diff -Nru thunderbird-91.3.2+build1/accessible/windows/msaa/MsaaAccessible.cpp thunderbird-91.4.0+build2/accessible/windows/msaa/MsaaAccessible.cpp
--- thunderbird-91.3.2+build1/accessible/windows/msaa/MsaaAccessible.cpp	2021-11-19 11:55:38.000000000 +0000
+++ thunderbird-91.4.0+build2/accessible/windows/msaa/MsaaAccessible.cpp	2021-12-09 11:59:36.000000000 +0000
@@ -663,20 +663,22 @@
 already_AddRefed<IAccessible> MsaaAccessible::GetRemoteIAccessibleFor(
     const VARIANT& aVarChild) {
   a11y::RootAccessible* root = LocalAcc()->RootAccessible();
-  const nsTArray<DocAccessibleParent*>* remoteDocs =
+  const nsTArray<DocAccessibleParent*>* rawRemoteDocs =
       DocManager::TopLevelRemoteDocs();
-  if (!remoteDocs) {
+  if (!rawRemoteDocs) {
     return nullptr;
   }
+  nsTArray<RefPtr<DocAccessibleParent>> remoteDocs(rawRemoteDocs->Length());
+  for (auto rawRemoteDoc : *rawRemoteDocs) {
+    remoteDocs.AppendElement(rawRemoteDoc);
+  }
 
   RefPtr<IAccessible> result;
 
-  // We intentionally leave the call to remoteDocs->Length() inside the loop
-  // condition because it is possible for reentry to occur in the call to
-  // GetProxiedAccessibleInSubtree() such that remoteDocs->Length() is mutated.
-  for (size_t i = 0; i < remoteDocs->Length(); i++) {
-    DocAccessibleParent* topRemoteDoc = remoteDocs->ElementAt(i);
-
+  for (auto topRemoteDoc : remoteDocs) {
+    if (topRemoteDoc->IsShutdown()) {
+      continue;
+    }
     LocalAccessible* outerDoc = topRemoteDoc->OuterDocOfRemoteBrowser();
     if (!outerDoc) {
       continue;
diff -Nru thunderbird-91.3.2+build1/browser/actors/ClickHandlerChild.jsm thunderbird-91.4.0+build2/browser/actors/ClickHandlerChild.jsm
--- thunderbird-91.3.2+build1/browser/actors/ClickHandlerChild.jsm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/actors/ClickHandlerChild.jsm	2021-12-09 11:59:35.000000000 +0000
@@ -23,6 +23,12 @@
   "resource://gre/modules/E10SUtils.jsm"
 );
 
+ChromeUtils.defineModuleGetter(
+  this,
+  "BrowserUtils",
+  "resource://gre/modules/BrowserUtils.jsm"
+);
+
 class ClickHandlerChild extends JSWindowActorChild {
   handleEvent(event) {
     if (
@@ -59,7 +65,9 @@
       }
     }
 
-    let [href, node, principal] = this._hrefAndLinkNodeForClickEvent(event);
+    let [href, node, principal] = BrowserUtils.hrefAndLinkNodeForClickEvent(
+      event
+    );
 
     let csp = ownerDoc.csp;
     if (csp) {
@@ -133,65 +141,4 @@
       this.sendAsyncMessage("Content:Click", json);
     }
   }
-
-  /**
-   * Extracts linkNode and href for the current click target.
-   *
-   * @param event
-   *        The click event.
-   * @return [href, linkNode, linkPrincipal].
-   *
-   * @note linkNode will be null if the click wasn't on an anchor
-   *       element. This includes SVG links, because callers expect |node|
-   *       to behave like an <a> element, which SVG links (XLink) don't.
-   */
-  _hrefAndLinkNodeForClickEvent(event) {
-    let content = this.contentWindow;
-    function isHTMLLink(aNode) {
-      // Be consistent with what nsContextMenu.js does.
-      return (
-        (aNode instanceof content.HTMLAnchorElement && aNode.href) ||
-        (aNode instanceof content.HTMLAreaElement && aNode.href) ||
-        aNode instanceof content.HTMLLinkElement
-      );
-    }
-
-    let node = event.composedTarget;
-    while (node && !isHTMLLink(node)) {
-      node = node.flattenedTreeParentNode;
-    }
-
-    if (node) {
-      return [node.href, node, node.ownerDocument.nodePrincipal];
-    }
-
-    // If there is no linkNode, try simple XLink.
-    let href, baseURI;
-    node = event.composedTarget;
-    while (node && !href) {
-      if (
-        node.nodeType == content.Node.ELEMENT_NODE &&
-        (node.localName == "a" ||
-          node.namespaceURI == "http://www.w3.org/1998/Math/MathML")
-      ) {
-        href =
-          node.getAttribute("href") ||
-          node.getAttributeNS("http://www.w3.org/1999/xlink", "href");
-        if (href) {
-          baseURI = node.ownerDocument.baseURIObject;
-          break;
-        }
-      }
-      node = node.flattenedTreeParentNode;
-    }
-
-    // In case of XLink, we don't return the node we got href from since
-    // callers expect <a>-like elements.
-    // Note: makeURI() will throw if aUri is not a valid URI.
-    return [
-      href ? Services.io.newURI(href, null, baseURI).spec : null,
-      null,
-      node && node.ownerDocument.nodePrincipal,
-    ];
-  }
 }
diff -Nru thunderbird-91.3.2+build1/browser/actors/ClickHandlerParent.jsm thunderbird-91.4.0+build2/browser/actors/ClickHandlerParent.jsm
--- thunderbird-91.3.2+build1/browser/actors/ClickHandlerParent.jsm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/actors/ClickHandlerParent.jsm	2021-12-09 11:59:35.000000000 +0000
@@ -55,6 +55,11 @@
     // This is heavily based on contentAreaClick from browser.js (Bug 903016)
     // The data is set up in a way to look like an Event.
     let browser = this.manager.browsingContext.top.embedderElement;
+    if (!browser) {
+      // Can be null if the tab disappeared by the time we got the message.
+      // Just bail.
+      return;
+    }
     let window = browser.ownerGlobal;
 
     if (!data.href) {
diff -Nru thunderbird-91.3.2+build1/browser/base/content/browser-fullScreenAndPointerLock.js thunderbird-91.4.0+build2/browser/base/content/browser-fullScreenAndPointerLock.js
--- thunderbird-91.3.2+build1/browser/base/content/browser-fullScreenAndPointerLock.js	2021-11-19 11:55:38.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/base/content/browser-fullScreenAndPointerLock.js	2021-12-09 11:59:35.000000000 +0000
@@ -122,8 +122,17 @@
     this._timeoutHide.start();
   },
 
-  close() {
-    if (!this._element) {
+  /**
+   * Close the full screen or pointerlock warning.
+   * @param {('fullscreen-warning'|'pointerlock-warning')} elementId - Id of the
+   * warning element to close. If the id does not match the currently shown
+   * warning this is a no-op.
+   */
+  close(elementId) {
+    if (!elementId) {
+      throw new Error("Must pass id of warning element to close");
+    }
+    if (!this._element || this._element.id != elementId) {
       return;
     }
     // Cancel any pending timeout
@@ -245,7 +254,7 @@
   },
 
   exited() {
-    PointerlockFsWarning.close();
+    PointerlockFsWarning.close("pointerlock-warning");
   },
 };
 
@@ -447,7 +456,7 @@
 
     // If we have a current pointerlock warning shown then hide it
     // before transition.
-    PointerlockFsWarning.close();
+    PointerlockFsWarning.close("pointerlock-warning");
 
     // If it is a remote browser, send a message to ask the content
     // to enter fullscreen state. We don't need to do so if it is an
@@ -569,7 +578,7 @@
       true
     );
 
-    PointerlockFsWarning.close();
+    PointerlockFsWarning.close("fullscreen-warning");
     gBrowser.tabContainer.removeEventListener(
       "TabSelect",
       this.exitDomFullScreen
diff -Nru thunderbird-91.3.2+build1/browser/base/content/test/static/browser_parsable_css.js thunderbird-91.4.0+build2/browser/base/content/test/static/browser_parsable_css.js
--- thunderbird-91.3.2+build1/browser/base/content/test/static/browser_parsable_css.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/base/content/test/static/browser_parsable_css.js	2021-12-09 11:59:35.000000000 +0000
@@ -118,6 +118,9 @@
 
   // This variable is used from CSS embedded in JS in adjustableTitle.js
   { propName: "--icon-url", isFromDevTools: false },
+
+  // This variable is used from CSS embedded in JS in pdf.js
+  { propName: "--zoom-factor", isFromDevTools: false },
 ];
 
 // Add suffix to stylesheets' URI so that we always load them here and
diff -Nru thunderbird-91.3.2+build1/browser/components/downloads/content/downloads.css thunderbird-91.4.0+build2/browser/components/downloads/content/downloads.css
--- thunderbird-91.3.2+build1/browser/components/downloads/content/downloads.css	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/downloads/content/downloads.css	2021-12-09 11:59:35.000000000 +0000
@@ -91,7 +91,7 @@
 #downloadsPanel-blockedSubview,
 #downloadsPanel-mainView {
   font: caption;
-  width: 35em;
+  min-width: 37em;
   padding: 0.62em;
 }
 
diff -Nru thunderbird-91.3.2+build1/browser/components/downloads/content/downloadsPanel.inc.xhtml thunderbird-91.4.0+build2/browser/components/downloads/content/downloadsPanel.inc.xhtml
--- thunderbird-91.3.2+build1/browser/components/downloads/content/downloadsPanel.inc.xhtml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/downloads/content/downloadsPanel.inc.xhtml	2021-12-09 11:59:36.000000000 +0000
@@ -117,7 +117,7 @@
     <panelview id="downloadsPanel-mainView">
       <vbox class="panel-view-body-unscrollable">
         <richlistbox id="downloadsListBox"
-                     data-l10n-id="downloads-panel-list"
+                     data-l10n-id="downloads-panel-items"
                      data-l10n-attrs="style"
                      context="downloadsContextMenu"
                      onmouseover="DownloadsView.onDownloadMouseOver(event);"
diff -Nru thunderbird-91.3.2+build1/browser/components/enterprisepolicies/Policies.jsm thunderbird-91.4.0+build2/browser/components/enterprisepolicies/Policies.jsm
--- thunderbird-91.3.2+build1/browser/components/enterprisepolicies/Policies.jsm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/enterprisepolicies/Policies.jsm	2021-12-09 11:59:36.000000000 +0000
@@ -423,50 +423,10 @@
         });
       }
 
-      if (
-        param.Default !== undefined ||
-        param.AcceptThirdParty !== undefined ||
-        param.RejectTracker !== undefined ||
-        param.Locked
-      ) {
-        const ACCEPT_COOKIES = 0;
-        const REJECT_THIRD_PARTY_COOKIES = 1;
-        const REJECT_ALL_COOKIES = 2;
-        const REJECT_UNVISITED_THIRD_PARTY = 3;
-        const REJECT_TRACKER = 4;
-
-        let newCookieBehavior = ACCEPT_COOKIES;
-        if (param.Default !== undefined && !param.Default) {
-          newCookieBehavior = REJECT_ALL_COOKIES;
-        } else if (param.AcceptThirdParty) {
-          if (param.AcceptThirdParty == "never") {
-            newCookieBehavior = REJECT_THIRD_PARTY_COOKIES;
-          } else if (param.AcceptThirdParty == "from-visited") {
-            newCookieBehavior = REJECT_UNVISITED_THIRD_PARTY;
-          }
-        } else if (param.RejectTracker !== undefined && param.RejectTracker) {
-          newCookieBehavior = REJECT_TRACKER;
-        }
-
-        setDefaultPref(
-          "network.cookie.cookieBehavior",
-          newCookieBehavior,
-          param.Locked
-        );
-        setDefaultPref(
-          "network.cookie.cookieBehavior.pbmode",
-          newCookieBehavior,
-          param.Locked
-        );
-      }
-
-      const KEEP_COOKIES_UNTIL_EXPIRATION = 0;
-      const KEEP_COOKIES_UNTIL_END_OF_SESSION = 2;
-
       if (param.ExpireAtSessionEnd !== undefined || param.Locked) {
-        let newLifetimePolicy = KEEP_COOKIES_UNTIL_EXPIRATION;
+        let newLifetimePolicy = Ci.nsICookieService.ACCEPT_NORMALLY;
         if (param.ExpireAtSessionEnd) {
-          newLifetimePolicy = KEEP_COOKIES_UNTIL_END_OF_SESSION;
+          newLifetimePolicy = Ci.nsICookieService.ACCEPT_SESSION;
         }
 
         setDefaultPref(
@@ -475,6 +435,68 @@
           param.Locked
         );
       }
+
+      // New Cookie Behavior option takes precendence
+      let defaultPref = Services.prefs.getDefaultBranch("");
+      let newCookieBehavior = defaultPref.getIntPref(
+        "network.cookie.cookieBehavior"
+      );
+      let newCookieBehaviorPB = defaultPref.getIntPref(
+        "network.cookie.cookieBehavior.pbmode"
+      );
+      if ("Behavior" in param || "BehaviorPrivateBrowsing" in param) {
+        let behaviors = {
+          accept: Ci.nsICookieService.BEHAVIOR_ACCEPT,
+          "reject-foreign": Ci.nsICookieService.BEHAVIOR_REJECT_FOREIGN,
+          reject: Ci.nsICookieService.BEHAVIOR_REJECT,
+          "limit-foreign": Ci.nsICookieService.BEHAVIOR_LIMIT_FOREIGN,
+          "reject-tracker": Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER,
+          "reject-tracker-and-partition-foreign":
+            Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER_AND_PARTITION_FOREIGN,
+        };
+        if ("Behavior" in param) {
+          newCookieBehavior = behaviors[param.Behavior];
+        }
+        if ("BehaviorPrivateBrowsing" in param) {
+          newCookieBehaviorPB = behaviors[param.BehaviorPrivateBrowsing];
+        }
+      } else {
+        // Default, AcceptThirdParty, and RejectTracker are being
+        // deprecated in favor of Behavior. They will continue
+        // to be supported, though.
+        if (
+          param.Default !== undefined ||
+          param.AcceptThirdParty !== undefined ||
+          param.RejectTracker !== undefined ||
+          param.Locked
+        ) {
+          newCookieBehavior = Ci.nsICookieService.BEHAVIOR_ACCEPT;
+          if (param.Default !== undefined && !param.Default) {
+            newCookieBehavior = Ci.nsICookieService.BEHAVIOR_REJECT;
+          } else if (param.AcceptThirdParty) {
+            if (param.AcceptThirdParty == "never") {
+              newCookieBehavior = Ci.nsICookieService.BEHAVIOR_REJECT_FOREIGN;
+            } else if (param.AcceptThirdParty == "from-visited") {
+              newCookieBehavior = Ci.nsICookieService.BEHAVIOR_LIMIT_FOREIGN;
+            }
+          } else if (param.RejectTracker) {
+            newCookieBehavior = Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER;
+          }
+        }
+        // With the old cookie policy, we made private browsing the same.
+        newCookieBehaviorPB = newCookieBehavior;
+      }
+      // We set the values no matter what just in case the policy was only used to lock.
+      setDefaultPref(
+        "network.cookie.cookieBehavior",
+        newCookieBehavior,
+        param.Locked
+      );
+      setDefaultPref(
+        "network.cookie.cookieBehavior.pbmode",
+        newCookieBehaviorPB,
+        param.Locked
+      );
     },
   },
 
@@ -1123,6 +1145,13 @@
           locked
         );
       }
+      if ("SponsoredTopSites" in param) {
+        setDefaultPref(
+          "browser.newtabpage.activity-stream.showSponsoredTopSites",
+          param.SponsoredTopSites,
+          locked
+        );
+      }
       if ("Highlights" in param) {
         setDefaultPref(
           "browser.newtabpage.activity-stream.feeds.section.highlights",
@@ -1142,6 +1171,13 @@
           locked
         );
       }
+      if ("SponsoredPocket" in param) {
+        setDefaultPref(
+          "browser.newtabpage.activity-stream.showSponsored",
+          param.SponsoredPocket,
+          locked
+        );
+      }
       if ("Snippets" in param) {
         setDefaultPref(
           "browser.newtabpage.activity-stream.feeds.snippets",
@@ -1549,6 +1585,7 @@
         "geo.",
         "gfx.",
         "intl.",
+        "keyword.enabled",
         "layers.",
         "layout.",
         "media.",
@@ -1558,6 +1595,7 @@
         "print.",
         "signon.",
         "spellchecker.",
+        "toolkit.legacyUserProfileCustomizations.stylesheets",
         "ui.",
         "widget.",
       ];
diff -Nru thunderbird-91.3.2+build1/browser/components/enterprisepolicies/schemas/policies-schema.json thunderbird-91.4.0+build2/browser/components/enterprisepolicies/schemas/policies-schema.json
--- thunderbird-91.3.2+build1/browser/components/enterprisepolicies/schemas/policies-schema.json	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/enterprisepolicies/schemas/policies-schema.json	2021-12-09 11:59:36.000000000 +0000
@@ -217,7 +217,18 @@
 
         "Locked": {
           "type": "boolean"
+        },
+
+        "Behavior": {
+          "type": "string",
+          "enum": ["accept", "reject-foreign", "reject", "limit-foreign", "reject-tracker", "reject-tracker-and-partition-foreign"]
+        },
+
+        "BehaviorPrivateBrowsing": {
+          "type": "string",
+          "enum": ["accept", "reject-foreign", "reject", "limit-foreign", "reject-tracker", "reject-tracker-and-partition-foreign"]
         }
+
       }
     },
 
@@ -526,12 +537,18 @@
         "TopSites": {
           "type": "boolean"
         },
+        "SponsoredTopSites": {
+          "type": "boolean"
+        },
         "Highlights": {
           "type": "boolean"
         },
         "Pocket": {
           "type": "boolean"
         },
+        "SponsoredPocket": {
+          "type": "boolean"
+        },
         "Snippets": {
           "type": "boolean"
         },
diff -Nru thunderbird-91.3.2+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_firefoxhome.js thunderbird-91.4.0+build2/browser/components/enterprisepolicies/tests/browser/browser_policy_firefoxhome.js
--- thunderbird-91.3.2+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_firefoxhome.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/enterprisepolicies/tests/browser/browser_policy_firefoxhome.js	2021-12-09 11:59:36.000000000 +0000
@@ -82,8 +82,10 @@
       FirefoxHome: {
         Search: false,
         TopSites: false,
+        SponsoredTopSites: false,
         Highlights: false,
         Pocket: false,
+        SponsoredPocket: false,
         Snippets: false,
         Locked: true,
       },
@@ -94,8 +96,11 @@
     let data = {
       Search: "browser.newtabpage.activity-stream.showSearch",
       TopSites: "browser.newtabpage.activity-stream.feeds.topsites",
+      SponsoredTopSites:
+        "browser.newtabpage.activity-stream.showSponsoredTopSites",
       Highlights: "browser.newtabpage.activity-stream.feeds.section.highlights",
       Pocket: "browser.newtabpage.activity-stream.feeds.section.topstories",
+      SponsoredPocket: "browser.newtabpage.activity-stream.showSponsored",
       Snippets: "browser.newtabpage.activity-stream.feeds.snippets",
     };
     for (let [section, preference] of Object.entries(data)) {
diff -Nru thunderbird-91.3.2+build1/browser/components/enterprisepolicies/tests/browser/managedbookmarks/browser_policy_managedbookmarks.js thunderbird-91.4.0+build2/browser/components/enterprisepolicies/tests/browser/managedbookmarks/browser_policy_managedbookmarks.js
--- thunderbird-91.3.2+build1/browser/components/enterprisepolicies/tests/browser/managedbookmarks/browser_policy_managedbookmarks.js	2021-11-19 11:55:38.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/enterprisepolicies/tests/browser/managedbookmarks/browser_policy_managedbookmarks.js	2021-12-09 11:59:36.000000000 +0000
@@ -132,6 +132,19 @@
   await openContextMenuPromise;
   info("Opened context menu");
 
+  ok(
+    document.getElementById("placesContext_open:newprivatewindow").hidden,
+    "Private Browsing menu should be hidden"
+  );
+  ok(
+    document.getElementById("placesContext_openContainer:tabs").hidden,
+    "Open in Tabs should be hidden"
+  );
+  ok(
+    document.getElementById("placesContext_delete").hidden,
+    "Delete should be hidden"
+  );
+
   let tabCreatedPromise = BrowserTestUtils.waitForNewTab(gBrowser, null, true);
 
   let openInNewTabOption = document.getElementById("placesContext_open:newtab");
diff -Nru thunderbird-91.3.2+build1/browser/components/enterprisepolicies/tests/browser/managedbookmarks/managedbookmarks.json thunderbird-91.4.0+build2/browser/components/enterprisepolicies/tests/browser/managedbookmarks/managedbookmarks.json
--- thunderbird-91.3.2+build1/browser/components/enterprisepolicies/tests/browser/managedbookmarks/managedbookmarks.json	2021-11-19 11:55:38.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/enterprisepolicies/tests/browser/managedbookmarks/managedbookmarks.json	2021-12-09 11:59:36.000000000 +0000
@@ -1,5 +1,6 @@
 {
 	"policies": {
+		"DisablePrivateBrowsing": true,
 		"DisplayBookmarksToolbar": true,
 		"ManagedBookmarks": [{
 				"toplevel_name": "Folder 1"
diff -Nru thunderbird-91.3.2+build1/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js thunderbird-91.4.0+build2/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
--- thunderbird-91.3.2+build1/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js	2021-11-19 11:55:39.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js	2021-12-09 11:59:36.000000000 +0000
@@ -817,6 +817,90 @@
       "network.http.windows-sso.enabled": true,
     },
   },
+
+  {
+    policies: {
+      Cookies: {
+        Behavior: "accept",
+        BehaviorPrivateBrowsing: "reject-foreign",
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "network.cookie.cookieBehavior": 0,
+      "network.cookie.cookieBehavior.pbmode": 1,
+    },
+  },
+
+  {
+    policies: {
+      Cookies: {
+        Behavior: "reject-foreign",
+        BehaviorPrivateBrowsing: "reject",
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "network.cookie.cookieBehavior": 1,
+      "network.cookie.cookieBehavior.pbmode": 2,
+    },
+  },
+
+  {
+    policies: {
+      Cookies: {
+        Behavior: "reject",
+        BehaviorPrivateBrowsing: "limit-foreign",
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "network.cookie.cookieBehavior": 2,
+      "network.cookie.cookieBehavior.pbmode": 3,
+    },
+  },
+
+  {
+    policies: {
+      Cookies: {
+        Behavior: "limit-foreign",
+        BehaviorPrivateBrowsing: "reject-tracker",
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "network.cookie.cookieBehavior": 3,
+      "network.cookie.cookieBehavior.pbmode": 4,
+    },
+  },
+
+  {
+    policies: {
+      Cookies: {
+        Behavior: "reject-tracker",
+        BehaviorPrivateBrowsing: "reject-tracker-and-partition-foreign",
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "network.cookie.cookieBehavior": 4,
+      "network.cookie.cookieBehavior.pbmode": 5,
+    },
+  },
+
+  {
+    policies: {
+      Cookies: {
+        Behavior: "reject-tracker-and-partition-foreign",
+        BehaviorPrivateBrowsing: "accept",
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "network.cookie.cookieBehavior": 5,
+      "network.cookie.cookieBehavior.pbmode": 0,
+    },
+  },
 ];
 
 add_task(async function test_policy_simple_prefs() {
diff -Nru thunderbird-91.3.2+build1/browser/components/places/PlacesUIUtils.jsm thunderbird-91.4.0+build2/browser/components/places/PlacesUIUtils.jsm
--- thunderbird-91.3.2+build1/browser/components/places/PlacesUIUtils.jsm	2021-11-19 11:55:39.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/places/PlacesUIUtils.jsm	2021-12-09 11:59:36.000000000 +0000
@@ -1348,37 +1348,35 @@
     let linkItems = [
       "placesContext_open:newtab",
       "placesContext_open:newwindow",
-      "placesContext_open:newprivatewindow",
       "placesContext_openSeparator",
       "placesContext_copy",
     ];
+    // Hide everything. We'll unhide the things we need.
     Array.from(menupopup.children).forEach(function(child) {
-      if (!(child.id in linkItems)) {
-        child.hidden = true;
-      }
+      child.hidden = true;
     });
     // Store triggerNode in controller for checking if commands are enabled
     this.managedBookmarksController.triggerNode = menupopup.triggerNode;
     // Container in this context means a folder.
     let isFolder = menupopup.triggerNode.hasAttribute("container");
-    let openContainerInTabs_menuitem = document.getElementById(
-      "placesContext_openContainer:tabs"
-    );
     if (isFolder) {
       // Disable the openContainerInTabs menuitem if there
       // are no children of the menu that have links.
+      let openContainerInTabs_menuitem = document.getElementById(
+        "placesContext_openContainer:tabs"
+      );
       let menuitems = menupopup.triggerNode.menupopup.children;
       let openContainerInTabs = Array.from(menuitems).some(
         menuitem => menuitem.link
       );
       openContainerInTabs_menuitem.disabled = !openContainerInTabs;
+      openContainerInTabs_menuitem.hidden = false;
     } else {
-      document.getElementById(
-        "placesContext_open:newprivatewindow"
-      ).hidden = PrivateBrowsingUtils.isWindowPrivate(window);
+      linkItems.forEach(id => (document.getElementById(id).hidden = false));
+      document.getElementById("placesContext_open:newprivatewindow").hidden =
+        PrivateBrowsingUtils.isWindowPrivate(window) ||
+        !PrivateBrowsingUtils.enabled;
     }
-    openContainerInTabs_menuitem.hidden = !isFolder;
-    linkItems.forEach(id => (document.getElementById(id).hidden = isFolder));
 
     event.target.ownerGlobal.updateCommands("places");
   },
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/browser/components/search/extensions/coccoc/favicon.ico and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/browser/components/search/extensions/coccoc/favicon.ico differ
diff -Nru thunderbird-91.3.2+build1/browser/components/urlbar/tests/unit/test_unitConversion.js thunderbird-91.4.0+build2/browser/components/urlbar/tests/unit/test_unitConversion.js
--- thunderbird-91.3.2+build1/browser/components/urlbar/tests/unit/test_unitConversion.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/components/urlbar/tests/unit/test_unitConversion.js	2021-12-09 11:59:36.000000000 +0000
@@ -391,22 +391,70 @@
       {
         queryString: "0:00 utc to here",
         timezone: "EST5EDT",
-        expected: "20:00 UTC-400",
+        assertResult: output => {
+          const date = new Date();
+          const offset = date.getTimezoneOffset();
+          if (offset === 240) {
+            // Summer time.
+            Assert.equal(output, "20:00 UTC-400");
+          } else if (offset === 300) {
+            // Standard time.
+            Assert.equal(output, "19:00 UTC-500");
+          } else {
+            Assert.ok(false, "Unexpected time");
+          }
+        },
       },
       {
         queryString: "0:00 utc to here",
         timezone: "PST8PDT",
-        expected: "17:00 UTC-700",
+        assertResult: output => {
+          const date = new Date();
+          const offset = date.getTimezoneOffset();
+          if (offset === 420) {
+            // Summer time.
+            Assert.equal(output, "17:00 UTC-700");
+          } else if (offset === 480) {
+            // Standard time.
+            Assert.equal(output, "16:00 UTC-800");
+          } else {
+            Assert.ok(false, "Unexpected time");
+          }
+        },
       },
       {
         queryString: "9:00 to utc",
         timezone: "EST5EDT",
-        expected: "13:00 UTC",
+        assertResult: output => {
+          const date = new Date();
+          const offset = date.getTimezoneOffset();
+          if (offset === 240) {
+            // Summer time.
+            Assert.equal(output, "13:00 UTC");
+          } else if (offset === 300) {
+            // Standard time.
+            Assert.equal(output, "14:00 UTC");
+          } else {
+            Assert.ok(false, "Unexpected time");
+          }
+        },
       },
       {
         queryString: "9 am to utc",
         timezone: "EST5EDT",
-        expected: "1:00 PM UTC",
+        assertResult: output => {
+          const date = new Date();
+          const offset = date.getTimezoneOffset();
+          if (offset === 240) {
+            // Summer time.
+            Assert.equal(output, "1:00 PM UTC");
+          } else if (offset === 300) {
+            // Standard time.
+            Assert.equal(output, "2:00 PM UTC");
+          } else {
+            Assert.ok(false, "Unexpected time");
+          }
+        },
       },
       {
         queryString: "now to utc",
diff -Nru thunderbird-91.3.2+build1/browser/config/version_display.txt thunderbird-91.4.0+build2/browser/config/version_display.txt
--- thunderbird-91.3.2+build1/browser/config/version_display.txt	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/config/version_display.txt	2021-12-09 12:00:15.000000000 +0000
@@ -1 +1 @@
-91.3.0esr
+91.4.0esr
diff -Nru thunderbird-91.3.2+build1/browser/config/version.txt thunderbird-91.4.0+build2/browser/config/version.txt
--- thunderbird-91.3.2+build1/browser/config/version.txt	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/config/version.txt	2021-12-09 12:00:15.000000000 +0000
@@ -1 +1 @@
-91.3.0
+91.4.0
diff -Nru thunderbird-91.3.2+build1/browser/locales/en-US/browser/downloads.ftl thunderbird-91.4.0+build2/browser/locales/en-US/browser/downloads.ftl
--- thunderbird-91.3.2+build1/browser/locales/en-US/browser/downloads.ftl	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/locales/en-US/browser/downloads.ftl	2021-12-09 11:59:36.000000000 +0000
@@ -15,8 +15,8 @@
 # The style attribute has the width of the Downloads Panel expressed using
 # a CSS unit. The longest labels that should fit are usually those of
 # in-progress and blocked downloads.
-downloads-panel-list =
-  .style = width: 70ch
+downloads-panel-items =
+  .style = width: 35em
 
 downloads-cmd-pause =
     .label = Pause
diff -Nru thunderbird-91.3.2+build1/browser/locales/l10n-changesets.json thunderbird-91.4.0+build2/browser/locales/l10n-changesets.json
--- thunderbird-91.3.2+build1/browser/locales/l10n-changesets.json	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/locales/l10n-changesets.json	2021-12-09 11:59:36.000000000 +0000
@@ -15,7 +15,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "92a1596272fd42bb56e2d5043bd7b8eb65e86314"
+        "revision": "8312cd2e0777746cca7da89502bd806e57fff7e0"
     },
     "af": {
         "pin": false,
@@ -33,7 +33,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ef1fb0bc8de0d804e719deb854e71a9287e10147"
+        "revision": "21bf766c19d81d560aeb7fea3923acaa160a4f0b"
     },
     "an": {
         "pin": false,
@@ -51,7 +51,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "643856bc8d0c324fe63fff8f009534d7a2694256"
+        "revision": "34b6a4f0790db8e78bb8623a1a835008ccd0b949"
     },
     "ar": {
         "pin": false,
@@ -69,7 +69,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0933e35d41ba4db587fa87e1bd445e296886e939"
+        "revision": "513c3e8dac974838cbfc60137a9999d9b3249572"
     },
     "ast": {
         "pin": false,
@@ -87,7 +87,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "d70a68a4aa6face0962deec6f640b6f387c6f47a"
+        "revision": "19ca0cd0d1bf1ba0d31179c2add90526e7c61867"
     },
     "az": {
         "pin": false,
@@ -105,7 +105,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "6c8cee31a01b8f4e5658eaf9ead1373ac39d7f77"
+        "revision": "44aa0dad7964291bfa8ca8e7b74ea4cff369df93"
     },
     "be": {
         "pin": false,
@@ -123,7 +123,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "50750fd62e1f551058e1ad72427f2c47b4c513f7"
+        "revision": "c41577eaf11e849a8e9deaea820b6414a5705cbc"
     },
     "bg": {
         "pin": false,
@@ -141,7 +141,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f8fd9a2a1a4e21f7ca4db522fa183e9dbab38a8e"
+        "revision": "98d00610785165a5b5b50719e5cd963a3113dbfb"
     },
     "bn": {
         "pin": false,
@@ -159,7 +159,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "37f0cdb8748acae5d6457b3b2490360603d7d78d"
+        "revision": "2ca52cbb680a58c4cd4b614cf4699fbf98d9efd4"
     },
     "br": {
         "pin": false,
@@ -177,7 +177,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "87c6e8d9493ef888ce46741fa4379c881c4b7adf"
+        "revision": "ce92556a0a903955d3c937b59a7c14bd6e1f7ecf"
     },
     "bs": {
         "pin": false,
@@ -195,7 +195,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c00f54616813c87f5998880daf0bb1f4d07bcc25"
+        "revision": "1c79dabdb12088b14ae76696ca31170c011b1bcf"
     },
     "ca": {
         "pin": false,
@@ -213,7 +213,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "657a772d6987a0cc31d556827abded1c98b642c9"
+        "revision": "a22912c01617f0fbc3fe6ec907c17049b7688942"
     },
     "ca-valencia": {
         "pin": false,
@@ -231,7 +231,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "de153293fca69dcd36c10ad1e3ddb9f5d0a575bb"
+        "revision": "34bf3fd631d48459075581cbfcfd1449ea94f394"
     },
     "cak": {
         "pin": false,
@@ -249,7 +249,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8f035471e0d6850a7768282cd6f312be915ed756"
+        "revision": "e2e4ba2c37bcea86404c345c24eb0352bd879f4f"
     },
     "cs": {
         "pin": false,
@@ -267,7 +267,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "180092244961ac555f475ee4a54ecfb9f0b91ee3"
+        "revision": "a60792bff6ff8d6f564445c1c270ce3b14aff13b"
     },
     "cy": {
         "pin": false,
@@ -285,7 +285,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ed04c2140266a3466b3ee2df713a5db523ec83ff"
+        "revision": "fe6e566e139d36f25ac9899df2256225cb968a1f"
     },
     "da": {
         "pin": false,
@@ -303,7 +303,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "04f115e9e669cf3e5f709c8007244240d3bb9d70"
+        "revision": "af198d43f7d62d5421d3ea845947aaf625c48e18"
     },
     "de": {
         "pin": false,
@@ -321,7 +321,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "97551d848cc35d23ab44c5fb575cb033e9b103f8"
+        "revision": "cdd66c249c7b6039c6128d421a8d6d7bab140f95"
     },
     "dsb": {
         "pin": false,
@@ -339,7 +339,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "eed5e4afa16a0d40b190677ed63ba58e3fa15603"
+        "revision": "962e5a544415d3edfb87406e4ee1b1cc04488c5a"
     },
     "el": {
         "pin": false,
@@ -357,7 +357,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "46b1520ed3b056cd7e04ff49f092aca92ee958e0"
+        "revision": "e7c49fd88463275b2b52be622e8f1b5ced0edb42"
     },
     "en-CA": {
         "pin": false,
@@ -375,7 +375,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "20e2b9c4064ee74a24690eb2bcf328c7dd248a5b"
+        "revision": "5a0e35b08a489351418516c5c384b15bdef9cabd"
     },
     "en-GB": {
         "pin": false,
@@ -393,7 +393,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8a6db5af83f3851a921082defa94d9facd85d9e9"
+        "revision": "72f8c5d8305df3233cc78e9d2967f6c6624315ba"
     },
     "eo": {
         "pin": false,
@@ -411,7 +411,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4b208b3cffcaf8dd46746c95f858d46c75ff1e53"
+        "revision": "23c9df7dee77ec8fae490f54c7a1f737e91bb689"
     },
     "es-AR": {
         "pin": false,
@@ -429,7 +429,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e660e5b821466e8ecc40b3332ebcc0e16631dcff"
+        "revision": "6cf3c836995d40e92bb7380e49f0992b269f8f5f"
     },
     "es-CL": {
         "pin": false,
@@ -447,7 +447,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "609efca99c32a1c06ab7d37accfb4013d80d3a23"
+        "revision": "8727dda3935ef37fcbe6835baec1805db02d79b8"
     },
     "es-ES": {
         "pin": false,
@@ -465,7 +465,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "06f7fdd2474052203dc55d20ae7d8d643cd42c35"
+        "revision": "5351aba49895272a124069fd062506f132717b9e"
     },
     "es-MX": {
         "pin": false,
@@ -483,7 +483,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "46c5761bc0a0d79c11f338ee1c8ead3a54239d01"
+        "revision": "dd834a4af402c5c6706f622c4f3dcc0c95abb5b0"
     },
     "et": {
         "pin": false,
@@ -501,7 +501,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "77c75b38c76635d298a50902fe7e0e0b6f6e8258"
+        "revision": "1f2150796079f0ddc0c5c4bba7c030fc98b39cd2"
     },
     "eu": {
         "pin": false,
@@ -519,7 +519,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "fc0109e70847351138cb7ca1998b9ccafb46d73b"
+        "revision": "b2aaf4f508cf10389fec637d0f3bdf1ebbbc720c"
     },
     "fa": {
         "pin": false,
@@ -537,7 +537,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9800e65943ae7b07be1369f4de0ba9f92fe6ef5d"
+        "revision": "04ec3c3bbe92bdc5fe96943ccccf11d798c906dc"
     },
     "ff": {
         "pin": false,
@@ -555,7 +555,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "cab0e832bfed5291ba93618d46941391fe503185"
+        "revision": "0cf866f9bc4efcaf941823c89be7103d91c27634"
     },
     "fi": {
         "pin": false,
@@ -573,7 +573,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1996d416f8706f7ac8577f0db397c25aa5e2158b"
+        "revision": "04a600fc54a48f151318f9207cc8ec1a3236842b"
     },
     "fr": {
         "pin": false,
@@ -591,7 +591,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "cf093603b7bfad4fe144b46bc119fcb0b9226a03"
+        "revision": "64a3576df276ce45d0ff0d4ee133c92c1801bcc0"
     },
     "fy-NL": {
         "pin": false,
@@ -609,7 +609,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8db3ea4951e266a03c87d42944eb8bcb435c61eb"
+        "revision": "c84177dfa254ca9144062a61c07ff6f8e89d9c0e"
     },
     "ga-IE": {
         "pin": false,
@@ -627,7 +627,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "86160f7aeec7b615f982ee024825426812715b91"
+        "revision": "31590cffac566446b3654fad63d25b89cf39f8c0"
     },
     "gd": {
         "pin": false,
@@ -645,7 +645,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "cd6f01ba00ba02642f71808f0350bb61c07f0127"
+        "revision": "ba4f274ac4a1198251e9b9f0dd1fcd5adec53ada"
     },
     "gl": {
         "pin": false,
@@ -663,7 +663,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "753414a73c6e94e35325f41350f5374009c04a42"
+        "revision": "56b41bdcd401c52ded45bbbe67e6dc34727b0eb0"
     },
     "gn": {
         "pin": false,
@@ -681,7 +681,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b6442f8530c9ecbf07e11badb6944cfc6b2c6599"
+        "revision": "59e2afb65c08b79c7cd3a54f1b4dc3185253e755"
     },
     "gu-IN": {
         "pin": false,
@@ -699,7 +699,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "71c65787b4b0cbfcd211710c7e4b54d10b4f2ed6"
+        "revision": "33b4409fb6154d61d7abc626b8beebcbed54f783"
     },
     "he": {
         "pin": false,
@@ -717,7 +717,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ebe4151d33e329d31a91a2ce7293d46eb40974ac"
+        "revision": "92f9f82381899a6d87cbb499e8232f2379dd152b"
     },
     "hi-IN": {
         "pin": false,
@@ -735,7 +735,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "3dbb505738e1dd04d6f0dcc7ba8643eff475c395"
+        "revision": "00090f7a2a3fe122f40e4831945b41dfc4ce9be0"
     },
     "hr": {
         "pin": false,
@@ -753,7 +753,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4f1a0f4f4067b44d7964a0a4689e8a5804a88440"
+        "revision": "6e4a3fdc01f315566fe44286e5e9e7421f463165"
     },
     "hsb": {
         "pin": false,
@@ -771,7 +771,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ee883b57e3233de6e7b3aa5aa9474c55e898858c"
+        "revision": "7fd9bc25e49d515d0233fc4e7ead47f55557a145"
     },
     "hu": {
         "pin": false,
@@ -789,7 +789,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ece9f6fe94177435b9b696ba2008d8f08f1fbee8"
+        "revision": "ce3b378ce95009f47be7840aa688123067c8fb24"
     },
     "hy-AM": {
         "pin": false,
@@ -807,7 +807,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "94e4ba11a06d733285195f99c58f0c51c7d4447e"
+        "revision": "c91a4a3e8821995112f3a66d1d8b383a4dbd1f5b"
     },
     "ia": {
         "pin": false,
@@ -825,7 +825,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f6b923d775ab5d78d8dcc9e61b1fd467f8e37661"
+        "revision": "4f235acc839e921b4c1303874a40bd44433c2620"
     },
     "id": {
         "pin": false,
@@ -843,7 +843,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "cd52deeba1935fcf695799c7a63de28cbcc29004"
+        "revision": "fface86a34e44672fe70a52dc99e5fc91487f96c"
     },
     "is": {
         "pin": false,
@@ -861,7 +861,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "6ccce2be823e9ffa0d5f4d07d1b175dc58c7689c"
+        "revision": "5978ae767b44dac272feac7ca40ef7dd7e7162ce"
     },
     "it": {
         "pin": false,
@@ -879,7 +879,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "390a9b74d197e9710b974bedd653d131f60de192"
+        "revision": "4fdad8bddf965a20e82f73519d4f3c424766cf43"
     },
     "ja": {
         "pin": false,
@@ -895,7 +895,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "deaf9e14e832702d4771e807a2c1bcd38f7e47be"
+        "revision": "70352a22739bce87e4adbb6929f23f7c32eed5eb"
     },
     "ja-JP-mac": {
         "pin": false,
@@ -903,7 +903,7 @@
             "macosx64",
             "macosx64-devedition"
         ],
-        "revision": "ce77b5ca42848c8ebfeff43e603715569a672ac9"
+        "revision": "d9293092a4608acd2ef01ed4fff7903267ebb661"
     },
     "ka": {
         "pin": false,
@@ -921,7 +921,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8bddf1adfa2c229465c3fb63751c8336793185ec"
+        "revision": "49b4a7c6bb2c5f41f38d432cdb35f0180d489e50"
     },
     "kab": {
         "pin": false,
@@ -939,7 +939,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "00a29720f947b0c90d871a153b968982516257db"
+        "revision": "7e9377dce15411da9fc3cf05ad2533f598f3fbfb"
     },
     "kk": {
         "pin": false,
@@ -957,7 +957,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1d1ee9e00851e1ecc9deea025b2bc5b471b6e061"
+        "revision": "4850752776400eb3af019a1cc6286fb63785d14c"
     },
     "km": {
         "pin": false,
@@ -975,7 +975,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "7b2dcb7f998649999103bfe0829ac3aaa59a4a8a"
+        "revision": "3a5a1cae9b9306dd686af753ea51e3164c46d42b"
     },
     "kn": {
         "pin": false,
@@ -993,7 +993,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "89649fb492505be33c3711c0de298d638dc411e7"
+        "revision": "6ed122b33cacbdeb27068b19e86b3ca7fba642b6"
     },
     "ko": {
         "pin": false,
@@ -1011,7 +1011,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9537ee3e1cc0e81ec947b7b95e2a60c7384f34d3"
+        "revision": "49bc07645a47f419eee745babe027ea846d6c9f8"
     },
     "lij": {
         "pin": false,
@@ -1029,7 +1029,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8ff625f36b1a391344e2d5e9d127f6a1ce7cb8c6"
+        "revision": "93f04df126164aa3e37bca2c981616372783d9a3"
     },
     "lt": {
         "pin": false,
@@ -1047,7 +1047,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "16886a7d864d614e4da149a9c7ef78c65d718bf1"
+        "revision": "45a45034f5f44299356927b7923256142ba29386"
     },
     "lv": {
         "pin": false,
@@ -1065,7 +1065,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4c9912d162e8ee6a9bef55a1b7c8694ba8503dc7"
+        "revision": "daea4ba4e7f4c8bd90009f47f2f129c9f1a32a4c"
     },
     "mk": {
         "pin": false,
@@ -1083,7 +1083,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a9bf2475611f1fdd1d1510e517a3b39923072362"
+        "revision": "0c4ca0f4fc179488beeb99fadee5099a67f66bd1"
     },
     "mr": {
         "pin": false,
@@ -1101,7 +1101,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "166d524f00d6cc01dfd328e027d1d39c47d3c8af"
+        "revision": "9be8d59519762d2211249f36d96c3a481a3a028e"
     },
     "ms": {
         "pin": false,
@@ -1119,7 +1119,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "02294c8f9869ce76fa81f31a972dfb6a34d365dd"
+        "revision": "0f44d0bcfda2db6f2d90c77bae46a55554edea27"
     },
     "my": {
         "pin": false,
@@ -1137,7 +1137,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "dca5a79d295865e40bca5e6696521995160706c2"
+        "revision": "ccbf0c4355d6a7d35ff28c6284a6ccd2c3ec6d06"
     },
     "nb-NO": {
         "pin": false,
@@ -1155,7 +1155,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "fa192e5cc1f73f78db70903e9b0dbb4e17fc7a05"
+        "revision": "a6cf2c6e35944be8477925180857370e44e74f61"
     },
     "ne-NP": {
         "pin": false,
@@ -1173,7 +1173,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b8dd4d8f5e93e7b33c781e2aef70bdee0c2eaa44"
+        "revision": "c1636a1a7507710a736e6ffe4faf18ea92f45c9a"
     },
     "nl": {
         "pin": false,
@@ -1191,7 +1191,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "46a820726affa963ae8d0221fab375be955c225f"
+        "revision": "60ed1c2397a64d311eaf453a2c03679a51eb617d"
     },
     "nn-NO": {
         "pin": false,
@@ -1209,7 +1209,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "3cfb21421c531107d426a39fccce77955727753d"
+        "revision": "cf67b7b68d3bcff75fa544b66d624677e78f8078"
     },
     "oc": {
         "pin": false,
@@ -1227,7 +1227,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e01ef9843c28cf55e4c451624db766552dd99db8"
+        "revision": "9ac29828960ef1d2267773688598a106a3c4eb3a"
     },
     "pa-IN": {
         "pin": false,
@@ -1245,7 +1245,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "da0d62f7f0ad6edbcb44cef3c728946b17234d5d"
+        "revision": "146b2fad2ae503434f9817a6bc88465d2f91af72"
     },
     "pl": {
         "pin": false,
@@ -1263,7 +1263,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e30cce769184a71f15485a12723f39ccb95624d6"
+        "revision": "4d286061b125d7a90b08ac4bd03574e768af5d75"
     },
     "pt-BR": {
         "pin": false,
@@ -1281,7 +1281,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "bd8a87e96bdb21ff6a44d32aa7dba9d42c5f2fe4"
+        "revision": "89f1b173c9b1002bb3acecc28ee7884d23c9d029"
     },
     "pt-PT": {
         "pin": false,
@@ -1299,7 +1299,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "fe2b648b39619dea2190b45193db507937410b3d"
+        "revision": "27adc5dad78159639f4921960499b13a6031837e"
     },
     "rm": {
         "pin": false,
@@ -1317,7 +1317,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "2707ab2e7ca0079b9ee1748ebb5f18e752bff804"
+        "revision": "f27a9549658ab5d5e0d31bd6cc0469b298b985af"
     },
     "ro": {
         "pin": false,
@@ -1335,7 +1335,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0f29430e1de4c090f96b8cc2322e37974c6099c9"
+        "revision": "69cdc288966fcc830e3485125f1be4105cda88cd"
     },
     "ru": {
         "pin": false,
@@ -1353,7 +1353,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8b59cb544f3c7e6eee5f97dee439ae0f201d44dd"
+        "revision": "ee31f5a24611f677b08a13511ed9448befce1959"
     },
     "sco": {
         "pin": false,
@@ -1371,7 +1371,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "29f369dc5302982392ccc3aea2454d6825bb81d1"
+        "revision": "61ea93a50fffdcd948d3c20421039b712e414d38"
     },
     "si": {
         "pin": false,
@@ -1389,7 +1389,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "39dc94da7fbdd627ce77d14a835588d75e823bc4"
+        "revision": "2b134d24c0464fbf2b5fd323df0e32cadc13f424"
     },
     "sk": {
         "pin": false,
@@ -1407,7 +1407,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0d7a7bc0caa7294cbc0e55ba0b24b281e84cb5ba"
+        "revision": "6d69c24dc8db10d955d908ba5d6c61809a045ec6"
     },
     "sl": {
         "pin": false,
@@ -1425,7 +1425,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "cf86931ec405b8bba60c0bca609dcd14a903b66c"
+        "revision": "29e195d1d1609410f5383a83fd611ec195d2ef89"
     },
     "son": {
         "pin": false,
@@ -1443,7 +1443,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "7241fff63be7dc2e101e9e24a66ccf326d4e77fa"
+        "revision": "60a3b235fe1df2316e7c039ef7c22fbe67545a85"
     },
     "sq": {
         "pin": false,
@@ -1461,7 +1461,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "862be030f91ce3e9836a10335fd065be189d4aa0"
+        "revision": "8588cbc89847b93a0d29f02d85bfefee717b2d2f"
     },
     "sr": {
         "pin": false,
@@ -1479,7 +1479,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "35e4457ff9dd6dfd6a55db7582ea63921549ac29"
+        "revision": "901ab3e62a9a80aa700af7ebf1ef85152d9027a8"
     },
     "sv-SE": {
         "pin": false,
@@ -1497,7 +1497,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "5a7bb8693aa1d857a1b03ab45bf2c143b7381126"
+        "revision": "b098e2ebc049724d5a618c5e2a581ff9e01b869c"
     },
     "szl": {
         "pin": false,
@@ -1515,7 +1515,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "278901185c52a2ec9ba3e762e0390e236721c1f2"
+        "revision": "25951b964d5b961582e60620ab06a2f90f7b53a0"
     },
     "ta": {
         "pin": false,
@@ -1533,7 +1533,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0f97ab424652c056c02320a04dba1c07e1085889"
+        "revision": "94659c83c9d820384aa4d505d5777571c4caecd6"
     },
     "te": {
         "pin": false,
@@ -1551,7 +1551,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0c5171e645808b3f4b61b99450dedadf5ca9e610"
+        "revision": "eb59646a5d362451db123136ca697ab4e08dd334"
     },
     "th": {
         "pin": false,
@@ -1569,7 +1569,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9bc9e10fc0a480f4e1ba36df71a7829732cee4e8"
+        "revision": "10d257301a2d7be0a5f1d66abe70000cfe3f1f15"
     },
     "tl": {
         "pin": false,
@@ -1587,7 +1587,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9f8f9f3a94befb5cdde63556403c7db864fcf05b"
+        "revision": "9be6adca0e5183b5082c6b56c51953fd1575417c"
     },
     "tr": {
         "pin": false,
@@ -1605,7 +1605,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8d51ff7395e2c7673a5307af38d2e744f748552d"
+        "revision": "51354c936bf6d0bff1684ef2f3fff47f300fddbc"
     },
     "trs": {
         "pin": false,
@@ -1623,7 +1623,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9d504528894fa1bc57ede3f46d14e7970e924fe7"
+        "revision": "d7510f2d01dc3740ed1abf2787bf73827deff078"
     },
     "uk": {
         "pin": false,
@@ -1641,7 +1641,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c78494f6c55a6d39196e8ee9140bf08108a3e385"
+        "revision": "4d1fa878042bb6f1cf6a6e57e38c4a41a799fd6b"
     },
     "ur": {
         "pin": false,
@@ -1659,7 +1659,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "506249e5943a9d24d54d061c0074829cd280bbc8"
+        "revision": "ad3035f281830930ba913343e03ef31623dd537a"
     },
     "uz": {
         "pin": false,
@@ -1677,7 +1677,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "d3033e3dea25164352fe28164df4c500a14e2bf4"
+        "revision": "8ea7a5a051db8ae409a5e5d750988ea6c21e7c06"
     },
     "vi": {
         "pin": false,
@@ -1695,7 +1695,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1852a46afae43ebf3d6318322a49ee1b53945150"
+        "revision": "67fe2acb306fcb00853c1ff142efb137b7eeb964"
     },
     "xh": {
         "pin": false,
@@ -1713,7 +1713,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "53916ed84e5b2365df876eff27b21b8e3239f06c"
+        "revision": "abc22dfb6d84aa2658b0af6bfb9df4a5c2eeb6d4"
     },
     "zh-CN": {
         "pin": false,
@@ -1731,7 +1731,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "225124a5e7e332b4db7879765de8a8905032c84d"
+        "revision": "d6d6f9bb61130b7ec0305e791326543816bc96d5"
     },
     "zh-TW": {
         "pin": false,
@@ -1749,6 +1749,6 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c81255566999f2655581de0385075c7b9e378b73"
+        "revision": "0cbdc5f1a0486a7a55f9ed3254b6f3a2badbe501"
     }
 }
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/browser/themes/osx/downloads/downloads.css thunderbird-91.4.0+build2/browser/themes/osx/downloads/downloads.css
--- thunderbird-91.3.2+build1/browser/themes/osx/downloads/downloads.css	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/themes/osx/downloads/downloads.css	2021-12-09 11:59:36.000000000 +0000
@@ -15,7 +15,7 @@
 
 :root {
   --downloads-item-height: 6em;
-  --downloads-item-font-size-factor: 0.95;
+  --downloads-item-font-size-factor: 0.80;
   --downloads-item-details-opacity: 0.7;
 }
 
diff -Nru thunderbird-91.3.2+build1/browser/themes/windows/browser-aero.css thunderbird-91.4.0+build2/browser/themes/windows/browser-aero.css
--- thunderbird-91.3.2+build1/browser/themes/windows/browser-aero.css	2021-11-19 11:55:39.000000000 +0000
+++ thunderbird-91.4.0+build2/browser/themes/windows/browser-aero.css	2021-12-09 11:59:37.000000000 +0000
@@ -80,13 +80,13 @@
 
         @media (-moz-proton) {
         @media (-moz-windows-accent-color-in-titlebar) {
-          :root[sizemode=normal][tabsintitlebar] {
+          :root[sizemode=normal][tabsintitlebar] #navigator-toolbox {
             border-top: .5px solid -moz-accent-color;
           }
         }
         } /*** END proton ***/
 
-        :root[sizemode=normal][tabsintitlebar]:-moz-window-inactive {
+        :root[sizemode=normal][tabsintitlebar]:-moz-window-inactive #navigator-toolbox {
           border-top-color: rgb(57,57,57);
         }
 
@@ -311,7 +311,8 @@
 
   @media (-moz-os-version: windows-win8) {
     /* Artificially draw window borders that are covered by lwtheme, see bug 591930.
-     * Borders for win7 are below, win10 doesn't need them. */
+     * Borders for win7 are below, win10 only needs something like this when
+     * drawing in the titlebar (-moz-windows-accent-color-in-titlebar). */
     #main-window[sizemode="normal"] #navigator-toolbox:-moz-lwtheme {
       border-top: 1px solid @glassShadowColor@;
     }
@@ -343,7 +344,8 @@
   }
 
   /* Artificially draw window borders that are covered by lwtheme, see bug 591930.
-   * We use a different border for win8, and this is not necessary on win10+ */
+   * We use a different border for win8, and this win10+ only needs this if
+   * drawing in the titlebar (-moz-windows-accent-color-in-titlebar). */
   #main-window[sizemode="normal"] #navigator-toolbox:-moz-lwtheme {
     border-top: 1px solid @glassActiveBorderColor@;
     padding-top: 1px;
diff -Nru thunderbird-91.3.2+build1/BUILDID thunderbird-91.4.0+build2/BUILDID
--- thunderbird-91.3.2+build1/BUILDID	2021-11-19 12:03:23.000000000 +0000
+++ thunderbird-91.4.0+build2/BUILDID	2021-12-09 12:07:46.000000000 +0000
@@ -1 +1 @@
-20211117150618
\ No newline at end of file
+20211203141721
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/.cargo/config.in thunderbird-91.4.0+build2/.cargo/config.in
--- thunderbird-91.3.2+build1/.cargo/config.in	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/.cargo/config.in	2021-12-09 11:59:35.000000000 +0000
@@ -20,7 +20,7 @@
 [source."https://github.com/mozilla/cubeb-pulse-rs"]
 git = "https://github.com/mozilla/cubeb-pulse-rs"
 replace-with = "vendored-sources"
-rev = "c87b50aebfa088c1ad30c74819d4e9829f88b2e3"
+rev = "b0acd9e16c0249d61835a2d23735fbcbd8cbef64"
 
 [source."https://github.com/mozilla/cubeb-coreaudio-rs"]
 git = "https://github.com/mozilla/cubeb-coreaudio-rs"
@@ -97,6 +97,11 @@
 replace-with = "vendored-sources"
 rev = "824fa69756523f2b6d49029fe25de94130b1f144"
 
+[source."https://github.com/alexcrichton/cc-rs/"]
+git = "https://github.com/alexcrichton/cc-rs/"
+replace-with = "vendored-sources"
+rev = "b2f6b146b75299c444e05bbde50d03705c7c4b6e"
+
 [source."https://github.com/PLSysSec/rlbox_lucet_sandbox/"]
 git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/"
 replace-with = "vendored-sources"
diff -Nru thunderbird-91.3.2+build1/Cargo.lock thunderbird-91.4.0+build2/Cargo.lock
--- thunderbird-91.3.2+build1/Cargo.lock	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/Cargo.lock	2021-12-09 11:59:35.000000000 +0000
@@ -491,9 +491,8 @@
 
 [[package]]
 name = "cc"
-version = "1.0.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
+version = "1.0.71"
+source = "git+https://github.com/alexcrichton/cc-rs/?rev=b2f6b146b75299c444e05bbde50d03705c7c4b6e#b2f6b146b75299c444e05bbde50d03705c7c4b6e"
 dependencies = [
  "jobserver",
 ]
@@ -1028,7 +1027,7 @@
 [[package]]
 name = "cubeb-pulse"
 version = "0.3.0"
-source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=c87b50aebfa088c1ad30c74819d4e9829f88b2e3#c87b50aebfa088c1ad30c74819d4e9829f88b2e3"
+source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=b0acd9e16c0249d61835a2d23735fbcbd8cbef64#b0acd9e16c0249d61835a2d23735fbcbd8cbef64"
 dependencies = [
  "cubeb-backend",
  "pulse",
@@ -3870,7 +3869,7 @@
 [[package]]
 name = "pulse"
 version = "0.3.0"
-source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=c87b50aebfa088c1ad30c74819d4e9829f88b2e3#c87b50aebfa088c1ad30c74819d4e9829f88b2e3"
+source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=b0acd9e16c0249d61835a2d23735fbcbd8cbef64#b0acd9e16c0249d61835a2d23735fbcbd8cbef64"
 dependencies = [
  "bitflags",
  "pulse-ffi",
@@ -3879,7 +3878,7 @@
 [[package]]
 name = "pulse-ffi"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=c87b50aebfa088c1ad30c74819d4e9829f88b2e3#c87b50aebfa088c1ad30c74819d4e9829f88b2e3"
+source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=b0acd9e16c0249d61835a2d23735fbcbd8cbef64#b0acd9e16c0249d61835a2d23735fbcbd8cbef64"
 dependencies = [
  "libc",
 ]
diff -Nru thunderbird-91.3.2+build1/Cargo.toml thunderbird-91.4.0+build2/Cargo.toml
--- thunderbird-91.3.2+build1/Cargo.toml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/Cargo.toml	2021-12-09 11:59:35.000000000 +0000
@@ -109,3 +109,8 @@
 
 [patch.crates-io.prost-derive]
 path = "third_party/rust/prost-derive"
+
+# Pick upstream patch for GCC 11 on armhf linux.
+[patch.crates-io.cc]
+git = "https://github.com/alexcrichton/cc-rs/"
+rev = "b2f6b146b75299c444e05bbde50d03705c7c4b6e"
diff -Nru thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-command-controller.js thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-command-controller.js
--- thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-command-controller.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-command-controller.js	2021-12-09 12:01:04.000000000 +0000
@@ -953,37 +953,6 @@
   // Ensure the printing of this file will be detected by calPrintUtils.jsm.
   cal.print.ensureInitialized();
 
-  let printBrowser = document.getElementById("calendarPrintContent");
-  if (printBrowser.currentURI.spec == "about:blank") {
-    // The template page hasn't been loaded yet. Do that now.
-    await new Promise(resolve => {
-      // Store a strong reference to this progress listener.
-      printBrowser.progressListener = {
-        QueryInterface: ChromeUtils.generateQI([
-          "nsIWebProgressListener",
-          "nsISupportsWeakReference",
-        ]),
-
-        /** nsIWebProgressListener */
-        onStateChange(webProgress, request, stateFlags, status) {
-          if (
-            stateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
-            printBrowser.currentURI.spec != "about:blank"
-          ) {
-            printBrowser.webProgress.removeProgressListener(this);
-            delete printBrowser.progressListener;
-            resolve();
-          }
-        },
-      };
-
-      printBrowser.webProgress.addProgressListener(
-        printBrowser.progressListener,
-        Ci.nsIWebProgress.NOTIFY_STATE_ALL
-      );
-      MailE10SUtils.loadURI(printBrowser, "chrome://calendar/content/printing-template.html");
-    });
-  }
-
-  PrintUtils.startPrintWindow(printBrowser.browsingContext, {});
+  await PrintUtils.loadPrintBrowser("chrome://calendar/content/printing-template.html");
+  PrintUtils.startPrintWindow(PrintUtils.printBrowser.browsingContext, {});
 }
diff -Nru thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-event-column.js thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-event-column.js
--- thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-event-column.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-event-column.js	2021-12-09 12:01:04.000000000 +0000
@@ -47,6 +47,8 @@
           <calendar-event-box hidden="true"/>
         `)
       );
+      this.bgbox = this.querySelector(".multiday-column-bg-box");
+      this.topbox = this.querySelector(".multiday-column-top-box");
 
       this.addEventListener("dblclick", event => {
         if (event.button != 0) {
@@ -140,17 +142,19 @@
 
       this.mDayEndMin = 17 * 60;
 
-      // An array of objects that contain information about the events that are to be
-      // displayed. The contained fields are:
-      // - event:        The event that is to be displayed in a 'calendar-event-box'
-      // - layoutStart:  The 'start'-datetime object of the event in the timezone of the view
-      // - layoutEnd:    The 'end'-datetime object of the event in the timezone of the view.
-      // The 'layoutEnd' may be different from the real 'end' time of the
-      // event because it considers a certain minimum duration of the event
-      // that is basically dependent of the font-size of the event-box label.
-      this.mEventInfos = [];
-
-      this.mEventMap = null;
+      /**
+       * An internal collection of data for events.
+       * @typedef {Object} EventData
+       * @property {calItemBase} eventItem - The event item.
+       * @property {Element} element - The displayed event in this column.
+       * @property {boolean} selected - Whether the event is selected.
+       */
+      /**
+       * Event data for all the events displayed in this column.
+       * @type {Map<string, EventData} - A map from an event item's hashId to
+       *   its data.
+       */
+      this.eventDataMap = new Map();
 
       this.mCalendarView = null;
 
@@ -173,8 +177,6 @@
 
       this.mEventToEdit = null;
 
-      this.mSelectedItemIds = null;
-
       this.mSelected = false;
 
       this.mFgboxes = null;
@@ -183,12 +185,7 @@
 
       this.mDayOff = false;
 
-      // mEventInfos.
-      this.mSelectedChunks = [];
-
-      this.mEventInfos = [];
       this.mTimezone = cal.dtz.UTC;
-      this.mSelectedItemIds = {};
       this.initializeAttributeInheritance();
     }
 
@@ -231,9 +228,7 @@
 
       if (!cal.data.compareObjects(val.timezone, this.mTimezone)) {
         this.mTimezone = val.timezone;
-        if (!this.mLayoutBatchCount) {
-          this.recalculateStartEndMinutes();
-        }
+        this.relayout();
       }
     }
 
@@ -249,14 +244,6 @@
       return this.mCalendarView;
     }
 
-    get topbox() {
-      return this.querySelector(".multiday-column-top-box");
-    }
-
-    get bgbox() {
-      return this.querySelector(".multiday-column-bg-box");
-    }
-
     get fgboxes() {
       if (this.mFgboxes == null) {
         this.mFgboxes = {
@@ -286,39 +273,46 @@
       return this.mDayOff;
     }
 
-    selectOccurrence(occurrence) {
-      if (occurrence) {
-        this.mSelectedItemIds[occurrence.hashId] = true;
-        let chunk = this.findChunkForOccurrence(occurrence);
-        if (!chunk) {
-          return;
-        }
-        chunk.selected = true;
-        this.mSelectedChunks.push(chunk);
+    /**
+     * Set whether the calendar-event-box element for the given event item
+     * should be displayed as selected or unselected.
+     *
+     * @param {calItemBase} eventItem - The event item.
+     * @param {boolean} select - Whether to show the corresponding event element
+     *   as selected.
+     */
+    selectEvent(eventItem, select) {
+      let data = this.eventDataMap.get(eventItem.hashId);
+      if (!data) {
+        return;
       }
-    }
-
-    unselectOccurrence(occurrence) {
-      if (occurrence) {
-        delete this.mSelectedItemIds[occurrence.hashId];
-        let chunk = this.findChunkForOccurrence(occurrence);
-        if (!chunk) {
-          return;
-        }
-        chunk.selected = false;
-        let index = this.mSelectedChunks.indexOf(chunk);
-        this.mSelectedChunks.splice(index, 1);
+      data.selected = select;
+      if (data.element) {
+        // There is a small window between an event item being added and it
+        // actually having an element. If it doesn't have an element yet, it
+        // will be selected on its creation instead.
+        data.element.selected = select;
       }
     }
 
-    findChunkForOccurrence(occurrence) {
-      for (let chunk of this.mEventBoxes) {
-        if (chunk.occurrence.hashId == occurrence.hashId) {
-          return chunk;
-        }
-      }
+    /**
+     * Return the displayed calendar-event-box element for the given event item.
+     *
+     * @param {calItemBase} eventItem - The event item.
+     *
+     * @return {Element} - The corresponding element, or undefined if none.
+     */
+    findElementForEventItem(eventItem) {
+      return this.eventDataMap.get(eventItem.hashId)?.element;
+    }
 
-      return null;
+    /**
+     * Return all the event items that are displayed in this columns.
+     *
+     * @return {calItemBase[]} - An array of all the displayed event items.
+     */
+    getAllEventItems() {
+      return Array.from(this.eventDataMap.values(), data => data.eventItem);
     }
 
     startLayoutBatchChange() {
@@ -343,37 +337,6 @@
       return ret;
     }
 
-    internalDeleteEvent(occurrence) {
-      let itemIndex = -1;
-      let occ;
-      for (let i in this.mEventInfos) {
-        occ = this.mEventInfos[i].event;
-        if (occ.hashId == occurrence.hashId) {
-          itemIndex = i;
-          break;
-        }
-      }
-
-      if (itemIndex == -1) {
-        return false;
-      }
-      delete this.mSelectedItemIds[occ.hashId];
-      this.mSelectedChunks = this.mSelectedChunks.filter(item => {
-        return !item.occurrence || item.occurrence.hashId != occurrence.hashId;
-      });
-      this.mEventInfos.splice(itemIndex, 1);
-      return true;
-    }
-
-    recalculateStartEndMinutes() {
-      for (let chunk of this.mEventInfos) {
-        let mins = this.getStartEndMinutesForOccurrence(chunk.event);
-        chunk.startMinute = mins.start;
-        chunk.endMinute = mins.end;
-      }
-
-      this.relayout();
-    }
     /**
      * This function returns the start and end minutes of the occurrence
      * part in the day of this column, moreover, the real start and end
@@ -430,54 +393,73 @@
       };
     }
 
-    createChunk(occurrence) {
-      let mins = this.getStartEndMinutesForOccurrence(occurrence);
-
-      let chunk = {
-        startMinute: mins.start,
-        endMinute: mins.end,
-        event: occurrence,
-      };
-      return chunk;
-    }
+    /**
+     * Create or update a displayed calendar-event-box element for the given
+     * event item.
+     *
+     * @param {calItemBase} eventItem - The event item to create or update an
+     *   element for.
+     */
+    addEvent(eventItem) {
+      let eventData = this.eventDataMap.get(eventItem.hashId);
+      if (!eventData) {
+        // New event with no pre-existing data.
+        eventData = { selected: false };
+        this.eventDataMap.set(eventItem.hashId, eventData);
+      }
 
-    addEvent(occurrence) {
-      this.internalDeleteEvent(occurrence);
+      // We set the eventItem property here, the rest will be updated in
+      // relayout().
+      // NOTE: If we already have an event with the given hashId, then the
+      // eventData.element will still refer to the previous display of the event
+      // until we call relayout().
+      eventData.eventItem = eventItem;
 
-      let chunk = this.createChunk(occurrence);
-      this.mEventInfos.push(chunk);
       if (this.mEventMapTimeout) {
         clearTimeout(this.mEventMapTimeout);
       }
 
       if (this.mCreatedNewEvent) {
-        this.mEventToEdit = occurrence;
+        this.mEventToEdit = eventItem;
       }
 
       this.mEventMapTimeout = setTimeout(() => this.relayout(), 5);
     }
 
-    deleteEvent(occurrence) {
-      if (this.internalDeleteEvent(occurrence)) {
+    /**
+     * Remove the displayed calendar-event-box element for the given event item
+     * from this column
+     *
+     * @param {calItemBase} eventItem - The event item to remove the element of.
+     */
+    deleteEvent(eventItem) {
+      if (this.eventDataMap.delete(eventItem.hashId)) {
         this.relayout();
       }
     }
 
-    clear() {
-      while (this.bgbox && this.bgbox.hasChildNodes()) {
+    _clearElements() {
+      while (this.bgbox.hasChildNodes()) {
         this.bgbox.lastChild.remove();
       }
-      while (this.topbox && this.topbox.hasChildNodes()) {
+      while (this.topbox.hasChildNodes()) {
         this.topbox.lastChild.remove();
       }
-      this.mSelectedChunks = [];
+    }
+
+    /**
+     * Clear the column of all events.
+     */
+    clear() {
+      this._clearElements();
+      this.eventDataMap.clear();
     }
 
     relayout() {
       if (this.mLayoutBatchCount > 0) {
         return;
       }
-      this.clear();
+      this._clearElements();
 
       let orient = this.getAttribute("orient");
       this.bgbox.setAttribute("orient", orient);
@@ -542,10 +524,9 @@
       // overlapping event areas).
       this.topbox.setAttribute("orient", otherOrient);
 
-      this.mEventMap = this.computeEventMap();
-      this.mEventBoxes = [];
+      let eventMap = this.computeEventMap();
 
-      if (!this.mEventMap.length) {
+      if (!eventMap) {
         return;
       }
 
@@ -560,8 +541,8 @@
       let columnCount = 1;
       let spanTotal = 0;
 
-      for (let layer of this.mEventMap) {
-        // The event-map (this.mEventMap) contains an array of layers.
+      for (let layer of eventMap) {
+        // The eventMap contains an array of layers.
         // For each layer we create a box below the stack just created above.
         // So each different layer lives in a box that's contained in the stack.
         let xulColumn = document.createXULElement("box");
@@ -639,12 +620,20 @@
               chunkBox.calendarView = this.calendarView;
               chunkBox.occurrence = chunk.event;
               chunkBox.parentColumn = this;
-              if (chunk.event.hashId in this.mSelectedItemIds) {
-                chunkBox.selected = true;
-                this.mSelectedChunks.push(chunkBox);
-              }
-
-              this.mEventBoxes.push(chunkBox);
+              let eventData = this.eventDataMap.get(chunk.event.hashId);
+              // An event item can technically be 'selected' between a call to
+              // addEvent and this method (because of the setTimeout). E.g.
+              // clicking the event in the unifinder tree will select the item
+              // through selectEvent. If the element wasn't yet created in that
+              // method, we set the selected status here as well.
+              //
+              // Similarly, if an event has the same hashId, we maintain its
+              // selection.
+              // NOTE: In this latter case we are relying on the fact that
+              // eventData.element.selected is never out of sync with
+              // eventData.selected.
+              chunkBox.selected = eventData.selected;
+              eventData.element = chunkBox;
 
               if (this.mEventToEdit && chunkBox.occurrence.hashId == this.mEventToEdit.hashId) {
                 boxToEdit = chunkBox;
@@ -708,6 +697,10 @@
       let blobs = [];
       let currentBlob = [];
 
+      if (!this.eventDataMap.size) {
+        return null;
+      }
+
       function sortByStart(aEventInfo, bEventInfo) {
         // If you pass in tasks without both entry and due dates, I will
         // kill you.
@@ -719,23 +712,30 @@
         }
         return startComparison;
       }
-      this.mEventInfos.forEach(aEventInfo => {
-        let item = aEventInfo.event.clone();
+
+      // An ordered list of data for each event we want to show. The contained
+      // fields are:
+      // - event:       The event that is to be displayed.
+      // - layoutStart: The displayed 'start'-datetime object of the event.
+      // - layoutEnd:   The displayed 'end'-datetime object of the event.
+      let eventList = Array.from(this.eventDataMap.values(), eventData => {
+        let item = eventData.eventItem;
         let start = item.startDate || item.entryDate || item.dueDate;
+        // Make sure the displayed start time is relative to the view's
+        // timezone.
         start = start.getInTimezone(this.mTimezone);
-        aEventInfo.layoutStart = start;
         let end = item.endDate || item.dueDate || item.entryDate;
         end = end.getInTimezone(this.mTimezone);
-        let secEnd = start.clone();
-        secEnd.addDuration(this.mMinDuration);
-        if (secEnd.nativeTime > end.nativeTime) {
-          aEventInfo.layoutEnd = secEnd;
-        } else {
-          aEventInfo.layoutEnd = end;
+        // Make sure the event has a minimum *displayed* end time to ensure the
+        // event has enough duration to be visible.
+        let minEnd = start.clone();
+        minEnd.addDuration(this.mMinDuration);
+        if (minEnd.nativeTime > end.nativeTime) {
+          end = minEnd;
         }
-        return aEventInfo;
+        return { event: item, layoutStart: start, layoutEnd: end };
       });
-      this.mEventInfos.sort(sortByStart);
+      eventList.sort(sortByStart);
 
       // The end time of the last ending event in the entire blob.
       let latestItemEnd;
@@ -752,12 +752,7 @@
       //         width to make room for the item.
       // Step 3: Give up and create a new column for the item.
       // (The steps are explained in more detail as we come to them).
-      for (let i in this.mEventInfos) {
-        let curItemInfo = {
-          event: this.mEventInfos[i].event,
-          layoutStart: this.mEventInfos[i].layoutStart,
-          layoutEnd: this.mEventInfos[i].layoutEnd,
-        };
+      for (let curItemInfo of eventList) {
         if (!latestItemEnd) {
           latestItemEnd = curItemInfo.layoutEnd;
         }
@@ -1222,11 +1217,11 @@
       let scrollbox = currentView().scrollbox;
       let boundingRect = scrollbox.getBoundingClientRect();
       if (orient == "vertical") {
-        diffStart = event.clientY - boundingRect.y;
-        diffEnd = boundingRect.y + boundingRect.height - event.clientY;
+        diffStart = Math.max(event.clientY - boundingRect.y, 0);
+        diffEnd = Math.max(boundingRect.y + boundingRect.height - event.clientY, 0);
       } else {
-        diffStart = event.clientX - boundingRect.x;
-        diffEnd = boundingRect.x + boundingRect.width - event.clientX;
+        diffStart = Math.max(event.clientX - boundingRect.x, 0);
+        diffEnd = Math.max(boundingRect.x + boundingRect.width - event.clientX, 0);
       }
 
       const SCROLLZONE = 55; // Size (pixels) of the top/bottom view where the scroll starts.
@@ -1234,7 +1229,7 @@
       const MINTIMEOUT = 30; // two consecutive scrolls.
       const SCROLLBYHOUR = 0.33; // Part of hour to move for each scroll.
       let insideScrollZone = 0;
-      let pxPerHr = event.target.mPixPerMin * 60;
+      let pxPerHr = this.mPixPerMin * 60;
       let scrollBy = Math.floor(pxPerHr * SCROLLBYHOUR);
       if (diffStart < SCROLLZONE) {
         insideScrollZone = SCROLLZONE - diffStart;
@@ -1272,10 +1267,11 @@
       // drag session, no sweeping.
       let boundingRect = currentView().scrollbox.getBoundingClientRect();
       if (
-        event.clientX < boundingRect.x ||
-        event.clientX > boundingRect.x + boundingRect.width ||
-        event.clientY < boundingRect.y ||
-        event.clientY > boundingRect.y + boundingRect.height
+        dragState.dragType == "move" &&
+        (event.clientX < boundingRect.x ||
+          event.clientX > boundingRect.x + boundingRect.width ||
+          event.clientY < boundingRect.y ||
+          event.clientY > boundingRect.y + boundingRect.height)
       ) {
         // Remove the drag state.
         for (
@@ -1306,6 +1302,7 @@
         if (!selectedItems.some(aItem => aItem.hashId == item.hashId)) {
           col.calendarView.setSelectedItems([event.ctrlKey ? item.parentItem : item]);
         }
+        // NOTE: Dragging to the allday header will fail (bug 1675056).
         invokeEventDragSession(dragState.dragOccurrence, col);
         return;
       }
diff -Nru thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-multiday-view.js thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-multiday-view.js
--- thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-multiday-view.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-multiday-view.js	2021-12-09 12:01:04.000000000 +0000
@@ -328,22 +328,6 @@
       return this.mParentColumn;
     }
 
-    get startMinute() {
-      if (!this.mOccurrence) {
-        return 0;
-      }
-      let startDate = this.mOccurrence.startDate || this.mOccurrence.entryDate;
-      return startDate.hour * 60 + startDate.minute;
-    }
-
-    get endMinute() {
-      if (!this.mOccurrence) {
-        return 0;
-      }
-      let endDate = this.mOccurrence.endDate || this.mOccurrence.dueDate;
-      return endDate.hour * 60 + endDate.minute;
-    }
-
     getOptimalMinSize() {
       let label = this.querySelector(".event-name-label");
       if (this.getAttribute("orient") == "vertical") {
@@ -1110,7 +1094,7 @@
       // Make sure the flashing attribute is set or reset on all visible boxes.
       const columns = this.findColumnsForItem(item);
       for (const col of columns) {
-        const colBox = col.column.findChunkForOccurrence(item);
+        const colBox = col.column.findElementForEventItem(item);
         const headerBox = col.header.findBoxForItem(item);
 
         if (colBox) {
@@ -1237,7 +1221,7 @@
             const cols = this.findColumnsForItem(occ);
             for (const col of cols) {
               col.header.unselectOccurrence(occ);
-              col.column.unselectOccurrence(occ);
+              col.column.selectEvent(occ, false);
             }
           }
         }
@@ -1255,7 +1239,7 @@
             if (start.isDate) {
               col.header.selectOccurrence(occ);
             } else {
-              col.column.selectOccurrence(occ);
+              col.column.selectEvent(occ, true);
             }
           }
         }
@@ -1535,7 +1519,7 @@
         if (counter < dayboxkids.length) {
           dayEventsBox = dayboxkids[counter];
           dayEventsBox.removeAttribute("relation");
-          dayEventsBox.mEventInfos = [];
+          dayEventsBox.clear();
         } else {
           dayEventsBox = document.createXULElement("calendar-event-column");
           dayEventsBox.setAttribute("flex", "1");
@@ -1918,7 +1902,7 @@
         // Get all-day events in column header and events within the column.
         const colEvents = col.header.mItemBoxes
           .map(box => box.occurrence)
-          .concat(col.column.mEventInfos.map(info => info.event));
+          .concat(col.column.getAllEventItems());
 
         for (const event of colEvents) {
           if (event.calendar.id == calendar.id) {
diff -Nru thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-print.js thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-print.js
--- thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-print.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-print.js	2021-12-09 12:01:04.000000000 +0000
@@ -42,8 +42,9 @@
     otherForm.hidden = true;
     form.hidden = false;
   });
-  let cancelButton = otherForm.querySelector("#cancel-button");
-  cancelButton.parentNode.replaceChild(backButton, cancelButton);
+  let backButtonContainer = form.querySelector("#back-button-container");
+  let printButtonContainer = otherForm.querySelector("#button-container");
+  printButtonContainer.parentNode.insertBefore(backButtonContainer, printButtonContainer);
 
   let eventsCheckbox = form.querySelector("input#events");
   let tasksCheckbox = form.querySelector("input#tasks");
diff -Nru thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-tab-panels.inc.xhtml thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-tab-panels.inc.xhtml
--- thunderbird-91.3.2+build1/comm/calendar/base/content/calendar-tab-panels.inc.xhtml	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/calendar/base/content/calendar-tab-panels.inc.xhtml	2021-12-09 12:01:04.000000000 +0000
@@ -634,10 +634,6 @@
     </hbox>
   </hbox>
 
-  <!-- Hidden browser so that we have something to print from. When printing,
-       printing-template.html is loaded here. -->
-  <browser id="calendarPrintContent" type="content" remote="true" hidden="true"/>
-
   <!-- This form is injected into the printing options page (by calendar-print.js)
        if we are printing the calendar. The script for the form is also in
        calendar-print.js and CSS in calendar-print.css. -->
@@ -696,8 +692,8 @@
 
       <hr />
 
-      <footer class="footer-container" id="print-footer" role="none">
-        <section id="button-container" class="section-block">
+      <footer class="footer-container" role="none">
+        <section id="next-button-container" class="section-block">
           <button id="next-button"
                   class="primary"
                   type="submit"
@@ -712,11 +708,13 @@
         </section>
       </footer>
 
-      <!-- This button will replace the original cancel button. -->
-      <button id="back-button"
-              type="button"
-              autocomplete="off"
-              data-l10n-id="calendar-print-back-button"></button>
+      <!-- This section will be added to the footer of the original form. -->
+      <section id="back-button-container" class="section-block">
+        <button id="back-button"
+                type="button"
+                autocomplete="off"
+                data-l10n-id="calendar-print-back-button"></button>
+      </section>
     </form>
   </template>
 </vbox>
diff -Nru thunderbird-91.3.2+build1/comm/calendar/base/themes/common/calendar-print.css thunderbird-91.4.0+build2/comm/calendar/base/themes/common/calendar-print.css
--- thunderbird-91.3.2+build1/comm/calendar/base/themes/common/calendar-print.css	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/calendar/base/themes/common/calendar-print.css	2021-12-09 12:01:04.000000000 +0000
@@ -43,3 +43,24 @@
   padding: 0;
   width: 100%;
 }
+
+#next-button-container,
+#back-button-container {
+  display: flex;
+  justify-content: center;
+  gap: 8px;
+}
+
+#next-button-container > button,
+#back-button-container > button {
+  flex: 1 1 auto;
+  margin: 0;
+}
+
+#back-button-container {
+  margin-bottom: 8px;
+}
+
+#button-container {
+  margin-top: 8px;
+}
diff -Nru thunderbird-91.3.2+build1/comm/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css thunderbird-91.4.0+build2/comm/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
--- thunderbird-91.3.2+build1/comm/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css	2021-12-09 12:01:04.000000000 +0000
@@ -3,8 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #calendar-invitations-dialog {
-  min-width: 500px;
-  min-height: 273px;
+  width: 500px;
+  height: 273px;
+}
+
+#dialog-box {
+  overflow: auto;
 }
 
 .calendar-invitations-updating-icon {
diff -Nru thunderbird-91.3.2+build1/comm/.gecko_rev.yml thunderbird-91.4.0+build2/comm/.gecko_rev.yml
--- thunderbird-91.3.2+build1/comm/.gecko_rev.yml	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/.gecko_rev.yml	2021-12-09 12:01:04.000000000 +0000
@@ -2,7 +2,7 @@
 GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
 GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-esr91
 GECKO_HEAD_REF: default
-GECKO_HEAD_REV: 133cb250fa145cba5cc7ed95f75bb3c1b02e6916
+GECKO_HEAD_REV: b6173cd78c9d522f2e3257c408933db4f9cedc13
 
 ### For comm-central
 # GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
diff -Nru thunderbird-91.3.2+build1/comm/mail/actors/MailtoChild.jsm thunderbird-91.4.0+build2/comm/mail/actors/MailtoChild.jsm
--- thunderbird-91.3.2+build1/comm/mail/actors/MailtoChild.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/actors/MailtoChild.jsm	2021-12-09 12:01:04.000000000 +0000
@@ -0,0 +1,17 @@
+/* vim: set ts=2 sw=2 et tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const EXPORTED_SYMBOLS = ["MailtoChild"];
+
+class MailtoChild extends JSWindowActorChild {
+  handleEvent(event) {
+    if (event.button == 0 && event.target.href?.startsWith("mailto:")) {
+      this.sendAsyncMessage("mailtoLink", event.target.href);
+      event.preventDefault();
+    }
+  }
+}
diff -Nru thunderbird-91.3.2+build1/comm/mail/actors/MailtoParent.jsm thunderbird-91.4.0+build2/comm/mail/actors/MailtoParent.jsm
--- thunderbird-91.3.2+build1/comm/mail/actors/MailtoParent.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/actors/MailtoParent.jsm	2021-12-09 12:01:04.000000000 +0000
@@ -0,0 +1,34 @@
+/* vim: set ts=2 sw=2 et tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const EXPORTED_SYMBOLS = ["MailtoParent"];
+
+const { MailServices } = ChromeUtils.import(
+  "resource:///modules/MailServices.jsm"
+);
+const { MailUtils } = ChromeUtils.import("resource:///modules/MailUtils.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+class MailtoParent extends JSWindowActorParent {
+  receiveMessage({ data, target }) {
+    let identity = null;
+
+    // If the document with the link is a message, try to get the identity
+    // from the message and use it when composing.
+    let documentURI = target.windowContext.documentURI;
+    if (documentURI instanceof Ci.nsIMsgMessageUrl) {
+      documentURI.QueryInterface(Ci.nsIMsgMessageUrl);
+      [identity] = MailUtils.getIdentityForHeader(documentURI.messageHeader);
+    }
+
+    MailServices.compose.OpenComposeWindowWithURI(
+      undefined,
+      Services.io.newURI(data),
+      identity
+    );
+  }
+}
diff -Nru thunderbird-91.3.2+build1/comm/mail/actors/moz.build thunderbird-91.4.0+build2/comm/mail/actors/moz.build
--- thunderbird-91.3.2+build1/comm/mail/actors/moz.build	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/actors/moz.build	2021-12-09 12:01:04.000000000 +0000
@@ -14,6 +14,8 @@
     "LinkClickHandlerChild.jsm",
     "LinkClickHandlerParent.jsm",
     "LinkHandlerParent.jsm",
+    "MailtoChild.jsm",
+    "MailtoParent.jsm",
     "PromptParent.jsm",
     "VCardChild.jsm",
     "VCardParent.jsm",
diff -Nru thunderbird-91.3.2+build1/comm/mail/base/content/mail3PaneWindowCommands.js thunderbird-91.4.0+build2/comm/mail/base/content/mail3PaneWindowCommands.js
--- thunderbird-91.3.2+build1/comm/mail/base/content/mail3PaneWindowCommands.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/base/content/mail3PaneWindowCommands.js	2021-12-09 12:01:04.000000000 +0000
@@ -417,14 +417,7 @@
         }
         return false;
       case "cmd_print":
-        // We can't print messages unless they're being displayed, so enable
-        // printing only if exactly one message is selected and it is the
-        // message being displayed.
-        return (
-          gMessageDisplay.visible &&
-          gFolderDisplay.selectedCount == 1 &&
-          gFolderDisplay.selectedMessage == gMessageDisplay.displayedMessage
-        );
+        return gFolderDisplay.selectedCount >= 1;
       case "cmd_newMessage":
         return CanComposeMessages();
       case "cmd_viewAllHeader":
@@ -913,8 +906,7 @@
         );
         return;
       case "cmd_print":
-        let messagePaneBrowser = document.getElementById("messagepane");
-        PrintUtils.startPrintWindow(messagePaneBrowser.browsingContext, {});
+        PrintSelectedMessages();
         return;
       case "cmd_saveAsFile":
         MsgSaveAsFile();
@@ -1534,3 +1526,42 @@
 
   return true;
 }
+
+/** Prints the messages selected in the thread pane. */
+async function PrintSelectedMessages() {
+  if (gFolderDisplay.selectedCount == 1) {
+    if (
+      gMessageDisplay.visible &&
+      gFolderDisplay.selectedMessage == gMessageDisplay.displayedMessage
+    ) {
+      // Use the already displayed message and print preview UI if we can.
+      let messagePaneBrowser = document.getElementById("messagepane");
+      PrintUtils.startPrintWindow(messagePaneBrowser.browsingContext, {});
+    } else {
+      // Load the only message in a hidden browser, then use the print preview UI.
+      let uri = gFolderDisplay.selectedMessageUris[0];
+      let messageService = messenger.messageServiceFromURI(uri);
+      await PrintUtils.loadPrintBrowser(messageService.getUrlForUri(uri).spec);
+      PrintUtils.startPrintWindow(PrintUtils.printBrowser.browsingContext, {});
+    }
+
+    return;
+  }
+
+  // Multiple messages. Get the printer settings, then load the messages into
+  // a hidden browser and print them one at a time.
+  let ps = PrintUtils.getPrintSettings();
+  Cc["@mozilla.org/embedcomp/printingprompt-service;1"]
+    .getService(Ci.nsIPrintingPromptService)
+    .showPrintDialog(window, ps);
+  if (ps.isCancelled) {
+    return;
+  }
+  ps.printSilent = true;
+
+  for (let uri of gFolderDisplay.selectedMessageUris) {
+    let messageService = messenger.messageServiceFromURI(uri);
+    await PrintUtils.loadPrintBrowser(messageService.getUrlForUri(uri).spec);
+    await PrintUtils.printBrowser.browsingContext.print(ps);
+  }
+}
diff -Nru thunderbird-91.3.2+build1/comm/mail/base/content/messenger.xhtml thunderbird-91.4.0+build2/comm/mail/base/content/messenger.xhtml
--- thunderbird-91.3.2+build1/comm/mail/base/content/messenger.xhtml	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/base/content/messenger.xhtml	2021-12-09 12:01:04.000000000 +0000
@@ -801,6 +801,8 @@
 #include ../../../calendar/base/content/item-editing/calendar-item-panel.inc.xhtml
       </tabpanels>
      </tabbox>
+      <!-- Hidden browser used for printing documents without displaying them. -->
+      <browser id="hiddenPrintContent" type="content" remote="true" hidden="true"/>
     </tabmail>
     <vbox id="contentTab" collapsed="true">
       <vbox flex="1" class="contentTabInstance">
diff -Nru thunderbird-91.3.2+build1/comm/mail/base/content/printUtils.js thunderbird-91.4.0+build2/comm/mail/base/content/printUtils.js
--- thunderbird-91.3.2+build1/comm/mail/base/content/printUtils.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/base/content/printUtils.js	2021-12-09 12:01:04.000000000 +0000
@@ -8,6 +8,7 @@
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
+  MailE10SUtils: "resource:///modules/MailE10SUtils.jsm",
   SubDialogManager: "resource://gre/modules/SubDialog.jsm",
 });
 
@@ -95,6 +96,45 @@
 
     return b;
   };
+
+  scope.PrintUtils.__defineGetter__("printBrowser", () =>
+    document.getElementById("hiddenPrintContent")
+  );
+  scope.PrintUtils.loadPrintBrowser = async function(url) {
+    let printBrowser = this.printBrowser;
+    if (printBrowser.currentURI.spec == url) {
+      return;
+    }
+
+    // The template page hasn't been loaded yet. Do that now.
+    await new Promise(resolve => {
+      // Store a strong reference to this progress listener.
+      printBrowser.progressListener = {
+        QueryInterface: ChromeUtils.generateQI([
+          "nsIWebProgressListener",
+          "nsISupportsWeakReference",
+        ]),
+
+        /** nsIWebProgressListener */
+        onStateChange(webProgress, request, stateFlags, status) {
+          if (
+            stateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
+            printBrowser.currentURI.spec != "about:blank"
+          ) {
+            printBrowser.webProgress.removeProgressListener(this);
+            delete printBrowser.progressListener;
+            resolve();
+          }
+        },
+      };
+
+      printBrowser.webProgress.addProgressListener(
+        printBrowser.progressListener,
+        Ci.nsIWebProgress.NOTIFY_STATE_ALL
+      );
+      MailE10SUtils.loadURI(printBrowser, url);
+    });
+  };
   return scope.PrintUtils;
 });
 
diff -Nru thunderbird-91.3.2+build1/comm/mail/base/test/browser/browser.ini thunderbird-91.4.0+build2/comm/mail/base/test/browser/browser.ini
--- thunderbird-91.3.2+build1/comm/mail/base/test/browser/browser.ini	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/base/test/browser/browser.ini	2021-12-09 12:01:04.000000000 +0000
@@ -12,6 +12,7 @@
 
 [browser_formPickers.js]
 tags = webextensions
+[browser_interactionTelemetry.js]
 [browser_linkHandler.js]
 [browser_mailContext.js]
 tags = contextmenu webextensions
diff -Nru thunderbird-91.3.2+build1/comm/mail/base/test/browser/browser_interactionTelemetry.js thunderbird-91.4.0+build2/comm/mail/base/test/browser/browser_interactionTelemetry.js
--- thunderbird-91.3.2+build1/comm/mail/base/test/browser/browser_interactionTelemetry.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/base/test/browser/browser_interactionTelemetry.js	2021-12-09 12:01:04.000000000 +0000
@@ -0,0 +1,67 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const AREAS = ["keyboard", "calendar", "chat", "message_display", "toolbox"];
+
+// Checks that the correct number of clicks are registered against the correct
+// keys in the scalars.
+function assertInteractionScalars(expectedAreas) {
+  let processScalars =
+    Services.telemetry.getSnapshotForKeyedScalars("main", true)?.parent ?? {};
+
+  for (let source of AREAS) {
+    let scalars = processScalars?.[`tb.ui.interaction.${source}`] ?? {};
+
+    let expected = expectedAreas[source] ?? {};
+
+    let expectedKeys = new Set(
+      Object.keys(scalars).concat(Object.keys(expected))
+    );
+    for (let key of expectedKeys) {
+      Assert.equal(
+        scalars[key],
+        expected[key],
+        `Expected to see the correct value for ${key} in ${source}.`
+      );
+    }
+  }
+}
+
+add_task(async function() {
+  Services.telemetry.clearScalars();
+
+  EventUtils.synthesizeMouseAtCenter(
+    document.getElementById("calendar-tab-button"),
+    {},
+    window
+  );
+
+  let calendarWindowPromise = BrowserTestUtils.promiseAlertDialog(
+    "cancel",
+    "chrome://calendar/content/calendar-creation.xhtml"
+  );
+  EventUtils.synthesizeMouseAtCenter(
+    document.querySelector("#calendar-list-pane .calendar-list-create"),
+    {},
+    window
+  );
+  await calendarWindowPromise;
+
+  EventUtils.synthesizeMouseAtCenter(
+    document.querySelector("#tabmail-tabs tab:nth-child(2) .tab-close-button"),
+    {},
+    window
+  );
+
+  assertInteractionScalars({
+    calendar: {
+      "calendar-new-calendar-command": 1,
+    },
+    toolbox: {
+      "calendar-tab-button": 1,
+      "tab-close-button": 1,
+    },
+  });
+});
diff -Nru thunderbird-91.3.2+build1/comm/mail/components/accountcreation/AccountCreationUtils.jsm thunderbird-91.4.0+build2/comm/mail/components/accountcreation/AccountCreationUtils.jsm
--- thunderbird-91.3.2+build1/comm/mail/components/accountcreation/AccountCreationUtils.jsm	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/components/accountcreation/AccountCreationUtils.jsm	2021-12-09 12:01:04.000000000 +0000
@@ -565,6 +565,18 @@
 };
 
 /**
+ * Checks whether we already have an addon but it is disabled.
+ * @returns {boolean} is already installed but disabled
+ */
+AddonInstaller.prototype.isDisabled = async function() {
+  if (!this._id) {
+    return false;
+  }
+  let addon = await AddonManager.getAddonByID(this._id);
+  return addon && !addon.isActive;
+};
+
+/**
  * Downloads and installs the addon.
  * The downloaded XPI will be checked using prompt().
  */
diff -Nru thunderbird-91.3.2+build1/comm/mail/components/accountcreation/content/accountSetup.js thunderbird-91.4.0+build2/comm/mail/components/accountcreation/content/accountSetup.js
--- thunderbird-91.3.2+build1/comm/mail/components/accountcreation/content/accountSetup.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/components/accountcreation/content/accountSetup.js	2021-12-09 12:01:04.000000000 +0000
@@ -18,6 +18,7 @@
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AccountConfig: "resource:///modules/accountcreation/AccountConfig.jsm",
+  AddonManager: "resource://gre/modules/AddonManager.jsm",
   cal: "resource:///modules/calendar/calUtils.jsm",
   CardDAVUtils: "resource:///modules/CardDAVUtils.jsm",
   CreateInBackend: "resource:///modules/accountcreation/CreateInBackend.jsm",
@@ -1082,8 +1083,11 @@
       { count: protocols.length }
     );
 
-    // Thunderbird can't handle Exchange server independentely, therefore we
-    // need to prompt the user with the isntallation of the Owl add-on.
+    // Ensure by default the "Done" button is enabled.
+    document.getElementById("createButton").disabled = false;
+
+    // Thunderbird can't handle Exchange server independently, therefore we
+    // need to prompt the user with the installation of the Owl add-on.
     if (config.incoming.type == "exchange") {
       let addonsInstallRows = document.getElementById("resultAddonInstallRows");
 
@@ -1104,6 +1108,7 @@
           for (let addon of config.addons) {
             let installer = new AddonInstaller(addon);
             addon.isInstalled = await installer.isInstalled();
+            addon.isDisabled = await installer.isDisabled();
           }
 
           let addonInfoArea = document.getElementById("installAddonInfo");
@@ -1116,6 +1121,9 @@
             addonInfoArea.hidden = true;
             return;
           }
+          // Disable "Done" until add-on is installed, or some other protocol
+          // is selected.
+          document.getElementById("createButton").disabled = true;
 
           addonInfoArea.hidden = false;
 
@@ -1154,6 +1162,32 @@
             button.addEventListener("click", () => {
               gAccountSetup.addonInstall(addon);
             });
+            if (addon.isDisabled) {
+              // If the add on is disabled by user, or due to incompatibility
+              // - disable install (it won't help, it's already installed)
+              // - link to the addons manager instead (so they can fix it)
+              button.disabled = true;
+              link.setAttribute("href", "about:addons");
+              link.setAttribute("target", "_blank");
+
+              // Trigger an add-on update check. If an update is available,
+              // enable the install button to (re)install.
+              AddonManager.getAddonByID(addon.id).then(a => {
+                if (!a) {
+                  return;
+                }
+                let listener = {
+                  onUpdateAvailable(addon, install) {
+                    button.disabled = false;
+                  },
+                  onNoUpdateAvailable() {},
+                };
+                a.findUpdates(
+                  listener,
+                  AddonManager.UPDATE_WHEN_USER_REQUESTED
+                );
+              });
+            }
 
             container.appendChild(img);
             container.appendChild(link);
@@ -1161,7 +1195,6 @@
 
             addonsInstallRows.appendChild(container);
           }
-          document.getElementById("createButton").disabled = true;
         } catch (e) {
           this.showErrorNotification(e, true);
         }
@@ -1331,9 +1364,15 @@
       this.stopLoadingState("account-setup-success-addon");
       createButton.disabled = false;
 
-      this._currentConfig.incoming.type = addon.useType.addonAccountType;
-      await this.validateAndFinish();
+      this._currentConfig.incoming.addonAccountType =
+        addon.useType.addonAccountType;
+      // Remove the note about having to install an add-on.
+      let rows = document.getElementById("resultAddonInstallRows");
+      while (rows.lastChild) {
+        rows.lastChild.remove();
+      }
     } catch (e) {
+      Cu.reportError(e);
       this.showErrorNotification(e, true);
       addonInfoArea.hidden = false;
     }
@@ -1989,48 +2028,51 @@
   },
 
   async onCreate() {
-    try {
-      gAccountSetupLogger.debug("Create button clicked");
+    gAccountSetupLogger.debug("Create button clicked");
 
-      let configFilledIn = this.getConcreteConfig();
-      let self = this;
-      // If the dialog is not needed, it will go straight to OK callback
-      gSecurityWarningDialog.open(
-        this._currentConfig,
-        configFilledIn,
-        true,
-        async function() {
-          // on OK
-          await self.validateAndFinish(configFilledIn);
-        },
-        function() {
-          // on cancel, do nothing
-        }
-      );
-    } catch (ex) {
-      let errorMessage = await document.l10n.formatValue(
-        "account-setup-creation-error-title"
-      );
-      errorMessage += `. Ex=${ex}. Stack=${ex.stack}`;
-      gAccountSetupLogger.error(errorMessage);
+    let configFilledIn = this.getConcreteConfig();
+    let self = this;
+    // If the dialog is not needed, it will go straight to OK callback
+    gSecurityWarningDialog.open(
+      this._currentConfig,
+      configFilledIn,
+      true,
+      async function() {
+        // on OK
+        await self.validateAndFinish(configFilledIn).catch(async ex => {
+          let errorMessage = await document.l10n.formatValue(
+            "account-setup-creation-error-title"
+          );
+          gAccountSetupLogger.error(errorMessage + ". " + ex);
 
-      this.clearNotifications();
-      let notification = this.notificationBox.appendNotification(
-        errorMessage,
-        "accountSetupError",
-        null,
-        this.notificationBox.PRIORITY_CRITICAL_HIGH,
-        null
-      );
+          self.clearNotifications();
+          let notification = self.notificationBox.appendNotification(
+            errorMessage,
+            "accountSetupError",
+            null,
+            this.notificationBox.PRIORITY_CRITICAL_HIGH,
+            null
+          );
 
-      // Hide the close button to prevent dismissing the notification.
-      notification.removeAttribute("dismissable");
-    }
+          // Hide the close button to prevent dismissing the notification.
+          notification.removeAttribute("dismissable");
+        });
+      },
+      function() {
+        // on cancel, do nothing
+      }
+    );
   },
 
   // called by onCreate()
   async validateAndFinish(configFilled) {
     let configFilledIn = configFilled || this.getConcreteConfig();
+    if (
+      configFilledIn.incoming.type == "exchange" &&
+      "addonAccountType" in configFilledIn.incoming
+    ) {
+      configFilledIn.incoming.type = configFilledIn.incoming.addonAccountType;
+    }
 
     if (CreateInBackend.checkIncomingServerAlreadyExists(configFilledIn)) {
       let [title, description] = await document.l10n.formatValues([
@@ -2111,6 +2153,7 @@
         );
       },
       function(e) {
+        self.stopLoadingState("account-setup-checking-password");
         // failed
         // Could be a wrong password, but there are 1000 other
         // reasons why this failed. Only the backend knows.
diff -Nru thunderbird-91.3.2+build1/comm/mail/components/addrbook/content/aboutAddressBook.js thunderbird-91.4.0+build2/comm/mail/components/addrbook/content/aboutAddressBook.js
--- thunderbird-91.3.2+build1/comm/mail/components/addrbook/content/aboutAddressBook.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/components/addrbook/content/aboutAddressBook.js	2021-12-09 12:01:04.000000000 +0000
@@ -1461,11 +1461,6 @@
 // Printing
 
 var printHandler = {
-  QueryInterface: ChromeUtils.generateQI([
-    "nsIWebProgressListener",
-    "nsISupportsWeakReference",
-  ]),
-
   printDirectory(directory) {
     let title = directory ? directory.dirName : document.title;
 
@@ -1525,37 +1520,12 @@
     );
   },
 
-  _printURL(url) {
-    let stack = window.browsingContext.topFrameElement.parentNode;
-    this._browser = stack.querySelector("browser.aboutAddressBookPrint");
-
-    if (!this._browser) {
-      this._browser = stack.ownerDocument.createXULElement("browser");
-      this._browser.classList.add("aboutAddressBookPrint");
-      this._browser.setAttribute("type", "content");
-      this._browser.setAttribute("hidden", "true");
-      this._browser.setAttribute("remote", "true");
-
-      stack.appendChild(this._browser);
-    }
-
-    this._browser.webProgress.addProgressListener(
-      this,
-      Ci.nsIWebProgress.NOTIFY_STATE_ALL
+  async _printURL(url) {
+    let topWindow = window.browsingContext.topChromeWindow;
+    await topWindow.PrintUtils.loadPrintBrowser(url);
+    topWindow.PrintUtils.startPrintWindow(
+      topWindow.PrintUtils.printBrowser.browsingContext,
+      {}
     );
-
-    MailE10SUtils.loadURI(this._browser, url);
-  },
-
-  /** nsIWebProgressListener */
-  onStateChange(webProgress, request, stateFlags, status) {
-    if (
-      stateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
-      this._browser.currentURI.spec != "about:blank"
-    ) {
-      let topWindow = window.browsingContext.topChromeWindow;
-      topWindow.PrintUtils.startPrintWindow(this._browser.browsingContext, {});
-      this._browser.webProgress.removeProgressListener(this);
-    }
   },
 };
diff -Nru thunderbird-91.3.2+build1/comm/mail/components/compose/content/cloudAttachmentLinkManager.js thunderbird-91.4.0+build2/comm/mail/components/compose/content/cloudAttachmentLinkManager.js
--- thunderbird-91.3.2+build1/comm/mail/components/compose/content/cloudAttachmentLinkManager.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/components/compose/content/cloudAttachmentLinkManager.js	2021-12-09 12:01:04.000000000 +0000
@@ -303,10 +303,11 @@
       header.innerHTML = " ";
       root.appendChild(header);
 
-      let list = editor.createElementWithDefaults("div");
+      let list = editor.createElementWithDefaults("ul");
       list.id = "cloudAttachmentList";
       list.style.backgroundColor = "#FFFFFF";
       list.style.padding = "15px";
+      list.style.listStyleType = "none";
       list.display = "inline-block";
       list.innerHTML = " ";
       root.appendChild(list);
@@ -371,7 +372,7 @@
       list = aDocument.getElementById("cloudAttachmentList");
     }
 
-    let node = aDocument.createElement("div");
+    let node = aDocument.createElement(gMsgCompose.composeHTML ? "li" : "div");
     node.className = "cloudAttachmentItem";
     node.contentLocation = aAttachment.contentLocation;
 
@@ -387,8 +388,8 @@
       let paperclip = aDocument.createElement("img");
       paperclip.style.marginRight = "5px";
       paperclip.style.cssFloat = "left";
-      paperclip.style.width = "24px";
-      paperclip.style.height = "24px";
+      paperclip.width = "24";
+      paperclip.height = "24";
       paperclip.src =
         "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABVUlEQVR42mNgGChgbGzMqm9slqFnbHZLz8TsPwoGioHkQGrItgBsOLrBaFjfxCydbAvgLjc2zQNymZCkmPRMzfOhllwj3wKoK9EMB4PQ0FBmJHmgWtM1eqZmS8m1gEHXxGyLnon5WlzyyGyyLMBmwKgFoxYMPgv+gdjq1ta8YL6elRhU/i+1LDgAYuuamidC+Q1geVOzzVSxQN/EPAnKvwLM0cFA+hOYb2TmRIkFH0CaDExNDbS1HXgwim1o2QMKNvIsMDafCtW4DOwLMzM1YJl0ChxUxqaNQCFGsDqgRRB1ppdIssDQ3FwLqPE7ermvY2ysDK8zEEH3RdfYWIPkIlvX1DQaasAvfVPTGBQ5E3MvoPhXiAPMYympFxoQ4W7eA/IBKIhASRRiuOkUiutnoGuzYQYi4b/AOCmjWiMAGFz2QEO3gwwGunoXiE+T1oa5uTkfKeoBW+cLhPF1+Q8AAAAASUVORK5CYII=";
       node.appendChild(paperclip);
@@ -403,8 +404,7 @@
 
       let size = aDocument.createElement("span");
       size.textContent =
-        "(" + gMessenger.formatFileSize(aAttachment.size) + ")";
-      size.style.marginLeft = "5px";
+        " (" + gMessenger.formatFileSize(aAttachment.size) + ") ";
       size.style.fontSize = "small";
       size.style.color = "grey";
       node.appendChild(size);
@@ -415,8 +415,8 @@
       if (provider.iconURL) {
         let providerIcon = aDocument.createElement("img");
         providerIcon.style.marginRight = "5px";
-        providerIcon.style.maxWidth = "24px";
-        providerIcon.style.maxHeight = "24px";
+        providerIcon.width = "24";
+        providerIcon.height = "24";
         providerIcon.style.verticalAlign = "middle";
         providerIdentity.appendChild(providerIcon);
 
@@ -437,7 +437,7 @@
       if (provider.serviceURL) {
         let providerLink = this._generateLink(
           aDocument,
-          provider.displayName,
+          cloudFileAccounts.getDisplayName(aAccount),
           provider.serviceURL
         );
         providerLink.style.verticalAlign = "middle";
@@ -448,9 +448,11 @@
         providerName.style.verticalAlign = "middle";
         providerIdentity.appendChild(providerName);
       }
-
       node.appendChild(providerIdentity);
 
+      let linebreak = aDocument.createElement("br");
+      node.appendChild(linebreak);
+
       let downloadUrl = this._generateLink(
         aDocument,
         aAttachment.contentLocation,
@@ -458,7 +460,6 @@
       );
       downloadUrl.style.fontSize = "small";
       downloadUrl.style.display = "block";
-
       node.appendChild(downloadUrl);
     } else {
       node.textContent = getComposeBundle().getFormattedString(
@@ -466,7 +467,7 @@
         [
           aAttachment.name,
           gMessenger.formatFileSize(aAttachment.size),
-          provider.displayName,
+          cloudFileAccounts.getDisplayName(aAccount),
           aAttachment.contentLocation,
         ]
       );
diff -Nru thunderbird-91.3.2+build1/comm/mail/components/compose/content/MsgComposeCommands.js thunderbird-91.4.0+build2/comm/mail/components/compose/content/MsgComposeCommands.js
--- thunderbird-91.3.2+build1/comm/mail/components/compose/content/MsgComposeCommands.js	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/components/compose/content/MsgComposeCommands.js	2021-12-09 12:01:04.000000000 +0000
@@ -8446,14 +8446,14 @@
       return;
     }
 
-    // We're dragging files that can potentially be attached or added inline, so
-    // update the variable.
-    gIsDraggingAttachments = true;
-
     if (flavors.some(f => event.dataTransfer.types.includes(f))) {
       // Show the drop overlay only if we dragged files or supported types.
       let attachments = this.getValidAttachments(event);
       if (attachments.length) {
+        // We're dragging files that can potentially be attached or added
+        // inline, so update the variable.
+        gIsDraggingAttachments = true;
+
         event.stopPropagation();
         event.preventDefault();
         document
@@ -9388,6 +9388,7 @@
     domWindowUtils.AGENT_SHEET
   );
 
+  window.content.browsingContext.allowJavascript = false;
   gMsgCompose.initEditor(editor, window.content);
 
   // Then, we enable related UI entries.
diff -Nru thunderbird-91.3.2+build1/comm/mail/components/MailGlue.jsm thunderbird-91.4.0+build2/comm/mail/components/MailGlue.jsm
--- thunderbird-91.3.2+build1/comm/mail/components/MailGlue.jsm	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/components/MailGlue.jsm	2021-12-09 12:01:04.000000000 +0000
@@ -129,6 +129,19 @@
     ],
   },
 
+  Mailto: {
+    parent: {
+      moduleURI: "resource:///actors/MailtoParent.jsm",
+    },
+    child: {
+      moduleURI: "resource:///actors/MailtoChild.jsm",
+      events: {
+        click: {},
+      },
+    },
+    allFrames: true,
+  },
+
   Pdfjs: {
     parent: {
       moduleURI: "resource://pdf.js/PdfjsParent.jsm",
@@ -180,6 +193,7 @@
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   ExtensionSupport: "resource:///modules/ExtensionSupport.jsm",
   MailMigrator: "resource:///modules/MailMigrator.jsm",
+  MailUsageTelemetry: "resource:///modules/MailUsageTelemetry.jsm",
   LightweightThemeConsumer:
     "resource://gre/modules/LightweightThemeConsumer.jsm",
   OsEnvironment: "resource://gre/modules/OsEnvironment.jsm",
@@ -266,6 +280,8 @@
       "Thunderbird-internal-BrowserConsole"
     );
 
+    MailUsageTelemetry.uninit();
+
     if (this._lateTasksIdleObserver) {
       this._userIdleService.removeIdleObserver(
         this._lateTasksIdleObserver,
@@ -505,6 +521,8 @@
       this._lateTasksIdleObserver,
       LATE_TASKS_IDLE_TIME_SEC
     );
+
+    MailUsageTelemetry.init();
   },
 
   /**
diff -Nru thunderbird-91.3.2+build1/comm/mail/components/telemetry/Scalars.yaml thunderbird-91.4.0+build2/comm/mail/components/telemetry/Scalars.yaml
--- thunderbird-91.3.2+build1/comm/mail/components/telemetry/Scalars.yaml	2021-11-19 11:56:47.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/components/telemetry/Scalars.yaml	2021-12-09 12:01:04.000000000 +0000
@@ -314,3 +314,84 @@
       - "telemetry-client-dev@thunderbird.net"
     record_in_processes:
       - 'main'
+
+tb.ui.interaction:
+  calendar:
+    bug_numbers:
+      - 1736739
+    description: >
+      Records a count of interactions with items in the calendar.
+    expires: never
+    kind: uint
+    keyed: true
+    notification_emails:
+      - "telemetry-client-dev@thunderbird.net"
+    products:
+      - "thunderbird"
+    release_channel_collection: opt-out
+    record_in_processes:
+      - "main"
+
+  chat:
+    bug_numbers:
+      - 1736739
+    description: >
+      Records a count of interactions with items in chat.
+    expires: never
+    kind: uint
+    keyed: true
+    notification_emails:
+      - "telemetry-client-dev@thunderbird.net"
+    products:
+      - "thunderbird"
+    release_channel_collection: opt-out
+    record_in_processes:
+      - "main"
+
+  keyboard:
+    bug_numbers:
+      - 1736739
+    description: >
+      Records a count of interactions with keyboard shortcuts.
+    expires: never
+    kind: uint
+    keyed: true
+    notification_emails:
+      - "telemetry-client-dev@thunderbird.net"
+    products:
+      - "thunderbird"
+    release_channel_collection: opt-out
+    record_in_processes:
+      - "main"
+
+  message_display:
+    bug_numbers:
+      - 1736739
+    description: >
+      Records a count of interactions with items in the message display.
+    expires: never
+    kind: uint
+    keyed: true
+    notification_emails:
+      - "telemetry-client-dev@thunderbird.net"
+    products:
+      - "thunderbird"
+    release_channel_collection: opt-out
+    record_in_processes:
+      - "main"
+
+  toolbox:
+    bug_numbers:
+      - 1736739
+    description: >
+      Records a count of interactions with items in the main window toolbox.
+    expires: never
+    kind: uint
+    keyed: true
+    notification_emails:
+      - "telemetry-client-dev@thunderbird.net"
+    products:
+      - "thunderbird"
+    release_channel_collection: opt-out
+    record_in_processes:
+      - "main"
diff -Nru thunderbird-91.3.2+build1/comm/mail/config/version_display.txt thunderbird-91.4.0+build2/comm/mail/config/version_display.txt
--- thunderbird-91.3.2+build1/comm/mail/config/version_display.txt	2021-11-19 11:56:51.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/config/version_display.txt	2021-12-09 12:01:07.000000000 +0000
@@ -1 +1 @@
-91.3.2
+91.4.0
diff -Nru thunderbird-91.3.2+build1/comm/mail/config/version.txt thunderbird-91.4.0+build2/comm/mail/config/version.txt
--- thunderbird-91.3.2+build1/comm/mail/config/version.txt	2021-11-19 11:56:51.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/config/version.txt	2021-12-09 12:01:07.000000000 +0000
@@ -1 +1 @@
-91.3.2
+91.4.0
diff -Nru thunderbird-91.3.2+build1/comm/mail/modules/MailUsageTelemetry.jsm thunderbird-91.4.0+build2/comm/mail/modules/MailUsageTelemetry.jsm
--- thunderbird-91.3.2+build1/comm/mail/modules/MailUsageTelemetry.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/modules/MailUsageTelemetry.jsm	2021-12-09 12:01:04.000000000 +0000
@@ -0,0 +1,345 @@
+/* -*- js-indent-level: 2; indent-tabs-mode: nil -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const EXPORTED_SYMBOLS = ["MailUsageTelemetry"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Services: "resource://gre/modules/Services.jsm",
+});
+
+// Observed topic names.
+const DOMWINDOW_OPENED_TOPIC = "domwindowopened";
+
+// Window types we're interested in.
+const WINDOW_TYPES = ["mail:3pane", "mail:messageWindow"];
+
+// Window URLs we're interested in.
+const WINDOW_URLS = [
+  "chrome://messenger/content/messenger.xhtml",
+  "chrome://messenger/content/messageWindow.xhtml",
+];
+
+// The elements we consider to be interactive.
+const UI_TARGET_ELEMENTS = [
+  "menuitem",
+  "toolbarbutton",
+  "key",
+  "command",
+  "checkbox",
+  "input",
+  "button",
+  "image",
+  "radio",
+  "richlistitem",
+];
+
+// The containers of interactive elements that we care about and their pretty
+// names. These should be listed in order of most-specific to least-specific,
+// when iterating JavaScript will guarantee that ordering and so we will find
+// the most specific area first.
+const MESSENGER_UI_CONTAINER_IDS = {
+  // Calendar.
+  "today-pane-panel": "calendar",
+  calendarTabPanel: "calendar",
+  "calendar-popupset": "calendar",
+
+  // Chat.
+  chatTabPanel: "chat",
+  buddyListContextMenu: "chat",
+  chatConversationContextMenu: "chat",
+  "chat-toolbar-context-menu": "chat",
+  chatContextMenu: "chat",
+  participantListContextMenu: "chat",
+
+  // Anything to do with the 3-pane tab or message window.
+  mailContext: "message-display",
+  folderPaneContext: "message-display",
+  singleMessage: "message-display",
+  emailAddressPopup: "message-display",
+  copyPopup: "message-display",
+  messageIdContext: "message-display",
+  attachmentItemContext: "message-display",
+  attachmentListContext: "message-display",
+  attachmentMenuList: "message-display",
+  "attachment-toolbar-context-menu": "message-display",
+  copyUrlPopup: "message-display",
+  newsgroupPopup: "message-display",
+
+  // The tab bar and the toolbox.
+  "navigation-toolbox": "toolbox",
+  "mail-toolbox": "toolbox",
+  "quick-filter-bar": "toolbox",
+  "appMenu-popup": "toolbox",
+  tabContextMenu: "toolbox",
+};
+
+const KNOWN_ADDONS = [];
+
+function telemetryId(widgetId, obscureAddons = true) {
+  // Add-on IDs need to be obscured.
+  function addonId(id) {
+    if (!obscureAddons) {
+      return id;
+    }
+
+    let pos = KNOWN_ADDONS.indexOf(id);
+    if (pos < 0) {
+      pos = KNOWN_ADDONS.length;
+      KNOWN_ADDONS.push(id);
+    }
+    return `addon${pos}`;
+  }
+
+  if (widgetId.endsWith("-browserAction-toolbarbutton")) {
+    widgetId = addonId(
+      widgetId.substring(
+        0,
+        widgetId.length - "-browserAction-toolbarbutton".length
+      )
+    );
+  } else if (widgetId.endsWith("-messageDisplayAction-toolbarbutton")) {
+    widgetId = addonId(
+      widgetId.substring(
+        0,
+        widgetId.length - "-messageDisplayAction-toolbarbutton".length
+      )
+    );
+  } else if (widgetId.startsWith("ext-keyset-id-")) {
+    // Webextension command shortcuts don't have an id on their key element so
+    // we see the id from the keyset that contains them.
+    widgetId = addonId(widgetId.substring("ext-keyset-id-".length));
+  }
+
+  return widgetId.replace(/_/g, "-");
+}
+
+let MailUsageTelemetry = {
+  QueryInterface: ChromeUtils.generateQI([
+    "nsIObserver",
+    "nsISupportsWeakReference",
+  ]),
+
+  _inited: false,
+
+  init() {
+    // Make sure to catch new chrome windows and subsession splits.
+    Services.obs.addObserver(this, DOMWINDOW_OPENED_TOPIC, true);
+
+    // Attach the handlers to the existing Windows.
+    for (let winType of WINDOW_TYPES) {
+      for (let win of Services.wm.getEnumerator(winType)) {
+        this._registerWindow(win);
+      }
+    }
+
+    this._inited = true;
+  },
+
+  uninit() {
+    if (!this._inited) {
+      return;
+    }
+    Services.obs.removeObserver(this, DOMWINDOW_OPENED_TOPIC);
+  },
+
+  observe(subject, topic, data) {
+    switch (topic) {
+      case DOMWINDOW_OPENED_TOPIC:
+        this._onWindowOpen(subject);
+        break;
+    }
+  },
+
+  handleEvent(event) {
+    switch (event.type) {
+      case "unload":
+        this._unregisterWindow(event.target);
+        break;
+    }
+  },
+
+  _getWidgetID(node) {
+    // We want to find a sensible ID for this element.
+    if (!node) {
+      return null;
+    }
+
+    if (node.id) {
+      return node.id;
+    }
+
+    // Special case in the tabs.
+    if (node.classList.contains("tab-close-button")) {
+      return "tab-close-button";
+    }
+
+    // One of these will at least let us know what the widget is for.
+    let possibleAttributes = [
+      "preference",
+      "command",
+      "observes",
+      "data-l10n-id",
+    ];
+
+    // The key attribute on key elements is the actual key to listen for.
+    if (node.localName != "key") {
+      possibleAttributes.unshift("key");
+    }
+
+    for (let idAttribute of possibleAttributes) {
+      if (node.hasAttribute(idAttribute)) {
+        return node.getAttribute(idAttribute);
+      }
+    }
+
+    return this._getWidgetID(node.parentElement);
+  },
+
+  _getBrowserWidgetContainer(node) {
+    // Find the container holding this element.
+    for (let containerId of Object.keys(MESSENGER_UI_CONTAINER_IDS)) {
+      let container = node.ownerDocument.getElementById(containerId);
+      if (container && container.contains(node)) {
+        return MESSENGER_UI_CONTAINER_IDS[containerId];
+      }
+    }
+    return null;
+  },
+
+  _getWidgetContainer(node) {
+    if (node.localName == "key") {
+      return "keyboard";
+    }
+
+    const { URL } = node.ownerDocument;
+    if (WINDOW_URLS.includes(URL)) {
+      return this._getBrowserWidgetContainer(node);
+    }
+    return null;
+  },
+
+  lastClickTarget: null,
+
+  _recordCommand(event) {
+    let types = [event.type];
+    let sourceEvent = event;
+    while (sourceEvent.sourceEvent) {
+      sourceEvent = sourceEvent.sourceEvent;
+      types.push(sourceEvent.type);
+    }
+
+    let lastTarget = this.lastClickTarget?.get();
+    if (
+      lastTarget &&
+      sourceEvent.type == "command" &&
+      sourceEvent.target.contains(lastTarget)
+    ) {
+      // Ignore a command event triggered by a click.
+      this.lastClickTarget = null;
+      return;
+    }
+
+    this.lastClickTarget = null;
+
+    if (sourceEvent.type == "click") {
+      // Only care about main button clicks.
+      if (sourceEvent.button != 0) {
+        return;
+      }
+
+      // This click may trigger a command event so retain the target to be able
+      // to dedupe that event.
+      this.lastClickTarget = Cu.getWeakReference(sourceEvent.target);
+    }
+
+    // We should never see events from web content as they are fired in a
+    // content process, but let's be safe.
+    let url = sourceEvent.target.ownerDocument.documentURIObject;
+    if (!url.schemeIs("chrome") && !url.schemeIs("about")) {
+      return;
+    }
+
+    // This is what events targetted at content will actually look like.
+    if (sourceEvent.target.localName == "browser") {
+      return;
+    }
+
+    // Find the actual element we're interested in.
+    let node = sourceEvent.target;
+    while (!UI_TARGET_ELEMENTS.includes(node.localName)) {
+      node = node.parentNode;
+      if (!node) {
+        // A click on a space or label or something we're not interested in.
+        return;
+      }
+    }
+
+    let item = this._getWidgetID(node);
+    let source = this._getWidgetContainer(node);
+
+    if (item && source) {
+      let scalar = `tb.ui.interaction.${source.replace("-", "_")}`;
+      Services.telemetry.keyedScalarAdd(scalar, telemetryId(item), 1);
+    }
+  },
+
+  /**
+   * Listens for UI interactions in the window.
+   */
+  _addUsageListeners(win) {
+    // Listen for command events from the UI.
+    win.addEventListener("command", event => this._recordCommand(event), true);
+    win.addEventListener("click", event => this._recordCommand(event), true);
+  },
+
+  /**
+   * Adds listeners to a single chrome window.
+   */
+  _registerWindow(win) {
+    this._addUsageListeners(win);
+
+    win.addEventListener("unload", this);
+  },
+
+  /**
+   * Removes listeners from a single chrome window.
+   */
+  _unregisterWindow(win) {
+    win.removeEventListener("unload", this);
+  },
+
+  /**
+   * Tracks the window count and registers the listeners for the tab count.
+   * @param{Object} win The window object.
+   */
+  _onWindowOpen(win) {
+    // Make sure to have a |nsIDOMWindow|.
+    if (!(win instanceof Ci.nsIDOMWindow)) {
+      return;
+    }
+
+    let onLoad = () => {
+      win.removeEventListener("load", onLoad);
+
+      // Ignore non browser windows.
+      if (
+        !WINDOW_TYPES.includes(
+          win.document.documentElement.getAttribute("windowtype")
+        )
+      ) {
+        return;
+      }
+
+      this._registerWindow(win);
+    };
+    win.addEventListener("load", onLoad);
+  },
+};
diff -Nru thunderbird-91.3.2+build1/comm/mail/modules/moz.build thunderbird-91.4.0+build2/comm/mail/modules/moz.build
--- thunderbird-91.3.2+build1/comm/mail/modules/moz.build	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/modules/moz.build	2021-12-09 12:01:04.000000000 +0000
@@ -14,6 +14,7 @@
     "MailConsts.jsm",
     "MailE10SUtils.jsm",
     "MailMigrator.jsm",
+    "MailUsageTelemetry.jsm",
     "MailUtils.jsm",
     "MailViewManager.jsm",
     "MessageArchiver.jsm",
diff -Nru thunderbird-91.3.2+build1/comm/mail/test/browser/content-policy/browser_jsContentPolicy.js thunderbird-91.4.0+build2/comm/mail/test/browser/content-policy/browser_jsContentPolicy.js
--- thunderbird-91.3.2+build1/comm/mail/test/browser/content-policy/browser_jsContentPolicy.js	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mail/test/browser/content-policy/browser_jsContentPolicy.js	2021-12-09 12:01:04.000000000 +0000
@@ -23,6 +23,12 @@
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );
 
+var {
+  close_compose_window,
+  open_compose_with_forward,
+  open_compose_with_reply,
+} = ChromeUtils.import("resource://testing-common/mozmill/ComposeHelpers.jsm");
+
 var { MailE10SUtils } = ChromeUtils.import(
   "resource:///modules/MailE10SUtils.jsm"
 );
@@ -213,4 +219,61 @@
 
   ++gMsgNo;
   select_none();
+});
+
+/*
+ * Runs in the browser process via SpecialPowers.spawn to check JavaScript
+ * is disabled.
+ */
+function assertJSDisabledInEditor() {
+  Assert.ok(content.location.href);
+  Assert.ok(
+    !content.wrappedJSObject.jsIsTurnedOn,
+    "JS should not be turned on in editor."
+  );
+
+  // <noscript> is not shown in the editor, independent of whether scripts
+  // are on or off. So we can't check that like in assertJSDisabledIn.
+}
+
+/**
+ * Check JavaScript is disabled in the editor.
+ */
+add_task(async function testJsInMailReply() {
+  be_in_folder(folder);
+
+  var body = jsMsgBody.replace(
+    "</body>",
+    "<img src=x onerror=alert(1)></body>"
+  );
+
+  let msgDbHdr = addToFolder("js msg reply " + gMsgNo, body, folder);
+
+  // select the newly created message
+  let msgHdr = select_click_row(gMsgNo);
+
+  Assert.equal(
+    msgDbHdr,
+    msgHdr,
+    "selected message header should be the same as generated header"
+  );
+
+  assert_selected_and_displayed(gMsgNo);
+
+  await SpecialPowers.spawn(messagePane, [], assertJSDisabledInEditor);
+
+  let replyWin = open_compose_with_reply();
+  // If JavaScript is on, loading the window will actually show an alert(1)
+  // so execution doesn't go further from here.
+  let editor = replyWin.window.document.getElementById("content-frame");
+  await SpecialPowers.spawn(editor, [], assertJSDisabledInEditor);
+  close_compose_window(replyWin);
+
+  let fwdWin = open_compose_with_forward();
+  editor = fwdWin.window.document.getElementById("content-frame");
+  await SpecialPowers.spawn(editor, [], assertJSDisabledInEditor);
+  close_compose_window(fwdWin);
+
+  ++gMsgNo;
+  select_none();
 });
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/base/content/menulist-charsetpicker.js thunderbird-91.4.0+build2/comm/mailnews/base/content/menulist-charsetpicker.js
--- thunderbird-91.3.2+build1/comm/mailnews/base/content/menulist-charsetpicker.js	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/base/content/menulist-charsetpicker.js	2021-12-09 12:01:04.000000000 +0000
@@ -17,23 +17,34 @@
   /**
    * MozMenulistCharsetpicker is a menulist widget that is automatically
    * populated with charset selections.
-   * Setting preference="<name>" will set the selected value to that of the
-   * named preference value.
-   * @abstract
    * @extends {MozMenuList}
    */
-  class MozMenulistCharsetpickerBase extends customElements.get("menulist") {
-    static get observedAttributes() {
-      return super.observedAttributes.concat(["subset", "preference"]);
-    }
-
+  class MozMenulistCharsetpickerViewing extends customElements.get("menulist") {
     /**
      * Get the charset values to show in the list.
      * @abstract
      * @return {String[]} an array of character encoding names
      */
     get charsetValues() {
-      return [];
+      return [
+        "UTF-8",
+        "Big5",
+        "EUC-KR",
+        "gbk",
+        "KOI8-R",
+        "ISO-2022-JP",
+        "ISO-8859-1",
+        "ISO-8859-2",
+        "ISO-8859-7",
+        "windows-874",
+        "windows-1250",
+        "windows-1251",
+        "windows-1252",
+        "windows-1255",
+        "windows-1256",
+        "windows-1257",
+        "windows-1258",
+      ];
     }
 
     connectedCallback() {
@@ -67,84 +78,6 @@
         .forEach(item => {
           this.appendItem(item.label, item.value);
         });
-      this._setupSelectedValueFromPref();
-    }
-
-    _setupSelectedValueFromPref() {
-      // Set appropriate selected menu item based on preference value.
-      if (this.hasAttribute("preference")) {
-        let preference = Services.prefs.getComplexValue(
-          this.getAttribute("preference"),
-          Ci.nsIPrefLocalizedString
-        );
-        this.value = preference.data;
-      }
-    }
-
-    attributeChangedCallback(name, oldValue, newValue) {
-      super.attributeChangedCallback(name, oldValue, newValue);
-      // @see MozElementMixin.attributeChangedCallback()
-      if (
-        !this.isConnectedAndReady ||
-        oldValue === newValue ||
-        !this.inheritedAttributesCache
-      ) {
-        return;
-      }
-      if (name == "preference") {
-        this._setupSelectedValueFromPref();
-      }
-    }
-  }
-
-  /**
-   * Menulist widget that shows charset applicable for sending messages.
-   * @extends MozMenulistCharsetpickerBase
-   */
-  class MozMenulistCharsetpickerSending extends MozMenulistCharsetpickerBase {
-    get charsetValues() {
-      return [
-        "UTF-8",
-        "EUC-KR",
-        "gbk",
-        "gb18030",
-        "ISO-2022-JP",
-        "ISO-8859-1",
-        "ISO-8859-7",
-        "windows-1252",
-      ];
-    }
-  }
-  customElements.define(
-    "menulist-charsetpicker-sending",
-    MozMenulistCharsetpickerSending,
-    { extends: "menulist" }
-  );
-
-  /**
-   * Menulist widget that shows charsets applicable for viewing messages.
-   * @extends MozMenulistCharsetpickerBase
-   */
-  class MozMenulistCharsetpickerViewing extends MozMenulistCharsetpickerBase {
-    get charsetValues() {
-      return [
-        "UTF-8",
-        "Big5",
-        "EUC-KR",
-        "gbk",
-        "ISO-2022-JP",
-        "ISO-8859-1",
-        "ISO-8859-2",
-        "ISO-8859-7",
-        "windows-874",
-        "windows-1250",
-        "windows-1251",
-        "windows-1252",
-        "windows-1255",
-        "windows-1256",
-        "windows-1257",
-        "windows-1258",
-      ];
     }
   }
   customElements.define(
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/base/src/nsMessenger.cpp thunderbird-91.4.0+build2/comm/mailnews/base/src/nsMessenger.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/base/src/nsMessenger.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/base/src/nsMessenger.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -2046,44 +2046,44 @@
   // remove it from the history list.
   nsCOMPtr<nsIMsgDBHdr> msgHdr = do_QueryInterface(item);
   if (msgHdr) {
-  nsCOMPtr<nsIMsgFolder> folder;
-  msgHdr->GetFolder(getter_AddRefs(folder));
-  if (folder) {
-    nsCString msgUri;
-    nsMsgKey msgKey;
-    msgHdr->GetMessageKey(&msgKey);
-    folder->GenerateMessageURI(msgKey, msgUri);
-    // need to remove the corresponding folder entry, and
-    // adjust the current history pos.
-    size_t uriPos = mLoadedMsgHistory.IndexOf(msgUri);
-    if (uriPos != mLoadedMsgHistory.NoIndex) {
-      mLoadedMsgHistory.RemoveElementAt(uriPos);
-      mLoadedMsgHistory.RemoveElementAt(uriPos);  // and the folder uri entry
-      if (mCurHistoryPos >= (int32_t)uriPos) mCurHistoryPos -= 2;
+    nsCOMPtr<nsIMsgFolder> folder;
+    msgHdr->GetFolder(getter_AddRefs(folder));
+    if (folder) {
+      nsCString msgUri;
+      nsMsgKey msgKey;
+      msgHdr->GetMessageKey(&msgKey);
+      folder->GenerateMessageURI(msgKey, msgUri);
+      // need to remove the corresponding folder entry, and
+      // adjust the current history pos.
+      size_t uriPos = mLoadedMsgHistory.IndexOf(msgUri);
+      if (uriPos != mLoadedMsgHistory.NoIndex) {
+        mLoadedMsgHistory.RemoveElementAt(uriPos);
+        mLoadedMsgHistory.RemoveElementAt(uriPos);  // and the folder uri entry
+        if (mCurHistoryPos >= (int32_t)uriPos) mCurHistoryPos -= 2;
+      }
     }
   }
-  }
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMessenger::OnItemPropertyChanged(nsIMsgFolder* item,
-                                                   const nsACString& property,
-                                                   const nsACString& oldValue,
-                                                   const nsACString& newValue) {
+                                                 const nsACString& property,
+                                                 const nsACString& oldValue,
+                                                 const nsACString& newValue) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsMessenger::OnItemIntPropertyChanged(nsIMsgFolder* item,
                                                     const nsACString& property,
                                                     int64_t oldValue,
-    int64_t newValue) {
+                                                    int64_t newValue) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsMessenger::OnItemBoolPropertyChanged(nsIMsgFolder* item,
                                                      const nsACString& property,
                                                      bool oldValue,
-    bool newValue) {
+                                                     bool newValue) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
@@ -2096,12 +2096,12 @@
 NS_IMETHODIMP nsMessenger::OnItemPropertyFlagChanged(nsIMsgDBHdr* item,
                                                      const nsACString& property,
                                                      uint32_t oldFlag,
-    uint32_t newFlag) {
+                                                     uint32_t newFlag) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsMessenger::OnItemEvent(nsIMsgFolder* item,
-                                         const nsACString& event) {
+                                       const nsACString& event) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/base/src/nsMsgAccountManager.cpp thunderbird-91.4.0+build2/comm/mailnews/base/src/nsMsgAccountManager.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/base/src/nsMsgAccountManager.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/base/src/nsMsgAccountManager.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -1070,8 +1070,8 @@
     // If we have an existing account with the same server, ignore this account
     if (serverAccount) continue;
 
-    if (NS_FAILED(
-            createKeyedAccount(accountsArray[i], true, getter_AddRefs(account))) ||
+    if (NS_FAILED(createKeyedAccount(accountsArray[i], true,
+                                     getter_AddRefs(account))) ||
         !account) {
       NS_WARNING("unexpected entry in account list; prefs corrupt?");
       continue;
@@ -1573,7 +1573,8 @@
     }
   }
 
-  if (!forcePositionToEnd && !localFoldersAccountKey.IsEmpty() && !lastFolderAccountKey.IsEmpty() &&
+  if (!forcePositionToEnd && !localFoldersAccountKey.IsEmpty() &&
+      !lastFolderAccountKey.IsEmpty() &&
       lastFolderAccountKey == localFoldersAccountKey) {
     // Insert account before Local Folders if that is the last account.
     m_accounts.InsertElementAt(m_accounts.Length() - 1, account);
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/base/src/nsMsgAccountManager.h thunderbird-91.4.0+build2/comm/mailnews/base/src/nsMsgAccountManager.h
--- thunderbird-91.3.2+build1/comm/mailnews/base/src/nsMsgAccountManager.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/base/src/nsMsgAccountManager.h	2021-12-09 12:01:04.000000000 +0000
@@ -127,7 +127,8 @@
   nsCString m_lastFolderURIForPath;
 
   /* internal creation routines - updates m_identities and m_incomingServers */
-  nsresult createKeyedAccount(const nsCString& key, bool forcePositionToEnd, nsIMsgAccount** _retval);
+  nsresult createKeyedAccount(const nsCString& key, bool forcePositionToEnd,
+                              nsIMsgAccount** _retval);
   nsresult createKeyedServer(const nsACString& key, const nsACString& username,
                              const nsACString& password, const nsACString& type,
                              nsIMsgIncomingServer** _retval);
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/base/src/nsNewMailnewsURI.cpp thunderbird-91.4.0+build2/comm/mailnews/base/src/nsNewMailnewsURI.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/base/src/nsNewMailnewsURI.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/base/src/nsNewMailnewsURI.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -69,7 +69,7 @@
     }
     // If we're for some reason not on the main thread, dispatch to main
     // or else we'll crash.
-    auto NewURI = [&aSpec, &aCharset, &aBaseURI, aURI, &rv]() -> auto {
+    auto NewURI = [&aSpec, &aCharset, &aBaseURI, aURI, &rv ]() -> auto {
       rv = nsSmtpService::NewMailtoURI(aSpec, aCharset, aBaseURI, aURI);
     };
     nsCOMPtr<nsIRunnable> task = NS_NewRunnableFunction("NewURI", NewURI);
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/compose/src/MessageSend.jsm thunderbird-91.4.0+build2/comm/mailnews/compose/src/MessageSend.jsm
--- thunderbird-91.3.2+build1/comm/mailnews/compose/src/MessageSend.jsm	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/compose/src/MessageSend.jsm	2021-12-09 12:01:04.000000000 +0000
@@ -622,7 +622,7 @@
       isNewsDelivery &&
       (this._compFields.to || this._compFields.cc || this._compFields.bcc)
     ) {
-      this._deliverFileAsMail();
+      this._deliverAsMail();
       return;
     }
 
@@ -747,10 +747,10 @@
 
     this._deliveryFile = await this._createDeliveryFile();
     if (this._compFields.newsgroups) {
-      this._deliverFileAsNews(this._deliveryFile);
+      this._deliverAsNews();
       return;
     }
-    this._deliverFileAsMail(this._deliveryFile);
+    this._deliverAsMail();
   },
 
   /**
@@ -1013,10 +1013,9 @@
   },
 
   /**
-   * Send a file to smtp service.
-   * @param {nsIFile} file - The file to send.
+   * Send this._deliveryFile to smtp service.
    */
-  _deliverFileAsMail(file) {
+  _deliverAsMail() {
     this.sendReport.currentProcess = Ci.nsIMsgSendReport.process_SMTP;
     this._setStatusMessage(
       this._composeBundle.GetStringFromName("sendingMessage")
@@ -1046,7 +1045,7 @@
         : this._statusFeedback;
     this._smtpRequest = {};
     MailServices.smtp.sendMailMessage(
-      file,
+      this._deliveryFile,
       encodedRecipients,
       this._userIdentity,
       this._compFields.from,
@@ -1062,10 +1061,9 @@
   },
 
   /**
-   * Send a file to nntp service.
-   * @param {nsIFile} file - The file to send.
+   * Send this._deliveryFile to nntp service.
    */
-  _deliverFileAsNews(file) {
+  _deliverAsNews() {
     this.sendReport.currentProcess = Ci.nsIMsgSendReport.process_NNTP;
     MsgUtils.sendLogger.debug("Delivering news message");
     let deliveryListener = new MsgDeliveryListener(this, true);
@@ -1073,7 +1071,7 @@
       this._sendProgress?.msgWindow ||
       MailServices.mailSession.topmostMsgWindow;
     MailServices.nntp.postMessage(
-      file,
+      this._deliveryFile,
       this._compFields.newsgroups,
       this._accountKey,
       deliveryListener,
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/compose/src/nsMsgAttachmentHandler.cpp thunderbird-91.4.0+build2/comm/mailnews/compose/src/nsMsgAttachmentHandler.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/compose/src/nsMsgAttachmentHandler.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/compose/src/nsMsgAttachmentHandler.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -575,9 +575,8 @@
       if (NS_FAILED(rv)) goto done;
 
       nsCOMPtr<nsIURI> dummyNull;
-      rv = messageService->DisplayMessage(uri, m_mime_parser, nullptr,
-                                          nullptr, false,
-                                          getter_AddRefs(dummyNull));
+      rv = messageService->DisplayMessage(uri, m_mime_parser, nullptr, nullptr,
+                                          false, getter_AddRefs(dummyNull));
     }
   }
 done:
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/compose/src/nsMsgCompose.cpp thunderbird-91.4.0+build2/comm/mailnews/compose/src/nsMsgCompose.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/compose/src/nsMsgCompose.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/compose/src/nsMsgCompose.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -185,6 +185,8 @@
     prefBranch->GetBoolPref("converter.html2txt.structs", &mConvertStructs);
 
   m_composeHTML = false;
+
+  mTmpAttachmentsDeleted = false;
 }
 
 nsMsgCompose::~nsMsgCompose() {
@@ -194,21 +196,11 @@
     // was never even called.
     return;
   }
-  // Remove temporary attachment files, e.g. key.asc when attaching public key.
-  nsTArray<RefPtr<nsIMsgAttachment>> attachments;
-  m_compFields->GetAttachments(attachments);
-  for (nsIMsgAttachment* attachment : attachments) {
-    bool isTemporary;
-    attachment->GetTemporary(&isTemporary);
-    if (isTemporary) {
-      nsCString url;
-      attachment->GetUrl(url);
-      nsCOMPtr<nsIFile> urlFile;
-      nsresult rv = NS_GetFileFromURLSpec(url, getter_AddRefs(urlFile));
-      if (NS_SUCCEEDED(rv)) {
-        urlFile->Remove(false);
-      }
-    }
+  m_window = nullptr;
+  if (!mMsgSend) {
+    // This dtor can be called before mMsgSend->CreateAndSendMessage returns,
+    // tmp attachments are needed to create the message, so don't delete them.
+    DeleteTmpAttachments();
   }
 }
 
@@ -1100,13 +1092,6 @@
                                     Promise** aPromise) {
   NS_ENSURE_TRUE(m_compFields, NS_ERROR_NOT_INITIALIZED);
   nsresult rv = NS_OK;
-  nsCOMPtr<nsIPrompt> prompt;
-
-  // i'm assuming the compose window is still up at this point...
-  if (m_window) {
-    nsCOMPtr<nsPIDOMWindowOuter> window = nsPIDOMWindowOuter::From(m_window);
-    window->GetPrompter(getter_AddRefs(prompt));
-  }
 
   // Set content type based on which type of compose window we had.
   nsString contentType = (m_composeHTML) ? u"text/html"_ns : u"text/plain"_ns;
@@ -1240,14 +1225,24 @@
   // Save the identity being sent for later use.
   m_identity = identity;
 
+  nsCOMPtr<nsIPrompt> prompt;
+  if (m_window) {
+    nsCOMPtr<nsPIDOMWindowOuter> window = nsPIDOMWindowOuter::From(m_window);
+    window->GetPrompter(getter_AddRefs(prompt));
+  }
+
   RefPtr<mozilla::dom::Promise> promise;
   rv = SendMsgToServer(deliverMode, identity, accountKey,
                        getter_AddRefs(promise));
 
-  auto handleFailure = [&](nsresult rv) {
-    NotifyStateListeners(nsIMsgComposeNotificationType::ComposeProcessDone, rv);
+  RefPtr<nsMsgCompose> self = this;
+  auto handleFailure = [self = std::move(self), prompt = std::move(prompt),
+                        deliverMode](nsresult rv) {
+    self->NotifyStateListeners(
+        nsIMsgComposeNotificationType::ComposeProcessDone, rv);
     nsCOMPtr<nsIMsgSendReport> sendReport;
-    if (mMsgSend) mMsgSend->GetSendReport(getter_AddRefs(sendReport));
+    if (self->mMsgSend)
+      self->mMsgSend->GetSendReport(getter_AddRefs(sendReport));
     if (sendReport) {
       nsresult theError;
       sendReport->DisplayReport(prompt, true, true, &theError);
@@ -1271,11 +1266,15 @@
           break;
       }
     }
-    if (mProgress) mProgress->CloseProgressDialog(true);
+    if (self->mProgress) self->mProgress->CloseProgressDialog(true);
+
+    self->DeleteTmpAttachments();
   };
   if (promise) {
     new DomPromiseListener(
-        promise, [](JSContext*, JS::Handle<JS::Value>) {}, handleFailure);
+        promise,
+        [&](JSContext*, JS::Handle<JS::Value>) { DeleteTmpAttachments(); },
+        handleFailure);
     promise.forget(aPromise);
   } else if (NS_FAILED(rv)) {
     handleFailure(rv);
@@ -2638,33 +2637,33 @@
 
   if (aEditor) {
     if (aEditor) {
-  RefPtr<Selection> selection;
-  nsCOMPtr<nsINode> parent;
-  int32_t offset;
-  nsresult rv;
+      RefPtr<Selection> selection;
+      nsCOMPtr<nsINode> parent;
+      int32_t offset;
+      nsresult rv;
 
-  // get parent and offset of mailcite
-  rv = GetNodeLocation(nodeInserted, address_of(parent), &offset);
-  NS_ENSURE_SUCCESS(rv, rv);
+      // get parent and offset of mailcite
+      rv = GetNodeLocation(nodeInserted, address_of(parent), &offset);
+      NS_ENSURE_SUCCESS(rv, rv);
 
-  // get selection
-  aEditor->GetSelection(getter_AddRefs(selection));
-  if (selection) {
-    // place selection after mailcite
-    selection->CollapseInLimiter(parent, offset + 1);
-    // insert a break at current selection
-    aEditor->InsertLineBreak();
-    selection->CollapseInLimiter(parent, offset + 1);
-  }
-  nsCOMPtr<nsISelectionController> selCon;
-  aEditor->GetSelectionController(getter_AddRefs(selCon));
+      // get selection
+      aEditor->GetSelection(getter_AddRefs(selection));
+      if (selection) {
+        // place selection after mailcite
+        selection->CollapseInLimiter(parent, offset + 1);
+        // insert a break at current selection
+        aEditor->InsertLineBreak();
+        selection->CollapseInLimiter(parent, offset + 1);
+      }
+      nsCOMPtr<nsISelectionController> selCon;
+      aEditor->GetSelectionController(getter_AddRefs(selCon));
 
-  if (selCon)
-    // After ScrollSelectionIntoView(), the pending notifications might be
-    // flushed and PresShell/PresContext/Frames may be dead. See bug 418470.
-    selCon->ScrollSelectionIntoView(
-        nsISelectionController::SELECTION_NORMAL,
-        nsISelectionController::SELECTION_ANCHOR_REGION, true);
+      if (selCon)
+        // After ScrollSelectionIntoView(), the pending notifications might be
+        // flushed and PresShell/PresContext/Frames may be dead. See bug 418470.
+        selCon->ScrollSelectionIntoView(
+            nsISelectionController::SELECTION_NORMAL,
+            nsISelectionController::SELECTION_ANCHOR_REGION, true);
     }
   }
 
@@ -5214,6 +5213,31 @@
   return NS_OK;
 }
 
+void nsMsgCompose::DeleteTmpAttachments() {
+  if (mTmpAttachmentsDeleted || m_window) {
+    // Don't delete tmp attachments if compose window is still open, e.g. saving
+    // a draft.
+    return;
+  }
+  mTmpAttachmentsDeleted = true;
+  // Remove temporary attachment files, e.g. key.asc when attaching public key.
+  nsTArray<RefPtr<nsIMsgAttachment>> attachments;
+  m_compFields->GetAttachments(attachments);
+  for (nsIMsgAttachment* attachment : attachments) {
+    bool isTemporary;
+    attachment->GetTemporary(&isTemporary);
+    if (isTemporary) {
+      nsCString url;
+      attachment->GetUrl(url);
+      nsCOMPtr<nsIFile> urlFile;
+      nsresult rv = NS_GetFileFromURLSpec(url, getter_AddRefs(urlFile));
+      if (NS_SUCCEEDED(rv)) {
+        urlFile->Remove(false);
+      }
+    }
+  }
+}
+
 nsMsgMailList::nsMsgMailList(nsIAbDirectory* directory)
     : mDirectory(directory) {
   mDirectory->GetDirName(mName);
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/compose/src/nsMsgCompose.h thunderbird-91.4.0+build2/comm/mailnews/compose/src/nsMsgCompose.h
--- thunderbird-91.3.2+build1/comm/mailnews/compose/src/nsMsgCompose.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/compose/src/nsMsgCompose.h	2021-12-09 12:01:04.000000000 +0000
@@ -138,6 +138,10 @@
 
   friend class QuotingOutputStreamListener;
   friend class nsMsgComposeSendListener;
+
+ private:
+  void DeleteTmpAttachments();
+  bool mTmpAttachmentsDeleted;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/compose/src/SmtpClient.jsm thunderbird-91.4.0+build2/comm/mailnews/compose/src/SmtpClient.jsm
--- thunderbird-91.3.2+build1/comm/mailnews/compose/src/SmtpClient.jsm	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/compose/src/SmtpClient.jsm	2021-12-09 12:01:04.000000000 +0000
@@ -118,6 +118,7 @@
    */
   connect() {
     let port = this._server.port || (this.options.requireTLS ? 465 : 587);
+    this.logger.debug(`Connecting to smtp://${this._server.hostname}:${port}`);
     this.socket = new TCPSocket(this._server.hostname, port, {
       binaryType: "arraybuffer",
       useSecureTransport: this._secureMode,
@@ -956,7 +957,7 @@
       this._onNsError(MsgUtils.NS_ERROR_SMTP_AUTH_FAILURE, command.data);
       return;
     }
-    this.logger.debug("AUTH LOGIN USER successful");
+    this.logger.debug("AUTH LOGIN USER");
     this._currentAction = this._actionAUTH_LOGIN_PASS;
     this._sendCommand(btoa(this._authenticator.username), true);
   }
@@ -971,7 +972,7 @@
       this._onNsError(MsgUtils.NS_ERROR_SMTP_AUTH_FAILURE, command.data);
       return;
     }
-    this.logger.debug("AUTH LOGIN PASS successful");
+    this.logger.debug("AUTH LOGIN PASS");
     this._currentAction = this._actionAUTHComplete;
     let password = this._authenticator.getPassword();
     if (
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/compose/src/SmtpServer.jsm thunderbird-91.4.0+build2/comm/mailnews/compose/src/SmtpServer.jsm
--- thunderbird-91.3.2+build1/comm/mailnews/compose/src/SmtpServer.jsm	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/compose/src/SmtpServer.jsm	2021-12-09 12:01:04.000000000 +0000
@@ -276,12 +276,16 @@
    * @returns {string}
    */
   _getServerURI(includeUsername) {
+    // When constructing nsIURI, need to wrap IPv6 address in [].
+    let hostname = this.hostname.includes(":")
+      ? `[${this.hostname}]`
+      : this.hostname;
     return (
       "smtp://" +
       (includeUsername && this.username
         ? `${encodeURIComponent(this.username)}@`
         : "") +
-      this.hostname
+      hostname
     );
   },
 
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/db/msgdb/src/nsMsgDatabase.cpp thunderbird-91.4.0+build2/comm/mailnews/db/msgdb/src/nsMsgDatabase.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/db/msgdb/src/nsMsgDatabase.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/db/msgdb/src/nsMsgDatabase.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsIFile.h"
 #include "nsMailDatabase.h"
 #include "nsDBFolderInfo.h"
+#include "nsIMsgNewsFolder.h"
 #include "nsMsgThread.h"
 #include "nsIMsgSearchTerm.h"
 #include "nsMsgBaseCID.h"
@@ -2823,6 +2824,8 @@
   if (NS_FAILED(rv) || resultCharset.IsEmpty() ||
       resultCharset.EqualsLiteral("us-ascii")) {
     resultCharset.AssignLiteral("UTF-8");
+    nsCOMPtr<nsIMsgNewsFolder> newsfolder(do_QueryInterface(m_folder));
+    if (newsfolder) newsfolder->GetCharset(resultCharset);
   }
   return rv;
 }
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/public/nsIImapHostSessionList.h thunderbird-91.4.0+build2/comm/mailnews/imap/public/nsIImapHostSessionList.h
--- thunderbird-91.3.2+build1/comm/mailnews/imap/public/nsIImapHostSessionList.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/public/nsIImapHostSessionList.h	2021-12-09 12:01:04.000000000 +0000
@@ -73,6 +73,10 @@
                                                    bool discovered) = 0;
   NS_IMETHOD GetHaveWeEverDiscoveredFoldersForHost(const char* serverKey,
                                                    bool& result) = 0;
+  NS_IMETHOD SetDiscoveryForHostInProgress(const char* serverKey,
+                                           bool inProgress) = 0;
+  NS_IMETHOD GetDiscoveryForHostInProgress(const char* serverKey,
+                                           bool& result) = 0;
 
   // Trash Folder
   NS_IMETHOD SetOnlineTrashFolderExistsForHost(const char* serverKey,
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapHostSessionList.cpp thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapHostSessionList.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapHostSessionList.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapHostSessionList.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -30,6 +30,7 @@
 #else
   fHaveWeEverDiscoveredFolders = false;  // try this, see what bad happens
 #endif
+  fDiscoveryForHostInProgress = false;
   fCanonicalOnlineSubDir = NULL;
   fNamespaceList = nsImapNamespaceList::CreatensImapNamespaceList();
   fUsingSubscription = true;
@@ -295,6 +296,27 @@
   PR_ExitMonitor(gCachedHostInfoMonitor);
   return (host == NULL) ? NS_ERROR_ILLEGAL_VALUE : NS_OK;
 }
+
+NS_IMETHODIMP nsImapHostSessionList::GetDiscoveryForHostInProgress(
+    const char* serverKey, bool& result) {
+  PR_EnterMonitor(gCachedHostInfoMonitor);
+  nsIMAPHostInfo* host = FindHost(serverKey);
+  if (host)
+    result = host->fDiscoveryForHostInProgress;
+  else
+    result = false;
+  PR_ExitMonitor(gCachedHostInfoMonitor);
+  return (host == NULL) ? NS_ERROR_ILLEGAL_VALUE : NS_OK;
+}
+
+NS_IMETHODIMP nsImapHostSessionList::SetDiscoveryForHostInProgress(
+    const char* serverKey, bool inProgress) {
+  PR_EnterMonitor(gCachedHostInfoMonitor);
+  nsIMAPHostInfo* host = FindHost(serverKey);
+  if (host) host->fDiscoveryForHostInProgress = inProgress;
+  PR_ExitMonitor(gCachedHostInfoMonitor);
+  return (host == NULL) ? NS_ERROR_ILLEGAL_VALUE : NS_OK;
+}
 
 NS_IMETHODIMP nsImapHostSessionList::SetOnlineTrashFolderExistsForHost(
     const char* serverKey, bool exists) {
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapHostSessionList.h thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapHostSessionList.h
--- thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapHostSessionList.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapHostSessionList.h	2021-12-09 12:01:04.000000000 +0000
@@ -32,6 +32,7 @@
   eIMAPCapabilityFlags fCapabilityFlags;
   char* fHierarchyDelimiters;  // string of top-level hierarchy delimiters
   bool fHaveWeEverDiscoveredFolders;
+  bool fDiscoveryForHostInProgress;
   char* fCanonicalOnlineSubDir;
   nsImapNamespaceList *fNamespaceList, *fTempNamespaceList;
   bool fNamespacesOverridable;
@@ -107,6 +108,10 @@
                                                    bool discovered) override;
   NS_IMETHOD GetHaveWeEverDiscoveredFoldersForHost(const char* serverKey,
                                                    bool& result) override;
+  NS_IMETHOD SetDiscoveryForHostInProgress(const char* serverKey,
+                                           bool inProgress) override;
+  NS_IMETHOD GetDiscoveryForHostInProgress(const char* serverKey,
+                                           bool& result) override;
 
   // Trash Folder
   NS_IMETHOD SetOnlineTrashFolderExistsForHost(const char* serverKey,
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapIncomingServer.cpp thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapIncomingServer.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapIncomingServer.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapIncomingServer.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -884,6 +884,15 @@
   nsCOMPtr<nsIThread> thread(do_GetCurrentThread());
   rv =
       imapService->DiscoverAllFolders(rootMsgFolder, this, aMsgWindow, nullptr);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsIImapHostSessionList> hostSessionList =
+      do_GetService(kCImapHostSessionListCID, &rv);
+  if (NS_SUCCEEDED(rv)) {
+    nsAutoCString serverKey;
+    rv = GetKey(serverKey);
+    if (!serverKey.IsEmpty())
+      hostSessionList->SetDiscoveryForHostInProgress(serverKey.get(), true);
+  }
   return rv;
 }
 
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapMailFolder.cpp thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapMailFolder.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapMailFolder.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapMailFolder.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -785,6 +785,33 @@
         do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
+    /* Do a discovery in its own url if needed. Do before SELECT url. */
+    nsCOMPtr<nsIImapHostSessionList> hostSession =
+        do_GetService(kCImapHostSessionList, &rv);
+    if (NS_SUCCEEDED(rv) && hostSession) {
+      bool foundMailboxesAlready = false;
+      nsCString serverKey;
+      GetServerKey(serverKey);
+      hostSession->GetHaveWeEverDiscoveredFoldersForHost(serverKey.get(),
+                                                         foundMailboxesAlready);
+      if (!foundMailboxesAlready) {
+        bool discoveryInProgress = false;
+        // See if discovery in progress and not yet finished.
+        hostSession->GetDiscoveryForHostInProgress(serverKey.get(),
+                                                   discoveryInProgress);
+        if (!discoveryInProgress) {
+          nsCOMPtr<nsIMsgFolder> rootFolder;
+          rv = GetRootFolder(getter_AddRefs(rootFolder));
+          if (NS_SUCCEEDED(rv) && rootFolder) {
+            rv = imapService->DiscoverAllFolders(rootFolder, this, aMsgWindow,
+                                                 nullptr);
+            if (NS_SUCCEEDED(rv))
+              hostSession->SetDiscoveryForHostInProgress(serverKey.get(), true);
+          }
+        }
+      }
+    }
+
     nsCOMPtr<nsIURI> url;
     rv = imapService->SelectFolder(this, m_urlListener, aMsgWindow,
                                    getter_AddRefs(url));
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapProtocol.cpp thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapProtocol.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapProtocol.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapProtocol.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -1847,7 +1847,12 @@
     if (GetServerStateParser().GetCapabilityFlag() & kHasLanguageCapability)
       Language();
 
-    if (m_runningUrl) FindMailboxesIfNecessary();
+    if (m_runningUrl) {
+      bool foundMailboxesAlready = false;
+      m_hostSessionList->GetHaveWeEverDiscoveredFoldersForHost(
+          GetImapServerKey(), foundMailboxesAlready);
+      if (!foundMailboxesAlready) FindMailboxesIfNecessary();
+    }
 
     nsImapState imapState = nsIImapUrl::ImapStatusNone;
     if (m_runningUrl) m_runningUrl->GetRequiredImapState(&imapState);
@@ -1898,6 +1903,11 @@
           IMAP, LogLevel::Debug,
           ("URL failed with code 0x%" PRIx32 " (%s)", static_cast<uint32_t>(rv),
            mailnewsurl->GetSpecOrDefault().get()));
+      // If discovery URL fails, clear the in-progress flag.
+      if (m_imapAction == nsIImapUrl::nsImapDiscoverAllBoxesUrl) {
+        m_hostSessionList->SetDiscoveryForHostInProgress(GetImapServerKey(),
+                                                         false);
+      }
     }
     // Inform any nsIUrlListeners that the URL has finished. This will invoke
     // nsIUrlListener.onStopRunningUrl().
@@ -7147,22 +7157,29 @@
     HandleMemoryFailure();
 }
 
+// This is called to do mailbox discovery if discovery not already complete
+// for the "host" (i.e., server or account). Discovery still only occurs if
+// the imap action is appropriate and if discovery is not in progress due to
+// a running "discoverallboxes" URL.
 void nsImapProtocol::FindMailboxesIfNecessary() {
   // biff should not discover mailboxes
-  bool foundMailboxesAlready = false;
   nsImapAction imapAction;
-
-  // need to do this for every connection in order to see folders.
   (void)m_runningUrl->GetImapAction(&imapAction);
-  nsresult rv = m_hostSessionList->GetHaveWeEverDiscoveredFoldersForHost(
-      GetImapServerKey(), foundMailboxesAlready);
-  if (NS_SUCCEEDED(rv) && !foundMailboxesAlready &&
-      (imapAction != nsIImapUrl::nsImapBiff) &&
+  if ((imapAction != nsIImapUrl::nsImapBiff) &&
       (imapAction != nsIImapUrl::nsImapVerifylogon) &&
       (imapAction != nsIImapUrl::nsImapDiscoverAllBoxesUrl) &&
       (imapAction != nsIImapUrl::nsImapUpgradeToSubscription) &&
-      !GetSubscribingNow())
-    DiscoverMailboxList();
+      !GetSubscribingNow()) {
+    // If discovery in progress, don't kick-off another discovery.
+    bool discoveryInProgress = false;
+    m_hostSessionList->GetDiscoveryForHostInProgress(GetImapServerKey(),
+                                                     discoveryInProgress);
+    if (!discoveryInProgress) {
+      m_hostSessionList->SetDiscoveryForHostInProgress(GetImapServerKey(),
+                                                       true);
+      DiscoverMailboxList();
+    }
+  }
 }
 
 void nsImapProtocol::DiscoverAllAndSubscribedBoxes() {
@@ -7480,9 +7497,11 @@
     }  // if trash folder doesn't exist
     m_hostSessionList->SetHaveWeEverDiscoveredFoldersForHost(GetImapServerKey(),
                                                              true);
-
     // notify front end that folder discovery is complete....
     if (m_imapServerSink) m_imapServerSink->DiscoveryDone();
+
+    // Clear the discovery in progress flag.
+    m_hostSessionList->SetDiscoveryForHostInProgress(GetImapServerKey(), false);
   }
 }
 
@@ -8996,6 +9015,24 @@
   nsresult rv =
       nsContentSecurityManager::doContentSecurityCheck(this, listener);
   NS_ENSURE_SUCCESS(rv, rv);
+  if (m_url) {
+    nsCOMPtr<nsIImapUrl> imapUrl(do_QueryInterface(m_url, &rv));
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsImapAction imapAction;
+    imapUrl->GetImapAction(&imapAction);
+    // If we're shutting down, and not running the kinds of urls we run at
+    // shutdown, then this should fail because running urls during
+    // shutdown will very likely fail and potentially hang.
+    nsCOMPtr<nsIMsgAccountManager> accountMgr =
+        do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+    bool shuttingDown = false;
+    (void)accountMgr->GetShutdownInProgress(&shuttingDown);
+    if (shuttingDown && imapAction != nsIImapUrl::nsImapExpungeFolder &&
+        imapAction != nsIImapUrl::nsImapDeleteAllMsgs &&
+        imapAction != nsIImapUrl::nsImapDeleteFolder)
+      return NS_ERROR_FAILURE;
+  }
   return NS_ImplementChannelOpen(this, _retval);
 }
 
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapService.cpp thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapService.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapService.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapService.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -657,8 +657,9 @@
     const char* aMessageURI, nsISupports* aDisplayConsumer,
     nsIMsgWindow* aMsgWindow, nsIUrlListener* aUrlListener, nsIURI** aURL) {
   mPrintingOperation = true;
-  nsresult rv = DisplayMessage(nsDependentCString(aMessageURI), aDisplayConsumer, aMsgWindow,
-                               aUrlListener, false, aURL);
+  nsresult rv =
+      DisplayMessage(nsDependentCString(aMessageURI), aDisplayConsumer,
+                     aMsgWindow, aUrlListener, false, aURL);
   mPrintingOperation = false;
   return rv;
 }
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapUrl.h thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapUrl.h
--- thunderbird-91.3.2+build1/comm/mailnews/imap/src/nsImapUrl.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/src/nsImapUrl.h	2021-12-09 12:01:04.000000000 +0000
@@ -126,7 +126,7 @@
   bool m_addDummyEnvelope;
   bool m_canonicalLineEnding;  // CRLF
 
-  nsCString mURI;              // the RDF URI associated with this url.
+  nsCString mURI;         // the RDF URI associated with this url.
   bool mOverrideCharset;  // used by nsIMsgI18NUrl...
   mozilla::Mutex mLock;
 };
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/test/unit/head_server.js thunderbird-91.4.0+build2/comm/mailnews/imap/test/unit/head_server.js
--- thunderbird-91.3.2+build1/comm/mailnews/imap/test/unit/head_server.js	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/test/unit/head_server.js	2021-12-09 12:01:04.000000000 +0000
@@ -50,6 +50,9 @@
 var { AuthPLAIN, AuthLOGIN, AuthCRAM } = ChromeUtils.import(
   "resource://testing-common/mailnews/Auth.jsm"
 );
+var { smtpDaemon, SMTP_RFC2821_handler } = ChromeUtils.import(
+  "resource://testing-common/mailnews/Smtpd.jsm"
+);
 
 function makeServer(daemon, infoString, otherProps) {
   if (infoString in imapd.configurations) {
@@ -149,3 +152,14 @@
 registerCleanupFunction(function() {
   load(gDEPTH + "mailnews/resources/mailShutdown.js");
 });
+
+// Setup the SMTP daemon and server
+function setupSmtpServerDaemon(handler) {
+  if (!handler) {
+    handler = function(d) {
+      return new SMTP_RFC2821_handler(d);
+    };
+  }
+  var server = new nsMailServer(handler, new smtpDaemon());
+  return server;
+}
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/imap/test/unit/test_imapFilterActions.js thunderbird-91.4.0+build2/comm/mailnews/imap/test/unit/test_imapFilterActions.js
--- thunderbird-91.3.2+build1/comm/mailnews/imap/test/unit/test_imapFilterActions.js	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/imap/test/unit/test_imapFilterActions.js	2021-12-09 12:01:04.000000000 +0000
@@ -23,19 +23,40 @@
 var gHeader; // the current message db header
 var gInboxCount; // the previous number of messages in the Inbox
 var gSubfolderCount; // the previous number of messages in the subfolder
-var gMessage = "draft1"; // message file used as the test message
+var gMessage = "image-attach-test"; // message file used as the test message
 
 // subject of the test message
-var gMessageSubject = "Hello, did you receive my bugmail?";
+var gMessageSubject = "image attach test";
 
 // a string in the body of the test message
-var gMessageInBody = "an HTML message";
+var gMessageInBody = "01234567890test";
 
 // various object references
 var gDbService = Cc["@mozilla.org/msgDatabase/msgDBService;1"].getService(
   Ci.nsIMsgDBService
 );
 
+var gSmtpServerD = setupSmtpServerDaemon();
+
+function setupSmtpServer() {
+  gSmtpServerD.start();
+  var gSmtpServer = localAccountUtils.create_outgoing_server(
+    gSmtpServerD.port,
+    "user",
+    "password",
+    "localhost"
+  );
+  MailServices.accounts.defaultAccount.defaultIdentity.email =
+    "from@tinderbox.invalid";
+  MailServices.accounts.defaultAccount.defaultIdentity.smtpServerKey =
+    gSmtpServer.key;
+
+  registerCleanupFunction(() => {
+    gSmtpServerD.stop();
+    Services.prefs.clearUserPref("mail.forward_message_mode");
+  });
+}
+
 // Definition of tests. The test function name is the filter action
 // being tested, with "Body" appended to tests that use delayed
 // application of filters due to a body search
@@ -45,6 +66,7 @@
   // function serverParms() {
   //   IMAPPump.server.setDebugLevel(fsDebugAll);
   // },
+  setupSmtpServer,
   setupFilters,
   // The initial tests do not result in new messages added.
   async function MoveToFolder() {
@@ -311,6 +333,12 @@
     Assert.equal(gInboxCount + 1, folderCount(IMAPPump.inbox));
     Assert.equal(gSubfolderCount + 1, folderCount(gSubfolder));
   },
+  async function ForwardInline() {
+    return testForward(2);
+  },
+  async function ForwardAsAttachment() {
+    return testForward(0);
+  },
   /**/
   endTest,
 ];
@@ -566,3 +594,19 @@
     dump(e);
   }
 }
+
+/**
+ * Test that Ci.nsMsgFilterAction.Forward works.
+ * @param {number} mode - 0 means forward as attachment, 2 means forward inline.
+ */
+async function testForward(mode) {
+  Services.prefs.setIntPref("mail.forward_message_mode", mode);
+
+  gSmtpServerD.resetTest();
+  gAction.type = Ci.nsMsgFilterAction.Forward;
+  gAction.strValue = "to@local";
+  await setupTest(gFilter, gAction);
+  let msgData = gSmtpServerD._daemon.post;
+  Assert.ok(msgData.includes(`Subject: Fwd: ${gMessageSubject}`));
+  Assert.ok(msgData.includes(`${gMessageInBody}`));
+}
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/local/src/nsMailboxService.cpp thunderbird-91.4.0+build2/comm/mailnews/local/src/nsMailboxService.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/local/src/nsMailboxService.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/local/src/nsMailboxService.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -139,8 +139,7 @@
     const char* aMessageURI, nsISupports* aDisplayConsumer,
     nsIMsgWindow* aMsgWindow, nsIUrlListener* aUrlListener,
     const char* aFileName, /* only used by open attachment... */
-    nsMailboxAction mailboxAction, bool aOverrideCharset,
-    nsIURI** aURL) {
+    nsMailboxAction mailboxAction, bool aOverrideCharset, nsIURI** aURL) {
   nsresult rv = NS_OK;
   nsCOMPtr<nsIMailboxUrl> mailboxurl;
   nsMailboxAction actionToUse = mailboxAction;
@@ -275,8 +274,7 @@
   }
 
   return FetchMessage(aURIString.get(), aConsumer, aMsgWindow, aUrlListener,
-                      nullptr, nsIMailboxUrl::ActionFetchMessage, false,
-                      aURL);
+                      nullptr, nsIMailboxUrl::ActionFetchMessage, false, aURL);
 }
 
 NS_IMETHODIMP nsMailboxService::StreamHeaders(const char* aMessageURI,
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/local/src/nsMailboxService.h thunderbird-91.4.0+build2/comm/mailnews/local/src/nsMailboxService.h
--- thunderbird-91.3.2+build1/comm/mailnews/local/src/nsMailboxService.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/local/src/nsMailboxService.h	2021-12-09 12:01:04.000000000 +0000
@@ -51,8 +51,7 @@
       const char* aMessageURI, nsISupports* aDisplayConsumer,
       nsIMsgWindow* aMsgWindow, nsIUrlListener* aUrlListener,
       const char* aFileName, /* only used by open attachment */
-      nsMailboxAction mailboxAction, bool aOverrideCharset,
-      nsIURI** aURL);
+      nsMailboxAction mailboxAction, bool aOverrideCharset, nsIURI** aURL);
 
   nsresult DecomposeMailboxURI(const char* aMessageURI, nsIMsgFolder** aFolder,
                                nsMsgKey* aMsgKey);
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/local/src/nsMailboxUrl.h thunderbird-91.4.0+build2/comm/mailnews/local/src/nsMailboxUrl.h
--- thunderbird-91.3.2+build1/comm/mailnews/local/src/nsMailboxUrl.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/local/src/nsMailboxUrl.h	2021-12-09 12:01:04.000000000 +0000
@@ -102,7 +102,7 @@
 
   // truncated message support
   nsCString m_originalSpec;
-  nsCString mURI;              // the RDF URI associated with this url.
+  nsCString mURI;         // the RDF URI associated with this url.
   bool mOverrideCharset;  // used by nsIMsgI18NUrl...
 };
 
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/local/src/nsPop3Sink.cpp thunderbird-91.4.0+build2/comm/mailnews/local/src/nsPop3Sink.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/local/src/nsPop3Sink.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/local/src/nsPop3Sink.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -392,9 +392,9 @@
     if (server) {
       nsCString plugStoreContract;
       server->GetCharValue("storeContractID", plugStoreContract);
-      // Maildir doesn't care about quaranting, but other stores besides berkeley
-      // mailbox might. We should probably make this an attribute on the pluggable
-      // store, though.
+      // Maildir doesn't care about quaranting, but other stores besides
+      // berkeley mailbox might. We should probably make this an attribute on
+      // the pluggable store, though.
       if (plugStoreContract.Equals("@mozilla.org/msgstore/berkeleystore;1"_ns))
         pPrefBranch->GetBoolPref("mailnews.downloadToTempFile",
                                  &m_downloadingToTempFile);
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp thunderbird-91.4.0+build2/comm/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -368,17 +368,11 @@
     headerSink->HandleAttachment(
         contentType, nsDependentCString(url) /* was escapedUrl */,
         unicodeHeaderValue.get(), uriString, aIsExternalAttachment);
-
-    mSkipAttachment = false;
-
-    // List the attachments for printing.
-    rv = StartAttachmentInBody(name, contentType, url);
-  } else {
-    // If we don't need or cannot broadcast attachment info, just ignore it
-    mSkipAttachment = true;
-    rv = NS_OK;
   }
 
+  // List the attachments for printing.
+  rv = StartAttachmentInBody(name, contentType, url);
+
   return rv;
 }
 
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/mime/src/mimemoz2.cpp thunderbird-91.4.0+build2/comm/mailnews/mime/src/mimemoz2.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/mime/src/mimemoz2.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/mime/src/mimemoz2.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -1515,8 +1515,10 @@
 }
 
 bool NoEmitterProcessing(nsMimeOutputType format_out) {
-  if ((format_out == nsMimeOutput::nsMimeMessageDraftOrTemplate) ||
-      (format_out == nsMimeOutput::nsMimeMessageEditorTemplate))
+  if (format_out == nsMimeOutput::nsMimeMessageDraftOrTemplate ||
+      format_out == nsMimeOutput::nsMimeMessageEditorTemplate ||
+      format_out == nsMimeOutput::nsMimeMessageQuoting ||
+      format_out == nsMimeOutput::nsMimeMessageBodyQuoting)
     return true;
   else
     return false;
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/mime/src/mimemoz2.h thunderbird-91.4.0+build2/comm/mailnews/mime/src/mimemoz2.h
--- thunderbird-91.3.2+build1/comm/mailnews/mime/src/mimemoz2.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/mime/src/mimemoz2.h	2021-12-09 12:01:04.000000000 +0000
@@ -125,7 +125,8 @@
   char* originalMsgURI;  // the original URI of the message we are currently
                          // processing
   nsCOMPtr<nsIMsgDBHdr> origMsgHdr;
-  bool autodetectCharset; // Used to indicate pending autodetection while streaming contents.
+  bool autodetectCharset;  // Used to indicate pending autodetection while
+                           // streaming contents.
 };
 
 ////////////////////////////////////////////////////////////////
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/mime/src/mimetext.cpp thunderbird-91.4.0+build2/comm/mailnews/mime/src/mimetext.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/mime/src/mimetext.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/mime/src/mimetext.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -107,21 +107,13 @@
         text->charset = strdup("UTF-8");
 
       if (!text->charset) {
-        nsresult res;
-
         text->charsetOverridable = true;
-
-        nsCOMPtr<nsIPrefBranch> prefBranch(
-            do_GetService(NS_PREFSERVICE_CONTRACTID, &res));
+        text->inputAutodetect = true;
 
         if (obj->options && obj->options->default_charset)
           text->charset = strdup(obj->options->default_charset);
-        else {
-          if (NS_SUCCEEDED(res)) {
-            text->charset = strdup("UTF-8");
-          } else
-            text->charset = strdup("");
-        }
+        else
+          text->charset = strdup("UTF-8");
       }
     }
   }
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/mime/src/nsStreamConverter.cpp thunderbird-91.4.0+build2/comm/mailnews/mime/src/nsStreamConverter.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/mime/src/nsStreamConverter.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/mime/src/nsStreamConverter.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -26,6 +26,7 @@
 #include "nsNetUtil.h"
 #include "mozITXTToHTMLConv.h"
 #include "nsIMsgMailNewsUrl.h"
+#include "nsINntpUrl.h"
 #include "nsIMsgWindow.h"
 #include "nsICategoryManager.h"
 #include "nsMsgUtils.h"
@@ -118,7 +119,19 @@
             *default_charset = nullptr;
           } else {
             *override_charset = false;
-            *default_charset = strdup("UTF-8");
+            // Special treatment for news: URLs. Get the server default charset.
+            nsCOMPtr<nsINntpUrl> nntpURL(do_QueryInterface(aURI));
+            if (nntpURL) {
+              nsCString charset;
+              rv = nntpURL->GetCharset(charset);
+              if (NS_SUCCEEDED(rv)) {
+                *default_charset = ToNewCString(charset);
+              } else {
+                *default_charset = strdup("UTF-8");
+              }
+            } else {
+              *default_charset = strdup("UTF-8");
+            }
           }
 
           // if there is no manual override and a folder charset exists
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/news/public/nsIMsgNewsFolder.idl thunderbird-91.4.0+build2/comm/mailnews/news/public/nsIMsgNewsFolder.idl
--- thunderbird-91.3.2+build1/comm/mailnews/news/public/nsIMsgNewsFolder.idl	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/news/public/nsIMsgNewsFolder.idl	2021-12-09 12:01:04.000000000 +0000
@@ -96,6 +96,9 @@
 
   void setReadSetFromStr(in ACString setStr);
 
+  /// returns the server's default charset.
+  readonly attribute ACString charset;
+
   readonly attribute ACString newsrcLine;
   readonly attribute ACString optionLines;
   readonly attribute ACString unsubscribedNewsgroupLines;
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/news/public/nsINntpUrl.idl thunderbird-91.4.0+build2/comm/mailnews/news/public/nsINntpUrl.idl
--- thunderbird-91.3.2+build1/comm/mailnews/news/public/nsINntpUrl.idl	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/news/public/nsINntpUrl.idl	2021-12-09 12:01:04.000000000 +0000
@@ -68,6 +68,9 @@
   /// The message key portion of the URI or nsMsgKey_None if not present
   readonly attribute nsMsgKey key;
 
+  /// returns the server's default charset.
+  readonly attribute ACString charset;
+
   /// The action of this news URI could not be determined
   const nsNewsAction ActionUnknown = 0;
   /// Fetch the contents of an article
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/news/src/nsNewsFolder.cpp thunderbird-91.4.0+build2/comm/mailnews/news/src/nsNewsFolder.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/news/src/nsNewsFolder.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/news/src/nsNewsFolder.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -1242,6 +1242,15 @@
   return nsCreateNewsBaseMessageURI(nsCString(aURI).get(), mBaseMessageURI);
 }
 
+NS_IMETHODIMP nsMsgNewsFolder::GetCharset(nsACString& charset) {
+  nsCOMPtr<nsIMsgIncomingServer> server;
+  nsresult rv = GetServer(getter_AddRefs(server));
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsINntpIncomingServer> nserver(do_QueryInterface(server));
+  NS_ENSURE_TRUE(nserver, NS_ERROR_NULL_POINTER);
+  return nserver->GetCharset(charset);
+}
+
 NS_IMETHODIMP
 nsMsgNewsFolder::GetNewsrcLine(nsACString& newsrcLine) {
   nsresult rv;
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/news/src/nsNntpService.cpp thunderbird-91.4.0+build2/comm/mailnews/news/src/nsNntpService.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/news/src/nsNntpService.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/news/src/nsNntpService.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -1324,8 +1324,9 @@
     const char* aMessageURI, nsISupports* aDisplayConsumer,
     nsIMsgWindow* aMsgWindow, nsIUrlListener* aUrlListener, nsIURI** aURL) {
   mPrintingOperation = true;
-  nsresult rv = DisplayMessage(nsDependentCString(aMessageURI), aDisplayConsumer, aMsgWindow,
-                               aUrlListener, false, aURL);
+  nsresult rv =
+      DisplayMessage(nsDependentCString(aMessageURI), aDisplayConsumer,
+                     aMsgWindow, aUrlListener, false, aURL);
   mPrintingOperation = false;
   return rv;
 }
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/news/src/nsNntpUrl.cpp thunderbird-91.4.0+build2/comm/mailnews/news/src/nsNntpUrl.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/news/src/nsNntpUrl.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/news/src/nsNntpUrl.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -262,6 +262,15 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP nsNntpUrl::GetCharset(nsACString& charset) {
+  nsCOMPtr<nsIMsgIncomingServer> server;
+  nsresult rv = GetServer(getter_AddRefs(server));
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsINntpIncomingServer> nserver(do_QueryInterface(server));
+  NS_ENSURE_TRUE(nserver, NS_ERROR_NULL_POINTER);
+  return nserver->GetCharset(charset);
+}
+
 NS_IMETHODIMP nsNntpUrl::GetNormalizedSpec(nsACString& aPrincipalSpec) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/news/src/nsNntpUrl.h thunderbird-91.4.0+build2/comm/mailnews/news/src/nsNntpUrl.h
--- thunderbird-91.3.2+build1/comm/mailnews/news/src/nsNntpUrl.h	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/news/src/nsNntpUrl.h	2021-12-09 12:01:04.000000000 +0000
@@ -45,7 +45,7 @@
   nsNewsAction m_newsAction;  // the action this url represents...parse mailbox,
                               // display messages, etc.
 
-  nsCString mURI;              // the RDF URI associated with this url.
+  nsCString mURI;         // the RDF URI associated with this url.
   bool mOverrideCharset;  // used by nsIMsgI18NUrl...
 
   nsCString mOriginalSpec;
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/search/src/nsMsgFilter.cpp thunderbird-91.4.0+build2/comm/mailnews/search/src/nsMsgFilter.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/search/src/nsMsgFilter.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/search/src/nsMsgFilter.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -23,6 +23,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIMsgFilterService.h"
+#include "nsIMsgNewsFolder.h"
 #include "prmem.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Services.h"
@@ -575,11 +576,12 @@
                       bool* pResult) {
   NS_ENSURE_ARG_POINTER(folder);
   NS_ENSURE_ARG_POINTER(msgHdr);
-  // use offlineMail because
-  nsresult rv = nsMsgSearchOfflineMail::MatchTermsForFilter(
-      msgHdr, m_termList, "UTF-8", m_scope, db, headers, &m_expressionTree,
-      pResult);
-  return rv;
+  nsCString folderCharset = "UTF-8"_ns;
+  nsCOMPtr<nsIMsgNewsFolder> newsfolder(do_QueryInterface(folder));
+  if (newsfolder) newsfolder->GetCharset(folderCharset);
+  return nsMsgSearchOfflineMail::MatchTermsForFilter(
+      msgHdr, m_termList, folderCharset.get(), m_scope, db, headers,
+      &m_expressionTree, pResult);
 }
 
 NS_IMETHODIMP
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/search/src/nsMsgSearchAdapter.cpp thunderbird-91.4.0+build2/comm/mailnews/search/src/nsMsgSearchAdapter.cpp
--- thunderbird-91.3.2+build1/comm/mailnews/search/src/nsMsgSearchAdapter.cpp	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/search/src/nsMsgSearchAdapter.cpp	2021-12-09 12:01:04.000000000 +0000
@@ -25,6 +25,7 @@
 #include "nsMemory.h"
 #include "nsMsgMessageFlags.h"
 #include "mozilla/Attributes.h"
+#include "nsIMsgNewsFolder.h"
 
 // This stuff lives in the base class because the IMAP search syntax
 // is used by the Dredd SEARCH command as well as IMAP itself
@@ -201,6 +202,20 @@
   srcCharset = m_defaultCharset;
   dstCharset.Assign(srcCharset);
 
+  if (m_scope) {
+    nsCOMPtr<nsIMsgFolder> folder;
+    rv = m_scope->GetFolder(getter_AddRefs(folder));
+    if (NS_SUCCEEDED(rv) && folder) {
+      nsCOMPtr<nsIMsgNewsFolder> newsfolder(do_QueryInterface(folder));
+      if (newsfolder) {
+        nsCString folderCharset;
+        rv = newsfolder->GetCharset(folderCharset);
+        if (NS_SUCCEEDED(rv))
+          dstCharset.Assign(NS_ConvertASCIItoUTF16(folderCharset));
+      }
+    }
+  }
+
   if (forceAsciiSearch) {
     // Special cases to use in order to force US-ASCII searching with Latin1
     // or MacRoman text. Eurgh. This only has to happen because IMAP
diff -Nru thunderbird-91.3.2+build1/comm/mailnews/test/data/image-attach-test thunderbird-91.4.0+build2/comm/mailnews/test/data/image-attach-test
--- thunderbird-91.3.2+build1/comm/mailnews/test/data/image-attach-test	2021-11-19 11:56:48.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/mailnews/test/data/image-attach-test	2021-12-09 12:01:04.000000000 +0000
@@ -1,5 +1,4 @@
 From - Fri May 20 16:47:38 2008
-X-Identity-Key: id2
 Message-ID: <4A947F73.5030709@example.com>
 Date: Tue, 25 Aug 2009 17:18:59 -0700
 From: Foo Bar <xxx@example.com>
diff -Nru thunderbird-91.3.2+build1/comm/SOURCE_CHANGESET thunderbird-91.4.0+build2/comm/SOURCE_CHANGESET
--- thunderbird-91.3.2+build1/comm/SOURCE_CHANGESET	2021-11-19 11:56:51.000000000 +0000
+++ thunderbird-91.4.0+build2/comm/SOURCE_CHANGESET	2021-12-09 12:01:07.000000000 +0000
@@ -1 +1 @@
-c35def313c0c2bd0341e3e058f862f02390269c4
\ No newline at end of file
+ab6dfcf3a37bf53aac1a9d632d45ee51047050bb
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/config/milestone.txt thunderbird-91.4.0+build2/config/milestone.txt
--- thunderbird-91.3.2+build1/config/milestone.txt	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/config/milestone.txt	2021-12-09 12:00:15.000000000 +0000
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-91.3.0
+91.4.0
diff -Nru thunderbird-91.3.2+build1/debian/changelog thunderbird-91.4.0+build2/debian/changelog
--- thunderbird-91.3.2+build1/debian/changelog	2021-11-19 12:31:31.000000000 +0000
+++ thunderbird-91.4.0+build2/debian/changelog	2021-12-10 11:29:17.000000000 +0000
@@ -1,3 +1,13 @@
+thunderbird (1:91.4.0+build2-0ubuntu0.20.04.1) focal; urgency=medium
+
+  * New upstream stable release (91.4.0build2)
+
+  [ Rico Tzschichholz ]
+  * Bump dump_sys to bf7f6bd855eb6ecb233b52bfa7b2c975b7026540 (LP: #1945770)
+    - debian/build/create-tarball.py
+
+ -- Olivier Tilloy <olivier.tilloy@canonical.com>  Fri, 10 Dec 2021 12:29:17 +0100
+
 thunderbird (1:91.3.2+build1-0ubuntu0.20.04.1) focal; urgency=medium
 
   * New upstream stable release (91.3.2build1)
diff -Nru thunderbird-91.3.2+build1/devtools/client/jsonview/components/MainTabbedArea.js thunderbird-91.4.0+build2/devtools/client/jsonview/components/MainTabbedArea.js
--- thunderbird-91.3.2+build1/devtools/client/jsonview/components/MainTabbedArea.js	2021-11-19 11:55:39.000000000 +0000
+++ thunderbird-91.4.0+build2/devtools/client/jsonview/components/MainTabbedArea.js	2021-12-09 11:59:37.000000000 +0000
@@ -59,6 +59,9 @@
 
     onTabChanged(index) {
       this.setState({ activeTab: index });
+
+      // Send notification event to the window. This is useful for tests.
+      window.dispatchEvent(new CustomEvent("TabChanged"));
     }
 
     render() {
diff -Nru thunderbird-91.3.2+build1/devtools/client/jsonview/test/head.js thunderbird-91.4.0+build2/devtools/client/jsonview/test/head.js
--- thunderbird-91.3.2+build1/devtools/client/jsonview/test/head.js	2021-11-19 11:55:39.000000000 +0000
+++ thunderbird-91.4.0+build2/devtools/client/jsonview/test/head.js	2021-12-09 11:59:37.000000000 +0000
@@ -146,9 +146,17 @@
 function selectJsonViewContentTab(name) {
   info("Selecting tab: '" + name + "'");
 
-  const browser = gBrowser.selectedBrowser;
-  const selector = ".tabs-menu .tabs-menu-item." + name + " a";
-  return BrowserTestUtils.synthesizeMouseAtCenter(selector, {}, browser);
+  // eslint-disable-next-line no-shadow
+  return ContentTask.spawn(gBrowser.selectedBrowser, name, async name => {
+    const selector = ".tabs-menu .tabs-menu-item." + CSS.escape(name) + " a";
+    const element = content.document.querySelector(selector);
+    is(element.getAttribute("aria-selected"), "false", "Tab not selected yet");
+    await new Promise(resolve => {
+      content.addEventListener("TabChanged", resolve, { once: true });
+      element.click();
+    });
+    is(element.getAttribute("aria-selected"), "true", "Tab is now selected");
+  });
 }
 
 function getElementCount(selector) {
diff -Nru thunderbird-91.3.2+build1/devtools/client/shared/prefs.js thunderbird-91.4.0+build2/devtools/client/shared/prefs.js
--- thunderbird-91.3.2+build1/devtools/client/shared/prefs.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/devtools/client/shared/prefs.js	2021-12-09 11:59:37.000000000 +0000
@@ -127,10 +127,19 @@
     );
   }
   if (prefType == "Json") {
-    map(self, cache, accessorName, "Char", prefsRoot, prefName, fallbackValue, {
-      in: JSON.parse,
-      out: JSON.stringify,
-    });
+    map(
+      self,
+      cache,
+      accessorName,
+      "String",
+      prefsRoot,
+      prefName,
+      fallbackValue,
+      {
+        in: JSON.parse,
+        out: JSON.stringify,
+      }
+    );
     return;
   }
   if (prefType == "Float") {
diff -Nru thunderbird-91.3.2+build1/devtools/client/shared/test/browser_prefs-02.js thunderbird-91.4.0+build2/devtools/client/shared/test/browser_prefs-02.js
--- thunderbird-91.3.2+build1/devtools/client/shared/test/browser_prefs-02.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/devtools/client/shared/test/browser_prefs-02.js	2021-12-09 11:59:37.000000000 +0000
@@ -8,25 +8,16 @@
 const { PrefsHelper } = require("devtools/client/shared/prefs");
 
 function test() {
-  const originalJson = Services.prefs.getCharPref(
-    "devtools.performance.timeline.hidden-markers"
-  );
-  const originalFloat = Services.prefs.getCharPref(
-    "devtools.performance.memory.sample-probability"
-  );
-
-  const Prefs = new PrefsHelper("devtools.performance", {
-    float: ["Float", "memory.sample-probability"],
-    json: ["Json", "timeline.hidden-markers"],
+  const Prefs = new PrefsHelper("prefs.helper.test", {
+    float: ["Float", "float"],
+    json: ["Json", "json"],
+    jsonWithSpecialChar: ["Json", "jsonWithSpecialChar"],
   });
 
   Prefs.registerObserver();
 
-  // Float
-  Services.prefs.setCharPref(
-    "devtools.performance.timeline.hidden-markers",
-    '{"a":1}'
-  );
+  // JSON
+  Services.prefs.setCharPref("prefs.helper.test.json", '{"a":1}');
   is(Prefs.json.a, 1, "The JSON pref value is correctly casted on get.");
 
   Prefs.json = { b: 2 };
@@ -37,11 +28,31 @@
   );
   is(Prefs.json.b, 2, "The JSON pref value is correctly casted on set (2).");
 
-  // Float
-  Services.prefs.setCharPref(
-    "devtools.performance.memory.sample-probability",
-    "3.14"
+  // JSON with special character
+  Services.prefs.setStringPref(
+    "prefs.helper.test.jsonWithSpecialChar",
+    `{"hello":"��よ�皆�"}`
+  );
+  is(
+    Prefs.jsonWithSpecialChar.hello,
+    "��よ�皆�",
+    "The JSON pref value with a special character is correctly stored."
+  );
+
+  Prefs.jsonWithSpecialChar = { bye: "�よ�ら�" };
+  is(
+    Prefs.jsonWithSpecialChar.hello,
+    undefined,
+    "The JSON with the special characters pref value is correctly set. (1)"
+  );
+  is(
+    Prefs.jsonWithSpecialChar.bye,
+    "�よ�ら�",
+    "The JSON with the special characters pref value is correctly set. (2)"
   );
+
+  // Float
+  Services.prefs.setCharPref("prefs.helper.test.float", "3.14");
   is(Prefs.float, 3.14, "The float pref value is correctly casted on get.");
 
   Prefs.float = 6.28;
@@ -49,13 +60,8 @@
 
   Prefs.unregisterObserver();
 
-  Services.prefs.setCharPref(
-    "devtools.performance.timeline.hidden-markers",
-    originalJson
-  );
-  Services.prefs.setCharPref(
-    "devtools.performance.memory.sample-probability",
-    originalFloat
-  );
+  Services.prefs.clearUserPref("prefs.helper.test.float");
+  Services.prefs.clearUserPref("prefs.helper.test.json");
+  Services.prefs.clearUserPref("prefs.helper.test.jsonWithSpecialChar");
   finish();
 }
diff -Nru thunderbird-91.3.2+build1/docshell/base/nsDocShell.cpp thunderbird-91.4.0+build2/docshell/base/nsDocShell.cpp
--- thunderbird-91.3.2+build1/docshell/base/nsDocShell.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/docshell/base/nsDocShell.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -8032,7 +8032,11 @@
   mContentViewer->SetNavigationTiming(mTiming);
 
   if (NS_FAILED(mContentViewer->Init(widget, bounds, aWindowActor))) {
+    nsCOMPtr<nsIContentViewer> viewer = mContentViewer;
+    viewer->Close(nullptr);
+    viewer->Destroy();
     mContentViewer = nullptr;
+    mCurrentURI = nullptr;
     NS_WARNING("ContentViewer Initialization failed");
     return NS_ERROR_FAILURE;
   }
diff -Nru thunderbird-91.3.2+build1/docshell/test/navigation/test_rate_limit_location_change.html thunderbird-91.4.0+build2/docshell/test/navigation/test_rate_limit_location_change.html
--- thunderbird-91.3.2+build1/docshell/test/navigation/test_rate_limit_location_change.html	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/docshell/test/navigation/test_rate_limit_location_change.html	2021-12-09 11:59:38.000000000 +0000
@@ -29,6 +29,7 @@
     "history.back": () => win.history.back(),
     "history.forward": () => win.history.forward(),
     "history.go": () => win.history.go(-1),
+    "location.href": () => win.location.href = win.location.href + "",
     "location.hash": () => win.location.hash = inc++,
     "location.host": () => win.location.host = win.location.host + "",
     "location.hostname": () => win.location.hostname = win.location.hostname + "",
@@ -36,6 +37,9 @@
     "location.port": () => win.location.port = win.location.port + "",
     "location.protocol": () => win.location.protocol = win.location.protocol + "",
     "location.search": () => win.location.search = win.location.search + "",
+    "location.assign": () => win.location.assign(`${win.location.href}#${inc++}`),
+    "location.replace": () => win.location.replace(`${win.location.href}#${inc++}`),
+    "location.reload": () => win.location.reload(),
   });
 
   async function test() {
diff -Nru thunderbird-91.3.2+build1/dom/base/Location.cpp thunderbird-91.4.0+build2/dom/base/Location.cpp
--- thunderbird-91.3.2+build1/dom/base/Location.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/Location.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -25,6 +25,7 @@
 #include "nsGlobalWindow.h"
 #include "mozilla/Likely.h"
 #include "nsCycleCollectionParticipant.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/Components.h"
 #include "mozilla/NullPrincipal.h"
 #include "mozilla/ServoStyleConsts.h"
@@ -548,7 +549,13 @@
   SetURI(uri, aSubjectPrincipal, aRv);
 }
 
-void Location::Reload(bool aForceget, ErrorResult& aRv) {
+void Location::Reload(bool aForceget, nsIPrincipal& aSubjectPrincipal,
+                      ErrorResult& aRv) {
+  if (!CallerSubsumes(&aSubjectPrincipal)) {
+    aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
+    return;
+  }
+
   nsCOMPtr<nsIDocShell> docShell(GetDocShell());
   if (!docShell) {
     return aRv.Throw(NS_ERROR_FAILURE);
@@ -574,6 +581,21 @@
     }
   }
 
+  RefPtr<BrowsingContext> bc = GetBrowsingContext();
+  if (!bc || bc->IsDiscarded()) {
+    return;
+  }
+
+  CallerType callerType = aSubjectPrincipal.IsSystemPrincipal()
+                              ? CallerType::System
+                              : CallerType::NonSystem;
+
+  nsresult rv = bc->CheckLocationChangeRateLimit(callerType);
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+    return;
+  }
+
   uint32_t reloadFlags = nsIWebNavigation::LOAD_FLAGS_NONE;
 
   if (aForceget) {
@@ -581,7 +603,7 @@
                   nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY;
   }
 
-  nsresult rv = nsDocShell::Cast(docShell)->Reload(reloadFlags);
+  rv = nsDocShell::Cast(docShell)->Reload(reloadFlags);
   if (NS_FAILED(rv) && rv != NS_BINDING_ABORTED) {
     // NS_BINDING_ABORTED is returned when we attempt to reload a POST result
     // and the user says no at the "do you want to reload?" prompt.  Don't
diff -Nru thunderbird-91.3.2+build1/dom/base/Location.h thunderbird-91.4.0+build2/dom/base/Location.h
--- thunderbird-91.3.2+build1/dom/base/Location.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/Location.h	2021-12-09 11:59:38.000000000 +0000
@@ -43,14 +43,7 @@
               ErrorResult& aError);
 
   void Reload(bool aForceget, nsIPrincipal& aSubjectPrincipal,
-              ErrorResult& aError) {
-    if (!CallerSubsumes(&aSubjectPrincipal)) {
-      aError.Throw(NS_ERROR_DOM_SECURITY_ERR);
-      return;
-    }
-
-    Reload(aForceget, aError);
-  }
+              ErrorResult& aError);
 
   void GetHref(nsAString& aHref, nsIPrincipal& aSubjectPrincipal,
                ErrorResult& aError) {
@@ -118,8 +111,6 @@
 
   nsresult ToString(nsAString& aString) { return GetHref(aString); }
 
-  void Reload(bool aForceget, ErrorResult& aRv);
-
  protected:
   virtual ~Location();
 
diff -Nru thunderbird-91.3.2+build1/dom/base/nsHistory.cpp thunderbird-91.4.0+build2/dom/base/nsHistory.cpp
--- thunderbird-91.3.2+build1/dom/base/nsHistory.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/nsHistory.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -19,6 +19,7 @@
 #include "mozilla/dom/Location.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/BasePrincipal.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -137,7 +138,8 @@
   aResult.setNull();
 }
 
-void nsHistory::Go(int32_t aDelta, CallerType aCallerType, ErrorResult& aRv) {
+void nsHistory::Go(int32_t aDelta, nsIPrincipal& aSubjectPrincipal,
+                   ErrorResult& aRv) {
   LOG(("nsHistory::Go(%d)", aDelta));
   nsCOMPtr<nsPIDOMWindowInner> win(do_QueryReferent(mInnerWindow));
   if (!win || !win->HasActiveDocument()) {
@@ -149,7 +151,7 @@
     // "When the go(delta) method is invoked, if delta is zero, the user agent
     // must act as if the location.reload() method was called instead."
     RefPtr<Location> location = win->Location();
-    return location->Reload(false, aRv);
+    return location->Reload(false, aSubjectPrincipal, aRv);
   }
 
   RefPtr<ChildSHistory> session_history = GetSessionHistory();
@@ -163,12 +165,16 @@
           ? win->GetWindowContext()->HasValidTransientUserGestureActivation()
           : false;
 
+  CallerType callerType = aSubjectPrincipal.IsSystemPrincipal()
+                              ? CallerType::System
+                              : CallerType::NonSystem;
+
   // Ignore the return value from Go(), since returning errors from Go() can
   // lead to exceptions and a possible leak of history length
   // AsyncGo throws if we hit the location change rate limit.
   if (StaticPrefs::dom_window_history_async()) {
     session_history->AsyncGo(aDelta, /* aRequireUserInteraction = */ false,
-                             userActivation, aCallerType, aRv);
+                             userActivation, callerType, aRv);
   } else {
     session_history->Go(aDelta, /* aRequireUserInteraction = */ false,
                         userActivation, IgnoreErrors());
diff -Nru thunderbird-91.3.2+build1/dom/base/nsHistory.h thunderbird-91.4.0+build2/dom/base/nsHistory.h
--- thunderbird-91.3.2+build1/dom/base/nsHistory.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/nsHistory.h	2021-12-09 11:59:38.000000000 +0000
@@ -45,7 +45,7 @@
                             mozilla::ErrorResult& aRv);
   void GetState(JSContext* aCx, JS::MutableHandle<JS::Value> aResult,
                 mozilla::ErrorResult& aRv) const;
-  void Go(int32_t aDelta, mozilla::dom::CallerType aCallerType,
+  void Go(int32_t aDelta, nsIPrincipal& aSubjectPrincipal,
           mozilla::ErrorResult& aRv);
   void Back(mozilla::dom::CallerType aCallerType, mozilla::ErrorResult& aRv);
   void Forward(mozilla::dom::CallerType aCallerType, mozilla::ErrorResult& aRv);
diff -Nru thunderbird-91.3.2+build1/dom/base/nsObjectLoadingContent.cpp thunderbird-91.4.0+build2/dom/base/nsObjectLoadingContent.cpp
--- thunderbird-91.3.2+build1/dom/base/nsObjectLoadingContent.cpp	2021-11-19 11:55:40.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/nsObjectLoadingContent.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -1838,6 +1838,8 @@
     if (cspToInherit) {
       loadState->SetCsp(cspToInherit);
     }
+    loadState->SetTriggeringSandboxFlags(sandboxFlags);
+
     // TODO(djg): This was httpChan->SetReferrerInfoWithoutClone(referrerInfo);
     // Is the ...WithoutClone(...) important?
     auto referrerInfo = MakeRefPtr<ReferrerInfo>(*doc);
diff -Nru thunderbird-91.3.2+build1/dom/base/nsStructuredCloneContainer.cpp thunderbird-91.4.0+build2/dom/base/nsStructuredCloneContainer.cpp
--- thunderbird-91.3.2+build1/dom/base/nsStructuredCloneContainer.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/nsStructuredCloneContainer.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -14,6 +14,7 @@
 #include "js/Value.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Base64.h"
+#include "mozilla/CheckedInt.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/fallible.h"
@@ -143,6 +144,11 @@
 
   auto iter = Data().Start();
   size_t size = Data().Size();
+  CheckedInt<nsAutoCString::size_type> sizeCheck(size);
+  if (!sizeCheck.isValid()) {
+    return NS_ERROR_FAILURE;
+  }
+
   nsAutoCString binaryData;
   if (!binaryData.SetLength(size, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
diff -Nru thunderbird-91.3.2+build1/dom/base/nsTextFragment.cpp thunderbird-91.4.0+build2/dom/base/nsTextFragment.cpp
--- thunderbird-91.3.2+build1/dom/base/nsTextFragment.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/nsTextFragment.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -196,6 +196,11 @@
 
 bool nsTextFragment::SetTo(const char16_t* aBuffer, int32_t aLength,
                            bool aUpdateBidi, bool aForce2b) {
+  if (MOZ_UNLIKELY(aLength < 0 || static_cast<uint32_t>(aLength) >
+                                      NS_MAX_TEXT_FRAGMENT_LENGTH)) {
+    return false;
+  }
+
   if (aForce2b && mState.mIs2b && !m2b->IsReadonly()) {
     uint32_t storageSize = m2b->StorageSize();
     uint32_t neededSize = aLength * sizeof(char16_t);
@@ -355,6 +360,9 @@
   // This is a common case because some callsites create a textnode
   // with a value by creating the node and then calling AppendData.
   if (mState.mLength == 0) {
+    if (MOZ_UNLIKELY(aLength > INT32_MAX)) {
+      return false;
+    }
     return SetTo(aBuffer, aLength, aUpdateBidi, aForce2b);
   }
 
diff -Nru thunderbird-91.3.2+build1/dom/base/nsTextFragment.h thunderbird-91.4.0+build2/dom/base/nsTextFragment.h
--- thunderbird-91.3.2+build1/dom/base/nsTextFragment.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/nsTextFragment.h	2021-12-09 11:59:38.000000000 +0000
@@ -90,6 +90,8 @@
    */
   uint32_t GetLength() const { return mState.mLength; }
 
+#define NS_MAX_TEXT_FRAGMENT_LENGTH (static_cast<uint32_t>(0x1FFFFFFF))
+
   bool CanGrowBy(size_t n) const {
     return n < (1 << 29) && mState.mLength + n < (1 << 29);
   }
@@ -106,6 +108,9 @@
              bool aForce2b);
 
   bool SetTo(const nsString& aString, bool aUpdateBidi, bool aForce2b) {
+    if (MOZ_UNLIKELY(aString.Length() > NS_MAX_TEXT_FRAGMENT_LENGTH)) {
+      return false;
+    }
     ReleaseText();
     if (aForce2b && !aUpdateBidi) {
       nsStringBuffer* buffer = nsStringBuffer::FromString(aString);
@@ -283,8 +288,6 @@
     uint32_t mLength : 29;
   };
 
-#define NS_MAX_TEXT_FRAGMENT_LENGTH (static_cast<uint32_t>(0x1FFFFFFF))
-
   size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
 
   /**
diff -Nru thunderbird-91.3.2+build1/dom/base/StructuredCloneBlob.cpp thunderbird-91.4.0+build2/dom/base/StructuredCloneBlob.cpp
--- thunderbird-91.3.2+build1/dom/base/StructuredCloneBlob.cpp	2021-11-19 11:55:40.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/base/StructuredCloneBlob.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -144,6 +144,9 @@
   if (!JS_ReadUint32Pair(aReader, &length, &version)) {
     return false;
   }
+  if (length % 8 != 0) {
+    return false;
+  }
 
   uint32_t blobOffset;
   uint32_t blobCount;
diff -Nru thunderbird-91.3.2+build1/dom/cache/Cache.cpp thunderbird-91.4.0+build2/dom/cache/Cache.cpp
--- thunderbird-91.3.2+build1/dom/cache/Cache.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/cache/Cache.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -307,8 +307,9 @@
   MOZ_DIAGNOSTIC_ASSERT(!global.Failed());
 
   nsTArray<SafeRefPtr<Request>> requestList(1);
+  RootedDictionary<RequestInit> requestInit(aContext);
   SafeRefPtr<Request> request =
-      Request::Constructor(global, aRequest, RequestInit(), aRv);
+      Request::Constructor(global, aRequest, requestInit, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
@@ -351,8 +352,9 @@
           aRequestList[i].GetAsUSVString());
     }
 
+    RootedDictionary<RequestInit> requestInit(aContext);
     SafeRefPtr<Request> request =
-        Request::Constructor(global, requestOrString, RequestInit(), aRv);
+        Request::Constructor(global, requestOrString, requestInit, aRv);
     if (NS_WARN_IF(aRv.Failed())) {
       return nullptr;
     }
@@ -540,8 +542,9 @@
   for (uint32_t i = 0; i < aRequestList.Length(); ++i) {
     RequestOrUSVString requestOrString;
     requestOrString.SetAsRequest() = aRequestList[i].unsafeGetRawPtr();
+    RootedDictionary<RequestInit> requestInit(aGlobal.Context());
     RefPtr<Promise> fetch =
-        FetchRequest(mGlobal, requestOrString, RequestInit(), aCallerType, aRv);
+        FetchRequest(mGlobal, requestOrString, requestInit, aCallerType, aRv);
     if (NS_WARN_IF(aRv.Failed())) {
       return nullptr;
     }
diff -Nru thunderbird-91.3.2+build1/dom/cache/TypeUtils.cpp thunderbird-91.4.0+build2/dom/cache/TypeUtils.cpp
--- thunderbird-91.3.2+build1/dom/cache/TypeUtils.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/cache/TypeUtils.cpp	2021-12-09 11:59:38.000000000 +0000
@@ -473,8 +473,9 @@
   GlobalObject global(cx, GetGlobalObject()->GetGlobalJSObject());
   MOZ_DIAGNOSTIC_ASSERT(!global.Failed());
 
+  RootedDictionary<RequestInit> requestInit(cx);
   SafeRefPtr<Request> request =
-      Request::Constructor(global, requestOrString, RequestInit(), aRv);
+      Request::Constructor(global, requestOrString, requestInit, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
diff -Nru thunderbird-91.3.2+build1/dom/events/EventStateManager.cpp thunderbird-91.4.0+build2/dom/events/EventStateManager.cpp
--- thunderbird-91.3.2+build1/dom/events/EventStateManager.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/events/EventStateManager.cpp	2021-12-09 11:59:39.000000000 +0000
@@ -4002,6 +4002,10 @@
   // The cursor size won't be affected by our full zoom in the parent process,
   // so undo that before checking the rect.
   float zoom = topLevel->GetFullZoom();
+
+  // Also adjust for accessibility cursor scaling factor.
+  zoom /= LookAndFeel::GetFloat(LookAndFeel::FloatID::CursorScale, 1.0f);
+
   nsSize size(CSSPixel::ToAppUnits(width / zoom),
               CSSPixel::ToAppUnits(height / zoom));
   nsPoint hotspot(CSSPixel::ToAppUnits(aCursor.mHotspot.x / zoom),
diff -Nru thunderbird-91.3.2+build1/dom/html/test/browser_fullscreen-navigation.js thunderbird-91.4.0+build2/dom/html/test/browser_fullscreen-navigation.js
--- thunderbird-91.3.2+build1/dom/html/test/browser_fullscreen-navigation.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/html/test/browser_fullscreen-navigation.js	2021-12-09 11:59:39.000000000 +0000
@@ -0,0 +1,64 @@
+"use strict";
+
+// This test tends to trigger a race in the fullscreen time telemetry,
+// where the fullscreen enter and fullscreen exit events (which use the
+// same histogram ID) overlap. That causes TelemetryStopwatch to log an
+// error.
+SimpleTest.ignoreAllUncaughtExceptions(true);
+
+function waitFullscreenEvents(aDocument) {
+  return new Promise(resolve => {
+    function errorHandler() {
+      ok(false, "should not get fullscreenerror event");
+    }
+
+    let countFsChange = 0;
+    function changeHandler() {
+      ++countFsChange;
+      if (countFsChange == 2) {
+        aDocument.removeEventListener("fullscreenchange", changeHandler);
+        aDocument.removeEventListener("fullscreenerror", errorHandler);
+        resolve();
+      }
+    }
+
+    aDocument.addEventListener("fullscreenchange", changeHandler);
+    aDocument.addEventListener("fullscreenerror", errorHandler);
+  });
+}
+
+add_task(async function init() {
+  await pushPrefs(
+    ["full-screen-api.transition-duration.enter", "0 0"],
+    ["full-screen-api.transition-duration.leave", "0 0"]
+  );
+});
+
+add_task(async function navigation() {
+  await BrowserTestUtils.withNewTab(
+    {
+      gBrowser,
+      url: `data:text/html,
+      <button id="button">Click here</button>
+      <script>
+        let button = document.getElementById("button");
+        button.addEventListener("click", function() {
+          button.requestFullscreen();
+          location.href = "about:blank";
+        });
+      </script>`,
+    },
+    async function(browser) {
+      let promiseFsEvents = waitFullscreenEvents(document);
+
+      await BrowserTestUtils.synthesizeMouseAtCenter("#button", {}, browser);
+      await promiseFsEvents;
+
+      ok(!window.fullScreen, "The chrome window should not be in fullscreen");
+      ok(
+        !document.documentElement.hasAttribute("inDOMFullscreen"),
+        "The chrome document should not be in fullscreen"
+      );
+    }
+  );
+});
diff -Nru thunderbird-91.3.2+build1/dom/html/test/browser.ini thunderbird-91.4.0+build2/dom/html/test/browser.ini
--- thunderbird-91.3.2+build1/dom/html/test/browser.ini	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/html/test/browser.ini	2021-12-09 11:59:39.000000000 +0000
@@ -34,6 +34,8 @@
 support-files = file_fullscreen-newtab.html
 skip-if = os == 'mac'
   (os == 'linux' && bits == 64 && os_version == '18.04')  # Bug 1601460, Bug 1494843
+[browser_fullscreen-navigation.js]
+tags = fullscreen
 [browser_submission_flush.js]
 [browser_refresh_after_document_write.js]
 support-files =
diff -Nru thunderbird-91.3.2+build1/dom/ipc/ClonedErrorHolder.cpp thunderbird-91.4.0+build2/dom/ipc/ClonedErrorHolder.cpp
--- thunderbird-91.3.2+build1/dom/ipc/ClonedErrorHolder.cpp	2021-11-19 11:55:40.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/ipc/ClonedErrorHolder.cpp	2021-12-09 11:59:39.000000000 +0000
@@ -341,6 +341,9 @@
   if (!JS_ReadUint32Pair(aReader, &length, &version)) {
     return false;
   }
+  if (length % 8 != 0) {
+    return false;
+  }
 
   JSStructuredCloneData data(mStructuredCloneScope);
   while (length) {
diff -Nru thunderbird-91.3.2+build1/dom/media/MediaDecoderStateMachine.cpp thunderbird-91.4.0+build2/dom/media/MediaDecoderStateMachine.cpp
--- thunderbird-91.3.2+build1/dom/media/MediaDecoderStateMachine.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/media/MediaDecoderStateMachine.cpp	2021-12-09 11:59:39.000000000 +0000
@@ -594,11 +594,13 @@
   void HandleVideoDecoded(VideoData* aVideo, TimeStamp aDecodeStart) override {
     const auto currentTime = mMaster->GetMediaTime();
     if (aVideo->GetEndTime() < currentTime) {
-      SLOG("video %" PRId64 " is too late (current=%" PRId64 ")",
-           aVideo->GetEndTime().ToMicroseconds(), currentTime.ToMicroseconds());
-      mRequestNextVideoKeyFrame = true;
+      if (!mVideoFirstLateTime) {
+        mVideoFirstLateTime = Some(TimeStamp::Now());
+      }
+      SLOG("video %" PRId64 " starts being late (current=%" PRId64 ")",
+           aVideo->mTime.ToMicroseconds(), currentTime.ToMicroseconds());
     } else {
-      mRequestNextVideoKeyFrame = false;
+      mVideoFirstLateTime.reset();
     }
     mMaster->PushVideo(aVideo);
     DispatchDecodeTasksIfNeeded();
@@ -609,7 +611,7 @@
 
   void HandleVideoCanceled() override {
     mMaster->RequestVideoData(mMaster->GetMediaTime(),
-                              mRequestNextVideoKeyFrame);
+                              ShouldRequestNextKeyFrame());
   }
 
   void HandleEndOfAudio() override;
@@ -631,7 +633,7 @@
 
   void HandleVideoWaited(MediaData::Type aType) override {
     mMaster->RequestVideoData(mMaster->GetMediaTime(),
-                              mRequestNextVideoKeyFrame);
+                              ShouldRequestNextKeyFrame());
   }
 
   void HandleAudioCaptured() override {
@@ -661,6 +663,7 @@
 
     if (aPlayState == MediaDecoder::PLAY_STATE_PAUSED) {
       StartDormantTimer();
+      mVideoFirstLateTime.reset();
     } else {
       mDormantTimer.Reset();
     }
@@ -759,6 +762,23 @@
         [this]() { mDormantTimer.CompleteRequest(); });
   }
 
+  bool ShouldRequestNextKeyFrame() const {
+    if (!mVideoFirstLateTime) {
+      return false;
+    }
+    const double elapsedTimeMs =
+        (TimeStamp::Now() - *mVideoFirstLateTime).ToMilliseconds();
+    const bool rv = elapsedTimeMs >=
+                    StaticPrefs::media_decoder_skip_when_video_too_slow_ms();
+    if (rv) {
+      SLOG(
+          "video has been late behind media time for %f ms, should skip to "
+          "next key frame",
+          elapsedTimeMs);
+    }
+    return rv;
+  }
+
   // Time at which we started decoding.
   TimeStamp mDecodeStartTime;
 
@@ -777,10 +797,10 @@
   MediaEventListener mOnAudioPopped;
   MediaEventListener mOnVideoPopped;
 
-  // It will be set to true if the received decoded video frame is already late
-  // comparing to the current time. So we will want to directly request the next
-  // keyframe in order to catch up with the playback time.
-  bool mRequestNextVideoKeyFrame = false;
+  // If video has been later than the media time, this will records when the
+  // video started being late. It will be reset once video catches up with the
+  // media time.
+  Maybe<TimeStamp> mVideoFirstLateTime;
 };
 
 /**
@@ -2479,7 +2499,8 @@
       mMaster->IsWaitingVideoData()) {
     return;
   }
-  mMaster->RequestVideoData(mMaster->GetMediaTime(), mRequestNextVideoKeyFrame);
+  mMaster->RequestVideoData(mMaster->GetMediaTime(),
+                            ShouldRequestNextKeyFrame());
 }
 
 void MediaDecoderStateMachine::DecodingState::MaybeStartBuffering() {
diff -Nru thunderbird-91.3.2+build1/dom/media/tests/crashtests/1717318.html thunderbird-91.4.0+build2/dom/media/tests/crashtests/1717318.html
--- thunderbird-91.3.2+build1/dom/media/tests/crashtests/1717318.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/media/tests/crashtests/1717318.html	2021-12-09 11:59:40.000000000 +0000
@@ -0,0 +1,10 @@
+<html>
+<head>
+<script>
+window.addEventListener('load', () => {
+  SpecialPowers.Components.classes["@mozilla.org/peerconnection;1"].createInstance(SpecialPowers.Components.interfaces.nsIArray);
+})
+</script>
+</head>
+</html>
+
diff -Nru thunderbird-91.3.2+build1/dom/media/tests/crashtests/crashtests.list thunderbird-91.4.0+build2/dom/media/tests/crashtests/crashtests.list
--- thunderbird-91.3.2+build1/dom/media/tests/crashtests/crashtests.list	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/media/tests/crashtests/crashtests.list	2021-12-09 11:59:40.000000000 +0000
@@ -35,3 +35,4 @@
 skip-if(Android) pref(media.getusermedia.audiocapture.enabled,true) load 1573536.html
 skip-if(!Android) pref(media.getusermedia.audiocapture.enabled,true) pref(media.navigator.permission.device,false) load 1573536.html # media.navigator.permission.device is mobile-only, so other platforms fail to set it (Bug 1350948)
 load 1594136.html
+load 1717318.html
diff -Nru thunderbird-91.3.2+build1/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp thunderbird-91.4.0+build2/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp
--- thunderbird-91.3.2+build1/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp	2021-12-09 11:59:40.000000000 +0000
@@ -343,8 +343,9 @@
     destroy_timecard(mTimeCard);
     mTimeCard = nullptr;
   }
-  // This aborts if not on main thread (in Debug builds)
-  PC_AUTO_ENTER_API_CALL_NO_CHECK();
+
+  MOZ_ASSERT(NS_IsMainThread());
+
   if (mWindow && mActiveOnWindow) {
     mWindow->RemovePeerConnection();
     // No code is supposed to observe the assignment below, but
@@ -2125,7 +2126,7 @@
 }
 
 void PeerConnectionImpl::ShutdownMedia() {
-  PC_AUTO_ENTER_API_CALL_NO_CHECK();
+  MOZ_ASSERT(NS_IsMainThread());
 
   if (!mMedia) return;
 
diff -Nru thunderbird-91.3.2+build1/dom/media/webrtc/jsapi/RTCStatsReport.cpp thunderbird-91.4.0+build2/dom/media/webrtc/jsapi/RTCStatsReport.cpp
--- thunderbird-91.3.2+build1/dom/media/webrtc/jsapi/RTCStatsReport.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/media/webrtc/jsapi/RTCStatsReport.cpp	2021-12-09 11:59:40.000000000 +0000
@@ -13,9 +13,9 @@
 namespace mozilla::dom {
 
 RTCStatsTimestampMaker::RTCStatsTimestampMaker(const GlobalObject* aGlobal) {
-  nsCOMPtr<nsPIDOMWindowInner> window =
-      do_QueryInterface(aGlobal->GetAsSupports());
-  if (window) {
+  nsCOMPtr<nsPIDOMWindowInner> window;
+  if (aGlobal && (window = do_QueryInterface(aGlobal->GetAsSupports())) &&
+      window->GetPerformance()) {
     mRandomTimelineSeed = window->GetPerformance()->GetRandomTimelineSeed();
     mStartMonotonic = window->GetPerformance()->CreationTimeStamp();
     // Ugh. Performance::TimeOrigin is not constant, which means we need to
diff -Nru thunderbird-91.3.2+build1/dom/network/TCPSocket.cpp thunderbird-91.4.0+build2/dom/network/TCPSocket.cpp
--- thunderbird-91.3.2+build1/dom/network/TCPSocket.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/network/TCPSocket.cpp	2021-12-09 11:59:40.000000000 +0000
@@ -893,9 +893,12 @@
 
   nsCOMPtr<nsIURI> uri;
   nsCString spec = mSsl ? "https://"_ns : "http://"_ns;
+  bool maybeIPv6 = mHost.FindChar(':') != -1;
+  if (maybeIPv6) spec.Append('[');
   if (!AppendUTF16toUTF8(mHost, spec, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
+  if (maybeIPv6) spec.Append(']');
   rv = NS_MutateURI(NS_STANDARDURLMUTATOR_CONTRACTID)
            .SetSpec(spec)
            .SetPort(mPort)
diff -Nru thunderbird-91.3.2+build1/dom/network/tests/test_tcpsocket_client_and_server_basics.js thunderbird-91.4.0+build2/dom/network/tests/test_tcpsocket_client_and_server_basics.js
--- thunderbird-91.3.2+build1/dom/network/tests/test_tcpsocket_client_and_server_basics.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/network/tests/test_tcpsocket_client_and_server_basics.js	2021-12-09 11:59:39.000000000 +0000
@@ -589,3 +589,27 @@
 }
 
 add_task(test_basics);
+
+/**
+ * Test that TCPSocket works with ipv6 address.
+ */
+add_task(async function test_ipv6() {
+  const { HttpServer } = ChromeUtils.import(
+    "resource://testing-common/httpd.js"
+  );
+  let deferred = defer();
+  let httpServer = new HttpServer();
+  httpServer.start_ipv6(-1);
+
+  let clientSocket = new TCPSocket("::1", httpServer.identity.primaryPort);
+  clientSocket.onopen = () => {
+    ok(true, "Connect to ipv6 address succeeded");
+    deferred.resolve();
+  };
+  clientSocket.onerror = () => {
+    ok(false, "Connect to ipv6 address failed");
+    deferred.reject();
+  };
+  await deferred.promise;
+  await httpServer.stop();
+});
diff -Nru thunderbird-91.3.2+build1/dom/push/PushManager.cpp thunderbird-91.4.0+build2/dom/push/PushManager.cpp
--- thunderbird-91.3.2+build1/dom/push/PushManager.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/push/PushManager.cpp	2021-12-09 11:59:40.000000000 +0000
@@ -452,7 +452,7 @@
 
 already_AddRefed<Promise> PushManager::PerformSubscriptionActionFromWorker(
     SubscriptionAction aAction, ErrorResult& aRv) {
-  PushSubscriptionOptionsInit options;
+  RootedDictionary<PushSubscriptionOptionsInit> options(RootingCx());
   return PerformSubscriptionActionFromWorker(aAction, options, aRv);
 }
 
diff -Nru thunderbird-91.3.2+build1/dom/reporting/ReportDeliver.cpp thunderbird-91.4.0+build2/dom/reporting/ReportDeliver.cpp
--- thunderbird-91.3.2+build1/dom/reporting/ReportDeliver.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/reporting/ReportDeliver.cpp	2021-12-09 11:59:40.000000000 +0000
@@ -221,8 +221,9 @@
   RequestOrUSVString fetchInput;
   fetchInput.SetAsRequest() = request;
 
-  RefPtr<Promise> promise = FetchRequest(
-      globalObject, fetchInput, RequestInit(), CallerType::NonSystem, error);
+  RootedDictionary<RequestInit> requestInit(RootingCx());
+  RefPtr<Promise> promise = FetchRequest(globalObject, fetchInput, requestInit,
+                                         CallerType::NonSystem, error);
   if (error.Failed()) {
     for (auto& report : aReports) {
       ++report.mFailures;
diff -Nru thunderbird-91.3.2+build1/dom/serviceworkers/ServiceWorkerOp.cpp thunderbird-91.4.0+build2/dom/serviceworkers/ServiceWorkerOp.cpp
--- thunderbird-91.3.2+build1/dom/serviceworkers/ServiceWorkerOp.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/serviceworkers/ServiceWorkerOp.cpp	2021-12-09 11:59:40.000000000 +0000
@@ -653,7 +653,7 @@
     const ServiceWorkerPushEventOpArgs& args =
         mArgs.get_ServiceWorkerPushEventOpArgs();
 
-    PushEventInit pushEventInit;
+    RootedDictionary<PushEventInit> pushEventInit(aCx);
 
     if (args.data().type() != OptionalPushData::Tvoid_t) {
       auto& bytes = args.data().get_ArrayOfuint8_t();
diff -Nru thunderbird-91.3.2+build1/dom/serviceworkers/ServiceWorkerPrivate.cpp thunderbird-91.4.0+build2/dom/serviceworkers/ServiceWorkerPrivate.cpp
--- thunderbird-91.3.2+build1/dom/serviceworkers/ServiceWorkerPrivate.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/serviceworkers/ServiceWorkerPrivate.cpp	2021-12-09 11:59:40.000000000 +0000
@@ -828,7 +828,7 @@
     RefPtr<PushErrorReporter> errorReporter =
         new PushErrorReporter(aWorkerPrivate, mMessageId);
 
-    PushEventInit pei;
+    RootedDictionary<PushEventInit> pei(aCx);
     if (mData) {
       const nsTArray<uint8_t>& bytes = mData.ref();
       JSObject* data =
diff -Nru thunderbird-91.3.2+build1/dom/webidl/History.webidl thunderbird-91.4.0+build2/dom/webidl/History.webidl
--- thunderbird-91.3.2+build1/dom/webidl/History.webidl	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/webidl/History.webidl	2021-12-09 11:59:40.000000000 +0000
@@ -21,7 +21,7 @@
   attribute ScrollRestoration scrollRestoration;
   [Throws]
   readonly attribute any state;
-  [Throws, NeedsCallerType]
+  [Throws, NeedsSubjectPrincipal]
   void go(optional long delta = 0);
   [Throws, NeedsCallerType]
   void back();
diff -Nru thunderbird-91.3.2+build1/dom/worklet/Worklet.cpp thunderbird-91.4.0+build2/dom/worklet/Worklet.cpp
--- thunderbird-91.3.2+build1/dom/worklet/Worklet.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/worklet/Worklet.cpp	2021-12-09 11:59:41.000000000 +0000
@@ -126,7 +126,7 @@
     RequestOrUSVString requestInput;
     requestInput.SetAsUSVString().ShareOrDependUpon(aModuleURL);
 
-    RequestInit requestInit;
+    RootedDictionary<RequestInit> requestInit(aCx);
     requestInit.mCredentials.Construct(aOptions.mCredentials);
 
     SafeRefPtr<Request> request =
diff -Nru thunderbird-91.3.2+build1/dom/xhr/XMLHttpRequestMainThread.cpp thunderbird-91.4.0+build2/dom/xhr/XMLHttpRequestMainThread.cpp
--- thunderbird-91.3.2+build1/dom/xhr/XMLHttpRequestMainThread.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/dom/xhr/XMLHttpRequestMainThread.cpp	2021-12-09 11:59:40.000000000 +0000
@@ -2917,6 +2917,7 @@
   // as per spec. We really should create the channel here in send(), but
   // we have internal code relying on the channel being created in open().
   if (!mChannel) {
+    mErrorLoad = ErrorType::eChannelOpen;
     mFlagSend = true;  // so CloseRequestWithError sets us to DONE.
     aRv = MaybeSilentSendFailure(NS_ERROR_DOM_NETWORK_ERR);
     return;
@@ -2924,6 +2925,7 @@
 
   // non-GET requests aren't allowed for blob.
   if (IsBlobURI(mRequestURL) && !mRequestMethod.EqualsLiteral("GET")) {
+    mErrorLoad = ErrorType::eChannelOpen;
     mFlagSend = true;  // so CloseRequestWithError sets us to DONE.
     aRv = MaybeSilentSendFailure(NS_ERROR_DOM_NETWORK_ERR);
     return;
diff -Nru thunderbird-91.3.2+build1/gfx/2d/DrawTargetSkia.cpp thunderbird-91.4.0+build2/gfx/2d/DrawTargetSkia.cpp
--- thunderbird-91.3.2+build1/gfx/2d/DrawTargetSkia.cpp	2021-11-19 11:55:41.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/2d/DrawTargetSkia.cpp	2021-12-09 11:59:41.000000000 +0000
@@ -284,7 +284,7 @@
                   map.mData, map.mStride);
   sk_sp<SkImage> image = SkImage::MakeFromRaster(pixmap, releaseProc, surf);
   if (!image) {
-    ReleaseTemporarySurface(nullptr, surf);
+    releaseProc(map.mData, surf);
     gfxDebug() << "Failed making Skia raster image for temporary surface";
   }
 
diff -Nru thunderbird-91.3.2+build1/gfx/2d/RecordedEvent.h thunderbird-91.4.0+build2/gfx/2d/RecordedEvent.h
--- thunderbird-91.3.2+build1/gfx/2d/RecordedEvent.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/2d/RecordedEvent.h	2021-12-09 11:59:40.000000000 +0000
@@ -59,9 +59,9 @@
 };
 
 struct RecordedFontDetails {
-  uint64_t fontDataKey;
-  uint32_t size;
-  uint32_t index;
+  uint64_t fontDataKey = 0;
+  uint32_t size = 0;
+  uint32_t index = 0;
 };
 
 struct RecordedDependentSurface {
diff -Nru thunderbird-91.3.2+build1/gfx/2d/RecordedEventImpl.h thunderbird-91.4.0+build2/gfx/2d/RecordedEventImpl.h
--- thunderbird-91.3.2+build1/gfx/2d/RecordedEventImpl.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/2d/RecordedEventImpl.h	2021-12-09 11:59:41.000000000 +0000
@@ -370,7 +370,7 @@
   PatternStorage mPattern;
   DrawOptions mOptions;
   Glyph* mGlyphs = nullptr;
-  uint32_t mNumGlyphs;
+  uint32_t mNumGlyphs = 0;
 };
 
 class RecordedMask : public RecordedDrawingEvent<RecordedMask> {
@@ -1048,7 +1048,7 @@
 
   ReferencePtr mRefPtr;
   GradientStop* mStops = nullptr;
-  uint32_t mNumStops;
+  uint32_t mNumStops = 0;
   ExtendMode mExtendMode;
   bool mDataOwned;
 
@@ -2365,6 +2365,11 @@
 inline RecordedFillGlyphs::~RecordedFillGlyphs() { delete[] mGlyphs; }
 
 inline bool RecordedFillGlyphs::PlayEvent(Translator* aTranslator) const {
+  if (mNumGlyphs > 0 && !mGlyphs) {
+    // Glyph allocation failed
+    return false;
+  }
+
   DrawTarget* dt = aTranslator->LookupDrawTarget(mDT);
   if (!dt) {
     return false;
@@ -2390,12 +2395,19 @@
   ReadDrawOptions(aStream, mOptions);
   ReadPatternData(aStream, mPattern);
   ReadElement(aStream, mNumGlyphs);
-  if (!aStream.good()) {
+  if (!aStream.good() || mNumGlyphs <= 0) {
     return;
   }
 
-  mGlyphs = new Glyph[mNumGlyphs];
-  aStream.read((char*)mGlyphs, sizeof(Glyph) * mNumGlyphs);
+  mGlyphs = new (fallible) Glyph[mNumGlyphs];
+  if (!mGlyphs) {
+     gfxCriticalNote
+         << "RecordedFillGlyphs failed to allocate glyphs of size "
+         << mNumGlyphs;
+    aStream.SetIsBad();
+  } else {
+    aStream.read((char*)mGlyphs, sizeof(Glyph) * mNumGlyphs);
+  }
 }
 
 template <class S>
@@ -3060,8 +3072,11 @@
     return;
   }
 
-  size_t size = mSize.width * mSize.height * BytesPerPixel(mFormat);
-  mData = new (fallible) uint8_t[size];
+  size_t size = 0;
+  if (mSize.width >= 0 && mSize.height >= 0) {
+    size = size_t(mSize.width) * size_t(mSize.height) * BytesPerPixel(mFormat);
+    mData = new (fallible) uint8_t[size];
+  }
   if (!mData) {
     gfxCriticalNote
         << "RecordedSourceSurfaceCreation failed to allocate data of size "
@@ -3234,6 +3249,10 @@
 
 inline bool RecordedGradientStopsCreation::PlayEvent(
     Translator* aTranslator) const {
+  if (mNumStops > 0 && !mStops) {
+    // Stops allocation failed
+    return false;
+  }
   RefPtr<GradientStops> src =
       aTranslator->GetOrCreateGradientStops(mStops, mNumStops, mExtendMode);
   aTranslator->AddGradientStops(mRefPtr, src);
@@ -3255,13 +3274,19 @@
   ReadElementConstrained(aStream, mExtendMode, ExtendMode::CLAMP,
                          ExtendMode::REFLECT);
   ReadElement(aStream, mNumStops);
-  if (!aStream.good()) {
+  if (!aStream.good() || mNumStops <= 0) {
     return;
   }
 
-  mStops = new GradientStop[mNumStops];
-
-  aStream.read((char*)mStops, mNumStops * sizeof(GradientStop));
+  mStops = new (fallible) GradientStop[mNumStops];
+  if (!mStops) {
+    gfxCriticalNote
+        << "RecordedGradientStopsCreation failed to allocate stops of size "
+        << mNumStops;
+    aStream.SetIsBad();
+  } else {
+    aStream.read((char*)mStops, mNumStops * sizeof(GradientStop));
+  }
 }
 
 inline void RecordedGradientStopsCreation::OutputSimpleEventInfo(
diff -Nru thunderbird-91.3.2+build1/gfx/layers/SourceSurfaceSharedData.h thunderbird-91.4.0+build2/gfx/layers/SourceSurfaceSharedData.h
--- thunderbird-91.3.2+build1/gfx/layers/SourceSurfaceSharedData.h	2021-11-19 11:55:42.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/layers/SourceSurfaceSharedData.h	2021-12-09 11:59:41.000000000 +0000
@@ -56,7 +56,9 @@
 
   int32_t Stride() override { return mStride; }
 
-  SurfaceType GetType() const override { return SurfaceType::DATA; }
+  SurfaceType GetType() const override {
+    return SurfaceType::DATA_SHARED_WRAPPER;
+  }
   IntSize GetSize() const override { return mSize; }
   SurfaceFormat GetFormat() const override { return mFormat; }
 
diff -Nru thunderbird-91.3.2+build1/gfx/thebes/gfxPlatformFontList.cpp thunderbird-91.4.0+build2/gfx/thebes/gfxPlatformFontList.cpp
--- thunderbird-91.3.2+build1/gfx/thebes/gfxPlatformFontList.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/thebes/gfxPlatformFontList.cpp	2021-12-09 11:59:41.000000000 +0000
@@ -256,6 +256,7 @@
   sPlatformFontList = aList;
   if (XRE_IsParentProcess() &&
       StaticPrefs::gfx_font_list_omt_enabled_AtStartup() &&
+      StaticPrefs::gfx_e10s_font_list_shared_AtStartup() &&
       !gfxPlatform::InSafeMode()) {
     sInitFontListThread = PR_CreateThread(
         PR_USER_THREAD, InitFontListCallback, aList, PR_PRIORITY_NORMAL,
diff -Nru thunderbird-91.3.2+build1/gfx/wr/webrender/src/clip.rs thunderbird-91.4.0+build2/gfx/wr/webrender/src/clip.rs
--- thunderbird-91.3.2+build1/gfx/wr/webrender/src/clip.rs	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/wr/webrender/src/clip.rs	2021-12-09 11:59:41.000000000 +0000
@@ -1230,6 +1230,66 @@
         }
     }
 
+    /// Given a clip-chain instance, return a safe rect within the visible region
+    /// that can be assumed to be unaffected by clip radii. Returns None if it
+    /// encounters any complex cases, just handling rounded rects in the same
+    /// coordinate system as the clip-chain for now.
+    pub fn get_inner_rect_for_clip_chain(
+        &self,
+        clip_chain: &ClipChainInstance,
+        clip_data_store: &ClipDataStore,
+        spatial_tree: &SpatialTree,
+    ) -> Option<PictureRect> {
+        let mut inner_rect = clip_chain.pic_clip_rect;
+        let clip_instances = &self
+            .clip_node_instances[clip_chain.clips_range.to_range()];
+
+        for clip_instance in clip_instances {
+            // Don't handle mapping between coord systems for now
+            if !clip_instance.flags.contains(ClipNodeFlags::SAME_COORD_SYSTEM) {
+                return None;
+            }
+
+            let clip_node = &clip_data_store[clip_instance.handle];
+
+            match clip_node.item.kind {
+                // Ignore any clips which are complex or impossible to calculate
+                // inner rects for now
+                ClipItemKind::Rectangle { mode: ClipMode::ClipOut, .. } |
+                ClipItemKind::Image { .. } |
+                ClipItemKind::BoxShadow { .. } |
+                ClipItemKind::RoundedRectangle { mode: ClipMode::ClipOut, .. } => {
+                    return None;
+                }
+                // Normal Clip rects are already handled by the clip-chain pic_clip_rect,
+                // no need to do anything here
+                ClipItemKind::Rectangle { mode: ClipMode::Clip, .. } => {}
+                ClipItemKind::RoundedRectangle { mode: ClipMode::Clip, rect, radius } => {
+                    // Get an inner rect for the rounded-rect clip
+                    let local_inner_rect = match extract_inner_rect_safe(&rect, &radius) {
+                        Some(rect) => rect,
+                        None => return None,
+                    };
+
+                    // Map it from local -> picture space
+                    let mapper = SpaceMapper::new_with_target(
+                        clip_chain.pic_spatial_node_index,
+                        clip_instance.spatial_node_index,
+                        PictureRect::max_rect(),
+                        spatial_tree,
+                    );
+
+                    // Accumulate in to the inner_rect, in case there are multiple rounded-rect clips
+                    if let Some(pic_inner_rect) = mapper.map(&local_inner_rect) {
+                        inner_rect = inner_rect.intersection(&pic_inner_rect).unwrap_or(PictureRect::zero());
+                    }
+                }
+            }
+        }
+
+        Some(inner_rect)
+    }
+
     /// The main interface external code uses. Given a local primitive, positioning
     /// information, and a clip chain id, build an optimized clip chain instance.
     pub fn build_clip_chain_instance(
diff -Nru thunderbird-91.3.2+build1/gfx/wr/webrender/src/picture.rs thunderbird-91.4.0+build2/gfx/wr/webrender/src/picture.rs
--- thunderbird-91.3.2+build1/gfx/wr/webrender/src/picture.rs	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/wr/webrender/src/picture.rs	2021-12-09 11:59:41.000000000 +0000
@@ -3707,7 +3707,7 @@
 
         let sub_slice = &mut self.sub_slices[sub_slice_index];
 
-        if let Some(backdrop_candidate) = backdrop_candidate {
+        if let Some(mut backdrop_candidate) = backdrop_candidate {
             let is_suitable_backdrop = match backdrop_candidate.kind {
                 Some(BackdropKind::Clear) => {
                     // Clear prims are special - they always end up in their own slice,
@@ -3740,8 +3740,19 @@
 
             if sub_slice_index == 0 &&
                is_suitable_backdrop &&
-               sub_slice.compositor_surfaces.is_empty() &&
-               !prim_clip_chain.needs_mask {
+               sub_slice.compositor_surfaces.is_empty() {
+
+                // If the backdrop candidate has a clip-mask, try to extract an opaque inner
+                // rect that is safe to use for subpixel rendering
+                if prim_clip_chain.needs_mask {
+                    backdrop_candidate.opaque_rect = clip_store
+                        .get_inner_rect_for_clip_chain(
+                            prim_clip_chain,
+                            &data_stores.clip,
+                            frame_context.spatial_tree,
+                        )
+                        .unwrap_or(PictureRect::zero());
+                }
 
                 if backdrop_candidate.opaque_rect.contains_box(&self.backdrop.opaque_rect) {
                     self.backdrop.opaque_rect = backdrop_candidate.opaque_rect;
diff -Nru thunderbird-91.3.2+build1/gfx/wr/wrench/reftests/text/reftest.list thunderbird-91.4.0+build2/gfx/wr/wrench/reftests/text/reftest.list
--- thunderbird-91.3.2+build1/gfx/wr/wrench/reftests/text/reftest.list	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/wr/wrench/reftests/text/reftest.list	2021-12-09 11:59:41.000000000 +0000
@@ -82,3 +82,4 @@
 # the main goal of the test is that everything is in the same place, at the same scale, clipped the same way,
 # despite 4x on-the-fly scale change.
 skip_on(android) fuzzy-range(<=3,*21700,<=20,*3500,<=119,*590) fuzzy-if(platform(swgl),108,24907) == raster_root_C_8192.yaml raster_root_C_ref.yaml
+== subpx-bg-mask.yaml subpx-bg-mask-ref.yaml
diff -Nru thunderbird-91.3.2+build1/gfx/wr/wrench/reftests/text/subpx-bg-mask-ref.yaml thunderbird-91.4.0+build2/gfx/wr/wrench/reftests/text/subpx-bg-mask-ref.yaml
--- thunderbird-91.3.2+build1/gfx/wr/wrench/reftests/text/subpx-bg-mask-ref.yaml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/wr/wrench/reftests/text/subpx-bg-mask-ref.yaml	2021-12-09 11:59:41.000000000 +0000
@@ -0,0 +1,8 @@
+---
+root:
+  items:
+    - text: "A"
+      origin: 20 190
+      size: 180
+      color: black
+      font: "FreeSans.ttf"
diff -Nru thunderbird-91.3.2+build1/gfx/wr/wrench/reftests/text/subpx-bg-mask.yaml thunderbird-91.4.0+build2/gfx/wr/wrench/reftests/text/subpx-bg-mask.yaml
--- thunderbird-91.3.2+build1/gfx/wr/wrench/reftests/text/subpx-bg-mask.yaml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/gfx/wr/wrench/reftests/text/subpx-bg-mask.yaml	2021-12-09 11:59:41.000000000 +0000
@@ -0,0 +1,27 @@
+# Verify that text on a picture cache slice where the background
+# has a rounded-rect clip correct enables subpixel AA
+---
+root:
+  items:
+    - type: rect
+      bounds: [0, 0, 100, 100]
+      color: white
+    - type: scroll-frame
+      bounds: [0, 0, 200, 200]
+      content-size: [200, 200]
+      scroll-offset: [0, 0]
+      items:
+      - type: clip
+        bounds: [0, 0, 200, 200]
+        complex:
+          - rect: [0, 0, 200, 200]
+            radius: 4
+        items:
+          - type: rect
+            bounds: [0, 0, 200, 200]
+            color: white
+          - text: "A"
+            origin: 20 190
+            size: 180
+            color: black
+            font: "FreeSans.ttf"
diff -Nru thunderbird-91.3.2+build1/ipc/chromium/src/chrome/common/ipc_channel.h thunderbird-91.4.0+build2/ipc/chromium/src/chrome/common/ipc_channel.h
--- thunderbird-91.3.2+build1/ipc/chromium/src/chrome/common/ipc_channel.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/ipc/chromium/src/chrome/common/ipc_channel.h	2021-12-09 11:59:43.000000000 +0000
@@ -67,11 +67,18 @@
   enum Mode { MODE_SERVER, MODE_CLIENT };
 
   enum {
-    // The maximum message size in bytes. Attempting to receive a
-    // message of this size or bigger results in a channel error.
+
+  // The maximum message size in bytes. Attempting to receive a
+  // message of this size or bigger results in a channel error.
+  // This is larger in fuzzing builds to allow the fuzzing of passing
+  // large data structures into DOM methods without crashing.
+#ifndef FUZZING
     kMaximumMessageSize = 256 * 1024 * 1024,
+#else
+    kMaximumMessageSize = 1792 * 1024 * 1024,  // 1.75GB
+#endif
 
-    // Ammount of data to read at once from the pipe.
+    // Amount of data to read at once from the pipe.
     kReadBufferSize = 4 * 1024,
 
     // Maximum size of a message that we allow to be copied (rather than moved).
diff -Nru thunderbird-91.3.2+build1/js/public/GCAnnotations.h thunderbird-91.4.0+build2/js/public/GCAnnotations.h
--- thunderbird-91.3.2+build1/js/public/GCAnnotations.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/public/GCAnnotations.h	2021-12-09 11:59:42.000000000 +0000
@@ -63,6 +63,16 @@
 // very nice for other uses of the callgraph.
 #  define JS_HAZ_JSNATIVE_CALLER __attribute__((annotate("Calls JSNatives")))
 
+// Mark a variable as being "GC safe", i.e., it does not contain any
+// invalidatable pointers at the current point in the code. A typical
+// example might be a collection containing GC pointers, which at the
+// present time is empty. This property is only temporary; the next use
+// of the variable will invalidate it (on the assumption that a GC pointer
+// might be added to it.) Try to use this as early as possible, probably
+// immediately after construction, so that if future mutations through
+// the variable are added, they won't be covered by the annotation.
+#  define JS_HAZ_VALUE_IS_GC_SAFE(var) JS::detail::MarkVariableAsGCSafe(var)
+
 #else
 
 #  define JS_EXPECT_HAZARDS
@@ -76,6 +86,24 @@
 #  define JS_HAZ_GC_SUPPRESSED
 #  define JS_HAZ_CAN_RUN_SCRIPT
 #  define JS_HAZ_JSNATIVE_CALLER
+#  define JS_HAZ_VALUE_IS_GC_SAFE(var)
+
+#endif
+
+#ifdef XGILL_PLUGIN
+
+// Implemented by passing variable to a dummy function so that it shows up
+// in the control flow graph.
+namespace JS {
+namespace detail {
+
+template <typename T>
+static inline void MarkVariableAsGCSafe(T& var) {
+  asm("");
+}
+
+}  // namespace detail
+}  // namespace JS
 
 #endif
 
diff -Nru thunderbird-91.3.2+build1/js/src/devtools/rootAnalysis/analyzeRoots.js thunderbird-91.4.0+build2/js/src/devtools/rootAnalysis/analyzeRoots.js
--- thunderbird-91.3.2+build1/js/src/devtools/rootAnalysis/analyzeRoots.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/devtools/rootAnalysis/analyzeRoots.js	2021-12-09 11:59:42.000000000 +0000
@@ -205,7 +205,7 @@
             return src;
         if ("PEdgeCallInstance" in edge) {
             if (expressionUsesVariable(edge.PEdgeCallInstance.Exp, variable)) {
-                if (edgeKillsVariable(edge, variable)) {
+                if (edgeStartsValueLiveRange(edge, variable)) {
                     // If the variable is being constructed, then the incoming
                     // value is not used here; it didn't exist before
                     // construction. (The analysis doesn't get told where
@@ -290,18 +290,17 @@
     return exp.Kind == "Var" && sameVariable(exp.Variable, variable);
 }
 
-// Return whether the edge terminates the live range of a variable's value when
-// searching in reverse through the CFG, by setting it to some new value.
-// Examples of killing 'obj's live range:
+// Return whether the edge starts the live range of a variable's value, by setting
+// it to some new value. Examples of starting obj's live range:
 //
 //     obj = foo;
 //     obj = foo();
 //     obj = foo(obj);         // uses previous value but then sets to new value
 //     SomeClass obj(true, 1); // constructor
 //
-function edgeKillsVariable(edge, variable)
+function edgeStartsValueLiveRange(edge, variable)
 {
-    // Direct assignments kill their lhs: var = value
+    // Direct assignments start live range of lhs: var = value
     if (edge.Kind == "Assign") {
         const [lhs, rhs] = edge.Exp;
         return (expressionIsVariable(lhs, variable) &&
@@ -311,14 +310,14 @@
     if (edge.Kind != "Call")
         return false;
 
-    // Assignments of call results kill their lhs.
+    // Assignments of call results start live range: var = foo()
     if (1 in edge.Exp) {
         var lhs = edge.Exp[1];
         if (expressionIsVariable(lhs, variable))
             return true;
     }
 
-    // Constructor calls kill their 'this' value.
+    // Constructor calls start live range of instance: SomeClass var(...)
     if ("PEdgeCallInstance" in edge) {
         var instance = edge.PEdgeCallInstance.Exp;
 
@@ -391,12 +390,12 @@
         for (const edge of successors[point]) {
             if (edgeMovesVariable(edge, variable))
                 return true;
-            // edgeKillsVariable will find places where 'variable' is given a
+            // edgeStartsValueLiveRange will find places where 'variable' is given a
             // new value. Never observed in practice, since this function is
             // only called with a temporary resulting from std::move(), which
             // is used immediately for a call. But just to be robust to future
             // uses:
-            if (!edgeKillsVariable(edge, variable))
+            if (!edgeStartsValueLiveRange(edge, variable))
                 work.push(edge.Index[1]);
         }
     }
@@ -426,11 +425,7 @@
 //     foo(uobj);
 //     gc();
 //
-// Compare to edgeKillsVariable: killing (in backwards direction) means the
-// variable's value was live and is no longer. Invalidating means it wasn't
-// actually live after all.
-//
-function edgeInvalidatesVariable(edge, variable, body)
+function edgeEndsValueLiveRange(edge, variable, body)
 {
     // var = nullptr;
     if (edge.Kind == "Assign") {
@@ -446,6 +441,17 @@
     if (edge.Type.Kind == 'Function' &&
         edge.Exp[0].Kind == 'Var' &&
         edge.Exp[0].Variable.Kind == 'Func' &&
+        edge.Exp[0].Variable.Name[1] == 'MarkVariableAsGCSafe' &&
+        edge.Exp[0].Variable.Name[0].includes("JS::detail::MarkVariableAsGCSafe") &&
+        expressionIsVariable(edge.PEdgeCallArguments.Exp[0], variable))
+    {
+        // explicit JS_HAZ_VARIABLE_IS_GC_SAFE annotation
+        return true;
+    }
+
+    if (edge.Type.Kind == 'Function' &&
+        edge.Exp[0].Kind == 'Var' &&
+        edge.Exp[0].Variable.Kind == 'Func' &&
         edge.Exp[0].Variable.Name[1] == 'move' &&
         edge.Exp[0].Variable.Name[0].includes('std::move(') &&
         expressionIsVariable(edge.PEdgeCallArguments.Exp[0], variable) &&
@@ -664,14 +670,14 @@
         for (var edge of predecessors[ppoint]) {
             var source = edge.Index[0];
 
-            if (edgeInvalidatesVariable(edge, variable, body)) {
+            if (edgeEndsValueLiveRange(edge, variable, body)) {
                 // Terminate the search through this point; we thought we were
                 // within the live range, but it turns out that the variable
                 // was set to a value that we don't care about.
                 continue;
             }
 
-            var edge_kills = edgeKillsVariable(edge, variable);
+            var edge_kills = edgeStartsValueLiveRange(edge, variable);
             var edge_uses = edgeUsesVariable(edge, variable, body);
 
             if (edge_kills || edge_uses) {
@@ -803,7 +809,7 @@
             //
 
             // Ignore uses that are just invalidating the previous value.
-            if (edgeInvalidatesVariable(edge, variable, body))
+            if (edgeEndsValueLiveRange(edge, variable, body))
                 continue;
 
             var usePoint = edgeUsesVariable(edge, variable, body);
diff -Nru thunderbird-91.3.2+build1/js/src/devtools/rootAnalysis/run-test.py thunderbird-91.4.0+build2/js/src/devtools/rootAnalysis/run-test.py
--- thunderbird-91.3.2+build1/js/src/devtools/rootAnalysis/run-test.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/devtools/rootAnalysis/run-test.py	2021-12-09 11:59:43.000000000 +0000
@@ -98,6 +98,7 @@
 outroot = os.path.join(testdir, "out")
 make_dir(outroot)
 
+failed = set()
 for name in cfg.tests:
     name = os.path.basename(name)
     indir = os.path.join(testdir, name)
@@ -117,8 +118,13 @@
         exec(testcode, {"test": test, "equal": equal})
     except subprocess.CalledProcessError:
         print("TEST-FAILED: %s" % name)
+        failed.add(name)
     except AssertionError:
         print("TEST-FAILED: %s" % name)
+        failed.add(name)
         raise
     else:
         print("TEST-PASSED: %s" % name)
+
+if failed:
+    raise Exception("Failed tests: " + " ".join(failed))
diff -Nru thunderbird-91.3.2+build1/js/src/devtools/rootAnalysis/t/hazards/source.cpp thunderbird-91.4.0+build2/js/src/devtools/rootAnalysis/t/hazards/source.cpp
--- thunderbird-91.3.2+build1/js/src/devtools/rootAnalysis/t/hazards/source.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/devtools/rootAnalysis/t/hazards/source.cpp	2021-12-09 11:59:43.000000000 +0000
@@ -8,6 +8,20 @@
 
 #define ANNOTATE(property) __attribute__((annotate(property)))
 
+// MarkVariableAsGCSafe is a magic function name used as an
+// explicit annotation.
+
+namespace JS {
+namespace detail {
+template <typename T>
+static void MarkVariableAsGCSafe(T&) {
+  asm("");
+}
+}  // namespace detail
+}  // namespace JS
+
+#define JS_HAZ_VARIABLE_IS_GC_SAFE(var) JS::detail::MarkVariableAsGCSafe(var)
+
 struct Cell {
   int f;
 } ANNOTATE("GC Thing");
@@ -315,6 +329,35 @@
     GC();
     consume(std::move(unsafe10));
   }
+
+  // annotated to be safe before the GC. (This doesn't make
+  // a lot of sense here; the annotation is for when some
+  // type is known to only contain safe values, eg it is
+  // initialized as empty, or it is a union and we know
+  // that the GC pointer variants are not in use.)
+  {
+    mozilla::UniquePtr<Cell> safe11(&cell);
+    JS_HAZ_VARIABLE_IS_GC_SAFE(safe11);
+    GC();
+  }
+
+  // annotate as safe value after the GC -- since nothing else
+  // has touched the variable, that means it was already safe
+  // during the GC.
+  {
+    mozilla::UniquePtr<Cell> safe12(&cell);
+    GC();
+    JS_HAZ_VARIABLE_IS_GC_SAFE(safe12);
+  }
+
+  // annotate as safe after the GC -- but we've already used it, so it's
+  // too late.
+  {
+    mozilla::UniquePtr<Cell> unsafe13(&cell);
+    GC();
+    use(unsafe13.get());
+    JS_HAZ_VARIABLE_IS_GC_SAFE(unsafe13);
+  }
 }
 
 // Make sure `this` is live at the beginning of a function.
diff -Nru thunderbird-91.3.2+build1/js/src/devtools/rootAnalysis/t/hazards/test.py thunderbird-91.4.0+build2/js/src/devtools/rootAnalysis/t/hazards/test.py
--- thunderbird-91.3.2+build1/js/src/devtools/rootAnalysis/t/hazards/test.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/devtools/rootAnalysis/t/hazards/test.py	2021-12-09 11:59:43.000000000 +0000
@@ -71,6 +71,9 @@
 assert "safe8" not in hazmap
 assert "safe9" not in hazmap
 assert "safe10" not in hazmap
+assert "safe11" not in hazmap
+assert "safe12" not in hazmap
+assert "unsafe13" in hazmap
 
 # method hazard.
 
diff -Nru thunderbird-91.3.2+build1/js/src/gc/WeakMap-inl.h thunderbird-91.4.0+build2/js/src/gc/WeakMap-inl.h
--- thunderbird-91.3.2+build1/js/src/gc/WeakMap-inl.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/gc/WeakMap-inl.h	2021-12-09 11:59:43.000000000 +0000
@@ -144,8 +144,8 @@
   MOZ_ASSERT(oldKey == gc::ToMarkable(p->key()), "no moving GC");
 }
 
-// If the entry is live, ensure its key and value are marked. Also make sure
-// the key is at least as marked as the delegate, so it cannot get discarded
+// If the entry is live, ensure its key and value are marked. Also make sure the
+// key is at least as marked as min(map, delegate), so it cannot get discarded
 // and then recreated by rewrapping the delegate.
 template <class K, class V>
 bool WeakMap<K, V>::markEntry(GCMarker* marker, K& key, V& value) {
@@ -157,15 +157,15 @@
   if (delegate) {
     CellColor delegateColor = gc::detail::GetEffectiveColor(rt, delegate);
     MOZ_ASSERT(mapColor);
-    // The delegate color should propagate to the key, assuming the map is
-    // potentially alive at all (its color doesn't matter).
-    if (keyColor < delegateColor) {
-      gc::AutoSetMarkColor autoColor(*marker, delegateColor);
+    // The key needs to stay alive while both the delegate and map are live.
+    CellColor proxyPreserveColor = std::min(delegateColor, mapColor);
+    if (keyColor < proxyPreserveColor) {
+      gc::AutoSetMarkColor autoColor(*marker, proxyPreserveColor);
       TraceWeakMapKeyEdge(marker, zone(), &key,
                           "proxy-preserved WeakMap entry key");
-      MOZ_ASSERT(key->color() >= delegateColor);
+      MOZ_ASSERT(key->color() >= proxyPreserveColor);
       marked = true;
-      keyColor = delegateColor;
+      keyColor = proxyPreserveColor;
     }
   }
 
@@ -232,13 +232,9 @@
     gc::EphemeronEdgeVector newVector;
     gc::EphemeronEdgeVector& edges = p ? p->value : newVector;
 
-    // Add a delegate -> key edge, where the key is marked the color of the
-    // delegate no matter what the weakmap's mark color is. This is implemented
-    // as if it were a regular ephemeron <weakmap, key> -> value edge, where
-    // the value color is the minimum of the two source colors, but in place of
-    // the weakmap we use the constant color Black, which results in the
-    // delegate's color propagating unchanged.
-    gc::EphemeronEdge keyEdge{CellColor::Black, key};
+    // Add a <weakmap, delegate> -> key edge: the key must be preserved for
+    // future lookups until either the weakmap or the delegate dies.
+    gc::EphemeronEdge keyEdge{mapColor, key};
     if (!edges.append(keyEdge)) {
       return false;
     }
@@ -277,6 +273,10 @@
 
 template <class K, class V>
 bool WeakMap<K, V>::markEntries(GCMarker* marker) {
+  // This method is called whenever the map's mark color changes. Mark values
+  // (and keys with delegates) as required for the new color and populate the
+  // ephemeron edges if we're in incremental marking mode.
+
   MOZ_ASSERT(mapColor);
   bool markedAny = false;
 
@@ -289,14 +289,18 @@
       continue;
     }
 
+    // Adds edges to the ephemeron edges table for any keys (or delegates) where
+    // future changes to their mark color would require marking the value (or
+    // the key).
+    //
+    // Note that delegateColor >= keyColor because marking a key marks its
+    // delegate, so we only need to check whether keyColor < mapColor to tell
+    // this.
+
     JSRuntime* rt = zone()->runtimeFromAnyThread();
     CellColor keyColor =
         gc::detail::GetEffectiveColor(rt, e.front().key().get());
 
-    // Changes in the map's mark color will be handled in this code, but
-    // changes in the key's mark color are handled through the weak keys table.
-    // So we only need to populate the table if the key is less marked than the
-    // map, to catch later updates in the key's mark color.
     if (keyColor < mapColor) {
       MOZ_ASSERT(marker->weakMapAction() == JS::WeakMapTraceAction::Expand);
       // The final color of the key is not yet known. Record this weakmap and
diff -Nru thunderbird-91.3.2+build1/js/src/jit/CodeGenerator.cpp thunderbird-91.4.0+build2/js/src/jit/CodeGenerator.cpp
--- thunderbird-91.3.2+build1/js/src/jit/CodeGenerator.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/jit/CodeGenerator.cpp	2021-12-09 11:59:42.000000000 +0000
@@ -7932,35 +7932,36 @@
 
   const wasm::CallSiteDesc& desc = mir->desc();
   const wasm::CalleeDesc& callee = mir->callee();
+  CodeOffset retOffset;
   switch (callee.which()) {
     case wasm::CalleeDesc::Func:
-      masm.call(desc, callee.funcIndex());
+      retOffset = masm.call(desc, callee.funcIndex());
       reloadRegs = false;
       switchRealm = false;
       break;
     case wasm::CalleeDesc::Import:
-      masm.wasmCallImport(desc, callee);
+      retOffset = masm.wasmCallImport(desc, callee);
       break;
     case wasm::CalleeDesc::AsmJSTable:
     case wasm::CalleeDesc::WasmTable:
-      masm.wasmCallIndirect(desc, callee, needsBoundsCheck);
+      retOffset = masm.wasmCallIndirect(desc, callee, needsBoundsCheck);
       reloadRegs = switchRealm = callee.which() == wasm::CalleeDesc::WasmTable;
       break;
     case wasm::CalleeDesc::Builtin:
-      masm.call(desc, callee.builtin());
+      retOffset = masm.call(desc, callee.builtin());
       reloadRegs = false;
       switchRealm = false;
       break;
     case wasm::CalleeDesc::BuiltinInstanceMethod:
-      masm.wasmCallBuiltinInstanceMethod(desc, mir->instanceArg(),
-                                         callee.builtin(),
-                                         mir->builtinMethodFailureMode());
+      retOffset = masm.wasmCallBuiltinInstanceMethod(
+          desc, mir->instanceArg(), callee.builtin(),
+          mir->builtinMethodFailureMode());
       switchRealm = false;
       break;
   }
 
   // Note the assembler offset for the associated LSafePoint.
-  markSafepointAt(masm.currentOffset(), lir);
+  markSafepointAt(retOffset.offset(), lir);
 
   // Now that all the outbound in-memory args are on the stack, note the
   // required lower boundary point of the associated StackMap.
diff -Nru thunderbird-91.3.2+build1/js/src/jit/MIR.cpp thunderbird-91.4.0+build2/js/src/jit/MIR.cpp
--- thunderbird-91.3.2+build1/js/src/jit/MIR.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/jit/MIR.cpp	2021-12-09 11:59:42.000000000 +0000
@@ -4370,6 +4370,26 @@
   return this;
 }
 
+MDefinition* MWasmExtendU32Index::foldsTo(TempAllocator& alloc) {
+  MDefinition* input = this->input();
+  if (input->isConstant()) {
+    return MConstant::NewInt64(
+        alloc, int64_t(uint32_t(input->toConstant()->toInt32())));
+  }
+
+  return this;
+}
+
+MDefinition* MWasmWrapU32Index::foldsTo(TempAllocator& alloc) {
+  MDefinition* input = this->input();
+  if (input->isConstant()) {
+    return MConstant::New(
+        alloc, Int32Value(int32_t(uint32_t(input->toConstant()->toInt64()))));
+  }
+
+  return this;
+}
+
 MDefinition* MWasmAddOffset::foldsTo(TempAllocator& alloc) {
   MDefinition* baseArg = base();
   if (!baseArg->isConstant()) {
diff -Nru thunderbird-91.3.2+build1/js/src/jit/MIROps.yaml thunderbird-91.4.0+build2/js/src/jit/MIROps.yaml
--- thunderbird-91.3.2+build1/js/src/jit/MIROps.yaml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/jit/MIROps.yaml	2021-12-09 11:59:43.000000000 +0000
@@ -2247,6 +2247,9 @@
   operands:
     input: Int32
   result_type: Int64
+  movable: true
+  congruent_to: if_operands_equal
+  folds_to: custom
   type_policy: none
   alias_set: none
 
@@ -2254,6 +2257,9 @@
   operands:
     input: Int64
   result_type: Int32
+  movable: true
+  congruent_to: if_operands_equal
+  folds_to: custom
   type_policy: none
   alias_set: none
 
diff -Nru thunderbird-91.3.2+build1/js/src/jit/WasmBCE.cpp thunderbird-91.4.0+build2/js/src/jit/WasmBCE.cpp
--- thunderbird-91.3.2+build1/js/src/jit/WasmBCE.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/jit/WasmBCE.cpp	2021-12-09 11:59:43.000000000 +0000
@@ -53,9 +53,12 @@
           // result is above 2^31-1, but we don't care about that for BCE.
 
           if (addr->isConstant() &&
-              addr->toConstant()->type() == MIRType::Int32 &&
-              uint64_t(addr->toConstant()->toInt32()) <
-                  mir->minWasmHeapLength()) {
+              ((addr->toConstant()->type() == MIRType::Int32 &&
+                uint64_t(addr->toConstant()->toInt32()) <
+                    mir->minWasmHeapLength()) ||
+               (addr->toConstant()->type() == MIRType::Int64 &&
+                uint64_t(addr->toConstant()->toInt64()) <
+                    mir->minWasmHeapLength()))) {
             bc->setRedundant();
             if (JitOptions.spectreIndexMasking) {
               bc->replaceAllUsesWith(addr);
diff -Nru thunderbird-91.3.2+build1/js/src/jit-test/lib/codegen-x86-test.js thunderbird-91.4.0+build2/js/src/jit-test/lib/codegen-x86-test.js
--- thunderbird-91.3.2+build1/js/src/jit-test/lib/codegen-x86-test.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/jit-test/lib/codegen-x86-test.js	2021-12-09 11:59:42.000000000 +0000
@@ -13,10 +13,11 @@
 var ABSADDR = `${HEX}{2} ${HEX}{2} ${HEX}{2} ${HEX}{2}`;
 
 // End of prologue.  The mov to eax is debug code, inserted by the register
-// allocator to clobber eax before a move group.
+// allocator to clobber eax before a move group.  But it is only present if
+// there is a move group there.
 var x86_prefix = `
-8b ec            mov %esp, %ebp
-b8 ef be ad de   mov \\$0xDEADBEEF, %eax
+8b ec            mov %esp, %ebp(
+b8 ef be ad de   mov \\$0xDEADBEEF, %eax)?
 `
 
 // `.bp` because zydis chooses 'rbp' even on 32-bit systems
diff -Nru thunderbird-91.3.2+build1/js/src/jit-test/tests/gc/weak-marking-03.js thunderbird-91.4.0+build2/js/src/jit-test/tests/gc/weak-marking-03.js
--- thunderbird-91.3.2+build1/js/src/jit-test/tests/gc/weak-marking-03.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/jit-test/tests/gc/weak-marking-03.js	2021-12-09 11:59:43.000000000 +0000
@@ -567,9 +567,9 @@
   showmarks();
   marks = getMarks();
   assertEq(marks[0], "gray", "map is gray");
-  assertEq(marks[1], "black", "black delegate should mark key black");
+  assertEq(marks[1], "gray", "gray map + black delegate should mark key gray");
   assertEq(marks[2], "black", "delegate is still black");
-  assertEq(marks[3], "gray", "gray map + black key => gray value");
+  assertEq(marks[3], "gray", "gray map + gray key => gray value");
 
   clearMarkQueue();
   clearMarkObservers();
@@ -629,9 +629,9 @@
   showmarks();
   marks = getMarks();
   assertEq(marks[0], "gray", "map is gray");
-  assertEq(marks[1], "black", "black delegate should mark key black");
+  assertEq(marks[1], "gray", "gray map + black delegate should mark key gray");
   assertEq(marks[2], "black", "delegate is black");
-  assertEq(marks[3], "gray", "gray map + black key => gray value via delegate -> value");
+  assertEq(marks[3], "gray", "gray map + gray key => gray value via delegate -> value");
 
   clearMarkQueue();
   clearMarkObservers();
diff -Nru thunderbird-91.3.2+build1/js/src/jit-test/tests/wasm/bce-x64-ion-codegen.js thunderbird-91.4.0+build2/js/src/jit-test/tests/wasm/bce-x64-ion-codegen.js
--- thunderbird-91.3.2+build1/js/src/jit-test/tests/wasm/bce-x64-ion-codegen.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/jit-test/tests/wasm/bce-x64-ion-codegen.js	2021-12-09 11:59:42.000000000 +0000
@@ -0,0 +1,60 @@
+// |jit-test| --wasm-compiler=optimizing; --disable-wasm-huge-memory; --spectre-mitigations=off; skip-if: !hasDisassembler() || wasmCompileMode() != "ion" || !getBuildConfiguration().x64 || getBuildConfiguration().simulator || getJitCompilerOptions()["ion.check-range-analysis"]; include:codegen-x64-test.js
+
+// Spectre mitigation is disabled above to make the generated code simpler to
+// match; ion.check-range-analysis makes a hash of the code and makes testing
+// pointless.
+
+// White-box testing of bounds check elimination on 64-bit systems.
+//
+// This is probably fairly brittle, but BCE on 64-bit platforms regressed (bug
+// 1735207) without us noticing, so it's not like we can do without these tests.
+//
+// See also bce-x86-ion-codegen.js.
+//
+// If this turns out to be too brittle to be practical then an alternative to
+// testing the output code is to do what we do for SIMD, record (in a log or
+// buffer of some kind) that certain optimizations triggered, and then check the
+// log.
+
+// Make sure the check for the second load is removed: the two load instructions
+// should appear back-to-back in the output.
+codegenTestX64_adhoc(
+`(module
+   (memory 1)
+   (func (export "f") (param i32) (result i32)
+     (local i32)
+     (local.set 1 (i32.add (local.get 0) (i32.const 4)))
+     (i32.load (local.get 1))
+     drop
+     (i32.load (local.get 1))))`,
+    'f', `
+48 3b ..                  cmp %r.x, %r.x
+0f 82 02 00 00 00         jb 0x00000000000000..
+0f 0b                     ud2
+41 8b .. ..               movl \\(%r15,%r..,1\\), %e..
+41 8b .. ..               movl \\(%r15,%r..,1\\), %eax`,
+    {no_prefix:true});
+
+// Make sure constant indices below the heap minimum do not require a bounds check.
+codegenTestX64_adhoc(
+`(module
+   (memory 1)
+   (func (export "f") (result i32)
+     (i32.load (i32.const 16))))`,
+    'f',
+    `41 8b 47 10               movl 0x10\\(%r15\\), %eax`, {log:true});
+
+// Ditto, even at the very limit of the known heap, extending into the guard
+// page.  This is an OOB access, of course, but it needs no explicit bounds
+// check.
+codegenTestX64_adhoc(
+`(module
+   (memory 1)
+   (func (export "f") (result i32)
+     (i32.load (i32.const 65535))))`,
+    'f',
+`
+b8 ff ff 00 00            mov \\$0xFFFF, %eax
+41 8b 04 07               movl \\(%r15,%rax,1\\), %eax`);
+
+
diff -Nru thunderbird-91.3.2+build1/js/src/jit-test/tests/wasm/bce-x86-ion-codegen.js thunderbird-91.4.0+build2/js/src/jit-test/tests/wasm/bce-x86-ion-codegen.js
--- thunderbird-91.3.2+build1/js/src/jit-test/tests/wasm/bce-x86-ion-codegen.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/jit-test/tests/wasm/bce-x86-ion-codegen.js	2021-12-09 11:59:42.000000000 +0000
@@ -0,0 +1,55 @@
+// |jit-test| --wasm-compiler=optimizing; --spectre-mitigations=off; skip-if: !hasDisassembler() || wasmCompileMode() != "ion" || !getBuildConfiguration().x86 || getBuildConfiguration().simulator || getJitCompilerOptions()["ion.check-range-analysis"]; include:codegen-x86-test.js
+
+// Spectre mitigation is disabled above to make the generated code simpler to
+// match; ion.check-range-analysis makes a hash of the code and makes testing
+// pointless.
+
+// White-box testing of bounds check elimination on 32-bit systems.
+//
+// This is probably fairly brittle, but BCE (on 64-bit platforms) regressed (bug
+// 1735207) without us noticing, so it's not like we can do without these tests.
+//
+// See also bce-x64-ion-codegen.js.
+
+// Make sure the check for the second load is removed: the two load instructions
+// should appear back-to-back in the output.
+codegenTestX86_adhoc(
+`(module
+   (memory 1)
+   (func (export "f") (param i32) (result i32)
+     (local i32)
+     (local.set 1 (i32.add (local.get 0) (i32.const 4)))
+     (i32.load (local.get 1))
+     drop
+     (i32.load (local.get 1))))`,
+    'f', `
+3b ..                     cmp %e.., %e..
+0f 82 02 00 00 00         jb 0x00000000000000..
+0f 0b                     ud2
+8b .. ..                  movl \\(%r..,%r..,1\\), %e..
+8b .. ..                  movl \\(%r..,%r..,1\\), %eax`,
+    {no_prefix:true});
+
+// Make sure constant indices below the heap minimum do not require a bounds check.
+// The first movl from *rsi below loads the heap base from Tls, an x86-ism.
+codegenTestX86_adhoc(
+`(module
+   (memory 1)
+   (func (export "f") (result i32)
+     (i32.load (i32.const 16))))`,
+    'f', `
+8b ..                     movl \\(%rsi\\), %e..
+8b .. 10                  movl 0x10\\(%r..\\), %eax`);
+
+// Ditto, even at the very limit of the known heap, extending into the guard
+// page.  This is an OOB access, of course, but it needs no explicit bounds
+// check.
+codegenTestX86_adhoc(
+`(module
+   (memory 1)
+   (func (export "f") (result i32)
+     (i32.load (i32.const 65535))))`,
+    'f',
+`
+8b ..                     movl \\(%rsi\\), %e..
+8b .. ff ff 00 00         movl 0xFFFF\\(%r..\\), %eax`);
diff -Nru thunderbird-91.3.2+build1/js/src/wasm/WasmJS.cpp thunderbird-91.4.0+build2/js/src/wasm/WasmJS.cpp
--- thunderbird-91.3.2+build1/js/src/wasm/WasmJS.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/src/wasm/WasmJS.cpp	2021-12-09 11:59:47.000000000 +0000
@@ -1690,7 +1690,8 @@
     const GlobalDescVector& globals, const ValVector& globalImportValues,
     const WasmGlobalObjectVector& globalObjs, HandleObject proto,
     UniqueDebugState maybeDebug) {
-  UniquePtr<ExportMap> exports = js::MakeUnique<ExportMap>(cx->zone());
+  Rooted<UniquePtr<ExportMap>> exports(cx,
+                                       js::MakeUnique<ExportMap>(cx->zone()));
   if (!exports) {
     ReportOutOfMemory(cx);
     return nullptr;
@@ -1702,6 +1703,8 @@
     ReportOutOfMemory(cx);
     return nullptr;
   }
+  // Note that `scopes` is a WeakCache, auto-linked into a sweep list on the
+  // Zone, and so does not require rooting.
 
   uint32_t indirectGlobals = 0;
 
diff -Nru thunderbird-91.3.2+build1/js/xpconnect/wrappers/XrayWrapper.h thunderbird-91.4.0+build2/js/xpconnect/wrappers/XrayWrapper.h
--- thunderbird-91.3.2+build1/js/xpconnect/wrappers/XrayWrapper.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/js/xpconnect/wrappers/XrayWrapper.h	2021-12-09 11:59:47.000000000 +0000
@@ -209,6 +209,9 @@
                    const JS::CallArgs& args, const js::Wrapper& baseInstance) {
     JSXrayTraits& self = JSXrayTraits::singleton;
     JS::RootedObject holder(cx, self.ensureHolder(cx, wrapper));
+    if (!holder) {
+      return false;
+    }
     if (xpc::JSXrayTraits::getProtoKey(holder) == JSProto_Function) {
       return baseInstance.call(cx, wrapper, args);
     }
@@ -225,6 +228,9 @@
   bool getPrototype(JSContext* cx, JS::HandleObject wrapper,
                     JS::HandleObject target, JS::MutableHandleObject protop) {
     JS::RootedObject holder(cx, ensureHolder(cx, wrapper));
+    if (!holder) {
+      return false;
+    }
     JSProtoKey key = getProtoKey(holder);
     if (isPrototype(holder)) {
       JSProtoKey protoKey = js::InheritanceProtoKeyForStandardClass(key);
diff -Nru thunderbird-91.3.2+build1/layout/base/nsDocumentViewer.cpp thunderbird-91.4.0+build2/layout/base/nsDocumentViewer.cpp
--- thunderbird-91.3.2+build1/layout/base/nsDocumentViewer.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/layout/base/nsDocumentViewer.cpp	2021-12-09 11:59:47.000000000 +0000
@@ -1592,8 +1592,6 @@
 
 NS_IMETHODIMP
 nsDocumentViewer::Destroy() {
-  NS_ASSERTION(mDocument, "No document in Destroy()!");
-
   // Don't let the document get unloaded while we are printing.
   // this could happen if we hit the back button during printing.
   // We also keep the viewer from being cached in session history, since
diff -Nru thunderbird-91.3.2+build1/layout/base/PresShell.cpp thunderbird-91.4.0+build2/layout/base/PresShell.cpp
--- thunderbird-91.3.2+build1/layout/base/PresShell.cpp	2021-11-19 11:55:47.000000000 +0000
+++ thunderbird-91.4.0+build2/layout/base/PresShell.cpp	2021-12-09 11:59:48.000000000 +0000
@@ -7600,7 +7600,7 @@
   } else if (!mPresShell->mNoDelayedKeyEvents) {
     UniquePtr<DelayedKeyEvent> delayedKeyEvent =
         MakeUnique<DelayedKeyEvent>(aGUIEvent->AsKeyboardEvent());
-    PushDelayedEventIntoQueue(std::move(delayedKeyEvent));
+    mPresShell->mDelayedEvents.AppendElement(std::move(delayedKeyEvent));
   }
   aGUIEvent->mFlags.mIsSuppressedOrDelayed = true;
   return true;
@@ -7625,9 +7625,11 @@
                     aGUIEvent->mMessage != eMouseMove,
                 !InputTaskManager::Get()->IsSuspended());
 
+  RefPtr<PresShell> ps = aFrameToHandleEvent->PresShell();
+
   if (aGUIEvent->mMessage == eMouseDown) {
-    mPresShell->mNoDelayedMouseEvents = true;
-  } else if (!mPresShell->mNoDelayedMouseEvents &&
+    ps->mNoDelayedMouseEvents = true;
+  } else if (!ps->mNoDelayedMouseEvents &&
              (aGUIEvent->mMessage == eMouseUp ||
               // contextmenu is triggered after right mouseup on Windows and
               // right mousedown on other platforms.
@@ -7635,7 +7637,7 @@
               aGUIEvent->mMessage == eMouseExitFromWidget)) {
     UniquePtr<DelayedMouseEvent> delayedMouseEvent =
         MakeUnique<DelayedMouseEvent>(aGUIEvent->AsMouseEvent());
-    PushDelayedEventIntoQueue(std::move(delayedMouseEvent));
+    ps->mDelayedEvents.AppendElement(std::move(delayedMouseEvent));
   }
 
   // If there is a suppressed event listener associated with the document,
diff -Nru thunderbird-91.3.2+build1/layout/base/PresShell.h thunderbird-91.4.0+build2/layout/base/PresShell.h
--- thunderbird-91.3.2+build1/layout/base/PresShell.h	2021-11-19 11:55:46.000000000 +0000
+++ thunderbird-91.4.0+build2/layout/base/PresShell.h	2021-12-09 11:59:47.000000000 +0000
@@ -2712,10 +2712,6 @@
     already_AddRefed<PresShell> GetParentPresShellForEventHandling() {
       return mPresShell->GetParentPresShellForEventHandling();
     }
-    void PushDelayedEventIntoQueue(UniquePtr<DelayedEvent>&& aDelayedEvent) {
-      mPresShell->mDelayedEvents.AppendElement(std::move(aDelayedEvent));
-    }
-
     OwningNonNull<PresShell> mPresShell;
     AutoCurrentEventInfoSetter* mCurrentEventInfoSetter;
     static TimeStamp sLastInputCreated;
diff -Nru thunderbird-91.3.2+build1/modules/libpref/init/all.js thunderbird-91.4.0+build2/modules/libpref/init/all.js
--- thunderbird-91.3.2+build1/modules/libpref/init/all.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/modules/libpref/init/all.js	2021-12-09 11:59:51.000000000 +0000
@@ -331,7 +331,7 @@
 pref("browser.triple_click_selects_paragraph", true);
 
 // Enable fillable forms in the PDF viewer.
-pref("pdfjs.renderInteractiveForms", true);
+pref("pdfjs.annotationMode", 2);
 
 // Enable JavaScript support in the PDF viewer.
 pref("pdfjs.enableScripting", true);
diff -Nru thunderbird-91.3.2+build1/modules/libpref/init/StaticPrefList.yaml thunderbird-91.4.0+build2/modules/libpref/init/StaticPrefList.yaml
--- thunderbird-91.3.2+build1/modules/libpref/init/StaticPrefList.yaml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/modules/libpref/init/StaticPrefList.yaml	2021-12-09 11:59:52.000000000 +0000
@@ -8330,6 +8330,20 @@
   value: true
   mirror: always
 
+# When video continues later than the current media time for this period of
+# time, then it will trigger skip-to-next-keyframe mechanism. As this aims to
+# solve the drop frames issue where video decoding too slow for high
+# resolution videos. eg. 4k+. Therefore, the value is is determined by the
+# telemetry probe `video_inter_keyframe_max_ms` in the key of `AV,h>2160` which
+# shows that 95% video's key frame interval are less than ~5000. We use its
+# half value as a threashold to decide whether we should keep decoding in the
+# current video position or jump to the next keyframe in order to decode future
+# frames in advance.
+- name: media.decoder.skip_when_video_too_slow_ms
+  type: RelaxedAtomicInt32
+  value: 2500
+  mirror: always
+
 - name: media.gmp.decoder.enabled
   type: RelaxedAtomicBool
   value: false
diff -Nru thunderbird-91.3.2+build1/netwerk/base/nsINetUtil.idl thunderbird-91.4.0+build2/netwerk/base/nsINetUtil.idl
--- thunderbird-91.3.2+build1/netwerk/base/nsINetUtil.idl	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/netwerk/base/nsINetUtil.idl	2021-12-09 11:59:51.000000000 +0000
@@ -152,6 +152,9 @@
   /** Skip C0 and DEL from unescaping */
   const unsigned long ESCAPE_URL_SKIP_CONTROL = 1 << 15;
 
+  /** %XX-escape external protocol handler URL */
+  const unsigned long ESCAPE_URL_EXT_HANDLER = 1 << 17;
+
   /**
    * %XX-Escape invalid chars in a URL segment.
    *
diff -Nru thunderbird-91.3.2+build1/netwerk/dns/effective_tld_names.dat thunderbird-91.4.0+build2/netwerk/dns/effective_tld_names.dat
--- thunderbird-91.3.2+build1/netwerk/dns/effective_tld_names.dat	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/netwerk/dns/effective_tld_names.dat	2021-12-09 12:00:15.000000000 +0000
@@ -7132,7 +7132,7 @@
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2021-10-08T15:12:46Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2021-11-13T15:12:42Z
 // This list is auto-generated, don't edit it manually.
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7647,7 +7647,7 @@
 // casa : 2013-11-21 Registry Services, LLC
 casa
 
-// case : 2015-09-03 CNH Industrial N.V.
+// case : 2015-09-03 Helium TLDs Ltd
 case
 
 // cash : 2014-03-06 Binky Moon, LLC
@@ -10317,9 +10317,6 @@
 // xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY
 在线
 
-// xn--3oq18vl8pn36a : 2015-07-02 Volkswagen (China) Investment Co., Ltd.
-大众汽车
-
 // xn--3pxu8k : 2015-01-15 VeriSign Sarl
 点看
 
@@ -10982,7 +10979,6 @@
 // No longer operated by CentralNic, these entries should be adopted and/or removed by current operators
 // Submitted by Gavin Brown <gavin.brown@centralnic.com>
 ar.com
-gb.com
 hu.com
 kr.com
 no.com
@@ -11642,12 +11638,6 @@
 // Submitted by Dominik Menke <dom@digineo.de>
 dynv6.net
 
-// Ellucian : https://ellucian.com
-// Submitted by Josue Colon <CloudOps-Network@ellucian.com>
-elluciancrmadvance.com
-elluciancrmadvise.com
-elluciancrmrecruit.com
-
 // E4YOU spol. s.r.o. : https://e4you.cz/
 // Submitted by Vladimir Dudr <info@e4you.cz>
 e4.cz
@@ -11915,6 +11905,11 @@
 // Submitted by Louis Chemineau <louis@chmn.me>
 flap.id
 
+// FlashDrive : https://flashdrive.io
+// Submitted by Eric Chan <support@flashdrive.io>
+onflashdrive.app
+fldrv.com
+
 // fly.io: https://fly.io
 // Submitted by Kurt Mackey <kurt@fly.io>
 fly.dev
diff -Nru thunderbird-91.3.2+build1/netwerk/ipc/DocumentLoadListener.cpp thunderbird-91.4.0+build2/netwerk/ipc/DocumentLoadListener.cpp
--- thunderbird-91.3.2+build1/netwerk/ipc/DocumentLoadListener.cpp	2021-11-19 11:55:48.000000000 +0000
+++ thunderbird-91.4.0+build2/netwerk/ipc/DocumentLoadListener.cpp	2021-12-09 11:59:50.000000000 +0000
@@ -764,7 +764,7 @@
 
   MOZ_ASSERT(!mIsDocumentLoad);
 
-  auto sandboxFlags = GetLoadingBrowsingContext()->GetSandboxFlags();
+  auto sandboxFlags = aLoadState->TriggeringSandboxFlags();
 
   RefPtr<LoadInfo> loadInfo = CreateObjectLoadInfo(
       aLoadState, aInnerWindowId, aContentPolicyType, sandboxFlags);
diff -Nru thunderbird-91.3.2+build1/netwerk/protocol/http/HttpChannelChild.cpp thunderbird-91.4.0+build2/netwerk/protocol/http/HttpChannelChild.cpp
--- thunderbird-91.3.2+build1/netwerk/protocol/http/HttpChannelChild.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/netwerk/protocol/http/HttpChannelChild.cpp	2021-12-09 11:59:51.000000000 +0000
@@ -1822,6 +1822,9 @@
 
     if (remoteChannelExists) {
       SendCancel(aStatus, mLoadInfo->GetRequestBlockingReason());
+    } else if (MOZ_UNLIKELY(!LoadOnStartRequestCalled() ||
+                            !LoadOnStopRequestCalled())) {
+      Unused << AsyncAbort(mStatus);
     }
   }
   return NS_OK;
@@ -1832,7 +1835,6 @@
   LOG(("HttpChannelChild::Suspend [this=%p, mSuspendCount=%" PRIu32 "\n", this,
        mSuspendCount + 1));
   MOZ_ASSERT(NS_IsMainThread());
-  NS_ENSURE_TRUE(RemoteChannelExists(), NS_ERROR_NOT_AVAILABLE);
 
   LogCallingScriptLocation(this);
 
@@ -1855,7 +1857,6 @@
   LOG(("HttpChannelChild::Resume [this=%p, mSuspendCount=%" PRIu32 "\n", this,
        mSuspendCount - 1));
   MOZ_ASSERT(NS_IsMainThread());
-  NS_ENSURE_TRUE(RemoteChannelExists(), NS_ERROR_NOT_AVAILABLE);
   NS_ENSURE_TRUE(mSuspendCount > 0, NS_ERROR_UNEXPECTED);
 
   LogCallingScriptLocation(this);
@@ -1866,8 +1867,8 @@
   // Don't SendResume at all if we're diverting callbacks to the parent (unless
   // suspend was sent earlier); otherwise, resume will be called at the correct
   // time in the parent itself.
-  if (!--mSuspendCount && mSuspendSent) {
-    if (RemoteChannelExists()) {
+  if (!--mSuspendCount) {
+    if (RemoteChannelExists() && mSuspendSent) {
       SendResume();
     }
     if (mCallOnResume) {
diff -Nru thunderbird-91.3.2+build1/netwerk/sctp/datachannel/DataChannel.cpp thunderbird-91.4.0+build2/netwerk/sctp/datachannel/DataChannel.cpp
--- thunderbird-91.3.2+build1/netwerk/sctp/datachannel/DataChannel.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/netwerk/sctp/datachannel/DataChannel.cpp	2021-12-09 11:59:52.000000000 +0000
@@ -1195,6 +1195,11 @@
 }
 
 uint32_t DataChannelConnection::GetCurrentStreamIndex() {
+  if (!mChannels.Get(mCurrentStream)) {
+    // The stream muse have been removed, reset
+    DC_DEBUG(("Reset mCurrentChannel"));
+    mCurrentStream = 0;
+  }
   return mCurrentStream;
 }
 
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozbuild/artifacts.py thunderbird-91.4.0+build2/python/mozbuild/mozbuild/artifacts.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozbuild/artifacts.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozbuild/artifacts.py	2021-12-09 11:59:52.000000000 +0000
@@ -34,6 +34,7 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+import buildconfig
 import collections
 import functools
 import glob
@@ -53,31 +54,16 @@
 import zipfile
 
 import pylru
-from taskgraph.util.taskcluster import (
-    find_task_id,
-    get_artifact_url,
-    list_artifacts,
-)
+from taskgraph.util.taskcluster import find_task_id, get_artifact_url, list_artifacts
 
 from mach.util import UserError
 
 from mozbuild.artifact_cache import ArtifactCache
 from mozbuild.artifact_builds import JOB_CHOICES
-from mozbuild.util import (
-    ensureParentDir,
-    FileAvoidWrite,
-    mkdir,
-    ensure_subprocess_env,
-)
+from mozbuild.util import ensureParentDir, FileAvoidWrite, mkdir
 import mozinstall
-from mozpack.files import (
-    JarFinder,
-    TarFinder,
-)
-from mozpack.mozjar import (
-    JarReader,
-    JarWriter,
-)
+from mozpack.files import JarFinder, TarFinder
+from mozpack.mozjar import JarReader, JarWriter
 from mozpack.packager.unpack import UnpackFinder
 import mozpack.path as mozpath
 
@@ -102,11 +88,19 @@
 
 class ArtifactJob(object):
     trust_domain = "gecko"
-    candidate_trees = [
+    default_candidate_trees = [
+        "releases/mozilla-release",
+    ]
+    nightly_candidate_trees = [
         "mozilla-central",
         "integration/autoland",
+    ]
+    beta_candidate_trees = [
         "releases/mozilla-beta",
-        "releases/mozilla-release",
+    ]
+    # The list below list should be updated when we have new ESRs.
+    esr_candidate_trees = [
+        "releases/mozilla-esr91",
     ]
     try_tree = "try"
 
@@ -171,6 +165,7 @@
         elif download_symbols:
             self._symbols_archive_suffix = "crashreporter-symbols.zip"
         self._mozbuild = mozbuild
+        self._candidate_trees = None
 
     def log(self, *args, **kwargs):
         if self._log:
@@ -417,14 +412,30 @@
         else:
             raise RuntimeError("Unsupported archive type for %s" % filename)
 
+    @property
+    def candidate_trees(self):
+        if not self._candidate_trees:
+            self._candidate_trees = self.select_candidate_trees()
+        return self._candidate_trees
+
+    def select_candidate_trees(self):
+        version_display = buildconfig.substs.get("MOZ_APP_VERSION_DISPLAY")
+
+        if "esr" in version_display:
+            return self.esr_candidate_trees
+        elif re.search("a\d+$", version_display):
+            return self.nightly_candidate_trees
+        elif re.search("b\d+$", version_display):
+            return self.beta_candidate_trees
+
+        return self.default_candidate_trees
+
 
 class AndroidArtifactJob(ArtifactJob):
     package_re = r"public/build/geckoview_example\.apk"
     product = "mobile"
 
-    package_artifact_patterns = {
-        "**/*.so",
-    }
+    package_artifact_patterns = {"**/*.so"}
 
     def process_package_artifact(self, filename, processed_filename):
         # Extract all .so files into the root, which will get copied into dist/bin.
@@ -612,7 +623,7 @@
                         # 'gmp-fake/1.0/libfake.dylib',
                         # 'gmp-fakeopenh264/1.0/libfakeopenh264.dylib',
                     ],
-                ),
+                )
             ]
 
             with JarWriter(file=processed_filename, compress_level=5) as writer:
@@ -723,10 +734,18 @@
 class ThunderbirdMixin(object):
     trust_domain = "comm"
     product = "thunderbird"
-    candidate_trees = [
+    try_tree = "try-comm-central"
+
+    nightly_candidate_trees = [
         "comm-central",
     ]
-    try_tree = "try-comm-central"
+    beta_candidate_trees = [
+        "releases/comm-beta",
+    ]
+    # The list below list should be updated when we have new ESRs.
+    esr_candidate_trees = [
+        "releases/comm-esr91",
+    ]
 
 
 class LinuxThunderbirdArtifactJob(ThunderbirdMixin, LinuxArtifactJob):
@@ -1038,7 +1057,6 @@
     def run_hg(self, *args, **kwargs):
         env = kwargs.get("env", {})
         env["HGPLAIN"] = "1"
-        kwargs["env"] = ensure_subprocess_env(env)
         kwargs["universal_newlines"] = True
         return subprocess.check_output([self._hg] + list(args), **kwargs)
 
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozbuild/build_commands.py thunderbird-91.4.0+build2/python/mozbuild/mozbuild/build_commands.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozbuild/build_commands.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozbuild/build_commands.py	2021-12-09 11:59:53.000000000 +0000
@@ -8,14 +8,10 @@
 import os
 import subprocess
 
-from mach.decorators import (
-    CommandArgument,
-    CommandProvider,
-    Command,
-)
+from mach.decorators import CommandArgument, CommandProvider, Command
 
 from mozbuild.base import MachCommandBase
-from mozbuild.util import ensure_subprocess_env, MOZBUILD_METRICS_PATH
+from mozbuild.util import MOZBUILD_METRICS_PATH
 from mozbuild.mozconfig import MozconfigLoader
 import mozpack.path as mozpath
 
@@ -148,9 +144,7 @@
                 instr.virtualenv_manager.python_path,
                 mozpath.join(self.topsrcdir, "build/pgo/profileserver.py"),
             ]
-            subprocess.check_call(
-                pgo_cmd, cwd=instr.topobjdir, env=ensure_subprocess_env(pgo_env)
-            )
+            subprocess.check_call(pgo_cmd, cwd=instr.topobjdir, env=pgo_env)
 
             # Set the default build to MOZ_PROFILE_USE
             append_env = {"MOZ_PROFILE_USE": "1"}
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozbuild/configure/__init__.py thunderbird-91.4.0+build2/python/mozbuild/mozbuild/configure/__init__.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozbuild/configure/__init__.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozbuild/configure/__init__.py	2021-12-09 11:59:53.000000000 +0000
@@ -25,13 +25,8 @@
     OptionValue,
 )
 from mozbuild.configure.help import HelpFormatter
-from mozbuild.configure.util import (
-    ConfigureOutputHandler,
-    getpreferredencoding,
-    LineIO,
-)
+from mozbuild.configure.util import ConfigureOutputHandler, getpreferredencoding, LineIO
 from mozbuild.util import (
-    ensure_subprocess_env,
     exec_,
     memoize,
     memoized_property,
@@ -1016,15 +1011,9 @@
 
         def wrap(function):
             def wrapper(*args, **kwargs):
-                if kwargs.get("env") is None:
+                if kwargs.get("env") is None and self._environ:
                     kwargs["env"] = dict(self._environ)
-                # Subprocess on older Pythons can't handle unicode keys or
-                # values in environment dicts while subprocess on newer Pythons
-                # needs text in the env. Normalize automagically so callers
-                # don't have to deal with this.
-                kwargs["env"] = ensure_subprocess_env(
-                    kwargs["env"], encoding=system_encoding
-                )
+
                 return function(*args, **kwargs)
 
             return wrapper
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozbuild/frontend/gyp_reader.py thunderbird-91.4.0+build2/python/mozbuild/mozbuild/frontend/gyp_reader.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozbuild/frontend/gyp_reader.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozbuild/frontend/gyp_reader.py	2021-12-09 11:59:53.000000000 +0000
@@ -14,16 +14,8 @@
 import mozpack.path as mozpath
 from mozpack.files import FileFinder
 from .sandbox import alphabetical_sorted
-from .context import (
-    ObjDirPath,
-    SourcePath,
-    TemplateContext,
-    VARIABLES,
-)
-from mozbuild.util import (
-    ensure_subprocess_env,
-    expand_variables,
-)
+from .context import ObjDirPath, SourcePath, TemplateContext, VARIABLES
+from mozbuild.util import expand_variables
 
 # Define this module as gyp.generator.mozbuild so that gyp can use it
 # as a generator under the name "mozbuild".
@@ -436,12 +428,10 @@
             # This isn't actually used anywhere in this generator, but it's needed
             # to override the registry detection of VC++ in gyp.
             os.environ.update(
-                ensure_subprocess_env(
-                    {
-                        "GYP_MSVS_OVERRIDE_PATH": "fake_path",
-                        "GYP_MSVS_VERSION": config.substs["MSVS_VERSION"],
-                    }
-                )
+                {
+                    "GYP_MSVS_OVERRIDE_PATH": "fake_path",
+                    "GYP_MSVS_VERSION": config.substs["MSVS_VERSION"],
+                }
             )
 
         params = {
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozbuild/mozconfig.py thunderbird-91.4.0+build2/python/mozbuild/mozbuild/mozconfig.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozbuild/mozconfig.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozbuild/mozconfig.py	2021-12-09 11:59:53.000000000 +0000
@@ -14,7 +14,6 @@
 
 from mozboot.mozconfig import find_mozconfig
 from mozpack import path as mozpath
-from mozbuild.util import ensure_subprocess_env
 
 MOZCONFIG_BAD_EXIT_CODE = """
 Evaluation of your mozconfig exited with an error. This could be triggered
@@ -79,14 +78,7 @@
 
     IGNORE_SHELL_VARIABLES = {"_", "BASH_ARGV", "BASH_ARGV0", "BASH_ARGC"}
 
-    ENVIRONMENT_VARIABLES = {
-        "CC",
-        "CXX",
-        "CFLAGS",
-        "CXXFLAGS",
-        "LDFLAGS",
-        "MOZ_OBJDIR",
-    }
+    ENVIRONMENT_VARIABLES = {"CC", "CXX", "CFLAGS", "CXXFLAGS", "LDFLAGS", "MOZ_OBJDIR"}
 
     AUTODETECT = object()
 
@@ -163,7 +155,7 @@
                     command,
                     stderr=subprocess.STDOUT,
                     cwd=self.topsrcdir,
-                    env=ensure_subprocess_env(env),
+                    env=env,
                     universal_newlines=True,
                 )
             )
@@ -198,12 +190,7 @@
             added = set2 - set1
             removed = set1 - set2
             maybe_modified = set1 & set2
-            changed = {
-                "added": {},
-                "removed": {},
-                "modified": {},
-                "unmodified": {},
-            }
+            changed = {"added": {}, "removed": {}, "modified": {}, "unmodified": {}}
 
             for key in added:
                 changed["added"][key] = vars_after[key]
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozbuild/repackaging/mar.py thunderbird-91.4.0+build2/python/mozbuild/mozbuild/repackaging/mar.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozbuild/repackaging/mar.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozbuild/repackaging/mar.py	2021-12-09 11:59:51.000000000 +0000
@@ -13,10 +13,7 @@
 import subprocess
 import mozpack.path as mozpath
 from mozbuild.repackaging.application_ini import get_application_ini_value
-from mozbuild.util import (
-    ensureParentDir,
-    ensure_subprocess_env,
-)
+from mozbuild.util import ensureParentDir
 
 
 _BCJ_OPTIONS = {
@@ -87,7 +84,7 @@
             # make_full_update.sh is a bash script, and Windows needs to
             # explicitly call out the shell to execute the script from Python.
             cmd.insert(0, env["MOZILLABUILD"] + "/msys/bin/bash.exe")
-        subprocess.check_call(cmd, env=ensure_subprocess_env(env))
+        subprocess.check_call(cmd, env=env)
 
     finally:
         shutil.rmtree(tmpdir)
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozbuild/test/python.ini thunderbird-91.4.0+build2/python/mozbuild/mozbuild/test/python.ini
--- thunderbird-91.3.2+build1/python/mozbuild/mozbuild/test/python.ini	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozbuild/test/python.ini	2021-12-09 11:59:52.000000000 +0000
@@ -43,6 +43,7 @@
 [frontend/test_reader.py]
 [frontend/test_sandbox.py]
 [test_artifact_cache.py]
+[test_artifacts.py]
 [test_base.py]
 [test_containers.py]
 [test_dotproperties.py]
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozbuild/test/test_artifacts.py thunderbird-91.4.0+build2/python/mozbuild/mozbuild/test/test_artifacts.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozbuild/test/test_artifacts.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozbuild/test/test_artifacts.py	2021-12-09 11:59:52.000000000 +0000
@@ -0,0 +1,111 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import buildconfig
+import mozunit
+
+from unittest import TestCase
+
+from mozbuild.artifacts import ArtifactJob, ThunderbirdMixin
+
+
+class FakeArtifactJob(ArtifactJob):
+    package_re = r""
+
+
+class TestArtifactJob(TestCase):
+    def _assert_candidate_trees(self, version_display, expected_trees):
+        buildconfig.substs["MOZ_APP_VERSION_DISPLAY"] = version_display
+
+        job = FakeArtifactJob()
+        self.assertGreater(len(job.candidate_trees), 0)
+        self.assertEqual(job.candidate_trees, expected_trees)
+
+    def test_candidate_trees_with_empty_file(self):
+        self._assert_candidate_trees(
+            version_display="", expected_trees=ArtifactJob.default_candidate_trees
+        )
+
+    def test_candidate_trees_with_beta_version(self):
+        self._assert_candidate_trees(
+            version_display="92.1b2", expected_trees=ArtifactJob.beta_candidate_trees
+        )
+
+    def test_candidate_trees_with_esr_version(self):
+        self._assert_candidate_trees(
+            version_display="91.3.0esr", expected_trees=ArtifactJob.esr_candidate_trees
+        )
+
+    def test_candidate_trees_with_nightly_version(self):
+        self._assert_candidate_trees(
+            version_display="95.0a1", expected_trees=ArtifactJob.nightly_candidate_trees
+        )
+
+    def test_candidate_trees_with_release_version(self):
+        self._assert_candidate_trees(
+            version_display="93.0.1", expected_trees=ArtifactJob.default_candidate_trees
+        )
+
+    def test_candidate_trees_with_newline_before_version(self):
+        self._assert_candidate_trees(
+            version_display="\n\n91.3.0esr",
+            expected_trees=ArtifactJob.esr_candidate_trees,
+        )
+
+    def test_property_is_cached(self):
+        job = FakeArtifactJob()
+        expected_trees = ArtifactJob.esr_candidate_trees
+
+        buildconfig.substs["MOZ_APP_VERSION_DISPLAY"] = "91.3.0.esr"
+        self.assertEqual(job.candidate_trees, expected_trees)
+        # Because the property is cached, changing the
+        # `MOZ_APP_VERSION_DISPLAY` won't have any impact.
+        buildconfig.substs["MOZ_APP_VERSION_DISPLAY"] = ""
+        self.assertEqual(job.candidate_trees, expected_trees)
+
+
+class FakeThunderbirdJob(ThunderbirdMixin, FakeArtifactJob):
+    pass
+
+
+class TestThunderbirdMixin(TestCase):
+    def _assert_candidate_trees(self, version_display, expected_trees):
+        buildconfig.substs["MOZ_APP_VERSION_DISPLAY"] = version_display
+
+        job = FakeThunderbirdJob()
+        self.assertGreater(len(job.candidate_trees), 0)
+        self.assertEqual(job.candidate_trees, expected_trees)
+
+    def test_candidate_trees_with_beta_version(self):
+        self._assert_candidate_trees(
+            version_display="92.1b2",
+            expected_trees=ThunderbirdMixin.beta_candidate_trees,
+        )
+
+    def test_candidate_trees_with_esr_version(self):
+        self._assert_candidate_trees(
+            version_display="91.3.0esr",
+            expected_trees=ThunderbirdMixin.esr_candidate_trees,
+        )
+
+    def test_candidate_trees_with_nightly_version(self):
+        self._assert_candidate_trees(
+            version_display="95.0a1",
+            expected_trees=ThunderbirdMixin.nightly_candidate_trees,
+        )
+
+    def test_property_is_cached(self):
+        job = FakeThunderbirdJob()
+        expected_trees = ThunderbirdMixin.esr_candidate_trees
+
+        buildconfig.substs["MOZ_APP_VERSION_DISPLAY"] = "91.3.0.esr"
+        self.assertEqual(job.candidate_trees, expected_trees)
+        # Because the property is cached, changing the
+        # `MOZ_APP_VERSION_DISPLAY` won't have any impact.
+        buildconfig.substs["MOZ_APP_VERSION_DISPLAY"] = ""
+        self.assertEqual(job.candidate_trees, expected_trees)
+
+
+if __name__ == "__main__":
+    mozunit.main()
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozpack/test/test_archive.py thunderbird-91.4.0+build2/python/mozbuild/mozpack/test/test_archive.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozpack/test/test_archive.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozpack/test/test_archive.py	2021-12-09 11:59:53.000000000 +0000
@@ -14,6 +14,8 @@
 
 import pytest
 
+import sys
+
 from mozpack.archive import (
     DEFAULT_MTIME,
     create_tar_from_files,
@@ -115,8 +117,16 @@
             with open(tp, "wb") as fh:
                 create_tar_from_files(fh, files)
 
-            # Output should be deterministic.
-            self.assertEqual(file_hash(tp), "01cd314e277f060e98c7de6c8ea57f96b3a2065c")
+            # Output should be deterministic. Checking for Python version because of Bug 1735396.
+            if sys.version_info.major == 3 and sys.version_info.minor <= 8:
+                self.assertEqual(
+                    file_hash(tp), "01cd314e277f060e98c7de6c8ea57f96b3a2065c"
+                )
+            # The else statement below assumes Python 3.9 and newer.
+            else:
+                self.assertEqual(
+                    file_hash(tp), "50fe1aaadf0d44abb69bdea174b4dd6cdb4f4898"
+                )
 
             with tarfile.open(tp, "r") as tf:
                 self._verify_basic_tarfile(tf)
@@ -155,7 +165,14 @@
             with open(gp, "wb") as fh:
                 create_tar_gz_from_files(fh, files)
 
-            self.assertEqual(file_hash(gp), "7c4da5adc5088cdf00911d5daf9a67b15de714b7")
+            if sys.version_info.major == 3 and sys.version_info.minor <= 8:
+                self.assertEqual(
+                    file_hash(gp), "7c4da5adc5088cdf00911d5daf9a67b15de714b7"
+                )
+            else:
+                self.assertEqual(
+                    file_hash(gp), "766117873af9754915ee93c56243616d000d7e5e"
+                )
 
             with tarfile.open(gp, "r:gz") as tf:
                 self._verify_basic_tarfile(tf)
@@ -170,9 +187,16 @@
 
             gp = os.path.join(d, "test.tar.gz")
             with open(gp, "wb") as fh:
-                create_tar_gz_from_files(fh, files, filename="foobar", compresslevel=1)
+                create_tar_gz_from_files(fh, files, filename="foobar")
 
-            self.assertEqual(file_hash(gp), "1cc8b96f0262350977c2e9d61f40a1fa76f35c52")
+            if sys.version_info.major == 3 and sys.version_info.minor <= 8:
+                self.assertEqual(
+                    file_hash(gp), "721e00083c17d16df2edbddf40136298c06d0c49"
+                )
+            else:
+                self.assertEqual(
+                    file_hash(gp), "059916c8e6b6f22be774dc56aabb3819460fee53"
+                )
 
             with tarfile.open(gp, "r:gz") as tf:
                 self._verify_basic_tarfile(tf)
@@ -189,7 +213,14 @@
             with open(bp, "wb") as fh:
                 create_tar_bz2_from_files(fh, files)
 
-            self.assertEqual(file_hash(bp), "eb5096d2fbb71df7b3d690001a6f2e82a5aad6a7")
+            if sys.version_info.major == 3 and sys.version_info.minor <= 8:
+                self.assertEqual(
+                    file_hash(bp), "eb5096d2fbb71df7b3d690001a6f2e82a5aad6a7"
+                )
+            else:
+                self.assertEqual(
+                    file_hash(bp), "600883e25722fdde5eb78c6c40955ab80b7ac114"
+                )
 
             with tarfile.open(bp, "r:bz2") as tf:
                 self._verify_basic_tarfile(tf)
diff -Nru thunderbird-91.3.2+build1/python/mozbuild/mozpack/test/test_files.py thunderbird-91.4.0+build2/python/mozbuild/mozpack/test/test_files.py
--- thunderbird-91.3.2+build1/python/mozbuild/mozpack/test/test_files.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozbuild/mozpack/test/test_files.py	2021-12-09 11:59:54.000000000 +0000
@@ -350,7 +350,7 @@
         self.assertEqual(link, source)
 
     def test_noop(self):
-        if not hasattr(os, "symlink"):
+        if not hasattr(os, "symlink") or sys.platform == "win32":
             return
 
         source = self.tmppath("source")
diff -Nru thunderbird-91.3.2+build1/python/mozperftest/mozperftest/test/browsertime/visualtools.py thunderbird-91.4.0+build2/python/mozperftest/mozperftest/test/browsertime/visualtools.py
--- thunderbird-91.3.2+build1/python/mozperftest/mozperftest/test/browsertime/visualtools.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/python/mozperftest/mozperftest/test/browsertime/visualtools.py	2021-12-09 11:59:53.000000000 +0000
@@ -95,6 +95,10 @@
         "69/89/d8fc61a51ded540bd4b8859510b4ae44a0762c8b61dd81eb2c36f5e853ef/"
         "numpy-1.19.2-cp38-cp38-win_amd64.whl"
     ),
+    ("win64", "3.9"): (
+        "cc/bd/5779abe299afb562cdd434e8229a69a71802cc131ea6d811a8bf05937745/"
+        "numpy-1.20.0-cp39-cp39-win_amd64.whl"
+    ),
 }
 
 
@@ -135,6 +139,10 @@
         "9e/66/57d6cfa52dacd9a57d0289f8b8a614b2b4f9c401c2ac154d6b31ed8257d6/"
         "numpy-1.19.2-cp38-cp38-win_amd64.whl"
     ),
+    ("win64", "3.9"): (
+        "a5/6c/30c838130f75f3aaf65fdf72cc357967d7d2b569bf52c7eb788e6f1eb8c3/"
+        "scipy-1.5.4-cp39-cp39-win_amd64.whl"
+    ),
 }
 
 
diff -Nru thunderbird-91.3.2+build1/security/manager/ssl/nsSTSPreloadList.inc thunderbird-91.4.0+build2/security/manager/ssl/nsSTSPreloadList.inc
--- thunderbird-91.3.2+build1/security/manager/ssl/nsSTSPreloadList.inc	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/security/manager/ssl/nsSTSPreloadList.inc	2021-12-09 12:00:15.000000000 +0000
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1646045406094000);
+const PRTime gPreloadListExpirationTime = INT64_C(1648723821863000);
 %%
 0--1.de, 1
 0-1.party, 1
@@ -109,10 +109,6 @@
 0139365.com, 0
 013zl.com, 1
 015kb.com, 1
-016028.com, 1
-016098.com, 1
-016298.com, 1
-016328.com, 1
 018663.com, 1
 018zl.com, 1
 019328.com, 1
@@ -226,8 +222,6 @@
 066318.com, 1
 066538.com, 1
 066718.com, 1
-066928.com, 1
-066938.com, 1
 06804.com, 1
 0681a.com, 1
 0681h.com, 1
@@ -246,13 +240,11 @@
 0760ks.com, 1
 076k8.com, 1
 0771z6.com, 1
-077768.net, 1
 077969.com, 1
 077k8.com, 1
 078663.com, 1
 0788yh.com, 1
 0792112.com, 1
-0797.tv, 1
 0798rcw.com, 1
 07d88.com, 1
 07d88.net, 1
@@ -261,7 +253,6 @@
 0809yh.com, 1
 081115.com, 1
 08154711.xyz, 1
-081638.com, 1
 081752.com, 1
 081763.com, 1
 081769.com, 1
@@ -286,7 +277,6 @@
 083905.com, 1
 083907.com, 1
 083912.com, 1
-083957.com, 1
 083962.com, 1
 083965.com, 1
 083967.com, 1
@@ -330,7 +320,6 @@
 0ii0.cf, 1
 0ik.de, 1
 0iz.net, 1
-0km.top, 1
 0knowledge.de, 0
 0kun.net, 1
 0o0.edu.pl, 1
@@ -417,8 +406,11 @@
 100baksov.tk, 1
 100ballov.tk, 1
 100cccc.com, 1
+100dddd.com, 1
 100eeee.com, 1
+100ffff.com, 1
 100gggg.com, 1
+100hhhh.com, 1
 100jjjj.com, 1
 100k.eu, 1
 100kkkk.com, 1
@@ -431,12 +423,14 @@
 100pourcentlocale.be, 1
 100procentlokaal.be, 1
 100pudov.tk, 1
+100qqqq.com, 1
 100rrrr.com, 1
 100sapog.tk, 1
 100skidok.ga, 1
 100tur.tk, 1
 100up.de, 1
 100up.org, 1
+100uuuu.com, 1
 100v.org, 1
 100visits.tk, 1
 100voprosov.tk, 1
@@ -444,6 +438,7 @@
 100words.ca, 1
 100yyyy.com, 1
 100zakladok.tk, 1
+100zzzz.com, 1
 101.qa, 1
 10101.io, 1
 101010.pl, 1
@@ -644,7 +639,6 @@
 1177z6.com, 1
 11883837.com, 1
 11885835.com, 1
-118btt.com, 1
 118vip.net, 1
 1190america.tk, 1
 11993837.com, 1
@@ -657,7 +651,7 @@
 11aazz.com, 1
 11ag8.com, 1
 11assets.com, 1
-11b31.com, 1
+11b31.com, 0
 11b58.com, 1
 11bbee.com, 1
 11bbjj.com, 1
@@ -742,13 +736,11 @@
 11jjqq.com, 1
 11jjrr.com, 1
 11jjtt.com, 1
-11jjyy.com, 1
 11jjzz.com, 1
 11kkee.com, 1
 11kkff.com, 1
 11kkss.com, 1
 11men.tk, 1
-11ppbb.com, 1
 11ppcc.com, 1
 11ppdd.com, 1
 11ppee.com, 1
@@ -899,7 +891,6 @@
 12345678365.com, 1
 123456789365.com, 1
 12345porn.com, 1
-1234666365.com, 1
 1236.be, 1
 12365t.com, 1
 123ali.ir, 1
@@ -935,7 +926,7 @@
 127661.com, 1
 1277bet.com, 1
 1288366.com, 1
-129.co, 1
+129.co, 0
 1299bet.com, 1
 12ag8.com, 1
 12bsc.com, 1
@@ -949,7 +940,6 @@
 12train.com, 1
 13-th.com, 1
 130.ua, 1
-130978.com, 1
 130kb.com, 1
 130ks.com, 1
 130ks.net, 1
@@ -965,7 +955,6 @@
 133492.com, 1
 133769.xyz, 1
 1337ersprime.com, 1
-133846.xyz, 1
 133ks.com, 1
 133ks.net, 1
 133z6.com, 1
@@ -1011,7 +1000,6 @@
 148663.com, 1
 149433.com, 1
 149733.com, 1
-14er.games, 1
 14er.jp, 1
 14er.net, 1
 14erc.com, 1
@@ -1188,6 +1176,7 @@
 16836599.com, 1
 168365t.com, 1
 168bet9.com, 1
+168btt.com, 1
 168esb.com, 1
 168fff.cc, 1
 168z6.com, 1
@@ -1276,7 +1265,6 @@
 174.net.nz, 1
 174343.com, 1
 1750studios.com, 0
-175dt.com, 1
 175k8.com, 1
 175ks.com, 1
 1768calc.com.au, 1
@@ -1673,6 +1661,7 @@
 21566365.com, 0
 215dy.net, 1
 216vv.com, 1
+218btt.com, 1
 218strand.com, 1
 219k8.com, 1
 21risk.com, 1
@@ -1687,7 +1676,7 @@
 2222365t.com, 1
 2222k8.com, 1
 2222k8.net, 1
-222321365.com, 1
+222321365.com, 0
 2226321.com, 1
 2227552.com, 1
 222b58.com, 1
@@ -1696,7 +1685,7 @@
 222k8.com, 1
 222k8.net, 1
 222tips.com, 1
-22321365.com, 1
+22321365.com, 0
 225485.com, 1
 2255motion.com, 1
 2264707.ru, 1
@@ -1831,7 +1820,7 @@
 233abc.com, 0
 233blog.com, 1
 233boy.com, 1
-233hub.com, 0
+233hub.com, 1
 233hub.net, 1
 233hub.org, 1
 233hugo.com, 1
@@ -1879,41 +1868,41 @@
 247xchanger.com, 1
 2484811.com, 1
 24848168.com, 1
-24848188.com, 1
-2484822.com, 1
+24848188.com, 0
+2484822.com, 0
 2484833.com, 1
 2484855.com, 1
-24848588.com, 1
-24848918.com, 1
-24848966.com, 1
-24848988.com, 1
+24848588.com, 0
+24848918.com, 0
+24848966.com, 0
+24848988.com, 0
 24848a.vip, 1
 24848b.vip, 1
 24848c.vip, 1
 24848d.vip, 1
-24848e.vip, 1
-24848h.vip, 1
-24848jj.com, 1
-24848kk.com, 1
-24848ll.com, 1
+24848e.vip, 0
+24848h.vip, 0
+24848jj.com, 0
+24848kk.com, 0
+24848ll.com, 0
 24848mm.com, 1
 24848nn.com, 1
-24848oo.com, 1
-24848pp.com, 1
-24848qq.com, 1
-24848rr.com, 1
+24848oo.com, 0
+24848pp.com, 0
+24848qq.com, 0
+24848rr.com, 0
 24848ss.com, 1
-24848tt.com, 1
-24848uu.com, 1
+24848tt.com, 0
+24848uu.com, 0
 24848v.vip, 1
-24848vv.com, 1
-24848w.vip, 1
-24848ww.com, 1
-24848x.vip, 1
-24848xx.com, 1
-24848y.vip, 1
-24848yy.com, 1
-24848z.vip, 1
+24848vv.com, 0
+24848w.vip, 0
+24848ww.com, 0
+24848x.vip, 0
+24848xx.com, 0
+24848y.vip, 0
+24848yy.com, 0
+24848z.vip, 0
 24848zz.com, 1
 248663.com, 1
 2495dentalimplants.com, 1
@@ -1927,9 +1916,7 @@
 24hour-locksmithsanantonio.com, 1
 24hourcyclist.co.uk, 1
 24hourelectricalservices.co.uk, 1
-24hourlocksmithbaltimore.com, 1
 24hourlocksmithdallastx.com, 1
-24hourlocksmithdetroit.com, 1
 24hourlocksmithhoustontx.com, 1
 24hourlocksmithspring.com, 1
 24hourscienceprojects.com, 1
@@ -2167,52 +2154,52 @@
 315xpj.com, 0
 316433.com, 1
 317811111.com, 1
-317822222.com, 1
+317822222.com, 0
 31783333.com, 1
-317833333.com, 1
-317844444.com, 1
-317855555.com, 1
+317833333.com, 0
+317844444.com, 0
+317855555.com, 0
 31786666.com, 1
-317866666.com, 1
+317866666.com, 0
 3178666666.com, 1
-317877777.com, 1
+317877777.com, 0
 3178888888.com, 1
-31789999.com, 1
-317899999.com, 1
-3178b.com, 1
+31789999.com, 0
+317899999.com, 0
+3178b.com, 0
 3178bbb.com, 1
-3178c.com, 1
+3178c.com, 0
 3178ccc.com, 1
 3178dd.com, 1
-3178ddd.com, 1
-3178e.com, 1
+3178ddd.com, 0
+3178e.com, 0
 3178eee.com, 1
-3178f.com, 1
-3178fff.com, 1
-3178g.com, 1
-3178h.com, 1
-3178i.com, 1
-3178iii.com, 1
-3178jjj.com, 1
-3178l.com, 1
-3178m.com, 1
-3178n.com, 1
+3178f.com, 0
+3178fff.com, 0
+3178g.com, 0
+3178h.com, 0
+3178i.com, 0
+3178iii.com, 0
+3178jjj.com, 0
+3178l.com, 0
+3178m.com, 0
+3178n.com, 0
 3178o.com, 1
-3178p.com, 1
-3178ppp.com, 1
-3178qqq.com, 1
-3178rrr.com, 1
-3178tt.com, 1
-3178ttt.com, 1
-3178uuu.com, 1
-3178vvv.com, 1
-3178ww.com, 1
-3178www.com, 1
-3178xx.com, 1
+3178p.com, 0
+3178ppp.com, 0
+3178qqq.com, 0
+3178rrr.com, 0
+3178tt.com, 0
+3178ttt.com, 0
+3178uuu.com, 0
+3178vvv.com, 0
+3178ww.com, 0
+3178www.com, 0
+3178xx.com, 0
 3178xxx.com, 1
 3178yy.com, 1
 3178yyy.com, 1
-3178zzz.com, 1
+3178zzz.com, 0
 319k3.com, 1
 319xpj.com, 1
 31du.cn, 1
@@ -2239,7 +2226,7 @@
 33-km.ru, 1
 33138vip.com, 1
 33168365.com, 1
-33321365.com, 1
+33321365.com, 0
 333321365.com, 1
 3333365t.com, 1
 333365t.com, 1
@@ -2289,7 +2276,7 @@
 34365t.com, 1
 343722.com, 1
 343922.com, 1
-34536565.com, 1
+34536565.com, 0
 3455bet.com, 1
 345666365.com, 1
 3456666365.com, 1
@@ -2384,7 +2371,6 @@
 351365.com, 1
 3539783.com, 1
 354022.com, 1
-354133.com, 1
 354622.com, 1
 354633.com, 1
 354922.com, 1
@@ -2479,23 +2465,23 @@
 36536599.vip, 0
 3654.vip, 1
 3655053.com, 1
-36554ll.com, 1
-36554mm.com, 1
+36554ll.com, 0
+36554mm.com, 0
 3655612.com, 0
 3655623.com, 0
 3655634.com, 0
 3655645.com, 0
 365600dl.com, 1
-36565123.com, 1
-36565234.com, 1
-36565345.com, 1
-365654321.com, 1
-36565456.com, 1
-36565567.com, 1
+36565123.com, 0
+36565234.com, 0
+36565345.com, 0
+365654321.com, 0
+36565456.com, 0
+36565567.com, 0
 36565678.com, 1
-36565789.com, 1
+36565789.com, 0
 36565b.com, 1
-36565f.com, 1
+36565f.com, 0
 3656701.com, 0
 3656712.com, 0
 3656723.com, 0
@@ -2524,7 +2510,7 @@
 365electricalvn.com, 1
 365fast.com, 1
 365healthworld.com, 1
-365iosapp.com, 1
+365iosapp.com, 0
 365nnnn.com, 0
 365propertybuyer.co.uk, 0
 365q01.com, 1
@@ -2535,7 +2521,7 @@
 365y00.com, 1
 365y11.com, 1
 365y2.com, 1
-365y22.com, 1
+365y22.com, 0
 365y33.com, 1
 365y5.com, 1
 365y55.com, 1
@@ -2585,7 +2571,6 @@
 369wt.com, 1
 36ag8.com, 1
 36ga.com, 1
-36gx.com, 1
 36ja.com, 1
 36jn.com, 1
 36kn.com, 1
@@ -2595,7 +2580,6 @@
 36xk.com, 1
 36xn.com, 1
 36yf.com, 1
-36yj.com, 1
 370422.com, 1
 371422.com, 1
 371cloud.com, 0
@@ -2775,7 +2759,6 @@
 3countiescastlehire.co.uk, 1
 3cs.ch, 1
 3d-animator.net, 1
-3d-fotoservice.de, 1
 3d-glow.de, 1
 3d-station.fr, 1
 3dagentur.com, 1
@@ -2981,7 +2964,6 @@
 426773.com, 1
 427552.com, 1
 428northampton.com, 1
-42browning.com, 1
 42ch.com, 1
 42day.info, 1
 42entrepreneurs.fr, 0
@@ -3002,10 +2984,10 @@
 43klive.com, 1
 44-k.com, 1
 44168365.com, 1
-44321365.com, 1
+44321365.com, 0
 443658.com, 1
 44365t.com, 1
-444321365.com, 1
+444321365.com, 0
 4447552.com, 1
 444b58.com, 1
 444bet86.com, 1
@@ -3230,7 +3212,6 @@
 48d88.com, 1
 48lipetsk.tk, 1
 48times.online, 1
-491mhz.net, 1
 4927a.com, 1
 492977.com, 1
 492y.com, 1
@@ -3547,7 +3528,6 @@
 536422.com, 1
 5364jc.com, 1
 538vv.com, 1
-53ningen.com, 1
 53pluk.cz, 1
 54.sb, 0
 540922.com, 1
@@ -3564,13 +3544,12 @@
 545922.com, 1
 54below.com, 1
 54cuatro.com, 1
-54lsj.cc, 1
 5518k3.com, 1
-55321365.com, 1
+55321365.com, 0
 5533445.com, 1
 55365t.com, 1
 5536z.com, 1
-555321365.com, 1
+555321365.com, 0
 5557552.com, 1
 555b58.com, 1
 555bet86.com, 1
@@ -3638,8 +3617,8 @@
 595380.com, 1
 595422.com, 1
 596422.com, 1
-59759vip.com, 1
-59759z.com, 1
+59759vip.com, 0
+59759z.com, 0
 5981168.com, 1
 5981611.com, 1
 5981622.com, 1
@@ -3717,7 +3696,6 @@
 5icsb.com, 1
 5ilg.com, 1
 5keys.ru, 1
-5kraceforals.com, 1
 5long88.com, 1
 5net.ga, 1
 5ososea.com, 1
@@ -3781,6 +3759,7 @@
 616btt.net, 1
 616f88.com, 1
 61730123.com, 1
+618media.com, 1
 619kb.com, 1
 61ag8.com, 1
 61d88.com, 1
@@ -4049,7 +4028,7 @@
 6616fc.com, 1
 661z6.com, 1
 662607.xyz, 1
-66321365.com, 1
+66321365.com, 0
 6633445.com, 1
 663365666.com, 1
 663365777.com, 1
@@ -4089,7 +4068,7 @@
 6660111.ru, 1
 666111bet.com, 1
 666222bet.com, 1
-666321365.com, 1
+666321365.com, 0
 666333bet.com, 1
 666365app.com, 1
 666365ios.com, 1
@@ -4181,7 +4160,7 @@
 6729ll.co, 1
 6729ll.com, 1
 6729m.co, 1
-6729m.com, 1
+6729m.com, 0
 6729mm.co, 1
 6729mm.com, 1
 6729n.co, 1
@@ -4205,7 +4184,7 @@
 6729rr.co, 1
 6729rr.com, 1
 6729s.co, 1
-6729s.com, 1
+6729s.com, 0
 6729ss.co, 1
 6729ss.com, 1
 6729t.co, 1
@@ -4219,7 +4198,7 @@
 6729v.co, 1
 6729v.com, 1
 6729vv.co, 1
-6729vv.com, 1
+6729vv.com, 0
 6729w.co, 1
 6729w.com, 1
 6729ww.co, 1
@@ -4419,7 +4398,6 @@
 729433.com, 1
 729solutions.com, 1
 72hours2sold.com, 1
-730433.com, 1
 731433.com, 1
 732365.com, 1
 732433.com, 1
@@ -4578,7 +4556,7 @@
 7666898.com, 1
 76669.com, 1
 76956.com, 1
-769k.com, 1
+769k.com, 0
 76networks.tk, 1
 77-elagage.fr, 1
 77018cc.com, 1
@@ -4587,7 +4565,7 @@
 77018vip.com, 1
 77168365.com, 1
 77177.de, 1
-77321365.com, 1
+77321365.com, 0
 7733445.com, 1
 775018.com, 1
 776z6.com, 1
@@ -4622,7 +4600,7 @@
 7891553.com, 1
 7891997.com, 1
 7893.net, 1
-78936565.com, 1
+78936565.com, 0
 789365t.com, 1
 7894.net, 1
 789zr.com, 0
@@ -4835,7 +4813,6 @@
 8200d.com, 1
 8202d.com, 1
 8203d88.com, 1
-8206688.com, 1
 8206d.com, 1
 8207d88.com, 1
 8208d.com, 1
@@ -5113,7 +5090,7 @@
 8822d88.com, 1
 8826d.com, 1
 8826d88.com, 1
-88321365.com, 1
+88321365.com, 0
 8832ks.com, 1
 8833445.com, 1
 8835365.com, 1
@@ -5173,7 +5150,7 @@
 8876d.com, 1
 887d.com, 1
 8881ks.com, 1
-888321365.com, 1
+888321365.com, 0
 8884553.com, 1
 8885asknick.com, 1
 8885ks.com, 1
@@ -5481,13 +5458,13 @@
 934122.com, 1
 934365.com, 1
 93644.com, 1
-93644a.com, 1
-93644b.com, 1
-93644c.com, 1
-93644d.com, 1
-93644x.com, 1
-93644y.com, 1
-93644z.com, 1
+93644a.com, 0
+93644b.com, 0
+93644c.com, 0
+93644d.com, 0
+93644x.com, 0
+93644y.com, 0
+93644z.com, 0
 939394.org, 1
 9397.com, 1
 9397a.com, 1
@@ -5754,7 +5731,7 @@
 9918883.com, 1
 991ccc.com, 1
 992ccc.com, 1
-99321365.com, 1
+99321365.com, 0
 9933445.com, 1
 99365t.com, 1
 99456j.com, 0
@@ -6022,9 +5999,9 @@
 a30.tokyo, 0
 a356.top, 1
 a36533.com, 1
-a365vip2.com, 1
+a365vip2.com, 0
 a365vip3.com, 1
-a365vip5.com, 1
+a365vip5.com, 0
 a365vip9.com, 1
 a3m.gmbh, 1
 a3mobile.com, 1
@@ -6272,7 +6249,7 @@
 abe-elektro.de, 1
 abe-medical.jp, 1
 abecodes.net, 1
-abeestrada.com, 1
+abeestrada.com, 0
 abeilles-idapi.fr, 0
 abelbarretto.tk, 1
 abelburners.co.uk, 1
@@ -6480,7 +6457,6 @@
 absolucopine.com, 1
 absolugroupe.com, 1
 absoluphoto.com, 1
-absolutcruceros.com, 1
 absolute.com, 1
 absoluteautobody.com, 1
 absolutebritney.com, 1
@@ -6490,7 +6466,6 @@
 absolutezero.tk, 1
 absolution.ga, 1
 absolutperm.tk, 1
-absolutviajes.com, 1
 absolutweb.tk, 1
 abssoft.tk, 1
 abstechs.ae, 1
@@ -6545,7 +6520,6 @@
 acacia-gardens.co.uk, 1
 acaciawellbeing.com.au, 1
 academiacivilbalonmano.tk, 1
-academiadebomberosonline.com, 1
 academiadelmolino.com.uy, 1
 academiadeufologia.com.br, 1
 academiaelizart.ro, 1
@@ -6553,6 +6527,7 @@
 academiaoposicionescorreos.com, 1
 academiasdemodelos.com, 1
 academica.nl, 1
+academichealthscience.net, 1
 academichelp.gq, 1
 academicperks.org, 1
 academie-de-police.ch, 0
@@ -6618,7 +6593,7 @@
 accessiware.com, 1
 accesskeycloning.com, 1
 accesslogisticgroup.com, 1
-accessmania.com, 1
+accessmania.com, 0
 accessnetworks.com, 1
 accessoh.gov, 1
 accessoirescheveuxchic.com, 1
@@ -6733,6 +6708,7 @@
 achwo.de, 1
 aciclinical.com, 1
 aciclovir.ga, 1
+acid.ninja, 1
 acidchrist.tk, 1
 acidoascorbico.com, 1
 acihotel.vn, 1
@@ -6785,6 +6761,8 @@
 acquadiparma.kr, 1
 acquaparrucchieri.it, 1
 acquasuisse.tk, 1
+acquire.co.nz, 1
+acquireit.com.au, 1
 acquisition.gov, 1
 acquistorealestate.com, 1
 acrealamendolara.tk, 1
@@ -6861,7 +6839,6 @@
 activecare-monitor.com, 0
 activeclearweb.com, 1
 activeexcavator.com, 1
-activefootandankle.com, 1
 activegateball.tk, 1
 activehire.co.uk, 1
 activeleisure.ie, 1
@@ -6890,7 +6867,6 @@
 actopan.tk, 1
 actoralcareprofessional.com, 1
 actoresonlinevenezuela.tk, 1
-actors-cafe.net, 1
 actorsanthosh.tk, 1
 actorshop.co.uk, 1
 actrices.tk, 1
@@ -6901,14 +6877,12 @@
 actserv.co.ke, 1
 actu-itech.cf, 1
 actualadmins.com, 1
-actualidadblog.com, 1
 actualidadecommerce.com, 1
 actualidadgadget.com, 1
 actualidadiphone.com, 1
 actualidadkd.com, 1
 actualidadliteratura.com, 1
 actualidadmotor.com, 1
-actualidadviajes.com, 1
 actualite-videos.com, 1
 actualizarapp.com, 1
 actualpost.com, 1
@@ -7041,9 +7015,7 @@
 adasbench.com, 1
 adata.kz, 1
 adativos.com.br, 1
-adauge.com, 1
 adawolfa.cz, 1
-adayinthelifeof.nl, 1
 adblockextreme.com, 1
 adblockextreme.net, 1
 adblockextreme.org, 1
@@ -7168,7 +7140,6 @@
 aditro.com, 1
 adityatelange.in, 1
 adiyamanhaberleri.tk, 1
-adjagu.org, 0
 adje-fansite.tk, 1
 adjudicating.tk, 1
 adjustingoursails.com, 1
@@ -7208,6 +7179,7 @@
 adminresurs.tk, 1
 adminrezo.fr, 1
 adminton.eu, 1
+admirable.pro, 1
 admiralshipsupplier.com, 0
 admody.com, 1
 admongo.gov, 1
@@ -7225,6 +7197,7 @@
 adomicilio.com.gt, 0
 adonai.eti.br, 1
 adondevamosmundo.com, 1
+adonis.hosting, 1
 adonisgrup.ro, 1
 adonizer.science, 1
 adonnante.com, 0
@@ -7429,7 +7402,6 @@
 adventures.com, 1
 adventuresinparanoia.com, 1
 adventureswithlillie.ca, 1
-adventureworldtour.com, 1
 adventuringup.com, 1
 adventurousway.com, 1
 adventus.space, 1
@@ -7485,7 +7457,6 @@
 advst.uk, 1
 advtran.com, 0
 adware.pl, 0
-adwokatkosterka.pl, 1
 adwokatzdunek.pl, 1
 adws.io, 1
 adxperience.com, 1
@@ -7560,6 +7531,7 @@
 aeksistem.com, 1
 aelieve.com, 1
 aelisya.net, 0
+aelurus.com, 1
 aemteatre.com, 1
 aenmail.com, 1
 aenterprise.info, 1
@@ -7642,8 +7614,6 @@
 afbrunswick.com, 1
 afbryt.com, 1
 afc-capital.mx, 1
-afcmrs.org, 0
-afcmrsfeedback.org, 0
 afcmrstest.org, 1
 afdah.se, 1
 afearlessventure.com, 1
@@ -7679,7 +7649,6 @@
 affordablevaccinesest.ga, 1
 affpass.com, 1
 affping.com, 1
-affproduct.com, 1
 affsquare.com, 1
 affumico.it, 1
 affvps.net, 1
@@ -7943,6 +7912,7 @@
 agencia.pro, 1
 agenciacanina.tk, 1
 agenciacorujadesign.com.br, 1
+agenciadeempregosdourados.com.br, 1
 agenciadigitalbolivia.com, 1
 agenciaempleo.tk, 1
 agenciafiscal.pe, 1
@@ -7988,7 +7958,6 @@
 agenziapubblicitaria.milano.it, 1
 agenziapubblicitaria.roma.it, 1
 ageofreason.tk, 1
-agespisa.com.br, 1
 agfmedia.com, 1
 agg097.com, 1
 agg66.com, 1
@@ -8075,7 +8044,6 @@
 agks92.com, 1
 agktest1.ga, 1
 aglar.tk, 1
-aglc8.com, 1
 agleventis.com, 1
 aglh.com, 1
 aglilai001.com, 1
@@ -8254,7 +8222,6 @@
 ahmetshina.tk, 1
 ahmud.net, 1
 ahoj.hu, 1
-ahollamby.com, 1
 ahorasalud.com, 1
 ahornblatt.org, 1
 ahosi.com, 1
@@ -8549,6 +8516,7 @@
 airjet.cf, 1
 airjordanpascher.tk, 1
 airkiss.ga, 1
+airknowledge.gov, 1
 airline-rabota.tk, 1
 airlinefarescompare.com, 1
 airlineflyingclub.tk, 1
@@ -8579,6 +8547,7 @@
 airportcoc.cf, 1
 airportcoc.ga, 1
 airportcoc.ml, 1
+airportlimototoronto.com, 1
 airportstuttgart.com, 1
 airpurifierproductsonline.com, 1
 airquestion.org, 1
@@ -8624,7 +8593,6 @@
 aistsist.ga, 1
 aistsist.tk, 1
 ait.com.ar, 1
-aiticon.com, 1
 aitosoftware.com, 1
 aitrading.uk, 1
 aitrust.ro, 1
@@ -8725,7 +8693,6 @@
 akeldam.tk, 1
 akelius.com, 1
 akemineko.tk, 1
-akepayu.com, 1
 akerberri.tk, 1
 akerboom.family, 1
 akerboom.me, 1
@@ -8792,7 +8759,6 @@
 akselinurmio.fi, 1
 aksenov.tk, 1
 aksenovalexey.tk, 1
-aksert.com, 1
 akses.co, 1
 akshay.in.eu.org, 1
 akshi.in, 1
@@ -8916,7 +8882,6 @@
 alaricfavier.eu, 0
 alarko-carrier.com.tr, 1
 alarmat.pl, 1
-alarmcast.ca, 1
 alarmcomplete.co.uk, 1
 alarme-bateau-yacht.com, 1
 alarme911.fr, 1
@@ -9128,11 +9093,11 @@
 alessandrotravel.com, 1
 alessandroz.ddns.net, 1
 aletm.it, 1
+alevel.tech, 0
 alevi-forum.tk, 1
 alevi.tk, 1
 alex-n.net, 1
 alex-ross.co.uk, 1
-alex-weigle.shop, 1
 alex3.tk, 1
 alex97000.de, 0
 alexaconnect.tk, 1
@@ -9313,7 +9278,6 @@
 ali-shariati.tk, 1
 alia-helianthi.tk, 1
 alialkurdy.tk, 1
-aliamex.com, 1
 alianet.org, 1
 aliantsoft.pl, 1
 aliasinfoforums.tk, 1
@@ -9660,6 +9624,7 @@
 allseasonschimney.com, 1
 allseasonswaterproofing.com, 1
 allset.ml, 1
+allshopbiz.com, 1
 allshousedesigns.com, 0
 allsoftfree.com, 1
 allsoulinc.com, 1
@@ -9719,7 +9684,6 @@
 allwrestling.ga, 1
 allyachts.cf, 1
 allyachts.gq, 1
-alma365.it, 1
 almaarkansas.gov, 1
 almaascosmetics.com, 1
 almaatlantica.com, 1
@@ -9779,7 +9743,6 @@
 alohotel.com, 1
 alohotelorange.com, 1
 alohotels.com, 1
-alojamientos-cuba.com, 1
 alolabor.org, 1
 alomch.gq, 1
 alomendia.tk, 1
@@ -9873,7 +9836,7 @@
 alpine-holiday.de, 1
 alpine-tuning.de, 1
 alpine.com.cn, 1
-alpinechaletrental.com, 1
+alpinechaletrental.com, 0
 alpinedentalhealth.com, 1
 alpinehighlandrealty.com, 1
 alpineitltd.co.uk, 0
@@ -10093,7 +10056,6 @@
 am5039.com, 1
 am5188.com, 1
 am5199.com, 1
-am6118.com, 1
 am8009.com, 1
 am8028.com, 1
 am8213.com, 1
@@ -10101,9 +10063,7 @@
 am8833.net, 1
 am8898.net, 1
 am8info.com, 1
-ama-agency.ma, 1
 ama.ne.jp, 1
-amaabjj.com, 1
 amabiligranilhas.com, 1
 amaderforum.tk, 1
 amadeusproject.cf, 1
@@ -10115,12 +10075,10 @@
 amagdic.com, 1
 amagical.net, 0
 amagraduates.tk, 1
-amaismarket.com.br, 1
 amaiz.com, 1
 amalbansode.com, 1
 amalfi5stars.com, 1
 amalficoastransfers.it, 1
-amalfilapiazzetta.it, 1
 amalfipositanoboatrental.com, 1
 amalfitabula.it, 1
 amalgaamvrij.tk, 1
@@ -10194,7 +10152,6 @@
 amazon.sg, 1
 amazonemotions.com, 1
 amb.tf, 1
-ambacoin.io, 1
 ambassify.com, 1
 ambassify.eu, 1
 ambc.es, 1
@@ -10339,7 +10296,7 @@
 ameza.co.uk, 1
 ameza.com.mx, 1
 ameza.io, 1
-ameza.me, 1
+ameza.me, 0
 ameza.net, 1
 amf.to, 1
 amfiteatr.tk, 1
@@ -10357,7 +10314,6 @@
 amiciperlatesta.it, 1
 amicosauro.tk, 1
 amicusjunior.ro, 1
-amielle.com, 1
 amifashion.ml, 1
 amifoundation.net, 1
 amigodeltoro.tk, 1
@@ -10450,6 +10406,7 @@
 amongus.coffee, 1
 amoozesh98.ir, 1
 amoralizm.tk, 1
+amoraparavoce.com.br, 1
 amordetelas.com, 1
 amorgos-aegialis.com, 1
 amorgosrentandgo.gr, 1
@@ -10685,6 +10642,7 @@
 and.com, 0
 andalosse.tk, 1
 andaluciaboard.tk, 1
+andalusiaal.gov, 1
 andalusierondreizen.nl, 1
 andel.info, 0
 anders.hamburg, 1
@@ -11491,6 +11449,7 @@
 antonin.one, 1
 antoninocardillo.com, 1
 antonio-gartenbau.de, 0
+antoniojr.adv.br, 1
 antoniomarques.eu, 0
 antonioordonez.es, 1
 antoniorodriguesadv.com.br, 1
@@ -11668,7 +11627,6 @@
 aperiomoney.ga, 1
 aperiotaxation.ga, 1
 apertis.org, 0
-aperto-nota.eu, 1
 aperto.de, 1
 apertura.tk, 1
 aperture-science.net, 1
@@ -11740,7 +11698,6 @@
 apkfame.com, 1
 apkfuse.com, 1
 apkmaze.com, 1
-apkmody.io, 1
 apkmody.ir, 1
 apknut.com, 1
 apkoyunlar.club, 1
@@ -11779,6 +11736,7 @@
 apod.ml, 1
 apogaea.com, 1
 apogeephoto.com, 1
+apoiocoletivo.com, 1
 apokalipsis.tk, 1
 apollochiropractor.com, 1
 apollodiet.com, 1
@@ -11897,7 +11855,6 @@
 application-travel.us.com, 1
 applicationmanager.gov, 1
 applied-privacy.net, 1
-appliedenglish.jp, 1
 appliedmaths.lk, 1
 appllio.com, 1
 apply-esta.us.com, 1
@@ -12071,7 +12028,6 @@
 aquavitaedayspa.com.au, 1
 aquedim.com, 1
 aqueducttech.com, 1
-aquilaguild.com, 0
 aquiparoxetina.gq, 1
 aquitainebrasserie.com.au, 1
 aquivardenafilo.gq, 1
@@ -12129,6 +12085,9 @@
 arandomsite.tk, 1
 aranel.me, 1
 aranycsillag.net, 1
+arapahoeco.gov, 1
+arapahoesheriff.gov, 1
+arapahoevotes.gov, 1
 araqnid.org, 1
 ararat-rp.tk, 1
 araratour.com, 1
@@ -12321,6 +12280,7 @@
 arex-corp.com, 1
 areyoubaroque.com, 1
 arezzonotizie.it, 1
+arforingenieria.com, 1
 arg.zone, 1
 argama-nature.com, 1
 arganaderm.ch, 0
@@ -12373,6 +12333,7 @@
 ariens.com, 1
 ariensco.com, 1
 arienscohospitality.com, 1
+ariensfoundation.org, 1
 arieswdd.com, 1
 arifburhan.online, 1
 arifer.tk, 1
@@ -12440,7 +12401,6 @@
 arkhangelsk.gq, 1
 arkhangelsk.tk, 1
 arkholmevillage.ml, 1
-arkhvoid.com, 1
 arkhvoid.xyz, 1
 arkitextonico.com, 1
 arkm6.gq, 1
@@ -12592,7 +12552,6 @@
 arpsel.de, 1
 arpteamdiabolo.tk, 1
 arqueo-ecuatoriana.ec, 1
-arquidigital.com, 1
 arquipielago.tk, 1
 arquitectura-ilimitada.tk, 1
 arquitet.com.br, 1
@@ -12683,6 +12642,7 @@
 artedmachado.tk, 1
 artedona.com, 1
 artefeita.com.br, 1
+artefeitaessencias.com.br, 1
 arteinstudio.it, 1
 artelignum.tk, 1
 artelista.com, 1
@@ -12757,7 +12717,6 @@
 artifuse.ch, 1
 artigianociao.jp, 1
 artigoagency.com, 1
-artigoos.com, 1
 artikel9.com, 1
 artinfo.tk, 1
 artinoxcenter.com.tr, 1
@@ -12860,7 +12819,6 @@
 arx-libertatis.org, 1
 arx.vg, 1
 arx8x.net, 1
-arxcs.com, 1
 aryabusines.com, 1
 aryacollege.me, 1
 aryalaroca.de, 1
@@ -12953,7 +12911,6 @@
 asdunumerique.fr, 1
 asdwfwqd.com, 1
 asdyx.de, 1
-asean-wen.org, 1
 asec01.net, 1
 asecus.ch, 1
 asegem.es, 1
@@ -13013,6 +12970,7 @@
 ashutoshmishra.org, 1
 ashutov.rocks, 0
 ashwainfo.in, 1
+ashwaubenon.gov, 1
 asia-gazette.com, 1
 asia-global-risk.com, 1
 asia.dating, 1
@@ -13210,7 +13168,7 @@
 assumptionpj.org, 1
 assurance-emprunteur.bzh, 1
 assurancesmons.be, 0
-assured.se, 1
+assured.se, 0
 assuredspc.com, 1
 asta-bar.de, 0
 astacreative.nl, 1
@@ -13235,7 +13193,6 @@
 astengox.com, 1
 astenotarili.online, 0
 astenretail.com, 1
-asteq.com.ar, 1
 asteracancercare.org, 1
 asterix-obelix.ga, 1
 asteroskonh.com, 1
@@ -13433,7 +13390,7 @@
 aticportal.com, 1
 atide.cf, 1
 atigerseye.com, 1
-atik.kr, 1
+atik.kr, 0
 atiku2007.tk, 1
 atilo.sh, 1
 atimo.dj, 1
@@ -13564,7 +13521,7 @@
 atspeeds.com, 1
 att-lda.pt, 1
 attac.us, 1
-attain.com, 1
+attain.com, 0
 attanasioluigi.tk, 1
 attatroll.de, 1
 attcleaning.com, 1
@@ -13677,7 +13634,6 @@
 audirsq3.de, 1
 audisto.com, 1
 audit.ovh, 1
-audite.de, 1
 auditingfirm.tk, 1
 audition-radio.tk, 1
 auditmatrix.com, 1
@@ -13730,6 +13686,7 @@
 aulacaribemar.com, 1
 aulaschrank.gq, 1
 aulasprofdanilo.com.br, 1
+aulasvirtualesperu.com, 1
 aumentada.net, 1
 aumilieudumonde.gf, 1
 aumisc.com, 1
@@ -13786,6 +13743,7 @@
 auskunftsbegehren.at, 1
 ausmwoid.de, 1
 auspicacious.org, 1
+ausschreibungen-suedtirol.it, 1
 ausset.me, 1
 aussiefunadvisor.com, 1
 aussiegemdesigns.com.au, 1
@@ -13926,7 +13884,6 @@
 autocrossteam-monein.tk, 1
 autocrossteam.tk, 1
 autocrypt.org, 1
-autodalmacija.com, 1
 autodemolizioni.roma.it, 1
 autodidactic.ai, 1
 autodidacticstudios.com, 1
@@ -14140,7 +14097,6 @@
 autonewsreview.com, 1
 autonewssite.com, 1
 autonoleggio.milano.it, 1
-autoone.sk, 1
 autoosijek.com, 1
 autopapa.wien, 1
 autopapo.com.br, 1
@@ -14165,7 +14121,6 @@
 autorepairinlasvegas.com, 1
 autorepairseattle.com, 1
 autorepguide.com, 1
-autoreply.services, 1
 autorepmans.com, 1
 autoresponderilimitado.tk, 1
 autoreview.ml, 1
@@ -14214,7 +14169,7 @@
 autotitleloansnu.ga, 1
 autoto.hr, 1
 autotonic.tk, 1
-autotrac.com.br, 0
+autotrac.com.br, 1
 autotransportquoteservices.com, 1
 autotras.com, 1
 autotyreprest.ro, 1
@@ -14269,7 +14224,6 @@
 ava-sky.ga, 1
 ava-software.at, 1
 avaaz.org, 1
-avabouncehire.co.uk, 1
 avacariu.me, 1
 avacatossiu.tk, 1
 avaclub.ga, 1
@@ -14509,14 +14463,12 @@
 awesomebouncycastles.co.uk, 1
 awesomelifedeals.today, 1
 awesomenamegenerator.com, 1
-awesomeness.tk, 1
 awesomesit.es, 0
 awf0.xyz, 1
 awfulsport-news.tk, 1
 awh.ink, 1
 awinninghabit.com, 1
 awk.tw, 1
-awksolutions.com, 1
 awningcanopyus.com, 1
 awningsaboveus.com, 1
 awningsatlantaga.com, 1
@@ -14546,6 +14498,7 @@
 axel-fischer.net, 1
 axel-fischer.science, 1
 axel-voss.eu, 0
+axel.red, 1
 axelcalle.com, 1
 axeldavid.fr, 1
 axelname.ru, 1
@@ -14621,7 +14574,7 @@
 aymericlagier.com, 1
 aymhome.top, 1
 ayon-games.tk, 1
-ayouiv.com, 1
+ayothemes.com, 1
 ayresalpine.com, 1
 ayresanaheim.com, 1
 ayresapline.com, 1
@@ -15039,22 +14992,22 @@
 b99885.com, 1
 b99886.com, 1
 b99918.com, 1
-b9999ff.com, 1
-b9999hh.com, 1
-b9999ii.com, 1
-b9999jj.com, 1
-b9999ll.com, 1
-b9999mm.com, 1
-b9999nn.com, 1
+b9999ff.com, 0
+b9999hh.com, 0
+b9999ii.com, 0
+b9999jj.com, 0
+b9999ll.com, 0
+b9999mm.com, 0
+b9999nn.com, 0
 b9999oo.com, 1
 b9999pp.com, 1
-b9999qq.com, 1
+b9999qq.com, 0
 b9999tt.com, 1
 b9999vv.com, 1
 b9999ww.com, 0
 b9999yy.com, 1
-b9999zz.com, 1
-b99iosapp.com, 1
+b9999zz.com, 0
+b99iosapp.com, 0
 b9winner.com, 1
 ba47.net, 1
 ba7rain.tk, 1
@@ -15131,7 +15084,6 @@
 babyinthehouse.com.br, 1
 babykappy.com, 1
 babyliss-pro.net, 0
-babylontraffic.com, 1
 babymasaze.cz, 1
 babymozg.ga, 1
 babynames.net, 1
@@ -15147,13 +15099,11 @@
 babyshopsupport.com.au, 1
 babyshower.cf, 1
 babystrollers.ml, 1
-babystudio.es, 1
 babytan.tk, 1
 babyvillagegt.com, 1
 babyz.tk, 1
 babyzen.tk, 1
 bac-fiches.tk, 1
-bacahorror.com, 1
 bacanal-intruder.tk, 1
 bacaneriahlg.com, 1
 bacanora.tk, 1
@@ -15322,7 +15272,6 @@
 baer.space, 1
 baframedya.tk, 1
 bafus.ru, 1
-bafwsprod-bafwsprodnew.azurewebsites.net, 1
 bag.bg, 1
 bag66.ru, 1
 bagdagul.tk, 1
@@ -15364,6 +15313,7 @@
 baidutrustssl.cn, 1
 baidutrustssl.com, 1
 baif.hr, 1
+baifubao.com, 1
 baikal.cf, 1
 baikalfond.ml, 1
 baikalppk.tk, 1
@@ -15371,6 +15321,7 @@
 baildonhottubs.co.uk, 1
 baileebee.com, 1
 baileysafetyconsultants.com, 1
+bailleux.be, 1
 bailodromo.tk, 1
 bailong.kr.ua, 1
 bailonga.com, 1
@@ -15409,6 +15360,7 @@
 bakbi.tk, 1
 baker-street.tk, 1
 bakerbasements.com, 1
+bakercity.gov, 1
 bakercitypd.gov, 1
 bakercounty911or.gov, 1
 bakercountyor.gov, 1
@@ -15680,6 +15632,7 @@
 bankofrealty.review, 1
 bankpolicies.com, 1
 bankrbk.kz, 1
+bankruptcy.ky, 1
 banksaround.com, 1
 banksite.ga, 1
 bankstownapartments.com.au, 1
@@ -15688,7 +15641,7 @@
 bankwebinars.com, 1
 banland.net, 1
 banlinhdanong.com, 0
-banmapvn.com, 0
+banmapvn.com, 1
 banned-bitches.tk, 1
 banner-design.tk, 1
 banner.ga, 1
@@ -15822,7 +15775,6 @@
 baritoday.it, 1
 barkerjr.xyz, 1
 barkingaboutbusiness.com, 1
-barkingmadpetproducts.co.za, 1
 barkingspidersaspets.com, 1
 barkstop.net, 1
 barlamane.com, 1
@@ -15894,7 +15846,6 @@
 bartel.ws, 1
 bartelt.name, 1
 barter.vg, 1
-barter4crypto.com, 1
 barth.services, 1
 bartholf.nu, 1
 bartkramer.nl, 0
@@ -15978,7 +15929,6 @@
 basicports.eu, 1
 basicports.net, 1
 basicports.org, 1
-basics.domains, 1
 basics.net, 1
 basicsuamarca.com.br, 1
 basictools.tk, 1
@@ -16032,7 +15982,6 @@
 batailleros.tk, 1
 batcave.tech, 1
 batch.com, 0
-batchewanabingo.com, 1
 baterioverolety.cz, 1
 batesvillearkansas.gov, 1
 batextiles.tk, 1
@@ -16146,7 +16095,6 @@
 baysidephotography.ga, 1
 bayt.com, 1
 baytalebaa.com, 1
-baytobayaircon.com.au, 1
 baytownent.com, 1
 baytv.it, 1
 baywatch.io, 1
@@ -16166,15 +16114,12 @@
 bazarotehijos.com, 1
 bazdell.com, 0
 bazhan.me, 1
-bazinga-events.nl, 1
 bazos.at, 1
 bazos.cz, 1
 bazos.pl, 1
 bazos.sk, 1
 bazraria.com, 1
 bazziergraphik.com, 1
-bb-ek.de, 1
-bb-moisel.de, 1
 bb-sportnahrung.de, 1
 bb00228.com, 1
 bb057.com, 1
@@ -16194,7 +16139,6 @@
 bbalposticino.it, 1
 bbamsch.com, 1
 bbb1991.me, 0
-bbbasicspodcast.com, 1
 bbbff.net, 1
 bbc67.fr, 1
 bbcastles.com, 1
@@ -16228,6 +16172,7 @@
 bbrigittae.hu, 1
 bbschat.tk, 1
 bbsec.xyz, 1
+bbsgood.com, 1
 bbuio.com, 0
 bbunits.de, 1
 bbusa.tk, 1
@@ -16349,7 +16294,6 @@
 beakbirds.com, 1
 beaker.coffee, 1
 beal.edu, 1
-beallure.it, 1
 bealpha.pl, 1
 beam-life.tk, 1
 beam-to.me, 1
@@ -16393,7 +16337,6 @@
 beastnet.works, 1
 beastnet.xyz, 1
 beastowner.li, 1
-beastshirt.com, 1
 beatbreaker.tk, 1
 beatfeld.de, 1
 beatfreaks.tk, 1
@@ -16412,7 +16355,6 @@
 beatuprobot.net, 1
 beatzone.tk, 1
 beau.cat, 1
-beau.pw, 1
 beaucrabill.com, 1
 beaufortcastawaycharter.com, 1
 beaulieu.ch, 1
@@ -16448,6 +16390,7 @@
 beautycarepack.com.ng, 1
 beautycom.club, 1
 beautycon.ir, 1
+beautyest.net, 1
 beautyeyewear.ga, 1
 beautyforceacademy.bg, 1
 beautyinfos.de, 1
@@ -16483,7 +16426,6 @@
 beccajoshwedding.com, 1
 bech32.net, 1
 beckdesign.tk, 1
-beckijayes.family, 1
 becklove.cn, 1
 beckylicious.tk, 1
 beclan.tk, 1
@@ -16508,7 +16450,6 @@
 bedez.pl, 1
 bedford911.com, 1
 bedfordnissanparts.com, 1
-bedinsi.com.br, 1
 bedlingtonterrier.com.br, 1
 bedofcorpses.tk, 1
 bedouille.com, 1
@@ -16624,6 +16565,7 @@
 behead.de, 1
 behemoth.cf, 1
 beherit.pl, 1
+behinam.co.il, 1
 behind-the-mask.tk, 1
 behindenemyminds.be, 1
 behindenemyminds.eu, 1
@@ -16726,7 +16668,6 @@
 belindaweb.tk, 1
 belinks.tk, 1
 belinsky.tk, 1
-belive.tv, 1
 beliyo.tk, 1
 belizemap.tk, 1
 belkamfish.com, 1
@@ -16825,7 +16766,6 @@
 benchmarkmonument.com, 1
 benchstoolo.com, 1
 benclarkphotography.com.au, 1
-bencorby.com, 1
 bencrump.com, 1
 bendechrai.com, 0
 bendemaree.com, 1
@@ -16843,7 +16783,6 @@
 benedictoaguilar.tech, 1
 benedikto.tk, 1
 benee-awraham.nl, 1
-benefits.gov, 1
 benefitz.cf, 1
 benefitz.ga, 1
 benefitz.gq, 1
@@ -16851,6 +16790,7 @@
 benekill.tk, 1
 benepiscinas.com.br, 1
 benepla.com, 1
+beneri.se, 1
 benetcasablancas.tk, 1
 benevisim.com, 1
 benevita.bio, 1
@@ -16871,7 +16811,7 @@
 benhamplateau.tk, 1
 benhaney.com, 1
 benhartmann.de, 0
-benhoeg.com, 1
+benhoeg.com, 0
 beniajan.tk, 1
 benidormcd.tk, 1
 benihyangbaik.com, 1
@@ -16923,6 +16863,7 @@
 benrogers.tk, 1
 bensbouncycastles.co.uk, 1
 benschnarr.com, 1
+benscobie.com, 1
 benshoof.org, 1
 bensinflatables.co.uk, 1
 bensjamtracks.com, 1
@@ -17095,7 +17036,6 @@
 bertrell.com, 1
 bertsmithvwparts.com, 1
 beryko.cz, 1
-beryl.net, 1
 berz.one, 1
 berzkalne.co.uk, 1
 besanowsky.de, 1
@@ -17112,6 +17052,7 @@
 beserberg.tk, 1
 besiconstruct.be, 1
 besidemetal.tk, 1
+besiktasmtsk.com, 1
 besnard.me, 1
 besnik.de, 0
 besnik.tk, 1
@@ -17841,7 +17782,6 @@
 beyondthisrealm.com.au, 1
 beyondtrust.com, 1
 beyondtv.ga, 1
-beyondweb.net, 1
 beyours.be, 1
 bezagentstva.cf, 1
 bezahlbare-praemien.ch, 1
@@ -17857,7 +17797,6 @@
 bezpecnostsiti.cf, 1
 bezposrednio.net.pl, 1
 bezpredel.tk, 1
-bezzia.com, 1
 bfam.tv, 1
 bfbet365.com, 1
 bfcgermania88.de, 1
@@ -17897,7 +17836,6 @@
 bgs-game.com, 1
 bgtoyou.com, 1
 bgtraffic.tk, 1
-bguidinger.com, 1
 bh-oberland.de, 1
 bh.sb, 1
 bhacit.com, 1
@@ -18039,7 +17977,6 @@
 bierbaumer.net, 1
 bierbrouwerijderoos.nl, 1
 bierochs.org, 1
-bierwebshop.be, 1
 bieser.ch, 1
 biester.pro, 1
 bietigheim-digital.tk, 1
@@ -18120,12 +18057,12 @@
 bigpage.tk, 1
 bigprintinglasvegas.com, 1
 bigpurse.tk, 1
+bigrapidstownshipmi.gov, 1
 bigrender.tk, 1
 bigsaleclub.com, 1
 bigsam.us, 1
 bigseo.ml, 1
 bigseo.tk, 1
-bigserp.com, 1
 bigshare.ga, 1
 bigshopper.com, 1
 bigshopper.nl, 1
@@ -18298,6 +18235,7 @@
 bimmerlabs.com, 1
 bimoge.tk, 1
 bimsynergistics.com, 1
+bin95.com, 1
 bina.az, 1
 binairy.com, 1
 binairy.nl, 1
@@ -18445,12 +18383,10 @@
 biolika.ua, 1
 biolmarket.ru, 1
 biologiaygeologia.tk, 1
-biologie-seite.de, 1
 biologis.ch, 1
 biologo.club, 1
 biology-colleges.com, 1
 biomag.it, 0
-biomasscore.com, 1
 biomassinfo.jp, 1
 biomathalliance.org, 1
 biomax-mep.com.br, 1
@@ -18687,7 +18623,6 @@
 bitcointransfer.tk, 1
 bitcoinwalletscript.tk, 1
 bitcoinx.ro, 1
-bitcoinyab.com, 1
 bitcork.io, 1
 bitcrazy.org, 1
 bitech-ec.com, 1
@@ -18710,6 +18645,7 @@
 bitgo.com, 1
 bitgrapes.com, 1
 bitguerrilla.com, 1
+bithap.com, 0
 bither.net, 1
 bititrain.com, 1
 bitix.tk, 1
@@ -18905,7 +18841,6 @@
 bkt.to, 1
 bkulup.com, 1
 bl-builder.tk, 1
-bl00.se, 1
 bl4ckb0x.biz, 1
 bl4ckb0x.com, 1
 bl4ckb0x.de, 1
@@ -19001,6 +18936,7 @@
 blackheads.tk, 1
 blackhealthwealth.com, 1
 blackhelicopters.net, 1
+blackhillsinfosec.com, 1
 blackhistorymonth.gov, 1
 blackjackballroomcasino.info, 1
 blackjackprogramest.ga, 1
@@ -19159,7 +19095,6 @@
 bleepplc.co.uk, 1
 blegalservicespty.com, 1
 blekingeopen.tk, 1
-blender.io, 1
 blenderinsider.com, 1
 blenderrecipereviews.com, 1
 blenderwallet.io, 1
@@ -19180,8 +19115,8 @@
 blichmann.eu, 1
 blicy.net, 1
 blideobames.com, 1
-blidz.com, 1
-blieque.co.uk, 1
+blidz.com, 0
+blieque.co.uk, 0
 bliesekow.net, 1
 blightnight.games, 1
 blightnight.live, 1
@@ -19241,7 +19176,7 @@
 blk.me, 1
 blkbx.eu, 1
 blkj.com, 1
-bllb.ru, 1
+bllb.ru, 0
 blm.gov, 1
 blm36.cc, 1
 blm69.cc, 1
@@ -19344,6 +19279,7 @@
 blogsnote.xyz, 1
 blogspasest.ga, 1
 blogstar.tk, 1
+blogtechnologiczny.pl, 1
 blogthetindung.com, 1
 blogtroterzy.pl, 1
 bloguser.ru, 1
@@ -19401,7 +19337,6 @@
 blue-olive.co.za, 1
 blue-pool.de, 1
 blue-python.tk, 1
-blue42.net, 1
 blueangel.org.tw, 1
 blueatlasmarketing.com, 1
 bluebahari.gq, 1
@@ -19456,7 +19391,6 @@
 bluerange.io, 1
 bluerootsmarketing.com, 1
 blues-and-pictures.com, 1
-blues.at, 1
 bluesbarn.tk, 1
 bluesecret.co.uk, 1
 blueshouse.ro, 1
@@ -19518,7 +19452,7 @@
 blurringexistence.net, 1
 blurt.cf, 1
 blusens.com, 1
-blushbymounika.com, 1
+blushbymounika.com, 0
 blushingweb.tk, 1
 blusmurf.net, 1
 blutooth.ga, 1
@@ -19604,7 +19538,6 @@
 bobiji.com, 0
 bobijoel.ml, 1
 bobkidbob.com, 1
-bobkoetsier.nl, 1
 boblog.tk, 1
 bobmaster.cyou, 1
 bobnbounce.ie, 1
@@ -19670,7 +19603,6 @@
 bodyweb.com.br, 1
 bodyweightsolution.com, 1
 bodyworksautorebuild.com, 1
-boeah.com, 1
 boeddhashop.nl, 1
 boegli.tk, 1
 boehm.sh, 1
@@ -19712,7 +19644,6 @@
 boimmobilier.ch, 0
 boingboing.net, 1
 boingo00.wtf, 1
-boip.in, 1
 boira.tk, 1
 boiseonlinemall.com, 1
 boizeau.fr, 1
@@ -19841,7 +19772,7 @@
 bonesserver.com, 1
 bonexio.tk, 1
 bonfi.net, 1
-bonfireleads.com, 1
+bonfireleads.com, 0
 bonfloss.com, 1
 bongloy.com, 1
 bongminhtam.com, 1
@@ -19894,6 +19825,7 @@
 bonusup.tk, 1
 bonyancard.com, 0
 bonyancard.ir, 0
+boo, 1
 boodledose.ddns.net, 1
 boodmo.com, 1
 boof.com, 0
@@ -20118,7 +20050,7 @@
 botdiril.com, 1
 botealis.ch, 0
 botelegram.tk, 1
-botezdepoveste.ro, 1
+botezdepoveste.ro, 0
 botguard.net, 1
 bothive.io, 1
 boticadiservicio.com, 1
@@ -20155,7 +20087,6 @@
 bougeer.gent, 1
 bougeret.fr, 1
 bougerpourmasante.com, 1
-bougetesfesses.fr, 1
 boughariosbros.com, 1
 boukoubengo.com, 1
 bouldercounty.gov, 1
@@ -20266,7 +20197,6 @@
 bourbo.net, 1
 bourbonridgeretreat.com, 1
 bourestonmedia.com, 1
-bourgdepabos.com, 1
 bourgeoisdoor.com, 1
 bourgeoisdoorco.com, 1
 bournefun.co.uk, 1
@@ -20287,7 +20217,6 @@
 bouzouks.net, 1
 bovenwebdesign.nl, 1
 bovworkplacepensions.com, 1
-bowdens.me, 1
 bowedwallcrackrepair.com, 1
 bowhill.me, 1
 bowlcake.fr, 1
@@ -20326,7 +20255,6 @@
 boycewire.com, 1
 boydstree.com, 1
 boyfriendhusband.men, 1
-boyhost.cn, 1
 boyinglanguage.com, 1
 boykovo.tk, 1
 boyo.cloud, 1
@@ -20439,7 +20367,6 @@
 braintonus.tk, 1
 braintreevt.gov, 1
 brainvation.de, 1
-brainwav.es, 1
 brainwork.space, 1
 brajenovic.com, 1
 brakemanpro.com, 1
@@ -20568,7 +20495,6 @@
 braunsteinpc.com, 1
 braunwarth.info, 0
 brausestube.de, 1
-brava.bg, 1
 brave-foods.ch, 0
 brave-foods.com, 0
 brave.com, 1
@@ -20611,6 +20537,7 @@
 braziliaskincare.com, 1
 brazillens.com, 1
 brazoriabar.org, 1
+brazoriacountyclerktx.gov, 1
 brb.city, 1
 brba.nl, 1
 brbcbd.com, 1
@@ -20779,6 +20706,7 @@
 brickwerks.io, 1
 bricmon.tk, 1
 bricolajeux.ch, 0
+bricolea.fr, 1
 bricomag-media.com, 1
 bricomium.com, 1
 brid.gy, 0
@@ -20849,7 +20777,6 @@
 brightsparks.com.sg, 1
 brightsport-news.tk, 1
 brightview.net.cn, 1
-brightworkcreative.com, 1
 brightzonecleaning.com.au, 1
 brightzoneofficecleaning.com.au, 1
 brigidaarie.com, 1
@@ -20968,6 +20895,7 @@
 broadyexpress.com.au, 1
 broca.io, 0
 brockwayministorage.com, 1
+brockwaytwpmn.gov, 1
 brodowski.cc, 1
 brody.digital, 1
 brody.ninja, 1
@@ -20989,6 +20917,7 @@
 brokerdecredite.ro, 1
 brokerlink.ca, 1
 brokernet.ie, 0
+brokernotes.co, 1
 brokerstalk.com, 1
 brokeryouers.ga, 1
 brokeryouest.ga, 1
@@ -21015,7 +20944,6 @@
 brooklynentdoc.com, 1
 brooklyngynplace.com, 1
 brooklynrealestateblog.com, 1
-brooklynsigns.com, 1
 brooklyntheborough.com, 1
 brookscountyga.gov, 1
 brooksideas.ga, 1
@@ -21187,6 +21115,7 @@
 bslinguistics.co.uk, 1
 bsmn.ga, 1
 bsmsl.com, 1
+bsociabl.com, 1
 bsolution.edu.vn, 1
 bsp-southpool.com, 1
 bspecialfx.nl, 1
@@ -21230,8 +21159,8 @@
 btcontract.com, 0
 btcp.space, 1
 btcpop.co, 1
-btcshower.com, 1
 btdproductions.tk, 1
+bth.wtf, 1
 bthub.xyz, 1
 bticoin3king.cf, 1
 btid.tk, 1
@@ -21267,9 +21196,7 @@
 btt882.com, 1
 btta13.com, 1
 btta16.com, 1
-bttc.co.uk, 0
 btth.live, 1
-btth.pl, 1
 btth.tv, 1
 btth.xyz, 1
 bttorj45.com, 1
@@ -21373,7 +21300,7 @@
 bufete.tk, 1
 buff-buff.tk, 1
 buff360.xyz, 1
-buffaloautomation.com, 1
+buffaloautomation.com, 0
 buffalobakeriesers.ga, 1
 buffalobakeriesest.ga, 1
 buffalobill.idv.tw, 1
@@ -21427,7 +21354,6 @@
 building-cost-estimators.com, 1
 building-materials.tk, 1
 buildingchemistry.tk, 1
-buildingclouds.de, 1
 buildingcostestimators.co.uk, 1
 buildingdesign.tk, 1
 buildinginspectionmandurah.ga, 1
@@ -21435,6 +21361,7 @@
 buildingpointne.com, 1
 buildit.se, 1
 builditfl.com, 0
+builditsolutions.net, 0
 buildkite.com, 1
 buildmate.ml, 1
 buildmorebuslanes.com, 1
@@ -21497,6 +21424,7 @@
 bullettags.com, 1
 bullfitta.tk, 1
 bullish.com, 1
+bullockcountyal.gov, 1
 bullpendaily.com, 1
 bullseyemetrics.com, 1
 bullshitmail.nl, 1
@@ -21527,7 +21455,6 @@
 bundesverband-krisenintervention.de, 1
 bundesverbandkrisenintervention.de, 1
 bundesvvehr.de, 1
-bundito.com, 1
 bune.city, 1
 bungaspa.com, 1
 bungee.pw, 1
@@ -21573,6 +21500,7 @@
 burdine-andersoninc.com, 1
 burdurhaber.tk, 1
 burdursondakika.tk, 1
+bureaubolster.nl, 0
 bureaudirectoryers.ga, 1
 bureaugoodwork.nl, 1
 bureaux-entrepots.fr, 0
@@ -21585,7 +21513,7 @@
 burgawnc.gov, 1
 burgerbites.be, 1
 burgerbudget.gent, 1
-burgernet.nl, 1
+burgernet.nl, 0
 burgers.io, 1
 burghardt.pl, 1
 burghtstam.tk, 1
@@ -21822,7 +21750,6 @@
 businessloco.ga, 1
 businesslondon.tk, 1
 businesslowprice.ga, 1
-businessmarketingblog.org, 1
 businessmarks.ga, 1
 businessmetric.ga, 1
 businessmind.ml, 1
@@ -22096,10 +22023,9 @@
 buzt.cn, 1
 buzzconcert.com, 1
 buzzcontent.com, 1
-buzzer-sosmed.site, 1
 buzzfeast.com, 1
 buzzhub.tk, 1
-buzzkuri.com, 1
+buzzkuri.com, 0
 buzzman.ga, 1
 buzzmedianetworks.com, 1
 buzzpop.tv, 0
@@ -22141,6 +22067,7 @@
 bwh1.net, 0
 bwhbwh.net, 1
 bwilkinson.co.uk, 1
+bwin18.cc, 0
 bwin2288.com, 1
 bwin369.cc, 1
 bwin58.cc, 1
@@ -22185,7 +22112,6 @@
 bygningsregistrering.dk, 1
 bygogmiljoe.dk, 1
 bygoselink.nl, 1
-byhe.me, 1
 byhenryvera.com, 1
 byjamesrush.com, 1
 byji.com, 1
@@ -22194,7 +22120,6 @@
 byjuschennai.com, 1
 byken.cn, 1
 byket.lviv.ua, 1
-byladyverdelet.bzh, 1
 byll.de, 1
 byluthier.com, 1
 bymike.co, 1
@@ -22211,7 +22136,6 @@
 byrddogpaving.com, 1
 byrest.com, 1
 byriderfranchise.com, 1
-byrko.cz, 1
 byrko.sk, 1
 byrnesagency.com, 1
 byronkg.us, 1
@@ -22226,6 +22150,7 @@
 bystryj-zajm.gq, 1
 bystryj-zajm.tk, 1
 byte-lab.tk, 1
+byte.nl, 1
 byte128.com, 0
 bytearts.net, 0
 bytebe.at, 0
@@ -22270,10 +22195,8 @@
 bzhub.bid, 1
 bziaks.xyz, 1
 bzik.cf, 1
-bzsparks.com, 0
 bztech.com.br, 1
-bztraveler.com, 1
-bztraveler.net, 1
+bztraveler.net, 0
 bzv-fr.eu, 1
 c-14.de, 1
 c-3.moe, 1
@@ -22443,7 +22366,6 @@
 cadra.nl, 1
 cadre.com, 1
 cadsys.net, 1
-cadusilva.com, 1
 caduta-capelli.tk, 1
 cadventura.com, 1
 cady-jennifer.tk, 1
@@ -22620,6 +22542,7 @@
 calgraf.com, 1
 calhoun.tk, 1
 calhouncountyflsheriff.gov, 1
+calhounfalls.gov, 1
 caliane.de, 1
 calibermind.com, 1
 calibra.com, 1
@@ -22664,7 +22587,7 @@
 calligraphychic.com, 1
 callisabel.fr, 1
 callmebetty.com, 1
-callmewhatever.com, 1
+callmewhatever.com, 0
 callmewhatever.de, 1
 callmewhatever.net, 1
 callsign.com, 0
@@ -22700,7 +22623,6 @@
 calyxinstitute.org, 1
 calzadonline1.com, 1
 calzaturesira.it, 1
-cam-et-xou.fr, 1
 camago.dk, 1
 camara360grados.com, 1
 camaradecomerciosiguatepeque.hn, 1
@@ -22836,7 +22758,6 @@
 campistry.net, 1
 camplaza.tk, 1
 campmackinaw.com, 1
-campo-salado.com, 1
 campofant.com, 1
 campograndenews.com.br, 1
 campona.hu, 1
@@ -22880,6 +22801,7 @@
 camsupplier.ml, 1
 camsupplierers.ga, 1
 camtor.ml, 1
+camzroofing.ca, 0
 can-amchains.com, 1
 can7.fr, 1
 canada-tourisme.ch, 0
@@ -23025,7 +22947,6 @@
 cantical.com, 1
 cantik.co, 1
 cantonmi.gov, 1
-cantonroadjewelry.com, 1
 cantor.cloud, 1
 cantosdisidentes.tk, 1
 cantstopart.com, 1
@@ -23210,9 +23131,8 @@
 carboneventsupport.be, 1
 carboneventsupport.lu, 1
 carbonholic.org, 1
-carboniaccessori.com.br, 1
 carbonkiller.org, 1
-carbonlib.com, 1
+carbonlib.com, 0
 carbonmonoxidelawyer.net, 1
 carbonnel.me, 1
 carbono.uy, 1
@@ -23240,6 +23160,7 @@
 carddreams.es, 1
 cardexaminerers.ga, 1
 cardexaminerest.ga, 1
+cardexchangesolutions.com, 0
 cardfightcoalition.com, 1
 cardiaccane.com, 1
 cardiagnose.nl, 1
@@ -23467,7 +23388,6 @@
 carolinaclimatecontrolsc.com, 1
 carolinalamujerdehoy.com.gt, 1
 carolinaoliveira.tk, 1
-carolinapainandspine.com, 1
 carolinasaddictionfellows.com, 1
 carolinavarletaarriagada.tk, 1
 carolinavein.com, 1
@@ -23486,6 +23406,7 @@
 carp-zeeland.tk, 1
 carp4life.tk, 1
 carparo.net, 1
+carpentersvilleil.gov, 1
 carpentrybyallen.com, 1
 carpet24.gr, 1
 carpetandhardwoodflooringpros.com, 1
@@ -23877,9 +23798,9 @@
 casso.tk, 1
 castagnola.tk, 1
 castalie.tk, 1
+castaneatownshippa.gov, 1
 castaneda.tk, 1
 castella.tk, 1
-castellannenberg.com, 1
 castellet.tk, 1
 castelletto.tk, 1
 castelnuovo.xyz, 1
@@ -24015,6 +23936,7 @@
 cativarbrasil.com.br, 1
 catl.st, 1
 catland.club, 1
+catlettsburgky.gov, 1
 catlicking.com, 1
 catlovingcare.com, 1
 catmash.tk, 0
@@ -24136,7 +24058,6 @@
 cbxp.in, 1
 cc.hn, 1
 cc00228.com, 1
-cc3m.com, 1
 cc5197.co, 1
 cc6729.co, 1
 cc6729.com, 1
@@ -24153,7 +24074,7 @@
 ccac.gov, 1
 ccaguavivadonaciones.org, 1
 ccaj.io, 1
-ccamatilfiji.com, 0
+ccamatilfiji.com, 1
 ccarps.com, 1
 ccatpracticetest.com, 1
 ccattestprep.com, 1
@@ -24332,7 +24253,6 @@
 celebraze.tk, 1
 celebrex.ga, 1
 celebrex100mg.cf, 1
-celebrities.pictures, 1
 celebritiesblog.tk, 1
 celebritydailynews.ml, 1
 celebrityfakes.tk, 1
@@ -24463,7 +24383,6 @@
 centreagree.com, 1
 centreautofronton.com, 1
 centredaccueil.fr, 0
-centreparkhistoricdistrict.org, 1
 centrepointorguk-dev.azurewebsites.net, 1
 centretownshipin.gov, 1
 centricagency.co.uk, 1
@@ -24586,7 +24505,6 @@
 certifiednurses.org, 1
 certifix.eu, 1
 certnazionale.it, 1
-certprep.fr, 1
 certpro.uk, 1
 certreg.eu, 1
 certspotter.com, 1
@@ -24676,7 +24594,6 @@
 cgknieuwpoort.nl, 1
 cglib.xyz, 1
 cgmbacklot.com, 1
-cgminc.net, 1
 cgn-medienservice.de, 1
 cgp.moe, 1
 cgpe.com, 0
@@ -24710,7 +24627,6 @@
 chad-online.tk, 1
 chad.ch, 1
 chadlenz.ca, 1
-chadoisaac.com, 1
 chadpugsley.com, 1
 chadslive.com, 1
 chadstoneapartments.com.au, 1
@@ -24761,6 +24677,7 @@
 chamicro.com, 1
 chamonixcamera.cn, 1
 champagneandcoconuts.com, 1
+champaigncountyclerkil.gov, 1
 champdogs.co.uk, 1
 champdogs.com, 1
 championbet.et, 1
@@ -24846,6 +24763,7 @@
 charbonnel.eu, 1
 charcoal-se.org, 1
 charcoalvenice.com, 1
+chardik.tk, 1
 charge.co, 0
 charge.ga, 1
 charge.gq, 1
@@ -24989,6 +24907,7 @@
 chatsupport.co, 1
 chatsworthelectrical.com, 1
 chattahoocheefl.gov, 1
+chattanoogaface.com, 1
 chattergallery.com, 1
 chatticketsers.ga, 1
 chattingorcheating.com, 1
@@ -25099,7 +25018,6 @@
 checkmack.cf, 1
 checkmack.ga, 1
 checkmack.gq, 1
-checkmatewebsolutions.com, 1
 checkme.gq, 1
 checkme.ml, 1
 checkmedia.org, 1
@@ -25163,7 +25081,6 @@
 chemicalguys-ruhrpott.de, 1
 chemicalpharm.com, 1
 chemicalromance.tk, 1
-chemie-schule.de, 1
 chemiphys.com, 0
 chemistry-schools.com, 1
 chemolak.pl, 1
@@ -25540,6 +25457,7 @@
 chrisahrweileryoga.com, 1
 chrisaitch.com, 1
 chrisbillo.com, 1
+chrisbrakebill.com, 0
 chrisbrockdiving.com, 1
 chrisbryant.me.uk, 1
 chrisburnell.com, 1
@@ -25816,7 +25734,6 @@
 cialisfreetrial.ga, 1
 cialisvtr.com, 1
 cialona.nl, 1
-cialowruchu.pl, 1
 ciancaiphotobooth.com, 1
 ciancode.com, 1
 cianmawhinney.me, 1
@@ -25826,11 +25743,9 @@
 ciat.no, 0
 cibdol.com, 1
 cibdol.nl, 1
-cibercactus.com, 1
 cibercat.tk, 1
 cibercheck.com, 1
 cibleclick.com, 1
-ciblogin.com, 1
 cibus.ba, 1
 cica.es, 1
 cicavkleci.cz, 1
@@ -25897,7 +25812,6 @@
 cincosf.com, 1
 cinderellacloset.in, 1
 cindey.io, 1
-cindydudley.com, 1
 cine-music.de, 1
 cine.to, 1
 cinedarkwolf.tk, 1
@@ -25964,7 +25878,6 @@
 ciphersuite.info, 1
 ciphertech.com.tw, 1
 cipies.com, 1
-ciplerli.st, 1
 cippus.tk, 1
 cipri.com, 1
 cipri.net, 1
@@ -26071,6 +25984,8 @@
 citizing.org, 1
 citos.ga, 1
 citroner.blog, 1
+citrusbocc.gov, 1
+citruscounty.gov, 1
 citruspi.com, 1
 citruspi.io, 1
 citrusui.me, 1
@@ -26105,7 +26020,10 @@
 citylojistik.com, 1
 citymoobel.ee, 1
 cityofarcolatx.gov, 1
+cityofbambergsc.gov, 1
+cityofblancotx.gov, 1
 cityofbrookings-sd.gov, 1
+cityofburnsor.gov, 1
 cityofcarsonca.gov, 1
 cityofdelcity.gov, 1
 cityofeastpointemi.gov, 1
@@ -26114,6 +26032,7 @@
 cityofgirardoh.gov, 1
 cityofguttenbergia.gov, 1
 cityofherculaneum.gov, 1
+cityofkasaanak.gov, 1
 cityoflakegeneva.gov, 1
 cityofmadera.gov, 1
 cityofmanchestertn.gov, 1
@@ -26124,8 +26043,11 @@
 cityofpagedalemo.gov, 1
 cityofpearidgear.gov, 1
 cityofpeople.gent, 1
+cityofperris.gov, 1
 cityofpinconningmi.gov, 1
 cityofpinebluff-ar.gov, 1
+cityoframseymn.gov, 1
+cityofspoonerwi.gov, 1
 cityoftitans.com, 1
 cityoftitansmmo.com, 1
 cityofwadley-ga.gov, 1
@@ -26178,7 +26100,6 @@
 cj26.club, 1
 cj8.de, 1
 cjaconsultoria.online, 1
-cjbeckert.com, 1
 cjdby.net, 1
 cjdpenterprises.com, 1
 cjdpenterprises.com.au, 1
@@ -26217,6 +26138,7 @@
 cklie.de, 1
 ckliemann.com, 1
 ckliemann.net, 1
+ckna.ca, 1
 ckostecki.de, 1
 ckp.ie, 1
 ckrobotics.tk, 1
@@ -26431,7 +26353,6 @@
 clearmaxx.ch, 1
 clearpay.co.uk, 1
 clearsafetalk.com, 1
-clearsense.com, 1
 clearspringinsurance.com, 1
 clearstep.health, 1
 clearview-creative.com, 1
@@ -26507,7 +26428,6 @@
 clevyrstudios.com, 1
 clevyrvr.com, 1
 cleysense.com, 0
-clgb.org, 1
 clic-et-site.com, 1
 clic-music.com, 1
 clic29.fr, 1
@@ -26561,7 +26481,6 @@
 cliksource.com, 1
 climaencusco.com, 1
 climatechange2021.org, 1
-climatecrafters.com, 1
 climateinteractive.org, 1
 climatgate.tk, 1
 climaticequipment.tk, 1
@@ -26719,10 +26638,8 @@
 cloudforce.com, 1
 cloudfree.online, 1
 cloudfree.shop, 1
-cloudfree.site, 1
 cloudfree.top, 1
 cloudfudge.com, 1
-cloudhoreca.com, 1
 cloudia.org, 1
 cloudily.com, 1
 cloudimproved.com, 1
@@ -26730,7 +26647,6 @@
 cloudindex.io, 1
 cloudinfinit.com, 1
 cloudix.cf, 1
-cloudkeep.nl, 1
 cloudlessdreams.com, 0
 cloudlfront.net, 1
 cloudlight.biz, 1
@@ -26791,7 +26707,6 @@
 cloudturing.com, 1
 cloudu.de, 1
 cloudup.com, 1
-cloudwarez.xyz, 1
 cloudwebservices.nl, 1
 cloudwellmarketing.com, 1
 cloudwise.nl, 1
@@ -26946,7 +26861,6 @@
 cms-world.co.jp, 1
 cmsasia.co, 1
 cmserviscz.cz, 1
-cmskakuyasu.info, 1
 cmskeyholding.co.uk, 1
 cmskeyholding.com, 1
 cmskh.co.uk, 1
@@ -27073,6 +26987,7 @@
 coco-cool.fr, 1
 coco-line.ch, 1
 cocoa-job.jp, 1
+cocoafl.gov, 1
 cocodroid.com, 0
 cocokmobi.ga, 1
 cocolink.jp, 1
@@ -27117,7 +27032,6 @@
 code.gov, 1
 code.taxi, 1
 code4.hk, 1
-code4u.org, 1
 code66.ru, 1
 code67.com, 1
 code9000.be, 1
@@ -27248,7 +27162,6 @@
 coentropic.com, 1
 coenzima.com, 1
 coequals.tk, 1
-coeus.cloud, 1
 cofbev.com, 1
 cofense.at, 1
 coffee-mamenoki.jp, 1
@@ -27284,12 +27197,12 @@
 cognitip.com, 1
 cognitiveapplications.net, 1
 cognitohq.com, 0
+cognixia.us, 1
 cognosweb.net, 1
 cogsquad.house, 1
 cogsys.de, 1
 cogumelosmagicos.org, 1
 coiffeurschnittstelle.ch, 1
-coiffure-andrea.ch, 1
 coignieresentransition.fr, 1
 coil.gov, 1
 coimmvest.com, 1
@@ -27325,7 +27238,6 @@
 coins2001.ru, 1
 coinsales.net, 1
 coinsconnect.co.uk, 1
-coinsmat.com, 1
 coinsuggest.com, 1
 cointosh.jp, 1
 cointree.com, 1
@@ -27384,6 +27296,7 @@
 coletrain.com, 1
 colf.online, 1
 colfaxcountyne.gov, 1
+colfaxia.gov, 1
 colibriexpress.tk, 1
 colincogle.name, 1
 colinespinas.com, 1
@@ -27543,6 +27456,7 @@
 comasystem.dk, 1
 combattrecellulite.com, 1
 combidesk.com, 1
+combigo.com, 1
 combineconquer.com, 1
 combron.be, 1
 combron.co.uk, 1
@@ -27940,7 +27854,6 @@
 conesin.com, 1
 conews.ml, 1
 conexaotecidos.com.br, 1
-conexionfit.com, 1
 conexionok.com, 1
 conexiontransporte.com, 1
 conexstudios.online, 0
@@ -27949,7 +27862,6 @@
 confer.ch, 1
 conference-expert.eu, 1
 conference.dnsfor.me, 1
-confia.io, 1
 confiancefoundation.org, 1
 confidential.network, 1
 confidentliving.gq, 1
@@ -27989,7 +27901,7 @@
 congresodermatologia2019.com, 1
 congressmankirk.com, 1
 coniectoinvestments.com, 1
-conju.cat, 1
+conju.cat, 0
 conjugacao.com.br, 1
 conjurer.tk, 1
 conjurosamarresytrabajosespirituales.com, 1
@@ -28121,6 +28033,7 @@
 constructionstudent.uk, 1
 construred.tk, 1
 construyetuempresa.com, 1
+consul-coton.ru, 1
 consul-novocherkassk.ml, 1
 consul.io, 0
 consulenteambientale.it, 1
@@ -28187,7 +28100,6 @@
 continuitycenters.com, 0
 continuum.memorial, 0
 continuumm-tech.com, 1
-continuumrecoverycenter.com, 1
 contortion.tk, 1
 contrabass.net, 1
 contractalerters.ga, 1
@@ -28217,7 +28129,6 @@
 controlautocom.com.br, 1
 controlbooth.com, 1
 controle.net, 1
-controleer-maar-een-ander.nl, 1
 controlewiki.be, 1
 controllertech.com, 1
 controlshiftlabs.com, 1
@@ -28256,6 +28167,7 @@
 coochiehacks.io, 1
 coocook.org, 1
 cooferro.tk, 1
+cooink.net, 0
 cook-maestro.com, 1
 cook.gg, 1
 cookandbakecenter.com, 1
@@ -28342,7 +28254,6 @@
 copewithdata.com, 1
 cophumouraustralia.com, 1
 copiisiparinti.ro, 1
-copleylawfirm.com, 1
 copperandtileroofing.com, 1
 copperexports.tk, 1
 copperheados.com, 1
@@ -28437,6 +28348,7 @@
 corevetconnect.co.uk, 1
 corexpert.com, 1
 coreyjmahler.com, 1
+corfuny.gov, 1
 corgei.com, 1
 corgi.party, 1
 corgiaspets.com, 1
@@ -28560,6 +28472,7 @@
 cortesparapelo.com, 1
 cortex-development.de, 1
 cortexx.nl, 1
+cortezco.gov, 1
 cortino.ga, 1
 cortis-consulting.ch, 1
 cortizo.com.ar, 1
@@ -28583,7 +28496,7 @@
 coshima.tk, 1
 cosirex.com, 1
 coskun.tk, 1
-coslinker.com, 1
+coslinker.com, 0
 cosmasiakraft.tk, 1
 cosmechic.fr, 1
 cosmekaitori.jp, 1
@@ -28602,7 +28515,6 @@
 cosmic-relations.co.jp, 1
 cosmic-service.com, 1
 cosmicdrifters.com, 1
-cosmicnavigator.com, 1
 cosmicworlds.mobi, 1
 cosmodacollection.com, 1
 cosmohit.ua, 1
@@ -28689,7 +28601,6 @@
 counterespionage.com, 1
 countermats.net, 1
 countermentors.com, 1
-countersolutions.co.uk, 1
 counterstrikeonline.org, 1
 countertrade.com, 1
 countetime.com, 1
@@ -28744,6 +28655,7 @@
 courtneybearse.com, 1
 courtsunlimitedut.com, 1
 courttranscriptontario.ca, 1
+courvix.com, 1
 couscous.recipes, 1
 cousine.tk, 1
 cousins.tk, 1
@@ -28870,11 +28782,9 @@
 cqradio.tk, 1
 cqswxx.com, 1
 cqvradio.ddns.net, 1
-cr-it.net, 1
 cr.search.yahoo.com, 0
 cr05.fr, 1
 cr1coffee.com, 1
-cr4pr.com, 1
 cr8haven.com, 1
 cr9499.com, 1
 cra-bank.com, 1
@@ -28904,7 +28814,6 @@
 craft-me-in.com, 1
 craftandbuild.de, 1
 craftbyhand.com, 1
-craftcms.com, 1
 crafted.cat, 1
 crafterbase.de, 1
 crafters.co.jp, 1
@@ -28966,6 +28875,7 @@
 crashdebug.fr, 1
 crashdummy.tk, 1
 crashedata.tk, 1
+crate.io, 0
 cratedb-dev.cloud, 1
 cratedb.cloud, 1
 cratedb.net, 1
@@ -29021,7 +28931,6 @@
 crc-search.com, 1
 crc32.online, 1
 crc64.online, 1
-crdmendoza.net, 1
 crea-etc.net, 0
 crea-shops.ch, 0
 crea-th.at, 1
@@ -29059,7 +28968,6 @@
 creategyx.ga, 1
 createwithcynthia.com, 1
 creati.me, 1
-creatic.co, 1
 creatieven.com, 1
 creatieverd.nl, 1
 creatingchange.us, 1
@@ -29326,7 +29234,6 @@
 cross-culture.tk, 1
 cross-games.tk, 1
 cross-led-sign.com, 1
-cross-view.com, 1
 cross-x.com, 1
 crossair.tk, 1
 crosscom.ch, 1
@@ -29420,7 +29327,6 @@
 crydent.com, 1
 cryoblaster.com, 0
 cryoflesh.com, 1
-cryoit.com, 1
 cryothanasia.com, 1
 cryozenic.com, 1
 cryp.no, 1
@@ -29442,6 +29348,7 @@
 crypto-clix.xyz, 1
 crypto-gaming.tk, 1
 crypto-wiki.tk, 1
+crypto.cat, 1
 crypto.graphics, 1
 crypto.is, 0
 cryptoafternoon.com, 1
@@ -29492,7 +29399,7 @@
 cryptopartynewcastle.org, 1
 cryptopartyutah.org, 1
 cryptopaste.org, 1
-cryptophobia.nl, 0
+cryptophobia.nl, 1
 cryptorival.com, 1
 cryptoseb.pw, 1
 cryptoshot.pw, 1
@@ -29557,9 +29464,7 @@
 csaposs.com, 1
 csarchispace.com, 1
 csbya.com, 1
-csca.me, 1
 cscau.com, 0
-cscdn.net, 1
 csci571.com, 1
 csd-sevnica.si, 1
 csd-slovenije.si, 1
@@ -29595,7 +29500,6 @@
 cshive-static.com, 1
 cshive.com, 1
 cshm-schm.ca, 1
-cshopify.com, 1
 cshostorg.tk, 1
 cshub.nl, 1
 csid.ro, 1
@@ -29604,8 +29508,6 @@
 csinfo.us, 1
 csinterstargeneve.ch, 0
 csirt.ee, 1
-csis.dk, 1
-csisgroup.com, 1
 csitarz.com, 1
 cskentertainment.co.uk, 1
 cslbuild.com, 1
@@ -29781,12 +29683,9 @@
 culinary.ga, 1
 culinoa.be, 1
 culpoilu.tk, 1
-cultbeauty.co.uk, 1
-cultbeauty.com, 1
 cultofperf.org.uk, 1
 cultrix.co.uk, 1
 cultrixdigital.co.uk, 1
-cultura10.com, 1
 culturaanarquista.tk, 1
 culturaarabe.tk, 1
 culturabrasilia.tk, 1
@@ -29853,7 +29752,6 @@
 curaprox.co.th, 1
 curareldolordeespalda.com, 1
 curatedtaste.com, 1
-curbside.com, 1
 curbza.com, 1
 cureatr.com, 1
 curia.fi, 1
@@ -29910,6 +29808,7 @@
 curtis-smith.me.uk, 1
 curtis-smith.uk, 1
 curtisleejones.tk, 1
+curtislinville.net, 1
 curtispope.com, 1
 curtissmith.me.uk, 1
 curtissmith.uk, 1
@@ -29943,12 +29842,12 @@
 custombuttonco.com, 1
 customcodeit.com.au, 1
 customcompleteautomotive.com, 1
+customd.com, 0
 customdissertation.com, 1
 customerbuilders.com, 1
 customerfocus.co.za, 1
 customessaystation.gq, 1
-customfitbymj.net, 1
-customgear.com.au, 0
+customgear.com.au, 1
 customhash.com, 1
 customhomerealty.com, 1
 customizedcelebrations.co.uk, 1
@@ -30079,7 +29978,6 @@
 cyber.cafe, 0
 cyber.gov, 1
 cyber.je, 1
-cyber.securitytactics.com, 1
 cyberark.com, 1
 cyberarmy.cc, 1
 cyberatlantis.com, 1
@@ -30123,6 +30021,7 @@
 cyberium-planet.cf, 1
 cyberkov.com, 0
 cyberlab.team, 1
+cyberlegal.co, 0
 cyberlin.org, 1
 cyberlounge.ga, 1
 cybermall.ga, 1
@@ -30131,12 +30030,12 @@
 cyberme.sh, 1
 cybermeldpunt.nl, 1
 cybermotives.com, 1
-cybernest.de, 1
 cybernetivdigital.com, 1
 cyberogism.com, 1
 cyberon.it, 1
 cyberoptic.de, 1
 cyberpanel.cf, 1
+cyberpathogen.me, 1
 cyberpcforum.com, 1
 cyberpedia.wiki, 1
 cyberphaze.com, 1
@@ -30222,7 +30121,7 @@
 cygnan.com, 1
 cygnatus.com, 1
 cygnius.net, 1
-cyhour.com, 1
+cyhour.com, 0
 cykelbanor.se, 1
 cyklistika24.cz, 1
 cylindehea.com, 1
@@ -30271,6 +30170,7 @@
 cythereaxxx.com, 1
 cytophil.com, 1
 cyumus.com, 1
+cz.ma, 1
 czakey.net, 1
 czarni-czarne.tk, 1
 czaw.org, 1
@@ -30454,6 +30354,7 @@
 dachshundtalk.com, 1
 daciamodellen.nl, 1
 dacsanchatviet.com, 1
+dad, 1
 dad256.tk, 1
 dada.is, 1
 dadafterforty.be, 1
@@ -30472,6 +30373,7 @@
 dadrian.io, 1
 dadsarmy.tk, 1
 daduke.org, 1
+dadycandoit.com, 1
 daemen.org, 1
 daemon-hentai.tk, 1
 daemon.xin, 1
@@ -30510,7 +30412,6 @@
 dagsell.ga, 1
 dagyirivera.com, 1
 dahaboffers.tk, 1
-dahfasad.com, 1
 dahl-pind.dk, 1
 dahlberg.cologne, 1
 dahobo.tk, 1
@@ -30587,6 +30488,7 @@
 daknob.net, 1
 dakota-fanning.tk, 1
 dakota-spain.tk, 1
+dakota911mn.gov, 1
 dakotacil.org, 1
 daktarisys.com, 1
 daktariwildlife.org, 1
@@ -30616,7 +30518,6 @@
 dallasescorts.net, 1
 dallaslu.com, 1
 dallasmenshealth.com, 1
-dallastxdivorce.com, 1
 dallaswestinternational.ga, 1
 dallatana.tk, 1
 dalliard.ch, 1
@@ -31115,7 +31016,7 @@
 databiz.ga, 1
 datablender.nl, 1
 databp.com, 1
-databricks.com, 0
+databricks.com, 1
 databutlr.com, 1
 databutlr.net, 1
 datacalle.com, 1
@@ -31364,6 +31265,7 @@
 davidzarza.tk, 1
 davidzeegers.nl, 1
 davidzimmerman3.com, 1
+davie3.com, 1
 davimun.org, 1
 davinamccall.tk, 1
 daviscannabisco.com, 1
@@ -31402,6 +31304,7 @@
 daxpatterns.com, 1
 daxperience.eu, 1
 daxrunbase.com, 1
+day, 1
 day-peak.com, 1
 daycontactlens.com, 1
 daycubrem.com, 1
@@ -31445,7 +31348,6 @@
 db-buddy.com, 1
 db-sanity.com, 1
 db-works.nl, 1
-db.ci, 1
 db.fyi, 1
 dbapress.org, 1
 dbaron.org, 1
@@ -31612,7 +31514,6 @@
 deaf.eu.org, 1
 deafsound.tk, 1
 deagle.chat, 1
-deai-life.biz, 1
 deaktualisierung.org, 0
 deal-runners.cf, 1
 deal45.ga, 1
@@ -31640,6 +31541,7 @@
 dealwithstatistics.com, 1
 deamonmail.tk, 1
 deamsterdam.ml, 1
+deamuseum.org, 0
 deanandnatalia.co.za, 1
 deanbank.com, 1
 deanconsultancy.co.uk, 1
@@ -31750,7 +31652,6 @@
 decohome.ee, 1
 decompression.tk, 1
 deconstructind.ro, 1
-decoora.com, 1
 decor-live.ru, 1
 decor-prazdnik.ru, 1
 decorarei.com, 1
@@ -31778,6 +31679,7 @@
 decrypt.co, 1
 decrypto.net, 1
 decs.es, 1
+decstasy.de, 1
 decsys.work, 1
 dedelta.net, 1
 dedeo.tk, 1
@@ -31946,6 +31848,7 @@
 degreecollege.tk, 1
 degreeducation.tk, 1
 degressif.com, 1
+degroetenvanrosaline.nl, 1
 degrootenslot.nl, 1
 degroupage.info, 1
 dehaanadvocatenkantoor.nl, 1
@@ -32192,7 +32095,6 @@
 denachtegaalferwert.tk, 1
 denaehula.com, 1
 denali.net, 1
-denardbrewing.com, 1
 denarium.com, 1
 denatured.tk, 1
 denbkh.ru, 0
@@ -32328,7 +32230,6 @@
 depedept.com, 0
 depedsurigaodelnorte.com, 1
 depedtambayan.net, 1
-depedtambayan.net.ph, 1
 depedtayo.com, 1
 depedtayo.ph, 1
 depelos.co, 1
@@ -32558,7 +32459,6 @@
 despinavandi.gr, 1
 desplats.com.ar, 1
 despondentrock.tk, 1
-despora.de, 1
 desportvriendenoverijse.tk, 1
 despotika.de, 1
 desserteagleselvenar.tk, 1
@@ -32572,7 +32472,6 @@
 desterrada.tk, 1
 destileria.net.br, 1
 destinattorneyjohngreene.com, 1
-destiney-arkaden.de, 1
 destinomistico.com, 1
 destinyofthephoenix.me, 0
 destom.be, 1
@@ -32600,7 +32499,6 @@
 detale.eu, 1
 detalhecomercio.com.br, 1
 detalika.ru, 1
-detalyedesigngroup.com, 1
 detao.org, 1
 detc.tk, 1
 detdom.tk, 1
@@ -32710,7 +32608,7 @@
 developmentaid.org, 1
 developmentsites.melbourne, 1
 developpeur-freelance.io, 1
-developr.uk, 1
+developpeur-web.tech, 0
 develops.co.il, 1
 develoupe.com, 1
 develux.net, 1
@@ -32785,7 +32683,6 @@
 devs.host, 1
 devs.icu, 1
 devs.men, 1
-devsdata.com, 1
 devsectools.com, 1
 devsjournal.com, 1
 devskiller.com, 1
@@ -32894,7 +32791,6 @@
 dgblaw.com.au, 0
 dgbouncycastlehire.com, 1
 dggb.co.in, 1
-dgitup.com, 1
 dgl-24.de, 1
 dgmedia.tk, 1
 dgportals.co.uk, 1
@@ -32945,7 +32841,6 @@
 dia.com.br, 1
 diabetessucks.net, 1
 diabhal-staff.com, 1
-diabhal-staff.it, 1
 diabhalstaff.it, 1
 diabitify.com, 1
 diableros.tk, 1
@@ -33144,6 +33039,7 @@
 diekperaiwseis.gr, 1
 diem-project.org, 1
 diemattels.at, 1
+diemperu.com, 1
 dienaturbinderei.at, 1
 dienchaninstitute.com, 1
 diendorfer.space, 1
@@ -33183,7 +33079,6 @@
 dieti.gq, 1
 dieti.net, 1
 dietlein.tech, 1
-dietlin.com, 1
 dietlist.ga, 1
 dietmoikiensinh.tk, 1
 dietolog.gq, 1
@@ -33308,7 +33203,6 @@
 digitalcompudev.biz, 1
 digitalcompudev.com, 1
 digitalcraftmarketing.co.uk, 1
-digitalcrisis.com, 1
 digitalcronies.com, 1
 digitaldashboard.gov, 1
 digitaldeli.com, 1
@@ -33321,7 +33215,6 @@
 digitaldisaster.tk, 1
 digitaldragonsinc.com, 1
 digitale-oekonomie.ch, 1
-digitalecom.ga, 1
 digitaleducationarea.tk, 1
 digitaleducationpro.tk, 1
 digitalehandtekeningen.nl, 1
@@ -33343,6 +33236,7 @@
 digitalgeek.social, 1
 digitalgov.gov, 1
 digitalgymnastics.tk, 1
+digitalhabitat.io, 0
 digitalhands.tk, 1
 digitalhealth.gov.au, 1
 digitalheart.tk, 1
@@ -33369,6 +33263,7 @@
 digitalphone.tk, 1
 digitalphoto.group, 1
 digitalphoto.tech, 1
+digitalpiloten.org, 1
 digitalplaymakers.co.uk, 1
 digitalpocketpedometer.tk, 1
 digitalponsel.com, 1
@@ -33434,7 +33329,6 @@
 dijkmanmuziek.nl, 0
 dijks.com, 1
 dik-manusch.tk, 1
-dikant.eu, 1
 dikiaap.id, 1
 dikkevettescania.tk, 1
 diko.ml, 1
@@ -33453,7 +33347,6 @@
 dima-v.ru, 1
 dima.pm, 1
 dimagrimentoincorso.it, 1
-dimanet.fr, 1
 dimanss47.net, 1
 dimatokar.com, 1
 dimatx.com, 1
@@ -33577,6 +33470,7 @@
 directories.cf, 1
 directorios.tk, 1
 directoriostelefonicos.com, 1
+directorioz.com, 1
 directorseries.com, 1
 directory-aldo.tk, 1
 directory-ecco.tk, 1
@@ -33584,7 +33478,6 @@
 directorydashboard.ga, 1
 directorydisc.cf, 1
 directorydisc.ga, 1
-directorylib.com, 1
 directoryworld.tk, 1
 directpaydayloansonline.ga, 1
 directreal.sk, 1
@@ -33677,7 +33570,6 @@
 discordhome.com, 1
 discordservers.com, 1
 discordsworld.tk, 1
-discotek.club, 1
 discotheque.tk, 1
 discount-course.com, 1
 discountforelectronics.tk, 1
@@ -33837,6 +33729,7 @@
 distraction.tk, 1
 distratus.com, 1
 distri.com.ua, 1
+distribuidoracristal.com.br, 1
 distribuidoradecierres.com, 1
 distribuidoraplus.com, 1
 distribuidorveterinario.es, 1
@@ -34114,7 +34007,6 @@
 djtavo.tk, 1
 djtiago.tk, 1
 djtourist.tk, 1
-djul.net, 1
 djura.in.rs, 1
 djurensvanner.tk, 1
 djurklinikenangelholm.se, 1
@@ -34247,7 +34139,7 @@
 dmshynk.com, 1
 dmvhomesgroup.com, 1
 dmwall.cn, 1
-dmwaste.com, 1
+dmwaste.com, 0
 dmwclan.tk, 1
 dmx.xyz, 1
 dmxclan.tk, 1
@@ -34365,7 +34257,6 @@
 docbrown.dk, 1
 docdoc.ru, 1
 docdoc.tel, 1
-docedic.com, 1
 docedic.es, 1
 docemeldoces.com, 1
 docertify.com, 1
@@ -34460,6 +34351,7 @@
 doddy.tk, 1
 dodecaedro.tk, 1
 dodgecountyne.gov, 1
+dodgevillewi.gov, 1
 dodi-alhelo.tk, 1
 dodikod.tk, 1
 dodolle.co.uk, 1
@@ -34499,6 +34391,7 @@
 dogecoinnews.net, 1
 dogecoinnews.org, 1
 dogespeed.gq, 1
+dogespeed.ml, 1
 dogespeed.tk, 1
 dogfights.tk, 1
 dogforum.de, 1
@@ -34736,7 +34629,6 @@
 domovik-magz.tk, 1
 domovitae.io, 1
 domovitae.nl, 1
-domowe-potrawy.pl, 1
 domowejroboty.pl, 1
 domparts.com.au, 1
 domprojects.com, 1
@@ -35038,13 +34930,12 @@
 douai.me, 1
 douban.city, 1
 double20.gg, 1
-doubleaste.com, 1
+doubleaste.com, 0
 doubleavineyards.com, 1
 doublebangmusic.com, 0
 doubled.ml, 1
 doubledranch.tk, 1
 doublefun.net, 1
-doubleglazingmasters.com.au, 1
 doubleness.gq, 1
 doublestat.me, 1
 doubleup.com.au, 1
@@ -35060,6 +34951,7 @@
 douglascounty-oregon.gov, 1
 douglascountycolorado.gov, 1
 douglascountyga.gov, 1
+douglascountyor.gov, 1
 douglascuddletoy.com, 1
 douglascustodio.com.br, 1
 douglasmi.gov, 1
@@ -35179,16 +35071,10 @@
 dpmr446.fr, 1
 dpomax.com.br, 1
 dponetwork.nl, 0
-dposit.com, 1
-dposit.email, 1
-dposit.eu, 1
-dposit.net, 1
-dposit.org, 1
 dpower.tk, 1
 dppstar.com, 1
 dprb.biz, 1
 dpress24.it, 1
-dps.srl, 1
 dpsg-hohenlinden.de, 1
 dpsg-roden.de, 0
 dpsmassage.nl, 1
@@ -35224,6 +35110,7 @@
 dracheisolation.tk, 1
 drachenleder.de, 1
 dracisvet.cz, 1
+dracoon.team, 1
 dracox.com, 0
 dracula.city, 1
 draemar.com, 1
@@ -35303,7 +35190,7 @@
 drakencan.gq, 1
 drakenprospero.com, 0
 drakenson.de, 1
-drakfot.se, 1
+drakfot.se, 0
 drakiada.tk, 1
 drakoraw.my.id, 1
 draliabadi.com, 0
@@ -35319,7 +35206,6 @@
 dranik.ga, 1
 dranik.ml, 1
 drankenweb.tk, 1
-dranous.com, 1
 drapeauxdespays.fr, 1
 draper.wtf, 1
 draperutah.gov, 1
@@ -35395,7 +35281,6 @@
 dreamlordpress.it, 1
 dreamlux.cz, 1
 dreamlux.sk, 1
-dreamotis.com, 1
 dreampages.tk, 1
 dreampointech.com, 1
 dreamqueen.tk, 1
@@ -35610,7 +35495,6 @@
 dronepit.dk, 1
 droneservices.com.fj, 1
 dronesquadcoptersales.ga, 1
-droneways.com.au, 1
 droneways.tech, 1
 droni.cz, 1
 dronix.tk, 1
@@ -35891,7 +35775,6 @@
 ducksify.com, 1
 ducksoft.fi, 1
 duckstad.net, 1
-duckyubuntu.tk, 1
 ductcare.com, 1
 dude.tokyo, 1
 dudedood.tk, 1
@@ -35942,7 +35825,6 @@
 duke-nukem.tk, 1
 dukeandduchessdrivingschool.co.uk, 1
 dukegat.de, 0
-dukeipai.org, 1
 dukeofmetal.tk, 1
 dukers-baelemans.nl, 0
 dukhanstore.com, 1
@@ -36172,7 +36054,7 @@
 dwwt.net, 1
 dwwt.nl, 1
 dwwt.org, 1
-dwz-solutions.com, 1
+dwz-solutions.com, 0
 dwz-solutions.de, 1
 dwz-solutions.eu, 1
 dwz-solutions.net, 1
@@ -36200,7 +36082,6 @@
 dyeager.org, 1
 dyingflame.tk, 1
 dyktig.as, 1
-dyktig.no, 1
 dylan-motorcross.tk, 1
 dylan-park.com, 1
 dylancl.cf, 1
@@ -36246,6 +36127,7 @@
 dynamicbusinessconsultants.ga, 1
 dynamicconsultantsgroup.com, 1
 dynamicdesignuk.com, 1
+dynamicnet.net, 1
 dynamicpl.us, 1
 dynamicplus.it, 1
 dynamicsdays.info, 1
@@ -36280,7 +36162,6 @@
 dyrenesverden.no, 1
 dyrkar.com, 1
 dyrkar.se, 1
-dyrstad.net, 1
 dys-coaching.com, 1
 dysautonomia-postsyndrome.com, 1
 dyscalculia-blog.com, 1
@@ -36293,10 +36174,10 @@
 dyz.pw, 1
 dz6729.com, 1
 dz6957.com, 1
+dzar.nsupdate.info, 1
 dzeina.ch, 0
 dzet.de, 1
 dziaduch.pl, 1
-dziary.com, 1
 dziecismoka.pl, 1
 dziekonski.com, 1
 dzimchuk.net, 1
@@ -36320,7 +36201,6 @@
 dzz.by, 1
 e-account.by, 1
 e-alink.com, 1
-e-alive.com, 1
 e-antikvar.tk, 1
 e-bags.tk, 1
 e-balloons.tk, 1
@@ -36328,7 +36208,6 @@
 e-belgia.tk, 1
 e-beyond.de, 1
 e-bikesdirect.co.uk, 1
-e-biografias.net, 1
 e-bodybuilding.tk, 1
 e-boekhouden.nl, 1
 e-bookshelf.de, 1
@@ -36433,7 +36312,6 @@
 e-tables.tk, 1
 e-tablets.tk, 1
 e-teacher.pl, 1
-e-teachers.me, 1
 e-tech-solution.com, 1
 e-tech-solution.net, 1
 e-technology.tk, 1
@@ -36978,13 +36856,13 @@
 easywin.ml, 1
 easywio.com, 1
 easywords.org, 1
+eat, 1
 eat-sleep-code.com, 1
 eat-the-world.ch, 1
 eat-vegan.rocks, 1
 eatery.co.il, 1
 eatfitoutlet.com.br, 1
 eatingasturias.com, 1
-eatinghouz.com, 1
 eatinglinks.tk, 1
 eatingonions.com, 1
 eatmebudapest.hu, 1
@@ -37037,6 +36915,7 @@
 ebatechenergiedisplay.nl, 1
 ebatechenergiemanagement.nl, 1
 ebayinc.com, 1
+ebaymotorssucks.com, 1
 ebcfx.com, 1
 ebci-nsn.gov, 1
 ebcired-nsn.gov, 1
@@ -37065,7 +36944,6 @@
 ebki-nsn.gov, 1
 eblan.gq, 1
 eblog.cf, 1
-eblog.ink, 1
 ebola-hosting.cz, 1
 ebolacharts.ga, 1
 ebolavirus.tk, 1
@@ -37121,7 +36999,6 @@
 eccux.com, 1
 ecdn.cz, 1
 ecelembrou.ovh, 1
-ecfnorte.com.br, 1
 ecfunstalls.com, 1
 ecgclic.fr, 1
 echarity.ae, 1
@@ -37194,6 +37071,7 @@
 ecocanada.jobs, 1
 ecoccinelles.ch, 0
 ecoccinelles.com, 0
+ecoconut.org, 1
 ecocreativity.org, 1
 ecocuisinedesign.com, 1
 ecodedi.com, 1
@@ -37249,7 +37127,6 @@
 econativa.pt, 1
 econfia.cf, 1
 econmarketingdigital.com, 1
-economiafinanzas.com, 1
 economic-sanctions.com, 1
 economicnews.ga, 1
 economics-colleges.com, 1
@@ -37272,6 +37149,7 @@
 ecos-ev.de, 1
 ecos.srl, 1
 ecosas.org, 1
+ecosdanoticia.net.br, 1
 ecosdesociedad.tk, 1
 ecosfti.tk, 1
 ecoshare.info, 1
@@ -37292,7 +37170,6 @@
 ecoupakovka.ga, 1
 ecourbano.tk, 1
 ecoute.tv, 1
-ecovision.com.br, 1
 ecowoman-armenian.tk, 1
 ecowoman-bengalian.tk, 1
 ecowoman-indonezian.tk, 1
@@ -37349,6 +37226,7 @@
 edeals.com.co, 1
 edeca.net, 1
 ededdeddy.tk, 1
+edefrutos2020.com, 1
 edegembicycleclub.tk, 1
 edegulkoyu.tk, 1
 edehsa.com, 1
@@ -37425,6 +37303,7 @@
 edmedsonline.tk, 1
 edmilia.tk, 1
 edmoncu.com, 1
+edmondok.gov, 1
 edmundcelis.com, 1
 edok.com.br, 1
 edoss.co.za, 0
@@ -37659,7 +37538,6 @@
 eftcorp.biz, 1
 eftelingcraft.net, 1
 efterfest.tk, 1
-eftopia.org, 1
 efutbol.tk, 1
 eg7.co.jp, 1
 eg7.jp, 1
@@ -37731,6 +37609,7 @@
 egres.xyz, 1
 egretail.no, 0
 egrojsoft.info, 1
+egrp365.ru, 1
 egsl.pro, 1
 egt-bg.com, 1
 egt.ee, 1
@@ -37789,7 +37668,6 @@
 eichinger-stelzl.com, 1
 eichinger-stelzl.de, 1
 eichler.work, 1
-eickemeyer.nl, 1
 eickhof.co, 1
 eickhof.us, 1
 eickhofcolumbaria.com, 1
@@ -37808,6 +37686,7 @@
 eightyfour.ca, 1
 eightyfour.pictures, 1
 eightysoft.de, 1
+eigpropertyauctions.co.uk, 1
 eihaikyo.com, 1
 eiji.fr, 1
 eikenskaden.tk, 1
@@ -37830,6 +37709,7 @@
 einhorn.space, 1
 einmonolog.de, 1
 einomanner.com, 1
+einreiseanmeldung.de, 1
 einrichtwerk.de, 1
 einsatzstiefel.info, 1
 einscube.com, 1
@@ -37871,7 +37751,6 @@
 ejknet.nl, 1
 ejkwebdesign.nl, 1
 ek-networks.de, 0
-ekaigotenshoku.com, 1
 ekalisch.de, 1
 ekamus.tk, 1
 ekati.ru, 1
@@ -37921,6 +37800,7 @@
 eksk.pl, 1
 ekspert.tk, 1
 eksploraz.com, 1
+ekspoint-mods.ru, 1
 eku.com.tr, 1
 ekuma.tk, 1
 ekvastra.in, 1
@@ -37994,7 +37874,6 @@
 elderplan.org, 1
 elderreviews.gq, 1
 elderscrolls.tk, 1
-eldertons.co.uk, 1
 eldevo.com, 1
 eldiariodemof.com, 1
 eldiedesign.com, 1
@@ -38004,6 +37883,7 @@
 eldrid.ge, 1
 ele-sm.com, 1
 elearningpilot.com, 1
+elecpromo.com, 1
 electerious.com, 1
 electicofficial.com, 0
 electionpresidentiellegabon2009.ga, 1
@@ -38046,12 +37926,10 @@
 electricconejovalley.com, 1
 electricdosvientos.com, 1
 electricdreams.xyz, 1
-electricfenceboksburg.co.za, 1
 electricfencemidrand.co.za, 1
 electricfenceroodepoort.co.za, 1
 electricfireplaces.tk, 1
 electricgatemotorsalberton.co.za, 1
-electricgatemotorskemptonpark.co.za, 1
 electricgatemotorsroodepoort.co.za, 1
 electricgypsies.nl, 1
 electrichiddenhills.com, 1
@@ -38120,7 +37998,6 @@
 electroniko.cf, 1
 electronis.ru, 1
 electronmag.tk, 1
-electroservice.co.za, 1
 electrosoftcloud.com, 1
 electrostatics.com, 1
 electrostore.com.ec, 1
@@ -38393,6 +38270,7 @@
 elizabethmacdonaldbooks.com, 1
 elizabethrominski.com, 1
 elizabethtaderera.me, 1
+eljay.cc, 1
 eljef.me, 1
 elka-piter.ga, 1
 elkampeuzo-musique.tk, 1
@@ -38713,7 +38591,6 @@
 emina-arapovic.tk, 1
 eminafans.tk, 1
 eminem.kim, 1
-emirabiz.com, 0
 emirates247.com, 1
 emirefek.net, 1
 emirichardson.com, 1
@@ -38792,7 +38669,6 @@
 empiria.site, 1
 emplealis.com, 1
 empleandon0s.com, 1
-empleosearch.com, 1
 emploi-collectivites.fr, 0
 employeeexpress.gov, 1
 employeemanual.com.au, 1
@@ -38825,6 +38701,7 @@
 emprendefinanzas.com, 1
 emprendeperuano.com, 1
 emprendimientoweb.co, 1
+empresa365.com, 1
 empresautil.tk, 1
 emprunterlivre.ci, 1
 emptiness.cf, 1
@@ -38899,7 +38776,6 @@
 encontreumagp.com, 1
 encontro.online, 1
 encontroespiritadeinverno.com.br, 1
-encore.io, 1
 encoro.org, 1
 encountercss.com, 1
 encouragemarketing.com, 1
@@ -39001,6 +38877,7 @@
 energybooster.tk, 1
 energycarriers.com, 1
 energycodes.gov, 1
+energycommunities.gov, 1
 energyconsultonline.nl, 1
 energydistributorsllc.com, 1
 energydrinkblog.de, 1
@@ -39127,13 +39004,13 @@
 enigmamusic.tk, 1
 enigmatry-website-test.azurewebsites.net, 1
 enigmatry.com, 1
-enijew.com, 1
 enitso.de, 1
 enity.tk, 1
 eniwa-eye.com, 1
 enixgaming.com, 1
 eniyicrmprogramlari.tk, 1
 enizioshop.com, 1
+enjin.io, 1
 enjin.zone, 1
 enjincoin.io, 1
 enjinwallet.io, 1
@@ -39153,7 +39030,6 @@
 enlnf.link, 1
 enloestatebank.com, 1
 enlyft.com, 0
-enmieux.be, 1
 enmowe.com, 1
 enmowe.tech, 1
 ennori.jp, 1
@@ -39262,7 +39138,6 @@
 entspannter-arbeiten.de, 0
 entwickler.land, 1
 enuchi.jp, 1
-enuygun.com, 1
 envaldemoro.com, 1
 envant.co.uk, 1
 enveloppenopmaat.nl, 1
@@ -39270,7 +39145,7 @@
 enviam.de, 1
 enviarcurriculumvitae.com, 1
 enviartucurriculumvitae.com, 1
-enviatufoto.com, 1
+enviatufoto.com, 0
 envide.no, 1
 enviosnegocios.tk, 1
 enviro-umweltservice.de, 1
@@ -39351,7 +39226,6 @@
 epica.tk, 1
 epicapos.cz, 1
 epicbouncycastles.co.uk, 1
-epiccdn.net, 1
 epiccraft-mc.de, 1
 epicdesign1.tk, 1
 epicdesign2.tk, 1
@@ -39454,6 +39328,7 @@
 epvd.tk, 1
 epyonsuniverse.net, 1
 eq-serve.com, 1
+eqab.net, 1
 eqassociates.com, 1
 eqibank.com, 1
 eqlplayground.io, 1
@@ -39490,7 +39365,6 @@
 equityloupe.com, 1
 equityloupe.org, 1
 equityloupe.ru, 1
-equityset.com, 1
 equitytrack.co, 1
 equityyes.org, 1
 equivid.ga, 1
@@ -39522,9 +39396,9 @@
 erciyesspor.tk, 1
 erclab.kr, 1
 erclaim.com, 1
+erctra.com, 1
 erdethamburgeronsdag.no, 1
 ereader.uno, 1
-erechimimoveis.com.br, 1
 erector.cf, 1
 erector.tk, 1
 eredmenye.xyz, 1
@@ -39677,7 +39551,6 @@
 ertebatatjelve.ir, 1
 erthisa.tk, 1
 eru.im, 0
-eru.moe, 1
 erudicia.com, 1
 erudicia.de, 1
 erudicia.es, 1
@@ -39690,7 +39563,6 @@
 erudio-usluge.hr, 1
 erulezz.nl, 1
 eruzione.us, 1
-ervaarjapan.nl, 1
 ervirmaison.tk, 1
 erwanlepape.com, 1
 erwannlaflute.tk, 1
@@ -39743,7 +39615,6 @@
 esb553.com, 1
 esb556.com, 1
 esb5889.com, 1
-esb5889.net, 1
 esb666.com, 1
 esb688.com, 1
 esb68888.com, 1
@@ -39914,7 +39785,7 @@
 espace-finance.fr, 1
 espace-gestion.fr, 1
 espace-habitat-francais.fr, 1
-espace-orenda.ch, 0
+espace-orenda.ch, 1
 espace-vet.fr, 1
 espace.network, 1
 espace.spb.ru, 0
@@ -39958,13 +39829,13 @@
 esport-agency.fr, 1
 esporters.today, 1
 esportsbattles.ga, 1
-esportslac.com, 1
 espower.com.sg, 1
 espressob2b.com, 1
 esprihealth.com, 1
 esprit.tn, 1
 espritrait.com, 0
 espyder.net, 1
+esq, 1
 esquelario.tk, 1
 esquirebrotherhood.tk, 1
 esquirou-trieves.fr, 0
@@ -40025,7 +39896,6 @@
 estafallando.es, 1
 estafallando.mx, 1
 estahl.dk, 1
-estaleiro.org, 1
 estallidodigital.cl, 1
 estampascriativas.com.br, 1
 estate360.co.tz, 1
@@ -40051,6 +39921,7 @@
 estetista.net, 1
 esthe-zukan.com, 1
 estherlew.is, 1
+esthernariyoshi.com, 1
 esthesoleil.jp, 1
 estila.co, 1
 estilopack-loja.com.br, 1
@@ -40118,7 +39989,6 @@
 etaoinwu.win, 1
 etath.com, 1
 etaxigraz.com, 1
-etbtoursegypt.com, 1
 etccooperative.org, 0
 etch.co, 1
 etch44.com, 1
@@ -40157,6 +40027,7 @@
 eth-news.info, 1
 eth-services.de, 1
 eth0.nl, 0
+etha.nz, 1
 ethaligan.fr, 1
 ethan.pm, 1
 ethan.wtf, 1
@@ -40239,7 +40110,6 @@
 etssquare.com, 1
 etsu.edu, 1
 ettbattreinternet.se, 1
-ettbl.net, 1
 ettebiz.com, 1
 ettgottliv.com, 1
 ettounsi.net, 1
@@ -40378,7 +40248,6 @@
 europeanpreppers.com, 1
 europeanstudies-chemnitz.de, 1
 europeantransportmanagement.com, 1
-europeanwineresource.com, 1
 europeluxuryweddings.com, 1
 europeonline.tk, 1
 europeos.es, 1
@@ -40389,7 +40258,6 @@
 europetravelservice.co.uk, 1
 europoint.org.uk, 1
 europop.com, 1
-eurora.de, 1
 eurorecambios24.com, 1
 euroroad17.dk, 1
 euroscot.de, 1
@@ -40497,7 +40365,6 @@
 evenstar-gaming.com, 1
 evenstargames.com, 1
 event-blick.de, 1
-event-fullyyours.com, 1
 event-reisen.tk, 1
 event4fun.no, 1
 eventact.com, 0
@@ -40605,6 +40472,7 @@
 eviction.cf, 1
 evidecor.com.br, 1
 evidence-based.review, 1
+evidencebased.net, 1
 evidenceusa.com.br, 1
 evidenciamidiasdigitais.com.br, 1
 evidencija.ba, 1
@@ -40659,6 +40527,7 @@
 evoludis.net, 1
 evolution-gaming.tk, 1
 evolution-host.ga, 1
+evolution.codes, 1
 evolutionbiote.com, 1
 evolutioninflatables.co.uk, 1
 evolutionlending.co.uk, 1
@@ -40745,7 +40614,6 @@
 exambot.gq, 1
 exambot.tk, 1
 examedge.com, 1
-examesrush.com, 1
 examesrush.com.br, 1
 examika.ru, 1
 examlab.tk, 1
@@ -40833,7 +40701,6 @@
 exentio.sexy, 1
 exercisekingers.ga, 1
 exercisekingest.ga, 1
-exerforge.com, 1
 exerforge.net, 1
 exerpm.tk, 1
 exesoft.ml, 1
@@ -40896,7 +40763,6 @@
 expensivejewelsest.ga, 1
 exper.gr, 1
 experens.com, 1
-experienceoutdoors.org.uk, 1
 experienceoz.com.au, 1
 experiment-626.tk, 1
 experimentalguruji.cf, 1
@@ -40986,6 +40852,7 @@
 exposurethrash.tk, 1
 expouniverse.cf, 1
 expouniverse.tk, 1
+expovivienda.com.mx, 1
 express-hosting.org, 1
 express-shina.ru, 1
 express-shop.tk, 1
@@ -41241,12 +41108,10 @@
 f88vip106.com, 1
 f88vip107.com, 1
 f88vip108.com, 1
-f88vip109.com, 1
 f88vip11.com, 1
 f88vip110.com, 1
 f88vip111.com, 1
 f88vip112.com, 1
-f88vip113.com, 1
 f88vip114.com, 1
 f88vip115.com, 1
 f88vip116.com, 1
@@ -41340,11 +41205,11 @@
 fabien-hebuterne.fr, 1
 fabienbaker.com, 1
 fabienne-roux.org, 1
+fabil.id, 1
 fabiobier.com, 1
 fabiocicerchia.it, 1
 fableforge.nl, 1
 fableheartmedia.com, 1
-faboolus.com, 1
 fabricadeobsequiosimpresores.com, 1
 fabricalaser.com.br, 1
 fabriceleroux.com, 0
@@ -41478,7 +41343,6 @@
 fadaru.ml, 1
 fadednet.com, 0
 fademusic.tk, 1
-fadergs.edu.br, 1
 faderweb.de, 1
 fads-center.online, 1
 fadusongs.com, 1
@@ -41604,7 +41468,6 @@
 faktury.co, 1
 falaeapp.org, 1
 falaowang.com, 1
-falasteenjobs.com, 1
 falbros.com, 1
 falce.in, 1
 falcema.com, 1
@@ -41724,7 +41587,6 @@
 fan.gov, 1
 fan4all.de, 1
 fanactu.com, 1
-fanatical.com, 1
 fanaticamandafans.tk, 1
 fanatik.io, 1
 fanatka.tk, 1
@@ -41806,7 +41668,6 @@
 fantgames.com, 1
 fantinisfantasy.cf, 1
 fantiphysiotherapy.com, 1
-fantom.foundation, 1
 fantraxhq.com, 1
 fanvoice.com, 1
 fanyina.cn, 1
@@ -41858,7 +41719,6 @@
 farhadexchange.com, 1
 farhanaditya.com, 0
 farhandanish.tk, 1
-farhood.org, 1
 farian.tk, 1
 faribanx-porn.com, 1
 faribanx-xxx.com, 1
@@ -41935,7 +41795,6 @@
 fashionforyou.ga, 1
 fashionfreaks.tk, 1
 fashionfuture.tk, 1
-fashionhijabers.com, 1
 fashionlink.tk, 1
 fashionlistify.tk, 1
 fashionmagz.tk, 1
@@ -42080,7 +41939,6 @@
 fauxcams.com, 1
 fauxil.shop, 1
 favalart.com, 1
-fave.ly, 1
 favedog.com, 1
 favely.com, 1
 favorai.com, 1
@@ -42094,7 +41952,6 @@
 favoritetechers.ga, 1
 favouritequotations.ca, 1
 faw-club.cf, 1
-fawong.com, 1
 fawter.online, 1
 faxfarmers.ga, 1
 faxfarmest.ga, 1
@@ -42115,7 +41972,6 @@
 fazo.gq, 1
 fazrin.tk, 1
 fazz.id, 1
-fazzfinancial.com, 1
 fb-lab.de, 1
 fb.gg, 1
 fb.me, 1
@@ -42399,7 +42255,7 @@
 felsenheimer.tk, 1
 felsing.net, 1
 felton.network, 1
-feltons.me, 1
+feltons.me, 0
 feluck.de, 1
 female-costumes.tk, 1
 femalecare.tk, 1
@@ -42594,7 +42450,7 @@
 fettbrot.tk, 1
 feudalisten.de, 1
 feudaltactics.com, 1
-feuerhaken.org, 1
+feuerhaken.org, 0
 feuerhuhn.de, 1
 feuerloescher-arten.de, 1
 feuerloescher-test.de, 1
@@ -42974,7 +42830,6 @@
 findcbdoilnearme.com, 1
 findcheap.us, 0
 finddecisionsest.ga, 1
-finde-kleinanzeigen.de, 1
 findelahistoria.com, 1
 findenmed.com.br, 1
 findete.tk, 1
@@ -43088,7 +42943,6 @@
 finwarriors.tk, 1
 finwe.info, 1
 finzy.com, 1
-fionafuchs.de, 1
 fionamcbride.com, 1
 fionna.io, 1
 fionna.org, 1
@@ -43347,7 +43201,6 @@
 fix-the-timeline.org, 1
 fix.mk, 1
 fixaslowcomputer.com, 1
-fixatelierstore.com.br, 1
 fixatom.com, 1
 fixdiabetesnaturally.com, 1
 fixed.tech, 1
@@ -43383,7 +43236,6 @@
 fizz.team, 1
 fizz.technology, 1
 fizz.tools, 1
-fizz.world, 1
 fizz.zone, 1
 fizzcharts.com, 1
 fizzcompetitions.com, 1
@@ -43483,7 +43335,7 @@
 flashigra.tk, 1
 flashissue.com, 1
 flashkeysers.ga, 1
-flashlearners.com, 0
+flashlearners.com, 1
 flashlightchart.com, 1
 flashmarkets.com, 1
 flashscores.tk, 1
@@ -43524,6 +43376,7 @@
 flayla.tk, 1
 flblog.top, 0
 flcatering.com, 1
+flcma.gov, 1
 flconcretelifting.com, 1
 flcourts.gov, 1
 fldjj.gov, 1
@@ -43602,6 +43455,7 @@
 flexussolucoes.com.br, 1
 flexve.com, 1
 flfl.de, 1
+flhealthcharts.gov, 1
 fliacuello.com.ar, 1
 flibanserina.com, 1
 flicerdowneh.cf, 1
@@ -43719,6 +43573,7 @@
 floravino.de, 1
 floreg.com, 1
 florenceapp.co.uk, 1
+florencecountywi.gov, 1
 florenciaextrema.tk, 1
 florenciasabio.com, 1
 florent-tatard.fr, 1
@@ -43861,6 +43716,7 @@
 fluxoid.com, 1
 flvyingeagle.ga, 1
 flwrightwichita.org, 1
+fly, 1
 fly-en-drive.nl, 1
 fly.moe, 1
 flyabe.com, 1
@@ -43970,7 +43826,6 @@
 focoja.com.br, 1
 focusdemolition.com.au, 1
 focusgroup.tk, 1
-focusmagonline.com.au, 1
 focusmark.jp, 0
 focusministries1.org, 1
 focusproductions.tk, 1
@@ -44040,7 +43895,6 @@
 fondationwiggli.ch, 1
 fondbaikal.ml, 1
 fondy.ru, 1
-fondy.ua, 1
 foneapk.com, 1
 foneo.com, 1
 fonga.ch, 1
@@ -44062,7 +43916,6 @@
 fontnegar.ir, 1
 fonts2u.com, 1
 fonts4free.net, 1
-fonzone.it, 1
 foo, 1
 foo.fo, 1
 foo.hamburg, 1
@@ -44363,7 +44216,6 @@
 forkurd.ml, 1
 forliberty.com.br, 1
 forlitoday.it, 1
-formacionyestudios.com, 1
 formalgrammar.tk, 1
 formalist.cz, 1
 formality.one, 1
@@ -44413,7 +44265,6 @@
 forocio.tk, 1
 forocristiano.tk, 1
 forodebanfield.tk, 1
-forodeespanol.com, 1
 forodieta.com, 0
 foroenguera.tk, 1
 forojovensanfernando.tk, 1
@@ -44598,6 +44449,7 @@
 fotografiadellalucerossa.com, 1
 fotografiamakro.pl, 1
 fotografies.tk, 1
+fotografija.tk, 1
 fotografoivanalmeida.com.br, 1
 fotogram.be, 1
 fotohiking.com, 1
@@ -44634,7 +44486,6 @@
 found.website, 1
 foundationassure.com, 1
 foundationmaintenance.com, 1
-foundationrepairannarbor.com, 1
 foundationrepairasheville.com, 1
 foundationrepairbasementwaterproofingtn.com, 1
 foundationrepairchicagoil.com, 1
@@ -44739,7 +44590,6 @@
 fractalenlightenment.com, 1
 fractieplanner.nl, 1
 fractionalciso.com, 1
-fractionclub.com, 1
 fracturedfx.com, 1
 fracturedperspective.com, 1
 fragara.com, 1
@@ -45036,7 +44886,6 @@
 free-traff.cf, 1
 free-watching.ga, 1
 free-webtv.tk, 1
-free.ac.cn, 1
 free.com.tw, 1
 free6to12yo.gq, 1
 free8.xyz, 1
@@ -45131,6 +44980,7 @@
 freelance.nl, 1
 freelancecollab.com, 1
 freelanceessaywriters.com, 1
+freelancehunt.com, 1
 freelancejobs.org.uk, 1
 freelancemw.com, 0
 freelancerim.ml, 1
@@ -45319,6 +45169,7 @@
 frettennet.tk, 1
 frettirnar.is, 1
 freudedurchmachen.de, 1
+freundeskreis-tarjan.de, 1
 freundinnen-ausflug.de, 1
 freundinnen-kurzurlaub.de, 1
 freundinnen-urlaub.de, 1
@@ -45464,7 +45315,6 @@
 fronteers.nl, 0
 fronteimoveis.com.br, 1
 fronterasblog.tk, 1
-frontier-ad.co.jp, 1
 frontier.bet, 1
 frontierbrasil.tk, 1
 frontierdiscount.com, 1
@@ -45635,7 +45485,6 @@
 fuego.tech, 1
 fuegocruzado.tk, 1
 fuegosalsapower.tk, 1
-fuelfirebrand.com, 1
 fuelgalicia.tk, 1
 fuelingyourdreams.com, 0
 fuembellida.tk, 1
@@ -45664,7 +45513,6 @@
 fujiwarashinzo.com, 1
 fujiyakimono.com, 1
 fukabori-kaidora.com, 1
-fukakukeiba.com, 1
 fukase-seed.com, 1
 fukikaeru.com, 1
 fukn.jp, 1
@@ -45703,11 +45551,13 @@
 fullscopesports.com, 1
 fullsize.ml, 1
 fullspace.com.br, 1
+fullstack.love, 1
 fulltextarchive.com, 1
 fulltxt.ml, 1
 fully-hair.tk, 1
 fullzest.com, 1
 fultoncountyar.gov, 1
+fultoncountyil.gov, 1
 fultondaleal.gov, 1
 fumblers.ca, 1
 fumerolles.ch, 0
@@ -45732,7 +45582,6 @@
 funatic.tk, 1
 funboat.tk, 1
 funbuynet.com.br, 1
-funcabinrentals.com, 1
 funchal.cf, 1
 funchal.ga, 1
 funchal.gq, 1
@@ -45937,11 +45786,9 @@
 furrycraft.ga, 1
 furrytech.network, 1
 fursandfur.tk, 1
-fursuitbutts.com, 1
 furtodo.com, 1
 furu-sato.com, 1
 furuy.com, 1
-furworks.de, 1
 furzone.net, 1
 fusacity.tk, 1
 fusacovi.cf, 1
@@ -46001,7 +45848,6 @@
 futurenda.com, 1
 futureofyoucdc.sg, 1
 futureplanet.tk, 1
-futureshock7130.com, 1
 futuresonline.com, 1
 futuresound.tk, 1
 futuressm.com, 1
@@ -46156,7 +46002,6 @@
 gabbyer.ga, 1
 gabbyer.gq, 1
 gabbyer.ml, 1
-gabe.cooking, 1
 gabe.download, 1
 gabe.house, 1
 gabe.link, 1
@@ -46218,7 +46063,6 @@
 gadecs.com, 1
 gadget-freak.cf, 1
 gadget-tips.com, 1
-gadgetadvisor.net, 1
 gadgetflashers.ga, 1
 gadgetflip.com, 1
 gadgetfreak.cf, 1
@@ -46705,6 +46549,7 @@
 garotos.gq, 1
 garotos.tk, 1
 garrettcornwell.tk, 1
+garrettcountymd.gov, 1
 garriganenterprises.com, 1
 garriganenterprises.net, 1
 garriganenterprisesinc.com, 1
@@ -46846,7 +46691,6 @@
 gba.ge, 1
 gbcsummercamps.com, 1
 gbdavisplasticsurgery.com, 1
-gbet24.com, 1
 gbhem.org, 1
 gbinsta.com, 1
 gbiotech.tk, 1
@@ -47179,7 +47023,6 @@
 genesisblock.com, 1
 genesiscrystals.com, 1
 genesiseureka.com, 1
-genesisgold.com, 1
 genesisgrade.com, 1
 genesismachina.ca, 1
 genesisplay.tk, 1
@@ -47225,7 +47068,6 @@
 genom.by, 1
 genome.gov, 0
 genomedia.jp, 1
-genomelink.io, 1
 genomequestlive.com, 1
 genometrik.de, 1
 genoog.com, 1
@@ -47314,7 +47156,6 @@
 geo-industrie.fr, 1
 geo-portale.it, 1
 geoarchive.tk, 1
-geobennett.com, 1
 geocar.com, 1
 geocod.tk, 1
 geocoin2016.dk, 1
@@ -47424,7 +47265,6 @@
 geowest.tk, 1
 geowithmaps.com, 1
 gep.ch, 1
-gep.com, 1
 gepe.ch, 1
 gepetoauth.herokuapp.com, 1
 gepetoservices.herokuapp.com, 1
@@ -47461,6 +47301,7 @@
 germanophobia.tk, 1
 germansoldiers.net, 1
 germanssky.de, 1
+germantownwi.gov, 1
 germantrip.tk, 1
 germany-board.tk, 1
 germanytravel.ga, 1
@@ -47493,6 +47334,7 @@
 gesentorno.tk, 1
 gesetz.tk, 1
 gesevi.com, 1
+gesica.cloud, 1
 gesmav-trier.de, 1
 gesnex.com, 1
 gessettirotti.it, 1
@@ -47503,8 +47345,6 @@
 gestionth.com, 1
 gestorehotel.com, 1
 gestorestecnologicos.com, 1
-gestorimob.com.br, 1
-gestorimobiliaria.com.br, 1
 gestormensajeria.com, 1
 gestsal.com, 1
 gestus.co, 1
@@ -47684,7 +47524,6 @@
 getyourphix.tk, 1
 getyoursite.ga, 1
 getyourstartcareers.com, 1
-geulah.org.il, 1
 geulis.tk, 1
 geus-okna.eu, 1
 gevelreinigingtiel.nl, 1
@@ -47761,6 +47600,7 @@
 gh16.com.ar, 1
 gha.st, 1
 ghada.blog, 1
+ghanabusiness.net, 1
 ghanaculture.tk, 1
 gharbala.com, 1
 ghazals.tk, 1
@@ -47825,10 +47665,8 @@
 giacomorosaldi.com, 1
 giakki.eu, 0
 gialupa.tk, 1
-giaminh.com, 1
 giancarlomarino.com, 1
 giangma.tk, 1
-giannademartini.com, 1
 giannifoti.it, 1
 gianproperties.com, 1
 giant-panda.com, 1
@@ -47919,6 +47757,7 @@
 gigawattz.com, 1
 giggletotz.co.uk, 1
 gigharborwa.gov, 1
+gigiena-ruk.ru, 1
 gigiscloud.servebeer.com, 1
 giglink.club, 1
 gigloog.tk, 1
@@ -48222,6 +48061,7 @@
 glenbeulahwi.gov, 1
 glencambria.com, 1
 glencarbide.com, 1
+glencarbonil.gov, 1
 glencoveny.gov, 1
 glendarraghbouncycastles.co.uk, 1
 glenhuntlyapartments.com.au, 1
@@ -48312,7 +48152,6 @@
 globalipaction.ch, 1
 globalisierung-fakten.de, 1
 globalitac.com, 1
-globalityinvestment.com, 1
 globalizationpedia.com, 1
 globalkwizz.tk, 1
 globalmasonryers.ga, 1
@@ -48402,7 +48241,6 @@
 glovementor.com, 1
 glowfic.com, 1
 glowmedspaencino.com, 1
-glowstone.net, 1
 glpreparation.com, 1
 glubbforum.de, 1
 glue.tk, 1
@@ -48477,6 +48315,7 @@
 gnaucke.com, 1
 gnawa-diffusion.tk, 1
 gnax.jp, 0
+gncsuplementos.com.br, 1
 gndmillwork.com, 1
 gnetwork.eu, 1
 gnezdo.tk, 1
@@ -48489,6 +48328,7 @@
 gnmlive.com, 1
 gnom.me, 1
 gnomania.ml, 1
+gnous.eu, 1
 gnrinfo.tk, 1
 gntfy.us, 1
 gnuand.me, 1
@@ -48548,7 +48388,6 @@
 gobarrelroll.com, 1
 gobi.tk, 1
 gobiernousa.gov, 1
-gobiz.com.my, 1
 goblackwood.co.uk, 1
 goblintears.com, 1
 gobouncy.co.uk, 1
@@ -48607,6 +48446,7 @@
 goergetown.tk, 1
 goerres2014.de, 1
 goetemp.de, 1
+goetheschule-giessen.de, 1
 goetic.space, 1
 goettinger-biergarten.de, 1
 goettinger-katzenschutz.de, 1
@@ -48901,7 +48741,6 @@
 goozp.com, 1
 gopass-dev.com, 1
 gopass.health, 1
-gopayz.com.my, 1
 gopet.shop, 1
 gopher.tk, 1
 gophoto.it, 1
@@ -49064,6 +48903,7 @@
 gougeaway.tk, 1
 gougeul.org, 1
 goukon.ru, 1
+goup.com.tr, 1
 gouplinkit.com, 1
 gourgouli.com, 1
 gourmetfestival.de, 1
@@ -49079,7 +48919,6 @@
 govisitcostarica.co.cr, 1
 govisitcostarica.com, 1
 govisitsandiego.com, 1
-govloans.gov, 1
 govno-site.tk, 1
 govnohosting.cf, 1
 govnosite.tk, 1
@@ -49154,6 +48993,7 @@
 gpz500s.tk, 1
 gq-magazine.co.uk, 1
 gqmstore.com.br, 1
+gqyyy.cc, 0
 gr.search.yahoo.com, 0
 gr8engineer2b.com, 1
 gr8ness.com, 1
@@ -49266,6 +49106,7 @@
 grandcapital.net, 1
 grandcapital.ru, 1
 grandchene.ch, 0
+grandchutewi.gov, 1
 grandcountydronepilot.com, 1
 grande.coffee, 1
 grandepresion.com, 1
@@ -49352,7 +49193,7 @@
 grasmark.com, 1
 grasp24.pl, 1
 graspingtech.com, 1
-grasscity.com, 1
+grasscity.com, 0
 grassenberg.de, 1
 grasshoppervape.com, 1
 grasso.io, 1
@@ -49870,6 +49711,7 @@
 grundskoleboken.ga, 1
 grundskoleboken.gq, 1
 grundskoleboken.tk, 1
+grundycountyil.gov, 1
 grundycountyiowa.gov, 1
 grunex.com, 0
 grunion.tk, 1
@@ -50106,7 +49948,6 @@
 guideo.ch, 0
 guides-peche64.com, 1
 guidesacademe.com, 1
-guidesetc.com, 1
 guidesiracusa.tk, 1
 guidesorbetiere.com, 1
 guidethailande.tk, 1
@@ -50217,7 +50058,6 @@
 gurumobile.tk, 1
 gurunanakdarvar.tk, 1
 gurunpa.com, 1
-gururi.com, 1
 guruworld.tk, 1
 gus.host, 1
 gus.moe, 1
@@ -50344,7 +50184,6 @@
 gymjokesers.ga, 1
 gymjokesest.ga, 1
 gymkirchenfeld.ch, 1
-gymlife.fr, 1
 gymnaserenens.ch, 0
 gymnasium-farmsen.de, 1
 gymnasium-hittfeld.de, 1
@@ -50631,6 +50470,7 @@
 haigekassa.ee, 1
 haigle.com, 1
 haigure.com, 1
+hails.info, 1
 hailstorm.nl, 1
 haimablog.ooo, 1
 hainanstar.cc, 1
@@ -50663,7 +50503,6 @@
 hairhumanextensions.tk, 1
 hairloss.com, 1
 hairlossadvice.tk, 1
-hairmitage.pl, 0
 hairphoto.tk, 1
 hairpins.tk, 1
 hairsalon-wish.com, 1
@@ -50731,7 +50570,6 @@
 halilova.tk, 1
 halilweb.tk, 1
 halilyagcioglu.tk, 1
-halkidikitransfers.eu, 1
 halkyon.net, 1
 hallaminternet.com, 1
 hallcopainting.com, 1
@@ -50756,7 +50594,6 @@
 halneff.ga, 1
 halo.fr, 1
 halocredit.pl, 1
-halodebki.pl, 1
 halogen.city, 1
 halogen.vip, 1
 halogenos.org, 1
@@ -50859,7 +50696,6 @@
 handwerkwebseiten.de, 0
 handy-page.tk, 1
 handy.lc, 1
-handyglas.com, 1
 handymanbibleers.ga, 1
 handymanbibleest.ga, 1
 handymanbypolli.com, 1
@@ -50954,6 +50790,7 @@
 haosygt.com, 1
 haotown.cn, 0
 haoyangmao8.com, 0
+haoyugao.com, 1
 haoz.tk, 1
 haozhang.org, 1
 haozhexie.com, 1
@@ -51158,7 +50995,6 @@
 harringtonca.com, 1
 harrisandharris.com.au, 1
 harrisconsulting.ie, 1
-harrisexteriors.com, 1
 harrisonar.gov, 1
 harrisoncountyms.gov, 1
 harrisoncountymschanceryclerk.gov, 1
@@ -51190,6 +51026,7 @@
 hartkampforkids.nl, 1
 hartleighclyde.com.au, 1
 hartlep.email, 1
+hartleycountytx.gov, 1
 hartlieb.me, 1
 hartmancpa.com, 1
 hartpsychologen.nl, 1
@@ -51251,7 +51088,6 @@
 hasilkeluaransgp.com, 1
 hasilocke.de, 1
 hasjob.co, 1
-haskovec.com, 1
 hasmoralsers.ga, 1
 hasmoralsest.ga, 1
 hassan-kuordish.tk, 1
@@ -51271,6 +51107,7 @@
 hatake.tk, 1
 hataonline.tk, 1
 hatarisecurity.co.ke, 1
+hatcher.cloud, 1
 hate.ga, 1
 hate.tk, 1
 hatemarga.tk, 1
@@ -51342,7 +51179,6 @@
 havetherelationshipyouwant.com, 1
 havohravo.com, 1
 havranek-its.at, 1
-hawaar.com, 1
 hawaiiafro.tk, 1
 hawaiianchoice.com, 1
 hawaiianlion.cf, 1
@@ -51393,6 +51229,7 @@
 hazardhub.com, 1
 hazaristan.asia, 1
 haze-productions.com, 1
+haze.network, 0
 haze.productions, 1
 hazelhof.nl, 1
 hazelkid.tk, 1
@@ -51465,8 +51302,6 @@
 hd9721.com, 1
 hdbits.org, 1
 hdc.cz, 1
-hdcenter.cc, 1
-hdcozinha.com.br, 1
 hddistribuidorahortifruti.com.br, 1
 hddrecovery.net.au, 1
 hdeaves.uk, 1
@@ -51659,6 +51494,7 @@
 healthhusky.ga, 1
 healthiercompany.com, 1
 healthiergenerations.co.uk, 1
+healthierweight.co.uk, 1
 healthimagine.ga, 1
 healthintergrity.ga, 1
 healthiraq.ga, 1
@@ -51799,7 +51635,6 @@
 healthworksmarden.com.au, 1
 healthy-map.com, 1
 healthy-shoko.com, 1
-healthy1lifestyle.com, 1
 healthyaging-digital.com, 1
 healthyalabama.tk, 1
 healthyankee.ga, 1
@@ -51816,7 +51651,7 @@
 healthyhours.tk, 1
 healthyindiana.tk, 1
 healthykansas.tk, 1
-healthykitchen101.com, 1
+healthykitchen101.com, 0
 healthyliving-healthnetwork.com, 1
 healthymaine.tk, 1
 healthymen.ml, 1
@@ -51876,7 +51711,6 @@
 hearty.sg, 1
 hearty.taipei, 1
 hearty.tech, 1
-hearty.tw, 1
 heartyapp.com, 1
 heartyapp.tw, 1
 heartycorp.com, 1
@@ -51890,7 +51724,7 @@
 heatherleysephotography.com, 1
 heathersmithcommercial.com, 1
 heatingequipment.tk, 1
-heaven-boutique.de, 1
+heaven-boutique.de, 0
 heaven.moe, 1
 heavenlybeauty.tk, 1
 heavenlyseals.com, 1
@@ -52023,6 +51857,7 @@
 heiwa-valve.co.jp, 0
 hejazultra.org, 1
 hejsupport.se, 1
+heka.ai, 1
 hekat.sk, 1
 hekate.com.mx, 1
 hekeki.com, 1
@@ -52035,7 +51870,6 @@
 helagotaland.gq, 1
 helali.me, 1
 helbreath.tk, 1
-helco.xyz, 1
 helden-spielen.de, 1
 heldenhalde.de, 1
 helder.tk, 1
@@ -52073,6 +51907,7 @@
 helios4.com, 1
 heliosbot.net, 1
 heliosnet.com, 1
+heliosvoting.org, 0
 helium24.net, 1
 heliumtech.tk, 1
 helix.am, 1
@@ -52090,7 +51925,6 @@
 hellersgas.com, 1
 hellfreak.tk, 1
 hellhavens.tk, 1
-hello-design.fr, 1
 hello-papaye.com, 1
 helloacm.com, 1
 helloafrica.ga, 1
@@ -52369,6 +52203,7 @@
 herpes-no.com, 1
 herr-webdesign.de, 1
 herrald-skeeleren.tk, 1
+herramientasbazarot.com, 1
 herranzramia.com, 0
 herrderzeit.de, 1
 herrenblut.tk, 1
@@ -52388,6 +52223,7 @@
 herrtxbias.net, 1
 herrtxbias.org, 1
 hersdorf-eifel.de, 1
+hersmartchoice.com, 1
 herthaloewen.tk, 1
 hertsbouncycastles.com, 1
 hertz.zone, 1
@@ -52468,7 +52304,6 @@
 hexxagon.com, 1
 hey.pw, 1
 heybaker.com.au, 1
-heyboldface.com, 1
 heybookmark.ga, 1
 heybookmark.gq, 1
 heybritney.tk, 1
@@ -52502,12 +52337,10 @@
 hfzlaw.com, 0
 hg.gg, 1
 hg.python.org, 1
-hg0086.la, 1
 hg170.cc, 1
 hg661.cc, 1
 hg71839.com, 1
 hg881.com, 1
-hgbcms.ca, 1
 hgc.solutions, 1
 hgc369.com, 1
 hgcityca.gov, 1
@@ -52730,7 +52563,6 @@
 himbamcky.com, 1
 himcy.ga, 1
 himecorazon.com, 1
-himekomi.com, 1
 himg.eu, 1
 himgdz.ru, 1
 himiko.cloud, 1
@@ -52801,6 +52633,7 @@
 hirel.gq, 1
 hireprofs.com, 1
 hiresteve.ca, 1
+hiretech.com, 1
 hireteen.com, 0
 hirevets.gov, 1
 hirevo.eu, 1
@@ -52875,7 +52708,6 @@
 hitechgr.eu, 1
 hitekcomputing.net, 1
 hitel.tk, 1
-hiteshbrahmbhatt.com, 1
 hiteshchandwani.com, 1
 hiteshjoshi.com, 1
 hitflow.fr, 1
@@ -52884,7 +52716,6 @@
 hitfm.tk, 1
 hitglish.com, 1
 hitham.tk, 1
-hithardnews.com, 1
 hithouse.tk, 1
 hitiles.tk, 1
 hititgunesi-tr.com, 1
@@ -52922,7 +52753,6 @@
 hivatal-info.hu, 1
 hivault.cf, 1
 hive101.info, 1
-hivehub.no, 1
 hivekey.eu, 1
 hivekey.io, 1
 hiveopolis.eu, 1
@@ -52955,6 +52785,7 @@
 hjelpemiddeldatabasen.no, 1
 hjertingfysioterapi.dk, 1
 hjes.com.ve, 1
+hjf.com.ar, 1
 hjkbm.cn, 1
 hjmag.com, 1
 hjort.land, 1
@@ -52987,7 +52818,6 @@
 hks-projekt.at, 1
 hks.pw, 1
 hkskhf.dk, 1
-hktech.com, 1
 hktkl.com, 1
 hktss.pp.ua, 1
 hkustmbajp.com, 1
@@ -53102,6 +52932,7 @@
 hocz.net, 1
 hodeis.ga, 1
 hodes.tk, 1
+hodgeman.gov, 1
 hodgephotography.com, 1
 hoe.re, 1
 hoeft-autolackierung.de, 1
@@ -53142,7 +52973,6 @@
 hogyerzedmagad.hu, 1
 hohenleimbach.de, 1
 hohenpoelz.de, 1
-hohm.in, 1
 hohma.tk, 1
 hohnet.com, 0
 hoikin.tk, 1
@@ -53214,6 +53044,7 @@
 hollybanks.net, 1
 hollyforrest.ca, 1
 hollyforrestphotography.ca, 1
+hollyspringsms.gov, 1
 hollywoodstars.tk, 1
 hollyworks.com, 1
 holmes.ie, 1
@@ -53230,6 +53061,8 @@
 holowaty.me, 1
 holoxplor.space, 1
 holstein.tk, 1
+holstphoto.com, 1
+holtcountyne.gov, 1
 holtslander.ca, 1
 holubowski.com, 1
 holundersberg.de, 1
@@ -53255,7 +53088,6 @@
 holyubofficial.net, 1
 holywhite.com, 1
 holywr.it, 1
-holz.nu, 1
 holzed.com, 1
 holzschutz-holzbearbeitung.de, 1
 holzspielzeug-shop.ch, 1
@@ -53280,7 +53112,6 @@
 homeadvice.ga, 1
 homeadvice.tk, 1
 homeandliving.it, 1
-homeautomated.com, 1
 homebank.kg, 1
 homebasedbusinessopportunity.tk, 1
 homebattle.ga, 1
@@ -53516,6 +53347,7 @@
 homeserver-kp.de, 1
 homeservices.ro, 1
 homesforaustralia.ga, 1
+homeshowoff.com, 1
 homesonic.ga, 1
 homespunhouse.tk, 1
 homestamp.ga, 1
@@ -53617,7 +53449,6 @@
 hoogstraatseschaakclub.tk, 1
 hoogveen.tk, 1
 hookahfoil.ru, 1
-hookahshop.lt, 1
 hookandloom.com, 1
 hookbin.com, 1
 hooked-on.co.za, 1
@@ -53822,6 +53653,7 @@
 hostpoint.ch, 1
 hostprior.ro, 1
 hostreputation.com, 1
+hosts.cf, 0
 hostux.network, 1
 hostwinds.com, 1
 hosuronline.com, 1
@@ -53839,6 +53671,7 @@
 hotbella.net, 1
 hotcandlestick.com, 1
 hotcars.com, 1
+hotchillibox.co.za, 1
 hotchillibox.com, 1
 hotcoder.tk, 1
 hotcursosrio.com.br, 1
@@ -53860,6 +53693,7 @@
 hotel-rosner.at, 1
 hotel-villaelaia.fr, 1
 hotelamgarnmarkt.at, 0
+hotelarevalo.com, 1
 hotelastor.com, 1
 hotelbiz.cf, 1
 hotelbiz.ga, 1
@@ -53874,7 +53708,6 @@
 hoteldimorae.it, 1
 hoteldvorik.ml, 1
 hotelelaphusabrac.com, 1
-hoteles4you.com, 1
 hotelevershine.com, 1
 hotelfloresta.tk, 1
 hotelfloridachaco.com, 1
@@ -53987,6 +53820,7 @@
 houseofaceonline.com, 1
 houseofhouston.com, 1
 houseofpertijs.com, 1
+houseofpheromones.com, 1
 houseofyee.com, 1
 houseplant.tk, 1
 houser.lu, 1
@@ -54180,6 +54014,7 @@
 hse-dev.com, 1
 hse-online.com, 1
 hsex.tv, 0
+hsg-lumdatal.de, 1
 hsimrall.com, 1
 hsivonen.com, 1
 hsivonen.fi, 1
@@ -54283,12 +54118,10 @@
 htxnet.biz, 1
 hu-a-u.com, 1
 hu.search.yahoo.com, 0
-hu2ty.net, 1
 huabanxs.com, 1
 huabianwa.com, 1
 huagati.com, 1
 huahinpropertylisting.com, 1
-huang.nu, 1
 huangguancq.com, 1
 huangh.com, 1
 huangjia71.com, 1
@@ -54518,7 +54351,6 @@
 hunngard.com, 1
 hunqz.com, 1
 hunstoncanoeclub.co.uk, 1
-huntcraft.ru, 1
 hunter-read.com, 1
 hunter.io, 1
 hunterjohnson.io, 1
@@ -54548,7 +54380,6 @@
 hupeng.me, 1
 huracanvillegas.com, 1
 hurbascooter.com, 1
-hurd.is, 1
 hurinkazan2020.com, 1
 hurleyhomestead.com, 1
 huron.tk, 1
@@ -54565,7 +54396,6 @@
 hushbabysleep.com, 1
 hushfile.it, 1
 husic.net, 0
-husk.house, 1
 husky-in-nood.tk, 1
 huskyeye.de, 1
 huskyinc.us, 0
@@ -54576,6 +54406,7 @@
 hustle.com, 1
 hustlerstate.tk, 1
 hutchh.com, 1
+hutchinsonmn.gov, 1
 huthacks.com, 1
 huto.ml, 1
 hutson-foods.com, 1
@@ -54599,6 +54430,7 @@
 hv-portal.de, 1
 hvanmeldung.de, 1
 hvanmeldung.online, 1
+hvcoksvote.gov, 1
 hvdbox.de, 0
 hvenetworks.cf, 1
 hveradistributions.com, 1
@@ -54681,7 +54513,6 @@
 hydroxide.net, 1
 hydrozone.fr, 1
 hyec.jp, 1
-hygh.tech, 1
 hygieneproclean.co.nz, 1
 hygo.com, 1
 hyk.me, 1
@@ -54853,12 +54684,14 @@
 i9397.com, 0
 i9721.com, 1
 i9728.co, 1
+i9elo.com, 1
 i9s.in, 1
 ia.net, 1
 ia1000.com, 1
 iabot.tk, 1
 iacitywebdesigner.com, 1
 iaco.li, 1
+iacono.com.br, 0
 iactu.info, 1
 iadore.tk, 1
 iadttaveras.com, 1
@@ -54874,6 +54707,7 @@
 ialps.cn, 1
 iam.lc, 1
 iam.soy, 1
+iamafricacampaign.org, 1
 iamanewme.com, 1
 iambhatti.tk, 1
 iamconnected.eu, 1
@@ -54883,7 +54717,6 @@
 iamjoshellis.com, 1
 iamlegend.ml, 1
 iamlife.com, 1
-iamlifeplan.com, 1
 iamlizu.com, 1
 iamlzh.com, 0
 iamokay.nl, 1
@@ -54972,7 +54805,6 @@
 ibloggospel.com, 1
 iblowdry.com, 1
 iblsoft.com, 1
-ibmr.br, 1
 ibodyiq.com, 1
 iboy1069.com, 0
 ibpegasus.tk, 1
@@ -55010,6 +54842,7 @@
 icbemp.gov, 0
 icc.kharkov.ua, 1
 iccorporateinteriors.com.au, 1
+icdp.org.ua, 1
 icebat.dyndns.org, 1
 iceberg.academy, 0
 iceberg.ddns.me, 1
@@ -55042,8 +54875,6 @@
 iceshadow.tk, 1
 icetiger.eu, 1
 icetravellers.com, 0
-icetwister.com, 1
-icewoman.net, 1
 icewood-bois.com, 1
 ich-finde-wikipedia-toll.tk, 1
 ich-hab-die-schnauze-voll-von-der-suche-nach-ner-kurzen-domain.de, 1
@@ -55104,6 +54935,7 @@
 icpc2016.in.th, 1
 icq-project.net, 1
 icq-world.tk, 1
+icreative.nl, 0
 icruise.com, 1
 ics.edu.hn, 1
 icst.tk, 1
@@ -55187,7 +55019,7 @@
 ideamiapublicidad.com, 1
 ideamount.com, 1
 idearumahidaman.com, 1
-ideasenfoto.com, 1
+ideasenfoto.com, 0
 ideashop.com, 1
 ideaweb.de, 1
 ideaweblab.com, 0
@@ -55200,7 +55032,6 @@
 idee-lq.net, 1
 ideeaanzee.tv, 1
 ideefactory.de, 1
-idegrafico.com, 1
 ideiasefinancas.com.br, 1
 ideice.gob.do, 1
 idemo.in, 1
@@ -55242,14 +55073,13 @@
 idgs.my, 1
 idheastudio.com, 1
 idhosts.co.id, 1
-idigiskill.com, 1
 idigovs.com, 1
 idinby.dk, 1
 idiomasdelmundo.tk, 1
 idiot.trade, 1
 idioteque.tk, 1
 idioumarou.com, 1
-idkidknow.com, 0
+idkidknow.com, 1
 idleleo.com, 1
 idlemon.net, 1
 idlethoughtsandramblings.com, 1
@@ -55295,7 +55125,6 @@
 ie-blog.net, 1
 ie.edu, 1
 ie.search.yahoo.com, 0
-iea-annex61.org, 1
 iechistore.com, 1
 ieeedeis.org, 1
 ieeesb.nl, 1
@@ -55452,7 +55281,6 @@
 igra-prestol.tk, 1
 igra3k.tk, 1
 igrajucirasti.ba, 1
-igramfollower.com, 1
 igramming.com, 1
 igranit.md, 1
 igraonicalara.tk, 1
@@ -55479,7 +55307,6 @@
 ihc.im, 1
 ihcprofile.com, 1
 ihdev.party, 1
-ihearmedical.com, 1
 iheartguys.com, 1
 iheartguys.net, 0
 iheartguys.org, 1
@@ -55504,7 +55331,6 @@
 ihsangans.my.id, 1
 ihsolution.in, 1
 ihtdenisjaccard.com, 1
-ihuan.me, 1
 ihydra.net, 1
 ii5197.co, 1
 ii6729.co, 1
@@ -55572,7 +55398,6 @@
 ikeyless.com, 1
 ikfloreer.nu, 1
 ikhtiarbersama.com, 1
-ikigaiapp.it, 1
 ikiler.com, 1
 ikimo9.com, 1
 ikinokori-marketing.com, 1
@@ -55626,7 +55451,6 @@
 ilawgix.com, 1
 ilazycat.com, 1
 ilbiglietto24.eu, 1
-ilc666.com, 1
 ilcourthelp.gov, 1
 ilctucson.com, 1
 ildepu.tk, 1
@@ -55713,7 +55537,6 @@
 iloft.xyz, 1
 iloli.name, 1
 ilona-france.tk, 1
-ilondres.es, 1
 ilonewolfs.com, 1
 ilonpolku.fi, 1
 ilouis.cn, 1
@@ -55825,6 +55648,7 @@
 imason.com, 1
 imawasn-consulting.com, 1
 imaya.tk, 1
+imbdagency.com, 1
 imbianchino.roma.it, 1
 imbit.tk, 1
 imboom.tk, 1
@@ -56340,7 +56164,6 @@
 inex.one, 1
 inexlog.fr, 1
 inexpensivecomputers.net, 1
-inextmovies.link, 1
 ineztheminiatureelephant.com, 1
 inf-fusion.ca, 1
 inf0sec.nl, 1
@@ -56395,7 +56218,6 @@
 infinitysportsandfitness.in, 1
 infinityvr.net, 1
 infinityweb.com.au, 1
-infirmiere-canadienne.com, 1
 infirmieredevie.ch, 0
 infirmiers-montpellier.fr, 1
 infivalle.gov.co, 1
@@ -56459,6 +56281,7 @@
 infodesigners.eu, 1
 infodesk.at, 1
 infodiscus.com, 0
+infoduv.fr, 1
 infofamouspeople.com, 1
 infofp.tk, 1
 infogai.tk, 1
@@ -56610,6 +56433,7 @@
 infranium.com, 1
 infranium.eu, 1
 infranium.info, 1
+infranium.net, 1
 infranium.org, 1
 infranotes.com, 1
 infranoto.com, 1
@@ -56643,6 +56467,7 @@
 infruction.com, 1
 infstudios.nl, 1
 infuse-mn.gov, 1
+ing, 1
 ing-buero-junk.de, 1
 ingalabs.hu, 1
 ingatlanjogaszok.hu, 1
@@ -56703,6 +56528,7 @@
 init3.cn, 1
 initblogger.com, 1
 initialization.tech, 0
+initiative-3d.org, 1
 initiative-digitalisierung-kmu.de, 1
 initq.net, 1
 initramfs.io, 1
@@ -56881,7 +56707,6 @@
 insertcoins.net, 1
 insertface.com, 1
 inserzioniticino.ch, 1
-insgesamt.net, 1
 inshapenutrition.com.br, 1
 inshared.nl, 1
 insho.fashion, 0
@@ -57067,6 +56892,7 @@
 inteapuestas.com, 1
 intechdaybcp.com, 1
 integ.jp, 1
+integra-belgium.be, 1
 integrahealth.com.mx, 1
 integralblue.com, 1
 integralcare.org, 1
@@ -57122,6 +56948,7 @@
 intellinetixvibration.com, 1
 intellio.pl, 1
 intellior.ag, 1
+intellitonic.com, 1
 intelly.kr, 1
 intelly.nl, 1
 intelly365.nl, 1
@@ -57226,7 +57053,6 @@
 internet-aukcion.info, 1
 internet-drive.tk, 1
 internet-gazeta.ga, 1
-internet-israel.com, 1
 internet-meesters.nl, 0
 internet-pornografie.de, 0
 internet-tv4u.tk, 1
@@ -57316,7 +57142,6 @@
 intimastoreatacado.com.br, 1
 intimznakomstvo.tk, 1
 intisar.ru, 1
-intiveo.com, 1
 intmissioncenter.org, 0
 into-the-mountain.com, 1
 intomsk.tk, 1
@@ -57426,7 +57251,6 @@
 investingdiary.cn, 1
 investingent.be, 1
 investingent.com, 1
-investinghent.be, 1
 investingindiscovery.com, 1
 investingtrader.net, 1
 investinturkey.com.tr, 1
@@ -57459,7 +57283,6 @@
 invetekno.com, 1
 invetep.sk, 1
 inviaworld.tk, 1
-invicti.com, 1
 inviertefacil.com.mx, 1
 invinoaustria.cz, 1
 invisible-college.com, 1
@@ -57519,7 +57342,6 @@
 ionlabs.kr, 1
 ionline.ml, 1
 ionovia.de, 1
-ionplesalexandru.com, 1
 ionstudio.pe, 1
 ionutnechita.ro, 1
 ionutnica.ro, 1
@@ -57529,6 +57351,7 @@
 iorgroup.org, 1
 ios11018.com, 1
 iosartstudios.gr, 1
+iosbankermyanmar.com, 1
 iosecurity.co.za, 1
 iosjailbreakiphone.com, 1
 ioslo.net, 1
@@ -57636,7 +57459,6 @@
 ippo-juku.com, 1
 iprash.com, 1
 iprcenter.gov, 1
-iprep.it, 1
 ipresent.com, 1
 iprice.co.id, 1
 iprice.hk, 1
@@ -58315,7 +58137,6 @@
 itmx.cc, 1
 itn.co.uk, 1
 itnota.com, 1
-itnow.ng, 1
 itnrd.com, 1
 itochan.jp, 1
 itogoyomi.com, 1
@@ -58400,7 +58221,6 @@
 itstartswithme.ca, 1
 itstatic.tech, 1
 itsuitsyou.co.za, 1
-itsundef.in, 1
 itsupport24.tk, 1
 itsupportguys.com, 1
 itsynergy.co.uk, 1
@@ -58419,6 +58239,7 @@
 itworks.nyc, 1
 itxartu.tk, 1
 itxcjm.top, 1
+itxn.cn, 0
 itzahammer.tk, 1
 itzamnaxelahomestay.tk, 1
 itzap.com.au, 1
@@ -58462,7 +58283,6 @@
 ivetazivot.cz, 1
 ivetdata.com, 0
 ivfausland.de, 1
-ivfmeds.com, 1
 ivi.cx, 1
 ivisa.ga, 1
 ivisitkorea.com, 1
@@ -58535,6 +58355,7 @@
 ixquick.com, 1
 ixquick.de, 1
 ixquick.eu, 1
+ixquick.fr, 1
 ixquick.info, 1
 ixquick.nl, 1
 ixtan.ga, 1
@@ -58572,6 +58393,7 @@
 izodiacsigns.com, 1
 izolyatsia.org, 1
 izone.ua, 1
+izonemart.com, 1
 izttech.com, 1
 izuba.info, 0
 izumi-ryokan.com, 1
@@ -58647,23 +58469,23 @@
 j9297.co, 1
 j9297.com, 1
 j9504.com, 1
-j9507.com, 1
-j9508.com, 1
-j9511.com, 1
+j9507.com, 0
+j9508.com, 0
+j9511.com, 0
 j9512.com, 1
 j9514.com, 0
-j9515.com, 1
-j9516.com, 1
-j9517.com, 1
-j95app.com, 1
+j9515.com, 0
+j9516.com, 0
+j9517.com, 0
+j95app.com, 0
 j95bb.com, 1
-j95cc.com, 1
-j95dd.com, 1
-j95ee.com, 1
-j95ios.com, 1
-j95ss.com, 1
-j95xx.com, 1
-j95zz.com, 1
+j95cc.com, 0
+j95dd.com, 0
+j95ee.com, 0
+j95ios.com, 0
+j95ss.com, 0
+j95xx.com, 0
+j95zz.com, 0
 j9721.com, 1
 j9728.co, 1
 ja-gps.com.au, 1
@@ -58743,10 +58565,10 @@
 jacksanalytics.com, 1
 jacksball.com, 1
 jacksfeestverhuur.nl, 1
-jackson-quon.com, 1
 jacksoncountyfl.gov, 1
 jacksonhu.com, 1
 jacksonville.gov, 1
+jacksonvilleal.gov, 1
 jacksorrell.com, 1
 jackspub.net, 1
 jackstone.tk, 1
@@ -58912,7 +58734,6 @@
 jamesevans.is, 1
 jamesgreenfield.com, 1
 jamesheald.com, 1
-jameshemmings.co.uk, 1
 jameshost.net, 1
 jameside.com, 1
 jamesj.me, 0
@@ -58926,7 +58747,6 @@
 jamesmilazzo.com, 1
 jamesmorrison.me, 1
 jamesnowlin.com, 1
-jamesonmelbye.com, 1
 jamesredmond.tk, 1
 jamesrobertson.sh, 1
 jamesross.name, 1
@@ -59068,7 +58888,6 @@
 jardigital.com.au, 1
 jardinderline.ch, 1
 jardineras.online, 1
-jardineriaon.com, 1
 jardinesimperiales.com, 1
 jaredeberle.org, 1
 jaredfernandez.com, 1
@@ -59169,7 +58988,6 @@
 javascriptlab.fr, 1
 javaweb.site, 1
 javaxxz.com, 1
-jave.asia, 1
 javedali.tk, 1
 javedhasrat.com, 1
 javfree.me, 1
@@ -59186,7 +59004,6 @@
 javitron.tk, 1
 javleech.com, 1
 javmobile.net, 1
-javocean.com, 1
 javorina.tk, 1
 javsod.top, 1
 jawharati.tk, 1
@@ -59422,7 +59239,6 @@
 jedilukmas.tk, 1
 jedipedia.net, 1
 jedwarddurrett.com, 1
-jeec.ist, 1
 jeek.jp, 1
 jeemain.org, 1
 jeep-diagnost.ml, 1
@@ -59478,6 +59294,7 @@
 jelleraaijmakers.nl, 1
 jellybeanbooks.com.au, 1
 jellyfin.spdns.eu, 1
+jellyfish.co, 1
 jellyfishlivewire.co.uk, 1
 jellynails.tk, 1
 jellypepper.com, 0
@@ -59597,10 +59414,15 @@
 jesmh.de, 1
 jesperandersson.tk, 1
 jespersen.tk, 1
+jesscharlie.com, 1
+jesse-charlie.com, 1
+jesse-charlie.net, 1
+jesse-charlie.org, 1
 jesseblum.com, 1
 jessecharley.com, 1
 jessecharli.com, 1
 jessecharlie.com, 1
+jessecharlie.info, 1
 jessecharlie.net, 1
 jessecharlie.org, 1
 jessecharlienaser.com, 1
@@ -59616,7 +59438,6 @@
 jessetrebil.com, 1
 jessetrebilfoundationsystems.com, 1
 jessevictors.com, 1
-jessgranger.com, 1
 jessica-weller.de, 1
 jessicabarends.nl, 1
 jessicabenedictus.nl, 0
@@ -59771,7 +59592,7 @@
 jiaty.com, 1
 jiaxitian.com, 1
 jiayi.life, 1
-jiazhao.ga, 1
+jiazhao.ga, 0
 jicaivvip.com, 1
 jichi.io, 1
 jichi.nz, 1
@@ -59881,7 +59702,6 @@
 jkarteaga.tk, 1
 jkbfabrics.com, 1
 jkbizsolutions.org, 1
-jkelder.com, 1
 jkest.cc, 1
 jkfindings.com, 1
 jkg.tw, 1
@@ -60051,7 +59871,6 @@
 jodokai.tk, 1
 joduska.me, 1
 jodyboucher.com, 0
-jodyshop.com, 1
 joe-st.de, 1
 joe262.com, 1
 joearodriguez.com, 1
@@ -60078,6 +59897,7 @@
 joellimberg.com, 1
 joellombardo.com, 0
 joelmunch.com, 1
+joelotu.com, 1
 joelsolkoff.com, 1
 joelving.dk, 1
 joepitt.co.uk, 0
@@ -60106,6 +59926,7 @@
 jogi-server.de, 1
 jogjacar.com, 1
 jogjakarta.tk, 1
+joglopark.com, 1
 jogorama.com.br, 0
 jogosdeanimais.org, 1
 jogoshoje.io, 1
@@ -60179,7 +60000,6 @@
 johnrosen.xyz, 1
 johnrosewicz.com, 1
 johnscalla.com, 1
-johnsegovia.com, 1
 johnsongenealogy.net, 1
 johnsonho.net, 1
 johnsons.tk, 1
@@ -60214,6 +60034,7 @@
 jojoshare.com, 1
 jojosplaycentreandcafeteria.co.uk, 1
 jokedalderup.nl, 1
+jokequebec.com, 1
 jokersro.tk, 1
 jokertv.ovh, 1
 jokesbykids.com, 1
@@ -60236,6 +60057,7 @@
 jolo.software, 1
 jolokia.ch, 1
 jomagus.de, 1
+jomibe.de, 1
 jomo.tv, 1
 jomsolat.tk, 1
 jon8rfc.homeip.net, 1
@@ -60262,7 +60084,6 @@
 jonaswitmer.ch, 1
 jonatan.gq, 1
 jonathan-apps.com, 1
-jonathan.us.com, 1
 jonathancarter.org, 1
 jonathandupree.com, 1
 jonathangagnetrainer.com, 1
@@ -60400,6 +60221,7 @@
 josefjanosec.com, 1
 josefottosson.se, 1
 josefranca.pt, 0
+josejimenezgonzalez.es, 1
 josejorques.tk, 1
 joseluisberrocal.tk, 1
 josemortellaro.com, 1
@@ -60415,7 +60237,6 @@
 josephmarino.net, 1
 josephojo.com, 1
 josephpinder.com, 1
-josephrichard.com, 1
 josephsniderman.com, 1
 josephsniderman.net, 1
 josephsniderman.org, 1
@@ -60491,7 +60312,6 @@
 joustsec.com, 1
 jouwbuis.nl, 1
 jouwpaardenbak.nl, 1
-jovani.com, 0
 jovenescontraelaburrimiento.tk, 1
 joviam.com, 1
 jovic.hamburg, 1
@@ -60505,6 +60325,7 @@
 joycosmetics.ch, 1
 joydivision.tk, 1
 joydream.tk, 1
+joyful.house, 1
 joyfulevents.tk, 1
 joyfulexpressions.gallery, 1
 joyfulhealthyeats.com, 1
@@ -60559,7 +60380,6 @@
 jpsinflatables.co.uk, 1
 jpslconsulting.ca, 1
 jpst.it, 1
-jpvermogensregie.com, 1
 jqlin.com, 1
 jqlsql.com, 1
 jquery.wtf, 1
@@ -60652,8 +60472,8 @@
 jttech.se, 1
 ju-edu.tk, 1
 ju-rex.eu, 1
+ju.io, 1
 juabcounty.gov, 1
-jualjuel.com, 1
 jualkambing.tk, 1
 juan23.edu.uy, 1
 juancarlosflores.tk, 1
@@ -60676,7 +60496,6 @@
 jub0bs.com, 1
 jubileum.online, 1
 jubileumfotograaf.nl, 1
-jubodarpan.in, 1
 jucca-nautica.si, 1
 juchheim-methode.de, 1
 juchit.at, 1
@@ -60721,6 +60540,7 @@
 jugendhackt.org, 1
 jugendsuenden.info, 1
 juggo.me, 1
+jugh.de, 1
 jugwallonie.be, 1
 juhakoho.com, 1
 juhanihakala.fi, 1
@@ -60835,6 +60655,7 @@
 junbread.win, 1
 junctioncitywisconsin.gov, 1
 jundongwu.com, 1
+juneaucountywi.gov, 1
 junefolkhogskola.se, 1
 junethack.net, 1
 junge-linke.tk, 1
@@ -60898,7 +60719,6 @@
 jurisprudentacedo.com, 1
 jurist.gq, 1
 juristech.io, 1
-juristique.fr, 1
 juristique.info, 1
 juristique.org, 1
 juristique.us, 1
@@ -60972,7 +60792,6 @@
 justpdf.cf, 1
 justpractice.ca, 1
 justquoteme.ga, 1
-justrighthsc.com, 1
 justsandro.tk, 1
 justsellmycar.com, 1
 justsome.info, 1
@@ -61002,7 +60821,6 @@
 jvega.me, 1
 jvianes.ddns.net, 1
 jvlfinance.cz, 1
-jvn.com, 1
 jvphotoboothhire.co.uk, 1
 jvsticker.com, 1
 jvwdev.nl, 1
@@ -61035,7 +60853,6 @@
 jxm.in, 1
 jxs.ch, 1
 jy11.de, 1
-jybrid.com, 1
 jydemarked.dk, 1
 jyk.me, 1
 jyllandsakvariet.dk, 1
@@ -61098,7 +60915,6 @@
 k7azx.com, 1
 k8.com, 1
 k801.com, 1
-k805.com, 1
 k805.net, 1
 k80608.com, 1
 k8082.com, 1
@@ -61118,11 +60934,9 @@
 k8268.net, 1
 k83333.com, 1
 k8368.com, 1
-k8368.net, 1
 k846.com, 1
 k85.app, 1
 k851.com, 1
-k8533.com, 1
 k86.app, 1
 k865.net, 1
 k86666.com, 1
@@ -61165,18 +60979,35 @@
 k88256.com, 1
 k88257.com, 1
 k88259.com, 1
+k88262.com, 1
 k88269.com, 1
+k88270.com, 1
+k88271.com, 1
+k88272.com, 1
+k88273.com, 1
+k88275.com, 1
+k88276.com, 1
+k88277.com, 1
+k88285.com, 1
 k88302.com, 1
 k88306.com, 1
 k88312.com, 1
 k88313.com, 1
 k88327.com, 1
+k885.co, 1
+k886.co, 1
+k88601.com, 1
+k88603.com, 1
+k88606.com, 1
+k88608.com, 1
+k88609.com, 1
 k8861.com, 1
 k88652.com, 1
 k88670.com, 1
 k88671.com, 1
 k88672.com, 1
 k88870.com, 1
+k889.co, 1
 k8892.com, 1
 k89.app, 1
 k89188.com, 1
@@ -61265,7 +61096,6 @@
 kadeatwood.com, 1
 kadenba.ch, 1
 kadence.tk, 1
-kadeshfoundation.org, 1
 kadet.net.ru, 1
 kadett-c-club-limburg.tk, 1
 kadhal-kirukkan.tk, 1
@@ -61405,9 +61235,9 @@
 kalender.goip.de, 1
 kalerne.tk, 1
 kalevlamps.co.uk, 1
+kalex.nl, 1
 kaleylocks.com, 1
 kalhufvudet.se, 1
-kali.training, 1
 kaliaa.fi, 1
 kalian.cz, 1
 kaliboairport.tk, 1
@@ -61512,7 +61342,6 @@
 kanal-tv-haensch.de, 1
 kanalasal.id, 1
 kanapa.gq, 1
-kanar.nl, 1
 kanariesite.tk, 1
 kanatsuki.tk, 1
 kanava.tk, 1
@@ -61573,7 +61402,6 @@
 kanui.ml, 1
 kanuvu.de, 1
 kanvasbaski.tk, 1
-kanyingba.com, 1
 kanz.jp, 1
 kanzashi.com, 1
 kanzlei-gaengler.de, 1
@@ -61627,7 +61455,7 @@
 karacommagere.com, 1
 karadenizhaberleri.tk, 1
 karajonline.tk, 1
-karalane.com, 1
+karalane.com, 0
 karamel69.ru, 1
 karamomo.net, 1
 karanastic.com, 0
@@ -61726,7 +61554,6 @@
 karniz.ml, 1
 karo.pc.pl, 1
 karoche.ga, 1
-karodos.pl, 1
 karoke.in, 1
 karolak.fr, 0
 karolaschinkel.de, 1
@@ -61867,7 +61694,6 @@
 kati0.com, 1
 katiebenson.tk, 1
 katiechai.xyz, 1
-katiegunnell.com, 1
 katiepears.net, 1
 katieriker.com, 1
 katieskandy.co.uk, 1
@@ -62026,8 +61852,6 @@
 kc-holzfaeller.de, 1
 kc-hrubeho.cz, 1
 kc-leeuwarden.tk, 1
-kc1hbk.com, 1
-kc3.moe, 1
 kc5mpk.com, 1
 kccargo.us, 1
 kcire.me, 1
@@ -62049,6 +61873,7 @@
 kdramaholic.com, 1
 kdrive.tk, 1
 kdw.cloud, 1
+kdyby.org, 0
 ke.fo, 1
 ke7tlf.us, 1
 ke8gtp-vf.herokuapp.com, 1
@@ -62129,6 +61954,7 @@
 kein-fidget-spinner-werden.de, 1
 kein-vergessen.tk, 1
 keinanung.nl, 1
+keinefilterblase.de, 1
 keio-formula.com, 1
 keiralewis.co.uk, 1
 keisaku.org, 1
@@ -62306,7 +62132,6 @@
 kernel.nz, 1
 kernelpanics.nl, 1
 kernelprogrammer.com, 1
-kerner.xyz, 1
 kernet.com.ar, 1
 kernkompas.nl, 1
 kerocristais.pt, 0
@@ -62325,7 +62150,6 @@
 kescher.site, 1
 kesef.org.il, 1
 kesen.news, 1
-kesen.wang, 1
 keshankang.com, 1
 keshausconsulting.com, 1
 keskeces.com, 1
@@ -62467,6 +62291,7 @@
 kf846.com, 1
 kf848.com, 1
 kf8686.com, 1
+kf88666.com, 1
 kf8879.com, 1
 kf8954.com, 1
 kf8955.com, 1
@@ -62645,7 +62470,6 @@
 kidzsmile.co.uk, 1
 kiebel.de, 1
 kiedys.net, 1
-kiehls.pt, 1
 kiekin.org, 1
 kiekko.pro, 1
 kiel-kind.de, 1
@@ -62673,6 +62497,7 @@
 kifid.nl, 1
 kigurumi-party.ru, 1
 kihi.news, 1
+kii91.com, 0
 kiinanharjakoirat.tk, 1
 kiinteistot-lidl.fi, 1
 kik.ee, 1
@@ -62689,6 +62514,7 @@
 kilimstyle.com, 1
 kilkennyaccountingservices.ie, 1
 kilkimzaibu.tk, 1
+kill.trade, 1
 killaraapartments.com.au, 1
 killborn.tk, 1
 killdeer.com, 0
@@ -62797,6 +62623,7 @@
 kingdoms.gg, 1
 kingfast.cc, 1
 kingfast.eu.org, 1
+kingfin.com, 1
 kingiescastles.co.uk, 1
 kingjamesbibleonline.org, 1
 kingjamesgospel.com, 1
@@ -63150,6 +62977,7 @@
 klanggut.at, 1
 klankenkast.nl, 1
 klapib.ee, 1
+klappgeschichten.de, 1
 klapty.com, 1
 klares-licht.de, 1
 klarika.com, 1
@@ -63281,6 +63109,7 @@
 kloudboy.com, 1
 kloza.tk, 1
 klpiano.my, 1
+kls-platform.com, 1
 klssn.com, 1
 klu.io, 1
 klub-zajmov.ga, 1
@@ -63376,7 +63205,6 @@
 know.cf, 1
 knowarth.com, 1
 knowdebt.org, 1
-knowit-now.com, 1
 knowledge-base.info, 0
 knowledgeforce.com, 1
 knowledgehook.com, 1
@@ -63526,10 +63354,10 @@
 kojip.com, 1
 kojipkgs.fedoraproject.org, 1
 koka-shop.de, 1
-kokankart.com, 1
 kokensupport.com, 1
 koketteriet.se, 1
 kokica.si, 1
+kokily.com, 1
 koko.news, 1
 kokoiroworks.com, 1
 kokomo.cloud, 1
@@ -63586,6 +63414,7 @@
 kolotsainaskoto.tk, 1
 kolpingsfamilie-vechta-maria-frieden.de, 1
 kolrami.com, 1
+koltiva.com, 1
 koluke.co, 1
 koluke.com, 1
 kolyapetrov.tk, 1
@@ -63648,6 +63477,7 @@
 koncertbooking.com, 1
 kondi.net, 1
 kondo-kougei.co.jp, 1
+kondomshop.org, 1
 kondou-butsudan.com, 1
 konducars.nl, 1
 konekthing.com, 1
@@ -63744,7 +63574,6 @@
 koood13.com, 1
 koop-bremen.de, 1
 kooplokaal.gent, 1
-kooponline.eu, 1
 kooranaps.wa.edu.au, 1
 kooratalk.ga, 1
 koot.nl, 1
@@ -64005,7 +63834,6 @@
 krasotki.ml, 1
 krasovsky.me, 1
 kratochvilovi.net, 1
-kratom-k.com, 1
 krattk.de, 1
 krauseent.com, 0
 krauskopf-it.de, 1
@@ -64126,7 +63954,6 @@
 kristiehill.com, 1
 kristikala.nl, 1
 kristina-lari.ru, 1
-kristinbailey.com, 1
 kristineskitchenblog.com, 1
 kristjanrang.eu, 0
 kristofba.ch, 1
@@ -64136,6 +63963,7 @@
 kriswauters.tk, 1
 kritical.es, 1
 kritikawebu.cz, 1
+kritikos.io, 1
 kriyayoga.fr, 1
 krizevci.info, 1
 krizialim.tk, 1
@@ -64360,10 +64188,12 @@
 ks9696.com, 1
 ks9888.com, 1
 ks99.app, 1
+ksabconline.gov, 1
 ksar.tk, 1
 ksauhs-med.com, 1
 kscarlett.com, 1
 kselenia.ee, 1
+kselien.gov, 1
 ksem.tk, 1
 kseniya.tk, 1
 kseniyakoroleva.tk, 1
@@ -64382,6 +64212,7 @@
 ksp-spb.com, 1
 kspndanautoba.id, 1
 ksradio.it, 1
+ksrevenue.gov, 1
 kssk.de, 1
 kst-dlvr.tk, 1
 kst-service.tk, 1
@@ -64390,9 +64221,11 @@
 ksu.kz, 1
 ksukelife.com, 1
 ksv-friesland.nl, 1
+ksvehicles.gov, 1
 ksvip02.com, 1
 ksvip09.com, 1
 ksw.hr, 1
+kswebtags.gov, 1
 kswork.life, 1
 kt-events.de, 1
 kt-motors.com, 1
@@ -64510,6 +64343,7 @@
 kumuwiki.de, 1
 kunaldesai.blog, 1
 kunashir.tk, 1
+kunda.ovh, 1
 kundenerreichen.com, 1
 kundenerreichen.de, 1
 kundenvertrag.de, 1
@@ -64573,7 +64407,6 @@
 kuritsa.tk, 1
 kurnia.tk, 1
 kurniadwin.to, 1
-kurniasihmandiri.com, 1
 kuroha.co.uk, 1
 kuroinu.jp, 1
 kuroisalva.xyz, 0
@@ -64608,6 +64441,7 @@
 kuschku.de, 1
 kuscu.de, 1
 kusdaryanto.web.id, 1
+kushfest.net, 1
 kushner-cpa.co.il, 1
 kushwanth.in, 1
 kushwanthreddy.com, 1
@@ -64726,7 +64560,6 @@
 kyle.place, 1
 kylebaldw.in, 0
 kyledrake.net, 1
-kylefennell.blog, 1
 kyleggiero.me, 1
 kylegutschow.com, 1
 kylehaka.la, 1
@@ -64841,7 +64674,6 @@
 labanskollermark.se, 1
 labassist.lt, 1
 labastidedesaromes.com, 0
-labavn.org, 1
 labcenter.com, 1
 labcoat.jp, 1
 labdiagnostica.com, 1
@@ -64961,6 +64793,7 @@
 ladanivabelgium.tk, 1
 ladanmokhtari.tk, 1
 ladbroke.net, 1
+ladeboks.dk, 1
 ladedu.com, 1
 ladelicateparenthese.com, 1
 ladenzeile.at, 1
@@ -65146,7 +64979,6 @@
 laled.ch, 0
 lalegria.tk, 1
 laleli.biz, 1
-lallybroch.com.au, 1
 lalokura.tk, 1
 lalucepulsata.it, 1
 lalucha.tk, 1
@@ -65167,7 +64999,6 @@
 lamaturitadidaniele.ml, 1
 lambauer.com, 1
 lambda.dance, 1
-lambda.sx, 1
 lambdajournal.com, 1
 lambdaof.xyz, 1
 lambertshealthcare.co.uk, 1
@@ -65556,7 +65387,6 @@
 laspequenassemillas.com, 1
 laspirale.tk, 1
 lasranas.es, 1
-lasrecetascocina.com, 1
 lasrecetasdeguada.com, 1
 lasse-boberg.tk, 1
 lasse-it.dk, 0
@@ -65710,6 +65540,7 @@
 lauresta.lv, 1
 lauriemilne.com, 1
 laurindale.tk, 1
+laurineprice.com, 1
 laurinhaepaulo.ga, 1
 lauriuc.sk, 1
 lausannedentiste.ch, 0
@@ -65718,7 +65549,6 @@
 laut.digital, 1
 lautremode.com, 1
 lauxlawyers.ch, 0
-lauxzahnheilkunde.de, 1
 lauzon-hitter.com, 1
 lavabit.com, 1
 lavabit.no, 1
@@ -65889,12 +65719,8 @@
 lc040.com, 1
 lc08080.com, 1
 lc10086.com, 1
-lc1588.com, 1
 lc18.vip, 1
-lc1800.com, 1
 lc1818.net, 1
-lc245.com, 1
-lc2500.com, 1
 lc3708.com, 1
 lc3710.com, 1
 lc3711.com, 1
@@ -65917,9 +65743,6 @@
 lc3743.com, 1
 lc3744.com, 1
 lc3745.com, 1
-lc3746.com, 1
-lc3747.com, 1
-lc3748.com, 1
 lc3751.com, 1
 lc3757.com, 1
 lc3759.com, 1
@@ -65940,13 +65763,11 @@
 lc3799.com, 1
 lc3801.com, 1
 lc3802.com, 1
-lc460.com, 1
 lc50000.com, 1
 lc5188.net, 1
 lc530.com, 1
 lc555.net, 1
 lc58588.com, 1
-lc5998.com, 1
 lc6.fun, 1
 lc60000.com, 1
 lc6601.com, 1
@@ -65955,13 +65776,13 @@
 lc6632.com, 1
 lc6656.com, 1
 lc6659.com, 1
+lc6665.com, 1
 lc6686.com, 1
 lc6698.com, 1
 lc68.net, 1
 lc68693.com, 1
 lc68694.com, 1
 lc68696.com, 1
-lc68699.com, 1
 lc68884.com, 1
 lc7.fun, 1
 lc8.com, 1
@@ -66011,18 +65832,11 @@
 lc8866.com, 1
 lc8868.net, 1
 lc8881.com, 1
-lc8882.com, 1
 lc8885.com, 1
 lc8887.com, 1
-lc8893.com, 1
 lc8898.net, 1
-lc8900.com, 1
-lc8905.com, 1
-lc8906.com, 1
 lc891.com, 1
-lc8910.com, 1
 lc8912.com, 1
-lc8914.com, 1
 lc8916.com, 1
 lc8917.com, 1
 lc8918.com, 1
@@ -66042,10 +65856,8 @@
 lc8a.com, 1
 lc8c.com, 1
 lc8dc26.com, 1
-lc8dc28.com, 1
 lc8guidance.com, 1
 lc8md77.com, 1
-lc9108.com, 1
 lc9158.com, 1
 lc9256.com, 1
 lc98.net, 1
@@ -66060,7 +65872,6 @@
 lc9950.com, 1
 lca.gov, 1
 lcacommons.gov, 1
-lcars-sv.info, 1
 lcdf.education, 1
 lce-events.com, 1
 lcemsami.gov, 1
@@ -66240,7 +66051,6 @@
 lebens-fluss.at, 1
 lebensinselparaguay.tk, 1
 lebensraum-fitness-toenisvorst.de, 1
-lebensraum-kurse.ch, 1
 lebesis.tk, 1
 lebihan.pl, 1
 leblanc.io, 1
@@ -66264,7 +66074,6 @@
 lechateaurestaurant.com, 1
 lechaudrondupertuis.ch, 1
 lecheng.in, 1
-lecheng08.com, 1
 lecheng2.com, 1
 lecheng3.com, 1
 lecheng5288.com, 1
@@ -66326,6 +66135,7 @@
 leefjongeren.nl, 1
 leekspin.ml, 1
 leekspin.tk, 1
+leelanautownshipmi.gov, 1
 leelaylay.com, 1
 leelou.wedding, 1
 leeman.nl, 1
@@ -66354,7 +66164,6 @@
 lefebvristes.com, 1
 lefebvristes.fr, 1
 lefilradio.fr, 1
-leflibustier.ru, 1
 leflox.cf, 1
 lefonddeloeil.com, 0
 lefreka.fr, 1
@@ -66512,6 +66321,7 @@
 lehnen.xyz, 1
 lehokolo.eu, 1
 lehti-tarjous.net, 1
+lehtinen.xyz, 0
 lehvyn.org, 1
 leibniz-gymnasium-altdorf.de, 1
 leicestermoneyman.com, 1
@@ -66581,7 +66391,6 @@
 lemfam.ru, 1
 lemilane.it, 1
 leminhduong.com, 1
-lemmi.no, 1
 lemmy.ca, 1
 lemni.top, 1
 lemoine.at, 1
@@ -66681,7 +66490,6 @@
 leonauto.de, 1
 leonbuitendam.nl, 1
 leoncss.ml, 1
-leondenard.com, 1
 leongalin.tk, 1
 leonhooijer.nl, 0
 leonidas-dovido.tk, 1
@@ -66711,7 +66519,6 @@
 leowkahman.com, 1
 lep.gov, 1
 lepalierjuridique.com, 1
-lepallec.tv, 1
 lepartiecomemoracoes.com.br, 1
 lepblog.tk, 1
 lepenetapeti.com, 1
@@ -66795,7 +66602,6 @@
 leshok.tk, 1
 lesin.tk, 1
 lesjardinsdemathieu.net, 0
-lesjardinsdubanchet.fr, 1
 leskoalasenvoyage.com, 1
 lesley.xyz, 1
 leslie.horse, 1
@@ -66840,7 +66646,6 @@
 leteckedarky.cz, 1
 letemps.ch, 1
 letempsdujasmin.fr, 1
-letempsdunefleur.be, 1
 letgodbetrue.com, 1
 lethalgaming.tk, 1
 lethosdesigns.co.uk, 1
@@ -66857,7 +66662,6 @@
 letranif.net, 1
 letrissimas.com, 1
 lets-go-acoustic.de, 0
-lets-ktai.jp, 1
 lets.ninja, 1
 lets.nu, 1
 letsagree.online, 1
@@ -66931,7 +66735,6 @@
 level5-drywall.com, 1
 level6.me, 1
 levelaccordingly.com, 1
-levelia.eu, 1
 levelninehvac.com, 1
 levels.one, 1
 levels3d.com, 1
@@ -67274,6 +67077,7 @@
 lifamily.xyz, 1
 lifanov.com, 1
 lifars.com, 1
+life-element.com, 1
 life-emotions.pt, 1
 life-experiment.com, 1
 life-in-hell.tk, 1
@@ -67434,6 +67238,7 @@
 lijana.rs, 1
 lije-creative.com, 1
 lijero.co, 1
+lijncoaching.nl, 1
 lijstbob.nl, 1
 lijstje.be, 1
 lijstje.nl, 1
@@ -67506,7 +67311,6 @@
 lilomatrixcorner.fr, 1
 lilosaludable.com, 1
 lilou-sportswear.com, 1
-lilousportswear.com, 1
 lilov.com.ua, 1
 lilpwny.com, 1
 liltv.media, 1
@@ -67622,6 +67426,7 @@
 line.co.nz, 0
 lineadmins.com, 1
 lineaesse5.it, 1
+lineageos.org, 1
 lineamortal.tk, 1
 linearmap.com, 1
 linebooks.cf, 1
@@ -67777,6 +67582,7 @@
 linux.farm, 1
 linux.fi, 1
 linux.im, 1
+linux.pizza, 1
 linux.study, 1
 linux3.org, 1
 linux4all.tk, 1
@@ -67804,7 +67610,6 @@
 linuxhub.ro, 0
 linuxincluded.com, 1
 linuxiuvat.de, 1
-linuxkompis.se, 1
 linuxlounge.net, 1
 linuxmalta.tk, 1
 linuxnetflow.com, 1
@@ -67936,7 +67741,6 @@
 litebit.eu, 1
 litebit.nl, 1
 litebitcdn.eu, 1
-litebits.com, 1
 litebooks.gq, 1
 litecache.de, 1
 litecloud.ml, 1
@@ -67958,7 +67762,6 @@
 litespeed-webserver.de, 1
 litespeedwebserver.com, 1
 litespeedwebserver.de, 1
-litfin.name, 1
 litfl.com, 1
 lithan.com, 1
 lithesalar.se, 1
@@ -68057,7 +67860,6 @@
 live9922.com, 1
 liveachievers.tk, 1
 liveagood.life, 1
-liveandinvestoverseas.com, 1
 liveanimations.org, 1
 livebandphotos.com, 1
 livebestbooks.gq, 1
@@ -68420,6 +68222,7 @@
 locksmithboksburg.co.za, 1
 locksmithdearborn.com, 1
 locksmithdickinson-tx.com, 1
+locksmithdriftwood.com, 1
 locksmithedenvale24-7.co.za, 1
 locksmithedmonds.com, 1
 locksmithforcarshoustontx.com, 1
@@ -68490,6 +68293,7 @@
 logancooper.jp, 1
 logancountyks.gov, 1
 logancountyky.gov, 1
+logancountyohio.gov, 1
 loganextermination.net, 1
 loganmarchione.com, 1
 loganparkneighborhood.org, 1
@@ -68508,10 +68312,12 @@
 logexplorer.net, 1
 logfile.at, 1
 logfile.ch, 1
+logger-phillipferreira.herokuapp.com, 1
 logibow.com, 1
 logic8.ml, 1
 logical-invest.com, 1
 logicchen.com, 1
+logiccircle.ir, 0
 logicdream.tk, 1
 logiciel-entreprise-seurann.fr, 1
 logicio.ch, 0
@@ -68580,7 +68386,6 @@
 loja351.com, 1
 lojaacampar.com.br, 1
 lojaapoio.com.br, 1
-lojacorbuccieats.com.br, 1
 lojadamimo.com.br, 1
 lojadanidrea.com.br, 1
 lojadarenda.com.br, 1
@@ -68621,7 +68426,6 @@
 lojaxo.com.br, 1
 lojix.com, 0
 lojj.pt, 1
-lokaal.org, 1
 lokal-speisen.de, 1
 lokalna.net, 1
 lokan.id, 1
@@ -68702,6 +68506,7 @@
 lomza.tk, 1
 lon-so.com, 1
 lona.io, 1
+lonasdigital.com, 1
 lonavla.tk, 1
 lonay.me, 0
 loncarlyonjenkins.com, 1
@@ -69105,6 +68910,7 @@
 lovemasjid.com, 1
 lovememories.cf, 1
 lovemen.cc, 1
+lovemesomegadgets.com, 1
 lovemethoda.com, 1
 lovemiku.info, 1
 lovemoon.tk, 1
@@ -69130,7 +68936,6 @@
 lovg.ren, 1
 lovin.ga, 1
 lovin.tk, 1
-lovingthermo.com, 1
 lovink.net, 1
 lovizaim.ru, 1
 lovlyhorses.tk, 1
@@ -69155,7 +68960,6 @@
 loxdonmarkets.com, 1
 loyaleco.it, 1
 loyaltech.ch, 1
-loyalty-connections.co.uk, 0
 loyaltyreviewers.ga, 1
 loyd.co, 1
 loyisa.cn, 1
@@ -69172,7 +68976,6 @@
 lpcom.de, 1
 lpdp.photo, 1
 lpfan.tk, 1
-lpgaclub.jp, 1
 lph.saarland, 1
 lphispano.tk, 1
 lpkosovo.tk, 1
@@ -69185,8 +68988,8 @@
 lqhi.cn, 1
 lr-expert.ru, 1
 lra-cloud.de, 1
+lrdo.net, 1
 lrfix.com, 1
-lriese.ch, 1
 lroc.com.au, 1
 lrs.lt, 1
 lrssystems.com, 1
@@ -69495,6 +69298,7 @@
 lumi.com, 1
 lumi.pw, 1
 lumien.net, 1
+lumieredesoy.com, 1
 lumierewithinspirato.com, 1
 luminaire-mobilier-design.be, 1
 luminaire.fr, 1
@@ -69509,7 +69313,6 @@
 lumoria.eu, 1
 lumos.gallery, 1
 lumpenrock.tk, 1
-lumpov.com, 1
 lumpy.ga, 1
 lums.se, 1
 lumsdens.ga, 1
@@ -69619,6 +69422,7 @@
 luuppi.fi, 1
 luv-scent.com, 1
 luv.asn.au, 1
+luv2watchmycam.com, 1
 luvare.com, 1
 luvbridal.com.au, 1
 luvey.com, 1
@@ -69698,6 +69502,7 @@
 lwis.me, 1
 lwisa.ma, 1
 lwl-foej-bewerbung.de, 1
+lwl.moe, 1
 lwnlh.com, 1
 lwsl.ink, 1
 lx-blog.cn, 1
@@ -69861,7 +69666,6 @@
 maahchepen.tk, 1
 maailm.tk, 1
 maaldrift.tk, 1
-maalexi.com, 1
 maaret.de, 1
 maarivpn.com, 1
 maartenderaedemaeker.be, 1
@@ -69994,7 +69798,6 @@
 maddistonevangelical.co.uk, 1
 maddreefer.com, 1
 made-dwell.com, 1
-made-in-auto.com, 1
 made-in-earth.co.jp, 1
 made-to-usb.com, 1
 made.md, 1
@@ -70030,6 +69833,7 @@
 madian.tk, 1
 madinina.tk, 1
 madirc.net, 1
+madisoncountyalema.gov, 1
 madisoncountyhelps.com, 1
 madisonent-facialplasticsurgery.com, 1
 madisonivy.space, 1
@@ -70076,7 +69880,6 @@
 maduracion.com, 1
 maduradas.info, 1
 maduradas.net, 1
-madurasfollando.online, 1
 madviewer.tk, 1
 madwarlock.com, 1
 mae-berlinistanbul.com, 1
@@ -70145,7 +69948,6 @@
 magenkompass.de, 1
 magenta-health.com, 1
 magentaize.net, 1
-magentoeesti.eu, 1
 magepro.fr, 1
 magescobd.com, 1
 magesy.blog, 1
@@ -70186,6 +69988,7 @@
 magicomotor.com, 1
 magicorama.com, 1
 magicpill.com.au, 1
+magicsms.pl, 1
 magicspaceninjapirates.de, 1
 magictable.com, 1
 magictallguy.tk, 1
@@ -70414,7 +70217,6 @@
 maisallianz.com, 1
 maisapanama.com, 1
 maiscelular.com.br, 1
-maisecom.com.br, 1
 maisempregonet.com, 1
 maisgasolina.com, 1
 maisie.nl, 1
@@ -70423,7 +70225,6 @@
 maison-haimard.fr, 1
 maisonanimale.com.br, 1
 maisondoree.be, 1
-maisondureau.fr, 1
 maisonmere.group, 1
 maisonpaulmier.fr, 1
 maisproduzida.com.br, 1
@@ -70489,9 +70290,6 @@
 makepro.net, 1
 makera.ga, 1
 makerdao.com, 1
-makermiles.com, 1
-makermiles.net, 1
-makermiles.org, 1
 makesenseofdata.co.uk, 1
 maketheneighborsjealous.com, 1
 maketodiet.com, 1
@@ -70636,6 +70434,7 @@
 malphisruul.de, 1
 malscan.com, 0
 malsignature.com, 1
+malsoftware.com, 1
 malta-firma.com, 1
 maltasite.tk, 1
 maltaultrastifo.tk, 1
@@ -70720,6 +70519,7 @@
 manaonetrading.com, 1
 manasakcijas.lv, 1
 manaspaul.tk, 1
+manateepao.gov, 1
 manatees.com.au, 1
 manatees.net, 1
 manav-it.de, 1
@@ -70737,6 +70537,7 @@
 mandai-st.jp, 1
 mandai-t.jp, 1
 mandala-book.tk, 1
+mandalatantra.com.br, 1
 mandanudes.ae, 1
 mandarinplay.tk, 1
 mandcbouncycastlehire.co.uk, 1
@@ -70798,6 +70599,7 @@
 manhattanchoralensemble.org, 1
 manhattandermatologistsnyc.com, 1
 manhattangastroenterology.com, 1
+manhattanks.gov, 1
 manhattanprimarycaredoctorsnyc.com, 1
 manhole.club, 1
 manhuagui.com, 1
@@ -70860,7 +70662,6 @@
 mansora.io, 1
 mansour.io, 1
 mansurov.tk, 1
-mansys.io, 1
 mantachiepharmacy.com, 1
 mantalak.com, 1
 mantalksmanrules.com, 1
@@ -70874,8 +70675,6 @@
 manti.by, 1
 mantor.org, 0
 mantra.pictures, 1
-mantul.top, 1
-manualidadeson.com, 1
 manuall.ae, 1
 manuall.co.uk, 1
 manuall.cz, 1
@@ -70909,7 +70708,6 @@
 manueljirado.tk, 1
 manuelosorio.me, 1
 manuelperujo.ch, 1
-manuelpinto.in, 1
 manuelraimo.cf, 1
 manuelrueger.de, 0
 manufacturedhomemoving.com, 1
@@ -70950,6 +70748,7 @@
 maplebgm.cc, 1
 maplegate.info, 1
 maplegrove.cf, 1
+maplegrovetownshipmi.gov, 1
 maplehome.tk, 1
 mapletime.com, 1
 maplewood.tk, 1
@@ -70964,7 +70763,6 @@
 maquetting.com, 1
 maquinariahosteleriaocasion.com, 1
 maquinariaspesadas.org, 0
-maquinasdecoserplus.com, 1
 maquinasperfectas.tk, 1
 maquinasquepiensan.tk, 1
 mar-eco.no, 1
@@ -71005,7 +70803,6 @@
 marcel-waldvogel.ch, 1
 marcelabarrozo.tk, 1
 marcelino.cf, 1
-marcelinofranchini.com, 1
 marcelinofranchini.eu, 1
 marcelinofranchini.info, 1
 marcelinofranchini.net, 1
@@ -71028,7 +70825,6 @@
 marchinghatters.tk, 1
 marchingnorth.com, 1
 marchukov.com, 1
-marcianoandtopazio.com, 1
 marcillacetfils.fr, 1
 marclange.net, 1
 marco-burmeister.de, 1
@@ -71073,6 +70869,7 @@
 marekkohn.tk, 1
 marekkorlak.com, 1
 marelijah.org, 1
+marengomi.gov, 1
 maresencial.com, 1
 marex.host, 1
 marfadelivery.tk, 1
@@ -71134,7 +70931,6 @@
 mariedanielle.it, 1
 mariehane.com, 1
 mariejulien.com, 1
-marielinepitre.com, 1
 mariella-sun.net, 1
 marielouise-oliwkiewicz.nl, 1
 marielouise.tk, 1
@@ -71142,6 +70938,7 @@
 mariereichl.cz, 1
 mariescountymo.gov, 1
 marieskyler.net, 1
+marietrap.ch, 1
 marijnfidder.nl, 1
 marijuanajobscannabiscareers.com, 1
 marijuanamed420.com, 1
@@ -71200,7 +70997,6 @@
 maritime-mea.com, 1
 maritlarsen.ml, 1
 maritlarsen.tk, 1
-marivalemotions.com, 1
 mariviolin.com, 1
 marix.ro, 1
 marizaikonomi.tk, 1
@@ -71440,6 +71236,7 @@
 martin-renze.de, 0
 martin-smith.info, 1
 martin-weil.de, 1
+martin.vet, 0
 martinaachen.tk, 1
 martinalonsovega.tk, 1
 martinassurfdepot.tk, 1
@@ -71579,11 +71376,11 @@
 maskinkultur.com, 1
 maskova.net, 1
 maslenka.tk, 1
-maslife365.com, 1
 maslin.io, 1
 maslow.tk, 1
 masmusica.tk, 1
 masmusicaradio.tk, 1
+masoncountyil.gov, 1
 masoncountywa.gov, 1
 masoncountywv.gov, 1
 masquerade.site, 0
@@ -71605,6 +71402,7 @@
 massagecupping.com, 1
 massagegunadvice.com, 1
 massagekartan.ga, 1
+massagetherapyschoolsinformation.com, 1
 massar.family, 1
 massazh.cf, 1
 massconsultores.com, 1
@@ -71743,9 +71541,9 @@
 mateuszkopytko.pl, 1
 mateuszmajewski.com, 1
 mateuszpilszek.pl, 1
+matewanwv.gov, 1
 mateworks.hu, 1
 matex-tokyo.co.jp, 1
-matgauthanky.com, 1
 matglobal.tech, 1
 matgodt.no, 1
 math-coaching.com, 1
@@ -71792,7 +71590,6 @@
 matildajaneclothing.com, 1
 matildeferreira.co.uk, 1
 matillat.ovh, 1
-matinataskincare.com, 1
 matipl.pl, 1
 matiu.tk, 1
 matjaz.it, 1
@@ -71832,6 +71629,7 @@
 matroskin.ml, 1
 matroussedetoilette.com, 1
 matsu-semi.com, 1
+matsu.gov, 1
 matsushima-kosodate.com, 1
 matt-brooks.com, 1
 matt-royal.com.cy, 1
@@ -71862,6 +71660,7 @@
 matterhorn-test.com, 1
 mattersource.com, 1
 mattessons.co.uk, 1
+mattferderer.com, 1
 mattforster.ca, 1
 mattga.ca, 1
 matthew-carson.info, 1
@@ -71974,6 +71773,7 @@
 mavenvets.co.uk, 1
 mavibrasil.com.br, 1
 maviepearl.net, 1
+mavon.com, 1
 mavrick.tk, 1
 mavro.cf, 1
 mavro.ga, 1
@@ -72079,7 +71879,6 @@
 maxp.info, 0
 maxpl0it.com, 1
 maxportal.tk, 1
-maxr1998.de, 1
 maxrandolph.com, 1
 maxratmeyer.com, 1
 maxrider.tk, 1
@@ -72145,7 +71944,6 @@
 mazdaofgermantown.com, 1
 mazdel.tk, 1
 maze.fr, 0
-mazenjobs.com, 1
 mazepa.ml, 1
 mazhab.tk, 1
 mazik.tk, 1
@@ -72153,7 +71951,6 @@
 mazloum.adv.br, 1
 mazternet.ru, 1
 mazurlabs.tk, 1
-mazury-invest.pl, 1
 mazzettigroup.com, 1
 mazzotta.me, 1
 mb-demo.net, 1
@@ -72194,7 +71991,6 @@
 mbrjun.cn, 1
 mbs-journey.com, 1
 mbsec.net, 1
-mbski.se, 1
 mbsync4supply.com, 1
 mburaks.com, 1
 mburns.duckdns.org, 1
@@ -72204,7 +72000,6 @@
 mc-dos.ru, 1
 mc-jobs.net, 1
 mc-pub.org, 0
-mc-revolution.ru, 1
 mc-teemocraft.tk, 1
 mc-web.se, 1
 mc.ax, 1
@@ -72236,6 +72031,7 @@
 mcdonalds.be, 1
 mcdonalds.design, 1
 mcdonaldwhsl.com, 0
+mcdowellcountyncboe.gov, 1
 mcdsg.net, 1
 mcduff.ga, 1
 mce.eu, 1
@@ -72286,9 +72082,10 @@
 mcleodcountymn.gov, 1
 mclinflatables.co.uk, 1
 mclmotors.co.uk, 1
+mclouds.ru, 0
 mclyr.com, 0
 mcmillanskiclub.com.au, 1
-mcmk.in, 1
+mcmk.in, 0
 mcnb.top, 1
 mcneill.io, 1
 mcnet.care, 1
@@ -72308,7 +72105,6 @@
 mcplayman.de, 1
 mcprocdn.com, 1
 mcregex.com, 1
-mcrn.jp, 1
 mcsa-usa.org, 1
 mcsdatum.co.uk, 1
 mcseboard.de, 1
@@ -72334,12 +72130,8 @@
 md-clinica.com.ua, 1
 md-progressistes.fr, 1
 md-service.net, 1
-md19lc8.com, 1
-md21lc8.com, 1
-md24lc8.com, 1
 md28.in, 1
 md5file.com, 1
-md5hashing.net, 1
 mdaemon.de, 1
 mdatc.gov, 1
 mdazo.net, 1
@@ -72359,6 +72151,7 @@
 mdir.tk, 1
 mditsa.de, 1
 mdiv.pl, 1
+mdkhorshedalam.com, 1
 mdl.co.ua, 1
 mdlayher.com, 1
 mdleom.com, 1
@@ -72753,19 +72546,6 @@
 med-colleges.com, 1
 med-line.cf, 1
 med-otzyv.ru, 1
-med-post.biz, 1
-med-post.co, 1
-med-post.com, 1
-med-post.net, 1
-med-post.org, 1
-med-postclinic.com, 1
-med-postdoctor.com, 1
-med-postdoctors.com, 1
-med-postemergency.com, 1
-med-posthealth.com, 1
-med-postmedical.com, 1
-med-postphysicians.com, 1
-med-postwellness.com, 1
 med-spravca.ml, 1
 med.tips, 1
 med360.at, 1
@@ -72854,6 +72634,7 @@
 mediathekview.de, 1
 mediation-mv.de, 1
 mediationculturelleclp.ch, 0
+mediatorzy.waw.pl, 1
 mediaukkies.nl, 1
 mediawax.be, 1
 mediaweb.com.ve, 1
@@ -72955,32 +72736,6 @@
 medovoe.ml, 1
 medpeer.co.jp, 1
 medpeer.jp, 1
-medpost.biz, 1
-medpost.co, 1
-medpost.info, 1
-medpost.me, 1
-medpost.mobi, 1
-medpost.tv, 1
-medpost.us, 1
-medpostcare.com, 1
-medpostclinic.com, 1
-medpostdoctor.com, 1
-medpostdoctors.com, 1
-medpostemergency.com, 1
-medpostexpresscare.com, 1
-medposthealth.com, 1
-medposthealthcare.com, 1
-medpostimmediatecare.com, 1
-medpostmedical.com, 1
-medpostphysicians.com, 1
-medposturgentcare.biz, 1
-medposturgentcare.co, 1
-medposturgentcare.com, 1
-medposturgentcare.info, 1
-medposturgentcare.net, 1
-medposturgentcare.org, 1
-medpostwalkincare.com, 1
-medpostwellness.com, 1
 medprozone.com, 1
 medreich.com, 1
 medrol.cf, 1
@@ -73073,7 +72828,6 @@
 megaelettrostimolatore.com, 1
 megafide.com.br, 1
 megafilez.tk, 1
-megaflix.nl, 1
 megaflowers.ru, 1
 megagifs.de, 1
 megaherz.tk, 1
@@ -73098,7 +72852,6 @@
 meganholliday.blog, 1
 meganmarston.cf, 1
 meganmarston.ga, 1
-meganreel.com, 1
 meganruggiero.com, 0
 megaparadise.ml, 1
 megapixel.cz, 1
@@ -73160,11 +72913,10 @@
 meierhofer.net, 1
 meiersmarkus.de, 1
 meigetsuen1980.com, 1
-meijburg.com, 1
 meijwebdesign.nl, 1
 meikampf.de, 1
 meikan.moe, 1
-meiksbar.de, 0
+meiksbar.de, 1
 meiler.cf, 1
 meilleur-casino-fiable.com, 1
 meilleur.info, 1
@@ -73219,7 +72971,6 @@
 mejorespatineteselectricos.es, 1
 mejorfiltrodeagua.com, 1
 mejorlimpiafondos.com, 1
-mejorwork.com, 1
 mejovonakowogov.gq, 1
 mekajen.com, 1
 mekaleskirit.tk, 1
@@ -73250,7 +73001,7 @@
 melanieschweiger.com, 1
 melanin.cf, 1
 melatonin.fun, 1
-melbar.com.au, 1
+melbar.com.au, 0
 melbet.com, 1
 melbet.ru, 1
 melbetapp.com, 1
@@ -73326,6 +73077,7 @@
 membershipservices.org.uk, 1
 memberstweets.com, 1
 memdoc.org, 1
+meme, 1
 meme.fi, 1
 meme.institute, 1
 memed.xyz, 1
@@ -73429,7 +73181,6 @@
 mentalpage.com, 1
 mentalproblems.tk, 1
 mentalsauce.tk, 1
-mentaltraining-fuer-musiker.ch, 1
 mentecuriosa.net, 1
 mentesinquietas.tk, 1
 menthiere.fr, 1
@@ -73551,7 +73302,6 @@
 mermaidboattrips.com, 1
 mermakov.info, 1
 mernau.co, 1
-mero.co, 0
 merojob.com, 1
 meronberry.jp, 1
 merpay.com, 1
@@ -73666,6 +73416,7 @@
 metalloprokat.market, 1
 metallosajding.ru, 1
 metalmaniac.tk, 1
+metalmonocle.com, 1
 metalnight.tk, 1
 metalpesado.tk, 1
 metalsoviet.tk, 1
@@ -73676,7 +73427,6 @@
 metalweaverscreations.com, 1
 metalworkingexpo.com, 1
 metamorfosis.cf, 1
-metanic.services, 1
 metanoia8295.com, 1
 metanumbers.com, 1
 metapeen.nl, 1
@@ -73715,7 +73465,6 @@
 meteoradar.ch, 1
 meteorapp.space, 1
 meteorites-for-sale.com, 1
-meteorologiaenred.com, 1
 meteosmit.it, 1
 meteosolutions.com, 1
 meteowiki.tk, 1
@@ -73915,7 +73664,6 @@
 miagexport.com, 1
 miah.top, 1
 mialma.live, 1
-mialquilerdecoches.com, 1
 miamibeachcommunitychurch.com, 1
 miamifl.casa, 1
 miamifl.homes, 1
@@ -73935,7 +73683,6 @@
 miatgent.be, 1
 miavierra.org, 1
 mibank.xyz, 1
-mibaso.com, 1
 mibeneficio.cl, 1
 mibh.de, 1
 miboulot.com, 1
@@ -74043,6 +73790,7 @@
 michelgolfier.ml, 1
 michelkok.tk, 1
 michellavat.com, 1
+michelledonelan.co.uk, 0
 michellelowery.com, 1
 michelletmc.com, 1
 michelletrachtenberg.tk, 1
@@ -74082,7 +73830,6 @@
 microdesic.com, 1
 microdots.de, 1
 microfinance-crimea.ru, 1
-microfusion.tw, 1
 microgreensworld.com, 1
 microjournal.xyz, 1
 microjovem.pt, 1
@@ -74094,6 +73841,7 @@
 micromind.io, 1
 micropigmentacaobh.com.br, 1
 micropigmentadordesucesso.com, 1
+micropigpets.com, 1
 microsoftedgeinsider.com, 1
 microtel2notch.tk, 1
 microtube.tk, 1
@@ -74182,7 +73930,6 @@
 miguelcolmenares.com, 1
 migueldemoura.com, 1
 migueldominguez.ch, 0
-miguelgaton.es, 1
 miguelito.tk, 1
 miguelmartinez.ch, 0
 miguelmenendez.pro, 1
@@ -74240,12 +73987,12 @@
 mikalikes.men, 1
 mike-bland.com, 1
 mike-burns.com, 1
+mike-estela.com, 1
 mike-et-pascale-sanger.com, 1
 mikeandemily.duckdns.org, 1
 mikebelanger.ca, 1
 mikeblog.site, 1
 mikeburns.tk, 1
-mikecameronyyc.com, 1
 mikecapson.com, 1
 mikecb.org, 1
 mikechasejr.tk, 1
@@ -74266,7 +74013,6 @@
 mikerichards.photos, 1
 mikerichards.pictures, 1
 mikerichardsphotography.com, 1
-mikesplumbingswfl.com, 1
 mikesystems.tk, 1
 miketabor.com, 1
 miketheuer.com, 1
@@ -74312,7 +74058,6 @@
 miku.bar, 1
 miku.cloud, 1
 miku.party, 1
-miku.ro, 1
 mikumiku.stream, 1
 mikupic.com, 1
 mikusa.xyz, 1
@@ -74453,7 +74198,6 @@
 minakov.pro, 1
 minakova.pro, 1
 minamassimo.org, 1
-minami.xyz, 1
 minamo.io, 1
 minandolacorrupcion.mx, 1
 minantavla.se, 0
@@ -74551,6 +74295,7 @@
 minesouls.fr, 1
 minestory.cf, 1
 minetrack.de, 1
+minetrack.no, 1
 minetracker.dk, 1
 mineturtle.de, 1
 minez-nightswatch.com, 0
@@ -74667,7 +74412,6 @@
 minto.cc, 1
 minton.systems, 1
 mintosherbs.com, 1
-mintrak2.com, 1
 mintse.com, 1
 minttang.cn, 0
 minu.link, 1
@@ -75083,10 +74827,12 @@
 mlada-moda.cz, 1
 mladamoda.sk, 1
 mladenovac.tk, 1
+mlan-server.de, 1
 mlarte.com, 1
-mlathrom.com, 1
+mlathrom.com, 0
 mlcfinvest.in, 1
 mlcnfriends.com, 1
+mlcreaciones.com, 1
 mlcrosoftonlline.cz, 1
 mlcrosoftonlline.ml, 1
 mlfilm.ml, 1
@@ -75222,12 +74968,12 @@
 mo-vvs.dk, 1
 mo.nl, 1
 mo2021.de, 1
-mo3.club, 1
 moa.moe, 1
 moabit.de, 1
 moabpapier.de, 1
 moabygg.se, 1
-moahmo.com, 1
+moahmo.com, 0
+moarcookies.com, 0
 moas.design, 1
 moas.photos, 1
 mob2con.com.br, 1
@@ -75290,6 +75036,7 @@
 mobiliteitsbedrijfstadgent.be, 1
 mobiliteitstadgent.be, 1
 mobility-events.ch, 1
+mobilityworks.eu, 0
 mobilize-auto-register.herokuapp.com, 1
 mobilize.us, 1
 mobilizon.fr, 1
@@ -75376,6 +75123,7 @@
 mode-musthaves.com, 1
 mode-tabita.be, 1
 modecaso.com, 1
+modehaus-marionk.de, 1
 model-nathalie.tk, 1
 model-school.tk, 1
 model.earth, 1
@@ -75499,6 +75247,7 @@
 mohammadhamed.tk, 1
 mohammadreza-bakhtiari.tk, 1
 mohammedalrifai.tk, 1
+mohanmekap.com, 1
 mohave.gov, 1
 moheatingcoolinghvac.com, 1
 mohela.com, 1
@@ -75544,6 +75293,7 @@
 mojzis.com, 1
 mojzis.cz, 1
 mojzisova.com, 1
+mokadev.com, 0
 mokamelhaa.ir, 0
 mokeedev.com, 1
 mokeedev.review, 1
@@ -75633,7 +75383,6 @@
 monad.io, 1
 monakasatmasr.com, 1
 monalyse.com, 1
-monamurlite.ru, 1
 monarch.security, 1
 monarchelectric.com, 1
 monarcjuexpo.ch, 1
@@ -75806,6 +75555,7 @@
 monteurzimmerfrei.de, 1
 montgomerycountyal.gov, 1
 montgomerycountyia.gov, 1
+montgomerycountypa.gov, 1
 montgomeryfirm.com, 1
 montgomeryohio.gov, 1
 montgomeryprobatecourtal.gov, 1
@@ -75824,6 +75574,7 @@
 montredeal.fr, 1
 montsaintaignan.fr, 1
 montserrat.ind.br, 1
+montuan.com.br, 1
 montychristie.com, 1
 montyvlogs.com, 1
 monveilleuretmoi.com, 1
@@ -75912,7 +75663,6 @@
 moov.tk, 1
 moovablestorage.com, 1
 moove-it.com, 1
-moovhl.com, 1
 mopak.tk, 1
 moparcraft.com, 1
 moparcraft.net, 1
@@ -75960,6 +75710,7 @@
 mordovia.gq, 1
 mordovia.tk, 1
 mordoviya.tk, 1
+mordrum.com, 1
 more-hikkoshi.com, 1
 more-terrain.de, 1
 moreal.co, 1
@@ -75997,7 +75748,6 @@
 morgen.news, 1
 morgner.com, 1
 mori-cdc.com, 1
-morifuji.me, 1
 morikami.org, 1
 morisakimikiya.com, 1
 moritoworks.com, 1
@@ -76104,6 +75854,7 @@
 mostlyharmless.at, 1
 mostlyoverhead.com, 1
 mostmost.tk, 1
+mostqbalwatanalqahirah.com, 1
 mosttaza.com, 1
 mosurist.tk, 1
 moswand.nl, 1
@@ -76181,7 +75932,6 @@
 motorcyclesafer.com, 1
 motorialab.com, 0
 motoridiricerca.tk, 1
-motornaolja.com, 1
 motoroilinfo.com, 0
 motorpointarenacardiff.co.uk, 1
 motorring.ru, 1
@@ -76235,6 +75985,7 @@
 mountairymd.gov, 1
 mountbatten.cz, 1
 mountbrowneguestcottage.ga, 1
+mountclemens.gov, 1
 mountknowledge.nl, 1
 mountpost.tk, 1
 mourabaha-dz.com, 1
@@ -76248,7 +75999,6 @@
 movahoteis.com.br, 1
 moval.gov, 1
 move-out-cleaning.co.uk, 1
-move.mil, 1
 moveltix.net, 1
 movember.com, 0
 movementdanceacademy.it, 1
@@ -76368,7 +76118,6 @@
 mr-bills.com, 1
 mr-coffee.net, 1
 mr-labo.jp, 1
-mr-nachhilfe.de, 1
 mr-wolf.nl, 0
 mr3.io, 1
 mraag.xyz, 1
@@ -76546,7 +76295,6 @@
 msz-fotografie.de, 1
 mszavodumiru.cz, 1
 mt-bank.jp, 1
-mt-caza.com, 1
 mt-tech.fi, 1
 mt-west.org, 1
 mt.run, 0
@@ -76645,6 +76393,7 @@
 muclan.tk, 1
 mucmail.de, 1
 mudanzasacuna.com.co, 1
+mudanzasjuniorh.com, 1
 mudanzasuiza.com.ec, 1
 mudanzasytransportesbh.com, 1
 mudaomundo.org, 1
@@ -76973,7 +76722,6 @@
 musicwear.cz, 1
 musicworkout.de, 1
 musigama.tk, 1
-musik-mentaltraining.ch, 1
 musik-vereinsbedarf.de, 1
 musiker.tk, 1
 musikerkontakt.dk, 1
@@ -77071,7 +76819,6 @@
 mv-wohnen.de, 1
 mvandek.nl, 1
 mvarsamis.com, 1
-mvbits.com, 1
 mvbug.com, 1
 mvccp.co.za, 1
 mvdmt.gov, 1
@@ -77101,6 +76848,7 @@
 mwcwallet.com, 1
 mwd.world, 1
 mwe.st, 1
+mwezi.org, 1
 mwicescholarship.com, 1
 mwinds.tk, 1
 mwine.sk, 1
@@ -77114,6 +76862,7 @@
 mwtdev.se, 1
 mwteh.ru, 1
 mwtj.com, 1
+mwtown.gov, 1
 mww.moe, 1
 mx-moto.fr, 1
 mx-quad.fr, 1
@@ -77209,6 +76958,7 @@
 myanmar-responsiblebusiness.org, 1
 myapexcard.com, 1
 myaquaterra.tk, 1
+myarcade.org, 0
 myartsjournal.com, 1
 myasb.club, 1
 myathena.ai, 1
@@ -77219,7 +76969,6 @@
 mybakkupakku.com, 1
 mybaran.tk, 1
 mybarcelona.tk, 1
-mybasementdoctor.com, 1
 mybathroom.tk, 1
 mybauingenieur24.de, 1
 mybb.com, 1
@@ -77281,8 +77030,8 @@
 mychurchisalive.org, 1
 mycinema.pro, 1
 mycircleworks.com, 1
-myclasscam.com, 1
-myclasscam.org, 1
+myclasscam.com, 0
+myclasscam.org, 0
 myclgnotes.com, 1
 myclimate.com, 1
 myclinicalstudybuddy.com, 1
@@ -77291,6 +77040,7 @@
 mycloudbits.me, 1
 mycloudhome.site, 1
 mycloudhome.top, 1
+mycloudhome.xyz, 1
 mycloudkey.net, 1
 mycloudsaas.com, 1
 mycodes.com.au, 1
@@ -77315,7 +77065,6 @@
 mycontactacuvue.fr, 0
 mycontactopticien.fr, 0
 mycontrolmonitor.com, 1
-mycookrecetas.com, 1
 mycoordinates.xyz, 1
 mycounterstrike.ru, 1
 mycoupons.com, 1
@@ -77336,7 +77085,6 @@
 mydarksite.tk, 1
 mydarkstar.net, 1
 mydatadoneright.eu, 1
-mydataprotected.com, 1
 mydating.be, 1
 mydaxio.com, 1
 mydaymark.com, 1
@@ -77524,7 +77272,6 @@
 myled.ml, 1
 mylegacyvip.com, 1
 mylene-chandelier.me, 1
-myles.digital, 1
 mylever.com, 1
 mylfca.com, 1
 mylife360mag.com, 1
@@ -77728,6 +77475,7 @@
 myrepublic.ph, 1
 myrepublic.rocks, 1
 myrepublic.run, 1
+myrepublic.tk, 1
 myrepublic.tv, 1
 myrepublic.tw, 1
 myrepublic.us.com, 1
@@ -77822,7 +77570,6 @@
 mysticmedia.net, 1
 mystinkefinger.de, 1
 mystorage.work, 1
-mystore24.eu, 1
 mystore24.us, 1
 mystorymonster.com, 1
 mystown.org, 1
@@ -77855,6 +77602,7 @@
 mytransmissionexperts.com, 1
 mytravelblog.de, 1
 mytravelguide.tk, 1
+mytreasury.gov, 1
 mytrendiya.com, 1
 mytribes.ru, 1
 mytribus.com, 1
@@ -77875,6 +77623,7 @@
 myupdatesystems.com, 1
 myupdateweb.com, 1
 myusagepayments.com, 1
+myvaccinefl.gov, 1
 myvacompany.com, 1
 myvalleymarketing.com, 1
 myvegasadvisor.com, 1
@@ -78074,7 +77823,7 @@
 naga-wedding.tk, 1
 naga.com, 1
 naga.gq, 1
-naga.im, 1
+naga.im, 0
 naganoziotech.com, 1
 nagaragem.com.br, 1
 nagashi.ma, 0
@@ -78328,6 +78077,7 @@
 naric.com, 1
 narin.cf, 1
 narindal.ca, 1
+narindal.ch, 1
 naringslivsala.se, 1
 nariohtools.com, 1
 naris-grc.com, 1
@@ -78707,7 +78457,9 @@
 ncea.net.au, 1
 ncegs.sk, 1
 ncem.gov, 1
+nchaf.gov, 1
 nchangfong.com, 0
+nchomeownerassistance.gov, 1
 nchponline.org, 1
 ncic.gg, 1
 ncjrs.gov, 1
@@ -78736,6 +78488,7 @@
 ncsbe-apps.gov, 1
 ncsc.gov.uk, 1
 ncsccs.com, 1
+ncsparta.gov, 1
 nctx.co.uk, 1
 ncua.gov, 1
 ncuc.gov, 1
@@ -78744,7 +78497,6 @@
 ndarville.com, 1
 ndbt.com, 1
 ndcpolipak.com, 1
-nder.be, 1
 ndev.tk, 1
 ndfirefighter.com, 1
 ndhlink.com, 1
@@ -78798,7 +78550,6 @@
 nebucadnezzer.tk, 1
 nebuchadnezzar.codes, 1
 nebul.at, 0
-nebulae.co, 1
 nebulise.com, 1
 nebuso.com, 1
 nec-x.com, 1
@@ -78887,6 +78638,7 @@
 neht.xyz, 1
 nehta.gov.au, 1
 neide.ga, 1
+neighbor.co.il, 1
 neighborhood-threat.tk, 1
 neighborhoodelectricwa.com, 1
 neighborshop.de, 1
@@ -78981,7 +78733,7 @@
 neno.io, 1
 neo-novarion.com, 1
 neo1.com, 1
-neo2k.dk, 1
+neo2k.dk, 0
 neo2shyalien.eu, 0
 neoaviation.ir, 1
 neobits.nl, 1
@@ -79094,6 +78846,7 @@
 neropiceno.tk, 1
 neroshana.com, 1
 nerot.eu, 1
+nerpa-club.ru, 1
 nert.gq, 1
 nerta.ro, 1
 nertus.ua, 1
@@ -79198,7 +78951,6 @@
 netfuture.ch, 1
 netgaming.de, 1
 netgen.co.za, 1
-netgroupsa.com, 1
 netguide.co.nz, 1
 nethack.ninja, 1
 nethackwiki.com, 1
@@ -79308,6 +79060,7 @@
 netwidow.com, 1
 netwire.tk, 1
 netwiseprofits.com, 1
+networds.ro, 1
 networg.cz, 1
 networg.pl, 1
 network-midlands.co.uk, 1
@@ -79358,6 +79111,7 @@
 netzona.org, 1
 netzspielplatz.de, 0
 netzsv.website, 1
+netztest.at, 1
 netzvieh.de, 1
 netzwerk-lq.com, 1
 netzwerk-sozialliberal.de, 1
@@ -79432,7 +79186,6 @@
 new-boiler-prices.co.uk, 1
 new-jersey-online-casinos.com, 1
 new-medic.com, 1
-new-ms.com, 1
 new-mvp.com, 1
 new-process.ch, 1
 new-process.com, 1
@@ -79455,7 +79208,6 @@
 newbackup.ml, 1
 newbasemedia.us, 1
 newbeginningsresale.com, 1
-newbernpost539.com, 1
 newberryfl.gov, 1
 newbies.tk, 1
 newbietech.cn, 0
@@ -79723,6 +79475,7 @@
 nextprotocol.tech, 1
 nextpup.net, 1
 nextracker.com, 1
+nextrader.guru, 0
 nextrasp.it, 1
 nextrec.site, 1
 nextrend.co, 1
@@ -79737,6 +79490,7 @@
 nextwab.com, 1
 nextworldcoding.ga, 1
 nexty6.com, 1
+nexus, 1
 nexus-start.de, 1
 nexus-vienna.at, 1
 nexusbyte.de, 1
@@ -79821,7 +79575,6 @@
 nguoimuahangmy.com, 1
 nguru.net, 1
 ngutek.com, 1
-nguyencucthanh.com, 1
 nguyendiep.com, 1
 nguyenfamily.tk, 1
 nguyenminhhung.com, 1
@@ -79945,6 +79698,7 @@
 nichijou.org, 1
 nicholasperkins.io, 1
 nicholasquigley.com, 1
+nicholasruddick.com, 1
 nicholaswilliams.net, 1
 nicholshydroseeding.com, 1
 nicht-blau.de, 1
@@ -79990,7 +79744,6 @@
 nickserve.org, 1
 nickstories.de, 1
 nicktamin.de, 1
-nicktheitguy.com, 1
 nickwasused.de, 1
 nickwasused.ga, 1
 nickwasused.gq, 1
@@ -80251,6 +80004,7 @@
 ningwei.net, 1
 niniko.tk, 1
 ninja-corner.tk, 1
+ninjacomputing.com, 1
 ninjamagic.tk, 1
 ninjan.co, 1
 ninjasproxy.com, 1
@@ -80291,7 +80045,6 @@
 niqex.com, 1
 nirada.info, 1
 nirhub.ru, 1
-nirjonmela.com, 1
 nirjonmela.net, 1
 nirmalroy.ml, 1
 nirudo.me, 1
@@ -80407,7 +80160,6 @@
 nlyfeue.gq, 1
 nlyvey.com, 1
 nm.cx, 1
-nm2d.nl, 1
 nmb.gov, 1
 nmcep.net, 1
 nmd.so, 1
@@ -80421,7 +80173,6 @@
 nmu.university, 1
 nmx.moe, 1
 nn-vol.ga, 1
-nn0.net, 1
 nn01.cc, 1
 nn01.com, 1
 nn04.org, 1
@@ -80433,6 +80184,7 @@
 nn9397.com, 0
 nn9721.com, 0
 nn9728.co, 1
+nna774.net, 1
 nndfn.com, 1
 nnews.tk, 1
 nnkkserver02.ddns.net, 1
@@ -80543,6 +80295,7 @@
 noiglosujemy.com.pl, 1
 noiglosujemy.pl, 1
 noincludesubdomains.preloaded.test, 0
+noinghene.com, 1
 noirland.co.nz, 1
 noirpvp.com, 1
 noiseandheat.com, 1
@@ -80599,7 +80352,6 @@
 nomifensine.com, 1
 nomik.xyz, 1
 nomio.com, 1
-nomo.my, 1
 nomoondev.azurewebsites.net, 1
 nomsing.tk, 1
 nomsy.net, 1
@@ -80715,6 +80467,7 @@
 noriel.ro, 1
 norikazumatsuno.tk, 1
 noris.de, 0
+noriskit.nl, 1
 noritakechina.com, 1
 normaculta.com.br, 1
 normalady.com, 1
@@ -80750,7 +80503,6 @@
 northbrisbaneapartments.com.au, 1
 northcharlestonsc.gov, 1
 northcoastlabs.com, 1
-northconsulting.fr, 1
 northcountykiaparts.com, 1
 northcreekresort.com, 1
 northcreekresortblue.ca, 1
@@ -80768,6 +80520,7 @@
 northernpowertrain.com, 1
 northernselfstorage.co.za, 1
 northfayettepa.gov, 1
+northfayettepapolice.gov, 1
 northfinance.dk, 1
 northflightaeromed.org, 1
 northhampton-nh-pd.gov, 1
@@ -80863,7 +80616,6 @@
 notariuszprzybylowicz.pl, 1
 notariuszsych.pl, 1
 notarkrauss.de, 1
-notary24.ru, 1
 notaryassistant.com, 1
 notbolaget.se, 1
 notboring.co.uk, 1
@@ -80933,16 +80685,13 @@
 notonprem.com, 1
 notora.tech, 1
 notoriousdev.com, 1
-nototema.com, 1
 notre-planete.info, 1
 notrefuse.tk, 1
 notrero13.com, 1
 notresiteduvercors.tk, 1
 notsafefor.work, 1
 nottinghammoneyman.com, 1
-nottres.com, 1
 notube.net, 1
-noty.tech, 1
 notyouraverageamerican.com, 0
 nou9ta.tk, 1
 noudjalink.nl, 1
@@ -81067,7 +80816,6 @@
 nowtricity.com, 1
 nowzarimd.com, 1
 noxi.ga, 1
-noxlogic.nl, 1
 noxomusic.com, 1
 noxx.global, 1
 noxx.solutions, 1
@@ -81107,8 +80855,8 @@
 nrail.eu, 1
 nrbbs.net, 1
 nrbpublishing.com, 1
+nrd.gov, 1
 nrd.li, 1
-nrdigitalbranding.com, 1
 nrdstd.io, 1
 nrealsport.com, 1
 nrev.ch, 0
@@ -81231,6 +80979,7 @@
 nudevotion.com, 1
 nudge.ai, 1
 nudo.tk, 1
+nuecescountytx.gov, 1
 nuel.cl, 1
 nuestrasdanzashn.tk, 1
 nuestratecnologia.com, 1
@@ -81282,7 +81031,6 @@
 numericall.gq, 1
 numerik-games.ch, 0
 numeritelefonici.it, 1
-numero-aleatorio.com, 1
 numero1.ch, 0
 numero1.tk, 1
 numerobis.tk, 1
@@ -81359,7 +81107,6 @@
 nutri-spec.me, 1
 nutriciametabolics-shop.de, 1
 nutriclub.co.id, 1
-nutridieta.com, 1
 nutrienti.eu, 1
 nutrifyyourself.com, 1
 nutrimedcn.com, 1
@@ -81434,7 +81181,6 @@
 nwwnetwork.net, 1
 nx42.pw, 1
 nxedge.com, 1
-nxgn.io, 1
 nxinfo.ch, 0
 nxit.ca, 1
 nxlogis.kr, 1
@@ -81469,6 +81215,7 @@
 nycu.moe, 1
 nydig.com, 1
 nydnxs.com, 0
+nyecountynv.gov, 1
 nyerjachioval.hu, 1
 nyerjamilkaval.hu, 1
 nyerjazoreoval.hu, 1
@@ -81705,6 +81452,7 @@
 obsproject.com, 1
 obsuzhday.com, 1
 obtima.org, 1
+obu4alka.ru, 0
 obuchowicz.pl, 1
 obuhov.ml, 1
 obuhov.tk, 1
@@ -81897,7 +81645,6 @@
 odziezrobocza.pl, 1
 odzyskaniedomeny.pl, 1
 odzywianie.info.pl, 1
-oe-boston.com, 1
 oe0fcdncxjpdd05b.myfritz.net, 1
 oe2018.gov.pt, 1
 oe2019.gov.pt, 1
@@ -81926,10 +81673,10 @@
 oestemc.com.br, 1
 oesterbaron.nl, 1
 oetzies-quiz.com, 1
-oevenezolano.org, 1
 oevkg.at, 1
 of-sound-mind.com, 1
 of2106.dnsalias.org, 1
+of2m.fr, 1
 ofallonil.gov, 1
 ofaqim.city, 1
 ofasoft.com, 1
@@ -81984,6 +81731,8 @@
 officemovepro.com, 1
 officert.ga, 1
 officevibe.com, 1
+official-sensitive.co.uk, 1
+official-sensitive.org, 1
 officialhazalturesan.tk, 1
 officina.roma.it, 1
 officina.tk, 1
@@ -82031,6 +81780,7 @@
 ogfarms.in, 1
 oggw.us, 1
 ogis.gov, 1
+ogkw.de, 1
 oglecountyil.gov, 1
 oglen.ca, 1
 ogmworld.tk, 1
@@ -82053,6 +81803,7 @@
 ohartl.de, 0
 ohayosoro.me, 1
 ohbabybean.com, 1
+ohchouette.com, 1
 ohd.dk, 1
 oheila.com, 1
 ohentpay.com, 1
@@ -82106,6 +81857,7 @@
 oilsan.com, 1
 oimexico.tk, 1
 oinky.ddns.net, 1
+oirealtor.com, 1
 oisabre.com, 1
 oisd.nl, 1
 oiseaux-mania.com, 1
@@ -82289,6 +82041,7 @@
 olgcc.net, 1
 olgiati.org, 0
 olgierdlewandowski.pl, 1
+olgui.net, 0
 olgun.eu, 1
 olhcparish.net, 1
 olibomb.cc, 1
@@ -82308,6 +82061,7 @@
 olivemultispecialist.com, 1
 oliveoil.bot, 1
 oliveoil.pro, 1
+oliveoilschool.org, 1
 oliveoilshop.com, 1
 oliveoiltest.com, 1
 oliveoiltimes.com, 1
@@ -82371,6 +82125,7 @@
 olsh-hilltown.com, 1
 olson25.org, 1
 olsonproperties.com, 1
+oluchiedmundmusic.com, 1
 oludeniz.tk, 1
 olustvere.edu.ee, 1
 olxdir.tk, 1
@@ -82400,7 +82155,6 @@
 omangrid.com, 1
 omanhr.cf, 1
 omanko.porn, 0
-omaosurveys.org, 0
 omarans.com, 1
 omarbaba.shop, 1
 omarh.net, 1
@@ -82454,6 +82208,7 @@
 omniaintranet.dk, 1
 omniaintranet.se, 1
 omniarch.se, 1
+omniasl.com, 0
 omniatv.com, 1
 omniballot.us, 1
 omnibot.tv, 1
@@ -82527,14 +82282,13 @@
 ondiet.biz, 1
 ondoorgrond.tk, 1
 ondrej.org, 1
-ondrejbudin.cz, 1
+ondrejbudin.cz, 0
 ondrejhoralek.cz, 1
 ondrejsramek.cz, 1
 ondrejvasicek.cz, 1
 one-clue.com, 1
 one-cozmic.com, 1
 one-host.ga, 1
-one-million-places.com, 1
 one-news.net, 0
 one-pixel.tk, 1
 one-resource.com, 1
@@ -82853,7 +82607,7 @@
 ontdekhetzelf.nu, 1
 onthe.network, 1
 ontheballbuilding.com.au, 1
-onthecheap.store, 1
+onthecheap.store, 0
 onthegosystems.com, 1
 onthegreen.golf, 1
 onthesocials.com.au, 1
@@ -82866,7 +82620,6 @@
 ontwerpdenkers.nl, 1
 onurer.net, 1
 onvey.io, 1
-onvirt.de, 1
 onvori.com, 1
 onvori.de, 1
 onvousment.fr, 1
@@ -82960,7 +82713,7 @@
 openarch.nl, 1
 openarchivaris.nl, 1
 openbayes.blog, 1
-openbayes.network, 1
+openbayes.com, 1
 openbayesstatus.com, 1
 openbeecloud.com, 1
 openblox.org, 1
@@ -83021,6 +82774,7 @@
 openrainbow.org, 1
 openre.site, 1
 openrealestate.co, 1
+openresearch.amsterdam, 1
 openreview.net, 1
 openroademail.com, 1
 openrtm.org, 1
@@ -83056,6 +82810,7 @@
 openwaveguide.de, 1
 openwifi.gr, 1
 openwrt-dist.tk, 1
+opera.im, 1
 operacdn.com, 1
 operacionlimpieza.com, 1
 operad.fr, 1
@@ -83100,14 +82855,10 @@
 oportaln10.com.br, 1
 oportunidadeganhos.tk, 1
 opos.cf, 1
-oposicionesapolicialocal.es, 1
 oposicionescorreos.es, 1
-oposicionescorreos.info, 1
 oposicionescorreos.net, 1
-oposicionesdejusticia.org, 1
 oposicionesjusticia.info, 1
 oposicionesprofesores.tk, 1
-oposicionesycursos.com, 1
 opp.moe, 1
 oppabet.com, 1
 oppada.com, 1
@@ -83163,7 +82914,6 @@
 optimale.co.uk, 1
 optimall.tk, 1
 optimalrehab.se, 1
-optimalsetup.com, 1
 optimaner.pl, 1
 optimausa.com, 1
 optimed.tk, 1
@@ -83196,7 +82946,6 @@
 optisell.ga, 1
 optitaxes.com, 1
 optizym.de, 1
-optm.us, 1
 optmos.at, 1
 optoms.tk, 1
 optoutday.de, 1
@@ -83272,7 +83021,6 @@
 orcas.tk, 1
 orcawiki.nl, 1
 orchardnh.org, 1
-orchardscribe.com, 1
 orchestra.tk, 1
 orchideenettoyage.com, 1
 orchidhouse.sk, 1
@@ -83374,6 +83122,7 @@
 orientravelmacas.com, 1
 oriflamesamara.tk, 1
 oriflameszepsegkozpont.hu, 1
+orifonline.ro, 1
 origami.to, 1
 origamiking.wiki, 1
 origenarts.com, 1
@@ -83561,7 +83310,6 @@
 osmosis.org, 1
 osmre.gov, 1
 osnova.cz, 1
-osobliwydom.pl, 1
 osobnyak.tk, 1
 osolutionscorp.com, 1
 osom.finance, 1
@@ -83607,7 +83355,6 @@
 ostsee-campingplatz.de, 1
 ostylelimo.com, 1
 osuarez3.com, 1
-osugiving.com, 1
 osuszanie-krakow.pl, 1
 osuszanie-radom.pl, 1
 osuszanie-warszawa.pl, 1
@@ -83616,10 +83363,10 @@
 oswalds.co.uk, 1
 oswaldsmillaudio.com, 1
 oswbouncycastles.co.uk, 1
+oswegony.gov, 1
 osworx.net, 1
 oszri.hu, 1
 ot-vinta.tk, 1
-ota365.com, 1
 otakaroltd.co.nz, 1
 otakubox.de, 1
 otakuie.tk, 1
@@ -83650,6 +83397,7 @@
 otkm-stuttgart.tk, 1
 otmorozki.tk, 1
 otoblok.com, 1
+otokirala.com, 1
 otokiralama.name.tr, 1
 otoma.tk, 1
 otomania.tk, 1
@@ -83711,11 +83459,9 @@
 ourayco.gov, 1
 ourchoice2016.com, 1
 ourcloud.at, 1
-ourcoast.com.au, 1
 ourcodinglives.com, 1
 ourcomeback.gov.au, 1
 ourcreolesoul.com, 1
-ourdataprotected.com, 1
 ourdocuments.gov, 1
 ourevents.net, 1
 ourgame.ie, 1
@@ -83747,6 +83493,7 @@
 out-of-england.gq, 1
 out-of-england.ml, 1
 out-of-scope.de, 1
+outagamie.gov, 1
 outbound.tk, 1
 outbreak.games, 1
 outdoorfurniture.ie, 1
@@ -83798,6 +83545,7 @@
 outsiders.paris, 0
 outsidology.com, 1
 outsourcify.net, 1
+outsourcingdenomina.co, 1
 outsourcingnominabogota.com, 1
 outstack.vote, 1
 outstanding.tk, 1
@@ -83829,7 +83577,6 @@
 overener.com, 1
 overframe.gg, 1
 overheek.tk, 1
-overijsselsemerentocht.nl, 1
 overlandliberty.be, 1
 overlevers.tk, 1
 overlord.network, 1
@@ -84175,6 +83922,7 @@
 paczkadlawieznia.pl, 1
 paczkahigieniczna.pl, 1
 paczkazywnosciowa.pl, 1
+pad.wf, 1
 padam-group.com, 1
 padberx-marketing-consultants.de, 1
 padderne.tk, 1
@@ -84382,6 +84130,7 @@
 palmas.lk, 1
 palmavile.us, 0
 palmaville.com, 0
+palmbeachcounty-fl.gov, 1
 palmbeachcuisine.com, 1
 palmbeachelections.gov, 1
 palmbeachvotes.gov, 1
@@ -84484,6 +84233,7 @@
 panezai.tk, 1
 pang.ga, 1
 pangash.com, 1
+pangci.xyz, 0
 pangea-it.com, 1
 pangeaservices.com, 1
 panghu.me, 1
@@ -84509,7 +84259,6 @@
 pano-guru.com, 1
 pano.ie, 1
 panoramacambios.com, 1
-panoramahurtowni.pl, 1
 panoramaphoto.cf, 1
 panoramaresidence-moesern.at, 1
 panoramica.tk, 1
@@ -84724,6 +84473,7 @@
 parkbee.com.br, 1
 parkcitycu.org, 1
 parkcounty-wy.gov, 1
+parkcountysheriff-wy.gov, 1
 parked-domain.net, 1
 parkefficient.de, 1
 parkercs.cf, 1
@@ -84745,7 +84495,6 @@
 parket.gq, 1
 parketsn.ru, 1
 parkettdielen.net, 1
-parki.cloud, 1
 parking4less.com, 0
 parkinginparis.fr, 1
 parkingparisnord.fr, 1
@@ -84769,7 +84518,6 @@
 parmels.com.br, 1
 parmoli.tk, 1
 parnassys.net, 1
-parniplus.com, 1
 parnizaziteksasko.cz, 1
 parodesigns.com, 1
 paroisses-theix-surzur.com, 1
@@ -84783,7 +84531,6 @@
 parrocchiadimeana.tk, 1
 parrocchiamontevecchia.it, 1
 parroquiacorazondemaria.tk, 1
-parroquiaelcarmen.org, 1
 parrotbook.cf, 1
 parry.org, 1
 pars.work, 1
@@ -84847,7 +84594,6 @@
 partybounceplay.co.uk, 1
 partyclub.tk, 1
 partycoin.ga, 1
-partydesign.vn, 1
 partydj.be, 1
 partyevents.tk, 1
 partyhireliverpool.co.uk, 1
@@ -85140,7 +84886,6 @@
 pauljackson.ga, 1
 pauljmartinez.com, 1
 pauljonathan.dk, 1
-paullinmakeup.com, 1
 paullockaby.com, 1
 paulmarc.org, 1
 paulmarvin.tk, 1
@@ -85229,7 +84974,7 @@
 payboy.biz, 1
 payboy.rocks, 1
 paybro.eu, 1
-paycardtech.com, 1
+paycardtech.com, 0
 paycentre.com, 1
 payclock.com, 1
 paydepot.com, 1
@@ -85296,7 +85041,6 @@
 pbcomp.com.au, 0
 pbern.xyz, 1
 pbest.tk, 1
-pbf.earth, 1
 pborn.eu, 1
 pbourhis.me, 1
 pbqs.site, 1
@@ -85321,6 +85065,7 @@
 pc-tweak.de, 1
 pc-warriors.com, 1
 pc28yc.com, 1
+pcast.gov, 1
 pcbarchitect.com, 1
 pcbfl.gov, 1
 pcbmarketing.gq, 1
@@ -85370,6 +85115,7 @@
 pcmr.info, 1
 pcmr.rocks, 1
 pcnewsoft.tk, 1
+pcnotdienst-oldenburg-rastede.de, 1
 pcpirates.tk, 1
 pcplaza.tk, 1
 pcprkolo.pl, 1
@@ -85568,7 +85314,6 @@
 peers.tk, 1
 peersquaders.ga, 1
 peersquadest.ga, 1
-peertube.social, 1
 peerweb.com, 1
 peerwebdc.tk, 1
 peetah.com, 0
@@ -85685,7 +85430,6 @@
 pensacolawinterfest.org, 1
 pensador.com, 1
 pensador.info, 1
-pensan.ge, 1
 pensatore.tk, 1
 pensia.tk, 1
 pensieridigitali.tk, 1
@@ -85753,7 +85497,7 @@
 peperoni.tk, 1
 peperstraat.online, 1
 pepfar.gov, 0
-pepgrid.net, 1
+pepgrid.net, 0
 pepkey.net, 1
 peplex.ddns.net, 1
 peplex.nl, 1
@@ -85861,6 +85605,7 @@
 periodicomirador.com, 1
 periodicopcion.tk, 1
 periodista.tk, 1
+periony.com, 1
 periosearch.tk, 1
 perisani.com, 1
 periscope.tv, 1
@@ -85911,6 +85656,7 @@
 perroon.eu, 1
 perroquet-passion.ch, 0
 perrybook.tk, 1
+perrycountytn.gov, 1
 pers-hr.tk, 1
 perscore.tk, 1
 perseo.tk, 1
@@ -85945,7 +85691,7 @@
 personnedisparue.fr, 1
 personskadeadvokater.no, 1
 perspective.com.tr, 1
-perspectivum.com, 1
+perspectivum.com, 0
 perspektivwechsel-coaching.de, 1
 persson.me, 1
 perth-seo-agency.com.au, 0
@@ -85972,6 +85718,7 @@
 perved.org, 1
 pervejshijistochnik.tk, 1
 perversa.cl, 1
+perversas.cl, 1
 pervesk.lt, 1
 pervoklass.cf, 1
 pervomaysk-city.ml, 1
@@ -86062,7 +85809,6 @@
 peterjin.org, 1
 peterjohnson.io, 1
 peterkotula.tk, 1
-peterkrivanek.com, 1
 peterkshultz.com, 0
 peterlajos.com, 1
 peterlew.is, 1
@@ -86308,6 +86054,7 @@
 phcloud.spdns.de, 1
 phcnetworks.net, 0
 phcorner.net, 1
+phd, 1
 phdelivery.com, 1
 phdhub.it, 1
 phdwuda.com, 1
@@ -86327,10 +86074,8 @@
 phero.com, 1
 pheroforce.com, 1
 pherologie.com, 1
-pheromeon.com, 1
 pheromeons.com, 1
 pheromoans.com, 1
-pheromoen.com, 1
 pheromoens.com, 1
 pheromones.co, 1
 pheromonetalk.com, 1
@@ -86386,7 +86131,6 @@
 philippinenewsvanguard.tk, 1
 philippkaindl.de, 1
 philippkeschl.at, 1
-philipprouhet.com, 1
 philipslater.cf, 1
 philipslater.ga, 1
 philipslater.gq, 1
@@ -86446,7 +86190,6 @@
 phoenixshirt.com, 1
 phoenixurbanspaces.com, 1
 phographer.com, 1
-pholder.com, 1
 phone-service-center.de, 1
 phone-spy.ml, 1
 phone42.com, 1
@@ -86584,7 +86327,6 @@
 phsa.com.au, 1
 phsa.nz, 1
 phtalent.tk, 1
-phuductms.com, 1
 phuket-idc.com, 1
 phuket-idc.de, 1
 phuket-nash.cf, 1
@@ -86609,6 +86351,7 @@
 phurl.io, 1
 phv-bw.de, 1
 phw.org.uk, 1
+phxserver.net, 0
 phyley.com, 1
 phyllischerry.com, 1
 phys.ir, 1
@@ -86788,6 +86531,7 @@
 pif.email, 1
 piffer.ind.br, 1
 pig-breeding.tk, 1
+pigb.net, 1
 pigeonracinginformation.com, 1
 pigeons-rings.com, 1
 pigfox.com, 1
@@ -86820,7 +86564,6 @@
 pilatespt.nl, 1
 pilatesstation.co.th, 1
 pildat.org, 1
-pileofgarbage.net, 1
 pilesyk.tk, 1
 pili-serv.ovh, 1
 piliszek.net, 1
@@ -86834,7 +86577,6 @@
 pillowfort.pub, 1
 pilot-colleges.com, 1
 pilot.co, 0
-pilot.com, 1
 pilotandy.com, 1
 pilotcareercenter.com, 1
 pilotcareercentre.com, 1
@@ -86926,7 +86668,6 @@
 pinnaclecare.com, 1
 pinnaclelife.co.nz, 0
 pinnaclelife.nz, 1
-pinnacleraffles.com, 1
 pinnakl.com, 1
 pinnoto.org, 1
 pinot.it, 1
@@ -87010,7 +86751,6 @@
 piratenlogin.de, 0
 pirateparty.org.uk, 1
 piratepay.io, 0
-pirateproxy.bet, 1
 pirateproxy.buzz, 1
 pirateproxy.cat, 1
 pirateproxy.cc, 1
@@ -87026,7 +86766,6 @@
 pirateproxy.onl, 1
 pirateproxy.pl, 1
 pirateproxy.pw, 1
-pirateproxy.red, 1
 pirateproxy.sh, 1
 pirateproxy.tube, 1
 pirateproxy.tv, 1
@@ -87052,7 +86791,6 @@
 pirscapital.com, 1
 piruchita.com, 1
 pirxpilot.me, 1
-pis.eu.com, 1
 pisaggni.ch, 1
 pisanpeikot.tk, 1
 pisarzowa.tk, 1
@@ -87189,8 +86927,6 @@
 pizzeriasmallorca.com, 1
 pj00100.com, 1
 pj00200.com, 1
-pj00300.com, 1
-pj00400.com, 1
 pj00600.com, 1
 pj00700.com, 1
 pj00800.com, 1
@@ -87205,11 +86941,11 @@
 pjleisure.co.uk, 1
 pjo.no, 1
 pjotor.tk, 1
+pjp.com.mt, 1
 pjshop.cf, 1
 pjuu.com, 0
 pk-master.tk, 1
 pk-soft.tk, 1
-pk.city, 1
 pk.search.yahoo.com, 0
 pk8k.com, 1
 pkb.shop, 1
@@ -87251,6 +86987,7 @@
 plainjs.com, 1
 plainlanguage.gov, 1
 plainoltrailers.com, 1
+plainsgeorgia.gov, 1
 plaintech.net.au, 1
 plaintextpledge.com, 1
 plaintextpledge.email, 1
@@ -87371,7 +87108,6 @@
 plaros.ml, 1
 plasapulsa.tk, 1
 plasesolev.tk, 1
-plashenkov.com, 1
 plaskiewicz.pl, 1
 plasofficial.it, 1
 plassmann.ws, 1
@@ -87557,6 +87293,7 @@
 pley.today, 1
 plgr.cc, 1
 plgr.tech, 1
+plicca.com, 0
 plichso.de, 1
 plikersi.tk, 1
 plikiai.tk, 1
@@ -87593,7 +87330,10 @@
 plum.fr, 1
 plumair-ve.com, 1
 plumber-in-sandton.co.za, 1
+plumbercincoranch.com, 1
 plumberlewisvilletexas.com, 1
+plumbermountedgecombe.co.za, 1
+plumberumhlangarocks.co.za, 1
 plumbing-arlington.com, 1
 plumbingandheatingspecialistnw.com, 1
 plumbingglenvista.co.za, 1
@@ -88109,6 +87849,7 @@
 poloniainfo.com, 1
 polonialidzbark.tk, 1
 polskiemalzenstwo.org, 1
+polskienewsy.tk, 1
 polsonlawfirm.com, 1
 poly-fast.com, 0
 polybius.io, 1
@@ -88124,7 +87865,6 @@
 polymtl.ca, 0
 polynomapp.com, 1
 polypane.rocks, 1
-polypet.com.sg, 1
 polyr.xyz, 1
 polytarian.com, 1
 polytechecosystem.vc, 1
@@ -88267,6 +88007,7 @@
 popup-stores.online, 1
 popupbazaar.tk, 1
 popvitrin.com, 1
+popxclusive.com, 1
 poquiloco.com, 1
 poquvi.net, 0
 porady-wnetrzarskie.pl, 1
@@ -88285,6 +88026,7 @@
 porkmart.ga, 1
 porkolab.digital, 1
 porkpiesonline.co.nz, 1
+porkyx.com, 1
 porm.club, 1
 porn2019.tk, 1
 porn77.info, 1
@@ -88331,7 +88073,6 @@
 pornojimo.com, 1
 pornokran.com, 1
 pornolab.su, 1
-pornolarizlehd.com, 1
 pornomens.be, 1
 pornomovies.mobi, 1
 pornomovieshd.com, 1
@@ -88395,6 +88136,7 @@
 portalm.tk, 1
 portalmundo.xyz, 1
 portalpandalandia.tk, 1
+portalpower.com.br, 1
 portalz.xyz, 1
 portamiinpista.it, 0
 portatilea.com, 1
@@ -88427,6 +88169,7 @@
 portsmouthsheriffsofficeva.gov, 1
 portsolent.com, 1
 portstal.ru, 1
+portugal-a-programar.pt, 1
 portugal-reisetipps.de, 1
 portugalbycar.com, 1
 portugalivre.tk, 1
@@ -88467,7 +88210,6 @@
 positivityeffect.com, 1
 positivos.tk, 1
 positronicmoron.tk, 1
-poskok.info, 1
 posoco.in, 1
 posoiu.net, 1
 posowetuite.ru, 1
@@ -88485,7 +88227,6 @@
 postal.dk, 1
 postal3.es, 1
 postandfly.com, 1
-postari.ro, 1
 postat.com, 1
 postawnasiebie.pl, 1
 postback.io, 0
@@ -88611,7 +88352,6 @@
 poundgatepark.co.uk, 1
 poupee.me, 1
 poured-floors.tk, 1
-pourmoi.co.uk, 1
 pourout.org, 0
 pouwels-oss.nl, 1
 povar.ru, 1
@@ -88633,6 +88373,7 @@
 power-magnetic.ml, 1
 power-of-interest.com, 1
 power-tools24.com, 1
+power2prevent.gov, 1
 poweramazon.tk, 1
 poweranalitica.com, 1
 powerb.ch, 0
@@ -88650,7 +88391,6 @@
 powerfortunes.com, 1
 powergridess.com, 0
 powergroup.tk, 1
-powerhockey.info, 1
 powerinboxperformance.com, 1
 powerlifting.tk, 1
 powermeter.at, 1
@@ -88749,7 +88489,6 @@
 ppro.com, 0
 pptavmdata.org, 1
 ppusl.ro, 1
-ppweb.pro, 1
 ppy.la, 1
 ppy.sh, 1
 pqd.ru, 1
@@ -89012,6 +88751,7 @@
 president.bg, 1
 presidentdirectory.ga, 1
 presidentialinnovationfellows.gov, 1
+presidentialserviceawards.org, 1
 presidentinternet.org, 1
 presidio.gov, 1
 presidiotunneltops.gov, 1
@@ -89050,6 +88790,7 @@
 prestigeeventshire.co.uk, 1
 prestigemix.com, 1
 prestigerepairs.com.au, 1
+prestigesigns.net, 1
 prestigesoundandlight.co.uk, 1
 prestigeworldwidepr.com, 1
 prestigiouskitchen.com, 1
@@ -89296,7 +89037,6 @@
 privasphere.com, 1
 private-diary-taka.com, 1
 private-krankenversicherung.tk, 1
-private-mail-for.me, 1
 private-relay.email, 1
 privatebanks.uk, 1
 privatebin.info, 1
@@ -89455,13 +89195,12 @@
 prodentalsantacruz.es, 1
 prodesigntools.com, 1
 prodesk.bg, 1
-prodevsblog.com, 1
 prodhealthcare.org, 1
 prodietix.cz, 1
 prodigibook.com, 1
 prodigyhacking.com, 1
 prodigyhq.io, 1
-prodinger.com, 1
+prodinger.com, 0
 prodottitipicidellatoscana.it, 1
 prodottogiusto.com, 1
 produccioneskm.cl, 1
@@ -89478,7 +89217,6 @@
 productiv.com, 1
 productive-garden.com, 1
 productivemachine.net, 1
-productlondon.com, 1
 productmarketingalliance.com, 1
 productosdeteruel.es, 1
 productosfitness.com, 1
@@ -89502,6 +89240,8 @@
 proemployeeprotection.com, 1
 proemployeeprotection.net, 1
 proesb.net, 1
+proevlifecycle.eu, 1
+prof, 1
 prof-toplivo.ru, 1
 prof-waldowski.de, 1
 profarm.top, 1
@@ -89737,12 +89477,10 @@
 promoscuola.net, 1
 promosjungle.com, 1
 promosolucoes.tk, 1
-promospg.es, 1
 promotech.pro, 1
 promoterms.com.au, 1
 promotioncentre.co.uk, 1
 promotiongeeks.com, 0
-promotionnissanauto.com, 1
 promotionvillanakarin.com, 1
 promovendum.nl, 1
 promtechosnastka.ru, 1
@@ -89765,7 +89503,6 @@
 propanesale.cf, 1
 propcierge.in, 1
 propecia.ml, 1
-propelgrowth.com, 1
 propermatches.com, 1
 propershave.com, 1
 propertech.com.br, 1
@@ -90125,6 +89862,7 @@
 pssjd.org, 1
 pst.moe, 1
 pste.pw, 1
+pstrozniak.com, 1
 pstrykmyk.eu, 1
 pstutorials.tk, 1
 psu.je, 1
@@ -90522,7 +90260,6 @@
 puzz.gg, 1
 puzzlage.com, 1
 puzzle-welt.ch, 1
-puzzleetc.com, 1
 puzzlegames.com, 1
 puzzlepiehouse.com, 1
 puzzlepoint.ch, 1
@@ -90577,7 +90314,6 @@
 pxgamer.xyz, 1
 pxio.de, 0
 pxl-mailtracker.com, 1
-pxl.blue, 1
 pxl.cl, 1
 pxld.sh, 1
 pxstart.cz, 1
@@ -90632,7 +90368,6 @@
 pyxisfreelance.co, 1
 pyxisfreelance.com.au, 1
 pyxo.net, 0
-pyzlnar.com, 1
 pzpittsburgh.com, 1
 pzsearch.nl, 1
 pzu-masa.pl, 1
@@ -90668,6 +90403,7 @@
 qabalah.ga, 1
 qabalah.jp, 1
 qabel.de, 1
+qabete.com, 1
 qac.gov, 1
 qaconstrucciones.com, 1
 qadmium.com, 1
@@ -90788,13 +90524,13 @@
 qmeriaux.fr, 1
 qmp-media.nl, 1
 qnected.nl, 1
+qnixon.com, 1
 qnotafm.com.co, 1
 qnq.moe, 1
 qnsgmd.com, 1
 qochealth.com, 1
 qoder.co, 1
 qoml.net, 1
-qonto.com, 1
 qoor.io, 0
 qoptalk.com, 1
 qosim.ga, 1
@@ -90819,7 +90555,7 @@
 qq9728.co, 1
 qqiao.me, 1
 qqmingzi.cc, 1
-qqq6.com, 1
+qqq6.com, 0
 qqq67.com, 1
 qqqq.plus, 1
 qqrss.com, 1
@@ -90882,7 +90618,6 @@
 qtvr.com, 1
 qtxh.net, 1
 qtzhi.com, 1
-quackerswaterproofing.com, 1
 quackquack.in, 1
 quadcityjuggalos.tk, 1
 quadomania.tk, 1
@@ -91029,6 +90764,7 @@
 quentin-sauvetre.fr, 1
 quentinchevre.ch, 1
 quepourlesjuristes.fr, 1
+quera.ir, 1
 querelle.tk, 1
 querenciavirtual.com.br, 1
 quernon.fr, 1
@@ -91318,6 +91054,7 @@
 rabbitcare.com, 1
 rabbitinternet.com, 1
 rabbitsstore.com, 1
+rabbitvcactus.eu, 1
 rabby.tk, 1
 rabenkralle.tk, 1
 rabica.de, 1
@@ -91764,7 +91501,7 @@
 rally-vysledky.cz, 1
 rallybase.cz, 1
 rallybase.eu, 1
-rallycycling.com, 1
+rallycycling.com, 0
 rallyfotosaswin.tk, 1
 rallyservice.pl, 1
 rallytrophy.tk, 1
@@ -91915,7 +91652,6 @@
 raphrfg.com, 1
 rapidapp.io, 1
 rapidcenter.tk, 1
-rapidflow.io, 1
 rapidgator.net, 1
 rapidguide.tk, 1
 rapidminer.com, 0
@@ -92272,7 +92008,6 @@
 readysell.net, 1
 readysetscif.com, 1
 readystep.ga, 1
-readytobattle.net, 1
 readytongue.com, 0
 readytowear.es, 1
 readywithresourcestn.gov, 1
@@ -92281,6 +92016,7 @@
 reakcjonista.tk, 1
 reaksi.id, 1
 real-bits.com, 1
+real-compare.com, 0
 real-digital.co.uk, 1
 real-it.nl, 1
 real-linux.tk, 1
@@ -92324,7 +92060,6 @@
 realestatecentralcoast.info, 1
 realestateexecutives.tk, 1
 realestategreenville.tk, 1
-realestatemarketingblog.org, 1
 realestateonehowell.com, 1
 realestatesales.gov, 1
 realfamilyincest.com, 1
@@ -92395,7 +92130,6 @@
 reavaninc.com, 1
 reaven.nl, 1
 rebajasoferta.com, 1
-rebalancenyc.com, 1
 rebane2001.com, 1
 rebatekey.com, 1
 rebeccawendlandt.com, 1
@@ -92408,7 +92142,6 @@
 rebelessex.com, 1
 rebelko.de, 1
 rebellecare.com, 1
-rebellion.scot, 1
 rebelonline.nl, 1
 rebelz.se, 1
 rebill.to, 1
@@ -92423,7 +92156,6 @@
 reby.tk, 1
 rec.moe, 1
 recalls.gov, 1
-recantoshop.com, 1
 recantoshop.com.br, 1
 recaptcha-demo.appspot.com, 1
 receitas.tk, 1
@@ -92436,7 +92168,6 @@
 recessmonkeyz.tk, 1
 recetasboricuas.com, 1
 recetasdemape.com, 1
-recetin.com, 1
 recettes-series.com, 1
 rechenknaecht.de, 1
 rechenwerk.net, 1
@@ -92992,6 +92723,7 @@
 religiya.tk, 1
 relijon.com, 1
 relikt.tk, 1
+relisten.nl, 1
 relivekitchen.com, 1
 reloading.ml, 1
 relocatefeds.gov, 1
@@ -93010,7 +92742,6 @@
 remake-projects.tk, 1
 remambo.jp, 1
 remapmijnauto.nl, 1
-remarketable.org, 1
 remateszarate.cl, 0
 remax.at, 1
 remeb.de, 1
@@ -93037,6 +92768,7 @@
 remilner.co.uk, 1
 reminded.tk, 1
 remini.cz, 1
+reminisceaudio.com, 1
 remirampin.com, 1
 remissan.com, 1
 remitano.com, 1
@@ -93143,7 +92875,6 @@
 rennfire.org, 1
 renoproject.org, 1
 renos.tk, 1
-renovablesverdes.com, 1
 renovandoingresos.com, 1
 renovationsf.cf, 1
 renovationsf.ga, 1
@@ -93192,8 +92923,6 @@
 repairit.support, 1
 repairmysolarpanels.com, 1
 repairtly.com, 0
-repalanca.com, 1
-repalcateia.com.br, 1
 repaper.org, 1
 reparacionesdecalefones.com, 1
 reparacionmovilescartagena.com, 1
@@ -93224,7 +92953,6 @@
 report-incident.de, 1
 report-uri.com, 1
 reportasee.com, 1
-reportband.gov, 1
 reporte.tk, 1
 reportercareer.ga, 1
 reporting.gov, 1
@@ -93322,6 +93050,7 @@
 resolvefa.co.uk, 1
 resolvefa.com, 1
 resolveit.gq, 1
+resolvergroup.com.au, 1
 resolvo.com, 1
 resolvs.com, 1
 resoplus.ch, 0
@@ -93337,9 +93066,6 @@
 resourcesmanagementcorp.com, 1
 resourcs.com, 1
 respawwn.com, 1
-respectmyprivacy.eu, 1
-respectmyprivacy.net, 1
-respectmyprivacy.nl, 1
 respecttheflame.com, 1
 respinar.com, 1
 respiradores.tk, 1
@@ -93527,6 +93253,7 @@
 revers.tk, 1
 reverseaustralia.com, 1
 reversecanada.com, 1
+reversecrucifixkm.altervista.org, 1
 reversedns.tk, 1
 reverseloansolutions.com, 1
 reverselookupphone.us, 1
@@ -93561,6 +93288,7 @@
 revisoronline.gq, 1
 revisoronline.ml, 1
 revisoronline.tk, 1
+revista-programar.info, 1
 revistabifrontal.com, 1
 revistacocina.tk, 1
 revistadiscover.com, 1
@@ -93722,7 +93450,6 @@
 rian.gq, 1
 riared.net, 1
 riared.org, 1
-riaucybersolution.net, 0
 riaudetil.com, 1
 rib-ims.com, 1
 rib-leipzig.com, 1
@@ -93735,7 +93462,6 @@
 ribes.design, 0
 ribolov.tk, 1
 ribtours.co, 1
-ricardo.nu, 1
 ricardobalk.nl, 1
 ricardojsanchez.com.ar, 1
 ricardopq.com, 1
@@ -93748,7 +93474,6 @@
 riceadvice.info, 1
 rich-good.com, 1
 richadams.me, 1
-richamorindonesia.com, 1
 richandsteph.co.uk, 1
 richandsteph.uk, 1
 richard-purves.com, 1
@@ -93804,8 +93529,6 @@
 richmtdriver.com, 1
 richviajero.com, 1
 richwayfun.com, 1
-ricketyspace.net, 1
-ricki-z.com, 1
 rickmakes.com, 1
 rickmartensen.nl, 0
 rickrongen.nl, 1
@@ -93900,7 +93623,6 @@
 rijschoolsafetyfirst.nl, 1
 rijsinkunst.nl, 1
 rik.onl, 1
-rikaidoshop.com, 1
 rikaz.tech, 1
 riklewis.com, 1
 riku.pro, 1
@@ -93950,7 +93672,6 @@
 riosoils.com, 1
 riostones.com, 1
 riovizela.pt, 1
-rioxmarketing.com, 1
 rioxmarketing.pt, 1
 rip-sport.cz, 1
 rip.ie, 1
@@ -93962,6 +93683,7 @@
 ripin.org, 1
 ripley.red, 1
 ripmixmake.org, 1
+ripon-wi.gov, 1
 ripp-it.com, 1
 ripper.store, 1
 ripple.com, 1
@@ -93976,7 +93698,6 @@
 ripplenews.world, 1
 riproduzionichiavi.it, 1
 riptidetech.io, 1
-ris-bad-wurzach.de, 1
 ris.fi, 1
 risada.nl, 1
 risalatconsultants.com, 1
@@ -94129,7 +93850,6 @@
 rmdhnreza.my.id, 1
 rmdscreen.com, 1
 rme.li, 0
-rmeuropean.com, 1
 rmf.io, 1
 rmit.me, 1
 rmm-i.com, 1
@@ -94148,6 +93868,7 @@
 rn29.me, 1
 rnag.ie, 1
 rnb-storenbau.ch, 1
+rnbjunk.com, 1
 rncc.mx, 1
 rndtool.info, 1
 rnews.tk, 1
@@ -94231,7 +93952,6 @@
 robi-net.it, 1
 robicue.com, 0
 robigalia.org, 0
-robijomasszazs.com, 1
 robimgood.com.ua, 1
 robin-kusch.de, 1
 robin-novotny.com, 1
@@ -94333,6 +94053,7 @@
 rockinronniescastles.co.uk, 1
 rockitinflatables.co.uk, 1
 rocklabs.xyz, 1
+rocklandcountyny.gov, 1
 rocklinhousecleaning.com, 1
 rocknbluestoday.tk, 1
 rocknwater.com, 1
@@ -94350,7 +94071,6 @@
 rockymountaininsurancecenter.com, 1
 rockymountainspice.com, 1
 rockyourlife.gq, 1
-rockypest.com.au, 1
 rocmartialartsacademy.com, 1
 rocsole.com, 1
 rocssti.net, 1
@@ -94377,7 +94097,6 @@
 roditely.cf, 1
 rodnikbel.tk, 1
 rodobike.com.br, 1
-rodoelectrodomesticos.com, 1
 rodokubu.jp, 1
 rodolfo.gs, 1
 rodolphe-lebrun.fr, 1
@@ -94472,7 +94191,6 @@
 rolandog.com, 1
 rolandoredi.com, 1
 rolandozarate.tk, 1
-rolandreed.cn, 1
 rolandszabo.com, 1
 rolandvanipenburg.com, 1
 rolc.org.sg, 1
@@ -94591,6 +94309,7 @@
 ronomon.com, 1
 ronsguideservice.com, 1
 ronzertnert.xyz, 1
+roo.ie, 1
 roodfruit.com, 1
 roodfruit.nl, 1
 roodfruit.studio, 1
@@ -94643,10 +94362,10 @@
 rootedlifemontessori.com, 1
 rootfor.me, 1
 rootingpalace.tk, 1
+rootkit.es, 1
 rootlair.com, 1
 rootless.ga, 1
 rootless.tk, 1
-rootly.io, 1
 rootonline.de, 1
 rootpak.com, 1
 rootpigeon.com, 1
@@ -94739,6 +94458,7 @@
 rosslug.org.uk, 1
 rossome.org, 1
 rosstroj-balashiha.ml, 1
+rossvillega.gov, 1
 rosswilson.co.uk, 0
 rost.tv, 1
 rostclub.ro, 1
@@ -94953,7 +94673,6 @@
 rpa.gov, 1
 rpadonline.com, 1
 rpattisonroofing.co.uk, 1
-rpauto.ru, 1
 rpcinmobiliaria.net, 0
 rpg-maker.net, 1
 rpg-maker.org, 1
@@ -95051,6 +94770,7 @@
 rstsecuritygroup.co.uk, 1
 rsttraining.co.uk, 1
 rsvaachen.de, 1
+rsvp, 1
 rsvpdesign.co.uk, 1
 rswebsols.com, 1
 rswow.ru, 1
@@ -95126,6 +94846,8 @@
 rubberlegscastles.co.uk, 1
 rubbermaidoutlet.com, 1
 rubbix.net, 1
+rubblekempton.co.za, 1
+rubblemidrand.co.za, 1
 rubblerandburg.co.za, 1
 rubbleremovalbluff.co.za, 1
 rubbleremovalhillcrest.co.za, 1
@@ -95227,6 +94949,7 @@
 ruhrnalist.de, 1
 ruicore.cn, 1
 ruifu.tech, 1
+ruiming.me, 1
 ruimoreira.co.uk, 1
 ruimtevoor.gent, 1
 ruimtevoorgent.be, 1
@@ -95308,7 +95031,6 @@
 runnerslab.com, 1
 runningfast.cf, 1
 runningrabb.it, 1
-runningshaadi.in, 1
 runningshows.tk, 1
 runosklep.pl, 1
 runpartner.com, 1
@@ -95317,7 +95039,7 @@
 runtall.co.uk, 1
 runvs.io, 1
 runwaybpo.com, 1
-ruobiyi.com, 1
+ruobiyi.com, 0
 ruobr.ru, 1
 ruonavaara.fi, 1
 ruoskachile.tk, 1
@@ -95408,6 +95130,7 @@
 rustambek.tk, 1
 rustamkhanko.gq, 1
 rustbyexample.com, 0
+rustfanatic.com, 1
 rustfu.rs, 1
 rusticpathways.com.au, 1
 rusticroadlandscaping.com, 1
@@ -95579,12 +95302,12 @@
 s1mplescripts.de, 1
 s1ris.org, 1
 s2.coach, 1
+s20121946.ml, 1
 s2i.ch, 0
 s2member.com, 1
 s2t.net, 1
 s36533.com, 1
 s3cur1ty.com, 1
-s3cur3.it, 1
 s3gfault.com, 1
 s3lph.me, 1
 s3n.se, 1
@@ -95630,6 +95353,7 @@
 sa-blog.net, 1
 sa-mp.me, 1
 sa-mp.ro, 1
+sa.gov, 1
 sa.net, 1
 sa68.cc, 1
 sa88.cc, 1
@@ -95745,9 +95469,9 @@
 safaritenten.nl, 1
 safatech.me, 1
 safc.tk, 1
-safcstore.com, 1
 safeacs.com, 1
 safeadmin.ga, 1
+safeandsecureserver.com, 1
 safearth.training, 1
 safeathomeohio.gov, 1
 safebaseflorida.com, 1
@@ -95821,6 +95545,7 @@
 safeui.com, 0
 safevault.org, 1
 safevisit.com.au, 1
+safewaysecurityscreens.com.au, 1
 safewaywaterproofing.com, 1
 safiosolutions.com, 1
 safirakbar.tk, 1
@@ -95829,7 +95554,6 @@
 safkgroup.com, 1
 safungerar.se, 1
 sagacioussuricata.com, 1
-sagafalabellacatalogo.net, 1
 sagagardencentre.co.uk, 1
 sagan.tk, 1
 sagarawat.in, 1
@@ -95861,7 +95585,6 @@
 saharacloud.com, 1
 saharmassachi.com, 1
 sahb.dk, 1
-sahccareers.com, 1
 sahibinden.com, 1
 sahinmuzikyapim.com, 1
 sahinozgenhukuk.com, 1
@@ -96173,7 +95896,6 @@
 samara-avia.ru, 1
 samara-hosting.tk, 1
 samaritainsmeyrin.ch, 0
-samarth.edu.in, 1
 samatva-yogalaya.com, 1
 samba.org, 1
 sambaash.com, 1
@@ -96216,7 +95938,7 @@
 saml-gateway.org, 1
 samlam.ddns.net, 1
 samlamac.com, 1
-samlaw.co.nz, 1
+samlaw.co.nz, 0
 sammamish--locksmith.com, 1
 sammichscripts.com, 1
 sammyservers.com, 1
@@ -96353,6 +96075,7 @@
 sandton-plumbing.co.za, 1
 sandtonescorts.com, 1
 sandtonplumber24-7.co.za, 1
+sandtonplumbing.co.za, 1
 sanduskycountyoh.gov, 1
 sandwichclub.tk, 1
 sandwichcouncil.tk, 1
@@ -96669,7 +96392,6 @@
 sativatunja.com, 1
 satl-lelystad.nl, 1
 satmd.de, 1
-satoshibattles.com, 1
 satoshilabs.com, 1
 satoshinumbers.com, 1
 satpersian.tk, 1
@@ -96684,6 +96406,7 @@
 sattaresult.net, 1
 saturdayenterprises.ga, 1
 saturnbb.com, 1
+saturne.tk, 1
 saturuang.id, 1
 satyamshivamsundaram.in, 1
 sauber.dk, 1
@@ -96806,7 +96529,6 @@
 saydj.tk, 1
 sayednidhalphoto.tk, 1
 sayeghonline.com, 0
-saygoodbyetoie.com, 1
 sayilarmuhendislik.com, 1
 sayprepay.com, 1
 sayrodigital.com, 1
@@ -96885,7 +96607,6 @@
 scaffoldhirerandburg.co.za, 1
 scaffoldhiresandton.co.za, 1
 scaffoldingsandton.co.za, 1
-scaffoldingsolutions.com, 1
 scag9.com, 1
 scai.org, 1
 scala.click, 1
@@ -96937,7 +96658,6 @@
 scarecrow-cn.com, 1
 scaricamusica.tk, 1
 scarinex.tk, 1
-scartazzini.com, 1
 scaryghost.tk, 1
 scatgirls.net, 1
 scatsbouncingcastles.ie, 1
@@ -97010,7 +96730,6 @@
 schemingmind.com, 1
 schemmel.net, 1
 schenkel.tk, 1
-schenkelimoveis.com.br, 1
 schenkes.de, 0
 scherfke.de, 1
 schermkapot.nl, 1
@@ -97077,6 +96796,7 @@
 schody-rozycki.pl, 1
 schoeller.click, 1
 schoenstatt-fathers.link, 1
+schoenstatt-fathers.us, 1
 schoenstatt-movement.us, 1
 schoenstatt.link, 1
 schoepski.de, 1
@@ -97135,6 +96855,7 @@
 schoolbytes.education, 1
 schoolcafe.com, 1
 schoolcashonline.com, 1
+schoolcrafttownshipmi.gov, 1
 schooldatasquad.com, 1
 schoolheads.ph, 1
 schooli.io, 1
@@ -97218,7 +96939,6 @@
 schwarzegar.de, 1
 schwarzenberg.tk, 1
 schwarzer.it, 1
-schwarzer.wang, 1
 schwarzes-muenchen.de, 1
 schwarzhenri.ch, 0
 schwarztrade.cz, 1
@@ -97280,6 +97000,7 @@
 scintilla.nl, 1
 scintillating.stream, 1
 scionasset.com, 0
+sciooregon.gov, 1
 sciototownship-oh.gov, 1
 scip.ch, 1
 scislowcy.pl, 1
@@ -97304,7 +97025,6 @@
 scoopgalleries.com, 1
 scoopgh.com, 1
 scootaloo.co.uk, 1
-scooter-experts.com, 1
 scooterinaustralia.tk, 1
 scootermalagarental.com, 1
 scooterproducten.com, 1
@@ -97481,7 +97201,6 @@
 sd.af, 1
 sd.eti.br, 1
 sd4u.be, 1
-sda.one, 1
 sdaniel55.com, 1
 sdare.ru, 1
 sdcardrecovery.de, 1
@@ -97511,7 +97230,7 @@
 sdsite.tk, 1
 sdsmanagement.me, 0
 sdsmt.engineering, 1
-sduconnect.nl, 1
+sduconnect.nl, 0
 sduoxminty.cn, 1
 sdut.gq, 1
 sdvigpress.org, 0
@@ -97535,6 +97254,7 @@
 seadus.ee, 1
 seaelba.com, 1
 seaholmwines.com, 1
+sealandair.fr, 1
 sealart.pl, 1
 sealaw.com, 1
 sealbaker.com, 1
@@ -97542,6 +97262,7 @@
 sealtitebasement.com, 1
 seamester.com, 1
 seamoo.se, 1
+seamus.party, 1
 sean-wright.com, 1
 seanchaidh.org, 1
 seanchristian.tk, 1
@@ -97597,6 +97318,7 @@
 seaspiration.com, 1
 seatbeltpledge.com, 1
 seatinglane2u.com, 1
+seats2meet.com, 1
 seatsurfing.de, 1
 seattle-life.net, 1
 seattlebasementwaterproofers.com, 1
@@ -97672,7 +97394,6 @@
 secfish.net, 0
 secgui.de, 1
 sech.me, 1
-sechssiwwe.de, 1
 secinto.com, 1
 secitem.de, 1
 seclimax.site, 1
@@ -97751,12 +97472,11 @@
 secure.advancepayroll.com.au, 1
 secure.facebook.com, 0
 securebot.ga, 1
-securecheck360.com, 1
 securecloudplatform.nl, 1
+securecomms.cz, 1
 secureddocumentshredding.com, 1
 securedrop.org, 1
 secureenduserconnection.se, 1
-secureesolutions.com, 1
 securefiletransfer.nl, 1
 securegovernment.us, 1
 secureheaders.com, 1
@@ -97887,7 +97607,6 @@
 seemyreality.tk, 1
 seeonce.co, 1
 seerainer.com, 1
-seestersmexicancantina.com, 1
 seesuite.com, 0
 seetheprogress.com, 1
 seetheprogress.de, 1
@@ -97951,7 +97670,6 @@
 seismas1.com, 1
 seitai-nabejun.jp, 1
 seitai-taiyou.com, 1
-seitaisalon-ti-da-ouji.com, 1
 seitanic-cookbook.de, 1
 seitenwaelzer.de, 1
 seizethedaybrasil.com.br, 1
@@ -98014,7 +97732,6 @@
 selfiehome.cz, 1
 selfishness.com, 1
 selfloath.in, 1
-selfmade4u.de, 1
 selfrealize.ga, 1
 selfretire.cf, 1
 selfserverx.com, 0
@@ -98168,7 +97885,6 @@
 senshudo.tv, 1
 sensibleita.tk, 1
 sensiblelanecounty.tk, 1
-sensitidolls.com, 1
 sensivo.eu, 1
 sensizem.tk, 1
 sensoft-int.com, 1
@@ -98561,7 +98277,6 @@
 session.bbc.com, 1
 sessionslogning.dk, 1
 sestry.tk, 1
-setasgourmet.es, 1
 seteampty.net, 1
 setenforce.one, 1
 setevik.tk, 1
@@ -99093,7 +98808,6 @@
 shengrenyu.com, 1
 shenmiya.com, 1
 shenpei.net, 1
-shens.ai, 1
 shenshi.com, 1
 shentengtu.idv.tw, 1
 shepherdsfriendly.co.uk, 1
@@ -99178,7 +98892,6 @@
 shimo.im, 1
 shimonfly.com, 1
 shin-yo.de, 1
-shincastella.com, 1
 shindocuba.tk, 1
 shineindiarktutorial.ml, 1
 shineleds.ga, 1
@@ -99239,7 +98952,6 @@
 shirevirtual.tk, 1
 shireyishunjian.com, 1
 shireyishunjian.group, 1
-shirhashirim.org.il, 1
 shiriforum.tk, 1
 shirley.li, 1
 shirlygilad.com, 1
@@ -99308,7 +99020,6 @@
 shoarq.com, 1
 shochikubai.tk, 1
 shock.ee, 1
-shockercityservices.com, 1
 shockerdragon.tk, 1
 shockproof.systems, 1
 shodan.io, 1
@@ -99624,7 +99335,6 @@
 showmeengland.co.uk, 1
 shown.io, 1
 shownet.tk, 1
-showno.me, 1
 showpassword.net, 0
 showroom.co.uk, 1
 showroom.de, 0
@@ -99638,8 +99348,6 @@
 shpargalka.work, 1
 shpil.by, 1
 shpilevsky.name, 1
-shpiliak.com, 1
-shpiliak.ru, 1
 shpori.tk, 1
 shrapnel.ga, 1
 shraymonks.com, 1
@@ -99780,6 +99488,7 @@
 sicurled.com, 1
 sicvisuals.com, 1
 sicz.de, 1
+sid-giessen.de, 1
 sid.group, 1
 sidari.tk, 1
 sidatbacklink.tk, 1
@@ -99928,7 +99637,6 @@
 sikaranbrotherhood.tk, 1
 sikayetvar.com, 0
 sike.org, 1
-sikevux.se, 1
 sikkind.com, 0
 siku-shop.ch, 1
 siku.pro, 1
@@ -99960,7 +99668,6 @@
 silicon-vision.com, 1
 silina.tk, 1
 silindir-taslama.tk, 1
-silkebaekken.no, 1
 silken-madame.tk, 1
 silkproducts.tk, 1
 sillisalaatti.fi, 1
@@ -100074,7 +99781,7 @@
 silvertonmd.com, 1
 silvertorrents.cf, 1
 silverwind.io, 1
-silvesrom.ro, 1
+silvesrom.ro, 0
 silvester-mitterschida.de, 0
 silviacataldi.com, 1
 silviadominguez.tk, 1
@@ -100167,7 +99874,6 @@
 simotrescu.ro, 1
 simpatie.tk, 1
 simpbx.net, 1
-simpel.be, 1
 simpelkoken.be, 1
 simpelkoken.com, 1
 simpelkoken.net, 1
@@ -100330,7 +100036,7 @@
 singapur24.tk, 1
 singapurfirma.com, 1
 singee.me, 1
-singee.site, 1
+singee.site, 0
 singel.ch, 1
 singer.ru, 1
 singerpragathi.tk, 1
@@ -100459,6 +100165,7 @@
 siscompt.com, 1
 siseed.io, 1
 siselectrom.com, 1
+siseministeerium.ee, 1
 sisiengineers.gq, 1
 sisirbatu.tk, 1
 sismit.com, 1
@@ -100725,7 +100432,7 @@
 skipbinsforhire.co.za, 1
 skipfault.com, 1
 skipperinnovations.com, 0
-skippers-bin.com, 1
+skippers-bin.com, 0
 skippy.dog, 0
 skipsteer.com, 1
 skiptadiabetes.com, 1
@@ -100828,7 +100535,6 @@
 skybirds.org, 1
 skyblond.info, 1
 skybloom.com, 1
-skyblue.co.jp, 1
 skyblueradio.com, 1
 skyborne.tk, 1
 skybrary.aero, 1
@@ -100875,7 +100581,6 @@
 skynethk.com, 1
 skynetstores.ae, 1
 skynetz.tk, 1
-skyntalent.com, 1
 skyoy.com, 0
 skype.com, 1
 skypefr.com, 1
@@ -100894,6 +100599,7 @@
 skyscnr.com, 1
 skyseo.cf, 1
 skysoftbg.com, 1
+skysuite.nl, 1
 skytec.host, 1
 skyterraathome.com, 1
 skyterraembrace.com, 1
@@ -101000,7 +100706,6 @@
 slim-planet.com, 1
 slim-slender.com, 1
 slimetutorial.com, 1
-slimk1nd.nl, 1
 slimmarkets.com, 1
 slimopweg.be, 1
 slimspots.com, 1
@@ -101239,7 +100944,7 @@
 smartroofingandsheetmetal.com, 1
 smartshiftme.com, 1
 smartship.co.jp, 1
-smartshoppers.es, 1
+smartshoppers.es, 0
 smartsitio.com, 1
 smartspace.ml, 1
 smartspace.tk, 1
@@ -101315,6 +101020,7 @@
 smithandellis.com, 1
 smithandnoble.com, 1
 smithchung.eu, 1
+smithcountyelectiontn.gov, 1
 smithcountytxtaxrates.gov, 1
 smithf.red, 1
 smithings.com, 1
@@ -101450,11 +101156,7 @@
 snatek.net, 1
 snatertlc.it, 1
 snatti.com, 1
-snazel.ae, 1
 snazel.co.il, 1
-snazel.de, 1
-snazel.ee, 1
-snazel.uk, 1
 snazzie.nl, 1
 sncdn.com, 1
 snd-zentrum.de, 1
@@ -101595,7 +101297,6 @@
 sobczakdesign.de, 1
 sobeelectronics.com, 1
 sobersys.com, 1
-sobie.ch, 1
 sobieray.dyndns.org, 1
 soblaznenie.ru, 1
 soblaznenie2.ru, 1
@@ -101664,7 +101365,6 @@
 socialnews.ga, 1
 socialnitro.com, 1
 socialnous.co, 1
-socialplanet.pl, 1
 socialproject.ml, 1
 socials.gq, 1
 socialsecrets-coaching.de, 1
@@ -101709,6 +101409,7 @@
 sockscap64.com, 1
 socktopus.io, 1
 socomforums.tk, 1
+soconj.gov, 1
 socraticsolutions.us, 1
 socseti.cf, 1
 socseti.ga, 1
@@ -101782,7 +101483,6 @@
 softelectronet.tk, 1
 softfuture.tk, 1
 softios.com, 1
-softlan.com.py, 1
 softly.sk, 1
 softonic.com, 1
 softonic.com.br, 1
@@ -101909,7 +101609,6 @@
 solemare-hotel.it, 1
 solentbasketball.co.uk, 1
 solentbubblesandbounce.co.uk, 1
-solepurposetest.com, 1
 solfegiator.ch, 0
 solfipinformatique.org, 1
 soli.cafe, 1
@@ -101936,7 +101635,6 @@
 solihullpcrepairs.co.uk, 1
 solikreis-stuttgart.tk, 1
 solipsists.tk, 1
-solisboutique.com.au, 1
 solisrey.es, 1
 solit.systems, 1
 solitairenetwork.com, 1
@@ -102079,6 +101777,7 @@
 sondersobk.dk, 1
 sondoro.tk, 1
 sondriotoday.it, 1
+sonerezh.bzh, 1
 sonesinafar.tk, 1
 sonesisonesi.tk, 1
 sonesonesisi.tk, 1
@@ -102177,7 +101876,6 @@
 sopronforras.tk, 1
 sopsop.tk, 1
 soquee.net, 1
-sor.so, 1
 sorabi.jp, 1
 soraharu.com, 1
 soraiaschneider.com.br, 1
@@ -102210,7 +101908,6 @@
 sos-idraulico.it, 1
 sos-loodgieter.com, 1
 sos-muratore.it, 1
-sos-zimmerpflanzen.de, 1
 sos.sk, 0
 sos.vg, 1
 sos.yt, 1
@@ -102563,7 +102260,6 @@
 spanischunterricht.tk, 1
 spanishblackboard.com, 1
 spanishdogs.tk, 1
-spanishfox.com, 1
 spanishnewsarticles.tk, 1
 spanishnow.tk, 1
 spanjeflydrive.nl, 1
@@ -102651,6 +102347,7 @@
 speakermatch.com, 1
 speakersbusiness.com, 1
 speakersden.tk, 1
+speakertwpmi.gov, 1
 spear.ga, 1
 specdrones.us, 1
 special-equipment.tk, 1
@@ -102862,6 +102559,7 @@
 splashstoretw.com, 1
 splatprofcare.com, 1
 spleis.no, 1
+splendidspoon.com, 1
 splendorservizi.it, 1
 spli.co, 1
 splibrary.tk, 1
@@ -103091,7 +102789,6 @@
 spufpowered.com, 1
 spur.com.br, 1
 spurghi.roma.it, 1
-spurindustrial.com, 1
 spurto.in, 1
 sputnik1net.org, 1
 spy-net.tk, 1
@@ -103135,7 +102832,6 @@
 sqshq.de, 1
 squad.fr, 1
 squadgames.ru, 1
-squadlinx.com, 1
 squadronprotectiveservices.net, 1
 squardllc.ml, 1
 square-gamers.tk, 1
@@ -103151,6 +102847,7 @@
 squarecat.io, 1
 squaredancedance.tk, 1
 squaredseven.com, 1
+squarefootllcconstruction.com, 0
 squareforums.com, 1
 squaregift.com, 1
 squaregift.net, 1
@@ -103239,6 +102936,7 @@
 srkb.net, 1
 srle.tk, 1
 srmt82east.com, 1
+srnl.gov, 1
 sro.center, 1
 sro.fi, 1
 srochno-pohudeti.tk, 1
@@ -103353,7 +103051,6 @@
 sspanel.host, 1
 ssprod.tk, 1
 sspu.ml, 1
-ssr.llc, 1
 ssradio.live, 1
 ssready.io, 1
 ssrfq.com, 1
@@ -103415,7 +103112,6 @@
 stadtbauwerk.at, 0
 stadtbuecherei-bad-wurzach.de, 1
 stadterneuerung-hwb.de, 1
-stadtgartenla.com, 1
 stadtkapelle-oehringen.de, 1
 stadtpapa.de, 1
 stadtplan-ilmenau.de, 1
@@ -103518,7 +103214,6 @@
 standfore.com, 1
 standheizung-shop.de, 1
 standingbear.tk, 1
-standoff-magic.ru, 1
 standoffdrop.com, 1
 standoffdrop.ru, 1
 standsearch.cf, 1
@@ -103621,6 +103316,7 @@
 starry.blue, 1
 starrymc.cn, 1
 starryvoid.com, 1
+starsam80.net, 1
 starsbattle.net, 1
 starscream.xyz, 1
 starseersprophecy.com, 1
@@ -103743,7 +103439,6 @@
 statsnite.com, 1
 status.care, 1
 status.vg, 1
-statusboard.eu, 1
 statusbot.io, 1
 statuscode.ch, 1
 statusdoors.com, 1
@@ -103830,6 +103525,7 @@
 steborio.pw, 1
 steckel.cc, 1
 stecos.co.uk, 1
+stedb.eu, 1
 stedbg.net, 1
 steebel.com.au, 1
 steef389.eu, 1
@@ -103891,9 +103587,7 @@
 steggemachine.com, 1
 stehlik.co.uk, 1
 stehlik.sk, 1
-steidlewirt.de, 1
 steigerlegal.ch, 1
-steinberg.net, 1
 steinbergmedia.de, 1
 steiner-dominik.at, 1
 steiner.do, 1
@@ -103919,6 +103613,7 @@
 stellarguard.me, 1
 stellarium-gornergrat.ch, 1
 stellarlumensnews.today, 1
+stellen.ch, 1
 stelleninserate.de, 1
 stellenticket.de, 1
 stelletjeafgebeuktemongolen.tk, 1
@@ -103927,6 +103622,7 @@
 stels.ml, 1
 stels.tk, 1
 stem16plus.gent, 1
+stemapp.io, 0
 stematechnologies.ga, 1
 stembureauledenindenhaag.nl, 1
 stemcellclinic.design, 1
@@ -103948,7 +103644,7 @@
 stena.cf, 1
 stenaro.ch, 1
 stenhojmedia.dk, 1
-stening.co, 1
+stening.co, 0
 steno.nl, 1
 stensund.se, 1
 stenvallmcclain.tk, 1
@@ -103977,6 +103673,7 @@
 stephenschirle.ml, 1
 stephenschrauger.com, 1
 stephenschrauger.org, 1
+stephenscity.gov, 1
 stephenskory.com, 1
 stephensol.is, 1
 stephensolis.com, 1
@@ -104183,6 +103880,7 @@
 stirling.co, 1
 stisidores.org, 1
 stitch.money, 1
+stitchfiddle.com, 1
 stitchinprogress.com, 1
 stjohncamden.com, 1
 stjohnin.com, 1
@@ -104206,6 +103904,7 @@
 stleismann.de, 1
 stleonardmn.org, 1
 stlfamilyattorney.com, 1
+stlfc.gov, 1
 stlfence.com, 1
 stln.ml, 1
 stlouiscountymovotes.gov, 1
@@ -104250,6 +103949,7 @@
 stock-solution.de, 1
 stockanalysis.com, 1
 stockbridge-ma.gov, 1
+stockbridgevt.gov, 1
 stockgraphicdesigns.com, 1
 stockholm.ga, 1
 stockholmpride.org, 1
@@ -104321,10 +104021,10 @@
 stoneproperty.ie, 1
 stonerwitch.tk, 1
 stonesbones.com, 1
-stonesnowboards.com, 1
 stonetribute.tk, 1
 stoneworld.ga, 1
 stonewuu.com, 1
+stoningtonboroughct.gov, 1
 stonystratford.org, 1
 stoom-stichting.nl, 1
 stoomstichting.be, 1
@@ -104392,7 +104092,6 @@
 storeit.co.uk, 1
 storemax.com.au, 1
 storeplus.ml, 1
-storey-lines.com, 1
 storgaarddieu.com, 1
 storgom.ua, 0
 storiadellarte.com, 1
@@ -104415,7 +104114,6 @@
 stormrider.tk, 1
 stormwatcher.org, 1
 stormylegions.tk, 1
-stormyyd.com, 1
 storspillercasino.com, 1
 stortiservices.com, 1
 storvann.net, 1
@@ -104569,12 +104267,12 @@
 streamgoalandres.ml, 1
 streaming-download.net, 1
 streaming.jetzt, 1
+streaminginternacional.com, 1
 streamlineverify.com, 1
 streamodz.com, 1
 streamonline.fi, 1
 streampanel.net, 1
 streampleasure.xyz, 1
-streamrite.com, 1
 streams.dyndns.org, 1
 streamside.tk, 1
 streamspouredout.com, 1
@@ -104712,7 +104410,6 @@
 ststanislaus.com, 1
 stt.wiki, 1
 sttammanyurology.com, 1
-sttg.com.au, 1
 stthomasbrigantine.org, 1
 sttl-topographie.com, 1
 sttpk.id, 0
@@ -105044,6 +104741,7 @@
 sudaraka.org, 0
 sudcalifornianos.me, 1
 sudmotor-occasions.be, 0
+sudo.li, 1
 sudo.ws, 1
 sudoash.com, 1
 sudoku-insight.tk, 1
@@ -105268,7 +104966,6 @@
 sunnysin.net, 1
 sunnyssingh.tk, 1
 sunnyvalesuites.com, 1
-sunnyx3m.com, 1
 sunokuran.tk, 1
 sunpax.ga, 1
 sunpig.com.my, 1
@@ -105361,6 +105058,7 @@
 supercastlesmelbourne.com.au, 1
 supercastlessouthsydney.com.au, 1
 supercastlessunshinecoast.com.au, 1
+supercastlessydney.com.au, 1
 supercentenarian.com, 1
 supercharged.co.uk, 1
 supercima.com, 0
@@ -105452,7 +105150,6 @@
 supersonnig-festival.de, 1
 supersonnigfestival.de, 1
 superspeller.ng, 1
-supersprowtz.com, 1
 superstargossip.com, 1
 superstarhost.tk, 1
 superstart.tk, 1
@@ -105604,11 +105301,6 @@
 sustainabilityknowledgegroup.com, 1
 sustainabilitysociety.hk, 1
 sustained.tk, 1
-sustainimum.com, 1
-sustainimum.email, 1
-sustainimum.eu, 1
-sustainimum.net, 1
-sustainimum.org, 1
 sustainoss.org, 1
 sustc.ac.cn, 1
 susthx.com, 1
@@ -105682,7 +105374,6 @@
 sveikas.info, 1
 sveinerik.org, 1
 sven-erik.org, 1
-sven.ai, 1
 svenbacia.me, 1
 svendubbeld.nl, 1
 sveneckelmann.de, 1
@@ -105780,6 +105471,7 @@
 swat.io, 1
 swat4stats.com, 1
 swatee.com, 1
+swattransport.ae, 1
 sway-cdn.com, 1
 sway.com, 1
 swayampaaka.com, 1
@@ -105815,7 +105507,6 @@
 sweetenedcondensed.com, 1
 sweetgood.de, 1
 sweethearts.tk, 1
-sweethomemargarita.com, 0
 sweethomesnohomishrenovations.com, 1
 sweethorses.tk, 1
 sweetintrigue.tk, 1
@@ -106039,7 +105730,6 @@
 synabi.com, 0
 synack.uk, 1
 synackrst.net, 1
-synapseretailing.com, 0
 synaptickz.me, 1
 sync-it.no, 1
 synccentre.com, 1
@@ -106154,6 +105844,7 @@
 systemeprod.fr, 0
 systemerr.tk, 1
 systemintegra.ru, 1
+systemisbusy.info, 1
 systemische-praxis-darmstadt.de, 1
 systemlead.pl, 1
 systemli.org, 1
@@ -106273,21 +105964,21 @@
 t7e.de, 0
 t81365.com, 1
 t82365.com, 1
-t8803.com, 1
+t8803.com, 0
 t8805.com, 1
-t8807.com, 1
-t8809.com, 1
-t8815.com, 1
+t8807.com, 0
+t8809.com, 0
+t8815.com, 0
 t8816.com, 1
-t8817.com, 1
-t8819.com, 1
-t8830.com, 1
+t8817.com, 0
+t8819.com, 0
+t8830.com, 0
 t88gg.com, 1
-t88jj.com, 1
-t88mm.com, 1
-t88nn.com, 1
-t88oo.com, 1
-t88ss.com, 1
+t88jj.com, 0
+t88mm.com, 0
+t88nn.com, 0
+t88oo.com, 0
+t88ss.com, 0
 t88vip0.com, 1
 t88vip1.com, 1
 t88vip2.com, 1
@@ -106387,6 +106078,7 @@
 tadalafilindia.gq, 1
 taddiestales.com, 1
 tadinfos.fr, 1
+tadiranbatteries.de, 0
 tadj-mahalat.com, 1
 tadjiki.tk, 1
 tadjikistan.tk, 1
@@ -106531,7 +106223,6 @@
 takk.pl, 1
 takkaaaaa.com, 1
 takkguitar.net, 1
-tako-miyabi.xyz, 1
 takosen.co.jp, 1
 taksaft.tk, 1
 taktika.tk, 1
@@ -106727,7 +106418,6 @@
 tannerwilliamson.com, 1
 tannerwj.com, 1
 tannextcloud.cf, 1
-tanntime.no, 1
 tanovar.com, 1
 tanpopo.io, 1
 tantalos.nl, 1
@@ -106775,7 +106465,6 @@
 taplemon.com, 1
 tappezzeria.roma.it, 1
 tappezziere.milano.it, 0
-tapple.world, 1
 tappyshop.com.br, 1
 tapquad.com, 1
 taprix.org, 1
@@ -106841,6 +106530,7 @@
 tarotsgratuits.com, 1
 tarper24.net, 1
 tarrasque.io, 1
+tarrytownny.gov, 1
 tarsan.cz, 1
 tarsashaz-biztositas.hu, 1
 tartaneagle.org.uk, 1
@@ -106854,7 +106544,6 @@
 tas.best, 1
 tas2580.net, 0
 tasadar.net, 0
-tasadordecoches.com, 1
 tasarimgazetesi.com, 1
 tasbrouwwinkel.nl, 1
 tascas.ga, 1
@@ -106862,7 +106551,6 @@
 tascuro.com, 1
 tasefiling.gov, 1
 tasintrip.com, 1
-taskboss.at, 1
 taskforce.eu, 1
 taskhorizon.audio, 1
 taskin.me, 1
@@ -106919,7 +106607,6 @@
 tattootoday.org, 0
 tattvaayoga.com, 1
 tatu-love.tk, 1
-tatuantes.com, 1
 taturukav.tk, 1
 taubin.cc, 1
 tauedu.org, 1
@@ -107062,6 +106749,7 @@
 tche.digital, 1
 tchealers.com, 1
 tchebb.me, 1
+tchnics.de, 1
 tchoukball.ch, 0
 tchouktchouk-baroum.fr, 1
 tchverheul.nl, 1
@@ -107112,7 +106800,7 @@
 tdude.co, 1
 tdvg.nl, 1
 tdxexpedited.com, 1
-tdyx-china.com.cn, 1
+tdyx-china.com.cn, 0
 tea-empire.co.uk, 1
 tea.in.th, 1
 teach.gq, 1
@@ -107122,6 +106810,7 @@
 teacherfrancis.com, 1
 teachermommylife.com, 1
 teacherph.com, 1
+teacherph.net, 0
 teacherpowered.org, 1
 teacherquinten.com, 1
 teacherquotes.gq, 1
@@ -107129,7 +106818,6 @@
 teachinginhighered.com, 1
 teachking.tk, 1
 teachmeplease.ru, 1
-teachoo.com, 1
 teachpeople.org, 1
 teachwithouttears.com, 1
 teacuppersiancats.com, 1
@@ -107161,7 +106849,6 @@
 team3.io, 1
 team3482.com, 1
 team957.co.uk, 1
-teamacadia.org, 1
 teamarasensas.tk, 1
 teamb.nl, 1
 teambalinge.tk, 1
@@ -107257,7 +106944,6 @@
 tease.email, 1
 teasenetwork.com, 1
 teaser-trailer.com, 1
-teast.eu, 1
 teatrarium.com, 1
 teatroutopia.tk, 1
 teazer.tk, 1
@@ -107346,9 +107032,9 @@
 teched-creations.com, 1
 techendeavors.com, 1
 techexpert.tips, 1
+techexplorist.com, 1
 techfibian.tk, 1
 techfishnews.com, 1
-techformator.pl, 0
 techfreepro.ml, 1
 techgama.org, 1
 techgarage.blog, 1
@@ -107405,7 +107091,6 @@
 technicalustad.com, 1
 techniclab.net, 0
 techniclab.org, 0
-technik-boeckmann.de, 1
 technochat.in, 1
 technodance.tk, 1
 technogies.cf, 1
@@ -107534,6 +107219,7 @@
 tecnicapotiguar.com.br, 1
 tecnick.com, 1
 tecnicoelettrodomestici.roma.it, 1
+tecnikan.com.ar, 1
 tecnimotos.com, 1
 tecnipuntoseguridad.com, 1
 tecno-block.ru, 1
@@ -107563,6 +107249,7 @@
 tecverso.com.br, 1
 tecwolf.com.br, 1
 tecyt.com, 1
+ted.do, 0
 tedb.us, 0
 teddax.com, 1
 tedder.cc, 1
@@ -107759,6 +107446,7 @@
 telka-online.tk, 1
 telkomuniversity.ac.id, 0
 tellerify.com, 1
+tellet.tel, 1
 telling-voices.tk, 1
 telling.xyz, 1
 tellingua.com, 0
@@ -107778,8 +107466,6 @@
 telugu4u.net, 1
 tem.li, 1
 temariogratis.com, 1
-temariopolicianacional.es, 1
-temariosdeoposiciones.es, 1
 temariosoposiciones.tk, 1
 tematicas.org, 1
 temdu.com, 1
@@ -108069,7 +107755,6 @@
 testmx.org, 1
 testmy.net, 1
 testmy.tk, 1
-testnode.xyz, 0
 testomato.com, 1
 testone.com.tr, 1
 testoon.com, 1
@@ -108261,6 +107946,7 @@
 thaiforest.ch, 0
 thaiforexfamily.com, 1
 thaigirls.cf, 1
+thaigirls.xyz, 0
 thaihomecooking.com, 1
 thaihong.co.th, 1
 thaihotmodels.tk, 1
@@ -108485,7 +108171,6 @@
 thebitchneyfiles.tk, 1
 theblackboard.gr, 1
 theblackcat.ga, 1
-theblacklock.com, 1
 theblisters.tk, 1
 theblondeabroad.com, 0
 theblue.tk, 1
@@ -108611,7 +108296,6 @@
 thecubepsych.com, 1
 thecultureworks.com, 1
 thecureplainsong.tk, 1
-thecuriouscat.net, 1
 thecuriousdev.com, 1
 thecustomdroid.com, 1
 thecustomizewindows.com, 1
@@ -108639,7 +108323,6 @@
 thedevilsbrigade.com, 1
 thedevilwearswibra.nl, 1
 thedevrycommonsbrasil.com, 0
-thediabetesnews.com, 1
 thediamondcenter.com, 1
 thediaryofadam.com, 1
 thedietsolutionprog.tk, 1
@@ -108721,6 +108404,7 @@
 theflyingdutch.tk, 1
 thefnafarchive.org, 1
 thefoodcops.com, 1
+thefooddictator.com, 1
 thefoodellers.com, 1
 thefoodiefit.com, 1
 thefoot.tk, 1
@@ -108836,7 +108520,7 @@
 theideaskitchen.com.au, 1
 theidiotboard.com, 1
 theig.co, 1
-theilluminatisociety.org, 1
+theilluminatisociety.org, 0
 theimagefile.com, 1
 theimaginationagency.com, 1
 theinboxpros.com, 1
@@ -108981,10 +108665,10 @@
 themoviepreview.ga, 1
 themurrayfamily.me.uk, 1
 themusecollaborative.org, 1
-themusic.cloud, 1
 themusicalsafari.com, 1
 themusicthatnobodylikes.tk, 1
 themusthaves.de, 1
+then.icu, 1
 thenappylaundry.ga, 1
 thenathanmethod.com, 1
 thenation.tk, 1
@@ -109035,7 +108719,6 @@
 theoldsewingfactory.com, 1
 theolodewijk.nl, 1
 theologique.ch, 0
-theomegagroup.co.uk, 1
 theomg.co, 1
 theonegroup.co.uk, 0
 theonethaimassage.de, 1
@@ -109062,11 +108745,9 @@
 theotherconcept.be, 1
 theotherside.tk, 1
 theoverfly.co, 1
-theowlclub.net, 1
 thepaffy.de, 1
 thepaleodiettips.tk, 1
 thepandacustom.com, 1
-thepaperlion.ca, 1
 theparachafamily.tk, 1
 theparklane-sukhumvitbearing.com, 1
 theparoxetine.gq, 1
@@ -109096,6 +108777,7 @@
 thepinfluencers.com, 1
 thepioneers.nl, 1
 thepiratebay.cf, 1
+thepiratebay.net, 1
 thepiratesociety.org, 1
 thepitsurfhire.co.uk, 1
 thepixel.tk, 1
@@ -109262,7 +108944,6 @@
 thespacegame.tk, 1
 thesphinx.ca, 1
 thespiritfm.tk, 1
-thesplashlab.com, 1
 thesslstore.com, 1
 thesslstore.in, 1
 thestable.com, 1
@@ -109512,7 +109193,6 @@
 thinkmarketing.ca, 1
 thinkprocedural.com, 1
 thinktac.com, 1
-thinktankofthree.com, 1
 thinkwisesoftware.com, 1
 thinkwits.com, 1
 thinxtream.com, 1
@@ -109651,7 +109331,6 @@
 threepoint.tk, 1
 threerivers.edu, 1
 threeriversopenhouse.com, 1
-threeshipswhisky.co.za, 1
 threethirty.gq, 1
 threexxx.ch, 1
 threit.de, 1
@@ -109704,6 +109383,7 @@
 thw-bernburg.de, 1
 thw-jugend-muenchen-west.de, 1
 thwebdesigns.com, 1
+thweis.com, 1
 thwiki.cc, 1
 thxandbye.de, 1
 thycotic.ru, 1
@@ -109765,7 +109445,7 @@
 ticketbahia.com, 1
 ticketcity.com, 1
 ticketdriver.com, 1
-ticketmaze.com, 1
+ticketmaze.com, 0
 ticketpro.ca, 0
 ticketrunway.com, 1
 tickets2004.tk, 1
@@ -109864,7 +109544,6 @@
 tiffany.life, 1
 tiffany.moe, 1
 tiffanyblooms.ru, 1
-tiffanytravels.com, 1
 tiffanywatson.xyz, 1
 tiffnix.com, 1
 tifia.com, 1
@@ -109904,7 +109583,6 @@
 tikitak-o-rama.tk, 1
 tikona.ga, 1
 tiktak.su, 1
-tiktok.com, 1
 tiktokgirls.live, 1
 tiktokoff.com, 1
 tikun.tk, 1
@@ -110095,7 +109773,6 @@
 tintoria.roma.it, 1
 tintuonmobile.tk, 1
 tinturanaturale.it, 1
-tiny-house.ro, 1
 tiny-img.com, 1
 tiny-tattoos.tk, 1
 tiny.ee, 1
@@ -110142,7 +109819,6 @@
 tipscesarlopez.com, 1
 tipsfinal.tk, 1
 tipskanalen.cf, 1
-tipslab.info, 1
 tipslifetimefitness.ga, 1
 tipslifetimefitness.gq, 1
 tipsmake.com, 1
@@ -110152,7 +109828,6 @@
 tipsypresent.com, 1
 tiptoptransmissions.com, 1
 tipulnagish.co.il, 1
-tipwho.com, 1
 tiqets.com, 1
 tir-mauperthuis.fr, 1
 tiraloche.com, 1
@@ -110608,7 +110283,7 @@
 tomasmatulevicius.lt, 1
 tomasmoberg.org, 1
 tomaspatera.cz, 1
-tomasvecera.cz, 1
+tomasvecera.cz, 0
 tomasz.com, 1
 tomaszdwornicki.net, 1
 tomatenaufdenaugen.de, 1
@@ -110750,7 +110425,6 @@
 tonkayagran.com, 0
 tonkayagran.ru, 1
 tonnycat.com, 1
-tonnygaric.com, 1
 tono.us, 1
 tonorosario.tk, 1
 tonshaiza.tk, 1
@@ -110772,6 +110446,7 @@
 tonytan.io, 1
 tonytan.net, 1
 tonytron.com.br, 1
+tonyw.xyz, 1
 tonywebster.com, 1
 too.com.ua, 1
 too.gy, 1
@@ -110913,6 +110588,7 @@
 topkorea.ml, 1
 toplevel.mx, 1
 toplifesaudaveis.com.br, 1
+toplink.co.il, 1
 toplist.cz, 1
 toplist.eu, 1
 toplist.sk, 1
@@ -111034,6 +110710,7 @@
 tormakristof.eu, 1
 tormentedradio.com, 0
 tormox.ml, 1
+tornado-map.de, 1
 tornadoarchiv.ml, 1
 tornadodetector.ga, 1
 tornadotwistar.com, 1
@@ -111125,7 +110802,6 @@
 total-security.tk, 1
 totalaccessnicaragua.co, 1
 totalbike.com.br, 1
-totalcarcheck.co.uk, 1
 totalcarpetcare.co.uk, 1
 totalchecklist.com, 1
 totalconceptnh.com, 1
@@ -111134,7 +110810,6 @@
 totalengineering.club, 1
 totalforcegym.com, 0
 totalfoundationpros.com, 1
-totalhomecareinc.com, 1
 totalhost.gq, 1
 totalinfo.in, 1
 totalintegratedtherapy.com, 1
@@ -111279,17 +110954,21 @@
 townifi.ga, 1
 townlaretsota.gq, 1
 townofbridgewater.ca, 1
+townofbrooklynwi.gov, 1
 townofbrookwoodal.gov, 1
 townofcaponbridgewv.gov, 1
 townofclevelandnc.gov, 1
-townofgoldenmeadow-la.gov, 1
 townofhamiltonny.gov, 1
 townofhulbertok.gov, 1
+townofhumeny.gov, 1
+townofjohnsonwi.gov, 1
 townoflebanonny.gov, 1
 townofmineral.net, 1
+townofomro.gov, 1
 townofpolk-wi.gov, 1
 townofruthnc.gov, 1
 townoftaycheedahwi.gov, 1
+townofthomsonmn.gov, 1
 townofwinneconne.gov, 1
 townresults.ga, 1
 townshipofthenorthshore.ca, 1
@@ -111697,7 +111376,6 @@
 traumfaenger.tk, 1
 traumobjekte.com, 1
 traumobjekte.info, 1
-traumschwingen.de, 1
 traumwerker.com, 1
 traut.cloud, 1
 travador.com, 1
@@ -111874,7 +111552,6 @@
 treasuryhunt.gov, 1
 treasuryofgreatchildrensbooks.com, 1
 treasuryscams.gov, 1
-treatment.org, 1
 treatmentindiana.com, 1
 treatyoself.com.au, 1
 trebek.club, 1
@@ -112255,6 +111932,7 @@
 truckerjobusa.com, 1
 truckersmp.com, 1
 truckersworld.tk, 1
+truckingks.gov, 1
 truckscout24.at, 1
 truckscout24.be, 1
 truckscout24.bg, 1
@@ -112367,10 +112045,8 @@
 truten.tk, 1
 truth.tk, 1
 truthdancer.com, 1
-truthlost.com, 1
 truthmessages.pw, 1
 truthsayer.tk, 1
-truthserum.co, 1
 trutopoffer.com, 1
 truvayangin.tk, 1
 truvisory.com, 1
@@ -112403,11 +112079,9 @@
 trymegadrol.com, 1
 tryndraze.com, 1
 trynowrinkleseyeserum.com, 1
-trynta.com, 1
 trynta.net, 1
 tryonnc.gov, 1
 trypathnow.com, 1
-trypenspinning.com, 1
 tryplo.ca, 1
 tryplo.com, 1
 tryplo.io, 1
@@ -112448,6 +112122,7 @@
 tsenv.net, 1
 tsgbit.net, 1
 tsgkc1.com, 1
+tshirtatlowprice.com, 1
 tshirtgenerator.ga, 1
 tshirtmemoryquilts.com, 1
 tshirtscapetown.com, 1
@@ -112588,7 +112263,6 @@
 tuckmeintebo.com, 1
 tucnak.eu, 1
 tucny.com, 1
-tucoladaperfecta.es, 1
 tucsonfcu.com, 1
 tucsonpcrepair.com, 1
 tucuatro.com, 1
@@ -112707,7 +112381,6 @@
 tupeuxpastest.ch, 0
 tupianku.com, 1
 tupizm.com, 1
-tupoema.info, 1
 tuppenceworth.ie, 1
 tupperwaresalamanca.com, 1
 tupsicoayuda.com, 1
@@ -112734,9 +112407,7 @@
 turfirm.tk, 1
 turgut46.tk, 1
 turi.space, 1
-turigum.com, 1
 turiscar.pt, 1
-turismodubrovnik.com, 1
 turismogdl.com, 1
 turismoliliana.tk, 1
 turismonochile.com, 1
@@ -112805,7 +112476,7 @@
 turpinpesage.fr, 1
 tursiae.org, 1
 turteka.com, 1
-turtledigital.co.uk, 1
+turtle.ai, 0
 turtleduckstudios.com, 1
 turtlehead.tk, 1
 turtles.ga, 1
@@ -112889,7 +112560,6 @@
 tuxplace.nl, 1
 tuxsoul.com, 1
 tuxsrv.com, 1
-tuxtimo.me, 1
 tuyensinhcanuoc.com, 1
 tuyetchieuwebsite.tk, 1
 tuza.com.au, 1
@@ -113124,7 +112794,6 @@
 tyler.rs, 1
 tylerdavies.net, 1
 tylerdurden.ml, 1
-tylerharcourt.ca, 1
 tylerharcourt.com, 1
 tylerharcourt.net, 1
 tylerharcourt.org, 1
@@ -113393,6 +113062,7 @@
 uebersetzungscenter.ch, 1
 ueberwachungspaket.at, 1
 uedaviolin.com, 1
+uefeng.com, 0
 uel-thompson-okanagan.ca, 1
 uesc.org, 1
 uesociedadlimitada.com, 1
@@ -113418,15 +113088,12 @@
 ufplanets.com, 1
 ufroo.com, 1
 ufuq.de, 1
+ugameclub.com, 1
 ugb-verlag.de, 0
 ugcdn.com, 1
 ugeek.tk, 1
 uggedal.com, 1
 ugirlx.com, 1
-uglycat.com, 1
-uglycat.eu, 1
-uglycat.net, 1
-uglycat.org, 1
 ugmtc.org, 1
 ugolovnyj-advokat.cf, 1
 ugolsibiri.ru, 1
@@ -113607,7 +113274,6 @@
 umanews.net, 1
 umanityracing.com, 1
 umanupszn.gov.ua, 1
-umartina.eu, 1
 umaru.gq, 1
 umas.tk, 1
 umashev.ru, 1
@@ -113642,7 +113308,6 @@
 un-box.org, 1
 un-framed.co.za, 1
 un-zero-un.fr, 1
-unadonna.it, 1
 unae.fr, 1
 unaffectedsound.tk, 1
 unai-yus.tk, 1
@@ -113669,18 +113334,14 @@
 unblocked.krd, 1
 unblocked.lat, 1
 unblocked.lc, 1
-unblocked.llc, 1
 unblocked.ltda, 1
 unblocked.mx, 1
-unblocked.nz, 1
 unblocked.one, 1
-unblocked.pet, 1
 unblocked.pro, 1
 unblocked.sh, 1
 unblocked.uno, 1
 unblocked.vc, 1
 unblocked.vet, 1
-unblocked.vip, 1
 unblocked.win, 1
 unblockit.bid, 1
 unblockit.biz, 1
@@ -113774,7 +113435,6 @@
 unfallrechtler.de, 1
 unfamousrecords.tk, 1
 unfathomable.blue, 1
-unfc.nl, 1
 unferno.tech, 1
 unfettered.net, 0
 unfixed-soul.tk, 1
@@ -113795,7 +113455,6 @@
 uni-watch.com, 1
 uni2share.com, 1
 unian.info, 1
-uniaofraternalraulcury.com.br, 1
 unibaby.com, 1
 unibet.gg, 1
 unibev.net, 1
@@ -113844,8 +113503,8 @@
 uniforcele.com, 1
 uniform-agri.com, 1
 uniformebateriasheliar.com.br, 1
-uniformesdreamleaguesoccer.com, 1
 unify.id, 1
+unik.bg, 1
 unikainfocom.in, 1
 uniklinik-cms.com, 1
 unikoingold.com, 1
@@ -113880,7 +113539,6 @@
 unipart.digital, 0
 unipass.ga, 1
 unipig.de, 0
-uniq.site, 1
 uniqsys.eu, 1
 unique-news.tk, 1
 unique-punk.tk, 1
@@ -114033,7 +113691,6 @@
 unluco.com, 1
 unmanaged.space, 1
 unmarkdocs.co, 1
-unmonito.red, 1
 unmutegreetings.dk, 1
 unn-edu.info, 1
 unnamed.download, 1
@@ -114233,7 +113890,6 @@
 urabain.com, 1
 uradisam.rs, 1
 uradvd.best, 1
-uradvd.town, 1
 uraimo.com, 1
 urakn0x.tk, 1
 ural-emal.ga, 1
@@ -114302,7 +113958,6 @@
 urbanwildlifealliance.org, 0
 urbanxdevelopment.com, 0
 urbanxhome.com, 1
-urbanyshop.com, 1
 urbest.io, 1
 urbexdk.nl, 1
 urbexing.eu, 1
@@ -114538,7 +114193,6 @@
 usuan.net, 1
 usuluddin.ga, 1
 usuluddin.tk, 1
-usweme.info, 1
 uswitch.com, 1
 usyfawovad.gq, 1
 usygov.ga, 1
@@ -114560,7 +114214,6 @@
 utaowan.com, 0
 utavatu.mk, 1
 utazas-nyaralas.info, 1
-utazine.com, 1
 utbabogados.com, 1
 utbosbeekhuuske.tk, 1
 utcast-mate.com, 1
@@ -114623,7 +114276,6 @@
 uv.uy, 1
 uvc.com.ua, 1
 uvcbyefsen.com, 1
-uvcleanfrance.com, 1
 uvenuse.cz, 1
 uvlamp.ee, 1
 uvocorp.com, 1
@@ -114653,6 +114305,7 @@
 ux-designers.nl, 1
 ux-solution.de, 1
 uxdesignerjobs.nl, 1
+uxpressia.com, 1
 uxtag.com, 1
 uxteam.com, 1
 uy.search.yahoo.com, 0
@@ -114718,7 +114371,7 @@
 v0v.cc, 1
 v0v.de, 1
 v1.dk, 1
-v10006.com, 1
+v10006.com, 0
 v10008.com, 1
 v1081.com, 1
 v139.com, 1
@@ -114732,7 +114385,7 @@
 v2raytech.com, 1
 v2speed.me, 1
 v2x.sk, 1
-v3025.com, 1
+v3025.com, 0
 v33v33.com, 1
 v36533.com, 1
 v44v44.com, 1
@@ -114743,11 +114396,11 @@
 v5197.co, 1
 v55565.com, 0
 v55v55.com, 1
-v5658.com, 1
+v5658.com, 0
 v5ray.top, 1
 v6004.com, 1
 v6021.com, 1
-v6170.com, 1
+v6170.com, 0
 v6350.com, 1
 v6506.com, 1
 v66255.com, 0
@@ -114772,7 +114425,7 @@
 v9285.com, 0
 v9297.co, 1
 v9728.co, 1
-v9728.com, 1
+v9728.com, 0
 v9820.com, 1
 va-reitartikel.com, 1
 va.gov, 0
@@ -114780,12 +114433,12 @@
 va11halla.ddns.net, 1
 vaabogados.legal, 1
 vaaddress.co, 1
-vaaes.org, 0
 vaan-arbeidsrecht.nl, 1
 vaartjesboten.nl, 1
 vaat.io, 1
 vabusinesses.org, 1
 vacacionesenlinea.com, 1
+vacacionestours.com, 1
 vacancyfiller.com, 1
 vacatecleaning.melbourne, 1
 vacati0n.tk, 1
@@ -114804,7 +114457,6 @@
 vaclan.tk, 1
 vaclavambroz.eu, 1
 vaclavkocum.com, 1
-vacpas.com, 1
 vacuna.gov, 1
 vacuumreviewcenter.com, 1
 vacuumsealers.ml, 1
@@ -114930,6 +114582,7 @@
 vallejoca.gov, 1
 vallenar.tk, 1
 valleyautofair.com, 1
+valleycountyne.gov, 1
 valleydalecottage.com.au, 1
 valleyfleetsupport.org, 1
 valleyofdeath.tk, 1
@@ -114962,13 +114615,11 @@
 valtoaho.com, 1
 valtool.uk, 1
 valudo.st, 1
-valuecashhomes.com, 1
 valuecashoffers.com, 1
 valuechain.me, 1
 valuehost.com.br, 1
 valuemyhome.co.uk, 1
 valuemyhome.uk, 1
-valuemywebsite.net, 1
 valueng.com, 1
 valueofblog.com, 1
 valueourmind.com, 1
@@ -115153,7 +114804,6 @@
 vas.ae, 1
 vasanth.org, 0
 vasaprilezitost.eu, 1
-vasaprilezitost.sk, 1
 vascomm.co.id, 1
 vasconcellos.casa, 1
 vasconcellos.xyz, 1
@@ -115230,6 +114880,7 @@
 vbazile.com, 1
 vbelgorode.tk, 1
 vbestseller.com, 1
+vbhelp.org, 1
 vbql.me, 1
 vbsoft.cz, 1
 vburyatii.ml, 1
@@ -115533,7 +115184,7 @@
 verhaltenstherapie-weiden.de, 1
 verhaslaw.com, 1
 verhovs.ky, 0
-veri2.com, 1
+veri2.com, 0
 verifalia.com, 1
 verified.eu, 1
 verifiedjoseph.com, 1
@@ -115582,6 +115233,7 @@
 vernonreinike.com, 1
 vernonsecureselfstorage.ca, 1
 vernonspeedskatingclub.com, 1
+vernonvt.gov, 1
 vernonwintercarnival.com, 1
 veronasera.it, 1
 veronic.hu, 1
@@ -115661,6 +115313,7 @@
 vesta.us, 1
 vestacp.top, 1
 vestakassa-online.cf, 1
+vestalny.gov, 1
 vestberry.com, 1
 vestd.com, 1
 vestibtech.com, 1
@@ -115701,6 +115354,7 @@
 veto.fish, 1
 vetofish.com, 1
 vetosh.tk, 1
+vetpraxis.de, 1
 vetputten.nl, 1
 vetren.tk, 1
 vets.gov, 1
@@ -115749,7 +115403,6 @@
 viagratop.tk, 1
 viagusto.pl, 1
 viajantesturismo.com, 1
-viajaramsterdam.com, 1
 viaje-a-china.com, 1
 vialibido.com.br, 1
 viamilitaris.net, 1
@@ -115921,6 +115574,7 @@
 viditour-zorg.nl, 1
 vidkovaomara.si, 1
 vidlyoficial.com, 1
+vidmia.com, 1
 vidnova.ua, 1
 vidos-eu.com, 1
 vidracariaespelhosbh.com.br, 1
@@ -116087,6 +115741,7 @@
 villagecenterpediatrics.com, 1
 villagemagazines.co.uk, 1
 villagenscamuria.it, 1
+villageofcarbonhill-il.gov, 1
 villageofmuirmi.gov, 1
 villageofowegony.gov, 1
 villageoftikiisland.gov, 1
@@ -116188,7 +115843,6 @@
 vinner.com.au, 1
 vinnie.gq, 1
 vinny.tk, 1
-vinnyandchristina.com, 1
 vinnyvidivici.com, 1
 vinodoc.cz, 1
 vinohradiv.tk, 1
@@ -116254,7 +115908,6 @@
 vip6132.com, 1
 vip77018.com, 1
 vip8522.com, 1
-vipass.ca, 1
 vipcards.top, 1
 vipd88.net, 1
 vipdirektolog.ru, 1
@@ -116489,7 +116142,6 @@
 visyeva.hu, 1
 vitaalcheck.nl, 1
 vitaalfitcoaching.nl, 1
-vitaen.nl, 1
 vitahook.pw, 1
 vitahost.ml, 1
 vitakov.tk, 1
@@ -116565,7 +116217,6 @@
 vivatv.com.tw, 1
 vivavox.tk, 1
 vive.com, 0
-vive.link, 1
 vivediabetes-sanamente.com, 1
 vivekanandaspokenenglish.com, 1
 vivelawir.eu, 1
@@ -116575,7 +116226,6 @@
 vivendi.de, 1
 viveport.com, 1
 viveportal.com, 1
-viveras.ch, 1
 viveremediglia.tk, 1
 vivesaludableconomnilife.com, 1
 vivetoluca.com, 1
@@ -116907,6 +116557,7 @@
 volunteerhere.ga, 1
 volunteers.tk, 1
 voluntourism.ga, 1
+volusiaelections.gov, 1
 volusiavotes.gov, 1
 volvo1800es.tk, 1
 volvoconnect.com, 1
@@ -116984,6 +116635,7 @@
 votecalhounfl.gov, 1
 votecitrus.gov, 1
 votedenton.gov, 1
+votefranklinfl.gov, 1
 votegulf.gov, 1
 votehamiltoncountyohio.gov, 1
 votehillsborough.gov, 1
@@ -117054,7 +116706,6 @@
 vpn.black, 1
 vpn.ht, 1
 vpn4free.ga, 1
-vpnaustralianow.org, 1
 vpnboss.com.au, 1
 vpnemail.com, 1
 vpnguvnor.co.uk, 1
@@ -117251,7 +116902,7 @@
 vv1234.cn, 1
 vv5197.co, 1
 vv6729.co, 1
-vv6729.com, 1
+vv6729.com, 0
 vv6957.co, 1
 vv9297.co, 1
 vv9397.com, 1
@@ -117334,7 +116985,6 @@
 w-p-k.de, 1
 w-spotlight.appspot.com, 1
 w-surgeryhospital.com, 1
-w-w-auto.de, 1
 w-ws.ga, 1
 w.wiki, 1
 w00228.com, 1
@@ -117355,6 +117005,7 @@
 w3330.com, 1
 w365.vip, 0
 w36533.com, 1
+w36594.com, 0
 w3app.nl, 1
 w3ctag.com, 1
 w3ctag.org, 1
@@ -117385,9 +117036,7 @@
 w61611.net, 1
 w61616.com, 1
 w66001.com, 1
-w6603.com, 1
 w661122.net, 1
-w6612.net, 1
 w66133.com, 1
 w66133.net, 1
 w66136.com, 1
@@ -117462,11 +117111,9 @@
 w9297.com, 1
 w9397.com, 1
 w95.pw, 1
-w9710.com, 1
 w9720.com, 1
 w9721.com, 1
 w9728.co, 1
-w9730.com, 1
 w9740.com, 1
 w9750.com, 1
 w97a.com, 1
@@ -117475,7 +117122,6 @@
 waagen.tk, 1
 waaifu.com, 1
 waalsekrook.be, 1
-waavit.com, 1
 waays.eu, 1
 waays.fr, 1
 waayz.eu, 1
@@ -117771,7 +117417,6 @@
 warezoom.com, 1
 warfarina.com, 1
 warfield.org.uk, 1
-wargameexclusive.com, 1
 wargov.tk, 1
 wargun.ml, 1
 warid.ga, 1
@@ -117819,7 +117464,6 @@
 warungmini-vanwou.nl, 1
 warupu.com, 1
 warworld.ml, 1
-wasabiwallet.co, 1
 wasabiwallet.io, 1
 wasatchcleanair.com, 1
 wasatchconstables.com, 1
@@ -117908,7 +117552,7 @@
 waterlemons2k.top, 1
 waterlens.moe, 1
 waterliteracy.tk, 1
-watermarkly.com, 1
+watermarkly.com, 0
 watermitigationspecialists.com, 1
 watermonitor.gov, 1
 wateroutlook.com, 1
@@ -117934,12 +117578,8 @@
 watestsite.ovh, 1
 watfordcyclehub.org.uk, 1
 watfordjc.uk, 1
-watgroeitwaar.com, 1
-watgroeitwaar.eu, 1
-watgroeitwaar.net, 1
-watgroeitwaar.nl, 1
-watgroeitwaar.org, 1
 watismijnbandenspanning.nl, 1
+watongaok.gov, 1
 watoo.tech, 1
 watsonsurplus.com, 1
 wattmaedchen.de, 1
@@ -117948,6 +117588,7 @@
 waukeect.com, 1
 waukeshairon.com, 1
 waupacacounty-wi.gov, 1
+waupacawi.gov, 1
 wav-productions.com, 1
 wav.tv, 1
 wave-inc.co.jp, 1
@@ -117989,6 +117630,7 @@
 wazzap.tk, 1
 wb-cw.tech, 1
 wb256.com, 1
+wb6668.net, 1
 wba.or.at, 1
 wbbauth.de, 1
 wbbwbwebweb.cf, 1
@@ -118010,8 +117652,8 @@
 wbt-solutions.net, 1
 wbudd.com, 1
 wbut.ml, 1
+wbvb.nl, 1
 wby.by, 1
-wby.gd, 1
 wby.tw, 1
 wc-is.com, 1
 wc3modding.ml, 1
@@ -118226,7 +117868,6 @@
 webcollector.ga, 1
 webconceptions.fr, 1
 webcontentserver.com, 1
-webcontentspinning.com, 1
 webcontrol.tk, 1
 webconverge.nl, 1
 webcookies.org, 1
@@ -118285,7 +117926,6 @@
 webfilings-eu.appspot.com, 1
 webfilings-mirror-hrd.appspot.com, 1
 webfilings.appspot.com, 1
-webfiredesigns.ca, 1
 webfixers.nl, 1
 webfocus.ph, 1
 webfoersterei.de, 1
@@ -118309,7 +117949,6 @@
 webhoffmann.de, 0
 webhooks.stream, 1
 webhopp.com, 1
-webhost.guide, 1
 webhosting-erfahrungen.de, 1
 webhosting4u.email, 0
 webhostingblackfriday.deals, 1
@@ -118485,6 +118124,7 @@
 websiteservice.pro, 1
 websitesseller.com, 1
 websitesthatwork.biz, 1
+websiteurl.org, 1
 websize.me, 1
 websmartlink.tk, 1
 websoftba.gq, 1
@@ -118492,7 +118132,6 @@
 websouthdesign.com, 1
 websphere.tk, 1
 webspider.tk, 1
-webspiral.jp, 1
 webspire.tech, 1
 webspotter.nl, 1
 webssupport.ga, 1
@@ -118650,6 +118289,7 @@
 wegrzynek.pl, 1
 wegvielfalt.de, 1
 wehealasone.gov.ph, 1
+weho.gov, 1
 wehostdnn.com, 1
 weibohan.com, 1
 weibomiaopai.com, 1
@@ -118712,7 +118352,6 @@
 weldersnet.tk, 1
 weldonconstruction.com.au, 1
 welfareness.icu, 1
-well-you.com, 1
 well.bayern, 1
 wella-download-center.de, 1
 wellandwealthy.org, 1
@@ -118807,7 +118446,6 @@
 wer-kommt-her.de, 1
 werbe-sonnenbrillen.de, 0
 werbeagentur.de, 1
-werbedesign-tauber.de, 1
 werbefotograf-leitner.de, 1
 werbefotografie-leitner.de, 1
 werbewelt-tv.de, 1
@@ -118865,7 +118503,7 @@
 wesreportportal.com, 1
 wessalicious.com, 1
 wessco.mx, 1
-wessner.co, 1
+wessner.co, 0
 west-contemporary.com, 1
 west-nerica.de, 1
 west-raptors.tk, 1
@@ -118922,6 +118560,7 @@
 westonaprice.london, 1
 westondenning.com, 1
 westonma.gov, 1
+westoveral.gov, 1
 westplains.gov, 1
 westpointne.gov, 1
 westportseaanglingfestival.eu, 1
@@ -118959,7 +118598,6 @@
 wewitro.de, 1
 wewitro.net, 1
 weworkjpn.com, 1
-wexfly.com, 1
 wexfordbouncycastles.ie, 1
 wexilapp.com, 1
 weyhmueller.de, 0
@@ -119037,11 +118675,6 @@
 whatevents.tk, 1
 whatevername.tk, 1
 whateverzone.ml, 1
-whatgrowswhere.com, 1
-whatgrowswhere.eu, 1
-whatgrowswhere.net, 1
-whatgrowswhere.nl, 1
-whatgrowswhere.org, 1
 whatiexpose.com, 1
 whatimissed.news, 1
 whatisapassword.com, 1
@@ -119572,6 +119205,7 @@
 willbarnesphotography.co.uk, 1
 willberg.bayern, 1
 willcounty.gov, 1
+willcounty911.gov, 1
 willcountyclerk.gov, 1
 willcountysao.gov, 1
 willdropphoto.co.uk, 1
@@ -119613,7 +119247,6 @@
 willlewis.co.uk, 1
 willmage.com, 1
 willnorris.com, 1
-willobyhomes.realestate, 1
 willocks.nl, 1
 willosagiede.com, 0
 willow.technology, 1
@@ -119657,7 +119290,6 @@
 win-fortuna.ml, 1
 win-rar.com, 1
 win.gg, 1
-win365.com, 1
 win7stylebuilder.com, 0
 win7tips.tk, 1
 win8.am, 1
@@ -119673,6 +119305,7 @@
 winch-center.de, 1
 winchat365.com, 1
 winckelmann2020.com, 1
+wincoil.gov, 1
 wind-riders.cf, 1
 wind.moe, 0
 windelnkaufen24.de, 1
@@ -119742,6 +119375,7 @@
 winmodels.org, 1
 winmodels.ru, 1
 winnebagocountyiowa.gov, 1
+winnebagocountywi.gov, 1
 winner.ua, 1
 winnercivi.com, 1
 winners.net, 1
@@ -119880,7 +119514,6 @@
 wiska.lat, 1
 wiskundeonderzoek.tk, 1
 wism.io, 1
-wisnuadi.com, 1
 wispmaeksmusic.tk, 1
 wispsuperfoods.com, 1
 wispyon.com, 1
@@ -119983,6 +119616,7 @@
 wlilai.com, 1
 wlmhtrecoverycollege.co.uk, 1
 wlmq10086.cn, 1
+wlombard.ru, 1
 wlpvzfilmy-onlajnmlawq.tk, 1
 wlt.ca, 0
 wltix.com, 0
@@ -120066,7 +119700,6 @@
 wolf-haven.tk, 1
 wolfachtal-alpaka.de, 1
 wolfarth.info, 1
-wolfcrow.com, 1
 wolfdig.com.br, 1
 wolfeco.net, 1
 wolfermann.org, 1
@@ -120078,7 +119711,6 @@
 wolfgang-kerschbaumer.net, 1
 wolfgang-kloke.de, 1
 wolfgang-ziegler.com, 1
-wolfhowl.me, 1
 wolflabs.co.uk, 1
 wolflambert.tk, 1
 wolfsburgwest.com, 1
@@ -120255,7 +119887,6 @@
 wordpressarequipa.com, 1
 wordpressbot.tk, 1
 wordpressdevelopment.ml, 1
-wordpresssetup.org, 1
 wordprix.com, 1
 wordregistrar.ga, 1
 wordsearchwhiz.com, 1
@@ -120345,7 +119976,6 @@
 world-documentary.ml, 1
 world-education-association.org, 1
 world-ir.international, 1
-world-lolo.com, 1
 world-of-arms.tk, 1
 world-of-tes.tk, 1
 world-politics.tk, 1
@@ -120559,7 +120189,6 @@
 wpcs.pro, 1
 wpdepo.com, 1
 wpdev.com.au, 1
-wpdirecto.com, 1
 wpdublin.com, 1
 wpekspres.com, 1
 wpen.ru, 1
@@ -120793,7 +120422,7 @@
 ww0512.com, 1
 ww5197.co, 1
 ww6729.co, 1
-ww6729.com, 1
+ww6729.com, 0
 ww6957.co, 1
 ww8989.com, 1
 ww9297.co, 1
@@ -120935,6 +120564,7 @@
 wyatttauber.com, 1
 wybar.uk, 1
 wycena.ga, 1
+wyckoff.vip, 1
 wycombetoday.com, 0
 wyczaruj.pl, 1
 wyday.com, 1
@@ -120993,7 +120623,6 @@
 x00786.com, 1
 x0r.be, 1
 x0r.link, 1
-x13.com, 1
 x13.net, 1
 x1616.tk, 1
 x17.cafe, 1
@@ -121163,12 +120792,10 @@
 xb935.com, 1
 xb936.com, 1
 xb937.com, 1
-xb951.com, 1
 xb953.com, 1
 xb957.com, 1
 xb961.com, 1
 xb962.com, 0
-xb963.com, 1
 xb965.com, 0
 xb967.com, 1
 xb971.com, 1
@@ -121326,7 +120953,7 @@
 xi.ht, 1
 xia.de, 1
 xia100.xyz, 1
-xiahdeh.com, 1
+xiahdeh.com, 0
 xiamenshipbuilding.com, 1
 xiamuzi.com, 1
 xiangblog.com, 1
@@ -121356,7 +120983,7 @@
 xiashali.me, 1
 xiaxuejin.cn, 1
 xiazhanjian.com, 0
-xibilus.com, 1
+xibilus.com, 0
 xice.cf, 1
 xice.wang, 1
 xichuangke.com, 0
@@ -121418,7 +121045,6 @@
 xinbo179.com, 1
 xinbo180.com, 1
 xinbo186.com, 1
-xinbo189.com, 1
 xinbo190.com, 1
 xinbo196.com, 1
 xinbo198.com, 1
@@ -121440,7 +121066,6 @@
 xinbo290.com, 1
 xinbo296.com, 1
 xinbo298.com, 1
-xinbo299.com, 1
 xinbo306.com, 1
 xinbo308.com, 1
 xinbo316.com, 1
@@ -121461,7 +121086,6 @@
 xinbo390.com, 1
 xinbo396.com, 1
 xinbo398.com, 1
-xinbo399.com, 1
 xinbo400.com, 1
 xinbo401.com, 1
 xinbo406.com, 1
@@ -121535,6 +121159,7 @@
 xlaw.com.br, 1
 xldl.ml, 1
 xlem.cn, 1
+xlfblog.com, 0
 xlfilippou.com, 1
 xlink.com.pl, 1
 xlmnews.today, 1
@@ -121792,7 +121417,6 @@
 xn--fakovec-k6a.eu, 1
 xn--familie-pppinghaus-l3b.de, 1
 xn--feuerlscher-arten-4zb.de, 1
-xn--flordepia-s6a.com, 1
 xn--flskeklubben-7cb.dk, 0
 xn--fp8h58f.ws, 1
 xn--fp8hm6b.ws, 1
@@ -121989,7 +121613,6 @@
 xobotun.com, 1
 xoda.pw, 1
 xogum.email, 1
-xoh.at, 1
 xolotto.com, 1
 xolphin.nl, 1
 xombitgames.com, 1
@@ -122038,7 +121661,7 @@
 xpjdi.com, 1
 xpjei.com, 1
 xpjfan.com, 1
-xpjiosapp.com, 1
+xpjiosapp.com, 0
 xpjmd.com, 1
 xpjtop.com, 1
 xpjwa.com, 1
@@ -122095,9 +121718,9 @@
 xsole.net, 1
 xsolla.com, 1
 xss.sk, 1
+xssi.uk, 1
 xsstime.nl, 1
 xsteam.eu, 1
-xstore.top, 1
 xstreamable.com, 1
 xsuper.net, 1
 xsv.cn, 1
@@ -122210,6 +121833,7 @@
 xuntier.ch, 1
 xurl.gq, 1
 xuwei.de, 1
+xuyh0120.win, 1
 xvadimx.me, 1
 xvaldezendocrino.com, 1
 xvidyo.ga, 1
@@ -122302,14 +121926,14 @@
 y3451.com, 1
 y3650.com, 1
 y36500.com, 1
-y3651.com, 1
+y3651.com, 0
 y36511.com, 1
 y365188.com, 1
 y3653.com, 1
 y36533.com, 1
-y3654.com, 1
+y3654.com, 0
 y3656.com, 1
-y36577.com, 1
+y36577.com, 0
 y3bet.com, 1
 y5197.co, 1
 y5bet.com, 1
@@ -122453,7 +122077,6 @@
 yagmursoft.tk, 1
 yagoda-malina.tk, 1
 yagotour.cf, 1
-yah-music.com, 1
 yahan.tv, 1
 yaharu.ru, 1
 yahav.co.il, 1
@@ -122519,6 +122142,7 @@
 yangmao.info, 1
 yangmaodang.org, 0
 yangmi.blog, 1
+yangrq.org, 1
 yangruixin.com, 1
 yangshangzhen.com, 1
 yangwang.tk, 1
@@ -122813,7 +122437,6 @@
 yhaupenthal.org, 1
 yhe.me, 1
 yhenke.de, 0
-yhfou.com, 1
 yhhvi.cf, 1
 yhn.sh, 1
 yhndnzj.com, 1
@@ -123018,6 +122641,7 @@
 yoshibaworks.com, 1
 yoshitsugu.net, 1
 yoshkar-ola-city.tk, 1
+yosida-dental.com, 1
 yosida95.com, 1
 yospos.org, 1
 yoti.com, 1
@@ -123028,7 +122652,6 @@
 yotubaiotona.net, 1
 you.com.br, 1
 you15iv.com, 1
-you2you.fr, 1
 you52iv.com, 1
 youareme.ca, 0
 youarethelight.pl, 1
@@ -123044,6 +122667,7 @@
 youdamom.com, 1
 youdungoofd.com, 1
 youenglish.school, 1
+youftp.tk, 1
 yougee.ml, 1
 yougene.me, 1
 yougot.pw, 1
@@ -123094,6 +122718,7 @@
 youngcouple9598.net, 1
 youngdevotion.net, 1
 youngdevotion.org, 1
+youngfree.cn, 1
 youngguns.club, 1
 younglions.cf, 1
 youngmodelsagency.tk, 1
@@ -123161,7 +122786,6 @@
 yourgadget.ro, 1
 yourgames.tv, 1
 yourgift.in, 1
-yourhair.net, 1
 yourhealthcommunity.com, 1
 yourhumandesign.ch, 1
 yourivanopdorp.nl, 1
@@ -123365,6 +122989,7 @@
 yue2.net, 1
 yuema.net.cn, 1
 yuer.sytes.net, 1
+yufan.me, 0
 yufu5.com, 1
 yugami-lab.com, 1
 yugasun.com, 1
@@ -123770,7 +123395,6 @@
 zachaysan.com, 1
 zachbolinger.com, 1
 zachborboa.com, 1
-zachgibbens.org, 1
 zachhay.es, 1
 zachranari.tk, 1
 zachschneider.ca, 1
@@ -123847,7 +123471,6 @@
 zakariya.blog, 1
 zakarotta.ga, 1
 zakaz.cf, 1
-zakazat-dizayn-interyera.ru, 1
 zakcutner.com, 1
 zakcutner.uk, 1
 zakelijketaalcursus.nl, 1
@@ -123895,7 +123518,6 @@
 zamow.co, 0
 zamtech.co.jp, 1
 zananta.com, 1
-zandcell.com, 1
 zander.dk, 1
 zandra.cf, 1
 zanellidesigns.co.uk, 1
@@ -123968,7 +123590,6 @@
 zavalianis.gr, 1
 zavarkin.tk, 1
 zavec.com.ec, 0
-zavedu.org, 1
 zaves.tk, 1
 zawo-electric.de, 1
 zayats.tk, 1
@@ -124278,7 +123899,6 @@
 zeropoint.bg, 1
 zeroseteatacado.com.br, 1
 zerosource.net, 1
-zerosync.com, 1
 zerotoleranceclan.tk, 1
 zerotoone.de, 1
 zerotoone.studio, 1
@@ -124292,7 +123912,6 @@
 zerozero.gq, 1
 zertif.info, 1
 zertifikatsshop.de, 1
-zerty.de, 1
 zeryn.net, 1
 zesgoes.nl, 1
 zespia.tw, 1
@@ -124377,6 +123996,7 @@
 zhen-chen.com, 1
 zhendre.com, 1
 zhengjie.com, 1
+zhengouwu.com, 1
 zhengzihan.com, 1
 zhenic.ir, 1
 zhenn.fr, 1
@@ -124502,6 +124122,7 @@
 zionsvillelocksmiths.com, 1
 ziontech.eu.org, 1
 zionvps.com, 0
+zip.ch, 1
 zipalerts.com, 1
 ziparcfhive.ga, 1
 zipkey.de, 1
@@ -124569,7 +124190,6 @@
 zl-69.com, 1
 zl-79.com, 1
 zl-89.com, 1
-zl0101.com, 1
 zl0707.com, 1
 zl071.com, 1
 zl0909.com, 1
@@ -124592,7 +124212,6 @@
 zl5151.com, 1
 zl6161.com, 1
 zl6464.com, 1
-zl6767.com, 1
 zl6868.com, 1
 zl6969.com, 1
 zl7070.com, 1
@@ -124717,6 +124336,7 @@
 zok-ambicija.tk, 1
 zoki.art, 1
 zoko.tk, 1
+zokster.net, 0
 zokuomthawn.tk, 1
 zollernalbtour.de, 1
 zollprozess.ch, 1
@@ -124816,6 +124436,7 @@
 zorghuys-steenbergen.nl, 1
 zorghuys.nl, 1
 zorgnetwerkenabr.nl, 1
+zorig.ch, 1
 zorium.org, 0
 zormeloandassociates.com, 1
 zornica.tk, 1
@@ -124875,7 +124496,6 @@
 zsdublovice.cz, 1
 zseartcc.org, 1
 zselicivt.hu, 1
-zserver.fr, 1
 zsi.com.tr, 1
 zsien.cn, 1
 zskomenskeho.cz, 1
@@ -124917,7 +124537,6 @@
 zuitaotu.com, 1
 zuiverjegeest.nl, 1
 zukify.com, 1
-zukix.com, 1
 zukonar.ru, 1
 zukunft-mobilitaet.net, 1
 zula.africa, 1
@@ -125010,6 +124629,7 @@
 zypr.pw, 1
 zyria.de, 1
 zyrillezuno.com, 1
+zyter.com, 1
 zythromax.ga, 1
 zyul.ddns.net, 1
 zyx3d.tk, 1
diff -Nru thunderbird-91.3.2+build1/security/manager/ssl/StaticHPKPins.h thunderbird-91.4.0+build2/security/manager/ssl/StaticHPKPins.h
--- thunderbird-91.3.2+build1/security/manager/ssl/StaticHPKPins.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/security/manager/ssl/StaticHPKPins.h	2021-12-09 12:00:15.000000000 +0000
@@ -1149,4 +1149,4 @@
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1643626214621000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1646304629676000);
diff -Nru thunderbird-91.3.2+build1/security/nss/coreconf/coreconf.dep thunderbird-91.4.0+build2/security/nss/coreconf/coreconf.dep
--- thunderbird-91.3.2+build1/security/nss/coreconf/coreconf.dep	2021-11-19 11:55:49.000000000 +0000
+++ thunderbird-91.4.0+build2/security/nss/coreconf/coreconf.dep	2021-12-09 11:59:54.000000000 +0000
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff -Nru thunderbird-91.3.2+build1/security/nss/gtests/certdb_gtest/decode_certs_unittest.cc thunderbird-91.4.0+build2/security/nss/gtests/certdb_gtest/decode_certs_unittest.cc
--- thunderbird-91.3.2+build1/security/nss/gtests/certdb_gtest/decode_certs_unittest.cc	2021-11-19 11:55:49.000000000 +0000
+++ thunderbird-91.4.0+build2/security/nss/gtests/certdb_gtest/decode_certs_unittest.cc	2021-12-09 11:59:52.000000000 +0000
@@ -26,3 +26,16 @@
                          sizeof(emptyCertPackage)));
   EXPECT_EQ(SEC_ERROR_BAD_DER, PR_GetError());
 }
+
+TEST_F(DecodeCertsTest, EmptySignedData) {
+  // This represents a PKCS#7 ContentInfo of contentType
+  // 1.2.840.113549.1.7.2 (signedData) with missing content.
+  unsigned char emptySignedData[] = {0x30, 0x80, 0x06, 0x09, 0x2a, 0x86,
+                                     0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07,
+                                     0x02, 0x00, 0x00, 0x05, 0x00};
+
+  EXPECT_EQ(nullptr,
+            CERT_DecodeCertFromPackage(reinterpret_cast<char*>(emptySignedData),
+                                       sizeof(emptySignedData)));
+  EXPECT_EQ(SEC_ERROR_BAD_DER, PR_GetError());
+}
diff -Nru thunderbird-91.3.2+build1/security/nss/lib/cryptohi/secvfy.c thunderbird-91.4.0+build2/security/nss/lib/cryptohi/secvfy.c
--- thunderbird-91.3.2+build1/security/nss/lib/cryptohi/secvfy.c	2021-11-19 11:55:49.000000000 +0000
+++ thunderbird-91.4.0+build2/security/nss/lib/cryptohi/secvfy.c	2021-12-09 11:59:54.000000000 +0000
@@ -164,6 +164,37 @@
         PR_FALSE /*XXX: unsafeAllowMissingParameters*/);
 }
 
+static unsigned int
+checkedSignatureLen(const SECKEYPublicKey *pubk)
+{
+    unsigned int sigLen = SECKEY_SignatureLen(pubk);
+    if (sigLen == 0) {
+        /* Error set by SECKEY_SignatureLen */
+        return sigLen;
+    }
+    unsigned int maxSigLen;
+    switch (pubk->keyType) {
+        case rsaKey:
+        case rsaPssKey:
+            maxSigLen = (RSA_MAX_MODULUS_BITS + 7) / 8;
+            break;
+        case dsaKey:
+            maxSigLen = DSA_MAX_SIGNATURE_LEN;
+            break;
+        case ecKey:
+            maxSigLen = 2 * MAX_ECKEY_LEN;
+            break;
+        default:
+            PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
+            return 0;
+    }
+    if (sigLen > maxSigLen) {
+        PORT_SetError(SEC_ERROR_INVALID_KEY);
+        return 0;
+    }
+    return sigLen;
+}
+
 /*
  * decode the ECDSA or DSA signature from it's DER wrapping.
  * The unwrapped/raw signature is placed in the buffer pointed
@@ -174,38 +205,38 @@
                        unsigned int len)
 {
     SECItem *dsasig = NULL; /* also used for ECDSA */
-    SECStatus rv = SECSuccess;
 
-    if ((algid != SEC_OID_ANSIX9_DSA_SIGNATURE) &&
-        (algid != SEC_OID_ANSIX962_EC_PUBLIC_KEY)) {
-        if (sig->len != len) {
-            PORT_SetError(SEC_ERROR_BAD_DER);
-            return SECFailure;
+    /* Safety: Ensure algId is as expected and that signature size is within maxmimums */
+    if (algid == SEC_OID_ANSIX9_DSA_SIGNATURE) {
+        if (len > DSA_MAX_SIGNATURE_LEN) {
+            goto loser;
         }
-
-        PORT_Memcpy(dsig, sig->data, sig->len);
-        return SECSuccess;
-    }
-
-    if (algid == SEC_OID_ANSIX962_EC_PUBLIC_KEY) {
+    } else if (algid == SEC_OID_ANSIX962_EC_PUBLIC_KEY) {
         if (len > MAX_ECKEY_LEN * 2) {
-            PORT_SetError(SEC_ERROR_BAD_DER);
-            return SECFailure;
+            goto loser;
         }
-    }
-    dsasig = DSAU_DecodeDerSigToLen((SECItem *)sig, len);
-
-    if ((dsasig == NULL) || (dsasig->len != len)) {
-        rv = SECFailure;
     } else {
-        PORT_Memcpy(dsig, dsasig->data, dsasig->len);
+        goto loser;
     }
 
-    if (dsasig != NULL)
+    /* Decode and pad to length */
+    dsasig = DSAU_DecodeDerSigToLen((SECItem *)sig, len);
+    if (dsasig == NULL) {
+        goto loser;
+    }
+    if (dsasig->len != len) {
         SECITEM_FreeItem(dsasig, PR_TRUE);
-    if (rv == SECFailure)
-        PORT_SetError(SEC_ERROR_BAD_DER);
-    return rv;
+        goto loser;
+    }
+
+    PORT_Memcpy(dsig, dsasig->data, len);
+    SECITEM_FreeItem(dsasig, PR_TRUE);
+
+    return SECSuccess;
+
+loser:
+    PORT_SetError(SEC_ERROR_BAD_DER);
+    return SECFailure;
 }
 
 const SEC_ASN1Template hashParameterTemplate[] =
@@ -281,7 +312,7 @@
 sec_DecodeSigAlg(const SECKEYPublicKey *key, SECOidTag sigAlg,
                  const SECItem *param, SECOidTag *encalgp, SECOidTag *hashalg)
 {
-    int len;
+    unsigned int len;
     PLArenaPool *arena;
     SECStatus rv;
     SECItem oid;
@@ -466,48 +497,52 @@
     cx->pkcs1RSADigestInfo = NULL;
     rv = SECSuccess;
     if (sig) {
-        switch (type) {
-            case rsaKey:
-                rv = recoverPKCS1DigestInfo(hashAlg, &cx->hashAlg,
-                                            &cx->pkcs1RSADigestInfo,
-                                            &cx->pkcs1RSADigestInfoLen,
-                                            cx->key,
-                                            sig, wincx);
-                break;
-            case rsaPssKey:
-                sigLen = SECKEY_SignatureLen(key);
-                if (sigLen == 0) {
-                    /* error set by SECKEY_SignatureLen */
-                    rv = SECFailure;
+        rv = SECFailure;
+        if (type == rsaKey) {
+            rv = recoverPKCS1DigestInfo(hashAlg, &cx->hashAlg,
+                                        &cx->pkcs1RSADigestInfo,
+                                        &cx->pkcs1RSADigestInfoLen,
+                                        cx->key,
+                                        sig, wincx);
+        } else {
+            sigLen = checkedSignatureLen(key);
+            /* Check signature length is within limits */
+            if (sigLen == 0) {
+                /* error set by checkedSignatureLen */
+                rv = SECFailure;
+                goto loser;
+            }
+            if (sigLen > sizeof(cx->u)) {
+                PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+                rv = SECFailure;
+                goto loser;
+            }
+            switch (type) {
+                case rsaPssKey:
+                    if (sig->len != sigLen) {
+                        PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+                        rv = SECFailure;
+                        goto loser;
+                    }
+                    PORT_Memcpy(cx->u.buffer, sig->data, sigLen);
+                    rv = SECSuccess;
                     break;
-                }
-                if (sig->len != sigLen) {
-                    PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
-                    rv = SECFailure;
+                case ecKey:
+                case dsaKey:
+                    /* decodeECorDSASignature will check sigLen == sig->len after padding */
+                    rv = decodeECorDSASignature(encAlg, sig, cx->u.buffer, sigLen);
                     break;
-                }
-                PORT_Memcpy(cx->u.buffer, sig->data, sigLen);
-                break;
-            case dsaKey:
-            case ecKey:
-                sigLen = SECKEY_SignatureLen(key);
-                if (sigLen == 0) {
-                    /* error set by SECKEY_SignatureLen */
+                default:
+                    /* Unreachable */
                     rv = SECFailure;
-                    break;
-                }
-                rv = decodeECorDSASignature(encAlg, sig, cx->u.buffer, sigLen);
-                break;
-            default:
-                rv = SECFailure;
-                PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
-                break;
+                    goto loser;
+            }
+        }
+        if (rv != SECSuccess) {
+            goto loser;
         }
     }
 
-    if (rv)
-        goto loser;
-
     /* check hash alg again, RSA may have changed it.*/
     if (HASH_GetHashTypeByOidTag(cx->hashAlg) == HASH_AlgNULL) {
         /* error set by HASH_GetHashTypeByOidTag */
@@ -650,11 +685,16 @@
     switch (cx->key->keyType) {
         case ecKey:
         case dsaKey:
-            dsasig.data = cx->u.buffer;
-            dsasig.len = SECKEY_SignatureLen(cx->key);
+            dsasig.len = checkedSignatureLen(cx->key);
             if (dsasig.len == 0) {
                 return SECFailure;
             }
+            if (dsasig.len > sizeof(cx->u)) {
+                PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+                return SECFailure;
+            }
+            dsasig.data = cx->u.buffer;
+
             if (sig) {
                 rv = decodeECorDSASignature(cx->encAlg, sig, dsasig.data,
                                             dsasig.len);
@@ -686,8 +726,13 @@
                 }
 
                 rsasig.data = cx->u.buffer;
-                rsasig.len = SECKEY_SignatureLen(cx->key);
+                rsasig.len = checkedSignatureLen(cx->key);
                 if (rsasig.len == 0) {
+                    /* Error set by checkedSignatureLen */
+                    return SECFailure;
+                }
+                if (rsasig.len > sizeof(cx->u)) {
+                    PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
                     return SECFailure;
                 }
                 if (sig) {
@@ -749,7 +794,6 @@
     SECStatus rv;
     VFYContext *cx;
     SECItem dsasig; /* also used for ECDSA */
-
     rv = SECFailure;
 
     cx = vfy_CreateContext(key, sig, encAlg, hashAlg, NULL, wincx);
@@ -757,19 +801,25 @@
         switch (key->keyType) {
             case rsaKey:
                 rv = verifyPKCS1DigestInfo(cx, digest);
+                /* Error (if any) set by verifyPKCS1DigestInfo */
                 break;
-            case dsaKey:
             case ecKey:
+            case dsaKey:
                 dsasig.data = cx->u.buffer;
-                dsasig.len = SECKEY_SignatureLen(cx->key);
+                dsasig.len = checkedSignatureLen(cx->key);
                 if (dsasig.len == 0) {
+                    /* Error set by checkedSignatureLen */
+                    rv = SECFailure;
                     break;
                 }
-                if (PK11_Verify(cx->key, &dsasig, (SECItem *)digest, cx->wincx) !=
-                    SECSuccess) {
+                if (dsasig.len > sizeof(cx->u)) {
+                    PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+                    rv = SECFailure;
+                    break;
+                }
+                rv = PK11_Verify(cx->key, &dsasig, (SECItem *)digest, cx->wincx);
+                if (rv != SECSuccess) {
                     PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
-                } else {
-                    rv = SECSuccess;
                 }
                 break;
             default:
diff -Nru thunderbird-91.3.2+build1/security/nss/lib/nss/nss.h thunderbird-91.4.0+build2/security/nss/lib/nss/nss.h
--- thunderbird-91.3.2+build1/security/nss/lib/nss/nss.h	2021-11-19 11:55:49.000000000 +0000
+++ thunderbird-91.4.0+build2/security/nss/lib/nss/nss.h	2021-12-09 11:59:52.000000000 +0000
@@ -22,10 +22,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.68" _NSS_CUSTOMIZED
+#define NSS_VERSION "3.68.1" _NSS_CUSTOMIZED
 #define NSS_VMAJOR 3
 #define NSS_VMINOR 68
-#define NSS_VPATCH 0
+#define NSS_VPATCH 1
 #define NSS_VBUILD 0
 #define NSS_BETA PR_FALSE
 
diff -Nru thunderbird-91.3.2+build1/security/nss/lib/pkcs7/certread.c thunderbird-91.4.0+build2/security/nss/lib/pkcs7/certread.c
--- thunderbird-91.3.2+build1/security/nss/lib/pkcs7/certread.c	2021-11-19 11:55:49.000000000 +0000
+++ thunderbird-91.4.0+build2/security/nss/lib/pkcs7/certread.c	2021-12-09 11:59:52.000000000 +0000
@@ -139,6 +139,11 @@
         goto done;
     }
 
+    if (contentInfo.content.signedData == NULL) {
+        PORT_SetError(SEC_ERROR_BAD_DER);
+        goto done;
+    }
+
     rv = SECSuccess;
 
     certs = contentInfo.content.signedData->certificates;
diff -Nru thunderbird-91.3.2+build1/security/nss/lib/softoken/softkver.h thunderbird-91.4.0+build2/security/nss/lib/softoken/softkver.h
--- thunderbird-91.3.2+build1/security/nss/lib/softoken/softkver.h	2021-11-19 11:55:49.000000000 +0000
+++ thunderbird-91.4.0+build2/security/nss/lib/softoken/softkver.h	2021-12-09 11:59:53.000000000 +0000
@@ -17,10 +17,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.68" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION "3.68.1" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR 3
 #define SOFTOKEN_VMINOR 68
-#define SOFTOKEN_VPATCH 0
+#define SOFTOKEN_VPATCH 1
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_FALSE
 
diff -Nru thunderbird-91.3.2+build1/security/nss/lib/util/nssutil.h thunderbird-91.4.0+build2/security/nss/lib/util/nssutil.h
--- thunderbird-91.3.2+build1/security/nss/lib/util/nssutil.h	2021-11-19 11:55:49.000000000 +0000
+++ thunderbird-91.4.0+build2/security/nss/lib/util/nssutil.h	2021-12-09 11:59:53.000000000 +0000
@@ -19,10 +19,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.68"
+#define NSSUTIL_VERSION "3.68.1"
 #define NSSUTIL_VMAJOR 3
 #define NSSUTIL_VMINOR 68
-#define NSSUTIL_VPATCH 0
+#define NSSUTIL_VPATCH 1
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_FALSE
 
diff -Nru thunderbird-91.3.2+build1/security/nss/TAG-INFO thunderbird-91.4.0+build2/security/nss/TAG-INFO
--- thunderbird-91.3.2+build1/security/nss/TAG-INFO	2021-11-19 11:55:49.000000000 +0000
+++ thunderbird-91.4.0+build2/security/nss/TAG-INFO	2021-12-09 11:59:52.000000000 +0000
@@ -1 +1 @@
-NSS_3_68_RTM
\ No newline at end of file
+NSS_3_68_1_RTM
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/services/settings/dumps/blocklists/addons-bloomfilters.json thunderbird-91.4.0+build2/services/settings/dumps/blocklists/addons-bloomfilters.json
--- thunderbird-91.3.2+build1/services/settings/dumps/blocklists/addons-bloomfilters.json	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/services/settings/dumps/blocklists/addons-bloomfilters.json	2021-12-09 12:00:15.000000000 +0000
@@ -3,6 +3,284 @@
     {
       "stash": {
         "blocked": [
+          "@easy-tabs:1.1.5",
+          "@easy-tabs:1.2.2",
+          "@easy-tabs:1.1.1",
+          "@easy-tabs:1.1.4",
+          "@easy-tabs:1.1.9",
+          "@easy-tabs:1.2.0",
+          "@easy-tabs:1.2.1",
+          "@easy-tabs:1.1.2",
+          "@speed-dial-fast1:1.1.1",
+          "@easy-tabs:1.2.3",
+          "@easy-tabs:1.1.8",
+          "@easy-tabs:1.1.7",
+          "@easy-tabs:1.1.3",
+          "@easy-tabs:1.1.6"
+        ],
+        "unblocked": []
+      },
+      "schema": 1637692674312,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1637865308773,
+      "id": "9787185c-a27c-4389-b6fc-fd1b51eceab8",
+      "last_modified": 1637865474270
+    },
+    {
+      "stash": {
+        "blocked": [
+          "SimilarDomain@ext:1.0",
+          "Security_Test@ext:1.0",
+          "pavel.sherbakov@gmail.com:68.7.3",
+          "pavel.sherbakov@gmail.com:67.6.9",
+          "pavel.sherbakov@gmail.com:69.4.5",
+          "pavel.sherbakov@gmail.com:66.5.1",
+          "pavel.sherbakov@gmail.com:64.1.3",
+          "pavel.sherbakov@gmail.com:72.1.5",
+          "pavel.sherbakov@gmail.com:67.5.7",
+          "pavel.sherbakov@gmail.com:68.5.8",
+          "pavel.sherbakov@gmail.com:66.2.3",
+          "URLThreatCheck@ext:1.0",
+          "pavel.sherbakov@gmail.com:67.4.3",
+          "pavel.sherbakov@gmail.com:68.7.5",
+          "Malware_Finder@ext:1.0",
+          "pavel.sherbakov@gmail.com:69.5.1",
+          "EsperantoDictionary@ext:1.0",
+          "pavel.sherbakov@gmail.com:77.5.7",
+          "pavel.sherbakov@gmail.com:65.5.5",
+          "pavel.sherbakov@gmail.com:65.4.3",
+          "PetrolAddicts@ext:1.0",
+          "pavel.sherbakov@gmail.com:67.4.1",
+          "pavel.sherbakov@gmail.com:72.1.9",
+          "pavel.sherbakov@gmail.com:73.2.7",
+          "pavel.sherbakov@gmail.com:65.6.7",
+          "pavel.sherbakov@gmail.com:67.4.7",
+          "pavel.sherbakov@gmail.com:68.9.7",
+          "Speed_Check@ext:1.0",
+          "pavel.sherbakov@gmail.com:65.3.7",
+          "pavel.sherbakov@gmail.com:69.2.5",
+          "pavel.sherbakov@gmail.com:68.6.3",
+          "pavel.sherbakov@gmail.com:76.8.7",
+          "pavel.sherbakov@gmail.com:70.1.1",
+          "Analyze_URL@ext:1.0",
+          "Test_Certificate@ext:1.0",
+          "pavel.sherbakov@gmail.com:68.9.8",
+          "LinkGraphAnalysis@ext:1.0",
+          "pavel.sherbakov@gmail.com:76.9.5",
+          "pavel.sherbakov@gmail.com:69.1.3",
+          "pavel.sherbakov@gmail.com:67.5.9",
+          "pavel.sherbakov@gmail.com:65.6.5",
+          "BackLinksMonitor@ext:1.0",
+          "pavel.sherbakov@gmail.com:67.5.5",
+          "pavel.sherbakov@gmail.com:68.5.1",
+          "pavel.sherbakov@gmail.com:66.5.5",
+          "pavel.sherbakov@gmail.com:69.1.1",
+          "pavel.sherbakov@gmail.com:66.3.1",
+          "pavel.sherbakov@gmail.com:65.3.6",
+          "pavel.sherbakov@gmail.com:71.1.1",
+          "pavel.sherbakov@gmail.com:69.2.3",
+          "pavel.sherbakov@gmail.com:69.3.9",
+          "pavel.sherbakov@gmail.com:68.6.7",
+          "pavel.sherbakov@gmail.com:69.2.1",
+          "reddit_search@ext:1.0",
+          "pavel.sherbakov@gmail.com:72.2.1",
+          "pavel.sherbakov@gmail.com:64.3.5",
+          "pavel.sherbakov@gmail.com:67.6.5",
+          "pavel.sherbakov@gmail.com:67.1.5",
+          "pavel.sherbakov@gmail.com:66.1.8",
+          "SEO_Analyzer@ext:1.0",
+          "pavel.sherbakov@gmail.com:76.9.3",
+          "pavel.sherbakov@gmail.com:77.3.3",
+          "Domain_Info@ext:1.0",
+          "pavel.sherbakov@gmail.com:73.2.9"
+        ],
+        "unblocked": []
+      },
+      "schema": 1637682694770,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1637692508451,
+      "id": "228b14ae-9432-4698-87ff-5c8225c93c3e",
+      "last_modified": 1637692674236
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{02ddc323-3339-44ea-a24d-f65bc41e1094}:1.1.0",
+          "wallet@m-etamask.com:1.3.0",
+          "wallet@m-etamask.com:1.2.0",
+          "wallet@m-etamask.com:1.4.0"
+        ],
+        "unblocked": []
+      },
+      "schema": 1637282275455,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1637606109327,
+      "id": "b1e6285c-5079-467a-9023-43d3bbfb1325",
+      "last_modified": 1637606282788
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.18",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.20",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.6",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.13",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.19",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.17",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.16",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.11",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.12",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.21",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.9",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.5",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.10",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.14",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.8",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.4",
+          "{00360816-3389-4e1d-9f8e-c0479a87dc8b}:1.0.3"
+        ],
+        "unblocked": []
+      },
+      "schema": 1637260675554,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1637282109144,
+      "id": "b9aaf5ad-920a-4756-bae2-33181d65dc4c",
+      "last_modified": 1637282275381
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{a02abdbd-67f1-4a34-8618-542ea0403c49}:1.0"
+        ],
+        "unblocked": []
+      },
+      "schema": 1637166846121,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1637260508809,
+      "id": "323ddd82-1478-4bb9-be8c-afdbaaae01a3",
+      "last_modified": 1637260675473
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{39a81ad1-e825-4bd5-9b02-0c55d5f66fe4}:4.2.1"
+        ],
+        "unblocked": []
+      },
+      "schema": 1636547865524,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1637022908726,
+      "id": "5ca37f37-8332-43e0-8791-f8371578a98b",
+      "last_modified": 1637023071663
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{0df4ccde-744e-445e-a22a-84378af3b002}:1.91",
+          "{0df4ccde-744e-445e-a22a-84378af3b002}:1.0",
+          "{b9e8c781-75c2-443e-aca3-ffa68e8c49b8}:1.0",
+          "{6505668d-8d72-4964-a1f8-d1789d0b4827}:1.0",
+          "{0df4ccde-744e-445e-a22a-84378af3b002}:1.92"
+        ],
+        "unblocked": []
+      },
+      "schema": 1636483097941,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1636547707420,
+      "id": "efdfe866-4d35-42e4-bfca-694ed3dc101d",
+      "last_modified": 1636547865447
+    },
+    {
+      "stash": {
+        "blocked": [
+          "bacnt2412@gmail.com:1.1",
+          "undervpn_store@undervpn.digital:2.0.0.63",
+          "undervpn_store@undervpn.digital:2.0.0.61",
+          "bacnt2412@gmail.com:1.0",
+          "undervpn@undervpn.digital:2.0.0.63",
+          "undervpn@undervpn.digital:2.0.0.61"
+        ],
+        "unblocked": []
+      },
+      "schema": 1636137470705,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1636482908521,
+      "id": "0358385f-270e-49d9-9898-b646ce5ba657",
+      "last_modified": 1636483097867
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{c9837f45-c18f-4c32-bfd3-0b1ca1e394fb}:1.92",
+          "{c9837f45-c18f-4c32-bfd3-0b1ca1e394fb}:1.0",
+          "{c9837f45-c18f-4c32-bfd3-0b1ca1e394fb}:1.91"
+        ],
+        "unblocked": []
+      },
+      "schema": 1636115876356,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1636137307675,
+      "id": "0e086673-25b2-4f5b-9080-863cbcecb623",
+      "last_modified": 1636137470605
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{52671a2e-41cb-431a-96ed-f8898c829303}:1.0"
+        ],
+        "unblocked": []
+      },
+      "schema": 1635964681183,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1636115707921,
+      "id": "cdb720f4-7668-4148-835f-b29e46778fb2",
+      "last_modified": 1636115876268
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": []
+      },
+      "schema": 1635856675788,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1635964509453,
+      "id": "a984cfd8-c8f7-41c8-8091-421ed066ef4b",
+      "last_modified": 1635964681037
+    },
+    {
+      "stash": {
+        "blocked": [
+          "SSLInfo@ext:1.0"
+        ],
+        "unblocked": []
+      },
+      "schema": 1635791882453,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1635856508979,
+      "id": "02919eee-9d52-487c-a580-5103990faf10",
+      "last_modified": 1635856675708
+    },
+    {
+      "stash": {
+        "blocked": [
+          "lansvans63@gmail.com:1.0",
+          "lansvans63@gmail.com:1.5",
+          "lansvans63@gmail.com:1.3",
+          "lansvans63@gmail.com:1.1",
+          "lansvans63@gmail.com:1.2",
+          "lansvans63@gmail.com:1.4"
+        ],
+        "unblocked": []
+      },
+      "schema": 1635416185225,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1635791709561,
+      "id": "5c71a3af-3b18-4cc9-b49e-dfc69fde0bfb",
+      "last_modified": 1635791882379
+    },
+    {
+      "stash": {
+        "blocked": [
           "{604c5a78-dd2e-418d-b91e-7162104693ca}:1.9.2",
           "{604c5a78-dd2e-418d-b91e-7162104693ca}:1.0.0",
           "{604c5a78-dd2e-418d-b91e-7162104693ca}:1.9.1",
diff -Nru thunderbird-91.3.2+build1/services/settings/dumps/main/password-recipes.json thunderbird-91.4.0+build2/services/settings/dumps/main/password-recipes.json
--- thunderbird-91.3.2+build1/services/settings/dumps/main/password-recipes.json	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/services/settings/dumps/main/password-recipes.json	2021-12-09 11:59:55.000000000 +0000
@@ -2,13 +2,16 @@
   "data": [
     {
       "hosts": [
-        "login.ubuntu.com"
+        "login.ubuntu.com",
+        "login.launchpad.net",
+        "login.staging.ubuntu.com",
+        "login-lp.staging.ubuntu.com"
       ],
-      "schema": 1631046241629,
-      "description": "ubuntu uses an invisible username field and requires the field being blank (Bug 1724136).",
+      "schema": 1636656872819,
+      "description": "ubuntu uses an invisible username field and requires the field being blank (Bug 1724136, Bug 1739992).",
       "notUsernameSelector": "input[name='openid.usernamesecret']",
       "id": "ebb01149-3568-429e-9924-8404414f6fe7",
-      "last_modified": 1631639778536
+      "last_modified": 1636659060482
     },
     {
       "hosts": [
diff -Nru thunderbird-91.3.2+build1/services/settings/dumps/security-state/intermediates.json thunderbird-91.4.0+build2/services/settings/dumps/security-state/intermediates.json
--- thunderbird-91.3.2+build1/services/settings/dumps/security-state/intermediates.json	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/services/settings/dumps/security-state/intermediates.json	2021-12-09 12:00:15.000000000 +0000
@@ -1,6 +1,1248 @@
 {
   "data": [
     {
+      "schema": 1638025204792,
+      "derHash": "8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=",
+      "subject": "CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN",
+      "subjectDN": "MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b",
+        "size": 1963,
+        "filename": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem",
+        "location": "security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=",
+      "crlite_enrolled": false,
+      "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2",
+      "last_modified": 1638176394669
+    },
+    {
+      "schema": 1638022415101,
+      "derHash": "k6B4mNibLMoWa6bx+KFBOM5Dgo5JG4MZJryCR9ORzHI=",
+      "subject": "CN=Starfield Secure Certificate Authority - G2,OU=http://certs.starfieldtech.com/repository/,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US",
+      "subjectDN": "MIHGMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEzMDEGA1UECxMqaHR0cDovL2NlcnRzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkvMTQwMgYDVQQDEytTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "4283da4ef9b6b21e475fb4a88aff9532a5c74e35282cb5459a20ee419646571c",
+        "size": 1792,
+        "filename": "8kGWrpQHhmc0jwLo43RYo6bmqtHgsNxhARjM5yFCe_w=.pem",
+        "location": "security-state-staging/intermediates/f0b4b8ab-658e-452d-a259-15b15f68060a.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "8kGWrpQHhmc0jwLo43RYo6bmqtHgsNxhARjM5yFCe/w=",
+      "crlite_enrolled": true,
+      "id": "eda1d6cc-95f3-4925-b185-1972acc69e5a",
+      "last_modified": 1638025203723
+    },
+    {
+      "schema": 1638000791272,
+      "derHash": "lzpBJ2/9AeAnoqrUnjTDeEbT6Xb/amILZxLjODIEGqY=",
+      "subject": "CN=Go Daddy Secure Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US",
+      "subjectDN": "MIG0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "a111efc20329e87b541cfc3e7f526fc54bb24624fddf210f4347b9fadfb1ab6b",
+        "size": 1727,
+        "filename": "8Rw90Ej3Ttt8RRkrg-WYDS9n7IS03bk5bjP_UXPtaY8=.pem",
+        "location": "security-state-staging/intermediates/a2a04dfe-6201-4d0a-b8cf-80d2975bfb51.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "8Rw90Ej3Ttt8RRkrg+WYDS9n7IS03bk5bjP/UXPtaY8=",
+      "crlite_enrolled": true,
+      "id": "549c92e2-3738-4c8c-ae37-407e4e6158ce",
+      "last_modified": 1638003652877
+    },
+    {
+      "schema": 1637769495501,
+      "derHash": "8Up9JCetCgG01/152NUHctJSbiUkJfignDA3/fpjX1o=",
+      "subject": "CN=ZoTrus OV SSL CA,O=ZoTrus Technology Limited,C=CN",
+      "subjectDN": "MEwxCzAJBgNVBAYTAkNOMSIwIAYDVQQKExlab1RydXMgVGVjaG5vbG9neSBMaW1pdGVkMRkwFwYDVQQDExBab1RydXMgT1YgU1NMIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "3d34f0ccb6454d57fa6d545acd6c231900b5c908c93777fe407d6363d4c87fb0",
+        "size": 2251,
+        "filename": "mic4JfOko8h5lsSjNABtsJRu4_nBErCNRFyxtEJc7SA=.pem",
+        "location": "security-state-staging/intermediates/18b9a297-9f9d-465d-a63a-b2e6ad2da805.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "mic4JfOko8h5lsSjNABtsJRu4/nBErCNRFyxtEJc7SA=",
+      "crlite_enrolled": true,
+      "id": "c5018a05-ac0d-419c-883c-606fbf703668",
+      "last_modified": 1637917121230
+    },
+    {
+      "schema": 1637765420708,
+      "derHash": "F7TgrQSCo9An9YvfyKm9Vfdcq8jfBZpAVqFsyN7lM+8=",
+      "subject": "CN=University of Macedonia CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
+      "subjectDN": "MHsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEmMCQGA1UEAxMdVW5pdmVyc2l0eSBvZiBNYWNlZG9uaWEgQ0EgUjE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "c153ed5ab8ba6db8df23a7640e7da30387b8d49e9c76ac5a7087e71e346c1522",
+        "size": 2519,
+        "filename": "Q3wUDE_KGR_qsDlo3z3iA92yNVJJgXo3pVbkHKiMh-g=.pem",
+        "location": "security-state-staging/intermediates/c67c13bf-d12d-4e53-8827-0bb25e395b9f.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Q3wUDE/KGR/qsDlo3z3iA92yNVJJgXo3pVbkHKiMh+g=",
+      "crlite_enrolled": false,
+      "id": "49042737-15ea-4a2c-b256-318ca9c6a653",
+      "last_modified": 1637765959136
+    },
+    {
+      "schema": 1637765612816,
+      "derHash": "F7TgrQSCo9An9YvfyKm9Vfdcq8jfBZpAVqFsyN7lM+8=",
+      "subject": "CN=University of Macedonia CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
+      "subjectDN": "MHsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEmMCQGA1UEAxMdVW5pdmVyc2l0eSBvZiBNYWNlZG9uaWEgQ0EgUjE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "c153ed5ab8ba6db8df23a7640e7da30387b8d49e9c76ac5a7087e71e346c1522",
+        "size": 2519,
+        "filename": "Q3wUDE_KGR_qsDlo3z3iA92yNVJJgXo3pVbkHKiMh-g=.pem",
+        "location": "security-state-staging/intermediates/58ae3d50-d6eb-4b02-9565-29f915ef549e.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Q3wUDE/KGR/qsDlo3z3iA92yNVJJgXo3pVbkHKiMh+g=",
+      "crlite_enrolled": false,
+      "id": "0f430c08-80c5-4146-9d7b-847ab31f7778",
+      "last_modified": 1637765959127
+    },
+    {
+      "schema": 1637676978189,
+      "derHash": "Yjq+xvhacCisoQ9b3F2BtWtjFN8odD/8yE7KMvNa6EY=",
+      "subject": "CN=MuaSSL.com TLS Issuing ECC CA R1,O=Hao Quang Viet Software Company Limited,C=VN",
+      "subjectDN": "MGoxCzAJBgNVBAYTAlZOMTAwLgYDVQQKDCdIYW8gUXVhbmcgVmlldCBTb2Z0d2FyZSBDb21wYW55IExpbWl0ZWQxKTAnBgNVBAMMIE11YVNTTC5jb20gVExTIElzc3VpbmcgRUNDIENBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "ac2e894346704c3fc08ad98c62eede51d5e6ccffc991c94df6e3c14d59acda62",
+        "size": 1894,
+        "filename": "aWadCp7kMcffucdctgN2uR7OBZm-XJI09tOLxjLbhv8=.pem",
+        "location": "security-state-staging/intermediates/ce4f4276-506a-4b31-852e-fc3724469a82.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "aWadCp7kMcffucdctgN2uR7OBZm+XJI09tOLxjLbhv8=",
+      "crlite_enrolled": false,
+      "id": "375b4322-da36-43eb-b0f8-3e034e77e486",
+      "last_modified": 1637679524866
+    },
+    {
+      "schema": 1637676979360,
+      "derHash": "OPWMr2UMzU9gJ9HJImgokaFl/vSR/B0zP+ipyFFYbUg=",
+      "subject": "CN=MuaSSL.com EV TLS Issuing RSA CA R1,O=Hao Quang Viet Software Company Limited,C=VN",
+      "subjectDN": "MG0xCzAJBgNVBAYTAlZOMTAwLgYDVQQKDCdIYW8gUXVhbmcgVmlldCBTb2Z0d2FyZSBDb21wYW55IExpbWl0ZWQxLDAqBgNVBAMMI011YVNTTC5jb20gRVYgVExTIElzc3VpbmcgUlNBIENBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "1268f09ff0fbaa823641ed09fcffa9375ff709984ae1760df81690f6d93e599a",
+        "size": 2540,
+        "filename": "13AbTAPgSo4ZEXl_1d53tBhdk_1OZp42oZ8Uo8f-0gs=.pem",
+        "location": "security-state-staging/intermediates/865dda55-844a-4582-a11b-5b6e5990260f.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "13AbTAPgSo4ZEXl/1d53tBhdk/1OZp42oZ8Uo8f+0gs=",
+      "crlite_enrolled": false,
+      "id": "a654fabe-9ac1-4467-9d3a-bdafdd9b0b8a",
+      "last_modified": 1637679524859
+    },
+    {
+      "schema": 1637633470008,
+      "derHash": "UpmYc6PRKkVx25oWBXap2VGtTkp9oxxcEGE4BekiQyU=",
+      "subject": "CN=MuaSSL.com TLS Issuing RSA CA R1,O=Hao Quang Viet Software Company Limited,C=VN",
+      "subjectDN": "MGoxCzAJBgNVBAYTAlZOMTAwLgYDVQQKDCdIYW8gUXVhbmcgVmlldCBTb2Z0d2FyZSBDb21wYW55IExpbWl0ZWQxKTAnBgNVBAMMIE11YVNTTC5jb20gVExTIElzc3VpbmcgUlNBIENBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "0532c96a8ccdfe2c93144af785a8ea878c890e17d29b1902af77265bcdb4950c",
+        "size": 2475,
+        "filename": "665w_NZsPO7TEXwGSRnHz5bGQ3teDolKrTBrXhjcHcw=.pem",
+        "location": "security-state-staging/intermediates/16bcd296-9145-412a-834b-d94e1d8f285c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "665w/NZsPO7TEXwGSRnHz5bGQ3teDolKrTBrXhjcHcw=",
+      "crlite_enrolled": false,
+      "id": "5396a2c3-5e2b-4b6e-8e64-73b58dfe5c7f",
+      "last_modified": 1637636417266
+    },
+    {
+      "schema": 1637633471153,
+      "derHash": "eF/TI2TEV+KutDU6qVgI83GqiQbhHEDhPDOKaz7nO+E=",
+      "subject": "CN=MuaSSL.com EV TLS Issuing ECC CA R1,O=Hao Quang Viet Software Company Limited,C=VN",
+      "subjectDN": "MG0xCzAJBgNVBAYTAlZOMTAwLgYDVQQKDCdIYW8gUXVhbmcgVmlldCBTb2Z0d2FyZSBDb21wYW55IExpbWl0ZWQxLDAqBgNVBAMMI011YVNTTC5jb20gRVYgVExTIElzc3VpbmcgRUNDIENBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "fbb1f42effaa30ae80b8f308b7ae5cbc690e9716c62b786556d20cf07f59de5f",
+        "size": 1955,
+        "filename": "KsymRI2FihoZ5c5m000bkzpYqk9OfXKMBPz7WEodqEg=.pem",
+        "location": "security-state-staging/intermediates/ff93576f-dc09-4207-bd4c-2f8333621852.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "KsymRI2FihoZ5c5m000bkzpYqk9OfXKMBPz7WEodqEg=",
+      "crlite_enrolled": false,
+      "id": "bbb4fdaf-43cc-4c28-abd4-5a28a8db2864",
+      "last_modified": 1637636417259
+    },
+    {
+      "schema": 1637635862331,
+      "derHash": "UpmYc6PRKkVx25oWBXap2VGtTkp9oxxcEGE4BekiQyU=",
+      "subject": "CN=MuaSSL.com TLS Issuing RSA CA R1,O=Hao Quang Viet Software Company Limited,C=VN",
+      "subjectDN": "MGoxCzAJBgNVBAYTAlZOMTAwLgYDVQQKDCdIYW8gUXVhbmcgVmlldCBTb2Z0d2FyZSBDb21wYW55IExpbWl0ZWQxKTAnBgNVBAMMIE11YVNTTC5jb20gVExTIElzc3VpbmcgUlNBIENBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "0532c96a8ccdfe2c93144af785a8ea878c890e17d29b1902af77265bcdb4950c",
+        "size": 2475,
+        "filename": "665w_NZsPO7TEXwGSRnHz5bGQ3teDolKrTBrXhjcHcw=.pem",
+        "location": "security-state-staging/intermediates/2732f8f6-790e-4305-85a5-0b80e0167674.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "665w/NZsPO7TEXwGSRnHz5bGQ3teDolKrTBrXhjcHcw=",
+      "crlite_enrolled": false,
+      "id": "96382960-f466-4b1e-978c-efbc31fa4596",
+      "last_modified": 1637636417253
+    },
+    {
+      "schema": 1637635863576,
+      "derHash": "eF/TI2TEV+KutDU6qVgI83GqiQbhHEDhPDOKaz7nO+E=",
+      "subject": "CN=MuaSSL.com EV TLS Issuing ECC CA R1,O=Hao Quang Viet Software Company Limited,C=VN",
+      "subjectDN": "MG0xCzAJBgNVBAYTAlZOMTAwLgYDVQQKDCdIYW8gUXVhbmcgVmlldCBTb2Z0d2FyZSBDb21wYW55IExpbWl0ZWQxLDAqBgNVBAMMI011YVNTTC5jb20gRVYgVExTIElzc3VpbmcgRUNDIENBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "fbb1f42effaa30ae80b8f308b7ae5cbc690e9716c62b786556d20cf07f59de5f",
+        "size": 1955,
+        "filename": "KsymRI2FihoZ5c5m000bkzpYqk9OfXKMBPz7WEodqEg=.pem",
+        "location": "security-state-staging/intermediates/54a21cc9-4c30-4b6b-abaf-19625388cd14.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "KsymRI2FihoZ5c5m000bkzpYqk9OfXKMBPz7WEodqEg=",
+      "crlite_enrolled": false,
+      "id": "97428867-31bd-42a5-9eea-4f58820285bb",
+      "last_modified": 1637636417247
+    },
+    {
+      "schema": 1637593069231,
+      "derHash": "sKbvA1DnxMYFa+6nr50thgue0QITe5cp08IyFtGVVGo=",
+      "subject": "CN=Advanced Class 3 e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU",
+      "subjectDN": "MIGFMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xKjAoBgNVBAMMIUFkdmFuY2VkIENsYXNzIDMgZS1Temlnbm8gQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "0ed62164b86f37c69eb2018a4a79db046f2eae11bfb1c748569dff5da6e94178",
+        "size": 1768,
+        "filename": "VGt-HUDy6qey1Up5ZYyfXaLC_1Yy9l4AvJsHFIQXC5g=.pem",
+        "location": "security-state-staging/intermediates/912a52c5-97ea-4353-806f-dbf6b9c95e81.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "VGt+HUDy6qey1Up5ZYyfXaLC/1Yy9l4AvJsHFIQXC5g=",
+      "crlite_enrolled": false,
+      "id": "1d065829-106f-4cf5-a7ce-33874e651514",
+      "last_modified": 1637614674594
+    },
+    {
+      "schema": 1637571537940,
+      "derHash": "d9bCr1p7hvY9mRjIdTN3nyrwjTXPoU2kk4yAP1PeGKE=",
+      "subject": "CN=SwissSign Personal Gold CA 2014 - G22,O=SwissSign AG,C=CH",
+      "subjectDN": "MFQxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLjAsBgNVBAMTJVN3aXNzU2lnbiBQZXJzb25hbCBHb2xkIENBIDIwMTQgLSBHMjI=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "37ef04fb6f6156e237c6f04ae3b383028744a07d5a6a4197c49d3411c82108f0",
+        "size": 2389,
+        "filename": "l5kY-a2-qCNGMn7LXb_lGEENF-dZOLccQOZBKr40wVE=.pem",
+        "location": "security-state-staging/intermediates/6a316d67-95bd-4ab5-aef3-82bd300391d7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "l5kY+a2+qCNGMn7LXb/lGEENF+dZOLccQOZBKr40wVE=",
+      "crlite_enrolled": false,
+      "id": "26a70827-d9ed-46cc-8952-77eb4121605e",
+      "last_modified": 1637593068149
+    },
+    {
+      "schema": 1637590211288,
+      "derHash": "ThpWTHGgQoiXDlPAN9HPwlwfm+/FJ2zzvVAe4mLwQgI=",
+      "subject": "CN=GlobalSign Atlas R3 OV TLS CA H2 2021,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIE9WIFRMUyBDQSBIMiAyMDIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "d499679a13f287b719305ece5b064b2730137bf3006a9913e7ab121e378f3262",
+        "size": 1715,
+        "filename": "D2Dxjr_K2WrUouIXuBMldR6ucBSdBjfQI6boJU6R6i8=.pem",
+        "location": "security-state-staging/intermediates/fae57392-fd90-4733-a1bb-c543b9e8ff29.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "D2Dxjr/K2WrUouIXuBMldR6ucBSdBjfQI6boJU6R6i8=",
+      "crlite_enrolled": true,
+      "id": "105b6627-b2cd-462b-8da2-204dc969ac8c",
+      "last_modified": 1637593068134
+    },
+    {
+      "schema": 1637569170634,
+      "derHash": "cQLZcsJOnKaNDm+f9TxfZYzZuGSfKOrY28M2wt9QSBE=",
+      "subject": "CN=CertCloud RSA OV TLS CA,O=CertCloud Pte. Ltd.,C=SG",
+      "subjectDN": "ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIE9WIFRMUyBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "8d771de489696047446dd891e36b2c199bc714a871f4de9a134028e7dd330872",
+        "size": 2081,
+        "filename": "ORYJiVkIJCqtrNqVHJ4iw_q-R2u46OEMcFExxBr8_5Y=.pem",
+        "location": "security-state-staging/intermediates/3b08e799-b31b-4131-a15e-06ba6cd0b067.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "ORYJiVkIJCqtrNqVHJ4iw/q+R2u46OEMcFExxBr8/5Y=",
+      "crlite_enrolled": true,
+      "id": "1e513d59-b8f5-4b2d-b079-bf21291f788f",
+      "last_modified": 1637571536847
+    },
+    {
+      "schema": 1637568901551,
+      "derHash": "cQLZcsJOnKaNDm+f9TxfZYzZuGSfKOrY28M2wt9QSBE=",
+      "subject": "CN=CertCloud RSA OV TLS CA,O=CertCloud Pte. Ltd.,C=SG",
+      "subjectDN": "ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIE9WIFRMUyBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "8d771de489696047446dd891e36b2c199bc714a871f4de9a134028e7dd330872",
+        "size": 2081,
+        "filename": "ORYJiVkIJCqtrNqVHJ4iw_q-R2u46OEMcFExxBr8_5Y=.pem",
+        "location": "security-state-staging/intermediates/85b0d8c2-29b3-4346-9080-e95bce35f8b6.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "ORYJiVkIJCqtrNqVHJ4iw/q+R2u46OEMcFExxBr8/5Y=",
+      "crlite_enrolled": true,
+      "id": "b87a1d31-36bc-448e-ba4b-6a58e79386ba",
+      "last_modified": 1637571536838
+    },
+    {
+      "schema": 1637355443297,
+      "derHash": "MTH/29ln180dd3Qq+XcvEFH/TJrkE3WfQ0/h6BERngM=",
+      "subject": "CN=TrustOcean EV SSL CA - RSA - 2019,OU=Controlled by Sectigo exclusively for TrustOcean Ltd.+OU=RSA Extended Validation Secure Server - 2019,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US",
+      "subjectDN": "MIHoMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFRydXN0T2NlYW4gTHRkLjE1MDMGA1UECxMsUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTkxKjAoBgNVBAMTIVRydXN0T2NlYW4gRVYgU1NMIENBIC0gUlNBIC0gMjAxOQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "bb57de69afc6d6f5f59b1c80758edf0ef1791b7a08530fed8903ef18cd25188e",
+        "size": 2324,
+        "filename": "uG18SfTnbrT8g2zCkpa7kWClIcTyqEW_1iPtChk9nTQ=.pem",
+        "location": "security-state-staging/intermediates/6020590f-b065-482b-9549-d56eb98c4b60.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "uG18SfTnbrT8g2zCkpa7kWClIcTyqEW/1iPtChk9nTQ=",
+      "crlite_enrolled": false,
+      "id": "12413a5f-6a98-4669-8438-f936d9b86ea3",
+      "last_modified": 1637485047213
+    },
+    {
+      "schema": 1637333969955,
+      "derHash": "k7KBvYHYPPmGZZ3/0K9XmTuS5uRhQWJTn3UFJM4Ru8s=",
+      "subject": "CN=Abitab SSL Extended Validation,OU=IDdigital,O=Abitab S.A.,C=UY",
+      "subjectDN": "MGAxCzAJBgNVBAYTAlVZMRQwEgYDVQQKDAtBYml0YWIgUy5BLjESMBAGA1UECwwJSURkaWdpdGFsMScwJQYDVQQDDB5BYml0YWIgU1NMIEV4dGVuZGVkIFZhbGlkYXRpb24=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "a994aaf2225099f989467d317d95162a61ab0f2a8b48927a953540b65a87fe3e",
+        "size": 1703,
+        "filename": "y2KaAsU1VfJfWRQYPeq3HVxO1GVrwSw4xGq7rSJtyII=.pem",
+        "location": "security-state-staging/intermediates/972694b4-ca85-44f1-91f0-7e0a868a3149.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "y2KaAsU1VfJfWRQYPeq3HVxO1GVrwSw4xGq7rSJtyII=",
+      "crlite_enrolled": true,
+      "id": "04ee2b55-620a-4d2e-a4c7-00b5c73ec962",
+      "last_modified": 1637355442150
+    },
+    {
+      "schema": 1637331030153,
+      "derHash": "8A5ha1ntBubMlxfQOfehpwyz0I4LatdGU2cMzkSMYfM=",
+      "subject": "CN=TeleSec Business TLS-CA 21,O=Deutsche Telekom Security GmbH,C=DE",
+      "subjectDN": "MFsxCzAJBgNVBAYTAkRFMScwJQYDVQQKEx5EZXV0c2NoZSBUZWxla29tIFNlY3VyaXR5IEdtYkgxIzAhBgNVBAMTGlRlbGVTZWMgQnVzaW5lc3MgVExTLUNBIDIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "5af51fb639abc7ecb3215b9fc5e15ae466f544ef15726b5ceaa0ab6da9b6d935",
+        "size": 2093,
+        "filename": "HwN-XWTswr50M_-6ArVXfcQin_00zYvWNeebDkP2YVI=.pem",
+        "location": "security-state-staging/intermediates/bf2aacbd-643a-4dc2-8720-b5f2241d2ad8.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "HwN+XWTswr50M/+6ArVXfcQin/00zYvWNeebDkP2YVI=",
+      "crlite_enrolled": false,
+      "id": "087d2225-53d6-4103-b228-7a7c44753024",
+      "last_modified": 1637333968854
+    },
+    {
+      "schema": 1637180031808,
+      "derHash": "jz5daFi5J9KE/bhaGxWHXNeOY7ggwg3cU5zNhLDBpqo=",
+      "subject": "CN=Alibaba Cloud GCC R3 DV TLS CA 2021,O=Alibaba Cloud Computing Co.\\, Ltd.,C=CN",
+      "subjectDN": "MGcxCzAJBgNVBAYTAkNOMSowKAYDVQQKEyFBbGliYWJhIENsb3VkIENvbXB1dGluZyBDby4sIEx0ZC4xLDAqBgNVBAMTI0FsaWJhYmEgQ2xvdWQgR0NDIFIzIERWIFRMUyBDQSAyMDIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "f98193821503fbb97e18ccaf2e25c0be62c2a4b730272b187bee61068dd23f96",
+        "size": 1735,
+        "filename": "Pg1Dubcu-8AyH8ZdyHa-bP6sDppBv9fvXsyA66WgFbo=.pem",
+        "location": "security-state-staging/intermediates/72c33ac3-4ba3-487e-9802-e6fc78741b93.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Pg1Dubcu+8AyH8ZdyHa+bP6sDppBv9fvXsyA66WgFbo=",
+      "crlite_enrolled": false,
+      "id": "06729145-2c24-4ee9-9769-340ae114ad54",
+      "last_modified": 1637182700802
+    },
+    {
+      "schema": 1637180032992,
+      "derHash": "eu3lN07Kn/NMVyfBDbmCIi11MVd5dEm4g2T3Du+gwkw=",
+      "subject": "CN=Alibaba Cloud GCC R3 AlphaSSL CA 2021,O=Alibaba Cloud Computing Co.\\, Ltd.,C=CN",
+      "subjectDN": "MGkxCzAJBgNVBAYTAkNOMSowKAYDVQQKEyFBbGliYWJhIENsb3VkIENvbXB1dGluZyBDby4sIEx0ZC4xLjAsBgNVBAMTJUFsaWJhYmEgQ2xvdWQgR0NDIFIzIEFscGhhU1NMIENBIDIwMjE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "433ece3434c90b6bc0e4051245e9b8830f6689098ff3fae65e6394c641b077ca",
+        "size": 1735,
+        "filename": "AL3NHbHkwjd0miX1rwn-16RIrjnUTmWCdIdhb8wn4MU=.pem",
+        "location": "security-state-staging/intermediates/b848db72-397e-4074-9cea-c288bb8b6c35.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "AL3NHbHkwjd0miX1rwn+16RIrjnUTmWCdIdhb8wn4MU=",
+      "crlite_enrolled": false,
+      "id": "0b87c98c-35ab-4ba6-b37b-d6a18a20ddce",
+      "last_modified": 1637182700796
+    },
+    {
+      "schema": 1637182212084,
+      "derHash": "eu3lN07Kn/NMVyfBDbmCIi11MVd5dEm4g2T3Du+gwkw=",
+      "subject": "CN=Alibaba Cloud GCC R3 AlphaSSL CA 2021,O=Alibaba Cloud Computing Co.\\, Ltd.,C=CN",
+      "subjectDN": "MGkxCzAJBgNVBAYTAkNOMSowKAYDVQQKEyFBbGliYWJhIENsb3VkIENvbXB1dGluZyBDby4sIEx0ZC4xLjAsBgNVBAMTJUFsaWJhYmEgQ2xvdWQgR0NDIFIzIEFscGhhU1NMIENBIDIwMjE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "433ece3434c90b6bc0e4051245e9b8830f6689098ff3fae65e6394c641b077ca",
+        "size": 1735,
+        "filename": "AL3NHbHkwjd0miX1rwn-16RIrjnUTmWCdIdhb8wn4MU=.pem",
+        "location": "security-state-staging/intermediates/5c9b177e-3414-4fdb-b24c-65701bec1c60.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "AL3NHbHkwjd0miX1rwn+16RIrjnUTmWCdIdhb8wn4MU=",
+      "crlite_enrolled": false,
+      "id": "18f5d6e2-fab6-4ca1-b822-5f161f3244d5",
+      "last_modified": 1637182700789
+    },
+    {
+      "schema": 1637182213256,
+      "derHash": "jz5daFi5J9KE/bhaGxWHXNeOY7ggwg3cU5zNhLDBpqo=",
+      "subject": "CN=Alibaba Cloud GCC R3 DV TLS CA 2021,O=Alibaba Cloud Computing Co.\\, Ltd.,C=CN",
+      "subjectDN": "MGcxCzAJBgNVBAYTAkNOMSowKAYDVQQKEyFBbGliYWJhIENsb3VkIENvbXB1dGluZyBDby4sIEx0ZC4xLDAqBgNVBAMTI0FsaWJhYmEgQ2xvdWQgR0NDIFIzIERWIFRMUyBDQSAyMDIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "f98193821503fbb97e18ccaf2e25c0be62c2a4b730272b187bee61068dd23f96",
+        "size": 1735,
+        "filename": "Pg1Dubcu-8AyH8ZdyHa-bP6sDppBv9fvXsyA66WgFbo=.pem",
+        "location": "security-state-staging/intermediates/5a409ab9-63a8-4b06-9e2a-29a607fd8798.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Pg1Dubcu+8AyH8ZdyHa+bP6sDppBv9fvXsyA66WgFbo=",
+      "crlite_enrolled": false,
+      "id": "eaebeb2f-d95f-4ae7-bca6-d44f38b6ccfb",
+      "last_modified": 1637182700782
+    },
+    {
+      "schema": 1636577885684,
+      "derHash": "vf2E2QKq0BDE4IExd1r7c2VpTugcm4ri33ZBnz7fG+E=",
+      "subject": "CN=TrustSign BR Certification Authority (OV) 2,O=TrustSign Certificadora Dig. & Soluções Segurança da Inf. Ltda.,L=São José dos Campos,ST=São Paulo,C=BR",
+      "subjectDN": "MIHFMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8OjbyBQYXVsbzEeMBwGA1UEBwwVU8OjbyBKb3PDqSBkb3MgQ2FtcG9zMUswSQYDVQQKDEJUcnVzdFNpZ24gQ2VydGlmaWNhZG9yYSBEaWcuICYgU29sdcOnw7VlcyBTZWd1cmFuw6dhIGRhIEluZi4gTHRkYS4xNDAyBgNVBAMTK1RydXN0U2lnbiBCUiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAoT1YpIDI=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "d3dc3d5cc6b731efb8dd4582c2ff3a8a8908962642aa4824f4b90b58832e90cd",
+        "size": 2251,
+        "filename": "YH8nyVlvrD15SoA59nrCYN5KN2y2Xz-fJ5K-uBAfl1Y=.pem",
+        "location": "security-state-staging/intermediates/c00b8ed3-5bd7-4213-8c0b-7b171e5b524a.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "YH8nyVlvrD15SoA59nrCYN5KN2y2Xz+fJ5K+uBAfl1Y=",
+      "crlite_enrolled": false,
+      "id": "4d16fbc3-1ed1-40c0-940d-7abe6b7f2408",
+      "last_modified": 1636772470973
+    },
+    {
+      "schema": 1636574867921,
+      "derHash": "x3xf3ExlXJ3GkMucdvmPrtPD3s7wZMvNctQcWeVYf+s=",
+      "subject": "CN=TrustOcean Organization Validation SSL CA,O=TrustOcean Limited,C=US",
+      "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxMjAwBgNVBAMTKVRydXN0T2NlYW4gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gU1NMIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "556a16e9adc4480fdb9e891eaeeed7d9e5985f01350398edeb90bb12a7902658",
+        "size": 2109,
+        "filename": "iuXy6C6fQ7WIvruSnxEwSvYjFOgeVw4HZdR0x0OFOVE=.pem",
+        "location": "security-state-staging/intermediates/c2f7ee4a-a230-40fe-ae6d-7bac146e0fca.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "iuXy6C6fQ7WIvruSnxEwSvYjFOgeVw4HZdR0x0OFOVE=",
+      "crlite_enrolled": true,
+      "id": "08d30c0e-cd9a-4c3e-b21d-ea273d69191b",
+      "last_modified": 1636577884550
+    },
+    {
+      "schema": 1636553315830,
+      "derHash": "+RYG0bxSxhATbKqFarUAxIw7mTusSAjNgrxLeKvyQVY=",
+      "subject": "CN=NETLOCK DVSSL CA,OU=Tanúsítványkiadók (Certification Services),O=NETLOCK Kft.,L=Budapest,C=HU",
+      "subjectDN": "MIGLMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5FVExPQ0sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTEZMBcGA1UEAwwQTkVUTE9DSyBEVlNTTCBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "28fe966e32eb004f5c288e09eb400e8b6dd866ad8cee74b7e0ad399c7033fc15",
+        "size": 2446,
+        "filename": "Ss_LpeQiFGYRawte4JwIYIKszuA0KoeTtkpsRkiLCaw=.pem",
+        "location": "security-state-staging/intermediates/90489a16-17cf-4e28-83e7-e422bb5f8b09.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Ss/LpeQiFGYRawte4JwIYIKszuA0KoeTtkpsRkiLCaw=",
+      "crlite_enrolled": true,
+      "id": "e7bd6d4d-f645-4abb-b632-af28f5ac9c61",
+      "last_modified": 1636556282997
+    },
+    {
+      "schema": 1636555797761,
+      "derHash": "dYlNTJTCLXKW7hn7RHYjJYwlkbFwMSiLs4aiCqHw4KY=",
+      "subject": "CN=NetLock Közjegyzői (Class A) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU",
+      "subjectDN": "MIGuMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE8MDoGA1UEAwwzTmV0TG9jayBLw7Z6amVneXrFkWkgKENsYXNzIEEpIFRhbsO6c8OtdHbDoW55a2lhZMOz",
+      "whitelist": false,
+      "attachment": {
+        "hash": "4327de015aac627d028d4696e3b582048933e2f87d179c261b01897e32b67a1d",
+        "size": 2190,
+        "filename": "RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=.pem",
+        "location": "security-state-staging/intermediates/27099d75-dfc0-441a-a1de-81e112a1d6e5.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=",
+      "crlite_enrolled": true,
+      "id": "a76d3004-9787-484d-a4d9-2e5555cd8b56",
+      "last_modified": 1636556282950
+    },
+    {
+      "schema": 1636555798983,
+      "derHash": "fsrKSjWFo7QOJVdEFVEtVrV5mbdTAXhW8qsV+h8h9tA=",
+      "subject": "CN=NETLOCK Trust Qualified EV CA 3,O=NETLOCK Ltd.,L=Budapest,C=HU",
+      "subjectDN": "MGExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSgwJgYDVQQDDB9ORVRMT0NLIFRydXN0IFF1YWxpZmllZCBFViBDQSAz",
+      "whitelist": false,
+      "attachment": {
+        "hash": "5c9cd98f81f0d60b8f3c40b8be94209d25226eb7ebf1c126947da32ed3d21dbc",
+        "size": 2215,
+        "filename": "ksEtUEbADR0V5fQig7YPrrgGcr2PovgbGzQx045WU_0=.pem",
+        "location": "security-state-staging/intermediates/be90d242-60d9-4a6b-aefe-8e8fb342b23e.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "ksEtUEbADR0V5fQig7YPrrgGcr2PovgbGzQx045WU/0=",
+      "crlite_enrolled": true,
+      "id": "bf7893da-0baf-4aae-8bfc-282641a4dcff",
+      "last_modified": 1636556282914
+    },
+    {
+      "schema": 1636555800810,
+      "derHash": "NyuPTOc77fyIcYxAe7az5tj5p5vpVxkNDnEBx7DvmjI=",
+      "subject": "CN=NetLock Expressz (Class C) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU",
+      "subjectDN": "MIGqMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE4MDYGA1UEAwwvTmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFuw7pzw610dsOhbnlraWFkw7M=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "96ba448b3b21c633bd5e293f4383a8b88b67e802476a48d48ba20ffa8359a5ce",
+        "size": 2182,
+        "filename": "KS2adY6eMaWNhbLW6JREO3Oo34Qy_UvmA5f-f4ROpYw=.pem",
+        "location": "security-state-staging/intermediates/6380c544-10af-435b-ae2d-adad842694a3.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "KS2adY6eMaWNhbLW6JREO3Oo34Qy/UvmA5f+f4ROpYw=",
+      "crlite_enrolled": true,
+      "id": "522256d0-e9e9-44e9-b35d-221ddf453cad",
+      "last_modified": 1636556282888
+    },
+    {
+      "schema": 1636555799842,
+      "derHash": "YoSgO6+uhhow46JaAwQoMG9+tSvQuld6HZYqgJqDDJ4=",
+      "subject": "CN=NetLock Minősített Eat. (Class Q Legal) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU",
+      "subjectDN": "MIG5MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFHMEUGA1UEAww+TmV0TG9jayBNaW7FkXPDrXRldHQgRWF0LiAoQ2xhc3MgUSBMZWdhbCkgVGFuw7pzw610dsOhbnlraWFkw7M=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "be44ba2f0e98d91976e0b376d14bfcfbf5e04990413aeb73457eb447f773a585",
+        "size": 2203,
+        "filename": "wbqAvjVExNzYgkWT-psQa7MDcYIscGSOYZa0cm5x83M=.pem",
+        "location": "security-state-staging/intermediates/602c1224-b665-4b69-848a-f07cbc00e0be.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "wbqAvjVExNzYgkWT+psQa7MDcYIscGSOYZa0cm5x83M=",
+      "crlite_enrolled": true,
+      "id": "73e86e8a-47ad-4f60-be1d-64ed2011a0bb",
+      "last_modified": 1636556282862
+    },
+    {
+      "schema": 1636555798406,
+      "derHash": "ayP62JAYDDN7hkFV2uDem62e8L2njREvLL3D0CrReVY=",
+      "subject": "CN=NetLock Üzleti (Class B) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU",
+      "subjectDN": "MIGpMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE3MDUGA1UEAwwuTmV0TG9jayDDnHpsZXRpIChDbGFzcyBCKSBUYW7DunPDrXR2w6FueWtpYWTDsw==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "573f7ca4199a4ab7b67cf4b5b1c8e25a89da7c93d3296ece5e8301e5bf64c39b",
+        "size": 2182,
+        "filename": "1YROuDznuNvrat3sL9gwGR124PRLocGQQWd6IoM50Ls=.pem",
+        "location": "security-state-staging/intermediates/5ae11eb3-59e2-4f2f-a3ad-09d610869295.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "1YROuDznuNvrat3sL9gwGR124PRLocGQQWd6IoM50Ls=",
+      "crlite_enrolled": true,
+      "id": "1a8145a6-66a3-4c40-914b-e027086ea091",
+      "last_modified": 1636556282833
+    },
+    {
+      "schema": 1636315451275,
+      "derHash": "dFCEYqXCpPJb3LVcslkxCgVrfWI92OVTUfO0Lx0ySGs=",
+      "subject": "CN=TrustSign RSA OV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR",
+      "subjectDN": "MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBSU0EgT1YgQ0E=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "e4f8e4c2fc7a0eebc4bc552e536ebdd76c0b0553eb218e1bff323f7729969d80",
+        "size": 2117,
+        "filename": "chB881BfDWAiJ-J0Xbjx2_V5kxVs4F8Bof_rFzQm8kw=.pem",
+        "location": "security-state-staging/intermediates/3712897c-ea80-4f7b-a166-8193962ca35d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "chB881BfDWAiJ+J0Xbjx2/V5kxVs4F8Bof/rFzQm8kw=",
+      "crlite_enrolled": false,
+      "id": "23cc5cfc-37c0-40fb-a746-f53e5d03c584",
+      "last_modified": 1636318679457
+    },
+    {
+      "schema": 1636210673834,
+      "derHash": "unmfMiWR3X0128WPSCByXwlPVDqhPLRYxVyR3Ia+Iv8=",
+      "subject": "CN=CERTDATA SSL EV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR",
+      "subjectDN": "MG4xCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMDAuBgNVBAMMJ0NFUlREQVRBIFNTTCBFViBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "817455fbcfc00bd641341d581d3a97196ae6a94a33f63590a5b540321bf458e8",
+        "size": 2158,
+        "filename": "cVSKuRG7oLetITEBYy5dH5QBCUayslF78ETJPRfzwkU=.pem",
+        "location": "security-state-staging/intermediates/498affb3-e1de-4edb-9347-ffb1561473e8.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "cVSKuRG7oLetITEBYy5dH5QBCUayslF78ETJPRfzwkU=",
+      "crlite_enrolled": false,
+      "id": "9b021867-2e4d-4bd5-ad39-3ba7645c4e76",
+      "last_modified": 1636232280229
+    },
+    {
+      "schema": 1636207594164,
+      "derHash": "OrzpUwGd8lge2sq1i+jhQ/5pCn+Twow3PCB2J/gYJk4=",
+      "subject": "CN=University of Piraeus CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
+      "subjectDN": "MHkxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEkMCIGA1UEAxMbVW5pdmVyc2l0eSBvZiBQaXJhZXVzIENBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "11e9d3f7943085efab72f0343e77a33ad11587e4783a1896d818f44464fbe9f2",
+        "size": 2690,
+        "filename": "2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=.pem",
+        "location": "security-state-staging/intermediates/f1323b0b-1fba-443a-b79d-1a95d86c0351.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=",
+      "crlite_enrolled": false,
+      "id": "03522946-a532-4098-bd62-210f42372500",
+      "last_modified": 1636210672701
+    },
+    {
+      "schema": 1636207859236,
+      "derHash": "OrzpUwGd8lge2sq1i+jhQ/5pCn+Twow3PCB2J/gYJk4=",
+      "subject": "CN=University of Piraeus CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
+      "subjectDN": "MHkxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEkMCIGA1UEAxMbVW5pdmVyc2l0eSBvZiBQaXJhZXVzIENBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "11e9d3f7943085efab72f0343e77a33ad11587e4783a1896d818f44464fbe9f2",
+        "size": 2690,
+        "filename": "2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=.pem",
+        "location": "security-state-staging/intermediates/c738b753-9255-45e1-9c7c-9e0b1dbd9be3.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=",
+      "crlite_enrolled": false,
+      "id": "f59f3875-237a-4b1c-9f5c-d97c77aa1d94",
+      "last_modified": 1636210672674
+    },
+    {
+      "schema": 1635991660699,
+      "derHash": "Fh7lOGMpsoon/0BXNlUqYh1ahEpDgR42I+Uu76C6hAo=",
+      "subject": "CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM",
+      "subjectDN": "ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "b8fd47c4234e14aae99e993f325e88c880408479e0c6ecf0a155bcb2481f0c25",
+        "size": 2353,
+        "filename": "KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem",
+        "location": "security-state-staging/intermediates/54eee2eb-1fa3-4f22-84be-3db33a9a0e5d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=",
+      "crlite_enrolled": true,
+      "id": "9f149ba1-e8dc-457d-9abd-23718172f6af",
+      "last_modified": 1635994653520
+    },
+    {
+      "schema": 1635951634626,
+      "derHash": "KmKGw6wJrmzTdIskoz8w+5PamR+IP3ACgksUqRSVWFU=",
+      "subject": "CN=Nyatwork,O=Nyatwork Communication Ltd,C=CA",
+      "subjectDN": "MEUxCzAJBgNVBAYTAkNBMSMwIQYDVQQKDBpOeWF0d29yayBDb21tdW5pY2F0aW9uIEx0ZDERMA8GA1UEAwwITnlhdHdvcms=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "1b3c2d7116e9d075b69357d2ae84fbd7ff85f479e7e595094a8e3194b9069459",
+        "size": 1711,
+        "filename": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=.pem",
+        "location": "security-state-staging/intermediates/f63457d5-b210-4a26-999a-986a2746529d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=",
+      "crlite_enrolled": true,
+      "id": "7c9aed6c-01b5-41d5-a94c-75cb90fccd0e",
+      "last_modified": 1635955056948
+    },
+    {
+      "schema": 1635952003544,
+      "derHash": "KmKGw6wJrmzTdIskoz8w+5PamR+IP3ACgksUqRSVWFU=",
+      "subject": "CN=Nyatwork,O=Nyatwork Communication Ltd,C=CA",
+      "subjectDN": "MEUxCzAJBgNVBAYTAkNBMSMwIQYDVQQKDBpOeWF0d29yayBDb21tdW5pY2F0aW9uIEx0ZDERMA8GA1UEAwwITnlhdHdvcms=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "1b3c2d7116e9d075b69357d2ae84fbd7ff85f479e7e595094a8e3194b9069459",
+        "size": 1711,
+        "filename": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=.pem",
+        "location": "security-state-staging/intermediates/d3f28ecf-6110-4794-8523-aa8ab6af44db.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=",
+      "crlite_enrolled": true,
+      "id": "dbf86667-80e8-4573-b737-6f4b02e89985",
+      "last_modified": 1635955056913
+    },
+    {
+      "schema": 1635951408055,
+      "derHash": "KmKGw6wJrmzTdIskoz8w+5PamR+IP3ACgksUqRSVWFU=",
+      "subject": "CN=Nyatwork,O=Nyatwork Communication Ltd,C=CA",
+      "subjectDN": "MEUxCzAJBgNVBAYTAkNBMSMwIQYDVQQKDBpOeWF0d29yayBDb21tdW5pY2F0aW9uIEx0ZDERMA8GA1UEAwwITnlhdHdvcms=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "1b3c2d7116e9d075b69357d2ae84fbd7ff85f479e7e595094a8e3194b9069459",
+        "size": 1711,
+        "filename": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=.pem",
+        "location": "security-state-staging/intermediates/cf64480a-18ad-4cec-bf68-ca9d801220b8.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=",
+      "crlite_enrolled": true,
+      "id": "0f8cb74b-3ee4-41a7-89f5-6ec1fda84e09",
+      "last_modified": 1635955056890
+    },
+    {
+      "schema": 1635883717508,
+      "derHash": "eMtRLeSM7c1xNN9XyXPB4aB2krj1QqRKzruLt3bVXVk=",
+      "subject": "CN=CrowdStrike GCC R3 TLS OV CA 2020,O=CrowdStrike Inc.,C=US",
+      "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSowKAYDVQQDEyFDcm93ZFN0cmlrZSBHQ0MgUjMgVExTIE9WIENBIDIwMjA=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "4db0721974365af16dd868628e17ddb2016a9a91ef607ffb13a995ff49b25874",
+        "size": 1707,
+        "filename": "nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=.pem",
+        "location": "security-state-staging/intermediates/dffc1d44-5fa3-4cf0-8e03-6e735e18ca4c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=",
+      "crlite_enrolled": false,
+      "id": "bd781195-4915-4ba3-9cc4-34433abaf5c9",
+      "last_modified": 1635886685198
+    },
+    {
+      "schema": 1635883943102,
+      "derHash": "eMtRLeSM7c1xNN9XyXPB4aB2krj1QqRKzruLt3bVXVk=",
+      "subject": "CN=CrowdStrike GCC R3 TLS OV CA 2020,O=CrowdStrike Inc.,C=US",
+      "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSowKAYDVQQDEyFDcm93ZFN0cmlrZSBHQ0MgUjMgVExTIE9WIENBIDIwMjA=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "4db0721974365af16dd868628e17ddb2016a9a91ef607ffb13a995ff49b25874",
+        "size": 1707,
+        "filename": "nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=.pem",
+        "location": "security-state-staging/intermediates/87766a98-a2cc-464d-9b61-f38989d08aef.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=",
+      "crlite_enrolled": false,
+      "id": "679290b1-74f0-4692-85c0-80c7ed611f13",
+      "last_modified": 1635886685175
+    },
+    {
+      "schema": 1635757204738,
+      "derHash": "Gvi01Jxae22lNt6pL9+vRXNiBa/KLa//rstxLanD69E=",
+      "subject": "CN=Technical University of Crete TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR",
+      "subjectDN": "MH8xCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBDcmV0ZSBUTFMgUlNBIFN1YkNBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "55201b962dc6510422f5c81d5c66b5b28c4d7f2a96442f66bec08c6f21d80312",
+        "size": 2800,
+        "filename": "t--9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=.pem",
+        "location": "security-state-staging/intermediates/43f07f3c-1a13-46dc-9ecc-40e065495ad7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "t++9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=",
+      "crlite_enrolled": true,
+      "id": "34fd48b9-f31c-452a-8667-c873079e18df",
+      "last_modified": 1635821862453
+    },
+    {
+      "schema": 1635818885532,
+      "derHash": "Gvi01Jxae22lNt6pL9+vRXNiBa/KLa//rstxLanD69E=",
+      "subject": "CN=Technical University of Crete TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR",
+      "subjectDN": "MH8xCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBDcmV0ZSBUTFMgUlNBIFN1YkNBIFIx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "55201b962dc6510422f5c81d5c66b5b28c4d7f2a96442f66bec08c6f21d80312",
+        "size": 2800,
+        "filename": "t--9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=.pem",
+        "location": "security-state-staging/intermediates/952e3311-d764-4dbb-9fc5-dd3741a2ca38.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "t++9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=",
+      "crlite_enrolled": true,
+      "id": "32411461-ff99-4c13-b584-07737440b625",
+      "last_modified": 1635821862430
+    },
+    {
+      "schema": 1635735519825,
+      "derHash": "DhC93udRLb156/C09I/u18g8K9PdgXZVZfT/EQt7+kI=",
+      "subject": "CN=Cybertrust Japan Extended Validation Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP",
+      "subjectDN": "MGsxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjE3MDUGA1UEAxMuQ3liZXJ0cnVzdCBKYXBhbiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "e3d590ab4b71fbd20183713733b3253b32ef24a73382153319f8916fc66d3c1d",
+        "size": 1678,
+        "filename": "VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8_yf2AOohCgqgk=.pem",
+        "location": "security-state-staging/intermediates/222e4d33-ee5a-4885-add5-c30b4495b281.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8/yf2AOohCgqgk=",
+      "crlite_enrolled": false,
+      "id": "92292d1f-471b-4db3-ba30-6f423a7d649b",
+      "last_modified": 1635757203583
+    },
+    {
+      "schema": 1635584246419,
+      "derHash": "FfrEJaqEQEs2L6NInrZ9BV1donb4aFxNaY2hgw1CDw8=",
+      "subject": "CN=COMODO RSA Client Authentication and Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB",
+      "subjectDN": "MIGXMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE9MDsGA1UEAxM0Q09NT0RPIFJTQSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "6d952d782fa2f84e580c545480b40eeae3fab20a3eba7b734b158271c48b1117",
+        "size": 2105,
+        "filename": "mHI0vDHAQ12vglM3cO2DlsvGPmhqena8_DpLQz3BaYs=.pem",
+        "location": "security-state-staging/intermediates/df4e2dce-92b3-41f1-8479-4de071dddbfe.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "mHI0vDHAQ12vglM3cO2DlsvGPmhqena8/DpLQz3BaYs=",
+      "crlite_enrolled": false,
+      "id": "e9149e45-f71f-4714-887f-be55784c958e",
+      "last_modified": 1635735518690
+    },
+    {
+      "schema": 1635581142762,
+      "derHash": "M9VzWYMfh3VObnVda1tW5+cSl93f6h1jlwhmBCgPb/w=",
+      "subject": "CN=Cybertrust Japan Secure Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP",
+      "subjectDN": "MF4xCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEqMCgGA1UEAxMhQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "3d3d273966feacef23b9bad6f99c08f1cc7d487295361ce8cc0b10c724baf67a",
+        "size": 1711,
+        "filename": "bVyC1r63wwzb47rnbZ46v-604DOoFUXTp4JA0srlZRE=.pem",
+        "location": "security-state-staging/intermediates/aa91ff40-8753-4ea6-bc6c-9c2f51e7c6a1.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "bVyC1r63wwzb47rnbZ46v+604DOoFUXTp4JA0srlZRE=",
+      "crlite_enrolled": false,
+      "id": "03556fa4-abec-492c-a31c-149b44f3f991",
+      "last_modified": 1635584245288
+    },
+    {
+      "schema": 1635581139247,
+      "derHash": "1oMbpDYH9awZd41idTFWKvVRRfGRyrXvr6DgAFRCswI=",
+      "subject": "CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US",
+      "subjectDN": "MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "eec823ad61a76103455ac29ab1ea726af33851691074cffd1fb703c49fe85217",
+        "size": 2121,
+        "filename": "4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem",
+        "location": "security-state-staging/intermediates/e3b5ce85-565e-482f-b742-aae47955c01f.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=",
+      "crlite_enrolled": true,
+      "id": "8fc3b269-4824-4ae9-9b9d-2d5ab7099766",
+      "last_modified": 1635584245265
+    },
+    {
+      "schema": 1635580932372,
+      "derHash": "qzIDs+ogF9UJcmodgik+/8uMQs61LJrxwO7pa1wCvLo=",
+      "subject": "CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US",
+      "subjectDN": "MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "dab72f8a61c3d1392090bfa1d53928ff5e675385a1b03742a601a3457a12342f",
+        "size": 2653,
+        "filename": "4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem",
+        "location": "security-state-staging/intermediates/8493a5e1-2fe7-48d1-baff-5f6b9f29913f.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=",
+      "crlite_enrolled": true,
+      "id": "f45995f1-56b8-45c4-9465-14c646f731cc",
+      "last_modified": 1635584245242
+    },
+    {
+      "schema": 1635583809037,
+      "derHash": "1oMbpDYH9awZd41idTFWKvVRRfGRyrXvr6DgAFRCswI=",
+      "subject": "CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US",
+      "subjectDN": "MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "eec823ad61a76103455ac29ab1ea726af33851691074cffd1fb703c49fe85217",
+        "size": 2121,
+        "filename": "4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem",
+        "location": "security-state-staging/intermediates/d49999e5-60cd-4c45-a970-e9462ab32f63.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=",
+      "crlite_enrolled": true,
+      "id": "9561182b-470d-459e-8d38-ee7e1b3ceed8",
+      "last_modified": 1635584245220
+    },
+    {
+      "schema": 1635583809600,
+      "derHash": "qzIDs+ogF9UJcmodgik+/8uMQs61LJrxwO7pa1wCvLo=",
+      "subject": "CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US",
+      "subjectDN": "MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "dab72f8a61c3d1392090bfa1d53928ff5e675385a1b03742a601a3457a12342f",
+        "size": 2653,
+        "filename": "4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem",
+        "location": "security-state-staging/intermediates/cd6fd8ca-476d-4166-8171-47e097b3fba7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=",
+      "crlite_enrolled": true,
+      "id": "cdcb7fdb-36d0-4d2b-b326-6537b6c0a255",
+      "last_modified": 1635584245197
+    },
+    {
+      "schema": 1635516626946,
+      "derHash": "vLwYxGO2HzoDOxDHSXTtiiwyivzWejONmHFQajUVQZ8=",
+      "subject": "CN=e-Szigno Class3 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU",
+      "subjectDN": "MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMyBTU0wgQ0EgMjAxNw==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "141f708e3e75831bbe1ea4307dbbb1564e45c53708e07ce12ace8a2c364453d4",
+        "size": 1670,
+        "filename": "69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=.pem",
+        "location": "security-state-staging/intermediates/713a5d0b-40ac-4d69-8093-93d4bd2e61ab.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=",
+      "crlite_enrolled": true,
+      "id": "20f1bea5-b08a-4583-bdc2-e4d66e4dbc30",
+      "last_modified": 1635519435161
+    },
+    {
+      "schema": 1635519013320,
+      "derHash": "ffgAB19SA8AXNk6BGVqayf8AxQfWSnD3N9jT6Ms/CEU=",
+      "subject": "CN=e-Szigno Qualified TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU",
+      "subjectDN": "MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBUTFMgQ0EgMjAxOA==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "df20fd29ecb80ea583b981311eed6c99114bffa8ab98b5265dc4c8efcc1897f0",
+        "size": 1674,
+        "filename": "qd9EIyfp7CEtbkxafeyYAuC_8wQBWqGZflkLznwnuyc=.pem",
+        "location": "security-state-staging/intermediates/b21a2837-5b65-44b6-92b7-fec471d70713.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "qd9EIyfp7CEtbkxafeyYAuC/8wQBWqGZflkLznwnuyc=",
+      "crlite_enrolled": true,
+      "id": "2f5d27a3-cb0f-4f6b-b6b1-20c198d58fc8",
+      "last_modified": 1635519435137
+    },
+    {
+      "schema": 1635497859073,
+      "derHash": "ffgAB19SA8AXNk6BGVqayf8AxQfWSnD3N9jT6Ms/CEU=",
+      "subject": "CN=e-Szigno Qualified TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU",
+      "subjectDN": "MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBUTFMgQ0EgMjAxOA==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "df20fd29ecb80ea583b981311eed6c99114bffa8ab98b5265dc4c8efcc1897f0",
+        "size": 1674,
+        "filename": "qd9EIyfp7CEtbkxafeyYAuC_8wQBWqGZflkLznwnuyc=.pem",
+        "location": "security-state-staging/intermediates/9528d3b9-a037-4f0f-b644-1e7827d3c927.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "qd9EIyfp7CEtbkxafeyYAuC/8wQBWqGZflkLznwnuyc=",
+      "crlite_enrolled": true,
+      "id": "4802c4c4-718e-4497-a9a5-c367fed873eb",
+      "last_modified": 1635519435113
+    },
+    {
+      "schema": 1635516393564,
+      "derHash": "vLwYxGO2HzoDOxDHSXTtiiwyivzWejONmHFQajUVQZ8=",
+      "subject": "CN=e-Szigno Class3 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU",
+      "subjectDN": "MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMyBTU0wgQ0EgMjAxNw==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "141f708e3e75831bbe1ea4307dbbb1564e45c53708e07ce12ace8a2c364453d4",
+        "size": 1670,
+        "filename": "69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=.pem",
+        "location": "security-state-staging/intermediates/35bc1459-db4e-4fbe-b245-efb1d8b3e9e6.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=",
+      "crlite_enrolled": true,
+      "id": "5bb86eed-d806-4423-a0c3-14872f739af8",
+      "last_modified": 1635519435082
+    },
+    {
+      "schema": 1635516394253,
+      "derHash": "PtCuZ6FDLIPYIQHeabLuXn8gMCcJ2VeQc6MC2pD0hTM=",
+      "subject": "CN=TrustSafe Domain Validated CA,OU=SSL Department,O=Isimtescil Bilisim Anonim Sirketi,L=Istanbul,C=TR",
+      "subjectDN": "MIGNMQswCQYDVQQGEwJUUjERMA8GA1UEBwwISXN0YW5idWwxKjAoBgNVBAoMIUlzaW10ZXNjaWwgQmlsaXNpbSBBbm9uaW0gU2lya2V0aTEXMBUGA1UECwwOU1NMIERlcGFydG1lbnQxJjAkBgNVBAMMHVRydXN0U2FmZSBEb21haW4gVmFsaWRhdGVkIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "748834790eb69db784c3f00d7f2ef2b64cf353435e5de3e69ac4ca2c81299276",
+        "size": 2247,
+        "filename": "90w8QxLDw7OA3WHogRdF8WutmwS2zB2cr21T0-Sun5o=.pem",
+        "location": "security-state-staging/intermediates/32d1002c-6eee-400e-a7ec-8b0235165445.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "90w8QxLDw7OA3WHogRdF8WutmwS2zB2cr21T0+Sun5o=",
+      "crlite_enrolled": true,
+      "id": "29a0cb2e-7719-4c2f-9360-00c82a4a3c72",
+      "last_modified": 1635519435037
+    },
+    {
+      "schema": 1635516392834,
+      "derHash": "EUdT6I0ADnWZYVqZB+Jrc7bYUTF/8rJ6yp24/FBWkqc=",
+      "subject": "CN=E-Tugra Organization Validated CA,OU=E-TuÄŸra Sertifikasyon Merkezi,O=E-TuÄŸra EBG BiliÅŸim Teknolojileri ve Hizmetleri A.Åž.,L=Ankara,C=TR",
+      "subjectDN": "MIG1MQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxKjAoBgNVBAMMIUUtVHVncmEgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "c20540a909d14bde73c51dde53da2ff3fea4d75a0c875924065198ab7de00da3",
+        "size": 2304,
+        "filename": "2C9V2-VZ5v93wYg0HupOPel5wBqM8YEDtTLQWSkHjis=.pem",
+        "location": "security-state-staging/intermediates/375b6c2a-70ea-49da-8638-9e7de1fc7e9b.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "2C9V2+VZ5v93wYg0HupOPel5wBqM8YEDtTLQWSkHjis=",
+      "crlite_enrolled": true,
+      "id": "14fdc6a9-ae04-401c-9371-d01b4bbb58b9",
+      "last_modified": 1635519434998
+    },
+    {
+      "schema": 1635516394831,
+      "derHash": "y2/O5BxV4kd03wK+Nd5tQY6U71gR99sTc6+ICc9wfyo=",
+      "subject": "CN=E-Tugra Domain Validated CA,OU=E-TuÄŸra Sertifikasyon Merkezi,O=E-TuÄŸra EBG BiliÅŸim Teknolojileri ve Hizmetleri A.Åž.,L=Ankara,C=TR",
+      "subjectDN": "MIGvMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxJDAiBgNVBAMMG0UtVHVncmEgRG9tYWluIFZhbGlkYXRlZCBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "c6b2887b29d06c3a32442bacd3087e92f206a5fa698d64deded68c4d8bb5d347",
+        "size": 2296,
+        "filename": "DReMCzHTvlRp8z0vjOXH2lx0lpHIz5iXick53RZbRT8=.pem",
+        "location": "security-state-staging/intermediates/570f1b75-429e-4c79-b0e9-d7653e227ce7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "DReMCzHTvlRp8z0vjOXH2lx0lpHIz5iXick53RZbRT8=",
+      "crlite_enrolled": true,
+      "id": "feefbefd-6161-49d5-84fd-5b09c850c80c",
+      "last_modified": 1635519434974
+    },
+    {
+      "schema": 1635516395422,
+      "derHash": "znrcGXdXpS5pogFMzgPZgGMlAnZHQsKSPXOAVo4hAKY=",
+      "subject": "CN=E-Tugra Extended Validated CA,OU=E-TuÄŸra Sertifikasyon Merkezi,O=E-TuÄŸra EBG BiliÅŸim Teknolojileri ve Hizmetleri A.Åž.,L=Ankara,C=TR",
+      "subjectDN": "MIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxJjAkBgNVBAMMHUUtVHVncmEgRXh0ZW5kZWQgVmFsaWRhdGVkIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "12ff7eb3fc7ad0d030464cfca8808d4239fab2f60c03f47a3f76ec1c962d10f8",
+        "size": 2296,
+        "filename": "CbsSUO015uoyaPW3UoozNFDyIZuKJooRSCguLZLEHjg=.pem",
+        "location": "security-state-staging/intermediates/b4924736-081c-4006-83d9-18747abe70b7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "CbsSUO015uoyaPW3UoozNFDyIZuKJooRSCguLZLEHjg=",
+      "crlite_enrolled": true,
+      "id": "7c935540-4c03-4352-b768-16756b45aed8",
+      "last_modified": 1635519434950
+    },
+    {
+      "schema": 1635476294953,
+      "derHash": "tBpIZPDU7E6mMtAbPn8jJ3XlXiKzv9hkLuEpIoDQ5Ho=",
+      "subject": "CN=DigiCert Basic EV RSA CN CA G2,O=DigiCert Inc,C=US",
+      "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIFJTQSBDTiBDQSBHMg==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "d2c3c0eb28e66976ac4acda4193e4e6b8892fa07ec37f9932f19408c824dc0a2",
+        "size": 1654,
+        "filename": "M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=.pem",
+        "location": "security-state-staging/intermediates/aae99adb-feec-4ec3-b8f8-06e4b7cc8071.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=",
+      "crlite_enrolled": true,
+      "id": "1a6503c7-0f5c-4cde-8e28-452c972f857e",
+      "last_modified": 1635497857853
+    },
+    {
+      "schema": 1635495268237,
+      "derHash": "XGSxcxqBON6n0Rya6GIokflF66RoJeer/kdU8KYBGvg=",
+      "subject": "CN=Microsoft ECC TLS Issuing AOC CA 01,O=Microsoft Corporation,C=US",
+      "subjectDN": "MFsxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLDAqBgNVBAMTI01pY3Jvc29mdCBFQ0MgVExTIElzc3VpbmcgQU9DIENBIDAx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "b8980a779b7c2fe67041f19cdecab2d5a43f61ef0793b5cede8a3b9e111eb0b6",
+        "size": 1544,
+        "filename": "qd93pb-3n6NM25ddlkow2f5_xOZwvTm_G4wmBehD21Q=.pem",
+        "location": "security-state-staging/intermediates/7fc14ec5-80cf-4527-8ceb-7135fd5ae374.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "qd93pb+3n6NM25ddlkow2f5/xOZwvTm/G4wmBehD21Q=",
+      "crlite_enrolled": true,
+      "id": "c10233f0-5a2e-4b4b-bfec-4ee643137071",
+      "last_modified": 1635497857805
+    },
+    {
+      "schema": 1635495268881,
+      "derHash": "SB5YKiBqfXBAzNoXzyXTSXhaKrlO11UqslTc04sDLsA=",
+      "subject": "CN=Microsoft RSA TLS Issuing AOC CA 01,O=Microsoft Corporation,C=US",
+      "subjectDN": "MFsxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLDAqBgNVBAMTI01pY3Jvc29mdCBSU0EgVExTIElzc3VpbmcgQU9DIENBIDAx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "2304a6019fd3a16f19edfca5fefde59b3c14ab1accadb45eea875e9cd13c9b04",
+        "size": 2694,
+        "filename": "dITy8WGNNfbyOcBbrTC4t62TxwJNQADThxQUF-492_Q=.pem",
+        "location": "security-state-staging/intermediates/b8a6c3f7-8eee-49d2-bb3c-f8d0a6335b62.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "dITy8WGNNfbyOcBbrTC4t62TxwJNQADThxQUF+492/Q=",
+      "crlite_enrolled": true,
+      "id": "eaaba7c6-7727-4861-b733-17dc938f8649",
+      "last_modified": 1635497857758
+    },
+    {
+      "schema": 1635473380307,
+      "derHash": "AHEIGUEV88iZ9U7mfLTahyde3B1nmNp4fgdYz6aulrE=",
+      "subject": "CN=VR IDENT SSL CA 2020,O=D-Trust GmbH,C=DE",
+      "subjectDN": "MEMxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxHTAbBgNVBAMTFFZSIElERU5UIFNTTCBDQSAyMDIw",
+      "whitelist": false,
+      "attachment": {
+        "hash": "1206315657f09d9afaec77ac85e998dd3c6cdcb66f3f2176acc53b52c01c503c",
+        "size": 2519,
+        "filename": "tODlN5eWKJbzjaei8TSG0CEnvkryLLZvN3Yh2FucTVs=.pem",
+        "location": "security-state-staging/intermediates/35f8e921-4fcb-4f84-9bbb-da548ebd9895.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "tODlN5eWKJbzjaei8TSG0CEnvkryLLZvN3Yh2FucTVs=",
+      "crlite_enrolled": false,
+      "id": "9a044a16-723a-4cf7-8fef-aef81b9007f6",
+      "last_modified": 1635476293709
+    },
+    {
+      "schema": 1635473379735,
+      "derHash": "nmyANcDxyKlFMQ5y2D5TGUe1cfkpLkKkJIo3C/ezBb4=",
+      "subject": "CN=VR IDENT EV SSL CA 2020,O=D-Trust GmbH,C=DE",
+      "subjectDN": "MEYxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIDAeBgNVBAMTF1ZSIElERU5UIEVWIFNTTCBDQSAyMDIw",
+      "whitelist": false,
+      "attachment": {
+        "hash": "dc99c4f4f52985f008966e436a519a723e8fc97d68041786cb235d067d979c71",
+        "size": 2556,
+        "filename": "n2nZ8zPLSNKoerb6X9o01VOniH-YyahnTcdt2oR9ovw=.pem",
+        "location": "security-state-staging/intermediates/24db4e33-c897-4e54-9072-c201e9f0c903.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "n2nZ8zPLSNKoerb6X9o01VOniH+YyahnTcdt2oR9ovw=",
+      "crlite_enrolled": false,
+      "id": "911c16b5-610f-407c-95ae-d17b705f20c2",
+      "last_modified": 1635476293686
+    },
+    {
+      "schema": 1635454810007,
+      "derHash": "Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=",
+      "subject": "CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES",
+      "subjectDN": "MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471",
+        "size": 1248,
+        "filename": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem",
+        "location": "security-state-staging/intermediates/c06db3d6-f723-43e2-99fe-fb7ab58beff9.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=",
+      "crlite_enrolled": true,
+      "id": "3d87fa81-1922-410b-ad87-b072f825cf4c",
+      "last_modified": 1635458234493
+    },
+    {
+      "schema": 1635454214966,
+      "derHash": "Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=",
+      "subject": "CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES",
+      "subjectDN": "MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471",
+        "size": 1248,
+        "filename": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem",
+        "location": "security-state-staging/intermediates/c43aba38-0250-470d-bc16-4fa8ee7973cb.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=",
+      "crlite_enrolled": true,
+      "id": "e3964c59-8391-4432-9624-9b3f841b6121",
+      "last_modified": 1635458234445
+    },
+    {
+      "schema": 1635454600035,
+      "derHash": "Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=",
+      "subject": "CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES",
+      "subjectDN": "MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471",
+        "size": 1248,
+        "filename": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem",
+        "location": "security-state-staging/intermediates/0e071112-b7ec-44a8-bf67-d3723d6c9c8c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=",
+      "crlite_enrolled": true,
+      "id": "d709f323-b76c-451f-bf49-dabb2b709355",
+      "last_modified": 1635458234409
+    },
+    {
+      "schema": 1635436209776,
+      "derHash": "s0oztER0/bAHjxE1J7vbdv5b+ByiS7htYoE2xQFgQ+g=",
+      "subject": "CN=Certum Class I CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL",
+      "subjectDN": "MHYxCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGjAYBgNVBAMTEUNlcnR1bSBDbGFzcyBJIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "30af05c15084780c6d3ae3b8241e1c92fd060afc921724be7e63675470aeac33",
+        "size": 1711,
+        "filename": "MbF_6zzENJgNMBtdiV6R_9-GZ7l6Nl4QjwF-GW39Yms=.pem",
+        "location": "security-state-staging/intermediates/431977f4-c9e1-426b-b192-a46a8deba0f6.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "MbF/6zzENJgNMBtdiV6R/9+GZ7l6Nl4QjwF+GW39Yms=",
+      "crlite_enrolled": false,
+      "id": "773ef76c-6d3d-4e37-bc25-7bd1ab2f4be8",
+      "last_modified": 1635436642995
+    },
+    {
+      "schema": 1635432610704,
+      "derHash": "s0oztER0/bAHjxE1J7vbdv5b+ByiS7htYoE2xQFgQ+g=",
+      "subject": "CN=Certum Class I CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL",
+      "subjectDN": "MHYxCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGjAYBgNVBAMTEUNlcnR1bSBDbGFzcyBJIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "30af05c15084780c6d3ae3b8241e1c92fd060afc921724be7e63675470aeac33",
+        "size": 1711,
+        "filename": "MbF_6zzENJgNMBtdiV6R_9-GZ7l6Nl4QjwF-GW39Yms=.pem",
+        "location": "security-state-staging/intermediates/6d12dffd-f723-444a-89cf-c22b61120a46.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "MbF/6zzENJgNMBtdiV6R/9+GZ7l6Nl4QjwF+GW39Yms=",
+      "crlite_enrolled": false,
+      "id": "d4829978-1ba8-4af9-a6e4-a151e2c5f4f6",
+      "last_modified": 1635433111646
+    },
+    {
       "schema": 1635365171154,
       "derHash": "4/NVu17BE8/cXhzSNAxlwm30xph5/vmAA27PQv0Jk3I=",
       "subject": "CN=Network Solutions EV Server CA 3,O=Network Solutions L.L.C.,C=US",
@@ -325,24 +1567,6 @@
       "last_modified": 1634947050868
     },
     {
-      "schema": 1634935826625,
-      "derHash": "KmKGw6wJrmzTdIskoz8w+5PamR+IP3ACgksUqRSVWFU=",
-      "subject": "CN=Nyatwork,O=Nyatwork Communication Ltd,C=CA",
-      "subjectDN": "MEUxCzAJBgNVBAYTAkNBMSMwIQYDVQQKDBpOeWF0d29yayBDb21tdW5pY2F0aW9uIEx0ZDERMA8GA1UEAwwITnlhdHdvcms=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "1b3c2d7116e9d075b69357d2ae84fbd7ff85f479e7e595094a8e3194b9069459",
-        "size": 1711,
-        "filename": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=.pem",
-        "location": "security-state-staging/intermediates/cf64480a-18ad-4cec-bf68-ca9d801220b8.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=",
-      "crlite_enrolled": false,
-      "id": "0f8cb74b-3ee4-41a7-89f5-6ec1fda84e09",
-      "last_modified": 1634947050852
-    },
-    {
       "schema": 1634935828297,
       "derHash": "kmUc1IoCiKowdTVN3BXcJNCvjuZwFbaKFFlwoJNHXhk=",
       "subject": "CN=GlobalSign Atlas R3 DV ACME CA 2022 Q1,O=GlobalSign nv-sa,C=BE",
@@ -541,24 +1765,6 @@
       "last_modified": 1634947050640
     },
     {
-      "schema": 1634936449175,
-      "derHash": "KmKGw6wJrmzTdIskoz8w+5PamR+IP3ACgksUqRSVWFU=",
-      "subject": "CN=Nyatwork,O=Nyatwork Communication Ltd,C=CA",
-      "subjectDN": "MEUxCzAJBgNVBAYTAkNBMSMwIQYDVQQKDBpOeWF0d29yayBDb21tdW5pY2F0aW9uIEx0ZDERMA8GA1UEAwwITnlhdHdvcms=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "1b3c2d7116e9d075b69357d2ae84fbd7ff85f479e7e595094a8e3194b9069459",
-        "size": 1711,
-        "filename": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=.pem",
-        "location": "security-state-staging/intermediates/d3f28ecf-6110-4794-8523-aa8ab6af44db.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=",
-      "crlite_enrolled": false,
-      "id": "dbf86667-80e8-4573-b737-6f4b02e89985",
-      "last_modified": 1634947050627
-    },
-    {
       "schema": 1634936451023,
       "derHash": "cnqQaaPGDSE1hOYW1b9V39GccaOXZkXqanOxj4N2DSQ=",
       "subject": "CN=GlobalSign Atlas ECCR5 DV TLS CA 2022 Q1,O=GlobalSign nv-sa,C=BE",
@@ -757,24 +1963,6 @@
       "last_modified": 1634947050390
     },
     {
-      "schema": 1634937124663,
-      "derHash": "KmKGw6wJrmzTdIskoz8w+5PamR+IP3ACgksUqRSVWFU=",
-      "subject": "CN=Nyatwork,O=Nyatwork Communication Ltd,C=CA",
-      "subjectDN": "MEUxCzAJBgNVBAYTAkNBMSMwIQYDVQQKDBpOeWF0d29yayBDb21tdW5pY2F0aW9uIEx0ZDERMA8GA1UEAwwITnlhdHdvcms=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "1b3c2d7116e9d075b69357d2ae84fbd7ff85f479e7e595094a8e3194b9069459",
-        "size": 1711,
-        "filename": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=.pem",
-        "location": "security-state-staging/intermediates/f63457d5-b210-4a26-999a-986a2746529d.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "o0jjxzbIt8jj8zaT6IFOw5B3fUAt1GpNhfNVqM7gAVY=",
-      "crlite_enrolled": false,
-      "id": "7c9aed6c-01b5-41d5-a94c-75cb90fccd0e",
-      "last_modified": 1634947050373
-    },
-    {
       "schema": 1634937126377,
       "derHash": "2eSoA/tJju6Tefz5CsMGeuZdCYzHeJDDfldeJJzX18k=",
       "subject": "CN=GlobalSign Atlas R3 DV TLS CA 2022 Q1,O=GlobalSign nv-sa,C=BE",
@@ -7129,24 +8317,6 @@
       "last_modified": 1632167888751
     },
     {
-      "schema": 1632149856271,
-      "derHash": "k6B4mNibLMoWa6bx+KFBOM5Dgo5JG4MZJryCR9ORzHI=",
-      "subject": "CN=Starfield Secure Certificate Authority - G2,OU=http://certs.starfieldtech.com/repository/,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US",
-      "subjectDN": "MIHGMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEzMDEGA1UECxMqaHR0cDovL2NlcnRzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkvMTQwMgYDVQQDEytTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy",
-      "whitelist": false,
-      "attachment": {
-        "hash": "4283da4ef9b6b21e475fb4a88aff9532a5c74e35282cb5459a20ee419646571c",
-        "size": 1792,
-        "filename": "8kGWrpQHhmc0jwLo43RYo6bmqtHgsNxhARjM5yFCe_w=.pem",
-        "location": "security-state-staging/intermediates/f0b4b8ab-658e-452d-a259-15b15f68060a.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "8kGWrpQHhmc0jwLo43RYo6bmqtHgsNxhARjM5yFCe/w=",
-      "crlite_enrolled": true,
-      "id": "eda1d6cc-95f3-4925-b185-1972acc69e5a",
-      "last_modified": 1632167888728
-    },
-    {
       "schema": 1631908274830,
       "derHash": "DlXQmFSCu7fEkOuhR8WgIaLCogidOor1fQHt1UDKWkU=",
       "subject": "CN=SwissSign RSA TLS DV ICA 2021 - 1,O=SwissSign AG,C=CH",
@@ -7309,24 +8479,6 @@
       "last_modified": 1631843845693
     },
     {
-      "schema": 1631843453964,
-      "derHash": "8Up9JCetCgG01/152NUHctJSbiUkJfignDA3/fpjX1o=",
-      "subject": "CN=ZoTrus OV SSL CA,O=ZoTrus Technology Limited,C=CN",
-      "subjectDN": "MEwxCzAJBgNVBAYTAkNOMSIwIAYDVQQKExlab1RydXMgVGVjaG5vbG9neSBMaW1pdGVkMRkwFwYDVQQDExBab1RydXMgT1YgU1NMIENB",
-      "whitelist": false,
-      "attachment": {
-        "hash": "3d34f0ccb6454d57fa6d545acd6c231900b5c908c93777fe407d6363d4c87fb0",
-        "size": 2251,
-        "filename": "mic4JfOko8h5lsSjNABtsJRu4_nBErCNRFyxtEJc7SA=.pem",
-        "location": "security-state-staging/intermediates/18b9a297-9f9d-465d-a63a-b2e6ad2da805.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "mic4JfOko8h5lsSjNABtsJRu4/nBErCNRFyxtEJc7SA=",
-      "crlite_enrolled": false,
-      "id": "c5018a05-ac0d-419c-883c-606fbf703668",
-      "last_modified": 1631843845672
-    },
-    {
       "schema": 1631843455899,
       "derHash": "riEQ8jVKnbDFOqbpE5+vDdLrAYZaZnETXG/2LZ84SKA=",
       "subject": "CN=CerSign DV SSL CA,O=CerSign Technology Limited,C=CN",
@@ -7417,24 +8569,6 @@
       "last_modified": 1631735851199
     },
     {
-      "schema": 1631545045582,
-      "derHash": "+RYG0bxSxhATbKqFarUAxIw7mTusSAjNgrxLeKvyQVY=",
-      "subject": "CN=NETLOCK DVSSL CA,OU=Tanúsítványkiadók (Certification Services),O=NETLOCK Kft.,L=Budapest,C=HU",
-      "subjectDN": "MIGLMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5FVExPQ0sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTEZMBcGA1UEAwwQTkVUTE9DSyBEVlNTTCBDQQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "28fe966e32eb004f5c288e09eb400e8b6dd866ad8cee74b7e0ad399c7033fc15",
-        "size": 2446,
-        "filename": "Ss_LpeQiFGYRawte4JwIYIKszuA0KoeTtkpsRkiLCaw=.pem",
-        "location": "security-state-staging/intermediates/90489a16-17cf-4e28-83e7-e422bb5f8b09.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "Ss/LpeQiFGYRawte4JwIYIKszuA0KoeTtkpsRkiLCaw=",
-      "crlite_enrolled": true,
-      "id": "e7bd6d4d-f645-4abb-b632-af28f5ac9c61",
-      "last_modified": 1631563058760
-    },
-    {
       "schema": 1631285901629,
       "derHash": "P7oKpJ+94cgUyoMIeO0Dx9JDI/Y0g+Ut7o/0LBU8I08=",
       "subject": "CN=GlobeSSL EV Certification Authority 2,OU=Controlled by COMODO exclusively for Globe Hosting\\, Inc.,O=Globe Hosting\\, Inc.,L=Wilmington,ST=DE,C=US",
@@ -7525,24 +8659,6 @@
       "last_modified": 1631066311404
     },
     {
-      "schema": 1631065801779,
-      "derHash": "cQLZcsJOnKaNDm+f9TxfZYzZuGSfKOrY28M2wt9QSBE=",
-      "subject": "CN=CertCloud RSA OV TLS CA,O=CertCloud Pte. Ltd.,C=SG",
-      "subjectDN": "ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIE9WIFRMUyBDQQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "8d771de489696047446dd891e36b2c199bc714a871f4de9a134028e7dd330872",
-        "size": 2081,
-        "filename": "ORYJiVkIJCqtrNqVHJ4iw_q-R2u46OEMcFExxBr8_5Y=.pem",
-        "location": "security-state-staging/intermediates/85b0d8c2-29b3-4346-9080-e95bce35f8b6.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "ORYJiVkIJCqtrNqVHJ4iw/q+R2u46OEMcFExxBr8/5Y=",
-      "crlite_enrolled": false,
-      "id": "b87a1d31-36bc-448e-ba4b-6a58e79386ba",
-      "last_modified": 1631066311384
-    },
-    {
       "schema": 1631065802315,
       "derHash": "yYqJmVEeL2CJUFOv9MU5vRtnZXVOu3s1OJaz8pdO2D8=",
       "subject": "CN=CertCloud ECC OV TLS CA,O=CertCloud Pte. Ltd.,C=SG",
@@ -7561,24 +8677,6 @@
       "last_modified": 1631066311364
     },
     {
-      "schema": 1631065971057,
-      "derHash": "cQLZcsJOnKaNDm+f9TxfZYzZuGSfKOrY28M2wt9QSBE=",
-      "subject": "CN=CertCloud RSA OV TLS CA,O=CertCloud Pte. Ltd.,C=SG",
-      "subjectDN": "ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIE9WIFRMUyBDQQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "8d771de489696047446dd891e36b2c199bc714a871f4de9a134028e7dd330872",
-        "size": 2081,
-        "filename": "ORYJiVkIJCqtrNqVHJ4iw_q-R2u46OEMcFExxBr8_5Y=.pem",
-        "location": "security-state-staging/intermediates/3b08e799-b31b-4131-a15e-06ba6cd0b067.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "ORYJiVkIJCqtrNqVHJ4iw/q+R2u46OEMcFExxBr8/5Y=",
-      "crlite_enrolled": false,
-      "id": "1e513d59-b8f5-4b2d-b079-bf21291f788f",
-      "last_modified": 1631066311344
-    },
-    {
       "schema": 1631065801225,
       "derHash": "9vFZKGoUAd5Tl+IaAJBTSoX157n5j9SlpHsd/9S/3tQ=",
       "subject": "CN=emSign EV SSL CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US",
@@ -8065,96 +9163,6 @@
       "last_modified": 1627246645036
     },
     {
-      "schema": 1627098943049,
-      "derHash": "qzIDs+ogF9UJcmodgik+/8uMQs61LJrxwO7pa1wCvLo=",
-      "subject": "CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US",
-      "subjectDN": "MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "dab72f8a61c3d1392090bfa1d53928ff5e675385a1b03742a601a3457a12342f",
-        "size": 2653,
-        "filename": "4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem",
-        "location": "security-state-staging/intermediates/cd6fd8ca-476d-4166-8171-47e097b3fba7.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=",
-      "crlite_enrolled": false,
-      "id": "cdcb7fdb-36d0-4d2b-b326-6537b6c0a255",
-      "last_modified": 1627102640462
-    },
-    {
-      "schema": 1627098765680,
-      "derHash": "1oMbpDYH9awZd41idTFWKvVRRfGRyrXvr6DgAFRCswI=",
-      "subject": "CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US",
-      "subjectDN": "MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "eec823ad61a76103455ac29ab1ea726af33851691074cffd1fb703c49fe85217",
-        "size": 2121,
-        "filename": "4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem",
-        "location": "security-state-staging/intermediates/d49999e5-60cd-4c45-a970-e9462ab32f63.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=",
-      "crlite_enrolled": false,
-      "id": "9561182b-470d-459e-8d38-ee7e1b3ceed8",
-      "last_modified": 1627102640439
-    },
-    {
-      "schema": 1627099151125,
-      "derHash": "qzIDs+ogF9UJcmodgik+/8uMQs61LJrxwO7pa1wCvLo=",
-      "subject": "CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US",
-      "subjectDN": "MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "dab72f8a61c3d1392090bfa1d53928ff5e675385a1b03742a601a3457a12342f",
-        "size": 2653,
-        "filename": "4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem",
-        "location": "security-state-staging/intermediates/8493a5e1-2fe7-48d1-baff-5f6b9f29913f.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=",
-      "crlite_enrolled": false,
-      "id": "f45995f1-56b8-45c4-9465-14c646f731cc",
-      "last_modified": 1627102640419
-    },
-    {
-      "schema": 1627098943614,
-      "derHash": "1oMbpDYH9awZd41idTFWKvVRRfGRyrXvr6DgAFRCswI=",
-      "subject": "CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US",
-      "subjectDN": "MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "eec823ad61a76103455ac29ab1ea726af33851691074cffd1fb703c49fe85217",
-        "size": 2121,
-        "filename": "4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem",
-        "location": "security-state-staging/intermediates/e3b5ce85-565e-482f-b742-aae47955c01f.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=",
-      "crlite_enrolled": false,
-      "id": "8fc3b269-4824-4ae9-9b9d-2d5ab7099766",
-      "last_modified": 1627102640399
-    },
-    {
-      "schema": 1626987442498,
-      "derHash": "lzpBJ2/9AeAnoqrUnjTDeEbT6Xb/amILZxLjODIEGqY=",
-      "subject": "CN=Go Daddy Secure Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US",
-      "subjectDN": "MIG0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy",
-      "whitelist": false,
-      "attachment": {
-        "hash": "a111efc20329e87b541cfc3e7f526fc54bb24624fddf210f4347b9fadfb1ab6b",
-        "size": 1727,
-        "filename": "8Rw90Ej3Ttt8RRkrg-WYDS9n7IS03bk5bjP_UXPtaY8=.pem",
-        "location": "security-state-staging/intermediates/a2a04dfe-6201-4d0a-b8cf-80d2975bfb51.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "8Rw90Ej3Ttt8RRkrg+WYDS9n7IS03bk5bjP/UXPtaY8=",
-      "crlite_enrolled": true,
-      "id": "549c92e2-3738-4c8c-ae37-407e4e6158ce",
-      "last_modified": 1627009045803
-    },
-    {
       "schema": 1626986989722,
       "derHash": "9igmTHnb+9/P3sZDFxvcvU3nSD+cgOpZBoiHrkSaLkg=",
       "subject": "CN=HARICA EV TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,L=Athens,C=GR",
@@ -8497,24 +9505,6 @@
       "last_modified": 1625126256108
     },
     {
-      "schema": 1625125796340,
-      "derHash": "SB5YKiBqfXBAzNoXzyXTSXhaKrlO11UqslTc04sDLsA=",
-      "subject": "CN=Microsoft RSA TLS Issuing AOC CA 01,O=Microsoft Corporation,C=US",
-      "subjectDN": "MFsxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLDAqBgNVBAMTI01pY3Jvc29mdCBSU0EgVExTIElzc3VpbmcgQU9DIENBIDAx",
-      "whitelist": false,
-      "attachment": {
-        "hash": "2304a6019fd3a16f19edfca5fefde59b3c14ab1accadb45eea875e9cd13c9b04",
-        "size": 2694,
-        "filename": "dITy8WGNNfbyOcBbrTC4t62TxwJNQADThxQUF-492_Q=.pem",
-        "location": "security-state-staging/intermediates/b8a6c3f7-8eee-49d2-bb3c-f8d0a6335b62.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "dITy8WGNNfbyOcBbrTC4t62TxwJNQADThxQUF+492/Q=",
-      "crlite_enrolled": false,
-      "id": "eaaba7c6-7727-4861-b733-17dc938f8649",
-      "last_modified": 1625126256095
-    },
-    {
       "schema": 1625125798020,
       "derHash": "J2k4FTLZYYPtOb3E4yPzxSD75qzzvaMCIiOd38RMg4A=",
       "subject": "CN=Microsoft ECC TLS Issuing EOC CA 01,O=Microsoft Corporation,C=US",
@@ -8533,24 +9523,6 @@
       "last_modified": 1625126256083
     },
     {
-      "schema": 1625125799746,
-      "derHash": "XGSxcxqBON6n0Rya6GIokflF66RoJeer/kdU8KYBGvg=",
-      "subject": "CN=Microsoft ECC TLS Issuing AOC CA 01,O=Microsoft Corporation,C=US",
-      "subjectDN": "MFsxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLDAqBgNVBAMTI01pY3Jvc29mdCBFQ0MgVExTIElzc3VpbmcgQU9DIENBIDAx",
-      "whitelist": false,
-      "attachment": {
-        "hash": "b8980a779b7c2fe67041f19cdecab2d5a43f61ef0793b5cede8a3b9e111eb0b6",
-        "size": 1544,
-        "filename": "qd93pb-3n6NM25ddlkow2f5_xOZwvTm_G4wmBehD21Q=.pem",
-        "location": "security-state-staging/intermediates/7fc14ec5-80cf-4527-8ceb-7135fd5ae374.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "qd93pb+3n6NM25ddlkow2f5/xOZwvTm/G4wmBehD21Q=",
-      "crlite_enrolled": false,
-      "id": "c10233f0-5a2e-4b4b-bfec-4ee643137071",
-      "last_modified": 1625126256070
-    },
-    {
       "schema": 1625125801402,
       "derHash": "13xFwVh3McRjLBnW88n+gyYmYVyHnqBTZkpLJusik+w=",
       "subject": "CN=Microsoft RSA TLS Issuing AOC CA 02,O=Microsoft Corporation,C=US",
@@ -9073,24 +10045,6 @@
       "last_modified": 1623963448315
     },
     {
-      "schema": 1623916919617,
-      "derHash": "ThpWTHGgQoiXDlPAN9HPwlwfm+/FJ2zzvVAe4mLwQgI=",
-      "subject": "CN=GlobalSign Atlas R3 OV TLS CA H2 2021,O=GlobalSign nv-sa,C=BE",
-      "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIE9WIFRMUyBDQSBIMiAyMDIx",
-      "whitelist": false,
-      "attachment": {
-        "hash": "d499679a13f287b719305ece5b064b2730137bf3006a9913e7ab121e378f3262",
-        "size": 1715,
-        "filename": "D2Dxjr_K2WrUouIXuBMldR6ucBSdBjfQI6boJU6R6i8=.pem",
-        "location": "security-state-staging/intermediates/fae57392-fd90-4733-a1bb-c543b9e8ff29.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "D2Dxjr/K2WrUouIXuBMldR6ucBSdBjfQI6boJU6R6i8=",
-      "crlite_enrolled": false,
-      "id": "105b6627-b2cd-462b-8da2-204dc969ac8c",
-      "last_modified": 1623920278133
-    },
-    {
       "schema": 1623916921256,
       "derHash": "EbbbW2jc3zRHmufnt7uqcWWQVXetg9R08ruXF84kTOo=",
       "subject": "CN=GlobalSign Atlas R3 AlphaSSL CA H2 2021,O=Globalsign nv-sa,C=BE",
@@ -9307,24 +10261,6 @@
       "last_modified": 1622559454515
     },
     {
-      "schema": 1621954724552,
-      "derHash": "tBpIZPDU7E6mMtAbPn8jJ3XlXiKzv9hkLuEpIoDQ5Ho=",
-      "subject": "CN=DigiCert Basic EV RSA CN CA G2,O=DigiCert Inc,C=US",
-      "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIFJTQSBDTiBDQSBHMg==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "d2c3c0eb28e66976ac4acda4193e4e6b8892fa07ec37f9932f19408c824dc0a2",
-        "size": 1654,
-        "filename": "M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=.pem",
-        "location": "security-state-staging/intermediates/aae99adb-feec-4ec3-b8f8-06e4b7cc8071.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=",
-      "crlite_enrolled": false,
-      "id": "1a6503c7-0f5c-4cde-8e28-452c972f857e",
-      "last_modified": 1622105887036
-    },
-    {
       "schema": 1621609055804,
       "derHash": "dqxae3TjELnmJOf30Rg4DKloW0DEFsa4meSm1Cm+ej8=",
       "subject": "CN=TLS RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mahé,C=SC",
@@ -14131,24 +15067,6 @@
       "last_modified": 1613660250318
     },
     {
-      "schema": 1613659810002,
-      "derHash": "OrzpUwGd8lge2sq1i+jhQ/5pCn+Twow3PCB2J/gYJk4=",
-      "subject": "CN=University of Piraeus CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
-      "subjectDN": "MHkxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEkMCIGA1UEAxMbVW5pdmVyc2l0eSBvZiBQaXJhZXVzIENBIFIx",
-      "whitelist": false,
-      "attachment": {
-        "hash": "11e9d3f7943085efab72f0343e77a33ad11587e4783a1896d818f44464fbe9f2",
-        "size": 2690,
-        "filename": "2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=.pem",
-        "location": "security-state-staging/intermediates/c738b753-9255-45e1-9c7c-9e0b1dbd9be3.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=",
-      "crlite_enrolled": true,
-      "id": "f59f3875-237a-4b1c-9f5c-d97c77aa1d94",
-      "last_modified": 1613660250307
-    },
-    {
       "schema": 1613659811501,
       "derHash": "nHgvawVYrcscye+EUyDRRZLJIg/PADDAmA2ddTsGYk8=",
       "subject": "CN=International Hellenic University TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR",
@@ -14563,24 +15481,6 @@
       "last_modified": 1613660249965
     },
     {
-      "schema": 1613659860858,
-      "derHash": "F7TgrQSCo9An9YvfyKm9Vfdcq8jfBZpAVqFsyN7lM+8=",
-      "subject": "CN=University of Macedonia CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
-      "subjectDN": "MHsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEmMCQGA1UEAxMdVW5pdmVyc2l0eSBvZiBNYWNlZG9uaWEgQ0EgUjE=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "c153ed5ab8ba6db8df23a7640e7da30387b8d49e9c76ac5a7087e71e346c1522",
-        "size": 2519,
-        "filename": "Q3wUDE_KGR_qsDlo3z3iA92yNVJJgXo3pVbkHKiMh-g=.pem",
-        "location": "security-state-staging/intermediates/58ae3d50-d6eb-4b02-9565-29f915ef549e.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "Q3wUDE/KGR/qsDlo3z3iA92yNVJJgXo3pVbkHKiMh+g=",
-      "crlite_enrolled": true,
-      "id": "0f430c08-80c5-4146-9d7b-847ab31f7778",
-      "last_modified": 1613660249922
-    },
-    {
       "schema": 1613659862334,
       "derHash": "iExR1kO+ESbnLzsbcji6V+AmjB1sSiKs3WJJwXWKU7Y=",
       "subject": "CN=International Hellenic University CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
@@ -14725,24 +15625,6 @@
       "last_modified": 1613660249814
     },
     {
-      "schema": 1613659878451,
-      "derHash": "Gvi01Jxae22lNt6pL9+vRXNiBa/KLa//rstxLanD69E=",
-      "subject": "CN=Technical University of Crete TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR",
-      "subjectDN": "MH8xCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBDcmV0ZSBUTFMgUlNBIFN1YkNBIFIx",
-      "whitelist": false,
-      "attachment": {
-        "hash": "55201b962dc6510422f5c81d5c66b5b28c4d7f2a96442f66bec08c6f21d80312",
-        "size": 2800,
-        "filename": "t--9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=.pem",
-        "location": "security-state-staging/intermediates/952e3311-d764-4dbb-9fc5-dd3741a2ca38.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "t++9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=",
-      "crlite_enrolled": false,
-      "id": "32411461-ff99-4c13-b584-07737440b625",
-      "last_modified": 1613660249792
-    },
-    {
       "schema": 1613656175899,
       "derHash": "/IiJpBHRkQt6beFZ+zKPhN/9J1ajmnjpHLm7kMb+puQ=",
       "subject": "CN=University of Crete CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
@@ -14977,24 +15859,6 @@
       "last_modified": 1613656686921
     },
     {
-      "schema": 1613656198317,
-      "derHash": "Gvi01Jxae22lNt6pL9+vRXNiBa/KLa//rstxLanD69E=",
-      "subject": "CN=Technical University of Crete TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR",
-      "subjectDN": "MH8xCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBDcmV0ZSBUTFMgUlNBIFN1YkNBIFIx",
-      "whitelist": false,
-      "attachment": {
-        "hash": "55201b962dc6510422f5c81d5c66b5b28c4d7f2a96442f66bec08c6f21d80312",
-        "size": 2800,
-        "filename": "t--9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=.pem",
-        "location": "security-state-staging/intermediates/43f07f3c-1a13-46dc-9ecc-40e065495ad7.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "t++9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=",
-      "crlite_enrolled": false,
-      "id": "34fd48b9-f31c-452a-8667-c873079e18df",
-      "last_modified": 1613656686910
-    },
-    {
       "schema": 1613656202663,
       "derHash": "CKJ3P5CLieNfg9wnCvuLxl6NGS8N0ktSEWFxaNYN06s=",
       "subject": "CN=University of Western Macedonia CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
@@ -15031,24 +15895,6 @@
       "last_modified": 1613656686858
     },
     {
-      "schema": 1613656210235,
-      "derHash": "OrzpUwGd8lge2sq1i+jhQ/5pCn+Twow3PCB2J/gYJk4=",
-      "subject": "CN=University of Piraeus CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
-      "subjectDN": "MHkxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEkMCIGA1UEAxMbVW5pdmVyc2l0eSBvZiBQaXJhZXVzIENBIFIx",
-      "whitelist": false,
-      "attachment": {
-        "hash": "11e9d3f7943085efab72f0343e77a33ad11587e4783a1896d818f44464fbe9f2",
-        "size": 2690,
-        "filename": "2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=.pem",
-        "location": "security-state-staging/intermediates/f1323b0b-1fba-443a-b79d-1a95d86c0351.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=",
-      "crlite_enrolled": true,
-      "id": "03522946-a532-4098-bd62-210f42372500",
-      "last_modified": 1613656686825
-    },
-    {
       "schema": 1613656211677,
       "derHash": "Dugs637KJBzMKdTliAYsQ+RH7ebGlvE1rMQRlmEmuoM=",
       "subject": "CN=Aristotle University of Thessaloniki SSL RSA SubCA R2,O=Aristotle University of Thessaloniki,L=Thessaloniki,C=GR",
@@ -15319,24 +16165,6 @@
       "last_modified": 1613656686605
     },
     {
-      "schema": 1613656242812,
-      "derHash": "F7TgrQSCo9An9YvfyKm9Vfdcq8jfBZpAVqFsyN7lM+8=",
-      "subject": "CN=University of Macedonia CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR",
-      "subjectDN": "MHsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEmMCQGA1UEAxMdVW5pdmVyc2l0eSBvZiBNYWNlZG9uaWEgQ0EgUjE=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "c153ed5ab8ba6db8df23a7640e7da30387b8d49e9c76ac5a7087e71e346c1522",
-        "size": 2519,
-        "filename": "Q3wUDE_KGR_qsDlo3z3iA92yNVJJgXo3pVbkHKiMh-g=.pem",
-        "location": "security-state-staging/intermediates/c67c13bf-d12d-4e53-8827-0bb25e395b9f.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "Q3wUDE/KGR/qsDlo3z3iA92yNVJJgXo3pVbkHKiMh+g=",
-      "crlite_enrolled": true,
-      "id": "49042737-15ea-4a2c-b256-318ca9c6a653",
-      "last_modified": 1613656686595
-    },
-    {
       "schema": 1613656244277,
       "derHash": "fixTc5fnuNmyTYfzBMluoFekB84R0LZtmbpLiiK7EWc=",
       "subject": "CN=University of the Aegean TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR",
@@ -16057,24 +16885,6 @@
       "last_modified": 1611867512219
     },
     {
-      "schema": 1611841764484,
-      "derHash": "dYlNTJTCLXKW7hn7RHYjJYwlkbFwMSiLs4aiCqHw4KY=",
-      "subject": "CN=NetLock Közjegyzői (Class A) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU",
-      "subjectDN": "MIGuMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE8MDoGA1UEAwwzTmV0TG9jayBLw7Z6amVneXrFkWkgKENsYXNzIEEpIFRhbsO6c8OtdHbDoW55a2lhZMOz",
-      "whitelist": false,
-      "attachment": {
-        "hash": "4327de015aac627d028d4696e3b582048933e2f87d179c261b01897e32b67a1d",
-        "size": 2190,
-        "filename": "RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=.pem",
-        "location": "security-state-staging/intermediates/27099d75-dfc0-441a-a1de-81e112a1d6e5.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=",
-      "crlite_enrolled": true,
-      "id": "a76d3004-9787-484d-a4d9-2e5555cd8b56",
-      "last_modified": 1611842278578
-    },
-    {
       "schema": 1611647872433,
       "derHash": "51WunELBMV8n3NBkUcar4LxqrW7dwuVjXPxJGBktNEw=",
       "subject": "CN=sslTrus (RSA) EV CA,O=sslTrus (上海��信�科技有�公�),C=CN",
@@ -17119,24 +17929,6 @@
       "last_modified": 1606161750117
     },
     {
-      "schema": 1605878542738,
-      "derHash": "vf2E2QKq0BDE4IExd1r7c2VpTugcm4ri33ZBnz7fG+E=",
-      "subject": "CN=TrustSign BR Certification Authority (OV) 2,O=TrustSign Certificadora Dig. & Soluções Segurança da Inf. Ltda.,L=São José dos Campos,ST=São Paulo,C=BR",
-      "subjectDN": "MIHFMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8OjbyBQYXVsbzEeMBwGA1UEBwwVU8OjbyBKb3PDqSBkb3MgQ2FtcG9zMUswSQYDVQQKDEJUcnVzdFNpZ24gQ2VydGlmaWNhZG9yYSBEaWcuICYgU29sdcOnw7VlcyBTZWd1cmFuw6dhIGRhIEluZi4gTHRkYS4xNDAyBgNVBAMTK1RydXN0U2lnbiBCUiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAoT1YpIDI=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "d3dc3d5cc6b731efb8dd4582c2ff3a8a8908962642aa4824f4b90b58832e90cd",
-        "size": 2251,
-        "filename": "YH8nyVlvrD15SoA59nrCYN5KN2y2Xz-fJ5K-uBAfl1Y=.pem",
-        "location": "security-state-staging/intermediates/c00b8ed3-5bd7-4213-8c0b-7b171e5b524a.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "YH8nyVlvrD15SoA59nrCYN5KN2y2Xz+fJ5K+uBAfl1Y=",
-      "crlite_enrolled": true,
-      "id": "4d16fbc3-1ed1-40c0-940d-7abe6b7f2408",
-      "last_modified": 1605945559522
-    },
-    {
       "schema": 1605772140734,
       "derHash": "M47bBPuL6vB6EHSef05TjeBxXa+2R41YBj+3yL2www0=",
       "subject": "CN=DigiCert Global G3 TLS ECC SHA384 2020 CA1,O=DigiCert Inc,C=US",
@@ -17749,24 +18541,6 @@
       "last_modified": 1602964635139
     },
     {
-      "schema": 1602939433240,
-      "derHash": "unmfMiWR3X0128WPSCByXwlPVDqhPLRYxVyR3Ia+Iv8=",
-      "subject": "CN=CERTDATA SSL EV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR",
-      "subjectDN": "MG4xCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMDAuBgNVBAMMJ0NFUlREQVRBIFNTTCBFViBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "817455fbcfc00bd641341d581d3a97196ae6a94a33f63590a5b540321bf458e8",
-        "size": 2158,
-        "filename": "cVSKuRG7oLetITEBYy5dH5QBCUayslF78ETJPRfzwkU=.pem",
-        "location": "security-state-staging/intermediates/498affb3-e1de-4edb-9347-ffb1561473e8.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "cVSKuRG7oLetITEBYy5dH5QBCUayslF78ETJPRfzwkU=",
-      "crlite_enrolled": true,
-      "id": "9b021867-2e4d-4bd5-ad39-3ba7645c4e76",
-      "last_modified": 1602943040447
-    },
-    {
       "schema": 1602917835280,
       "derHash": "dWqrkA4/XHYnNLZGH8MqndNB6h1KBCg0CSM8OXh6hn4=",
       "subject": "CN=TrustAsia ECC OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN",
@@ -17929,24 +18703,6 @@
       "last_modified": 1602647874741
     },
     {
-      "schema": 1602647302024,
-      "derHash": "Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=",
-      "subject": "CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES",
-      "subjectDN": "MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471",
-        "size": 1248,
-        "filename": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem",
-        "location": "security-state-staging/intermediates/0e071112-b7ec-44a8-bf67-d3723d6c9c8c.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=",
-      "crlite_enrolled": false,
-      "id": "d709f323-b76c-451f-bf49-dabb2b709355",
-      "last_modified": 1602647874718
-    },
-    {
       "schema": 1602643717900,
       "derHash": "DSzH5pc/gPoiU/uIgo72rLs7lf+nfEiWUMNWc19UtwY=",
       "subject": "CN=AlpiroSSL ECC OV CA,O=Alpiro s.r.o.,C=CZ",
@@ -18019,24 +18775,6 @@
       "last_modified": 1602644269898
     },
     {
-      "schema": 1602643706774,
-      "derHash": "Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=",
-      "subject": "CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES",
-      "subjectDN": "MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471",
-        "size": 1248,
-        "filename": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem",
-        "location": "security-state-staging/intermediates/c43aba38-0250-470d-bc16-4fa8ee7973cb.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=",
-      "crlite_enrolled": false,
-      "id": "e3964c59-8391-4432-9624-9b3f841b6121",
-      "last_modified": 1602644269887
-    },
-    {
       "schema": 1602643708962,
       "derHash": "PtE/nRnlb1uhSSOFyoE/fdY7vrPPXFbbXDCc9OqpAXE=",
       "subject": "CN=AlpiroSSL RSA EV CA,O=Alpiro s.r.o.,C=CZ",
@@ -18109,24 +18847,6 @@
       "last_modified": 1602640676790
     },
     {
-      "schema": 1602640108808,
-      "derHash": "Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=",
-      "subject": "CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES",
-      "subjectDN": "MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471",
-        "size": 1248,
-        "filename": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem",
-        "location": "security-state-staging/intermediates/c06db3d6-f723-43e2-99fe-fb7ab58beff9.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=",
-      "crlite_enrolled": false,
-      "id": "3d87fa81-1922-410b-ad87-b072f825cf4c",
-      "last_modified": 1602640676779
-    },
-    {
       "schema": 1602640117836,
       "derHash": "DSzH5pc/gPoiU/uIgo72rLs7lf+nfEiWUMNWc19UtwY=",
       "subject": "CN=AlpiroSSL ECC OV CA,O=Alpiro s.r.o.,C=CZ",
@@ -18469,42 +19189,6 @@
       "last_modified": 1601675840461
     },
     {
-      "schema": 1601646741831,
-      "derHash": "eMtRLeSM7c1xNN9XyXPB4aB2krj1QqRKzruLt3bVXVk=",
-      "subject": "CN=CrowdStrike GCC R3 TLS OV CA 2020,O=CrowdStrike Inc.,C=US",
-      "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSowKAYDVQQDEyFDcm93ZFN0cmlrZSBHQ0MgUjMgVExTIE9WIENBIDIwMjA=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "4db0721974365af16dd868628e17ddb2016a9a91ef607ffb13a995ff49b25874",
-        "size": 1707,
-        "filename": "nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=.pem",
-        "location": "security-state-staging/intermediates/87766a98-a2cc-464d-9b61-f38989d08aef.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=",
-      "crlite_enrolled": true,
-      "id": "679290b1-74f0-4692-85c0-80c7ed611f13",
-      "last_modified": 1601647037525
-    },
-    {
-      "schema": 1601646862791,
-      "derHash": "eMtRLeSM7c1xNN9XyXPB4aB2krj1QqRKzruLt3bVXVk=",
-      "subject": "CN=CrowdStrike GCC R3 TLS OV CA 2020,O=CrowdStrike Inc.,C=US",
-      "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSowKAYDVQQDEyFDcm93ZFN0cmlrZSBHQ0MgUjMgVExTIE9WIENBIDIwMjA=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "4db0721974365af16dd868628e17ddb2016a9a91ef607ffb13a995ff49b25874",
-        "size": 1707,
-        "filename": "nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=.pem",
-        "location": "security-state-staging/intermediates/dffc1d44-5fa3-4cf0-8e03-6e735e18ca4c.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=",
-      "crlite_enrolled": true,
-      "id": "bd781195-4915-4ba3-9cc4-34433abaf5c9",
-      "last_modified": 1601647037505
-    },
-    {
       "schema": 1601628639979,
       "derHash": "OPc2R/HsruwPxa/misMODCYXHp8jL0UwcpQSQI/VNiY=",
       "subject": "CN=DigiCert Baltimore TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US",
@@ -18793,24 +19477,6 @@
       "last_modified": 1601517447884
     },
     {
-      "schema": 1601376689641,
-      "derHash": "vLwYxGO2HzoDOxDHSXTtiiwyivzWejONmHFQajUVQZ8=",
-      "subject": "CN=e-Szigno Class3 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU",
-      "subjectDN": "MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMyBTU0wgQ0EgMjAxNw==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "141f708e3e75831bbe1ea4307dbbb1564e45c53708e07ce12ace8a2c364453d4",
-        "size": 1670,
-        "filename": "69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=.pem",
-        "location": "security-state-staging/intermediates/713a5d0b-40ac-4d69-8093-93d4bd2e61ab.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=",
-      "crlite_enrolled": true,
-      "id": "20f1bea5-b08a-4583-bdc2-e4d66e4dbc30",
-      "last_modified": 1601517447872
-    },
-    {
       "schema": 1601376692642,
       "derHash": "tvZVm7zgosyR5Qe11zGeMkh+2uKKBjvHO2QF5sRGZbY=",
       "subject": "CN=QuoVadis Enterprise Trust CA 2 G3,O=QuoVadis Limited,C=BM",
@@ -19405,24 +20071,6 @@
       "last_modified": 1601517447175
     },
     {
-      "schema": 1601376614329,
-      "derHash": "ffgAB19SA8AXNk6BGVqayf8AxQfWSnD3N9jT6Ms/CEU=",
-      "subject": "CN=e-Szigno Qualified TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU",
-      "subjectDN": "MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBUTFMgQ0EgMjAxOA==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "df20fd29ecb80ea583b981311eed6c99114bffa8ab98b5265dc4c8efcc1897f0",
-        "size": 1674,
-        "filename": "qd9EIyfp7CEtbkxafeyYAuC_8wQBWqGZflkLznwnuyc=.pem",
-        "location": "security-state-staging/intermediates/b21a2837-5b65-44b6-92b7-fec471d70713.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "qd9EIyfp7CEtbkxafeyYAuC/8wQBWqGZflkLznwnuyc=",
-      "crlite_enrolled": true,
-      "id": "2f5d27a3-cb0f-4f6b-b6b1-20c198d58fc8",
-      "last_modified": 1601517447163
-    },
-    {
       "schema": 1601376615736,
       "derHash": "BDerLsLCtIkClsE1A0sh2xRkNLgxfucDqoqpQ8XqUa4=",
       "subject": "CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US",
@@ -20989,24 +21637,6 @@
       "last_modified": 1601517445720
     },
     {
-      "schema": 1601373057866,
-      "derHash": "ffgAB19SA8AXNk6BGVqayf8AxQfWSnD3N9jT6Ms/CEU=",
-      "subject": "CN=e-Szigno Qualified TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU",
-      "subjectDN": "MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBUTFMgQ0EgMjAxOA==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "df20fd29ecb80ea583b981311eed6c99114bffa8ab98b5265dc4c8efcc1897f0",
-        "size": 1674,
-        "filename": "qd9EIyfp7CEtbkxafeyYAuC_8wQBWqGZflkLznwnuyc=.pem",
-        "location": "security-state-staging/intermediates/9528d3b9-a037-4f0f-b644-1e7827d3c927.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "qd9EIyfp7CEtbkxafeyYAuC/8wQBWqGZflkLznwnuyc=",
-      "crlite_enrolled": true,
-      "id": "4802c4c4-718e-4497-a9a5-c367fed873eb",
-      "last_modified": 1601517445709
-    },
-    {
       "schema": 1601373052202,
       "derHash": "MqTlVONjEW/kjiLwHawXNnUqcccg+Z9GLVZQItO60H0=",
       "subject": "CN=DPDHL Global TLS CA - I5,O=Deutsche Post AG,C=DE",
@@ -21547,24 +22177,6 @@
       "last_modified": 1601517445138
     },
     {
-      "schema": 1601372990662,
-      "derHash": "vLwYxGO2HzoDOxDHSXTtiiwyivzWejONmHFQajUVQZ8=",
-      "subject": "CN=e-Szigno Class3 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU",
-      "subjectDN": "MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMyBTU0wgQ0EgMjAxNw==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "141f708e3e75831bbe1ea4307dbbb1564e45c53708e07ce12ace8a2c364453d4",
-        "size": 1670,
-        "filename": "69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=.pem",
-        "location": "security-state-staging/intermediates/35bc1459-db4e-4fbe-b245-efb1d8b3e9e6.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=",
-      "crlite_enrolled": true,
-      "id": "5bb86eed-d806-4423-a0c3-14872f739af8",
-      "last_modified": 1601517445127
-    },
-    {
       "schema": 1601372984986,
       "derHash": "PuAnjfcfo8ElxM1IfwHXdGlOb8V+DNlMJO/XaRM5GOU=",
       "subject": "CN=GTS Root R1,O=Google Trust Services LLC,C=US",
@@ -24445,24 +25057,6 @@
       "last_modified": 1601517441636
     },
     {
-      "schema": 1601376722448,
-      "derHash": "fsrKSjWFo7QOJVdEFVEtVrV5mbdTAXhW8qsV+h8h9tA=",
-      "subject": "CN=NETLOCK Trust Qualified EV CA 3,O=NETLOCK Ltd.,L=Budapest,C=HU",
-      "subjectDN": "MGExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSgwJgYDVQQDDB9ORVRMT0NLIFRydXN0IFF1YWxpZmllZCBFViBDQSAz",
-      "whitelist": false,
-      "attachment": {
-        "hash": "5c9cd98f81f0d60b8f3c40b8be94209d25226eb7ebf1c126947da32ed3d21dbc",
-        "size": 2215,
-        "filename": "ksEtUEbADR0V5fQig7YPrrgGcr2PovgbGzQx045WU_0=.pem",
-        "location": "security-state-staging/intermediates/be90d242-60d9-4a6b-aefe-8e8fb342b23e.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "ksEtUEbADR0V5fQig7YPrrgGcr2PovgbGzQx045WU/0=",
-      "crlite_enrolled": true,
-      "id": "bf7893da-0baf-4aae-8bfc-282641a4dcff",
-      "last_modified": 1601517441601
-    },
-    {
       "schema": 1601376727778,
       "derHash": "NAylukAtFAtlosl2566BKKFQXCnRkODgNPWcyuepK8I=",
       "subject": "CN=Apple Public EV Server RSA CA 1 - G1,O=Apple Inc.,C=US",
@@ -24481,24 +25075,6 @@
       "last_modified": 1601517441584
     },
     {
-      "schema": 1601376759524,
-      "derHash": "nmyANcDxyKlFMQ5y2D5TGUe1cfkpLkKkJIo3C/ezBb4=",
-      "subject": "CN=VR IDENT EV SSL CA 2020,O=D-Trust GmbH,C=DE",
-      "subjectDN": "MEYxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIDAeBgNVBAMTF1ZSIElERU5UIEVWIFNTTCBDQSAyMDIw",
-      "whitelist": false,
-      "attachment": {
-        "hash": "dc99c4f4f52985f008966e436a519a723e8fc97d68041786cb235d067d979c71",
-        "size": 2556,
-        "filename": "n2nZ8zPLSNKoerb6X9o01VOniH-YyahnTcdt2oR9ovw=.pem",
-        "location": "security-state-staging/intermediates/24db4e33-c897-4e54-9072-c201e9f0c903.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "n2nZ8zPLSNKoerb6X9o01VOniH+YyahnTcdt2oR9ovw=",
-      "crlite_enrolled": true,
-      "id": "911c16b5-610f-407c-95ae-d17b705f20c2",
-      "last_modified": 1601517441567
-    },
-    {
       "schema": 1601376734751,
       "derHash": "mmlizYwhtdzx9ws5qDbH85fsSV+IC+m5tpuLJyiOyxQ=",
       "subject": "CN=KICA RSA OV CA,O=KICA,C=KR",
@@ -24679,24 +25255,6 @@
       "last_modified": 1601517441378
     },
     {
-      "schema": 1601376733906,
-      "derHash": "AHEIGUEV88iZ9U7mfLTahyde3B1nmNp4fgdYz6aulrE=",
-      "subject": "CN=VR IDENT SSL CA 2020,O=D-Trust GmbH,C=DE",
-      "subjectDN": "MEMxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxHTAbBgNVBAMTFFZSIElERU5UIFNTTCBDQSAyMDIw",
-      "whitelist": false,
-      "attachment": {
-        "hash": "1206315657f09d9afaec77ac85e998dd3c6cdcb66f3f2176acc53b52c01c503c",
-        "size": 2519,
-        "filename": "tODlN5eWKJbzjaei8TSG0CEnvkryLLZvN3Yh2FucTVs=.pem",
-        "location": "security-state-staging/intermediates/35f8e921-4fcb-4f84-9bbb-da548ebd9895.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "tODlN5eWKJbzjaei8TSG0CEnvkryLLZvN3Yh2FucTVs=",
-      "crlite_enrolled": true,
-      "id": "9a044a16-723a-4cf7-8fef-aef81b9007f6",
-      "last_modified": 1601517441361
-    },
-    {
       "schema": 1601376778985,
       "derHash": "vrUcj0UkJrK55nL33R7qSzPWw49MoqlpVs4kvQWww40=",
       "subject": "CN=TrustCor DV SSL CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA",
@@ -25723,24 +26281,6 @@
       "last_modified": 1591199862438
     },
     {
-      "schema": 1591167048156,
-      "derHash": "x3xf3ExlXJ3GkMucdvmPrtPD3s7wZMvNctQcWeVYf+s=",
-      "subject": "CN=TrustOcean Organization Validation SSL CA,O=TrustOcean Limited,C=US",
-      "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxMjAwBgNVBAMTKVRydXN0T2NlYW4gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gU1NMIENB",
-      "whitelist": false,
-      "attachment": {
-        "hash": "556a16e9adc4480fdb9e891eaeeed7d9e5985f01350398edeb90bb12a7902658",
-        "size": 2109,
-        "filename": "iuXy6C6fQ7WIvruSnxEwSvYjFOgeVw4HZdR0x0OFOVE=.pem",
-        "location": "security-state-staging/intermediates/c2f7ee4a-a230-40fe-ae6d-7bac146e0fca.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "iuXy6C6fQ7WIvruSnxEwSvYjFOgeVw4HZdR0x0OFOVE=",
-      "crlite_enrolled": false,
-      "id": "08d30c0e-cd9a-4c3e-b21d-ea273d69191b",
-      "last_modified": 1591199862432
-    },
-    {
       "schema": 1591167041835,
       "derHash": "6sATQ3DJ/6v8eutf0DwlFikPrlWFCBxAoI8ZyJq3v1s=",
       "subject": "CN=Sectigo Partners - Client Authentication and Secure Email - ECC,O=Sectigo Limited,C=GB",
@@ -29917,24 +30457,6 @@
       "last_modified": 1576536534240
     },
     {
-      "schema": 1576536056853,
-      "derHash": "sKbvA1DnxMYFa+6nr50thgue0QITe5cp08IyFtGVVGo=",
-      "subject": "CN=Advanced Class 3 e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU",
-      "subjectDN": "MIGFMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xKjAoBgNVBAMMIUFkdmFuY2VkIENsYXNzIDMgZS1Temlnbm8gQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "0ed62164b86f37c69eb2018a4a79db046f2eae11bfb1c748569dff5da6e94178",
-        "size": 1768,
-        "filename": "VGt-HUDy6qey1Up5ZYyfXaLC_1Yy9l4AvJsHFIQXC5g=.pem",
-        "location": "security-state-staging/intermediates/912a52c5-97ea-4353-806f-dbf6b9c95e81.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "VGt+HUDy6qey1Up5ZYyfXaLC/1Yy9l4AvJsHFIQXC5g=",
-      "crlite_enrolled": true,
-      "id": "1d065829-106f-4cf5-a7ce-33874e651514",
-      "last_modified": 1576536534237
-    },
-    {
       "schema": 1576536055441,
       "derHash": "ZlZv7dYNs64QkQ8qiXB89RWQkgM6cadc2GhR1zWRlBE=",
       "subject": "CN=AffirmTrust Premium Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US",
@@ -36451,24 +36973,6 @@
       "last_modified": 1576536531038
     },
     {
-      "schema": 1576536088599,
-      "derHash": "k7KBvYHYPPmGZZ3/0K9XmTuS5uRhQWJTn3UFJM4Ru8s=",
-      "subject": "CN=Abitab SSL Extended Validation,OU=IDdigital,O=Abitab S.A.,C=UY",
-      "subjectDN": "MGAxCzAJBgNVBAYTAlVZMRQwEgYDVQQKDAtBYml0YWIgUy5BLjESMBAGA1UECwwJSURkaWdpdGFsMScwJQYDVQQDDB5BYml0YWIgU1NMIEV4dGVuZGVkIFZhbGlkYXRpb24=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "a994aaf2225099f989467d317d95162a61ab0f2a8b48927a953540b65a87fe3e",
-        "size": 1703,
-        "filename": "y2KaAsU1VfJfWRQYPeq3HVxO1GVrwSw4xGq7rSJtyII=.pem",
-        "location": "security-state-staging/intermediates/972694b4-ca85-44f1-91f0-7e0a868a3149.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "y2KaAsU1VfJfWRQYPeq3HVxO1GVrwSw4xGq7rSJtyII=",
-      "crlite_enrolled": false,
-      "id": "04ee2b55-620a-4d2e-a4c7-00b5c73ec962",
-      "last_modified": 1576536531027
-    },
-    {
       "schema": 1576536117970,
       "derHash": "IqBmaJrJHHl9lwFGsLwTjhcDudqrpIFl/SVheSy3ApI=",
       "subject": "CN=Ensured Root CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL",
@@ -38449,24 +38953,6 @@
       "last_modified": 1562108433420
     },
     {
-      "schema": 1562108431893,
-      "derHash": "PtCuZ6FDLIPYIQHeabLuXn8gMCcJ2VeQc6MC2pD0hTM=",
-      "subject": "CN=TrustSafe Domain Validated CA,OU=SSL Department,O=Isimtescil Bilisim Anonim Sirketi,L=Istanbul,C=TR",
-      "subjectDN": "MIGNMQswCQYDVQQGEwJUUjERMA8GA1UEBwwISXN0YW5idWwxKjAoBgNVBAoMIUlzaW10ZXNjaWwgQmlsaXNpbSBBbm9uaW0gU2lya2V0aTEXMBUGA1UECwwOU1NMIERlcGFydG1lbnQxJjAkBgNVBAMMHVRydXN0U2FmZSBEb21haW4gVmFsaWRhdGVkIENB",
-      "whitelist": false,
-      "attachment": {
-        "hash": "748834790eb69db784c3f00d7f2ef2b64cf353435e5de3e69ac4ca2c81299276",
-        "size": 2247,
-        "filename": "90w8QxLDw7OA3WHogRdF8WutmwS2zB2cr21T0-Sun5o=.pem",
-        "location": "security-state-staging/intermediates/32d1002c-6eee-400e-a7ec-8b0235165445.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "90w8QxLDw7OA3WHogRdF8WutmwS2zB2cr21T0+Sun5o=",
-      "crlite_enrolled": true,
-      "id": "29a0cb2e-7719-4c2f-9360-00c82a4a3c72",
-      "last_modified": 1562108432669
-    },
-    {
       "schema": 1562108430382,
       "derHash": "bEfTZcE7yMw9be9djwerjb6jyNSUXWUaqYVKnJo8xxw=",
       "subject": "CN=Certum Extended Validation CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL",
@@ -38485,24 +38971,6 @@
       "last_modified": 1562108431124
     },
     {
-      "schema": 1562108429620,
-      "derHash": "d9bCr1p7hvY9mRjIdTN3nyrwjTXPoU2kk4yAP1PeGKE=",
-      "subject": "CN=SwissSign Personal Gold CA 2014 - G22,O=SwissSign AG,C=CH",
-      "subjectDN": "MFQxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLjAsBgNVBAMTJVN3aXNzU2lnbiBQZXJzb25hbCBHb2xkIENBIDIwMTQgLSBHMjI=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "37ef04fb6f6156e237c6f04ae3b383028744a07d5a6a4197c49d3411c82108f0",
-        "size": 2389,
-        "filename": "l5kY-a2-qCNGMn7LXb_lGEENF-dZOLccQOZBKr40wVE=.pem",
-        "location": "security-state-staging/intermediates/6a316d67-95bd-4ab5-aef3-82bd300391d7.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "l5kY+a2+qCNGMn7LXb/lGEENF+dZOLccQOZBKr40wVE=",
-      "crlite_enrolled": true,
-      "id": "26a70827-d9ed-46cc-8952-77eb4121605e",
-      "last_modified": 1562108430373
-    },
-    {
       "schema": 1562108428868,
       "derHash": "CzOSEtfP8XosWeNWabWOdzUBM3UKeNqUBHcO3UcN73Y=",
       "subject": "CN=GlobalSign Organization Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE",
@@ -38539,24 +39007,6 @@
       "last_modified": 1562108428860
     },
     {
-      "schema": 1562108427352,
-      "derHash": "FfrEJaqEQEs2L6NInrZ9BV1donb4aFxNaY2hgw1CDw8=",
-      "subject": "CN=COMODO RSA Client Authentication and Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB",
-      "subjectDN": "MIGXMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE9MDsGA1UEAxM0Q09NT0RPIFJTQSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "6d952d782fa2f84e580c545480b40eeae3fab20a3eba7b734b158271c48b1117",
-        "size": 2105,
-        "filename": "mHI0vDHAQ12vglM3cO2DlsvGPmhqena8_DpLQz3BaYs=.pem",
-        "location": "security-state-staging/intermediates/df4e2dce-92b3-41f1-8479-4de071dddbfe.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "mHI0vDHAQ12vglM3cO2DlsvGPmhqena8/DpLQz3BaYs=",
-      "crlite_enrolled": true,
-      "id": "e9149e45-f71f-4714-887f-be55784c958e",
-      "last_modified": 1562108428099
-    },
-    {
       "schema": 1562108425846,
       "derHash": "qbrrbzgUtMNDENqE3tOsOC2gErhNIH1KObFnHPWB9ME=",
       "subject": "CN=Gehirn Managed Certification Authority - RSA Digital ID,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP",
@@ -39457,24 +39907,6 @@
       "last_modified": 1562108318607
     },
     {
-      "schema": 1562108317082,
-      "derHash": "NyuPTOc77fyIcYxAe7az5tj5p5vpVxkNDnEBx7DvmjI=",
-      "subject": "CN=NetLock Expressz (Class C) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU",
-      "subjectDN": "MIGqMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE4MDYGA1UEAwwvTmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFuw7pzw610dsOhbnlraWFkw7M=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "96ba448b3b21c633bd5e293f4383a8b88b67e802476a48d48ba20ffa8359a5ce",
-        "size": 2182,
-        "filename": "KS2adY6eMaWNhbLW6JREO3Oo34Qy_UvmA5f-f4ROpYw=.pem",
-        "location": "security-state-staging/intermediates/6380c544-10af-435b-ae2d-adad842694a3.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "KS2adY6eMaWNhbLW6JREO3Oo34Qy/UvmA5f+f4ROpYw=",
-      "crlite_enrolled": true,
-      "id": "522256d0-e9e9-44e9-b35d-221ddf453cad",
-      "last_modified": 1562108317826
-    },
-    {
       "schema": 1562108316330,
       "derHash": "MMwfzLvsAuaJkblkWSD5qZbBJ8L8vQeVhPHXjYh1kbc=",
       "subject": "SERIALNUMBER=201723,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE",
@@ -39961,24 +40393,6 @@
       "last_modified": 1562025714778
     },
     {
-      "schema": 1562025713265,
-      "derHash": "M9VzWYMfh3VObnVda1tW5+cSl93f6h1jlwhmBCgPb/w=",
-      "subject": "CN=Cybertrust Japan Secure Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP",
-      "subjectDN": "MF4xCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEqMCgGA1UEAxMhQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIENB",
-      "whitelist": false,
-      "attachment": {
-        "hash": "3d3d273966feacef23b9bad6f99c08f1cc7d487295361ce8cc0b10c724baf67a",
-        "size": 1711,
-        "filename": "bVyC1r63wwzb47rnbZ46v-604DOoFUXTp4JA0srlZRE=.pem",
-        "location": "security-state-staging/intermediates/aa91ff40-8753-4ea6-bc6c-9c2f51e7c6a1.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "bVyC1r63wwzb47rnbZ46v+604DOoFUXTp4JA0srlZRE=",
-      "crlite_enrolled": true,
-      "id": "03556fa4-abec-492c-a31c-149b44f3f991",
-      "last_modified": 1562025714019
-    },
-    {
       "schema": 1562025711764,
       "derHash": "hDJGhhPZjK3s3wgWxJ6it/aZ9KEc7AD1eMK6NnsmHAg=",
       "subject": "CN=XiPS CA,O=XiPS,C=JP",
@@ -45073,24 +45487,6 @@
       "last_modified": 1562025203402
     },
     {
-      "schema": 1562025201928,
-      "derHash": "MTH/29ln180dd3Qq+XcvEFH/TJrkE3WfQ0/h6BERngM=",
-      "subject": "CN=TrustOcean EV SSL CA - RSA - 2019,OU=Controlled by Sectigo exclusively for TrustOcean Ltd.+OU=RSA Extended Validation Secure Server - 2019,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US",
-      "subjectDN": "MIHoMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFRydXN0T2NlYW4gTHRkLjE1MDMGA1UECxMsUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTkxKjAoBgNVBAMTIVRydXN0T2NlYW4gRVYgU1NMIENBIC0gUlNBIC0gMjAxOQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "bb57de69afc6d6f5f59b1c80758edf0ef1791b7a08530fed8903ef18cd25188e",
-        "size": 2324,
-        "filename": "uG18SfTnbrT8g2zCkpa7kWClIcTyqEW_1iPtChk9nTQ=.pem",
-        "location": "security-state-staging/intermediates/6020590f-b065-482b-9549-d56eb98c4b60.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "uG18SfTnbrT8g2zCkpa7kWClIcTyqEW/1iPtChk9nTQ=",
-      "crlite_enrolled": true,
-      "id": "12413a5f-6a98-4669-8438-f936d9b86ea3",
-      "last_modified": 1562025202660
-    },
-    {
       "schema": 1562025198927,
       "derHash": "SWlaXw9+9u32mBk9me1Iuq3iDqRXQDwRzq1JLEWGZdo=",
       "subject": "CN=TWCA Global EVSSL Certification Authority,OU=Global EVSSL Sub-CA,O=TAIWAN-CA,C=TW",
@@ -45127,24 +45523,6 @@
       "last_modified": 1562025197408
     },
     {
-      "schema": 1562025195931,
-      "derHash": "YoSgO6+uhhow46JaAwQoMG9+tSvQuld6HZYqgJqDDJ4=",
-      "subject": "CN=NetLock Minősített Eat. (Class Q Legal) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU",
-      "subjectDN": "MIG5MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFHMEUGA1UEAww+TmV0TG9jayBNaW7FkXPDrXRldHQgRWF0LiAoQ2xhc3MgUSBMZWdhbCkgVGFuw7pzw610dsOhbnlraWFkw7M=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "be44ba2f0e98d91976e0b376d14bfcfbf5e04990413aeb73457eb447f773a585",
-        "size": 2203,
-        "filename": "wbqAvjVExNzYgkWT-psQa7MDcYIscGSOYZa0cm5x83M=.pem",
-        "location": "security-state-staging/intermediates/602c1224-b665-4b69-848a-f07cbc00e0be.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "wbqAvjVExNzYgkWT+psQa7MDcYIscGSOYZa0cm5x83M=",
-      "crlite_enrolled": true,
-      "id": "73e86e8a-47ad-4f60-be1d-64ed2011a0bb",
-      "last_modified": 1562025196662
-    },
-    {
       "schema": 1562025193661,
       "derHash": "rtXdmlM5aF37Ap9tiaFDNallEsPKzFKymUr4trN/pNI=",
       "subject": "CN=GlobalSign Extended Validation CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE",
@@ -48907,24 +49285,6 @@
       "last_modified": 1562024792620
     },
     {
-      "schema": 1562024789653,
-      "derHash": "DhC93udRLb156/C09I/u18g8K9PdgXZVZfT/EQt7+kI=",
-      "subject": "CN=Cybertrust Japan Extended Validation Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP",
-      "subjectDN": "MGsxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjE3MDUGA1UEAxMuQ3liZXJ0cnVzdCBKYXBhbiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "e3d590ab4b71fbd20183713733b3253b32ef24a73382153319f8916fc66d3c1d",
-        "size": 1678,
-        "filename": "VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8_yf2AOohCgqgk=.pem",
-        "location": "security-state-staging/intermediates/222e4d33-ee5a-4885-add5-c30b4495b281.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8/yf2AOohCgqgk=",
-      "crlite_enrolled": true,
-      "id": "92292d1f-471b-4db3-ba30-6f423a7d649b",
-      "last_modified": 1562024790389
-    },
-    {
       "schema": 1562024786680,
       "derHash": "/ikDnS1H0CkoTZqoz7He1yb/DiX955/oSpVAGHhktLc=",
       "subject": "SERIALNUMBER=201819,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE",
@@ -50941,24 +51301,6 @@
       "last_modified": 1562023966614
     },
     {
-      "schema": 1562023961331,
-      "derHash": "EUdT6I0ADnWZYVqZB+Jrc7bYUTF/8rJ6yp24/FBWkqc=",
-      "subject": "CN=E-Tugra Organization Validated CA,OU=E-TuÄŸra Sertifikasyon Merkezi,O=E-TuÄŸra EBG BiliÅŸim Teknolojileri ve Hizmetleri A.Åž.,L=Ankara,C=TR",
-      "subjectDN": "MIG1MQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxKjAoBgNVBAMMIUUtVHVncmEgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBDQQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "c20540a909d14bde73c51dde53da2ff3fea4d75a0c875924065198ab7de00da3",
-        "size": 2304,
-        "filename": "2C9V2-VZ5v93wYg0HupOPel5wBqM8YEDtTLQWSkHjis=.pem",
-        "location": "security-state-staging/intermediates/375b6c2a-70ea-49da-8638-9e7de1fc7e9b.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "2C9V2+VZ5v93wYg0HupOPel5wBqM8YEDtTLQWSkHjis=",
-      "crlite_enrolled": true,
-      "id": "14fdc6a9-ae04-401c-9371-d01b4bbb58b9",
-      "last_modified": 1562023962077
-    },
-    {
       "schema": 1562023958320,
       "derHash": "L9Qqlsgw/SxVKywnZg7ukwfYRwbem3XPOa51DrIhue4=",
       "subject": "CN=COMODO ECC Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB",
@@ -51841,24 +52183,6 @@
       "last_modified": 1562023880990
     },
     {
-      "schema": 1562023879494,
-      "derHash": "dFCEYqXCpPJb3LVcslkxCgVrfWI92OVTUfO0Lx0ySGs=",
-      "subject": "CN=TrustSign RSA OV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR",
-      "subjectDN": "MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBSU0EgT1YgQ0E=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "e4f8e4c2fc7a0eebc4bc552e536ebdd76c0b0553eb218e1bff323f7729969d80",
-        "size": 2117,
-        "filename": "chB881BfDWAiJ-J0Xbjx2_V5kxVs4F8Bof_rFzQm8kw=.pem",
-        "location": "security-state-staging/intermediates/3712897c-ea80-4f7b-a166-8193962ca35d.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "chB881BfDWAiJ+J0Xbjx2/V5kxVs4F8Bof/rFzQm8kw=",
-      "crlite_enrolled": true,
-      "id": "23cc5cfc-37c0-40fb-a746-f53e5d03c584",
-      "last_modified": 1562023880249
-    },
-    {
       "schema": 1562023875682,
       "derHash": "sJNdwEtOYMDELe9+xXobHY+VjReYjnHMgKjPXmNbpbQ=",
       "subject": "CN=D-TRUST SSL Class 3 CA 1 EV 2009,O=D-Trust GmbH,C=DE",
@@ -51967,24 +52291,6 @@
       "last_modified": 1562023865923
     },
     {
-      "schema": 1562023864420,
-      "derHash": "y2/O5BxV4kd03wK+Nd5tQY6U71gR99sTc6+ICc9wfyo=",
-      "subject": "CN=E-Tugra Domain Validated CA,OU=E-TuÄŸra Sertifikasyon Merkezi,O=E-TuÄŸra EBG BiliÅŸim Teknolojileri ve Hizmetleri A.Åž.,L=Ankara,C=TR",
-      "subjectDN": "MIGvMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxJDAiBgNVBAMMG0UtVHVncmEgRG9tYWluIFZhbGlkYXRlZCBDQQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "c6b2887b29d06c3a32442bacd3087e92f206a5fa698d64deded68c4d8bb5d347",
-        "size": 2296,
-        "filename": "DReMCzHTvlRp8z0vjOXH2lx0lpHIz5iXick53RZbRT8=.pem",
-        "location": "security-state-staging/intermediates/570f1b75-429e-4c79-b0e9-d7653e227ce7.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "DReMCzHTvlRp8z0vjOXH2lx0lpHIz5iXick53RZbRT8=",
-      "crlite_enrolled": true,
-      "id": "feefbefd-6161-49d5-84fd-5b09c850c80c",
-      "last_modified": 1562023865176
-    },
-    {
       "schema": 1562023862132,
       "derHash": "rw42PK5t9Inyl2ooTRLUwzyUsTX6d/ieiSmNdJHpmXQ=",
       "subject": "CN=DigiCert Universal Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US",
@@ -52147,24 +52453,6 @@
       "last_modified": 1562023844984
     },
     {
-      "schema": 1562023843492,
-      "derHash": "8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=",
-      "subject": "CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN",
-      "subjectDN": "MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB",
-      "whitelist": false,
-      "attachment": {
-        "hash": "bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b",
-        "size": 1963,
-        "filename": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem",
-        "location": "security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=",
-      "crlite_enrolled": true,
-      "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2",
-      "last_modified": 1562023844242
-    },
-    {
       "schema": 1562023842017,
       "derHash": "aXDjlmIUF9zuMVqsKLteoxYfF1Ag9/Tpuhfa3ljbsI0=",
       "subject": "CN=WoTrus DV SSL CA,O=WoTrus CA Limited,C=CN",
@@ -53389,24 +53677,6 @@
       "last_modified": 1559866177285
     },
     {
-      "schema": 1559866168360,
-      "derHash": "znrcGXdXpS5pogFMzgPZgGMlAnZHQsKSPXOAVo4hAKY=",
-      "subject": "CN=E-Tugra Extended Validated CA,OU=E-TuÄŸra Sertifikasyon Merkezi,O=E-TuÄŸra EBG BiliÅŸim Teknolojileri ve Hizmetleri A.Åž.,L=Ankara,C=TR",
-      "subjectDN": "MIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxJjAkBgNVBAMMHUUtVHVncmEgRXh0ZW5kZWQgVmFsaWRhdGVkIENB",
-      "whitelist": false,
-      "attachment": {
-        "hash": "12ff7eb3fc7ad0d030464cfca8808d4239fab2f60c03f47a3f76ec1c962d10f8",
-        "size": 2296,
-        "filename": "CbsSUO015uoyaPW3UoozNFDyIZuKJooRSCguLZLEHjg=.pem",
-        "location": "security-state-staging/intermediates/b4924736-081c-4006-83d9-18747abe70b7.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "CbsSUO015uoyaPW3UoozNFDyIZuKJooRSCguLZLEHjg=",
-      "crlite_enrolled": true,
-      "id": "7c935540-4c03-4352-b768-16756b45aed8",
-      "last_modified": 1559866169149
-    },
-    {
       "schema": 1559866037153,
       "derHash": "Pmk2hUsVb7sV7phEye47v5L4SSiXp3L5CSxS7ShQfr8=",
       "subject": "SERIALNUMBER=201913,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE",
@@ -53461,24 +53731,6 @@
       "last_modified": 1559866009943
     },
     {
-      "schema": 1559865975116,
-      "derHash": "ayP62JAYDDN7hkFV2uDem62e8L2njREvLL3D0CrReVY=",
-      "subject": "CN=NetLock Üzleti (Class B) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU",
-      "subjectDN": "MIGpMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE3MDUGA1UEAwwuTmV0TG9jayDDnHpsZXRpIChDbGFzcyBCKSBUYW7DunPDrXR2w6FueWtpYWTDsw==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "573f7ca4199a4ab7b67cf4b5b1c8e25a89da7c93d3296ece5e8301e5bf64c39b",
-        "size": 2182,
-        "filename": "1YROuDznuNvrat3sL9gwGR124PRLocGQQWd6IoM50Ls=.pem",
-        "location": "security-state-staging/intermediates/5ae11eb3-59e2-4f2f-a3ad-09d610869295.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "1YROuDznuNvrat3sL9gwGR124PRLocGQQWd6IoM50Ls=",
-      "crlite_enrolled": true,
-      "id": "1a8145a6-66a3-4c40-914b-e027086ea091",
-      "last_modified": 1559865975919
-    },
-    {
       "schema": 1559865954402,
       "derHash": "bGniAWVkQOuYzQh1dkoe0ZAV7YxEJ2Aaypxor6iXOVk=",
       "subject": "CN=Abbott Laboratories Secure Server CA,O=Abbott Laboratories Inc.,C=US",
diff -Nru thunderbird-91.3.2+build1/services/settings/dumps/security-state/onecrl.json thunderbird-91.4.0+build2/services/settings/dumps/security-state/onecrl.json
--- thunderbird-91.3.2+build1/services/settings/dumps/security-state/onecrl.json	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/services/settings/dumps/security-state/onecrl.json	2021-12-09 11:59:55.000000000 +0000
@@ -1,6 +1,276 @@
 {
   "data": [
     {
+      "schema": 1636216607840,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "Irmwxw==",
+      "id": "88b9b4f9-e3a5-43a2-9161-e072ca0cc25d",
+      "last_modified": 1636587776892
+    },
+    {
+      "schema": 1636563658712,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "Irmw9RUMnLWK",
+      "id": "efb30e9b-2f9c-4a52-8936-21ef6086685a",
+      "last_modified": 1636587776881
+    },
+    {
+      "schema": 1636563659207,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MFAxCzAJBgNVBAYTAkpQMRgwFgYDVQQKEw9TRUNPTSBUcnVzdC5uZXQxJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmljYXRpb24gUm9vdENBMQ==",
+      "serialNumber": "Ermw3g==",
+      "id": "57eb9e47-5a49-4af2-b264-b5a22220ab9a",
+      "last_modified": 1636587776871
+    },
+    {
+      "schema": 1636563659891,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "IrmxDxYqdHHX",
+      "id": "c20e8a7f-f7f7-46a5-9201-f3eaa13b8379",
+      "last_modified": 1636587776862
+    },
+    {
+      "schema": 1636563660914,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "Irmw/QH4w0Am",
+      "id": "e71d344b-abc9-42a4-9c71-864ae546731c",
+      "last_modified": 1636587776852
+    },
+    {
+      "schema": 1636563661399,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "Irmw6riAVioU",
+      "id": "0d25e750-23fc-4def-91a0-d10338926f6a",
+      "last_modified": 1636587776842
+    },
+    {
+      "schema": 1636563661862,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "IrmwzA==",
+      "id": "52c32a3f-26c3-4cf2-88af-8e4777c464c0",
+      "last_modified": 1636587776833
+    },
+    {
+      "schema": 1636563662298,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "IrmxLQbUNQw0",
+      "id": "1c913f51-5d9d-43b3-85d0-7b98c4068e00",
+      "last_modified": 1636587776825
+    },
+    {
+      "schema": 1636563662784,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOQ==",
+      "serialNumber": "YDQ5U886jKQrtEpEKSy69A==",
+      "id": "2d7659c9-1483-48f2-b928-9d36ee801409",
+      "last_modified": 1636587776818
+    },
+    {
+      "schema": 1636563663321,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "Irmw/ofYnXPM",
+      "id": "789fd5b6-aabe-480f-92ac-784705c030ff",
+      "last_modified": 1636587776809
+    },
+    {
+      "schema": 1636563663779,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MIGnMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnk=",
+      "serialNumber": "SUEs5AAn",
+      "id": "e0a9e5b9-f604-482b-a536-f892bfadd85e",
+      "last_modified": 1636587776802
+    },
+    {
+      "schema": 1636563664227,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "IrmxLgSn7Cvs",
+      "id": "3de39048-1720-4a67-afd4-31748a913013",
+      "last_modified": 1636587776796
+    },
+    {
+      "schema": 1636563664685,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "IrmxB+QOrp3P",
+      "id": "7a7aa30b-0f35-42af-bf31-95699333167c",
+      "last_modified": 1636587776790
+    },
+    {
+      "schema": 1636563665204,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=",
+      "serialNumber": "IrmxEAXK2OI4",
+      "id": "c1103392-2dbb-4244-b864-33c628f2477f",
+      "last_modified": 1636587776784
+    },
+    {
+      "schema": 1636563665753,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOQ==",
+      "serialNumber": "ShA9s+HZJmJlKzvcauXC8w==",
+      "id": "8f26fd75-b45a-451d-b518-85636b5eb118",
+      "last_modified": 1636587776778
+    },
+    {
+      "schema": 1636563666256,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MFAxCzAJBgNVBAYTAkpQMRgwFgYDVQQKEw9TRUNPTSBUcnVzdC5uZXQxJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmljYXRpb24gUm9vdENBMQ==",
+      "serialNumber": "Ermw7w==",
+      "id": "05fbcacd-8c76-47d9-a972-1cc17893b1cf",
+      "last_modified": 1636587776772
+    },
+    {
+      "schema": 1636563666710,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MFAxCzAJBgNVBAYTAkpQMRgwFgYDVQQKEw9TRUNPTSBUcnVzdC5uZXQxJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmljYXRpb24gUm9vdENBMQ==",
+      "serialNumber": "Ermw7A==",
+      "id": "81cbd120-6dce-4214-babf-3d72b3e9540b",
+      "last_modified": 1636587776766
+    },
+    {
+      "schema": 1636563667150,
+      "details": {
+        "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1740553",
+        "who": "",
+        "why": "",
+        "name": "",
+        "created": ""
+      },
+      "enabled": false,
+      "issuerName": "MFAxCzAJBgNVBAYTAkpQMRgwFgYDVQQKEw9TRUNPTSBUcnVzdC5uZXQxJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmljYXRpb24gUm9vdENBMQ==",
+      "serialNumber": "Ermw7g==",
+      "id": "831b8d50-c98c-4501-b867-ecb0dd8efc3d",
+      "last_modified": 1636587776760
+    },
+    {
       "schema": 1628162493146,
       "details": {
         "bug": "https://bugzilla.mozilla.org/show_bug.cgi?id=1724254",
diff -Nru thunderbird-91.3.2+build1/SOURCE_CHANGESET thunderbird-91.4.0+build2/SOURCE_CHANGESET
--- thunderbird-91.3.2+build1/SOURCE_CHANGESET	2021-11-19 11:56:51.000000000 +0000
+++ thunderbird-91.4.0+build2/SOURCE_CHANGESET	2021-12-09 12:01:07.000000000 +0000
@@ -1 +1 @@
-133cb250fa145cba5cc7ed95f75bb3c1b02e6916
\ No newline at end of file
+b6173cd78c9d522f2e3257c408933db4f9cedc13
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/taskcluster/ci/config.yml thunderbird-91.4.0+build2/taskcluster/ci/config.yml
--- thunderbird-91.3.2+build1/taskcluster/ci/config.yml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/taskcluster/ci/config.yml	2021-12-09 11:59:53.000000000 +0000
@@ -585,7 +585,7 @@
             implementation: generic-worker
             os: windows
             worker-type: 'gecko-{alias}'
-        win10-64-2004(|-gpu):
+        win10-64-2004(|-gpu|-source):
             provisioner: 'gecko-t'
             implementation: generic-worker
             os: windows
diff -Nru thunderbird-91.3.2+build1/taskcluster/ci/cron-bouncer-check/kind.yml thunderbird-91.4.0+build2/taskcluster/ci/cron-bouncer-check/kind.yml
--- thunderbird-91.3.2+build1/taskcluster/ci/cron-bouncer-check/kind.yml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/taskcluster/ci/cron-bouncer-check/kind.yml	2021-12-09 11:59:54.000000000 +0000
@@ -53,8 +53,7 @@
                     mozilla-central: FIREFOX_NIGHTLY
                     mozilla-beta: LATEST_FIREFOX_RELEASED_DEVEL_VERSION
                     mozilla-release: LATEST_FIREFOX_VERSION
-                    mozilla-esr78: FIREFOX_ESR
-                    mozilla-esr91: FIREFOX_ESR_NEXT
+                    mozilla-esr91: FIREFOX_ESR
                     default: LATEST_FIREFOX_DEVEL_VERSION
             products-url: https://product-details.mozilla.org/1.0/firefox_versions.json
         treeherder:
diff -Nru thunderbird-91.3.2+build1/taskcluster/ci/source-test/python.yml thunderbird-91.4.0+build2/taskcluster/ci/source-test/python.yml
--- thunderbird-91.3.2+build1/taskcluster/ci/source-test/python.yml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/taskcluster/ci/source-test/python.yml	2021-12-09 11:59:55.000000000 +0000
@@ -9,7 +9,7 @@
         by-platform:
             linux1804-64.*: t-linux-xlarge-source
             macosx1014-64.*: t-osx-1014
-            windows10-64.*: t-win10-64-source
+            windows10-64.*: win10-64-2004-source
     worker:
         by-platform:
             linux1804-64.*:
diff -Nru thunderbird-91.3.2+build1/taskcluster/ci/startup-test/kind.yml thunderbird-91.4.0+build2/taskcluster/ci/startup-test/kind.yml
--- thunderbird-91.3.2+build1/taskcluster/ci/startup-test/kind.yml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/taskcluster/ci/startup-test/kind.yml	2021-12-09 11:59:55.000000000 +0000
@@ -25,7 +25,7 @@
     description: Check whether or not a product crashes on startup
     run-on-projects: ['mozilla-central']
     worker:
-        max-run-time: 1200
+        max-run-time: 3600
     run:
         sparse-profile: mozharness
     attributes:
@@ -101,7 +101,7 @@
             upstream_kind: repackage-signing
             upstream_artifact: target.installer.exe
             binary: core/firefox.exe
-        worker-type: t-win10-64-source
+        worker-type: win10-64-2004-source
         shipping-product: firefox
         attributes:
             build_platform: win32-shippable
@@ -118,7 +118,7 @@
             upstream_kind: repackage-signing
             upstream_artifact: target.installer.exe
             binary: core/firefox.exe
-        worker-type: t-win10-64-source
+        worker-type: win10-64-2004-source
         shipping-product: firefox
         attributes:
             build_platform: win64-shippable
diff -Nru thunderbird-91.3.2+build1/testing/talos/talos/xtalos/etlparser.py thunderbird-91.4.0+build2/testing/talos/talos/xtalos/etlparser.py
--- thunderbird-91.3.2+build1/testing/talos/talos/xtalos/etlparser.py	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/testing/talos/talos/xtalos/etlparser.py	2021-12-09 11:59:53.000000000 +0000
@@ -41,7 +41,7 @@
     (re.compile(r"cltbld\.t-w732-ix-\d+\.\d+"), "{cltbld}"),
     (
         re.compile(r"venv\\lib\\site-packages\\pip\\_vendor\\.*"),
-        r"venv\lib\\site-packages\\{pip_vendor}",
+        r"venv\\lib\\site-packages\\{pip_vendor}",
     ),
 ]
 stages = ["startup", "normal", "shutdown"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/.cargo-checksum.json	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/.cargo-checksum.json	2021-12-09 12:01:23.000000000 +0000
@@ -1 +1 @@
-{"files":{".github/dependabot.yml":"b3c743aa114d08f175badc60d3a071e5c77bcc471c28e3320b29b22d3df2c6da",".taskcluster.yml":"8edfb77589c3b65fd4eb5c07ab520cc6da48354817d3b4fba5a913a5393afd6a","Cargo.lock":"a26eb56d7631f5f3d4b8b58b339e4348f76547cf5f5de6c96d511001ac34ca73","Cargo.toml":"62e74d7817f69e703271f3273088c7b8e6ffb95ec9d8ceb58d7b546ba2eafe08","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3e42ed0dec3b026dab14c0b892b374322a731fe2f40b3e903ae86379d0822f76","src/action.rs":"8dc9d2295a44f28308713fe02e7ecfa0cbbdf610d6c7f98a2e194bf587df0fa0","src/cache.rs":"fe03df66fa0e77343a7e8c9909949ea3ec06dd990df80a4d1787277efd228b04","src/common.rs":"0d21914c8ad4bb196da65be7cf44f9f29f68efcd867d2517b2dbb8a237f6c356","src/dumper.rs":"d6a3ddea6a5b82724858ab3165548cdeab5accb4c93f555fd2a4e7da2b0a79ec","src/line.rs":"f3183f24532e0acca5aa0b67ab404e940481b3bc38fc4c1ef45999eeee611fa5","src/linux/elf.rs":"8fd05ae6e4e3e487a2d0d16407dfa9cf546e850f59046d9e8a3cd04088aaa9f8","src/linux/lines.rs":"37d6946d93022072a414e65a98a4e75bfa776a055b3db30c10831c917e4c6db1","src/linux/mod.rs":"8b59d998a9c3390c523a0ed5e550c9bbd746e16c5bb2625811449877795e6b45","src/linux/source.rs":"956c3b4462a1cc2ea99f23e765bd0c04c65fb9cdbdfbaff8c0ed1e1464e7b522","src/linux/symbol.rs":"b56963f4f1495bde299f12bdf9d0ea99a01efaa6baae39e3e9f6e8ff77cb0331","src/mac/macho.rs":"ec656d9082a1663daee01f7dcef185a7daa09f4f616870d4b23e349e5ff6394e","src/mac/mod.rs":"3ac83be905af817edbf52b6ca4e1e84a3b5902d9f6d3d30739c73d836d7cdaa4","src/main.rs":"f652d7507c4a7ca326fe3d0183ba6c85366ee231c3e05889e09ed79e7a527443","src/mapping.rs":"7ef4bab9473703cb63a71e3c8ac97611bee17a78b0b80997cf9a48eaf014d589","src/utils.rs":"5d585ece8511579786bad27fcf4c83c762706a286a5c43a3cf1394779d878678","src/windows/lines.rs":"831c0af2174ee3cecc2910924fc9ea8527c6a3136d63fdf34e53373215a34b43","src/windows/mod.rs":"96faf55699b8906df9ae36ffe676e260eb86e3c8f4634e5549a54dfd142d576d","src/windows/pdb.rs":"af52290c347a0261e02118d2c4139ef41d77b9c0f3a610530d738c23e719cd25","src/windows/source.rs":"af79560d7802b7f255e17136423c111ddc78ec664d45ea974fcba1ef63388193","src/windows/symbol.rs":"5945b1022195ae428b90ffffa5cac25bdb6a14163e44fa430c7fe4c7d98d8792","src/windows/types.rs":"20fd69c43f9db6b28cce04bae4cc722103cb33f6ea8f176cb1a44cb09dc2b6b5","src/windows/utils.rs":"b84fc38b1ed5dde5f0b635796a8af575b893480f5f39da11c6d8194f06120767","test_data/linux/Makefile":"3432b81e94615cef431c105d011570026a4ac51800f11d9ee5546258a72c92d6","test_data/linux/basic.cpp":"6d5d0ae32014a45f8ebe08fe22c69fe699b8be617a07950945baa9ff39f38f39","test_data/linux/basic.dbg":"5a91bac375c17d505c8902546ea55eb463fd63f666f2abb405fdd358b8e36039","test_data/linux/basic.full":"1bbd131f5646885019384cd264ed48f3d12f73fe0c3f56ed4d5e8424310895f4","test_data/linux/basic.full.sym":"5b92e3659c41ff122b81c3be68d3f1daf514b5f3ab2481b2f06c61741d9f0d17","test_data/linux/basic.stripped":"87726d48f5cfb0442df2f716d8e1e25246991d4c71c8a3e6d515929c6f7b9626","test_data/mapping.json":"dd2e691208636aac2083f4e0c9fc129eb92d1ece58eb7c4066f5c23db8890397","test_data/mapping/aaa.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/mapping/bbb.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/mapping/ccc.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/windows/Makefile":"48e211d35721ed553958c0202e99814f6493ae86ca1a64900c325a835f617351","test_data/windows/basic-opt32.dll":"5156dc395dddbf421fe593da2ed0e47c3942ba81e14551c28be9d4a1ff7d514a","test_data/windows/basic-opt32.old.sym":"e97f8a86581afc2385b75e9e7ae85ae4694f7d89724030e5da9afcb060d165f3","test_data/windows/basic-opt32.pdb":"e9bdabafbda60098c4d44148fd7001432c994d225fe7cd80eb2caa332cd43261","test_data/windows/basic-opt64.dll":"9e7f7c47a708c75a8691e90f1599c4c35ccd476fdb804e9721eed5c20a74d529","test_data/windows/basic-opt64.old.sym":"404f852ed3c0bfa04e77c9cbc32b2189b7b971b9e3c054da0c836b2b825d338b","test_data/windows/basic-opt64.pdb":"bfc72b22638be4f0a5a226707d5a51f1bb5bf346ac3afe191f3f171dfab7d0e3","test_data/windows/basic.cpp":"4b3b05382b910ed31643e05f612fe602fbbe9319674d2436cc90d9aaf9bbe16f","test_data/windows/basic32-min.dll":"fbc14344b4c15e1bb918e190abcc694958f25ea3678c4c0fbc3bcd309d6862b3","test_data/windows/basic32-min.old.sym":"151b199aa27ed1b26218bbfc86e87bbc8fbeb7c5ff73f9ffeb2f6ed3e2427181","test_data/windows/basic32-min.pdb":"d8dc7e565cc578513fc9c73d3f7613b5ca2a2b4fc853ef4e7ffd7d21c3ecbc8e","test_data/windows/basic32.dll":"6dd60214760eebefd0aec0d13b373238dea1aea0acff24635f8be13ee22a2915","test_data/windows/basic32.old.sym":"faad23663195e3d480064d83f358f2092d170f8a896b67b025a18ffa66468386","test_data/windows/basic32.pd_":"aadc24504eef021e517777d63bcebaaedac71e881449b4eaee6904fafb89d632","test_data/windows/basic64.dll":"659cbe2cedd4a8e9eb4df40d9a74f3a616cd2bb2092a9b4838aa819b6da776bc","test_data/windows/basic64.old.sym":"6e53a243fb683697725df08d2c556118738bba03a88658cb0ca7446b67a41a2c","test_data/windows/basic64.pdb":"0f90994148627ce5f7e3fdbb2e4e17151ee8a76ea8212b5df2cc1252c0d4e9a2","test_data/windows/dump_syms_regtest64.exe":"46e6bcc478e6903ef08762c3483e1e8b4eba4898011aa9b473ade57c8b0e098c","test_data/windows/dump_syms_regtest64.old.sym":"4b6b4b281368714c0aa34c383bdaafe51cbb01b52db7dad6259b3784d7970e1f","test_data/windows/dump_syms_regtest64.pdb":"d3e8878f893ef945cc0e03fb064e4b76af64de82c92707ed4fc3b62c019949f0","test_data/windows/mozwer.dll":"9b6eff52c350a90c0e23f4b5312dd686ff349c9ab007cd7d0cc00370b3889fc4","test_data/windows/mozwer.sym":"76d4dfac82edd9a5f152e812c9d1188c22ff5a590995424bcc2566fa24d55b6b","test_data/windows/ntdll.old.sym":"2983d2d6146b56d3c4105e0f561c78a9f1743d3c4dcde2933c742b6f7f6df8cd","test_data/windows/oleaut32.old.sym":"370baf634d8e0c5742c6d9991931d2d4646c566cd3380a11ab509c7dafed1a07"},"package":null}
\ No newline at end of file
+{"files":{".github/dependabot.yml":"b3c743aa114d08f175badc60d3a071e5c77bcc471c28e3320b29b22d3df2c6da",".taskcluster.yml":"8edfb77589c3b65fd4eb5c07ab520cc6da48354817d3b4fba5a913a5393afd6a","CODE_OF_CONDUCT.md":"902d5357af363426631d907e641e220b3ec89039164743f8442b3f120479b7cf","Cargo.lock":"ed1f828cbcaf8da2a7e8889b10458d1c5f101f5bcf59e933357ab020b13f19af","Cargo.toml":"6909821d7566d64cd6088ec2f91d238fc9c1bc43822035742b445ea3781e93d6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"52943eaec10fc609760b0cc0f141b5ea6b9a99e412089acb94df4702b5fe890e","src/action.rs":"1b2b2fecf9680b458745f0a24631795b375c7149375ddffd1683d0e86c470707","src/cache.rs":"c91e49933a9176d7eea6bf277d3bdc7886475339103892daf978f40e0f49b658","src/common.rs":"0310eb658a8674c216974bf79a3fc6c1db39bbb8056eeea28b2139c8c841d3ad","src/dumper.rs":"df2d294912a9df3042d60ab45ce7bcfb547371fc89ea524ec50a33272c7f199c","src/line.rs":"f3183f24532e0acca5aa0b67ab404e940481b3bc38fc4c1ef45999eeee611fa5","src/linux/elf.rs":"123fece07affe5a49b1e05f177dc2b6b0a6642642a7c4345c33fda7f25155371","src/linux/lines.rs":"37d6946d93022072a414e65a98a4e75bfa776a055b3db30c10831c917e4c6db1","src/linux/mod.rs":"8b59d998a9c3390c523a0ed5e550c9bbd746e16c5bb2625811449877795e6b45","src/linux/source.rs":"956c3b4462a1cc2ea99f23e765bd0c04c65fb9cdbdfbaff8c0ed1e1464e7b522","src/linux/symbol.rs":"6740d7a74adc2a7c6fc1b8adfb58be745f967e79aec1120fdc8da3330d99cb6d","src/mac/macho.rs":"99faffc4c24b294661a9eb29537d2da82b7c2e948d9b32bc68a6830d053fe2c5","src/mac/mod.rs":"3ac83be905af817edbf52b6ca4e1e84a3b5902d9f6d3d30739c73d836d7cdaa4","src/main.rs":"cb8e31fd4508382451c49b04583c62fd25cfb5c01149c24768680c2da19d1b24","src/mapping.rs":"ea7cb54ddca809c2221967883f34f170baf271bc7d747f56eab270198d5c10f1","src/utils.rs":"6aa3cfea871d01cb6abee201fbd7cbb540f111c0672977bb80870f13215e4787","src/windows/lines.rs":"831c0af2174ee3cecc2910924fc9ea8527c6a3136d63fdf34e53373215a34b43","src/windows/mod.rs":"96faf55699b8906df9ae36ffe676e260eb86e3c8f4634e5549a54dfd142d576d","src/windows/pdb.rs":"0e7ddec5dbbf80862a6dbac03fe6170c92410f70266089b3790204913c53e348","src/windows/source.rs":"824dad820c7ee12d4bbe098dd98a1b37ab84f3bfbcd6eba62029cbf25733cce5","src/windows/symbol.rs":"1bcaaa390a24fa3ed780d59631b5a355331662653a64d73c2743d81d619dcfde","src/windows/types.rs":"672428c218b5f5e9dcab86f2b381af03539c6c189048769d859e45ab8c7f1f82","src/windows/utils.rs":"2b2287d2e60e5f4816762f4384145fdae849a4f1694e9549a1bb1290b025a67e","test_data/linux/Makefile":"3432b81e94615cef431c105d011570026a4ac51800f11d9ee5546258a72c92d6","test_data/linux/basic.cpp":"6d5d0ae32014a45f8ebe08fe22c69fe699b8be617a07950945baa9ff39f38f39","test_data/linux/basic.dbg":"5a91bac375c17d505c8902546ea55eb463fd63f666f2abb405fdd358b8e36039","test_data/linux/basic.dbg.sym":"49e4b8517b839a236e4143fb65f572b80278643e08bb33949387ab79dd8b3481","test_data/linux/basic.full":"1bbd131f5646885019384cd264ed48f3d12f73fe0c3f56ed4d5e8424310895f4","test_data/linux/basic.full.sym":"eff0a95963b7ac844792ea3642cbb574505783ba01b731e7f32edf9f1a6bdef7","test_data/linux/basic.stripped":"87726d48f5cfb0442df2f716d8e1e25246991d4c71c8a3e6d515929c6f7b9626","test_data/mapping.json":"dd2e691208636aac2083f4e0c9fc129eb92d1ece58eb7c4066f5c23db8890397","test_data/mapping/aaa.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/mapping/bbb.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/mapping/ccc.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/windows/Makefile":"48e211d35721ed553958c0202e99814f6493ae86ca1a64900c325a835f617351","test_data/windows/basic-opt32.dll":"5156dc395dddbf421fe593da2ed0e47c3942ba81e14551c28be9d4a1ff7d514a","test_data/windows/basic-opt32.old.sym":"e97f8a86581afc2385b75e9e7ae85ae4694f7d89724030e5da9afcb060d165f3","test_data/windows/basic-opt32.pdb":"e9bdabafbda60098c4d44148fd7001432c994d225fe7cd80eb2caa332cd43261","test_data/windows/basic-opt64.dll":"9e7f7c47a708c75a8691e90f1599c4c35ccd476fdb804e9721eed5c20a74d529","test_data/windows/basic-opt64.old.sym":"404f852ed3c0bfa04e77c9cbc32b2189b7b971b9e3c054da0c836b2b825d338b","test_data/windows/basic-opt64.pdb":"bfc72b22638be4f0a5a226707d5a51f1bb5bf346ac3afe191f3f171dfab7d0e3","test_data/windows/basic.cpp":"4b3b05382b910ed31643e05f612fe602fbbe9319674d2436cc90d9aaf9bbe16f","test_data/windows/basic32-min.dll":"fbc14344b4c15e1bb918e190abcc694958f25ea3678c4c0fbc3bcd309d6862b3","test_data/windows/basic32-min.old.sym":"151b199aa27ed1b26218bbfc86e87bbc8fbeb7c5ff73f9ffeb2f6ed3e2427181","test_data/windows/basic32-min.pdb":"d8dc7e565cc578513fc9c73d3f7613b5ca2a2b4fc853ef4e7ffd7d21c3ecbc8e","test_data/windows/basic32.dll":"6dd60214760eebefd0aec0d13b373238dea1aea0acff24635f8be13ee22a2915","test_data/windows/basic32.old.sym":"faad23663195e3d480064d83f358f2092d170f8a896b67b025a18ffa66468386","test_data/windows/basic32.pd_":"aadc24504eef021e517777d63bcebaaedac71e881449b4eaee6904fafb89d632","test_data/windows/basic64.dll":"659cbe2cedd4a8e9eb4df40d9a74f3a616cd2bb2092a9b4838aa819b6da776bc","test_data/windows/basic64.old.sym":"6e53a243fb683697725df08d2c556118738bba03a88658cb0ca7446b67a41a2c","test_data/windows/basic64.pdb":"0f90994148627ce5f7e3fdbb2e4e17151ee8a76ea8212b5df2cc1252c0d4e9a2","test_data/windows/dump_syms_regtest64.exe":"46e6bcc478e6903ef08762c3483e1e8b4eba4898011aa9b473ade57c8b0e098c","test_data/windows/dump_syms_regtest64.old.sym":"4b6b4b281368714c0aa34c383bdaafe51cbb01b52db7dad6259b3784d7970e1f","test_data/windows/dump_syms_regtest64.pdb":"d3e8878f893ef945cc0e03fb064e4b76af64de82c92707ed4fc3b62c019949f0","test_data/windows/mozwer.dll":"9b6eff52c350a90c0e23f4b5312dd686ff349c9ab007cd7d0cc00370b3889fc4","test_data/windows/mozwer.sym":"9a9f333f618c7fdf92b09dfa83cac961d574d8812bbc3b3f7525b1be8ed53abe","test_data/windows/ntdll.old.sym":"2983d2d6146b56d3c4105e0f561c78a9f1743d3c4dcde2933c742b6f7f6df8cd","test_data/windows/oleaut32.old.sym":"370baf634d8e0c5742c6d9991931d2d4646c566cd3380a11ab509c7dafed1a07"},"package":null}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/Cargo.lock	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/Cargo.lock	2021-12-09 12:01:23.000000000 +0000
@@ -1,31 +1,38 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
-version = "0.14.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
+checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
 dependencies = [
- "gimli 0.23.0",
+ "gimli 0.25.0",
 ]
 
 [[package]]
 name = "adler"
-version = "0.2.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.4.7"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
+checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.15"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
@@ -36,26 +43,26 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.36"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68803225a7b13e47191bab76f2687382b60d259e8cf37f6e1893658b84bb9479"
+checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf"
 
 [[package]]
-name = "arrayref"
-version = "0.3.6"
+name = "arrayvec"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.5.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd"
 
 [[package]]
 name = "atty"
@@ -65,7 +72,7 @@
 dependencies = [
  "hermit-abi",
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -76,12 +83,13 @@
 
 [[package]]
 name = "backtrace"
-version = "0.3.55"
+version = "0.3.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
+checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"
 dependencies = [
  "addr2line",
- "cfg-if 1.0.0",
+ "cc",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -96,31 +104,20 @@
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "blake2b_simd"
-version = "0.5.11"
+name = "bitvec"
+version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
+checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
 dependencies = [
- "arrayref",
- "arrayvec",
- "constant_time_eq",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.3",
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
 ]
 
 [[package]]
@@ -129,47 +126,41 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array",
 ]
 
 [[package]]
-name = "block-padding"
-version = "0.1.5"
+name = "brownstone"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+checksum = "83b83224877479161e925498306710f448b13a7f6fdcf69022a60dad1fe3d1bd"
 dependencies = [
- "byte-tools",
+ "arrayvec 0.7.1",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "0.5.6"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
 [[package]]
 name = "bzip2"
-version = "0.3.3"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
+checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
 dependencies = [
  "bzip2-sys",
  "libc",
@@ -177,9 +168,9 @@
 
 [[package]]
 name = "bzip2-sys"
-version = "0.1.9+1.0.8"
+version = "0.1.11+1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
 dependencies = [
  "cc",
  "libc",
@@ -199,21 +190,15 @@
 
 [[package]]
 name = "cc"
-version = "1.0.66"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
 dependencies = [
  "jobserver",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
@@ -228,7 +213,7 @@
  "num-integer",
  "num-traits",
  "time",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -247,18 +232,6 @@
 ]
 
 [[package]]
-name = "const_fn"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
 name = "core-foundation"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -276,19 +249,21 @@
 
 [[package]]
 name = "cpp_demangle"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44919ecaf6f99e8e737bc239408931c9a01e9a6c74814fee8242dd2506b65390"
+checksum = "8ea47428dc9d2237f3c6bc134472edfd63ebba0af932e783506dcfd66f10d18a"
 dependencies = [
- "cfg-if 1.0.0",
- "glob",
+ "cfg-if",
 ]
 
 [[package]]
-name = "cpuid-bool"
-version = "0.1.2"
+name = "cpufeatures"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "crc32fast"
@@ -296,16 +271,16 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"
+checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-epoch",
@@ -315,33 +290,32 @@
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
 dependencies = [
- "cfg-if 1.0.0",
- "const_fn",
+ "cfg-if",
  "crossbeam-utils",
  "lazy_static",
  "memoffset",
@@ -350,22 +324,21 @@
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
+checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.1"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
 dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
+ "cfg-if",
  "lazy_static",
 ]
 
@@ -380,40 +353,31 @@
 
 [[package]]
 name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.3",
-]
-
-[[package]]
-name = "digest"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array",
 ]
 
 [[package]]
 name = "dirs"
-version = "3.0.1"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff"
+checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
 dependencies = [
  "dirs-sys",
 ]
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
 dependencies = [
  "libc",
  "redox_users",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -434,6 +398,7 @@
  "failure",
  "futures",
  "fxhash",
+ "goblin",
  "hashbrown",
  "lazy_static",
  "log",
@@ -454,12 +419,22 @@
 ]
 
 [[package]]
+name = "elementtree"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19c5d32d0ab83734d2d7452047ef901c105991044b7b07da30fe82371a149a25"
+dependencies = [
+ "string_cache",
+ "xml-rs",
+]
+
+[[package]]
 name = "encoding_rs"
-version = "0.8.26"
+version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283"
+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -485,12 +460,6 @@
 ]
 
 [[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
 name = "fallible-iterator"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -498,11 +467,11 @@
 
 [[package]]
 name = "flate2"
-version = "1.0.19"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
+checksum = "80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crc32fast",
  "libc",
  "miniz_oxide",
@@ -531,35 +500,25 @@
 
 [[package]]
 name = "form_urlencoded"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
 dependencies = [
  "matches",
  "percent-encoding",
 ]
 
 [[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
+name = "funty"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
 
 [[package]]
 name = "futures"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
+checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -572,9 +531,9 @@
 
 [[package]]
 name = "futures-channel"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -582,15 +541,15 @@
 
 [[package]]
 name = "futures-core"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -599,16 +558,17 @@
 
 [[package]]
 name = "futures-io"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
 dependencies = [
+ "autocfg",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -617,25 +577,23 @@
 
 [[package]]
 name = "futures-sink"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
 
 [[package]]
 name = "futures-task"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
-dependencies = [
- "once_cell",
-]
+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
 
 [[package]]
 name = "futures-util"
-version = "0.3.8"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
 dependencies = [
+ "autocfg",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -643,7 +601,7 @@
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project 1.0.2",
+ "pin-project-lite",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -661,15 +619,6 @@
 
 [[package]]
 name = "generic-array"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
 version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
@@ -680,20 +629,20 @@
 
 [[package]]
 name = "getrandom"
-version = "0.1.15"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
 dependencies = [
  "fallible-iterator",
  "stable_deref_trait",
@@ -701,21 +650,15 @@
 
 [[package]]
 name = "gimli"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
-
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
 
 [[package]]
 name = "goblin"
-version = "0.2.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20fd25aa456527ce4f544271ae4fea65d2eda4a6561ea56f39fb3ee4f7e3884"
+checksum = "0b1800b95efee8ad4ef04517d4d69f8e209e763b1668f1179aeeedd0e454da55"
 dependencies = [
  "log",
  "plain",
@@ -724,9 +667,9 @@
 
 [[package]]
 name = "h2"
-version = "0.2.7"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
+checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472"
 dependencies = [
  "bytes",
  "fnv",
@@ -739,14 +682,13 @@
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-futures",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
  "ahash",
  "serde",
@@ -754,27 +696,27 @@
 
 [[package]]
 name = "heck"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
 dependencies = [
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
  "bytes",
  "fnv",
@@ -783,31 +725,32 @@
 
 [[package]]
 name = "http-body"
-version = "0.3.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
+checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
 dependencies = [
  "bytes",
  "http",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
 
 [[package]]
 name = "httpdate"
-version = "0.3.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
 
 [[package]]
 name = "hyper"
-version = "0.13.9"
+version = "0.14.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
+checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -819,7 +762,7 @@
  "httparse",
  "httpdate",
  "itoa",
- "pin-project 1.0.2",
+ "pin-project-lite",
  "socket2",
  "tokio",
  "tower-service",
@@ -829,15 +772,15 @@
 
 [[package]]
 name = "hyper-tls"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
  "hyper",
  "native-tls",
  "tokio",
- "tokio-tls",
+ "tokio-native-tls",
 ]
 
 [[package]]
@@ -848,9 +791,9 @@
 
 [[package]]
 name = "idna"
-version = "0.2.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -858,10 +801,16 @@
 ]
 
 [[package]]
+name = "indent_write"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3"
+
+[[package]]
 name = "indexmap"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -869,60 +818,47 @@
 
 [[package]]
 name = "instant"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
 dependencies = [
- "libc",
+ "cfg-if",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
+checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "jobserver"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
 dependencies = [
  "libc",
 ]
 
 [[package]]
-name = "js-sys"
-version = "0.3.46"
+name = "joinery"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
-dependencies = [
- "wasm-bindgen",
-]
+checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
 
 [[package]]
-name = "kernel32-sys"
-version = "0.2.2"
+name = "js-sys"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"
 dependencies = [
- "winapi 0.2.8",
- "winapi-build",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -944,46 +880,53 @@
 checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
+name = "lexical-core"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
+dependencies = [
+ "arrayvec 0.5.2",
+ "bitflags",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
+
+[[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
 
 [[package]]
 name = "lock_api"
-version = "0.4.2"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
 dependencies = [
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
 ]
 
 [[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
 name = "matches"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "memchr"
-version = "2.3.4"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memmap"
@@ -992,14 +935,14 @@
 checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 dependencies = [
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "memoffset"
-version = "0.6.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
  "autocfg",
 ]
@@ -1011,20 +954,10 @@
 checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
-name = "mime_guess"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
 name = "miniz_oxide"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
  "autocfg",
@@ -1032,49 +965,40 @@
 
 [[package]]
 name = "mio"
-version = "0.6.23"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
  "libc",
  "log",
  "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
+ "ntapi",
+ "winapi",
 ]
 
 [[package]]
 name = "miow"
-version = "0.2.2"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
 dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "winapi",
 ]
 
 [[package]]
 name = "msvc-demangler"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6584cf122f02fc0396420a116cd395a9a776ec4347dffe1c5119c3fcc917c060"
+checksum = "bfb67c6dd0fa9b00619c41c5700b6f92d5f418be49b45ddb9970fbd4569df3c8"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
+checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"
 dependencies = [
  "lazy_static",
  "libc",
@@ -1089,14 +1013,44 @@
 ]
 
 [[package]]
-name = "net2"
-version = "0.2.37"
+name = "new_debug_unreachable"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
+[[package]]
+name = "nom"
+version = "6.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
 dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
+ "bitvec",
+ "funty",
+ "lexical-core",
+ "memchr",
+ "version_check",
+]
+
+[[package]]
+name = "nom-supreme"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08bbbb568bb8e06f87b58a592eb5af2bf6dbbfe1868ab7311adec38230459a8"
+dependencies = [
+ "brownstone",
+ "indent_write",
+ "joinery",
+ "memchr",
+ "nom",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi",
 ]
 
 [[package]]
@@ -1130,21 +1084,18 @@
 
 [[package]]
 name = "object"
-version = "0.22.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "once_cell"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "opaque-debug"
@@ -1154,38 +1105,38 @@
 
 [[package]]
 name = "openssl"
-version = "0.10.31"
+version = "0.10.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187"
+checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
 dependencies = [
  "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
  "foreign-types",
- "lazy_static",
  "libc",
+ "once_cell",
  "openssl-sys",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-src"
-version = "111.13.0+1.1.1i"
+version = "111.16.0+1.1.1l"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6"
+checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.59"
+version = "0.9.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe"
+checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82"
 dependencies = [
  "autocfg",
  "cc",
@@ -1197,9 +1148,9 @@
 
 [[package]]
 name = "parking_lot"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
@@ -1208,23 +1159,23 @@
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "instant",
  "libc",
  "redox_syscall",
  "smallvec",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "pdb"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66be5fcea88b52962d3d6fcc5194f1d77666f5aca256926688743a8de1152e4"
+checksum = "13f4d162ecaaa1467de5afbe62d597757b674b51da8bb4e587430c5fdb2af7aa"
 dependencies = [
  "fallible-iterator",
  "scroll",
@@ -1238,99 +1189,19 @@
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
-dependencies = [
- "maplit",
- "pest",
- "sha-1",
-]
-
-[[package]]
-name = "pin-project"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"
-dependencies = [
- "pin-project-internal 0.4.27",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
-dependencies = [
- "pin-project-internal 1.0.2",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.2"
+name = "phf_shared"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "siphasher",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.0"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -1351,18 +1222,18 @@
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
-name = "podio"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19"
-
-[[package]]
 name = "ppv-lite86"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
 name = "proc-macro-hack"
 version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1370,35 +1241,40 @@
 
 [[package]]
 name = "proc-macro-nested"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
+[[package]]
 name = "rand"
-version = "0.7.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
- "getrandom",
  "libc",
  "rand_chacha",
  "rand_core",
@@ -1407,9 +1283,9 @@
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
  "rand_core",
@@ -1417,56 +1293,57 @@
 
 [[package]]
 name = "rand_core"
-version = "0.5.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
  "rand_core",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.57"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+dependencies = [
+ "bitflags",
+]
 
 [[package]]
 name = "redox_users"
-version = "0.3.5"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
+checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
  "getrandom",
  "redox_syscall",
- "rust-argon2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.4.2"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -1474,14 +1351,14 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.10.10"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"
+checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
 dependencies = [
  "base64",
  "bytes",
@@ -1497,14 +1374,13 @@
  "lazy_static",
  "log",
  "mime",
- "mime_guess",
  "native-tls",
  "percent-encoding",
- "pin-project-lite 0.2.0",
+ "pin-project-lite",
  "serde",
  "serde_urlencoded",
  "tokio",
- "tokio-tls",
+ "tokio-native-tls",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1513,22 +1389,10 @@
 ]
 
 [[package]]
-name = "rust-argon2"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
-dependencies = [
- "base64",
- "blake2b_simd",
- "constant_time_eq",
- "crossbeam-utils",
-]
-
-[[package]]
 name = "rustc-demangle"
-version = "0.1.18"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "ryu"
@@ -1543,7 +1407,7 @@
 checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
 dependencies = [
  "lazy_static",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1563,9 +1427,9 @@
 
 [[package]]
 name = "scroll_derive"
-version = "0.10.4"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d"
+checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1574,9 +1438,9 @@
 
 [[package]]
 name = "security-framework"
-version = "2.0.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
+checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -1587,9 +1451,9 @@
 
 [[package]]
 name = "security-framework-sys"
-version = "2.0.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
+checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1597,18 +1461,18 @@
 
 [[package]]
 name = "serde"
-version = "1.0.118"
+version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.118"
+version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1617,9 +1481,9 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.60"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
+checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950"
 dependencies = [
  "itoa",
  "ryu",
@@ -1639,35 +1503,23 @@
 ]
 
 [[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
 name = "sha2"
-version = "0.9.2"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
+checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3"
 dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpuid-bool",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "block-buffer",
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+ "opaque-debug",
 ]
 
 [[package]]
 name = "simplelog"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc0ffd69814a9b251d43afcabf96dad1b29f5028378056257be9e3fecc9f720"
+checksum = "59d0fe306a0ced1c88a58042dc22fc2ddd000982c26d75f6aa09a394547c41e0"
 dependencies = [
  "chrono",
  "log",
@@ -1675,26 +1527,31 @@
 ]
 
 [[package]]
+name = "siphasher"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1"
+
+[[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
 
 [[package]]
 name = "smallvec"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "socket2"
-version = "0.3.19"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
 dependencies = [
- "cfg-if 1.0.0",
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1704,6 +1561,25 @@
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "string_cache"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a"
+dependencies = [
+ "lazy_static",
+ "new_debug_unreachable",
+ "phf_shared",
+ "precomputed-hash",
+ "serde",
+]
+
+[[package]]
 name = "strsim"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1711,9 +1587,9 @@
 
 [[package]]
 name = "symbolic"
-version = "8.0.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed99d2d834d525df5ba47628e09a8e600bec7c4fe44a725accc7e492977cd87e"
+checksum = "15a8386ee899fa8c8e372d886e937444d2bd72123ef4a3f234e4ac10f65aa2b5"
 dependencies = [
  "symbolic-common",
  "symbolic-debuginfo",
@@ -1723,9 +1599,9 @@
 
 [[package]]
 name = "symbolic-common"
-version = "8.0.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0caab39ce6f074031b8fd3dd297bfda70a2d1f33c6e7cc1b737ac401f856448d"
+checksum = "348885c332e7d0784d661844b13b198464144a5ebcd3bfc047a6c441867ea467"
 dependencies = [
  "debugid",
  "memmap",
@@ -1735,37 +1611,39 @@
 
 [[package]]
 name = "symbolic-debuginfo"
-version = "8.0.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d988bcd67d7a630e1308292c719c62fb5d17669e86a26d411613dd09a161361"
+checksum = "35bab4753ee9fcc994192a13fb17519397b283106424e33787265220472816ee"
 dependencies = [
  "dmsort",
+ "elementtree",
  "fallible-iterator",
  "flate2",
- "gimli 0.22.0",
+ "gimli 0.24.0",
  "goblin",
  "lazy_static",
  "lazycell",
+ "nom",
+ "nom-supreme",
  "parking_lot",
  "pdb",
- "pest",
- "pest_derive",
  "regex",
+ "scroll",
  "serde",
  "serde_json",
  "smallvec",
  "symbolic-common",
  "thiserror",
  "walrus",
- "wasmparser 0.68.0",
+ "wasmparser",
  "zip",
 ]
 
 [[package]]
 name = "symbolic-demangle"
-version = "8.0.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b77ecb5460a87faa37ed53521eed8f073c8339b7a5788c1f93efc09ce74e1b68"
+checksum = "6780c62bfbd609bffaa13d6959715850578aa43caaae7aee14f1f24ceb64f433"
 dependencies = [
  "cc",
  "cpp_demangle",
@@ -1776,9 +1654,9 @@
 
 [[package]]
 name = "symbolic-minidump"
-version = "8.0.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d923398ae807fc354c0249b286ad0a7c618a5a518ba66cf95d095cc563d941"
+checksum = "8507efc38cf694055f3a70ba4ca51b39ef258d5e661772cc29c97bc08f6069e7"
 dependencies = [
  "cc",
  "lazy_static",
@@ -1790,9 +1668,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.55"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a"
+checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1801,9 +1679,9 @@
 
 [[package]]
 name = "synstructure"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1812,17 +1690,23 @@
 ]
 
 [[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
 name = "tempfile"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "libc",
  "rand",
  "redox_syscall",
  "remove_dir_all",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1845,18 +1729,18 @@
 
 [[package]]
 name = "thiserror"
-version = "1.0.22"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
+checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.22"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
+checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1864,30 +1748,20 @@
 ]
 
 [[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
 name = "time"
-version = "0.1.44"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
  "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.1.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
+checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1900,27 +1774,25 @@
 
 [[package]]
 name = "tokio"
-version = "0.2.24"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
+checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce"
 dependencies = [
+ "autocfg",
  "bytes",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
+ "libc",
  "memchr",
  "mio",
  "num_cpus",
- "pin-project-lite 0.1.11",
- "slab",
+ "pin-project-lite",
+ "winapi",
 ]
 
 [[package]]
-name = "tokio-tls"
-version = "0.3.1"
+name = "tokio-native-tls"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
  "tokio",
@@ -1928,56 +1800,45 @@
 
 [[package]]
 name = "tokio-util"
-version = "0.3.1"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
+checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite 0.1.11",
+ "pin-project-lite",
  "tokio",
 ]
 
 [[package]]
 name = "tower-service"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.22"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
- "cfg-if 1.0.0",
- "log",
- "pin-project-lite 0.2.0",
+ "cfg-if",
+ "pin-project-lite",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
-name = "tracing-futures"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
-dependencies = [
- "pin-project 0.4.27",
- "tracing",
-]
-
-[[package]]
 name = "try-lock"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1985,48 +1846,30 @@
 
 [[package]]
 name = "typenum"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
+checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
+checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.16"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
+checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
 
 [[package]]
 name = "unicode-width"
@@ -2036,15 +1879,15 @@
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "url"
-version = "2.2.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2054,15 +1897,15 @@
 
 [[package]]
 name = "uuid"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 
 [[package]]
 name = "vcpkg"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vec_map"
@@ -2072,29 +1915,29 @@
 
 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
 
 [[package]]
 name = "walrus"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d470d0583e65f4cab21a1ff3c1ba3dd23ae49e68f516f0afceaeb001b32af39"
+checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8"
 dependencies = [
  "anyhow",
  "id-arena",
  "leb128",
  "log",
  "walrus-macro",
- "wasmparser 0.59.0",
+ "wasmparser",
 ]
 
 [[package]]
 name = "walrus-macro"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c2bb690b44cb1b0fdcc54d4998d21f8bdaf706b93775425e440b174f39ad16"
+checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -2114,23 +1957,17 @@
 
 [[package]]
 name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.69"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
+checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2138,9 +1975,9 @@
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.69"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
+checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -2153,11 +1990,11 @@
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.19"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
+checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -2165,9 +2002,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.69"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
+checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2175,9 +2012,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.69"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
+checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2188,27 +2025,21 @@
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
-
-[[package]]
-name = "wasmparser"
-version = "0.59.0"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9"
+checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
 
 [[package]]
 name = "wasmparser"
-version = "0.68.0"
+version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29a00e14eed9c2ecbbdbdd4fb284f49d21b6808965de24769a6379a13ec47d4c"
+checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"
 
 [[package]]
 name = "web-sys"
-version = "0.3.46"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
+checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2216,12 +2047,6 @@
 
 [[package]]
 name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
@@ -2231,12 +2056,6 @@
 ]
 
 [[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2248,7 +2067,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2263,28 +2082,31 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
+name = "wyz"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
 
 [[package]]
 name = "zip"
-version = "0.5.6"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58287c28d78507f5f91f2a4cf1e8310e2c76fd4c6932f93ac60fd1ceb402db7d"
+checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
 dependencies = [
+ "byteorder",
  "bzip2",
  "crc32fast",
  "flate2",
- "podio",
+ "thiserror",
  "time",
 ]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/Cargo.toml	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/Cargo.toml	2021-12-09 12:01:27.000000000 +0000
@@ -9,26 +9,27 @@
 license = "MIT/Apache-2.0"
 
 [dependencies]
-bitflags = "1.2"
+bitflags = "1.3"
 cab = "0.2"
 clap = "2.33"
-crossbeam = "0.8.0"
+crossbeam = "0.8.1"
 dirs = "3.0"
 failure = "0.1"
 futures = "0.3"
-hashbrown = { version = "0.9", features = ["serde"] }
+goblin = "0.4.2" # Keep in sync with symbolic-debuginfo
+hashbrown = { version = "0.11", features = ["serde"] }
 lazy_static = "1.4"
 log = "0.4"
 num_cpus = "1.13"
-pdb = "0.6"
-regex = "1.3"
-reqwest = { version = "0.10", features = ["blocking"] }
+pdb = "0.7"
+regex = "1.4"
+reqwest = { version = "0.11", features = ["blocking"] }
 serde = "1.0"
 serde_json = "1.0"
 sha2 = "0.9"
-simplelog = "0.9"
+simplelog = "0.10"
 symbolic = { version = "8", features = ["demangle", "minidump"] }
-tokio = "0.2.24"
+tokio = "1.8"
 url = "2.2"
 uuid = "0.8"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/CODE_OF_CONDUCT.md thunderbird-91.4.0+build2/third_party/dump_syms/CODE_OF_CONDUCT.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/CODE_OF_CONDUCT.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/CODE_OF_CONDUCT.md	2021-12-09 12:01:23.000000000 +0000
@@ -0,0 +1,15 @@
+# Community Participation Guidelines
+
+This repository is governed by Mozilla's code of conduct and etiquette guidelines. 
+For more details, please read the
+[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/). 
+
+## How to Report
+For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
+
+<!--
+## Project Specific Etiquette
+
+In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
+Please update for your project.
+-->
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/README.md thunderbird-91.4.0+build2/third_party/dump_syms/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/README.md	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/README.md	2021-12-09 12:01:23.000000000 +0000
@@ -3,4 +3,29 @@
 [![Task Status](https://community-tc.services.mozilla.com/api/github/v1/repository/mozilla/dump_syms/master/badge.svg)](https://community-tc.services.mozilla.com/api/github/v1/repository/mozilla/dump_syms/master/latest)
 [![codecov](https://codecov.io/gh/calixteman/dump_syms/branch/master/graph/badge.svg)](https://codecov.io/gh/calixteman/dump_syms)
 
-The goal is to rewrite breakpad tools to generate breakpad symbol files from debug files. 
+dump_syms is a command-line utility for parsing the debugging information the
+compiler provides (whether as DWARF or STABS sections in an ELF file or as
+stand-alone PDB files) and writing that information back out in the Breakpad
+symbol file format.
+
+
+# Usage
+
+Use dump_syms:
+
+    dump_syms [FLAGS] [OPTIONS] <filenames>...
+    
+for help:
+
+    dump_syms --help
+
+
+# Development
+
+To build:
+
+    cargo build
+    
+To run tests:
+
+    cargo test
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/action.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/action.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/action.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/action.rs	2021-12-09 12:01:23.000000000 +0000
@@ -30,7 +30,7 @@
 
     fn single_file(&self, filename: &str) -> common::Result<()> {
         match self {
-            Self::Dump(config) => dumper::single_file(&config, filename),
+            Self::Dump(config) => dumper::single_file(config, filename),
             Self::ListArch => {
                 let path = PathBuf::from(filename);
                 let filename = utils::get_filename(&path);
@@ -44,9 +44,9 @@
     fn several_files(&self, filenames: &[&str]) -> common::Result<()> {
         match self {
             Self::Dump(config) => match config.file_type {
-                FileType::Elf => dumper::several_files::<ElfInfo>(&config, filenames),
-                FileType::Macho => dumper::several_files::<MachoInfo>(&config, filenames),
-                FileType::Pdb => dumper::several_files::<PDBInfo>(&config, filenames),
+                FileType::Elf => dumper::several_files::<ElfInfo>(config, filenames),
+                FileType::Macho => dumper::several_files::<MachoInfo>(config, filenames),
+                FileType::Pdb => dumper::several_files::<PDBInfo>(config, filenames),
                 _ => Ok(()),
             },
             Self::ListArch => {
@@ -94,6 +94,7 @@
             mapping_src: None,
             mapping_dest: None,
             mapping_file: None,
+            check_cfi: false,
         });
 
         action.action(&[tmp_file.to_str().unwrap()]).unwrap();
@@ -106,6 +107,35 @@
     }
 
     #[test]
+    fn test_missing_cfi() {
+        let tmp_dir = Builder::new().prefix("missing_cfi").tempdir().unwrap();
+        let basic64 = PathBuf::from("./test_data/windows/basic64.pdb");
+        let tmp_file = tmp_dir.path().join("basic64.pdb");
+        let tmp_out = tmp_dir.path().join("output.sym");
+
+        copy(basic64, &tmp_file).unwrap();
+
+        let action = Action::Dump(Config {
+            output: tmp_out.to_str().unwrap(),
+            symbol_server: None,
+            store: None,
+            debug_id: None,
+            code_id: None,
+            arch: common::get_compile_time_arch(),
+            file_type: FileType::Pdb,
+            num_jobs: 1,
+            mapping_var: None,
+            mapping_src: None,
+            mapping_dest: None,
+            mapping_file: None,
+            check_cfi: true,
+        });
+
+        let res = action.action(&[tmp_file.to_str().unwrap()]);
+        assert!(res.is_err());
+    }
+
+    #[test]
     fn test_missing_pe_but_in_dir() {
         let tmp_dir = Builder::new().prefix("no_pe").tempdir().unwrap();
         let basic64_pdb = PathBuf::from("./test_data/windows/basic64.pdb");
@@ -130,6 +160,7 @@
             mapping_src: None,
             mapping_dest: None,
             mapping_file: None,
+            check_cfi: false,
         });
 
         action.action(&[tmp_pdb.to_str().unwrap()]).unwrap();
@@ -160,6 +191,7 @@
             mapping_src: None,
             mapping_dest: None,
             mapping_file: None,
+            check_cfi: false,
         });
 
         action.action(&[full.to_str().unwrap()]).unwrap();
@@ -194,22 +226,23 @@
             mapping_src: None,
             mapping_dest: None,
             mapping_file: None,
+            check_cfi: false,
         });
 
         action
             .action(&[stripped.to_str().unwrap(), dbg.to_str().unwrap()])
             .unwrap();
 
-        let re = Regex::new(r"<unknown[^>]*>").unwrap();
+        let re = Regex::new(r"<procedure linkage table[^>]*>").unwrap();
         let data = read(tmp_out).unwrap();
         let data = String::from_utf8(data).unwrap();
-        let data = re.replace_all(&data, "<unknown>");
+        let data = re.replace_all(&data, "<procedure linkage table>");
         let new: Vec<_> = data.split(|c: char| c == '\n').skip(1).collect();
 
-        let basic = PathBuf::from("./test_data/linux/basic.full.sym");
+        let basic = PathBuf::from("./test_data/linux/basic.dbg.sym");
         let data = read(basic).unwrap();
         let data = String::from_utf8(data).unwrap();
-        let data = re.replace_all(&data, "<unknown>");
+        let data = re.replace_all(&data, "<procedure linkage table>");
         let basic: Vec<_> = data.split(|c: char| c == '\n').skip(1).collect();
 
         assert_eq!(basic, new);
@@ -235,22 +268,20 @@
             mapping_src: None,
             mapping_dest: None,
             mapping_file: None,
+            check_cfi: false,
         });
 
         action
             .action(&[dbg.to_str().unwrap(), stripped.to_str().unwrap()])
             .unwrap();
 
-        let re = Regex::new(r"<unknown[^>]*>").unwrap();
         let data = read(tmp_out).unwrap();
         let data = String::from_utf8(data).unwrap();
-        let data = re.replace_all(&data, "<unknown>");
         let new: Vec<_> = data.split(|c: char| c == '\n').skip(1).collect();
 
-        let basic = PathBuf::from("./test_data/linux/basic.full.sym");
+        let basic = PathBuf::from("./test_data/linux/basic.dbg.sym");
         let data = read(basic).unwrap();
         let data = String::from_utf8(data).unwrap();
-        let data = re.replace_all(&data, "<unknown>");
         let basic: Vec<_> = data.split(|c: char| c == '\n').skip(1).collect();
 
         assert_eq!(basic, new);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/cache.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/cache.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/cache.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/cache.rs	2021-12-09 12:01:23.000000000 +0000
@@ -8,7 +8,7 @@
 use reqwest::{self, blocking, header::USER_AGENT, Client};
 use std::fs::{self, File};
 use std::io::{BufWriter, Read, Write};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 use tokio::runtime::Runtime;
 use url::Url;
@@ -107,7 +107,7 @@
 }
 
 fn read_config_from_str(s: &str) -> Option<Vec<SymbolServer>> {
-    let servers = parse_sympath(&s);
+    let servers = parse_sympath(s);
     if servers.is_empty() {
         None
     } else {
@@ -177,7 +177,7 @@
 fn search_in_cache(
     servers: &[SymbolServer],
     id: &str,
-    base: &PathBuf,
+    base: &Path,
     file_name: &str,
 ) -> Option<PathBuf> {
     for cache in servers.iter().filter_map(|x| x.cache.as_ref()) {
@@ -189,15 +189,14 @@
     None
 }
 
-fn get_jobs(servers: &[SymbolServer], id: &str, base: &PathBuf, file_name: &str) -> Vec<Job> {
+fn get_jobs(servers: &[SymbolServer], id: &str, base: &Path, file_name: &str) -> Vec<Job> {
     // The query urls are: https://symbols.mozilla.org/xul.pdb/DEBUG_ID/xul.pd_
     let mut jobs = Vec::new();
     for server in servers.iter() {
-        let path = if let Some(cache) = server.cache.as_ref() {
-            Some(PathBuf::from(cache).join(base).join(id).join(&file_name))
-        } else {
-            None
-        };
+        let path = server
+            .cache
+            .as_ref()
+            .map(|cache| PathBuf::from(cache).join(base).join(id).join(&file_name));
         let job = Job::new(
             path.clone(),
             format!("{}/{}/{}/{}", server.server, file_name, id, file_name),
@@ -299,13 +298,13 @@
     let base = get_base(&file_name);
 
     // Start with the caches
-    if let Some(path) = search_in_cache(&servers, id, &base, &file_name) {
+    if let Some(path) = search_in_cache(servers, id, &base, &file_name) {
         return (Some(utils::read_file(path)), file_name);
     }
 
     // Try the symbol servers
     // Each job contains the path where to cache data (if one) and a query url
-    let jobs = get_jobs(&servers, id, &base, &file_name);
+    let jobs = get_jobs(servers, id, &base, &file_name);
     let buf = fetch_data(jobs);
 
     if let Some(buf) = buf {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/common.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/common.rs	2021-12-09 12:01:23.000000000 +0000
@@ -48,6 +48,7 @@
     fn dump<W: Write>(&self, writer: W) -> Result<()>;
     fn get_name(&self) -> &str;
     fn get_debug_id(&self) -> &str;
+    fn has_stack(&self) -> bool;
 }
 
 pub(crate) trait Mergeable {
@@ -77,11 +78,17 @@
     .name()
 }
 
+pub(crate) fn normalize_anonymous_namespace(text: &str) -> String {
+    let fixed = text.replace("`anonymous namespace'", "(anonymous namespace)");
+    String::from(&fixed)
+}
+
 pub(crate) fn fix_symbol_name<'a>(name: &'a Name<'a>) -> Name<'a> {
     lazy_static! {
         static ref LLVM_NNN: Regex = Regex::new(r"\.llvm\.[0-9]+$").unwrap();
     }
     let fixed = LLVM_NNN.replace(name.as_str(), "");
+    let fixed = normalize_anonymous_namespace(&fixed);
 
     Name::new(fixed, name.mangling(), name.language())
 }
@@ -106,4 +113,13 @@
             fix_symbol_name(&name)
         );
     }
+
+    #[test]
+    fn test_normalize_anonymous_namespace() {
+        let name = "(anonymous namespace)";
+        assert_eq!("(anonymous namespace)", normalize_anonymous_namespace(name));
+
+        let name = "`anonymous namespace'";
+        assert_eq!("(anonymous namespace)", normalize_anonymous_namespace(name));
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/dumper.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/dumper.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/dumper.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/dumper.rs	2021-12-09 12:01:23.000000000 +0000
@@ -8,7 +8,7 @@
 use hashbrown::HashMap;
 use log::{error, info};
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};
@@ -33,6 +33,7 @@
     pub arch: &'a str,
     pub file_type: FileType,
     pub num_jobs: usize,
+    pub check_cfi: bool,
     pub mapping_var: Option<Vec<&'a str>>,
     pub mapping_src: Option<Vec<&'a str>>,
     pub mapping_dest: Option<Vec<&'a str>>,
@@ -43,7 +44,7 @@
     fn get_dbg(
         arch: Arch,
         buf: &[u8],
-        path: &PathBuf,
+        path: &Path,
         filename: &str,
         mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self>;
@@ -51,7 +52,7 @@
     fn get_pe<'a>(
         _conf: &Config<'a>,
         _buf: &[u8],
-        _path: &PathBuf,
+        _path: &Path,
         _filename: &str,
         _mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self> {
@@ -63,11 +64,11 @@
     fn get_dbg(
         _arch: Arch,
         buf: &[u8],
-        _path: &PathBuf,
+        _path: &Path,
         filename: &str,
         mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self> {
-        Self::new(&buf, filename, Platform::Linux, mapping)
+        Self::new(buf, filename, Platform::Linux, mapping)
     }
 }
 
@@ -75,11 +76,11 @@
     fn get_dbg(
         arch: Arch,
         buf: &[u8],
-        _path: &PathBuf,
+        _path: &Path,
         filename: &str,
         mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self> {
-        Self::new(&buf, filename, arch, mapping)
+        Self::new(buf, filename, arch, mapping)
     }
 }
 
@@ -87,24 +88,24 @@
     fn get_dbg(
         _arch: Arch,
         buf: &[u8],
-        path: &PathBuf,
+        path: &Path,
         filename: &str,
         mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self> {
-        let mut pdb = Self::new(&buf, filename, "", None, mapping)?;
-        windows::utils::try_to_set_pe(&path, &mut pdb, &buf);
+        let mut pdb = Self::new(buf, filename, "", None, mapping)?;
+        windows::utils::try_to_set_pe(path, &mut pdb, buf);
         Ok(pdb)
     }
 
     fn get_pe<'a>(
         conf: &Config<'a>,
         buf: &[u8],
-        path: &PathBuf,
+        path: &Path,
         filename: &str,
         mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self> {
         let symbol_server = cache::get_sym_servers(conf.symbol_server);
-        let res = windows::utils::get_pe_pdb_buf(path, &buf, symbol_server.as_ref());
+        let res = windows::utils::get_pe_pdb_buf(path, buf, symbol_server.as_ref());
 
         if let Some((pe, pdb_buf, pdb_name)) = res {
             let pdb = Self::new(&pdb_buf, &pdb_name, filename, Some(pe), mapping)?;
@@ -119,7 +120,7 @@
     fn get_dbg(
         _arch: Arch,
         _buf: &[u8],
-        _path: &PathBuf,
+        _path: &Path,
         _filename: &str,
         _mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self> {
@@ -129,11 +130,11 @@
     fn get_pe<'a>(
         _conf: &Config<'a>,
         buf: &[u8],
-        path: &PathBuf,
+        path: &Path,
         filename: &str,
         _mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self> {
-        let pe = PeObject::parse(&buf)
+        let pe = PeObject::parse(buf)
             .unwrap_or_else(|_| panic!("Unable to parse the PE file {}", path.to_str().unwrap()));
         let pe = Self::new(filename, pe)?;
         Ok(pe)
@@ -143,12 +144,17 @@
 fn store<D: Dumpable, S1: AsRef<str>, S2: AsRef<str>>(
     output: S1,
     store: Option<S2>,
+    check_cfi: bool,
     dumpable: D,
 ) -> common::Result<()> {
+    if check_cfi && !dumpable.has_stack() {
+        return Err("No CFI data".into());
+    }
+
     let output = output.as_ref();
     let store = store.filter(|p| !p.as_ref().is_empty()).map(|p| {
         PathBuf::from(p.as_ref()).join(cache::get_path_for_sym(
-            &dumpable.get_name(),
+            dumpable.get_name(),
             dumpable.get_debug_id(),
         ))
     });
@@ -173,29 +179,27 @@
 
 fn get_from_id(
     config: &Config,
-    path: &PathBuf,
+    path: &Path,
     filename: String,
 ) -> common::Result<(Vec<u8>, String)> {
-    for id in &[config.debug_id, config.code_id] {
-        if let Some(id) = id {
-            let symbol_server = cache::get_sym_servers(config.symbol_server);
-            let (buf, filename) = cache::search_file(filename, id, symbol_server.as_ref());
-            return if let Some(buf) = buf {
-                Ok((buf, filename))
-            } else {
-                Err(format!("Impossible to get file {} with id {}", filename, id).into())
-            };
-        }
+    if let Some(id) = config.debug_id.or(config.code_id) {
+        let symbol_server = cache::get_sym_servers(config.symbol_server);
+        let (buf, filename) = cache::search_file(filename, id, symbol_server.as_ref());
+        return if let Some(buf) = buf {
+            Ok((buf, filename))
+        } else {
+            Err(format!("Impossible to get file {} with id {}", filename, id).into())
+        };
     }
 
     Ok((utils::read_file(&path), filename))
 }
 
 pub(crate) fn single_file(config: &Config, filename: &str) -> common::Result<()> {
-    let path = PathBuf::from(filename);
-    let filename = utils::get_filename(&path);
+    let path = Path::new(filename);
+    let filename = utils::get_filename(path);
 
-    let (buf, filename) = get_from_id(config, &path, filename)?;
+    let (buf, filename) = get_from_id(config, path, filename)?;
     let file_mapping = PathMappings::new(
         &config.mapping_var,
         &config.mapping_src,
@@ -209,28 +213,32 @@
         FileType::Elf => store(
             config.output,
             config.store,
-            ElfInfo::get_dbg(arch, &buf, &path, &filename, file_mapping)?,
+            config.check_cfi,
+            ElfInfo::get_dbg(arch, &buf, path, &filename, file_mapping)?,
         ),
         FileType::Pdb => store(
             config.output,
             config.store,
-            PDBInfo::get_dbg(arch, &buf, &path, &filename, file_mapping)?,
+            config.check_cfi,
+            PDBInfo::get_dbg(arch, &buf, path, &filename, file_mapping)?,
         ),
         FileType::Pe => {
-            if let Ok(pdb_info) = PDBInfo::get_pe(config, &buf, &path, &filename, file_mapping) {
-                store(config.output, config.store, pdb_info)
+            if let Ok(pdb_info) = PDBInfo::get_pe(config, &buf, path, &filename, file_mapping) {
+                store(config.output, config.store, config.check_cfi, pdb_info)
             } else {
                 store(
                     config.output,
                     config.store,
-                    PEInfo::get_pe(config, &buf, &path, &filename, None)?,
+                    config.check_cfi,
+                    PEInfo::get_pe(config, &buf, path, &filename, None)?,
                 )
             }
         }
         FileType::Macho => store(
             config.output,
             config.store,
-            MachoInfo::get_dbg(arch, &buf, &path, &filename, file_mapping)?,
+            config.check_cfi,
+            MachoInfo::get_dbg(arch, &buf, path, &filename, file_mapping)?,
         ),
         FileType::Unknown => Err("Unknown file format".into()),
     }
@@ -253,10 +261,11 @@
     num_threads: usize,
     output: &str,
     store: &Option<String>,
+    check_cfi: bool,
 ) -> common::Result<()> {
     if results.len() == 1 {
         let (_, d) = results.drain().take(1).next().unwrap();
-        self::store(&output, store.as_ref(), d)?;
+        self::store(&output, store.as_ref(), check_cfi, d)?;
     } else {
         for (_, d) in results.drain() {
             sender
@@ -290,6 +299,7 @@
     num_threads: usize,
     output: String,
     store: Option<String>,
+    check_cfi: bool,
 ) -> common::Result<()> {
     while let Ok(job) = receiver.recv() {
         if job.is_none() {
@@ -323,7 +333,7 @@
             JobType::Dump(d) => {
                 let cwd = ".".to_string();
                 let store = Some(store.as_ref().unwrap_or(&cwd));
-                self::store(&output, store.as_ref(), d)?;
+                self::store(&output, store.as_ref(), check_cfi, d)?;
                 continue;
             }
         }
@@ -332,7 +342,14 @@
             // it was the last file: so we just have to add jobs to dump & store
             // and then poison the queue
             let mut results = results.lock().unwrap();
-            send_store_jobs(&sender, &mut results, num_threads, &output, &store)?;
+            send_store_jobs(
+                &sender,
+                &mut results,
+                num_threads,
+                &output,
+                &store,
+                check_cfi,
+            )?;
         } else {
             counter.fetch_sub(1, Ordering::SeqCst);
         }
@@ -367,12 +384,13 @@
         let counter = Arc::clone(&counter);
         let output = config.output.to_string();
         let store = config.store.map(|s| s.to_string());
+        let check_cfi = config.check_cfi;
 
         let t = thread::Builder::new()
             .name(format!("dump-syms {}", i))
             .spawn(move || {
                 consumer::<T>(
-                    arch, sender, receiver, results, counter, num_jobs, output, store,
+                    arch, sender, receiver, results, counter, num_jobs, output, store, check_cfi,
                 )
             })
             .unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/linux/elf.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/linux/elf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/linux/elf.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/linux/elf.rs	2021-12-09 12:01:23.000000000 +0000
@@ -16,7 +16,7 @@
 use symbolic::minidump::cfi::AsciiCfiWriter;
 
 use super::source::{SourceFiles, SourceMap};
-use super::symbol::{ElfSymbol, ElfSymbols};
+use super::symbol::{ContainsSymbol, ElfSymbol, ElfSymbols};
 use crate::common::{self, Dumpable, LineFinalizer, Mergeable};
 use crate::line::Lines;
 use crate::mapping::PathMappings;
@@ -203,7 +203,7 @@
         }
         println!("{}Inlinees:", level);
         for f in fun.inlinees.iter() {
-            Self::debug_function(&f, "  ".to_string() + &level);
+            Self::debug_function(f, "  ".to_string() + &level);
         }
         println!();
     }
@@ -281,6 +281,7 @@
                 name: Self::demangle(&fun.name),
                 is_public: false,
                 is_multiple: false,
+                is_synthetic: false,
                 rva: fun.address as u32,
                 len: fun.size as u32,
                 parameter_size: 0,
@@ -317,6 +318,10 @@
 
     fn collect_publics(&mut self, o: &Object) {
         for sym in o.symbols() {
+            if self.syms.is_inside_symbol(sym.address as u32) {
+                continue;
+            }
+
             match self.syms.entry(sym.address as u32) {
                 btree_map::Entry::Occupied(_) => {}
                 btree_map::Entry::Vacant(e) => {
@@ -328,6 +333,7 @@
                         name: sym_name,
                         is_public: true,
                         is_multiple: false,
+                        is_synthetic: false,
                         rva: sym.address as u32,
                         len: sym.size as u32,
                         parameter_size: 0,
@@ -358,7 +364,7 @@
         platform: Platform,
         mapping: Option<Arc<PathMappings>>,
     ) -> common::Result<Self> {
-        let o = Object::parse(&buf).map_err(|e| e.compat())?;
+        let o = Object::parse(buf).map_err(|e| e.compat())?;
         Self::from_object(&o, file_name, platform, mapping)
     }
 
@@ -379,11 +385,12 @@
             Type::Stripped
         };
 
-        collector.collect_functions(&o, &mut source)?;
-        collector.collect_publics(&o);
+        collector.collect_functions(o, &mut source)?;
+        collector.collect_publics(o);
 
-        let stack = Collector::get_stack_info(&o);
-        let symbols = crate::linux::symbol::append_dummy_symbol(collector.syms, file_name);
+        let stack = Collector::get_stack_info(o);
+        let symbols =
+            crate::linux::symbol::add_executable_section_symbols(collector.syms, file_name, o);
 
         Ok(Self {
             symbols,
@@ -433,19 +440,24 @@
         for (addr, sym) in right.symbols.iter_mut() {
             if sym.is_public {
                 // No line info so just put the sym in the map
-
-                // Check that the symbol isn't inside another one (it happens sometimes IRL)
-                let last = left.symbols.range(0..*addr).next_back();
-                if let Some(last) = last {
-                    if *addr < last.1.rva + last.1.len {
-                        continue;
-                    }
+                if left.symbols.is_inside_symbol(*addr) {
+                    continue;
                 }
 
                 match left.symbols.entry(*addr) {
                     btree_map::Entry::Occupied(mut e) => {
-                        // we already have one so just discard this one
-                        e.get_mut().is_multiple = true;
+                        if sym.is_synthetic {
+                            // Do not replace an existing symbol with a synthetic one
+                            continue;
+                        }
+
+                        if e.get().is_synthetic {
+                            // Always replace a synthetic symbol
+                            e.insert(sym.clone());
+                        } else if e.get().name != sym.name {
+                            // We already have one so just discard this one
+                            e.get_mut().is_multiple = true;
+                        }
                     }
                     btree_map::Entry::Vacant(e) => {
                         e.insert(sym.clone());
@@ -498,4 +510,8 @@
     fn get_name(&self) -> &str {
         &self.file_name
     }
+
+    fn has_stack(&self) -> bool {
+        !self.stack.is_empty()
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/linux/symbol.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/linux/symbol.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/linux/symbol.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/linux/symbol.rs	2021-12-09 12:01:23.000000000 +0000
@@ -5,6 +5,8 @@
 
 use std::collections::BTreeMap;
 use std::fmt::{Display, Formatter};
+use std::ops::Bound::{Excluded, Included};
+use symbolic::debuginfo::Object;
 
 use crate::line::Lines;
 
@@ -13,6 +15,7 @@
     pub name: String,
     pub is_public: bool,
     pub is_multiple: bool,
+    pub is_synthetic: bool,
     pub rva: u32,
     pub len: u32,
     pub parameter_size: u32,
@@ -21,6 +24,17 @@
 
 pub(super) type ElfSymbols = BTreeMap<u32, ElfSymbol>;
 
+pub trait ContainsSymbol {
+    fn is_inside_symbol(&self, rva: u32) -> bool;
+}
+
+impl ContainsSymbol for ElfSymbols {
+    fn is_inside_symbol(&self, rva: u32) -> bool {
+        let last = self.range((Included(0), Excluded(rva))).next_back();
+        last.map_or(false, |last| rva < (last.1.rva + last.1.len))
+    }
+}
+
 impl Display for ElfSymbol {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
         if self.is_public {
@@ -60,33 +74,32 @@
     }
 }
 
-pub(super) fn append_dummy_symbol(mut syms: ElfSymbols, name: &str) -> ElfSymbols {
-    let (rva, len) = if let Some((_, last_sym)) = syms.iter().next_back() {
-        (last_sym.rva, last_sym.len)
-    } else {
-        return syms;
-    };
-
-    let rva = if len == 0 { rva + len + 1 } else { rva + len };
-
-    let name = if name.is_empty() {
-        String::from("<unknown>")
-    } else {
-        format!("<unknown in {}>", name)
-    };
-
-    syms.insert(
-        rva,
-        ElfSymbol {
-            name,
-            is_public: true,
-            is_multiple: false,
-            rva,
-            len: 0,
-            parameter_size: 0,
-            source: Lines::new(),
-        },
-    );
+pub(super) fn add_executable_section_symbols(
+    mut syms: ElfSymbols,
+    name: &str,
+    object: &Object,
+) -> ElfSymbols {
+    let object = goblin::Object::parse(object.data());
+    if let Ok(goblin::Object::Elf(elf)) = object {
+        for header in elf.section_headers {
+            if header.is_executable() {
+                let name = if name.is_empty() { "unknown" } else { name };
+                let section_name = elf.shdr_strtab.get_at(header.sh_name).unwrap_or("unknown");
+                let symbol_name = format!("<{} ELF section in {}>", section_name, name);
+                let rva = header.sh_addr as u32;
+                syms.entry(rva).or_insert(ElfSymbol {
+                    name: symbol_name,
+                    is_public: true,
+                    is_multiple: false,
+                    is_synthetic: true,
+                    rva,
+                    len: 0,
+                    parameter_size: 0,
+                    source: Lines::new(),
+                });
+            }
+        }
+    }
 
     syms
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/mac/macho.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/mac/macho.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/mac/macho.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/mac/macho.rs	2021-12-09 12:01:23.000000000 +0000
@@ -92,10 +92,14 @@
     }
 
     fn get_debug_id(&self) -> &str {
-        &self.elf.get_debug_id()
+        self.elf.get_debug_id()
     }
 
     fn get_name(&self) -> &str {
-        &self.elf.get_name()
+        self.elf.get_name()
+    }
+
+    fn has_stack(&self) -> bool {
+        self.elf.has_stack()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/main.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/main.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/main.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/main.rs	2021-12-09 12:01:23.000000000 +0000
@@ -16,7 +16,7 @@
 
 use clap::{crate_authors, crate_version, App, Arg};
 use log::error;
-use simplelog::{Config, LevelFilter, TermLogger, TerminalMode};
+use simplelog::{ColorChoice, ConfigBuilder, LevelFilter, TermLogger, TerminalMode};
 use std::ops::Deref;
 use std::panic;
 
@@ -72,6 +72,11 @@
                 .takes_value(true),
         )
         .arg(
+            Arg::with_name("check_cfi")
+                .help("Fail if there are no CFI data")
+                .long("check-cfi")
+        )
+        .arg(
             Arg::with_name("verbose")
                 .help("Set the level of verbosity (off, error (default), warn, info, debug, trace)")
                 .long("verbose")
@@ -147,7 +152,14 @@
     };
 
     // Init the logger
-    let _ = TermLogger::init(verbosity, Config::default(), TerminalMode::Stderr);
+    let mut config = ConfigBuilder::new();
+    config.set_time_to_local(true);
+    let _ = TermLogger::init(
+        verbosity,
+        config.build(),
+        TerminalMode::Stderr,
+        ColorChoice::Auto,
+    );
 
     // Set a panic hook to redirect to the logger
     panic::set_hook(Box::new(|panic_info| {
@@ -176,6 +188,7 @@
     let debug_id = matches.value_of("debug_id");
     let code_id = matches.value_of("code_id");
     let arch = matches.value_of("arch").unwrap();
+    let check_cfi = matches.is_present("check_cfi");
     let mapping_var = matches
         .values_of("mapping_var")
         .map(|v| v.collect::<Vec<_>>());
@@ -193,7 +206,7 @@
     };
     let typ = matches.value_of("type").unwrap();
     let file_type = if filenames.len() >= 2 {
-        if typ == "" {
+        if typ.is_empty() {
             eprintln!(
                 "Since there are several files to dump, the type must be specified with --type"
             );
@@ -224,6 +237,7 @@
             arch,
             file_type,
             num_jobs,
+            check_cfi,
             mapping_var,
             mapping_src,
             mapping_dest,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/mapping.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/mapping.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/mapping.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/mapping.rs	2021-12-09 12:01:23.000000000 +0000
@@ -165,7 +165,7 @@
                             buf.extend_from_slice(val.as_bytes());
                         }
                         ActionKind::Digest(uppercase) => {
-                            buf.extend_from_slice(&get_digest(file, uppercase)?.as_bytes());
+                            buf.extend_from_slice(get_digest(file, uppercase)?.as_bytes());
                         }
                         ActionKind::None => {}
                     }
@@ -309,11 +309,7 @@
         };
 
         #[cfg(windows)]
-        let file_str = if file_str.starts_with(r"\\?\") {
-            &file_str[r"\\?\".len()..]
-        } else {
-            file_str
-        };
+        let file_str = file_str.strip_prefix(r"\\?\").unwrap_or(file_str);
 
         {
             let cache = self.cache.lock().unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/utils.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/utils.rs	2021-12-09 12:01:23.000000000 +0000
@@ -113,10 +113,7 @@
     }
 }
 
-fn get_cabinet_files<'a>(
-    cab: &'a Cabinet<Cursor<&Vec<u8>>>,
-    path: PathBuf,
-) -> Option<(String, usize)> {
+fn get_cabinet_files(cab: &Cabinet<Cursor<&Vec<u8>>>, path: PathBuf) -> Option<(String, usize)> {
     // Try to find in the cabinet the same path with pdb extension
     let path = get_corrected_path(path);
     let file_name = path.file_name().unwrap();
@@ -173,7 +170,7 @@
     ret
 }
 
-pub fn get_filename(path: &PathBuf) -> String {
+pub fn get_filename(path: &Path) -> String {
     path.file_name().unwrap().to_str().unwrap().to_string()
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/pdb.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/pdb.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/pdb.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/pdb.rs	2021-12-09 12:01:23.000000000 +0000
@@ -26,13 +26,13 @@
 use crate::mapping::PathMappings;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
-enum CPU {
+enum Cpu {
     X86,
     X86_64,
     Unknown,
 }
 
-impl CPU {
+impl Cpu {
     fn get_ptr_size(self) -> u32 {
         match self {
             Self::X86 => 4,
@@ -41,22 +41,22 @@
     }
 }
 
-impl Display for CPU {
+impl Display for Cpu {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
         write!(
             f,
             "{}",
             match self {
-                CPU::X86 => "x86",
-                CPU::X86_64 => "x86_64",
-                CPU::Unknown => "unknown",
+                Cpu::X86 => "x86",
+                Cpu::X86_64 => "x86_64",
+                Cpu::Unknown => "unknown",
             }
         )
     }
 }
 
-const IMAGE_SCN_CNT_CODE: u32 = 0x00_000_020;
-const IMAGE_SCN_MEM_EXECUTE: u32 = 0x20_000_000;
+const IMAGE_SCN_CNT_CODE: u32 = 0x0000_0020;
+const IMAGE_SCN_MEM_EXECUTE: u32 = 0x2000_0000;
 
 #[derive(Debug)]
 pub(super) struct PDBSections {
@@ -145,7 +145,7 @@
 }
 
 struct Collector {
-    cpu: CPU,
+    cpu: Cpu,
     symbols: RvaSymbols,
     pdb_sections: PDBSections,
     pdb_contributions: PDBContributions,
@@ -166,18 +166,18 @@
         symbol: ProcedureSymbol,
         info: BlockInfo,
         lines: &SourceLineCollector,
-    ) -> Result<()> {
-        self.symbols.add_procedure_symbol(lines, symbol, info)
+    ) {
+        self.symbols.add_procedure_symbol(lines, symbol, info);
     }
 
-    fn add_symbol(&mut self, symbol: SelectedSymbol, info: BlockInfo) -> Result<()> {
-        self.symbols.add_symbol(symbol, info)
+    fn add_symbol(&mut self, symbol: SelectedSymbol, info: BlockInfo) {
+        self.symbols.add_symbol(symbol, info);
     }
 
     fn add_reg_rel(&mut self, symbol: RegisterRelativeSymbol) {
         // TODO: check that's the correct way to know if we've a parameter here
         // 22 comes from https://github.com/microsoft/microsoft-pdb/blob/master/include/cvconst.h#L436
-        if self.cpu == CPU::X86 && symbol.register == Register(22 /* EBP */) && symbol.offset > 0 {
+        if self.cpu == Cpu::X86 && symbol.register == Register(22 /* EBP */) && symbol.offset > 0 {
             self.symbols.add_ebp(symbol);
         }
     }
@@ -194,7 +194,7 @@
 pub(crate) struct PDBInfo {
     symbols: PDBSymbols,
     files: Vec<String>,
-    cpu: CPU,
+    cpu: Cpu,
     debug_id: String,
     pdb_name: String,
     pe_name: String,
@@ -228,18 +228,18 @@
     }
 }
 
-fn get_cpu(dbi: &DebugInformation) -> CPU {
+fn get_cpu(dbi: &DebugInformation) -> Cpu {
     if let Ok(mt) = dbi.machine_type() {
         match mt {
             // Currently breakpad code only uses these machine types
             // but we've more possibilities:
             // https://docs.rs/pdb/0.5.0/pdb/enum.MachineType.html
-            MachineType::X86 => CPU::X86,
-            MachineType::Amd64 | MachineType::Ia64 => CPU::X86_64,
-            _ => CPU::Unknown,
+            MachineType::X86 => Cpu::X86,
+            MachineType::Amd64 | MachineType::Ia64 => Cpu::X86_64,
+            _ => Cpu::Unknown,
         }
     } else {
-        CPU::Unknown
+        Cpu::Unknown
     }
 }
 
@@ -269,7 +269,7 @@
 
     if !found_unwind_info {
         if let Some(pdb_buf) = pdb_buf {
-            if let Ok(pdb) = PdbObject::parse(&pdb_buf) {
+            if let Ok(pdb) = PdbObject::parse(pdb_buf) {
                 if pdb.has_unwind_info() {
                     cfi_writer
                         .process(&Object::Pdb(pdb))
@@ -353,7 +353,7 @@
                     len: block.len,
                 },
                 lines,
-            )?;
+            );
         }
 
         Ok(())
@@ -364,25 +364,25 @@
         block: SeparatedCodeSymbol,
         collector: &mut Collector,
         lines: &SourceLineCollector,
-    ) -> Result<()> {
+    ) {
         // We can see some sepcode syms in ntdll.dll
         // As far as I understand, they're pieces of code moved at compilation time.
         // According to some functions signatures these piece of code can be just
         // exception filter and exception handling
         let block_rva = match block.offset.to_rva(&self.address_map) {
             Some(rva) => rva,
-            _ => return Ok(()),
+            _ => return,
         };
 
         let parent_rva = match block.parent_offset.to_rva(&self.address_map) {
             Some(rva) => rva,
-            _ => return Ok(()),
+            _ => return,
         };
 
         if let Some(parent) = collector.get_symbol_at(parent_rva.0) {
             if block_rva < parent_rva || block_rva > parent_rva + parent.len {
                 // So the block is outside of its parent procedure
-                let source = lines.collect_source_lines(block.offset, block.len)?;
+                let source = lines.collect_source_lines(block.offset, block.len);
                 let sym = SelectedSymbol {
                     name: parent.name.clone(),
                     type_index: parent.type_index,
@@ -403,11 +403,9 @@
                         offset: block.offset,
                         len: block.len,
                     },
-                )?;
+                );
             }
         }
-
-        Ok(())
     }
 
     fn handle_symbol(
@@ -432,13 +430,13 @@
                         len: procedure.len,
                     },
                     lines,
-                )?;
+                );
             }
             SymbolData::Block(block) => {
-                self.add_block(&module_info, block, collector, lines)?;
+                self.add_block(module_info, block, collector, lines)?;
             }
             SymbolData::SeparatedCode(block) => {
-                self.add_sepcode(block, collector, lines)?;
+                self.add_sepcode(block, collector, lines);
             }
             SymbolData::RegisterRelative(regrel) => {
                 collector.add_reg_rel(regrel);
@@ -471,7 +469,7 @@
 
             let lines = SourceLineCollector::new(
                 &self.address_map,
-                &source_files,
+                source_files,
                 module_info.line_program()?,
             )?;
 
@@ -529,13 +527,11 @@
         // Demangler or dumper (for type info we've for private symbols)
         let type_dumper = TypeDumper::new(&type_info, cpu.get_ptr_size(), DumperFlags::default())?;
 
-        let code_id = if let Some(pe) = pe.as_ref() {
-            Some(pe.code_id().unwrap().as_str().to_uppercase())
-        } else {
-            None
-        };
+        let code_id = pe
+            .as_ref()
+            .map(|pe| pe.code_id().unwrap().as_str().to_uppercase());
 
-        let stack = get_stack_info(Some(&buf), pe);
+        let stack = get_stack_info(Some(buf), pe);
         let symbols =
             collector
                 .symbols
@@ -581,6 +577,10 @@
     fn get_name(&self) -> &str {
         &self.pdb_name
     }
+
+    fn has_stack(&self) -> bool {
+        !self.stack.is_empty()
+    }
 }
 
 impl Mergeable for PDBInfo {
@@ -591,7 +591,7 @@
 
 pub(crate) struct PEInfo {
     symbols: PDBSymbols,
-    cpu: CPU,
+    cpu: Cpu,
     debug_id: String,
     pdb_name: String,
     pe_name: String,
@@ -624,12 +624,12 @@
 impl PEInfo {
     pub fn new(pe_name: &str, pe: PeObject) -> Result<Self> {
         let cpu = match pe.arch() {
-            Arch::X86 => CPU::X86,
-            Arch::X86Unknown => CPU::X86,
-            Arch::Amd64 => CPU::X86_64,
-            Arch::Amd64h => CPU::X86_64,
-            Arch::Amd64Unknown => CPU::X86_64,
-            _ => CPU::Unknown,
+            Arch::X86 => Cpu::X86,
+            Arch::X86Unknown => Cpu::X86,
+            Arch::Amd64 => Cpu::X86_64,
+            Arch::Amd64h => Cpu::X86_64,
+            Arch::Amd64Unknown => Cpu::X86_64,
+            _ => Cpu::Unknown,
         };
         let pdb_name = pe.debug_file_name().unwrap_or_default().to_string();
         let pdb_name = PEInfo::file_name_only(&pdb_name).to_string();
@@ -672,8 +672,16 @@
     }
 
     fn get_name(&self) -> &str {
+        if self.pdb_name.is_empty() {
+            return &self.pe_name;
+        }
+
         &self.pdb_name
     }
+
+    fn has_stack(&self) -> bool {
+        !self.stack.is_empty()
+    }
 }
 
 impl Mergeable for PEInfo {
@@ -801,7 +809,7 @@
         let mut res: Vec<BreakpadLineRecord> = Vec::new();
         func.lines().for_each(|l| {
             let line = l.unwrap();
-            if line.line >= 0xf00_000 {
+            if line.line >= 0x00f0_0000 {
                 res.last_mut().unwrap().size += line.size
             } else {
                 res.push(line);
@@ -857,13 +865,11 @@
                 .map(|(a, n, o)| format!("At 0x{:x}: new {}, old: {}", a, n, o))
                 .collect();
             panic!(
-                format!(
-                    "Not the same number of FUNC (new: {}, old: {}):\n - Diff keys: {:?}\n - Diff values: {:?}",
-                    func_new.len(),
-                    func_old.len(),
-                    diff,
-                    values,
-                )
+                "Not the same number of FUNC (new: {}, old: {}):\n - Diff keys: {:?}\n - Diff values: {:?}",
+                func_new.len(),
+                func_old.len(),
+                diff,
+                values,
             );
         }
     }
@@ -923,7 +929,7 @@
 
         // TODO: find a way to compare function names
 
-        let line_old = clean_old_lines(&old);
+        let line_old = clean_old_lines(old);
         let line_new = new.lines();
 
         assert_eq!(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/source.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/source.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/source.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/source.rs	2021-12-09 12:01:23.000000000 +0000
@@ -55,14 +55,10 @@
         })
     }
 
-    pub(super) fn collect_source_lines(
-        &self,
-        offset: PdbInternalSectionOffset,
-        len: u32,
-    ) -> Result<Lines> {
+    pub(super) fn collect_source_lines(&self, offset: PdbInternalSectionOffset, len: u32) -> Lines {
         let mut source_lines = Lines::new();
         if self.lines.is_empty() {
-            return Ok(source_lines);
+            return source_lines;
         }
 
         let start = (offset.section, offset.offset);
@@ -71,7 +67,7 @@
         let mut last_file_id = 0;
 
         for (_, line) in self.lines.range((Included(&start), Excluded(&end))) {
-            let rva = line.offset.to_internal_rva(&self.address_map).unwrap();
+            let rva = line.offset.to_internal_rva(self.address_map).unwrap();
             if last_file_index != line.file_index {
                 let file = self.line_program.get_file_info(line.file_index).unwrap();
                 last_file_index = line.file_index;
@@ -80,7 +76,7 @@
             source_lines.add_line(rva.0, line.line_start, last_file_id);
         }
 
-        Ok(source_lines)
+        source_lines
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/symbol.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/symbol.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/symbol.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/symbol.rs	2021-12-09 12:01:23.000000000 +0000
@@ -6,7 +6,7 @@
 use hashbrown::{hash_map, HashMap};
 use pdb::{
     AddressMap, FrameTable, PdbInternalRva, PdbInternalSectionOffset, ProcedureSymbol,
-    PublicSymbol, RegisterRelativeSymbol, Result, TypeIndex,
+    PublicSymbol, RegisterRelativeSymbol, TypeIndex,
 };
 use std::collections::BTreeMap;
 use std::fmt::{Display, Formatter};
@@ -130,7 +130,7 @@
             return 0;
         }
 
-        let internal_rva = self.offset.to_internal_rva(&address_map).unwrap();
+        let internal_rva = self.offset.to_internal_rva(address_map).unwrap();
         let mut frames = frame_table.iter_at_rva(internal_rva);
         if let Ok(frame) = frames.next() {
             if let Some(frame) =  frame {
@@ -168,7 +168,7 @@
         function: ProcedureSymbol,
         block_info: BlockInfo,
         line_collector: &SourceLineCollector,
-    ) -> Result<()> {
+    ) {
         self.is_multiple = true;
 
         // TODO: this is legacy code
@@ -180,10 +180,8 @@
             self.type_index = function.type_index;
             self.offset = block_info.offset;
             self.len = block_info.len;
-            self.source = line_collector.collect_source_lines(block_info.offset, block_info.len)?;
+            self.source = line_collector.collect_source_lines(block_info.offset, block_info.len);
         }
-
-        Ok(())
     }
 
     pub(super) fn update_public(&mut self, symbol: PublicSymbol) {
@@ -266,16 +264,16 @@
         line_collector: &SourceLineCollector,
         function: ProcedureSymbol,
         block_info: BlockInfo,
-    ) -> Result<()> {
+    ) {
         // Since several symbols may have the same rva (because they've the same disassembly code)
         // we need to "select" the a symbol for a rva.
         // Anyway it could lead to strange backtraces.
 
         let fun_name = function.name.to_string().into_owned();
         if let Some(selected) = self.map.get_mut(&block_info.rva) {
-            selected.update_private(function, block_info, line_collector)?;
+            selected.update_private(function, block_info, line_collector);
         } else {
-            let source = line_collector.collect_source_lines(block_info.offset, block_info.len)?;
+            let source = line_collector.collect_source_lines(block_info.offset, block_info.len);
             self.rva = block_info.rva;
             self.symbol = Some(SelectedSymbol {
                 name: fun_name,
@@ -292,8 +290,6 @@
             });
             self.last_id += 1;
         }
-
-        Ok(())
     }
 
     fn is_constant_string(name: &str) -> bool {
@@ -363,11 +359,7 @@
         }
     }
 
-    pub(super) fn add_symbol(
-        &mut self,
-        function: SelectedSymbol,
-        block_info: BlockInfo,
-    ) -> Result<()> {
+    pub(super) fn add_symbol(&mut self, function: SelectedSymbol, block_info: BlockInfo) {
         match self.map.entry(block_info.rva) {
             hash_map::Entry::Occupied(selected) => {
                 let selected = selected.into_mut();
@@ -377,8 +369,6 @@
                 e.insert(function);
             }
         }
-
-        Ok(())
     }
 
     pub(super) fn add_ebp(&mut self, ebp: RegisterRelativeSymbol) {
@@ -412,7 +402,7 @@
             if sym.len == 0 {
                 ranges.insert((rva, 0), last);
             } else {
-                let start = offset.to_internal_rva(&address_map).unwrap();
+                let start = offset.to_internal_rva(address_map).unwrap();
                 let end = PdbInternalRva(start.0 + sym.len);
                 for (rva, len) in address_map
                     .rva_ranges(start..end)
@@ -509,101 +499,62 @@
 pub(super) fn symbolic_to_pdb_symbols(
     syms: PeSymbolIterator,
     exception_data: Option<&ExceptionData<'_>>,
-    name: &str,
+    module_name: &str,
 ) -> PDBSymbols {
     let mut pdb_syms = PDBSymbols::default();
-    let sizes = match exception_data {
-        Some(data) => {
-            let mut sizes = HashMap::new();
-            for function in data {
-                if let Ok(function) = function {
-                    if function.end_address <= function.begin_address {
-                        continue;
-                    }
-                    sizes.insert(
-                        function.begin_address,
-                        function.end_address - function.begin_address,
-                    );
-                }
-            }
-            sizes
-        }
-        None => HashMap::new(),
+
+    let module_name = if module_name.is_empty() {
+        String::from("<unknown>")
+    } else {
+        format!("<unknown in {}>", module_name)
+    };
+
+    if let Some(data) = exception_data {
+        data.into_iter()
+            .filter_map(|result| result.ok())
+            .filter(|function| function.end_address > function.begin_address)
+            .for_each(|function| {
+                pdb_syms.insert(
+                    function.begin_address,
+                    PDBSymbol {
+                        name: module_name.clone(),
+                        is_public: false,
+                        is_multiple: false,
+                        rva: function.begin_address,
+                        len: function.end_address - function.begin_address,
+                        parameter_size: 0,
+                        source: Rc::new(Lines::new()),
+                        id: 0,
+                    },
+                );
+            });
     };
 
     for sym in syms {
         if let Some(name) = sym.name() {
-            let demangled_name = TypeDumper::demangle(&name);
+            let demangled_name = TypeDumper::demangle(name);
             let (name, parameter_size) = match demangled_name {
                 FuncName::Undecorated(name) => (name, 0),
                 FuncName::Unknown((name, parameter_size)) => (name, parameter_size),
             };
             let rva = sym.address as u32;
-            let len = *sizes.get(&rva).unwrap_or(&0);
-
-            pdb_syms.insert(
-                rva,
-                PDBSymbol {
+            pdb_syms
+                .entry(rva)
+                .and_modify(|e| {
+                    e.name = name.clone();
+                    e.parameter_size = parameter_size;
+                })
+                .or_insert(PDBSymbol {
                     name,
-                    // if we managed to have a length from CFI info
-                    // then we create a fake FUNC instead of having a
-                    // true PUBLIC.
-                    is_public: len == 0,
-                    is_multiple: false,
-                    rva,
-                    len,
-                    parameter_size,
-                    source: Rc::new(Lines::new()),
-                    id: 0,
-                },
-            );
-        }
-    }
-
-    if pdb_syms.is_empty() {
-        return pdb_syms;
-    }
-
-    let name = if name.is_empty() {
-        String::from("<unknown>")
-    } else {
-        format!("<unknown in {}>", name)
-    };
-
-    // Find the holes and fill them with a dummy symbol
-    let mut iter = pdb_syms.values();
-    let first = iter.next().unwrap();
-    let mut last = if first.len == 0 {
-        None
-    } else {
-        Some(first.rva + first.len)
-    };
-    let mut syms_to_fill_holes = Vec::new();
-    for value in iter {
-        if let Some(last) = last {
-            if last < value.rva {
-                // we've a hole: [last; value.rva[
-                syms_to_fill_holes.push(PDBSymbol {
-                    name: name.clone(),
                     is_public: true,
                     is_multiple: false,
-                    rva: last,
-                    len: value.rva - last,
-                    parameter_size: 0,
+                    rva: sym.address as u32,
+                    len: 0,
+                    parameter_size,
                     source: Rc::new(Lines::new()),
                     id: 0,
                 });
-            }
         }
-        last = if value.len == 0 {
-            None
-        } else {
-            Some(value.rva + value.len)
-        };
-    }
-
-    for sym in syms_to_fill_holes.drain(..) {
-        pdb_syms.insert(sym.rva, sym);
     }
 
     pdb_syms
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/types.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/types.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/types.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/types.rs	2021-12-09 12:01:23.000000000 +0000
@@ -243,6 +243,9 @@
                     PrimitiveKind::F80 => 10,
                     PrimitiveKind::Complex80 => 20,
                     PrimitiveKind::Complex128 => 32,
+                    _ => {
+                        panic!("Unsupported primitive type {:?}", t.kind);
+                    }
                 }
             }
             TypeData::Class(t) => self.get_class_size(t),
@@ -520,12 +523,11 @@
     }
 
     fn dump_ptr(&self, ptr: PointerType, is_const: bool) -> Result<String> {
-        let mut attributes = Vec::new();
-        attributes.push(PtrAttributes {
+        let mut attributes = vec![PtrAttributes {
             is_pointer_const: ptr.attributes.is_const() || is_const,
             is_pointee_const: false,
             mode: ptr.attributes.pointer_mode(),
-        });
+        }];
         let mut ptr = ptr;
         loop {
             let typ = self.find(ptr.underlying_type)?;
@@ -697,6 +699,9 @@
             PrimitiveKind::Bool32 => "bool32_t",
             PrimitiveKind::Bool64 => "bool64_t",
             PrimitiveKind::HRESULT => "HRESULT",
+            _ => {
+                panic!("Unsupported primitive type {:?}", prim.kind);
+            }
         };
 
         if prim.indirection.is_some() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/src/windows/utils.rs	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/src/windows/utils.rs	2021-12-09 12:01:23.000000000 +0000
@@ -3,7 +3,8 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
-use std::path::PathBuf;
+use log::warn;
+use std::path::Path;
 use symbolic::debuginfo::pe::PeObject;
 use uuid::Uuid;
 
@@ -11,7 +12,7 @@
 use crate::utils;
 use crate::windows::pdb::PDBInfo;
 
-fn try_to_find_pdb(path: &PathBuf, pdb_filename: &str) -> Option<Vec<u8>> {
+fn try_to_find_pdb(path: &Path, pdb_filename: &str) -> Option<Vec<u8>> {
     // Just check that the file is in the same directory as the PE one
     let pdb = path.with_file_name(pdb_filename);
     let mut pdb_cab = pdb.clone();
@@ -33,45 +34,46 @@
     None
 }
 
-fn os_specific_try_to_find_pdb(path: &PathBuf, pdb_filename: String) -> (Option<Vec<u8>>, String) {
+fn os_specific_try_to_find_pdb(path: &Path, pdb_filename: &str) -> (Option<Vec<u8>>, String) {
     // We may have gotten either an OS native path, or a Windows path.
     // On Windows, they're both the same. On Unix, they are different, and in that case,
     // we change backslashes to forward slashes for `file_name()` to do its job.
     // But before that, just try wether the file exists.
     #[cfg(unix)]
     let pdb_filename = pdb_filename.replace("\\", "/");
-    let pdb_path = PathBuf::from(&pdb_filename);
-    let pdb_name = pdb_path.file_name().unwrap().to_str().unwrap().to_string();
-
-    if pdb_path.is_file() {
-        (Some(utils::read_file(pdb_path)), pdb_name)
+    let pdb_path = Path::new(&pdb_filename);
+    if let Some(file_name) = pdb_path.file_name() {
+        let pdb_name = file_name.to_str().unwrap().to_string();
+        if pdb_path.is_file() {
+            (Some(utils::read_file(pdb_path)), pdb_name)
+        } else {
+            (try_to_find_pdb(path, &pdb_name), pdb_name)
+        }
     } else {
-        (try_to_find_pdb(path, &pdb_name), pdb_name)
+        (None, "".to_string())
     }
 }
 
 pub fn get_pe_pdb_buf<'a>(
-    path: &PathBuf,
+    path: &Path,
     buf: &'a [u8],
     symbol_server: Option<&Vec<SymbolServer>>,
 ) -> Option<(PeObject<'a>, Vec<u8>, String)> {
-    let pe = PeObject::parse(&buf)
+    let pe = PeObject::parse(buf)
         .unwrap_or_else(|_| panic!("Unable to parse the PE file {}", path.to_str().unwrap()));
     if let Some(pdb_filename) = pe.debug_file_name() {
         let pdb_filename = pdb_filename.into_owned();
-        let (pdb, pdb_name) = os_specific_try_to_find_pdb(path, pdb_filename);
-
-        if let Some(pdb_buf) = pdb {
+        let (pdb, pdb_name) = os_specific_try_to_find_pdb(path, &pdb_filename);
+        if pdb_name.is_empty() {
+            warn!("Invalid pdb filename in PE file: \"{}\"", pdb_filename);
+            None
+        } else if let Some(pdb_buf) = pdb {
             Some((pe, pdb_buf, pdb_name))
         } else {
             // Not here so try symbol server (or cache)
             let debug_id = get_pe_debug_id(Some(&pe)).unwrap();
             let (pdb, pdb_name) = cache::search_file(pdb_name, &debug_id, symbol_server);
-            if let Some(pdb_buf) = pdb {
-                Some((pe, pdb_buf, pdb_name))
-            } else {
-                None
-            }
+            pdb.map(|pdb_buf| (pe, pdb_buf, pdb_name))
         }
     } else {
         None
@@ -98,9 +100,9 @@
     }
 }
 
-pub(crate) fn try_to_set_pe(path: &PathBuf, pdb_info: &mut PDBInfo, pdb_buf: &[u8]) {
+pub(crate) fn try_to_set_pe(path: &Path, pdb_info: &mut PDBInfo, pdb_buf: &[u8]) {
     // Just check that the file is in the same directory as the PDB one
-    let mut path = path.clone();
+    let mut path = path.to_path_buf();
     for ext in vec!["dll", "dl_", "exe", "ex_"].drain(..) {
         path.set_extension(ext);
         if path.is_file() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/test_data/linux/basic.dbg.sym thunderbird-91.4.0+build2/third_party/dump_syms/test_data/linux/basic.dbg.sym
--- thunderbird-91.3.2+build1/third_party/dump_syms/test_data/linux/basic.dbg.sym	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/test_data/linux/basic.dbg.sym	2021-12-09 12:01:23.000000000 +0000
@@ -0,0 +1,89 @@
+MODULE Linux x86_64 20AD60B0B4C68177552708AA192E77390 basic.full
+INFO CODE_ID B060AD20C6B47781552708AA192E7739FAC7C84A
+FILE 0 /home/calixte/dev/mozilla/dump_syms.calixteman/test_data/linux/basic.cpp
+PUBLIC 1000 0 _init
+PUBLIC 1020 0 <.plt ELF section in basic.dbg>
+PUBLIC 1030 0 <.plt.got ELF section in basic.dbg>
+PUBLIC 1040 0 _start
+PUBLIC 1070 0 deregister_tm_clones
+PUBLIC 10a0 0 register_tm_clones
+PUBLIC 10e0 0 __do_global_dtors_aux
+PUBLIC 1120 0 frame_dummy
+FUNC 1125 26 0 inline_1(int)
+1125 7 2 0
+112c 9 3 0
+1135 11 4 0
+1146 3 5 0
+1149 2 6 0
+FUNC 114b 2c 0 inline_2(int)
+114b d 9 0
+1158 1d 10 0
+1175 2 11 0
+FUNC 1177 33 0 inline_3(int)
+1177 13 14 0
+118a 1e 15 0
+11a8 2 16 0
+FUNC 11aa 3a 0 inline_4(int)
+11aa 19 19 0
+11c3 1f 20 0
+11e2 2 21 0
+FUNC 11e4 d9 0 foo(int)
+11e4 7 24 0
+11eb 9 25 0
+11f4 3d 26 0
+1231 d 27 0
+123e c 28 0
+124a 69 29 0
+12b3 8 31 0
+12bb 2 32 0
+FUNC 12bd 1c 0 main
+12bd f 35 0
+12cc b 36 0
+12d7 2 37 0
+PUBLIC 12e0 0 __libc_csu_init
+PUBLIC 1340 0 __libc_csu_fini
+PUBLIC 1344 0 _fini
+STACK CFI INIT 1040 2b .cfa: $rsp 8 +
+STACK CFI INIT 1020 10 .cfa: $rsp 16 + .ra: .cfa -8 + ^
+STACK CFI 1026 .cfa: $rsp 24 +
+STACK CFI INIT 1030 8 .cfa: $rsp 8 + .ra: .cfa -8 + ^
+STACK CFI INIT 1125 26 .cfa: $rsp 8 + .ra: .cfa -8 + ^
+STACK CFI 1126 .cfa: $rsp 16 + $rbp: .cfa -16 + ^
+STACK CFI 1129 .cfa: $rbp 16 +
+STACK CFI 114a .cfa: $rsp 8 +
+STACK CFI INIT 114b 2c .cfa: $rsp 8 + .ra: .cfa -8 + ^
+STACK CFI 114c .cfa: $rsp 16 + $rbp: .cfa -16 + ^
+STACK CFI 114f .cfa: $rbp 16 +
+STACK CFI 1176 .cfa: $rsp 8 +
+STACK CFI INIT 1177 33 .cfa: $rsp 8 + .ra: .cfa -8 + ^
+STACK CFI 1178 .cfa: $rsp 16 + $rbp: .cfa -16 + ^
+STACK CFI 117b .cfa: $rbp 16 +
+STACK CFI 11a9 .cfa: $rsp 8 +
+STACK CFI INIT 11aa 3a .cfa: $rsp 8 + .ra: .cfa -8 + ^
+STACK CFI 11ab .cfa: $rsp 16 + $rbp: .cfa -16 + ^
+STACK CFI 11ae .cfa: $rbp 16 +
+STACK CFI 11e3 .cfa: $rsp 8 +
+STACK CFI INIT 11e4 d9 .cfa: $rsp 8 + .ra: .cfa -8 + ^
+STACK CFI 11e5 .cfa: $rsp 16 + $rbp: .cfa -16 + ^
+STACK CFI 11e8 .cfa: $rbp 16 +
+STACK CFI 12bc .cfa: $rsp 8 +
+STACK CFI INIT 12bd 1c .cfa: $rsp 8 + .ra: .cfa -8 + ^
+STACK CFI 12be .cfa: $rsp 16 + $rbp: .cfa -16 + ^
+STACK CFI 12c1 .cfa: $rbp 16 +
+STACK CFI 12d8 .cfa: $rsp 8 +
+STACK CFI INIT 12e0 5d .cfa: $rsp 8 + .ra: .cfa -8 + ^
+STACK CFI 12e2 .cfa: $rsp 16 + $r15: .cfa -16 + ^
+STACK CFI 12eb .cfa: $rsp 24 + $r14: .cfa -24 + ^
+STACK CFI 12f0 .cfa: $rsp 32 + $r13: .cfa -32 + ^
+STACK CFI 12f5 .cfa: $rsp 40 + $r12: .cfa -40 + ^
+STACK CFI 12f9 .cfa: $rsp 48 + $rbp: .cfa -48 + ^
+STACK CFI 1301 .cfa: $rsp 56 + $rbx: .cfa -56 + ^
+STACK CFI 1308 .cfa: $rsp 64 +
+STACK CFI 1332 .cfa: $rsp 56 +
+STACK CFI 1333 .cfa: $rsp 48 +
+STACK CFI 1334 .cfa: $rsp 40 +
+STACK CFI 1336 .cfa: $rsp 32 +
+STACK CFI 1338 .cfa: $rsp 24 +
+STACK CFI 133a .cfa: $rsp 16 +
+STACK CFI 133c .cfa: $rsp 8 +
+STACK CFI INIT 1340 1 .cfa: $rsp 8 + .ra: .cfa -8 + ^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/test_data/linux/basic.full.sym thunderbird-91.4.0+build2/third_party/dump_syms/test_data/linux/basic.full.sym
--- thunderbird-91.3.2+build1/third_party/dump_syms/test_data/linux/basic.full.sym	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/test_data/linux/basic.full.sym	2021-12-09 12:01:23.000000000 +0000
@@ -2,6 +2,8 @@
 INFO CODE_ID B060AD20C6B47781552708AA192E7739FAC7C84A
 FILE 0 /home/calixte/dev/mozilla/dump_syms.calixteman/test_data/linux/basic.cpp
 PUBLIC 1000 0 _init
+PUBLIC 1020 0 <.plt ELF section in basic.full>
+PUBLIC 1030 0 <.plt.got ELF section in basic.full>
 PUBLIC 1040 0 _start
 PUBLIC 1070 0 deregister_tm_clones
 PUBLIC 10a0 0 register_tm_clones
@@ -41,7 +43,6 @@
 PUBLIC 12e0 0 __libc_csu_init
 PUBLIC 1340 0 __libc_csu_fini
 PUBLIC 1344 0 _fini
-PUBLIC 1345 0 <unknown in basic.full>
 STACK CFI INIT 1040 2b .cfa: $rsp 8 +
 STACK CFI INIT 1020 10 .cfa: $rsp 16 + .ra: .cfa -8 + ^
 STACK CFI 1026 .cfa: $rsp 24 +
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/test_data/windows/mozwer.sym thunderbird-91.4.0+build2/third_party/dump_syms/test_data/windows/mozwer.sym
--- thunderbird-91.3.2+build1/third_party/dump_syms/test_data/windows/mozwer.sym	2021-11-19 11:57:09.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/test_data/windows/mozwer.sym	2021-12-09 12:01:23.000000000 +0000
@@ -1,11 +1,1554 @@
 MODULE windows x86_64 5A9EC5FA8DE834784C4C44205044422E1 mozwer.pdb
 INFO CODE_ID 5FDB6A2871000 mozwer.dll
 FUNC 1000 94 0 OutOfProcessExceptionEventCallback
-PUBLIC 1094 0 <unknown in mozwer.dll>
 FUNC 10a0 267 0 OutOfProcessExceptionEventSignatureCallback
-PUBLIC 1307 0 <unknown in mozwer.dll>
+FUNC 1310 64 0 <unknown in mozwer.dll>
 PUBLIC 1380 0 OutOfProcessExceptionEventDebuggerLaunchCallback
-PUBLIC 1381 0 <unknown in mozwer.dll>
+FUNC 13c0 21 0 <unknown in mozwer.dll>
+FUNC 13e4 9b 0 <unknown in mozwer.dll>
+FUNC 1480 10e 0 <unknown in mozwer.dll>
+FUNC 1590 13 0 <unknown in mozwer.dll>
+FUNC 15b0 d1 0 <unknown in mozwer.dll>
+FUNC 1684 6d 0 <unknown in mozwer.dll>
+FUNC 16f4 71 0 <unknown in mozwer.dll>
+FUNC 1768 34 0 <unknown in mozwer.dll>
+FUNC 179c 116 0 <unknown in mozwer.dll>
+FUNC 18b4 84 0 <unknown in mozwer.dll>
+FUNC 1940 50 0 <unknown in mozwer.dll>
+FUNC 19b4 131 0 <unknown in mozwer.dll>
+FUNC 1af0 3d 0 <unknown in mozwer.dll>
+FUNC 1b30 ac 0 <unknown in mozwer.dll>
+FUNC 1bdc 6b 0 <unknown in mozwer.dll>
+FUNC 1c64 1b 0 <unknown in mozwer.dll>
+FUNC 1c88 17 0 <unknown in mozwer.dll>
+FUNC 1ca0 3a 0 <unknown in mozwer.dll>
+FUNC 1d08 98 0 <unknown in mozwer.dll>
+FUNC 1da0 39 0 <unknown in mozwer.dll>
+FUNC 1ddc 24 0 <unknown in mozwer.dll>
+FUNC 1e00 49 0 <unknown in mozwer.dll>
+FUNC 1e4c 29 0 <unknown in mozwer.dll>
+FUNC 1e78 8b 0 <unknown in mozwer.dll>
+FUNC 1f04 60 0 <unknown in mozwer.dll>
+FUNC 1f64 15 0 <unknown in mozwer.dll>
+FUNC 1f7c 34 0 <unknown in mozwer.dll>
+FUNC 1fb0 30 0 <unknown in mozwer.dll>
+FUNC 1fe0 14 0 <unknown in mozwer.dll>
+FUNC 1ff4 28 0 <unknown in mozwer.dll>
+FUNC 201c 15 0 <unknown in mozwer.dll>
+FUNC 2034 14 0 <unknown in mozwer.dll>
+FUNC 20dc 3a 0 <unknown in mozwer.dll>
+FUNC 2118 52 0 <unknown in mozwer.dll>
+FUNC 2188 14a 0 <unknown in mozwer.dll>
+FUNC 22e0 5b 0 <unknown in mozwer.dll>
+FUNC 233c 3c 0 <unknown in mozwer.dll>
+FUNC 2378 3c 0 <unknown in mozwer.dll>
+FUNC 244c 3e 0 <unknown in mozwer.dll>
+FUNC 251c 57 0 <unknown in mozwer.dll>
+FUNC 2574 1a1 0 <unknown in mozwer.dll>
+FUNC 2730 20b 0 <unknown in mozwer.dll>
+FUNC 2940 6d 0 <unknown in mozwer.dll>
+FUNC 29b0 a 0 <unknown in mozwer.dll>
+FUNC 29bc a5 0 <unknown in mozwer.dll>
+FUNC 2a68 2f 0 <unknown in mozwer.dll>
+FUNC 2a98 12 0 <unknown in mozwer.dll>
+FUNC 2aac 12 0 <unknown in mozwer.dll>
+FUNC 2ac0 12 0 <unknown in mozwer.dll>
+FUNC 2b00 5b 0 <unknown in mozwer.dll>
+FUNC 2b5c 66 0 <unknown in mozwer.dll>
+FUNC 2bcc 58 0 <unknown in mozwer.dll>
+FUNC 2c28 2a 0 <unknown in mozwer.dll>
+FUNC 2cb4 117 0 <unknown in mozwer.dll>
+FUNC 2e08 1b 0 <unknown in mozwer.dll>
+FUNC 2e24 1b 0 <unknown in mozwer.dll>
+FUNC 2e5c 1b 0 <unknown in mozwer.dll>
+FUNC 2e80 1b 0 <unknown in mozwer.dll>
+FUNC 2ecc 28 0 <unknown in mozwer.dll>
+FUNC 2ef4 19 0 <unknown in mozwer.dll>
+FUNC 2f10 10 0 <unknown in mozwer.dll>
+FUNC 2f20 14 0 <unknown in mozwer.dll>
+FUNC 2f34 12 0 <unknown in mozwer.dll>
+FUNC 2f60 10 0 <unknown in mozwer.dll>
+FUNC 2f80 190 0 <unknown in mozwer.dll>
+FUNC 3130 23 0 <unknown in mozwer.dll>
+FUNC 3180 10 0 <unknown in mozwer.dll>
+FUNC 31b0 3d 0 <unknown in mozwer.dll>
+FUNC 3200 40 0 <unknown in mozwer.dll>
+FUNC 3240 5b 0 <unknown in mozwer.dll>
+FUNC 32b8 35 0 <unknown in mozwer.dll>
+FUNC 32f0 10 0 <unknown in mozwer.dll>
+FUNC 3300 14 0 <unknown in mozwer.dll>
+FUNC 3314 10 0 <unknown in mozwer.dll>
+FUNC 3344 27 0 <unknown in mozwer.dll>
+FUNC 3374 3e 0 <unknown in mozwer.dll>
+FUNC 33b4 6f 0 <unknown in mozwer.dll>
+FUNC 34cc 9b 0 <unknown in mozwer.dll>
+FUNC 358c 1f 0 <unknown in mozwer.dll>
+FUNC 35d0 8b 0 <unknown in mozwer.dll>
+FUNC 365c 8b 0 <unknown in mozwer.dll>
+FUNC 36e8 8b 0 <unknown in mozwer.dll>
+FUNC 377c 6e 0 <unknown in mozwer.dll>
+FUNC 37ec 143 0 <unknown in mozwer.dll>
+FUNC 3938 8b 0 <unknown in mozwer.dll>
+FUNC 39c4 8b 0 <unknown in mozwer.dll>
+FUNC 3a50 8b 0 <unknown in mozwer.dll>
+FUNC 3ae4 63 0 <unknown in mozwer.dll>
+FUNC 3b48 134 0 <unknown in mozwer.dll>
+FUNC 3cb4 20 0 <unknown in mozwer.dll>
+FUNC 3ce0 9a 0 <unknown in mozwer.dll>
+FUNC 3d94 34 0 <unknown in mozwer.dll>
+FUNC 3dc8 23 0 <unknown in mozwer.dll>
+FUNC 3f08 85 0 <unknown in mozwer.dll>
+FUNC 3f90 85 0 <unknown in mozwer.dll>
+FUNC 4018 85 0 <unknown in mozwer.dll>
+FUNC 40a0 85 0 <unknown in mozwer.dll>
+FUNC 4128 85 0 <unknown in mozwer.dll>
+FUNC 41b0 85 0 <unknown in mozwer.dll>
+FUNC 4238 1cb 0 <unknown in mozwer.dll>
+FUNC 4404 1d2 0 <unknown in mozwer.dll>
+FUNC 45d8 63 0 <unknown in mozwer.dll>
+FUNC 463c 6e 0 <unknown in mozwer.dll>
+FUNC 46ac 114 0 <unknown in mozwer.dll>
+FUNC 47c0 117 0 <unknown in mozwer.dll>
+FUNC 48d8 1e7 0 <unknown in mozwer.dll>
+FUNC 4ac0 1ee 0 <unknown in mozwer.dll>
+FUNC 4cfc 23 0 <unknown in mozwer.dll>
+FUNC 4d80 48 0 <unknown in mozwer.dll>
+FUNC 4dc8 f5 0 <unknown in mozwer.dll>
+FUNC 4ec8 2c 0 <unknown in mozwer.dll>
+FUNC 4ef4 40 0 <unknown in mozwer.dll>
+FUNC 4f58 23 0 <unknown in mozwer.dll>
+FUNC 4fe0 23 0 <unknown in mozwer.dll>
+FUNC 5070 216 0 <unknown in mozwer.dll>
+FUNC 5288 70 0 <unknown in mozwer.dll>
+FUNC 52f8 5c 0 <unknown in mozwer.dll>
+FUNC 5354 a2 0 <unknown in mozwer.dll>
+FUNC 5448 a1 0 <unknown in mozwer.dll>
+FUNC 5550 171 0 <unknown in mozwer.dll>
+FUNC 56c4 284 0 <unknown in mozwer.dll>
+FUNC 5950 bc 0 <unknown in mozwer.dll>
+FUNC 5a80 96 0 <unknown in mozwer.dll>
+FUNC 5b24 215 0 <unknown in mozwer.dll>
+FUNC 5dac 1c5 0 <unknown in mozwer.dll>
+FUNC 5f74 db 0 <unknown in mozwer.dll>
+FUNC 6050 121 0 <unknown in mozwer.dll>
+FUNC 61d4 23 0 <unknown in mozwer.dll>
+FUNC 61f8 12d 0 <unknown in mozwer.dll>
+FUNC 634c 28 0 <unknown in mozwer.dll>
+FUNC 63c4 23 0 <unknown in mozwer.dll>
+FUNC 644c 4b 0 <unknown in mozwer.dll>
+FUNC 6498 103 0 <unknown in mozwer.dll>
+FUNC 65a4 25 0 <unknown in mozwer.dll>
+FUNC 65cc 43 0 <unknown in mozwer.dll>
+FUNC 6634 23 0 <unknown in mozwer.dll>
+FUNC 66bc 23 0 <unknown in mozwer.dll>
+FUNC 6750 26a 0 <unknown in mozwer.dll>
+FUNC 69bc 58 0 <unknown in mozwer.dll>
+FUNC 6a14 58 0 <unknown in mozwer.dll>
+FUNC 6ad0 a3 0 <unknown in mozwer.dll>
+FUNC 6bd8 196 0 <unknown in mozwer.dll>
+FUNC 6d70 2dd 0 <unknown in mozwer.dll>
+FUNC 7058 a6 0 <unknown in mozwer.dll>
+FUNC 7100 79 0 <unknown in mozwer.dll>
+FUNC 717c c7 0 <unknown in mozwer.dll>
+FUNC 7244 53 0 <unknown in mozwer.dll>
+FUNC 7298 239 0 <unknown in mozwer.dll>
+FUNC 7544 1cb 0 <unknown in mozwer.dll>
+FUNC 7710 db 0 <unknown in mozwer.dll>
+FUNC 77ec 106 0 <unknown in mozwer.dll>
+FUNC 7954 23 0 <unknown in mozwer.dll>
+FUNC 7978 131 0 <unknown in mozwer.dll>
+FUNC 7ad0 28 0 <unknown in mozwer.dll>
+FUNC 7af8 2b 0 <unknown in mozwer.dll>
+FUNC 7b34 23 0 <unknown in mozwer.dll>
+FUNC 7bc4 227 0 <unknown in mozwer.dll>
+FUNC 7dec 70 0 <unknown in mozwer.dll>
+FUNC 7e5c 5c 0 <unknown in mozwer.dll>
+FUNC 7eb8 a2 0 <unknown in mozwer.dll>
+FUNC 7fac a1 0 <unknown in mozwer.dll>
+FUNC 80b4 171 0 <unknown in mozwer.dll>
+FUNC 8228 284 0 <unknown in mozwer.dll>
+FUNC 84b4 bc 0 <unknown in mozwer.dll>
+FUNC 85e4 96 0 <unknown in mozwer.dll>
+FUNC 8688 215 0 <unknown in mozwer.dll>
+FUNC 8910 1c5 0 <unknown in mozwer.dll>
+FUNC 8ad8 db 0 <unknown in mozwer.dll>
+FUNC 8bb4 121 0 <unknown in mozwer.dll>
+FUNC 8d3c 23 0 <unknown in mozwer.dll>
+FUNC 8d60 12d 0 <unknown in mozwer.dll>
+FUNC 8eb4 28 0 <unknown in mozwer.dll>
+FUNC 8edc 2b 0 <unknown in mozwer.dll>
+FUNC 8f18 23 0 <unknown in mozwer.dll>
+FUNC 8fac 277 0 <unknown in mozwer.dll>
+FUNC 9224 58 0 <unknown in mozwer.dll>
+FUNC 927c 58 0 <unknown in mozwer.dll>
+FUNC 9338 a3 0 <unknown in mozwer.dll>
+FUNC 9440 196 0 <unknown in mozwer.dll>
+FUNC 95d8 2dd 0 <unknown in mozwer.dll>
+FUNC 98c0 a6 0 <unknown in mozwer.dll>
+FUNC 9968 79 0 <unknown in mozwer.dll>
+FUNC 99e4 c7 0 <unknown in mozwer.dll>
+FUNC 9aac 53 0 <unknown in mozwer.dll>
+FUNC 9b00 239 0 <unknown in mozwer.dll>
+FUNC 9dac 1cb 0 <unknown in mozwer.dll>
+FUNC 9f78 db 0 <unknown in mozwer.dll>
+FUNC a054 106 0 <unknown in mozwer.dll>
+FUNC a1c0 23 0 <unknown in mozwer.dll>
+FUNC a1e4 131 0 <unknown in mozwer.dll>
+FUNC a33c 28 0 <unknown in mozwer.dll>
+FUNC a3b4 9b 0 <unknown in mozwer.dll>
+FUNC a468 115 0 <unknown in mozwer.dll>
+FUNC a580 115 0 <unknown in mozwer.dll>
+FUNC a698 9b 0 <unknown in mozwer.dll>
+FUNC a75c 10b 0 <unknown in mozwer.dll>
+FUNC a8c4 230 0 <unknown in mozwer.dll>
+FUNC aaf4 3f 0 <unknown in mozwer.dll>
+FUNC ab34 23 0 <unknown in mozwer.dll>
+FUNC abe0 2a6 0 <unknown in mozwer.dll>
+FUNC ae88 94 0 <unknown in mozwer.dll>
+FUNC af1c 5c 0 <unknown in mozwer.dll>
+FUNC af78 a2 0 <unknown in mozwer.dll>
+FUNC b06c a1 0 <unknown in mozwer.dll>
+FUNC b110 50 0 <unknown in mozwer.dll>
+FUNC b168 4a 0 <unknown in mozwer.dll>
+FUNC b1b4 171 0 <unknown in mozwer.dll>
+FUNC b328 29a 0 <unknown in mozwer.dll>
+FUNC b5cc ff 0 <unknown in mozwer.dll>
+FUNC b6cc 158 0 <unknown in mozwer.dll>
+FUNC b824 b5 0 <unknown in mozwer.dll>
+FUNC b8e8 252 0 <unknown in mozwer.dll>
+FUNC bbac 202 0 <unknown in mozwer.dll>
+FUNC bdb0 104 0 <unknown in mozwer.dll>
+FUNC beb4 121 0 <unknown in mozwer.dll>
+FUNC c03c 23 0 <unknown in mozwer.dll>
+FUNC c060 14a 0 <unknown in mozwer.dll>
+FUNC c1d0 28 0 <unknown in mozwer.dll>
+FUNC c248 9b 0 <unknown in mozwer.dll>
+FUNC c2fc 118 0 <unknown in mozwer.dll>
+FUNC c414 118 0 <unknown in mozwer.dll>
+FUNC c52c 9d 0 <unknown in mozwer.dll>
+FUNC c5f4 114 0 <unknown in mozwer.dll>
+FUNC c764 200 0 <unknown in mozwer.dll>
+FUNC c964 40 0 <unknown in mozwer.dll>
+FUNC c9a4 23 0 <unknown in mozwer.dll>
+FUNC ca54 2b2 0 <unknown in mozwer.dll>
+FUNC cd08 7c 0 <unknown in mozwer.dll>
+FUNC cd84 58 0 <unknown in mozwer.dll>
+FUNC ce40 a3 0 <unknown in mozwer.dll>
+FUNC cee4 51 0 <unknown in mozwer.dll>
+FUNC cf40 4b 0 <unknown in mozwer.dll>
+FUNC cf8c 196 0 <unknown in mozwer.dll>
+FUNC d124 2f3 0 <unknown in mozwer.dll>
+FUNC d420 cc 0 <unknown in mozwer.dll>
+FUNC d4ec 13e 0 <unknown in mozwer.dll>
+FUNC d62c e9 0 <unknown in mozwer.dll>
+FUNC d718 53 0 <unknown in mozwer.dll>
+FUNC d76c 276 0 <unknown in mozwer.dll>
+FUNC da54 208 0 <unknown in mozwer.dll>
+FUNC dc5c 104 0 <unknown in mozwer.dll>
+FUNC dd60 106 0 <unknown in mozwer.dll>
+FUNC decc 23 0 <unknown in mozwer.dll>
+FUNC def0 14e 0 <unknown in mozwer.dll>
+FUNC e064 28 0 <unknown in mozwer.dll>
+FUNC e094 25 0 <unknown in mozwer.dll>
+FUNC e104 a3 0 <unknown in mozwer.dll>
+FUNC e208 23 0 <unknown in mozwer.dll>
+FUNC e290 23 0 <unknown in mozwer.dll>
+FUNC e320 20a 0 <unknown in mozwer.dll>
+FUNC e52c 74 0 <unknown in mozwer.dll>
+FUNC e5a0 60 0 <unknown in mozwer.dll>
+FUNC e600 a8 0 <unknown in mozwer.dll>
+FUNC e6f8 a1 0 <unknown in mozwer.dll>
+FUNC e800 171 0 <unknown in mozwer.dll>
+FUNC e974 266 0 <unknown in mozwer.dll>
+FUNC ebe4 bc 0 <unknown in mozwer.dll>
+FUNC ed14 96 0 <unknown in mozwer.dll>
+FUNC edb8 215 0 <unknown in mozwer.dll>
+FUNC f040 1c5 0 <unknown in mozwer.dll>
+FUNC f208 db 0 <unknown in mozwer.dll>
+FUNC f2e4 d5 0 <unknown in mozwer.dll>
+FUNC f41c 23 0 <unknown in mozwer.dll>
+FUNC f448 25 0 <unknown in mozwer.dll>
+FUNC f4b8 a5 0 <unknown in mozwer.dll>
+FUNC f5c4 23 0 <unknown in mozwer.dll>
+FUNC f64c 23 0 <unknown in mozwer.dll>
+FUNC f6e0 27b 0 <unknown in mozwer.dll>
+FUNC fa68 a3 0 <unknown in mozwer.dll>
+FUNC fb70 196 0 <unknown in mozwer.dll>
+FUNC fd08 2ca 0 <unknown in mozwer.dll>
+FUNC ffdc a6 0 <unknown in mozwer.dll>
+FUNC 10084 79 0 <unknown in mozwer.dll>
+FUNC 10100 c7 0 <unknown in mozwer.dll>
+FUNC 101c8 53 0 <unknown in mozwer.dll>
+FUNC 1021c 239 0 <unknown in mozwer.dll>
+FUNC 104c8 1cb 0 <unknown in mozwer.dll>
+FUNC 10694 db 0 <unknown in mozwer.dll>
+FUNC 10770 eb 0 <unknown in mozwer.dll>
+FUNC 108bc 23 0 <unknown in mozwer.dll>
+FUNC 108e0 1cb 0 <unknown in mozwer.dll>
+FUNC 10aac 1d2 0 <unknown in mozwer.dll>
+FUNC 10c80 2b 0 <unknown in mozwer.dll>
+FUNC 10cbc 23 0 <unknown in mozwer.dll>
+FUNC 10d30 9b 0 <unknown in mozwer.dll>
+FUNC 10de4 115 0 <unknown in mozwer.dll>
+FUNC 10efc 115 0 <unknown in mozwer.dll>
+FUNC 11014 9b 0 <unknown in mozwer.dll>
+FUNC 110d8 10b 0 <unknown in mozwer.dll>
+FUNC 11240 230 0 <unknown in mozwer.dll>
+FUNC 11470 3f 0 <unknown in mozwer.dll>
+FUNC 114b0 23 0 <unknown in mozwer.dll>
+FUNC 1155c 295 0 <unknown in mozwer.dll>
+FUNC 117f4 98 0 <unknown in mozwer.dll>
+FUNC 1188c 60 0 <unknown in mozwer.dll>
+FUNC 118ec a8 0 <unknown in mozwer.dll>
+FUNC 119e4 a1 0 <unknown in mozwer.dll>
+FUNC 11a88 50 0 <unknown in mozwer.dll>
+FUNC 11ae0 4a 0 <unknown in mozwer.dll>
+FUNC 11b2c 171 0 <unknown in mozwer.dll>
+FUNC 11ca0 27c 0 <unknown in mozwer.dll>
+FUNC 11f24 ff 0 <unknown in mozwer.dll>
+FUNC 12024 158 0 <unknown in mozwer.dll>
+FUNC 1217c b5 0 <unknown in mozwer.dll>
+FUNC 12240 252 0 <unknown in mozwer.dll>
+FUNC 12504 202 0 <unknown in mozwer.dll>
+FUNC 12708 104 0 <unknown in mozwer.dll>
+FUNC 1280c d5 0 <unknown in mozwer.dll>
+FUNC 12948 23 0 <unknown in mozwer.dll>
+FUNC 1296c 2b 0 <unknown in mozwer.dll>
+FUNC 129a8 23 0 <unknown in mozwer.dll>
+FUNC 12a1c 9b 0 <unknown in mozwer.dll>
+FUNC 12ad0 118 0 <unknown in mozwer.dll>
+FUNC 12be8 118 0 <unknown in mozwer.dll>
+FUNC 12d00 9d 0 <unknown in mozwer.dll>
+FUNC 12dc8 114 0 <unknown in mozwer.dll>
+FUNC 12f38 200 0 <unknown in mozwer.dll>
+FUNC 13138 40 0 <unknown in mozwer.dll>
+FUNC 13178 23 0 <unknown in mozwer.dll>
+FUNC 13228 2b2 0 <unknown in mozwer.dll>
+FUNC 1360c a3 0 <unknown in mozwer.dll>
+FUNC 136b0 51 0 <unknown in mozwer.dll>
+FUNC 1370c 4b 0 <unknown in mozwer.dll>
+FUNC 13758 196 0 <unknown in mozwer.dll>
+FUNC 138f0 2e0 0 <unknown in mozwer.dll>
+FUNC 13bd8 cc 0 <unknown in mozwer.dll>
+FUNC 13ca4 13e 0 <unknown in mozwer.dll>
+FUNC 13de4 e9 0 <unknown in mozwer.dll>
+FUNC 13ed0 53 0 <unknown in mozwer.dll>
+FUNC 13f24 276 0 <unknown in mozwer.dll>
+FUNC 1420c 208 0 <unknown in mozwer.dll>
+FUNC 14414 104 0 <unknown in mozwer.dll>
+FUNC 14518 eb 0 <unknown in mozwer.dll>
+FUNC 14668 23 0 <unknown in mozwer.dll>
+FUNC 1468c a2 0 <unknown in mozwer.dll>
+FUNC 14730 9e 0 <unknown in mozwer.dll>
+FUNC 147d0 85 0 <unknown in mozwer.dll>
+FUNC 14858 81 0 <unknown in mozwer.dll>
+FUNC 148dc a2 0 <unknown in mozwer.dll>
+FUNC 14980 9e 0 <unknown in mozwer.dll>
+FUNC 14a20 85 0 <unknown in mozwer.dll>
+FUNC 14aa8 81 0 <unknown in mozwer.dll>
+FUNC 14b2c 85 0 <unknown in mozwer.dll>
+FUNC 14bb4 81 0 <unknown in mozwer.dll>
+FUNC 14c38 7a 0 <unknown in mozwer.dll>
+FUNC 14cf4 75 0 <unknown in mozwer.dll>
+FUNC 14d7c 91 0 <unknown in mozwer.dll>
+FUNC 14e10 8b 0 <unknown in mozwer.dll>
+FUNC 14e9c bc 0 <unknown in mozwer.dll>
+FUNC 14f58 a6 0 <unknown in mozwer.dll>
+FUNC 1502c bc 0 <unknown in mozwer.dll>
+FUNC 15128 bc 0 <unknown in mozwer.dll>
+FUNC 15224 bc 0 <unknown in mozwer.dll>
+FUNC 152f4 ba 0 <unknown in mozwer.dll>
+FUNC 153b0 ba 0 <unknown in mozwer.dll>
+FUNC 1546c ba 0 <unknown in mozwer.dll>
+FUNC 15550 ba 0 <unknown in mozwer.dll>
+FUNC 156c4 bc 0 <unknown in mozwer.dll>
+FUNC 15780 bc 0 <unknown in mozwer.dll>
+FUNC 1583c bc 0 <unknown in mozwer.dll>
+FUNC 158f8 bc 0 <unknown in mozwer.dll>
+FUNC 159b4 ba 0 <unknown in mozwer.dll>
+FUNC 15a70 ba 0 <unknown in mozwer.dll>
+FUNC 15b2c ba 0 <unknown in mozwer.dll>
+FUNC 15be8 ba 0 <unknown in mozwer.dll>
+FUNC 15d74 be 0 <unknown in mozwer.dll>
+FUNC 15e34 bd 0 <unknown in mozwer.dll>
+FUNC 15ef4 be 0 <unknown in mozwer.dll>
+FUNC 15fb4 bd 0 <unknown in mozwer.dll>
+FUNC 16074 bc 0 <unknown in mozwer.dll>
+FUNC 16130 bb 0 <unknown in mozwer.dll>
+FUNC 161ec bc 0 <unknown in mozwer.dll>
+FUNC 162a8 bc 0 <unknown in mozwer.dll>
+FUNC 16364 a9 0 <unknown in mozwer.dll>
+FUNC 16410 a4 0 <unknown in mozwer.dll>
+FUNC 164b4 a3 0 <unknown in mozwer.dll>
+FUNC 16558 be 0 <unknown in mozwer.dll>
+FUNC 16628 bc 0 <unknown in mozwer.dll>
+FUNC 166e4 bb 0 <unknown in mozwer.dll>
+FUNC 167a0 bc 0 <unknown in mozwer.dll>
+FUNC 1685c bb 0 <unknown in mozwer.dll>
+FUNC 16918 ba 0 <unknown in mozwer.dll>
+FUNC 169d4 b9 0 <unknown in mozwer.dll>
+FUNC 16a90 ba 0 <unknown in mozwer.dll>
+FUNC 16b4c ba 0 <unknown in mozwer.dll>
+FUNC 16c08 8d 0 <unknown in mozwer.dll>
+FUNC 16c98 87 0 <unknown in mozwer.dll>
+FUNC 16d20 bc 0 <unknown in mozwer.dll>
+FUNC 16ddc b8 0 <unknown in mozwer.dll>
+FUNC 16f34 a4 0 <unknown in mozwer.dll>
+FUNC 16fd8 a3 0 <unknown in mozwer.dll>
+FUNC 17130 8d 0 <unknown in mozwer.dll>
+FUNC 171c0 87 0 <unknown in mozwer.dll>
+FUNC 17270 be 0 <unknown in mozwer.dll>
+FUNC 17330 bd 0 <unknown in mozwer.dll>
+FUNC 173f0 be 0 <unknown in mozwer.dll>
+FUNC 174b0 bd 0 <unknown in mozwer.dll>
+FUNC 17570 bc 0 <unknown in mozwer.dll>
+FUNC 1762c bb 0 <unknown in mozwer.dll>
+FUNC 176e8 bc 0 <unknown in mozwer.dll>
+FUNC 177a4 bc 0 <unknown in mozwer.dll>
+FUNC 17860 a4 0 <unknown in mozwer.dll>
+FUNC 17904 a3 0 <unknown in mozwer.dll>
+FUNC 179a8 be 0 <unknown in mozwer.dll>
+FUNC 17a68 bc 0 <unknown in mozwer.dll>
+FUNC 17b24 bb 0 <unknown in mozwer.dll>
+FUNC 17be0 bc 0 <unknown in mozwer.dll>
+FUNC 17c9c bb 0 <unknown in mozwer.dll>
+FUNC 17d58 ba 0 <unknown in mozwer.dll>
+FUNC 17e14 b9 0 <unknown in mozwer.dll>
+FUNC 17ed0 ba 0 <unknown in mozwer.dll>
+FUNC 17f8c ba 0 <unknown in mozwer.dll>
+FUNC 18048 8d 0 <unknown in mozwer.dll>
+FUNC 180d8 87 0 <unknown in mozwer.dll>
+FUNC 18160 bc 0 <unknown in mozwer.dll>
+FUNC 1821c b8 0 <unknown in mozwer.dll>
+FUNC 18374 a4 0 <unknown in mozwer.dll>
+FUNC 18418 a3 0 <unknown in mozwer.dll>
+FUNC 18570 8d 0 <unknown in mozwer.dll>
+FUNC 18600 87 0 <unknown in mozwer.dll>
+FUNC 186b0 a4 0 <unknown in mozwer.dll>
+FUNC 18754 a3 0 <unknown in mozwer.dll>
+FUNC 187f8 8d 0 <unknown in mozwer.dll>
+FUNC 18888 87 0 <unknown in mozwer.dll>
+FUNC 18a80 3d 0 <unknown in mozwer.dll>
+FUNC 18ae8 3d 0 <unknown in mozwer.dll>
+FUNC 18b50 3d 0 <unknown in mozwer.dll>
+FUNC 18bb8 3d 0 <unknown in mozwer.dll>
+FUNC 18c20 3d 0 <unknown in mozwer.dll>
+FUNC 18c88 3d 0 <unknown in mozwer.dll>
+FUNC 18d34 218 0 <unknown in mozwer.dll>
+FUNC 18f4c 74 0 <unknown in mozwer.dll>
+FUNC 18fc0 60 0 <unknown in mozwer.dll>
+FUNC 19020 a8 0 <unknown in mozwer.dll>
+FUNC 19118 a1 0 <unknown in mozwer.dll>
+FUNC 19220 171 0 <unknown in mozwer.dll>
+FUNC 19394 266 0 <unknown in mozwer.dll>
+FUNC 19604 bc 0 <unknown in mozwer.dll>
+FUNC 19734 96 0 <unknown in mozwer.dll>
+FUNC 197d8 215 0 <unknown in mozwer.dll>
+FUNC 19a60 1c5 0 <unknown in mozwer.dll>
+FUNC 19c28 db 0 <unknown in mozwer.dll>
+FUNC 19d04 d5 0 <unknown in mozwer.dll>
+FUNC 19e40 23 0 <unknown in mozwer.dll>
+FUNC 19ed4 288 0 <unknown in mozwer.dll>
+FUNC 1a268 a3 0 <unknown in mozwer.dll>
+FUNC 1a370 196 0 <unknown in mozwer.dll>
+FUNC 1a508 2ca 0 <unknown in mozwer.dll>
+FUNC 1a7dc a6 0 <unknown in mozwer.dll>
+FUNC 1a884 79 0 <unknown in mozwer.dll>
+FUNC 1a900 c7 0 <unknown in mozwer.dll>
+FUNC 1a9c8 53 0 <unknown in mozwer.dll>
+FUNC 1aa1c 239 0 <unknown in mozwer.dll>
+FUNC 1acc8 1cb 0 <unknown in mozwer.dll>
+FUNC 1ae94 db 0 <unknown in mozwer.dll>
+FUNC 1af70 eb 0 <unknown in mozwer.dll>
+FUNC 1b0c0 23 0 <unknown in mozwer.dll>
+FUNC 1b0e4 85 0 <unknown in mozwer.dll>
+FUNC 1b16c 81 0 <unknown in mozwer.dll>
+FUNC 1b3c8 a4 0 <unknown in mozwer.dll>
+FUNC 1b46c a3 0 <unknown in mozwer.dll>
+FUNC 1b510 8d 0 <unknown in mozwer.dll>
+FUNC 1b5a0 87 0 <unknown in mozwer.dll>
+FUNC 1b6c8 3c 0 <unknown in mozwer.dll>
+FUNC 1b70c 14 0 <unknown in mozwer.dll>
+FUNC 1b72c 52 0 <unknown in mozwer.dll>
+FUNC 1b780 5b 0 <unknown in mozwer.dll>
+FUNC 1b7e4 21 0 <unknown in mozwer.dll>
+FUNC 1b80c 21 0 <unknown in mozwer.dll>
+FUNC 1b83c 30 0 <unknown in mozwer.dll>
+FUNC 1b86c 4a 0 <unknown in mozwer.dll>
+FUNC 1b8ec bc 0 <unknown in mozwer.dll>
+FUNC 1b9a8 c1 0 <unknown in mozwer.dll>
+FUNC 1ba94 26 0 <unknown in mozwer.dll>
+FUNC 1badc 38 0 <unknown in mozwer.dll>
+FUNC 1bb14 186 0 <unknown in mozwer.dll>
+FUNC 1bc9c 182 0 <unknown in mozwer.dll>
+FUNC 1be30 5d 0 <unknown in mozwer.dll>
+FUNC 1becc 16 0 <unknown in mozwer.dll>
+FUNC 1bef0 1b 0 <unknown in mozwer.dll>
+FUNC 1bf14 1b 0 <unknown in mozwer.dll>
+FUNC 1bf44 175 0 <unknown in mozwer.dll>
+FUNC 1c0bc 171 0 <unknown in mozwer.dll>
+FUNC 1c250 1c3 0 <unknown in mozwer.dll>
+FUNC 1c41c 1b 0 <unknown in mozwer.dll>
+FUNC 1c440 1b 0 <unknown in mozwer.dll>
+FUNC 1c4a4 1a2 0 <unknown in mozwer.dll>
+FUNC 1c650 1b 0 <unknown in mozwer.dll>
+FUNC 1c674 1b 0 <unknown in mozwer.dll>
+FUNC 1c6f4 48 0 <unknown in mozwer.dll>
+FUNC 1c73c 3a 0 <unknown in mozwer.dll>
+FUNC 1c7a4 1b0 0 <unknown in mozwer.dll>
+FUNC 1c980 1b 0 <unknown in mozwer.dll>
+FUNC 1c9a4 1b 0 <unknown in mozwer.dll>
+FUNC 1ca08 26 0 <unknown in mozwer.dll>
+FUNC 1ca30 116 0 <unknown in mozwer.dll>
+FUNC 1cb68 26 0 <unknown in mozwer.dll>
+FUNC 1cbd8 3b 0 <unknown in mozwer.dll>
+FUNC 1cc34 3b 0 <unknown in mozwer.dll>
+FUNC 1cc80 4e 0 <unknown in mozwer.dll>
+FUNC 1ccd0 4e 0 <unknown in mozwer.dll>
+FUNC 1cd30 3b 0 <unknown in mozwer.dll>
+FUNC 1cd6c 3b 0 <unknown in mozwer.dll>
+FUNC 1cda8 38 0 <unknown in mozwer.dll>
+FUNC 1cde0 31 0 <unknown in mozwer.dll>
+FUNC 1ce18 24 0 <unknown in mozwer.dll>
+FUNC 1ce3c 2e 0 <unknown in mozwer.dll>
+FUNC 1ce6c 23 0 <unknown in mozwer.dll>
+FUNC 1ce90 2e 0 <unknown in mozwer.dll>
+FUNC 1cec4 27 0 <unknown in mozwer.dll>
+FUNC 1cef0 27 0 <unknown in mozwer.dll>
+FUNC 1cf54 6c 0 <unknown in mozwer.dll>
+FUNC 1cfc0 67 0 <unknown in mozwer.dll>
+FUNC 1d028 1a 0 <unknown in mozwer.dll>
+FUNC 1d044 43 0 <unknown in mozwer.dll>
+FUNC 1d088 1a 0 <unknown in mozwer.dll>
+FUNC 1d0a4 43 0 <unknown in mozwer.dll>
+FUNC 1d0e8 41 0 <unknown in mozwer.dll>
+FUNC 1d12c 41 0 <unknown in mozwer.dll>
+FUNC 1d170 3b 0 <unknown in mozwer.dll>
+FUNC 1d1ac 3b 0 <unknown in mozwer.dll>
+FUNC 1d1e8 4e 0 <unknown in mozwer.dll>
+FUNC 1d238 4e 0 <unknown in mozwer.dll>
+FUNC 1d298 106 0 <unknown in mozwer.dll>
+FUNC 1d3c0 1b 0 <unknown in mozwer.dll>
+FUNC 1d3e4 1b 0 <unknown in mozwer.dll>
+FUNC 1d414 113 0 <unknown in mozwer.dll>
+FUNC 1d538 d1 0 <unknown in mozwer.dll>
+FUNC 1d60c b1 0 <unknown in mozwer.dll>
+FUNC 1d798 64 0 <unknown in mozwer.dll>
+FUNC 1d7fc 3d 0 <unknown in mozwer.dll>
+FUNC 1d850 182 0 <unknown in mozwer.dll>
+FUNC 1d9f4 62 0 <unknown in mozwer.dll>
+FUNC 1da58 83 0 <unknown in mozwer.dll>
+FUNC 1daf4 58 0 <unknown in mozwer.dll>
+FUNC 1db54 58 0 <unknown in mozwer.dll>
+FUNC 1dbc8 b9 0 <unknown in mozwer.dll>
+FUNC 1dc84 53 0 <unknown in mozwer.dll>
+FUNC 1dcd8 c9 0 <unknown in mozwer.dll>
+FUNC 1dda4 53 0 <unknown in mozwer.dll>
+FUNC 1de20 81 0 <unknown in mozwer.dll>
+FUNC 1dea4 1aa 0 <unknown in mozwer.dll>
+FUNC 1e09c 64 0 <unknown in mozwer.dll>
+FUNC 1e118 28 0 <unknown in mozwer.dll>
+FUNC 1e168 3f 0 <unknown in mozwer.dll>
+FUNC 1e1a8 20 0 <unknown in mozwer.dll>
+FUNC 1e1c8 2c 0 <unknown in mozwer.dll>
+FUNC 1e1f4 22 0 <unknown in mozwer.dll>
+FUNC 1e22c 65 0 <unknown in mozwer.dll>
+FUNC 1e294 6c 0 <unknown in mozwer.dll>
+FUNC 1e380 4d 0 <unknown in mozwer.dll>
+FUNC 1e3e0 18 0 <unknown in mozwer.dll>
+FUNC 1e400 1 0 <unknown in mozwer.dll>
+FUNC 1e410 1 0 <unknown in mozwer.dll>
+FUNC 1e44c 5b 0 <unknown in mozwer.dll>
+FUNC 1e4f0 56 0 <unknown in mozwer.dll>
+FUNC 1e564 47 0 <unknown in mozwer.dll>
+FUNC 1e5ac 22 0 <unknown in mozwer.dll>
+FUNC 1e5d0 19 0 <unknown in mozwer.dll>
+FUNC 1e5ec bf 0 <unknown in mozwer.dll>
+FUNC 1e6ac 4d 0 <unknown in mozwer.dll>
+FUNC 1e6fc 4d 0 <unknown in mozwer.dll>
+FUNC 1e750 1f 0 <unknown in mozwer.dll>
+FUNC 1e770 1a 0 <unknown in mozwer.dll>
+FUNC 1e798 2a 0 <unknown in mozwer.dll>
+FUNC 1e7cc 1b 0 <unknown in mozwer.dll>
+FUNC 1e7f0 1b 0 <unknown in mozwer.dll>
+FUNC 1e840 2b 0 <unknown in mozwer.dll>
+FUNC 1e888 5f 0 <unknown in mozwer.dll>
+FUNC 1e8e8 62 0 <unknown in mozwer.dll>
+FUNC 1e94c 106 0 <unknown in mozwer.dll>
+FUNC 1ea54 27 0 <unknown in mozwer.dll>
+FUNC 1ea7c 132 0 <unknown in mozwer.dll>
+FUNC 1ebb0 62 0 <unknown in mozwer.dll>
+FUNC 1ec14 52 0 <unknown in mozwer.dll>
+FUNC 1ecfc 8e 0 <unknown in mozwer.dll>
+FUNC 1ed8c 42 0 <unknown in mozwer.dll>
+FUNC 1ee3c 1f 0 <unknown in mozwer.dll>
+FUNC 1ee5c 2b 0 <unknown in mozwer.dll>
+FUNC 1ee88 af 0 <unknown in mozwer.dll>
+FUNC 1ef68 81 0 <unknown in mozwer.dll>
+FUNC 1efec 88 0 <unknown in mozwer.dll>
+FUNC 1f074 a6 0 <unknown in mozwer.dll>
+FUNC 1f228 91 0 <unknown in mozwer.dll>
+FUNC 1f2d8 29 0 <unknown in mozwer.dll>
+FUNC 1f304 29 0 <unknown in mozwer.dll>
+FUNC 1f330 29 0 <unknown in mozwer.dll>
+FUNC 1f35c 29 0 <unknown in mozwer.dll>
+FUNC 1f388 29 0 <unknown in mozwer.dll>
+FUNC 1f3b4 6c 0 <unknown in mozwer.dll>
+FUNC 1f420 7e 0 <unknown in mozwer.dll>
+FUNC 1f4a0 93 0 <unknown in mozwer.dll>
+FUNC 1f534 6b 0 <unknown in mozwer.dll>
+FUNC 1f5a0 b3 0 <unknown in mozwer.dll>
+FUNC 1f668 26 0 <unknown in mozwer.dll>
+FUNC 1f6a0 1f 0 <unknown in mozwer.dll>
+FUNC 1f6c0 76 0 <unknown in mozwer.dll>
+FUNC 1f758 36 0 <unknown in mozwer.dll>
+FUNC 1f790 42 0 <unknown in mozwer.dll>
+FUNC 1f7d4 49 0 <unknown in mozwer.dll>
+FUNC 1f820 50 0 <unknown in mozwer.dll>
+FUNC 1f884 58 0 <unknown in mozwer.dll>
+FUNC 1f91c 2e4 0 <unknown in mozwer.dll>
+FUNC 1fc00 4c 0 <unknown in mozwer.dll>
+FUNC 1fc4c 2e5 0 <unknown in mozwer.dll>
+FUNC 1ff34 847 0 <unknown in mozwer.dll>
+FUNC 2077c 4b3 0 <unknown in mozwer.dll>
+FUNC 20c30 139 0 <unknown in mozwer.dll>
+FUNC 20d6c 71 0 <unknown in mozwer.dll>
+FUNC 20de0 86 0 <unknown in mozwer.dll>
+FUNC 20e68 14a 0 <unknown in mozwer.dll>
+FUNC 20fb4 11f 0 <unknown in mozwer.dll>
+FUNC 210d4 150 0 <unknown in mozwer.dll>
+FUNC 21224 c6 0 <unknown in mozwer.dll>
+FUNC 212ec 68 0 <unknown in mozwer.dll>
+FUNC 213c8 291 0 <unknown in mozwer.dll>
+FUNC 2165c 272 0 <unknown in mozwer.dll>
+FUNC 218d0 479 0 <unknown in mozwer.dll>
+FUNC 21d4c 167 0 <unknown in mozwer.dll>
+FUNC 21eb4 ea5 0 <unknown in mozwer.dll>
+FUNC 22d5c 374 0 <unknown in mozwer.dll>
+FUNC 230d0 f6 0 <unknown in mozwer.dll>
+FUNC 231c8 17 0 <unknown in mozwer.dll>
+FUNC 231e0 126 0 <unknown in mozwer.dll>
+FUNC 23308 13f 0 <unknown in mozwer.dll>
+FUNC 23448 34 0 <unknown in mozwer.dll>
+FUNC 2347c 111 0 <unknown in mozwer.dll>
+FUNC 23590 2b2 0 <unknown in mozwer.dll>
+FUNC 23844 897 0 <unknown in mozwer.dll>
+FUNC 240dc 207 0 <unknown in mozwer.dll>
+FUNC 242e4 3a 0 <unknown in mozwer.dll>
+FUNC 24320 541 0 <unknown in mozwer.dll>
+FUNC 24864 1df 0 <unknown in mozwer.dll>
+FUNC 24a44 1d5 0 <unknown in mozwer.dll>
+FUNC 24c1c 1cc 0 <unknown in mozwer.dll>
+FUNC 24de8 247 0 <unknown in mozwer.dll>
+FUNC 25030 535 0 <unknown in mozwer.dll>
+FUNC 25568 15c 0 <unknown in mozwer.dll>
+FUNC 256c4 192 0 <unknown in mozwer.dll>
+FUNC 2587c 62 0 <unknown in mozwer.dll>
+FUNC 258e0 1cc 0 <unknown in mozwer.dll>
+FUNC 25af8 63 0 <unknown in mozwer.dll>
+FUNC 25b5c 3a 0 <unknown in mozwer.dll>
+FUNC 25b98 3e 0 <unknown in mozwer.dll>
+FUNC 25bd8 1d 0 <unknown in mozwer.dll>
+FUNC 25bf8 1a 0 <unknown in mozwer.dll>
+FUNC 25c14 17 0 <unknown in mozwer.dll>
+FUNC 25c2c c0 0 <unknown in mozwer.dll>
+FUNC 25cec 19 0 <unknown in mozwer.dll>
+FUNC 25d08 19 0 <unknown in mozwer.dll>
+FUNC 25d24 19 0 <unknown in mozwer.dll>
+FUNC 25d40 207 0 <unknown in mozwer.dll>
+FUNC 25f48 17 0 <unknown in mozwer.dll>
+FUNC 25f60 7c 0 <unknown in mozwer.dll>
+FUNC 25fdc 75 0 <unknown in mozwer.dll>
+FUNC 26054 e1 0 <unknown in mozwer.dll>
+FUNC 26138 112 0 <unknown in mozwer.dll>
+FUNC 2639c 4c 0 <unknown in mozwer.dll>
+FUNC 263e8 152 0 <unknown in mozwer.dll>
+FUNC 2653c 11d 0 <unknown in mozwer.dll>
+FUNC 2665c 40 0 <unknown in mozwer.dll>
+FUNC 266b0 40 0 <unknown in mozwer.dll>
+FUNC 26728 40 0 <unknown in mozwer.dll>
+FUNC 26890 28 0 <unknown in mozwer.dll>
+FUNC 268d0 29 0 <unknown in mozwer.dll>
+FUNC 26900 2d 0 <unknown in mozwer.dll>
+FUNC 269f0 46 0 <unknown in mozwer.dll>
+FUNC 26a50 35 0 <unknown in mozwer.dll>
+FUNC 26a90 4b 0 <unknown in mozwer.dll>
+FUNC 26b1c a1 0 <unknown in mozwer.dll>
+FUNC 26bc0 95 0 <unknown in mozwer.dll>
+FUNC 26c58 62 0 <unknown in mozwer.dll>
+FUNC 26cd4 62 0 <unknown in mozwer.dll>
+FUNC 26d38 62 0 <unknown in mozwer.dll>
+FUNC 26d9c 62 0 <unknown in mozwer.dll>
+FUNC 26e00 62 0 <unknown in mozwer.dll>
+FUNC 26e64 95 0 <unknown in mozwer.dll>
+FUNC 26f20 72 0 <unknown in mozwer.dll>
+FUNC 26f94 72 0 <unknown in mozwer.dll>
+FUNC 27008 32 0 <unknown in mozwer.dll>
+FUNC 2703c 37 0 <unknown in mozwer.dll>
+FUNC 270c0 31 0 <unknown in mozwer.dll>
+FUNC 27100 41 0 <unknown in mozwer.dll>
+FUNC 27144 3a 0 <unknown in mozwer.dll>
+FUNC 27180 dc 0 <unknown in mozwer.dll>
+FUNC 2725c 95 0 <unknown in mozwer.dll>
+FUNC 272f4 48 0 <unknown in mozwer.dll>
+FUNC 2733c 46 0 <unknown in mozwer.dll>
+FUNC 27384 46 0 <unknown in mozwer.dll>
+FUNC 273cc 51 0 <unknown in mozwer.dll>
+FUNC 27420 b6 0 <unknown in mozwer.dll>
+FUNC 274d8 39 0 <unknown in mozwer.dll>
+FUNC 27514 82 0 <unknown in mozwer.dll>
+FUNC 27598 48 0 <unknown in mozwer.dll>
+FUNC 275e0 ab 0 <unknown in mozwer.dll>
+FUNC 2768c 61 0 <unknown in mozwer.dll>
+FUNC 276f0 51 0 <unknown in mozwer.dll>
+FUNC 27744 61 0 <unknown in mozwer.dll>
+FUNC 277a8 56 0 <unknown in mozwer.dll>
+FUNC 27800 dc 0 <unknown in mozwer.dll>
+FUNC 278dc 70 0 <unknown in mozwer.dll>
+FUNC 2794c 50 0 <unknown in mozwer.dll>
+FUNC 2799c 5f 0 <unknown in mozwer.dll>
+FUNC 279fc 71 0 <unknown in mozwer.dll>
+FUNC 27a70 71 0 <unknown in mozwer.dll>
+FUNC 27ae4 40 0 <unknown in mozwer.dll>
+FUNC 27b24 33 0 <unknown in mozwer.dll>
+FUNC 27b58 4f 0 <unknown in mozwer.dll>
+FUNC 27ba8 4e 0 <unknown in mozwer.dll>
+FUNC 27bf8 4e 0 <unknown in mozwer.dll>
+FUNC 27c48 4e 0 <unknown in mozwer.dll>
+FUNC 27c98 4e 0 <unknown in mozwer.dll>
+FUNC 27ce8 42 0 <unknown in mozwer.dll>
+FUNC 27d2c 6d 0 <unknown in mozwer.dll>
+FUNC 27d9c 2e 0 <unknown in mozwer.dll>
+FUNC 27dcc 15a 0 <unknown in mozwer.dll>
+FUNC 27f28 2e 0 <unknown in mozwer.dll>
+FUNC 27f58 78 0 <unknown in mozwer.dll>
+FUNC 27fd0 c6 0 <unknown in mozwer.dll>
+FUNC 280a0 73 0 <unknown in mozwer.dll>
+FUNC 28114 fe 0 <unknown in mozwer.dll>
+FUNC 28228 119 0 <unknown in mozwer.dll>
+FUNC 28344 137 0 <unknown in mozwer.dll>
+FUNC 2847c 1d6 0 <unknown in mozwer.dll>
+FUNC 28ab4 4d 0 <unknown in mozwer.dll>
+FUNC 28ba0 53 0 <unknown in mozwer.dll>
+FUNC 28bfc 26 0 <unknown in mozwer.dll>
+FUNC 28c44 79 0 <unknown in mozwer.dll>
+FUNC 28cc0 48 0 <unknown in mozwer.dll>
+FUNC 28d10 37 0 <unknown in mozwer.dll>
+FUNC 28d80 1b 0 <unknown in mozwer.dll>
+FUNC 28dc0 1c 0 <unknown in mozwer.dll>
+FUNC 28e10 39 0 <unknown in mozwer.dll>
+FUNC 28e50 22 0 <unknown in mozwer.dll>
+FUNC 28e74 d4 0 <unknown in mozwer.dll>
+FUNC 28f48 a7 0 <unknown in mozwer.dll>
+FUNC 28ff0 cc 0 <unknown in mozwer.dll>
+FUNC 290bc 41 0 <unknown in mozwer.dll>
+FUNC 29100 1a 0 <unknown in mozwer.dll>
+FUNC 29130 20 0 <unknown in mozwer.dll>
+FUNC 29150 67 0 <unknown in mozwer.dll>
+FUNC 291c0 c5 0 <unknown in mozwer.dll>
+FUNC 292a4 26 0 <unknown in mozwer.dll>
+FUNC 292f0 26 0 <unknown in mozwer.dll>
+FUNC 29318 cd 0 <unknown in mozwer.dll>
+FUNC 293e8 f5 0 <unknown in mozwer.dll>
+FUNC 294e0 38 0 <unknown in mozwer.dll>
+FUNC 29520 26 0 <unknown in mozwer.dll>
+FUNC 29560 26 0 <unknown in mozwer.dll>
+FUNC 29588 f5 0 <unknown in mozwer.dll>
+FUNC 29680 20 0 <unknown in mozwer.dll>
+FUNC 296a0 9f 0 <unknown in mozwer.dll>
+FUNC 29748 1b 0 <unknown in mozwer.dll>
+FUNC 2976c 1b 0 <unknown in mozwer.dll>
+FUNC 2979c c8 0 <unknown in mozwer.dll>
+FUNC 2988c 3f 0 <unknown in mozwer.dll>
+FUNC 298ec 45 0 <unknown in mozwer.dll>
+FUNC 29954 5f 0 <unknown in mozwer.dll>
+FUNC 299d4 3d 0 <unknown in mozwer.dll>
+FUNC 29a20 3b 0 <unknown in mozwer.dll>
+FUNC 29a60 40 0 <unknown in mozwer.dll>
+FUNC 29abc ed 0 <unknown in mozwer.dll>
+FUNC 29bac 10c 0 <unknown in mozwer.dll>
+FUNC 29cd8 36 0 <unknown in mozwer.dll>
+FUNC 29d10 36 0 <unknown in mozwer.dll>
+FUNC 29d60 25 0 <unknown in mozwer.dll>
+FUNC 29d94 87 0 <unknown in mozwer.dll>
+FUNC 29e1c 1c 0 <unknown in mozwer.dll>
+FUNC 29e40 60 0 <unknown in mozwer.dll>
+FUNC 29eb0 25 0 <unknown in mozwer.dll>
+FUNC 29ed8 3a 0 <unknown in mozwer.dll>
+FUNC 29f20 27 0 <unknown in mozwer.dll>
+FUNC 29f4c 2b9 0 <unknown in mozwer.dll>
+FUNC 2a208 7d 0 <unknown in mozwer.dll>
+FUNC 2a288 90 0 <unknown in mozwer.dll>
+FUNC 2a318 b8 0 <unknown in mozwer.dll>
+FUNC 2a3d0 1c2 0 <unknown in mozwer.dll>
+FUNC 2a59c 1b 0 <unknown in mozwer.dll>
+FUNC 2a5c0 1b 0 <unknown in mozwer.dll>
+FUNC 2a5f0 1a0 0 <unknown in mozwer.dll>
+FUNC 2a79c 26 0 <unknown in mozwer.dll>
+FUNC 2a800 1e3 0 <unknown in mozwer.dll>
+FUNC 2aa14 1ba 0 <unknown in mozwer.dll>
+FUNC 2abd0 3d 0 <unknown in mozwer.dll>
+FUNC 2ac18 80 0 <unknown in mozwer.dll>
+FUNC 2ac98 3c 0 <unknown in mozwer.dll>
+FUNC 2acd4 1e 0 <unknown in mozwer.dll>
+FUNC 2acf4 2f 0 <unknown in mozwer.dll>
+FUNC 2ad24 47 0 <unknown in mozwer.dll>
+FUNC 2adb8 25 0 <unknown in mozwer.dll>
+FUNC 2ade0 1a 0 <unknown in mozwer.dll>
+FUNC 2adfc 15b 0 <unknown in mozwer.dll>
+FUNC 2af68 6d 0 <unknown in mozwer.dll>
+FUNC 2afe0 ae 0 <unknown in mozwer.dll>
+FUNC 2b0c8 2f 0 <unknown in mozwer.dll>
+FUNC 2b100 34 0 <unknown in mozwer.dll>
+FUNC 2b134 59 0 <unknown in mozwer.dll>
+FUNC 2b194 27 0 <unknown in mozwer.dll>
+FUNC 2b228 2e 0 <unknown in mozwer.dll>
+FUNC 2b258 12 0 <unknown in mozwer.dll>
+FUNC 2b26c 12 0 <unknown in mozwer.dll>
+FUNC 2b280 1da 0 <unknown in mozwer.dll>
+FUNC 2b45c 26c 0 <unknown in mozwer.dll>
+FUNC 2b6cc 27 0 <unknown in mozwer.dll>
+FUNC 2b758 27 0 <unknown in mozwer.dll>
+FUNC 2b7b0 92 0 <unknown in mozwer.dll>
+FUNC 2b89c 26 0 <unknown in mozwer.dll>
+FUNC 2b8e4 45 0 <unknown in mozwer.dll>
+FUNC 2b9b0 27 0 <unknown in mozwer.dll>
+FUNC 2ba10 66 0 <unknown in mozwer.dll>
+FUNC 2ba80 4b 0 <unknown in mozwer.dll>
+FUNC 2bb0c 7a 0 <unknown in mozwer.dll>
+FUNC 2bc04 5d 0 <unknown in mozwer.dll>
+FUNC 2bc64 ae 0 <unknown in mozwer.dll>
+FUNC 2bd24 78 0 <unknown in mozwer.dll>
+FUNC 2bdb4 28 0 <unknown in mozwer.dll>
+FUNC 2bddc 26 0 <unknown in mozwer.dll>
+FUNC 2be18 28 0 <unknown in mozwer.dll>
+FUNC 2be68 9a 0 <unknown in mozwer.dll>
+FUNC 2bf24 e0 0 <unknown in mozwer.dll>
+FUNC 2c02c 40 0 <unknown in mozwer.dll>
+FUNC 2c06c 30 0 <unknown in mozwer.dll>
+FUNC 2c0b0 47 0 <unknown in mozwer.dll>
+FUNC 2c110 11f 0 <unknown in mozwer.dll>
+FUNC 2c238 1b 0 <unknown in mozwer.dll>
+FUNC 2c25c 1b 0 <unknown in mozwer.dll>
+FUNC 2c280 5b 0 <unknown in mozwer.dll>
+FUNC 2c2f0 cf 0 <unknown in mozwer.dll>
+FUNC 2c3c0 39 0 <unknown in mozwer.dll>
+FUNC 2c3fc 20 0 <unknown in mozwer.dll>
+FUNC 2c41c 3a 0 <unknown in mozwer.dll>
+FUNC 2c458 3b 0 <unknown in mozwer.dll>
+FUNC 2c494 20 0 <unknown in mozwer.dll>
+FUNC 2c4b4 3a 0 <unknown in mozwer.dll>
+FUNC 2c4f0 3b 0 <unknown in mozwer.dll>
+FUNC 2c52c 4e 0 <unknown in mozwer.dll>
+FUNC 2c5c4 5e 0 <unknown in mozwer.dll>
+FUNC 2c664 61 0 <unknown in mozwer.dll>
+FUNC 2c6c8 76 0 <unknown in mozwer.dll>
+FUNC 2c740 2a 0 <unknown in mozwer.dll>
+FUNC 2c76c 2e 0 <unknown in mozwer.dll>
+FUNC 2c79c 2a 0 <unknown in mozwer.dll>
+FUNC 2c7c8 2e 0 <unknown in mozwer.dll>
+FUNC 2c7f8 2a 0 <unknown in mozwer.dll>
+FUNC 2c824 2e 0 <unknown in mozwer.dll>
+FUNC 2c854 2a 0 <unknown in mozwer.dll>
+FUNC 2c880 2e 0 <unknown in mozwer.dll>
+FUNC 2c8b0 2a 0 <unknown in mozwer.dll>
+FUNC 2c8dc 2e 0 <unknown in mozwer.dll>
+FUNC 2c90c 2a 0 <unknown in mozwer.dll>
+FUNC 2c938 2e 0 <unknown in mozwer.dll>
+FUNC 2c968 2a 0 <unknown in mozwer.dll>
+FUNC 2c994 2e 0 <unknown in mozwer.dll>
+FUNC 2c9c4 2a 0 <unknown in mozwer.dll>
+FUNC 2c9f0 2e 0 <unknown in mozwer.dll>
+FUNC 2ca20 2a 0 <unknown in mozwer.dll>
+FUNC 2ca4c 2e 0 <unknown in mozwer.dll>
+FUNC 2ca7c 2a 0 <unknown in mozwer.dll>
+FUNC 2caa8 2e 0 <unknown in mozwer.dll>
+FUNC 2cad8 2a 0 <unknown in mozwer.dll>
+FUNC 2cb04 2e 0 <unknown in mozwer.dll>
+FUNC 2cb34 2a 0 <unknown in mozwer.dll>
+FUNC 2cb60 2e 0 <unknown in mozwer.dll>
+FUNC 2cf30 1e 0 <unknown in mozwer.dll>
+FUNC 2cf50 18 0 <unknown in mozwer.dll>
+FUNC 2cf90 2a 0 <unknown in mozwer.dll>
+FUNC 2cfbc 2e 0 <unknown in mozwer.dll>
+FUNC 2cfec 2a 0 <unknown in mozwer.dll>
+FUNC 2d018 2e 0 <unknown in mozwer.dll>
+FUNC 2d048 2a 0 <unknown in mozwer.dll>
+FUNC 2d074 2e 0 <unknown in mozwer.dll>
+FUNC 2d0a4 2a 0 <unknown in mozwer.dll>
+FUNC 2d0d0 2e 0 <unknown in mozwer.dll>
+FUNC 2d100 2e 0 <unknown in mozwer.dll>
+FUNC 2d130 2e 0 <unknown in mozwer.dll>
+FUNC 2d160 2e 0 <unknown in mozwer.dll>
+FUNC 2d190 2e 0 <unknown in mozwer.dll>
+FUNC 2d1c0 2e 0 <unknown in mozwer.dll>
+FUNC 2d1f0 2e 0 <unknown in mozwer.dll>
+FUNC 2d220 2e 0 <unknown in mozwer.dll>
+FUNC 2d250 2e 0 <unknown in mozwer.dll>
+FUNC 2d2b8 25 0 <unknown in mozwer.dll>
+FUNC 2d2ec 2a 0 <unknown in mozwer.dll>
+FUNC 2d324 305 0 <unknown in mozwer.dll>
+FUNC 2d62c 2f0 0 <unknown in mozwer.dll>
+FUNC 2d954 25 0 <unknown in mozwer.dll>
+FUNC 2d98c 2d 0 <unknown in mozwer.dll>
+FUNC 2d9c8 6a8 0 <unknown in mozwer.dll>
+FUNC 2e070 758 0 <unknown in mozwer.dll>
+FUNC 2e824 17e 0 <unknown in mozwer.dll>
+FUNC 2e9a4 4d 0 <unknown in mozwer.dll>
+FUNC 2e9f4 72 0 <unknown in mozwer.dll>
+FUNC 2ea68 14 0 <unknown in mozwer.dll>
+FUNC 2ea7c 19c 0 <unknown in mozwer.dll>
+FUNC 2f97c 31 0 <unknown in mozwer.dll>
+FUNC 2f9b0 31 0 <unknown in mozwer.dll>
+FUNC 2fa50 304 0 <unknown in mozwer.dll>
+FUNC 2fd54 30 0 <unknown in mozwer.dll>
+FUNC 2fd84 a5 0 <unknown in mozwer.dll>
+FUNC 2fe2c 1d2 0 <unknown in mozwer.dll>
+FUNC 30000 db 0 <unknown in mozwer.dll>
+FUNC 300dc 36d 0 <unknown in mozwer.dll>
+FUNC 3044c 143 0 <unknown in mozwer.dll>
+FUNC 30590 a6 0 <unknown in mozwer.dll>
+FUNC 30638 132 0 <unknown in mozwer.dll>
+FUNC 3076c 5e 0 <unknown in mozwer.dll>
+FUNC 307cc 23 0 <unknown in mozwer.dll>
+FUNC 30800 17c 0 <unknown in mozwer.dll>
+FUNC 309a0 26 0 <unknown in mozwer.dll>
+FUNC 309d0 124 0 <unknown in mozwer.dll>
+FUNC 30af4 21 0 <unknown in mozwer.dll>
+FUNC 30b98 5b 0 <unknown in mozwer.dll>
+FUNC 30bf4 1d 0 <unknown in mozwer.dll>
+FUNC 30c30 13 0 <unknown in mozwer.dll>
+FUNC 30c50 3d5 0 <unknown in mozwer.dll>
+FUNC 31054 82 0 <unknown in mozwer.dll>
+FUNC 310e4 69 0 <unknown in mozwer.dll>
+FUNC 31150 bb 0 <unknown in mozwer.dll>
+FUNC 3120c 76 0 <unknown in mozwer.dll>
+FUNC 31284 a2 0 <unknown in mozwer.dll>
+FUNC 31328 a1 0 <unknown in mozwer.dll>
+FUNC 313cc 148 0 <unknown in mozwer.dll>
+FUNC 31514 47f 0 <unknown in mozwer.dll>
+FUNC 31994 65 0 <unknown in mozwer.dll>
+FUNC 319fc a2 0 <unknown in mozwer.dll>
+FUNC 31aa0 166 0 <unknown in mozwer.dll>
+FUNC 31c08 352 0 <unknown in mozwer.dll>
+FUNC 31f5c 1ea 0 <unknown in mozwer.dll>
+FUNC 32148 296 0 <unknown in mozwer.dll>
+FUNC 323e0 2e 0 <unknown in mozwer.dll>
+FUNC 32410 2c 0 <unknown in mozwer.dll>
+FUNC 3243c 26 0 <unknown in mozwer.dll>
+FUNC 32464 4e 0 <unknown in mozwer.dll>
+FUNC 324b4 26 0 <unknown in mozwer.dll>
+FUNC 324e4 1b 0 <unknown in mozwer.dll>
+FUNC 32508 1b 0 <unknown in mozwer.dll>
+FUNC 32550 26 0 <unknown in mozwer.dll>
+FUNC 32590 26 0 <unknown in mozwer.dll>
+FUNC 325b8 be 0 <unknown in mozwer.dll>
+FUNC 326ac 1b 0 <unknown in mozwer.dll>
+FUNC 326d0 1b 0 <unknown in mozwer.dll>
+FUNC 32700 8e 0 <unknown in mozwer.dll>
+FUNC 327b4 11d 0 <unknown in mozwer.dll>
+FUNC 328f8 26 0 <unknown in mozwer.dll>
+FUNC 32974 72 0 <unknown in mozwer.dll>
+FUNC 329e8 6f 0 <unknown in mozwer.dll>
+FUNC 32a58 89 0 <unknown in mozwer.dll>
+FUNC 32ae4 8f 0 <unknown in mozwer.dll>
+FUNC 32b74 10a 0 <unknown in mozwer.dll>
+FUNC 32c80 47 0 <unknown in mozwer.dll>
+FUNC 32cc8 1ff 0 <unknown in mozwer.dll>
+FUNC 32ec8 34 0 <unknown in mozwer.dll>
+FUNC 32efc 59 0 <unknown in mozwer.dll>
+FUNC 32f58 48 0 <unknown in mozwer.dll>
+FUNC 32fa0 77 0 <unknown in mozwer.dll>
+FUNC 33018 3f 0 <unknown in mozwer.dll>
+FUNC 33088 6e 0 <unknown in mozwer.dll>
+FUNC 33118 3e 0 <unknown in mozwer.dll>
+FUNC 33178 41 0 <unknown in mozwer.dll>
+FUNC 331dc 13a 0 <unknown in mozwer.dll>
+FUNC 3331c 29 0 <unknown in mozwer.dll>
+FUNC 33348 3c 0 <unknown in mozwer.dll>
+FUNC 33384 51 0 <unknown in mozwer.dll>
+FUNC 333d8 51 0 <unknown in mozwer.dll>
+FUNC 3342c 6c 0 <unknown in mozwer.dll>
+FUNC 334ac 38 0 <unknown in mozwer.dll>
+FUNC 334f8 4c 0 <unknown in mozwer.dll>
+FUNC 33558 4c 0 <unknown in mozwer.dll>
+FUNC 335d4 69 0 <unknown in mozwer.dll>
+FUNC 33640 75 0 <unknown in mozwer.dll>
+FUNC 336d8 14 0 <unknown in mozwer.dll>
+FUNC 336f4 24 0 <unknown in mozwer.dll>
+FUNC 33720 49 0 <unknown in mozwer.dll>
+FUNC 3377c 9d 0 <unknown in mozwer.dll>
+FUNC 33838 22 0 <unknown in mozwer.dll>
+FUNC 33878 5c 0 <unknown in mozwer.dll>
+FUNC 338d4 31 0 <unknown in mozwer.dll>
+FUNC 33908 22 0 <unknown in mozwer.dll>
+FUNC 3392c 176 0 <unknown in mozwer.dll>
+FUNC 33aa8 9d 0 <unknown in mozwer.dll>
+FUNC 33b64 22 0 <unknown in mozwer.dll>
+FUNC 33ba4 5b 0 <unknown in mozwer.dll>
+FUNC 33c00 31 0 <unknown in mozwer.dll>
+FUNC 33c34 22 0 <unknown in mozwer.dll>
+FUNC 33c58 18a 0 <unknown in mozwer.dll>
+FUNC 33de8 209 0 <unknown in mozwer.dll>
+FUNC 33ff4 3ca 0 <unknown in mozwer.dll>
+FUNC 343c0 25 0 <unknown in mozwer.dll>
+FUNC 343e8 179 0 <unknown in mozwer.dll>
+FUNC 34564 2f 0 <unknown in mozwer.dll>
+FUNC 34594 18b 0 <unknown in mozwer.dll>
+FUNC 3474c de 0 <unknown in mozwer.dll>
+FUNC 3482c 3d 0 <unknown in mozwer.dll>
+FUNC 3486c c7 0 <unknown in mozwer.dll>
+FUNC 3493c 187 0 <unknown in mozwer.dll>
+FUNC 34ac4 30e 0 <unknown in mozwer.dll>
+FUNC 34e14 de 0 <unknown in mozwer.dll>
+FUNC 34ef4 3d 0 <unknown in mozwer.dll>
+FUNC 34f34 c7 0 <unknown in mozwer.dll>
+FUNC 35004 189 0 <unknown in mozwer.dll>
+FUNC 35190 19b 0 <unknown in mozwer.dll>
+FUNC 353a8 22 0 <unknown in mozwer.dll>
+FUNC 353d0 22 0 <unknown in mozwer.dll>
+FUNC 354bc 11e 0 <unknown in mozwer.dll>
+FUNC 355dc 17 0 <unknown in mozwer.dll>
+FUNC 35644 30 0 <unknown in mozwer.dll>
+FUNC 35698 111 0 <unknown in mozwer.dll>
+FUNC 357ac 2f 0 <unknown in mozwer.dll>
+FUNC 357dc 119 0 <unknown in mozwer.dll>
+FUNC 359e4 65 0 <unknown in mozwer.dll>
+FUNC 35b7c 75 0 <unknown in mozwer.dll>
+FUNC 35bf4 95 0 <unknown in mozwer.dll>
+FUNC 35d48 96 0 <unknown in mozwer.dll>
+FUNC 35e24 101 0 <unknown in mozwer.dll>
+FUNC 35f28 9f 0 <unknown in mozwer.dll>
+FUNC 35fc8 11 0 <unknown in mozwer.dll>
+FUNC 3600c 21 0 <unknown in mozwer.dll>
+FUNC 36034 21 0 <unknown in mozwer.dll>
+FUNC 360b8 320 0 <unknown in mozwer.dll>
+FUNC 363d8 322 0 <unknown in mozwer.dll>
+FUNC 36708 25 0 <unknown in mozwer.dll>
+FUNC 36738 81 0 <unknown in mozwer.dll>
+FUNC 367f8 25 0 <unknown in mozwer.dll>
+FUNC 36828 91 0 <unknown in mozwer.dll>
+FUNC 368f0 e5 0 <unknown in mozwer.dll>
+FUNC 369e8 ef 0 <unknown in mozwer.dll>
+FUNC 36b08 a1 0 <unknown in mozwer.dll>
+FUNC 36bac bd 0 <unknown in mozwer.dll>
+FUNC 36c6c 7e 0 <unknown in mozwer.dll>
+FUNC 36cec 49 0 <unknown in mozwer.dll>
+FUNC 36d40 26 0 <unknown in mozwer.dll>
+FUNC 36d88 71 0 <unknown in mozwer.dll>
+FUNC 36e38 56 0 <unknown in mozwer.dll>
+FUNC 36eac ea 0 <unknown in mozwer.dll>
+FUNC 36fa0 1b 0 <unknown in mozwer.dll>
+FUNC 36fc4 1b 0 <unknown in mozwer.dll>
+FUNC 36ff4 40 0 <unknown in mozwer.dll>
+FUNC 37034 9c 0 <unknown in mozwer.dll>
+FUNC 370d0 9c 0 <unknown in mozwer.dll>
+FUNC 37264 96 0 <unknown in mozwer.dll>
+FUNC 372fc 96 0 <unknown in mozwer.dll>
+FUNC 37394 2be 0 <unknown in mozwer.dll>
+FUNC 37674 2ff 0 <unknown in mozwer.dll>
+FUNC 379f4 eb 0 <unknown in mozwer.dll>
+FUNC 37af0 2da 0 <unknown in mozwer.dll>
+FUNC 37dcc 8e 0 <unknown in mozwer.dll>
+FUNC 37e5c 4d0 0 <unknown in mozwer.dll>
+FUNC 3832c 95 0 <unknown in mozwer.dll>
+FUNC 383c4 102 0 <unknown in mozwer.dll>
+FUNC 384c8 119 0 <unknown in mozwer.dll>
+FUNC 385e4 170 0 <unknown in mozwer.dll>
+FUNC 38754 6c 0 <unknown in mozwer.dll>
+FUNC 387c0 ea 0 <unknown in mozwer.dll>
+FUNC 388ac eb 0 <unknown in mozwer.dll>
+FUNC 38998 79 0 <unknown in mozwer.dll>
+FUNC 38a14 e8 0 <unknown in mozwer.dll>
+FUNC 38afc e9 0 <unknown in mozwer.dll>
+FUNC 38be8 e4 0 <unknown in mozwer.dll>
+FUNC 38ccc e8 0 <unknown in mozwer.dll>
+FUNC 38dbc 45 0 <unknown in mozwer.dll>
+FUNC 38e04 46 0 <unknown in mozwer.dll>
+FUNC 38e4c 46 0 <unknown in mozwer.dll>
+FUNC 38e94 51 0 <unknown in mozwer.dll>
+FUNC 38ee8 61 0 <unknown in mozwer.dll>
+FUNC 38f54 5a 0 <unknown in mozwer.dll>
+FUNC 38fb0 e1 0 <unknown in mozwer.dll>
+FUNC 39094 f4 0 <unknown in mozwer.dll>
+FUNC 39188 10b 0 <unknown in mozwer.dll>
+FUNC 39294 14c 0 <unknown in mozwer.dll>
+FUNC 39490 1a 0 <unknown in mozwer.dll>
+FUNC 394cc 29 0 <unknown in mozwer.dll>
+FUNC 394f8 2d 0 <unknown in mozwer.dll>
+FUNC 39528 29 0 <unknown in mozwer.dll>
+FUNC 39554 2d 0 <unknown in mozwer.dll>
+FUNC 39584 29 0 <unknown in mozwer.dll>
+FUNC 395b0 2d 0 <unknown in mozwer.dll>
+FUNC 395e0 29 0 <unknown in mozwer.dll>
+FUNC 3960c 2d 0 <unknown in mozwer.dll>
+FUNC 3963c 29 0 <unknown in mozwer.dll>
+FUNC 39668 29 0 <unknown in mozwer.dll>
+FUNC 39694 29 0 <unknown in mozwer.dll>
+FUNC 396c0 29 0 <unknown in mozwer.dll>
+FUNC 396ec 2d 0 <unknown in mozwer.dll>
+FUNC 3971c 2d 0 <unknown in mozwer.dll>
+FUNC 3974c 2d 0 <unknown in mozwer.dll>
+FUNC 3977c 2d 0 <unknown in mozwer.dll>
+FUNC 397ac 2e 0 <unknown in mozwer.dll>
+FUNC 397dc 2e 0 <unknown in mozwer.dll>
+FUNC 3980c 2e 0 <unknown in mozwer.dll>
+FUNC 3983c 2e 0 <unknown in mozwer.dll>
+FUNC 398b0 7d 0 <unknown in mozwer.dll>
+FUNC 39994 122 0 <unknown in mozwer.dll>
+FUNC 39ab8 13 0 <unknown in mozwer.dll>
+FUNC 39e0c 53 0 <unknown in mozwer.dll>
+FUNC 39e60 2a 0 <unknown in mozwer.dll>
+FUNC 39e8c 64 0 <unknown in mozwer.dll>
+FUNC 39ef0 c9 0 <unknown in mozwer.dll>
+FUNC 39fbc 103 0 <unknown in mozwer.dll>
+FUNC 3a0cc 13f 0 <unknown in mozwer.dll>
+FUNC 3a214 32 0 <unknown in mozwer.dll>
+FUNC 3a248 11f 0 <unknown in mozwer.dll>
+FUNC 3a38c 166 0 <unknown in mozwer.dll>
+FUNC 3a4f4 12 0 <unknown in mozwer.dll>
+FUNC 3a508 18 0 <unknown in mozwer.dll>
+FUNC 3a520 12 0 <unknown in mozwer.dll>
+FUNC 3a534 18 0 <unknown in mozwer.dll>
+FUNC 3a54c 3a 0 <unknown in mozwer.dll>
+FUNC 3a588 53 0 <unknown in mozwer.dll>
+FUNC 3a5dc 86 0 <unknown in mozwer.dll>
+FUNC 3a664 bf 0 <unknown in mozwer.dll>
+FUNC 3a734 51 0 <unknown in mozwer.dll>
+FUNC 3a788 51 0 <unknown in mozwer.dll>
+FUNC 3a804 a4 0 <unknown in mozwer.dll>
+FUNC 3a8a8 95 0 <unknown in mozwer.dll>
+FUNC 3a974 af 0 <unknown in mozwer.dll>
+FUNC 3aa24 f4 0 <unknown in mozwer.dll>
+FUNC 3ab18 87 0 <unknown in mozwer.dll>
+FUNC 3ac78 a8 0 <unknown in mozwer.dll>
+FUNC 3ad20 176 0 <unknown in mozwer.dll>
+FUNC 3aee8 36 0 <unknown in mozwer.dll>
+FUNC 3af20 6c 0 <unknown in mozwer.dll>
+FUNC 3af8c 65 0 <unknown in mozwer.dll>
+FUNC 3aff4 75 0 <unknown in mozwer.dll>
+FUNC 3b06c 101 0 <unknown in mozwer.dll>
+FUNC 3b170 13e 0 <unknown in mozwer.dll>
+FUNC 3b2b0 ba 0 <unknown in mozwer.dll>
+FUNC 3b36c bf 0 <unknown in mozwer.dll>
+FUNC 3b42c a5 0 <unknown in mozwer.dll>
+FUNC 3b4d4 50 0 <unknown in mozwer.dll>
+FUNC 3b524 a8 0 <unknown in mozwer.dll>
+FUNC 3b624 1b 0 <unknown in mozwer.dll>
+FUNC 3b648 1b 0 <unknown in mozwer.dll>
+FUNC 3b6a0 1f 0 <unknown in mozwer.dll>
+FUNC 3b6c0 18d 0 <unknown in mozwer.dll>
+FUNC 3b860 22 0 <unknown in mozwer.dll>
+FUNC 3b888 96 0 <unknown in mozwer.dll>
+FUNC 3b920 315 0 <unknown in mozwer.dll>
+FUNC 3bc40 17 0 <unknown in mozwer.dll>
+FUNC 3bc58 91 0 <unknown in mozwer.dll>
+FUNC 3bcec 69 0 <unknown in mozwer.dll>
+FUNC 3bd60 26 0 <unknown in mozwer.dll>
+FUNC 3bda8 8c 0 <unknown in mozwer.dll>
+FUNC 3be34 33 0 <unknown in mozwer.dll>
+FUNC 3be68 2f 0 <unknown in mozwer.dll>
+FUNC 3bea0 b1 0 <unknown in mozwer.dll>
+FUNC 3bf54 5f 0 <unknown in mozwer.dll>
+FUNC 3bfbc 2b 0 <unknown in mozwer.dll>
+FUNC 3bfec 6f 0 <unknown in mozwer.dll>
+FUNC 3c094 108 0 <unknown in mozwer.dll>
+FUNC 3c260 2c 0 <unknown in mozwer.dll>
+FUNC 3c28c 2c 0 <unknown in mozwer.dll>
+FUNC 3c354 2c 0 <unknown in mozwer.dll>
+FUNC 3c380 2c 0 <unknown in mozwer.dll>
+FUNC 3c3ac 4d 0 <unknown in mozwer.dll>
+FUNC 3c3fc 4b 0 <unknown in mozwer.dll>
+FUNC 3c448 39 0 <unknown in mozwer.dll>
+FUNC 3c484 176 0 <unknown in mozwer.dll>
+FUNC 3c5fc 66 0 <unknown in mozwer.dll>
+FUNC 3c664 3e 0 <unknown in mozwer.dll>
+FUNC 3c6a4 60 0 <unknown in mozwer.dll>
+FUNC 3c704 d1 0 <unknown in mozwer.dll>
+FUNC 3c7e0 251 0 <unknown in mozwer.dll>
+FUNC 3ca34 15e 0 <unknown in mozwer.dll>
+FUNC 3cbbc 2f 0 <unknown in mozwer.dll>
+FUNC 3cc00 661 0 <unknown in mozwer.dll>
+FUNC 3d264 32 0 <unknown in mozwer.dll>
+FUNC 3d298 2f 0 <unknown in mozwer.dll>
+FUNC 3d2c8 2f 0 <unknown in mozwer.dll>
+FUNC 3d300 1b 0 <unknown in mozwer.dll>
+FUNC 3d324 1b 0 <unknown in mozwer.dll>
+FUNC 3d348 1b 0 <unknown in mozwer.dll>
+FUNC 3d36c 1b 0 <unknown in mozwer.dll>
+FUNC 3d3a0 b3 0 <unknown in mozwer.dll>
+FUNC 3d454 1c 0 <unknown in mozwer.dll>
+FUNC 3d5a8 e2 0 <unknown in mozwer.dll>
+FUNC 3d68c 87 0 <unknown in mozwer.dll>
+FUNC 3d714 1231 0 <unknown in mozwer.dll>
+FUNC 3e960 2f 0 <unknown in mozwer.dll>
+FUNC 3e990 2f 0 <unknown in mozwer.dll>
+FUNC 3ea50 67 0 <unknown in mozwer.dll>
+FUNC 3eaf0 74 0 <unknown in mozwer.dll>
+FUNC 3eb64 a1 0 <unknown in mozwer.dll>
+FUNC 3ec05 38 0 <unknown in mozwer.dll>
+FUNC 3ec80 49 0 <unknown in mozwer.dll>
+FUNC 3ecd0 39 0 <unknown in mozwer.dll>
+FUNC 3ed09 1e 0 <unknown in mozwer.dll>
+FUNC 3ed27 4b 0 <unknown in mozwer.dll>
+FUNC 3ed72 2a 0 <unknown in mozwer.dll>
+FUNC 3ed9c 21 0 <unknown in mozwer.dll>
+FUNC 3edc0 e4 0 <unknown in mozwer.dll>
+FUNC 3eea4 f4 0 <unknown in mozwer.dll>
+FUNC 3ef98 187 0 <unknown in mozwer.dll>
+FUNC 3f11f 10 0 <unknown in mozwer.dll>
+FUNC 3f12f 1b 0 <unknown in mozwer.dll>
+FUNC 3f14a 1e 0 <unknown in mozwer.dll>
+FUNC 3f170 5a8 0 <unknown in mozwer.dll>
+FUNC 3f750 22c 0 <unknown in mozwer.dll>
+FUNC 3f97c 1b4 0 <unknown in mozwer.dll>
+FUNC 3fb30 49 0 <unknown in mozwer.dll>
+FUNC 3fb7c 3b 0 <unknown in mozwer.dll>
+FUNC 3fbb8 14 0 <unknown in mozwer.dll>
+FUNC 3fbcc 114d 0 <unknown in mozwer.dll>
+FUNC 40d1c 29 0 <unknown in mozwer.dll>
+FUNC 40d50 533 0 <unknown in mozwer.dll>
+FUNC 41284 10a 0 <unknown in mozwer.dll>
+FUNC 413cc 1b 0 <unknown in mozwer.dll>
+FUNC 413f0 1b 0 <unknown in mozwer.dll>
+FUNC 41420 2e8 0 <unknown in mozwer.dll>
+FUNC 41708 6c 0 <unknown in mozwer.dll>
+FUNC 417b0 9c 0 <unknown in mozwer.dll>
+FUNC 4184c 108 0 <unknown in mozwer.dll>
+FUNC 41954 33e 0 <unknown in mozwer.dll>
+FUNC 41c94 77 0 <unknown in mozwer.dll>
+FUNC 41d14 1b 0 <unknown in mozwer.dll>
+FUNC 41d38 1b 0 <unknown in mozwer.dll>
+FUNC 41d68 58 0 <unknown in mozwer.dll>
+FUNC 41e10 7f 0 <unknown in mozwer.dll>
+FUNC 41e90 86 0 <unknown in mozwer.dll>
+FUNC 41f18 fd 0 <unknown in mozwer.dll>
+FUNC 42018 f6 0 <unknown in mozwer.dll>
+FUNC 42110 e4 0 <unknown in mozwer.dll>
+FUNC 421f4 db 0 <unknown in mozwer.dll>
+FUNC 42344 263 0 <unknown in mozwer.dll>
+FUNC 425a8 99 0 <unknown in mozwer.dll>
+FUNC 42644 cf 0 <unknown in mozwer.dll>
+FUNC 42720 2ea 0 <unknown in mozwer.dll>
+FUNC 42a0c 98 0 <unknown in mozwer.dll>
+FUNC 42ab0 ea 0 <unknown in mozwer.dll>
+FUNC 42b9c a5 0 <unknown in mozwer.dll>
+FUNC 42c44 c9 0 <unknown in mozwer.dll>
+FUNC 42d10 63 0 <unknown in mozwer.dll>
+FUNC 42d74 77 0 <unknown in mozwer.dll>
+FUNC 42e1c 27e 0 <unknown in mozwer.dll>
+FUNC 4309c 7f 0 <unknown in mozwer.dll>
+FUNC 4311c cd 0 <unknown in mozwer.dll>
+FUNC 431f0 24a 0 <unknown in mozwer.dll>
+FUNC 4343c 96 0 <unknown in mozwer.dll>
+FUNC 434e0 108 0 <unknown in mozwer.dll>
+FUNC 435e8 5f 0 <unknown in mozwer.dll>
+FUNC 43650 e8 0 <unknown in mozwer.dll>
+FUNC 43738 21 0 <unknown in mozwer.dll>
+FUNC 4375c ae 0 <unknown in mozwer.dll>
+FUNC 43830 ab 0 <unknown in mozwer.dll>
+FUNC 43970 c7 0 <unknown in mozwer.dll>
+FUNC 43a40 5b 0 <unknown in mozwer.dll>
+FUNC 43a9b 334 0 <unknown in mozwer.dll>
+FUNC 43dcf 1e 0 <unknown in mozwer.dll>
+FUNC 43e20 17 0 <unknown in mozwer.dll>
+FUNC 43e37 a4 0 <unknown in mozwer.dll>
+FUNC 43edb 1 0 <unknown in mozwer.dll>
+FUNC 43edc d3 0 <unknown in mozwer.dll>
+FUNC 43fb0 c6 0 <unknown in mozwer.dll>
+FUNC 44080 3e0 0 <unknown in mozwer.dll>
+FUNC 44460 9e 0 <unknown in mozwer.dll>
+FUNC 44508 94 0 <unknown in mozwer.dll>
+FUNC 4459c 39 0 <unknown in mozwer.dll>
+FUNC 445e0 7a 0 <unknown in mozwer.dll>
+FUNC 44758 4f 0 <unknown in mozwer.dll>
+FUNC 447a8 f0 0 <unknown in mozwer.dll>
+FUNC 448b0 100 0 <unknown in mozwer.dll>
+FUNC 449b0 197 0 <unknown in mozwer.dll>
+FUNC 44b48 25 0 <unknown in mozwer.dll>
+FUNC 44b70 179 0 <unknown in mozwer.dll>
+FUNC 44cec 46 0 <unknown in mozwer.dll>
+FUNC 44d34 150 0 <unknown in mozwer.dll>
+FUNC 44f2c 4f 0 <unknown in mozwer.dll>
+FUNC 44f7c ad 0 <unknown in mozwer.dll>
+FUNC 45078 32 0 <unknown in mozwer.dll>
+FUNC 450b4 32 0 <unknown in mozwer.dll>
+FUNC 450f0 117 0 <unknown in mozwer.dll>
+FUNC 45208 3e7 0 <unknown in mozwer.dll>
+FUNC 455f0 23 0 <unknown in mozwer.dll>
+FUNC 45614 b0 0 <unknown in mozwer.dll>
+FUNC 456c4 23 0 <unknown in mozwer.dll>
+FUNC 456e8 b0 0 <unknown in mozwer.dll>
+FUNC 45798 c3 0 <unknown in mozwer.dll>
+FUNC 4585c c3 0 <unknown in mozwer.dll>
+FUNC 45920 37 0 <unknown in mozwer.dll>
+FUNC 45958 5a 0 <unknown in mozwer.dll>
+FUNC 459b4 7c 0 <unknown in mozwer.dll>
+FUNC 45a30 56 0 <unknown in mozwer.dll>
+FUNC 45a88 4b 0 <unknown in mozwer.dll>
+FUNC 45ad4 20a 0 <unknown in mozwer.dll>
+FUNC 45ce0 c1 0 <unknown in mozwer.dll>
+FUNC 45da4 291 0 <unknown in mozwer.dll>
+FUNC 46038 41 0 <unknown in mozwer.dll>
+FUNC 4607c 41 0 <unknown in mozwer.dll>
+FUNC 461a0 25 0 <unknown in mozwer.dll>
+FUNC 461c8 179 0 <unknown in mozwer.dll>
+FUNC 4636c 9e 0 <unknown in mozwer.dll>
+FUNC 4640c 33 0 <unknown in mozwer.dll>
+FUNC 46440 eb 0 <unknown in mozwer.dll>
+FUNC 4652c ef 0 <unknown in mozwer.dll>
+FUNC 4661c f3 0 <unknown in mozwer.dll>
+FUNC 46710 99 0 <unknown in mozwer.dll>
+FUNC 467ac 3b 0 <unknown in mozwer.dll>
+FUNC 467e8 3b 0 <unknown in mozwer.dll>
+FUNC 46838 26 0 <unknown in mozwer.dll>
+FUNC 46880 40 0 <unknown in mozwer.dll>
+FUNC 468d0 51 0 <unknown in mozwer.dll>
+FUNC 46924 119 0 <unknown in mozwer.dll>
+FUNC 46a40 456 0 <unknown in mozwer.dll>
+FUNC 46f00 8f 0 <unknown in mozwer.dll>
+FUNC 46f90 19b 0 <unknown in mozwer.dll>
+FUNC 4712c 1bd 0 <unknown in mozwer.dll>
+FUNC 472ec 27b 0 <unknown in mozwer.dll>
+FUNC 47568 66 0 <unknown in mozwer.dll>
+FUNC 475f8 66 0 <unknown in mozwer.dll>
+FUNC 47660 27 0 <unknown in mozwer.dll>
+FUNC 47694 3b 0 <unknown in mozwer.dll>
+FUNC 476d0 29 0 <unknown in mozwer.dll>
+FUNC 47704 e7 0 <unknown in mozwer.dll>
+FUNC 47874 3d 0 <unknown in mozwer.dll>
+FUNC 478b4 1e 0 <unknown in mozwer.dll>
+FUNC 478d4 53 0 <unknown in mozwer.dll>
+FUNC 4797c ce 0 <unknown in mozwer.dll>
+FUNC 47a4c c7 0 <unknown in mozwer.dll>
+FUNC 47bb4 36 0 <unknown in mozwer.dll>
+FUNC 47cdc 7a 0 <unknown in mozwer.dll>
+FUNC 47d64 1d 0 <unknown in mozwer.dll>
+FUNC 47dd4 39 0 <unknown in mozwer.dll>
+FUNC 47e20 4e 0 <unknown in mozwer.dll>
+FUNC 47ff8 18a 0 <unknown in mozwer.dll>
+FUNC 48184 96 0 <unknown in mozwer.dll>
+FUNC 48254 28 0 <unknown in mozwer.dll>
+FUNC 48280 1ea 0 <unknown in mozwer.dll>
+FUNC 48554 2e6 0 <unknown in mozwer.dll>
+FUNC 4883c 62 0 <unknown in mozwer.dll>
+FUNC 48910 250 0 <unknown in mozwer.dll>
+FUNC 48b94 32 0 <unknown in mozwer.dll>
+FUNC 48c00 42 0 <unknown in mozwer.dll>
+FUNC 48c78 3c 0 <unknown in mozwer.dll>
+FUNC 48cc0 42 0 <unknown in mozwer.dll>
+FUNC 48d04 1b 0 <unknown in mozwer.dll>
+FUNC 48d30 87 0 <unknown in mozwer.dll>
+FUNC 48db8 30 0 <unknown in mozwer.dll>
+FUNC 48de8 ed 0 <unknown in mozwer.dll>
+FUNC 48ed8 88 0 <unknown in mozwer.dll>
+FUNC 48f60 237 0 <unknown in mozwer.dll>
+FUNC 49198 294 0 <unknown in mozwer.dll>
+FUNC 4942c 13d 0 <unknown in mozwer.dll>
+FUNC 4956c 142 0 <unknown in mozwer.dll>
+FUNC 496cc 1fe 0 <unknown in mozwer.dll>
+FUNC 498cc 201 0 <unknown in mozwer.dll>
+FUNC 49ad0 c0 0 <unknown in mozwer.dll>
+FUNC 49b90 c1 0 <unknown in mozwer.dll>
+FUNC 49c54 4f0 0 <unknown in mozwer.dll>
+FUNC 4a144 50f 0 <unknown in mozwer.dll>
+FUNC 4a654 d1 0 <unknown in mozwer.dll>
+FUNC 4a728 215 0 <unknown in mozwer.dll>
+FUNC 4a940 d1 0 <unknown in mozwer.dll>
+FUNC 4aa14 2ef 0 <unknown in mozwer.dll>
+FUNC 4ad14 15d 0 <unknown in mozwer.dll>
+FUNC 4ae78 2b 0 <unknown in mozwer.dll>
+FUNC 4aea4 a7 0 <unknown in mozwer.dll>
+FUNC 4af74 1dc 0 <unknown in mozwer.dll>
+FUNC 4b150 1c8 0 <unknown in mozwer.dll>
+FUNC 4b318 179 0 <unknown in mozwer.dll>
+FUNC 4b494 20 0 <unknown in mozwer.dll>
+FUNC 4b4b4 4c 0 <unknown in mozwer.dll>
+FUNC 4b500 50 0 <unknown in mozwer.dll>
+FUNC 4b620 5ab 0 <unknown in mozwer.dll>
+FUNC 4bbcc 20 0 <unknown in mozwer.dll>
+FUNC 4bbec 30 0 <unknown in mozwer.dll>
+FUNC 4bc1c 20 0 <unknown in mozwer.dll>
+FUNC 4bc3c 30 0 <unknown in mozwer.dll>
+FUNC 4bc6c 13 0 <unknown in mozwer.dll>
+FUNC 4bc80 23 0 <unknown in mozwer.dll>
+FUNC 4bca4 21 0 <unknown in mozwer.dll>
+FUNC 4bcc8 31 0 <unknown in mozwer.dll>
+FUNC 4bcfc 13 0 <unknown in mozwer.dll>
+FUNC 4bd10 23 0 <unknown in mozwer.dll>
+FUNC 4bd34 20 0 <unknown in mozwer.dll>
+FUNC 4bd54 30 0 <unknown in mozwer.dll>
+FUNC 4bd84 20 0 <unknown in mozwer.dll>
+FUNC 4bda4 30 0 <unknown in mozwer.dll>
+FUNC 4bdd4 13 0 <unknown in mozwer.dll>
+FUNC 4bde8 23 0 <unknown in mozwer.dll>
+FUNC 4be0c 21 0 <unknown in mozwer.dll>
+FUNC 4be30 31 0 <unknown in mozwer.dll>
+FUNC 4be64 13 0 <unknown in mozwer.dll>
+FUNC 4be78 23 0 <unknown in mozwer.dll>
+FUNC 4be9c 67 0 <unknown in mozwer.dll>
+FUNC 4bf04 c6 0 <unknown in mozwer.dll>
+FUNC 4bfcc 67 0 <unknown in mozwer.dll>
+FUNC 4c034 cb 0 <unknown in mozwer.dll>
+FUNC 4c100 69 0 <unknown in mozwer.dll>
+FUNC 4c16c d4 0 <unknown in mozwer.dll>
+FUNC 4c240 69 0 <unknown in mozwer.dll>
+FUNC 4c2ac d9 0 <unknown in mozwer.dll>
+FUNC 4c388 46 0 <unknown in mozwer.dll>
+FUNC 4c3d0 127 0 <unknown in mozwer.dll>
+FUNC 4c570 bd 0 <unknown in mozwer.dll>
+FUNC 4c630 89 0 <unknown in mozwer.dll>
+FUNC 4c6bc 35d 0 <unknown in mozwer.dll>
+FUNC 4ca24 bb 0 <unknown in mozwer.dll>
+FUNC 4cae0 101 0 <unknown in mozwer.dll>
+FUNC 4cbe4 3d 0 <unknown in mozwer.dll>
+FUNC 4cc24 2f 0 <unknown in mozwer.dll>
+FUNC 4cc54 de 0 <unknown in mozwer.dll>
+FUNC 4cd3c 15 0 <unknown in mozwer.dll>
+FUNC 4cd54 c7 0 <unknown in mozwer.dll>
+FUNC 4ce1c 16c 0 <unknown in mozwer.dll>
+FUNC 4cf88 53 0 <unknown in mozwer.dll>
+FUNC 4cfe8 26 0 <unknown in mozwer.dll>
+FUNC 4d010 55 0 <unknown in mozwer.dll>
+FUNC 4d098 76 0 <unknown in mozwer.dll>
+FUNC 4d124 3d 0 <unknown in mozwer.dll>
+FUNC 4d164 52 0 <unknown in mozwer.dll>
+FUNC 4d1b8 be 0 <unknown in mozwer.dll>
+FUNC 4d278 3b 0 <unknown in mozwer.dll>
+FUNC 4d2c0 1c 0 <unknown in mozwer.dll>
+FUNC 4d2dc 27 0 <unknown in mozwer.dll>
+FUNC 4d31c aa 0 <unknown in mozwer.dll>
+FUNC 4d3e0 40 0 <unknown in mozwer.dll>
+FUNC 4d430 2a 0 <unknown in mozwer.dll>
+FUNC 4d460 26 0 <unknown in mozwer.dll>
+FUNC 4d490 47 0 <unknown in mozwer.dll>
+FUNC 4d4d8 8d 0 <unknown in mozwer.dll>
+FUNC 4d568 25 0 <unknown in mozwer.dll>
+FUNC 4d598 1b 0 <unknown in mozwer.dll>
+FUNC 4d5bc 1b 0 <unknown in mozwer.dll>
+FUNC 4d5f4 a0 0 <unknown in mozwer.dll>
+FUNC 4d694 85 0 <unknown in mozwer.dll>
+FUNC 4d71c 40 0 <unknown in mozwer.dll>
+FUNC 4d75c a3 0 <unknown in mozwer.dll>
+FUNC 4d800 a4 0 <unknown in mozwer.dll>
+FUNC 4d8a4 a3 0 <unknown in mozwer.dll>
+FUNC 4d948 a4 0 <unknown in mozwer.dll>
+FUNC 4dce8 147 0 <unknown in mozwer.dll>
+FUNC 4e0d8 137 0 <unknown in mozwer.dll>
+FUNC 4e414 6e 0 <unknown in mozwer.dll>
+FUNC 4e490 34 0 <unknown in mozwer.dll>
+FUNC 4e720 2be 0 <unknown in mozwer.dll>
+FUNC 4e9e0 65 0 <unknown in mozwer.dll>
+FUNC 4ea48 ba 0 <unknown in mozwer.dll>
+FUNC 4eb14 133 0 <unknown in mozwer.dll>
+FUNC 4ec64 127 0 <unknown in mozwer.dll>
+FUNC 4edb0 70 0 <unknown in mozwer.dll>
+FUNC 4ee20 9c 0 <unknown in mozwer.dll>
+FUNC 4eebc 20 0 <unknown in mozwer.dll>
+FUNC 4eedc 20 0 <unknown in mozwer.dll>
+FUNC 4eefc 96 0 <unknown in mozwer.dll>
+FUNC 4ef94 20 0 <unknown in mozwer.dll>
+FUNC 4efc0 20 0 <unknown in mozwer.dll>
+FUNC 4efe0 87 0 <unknown in mozwer.dll>
+FUNC 4f070 9c 0 <unknown in mozwer.dll>
+FUNC 4f120 10 0 <unknown in mozwer.dll>
+FUNC 4f170 f1 0 <unknown in mozwer.dll>
+FUNC 4f264 106 0 <unknown in mozwer.dll>
+FUNC 4f3b8 2e 0 <unknown in mozwer.dll>
+FUNC 4f3e8 267 0 <unknown in mozwer.dll>
+FUNC 4f650 2a 0 <unknown in mozwer.dll>
+FUNC 4f67c 27 0 <unknown in mozwer.dll>
+FUNC 4f6a4 d4 0 <unknown in mozwer.dll>
+FUNC 4f7ac 30d 0 <unknown in mozwer.dll>
+FUNC 4fabc 1d 0 <unknown in mozwer.dll>
+FUNC 4fadc 7c 0 <unknown in mozwer.dll>
+FUNC 4fb58 11 0 <unknown in mozwer.dll>
+FUNC 4fb6c 1f 0 <unknown in mozwer.dll>
+FUNC 4fb8c 1e 0 <unknown in mozwer.dll>
+FUNC 4fbc8 133 0 <unknown in mozwer.dll>
+FUNC 4fd04 200 0 <unknown in mozwer.dll>
+FUNC 50190 2 0 <unknown in mozwer.dll>
+FUNC 501b0 6 0 <unknown in mozwer.dll>
+FUNC 501b6 17 0 <unknown in mozwer.dll>
+FUNC 501cd 19 0 <unknown in mozwer.dll>
+FUNC 501e6 14 0 <unknown in mozwer.dll>
+FUNC 501fa 36 0 <unknown in mozwer.dll>
+FUNC 50230 18 0 <unknown in mozwer.dll>
+FUNC 50248 96 0 <unknown in mozwer.dll>
+FUNC 502de 1b 0 <unknown in mozwer.dll>
+FUNC 502f9 1b 0 <unknown in mozwer.dll>
+FUNC 50314 1b 0 <unknown in mozwer.dll>
+FUNC 5032f 1b 0 <unknown in mozwer.dll>
+FUNC 5034a 1b 0 <unknown in mozwer.dll>
+FUNC 50365 1b 0 <unknown in mozwer.dll>
+FUNC 50380 1a 0 <unknown in mozwer.dll>
+FUNC 5039a 1b 0 <unknown in mozwer.dll>
+FUNC 503b5 1a 0 <unknown in mozwer.dll>
+FUNC 503cf 1a 0 <unknown in mozwer.dll>
+FUNC 503e9 18 0 <unknown in mozwer.dll>
+FUNC 50401 2b 0 <unknown in mozwer.dll>
+FUNC 5042c 2b 0 <unknown in mozwer.dll>
+FUNC 50457 1b 0 <unknown in mozwer.dll>
+FUNC 50480 20 0 <unknown in mozwer.dll>
+FUNC 504ac 16 0 <unknown in mozwer.dll>
+FUNC 504c2 1a 0 <unknown in mozwer.dll>
+FUNC 504dc 1a 0 <unknown in mozwer.dll>
+FUNC 504f6 1a 0 <unknown in mozwer.dll>
+FUNC 50510 1a 0 <unknown in mozwer.dll>
+FUNC 5052a 1a 0 <unknown in mozwer.dll>
+FUNC 50544 19 0 <unknown in mozwer.dll>
+FUNC 5055d 1a 0 <unknown in mozwer.dll>
+FUNC 50577 19 0 <unknown in mozwer.dll>
+FUNC 50590 16 0 <unknown in mozwer.dll>
+FUNC 505a6 16 0 <unknown in mozwer.dll>
+FUNC 505bc 1a 0 <unknown in mozwer.dll>
+FUNC 505d6 19 0 <unknown in mozwer.dll>
+FUNC 505ef 21 0 <unknown in mozwer.dll>
+FUNC 50610 19 0 <unknown in mozwer.dll>
+FUNC 50629 1b 0 <unknown in mozwer.dll>
+FUNC 50644 1d 0 <unknown in mozwer.dll>
+FUNC 50661 1b 0 <unknown in mozwer.dll>
+FUNC 5067c 18 0 <unknown in mozwer.dll>
+FUNC 50694 1a 0 <unknown in mozwer.dll>
+FUNC 506ae 1a 0 <unknown in mozwer.dll>
+FUNC 506c8 1a 0 <unknown in mozwer.dll>
+FUNC 506e2 1a 0 <unknown in mozwer.dll>
+FUNC 506fc 21 0 <unknown in mozwer.dll>
+FUNC 5071d 1a 0 <unknown in mozwer.dll>
+FUNC 50737 19 0 <unknown in mozwer.dll>
+FUNC 50750 19 0 <unknown in mozwer.dll>
+FUNC 50769 1a 0 <unknown in mozwer.dll>
+FUNC 50783 19 0 <unknown in mozwer.dll>
+FUNC 5079c 17 0 <unknown in mozwer.dll>
+FUNC 507b3 91 0 <unknown in mozwer.dll>
+FUNC 50844 9f 0 <unknown in mozwer.dll>
+FUNC 508e3 19 0 <unknown in mozwer.dll>
+FUNC 508fc 19 0 <unknown in mozwer.dll>
+FUNC 50915 19 0 <unknown in mozwer.dll>
+FUNC 5092e 41 0 <unknown in mozwer.dll>
+FUNC 5096f 1a 0 <unknown in mozwer.dll>
+FUNC 50989 19 0 <unknown in mozwer.dll>
+FUNC 509a2 47 0 <unknown in mozwer.dll>
+FUNC 509e9 47 0 <unknown in mozwer.dll>
+FUNC 50a30 53 0 <unknown in mozwer.dll>
+FUNC 50a83 53 0 <unknown in mozwer.dll>
+FUNC 50ad6 17 0 <unknown in mozwer.dll>
+FUNC 50aed 17 0 <unknown in mozwer.dll>
+FUNC 50b04 1a 0 <unknown in mozwer.dll>
+FUNC 50b1e 17 0 <unknown in mozwer.dll>
+FUNC 50b35 25 0 <unknown in mozwer.dll>
+FUNC 50b5a 78 0 <unknown in mozwer.dll>
+FUNC 50bd2 2f 0 <unknown in mozwer.dll>
+FUNC 50c01 83 0 <unknown in mozwer.dll>
+FUNC 50c84 16 0 <unknown in mozwer.dll>
+FUNC 50c9a 23 0 <unknown in mozwer.dll>
+FUNC 50cbd 16 0 <unknown in mozwer.dll>
+FUNC 50cd3 23 0 <unknown in mozwer.dll>
+FUNC 50cf6 17 0 <unknown in mozwer.dll>
+FUNC 50d0d 1a 0 <unknown in mozwer.dll>
+FUNC 50d27 2c 0 <unknown in mozwer.dll>
+FUNC 50d53 2c 0 <unknown in mozwer.dll>
+PUBLIC 50d7f 0 <unknown in mozwer.dll>
 STACK CFI INIT 1000 94 .cfa: $rsp 8 + .ra: .cfa 8 - ^
 STACK CFI 1000 .cfa: $rsp 80 +
 STACK CFI INIT 10a0 267 .cfa: $rsp 8 + .ra: .cfa 8 - ^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"6a0fd5291935caf64fa59deb27cf2fd8c59e1a48b184c29b37117a86981fc64b","Cargo.lock":"7978ec083868a1a0bd9dd28e8d490e290118940a74c6a021d1b5388f32a11995","Cargo.toml":"e024cf87a29249d693a94a6f5a8a64293e2ba041a1580ad471c98062d9ecd70e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"e99d88d232bf57d70f0fb87f6b496d44b6653f99f8a63d250a54c61ea4bcde40","README.md":"0d1090019193c11715a619c9602dc6f82b65cb2b3f22bbdda7ad964ff6963dc7","bench.plot.r":"6a5d7a4d36ed6b3d9919be703a479bef47698bf947818b483ff03951df2d4e01","benchmark.sh":"7b00323c126f6249ccff9b1824b7a8a237d623af202418d764df195c01e16272","coverage":"4f6b504b55aa623f5d1e8213e7c27683e901b981c621efdf146485c34e0fc963","examples/addr2line.rs":"84758ab26ae68b464d65c6de81a417fb564bb73b5b43ffb97ad02cedd49aec74","rustfmt.toml":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/lazy.rs":"14ec61761369c21d426673f549c21394221533f444b68cd2a8370952eb19f345","src/lib.rs":"168a4abe96ae669218513e9b22c27d59438fe42173d9eb0f1a34dbea67641111","tests/correctness.rs":"c9325ffdec577bf5e56f5dd72fdff4927153d0a4c34c0fda5aefaeb44a8d26fd","tests/output_equivalence.rs":"38d7b585b7a2ca43b07eef6b34c11f489d1deae138a010123c33188dfb881c11","tests/parse.rs":"187e3d9377d9294aca569557fd55b5f1153608395f701c897e2a7f2e0cc159c6"},"package":"7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"4362117bf8d2b20638481835c77256d2f5b16129f0b8ebb7ac958eda753c397a","Cargo.lock":"b7f3eac84ef76e58c1ac2e1626a99c01d7c50fb57e638959c15463041615fce5","Cargo.toml":"84c6c137d3b630bd0fd4b11c03268fb806abec89770f3b7b5369d1e52e8cfc5b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"e99d88d232bf57d70f0fb87f6b496d44b6653f99f8a63d250a54c61ea4bcde40","README.md":"478c2d561386358d0894e08ec09101a379b598acde1314f7768504485dd9de09","bench.plot.r":"6a5d7a4d36ed6b3d9919be703a479bef47698bf947818b483ff03951df2d4e01","benchmark.sh":"7b00323c126f6249ccff9b1824b7a8a237d623af202418d764df195c01e16272","coverage":"4f6b504b55aa623f5d1e8213e7c27683e901b981c621efdf146485c34e0fc963","examples/addr2line.rs":"75ef29e1d07d49d247990ad970892d64f629766bafa36afddff5a88976e58060","rustfmt.toml":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/function.rs":"28fa8f15522149a4e73b1c7e9c7fd1256921ea59fc38ba4c71e926802e1dc7bc","src/lazy.rs":"14ec61761369c21d426673f549c21394221533f444b68cd2a8370952eb19f345","src/lib.rs":"5696c0aee67df576f78935c66bb124f4e5fa19cbc9b25faf8f750e7e8dda113c","tests/correctness.rs":"c9325ffdec577bf5e56f5dd72fdff4927153d0a4c34c0fda5aefaeb44a8d26fd","tests/output_equivalence.rs":"38d7b585b7a2ca43b07eef6b34c11f489d1deae138a010123c33188dfb881c11","tests/parse.rs":"9e421ea9d9348721f6c6533cdba1db5b84287fc685f870c7905dea06b596b4db"},"package":"3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,19 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
-version = "0.12.2"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c"
+checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a"
 dependencies = [
- "gimli 0.21.0",
+ "gimli 0.24.0",
 ]
 
 [[package]]
 name = "addr2line"
-version = "0.14.0"
+version = "0.16.0"
 dependencies = [
  "backtrace",
  "clap",
@@ -19,27 +21,22 @@
  "cpp_demangle",
  "fallible-iterator",
  "findshlibs",
- "gimli 0.23.0",
+ "gimli 0.25.0",
  "memmap",
- "object 0.22.0",
+ "object 0.26.0",
  "rustc-demangle",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
  "rustc-test",
  "smallvec",
+ "typed-arena",
 ]
 
 [[package]]
 name = "adler"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10"
-
-[[package]]
-name = "adler32"
-version = "1.1.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ansi_term"
@@ -62,16 +59,23 @@
 ]
 
 [[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
 name = "backtrace"
-version = "0.3.49"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c"
+checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282"
 dependencies = [
- "addr2line 0.12.2",
+ "addr2line 0.15.2",
+ "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.3.7",
- "object 0.20.0",
+ "miniz_oxide",
+ "object 0.25.3",
  "rustc-demangle",
 ]
 
@@ -82,16 +86,22 @@
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
+name = "cc"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+
+[[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "2.33.1"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
  "ansi_term",
  "atty",
@@ -104,25 +114,24 @@
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.32"
+version = "0.1.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc4ac2c824d2bfc612cba57708198547e9a26943af0632aff033e0693074d5c"
+checksum = "fd4ed89e0a5c3e50b15c0045fbe1ff8567b703bc07544faf935ddff0aaa7b65f"
 
 [[package]]
 name = "cpp_demangle"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad49cad3673b9d586bc50cd92fdc0e9205ecd162d4206073d9774c4fe13a8fde"
+checksum = "8ea47428dc9d2237f3c6bc134472edfd63ebba0af932e783506dcfd66f10d18a"
 dependencies = [
  "cfg-if",
- "glob",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
  "cfg-if",
 ]
@@ -135,9 +144,9 @@
 
 [[package]]
 name = "findshlibs"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00acd5e75443244c1f42fb330b8493d30b44da5b61565d8b8fbf4ecc9dda2a1"
+checksum = "37affc18a9c7cf90b6cf6a7700dab60439a8f138ac5ebc5f12b98281d8f687c9"
 dependencies = [
  "lazy_static",
  "libc",
@@ -145,14 +154,14 @@
 
 [[package]]
 name = "flate2"
-version = "1.0.16"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
 dependencies = [
  "cfg-if",
  "crc32fast",
  "libc",
- "miniz_oxide 0.4.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -166,15 +175,15 @@
 
 [[package]]
 name = "gimli"
-version = "0.21.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
+checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
 
 [[package]]
 name = "gimli"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
 dependencies = [
  "compiler_builtins",
  "fallible-iterator",
@@ -184,16 +193,10 @@
 ]
 
 [[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
 name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
@@ -216,9 +219,15 @@
 
 [[package]]
 name = "libc"
-version = "0.2.71"
+version = "0.2.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
+
+[[package]]
+name = "memchr"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "memmap"
@@ -232,43 +241,38 @@
 
 [[package]]
 name = "miniz_oxide"
-version = "0.3.7"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
+ "autocfg",
 ]
 
 [[package]]
 name = "object"
-version = "0.20.0"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
+checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "object"
-version = "0.22.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386"
 dependencies = [
  "flate2",
- "wasmparser",
+ "memchr",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.16"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49"
 
 [[package]]
 name = "rustc-serialize"
@@ -290,9 +294,9 @@
 
 [[package]]
 name = "rustc-test"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc74abd96aeb3d5f68702101c903c661869fba4867f2ddf4836032f018ad4728"
+checksum = "aacc7967b0ae83af208c8caf2781cbf96f01dac0157cd89f7f05324d6d4e59bb"
 dependencies = [
  "getopts",
  "libc",
@@ -328,15 +332,15 @@
 
 [[package]]
 name = "smallvec"
-version = "1.4.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "strsim"
@@ -365,15 +369,22 @@
 
 [[package]]
 name = "time"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
  "libc",
+ "wasi",
  "winapi 0.3.9",
 ]
 
 [[package]]
+name = "typed-arena"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae"
+
+[[package]]
 name = "unicode-width"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -386,10 +397,10 @@
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
-name = "wasmparser"
-version = "0.57.0"
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "winapi"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,22 +12,29 @@
 
 [package]
 name = "addr2line"
-version = "0.14.0"
-authors = ["Nick Fitzgerald <fitzgen@gmail.com>", "Philip Craig <philipjcraig@gmail.com>", "Jon Gjengset <jon@thesquareplanet.com>", "Noah Bergbauer <noah.bergbauer@tum.de>"]
+version = "0.16.0"
 exclude = ["/benches/*", "/fixtures/*"]
 description = "A cross-platform symbolication library written in Rust, using `gimli`"
 documentation = "https://docs.rs/addr2line"
 readme = "./README.md"
 keywords = ["DWARF", "debug", "elf", "symbolicate", "atos"]
-categories = ["development-tools::debugging", "command-line-utilities"]
+categories = ["development-tools::debugging"]
 license = "Apache-2.0/MIT"
 repository = "https://github.com/gimli-rs/addr2line"
 [profile.bench]
 codegen-units = 1
 debug = true
+split-debuginfo = "packed"
+
+[profile.dev]
+split-debuginfo = "packed"
 
 [profile.release]
 debug = true
+split-debuginfo = "packed"
+
+[profile.test]
+split-debuginfo = "packed"
 
 [[example]]
 name = "addr2line"
@@ -70,12 +77,12 @@
 default-features = false
 
 [dependencies.gimli]
-version = "0.23"
+version = "0.25"
 features = ["read"]
 default-features = false
 
 [dependencies.object]
-version = "0.22"
+version = "0.26"
 features = ["read"]
 optional = true
 default-features = false
@@ -95,7 +102,7 @@
 version = "2"
 
 [dev-dependencies.findshlibs]
-version = "0.7"
+version = "0.8"
 
 [dev-dependencies.memmap]
 version = "0.7"
@@ -103,6 +110,9 @@
 [dev-dependencies.rustc-test]
 version = "0.3"
 
+[dev-dependencies.typed-arena]
+version = "2"
+
 [features]
 default = ["rustc-demangle", "cpp_demangle", "std-object", "fallible-iterator", "smallvec"]
 rustc-dep-of-std = ["core", "alloc", "compiler_builtins", "gimli/rustc-dep-of-std"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,75 @@
+## 0.16.0 (2021/07/26)
+
+### Breaking changes
+
+* Updated `gimli` and `object` dependencies.
+
+--------------------------------------------------------------------------------
+
+## 0.15.2 (2021/06/04)
+
+### Fixed
+
+* Allow `Context` to be `Send`.
+  [#219](https://github.com/gimli-rs/addr2line/pull/219)
+
+--------------------------------------------------------------------------------
+
+## 0.15.1 (2021/05/02)
+
+### Fixed
+
+* Don't ignore aranges with address 0.
+  [#217](https://github.com/gimli-rs/addr2line/pull/217)
+
+--------------------------------------------------------------------------------
+
+## 0.15.0 (2021/05/02)
+
+### Breaking changes
+
+* Updated `gimli` and `object` dependencies.
+  [#215](https://github.com/gimli-rs/addr2line/pull/215)
+
+* Added `debug_aranges` parameter to `Context::from_sections`.
+  [#200](https://github.com/gimli-rs/addr2line/pull/200)
+
+### Added
+
+* Added `.debug_aranges` support.
+  [#200](https://github.com/gimli-rs/addr2line/pull/200)
+
+* Added supplementary object file support.
+  [#208](https://github.com/gimli-rs/addr2line/pull/208)
+
+### Fixed
+
+* Fixed handling of Windows paths in locations.
+  [#209](https://github.com/gimli-rs/addr2line/pull/209)
+
+* examples/addr2line: Flush stdout after each response.
+  [#210](https://github.com/gimli-rs/addr2line/pull/210)
+
+* examples/addr2line: Avoid copying every section.
+  [#213](https://github.com/gimli-rs/addr2line/pull/213)
+
+--------------------------------------------------------------------------------
+
+## 0.14.1 (2020/12/31)
+
+### Fixed
+
+* Fix location lookup for skeleton units.
+  [#201](https://github.com/gimli-rs/addr2line/pull/201)
+
+### Added
+
+* Added `Context::find_location_range`.
+  [#196](https://github.com/gimli-rs/addr2line/pull/196)
+  [#199](https://github.com/gimli-rs/addr2line/pull/199)
+
+--------------------------------------------------------------------------------
+
 ## 0.14.0 (2020/10/27)
 
 ### Breaking changes
@@ -15,6 +87,7 @@
 * Fix handling of `DW_FORM_ref_addr`.
   [#193](https://github.com/gimli-rs/addr2line/pull/193)
 
+--------------------------------------------------------------------------------
 
 ## 0.13.0 (2020/07/07)
 
@@ -33,6 +106,7 @@
 * Don't skip `.debug_info` and `.debug_line` entries with a zero address.
   [#182](https://github.com/gimli-rs/addr2line/pull/182)
 
+--------------------------------------------------------------------------------
 
 ## 0.12.2 (2020/06/21)
 
@@ -41,6 +115,7 @@
 * Avoid linear search for `DW_FORM_ref_addr`.
   [#175](https://github.com/gimli-rs/addr2line/pull/175)
 
+--------------------------------------------------------------------------------
 
 ## 0.12.1 (2020/05/19)
 
@@ -52,6 +127,7 @@
 * Don't assert for functions with overlapping address ranges.
   [#168](https://github.com/gimli-rs/addr2line/pull/168)
 
+--------------------------------------------------------------------------------
 
 ## 0.12.0 (2020/05/12)
 
@@ -72,6 +148,7 @@
 * Removed `lazycell` dependency.
   [#160](https://github.com/gimli-rs/addr2line/pull/160)
 
+--------------------------------------------------------------------------------
 
 ## 0.11.0 (2020/01/11)
 
@@ -120,6 +197,7 @@
   [#146](https://github.com/gimli-rs/addr2line/pull/146)
   Improved benchmarks.
 
+--------------------------------------------------------------------------------
 
 ## 0.10.0 (2019/07/07)
 
@@ -128,6 +206,7 @@
 * [#127](https://github.com/gimli-rs/addr2line/pull/127)
   Update `gimli`.
 
+--------------------------------------------------------------------------------
 
 ## 0.9.0 (2019/05/02)
 
@@ -141,6 +220,7 @@
 * [#121](https://github.com/gimli-rs/addr2line/pull/121)
   Reexport `gimli`, `object`, and `fallible-iterator`.
 
+--------------------------------------------------------------------------------
 
 ## 0.8.0 (2019/02/06)
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/examples/addr2line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/examples/addr2line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/examples/addr2line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/examples/addr2line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,15 +4,17 @@
 extern crate gimli;
 extern crate memmap;
 extern crate object;
+extern crate typed_arena;
 
 use std::borrow::Cow;
 use std::fs::File;
-use std::io::{BufRead, Lines, StdinLock};
+use std::io::{BufRead, Lines, StdinLock, Write};
 use std::path::Path;
 
 use clap::{App, Arg, Values};
 use fallible_iterator::FallibleIterator;
-use object::Object;
+use object::{Object, ObjectSection};
+use typed_arena::Arena;
 
 use addr2line::{Context, Location};
 
@@ -75,6 +77,23 @@
     }
 }
 
+fn load_file_section<'input, 'arena, Endian: gimli::Endianity>(
+    id: gimli::SectionId,
+    file: &object::File<'input>,
+    endian: Endian,
+    arena_data: &'arena Arena<Cow<'input, [u8]>>,
+) -> Result<gimli::EndianSlice<'arena, Endian>, ()> {
+    // TODO: Unify with dwarfdump.rs in gimli.
+    let name = id.name();
+    match file.section_by_name(name) {
+        Some(section) => match section.uncompressed_data().unwrap() {
+            Cow::Borrowed(b) => Ok(gimli::EndianSlice::new(b, endian)),
+            Cow::Owned(b) => Ok(gimli::EndianSlice::new(arena_data.alloc(b.into()), endian)),
+        },
+        None => Ok(gimli::EndianSlice::new(&[][..], endian)),
+    }
+}
+
 fn main() {
     let matches = App::new("hardliner")
         .version("0.1")
@@ -90,6 +109,12 @@
                 .required(true),
         )
         .arg(
+            Arg::with_name("sup")
+                .long("sup")
+                .value_name("filename")
+                .help("Path to supplementary object file."),
+        )
+        .arg(
             Arg::with_name("functions")
                 .short("f")
                 .long("functions")
@@ -142,6 +167,8 @@
         )
         .get_matches();
 
+    let arena_data = Arena::new();
+
     let do_functions = matches.is_present("functions");
     let do_inlines = matches.is_present("inlines");
     let pretty = matches.is_present("pretty");
@@ -153,10 +180,37 @@
 
     let file = File::open(path).unwrap();
     let map = unsafe { memmap::Mmap::map(&file).unwrap() };
-    let file = &object::File::parse(&*map).unwrap();
+    let object = &object::File::parse(&*map).unwrap();
 
-    let symbols = file.symbol_map();
-    let ctx = Context::new(file).unwrap();
+    let endian = if object.is_little_endian() {
+        gimli::RunTimeEndian::Little
+    } else {
+        gimli::RunTimeEndian::Big
+    };
+
+    let mut load_section = |id: gimli::SectionId| -> Result<_, _> {
+        load_file_section(id, object, endian, &arena_data)
+    };
+
+    let sup_map;
+    let sup_object = if let Some(sup_path) = matches.value_of("sup") {
+        let sup_file = File::open(sup_path).unwrap();
+        sup_map = unsafe { memmap::Mmap::map(&sup_file).unwrap() };
+        Some(object::File::parse(&*sup_map).unwrap())
+    } else {
+        None
+    };
+
+    let symbols = object.symbol_map();
+    let mut dwarf = gimli::Dwarf::load(&mut load_section).unwrap();
+    if let Some(ref sup_object) = sup_object {
+        let mut load_sup_section = |id: gimli::SectionId| -> Result<_, _> {
+            load_file_section(id, sup_object, endian, &arena_data)
+        };
+        dwarf.load_sup(&mut load_sup_section).unwrap();
+    }
+
+    let ctx = Context::from_dwarf(dwarf).unwrap();
 
     let stdin = std::io::stdin();
     let addrs = matches
@@ -189,6 +243,8 @@
                 if do_functions {
                     if let Some(func) = frame.function {
                         print_function(&func.raw_name().unwrap(), func.language, demangle);
+                    } else if let Some(name) = symbols.get(probe).map(|x| x.name()) {
+                        print_function(name, None, demangle);
                     } else {
                         print!("??");
                     }
@@ -238,5 +294,6 @@
         if llvm {
             println!();
         }
+        std::io::stdout().flush().unwrap();
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -18,10 +18,8 @@
 [GNU binutils](https://sourceware.org/binutils/docs/binutils/addr2line.html)).
 
 # Quickstart
-
- - Add the [`object` crate](https://crates.io/crates/object) to your `Cargo.toml`
  - Add the [`addr2line` crate](https://crates.io/crates/addr2line) to your `Cargo.toml`
- - Load the file and parse it with [`object::File::parse`](https://docs.rs/object/*/object/struct.File.html#method.parse)
+ - Load the file and parse it with [`addr2line::object::File::parse`](https://docs.rs/object/*/object/struct.File.html#method.parse)
  - Pass the parsed file to [`addr2line::Context::new` ](https://docs.rs/addr2line/*/addr2line/struct.Context.html#method.new)
  - Use [`addr2line::Context::find_location`](https://docs.rs/addr2line/*/addr2line/struct.Context.html#method.find_location)
    or [`addr2line::Context::find_frames`](https://docs.rs/addr2line/*/addr2line/struct.Context.html#method.find_frames)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/src/function.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/src/function.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/src/function.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/src/function.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,540 @@
+use alloc::boxed::Box;
+use alloc::vec::Vec;
+use core::cmp::Ordering;
+use core::iter;
+
+use crate::lazy::LazyCell;
+use crate::maybe_small;
+use crate::{Error, RangeAttributes, ResDwarf};
+
+pub(crate) struct Functions<R: gimli::Reader> {
+    /// List of all `DW_TAG_subprogram` details in the unit.
+    pub(crate) functions: Box<
+        [(
+            gimli::UnitOffset<R::Offset>,
+            LazyCell<Result<Function<R>, Error>>,
+        )],
+    >,
+    /// List of `DW_TAG_subprogram` address ranges in the unit.
+    pub(crate) addresses: Box<[FunctionAddress]>,
+}
+
+/// A single address range for a function.
+///
+/// It is possible for a function to have multiple address ranges; this
+/// is handled by having multiple `FunctionAddress` entries with the same
+/// `function` field.
+pub(crate) struct FunctionAddress {
+    range: gimli::Range,
+    /// An index into `Functions::functions`.
+    pub(crate) function: usize,
+}
+
+pub(crate) struct Function<R: gimli::Reader> {
+    pub(crate) dw_die_offset: gimli::UnitOffset<R::Offset>,
+    pub(crate) name: Option<R>,
+    /// List of all `DW_TAG_inlined_subroutine` details in this function.
+    inlined_functions: Box<[InlinedFunction<R>]>,
+    /// List of `DW_TAG_inlined_subroutine` address ranges in this function.
+    inlined_addresses: Box<[InlinedFunctionAddress]>,
+}
+
+pub(crate) struct InlinedFunctionAddress {
+    range: gimli::Range,
+    call_depth: usize,
+    /// An index into `Function::inlined_functions`.
+    function: usize,
+}
+
+pub(crate) struct InlinedFunction<R: gimli::Reader> {
+    pub(crate) dw_die_offset: gimli::UnitOffset<R::Offset>,
+    pub(crate) name: Option<R>,
+    pub(crate) call_file: u64,
+    pub(crate) call_line: u32,
+    pub(crate) call_column: u32,
+}
+
+impl<R: gimli::Reader> Functions<R> {
+    pub(crate) fn parse(unit: &gimli::Unit<R>, dwarf: &ResDwarf<R>) -> Result<Functions<R>, Error> {
+        let mut functions = Vec::new();
+        let mut addresses = Vec::new();
+        let mut entries = unit.entries_raw(None)?;
+        while !entries.is_empty() {
+            let dw_die_offset = entries.next_offset();
+            if let Some(abbrev) = entries.read_abbreviation()? {
+                if abbrev.tag() == gimli::DW_TAG_subprogram {
+                    let mut ranges = RangeAttributes::default();
+                    for spec in abbrev.attributes() {
+                        match entries.read_attribute(*spec) {
+                            Ok(ref attr) => {
+                                match attr.name() {
+                                    gimli::DW_AT_low_pc => {
+                                        if let gimli::AttributeValue::Addr(val) = attr.value() {
+                                            ranges.low_pc = Some(val);
+                                        }
+                                    }
+                                    gimli::DW_AT_high_pc => match attr.value() {
+                                        gimli::AttributeValue::Addr(val) => {
+                                            ranges.high_pc = Some(val)
+                                        }
+                                        gimli::AttributeValue::Udata(val) => {
+                                            ranges.size = Some(val)
+                                        }
+                                        _ => {}
+                                    },
+                                    gimli::DW_AT_ranges => {
+                                        ranges.ranges_offset = dwarf
+                                            .sections
+                                            .attr_ranges_offset(unit, attr.value())?;
+                                    }
+                                    _ => {}
+                                };
+                            }
+                            Err(e) => return Err(e),
+                        }
+                    }
+
+                    let function_index = functions.len();
+                    if ranges.for_each_range(&dwarf.sections, unit, |range| {
+                        addresses.push(FunctionAddress {
+                            range,
+                            function: function_index,
+                        });
+                    })? {
+                        functions.push((dw_die_offset, LazyCell::new()));
+                    }
+                } else {
+                    for spec in abbrev.attributes() {
+                        match entries.read_attribute(*spec) {
+                            Ok(_) => {}
+                            Err(e) => return Err(e),
+                        }
+                    }
+                }
+            }
+        }
+
+        // The binary search requires the addresses to be sorted.
+        //
+        // It also requires them to be non-overlapping.  In practice, overlapping
+        // function ranges are unlikely, so we don't try to handle that yet.
+        //
+        // It's possible for multiple functions to have the same address range if the
+        // compiler can detect and remove functions with identical code.  In that case
+        // we'll nondeterministically return one of them.
+        addresses.sort_by_key(|x| x.range.begin);
+
+        Ok(Functions {
+            functions: functions.into_boxed_slice(),
+            addresses: addresses.into_boxed_slice(),
+        })
+    }
+
+    pub(crate) fn find_address(&self, probe: u64) -> Option<usize> {
+        self.addresses
+            .binary_search_by(|address| {
+                if probe < address.range.begin {
+                    Ordering::Greater
+                } else if probe >= address.range.end {
+                    Ordering::Less
+                } else {
+                    Ordering::Equal
+                }
+            })
+            .ok()
+    }
+
+    pub(crate) fn parse_inlined_functions(
+        &self,
+        unit: &gimli::Unit<R>,
+        dwarf: &ResDwarf<R>,
+    ) -> Result<(), Error> {
+        for function in &*self.functions {
+            function
+                .1
+                .borrow_with(|| Function::parse(function.0, unit, dwarf))
+                .as_ref()
+                .map_err(Error::clone)?;
+        }
+        Ok(())
+    }
+}
+
+impl<R: gimli::Reader> Function<R> {
+    pub(crate) fn parse(
+        dw_die_offset: gimli::UnitOffset<R::Offset>,
+        unit: &gimli::Unit<R>,
+        dwarf: &ResDwarf<R>,
+    ) -> Result<Self, Error> {
+        let mut entries = unit.entries_raw(Some(dw_die_offset))?;
+        let depth = entries.next_depth();
+        let abbrev = entries.read_abbreviation()?.unwrap();
+        debug_assert_eq!(abbrev.tag(), gimli::DW_TAG_subprogram);
+
+        let mut name = None;
+        for spec in abbrev.attributes() {
+            match entries.read_attribute(*spec) {
+                Ok(ref attr) => {
+                    match attr.name() {
+                        gimli::DW_AT_linkage_name | gimli::DW_AT_MIPS_linkage_name => {
+                            if let Ok(val) = dwarf.sections.attr_string(unit, attr.value()) {
+                                name = Some(val);
+                            }
+                        }
+                        gimli::DW_AT_name => {
+                            if name.is_none() {
+                                name = dwarf.sections.attr_string(unit, attr.value()).ok();
+                            }
+                        }
+                        gimli::DW_AT_abstract_origin | gimli::DW_AT_specification => {
+                            if name.is_none() {
+                                name = name_attr(attr.value(), unit, dwarf, 16)?;
+                            }
+                        }
+                        _ => {}
+                    };
+                }
+                Err(e) => return Err(e),
+            }
+        }
+
+        let mut inlined_functions = Vec::new();
+        let mut inlined_addresses = Vec::new();
+        Function::parse_children(
+            &mut entries,
+            depth,
+            unit,
+            dwarf,
+            &mut inlined_functions,
+            &mut inlined_addresses,
+            0,
+        )?;
+
+        // Sort ranges in "breadth-first traversal order", i.e. first by call_depth
+        // and then by range.begin. This allows finding the range containing an
+        // address at a certain depth using binary search.
+        // Note: Using DFS order, i.e. ordering by range.begin first and then by
+        // call_depth, would not work! Consider the two examples
+        // "[0..10 at depth 0], [0..2 at depth 1], [6..8 at depth 1]"  and
+        // "[0..5 at depth 0], [0..2 at depth 1], [5..10 at depth 0], [6..8 at depth 1]".
+        // In this example, if you want to look up address 7 at depth 0, and you
+        // encounter [0..2 at depth 1], are you before or after the target range?
+        // You don't know.
+        inlined_addresses.sort_by(|r1, r2| {
+            if r1.call_depth < r2.call_depth {
+                Ordering::Less
+            } else if r1.call_depth > r2.call_depth {
+                Ordering::Greater
+            } else if r1.range.begin < r2.range.begin {
+                Ordering::Less
+            } else if r1.range.begin > r2.range.begin {
+                Ordering::Greater
+            } else {
+                Ordering::Equal
+            }
+        });
+
+        Ok(Function {
+            dw_die_offset,
+            name,
+            inlined_functions: inlined_functions.into_boxed_slice(),
+            inlined_addresses: inlined_addresses.into_boxed_slice(),
+        })
+    }
+
+    fn parse_children(
+        entries: &mut gimli::EntriesRaw<R>,
+        depth: isize,
+        unit: &gimli::Unit<R>,
+        dwarf: &ResDwarf<R>,
+        inlined_functions: &mut Vec<InlinedFunction<R>>,
+        inlined_addresses: &mut Vec<InlinedFunctionAddress>,
+        inlined_depth: usize,
+    ) -> Result<(), Error> {
+        loop {
+            let dw_die_offset = entries.next_offset();
+            let next_depth = entries.next_depth();
+            if next_depth <= depth {
+                return Ok(());
+            }
+            if let Some(abbrev) = entries.read_abbreviation()? {
+                match abbrev.tag() {
+                    gimli::DW_TAG_subprogram => {
+                        Function::skip(entries, abbrev, next_depth)?;
+                    }
+                    gimli::DW_TAG_inlined_subroutine => {
+                        InlinedFunction::parse(
+                            dw_die_offset,
+                            entries,
+                            abbrev,
+                            next_depth,
+                            unit,
+                            dwarf,
+                            inlined_functions,
+                            inlined_addresses,
+                            inlined_depth,
+                        )?;
+                    }
+                    _ => {
+                        for spec in abbrev.attributes() {
+                            match entries.read_attribute(*spec) {
+                                Ok(_) => {}
+                                Err(e) => return Err(e),
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fn skip(
+        entries: &mut gimli::EntriesRaw<R>,
+        abbrev: &gimli::Abbreviation,
+        depth: isize,
+    ) -> Result<(), Error> {
+        // TODO: use DW_AT_sibling
+        for spec in abbrev.attributes() {
+            match entries.read_attribute(*spec) {
+                Ok(_) => {}
+                Err(e) => return Err(e),
+            }
+        }
+        while entries.next_depth() > depth {
+            if let Some(abbrev) = entries.read_abbreviation()? {
+                for spec in abbrev.attributes() {
+                    match entries.read_attribute(*spec) {
+                        Ok(_) => {}
+                        Err(e) => return Err(e),
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Build the list of inlined functions that contain `probe`.
+    pub(crate) fn find_inlined_functions(
+        &self,
+        probe: u64,
+    ) -> iter::Rev<maybe_small::IntoIter<&InlinedFunction<R>>> {
+        // `inlined_functions` is ordered from outside to inside.
+        let mut inlined_functions = maybe_small::Vec::new();
+        let mut inlined_addresses = &self.inlined_addresses[..];
+        loop {
+            let current_depth = inlined_functions.len();
+            // Look up (probe, current_depth) in inline_ranges.
+            // `inlined_addresses` is sorted in "breadth-first traversal order", i.e.
+            // by `call_depth` first, and then by `range.begin`. See the comment at
+            // the sort call for more information about why.
+            let search = inlined_addresses.binary_search_by(|range| {
+                if range.call_depth > current_depth {
+                    Ordering::Greater
+                } else if range.call_depth < current_depth {
+                    Ordering::Less
+                } else if range.range.begin > probe {
+                    Ordering::Greater
+                } else if range.range.end <= probe {
+                    Ordering::Less
+                } else {
+                    Ordering::Equal
+                }
+            });
+            if let Ok(index) = search {
+                let function_index = inlined_addresses[index].function;
+                inlined_functions.push(&self.inlined_functions[function_index]);
+                inlined_addresses = &inlined_addresses[index + 1..];
+            } else {
+                break;
+            }
+        }
+        inlined_functions.into_iter().rev()
+    }
+}
+
+impl<R: gimli::Reader> InlinedFunction<R> {
+    fn parse(
+        dw_die_offset: gimli::UnitOffset<R::Offset>,
+        entries: &mut gimli::EntriesRaw<R>,
+        abbrev: &gimli::Abbreviation,
+        depth: isize,
+        unit: &gimli::Unit<R>,
+        dwarf: &ResDwarf<R>,
+        inlined_functions: &mut Vec<InlinedFunction<R>>,
+        inlined_addresses: &mut Vec<InlinedFunctionAddress>,
+        inlined_depth: usize,
+    ) -> Result<(), Error> {
+        let mut ranges = RangeAttributes::default();
+        let mut name = None;
+        let mut call_file = 0;
+        let mut call_line = 0;
+        let mut call_column = 0;
+        for spec in abbrev.attributes() {
+            match entries.read_attribute(*spec) {
+                Ok(ref attr) => match attr.name() {
+                    gimli::DW_AT_low_pc => {
+                        if let gimli::AttributeValue::Addr(val) = attr.value() {
+                            ranges.low_pc = Some(val);
+                        }
+                    }
+                    gimli::DW_AT_high_pc => match attr.value() {
+                        gimli::AttributeValue::Addr(val) => ranges.high_pc = Some(val),
+                        gimli::AttributeValue::Udata(val) => ranges.size = Some(val),
+                        _ => {}
+                    },
+                    gimli::DW_AT_ranges => {
+                        ranges.ranges_offset =
+                            dwarf.sections.attr_ranges_offset(unit, attr.value())?;
+                    }
+                    gimli::DW_AT_linkage_name | gimli::DW_AT_MIPS_linkage_name => {
+                        if let Ok(val) = dwarf.sections.attr_string(unit, attr.value()) {
+                            name = Some(val);
+                        }
+                    }
+                    gimli::DW_AT_name => {
+                        if name.is_none() {
+                            name = dwarf.sections.attr_string(unit, attr.value()).ok();
+                        }
+                    }
+                    gimli::DW_AT_abstract_origin | gimli::DW_AT_specification => {
+                        if name.is_none() {
+                            name = name_attr(attr.value(), unit, dwarf, 16)?;
+                        }
+                    }
+                    gimli::DW_AT_call_file => {
+                        if let gimli::AttributeValue::FileIndex(fi) = attr.value() {
+                            call_file = fi;
+                        }
+                    }
+                    gimli::DW_AT_call_line => {
+                        call_line = attr.udata_value().unwrap_or(0) as u32;
+                    }
+                    gimli::DW_AT_call_column => {
+                        call_column = attr.udata_value().unwrap_or(0) as u32;
+                    }
+                    _ => {}
+                },
+                Err(e) => return Err(e),
+            }
+        }
+
+        let function_index = inlined_functions.len();
+        inlined_functions.push(InlinedFunction {
+            dw_die_offset,
+            name,
+            call_file,
+            call_line,
+            call_column,
+        });
+
+        ranges.for_each_range(&dwarf.sections, unit, |range| {
+            inlined_addresses.push(InlinedFunctionAddress {
+                range,
+                call_depth: inlined_depth,
+                function: function_index,
+            });
+        })?;
+
+        Function::parse_children(
+            entries,
+            depth,
+            unit,
+            dwarf,
+            inlined_functions,
+            inlined_addresses,
+            inlined_depth + 1,
+        )
+    }
+}
+
+fn name_attr<R>(
+    attr: gimli::AttributeValue<R>,
+    unit: &gimli::Unit<R>,
+    dwarf: &ResDwarf<R>,
+    recursion_limit: usize,
+) -> Result<Option<R>, Error>
+where
+    R: gimli::Reader,
+{
+    if recursion_limit == 0 {
+        return Ok(None);
+    }
+
+    match attr {
+        gimli::AttributeValue::UnitRef(offset) => name_entry(unit, offset, dwarf, recursion_limit),
+        gimli::AttributeValue::DebugInfoRef(dr) => {
+            let res_unit = dwarf.find_unit(dr)?;
+            name_entry(
+                &res_unit.dw_unit,
+                gimli::UnitOffset(dr.0 - res_unit.offset.0),
+                dwarf,
+                recursion_limit,
+            )
+        }
+        gimli::AttributeValue::DebugInfoRefSup(dr) => {
+            if let Some(sup_dwarf) = dwarf.sup.as_ref() {
+                let res_unit = sup_dwarf.find_unit(dr)?;
+                name_entry(
+                    &res_unit.dw_unit,
+                    gimli::UnitOffset(dr.0 - res_unit.offset.0),
+                    sup_dwarf,
+                    recursion_limit,
+                )
+            } else {
+                Ok(None)
+            }
+        }
+        _ => Ok(None),
+    }
+}
+
+fn name_entry<R>(
+    unit: &gimli::Unit<R>,
+    offset: gimli::UnitOffset<R::Offset>,
+    dwarf: &ResDwarf<R>,
+    recursion_limit: usize,
+) -> Result<Option<R>, Error>
+where
+    R: gimli::Reader,
+{
+    let mut entries = unit.entries_raw(Some(offset))?;
+    let abbrev = if let Some(abbrev) = entries.read_abbreviation()? {
+        abbrev
+    } else {
+        return Err(gimli::Error::NoEntryAtGivenOffset);
+    };
+
+    let mut name = None;
+    let mut next = None;
+    for spec in abbrev.attributes() {
+        match entries.read_attribute(*spec) {
+            Ok(ref attr) => match attr.name() {
+                gimli::DW_AT_linkage_name | gimli::DW_AT_MIPS_linkage_name => {
+                    if let Ok(val) = dwarf.sections.attr_string(unit, attr.value()) {
+                        return Ok(Some(val));
+                    }
+                }
+                gimli::DW_AT_name => {
+                    if let Ok(val) = dwarf.sections.attr_string(unit, attr.value()) {
+                        name = Some(val);
+                    }
+                }
+                gimli::DW_AT_abstract_origin | gimli::DW_AT_specification => {
+                    next = Some(attr.value());
+                }
+                _ => {}
+            },
+            Err(e) => return Err(e),
+        }
+    }
+
+    if name.is_some() {
+        return Ok(name);
+    }
+
+    if let Some(next) = next {
+        return name_attr(next, unit, dwarf, recursion_limit - 1);
+    }
+
+    Ok(None)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,8 @@
 //! The context caches some of the parsed information so that multiple lookups are
 //! efficient.
 //! Location information is obtained with
-//! [`Context::find_location`](./struct.Context.html#method.find_location).
+//! [`Context::find_location`](./struct.Context.html#method.find_location) or
+//! [`Context::find_location_range`](./struct.Context.html#method.find_location_range).
 //! Function information is obtained with
 //! [`Context::find_frames`](./struct.Context.html#method.find_frames), which returns
 //! a frame for each inline function. Each frame contains both name and location.
@@ -43,13 +44,16 @@
 #[cfg(feature = "object")]
 use alloc::rc::Rc;
 use alloc::string::{String, ToString};
+use alloc::sync::Arc;
 use alloc::vec::Vec;
 
-use core::cmp::Ordering;
+use core::cmp::{self, Ordering};
 use core::iter;
 use core::mem;
+use core::num::NonZeroU64;
 use core::u64;
 
+use crate::function::{Function, Functions, InlinedFunction};
 use crate::lazy::LazyCell;
 
 #[cfg(feature = "smallvec")]
@@ -63,6 +67,7 @@
     pub type IntoIter<T> = alloc::vec::IntoIter<T>;
 }
 
+mod function;
 mod lazy;
 
 type Error = gimli::Error;
@@ -71,19 +76,8 @@
 ///
 /// Constructing a `Context` is somewhat costly, so users should aim to reuse `Context`s
 /// when performing lookups for many addresses in the same executable.
-pub struct Context<R>
-where
-    R: gimli::Reader,
-{
-    unit_ranges: Vec<UnitRange>,
-    units: Vec<ResUnit<R>>,
-    sections: gimli::Dwarf<R>,
-}
-
-struct UnitRange {
-    unit_id: usize,
-    max_end: u64,
-    range: gimli::Range,
+pub struct Context<R: gimli::Reader> {
+    dwarf: ResDwarf<R>,
 }
 
 /// The type of `Context` that supports the `new` method.
@@ -98,63 +92,69 @@
     /// This means it is not thread safe, has no lifetime constraints (since it copies
     /// the input data), and works for any endianity.
     ///
-    /// Performance sensitive applications may want to use `Context::from_sections`
+    /// Performance sensitive applications may want to use `Context::from_dwarf`
     /// with a more specialised `gimli::Reader` implementation.
+    #[inline]
     pub fn new<'data: 'file, 'file, O: object::Object<'data, 'file>>(
         file: &'file O,
     ) -> Result<Self, Error> {
+        Self::new_with_sup(file, None)
+    }
+
+    /// Construct a new `Context`.
+    ///
+    /// Optionally also use a supplementary object file.
+    ///
+    /// The resulting `Context` uses `gimli::EndianRcSlice<gimli::RunTimeEndian>`.
+    /// This means it is not thread safe, has no lifetime constraints (since it copies
+    /// the input data), and works for any endianity.
+    ///
+    /// Performance sensitive applications may want to use `Context::from_dwarf_with_sup`
+    /// with a more specialised `gimli::Reader` implementation.
+    pub fn new_with_sup<'data: 'file, 'file, O: object::Object<'data, 'file>>(
+        file: &'file O,
+        sup_file: Option<&'file O>,
+    ) -> Result<Self, Error> {
         let endian = if file.is_little_endian() {
             gimli::RunTimeEndian::Little
         } else {
             gimli::RunTimeEndian::Big
         };
 
-        fn load_section<'data: 'file, 'file, O, S, Endian>(file: &'file O, endian: Endian) -> S
+        fn load_section<'data: 'file, 'file, O, Endian>(
+            id: gimli::SectionId,
+            file: &'file O,
+            endian: Endian,
+        ) -> Result<gimli::EndianRcSlice<Endian>, Error>
         where
             O: object::Object<'data, 'file>,
-            S: gimli::Section<gimli::EndianRcSlice<Endian>>,
             Endian: gimli::Endianity,
         {
             use object::ObjectSection;
 
             let data = file
-                .section_by_name(S::section_name())
+                .section_by_name(id.name())
                 .and_then(|section| section.uncompressed_data().ok())
                 .unwrap_or(Cow::Borrowed(&[]));
-            S::from(gimli::EndianRcSlice::new(Rc::from(&*data), endian))
+            Ok(gimli::EndianRcSlice::new(Rc::from(&*data), endian))
         }
 
-        let debug_abbrev: gimli::DebugAbbrev<_> = load_section(file, endian);
-        let debug_addr: gimli::DebugAddr<_> = load_section(file, endian);
-        let debug_info: gimli::DebugInfo<_> = load_section(file, endian);
-        let debug_line: gimli::DebugLine<_> = load_section(file, endian);
-        let debug_line_str: gimli::DebugLineStr<_> = load_section(file, endian);
-        let debug_ranges: gimli::DebugRanges<_> = load_section(file, endian);
-        let debug_rnglists: gimli::DebugRngLists<_> = load_section(file, endian);
-        let debug_str: gimli::DebugStr<_> = load_section(file, endian);
-        let debug_str_offsets: gimli::DebugStrOffsets<_> = load_section(file, endian);
-        let default_section = gimli::EndianRcSlice::new(Rc::from(&[][..]), endian);
-
-        Context::from_sections(
-            debug_abbrev,
-            debug_addr,
-            debug_info,
-            debug_line,
-            debug_line_str,
-            debug_ranges,
-            debug_rnglists,
-            debug_str,
-            debug_str_offsets,
-            default_section,
-        )
+        let mut dwarf = gimli::Dwarf::load(|id| load_section(id, file, endian))?;
+        if let Some(sup_file) = sup_file {
+            dwarf.load_sup(|id| load_section(id, sup_file, endian))?;
+        }
+        Context::from_dwarf(dwarf)
     }
 }
 
 impl<R: gimli::Reader> Context<R> {
     /// Construct a new `Context` from DWARF sections.
+    ///
+    /// This method does not support using a supplementary object file.
     pub fn from_sections(
         debug_abbrev: gimli::DebugAbbrev<R>,
         debug_addr: gimli::DebugAddr<R>,
+        debug_aranges: gimli::DebugAranges<R>,
         debug_info: gimli::DebugInfo<R>,
         debug_line: gimli::DebugLine<R>,
         debug_line_str: gimli::DebugLineStr<R>,
@@ -167,12 +167,12 @@
         Self::from_dwarf(gimli::Dwarf {
             debug_abbrev,
             debug_addr,
+            debug_aranges,
             debug_info,
             debug_line,
             debug_line_str,
             debug_str,
             debug_str_offsets,
-            debug_str_sup: default_section.clone().into(),
             debug_types: default_section.clone().into(),
             locations: gimli::LocationLists::new(
                 default_section.clone().into(),
@@ -180,100 +180,24 @@
             ),
             ranges: gimli::RangeLists::new(debug_ranges, debug_rnglists),
             file_type: gimli::DwarfFileType::Main,
+            sup: None,
         })
     }
 
     /// Construct a new `Context` from an existing [`gimli::Dwarf`] object.
+    #[inline]
     pub fn from_dwarf(sections: gimli::Dwarf<R>) -> Result<Self, Error> {
-        let mut unit_ranges = Vec::new();
-        let mut res_units = Vec::new();
-        let mut units = sections.units();
-        while let Some(header) = units.next()? {
-            let unit_id = res_units.len();
-            let offset = match header.offset().as_debug_info_offset() {
-                Some(offset) => offset,
-                None => continue,
-            };
-            let dw_unit = match sections.unit(header) {
-                Ok(dw_unit) => dw_unit,
-                Err(_) => continue,
-            };
-
-            let mut lang = None;
-            {
-                let mut entries = dw_unit.entries_raw(None)?;
-
-                let abbrev = match entries.read_abbreviation()? {
-                    Some(abbrev) if abbrev.tag() == gimli::DW_TAG_compile_unit => abbrev,
-                    _ => continue, // wtf?
-                };
-
-                let mut ranges = RangeAttributes::default();
-                for spec in abbrev.attributes() {
-                    let attr = entries.read_attribute(*spec)?;
-                    match attr.name() {
-                        gimli::DW_AT_low_pc => {
-                            if let gimli::AttributeValue::Addr(val) = attr.value() {
-                                ranges.low_pc = Some(val);
-                            }
-                        }
-                        gimli::DW_AT_high_pc => match attr.value() {
-                            gimli::AttributeValue::Addr(val) => ranges.high_pc = Some(val),
-                            gimli::AttributeValue::Udata(val) => ranges.size = Some(val),
-                            _ => {}
-                        },
-                        gimli::DW_AT_ranges => {
-                            ranges.ranges_offset =
-                                sections.attr_ranges_offset(&dw_unit, attr.value())?;
-                        }
-                        gimli::DW_AT_language => {
-                            if let gimli::AttributeValue::Language(val) = attr.value() {
-                                lang = Some(val);
-                            }
-                        }
-                        _ => {}
-                    }
-                }
-
-                ranges.for_each_range(&sections, &dw_unit, |range| {
-                    unit_ranges.push(UnitRange {
-                        range,
-                        unit_id,
-                        max_end: 0,
-                    });
-                })?;
-            }
-
-            res_units.push(ResUnit {
-                offset,
-                dw_unit,
-                lang,
-                lines: LazyCell::new(),
-                funcs: LazyCell::new(),
-            });
-        }
-
-        // Sort this for faster lookup in `find_unit_and_address` below.
-        unit_ranges.sort_by_key(|i| i.range.begin);
-
-        // Calculate the `max_end` field now that we've determined the order of
-        // CUs.
-        let mut max = 0;
-        for i in unit_ranges.iter_mut() {
-            max = max.max(i.range.end);
-            i.max_end = max;
-        }
-
-        Ok(Context {
-            units: res_units,
-            unit_ranges,
-            sections,
-        })
+        let mut dwarf = ResDwarf::parse(Arc::new(sections))?;
+        dwarf.sup = match dwarf.sections.sup.clone() {
+            Some(sup_sections) => Some(Box::new(ResDwarf::parse(sup_sections)?)),
+            None => None,
+        };
+        Ok(Context { dwarf })
     }
 
     /// The dwarf sections associated with this `Context`.
     pub fn dwarf(&self) -> &gimli::Dwarf<R> {
-        &self.sections
+        &self.dwarf.sections
     }
 
     /// Finds the CUs for the function address given.
@@ -287,11 +211,26 @@
     /// address, and the caller must check if there is actually a function or
     /// location in the CU for that address.
     fn find_units(&self, probe: u64) -> impl Iterator<Item = &ResUnit<R>> {
+        self.find_units_range(probe, probe + 1)
+            .map(|(unit, _range)| unit)
+    }
+
+    /// Finds the CUs covering the range of addresses given.
+    ///
+    /// The range is [low, high) (ie, the upper bound is exclusive). This can return multiple
+    /// ranges for the same unit.
+    #[inline]
+    fn find_units_range(
+        &self,
+        probe_low: u64,
+        probe_high: u64,
+    ) -> impl Iterator<Item = (&ResUnit<R>, &gimli::Range)> {
         // First up find the position in the array which could have our function
         // address.
         let pos = match self
+            .dwarf
             .unit_ranges
-            .binary_search_by_key(&probe, |i| i.range.begin)
+            .binary_search_by_key(&probe_high, |i| i.range.begin)
         {
             // Although unlikely, we could find an exact match.
             Ok(i) => i + 1,
@@ -304,35 +243,35 @@
 
         // Once we have our index we iterate backwards from that position
         // looking for a matching CU.
-        self.unit_ranges[..pos]
+        self.dwarf.unit_ranges[..pos]
             .iter()
             .rev()
             .take_while(move |i| {
                 // We know that this CU's start is beneath the probe already because
                 // of our sorted array.
-                debug_assert!(i.range.begin <= probe);
+                debug_assert!(i.range.begin <= probe_high);
 
                 // Each entry keeps track of the maximum end address seen so far,
                 // starting from the beginning of the array of unit ranges. We're
                 // iterating in reverse so if our probe is beyond the maximum range
                 // of this entry, then it's guaranteed to not fit in any prior
                 // entries, so we break out.
-                probe <= i.max_end
+                probe_low < i.max_end
             })
             .filter_map(move |i| {
                 // If this CU doesn't actually contain this address, move to the
                 // next CU.
-                if probe > i.range.end {
+                if probe_low >= i.range.end || probe_high <= i.range.begin {
                     return None;
                 }
-                Some(&self.units[i.unit_id])
+                Some((&self.dwarf.units[i.unit_id], &i.range))
             })
     }
 
     /// Find the DWARF unit corresponding to the given virtual memory address.
     pub fn find_dwarf_unit(&self, probe: u64) -> Option<&gimli::Unit<R>> {
         for unit in self.find_units(probe) {
-            match unit.find_function_or_location(probe, &self.sections, &self.units) {
+            match unit.find_function_or_location(probe, &self.dwarf) {
                 Ok((Some(_), _)) | Ok((_, Some(_))) => return Some(&unit.dw_unit),
                 _ => {}
             }
@@ -343,13 +282,23 @@
     /// Find the source file and line corresponding to the given virtual memory address.
     pub fn find_location(&self, probe: u64) -> Result<Option<Location<'_>>, Error> {
         for unit in self.find_units(probe) {
-            if let Some(location) = unit.find_location(probe, &self.sections)? {
+            if let Some(location) = unit.find_location(probe, &self.dwarf.sections)? {
                 return Ok(Some(location));
             }
         }
         Ok(None)
     }
 
+    /// Return source file and lines for a range of addresses. For each location it also
+    /// returns the address and size of the range of the underlying instructions.
+    pub fn find_location_range(
+        &self,
+        probe_low: u64,
+        probe_high: u64,
+    ) -> Result<LocationRangeIter<'_, R>, Error> {
+        LocationRangeIter::new(self, probe_low, probe_high)
+    }
+
     /// Return an iterator for the function frames corresponding to the given virtual
     /// memory address.
     ///
@@ -361,12 +310,12 @@
     /// location, until an non-inline caller is reached.
     pub fn find_frames(&self, probe: u64) -> Result<FrameIter<R>, Error> {
         for unit in self.find_units(probe) {
-            match unit.find_function_or_location(probe, &self.sections, &self.units)? {
+            match unit.find_function_or_location(probe, &self.dwarf)? {
                 (Some(function), location) => {
                     let inlined_functions = function.find_inlined_functions(probe);
                     return Ok(FrameIter(FrameIterState::Frames(FrameIterFrames {
                         unit,
-                        sections: &self.sections,
+                        sections: &self.dwarf.sections,
                         function,
                         inlined_functions,
                         next: location,
@@ -384,8 +333,8 @@
     /// Initialize all line data structures. This is used for benchmarks.
     #[doc(hidden)]
     pub fn parse_lines(&self) -> Result<(), Error> {
-        for unit in &self.units {
-            unit.parse_lines(&self.sections)?;
+        for unit in &self.dwarf.units {
+            unit.parse_lines(&self.dwarf.sections)?;
         }
         Ok(())
     }
@@ -393,8 +342,8 @@
     /// Initialize all function data structures. This is used for benchmarks.
     #[doc(hidden)]
     pub fn parse_functions(&self) -> Result<(), Error> {
-        for unit in &self.units {
-            unit.parse_functions(&self.sections)?;
+        for unit in &self.dwarf.units {
+            unit.parse_functions(&self.dwarf)?;
         }
         Ok(())
     }
@@ -402,13 +351,181 @@
     /// Initialize all inlined function data structures. This is used for benchmarks.
     #[doc(hidden)]
     pub fn parse_inlined_functions(&self) -> Result<(), Error> {
-        for unit in &self.units {
-            unit.parse_inlined_functions(&self.sections, &self.units)?;
+        for unit in &self.dwarf.units {
+            unit.parse_inlined_functions(&self.dwarf)?;
         }
         Ok(())
     }
 }
 
+struct UnitRange {
+    unit_id: usize,
+    max_end: u64,
+    range: gimli::Range,
+}
+
+struct ResDwarf<R: gimli::Reader> {
+    unit_ranges: Vec<UnitRange>,
+    units: Vec<ResUnit<R>>,
+    sections: Arc<gimli::Dwarf<R>>,
+    sup: Option<Box<ResDwarf<R>>>,
+}
+
+impl<R: gimli::Reader> ResDwarf<R> {
+    fn parse(sections: Arc<gimli::Dwarf<R>>) -> Result<Self, Error> {
+        // Find all the references to compilation units in .debug_aranges.
+        // Note that we always also iterate through all of .debug_info to
+        // find compilation units, because .debug_aranges may be missing some.
+        let mut aranges = Vec::new();
+        let mut headers = sections.debug_aranges.headers();
+        while let Some(header) = headers.next()? {
+            aranges.push((header.debug_info_offset(), header.offset()));
+        }
+        aranges.sort_by_key(|i| i.0);
+
+        let mut unit_ranges = Vec::new();
+        let mut res_units = Vec::new();
+        let mut units = sections.units();
+        while let Some(header) = units.next()? {
+            let unit_id = res_units.len();
+            let offset = match header.offset().as_debug_info_offset() {
+                Some(offset) => offset,
+                None => continue,
+            };
+            // We mainly want compile units, but we may need to follow references to entries
+            // within other units for function names.  We don't need anything from type units.
+            match header.type_() {
+                gimli::UnitType::Type { .. } | gimli::UnitType::SplitType { .. } => continue,
+                _ => {}
+            }
+            let dw_unit = match sections.unit(header) {
+                Ok(dw_unit) => dw_unit,
+                Err(_) => continue,
+            };
+
+            let mut lang = None;
+            {
+                let mut entries = dw_unit.entries_raw(None)?;
+
+                let abbrev = match entries.read_abbreviation()? {
+                    Some(abbrev) => abbrev,
+                    None => continue,
+                };
+
+                let mut ranges = RangeAttributes::default();
+                for spec in abbrev.attributes() {
+                    let attr = entries.read_attribute(*spec)?;
+                    match attr.name() {
+                        gimli::DW_AT_low_pc => {
+                            if let gimli::AttributeValue::Addr(val) = attr.value() {
+                                ranges.low_pc = Some(val);
+                            }
+                        }
+                        gimli::DW_AT_high_pc => match attr.value() {
+                            gimli::AttributeValue::Addr(val) => ranges.high_pc = Some(val),
+                            gimli::AttributeValue::Udata(val) => ranges.size = Some(val),
+                            _ => {}
+                        },
+                        gimli::DW_AT_ranges => {
+                            ranges.ranges_offset =
+                                sections.attr_ranges_offset(&dw_unit, attr.value())?;
+                        }
+                        gimli::DW_AT_language => {
+                            if let gimli::AttributeValue::Language(val) = attr.value() {
+                                lang = Some(val);
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+
+                // Find the address ranges for the CU, using in order of preference:
+                // - DW_AT_ranges
+                // - .debug_aranges
+                // - DW_AT_low_pc/DW_AT_high_pc
+                //
+                // Using DW_AT_ranges before .debug_aranges is possibly an arbitrary choice,
+                // but the feeling is that DW_AT_ranges is more likely to be reliable or complete
+                // if it is present.
+                //
+                // .debug_aranges must be used before DW_AT_low_pc/DW_AT_high_pc because
+                // it has been observed on macOS that DW_AT_ranges was not emitted even for
+                // discontiguous CUs.
+                let i = match ranges.ranges_offset {
+                    Some(_) => None,
+                    None => aranges.binary_search_by_key(&offset, |x| x.0).ok(),
+                };
+                if let Some(mut i) = i {
+                    // There should be only one set per CU, but in practice multiple
+                    // sets have been observed. This is probably a compiler bug, but
+                    // either way we need to handle it.
+                    while i > 0 && aranges[i - 1].0 == offset {
+                        i -= 1;
+                    }
+                    for (_, aranges_offset) in aranges[i..].iter().take_while(|x| x.0 == offset) {
+                        let aranges_header = sections.debug_aranges.header(*aranges_offset)?;
+                        let mut aranges = aranges_header.entries();
+                        while let Some(arange) = aranges.next()? {
+                            if arange.length() != 0 {
+                                unit_ranges.push(UnitRange {
+                                    range: arange.range(),
+                                    unit_id,
+                                    max_end: 0,
+                                });
+                            }
+                        }
+                    }
+                } else {
+                    ranges.for_each_range(&sections, &dw_unit, |range| {
+                        unit_ranges.push(UnitRange {
+                            range,
+                            unit_id,
+                            max_end: 0,
+                        });
+                    })?;
+                }
+            }
+
+            res_units.push(ResUnit {
+                offset,
+                dw_unit,
+                lang,
+                lines: LazyCell::new(),
+                funcs: LazyCell::new(),
+            });
+        }
+
+        // Sort this for faster lookup in `find_unit_and_address` below.
+        unit_ranges.sort_by_key(|i| i.range.begin);
+
+        // Calculate the `max_end` field now that we've determined the order of
+        // CUs.
+        let mut max = 0;
+        for i in unit_ranges.iter_mut() {
+            max = max.max(i.range.end);
+            i.max_end = max;
+        }
+
+        Ok(ResDwarf {
+            units: res_units,
+            unit_ranges,
+            sections,
+            sup: None,
+        })
+    }
+
+    fn find_unit(&self, offset: gimli::DebugInfoOffset<R::Offset>) -> Result<&ResUnit<R>, Error> {
+        match self
+            .units
+            .binary_search_by_key(&offset.0, |unit| unit.offset.0)
+        {
+            // There is never a DIE at the unit offset or before the first unit.
+            Ok(_) | Err(0) => Err(gimli::Error::NoEntryAtGivenOffset),
+            Err(i) => Ok(&self.units[i - 1]),
+        }
+    }
+}
+
 struct Lines {
     files: Box<[String]>,
     sequences: Box<[LineSequence]>,
@@ -427,10 +544,7 @@
     column: u32,
 }
 
-struct ResUnit<R>
-where
-    R: gimli::Reader,
-{
+struct ResUnit<R: gimli::Reader> {
     offset: gimli::DebugInfoOffset<R::Offset>,
     dw_unit: gimli::Unit<R>,
     lang: Option<gimli::DwLang>,
@@ -438,10 +552,7 @@
     funcs: LazyCell<Result<Functions<R>, Error>>,
 }
 
-impl<R> ResUnit<R>
-where
-    R: gimli::Reader,
-{
+impl<R: gimli::Reader> ResUnit<R> {
     fn parse_lines(&self, sections: &gimli::Dwarf<R>) -> Result<Option<&Lines>, Error> {
         let ilnp = match self.dw_unit.line_program {
             Some(ref ilnp) => ilnp,
@@ -469,10 +580,10 @@
 
                     let address = row.address();
                     let file_index = row.file_index();
-                    let line = row.line().unwrap_or(0) as u32;
+                    let line = row.line().map(NonZeroU64::get).unwrap_or(0) as u32;
                     let column = match row.column() {
                         gimli::ColumnType::LeftEdge => 0,
-                        gimli::ColumnType::Column(x) => x as u32,
+                        gimli::ColumnType::Column(x) => x.get() as u32,
                     };
 
                     if let Some(last_row) = sequence_rows.last_mut() {
@@ -515,23 +626,19 @@
             .map_err(Error::clone)
     }
 
-    fn parse_functions(&self, sections: &gimli::Dwarf<R>) -> Result<&Functions<R>, Error> {
+    fn parse_functions(&self, dwarf: &ResDwarf<R>) -> Result<&Functions<R>, Error> {
         self.funcs
-            .borrow_with(|| Functions::parse(&self.dw_unit, sections))
+            .borrow_with(|| Functions::parse(&self.dw_unit, dwarf))
             .as_ref()
             .map_err(Error::clone)
     }
 
-    fn parse_inlined_functions(
-        &self,
-        sections: &gimli::Dwarf<R>,
-        units: &[ResUnit<R>],
-    ) -> Result<(), Error> {
+    fn parse_inlined_functions(&self, dwarf: &ResDwarf<R>) -> Result<(), Error> {
         self.funcs
-            .borrow_with(|| Functions::parse(&self.dw_unit, sections))
+            .borrow_with(|| Functions::parse(&self.dw_unit, dwarf))
             .as_ref()
             .map_err(Error::clone)?
-            .parse_inlined_functions(&self.dw_unit, sections, units)
+            .parse_inlined_functions(&self.dw_unit, dwarf)
     }
 
     fn find_location(
@@ -539,74 +646,47 @@
         probe: u64,
         sections: &gimli::Dwarf<R>,
     ) -> Result<Option<Location<'_>>, Error> {
-        let lines = match self.parse_lines(sections)? {
-            Some(lines) => lines,
-            None => return Ok(None),
-        };
-
-        let idx = lines.sequences.binary_search_by(|sequence| {
-            if probe < sequence.start {
-                Ordering::Greater
-            } else if probe >= sequence.end {
-                Ordering::Less
-            } else {
-                Ordering::Equal
+        if let Some(mut iter) = LocationRangeUnitIter::new(self, sections, probe, probe + 1)? {
+            match iter.next() {
+                None => Ok(None),
+                Some((_addr, _len, loc)) => Ok(Some(loc)),
             }
-        });
-        let idx = match idx {
-            Ok(x) => x,
-            Err(_) => return Ok(None),
-        };
-        let sequence = &lines.sequences[idx];
-
-        let idx = sequence
-            .rows
-            .binary_search_by(|row| row.address.cmp(&probe));
-        let idx = match idx {
-            Ok(x) => x,
-            Err(0) => return Ok(None),
-            Err(x) => x - 1,
-        };
-        let row = &sequence.rows[idx];
+        } else {
+            Ok(None)
+        }
+    }
 
-        let file = lines.files.get(row.file_index as usize).map(String::as_str);
-        Ok(Some(Location {
-            file,
-            line: if row.line != 0 { Some(row.line) } else { None },
-            column: if row.column != 0 {
-                Some(row.column)
-            } else {
-                None
-            },
-        }))
+    #[inline]
+    fn find_location_range(
+        &self,
+        probe_low: u64,
+        probe_high: u64,
+        sections: &gimli::Dwarf<R>,
+    ) -> Result<Option<LocationRangeUnitIter<'_>>, Error> {
+        LocationRangeUnitIter::new(self, sections, probe_low, probe_high)
     }
 
     fn find_function_or_location(
         &self,
         probe: u64,
-        sections: &gimli::Dwarf<R>,
-        units: &[ResUnit<R>],
+        dwarf: &ResDwarf<R>,
     ) -> Result<(Option<&Function<R>>, Option<Location<'_>>), Error> {
-        let functions = self.parse_functions(sections)?;
-        if functions.is_empty() {
-            // If there are no functions, then this unit may have line information only,
-            // so check for a location.
-            let location = self.find_location(probe, sections)?;
-            return Ok((None, location));
-        }
-        let address = match functions.find_address(probe) {
-            Some(function) => function,
-            None => return Ok((None, None)),
+        let functions = self.parse_functions(dwarf)?;
+        let function = match functions.find_address(probe) {
+            Some(address) => {
+                let function_index = functions.addresses[address].function;
+                let (offset, ref function) = functions.functions[function_index];
+                Some(
+                    function
+                        .borrow_with(|| Function::parse(offset, &self.dw_unit, dwarf))
+                        .as_ref()
+                        .map_err(Error::clone)?,
+                )
+            }
+            None => None,
         };
-        let function_index = functions.addresses[address].function;
-        let function = &functions.functions[function_index];
-        let function = function
-            .1
-            .borrow_with(|| Function::parse(function.0, &self.dw_unit, sections, units))
-            .as_ref()
-            .map_err(Error::clone)?;
-        let location = self.find_location(probe, sections)?;
-        Ok((Some(function), location))
+        let location = self.find_location(probe, &dwarf.sections)?;
+        Ok((function, location))
     }
 
     fn render_file(
@@ -643,538 +723,227 @@
     }
 }
 
-fn path_push(path: &mut String, p: &str) {
-    if p.starts_with('/') {
-        *path = p.to_string();
-    } else {
-        if !path.ends_with('/') {
-            path.push('/');
-        }
-        *path += p;
-    }
+/// Iterator over `Location`s in a range of addresses, returned by `Context::find_location_range`.
+pub struct LocationRangeIter<'ctx, R: gimli::Reader> {
+    unit_iter: Box<dyn Iterator<Item = (&'ctx ResUnit<R>, &'ctx gimli::Range)> + 'ctx>,
+    iter: Option<LocationRangeUnitIter<'ctx>>,
+
+    probe_low: u64,
+    probe_high: u64,
+    sections: &'ctx gimli::Dwarf<R>,
 }
 
-fn name_attr<R>(
-    attr: gimli::AttributeValue<R>,
-    unit: &gimli::Unit<R>,
-    sections: &gimli::Dwarf<R>,
-    units: &[ResUnit<R>],
-    recursion_limit: usize,
-) -> Result<Option<R>, Error>
-where
-    R: gimli::Reader,
-{
-    if recursion_limit == 0 {
-        return Ok(None);
+impl<'ctx, R: gimli::Reader> LocationRangeIter<'ctx, R> {
+    #[inline]
+    fn new(ctx: &'ctx Context<R>, probe_low: u64, probe_high: u64) -> Result<Self, Error> {
+        let sections = &ctx.dwarf.sections;
+        let unit_iter = ctx.find_units_range(probe_low, probe_high);
+        Ok(Self {
+            unit_iter: Box::new(unit_iter),
+            iter: None,
+            probe_low,
+            probe_high,
+            sections,
+        })
     }
 
-    let (unit, offset) = match attr {
-        gimli::AttributeValue::UnitRef(offset) => (unit, offset),
-        gimli::AttributeValue::DebugInfoRef(dr) => {
-            let res_unit = match units.binary_search_by_key(&dr.0, |unit| unit.offset.0) {
-                // There is never a DIE at the unit offset or before the first unit.
-                Ok(_) | Err(0) => return Err(gimli::Error::NoEntryAtGivenOffset),
-                Err(i) => &units[i - 1],
-            };
-            (
-                &res_unit.dw_unit,
-                gimli::UnitOffset(dr.0 - res_unit.offset.0),
-            )
-        }
-        _ => return Ok(None),
-    };
-
-    let mut entries = unit.entries_raw(Some(offset))?;
-    let abbrev = if let Some(abbrev) = entries.read_abbreviation()? {
-        abbrev
-    } else {
-        return Err(gimli::Error::NoEntryAtGivenOffset);
-    };
-
-    let mut name = None;
-    let mut next = None;
-    for spec in abbrev.attributes() {
-        match entries.read_attribute(*spec) {
-            Ok(ref attr) => match attr.name() {
-                gimli::DW_AT_linkage_name | gimli::DW_AT_MIPS_linkage_name => {
-                    if let Ok(val) = sections.attr_string(unit, attr.value()) {
-                        return Ok(Some(val));
+    fn next_loc(&mut self) -> Result<Option<(u64, u64, Location<'ctx>)>, Error> {
+        loop {
+            let iter = self.iter.take();
+            match iter {
+                None => match self.unit_iter.next() {
+                    Some((unit, range)) => {
+                        self.iter = unit.find_location_range(
+                            cmp::max(self.probe_low, range.begin),
+                            cmp::min(self.probe_high, range.end),
+                            self.sections,
+                        )?;
                     }
-                }
-                gimli::DW_AT_name => {
-                    if let Ok(val) = sections.attr_string(unit, attr.value()) {
-                        name = Some(val);
+                    None => return Ok(None),
+                },
+                Some(mut iter) => {
+                    if let item @ Some(_) = iter.next() {
+                        self.iter = Some(iter);
+                        return Ok(item);
                     }
                 }
-                gimli::DW_AT_abstract_origin | gimli::DW_AT_specification => {
-                    next = Some(attr.value());
-                }
-                _ => {}
-            },
-            Err(e) => return Err(e),
+            }
         }
     }
+}
 
-    if name.is_some() {
-        return Ok(name);
-    }
+impl<'ctx, R> Iterator for LocationRangeIter<'ctx, R>
+where
+    R: gimli::Reader + 'ctx,
+{
+    type Item = (u64, u64, Location<'ctx>);
 
-    if let Some(next) = next {
-        return name_attr(next, unit, sections, units, recursion_limit - 1);
+    #[inline]
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.next_loc() {
+            Err(_) => None,
+            Ok(loc) => loc,
+        }
     }
-
-    Ok(None)
 }
 
-struct Functions<R: gimli::Reader> {
-    /// List of all `DW_TAG_subprogram` details in the unit.
-    functions: Box<
-        [(
-            gimli::UnitOffset<R::Offset>,
-            LazyCell<Result<Function<R>, Error>>,
-        )],
-    >,
-    /// List of `DW_TAG_subprogram` address ranges in the unit.
-    addresses: Box<[FunctionAddress]>,
-}
+#[cfg(feature = "fallible-iterator")]
+impl<'ctx, R> fallible_iterator::FallibleIterator for LocationRangeIter<'ctx, R>
+where
+    R: gimli::Reader + 'ctx,
+{
+    type Item = (u64, u64, Location<'ctx>);
+    type Error = Error;
 
-/// A single address range for a function.
-///
-/// It is possible for a function to have multiple address ranges; this
-/// is handled by having multiple `FunctionAddress` entries with the same
-/// `function` field.
-struct FunctionAddress {
-    range: gimli::Range,
-    /// An index into `Functions::functions`.
-    function: usize,
+    #[inline]
+    fn next(&mut self) -> Result<Option<Self::Item>, Self::Error> {
+        self.next_loc()
+    }
 }
 
-struct Function<R: gimli::Reader> {
-    dw_die_offset: gimli::UnitOffset<R::Offset>,
-    name: Option<R>,
-    /// List of all `DW_TAG_inlined_subroutine` details in this function.
-    inlined_functions: Box<[InlinedFunction<R>]>,
-    /// List of `DW_TAG_inlined_subroutine` address ranges in this function.
-    inlined_addresses: Box<[InlinedFunctionAddress]>,
+struct LocationRangeUnitIter<'ctx> {
+    lines: &'ctx Lines,
+    seqs: &'ctx [LineSequence],
+    seq_idx: usize,
+    row_idx: usize,
+    probe_high: u64,
 }
 
-struct InlinedFunctionAddress {
-    range: gimli::Range,
-    call_depth: usize,
-    /// An index into `Function::inlined_functions`.
-    function: usize,
-}
-
-struct InlinedFunction<R: gimli::Reader> {
-    dw_die_offset: gimli::UnitOffset<R::Offset>,
-    name: Option<R>,
-    call_file: u64,
-    call_line: u32,
-    call_column: u32,
-}
-
-impl<R: gimli::Reader> Functions<R> {
-    fn is_empty(&self) -> bool {
-        self.functions.is_empty()
-    }
-
-    fn parse(unit: &gimli::Unit<R>, sections: &gimli::Dwarf<R>) -> Result<Functions<R>, Error> {
-        let mut functions = Vec::new();
-        let mut addresses = Vec::new();
-        let mut entries = unit.entries_raw(None)?;
-        while !entries.is_empty() {
-            let dw_die_offset = entries.next_offset();
-            if let Some(abbrev) = entries.read_abbreviation()? {
-                if abbrev.tag() == gimli::DW_TAG_subprogram {
-                    let mut ranges = RangeAttributes::default();
-                    for spec in abbrev.attributes() {
-                        match entries.read_attribute(*spec) {
-                            Ok(ref attr) => {
-                                match attr.name() {
-                                    gimli::DW_AT_low_pc => {
-                                        if let gimli::AttributeValue::Addr(val) = attr.value() {
-                                            ranges.low_pc = Some(val);
-                                        }
-                                    }
-                                    gimli::DW_AT_high_pc => match attr.value() {
-                                        gimli::AttributeValue::Addr(val) => {
-                                            ranges.high_pc = Some(val)
-                                        }
-                                        gimli::AttributeValue::Udata(val) => {
-                                            ranges.size = Some(val)
-                                        }
-                                        _ => {}
-                                    },
-                                    gimli::DW_AT_ranges => {
-                                        ranges.ranges_offset =
-                                            sections.attr_ranges_offset(unit, attr.value())?;
-                                    }
-                                    _ => {}
-                                };
-                            }
-                            Err(e) => return Err(e),
-                        }
-                    }
-
-                    let function_index = functions.len();
-                    if ranges.for_each_range(sections, unit, |range| {
-                        addresses.push(FunctionAddress {
-                            range,
-                            function: function_index,
-                        });
-                    })? {
-                        functions.push((dw_die_offset, LazyCell::new()));
-                    }
-                } else {
-                    for spec in abbrev.attributes() {
-                        match entries.read_attribute(*spec) {
-                            Ok(_) => {}
-                            Err(e) => return Err(e),
-                        }
-                    }
-                }
-            }
-        }
-
-        // The binary search requires the addresses to be sorted.
-        //
-        // It also requires them to be non-overlapping.  In practice, overlapping
-        // function ranges are unlikely, so we don't try to handle that yet.
-        //
-        // It's possible for multiple functions to have the same address range if the
-        // compiler can detect and remove functions with identical code.  In that case
-        // we'll nondeterministically return one of them.
-        addresses.sort_by_key(|x| x.range.begin);
-
-        Ok(Functions {
-            functions: functions.into_boxed_slice(),
-            addresses: addresses.into_boxed_slice(),
-        })
-    }
-
-    fn find_address(&self, probe: u64) -> Option<usize> {
-        self.addresses
-            .binary_search_by(|address| {
-                if probe < address.range.begin {
+impl<'ctx> LocationRangeUnitIter<'ctx> {
+    fn new<R: gimli::Reader>(
+        resunit: &'ctx ResUnit<R>,
+        sections: &gimli::Dwarf<R>,
+        probe_low: u64,
+        probe_high: u64,
+    ) -> Result<Option<Self>, Error> {
+        let lines = resunit.parse_lines(sections)?;
+
+        if let Some(lines) = lines {
+            // Find index for probe_low.
+            let seq_idx = lines.sequences.binary_search_by(|sequence| {
+                if probe_low < sequence.start {
                     Ordering::Greater
-                } else if probe >= address.range.end {
+                } else if probe_low >= sequence.end {
                     Ordering::Less
                 } else {
                     Ordering::Equal
                 }
-            })
-            .ok()
-    }
+            });
+            let seq_idx = match seq_idx {
+                Ok(x) => x,
+                Err(0) => 0, // probe below sequence, but range could overlap
+                Err(_) => lines.sequences.len(),
+            };
 
-    fn parse_inlined_functions(
-        &self,
-        unit: &gimli::Unit<R>,
-        sections: &gimli::Dwarf<R>,
-        units: &[ResUnit<R>],
-    ) -> Result<(), Error> {
-        for function in &*self.functions {
-            function
-                .1
-                .borrow_with(|| Function::parse(function.0, unit, sections, units))
-                .as_ref()
-                .map_err(Error::clone)?;
+            let row_idx = if let Some(seq) = lines.sequences.get(seq_idx) {
+                let idx = seq.rows.binary_search_by(|row| row.address.cmp(&probe_low));
+                let idx = match idx {
+                    Ok(x) => x,
+                    Err(0) => 0, // probe below sequence, but range could overlap
+                    Err(x) => x - 1,
+                };
+                idx
+            } else {
+                0
+            };
+
+            Ok(Some(Self {
+                lines,
+                seqs: &*lines.sequences,
+                seq_idx,
+                row_idx,
+                probe_high,
+            }))
+        } else {
+            Ok(None)
         }
-        Ok(())
     }
 }
 
-impl<R: gimli::Reader> Function<R> {
-    fn parse(
-        dw_die_offset: gimli::UnitOffset<R::Offset>,
-        unit: &gimli::Unit<R>,
-        sections: &gimli::Dwarf<R>,
-        units: &[ResUnit<R>],
-    ) -> Result<Self, Error> {
-        let mut entries = unit.entries_raw(Some(dw_die_offset))?;
-        let depth = entries.next_depth();
-        let abbrev = entries.read_abbreviation()?.unwrap();
-        debug_assert_eq!(abbrev.tag(), gimli::DW_TAG_subprogram);
-
-        let mut name = None;
-        for spec in abbrev.attributes() {
-            match entries.read_attribute(*spec) {
-                Ok(ref attr) => {
-                    match attr.name() {
-                        gimli::DW_AT_linkage_name | gimli::DW_AT_MIPS_linkage_name => {
-                            if let Ok(val) = sections.attr_string(unit, attr.value()) {
-                                name = Some(val);
-                            }
-                        }
-                        gimli::DW_AT_name => {
-                            if name.is_none() {
-                                name = sections.attr_string(unit, attr.value()).ok();
-                            }
-                        }
-                        gimli::DW_AT_abstract_origin | gimli::DW_AT_specification => {
-                            if name.is_none() {
-                                name = name_attr(attr.value(), unit, sections, units, 16)?;
-                            }
-                        }
-                        _ => {}
-                    };
-                }
-                Err(e) => return Err(e),
-            }
-        }
-
-        let mut inlined_functions = Vec::new();
-        let mut inlined_addresses = Vec::new();
-        Function::parse_children(
-            &mut entries,
-            depth,
-            unit,
-            sections,
-            units,
-            &mut inlined_functions,
-            &mut inlined_addresses,
-            0,
-        )?;
-
-        // Sort ranges in "breadth-first traversal order", i.e. first by call_depth
-        // and then by range.begin. This allows finding the range containing an
-        // address at a certain depth using binary search.
-        // Note: Using DFS order, i.e. ordering by range.begin first and then by
-        // call_depth, would not work! Consider the two examples
-        // "[0..10 at depth 0], [0..2 at depth 1], [6..8 at depth 1]"  and
-        // "[0..5 at depth 0], [0..2 at depth 1], [5..10 at depth 0], [6..8 at depth 1]".
-        // In this example, if you want to look up address 7 at depth 0, and you
-        // encounter [0..2 at depth 1], are you before or after the target range?
-        // You don't know.
-        inlined_addresses.sort_by(|r1, r2| {
-            if r1.call_depth < r2.call_depth {
-                Ordering::Less
-            } else if r1.call_depth > r2.call_depth {
-                Ordering::Greater
-            } else if r1.range.begin < r2.range.begin {
-                Ordering::Less
-            } else if r1.range.begin > r2.range.begin {
-                Ordering::Greater
-            } else {
-                Ordering::Equal
-            }
-        });
-
-        Ok(Function {
-            dw_die_offset,
-            name,
-            inlined_functions: inlined_functions.into_boxed_slice(),
-            inlined_addresses: inlined_addresses.into_boxed_slice(),
-        })
-    }
+impl<'ctx> Iterator for LocationRangeUnitIter<'ctx> {
+    type Item = (u64, u64, Location<'ctx>);
 
-    fn parse_children(
-        entries: &mut gimli::EntriesRaw<R>,
-        depth: isize,
-        unit: &gimli::Unit<R>,
-        sections: &gimli::Dwarf<R>,
-        units: &[ResUnit<R>],
-        inlined_functions: &mut Vec<InlinedFunction<R>>,
-        inlined_addresses: &mut Vec<InlinedFunctionAddress>,
-        inlined_depth: usize,
-    ) -> Result<(), Error> {
+    fn next(&mut self) -> Option<(u64, u64, Location<'ctx>)> {
         loop {
-            let dw_die_offset = entries.next_offset();
-            let next_depth = entries.next_depth();
-            if next_depth <= depth {
-                return Ok(());
-            }
-            if let Some(abbrev) = entries.read_abbreviation()? {
-                match abbrev.tag() {
-                    gimli::DW_TAG_subprogram => {
-                        Function::skip(entries, abbrev, next_depth)?;
-                    }
-                    gimli::DW_TAG_inlined_subroutine => {
-                        InlinedFunction::parse(
-                            dw_die_offset,
-                            entries,
-                            abbrev,
-                            next_depth,
-                            unit,
-                            sections,
-                            units,
-                            inlined_functions,
-                            inlined_addresses,
-                            inlined_depth,
-                        )?;
-                    }
-                    _ => {
-                        for spec in abbrev.attributes() {
-                            match entries.read_attribute(*spec) {
-                                Ok(_) => {}
-                                Err(e) => return Err(e),
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+            let seq = match self.seqs.get(self.seq_idx) {
+                Some(seq) => seq,
+                None => break,
+            };
 
-    fn skip(
-        entries: &mut gimli::EntriesRaw<R>,
-        abbrev: &gimli::Abbreviation,
-        depth: isize,
-    ) -> Result<(), Error> {
-        // TODO: use DW_AT_sibling
-        for spec in abbrev.attributes() {
-            match entries.read_attribute(*spec) {
-                Ok(_) => {}
-                Err(e) => return Err(e),
+            if seq.start >= self.probe_high {
+                break;
             }
-        }
-        while entries.next_depth() > depth {
-            if let Some(abbrev) = entries.read_abbreviation()? {
-                for spec in abbrev.attributes() {
-                    match entries.read_attribute(*spec) {
-                        Ok(_) => {}
-                        Err(e) => return Err(e),
+
+            match seq.rows.get(self.row_idx) {
+                Some(row) => {
+                    if row.address >= self.probe_high {
+                        break;
                     }
-                }
-            }
-        }
-        Ok(())
-    }
 
-    /// Build the list of inlined functions that contain `probe`.
-    fn find_inlined_functions(
-        &self,
-        probe: u64,
-    ) -> iter::Rev<maybe_small::IntoIter<&InlinedFunction<R>>> {
-        // `inlined_functions` is ordered from outside to inside.
-        let mut inlined_functions = maybe_small::Vec::new();
-        let mut inlined_addresses = &self.inlined_addresses[..];
-        loop {
-            let current_depth = inlined_functions.len();
-            // Look up (probe, current_depth) in inline_ranges.
-            // `inlined_addresses` is sorted in "breadth-first traversal order", i.e.
-            // by `call_depth` first, and then by `range.begin`. See the comment at
-            // the sort call for more information about why.
-            let search = inlined_addresses.binary_search_by(|range| {
-                if range.call_depth > current_depth {
-                    Ordering::Greater
-                } else if range.call_depth < current_depth {
-                    Ordering::Less
-                } else if range.range.begin > probe {
-                    Ordering::Greater
-                } else if range.range.end <= probe {
-                    Ordering::Less
-                } else {
-                    Ordering::Equal
+                    let file = self
+                        .lines
+                        .files
+                        .get(row.file_index as usize)
+                        .map(String::as_str);
+                    let nextaddr = seq
+                        .rows
+                        .get(self.row_idx + 1)
+                        .map(|row| row.address)
+                        .unwrap_or(seq.end);
+
+                    let item = (
+                        row.address,
+                        nextaddr - row.address,
+                        Location {
+                            file,
+                            line: if row.line != 0 { Some(row.line) } else { None },
+                            column: if row.column != 0 {
+                                Some(row.column)
+                            } else {
+                                None
+                            },
+                        },
+                    );
+                    self.row_idx += 1;
+
+                    return Some(item);
+                }
+                None => {
+                    self.seq_idx += 1;
+                    self.row_idx = 0;
                 }
-            });
-            if let Ok(index) = search {
-                let function_index = inlined_addresses[index].function;
-                inlined_functions.push(&self.inlined_functions[function_index]);
-                inlined_addresses = &inlined_addresses[index + 1..];
-            } else {
-                break;
             }
         }
-        inlined_functions.into_iter().rev()
+        None
     }
 }
 
-impl<R: gimli::Reader> InlinedFunction<R> {
-    fn parse(
-        dw_die_offset: gimli::UnitOffset<R::Offset>,
-        entries: &mut gimli::EntriesRaw<R>,
-        abbrev: &gimli::Abbreviation,
-        depth: isize,
-        unit: &gimli::Unit<R>,
-        sections: &gimli::Dwarf<R>,
-        units: &[ResUnit<R>],
-        inlined_functions: &mut Vec<InlinedFunction<R>>,
-        inlined_addresses: &mut Vec<InlinedFunctionAddress>,
-        inlined_depth: usize,
-    ) -> Result<(), Error> {
-        let mut ranges = RangeAttributes::default();
-        let mut name = None;
-        let mut call_file = 0;
-        let mut call_line = 0;
-        let mut call_column = 0;
-        for spec in abbrev.attributes() {
-            match entries.read_attribute(*spec) {
-                Ok(ref attr) => match attr.name() {
-                    gimli::DW_AT_low_pc => {
-                        if let gimli::AttributeValue::Addr(val) = attr.value() {
-                            ranges.low_pc = Some(val);
-                        }
-                    }
-                    gimli::DW_AT_high_pc => match attr.value() {
-                        gimli::AttributeValue::Addr(val) => ranges.high_pc = Some(val),
-                        gimli::AttributeValue::Udata(val) => ranges.size = Some(val),
-                        _ => {}
-                    },
-                    gimli::DW_AT_ranges => {
-                        ranges.ranges_offset = sections.attr_ranges_offset(unit, attr.value())?;
-                    }
-                    gimli::DW_AT_linkage_name | gimli::DW_AT_MIPS_linkage_name => {
-                        if let Ok(val) = sections.attr_string(unit, attr.value()) {
-                            name = Some(val);
-                        }
-                    }
-                    gimli::DW_AT_name => {
-                        if name.is_none() {
-                            name = sections.attr_string(unit, attr.value()).ok();
-                        }
-                    }
-                    gimli::DW_AT_abstract_origin | gimli::DW_AT_specification => {
-                        if name.is_none() {
-                            name = name_attr(attr.value(), unit, sections, units, 16)?;
-                        }
-                    }
-                    gimli::DW_AT_call_file => {
-                        if let gimli::AttributeValue::FileIndex(fi) = attr.value() {
-                            call_file = fi;
-                        }
-                    }
-                    gimli::DW_AT_call_line => {
-                        call_line = attr.udata_value().unwrap_or(0) as u32;
-                    }
-                    gimli::DW_AT_call_column => {
-                        call_column = attr.udata_value().unwrap_or(0) as u32;
-                    }
-                    _ => {}
-                },
-                Err(e) => return Err(e),
-            }
-        }
-
-        let function_index = inlined_functions.len();
-        inlined_functions.push(InlinedFunction {
-            dw_die_offset,
-            name,
-            call_file,
-            call_line,
-            call_column,
-        });
-
-        ranges.for_each_range(sections, unit, |range| {
-            inlined_addresses.push(InlinedFunctionAddress {
-                range,
-                call_depth: inlined_depth,
-                function: function_index,
-            });
-        })?;
+fn path_push(path: &mut String, p: &str) {
+    if has_unix_root(p) || has_windows_root(p) {
+        *path = p.to_string();
+    } else {
+        let dir_separator = if has_windows_root(path.as_str()) {
+            '\\'
+        } else {
+            '/'
+        };
 
-        Function::parse_children(
-            entries,
-            depth,
-            unit,
-            sections,
-            units,
-            inlined_functions,
-            inlined_addresses,
-            inlined_depth + 1,
-        )
+        if !path.ends_with(dir_separator) {
+            path.push(dir_separator);
+        }
+        *path += p;
     }
 }
 
+/// Check if the path in the given string has a unix style root
+fn has_unix_root(p: &str) -> bool {
+    p.starts_with('/')
+}
+
+/// Check if the path in the given string has a windows style root
+fn has_windows_root(p: &str) -> bool {
+    p.starts_with('\\') || p.get(1..3) == Some(":\\")
+}
 struct RangeAttributes<R: gimli::Reader> {
     low_pc: Option<u64>,
     high_pc: Option<u64>,
@@ -1412,3 +1181,12 @@
     /// The column number.
     pub column: Option<u32>,
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn context_is_send() {
+        fn assert_is_send<T: Send>() {}
+        assert_is_send::<crate::Context<gimli::read::EndianSlice<gimli::LittleEndian>>>();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/tests/parse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/tests/parse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/addr2line/tests/parse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/addr2line/tests/parse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -40,8 +40,7 @@
             .unwrap_or(&[][..]);
         Ok(Cow::Borrowed(data))
     };
-    let load_section_sup = |_| Ok(Cow::Borrowed(&[][..]));
-    gimli::Dwarf::load(&load_section, &load_section_sup).unwrap()
+    gimli::Dwarf::load(&load_section).unwrap()
 }
 
 fn dwarf_borrow<'a>(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"042ed3158af7000c88a6617d775f11456bd30f6c7c8b5b586978faa1e11b1e24","Cargo.toml":"107d13689eecfa82a8b5ae35bf835b9d2775337226630e4bdb35f22d0dd52e18","LICENSE-0BSD":"861399f8c21c042b110517e76dc6b63a2b334276c8cf17412fc3c8908ca8dc17","LICENSE-APACHE":"8ada45cd9f843acf64e4722ae262c622a2b3b3007c7310ef36ac1061a30f6adb","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"fa83fd5ee10b61827de382e496bf66296a526e3d2c3b2aa5ad672aa15e8d2d7f","RELEASE_PROCESS.md":"a86cd10fc70f167f8d00e9e4ce0c6b4ebdfa1865058390dffd1e0ad4d3e68d9d","benches/bench.rs":"c07ce370e3680c602e415f8d1ec4e543ea2163ab22a09b6b82d93e8a30adca82","src/algo.rs":"b664b131f724a809591394a10b9023f40ab5963e32a83fa3163c2668e59c8b66","src/lib.rs":"67f3ca5b6333e22745b178b70f472514162cea2890344724f0f66995fcf19806"},"package":"ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"737088e45fdf27fe2cfedce163332d8ce08c58fd86ca287de2de34c0fbaf63e7","Cargo.toml":"f410869f0f1a5697f65a8a77be03da7aeecc0be26e7cf3a1feb1acaa4f518770","LICENSE-0BSD":"861399f8c21c042b110517e76dc6b63a2b334276c8cf17412fc3c8908ca8dc17","LICENSE-APACHE":"8ada45cd9f843acf64e4722ae262c622a2b3b3007c7310ef36ac1061a30f6adb","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"308c50cdb42b9573743068158339570b45ca3f895015ca3b87ba983edb0a21e6","RELEASE_PROCESS.md":"a86cd10fc70f167f8d00e9e4ce0c6b4ebdfa1865058390dffd1e0ad4d3e68d9d","benches/bench.rs":"c07ce370e3680c602e415f8d1ec4e543ea2163ab22a09b6b82d93e8a30adca82","src/algo.rs":"b664b131f724a809591394a10b9023f40ab5963e32a83fa3163c2668e59c8b66","src/lib.rs":"b55ba9c629b30360d08168b2ca0c96275432856a539737a105a6d6ae6bf7e88f"},"package":"f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,17 +12,17 @@
 
 [package]
 name = "adler"
-version = "0.2.3"
+version = "1.0.2"
 authors = ["Jonas Schievink <jonasschievink@gmail.com>"]
 description = "A simple clean-room implementation of the Adler-32 checksum"
 documentation = "https://docs.rs/adler/"
 readme = "README.md"
-keywords = ["checksum", "integrity", "hash", "adler32"]
+keywords = ["checksum", "integrity", "hash", "adler32", "zlib"]
 categories = ["algorithms"]
 license = "0BSD OR MIT OR Apache-2.0"
 repository = "https://github.com/jonas-schievink/adler.git"
 [package.metadata.docs.rs]
-rustdoc-args = ["--cfg docsrs"]
+rustdoc-args = ["--cfg=docsrs"]
 
 [package.metadata.release]
 no-dev-version = true
@@ -62,8 +62,3 @@
 default = ["std"]
 rustc-dep-of-std = ["core", "compiler_builtins"]
 std = []
-[badges.maintenance]
-status = "actively-developed"
-
-[badges.travis-ci]
-repository = "jonas-schievink/adler"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,35 @@
 
 No changes.
 
+## [1.0.2 - 2021-02-26](https://github.com/jonas-schievink/adler/releases/tag/v1.0.2)
+
+- Fix doctest on big-endian systems ([#9]).
+
+[#9]: https://github.com/jonas-schievink/adler/pull/9
+
+## [1.0.1 - 2020-11-08](https://github.com/jonas-schievink/adler/releases/tag/v1.0.1)
+
+### Fixes
+
+- Fix documentation on docs.rs.
+
+## [1.0.0 - 2020-11-08](https://github.com/jonas-schievink/adler/releases/tag/v1.0.0)
+
+### Fixes
+
+- Fix `cargo test --no-default-features` ([#5]).
+
+### Improvements
+
+- Extended and clarified documentation.
+- Added more rustdoc examples.
+- Extended CI to test the crate with `--no-default-features`.
+
+### Breaking Changes
+
+- `adler32_reader` now takes its generic argument by value instead of as a `&mut`.
+- Renamed `adler32_reader` to `adler32`.
+
 ## [0.2.3 - 2020-07-11](https://github.com/jonas-schievink/adler/releases/tag/v0.2.3)
 
 - Process 4 Bytes at a time, improving performance by up to 50% ([#2]).
@@ -31,3 +60,4 @@
 
 
 [#2]: https://github.com/jonas-schievink/adler/pull/2
+[#5]: https://github.com/jonas-schievink/adler/pull/5
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
 ![CI](https://github.com/jonas-schievink/adler/workflows/CI/badge.svg)
 
 This crate provides a simple implementation of the Adler-32 checksum, used in
-zlib, rsync, and other software.
+the zlib compression format.
 
 Please refer to the [changelog](CHANGELOG.md) to see what changed in the last
 releases.
@@ -14,6 +14,7 @@
 
 - Permissively licensed (0BSD) clean-room implementation.
 - Zero dependencies.
+- Zero `unsafe`.
 - Decent performance (3-4 GB/s).
 - Supports `#![no_std]` (with `default-features = false`).
 
@@ -23,7 +24,7 @@
 
 ```toml
 [dependencies]
-adler = "0.2.3"
+adler = "1.0.2"
 ```
 
 Check the [API Documentation](https://docs.rs/adler/) for how to use the
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/adler/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/adler/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,10 +4,11 @@
 //!
 //! - Permissively licensed (0BSD) clean-room implementation.
 //! - Zero dependencies.
+//! - Zero `unsafe`.
 //! - Decent performance (3-4 GB/s).
 //! - `#![no_std]` support (with `default-features = false`).
 
-#![doc(html_root_url = "https://docs.rs/adler/0.2.3")]
+#![doc(html_root_url = "https://docs.rs/adler/1.0.2")]
 // Deny a few warnings in doctests, since rustdoc `allow`s many warnings by default
 #![doc(test(attr(deny(unused_imports, unused_must_use))))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
@@ -33,8 +34,51 @@
 ///
 /// This type also implements `Hasher`, which makes it easy to calculate Adler-32 checksums of any
 /// type that implements or derives `Hash`. This also allows using Adler-32 in a `HashMap`, although
-/// that is not recommended (while every checksum is a hash, they are not necessarily good at being
-/// one).
+/// that is not recommended (while every checksum is a hash function, they are not necessarily a
+/// good one).
+///
+/// # Examples
+///
+/// Basic, piecewise checksum calculation:
+///
+/// ```
+/// use adler::Adler32;
+///
+/// let mut adler = Adler32::new();
+///
+/// adler.write_slice(&[0, 1, 2]);
+/// adler.write_slice(&[3, 4, 5]);
+///
+/// assert_eq!(adler.checksum(), 0x00290010);
+/// ```
+///
+/// Using `Hash` to process structures:
+///
+/// ```
+/// use std::hash::Hash;
+/// use adler::Adler32;
+///
+/// #[derive(Hash)]
+/// struct Data {
+///     byte: u8,
+///     word: u16,
+///     big: u64,
+/// }
+///
+/// let mut adler = Adler32::new();
+///
+/// let data = Data { byte: 0x1F, word: 0xABCD, big: !0 };
+/// data.hash(&mut adler);
+///
+/// // hash value depends on architecture endianness
+/// if cfg!(target_endian = "little") {
+///     assert_eq!(adler.checksum(), 0x33410990);
+/// }
+/// if cfg!(target_endian = "big") {
+///     assert_eq!(adler.checksum(), 0x331F0990);
+/// }
+///
+/// ```
 ///
 /// [`new`]: #method.new
 /// [`from_checksum`]: #method.from_checksum
@@ -119,6 +163,10 @@
 }
 
 /// Calculates the Adler-32 checksum of a byte slice.
+///
+/// This is a convenience function around the [`Adler32`] type.
+///
+/// [`Adler32`]: struct.Adler32.html
 pub fn adler32_slice(data: &[u8]) -> u32 {
     let mut h = Adler32::new();
     h.write_slice(data);
@@ -127,12 +175,35 @@
 
 /// Calculates the Adler-32 checksum of a `BufRead`'s contents.
 ///
-/// The passed `BufRead` implementor will be read until it reaches EOF.
+/// The passed `BufRead` implementor will be read until it reaches EOF (or until it reports an
+/// error).
+///
+/// If you only have a `Read` implementor, you can wrap it in `std::io::BufReader` before calling
+/// this function.
+///
+/// # Errors
+///
+/// Any error returned by the reader are bubbled up by this function.
+///
+/// # Examples
+///
+/// ```no_run
+/// # fn run() -> Result<(), Box<dyn std::error::Error>> {
+/// use adler::adler32;
+///
+/// use std::fs::File;
+/// use std::io::BufReader;
+///
+/// let file = File::open("input.txt")?;
+/// let mut file = BufReader::new(file);
 ///
-/// If you only have a `Read` implementor, wrap it in `std::io::BufReader`.
+/// adler32(&mut file)?;
+/// # Ok(()) }
+/// # fn main() { run().unwrap() }
+/// ```
 #[cfg(feature = "std")]
 #[cfg_attr(docsrs, doc(cfg(feature = "std")))]
-pub fn adler32_reader<R: BufRead>(reader: &mut R) -> io::Result<u32> {
+pub fn adler32<R: BufRead>(mut reader: R) -> io::Result<u32> {
     let mut h = Adler32::new();
     loop {
         let len = {
@@ -151,7 +222,6 @@
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::io::BufReader;
 
     #[test]
     fn zeroes() {
@@ -198,12 +268,14 @@
         assert_eq!(adler.checksum(), 0x8e88ef11); // from above
     }
 
+    #[cfg(feature = "std")]
     #[test]
     fn bufread() {
+        use std::io::BufReader;
         fn test(data: &[u8], checksum: u32) {
             // `BufReader` uses an 8 KB buffer, so this will test buffer refilling.
             let mut buf = BufReader::new(data);
-            let real_sum = adler32_reader(&mut buf).unwrap();
+            let real_sum = adler32(&mut buf).unwrap();
             assert_eq!(checksum, real_sum);
         }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+#![deny(warnings)]
+
+use std::env;
+
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+    if let Some(channel) = version_check::Channel::read() {
+        if channel.supports_features() {
+            println!("cargo:rustc-cfg=feature=\"specialize\"");
+        }
+    }
+    let os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS was not set");
+    if os.eq_ignore_ascii_case("linux")
+        || os.eq_ignore_ascii_case("android")
+        || os.eq_ignore_ascii_case("windows")
+        || os.eq_ignore_ascii_case("macos")
+        || os.eq_ignore_ascii_case("ios")
+        || os.eq_ignore_ascii_case("freebsd")
+        || os.eq_ignore_ascii_case("openbsd")
+        || os.eq_ignore_ascii_case("dragonfly")
+        || os.eq_ignore_ascii_case("solaris")
+        || os.eq_ignore_ascii_case("illumos")
+        || os.eq_ignore_ascii_case("fuchsia")
+        || os.eq_ignore_ascii_case("redox")
+        || os.eq_ignore_ascii_case("cloudabi")
+        || os.eq_ignore_ascii_case("haiku")
+        || os.eq_ignore_ascii_case("vxworks")
+        || os.eq_ignore_ascii_case("emscripten")
+        || os.eq_ignore_ascii_case("wasi")
+    {
+        println!("cargo:rustc-cfg=feature=\"runtime-rng\"");
+    }
+    let arch = env::var("CARGO_CFG_TARGET_ARCH").expect("CARGO_CFG_TARGET_ARCH was not set");
+    if arch.eq_ignore_ascii_case("x86_64")
+        || arch.eq_ignore_ascii_case("aarch64")
+        || arch.eq_ignore_ascii_case("mips64")
+        || arch.eq_ignore_ascii_case("powerpc64")
+        || arch.eq_ignore_ascii_case("riscv64gc")
+        || arch.eq_ignore_ascii_case("s390x")
+    {
+        println!("cargo:rustc-cfg=feature=\"folded_multiply\"");
+    }
+
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"ca9d74aa988a7af08d61e87c813584993c4fbc4c03af2b69bfcced15866d842e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ff8f68cb076caf8cefe7a6430d4ac086ce6af2ca8ce2c4e5a2004d4552ef52a2","README.md":"96e6af5def25a27317b764c060c944dbaee267f32096708e47eb159a8159379c","rustfmt.toml":"e090969e99df9360705680cc0097cfaddae10c22dc2e01470592cf3b9787fd36","smhasher/0001-Add-support-for-aHash.patch":"df01a714dd66554cab415afdec1bd634d19a53e564029ba4b84d2e1baffb6104","smhasher/0002-Add-support-for-aHash.patch":"47fe89f174b921dd134ce95d7147468680b87ad12180d3a00aa8aebdace1c104","smhasher/ahashOutput.txt":"25eaaf3615286ababb15d560ce16a741ed6447a8679b6b6633e0f39c0cc9c5c2","smhasher/clone_smhasher.sh":"510e12ec67052486853f186ce3e18f342fc80da88a47bf9b1aca81c827cb72b7","smhasher/fallbackOutput.txt":"247a408cb8426ed6c0119861d1b06809983cbbff73eafc181fb29910139c1f01","src/aes_hash.rs":"552c00906b6711a0f0f523f639100cfe626a4fd04e9b0cad5fd2d2a1ebdd0186","src/convert.rs":"59e9c20bfd37e8604c80b97339b77e6f6a600c8b177b672cad9ac3600f7f88e0","src/fallback_hash.rs":"5636a30aac53aff84dad46b9228db8957a9b2c2358ab51b1bcb786d751e55954","src/hash_map.rs":"36bf0b13e334d7cedbf83e4822438098b227e7c7e381abe5e1eeac1ff6caa209","src/hash_quality_test.rs":"bc642c29539a4acc75aa460d409008b7939c0eb8687e07e1a0d47f29fbbc9abb","src/hash_set.rs":"4289672c142e314a0bfc6535b5e8f5e07cc78b60c0c7b308a43fa361eca6ddea","src/lib.rs":"4a0b56b99ba7b941fc3a9412e825af4a9525e003192a894a055b8df4fda1bfbc","src/operations.rs":"82663e2e9d2dac714e84eb0c1daac979d20f7e80a7391027f8d03b0987186804","src/random_state.rs":"ac2aae2cf85d05be97376819291fe094109b85ce6bdcdcbeda26d85e10d2f6b3","src/specialize.rs":"3136ba21f0e9b991f6df589744f724d8e71586e0b48c969183a8b33ce7966c8c","tests/bench.rs":"90cc49473a25184c4d8d21d623a52b103e2d7c7c30e487da000b510c4ba5d944","tests/map_tests.rs":"c1e14ec39c2009d8a081349245e70af317c2d8424d40dc239a6c250c0adfae77","tests/nopanic.rs":"5edbaa43a16f8fc96180c2f3d576436640e6fc3221856df329b0540024625cab"},"package":"739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"}
\ No newline at end of file
+{"files":{"Cargo.toml":"176b1ff428589988aa194db00e22509652eaaf1802cee977e27296fe71c93fb3","FAQ.md":"9eb41898523ee209a0a937f9bcb78afe45ad55ca0556f8a4d4063558098f6d1e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ff8f68cb076caf8cefe7a6430d4ac086ce6af2ca8ce2c4e5a2004d4552ef52a2","README.md":"72185284f100e149998fe5301f70489e617cc4415b51cc77e967c63c6e970a67","build.rs":"d1629d71cd87d934b3dea723a6edfd32862a12d5e1d9100f904519675114539f","rustfmt.toml":"e090969e99df9360705680cc0097cfaddae10c22dc2e01470592cf3b9787fd36","src/aes_hash.rs":"6acd85cf26c964da7d0ffa3e39a337798130f5463c581e7729e5e397cc559d54","src/convert.rs":"57be1d17716d8733ef02b81bcad308eb4b07896911c9504ff49d0142e9ba48be","src/fallback_hash.rs":"565dfa061ad3347ecad6923dab3732e416d31daab07904b6815fcd801feb5a25","src/hash_map.rs":"ed0c79c41c2218ad9591a585670a2b9b983807c9725880b780138a44c126cbfd","src/hash_quality_test.rs":"bfd7f4c937cced1e6ada89cdc5b5305ca4589a71edf3901dd1e2246b978e3f3f","src/hash_set.rs":"dc3d33e290aad62457ab1f5e64d3e33eb79e28c9468bfc8686339f0bbd8b19aa","src/lib.rs":"8849cdf10fcfaac88f4b0ed073c00b0d28fc2abbf3990c1347a6c57d6f9025a3","src/operations.rs":"836a866a61b7f3126f30410f2031aad2b7a9f270de0d666093fafdfeae7bc234","src/random_state.rs":"ff6b4553c146494edce5e6a0f44e9a2316744e2ed7390d2ccacfd58e38b1e59d","src/specialize.rs":"0573430b05907f0ebb280beef6f705c5ca5b95dcff6fd03817aae66bb65eb568","tests/bench.rs":"2abc94d389c73370e166cb36a61f4337bb2dea4077639277614db302e685c91c","tests/map_tests.rs":"e0f155f964dd965740b072ee1da110a8c6ef34491c95219f7c89064112c7840f","tests/nopanic.rs":"3363675c4c1a197b86604a0aebbe958fb5ec7c01a414fbfd70e9eb8a29707400"},"package":"43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,12 +13,15 @@
 [package]
 edition = "2018"
 name = "ahash"
-version = "0.4.7"
+version = "0.7.4"
 authors = ["Tom Kaitchuck <Tom.Kaitchuck@gmail.com>"]
+build = "./build.rs"
+exclude = ["/smhasher"]
 description = "A non-cryptographic hash function using AES-NI for high performance"
 documentation = "https://docs.rs/ahash"
 readme = "README.md"
-keywords = ["hash", "hashmap", "aes", "aes-ni", "no-std"]
+keywords = ["hash", "hasher", "hashmap", "aes", "no-std"]
+categories = ["algorithms", "data-structures", "no-std"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/tkaitchuck/ahash"
 [package.metadata.docs.rs]
@@ -60,9 +63,6 @@
 name = "map"
 path = "tests/map_tests.rs"
 harness = false
-[dependencies.const-random]
-version = "0.1.6"
-optional = true
 [dev-dependencies.criterion]
 version = "0.3.2"
 
@@ -73,19 +73,45 @@
 version = "0.2.1"
 
 [dev-dependencies.hex]
-version = "0.3.2"
+version = "0.4.2"
 
 [dev-dependencies.no-panic]
 version = "0.1.10"
 
 [dev-dependencies.rand]
-version = "0.6.5"
+version = "0.7.3"
 
 [dev-dependencies.seahash]
-version = "3.0.5"
+version = "4.0"
+
+[dev-dependencies.serde_json]
+version = "1.0.59"
+[build-dependencies.version_check]
+version = "0.9"
 
 [features]
 compile-time-rng = ["const-random"]
-default = ["compile-time-rng", "std"]
-specialize = []
+default = ["std"]
 std = []
+[target."cfg(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\"))".dependencies.const-random]
+version = "0.1.12"
+optional = true
+
+[target."cfg(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\"))".dependencies.getrandom]
+version = "0.2.0"
+
+[target."cfg(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\"))".dependencies.once_cell]
+version = "1.5.2"
+features = ["unstable", "alloc"]
+default-features = false
+
+[target."cfg(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\"))".dependencies.serde]
+version = "1.0.117"
+optional = true
+[target."cfg(not(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\")))".dependencies.const-random]
+version = "0.1.12"
+optional = true
+
+[target."cfg(not(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\")))".dependencies.serde]
+version = "1.0.117"
+optional = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/FAQ.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/FAQ.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/FAQ.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/FAQ.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,118 @@
+## How does aHash prevent DOS attacks
+
+AHash is designed to [prevent an adversary that does not know the key from being able to create hash collisions or partial collisions.](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks)
+
+If you are a cryptographer and would like to help review aHash's algorithm, please post a comment [here](https://github.com/tkaitchuck/aHash/issues/11).
+
+In short, this is achieved by ensuring that:
+
+* aHash is designed to [resist differential crypto analysis](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks#differential-analysis). Meaning it should not be possible to devise a scheme to "cancel" out a modification of the internal state from a block of input via some corresponding change in a subsequent block of input.
+  * This is achieved by not performing any "premixing" - This reversible mixing gave previous hashes such as murmurhash confidence in their quality, but could be undone by a deliberate attack.
+  * Before it is used each chunk of input is "masked" such as by xoring it with an unpredictable value.
+* aHash obeys the '[strict avalanche criterion](https://en.wikipedia.org/wiki/Avalanche_effect#Strict_avalanche_criterion)':
+Each bit of input has the potential to flip every bit of the output.
+* Similarly, each bit in the key can affect every bit in the output.
+* Input bits never effect just one, or a very few, bits in intermediate state. This is specifically designed to prevent the sort of 
+[differential attacks launched by the sipHash authors](https://emboss.github.io/blog/2012/12/14/breaking-murmur-hash-flooding-dos-reloaded/) which cancel previous inputs.
+* The `finish` call at the end of the hash is designed to not expose individual bits of the internal state. 
+  * For example in the main algorithm 256bits of state and 256bits of keys are reduced to 64 total bits using 3 rounds of AES encryption. 
+Reversing this is more than non-trivial. Most of the information is by definition gone, and any given bit of the internal state is fully diffused across the output.
+* In both aHash and its fallback the internal state is divided into two halves which are updated by two unrelated techniques using the same input. - This means that if there is a way to attack one of them it likely won't be able to attack both of them at the same time.
+* It is deliberately difficult to 'chain' collisions. (This has been the major technique used to weaponize attacks on other hash functions)
+
+More details are available on [the wiki](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks).
+
+## Why not use a cryptographic hash in a hashmap.
+
+Cryptographic hashes are designed to make is nearly impossible to find two items that collide when the attacker has full control
+over the input. This has several implications:
+
+* They are very difficult to construct, and have to go to a lot of effort to ensure that collisions are not possible.
+* They have no notion of a 'key'. Rather, they are fully deterministic and provide exactly one hash for a given input.
+
+For a HashMap the requirements are different.
+
+* Speed is very important, especially for short inputs. Often the key for a HashMap is a single `u32` or similar, and to be effective
+the bucket that it should be hashed to needs to be computed in just a few CPU cycles.
+* A hashmap does not need to provide a hard and fast guarantee that no two inputs will ever collide. Hence, hashCodes are not 256bits 
+but are just 64 or 32 bits in length. Often the first thing done with the hashcode is to truncate it further to compute which among a few buckets should be used for a key. 
+  * Here collisions are expected, and a cheap to deal with provided there is no systematic way to generated huge numbers of values that all
+go to the same bucket.
+  * This also means that unlike a cryptographic hash partial collisions matter. It doesn't do a hashmap any good to produce a unique 256bit hash if
+the lower 12 bits are all the same. This means that even a provably irreversible hash would not offer protection from a DOS attack in a hashmap
+because an attacker can easily just brute force the bottom N bits.
+
+From a cryptography point of view, a hashmap needs something closer to a block cypher.
+Where the input can be quickly mixed in a way that cannot be reversed without knowing a key.
+
+## Why isn't aHash cryptographically secure
+
+It is not designed to be. 
+Attempting to use aHash as a secure hash will likely fail to hold up for several reasons:
+
+1. aHash relies on random keys which are assumed to not be observable by an attacker. For a cryptographic hash all inputs can be seen and controlled by the attacker.
+2. aHash has not yet gone through peer review, which is a pre-requisite for security critical algorithms.
+3. Because aHash uses reduced rounds of AES as opposed to the standard of 10. Things like the SQUARE attack apply to part of the internal state.
+(These are mitigated by other means to prevent producing collections, but would be a problem in other contexts).
+4. Like any cypher based hash, it will show certain statistical deviations from truly random output when comparing a (VERY) large number of hashes. 
+(By definition cyphers have fewer collisions than truly random data.)
+
+There are efforts to build a secure hash function that uses AES-NI for acceleration, but aHash is not one of them.
+
+## How is aHash so fast
+
+AHash uses a number of tricks. 
+
+One trick is taking advantage of specialization. If aHash is compiled on nightly it will take
+advantage of specialized hash implementations for strings, slices, and primitives. 
+
+Another is taking advantage of hardware instructions.
+When it is available aHash uses AES rounds using the AES-NI instruction. AES-NI is very fast (on an intel i7-6700 it 
+is as fast as a 64 bit multiplication.) and handles 16 bytes of input at a time, while being a very strong permutation.
+
+This is obviously much faster than most standard approaches to hashing, and does a better job of scrambling data than most non-secure hashes.
+
+On an intel i7-6700 compiled on nightly Rust with flags `-C opt-level=3 -C target-cpu=native -C codegen-units=1`:
+
+| Input   | SipHash 1-3 time | FnvHash time|FxHash time| aHash time| aHash Fallback* |
+|----------------|-----------|-----------|-----------|-----------|---------------|
+| u8             | 9.3271 ns | 0.808 ns  | **0.594 ns**  | 0.7704 ns | 0.7664 ns |
+| u16            | 9.5139 ns | 0.803 ns  | **0.594 ns**  | 0.7653 ns | 0.7704 ns |
+| u32            | 9.1196 ns | 1.4424 ns | **0.594 ns**  | 0.7637 ns | 0.7712 ns |
+| u64            | 10.854 ns | 3.0484 ns | **0.628 ns**  | 0.7788 ns | 0.7888 ns |
+| u128           | 12.465 ns | 7.0728 ns | 0.799 ns  | **0.6174 ns** | 0.6250 ns |
+| 1 byte string  | 11.745 ns | 2.4743 ns | 2.4000 ns | **1.4921 ns** | 1.5861 ns |
+| 3 byte string  | 12.066 ns | 3.5221 ns | 2.9253 ns | **1.4745 ns** | 1.8518 ns |
+| 4 byte string  | 11.634 ns | 4.0770 ns | 1.8818 ns | **1.5206 ns** | 1.8924 ns |
+| 7 byte string  | 14.762 ns | 5.9780 ns | 3.2282 ns | **1.5207 ns** | 1.8933 ns |
+| 8 byte string  | 13.442 ns | 4.0535 ns | 2.9422 ns | **1.6262 ns** | 1.8929 ns |
+| 15 byte string | 16.880 ns | 8.3434 ns | 4.6070 ns | **1.6265 ns** | 1.7965 ns |
+| 16 byte string | 15.155 ns | 7.5796 ns | 3.2619 ns | **1.6262 ns** | 1.8011 ns |
+| 24 byte string | 16.521 ns | 12.492 ns | 3.5424 ns | **1.6266 ns** | 2.8311 ns |
+| 68 byte string | 24.598 ns | 50.715 ns | 5.8312 ns | **4.8282 ns** | 5.4824 ns |
+| 132 byte string| 39.224 ns | 119.96 ns | 11.777 ns | **6.5087 ns** | 9.1459 ns |
+|1024 byte string| 254.00 ns | 1087.3 ns | 156.41 ns | **25.402 ns** | 54.566 ns |
+
+* Fallback refers to the algorithm aHash would use if AES instructions are unavailable.
+For reference a hash that does nothing (not even reads the input data takes) **0.520 ns**. So that represents the fastest
+possible time.
+
+As you can see above aHash like `FxHash` provides a large speedup over `SipHash-1-3` which is already nearly twice as fast as `SipHash-2-4`.
+
+Rust's HashMap by default uses `SipHash-1-3` because faster hash functions such as `FxHash` are predictable and vulnerable to denial of
+service attacks. While `aHash` has both very strong scrambling and very high performance.
+
+AHash performs well when dealing with large inputs because aHash reads 8 or 16 bytes at a time. (depending on availability of AES-NI)
+
+Because of this, and its optimized logic, `aHash` is able to outperform `FxHash` with strings.
+It also provides especially good performance dealing with unaligned input.
+(Notice the big performance gaps between 3 vs 4, 7 vs 8 and 15 vs 16 in `FxHash` above)
+
+### Which CPUs can use the hardware acceleration
+
+Hardware AES instructions are built into Intel processors built after 2010 and AMD processors after 2012.
+It is also available on [many other CPUs](https://en.wikipedia.org/wiki/AES_instruction_set) should in eventually
+be able to get aHash to work. However, only X86 and X86-64 are the only supported architectures at the moment, as currently
+they are the only architectures for which Rust provides an intrinsic.
+
+aHash also uses `sse2` and `sse3` instructions. X86 processors that have `aesni` also have these instruction sets.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,234 +1,92 @@
 # aHash     ![Build Status](https://img.shields.io/github/workflow/status/tkaitchuck/ahash/Rust) ![Licence](https://img.shields.io/crates/l/ahash) ![Downloads](https://img.shields.io/crates/d/ahash) 
 
-AHash is a high speed keyed hashing algorithm intended for use in in-memory hashmaps. It provides a high quality
-64bit hash. AHash is designed for performance and is not cryptographically secure.
+AHash is the [fastest](https://github.com/tkaitchuck/aHash/blob/master/compare/readme.md#Speed), 
+[DOS resistant hash](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks) currently available in Rust.
+AHash is intended *exclusively* for use in in-memory hashmaps. 
 
-## Goals
-
-AHash is the fastest DOS resistant hash for use in HashMaps available in the Rust language.
-Failing in any of these criteria will be treated as a bug.
+AHash's output is of [high quality](https://github.com/tkaitchuck/aHash/blob/master/compare/readme.md#Quality) but aHash is **not** a cryptographically secure hash.
 
 ## Design
 
-AHash is a keyed hash, so two instances initialized with different keys will produce completely different hashes, and the 
-resulting hashes cannot be predicted without knowing the keys. [This prevents DOS attacks where an attacker sends a large
-number of items whose hashes collide that get used as keys in a hashmap.](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks)
-
-AHash takes advantage of specialized hardware instructions whenever possible including the [hardware AES instruction](https://en.wikipedia.org/wiki/AES_instruction_set)
-on X86 processors when it is available. If it is not available it falls back on a somewhat slower (but still DOS resistant)
-[algorithm based on multiplication](https://github.com/tkaitchuck/aHash/wiki/AHash-fallback-algorithm).
-
-As such aHash does not have a fixed standard for its output. This is not a problem for Hashmaps, and allows aHash to achieve high performance and improve over time.
-
-## Non-Goals
-
-Because different computers or computers on versions of the code will observe different outputs Hash is not recommended 
-for use other than in-memory maps. Specifically aHash does not intend to be:
-
-* Used as a MACs or other application requiring a cryptographically secure hash
-* Used for distributed applications or ones requiring persisting hashed values
-
-## Hash quality
-
-**Both aHash's aes variant and the fallback pass the full [SMHasher test suite](https://github.com/rurban/smhasher)** (the output of the tests is checked into the smhasher subdirectory.) 
-
-At **over 50GB/s** aHash is the fastest algorithm to pass the full test suite by more than a factor of 2. Even the fallback algorithm is in the top 5 in terms of throughput.
-
-## Speed
-
-When it is available aHash uses AES rounds using the AES-NI instruction. AES-NI is very fast (on an intel i7-6700 it 
-is as fast as a 64 bit multiplication.) and handles 16 bytes of input at a time, while being a very strong permutation.
-
-This is obviously much faster than most standard approaches to hashing, and does a better job of scrambling data than most non-secure hashes.
-
-On an intel i7-6700 compiled on nightly Rust with flags `-C opt-level=3 -C target-cpu=native -C codegen-units=1`:
-
-| Input   | SipHash 1-3 time | FnvHash time|FxHash time| aHash time| aHash Fallback* |
-|----------------|-----------|-----------|-----------|-----------|---------------|
-| u8             | 9.3271 ns | 0.808 ns  | **0.594 ns**  | 0.7704 ns | 0.7664 ns |
-| u16            | 9.5139 ns | 0.803 ns  | **0.594 ns**  | 0.7653 ns | 0.7704 ns |
-| u32            | 9.1196 ns | 1.4424 ns | **0.594 ns**  | 0.7637 ns | 0.7712 ns |
-| u64            | 10.854 ns | 3.0484 ns | **0.628 ns**  | 0.7788 ns | 0.7888 ns |
-| u128           | 12.465 ns | 7.0728 ns | 0.799 ns  | **0.6174 ns** | 0.6250 ns |
-| 1 byte string  | 11.745 ns | 2.4743 ns | 2.4000 ns | **1.4921 ns** | 1.5861 ns |
-| 3 byte string  | 12.066 ns | 3.5221 ns | 2.9253 ns | **1.4745 ns** | 1.8518 ns |
-| 4 byte string  | 11.634 ns | 4.0770 ns | 1.8818 ns | **1.5206 ns** | 1.8924 ns |
-| 7 byte string  | 14.762 ns | 5.9780 ns | 3.2282 ns | **1.5207 ns** | 1.8933 ns |
-| 8 byte string  | 13.442 ns | 4.0535 ns | 2.9422 ns | **1.6262 ns** | 1.8929 ns |
-| 15 byte string | 16.880 ns | 8.3434 ns | 4.6070 ns | **1.6265 ns** | 1.7965 ns |
-| 16 byte string | 15.155 ns | 7.5796 ns | 3.2619 ns | **1.6262 ns** | 1.8011 ns |
-| 24 byte string | 16.521 ns | 12.492 ns | 3.5424 ns | **1.6266 ns** | 2.8311 ns |
-| 68 byte string | 24.598 ns | 50.715 ns | 5.8312 ns | **4.8282 ns** | 5.4824 ns |
-| 132 byte string| 39.224 ns | 119.96 ns | 11.777 ns | **6.5087 ns** | 9.1459 ns |
-|1024 byte string| 254.00 ns | 1087.3 ns | 156.41 ns | **25.402 ns** | 54.566 ns |
-
-* Fallback refers to the algorithm aHash would use if AES instructions are unavailable.
-For reference a hash that does nothing (not even reads the input data takes) **0.520 ns**. So that represents the fastest
-possible time.
-
-As you can see above aHash like `FxHash` provides a large speedup over `SipHash-1-3` which is already nearly twice as fast as `SipHash-2-4`.
-
-Rust's HashMap by default uses `SipHash-1-3` because faster hash functions such as `FxHash` are predictable and vulnerable to denial of
-service attacks. While `aHash` has both very strong scrambling and very high performance.
-
-AHash performs well when dealing with large inputs because aHash reads 8 or 16 bytes at a time. (depending on availability of AES-NI)
-
-Because of this, and its optimized logic, `aHash` is able to outperform `FxHash` with strings.
-It also provides especially good performance dealing with unaligned input.
-(Notice the big performance gaps between 3 vs 4, 7 vs 8 and 15 vs 16 in `FxHash` above)
-
-For more a more representative performance comparison which includes the overhead of using a HashMap, see [HashBrown's benchmarks](https://github.com/rust-lang/hashbrown#performance)
-as HashBrown now uses aHash as its hasher by default.
-
-## Security
-
-AHash is designed to [prevent an adversary that does not know the key from being able to create hash collisions or partial collisions.](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks)
-
-This achieved by ensuring that:
-
-* aHash is designed to [resist differential crypto analysis](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks#differential-analysis). Meaning it should not be possible to devise a scheme to "cancel" out a modification of the internal state from a block of input via some corresponding change in a subsequent block of input.
-  * This is achieved by not performing any "premixing" - This reversible mixing gave previous hashes such as murmurhash confidence in their quality, but could be undone by a deliberate attack.
-  * Before it is used each chunk of input is "masked" such as by xoring it with an unpredictable value.
-* aHash obeys the '[strict avalanche criterion](https://en.wikipedia.org/wiki/Avalanche_effect#Strict_avalanche_criterion)':
-Each bit of input has the potential to flip every bit of the output.
-* Similarly, each bit in the key can affect every bit in the output.
-* Input bits never affect just one, or a very few, bits in intermediate state. This is specifically designed to prevent the sort of 
-[differential attacks launched by the sipHash authors](https://emboss.github.io/blog/2012/12/14/breaking-murmur-hash-flooding-dos-reloaded/) which cancel previous inputs.
-* The `finish` call at the end of the hash is designed to not expose individual bits of the internal state. 
-  * For example in the main algorithm 256bits of state and 256bits of keys are reduced to 64 total bits using 3 rounds of AES encryption. 
-Reversing this is more than non-trivial. Most of the information is by definition gone, and any given bit of the internal state is fully diffused across the output.
-* In both aHash and its fallback the internal state is divided into two halves which are updated by two unrelated techniques using the same input. - This means that if there is a way to attack one of them it likely won't be able to attack both of them at the same time.
-* It is deliberately difficult to 'chain' collisions.
-  * To attack  Previous attacks on hash functions have relied on the ability
-
-More details are available on [the wiki](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks).
-
-### aHash is not cryptographically secure
-
-AHash should not be used for situations where cryptographic security is needed.
-It is not intended for this and will likely fail to hold up for several reasons.
-
-1. aHash relies on random keys which are assumed to not be observable by an attacker. For a cryptographic hash all inputs can be seen and controlled by the attacker.
-2. aHash has not yet gone through peer review.
-3. Because aHash uses reduced rounds of AES as opposed to the standard of 10. Things like the SQUARE attack apply to part of the internal state.
-(These are mitigated by other means to prevent producing collections, but would be a problem in other contexts).
-4. Like any cypher based hash, it will show certain statistical deviations from truly random output when comparing a (VERY) large number of hashes. 
-(By definition cyphers have fewer collisions than truly random data.)
+Because AHash is a keyed hash, each map will produce completely different hashes, which cannot be predicted without knowing the keys.
+[This prevents DOS attacks where an attacker sends a large number of items whose hashes collide that get used as keys in a hashmap.](https://github.com/tkaitchuck/aHash/wiki/How-aHash-is-resists-DOS-attacks)
 
-There are several efforts to build a secure hash function that uses AES-NI for acceleration, but aHash is not one of them.
+This also avoids [accidentally quadratic behavior by reading from one map and writing to another.](https://accidentallyquadratic.tumblr.com/post/153545455987/rust-hash-iteration-reinsertion)
 
-## Accelerated CPUs
+## Goals and Non-Goals
 
-Hardware AES instructions are built into Intel processors built after 2010 and AMD processors after 2012.
-It is also available on [many other CPUs](https://en.wikipedia.org/wiki/AES_instruction_set) should in eventually
-be able to get aHash to work. However, only X86 and X86-64 are the only supported architectures at the moment, as currently
-they are the only architectures for which Rust provides an intrinsic.
+AHash does *not* have a fixed standard for its output. This allows it to improve over time. For example,
+if any faster algorithm is found, aHash will be updated to incorporate the technique.
+Similarly, should any flaw in aHash's DOS resistance be found, aHash will be changed to correct the flaw.
 
-aHash also uses `sse2` and `sse3` instructions. X86 processors that have `aesni` also have these instruction sets.
+Because it does not have a fixed standard, different computers or computers on different versions of the code will observe different hash values.
+As such, aHash is not recommended for use other than in-memory maps. Specifically, aHash is not intended for network use or in applications which persist hashed values.
+(In these cases `HighwayHash` would be a better choice)
 
-## Why not use a cryptographic hash in a hashmap.
+Additionally, aHash is not intended to be cryptographically secure and should not be used as a MAC, or anywhere which requires a cryptographically secure hash.
+(In these cases `SHA-3` would be a better choice)
 
-Cryptographic hashes are designed to make is nearly impossible to find two items that collide when the attacker has full control
-over the input. This has several implications:
+## Usage
 
-* They are very difficult to construct, and have to go to a lot of effort to ensure that collisions are not possible.
-* They have no notion of a 'key'. Rather, they are fully deterministic and provide exactly one hash for a given input.
+AHash is a drop in replacement for the default implementation of the `Hasher` trait. To construct a `HashMap` using aHash 
+as its hasher do the following:
 
-For a HashMap the requirements are different.
+```rust
+use ahash::{AHasher, RandomState};
+use std::collections::HashMap;
 
-* Speed is very important, especially for short inputs. Often the key for a HashMap is a single `u32` or similar, and to be effective
-the bucket that it should be hashed to needs to be computed in just a few CPU cycles.
-* A hashmap does not need to provide a hard and fast guarantee that no two inputs will ever collide. Hence, hashCodes are not 256bits 
-but are just 64 or 32 bits in length. Often the first thing done with the hashcode is to truncate it further to compute which among a few buckets should be used for a key. 
-  * Here collisions are expected, and a cheap to deal with provided there is no systematic way to generated huge numbers of values that all
-go to the same bucket.
-  * This also means that unlike a cryptographic hash partial collisions matter. It doesn't do a hashmap any good to produce a unique 256bit hash if
-the lower 12 bits are all the same. This means that even a provably irreversible hash would not offer protection from a DOS attack in a hashmap
-because an attacker can easily just brute force the bottom N bits.
+let mut map: HashMap<i32, i32, RandomState> = HashMap::default();
+map.insert(12, 34);
+```
+For convenience, wrappers called `AHashMap` and `AHashSet` are also provided.
+These do the same thing with slightly less typing.
+```rust
+use ahash::AHashMap;
 
-From a cryptography point of view, a hashmap needs something closer to a block cypher.
-Where the input can be quickly mixed in a way that cannot be reversed without knowing a key.
+let mut map: AHashMap<i32, i32> = AHashMap::new();
+map.insert(12, 34);
+map.insert(56, 78);
+```
 
-# Why use aHash over X
+## Flags
 
-## SipHash
+The aHash package has the following flags:
+* `std`: This enables features which require the standard library. (On by default) This includes providing the utility classes `AHashMap` and `AHashSet`.
+* `serde`: Enables `serde` support for the utility classes `AHashMap` and `AHashSet`.
+* `compile-time-rng`: Whenever possible aHash will seed hashers with random numbers using the [getrandom](https://github.com/rust-random/getrandom) crate. 
+This is possible for OS targets which provide a source of randomness. (see the [full list](https://docs.rs/getrandom/0.2.0/getrandom/#supported-targets).)
+For OS targets without access to a random number generator, `compile-time-rng` provides an alternative.
+If `getrandom` is unavailable and `compile-time-rng` is enabled, aHash will generate random numbers at compile time and embed them in the binary.
+This allows for DOS resistance even if there is no random number generator available at runtime (assuming the compiled binary is not public).
+This makes the binary non-deterministic, unless `getrandom` is available for the target in which case the flag does nothing.
+(If non-determinism is a problem see [constrandom's documentation](https://github.com/tkaitchuck/constrandom#deterministic-builds))
 
-For a hashmap: Because aHash nearly **10x** faster.
+**NOTE:** If `getrandom` is unavailable and `compile-time-rng` is disabled aHash will fall back on using the numeric 
+value of memory addresses as a source of randomness. This is somewhat strong if ALSR is turned on (it is by default)
+but for embedded platforms this will result in weak keys. As a result, it is recommended to use `compile-time-rng` anytime
+random numbers will not be available at runtime.
 
-SipHash is however useful in other contexts, such as for a HMAC, where aHash would be completely inappropriate.
+## Comparison with other hashers
 
-*SipHash-2-4* is designed to provide DOS attack resistance, and has no presently known attacks
-against this claim that doesn't involve learning bits of the key.
+A full comparison with other hashing algorithms can be found [here](https://github.com/tkaitchuck/aHash/blob/master/compare/readme.md)
 
-SipHash is also available in the "1-3" variant which is about twice as fast as the standard version.
-The SipHash authors don't recommend using this variation when DOS attacks are a concern, but there are still no known
-practical DOS attacks against the algorithm. Rust has opted for the "1-3" version as the  default in `std::collections::HashMap`,
-because the speed trade off of "2-4" was not worth it.
+![Hasher performance](https://docs.google.com/spreadsheets/d/e/2PACX-1vSK7Li2nS-Bur9arAYF9IfT37MP-ohAe1v19lZu5fd9MajI1fSveLAQZyEie4Ea9k5-SWHTff7nL2DW/pubchart?oid=1323618938&format=image)
 
-As you can see in the table above, aHash is **much** faster than even *SipHash-1-3*, but it also provides DOS resistance,
-and any attack against the accelerated form would likely involve a weakness in AES.
-
-## FxHash
-
-In terms of performance, aHash is faster than the FXhash for strings and byte arrays but not primitives.
-So it might seem like using Fxhash for hashmaps when the key is a primitive is a good idea. This is *not* the case.
-
-When FX hash is operating on a 4 or 8 byte input such as a u32 or a u64, it reduces to multiplying the input by a fixed
-constant. This is a bad hashing algorithm because it means that lower bits can never be influenced by any higher bit. In
-the context of a hashmap where the low order bits are used to determine which bucket to put an item in, this isn't
-any better than the identity function. Any keys that happen to end in the same bit pattern will all collide. 
-Some examples of where this is likely to occur are:
-
-* Strings encoded in base64
-* Null terminated strings (when working with C code)
-* Integers that have the lower bits as zeros. (IE any multiple of small power of 2, which isn't a rare pattern in computer programs.)  
-  * For example when taking lengths of data or locations in data it is common for values to
-have a multiple of 1024, if these were used as keys in a map they will collide and end up in the same bucket.
-
-Like any non-keyed hash FxHash can be attacked. But FxHash is so prone to this that you may find yourself doing it accidentally.
-
-For example, it is possible to [accidentally introduce quadratic behavior by reading from one map in iteration order and writing to another.](https://accidentallyquadratic.tumblr.com/post/153545455987/rust-hash-iteration-reinsertion)
-
-Fxhash flaws make sense when you understand it for what it is. It is a quick and dirty hash, nothing more.
-it was not published and promoted by its creator, it was **found**!
-
-Because it is error-prone, FxHash should never be used as a default. In specialized instances where the keys are understood
-it makes sense, but given that aHash is faster on almost any object, it's probably not worth it.
-
-## FnvHash
-
-FnvHash is also a poor default. It only handles one byte at a time, so its performance really suffers with large inputs.
-It is also non-keyed so it is still subject to DOS attacks and [accidentally quadratic behavior.](https://accidentallyquadratic.tumblr.com/post/153545455987/rust-hash-iteration-reinsertion)
-
-## MurmurHash, CityHash, MetroHash, FarmHash, HighwayHash, XXHash, SeaHash
-
-Murmur, City, Metro, Farm and Highway are all related, and appear to directly replace one another. Sea and XX are independent
-and compete.
-
-They are all fine hashing algorithms, they do a good job of scrambling data, but they are all targeted at a different
-usecase. They are intended to work in distributed systems where the hash is expected to be the same over time and from one
-computer to the next, efficiently hashing large volumes of data.
-
-This is quite different from the needs of a Hasher used in a hashmap. In a map the typical value is under 10 bytes. None
-of these algorithms scale down to handle that small of data at a competitive time. What's more the restriction that they
-provide consistent output prevents them from taking advantage of different hardware capabilities on different CPUs. It makes
-sense for a hashmap to work differently on a phone than on a server, or in wasm.
+For a more representative performance comparison which includes the overhead of using a HashMap, see [HashBrown's benchmarks](https://github.com/rust-lang/hashbrown#performance)
+as HashBrown now uses aHash as its hasher by default.
 
-If you need to persist or transmit a hash of a file, then using one of these is probably a good idea. HighwayHash seems to be the preferred solution du jour. But inside a simple Hashmap, stick with aHash.
+## Hash quality
 
-## AquaHash
+AHash passes the full [SMHasher test suite](https://github.com/rurban/smhasher). 
 
-AquaHash is structured similarly to aHash. (Though the two were designed completely independently). AquaHash does not scale down nearly as well and
-does poorly with for example a single `i32` as input. Its only implementation at this point is in C++.
+The code to reproduce the result, and the full output [are checked into the repo](https://github.com/tkaitchuck/aHash/tree/master/smhasher).
 
-## t1ha
+## Additional FAQ
 
-T1ha is fairly fast at large sizes, and the output is of fairly high quality, but it is not clear what usecase it aims for.
-It has many different versions and is very complex, and uses hardware tricks, so one might infer it is meant for
-hashmaps like aHash. But any hash using it take at least **20ns**, and it doesn't outperform even SipHash until the
-input sizes are larger than 128 bytes and is not designed to be DOS resistant. So uses are likely niche.
+A separate FAQ document is maintained [here](https://github.com/tkaitchuck/aHash/blob/master/FAQ.md). 
+If you have questions not covered there, open an issue [here](https://github.com/tkaitchuck/aHash/issues).
 
-# License
+## License
 
 Licensed under either of:
 
@@ -243,3 +101,10 @@
 for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
 additional terms or conditions.
 
+
+
+
+
+
+
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/0001-Add-support-for-aHash.patch thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/0001-Add-support-for-aHash.patch
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/0001-Add-support-for-aHash.patch	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/0001-Add-support-for-aHash.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,135 +0,0 @@
-From 426384ce34cf410d892eeeeeb7f6046d52bff8e7 Mon Sep 17 00:00:00 2001
-From: Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
-Date: Sat, 11 Jul 2020 17:15:56 -0700
-Subject: [PATCH] Add support for ahash
-
----
- CMakeLists.txt |  1 +
- Hashes.h       |  5 +++++
- ahash.h        | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- main.cpp       |  2 +-
- 4 files changed, 55 insertions(+), 1 deletion(-)
- create mode 100644 ahash.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6ebab1a..9d79e98 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -470,10 +470,11 @@ add_executable(
- target_link_libraries(
-   SMHasher
-   SMHasherSupport
-   ${HIGHWAY_LIB}
-   ${BLAKE3_LIB}
-+  libahash_c.a
-   ${CMAKE_THREAD_LIBS_INIT}
-   )
- 
- #add_executable(
- #  bittest
-diff --git a/Hashes.h b/Hashes.h
-index 4e111c1..fcd3e38 100644
---- a/Hashes.h
-+++ b/Hashes.h
-@@ -19,10 +19,11 @@
- #if defined(__SSE4_2__) && defined(__x86_64__)
- #include "metrohash/metrohash64crc.h"
- #include "metrohash/metrohash128crc.h"
- #endif
- 
-+#include "ahash.h"
- #include "fasthash.h"
- #include "jody_hash32.h"
- #include "jody_hash64.h"
- 
- // objsize: 0-0x113 = 276
-@@ -356,10 +357,14 @@ inline void fasthash32_test ( const void * key, int len, uint32_t seed, void * o
- }
- #ifdef HAVE_INT64
- inline void fasthash64_test ( const void * key, int len, uint32_t seed, void * out ) {
-   *(uint64_t*)out = fasthash64(key, (size_t) len, (uint64_t)seed);
- }
-+inline void ahash64_test ( const void * key, int len, uint32_t seed, void * out ) {
-+  *(uint64_t*)out = ahash64(key, (size_t) len, (uint64_t)seed);
-+}
-+
- #endif
- 
- // objsize 0-778: 1912
- void mum_hash_test(const void * key, int len, uint32_t seed, void * out);
- 
-diff --git a/ahash.h b/ahash.h
-new file mode 100644
-index 0000000..6c59caf
---- /dev/null
-+++ b/ahash.h
-@@ -0,0 +1,48 @@
-+/* The MIT License
-+
-+   Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
-+
-+   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.
-+*/
-+
-+#ifndef _AHASH_H
-+#define _AHASH_H
-+
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/**
-+ * Ahash - 64-bit implementation of aHash
-+ * @buf:  data buffer
-+ * @len:  data size
-+ * @seed: the seed
-+ */
-+       uint64_t ahash64(const void *buf, size_t len, uint64_t seed);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-\ No newline at end of file
-diff --git a/main.cpp b/main.cpp
-index 04060f2..7489aaf 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -263,11 +263,11 @@ HashInfo g_hashes[] =
- 
-   { xxh3_test,            64, 0x39CD9E4A, "xxh3",        "xxHash v3, 64-bit", GOOD },
-   { xxh3low_test,         32, 0xFAE8467B, "xxh3low",     "xxHash v3, 64-bit, low 32-bits part", GOOD },
-   { xxh128_test,         128, 0xEB61B3A0, "xxh128",      "xxHash v3, 128-bit", GOOD },
-   { xxh128low_test,       64, 0x54D1CC70, "xxh128low",   "xxHash v3, 128-bit, low 64-bits part", GOOD },
--
-+  { ahash64_test,         64, 0x00000000, "ahash64",  "ahash 64bit", GOOD }, //Expected value set to zero because aHash does not adhere to a fixed output.
- #if __WORDSIZE >= 64
- # define TIFU_VERIF       0x644236D4
- #else
-   // broken on certain travis
- # define TIFU_VERIF       0x0
--- 
-2.25.1
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/0002-Add-support-for-aHash.patch thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/0002-Add-support-for-aHash.patch
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/0002-Add-support-for-aHash.patch	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/0002-Add-support-for-aHash.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-From 426384ce34cf410d892eeeeeb7f6046d52bff8e7 Mon Sep 17 00:00:00 2001
-From: Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
-Date: Sat, 11 Jul 2020 17:15:56 -0700
-Subject: [PATCH] Add support for ahash
-
----
- CMakeLists.txt |  1 +
- Hashes.h       |  5 +++++
- ahash.h        | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- main.cpp       |  2 +-
- 4 files changed, 55 insertions(+), 1 deletion(-)
- create mode 100644 ahash.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6ebab1a..9d79e98 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -470,10 +470,11 @@ add_executable(
- target_link_libraries(
-   SMHasher
-   SMHasherSupport
-   ${HIGHWAY_LIB}
-   ${BLAKE3_LIB}
-+  libahash_c.a
-   ${CMAKE_THREAD_LIBS_INIT}
-   )
- 
- #add_executable(
- #  bittest
-diff --git a/Hashes.h b/Hashes.h
-index 4e111c1..fcd3e38 100644
---- a/Hashes.h
-+++ b/Hashes.h
-@@ -19,10 +19,11 @@
- #if defined(__SSE4_2__) && defined(__x86_64__)
- #include "metrohash/metrohash64crc.h"
- #include "metrohash/metrohash128crc.h"
- #endif
- 
-+#include "ahash.h"
- #include "fasthash.h"
- #include "jody_hash32.h"
- #include "jody_hash64.h"
- 
- // objsize: 0-0x113 = 276
-@@ -356,10 +357,14 @@ inline void fasthash32_test ( const void * key, int len, uint32_t seed, void * o
- }
- #ifdef HAVE_INT64
- inline void fasthash64_test ( const void * key, int len, uint32_t seed, void * out ) {
-   *(uint64_t*)out = fasthash64(key, (size_t) len, (uint64_t)seed);
- }
-+inline void ahash64_test ( const void * key, int len, uint32_t seed, void * out ) {
-+  *(uint64_t*)out = ahash64(key, (size_t) len, (uint64_t)seed);
-+}
-+
- #endif
- 
- // objsize 0-778: 1912
- void mum_hash_test(const void * key, int len, uint32_t seed, void * out);
- 
-diff --git a/ahash.h b/ahash.h
-new file mode 100644
-index 0000000..6c59caf
---- /dev/null
-+++ b/ahash.h
-@@ -0,0 +1,48 @@
-+/* The MIT License
-+
-+   Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
-+
-+   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.
-+*/
-+
-+#ifndef _AHASH_H
-+#define _AHASH_H
-+
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/**
-+ * Ahash - 64-bit implementation of aHash
-+ * @buf:  data buffer
-+ * @len:  data size
-+ * @seed: the seed
-+ */
-+       uint64_t ahash64(const void *buf, size_t len, uint64_t seed);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-\ No newline at end of file
-diff --git a/main.cpp b/main.cpp
-index 04060f2..7489aaf 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -263,11 +263,11 @@ HashInfo g_hashes[] =
- 
-   { xxh3_test,            64, 0x39CD9E4A, "xxh3",        "xxHash v3, 64-bit", GOOD },
-   { xxh3low_test,         32, 0xFAE8467B, "xxh3low",     "xxHash v3, 64-bit, low 32-bits part", GOOD },
-   { xxh128_test,         128, 0xEB61B3A0, "xxh128",      "xxHash v3, 128-bit", GOOD },
-   { xxh128low_test,       64, 0x54D1CC70, "xxh128low",   "xxHash v3, 128-bit, low 64-bits part", GOOD },
--
-+  { ahash64_test,         64, 0x00000000, "ahash64",  "ahash 64bit", GOOD }, //Expected value set to zero because aHash does not adhere to a fixed output.
- #if __WORDSIZE >= 64
- # define TIFU_VERIF       0x644236D4
- #else
-   // broken on certain travis
- # define TIFU_VERIF       0x0
--- 
-2.25.1
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4658a7..efef724 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -630,20 +630,21 @@ if(ipo_supported)
-   set_property(TARGET SMHasherSupport PROPERTY INTERPROCEDURAL_OPTIMIZATION
-                                                True)
-   set_property(TARGET SMHasher PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLTO")
-   # set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-DLTO")
- else()
-   message(STATUS "IPO / LTO not supported: <${error}>")
- endif()
- 
- target_link_libraries(SMHasher SMHasherSupport ${HIGHWAY_LIB} ${BLAKE3_LIB}
-+                      libahash_c.a
-                       ${CMAKE_THREAD_LIBS_INIT})
- 
- # add_executable( bittest bittest.cpp )
- #
- # target_link_libraries( bittest SMHasherSupport ${CMAKE_THREAD_LIBS_INIT} )
- 
- if(NOT (CMAKE_CROSSCOMPILING))
-   enable_testing()
-   add_test(VerifyAll SMHasher --test=VerifyAll)
-   add_test(Sanity SMHasher --test=Sanity)
-diff --git a/Hashes.h b/Hashes.h
-index f795403..036b49b 100644
---- a/Hashes.h
-+++ b/Hashes.h
-@@ -14,20 +14,21 @@
- #include "metrohash/metrohash64.h"
- #include "metrohash/metrohash128.h"
- #include "cmetrohash.h"
- #include "opt_cmetrohash.h"
- 
- #if defined(__SSE4_2__) && defined(__x86_64__)
- #include "metrohash/metrohash64crc.h"
- #include "metrohash/metrohash128crc.h"
- #endif
- 
-+#include "ahash.h"
- #include "fasthash.h"
- #include "jody_hash32.h"
- #include "jody_hash64.h"
- 
- // objsize: 0-0x113 = 276
- #include "tifuhash.h"
- // objsize: 5f0-85f = 623
- #include "floppsyhash.h"
- 
- #include "vmac.h"
-@@ -353,20 +354,24 @@ inline void cmetrohash64_2_test ( const void * key, int len, uint32_t seed, void
- }
- #endif
- 
- inline void fasthash32_test ( const void * key, int len, uint32_t seed, void * out ) {
-   *(uint32_t*)out = fasthash32(key, (size_t) len, seed);
- }
- #ifdef HAVE_INT64
- inline void fasthash64_test ( const void * key, int len, uint32_t seed, void * out ) {
-   *(uint64_t*)out = fasthash64(key, (size_t) len, (uint64_t)seed);
- }
-+
-+inline void ahash64_test ( const void * key, int len, uint32_t seed, void * out ) {
-+  *(uint64_t*)out = ahash64(key, (size_t) len, (uint64_t)seed);
-+}
- #endif
- 
- // objsize 0-778: 1912
- void mum_hash_test(const void * key, int len, uint32_t seed, void * out);
- 
- inline void mum_low_test ( const void * key, int len, uint32_t seed, void * out ) {
-   uint64_t result;
-   mum_hash_test(key, len, seed, &result);
-   *(uint32_t*)out = (uint32_t)result;
- }
-diff --git a/ahash.h b/ahash.h
-new file mode 100644
-index 0000000..2ed416d
---- /dev/null
-+++ b/ahash.h
-@@ -0,0 +1,24 @@
-+
-+#ifndef _AHASH_H
-+#define _AHASH_H
-+
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/**
-+ * Ahash - 64-bit implementation of aHash
-+ * @buf:  data buffer
-+ * @len:  data size
-+ * @seed: the seed
-+ */
-+       uint64_t ahash64(const void *buf, size_t len, uint64_t seed);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-\ No newline at end of file
-diff --git a/main.cpp b/main.cpp
-index f742fbf..c221f7d 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -434,20 +434,21 @@ HashInfo g_hashes[] =
-   { t1ha0_ia32aes_avx1_test,   64, 0xF07C4DA5, "t1ha0_aes_avx1",  "Fast Positive Hash (machine-specific, requires AES-NI & AVX)", GOOD },
- #  endif /* __AVX__ */
- #  if defined(__AVX2__)
-   { t1ha0_ia32aes_avx2_test,   64, 0x8B38C599, "t1ha0_aes_avx2",  "Fast Positive Hash (machine-specific, requires AES-NI & AVX2)", GOOD },
- #  endif /* __AVX2__ */
- #endif /* T1HA0_AESNI_AVAILABLE */
-   { xxh3_test,            64, 0x39CD9E4A, "xxh3",        "xxHash v3, 64-bit", GOOD },
-   { xxh3low_test,         32, 0xFAE8467B, "xxh3low",     "xxHash v3, 64-bit, low 32-bits part", GOOD },
-   { xxh128_test,         128, 0xEB61B3A0, "xxh128",      "xxHash v3, 128-bit", GOOD },
-   { xxh128low_test,       64, 0x54D1CC70, "xxh128low",   "xxHash v3, 128-bit, low 64-bits part", GOOD },
-+  { ahash64_test,         64, 0x00000000, "ahash64",  "ahash 64bit", GOOD }, //Expected value set to zero because aHash does not adhere to a fixed output.
- #ifdef HAVE_BIT32
-   { wyhash32_test,        32, 0x09DE8066, "wyhash32",       "wyhash (32-bit)", GOOD },
- #else
-   { wyhash32low,          32, 0x9241B8A3, "wyhash32low",    "wyhash lower 32bit", GOOD },
- #endif
- #ifdef HAVE_INT64
-   { wyhash_test,          64, 0x7C62138D, "wyhash",         "wyhash (64-bit)", GOOD },
- #endif
- 
- };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/ahashOutput.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/ahashOutput.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/ahashOutput.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/ahashOutput.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,1516 +0,0 @@
--------------------------------------------------------------------------------
---- Testing ahash64 "ahash 64bit" GOOD
-
-[[[ Sanity Tests ]]]
-
-Verification value 0x84A46E17 ....... SKIP (self- or unseeded)
-Running sanity check 1     .......... PASS
-Running AppendedZeroesTest .......... PASS
-
-[[[ Speed Tests ]]]
-
-Bulk speed test - 262144-byte keys
-Alignment  7 -  8.351 bytes/cycle - 23891.85 MiB/sec @ 3 ghz
-Alignment  6 -  8.327 bytes/cycle - 23823.64 MiB/sec @ 3 ghz
-Alignment  5 -  8.312 bytes/cycle - 23780.76 MiB/sec @ 3 ghz
-Alignment  4 -  8.309 bytes/cycle - 23772.79 MiB/sec @ 3 ghz
-Alignment  3 -  8.315 bytes/cycle - 23790.37 MiB/sec @ 3 ghz
-Alignment  2 -  8.339 bytes/cycle - 23858.92 MiB/sec @ 3 ghz
-Alignment  1 -  8.320 bytes/cycle - 23804.48 MiB/sec @ 3 ghz
-Alignment  0 -  8.364 bytes/cycle - 23930.33 MiB/sec @ 3 ghz
-Average      -  8.330 bytes/cycle - 23831.64 MiB/sec @ 3 ghz
-
-Small key speed test -    1-byte keys -    11.98 cycles/hash
-Small key speed test -    2-byte keys -    12.95 cycles/hash
-Small key speed test -    3-byte keys -    13.00 cycles/hash
-Small key speed test -    4-byte keys -    14.00 cycles/hash
-Small key speed test -    5-byte keys -    14.28 cycles/hash
-Small key speed test -    6-byte keys -    13.98 cycles/hash
-Small key speed test -    7-byte keys -    14.24 cycles/hash
-Small key speed test -    8-byte keys -    14.28 cycles/hash
-Small key speed test -    9-byte keys -    14.18 cycles/hash
-Small key speed test -   10-byte keys -    14.29 cycles/hash
-Small key speed test -   11-byte keys -    14.12 cycles/hash
-Small key speed test -   12-byte keys -    14.00 cycles/hash
-Small key speed test -   13-byte keys -    14.00 cycles/hash
-Small key speed test -   14-byte keys -    14.00 cycles/hash
-Small key speed test -   15-byte keys -    14.23 cycles/hash
-Small key speed test -   16-byte keys -    14.00 cycles/hash
-Small key speed test -   17-byte keys -    16.05 cycles/hash
-Small key speed test -   18-byte keys -    16.14 cycles/hash
-Small key speed test -   19-byte keys -    16.00 cycles/hash
-Small key speed test -   20-byte keys -    16.17 cycles/hash
-Small key speed test -   21-byte keys -    16.00 cycles/hash
-Small key speed test -   22-byte keys -    16.07 cycles/hash
-Small key speed test -   23-byte keys -    16.13 cycles/hash
-Small key speed test -   24-byte keys -    15.99 cycles/hash
-Small key speed test -   25-byte keys -    16.12 cycles/hash
-Small key speed test -   26-byte keys -    15.99 cycles/hash
-Small key speed test -   27-byte keys -    16.00 cycles/hash
-Small key speed test -   28-byte keys -    16.30 cycles/hash
-Small key speed test -   29-byte keys -    18.11 cycles/hash
-Small key speed test -   30-byte keys -    18.52 cycles/hash
-Small key speed test -   31-byte keys -    17.98 cycles/hash
-Average                                    15.132 cycles/hash
-
-[[[ 'Hashmap' Speed Tests ]]]
-
-std::unordered_map
-Init std HashMapTest:     270.009 cycles/op (102401 inserts, 1% deletions)
-Running std HashMapTest:  120.593 cycles/op (3.6 stdv)
-
-greg7mdp/parallel-hashmap
-Init fast HashMapTest:    110.896 cycles/op (102401 inserts, 1% deletions)
-Running fast HashMapTest: 81.841 cycles/op (0.1 stdv)  ....... PASS
-
-[[[ Avalanche Tests ]]]
-
-Testing   24-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.702667%
-Testing   32-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.670667%
-Testing   40-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.608667%
-Testing   48-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.670667%
-Testing   56-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.670000%
-Testing   64-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.663333%
-Testing   72-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.780667%
-Testing   80-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.716000%
-Testing   96-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.621333%
-Testing  112-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.642667%
-Testing  128-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.629333%
-Testing  160-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.747333%
-Testing  512-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.757333%
-Testing 1024-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.820000%
-
-[[[ Keyset 'Sparse' Tests ]]]
-
-Keyset 'Sparse' - 16-bit keys with up to 9 bits set - 50643 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected          0.3, actual      1 (3.35x) (1) !
-Testing collisions (high 19-25 bits) - Worst is 24 bits: 90/76 (1.18x)
-Testing collisions (high 12-bit) - Expected      46547.0, actual  46547 (1.00x)
-Testing collisions (high  8-bit) - Expected      50387.0, actual  50387 (1.00x)
-Testing collisions (low  32-bit) - Expected          0.3, actual      0 (0.00x)
-Testing collisions (low  19-25 bits) - Worst is 25 bits: 39/38 (1.02x)
-Testing collisions (low  12-bit) - Expected      46547.0, actual  46547 (1.00x)
-Testing collisions (low   8-bit) - Expected      50387.0, actual  50387 (1.00x)
-Testing distribution - Worst bias is the 13-bit window at bit 55 - 0.572%
-
-Keyset 'Sparse' - 24-bit keys with up to 8 bits set - 1271626 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        188.2, actual    174 (0.92x)
-Testing collisions (high 24-35 bits) - Worst is 26 bits: 12182/12047 (1.01x)
-Testing collisions (high 12-bit) - Expected    1267530.0, actual 1267530 (1.00x)
-Testing collisions (high  8-bit) - Expected    1271370.0, actual 1271370 (1.00x)
-Testing collisions (low  32-bit) - Expected        188.2, actual    201 (1.07x) (13)
-Testing collisions (low  24-35 bits) - Worst is 32 bits: 201/188 (1.07x)
-Testing collisions (low  12-bit) - Expected    1267530.0, actual 1267530 (1.00x)
-Testing collisions (low   8-bit) - Expected    1271370.0, actual 1271370 (1.00x)
-Testing distribution - Worst bias is the 17-bit window at bit 53 - 0.082%
-
-Keyset 'Sparse' - 32-bit keys with up to 7 bits set - 4514873 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       2373.0, actual   2366 (1.00x) (-7)
-Testing collisions (high 25-38 bits) - Worst is 30 bits: 9627/9492 (1.01x)
-Testing collisions (high 12-bit) - Expected    4510777.0, actual 4510777 (1.00x)
-Testing collisions (high  8-bit) - Expected    4514617.0, actual 4514617 (1.00x)
-Testing collisions (low  32-bit) - Expected       2373.0, actual   2295 (0.97x)
-Testing collisions (low  25-38 bits) - Worst is 30 bits: 9493/9492 (1.00x)
-Testing collisions (low  12-bit) - Expected    4510777.0, actual 4510777 (1.00x)
-Testing collisions (low   8-bit) - Expected    4514617.0, actual 4514617 (1.00x)
-Testing distribution - Worst bias is the 19-bit window at bit 12 - 0.048%
-
-Keyset 'Sparse' - 40-bit keys with up to 6 bits set - 4598479 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       2461.7, actual   2561 (1.04x) (100)
-Testing collisions (high 25-38 bits) - Worst is 32 bits: 2561/2461 (1.04x)
-Testing collisions (high 12-bit) - Expected    4594383.0, actual 4594383 (1.00x)
-Testing collisions (high  8-bit) - Expected    4598223.0, actual 4598223 (1.00x)
-Testing collisions (low  32-bit) - Expected       2461.7, actual   2444 (0.99x) (-17)
-Testing collisions (low  25-38 bits) - Worst is 35 bits: 323/307 (1.05x)
-Testing collisions (low  12-bit) - Expected    4594383.0, actual 4594383 (1.00x)
-Testing collisions (low   8-bit) - Expected    4598223.0, actual 4598223 (1.00x)
-Testing distribution - Worst bias is the 19-bit window at bit  2 - 0.056%
-
-Keyset 'Sparse' - 48-bit keys with up to 6 bits set - 14196869 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      23463.6, actual  23431 (1.00x) (-32)
-Testing collisions (high 27-42 bits) - Worst is 37 bits: 747/733 (1.02x)
-Testing collisions (high 12-bit) - Expected   14192773.0, actual 14192773 (1.00x)
-Testing collisions (high  8-bit) - Expected   14196613.0, actual 14196613 (1.00x)
-Testing collisions (low  32-bit) - Expected      23463.6, actual  23284 (0.99x) (-179)
-Testing collisions (low  27-42 bits) - Worst is 41 bits: 51/45 (1.11x)
-Testing collisions (low  12-bit) - Expected   14192773.0, actual 14192773 (1.00x)
-Testing collisions (low   8-bit) - Expected   14196613.0, actual 14196613 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 44 - 0.029%
-
-Keyset 'Sparse' - 56-bit keys with up to 5 bits set - 4216423 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       2069.7, actual   2053 (0.99x) (-16)
-Testing collisions (high 25-38 bits) - Worst is 31 bits: 4136/4139 (1.00x)
-Testing collisions (high 12-bit) - Expected    4212327.0, actual 4212327 (1.00x)
-Testing collisions (high  8-bit) - Expected    4216167.0, actual 4216167 (1.00x)
-Testing collisions (low  32-bit) - Expected       2069.7, actual   2058 (0.99x) (-11)
-Testing collisions (low  25-38 bits) - Worst is 30 bits: 8320/8278 (1.00x)
-Testing collisions (low  12-bit) - Expected    4212327.0, actual 4212327 (1.00x)
-Testing collisions (low   8-bit) - Expected    4216167.0, actual 4216167 (1.00x)
-Testing distribution - Worst bias is the 18-bit window at bit 26 - 0.051%
-
-Keyset 'Sparse' - 64-bit keys with up to 5 bits set - 8303633 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8026.9, actual   8024 (1.00x) (-2)
-Testing collisions (high 26-40 bits) - Worst is 37 bits: 267/250 (1.06x)
-Testing collisions (high 12-bit) - Expected    8299537.0, actual 8299537 (1.00x)
-Testing collisions (high  8-bit) - Expected    8303377.0, actual 8303377 (1.00x)
-Testing collisions (low  32-bit) - Expected       8026.9, actual   8006 (1.00x) (-20)
-Testing collisions (low  26-40 bits) - Worst is 40 bits: 34/31 (1.08x)
-Testing collisions (low  12-bit) - Expected    8299537.0, actual 8299537 (1.00x)
-Testing collisions (low   8-bit) - Expected    8303377.0, actual 8303377 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 25 - 0.041%
-
-Keyset 'Sparse' - 72-bit keys with up to 5 bits set - 15082603 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      26482.7, actual  26443 (1.00x) (-39)
-Testing collisions (high 27-42 bits) - Worst is 42 bits: 33/25 (1.28x)
-Testing collisions (high 12-bit) - Expected   15078507.0, actual 15078507 (1.00x)
-Testing collisions (high  8-bit) - Expected   15082347.0, actual 15082347 (1.00x)
-Testing collisions (low  32-bit) - Expected      26482.7, actual  26586 (1.00x) (104)
-Testing collisions (low  27-42 bits) - Worst is 42 bits: 29/25 (1.12x)
-Testing collisions (low  12-bit) - Expected   15078507.0, actual 15078507 (1.00x)
-Testing collisions (low   8-bit) - Expected   15082347.0, actual 15082347 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 31 - 0.033%
-
-Keyset 'Sparse' - 96-bit keys with up to 4 bits set - 3469497 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1401.3, actual   1457 (1.04x) (56)
-Testing collisions (high 25-38 bits) - Worst is 32 bits: 1457/1401 (1.04x)
-Testing collisions (high 12-bit) - Expected    3465401.0, actual 3465401 (1.00x)
-Testing collisions (high  8-bit) - Expected    3469241.0, actual 3469241 (1.00x)
-Testing collisions (low  32-bit) - Expected       1401.3, actual   1390 (0.99x) (-11)
-Testing collisions (low  25-38 bits) - Worst is 38 bits: 26/21 (1.19x)
-Testing collisions (low  12-bit) - Expected    3465401.0, actual 3465401 (1.00x)
-Testing collisions (low   8-bit) - Expected    3469241.0, actual 3469241 (1.00x)
-Testing distribution - Worst bias is the 19-bit window at bit 52 - 0.070%
-
-Keyset 'Sparse' - 160-bit keys with up to 4 bits set - 26977161 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      84723.3, actual  84650 (1.00x) (-73)
-Testing collisions (high 28-44 bits) - Worst is 40 bits: 336/330 (1.02x)
-Testing collisions (high 12-bit) - Expected   26973065.0, actual 26973065 (1.00x)
-Testing collisions (high  8-bit) - Expected   26976905.0, actual 26976905 (1.00x)
-Testing collisions (low  32-bit) - Expected      84723.3, actual  84029 (0.99x) (-694)
-Testing collisions (low  28-44 bits) - Worst is 37 bits: 2744/2647 (1.04x)
-Testing collisions (low  12-bit) - Expected   26973065.0, actual 26973065 (1.00x)
-Testing collisions (low   8-bit) - Expected   26976905.0, actual 26976905 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 57 - 0.013%
-
-Keyset 'Sparse' - 256-bit keys with up to 3 bits set - 2796417 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        910.4, actual    903 (0.99x) (-7)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 29/28 (1.02x)
-Testing collisions (high 12-bit) - Expected    2792321.0, actual 2792321 (1.00x)
-Testing collisions (high  8-bit) - Expected    2796161.0, actual 2796161 (1.00x)
-Testing collisions (low  32-bit) - Expected        910.4, actual    855 (0.94x)
-Testing collisions (low  25-37 bits) - Worst is 28 bits: 14588/14565 (1.00x)
-Testing collisions (low  12-bit) - Expected    2792321.0, actual 2792321 (1.00x)
-Testing collisions (low   8-bit) - Expected    2796161.0, actual 2796161 (1.00x)
-Testing distribution - Worst bias is the 19-bit window at bit  7 - 0.112%
-
-Keyset 'Sparse' - 512-bit keys with up to 3 bits set - 22370049 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      58256.4, actual  58578 (1.01x) (322)
-Testing collisions (high 28-43 bits) - Worst is 43 bits: 32/28 (1.12x)
-Testing collisions (high 12-bit) - Expected   22365953.0, actual 22365953 (1.00x)
-Testing collisions (high  8-bit) - Expected   22369793.0, actual 22369793 (1.00x)
-Testing collisions (low  32-bit) - Expected      58256.4, actual  58543 (1.00x) (287)
-Testing collisions (low  28-43 bits) - Worst is 36 bits: 3712/3641 (1.02x)
-Testing collisions (low  12-bit) - Expected   22365953.0, actual 22365953 (1.00x)
-Testing collisions (low   8-bit) - Expected   22369793.0, actual 22369793 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 43 - 0.015%
-
-Keyset 'Sparse' - 1024-bit keys with up to 2 bits set - 524801 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected         32.1, actual     35 (1.09x) (3)
-Testing collisions (high 22-32 bits) - Worst is 32 bits: 35/32 (1.09x)
-Testing collisions (high 12-bit) - Expected     520705.0, actual 520705 (1.00x)
-Testing collisions (high  8-bit) - Expected     524545.0, actual 524545 (1.00x)
-Testing collisions (low  32-bit) - Expected         32.1, actual     38 (1.19x) (6)
-Testing collisions (low  22-32 bits) - Worst is 32 bits: 38/32 (1.19x)
-Testing collisions (low  12-bit) - Expected     520705.0, actual 520705 (1.00x)
-Testing collisions (low   8-bit) - Expected     524545.0, actual 524545 (1.00x)
-Testing distribution - Worst bias is the 16-bit window at bit 17 - 0.142%
-
-Keyset 'Sparse' - 2048-bit keys with up to 2 bits set - 2098177 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.5, actual    488 (0.95x)
-Testing collisions (high 24-36 bits) - Worst is 30 bits: 2050/2050 (1.00x)
-Testing collisions (high 12-bit) - Expected    2094081.0, actual 2094081 (1.00x)
-Testing collisions (high  8-bit) - Expected    2097921.0, actual 2097921 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.5, actual    523 (1.02x) (11)
-Testing collisions (low  24-36 bits) - Worst is 34 bits: 147/128 (1.15x)
-Testing collisions (low  12-bit) - Expected    2094081.0, actual 2094081 (1.00x)
-Testing collisions (low   8-bit) - Expected    2097921.0, actual 2097921 (1.00x)
-Testing distribution - Worst bias is the 18-bit window at bit 57 - 0.080%
-
-
-[[[ Keyset 'Permutation' Tests ]]]
-
-Combination Lowbits Tests:
-Keyset 'Combination' - up to 7 blocks from a set of 8 - 2396744 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        668.7, actual    645 (0.96x)
-Testing collisions (high 25-37 bits) - Worst is 35 bits: 94/83 (1.12x)
-Testing collisions (high 12-bit) - Expected    2392648.0, actual 2392648 (1.00x)
-Testing collisions (high  8-bit) - Expected    2396488.0, actual 2396488 (1.00x)
-Testing collisions (low  32-bit) - Expected        668.7, actual    693 (1.04x) (25)
-Testing collisions (low  25-37 bits) - Worst is 35 bits: 98/83 (1.17x)
-Testing collisions (low  12-bit) - Expected    2392648.0, actual 2392648 (1.00x)
-Testing collisions (low   8-bit) - Expected    2396488.0, actual 2396488 (1.00x)
-Testing distribution - Worst bias is the 17-bit window at bit 45 - 0.076%
-
-
-Combination Highbits Tests
-Keyset 'Combination' - up to 7 blocks from a set of 8 - 2396744 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        668.7, actual    682 (1.02x) (14)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 26/20 (1.24x)
-Testing collisions (high 12-bit) - Expected    2392648.0, actual 2392648 (1.00x)
-Testing collisions (high  8-bit) - Expected    2396488.0, actual 2396488 (1.00x)
-Testing collisions (low  32-bit) - Expected        668.7, actual    690 (1.03x) (22)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 47/41 (1.12x)
-Testing collisions (low  12-bit) - Expected    2392648.0, actual 2392648 (1.00x)
-Testing collisions (low   8-bit) - Expected    2396488.0, actual 2396488 (1.00x)
-Testing distribution - Worst bias is the 18-bit window at bit 13 - 0.059%
-
-
-Combination Hi-Lo Tests:
-Keyset 'Combination' - up to 6 blocks from a set of 15 - 12204240 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      17339.3, actual  17195 (0.99x) (-144)
-Testing collisions (high 27-41 bits) - Worst is 40 bits: 72/67 (1.06x)
-Testing collisions (high 12-bit) - Expected   12200144.0, actual 12200144 (1.00x)
-Testing collisions (high  8-bit) - Expected   12203984.0, actual 12203984 (1.00x)
-Testing collisions (low  32-bit) - Expected      17339.3, actual  17096 (0.99x) (-243)
-Testing collisions (low  27-41 bits) - Worst is 41 bits: 36/33 (1.06x)
-Testing collisions (low  12-bit) - Expected   12200144.0, actual 12200144 (1.00x)
-Testing collisions (low   8-bit) - Expected   12203984.0, actual 12203984 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 48 - 0.026%
-
-
-Combination 0x8000000 Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8190 (1.00x) (-1)
-Testing collisions (high 26-40 bits) - Worst is 40 bits: 43/31 (1.34x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8149 (0.99x) (-42)
-Testing collisions (low  26-40 bits) - Worst is 37 bits: 272/255 (1.06x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 54 - 0.052%
-
-
-Combination 0x0000001 Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8262 (1.01x) (71)
-Testing collisions (high 26-40 bits) - Worst is 39 bits: 71/63 (1.11x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8167 (1.00x) (-24)
-Testing collisions (low  26-40 bits) - Worst is 34 bits: 2066/2047 (1.01x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit  2 - 0.049%
-
-
-Combination 0x800000000000000 Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8224 (1.00x) (33)
-Testing collisions (high 26-40 bits) - Worst is 40 bits: 38/31 (1.19x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8182 (1.00x) (-9)
-Testing collisions (low  26-40 bits) - Worst is 30 bits: 32790/32767 (1.00x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 37 - 0.045%
-
-
-Combination 0x000000000000001 Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8173 (1.00x) (-18)
-Testing collisions (high 26-40 bits) - Worst is 34 bits: 2054/2047 (1.00x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8313 (1.01x) (122)
-Testing collisions (low  26-40 bits) - Worst is 40 bits: 37/31 (1.16x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 20 - 0.037%
-
-
-Combination 16-bytes [0-1] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8316 (1.02x) (125)
-Testing collisions (high 26-40 bits) - Worst is 36 bits: 545/511 (1.06x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8278 (1.01x) (87)
-Testing collisions (low  26-40 bits) - Worst is 40 bits: 36/31 (1.13x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 22 - 0.041%
-
-
-Combination 16-bytes [0-last] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8106 (0.99x) (-85)
-Testing collisions (high 26-40 bits) - Worst is 38 bits: 142/127 (1.11x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8250 (1.01x) (59)
-Testing collisions (low  26-40 bits) - Worst is 39 bits: 75/63 (1.17x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 28 - 0.039%
-
-
-Combination 32-bytes [0-1] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8337 (1.02x) (146)
-Testing collisions (high 26-40 bits) - Worst is 40 bits: 35/31 (1.09x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8248 (1.01x) (57)
-Testing collisions (low  26-40 bits) - Worst is 40 bits: 37/31 (1.16x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 25 - 0.038%
-
-
-Combination 32-bytes [0-last] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8227 (1.00x) (36)
-Testing collisions (high 26-40 bits) - Worst is 35 bits: 1047/1023 (1.02x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8191 (1.00x)
-Testing collisions (low  26-40 bits) - Worst is 39 bits: 73/63 (1.14x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 35 - 0.043%
-
-
-Combination 64-bytes [0-1] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8221 (1.00x) (30)
-Testing collisions (high 26-40 bits) - Worst is 39 bits: 73/63 (1.14x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8060 (0.98x) (-131)
-Testing collisions (low  26-40 bits) - Worst is 29 bits: 65173/65535 (0.99x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit  8 - 0.060%
-
-
-Combination 64-bytes [0-last] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8254 (1.01x) (63)
-Testing collisions (high 26-40 bits) - Worst is 38 bits: 137/127 (1.07x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8101 (0.99x) (-90)
-Testing collisions (low  26-40 bits) - Worst is 37 bits: 260/255 (1.02x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 41 - 0.040%
-
-
-Combination 128-bytes [0-1] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8141 (0.99x) (-50)
-Testing collisions (high 26-40 bits) - Worst is 40 bits: 33/31 (1.03x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8340 (1.02x) (149)
-Testing collisions (low  26-40 bits) - Worst is 40 bits: 38/31 (1.19x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 39 - 0.062%
-
-
-Combination 128-bytes [0-last] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       8192.0, actual   8309 (1.01x) (118)
-Testing collisions (high 26-40 bits) - Worst is 37 bits: 275/255 (1.07x)
-Testing collisions (high 12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (high  8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing collisions (low  32-bit) - Expected       8192.0, actual   8176 (1.00x) (-15)
-Testing collisions (low  26-40 bits) - Worst is 36 bits: 561/511 (1.10x)
-Testing collisions (low  12-bit) - Expected    8384510.0, actual 8384510 (1.00x)
-Testing collisions (low   8-bit) - Expected    8388350.0, actual 8388350 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 17 - 0.032%
-
-
-[[[ Keyset 'Window' Tests ]]]
-
-Keyset 'Window' -  32-bit key,  25-bit window - 32 tests, 33554432 keys per test
-Window at   0 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   1 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   2 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   3 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   4 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   5 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   6 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   7 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   8 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   9 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  10 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  11 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  12 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  13 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  14 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  15 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  16 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  17 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  18 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  19 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  20 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  21 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  22 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  23 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  24 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  25 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  26 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  27 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  28 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  29 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  30 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  31 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  32 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-
-[[[ Keyset 'Cyclic' Tests ]]]
-
-Keyset 'Cyclic' - 8 cycles of 8 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        116.4, actual    119 (1.02x) (3)
-Testing collisions (high 23-34 bits) - Worst is 32 bits: 119/116 (1.02x)
-Testing collisions (high 12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (high  8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing collisions (low  32-bit) - Expected        116.4, actual    118 (1.01x) (2)
-Testing collisions (low  23-34 bits) - Worst is 30 bits: 476/465 (1.02x)
-Testing collisions (low  12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (low   8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing distribution - Worst bias is the 17-bit window at bit 44 - 0.134%
-
-Keyset 'Cyclic' - 8 cycles of 9 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        116.4, actual    127 (1.09x) (11)
-Testing collisions (high 23-34 bits) - Worst is 31 bits: 262/232 (1.13x)
-Testing collisions (high 12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (high  8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing collisions (low  32-bit) - Expected        116.4, actual    112 (0.96x)
-Testing collisions (low  23-34 bits) - Worst is 34 bits: 33/29 (1.13x)
-Testing collisions (low  12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (low   8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing distribution - Worst bias is the 17-bit window at bit 32 - 0.141%
-
-Keyset 'Cyclic' - 8 cycles of 10 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        116.4, actual    131 (1.13x) (15)
-Testing collisions (high 23-34 bits) - Worst is 34 bits: 33/29 (1.13x)
-Testing collisions (high 12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (high  8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing collisions (low  32-bit) - Expected        116.4, actual    109 (0.94x)
-Testing collisions (low  23-34 bits) - Worst is 34 bits: 37/29 (1.27x)
-Testing collisions (low  12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (low   8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing distribution - Worst bias is the 17-bit window at bit 16 - 0.122%
-
-Keyset 'Cyclic' - 8 cycles of 11 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        116.4, actual    104 (0.89x)
-Testing collisions (high 23-34 bits) - Worst is 34 bits: 31/29 (1.07x)
-Testing collisions (high 12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (high  8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing collisions (low  32-bit) - Expected        116.4, actual    124 (1.07x) (8)
-Testing collisions (low  23-34 bits) - Worst is 34 bits: 34/29 (1.17x)
-Testing collisions (low  12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (low   8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing distribution - Worst bias is the 17-bit window at bit 47 - 0.137%
-
-Keyset 'Cyclic' - 8 cycles of 12 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        116.4, actual    113 (0.97x)
-Testing collisions (high 23-34 bits) - Worst is 28 bits: 1877/1862 (1.01x)
-Testing collisions (high 12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (high  8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing collisions (low  32-bit) - Expected        116.4, actual    113 (0.97x)
-Testing collisions (low  23-34 bits) - Worst is 34 bits: 38/29 (1.31x)
-Testing collisions (low  12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (low   8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing distribution - Worst bias is the 17-bit window at bit 53 - 0.109%
-
-Keyset 'Cyclic' - 8 cycles of 16 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        116.4, actual    122 (1.05x) (6)
-Testing collisions (high 23-34 bits) - Worst is 34 bits: 31/29 (1.07x)
-Testing collisions (high 12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (high  8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing collisions (low  32-bit) - Expected        116.4, actual    112 (0.96x)
-Testing collisions (low  23-34 bits) - Worst is 33 bits: 62/58 (1.07x)
-Testing collisions (low  12-bit) - Expected     995904.0, actual 995904 (1.00x)
-Testing collisions (low   8-bit) - Expected     999744.0, actual 999744 (1.00x)
-Testing distribution - Worst bias is the 17-bit window at bit 37 - 0.086%
-
-
-[[[ Keyset 'TwoBytes' Tests ]]]
-
-Keyset 'TwoBytes' - up-to-4-byte keys, 652545 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected         49.6, actual     61 (1.23x) (12)
-Testing collisions (high 23-33 bits) - Worst is 33 bits: 31/24 (1.25x)
-Testing collisions (high 12-bit) - Expected     648449.0, actual 648449 (1.00x)
-Testing collisions (high  8-bit) - Expected     652289.0, actual 652289 (1.00x)
-Testing collisions (low  32-bit) - Expected         49.6, actual     53 (1.07x) (4)
-Testing collisions (low  23-33 bits) - Worst is 32 bits: 53/49 (1.07x)
-Testing collisions (low  12-bit) - Expected     648449.0, actual 648449 (1.00x)
-Testing collisions (low   8-bit) - Expected     652289.0, actual 652289 (1.00x)
-Testing distribution - Worst bias is the 15-bit window at bit 54 - 0.125%
-
-Keyset 'TwoBytes' - up-to-8-byte keys, 5471025 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       3484.6, actual   3456 (0.99x) (-28)
-Testing collisions (high 26-39 bits) - Worst is 34 bits: 878/871 (1.01x)
-Testing collisions (high 12-bit) - Expected    5466929.0, actual 5466929 (1.00x)
-Testing collisions (high  8-bit) - Expected    5470769.0, actual 5470769 (1.00x)
-Testing collisions (low  32-bit) - Expected       3484.6, actual   3430 (0.98x) (-54)
-Testing collisions (low  26-39 bits) - Worst is 35 bits: 441/435 (1.01x)
-Testing collisions (low  12-bit) - Expected    5466929.0, actual 5466929 (1.00x)
-Testing collisions (low   8-bit) - Expected    5470769.0, actual 5470769 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 30 - 0.072%
-
-Keyset 'TwoBytes' - up-to-12-byte keys, 18616785 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      40347.8, actual  40130 (0.99x) (-217)
-Testing collisions (high 27-42 bits) - Worst is 32 bits: 40130/40347 (0.99x)
-Testing collisions (high 12-bit) - Expected   18612689.0, actual 18612689 (1.00x)
-Testing collisions (high  8-bit) - Expected   18616529.0, actual 18616529 (1.00x)
-Testing collisions (low  32-bit) - Expected      40347.8, actual  40032 (0.99x) (-315)
-Testing collisions (low  27-42 bits) - Worst is 42 bits: 46/39 (1.17x)
-Testing collisions (low  12-bit) - Expected   18612689.0, actual 18612689 (1.00x)
-Testing collisions (low   8-bit) - Expected   18616529.0, actual 18616529 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 40 - 0.023%
-
-Keyset 'TwoBytes' - up-to-16-byte keys, 44251425 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected     227963.2, actual 226681 (0.99x) (-1282)
-Testing collisions (high 29-45 bits) - Worst is 45 bits: 31/27 (1.11x)
-Testing collisions (high 12-bit) - Expected   44247329.0, actual 44247329 (1.00x)
-Testing collisions (high  8-bit) - Expected   44251169.0, actual 44251169 (1.00x)
-Testing collisions (low  32-bit) - Expected     227963.2, actual 227005 (1.00x) (-958)
-Testing collisions (low  29-45 bits) - Worst is 43 bits: 130/111 (1.17x)
-Testing collisions (low  12-bit) - Expected   44247329.0, actual 44247329 (1.00x)
-Testing collisions (low   8-bit) - Expected   44251169.0, actual 44251169 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 44 - 0.009%
-
-Keyset 'TwoBytes' - up-to-20-byte keys, 86536545 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected     871784.7, actual 865470 (0.99x) (-6314)
-Testing collisions (high 30-47 bits) - Worst is 41 bits: 1794/1702 (1.05x)
-Testing collisions (high 12-bit) - Expected   86532449.0, actual 86532449 (1.00x)
-Testing collisions (high  8-bit) - Expected   86536289.0, actual 86536289 (1.00x)
-Testing collisions (low  32-bit) - Expected     871784.7, actual 867660 (1.00x) (-4124)
-Testing collisions (low  30-47 bits) - Worst is 43 bits: 452/425 (1.06x)
-Testing collisions (low  12-bit) - Expected   86532449.0, actual 86532449 (1.00x)
-Testing collisions (low   8-bit) - Expected   86536289.0, actual 86536289 (1.00x)
-Testing distribution - Worst bias is the 19-bit window at bit 46 - 0.004%
-
-
-[[[ Keyset 'Text' Tests ]]]
-
-Keyset 'Text' - keys of form "FooXXXXBar" - 14776336 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      25418.1, actual  25256 (0.99x) (-162)
-Testing collisions (high 27-42 bits) - Worst is 42 bits: 30/24 (1.21x)
-Testing collisions (high 12-bit) - Expected   14772240.0, actual 14772240 (1.00x)
-Testing collisions (high  8-bit) - Expected   14776080.0, actual 14776080 (1.00x)
-Testing collisions (low  32-bit) - Expected      25418.1, actual  25375 (1.00x) (-43)
-Testing collisions (low  27-42 bits) - Worst is 40 bits: 112/99 (1.13x)
-Testing collisions (low  12-bit) - Expected   14772240.0, actual 14772240 (1.00x)
-Testing collisions (low   8-bit) - Expected   14776080.0, actual 14776080 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 61 - 0.024%
-
-Keyset 'Text' - keys of form "FooBarXXXX" - 14776336 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      25418.1, actual  25878 (1.02x) (460)
-Testing collisions (high 27-42 bits) - Worst is 33 bits: 12976/12709 (1.02x)
-Testing collisions (high 12-bit) - Expected   14772240.0, actual 14772240 (1.00x)
-Testing collisions (high  8-bit) - Expected   14776080.0, actual 14776080 (1.00x)
-Testing collisions (low  32-bit) - Expected      25418.1, actual  25540 (1.00x) (122)
-Testing collisions (low  27-42 bits) - Worst is 38 bits: 416/397 (1.05x)
-Testing collisions (low  12-bit) - Expected   14772240.0, actual 14772240 (1.00x)
-Testing collisions (low   8-bit) - Expected   14776080.0, actual 14776080 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 27 - 0.023%
-
-Keyset 'Text' - keys of form "XXXXFooBar" - 14776336 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      25418.1, actual  25266 (0.99x) (-152)
-Testing collisions (high 27-42 bits) - Worst is 34 bits: 6369/6354 (1.00x)
-Testing collisions (high 12-bit) - Expected   14772240.0, actual 14772240 (1.00x)
-Testing collisions (high  8-bit) - Expected   14776080.0, actual 14776080 (1.00x)
-Testing collisions (low  32-bit) - Expected      25418.1, actual  25162 (0.99x) (-256)
-Testing collisions (low  27-42 bits) - Worst is 40 bits: 101/99 (1.02x)
-Testing collisions (low  12-bit) - Expected   14772240.0, actual 14772240 (1.00x)
-Testing collisions (low   8-bit) - Expected   14776080.0, actual 14776080 (1.00x)
-Testing distribution - Worst bias is the 20-bit window at bit 10 - 0.016%
-
-Keyset 'Words' - 4000000 random keys of len 6-16 from alnum charset
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1862.6, actual   1923 (1.03x) (61)
-Testing collisions (high 25-38 bits) - Worst is 37 bits: 65/58 (1.12x)
-Testing collisions (high 12-bit) - Expected    3995904.0, actual 3995904 (1.00x)
-Testing collisions (high  8-bit) - Expected    3999744.0, actual 3999744 (1.00x)
-Testing collisions (low  32-bit) - Expected       1862.6, actual   1876 (1.01x) (14)
-Testing collisions (low  25-38 bits) - Worst is 32 bits: 1876/1862 (1.01x)
-Testing collisions (low  12-bit) - Expected    3995904.0, actual 3995904 (1.00x)
-Testing collisions (low   8-bit) - Expected    3999744.0, actual 3999744 (1.00x)
-Testing distribution - Worst bias is the 19-bit window at bit  1 - 0.075%
-
-Keyset 'Words' - 4000000 random keys of len 6-16 from password charset
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1862.6, actual   1884 (1.01x) (22)
-Testing collisions (high 25-38 bits) - Worst is 35 bits: 253/232 (1.09x)
-Testing collisions (high 12-bit) - Expected    3995904.0, actual 3995904 (1.00x)
-Testing collisions (high  8-bit) - Expected    3999744.0, actual 3999744 (1.00x)
-Testing collisions (low  32-bit) - Expected       1862.6, actual   1858 (1.00x) (-4)
-Testing collisions (low  25-38 bits) - Worst is 36 bits: 140/116 (1.20x)
-Testing collisions (low  12-bit) - Expected    3995904.0, actual 3995904 (1.00x)
-Testing collisions (low   8-bit) - Expected    3999744.0, actual 3999744 (1.00x)
-Testing distribution - Worst bias is the 18-bit window at bit 47 - 0.053%
-
-Keyset 'Words' - 102401 dict words
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected          1.2, actual      1 (0.82x)
-Testing collisions (high 20-27 bits) - Worst is 24 bits: 333/312 (1.07x)
-Testing collisions (high 12-bit) - Expected      98305.0, actual  98305 (1.00x)
-Testing collisions (high  8-bit) - Expected     102145.0, actual 102145 (1.00x)
-Testing collisions (low  32-bit) - Expected          1.2, actual      1 (0.82x)
-Testing collisions (low  20-27 bits) - Worst is 22 bits: 1284/1250 (1.03x)
-Testing collisions (low  12-bit) - Expected      98305.0, actual  98305 (1.00x)
-Testing collisions (low   8-bit) - Expected     102145.0, actual 102145 (1.00x)
-Testing distribution - Worst bias is the 14-bit window at bit 28 - 0.409%
-
-
-[[[ Keyset 'Zeroes' Tests ]]]
-
-Keyset 'Zeroes' - 204800 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected          4.9, actual      6 (1.23x) (2)
-Testing collisions (high 21-29 bits) - Worst is 28 bits: 82/78 (1.05x)
-Testing collisions (high 12-bit) - Expected     200704.0, actual 200704 (1.00x)
-Testing collisions (high  8-bit) - Expected     204544.0, actual 204544 (1.00x)
-Testing collisions (low  32-bit) - Expected          4.9, actual      5 (1.02x) (1)
-Testing collisions (low  21-29 bits) - Worst is 29 bits: 40/39 (1.02x)
-Testing collisions (low  12-bit) - Expected     200704.0, actual 200704 (1.00x)
-Testing collisions (low   8-bit) - Expected     204544.0, actual 204544 (1.00x)
-Testing distribution - Worst bias is the 14-bit window at bit 50 - 0.267%
-
-
-[[[ Keyset 'Seed' Tests ]]]
-
-Keyset 'Seed' - 5000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       2910.4, actual   2988 (1.03x) (78)
-Testing collisions (high 26-39 bits) - Worst is 39 bits: 27/22 (1.19x)
-Testing collisions (high 12-bit) - Expected    4995904.0, actual 4995904 (1.00x)
-Testing collisions (high  8-bit) - Expected    4999744.0, actual 4999744 (1.00x)
-Testing collisions (low  32-bit) - Expected       2910.4, actual   3040 (1.04x) (130)
-Testing collisions (low  26-39 bits) - Worst is 33 bits: 1528/1455 (1.05x)
-Testing collisions (low  12-bit) - Expected    4995904.0, actual 4995904 (1.00x)
-Testing collisions (low   8-bit) - Expected    4999744.0, actual 4999744 (1.00x)
-Testing distribution - Worst bias is the 19-bit window at bit  8 - 0.045%
-
-
-[[[ Keyset 'PerlinNoise' Tests ]]]
-
-Testing 16777216 coordinates (L2) :
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      32768.0, actual  32864 (1.00x) (97)
-Testing collisions (high 27-42 bits) - Worst is 38 bits: 548/511 (1.07x)
-Testing collisions (high 12-bit) - Expected   16773120.0, actual 16773120 (1.00x)
-Testing collisions (high  8-bit) - Expected   16776960.0, actual 16776960 (1.00x)
-Testing collisions (low  32-bit) - Expected      32768.0, actual  32219 (0.98x) (-548)
-Testing collisions (low  27-42 bits) - Worst is 42 bits: 44/31 (1.38x)
-Testing collisions (low  12-bit) - Expected   16773120.0, actual 16773120 (1.00x)
-Testing collisions (low   8-bit) - Expected   16776960.0, actual 16776960 (1.00x)
-
-
-[[[ Diff 'Differential' Tests ]]]
-
-Testing 8303632 up-to-5-bit differentials in 64-bit keys -> 64 bit hashes.
-1000 reps, 8303632000 total tests, expecting 0.00 random collisions..........
-0 total collisions, of which 0 single collisions were ignored
-
-Testing 11017632 up-to-4-bit differentials in 128-bit keys -> 64 bit hashes.
-1000 reps, 11017632000 total tests, expecting 0.00 random collisions..........
-0 total collisions, of which 0 single collisions were ignored
-
-Testing 2796416 up-to-3-bit differentials in 256-bit keys -> 64 bit hashes.
-1000 reps, 2796416000 total tests, expecting 0.00 random collisions..........
-0 total collisions, of which 0 single collisions were ignored
-
-
-[[[ DiffDist 'Differential Distribution' Tests ]]]
-
-Testing bit 0
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    503 (0.98x) (-8)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 37/31 (1.16x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    499 (0.97x)
-Testing collisions (low  24-36 bits) - Worst is 31 bits: 1028/1023 (1.00x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 1
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    550 (1.07x) (39)
-Testing collisions (high 24-36 bits) - Worst is 34 bits: 147/127 (1.15x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    504 (0.98x) (-7)
-Testing collisions (low  24-36 bits) - Worst is 26 bits: 32606/32767 (1.00x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 2
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    490 (0.96x)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 67/63 (1.05x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    522 (1.02x) (11)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 37/31 (1.16x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 3
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    483 (0.94x)
-Testing collisions (high 24-36 bits) - Worst is 28 bits: 8201/8191 (1.00x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    519 (1.01x) (8)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 86/63 (1.34x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 4
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    476 (0.93x)
-Testing collisions (high 24-36 bits) - Worst is 30 bits: 2026/2047 (0.99x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    511 (1.00x)
-Testing collisions (low  24-36 bits) - Worst is 34 bits: 145/127 (1.13x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 5
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    497 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 29 bits: 4206/4095 (1.03x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    488 (0.95x)
-Testing collisions (low  24-36 bits) - Worst is 34 bits: 141/127 (1.10x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 6
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    506 (0.99x) (-5)
-Testing collisions (high 24-36 bits) - Worst is 34 bits: 137/127 (1.07x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    512 (1.00x) (1)
-Testing collisions (low  24-36 bits) - Worst is 28 bits: 8292/8191 (1.01x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 7
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    481 (0.94x)
-Testing collisions (high 24-36 bits) - Worst is 30 bits: 2011/2047 (0.98x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    551 (1.08x) (40)
-Testing collisions (low  24-36 bits) - Worst is 32 bits: 551/511 (1.08x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 8
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    550 (1.07x) (39)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 47/31 (1.47x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    499 (0.97x)
-Testing collisions (low  24-36 bits) - Worst is 34 bits: 139/127 (1.09x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 9
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    493 (0.96x)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 66/63 (1.03x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    537 (1.05x) (26)
-Testing collisions (low  24-36 bits) - Worst is 33 bits: 299/255 (1.17x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 10
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    555 (1.08x) (44)
-Testing collisions (high 24-36 bits) - Worst is 33 bits: 281/255 (1.10x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    495 (0.97x)
-Testing collisions (low  24-36 bits) - Worst is 31 bits: 1048/1023 (1.02x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 11
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    459 (0.90x)
-Testing collisions (high 24-36 bits) - Worst is 29 bits: 4100/4095 (1.00x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    488 (0.95x)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 42/31 (1.31x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 12
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    491 (0.96x)
-Testing collisions (high 24-36 bits) - Worst is 29 bits: 4167/4095 (1.02x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    480 (0.94x)
-Testing collisions (low  24-36 bits) - Worst is 30 bits: 2089/2047 (1.02x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 13
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    497 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 34 bits: 132/127 (1.03x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    553 (1.08x) (42)
-Testing collisions (low  24-36 bits) - Worst is 32 bits: 553/511 (1.08x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 14
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    538 (1.05x) (27)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 34/31 (1.06x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    508 (0.99x) (-3)
-Testing collisions (low  24-36 bits) - Worst is 33 bits: 271/255 (1.06x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 15
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    534 (1.04x) (23)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 36/31 (1.13x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    530 (1.04x) (19)
-Testing collisions (low  24-36 bits) - Worst is 33 bits: 267/255 (1.04x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 16
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    481 (0.94x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 33/31 (1.03x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    498 (0.97x)
-Testing collisions (low  24-36 bits) - Worst is 29 bits: 4135/4095 (1.01x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 17
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    526 (1.03x) (15)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 80/63 (1.25x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    477 (0.93x)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 64/63 (1.00x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 18
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    483 (0.94x)
-Testing collisions (high 24-36 bits) - Worst is 28 bits: 8326/8191 (1.02x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    490 (0.96x)
-Testing collisions (low  24-36 bits) - Worst is 29 bits: 4095/4095 (1.00x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 19
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    492 (0.96x)
-Testing collisions (high 24-36 bits) - Worst is 34 bits: 136/127 (1.06x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    529 (1.03x) (18)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 79/63 (1.23x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 20
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    494 (0.96x)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 67/63 (1.05x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    511 (1.00x)
-Testing collisions (low  24-36 bits) - Worst is 34 bits: 137/127 (1.07x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 21
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    494 (0.96x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 45/31 (1.41x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    523 (1.02x) (12)
-Testing collisions (low  24-36 bits) - Worst is 30 bits: 2124/2047 (1.04x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 22
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    497 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 34 bits: 129/127 (1.01x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    499 (0.97x)
-Testing collisions (low  24-36 bits) - Worst is 33 bits: 258/255 (1.01x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 23
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    520 (1.02x) (9)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 37/31 (1.16x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    515 (1.01x) (4)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 39/31 (1.22x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 24
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    496 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 37/31 (1.16x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    486 (0.95x)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 36/31 (1.13x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 25
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    515 (1.01x) (4)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 35/31 (1.09x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    511 (1.00x)
-Testing collisions (low  24-36 bits) - Worst is 28 bits: 8241/8191 (1.01x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 26
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    525 (1.03x) (14)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 88/63 (1.38x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    500 (0.98x)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 43/31 (1.34x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 27
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    496 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 70/63 (1.09x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    516 (1.01x) (5)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 38/31 (1.19x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 28
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    523 (1.02x) (12)
-Testing collisions (high 24-36 bits) - Worst is 32 bits: 523/511 (1.02x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    512 (1.00x) (1)
-Testing collisions (low  24-36 bits) - Worst is 30 bits: 2100/2047 (1.03x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 29
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    534 (1.04x) (23)
-Testing collisions (high 24-36 bits) - Worst is 32 bits: 534/511 (1.04x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    494 (0.96x)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 34/31 (1.06x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 30
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    505 (0.99x) (-6)
-Testing collisions (high 24-36 bits) - Worst is 29 bits: 4057/4095 (0.99x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    499 (0.97x)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 68/63 (1.06x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 31
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    526 (1.03x) (15)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 36/31 (1.13x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    517 (1.01x) (6)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 40/31 (1.25x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 32
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    467 (0.91x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 41/31 (1.28x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    512 (1.00x) (1)
-Testing collisions (low  24-36 bits) - Worst is 34 bits: 142/127 (1.11x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 33
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    518 (1.01x) (7)
-Testing collisions (high 24-36 bits) - Worst is 33 bits: 267/255 (1.04x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    518 (1.01x) (7)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 40/31 (1.25x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 34
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    540 (1.05x) (29)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 49/31 (1.53x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    556 (1.09x) (45)
-Testing collisions (low  24-36 bits) - Worst is 32 bits: 556/511 (1.09x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 35
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    486 (0.95x)
-Testing collisions (high 24-36 bits) - Worst is 30 bits: 2057/2047 (1.00x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    504 (0.98x) (-7)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 33/31 (1.03x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 36
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    514 (1.00x) (3)
-Testing collisions (high 24-36 bits) - Worst is 31 bits: 1035/1023 (1.01x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    462 (0.90x)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 64/63 (1.00x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 37
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    496 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 65/63 (1.02x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    506 (0.99x) (-5)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 73/63 (1.14x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 38
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    489 (0.96x)
-Testing collisions (high 24-36 bits) - Worst is 30 bits: 2065/2047 (1.01x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    490 (0.96x)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 39/31 (1.22x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 39
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    539 (1.05x) (28)
-Testing collisions (high 24-36 bits) - Worst is 33 bits: 271/255 (1.06x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    514 (1.00x) (3)
-Testing collisions (low  24-36 bits) - Worst is 32 bits: 514/511 (1.00x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 40
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    484 (0.95x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 36/31 (1.13x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    515 (1.01x) (4)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 37/31 (1.16x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 41
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    505 (0.99x) (-6)
-Testing collisions (high 24-36 bits) - Worst is 34 bits: 137/127 (1.07x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    520 (1.02x) (9)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 67/63 (1.05x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 42
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    506 (0.99x) (-5)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 90/63 (1.41x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    566 (1.11x) (55)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 39/31 (1.22x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 43
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    541 (1.06x) (30)
-Testing collisions (high 24-36 bits) - Worst is 32 bits: 541/511 (1.06x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    480 (0.94x)
-Testing collisions (low  24-36 bits) - Worst is 27 bits: 16264/16383 (0.99x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 44
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    474 (0.93x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 38/31 (1.19x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    496 (0.97x)
-Testing collisions (low  24-36 bits) - Worst is 30 bits: 2097/2047 (1.02x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 45
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    497 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 65/63 (1.02x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    557 (1.09x) (46)
-Testing collisions (low  24-36 bits) - Worst is 32 bits: 557/511 (1.09x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 46
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    514 (1.00x) (3)
-Testing collisions (high 24-36 bits) - Worst is 32 bits: 514/511 (1.00x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    540 (1.05x) (29)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 43/31 (1.34x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 47
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    520 (1.02x) (9)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 39/31 (1.22x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    540 (1.05x) (29)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 81/63 (1.27x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 48
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    533 (1.04x) (22)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 75/63 (1.17x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    513 (1.00x) (2)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 40/31 (1.25x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 49
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    522 (1.02x) (11)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 37/31 (1.16x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    491 (0.96x)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 40/31 (1.25x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 50
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    527 (1.03x) (16)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 35/31 (1.09x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    545 (1.06x) (34)
-Testing collisions (low  24-36 bits) - Worst is 34 bits: 168/127 (1.31x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 51
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    505 (0.99x) (-6)
-Testing collisions (high 24-36 bits) - Worst is 33 bits: 280/255 (1.09x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    492 (0.96x)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 74/63 (1.16x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 52
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    468 (0.91x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 36/31 (1.13x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    509 (0.99x) (-2)
-Testing collisions (low  24-36 bits) - Worst is 31 bits: 1028/1023 (1.00x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 53
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    495 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 28 bits: 8270/8191 (1.01x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    486 (0.95x)
-Testing collisions (low  24-36 bits) - Worst is 29 bits: 4190/4095 (1.02x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 54
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    513 (1.00x) (2)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 77/63 (1.20x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    477 (0.93x)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 39/31 (1.22x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 55
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    509 (0.99x) (-2)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 71/63 (1.11x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    527 (1.03x) (16)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 34/31 (1.06x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 56
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    487 (0.95x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 39/31 (1.22x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    485 (0.95x)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 41/31 (1.28x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 57
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    485 (0.95x)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 41/31 (1.28x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    545 (1.06x) (34)
-Testing collisions (low  24-36 bits) - Worst is 35 bits: 73/63 (1.14x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 58
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    509 (0.99x) (-2)
-Testing collisions (high 24-36 bits) - Worst is 34 bits: 135/127 (1.05x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    511 (1.00x)
-Testing collisions (low  24-36 bits) - Worst is 30 bits: 2106/2047 (1.03x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 59
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    509 (0.99x) (-2)
-Testing collisions (high 24-36 bits) - Worst is 31 bits: 1032/1023 (1.01x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    505 (0.99x) (-6)
-Testing collisions (low  24-36 bits) - Worst is 29 bits: 4237/4095 (1.03x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 60
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    499 (0.97x)
-Testing collisions (high 24-36 bits) - Worst is 28 bits: 8290/8191 (1.01x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    526 (1.03x) (15)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 41/31 (1.28x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 61
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    534 (1.04x) (23)
-Testing collisions (high 24-36 bits) - Worst is 34 bits: 134/127 (1.05x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    508 (0.99x) (-3)
-Testing collisions (low  24-36 bits) - Worst is 31 bits: 1035/1023 (1.01x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 62
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    530 (1.04x) (19)
-Testing collisions (high 24-36 bits) - Worst is 32 bits: 530/511 (1.04x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    517 (1.01x) (6)
-Testing collisions (low  24-36 bits) - Worst is 36 bits: 42/31 (1.31x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-Testing bit 63
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        512.0, actual    521 (1.02x) (10)
-Testing collisions (high 24-36 bits) - Worst is 36 bits: 43/31 (1.34x)
-Testing collisions (high 12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (high  8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-Testing collisions (low  32-bit) - Expected        512.0, actual    472 (0.92x)
-Testing collisions (low  24-36 bits) - Worst is 28 bits: 8141/8191 (0.99x)
-Testing collisions (low  12-bit) - Expected    2093056.0, actual 2093056 (1.00x)
-Testing collisions (low   8-bit) - Expected    2096896.0, actual 2096896 (1.00x)
-
-
-[[[ MomentChi2 Tests ]]]
-
-Analyze hashes produced from a serie of linearly increasing numbers of 32-bit, using a step of 3 ...
-Target values to approximate : 38918200.000000 - 410450.000000
-Popcount 1 stats : 38919121.989370 - 410434.062934
-Popcount 0 stats : 38918028.259881 - 410423.768513
-MomentChi2 for bits 1 :   1.03555
-MomentChi2 for bits 0 :  0.0359308
-
-Derivative stats (transition from 2 consecutive values) :
-Popcount 1 stats : 38919523.956012 - 410475.202934
-Popcount 0 stats : 38918557.696824 - 410478.877341
-MomentChi2 for deriv b1 :   2.13522
-MomentChi2 for deriv b0 :  0.155856
-
-  Great !!
-
-
-[[[ Prng Tests ]]]
-
-Generating 33554432 random numbers :
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected     131072.0, actual 130471 (1.00x) (-600)
-Testing collisions (high 28-44 bits) - Worst is 42 bits: 130/127 (1.02x)
-Testing collisions (high 12-bit) - Expected   33550336.0, actual 33550336 (1.00x)
-Testing collisions (high  8-bit) - Expected   33554176.0, actual 33554176 (1.00x)
-Testing collisions (low  32-bit) - Expected     131072.0, actual 130871 (1.00x) (-200)
-Testing collisions (low  28-44 bits) - Worst is 43 bits: 70/63 (1.09x)
-Testing collisions (low  12-bit) - Expected   33550336.0, actual 33550336 (1.00x)
-Testing collisions (low   8-bit) - Expected   33554176.0, actual 33554176 (1.00x)
-
-
-Input vcode 0x00000001, Output vcode 0x00000001, Result vcode 0x00000001
-Verification value is 0x00000001 - Testing took 584.720469 seconds
--------------------------------------------------------------------------------
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/clone_smhasher.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/clone_smhasher.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/clone_smhasher.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/clone_smhasher.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-git clone https://github.com/rurban/smhasher.git && cd smhasher && git apply ../0001-Add-support-for-aHash.patch
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/fallbackOutput.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/fallbackOutput.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/smhasher/fallbackOutput.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/smhasher/fallbackOutput.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,1467 +0,0 @@
--------------------------------------------------------------------------------
---- Testing ahash64 "ahash 64bit" GOOD
-
-[[[ Sanity Tests ]]]
-
-Verification value 0x52EC0BA4 ....... SKIP (self- or unseeded)
-Running sanity check 1     .......... PASS
-Running AppendedZeroesTest .......... PASS
-
-[[[ Speed Tests ]]]
-
-Bulk speed test - 262144-byte keys
-Alignment  7 -  8.506 bytes/cycle - 24336.28 MiB/sec @ 3 ghz
-Alignment  6 -  8.505 bytes/cycle - 24333.38 MiB/sec @ 3 ghz
-Alignment  5 -  8.500 bytes/cycle - 24317.30 MiB/sec @ 3 ghz
-Alignment  4 -  8.491 bytes/cycle - 24294.09 MiB/sec @ 3 ghz
-Alignment  3 -  8.491 bytes/cycle - 24293.90 MiB/sec @ 3 ghz
-Alignment  2 -  8.492 bytes/cycle - 24296.22 MiB/sec @ 3 ghz
-Alignment  1 -  8.508 bytes/cycle - 24340.25 MiB/sec @ 3 ghz
-Alignment  0 -  8.748 bytes/cycle - 25028.73 MiB/sec @ 3 ghz
-Average      -  8.530 bytes/cycle - 24405.02 MiB/sec @ 3 ghz
-
-Small key speed test -    1-byte keys -    14.97 cycles/hash
-Small key speed test -    2-byte keys -    15.00 cycles/hash
-Small key speed test -    3-byte keys -    15.00 cycles/hash
-Small key speed test -    4-byte keys -    15.00 cycles/hash
-Small key speed test -    5-byte keys -    16.00 cycles/hash
-Small key speed test -    6-byte keys -    16.00 cycles/hash
-Small key speed test -    7-byte keys -    16.11 cycles/hash
-Small key speed test -    8-byte keys -    15.00 cycles/hash
-Small key speed test -    9-byte keys -    19.04 cycles/hash
-Small key speed test -   10-byte keys -    19.70 cycles/hash
-Small key speed test -   11-byte keys -    19.43 cycles/hash
-Small key speed test -   12-byte keys -    19.54 cycles/hash
-Small key speed test -   13-byte keys -    19.65 cycles/hash
-Small key speed test -   14-byte keys -    19.45 cycles/hash
-Small key speed test -   15-byte keys -    19.00 cycles/hash
-Small key speed test -   16-byte keys -    19.45 cycles/hash
-Small key speed test -   17-byte keys -    19.84 cycles/hash
-Small key speed test -   18-byte keys -    19.65 cycles/hash
-Small key speed test -   19-byte keys -    19.36 cycles/hash
-Small key speed test -   20-byte keys -    19.74 cycles/hash
-Small key speed test -   21-byte keys -    19.56 cycles/hash
-Small key speed test -   22-byte keys -    20.11 cycles/hash
-Small key speed test -   23-byte keys -    20.08 cycles/hash
-Small key speed test -   24-byte keys -    20.29 cycles/hash
-Small key speed test -   25-byte keys -    20.55 cycles/hash
-Small key speed test -   26-byte keys -    20.42 cycles/hash
-Small key speed test -   27-byte keys -    20.43 cycles/hash
-Small key speed test -   28-byte keys -    20.37 cycles/hash
-Small key speed test -   29-byte keys -    20.42 cycles/hash
-Small key speed test -   30-byte keys -    20.42 cycles/hash
-Small key speed test -   31-byte keys -    20.37 cycles/hash
-Average                                    18.708 cycles/hash
-
-[[[ 'Hashmap' Speed Tests ]]]
-
-std::unordered_map
-Init std HashMapTest:     295.723 cycles/op (102401 inserts, 1% deletions)
-Running std HashMapTest:  124.234 cycles/op (1.7 stdv)
-
-greg7mdp/parallel-hashmap
-Init fast HashMapTest:    112.031 cycles/op (102401 inserts, 1% deletions)
-Running fast HashMapTest: 85.002 cycles/op (2.1 stdv)  ....... PASS
-
-[[[ Avalanche Tests ]]]
-
-Testing   24-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.700000%
-Testing   32-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.628000%
-Testing   40-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.628667%
-Testing   48-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.662000%
-Testing   56-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.699333%
-Testing   64-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.665333%
-Testing   72-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.630667%
-Testing   80-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.692000%
-Testing   96-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.774000%
-Testing  112-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.730667%
-Testing  128-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.794000%
-Testing  160-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.702000%
-Testing  512-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.763333%
-Testing 1024-bit keys ->  64-bit hashes, 300000 reps worst bias is 0.816667%
-
-[[[ Keyset 'Sparse' Tests ]]]
-
-Keyset 'Sparse' - 16-bit keys with up to 9 bits set - 50643 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected          0.6, actual      0 (0.00x)
-Testing collisions (high 19-26 bits) - Worst is 22 bits: 320/611 (0.52x)
-Testing collisions (high 12-bit) - Expected      50643.0, actual  46547 (0.92x)
-Testing collisions (high  8-bit) - Expected      50643.0, actual  50387 (0.99x) (-256)
-Testing collisions (low  32-bit) - Expected          0.6, actual      1 (1.67x) (1)
-Testing collisions (low  19-26 bits) - Worst is 20 bits: 1168/2445 (0.48x)
-Testing collisions (low  12-bit) - Expected      50643.0, actual  46547 (0.92x)
-Testing collisions (low   8-bit) - Expected      50643.0, actual  50387 (0.99x) (-256)
-Testing distribution - Worst bias is the 13-bit window at bit  4 - 0.462%
-
-Keyset 'Sparse' - 24-bit keys with up to 8 bits set - 1271626 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        376.5, actual    180 (0.48x)
-Testing collisions (high 24-36 bits) - Worst is 35 bits: 26/47 (0.55x)
-Testing collisions (high 12-bit) - Expected    1271626.0, actual 1267530 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    1271626.0, actual 1271370 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected        376.5, actual    184 (0.49x)
-Testing collisions (low  24-36 bits) - Worst is 34 bits: 52/94 (0.55x)
-Testing collisions (low  12-bit) - Expected    1271626.0, actual 1267530 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    1271626.0, actual 1271370 (1.00x) (-256)
-Testing distribution - Worst bias is the 17-bit window at bit  8 - 0.085%
-
-Keyset 'Sparse' - 32-bit keys with up to 7 bits set - 4514873 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       4746.0, actual   2412 (0.51x)
-Testing collisions (high 26-39 bits) - Worst is 39 bits: 24/37 (0.65x)
-Testing collisions (high 12-bit) - Expected    4514873.0, actual 4510777 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    4514873.0, actual 4514617 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       4746.0, actual   2445 (0.52x)
-Testing collisions (low  26-39 bits) - Worst is 34 bits: 630/1186 (0.53x)
-Testing collisions (low  12-bit) - Expected    4514873.0, actual 4510777 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    4514873.0, actual 4514617 (1.00x) (-256)
-Testing distribution - Worst bias is the 19-bit window at bit 47 - 0.045%
-
-Keyset 'Sparse' - 40-bit keys with up to 6 bits set - 4598479 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       4923.4, actual   2402 (0.49x)
-Testing collisions (high 26-39 bits) - Worst is 34 bits: 639/1230 (0.52x)
-Testing collisions (high 12-bit) - Expected    4598479.0, actual 4594383 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    4598479.0, actual 4598223 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       4923.4, actual   2444 (0.50x)
-Testing collisions (low  26-39 bits) - Worst is 39 bits: 22/38 (0.57x)
-Testing collisions (low  12-bit) - Expected    4598479.0, actual 4594383 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    4598479.0, actual 4598223 (1.00x) (-256)
-Testing distribution - Worst bias is the 19-bit window at bit 62 - 0.044%
-
-Keyset 'Sparse' - 48-bit keys with up to 6 bits set - 14196869 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      46927.3, actual  23533 (0.50x)
-Testing collisions (high 28-43 bits) - Worst is 43 bits: 19/22 (0.83x)
-Testing collisions (high 12-bit) - Expected   14196869.0, actual 14192773 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   14196869.0, actual 14196613 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      46927.3, actual  23338 (0.50x)
-Testing collisions (low  28-43 bits) - Worst is 35 bits: 2947/5865 (0.50x)
-Testing collisions (low  12-bit) - Expected   14196869.0, actual 14192773 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   14196869.0, actual 14196613 (1.00x) (-256)
-Testing distribution - Worst bias is the 19-bit window at bit 45 - 0.021%
-
-Keyset 'Sparse' - 56-bit keys with up to 5 bits set - 4216423 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       4139.3, actual   2065 (0.50x)
-Testing collisions (high 26-39 bits) - Worst is 39 bits: 22/32 (0.68x)
-Testing collisions (high 12-bit) - Expected    4216423.0, actual 4212327 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    4216423.0, actual 4216167 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       4139.3, actual   1999 (0.48x)
-Testing collisions (low  26-39 bits) - Worst is 31 bits: 4110/8278 (0.50x)
-Testing collisions (low  12-bit) - Expected    4216423.0, actual 4212327 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    4216423.0, actual 4216167 (1.00x) (-256)
-Testing distribution - Worst bias is the 19-bit window at bit 26 - 0.049%
-
-Keyset 'Sparse' - 64-bit keys with up to 5 bits set - 8303633 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16053.7, actual   7972 (0.50x)
-Testing collisions (high 27-41 bits) - Worst is 40 bits: 39/62 (0.62x)
-Testing collisions (high 12-bit) - Expected    8303633.0, actual 8299537 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8303633.0, actual 8303377 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16053.7, actual   7866 (0.49x)
-Testing collisions (low  27-41 bits) - Worst is 40 bits: 36/62 (0.57x)
-Testing collisions (low  12-bit) - Expected    8303633.0, actual 8299537 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8303633.0, actual 8303377 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 61 - 0.047%
-
-Keyset 'Sparse' - 72-bit keys with up to 5 bits set - 15082603 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      52965.5, actual  26424 (0.50x)
-Testing collisions (high 28-43 bits) - Worst is 42 bits: 32/51 (0.62x)
-Testing collisions (high 12-bit) - Expected   15082603.0, actual 15078507 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   15082603.0, actual 15082347 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      52965.5, actual  26433 (0.50x)
-Testing collisions (low  28-43 bits) - Worst is 42 bits: 34/51 (0.66x)
-Testing collisions (low  12-bit) - Expected   15082603.0, actual 15078507 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   15082603.0, actual 15082347 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 59 - 0.022%
-
-Keyset 'Sparse' - 96-bit keys with up to 4 bits set - 3469497 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       2802.7, actual   1406 (0.50x)
-Testing collisions (high 26-39 bits) - Worst is 33 bits: 706/1401 (0.50x)
-Testing collisions (high 12-bit) - Expected    3469497.0, actual 3465401 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    3469497.0, actual 3469241 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       2802.7, actual   1374 (0.49x)
-Testing collisions (low  26-39 bits) - Worst is 37 bits: 44/87 (0.50x)
-Testing collisions (low  12-bit) - Expected    3469497.0, actual 3465401 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    3469497.0, actual 3469241 (1.00x) (-256)
-Testing distribution - Worst bias is the 19-bit window at bit  5 - 0.066%
-
-Keyset 'Sparse' - 160-bit keys with up to 4 bits set - 26977161 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected     169446.5, actual  84730 (0.50x)
-Testing collisions (high 29-45 bits) - Worst is 45 bits: 14/20 (0.68x)
-Testing collisions (high 12-bit) - Expected   26977161.0, actual 26973065 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   26977161.0, actual 26976905 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected     169446.5, actual  84408 (0.50x)
-Testing collisions (low  29-45 bits) - Worst is 36 bits: 5329/10590 (0.50x)
-Testing collisions (low  12-bit) - Expected   26977161.0, actual 26973065 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   26977161.0, actual 26976905 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 20 - 0.010%
-
-Keyset 'Sparse' - 256-bit keys with up to 3 bits set - 2796417 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1820.7, actual    908 (0.50x)
-Testing collisions (high 25-38 bits) - Worst is 35 bits: 118/227 (0.52x)
-Testing collisions (high 12-bit) - Expected    2796417.0, actual 2792321 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2796417.0, actual 2796161 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1820.7, actual    921 (0.51x)
-Testing collisions (low  25-38 bits) - Worst is 38 bits: 18/28 (0.63x)
-Testing collisions (low  12-bit) - Expected    2796417.0, actual 2792321 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2796417.0, actual 2796161 (1.00x) (-256)
-Testing distribution - Worst bias is the 19-bit window at bit  8 - 0.067%
-
-Keyset 'Sparse' - 512-bit keys with up to 3 bits set - 22370049 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected     116512.9, actual  58015 (0.50x)
-Testing collisions (high 28-44 bits) - Worst is 44 bits: 19/28 (0.67x)
-Testing collisions (high 12-bit) - Expected   22370049.0, actual 22365953 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   22370049.0, actual 22369793 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected     116512.9, actual  58134 (0.50x)
-Testing collisions (low  28-44 bits) - Worst is 40 bits: 241/455 (0.53x)
-Testing collisions (low  12-bit) - Expected   22370049.0, actual 22365953 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   22370049.0, actual 22369793 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 62 - 0.016%
-
-Keyset 'Sparse' - 1024-bit keys with up to 2 bits set - 524801 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected         64.1, actual     30 (0.47x)
-Testing collisions (high 23-33 bits) - Worst is 33 bits: 21/32 (0.65x)
-Testing collisions (high 12-bit) - Expected     524801.0, actual 520705 (0.99x) (-4096)
-Testing collisions (high  8-bit) - Expected     524801.0, actual 524545 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected         64.1, actual     37 (0.58x)
-Testing collisions (low  23-33 bits) - Worst is 33 bits: 23/32 (0.72x)
-Testing collisions (low  12-bit) - Expected     524801.0, actual 520705 (0.99x) (-4096)
-Testing collisions (low   8-bit) - Expected     524801.0, actual 524545 (1.00x) (-256)
-Testing distribution - Worst bias is the 16-bit window at bit 54 - 0.182%
-
-Keyset 'Sparse' - 2048-bit keys with up to 2 bits set - 2098177 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1025.0, actual    529 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 22/32 (0.69x)
-Testing collisions (high 12-bit) - Expected    2098177.0, actual 2094081 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2098177.0, actual 2097921 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1025.0, actual    525 (0.51x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 24/32 (0.75x)
-Testing collisions (low  12-bit) - Expected    2098177.0, actual 2094081 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2098177.0, actual 2097921 (1.00x) (-256)
-Testing distribution - Worst bias is the 18-bit window at bit  4 - 0.088%
-
-
-[[[ Keyset 'Permutation' Tests ]]]
-
-Combination Lowbits Tests:
-Keyset 'Combination' - up to 7 blocks from a set of 8 - 2396744 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1337.5, actual    659 (0.49x)
-Testing collisions (high 25-38 bits) - Worst is 36 bits: 55/83 (0.66x)
-Testing collisions (high 12-bit) - Expected    2396744.0, actual 2392648 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2396744.0, actual 2396488 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1337.5, actual    692 (0.52x)
-Testing collisions (low  25-38 bits) - Worst is 38 bits: 13/20 (0.62x)
-Testing collisions (low  12-bit) - Expected    2396744.0, actual 2392648 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2396744.0, actual 2396488 (1.00x) (-256)
-Testing distribution - Worst bias is the 17-bit window at bit  8 - 0.049%
-
-
-Combination Highbits Tests
-Keyset 'Combination' - up to 7 blocks from a set of 8 - 2396744 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1337.5, actual    668 (0.50x)
-Testing collisions (high 25-38 bits) - Worst is 34 bits: 175/334 (0.52x)
-Testing collisions (high 12-bit) - Expected    2396744.0, actual 2392648 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2396744.0, actual 2396488 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1337.5, actual    675 (0.50x)
-Testing collisions (low  25-38 bits) - Worst is 36 bits: 54/83 (0.65x)
-Testing collisions (low  12-bit) - Expected    2396744.0, actual 2392648 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2396744.0, actual 2396488 (1.00x) (-256)
-Testing distribution - Worst bias is the 18-bit window at bit  5 - 0.074%
-
-
-Combination Hi-Lo Tests:
-Keyset 'Combination' - up to 6 blocks from a set of 15 - 12204240 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      34678.6, actual  17094 (0.49x)
-Testing collisions (high 27-42 bits) - Worst is 36 bits: 1095/2167 (0.51x)
-Testing collisions (high 12-bit) - Expected   12204240.0, actual 12200144 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   12204240.0, actual 12203984 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      34678.6, actual  17320 (0.50x)
-Testing collisions (low  27-42 bits) - Worst is 40 bits: 75/135 (0.55x)
-Testing collisions (low  12-bit) - Expected   12204240.0, actual 12200144 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   12204240.0, actual 12203984 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 12 - 0.032%
-
-
-Combination 0x8000000 Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8224 (0.50x)
-Testing collisions (high 27-41 bits) - Worst is 33 bits: 4198/8191 (0.51x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8166 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 36 bits: 529/1023 (0.52x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 26 - 0.040%
-
-
-Combination 0x0000001 Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8221 (0.50x)
-Testing collisions (high 27-41 bits) - Worst is 38 bits: 139/255 (0.54x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8070 (0.49x)
-Testing collisions (low  27-41 bits) - Worst is 37 bits: 273/511 (0.53x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 33 - 0.045%
-
-
-Combination 0x800000000000000 Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8143 (0.50x)
-Testing collisions (high 27-41 bits) - Worst is 41 bits: 20/31 (0.63x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8230 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 38 bits: 144/255 (0.56x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 54 - 0.035%
-
-
-Combination 0x000000000000001 Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8039 (0.49x)
-Testing collisions (high 27-41 bits) - Worst is 41 bits: 17/31 (0.53x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8271 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 41 bits: 20/31 (0.63x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 40 - 0.045%
-
-
-Combination 16-bytes [0-1] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8194 (0.50x)
-Testing collisions (high 27-41 bits) - Worst is 33 bits: 4138/8191 (0.51x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8163 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 41 bits: 20/31 (0.63x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit  9 - 0.037%
-
-
-Combination 16-bytes [0-last] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8063 (0.49x)
-Testing collisions (high 27-41 bits) - Worst is 41 bits: 18/31 (0.56x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8241 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 39 bits: 91/127 (0.71x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 18 - 0.035%
-
-
-Combination 32-bytes [0-1] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   7942 (0.48x)
-Testing collisions (high 27-41 bits) - Worst is 41 bits: 17/31 (0.53x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8191 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 41 bits: 17/31 (0.53x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit  5 - 0.038%
-
-
-Combination 32-bytes [0-last] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8218 (0.50x)
-Testing collisions (high 27-41 bits) - Worst is 39 bits: 71/127 (0.55x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8144 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 30 bits: 32683/65535 (0.50x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 42 - 0.039%
-
-
-Combination 64-bytes [0-1] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8140 (0.50x)
-Testing collisions (high 27-41 bits) - Worst is 40 bits: 39/63 (0.61x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8127 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 40 bits: 34/63 (0.53x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 53 - 0.042%
-
-
-Combination 64-bytes [0-last] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8178 (0.50x)
-Testing collisions (high 27-41 bits) - Worst is 40 bits: 46/63 (0.72x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8354 (0.51x)
-Testing collisions (low  27-41 bits) - Worst is 38 bits: 136/255 (0.53x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 26 - 0.038%
-
-
-Combination 128-bytes [0-1] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8384 (0.51x)
-Testing collisions (high 27-41 bits) - Worst is 32 bits: 8384/16383 (0.51x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8287 (0.51x)
-Testing collisions (low  27-41 bits) - Worst is 33 bits: 4188/8191 (0.51x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 23 - 0.037%
-
-
-Combination 128-bytes [0-last] Tests:
-Keyset 'Combination' - up to 22 blocks from a set of 2 - 8388606 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      16384.0, actual   8104 (0.49x)
-Testing collisions (high 27-41 bits) - Worst is 34 bits: 2045/4095 (0.50x)
-Testing collisions (high 12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      16384.0, actual   8263 (0.50x)
-Testing collisions (low  27-41 bits) - Worst is 41 bits: 19/31 (0.59x)
-Testing collisions (low  12-bit) - Expected    8388606.0, actual 8384510 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    8388606.0, actual 8388350 (1.00x) (-256)
-Testing distribution - Worst bias is the 19-bit window at bit 16 - 0.040%
-
-
-[[[ Keyset 'Window' Tests ]]]
-
-Keyset 'Window' -  32-bit key,  25-bit window - 32 tests, 33554432 keys per test
-Window at   0 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   1 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   2 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   3 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   4 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   5 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   6 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   7 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   8 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at   9 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  10 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  11 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  12 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  13 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  14 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  15 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  16 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  17 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  18 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  19 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  20 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  21 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  22 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  23 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  24 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  25 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  26 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  27 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  28 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  29 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  30 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  31 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Window at  32 - Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-
-[[[ Keyset 'Cyclic' Tests ]]]
-
-Keyset 'Cyclic' - 8 cycles of 8 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        232.8, actual    107 (0.46x)
-Testing collisions (high 24-35 bits) - Worst is 34 bits: 38/58 (0.65x)
-Testing collisions (high 12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected        232.8, actual    100 (0.43x)
-Testing collisions (low  24-35 bits) - Worst is 27 bits: 3707/7450 (0.50x)
-Testing collisions (low  12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing distribution - Worst bias is the 17-bit window at bit 63 - 0.088%
-
-Keyset 'Cyclic' - 8 cycles of 9 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        232.8, actual    106 (0.46x)
-Testing collisions (high 24-35 bits) - Worst is 26 bits: 7405/14901 (0.50x)
-Testing collisions (high 12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected        232.8, actual    126 (0.54x)
-Testing collisions (low  24-35 bits) - Worst is 35 bits: 18/29 (0.62x)
-Testing collisions (low  12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing distribution - Worst bias is the 17-bit window at bit 55 - 0.099%
-
-Keyset 'Cyclic' - 8 cycles of 10 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        232.8, actual    127 (0.55x)
-Testing collisions (high 24-35 bits) - Worst is 33 bits: 66/116 (0.57x)
-Testing collisions (high 12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected        232.8, actual    104 (0.45x)
-Testing collisions (low  24-35 bits) - Worst is 27 bits: 3807/7450 (0.51x)
-Testing collisions (low  12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing distribution - Worst bias is the 17-bit window at bit  7 - 0.136%
-
-Keyset 'Cyclic' - 8 cycles of 11 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        232.8, actual    118 (0.51x)
-Testing collisions (high 24-35 bits) - Worst is 34 bits: 33/58 (0.57x)
-Testing collisions (high 12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected        232.8, actual    128 (0.55x)
-Testing collisions (low  24-35 bits) - Worst is 32 bits: 128/232 (0.55x)
-Testing collisions (low  12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing distribution - Worst bias is the 17-bit window at bit 38 - 0.115%
-
-Keyset 'Cyclic' - 8 cycles of 12 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        232.8, actual     91 (0.39x)
-Testing collisions (high 24-35 bits) - Worst is 27 bits: 3813/7450 (0.51x)
-Testing collisions (high 12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected        232.8, actual    102 (0.44x)
-Testing collisions (low  24-35 bits) - Worst is 25 bits: 14959/29802 (0.50x)
-Testing collisions (low  12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing distribution - Worst bias is the 17-bit window at bit 63 - 0.130%
-
-Keyset 'Cyclic' - 8 cycles of 16 bytes - 1000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected        232.8, actual    122 (0.52x)
-Testing collisions (high 24-35 bits) - Worst is 35 bits: 17/29 (0.58x)
-Testing collisions (high 12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected        232.8, actual    116 (0.50x)
-Testing collisions (low  24-35 bits) - Worst is 33 bits: 61/116 (0.52x)
-Testing collisions (low  12-bit) - Expected    1000000.0, actual 995904 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    1000000.0, actual 999744 (1.00x) (-256)
-Testing distribution - Worst bias is the 17-bit window at bit 19 - 0.122%
-
-
-[[[ Keyset 'TwoBytes' Tests ]]]
-
-Keyset 'TwoBytes' - up-to-4-byte keys, 652545 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected         99.1, actual     47 (0.47x)
-Testing collisions (high 23-34 bits) - Worst is 34 bits: 16/24 (0.65x)
-Testing collisions (high 12-bit) - Expected     652545.0, actual 648449 (0.99x) (-4096)
-Testing collisions (high  8-bit) - Expected     652545.0, actual 652289 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected         99.1, actual     46 (0.46x)
-Testing collisions (low  23-34 bits) - Worst is 33 bits: 28/49 (0.56x)
-Testing collisions (low  12-bit) - Expected     652545.0, actual 648449 (0.99x) (-4096)
-Testing collisions (low   8-bit) - Expected     652545.0, actual 652289 (1.00x) (-256)
-Testing distribution - Worst bias is the 16-bit window at bit 34 - 0.138%
-
-Keyset 'TwoBytes' - up-to-8-byte keys, 5471025 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       6969.1, actual   3548 (0.51x)
-Testing collisions (high 26-40 bits) - Worst is 40 bits: 15/27 (0.55x)
-Testing collisions (high 12-bit) - Expected    5471025.0, actual 5466929 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    5471025.0, actual 5470769 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       6969.1, actual   3378 (0.48x)
-Testing collisions (low  26-40 bits) - Worst is 39 bits: 34/54 (0.62x)
-Testing collisions (low  12-bit) - Expected    5471025.0, actual 5466929 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    5471025.0, actual 5470769 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 12 - 0.056%
-
-Keyset 'TwoBytes' - up-to-12-byte keys, 18616785 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      80695.5, actual  40607 (0.50x)
-Testing collisions (high 28-43 bits) - Worst is 42 bits: 42/78 (0.53x)
-Testing collisions (high 12-bit) - Expected   18616785.0, actual 18612689 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   18616785.0, actual 18616529 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      80695.5, actual  40085 (0.50x)
-Testing collisions (low  28-43 bits) - Worst is 36 bits: 2521/5043 (0.50x)
-Testing collisions (low  12-bit) - Expected   18616785.0, actual 18612689 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   18616785.0, actual 18616529 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 56 - 0.012%
-
-Keyset 'TwoBytes' - up-to-16-byte keys, 44251425 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected     455926.3, actual 227080 (0.50x)
-Testing collisions (high 29-46 bits) - Worst is 46 bits: 15/27 (0.54x)
-Testing collisions (high 12-bit) - Expected   44251425.0, actual 44247329 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   44251425.0, actual 44251169 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected     455926.3, actual 226684 (0.50x)
-Testing collisions (low  29-46 bits) - Worst is 33 bits: 113923/227963 (0.50x)
-Testing collisions (low  12-bit) - Expected   44251425.0, actual 44247329 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   44251425.0, actual 44251169 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit  0 - 0.007%
-
-Keyset 'TwoBytes' - up-to-20-byte keys, 86536545 total keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected    1743569.4, actual 866241 (0.50x)
-Testing collisions (high 30-48 bits) - Worst is 36 bits: 54556/108973 (0.50x)
-Testing collisions (high 12-bit) - Expected   86536545.0, actual 86532449 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   86536545.0, actual 86536289 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected    1743569.4, actual 865870 (0.50x)
-Testing collisions (low  30-48 bits) - Worst is 37 bits: 27421/54486 (0.50x)
-Testing collisions (low  12-bit) - Expected   86536545.0, actual 86532449 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   86536545.0, actual 86536289 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit  5 - 0.005%
-
-
-[[[ Keyset 'Text' Tests ]]]
-
-Keyset 'Text' - keys of form "Foo[XXXX]Bar" - 14776336 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      50836.3, actual  25649 (0.50x)
-Testing collisions (high 28-43 bits) - Worst is 34 bits: 6513/12709 (0.51x)
-Testing collisions (high 12-bit) - Expected   14776336.0, actual 14772240 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   14776336.0, actual 14776080 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      50836.3, actual  25314 (0.50x)
-Testing collisions (low  28-43 bits) - Worst is 40 bits: 108/198 (0.54x)
-Testing collisions (low  12-bit) - Expected   14776336.0, actual 14772240 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   14776336.0, actual 14776080 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 35 - 0.020%
-
-Keyset 'Text' - keys of form "FooBar[XXXX]" - 14776336 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      50836.3, actual  25522 (0.50x)
-Testing collisions (high 28-43 bits) - Worst is 43 bits: 15/24 (0.60x)
-Testing collisions (high 12-bit) - Expected   14776336.0, actual 14772240 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   14776336.0, actual 14776080 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      50836.3, actual  25294 (0.50x)
-Testing collisions (low  28-43 bits) - Worst is 41 bits: 61/99 (0.61x)
-Testing collisions (low  12-bit) - Expected   14776336.0, actual 14772240 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   14776336.0, actual 14776080 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit 37 - 0.017%
-
-Keyset 'Text' - keys of form "[XXXX]FooBar" - 14776336 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      50836.3, actual  25439 (0.50x)
-Testing collisions (high 28-43 bits) - Worst is 38 bits: 416/794 (0.52x)
-Testing collisions (high 12-bit) - Expected   14776336.0, actual 14772240 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   14776336.0, actual 14776080 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      50836.3, actual  25310 (0.50x)
-Testing collisions (low  28-43 bits) - Worst is 42 bits: 32/49 (0.64x)
-Testing collisions (low  12-bit) - Expected   14776336.0, actual 14772240 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   14776336.0, actual 14776080 (1.00x) (-256)
-Testing distribution - Worst bias is the 20-bit window at bit  2 - 0.025%
-
-
-[[[ Keyset 'Zeroes' Tests ]]]
-
-Keyset 'Zeroes' - 204800 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected          9.8, actual      5 (0.51x)
-Testing collisions (high 21-30 bits) - Worst is 29 bits: 41/78 (0.52x)
-Testing collisions (high 12-bit) - Expected     204800.0, actual 200704 (0.98x)
-Testing collisions (high  8-bit) - Expected     204800.0, actual 204544 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected          9.8, actual      4 (0.41x)
-Testing collisions (low  21-30 bits) - Worst is 25 bits: 643/1249 (0.51x)
-Testing collisions (low  12-bit) - Expected     204800.0, actual 200704 (0.98x)
-Testing collisions (low   8-bit) - Expected     204800.0, actual 204544 (1.00x) (-256)
-Testing distribution - Worst bias is the 15-bit window at bit 14 - 0.281%
-
-
-[[[ Keyset 'Seed' Tests ]]]
-
-Keyset 'Seed' - 5000000 keys
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       5820.8, actual   2880 (0.49x)
-Testing collisions (high 26-40 bits) - Worst is 37 bits: 105/181 (0.58x)
-Testing collisions (high 12-bit) - Expected    5000000.0, actual 4995904 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    5000000.0, actual 4999744 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       5820.8, actual   2957 (0.51x)
-Testing collisions (low  26-40 bits) - Worst is 33 bits: 1494/2910 (0.51x)
-Testing collisions (low  12-bit) - Expected    5000000.0, actual 4995904 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    5000000.0, actual 4999744 (1.00x) (-256)
-Testing distribution - Worst bias is the 19-bit window at bit 59 - 0.046%
-
-
-[[[ Keyset 'PerlinNoise' Tests ]]]
-
-Testing 16777216 coordinates (L2) :
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected      65536.0, actual  32715 (0.50x)
-Testing collisions (high 28-43 bits) - Worst is 42 bits: 46/63 (0.72x)
-Testing collisions (high 12-bit) - Expected   16777216.0, actual 16773120 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected   16777216.0, actual 16776960 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected      65536.0, actual  32752 (0.50x)
-Testing collisions (low  28-43 bits) - Worst is 41 bits: 69/127 (0.54x)
-Testing collisions (low  12-bit) - Expected   16777216.0, actual 16773120 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected   16777216.0, actual 16776960 (1.00x) (-256)
-
-
-[[[ Diff 'Differential' Tests ]]]
-
-Testing 8303632 up-to-5-bit differentials in 64-bit keys -> 64 bit hashes.
-1000 reps, 8303632000 total tests, expecting 0.00 random collisions..........
-0 total collisions, of which 0 single collisions were ignored
-
-Testing 11017632 up-to-4-bit differentials in 128-bit keys -> 64 bit hashes.
-1000 reps, 11017632000 total tests, expecting 0.00 random collisions..........
-0 total collisions, of which 0 single collisions were ignored
-
-Testing 2796416 up-to-3-bit differentials in 256-bit keys -> 64 bit hashes.
-1000 reps, 2796416000 total tests, expecting 0.00 random collisions..........
-0 total collisions, of which 0 single collisions were ignored
-
-
-[[[ DiffDist 'Differential Distribution' Tests ]]]
-
-Testing bit 0
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    516 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 19/31 (0.59x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    470 (0.46x)
-Testing collisions (low  25-37 bits) - Worst is 28 bits: 8112/16383 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 1
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    514 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 24/31 (0.75x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    507 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 19/31 (0.59x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 2
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    536 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 34 bits: 135/255 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    479 (0.47x)
-Testing collisions (low  25-37 bits) - Worst is 29 bits: 4068/8191 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 3
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    535 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 32 bits: 535/1023 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    533 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 31 bits: 1106/2047 (0.54x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 4
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    519 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 17/31 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    513 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 33 bits: 274/511 (0.54x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 5
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    520 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 32 bits: 520/1023 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    527 (0.51x)
-Testing collisions (low  25-37 bits) - Worst is 33 bits: 269/511 (0.53x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 6
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    519 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 41/63 (0.64x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    518 (0.51x)
-Testing collisions (low  25-37 bits) - Worst is 29 bits: 4236/8191 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 7
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    463 (0.45x)
-Testing collisions (high 25-37 bits) - Worst is 28 bits: 8190/16383 (0.50x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    497 (0.49x)
-Testing collisions (low  25-37 bits) - Worst is 34 bits: 134/255 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 8
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    513 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 21/31 (0.66x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    470 (0.46x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 32/63 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 9
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    527 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 37/63 (0.58x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    541 (0.53x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 19/31 (0.59x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 10
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    516 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 34 bits: 142/255 (0.55x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    470 (0.46x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 19/31 (0.59x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 11
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    500 (0.49x)
-Testing collisions (high 25-37 bits) - Worst is 31 bits: 1038/2047 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    526 (0.51x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 34/63 (0.53x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 12
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    503 (0.49x)
-Testing collisions (high 25-37 bits) - Worst is 35 bits: 83/127 (0.65x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    479 (0.47x)
-Testing collisions (low  25-37 bits) - Worst is 35 bits: 68/127 (0.53x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 13
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    515 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 40/63 (0.63x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    468 (0.46x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 33/63 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 14
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    465 (0.45x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 33/63 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    549 (0.54x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 20/31 (0.63x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 15
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    523 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 35/63 (0.55x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    537 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 35 bits: 71/127 (0.55x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 16
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    517 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 19/31 (0.59x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    484 (0.47x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 25/31 (0.78x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 17
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    504 (0.49x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 18/31 (0.56x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    487 (0.48x)
-Testing collisions (low  25-37 bits) - Worst is 35 bits: 68/127 (0.53x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 18
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    534 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 33 bits: 280/511 (0.55x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    519 (0.51x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 22/31 (0.69x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 19
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    571 (0.56x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 22/31 (0.69x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    493 (0.48x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 33/63 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 20
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    536 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 33 bits: 272/511 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    536 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 23/31 (0.72x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 21
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    464 (0.45x)
-Testing collisions (high 25-37 bits) - Worst is 35 bits: 67/127 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    536 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 35 bits: 81/127 (0.63x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 22
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    508 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 34 bits: 131/255 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    482 (0.47x)
-Testing collisions (low  25-37 bits) - Worst is 30 bits: 2054/4095 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 23
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    492 (0.48x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 20/31 (0.63x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    493 (0.48x)
-Testing collisions (low  25-37 bits) - Worst is 28 bits: 8176/16383 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 24
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    518 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 30 bits: 2102/4095 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    463 (0.45x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 33/63 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 25
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    532 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 32 bits: 532/1023 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    514 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 31 bits: 1032/2047 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 26
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    479 (0.47x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 40/63 (0.63x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    532 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 33 bits: 269/511 (0.53x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 27
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    511 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 33 bits: 272/511 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    450 (0.44x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 18/31 (0.56x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 28
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    538 (0.53x)
-Testing collisions (high 25-37 bits) - Worst is 34 bits: 138/255 (0.54x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    520 (0.51x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 19/31 (0.59x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 29
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    525 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 32 bits: 525/1023 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    516 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 23/31 (0.72x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 30
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    483 (0.47x)
-Testing collisions (high 25-37 bits) - Worst is 35 bits: 66/127 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    512 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 30 bits: 2100/4095 (0.51x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 31
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    503 (0.49x)
-Testing collisions (high 25-37 bits) - Worst is 27 bits: 16180/32767 (0.49x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    514 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 21/31 (0.66x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 32
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    557 (0.54x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 21/31 (0.66x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    502 (0.49x)
-Testing collisions (low  25-37 bits) - Worst is 30 bits: 2087/4095 (0.51x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 33
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    494 (0.48x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 17/31 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    481 (0.47x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 37/63 (0.58x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 34
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    520 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 22/31 (0.69x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    500 (0.49x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 21/31 (0.66x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 35
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    526 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 32 bits: 526/1023 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    507 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 34 bits: 134/255 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 36
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    530 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 20/31 (0.63x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    503 (0.49x)
-Testing collisions (low  25-37 bits) - Worst is 31 bits: 1034/2047 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 37
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    489 (0.48x)
-Testing collisions (high 25-37 bits) - Worst is 35 bits: 67/127 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    482 (0.47x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 36/63 (0.56x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 38
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    521 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 33 bits: 273/511 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    498 (0.49x)
-Testing collisions (low  25-37 bits) - Worst is 30 bits: 2041/4095 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 39
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    483 (0.47x)
-Testing collisions (high 25-37 bits) - Worst is 35 bits: 72/127 (0.56x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    529 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 20/31 (0.63x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 40
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    489 (0.48x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 33/63 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    499 (0.49x)
-Testing collisions (low  25-37 bits) - Worst is 29 bits: 4246/8191 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 41
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    536 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 34 bits: 137/255 (0.54x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    543 (0.53x)
-Testing collisions (low  25-37 bits) - Worst is 33 bits: 281/511 (0.55x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 42
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    513 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 31 bits: 1082/2047 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    494 (0.48x)
-Testing collisions (low  25-37 bits) - Worst is 34 bits: 131/255 (0.51x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 43
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    495 (0.48x)
-Testing collisions (high 25-37 bits) - Worst is 29 bits: 4158/8191 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    473 (0.46x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 16/31 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 44
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    479 (0.47x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 19/31 (0.59x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    541 (0.53x)
-Testing collisions (low  25-37 bits) - Worst is 35 bits: 74/127 (0.58x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 45
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    531 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 32 bits: 531/1023 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    513 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 18/31 (0.56x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 46
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    531 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 37/63 (0.58x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    510 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 17/31 (0.53x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 47
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    502 (0.49x)
-Testing collisions (high 25-37 bits) - Worst is 28 bits: 8325/16383 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    529 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 39/63 (0.61x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 48
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    512 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 35 bits: 69/127 (0.54x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    495 (0.48x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 33/63 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 49
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    551 (0.54x)
-Testing collisions (high 25-37 bits) - Worst is 36 bits: 38/63 (0.59x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    470 (0.46x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 37/63 (0.58x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 50
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    483 (0.47x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 22/31 (0.69x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    512 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 31 bits: 1030/2047 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 51
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    520 (0.51x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 17/31 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    510 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 31 bits: 1040/2047 (0.51x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 52
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    531 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 32 bits: 531/1023 (0.52x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    534 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 22/31 (0.69x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 53
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    546 (0.53x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 26/31 (0.81x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    483 (0.47x)
-Testing collisions (low  25-37 bits) - Worst is 35 bits: 65/127 (0.51x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 54
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    488 (0.48x)
-Testing collisions (high 25-37 bits) - Worst is 29 bits: 4102/8191 (0.50x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    501 (0.49x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 21/31 (0.66x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 55
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    509 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 34 bits: 130/255 (0.51x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    493 (0.48x)
-Testing collisions (low  25-37 bits) - Worst is 34 bits: 136/255 (0.53x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 56
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    528 (0.52x)
-Testing collisions (high 25-37 bits) - Worst is 33 bits: 274/511 (0.54x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    551 (0.54x)
-Testing collisions (low  25-37 bits) - Worst is 32 bits: 551/1023 (0.54x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 57
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    556 (0.54x)
-Testing collisions (high 25-37 bits) - Worst is 34 bits: 157/255 (0.61x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    489 (0.48x)
-Testing collisions (low  25-37 bits) - Worst is 30 bits: 2047/4095 (0.50x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 58
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    467 (0.46x)
-Testing collisions (high 25-37 bits) - Worst is 37 bits: 18/31 (0.56x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    523 (0.51x)
-Testing collisions (low  25-37 bits) - Worst is 36 bits: 39/63 (0.61x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 59
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    497 (0.49x)
-Testing collisions (high 25-37 bits) - Worst is 30 bits: 2031/4095 (0.50x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    530 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 33 bits: 278/511 (0.54x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 60
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    510 (0.50x)
-Testing collisions (high 25-37 bits) - Worst is 28 bits: 8176/16383 (0.50x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    517 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 19/31 (0.59x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 61
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    496 (0.48x)
-Testing collisions (high 25-37 bits) - Worst is 30 bits: 2041/4095 (0.50x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    529 (0.52x)
-Testing collisions (low  25-37 bits) - Worst is 32 bits: 529/1023 (0.52x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 62
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    552 (0.54x)
-Testing collisions (high 25-37 bits) - Worst is 32 bits: 552/1023 (0.54x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    507 (0.50x)
-Testing collisions (low  25-37 bits) - Worst is 37 bits: 18/31 (0.56x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-Testing bit 63
-Testing collisions ( 64-bit) - Expected    0.0, actual      0 (0.00x)
-Testing collisions (high 32-bit) - Expected       1024.0, actual    484 (0.47x)
-Testing collisions (high 25-37 bits) - Worst is 34 bits: 135/255 (0.53x)
-Testing collisions (high 12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (high  8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-Testing collisions (low  32-bit) - Expected       1024.0, actual    500 (0.49x)
-Testing collisions (low  25-37 bits) - Worst is 33 bits: 277/511 (0.54x)
-Testing collisions (low  12-bit) - Expected    2097152.0, actual 2093056 (1.00x) (-4096)
-Testing collisions (low   8-bit) - Expected    2097152.0, actual 2096896 (1.00x) (-256)
-
-
-[[[ MomentChi2 Tests ]]]
-
-Analyze hashes produced from a serie of linearly increasing numbers of 32-bit, using a step of 3 ...
-Target values to approximate : 38918200.000000 - 410450.000000
-Popcount 1 stats : 38918484.206651 - 410464.360454
-Popcount 0 stats : 38919365.145760 - 410461.861348
-MomentChi2 for bits 1 :  0.0983945
-MomentChi2 for bits 0 :   1.65373
-
-Derivative stats (transition from 2 consecutive values) :
-Popcount 1 stats : 38917342.700616 - 410405.257542
-Popcount 0 stats : 38919729.298852 - 410467.929221
-MomentChi2 for deriv b1 :  0.895362
-MomentChi2 for deriv b0 :   2.84895
-
-  Great !!
-
-
-
-Input vcode 0x00000001, Output vcode 0x00000001, Result vcode 0x00000001
-Verification value is 0x00000001 - Testing took 934.304636 seconds
--------------------------------------------------------------------------------
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/aes_hash.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/aes_hash.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/aes_hash.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/aes_hash.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,10 @@
 use crate::convert::*;
-use crate::operations::*;
 #[cfg(feature = "specialize")]
-use crate::HasherExt;
+use crate::fallback_hash::MULTIPLE;
+use crate::operations::*;
+use crate::RandomState;
 use core::hash::Hasher;
+use crate::random_state::PI;
 
 /// A `Hasher` for hashing an arbitrary stream of bytes.
 ///
@@ -49,6 +51,9 @@
     /// ```
     #[inline]
     pub fn new_with_keys(key1: u128, key2: u128) -> Self {
+        let pi: [u128; 2] = PI.convert();
+        let key1 = key1 ^ pi[0];
+        let key2 = key2 ^ pi[1];
         Self {
             enc: key1,
             sum: key2,
@@ -56,14 +61,24 @@
         }
     }
 
-    #[cfg(test)]
-    pub(crate) fn test_with_keys(key1: u64, key2: u64) -> AHasher {
-        use crate::random_state::scramble_keys;
-        let (k1, k2, k3, k4) = scramble_keys(key1, key2);
-        AHasher {
-            enc: [k1, k2].convert(),
-            sum: [k3, k4].convert(),
-            key: add_by_64s([k1, k2], [k3, k4]).convert(),
+    #[allow(unused)] // False positive
+    pub(crate) fn test_with_keys(key1: u128, key2: u128) -> Self {
+        Self {
+            enc: key1,
+            sum: key2,
+            key: key1 ^ key2,
+        }
+    }
+
+
+    #[inline]
+    pub(crate) fn from_random_state(rand_state: &RandomState) -> Self {
+        let key1 = [rand_state.k0, rand_state.k1].convert();
+        let key2 = [rand_state.k2, rand_state.k3].convert();
+        Self {
+            enc: key1,
+            sum: key2,
+            key: key1 ^ key2,
         }
     }
 
@@ -88,25 +103,19 @@
         self.enc = aesenc(self.enc, v2);
         self.sum = shuffle_and_add(self.sum, v2);
     }
-}
-
-#[cfg(feature = "specialize")]
-impl HasherExt for AHasher {
-    #[inline]
-    fn hash_u64(self, value: u64) -> u64 {
-        let mask = self.sum as u64;
-        let rot = (self.enc & 64) as u32;
-        folded_multiply(value ^ mask, crate::fallback_hash::MULTIPLE).rotate_left(rot)
-    }
 
     #[inline]
+    #[cfg(feature = "specialize")]
     fn short_finish(&self) -> u64 {
-        let buffer: [u64; 2] = self.enc.convert();
-        folded_multiply(buffer[0], buffer[1])
+        let combined = aesdec(self.sum, self.enc);
+        let result: [u64; 2] = aesenc(combined, combined).convert();
+        result[0]
     }
 }
 
-/// Provides methods to hash all of the primitive types.
+/// Provides [Hasher] methods to hash all of the primitive types.
+///
+/// [Hasher]: core::hash::Hasher
 impl Hasher for AHasher {
     #[inline]
     fn write_u8(&mut self, i: u8) {
@@ -129,11 +138,18 @@
     }
 
     #[inline]
+    #[cfg(any(target_pointer_width = "64", target_pointer_width = "32", target_pointer_width = "16"))]
     fn write_usize(&mut self, i: usize) {
         self.write_u64(i as u64);
     }
 
     #[inline]
+    #[cfg(target_pointer_width = "128")]
+    fn write_usize(&mut self, i: usize) {
+        self.write_u128(i as u128);
+    }
+
+    #[inline]
     fn write_u64(&mut self, i: u64) {
         self.write_u128(i as u128);
     }
@@ -145,22 +161,8 @@
         let length = data.len();
         self.add_in_length(length as u64);
         //A 'binary search' on sizes reduces the number of comparisons.
-        if data.len() < 8 {
-            let value: [u64; 2] = if data.len() >= 2 {
-                if data.len() >= 4 {
-                    //len 4-8
-                    [data.read_u32().0 as u64, data.read_last_u32() as u64]
-                } else {
-                    //len 2-3
-                    [data.read_u16().0 as u64, data[data.len() - 1] as u64]
-                }
-            } else {
-                if data.len() > 0 {
-                    [data[0] as u64, 0]
-                } else {
-                    [0, 0]
-                }
-            };
+        if data.len() <= 8 {
+            let value = read_small(data);
             self.hash_in(value.convert());
         } else {
             if data.len() > 32 {
@@ -217,6 +219,151 @@
     }
 }
 
+#[cfg(feature = "specialize")]
+pub(crate) struct AHasherU64 {
+    pub(crate) buffer: u64,
+    pub(crate) pad: u64,
+}
+
+/// A specialized hasher for only primitives under 64 bits.
+#[cfg(feature = "specialize")]
+impl Hasher for AHasherU64 {
+    #[inline]
+    fn finish(&self) -> u64 {
+        let rot = (self.pad & 64) as u32;
+        self.buffer.rotate_left(rot)
+    }
+
+    #[inline]
+    fn write(&mut self, _bytes: &[u8]) {
+        unreachable!("This should never be called")
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.buffer = folded_multiply(i ^ self.buffer, MULTIPLE);
+    }
+
+    #[inline]
+    fn write_u128(&mut self, _i: u128) {
+        unreachable!("This should never be called")
+    }
+
+    #[inline]
+    fn write_usize(&mut self, _i: usize) {
+        unimplemented!()
+    }
+}
+
+#[cfg(feature = "specialize")]
+pub(crate) struct AHasherFixed(pub AHasher);
+
+/// A specialized hasher for fixed size primitives larger than 64 bits.
+#[cfg(feature = "specialize")]
+impl Hasher for AHasherFixed {
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.0.short_finish()
+    }
+
+    #[inline]
+    fn write(&mut self, bytes: &[u8]) {
+        self.0.write(bytes)
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.0.write_u64(i);
+    }
+
+    #[inline]
+    fn write_u128(&mut self, i: u128) {
+        self.0.write_u128(i);
+    }
+
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.0.write_usize(i);
+    }
+}
+
+#[cfg(feature = "specialize")]
+pub(crate) struct AHasherStr(pub AHasher);
+
+/// A specialized hasher for strings
+/// Note that the other types don't panic because the hash impl for String tacks on an unneeded call. (As does vec)
+#[cfg(feature = "specialize")]
+impl Hasher for AHasherStr {
+    #[inline]
+    fn finish(&self) -> u64 {
+        let result : [u64; 2] = self.0.enc.convert();
+        result[0]
+    }
+
+    #[inline]
+    fn write(&mut self, bytes: &[u8]) {
+        if bytes.len() > 8 {
+            self.0.write(bytes);
+            self.0.enc = aesdec(self.0.sum, self.0.enc);
+            self.0.enc = aesenc(aesenc(self.0.enc, self.0.key), self.0.enc);
+        } else {
+            self.0.add_in_length(bytes.len() as u64);
+            let value = read_small(bytes).convert();
+            self.0.sum = shuffle_and_add(self.0.sum, value);
+            self.0.enc = aesdec(self.0.sum, self.0.enc);
+            self.0.enc = aesenc(aesenc(self.0.enc, self.0.key), self.0.enc);
+        }
+    }
+
+    #[inline]
+    fn write_u8(&mut self, _i: u8) {}
+
+    #[inline]
+    fn write_u16(&mut self, _i: u16) {}
+
+    #[inline]
+    fn write_u32(&mut self, _i: u32) {}
+
+    #[inline]
+    fn write_u64(&mut self, _i: u64) {}
+
+    #[inline]
+    fn write_u128(&mut self, _i: u128) {}
+
+    #[inline]
+    fn write_usize(&mut self, _i: usize) {}
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -226,7 +373,7 @@
     use std::hash::{BuildHasher, Hasher};
     #[test]
     fn test_sanity() {
-        let mut hasher = RandomState::with_seeds(192837465, 1234567890).build_hasher();
+        let mut hasher = RandomState::with_seeds(1, 2, 3, 4).build_hasher();
         hasher.write_u64(0);
         let h1 = hasher.finish();
         hasher.write(&[1, 0, 0, 0, 0, 0, 0, 0]);
@@ -289,3 +436,4 @@
         assert_eq!(bytes, 0x6464646464646464);
     }
 }
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/convert.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/convert.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/convert.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/convert.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,6 +47,12 @@
 convert!(u128, [u32; 4]);
 convert!(u128, [u16; 8]);
 convert!(u128, [u8; 16]);
+convert!([u64; 8], [u32; 16]);
+convert!([u64; 8], [u16; 32]);
+convert!([u64; 8], [u8; 64]);
+convert!([u64; 4], [u32; 8]);
+convert!([u64; 4], [u16; 16]);
+convert!([u64; 4], [u8; 32]);
 convert!([u64; 2], [u32; 4]);
 convert!([u64; 2], [u16; 8]);
 convert!([u64; 2], [u8; 16]);
@@ -62,6 +68,7 @@
 convert!(u32, [u8; 4]);
 convert!([u16; 2], [u8; 4]);
 convert!(u16, [u8; 2]);
+convert!([[u64; 4]; 2], [u8; 64]);
 
 convert!([f64; 2], [u8; 16]);
 convert!([f32; 4], [u8; 16]);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/fallback_hash.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/fallback_hash.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/fallback_hash.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/fallback_hash.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,8 @@
 use crate::convert::*;
 use crate::operations::folded_multiply;
-#[cfg(feature = "specialize")]
-use crate::HasherExt;
+use crate::operations::read_small;
+use crate::random_state::PI;
+use crate::RandomState;
 use core::hash::Hasher;
 
 ///This constant come from Kunth's prng (Empirically it works better than those from splitmix32).
@@ -31,22 +32,34 @@
     #[inline]
     #[allow(dead_code)] // Is not called if non-fallback hash is used.
     pub fn new_with_keys(key1: u128, key2: u128) -> AHasher {
+        let pi: [u128; 2] = PI.convert();
+        let key1: [u64; 2] = (key1 ^ pi[0]).convert();
+        let key2: [u64; 2] = (key2 ^ pi[1]).convert();
         AHasher {
-            buffer: key1 as u64,
-            pad: key2 as u64,
-            extra_keys: (key1 ^ key2).convert(),
+            buffer: key1[0],
+            pad: key1[1],
+            extra_keys: key2,
         }
     }
 
-    #[cfg(test)]
+    #[allow(unused)] // False positive
+    pub(crate) fn test_with_keys(key1: u128, key2: u128) -> Self {
+        let key1: [u64; 2] = key1.convert();
+        let key2: [u64; 2] = key2.convert();
+        Self {
+            buffer: key1[0],
+            pad: key1[1],
+            extra_keys: key2,
+        }
+    }
+
+    #[inline]
     #[allow(dead_code)] // Is not called if non-fallback hash is used.
-    pub(crate) fn test_with_keys(key1: u64, key2: u64) -> AHasher {
-        use crate::random_state::scramble_keys;
-        let (k1, k2, k3, k4) = scramble_keys(key1, key2);
+    pub(crate) fn from_random_state(rand_state: &RandomState) -> AHasher {
         AHasher {
-            buffer: k1,
-            pad: k2,
-            extra_keys: [k3, k4],
+            buffer: rand_state.k0,
+            pad: rand_state.k1,
+            extra_keys: [rand_state.k2, rand_state.k3],
         }
     }
 
@@ -80,10 +93,19 @@
     /// attacker somehow knew part of (but not all) the contents of the buffer before hand,
     /// they would not be able to predict any of the bits in the buffer at the end.
     #[inline(always)]
+    #[cfg(feature = "folded_multiply")]
     fn update(&mut self, new_data: u64) {
         self.buffer = folded_multiply(new_data ^ self.buffer, MULTIPLE);
     }
 
+    #[inline(always)]
+    #[cfg(not(feature = "folded_multiply"))]
+    fn update(&mut self, new_data: u64) {
+        let d1 = (new_data ^ self.buffer).wrapping_mul(MULTIPLE);
+        self.pad = (self.pad ^ d1).rotate_left(8).wrapping_mul(MULTIPLE);
+        self.buffer = (self.buffer ^ self.pad).rotate_left(24);
+    }
+
     /// Similar to the above this function performs an update using a "folded multiply".
     /// However it takes in 128 bits of data instead of 64. Both halves must be masked.
     ///
@@ -96,28 +118,31 @@
     /// can't be changed by the same set of input bits. To cancel this sequence with subsequent input would require
     /// knowing the keys.
     #[inline(always)]
+    #[cfg(feature = "folded_multiply")]
     fn large_update(&mut self, new_data: u128) {
         let block: [u64; 2] = new_data.convert();
         let combined = folded_multiply(block[0] ^ self.extra_keys[0], block[1] ^ self.extra_keys[1]);
-        self.buffer = (combined.wrapping_add(self.buffer) ^ self.pad).rotate_left(ROT);
+        self.buffer = (self.buffer.wrapping_add(self.pad) ^ combined).rotate_left(ROT);
     }
-}
 
-#[cfg(feature = "specialize")]
-impl HasherExt for AHasher {
-    #[inline]
-    fn hash_u64(self, value: u64) -> u64 {
-        let rot = (self.pad & 64) as u32;
-        folded_multiply(value ^ self.buffer, MULTIPLE).rotate_left(rot)
+    #[inline(always)]
+    #[cfg(not(feature = "folded_multiply"))]
+    fn large_update(&mut self, new_data: u128) {
+        let block: [u64; 2] = new_data.convert();
+        self.update(block[0] ^ self.extra_keys[0]);
+        self.update(block[1] ^ self.extra_keys[1]);
     }
 
     #[inline]
+    #[cfg(feature = "specialize")]
     fn short_finish(&self) -> u64 {
         self.buffer.wrapping_add(self.pad)
     }
 }
 
-/// Provides methods to hash all of the primitive types.
+/// Provides [Hasher] methods to hash all of the primitive types.
+///
+/// [Hasher]: core::hash::Hasher
 impl Hasher for AHasher {
     #[inline]
     fn write_u8(&mut self, i: u8) {
@@ -141,17 +166,22 @@
 
     #[inline]
     fn write_u128(&mut self, i: u128) {
-        let data: [u64; 2] = i.convert();
-        self.update(data[0]);
-        self.update(data[1]);
+        self.large_update(i);
     }
 
     #[inline]
+    #[cfg(any(target_pointer_width = "64", target_pointer_width = "32", target_pointer_width = "16"))]
     fn write_usize(&mut self, i: usize) {
         self.write_u64(i as u64);
     }
 
     #[inline]
+    #[cfg(target_pointer_width = "128")]
+    fn write_usize(&mut self, i: usize) {
+        self.write_u128(i as u128);
+    }
+
+    #[inline]
     #[allow(clippy::collapsible_if)]
     fn write(&mut self, input: &[u8]) {
         let mut data = input;
@@ -172,26 +202,165 @@
                 self.large_update([data.read_u64().0, data.read_last_u64()].convert());
             }
         } else {
-            if data.len() >= 2 {
-                if data.len() >= 4 {
-                    let block = [data.read_u32().0 as u64, data.read_last_u32() as u64];
-                    self.large_update(block.convert());
-                } else {
-                    let value = [data.read_u16().0 as u32, data[data.len() - 1] as u32];
-                    self.update(value.convert());
-                }
-            } else {
-                if data.len() > 0 {
-                    self.update(data[0] as u64);
-                }
-            }
+            let value = read_small(data);
+            self.large_update(value.convert());
         }
     }
+
     #[inline]
+    #[cfg(feature = "folded_multiply")]
     fn finish(&self) -> u64 {
         let rot = (self.buffer & 63) as u32;
         folded_multiply(self.buffer, self.pad).rotate_left(rot)
     }
+
+    #[inline]
+    #[cfg(not(feature = "folded_multiply"))]
+    fn finish(&self) -> u64 {
+        let rot = (self.buffer & 63) as u32;
+        (self.buffer.wrapping_mul(MULTIPLE) ^ self.pad).rotate_left(rot)
+    }
+}
+
+#[cfg(feature = "specialize")]
+pub(crate) struct AHasherU64 {
+    pub(crate) buffer: u64,
+    pub(crate) pad: u64,
+}
+
+/// A specialized hasher for only primitives under 64 bits.
+#[cfg(feature = "specialize")]
+impl Hasher for AHasherU64 {
+    #[inline]
+    fn finish(&self) -> u64 {
+        let rot = (self.pad & 64) as u32;
+        self.buffer.rotate_left(rot)
+    }
+
+    #[inline]
+    fn write(&mut self, _bytes: &[u8]) {
+        unreachable!("This should never be called")
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.buffer = folded_multiply(i ^ self.buffer, MULTIPLE);
+    }
+
+    #[inline]
+    fn write_u128(&mut self, _i: u128) {
+        unreachable!("This should never be called")
+    }
+
+    #[inline]
+    fn write_usize(&mut self, _i: usize) {
+        unimplemented!()
+    }
+}
+
+#[cfg(feature = "specialize")]
+pub(crate) struct AHasherFixed(pub AHasher);
+
+/// A specialized hasher for fixed size primitives larger than 64 bits.
+#[cfg(feature = "specialize")]
+impl Hasher for AHasherFixed {
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.0.short_finish()
+    }
+
+    #[inline]
+    fn write(&mut self, bytes: &[u8]) {
+        self.0.write(bytes)
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.write_u64(i as u64);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.0.write_u64(i);
+    }
+
+    #[inline]
+    fn write_u128(&mut self, i: u128) {
+        self.0.write_u128(i);
+    }
+
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.0.write_usize(i);
+    }
+}
+
+#[cfg(feature = "specialize")]
+pub(crate) struct AHasherStr(pub AHasher);
+
+/// A specialized hasher for a single string
+/// Note that the other types don't panic because the hash impl for String tacks on an unneeded call. (As does vec)
+#[cfg(feature = "specialize")]
+impl Hasher for AHasherStr {
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.0.finish()
+    }
+
+    #[inline]
+    fn write(&mut self, bytes: &[u8]) {
+        if bytes.len() > 8 {
+            self.0.write(bytes)
+        } else {
+            let value = read_small(bytes);
+            self.0.buffer = folded_multiply(value[0] ^ self.0.buffer,
+                                           value[1] ^ self.0.extra_keys[1]);
+            self.0.pad = self.0.pad.wrapping_add(bytes.len() as u64);
+        }
+    }
+
+    #[inline]
+    fn write_u8(&mut self, _i: u8) {}
+
+    #[inline]
+    fn write_u16(&mut self, _i: u16) {}
+
+    #[inline]
+    fn write_u32(&mut self, _i: u32) {}
+
+    #[inline]
+    fn write_u64(&mut self, _i: u64) {}
+
+    #[inline]
+    fn write_u128(&mut self, _i: u128) {}
+
+    #[inline]
+    fn write_usize(&mut self, _i: usize) {}
 }
 
 #[cfg(test)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/hash_map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/hash_map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/hash_map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/hash_map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,28 +6,43 @@
 use std::ops::{Deref, DerefMut, Index};
 use std::panic::UnwindSafe;
 
+#[cfg(feature = "serde")]
+use serde::{
+    de::{Deserialize, Deserializer},
+    ser::{Serialize, Serializer},
+};
+
+use crate::RandomState;
+
 /// A [`HashMap`](std::collections::HashMap) using [`RandomState`](crate::RandomState) to hash the items.
-/// Requires the `std` feature to be enabled.
+/// (Requires the `std` feature to be enabled.)
 #[derive(Clone)]
 pub struct AHashMap<K, V, S = crate::RandomState>(HashMap<K, V, S>);
 
-impl<K, V, S> AHashMap<K, V, S>
-where
-    K: Hash + Eq,
-    S: BuildHasher + Default,
-{
+impl<K, V> From<HashMap<K, V, crate::RandomState>> for AHashMap<K, V> {
+    fn from(item: HashMap<K, V, crate::RandomState>) -> Self {
+        AHashMap(item)
+    }
+}
+
+impl<K, V> Into<HashMap<K, V, crate::RandomState>> for AHashMap<K, V> {
+    fn into(self) -> HashMap<K, V, crate::RandomState> {
+        self.0
+    }
+}
+
+impl<K, V> AHashMap<K, V, RandomState> {
     pub fn new() -> Self {
-        AHashMap(HashMap::with_hasher(S::default()))
+        AHashMap(HashMap::with_hasher(RandomState::default()))
     }
 
     pub fn with_capacity(capacity: usize) -> Self {
-        AHashMap(HashMap::with_capacity_and_hasher(capacity, S::default()))
+        AHashMap(HashMap::with_capacity_and_hasher(capacity, RandomState::default()))
     }
 }
 
 impl<K, V, S> AHashMap<K, V, S>
 where
-    K: Hash + Eq,
     S: BuildHasher,
 {
     pub fn with_hasher(hash_builder: S) -> Self {
@@ -39,6 +54,144 @@
     }
 }
 
+impl<K, V, S> AHashMap<K, V, S>
+where
+    K: Hash + Eq,
+    S: BuildHasher,
+{
+    /// Returns a reference to the value corresponding to the key.
+    ///
+    /// The key may be any borrowed form of the map's key type, but
+    /// [`Hash`] and [`Eq`] on the borrowed form *must* match those for
+    /// the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::collections::HashMap;
+    ///
+    /// let mut map = HashMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.get(&1), Some(&"a"));
+    /// assert_eq!(map.get(&2), None);
+    /// ```
+    #[inline]
+    pub fn get<Q: ?Sized>(&self, k: &Q) -> Option<&V>
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.get(k)
+    }
+
+    /// Returns the key-value pair corresponding to the supplied key.
+    ///
+    /// The supplied key may be any borrowed form of the map's key type, but
+    /// [`Hash`] and [`Eq`] on the borrowed form *must* match those for
+    /// the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::collections::HashMap;
+    ///
+    /// let mut map = HashMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.get_key_value(&1), Some((&1, &"a")));
+    /// assert_eq!(map.get_key_value(&2), None);
+    /// ```
+    #[inline]
+    pub fn get_key_value<Q: ?Sized>(&self, k: &Q) -> Option<(&K, &V)>
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.get_key_value(k)
+    }
+
+    /// Returns a mutable reference to the value corresponding to the key.
+    ///
+    /// The key may be any borrowed form of the map's key type, but
+    /// [`Hash`] and [`Eq`] on the borrowed form *must* match those for
+    /// the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::collections::HashMap;
+    ///
+    /// let mut map = HashMap::new();
+    /// map.insert(1, "a");
+    /// if let Some(x) = map.get_mut(&1) {
+    ///     *x = "b";
+    /// }
+    /// assert_eq!(map[&1], "b");
+    /// ```
+    #[inline]
+    pub fn get_mut<Q: ?Sized>(&mut self, k: &Q) -> Option<&mut V>
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.get_mut(k)
+    }
+
+    /// Inserts a key-value pair into the map.
+    ///
+    /// If the map did not have this key present, [`None`] is returned.
+    ///
+    /// If the map did have this key present, the value is updated, and the old
+    /// value is returned. The key is not updated, though; this matters for
+    /// types that can be `==` without being identical. See the [module-level
+    /// documentation] for more.
+    ///
+    /// [module-level documentation]: crate::collections#insert-and-complex-keys
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::collections::HashMap;
+    ///
+    /// let mut map = HashMap::new();
+    /// assert_eq!(map.insert(37, "a"), None);
+    /// assert_eq!(map.is_empty(), false);
+    ///
+    /// map.insert(37, "b");
+    /// assert_eq!(map.insert(37, "c"), Some("b"));
+    /// assert_eq!(map[&37], "c");
+    /// ```
+    #[inline]
+    pub fn insert(&mut self, k: K, v: V) -> Option<V> {
+        self.0.insert(k, v)
+    }
+
+    /// Removes a key from the map, returning the value at the key if the key
+    /// was previously in the map.
+    ///
+    /// The key may be any borrowed form of the map's key type, but
+    /// [`Hash`] and [`Eq`] on the borrowed form *must* match those for
+    /// the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::collections::HashMap;
+    ///
+    /// let mut map = HashMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.remove(&1), Some("a"));
+    /// assert_eq!(map.remove(&1), None);
+    /// ```
+    #[inline]
+    pub fn remove<Q: ?Sized>(&mut self, k: &Q) -> Option<V>
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.remove(k)
+    }
+}
+
 impl<K, V, S> Deref for AHashMap<K, V, S> {
     type Target = HashMap<K, V, S>;
     fn deref(&self) -> &Self::Target {
@@ -99,7 +252,7 @@
 
 impl<K, V, S> Debug for AHashMap<K, V, S>
 where
-    K: Eq + Hash + Debug,
+    K: Debug,
     V: Debug,
     S: BuildHasher,
 {
@@ -165,13 +318,54 @@
     }
 }
 
-impl<K, V, S> Default for AHashMap<K, V, S>
+impl<K, V> Default for AHashMap<K, V, RandomState> {
+    #[inline]
+    fn default() -> AHashMap<K, V, RandomState> {
+        AHashMap::new()
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<K, V> Serialize for AHashMap<K, V>
 where
-    K: Eq + Hash,
-    S: BuildHasher + Default,
+    K: Serialize + Eq + Hash,
+    V: Serialize,
 {
-    #[inline]
-    fn default() -> AHashMap<K, V, S> {
-        AHashMap::with_hasher(Default::default())
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        self.deref().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, K, V> Deserialize<'de> for AHashMap<K, V>
+where
+    K: Deserialize<'de> + Eq + Hash,
+    V: Deserialize<'de>,
+{
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let hash_map = HashMap::deserialize(deserializer);
+        hash_map.map(|hash_map| Self(hash_map))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    #[test]
+    fn test_borrow() {
+        let mut map: AHashMap<String, String> = AHashMap::new();
+        map.insert("foo".to_string(), "Bar".to_string());
+        map.insert("Bar".to_string(), map.get("foo").unwrap().to_owned());
+    }
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn test_serde() {
+        let mut map = AHashMap::new();
+        map.insert("for".to_string(), 0);
+        map.insert("bar".to_string(), 1);
+        let serialization = serde_json::to_string(&map).unwrap();
+        let deserialization: AHashMap<String, u64> = serde_json::from_str(&serialization).unwrap();
+        assert_eq!(deserialization, map);
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/hash_quality_test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/hash_quality_test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/hash_quality_test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/hash_quality_test.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,3 @@
-use crate::{CallHasher, HasherExt};
 use core::hash::{Hash, Hasher};
 use std::collections::HashMap;
 
@@ -83,8 +82,8 @@
         if let Some(value) = map.get(&hash) {
             assert_eq!(
                 value, &array,
-                "Found a collision between {:x?} and {:x?}",
-                value, &array
+                "Found a collision between {:x?} and {:x?}. Hash: {:x?}",
+                value, &array, &hash
             );
         } else {
             map.insert(hash, array);
@@ -93,7 +92,7 @@
     assert_eq!(2396744, map.len());
 }
 
-fn test_keys_change_output<T: HasherExt>(constructor: impl Fn(u64, u64) -> T) {
+fn test_keys_change_output<T: Hasher>(constructor: impl Fn(u128, u128) -> T) {
     let mut a = constructor(1, 1);
     let mut b = constructor(1, 2);
     let mut c = constructor(2, 1);
@@ -110,48 +109,48 @@
     assert_sufficiently_different(c.finish(), d.finish(), 1);
 }
 
-fn test_input_affect_every_byte<T: HasherExt>(constructor: impl Fn(u64, u64) -> T) {
-    let base = 0.get_hash(constructor(0, 0));
+fn test_input_affect_every_byte<T: Hasher>(constructor: impl Fn(u128, u128) -> T) {
+    let base = hash_with(&0, constructor(0, 0));
     for shift in 0..16 {
         let mut alternitives = vec![];
         for v in 0..256 {
             let input = (v as u128) << (shift * 8);
             let hasher = constructor(0, 0);
-            alternitives.push(input.get_hash(hasher));
+            alternitives.push(hash_with(&input, hasher));
         }
-        assert_each_byte_differs(base, alternitives);
+        assert_each_byte_differs(shift, base, alternitives);
     }
 }
 
 ///Ensures that for every bit in the output there is some value for each byte in the key that flips it.
-fn test_keys_affect_every_byte<H: Hash, T: HasherExt>(item: H, constructor: impl Fn(u64, u64) -> T) {
-    let base = item.get_hash(constructor(0, 0));
-    for shift in 0..8 {
+fn test_keys_affect_every_byte<H: Hash, T: Hasher>(item: H, constructor: impl Fn(u128, u128) -> T) {
+    let base = hash_with(&item, constructor(0, 0));
+    for shift in 0..16 {
         let mut alternitives1 = vec![];
         let mut alternitives2 = vec![];
         for v in 0..256 {
-            let input = (v as u64) << (shift * 8);
+            let input = (v as u128) << (shift * 8);
             let hasher1 = constructor(input, 0);
             let hasher2 = constructor(0, input);
-            let h1 = item.get_hash(hasher1);
-            let h2 = item.get_hash(hasher2);
+            let h1 = hash_with(&item, hasher1);
+            let h2 = hash_with(&item, hasher2);
             alternitives1.push(h1);
             alternitives2.push(h2);
         }
-        assert_each_byte_differs(base, alternitives1);
-        assert_each_byte_differs(base, alternitives2);
+        assert_each_byte_differs(shift, base, alternitives1);
+        assert_each_byte_differs(shift, base, alternitives2);
     }
 }
 
-fn assert_each_byte_differs(base: u64, alternitives: Vec<u64>) {
+fn assert_each_byte_differs(num: u64, base: u64, alternitives: Vec<u64>) {
     let mut changed_bits = 0_u64;
     for alternitive in alternitives {
         changed_bits |= base ^ alternitive
     }
-    assert_eq!(core::u64::MAX, changed_bits, "Bits changed: {:x}", changed_bits);
+    assert_eq!(core::u64::MAX, changed_bits, "Bits changed: {:x} on num: {:?}", changed_bits, num);
 }
 
-fn test_finish_is_consistent<T: Hasher>(constructor: impl Fn(u64, u64) -> T) {
+fn test_finish_is_consistent<T: Hasher>(constructor: impl Fn(u128, u128) -> T) {
     let mut hasher = constructor(1, 2);
     "Foo".hash(&mut hasher);
     let a = hasher.finish();
@@ -159,8 +158,8 @@
     assert_eq!(a, b);
 }
 
-fn test_single_key_bit_flip<T: Hasher>(constructor: impl Fn(u64, u64) -> T) {
-    for bit in 0..64 {
+fn test_single_key_bit_flip<T: Hasher>(constructor: impl Fn(u128, u128) -> T) {
+    for bit in 0..128 {
         let mut a = constructor(0, 0);
         let mut b = constructor(0, 1 << bit);
         let mut c = constructor(1 << bit, 0);
@@ -191,7 +190,7 @@
     }
 }
 
-fn test_all_bytes_matter<T: HasherExt>(hasher: impl Fn() -> T) {
+fn test_all_bytes_matter<T: Hasher>(hasher: impl Fn() -> T) {
     let mut item = vec![0; 256];
     let base_hash = hash(&item, &hasher);
     for pos in 0..256 {
@@ -202,7 +201,7 @@
     }
 }
 
-fn test_no_pair_collisions<T: HasherExt>(hasher: impl Fn() -> T) {
+fn test_no_pair_collisions<T: Hasher>(hasher: impl Fn() -> T) {
     let base = [0_u64, 0_u64];
     let base_hash = hash(&base, &hasher);
     for bitpos1 in 0..64 {
@@ -227,11 +226,18 @@
     }
 }
 
-fn hash<H: Hash, T: HasherExt>(b: &H, hasher: &dyn Fn() -> T) -> u64 {
-    b.get_hash(hasher())
+fn hash<H: Hash, T: Hasher>(b: &H, hash_builder: &dyn Fn() -> T) -> u64 {
+    let mut hasher = hash_builder();
+    b.hash(&mut hasher);
+    hasher.finish()
+}
+
+fn hash_with<H: Hash, T: Hasher>(b: &H, mut hasher: T) -> u64 {
+    b.hash(&mut hasher);
+    hasher.finish()
 }
 
-fn test_single_bit_flip<T: HasherExt>(hasher: impl Fn() -> T) {
+fn test_single_bit_flip<T: Hasher>(hasher: impl Fn() -> T) {
     let size = 32;
     let compare_value = hash(&0u32, &hasher);
     for pos in 0..size {
@@ -248,6 +254,7 @@
     let compare_value = hash(&0u128, &hasher);
     for pos in 0..size {
         let test_value = hash(&(1u128 << pos), &hasher);
+        dbg!(compare_value, test_value);
         assert_sufficiently_different(compare_value, test_value, 2);
     }
 }
@@ -266,11 +273,11 @@
                 let (same_bytes, same_nibbles) = count_same_bytes_and_nibbles(value, long.finish());
                 assert!(
                     same_bytes <= 3,
-                    format!("{} bytes of {} -> {:x} vs {:x}", num, c, value, long.finish())
+                    "{} bytes of {} -> {:x} vs {:x}", num, c, value, long.finish()
                 );
                 assert!(
                     same_nibbles <= 8,
-                    format!("{} bytes of {} -> {:x} vs {:x}", num, c, value, long.finish())
+                    "{} bytes of {} -> {:x} vs {:x}", num, c, value, long.finish()
                 );
                 let flipped_bits = (value ^ long.finish()).count_ones();
                 assert!(flipped_bits > 10);
@@ -285,25 +292,21 @@
                     let (same_bytes, same_nibbles) = count_same_bytes_and_nibbles(value, long.finish());
                     assert!(
                         same_bytes <= 3,
-                        format!(
-                            "string {:?} + {} bytes of {} -> {:x} vs {:x}",
-                            string,
-                            num,
-                            c,
-                            value,
-                            long.finish()
-                        )
+                        "string {:?} + {} bytes of {} -> {:x} vs {:x}",
+                        string,
+                        num,
+                        c,
+                        value,
+                        long.finish()
                     );
                     assert!(
                         same_nibbles <= 8,
-                        format!(
-                            "string {:?} + {} bytes of {} -> {:x} vs {:x}",
-                            string,
-                            num,
-                            c,
-                            value,
-                            long.finish()
-                        )
+                        "string {:?} + {} bytes of {} -> {:x} vs {:x}",
+                        string,
+                        num,
+                        c,
+                        value,
+                        long.finish()
                     );
                     let flipped_bits = (value ^ long.finish()).count_ones();
                     assert!(flipped_bits > 10);
@@ -320,44 +323,46 @@
 
     #[test]
     fn fallback_single_bit_flip() {
-        test_single_bit_flip(|| AHasher::test_with_keys(0, 0))
+        test_single_bit_flip(|| AHasher::new_with_keys(0, 0))
     }
 
     #[test]
     fn fallback_single_key_bit_flip() {
-        test_single_key_bit_flip(AHasher::test_with_keys)
+        test_single_key_bit_flip(AHasher::new_with_keys)
     }
 
     #[test]
     fn fallback_all_bytes_matter() {
-        test_all_bytes_matter(|| AHasher::test_with_keys(0, 0));
+        test_all_bytes_matter(|| AHasher::new_with_keys(0, 0));
     }
 
     #[test]
     fn fallback_test_no_pair_collisions() {
-        test_no_pair_collisions(|| AHasher::test_with_keys(0, 0));
+        test_no_pair_collisions(|| AHasher::new_with_keys(0, 0));
     }
 
     #[test]
     fn fallback_test_no_full_collisions() {
-        test_no_full_collisions(|| AHasher::test_with_keys(12345, 67890));
+        test_no_full_collisions(|| AHasher::new_with_keys(0, 0));
     }
 
     #[test]
     fn fallback_keys_change_output() {
-        test_keys_change_output(AHasher::test_with_keys);
+        test_keys_change_output(AHasher::new_with_keys);
     }
 
     #[test]
     fn fallback_input_affect_every_byte() {
-        test_input_affect_every_byte(AHasher::test_with_keys);
+        test_input_affect_every_byte(AHasher::new_with_keys);
     }
 
     #[test]
     fn fallback_keys_affect_every_byte() {
-        test_keys_affect_every_byte(0, AHasher::test_with_keys);
-        test_keys_affect_every_byte("", AHasher::test_with_keys);
-        test_keys_affect_every_byte((0, 0), AHasher::test_with_keys);
+        //For fallback second key is not used in every hash.
+        #[cfg(all(not(feature = "specialize"), feature = "folded_multiply"))]
+            test_keys_affect_every_byte(0, |a, b| AHasher::new_with_keys(a ^ b, a));
+        test_keys_affect_every_byte("", |a, b| AHasher::new_with_keys(a ^ b, a));
+        test_keys_affect_every_byte((0, 0), |a, b| AHasher::new_with_keys(a ^ b, a));
     }
 
     #[test]
@@ -367,10 +372,10 @@
 
     #[test]
     fn fallback_padding_doesnot_collide() {
-        test_padding_doesnot_collide(|| AHasher::test_with_keys(0, 0));
-        test_padding_doesnot_collide(|| AHasher::test_with_keys(0, 1));
-        test_padding_doesnot_collide(|| AHasher::test_with_keys(1, 0));
-        test_padding_doesnot_collide(|| AHasher::test_with_keys(1, 1));
+        test_padding_doesnot_collide(|| AHasher::new_with_keys(0, 0));
+        test_padding_doesnot_collide(|| AHasher::new_with_keys(0, 2));
+        test_padding_doesnot_collide(|| AHasher::new_with_keys(2, 0));
+        test_padding_doesnot_collide(|| AHasher::new_with_keys(2, 2));
     }
 }
 
@@ -382,14 +387,16 @@
     use crate::hash_quality_test::*;
     use std::hash::{Hash, Hasher};
 
-    const BAD_KEY: u64 = 0x5252_5252_5252_5252; //This encrypts to 0.
-    const BAD_KEY2: u64 = 0x6363_6363_6363_6363; //This decrypts to 0.
+    //This encrypts to 0.
+    const BAD_KEY2: u128 = 0x6363_6363_6363_6363_6363_6363_6363_6363;
+    //This decrypts to 0.
+    const BAD_KEY: u128 = 0x5252_5252_5252_5252_5252_5252_5252_5252;
 
     #[test]
     fn test_single_bit_in_byte() {
-        let mut hasher1 = AHasher::new_with_keys(0, 0);
+        let mut hasher1 = AHasher::test_with_keys(0, 0);
         8_u32.hash(&mut hasher1);
-        let mut hasher2 = AHasher::new_with_keys(0, 0);
+        let mut hasher2 = AHasher::test_with_keys(0, 0);
         0_u32.hash(&mut hasher2);
         assert_sufficiently_different(hasher1.finish(), hasher2.finish(), 1);
     }
@@ -402,7 +409,7 @@
 
     #[test]
     fn aes_single_key_bit_flip() {
-        test_single_key_bit_flip(|k1, k2| AHasher::test_with_keys(k1, k2))
+        test_single_key_bit_flip(AHasher::test_with_keys)
     }
 
     #[test]
@@ -434,10 +441,12 @@
 
     #[test]
     fn aes_keys_affect_every_byte() {
-        test_keys_affect_every_byte(0, AHasher::test_with_keys);
+        #[cfg(not(feature = "specialize"))]
+            test_keys_affect_every_byte(0, AHasher::test_with_keys);
         test_keys_affect_every_byte("", AHasher::test_with_keys);
         test_keys_affect_every_byte((0, 0), AHasher::test_with_keys);
     }
+
     #[test]
     fn aes_finish_is_consistant() {
         test_finish_is_consistent(AHasher::test_with_keys)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/hash_set.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/hash_set.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/hash_set.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/hash_set.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,31 +1,45 @@
+use crate::RandomState;
 use std::collections::{hash_set, HashSet};
 use std::fmt::{self, Debug};
 use std::hash::{BuildHasher, Hash};
 use std::iter::FromIterator;
 use std::ops::{BitAnd, BitOr, BitXor, Deref, DerefMut, Sub};
 
+#[cfg(feature = "serde")]
+use serde::{
+    de::{Deserialize, Deserializer},
+    ser::{Serialize, Serializer},
+};
+
 /// A [`HashSet`](std::collections::HashSet) using [`RandomState`](crate::RandomState) to hash the items.
-/// Requires the `std` feature to be enabled.
+/// (Requires the `std` feature to be enabled.)
 #[derive(Clone)]
 pub struct AHashSet<T, S = crate::RandomState>(HashSet<T, S>);
 
-impl<T, S> AHashSet<T, S>
-where
-    T: Hash + Eq,
-    S: BuildHasher + Default,
-{
+impl<T> From<HashSet<T, crate::RandomState>> for AHashSet<T> {
+    fn from(item: HashSet<T, crate::RandomState>) -> Self {
+        AHashSet(item)
+    }
+}
+
+impl<T> Into<HashSet<T, crate::RandomState>> for AHashSet<T> {
+    fn into(self) -> HashSet<T, crate::RandomState> {
+        self.0
+    }
+}
+
+impl<T> AHashSet<T, RandomState> {
     pub fn new() -> Self {
-        AHashSet(HashSet::with_hasher(S::default()))
+        AHashSet(HashSet::with_hasher(RandomState::default()))
     }
 
     pub fn with_capacity(capacity: usize) -> Self {
-        AHashSet(HashSet::with_capacity_and_hasher(capacity, S::default()))
+        AHashSet(HashSet::with_capacity_and_hasher(capacity, RandomState::default()))
     }
 }
 
 impl<T, S> AHashSet<T, S>
 where
-    T: Hash + Eq,
     S: BuildHasher,
 {
     pub fn with_hasher(hash_builder: S) -> Self {
@@ -197,7 +211,7 @@
 
 impl<T, S> Debug for AHashSet<T, S>
 where
-    T: Eq + Hash + Debug,
+    T: Debug,
     S: BuildHasher,
 {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -254,14 +268,46 @@
     }
 }
 
-impl<T, S> Default for AHashSet<T, S>
-where
-    T: Eq + Hash,
-    S: BuildHasher + Default,
-{
+impl<T> Default for AHashSet<T, RandomState> {
     /// Creates an empty `AHashSet<T, S>` with the `Default` value for the hasher.
     #[inline]
-    fn default() -> AHashSet<T, S> {
+    fn default() -> AHashSet<T, RandomState> {
         AHashSet(HashSet::default())
     }
 }
+
+#[cfg(feature = "serde")]
+impl<T> Serialize for AHashSet<T>
+where
+    T: Serialize + Eq + Hash,
+{
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        self.deref().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, T> Deserialize<'de> for AHashSet<T>
+where
+    T: Deserialize<'de> + Eq + Hash,
+{
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let hash_set = HashSet::deserialize(deserializer);
+        hash_set.map(|hash_set| Self(hash_set))
+    }
+}
+
+#[cfg(all(test, feature = "serde"))]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_serde() {
+        let mut set = AHashSet::new();
+        set.insert("for".to_string());
+        set.insert("bar".to_string());
+        let serialization = serde_json::to_string(&set).unwrap();
+        let deserialization: AHashSet<String> = serde_json::from_str(&serialization).unwrap();
+        assert_eq!(deserialization, set);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,4 @@
-//! # aHash
-//!
-//! This hashing algorithm is intended to be a high performance, (hardware specific), keyed hash function.
+//! AHash is a hashing algorithm is intended to be a high performance, (hardware specific), keyed hash function.
 //! This can be seen as a DOS resistant alternative to `FxHash`, or a fast equivalent to `SipHash`.
 //! It provides a high speed hash algorithm, but where the result is not predictable without knowing a Key.
 //! This allows it to be used in a `HashMap` without allowing for the possibility that an malicious user can
@@ -10,10 +8,28 @@
 //!
 //! aHash uses the hardware AES instruction on x86 processors to provide a keyed hash function.
 //! aHash is not a cryptographically secure hash.
+//!
+//! # Example
+//! ```
+//! use ahash::{AHasher, RandomState};
+//! use std::collections::HashMap;
+//!
+//! let mut map: HashMap<i32, i32, RandomState> = HashMap::default();
+//! map.insert(12, 34);
+//! ```
+//! For convinence wrappers called `AHashMap` and `AHashSet` are also provided.
+//! These to the same thing with slightly less typing.
+//! ```ignore
+//! use ahash::AHashMap;
+//!
+//! let mut map: AHashMap<i32, i32> = AHashMap::with_capacity(4);
+//! map.insert(12, 34);
+//! map.insert(56, 78);
+//! ```
 #![deny(clippy::correctness, clippy::complexity, clippy::perf)]
 #![allow(clippy::pedantic, clippy::cast_lossless, clippy::unreadable_literal)]
 #![cfg_attr(all(not(test), not(feature = "std")), no_std)]
-#![cfg_attr(feature = "specialize", feature(specialization))]
+#![cfg_attr(feature = "specialize", feature(min_specialization))]
 
 #[macro_use]
 mod convert;
@@ -24,17 +40,14 @@
 #[cfg(test)]
 mod hash_quality_test;
 
-mod operations;
 #[cfg(feature = "std")]
 mod hash_map;
 #[cfg(feature = "std")]
 mod hash_set;
+mod operations;
 mod random_state;
 mod specialize;
 
-#[cfg(feature = "compile-time-rng")]
-use const_random::const_random;
-
 #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)))]
 pub use crate::aes_hash::AHasher;
 
@@ -48,14 +61,16 @@
 pub use crate::hash_map::AHashMap;
 #[cfg(feature = "std")]
 pub use crate::hash_set::AHashSet;
+use core::hash::BuildHasher;
+use core::hash::Hash;
 use core::hash::Hasher;
 
-/// Provides a default [Hasher] compile time generated constants for keys.
+/// Provides a default [Hasher] with fixed keys.
 /// This is typically used in conjunction with [BuildHasherDefault] to create
 /// [AHasher]s in order to hash the keys of the map.
-/// 
+///
 /// Generally it is preferable to use [RandomState] instead, so that different
-/// hashmaps will have different keys. However if fixed keys are desireable this 
+/// hashmaps will have different keys. However if fixed keys are desireable this
 /// may be used instead.
 ///
 /// # Example
@@ -72,13 +87,14 @@
 /// [Hasher]: std::hash::Hasher
 /// [HashMap]: std::collections::HashMap
 impl Default for AHasher {
-
-    /// Constructs a new [AHasher] with compile time generated constants for keys if the 
-    /// `compile-time-rng`feature is enabled. Otherwise the keys will be fixed constants.
-    /// This means the keys will be the same from one instance to another,
-    /// but different from build to the next. So if it is possible for a potential
-    /// attacker to have access to the compiled binary it would be better
-    /// to specify keys generated at runtime.
+    /// Constructs a new [AHasher] with fixed keys.
+    /// If `std` is enabled these will be generated upon first invocation.
+    /// Otherwise if the `compile-time-rng`feature is enabled these will be generated at compile time.
+    /// If neither of these features are available, hardcoded constants will be used.
+    ///
+    /// Because the values are fixed, different hashers will all hash elements the same way.
+    /// This could make hash values predictable, if DOS attacks are a concern. If this behaviour is
+    /// not required, it may be preferable to use [RandomState] instead.
     ///
     /// # Examples
     ///
@@ -95,87 +111,83 @@
     /// assert_eq!(hasher_1.finish(), hasher_2.finish());
     /// ```
     #[inline]
-    #[cfg(feature = "compile-time-rng")]
     fn default() -> AHasher {
-        AHasher::new_with_keys(const_random!(u128), const_random!(u128))
-    }
-    
-    /// Constructs a new [AHasher] with compile time generated constants for keys if the 
-    /// `compile-time-rng`feature is enabled. Otherwise the keys will be fixed constants.
-    /// This means the keys will be the same from one instance to another,
-    /// but different from build to the next. So if it is possible for a potential
-    /// attacker to have access to the compiled binary it would be better
-    /// to specify keys generated at runtime.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ahash::AHasher;
-    /// use std::hash::Hasher;
-    ///
-    /// let mut hasher_1 = AHasher::default();
-    /// let mut hasher_2 = AHasher::default();
-    ///
-    /// hasher_1.write_u32(1234);
-    /// hasher_2.write_u32(1234);
-    ///
-    /// assert_eq!(hasher_1.finish(), hasher_2.finish());
-    /// ```
-    #[inline]
-    #[cfg(not(feature = "compile-time-rng"))]
-    fn default() -> AHasher {
-        const K1: u128 = (random_state::INIT_SEED[0] as u128).wrapping_mul(random_state::MULTIPLE as u128);
-        const K2: u128 = (random_state::INIT_SEED[1] as u128).wrapping_mul(random_state::MULTIPLE as u128);
-        AHasher::new_with_keys(K1, K2)
+        RandomState::with_fixed_keys().build_hasher()
     }
 }
 
 /// Used for specialization. (Sealed)
-pub(crate) trait HasherExt: Hasher {
+pub(crate) trait BuildHasherExt: BuildHasher {
+    #[doc(hidden)]
+    fn hash_as_u64<T: Hash + ?Sized>(&self, value: &T) -> u64;
+
     #[doc(hidden)]
-    fn hash_u64(self, value: u64) -> u64;
+    fn hash_as_fixed_length<T: Hash + ?Sized>(&self, value: &T) -> u64;
 
     #[doc(hidden)]
-    fn short_finish(&self) -> u64;
+    fn hash_as_str<T: Hash + ?Sized>(&self, value: &T) -> u64;
 }
 
-impl<T: Hasher> HasherExt for T {
+impl<B: BuildHasher> BuildHasherExt for B {
+    #[inline]
+    #[cfg(feature = "specialize")]
+    default fn hash_as_u64<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = self.build_hasher();
+        value.hash(&mut hasher);
+        hasher.finish()
+    }
+    #[inline]
+    #[cfg(not(feature = "specialize"))]
+    fn hash_as_u64<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = self.build_hasher();
+        value.hash(&mut hasher);
+        hasher.finish()
+    }
     #[inline]
     #[cfg(feature = "specialize")]
-    default fn hash_u64(self, value: u64) -> u64 {
-        value.get_hash(self)
+    default fn hash_as_fixed_length<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = self.build_hasher();
+        value.hash(&mut hasher);
+        hasher.finish()
     }
     #[inline]
     #[cfg(not(feature = "specialize"))]
-    fn hash_u64(self, value: u64) -> u64 {
-        value.get_hash(self)
+    fn hash_as_fixed_length<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = self.build_hasher();
+        value.hash(&mut hasher);
+        hasher.finish()
     }
     #[inline]
     #[cfg(feature = "specialize")]
-    default fn short_finish(&self) -> u64 {
-        self.finish()
+    default fn hash_as_str<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = self.build_hasher();
+        value.hash(&mut hasher);
+        hasher.finish()
     }
     #[inline]
     #[cfg(not(feature = "specialize"))]
-    fn short_finish(&self) -> u64 {
-        self.finish()
+    fn hash_as_str<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = self.build_hasher();
+        value.hash(&mut hasher);
+        hasher.finish()
     }
 }
 
 // #[inline(never)]
 // #[doc(hidden)]
 // pub fn hash_test(input: &[u8]) -> u64 {
-//     let a = AHasher::new_with_keys(11111111111_u128, 2222222222_u128);
-//     input.get_hash(a)
+//     let a = RandomState::with_seeds(11, 22, 33, 44);
+//     <[u8]>::get_hash(input, &a)
 // }
 
+#[cfg(feature = "std")]
 #[cfg(test)]
 mod test {
     use crate::convert::Convert;
     use crate::*;
     use std::collections::HashMap;
+    use std::hash::Hash;
 
-    #[cfg(feature = "std")]
     #[test]
     fn test_default_builder() {
         use core::hash::BuildHasherDefault;
@@ -183,6 +195,7 @@
         let mut map = HashMap::<u32, u64, BuildHasherDefault<AHasher>>::default();
         map.insert(1, 3);
     }
+
     #[test]
     fn test_builder() {
         let mut map = HashMap::<u32, u64, RandomState>::default();
@@ -196,6 +209,43 @@
         assert_eq!(bytes, 0x6464646464646464);
     }
 
+
+    #[test]
+    fn test_non_zero() {
+        let mut hasher1 = AHasher::new_with_keys(0, 0);
+        let mut hasher2 = AHasher::new_with_keys(0, 0);
+        "foo".hash(&mut hasher1);
+        "bar".hash(&mut hasher2);
+        assert_ne!(hasher1.finish(), 0);
+        assert_ne!(hasher2.finish(), 0);
+        assert_ne!(hasher1.finish(), hasher2.finish());
+
+        let mut hasher1 = AHasher::new_with_keys(0, 0);
+        let mut hasher2 = AHasher::new_with_keys(0, 0);
+        3_u64.hash(&mut hasher1);
+        4_u64.hash(&mut hasher2);
+        assert_ne!(hasher1.finish(), 0);
+        assert_ne!(hasher2.finish(), 0);
+        assert_ne!(hasher1.finish(), hasher2.finish());
+    }
+
+    #[test]
+    fn test_non_zero_specialized() {
+        let hasher_build = RandomState::with_seeds(0,0,0,0);
+
+        let h1 = str::get_hash("foo", &hasher_build);
+        let h2 = str::get_hash("bar", &hasher_build);
+        assert_ne!(h1, 0);
+        assert_ne!(h2, 0);
+        assert_ne!(h1, h2);
+
+        let h1 = u64::get_hash(&3_u64, &hasher_build);
+        let h2 = u64::get_hash(&4_u64, &hasher_build);
+        assert_ne!(h1, 0);
+        assert_ne!(h2, 0);
+        assert_ne!(h1, h2);
+    }
+
     #[test]
     fn test_ahasher_construction() {
         let _ = AHasher::new_with_keys(1234, 5678);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/operations.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/operations.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/operations.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/operations.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,28 +7,50 @@
 //const SHUFFLE_MASK: u128 = 0x000d0702_0a040301_05080f0c_0e0b0609_u128;
 //const SHUFFLE_MASK: u128 = 0x040A0700_030E0106_0D050F08_020B0C09_u128;
 
+#[inline(always)]
 pub(crate) const fn folded_multiply(s: u64, by: u64) -> u64 {
     let result = (s as u128).wrapping_mul(by as u128);
     ((result & 0xffff_ffff_ffff_ffff) as u64) ^ ((result >> 64) as u64)
 }
 
+
+/// Given a small (less than 8 byte slice) returns the same data stored in two u32s.
+/// (order of and non-duplication of bytes is NOT guaranteed)
+#[inline(always)]
+pub(crate) fn read_small(data: &[u8]) -> [u64; 2] {
+    debug_assert!(data.len() <= 8);
+    if data.len() >= 2 {
+        if data.len() >= 4 {
+            //len 4-8
+            [data.read_u32().0 as u64, data.read_last_u32() as u64]
+        } else {
+            //len 2-3
+            [data.read_u16().0 as u64, data[data.len() - 1] as u64]
+        }
+    } else {
+        if data.len() > 0 {
+            [data[0] as u64, data[0] as u64]
+        } else {
+            [0, 0]
+        }
+    }
+}
+
 #[inline(always)]
 pub(crate) fn shuffle(a: u128) -> u128 {
     #[cfg(all(target_feature = "ssse3", not(miri)))]
-        {
-            use core::mem::transmute;
-            #[cfg(target_arch = "x86")]
-            use core::arch::x86::*;
-            #[cfg(target_arch = "x86_64")]
-            use core::arch::x86_64::*;
-            unsafe {
-                transmute(_mm_shuffle_epi8(transmute(a), transmute(SHUFFLE_MASK)))
-            }
-        }
+    {
+        #[cfg(target_arch = "x86")]
+        use core::arch::x86::*;
+        #[cfg(target_arch = "x86_64")]
+        use core::arch::x86_64::*;
+        use core::mem::transmute;
+        unsafe { transmute(_mm_shuffle_epi8(transmute(a), transmute(SHUFFLE_MASK))) }
+    }
     #[cfg(not(all(target_feature = "ssse3", not(miri))))]
-        {
-            a.swap_bytes()
-        }
+    {
+        a.swap_bytes()
+    }
 }
 
 #[allow(unused)] //not used by fallback
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/random_state.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/random_state.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/random_state.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/random_state.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,82 @@
+#[cfg(all(feature = "runtime-rng", not(all(feature = "compile-time-rng", test))))]
 use crate::convert::Convert;
-use crate::AHasher;
-use core::fmt;
-use core::hash::BuildHasher;
-use core::sync::atomic::AtomicUsize;
-use core::sync::atomic::Ordering;
-
-use crate::operations::folded_multiply;
-#[cfg(all(feature = "compile-time-rng", not(test)))]
-use const_random::const_random;
+#[cfg(feature = "specialize")]
+use crate::BuildHasherExt;
 
-///This constant come from Kunth's prng
-pub(crate) const MULTIPLE: u64 = 6364136223846793005;
-pub(crate) const INCREMENT: u64 = 1442695040888963407;
-
-// Const random provides randomized starting key with no runtime cost.
-#[cfg(all(feature = "compile-time-rng", not(test)))]
-pub(crate) const INIT_SEED: [u64; 2] = [const_random!(u64), const_random!(u64)];
+#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)))]
+pub use crate::aes_hash::*;
 
-#[cfg(any(not(feature = "compile-time-rng"), test))]
-pub(crate) const INIT_SEED: [u64; 2] = [0x2360_ED05_1FC6_5DA4, 0x4385_DF64_9FCC_F645]; //From PCG-64
+#[cfg(not(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri))))]
+pub use crate::fallback_hash::*;
 
-#[cfg(all(feature = "compile-time-rng", not(test)))]
-static SEED: AtomicUsize = AtomicUsize::new(const_random!(u64) as usize);
+#[cfg(all(feature = "compile-time-rng", any(not(feature = "runtime-rng"), test)))]
+use const_random::const_random;
+use core::fmt;
+use core::hash::BuildHasher;
+#[cfg(feature = "specialize")]
+use core::hash::Hash;
+use core::hash::Hasher;
+
+#[cfg(not(feature = "std"))]
+extern crate alloc;
+#[cfg(feature = "std")]
+extern crate std as alloc;
+
+
+#[cfg(all(feature = "runtime-rng", not(all(feature = "compile-time-rng", test))))]
+use alloc::boxed::Box;
+use core::sync::atomic::{AtomicUsize, Ordering};
+#[cfg(all(feature = "runtime-rng", not(all(feature = "compile-time-rng", test))))]
+use once_cell::race::OnceBox;
+
+#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)))]
+use crate::aes_hash::*;
+#[cfg(not(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri))))]
+use crate::fallback_hash::*;
+
+#[cfg(all(feature = "runtime-rng", not(all(feature = "compile-time-rng", test))))]
+static SEEDS: OnceBox<[[u64; 4]; 2]> = OnceBox::new();
+
+static COUNTER: AtomicUsize = AtomicUsize::new(0);
+
+pub(crate) const PI: [u64; 4] = [
+    0x243f_6a88_85a3_08d3,
+    0x1319_8a2e_0370_7344,
+    0xa409_3822_299f_31d0,
+    0x082e_fa98_ec4e_6c89,
+];
+
+pub(crate) const PI2: [u64; 4] = [
+    0x4528_21e6_38d0_1377,
+    0xbe54_66cf_34e9_0c6c,
+    0xc0ac_29b7_c97c_50dd,
+    0x3f84_d5b5_b547_0917,
+];
 
-#[cfg(any(not(feature = "compile-time-rng"), test))]
-static SEED: AtomicUsize = AtomicUsize::new(INCREMENT as usize);
+#[inline]
+pub(crate) fn seeds() -> [u64; 4] {
+    #[cfg(all(feature = "runtime-rng", not(all(feature = "compile-time-rng", test))))]
+    {
+        SEEDS.get_or_init(|| {
+            let mut result: [u8; 64] = [0; 64];
+            getrandom::getrandom(&mut result).expect("getrandom::getrandom() failed.");
+            Box::new(result.convert())
+        })[1]
+    }
+    #[cfg(all(feature = "compile-time-rng", any(not(feature = "runtime-rng"), test)))]
+    {
+        [
+            const_random!(u64),
+            const_random!(u64),
+            const_random!(u64),
+            const_random!(u64),
+        ]
+    }
+    #[cfg(all(not(feature = "runtime-rng"), not(feature = "compile-time-rng")))]
+    {
+        PI
+    }
+}
 
 /// Provides a [Hasher] factory. This is typically used (e.g. by [HashMap]) to create
 /// [AHasher]s in order to hash the keys of the map. See `build_hasher` below.
@@ -48,47 +100,92 @@
 }
 
 impl RandomState {
+    /// Use randomly generated keys
     #[inline]
     pub fn new() -> RandomState {
-        //Using a self pointer. When running with ASLR this is a random value.
-        let previous = SEED.load(Ordering::Relaxed) as u64;
-        let stack_mem_loc = &previous as *const _ as u64;
-        //This is similar to the update function in the fallback.
-        //only one multiply is needed because memory locations are not under an attackers control.
-        let current_seed = previous
-            .wrapping_add(stack_mem_loc)
-            .wrapping_mul(MULTIPLE)
-            .rotate_right(31);
-        SEED.store(current_seed as usize, Ordering::Relaxed);
-        let (k0, k1, k2, k3) = scramble_keys(&SEED as *const _ as u64, current_seed);
-        RandomState { k0, k1, k2, k3 }
+        #[cfg(all(feature = "runtime-rng", not(all(feature = "compile-time-rng", test))))]
+        {
+            let seeds = SEEDS.get_or_init(|| {
+                let mut result: [u8; 64] = [0; 64];
+                getrandom::getrandom(&mut result).expect("getrandom::getrandom() failed.");
+                Box::new(result.convert())
+            });
+            RandomState::from_keys(seeds[0], seeds[1])
+        }
+        #[cfg(all(feature = "compile-time-rng", any(not(feature = "runtime-rng"), test)))]
+        {
+            RandomState::from_keys(
+                [
+                    const_random!(u64),
+                    const_random!(u64),
+                    const_random!(u64),
+                    const_random!(u64),
+                ],
+                [
+                    const_random!(u64),
+                    const_random!(u64),
+                    const_random!(u64),
+                    const_random!(u64),
+                ],
+            )
+        }
+        #[cfg(all(not(feature = "runtime-rng"), not(feature = "compile-time-rng")))]
+        {
+            RandomState::from_keys(PI, PI2)
+        }
     }
 
-    /// Allows for explicitly setting the seeds to used.
-    pub const fn with_seeds(k0: u64, k1: u64) -> RandomState {
-        let (k0, k1, k2, k3) = scramble_keys(k0, k1);
+    /// Allows for supplying seeds, but each time it is called the resulting state will be different.
+    /// This is done using a static counter, so it can safely be used with a fixed keys.
+    #[inline]
+    pub fn generate_with(k0: u64, k1: u64, k2: u64, k3: u64) -> RandomState {
+        RandomState::from_keys(seeds(), [k0, k1, k2, k3])
+    }
+
+    fn from_keys(a: [u64; 4], b: [u64; 4]) -> RandomState {
+        let [k0, k1, k2, k3] = a;
+        let mut hasher = AHasher::from_random_state(&RandomState { k0, k1, k2, k3 });
+
+        let stack_mem_loc = &hasher as *const _ as usize;
+        #[cfg(not(all(target_arch = "arm", target_os = "none")))]
+        {
+            hasher.write_usize(COUNTER.fetch_add(stack_mem_loc, Ordering::Relaxed));
+        }
+        #[cfg(all(target_arch = "arm", target_os = "none"))]
+        {
+            let previous = COUNTER.load(Ordering::Relaxed);
+            let new = previous.wrapping_add(stack_mem_loc);
+            COUNTER.store(new, Ordering::Relaxed);
+            hasher.write_usize(new);
+        }
+        #[cfg(all(not(feature = "runtime-rng"), not(feature = "compile-time-rng")))]
+        hasher.write_usize(&PI as *const _ as usize);
+        let mix = |k: u64| {
+            let mut h = hasher.clone();
+            h.write_u64(k);
+            h.finish()
+        };
+
+        RandomState {
+            k0: mix(b[0]),
+            k1: mix(b[1]),
+            k2: mix(b[2]),
+            k3: mix(b[3]),
+        }
+    }
+
+    /// Internal. Used by Default.
+    #[inline]
+    pub(crate) fn with_fixed_keys() -> RandomState {
+        let [k0, k1, k2, k3] = seeds();
         RandomState { k0, k1, k2, k3 }
     }
-}
 
-/// This is based on the fallback hasher
-#[inline]
-pub(crate) const fn scramble_keys(a: u64, b: u64) -> (u64, u64, u64, u64) {
-    let k1 = folded_multiply(INIT_SEED[0] ^ a, MULTIPLE).wrapping_add(b);
-    let k2 = folded_multiply(INIT_SEED[0] ^ b, MULTIPLE).wrapping_add(a);
-    let k3 = folded_multiply(INIT_SEED[1] ^ a, MULTIPLE).wrapping_add(b);
-    let k4 = folded_multiply(INIT_SEED[1] ^ b, MULTIPLE).wrapping_add(a);
-    let combined = folded_multiply(a ^ b, MULTIPLE).wrapping_add(INCREMENT);
-    let rot1 = (combined & 63) as u32;
-    let rot2 = ((combined >> 16) & 63) as u32;
-    let rot3 = ((combined >> 32) & 63) as u32;
-    let rot4 = ((combined >> 48) & 63) as u32;
-    (
-        k1.rotate_left(rot1),
-        k2.rotate_left(rot2),
-        k3.rotate_left(rot3),
-        k4.rotate_left(rot4),
-    )
+    /// Allows for explicitly setting the seeds to used.
+    #[inline]
+    pub const fn with_seeds(k0: u64, k1: u64, k2: u64, k3: u64) -> RandomState {
+        RandomState { k0: k0 ^ PI2[0], k1: k1 ^ PI2[1], k2: k2 ^ PI2[2], k3: k3 ^ PI2[3] }
+    }
 }
 
 impl Default for RandomState {
@@ -101,13 +198,11 @@
 impl BuildHasher for RandomState {
     type Hasher = AHasher;
 
-    /// Constructs a new [AHasher] with keys based on compile time generated constants** and the location
-    /// this object was constructed at in memory. This means that two different [BuildHasher]s will will generate
+    /// Constructs a new [AHasher] with keys based on this [RandomState] object.
+    /// This means that two different [RandomState]s will will generate
     /// [AHasher]s that will return different hashcodes, but [Hasher]s created from the same [BuildHasher]
     /// will generate the same hashes for the same input data.
     ///
-    /// ** - only if the `compile-time-rng` feature is enabled.
-    ///
     /// # Examples
     ///
     /// ```
@@ -133,7 +228,34 @@
     /// [HashMap]: std::collections::HashMap
     #[inline]
     fn build_hasher(&self) -> AHasher {
-        AHasher::new_with_keys([self.k0, self.k1].convert(), [self.k2, self.k3].convert())
+        AHasher::from_random_state(self)
+    }
+}
+
+#[cfg(feature = "specialize")]
+impl BuildHasherExt for RandomState {
+    #[inline]
+    fn hash_as_u64<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = AHasherU64 {
+            buffer: self.k0,
+            pad: self.k1,
+        };
+        value.hash(&mut hasher);
+        hasher.finish()
+    }
+
+    #[inline]
+    fn hash_as_fixed_length<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = AHasherFixed(self.build_hasher());
+        value.hash(&mut hasher);
+        hasher.finish()
+    }
+
+    #[inline]
+    fn hash_as_str<T: Hash + ?Sized>(&self, value: &T) -> u64 {
+        let mut hasher = AHasherStr(self.build_hasher());
+        value.hash(&mut hasher);
+        hasher.finish()
     }
 }
 
@@ -142,12 +264,32 @@
     use super::*;
 
     #[test]
-    fn test_const_rand_disabled() {
-        assert_eq!(INIT_SEED, [0x2360_ED05_1FC6_5DA4, 0x4385_DF64_9FCC_F645]);
+    fn test_unique() {
+        let a = RandomState::new();
+        let b = RandomState::new();
+        assert_ne!(a.build_hasher().finish(), b.build_hasher().finish());
+    }
+
+    #[cfg(all(feature = "runtime-rng", not(all(feature = "compile-time-rng", test))))]
+    #[test]
+    fn test_not_pi() {
+        assert_ne!(PI, seeds());
+    }
+
+    #[cfg(all(feature = "compile-time-rng", any(not(feature = "runtime-rng"), test)))]
+    #[test]
+    fn test_not_pi_const() {
+        assert_ne!(PI, seeds());
+    }
+
+    #[cfg(all(not(feature = "runtime-rng"), not(feature = "compile-time-rng")))]
+    #[test]
+    fn test_pi() {
+        assert_eq!(PI, seeds());
     }
 
     #[test]
     fn test_with_seeds_const() {
-        const _CONST_RANDOM_STATE: RandomState = RandomState::with_seeds(17, 19);
+        const _CONST_RANDOM_STATE: RandomState = RandomState::with_seeds(17, 19, 21, 23);
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/specialize.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/specialize.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/src/specialize.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/src/specialize.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,23 @@
-#[cfg(feature = "specialize")]
-use crate::HasherExt;
+use core::hash::BuildHasher;
 use core::hash::Hash;
 use core::hash::Hasher;
 
+#[cfg(not(feature = "std"))]
+extern crate alloc;
+#[cfg(feature = "std")]
+extern crate std as alloc;
+
+#[cfg(feature = "specialize")]
+use crate::BuildHasherExt;
+#[cfg(feature = "specialize")]
+use alloc::string::String;
+#[cfg(feature = "specialize")]
+use alloc::vec::Vec;
+
 /// Provides a way to get an optimized hasher for a given data type.
 /// Rather than using a Hasher generically which can hash any value, this provides a way to get a specialized hash
-/// for a specific type. So this may be faster for primitive types. It does however consume the hasher in the process.
-/// #Example
+/// for a specific type. So this may be faster for primitive types.
+/// # Example
 /// ```
 /// use std::hash::BuildHasher;
 /// use ahash::RandomState;
@@ -15,20 +26,21 @@
 /// let hash_builder = RandomState::new();
 /// //...
 /// let value = 17;
-/// let hash = value.get_hash(hash_builder.build_hasher());
+/// let hash = u32::get_hash(&value, &hash_builder);
 /// ```
-pub trait CallHasher: Hash {
-    fn get_hash<H: Hasher>(&self, hasher: H) -> u64;
+pub trait CallHasher {
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64;
 }
 
 #[cfg(not(feature = "specialize"))]
 impl<T> CallHasher for T
 where
-    T: Hash,
+    T: Hash + ?Sized,
 {
     #[inline]
-    fn get_hash<H: Hasher>(&self, mut hasher: H) -> u64 {
-        self.hash(&mut hasher);
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        let mut hasher = build_hasher.build_hasher();
+        value.hash(&mut hasher);
         hasher.finish()
     }
 }
@@ -36,11 +48,12 @@
 #[cfg(feature = "specialize")]
 impl<T> CallHasher for T
 where
-    T: Hash,
+    T: Hash + ?Sized,
 {
     #[inline]
-    default fn get_hash<H: Hasher>(&self, mut hasher: H) -> u64 {
-        self.hash(&mut hasher);
+    default fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        let mut hasher = build_hasher.build_hasher();
+        value.hash(&mut hasher);
         hasher.finish()
     }
 }
@@ -50,8 +63,8 @@
         #[cfg(feature = "specialize")]
         impl CallHasher for $typ {
             #[inline]
-            fn get_hash<H: Hasher>(&self, hasher: H) -> u64 {
-                hasher.hash_u64(*self as u64)
+            fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+                build_hasher.hash_as_u64(value)
             }
         }
     };
@@ -68,54 +81,64 @@
 #[cfg(feature = "specialize")]
 impl CallHasher for u128 {
     #[inline]
-    fn get_hash<H: Hasher>(&self, mut hasher: H) -> u64 {
-        hasher.write_u128(*self);
-        hasher.short_finish()
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        build_hasher.hash_as_fixed_length(value)
     }
 }
 
 #[cfg(feature = "specialize")]
 impl CallHasher for i128 {
     #[inline]
-    fn get_hash<H: Hasher>(&self, mut hasher: H) -> u64 {
-        hasher.write_u128(*self as u128);
-        hasher.short_finish()
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        build_hasher.hash_as_fixed_length(value)
+    }
+}
+
+#[cfg(feature = "specialize")]
+impl CallHasher for usize {
+    #[inline]
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        build_hasher.hash_as_fixed_length(value)
+    }
+}
+
+#[cfg(feature = "specialize")]
+impl CallHasher for isize {
+    #[inline]
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        build_hasher.hash_as_fixed_length(value)
     }
 }
 
 #[cfg(feature = "specialize")]
 impl CallHasher for [u8] {
     #[inline]
-    fn get_hash<H: Hasher>(&self, mut hasher: H) -> u64 {
-        hasher.write(self);
-        hasher.finish()
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        build_hasher.hash_as_str(value)
     }
 }
 
-#[cfg(all(feature = "specialize", feature = "std"))]
+#[cfg(feature = "specialize")]
 impl CallHasher for Vec<u8> {
     #[inline]
-    fn get_hash<H: Hasher>(&self, mut hasher: H) -> u64 {
-        hasher.write(self);
-        hasher.finish()
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        build_hasher.hash_as_str(value)
     }
 }
 
 #[cfg(feature = "specialize")]
 impl CallHasher for str {
     #[inline]
-    fn get_hash<H: Hasher>(&self, mut hasher: H) -> u64 {
-        hasher.write(self.as_bytes());
-        hasher.finish()
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        build_hasher.hash_as_str(value)
     }
 }
 
-#[cfg(all(feature = "specialize", feature = "std"))]
+#[cfg(all(feature = "specialize"))]
 impl CallHasher for String {
     #[inline]
-    fn get_hash<H: Hasher>(&self, mut hasher: H) -> u64 {
-        hasher.write(self.as_bytes());
-        hasher.finish()
+    fn get_hash<H: Hash + ?Sized, B: BuildHasher>(value: &H, build_hasher: &B) -> u64 {
+        build_hasher.hash_as_str(value)
     }
 }
 
@@ -127,7 +150,8 @@
     #[test]
     #[cfg(feature = "specialize")]
     pub fn test_specialized_invoked() {
-        let shortened = 0_u64.get_hash(AHasher::new_with_keys(1, 2));
+        let build_hasher = RandomState::with_seeds(1, 2, 3, 4);
+        let shortened = u64::get_hash(&0, &build_hasher);
         let mut hasher = AHasher::new_with_keys(1, 2);
         0_u64.hash(&mut hasher);
         assert_ne!(hasher.finish(), shortened);
@@ -136,22 +160,22 @@
     /// Tests that some non-trivial transformation takes place.
     #[test]
     pub fn test_input_processed() {
-        let hasher = || AHasher::new_with_keys(3, 2);
-        assert_ne!(0, 0_u64.get_hash(hasher()));
-        assert_ne!(1, 0_u64.get_hash(hasher()));
-        assert_ne!(2, 0_u64.get_hash(hasher()));
-        assert_ne!(3, 0_u64.get_hash(hasher()));
-        assert_ne!(4, 0_u64.get_hash(hasher()));
-        assert_ne!(5, 0_u64.get_hash(hasher()));
-
-        assert_ne!(0, 1_u64.get_hash(hasher()));
-        assert_ne!(1, 1_u64.get_hash(hasher()));
-        assert_ne!(2, 1_u64.get_hash(hasher()));
-        assert_ne!(3, 1_u64.get_hash(hasher()));
-        assert_ne!(4, 1_u64.get_hash(hasher()));
-        assert_ne!(5, 1_u64.get_hash(hasher()));
+        let build_hasher = RandomState::with_seeds(2, 2, 2, 2);
+        assert_ne!(0, u64::get_hash(&0, &build_hasher));
+        assert_ne!(1, u64::get_hash(&0, &build_hasher));
+        assert_ne!(2, u64::get_hash(&0, &build_hasher));
+        assert_ne!(3, u64::get_hash(&0, &build_hasher));
+        assert_ne!(4, u64::get_hash(&0, &build_hasher));
+        assert_ne!(5, u64::get_hash(&0, &build_hasher));
+
+        assert_ne!(0, u64::get_hash(&1, &build_hasher));
+        assert_ne!(1, u64::get_hash(&1, &build_hasher));
+        assert_ne!(2, u64::get_hash(&1, &build_hasher));
+        assert_ne!(3, u64::get_hash(&1, &build_hasher));
+        assert_ne!(4, u64::get_hash(&1, &build_hasher));
+        assert_ne!(5, u64::get_hash(&1, &build_hasher));
 
-        let xored = 0_u64.get_hash(hasher()) ^ 1_u64.get_hash(hasher());
+        let xored = u64::get_hash(&0, &build_hasher) ^ u64::get_hash(&1, &build_hasher);
         assert_ne!(0, xored);
         assert_ne!(1, xored);
         assert_ne!(2, xored);
@@ -159,4 +183,47 @@
         assert_ne!(4, xored);
         assert_ne!(5, xored);
     }
+
+    #[test]
+    pub fn test_ref_independent() {
+        let build_hasher = RandomState::with_seeds(1, 2, 3, 4);
+        assert_eq!(u8::get_hash(&&1, &build_hasher), u8::get_hash(&1, &build_hasher));
+        assert_eq!(u16::get_hash(&&2, &build_hasher), u16::get_hash(&2, &build_hasher));
+        assert_eq!(u32::get_hash(&&3, &build_hasher), u32::get_hash(&3, &build_hasher));
+        assert_eq!(u64::get_hash(&&4, &build_hasher), u64::get_hash(&4, &build_hasher));
+        assert_eq!(u128::get_hash(&&5, &build_hasher), u128::get_hash(&5, &build_hasher));
+        assert_eq!(
+            str::get_hash(&"test", &build_hasher),
+            str::get_hash("test", &build_hasher)
+        );
+        assert_eq!(
+            str::get_hash(&"test", &build_hasher),
+            String::get_hash(&"test".to_string(), &build_hasher)
+        );
+        #[cfg(feature = "specialize")]
+        assert_eq!(
+            str::get_hash(&"test", &build_hasher),
+            <[u8]>::get_hash("test".as_bytes(), &build_hasher)
+        );
+
+        let build_hasher = RandomState::with_seeds(10, 20, 30, 40);
+        assert_eq!(u8::get_hash(&&&1, &build_hasher), u8::get_hash(&1, &build_hasher));
+        assert_eq!(u16::get_hash(&&&2, &build_hasher), u16::get_hash(&2, &build_hasher));
+        assert_eq!(u32::get_hash(&&&3, &build_hasher), u32::get_hash(&3, &build_hasher));
+        assert_eq!(u64::get_hash(&&&4, &build_hasher), u64::get_hash(&4, &build_hasher));
+        assert_eq!(u128::get_hash(&&&5, &build_hasher), u128::get_hash(&5, &build_hasher));
+        assert_eq!(
+            str::get_hash(&&"test", &build_hasher),
+            str::get_hash("test", &build_hasher)
+        );
+        assert_eq!(
+            str::get_hash(&&"test", &build_hasher),
+            String::get_hash(&"test".to_string(), &build_hasher)
+        );
+        #[cfg(feature = "specialize")]
+        assert_eq!(
+            str::get_hash(&&"test", &build_hasher),
+            <[u8]>::get_hash(&"test".to_string().into_bytes(), &build_hasher)
+        );
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/tests/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/tests/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/tests/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/tests/bench.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use ahash::{AHasher, CallHasher};
+use ahash::{CallHasher, RandomState};
 use criterion::*;
 use fxhash::FxHasher;
 use std::collections::hash_map::DefaultHasher;
@@ -6,8 +6,8 @@
 
 #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes"))]
 fn aeshash<H: Hash>(b: &H) -> u64 {
-    let hasher = AHasher::default();
-    b.get_hash(hasher)
+    let build_hasher = RandomState::with_seeds(1, 2, 3, 4);
+    H::get_hash(b, &build_hasher)
 }
 #[cfg(not(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes")))]
 fn aeshash<H: Hash>(_b: &H) -> u64 {
@@ -16,8 +16,8 @@
 
 #[cfg(not(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes")))]
 fn fallbackhash<H: Hash>(b: &H) -> u64 {
-    let hasher = AHasher::default();
-    b.get_hash(hasher)
+    let build_hasher = RandomState::with_seeds(1, 2, 3, 4);
+    H::get_hash(b, &build_hasher)
 }
 #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes"))]
 fn fallbackhash<H: Hash>(_b: &H) -> u64 {
@@ -64,152 +64,70 @@
         .collect()
 }
 
-const U8_VALUES: [u8; 1] = [123];
-const U16_VALUES: [u16; 1] = [1234];
-const U32_VALUES: [u32; 1] = [12345678];
-const U64_VALUES: [u64; 1] = [1234567890123456];
-const U128_VALUES: [u128; 1] = [12345678901234567890123456789012];
+const U8_VALUE: u8 = 123;
+const U16_VALUE: u16 = 1234;
+const U32_VALUE: u32 = 12345678;
+const U64_VALUE: u64 = 1234567890123456;
+const U128_VALUE: u128 = 12345678901234567890123456789012;
 
 fn bench_ahash(c: &mut Criterion) {
-    c.bench(
-        "aeshash",
-        ParameterizedBenchmark::new("u8", |b, &s| b.iter(|| black_box(aeshash(s))), &U8_VALUES),
-    );
-    c.bench(
-        "aeshash",
-        ParameterizedBenchmark::new("u16", |b, &s| b.iter(|| black_box(aeshash(s))), &U16_VALUES),
-    );
-    c.bench(
-        "aeshash",
-        ParameterizedBenchmark::new("u32", |b, &s| b.iter(|| black_box(aeshash(s))), &U32_VALUES),
-    );
-    c.bench(
-        "aeshash",
-        ParameterizedBenchmark::new("u64", |b, &s| b.iter(|| black_box(aeshash(s))), &U64_VALUES),
-    );
-    c.bench(
-        "aeshash",
-        ParameterizedBenchmark::new("u128", |b, &s| b.iter(|| black_box(aeshash(s))), &U128_VALUES),
-    );
-    c.bench(
-        "aeshash",
-        ParameterizedBenchmark::new("string", |b, s| b.iter(|| black_box(aeshash(s))), gen_strings()),
-    );
+    let mut group = c.benchmark_group("aeshash");
+    group.bench_with_input("u8", &U8_VALUE, |b, s| b.iter(|| black_box(aeshash(s))));
+    group.bench_with_input("u16", &U16_VALUE, |b, s| b.iter(|| black_box(aeshash(s))));
+    group.bench_with_input("u32", &U32_VALUE, |b, s| b.iter(|| black_box(aeshash(s))));
+    group.bench_with_input("u64", &U64_VALUE, |b, s| b.iter(|| black_box(aeshash(s))));
+    group.bench_with_input("u128", &U128_VALUE, |b, s| b.iter(|| black_box(aeshash(s))));
+    group.bench_with_input("string", &gen_strings(), |b, s| b.iter(|| black_box(aeshash(s))));
 }
 
 fn bench_fallback(c: &mut Criterion) {
-    c.bench(
-        "fallback",
-        ParameterizedBenchmark::new("u8", |b, &s| b.iter(|| black_box(fallbackhash(s))), &U8_VALUES),
-    );
-    c.bench(
-        "fallback",
-        ParameterizedBenchmark::new("u16", |b, &s| b.iter(|| black_box(fallbackhash(s))), &U16_VALUES),
-    );
-    c.bench(
-        "fallback",
-        ParameterizedBenchmark::new("u32", |b, &s| b.iter(|| black_box(fallbackhash(s))), &U32_VALUES),
-    );
-    c.bench(
-        "fallback",
-        ParameterizedBenchmark::new("u64", |b, &s| b.iter(|| black_box(fallbackhash(s))), &U64_VALUES),
-    );
-    c.bench(
-        "fallback",
-        ParameterizedBenchmark::new("u128", |b, &s| b.iter(|| black_box(fallbackhash(s))), &U128_VALUES),
-    );
-    c.bench(
-        "fallback",
-        ParameterizedBenchmark::new("string", |b, s| b.iter(|| black_box(fallbackhash(s))), gen_strings()),
-    );
+    let mut group = c.benchmark_group("fallback");
+    group.bench_with_input("u8", &U8_VALUE, |b, s| b.iter(|| black_box(fallbackhash(s))));
+    group.bench_with_input("u16", &U16_VALUE, |b, s| b.iter(|| black_box(fallbackhash(s))));
+    group.bench_with_input("u32", &U32_VALUE, |b, s| b.iter(|| black_box(fallbackhash(s))));
+    group.bench_with_input("u64", &U64_VALUE, |b, s| b.iter(|| black_box(fallbackhash(s))));
+    group.bench_with_input("u128", &U128_VALUE, |b, s| b.iter(|| black_box(fallbackhash(s))));
+    group.bench_with_input("string", &gen_strings(), |b, s| b.iter(|| black_box(fallbackhash(s))));
 }
 
 fn bench_fx(c: &mut Criterion) {
-    c.bench(
-        "fx",
-        ParameterizedBenchmark::new("u8", |b, &s| b.iter(|| black_box(fxhash(s))), &U8_VALUES),
-    );
-    c.bench(
-        "fx",
-        ParameterizedBenchmark::new("u16", |b, &s| b.iter(|| black_box(fxhash(s))), &U16_VALUES),
-    );
-    c.bench(
-        "fx",
-        ParameterizedBenchmark::new("u32", |b, &s| b.iter(|| black_box(fxhash(s))), &U32_VALUES),
-    );
-    c.bench(
-        "fx",
-        ParameterizedBenchmark::new("u64", |b, &s| b.iter(|| black_box(fxhash(s))), &U64_VALUES),
-    );
-    c.bench(
-        "fx",
-        ParameterizedBenchmark::new("u128", |b, &s| b.iter(|| black_box(fxhash(s))), &U128_VALUES),
-    );
-    c.bench(
-        "fx",
-        ParameterizedBenchmark::new("string", |b, s| b.iter(|| black_box(fxhash(s))), gen_strings()),
-    );
+    let mut group = c.benchmark_group("fx");
+    group.bench_with_input("u8", &U8_VALUE, |b, s| b.iter(|| black_box(fxhash(s))));
+    group.bench_with_input("u16", &U16_VALUE, |b, s| b.iter(|| black_box(fxhash(s))));
+    group.bench_with_input("u32", &U32_VALUE, |b, s| b.iter(|| black_box(fxhash(s))));
+    group.bench_with_input("u64", &U64_VALUE, |b, s| b.iter(|| black_box(fxhash(s))));
+    group.bench_with_input("u128", &U128_VALUE, |b, s| b.iter(|| black_box(fxhash(s))));
+    group.bench_with_input("string", &gen_strings(), |b, s| b.iter(|| black_box(fxhash(s))));
 }
 
 fn bench_fnv(c: &mut Criterion) {
-    c.bench(
-        "fnv",
-        ParameterizedBenchmark::new("u8", |b, &s| b.iter(|| black_box(fnvhash(s))), &U8_VALUES),
-    );
-    c.bench(
-        "fnv",
-        ParameterizedBenchmark::new("u16", |b, &s| b.iter(|| black_box(fnvhash(s))), &U16_VALUES),
-    );
-    c.bench(
-        "fnv",
-        ParameterizedBenchmark::new("u32", |b, &s| b.iter(|| black_box(fnvhash(s))), &U32_VALUES),
-    );
-    c.bench(
-        "fnv",
-        ParameterizedBenchmark::new("u64", |b, &s| b.iter(|| black_box(fnvhash(s))), &U64_VALUES),
-    );
-    c.bench(
-        "fnv",
-        ParameterizedBenchmark::new("u128", |b, &s| b.iter(|| black_box(fnvhash(s))), &U128_VALUES),
-    );
-    c.bench(
-        "fnv",
-        ParameterizedBenchmark::new("string", |b, s| b.iter(|| black_box(fnvhash(s))), gen_strings()),
-    );
+    let mut group = c.benchmark_group("fnv");
+    group.bench_with_input("u8", &U8_VALUE, |b, s| b.iter(|| black_box(fnvhash(s))));
+    group.bench_with_input("u16", &U16_VALUE, |b, s| b.iter(|| black_box(fnvhash(s))));
+    group.bench_with_input("u32", &U32_VALUE, |b, s| b.iter(|| black_box(fnvhash(s))));
+    group.bench_with_input("u64", &U64_VALUE, |b, s| b.iter(|| black_box(fnvhash(s))));
+    group.bench_with_input("u128", &U128_VALUE, |b, s| b.iter(|| black_box(fnvhash(s))));
+    group.bench_with_input("string", &gen_strings(), |b, s| b.iter(|| black_box(fnvhash(s))));
 }
 
 fn bench_sea(c: &mut Criterion) {
-    c.bench(
-        "sea",
-        ParameterizedBenchmark::new("string", |b, s| b.iter(|| black_box(seahash(s))), gen_strings()),
-    );
+    let mut group = c.benchmark_group("sea");
+    group.bench_with_input("u8", &U8_VALUE, |b, s| b.iter(|| black_box(seahash(s))));
+    group.bench_with_input("u16", &U16_VALUE, |b, s| b.iter(|| black_box(seahash(s))));
+    group.bench_with_input("u32", &U32_VALUE, |b, s| b.iter(|| black_box(seahash(s))));
+    group.bench_with_input("u64", &U64_VALUE, |b, s| b.iter(|| black_box(seahash(s))));
+    group.bench_with_input("u128", &U128_VALUE, |b, s| b.iter(|| black_box(seahash(s))));
+    group.bench_with_input("string", &gen_strings(), |b, s| b.iter(|| black_box(seahash(s))));
 }
 
 fn bench_sip(c: &mut Criterion) {
-    c.bench(
-        "sip",
-        ParameterizedBenchmark::new("u8", |b, &s| b.iter(|| black_box(siphash(s))), &U8_VALUES),
-    );
-    c.bench(
-        "sip",
-        ParameterizedBenchmark::new("u16", |b, &s| b.iter(|| black_box(siphash(s))), &U16_VALUES),
-    );
-    c.bench(
-        "sip",
-        ParameterizedBenchmark::new("u32", |b, &s| b.iter(|| black_box(siphash(s))), &U32_VALUES),
-    );
-    c.bench(
-        "sip",
-        ParameterizedBenchmark::new("u64", |b, &s| b.iter(|| black_box(siphash(s))), &U64_VALUES),
-    );
-    c.bench(
-        "sip",
-        ParameterizedBenchmark::new("u128", |b, &s| b.iter(|| black_box(siphash(s))), &U128_VALUES),
-    );
-    c.bench(
-        "sip",
-        ParameterizedBenchmark::new("string", |b, s| b.iter(|| black_box(siphash(s))), gen_strings()),
-    );
+    let mut group = c.benchmark_group("sip");
+    group.bench_with_input("u8", &U8_VALUE, |b, s| b.iter(|| black_box(siphash(s))));
+    group.bench_with_input("u16", &U16_VALUE, |b, s| b.iter(|| black_box(siphash(s))));
+    group.bench_with_input("u32", &U32_VALUE, |b, s| b.iter(|| black_box(siphash(s))));
+    group.bench_with_input("u64", &U64_VALUE, |b, s| b.iter(|| black_box(siphash(s))));
+    group.bench_with_input("u128", &U128_VALUE, |b, s| b.iter(|| black_box(siphash(s))));
+    group.bench_with_input("string", &gen_strings(), |b, s| b.iter(|| black_box(siphash(s))));
 }
 
 criterion_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/tests/map_tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/tests/map_tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/tests/map_tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/tests/map_tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,9 @@
-use std::hash::{Hash, Hasher};
+use std::hash::{BuildHasher, Hash, Hasher};
 
 use criterion::*;
 use fxhash::FxHasher;
 
-use ahash::{AHasher, CallHasher};
+use ahash::{AHasher, CallHasher, RandomState};
 
 fn gen_word_pairs() -> Vec<String> {
     let words: Vec<_> = r#"
@@ -119,16 +119,16 @@
 }
 
 #[allow(unused)] // False positive
-fn test_hash_common_words<T: Hasher>(hasher: impl Fn() -> T) {
+fn test_hash_common_words<B: BuildHasher>(build_hasher: &B) {
     let word_pairs: Vec<_> = gen_word_pairs();
-    check_for_collisions(&hasher, &word_pairs, 32);
+    check_for_collisions(build_hasher, &word_pairs, 32);
 }
 
 #[allow(unused)] // False positive
-fn check_for_collisions<T: Hasher, H: Hash>(hasher: &impl Fn() -> T, items: &[H], bucket_count: usize) {
+fn check_for_collisions<H: Hash, B: BuildHasher>(build_hasher: &B, items: &[H], bucket_count: usize) {
     let mut buckets = vec![0; bucket_count];
     for item in items {
-        let value = hash(item, &hasher) as usize;
+        let value = hash(item, build_hasher) as usize;
         buckets[value % bucket_count] += 1;
     }
     let mean = items.len() / bucket_count;
@@ -151,23 +151,22 @@
 }
 
 #[allow(unused)] // False positive
-fn hash<T: Hasher>(b: &impl Hash, hasher: &dyn Fn() -> T) -> u64 {
-    let hasher = hasher();
-    b.get_hash(hasher)
+fn hash<H: Hash, B: BuildHasher>(b: &H, build_hasher: &B) -> u64 {
+    H::get_hash(b, build_hasher)
 }
 
 #[test]
 fn test_bucket_distribution() {
-    let hasher = || AHasher::new_with_keys(123456789, 987654321);
-    test_hash_common_words(&hasher);
+    let build_hasher = RandomState::with_seeds(1, 2, 3, 4);
+    test_hash_common_words(&build_hasher);
     let sequence: Vec<_> = (0..320000).collect();
-    check_for_collisions(&hasher, &sequence, 32);
+    check_for_collisions(&build_hasher, &sequence, 32);
     let sequence: Vec<_> = (0..2560000).collect();
-    check_for_collisions(&hasher, &sequence, 256);
+    check_for_collisions(&build_hasher, &sequence, 256);
     let sequence: Vec<_> = (0..320000).map(|i| i * 1024).collect();
-    check_for_collisions(&hasher, &sequence, 32);
+    check_for_collisions(&build_hasher, &sequence, 32);
     let sequence: Vec<_> = (0..2560000_u64).map(|i| i * 1024).collect();
-    check_for_collisions(&hasher, &sequence, 256);
+    check_for_collisions(&build_hasher, &sequence, 256);
 }
 
 fn ahash_vec<H: Hash>(b: &Vec<H>) -> u64 {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/tests/nopanic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/tests/nopanic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ahash/tests/nopanic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ahash/tests/nopanic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,12 +20,27 @@
     hash_test_final(num, string);
 }
 
+struct SimpleBuildHasher {
+    hasher: AHasher,
+}
+
+impl BuildHasher for SimpleBuildHasher {
+    type Hasher = AHasher;
+
+    fn build_hasher(&self) -> Self::Hasher {
+        self.hasher.clone()
+    }
+}
+
 #[inline(never)]
 #[no_panic]
 fn hash_test_specialize(num: i32, string: &str) -> (u64, u64) {
     let hasher1 = AHasher::new_with_keys(1, 2);
     let hasher2 = AHasher::new_with_keys(1, 2);
-    (num.get_hash(hasher1), string.as_bytes().get_hash(hasher2))
+    (
+        i32::get_hash(&num, &SimpleBuildHasher { hasher: hasher1 }),
+        <[u8]>::get_hash(string.as_bytes(), &SimpleBuildHasher { hasher: hasher2 }),
+    )
 }
 
 #[inline(never)]
@@ -36,9 +51,12 @@
 #[inline(never)]
 #[no_panic]
 fn hash_test_random(num: i32, string: &str) -> (u64, u64) {
-    let hasher1 = RandomState::with_seeds(1, 2).build_hasher();
-    let hasher2 = RandomState::with_seeds(1, 2).build_hasher();
-    (num.get_hash(hasher1), string.as_bytes().get_hash(hasher2))
+    let build_hasher1 = RandomState::with_seeds(1, 2, 3, 4);
+    let build_hasher2 = RandomState::with_seeds(1, 2, 3, 4);
+    (
+        i32::get_hash(&num, &build_hasher1),
+        <[u8]>::get_hash(string.as_bytes(), &build_hasher2),
+    )
 }
 
 #[inline(never)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"cf15db60c9989b860ea874785f1d8b1b5350a28501cd169831042837ee6f350c","DESIGN.md":"9065f33d818d1562244d36dc4781e2a351108030cee17f11c2ba512ca7b4c27e","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"88a0a32dce081f2b1a5c71f2208c155961b0171daf1a5a9a70371fc5cf0c4304","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/ahocorasick.rs":"00db7f3c3e9c764f7e2e620ee28baeebaf2101191218dd06b75d7656749a096f","src/automaton.rs":"ea3fc2648e026eac9f9969b0d457e49af7b4a40044379ce010d054f22afbc98f","src/buffer.rs":"dae7ee7c1f846ca9cf115ba4949484000e1837b4fb7311f8d8c9a35011c9c26f","src/byte_frequencies.rs":"2fb85b381c038c1e44ce94294531cdcd339dca48b1e61f41455666e802cbbc9e","src/classes.rs":"166c9f15c9a2e370e2bc9a9e1620bb2db13df52edfde9a0db1f20144519a7e72","src/dfa.rs":"8302d809d0acbf2a9d5f947d91e28d779cc547e49256961029f1c01e3375cba9","src/error.rs":"36dbf2cefbfaa8a69186551320dbff023d3e82780a6c925e87c3e3997b967e66","src/lib.rs":"2d2ef0070fb6c4ba6695e948e60e05ed63d3e8c31de28d3c112653798f95d6d3","src/nfa.rs":"3f68abf96a1c556021f0b7011634b3273b3df7e5366c9d27a2fc63e93ffbd95d","src/packed/api.rs":"6c65dfa177b7d7b79f90a048f260bec7f817126c693b85f49704c7d2ecf5f646","src/packed/mod.rs":"29c76ad3cbb1f831140cefac7a27fb504ac4af4f454975a571965b48aad417eb","src/packed/pattern.rs":"b88c57af057997da0a5a06f4c5604a7e598c20acfc11c15cd8977727f6e1cf9c","src/packed/rabinkarp.rs":"b3242a8631ea5607163dcbb641e4ac9c6da26774378da1e51651b0ab5656b390","src/packed/teddy/README.md":"5819f40d221af93288e705eadef5393a41d7a0900881b4d676e01fd65d5adf15","src/packed/teddy/compile.rs":"5d7de6a45a84bb2322647a6de7a7b1573837b9222b16e348f023b8d47e0a5130","src/packed/teddy/mod.rs":"f63db3419b1d378929bf0bc1f0e3b909ff3c38b9f2b6e86ba4546b8f39907cd3","src/packed/teddy/runtime.rs":"0a1250ea73159b3be6e0fa9a3f55ecedbb2cb90cb798d1709e9f5ee48f8855d5","src/packed/tests.rs":"0b52ab9eef73a1a4f141f475a9fa98e54d447104aa69acba3a7f8248ce7164b2","src/packed/vector.rs":"ab3c0535fca5f09198d58cbfae44c292aeb3ce44bc92bca36d30dc72963639fc","src/prefilter.rs":"5191cc8a273a909ca460c492357401cb664a66ed0505948e969786d655a9aed8","src/state_id.rs":"50958ca2b089d775fb4e49a64950e2f1e8a4af1772fe782ae3715a7745dcc6d7","src/tests.rs":"837bf7e7b9aa8b215a750475411730fa081370ee93e78a6f516d86280a1ab906"},"package":"7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"}
\ No newline at end of file
+{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"f61283fd900435313b9ba8c1b87a4b5b31d442f9b554222136ec8d1d3d1e39d8","DESIGN.md":"9065f33d818d1562244d36dc4781e2a351108030cee17f11c2ba512ca7b4c27e","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"741e7249c8d1d6a7ba9341d68253dbf4952477c5620ff37c5325f2e894b148b6","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/ahocorasick.rs":"6fcbe812eec7af44b104c6b8a27b0a2ea8d67c3d9aec73cb69d802b30be5f005","src/automaton.rs":"610b3e2c104c51bf4f51a6d07626c3972e9d1274ca276e987385a231b284cc8b","src/buffer.rs":"dae7ee7c1f846ca9cf115ba4949484000e1837b4fb7311f8d8c9a35011c9c26f","src/byte_frequencies.rs":"2fb85b381c038c1e44ce94294531cdcd339dca48b1e61f41455666e802cbbc9e","src/classes.rs":"99a53a2ed8eea8c13699def90e31dfdff9d0b90572b1db3cb534e3396e7a0ed0","src/dfa.rs":"25e4455b3e179a7e192108d05f3683993456b36e3ebed99f827558c52525b7e6","src/error.rs":"d34c2c9c815df5d9dedc46b4b3ce109cd2cee07825de643f0c574ec960367beb","src/lib.rs":"f0c48b0ee093dd8b3034d025d052c3667860c5d4a196cb178588012b719acea4","src/nfa.rs":"2f443951c78196126bfd237ed5770a69077e6190daeecd47131339c25e51a3d0","src/packed/api.rs":"ec58ff1b4375dd4ff88fb5859c7ede994fe08d31b7d3677720a086592aa0fe53","src/packed/mod.rs":"d7ee11d487a7f129f16dc8f1473442a7127905933f378504bae83df0f23c5e2a","src/packed/pattern.rs":"3abf3835d4c4f8a43753c52936a894d819f713f233fc046e19de5ef95200dcce","src/packed/rabinkarp.rs":"caf9563b7442c9b75c9cb520fa236c7a6da8173705889b8d79b69ede14a20767","src/packed/teddy/README.md":"5819f40d221af93288e705eadef5393a41d7a0900881b4d676e01fd65d5adf15","src/packed/teddy/compile.rs":"aad40b3f93d2c388b409b31fb2795d414a365237789d5b1a7510d97ceb8ce260","src/packed/teddy/mod.rs":"83b52bd80272970ad17234d0db293d17c1710ec582302bf516b203c8edec037e","src/packed/teddy/runtime.rs":"836146e90b320b14fa2c65fe4af7915a41f6fb04408aac5fac731c22ff46adae","src/packed/tests.rs":"b8dc4d3281ecd6d0fa2bf7ef16cf292a467dfdce64e470c7921e983bfa60fee2","src/packed/vector.rs":"ab3c0535fca5f09198d58cbfae44c292aeb3ce44bc92bca36d30dc72963639fc","src/prefilter.rs":"82a3eb6d5c0c3f10bc8d5f57d55d6d14cf4cf21c475bb5253e1921084063b8d7","src/state_id.rs":"519ec8c7bf3fa72103d4c561c193759759f535dca924c9853efe630f406d2029","src/tests.rs":"6522ed1b244513c01de5bbcf0fe35571454fdea2c2a9d8dfe13a04bf57b70eca"},"package":"1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "aho-corasick"
-version = "0.7.15"
+version = "0.7.18"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 exclude = ["/aho-corasick-debug", "/ci/*", "/.travis.yml", "/appveyor.yml"]
 autotests = false
@@ -32,11 +33,11 @@
 [lib]
 name = "aho_corasick"
 [dependencies.memchr]
-version = "2.2.0"
+version = "2.4.0"
 default-features = false
-[dev-dependencies.doc-comment]
-version = "0.3.1"
+
+[dev-dependencies]
 
 [features]
 default = ["std"]
-std = ["memchr/use_std"]
+std = ["memchr/std"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -28,12 +28,6 @@
 aho-corasick = "0.7"
 ```
 
-and this to your crate root (if you're using Rust 2015):
-
-```rust
-extern crate aho_corasick;
-```
-
 
 ### Example: basic searching
 
@@ -162,7 +156,7 @@
 
 ### Minimum Rust version policy
 
-This crate's minimum supported `rustc` version is `1.28.0`.
+This crate's minimum supported `rustc` version is `1.41.1`.
 
 The current policy is that the minimum Rust version required to use this crate
 can be increased in minor version updates. For example, if `crate 1.0` requires
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/ahocorasick.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/ahocorasick.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/ahocorasick.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/ahocorasick.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
 use std::io;
 
-use automaton::Automaton;
-use buffer::Buffer;
-use dfa::{self, DFA};
-use error::Result;
-use nfa::{self, NFA};
-use packed;
-use prefilter::{Prefilter, PrefilterState};
-use state_id::StateID;
-use Match;
+use crate::automaton::Automaton;
+use crate::buffer::Buffer;
+use crate::dfa::{self, DFA};
+use crate::error::Result;
+use crate::nfa::{self, NFA};
+use crate::packed;
+use crate::prefilter::{Prefilter, PrefilterState};
+use crate::state_id::StateID;
+use crate::Match;
 
 /// An automaton for searching multiple strings in linear time.
 ///
@@ -1005,18 +1005,6 @@
     ///
     /// let ac = AhoCorasickBuilder::new()
     ///     .dfa(true)
-    ///     .byte_classes(false)
-    ///     .build(&["foo", "bar", "baz"]);
-    /// assert_eq!(20_768, ac.heap_bytes());
-    ///
-    /// let ac = AhoCorasickBuilder::new()
-    ///     .dfa(true)
-    ///     .byte_classes(true) // default
-    ///     .build(&["foo", "bar", "baz"]);
-    /// assert_eq!(1_248, ac.heap_bytes());
-    ///
-    /// let ac = AhoCorasickBuilder::new()
-    ///     .dfa(true)
     ///     .ascii_case_insensitive(true)
     ///     .build(&["foo", "bar", "baz"]);
     /// assert_eq!(1_248, ac.heap_bytes());
@@ -1169,7 +1157,7 @@
 ///
 /// The lifetime `'b` refers to the lifetime of the haystack being searched.
 #[derive(Debug)]
-pub struct FindIter<'a, 'b, S: 'a + StateID> {
+pub struct FindIter<'a, 'b, S: StateID> {
     fsm: &'a Imp<S>,
     prestate: PrefilterState,
     haystack: &'b [u8],
@@ -1226,7 +1214,7 @@
 ///
 /// The lifetime `'b` refers to the lifetime of the haystack being searched.
 #[derive(Debug)]
-pub struct FindOverlappingIter<'a, 'b, S: 'a + StateID> {
+pub struct FindOverlappingIter<'a, 'b, S: StateID> {
     fsm: &'a Imp<S>,
     prestate: PrefilterState,
     haystack: &'b [u8],
@@ -1297,7 +1285,7 @@
 ///
 /// The lifetime `'a` refers to the lifetime of the `AhoCorasick` automaton.
 #[derive(Debug)]
-pub struct StreamFindIter<'a, R, S: 'a + StateID> {
+pub struct StreamFindIter<'a, R, S: StateID> {
     it: StreamChunkIter<'a, R, S>,
 }
 
@@ -1332,7 +1320,7 @@
 /// N.B. This does not actually implement Iterator because we need to borrow
 /// from the underlying reader. But conceptually, it's still an iterator.
 #[derive(Debug)]
-struct StreamChunkIter<'a, R, S: 'a + StateID> {
+struct StreamChunkIter<'a, R, S: StateID> {
     /// The AC automaton.
     fsm: &'a Imp<S>,
     /// State associated with this automaton's prefilter. It is a heuristic
@@ -1681,7 +1669,7 @@
             // N.B. Using byte classes can actually be faster by improving
             // locality, but this only really applies for multi-megabyte
             // automata (i.e., automata that don't fit in your CPU's cache).
-            self.dfa(true).byte_classes(false);
+            self.dfa(true);
         } else if patterns.len() <= 5000 {
             self.dfa(true);
         }
@@ -1928,6 +1916,10 @@
     /// overall performance.
     ///
     /// This option is enabled by default.
+    #[deprecated(
+        since = "0.7.16",
+        note = "not carrying its weight, will be always enabled, see: https://github.com/BurntSushi/aho-corasick/issues/57"
+    )]
     pub fn byte_classes(&mut self, yes: bool) -> &mut AhoCorasickBuilder {
         self.dfa_builder.byte_classes(yes);
         self
@@ -1956,6 +1948,10 @@
     /// non-premultiplied form only requires 8 bits.
     ///
     /// This option is enabled by default.
+    #[deprecated(
+        since = "0.7.16",
+        note = "not carrying its weight, will be always enabled, see: https://github.com/BurntSushi/aho-corasick/issues/57"
+    )]
     pub fn premultiply(&mut self, yes: bool) -> &mut AhoCorasickBuilder {
         self.dfa_builder.premultiply(yes);
         self
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/automaton.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/automaton.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/automaton.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/automaton.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
-use ahocorasick::MatchKind;
-use prefilter::{self, Candidate, Prefilter, PrefilterState};
-use state_id::{dead_id, fail_id, StateID};
-use Match;
+use crate::ahocorasick::MatchKind;
+use crate::prefilter::{self, Candidate, Prefilter, PrefilterState};
+use crate::state_id::{dead_id, fail_id, StateID};
+use crate::Match;
 
 // NOTE: This trait essentially started as a copy of the same trait from from
 // regex-automata, with some wording changed since we use this trait for
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/classes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/classes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/classes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/classes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,7 +64,7 @@
     /// hasn't been converted to equivalence classes yet. Picking an arbitrary
     /// byte from each equivalence class then permits a full exploration of
     /// the NFA instead of using every possible byte value.
-    pub fn representatives(&self) -> ByteClassRepresentatives {
+    pub fn representatives(&self) -> ByteClassRepresentatives<'_> {
         ByteClassRepresentatives { classes: self, byte: 0, last_class: None }
     }
 
@@ -85,7 +85,7 @@
 }
 
 impl fmt::Debug for ByteClasses {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.is_singleton() {
             write!(f, "ByteClasses({{singletons}})")
         } else {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/dfa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/dfa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/dfa.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/dfa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,13 @@
 use std::mem::size_of;
 
-use ahocorasick::MatchKind;
-use automaton::Automaton;
-use classes::ByteClasses;
-use error::Result;
-use nfa::{PatternID, PatternLength, NFA};
-use prefilter::{Prefilter, PrefilterObj, PrefilterState};
-use state_id::{dead_id, fail_id, premultiply_overflow_error, StateID};
-use Match;
+use crate::ahocorasick::MatchKind;
+use crate::automaton::Automaton;
+use crate::classes::ByteClasses;
+use crate::error::Result;
+use crate::nfa::{PatternID, PatternLength, NFA};
+use crate::prefilter::{Prefilter, PrefilterObj, PrefilterState};
+use crate::state_id::{dead_id, fail_id, premultiply_overflow_error, StateID};
+use crate::Match;
 
 #[derive(Clone, Debug)]
 pub enum DFA<S> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -68,7 +68,7 @@
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.kind {
             ErrorKind::StateIDOverflow { max } => write!(
                 f,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -186,7 +186,6 @@
 #[cfg(not(feature = "std"))]
 compile_error!("`std` feature is currently required to build this crate");
 
-extern crate memchr;
 // #[cfg(doctest)]
 // #[macro_use]
 // extern crate doc_comment;
@@ -194,12 +193,12 @@
 // #[cfg(doctest)]
 // doctest!("../README.md");
 
-pub use ahocorasick::{
+pub use crate::ahocorasick::{
     AhoCorasick, AhoCorasickBuilder, FindIter, FindOverlappingIter, MatchKind,
     StreamFindIter,
 };
-pub use error::{Error, ErrorKind};
-pub use state_id::StateID;
+pub use crate::error::{Error, ErrorKind};
+pub use crate::state_id::StateID;
 
 mod ahocorasick;
 mod automaton;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/nfa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/nfa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/nfa.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/nfa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,13 +4,13 @@
 use std::mem::size_of;
 use std::ops::{Index, IndexMut};
 
-use ahocorasick::MatchKind;
-use automaton::Automaton;
-use classes::{ByteClassBuilder, ByteClasses};
-use error::Result;
-use prefilter::{self, opposite_ascii_case, Prefilter, PrefilterObj};
-use state_id::{dead_id, fail_id, usize_to_state_id, StateID};
-use Match;
+use crate::ahocorasick::MatchKind;
+use crate::automaton::Automaton;
+use crate::classes::{ByteClassBuilder, ByteClasses};
+use crate::error::Result;
+use crate::prefilter::{self, opposite_ascii_case, Prefilter, PrefilterObj};
+use crate::state_id::{dead_id, fail_id, usize_to_state_id, StateID};
+use crate::Match;
 
 /// The identifier for a pattern, which is simply the position of the pattern
 /// in the sequence of patterns given by the caller.
@@ -172,7 +172,7 @@
         self.state_mut(id)
     }
 
-    fn iter_transitions_mut(&mut self, id: S) -> IterTransitionsMut<S> {
+    fn iter_transitions_mut(&mut self, id: S) -> IterTransitionsMut<'_, S> {
         IterTransitionsMut::new(self, id)
     }
 
@@ -497,7 +497,7 @@
 /// is iterating over transitions, the caller can still mutate the NFA. This
 /// is useful when creating failure transitions.
 #[derive(Debug)]
-struct IterTransitionsMut<'a, S: StateID + 'a> {
+struct IterTransitionsMut<'a, S: StateID> {
     nfa: &'a mut NFA<S>,
     state_id: S,
     cur: usize,
@@ -1274,7 +1274,7 @@
 }
 
 impl<S: StateID> fmt::Debug for NFA<S> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         writeln!(f, "NFA(")?;
         writeln!(f, "match_kind: {:?}", self.match_kind)?;
         writeln!(f, "prefilter: {:?}", self.prefilter)?;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/api.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,9 @@
 use std::u16;
 
-use packed::pattern::Patterns;
-use packed::rabinkarp::RabinKarp;
-use packed::teddy::{self, Teddy};
-use Match;
+use crate::packed::pattern::Patterns;
+use crate::packed::rabinkarp::RabinKarp;
+use crate::packed::teddy::{self, Teddy};
+use crate::Match;
 
 /// This is a limit placed on the total number of patterns we're willing to try
 /// and match at once. As more sophisticated algorithms are added, this number
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,7 +105,7 @@
   no searcher is built.
 */
 
-pub use packed::api::{Builder, Config, FindIter, MatchKind, Searcher};
+pub use crate::packed::api::{Builder, Config, FindIter, MatchKind, Searcher};
 
 mod api;
 mod pattern;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/pattern.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/pattern.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/pattern.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/pattern.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 use std::u16;
 use std::usize;
 
-use packed::api::MatchKind;
+use crate::packed::api::MatchKind;
 
 /// The type used for representing a pattern identifier.
 ///
@@ -155,7 +155,7 @@
 
     /// Return the pattern with the given identifier. If such a pattern does
     /// not exist, then this panics.
-    pub fn get(&self, id: PatternID) -> Pattern {
+    pub fn get(&self, id: PatternID) -> Pattern<'_> {
         Pattern(&self.by_id[id as usize])
     }
 
@@ -167,7 +167,7 @@
     /// Callers must ensure that a pattern with the given identifier exists
     /// before using this method.
     #[cfg(target_arch = "x86_64")]
-    pub unsafe fn get_unchecked(&self, id: PatternID) -> Pattern {
+    pub unsafe fn get_unchecked(&self, id: PatternID) -> Pattern<'_> {
         Pattern(self.by_id.get_unchecked(id as usize))
     }
 
@@ -189,7 +189,7 @@
     /// the order provided by this iterator, then the result is guaranteed
     /// to satisfy the correct match semantics. (Either leftmost-first or
     /// leftmost-longest.)
-    pub fn iter(&self) -> PatternIter {
+    pub fn iter(&self) -> PatternIter<'_> {
         PatternIter { patterns: self, i: 0 }
     }
 }
@@ -226,7 +226,7 @@
 pub struct Pattern<'a>(&'a [u8]);
 
 impl<'a> fmt::Debug for Pattern<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Pattern")
             .field("lit", &String::from_utf8_lossy(&self.0))
             .finish()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/rabinkarp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/rabinkarp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/rabinkarp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/rabinkarp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use std::mem;
 
-use packed::pattern::{PatternID, Patterns};
-use Match;
+use crate::packed::pattern::{PatternID, Patterns};
+use crate::Match;
 
 /// The type of the rolling hash used in the Rabin-Karp algorithm.
 type Hash = usize;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/compile.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/compile.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/compile.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/compile.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,8 +4,8 @@
 use std::collections::BTreeMap;
 use std::fmt;
 
-use packed::pattern::{PatternID, Patterns};
-use packed::teddy::Teddy;
+use crate::packed::pattern::{PatternID, Patterns};
+use crate::packed::teddy::Teddy;
 
 /// A builder for constructing a Teddy matcher.
 ///
@@ -73,7 +73,7 @@
     }
 
     fn build_imp(&self, patterns: &Patterns) -> Option<Teddy> {
-        use packed::teddy::runtime;
+        use crate::packed::teddy::runtime;
 
         // Most of the logic here is just about selecting the optimal settings,
         // or perhaps even rejecting construction altogether. The choices
@@ -296,7 +296,7 @@
 }
 
 impl<'p> fmt::Debug for Compiler<'p> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut buckets = vec![vec![]; self.buckets.len()];
         for (i, bucket) in self.buckets.iter().enumerate() {
             for &patid in bucket {
@@ -400,7 +400,7 @@
 }
 
 impl fmt::Debug for Mask {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let (mut parts_lo, mut parts_hi) = (vec![], vec![]);
         for i in 0..32 {
             parts_lo.push(format!("{:02}: {:08b}", i, self.lo[i]));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
 #[cfg(target_arch = "x86_64")]
-pub use packed::teddy::compile::Builder;
+pub use crate::packed::teddy::compile::Builder;
 #[cfg(not(target_arch = "x86_64"))]
-pub use packed::teddy::fallback::Builder;
+pub use crate::packed::teddy::fallback::Builder;
 #[cfg(not(target_arch = "x86_64"))]
-pub use packed::teddy::fallback::Teddy;
+pub use crate::packed::teddy::fallback::Teddy;
 #[cfg(target_arch = "x86_64")]
-pub use packed::teddy::runtime::Teddy;
+pub use crate::packed::teddy::runtime::Teddy;
 
 #[cfg(target_arch = "x86_64")]
 mod compile;
@@ -14,8 +14,8 @@
 
 #[cfg(not(target_arch = "x86_64"))]
 mod fallback {
-    use packed::pattern::Patterns;
-    use Match;
+    use crate::packed::pattern::Patterns;
+    use crate::Match;
 
     #[derive(Clone, Debug, Default)]
     pub struct Builder(());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/runtime.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/runtime.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/runtime.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/teddy/runtime.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,10 +51,10 @@
 use std::arch::x86_64::*;
 use std::mem;
 
-use packed::pattern::{PatternID, Patterns};
-use packed::teddy::compile;
-use packed::vector::*;
-use Match;
+use crate::packed::pattern::{PatternID, Patterns};
+use crate::packed::teddy::compile;
+use crate::packed::vector::*;
+use crate::Match;
 
 /// The Teddy runtime.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/packed/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/packed/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 use std::usize;
 
-use packed::{Config, MatchKind};
-use Match;
+use crate::packed::{Config, MatchKind};
+use crate::Match;
 
 /// A description of a single test against a multi-pattern searcher.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/prefilter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/prefilter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/prefilter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/prefilter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,9 +5,9 @@
 
 use memchr::{memchr, memchr2, memchr3};
 
-use ahocorasick::MatchKind;
-use packed;
-use Match;
+use crate::ahocorasick::MatchKind;
+use crate::packed;
+use crate::Match;
 
 /// A candidate is the result of running a prefilter on a haystack at a
 /// particular position. The result is either no match, a confirmed match or
@@ -435,7 +435,7 @@
 }
 
 impl fmt::Debug for ByteSet {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut bytes = vec![];
         for b in 0..=255 {
             if self.contains(b) {
@@ -471,7 +471,7 @@
 }
 
 impl fmt::Debug for RareByteOffsets {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut offsets = vec![];
         for off in self.set.iter() {
             if off.max > 0 {
@@ -1032,7 +1032,7 @@
 /// Return the frequency rank of the given byte. The higher the rank, the more
 /// common the byte (heuristically speaking).
 fn freq_rank(b: u8) -> u8 {
-    use byte_frequencies::BYTE_FREQUENCIES;
+    use crate::byte_frequencies::BYTE_FREQUENCIES;
     BYTE_FREQUENCIES[b as usize]
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/state_id.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/state_id.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/state_id.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/state_id.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use std::hash::Hash;
 
-use error::{Error, Result};
+use crate::error::{Error, Result};
 
 // NOTE: Most of this code was copied from regex-automata, but without the
 // (de)serialization specific stuff.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/aho-corasick/src/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/aho-corasick/src/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 use std::io;
 use std::usize;
 
-use {AhoCorasickBuilder, Match, MatchKind};
+use crate::{AhoCorasickBuilder, Match, MatchKind};
 
 /// A description of a single test against an Aho-Corasick automaton.
 ///
@@ -739,6 +739,8 @@
                 $collection,
                 $kind,
                 |b: &mut AhoCorasickBuilder| {
+                    // TODO: remove tests when option is removed.
+                    #[allow(deprecated)]
                     b.dfa(true).byte_classes(false);
                 }
             );
@@ -747,6 +749,8 @@
                 $collection,
                 $kind,
                 |b: &mut AhoCorasickBuilder| {
+                    // TODO: remove tests when option is removed.
+                    #[allow(deprecated)]
                     b.dfa(true).premultiply(false);
                 }
             );
@@ -755,6 +759,8 @@
                 $collection,
                 $kind,
                 |b: &mut AhoCorasickBuilder| {
+                    // TODO: remove tests when options are removed.
+                    #[allow(deprecated)]
                     b.dfa(true).byte_classes(false).premultiply(false);
                 }
             );
@@ -830,6 +836,8 @@
     AC_STANDARD_OVERLAPPING,
     Standard,
     |b: &mut AhoCorasickBuilder| {
+        // TODO: remove tests when option is removed.
+        #[allow(deprecated)]
         b.dfa(true).byte_classes(false);
     }
 );
@@ -839,6 +847,8 @@
     AC_STANDARD_OVERLAPPING,
     Standard,
     |b: &mut AhoCorasickBuilder| {
+        // TODO: remove tests when option is removed.
+        #[allow(deprecated)]
         b.dfa(true).premultiply(false);
     }
 );
@@ -848,6 +858,8 @@
     AC_STANDARD_OVERLAPPING,
     Standard,
     |b: &mut AhoCorasickBuilder| {
+        // TODO: remove tests when options are removed.
+        #[allow(deprecated)]
         b.dfa(true).byte_classes(false).premultiply(false);
     }
 );
@@ -1129,7 +1141,7 @@
 // was incorrect, leading to a false negative.
 #[test]
 fn regression_rare_byte_prefilter() {
-    use AhoCorasick;
+    use crate::AhoCorasick;
 
     let ac = AhoCorasick::new_auto_configured(&["ab/j/", "x/"]);
     assert!(ac.is_match("ab/j/"));
@@ -1137,7 +1149,7 @@
 
 #[test]
 fn regression_case_insensitive_prefilter() {
-    use AhoCorasickBuilder;
+    use crate::AhoCorasickBuilder;
 
     for c in b'a'..b'z' {
         for c2 in b'a'..b'z' {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,11 @@
 use std::process::{Command, ExitStatus, Stdio};
 use std::str;
 
+#[cfg(all(feature = "backtrace", not(feature = "std")))]
+compile_error! {
+    "`backtrace` feature without `std` feature is not supported"
+}
+
 // This code exercises the surface area that we expect of the std Backtrace
 // type. If the current toolchain is able to compile it, we go ahead and use
 // backtrace in anyhow.
@@ -51,6 +56,10 @@
     if rustc < 38 {
         println!("cargo:rustc-cfg=anyhow_no_macro_reexport");
     }
+
+    if rustc < 51 {
+        println!("cargo:rustc-cfg=anyhow_no_ptr_addr_of");
+    }
 }
 
 fn compile_probe() -> Option<ExitStatus> {
@@ -58,17 +67,36 @@
     let out_dir = env::var_os("OUT_DIR")?;
     let probefile = Path::new(&out_dir).join("probe.rs");
     fs::write(&probefile, PROBE).ok()?;
-    Command::new(rustc)
-        .stderr(Stdio::null())
+
+    // Make sure to pick up Cargo rustc configuration.
+    let mut cmd = if let Some(wrapper) = env::var_os("CARGO_RUSTC_WRAPPER") {
+        let mut cmd = Command::new(wrapper);
+        // The wrapper's first argument is supposed to be the path to rustc.
+        cmd.arg(rustc);
+        cmd
+    } else {
+        Command::new(rustc)
+    };
+
+    cmd.stderr(Stdio::null())
         .arg("--edition=2018")
         .arg("--crate-name=anyhow_build")
         .arg("--crate-type=lib")
         .arg("--emit=metadata")
         .arg("--out-dir")
         .arg(out_dir)
-        .arg(probefile)
-        .status()
-        .ok()
+        .arg(probefile);
+
+    // If Cargo wants to set RUSTFLAGS, use that.
+    if let Ok(rustflags) = env::var("CARGO_ENCODED_RUSTFLAGS") {
+        if !rustflags.is_empty() {
+            for arg in rustflags.split('\x1f') {
+                cmd.arg(arg);
+            }
+        }
+    }
+
+    cmd.status().ok()
 }
 
 fn rustc_minor_version() -> Option<u32> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"aa95a0f75f797789090151c1e89fc835bf7996376efe27386769445d4b3166f5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5ae3beb5cb960dfe629cd02293a4ad678624b7ca1c104953912bd7606c2fd0c7","build.rs":"ffd5a7a8c9700328517abf11a3654c310c2da232f28841e0467c7e200fcd9221","src/backtrace.rs":"a82a8ffae2c68ee385dc78d8ec8cb6f3351234f0ad6af7e87df2371593e0f6aa","src/chain.rs":"1627608ce95c3484d26e1742a1b8b533b74c6159916b717bacffae3ae53731f9","src/context.rs":"f2be36af9588c924ed087bcb7bd681d330889e54b8f98cdc2aba93512a28762e","src/error.rs":"2fa0a03485eadd4cf84ae4e115fcc9cd98dda53a51c25593d854e5cd887f5b7e","src/fmt.rs":"dd0593a2e20487165ec5889e72cc8833eee4fa69ac258420428eede8e17f2213","src/kind.rs":"8481a8b7835eebb3859a8c32c217bf9c73543cfc62e3916b98d39af8b063125c","src/lib.rs":"7df19eaeda0759fd821fcf07c20c98f7df9beef30c103ce138d1fd793e69ff63","src/macros.rs":"f56059fe5cb4762895237bfffd5085f2557c6c50a54f7e9c518c138a8f7fd09d","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"464bc1ddeae307eac906928286ec3edb77057c5c1302e02150d3649e2b861f1a","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"98a45325b1e86d4c5d3094ab99cd1ada1f771c505d2d7322f0afcbe7bdb71cfa","tests/test_chain.rs":"f28efeae7395d1c395e6f1a647b4199c25a00410ade45248c145c6fcf2fb448a","tests/test_context.rs":"f82c915b182df1a604a4cd558a03b1a821414983d6f6af6822398104cea70676","tests/test_convert.rs":"62840be1ee8022ba5e8c0d3fc1752a1526b2c47d4cceecff2b86790524c3b3ea","tests/test_downcast.rs":"253d6f54e554965023b378b037827ec6289c4779a7a7c12706e19c2731d219fe","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"446e908ba4fe2f8787aad9d97a819536d638a2456e1edd041a7c40d34f7cf76d","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"828964b889abbeabcbcbb0dd92147039804a52cae2635590142a184158375f91"},"package":"68803225a7b13e47191bab76f2687382b60d259e8cf37f6e1893658b84bb9479"}
\ No newline at end of file
+{"files":{"Cargo.toml":"906d2097a583c07a9185bf590f9a768b1d85cc56f6e70cb6a4c001502cc9c831","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"4a58a26808c92aae6265a60e21745bb2891a60cf1d69985fc05d26b77c2b9a79","build.rs":"0a7e724ccc383c884be51541c453f654a55f06084360d443da443ffe702f0581","src/backtrace.rs":"a1a52f9874f0aa1382fb404f029c6fa88e53afe38fb2417877d5711f1f2b90c9","src/chain.rs":"1627608ce95c3484d26e1742a1b8b533b74c6159916b717bacffae3ae53731f9","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/error.rs":"2aa93ec95f16980037c244e94fa8ac75f8b20ac22530fe45a24550d1878eb0b5","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"ccf5d8075d44b03cc69c0478ee5e5b3a02d4f2e7cecb37588b30043d3fcdf65f","src/lib.rs":"c834db1e5c34f3631cdb483fbe4f4d316aa197e44f41ca90dc3b7bda0f5ab58b","src/macros.rs":"88daf58370b2fcc93c43ebd5b9c1659bf5460c972681b63d89d51132126e5560","src/ptr.rs":"f1ece995b5be064773ee3d516710b4948b0bee3c237786d9988c7d2acc52c95c","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"382956f4bd3dcd1f6036efb8f11193595a7c60e0a5dbf5f2da149f1f25183abf","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"0e81cf36c45ef1e77f0765f93ea56d07146be090ab35efec573a9fce34e36a23","tests/test_context.rs":"5399c609760b71f16bb63ed593f1adaf9f265bcfbc9aa5ab3361de35ddad48fe","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"0288c879c4735a8d317560baa3d4a6efbf1435d8ec350c5cb12cc1ba7c484080","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"7dd1b84a267c83121d9f85a9c1aadc072a863ec324e170af4d7d19516f0f526c","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"4b0cceae9e9b27fe2594e6c02bb3e3fd9965ed04498738e5877934dab807b50f"},"package":"28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "anyhow"
-version = "1.0.36"
+version = "1.0.43"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "Flexible concrete Error type built on std::error::Error"
 documentation = "https://docs.rs/anyhow"
@@ -24,6 +23,9 @@
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "doc_cfg"]
 targets = ["x86_64-unknown-linux-gnu"]
+[dependencies.backtrace]
+version = "0.3.51"
+optional = true
 [dev-dependencies.futures]
 version = "0.3"
 default-features = false
@@ -31,6 +33,10 @@
 [dev-dependencies.rustversion]
 version = "1.0"
 
+[dev-dependencies.syn]
+version = "1.0"
+features = ["full"]
+
 [dev-dependencies.thiserror]
 version = "1.0"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
-Anyhow&ensp;¯\\\_(ツ)\_/¯
-=========================
+Anyhow&ensp;¯\\\_(°ペ)\_/¯
+==========================
 
 [<img alt="github" src="https://img.shields.io/badge/github-dtolnay/anyhow-8da0cb?style=for-the-badge&labelColor=555555&logo=github" height="20">](https://github.com/dtolnay/anyhow)
 [<img alt="crates.io" src="https://img.shields.io/crates/v/anyhow.svg?style=for-the-badge&color=fc8d62&logo=rust" height="20">](https://crates.io/crates/anyhow)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/backtrace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/backtrace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/backtrace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/backtrace.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,34 @@
 #[cfg(backtrace)]
-pub(crate) use std::backtrace::Backtrace;
+pub(crate) use std::backtrace::{Backtrace, BacktraceStatus};
 
-#[cfg(not(backtrace))]
+#[cfg(all(not(backtrace), feature = "backtrace"))]
+pub(crate) use self::capture::{Backtrace, BacktraceStatus};
+
+#[cfg(not(any(backtrace, feature = "backtrace")))]
 pub(crate) enum Backtrace {}
 
 #[cfg(backtrace)]
+macro_rules! impl_backtrace {
+    () => {
+        std::backtrace::Backtrace
+    };
+}
+
+#[cfg(all(not(backtrace), feature = "backtrace"))]
+macro_rules! impl_backtrace {
+    () => {
+        impl core::fmt::Debug + core::fmt::Display
+    };
+}
+
+#[cfg(any(backtrace, feature = "backtrace"))]
 macro_rules! backtrace {
     () => {
-        Some(Backtrace::capture())
+        Some(crate::backtrace::Backtrace::capture())
     };
 }
 
-#[cfg(not(backtrace))]
+#[cfg(not(any(backtrace, feature = "backtrace")))]
 macro_rules! backtrace {
     () => {
         None
@@ -23,14 +40,362 @@
     ($err:expr) => {
         match $err.backtrace() {
             Some(_) => None,
-            None => Some(Backtrace::capture()),
+            None => backtrace!(),
         }
     };
 }
 
-#[cfg(all(feature = "std", not(backtrace)))]
+#[cfg(all(feature = "std", not(backtrace), feature = "backtrace"))]
+macro_rules! backtrace_if_absent {
+    ($err:expr) => {
+        backtrace!()
+    };
+}
+
+#[cfg(all(feature = "std", not(backtrace), not(feature = "backtrace")))]
 macro_rules! backtrace_if_absent {
     ($err:expr) => {
         None
     };
 }
+
+#[cfg(all(not(backtrace), feature = "backtrace"))]
+mod capture {
+    use backtrace::{BacktraceFmt, BytesOrWideString, Frame, PrintFmt, SymbolName};
+    use core::cell::UnsafeCell;
+    use core::fmt::{self, Debug, Display};
+    use core::sync::atomic::{AtomicUsize, Ordering};
+    use std::borrow::Cow;
+    use std::env;
+    use std::path::{self, Path, PathBuf};
+    use std::sync::Once;
+
+    pub(crate) struct Backtrace {
+        inner: Inner,
+    }
+
+    pub(crate) enum BacktraceStatus {
+        Unsupported,
+        Disabled,
+        Captured,
+    }
+
+    enum Inner {
+        Unsupported,
+        Disabled,
+        Captured(LazilyResolvedCapture),
+    }
+
+    struct Capture {
+        actual_start: usize,
+        resolved: bool,
+        frames: Vec<BacktraceFrame>,
+    }
+
+    struct BacktraceFrame {
+        frame: Frame,
+        symbols: Vec<BacktraceSymbol>,
+    }
+
+    struct BacktraceSymbol {
+        name: Option<Vec<u8>>,
+        filename: Option<BytesOrWide>,
+        lineno: Option<u32>,
+        colno: Option<u32>,
+    }
+
+    enum BytesOrWide {
+        Bytes(Vec<u8>),
+        Wide(Vec<u16>),
+    }
+
+    impl Debug for Backtrace {
+        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+            let capture = match &self.inner {
+                Inner::Unsupported => return fmt.write_str("<unsupported>"),
+                Inner::Disabled => return fmt.write_str("<disabled>"),
+                Inner::Captured(c) => c.force(),
+            };
+
+            let frames = &capture.frames[capture.actual_start..];
+
+            write!(fmt, "Backtrace ")?;
+
+            let mut dbg = fmt.debug_list();
+
+            for frame in frames {
+                if frame.frame.ip().is_null() {
+                    continue;
+                }
+
+                dbg.entries(&frame.symbols);
+            }
+
+            dbg.finish()
+        }
+    }
+
+    impl Debug for BacktraceFrame {
+        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+            let mut dbg = fmt.debug_list();
+            dbg.entries(&self.symbols);
+            dbg.finish()
+        }
+    }
+
+    impl Debug for BacktraceSymbol {
+        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+            write!(fmt, "{{ ")?;
+
+            if let Some(fn_name) = self.name.as_ref().map(|b| SymbolName::new(b)) {
+                write!(fmt, "fn: \"{:#}\"", fn_name)?;
+            } else {
+                write!(fmt, "fn: <unknown>")?;
+            }
+
+            if let Some(fname) = self.filename.as_ref() {
+                write!(fmt, ", file: \"{:?}\"", fname)?;
+            }
+
+            if let Some(line) = self.lineno {
+                write!(fmt, ", line: {:?}", line)?;
+            }
+
+            write!(fmt, " }}")
+        }
+    }
+
+    impl Debug for BytesOrWide {
+        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+            output_filename(
+                fmt,
+                match self {
+                    BytesOrWide::Bytes(w) => BytesOrWideString::Bytes(w),
+                    BytesOrWide::Wide(w) => BytesOrWideString::Wide(w),
+                },
+                PrintFmt::Short,
+                env::current_dir().as_ref().ok(),
+            )
+        }
+    }
+
+    impl Backtrace {
+        fn enabled() -> bool {
+            static ENABLED: AtomicUsize = AtomicUsize::new(0);
+            match ENABLED.load(Ordering::SeqCst) {
+                0 => {}
+                1 => return false,
+                _ => return true,
+            }
+            let enabled = match env::var_os("RUST_LIB_BACKTRACE") {
+                Some(s) => s != "0",
+                None => match env::var_os("RUST_BACKTRACE") {
+                    Some(s) => s != "0",
+                    None => false,
+                },
+            };
+            ENABLED.store(enabled as usize + 1, Ordering::SeqCst);
+            enabled
+        }
+
+        #[inline(never)] // want to make sure there's a frame here to remove
+        pub(crate) fn capture() -> Backtrace {
+            if Backtrace::enabled() {
+                Backtrace::create(Backtrace::capture as usize)
+            } else {
+                let inner = Inner::Disabled;
+                Backtrace { inner }
+            }
+        }
+
+        // Capture a backtrace which starts just before the function addressed
+        // by `ip`
+        fn create(ip: usize) -> Backtrace {
+            let mut frames = Vec::new();
+            let mut actual_start = None;
+            backtrace::trace(|frame| {
+                frames.push(BacktraceFrame {
+                    frame: frame.clone(),
+                    symbols: Vec::new(),
+                });
+                if frame.symbol_address() as usize == ip && actual_start.is_none() {
+                    actual_start = Some(frames.len() + 1);
+                }
+                true
+            });
+
+            // If no frames came out assume that this is an unsupported platform
+            // since `backtrace` doesn't provide a way of learning this right
+            // now, and this should be a good enough approximation.
+            let inner = if frames.is_empty() {
+                Inner::Unsupported
+            } else {
+                Inner::Captured(LazilyResolvedCapture::new(Capture {
+                    actual_start: actual_start.unwrap_or(0),
+                    frames,
+                    resolved: false,
+                }))
+            };
+
+            Backtrace { inner }
+        }
+
+        pub(crate) fn status(&self) -> BacktraceStatus {
+            match self.inner {
+                Inner::Unsupported => BacktraceStatus::Unsupported,
+                Inner::Disabled => BacktraceStatus::Disabled,
+                Inner::Captured(_) => BacktraceStatus::Captured,
+            }
+        }
+    }
+
+    impl Display for Backtrace {
+        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+            let capture = match &self.inner {
+                Inner::Unsupported => return fmt.write_str("unsupported backtrace"),
+                Inner::Disabled => return fmt.write_str("disabled backtrace"),
+                Inner::Captured(c) => c.force(),
+            };
+
+            let full = fmt.alternate();
+            let (frames, style) = if full {
+                (&capture.frames[..], PrintFmt::Full)
+            } else {
+                (&capture.frames[capture.actual_start..], PrintFmt::Short)
+            };
+
+            // When printing paths we try to strip the cwd if it exists,
+            // otherwise we just print the path as-is. Note that we also only do
+            // this for the short format, because if it's full we presumably
+            // want to print everything.
+            let cwd = env::current_dir();
+            let mut print_path = move |fmt: &mut fmt::Formatter, path: BytesOrWideString| {
+                output_filename(fmt, path, style, cwd.as_ref().ok())
+            };
+
+            let mut f = BacktraceFmt::new(fmt, style, &mut print_path);
+            f.add_context()?;
+            for frame in frames {
+                let mut f = f.frame();
+                if frame.symbols.is_empty() {
+                    f.print_raw(frame.frame.ip(), None, None, None)?;
+                } else {
+                    for symbol in frame.symbols.iter() {
+                        f.print_raw_with_column(
+                            frame.frame.ip(),
+                            symbol.name.as_ref().map(|b| SymbolName::new(b)),
+                            symbol.filename.as_ref().map(|b| match b {
+                                BytesOrWide::Bytes(w) => BytesOrWideString::Bytes(w),
+                                BytesOrWide::Wide(w) => BytesOrWideString::Wide(w),
+                            }),
+                            symbol.lineno,
+                            symbol.colno,
+                        )?;
+                    }
+                }
+            }
+            f.finish()?;
+            Ok(())
+        }
+    }
+
+    struct LazilyResolvedCapture {
+        sync: Once,
+        capture: UnsafeCell<Capture>,
+    }
+
+    impl LazilyResolvedCapture {
+        fn new(capture: Capture) -> Self {
+            LazilyResolvedCapture {
+                sync: Once::new(),
+                capture: UnsafeCell::new(capture),
+            }
+        }
+
+        fn force(&self) -> &Capture {
+            self.sync.call_once(|| {
+                // Safety: This exclusive reference can't overlap with any
+                // others. `Once` guarantees callers will block until this
+                // closure returns. `Once` also guarantees only a single caller
+                // will enter this closure.
+                unsafe { &mut *self.capture.get() }.resolve();
+            });
+
+            // Safety: This shared reference can't overlap with the exclusive
+            // reference above.
+            unsafe { &*self.capture.get() }
+        }
+    }
+
+    // Safety: Access to the inner value is synchronized using a thread-safe
+    // `Once`. So long as `Capture` is `Sync`, `LazilyResolvedCapture` is too
+    unsafe impl Sync for LazilyResolvedCapture where Capture: Sync {}
+
+    impl Capture {
+        fn resolve(&mut self) {
+            // If we're already resolved, nothing to do!
+            if self.resolved {
+                return;
+            }
+            self.resolved = true;
+
+            for frame in self.frames.iter_mut() {
+                let symbols = &mut frame.symbols;
+                let frame = &frame.frame;
+                backtrace::resolve_frame(frame, |symbol| {
+                    symbols.push(BacktraceSymbol {
+                        name: symbol.name().map(|m| m.as_bytes().to_vec()),
+                        filename: symbol.filename_raw().map(|b| match b {
+                            BytesOrWideString::Bytes(b) => BytesOrWide::Bytes(b.to_owned()),
+                            BytesOrWideString::Wide(b) => BytesOrWide::Wide(b.to_owned()),
+                        }),
+                        lineno: symbol.lineno(),
+                        colno: symbol.colno(),
+                    });
+                });
+            }
+        }
+    }
+
+    // Prints the filename of the backtrace frame.
+    fn output_filename(
+        fmt: &mut fmt::Formatter,
+        bows: BytesOrWideString,
+        print_fmt: PrintFmt,
+        cwd: Option<&PathBuf>,
+    ) -> fmt::Result {
+        let file: Cow<Path> = match bows {
+            #[cfg(unix)]
+            BytesOrWideString::Bytes(bytes) => {
+                use std::os::unix::ffi::OsStrExt;
+                Path::new(std::ffi::OsStr::from_bytes(bytes)).into()
+            }
+            #[cfg(not(unix))]
+            BytesOrWideString::Bytes(bytes) => {
+                Path::new(std::str::from_utf8(bytes).unwrap_or("<unknown>")).into()
+            }
+            #[cfg(windows)]
+            BytesOrWideString::Wide(wide) => {
+                use std::os::windows::ffi::OsStringExt;
+                Cow::Owned(std::ffi::OsString::from_wide(wide).into())
+            }
+            #[cfg(not(windows))]
+            BytesOrWideString::Wide(_wide) => Path::new("<unknown>").into(),
+        };
+        if print_fmt == PrintFmt::Short && file.is_absolute() {
+            if let Some(cwd) = cwd {
+                if let Ok(stripped) = file.strip_prefix(&cwd) {
+                    if let Some(s) = stripped.to_str() {
+                        return write!(fmt, ".{}{}", path::MAIN_SEPARATOR, s);
+                    }
+                }
+            }
+        }
+        Display::fmt(&file.display(), fmt)
+    }
+}
+
+fn _assert_send_sync() {
+    fn _assert<T: Send + Sync>() {}
+    _assert::<Backtrace>();
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/context.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/context.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/context.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/context.rs	2021-12-09 12:01:26.000000000 +0000
@@ -143,7 +143,7 @@
     }
 
     fn source(&self) -> Option<&(dyn StdError + 'static)> {
-        Some(self.error.inner.error())
+        Some(unsafe { crate::ErrorImpl::error(self.error.inner.by_ref()) })
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,16 @@
 use crate::alloc::Box;
 use crate::backtrace::Backtrace;
 use crate::chain::Chain;
+#[cfg(any(feature = "std", anyhow_no_ptr_addr_of))]
+use crate::ptr::Mut;
+use crate::ptr::{Own, Ref};
 use crate::{Error, StdError};
 use core::any::TypeId;
 use core::fmt::{self, Debug, Display};
-use core::mem::{self, ManuallyDrop};
-use core::ptr::{self, NonNull};
+use core::mem::ManuallyDrop;
+#[cfg(not(anyhow_no_ptr_addr_of))]
+use core::ptr;
+use core::ptr::NonNull;
 
 #[cfg(feature = "std")]
 use core::ops::{Deref, DerefMut};
@@ -80,10 +85,15 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<E>,
             object_ref: object_ref::<E>,
+            #[cfg(anyhow_no_ptr_addr_of)]
             object_mut: object_mut::<E>,
             object_boxed: object_boxed::<E>,
             object_downcast: object_downcast::<E>,
+            #[cfg(anyhow_no_ptr_addr_of)]
+            object_downcast_mut: object_downcast_mut::<E>,
             object_drop_rest: object_drop_front::<E>,
+            #[cfg(all(not(backtrace), feature = "backtrace"))]
+            object_backtrace: no_backtrace,
         };
 
         // Safety: passing vtable that operates on the right type E.
@@ -99,11 +109,15 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<MessageError<M>>,
             object_ref: object_ref::<MessageError<M>>,
-            #[cfg(feature = "std")]
+            #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
             object_mut: object_mut::<MessageError<M>>,
             object_boxed: object_boxed::<MessageError<M>>,
             object_downcast: object_downcast::<M>,
+            #[cfg(anyhow_no_ptr_addr_of)]
+            object_downcast_mut: object_downcast_mut::<M>,
             object_drop_rest: object_drop_front::<M>,
+            #[cfg(all(not(backtrace), feature = "backtrace"))]
+            object_backtrace: no_backtrace,
         };
 
         // Safety: MessageError is repr(transparent) so it is okay for the
@@ -120,11 +134,15 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<DisplayError<M>>,
             object_ref: object_ref::<DisplayError<M>>,
-            #[cfg(feature = "std")]
+            #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
             object_mut: object_mut::<DisplayError<M>>,
             object_boxed: object_boxed::<DisplayError<M>>,
             object_downcast: object_downcast::<M>,
+            #[cfg(anyhow_no_ptr_addr_of)]
+            object_downcast_mut: object_downcast_mut::<M>,
             object_drop_rest: object_drop_front::<M>,
+            #[cfg(all(not(backtrace), feature = "backtrace"))]
+            object_backtrace: no_backtrace,
         };
 
         // Safety: DisplayError is repr(transparent) so it is okay for the
@@ -143,10 +161,15 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<ContextError<C, E>>,
             object_ref: object_ref::<ContextError<C, E>>,
+            #[cfg(anyhow_no_ptr_addr_of)]
             object_mut: object_mut::<ContextError<C, E>>,
             object_boxed: object_boxed::<ContextError<C, E>>,
             object_downcast: context_downcast::<C, E>,
+            #[cfg(anyhow_no_ptr_addr_of)]
+            object_downcast_mut: context_downcast_mut::<C, E>,
             object_drop_rest: context_drop_rest::<C, E>,
+            #[cfg(all(not(backtrace), feature = "backtrace"))]
+            object_backtrace: no_backtrace,
         };
 
         // Safety: passing vtable that operates on the right type.
@@ -163,10 +186,15 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<BoxedError>,
             object_ref: object_ref::<BoxedError>,
+            #[cfg(anyhow_no_ptr_addr_of)]
             object_mut: object_mut::<BoxedError>,
             object_boxed: object_boxed::<BoxedError>,
             object_downcast: object_downcast::<Box<dyn StdError + Send + Sync>>,
+            #[cfg(anyhow_no_ptr_addr_of)]
+            object_downcast_mut: object_downcast_mut::<Box<dyn StdError + Send + Sync>>,
             object_drop_rest: object_drop_front::<Box<dyn StdError + Send + Sync>>,
+            #[cfg(all(not(backtrace), feature = "backtrace"))]
+            object_backtrace: no_backtrace,
         };
 
         // Safety: BoxedError is repr(transparent) so it is okay for the vtable
@@ -187,7 +215,7 @@
     where
         E: StdError + Send + Sync + 'static,
     {
-        let inner = Box::new(ErrorImpl {
+        let inner: Box<ErrorImpl<E>> = Box::new(ErrorImpl {
             vtable,
             backtrace,
             _object: error,
@@ -198,8 +226,7 @@
         // result is a thin pointer. The necessary behavior for manipulating the
         // underlying ErrorImpl<E> is preserved in the vtable provided by the
         // caller rather than a builtin fat pointer vtable.
-        let erased = mem::transmute::<Box<ErrorImpl<E>>, Box<ErrorImpl<()>>>(inner);
-        let inner = ManuallyDrop::new(erased);
+        let inner = Own::new(inner).cast::<ErrorImpl>();
         Error { inner }
     }
 
@@ -269,11 +296,15 @@
         let vtable = &ErrorVTable {
             object_drop: object_drop::<ContextError<C, Error>>,
             object_ref: object_ref::<ContextError<C, Error>>,
-            #[cfg(feature = "std")]
+            #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
             object_mut: object_mut::<ContextError<C, Error>>,
             object_boxed: object_boxed::<ContextError<C, Error>>,
             object_downcast: context_chain_downcast::<C>,
+            #[cfg(anyhow_no_ptr_addr_of)]
+            object_downcast_mut: context_chain_downcast_mut::<C>,
             object_drop_rest: context_chain_drop_rest::<C>,
+            #[cfg(all(not(backtrace), feature = "backtrace"))]
+            object_backtrace: context_backtrace::<C>,
         };
 
         // As the cause is anyhow::Error, we already have a backtrace for it.
@@ -285,9 +316,6 @@
 
     /// Get the backtrace for this Error.
     ///
-    /// Backtraces are only available on the nightly channel. Tracking issue:
-    /// [rust-lang/rust#53487][tracking].
-    ///
     /// In order for the backtrace to be meaningful, one of the two environment
     /// variables `RUST_LIB_BACKTRACE=1` or `RUST_BACKTRACE=1` must be defined
     /// and `RUST_LIB_BACKTRACE` must not be `0`. Backtraces are somewhat
@@ -301,10 +329,25 @@
     /// - If you want only panics to have backtraces, set `RUST_BACKTRACE=1` and
     ///   `RUST_LIB_BACKTRACE=0`.
     ///
+    /// # Stability
+    ///
+    /// Standard library backtraces are only available on the nightly channel.
+    /// Tracking issue: [rust-lang/rust#53487][tracking].
+    ///
+    /// On stable compilers, this function is only available if the crate's
+    /// "backtrace" feature is enabled, and will use the `backtrace` crate as
+    /// the underlying backtrace implementation.
+    ///
+    /// ```toml
+    /// [dependencies]
+    /// anyhow = { version = "1.0", features = ["backtrace"] }
+    /// ```
+    ///
     /// [tracking]: https://github.com/rust-lang/rust/issues/53487
-    #[cfg(backtrace)]
-    pub fn backtrace(&self) -> &Backtrace {
-        self.inner.backtrace()
+    #[cfg(any(backtrace, feature = "backtrace"))]
+    #[cfg_attr(doc_cfg, doc(cfg(any(nightly, feature = "backtrace"))))]
+    pub fn backtrace(&self) -> &impl_backtrace!() {
+        unsafe { ErrorImpl::backtrace(self.inner.by_ref()) }
     }
 
     /// An iterator of the chain of source errors contained by this Error.
@@ -331,7 +374,7 @@
     #[cfg(feature = "std")]
     #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
     pub fn chain(&self) -> Chain {
-        self.inner.chain()
+        unsafe { ErrorImpl::chain(self.inner.by_ref()) }
     }
 
     /// The lowest level cause of this error &mdash; this error's cause's
@@ -361,16 +404,23 @@
     }
 
     /// Attempt to downcast the error object to a concrete type.
-    pub fn downcast<E>(self) -> Result<E, Self>
+    pub fn downcast<E>(mut self) -> Result<E, Self>
     where
         E: Display + Debug + Send + Sync + 'static,
     {
         let target = TypeId::of::<E>();
+        let inner = self.inner.by_mut();
         unsafe {
             // Use vtable to find NonNull<()> which points to a value of type E
             // somewhere inside the data structure.
-            let addr = match (self.inner.vtable.object_downcast)(&self.inner, target) {
-                Some(addr) => addr,
+            #[cfg(not(anyhow_no_ptr_addr_of))]
+            let addr = match (vtable(inner.ptr).object_downcast)(inner.by_ref(), target) {
+                Some(addr) => addr.by_mut().extend(),
+                None => return Err(self),
+            };
+            #[cfg(anyhow_no_ptr_addr_of)]
+            let addr = match (vtable(inner.ptr).object_downcast_mut)(inner, target) {
+                Some(addr) => addr.extend(),
                 None => return Err(self),
             };
 
@@ -379,15 +429,10 @@
             let outer = ManuallyDrop::new(self);
 
             // Read E from where the vtable found it.
-            let error = ptr::read(addr.cast::<E>().as_ptr());
-
-            // Read Box<ErrorImpl<()>> from self. Can't move it out because
-            // Error has a Drop impl which we want to not run.
-            let inner = ptr::read(&outer.inner);
-            let erased = ManuallyDrop::into_inner(inner);
+            let error = addr.cast::<E>().read();
 
             // Drop rest of the data structure outside of E.
-            (erased.vtable.object_drop_rest)(erased, target);
+            (vtable(outer.inner.ptr).object_drop_rest)(outer.inner, target);
 
             Ok(error)
         }
@@ -437,8 +482,8 @@
         unsafe {
             // Use vtable to find NonNull<()> which points to a value of type E
             // somewhere inside the data structure.
-            let addr = (self.inner.vtable.object_downcast)(&self.inner, target)?;
-            Some(&*addr.cast::<E>().as_ptr())
+            let addr = (vtable(self.inner.ptr).object_downcast)(self.inner.by_ref(), target)?;
+            Some(addr.cast::<E>().deref())
         }
     }
 
@@ -451,8 +496,15 @@
         unsafe {
             // Use vtable to find NonNull<()> which points to a value of type E
             // somewhere inside the data structure.
-            let addr = (self.inner.vtable.object_downcast)(&self.inner, target)?;
-            Some(&mut *addr.cast::<E>().as_ptr())
+
+            #[cfg(not(anyhow_no_ptr_addr_of))]
+            let addr =
+                (vtable(self.inner.ptr).object_downcast)(self.inner.by_ref(), target)?.by_mut();
+
+            #[cfg(anyhow_no_ptr_addr_of)]
+            let addr = (vtable(self.inner.ptr).object_downcast_mut)(self.inner.by_mut(), target)?;
+
+            Some(addr.cast::<E>().deref_mut())
         }
     }
 }
@@ -475,7 +527,7 @@
     type Target = dyn StdError + Send + Sync + 'static;
 
     fn deref(&self) -> &Self::Target {
-        self.inner.error()
+        unsafe { ErrorImpl::error(self.inner.by_ref()) }
     }
 }
 
@@ -483,122 +535,180 @@
 #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
 impl DerefMut for Error {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        self.inner.error_mut()
+        unsafe { ErrorImpl::error_mut(self.inner.by_mut()) }
     }
 }
 
 impl Display for Error {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.display(formatter)
+        unsafe { ErrorImpl::display(self.inner.by_ref(), formatter) }
     }
 }
 
 impl Debug for Error {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.debug(formatter)
+        unsafe { ErrorImpl::debug(self.inner.by_ref(), formatter) }
     }
 }
 
 impl Drop for Error {
     fn drop(&mut self) {
         unsafe {
-            // Read Box<ErrorImpl<()>> from self.
-            let inner = ptr::read(&self.inner);
-            let erased = ManuallyDrop::into_inner(inner);
-
             // Invoke the vtable's drop behavior.
-            (erased.vtable.object_drop)(erased);
+            (vtable(self.inner.ptr).object_drop)(self.inner);
         }
     }
 }
 
 struct ErrorVTable {
-    object_drop: unsafe fn(Box<ErrorImpl<()>>),
-    object_ref: unsafe fn(&ErrorImpl<()>) -> &(dyn StdError + Send + Sync + 'static),
-    #[cfg(feature = "std")]
-    object_mut: unsafe fn(&mut ErrorImpl<()>) -> &mut (dyn StdError + Send + Sync + 'static),
-    object_boxed: unsafe fn(Box<ErrorImpl<()>>) -> Box<dyn StdError + Send + Sync + 'static>,
-    object_downcast: unsafe fn(&ErrorImpl<()>, TypeId) -> Option<NonNull<()>>,
-    object_drop_rest: unsafe fn(Box<ErrorImpl<()>>, TypeId),
+    object_drop: unsafe fn(Own<ErrorImpl>),
+    object_ref: unsafe fn(Ref<ErrorImpl>) -> Ref<dyn StdError + Send + Sync + 'static>,
+    #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
+    object_mut: unsafe fn(Mut<ErrorImpl>) -> &mut (dyn StdError + Send + Sync + 'static),
+    object_boxed: unsafe fn(Own<ErrorImpl>) -> Box<dyn StdError + Send + Sync + 'static>,
+    object_downcast: unsafe fn(Ref<ErrorImpl>, TypeId) -> Option<Ref<()>>,
+    #[cfg(anyhow_no_ptr_addr_of)]
+    object_downcast_mut: unsafe fn(Mut<ErrorImpl>, TypeId) -> Option<Mut<()>>,
+    object_drop_rest: unsafe fn(Own<ErrorImpl>, TypeId),
+    #[cfg(all(not(backtrace), feature = "backtrace"))]
+    object_backtrace: unsafe fn(Ref<ErrorImpl>) -> Option<&Backtrace>,
 }
 
 // Safety: requires layout of *e to match ErrorImpl<E>.
-unsafe fn object_drop<E>(e: Box<ErrorImpl<()>>) {
+unsafe fn object_drop<E>(e: Own<ErrorImpl>) {
     // Cast back to ErrorImpl<E> so that the allocator receives the correct
     // Layout to deallocate the Box's memory.
-    let unerased = mem::transmute::<Box<ErrorImpl<()>>, Box<ErrorImpl<E>>>(e);
+    let unerased = e.cast::<ErrorImpl<E>>().boxed();
     drop(unerased);
 }
 
 // Safety: requires layout of *e to match ErrorImpl<E>.
-unsafe fn object_drop_front<E>(e: Box<ErrorImpl<()>>, target: TypeId) {
+unsafe fn object_drop_front<E>(e: Own<ErrorImpl>, target: TypeId) {
     // Drop the fields of ErrorImpl other than E as well as the Box allocation,
     // without dropping E itself. This is used by downcast after doing a
     // ptr::read to take ownership of the E.
     let _ = target;
-    let unerased = mem::transmute::<Box<ErrorImpl<()>>, Box<ErrorImpl<ManuallyDrop<E>>>>(e);
+    let unerased = e.cast::<ErrorImpl<ManuallyDrop<E>>>().boxed();
     drop(unerased);
 }
 
 // Safety: requires layout of *e to match ErrorImpl<E>.
-unsafe fn object_ref<E>(e: &ErrorImpl<()>) -> &(dyn StdError + Send + Sync + 'static)
+unsafe fn object_ref<E>(e: Ref<ErrorImpl>) -> Ref<dyn StdError + Send + Sync + 'static>
 where
     E: StdError + Send + Sync + 'static,
 {
     // Attach E's native StdError vtable onto a pointer to self._object.
-    &(*(e as *const ErrorImpl<()> as *const ErrorImpl<E>))._object
+
+    let unerased = e.cast::<ErrorImpl<E>>();
+
+    #[cfg(not(anyhow_no_ptr_addr_of))]
+    return Ref::from_raw(NonNull::new_unchecked(
+        ptr::addr_of!((*unerased.as_ptr())._object) as *mut E,
+    ));
+
+    #[cfg(anyhow_no_ptr_addr_of)]
+    return Ref::new(&unerased.deref()._object);
 }
 
-// Safety: requires layout of *e to match ErrorImpl<E>.
-#[cfg(feature = "std")]
-unsafe fn object_mut<E>(e: &mut ErrorImpl<()>) -> &mut (dyn StdError + Send + Sync + 'static)
+// Safety: requires layout of *e to match ErrorImpl<E>, and for `e` to be derived
+// from a `&mut`
+#[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
+unsafe fn object_mut<E>(e: Mut<ErrorImpl>) -> &mut (dyn StdError + Send + Sync + 'static)
 where
     E: StdError + Send + Sync + 'static,
 {
     // Attach E's native StdError vtable onto a pointer to self._object.
-    &mut (*(e as *mut ErrorImpl<()> as *mut ErrorImpl<E>))._object
+    &mut e.cast::<ErrorImpl<E>>().deref_mut()._object
 }
 
 // Safety: requires layout of *e to match ErrorImpl<E>.
-unsafe fn object_boxed<E>(e: Box<ErrorImpl<()>>) -> Box<dyn StdError + Send + Sync + 'static>
+unsafe fn object_boxed<E>(e: Own<ErrorImpl>) -> Box<dyn StdError + Send + Sync + 'static>
 where
     E: StdError + Send + Sync + 'static,
 {
     // Attach ErrorImpl<E>'s native StdError vtable. The StdError impl is below.
-    mem::transmute::<Box<ErrorImpl<()>>, Box<ErrorImpl<E>>>(e)
+    e.cast::<ErrorImpl<E>>().boxed()
 }
 
 // Safety: requires layout of *e to match ErrorImpl<E>.
-unsafe fn object_downcast<E>(e: &ErrorImpl<()>, target: TypeId) -> Option<NonNull<()>>
+unsafe fn object_downcast<E>(e: Ref<ErrorImpl>, target: TypeId) -> Option<Ref<()>>
 where
     E: 'static,
 {
     if TypeId::of::<E>() == target {
         // Caller is looking for an E pointer and e is ErrorImpl<E>, take a
         // pointer to its E field.
-        let unerased = e as *const ErrorImpl<()> as *const ErrorImpl<E>;
-        let addr = &(*unerased)._object as *const E as *mut ();
-        Some(NonNull::new_unchecked(addr))
+
+        let unerased = e.cast::<ErrorImpl<E>>();
+
+        #[cfg(not(anyhow_no_ptr_addr_of))]
+        return Some(
+            Ref::from_raw(NonNull::new_unchecked(
+                ptr::addr_of!((*unerased.as_ptr())._object) as *mut E,
+            ))
+            .cast::<()>(),
+        );
+
+        #[cfg(anyhow_no_ptr_addr_of)]
+        return Some(Ref::new(&unerased.deref()._object).cast::<()>());
     } else {
         None
     }
 }
 
+// Safety: requires layout of *e to match ErrorImpl<E>.
+#[cfg(anyhow_no_ptr_addr_of)]
+unsafe fn object_downcast_mut<E>(e: Mut<ErrorImpl>, target: TypeId) -> Option<Mut<()>>
+where
+    E: 'static,
+{
+    if TypeId::of::<E>() == target {
+        // Caller is looking for an E pointer and e is ErrorImpl<E>, take a
+        // pointer to its E field.
+        let unerased = e.cast::<ErrorImpl<E>>().deref_mut();
+        Some(Mut::new(&mut unerased._object).cast::<()>())
+    } else {
+        None
+    }
+}
+
+#[cfg(all(not(backtrace), feature = "backtrace"))]
+fn no_backtrace(e: Ref<ErrorImpl>) -> Option<&Backtrace> {
+    let _ = e;
+    None
+}
+
 // Safety: requires layout of *e to match ErrorImpl<ContextError<C, E>>.
 #[cfg(feature = "std")]
-unsafe fn context_downcast<C, E>(e: &ErrorImpl<()>, target: TypeId) -> Option<NonNull<()>>
+unsafe fn context_downcast<C, E>(e: Ref<ErrorImpl>, target: TypeId) -> Option<Ref<()>>
+where
+    C: 'static,
+    E: 'static,
+{
+    if TypeId::of::<C>() == target {
+        let unerased = e.cast::<ErrorImpl<ContextError<C, E>>>().deref();
+        Some(Ref::new(&unerased._object.context).cast::<()>())
+    } else if TypeId::of::<E>() == target {
+        let unerased = e.cast::<ErrorImpl<ContextError<C, E>>>().deref();
+        Some(Ref::new(&unerased._object.error).cast::<()>())
+    } else {
+        None
+    }
+}
+
+// Safety: requires layout of *e to match ErrorImpl<ContextError<C, E>>.
+#[cfg(all(feature = "std", anyhow_no_ptr_addr_of))]
+unsafe fn context_downcast_mut<C, E>(e: Mut<ErrorImpl>, target: TypeId) -> Option<Mut<()>>
 where
     C: 'static,
     E: 'static,
 {
     if TypeId::of::<C>() == target {
-        let unerased = e as *const ErrorImpl<()> as *const ErrorImpl<ContextError<C, E>>;
-        let addr = &(*unerased)._object.context as *const C as *mut ();
-        Some(NonNull::new_unchecked(addr))
+        let unerased = e.cast::<ErrorImpl<ContextError<C, E>>>().deref_mut();
+        Some(Mut::new(&mut unerased._object.context).cast::<()>())
     } else if TypeId::of::<E>() == target {
-        let unerased = e as *const ErrorImpl<()> as *const ErrorImpl<ContextError<C, E>>;
-        let addr = &(*unerased)._object.error as *const E as *mut ();
-        Some(NonNull::new_unchecked(addr))
+        let unerased = e.cast::<ErrorImpl<ContextError<C, E>>>().deref_mut();
+        Some(Mut::new(&mut unerased._object.error).cast::<()>())
     } else {
         None
     }
@@ -606,7 +716,7 @@
 
 // Safety: requires layout of *e to match ErrorImpl<ContextError<C, E>>.
 #[cfg(feature = "std")]
-unsafe fn context_drop_rest<C, E>(e: Box<ErrorImpl<()>>, target: TypeId)
+unsafe fn context_drop_rest<C, E>(e: Own<ErrorImpl>, target: TypeId)
 where
     C: 'static,
     E: 'static,
@@ -614,68 +724,92 @@
     // Called after downcasting by value to either the C or the E and doing a
     // ptr::read to take ownership of that value.
     if TypeId::of::<C>() == target {
-        let unerased = mem::transmute::<
-            Box<ErrorImpl<()>>,
-            Box<ErrorImpl<ContextError<ManuallyDrop<C>, E>>>,
-        >(e);
+        let unerased = e
+            .cast::<ErrorImpl<ContextError<ManuallyDrop<C>, E>>>()
+            .boxed();
         drop(unerased);
     } else {
-        let unerased = mem::transmute::<
-            Box<ErrorImpl<()>>,
-            Box<ErrorImpl<ContextError<C, ManuallyDrop<E>>>>,
-        >(e);
+        let unerased = e
+            .cast::<ErrorImpl<ContextError<C, ManuallyDrop<E>>>>()
+            .boxed();
         drop(unerased);
     }
 }
 
 // Safety: requires layout of *e to match ErrorImpl<ContextError<C, Error>>.
-unsafe fn context_chain_downcast<C>(e: &ErrorImpl<()>, target: TypeId) -> Option<NonNull<()>>
+unsafe fn context_chain_downcast<C>(e: Ref<ErrorImpl>, target: TypeId) -> Option<Ref<()>>
 where
     C: 'static,
 {
+    let unerased = e.cast::<ErrorImpl<ContextError<C, Error>>>().deref();
     if TypeId::of::<C>() == target {
-        let unerased = e as *const ErrorImpl<()> as *const ErrorImpl<ContextError<C, Error>>;
-        let addr = &(*unerased)._object.context as *const C as *mut ();
-        Some(NonNull::new_unchecked(addr))
+        Some(Ref::new(&unerased._object.context).cast::<()>())
     } else {
         // Recurse down the context chain per the inner error's vtable.
-        let unerased = e as *const ErrorImpl<()> as *const ErrorImpl<ContextError<C, Error>>;
-        let source = &(*unerased)._object.error;
-        (source.inner.vtable.object_downcast)(&source.inner, target)
+        let source = &unerased._object.error;
+        (vtable(source.inner.ptr).object_downcast)(source.inner.by_ref(), target)
     }
 }
 
 // Safety: requires layout of *e to match ErrorImpl<ContextError<C, Error>>.
-unsafe fn context_chain_drop_rest<C>(e: Box<ErrorImpl<()>>, target: TypeId)
+#[cfg(anyhow_no_ptr_addr_of)]
+unsafe fn context_chain_downcast_mut<C>(e: Mut<ErrorImpl>, target: TypeId) -> Option<Mut<()>>
+where
+    C: 'static,
+{
+    let unerased = e.cast::<ErrorImpl<ContextError<C, Error>>>().deref_mut();
+    if TypeId::of::<C>() == target {
+        Some(Mut::new(&mut unerased._object.context).cast::<()>())
+    } else {
+        // Recurse down the context chain per the inner error's vtable.
+        let source = &mut unerased._object.error;
+        (vtable(source.inner.ptr).object_downcast_mut)(source.inner.by_mut(), target)
+    }
+}
+
+// Safety: requires layout of *e to match ErrorImpl<ContextError<C, Error>>.
+unsafe fn context_chain_drop_rest<C>(e: Own<ErrorImpl>, target: TypeId)
 where
     C: 'static,
 {
     // Called after downcasting by value to either the C or one of the causes
     // and doing a ptr::read to take ownership of that value.
     if TypeId::of::<C>() == target {
-        let unerased = mem::transmute::<
-            Box<ErrorImpl<()>>,
-            Box<ErrorImpl<ContextError<ManuallyDrop<C>, Error>>>,
-        >(e);
+        let unerased = e
+            .cast::<ErrorImpl<ContextError<ManuallyDrop<C>, Error>>>()
+            .boxed();
         // Drop the entire rest of the data structure rooted in the next Error.
         drop(unerased);
     } else {
-        let unerased = mem::transmute::<
-            Box<ErrorImpl<()>>,
-            Box<ErrorImpl<ContextError<C, ManuallyDrop<Error>>>>,
-        >(e);
-        // Read out a ManuallyDrop<Box<ErrorImpl<()>>> from the next error.
-        let inner = ptr::read(&unerased._object.error.inner);
+        let unerased = e
+            .cast::<ErrorImpl<ContextError<C, ManuallyDrop<Error>>>>()
+            .boxed();
+        // Read the Own<ErrorImpl> from the next error.
+        let inner = unerased._object.error.inner;
         drop(unerased);
-        let erased = ManuallyDrop::into_inner(inner);
+        let vtable = vtable(inner.ptr);
         // Recursively drop the next error using the same target typeid.
-        (erased.vtable.object_drop_rest)(erased, target);
+        (vtable.object_drop_rest)(inner, target);
     }
 }
 
+// Safety: requires layout of *e to match ErrorImpl<ContextError<C, Error>>.
+#[cfg(all(not(backtrace), feature = "backtrace"))]
+#[allow(clippy::unnecessary_wraps)]
+unsafe fn context_backtrace<C>(e: Ref<ErrorImpl>) -> Option<&Backtrace>
+where
+    C: 'static,
+{
+    let unerased = e.cast::<ErrorImpl<ContextError<C, Error>>>().deref();
+    let backtrace = ErrorImpl::backtrace(unerased._object.error.inner.by_ref());
+    Some(backtrace)
+}
+
+// NOTE: If working with `ErrorImpl<()>`, references should be avoided in favor
+// of raw pointers and `NonNull`.
 // repr C to ensure that E remains in the final position.
 #[repr(C)]
-pub(crate) struct ErrorImpl<E> {
+pub(crate) struct ErrorImpl<E = ()> {
     vtable: &'static ErrorVTable,
     backtrace: Option<Backtrace>,
     // NOTE: Don't use directly. Use only through vtable. Erased type may have
@@ -683,6 +817,13 @@
     _object: E,
 }
 
+// Reads the vtable out of `p`. This is the same as `p.as_ref().vtable`, but
+// avoids converting `p` into a reference.
+unsafe fn vtable(p: NonNull<ErrorImpl>) -> &'static ErrorVTable {
+    // NOTE: This assumes that `ErrorVTable` is the first field of ErrorImpl.
+    *(p.as_ptr() as *const &'static ErrorVTable)
+}
+
 // repr C to ensure that ContextError<C, E> has the same layout as
 // ContextError<ManuallyDrop<C>, E> and ContextError<C, ManuallyDrop<E>>.
 #[repr(C)]
@@ -692,41 +833,54 @@
 }
 
 impl<E> ErrorImpl<E> {
-    fn erase(&self) -> &ErrorImpl<()> {
+    fn erase(&self) -> Ref<ErrorImpl> {
         // Erase the concrete type of E but preserve the vtable in self.vtable
         // for manipulating the resulting thin pointer. This is analogous to an
         // unsize coercion.
-        unsafe { &*(self as *const ErrorImpl<E> as *const ErrorImpl<()>) }
+        Ref::new(self).cast::<ErrorImpl>()
     }
 }
 
-impl ErrorImpl<()> {
-    pub(crate) fn error(&self) -> &(dyn StdError + Send + Sync + 'static) {
+impl ErrorImpl {
+    pub(crate) unsafe fn error(this: Ref<Self>) -> &(dyn StdError + Send + Sync + 'static) {
         // Use vtable to attach E's native StdError vtable for the right
         // original type E.
-        unsafe { &*(self.vtable.object_ref)(self) }
+        (vtable(this.ptr).object_ref)(this).deref()
     }
 
     #[cfg(feature = "std")]
-    pub(crate) fn error_mut(&mut self) -> &mut (dyn StdError + Send + Sync + 'static) {
+    pub(crate) unsafe fn error_mut(this: Mut<Self>) -> &mut (dyn StdError + Send + Sync + 'static) {
         // Use vtable to attach E's native StdError vtable for the right
         // original type E.
-        unsafe { &mut *(self.vtable.object_mut)(self) }
+
+        #[cfg(not(anyhow_no_ptr_addr_of))]
+        return (vtable(this.ptr).object_ref)(this.by_ref())
+            .by_mut()
+            .deref_mut();
+
+        #[cfg(anyhow_no_ptr_addr_of)]
+        return (vtable(this.ptr).object_mut)(this);
     }
 
-    #[cfg(backtrace)]
-    pub(crate) fn backtrace(&self) -> &Backtrace {
+    #[cfg(any(backtrace, feature = "backtrace"))]
+    pub(crate) unsafe fn backtrace(this: Ref<Self>) -> &Backtrace {
         // This unwrap can only panic if the underlying error's backtrace method
         // is nondeterministic, which would only happen in maliciously
         // constructed code.
-        self.backtrace
+        this.deref()
+            .backtrace
             .as_ref()
-            .or_else(|| self.error().backtrace())
+            .or_else(|| {
+                #[cfg(backtrace)]
+                return Self::error(this).backtrace();
+                #[cfg(all(not(backtrace), feature = "backtrace"))]
+                return (vtable(this.ptr).object_backtrace)(this);
+            })
             .expect("backtrace capture failed")
     }
 
-    pub(crate) fn chain(&self) -> Chain {
-        Chain::new(self.error())
+    pub(crate) unsafe fn chain(this: Ref<Self>) -> Chain {
+        Chain::new(Self::error(this))
     }
 }
 
@@ -736,11 +890,11 @@
 {
     #[cfg(backtrace)]
     fn backtrace(&self) -> Option<&Backtrace> {
-        Some(self.erase().backtrace())
+        Some(unsafe { ErrorImpl::backtrace(self.erase()) })
     }
 
     fn source(&self) -> Option<&(dyn StdError + 'static)> {
-        self.erase().error().source()
+        unsafe { ErrorImpl::error(self.erase()).source() }
     }
 }
 
@@ -749,7 +903,7 @@
     E: Debug,
 {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        self.erase().debug(formatter)
+        unsafe { ErrorImpl::debug(self.erase(), formatter) }
     }
 }
 
@@ -758,7 +912,7 @@
     E: Display,
 {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        Display::fmt(&self.erase().error(), formatter)
+        unsafe { Display::fmt(ErrorImpl::error(self.erase()), formatter) }
     }
 }
 
@@ -766,14 +920,9 @@
     fn from(error: Error) -> Self {
         let outer = ManuallyDrop::new(error);
         unsafe {
-            // Read Box<ErrorImpl<()>> from error. Can't move it out because
-            // Error has a Drop impl which we want to not run.
-            let inner = ptr::read(&outer.inner);
-            let erased = ManuallyDrop::into_inner(inner);
-
             // Use vtable to attach ErrorImpl<E>'s native StdError vtable for
             // the right original type E.
-            (erased.vtable.object_boxed)(erased)
+            (vtable(outer.inner.ptr).object_boxed)(outer.inner)
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/fmt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/fmt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/fmt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/fmt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,14 @@
 use crate::chain::Chain;
 use crate::error::ErrorImpl;
+use crate::ptr::Ref;
 use core::fmt::{self, Debug, Write};
 
-impl ErrorImpl<()> {
-    pub(crate) fn display(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.error())?;
+impl ErrorImpl {
+    pub(crate) unsafe fn display(this: Ref<Self>, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", Self::error(this))?;
 
         if f.alternate() {
-            for cause in self.chain().skip(1) {
+            for cause in Self::chain(this).skip(1) {
                 write!(f, ": {}", cause)?;
             }
         }
@@ -15,8 +16,8 @@
         Ok(())
     }
 
-    pub(crate) fn debug(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let error = self.error();
+    pub(crate) unsafe fn debug(this: Ref<Self>, f: &mut fmt::Formatter) -> fmt::Result {
+        let error = Self::error(this);
 
         if f.alternate() {
             return Debug::fmt(error, f);
@@ -38,11 +39,11 @@
             }
         }
 
-        #[cfg(backtrace)]
+        #[cfg(any(backtrace, feature = "backtrace"))]
         {
-            use std::backtrace::BacktraceStatus;
+            use crate::backtrace::BacktraceStatus;
 
-            let backtrace = self.backtrace();
+            let backtrace = Self::backtrace(this);
             if let BacktraceStatus::Captured = backtrace.status() {
                 let mut backtrace = backtrace.to_string();
                 write!(f, "\n\n")?;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/kind.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/kind.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/kind.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/kind.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,9 +50,6 @@
 #[cfg(feature = "std")]
 use crate::StdError;
 
-#[cfg(backtrace)]
-use std::backtrace::Backtrace;
-
 pub struct Adhoc;
 
 pub trait AdhocKind: Sized {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -209,13 +209,24 @@
 //! will require an explicit `.map_err(Error::msg)` when working with a
 //! non-Anyhow error type inside a function that returns Anyhow's error type.
 
-#![doc(html_root_url = "https://docs.rs/anyhow/1.0.36")]
+#![doc(html_root_url = "https://docs.rs/anyhow/1.0.43")]
 #![cfg_attr(backtrace, feature(backtrace))]
 #![cfg_attr(doc_cfg, feature(doc_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
+#![deny(dead_code, unused_imports, unused_mut)]
 #![allow(
+    clippy::doc_markdown,
+    clippy::enum_glob_use,
+    clippy::missing_errors_doc,
+    clippy::missing_panics_doc,
+    clippy::module_name_repetitions,
+    clippy::must_use_candidate,
     clippy::needless_doctest_main,
     clippy::new_ret_no_self,
+    clippy::redundant_else,
+    clippy::unused_self,
+    clippy::used_underscore_binding,
+    clippy::wildcard_imports,
     clippy::wrong_self_convention
 )]
 
@@ -238,12 +249,12 @@
 mod fmt;
 mod kind;
 mod macros;
+mod ptr;
 mod wrapper;
 
-use crate::alloc::Box;
 use crate::error::ErrorImpl;
+use crate::ptr::Own;
 use core::fmt::Display;
-use core::mem::ManuallyDrop;
 
 #[cfg(not(feature = "std"))]
 use core::fmt::Debug;
@@ -363,7 +374,7 @@
 /// ```
 #[repr(transparent)]
 pub struct Error {
-    inner: ManuallyDrop<Box<ErrorImpl<()>>>,
+    inner: Own<ErrorImpl>,
 }
 
 /// Iterator of a chain of source errors.
@@ -604,9 +615,6 @@
     use crate::Error;
     use core::fmt::{Debug, Display};
 
-    #[cfg(backtrace)]
-    use std::backtrace::Backtrace;
-
     pub use core::result::Result::Err;
 
     #[doc(hidden)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -173,8 +173,9 @@
     };
     ($err:expr $(,)?) => ({
         use $crate::private::kind::*;
-        let error = $err;
-        (&error).anyhow_kind().new(error)
+        match $err {
+            error => (&error).anyhow_kind().new(error),
+        }
     });
     ($fmt:expr, $($arg:tt)*) => {
         $crate::private::new_adhoc(format!($fmt, $($arg)*))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/ptr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/ptr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/src/ptr.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/src/ptr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,199 @@
+use crate::alloc::Box;
+use core::marker::PhantomData;
+use core::ptr::NonNull;
+
+#[repr(transparent)]
+pub struct Own<T>
+where
+    T: ?Sized,
+{
+    pub ptr: NonNull<T>,
+}
+
+unsafe impl<T> Send for Own<T> where T: ?Sized {}
+
+unsafe impl<T> Sync for Own<T> where T: ?Sized {}
+
+impl<T> Copy for Own<T> where T: ?Sized {}
+
+impl<T> Clone for Own<T>
+where
+    T: ?Sized,
+{
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<T> Own<T>
+where
+    T: ?Sized,
+{
+    pub fn new(ptr: Box<T>) -> Self {
+        Own {
+            ptr: unsafe { NonNull::new_unchecked(Box::into_raw(ptr)) },
+        }
+    }
+
+    pub fn cast<U: CastTo>(self) -> Own<U::Target> {
+        Own {
+            ptr: self.ptr.cast(),
+        }
+    }
+
+    pub unsafe fn boxed(self) -> Box<T> {
+        Box::from_raw(self.ptr.as_ptr())
+    }
+
+    pub fn by_ref(&self) -> Ref<T> {
+        Ref {
+            ptr: self.ptr,
+            lifetime: PhantomData,
+        }
+    }
+
+    pub fn by_mut(&mut self) -> Mut<T> {
+        Mut {
+            ptr: self.ptr,
+            lifetime: PhantomData,
+        }
+    }
+}
+
+#[repr(transparent)]
+pub struct Ref<'a, T>
+where
+    T: ?Sized,
+{
+    pub ptr: NonNull<T>,
+    lifetime: PhantomData<&'a T>,
+}
+
+impl<'a, T> Copy for Ref<'a, T> where T: ?Sized {}
+
+impl<'a, T> Clone for Ref<'a, T>
+where
+    T: ?Sized,
+{
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<'a, T> Ref<'a, T>
+where
+    T: ?Sized,
+{
+    pub fn new(ptr: &'a T) -> Self {
+        Ref {
+            ptr: NonNull::from(ptr),
+            lifetime: PhantomData,
+        }
+    }
+
+    #[cfg(not(anyhow_no_ptr_addr_of))]
+    pub fn from_raw(ptr: NonNull<T>) -> Self {
+        Ref {
+            ptr,
+            lifetime: PhantomData,
+        }
+    }
+
+    pub fn cast<U: CastTo>(self) -> Ref<'a, U::Target> {
+        Ref {
+            ptr: self.ptr.cast(),
+            lifetime: PhantomData,
+        }
+    }
+
+    #[cfg(not(anyhow_no_ptr_addr_of))]
+    pub fn by_mut(self) -> Mut<'a, T> {
+        Mut {
+            ptr: self.ptr,
+            lifetime: PhantomData,
+        }
+    }
+
+    #[cfg(not(anyhow_no_ptr_addr_of))]
+    pub fn as_ptr(self) -> *const T {
+        self.ptr.as_ptr() as *const T
+    }
+
+    pub unsafe fn deref(self) -> &'a T {
+        &*self.ptr.as_ptr()
+    }
+}
+
+#[repr(transparent)]
+pub struct Mut<'a, T>
+where
+    T: ?Sized,
+{
+    pub ptr: NonNull<T>,
+    lifetime: PhantomData<&'a mut T>,
+}
+
+impl<'a, T> Copy for Mut<'a, T> where T: ?Sized {}
+
+impl<'a, T> Clone for Mut<'a, T>
+where
+    T: ?Sized,
+{
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<'a, T> Mut<'a, T>
+where
+    T: ?Sized,
+{
+    #[cfg(anyhow_no_ptr_addr_of)]
+    pub fn new(ptr: &'a mut T) -> Self {
+        Mut {
+            ptr: NonNull::from(ptr),
+            lifetime: PhantomData,
+        }
+    }
+
+    pub fn cast<U: CastTo>(self) -> Mut<'a, U::Target> {
+        Mut {
+            ptr: self.ptr.cast(),
+            lifetime: PhantomData,
+        }
+    }
+
+    #[cfg(not(anyhow_no_ptr_addr_of))]
+    pub fn by_ref(self) -> Ref<'a, T> {
+        Ref {
+            ptr: self.ptr,
+            lifetime: PhantomData,
+        }
+    }
+
+    pub fn extend<'b>(self) -> Mut<'b, T> {
+        Mut {
+            ptr: self.ptr,
+            lifetime: PhantomData,
+        }
+    }
+
+    pub unsafe fn deref_mut(self) -> &'a mut T {
+        &mut *self.ptr.as_ptr()
+    }
+}
+
+impl<'a, T> Mut<'a, T> {
+    pub unsafe fn read(self) -> T {
+        self.ptr.as_ptr().read()
+    }
+}
+
+// Force turbofish on all calls of `.cast::<U>()`.
+pub trait CastTo {
+    type Target;
+}
+
+impl<T> CastTo for T {
+    type Target = T;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/drop/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/drop/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/drop/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/drop/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![allow(clippy::module_name_repetitions)]
+
 use std::error::Error as StdError;
 use std::fmt::{self, Display};
 use std::sync::atomic::AtomicBool;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_boxed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_boxed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_boxed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_boxed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,8 @@
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
+
 use anyhow::anyhow;
 use std::error::Error as StdError;
 use std::io;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_chain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_chain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Error};
+use anyhow::{anyhow, Chain, Error};
 
 fn error() -> Error {
     anyhow!(0).context(1).context(2).context(3)
@@ -33,13 +33,36 @@
     let e = error();
     let mut chain = e.chain();
     assert_eq!(4, chain.len());
+    assert_eq!((4, Some(4)), chain.size_hint());
     assert_eq!("3", chain.next().unwrap().to_string());
     assert_eq!(3, chain.len());
+    assert_eq!((3, Some(3)), chain.size_hint());
     assert_eq!("0", chain.next_back().unwrap().to_string());
     assert_eq!(2, chain.len());
+    assert_eq!((2, Some(2)), chain.size_hint());
     assert_eq!("2", chain.next().unwrap().to_string());
     assert_eq!(1, chain.len());
+    assert_eq!((1, Some(1)), chain.size_hint());
     assert_eq!("1", chain.next_back().unwrap().to_string());
     assert_eq!(0, chain.len());
+    assert_eq!((0, Some(0)), chain.size_hint());
     assert!(chain.next().is_none());
 }
+
+#[test]
+fn test_default() {
+    let mut c = Chain::default();
+    assert!(c.next().is_none());
+}
+
+#[test]
+fn test_clone() {
+    let e = error();
+    let mut chain = e.chain().clone();
+    assert_eq!("3", chain.next().unwrap().to_string());
+    assert_eq!("2", chain.next().unwrap().to_string());
+    assert_eq!("1", chain.next().unwrap().to_string());
+    assert_eq!("0", chain.next().unwrap().to_string());
+    assert!(chain.next().is_none());
+    assert!(chain.next_back().is_none());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_context.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_context.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_context.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_context.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,8 @@
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
+
 mod drop;
 
 use crate::drop::{DetectDrop, Flag};
@@ -157,3 +162,10 @@
     drop(err);
     assert!(dropped.all());
 }
+
+#[test]
+fn test_root_cause() {
+    let (err, _) = make_chain();
+
+    assert_eq!(err.root_cause().to_string(), "no such file or directory");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_convert.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_convert.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_convert.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_convert.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![allow(clippy::unnecessary_wraps)]
+
 mod drop;
 
 use self::drop::{DetectDrop, Flag};
@@ -8,6 +10,26 @@
 fn test_convert() {
     let has_dropped = Flag::new();
     let error = Error::new(DetectDrop::new(&has_dropped));
+    let box_dyn = Box::<dyn StdError>::from(error);
+    assert_eq!("oh no!", box_dyn.to_string());
+    drop(box_dyn);
+    assert!(has_dropped.get());
+}
+
+#[test]
+fn test_convert_send() {
+    let has_dropped = Flag::new();
+    let error = Error::new(DetectDrop::new(&has_dropped));
+    let box_dyn = Box::<dyn StdError + Send>::from(error);
+    assert_eq!("oh no!", box_dyn.to_string());
+    drop(box_dyn);
+    assert!(has_dropped.get());
+}
+
+#[test]
+fn test_convert_send_sync() {
+    let has_dropped = Flag::new();
+    let error = Error::new(DetectDrop::new(&has_dropped));
     let box_dyn = Box::<dyn StdError + Send + Sync>::from(error);
     assert_eq!("oh no!", box_dyn.to_string());
     drop(box_dyn);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_downcast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_downcast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_downcast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_downcast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![allow(clippy::wildcard_imports)]
+
 mod common;
 mod drop;
 
@@ -66,6 +68,12 @@
             .unwrap()
             .to_string(),
     );
+
+    let mut bailed = bail_fmt().unwrap_err();
+    *bailed.downcast_mut::<String>().unwrap() = "clobber".to_string();
+    assert_eq!(bailed.downcast_ref::<String>().unwrap(), "clobber");
+    assert_eq!(bailed.downcast_mut::<String>().unwrap(), "clobber");
+    assert_eq!(bailed.downcast::<String>().unwrap(), "clobber");
 }
 
 #[test]
@@ -77,6 +85,15 @@
 }
 
 #[test]
+fn test_as_ref() {
+    let error = bail_error().unwrap_err();
+    let ref_dyn: &dyn StdError = error.as_ref();
+    assert_eq!("oh no!", ref_dyn.to_string());
+    let ref_dyn_send_sync: &(dyn StdError + Send + Sync) = error.as_ref();
+    assert_eq!("oh no!", ref_dyn_send_sync.to_string());
+}
+
+#[test]
 fn test_large_alignment() {
     #[repr(align(64))]
     #[derive(Debug)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/test_macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/test_macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![allow(clippy::eq_op)]
+#![allow(clippy::eq_op, clippy::shadow_unrelated, clippy::wildcard_imports)]
 
 mod common;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/ui/no-impl.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/ui/no-impl.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/ui/no-impl.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/ui/no-impl.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-error[E0599]: no method named `anyhow_kind` found for reference `&Error` in the current scope
+error[E0599]: the method `anyhow_kind` exists for reference `&Error`, but its trait bounds were not satisfied
  --> $DIR/no-impl.rs:7:13
   |
 4 | struct Error;
@@ -9,13 +9,13 @@
   | doesn't satisfy `Error: std::fmt::Display`
 ...
 7 |     let _ = anyhow!(Error);
-  |             ^^^^^^^^^^^^^^ method not found in `&Error`
+  |             ^^^^^^^^^^^^^^ method cannot be called on `&Error` due to unsatisfied trait bounds
   |
-  = note: the method `anyhow_kind` exists but the following trait bounds were not satisfied:
+  = note: the following trait bounds were not satisfied:
           `Error: Into<anyhow::Error>`
           which is required by `Error: anyhow::private::kind::TraitKind`
           `Error: std::fmt::Display`
           which is required by `&Error: anyhow::private::kind::AdhocKind`
           `&Error: Into<anyhow::Error>`
           which is required by `&Error: anyhow::private::kind::TraitKind`
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `anyhow` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/ui/temporary-value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/ui/temporary-value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/ui/temporary-value.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/ui/temporary-value.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5 @@
+use anyhow::anyhow;
+
+fn main() {
+    let _ = anyhow!(&String::new());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/ui/temporary-value.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/ui/temporary-value.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/anyhow/tests/ui/temporary-value.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/anyhow/tests/ui/temporary-value.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+error[E0716]: temporary value dropped while borrowed
+ --> $DIR/temporary-value.rs:4:22
+  |
+4 |     let _ = anyhow!(&String::new());
+  |             ---------^^^^^^^^^^^^^-- temporary value is freed at the end of this statement
+  |             |        |
+  |             |        creates a temporary which is freed while still in use
+  |             argument requires that borrow lasts for `'static`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.lock":"a089c4b179e72a02fac211ae23ff35cbb93703e975733b94eba13ac4b52fe5c4","Cargo.toml":"ff0e13c99f02212cb939518302c5110c6c5383fe4ddd3da01cea2fd656f0feee","LICENSE":"1bc7e6f475b3ec99b7e2643411950ae2368c250dd4c5c325f80f9811362a94a1","README.md":"f77d8910fa16f9f0ad2d72d039a7e8ac2979834e0acf435b7c84744c90cb21ec","examples/array_refs.rs":"336b52f6ab31d78766bd1653cea60b9f183d80369f3feec55e454ccbcb3adaaa","examples/array_refs_with_const.rs":"9e49959de714c611bc2e48bb0dd51c3023abc2b3e6b6e0428e7d7b30be8900e4","examples/simple-case.rs":"12a7c596db0d8e89415dfd75a8fe390a7141b24771ad70aee73286857a37b5fb","src/lib.rs":"193dcf7ba66294353b3173047606381f390552a94f1d0472bd9207273bd347c4"},"package":"a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,256 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "aho-corasick"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-dependencies = [
- "quickcheck 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "env_logger"
-version = "0.5.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "termcolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "humantime"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "log"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "memchr"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "quickcheck"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_termios"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "wincolor 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "termion"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thread_local"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ucd-util"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "utf8-ranges"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "version_check"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wincolor"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[metadata]
-"checksum aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c1c6d463cbe7ed28720b5b489e7c083eeb8f90d08be2a0d6bb9e1ffea9ce1afa"
-"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
-"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789"
-"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
-"checksum env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f4d7e69c283751083d53d01eac767407343b8b69c4bd70058e08adc2637cb257"
-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e"
-"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7"
-"checksum libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "684f330624d8c3784fb9558ca46c4ce488073a8d22450415c5eb4f4cfb0d11b5"
-"checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2"
-"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum quickcheck 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c01babc5ffd48a2a83744b3024814bb46dfd4f2a4705ccb44b1b60e644fdcab7"
-"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
-"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5bbbea44c5490a1e84357ff28b7d518b4619a159fed5d25f6c1de2d19cc42814"
-"checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d"
-"checksum termcolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "722426c4a0539da2c4ffd9b419d90ad540b4cff4a053be9069c908d4d07e2836"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
-"checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
-"checksum version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7716c242968ee87e5542f8021178248f267f295a5c4803beae8b8b7fd9bc6051"
-"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum wincolor 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b9dc3aa9dcda98b5a16150c54619c1ead22e3d3a5d458778ae914be760aa981a"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "arrayref"
-version = "0.3.6"
-authors = ["David Roundy <roundyd@physics.oregonstate.edu>"]
-description = "Macros to take array references of slices"
-documentation = "https://docs.rs/arrayref"
-license = "BSD-2-Clause"
-repository = "https://github.com/droundy/arrayref"
-[dev-dependencies.quickcheck]
-version = "0.6"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/examples/array_refs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/examples/array_refs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/examples/array_refs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/examples/array_refs.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#[macro_use]
-extern crate arrayref;
-
-fn main() {
-    let x = [0,1,2,3,4,5,6,7,8,9];
-    let (a,b,c) = array_refs!(&x, 2, 3, 5);
-    assert_eq!(2, a.len());
-    assert_eq!(3, b.len());
-    assert_eq!(5, c.len());
-    assert_eq!(*a, [0,1]);
-    assert_eq!(*b, [2,3,4]);
-    assert_eq!(*c, [5,6,7,8,9]);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/examples/array_refs_with_const.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/examples/array_refs_with_const.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/examples/array_refs_with_const.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/examples/array_refs_with_const.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#[macro_use]
-extern crate arrayref;
-
-const SIZE: usize = 10;
-const SIZE_A: usize = 2;
-const SIZE_B: usize = 3;
-const SIZE_C: usize = 5;
-
-fn main() {
-    let x: [u8; SIZE] = [0,1,2,3,4,5,6,7,8,9];
-    let (a,b,c) = array_refs!(&x, SIZE_A, SIZE_B, SIZE_C);
-    assert_eq!(SIZE_A, a.len());
-    assert_eq!(SIZE_B, b.len());
-    assert_eq!(SIZE_C, c.len());
-    assert_eq!(*a, [0,1]);
-    assert_eq!(*b, [2,3,4]);
-    assert_eq!(*c, [5,6,7,8,9]);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/examples/simple-case.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/examples/simple-case.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/examples/simple-case.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/examples/simple-case.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#[macro_use]
-extern crate arrayref;
-
-fn add_three(a: &[u8; 3]) -> u8 {
-    a[0] + a[1] + a[2]
-}
-
-fn main() {
-    let mut x = [0u8; 30];
-    x[20] = 1;
-    x[21] = 4;
-    x[24] = 3;
-    x[0] = add_three(array_mut_ref![x,20,3]);
-    assert_eq!(x[0], 8);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Copyright (c) 2015 David Roundy <roundyd@physics.oregonstate.edu>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-# arrayref
-
-[![Build Status](https://travis-ci.org/droundy/arrayref.svg?branch=master)](https://travis-ci.org/droundy/arrayref)
-[![Coverage Status](https://coveralls.io/repos/droundy/arrayref/badge.svg?branch=master&service=github)](https://coveralls.io/github/droundy/arrayref?branch=master)
-
-[Documentation](https://docs.rs/arrayref)
-
-This is a very small rust module, which contains just four macros, for
-the taking of array references to slices of... sliceable things.
-These macros (which are awkwardly named) should be perfectly safe, and
-have seen just a tad of code review.
-
-## Why would I want this?
-
-The goal of arrayref is to enable the effective use of APIs that
-involve array references rather than slices, for situations where
-parameters must have a given size.  As an example, consider the
-`byteorder` crate.  This is a very nice crate with a simple API
-containing functions that look like:
-
-```rust
-fn read_u16(buf: &[u8]) -> u16;
-fn write_u16(buf: &mut [u8], n: u16);
-```
-
-Looking at this, you might wonder why they accept a slice reference as
-input.  After all, they always want just two bytes.  These functions
-must panic if given a slice that is too small, which means that unless
-they are inlined, then a runtime bounds-check is forced, even if it
-may be statically known that the input is the right size.
-
-Wouldn't it be nicer if we had functions more like
-
-```rust
-fn read_u16_array(buf: &[u8; 2]) -> u16;
-fn write_u16_array(buf: &mut [u8; 2], n: u16);
-```
-
-The type signature would tell users precisely what size of input is
-required, and the compiler could check at compile time that the input
-is of the appropriate size: this sounds like the zero-cost
-abstractions rust is famous for!  However, there is a catch, which
-arises when you try to *use* these nicer functions, which is that
-usually you are looking at two bytes in a stream.  So, e.g. consider
-that we are working with a hypothetical (and simplified) ipv6 address.
-
-Doing this with our array version (which looks so beautiful in terms
-of accurately describing what we want!) looks terrible:
-
-```rust
-let addr: &[u8; 16] = ...;
-let mut segments = [0u16; 8];
-// array-based API
-for i in 0 .. 8 {
-    let mut two_bytes = [addr[2*i], addr[2*i+1]];
-    segments[i] = read_u16_array(&two_bytes);
-}
-// slice-based API
-for i in 0 .. 8 {
-    segments[i] = read_u16(&addr[2*i..]);
-}
-```
-
-The array-based approach looks way worse.  We need to create a fresh
-copy of the bytes, just so it will be in an array of the proper size!
-Thus the whole "zero-cost abstraction" argument for using array
-references fails.  The trouble is that there is no (safe) way (until
-[RFC 495][1] lands) to obtain an array reference to a portion of a
-larger array or slice.  Doing so is the equivalent of taking a slice
-with a size known at compile time, and ought to be built into the
-language.
-
-[1]: https://github.com/rust-lang/rfcs/blob/master/text/0495-array-pattern-changes.md
-
-The arrayref crate allows you to do this kind of slicing.  So the
-above (very contrived) example can be implemented with array
-references as:
-
-```rust
-let addr: &[u8; 16] = ...;
-let mut segments = [0u16; 8];
-// array-based API with arrayref
-for i in 0 .. 8 {
-    segments[i] = read_u16_array(array_ref![addr,2*i,2]);
-}
-```
-
-Here the `array_ref![addr,2*i,2]` macro allows us to take an array
-reference to a slice consisting of two bytes starting at `2*i`.  Apart
-from the syntax (less nice than slicing), it is essentially the same
-as the slice approach.  However, this code makes explicit the
-need for precisely *two* bytes both in the caller, and in the function
-signature.
-
-This module provides three other macros providing related
-functionality, which you can read about in the
-[documentation](https://droundy.github.io/arrayref).
-
-For an example of how these macros can be used in an actual program,
-see [my rust translation of tweetnacl][2], which uses `arrayref`
-to almost exclusively accept array references in functions, with the
-only exception being those which truly expect data of arbitrary
-length.  In my opinion, the result is code that is far more legible
-than the original C code, since the size of each argument is
-explicit.  Moreover (although I have not tested this), the use of
-array references rather than slices *should* result in far fewer
-bounds checks, since almost all sizes are known at compile time.
-
-[2]: https://github.com/droundy/onionsalt/blob/master/src/crypto.rs
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayref/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayref/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,476 +0,0 @@
-//! This package contains just four macros, which enable the creation
-//! of array references to portions of arrays or slices (or things
-//! that can be sliced).
-//!
-//! # Examples
-//!
-//! Here is a simple example of slicing and dicing a slice into array
-//! references with these macros.  Here we implement a simple
-//! little-endian conversion from bytes to `u16`, and demonstrate code
-//! that uses `array_ref!` to extract an array reference from a larger
-//! array.  Note that the documentation for each macro also has an
-//! example of its use.
-//!
-//! ```
-//! #[macro_use]
-//! extern crate arrayref;
-//!
-//! fn read_u16(bytes: &[u8; 2]) -> u16 {
-//!      bytes[0] as u16 + ((bytes[1] as u16) << 8)
-//! }
-//! // ...
-//! # fn main() {
-//! let data = [0,1,2,3,4,0,6,7,8,9];
-//! assert_eq!(256, read_u16(array_ref![data,0,2]));
-//! assert_eq!(4, read_u16(array_ref![data,4,2]));
-//! # }
-//! ```
-#![deny(warnings)]
-#![no_std]
-
-#[cfg(test)]
-#[macro_use]
-extern crate std;
-
-/// You can use `array_ref` to generate an array reference to a subset
-/// of a sliceable bit of data (which could be an array, or a slice,
-/// or a Vec).
-///
-/// **Panics** if the slice is out of bounds.
-///
-/// ```
-/// #[macro_use]
-/// extern crate arrayref;
-///
-/// fn read_u16(bytes: &[u8; 2]) -> u16 {
-///      bytes[0] as u16 + ((bytes[1] as u16) << 8)
-/// }
-/// // ...
-/// # fn main() {
-/// let data = [0,1,2,3,4,0,6,7,8,9];
-/// assert_eq!(256, read_u16(array_ref![data,0,2]));
-/// assert_eq!(4, read_u16(array_ref![data,4,2]));
-/// # }
-/// ```
-
-#[macro_export]
-macro_rules! array_ref {
-    ($arr:expr, $offset:expr, $len:expr) => {{
-        {
-            #[inline]
-            unsafe fn as_array<T>(slice: &[T]) -> &[T; $len] {
-                &*(slice.as_ptr() as *const [_; $len])
-            }
-            let offset = $offset;
-            let slice = & $arr[offset..offset + $len];
-            #[allow(unused_unsafe)]
-            unsafe {
-                as_array(slice)
-            }
-        }
-    }}
-}
-
-/// You can use `array_refs` to generate a series of array references
-/// to an input array reference.  The idea is if you want to break an
-/// array into a series of contiguous and non-overlapping arrays.
-/// `array_refs` is a bit funny in that it insists on slicing up the
-/// *entire* array.  This is intentional, as I find it handy to make
-/// me ensure that my sub-arrays add up to the entire array.  This
-/// macro will *never* panic, since the sizes are all checked at
-/// compile time.
-///
-/// Note that unlike `array_ref!`, `array_refs` *requires* that the
-/// first argument be an array reference.  The following arguments are
-/// the lengths of each subarray you wish a reference to.  The total
-/// of these arguments *must* equal the size of the array itself.
-///
-/// ```
-/// #[macro_use]
-/// extern crate arrayref;
-///
-/// fn read_u16(bytes: &[u8; 2]) -> u16 {
-///      bytes[0] as u16 + ((bytes[1] as u16) << 8)
-/// }
-/// // ...
-/// # fn main() {
-/// let data = [0,1,2,3,4,0,6,7];
-/// let (a,b,c) = array_refs![&data,2,2,4];
-/// assert_eq!(read_u16(a), 256);
-/// assert_eq!(read_u16(b), 3*256+2);
-/// assert_eq!(*c, [4,0,6,7]);
-/// # }
-/// ```
-#[macro_export]
-macro_rules! array_refs {
-    ( $arr:expr, $( $pre:expr ),* ; .. ;  $( $post:expr ),* ) => {{
-        {
-            use std::slice;
-            #[inline]
-            #[allow(unused_assignments)]
-            #[allow(eval_order_dependence)]
-            unsafe fn as_arrays<T>(a: &[T]) -> ( $( &[T; $pre], )* &[T],  $( &[T; $post], )*) {
-                let min_len = $( $pre + )* $( $post + )* 0;
-                let var_len = a.len() - min_len;
-                assert!(a.len() >= min_len);
-                let mut p = a.as_ptr();
-                ( $( {
-                    let aref = & *(p as *const [T; $pre]);
-                    p = p.offset($pre as isize);
-                    aref
-                } ),* , {
-                    let sl = slice::from_raw_parts(p as *const T, var_len);
-                    p = p.offset(var_len as isize);
-                    sl
-                }, $( {
-                    let aref = & *(p as *const [T; $post]);
-                    p = p.offset($post as isize);
-                    aref
-                } ),*)
-            }
-            let input = $arr;
-            #[allow(unused_unsafe)]
-            unsafe {
-                as_arrays(input)
-            }
-        }
-    }};
-    ( $arr:expr, $( $len:expr ),* ) => {{
-        {
-            #[inline]
-            #[allow(unused_assignments)]
-            #[allow(eval_order_dependence)]
-            unsafe fn as_arrays<T>(a: &[T; $( $len + )* 0 ]) -> ( $( &[T; $len], )* ) {
-                let mut p = a.as_ptr();
-                ( $( {
-                    let aref = &*(p as *const [T; $len]);
-                    p = p.offset($len as isize);
-                    aref
-                } ),* )
-            }
-            let input = $arr;
-            #[allow(unused_unsafe)]
-            unsafe {
-                as_arrays(input)
-            }
-        }
-    }}
-}
-
-
-/// You can use `mut_array_refs` to generate a series of mutable array
-/// references to an input mutable array reference.  The idea is if
-/// you want to break an array into a series of contiguous and
-/// non-overlapping mutable array references.  Like `array_refs!`,
-/// `mut_array_refs!` is a bit funny in that it insists on slicing up
-/// the *entire* array.  This is intentional, as I find it handy to
-/// make me ensure that my sub-arrays add up to the entire array.
-/// This macro will *never* panic, since the sizes are all checked at
-/// compile time.
-///
-/// Note that unlike `array_mut_ref!`, `mut_array_refs` *requires*
-/// that the first argument be a mutable array reference.  The
-/// following arguments are the lengths of each subarray you wish a
-/// reference to.  The total of these arguments *must* equal the size
-/// of the array itself.  Also note that this macro allows you to take
-/// out multiple mutable references to a single object, which is both
-/// weird and powerful.
-///
-/// ```
-/// #[macro_use]
-/// extern crate arrayref;
-///
-/// fn write_u16(bytes: &mut [u8; 2], num: u16) {
-///      bytes[0] = num as u8;
-///      bytes[1] = (num >> 8) as u8;
-/// }
-/// fn write_u32(bytes: &mut [u8; 4], num: u32) {
-///      bytes[0] = num as u8;
-///      bytes[1] = (num >> 8) as u8; // this is buggy to save space...
-/// }
-/// // ...
-/// # fn main() {
-/// let mut data = [0,1,2,3,4,0,6,7];
-/// let (a,b,c) = mut_array_refs![&mut data,2,2,4];
-/// // let's write out some nice prime numbers!
-/// write_u16(a, 37);
-/// write_u16(b, 73);
-/// write_u32(c, 137); // approximate inverse of the fine structure constant!
-/// # }
-/// ```
-#[macro_export]
-macro_rules! mut_array_refs {
-    ( $arr:expr, $( $pre:expr ),* ; .. ;  $( $post:expr ),* ) => {{
-        {
-            use std::slice;
-            #[inline]
-            #[allow(unused_assignments)]
-            #[allow(eval_order_dependence)]
-            unsafe fn as_arrays<T>(a: &mut [T]) -> ( $( &mut [T; $pre], )* &mut [T],  $( &mut [T; $post], )*) {
-                let min_len = $( $pre + )* $( $post + )* 0;
-                let var_len = a.len() - min_len;
-                assert!(a.len() >= min_len);
-                let mut p = a.as_mut_ptr();
-                ( $( {
-                    let aref = &mut *(p as *mut [T; $pre]);
-                    p = p.offset($pre as isize);
-                    aref
-                } ),* , {
-                    let sl = slice::from_raw_parts_mut(p as *mut T, var_len);
-                    p = p.offset(var_len as isize);
-                    sl
-                }, $( {
-                    let aref = &mut *(p as *mut [T; $post]);
-                    p = p.offset($post as isize);
-                    aref
-                } ),*)
-            }
-            let input = $arr;
-            #[allow(unused_unsafe)]
-            unsafe {
-                as_arrays(input)
-            }
-        }
-    }};
-    ( $arr:expr, $( $len:expr ),* ) => {{
-        {
-            #[inline]
-            #[allow(unused_assignments)]
-            #[allow(eval_order_dependence)]
-            unsafe fn as_arrays<T>(a: &mut [T; $( $len + )* 0 ]) -> ( $( &mut [T; $len], )* ) {
-                let mut p = a.as_mut_ptr();
-                ( $( {
-                    let aref = &mut *(p as *mut [T; $len]);
-                    p = p.offset($len as isize);
-                    aref
-                } ),* )
-            }
-            let input = $arr;
-            #[allow(unused_unsafe)]
-            unsafe {
-                as_arrays(input)
-            }
-        }
-    }};
-}
-
-/// You can use `array_mut_ref` to generate a mutable array reference
-/// to a subset of a sliceable bit of data (which could be an array,
-/// or a slice, or a Vec).
-///
-/// **Panics** if the slice is out of bounds.
-///
-/// ```
-/// #[macro_use]
-/// extern crate arrayref;
-///
-/// fn write_u16(bytes: &mut [u8; 2], num: u16) {
-///      bytes[0] = num as u8;
-///      bytes[1] = (num >> 8) as u8;
-/// }
-/// // ...
-/// # fn main() {
-/// let mut data = [0,1,2,3,4,0,6,7,8,9];
-/// write_u16(array_mut_ref![data,0,2], 1);
-/// write_u16(array_mut_ref![data,2,2], 5);
-/// assert_eq!(*array_ref![data,0,4], [1,0,5,0]);
-/// *array_mut_ref![data,4,5] = [4,3,2,1,0];
-/// assert_eq!(data, [1,0,5,0,4,3,2,1,0,9]);
-/// # }
-/// ```
-#[macro_export]
-macro_rules! array_mut_ref {
-    ($arr:expr, $offset:expr, $len:expr) => {{
-        {
-            #[inline]
-            unsafe fn as_array<T>(slice: &mut [T]) -> &mut [T; $len] {
-                &mut *(slice.as_mut_ptr() as *mut [_; $len])
-            }
-            let offset = $offset;
-            let slice = &mut $arr[offset..offset + $len];
-            #[allow(unused_unsafe)]
-            unsafe {
-                as_array(slice)
-            }
-        }
-    }}
-}
-
-
-#[cfg(test)]
-mod test {
-
-extern crate quickcheck;
-
-use std::vec::Vec;
-
-// use super::*;
-
-#[test]
-#[should_panic]
-fn checks_bounds() {
-    let foo: [u8; 11] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    let bar = array_ref!(foo, 1, 11);
-    println!("I am checking that I can dereference bar[0] = {}", bar[0]);
-}
-
-#[test]
-fn simple_case_works() {
-    fn check(expected: [u8; 3], actual: &[u8; 3]) {
-        for (e, a) in (&expected).iter().zip(actual.iter()) {
-            assert_eq!(e, a)
-        }
-    }
-    let mut foo: [u8; 11] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    {
-        let bar = array_ref!(foo, 2, 3);
-        check([2, 3, 4], bar);
-    }
-    check([0, 1, 2], array_ref!(foo, 0, 3));
-    fn zero2(x: &mut [u8; 2]) {
-        x[0] = 0;
-        x[1] = 0;
-    }
-    zero2(array_mut_ref!(foo, 8, 2));
-    check([0, 0, 10], array_ref!(foo, 8, 3));
-}
-
-
-#[test]
-fn check_array_ref_5() {
-    fn f(data: Vec<u8>, offset: usize) -> quickcheck::TestResult {
-        if data.len() < offset + 5 {
-            return quickcheck::TestResult::discard();
-        }
-        let out = array_ref!(data, offset, 5);
-        quickcheck::TestResult::from_bool(out.len() == 5)
-    }
-    quickcheck::quickcheck(f as fn(Vec<u8>, usize) -> quickcheck::TestResult);
-}
-
-#[test]
-fn check_array_ref_out_of_bounds_5() {
-    fn f(data: Vec<u8>, offset: usize) -> quickcheck::TestResult {
-        if data.len() >= offset + 5 {
-            return quickcheck::TestResult::discard();
-        }
-        quickcheck::TestResult::must_fail(move || {
-            array_ref!(data, offset, 5);
-        })
-    }
-    quickcheck::quickcheck(f as fn(Vec<u8>, usize) -> quickcheck::TestResult);
-}
-
-#[test]
-fn check_array_mut_ref_7() {
-    fn f(mut data: Vec<u8>, offset: usize) -> quickcheck::TestResult {
-        if data.len() < offset + 7 {
-            return quickcheck::TestResult::discard();
-        }
-        let out = array_mut_ref!(data, offset, 7);
-        out[6] = 3;
-        quickcheck::TestResult::from_bool(out.len() == 7)
-    }
-    quickcheck::quickcheck(f as fn(Vec<u8>, usize) -> quickcheck::TestResult);
-}
-
-
-#[test]
-fn check_array_mut_ref_out_of_bounds_32() {
-    fn f(mut data: Vec<u8>, offset: usize) -> quickcheck::TestResult {
-        if data.len() >= offset + 32 {
-            return quickcheck::TestResult::discard();
-        }
-        quickcheck::TestResult::must_fail(move || {
-            array_mut_ref!(data, offset, 32);
-        })
-    }
-    quickcheck::quickcheck(f as fn(Vec<u8>, usize) -> quickcheck::TestResult);
-}
-
-
-#[test]
-fn test_5_array_refs() {
-    let mut data: [usize; 128] = [0; 128];
-    for i in 0..128 {
-        data[i] = i;
-    }
-    let data = data;
-    let (a,b,c,d,e) = array_refs!(&data, 1, 14, 3, 100, 10);
-    assert_eq!(a.len(), 1 as usize);
-    assert_eq!(b.len(), 14 as usize);
-    assert_eq!(c.len(), 3 as usize);
-    assert_eq!(d.len(), 100 as usize);
-    assert_eq!(e.len(), 10 as usize);
-    assert_eq!(a, array_ref![data, 0, 1]);
-    assert_eq!(b, array_ref![data, 1, 14]);
-    assert_eq!(c, array_ref![data, 15, 3]);
-    assert_eq!(e, array_ref![data, 118, 10]);
-}
-
-#[test]
-fn test_5_array_refs_dotdot() {
-    let mut data: [usize; 128] = [0; 128];
-    for i in 0..128 {
-        data[i] = i;
-    }
-    let data = data;
-    let (a,b,c,d,e) = array_refs!(&data, 1, 14, 3; ..; 10);
-    assert_eq!(a.len(), 1 as usize);
-    assert_eq!(b.len(), 14 as usize);
-    assert_eq!(c.len(), 3 as usize);
-    assert_eq!(d.len(), 100 as usize);
-    assert_eq!(e.len(), 10 as usize);
-    assert_eq!(a, array_ref![data, 0, 1]);
-    assert_eq!(b, array_ref![data, 1, 14]);
-    assert_eq!(c, array_ref![data, 15, 3]);
-    assert_eq!(e, array_ref![data, 118, 10]);
-}
-
-
-#[test]
-fn test_5_mut_xarray_refs() {
-    let mut data: [usize; 128] = [0; 128];
-    {
-        // temporarily borrow the data to modify it.
-        let (a,b,c,d,e) = mut_array_refs!(&mut data, 1, 14, 3, 100, 10);
-        assert_eq!(a.len(), 1 as usize);
-        assert_eq!(b.len(), 14 as usize);
-        assert_eq!(c.len(), 3 as usize);
-        assert_eq!(d.len(), 100 as usize);
-        assert_eq!(e.len(), 10 as usize);
-        *a = [1; 1];
-        *b = [14; 14];
-        *c = [3; 3];
-        *d = [100; 100];
-        *e = [10; 10];
-    }
-    assert_eq!(&[1;1], array_ref![data, 0, 1]);
-    assert_eq!(&[14;14], array_ref![data, 1, 14]);
-    assert_eq!(&[3;3], array_ref![data, 15, 3]);
-    assert_eq!(&[10;10], array_ref![data, 118, 10]);
-}
-
-#[test]
-fn test_5_mut_xarray_refs_with_dotdot() {
-    let mut data: [usize; 128] = [0; 128];
-    {
-        // temporarily borrow the data to modify it.
-        let (a,b,c,d,e) = mut_array_refs!(&mut data, 1, 14, 3; ..; 10);
-        assert_eq!(a.len(), 1 as usize);
-        assert_eq!(b.len(), 14 as usize);
-        assert_eq!(c.len(), 3 as usize);
-        assert_eq!(d.len(), 100 as usize);
-        assert_eq!(e.len(), 10 as usize);
-        *a = [1; 1];
-        *b = [14; 14];
-        *c = [3; 3];
-        *e = [10; 10];
-    }
-    assert_eq!(&[1;1], array_ref![data, 0, 1]);
-    assert_eq!(&[14;14], array_ref![data, 1, 14]);
-    assert_eq!(&[3;3], array_ref![data, 15, 3]);
-    assert_eq!(&[10;10], array_ref![data, 118, 10]);
-}
-
-} // mod test
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/benches/arraystring.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/benches/arraystring.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/benches/arraystring.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/benches/arraystring.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
 use bencher::Bencher;
 
 fn try_push_c(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
+    let mut v = ArrayString::<512>::new();
     b.iter(|| {
         v.clear();
         while v.try_push('c').is_ok() {
@@ -18,7 +18,7 @@
 }
 
 fn try_push_alpha(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
+    let mut v = ArrayString::<512>::new();
     b.iter(|| {
         v.clear();
         while v.try_push('α').is_ok() {
@@ -30,7 +30,7 @@
 
 // Yes, pushing a string char-by-char is slow. Use .push_str.
 fn try_push_string(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
+    let mut v = ArrayString::<512>::new();
     let input = "abcαβγ“�";
     b.iter(|| {
         v.clear();
@@ -45,7 +45,7 @@
 }
 
 fn push_c(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
+    let mut v = ArrayString::<512>::new();
     b.iter(|| {
         v.clear();
         while !v.is_full() {
@@ -57,7 +57,7 @@
 }
 
 fn push_alpha(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
+    let mut v = ArrayString::<512>::new();
     b.iter(|| {
         v.clear();
         while !v.is_full() {
@@ -69,7 +69,7 @@
 }
 
 fn push_string(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
+    let mut v = ArrayString::<512>::new();
     let input = "abcαβγ“�";
     b.iter(|| {
         v.clear();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/benches/extend.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/benches/extend.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/benches/extend.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/benches/extend.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
 use bencher::black_box;
 
 fn extend_with_constant(b: &mut Bencher) {
-    let mut v = ArrayVec::<[u8; 512]>::new();
+    let mut v = ArrayVec::<u8, 512>::new();
     let cap = v.capacity();
     b.iter(|| {
         v.clear();
@@ -22,7 +22,7 @@
 }
 
 fn extend_with_range(b: &mut Bencher) {
-    let mut v = ArrayVec::<[u8; 512]>::new();
+    let mut v = ArrayVec::<u8, 512>::new();
     let cap = v.capacity();
     b.iter(|| {
         v.clear();
@@ -34,7 +34,7 @@
 }
 
 fn extend_with_slice(b: &mut Bencher) {
-    let mut v = ArrayVec::<[u8; 512]>::new();
+    let mut v = ArrayVec::<u8, 512>::new();
     let data = [1; 512];
     b.iter(|| {
         v.clear();
@@ -46,7 +46,7 @@
 }
 
 fn extend_with_write(b: &mut Bencher) {
-    let mut v = ArrayVec::<[u8; 512]>::new();
+    let mut v = ArrayVec::<u8, 512>::new();
     let data = [1; 512];
     b.iter(|| {
         v.clear();
@@ -57,7 +57,7 @@
 }
 
 fn extend_from_slice(b: &mut Bencher) {
-    let mut v = ArrayVec::<[u8; 512]>::new();
+    let mut v = ArrayVec::<u8, 512>::new();
     let data = [1; 512];
     b.iter(|| {
         v.clear();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"c9e49774ee89a3b7b533362d82060a14f2777ccefbe03b956f6f08057b6c3600","Cargo.toml":"c736151a4747b2c041404d730e17dec631393c5feea287edc8a3e482f83a8927","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0245ee104228a100ce5fceecf43e25faae450494d9173f43fd94c27d69fdac13","README.md":"f42eb73acbc7729825a836a532d1c8c6b71e006e0d87e549ea7a483da7472425","benches/arraystring.rs":"f12b890977117ebde4ca42bcd6b91f2a6a087f2b235aaca6d15e30d125ae9f67","benches/extend.rs":"c3d69cc488ec5341b019cfed545ebbfea252f98718037b413f6a349da9489d1b","ci/miri.sh":"59172afe080a3431f4e7dbd66d2040afa27ab9c0359532bd68f8f423261738de","custom.css":"e6f2cd299392337b4e2959c52f422e5b7be11920ea98d10db44d10ddef5ed47c","src/array.rs":"5fa75554ebdf595c918fe923a84678989fc420d800310ee19a21597f7d683b66","src/array_string.rs":"48c175371aed3372158a9331e939cffc2a11a09120253fa9d0521e5cbca7cfca","src/char.rs":"3fe9e9cc68fc7cedb238d53924b552b876a60c4fea85935d2f5d1ca0d41ffa3e","src/errors.rs":"ca44c0987f59ae57623088d80013e75129101caea93c278c8ebb0df898bc6b1b","src/lib.rs":"08270486d9e9d34e02e0edf227baf5e87b36d38d264da209d3b7f8962dce1b54","src/maybe_uninit.rs":"c81cf16f976bfaf7c1fe371aa2fba84872874fb0e43c96f63bef01cceb5e1d64","tests/serde.rs":"18c165cf6024f04a25b19aa139657d7c59f72d1541c9b24b44f9eaea01f507db","tests/tests.rs":"b9a3db8a0b957695d9ecc539a7ea2ded1eea3c6f76de8b5624c2b4eae95f1fdd"},"package":"23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"9608f4cde67279f69e80b85373f19c1dde90a075b51d930e25e26d7ddabbfa03","Cargo.toml":"f4001657c27de1386a449fc5035abc0016f4f70ad99161b16e263d1eb2892dd8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0245ee104228a100ce5fceecf43e25faae450494d9173f43fd94c27d69fdac13","README.md":"2264c34c62ea4c617d72047b00749b4786dfb9dff2fac24e0320170ee0cd19c8","benches/arraystring.rs":"fad1cecef71c290375befc77c75a868988b8d74135e8f8732bc5b58c85a8ab46","benches/extend.rs":"c38ecedbc88217a7e9fe1a73f916b168a96e48010a7ccd3dba5c3f8dea030d5d","ci/miri.sh":"6bad1d135e1bdd67a6b91c870a7cf5ee09a85f9515633592a6abfbba95fdaf52","src/array_string.rs":"cefc432a025d780e01113144cbd5c0856d4424ec7fba4e626ddea523fbc8bbaf","src/arrayvec.rs":"32da1d3202f621852a3b884491f7a1086b7d813fe64b5cd7cab858ad3e967560","src/arrayvec_impl.rs":"a5e3391dc350041651f0ba3816c863ff7f552ff553e4a88f801481dfad7e7613","src/char.rs":"1de50e1d6045af2b3496426492315ba774986f9bc8301ffa391de861a08cc9cb","src/errors.rs":"ca44c0987f59ae57623088d80013e75129101caea93c278c8ebb0df898bc6b1b","src/lib.rs":"29a4123616c0912ccae5d931d45f0ccc3746647da1ba077c34538824910dd0ca","src/utils.rs":"d1cdc508dfca385e63f1f57bc8b53ed4a7f515e4ac1ebaa97b1d543fc8369432","tests/serde.rs":"117eb2961b5954d13c577edf60bbb07cb7481685cc9d6c49760a981d71465849","tests/tests.rs":"c1cd94337f4dc9aa31a6c16e334319389c605a98ccc5792e5489167cb614b7cb"},"package":"be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,13 +13,13 @@
 [package]
 edition = "2018"
 name = "arrayvec"
-version = "0.5.2"
+version = "0.7.1"
 authors = ["bluss"]
 description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."
 documentation = "https://docs.rs/arrayvec/"
 keywords = ["stack", "vector", "array", "data-structure", "no_std"]
 categories = ["data-structures", "no-std"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/bluss/arrayvec"
 [package.metadata.docs.rs]
 features = ["serde"]
@@ -56,8 +56,5 @@
 [build-dependencies]
 
 [features]
-array-sizes-129-255 = []
-array-sizes-33-128 = []
 default = ["std"]
 std = []
-unstable-const-fn = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,56 +1,109 @@
 Recent Changes (arrayvec)
--------------------------
+=========================
 
-- 0.5.2
+## 0.7.1
 
-  - Add `is_empty` methods for ArrayVec and ArrayString by @nicbn
-  - Implement `TryFrom<Slice>` for ArrayVec by @paulkernfeld
-  - Add `unstable-const-fn` to make `new` methods const by @m-ou-se
-  - Run miri in CI and a few related fixes by @RalfJung
-  - Fix outdated comment by @Phlosioneer
-  - Move changelog to a separate file by @Luro02
-  - Remove deprecated `Error::description` by @AnderEnder
-  - Use pointer method `add` by @hbina
-
-- 0.5.1
-
-  - Add `as_ptr`, `as_mut_ptr` accessors directly on the `ArrayVec` by @tbu-
-    (matches the same addition to `Vec` which happened in Rust 1.37).
-  - Add method `ArrayString::len` (now available directly, not just through deref to str).
-  - Use raw pointers instead of `&mut [u8]` for encoding chars into `ArrayString`
-    (uninit best practice fix).
-  - Use raw pointers instead of `get_unchecked_mut` where the target may be
-    uninitialized everywhere relevant in the ArrayVec implementation
-    (uninit best practice fix).
-  - Changed inline hints on many methods, mainly removing inline hints
-  - `ArrayVec::dispose` is now deprecated (it has no purpose anymore)
-
-- 0.4.12
-
-  - Use raw pointers instead of `get_unchecked_mut` where the target may be
-    uninitialized everywhere relevant in the ArrayVec implementation.
-
-- 0.5.0
-
-  - Use `MaybeUninit` (now unconditionally) in the implementation of
-    `ArrayVec`
-  - Use `MaybeUninit` (now unconditionally) in the implementation of
-    `ArrayString`
-  - The crate feature for serde serialization is now named `serde`.
-  - Updated the `Array` trait interface, and it is now easier to use for
-    users outside the crate.
-  - Add `FromStr` impl for `ArrayString` by @despawnerer
-  - Add method `try_extend_from_slice` to `ArrayVec`, which is always
-    effecient by @Thomasdezeeuw.
-  - Add method `remaining_capacity` by @Thomasdezeeuw
-  - Improve performance of the `extend` method.
-  - The index type of zero capacity vectors is now itself zero size, by
-    @clarfon
-  - Use `drop_in_place` for truncate and clear methods. This affects drop order
-    and resume from panic during drop.
-  - Use Rust 2018 edition for the implementation
-  - Require Rust 1.36 or later, for the unconditional `MaybeUninit`
-    improvements.
+- Add new ArrayVec methods `.take()` and `.into_inner_unchecked()` by @conradludgate
+- `clone_from` now uses `truncate` when needed by @a1phyr
+
+## 0.7.0
+
+- `fn new_const` is now the way to const-construct arrayvec and arraystring,
+  and `fn new` has been reverted to a regular "non-const" function.
+  This works around performance issue #182, where the const fn version did not
+  optimize well. Change by @bluss with thanks to @rodrimati1992 and @niklasf
+  for analyzing the problem.
+
+- The deprecated feature flag `unstable-const-fn` was removed, since it's not needed
+
+- Optimize `.retain()` by using the same algorithm as in std, change by @niklasf,
+  issue #174. Original optimization in Rust std by @oxalica in rust-lang/rust/pull/81126
+
+## 0.6.1
+
+- The ``ArrayVec::new`` and ``ArrayString::new`` constructors are properly
+  const fns on stable and the feature flag ``unstable-const-fn`` is now deprecated.
+  by @rodrimati1992
+
+- Small fix to the capacity check macro by @Xaeroxe
+- Typo fix in documentation by @cuviper
+- Small code cleanup by @bluss
+
+## 0.6.0
+
+- The **const generics** release 🎉. Arrayvec finally implements what it
+  wanted to implement, since its first version: a vector backed by an array,
+  with generic parameters for the arbitrary element type *and* backing array
+  capacity.
+
+  The New type syntax is `ArrayVec<T, CAP>` where `CAP` is the arrayvec capacity.
+  For arraystring the syntax is `ArrayString<CAP>`.
+
+  Length is stored internally as u32; this limits the maximum capacity. The size
+  of the `ArrayVec` or `ArrayString` structs for the same capacity may grow
+  slightly compared with the previous version (depending on padding requirements
+  for the element type). Change by @bluss.
+
+- Arrayvec's `.extend()` and `FromIterator`/`.collect()` to arrayvec now
+  **panic** if the capacity of the arrayvec is exceeded. Change by @bluss.
+
+- Arraystring now implements `TryFrom<&str>` and `TryFrom<fmt::Arguments>` by
+  @c410-f3r
+
+- Minimum supported rust version is Rust 1.51
+
+## 0.5.2
+
+- Add `is_empty` methods for ArrayVec and ArrayString by @nicbn
+- Implement `TryFrom<Slice>` for ArrayVec by @paulkernfeld
+- Add `unstable-const-fn` to make `new` methods const by @m-ou-se
+- Run miri in CI and a few related fixes by @RalfJung
+- Fix outdated comment by @Phlosioneer
+- Move changelog to a separate file by @Luro02
+- Remove deprecated `Error::description` by @AnderEnder
+- Use pointer method `add` by @hbina
+
+## 0.5.1
+
+- Add `as_ptr`, `as_mut_ptr` accessors directly on the `ArrayVec` by @tbu-
+  (matches the same addition to `Vec` which happened in Rust 1.37).
+- Add method `ArrayString::len` (now available directly, not just through deref to str).
+- Use raw pointers instead of `&mut [u8]` for encoding chars into `ArrayString`
+  (uninit best practice fix).
+- Use raw pointers instead of `get_unchecked_mut` where the target may be
+  uninitialized everywhere relevant in the ArrayVec implementation
+  (uninit best practice fix).
+- Changed inline hints on many methods, mainly removing inline hints
+- `ArrayVec::dispose` is now deprecated (it has no purpose anymore)
+
+## 0.4.12
+
+- Use raw pointers instead of `get_unchecked_mut` where the target may be
+  uninitialized everywhere relevant in the ArrayVec implementation.
+
+## 0.5.0
+
+- Use `MaybeUninit` (now unconditionally) in the implementation of
+  `ArrayVec`
+- Use `MaybeUninit` (now unconditionally) in the implementation of
+  `ArrayString`
+- The crate feature for serde serialization is now named `serde`.
+- Updated the `Array` trait interface, and it is now easier to use for
+  users outside the crate.
+- Add `FromStr` impl for `ArrayString` by @despawnerer
+- Add method `try_extend_from_slice` to `ArrayVec`, which is always
+  effecient by @Thomasdezeeuw.
+- Add method `remaining_capacity` by @Thomasdezeeuw
+- Improve performance of the `extend` method.
+- The index type of zero capacity vectors is now itself zero size, by
+  @clarfon
+- Use `drop_in_place` for truncate and clear methods. This affects drop order
+  and resume from panic during drop.
+- Use Rust 2018 edition for the implementation
+- Require Rust 1.36 or later, for the unconditional `MaybeUninit`
+  improvements.
+
+## Older releases
 
 - 0.4.11
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/ci/miri.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/ci/miri.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/ci/miri.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/ci/miri.sh	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 set -ex
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/custom.css thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/custom.css
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/custom.css	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/custom.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-
-.docblock pre.rust { background: #eeeeff; }
-pre.trait, pre.fn, pre.struct, pre.enum, pre.typedef { background: #fcfefc; }
-
-/* Small “example� label for doc examples */
-.docblock pre.rust::before {
-    content: "example";
-    float: right;
-    font-style: italic;
-    font-size: 0.8em;
-    margin-top: -10px;
-    margin-right: -5px;
-}
-
-
-/* Fixup where display in trait listing */
-pre.trait .where::before {
-content: '\a         ';
-}
-
-.docblock code {
-    background-color: inherit;
-    font-weight: bold;
-    padding: 0 0.1em;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,9 +2,12 @@
 arrayvec
 ========
 [![Crates.io: arrayvec](https://img.shields.io/crates/v/arrayvec.svg)](https://crates.io/crates/arrayvec)
-[![Crates.io: nodrop](https://img.shields.io/crates/v/nodrop.svg)](https://crates.io/crates/nodrop)
 [![Documentation](https://docs.rs/arrayvec/badge.svg)](https://docs.rs/arrayvec)
-[![Build Status](https://travis-ci.org/bluss/arrayvec.svg?branch=master)](https://travis-ci.org/bluss/arrayvec)
+[![Build Status](https://github.com/bluss/arrayvec/workflows/Continuous%20integration/badge.svg?branch=master)](https://github.com/bluss/arrayvec/actions)
+
+
+
+
 [![License: Apache](https://img.shields.io/badge/License-Apache%202.0-red.svg)](LICENSE-APACHE)
 OR
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/array.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/array.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/array.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/array.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-
-/// Trait for fixed size arrays.
-///
-/// This trait is implemented for some specific array sizes, see
-/// the implementor list below. At the current state of Rust we can't
-/// make this fully general for every array size.
-///
-/// The following crate features add more array sizes (and they are not
-/// enabled by default due to their impact on compliation speed).
-///
-/// - `array-sizes-33-128`: All sizes 33 to 128 are implemented
-///   (a few in this range are included by default).
-/// - `array-sizes-129-255`: All sizes 129 to 255 are implemented
-///   (a few in this range are included by default).
-///
-/// ## Safety
-///
-/// This trait can *only* be implemented by fixed-size arrays or types with
-/// *exactly* the representation of a fixed size array (of the right element
-/// type and capacity).
-///
-/// Normally this trait is an implementation detail of arrayvec and doesn’t
-/// need implementing.
-pub unsafe trait Array {
-    /// The array’s element type
-    type Item;
-    /// The smallest type that can index and tell the length of the array.
-    #[doc(hidden)]
-    type Index: Index;
-    /// The array's element capacity
-    const CAPACITY: usize;
-    fn as_slice(&self) -> &[Self::Item];
-    fn as_mut_slice(&mut self) -> &mut [Self::Item];
-}
-
-pub trait Index : PartialEq + Copy {
-    const ZERO: Self;
-    fn to_usize(self) -> usize;
-    fn from(_: usize) -> Self;
-}
-
-impl Index for () {
-    const ZERO: Self = ();
-    #[inline(always)]
-    fn to_usize(self) -> usize { 0 }
-    #[inline(always)]
-    fn from(_ix: usize) ->  Self { () }
-}
-
-impl Index for bool {
-    const ZERO: Self = false;
-    #[inline(always)]
-    fn to_usize(self) -> usize { self as usize }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix != 0 }
-}
-
-impl Index for u8 {
-    const ZERO: Self = 0;
-    #[inline(always)]
-    fn to_usize(self) -> usize { self as usize }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix as u8 }
-}
-
-impl Index for u16 {
-    const ZERO: Self = 0;
-    #[inline(always)]
-    fn to_usize(self) -> usize { self as usize }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix as u16 }
-}
-
-impl Index for u32 {
-    const ZERO: Self = 0;
-    #[inline(always)]
-    fn to_usize(self) -> usize { self as usize }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix as u32 }
-}
-
-impl Index for usize {
-    const ZERO: Self = 0;
-    #[inline(always)]
-    fn to_usize(self) -> usize { self }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix }
-}
-
-macro_rules! fix_array_impl {
-    ($index_type:ty, $len:expr ) => (
-        unsafe impl<T> Array for [T; $len] {
-            type Item = T;
-            type Index = $index_type;
-            const CAPACITY: usize = $len;
-            #[doc(hidden)]
-            fn as_slice(&self) -> &[Self::Item] { self }
-            #[doc(hidden)]
-            fn as_mut_slice(&mut self) -> &mut [Self::Item] { self }
-        }
-    )
-}
-
-macro_rules! fix_array_impl_recursive {
-    ($index_type:ty, ) => ();
-    ($index_type:ty, $($len:expr,)*) => (
-        $(fix_array_impl!($index_type, $len);)*
-    );
-}
-
-
-fix_array_impl_recursive!((), 0,);
-fix_array_impl_recursive!(bool, 1,);
-fix_array_impl_recursive!(u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-                          15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-                          28, 29, 30, 31, );
-
-#[cfg(not(feature="array-sizes-33-128"))]
-fix_array_impl_recursive!(u8, 32, 40, 48, 50, 56, 64, 72, 96, 100, 128, );
-
-#[cfg(feature="array-sizes-33-128")]
-fix_array_impl_recursive!(u8, 
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
-52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
-72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
-109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
-125, 126, 127, 128,
-);
-
-#[cfg(not(feature="array-sizes-129-255"))]
-fix_array_impl_recursive!(u8, 160, 192, 200, 224,);
-
-#[cfg(feature="array-sizes-129-255")]
-fix_array_impl_recursive!(u8,
-129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
-141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
-157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
-173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
-189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
-205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
-221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
-253, 254, 255,
-);
-
-fix_array_impl_recursive!(u16, 256, 384, 512, 768, 1024, 2048, 4096, 8192, 16384, 32768,);
-// This array size doesn't exist on 16-bit
-#[cfg(any(target_pointer_width="32", target_pointer_width="64"))]
-fix_array_impl_recursive!(u32, 1 << 16,);
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/array_string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/array_string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/array_string.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/array_string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,50 +1,51 @@
 use std::borrow::Borrow;
 use std::cmp;
+use std::convert::TryFrom;
 use std::fmt;
 use std::hash::{Hash, Hasher};
-use std::ptr;
+use std::mem::MaybeUninit;
 use std::ops::{Deref, DerefMut};
+use std::ptr;
+use std::slice;
 use std::str;
 use std::str::FromStr;
 use std::str::Utf8Error;
-use std::slice;
 
-use crate::array::Array;
-use crate::array::Index;
 use crate::CapacityError;
+use crate::LenUint;
 use crate::char::encode_utf8;
+use crate::utils::MakeMaybeUninit;
 
 #[cfg(feature="serde")]
 use serde::{Serialize, Deserialize, Serializer, Deserializer};
 
-use super::MaybeUninit as MaybeUninitCopy;
 
 /// A string with a fixed capacity.
 ///
 /// The `ArrayString` is a string backed by a fixed size array. It keeps track
-/// of its length.
+/// of its length, and is parameterized by `CAP` for the maximum capacity.
+///
+/// `CAP` is of type `usize` but is range limited to `u32::MAX`; attempting to create larger
+/// arrayvecs with larger capacity will panic.
 ///
 /// The string is a contiguous value that you can store directly on the stack
 /// if needed.
 #[derive(Copy)]
-pub struct ArrayString<A>
-    where A: Array<Item=u8> + Copy
-{
-    xs: MaybeUninitCopy<A>,
-    len: A::Index,
+pub struct ArrayString<const CAP: usize> {
+    // the `len` first elements of the array are initialized
+    xs: [MaybeUninit<u8>; CAP],
+    len: LenUint,
 }
 
-impl<A> Default for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> Default for ArrayString<CAP>
 {
     /// Return an empty `ArrayString`
-    fn default() -> ArrayString<A> {
+    fn default() -> ArrayString<CAP> {
         ArrayString::new()
     }
 }
 
-impl<A> ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> ArrayString<CAP>
 {
     /// Create a new empty `ArrayString`.
     ///
@@ -53,34 +54,35 @@
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let mut string = ArrayString::<[_; 16]>::new();
+    /// let mut string = ArrayString::<16>::new();
     /// string.push_str("foo");
     /// assert_eq!(&string[..], "foo");
     /// assert_eq!(string.capacity(), 16);
     /// ```
-    #[cfg(not(feature="unstable-const-fn"))]
-    pub fn new() -> ArrayString<A> {
+    pub fn new() -> ArrayString<CAP> {
+        assert_capacity_limit!(CAP);
         unsafe {
-            ArrayString {
-                xs: MaybeUninitCopy::uninitialized(),
-                len: Index::ZERO,
-            }
+            ArrayString { xs: MaybeUninit::uninit().assume_init(), len: 0 }
         }
     }
 
-    #[cfg(feature="unstable-const-fn")]
-    pub const fn new() -> ArrayString<A> {
-        unsafe {
-            ArrayString {
-                xs: MaybeUninitCopy::uninitialized(),
-                len: Index::ZERO,
-            }
-        }
+    /// Create a new empty `ArrayString` (const fn).
+    ///
+    /// Capacity is inferred from the type parameter.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// static ARRAY: ArrayString<1024> = ArrayString::new_const();
+    /// ```
+    pub const fn new_const() -> ArrayString<CAP> {
+        assert_capacity_limit_const!(CAP);
+        ArrayString { xs: MakeMaybeUninit::ARRAY, len: 0 }
     }
 
     /// Return the length of the string.
     #[inline]
-    pub fn len(&self) -> usize { self.len.to_usize() }
+    pub fn len(&self) -> usize { self.len as usize }
 
     /// Returns whether the string is empty.
     #[inline]
@@ -95,7 +97,7 @@
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let mut string = ArrayString::<[_; 3]>::from("foo").unwrap();
+    /// let mut string = ArrayString::<3>::from("foo").unwrap();
     /// assert_eq!(&string[..], "foo");
     /// assert_eq!(string.len(), 3);
     /// assert_eq!(string.capacity(), 3);
@@ -115,13 +117,16 @@
     ///
     /// let string = ArrayString::from_byte_string(b"hello world").unwrap();
     /// ```
-    pub fn from_byte_string(b: &A) -> Result<Self, Utf8Error> {
-        let len = str::from_utf8(b.as_slice())?.len();
-        debug_assert_eq!(len, A::CAPACITY);
-        Ok(ArrayString {
-            xs: MaybeUninitCopy::from(*b),
-            len: Index::from(A::CAPACITY),
-        })
+    pub fn from_byte_string(b: &[u8; CAP]) -> Result<Self, Utf8Error> {
+        let len = str::from_utf8(b)?.len();
+        debug_assert_eq!(len, CAP);
+        let mut vec = Self::new();
+        unsafe {
+            (b as *const [u8; CAP] as *const [MaybeUninit<u8>; CAP])
+                .copy_to_nonoverlapping(&mut vec.xs as *mut [MaybeUninit<u8>; CAP], 1);
+            vec.set_len(CAP);
+        }
+        Ok(vec)
     }
 
     /// Return the capacity of the `ArrayString`.
@@ -129,18 +134,18 @@
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let string = ArrayString::<[_; 3]>::new();
+    /// let string = ArrayString::<3>::new();
     /// assert_eq!(string.capacity(), 3);
     /// ```
     #[inline(always)]
-    pub fn capacity(&self) -> usize { A::CAPACITY }
+    pub fn capacity(&self) -> usize { CAP }
 
     /// Return if the `ArrayString` is completely filled.
     ///
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let mut string = ArrayString::<[_; 1]>::new();
+    /// let mut string = ArrayString::<1>::new();
     /// assert!(!string.is_full());
     /// string.push_str("A");
     /// assert!(string.is_full());
@@ -154,7 +159,7 @@
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let mut string = ArrayString::<[_; 2]>::new();
+    /// let mut string = ArrayString::<2>::new();
     ///
     /// string.push('a');
     /// string.push('b');
@@ -174,7 +179,7 @@
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let mut string = ArrayString::<[_; 2]>::new();
+    /// let mut string = ArrayString::<2>::new();
     ///
     /// string.try_push('a').unwrap();
     /// string.try_push('b').unwrap();
@@ -186,7 +191,7 @@
     pub fn try_push(&mut self, c: char) -> Result<(), CapacityError<char>> {
         let len = self.len();
         unsafe {
-            let ptr = self.xs.ptr_mut().add(len);
+            let ptr = self.as_mut_ptr().add(len);
             let remaining_cap = self.capacity() - len;
             match encode_utf8(c, ptr, remaining_cap) {
                 Ok(n) => {
@@ -205,7 +210,7 @@
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let mut string = ArrayString::<[_; 2]>::new();
+    /// let mut string = ArrayString::<2>::new();
     ///
     /// string.push_str("a");
     /// string.push_str("d");
@@ -225,7 +230,7 @@
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let mut string = ArrayString::<[_; 2]>::new();
+    /// let mut string = ArrayString::<2>::new();
     ///
     /// string.try_push_str("a").unwrap();
     /// let overflow1 = string.try_push_str("bc");
@@ -241,7 +246,7 @@
             return Err(CapacityError::new(s));
         }
         unsafe {
-            let dst = self.xs.ptr_mut().add(self.len());
+            let dst = self.as_mut_ptr().add(self.len());
             let src = s.as_ptr();
             ptr::copy_nonoverlapping(src, dst, s.len());
             let newl = self.len() + s.len();
@@ -257,7 +262,7 @@
     /// ```
     /// use arrayvec::ArrayString;
     /// 
-    /// let mut s = ArrayString::<[_; 3]>::from("foo").unwrap();
+    /// let mut s = ArrayString::<3>::from("foo").unwrap();
     ///
     /// assert_eq!(s.pop(), Some('o'));
     /// assert_eq!(s.pop(), Some('o'));
@@ -287,7 +292,7 @@
     /// ```
     /// use arrayvec::ArrayString;
     ///
-    /// let mut string = ArrayString::<[_; 6]>::from("foobar").unwrap();
+    /// let mut string = ArrayString::<6>::from("foobar").unwrap();
     /// string.truncate(3);
     /// assert_eq!(&string[..], "foo");
     /// string.truncate(4);
@@ -317,7 +322,7 @@
     /// ```
     /// use arrayvec::ArrayString;
     /// 
-    /// let mut s = ArrayString::<[_; 3]>::from("foo").unwrap();
+    /// let mut s = ArrayString::<3>::from("foo").unwrap();
     ///
     /// assert_eq!(s.remove(0), 'f');
     /// assert_eq!(s.remove(1), 'o');
@@ -332,8 +337,8 @@
         let next = idx + ch.len_utf8();
         let len = self.len();
         unsafe {
-            ptr::copy(self.xs.ptr().add(next),
-                      self.xs.ptr_mut().add(idx),
+            ptr::copy(self.as_ptr().add(next),
+                      self.as_mut_ptr().add(idx),
                       len - next);
             self.set_len(len - (next - idx));
         }
@@ -355,104 +360,102 @@
     /// This method uses *debug assertions* to check the validity of `length`
     /// and may use other debug assertions.
     pub unsafe fn set_len(&mut self, length: usize) {
+        // type invariant that capacity always fits in LenUint
         debug_assert!(length <= self.capacity());
-        self.len = Index::from(length);
+        self.len = length as LenUint;
     }
 
     /// Return a string slice of the whole `ArrayString`.
     pub fn as_str(&self) -> &str {
         self
     }
+
+    fn as_ptr(&self) -> *const u8 {
+        self.xs.as_ptr() as *const u8
+    }
+
+    fn as_mut_ptr(&mut self) -> *mut u8 {
+        self.xs.as_mut_ptr() as *mut u8
+    }
 }
 
-impl<A> Deref for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> Deref for ArrayString<CAP>
 {
     type Target = str;
     #[inline]
     fn deref(&self) -> &str {
         unsafe {
-            let sl = slice::from_raw_parts(self.xs.ptr(), self.len.to_usize());
+            let sl = slice::from_raw_parts(self.as_ptr(), self.len());
             str::from_utf8_unchecked(sl)
         }
     }
 }
 
-impl<A> DerefMut for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> DerefMut for ArrayString<CAP>
 {
     #[inline]
     fn deref_mut(&mut self) -> &mut str {
         unsafe {
-            let sl = slice::from_raw_parts_mut(self.xs.ptr_mut(), self.len.to_usize());
+            let len = self.len();
+            let sl = slice::from_raw_parts_mut(self.as_mut_ptr(), len);
             str::from_utf8_unchecked_mut(sl)
         }
     }
 }
 
-impl<A> PartialEq for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> PartialEq for ArrayString<CAP>
 {
     fn eq(&self, rhs: &Self) -> bool {
         **self == **rhs
     }
 }
 
-impl<A> PartialEq<str> for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> PartialEq<str> for ArrayString<CAP>
 {
     fn eq(&self, rhs: &str) -> bool {
         &**self == rhs
     }
 }
 
-impl<A> PartialEq<ArrayString<A>> for str
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> PartialEq<ArrayString<CAP>> for str
 {
-    fn eq(&self, rhs: &ArrayString<A>) -> bool {
+    fn eq(&self, rhs: &ArrayString<CAP>) -> bool {
         self == &**rhs
     }
 }
 
-impl<A> Eq for ArrayString<A> 
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> Eq for ArrayString<CAP> 
 { }
 
-impl<A> Hash for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> Hash for ArrayString<CAP>
 {
     fn hash<H: Hasher>(&self, h: &mut H) {
         (**self).hash(h)
     }
 }
 
-impl<A> Borrow<str> for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> Borrow<str> for ArrayString<CAP>
 {
     fn borrow(&self) -> &str { self }
 }
 
-impl<A> AsRef<str> for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> AsRef<str> for ArrayString<CAP>
 {
     fn as_ref(&self) -> &str { self }
 }
 
-impl<A> fmt::Debug for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> fmt::Debug for ArrayString<CAP>
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
 }
 
-impl<A> fmt::Display for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> fmt::Display for ArrayString<CAP>
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
 }
 
 /// `Write` appends written data to the end of the string.
-impl<A> fmt::Write for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> fmt::Write for ArrayString<CAP>
 {
     fn write_char(&mut self, c: char) -> fmt::Result {
         self.try_push(c).map_err(|_| fmt::Error)
@@ -463,10 +466,9 @@
     }
 }
 
-impl<A> Clone for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> Clone for ArrayString<CAP>
 {
-    fn clone(&self) -> ArrayString<A> {
+    fn clone(&self) -> ArrayString<CAP> {
         *self
     }
     fn clone_from(&mut self, rhs: &Self) {
@@ -476,8 +478,7 @@
     }
 }
 
-impl<A> PartialOrd for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> PartialOrd for ArrayString<CAP>
 {
     fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
         (**self).partial_cmp(&**rhs)
@@ -488,8 +489,7 @@
     fn ge(&self, rhs: &Self) -> bool { **self >= **rhs }
 }
 
-impl<A> PartialOrd<str> for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> PartialOrd<str> for ArrayString<CAP>
 {
     fn partial_cmp(&self, rhs: &str) -> Option<cmp::Ordering> {
         (**self).partial_cmp(rhs)
@@ -500,28 +500,25 @@
     fn ge(&self, rhs: &str) -> bool { &**self >= rhs }
 }
 
-impl<A> PartialOrd<ArrayString<A>> for str
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> PartialOrd<ArrayString<CAP>> for str
 {
-    fn partial_cmp(&self, rhs: &ArrayString<A>) -> Option<cmp::Ordering> {
+    fn partial_cmp(&self, rhs: &ArrayString<CAP>) -> Option<cmp::Ordering> {
         self.partial_cmp(&**rhs)
     }
-    fn lt(&self, rhs: &ArrayString<A>) -> bool { self < &**rhs }
-    fn le(&self, rhs: &ArrayString<A>) -> bool { self <= &**rhs }
-    fn gt(&self, rhs: &ArrayString<A>) -> bool { self > &**rhs }
-    fn ge(&self, rhs: &ArrayString<A>) -> bool { self >= &**rhs }
+    fn lt(&self, rhs: &ArrayString<CAP>) -> bool { self < &**rhs }
+    fn le(&self, rhs: &ArrayString<CAP>) -> bool { self <= &**rhs }
+    fn gt(&self, rhs: &ArrayString<CAP>) -> bool { self > &**rhs }
+    fn ge(&self, rhs: &ArrayString<CAP>) -> bool { self >= &**rhs }
 }
 
-impl<A> Ord for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> Ord for ArrayString<CAP>
 {
     fn cmp(&self, rhs: &Self) -> cmp::Ordering {
         (**self).cmp(&**rhs)
     }
 }
 
-impl<A> FromStr for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> FromStr for ArrayString<CAP>
 {
     type Err = CapacityError;
 
@@ -532,8 +529,7 @@
 
 #[cfg(feature="serde")]
 /// Requires crate feature `"serde"`
-impl<A> Serialize for ArrayString<A>
-    where A: Array<Item=u8> + Copy
+impl<const CAP: usize> Serialize for ArrayString<CAP>
 {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer
@@ -544,8 +540,7 @@
 
 #[cfg(feature="serde")]
 /// Requires crate feature `"serde"`
-impl<'de, A> Deserialize<'de> for ArrayString<A> 
-    where A: Array<Item=u8> + Copy
+impl<'de, const CAP: usize> Deserialize<'de> for ArrayString<CAP> 
 {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
         where D: Deserializer<'de>
@@ -553,13 +548,13 @@
         use serde::de::{self, Visitor};
         use std::marker::PhantomData;
 
-        struct ArrayStringVisitor<A: Array<Item=u8>>(PhantomData<A>);
+        struct ArrayStringVisitor<const CAP: usize>(PhantomData<[u8; CAP]>);
 
-        impl<'de, A: Copy + Array<Item=u8>> Visitor<'de> for ArrayStringVisitor<A> {
-            type Value = ArrayString<A>;
+        impl<'de, const CAP: usize> Visitor<'de> for ArrayStringVisitor<CAP> {
+            type Value = ArrayString<CAP>;
 
             fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                write!(formatter, "a string no more than {} bytes long", A::CAPACITY)
+                write!(formatter, "a string no more than {} bytes long", CAP)
             }
 
             fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
@@ -577,6 +572,29 @@
             }
         }
 
-        deserializer.deserialize_str(ArrayStringVisitor::<A>(PhantomData))
+        deserializer.deserialize_str(ArrayStringVisitor(PhantomData))
+    }
+}
+
+impl<'a, const CAP: usize> TryFrom<&'a str> for ArrayString<CAP>
+{
+    type Error = CapacityError<&'a str>;
+
+    fn try_from(f: &'a str) -> Result<Self, Self::Error> {
+        let mut v = Self::new();
+        v.try_push_str(f)?;
+        Ok(v)
+    }
+}
+
+impl<'a, const CAP: usize> TryFrom<fmt::Arguments<'a>> for ArrayString<CAP>
+{
+    type Error = CapacityError<fmt::Error>;
+
+    fn try_from(f: fmt::Arguments<'a>) -> Result<Self, Self::Error> {
+        use fmt::Write;
+        let mut v = Self::new();
+        v.write_fmt(f).map_err(|e| CapacityError::new(e))?;
+        Ok(v)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/arrayvec_impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/arrayvec_impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/arrayvec_impl.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/arrayvec_impl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,86 @@
+use std::ptr;
+use std::slice;
+
+use crate::CapacityError;
+
+/// Implements basic arrayvec methods - based on a few required methods
+/// for length and element access.
+pub(crate) trait ArrayVecImpl {
+    type Item;
+    const CAPACITY: usize;
+
+    fn len(&self) -> usize;
+
+    unsafe fn set_len(&mut self, new_len: usize);
+
+    /// Return a slice containing all elements of the vector.
+    fn as_slice(&self) -> &[Self::Item] {
+        let len = self.len();
+        unsafe {
+            slice::from_raw_parts(self.as_ptr(), len)
+        }
+    }
+
+    /// Return a mutable slice containing all elements of the vector.
+    fn as_mut_slice(&mut self) -> &mut [Self::Item] {
+        let len = self.len();
+        unsafe {
+            std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)
+        }
+    }
+
+    /// Return a raw pointer to the vector's buffer.
+    fn as_ptr(&self) -> *const Self::Item;
+
+    /// Return a raw mutable pointer to the vector's buffer.
+    fn as_mut_ptr(&mut self) -> *mut Self::Item;
+
+    fn push(&mut self, element: Self::Item) {
+        self.try_push(element).unwrap()
+    }
+
+    fn try_push(&mut self, element: Self::Item) -> Result<(), CapacityError<Self::Item>> {
+        if self.len() < Self::CAPACITY {
+            unsafe {
+                self.push_unchecked(element);
+            }
+            Ok(())
+        } else {
+            Err(CapacityError::new(element))
+        }
+    }
+
+    unsafe fn push_unchecked(&mut self, element: Self::Item) {
+        let len = self.len();
+        debug_assert!(len < Self::CAPACITY);
+        ptr::write(self.as_mut_ptr().add(len), element);
+        self.set_len(len + 1);
+    }
+
+    fn pop(&mut self) -> Option<Self::Item> {
+        if self.len() == 0 {
+            return None;
+        }
+        unsafe {
+            let new_len = self.len() - 1;
+            self.set_len(new_len);
+            Some(ptr::read(self.as_ptr().add(new_len)))
+        }
+    }
+
+    fn clear(&mut self) {
+        self.truncate(0)
+    }
+
+    fn truncate(&mut self, new_len: usize) {
+        unsafe {
+            let len = self.len();
+            if new_len < len {
+                self.set_len(new_len);
+                let tail = slice::from_raw_parts_mut(self.as_mut_ptr().add(new_len), len - new_len);
+                ptr::drop_in_place(tail);
+            }
+        }
+    }
+}
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/arrayvec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/arrayvec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/arrayvec.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/arrayvec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1250 @@
+
+use std::cmp;
+use std::iter;
+use std::mem;
+use std::ops::{Bound, Deref, DerefMut, RangeBounds};
+use std::ptr;
+use std::slice;
+
+// extra traits
+use std::borrow::{Borrow, BorrowMut};
+use std::hash::{Hash, Hasher};
+use std::fmt;
+
+#[cfg(feature="std")]
+use std::io;
+
+use std::mem::ManuallyDrop;
+use std::mem::MaybeUninit;
+
+#[cfg(feature="serde")]
+use serde::{Serialize, Deserialize, Serializer, Deserializer};
+
+use crate::LenUint;
+use crate::errors::CapacityError;
+use crate::arrayvec_impl::ArrayVecImpl;
+use crate::utils::MakeMaybeUninit;
+
+/// A vector with a fixed capacity.
+///
+/// The `ArrayVec` is a vector backed by a fixed size array. It keeps track of
+/// the number of initialized elements. The `ArrayVec<T, CAP>` is parameterized
+/// by `T` for the element type and `CAP` for the maximum capacity.
+///
+/// `CAP` is of type `usize` but is range limited to `u32::MAX`; attempting to create larger
+/// arrayvecs with larger capacity will panic.
+///
+/// The vector is a contiguous value (storing the elements inline) that you can store directly on
+/// the stack if needed.
+///
+/// It offers a simple API but also dereferences to a slice, so that the full slice API is
+/// available. The ArrayVec can be converted into a by value iterator.
+pub struct ArrayVec<T, const CAP: usize> {
+    // the `len` first elements of the array are initialized
+    xs: [MaybeUninit<T>; CAP],
+    len: LenUint,
+}
+
+impl<T, const CAP: usize> Drop for ArrayVec<T, CAP> {
+    fn drop(&mut self) {
+        self.clear();
+
+        // MaybeUninit inhibits array's drop
+    }
+}
+
+macro_rules! panic_oob {
+    ($method_name:expr, $index:expr, $len:expr) => {
+        panic!(concat!("ArrayVec::", $method_name, ": index {} is out of bounds in vector of length {}"),
+               $index, $len)
+    }
+}
+
+impl<T, const CAP: usize> ArrayVec<T, CAP> {
+    /// Capacity
+    const CAPACITY: usize = CAP;
+
+    /// Create a new empty `ArrayVec`.
+    ///
+    /// The maximum capacity is given by the generic parameter `CAP`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<_, 16>::new();
+    /// array.push(1);
+    /// array.push(2);
+    /// assert_eq!(&array[..], &[1, 2]);
+    /// assert_eq!(array.capacity(), 16);
+    /// ```
+    pub fn new() -> ArrayVec<T, CAP> {
+        assert_capacity_limit!(CAP);
+        unsafe {
+            ArrayVec { xs: MaybeUninit::uninit().assume_init(), len: 0 }
+        }
+    }
+
+    /// Create a new empty `ArrayVec` (const fn).
+    ///
+    /// The maximum capacity is given by the generic parameter `CAP`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// static ARRAY: ArrayVec<u8, 1024> = ArrayVec::new_const();
+    /// ```
+    pub const fn new_const() -> ArrayVec<T, CAP> {
+        assert_capacity_limit_const!(CAP);
+        ArrayVec { xs: MakeMaybeUninit::ARRAY, len: 0 }
+    }
+
+    /// Return the number of elements in the `ArrayVec`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    /// array.pop();
+    /// assert_eq!(array.len(), 2);
+    /// ```
+    #[inline(always)]
+    pub fn len(&self) -> usize { self.len as usize }
+
+    /// Returns whether the `ArrayVec` is empty.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1]);
+    /// array.pop();
+    /// assert_eq!(array.is_empty(), true);
+    /// ```
+    #[inline]
+    pub fn is_empty(&self) -> bool { self.len() == 0 }
+
+    /// Return the capacity of the `ArrayVec`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let array = ArrayVec::from([1, 2, 3]);
+    /// assert_eq!(array.capacity(), 3);
+    /// ```
+    #[inline(always)]
+    pub fn capacity(&self) -> usize { CAP }
+
+    /// Return true if the `ArrayVec` is completely filled to its capacity, false otherwise.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<_, 1>::new();
+    /// assert!(!array.is_full());
+    /// array.push(1);
+    /// assert!(array.is_full());
+    /// ```
+    pub fn is_full(&self) -> bool { self.len() == self.capacity() }
+
+    /// Returns the capacity left in the `ArrayVec`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    /// array.pop();
+    /// assert_eq!(array.remaining_capacity(), 1);
+    /// ```
+    pub fn remaining_capacity(&self) -> usize {
+        self.capacity() - self.len()
+    }
+
+    /// Push `element` to the end of the vector.
+    ///
+    /// ***Panics*** if the vector is already full.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<_, 2>::new();
+    ///
+    /// array.push(1);
+    /// array.push(2);
+    ///
+    /// assert_eq!(&array[..], &[1, 2]);
+    /// ```
+    pub fn push(&mut self, element: T) {
+        ArrayVecImpl::push(self, element)
+    }
+
+    /// Push `element` to the end of the vector.
+    ///
+    /// Return `Ok` if the push succeeds, or return an error if the vector
+    /// is already full.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<_, 2>::new();
+    ///
+    /// let push1 = array.try_push(1);
+    /// let push2 = array.try_push(2);
+    ///
+    /// assert!(push1.is_ok());
+    /// assert!(push2.is_ok());
+    ///
+    /// assert_eq!(&array[..], &[1, 2]);
+    ///
+    /// let overflow = array.try_push(3);
+    ///
+    /// assert!(overflow.is_err());
+    /// ```
+    pub fn try_push(&mut self, element: T) -> Result<(), CapacityError<T>> {
+        ArrayVecImpl::try_push(self, element)
+    }
+
+    /// Push `element` to the end of the vector without checking the capacity.
+    ///
+    /// It is up to the caller to ensure the capacity of the vector is
+    /// sufficiently large.
+    ///
+    /// This method uses *debug assertions* to check that the arrayvec is not full.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<_, 2>::new();
+    ///
+    /// if array.len() + 2 <= array.capacity() {
+    ///     unsafe {
+    ///         array.push_unchecked(1);
+    ///         array.push_unchecked(2);
+    ///     }
+    /// }
+    ///
+    /// assert_eq!(&array[..], &[1, 2]);
+    /// ```
+    pub unsafe fn push_unchecked(&mut self, element: T) {
+        ArrayVecImpl::push_unchecked(self, element)
+    }
+
+    /// Shortens the vector, keeping the first `len` elements and dropping
+    /// the rest.
+    ///
+    /// If `len` is greater than the vector’s current length this has no
+    /// effect.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3, 4, 5]);
+    /// array.truncate(3);
+    /// assert_eq!(&array[..], &[1, 2, 3]);
+    /// array.truncate(4);
+    /// assert_eq!(&array[..], &[1, 2, 3]);
+    /// ```
+    pub fn truncate(&mut self, new_len: usize) {
+        ArrayVecImpl::truncate(self, new_len)
+    }
+
+    /// Remove all elements in the vector.
+    pub fn clear(&mut self) {
+        ArrayVecImpl::clear(self)
+    }
+
+
+    /// Get pointer to where element at `index` would be
+    unsafe fn get_unchecked_ptr(&mut self, index: usize) -> *mut T {
+        self.as_mut_ptr().add(index)
+    }
+
+    /// Insert `element` at position `index`.
+    ///
+    /// Shift up all elements after `index`.
+    ///
+    /// It is an error if the index is greater than the length or if the
+    /// arrayvec is full.
+    ///
+    /// ***Panics*** if the array is full or the `index` is out of bounds. See
+    /// `try_insert` for fallible version.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<_, 2>::new();
+    ///
+    /// array.insert(0, "x");
+    /// array.insert(0, "y");
+    /// assert_eq!(&array[..], &["y", "x"]);
+    ///
+    /// ```
+    pub fn insert(&mut self, index: usize, element: T) {
+        self.try_insert(index, element).unwrap()
+    }
+
+    /// Insert `element` at position `index`.
+    ///
+    /// Shift up all elements after `index`; the `index` must be less than
+    /// or equal to the length.
+    ///
+    /// Returns an error if vector is already at full capacity.
+    ///
+    /// ***Panics*** `index` is out of bounds.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<_, 2>::new();
+    ///
+    /// assert!(array.try_insert(0, "x").is_ok());
+    /// assert!(array.try_insert(0, "y").is_ok());
+    /// assert!(array.try_insert(0, "z").is_err());
+    /// assert_eq!(&array[..], &["y", "x"]);
+    ///
+    /// ```
+    pub fn try_insert(&mut self, index: usize, element: T) -> Result<(), CapacityError<T>> {
+        if index > self.len() {
+            panic_oob!("try_insert", index, self.len())
+        }
+        if self.len() == self.capacity() {
+            return Err(CapacityError::new(element));
+        }
+        let len = self.len();
+
+        // follows is just like Vec<T>
+        unsafe { // infallible
+            // The spot to put the new value
+            {
+                let p: *mut _ = self.get_unchecked_ptr(index);
+                // Shift everything over to make space. (Duplicating the
+                // `index`th element into two consecutive places.)
+                ptr::copy(p, p.offset(1), len - index);
+                // Write it in, overwriting the first copy of the `index`th
+                // element.
+                ptr::write(p, element);
+            }
+            self.set_len(len + 1);
+        }
+        Ok(())
+    }
+
+    /// Remove the last element in the vector and return it.
+    ///
+    /// Return `Some(` *element* `)` if the vector is non-empty, else `None`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<_, 2>::new();
+    ///
+    /// array.push(1);
+    ///
+    /// assert_eq!(array.pop(), Some(1));
+    /// assert_eq!(array.pop(), None);
+    /// ```
+    pub fn pop(&mut self) -> Option<T> {
+        ArrayVecImpl::pop(self)
+    }
+
+    /// Remove the element at `index` and swap the last element into its place.
+    ///
+    /// This operation is O(1).
+    ///
+    /// Return the *element* if the index is in bounds, else panic.
+    ///
+    /// ***Panics*** if the `index` is out of bounds.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    ///
+    /// assert_eq!(array.swap_remove(0), 1);
+    /// assert_eq!(&array[..], &[3, 2]);
+    ///
+    /// assert_eq!(array.swap_remove(1), 2);
+    /// assert_eq!(&array[..], &[3]);
+    /// ```
+    pub fn swap_remove(&mut self, index: usize) -> T {
+        self.swap_pop(index)
+            .unwrap_or_else(|| {
+                panic_oob!("swap_remove", index, self.len())
+            })
+    }
+
+    /// Remove the element at `index` and swap the last element into its place.
+    ///
+    /// This is a checked version of `.swap_remove`.  
+    /// This operation is O(1).
+    ///
+    /// Return `Some(` *element* `)` if the index is in bounds, else `None`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    ///
+    /// assert_eq!(array.swap_pop(0), Some(1));
+    /// assert_eq!(&array[..], &[3, 2]);
+    ///
+    /// assert_eq!(array.swap_pop(10), None);
+    /// ```
+    pub fn swap_pop(&mut self, index: usize) -> Option<T> {
+        let len = self.len();
+        if index >= len {
+            return None;
+        }
+        self.swap(index, len - 1);
+        self.pop()
+    }
+
+    /// Remove the element at `index` and shift down the following elements.
+    ///
+    /// The `index` must be strictly less than the length of the vector.
+    ///
+    /// ***Panics*** if the `index` is out of bounds.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    ///
+    /// let removed_elt = array.remove(0);
+    /// assert_eq!(removed_elt, 1);
+    /// assert_eq!(&array[..], &[2, 3]);
+    /// ```
+    pub fn remove(&mut self, index: usize) -> T {
+        self.pop_at(index)
+            .unwrap_or_else(|| {
+                panic_oob!("remove", index, self.len())
+            })
+    }
+
+    /// Remove the element at `index` and shift down the following elements.
+    ///
+    /// This is a checked version of `.remove(index)`. Returns `None` if there
+    /// is no element at `index`. Otherwise, return the element inside `Some`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    ///
+    /// assert!(array.pop_at(0).is_some());
+    /// assert_eq!(&array[..], &[2, 3]);
+    ///
+    /// assert!(array.pop_at(2).is_none());
+    /// assert!(array.pop_at(10).is_none());
+    /// ```
+    pub fn pop_at(&mut self, index: usize) -> Option<T> {
+        if index >= self.len() {
+            None
+        } else {
+            self.drain(index..index + 1).next()
+        }
+    }
+
+    /// Retains only the elements specified by the predicate.
+    ///
+    /// In other words, remove all elements `e` such that `f(&mut e)` returns false.
+    /// This method operates in place and preserves the order of the retained
+    /// elements.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3, 4]);
+    /// array.retain(|x| *x & 1 != 0 );
+    /// assert_eq!(&array[..], &[1, 3]);
+    /// ```
+    pub fn retain<F>(&mut self, mut f: F)
+        where F: FnMut(&mut T) -> bool
+    {
+        // Check the implementation of
+        // https://doc.rust-lang.org/std/vec/struct.Vec.html#method.retain
+        // for safety arguments (especially regarding panics in f and when
+        // dropping elements). Implementation closely mirrored here.
+
+        let original_len = self.len();
+        unsafe { self.set_len(0) };
+
+        struct BackshiftOnDrop<'a, T, const CAP: usize> {
+            v: &'a mut ArrayVec<T, CAP>,
+            processed_len: usize,
+            deleted_cnt: usize,
+            original_len: usize,
+        }
+
+        impl<T, const CAP: usize> Drop for BackshiftOnDrop<'_, T, CAP> {
+            fn drop(&mut self) {
+                if self.deleted_cnt > 0 {
+                    unsafe {
+                        ptr::copy(
+                            self.v.as_ptr().add(self.processed_len),
+                            self.v.as_mut_ptr().add(self.processed_len - self.deleted_cnt),
+                            self.original_len - self.processed_len
+                        );
+                    }
+                }
+                unsafe {
+                    self.v.set_len(self.original_len - self.deleted_cnt);
+                }
+            }
+        }
+
+        let mut g = BackshiftOnDrop { v: self, processed_len: 0, deleted_cnt: 0, original_len };
+
+        while g.processed_len < original_len {
+            let cur = unsafe { g.v.as_mut_ptr().add(g.processed_len) };
+            if !f(unsafe { &mut *cur }) {
+                g.processed_len += 1;
+                g.deleted_cnt += 1;
+                unsafe { ptr::drop_in_place(cur) };
+                continue;
+            }
+            if g.deleted_cnt > 0 {
+                unsafe {
+                    let hole_slot = g.v.as_mut_ptr().add(g.processed_len - g.deleted_cnt);
+                    ptr::copy_nonoverlapping(cur, hole_slot, 1);
+                }
+            }
+            g.processed_len += 1;
+        }
+
+        drop(g);
+    }
+
+    /// Set the vector’s length without dropping or moving out elements
+    ///
+    /// This method is `unsafe` because it changes the notion of the
+    /// number of “valid� elements in the vector. Use with care.
+    ///
+    /// This method uses *debug assertions* to check that `length` is
+    /// not greater than the capacity.
+    pub unsafe fn set_len(&mut self, length: usize) {
+        // type invariant that capacity always fits in LenUint
+        debug_assert!(length <= self.capacity());
+        self.len = length as LenUint;
+    }
+
+    /// Copy all elements from the slice and append to the `ArrayVec`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut vec: ArrayVec<usize, 10> = ArrayVec::new();
+    /// vec.push(1);
+    /// vec.try_extend_from_slice(&[2, 3]).unwrap();
+    /// assert_eq!(&vec[..], &[1, 2, 3]);
+    /// ```
+    ///
+    /// # Errors
+    ///
+    /// This method will return an error if the capacity left (see
+    /// [`remaining_capacity`]) is smaller then the length of the provided
+    /// slice.
+    ///
+    /// [`remaining_capacity`]: #method.remaining_capacity
+    pub fn try_extend_from_slice(&mut self, other: &[T]) -> Result<(), CapacityError>
+        where T: Copy,
+    {
+        if self.remaining_capacity() < other.len() {
+            return Err(CapacityError::new(()));
+        }
+
+        let self_len = self.len();
+        let other_len = other.len();
+
+        unsafe {
+            let dst = self.get_unchecked_ptr(self_len);
+            ptr::copy_nonoverlapping(other.as_ptr(), dst, other_len);
+            self.set_len(self_len + other_len);
+        }
+        Ok(())
+    }
+
+    /// Create a draining iterator that removes the specified range in the vector
+    /// and yields the removed items from start to end. The element range is
+    /// removed even if the iterator is not consumed until the end.
+    ///
+    /// Note: It is unspecified how many elements are removed from the vector,
+    /// if the `Drain` value is leaked.
+    ///
+    /// **Panics** if the starting point is greater than the end point or if
+    /// the end point is greater than the length of the vector.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut v1 = ArrayVec::from([1, 2, 3]);
+    /// let v2: ArrayVec<_, 3> = v1.drain(0..2).collect();
+    /// assert_eq!(&v1[..], &[3]);
+    /// assert_eq!(&v2[..], &[1, 2]);
+    /// ```
+    pub fn drain<R>(&mut self, range: R) -> Drain<T, CAP>
+        where R: RangeBounds<usize>
+    {
+        // Memory safety
+        //
+        // When the Drain is first created, it shortens the length of
+        // the source vector to make sure no uninitialized or moved-from elements
+        // are accessible at all if the Drain's destructor never gets to run.
+        //
+        // Drain will ptr::read out the values to remove.
+        // When finished, remaining tail of the vec is copied back to cover
+        // the hole, and the vector length is restored to the new length.
+        //
+        let len = self.len();
+        let start = match range.start_bound() {
+            Bound::Unbounded => 0,
+            Bound::Included(&i) => i,
+            Bound::Excluded(&i) => i.saturating_add(1),
+        };
+        let end = match range.end_bound() {
+            Bound::Excluded(&j) => j,
+            Bound::Included(&j) => j.saturating_add(1),
+            Bound::Unbounded => len,
+        };
+        self.drain_range(start, end)
+    }
+
+    fn drain_range(&mut self, start: usize, end: usize) -> Drain<T, CAP>
+    {
+        let len = self.len();
+
+        // bounds check happens here (before length is changed!)
+        let range_slice: *const _ = &self[start..end];
+
+        // Calling `set_len` creates a fresh and thus unique mutable references, making all
+        // older aliases we created invalid. So we cannot call that function.
+        self.len = start as LenUint;
+
+        unsafe {
+            Drain {
+                tail_start: end,
+                tail_len: len - end,
+                iter: (*range_slice).iter(),
+                vec: self as *mut _,
+            }
+        }
+    }
+
+    /// Return the inner fixed size array, if it is full to its capacity.
+    ///
+    /// Return an `Ok` value with the array if length equals capacity,
+    /// return an `Err` with self otherwise.
+    pub fn into_inner(self) -> Result<[T; CAP], Self> {
+        if self.len() < self.capacity() {
+            Err(self)
+        } else {
+            unsafe { Ok(self.into_inner_unchecked()) }
+        }
+    }
+
+    /// Return the inner fixed size array.
+    ///
+    /// Safety:
+    /// This operation is safe if and only if length equals capacity.
+    pub unsafe fn into_inner_unchecked(self) -> [T; CAP] {
+        debug_assert_eq!(self.len(), self.capacity());
+        let self_ = ManuallyDrop::new(self);
+        let array = ptr::read(self_.as_ptr() as *const [T; CAP]);
+        array
+    }
+
+    /// Returns the ArrayVec, replacing the original with a new empty ArrayVec.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut v = ArrayVec::from([0, 1, 2, 3]);
+    /// assert_eq!([0, 1, 2, 3], v.take().into_inner().unwrap());
+    /// assert!(v.is_empty());
+    /// ```
+    pub fn take(&mut self) -> Self  {
+        mem::replace(self, Self::new())
+    }
+
+    /// Return a slice containing all elements of the vector.
+    pub fn as_slice(&self) -> &[T] {
+        ArrayVecImpl::as_slice(self)
+    }
+
+    /// Return a mutable slice containing all elements of the vector.
+    pub fn as_mut_slice(&mut self) -> &mut [T] {
+        ArrayVecImpl::as_mut_slice(self)
+    }
+
+    /// Return a raw pointer to the vector's buffer.
+    pub fn as_ptr(&self) -> *const T {
+        ArrayVecImpl::as_ptr(self)
+    }
+
+    /// Return a raw mutable pointer to the vector's buffer.
+    pub fn as_mut_ptr(&mut self) -> *mut T {
+        ArrayVecImpl::as_mut_ptr(self)
+    }
+}
+
+impl<T, const CAP: usize> ArrayVecImpl for ArrayVec<T, CAP> {
+    type Item = T;
+    const CAPACITY: usize = CAP;
+
+    fn len(&self) -> usize { self.len() }
+
+    unsafe fn set_len(&mut self, length: usize) {
+        debug_assert!(length <= CAP);
+        self.len = length as LenUint;
+    }
+
+    fn as_ptr(&self) -> *const Self::Item {
+        self.xs.as_ptr() as _
+    }
+
+    fn as_mut_ptr(&mut self) -> *mut Self::Item {
+        self.xs.as_mut_ptr() as _
+    }
+}
+
+impl<T, const CAP: usize> Deref for ArrayVec<T, CAP> {
+    type Target = [T];
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        self.as_slice()
+    }
+}
+
+impl<T, const CAP: usize> DerefMut for ArrayVec<T, CAP> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.as_mut_slice()
+    }
+}
+
+
+/// Create an `ArrayVec` from an array.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+///
+/// let mut array = ArrayVec::from([1, 2, 3]);
+/// assert_eq!(array.len(), 3);
+/// assert_eq!(array.capacity(), 3);
+/// ```
+impl<T, const CAP: usize> From<[T; CAP]> for ArrayVec<T, CAP> {
+    fn from(array: [T; CAP]) -> Self {
+        let array = ManuallyDrop::new(array);
+        let mut vec = <ArrayVec<T, CAP>>::new();
+        unsafe {
+            (&*array as *const [T; CAP] as *const [MaybeUninit<T>; CAP])
+                .copy_to_nonoverlapping(&mut vec.xs as *mut [MaybeUninit<T>; CAP], 1);
+            vec.set_len(CAP);
+        }
+        vec
+    }
+}
+
+
+/// Try to create an `ArrayVec` from a slice. This will return an error if the slice was too big to
+/// fit.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+/// use std::convert::TryInto as _;
+///
+/// let array: ArrayVec<_, 4> = (&[1, 2, 3] as &[_]).try_into().unwrap();
+/// assert_eq!(array.len(), 3);
+/// assert_eq!(array.capacity(), 4);
+/// ```
+impl<T, const CAP: usize> std::convert::TryFrom<&[T]> for ArrayVec<T, CAP>
+    where T: Clone,
+{
+    type Error = CapacityError;
+
+    fn try_from(slice: &[T]) -> Result<Self, Self::Error> {
+        if Self::CAPACITY < slice.len() {
+            Err(CapacityError::new(()))
+        } else {
+            let mut array = Self::new();
+            array.extend_from_slice(slice);
+            Ok(array)
+        }
+    }
+}
+
+
+/// Iterate the `ArrayVec` with references to each element.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+///
+/// let array = ArrayVec::from([1, 2, 3]);
+///
+/// for elt in &array {
+///     // ...
+/// }
+/// ```
+impl<'a, T: 'a, const CAP: usize> IntoIterator for &'a ArrayVec<T, CAP> {
+    type Item = &'a T;
+    type IntoIter = slice::Iter<'a, T>;
+    fn into_iter(self) -> Self::IntoIter { self.iter() }
+}
+
+/// Iterate the `ArrayVec` with mutable references to each element.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+///
+/// let mut array = ArrayVec::from([1, 2, 3]);
+///
+/// for elt in &mut array {
+///     // ...
+/// }
+/// ```
+impl<'a, T: 'a, const CAP: usize> IntoIterator for &'a mut ArrayVec<T, CAP> {
+    type Item = &'a mut T;
+    type IntoIter = slice::IterMut<'a, T>;
+    fn into_iter(self) -> Self::IntoIter { self.iter_mut() }
+}
+
+/// Iterate the `ArrayVec` with each element by value.
+///
+/// The vector is consumed by this operation.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+///
+/// for elt in ArrayVec::from([1, 2, 3]) {
+///     // ...
+/// }
+/// ```
+impl<T, const CAP: usize> IntoIterator for ArrayVec<T, CAP> {
+    type Item = T;
+    type IntoIter = IntoIter<T, CAP>;
+    fn into_iter(self) -> IntoIter<T, CAP> {
+        IntoIter { index: 0, v: self, }
+    }
+}
+
+
+/// By-value iterator for `ArrayVec`.
+pub struct IntoIter<T, const CAP: usize> {
+    index: usize,
+    v: ArrayVec<T, CAP>,
+}
+
+impl<T, const CAP: usize> Iterator for IntoIter<T, CAP> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.index == self.v.len() {
+            None
+        } else {
+            unsafe {
+                let index = self.index;
+                self.index = index + 1;
+                Some(ptr::read(self.v.get_unchecked_ptr(index)))
+            }
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.v.len() - self.index;
+        (len, Some(len))
+    }
+}
+
+impl<T, const CAP: usize> DoubleEndedIterator for IntoIter<T, CAP> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        if self.index == self.v.len() {
+            None
+        } else {
+            unsafe {
+                let new_len = self.v.len() - 1;
+                self.v.set_len(new_len);
+                Some(ptr::read(self.v.get_unchecked_ptr(new_len)))
+            }
+        }
+    }
+}
+
+impl<T, const CAP: usize> ExactSizeIterator for IntoIter<T, CAP> { }
+
+impl<T, const CAP: usize> Drop for IntoIter<T, CAP> {
+    fn drop(&mut self) {
+        // panic safety: Set length to 0 before dropping elements.
+        let index = self.index;
+        let len = self.v.len();
+        unsafe {
+            self.v.set_len(0);
+            let elements = slice::from_raw_parts_mut(
+                self.v.get_unchecked_ptr(index),
+                len - index);
+            ptr::drop_in_place(elements);
+        }
+    }
+}
+
+impl<T, const CAP: usize> Clone for IntoIter<T, CAP>
+where T: Clone,
+{
+    fn clone(&self) -> IntoIter<T, CAP> {
+        let mut v = ArrayVec::new();
+        v.extend_from_slice(&self.v[self.index..]);
+        v.into_iter()
+    }
+}
+
+impl<T, const CAP: usize> fmt::Debug for IntoIter<T, CAP>
+where
+    T: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_list()
+            .entries(&self.v[self.index..])
+            .finish()
+    }
+}
+
+/// A draining iterator for `ArrayVec`.
+pub struct Drain<'a, T: 'a, const CAP: usize> {
+    /// Index of tail to preserve
+    tail_start: usize,
+    /// Length of tail
+    tail_len: usize,
+    /// Current remaining range to remove
+    iter: slice::Iter<'a, T>,
+    vec: *mut ArrayVec<T, CAP>,
+}
+
+unsafe impl<'a, T: Sync, const CAP: usize> Sync for Drain<'a, T, CAP> {}
+unsafe impl<'a, T: Send, const CAP: usize> Send for Drain<'a, T, CAP> {}
+
+impl<'a, T: 'a, const CAP: usize> Iterator for Drain<'a, T, CAP> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next().map(|elt|
+            unsafe {
+                ptr::read(elt as *const _)
+            }
+        )
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+impl<'a, T: 'a, const CAP: usize> DoubleEndedIterator for Drain<'a, T, CAP>
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.iter.next_back().map(|elt|
+            unsafe {
+                ptr::read(elt as *const _)
+            }
+        )
+    }
+}
+
+impl<'a, T: 'a, const CAP: usize> ExactSizeIterator for Drain<'a, T, CAP> {}
+
+impl<'a, T: 'a, const CAP: usize> Drop for Drain<'a, T, CAP> {
+    fn drop(&mut self) {
+        // len is currently 0 so panicking while dropping will not cause a double drop.
+
+        // exhaust self first
+        while let Some(_) = self.next() { }
+
+        if self.tail_len > 0 {
+            unsafe {
+                let source_vec = &mut *self.vec;
+                // memmove back untouched tail, update to new length
+                let start = source_vec.len();
+                let tail = self.tail_start;
+                let src = source_vec.as_ptr().add(tail);
+                let dst = source_vec.as_mut_ptr().add(start);
+                ptr::copy(src, dst, self.tail_len);
+                source_vec.set_len(start + self.tail_len);
+            }
+        }
+    }
+}
+
+struct ScopeExitGuard<T, Data, F>
+    where F: FnMut(&Data, &mut T)
+{
+    value: T,
+    data: Data,
+    f: F,
+}
+
+impl<T, Data, F> Drop for ScopeExitGuard<T, Data, F>
+    where F: FnMut(&Data, &mut T)
+{
+    fn drop(&mut self) {
+        (self.f)(&self.data, &mut self.value)
+    }
+}
+
+
+
+/// Extend the `ArrayVec` with an iterator.
+/// 
+/// ***Panics*** if extending the vector exceeds its capacity.
+impl<T, const CAP: usize> Extend<T> for ArrayVec<T, CAP> {
+    /// Extend the `ArrayVec` with an iterator.
+    /// 
+    /// ***Panics*** if extending the vector exceeds its capacity.
+    fn extend<I: IntoIterator<Item=T>>(&mut self, iter: I) {
+        unsafe {
+            self.extend_from_iter::<_, true>(iter)
+        }
+    }
+}
+
+#[inline(never)]
+#[cold]
+fn extend_panic() {
+    panic!("ArrayVec: capacity exceeded in extend/from_iter");
+}
+
+impl<T, const CAP: usize> ArrayVec<T, CAP> {
+    /// Extend the arrayvec from the iterable.
+    ///
+    /// ## Safety
+    ///
+    /// Unsafe because if CHECK is false, the length of the input is not checked.
+    /// The caller must ensure the length of the input fits in the capacity.
+    pub(crate) unsafe fn extend_from_iter<I, const CHECK: bool>(&mut self, iterable: I)
+        where I: IntoIterator<Item = T>
+    {
+        let take = self.capacity() - self.len();
+        let len = self.len();
+        let mut ptr = raw_ptr_add(self.as_mut_ptr(), len);
+        let end_ptr = raw_ptr_add(ptr, take);
+        // Keep the length in a separate variable, write it back on scope
+        // exit. To help the compiler with alias analysis and stuff.
+        // We update the length to handle panic in the iteration of the
+        // user's iterator, without dropping any elements on the floor.
+        let mut guard = ScopeExitGuard {
+            value: &mut self.len,
+            data: len,
+            f: move |&len, self_len| {
+                **self_len = len as LenUint;
+            }
+        };
+        let mut iter = iterable.into_iter();
+        loop {
+            if let Some(elt) = iter.next() {
+                if ptr == end_ptr && CHECK { extend_panic(); }
+                debug_assert_ne!(ptr, end_ptr);
+                ptr.write(elt);
+                ptr = raw_ptr_add(ptr, 1);
+                guard.data += 1;
+            } else {
+                return; // success
+            }
+        }
+    }
+
+    /// Extend the ArrayVec with clones of elements from the slice;
+    /// the length of the slice must be <= the remaining capacity in the arrayvec.
+    pub(crate) fn extend_from_slice(&mut self, slice: &[T])
+        where T: Clone
+    {
+        let take = self.capacity() - self.len();
+        debug_assert!(slice.len() <= take);
+        unsafe {
+            let slice = if take < slice.len() { &slice[..take] } else { slice };
+            self.extend_from_iter::<_, false>(slice.iter().cloned());
+        }
+    }
+}
+
+/// Rawptr add but uses arithmetic distance for ZST
+unsafe fn raw_ptr_add<T>(ptr: *mut T, offset: usize) -> *mut T {
+    if mem::size_of::<T>() == 0 {
+        // Special case for ZST
+        (ptr as usize).wrapping_add(offset) as _
+    } else {
+        ptr.add(offset)
+    }
+}
+
+/// Create an `ArrayVec` from an iterator.
+/// 
+/// ***Panics*** if the number of elements in the iterator exceeds the arrayvec's capacity.
+impl<T, const CAP: usize> iter::FromIterator<T> for ArrayVec<T, CAP> {
+    /// Create an `ArrayVec` from an iterator.
+    /// 
+    /// ***Panics*** if the number of elements in the iterator exceeds the arrayvec's capacity.
+    fn from_iter<I: IntoIterator<Item=T>>(iter: I) -> Self {
+        let mut array = ArrayVec::new();
+        array.extend(iter);
+        array
+    }
+}
+
+impl<T, const CAP: usize> Clone for ArrayVec<T, CAP>
+    where T: Clone
+{
+    fn clone(&self) -> Self {
+        self.iter().cloned().collect()
+    }
+
+    fn clone_from(&mut self, rhs: &Self) {
+        // recursive case for the common prefix
+        let prefix = cmp::min(self.len(), rhs.len());
+        self[..prefix].clone_from_slice(&rhs[..prefix]);
+
+        if prefix < self.len() {
+            // rhs was shorter
+            self.truncate(prefix);
+        } else {
+            let rhs_elems = &rhs[self.len()..];
+            self.extend_from_slice(rhs_elems);
+        }
+    }
+}
+
+impl<T, const CAP: usize> Hash for ArrayVec<T, CAP>
+    where T: Hash
+{
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        Hash::hash(&**self, state)
+    }
+}
+
+impl<T, const CAP: usize> PartialEq for ArrayVec<T, CAP>
+    where T: PartialEq
+{
+    fn eq(&self, other: &Self) -> bool {
+        **self == **other
+    }
+}
+
+impl<T, const CAP: usize> PartialEq<[T]> for ArrayVec<T, CAP>
+    where T: PartialEq
+{
+    fn eq(&self, other: &[T]) -> bool {
+        **self == *other
+    }
+}
+
+impl<T, const CAP: usize> Eq for ArrayVec<T, CAP> where T: Eq { }
+
+impl<T, const CAP: usize> Borrow<[T]> for ArrayVec<T, CAP> {
+    fn borrow(&self) -> &[T] { self }
+}
+
+impl<T, const CAP: usize> BorrowMut<[T]> for ArrayVec<T, CAP> {
+    fn borrow_mut(&mut self) -> &mut [T] { self }
+}
+
+impl<T, const CAP: usize> AsRef<[T]> for ArrayVec<T, CAP> {
+    fn as_ref(&self) -> &[T] { self }
+}
+
+impl<T, const CAP: usize> AsMut<[T]> for ArrayVec<T, CAP> {
+    fn as_mut(&mut self) -> &mut [T] { self }
+}
+
+impl<T, const CAP: usize> fmt::Debug for ArrayVec<T, CAP> where T: fmt::Debug {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
+}
+
+impl<T, const CAP: usize> Default for ArrayVec<T, CAP> {
+    /// Return an empty array
+    fn default() -> ArrayVec<T, CAP> {
+        ArrayVec::new()
+    }
+}
+
+impl<T, const CAP: usize> PartialOrd for ArrayVec<T, CAP> where T: PartialOrd {
+    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
+        (**self).partial_cmp(other)
+    }
+
+    fn lt(&self, other: &Self) -> bool {
+        (**self).lt(other)
+    }
+
+    fn le(&self, other: &Self) -> bool {
+        (**self).le(other)
+    }
+
+    fn ge(&self, other: &Self) -> bool {
+        (**self).ge(other)
+    }
+
+    fn gt(&self, other: &Self) -> bool {
+        (**self).gt(other)
+    }
+}
+
+impl<T, const CAP: usize> Ord for ArrayVec<T, CAP> where T: Ord {
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        (**self).cmp(other)
+    }
+}
+
+#[cfg(feature="std")]
+/// `Write` appends written data to the end of the vector.
+///
+/// Requires `features="std"`.
+impl<const CAP: usize> io::Write for ArrayVec<u8, CAP> {
+    fn write(&mut self, data: &[u8]) -> io::Result<usize> {
+        let len = cmp::min(self.remaining_capacity(), data.len());
+        let _result = self.try_extend_from_slice(&data[..len]);
+        debug_assert!(_result.is_ok());
+        Ok(len)
+    }
+    fn flush(&mut self) -> io::Result<()> { Ok(()) }
+}
+
+#[cfg(feature="serde")]
+/// Requires crate feature `"serde"`
+impl<T: Serialize, const CAP: usize> Serialize for ArrayVec<T, CAP> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        serializer.collect_seq(self)
+    }
+}
+
+#[cfg(feature="serde")]
+/// Requires crate feature `"serde"`
+impl<'de, T: Deserialize<'de>, const CAP: usize> Deserialize<'de> for ArrayVec<T, CAP> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where D: Deserializer<'de>
+    {
+        use serde::de::{Visitor, SeqAccess, Error};
+        use std::marker::PhantomData;
+
+        struct ArrayVecVisitor<'de, T: Deserialize<'de>, const CAP: usize>(PhantomData<(&'de (), [T; CAP])>);
+
+        impl<'de, T: Deserialize<'de>, const CAP: usize> Visitor<'de> for ArrayVecVisitor<'de, T, CAP> {
+            type Value = ArrayVec<T, CAP>;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                write!(formatter, "an array with no more than {} items", CAP)
+            }
+
+            fn visit_seq<SA>(self, mut seq: SA) -> Result<Self::Value, SA::Error>
+                where SA: SeqAccess<'de>,
+            {
+                let mut values = ArrayVec::<T, CAP>::new();
+
+                while let Some(value) = seq.next_element()? {
+                    if let Err(_) = values.try_push(value) {
+                        return Err(SA::Error::invalid_length(CAP + 1, &self));
+                    }
+                }
+
+                Ok(values)
+            }
+        }
+
+        deserializer.deserialize_seq(ArrayVecVisitor::<T, CAP>(PhantomData))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/char.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/char.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/char.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/char.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,8 +10,6 @@
 //
 // Original authors: alexchrichton, bluss
 
-use std::ptr;
-
 // UTF-8 ranges and tags for encoding characters
 const TAG_CONT: u8    = 0b1000_0000;
 const TAG_TWO_B: u8   = 0b1100_0000;
@@ -24,11 +22,6 @@
 /// Placeholder
 pub struct EncodeUtf8Error;
 
-#[inline]
-unsafe fn write(ptr: *mut u8, index: usize, byte: u8) {
-    ptr::write(ptr.add(index), byte)
-}
-
 /// Encode a char into buf using UTF-8.
 ///
 /// On success, return the byte length of the encoding (1, 2, 3 or 4).<br>
@@ -40,22 +33,22 @@
 {
     let code = ch as u32;
     if code < MAX_ONE_B && len >= 1 {
-        write(ptr, 0, code as u8);
+        ptr.add(0).write(code as u8);
         return Ok(1);
     } else if code < MAX_TWO_B && len >= 2 {
-        write(ptr, 0, (code >> 6 & 0x1F) as u8 | TAG_TWO_B);
-        write(ptr, 1, (code & 0x3F) as u8 | TAG_CONT);
+        ptr.add(0).write((code >> 6 & 0x1F) as u8 | TAG_TWO_B);
+        ptr.add(1).write((code & 0x3F) as u8 | TAG_CONT);
         return Ok(2);
     } else if code < MAX_THREE_B && len >= 3 {
-        write(ptr, 0, (code >> 12 & 0x0F) as u8 | TAG_THREE_B);
-        write(ptr, 1, (code >>  6 & 0x3F) as u8 | TAG_CONT);
-        write(ptr, 2, (code & 0x3F) as u8 | TAG_CONT);
+        ptr.add(0).write((code >> 12 & 0x0F) as u8 | TAG_THREE_B);
+        ptr.add(1).write((code >>  6 & 0x3F) as u8 | TAG_CONT);
+        ptr.add(2).write((code & 0x3F) as u8 | TAG_CONT);
         return Ok(3);
     } else if len >= 4 {
-        write(ptr, 0, (code >> 18 & 0x07) as u8 | TAG_FOUR_B);
-        write(ptr, 1, (code >> 12 & 0x3F) as u8 | TAG_CONT);
-        write(ptr, 2, (code >>  6 & 0x3F) as u8 | TAG_CONT);
-        write(ptr, 3, (code & 0x3F) as u8 | TAG_CONT);
+        ptr.add(0).write((code >> 18 & 0x07) as u8 | TAG_FOUR_B);
+        ptr.add(1).write((code >> 12 & 0x3F) as u8 | TAG_CONT);
+        ptr.add(2).write((code >>  6 & 0x3F) as u8 | TAG_CONT);
+        ptr.add(3).write((code & 0x3F) as u8 | TAG_CONT);
         return Ok(4);
     };
     Err(EncodeUtf8Error)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-//! **arrayvec** provides the types `ArrayVec` and `ArrayString`: 
+//! **arrayvec** provides the types [`ArrayVec`] and [`ArrayString`]: 
 //! array-backed vector and string types, which store their contents inline.
 //!
 //! The arrayvec package has the following cargo features:
@@ -10,23 +10,13 @@
 //! - `serde`
 //!   - Optional
 //!   - Enable serialization for ArrayVec and ArrayString using serde 1.x
-//! - `array-sizes-33-128`, `array-sizes-129-255`
-//!   - Optional
-//!   - Enable more array sizes (see [Array] for more information)
-//!
-//! - `unstable-const-fn`
-//!   - Optional
-//!   - Makes [`ArrayVec::new`] and [`ArrayString::new`] `const fn`s,
-//!     using the nightly `const_fn` feature.
-//!   - Unstable and requires nightly.
 //!
 //! ## Rust Version
 //!
-//! This version of arrayvec requires Rust 1.36 or later.
+//! This version of arrayvec requires Rust 1.51 or later.
 //!
-#![doc(html_root_url="https://docs.rs/arrayvec/0.4/")]
+#![doc(html_root_url="https://docs.rs/arrayvec/0.7/")]
 #![cfg_attr(not(feature="std"), no_std)]
-#![cfg_attr(feature="unstable-const-fn", feature(const_fn))]
 
 #[cfg(feature="serde")]
 extern crate serde;
@@ -34,1180 +24,36 @@
 #[cfg(not(feature="std"))]
 extern crate core as std;
 
-use std::cmp;
-use std::iter;
-use std::mem;
-use std::ops::{Bound, Deref, DerefMut, RangeBounds};
-use std::ptr;
-use std::slice;
-
-// extra traits
-use std::borrow::{Borrow, BorrowMut};
-use std::hash::{Hash, Hasher};
-use std::fmt;
-
-#[cfg(feature="std")]
-use std::io;
-
-
-mod maybe_uninit;
-use crate::maybe_uninit::MaybeUninit;
-
-#[cfg(feature="serde")]
-use serde::{Serialize, Deserialize, Serializer, Deserializer};
-
-mod array;
-mod array_string;
-mod char;
-mod errors;
-
-pub use crate::array::Array;
-use crate::array::Index;
-pub use crate::array_string::ArrayString;
-pub use crate::errors::CapacityError;
-
-
-/// A vector with a fixed capacity.
-///
-/// The `ArrayVec` is a vector backed by a fixed size array. It keeps track of
-/// the number of initialized elements.
-///
-/// The vector is a contiguous value that you can store directly on the stack
-/// if needed.
-///
-/// It offers a simple API but also dereferences to a slice, so
-/// that the full slice API is available.
-///
-/// ArrayVec can be converted into a by value iterator.
-pub struct ArrayVec<A: Array> {
-    xs: MaybeUninit<A>,
-    len: A::Index,
-}
-
-impl<A: Array> Drop for ArrayVec<A> {
-    fn drop(&mut self) {
-        self.clear();
-
-        // MaybeUninit inhibits array's drop
-    }
-}
-
-macro_rules! panic_oob {
-    ($method_name:expr, $index:expr, $len:expr) => {
-        panic!(concat!("ArrayVec::", $method_name, ": index {} is out of bounds in vector of length {}"),
-               $index, $len)
-    }
-}
-
-impl<A: Array> ArrayVec<A> {
-    /// Create a new empty `ArrayVec`.
-    ///
-    /// Capacity is inferred from the type parameter.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 16]>::new();
-    /// array.push(1);
-    /// array.push(2);
-    /// assert_eq!(&array[..], &[1, 2]);
-    /// assert_eq!(array.capacity(), 16);
-    /// ```
-    #[cfg(not(feature="unstable-const-fn"))]
-    pub fn new() -> ArrayVec<A> {
-        unsafe {
-            ArrayVec { xs: MaybeUninit::uninitialized(), len: Index::ZERO }
-        }
-    }
-
-    #[cfg(feature="unstable-const-fn")]
-    pub const fn new() -> ArrayVec<A> {
-        unsafe {
-            ArrayVec { xs: MaybeUninit::uninitialized(), len: Index::ZERO }
-        }
-    }
-
-    /// Return the number of elements in the `ArrayVec`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    /// array.pop();
-    /// assert_eq!(array.len(), 2);
-    /// ```
-    #[inline]
-    pub fn len(&self) -> usize { self.len.to_usize() }
-
-    /// Returns whether the `ArrayVec` is empty.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1]);
-    /// array.pop();
-    /// assert_eq!(array.is_empty(), true);
-    /// ```
-    #[inline]
-    pub fn is_empty(&self) -> bool { self.len() == 0 }
+pub(crate) type LenUint = u32;
 
-    /// Return the capacity of the `ArrayVec`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let array = ArrayVec::from([1, 2, 3]);
-    /// assert_eq!(array.capacity(), 3);
-    /// ```
-    #[inline(always)]
-    pub fn capacity(&self) -> usize { A::CAPACITY }
-
-    /// Return if the `ArrayVec` is completely filled.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 1]>::new();
-    /// assert!(!array.is_full());
-    /// array.push(1);
-    /// assert!(array.is_full());
-    /// ```
-    pub fn is_full(&self) -> bool { self.len() == self.capacity() }
-
-    /// Returns the capacity left in the `ArrayVec`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    /// array.pop();
-    /// assert_eq!(array.remaining_capacity(), 1);
-    /// ```
-    pub fn remaining_capacity(&self) -> usize {
-        self.capacity() - self.len()
-    }
-
-    /// Push `element` to the end of the vector.
-    ///
-    /// ***Panics*** if the vector is already full.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// array.push(1);
-    /// array.push(2);
-    ///
-    /// assert_eq!(&array[..], &[1, 2]);
-    /// ```
-    pub fn push(&mut self, element: A::Item) {
-        self.try_push(element).unwrap()
-    }
-
-    /// Push `element` to the end of the vector.
-    ///
-    /// Return `Ok` if the push succeeds, or return an error if the vector
-    /// is already full.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// let push1 = array.try_push(1);
-    /// let push2 = array.try_push(2);
-    ///
-    /// assert!(push1.is_ok());
-    /// assert!(push2.is_ok());
-    ///
-    /// assert_eq!(&array[..], &[1, 2]);
-    ///
-    /// let overflow = array.try_push(3);
-    ///
-    /// assert!(overflow.is_err());
-    /// ```
-    pub fn try_push(&mut self, element: A::Item) -> Result<(), CapacityError<A::Item>> {
-        if self.len() < A::CAPACITY {
-            unsafe {
-                self.push_unchecked(element);
-            }
-            Ok(())
-        } else {
-            Err(CapacityError::new(element))
-        }
-    }
-
-
-    /// Push `element` to the end of the vector without checking the capacity.
-    ///
-    /// It is up to the caller to ensure the capacity of the vector is
-    /// sufficiently large.
-    ///
-    /// This method uses *debug assertions* to check that the arrayvec is not full.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// if array.len() + 2 <= array.capacity() {
-    ///     unsafe {
-    ///         array.push_unchecked(1);
-    ///         array.push_unchecked(2);
-    ///     }
-    /// }
-    ///
-    /// assert_eq!(&array[..], &[1, 2]);
-    /// ```
-    pub unsafe fn push_unchecked(&mut self, element: A::Item) {
-        let len = self.len();
-        debug_assert!(len < A::CAPACITY);
-        ptr::write(self.get_unchecked_ptr(len), element);
-        self.set_len(len + 1);
-    }
-
-    /// Get pointer to where element at `index` would be
-    unsafe fn get_unchecked_ptr(&mut self, index: usize) -> *mut A::Item {
-        self.xs.ptr_mut().add(index)
-    }
-
-    /// Insert `element` at position `index`.
-    ///
-    /// Shift up all elements after `index`.
-    ///
-    /// It is an error if the index is greater than the length or if the
-    /// arrayvec is full.
-    ///
-    /// ***Panics*** if the array is full or the `index` is out of bounds. See
-    /// `try_insert` for fallible version.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// array.insert(0, "x");
-    /// array.insert(0, "y");
-    /// assert_eq!(&array[..], &["y", "x"]);
-    ///
-    /// ```
-    pub fn insert(&mut self, index: usize, element: A::Item) {
-        self.try_insert(index, element).unwrap()
-    }
-
-    /// Insert `element` at position `index`.
-    ///
-    /// Shift up all elements after `index`; the `index` must be less than
-    /// or equal to the length.
-    ///
-    /// Returns an error if vector is already at full capacity.
-    ///
-    /// ***Panics*** `index` is out of bounds.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// assert!(array.try_insert(0, "x").is_ok());
-    /// assert!(array.try_insert(0, "y").is_ok());
-    /// assert!(array.try_insert(0, "z").is_err());
-    /// assert_eq!(&array[..], &["y", "x"]);
-    ///
-    /// ```
-    pub fn try_insert(&mut self, index: usize, element: A::Item) -> Result<(), CapacityError<A::Item>> {
-        if index > self.len() {
-            panic_oob!("try_insert", index, self.len())
-        }
-        if self.len() == self.capacity() {
-            return Err(CapacityError::new(element));
-        }
-        let len = self.len();
-
-        // follows is just like Vec<T>
-        unsafe { // infallible
-            // The spot to put the new value
-            {
-                let p: *mut _ = self.get_unchecked_ptr(index);
-                // Shift everything over to make space. (Duplicating the
-                // `index`th element into two consecutive places.)
-                ptr::copy(p, p.offset(1), len - index);
-                // Write it in, overwriting the first copy of the `index`th
-                // element.
-                ptr::write(p, element);
+macro_rules! assert_capacity_limit {
+    ($cap:expr) => {
+        if std::mem::size_of::<usize>() > std::mem::size_of::<LenUint>() {
+            if $cap > LenUint::MAX as usize {
+                panic!("ArrayVec: largest supported capacity is u32::MAX")
             }
-            self.set_len(len + 1);
-        }
-        Ok(())
-    }
-
-    /// Remove the last element in the vector and return it.
-    ///
-    /// Return `Some(` *element* `)` if the vector is non-empty, else `None`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// array.push(1);
-    ///
-    /// assert_eq!(array.pop(), Some(1));
-    /// assert_eq!(array.pop(), None);
-    /// ```
-    pub fn pop(&mut self) -> Option<A::Item> {
-        if self.len() == 0 {
-            return None;
-        }
-        unsafe {
-            let new_len = self.len() - 1;
-            self.set_len(new_len);
-            Some(ptr::read(self.get_unchecked_ptr(new_len)))
-        }
-    }
-
-    /// Remove the element at `index` and swap the last element into its place.
-    ///
-    /// This operation is O(1).
-    ///
-    /// Return the *element* if the index is in bounds, else panic.
-    ///
-    /// ***Panics*** if the `index` is out of bounds.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    ///
-    /// assert_eq!(array.swap_remove(0), 1);
-    /// assert_eq!(&array[..], &[3, 2]);
-    ///
-    /// assert_eq!(array.swap_remove(1), 2);
-    /// assert_eq!(&array[..], &[3]);
-    /// ```
-    pub fn swap_remove(&mut self, index: usize) -> A::Item {
-        self.swap_pop(index)
-            .unwrap_or_else(|| {
-                panic_oob!("swap_remove", index, self.len())
-            })
-    }
-
-    /// Remove the element at `index` and swap the last element into its place.
-    ///
-    /// This is a checked version of `.swap_remove`.  
-    /// This operation is O(1).
-    ///
-    /// Return `Some(` *element* `)` if the index is in bounds, else `None`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    ///
-    /// assert_eq!(array.swap_pop(0), Some(1));
-    /// assert_eq!(&array[..], &[3, 2]);
-    ///
-    /// assert_eq!(array.swap_pop(10), None);
-    /// ```
-    pub fn swap_pop(&mut self, index: usize) -> Option<A::Item> {
-        let len = self.len();
-        if index >= len {
-            return None;
-        }
-        self.swap(index, len - 1);
-        self.pop()
-    }
-
-    /// Remove the element at `index` and shift down the following elements.
-    ///
-    /// The `index` must be strictly less than the length of the vector.
-    ///
-    /// ***Panics*** if the `index` is out of bounds.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    ///
-    /// let removed_elt = array.remove(0);
-    /// assert_eq!(removed_elt, 1);
-    /// assert_eq!(&array[..], &[2, 3]);
-    /// ```
-    pub fn remove(&mut self, index: usize) -> A::Item {
-        self.pop_at(index)
-            .unwrap_or_else(|| {
-                panic_oob!("remove", index, self.len())
-            })
-    }
-
-    /// Remove the element at `index` and shift down the following elements.
-    ///
-    /// This is a checked version of `.remove(index)`. Returns `None` if there
-    /// is no element at `index`. Otherwise, return the element inside `Some`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    ///
-    /// assert!(array.pop_at(0).is_some());
-    /// assert_eq!(&array[..], &[2, 3]);
-    ///
-    /// assert!(array.pop_at(2).is_none());
-    /// assert!(array.pop_at(10).is_none());
-    /// ```
-    pub fn pop_at(&mut self, index: usize) -> Option<A::Item> {
-        if index >= self.len() {
-            None
-        } else {
-            self.drain(index..index + 1).next()
-        }
-    }
-
-    /// Shortens the vector, keeping the first `len` elements and dropping
-    /// the rest.
-    ///
-    /// If `len` is greater than the vector’s current length this has no
-    /// effect.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3, 4, 5]);
-    /// array.truncate(3);
-    /// assert_eq!(&array[..], &[1, 2, 3]);
-    /// array.truncate(4);
-    /// assert_eq!(&array[..], &[1, 2, 3]);
-    /// ```
-    pub fn truncate(&mut self, new_len: usize) {
-        unsafe {
-            if new_len < self.len() {
-                let tail: *mut [_] = &mut self[new_len..];
-                self.len = Index::from(new_len);
-                ptr::drop_in_place(tail);
-            }
-        }
-    }
-
-    /// Remove all elements in the vector.
-    pub fn clear(&mut self) {
-        self.truncate(0)
-    }
-
-    /// Retains only the elements specified by the predicate.
-    ///
-    /// In other words, remove all elements `e` such that `f(&mut e)` returns false.
-    /// This method operates in place and preserves the order of the retained
-    /// elements.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3, 4]);
-    /// array.retain(|x| *x & 1 != 0 );
-    /// assert_eq!(&array[..], &[1, 3]);
-    /// ```
-    pub fn retain<F>(&mut self, mut f: F)
-        where F: FnMut(&mut A::Item) -> bool
-    {
-        let len = self.len();
-        let mut del = 0;
-        {
-            let v = &mut **self;
-
-            for i in 0..len {
-                if !f(&mut v[i]) {
-                    del += 1;
-                } else if del > 0 {
-                    v.swap(i - del, i);
-                }
-            }
-        }
-        if del > 0 {
-            self.drain(len - del..);
-        }
-    }
-
-    /// Set the vector’s length without dropping or moving out elements
-    ///
-    /// This method is `unsafe` because it changes the notion of the
-    /// number of “valid� elements in the vector. Use with care.
-    ///
-    /// This method uses *debug assertions* to check that `length` is
-    /// not greater than the capacity.
-    pub unsafe fn set_len(&mut self, length: usize) {
-        debug_assert!(length <= self.capacity());
-        self.len = Index::from(length);
-    }
-
-    /// Copy and appends all elements in a slice to the `ArrayVec`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut vec: ArrayVec<[usize; 10]> = ArrayVec::new();
-    /// vec.push(1);
-    /// vec.try_extend_from_slice(&[2, 3]).unwrap();
-    /// assert_eq!(&vec[..], &[1, 2, 3]);
-    /// ```
-    ///
-    /// # Errors
-    ///
-    /// This method will return an error if the capacity left (see
-    /// [`remaining_capacity`]) is smaller then the length of the provided
-    /// slice.
-    ///
-    /// [`remaining_capacity`]: #method.remaining_capacity
-    pub fn try_extend_from_slice(&mut self, other: &[A::Item]) -> Result<(), CapacityError>
-        where A::Item: Copy,
-    {
-        if self.remaining_capacity() < other.len() {
-            return Err(CapacityError::new(()));
-        }
-
-        let self_len = self.len();
-        let other_len = other.len();
-
-        unsafe {
-            let dst = self.xs.ptr_mut().add(self_len);
-            ptr::copy_nonoverlapping(other.as_ptr(), dst, other_len);
-            self.set_len(self_len + other_len);
-        }
-        Ok(())
-    }
-
-    /// Create a draining iterator that removes the specified range in the vector
-    /// and yields the removed items from start to end. The element range is
-    /// removed even if the iterator is not consumed until the end.
-    ///
-    /// Note: It is unspecified how many elements are removed from the vector,
-    /// if the `Drain` value is leaked.
-    ///
-    /// **Panics** if the starting point is greater than the end point or if
-    /// the end point is greater than the length of the vector.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut v = ArrayVec::from([1, 2, 3]);
-    /// let u: ArrayVec<[_; 3]> = v.drain(0..2).collect();
-    /// assert_eq!(&v[..], &[3]);
-    /// assert_eq!(&u[..], &[1, 2]);
-    /// ```
-    pub fn drain<R>(&mut self, range: R) -> Drain<A>
-        where R: RangeBounds<usize>
-    {
-        // Memory safety
-        //
-        // When the Drain is first created, it shortens the length of
-        // the source vector to make sure no uninitialized or moved-from elements
-        // are accessible at all if the Drain's destructor never gets to run.
-        //
-        // Drain will ptr::read out the values to remove.
-        // When finished, remaining tail of the vec is copied back to cover
-        // the hole, and the vector length is restored to the new length.
-        //
-        let len = self.len();
-        let start = match range.start_bound() {
-            Bound::Unbounded => 0,
-            Bound::Included(&i) => i,
-            Bound::Excluded(&i) => i.saturating_add(1),
-        };
-        let end = match range.end_bound() {
-            Bound::Excluded(&j) => j,
-            Bound::Included(&j) => j.saturating_add(1),
-            Bound::Unbounded => len,
-        };
-        self.drain_range(start, end)
-    }
-
-    fn drain_range(&mut self, start: usize, end: usize) -> Drain<A>
-    {
-        let len = self.len();
-
-        // bounds check happens here (before length is changed!)
-        let range_slice: *const _ = &self[start..end];
-
-        // Calling `set_len` creates a fresh and thus unique mutable references, making all
-        // older aliases we created invalid. So we cannot call that function.
-        self.len = Index::from(start);
-
-        unsafe {
-            Drain {
-                tail_start: end,
-                tail_len: len - end,
-                iter: (*range_slice).iter(),
-                vec: self as *mut _,
-            }
-        }
-    }
-
-    /// Return the inner fixed size array, if it is full to its capacity.
-    ///
-    /// Return an `Ok` value with the array if length equals capacity,
-    /// return an `Err` with self otherwise.
-    pub fn into_inner(self) -> Result<A, Self> {
-        if self.len() < self.capacity() {
-            Err(self)
-        } else {
-            unsafe {
-                let array = ptr::read(self.xs.ptr() as *const A);
-                mem::forget(self);
-                Ok(array)
-            }
-        }
-    }
-
-    /// Dispose of `self` (same as drop)
-    #[deprecated="Use std::mem::drop instead, if at all needed."]
-    pub fn dispose(mut self) {
-        self.clear();
-        mem::forget(self);
-    }
-
-    /// Return a slice containing all elements of the vector.
-    pub fn as_slice(&self) -> &[A::Item] {
-        self
-    }
-
-    /// Return a mutable slice containing all elements of the vector.
-    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
-        self
-    }
-
-    /// Return a raw pointer to the vector's buffer.
-    pub fn as_ptr(&self) -> *const A::Item {
-        self.xs.ptr()
-    }
-
-    /// Return a raw mutable pointer to the vector's buffer.
-    pub fn as_mut_ptr(&mut self) -> *mut A::Item {
-        self.xs.ptr_mut()
-    }
-}
-
-impl<A: Array> Deref for ArrayVec<A> {
-    type Target = [A::Item];
-    #[inline]
-    fn deref(&self) -> &[A::Item] {
-        unsafe {
-            slice::from_raw_parts(self.xs.ptr(), self.len())
-        }
-    }
-}
-
-impl<A: Array> DerefMut for ArrayVec<A> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut [A::Item] {
-        let len = self.len();
-        unsafe {
-            slice::from_raw_parts_mut(self.xs.ptr_mut(), len)
         }
     }
 }
 
-/// Create an `ArrayVec` from an array.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-///
-/// let mut array = ArrayVec::from([1, 2, 3]);
-/// assert_eq!(array.len(), 3);
-/// assert_eq!(array.capacity(), 3);
-/// ```
-impl<A: Array> From<A> for ArrayVec<A> {
-    fn from(array: A) -> Self {
-        ArrayVec { xs: MaybeUninit::from(array), len: Index::from(A::CAPACITY) }
-    }
-}
-
-
-/// Try to create an `ArrayVec` from a slice. This will return an error if the slice was too big to
-/// fit.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-/// use std::convert::TryInto as _;
-///
-/// let array: ArrayVec<[_; 4]> = (&[1, 2, 3] as &[_]).try_into().unwrap();
-/// assert_eq!(array.len(), 3);
-/// assert_eq!(array.capacity(), 4);
-/// ```
-impl<A: Array> std::convert::TryFrom<&[A::Item]> for ArrayVec<A>
-    where
-        A::Item: Clone,
-{
-    type Error = CapacityError;
-
-    fn try_from(slice: &[A::Item]) -> Result<Self, Self::Error> {
-        if A::CAPACITY < slice.len() {
-            Err(CapacityError::new(()))
-        } else {
-            let mut array = Self::new();
-            array.extend(slice.iter().cloned());
-            Ok(array)
-        }
-    }
-}
-
-
-/// Iterate the `ArrayVec` with references to each element.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-///
-/// let array = ArrayVec::from([1, 2, 3]);
-///
-/// for elt in &array {
-///     // ...
-/// }
-/// ```
-impl<'a, A: Array> IntoIterator for &'a ArrayVec<A> {
-    type Item = &'a A::Item;
-    type IntoIter = slice::Iter<'a, A::Item>;
-    fn into_iter(self) -> Self::IntoIter { self.iter() }
-}
-
-/// Iterate the `ArrayVec` with mutable references to each element.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-///
-/// let mut array = ArrayVec::from([1, 2, 3]);
-///
-/// for elt in &mut array {
-///     // ...
-/// }
-/// ```
-impl<'a, A: Array> IntoIterator for &'a mut ArrayVec<A> {
-    type Item = &'a mut A::Item;
-    type IntoIter = slice::IterMut<'a, A::Item>;
-    fn into_iter(self) -> Self::IntoIter { self.iter_mut() }
-}
-
-/// Iterate the `ArrayVec` with each element by value.
-///
-/// The vector is consumed by this operation.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-///
-/// for elt in ArrayVec::from([1, 2, 3]) {
-///     // ...
-/// }
-/// ```
-impl<A: Array> IntoIterator for ArrayVec<A> {
-    type Item = A::Item;
-    type IntoIter = IntoIter<A>;
-    fn into_iter(self) -> IntoIter<A> {
-        IntoIter { index: Index::from(0), v: self, }
-    }
-}
-
-
-/// By-value iterator for `ArrayVec`.
-pub struct IntoIter<A: Array> {
-    index: A::Index,
-    v: ArrayVec<A>,
-}
-
-impl<A: Array> Iterator for IntoIter<A> {
-    type Item = A::Item;
-
-    fn next(&mut self) -> Option<A::Item> {
-        if self.index == self.v.len {
-            None
-        } else {
-            unsafe {
-                let index = self.index.to_usize();
-                self.index = Index::from(index + 1);
-                Some(ptr::read(self.v.get_unchecked_ptr(index)))
-            }
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = self.v.len() - self.index.to_usize();
-        (len, Some(len))
-    }
-}
-
-impl<A: Array> DoubleEndedIterator for IntoIter<A> {
-    fn next_back(&mut self) -> Option<A::Item> {
-        if self.index == self.v.len {
-            None
-        } else {
-            unsafe {
-                let new_len = self.v.len() - 1;
-                self.v.set_len(new_len);
-                Some(ptr::read(self.v.get_unchecked_ptr(new_len)))
-            }
-        }
-    }
-}
-
-impl<A: Array> ExactSizeIterator for IntoIter<A> { }
-
-impl<A: Array> Drop for IntoIter<A> {
-    fn drop(&mut self) {
-        // panic safety: Set length to 0 before dropping elements.
-        let index = self.index.to_usize();
-        let len = self.v.len();
-        unsafe {
-            self.v.set_len(0);
-            let elements = slice::from_raw_parts_mut(
-                self.v.get_unchecked_ptr(index),
-                len - index);
-            ptr::drop_in_place(elements);
-        }
-    }
-}
-
-impl<A: Array> Clone for IntoIter<A>
-where
-    A::Item: Clone,
-{
-    fn clone(&self) -> IntoIter<A> {
-        self.v[self.index.to_usize()..]
-            .iter()
-            .cloned()
-            .collect::<ArrayVec<A>>()
-            .into_iter()
-    }
-}
-
-impl<A: Array> fmt::Debug for IntoIter<A>
-where
-    A::Item: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_list()
-            .entries(&self.v[self.index.to_usize()..])
-            .finish()
-    }
-}
-
-/// A draining iterator for `ArrayVec`.
-pub struct Drain<'a, A> 
-    where A: Array,
-          A::Item: 'a,
-{
-    /// Index of tail to preserve
-    tail_start: usize,
-    /// Length of tail
-    tail_len: usize,
-    /// Current remaining range to remove
-    iter: slice::Iter<'a, A::Item>,
-    vec: *mut ArrayVec<A>,
-}
-
-unsafe impl<'a, A: Array + Sync> Sync for Drain<'a, A> {}
-unsafe impl<'a, A: Array + Send> Send for Drain<'a, A> {}
-
-impl<'a, A: Array> Iterator for Drain<'a, A>
-    where A::Item: 'a,
-{
-    type Item = A::Item;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.iter.next().map(|elt|
-            unsafe {
-                ptr::read(elt as *const _)
-            }
-        )
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-impl<'a, A: Array> DoubleEndedIterator for Drain<'a, A>
-    where A::Item: 'a,
-{
-    fn next_back(&mut self) -> Option<Self::Item> {
-        self.iter.next_back().map(|elt|
-            unsafe {
-                ptr::read(elt as *const _)
-            }
-        )
-    }
-}
-
-impl<'a, A: Array> ExactSizeIterator for Drain<'a, A> where A::Item: 'a {}
-
-impl<'a, A: Array> Drop for Drain<'a, A> 
-    where A::Item: 'a
-{
-    fn drop(&mut self) {
-        // len is currently 0 so panicking while dropping will not cause a double drop.
-
-        // exhaust self first
-        while let Some(_) = self.next() { }
-
-        if self.tail_len > 0 {
-            unsafe {
-                let source_vec = &mut *self.vec;
-                // memmove back untouched tail, update to new length
-                let start = source_vec.len();
-                let tail = self.tail_start;
-                let src = source_vec.as_ptr().add(tail);
-                let dst = source_vec.as_mut_ptr().add(start);
-                ptr::copy(src, dst, self.tail_len);
-                source_vec.set_len(start + self.tail_len);
-            }
-        }
-    }
-}
-
-struct ScopeExitGuard<T, Data, F>
-    where F: FnMut(&Data, &mut T)
-{
-    value: T,
-    data: Data,
-    f: F,
-}
-
-impl<T, Data, F> Drop for ScopeExitGuard<T, Data, F>
-    where F: FnMut(&Data, &mut T)
-{
-    fn drop(&mut self) {
-        (self.f)(&self.data, &mut self.value)
-    }
-}
-
-
-
-/// Extend the `ArrayVec` with an iterator.
-/// 
-/// Does not extract more items than there is space for. No error
-/// occurs if there are more iterator elements.
-impl<A: Array> Extend<A::Item> for ArrayVec<A> {
-    fn extend<T: IntoIterator<Item=A::Item>>(&mut self, iter: T) {
-        let take = self.capacity() - self.len();
-        unsafe {
-            let len = self.len();
-            let mut ptr = raw_ptr_add(self.as_mut_ptr(), len);
-            let end_ptr = raw_ptr_add(ptr, take);
-            // Keep the length in a separate variable, write it back on scope
-            // exit. To help the compiler with alias analysis and stuff.
-            // We update the length to handle panic in the iteration of the
-            // user's iterator, without dropping any elements on the floor.
-            let mut guard = ScopeExitGuard {
-                value: &mut self.len,
-                data: len,
-                f: move |&len, self_len| {
-                    **self_len = Index::from(len);
-                }
-            };
-            let mut iter = iter.into_iter();
-            loop {
-                if ptr == end_ptr { break; }
-                if let Some(elt) = iter.next() {
-                    raw_ptr_write(ptr, elt);
-                    ptr = raw_ptr_add(ptr, 1);
-                    guard.data += 1;
-                } else {
-                    break;
-                }
-            }
-        }
-    }
-}
-
-/// Rawptr add but uses arithmetic distance for ZST
-unsafe fn raw_ptr_add<T>(ptr: *mut T, offset: usize) -> *mut T {
-    if mem::size_of::<T>() == 0 {
-        // Special case for ZST
-        (ptr as usize).wrapping_add(offset) as _
-    } else {
-        ptr.add(offset)
-    }
-}
-
-unsafe fn raw_ptr_write<T>(ptr: *mut T, value: T) {
-    if mem::size_of::<T>() == 0 {
-        /* nothing */
-    } else {
-        ptr::write(ptr, value)
-    }
-}
-
-/// Create an `ArrayVec` from an iterator.
-/// 
-/// Does not extract more items than there is space for. No error
-/// occurs if there are more iterator elements.
-impl<A: Array> iter::FromIterator<A::Item> for ArrayVec<A> {
-    fn from_iter<T: IntoIterator<Item=A::Item>>(iter: T) -> Self {
-        let mut array = ArrayVec::new();
-        array.extend(iter);
-        array
-    }
-}
-
-impl<A: Array> Clone for ArrayVec<A>
-    where A::Item: Clone
-{
-    fn clone(&self) -> Self {
-        self.iter().cloned().collect()
-    }
-
-    fn clone_from(&mut self, rhs: &Self) {
-        // recursive case for the common prefix
-        let prefix = cmp::min(self.len(), rhs.len());
-        self[..prefix].clone_from_slice(&rhs[..prefix]);
-
-        if prefix < self.len() {
-            // rhs was shorter
-            for _ in 0..self.len() - prefix {
-                self.pop();
+macro_rules! assert_capacity_limit_const {
+    ($cap:expr) => {
+        if std::mem::size_of::<usize>() > std::mem::size_of::<LenUint>() {
+            if $cap > LenUint::MAX as usize {
+                [/*ArrayVec: largest supported capacity is u32::MAX*/][$cap]
             }
-        } else {
-            let rhs_elems = rhs[self.len()..].iter().cloned();
-            self.extend(rhs_elems);
         }
     }
 }
 
-impl<A: Array> Hash for ArrayVec<A>
-    where A::Item: Hash
-{
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        Hash::hash(&**self, state)
-    }
-}
-
-impl<A: Array> PartialEq for ArrayVec<A>
-    where A::Item: PartialEq
-{
-    fn eq(&self, other: &Self) -> bool {
-        **self == **other
-    }
-}
-
-impl<A: Array> PartialEq<[A::Item]> for ArrayVec<A>
-    where A::Item: PartialEq
-{
-    fn eq(&self, other: &[A::Item]) -> bool {
-        **self == *other
-    }
-}
-
-impl<A: Array> Eq for ArrayVec<A> where A::Item: Eq { }
-
-impl<A: Array> Borrow<[A::Item]> for ArrayVec<A> {
-    fn borrow(&self) -> &[A::Item] { self }
-}
-
-impl<A: Array> BorrowMut<[A::Item]> for ArrayVec<A> {
-    fn borrow_mut(&mut self) -> &mut [A::Item] { self }
-}
-
-impl<A: Array> AsRef<[A::Item]> for ArrayVec<A> {
-    fn as_ref(&self) -> &[A::Item] { self }
-}
-
-impl<A: Array> AsMut<[A::Item]> for ArrayVec<A> {
-    fn as_mut(&mut self) -> &mut [A::Item] { self }
-}
-
-impl<A: Array> fmt::Debug for ArrayVec<A> where A::Item: fmt::Debug {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
-}
-
-impl<A: Array> Default for ArrayVec<A> {
-    /// Return an empty array
-    fn default() -> ArrayVec<A> {
-        ArrayVec::new()
-    }
-}
-
-impl<A: Array> PartialOrd for ArrayVec<A> where A::Item: PartialOrd {
-    fn partial_cmp(&self, other: &ArrayVec<A>) -> Option<cmp::Ordering> {
-        (**self).partial_cmp(other)
-    }
-
-    fn lt(&self, other: &Self) -> bool {
-        (**self).lt(other)
-    }
-
-    fn le(&self, other: &Self) -> bool {
-        (**self).le(other)
-    }
-
-    fn ge(&self, other: &Self) -> bool {
-        (**self).ge(other)
-    }
-
-    fn gt(&self, other: &Self) -> bool {
-        (**self).gt(other)
-    }
-}
-
-impl<A: Array> Ord for ArrayVec<A> where A::Item: Ord {
-    fn cmp(&self, other: &ArrayVec<A>) -> cmp::Ordering {
-        (**self).cmp(other)
-    }
-}
-
-#[cfg(feature="std")]
-/// `Write` appends written data to the end of the vector.
-///
-/// Requires `features="std"`.
-impl<A: Array<Item=u8>> io::Write for ArrayVec<A> {
-    fn write(&mut self, data: &[u8]) -> io::Result<usize> {
-        let len = cmp::min(self.remaining_capacity(), data.len());
-        let _result = self.try_extend_from_slice(&data[..len]);
-        debug_assert!(_result.is_ok());
-        Ok(len)
-    }
-    fn flush(&mut self) -> io::Result<()> { Ok(()) }
-}
-
-#[cfg(feature="serde")]
-/// Requires crate feature `"serde"`
-impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where S: Serializer
-    {
-        serializer.collect_seq(self)
-    }
-}
-
-#[cfg(feature="serde")]
-/// Requires crate feature `"serde"`
-impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A> {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: Deserializer<'de>
-    {
-        use serde::de::{Visitor, SeqAccess, Error};
-        use std::marker::PhantomData;
-
-        struct ArrayVecVisitor<'de, T: Deserialize<'de>, A: Array<Item=T>>(PhantomData<(&'de (), T, A)>);
-
-        impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Visitor<'de> for ArrayVecVisitor<'de, T, A> {
-            type Value = ArrayVec<A>;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                write!(formatter, "an array with no more than {} items", A::CAPACITY)
-            }
-
-            fn visit_seq<SA>(self, mut seq: SA) -> Result<Self::Value, SA::Error>
-                where SA: SeqAccess<'de>,
-            {
-                let mut values = ArrayVec::<A>::new();
-
-                while let Some(value) = seq.next_element()? {
-                    if let Err(_) = values.try_push(value) {
-                        return Err(SA::Error::invalid_length(A::CAPACITY + 1, &self));
-                    }
-                }
+mod arrayvec_impl;
+mod arrayvec;
+mod array_string;
+mod char;
+mod errors;
+mod utils;
 
-                Ok(values)
-            }
-        }
+pub use crate::array_string::ArrayString;
+pub use crate::errors::CapacityError;
 
-        deserializer.deserialize_seq(ArrayVecVisitor::<T, A>(PhantomData))
-    }
-}
+pub use crate::arrayvec::{ArrayVec, IntoIter, Drain};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/maybe_uninit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/maybe_uninit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/maybe_uninit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/maybe_uninit.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-
-
-use crate::array::Array;
-use std::mem::MaybeUninit as StdMaybeUninit;
-
-#[derive(Copy)]
-pub struct MaybeUninit<T> {
-    inner: StdMaybeUninit<T>,
-}
-
-impl<T> Clone for MaybeUninit<T>
-    where T: Copy
-{
-    fn clone(&self) -> Self { *self }
-}
-
-impl<T> MaybeUninit<T> {
-    /// Create a new MaybeUninit with uninitialized interior
-    pub const unsafe fn uninitialized() -> Self {
-        MaybeUninit { inner: StdMaybeUninit::uninit() }
-    }
-
-    /// Create a new MaybeUninit from the value `v`.
-    pub fn from(v: T) -> Self {
-        MaybeUninit { inner: StdMaybeUninit::new(v) }
-    }
-
-    // Raw pointer casts written so that we don't reference or access the
-    // uninitialized interior value
-
-    /// Return a raw pointer to the start of the interior array
-    pub fn ptr(&self) -> *const T::Item
-        where T: Array
-    {
-        self.inner.as_ptr() as *const T::Item
-    }
-
-    /// Return a mut raw pointer to the start of the interior array
-    pub fn ptr_mut(&mut self) -> *mut T::Item
-        where T: Array
-    {
-        self.inner.as_mut_ptr() as *mut T::Item
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/src/utils.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/src/utils.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+use std::marker::PhantomData;
+use std::mem::MaybeUninit;
+
+pub(crate) struct MakeMaybeUninit<T, const N: usize>(PhantomData<fn() -> T>);
+
+impl<T, const N: usize> MakeMaybeUninit<T, N> {
+    pub(crate) const VALUE: MaybeUninit<T> = MaybeUninit::uninit();
+
+    pub(crate) const ARRAY: [MaybeUninit<T>; N] = [Self::VALUE; N];
+}
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/tests/serde.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/tests/serde.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/tests/serde.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/tests/serde.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
 
     #[test]
     fn test_ser_de_empty() {
-        let vec = ArrayVec::<[u32; 0]>::new();
+        let vec = ArrayVec::<u32, 0>::new();
 
         assert_tokens(&vec, &[
             Token::Seq { len: Some(0) },
@@ -20,7 +20,7 @@
 
     #[test]
     fn test_ser_de() {
-        let mut vec = ArrayVec::<[u32; 3]>::new();
+        let mut vec = ArrayVec::<u32, 3>::new();
         vec.push(20);
         vec.push(55);
         vec.push(123);
@@ -36,7 +36,7 @@
 
     #[test]
     fn test_de_too_large() {
-        assert_de_tokens_error::<ArrayVec<[u32; 2]>>(&[
+        assert_de_tokens_error::<ArrayVec<u32, 2>>(&[
             Token::Seq { len: Some(3) },
             Token::U32(13),
             Token::U32(42),
@@ -52,7 +52,7 @@
 
     #[test]
     fn test_ser_de_empty() {
-        let string = ArrayString::<[u8; 0]>::new();
+        let string = ArrayString::<0>::new();
 
         assert_tokens(&string, &[
             Token::Str(""),
@@ -62,7 +62,7 @@
 
     #[test]
     fn test_ser_de() {
-        let string = ArrayString::<[u8; 9]>::from("1234 abcd")
+        let string = ArrayString::<9>::from("1234 abcd")
             .expect("expected exact specified capacity to be enough");
 
         assert_tokens(&string, &[
@@ -72,7 +72,7 @@
 
     #[test]
     fn test_de_too_large() {
-        assert_de_tokens_error::<ArrayString<[u8; 2]>>(&[
+        assert_de_tokens_error::<ArrayString<2>>(&[
             Token::Str("afd")
         ], "invalid length 3, expected a string no more than 2 bytes long");
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/tests/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/tests/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec/tests/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec/tests/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 fn test_simple() {
     use std::ops::Add;
 
-    let mut vec: ArrayVec<[Vec<i32>; 3]> = ArrayVec::new();
+    let mut vec: ArrayVec<Vec<i32>,  3> = ArrayVec::new();
 
     vec.push(vec![1, 2, 3, 4]);
     vec.push(vec![10]);
@@ -29,7 +29,7 @@
 
 #[test]
 fn test_capacity_left() {
-    let mut vec: ArrayVec<[usize; 4]> = ArrayVec::new();
+    let mut vec: ArrayVec<usize,  4> = ArrayVec::new();
     assert_eq!(vec.remaining_capacity(), 4);
     vec.push(1);
     assert_eq!(vec.remaining_capacity(), 3);
@@ -43,7 +43,7 @@
 
 #[test]
 fn test_extend_from_slice() {
-    let mut vec: ArrayVec<[usize; 10]> = ArrayVec::new();
+    let mut vec: ArrayVec<usize,  10> = ArrayVec::new();
 
     vec.try_extend_from_slice(&[1, 2, 3]).unwrap();
     assert_eq!(vec.len(), 3);
@@ -54,13 +54,13 @@
 
 #[test]
 fn test_extend_from_slice_error() {
-    let mut vec: ArrayVec<[usize; 10]> = ArrayVec::new();
+    let mut vec: ArrayVec<usize,  10> = ArrayVec::new();
 
     vec.try_extend_from_slice(&[1, 2, 3]).unwrap();
     let res = vec.try_extend_from_slice(&[0; 8]);
     assert_matches!(res, Err(_));
 
-    let mut vec: ArrayVec<[usize; 0]> = ArrayVec::new();
+    let mut vec: ArrayVec<usize,  0> = ArrayVec::new();
     let res = vec.try_extend_from_slice(&[0; 1]);
     assert_matches!(res, Err(_));
 }
@@ -70,14 +70,14 @@
     use arrayvec::ArrayVec;
     use std::convert::TryInto as _;
 
-    let res: Result<ArrayVec<[_; 2]>, _> = (&[1, 2, 3] as &[_]).try_into();
+    let res: Result<ArrayVec<_,  2>, _> = (&[1, 2, 3] as &[_]).try_into();
     assert_matches!(res, Err(_));
 }
 
 #[test]
 fn test_u16_index() {
     const N: usize = 4096;
-    let mut vec: ArrayVec<[_; N]> = ArrayVec::new();
+    let mut vec: ArrayVec<_,  N> = ArrayVec::new();
     for _ in 0..N {
         assert!(vec.try_push(1u8).is_ok());
     }
@@ -113,7 +113,7 @@
     }
 
     {
-        let mut array = ArrayVec::<[Bump; 128]>::new();
+        let mut array = ArrayVec::<Bump,  128>::new();
         array.push(Bump(flag));
         array.push(Bump(flag));
     }
@@ -123,7 +123,7 @@
     flag.set(0);
 
     {
-        let mut array = ArrayVec::<[_; 3]>::new();
+        let mut array = ArrayVec::<_,  3>::new();
         array.push(vec![Bump(flag)]);
         array.push(vec![Bump(flag), Bump(flag)]);
         array.push(vec![]);
@@ -142,7 +142,7 @@
     // test into_inner
     flag.set(0);
     {
-        let mut array = ArrayVec::<[_; 3]>::new();
+        let mut array = ArrayVec::<_,  3>::new();
         array.push(Bump(flag));
         array.push(Bump(flag));
         array.push(Bump(flag));
@@ -153,10 +153,25 @@
         assert_eq!(flag.get(), 3);
     }
 
+    // test take
+    flag.set(0);
+    {
+        let mut array1 = ArrayVec::<_,  3>::new();
+        array1.push(Bump(flag));
+        array1.push(Bump(flag));
+        array1.push(Bump(flag));
+        let array2 = array1.take();
+        assert_eq!(flag.get(), 0);
+        drop(array1);
+        assert_eq!(flag.get(), 0);
+        drop(array2);
+        assert_eq!(flag.get(), 3);
+    }
+
     // test cloning into_iter
     flag.set(0);
     {
-        let mut array = ArrayVec::<[_; 3]>::new();
+        let mut array = ArrayVec::<_,  3>::new();
         array.push(Bump(flag));
         array.push(Bump(flag));
         array.push(Bump(flag));
@@ -210,7 +225,7 @@
 
     flag.set(0);
     {
-        let mut array = ArrayVec::<[Bump; 128]>::new();
+        let mut array = ArrayVec::<Bump,  128>::new();
         array.push(Bump(flag));
         array.push(Bump(flag));
         array.push(Bump(flag));
@@ -226,7 +241,7 @@
 
     flag.set(0);
     {
-        let mut array = ArrayVec::<[Bump; 16]>::new();
+        let mut array = ArrayVec::<Bump,  16>::new();
         array.push(Bump(flag));
         array.push(Bump(flag));
         array.push(Bump(flag));
@@ -251,48 +266,66 @@
 fn test_extend() {
     let mut range = 0..10;
 
-    let mut array: ArrayVec<[_; 5]> = range.by_ref().collect();
+    let mut array: ArrayVec<_,  5> = range.by_ref().take(5).collect();
     assert_eq!(&array[..], &[0, 1, 2, 3, 4]);
     assert_eq!(range.next(), Some(5));
 
-    array.extend(range.by_ref());
+    array.extend(range.by_ref().take(0));
     assert_eq!(range.next(), Some(6));
 
-    let mut array: ArrayVec<[_; 10]> = (0..3).collect();
+    let mut array: ArrayVec<_,  10> = (0..3).collect();
     assert_eq!(&array[..], &[0, 1, 2]);
     array.extend(3..5);
     assert_eq!(&array[..], &[0, 1, 2, 3, 4]);
 }
 
+#[should_panic]
+#[test]
+fn test_extend_capacity_panic_1() {
+    let mut range = 0..10;
+
+    let _: ArrayVec<_,  5> = range.by_ref().collect();
+}
+
+#[should_panic]
+#[test]
+fn test_extend_capacity_panic_2() {
+    let mut range = 0..10;
+
+    let mut array: ArrayVec<_,  5> = range.by_ref().take(5).collect();
+    assert_eq!(&array[..], &[0, 1, 2, 3, 4]);
+    assert_eq!(range.next(), Some(5));
+    array.extend(range.by_ref().take(1));
+}
+
 #[test]
 fn test_is_send_sync() {
-    let data = ArrayVec::<[Vec<i32>; 5]>::new();
+    let data = ArrayVec::<Vec<i32>,  5>::new();
     &data as &dyn Send;
     &data as &dyn Sync;
 }
 
 #[test]
 fn test_compact_size() {
-    // Future rust will kill these drop flags!
-    // 4 elements size + 1 len + 1 enum tag + [1 drop flag]
-    type ByteArray = ArrayVec<[u8; 4]>;
+    // 4 bytes + padding + length
+    type ByteArray = ArrayVec<u8,  4>;
     println!("{}", mem::size_of::<ByteArray>());
-    assert!(mem::size_of::<ByteArray>() <= 8);
+    assert!(mem::size_of::<ByteArray>() <= 2 * mem::size_of::<u32>());
 
-    // 1 enum tag + 1 drop flag
-    type EmptyArray = ArrayVec<[u8; 0]>;
+    // just length
+    type EmptyArray = ArrayVec<u8,  0>;
     println!("{}", mem::size_of::<EmptyArray>());
-    assert!(mem::size_of::<EmptyArray>() <= 2);
+    assert!(mem::size_of::<EmptyArray>() <= mem::size_of::<u32>());
 
-    // 12 element size + 1 enum tag + 3 padding + 1 len + 1 drop flag + 2 padding
-    type QuadArray = ArrayVec<[u32; 3]>;
+    // 3 elements + padding + length
+    type QuadArray = ArrayVec<u32,  3>;
     println!("{}", mem::size_of::<QuadArray>());
-    assert!(mem::size_of::<QuadArray>() <= 24);
+    assert!(mem::size_of::<QuadArray>() <= 4 * 4 + mem::size_of::<u32>());
 }
 
 #[test]
 fn test_still_works_with_option_arrayvec() {
-    type RefArray = ArrayVec<[&'static i32; 2]>;
+    type RefArray = ArrayVec<&'static i32,  2>;
     let array = Some(RefArray::new());
     assert!(array.is_some());
     println!("{:?}", array);
@@ -305,10 +338,10 @@
     v.drain(0..7);
     assert_eq!(&v[..], &[]);
 
-    v.extend(0..);
+    v.extend(0..8);
     v.drain(1..4);
     assert_eq!(&v[..], &[0, 4, 5, 6, 7]);
-    let u: ArrayVec<[_; 3]> = v.drain(1..4).rev().collect();
+    let u: ArrayVec<_,  3> = v.drain(1..4).rev().collect();
     assert_eq!(&u[..], &[6, 5, 4]);
     assert_eq!(&v[..], &[0, 7]);
     v.drain(..);
@@ -321,10 +354,10 @@
     v.drain(0..=7);
     assert_eq!(&v[..], &[]);
 
-    v.extend(0..);
+    v.extend(0..8);
     v.drain(1..=4);
     assert_eq!(&v[..], &[0, 5, 6, 7]);
-    let u: ArrayVec<[_; 3]> = v.drain(1..=2).rev().collect();
+    let u: ArrayVec<_,  3> = v.drain(1..=2).rev().collect();
     assert_eq!(&u[..], &[6, 5]);
     assert_eq!(&v[..], &[0, 7]);
     v.drain(..);
@@ -374,7 +407,7 @@
         }
     }
 
-    let mut array = ArrayVec::<[DropPanic; 1]>::new();
+    let mut array = ArrayVec::<DropPanic,  1>::new();
     array.push(DropPanic);
 }
 
@@ -389,7 +422,7 @@
         }
     }
 
-    let mut array = ArrayVec::<[DropPanic; 1]>::new();
+    let mut array = ArrayVec::<DropPanic,  1>::new();
     array.push(DropPanic);
     array.into_iter();
 }
@@ -399,7 +432,7 @@
     let mut v = ArrayVec::from([]);
     assert_matches!(v.try_push(1), Err(_));
 
-    let mut v = ArrayVec::<[_; 3]>::new();
+    let mut v = ArrayVec::<_,  3>::new();
     v.insert(0, 0);
     v.insert(1, 1);
     //let ret1 = v.try_insert(3, 3);
@@ -428,7 +461,7 @@
 
 #[test]
 fn test_into_inner_2() {
-    let mut v = ArrayVec::<[String; 4]>::new();
+    let mut v = ArrayVec::<String,  4>::new();
     v.push("a".into());
     v.push("b".into());
     v.push("c".into());
@@ -437,17 +470,26 @@
 }
 
 #[test]
-fn test_into_inner_3_() {
-    let mut v = ArrayVec::<[i32; 4]>::new();
-    v.extend(1..);
+fn test_into_inner_3() {
+    let mut v = ArrayVec::<i32,  4>::new();
+    v.extend(1..=4);
     assert_eq!(v.into_inner().unwrap(), [1, 2, 3, 4]);
 }
 
+#[test]
+fn test_take() {
+    let mut v1 = ArrayVec::<i32,  4>::new();
+    v1.extend(1..=4);
+    let v2 = v1.take();
+    assert!(v1.into_inner().is_err());
+    assert_eq!(v2.into_inner().unwrap(), [1, 2, 3, 4]);
+}
+
 #[cfg(feature="std")]
 #[test]
 fn test_write() {
     use std::io::Write;
-    let mut v = ArrayVec::<[_; 8]>::new();
+    let mut v = ArrayVec::<_,  8>::new();
     write!(&mut v, "\x01\x02\x03").unwrap();
     assert_eq!(&v[..], &[1, 2, 3]);
     let r = v.write(&[9; 16]).unwrap();
@@ -457,16 +499,16 @@
 
 #[test]
 fn array_clone_from() {
-    let mut v = ArrayVec::<[_; 4]>::new();
+    let mut v = ArrayVec::<_,  4>::new();
     v.push(vec![1, 2]);
     v.push(vec![3, 4, 5]);
     v.push(vec![6]);
     let reference = v.to_vec();
-    let mut u = ArrayVec::<[_; 4]>::new();
+    let mut u = ArrayVec::<_,  4>::new();
     u.clone_from(&v);
     assert_eq!(&u, &reference[..]);
 
-    let mut t = ArrayVec::<[_; 4]>::new();
+    let mut t = ArrayVec::<_,  4>::new();
     t.push(vec![97]);
     t.push(vec![]);
     t.push(vec![5, 6, 2]);
@@ -484,7 +526,7 @@
     use std::error::Error;
 
     let text = "hello world";
-    let mut s = ArrayString::<[_; 16]>::new();
+    let mut s = ArrayString::<16>::new();
     s.try_push_str(text).unwrap();
     assert_eq!(&s, text);
     assert_eq!(text, &s);
@@ -494,7 +536,7 @@
     map.insert(s, 1);
     assert_eq!(map[text], 1);
 
-    let mut t = ArrayString::<[_; 2]>::new();
+    let mut t = ArrayString::<2>::new();
     assert!(t.try_push_str(text).is_err());
     assert_eq!(&t, "");
 
@@ -505,7 +547,7 @@
 
     // Test Error trait / try
     let t = || -> Result<(), Box<dyn Error>> {
-        let mut t = ArrayString::<[_; 2]>::new();
+        let mut t = ArrayString::<2>::new();
         t.try_push_str(text)?;
         Ok(())
     }();
@@ -516,7 +558,7 @@
 fn test_string_from() {
     let text = "hello world";
 	// Test `from` constructor
-    let u = ArrayString::<[_; 11]>::from(text).unwrap();
+    let u = ArrayString::<11>::from(text).unwrap();
     assert_eq!(&u, text);
     assert_eq!(u.len(), text.len());
 }
@@ -524,7 +566,7 @@
 #[test]
 fn test_string_parse_from_str() {
     let text = "hello world";
-    let u: ArrayString<[_; 11]> = text.parse().unwrap();
+    let u: ArrayString<11> = text.parse().unwrap();
     assert_eq!(&u, text);
     assert_eq!(u.len(), text.len());
 }
@@ -540,9 +582,9 @@
 #[test]
 fn test_string_clone() {
     let text = "hi";
-    let mut s = ArrayString::<[_; 4]>::new();
+    let mut s = ArrayString::<4>::new();
     s.push_str("abcd");
-    let t = ArrayString::<[_; 4]>::from(text).unwrap();
+    let t = ArrayString::<4>::from(text).unwrap();
     s.clone_from(&t);
     assert_eq!(&t, &s);
 }
@@ -550,7 +592,7 @@
 #[test]
 fn test_string_push() {
     let text = "abcαβγ";
-    let mut s = ArrayString::<[_; 8]>::new();
+    let mut s = ArrayString::<8>::new();
     for c in text.chars() {
         if let Err(_) = s.try_push(c) {
             break;
@@ -565,7 +607,7 @@
 
 #[test]
 fn test_insert_at_length() {
-    let mut v = ArrayVec::<[_; 8]>::new();
+    let mut v = ArrayVec::<_,  8>::new();
     let result1 = v.try_insert(0, "a");
     let result2 = v.try_insert(1, "b");
     assert!(result1.is_ok() && result2.is_ok());
@@ -575,7 +617,7 @@
 #[should_panic]
 #[test]
 fn test_insert_out_of_bounds() {
-    let mut v = ArrayVec::<[_; 8]>::new();
+    let mut v = ArrayVec::<_,  8>::new();
     let _ = v.try_insert(1, "test");
 }
 
@@ -608,7 +650,7 @@
     flag.set(0);
 
     {
-        let mut array = ArrayVec::<[_; 2]>::new();
+        let mut array = ArrayVec::<_,  2>::new();
         array.push(Bump(flag));
         array.insert(0, Bump(flag));
         assert_eq!(flag.get(), 0);
@@ -623,7 +665,7 @@
 
 #[test]
 fn test_pop_at() {
-    let mut v = ArrayVec::<[String; 4]>::new();
+    let mut v = ArrayVec::<String,  4>::new();
     let s = String::from;
     v.push(s("a"));
     v.push(s("b"));
@@ -646,9 +688,9 @@
 #[test]
 fn test_default() {
     use std::net;
-    let s: ArrayString<[u8; 4]> = Default::default();
+    let s: ArrayString<4> = Default::default();
     // Something without `Default` implementation.
-    let v: ArrayVec<[net::TcpStream; 4]> = Default::default();
+    let v: ArrayVec<net::TcpStream,  4> = Default::default();
     assert_eq!(s.len(), 0);
     assert_eq!(v.len(), 0);
 }
@@ -673,16 +715,74 @@
     #[derive(Copy, Clone, PartialEq, Debug)]
     struct Z; // Zero sized type
 
-    let mut array: ArrayVec<[_; 5]> = range.by_ref().map(|_| Z).collect();
+    let mut array: ArrayVec<_,  5> = range.by_ref().take(5).map(|_| Z).collect();
     assert_eq!(&array[..], &[Z; 5]);
     assert_eq!(range.next(), Some(5));
 
-    array.extend(range.by_ref().map(|_| Z));
+    array.extend(range.by_ref().take(0).map(|_| Z));
     assert_eq!(range.next(), Some(6));
 
-    let mut array: ArrayVec<[_; 10]> = (0..3).map(|_| Z).collect();
+    let mut array: ArrayVec<_,  10> = (0..3).map(|_| Z).collect();
     assert_eq!(&array[..], &[Z; 3]);
     array.extend((3..5).map(|_| Z));
     assert_eq!(&array[..], &[Z; 5]);
     assert_eq!(array.len(), 5);
 }
+
+#[test]
+fn test_try_from_argument() {
+    use core::convert::TryFrom;
+    let v = ArrayString::<16>::try_from(format_args!("Hello {}", 123)).unwrap();
+    assert_eq!(&v, "Hello 123");
+}
+
+#[test]
+fn allow_max_capacity_arrayvec_type() {
+    // this type is allowed to be used (but can't be constructed)
+    let _v: ArrayVec<(), {usize::MAX}>;
+}
+
+#[should_panic(expected="largest supported capacity")]
+#[test]
+fn deny_max_capacity_arrayvec_value() {
+    if mem::size_of::<usize>() <= mem::size_of::<u32>() {
+        panic!("This test does not work on this platform. 'largest supported capacity'");
+    }
+    // this type is allowed to be used (but can't be constructed)
+    let _v: ArrayVec<(), {usize::MAX}> = ArrayVec::new();
+}
+
+#[should_panic(expected="index out of bounds")]
+#[test]
+fn deny_max_capacity_arrayvec_value_const() {
+    if mem::size_of::<usize>() <= mem::size_of::<u32>() {
+        panic!("This test does not work on this platform. 'index out of bounds'");
+    }
+    // this type is allowed to be used (but can't be constructed)
+    let _v: ArrayVec<(), {usize::MAX}> = ArrayVec::new_const();
+}
+
+#[test]
+fn test_arrayvec_const_constructible() {
+    const OF_U8: ArrayVec<Vec<u8>, 10> = ArrayVec::new_const();
+
+    let mut var = OF_U8;
+    assert!(var.is_empty());
+    assert_eq!(var, ArrayVec::new());
+    var.push(vec![3, 5, 8]);
+    assert_eq!(var[..], [vec![3, 5, 8]]);
+}
+
+
+#[test]
+fn test_arraystring_const_constructible() {
+    const AS: ArrayString<10> = ArrayString::new_const();
+
+    let mut var = AS;
+    assert!(var.is_empty());
+    assert_eq!(var, ArrayString::new());
+    var.push_str("hello");
+    assert_eq!(var, *"hello");
+}
+
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/benches/arraystring.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/benches/arraystring.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/benches/arraystring.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/benches/arraystring.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,90 @@
+
+extern crate arrayvec;
+#[macro_use] extern crate bencher;
+
+use arrayvec::ArrayString;
+
+use bencher::Bencher;
+
+fn try_push_c(b: &mut Bencher) {
+    let mut v = ArrayString::<[u8; 512]>::new();
+    b.iter(|| {
+        v.clear();
+        while v.try_push('c').is_ok() {
+        }
+        v.len()
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+fn try_push_alpha(b: &mut Bencher) {
+    let mut v = ArrayString::<[u8; 512]>::new();
+    b.iter(|| {
+        v.clear();
+        while v.try_push('α').is_ok() {
+        }
+        v.len()
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+// Yes, pushing a string char-by-char is slow. Use .push_str.
+fn try_push_string(b: &mut Bencher) {
+    let mut v = ArrayString::<[u8; 512]>::new();
+    let input = "abcαβγ“�";
+    b.iter(|| {
+        v.clear();
+        for ch in input.chars().cycle() {
+            if !v.try_push(ch).is_ok() {
+                break;
+            }
+        }
+        v.len()
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+fn push_c(b: &mut Bencher) {
+    let mut v = ArrayString::<[u8; 512]>::new();
+    b.iter(|| {
+        v.clear();
+        while !v.is_full() {
+            v.push('c');
+        }
+        v.len()
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+fn push_alpha(b: &mut Bencher) {
+    let mut v = ArrayString::<[u8; 512]>::new();
+    b.iter(|| {
+        v.clear();
+        while !v.is_full() {
+            v.push('α');
+        }
+        v.len()
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+fn push_string(b: &mut Bencher) {
+    let mut v = ArrayString::<[u8; 512]>::new();
+    let input = "abcαβγ“�";
+    b.iter(|| {
+        v.clear();
+        for ch in input.chars().cycle() {
+            if !v.is_full() {
+                v.push(ch);
+            } else {
+                break;
+            }
+        }
+        v.len()
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+benchmark_group!(benches, try_push_c, try_push_alpha, try_push_string, push_c,
+                 push_alpha, push_string);
+benchmark_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/benches/extend.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/benches/extend.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/benches/extend.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/benches/extend.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,78 @@
+
+extern crate arrayvec;
+#[macro_use] extern crate bencher;
+
+use std::io::Write;
+
+use arrayvec::ArrayVec;
+
+use bencher::Bencher;
+use bencher::black_box;
+
+fn extend_with_constant(b: &mut Bencher) {
+    let mut v = ArrayVec::<[u8; 512]>::new();
+    let cap = v.capacity();
+    b.iter(|| {
+        v.clear();
+        let constant = black_box(1);
+        v.extend((0..cap).map(move |_| constant));
+        v[511]
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+fn extend_with_range(b: &mut Bencher) {
+    let mut v = ArrayVec::<[u8; 512]>::new();
+    let cap = v.capacity();
+    b.iter(|| {
+        v.clear();
+        let range = 0..cap;
+        v.extend(range.map(|x| black_box(x as _)));
+        v[511]
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+fn extend_with_slice(b: &mut Bencher) {
+    let mut v = ArrayVec::<[u8; 512]>::new();
+    let data = [1; 512];
+    b.iter(|| {
+        v.clear();
+        let iter = data.iter().map(|&x| x);
+        v.extend(iter);
+        v[511]
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+fn extend_with_write(b: &mut Bencher) {
+    let mut v = ArrayVec::<[u8; 512]>::new();
+    let data = [1; 512];
+    b.iter(|| {
+        v.clear();
+        v.write(&data[..]).ok();
+        v[511]
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+fn extend_from_slice(b: &mut Bencher) {
+    let mut v = ArrayVec::<[u8; 512]>::new();
+    let data = [1; 512];
+    b.iter(|| {
+        v.clear();
+        v.try_extend_from_slice(&data).ok();
+        v[511]
+    });
+    b.bytes = v.capacity() as u64;
+}
+
+benchmark_group!(benches,
+                 extend_with_constant,
+                 extend_with_range,
+                 extend_with_slice,
+                 extend_with_write,
+                 extend_from_slice
+);
+
+benchmark_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"c9e49774ee89a3b7b533362d82060a14f2777ccefbe03b956f6f08057b6c3600","Cargo.toml":"c736151a4747b2c041404d730e17dec631393c5feea287edc8a3e482f83a8927","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0245ee104228a100ce5fceecf43e25faae450494d9173f43fd94c27d69fdac13","README.md":"f42eb73acbc7729825a836a532d1c8c6b71e006e0d87e549ea7a483da7472425","benches/arraystring.rs":"f12b890977117ebde4ca42bcd6b91f2a6a087f2b235aaca6d15e30d125ae9f67","benches/extend.rs":"c3d69cc488ec5341b019cfed545ebbfea252f98718037b413f6a349da9489d1b","ci/miri.sh":"59172afe080a3431f4e7dbd66d2040afa27ab9c0359532bd68f8f423261738de","custom.css":"e6f2cd299392337b4e2959c52f422e5b7be11920ea98d10db44d10ddef5ed47c","src/array.rs":"5fa75554ebdf595c918fe923a84678989fc420d800310ee19a21597f7d683b66","src/array_string.rs":"48c175371aed3372158a9331e939cffc2a11a09120253fa9d0521e5cbca7cfca","src/char.rs":"3fe9e9cc68fc7cedb238d53924b552b876a60c4fea85935d2f5d1ca0d41ffa3e","src/errors.rs":"ca44c0987f59ae57623088d80013e75129101caea93c278c8ebb0df898bc6b1b","src/lib.rs":"08270486d9e9d34e02e0edf227baf5e87b36d38d264da209d3b7f8962dce1b54","src/maybe_uninit.rs":"c81cf16f976bfaf7c1fe371aa2fba84872874fb0e43c96f63bef01cceb5e1d64","tests/serde.rs":"18c165cf6024f04a25b19aa139657d7c59f72d1541c9b24b44f9eaea01f507db","tests/tests.rs":"b9a3db8a0b957695d9ecc539a7ea2ded1eea3c6f76de8b5624c2b4eae95f1fdd"},"package":"23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,63 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "arrayvec"
+version = "0.5.2"
+authors = ["bluss"]
+description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."
+documentation = "https://docs.rs/arrayvec/"
+keywords = ["stack", "vector", "array", "data-structure", "no_std"]
+categories = ["data-structures", "no-std"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/bluss/arrayvec"
+[package.metadata.docs.rs]
+features = ["serde"]
+
+[package.metadata.release]
+no-dev-version = true
+tag-name = "{{version}}"
+[profile.bench]
+debug = true
+
+[profile.release]
+debug = true
+
+[[bench]]
+name = "extend"
+harness = false
+
+[[bench]]
+name = "arraystring"
+harness = false
+[dependencies.serde]
+version = "1.0"
+optional = true
+default-features = false
+[dev-dependencies.bencher]
+version = "0.1.4"
+
+[dev-dependencies.matches]
+version = "0.1"
+
+[dev-dependencies.serde_test]
+version = "1.0"
+
+[build-dependencies]
+
+[features]
+array-sizes-129-255 = []
+array-sizes-33-128 = []
+default = ["std"]
+std = []
+unstable-const-fn = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,234 @@
+Recent Changes (arrayvec)
+-------------------------
+
+- 0.5.2
+
+  - Add `is_empty` methods for ArrayVec and ArrayString by @nicbn
+  - Implement `TryFrom<Slice>` for ArrayVec by @paulkernfeld
+  - Add `unstable-const-fn` to make `new` methods const by @m-ou-se
+  - Run miri in CI and a few related fixes by @RalfJung
+  - Fix outdated comment by @Phlosioneer
+  - Move changelog to a separate file by @Luro02
+  - Remove deprecated `Error::description` by @AnderEnder
+  - Use pointer method `add` by @hbina
+
+- 0.5.1
+
+  - Add `as_ptr`, `as_mut_ptr` accessors directly on the `ArrayVec` by @tbu-
+    (matches the same addition to `Vec` which happened in Rust 1.37).
+  - Add method `ArrayString::len` (now available directly, not just through deref to str).
+  - Use raw pointers instead of `&mut [u8]` for encoding chars into `ArrayString`
+    (uninit best practice fix).
+  - Use raw pointers instead of `get_unchecked_mut` where the target may be
+    uninitialized everywhere relevant in the ArrayVec implementation
+    (uninit best practice fix).
+  - Changed inline hints on many methods, mainly removing inline hints
+  - `ArrayVec::dispose` is now deprecated (it has no purpose anymore)
+
+- 0.4.12
+
+  - Use raw pointers instead of `get_unchecked_mut` where the target may be
+    uninitialized everywhere relevant in the ArrayVec implementation.
+
+- 0.5.0
+
+  - Use `MaybeUninit` (now unconditionally) in the implementation of
+    `ArrayVec`
+  - Use `MaybeUninit` (now unconditionally) in the implementation of
+    `ArrayString`
+  - The crate feature for serde serialization is now named `serde`.
+  - Updated the `Array` trait interface, and it is now easier to use for
+    users outside the crate.
+  - Add `FromStr` impl for `ArrayString` by @despawnerer
+  - Add method `try_extend_from_slice` to `ArrayVec`, which is always
+    effecient by @Thomasdezeeuw.
+  - Add method `remaining_capacity` by @Thomasdezeeuw
+  - Improve performance of the `extend` method.
+  - The index type of zero capacity vectors is now itself zero size, by
+    @clarfon
+  - Use `drop_in_place` for truncate and clear methods. This affects drop order
+    and resume from panic during drop.
+  - Use Rust 2018 edition for the implementation
+  - Require Rust 1.36 or later, for the unconditional `MaybeUninit`
+    improvements.
+
+- 0.4.11
+
+  - In Rust 1.36 or later, use newly stable `MaybeUninit`. This extends the
+    soundness work introduced in 0.4.9, we are finally able to use this in
+    stable. We use feature detection (build script) to enable this at build
+    time.
+
+- 0.4.10
+
+  - Use `repr(C)` in the `union` version that was introduced in 0.4.9, to
+    allay some soundness concerns.
+
+- 0.4.9
+
+  - Use `union` in the implementation on when this is detected to be supported
+    (nightly only for now). This is a better solution for treating uninitialized
+    regions correctly, and we'll use it in stable Rust as soon as we are able.
+    When this is enabled, the `ArrayVec` has no space overhead in its memory
+    layout, although the size of the vec should not be relied upon. (See [#114](https://github.com/bluss/arrayvec/pull/114))
+  - `ArrayString` updated to not use uninitialized memory, it instead zeros its
+    backing array. This will be refined in the next version, since we
+    need to make changes to the user visible API.
+  - The `use_union` feature now does nothing (like its documentation foretold).
+
+
+- 0.4.8
+
+  - Implement Clone and Debug for `IntoIter` by @clarcharr
+  - Add more array sizes under crate features. These cover all in the range
+    up to 128 and 129 to 255 respectively (we have a few of those by default):
+
+    - `array-size-33-128`
+    - `array-size-129-255`
+
+- 0.4.7
+
+  - Fix future compat warning about raw pointer casts
+  - Use `drop_in_place` when dropping the arrayvec by-value iterator
+  - Decrease mininum Rust version (see docs) by @jeehoonkang
+
+- 0.3.25
+
+  - Fix future compat warning about raw pointer casts
+
+- 0.4.6
+
+  - Fix compilation on 16-bit targets. This means, the 65536 array size is not
+    included on these targets.
+
+- 0.3.24
+
+  - Fix compilation on 16-bit targets. This means, the 65536 array size is not
+    included on these targets.
+  - Fix license files so that they are both included (was fixed in 0.4 before)
+
+- 0.4.5
+
+  - Add methods to `ArrayString` by @DenialAdams:
+
+    - `.pop() -> Option<char>`
+    - `.truncate(new_len)`
+    - `.remove(index) -> char`
+
+  - Remove dependency on crate odds
+  - Document debug assertions in unsafe methods better
+
+- 0.4.4
+
+  - Add method `ArrayVec::truncate()` by @niklasf
+
+- 0.4.3
+
+  - Improve performance for `ArrayVec::extend` with a lower level
+    implementation (#74)
+  - Small cleanup in dependencies (use no std for crates where we don't need more)
+
+- 0.4.2
+
+  - Add constructor method `new` to `CapacityError`.
+
+- 0.4.1
+
+  - Add `Default` impl to `ArrayString` by @tbu-
+
+- 0.4.0
+
+  - Reformed signatures and error handling by @bluss and @tbu-:
+
+    - `ArrayVec`'s `push, insert, remove, swap_remove` now match `Vec`'s
+      corresponding signature and panic on capacity errors where applicable.
+    - Add fallible methods `try_push, insert` and checked methods
+      `pop_at, swap_pop`.
+    - Similar changes to `ArrayString`'s push methods.
+
+  - Use a local version of the `RangeArgument` trait
+  - Add array sizes 50, 150, 200 by @daboross
+  - Support serde 1.0 by @daboross
+  - New method `.push_unchecked()` by @niklasf
+  - `ArrayString` implements `PartialOrd, Ord` by @tbu-
+  - Require Rust 1.14
+  - crate feature `use_generic_array` was dropped.
+
+- 0.3.23
+
+  - Implement `PartialOrd, Ord` as well as `PartialOrd<str>` for
+    `ArrayString`.
+
+- 0.3.22
+
+  - Implement `Array` for the 65536 size
+
+- 0.3.21
+
+  - Use `encode_utf8` from crate odds
+  - Add constructor `ArrayString::from_byte_string`
+
+- 0.3.20
+
+  - Simplify and speed up `ArrayString`’s `.push(char)`-
+
+- 0.3.19
+
+  - Add new crate feature `use_generic_array` which allows using their
+    `GenericArray` just like a regular fixed size array for the storage
+    of an `ArrayVec`.
+
+- 0.3.18
+
+  - Fix bounds check in `ArrayVec::insert`!
+    It would be buggy if `self.len() < index < self.capacity()`. Take note of
+    the push out behavior specified in the docs.
+
+- 0.3.17
+
+  - Added crate feature `use_union` which forwards to the nodrop crate feature
+  - Added methods `.is_full()` to `ArrayVec` and `ArrayString`.
+
+- 0.3.16
+
+  - Added method `.retain()` to `ArrayVec`.
+  - Added methods `.as_slice(), .as_mut_slice()` to `ArrayVec` and `.as_str()`
+    to `ArrayString`.
+
+- 0.3.15
+
+  - Add feature std, which you can opt out of to use `no_std` (requires Rust 1.6
+    to opt out).
+  - Implement `Clone::clone_from` for ArrayVec and ArrayString
+
+- 0.3.14
+
+  - Add `ArrayString::from(&str)`
+
+- 0.3.13
+
+  - Added `DerefMut` impl for `ArrayString`.
+  - Added method `.simplify()` to drop the element for `CapacityError`.
+  - Added method `.dispose()` to `ArrayVec`
+
+- 0.3.12
+
+  - Added ArrayString, a fixed capacity analogy of String
+
+- 0.3.11
+
+  - Added trait impls Default, PartialOrd, Ord, Write for ArrayVec
+
+- 0.3.10
+
+  - Go back to using external NoDrop, fixing a panic safety bug (issue #3)
+
+- 0.3.8
+
+  - Inline the non-dropping logic to remove one drop flag in the
+    ArrayVec representation.
+
+- 0.3.7
+
+  - Added method .into_inner()
+  - Added unsafe method .set_len()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/ci/miri.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/ci/miri.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/ci/miri.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/ci/miri.sh	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+set -ex
+
+export CARGO_NET_RETRY=5
+export CARGO_NET_TIMEOUT=10
+
+MIRI_NIGHTLY=nightly-$(curl -s https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/miri)
+echo "Installing latest nightly with Miri: $MIRI_NIGHTLY"
+rustup default "$MIRI_NIGHTLY"
+
+rustup component add miri
+cargo miri setup
+
+cargo miri test
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/custom.css thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/custom.css
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/custom.css	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/custom.css	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+
+.docblock pre.rust { background: #eeeeff; }
+pre.trait, pre.fn, pre.struct, pre.enum, pre.typedef { background: #fcfefc; }
+
+/* Small “example� label for doc examples */
+.docblock pre.rust::before {
+    content: "example";
+    float: right;
+    font-style: italic;
+    font-size: 0.8em;
+    margin-top: -10px;
+    margin-right: -5px;
+}
+
+
+/* Fixup where display in trait listing */
+pre.trait .where::before {
+content: '\a         ';
+}
+
+.docblock code {
+    background-color: inherit;
+    font-weight: bold;
+    padding: 0 0.1em;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) Ulrik Sverdrup "bluss" 2015-2017
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+
+arrayvec
+========
+[![Crates.io: arrayvec](https://img.shields.io/crates/v/arrayvec.svg)](https://crates.io/crates/arrayvec)
+[![Crates.io: nodrop](https://img.shields.io/crates/v/nodrop.svg)](https://crates.io/crates/nodrop)
+[![Documentation](https://docs.rs/arrayvec/badge.svg)](https://docs.rs/arrayvec)
+[![Build Status](https://travis-ci.org/bluss/arrayvec.svg?branch=master)](https://travis-ci.org/bluss/arrayvec)
+[![License: Apache](https://img.shields.io/badge/License-Apache%202.0-red.svg)](LICENSE-APACHE)
+OR
+[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+
+A vector with fixed capacity.
+
+Please read the [`API documentation here`](https://docs.rs/arrayvec)
+
+# License
+
+Dual-licensed to be compatible with the Rust project.
+
+Licensed under the Apache License, Version 2.0
+http://www.apache.org/licenses/LICENSE-2.0 or the MIT license
+http://opensource.org/licenses/MIT, at your
+option. This file may not be copied, modified, or distributed
+except according to those terms.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/array.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/array.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/array.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/array.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,151 @@
+
+/// Trait for fixed size arrays.
+///
+/// This trait is implemented for some specific array sizes, see
+/// the implementor list below. At the current state of Rust we can't
+/// make this fully general for every array size.
+///
+/// The following crate features add more array sizes (and they are not
+/// enabled by default due to their impact on compliation speed).
+///
+/// - `array-sizes-33-128`: All sizes 33 to 128 are implemented
+///   (a few in this range are included by default).
+/// - `array-sizes-129-255`: All sizes 129 to 255 are implemented
+///   (a few in this range are included by default).
+///
+/// ## Safety
+///
+/// This trait can *only* be implemented by fixed-size arrays or types with
+/// *exactly* the representation of a fixed size array (of the right element
+/// type and capacity).
+///
+/// Normally this trait is an implementation detail of arrayvec and doesn’t
+/// need implementing.
+pub unsafe trait Array {
+    /// The array’s element type
+    type Item;
+    /// The smallest type that can index and tell the length of the array.
+    #[doc(hidden)]
+    type Index: Index;
+    /// The array's element capacity
+    const CAPACITY: usize;
+    fn as_slice(&self) -> &[Self::Item];
+    fn as_mut_slice(&mut self) -> &mut [Self::Item];
+}
+
+pub trait Index : PartialEq + Copy {
+    const ZERO: Self;
+    fn to_usize(self) -> usize;
+    fn from(_: usize) -> Self;
+}
+
+impl Index for () {
+    const ZERO: Self = ();
+    #[inline(always)]
+    fn to_usize(self) -> usize { 0 }
+    #[inline(always)]
+    fn from(_ix: usize) ->  Self { () }
+}
+
+impl Index for bool {
+    const ZERO: Self = false;
+    #[inline(always)]
+    fn to_usize(self) -> usize { self as usize }
+    #[inline(always)]
+    fn from(ix: usize) ->  Self { ix != 0 }
+}
+
+impl Index for u8 {
+    const ZERO: Self = 0;
+    #[inline(always)]
+    fn to_usize(self) -> usize { self as usize }
+    #[inline(always)]
+    fn from(ix: usize) ->  Self { ix as u8 }
+}
+
+impl Index for u16 {
+    const ZERO: Self = 0;
+    #[inline(always)]
+    fn to_usize(self) -> usize { self as usize }
+    #[inline(always)]
+    fn from(ix: usize) ->  Self { ix as u16 }
+}
+
+impl Index for u32 {
+    const ZERO: Self = 0;
+    #[inline(always)]
+    fn to_usize(self) -> usize { self as usize }
+    #[inline(always)]
+    fn from(ix: usize) ->  Self { ix as u32 }
+}
+
+impl Index for usize {
+    const ZERO: Self = 0;
+    #[inline(always)]
+    fn to_usize(self) -> usize { self }
+    #[inline(always)]
+    fn from(ix: usize) ->  Self { ix }
+}
+
+macro_rules! fix_array_impl {
+    ($index_type:ty, $len:expr ) => (
+        unsafe impl<T> Array for [T; $len] {
+            type Item = T;
+            type Index = $index_type;
+            const CAPACITY: usize = $len;
+            #[doc(hidden)]
+            fn as_slice(&self) -> &[Self::Item] { self }
+            #[doc(hidden)]
+            fn as_mut_slice(&mut self) -> &mut [Self::Item] { self }
+        }
+    )
+}
+
+macro_rules! fix_array_impl_recursive {
+    ($index_type:ty, ) => ();
+    ($index_type:ty, $($len:expr,)*) => (
+        $(fix_array_impl!($index_type, $len);)*
+    );
+}
+
+
+fix_array_impl_recursive!((), 0,);
+fix_array_impl_recursive!(bool, 1,);
+fix_array_impl_recursive!(u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+                          15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+                          28, 29, 30, 31, );
+
+#[cfg(not(feature="array-sizes-33-128"))]
+fix_array_impl_recursive!(u8, 32, 40, 48, 50, 56, 64, 72, 96, 100, 128, );
+
+#[cfg(feature="array-sizes-33-128")]
+fix_array_impl_recursive!(u8, 
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+125, 126, 127, 128,
+);
+
+#[cfg(not(feature="array-sizes-129-255"))]
+fix_array_impl_recursive!(u8, 160, 192, 200, 224,);
+
+#[cfg(feature="array-sizes-129-255")]
+fix_array_impl_recursive!(u8,
+129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
+237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
+253, 254, 255,
+);
+
+fix_array_impl_recursive!(u16, 256, 384, 512, 768, 1024, 2048, 4096, 8192, 16384, 32768,);
+// This array size doesn't exist on 16-bit
+#[cfg(any(target_pointer_width="32", target_pointer_width="64"))]
+fix_array_impl_recursive!(u32, 1 << 16,);
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/array_string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/array_string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/array_string.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/array_string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,582 @@
+use std::borrow::Borrow;
+use std::cmp;
+use std::fmt;
+use std::hash::{Hash, Hasher};
+use std::ptr;
+use std::ops::{Deref, DerefMut};
+use std::str;
+use std::str::FromStr;
+use std::str::Utf8Error;
+use std::slice;
+
+use crate::array::Array;
+use crate::array::Index;
+use crate::CapacityError;
+use crate::char::encode_utf8;
+
+#[cfg(feature="serde")]
+use serde::{Serialize, Deserialize, Serializer, Deserializer};
+
+use super::MaybeUninit as MaybeUninitCopy;
+
+/// A string with a fixed capacity.
+///
+/// The `ArrayString` is a string backed by a fixed size array. It keeps track
+/// of its length.
+///
+/// The string is a contiguous value that you can store directly on the stack
+/// if needed.
+#[derive(Copy)]
+pub struct ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    xs: MaybeUninitCopy<A>,
+    len: A::Index,
+}
+
+impl<A> Default for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    /// Return an empty `ArrayString`
+    fn default() -> ArrayString<A> {
+        ArrayString::new()
+    }
+}
+
+impl<A> ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    /// Create a new empty `ArrayString`.
+    ///
+    /// Capacity is inferred from the type parameter.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let mut string = ArrayString::<[_; 16]>::new();
+    /// string.push_str("foo");
+    /// assert_eq!(&string[..], "foo");
+    /// assert_eq!(string.capacity(), 16);
+    /// ```
+    #[cfg(not(feature="unstable-const-fn"))]
+    pub fn new() -> ArrayString<A> {
+        unsafe {
+            ArrayString {
+                xs: MaybeUninitCopy::uninitialized(),
+                len: Index::ZERO,
+            }
+        }
+    }
+
+    #[cfg(feature="unstable-const-fn")]
+    pub const fn new() -> ArrayString<A> {
+        unsafe {
+            ArrayString {
+                xs: MaybeUninitCopy::uninitialized(),
+                len: Index::ZERO,
+            }
+        }
+    }
+
+    /// Return the length of the string.
+    #[inline]
+    pub fn len(&self) -> usize { self.len.to_usize() }
+
+    /// Returns whether the string is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool { self.len() == 0 }
+
+    /// Create a new `ArrayString` from a `str`.
+    ///
+    /// Capacity is inferred from the type parameter.
+    ///
+    /// **Errors** if the backing array is not large enough to fit the string.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let mut string = ArrayString::<[_; 3]>::from("foo").unwrap();
+    /// assert_eq!(&string[..], "foo");
+    /// assert_eq!(string.len(), 3);
+    /// assert_eq!(string.capacity(), 3);
+    /// ```
+    pub fn from(s: &str) -> Result<Self, CapacityError<&str>> {
+        let mut arraystr = Self::new();
+        arraystr.try_push_str(s)?;
+        Ok(arraystr)
+    }
+
+    /// Create a new `ArrayString` from a byte string literal.
+    ///
+    /// **Errors** if the byte string literal is not valid UTF-8.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let string = ArrayString::from_byte_string(b"hello world").unwrap();
+    /// ```
+    pub fn from_byte_string(b: &A) -> Result<Self, Utf8Error> {
+        let len = str::from_utf8(b.as_slice())?.len();
+        debug_assert_eq!(len, A::CAPACITY);
+        Ok(ArrayString {
+            xs: MaybeUninitCopy::from(*b),
+            len: Index::from(A::CAPACITY),
+        })
+    }
+
+    /// Return the capacity of the `ArrayString`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let string = ArrayString::<[_; 3]>::new();
+    /// assert_eq!(string.capacity(), 3);
+    /// ```
+    #[inline(always)]
+    pub fn capacity(&self) -> usize { A::CAPACITY }
+
+    /// Return if the `ArrayString` is completely filled.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let mut string = ArrayString::<[_; 1]>::new();
+    /// assert!(!string.is_full());
+    /// string.push_str("A");
+    /// assert!(string.is_full());
+    /// ```
+    pub fn is_full(&self) -> bool { self.len() == self.capacity() }
+
+    /// Adds the given char to the end of the string.
+    ///
+    /// ***Panics*** if the backing array is not large enough to fit the additional char.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let mut string = ArrayString::<[_; 2]>::new();
+    ///
+    /// string.push('a');
+    /// string.push('b');
+    ///
+    /// assert_eq!(&string[..], "ab");
+    /// ```
+    pub fn push(&mut self, c: char) {
+        self.try_push(c).unwrap();
+    }
+
+    /// Adds the given char to the end of the string.
+    ///
+    /// Returns `Ok` if the push succeeds.
+    ///
+    /// **Errors** if the backing array is not large enough to fit the additional char.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let mut string = ArrayString::<[_; 2]>::new();
+    ///
+    /// string.try_push('a').unwrap();
+    /// string.try_push('b').unwrap();
+    /// let overflow = string.try_push('c');
+    ///
+    /// assert_eq!(&string[..], "ab");
+    /// assert_eq!(overflow.unwrap_err().element(), 'c');
+    /// ```
+    pub fn try_push(&mut self, c: char) -> Result<(), CapacityError<char>> {
+        let len = self.len();
+        unsafe {
+            let ptr = self.xs.ptr_mut().add(len);
+            let remaining_cap = self.capacity() - len;
+            match encode_utf8(c, ptr, remaining_cap) {
+                Ok(n) => {
+                    self.set_len(len + n);
+                    Ok(())
+                }
+                Err(_) => Err(CapacityError::new(c)),
+            }
+        }
+    }
+
+    /// Adds the given string slice to the end of the string.
+    ///
+    /// ***Panics*** if the backing array is not large enough to fit the string.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let mut string = ArrayString::<[_; 2]>::new();
+    ///
+    /// string.push_str("a");
+    /// string.push_str("d");
+    ///
+    /// assert_eq!(&string[..], "ad");
+    /// ```
+    pub fn push_str(&mut self, s: &str) {
+        self.try_push_str(s).unwrap()
+    }
+
+    /// Adds the given string slice to the end of the string.
+    ///
+    /// Returns `Ok` if the push succeeds.
+    ///
+    /// **Errors** if the backing array is not large enough to fit the string.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let mut string = ArrayString::<[_; 2]>::new();
+    ///
+    /// string.try_push_str("a").unwrap();
+    /// let overflow1 = string.try_push_str("bc");
+    /// string.try_push_str("d").unwrap();
+    /// let overflow2 = string.try_push_str("ef");
+    ///
+    /// assert_eq!(&string[..], "ad");
+    /// assert_eq!(overflow1.unwrap_err().element(), "bc");
+    /// assert_eq!(overflow2.unwrap_err().element(), "ef");
+    /// ```
+    pub fn try_push_str<'a>(&mut self, s: &'a str) -> Result<(), CapacityError<&'a str>> {
+        if s.len() > self.capacity() - self.len() {
+            return Err(CapacityError::new(s));
+        }
+        unsafe {
+            let dst = self.xs.ptr_mut().add(self.len());
+            let src = s.as_ptr();
+            ptr::copy_nonoverlapping(src, dst, s.len());
+            let newl = self.len() + s.len();
+            self.set_len(newl);
+        }
+        Ok(())
+    }
+
+    /// Removes the last character from the string and returns it.
+    ///
+    /// Returns `None` if this `ArrayString` is empty.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    /// 
+    /// let mut s = ArrayString::<[_; 3]>::from("foo").unwrap();
+    ///
+    /// assert_eq!(s.pop(), Some('o'));
+    /// assert_eq!(s.pop(), Some('o'));
+    /// assert_eq!(s.pop(), Some('f'));
+    ///
+    /// assert_eq!(s.pop(), None);
+    /// ```
+    pub fn pop(&mut self) -> Option<char> {
+        let ch = match self.chars().rev().next() {
+            Some(ch) => ch,
+            None => return None,
+        };
+        let new_len = self.len() - ch.len_utf8();
+        unsafe {
+            self.set_len(new_len);
+        }
+        Some(ch)
+    }
+
+    /// Shortens this `ArrayString` to the specified length.
+    ///
+    /// If `new_len` is greater than the string’s current length, this has no
+    /// effect.
+    ///
+    /// ***Panics*** if `new_len` does not lie on a `char` boundary.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    ///
+    /// let mut string = ArrayString::<[_; 6]>::from("foobar").unwrap();
+    /// string.truncate(3);
+    /// assert_eq!(&string[..], "foo");
+    /// string.truncate(4);
+    /// assert_eq!(&string[..], "foo");
+    /// ```
+    pub fn truncate(&mut self, new_len: usize) {
+        if new_len <= self.len() {
+            assert!(self.is_char_boundary(new_len));
+            unsafe { 
+                // In libstd truncate is called on the underlying vector,
+                // which in turns drops each element.
+                // As we know we don't have to worry about Drop,
+                // we can just set the length (a la clear.)
+                self.set_len(new_len);
+            }
+        }
+    }
+
+    /// Removes a `char` from this `ArrayString` at a byte position and returns it.
+    ///
+    /// This is an `O(n)` operation, as it requires copying every element in the
+    /// array.
+    ///
+    /// ***Panics*** if `idx` is larger than or equal to the `ArrayString`’s length,
+    /// or if it does not lie on a `char` boundary.
+    ///
+    /// ```
+    /// use arrayvec::ArrayString;
+    /// 
+    /// let mut s = ArrayString::<[_; 3]>::from("foo").unwrap();
+    ///
+    /// assert_eq!(s.remove(0), 'f');
+    /// assert_eq!(s.remove(1), 'o');
+    /// assert_eq!(s.remove(0), 'o');
+    /// ```
+    pub fn remove(&mut self, idx: usize) -> char {
+        let ch = match self[idx..].chars().next() {
+            Some(ch) => ch,
+            None => panic!("cannot remove a char from the end of a string"),
+        };
+
+        let next = idx + ch.len_utf8();
+        let len = self.len();
+        unsafe {
+            ptr::copy(self.xs.ptr().add(next),
+                      self.xs.ptr_mut().add(idx),
+                      len - next);
+            self.set_len(len - (next - idx));
+        }
+        ch
+    }
+
+    /// Make the string empty.
+    pub fn clear(&mut self) {
+        unsafe {
+            self.set_len(0);
+        }
+    }
+
+    /// Set the strings’s length.
+    ///
+    /// This function is `unsafe` because it changes the notion of the
+    /// number of “valid� bytes in the string. Use with care.
+    ///
+    /// This method uses *debug assertions* to check the validity of `length`
+    /// and may use other debug assertions.
+    pub unsafe fn set_len(&mut self, length: usize) {
+        debug_assert!(length <= self.capacity());
+        self.len = Index::from(length);
+    }
+
+    /// Return a string slice of the whole `ArrayString`.
+    pub fn as_str(&self) -> &str {
+        self
+    }
+}
+
+impl<A> Deref for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    type Target = str;
+    #[inline]
+    fn deref(&self) -> &str {
+        unsafe {
+            let sl = slice::from_raw_parts(self.xs.ptr(), self.len.to_usize());
+            str::from_utf8_unchecked(sl)
+        }
+    }
+}
+
+impl<A> DerefMut for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    #[inline]
+    fn deref_mut(&mut self) -> &mut str {
+        unsafe {
+            let sl = slice::from_raw_parts_mut(self.xs.ptr_mut(), self.len.to_usize());
+            str::from_utf8_unchecked_mut(sl)
+        }
+    }
+}
+
+impl<A> PartialEq for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn eq(&self, rhs: &Self) -> bool {
+        **self == **rhs
+    }
+}
+
+impl<A> PartialEq<str> for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn eq(&self, rhs: &str) -> bool {
+        &**self == rhs
+    }
+}
+
+impl<A> PartialEq<ArrayString<A>> for str
+    where A: Array<Item=u8> + Copy
+{
+    fn eq(&self, rhs: &ArrayString<A>) -> bool {
+        self == &**rhs
+    }
+}
+
+impl<A> Eq for ArrayString<A> 
+    where A: Array<Item=u8> + Copy
+{ }
+
+impl<A> Hash for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn hash<H: Hasher>(&self, h: &mut H) {
+        (**self).hash(h)
+    }
+}
+
+impl<A> Borrow<str> for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn borrow(&self) -> &str { self }
+}
+
+impl<A> AsRef<str> for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn as_ref(&self) -> &str { self }
+}
+
+impl<A> fmt::Debug for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
+}
+
+impl<A> fmt::Display for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
+}
+
+/// `Write` appends written data to the end of the string.
+impl<A> fmt::Write for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn write_char(&mut self, c: char) -> fmt::Result {
+        self.try_push(c).map_err(|_| fmt::Error)
+    }
+
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        self.try_push_str(s).map_err(|_| fmt::Error)
+    }
+}
+
+impl<A> Clone for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn clone(&self) -> ArrayString<A> {
+        *self
+    }
+    fn clone_from(&mut self, rhs: &Self) {
+        // guaranteed to fit due to types matching.
+        self.clear();
+        self.try_push_str(rhs).ok();
+    }
+}
+
+impl<A> PartialOrd for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
+        (**self).partial_cmp(&**rhs)
+    }
+    fn lt(&self, rhs: &Self) -> bool { **self < **rhs }
+    fn le(&self, rhs: &Self) -> bool { **self <= **rhs }
+    fn gt(&self, rhs: &Self) -> bool { **self > **rhs }
+    fn ge(&self, rhs: &Self) -> bool { **self >= **rhs }
+}
+
+impl<A> PartialOrd<str> for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn partial_cmp(&self, rhs: &str) -> Option<cmp::Ordering> {
+        (**self).partial_cmp(rhs)
+    }
+    fn lt(&self, rhs: &str) -> bool { &**self < rhs }
+    fn le(&self, rhs: &str) -> bool { &**self <= rhs }
+    fn gt(&self, rhs: &str) -> bool { &**self > rhs }
+    fn ge(&self, rhs: &str) -> bool { &**self >= rhs }
+}
+
+impl<A> PartialOrd<ArrayString<A>> for str
+    where A: Array<Item=u8> + Copy
+{
+    fn partial_cmp(&self, rhs: &ArrayString<A>) -> Option<cmp::Ordering> {
+        self.partial_cmp(&**rhs)
+    }
+    fn lt(&self, rhs: &ArrayString<A>) -> bool { self < &**rhs }
+    fn le(&self, rhs: &ArrayString<A>) -> bool { self <= &**rhs }
+    fn gt(&self, rhs: &ArrayString<A>) -> bool { self > &**rhs }
+    fn ge(&self, rhs: &ArrayString<A>) -> bool { self >= &**rhs }
+}
+
+impl<A> Ord for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn cmp(&self, rhs: &Self) -> cmp::Ordering {
+        (**self).cmp(&**rhs)
+    }
+}
+
+impl<A> FromStr for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    type Err = CapacityError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::from(s).map_err(CapacityError::simplify)
+    }
+}
+
+#[cfg(feature="serde")]
+/// Requires crate feature `"serde"`
+impl<A> Serialize for ArrayString<A>
+    where A: Array<Item=u8> + Copy
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        serializer.serialize_str(&*self)
+    }
+}
+
+#[cfg(feature="serde")]
+/// Requires crate feature `"serde"`
+impl<'de, A> Deserialize<'de> for ArrayString<A> 
+    where A: Array<Item=u8> + Copy
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where D: Deserializer<'de>
+    {
+        use serde::de::{self, Visitor};
+        use std::marker::PhantomData;
+
+        struct ArrayStringVisitor<A: Array<Item=u8>>(PhantomData<A>);
+
+        impl<'de, A: Copy + Array<Item=u8>> Visitor<'de> for ArrayStringVisitor<A> {
+            type Value = ArrayString<A>;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                write!(formatter, "a string no more than {} bytes long", A::CAPACITY)
+            }
+
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+                where E: de::Error,
+            {
+                ArrayString::from(v).map_err(|_| E::invalid_length(v.len(), &self))
+            }
+
+            fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+                where E: de::Error,
+            {
+                let s = str::from_utf8(v).map_err(|_| E::invalid_value(de::Unexpected::Bytes(v), &self))?;
+
+                ArrayString::from(s).map_err(|_| E::invalid_length(s.len(), &self))
+            }
+        }
+
+        deserializer.deserialize_str(ArrayStringVisitor::<A>(PhantomData))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/char.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/char.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/char.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/char.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,99 @@
+// Copyright 2012-2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+//
+// Original authors: alexchrichton, bluss
+
+use std::ptr;
+
+// UTF-8 ranges and tags for encoding characters
+const TAG_CONT: u8    = 0b1000_0000;
+const TAG_TWO_B: u8   = 0b1100_0000;
+const TAG_THREE_B: u8 = 0b1110_0000;
+const TAG_FOUR_B: u8  = 0b1111_0000;
+const MAX_ONE_B: u32   =     0x80;
+const MAX_TWO_B: u32   =    0x800;
+const MAX_THREE_B: u32 =  0x10000;
+
+/// Placeholder
+pub struct EncodeUtf8Error;
+
+#[inline]
+unsafe fn write(ptr: *mut u8, index: usize, byte: u8) {
+    ptr::write(ptr.add(index), byte)
+}
+
+/// Encode a char into buf using UTF-8.
+///
+/// On success, return the byte length of the encoding (1, 2, 3 or 4).<br>
+/// On error, return `EncodeUtf8Error` if the buffer was too short for the char.
+///
+/// Safety: `ptr` must be writable for `len` bytes.
+#[inline]
+pub unsafe fn encode_utf8(ch: char, ptr: *mut u8, len: usize) -> Result<usize, EncodeUtf8Error>
+{
+    let code = ch as u32;
+    if code < MAX_ONE_B && len >= 1 {
+        write(ptr, 0, code as u8);
+        return Ok(1);
+    } else if code < MAX_TWO_B && len >= 2 {
+        write(ptr, 0, (code >> 6 & 0x1F) as u8 | TAG_TWO_B);
+        write(ptr, 1, (code & 0x3F) as u8 | TAG_CONT);
+        return Ok(2);
+    } else if code < MAX_THREE_B && len >= 3 {
+        write(ptr, 0, (code >> 12 & 0x0F) as u8 | TAG_THREE_B);
+        write(ptr, 1, (code >>  6 & 0x3F) as u8 | TAG_CONT);
+        write(ptr, 2, (code & 0x3F) as u8 | TAG_CONT);
+        return Ok(3);
+    } else if len >= 4 {
+        write(ptr, 0, (code >> 18 & 0x07) as u8 | TAG_FOUR_B);
+        write(ptr, 1, (code >> 12 & 0x3F) as u8 | TAG_CONT);
+        write(ptr, 2, (code >>  6 & 0x3F) as u8 | TAG_CONT);
+        write(ptr, 3, (code & 0x3F) as u8 | TAG_CONT);
+        return Ok(4);
+    };
+    Err(EncodeUtf8Error)
+}
+
+
+#[test]
+#[cfg_attr(miri, ignore)] // Miri is too slow
+fn test_encode_utf8() {
+    // Test that all codepoints are encoded correctly
+    let mut data = [0u8; 16];
+    for codepoint in 0..=(std::char::MAX as u32) {
+        if let Some(ch) = std::char::from_u32(codepoint) {
+            for elt in &mut data { *elt = 0; }
+            let ptr = data.as_mut_ptr();
+            let len = data.len();
+            unsafe {
+                let res = encode_utf8(ch, ptr, len).ok().unwrap();
+                assert_eq!(res, ch.len_utf8());
+            }
+            let string = std::str::from_utf8(&data).unwrap();
+            assert_eq!(string.chars().next(), Some(ch));
+        }
+    }
+}
+
+#[test]
+fn test_encode_utf8_oob() {
+    // test that we report oob if the buffer is too short
+    let mut data = [0u8; 16];
+    let chars = ['a', 'α', '�', '�'];
+    for (len, &ch) in (1..=4).zip(&chars) {
+        assert_eq!(len, ch.len_utf8(), "Len of ch={}", ch);
+        let ptr = data.as_mut_ptr();
+        unsafe {
+            assert!(matches::matches!(encode_utf8(ch, ptr, len - 1), Err(_)));
+            assert!(matches::matches!(encode_utf8(ch, ptr, len), Ok(_)));
+        }
+    }
+}
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/errors.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/errors.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/errors.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/errors.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,49 @@
+use std::fmt;
+#[cfg(feature="std")]
+use std::any::Any;
+#[cfg(feature="std")]
+use std::error::Error;
+
+/// Error value indicating insufficient capacity
+#[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+pub struct CapacityError<T = ()> {
+    element: T,
+}
+
+impl<T> CapacityError<T> {
+    /// Create a new `CapacityError` from `element`.
+    pub fn new(element: T) -> CapacityError<T> {
+        CapacityError {
+            element: element,
+        }
+    }
+
+    /// Extract the overflowing element
+    pub fn element(self) -> T {
+        self.element
+    }
+
+    /// Convert into a `CapacityError` that does not carry an element.
+    pub fn simplify(self) -> CapacityError {
+        CapacityError { element: () }
+    }
+}
+
+const CAPERROR: &'static str = "insufficient capacity";
+
+#[cfg(feature="std")]
+/// Requires `features="std"`.
+impl<T: Any> Error for CapacityError<T> {}
+
+impl<T> fmt::Display for CapacityError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", CAPERROR)
+    }
+}
+
+impl<T> fmt::Debug for CapacityError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}: {}", "CapacityError", CAPERROR)
+    }
+}
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1213 @@
+//! **arrayvec** provides the types `ArrayVec` and `ArrayString`: 
+//! array-backed vector and string types, which store their contents inline.
+//!
+//! The arrayvec package has the following cargo features:
+//!
+//! - `std`
+//!   - Optional, enabled by default
+//!   - Use libstd; disable to use `no_std` instead.
+//!
+//! - `serde`
+//!   - Optional
+//!   - Enable serialization for ArrayVec and ArrayString using serde 1.x
+//! - `array-sizes-33-128`, `array-sizes-129-255`
+//!   - Optional
+//!   - Enable more array sizes (see [Array] for more information)
+//!
+//! - `unstable-const-fn`
+//!   - Optional
+//!   - Makes [`ArrayVec::new`] and [`ArrayString::new`] `const fn`s,
+//!     using the nightly `const_fn` feature.
+//!   - Unstable and requires nightly.
+//!
+//! ## Rust Version
+//!
+//! This version of arrayvec requires Rust 1.36 or later.
+//!
+#![doc(html_root_url="https://docs.rs/arrayvec/0.4/")]
+#![cfg_attr(not(feature="std"), no_std)]
+#![cfg_attr(feature="unstable-const-fn", feature(const_fn))]
+
+#[cfg(feature="serde")]
+extern crate serde;
+
+#[cfg(not(feature="std"))]
+extern crate core as std;
+
+use std::cmp;
+use std::iter;
+use std::mem;
+use std::ops::{Bound, Deref, DerefMut, RangeBounds};
+use std::ptr;
+use std::slice;
+
+// extra traits
+use std::borrow::{Borrow, BorrowMut};
+use std::hash::{Hash, Hasher};
+use std::fmt;
+
+#[cfg(feature="std")]
+use std::io;
+
+
+mod maybe_uninit;
+use crate::maybe_uninit::MaybeUninit;
+
+#[cfg(feature="serde")]
+use serde::{Serialize, Deserialize, Serializer, Deserializer};
+
+mod array;
+mod array_string;
+mod char;
+mod errors;
+
+pub use crate::array::Array;
+use crate::array::Index;
+pub use crate::array_string::ArrayString;
+pub use crate::errors::CapacityError;
+
+
+/// A vector with a fixed capacity.
+///
+/// The `ArrayVec` is a vector backed by a fixed size array. It keeps track of
+/// the number of initialized elements.
+///
+/// The vector is a contiguous value that you can store directly on the stack
+/// if needed.
+///
+/// It offers a simple API but also dereferences to a slice, so
+/// that the full slice API is available.
+///
+/// ArrayVec can be converted into a by value iterator.
+pub struct ArrayVec<A: Array> {
+    xs: MaybeUninit<A>,
+    len: A::Index,
+}
+
+impl<A: Array> Drop for ArrayVec<A> {
+    fn drop(&mut self) {
+        self.clear();
+
+        // MaybeUninit inhibits array's drop
+    }
+}
+
+macro_rules! panic_oob {
+    ($method_name:expr, $index:expr, $len:expr) => {
+        panic!(concat!("ArrayVec::", $method_name, ": index {} is out of bounds in vector of length {}"),
+               $index, $len)
+    }
+}
+
+impl<A: Array> ArrayVec<A> {
+    /// Create a new empty `ArrayVec`.
+    ///
+    /// Capacity is inferred from the type parameter.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<[_; 16]>::new();
+    /// array.push(1);
+    /// array.push(2);
+    /// assert_eq!(&array[..], &[1, 2]);
+    /// assert_eq!(array.capacity(), 16);
+    /// ```
+    #[cfg(not(feature="unstable-const-fn"))]
+    pub fn new() -> ArrayVec<A> {
+        unsafe {
+            ArrayVec { xs: MaybeUninit::uninitialized(), len: Index::ZERO }
+        }
+    }
+
+    #[cfg(feature="unstable-const-fn")]
+    pub const fn new() -> ArrayVec<A> {
+        unsafe {
+            ArrayVec { xs: MaybeUninit::uninitialized(), len: Index::ZERO }
+        }
+    }
+
+    /// Return the number of elements in the `ArrayVec`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    /// array.pop();
+    /// assert_eq!(array.len(), 2);
+    /// ```
+    #[inline]
+    pub fn len(&self) -> usize { self.len.to_usize() }
+
+    /// Returns whether the `ArrayVec` is empty.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1]);
+    /// array.pop();
+    /// assert_eq!(array.is_empty(), true);
+    /// ```
+    #[inline]
+    pub fn is_empty(&self) -> bool { self.len() == 0 }
+
+    /// Return the capacity of the `ArrayVec`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let array = ArrayVec::from([1, 2, 3]);
+    /// assert_eq!(array.capacity(), 3);
+    /// ```
+    #[inline(always)]
+    pub fn capacity(&self) -> usize { A::CAPACITY }
+
+    /// Return if the `ArrayVec` is completely filled.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<[_; 1]>::new();
+    /// assert!(!array.is_full());
+    /// array.push(1);
+    /// assert!(array.is_full());
+    /// ```
+    pub fn is_full(&self) -> bool { self.len() == self.capacity() }
+
+    /// Returns the capacity left in the `ArrayVec`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    /// array.pop();
+    /// assert_eq!(array.remaining_capacity(), 1);
+    /// ```
+    pub fn remaining_capacity(&self) -> usize {
+        self.capacity() - self.len()
+    }
+
+    /// Push `element` to the end of the vector.
+    ///
+    /// ***Panics*** if the vector is already full.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<[_; 2]>::new();
+    ///
+    /// array.push(1);
+    /// array.push(2);
+    ///
+    /// assert_eq!(&array[..], &[1, 2]);
+    /// ```
+    pub fn push(&mut self, element: A::Item) {
+        self.try_push(element).unwrap()
+    }
+
+    /// Push `element` to the end of the vector.
+    ///
+    /// Return `Ok` if the push succeeds, or return an error if the vector
+    /// is already full.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<[_; 2]>::new();
+    ///
+    /// let push1 = array.try_push(1);
+    /// let push2 = array.try_push(2);
+    ///
+    /// assert!(push1.is_ok());
+    /// assert!(push2.is_ok());
+    ///
+    /// assert_eq!(&array[..], &[1, 2]);
+    ///
+    /// let overflow = array.try_push(3);
+    ///
+    /// assert!(overflow.is_err());
+    /// ```
+    pub fn try_push(&mut self, element: A::Item) -> Result<(), CapacityError<A::Item>> {
+        if self.len() < A::CAPACITY {
+            unsafe {
+                self.push_unchecked(element);
+            }
+            Ok(())
+        } else {
+            Err(CapacityError::new(element))
+        }
+    }
+
+
+    /// Push `element` to the end of the vector without checking the capacity.
+    ///
+    /// It is up to the caller to ensure the capacity of the vector is
+    /// sufficiently large.
+    ///
+    /// This method uses *debug assertions* to check that the arrayvec is not full.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<[_; 2]>::new();
+    ///
+    /// if array.len() + 2 <= array.capacity() {
+    ///     unsafe {
+    ///         array.push_unchecked(1);
+    ///         array.push_unchecked(2);
+    ///     }
+    /// }
+    ///
+    /// assert_eq!(&array[..], &[1, 2]);
+    /// ```
+    pub unsafe fn push_unchecked(&mut self, element: A::Item) {
+        let len = self.len();
+        debug_assert!(len < A::CAPACITY);
+        ptr::write(self.get_unchecked_ptr(len), element);
+        self.set_len(len + 1);
+    }
+
+    /// Get pointer to where element at `index` would be
+    unsafe fn get_unchecked_ptr(&mut self, index: usize) -> *mut A::Item {
+        self.xs.ptr_mut().add(index)
+    }
+
+    /// Insert `element` at position `index`.
+    ///
+    /// Shift up all elements after `index`.
+    ///
+    /// It is an error if the index is greater than the length or if the
+    /// arrayvec is full.
+    ///
+    /// ***Panics*** if the array is full or the `index` is out of bounds. See
+    /// `try_insert` for fallible version.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<[_; 2]>::new();
+    ///
+    /// array.insert(0, "x");
+    /// array.insert(0, "y");
+    /// assert_eq!(&array[..], &["y", "x"]);
+    ///
+    /// ```
+    pub fn insert(&mut self, index: usize, element: A::Item) {
+        self.try_insert(index, element).unwrap()
+    }
+
+    /// Insert `element` at position `index`.
+    ///
+    /// Shift up all elements after `index`; the `index` must be less than
+    /// or equal to the length.
+    ///
+    /// Returns an error if vector is already at full capacity.
+    ///
+    /// ***Panics*** `index` is out of bounds.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<[_; 2]>::new();
+    ///
+    /// assert!(array.try_insert(0, "x").is_ok());
+    /// assert!(array.try_insert(0, "y").is_ok());
+    /// assert!(array.try_insert(0, "z").is_err());
+    /// assert_eq!(&array[..], &["y", "x"]);
+    ///
+    /// ```
+    pub fn try_insert(&mut self, index: usize, element: A::Item) -> Result<(), CapacityError<A::Item>> {
+        if index > self.len() {
+            panic_oob!("try_insert", index, self.len())
+        }
+        if self.len() == self.capacity() {
+            return Err(CapacityError::new(element));
+        }
+        let len = self.len();
+
+        // follows is just like Vec<T>
+        unsafe { // infallible
+            // The spot to put the new value
+            {
+                let p: *mut _ = self.get_unchecked_ptr(index);
+                // Shift everything over to make space. (Duplicating the
+                // `index`th element into two consecutive places.)
+                ptr::copy(p, p.offset(1), len - index);
+                // Write it in, overwriting the first copy of the `index`th
+                // element.
+                ptr::write(p, element);
+            }
+            self.set_len(len + 1);
+        }
+        Ok(())
+    }
+
+    /// Remove the last element in the vector and return it.
+    ///
+    /// Return `Some(` *element* `)` if the vector is non-empty, else `None`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::<[_; 2]>::new();
+    ///
+    /// array.push(1);
+    ///
+    /// assert_eq!(array.pop(), Some(1));
+    /// assert_eq!(array.pop(), None);
+    /// ```
+    pub fn pop(&mut self) -> Option<A::Item> {
+        if self.len() == 0 {
+            return None;
+        }
+        unsafe {
+            let new_len = self.len() - 1;
+            self.set_len(new_len);
+            Some(ptr::read(self.get_unchecked_ptr(new_len)))
+        }
+    }
+
+    /// Remove the element at `index` and swap the last element into its place.
+    ///
+    /// This operation is O(1).
+    ///
+    /// Return the *element* if the index is in bounds, else panic.
+    ///
+    /// ***Panics*** if the `index` is out of bounds.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    ///
+    /// assert_eq!(array.swap_remove(0), 1);
+    /// assert_eq!(&array[..], &[3, 2]);
+    ///
+    /// assert_eq!(array.swap_remove(1), 2);
+    /// assert_eq!(&array[..], &[3]);
+    /// ```
+    pub fn swap_remove(&mut self, index: usize) -> A::Item {
+        self.swap_pop(index)
+            .unwrap_or_else(|| {
+                panic_oob!("swap_remove", index, self.len())
+            })
+    }
+
+    /// Remove the element at `index` and swap the last element into its place.
+    ///
+    /// This is a checked version of `.swap_remove`.  
+    /// This operation is O(1).
+    ///
+    /// Return `Some(` *element* `)` if the index is in bounds, else `None`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    ///
+    /// assert_eq!(array.swap_pop(0), Some(1));
+    /// assert_eq!(&array[..], &[3, 2]);
+    ///
+    /// assert_eq!(array.swap_pop(10), None);
+    /// ```
+    pub fn swap_pop(&mut self, index: usize) -> Option<A::Item> {
+        let len = self.len();
+        if index >= len {
+            return None;
+        }
+        self.swap(index, len - 1);
+        self.pop()
+    }
+
+    /// Remove the element at `index` and shift down the following elements.
+    ///
+    /// The `index` must be strictly less than the length of the vector.
+    ///
+    /// ***Panics*** if the `index` is out of bounds.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    ///
+    /// let removed_elt = array.remove(0);
+    /// assert_eq!(removed_elt, 1);
+    /// assert_eq!(&array[..], &[2, 3]);
+    /// ```
+    pub fn remove(&mut self, index: usize) -> A::Item {
+        self.pop_at(index)
+            .unwrap_or_else(|| {
+                panic_oob!("remove", index, self.len())
+            })
+    }
+
+    /// Remove the element at `index` and shift down the following elements.
+    ///
+    /// This is a checked version of `.remove(index)`. Returns `None` if there
+    /// is no element at `index`. Otherwise, return the element inside `Some`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3]);
+    ///
+    /// assert!(array.pop_at(0).is_some());
+    /// assert_eq!(&array[..], &[2, 3]);
+    ///
+    /// assert!(array.pop_at(2).is_none());
+    /// assert!(array.pop_at(10).is_none());
+    /// ```
+    pub fn pop_at(&mut self, index: usize) -> Option<A::Item> {
+        if index >= self.len() {
+            None
+        } else {
+            self.drain(index..index + 1).next()
+        }
+    }
+
+    /// Shortens the vector, keeping the first `len` elements and dropping
+    /// the rest.
+    ///
+    /// If `len` is greater than the vector’s current length this has no
+    /// effect.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3, 4, 5]);
+    /// array.truncate(3);
+    /// assert_eq!(&array[..], &[1, 2, 3]);
+    /// array.truncate(4);
+    /// assert_eq!(&array[..], &[1, 2, 3]);
+    /// ```
+    pub fn truncate(&mut self, new_len: usize) {
+        unsafe {
+            if new_len < self.len() {
+                let tail: *mut [_] = &mut self[new_len..];
+                self.len = Index::from(new_len);
+                ptr::drop_in_place(tail);
+            }
+        }
+    }
+
+    /// Remove all elements in the vector.
+    pub fn clear(&mut self) {
+        self.truncate(0)
+    }
+
+    /// Retains only the elements specified by the predicate.
+    ///
+    /// In other words, remove all elements `e` such that `f(&mut e)` returns false.
+    /// This method operates in place and preserves the order of the retained
+    /// elements.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut array = ArrayVec::from([1, 2, 3, 4]);
+    /// array.retain(|x| *x & 1 != 0 );
+    /// assert_eq!(&array[..], &[1, 3]);
+    /// ```
+    pub fn retain<F>(&mut self, mut f: F)
+        where F: FnMut(&mut A::Item) -> bool
+    {
+        let len = self.len();
+        let mut del = 0;
+        {
+            let v = &mut **self;
+
+            for i in 0..len {
+                if !f(&mut v[i]) {
+                    del += 1;
+                } else if del > 0 {
+                    v.swap(i - del, i);
+                }
+            }
+        }
+        if del > 0 {
+            self.drain(len - del..);
+        }
+    }
+
+    /// Set the vector’s length without dropping or moving out elements
+    ///
+    /// This method is `unsafe` because it changes the notion of the
+    /// number of “valid� elements in the vector. Use with care.
+    ///
+    /// This method uses *debug assertions* to check that `length` is
+    /// not greater than the capacity.
+    pub unsafe fn set_len(&mut self, length: usize) {
+        debug_assert!(length <= self.capacity());
+        self.len = Index::from(length);
+    }
+
+    /// Copy and appends all elements in a slice to the `ArrayVec`.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut vec: ArrayVec<[usize; 10]> = ArrayVec::new();
+    /// vec.push(1);
+    /// vec.try_extend_from_slice(&[2, 3]).unwrap();
+    /// assert_eq!(&vec[..], &[1, 2, 3]);
+    /// ```
+    ///
+    /// # Errors
+    ///
+    /// This method will return an error if the capacity left (see
+    /// [`remaining_capacity`]) is smaller then the length of the provided
+    /// slice.
+    ///
+    /// [`remaining_capacity`]: #method.remaining_capacity
+    pub fn try_extend_from_slice(&mut self, other: &[A::Item]) -> Result<(), CapacityError>
+        where A::Item: Copy,
+    {
+        if self.remaining_capacity() < other.len() {
+            return Err(CapacityError::new(()));
+        }
+
+        let self_len = self.len();
+        let other_len = other.len();
+
+        unsafe {
+            let dst = self.xs.ptr_mut().add(self_len);
+            ptr::copy_nonoverlapping(other.as_ptr(), dst, other_len);
+            self.set_len(self_len + other_len);
+        }
+        Ok(())
+    }
+
+    /// Create a draining iterator that removes the specified range in the vector
+    /// and yields the removed items from start to end. The element range is
+    /// removed even if the iterator is not consumed until the end.
+    ///
+    /// Note: It is unspecified how many elements are removed from the vector,
+    /// if the `Drain` value is leaked.
+    ///
+    /// **Panics** if the starting point is greater than the end point or if
+    /// the end point is greater than the length of the vector.
+    ///
+    /// ```
+    /// use arrayvec::ArrayVec;
+    ///
+    /// let mut v = ArrayVec::from([1, 2, 3]);
+    /// let u: ArrayVec<[_; 3]> = v.drain(0..2).collect();
+    /// assert_eq!(&v[..], &[3]);
+    /// assert_eq!(&u[..], &[1, 2]);
+    /// ```
+    pub fn drain<R>(&mut self, range: R) -> Drain<A>
+        where R: RangeBounds<usize>
+    {
+        // Memory safety
+        //
+        // When the Drain is first created, it shortens the length of
+        // the source vector to make sure no uninitialized or moved-from elements
+        // are accessible at all if the Drain's destructor never gets to run.
+        //
+        // Drain will ptr::read out the values to remove.
+        // When finished, remaining tail of the vec is copied back to cover
+        // the hole, and the vector length is restored to the new length.
+        //
+        let len = self.len();
+        let start = match range.start_bound() {
+            Bound::Unbounded => 0,
+            Bound::Included(&i) => i,
+            Bound::Excluded(&i) => i.saturating_add(1),
+        };
+        let end = match range.end_bound() {
+            Bound::Excluded(&j) => j,
+            Bound::Included(&j) => j.saturating_add(1),
+            Bound::Unbounded => len,
+        };
+        self.drain_range(start, end)
+    }
+
+    fn drain_range(&mut self, start: usize, end: usize) -> Drain<A>
+    {
+        let len = self.len();
+
+        // bounds check happens here (before length is changed!)
+        let range_slice: *const _ = &self[start..end];
+
+        // Calling `set_len` creates a fresh and thus unique mutable references, making all
+        // older aliases we created invalid. So we cannot call that function.
+        self.len = Index::from(start);
+
+        unsafe {
+            Drain {
+                tail_start: end,
+                tail_len: len - end,
+                iter: (*range_slice).iter(),
+                vec: self as *mut _,
+            }
+        }
+    }
+
+    /// Return the inner fixed size array, if it is full to its capacity.
+    ///
+    /// Return an `Ok` value with the array if length equals capacity,
+    /// return an `Err` with self otherwise.
+    pub fn into_inner(self) -> Result<A, Self> {
+        if self.len() < self.capacity() {
+            Err(self)
+        } else {
+            unsafe {
+                let array = ptr::read(self.xs.ptr() as *const A);
+                mem::forget(self);
+                Ok(array)
+            }
+        }
+    }
+
+    /// Dispose of `self` (same as drop)
+    #[deprecated="Use std::mem::drop instead, if at all needed."]
+    pub fn dispose(mut self) {
+        self.clear();
+        mem::forget(self);
+    }
+
+    /// Return a slice containing all elements of the vector.
+    pub fn as_slice(&self) -> &[A::Item] {
+        self
+    }
+
+    /// Return a mutable slice containing all elements of the vector.
+    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
+        self
+    }
+
+    /// Return a raw pointer to the vector's buffer.
+    pub fn as_ptr(&self) -> *const A::Item {
+        self.xs.ptr()
+    }
+
+    /// Return a raw mutable pointer to the vector's buffer.
+    pub fn as_mut_ptr(&mut self) -> *mut A::Item {
+        self.xs.ptr_mut()
+    }
+}
+
+impl<A: Array> Deref for ArrayVec<A> {
+    type Target = [A::Item];
+    #[inline]
+    fn deref(&self) -> &[A::Item] {
+        unsafe {
+            slice::from_raw_parts(self.xs.ptr(), self.len())
+        }
+    }
+}
+
+impl<A: Array> DerefMut for ArrayVec<A> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut [A::Item] {
+        let len = self.len();
+        unsafe {
+            slice::from_raw_parts_mut(self.xs.ptr_mut(), len)
+        }
+    }
+}
+
+/// Create an `ArrayVec` from an array.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+///
+/// let mut array = ArrayVec::from([1, 2, 3]);
+/// assert_eq!(array.len(), 3);
+/// assert_eq!(array.capacity(), 3);
+/// ```
+impl<A: Array> From<A> for ArrayVec<A> {
+    fn from(array: A) -> Self {
+        ArrayVec { xs: MaybeUninit::from(array), len: Index::from(A::CAPACITY) }
+    }
+}
+
+
+/// Try to create an `ArrayVec` from a slice. This will return an error if the slice was too big to
+/// fit.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+/// use std::convert::TryInto as _;
+///
+/// let array: ArrayVec<[_; 4]> = (&[1, 2, 3] as &[_]).try_into().unwrap();
+/// assert_eq!(array.len(), 3);
+/// assert_eq!(array.capacity(), 4);
+/// ```
+impl<A: Array> std::convert::TryFrom<&[A::Item]> for ArrayVec<A>
+    where
+        A::Item: Clone,
+{
+    type Error = CapacityError;
+
+    fn try_from(slice: &[A::Item]) -> Result<Self, Self::Error> {
+        if A::CAPACITY < slice.len() {
+            Err(CapacityError::new(()))
+        } else {
+            let mut array = Self::new();
+            array.extend(slice.iter().cloned());
+            Ok(array)
+        }
+    }
+}
+
+
+/// Iterate the `ArrayVec` with references to each element.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+///
+/// let array = ArrayVec::from([1, 2, 3]);
+///
+/// for elt in &array {
+///     // ...
+/// }
+/// ```
+impl<'a, A: Array> IntoIterator for &'a ArrayVec<A> {
+    type Item = &'a A::Item;
+    type IntoIter = slice::Iter<'a, A::Item>;
+    fn into_iter(self) -> Self::IntoIter { self.iter() }
+}
+
+/// Iterate the `ArrayVec` with mutable references to each element.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+///
+/// let mut array = ArrayVec::from([1, 2, 3]);
+///
+/// for elt in &mut array {
+///     // ...
+/// }
+/// ```
+impl<'a, A: Array> IntoIterator for &'a mut ArrayVec<A> {
+    type Item = &'a mut A::Item;
+    type IntoIter = slice::IterMut<'a, A::Item>;
+    fn into_iter(self) -> Self::IntoIter { self.iter_mut() }
+}
+
+/// Iterate the `ArrayVec` with each element by value.
+///
+/// The vector is consumed by this operation.
+///
+/// ```
+/// use arrayvec::ArrayVec;
+///
+/// for elt in ArrayVec::from([1, 2, 3]) {
+///     // ...
+/// }
+/// ```
+impl<A: Array> IntoIterator for ArrayVec<A> {
+    type Item = A::Item;
+    type IntoIter = IntoIter<A>;
+    fn into_iter(self) -> IntoIter<A> {
+        IntoIter { index: Index::from(0), v: self, }
+    }
+}
+
+
+/// By-value iterator for `ArrayVec`.
+pub struct IntoIter<A: Array> {
+    index: A::Index,
+    v: ArrayVec<A>,
+}
+
+impl<A: Array> Iterator for IntoIter<A> {
+    type Item = A::Item;
+
+    fn next(&mut self) -> Option<A::Item> {
+        if self.index == self.v.len {
+            None
+        } else {
+            unsafe {
+                let index = self.index.to_usize();
+                self.index = Index::from(index + 1);
+                Some(ptr::read(self.v.get_unchecked_ptr(index)))
+            }
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.v.len() - self.index.to_usize();
+        (len, Some(len))
+    }
+}
+
+impl<A: Array> DoubleEndedIterator for IntoIter<A> {
+    fn next_back(&mut self) -> Option<A::Item> {
+        if self.index == self.v.len {
+            None
+        } else {
+            unsafe {
+                let new_len = self.v.len() - 1;
+                self.v.set_len(new_len);
+                Some(ptr::read(self.v.get_unchecked_ptr(new_len)))
+            }
+        }
+    }
+}
+
+impl<A: Array> ExactSizeIterator for IntoIter<A> { }
+
+impl<A: Array> Drop for IntoIter<A> {
+    fn drop(&mut self) {
+        // panic safety: Set length to 0 before dropping elements.
+        let index = self.index.to_usize();
+        let len = self.v.len();
+        unsafe {
+            self.v.set_len(0);
+            let elements = slice::from_raw_parts_mut(
+                self.v.get_unchecked_ptr(index),
+                len - index);
+            ptr::drop_in_place(elements);
+        }
+    }
+}
+
+impl<A: Array> Clone for IntoIter<A>
+where
+    A::Item: Clone,
+{
+    fn clone(&self) -> IntoIter<A> {
+        self.v[self.index.to_usize()..]
+            .iter()
+            .cloned()
+            .collect::<ArrayVec<A>>()
+            .into_iter()
+    }
+}
+
+impl<A: Array> fmt::Debug for IntoIter<A>
+where
+    A::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_list()
+            .entries(&self.v[self.index.to_usize()..])
+            .finish()
+    }
+}
+
+/// A draining iterator for `ArrayVec`.
+pub struct Drain<'a, A> 
+    where A: Array,
+          A::Item: 'a,
+{
+    /// Index of tail to preserve
+    tail_start: usize,
+    /// Length of tail
+    tail_len: usize,
+    /// Current remaining range to remove
+    iter: slice::Iter<'a, A::Item>,
+    vec: *mut ArrayVec<A>,
+}
+
+unsafe impl<'a, A: Array + Sync> Sync for Drain<'a, A> {}
+unsafe impl<'a, A: Array + Send> Send for Drain<'a, A> {}
+
+impl<'a, A: Array> Iterator for Drain<'a, A>
+    where A::Item: 'a,
+{
+    type Item = A::Item;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next().map(|elt|
+            unsafe {
+                ptr::read(elt as *const _)
+            }
+        )
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+impl<'a, A: Array> DoubleEndedIterator for Drain<'a, A>
+    where A::Item: 'a,
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.iter.next_back().map(|elt|
+            unsafe {
+                ptr::read(elt as *const _)
+            }
+        )
+    }
+}
+
+impl<'a, A: Array> ExactSizeIterator for Drain<'a, A> where A::Item: 'a {}
+
+impl<'a, A: Array> Drop for Drain<'a, A> 
+    where A::Item: 'a
+{
+    fn drop(&mut self) {
+        // len is currently 0 so panicking while dropping will not cause a double drop.
+
+        // exhaust self first
+        while let Some(_) = self.next() { }
+
+        if self.tail_len > 0 {
+            unsafe {
+                let source_vec = &mut *self.vec;
+                // memmove back untouched tail, update to new length
+                let start = source_vec.len();
+                let tail = self.tail_start;
+                let src = source_vec.as_ptr().add(tail);
+                let dst = source_vec.as_mut_ptr().add(start);
+                ptr::copy(src, dst, self.tail_len);
+                source_vec.set_len(start + self.tail_len);
+            }
+        }
+    }
+}
+
+struct ScopeExitGuard<T, Data, F>
+    where F: FnMut(&Data, &mut T)
+{
+    value: T,
+    data: Data,
+    f: F,
+}
+
+impl<T, Data, F> Drop for ScopeExitGuard<T, Data, F>
+    where F: FnMut(&Data, &mut T)
+{
+    fn drop(&mut self) {
+        (self.f)(&self.data, &mut self.value)
+    }
+}
+
+
+
+/// Extend the `ArrayVec` with an iterator.
+/// 
+/// Does not extract more items than there is space for. No error
+/// occurs if there are more iterator elements.
+impl<A: Array> Extend<A::Item> for ArrayVec<A> {
+    fn extend<T: IntoIterator<Item=A::Item>>(&mut self, iter: T) {
+        let take = self.capacity() - self.len();
+        unsafe {
+            let len = self.len();
+            let mut ptr = raw_ptr_add(self.as_mut_ptr(), len);
+            let end_ptr = raw_ptr_add(ptr, take);
+            // Keep the length in a separate variable, write it back on scope
+            // exit. To help the compiler with alias analysis and stuff.
+            // We update the length to handle panic in the iteration of the
+            // user's iterator, without dropping any elements on the floor.
+            let mut guard = ScopeExitGuard {
+                value: &mut self.len,
+                data: len,
+                f: move |&len, self_len| {
+                    **self_len = Index::from(len);
+                }
+            };
+            let mut iter = iter.into_iter();
+            loop {
+                if ptr == end_ptr { break; }
+                if let Some(elt) = iter.next() {
+                    raw_ptr_write(ptr, elt);
+                    ptr = raw_ptr_add(ptr, 1);
+                    guard.data += 1;
+                } else {
+                    break;
+                }
+            }
+        }
+    }
+}
+
+/// Rawptr add but uses arithmetic distance for ZST
+unsafe fn raw_ptr_add<T>(ptr: *mut T, offset: usize) -> *mut T {
+    if mem::size_of::<T>() == 0 {
+        // Special case for ZST
+        (ptr as usize).wrapping_add(offset) as _
+    } else {
+        ptr.add(offset)
+    }
+}
+
+unsafe fn raw_ptr_write<T>(ptr: *mut T, value: T) {
+    if mem::size_of::<T>() == 0 {
+        /* nothing */
+    } else {
+        ptr::write(ptr, value)
+    }
+}
+
+/// Create an `ArrayVec` from an iterator.
+/// 
+/// Does not extract more items than there is space for. No error
+/// occurs if there are more iterator elements.
+impl<A: Array> iter::FromIterator<A::Item> for ArrayVec<A> {
+    fn from_iter<T: IntoIterator<Item=A::Item>>(iter: T) -> Self {
+        let mut array = ArrayVec::new();
+        array.extend(iter);
+        array
+    }
+}
+
+impl<A: Array> Clone for ArrayVec<A>
+    where A::Item: Clone
+{
+    fn clone(&self) -> Self {
+        self.iter().cloned().collect()
+    }
+
+    fn clone_from(&mut self, rhs: &Self) {
+        // recursive case for the common prefix
+        let prefix = cmp::min(self.len(), rhs.len());
+        self[..prefix].clone_from_slice(&rhs[..prefix]);
+
+        if prefix < self.len() {
+            // rhs was shorter
+            for _ in 0..self.len() - prefix {
+                self.pop();
+            }
+        } else {
+            let rhs_elems = rhs[self.len()..].iter().cloned();
+            self.extend(rhs_elems);
+        }
+    }
+}
+
+impl<A: Array> Hash for ArrayVec<A>
+    where A::Item: Hash
+{
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        Hash::hash(&**self, state)
+    }
+}
+
+impl<A: Array> PartialEq for ArrayVec<A>
+    where A::Item: PartialEq
+{
+    fn eq(&self, other: &Self) -> bool {
+        **self == **other
+    }
+}
+
+impl<A: Array> PartialEq<[A::Item]> for ArrayVec<A>
+    where A::Item: PartialEq
+{
+    fn eq(&self, other: &[A::Item]) -> bool {
+        **self == *other
+    }
+}
+
+impl<A: Array> Eq for ArrayVec<A> where A::Item: Eq { }
+
+impl<A: Array> Borrow<[A::Item]> for ArrayVec<A> {
+    fn borrow(&self) -> &[A::Item] { self }
+}
+
+impl<A: Array> BorrowMut<[A::Item]> for ArrayVec<A> {
+    fn borrow_mut(&mut self) -> &mut [A::Item] { self }
+}
+
+impl<A: Array> AsRef<[A::Item]> for ArrayVec<A> {
+    fn as_ref(&self) -> &[A::Item] { self }
+}
+
+impl<A: Array> AsMut<[A::Item]> for ArrayVec<A> {
+    fn as_mut(&mut self) -> &mut [A::Item] { self }
+}
+
+impl<A: Array> fmt::Debug for ArrayVec<A> where A::Item: fmt::Debug {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
+}
+
+impl<A: Array> Default for ArrayVec<A> {
+    /// Return an empty array
+    fn default() -> ArrayVec<A> {
+        ArrayVec::new()
+    }
+}
+
+impl<A: Array> PartialOrd for ArrayVec<A> where A::Item: PartialOrd {
+    fn partial_cmp(&self, other: &ArrayVec<A>) -> Option<cmp::Ordering> {
+        (**self).partial_cmp(other)
+    }
+
+    fn lt(&self, other: &Self) -> bool {
+        (**self).lt(other)
+    }
+
+    fn le(&self, other: &Self) -> bool {
+        (**self).le(other)
+    }
+
+    fn ge(&self, other: &Self) -> bool {
+        (**self).ge(other)
+    }
+
+    fn gt(&self, other: &Self) -> bool {
+        (**self).gt(other)
+    }
+}
+
+impl<A: Array> Ord for ArrayVec<A> where A::Item: Ord {
+    fn cmp(&self, other: &ArrayVec<A>) -> cmp::Ordering {
+        (**self).cmp(other)
+    }
+}
+
+#[cfg(feature="std")]
+/// `Write` appends written data to the end of the vector.
+///
+/// Requires `features="std"`.
+impl<A: Array<Item=u8>> io::Write for ArrayVec<A> {
+    fn write(&mut self, data: &[u8]) -> io::Result<usize> {
+        let len = cmp::min(self.remaining_capacity(), data.len());
+        let _result = self.try_extend_from_slice(&data[..len]);
+        debug_assert!(_result.is_ok());
+        Ok(len)
+    }
+    fn flush(&mut self) -> io::Result<()> { Ok(()) }
+}
+
+#[cfg(feature="serde")]
+/// Requires crate feature `"serde"`
+impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        serializer.collect_seq(self)
+    }
+}
+
+#[cfg(feature="serde")]
+/// Requires crate feature `"serde"`
+impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where D: Deserializer<'de>
+    {
+        use serde::de::{Visitor, SeqAccess, Error};
+        use std::marker::PhantomData;
+
+        struct ArrayVecVisitor<'de, T: Deserialize<'de>, A: Array<Item=T>>(PhantomData<(&'de (), T, A)>);
+
+        impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Visitor<'de> for ArrayVecVisitor<'de, T, A> {
+            type Value = ArrayVec<A>;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                write!(formatter, "an array with no more than {} items", A::CAPACITY)
+            }
+
+            fn visit_seq<SA>(self, mut seq: SA) -> Result<Self::Value, SA::Error>
+                where SA: SeqAccess<'de>,
+            {
+                let mut values = ArrayVec::<A>::new();
+
+                while let Some(value) = seq.next_element()? {
+                    if let Err(_) = values.try_push(value) {
+                        return Err(SA::Error::invalid_length(A::CAPACITY + 1, &self));
+                    }
+                }
+
+                Ok(values)
+            }
+        }
+
+        deserializer.deserialize_seq(ArrayVecVisitor::<T, A>(PhantomData))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/maybe_uninit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/maybe_uninit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/src/maybe_uninit.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/src/maybe_uninit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+
+
+use crate::array::Array;
+use std::mem::MaybeUninit as StdMaybeUninit;
+
+#[derive(Copy)]
+pub struct MaybeUninit<T> {
+    inner: StdMaybeUninit<T>,
+}
+
+impl<T> Clone for MaybeUninit<T>
+    where T: Copy
+{
+    fn clone(&self) -> Self { *self }
+}
+
+impl<T> MaybeUninit<T> {
+    /// Create a new MaybeUninit with uninitialized interior
+    pub const unsafe fn uninitialized() -> Self {
+        MaybeUninit { inner: StdMaybeUninit::uninit() }
+    }
+
+    /// Create a new MaybeUninit from the value `v`.
+    pub fn from(v: T) -> Self {
+        MaybeUninit { inner: StdMaybeUninit::new(v) }
+    }
+
+    // Raw pointer casts written so that we don't reference or access the
+    // uninitialized interior value
+
+    /// Return a raw pointer to the start of the interior array
+    pub fn ptr(&self) -> *const T::Item
+        where T: Array
+    {
+        self.inner.as_ptr() as *const T::Item
+    }
+
+    /// Return a mut raw pointer to the start of the interior array
+    pub fn ptr_mut(&mut self) -> *mut T::Item
+        where T: Array
+    {
+        self.inner.as_mut_ptr() as *mut T::Item
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/tests/serde.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/tests/serde.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/tests/serde.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/tests/serde.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,79 @@
+#![cfg(feature = "serde")]
+extern crate arrayvec;
+extern crate serde_test;
+
+mod array_vec {
+    use arrayvec::ArrayVec;
+
+    use serde_test::{Token, assert_tokens, assert_de_tokens_error};
+
+    #[test]
+    fn test_ser_de_empty() {
+        let vec = ArrayVec::<[u32; 0]>::new();
+
+        assert_tokens(&vec, &[
+            Token::Seq { len: Some(0) },
+            Token::SeqEnd,
+        ]);
+    }
+
+
+    #[test]
+    fn test_ser_de() {
+        let mut vec = ArrayVec::<[u32; 3]>::new();
+        vec.push(20);
+        vec.push(55);
+        vec.push(123);
+
+        assert_tokens(&vec, &[
+            Token::Seq { len: Some(3) },
+            Token::U32(20),
+            Token::U32(55),
+            Token::U32(123),
+            Token::SeqEnd,
+        ]);
+    }
+
+    #[test]
+    fn test_de_too_large() {
+        assert_de_tokens_error::<ArrayVec<[u32; 2]>>(&[
+            Token::Seq { len: Some(3) },
+            Token::U32(13),
+            Token::U32(42),
+            Token::U32(68),
+        ], "invalid length 3, expected an array with no more than 2 items");
+    }
+}
+
+mod array_string {
+    use arrayvec::ArrayString;
+
+    use serde_test::{Token, assert_tokens, assert_de_tokens_error};
+
+    #[test]
+    fn test_ser_de_empty() {
+        let string = ArrayString::<[u8; 0]>::new();
+
+        assert_tokens(&string, &[
+            Token::Str(""),
+        ]);
+    }
+
+
+    #[test]
+    fn test_ser_de() {
+        let string = ArrayString::<[u8; 9]>::from("1234 abcd")
+            .expect("expected exact specified capacity to be enough");
+
+        assert_tokens(&string, &[
+            Token::Str("1234 abcd"),
+        ]);
+    }
+
+    #[test]
+    fn test_de_too_large() {
+        assert_de_tokens_error::<ArrayString<[u8; 2]>>(&[
+            Token::Str("afd")
+        ], "invalid length 3, expected a string no more than 2 bytes long");
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/tests/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/tests/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/arrayvec-0.5.2/tests/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/arrayvec-0.5.2/tests/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,688 @@
+extern crate arrayvec;
+#[macro_use] extern crate matches;
+
+use arrayvec::ArrayVec;
+use arrayvec::ArrayString;
+use std::mem;
+use arrayvec::CapacityError;
+
+use std::collections::HashMap;
+
+
+#[test]
+fn test_simple() {
+    use std::ops::Add;
+
+    let mut vec: ArrayVec<[Vec<i32>; 3]> = ArrayVec::new();
+
+    vec.push(vec![1, 2, 3, 4]);
+    vec.push(vec![10]);
+    vec.push(vec![-1, 13, -2]);
+
+    for elt in &vec {
+        assert_eq!(elt.iter().fold(0, Add::add), 10);
+    }
+
+    let sum_len = vec.into_iter().map(|x| x.len()).fold(0, Add::add);
+    assert_eq!(sum_len, 8);
+}
+
+#[test]
+fn test_capacity_left() {
+    let mut vec: ArrayVec<[usize; 4]> = ArrayVec::new();
+    assert_eq!(vec.remaining_capacity(), 4);
+    vec.push(1);
+    assert_eq!(vec.remaining_capacity(), 3);
+    vec.push(2);
+    assert_eq!(vec.remaining_capacity(), 2);
+    vec.push(3);
+    assert_eq!(vec.remaining_capacity(), 1);
+    vec.push(4);
+    assert_eq!(vec.remaining_capacity(), 0);
+}
+
+#[test]
+fn test_extend_from_slice() {
+    let mut vec: ArrayVec<[usize; 10]> = ArrayVec::new();
+
+    vec.try_extend_from_slice(&[1, 2, 3]).unwrap();
+    assert_eq!(vec.len(), 3);
+    assert_eq!(&vec[..], &[1, 2, 3]);
+    assert_eq!(vec.pop(), Some(3));
+    assert_eq!(&vec[..], &[1, 2]);
+}
+
+#[test]
+fn test_extend_from_slice_error() {
+    let mut vec: ArrayVec<[usize; 10]> = ArrayVec::new();
+
+    vec.try_extend_from_slice(&[1, 2, 3]).unwrap();
+    let res = vec.try_extend_from_slice(&[0; 8]);
+    assert_matches!(res, Err(_));
+
+    let mut vec: ArrayVec<[usize; 0]> = ArrayVec::new();
+    let res = vec.try_extend_from_slice(&[0; 1]);
+    assert_matches!(res, Err(_));
+}
+
+#[test]
+fn test_try_from_slice_error() {
+    use arrayvec::ArrayVec;
+    use std::convert::TryInto as _;
+
+    let res: Result<ArrayVec<[_; 2]>, _> = (&[1, 2, 3] as &[_]).try_into();
+    assert_matches!(res, Err(_));
+}
+
+#[test]
+fn test_u16_index() {
+    const N: usize = 4096;
+    let mut vec: ArrayVec<[_; N]> = ArrayVec::new();
+    for _ in 0..N {
+        assert!(vec.try_push(1u8).is_ok());
+    }
+    assert!(vec.try_push(0).is_err());
+    assert_eq!(vec.len(), N);
+}
+
+#[test]
+fn test_iter() {
+    let mut iter = ArrayVec::from([1, 2, 3]).into_iter();
+    assert_eq!(iter.size_hint(), (3, Some(3)));
+    assert_eq!(iter.next_back(), Some(3));
+    assert_eq!(iter.next(), Some(1));
+    assert_eq!(iter.next_back(), Some(2));
+    assert_eq!(iter.size_hint(), (0, Some(0)));
+    assert_eq!(iter.next_back(), None);
+}
+
+#[test]
+fn test_drop() {
+    use std::cell::Cell;
+
+    let flag = &Cell::new(0);
+
+    #[derive(Clone)]
+    struct Bump<'a>(&'a Cell<i32>);
+
+    impl<'a> Drop for Bump<'a> {
+        fn drop(&mut self) {
+            let n = self.0.get();
+            self.0.set(n + 1);
+        }
+    }
+
+    {
+        let mut array = ArrayVec::<[Bump; 128]>::new();
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+    }
+    assert_eq!(flag.get(), 2);
+
+    // test something with the nullable pointer optimization
+    flag.set(0);
+
+    {
+        let mut array = ArrayVec::<[_; 3]>::new();
+        array.push(vec![Bump(flag)]);
+        array.push(vec![Bump(flag), Bump(flag)]);
+        array.push(vec![]);
+        let push4 = array.try_push(vec![Bump(flag)]);
+        assert_eq!(flag.get(), 0);
+        drop(push4);
+        assert_eq!(flag.get(), 1);
+        drop(array.pop());
+        assert_eq!(flag.get(), 1);
+        drop(array.pop());
+        assert_eq!(flag.get(), 3);
+    }
+
+    assert_eq!(flag.get(), 4);
+
+    // test into_inner
+    flag.set(0);
+    {
+        let mut array = ArrayVec::<[_; 3]>::new();
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+        let inner = array.into_inner();
+        assert!(inner.is_ok());
+        assert_eq!(flag.get(), 0);
+        drop(inner);
+        assert_eq!(flag.get(), 3);
+    }
+
+    // test cloning into_iter
+    flag.set(0);
+    {
+        let mut array = ArrayVec::<[_; 3]>::new();
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+        let mut iter = array.into_iter();
+        assert_eq!(flag.get(), 0);
+        iter.next();
+        assert_eq!(flag.get(), 1);
+        let clone = iter.clone();
+        assert_eq!(flag.get(), 1);
+        drop(clone);
+        assert_eq!(flag.get(), 3);
+        drop(iter);
+        assert_eq!(flag.get(), 5);
+    }
+}
+
+#[test]
+fn test_drop_panics() {
+    use std::cell::Cell;
+    use std::panic::catch_unwind;
+    use std::panic::AssertUnwindSafe;
+
+    let flag = &Cell::new(0);
+
+    struct Bump<'a>(&'a Cell<i32>);
+
+    // Panic in the first drop
+    impl<'a> Drop for Bump<'a> {
+        fn drop(&mut self) {
+            let n = self.0.get();
+            self.0.set(n + 1);
+            if n == 0 {
+                panic!("Panic in Bump's drop");
+            }
+        }
+    }
+    // check if rust is new enough
+    flag.set(0);
+    {
+        let array = vec![Bump(flag), Bump(flag)];
+        let res = catch_unwind(AssertUnwindSafe(|| {
+            drop(array);
+        }));
+        assert!(res.is_err());
+    }
+
+    if flag.get() != 2 {
+        println!("test_drop_panics: skip, this version of Rust doesn't continue in drop_in_place");
+        return;
+    }
+
+    flag.set(0);
+    {
+        let mut array = ArrayVec::<[Bump; 128]>::new();
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+
+        let res = catch_unwind(AssertUnwindSafe(|| {
+            drop(array);
+        }));
+        assert!(res.is_err());
+    }
+    // Check that all the elements drop, even if the first drop panics.
+    assert_eq!(flag.get(), 3);
+
+
+    flag.set(0);
+    {
+        let mut array = ArrayVec::<[Bump; 16]>::new();
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+        array.push(Bump(flag));
+
+        let i = 2;
+        let tail_len = array.len() - i;
+
+        let res = catch_unwind(AssertUnwindSafe(|| {
+            array.truncate(i);
+        }));
+        assert!(res.is_err());
+        // Check that all the tail elements drop, even if the first drop panics.
+        assert_eq!(flag.get(), tail_len as i32);
+    }
+
+
+}
+
+#[test]
+fn test_extend() {
+    let mut range = 0..10;
+
+    let mut array: ArrayVec<[_; 5]> = range.by_ref().collect();
+    assert_eq!(&array[..], &[0, 1, 2, 3, 4]);
+    assert_eq!(range.next(), Some(5));
+
+    array.extend(range.by_ref());
+    assert_eq!(range.next(), Some(6));
+
+    let mut array: ArrayVec<[_; 10]> = (0..3).collect();
+    assert_eq!(&array[..], &[0, 1, 2]);
+    array.extend(3..5);
+    assert_eq!(&array[..], &[0, 1, 2, 3, 4]);
+}
+
+#[test]
+fn test_is_send_sync() {
+    let data = ArrayVec::<[Vec<i32>; 5]>::new();
+    &data as &dyn Send;
+    &data as &dyn Sync;
+}
+
+#[test]
+fn test_compact_size() {
+    // Future rust will kill these drop flags!
+    // 4 elements size + 1 len + 1 enum tag + [1 drop flag]
+    type ByteArray = ArrayVec<[u8; 4]>;
+    println!("{}", mem::size_of::<ByteArray>());
+    assert!(mem::size_of::<ByteArray>() <= 8);
+
+    // 1 enum tag + 1 drop flag
+    type EmptyArray = ArrayVec<[u8; 0]>;
+    println!("{}", mem::size_of::<EmptyArray>());
+    assert!(mem::size_of::<EmptyArray>() <= 2);
+
+    // 12 element size + 1 enum tag + 3 padding + 1 len + 1 drop flag + 2 padding
+    type QuadArray = ArrayVec<[u32; 3]>;
+    println!("{}", mem::size_of::<QuadArray>());
+    assert!(mem::size_of::<QuadArray>() <= 24);
+}
+
+#[test]
+fn test_still_works_with_option_arrayvec() {
+    type RefArray = ArrayVec<[&'static i32; 2]>;
+    let array = Some(RefArray::new());
+    assert!(array.is_some());
+    println!("{:?}", array);
+}
+
+#[test]
+fn test_drain() {
+    let mut v = ArrayVec::from([0; 8]);
+    v.pop();
+    v.drain(0..7);
+    assert_eq!(&v[..], &[]);
+
+    v.extend(0..);
+    v.drain(1..4);
+    assert_eq!(&v[..], &[0, 4, 5, 6, 7]);
+    let u: ArrayVec<[_; 3]> = v.drain(1..4).rev().collect();
+    assert_eq!(&u[..], &[6, 5, 4]);
+    assert_eq!(&v[..], &[0, 7]);
+    v.drain(..);
+    assert_eq!(&v[..], &[]);
+}
+
+#[test]
+fn test_drain_range_inclusive() {
+    let mut v = ArrayVec::from([0; 8]);
+    v.drain(0..=7);
+    assert_eq!(&v[..], &[]);
+
+    v.extend(0..);
+    v.drain(1..=4);
+    assert_eq!(&v[..], &[0, 5, 6, 7]);
+    let u: ArrayVec<[_; 3]> = v.drain(1..=2).rev().collect();
+    assert_eq!(&u[..], &[6, 5]);
+    assert_eq!(&v[..], &[0, 7]);
+    v.drain(..);
+    assert_eq!(&v[..], &[]);
+}
+
+#[test]
+#[should_panic]
+fn test_drain_range_inclusive_oob() {
+    let mut v = ArrayVec::from([0; 0]);
+    v.drain(0..=0);
+}
+
+#[test]
+fn test_retain() {
+    let mut v = ArrayVec::from([0; 8]);
+    for (i, elt) in v.iter_mut().enumerate() {
+        *elt = i;
+    }
+    v.retain(|_| true);
+    assert_eq!(&v[..], &[0, 1, 2, 3, 4, 5, 6, 7]);
+    v.retain(|elt| {
+        *elt /= 2;
+        *elt % 2 == 0
+    });
+    assert_eq!(&v[..], &[0, 0, 2, 2]);
+    v.retain(|_| false);
+    assert_eq!(&v[..], &[]);
+}
+
+#[test]
+#[should_panic]
+fn test_drain_oob() {
+    let mut v = ArrayVec::from([0; 8]);
+    v.pop();
+    v.drain(0..8);
+}
+
+#[test]
+#[should_panic]
+fn test_drop_panic() {
+    struct DropPanic;
+
+    impl Drop for DropPanic {
+        fn drop(&mut self) {
+            panic!("drop");
+        }
+    }
+
+    let mut array = ArrayVec::<[DropPanic; 1]>::new();
+    array.push(DropPanic);
+}
+
+#[test]
+#[should_panic]
+fn test_drop_panic_into_iter() {
+    struct DropPanic;
+
+    impl Drop for DropPanic {
+        fn drop(&mut self) {
+            panic!("drop");
+        }
+    }
+
+    let mut array = ArrayVec::<[DropPanic; 1]>::new();
+    array.push(DropPanic);
+    array.into_iter();
+}
+
+#[test]
+fn test_insert() {
+    let mut v = ArrayVec::from([]);
+    assert_matches!(v.try_push(1), Err(_));
+
+    let mut v = ArrayVec::<[_; 3]>::new();
+    v.insert(0, 0);
+    v.insert(1, 1);
+    //let ret1 = v.try_insert(3, 3);
+    //assert_matches!(ret1, Err(InsertError::OutOfBounds(_)));
+    assert_eq!(&v[..], &[0, 1]);
+    v.insert(2, 2);
+    assert_eq!(&v[..], &[0, 1, 2]);
+
+    let ret2 = v.try_insert(1, 9);
+    assert_eq!(&v[..], &[0, 1, 2]);
+    assert_matches!(ret2, Err(_));
+
+    let mut v = ArrayVec::from([2]);
+    assert_matches!(v.try_insert(0, 1), Err(CapacityError { .. }));
+    assert_matches!(v.try_insert(1, 1), Err(CapacityError { .. }));
+    //assert_matches!(v.try_insert(2, 1), Err(CapacityError { .. }));
+}
+
+#[test]
+fn test_into_inner_1() {
+    let mut v = ArrayVec::from([1, 2]);
+    v.pop();
+    let u = v.clone();
+    assert_eq!(v.into_inner(), Err(u));
+}
+
+#[test]
+fn test_into_inner_2() {
+    let mut v = ArrayVec::<[String; 4]>::new();
+    v.push("a".into());
+    v.push("b".into());
+    v.push("c".into());
+    v.push("d".into());
+    assert_eq!(v.into_inner().unwrap(), ["a", "b", "c", "d"]);
+}
+
+#[test]
+fn test_into_inner_3_() {
+    let mut v = ArrayVec::<[i32; 4]>::new();
+    v.extend(1..);
+    assert_eq!(v.into_inner().unwrap(), [1, 2, 3, 4]);
+}
+
+#[cfg(feature="std")]
+#[test]
+fn test_write() {
+    use std::io::Write;
+    let mut v = ArrayVec::<[_; 8]>::new();
+    write!(&mut v, "\x01\x02\x03").unwrap();
+    assert_eq!(&v[..], &[1, 2, 3]);
+    let r = v.write(&[9; 16]).unwrap();
+    assert_eq!(r, 5);
+    assert_eq!(&v[..], &[1, 2, 3, 9, 9, 9, 9, 9]);
+}
+
+#[test]
+fn array_clone_from() {
+    let mut v = ArrayVec::<[_; 4]>::new();
+    v.push(vec![1, 2]);
+    v.push(vec![3, 4, 5]);
+    v.push(vec![6]);
+    let reference = v.to_vec();
+    let mut u = ArrayVec::<[_; 4]>::new();
+    u.clone_from(&v);
+    assert_eq!(&u, &reference[..]);
+
+    let mut t = ArrayVec::<[_; 4]>::new();
+    t.push(vec![97]);
+    t.push(vec![]);
+    t.push(vec![5, 6, 2]);
+    t.push(vec![2]);
+    t.clone_from(&v);
+    assert_eq!(&t, &reference[..]);
+    t.clear();
+    t.clone_from(&v);
+    assert_eq!(&t, &reference[..]);
+}
+
+#[cfg(feature="std")]
+#[test]
+fn test_string() {
+    use std::error::Error;
+
+    let text = "hello world";
+    let mut s = ArrayString::<[_; 16]>::new();
+    s.try_push_str(text).unwrap();
+    assert_eq!(&s, text);
+    assert_eq!(text, &s);
+
+    // Make sure Hash / Eq / Borrow match up so we can use HashMap
+    let mut map = HashMap::new();
+    map.insert(s, 1);
+    assert_eq!(map[text], 1);
+
+    let mut t = ArrayString::<[_; 2]>::new();
+    assert!(t.try_push_str(text).is_err());
+    assert_eq!(&t, "");
+
+    t.push_str("ab");
+    // DerefMut
+    let tmut: &mut str = &mut t;
+    assert_eq!(tmut, "ab");
+
+    // Test Error trait / try
+    let t = || -> Result<(), Box<dyn Error>> {
+        let mut t = ArrayString::<[_; 2]>::new();
+        t.try_push_str(text)?;
+        Ok(())
+    }();
+    assert!(t.is_err());
+}
+
+#[test]
+fn test_string_from() {
+    let text = "hello world";
+	// Test `from` constructor
+    let u = ArrayString::<[_; 11]>::from(text).unwrap();
+    assert_eq!(&u, text);
+    assert_eq!(u.len(), text.len());
+}
+
+#[test]
+fn test_string_parse_from_str() {
+    let text = "hello world";
+    let u: ArrayString<[_; 11]> = text.parse().unwrap();
+    assert_eq!(&u, text);
+    assert_eq!(u.len(), text.len());
+}
+
+#[test]
+fn test_string_from_bytes() {
+    let text = "hello world";
+    let u = ArrayString::from_byte_string(b"hello world").unwrap();
+    assert_eq!(&u, text);
+    assert_eq!(u.len(), text.len());
+}
+
+#[test]
+fn test_string_clone() {
+    let text = "hi";
+    let mut s = ArrayString::<[_; 4]>::new();
+    s.push_str("abcd");
+    let t = ArrayString::<[_; 4]>::from(text).unwrap();
+    s.clone_from(&t);
+    assert_eq!(&t, &s);
+}
+
+#[test]
+fn test_string_push() {
+    let text = "abcαβγ";
+    let mut s = ArrayString::<[_; 8]>::new();
+    for c in text.chars() {
+        if let Err(_) = s.try_push(c) {
+            break;
+        }
+    }
+    assert_eq!("abcαβ", &s[..]);
+    s.push('x');
+    assert_eq!("abcαβx", &s[..]);
+    assert!(s.try_push('x').is_err());
+}
+
+
+#[test]
+fn test_insert_at_length() {
+    let mut v = ArrayVec::<[_; 8]>::new();
+    let result1 = v.try_insert(0, "a");
+    let result2 = v.try_insert(1, "b");
+    assert!(result1.is_ok() && result2.is_ok());
+    assert_eq!(&v[..], &["a", "b"]);
+}
+
+#[should_panic]
+#[test]
+fn test_insert_out_of_bounds() {
+    let mut v = ArrayVec::<[_; 8]>::new();
+    let _ = v.try_insert(1, "test");
+}
+
+/*
+ * insert that pushes out the last
+    let mut u = ArrayVec::from([1, 2, 3, 4]);
+    let ret = u.try_insert(3, 99);
+    assert_eq!(&u[..], &[1, 2, 3, 99]);
+    assert_matches!(ret, Err(_));
+    let ret = u.try_insert(4, 77);
+    assert_eq!(&u[..], &[1, 2, 3, 99]);
+    assert_matches!(ret, Err(_));
+*/
+
+#[test]
+fn test_drop_in_insert() {
+    use std::cell::Cell;
+
+    let flag = &Cell::new(0);
+
+    struct Bump<'a>(&'a Cell<i32>);
+
+    impl<'a> Drop for Bump<'a> {
+        fn drop(&mut self) {
+            let n = self.0.get();
+            self.0.set(n + 1);
+        }
+    }
+
+    flag.set(0);
+
+    {
+        let mut array = ArrayVec::<[_; 2]>::new();
+        array.push(Bump(flag));
+        array.insert(0, Bump(flag));
+        assert_eq!(flag.get(), 0);
+        let ret = array.try_insert(1, Bump(flag));
+        assert_eq!(flag.get(), 0);
+        assert_matches!(ret, Err(_));
+        drop(ret);
+        assert_eq!(flag.get(), 1);
+    }
+    assert_eq!(flag.get(), 3);
+}
+
+#[test]
+fn test_pop_at() {
+    let mut v = ArrayVec::<[String; 4]>::new();
+    let s = String::from;
+    v.push(s("a"));
+    v.push(s("b"));
+    v.push(s("c"));
+    v.push(s("d"));
+
+    assert_eq!(v.pop_at(4), None);
+    assert_eq!(v.pop_at(1), Some(s("b")));
+    assert_eq!(v.pop_at(1), Some(s("c")));
+    assert_eq!(v.pop_at(2), None);
+    assert_eq!(&v[..], &["a", "d"]);
+}
+
+#[test]
+fn test_sizes() {
+    let v = ArrayVec::from([0u8; 1 << 16]);
+    assert_eq!(vec![0u8; v.len()], &v[..]);
+}
+
+#[test]
+fn test_default() {
+    use std::net;
+    let s: ArrayString<[u8; 4]> = Default::default();
+    // Something without `Default` implementation.
+    let v: ArrayVec<[net::TcpStream; 4]> = Default::default();
+    assert_eq!(s.len(), 0);
+    assert_eq!(v.len(), 0);
+}
+
+#[cfg(feature="array-sizes-33-128")]
+#[test]
+fn test_sizes_33_128() {
+    ArrayVec::from([0u8; 52]);
+    ArrayVec::from([0u8; 127]);
+}
+
+#[cfg(feature="array-sizes-129-255")]
+#[test]
+fn test_sizes_129_255() {
+    ArrayVec::from([0u8; 237]);
+    ArrayVec::from([0u8; 255]);
+}
+
+#[test]
+fn test_extend_zst() {
+    let mut range = 0..10;
+    #[derive(Copy, Clone, PartialEq, Debug)]
+    struct Z; // Zero sized type
+
+    let mut array: ArrayVec<[_; 5]> = range.by_ref().map(|_| Z).collect();
+    assert_eq!(&array[..], &[Z; 5]);
+    assert_eq!(range.next(), Some(5));
+
+    array.extend(range.by_ref().map(|_| Z));
+    assert_eq!(range.next(), Some(6));
+
+    let mut array: ArrayVec<[_; 10]> = (0..3).map(|_| Z).collect();
+    assert_eq!(&array[..], &[Z; 3]);
+    array.extend((3..5).map(|_| Z));
+    assert_eq!(&array[..], &[Z; 5]);
+    assert_eq!(array.len(), 5);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+extern crate cc;
+
+use std::env;
+
+fn main() {
+    match env::var("CARGO_CFG_TARGET_OS").unwrap_or_default().as_str() {
+        "android" => build_android(),
+        _ => {}
+    }
+}
+
+fn build_android() {
+    let expansion = match cc::Build::new().file("src/android-api.c").try_expand() {
+        Ok(result) => result,
+        Err(e) => {
+            println!("failed to run C compiler: {}", e);
+            return;
+        }
+    };
+    let expansion = match std::str::from_utf8(&expansion) {
+        Ok(s) => s,
+        Err(_) => return,
+    };
+    println!("expanded android version detection:\n{}", expansion);
+    let marker = "APIVERSION";
+    let i = match expansion.find(marker) {
+        Some(i) => i,
+        None => return,
+    };
+    let version = match expansion[i + marker.len() + 1..].split_whitespace().next() {
+        Some(s) => s,
+        None => return,
+    };
+    let version = match version.parse::<u32>() {
+        Ok(n) => n,
+        Err(_) => return,
+    };
+    if version >= 21 {
+        println!("cargo:rustc-cfg=feature=\"dl_iterate_phdr\"");
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"ac04d177404376ed5c4885a969ba9b5916d8039c4713ff7b5e4329e6df10499c","Cargo.toml":"140ddaaa350140e4b1573114737030119bb02f250f04737f08e3dd696ac364cb","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"5687e5510407cbcf02f4afe23a226f02c4a5c2140d2cf181929bf3094c3dba94","benches/benchmarks.rs":"029b78bb79052ec940eecfd18067b743925189202fc16015d3c4c25b05eb6d67","ci/android-ndk.sh":"89fafa41d08ff477f949bfc163d04d1eb34fdee370f7a695cfba4ef34c164a55","ci/android-sdk.sh":"69a953f70f32064d1d2a57c7082a50336b90a12d10c75e5416dbb1d6d718016c","ci/docker/aarch64-linux-android/Dockerfile":"1058f2ee9cf74b4c51a489e62544bea94c6cd537ad5c1b056f3e4b262f7e09f2","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"a7b7aae0d8e2f826cf1c6c7c3160f8e5e9a30478b83c394b6575ce15b0ff0802","ci/docker/arm-linux-androideabi/Dockerfile":"12f8c62f0750d3581292b23309f5aef15492c946a73e55df13bc345de5ca576e","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"5156382ff639b11801c1bd7ddc6e03e8834505a74ecf7160e92182603cd5d96f","ci/docker/armv7-linux-androideabi/Dockerfile":"7c582c2a4b162b147deada3194a30185ccb7a01215f97990cd1a5a3460c30fb9","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"4aaceef14ba700ea3719fe30fcb46f1bb154a47aa52cdb64fa6ed7eff96d6c85","ci/docker/i586-unknown-linux-gnu/Dockerfile":"0816c89b79a74be7ccfc34e95cd718ce29a8698a2ab56903b4b0712470f5c8bb","ci/docker/i686-linux-android/Dockerfile":"18957e8dad4c6d9c8ad561f846e20f6e2186ff7a8421f2a0089793b510f66fe2","ci/docker/i686-unknown-linux-gnu/Dockerfile":"0816c89b79a74be7ccfc34e95cd718ce29a8698a2ab56903b4b0712470f5c8bb","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"270de99179c925e6284a8283fdb4e40a8c813a569b24930d6cfe79a4c470ab61","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"4aa8ca641efd2f1937ef669eda2f3e357b2fb926911722b3afc6cf25ce4bcac2","ci/docker/x86_64-linux-android/Dockerfile":"e6d6fb37041a9d6fc6771be1ae8d1eaa506a1dc8796170c1ffcc3d6dd043bed2","ci/docker/x86_64-pc-windows-gnu/Dockerfile":"654988c5c008610f90d5159a8dd0ab6fd491e9c0d16ad65b03ef53f694a5400c","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"b5f4707ae5b0bc24aee535dc11d49eb7b3f01a8cabf83992fd2aec2bc8aba501","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"4db3cb7d315588f363eb9f377bf1c27d8e8886c07b6c0d0c5cf7ee91114a718b","ci/miri-rustup.sh":"d7d5412b2fad72dad9e6a73ef258902186e677090110ba10ab00a8daeb114375","ci/run-docker.sh":"c4efad39c65a38c89e90d61a9ef15136903dd4cf01a6ae8079aa005b882d751e","ci/run.sh":"0bb5c8256019779f3e1db20fcc2c01416ffd4679428f3e395ef5f3e55d2d642c","ci/runtest-android.rs":"be2e49bb296b92a8e3643a6c0a70917fe7b130fa43b71a29c4e7514f45c00e7e","examples/backtrace.rs":"5da0c95ccebfaffbbe7b5a92b0e488017dc375cbb5b8fb2b7712dd65b2dfb2ba","examples/raw.rs":"575ec6037f597ba7ab0eaf9dd699fadfabef918ba2affea7dc20cdbde55de5ec","src/backtrace/dbghelp.rs":"f89671bc3e9403640ce61bc9b6400f2193ae82698b503c3d8b892aa767a812c9","src/backtrace/libunwind.rs":"be4dcb03ca87b479eb12fe8c5b2ef8e0a3aafdfa1ffb16495b7038deede634e0","src/backtrace/miri.rs":"bc4eb816d2d141f6bf4fe9173cd79a281fcfa9b88b5e7d616645f4a2ccbb24e3","src/backtrace/mod.rs":"c763f0178809c48cd477b5aa4c86e8e2bd84f26fa73968738d46698c75e1c071","src/backtrace/noop.rs":"a8550b70b3c83f6852a1dba83cf97b1325238b5aa3ce7b35437e9382cdafd924","src/capture.rs":"5aaaab9aa82de431f9b4795befe7363461f26e78c49da763692dfdc34104c2f7","src/dbghelp.rs":"a870891dc3d0a7cbe232a0ac142408cb7e6c371f300297b1fba35066c35632e4","src/lib.rs":"e866aea1c4c2f52dc7a7a8b099d7026216d30c44108e2ed4c7e6e5b0ae97598a","src/print.rs":"766affbd9d2242a81d85067413dd95b807425a6df2fffb17a4eacc5f606d4200","src/print/fuchsia.rs":"515f7df603a8f918f3edfb8d1379f4f1d0e8dfbf0d84f0c8bd37c2bb9b707b22","src/symbolize/dbghelp.rs":"551c690bd4c0faada7ef1dbd0671fb65446235388f4540e021c878e65490c39c","src/symbolize/gimli.rs":"3f24099edb6b2cf71780df2e3e21f360645adbda99452bb329ff11a01c7b1599","src/symbolize/gimli/coff.rs":"bb67eb38e9c1a409a4ed38cf7e5cbbc6bd6cff1cd36aa3454136734bbfd1ac7d","src/symbolize/gimli/elf.rs":"7d742649d29675f624800c080a4ca0262dc006e1ac8a527d9a47707bc9e4b18c","src/symbolize/gimli/macho.rs":"de7955dc4cbe098e67b269882cc8d3428e13bfb2fb5dadc2a6514ca115145aba","src/symbolize/gimli/mmap_fake.rs":"9564fcf47000e70d521b31518e205c8e6ee09b7410fb1eb1e452721757ff54ba","src/symbolize/gimli/mmap_unix.rs":"8e902fd4200abce270257a571268a711819077acb19ffe9e090a58209c97e7df","src/symbolize/gimli/mmap_windows.rs":"a7de17bb97e9740fd2ebae971851f93b36f2f961c084a103d8ee80bf13093e00","src/symbolize/gimli/stash.rs":"8e8673403133e9375a701cc871261db2f49d33f478224a4933034a79a0375c3e","src/symbolize/libbacktrace.rs":"5f0c8017cc2aef5908e6a2008241a1a711cd24a2daf1eec678a2f4b49817210f","src/symbolize/miri.rs":"f484cc7886828307278cd155f426f8cd6462442e178fd4c0b2a41890877bb768","src/symbolize/mod.rs":"880855477d7e1fe217c27e1a9d0b77e30a4f73ff97f62928c71fc5aced65f80b","src/symbolize/noop.rs":"ca1400e8a6c8ea8ed210efcf346c8f97cd891a2ab9cc353ff1fcad01d71f4a14","src/types.rs":"f43c94b99d57ca66a5cfe939a46016c95b2d69d82695fb52480f7a3e5b344fd9","src/windows.rs":"46f02837a2e6b404a035993f2e1f03cdfc1a5a872c1feb92926566a31138d273","tests/accuracy/auxiliary.rs":"71d2238da401042e007ef5ee20336d6834724bae96d93c8c52d11a5a332d7d34","tests/accuracy/main.rs":"2363436cfba585f4f96e984cff6ca52c81587c3552f2d6207c2aa6d48ce02eec","tests/concurrent-panics.rs":"7696676e46a1c50a3a88446fdc59c0dedfb81ded24d77ec725f7cc101a5d8fe6","tests/long_fn_name.rs":"ebef58e34543ed4d47048faa9b6525f68fc71e12255af734523a513c5d4baa6f","tests/skip_inner_frames.rs":"7560fe59e83e4b234789c448da5504d3dd9065f9ad1b2615f12606f9112df4e0","tests/smoke.rs":"fcba716e2e56b37d52b88f9762ebaf899c991d587892090c2680ec9bdbd8c42e"},"package":"ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"}
\ No newline at end of file
+{"files":{"Cargo.lock":"8cfc500f5ff19bcd5b47e919af09b26ef2f5afa51c99a3addbe853de50c13517","Cargo.toml":"68a26761ba2504de2a1e178fe707bb7a095703e7776f8a95705fcee1452c88b5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"6007ea91612793f8c77d499d2065acd2255fc5f3c3268fd8bd1ae5f7bb40d6de","benches/benchmarks.rs":"029b78bb79052ec940eecfd18067b743925189202fc16015d3c4c25b05eb6d67","build.rs":"8d5e860da109f86c67596b10b5613ff6d19f9d24c2970f491a55261fb1973692","ci/android-ndk.sh":"89fafa41d08ff477f949bfc163d04d1eb34fdee370f7a695cfba4ef34c164a55","ci/android-sdk.sh":"69a953f70f32064d1d2a57c7082a50336b90a12d10c75e5416dbb1d6d718016c","ci/debuglink-docker.sh":"3a16131df8c69fef37331cb6f01a6623d169177474f475159d05bab61df077a9","ci/debuglink.sh":"164a961b930de8c9aedf45a11076c3d41081846a8e6a9566ba2b6ad615179e0b","ci/docker/aarch64-linux-android/Dockerfile":"1058f2ee9cf74b4c51a489e62544bea94c6cd537ad5c1b056f3e4b262f7e09f2","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"a7b7aae0d8e2f826cf1c6c7c3160f8e5e9a30478b83c394b6575ce15b0ff0802","ci/docker/arm-linux-androideabi/Dockerfile":"12f8c62f0750d3581292b23309f5aef15492c946a73e55df13bc345de5ca576e","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"5156382ff639b11801c1bd7ddc6e03e8834505a74ecf7160e92182603cd5d96f","ci/docker/armv7-linux-androideabi/Dockerfile":"7c582c2a4b162b147deada3194a30185ccb7a01215f97990cd1a5a3460c30fb9","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"4aaceef14ba700ea3719fe30fcb46f1bb154a47aa52cdb64fa6ed7eff96d6c85","ci/docker/i586-unknown-linux-gnu/Dockerfile":"0816c89b79a74be7ccfc34e95cd718ce29a8698a2ab56903b4b0712470f5c8bb","ci/docker/i686-linux-android/Dockerfile":"18957e8dad4c6d9c8ad561f846e20f6e2186ff7a8421f2a0089793b510f66fe2","ci/docker/i686-unknown-linux-gnu/Dockerfile":"0816c89b79a74be7ccfc34e95cd718ce29a8698a2ab56903b4b0712470f5c8bb","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"270de99179c925e6284a8283fdb4e40a8c813a569b24930d6cfe79a4c470ab61","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"4aa8ca641efd2f1937ef669eda2f3e357b2fb926911722b3afc6cf25ce4bcac2","ci/docker/x86_64-linux-android/Dockerfile":"e6d6fb37041a9d6fc6771be1ae8d1eaa506a1dc8796170c1ffcc3d6dd043bed2","ci/docker/x86_64-pc-windows-gnu/Dockerfile":"654988c5c008610f90d5159a8dd0ab6fd491e9c0d16ad65b03ef53f694a5400c","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"9f89f080551fff6678b1efcc0925fc8c16316f69cdd150e89f9e95cdab583510","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"4db3cb7d315588f363eb9f377bf1c27d8e8886c07b6c0d0c5cf7ee91114a718b","ci/miri-rustup.sh":"d7d5412b2fad72dad9e6a73ef258902186e677090110ba10ab00a8daeb114375","ci/run-docker.sh":"70760696a608b0d89eb3dcc4b08f176d709dd9f98e50297f2b7e0bb9b0f3b458","ci/run.sh":"0bb5c8256019779f3e1db20fcc2c01416ffd4679428f3e395ef5f3e55d2d642c","ci/runtest-android.rs":"be2e49bb296b92a8e3643a6c0a70917fe7b130fa43b71a29c4e7514f45c00e7e","examples/backtrace.rs":"5da0c95ccebfaffbbe7b5a92b0e488017dc375cbb5b8fb2b7712dd65b2dfb2ba","examples/raw.rs":"575ec6037f597ba7ab0eaf9dd699fadfabef918ba2affea7dc20cdbde55de5ec","src/android-api.c":"b75f16de578451464f49b83dc817b76aa9a0be0d86ea71d1659cc78f99e94fbd","src/backtrace/dbghelp.rs":"f89671bc3e9403640ce61bc9b6400f2193ae82698b503c3d8b892aa767a812c9","src/backtrace/libunwind.rs":"be4dcb03ca87b479eb12fe8c5b2ef8e0a3aafdfa1ffb16495b7038deede634e0","src/backtrace/miri.rs":"bc4eb816d2d141f6bf4fe9173cd79a281fcfa9b88b5e7d616645f4a2ccbb24e3","src/backtrace/mod.rs":"d304c16eb29cdea85110a15bd222d3eba2fc46b17513feab441b9ebb49461aea","src/backtrace/noop.rs":"a8550b70b3c83f6852a1dba83cf97b1325238b5aa3ce7b35437e9382cdafd924","src/capture.rs":"8701657803f04ea9e0b9dd6a4ca619761edb8a42cfd2f7c9c9e4ee31d9357159","src/dbghelp.rs":"40891588891fe48c16263374a36092ac3e67ddf4f756b880839f31dfcb80b7c4","src/lib.rs":"5f9cdd7910a355eb9ab64418014e4379712588237235d601f177c8dc6130b96a","src/print.rs":"766affbd9d2242a81d85067413dd95b807425a6df2fffb17a4eacc5f606d4200","src/print/fuchsia.rs":"515f7df603a8f918f3edfb8d1379f4f1d0e8dfbf0d84f0c8bd37c2bb9b707b22","src/symbolize/dbghelp.rs":"58aeda764a27702e0abb3af62bae8a162d8b6cb8c80ffd141ee794d81a8ace15","src/symbolize/gimli.rs":"26ac88bab08ba62cb5707110056843c4d611fac75c1120af7685209584961138","src/symbolize/gimli/coff.rs":"d3f4a274bd3b2ed81d114a9326630c019f682ca91aac6ec31e660f420c35b064","src/symbolize/gimli/elf.rs":"3445558fc1feed60165af55e07847c59c3eca5e4031f50b04329fc5be36eb057","src/symbolize/gimli/libs_dl_iterate_phdr.rs":"8f7dabbdff97e5a24f0d5b3670469840666a91e9971ac352abeb4e96d98a2a6c","src/symbolize/gimli/libs_haiku.rs":"0a0d4b37145e898f7068cadacccf362d8216e463e7026af2ce38d75ebfd74bea","src/symbolize/gimli/libs_illumos.rs":"523e96272b46bdaab2abb0dd0201cb8032bf86558cbed986a20d7e2cc02fa8be","src/symbolize/gimli/libs_libnx.rs":"4116eceadb2d9916d4f5602712eacec647f185d4c53c723aced8de5fc471b14d","src/symbolize/gimli/libs_macos.rs":"a0d6edf8f3af23523d1a63a12ef6a6dd9ad1057b2cb20cc405da0544daba5389","src/symbolize/gimli/libs_windows.rs":"6459f8610ca1a0fd7456539ec604f5276c94b3d0d7331357eaed338e49220a02","src/symbolize/gimli/macho.rs":"a918539adce8fcc5ae8e42d3674b7f1f6ee13c5929fca25f0c1d58ac289cbb4c","src/symbolize/gimli/mmap_fake.rs":"9564fcf47000e70d521b31518e205c8e6ee09b7410fb1eb1e452721757ff54ba","src/symbolize/gimli/mmap_unix.rs":"8159a4a807bd5692412ba1a280bb36ab942c06e904f37a92e2545f0b4211308a","src/symbolize/gimli/mmap_windows.rs":"1ca715317c1054968d92350438b293f800bae2174f395b20bc43a633d757fe8f","src/symbolize/gimli/stash.rs":"67d01016b17ca4c0adbb0827da9b83fde5f79ccc89db3e4fd769ab03c1248d8e","src/symbolize/miri.rs":"f5201cc8a7de24ad3424d2472cb0af59cd28563d09cc0c21e998f4cee4367ade","src/symbolize/mod.rs":"a42b300ecb92347bc805169fdb0ee4387a8c29f6925faf6d81c6850039298eb8","src/symbolize/noop.rs":"5d4432079b8ae2b9382945a57ae43df57bb4b7ed2e5956d4167e051a44567388","src/types.rs":"f43c94b99d57ca66a5cfe939a46016c95b2d69d82695fb52480f7a3e5b344fd9","src/windows.rs":"46f02837a2e6b404a035993f2e1f03cdfc1a5a872c1feb92926566a31138d273","tests/accuracy/auxiliary.rs":"71d2238da401042e007ef5ee20336d6834724bae96d93c8c52d11a5a332d7d34","tests/accuracy/main.rs":"f8e42aeeb50b35fca380db2e9fe52820cc0bc3133167289c5710e3290701e78e","tests/concurrent-panics.rs":"7696676e46a1c50a3a88446fdc59c0dedfb81ded24d77ec725f7cc101a5d8fe6","tests/long_fn_name.rs":"ebef58e34543ed4d47048faa9b6525f68fc71e12255af734523a513c5d4baa6f","tests/skip_inner_frames.rs":"7560fe59e83e4b234789c448da5504d3dd9065f9ad1b2615f12606f9112df4e0","tests/smoke.rs":"33014495f9158aea2d0ee2ee3335ffe82105c7ed894f96eaf7d23845a60f7439"},"package":"e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
-version = "0.14.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
+checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
 name = "adler"
-version = "0.2.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "autocfg"
@@ -23,10 +25,10 @@
 
 [[package]]
 name = "backtrace"
-version = "0.3.55"
+version = "0.3.61"
 dependencies = [
  "addr2line",
- "backtrace-sys",
+ "cc",
  "cfg-if",
  "cpp_demangle",
  "libc",
@@ -40,20 +42,10 @@
 ]
 
 [[package]]
-name = "backtrace-sys"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
 name = "cc"
-version = "1.0.61"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
+checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
 
 [[package]]
 name = "cfg-if"
@@ -63,9 +55,9 @@
 
 [[package]]
 name = "cpp_demangle"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6656dbc7c586cf2965887c3d066d9b983b20400bc2d52ed4cc5e33d0ceb2c602"
+checksum = "44919ecaf6f99e8e737bc239408931c9a01e9a6c74814fee8242dd2506b65390"
 dependencies = [
  "cfg-if",
  "glob",
@@ -73,9 +65,9 @@
 
 [[package]]
 name = "gimli"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
 
 [[package]]
 name = "glob"
@@ -85,25 +77,31 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
 
 [[package]]
 name = "libloading"
-version = "0.6.5"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1090080fe06ec2648d0da3881d9453d97e71a45f00eb179af7fdd7e3f686fdb0"
+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
 dependencies = [
  "cfg-if",
  "winapi",
 ]
 
 [[package]]
+name = "memchr"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+
+[[package]]
 name = "miniz_oxide"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
  "autocfg",
@@ -111,33 +109,36 @@
 
 [[package]]
 name = "object"
-version = "0.22.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce"
 
 [[package]]
 name = "rustc-serialize"
@@ -147,18 +148,18 @@
 
 [[package]]
 name = "serde"
-version = "1.0.117"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.117"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +168,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.48"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -178,9 +179,9 @@
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "winapi"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,8 +13,9 @@
 [package]
 edition = "2018"
 name = "backtrace"
-version = "0.3.55"
+version = "0.3.61"
 authors = ["The Rust Project Developers"]
+build = "build.rs"
 autoexamples = true
 autotests = true
 description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"
@@ -47,7 +48,7 @@
 
 [[test]]
 name = "accuracy"
-required-features = ["std", "gimli-symbolize"]
+required-features = ["std"]
 edition = "2018"
 
 [[test]]
@@ -55,15 +56,9 @@
 harness = false
 required-features = ["std"]
 [dependencies.addr2line]
-version = "0.14.0"
-optional = true
+version = "0.16.0"
 default-features = false
 
-[dependencies.backtrace-sys]
-version = "0.1.35"
-optional = true
-default_features = false
-
 [dependencies.cfg-if]
 version = "1.0"
 
@@ -73,18 +68,16 @@
 default-features = false
 
 [dependencies.libc]
-version = "0.2.45"
+version = "0.2.94"
 default-features = false
 
 [dependencies.miniz_oxide]
 version = "0.4.0"
-optional = true
 default-features = false
 
 [dependencies.object]
-version = "0.22"
+version = "0.26.0"
 features = ["read_core", "elf", "macho", "pe", "unaligned", "archive"]
-optional = true
 default-features = false
 
 [dependencies.rustc-demangle]
@@ -99,16 +92,18 @@
 features = ["derive"]
 optional = true
 [dev-dependencies.libloading]
-version = "0.6"
+version = "0.7"
+[build-dependencies.cc]
+version = "1.0.67"
 
 [features]
 coresymbolication = []
 dbghelp = []
-default = ["std", "gimli-symbolize"]
+default = ["std"]
 dladdr = []
-gimli-symbolize = ["addr2line", "miniz_oxide", "object"]
+gimli-symbolize = []
 kernel32 = []
-libbacktrace = ["backtrace-sys/backtrace-sys"]
+libbacktrace = []
 libunwind = []
 serialize-rustc = ["rustc-serialize"]
 serialize-serde = ["serde"]
@@ -116,5 +111,5 @@
 unix-backtrace = []
 verify-winapi = ["winapi/dbghelp", "winapi/handleapi", "winapi/libloaderapi", "winapi/memoryapi", "winapi/minwindef", "winapi/processthreadsapi", "winapi/synchapi", "winapi/tlhelp32", "winapi/winbase", "winapi/winnt"]
 [target."cfg(windows)".dependencies.winapi]
-version = "0.3.3"
+version = "0.3.9"
 optional = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/ci/debuglink-docker.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/ci/debuglink-docker.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/ci/debuglink-docker.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/ci/debuglink-docker.sh	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,29 @@
+# Small script to run debuglink tests inside a docker image.
+# Creates a writable mount on /usr/lib/debug.
+
+set -ex
+
+run() {
+    cargo generate-lockfile --manifest-path crates/debuglink/Cargo.toml
+    mkdir -p target crates/debuglink/target debug
+    docker build -t backtrace -f ci/docker/$1/Dockerfile ci
+    docker run \
+      --user `id -u`:`id -g` \
+      --rm \
+      --init \
+      --volume $(dirname $(dirname `which cargo`)):/cargo \
+      --env CARGO_HOME=/cargo \
+      --volume `rustc --print sysroot`:/rust:ro \
+      --env TARGET=$1 \
+      --volume `pwd`:/checkout:ro \
+      --volume `pwd`/target:/checkout/crates/debuglink/target \
+      --workdir /checkout \
+      --volume `pwd`/debug:/usr/lib/debug \
+      --privileged \
+      --env RUSTFLAGS \
+      backtrace \
+      bash \
+      -c 'PATH=$PATH:/rust/bin exec ci/debuglink.sh'
+}
+
+run x86_64-unknown-linux-gnu
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/ci/debuglink.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/ci/debuglink.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/ci/debuglink.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/ci/debuglink.sh	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Debuglink tests.
+# We build crates/debuglink and then move its debuginfo around
+# and test that it can still find the debuginfo.
+
+set -ex
+
+cratedir=`pwd`/crates/debuglink
+exefile=crates/debuglink/target/debug/debuglink
+
+# Baseline; no separate debug
+cargo build --manifest-path crates/debuglink/Cargo.toml
+$exefile $cratedir
+
+# Separate debug in same dir
+debugfile1=`dirname $exefile`/debuglink.debug
+objcopy --only-keep-debug $exefile $debugfile1
+strip -g $exefile
+(cd `dirname $exefile` && objcopy --add-gnu-debuglink=debuglink.debug debuglink)
+$exefile $cratedir
+
+# Separate debug in .debug subdir
+debugfile2=`dirname $exefile`/.debug/debuglink.debug
+mkdir -p `dirname $debugfile2`
+mv $debugfile1 $debugfile2
+$exefile $cratedir
+
+# Separate debug in /usr/lib/debug subdir
+debugfile3="/usr/lib/debug/$cratedir/target/debug/debuglink.debug"
+mkdir -p `dirname $debugfile3`
+mv $debugfile2 $debugfile3
+$exefile $cratedir
+
+# Separate debug in /usr/lib/debug/.build-id subdir
+id=`readelf -n $exefile | grep '^    Build ID: [0-9a-f]' | cut -b 15-`
+idfile="/usr/lib/debug/.build-id/${id:0:2}/${id:2}.debug"
+mkdir -p `dirname $idfile`
+mv $debugfile3 $idfile
+$exefile $cratedir
+
+# Replace idfile with a symlink (this is the usual arrangement)
+mv $idfile $debugfile3
+ln -s $debugfile3 $idfile
+$exefile $cratedir
+
+# Supplementary object file using relative path
+dwzfile="/usr/lib/debug/.dwz/debuglink.debug"
+mkdir -p `dirname $dwzfile`
+cp $debugfile3 $debugfile3.copy
+dwz -m $dwzfile -rh $debugfile3 $debugfile3.copy
+rm $debugfile3.copy
+$exefile $cratedir
+
+# Supplementary object file using build ID
+dwzid=`readelf -n $dwzfile | grep '^    Build ID: [0-9a-f]' | cut -b 15-`
+dwzidfile="/usr/lib/debug/.build-id/${dwzid:0:2}/${dwzid:2}.debug"
+mkdir -p `dirname $dwzidfile`
+mv $dwzfile $dwzidfile
+$exefile $cratedir
+mv $dwzidfile $dwzfile
+
+# Missing debug should fail
+mv $debugfile3 $debugfile3.tmp
+! $exefile $cratedir
+mv $debugfile3.tmp $debugfile3
+
+# Missing dwz should fail
+mv $dwzfile $dwzfile.tmp
+! $exefile $cratedir
+mv $dwzfile.tmp $dwzfile
+
+# Cleanup
+rm $idfile $debugfile3 $dwzfile
+echo Success
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile	2021-12-09 12:01:26.000000000 +0000
@@ -2,4 +2,5 @@
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc \
   libc6-dev \
-  ca-certificates
+  ca-certificates \
+  dwz
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/ci/run-docker.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/ci/run-docker.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/ci/run-docker.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/ci/run-docker.sh	2021-12-09 12:01:26.000000000 +0000
@@ -18,6 +18,7 @@
       --volume `pwd`/target:/checkout/target \
       --workdir /checkout \
       --privileged \
+      --env RUSTFLAGS \
       backtrace \
       bash \
       -c 'PATH=$PATH:/rust/bin exec ci/run.sh'
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -60,9 +60,9 @@
 This project is licensed under either of
 
  * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
+   https://www.apache.org/licenses/LICENSE-2.0)
  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
+   https://opensource.org/licenses/MIT)
 
 at your option.
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/android-api.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/android-api.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/android-api.c	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/android-api.c	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,4 @@
+// Used from the build script to detect the value of the `__ANDROID_API__`
+// builtin #define
+
+APIVERSION __ANDROID_API__
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/backtrace/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/backtrace/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/backtrace/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/backtrace/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -152,6 +152,7 @@
         mod dbghelp;
         use self::dbghelp::trace as trace_imp;
         pub(crate) use self::dbghelp::Frame as FrameImp;
+        #[cfg(target_env = "msvc")] // only used in dbghelp symbolize
         pub(crate) use self::dbghelp::StackFrame;
     } else {
         mod noop;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/capture.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/capture.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/capture.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/capture.rs	2021-12-09 12:01:26.000000000 +0000
@@ -249,6 +249,15 @@
     }
 }
 
+impl From<crate::Frame> for BacktraceFrame {
+    fn from(frame: crate::Frame) -> BacktraceFrame {
+        BacktraceFrame {
+            frame: Frame::Raw(frame),
+            symbols: None,
+        }
+    }
+}
+
 impl Into<Vec<BacktraceFrame>> for Backtrace {
     fn into(self) -> Vec<BacktraceFrame> {
         self.frames
@@ -472,12 +481,10 @@
 
 #[cfg(feature = "serde")]
 mod serde_impls {
-    extern crate serde;
-
-    use self::serde::de::Deserializer;
-    use self::serde::ser::Serializer;
-    use self::serde::{Deserialize, Serialize};
     use super::*;
+    use serde::de::Deserializer;
+    use serde::ser::Serializer;
+    use serde::{Deserialize, Serialize};
 
     #[derive(Serialize, Deserialize)]
     struct SerializedFrame {
@@ -520,3 +527,29 @@
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_frame_conversion() {
+        let mut frames = vec![];
+        crate::trace(|frame| {
+            let converted = BacktraceFrame::from(frame.clone());
+            frames.push(converted);
+            true
+        });
+
+        let mut manual = Backtrace::from(frames);
+        manual.resolve();
+        let frames = manual.frames();
+
+        for frame in frames {
+            println!("{:?}", frame.ip());
+            println!("{:?}", frame.symbol_address());
+            println!("{:?}", frame.module_base_address());
+            println!("{:?}", frame.symbols());
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/dbghelp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/dbghelp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/dbghelp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/dbghelp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,30 +34,12 @@
 mod dbghelp {
     use crate::windows::*;
     pub use winapi::um::dbghelp::{
-        StackWalk64, SymCleanup, SymFromAddrW, SymFunctionTableAccess64, SymGetLineFromAddrW64,
-        SymGetModuleBase64, SymInitializeW,
+        StackWalk64, StackWalkEx, SymCleanup, SymFromAddrW, SymFunctionTableAccess64,
+        SymGetLineFromAddrW64, SymGetModuleBase64, SymGetOptions, SymInitializeW, SymSetOptions,
     };
 
     extern "system" {
         // Not defined in winapi yet
-        pub fn SymGetOptions() -> u32;
-        pub fn SymSetOptions(_: u32);
-
-        // This is defined in winapi, but it's incorrect (FIXME winapi-rs#768)
-        pub fn StackWalkEx(
-            MachineType: DWORD,
-            hProcess: HANDLE,
-            hThread: HANDLE,
-            StackFrame: LPSTACKFRAME_EX,
-            ContextRecord: PVOID,
-            ReadMemoryRoutine: PREAD_PROCESS_MEMORY_ROUTINE64,
-            FunctionTableAccessRoutine: PFUNCTION_TABLE_ACCESS_ROUTINE64,
-            GetModuleBaseRoutine: PGET_MODULE_BASE_ROUTINE64,
-            TranslateAddress: PTRANSLATE_ADDRESS_ROUTINE64,
-            Flags: DWORD,
-        ) -> BOOL;
-
-        // Not defined in winapi yet
         pub fn SymFromInlineContextW(
             hProcess: HANDLE,
             Address: DWORD64,
@@ -176,7 +158,7 @@
 dbghelp! {
     extern "system" {
         fn SymGetOptions() -> DWORD;
-        fn SymSetOptions(options: DWORD) -> ();
+        fn SymSetOptions(options: DWORD) -> DWORD;
         fn SymInitializeW(
             handle: HANDLE,
             path: PCWSTR,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -40,6 +40,51 @@
 //! }
 //! # }
 //! ```
+//!
+//! # Backtrace accuracy
+//!
+//! This crate implements best-effort attempts to get the native backtrace. This
+//! is not always guaranteed to work, and some platforms don't return any
+//! backtrace at all. If your application requires accurate backtraces then it's
+//! recommended to closely evaluate this crate to see whether it's suitable
+//! for your use case on your target platforms.
+//!
+//! Even on supported platforms, there's a number of reasons that backtraces may
+//! be less-than-accurate, including but not limited to:
+//!
+//! * Unwind information may not be available. This crate primarily implements
+//!   backtraces by unwinding the stack, but not all functions may have
+//!   unwinding information (e.g. DWARF unwinding information).
+//!
+//! * Rust code may be compiled without unwinding information for some
+//!   functions. This can also happen for Rust code compiled with
+//!   `-Cpanic=abort`. You can remedy this, however, with
+//!   `-Cforce-unwind-tables` as a compiler option.
+//!
+//! * Unwind information may be inaccurate or corrupt. In the worst case
+//!   inaccurate unwind information can lead this library to segfault. In the
+//!   best case inaccurate information will result in a truncated stack trace.
+//!
+//! * Backtraces may not report filenames/line numbers correctly due to missing
+//!   or corrupt debug information. This won't lead to segfaults unlike corrupt
+//!   unwinding information, but missing or malformed debug information will
+//!   mean that filenames and line numbers will not be available. This may be
+//!   because debug information wasn't generated by the compiler, or it's just
+//!   missing on the filesystem.
+//!
+//! * Not all platforms are supported. For example there's no way to get a
+//!   backtrace on WebAssembly at the moment.
+//!
+//! * Crate features may be disabled. Currently this crate supports using Gimli
+//!   libbacktrace on non-Windows platforms for reading debuginfo for
+//!   backtraces. If both crate features are disabled, however, then these
+//!   platforms will generate a backtrace but be unable to generate symbols for
+//!   it.
+//!
+//! In most standard workflows for most standard platforms you generally don't
+//! need to worry about these caveats. We'll try to fix ones where we can over
+//! time, but otherwise it's important to be aware of the limitations of
+//! unwinding-based backtraces!
 
 #![doc(html_root_url = "https://docs.rs/backtrace")]
 #![deny(missing_docs)]
@@ -52,13 +97,17 @@
 // When we're building as part of libstd, silence all warnings since they're
 // irrelevant as this crate is developed out-of-tree.
 #![cfg_attr(backtrace_in_libstd, allow(warnings))]
+#![cfg_attr(not(feature = "std"), allow(dead_code))]
+// We know this is deprecated, it's only here for back-compat reasons.
+#![cfg_attr(feature = "rustc-serialize", allow(deprecated))]
 
 #[cfg(feature = "std")]
 #[macro_use]
 extern crate std;
 
-// This is only used for gimli right now, so silence warnings elsewhere.
-#[cfg_attr(not(target_os = "linux"), allow(unused_extern_crates))]
+// This is only used for gimli right now, which is only used on some platforms,
+// so don't worry if it's unused in other configurations.
+#[allow(unused_extern_crates)]
 extern crate alloc;
 
 pub use self::backtrace::{trace_unsynchronized, Frame};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/dbghelp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/dbghelp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/dbghelp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/dbghelp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -214,3 +214,5 @@
 
 #[cfg(not(feature = "std"))]
 unsafe fn cache(_filename: Option<*const [u16]>) {}
+
+pub unsafe fn clear_symbol_cache() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/coff.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/coff.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/coff.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/coff.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 use object::pe::{ImageDosHeader, ImageSymbol};
 use object::read::pe::{ImageNtHeaders, ImageOptionalHeader, SectionTable};
 use object::read::StringTable;
-use object::{Bytes, LittleEndian as LE};
+use object::LittleEndian as LE;
 
 #[cfg(target_pointer_width = "32")]
 type Pe = object::pe::ImageNtHeaders32;
@@ -13,30 +13,32 @@
 impl Mapping {
     pub fn new(path: &Path) -> Option<Mapping> {
         let map = super::mmap(path)?;
-        Mapping::mk(map, |data, stash| Context::new(stash, Object::parse(data)?))
+        Mapping::mk(map, |data, stash| {
+            Context::new(stash, Object::parse(data)?, None)
+        })
     }
 }
 
 pub struct Object<'a> {
-    data: Bytes<'a>,
+    data: &'a [u8],
     sections: SectionTable<'a>,
     symbols: Vec<(usize, &'a ImageSymbol)>,
     strings: StringTable<'a>,
 }
 
 pub fn get_image_base(data: &[u8]) -> Option<usize> {
-    let data = Bytes(data);
     let dos_header = ImageDosHeader::parse(data).ok()?;
-    let (nt_headers, _, _) = dos_header.nt_headers::<Pe>(data).ok()?;
+    let mut offset = dos_header.nt_headers_offset().into();
+    let (nt_headers, _) = Pe::parse(data, &mut offset).ok()?;
     usize::try_from(nt_headers.optional_header().image_base()).ok()
 }
 
 impl<'a> Object<'a> {
     fn parse(data: &'a [u8]) -> Option<Object<'a>> {
-        let data = Bytes(data);
         let dos_header = ImageDosHeader::parse(data).ok()?;
-        let (nt_headers, _, nt_tail) = dos_header.nt_headers::<Pe>(data).ok()?;
-        let sections = nt_headers.sections(nt_tail).ok()?;
+        let mut offset = dos_header.nt_headers_offset().into();
+        let (nt_headers, _) = Pe::parse(data, &mut offset).ok()?;
+        let sections = nt_headers.sections(data, offset).ok()?;
         let symtab = nt_headers.symbols(data).ok()?;
         let strings = symtab.strings();
         let image_base = usize::try_from(nt_headers.optional_header().image_base()).ok()?;
@@ -78,8 +80,7 @@
                 .section_by_name(self.strings, name.as_bytes())?
                 .1
                 .pe_data(self.data)
-                .ok()?
-                .0,
+                .ok()?,
         )
     }
 
@@ -101,7 +102,7 @@
         self.symbols[i].1.name(self.strings).ok()
     }
 
-    pub(super) fn search_object_map(&self, _addr: u64) -> Option<(&Context, u64)> {
+    pub(super) fn search_object_map(&self, _addr: u64) -> Option<(&Context<'_>, u64)> {
         None
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/elf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/elf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/elf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/elf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,12 @@
-use super::{Context, Mapping, Path, Stash, Vec};
-use core::convert::TryFrom;
-use object::elf::{ELFCOMPRESS_ZLIB, SHF_COMPRESSED};
+use super::mystd::ffi::{OsStr, OsString};
+use super::mystd::fs;
+use super::mystd::os::unix::ffi::{OsStrExt, OsStringExt};
+use super::mystd::path::{Path, PathBuf};
+use super::Either;
+use super::{Context, Mapping, Stash, Vec};
+use core::convert::{TryFrom, TryInto};
+use core::str;
+use object::elf::{ELFCOMPRESS_ZLIB, ELF_NOTE_GNU, NT_GNU_BUILD_ID, SHF_COMPRESSED};
 use object::read::elf::{CompressionHeader, FileHeader, SectionHeader, SectionTable, Sym};
 use object::read::StringTable;
 use object::{BigEndian, Bytes, NativeEndian};
@@ -13,7 +19,51 @@
 impl Mapping {
     pub fn new(path: &Path) -> Option<Mapping> {
         let map = super::mmap(path)?;
-        Mapping::mk(map, |data, stash| Context::new(stash, Object::parse(data)?))
+        Mapping::mk_or_other(map, |map, stash| {
+            let object = Object::parse(&map)?;
+
+            // Try to locate an external debug file using the build ID.
+            if let Some(path_debug) = object.build_id().and_then(locate_build_id) {
+                if let Some(mapping) = Mapping::new_debug(path_debug, None) {
+                    return Some(Either::A(mapping));
+                }
+            }
+
+            // Try to locate an external debug file using the GNU debug link section.
+            if let Some((path_debug, crc)) = object.gnu_debuglink_path(path) {
+                if let Some(mapping) = Mapping::new_debug(path_debug, Some(crc)) {
+                    return Some(Either::A(mapping));
+                }
+            }
+
+            Context::new(stash, object, None).map(Either::B)
+        })
+    }
+
+    /// Load debuginfo from an external debug file.
+    fn new_debug(path: PathBuf, crc: Option<u32>) -> Option<Mapping> {
+        let map = super::mmap(&path)?;
+        Mapping::mk(map, |map, stash| {
+            let object = Object::parse(&map)?;
+
+            if let Some(_crc) = crc {
+                // TODO: check crc
+            }
+
+            // Try to locate a supplementary object file.
+            if let Some((path_sup, build_id_sup)) = object.gnu_debugaltlink_path(&path) {
+                if let Some(map_sup) = super::mmap(&path_sup) {
+                    let map_sup = stash.set_mmap_aux(map_sup);
+                    if let Some(sup) = Object::parse(map_sup) {
+                        if sup.build_id() == Some(build_id_sup) {
+                            return Context::new(stash, object, Some(sup));
+                        }
+                    }
+                }
+            }
+
+            Context::new(stash, object, None)
+        })
     }
 }
 
@@ -29,7 +79,7 @@
     /// We could use a literal instead, but this helps ensure correctness.
     endian: NativeEndian,
     /// The entire file data.
-    data: Bytes<'a>,
+    data: &'a [u8],
     sections: SectionTable<'a, Elf>,
     strings: StringTable<'a>,
     /// List of pre-parsed and sorted symbols by base address.
@@ -38,7 +88,6 @@
 
 impl<'a> Object<'a> {
     fn parse(data: &'a [u8]) -> Option<Object<'a>> {
-        let data = object::Bytes(data);
         let elf = Elf::parse(data).ok()?;
         let endian = elf.endian().ok()?;
         let sections = elf.sections(endian, data).ok()?;
@@ -90,7 +139,7 @@
 
     pub fn section(&self, stash: &'a Stash, name: &str) -> Option<&'a [u8]> {
         if let Some(section) = self.section_header(name) {
-            let mut data = section.data(self.endian, self.data).ok()?;
+            let mut data = Bytes(section.data(self.endian, self.data).ok()?);
 
             // Check for DWARF-standard (gABI) compression, i.e., as generated
             // by ld's `--compress-debug-sections=zlib-gabi` flag.
@@ -131,7 +180,7 @@
                 }
             })
             .next()?;
-        let mut data = compressed_section.data(self.endian, self.data).ok()?;
+        let mut data = Bytes(compressed_section.data(self.endian, self.data).ok()?);
         if data.read_bytes(8).ok()?.0 != b"ZLIB\0\0\0\0" {
             return None;
         }
@@ -164,6 +213,46 @@
     pub(super) fn search_object_map(&self, _addr: u64) -> Option<(&Context<'_>, u64)> {
         None
     }
+
+    fn build_id(&self) -> Option<&'a [u8]> {
+        for section in self.sections.iter() {
+            if let Ok(Some(mut notes)) = section.notes(self.endian, self.data) {
+                while let Ok(Some(note)) = notes.next() {
+                    if note.name() == ELF_NOTE_GNU && note.n_type(self.endian) == NT_GNU_BUILD_ID {
+                        return Some(note.desc());
+                    }
+                }
+            }
+        }
+        None
+    }
+
+    // The contents of the ".gnu_debuglink" section is documented at:
+    // https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html
+    fn gnu_debuglink_path(&self, path: &Path) -> Option<(PathBuf, u32)> {
+        let section = self.section_header(".gnu_debuglink")?;
+        let data = section.data(self.endian, self.data).ok()?;
+        let len = data.iter().position(|x| *x == 0)?;
+        let filename = &data[..len];
+        let offset = (len + 1 + 3) & !3;
+        let crc_bytes = data
+            .get(offset..offset + 4)
+            .and_then(|bytes| bytes.try_into().ok())?;
+        let crc = u32::from_ne_bytes(crc_bytes);
+        let path_debug = locate_debuglink(path, filename)?;
+        Some((path_debug, crc))
+    }
+
+    // The format of the ".gnu_debugaltlink" section is based on gdb.
+    fn gnu_debugaltlink_path(&self, path: &Path) -> Option<(PathBuf, &'a [u8])> {
+        let section = self.section_header(".gnu_debugaltlink")?;
+        let data = section.data(self.endian, self.data).ok()?;
+        let len = data.iter().position(|x| *x == 0)?;
+        let filename = &data[..len];
+        let build_id = &data[len + 1..];
+        let path_sup = locate_debugaltlink(path, filename, build_id)?;
+        Some((path_sup, build_id))
+    }
 }
 
 fn decompress_zlib(input: &[u8], output: &mut [u8]) -> Option<()> {
@@ -186,3 +275,149 @@
         None
     }
 }
+
+const DEBUG_PATH: &[u8] = b"/usr/lib/debug";
+
+fn debug_path_exists() -> bool {
+    cfg_if::cfg_if! {
+        if #[cfg(any(target_os = "freebsd", target_os = "linux"))] {
+            use core::sync::atomic::{AtomicU8, Ordering};
+            static DEBUG_PATH_EXISTS: AtomicU8 = AtomicU8::new(0);
+
+            let mut exists = DEBUG_PATH_EXISTS.load(Ordering::Relaxed);
+            if exists == 0 {
+                exists = if Path::new(OsStr::from_bytes(DEBUG_PATH)).is_dir() {
+                    1
+                } else {
+                    2
+                };
+                DEBUG_PATH_EXISTS.store(exists, Ordering::Relaxed);
+            }
+            exists == 1
+        } else {
+            false
+        }
+    }
+}
+
+/// Locate a debug file based on its build ID.
+///
+/// The format of build id paths is documented at:
+/// https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html
+fn locate_build_id(build_id: &[u8]) -> Option<PathBuf> {
+    const BUILD_ID_PATH: &[u8] = b"/usr/lib/debug/.build-id/";
+    const BUILD_ID_SUFFIX: &[u8] = b".debug";
+
+    if build_id.len() < 2 {
+        return None;
+    }
+
+    if !debug_path_exists() {
+        return None;
+    }
+
+    let mut path =
+        Vec::with_capacity(BUILD_ID_PATH.len() + BUILD_ID_SUFFIX.len() + build_id.len() * 2 + 1);
+    path.extend(BUILD_ID_PATH);
+    path.push(hex(build_id[0] >> 4));
+    path.push(hex(build_id[0] & 0xf));
+    path.push(b'/');
+    for byte in &build_id[1..] {
+        path.push(hex(byte >> 4));
+        path.push(hex(byte & 0xf));
+    }
+    path.extend(BUILD_ID_SUFFIX);
+    Some(PathBuf::from(OsString::from_vec(path)))
+}
+
+fn hex(byte: u8) -> u8 {
+    if byte < 10 {
+        b'0' + byte
+    } else {
+        b'a' + byte - 10
+    }
+}
+
+/// Locate a file specified in a `.gnu_debuglink` section.
+///
+/// `path` is the file containing the section.
+/// `filename` is from the contents of the section.
+///
+/// Search order is based on gdb, documented at:
+/// https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html
+///
+/// gdb also allows the user to customize the debug search path, but we don't.
+///
+/// gdb also supports debuginfod, but we don't yet.
+fn locate_debuglink(path: &Path, filename: &[u8]) -> Option<PathBuf> {
+    let path = fs::canonicalize(path).ok()?;
+    let parent = path.parent()?;
+    let mut f = PathBuf::from(OsString::with_capacity(
+        DEBUG_PATH.len() + parent.as_os_str().len() + filename.len() + 2,
+    ));
+    let filename = Path::new(OsStr::from_bytes(filename));
+
+    // Try "/parent/filename" if it differs from "path"
+    f.push(parent);
+    f.push(filename);
+    if f != path && f.is_file() {
+        return Some(f);
+    }
+
+    // Try "/parent/.debug/filename"
+    let mut s = OsString::from(f);
+    s.clear();
+    f = PathBuf::from(s);
+    f.push(parent);
+    f.push(".debug");
+    f.push(filename);
+    if f.is_file() {
+        return Some(f);
+    }
+
+    if debug_path_exists() {
+        // Try "/usr/lib/debug/parent/filename"
+        let mut s = OsString::from(f);
+        s.clear();
+        f = PathBuf::from(s);
+        f.push(OsStr::from_bytes(DEBUG_PATH));
+        f.push(parent.strip_prefix("/").unwrap());
+        f.push(filename);
+        if f.is_file() {
+            return Some(f);
+        }
+    }
+
+    None
+}
+
+/// Locate a file specified in a `.gnu_debugaltlink` section.
+///
+/// `path` is the file containing the section.
+/// `filename` and `build_id` are the contents of the section.
+///
+/// Search order is based on gdb:
+/// - filename, which is either absolute or relative to `path`
+/// - the build ID path under `BUILD_ID_PATH`
+///
+/// gdb also allows the user to customize the debug search path, but we don't.
+///
+/// gdb also supports debuginfod, but we don't yet.
+fn locate_debugaltlink(path: &Path, filename: &[u8], build_id: &[u8]) -> Option<PathBuf> {
+    let filename = Path::new(OsStr::from_bytes(filename));
+    if filename.is_absolute() {
+        if filename.is_file() {
+            return Some(filename.into());
+        }
+    } else {
+        let path = fs::canonicalize(path).ok()?;
+        let parent = path.parent()?;
+        let mut f = PathBuf::from(parent);
+        f.push(filename);
+        if f.is_file() {
+            return Some(f);
+        }
+    }
+
+    locate_build_id(build_id)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+// Other Unix (e.g. Linux) platforms use ELF as an object file format
+// and typically implement an API called `dl_iterate_phdr` to load
+// native libraries.
+
+use super::mystd::borrow::ToOwned;
+use super::mystd::env;
+use super::mystd::ffi::{CStr, OsStr};
+use super::mystd::os::unix::prelude::*;
+use super::{Library, LibrarySegment, OsString, Vec};
+use core::slice;
+
+pub(super) fn native_libraries() -> Vec<Library> {
+    let mut ret = Vec::new();
+    unsafe {
+        libc::dl_iterate_phdr(Some(callback), &mut ret as *mut Vec<_> as *mut _);
+    }
+    return ret;
+}
+
+// `info` should be a valid pointers.
+// `vec` should be a valid pointer to a `std::Vec`.
+unsafe extern "C" fn callback(
+    info: *mut libc::dl_phdr_info,
+    _size: libc::size_t,
+    vec: *mut libc::c_void,
+) -> libc::c_int {
+    let info = &*info;
+    let libs = &mut *(vec as *mut Vec<Library>);
+    let is_main_prog = info.dlpi_name.is_null() || *info.dlpi_name == 0;
+    let name = if is_main_prog {
+        if libs.is_empty() {
+            env::current_exe().map(|e| e.into()).unwrap_or_default()
+        } else {
+            OsString::new()
+        }
+    } else {
+        let bytes = CStr::from_ptr(info.dlpi_name).to_bytes();
+        OsStr::from_bytes(bytes).to_owned()
+    };
+    let headers = slice::from_raw_parts(info.dlpi_phdr, info.dlpi_phnum as usize);
+    libs.push(Library {
+        name,
+        segments: headers
+            .iter()
+            .map(|header| LibrarySegment {
+                len: (*header).p_memsz as usize,
+                stated_virtual_memory_address: (*header).p_vaddr as usize,
+            })
+            .collect(),
+        bias: info.dlpi_addr as usize,
+    });
+    0
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_haiku.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_haiku.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_haiku.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_haiku.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+// Haiku implements the image_info struct and the get_next_image_info()
+// functions to iterate through the loaded executable images. The
+// image_info struct contains a pointer to the start of the .text
+// section within the virtual address space, as well as the size of
+// that section. All the read-only segments of the ELF-binary are in
+// that part of the address space.
+
+use super::mystd::borrow::ToOwned;
+use super::mystd::ffi::{CStr, OsStr};
+use super::mystd::mem::MaybeUninit;
+use super::mystd::os::unix::prelude::*;
+use super::{Library, LibrarySegment, Vec};
+
+pub(super) fn native_libraries() -> Vec<Library> {
+    let mut libraries: Vec<Library> = Vec::new();
+
+    unsafe {
+        let mut info = MaybeUninit::<libc::image_info>::zeroed();
+        let mut cookie: i32 = 0;
+        // Load the first image to get a valid info struct
+        let mut status =
+            libc::get_next_image_info(libc::B_CURRENT_TEAM, &mut cookie, info.as_mut_ptr());
+        if status != libc::B_OK {
+            return libraries;
+        }
+        let mut info = info.assume_init();
+
+        while status == libc::B_OK {
+            let mut segments = Vec::new();
+            segments.push(LibrarySegment {
+                stated_virtual_memory_address: 0,
+                len: info.text_size as usize,
+            });
+
+            let bytes = CStr::from_ptr(info.name.as_ptr()).to_bytes();
+            let name = OsStr::from_bytes(bytes).to_owned();
+            libraries.push(Library {
+                name: name,
+                segments: segments,
+                bias: info.text as usize,
+            });
+
+            status = libc::get_next_image_info(libc::B_CURRENT_TEAM, &mut cookie, &mut info);
+        }
+    }
+
+    libraries
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_illumos.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_illumos.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_illumos.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_illumos.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,99 @@
+use super::mystd::borrow::ToOwned;
+use super::mystd::ffi::{CStr, OsStr};
+use super::mystd::os::unix::prelude::*;
+use super::{Library, LibrarySegment, Vec};
+use core::mem;
+use object::NativeEndian;
+
+#[cfg(target_pointer_width = "64")]
+use object::elf::{FileHeader64 as FileHeader, ProgramHeader64 as ProgramHeader};
+
+type EHdr = FileHeader<NativeEndian>;
+type PHdr = ProgramHeader<NativeEndian>;
+
+#[repr(C)]
+struct LinkMap {
+    l_addr: libc::c_ulong,
+    l_name: *const libc::c_char,
+    l_ld: *const libc::c_void,
+    l_next: *const LinkMap,
+    l_prev: *const LinkMap,
+    l_refname: *const libc::c_char,
+}
+
+const RTLD_SELF: *const libc::c_void = -3isize as *const libc::c_void;
+const RTLD_DI_LINKMAP: libc::c_int = 2;
+
+extern "C" {
+    fn dlinfo(
+        handle: *const libc::c_void,
+        request: libc::c_int,
+        p: *mut libc::c_void,
+    ) -> libc::c_int;
+}
+
+pub(super) fn native_libraries() -> Vec<Library> {
+    let mut libs = Vec::new();
+
+    // Request the current link map from the runtime linker:
+    let map = unsafe {
+        let mut map: *const LinkMap = mem::zeroed();
+        if dlinfo(
+            RTLD_SELF,
+            RTLD_DI_LINKMAP,
+            (&mut map) as *mut *const LinkMap as *mut libc::c_void,
+        ) != 0
+        {
+            return libs;
+        }
+        map
+    };
+
+    // Each entry in the link map represents a loaded object:
+    let mut l = map;
+    while !l.is_null() {
+        // Fetch the fully qualified path of the loaded object:
+        let bytes = unsafe { CStr::from_ptr((*l).l_name) }.to_bytes();
+        let name = OsStr::from_bytes(bytes).to_owned();
+
+        // The base address of the object loaded into memory:
+        let addr = unsafe { (*l).l_addr };
+
+        // Use the ELF header for this object to locate the program
+        // header:
+        let e: *const EHdr = unsafe { (*l).l_addr as *const EHdr };
+        let phoff = unsafe { (*e).e_phoff }.get(NativeEndian);
+        let phnum = unsafe { (*e).e_phnum }.get(NativeEndian);
+        let etype = unsafe { (*e).e_type }.get(NativeEndian);
+
+        let phdr: *const PHdr = (addr + phoff) as *const PHdr;
+        let phdr = unsafe { core::slice::from_raw_parts(phdr, phnum as usize) };
+
+        libs.push(Library {
+            name,
+            segments: phdr
+                .iter()
+                .map(|p| {
+                    let memsz = p.p_memsz.get(NativeEndian);
+                    let vaddr = p.p_vaddr.get(NativeEndian);
+                    LibrarySegment {
+                        len: memsz as usize,
+                        stated_virtual_memory_address: vaddr as usize,
+                    }
+                })
+                .collect(),
+            bias: if etype == object::elf::ET_EXEC {
+                // Program header addresses for the base executable are
+                // already absolute.
+                0
+            } else {
+                // Other addresses are relative to the object base.
+                addr as usize
+            },
+        });
+
+        l = unsafe { (*l).l_next };
+    }
+
+    libs
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_libnx.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_libnx.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_libnx.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_libnx.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+use super::{Library, LibrarySegment, Vec};
+
+// DevkitA64 doesn't natively support debug info, but the build system will
+// place debug info at the path `romfs:/debug_info.elf`.
+pub(super) fn native_libraries() -> Vec<Library> {
+    extern "C" {
+        static __start__: u8;
+    }
+
+    let bias = unsafe { &__start__ } as *const u8 as usize;
+
+    let mut ret = Vec::new();
+    let mut segments = Vec::new();
+    segments.push(LibrarySegment {
+        stated_virtual_memory_address: 0,
+        len: usize::max_value() - bias,
+    });
+
+    let path = "romfs:/debug_info.elf";
+    ret.push(Library {
+        name: path.into(),
+        segments,
+        bias,
+    });
+
+    ret
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_macos.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_macos.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_macos.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_macos.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,146 @@
+#![allow(deprecated)]
+
+use super::mystd::ffi::{CStr, OsStr};
+use super::mystd::os::unix::prelude::*;
+use super::mystd::prelude::v1::*;
+use super::{Library, LibrarySegment};
+use core::convert::TryInto;
+use core::mem;
+
+pub(super) fn native_libraries() -> Vec<Library> {
+    let mut ret = Vec::new();
+    let images = unsafe { libc::_dyld_image_count() };
+    for i in 0..images {
+        ret.extend(native_library(i));
+    }
+    return ret;
+}
+
+fn native_library(i: u32) -> Option<Library> {
+    use object::macho;
+    use object::read::macho::{MachHeader, Segment};
+    use object::NativeEndian;
+
+    // Fetch the name of this library which corresponds to the path of
+    // where to load it as well.
+    let name = unsafe {
+        let name = libc::_dyld_get_image_name(i);
+        if name.is_null() {
+            return None;
+        }
+        CStr::from_ptr(name)
+    };
+
+    // Load the image header of this library and delegate to `object` to
+    // parse all the load commands so we can figure out all the segments
+    // involved here.
+    let (mut load_commands, endian) = unsafe {
+        let header = libc::_dyld_get_image_header(i);
+        if header.is_null() {
+            return None;
+        }
+        match (*header).magic {
+            macho::MH_MAGIC => {
+                let endian = NativeEndian;
+                let header = &*(header as *const macho::MachHeader32<NativeEndian>);
+                let data = core::slice::from_raw_parts(
+                    header as *const _ as *const u8,
+                    mem::size_of_val(header) + header.sizeofcmds.get(endian) as usize,
+                );
+                (header.load_commands(endian, data, 0).ok()?, endian)
+            }
+            macho::MH_MAGIC_64 => {
+                let endian = NativeEndian;
+                let header = &*(header as *const macho::MachHeader64<NativeEndian>);
+                let data = core::slice::from_raw_parts(
+                    header as *const _ as *const u8,
+                    mem::size_of_val(header) + header.sizeofcmds.get(endian) as usize,
+                );
+                (header.load_commands(endian, data, 0).ok()?, endian)
+            }
+            _ => return None,
+        }
+    };
+
+    // Iterate over the segments and register known regions for segments
+    // that we find. Additionally record information bout text segments
+    // for processing later, see comments below.
+    let mut segments = Vec::new();
+    let mut first_text = 0;
+    let mut text_fileoff_zero = false;
+    while let Some(cmd) = load_commands.next().ok()? {
+        if let Some((seg, _)) = cmd.segment_32().ok()? {
+            if seg.name() == b"__TEXT" {
+                first_text = segments.len();
+                if seg.fileoff(endian) == 0 && seg.filesize(endian) > 0 {
+                    text_fileoff_zero = true;
+                }
+            }
+            segments.push(LibrarySegment {
+                len: seg.vmsize(endian).try_into().ok()?,
+                stated_virtual_memory_address: seg.vmaddr(endian).try_into().ok()?,
+            });
+        }
+        if let Some((seg, _)) = cmd.segment_64().ok()? {
+            if seg.name() == b"__TEXT" {
+                first_text = segments.len();
+                if seg.fileoff(endian) == 0 && seg.filesize(endian) > 0 {
+                    text_fileoff_zero = true;
+                }
+            }
+            segments.push(LibrarySegment {
+                len: seg.vmsize(endian).try_into().ok()?,
+                stated_virtual_memory_address: seg.vmaddr(endian).try_into().ok()?,
+            });
+        }
+    }
+
+    // Determine the "slide" for this library which ends up being the
+    // bias we use to figure out where in memory objects are loaded.
+    // This is a bit of a weird computation though and is the result of
+    // trying a few things in the wild and seeing what sticks.
+    //
+    // The general idea is that the `bias` plus a segment's
+    // `stated_virtual_memory_address` is going to be where in the
+    // actual address space the segment resides. The other thing we rely
+    // on though is that a real address minus the `bias` is the index to
+    // look up in the symbol table and debuginfo.
+    //
+    // It turns out, though, that for system loaded libraries these
+    // calculations are incorrect. For native executables, however, it
+    // appears correct. Lifting some logic from LLDB's source it has
+    // some special-casing for the first `__TEXT` section loaded from
+    // file offset 0 with a nonzero size. For whatever reason when this
+    // is present it appears to mean that the symbol table is relative
+    // to just the vmaddr slide for the library. If it's *not* present
+    // then the symbol table is relative to the the vmaddr slide plus
+    // the segment's stated address.
+    //
+    // To handle this situation if we *don't* find a text section at
+    // file offset zero then we increase the bias by the first text
+    // sections's stated address and decrease all stated addresses by
+    // that amount as well. That way the symbol table is always appears
+    // relative to the library's bias amount. This appears to have the
+    // right results for symbolizing via the symbol table.
+    //
+    // Honestly I'm not entirely sure whether this is right or if
+    // there's something else that should indicate how to do this. For
+    // now though this seems to work well enough (?) and we should
+    // always be able to tweak this over time if necessary.
+    //
+    // For some more information see #318
+    let mut slide = unsafe { libc::_dyld_get_image_vmaddr_slide(i) as usize };
+    if !text_fileoff_zero {
+        let adjust = segments[first_text].stated_virtual_memory_address;
+        for segment in segments.iter_mut() {
+            segment.stated_virtual_memory_address -= adjust;
+        }
+        slide += adjust;
+    }
+
+    Some(Library {
+        name: OsStr::from_bytes(name.to_bytes()).to_owned(),
+        segments,
+        bias: slide,
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_windows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_windows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_windows.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/libs_windows.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,89 @@
+use super::super::super::windows::*;
+use super::mystd::os::windows::prelude::*;
+use super::{coff, mmap, Library, LibrarySegment, OsString};
+use alloc::vec;
+use alloc::vec::Vec;
+use core::mem;
+use core::mem::MaybeUninit;
+
+// For loading native libraries on Windows, see some discussion on
+// rust-lang/rust#71060 for the various strategies here.
+pub(super) fn native_libraries() -> Vec<Library> {
+    let mut ret = Vec::new();
+    unsafe {
+        add_loaded_images(&mut ret);
+    }
+    return ret;
+}
+
+unsafe fn add_loaded_images(ret: &mut Vec<Library>) {
+    let snap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, 0);
+    if snap == INVALID_HANDLE_VALUE {
+        return;
+    }
+
+    let mut me = MaybeUninit::<MODULEENTRY32W>::zeroed().assume_init();
+    me.dwSize = mem::size_of_val(&me) as DWORD;
+    if Module32FirstW(snap, &mut me) == TRUE {
+        loop {
+            if let Some(lib) = load_library(&me) {
+                ret.push(lib);
+            }
+
+            if Module32NextW(snap, &mut me) != TRUE {
+                break;
+            }
+        }
+    }
+
+    CloseHandle(snap);
+}
+
+unsafe fn load_library(me: &MODULEENTRY32W) -> Option<Library> {
+    let pos = me
+        .szExePath
+        .iter()
+        .position(|i| *i == 0)
+        .unwrap_or(me.szExePath.len());
+    let name = OsString::from_wide(&me.szExePath[..pos]);
+
+    // MinGW libraries currently don't support ASLR
+    // (rust-lang/rust#16514), but DLLs can still be relocated around in
+    // the address space. It appears that addresses in debug info are
+    // all as-if this library was loaded at its "image base", which is a
+    // field in its COFF file headers. Since this is what debuginfo
+    // seems to list we parse the symbol table and store addresses as if
+    // the library was loaded at "image base" as well.
+    //
+    // The library may not be loaded at "image base", however.
+    // (presumably something else may be loaded there?) This is where
+    // the `bias` field comes into play, and we need to figure out the
+    // value of `bias` here. Unfortunately though it's not clear how to
+    // acquire this from a loaded module. What we do have, however, is
+    // the actual load address (`modBaseAddr`).
+    //
+    // As a bit of a cop-out for now we mmap the file, read the file
+    // header information, then drop the mmap. This is wasteful because
+    // we'll probably reopen the mmap later, but this should work well
+    // enough for now.
+    //
+    // Once we have the `image_base` (desired load location) and the
+    // `base_addr` (actual load location) we can fill in the `bias`
+    // (difference between the actual and desired) and then the stated
+    // address of each segment is the `image_base` since that's what the
+    // file says.
+    //
+    // For now it appears that unlike ELF/MachO we can make do with one
+    // segment per library, using `modBaseSize` as the whole size.
+    let mmap = mmap(name.as_ref())?;
+    let image_base = coff::get_image_base(&mmap)?;
+    let base_addr = me.modBaseAddr as usize;
+    Some(Library {
+        name,
+        bias: base_addr.wrapping_sub(image_base),
+        segments: vec![LibrarySegment {
+            stated_virtual_memory_address: image_base,
+            len: me.modBaseSize as usize,
+        }],
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/macho.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/macho.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/macho.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/macho.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,9 +20,9 @@
         // First up we need to load the unique UUID which is stored in the macho
         // header of the file we're reading, specified at `path`.
         let map = super::mmap(path)?;
-        let (macho, data) = find_header(Bytes(&map))?;
+        let (macho, data) = find_header(&map)?;
         let endian = macho.endian().ok()?;
-        let uuid = macho.uuid(endian, data).ok()??;
+        let uuid = macho.uuid(endian, data, 0).ok()??;
 
         // Next we need to look for a `*.dSYM` file. For now we just probe the
         // containing directory and look around for something that matches
@@ -40,10 +40,10 @@
         // file. This should have the symbol table for at least some
         // symbolication purposes.
         Mapping::mk(map, |data, stash| {
-            let (macho, data) = find_header(Bytes(data))?;
+            let (macho, data) = find_header(data)?;
             let endian = macho.endian().ok()?;
             let obj = Object::parse(macho, endian, data)?;
-            Context::new(stash, obj)
+            Context::new(stash, obj, None)
         })
     }
 
@@ -73,14 +73,14 @@
             let entry = entry.ok()?;
             let map = super::mmap(&entry.path())?;
             let candidate = Mapping::mk(map, |data, stash| {
-                let (macho, data) = find_header(Bytes(data))?;
+                let (macho, data) = find_header(data)?;
                 let endian = macho.endian().ok()?;
-                let entry_uuid = macho.uuid(endian, data).ok()??;
+                let entry_uuid = macho.uuid(endian, data, 0).ok()??;
                 if entry_uuid != uuid {
                     return None;
                 }
                 let obj = Object::parse(macho, endian, data)?;
-                Context::new(stash, obj)
+                Context::new(stash, obj, None)
             });
             if let Some(candidate) = candidate {
                 return Some(candidate);
@@ -91,7 +91,7 @@
     }
 }
 
-fn find_header(mut data: Bytes<'_>) -> Option<(&'_ Mach, Bytes<'_>)> {
+fn find_header(data: &'_ [u8]) -> Option<(&'_ Mach, &'_ [u8])> {
     use object::endian::BigEndian;
 
     let desired_cpu = || {
@@ -108,6 +108,7 @@
         }
     };
 
+    let mut data = Bytes(data);
     match data
         .clone()
         .read::<object::endian::U32<NativeEndian>>()
@@ -149,13 +150,13 @@
         _ => return None,
     }
 
-    Mach::parse(data).ok().map(|h| (h, data))
+    Mach::parse(data.0, 0).ok().map(|h| (h, data.0))
 }
 
 // This is used both for executables/libraries and source object files.
 pub struct Object<'a> {
     endian: NativeEndian,
-    data: Bytes<'a>,
+    data: &'a [u8],
     dwarf: Option<&'a [MachSection]>,
     syms: Vec<(&'a [u8], u64)>,
     syms_sort_by_name: bool,
@@ -166,12 +167,12 @@
 }
 
 impl<'a> Object<'a> {
-    fn parse(mach: &'a Mach, endian: NativeEndian, data: Bytes<'a>) -> Option<Object<'a>> {
+    fn parse(mach: &'a Mach, endian: NativeEndian, data: &'a [u8]) -> Option<Object<'a>> {
         let is_object = mach.filetype(endian) == object::macho::MH_OBJECT;
         let mut dwarf = None;
         let mut syms = Vec::new();
         let mut syms_sort_by_name = false;
-        let mut commands = mach.load_commands(endian, data).ok()?;
+        let mut commands = mach.load_commands(endian, data, 0).ok()?;
         let mut object_map = None;
         let mut object_mappings = Vec::new();
         while let Ok(Some(command)) = commands.next() {
@@ -181,7 +182,7 @@
                     dwarf = segment.sections(endian, section_data).ok();
                 }
             } else if let Some(symtab) = command.symtab().ok()? {
-                let symbols = symtab.symbols::<Mach>(endian, data).ok()?;
+                let symbols = symtab.symbols::<Mach, _>(endian, data).ok()?;
                 syms = symbols
                     .iter()
                     .filter_map(|nlist: &MachNlist| {
@@ -230,7 +231,7 @@
                     && &section_name[2..] == &name[1..]
             }
         })?;
-        Some(section.data(self.endian, self.data).ok()?.0)
+        Some(section.data(self.endian, self.data).ok()?)
     }
 
     pub fn search_symtab<'b>(&'b self, addr: u64) -> Option<&'b [u8]> {
@@ -299,14 +300,14 @@
                     .members()
                     .filter_map(Result::ok)
                     .find(|m| m.name() == member_name)?;
-                Bytes(member.data())
+                member.data(data).ok()?
             }
-            None => Bytes(data),
+            None => data,
         };
         let (macho, data) = find_header(data)?;
         let endian = macho.endian().ok()?;
         let obj = Object::parse(macho, endian, data)?;
-        Context::new(stash, obj)
+        Context::new(stash, obj, None)
     })
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/mmap_unix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/mmap_unix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/mmap_unix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/mmap_unix.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
-use super::{AsRawFd, File};
+use super::mystd::fs::File;
+use super::mystd::os::unix::prelude::*;
 use core::ops::Deref;
 use core::ptr;
 use core::slice;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/mmap_windows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/mmap_windows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/mmap_windows.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/mmap_windows.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 use super::super::super::windows::*;
-use super::{AsRawHandle, File};
+use super::mystd::fs::File;
+use super::mystd::os::windows::prelude::*;
 use core::ops::Deref;
 use core::ptr;
 use core::slice;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/stash.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/stash.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/stash.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli/stash.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 // only used on Linux right now, so allow dead code elsewhere
 #![cfg_attr(not(target_os = "linux"), allow(dead_code))]
 
+use super::Mmap;
 use alloc::vec;
 use alloc::vec::Vec;
 use core::cell::UnsafeCell;
@@ -8,12 +9,14 @@
 /// A simple arena allocator for byte buffers.
 pub struct Stash {
     buffers: UnsafeCell<Vec<Vec<u8>>>,
+    mmap_aux: UnsafeCell<Option<Mmap>>,
 }
 
 impl Stash {
     pub fn new() -> Stash {
         Stash {
             buffers: UnsafeCell::new(Vec::new()),
+            mmap_aux: UnsafeCell::new(None),
         }
     }
 
@@ -29,4 +32,21 @@
         // to the data inside any buffer will live as long as `self` does.
         &mut buffers[i]
     }
+
+    /// Stores a `Mmap` for the lifetime of this `Stash`, returning a pointer
+    /// which is scoped to just this lifetime.
+    pub fn set_mmap_aux(&self, map: Mmap) -> &[u8] {
+        // SAFETY: this is the only location for a mutable pointer to
+        // `mmap_aux`, and this structure isn't threadsafe to shared across
+        // threads either. This also is careful to store at most one `mmap_aux`
+        // since overwriting a previous one would invalidate the previous
+        // pointer. Given that though we can safely return a pointer to our
+        // interior-owned contents.
+        unsafe {
+            let mmap_aux = &mut *self.mmap_aux.get();
+            assert!(mmap_aux.is_none());
+            *mmap_aux = Some(map);
+            mmap_aux.as_ref().unwrap()
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/gimli.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,11 +34,13 @@
         target_os = "android",
         target_os = "freebsd",
         target_os = "fuchsia",
+        target_os = "haiku",
         target_os = "ios",
         target_os = "linux",
         target_os = "macos",
         target_os = "openbsd",
         target_os = "solaris",
+        target_os = "illumos",
     ))] {
         #[path = "gimli/mmap_unix.rs"]
         mod mmap;
@@ -59,13 +61,37 @@
     _stash: Stash,
 }
 
+enum Either<A, B> {
+    #[allow(dead_code)]
+    A(A),
+    B(B),
+}
+
 impl Mapping {
+    /// Creates a `Mapping` by ensuring that the `data` specified is used to
+    /// create a `Context` and it can only borrow from that or the `Stash` of
+    /// decompressed sections or auxiliary data.
     fn mk<F>(data: Mmap, mk: F) -> Option<Mapping>
     where
-        F: for<'a> Fn(&'a [u8], &'a Stash) -> Option<Context<'a>>,
+        F: for<'a> FnOnce(&'a [u8], &'a Stash) -> Option<Context<'a>>,
+    {
+        Mapping::mk_or_other(data, move |data, stash| {
+            let cx = mk(data, stash)?;
+            Some(Either::B(cx))
+        })
+    }
+
+    /// Creates a `Mapping` from `data`, or if the closure decides to, returns a
+    /// different mapping.
+    fn mk_or_other<F>(data: Mmap, mk: F) -> Option<Mapping>
+    where
+        F: for<'a> FnOnce(&'a [u8], &'a Stash) -> Option<Either<Mapping, Context<'a>>>,
     {
         let stash = Stash::new();
-        let cx = mk(&data, &stash)?;
+        let cx = match mk(&data, &stash)? {
+            Either::A(mapping) => return Some(mapping),
+            Either::B(cx) => cx,
+        };
         Some(Mapping {
             // Convert to 'static lifetimes since the symbols should
             // only borrow `map` and `stash` and we're preserving them below.
@@ -82,28 +108,27 @@
 }
 
 impl<'data> Context<'data> {
-    fn new(stash: &'data Stash, object: Object<'data>) -> Option<Context<'data>> {
-        fn load_section<'data, S>(stash: &'data Stash, obj: &Object<'data>) -> S
-        where
-            S: gimli::Section<gimli::EndianSlice<'data, Endian>>,
-        {
-            let data = obj.section(stash, S::section_name()).unwrap_or(&[]);
-            S::from(EndianSlice::new(data, Endian))
+    fn new(
+        stash: &'data Stash,
+        object: Object<'data>,
+        sup: Option<Object<'data>>,
+    ) -> Option<Context<'data>> {
+        let mut sections = gimli::Dwarf::load(|id| -> Result<_, ()> {
+            let data = object.section(stash, id.name()).unwrap_or(&[]);
+            Ok(EndianSlice::new(data, Endian))
+        })
+        .ok()?;
+
+        if let Some(sup) = sup {
+            sections
+                .load_sup(|id| -> Result<_, ()> {
+                    let data = sup.section(stash, id.name()).unwrap_or(&[]);
+                    Ok(EndianSlice::new(data, Endian))
+                })
+                .ok()?;
         }
+        let dwarf = addr2line::Context::from_dwarf(sections).ok()?;
 
-        let dwarf = addr2line::Context::from_sections(
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            gimli::EndianSlice::new(&[], Endian),
-        )
-        .ok()?;
         Some(Context { dwarf, object })
     }
 }
@@ -116,341 +141,56 @@
 
 cfg_if::cfg_if! {
     if #[cfg(windows)] {
-        use core::mem::MaybeUninit;
-        use super::super::windows::*;
-        use mystd::os::windows::prelude::*;
-        use alloc::vec;
-
         mod coff;
         use self::coff::Object;
-
-        // For loading native libraries on Windows, see some discussion on
-        // rust-lang/rust#71060 for the various strategies here.
-        fn native_libraries() -> Vec<Library> {
-            let mut ret = Vec::new();
-            unsafe { add_loaded_images(&mut ret); }
-            return ret;
-        }
-
-        unsafe fn add_loaded_images(ret: &mut Vec<Library>) {
-            let snap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, 0);
-            if snap == INVALID_HANDLE_VALUE {
-                return;
-            }
-
-            let mut me = MaybeUninit::<MODULEENTRY32W>::zeroed().assume_init();
-            me.dwSize = mem::size_of_val(&me) as DWORD;
-            if Module32FirstW(snap, &mut me) == TRUE {
-                loop {
-                    if let Some(lib) = load_library(&me) {
-                        ret.push(lib);
-                    }
-
-                    if Module32NextW(snap, &mut me) != TRUE {
-                        break;
-                    }
-                }
-
-            }
-
-            CloseHandle(snap);
-        }
-
-        unsafe fn load_library(me: &MODULEENTRY32W) -> Option<Library> {
-            let pos = me
-                .szExePath
-                .iter()
-                .position(|i| *i == 0)
-                .unwrap_or(me.szExePath.len());
-            let name = OsString::from_wide(&me.szExePath[..pos]);
-
-            // MinGW libraries currently don't support ASLR
-            // (rust-lang/rust#16514), but DLLs can still be relocated around in
-            // the address space. It appears that addresses in debug info are
-            // all as-if this library was loaded at its "image base", which is a
-            // field in its COFF file headers. Since this is what debuginfo
-            // seems to list we parse the symbol table and store addresses as if
-            // the library was loaded at "image base" as well.
-            //
-            // The library may not be loaded at "image base", however.
-            // (presumably something else may be loaded there?) This is where
-            // the `bias` field comes into play, and we need to figure out the
-            // value of `bias` here. Unfortunately though it's not clear how to
-            // acquire this from a loaded module. What we do have, however, is
-            // the actual load address (`modBaseAddr`).
-            //
-            // As a bit of a cop-out for now we mmap the file, read the file
-            // header information, then drop the mmap. This is wasteful because
-            // we'll probably reopen the mmap later, but this should work well
-            // enough for now.
-            //
-            // Once we have the `image_base` (desired load location) and the
-            // `base_addr` (actual load location) we can fill in the `bias`
-            // (difference between the actual and desired) and then the stated
-            // address of each segment is the `image_base` since that's what the
-            // file says.
-            //
-            // For now it appears that unlike ELF/MachO we can make do with one
-            // segment per library, using `modBaseSize` as the whole size.
-            let mmap = mmap(name.as_ref())?;
-            let image_base = coff::get_image_base(&mmap)?;
-            let base_addr = me.modBaseAddr as usize;
-            Some(Library {
-                name,
-                bias: base_addr.wrapping_sub(image_base),
-                segments: vec![LibrarySegment {
-                    stated_virtual_memory_address: image_base,
-                    len: me.modBaseSize as usize,
-                }],
-            })
-        }
     } else if #[cfg(any(
         target_os = "macos",
         target_os = "ios",
         target_os = "tvos",
         target_os = "watchos",
     ))] {
-        // macOS uses the Mach-O file format and uses DYLD-specific APIs to
-        // load a list of native libraries that are part of the application.
-
-        use mystd::os::unix::prelude::*;
-        use mystd::ffi::{OsStr, CStr};
-
         mod macho;
         use self::macho::Object;
-
-        #[allow(deprecated)]
-        fn native_libraries() -> Vec<Library> {
-            let mut ret = Vec::new();
-            let images = unsafe { libc::_dyld_image_count() };
-            for i in 0..images {
-                ret.extend(native_library(i));
-            }
-            return ret;
-        }
-
-        #[allow(deprecated)]
-        fn native_library(i: u32) -> Option<Library> {
-            use object::macho;
-            use object::read::macho::{MachHeader, Segment};
-            use object::{Bytes, NativeEndian};
-
-            // Fetch the name of this library which corresponds to the path of
-            // where to load it as well.
-            let name = unsafe {
-                let name = libc::_dyld_get_image_name(i);
-                if name.is_null() {
-                    return None;
-                }
-                CStr::from_ptr(name)
-            };
-
-            // Load the image header of this library and delegate to `object` to
-            // parse all the load commands so we can figure out all the segments
-            // involved here.
-            let (mut load_commands, endian) = unsafe {
-                let header = libc::_dyld_get_image_header(i);
-                if header.is_null() {
-                    return None;
-                }
-                match (*header).magic {
-                    macho::MH_MAGIC => {
-                        let endian = NativeEndian;
-                        let header = &*(header as *const macho::MachHeader32<NativeEndian>);
-                        let data = core::slice::from_raw_parts(
-                            header as *const _ as *const u8,
-                            mem::size_of_val(header) + header.sizeofcmds.get(endian) as usize
-                        );
-                        (header.load_commands(endian, Bytes(data)).ok()?, endian)
-                    }
-                    macho::MH_MAGIC_64 => {
-                        let endian = NativeEndian;
-                        let header = &*(header as *const macho::MachHeader64<NativeEndian>);
-                        let data = core::slice::from_raw_parts(
-                            header as *const _ as *const u8,
-                            mem::size_of_val(header) + header.sizeofcmds.get(endian) as usize
-                        );
-                        (header.load_commands(endian, Bytes(data)).ok()?, endian)
-                    }
-                    _ => return None,
-                }
-            };
-
-            // Iterate over the segments and register known regions for segments
-            // that we find. Additionally record information bout text segments
-            // for processing later, see comments below.
-            let mut segments = Vec::new();
-            let mut first_text = 0;
-            let mut text_fileoff_zero = false;
-            while let Some(cmd) = load_commands.next().ok()? {
-                if let Some((seg, _)) = cmd.segment_32().ok()? {
-                    if seg.name() == b"__TEXT" {
-                        first_text = segments.len();
-                        if seg.fileoff(endian) == 0 && seg.filesize(endian) > 0 {
-                            text_fileoff_zero = true;
-                        }
-                    }
-                    segments.push(LibrarySegment {
-                        len: seg.vmsize(endian).try_into().ok()?,
-                        stated_virtual_memory_address: seg.vmaddr(endian).try_into().ok()?,
-                    });
-                }
-                if let Some((seg, _)) = cmd.segment_64().ok()? {
-                    if seg.name() == b"__TEXT" {
-                        first_text = segments.len();
-                        if seg.fileoff(endian) == 0 && seg.filesize(endian) > 0 {
-                            text_fileoff_zero = true;
-                        }
-                    }
-                    segments.push(LibrarySegment {
-                        len: seg.vmsize(endian).try_into().ok()?,
-                        stated_virtual_memory_address: seg.vmaddr(endian).try_into().ok()?,
-                    });
-                }
-            }
-
-            // Determine the "slide" for this library which ends up being the
-            // bias we use to figure out where in memory objects are loaded.
-            // This is a bit of a weird computation though and is the result of
-            // trying a few things in the wild and seeing what sticks.
-            //
-            // The general idea is that the `bias` plus a segment's
-            // `stated_virtual_memory_address` is going to be where in the
-            // actual address space the segment resides. The other thing we rely
-            // on though is that a real address minus the `bias` is the index to
-            // look up in the symbol table and debuginfo.
-            //
-            // It turns out, though, that for system loaded libraries these
-            // calculations are incorrect. For native executables, however, it
-            // appears correct. Lifting some logic from LLDB's source it has
-            // some special-casing for the first `__TEXT` section loaded from
-            // file offset 0 with a nonzero size. For whatever reason when this
-            // is present it appears to mean that the symbol table is relative
-            // to just the vmaddr slide for the library. If it's *not* present
-            // then the symbol table is relative to the the vmaddr slide plus
-            // the segment's stated address.
-            //
-            // To handle this situation if we *don't* find a text section at
-            // file offset zero then we increase the bias by the first text
-            // sections's stated address and decrease all stated addresses by
-            // that amount as well. That way the symbol table is always appears
-            // relative to the library's bias amount. This appears to have the
-            // right results for symbolizing via the symbol table.
-            //
-            // Honestly I'm not entirely sure whether this is right or if
-            // there's something else that should indicate how to do this. For
-            // now though this seems to work well enough (?) and we should
-            // always be able to tweak this over time if necessary.
-            //
-            // For some more information see #318
-            let mut slide = unsafe { libc::_dyld_get_image_vmaddr_slide(i) as usize };
-            if !text_fileoff_zero {
-                let adjust = segments[first_text].stated_virtual_memory_address;
-                for segment in segments.iter_mut() {
-                    segment.stated_virtual_memory_address -= adjust;
-                }
-                slide += adjust;
-            }
-
-            Some(Library {
-                name: OsStr::from_bytes(name.to_bytes()).to_owned(),
-                segments,
-                bias: slide,
-            })
-        }
-    } else if #[cfg(any(
-        target_os = "linux",
-        target_os = "fuchsia",
-    ))] {
-        // Other Unix (e.g. Linux) platforms use ELF as an object file format
-        // and typically implement an API called `dl_iterate_phdr` to load
-        // native libraries.
-
-        use mystd::os::unix::prelude::*;
-        use mystd::ffi::{OsStr, CStr};
-
+    } else {
         mod elf;
         use self::elf::Object;
+    }
+}
 
-        fn native_libraries() -> Vec<Library> {
-            let mut ret = Vec::new();
-            unsafe {
-                libc::dl_iterate_phdr(Some(callback), &mut ret as *mut Vec<_> as *mut _);
-            }
-            return ret;
-        }
-
-        // `info` should be a valid pointers.
-        // `vec` should be a valid pointer to a `std::Vec`.
-        unsafe extern "C" fn callback(
-            info: *mut libc::dl_phdr_info,
-            _size: libc::size_t,
-            vec: *mut libc::c_void,
-        ) -> libc::c_int {
-            let info = &*info;
-            let libs = &mut *(vec as *mut Vec<Library>);
-            let is_main_prog = info.dlpi_name.is_null() || *info.dlpi_name == 0;
-            let name = if is_main_prog {
-                if libs.is_empty() {
-                    mystd::env::current_exe().map(|e| e.into()).unwrap_or_default()
-                } else {
-                    OsString::new()
-                }
-            } else {
-                let bytes = CStr::from_ptr(info.dlpi_name).to_bytes();
-                OsStr::from_bytes(bytes).to_owned()
-            };
-            let headers = core::slice::from_raw_parts(info.dlpi_phdr, info.dlpi_phnum as usize);
-            libs.push(Library {
-                name,
-                segments: headers
-                    .iter()
-                    .map(|header| LibrarySegment {
-                        len: (*header).p_memsz as usize,
-                        stated_virtual_memory_address: (*header).p_vaddr as usize,
-                    })
-                    .collect(),
-                bias: info.dlpi_addr as usize,
-            });
-            0
-        }
+cfg_if::cfg_if! {
+    if #[cfg(windows)] {
+        mod libs_windows;
+        use libs_windows::native_libraries;
+    } else if #[cfg(any(
+        target_os = "macos",
+        target_os = "ios",
+        target_os = "tvos",
+        target_os = "watchos",
+    ))] {
+        mod libs_macos;
+        use libs_macos::native_libraries;
+    } else if #[cfg(target_os = "illumos")] {
+        mod libs_illumos;
+        use libs_illumos::native_libraries;
+    } else if #[cfg(all(
+        any(
+            target_os = "linux",
+            target_os = "fuchsia",
+            target_os = "freebsd",
+            all(target_os = "android", feature = "dl_iterate_phdr"),
+        ),
+        not(target_env = "uclibc"),
+    ))] {
+        mod libs_dl_iterate_phdr;
+        use libs_dl_iterate_phdr::native_libraries;
     } else if #[cfg(target_env = "libnx")] {
-        // DevkitA64 doesn't natively support debug info, but the build system will place debug
-        // info at the path `romfs:/debug_info.elf`.
-        mod elf;
-        use self::elf::Object;
-
-        fn native_libraries() -> Vec<Library> {
-            extern "C" {
-                static __start__: u8;
-            }
-
-            let bias = unsafe { &__start__ } as *const u8 as usize;
-
-            let mut ret = Vec::new();
-            let mut segments = Vec::new();
-            segments.push(LibrarySegment {
-                stated_virtual_memory_address: 0,
-                len: usize::max_value() - bias,
-            });
-
-            let path = "romfs:/debug_info.elf";
-            ret.push(Library {
-                name: path.into(),
-                segments,
-                bias,
-            });
-
-            ret
-        }
+        mod libs_libnx;
+        use libs_libnx::native_libraries;
+    } else if #[cfg(target_os = "haiku")] {
+        mod libs_haiku;
+        use libs_haiku::native_libraries;
     } else {
-        // Everything else should use ELF, but doesn't know how to load native
-        // libraries.
-
-        use mystd::os::unix::prelude::*;
-        mod elf;
-        use self::elf::Object;
-
+        // Everything else should doesn't know how to load native libraries.
         fn native_libraries() -> Vec<Library> {
             Vec::new()
         }
@@ -618,10 +358,14 @@
         if let Ok(mut frames) = cx.dwarf.find_frames(addr as u64) {
             while let Ok(Some(frame)) = frames.next() {
                 any_frames = true;
+                let name = match frame.function {
+                    Some(f) => Some(f.name.slice()),
+                    None => cx.object.search_symtab(addr as u64),
+                };
                 call(Symbol::Frame {
                     addr: addr as *mut c_void,
                     location: frame.location,
-                    name: frame.function.map(|f| f.name.slice()),
+                    name,
                 });
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/libbacktrace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/libbacktrace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/libbacktrace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/libbacktrace.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,458 +0,0 @@
-//! Symbolication strategy using the DWARF-parsing code in libbacktrace.
-//!
-//! The libbacktrace C library, typically distributed with gcc, supports not
-//! only generating a backtrace (which we don't actually use) but also
-//! symbolicating the backtrace and handling dwarf debug information about
-//! things like inlined frames and whatnot.
-//!
-//! This is relatively complicated due to lots of various concerns here, but the
-//! basic idea is:
-//!
-//! * First we call `backtrace_syminfo`. This gets symbol information from the
-//!   dynamic symbol table if we can.
-//! * Next we call `backtrace_pcinfo`. This will parse debuginfo tables if
-//!   they're available and allow us to recover information about inline frames,
-//!   filenames, line numbers, etc.
-//!
-//! There's lots of trickery about getting the dwarf tables into libbacktrace,
-//! but hopefully it's not the end of the world and is clear enough when reading
-//! below.
-//!
-//! This is the default symbolication strategy for non-MSVC and non-OSX
-//! platforms. In libstd though this is the default strategy for OSX.
-
-#![allow(bad_style)]
-
-extern crate backtrace_sys as bt;
-
-use core::{marker, ptr, slice};
-use libc::{self, c_char, c_int, c_void, uintptr_t};
-
-use crate::symbolize::{ResolveWhat, SymbolName};
-use crate::types::BytesOrWideString;
-
-pub enum Symbol<'a> {
-    Syminfo {
-        pc: uintptr_t,
-        symname: *const c_char,
-        _marker: marker::PhantomData<&'a ()>,
-    },
-    Pcinfo {
-        pc: uintptr_t,
-        filename: *const c_char,
-        lineno: c_int,
-        function: *const c_char,
-        symname: *const c_char,
-    },
-}
-
-impl Symbol<'_> {
-    pub fn name(&self) -> Option<SymbolName<'_>> {
-        let symbol = |ptr: *const c_char| unsafe {
-            if ptr.is_null() {
-                None
-            } else {
-                let len = libc::strlen(ptr);
-                Some(SymbolName::new(slice::from_raw_parts(
-                    ptr as *const u8,
-                    len,
-                )))
-            }
-        };
-        match *self {
-            Symbol::Syminfo { symname, .. } => symbol(symname),
-            Symbol::Pcinfo {
-                function, symname, ..
-            } => {
-                // If possible prefer the `function` name which comes from
-                // debuginfo and can typically be more accurate for inline
-                // frames for example. If that's not present though fall back to
-                // the symbol table name specified in `symname`.
-                //
-                // Note that sometimes `function` can feel somewhat less
-                // accurate, for example being listed as `try<i32,closure>`
-                // isntead of `std::panicking::try::do_call`. It's not really
-                // clear why, but overall the `function` name seems more accurate.
-                if let Some(sym) = symbol(function) {
-                    return Some(sym);
-                }
-                symbol(symname)
-            }
-        }
-    }
-
-    pub fn addr(&self) -> Option<*mut c_void> {
-        let pc = match *self {
-            Symbol::Syminfo { pc, .. } => pc,
-            Symbol::Pcinfo { pc, .. } => pc,
-        };
-        if pc == 0 {
-            None
-        } else {
-            Some(pc as *mut _)
-        }
-    }
-
-    fn filename_bytes(&self) -> Option<&[u8]> {
-        match *self {
-            Symbol::Syminfo { .. } => None,
-            Symbol::Pcinfo { filename, .. } => {
-                let ptr = filename as *const u8;
-                if ptr.is_null() {
-                    return None;
-                }
-                unsafe {
-                    let len = libc::strlen(filename);
-                    Some(slice::from_raw_parts(ptr, len))
-                }
-            }
-        }
-    }
-
-    pub fn filename_raw(&self) -> Option<BytesOrWideString<'_>> {
-        self.filename_bytes().map(BytesOrWideString::Bytes)
-    }
-
-    #[cfg(feature = "std")]
-    pub fn filename(&self) -> Option<&::std::path::Path> {
-        use std::path::Path;
-
-        #[cfg(unix)]
-        fn bytes2path(bytes: &[u8]) -> Option<&Path> {
-            use std::ffi::OsStr;
-            use std::os::unix::prelude::*;
-            Some(Path::new(OsStr::from_bytes(bytes)))
-        }
-
-        #[cfg(windows)]
-        fn bytes2path(bytes: &[u8]) -> Option<&Path> {
-            use std::str;
-            str::from_utf8(bytes).ok().map(Path::new)
-        }
-
-        self.filename_bytes().and_then(bytes2path)
-    }
-
-    pub fn lineno(&self) -> Option<u32> {
-        match *self {
-            Symbol::Syminfo { .. } => None,
-            Symbol::Pcinfo { lineno, .. } => Some(lineno as u32),
-        }
-    }
-
-    pub fn colno(&self) -> Option<u32> {
-        None
-    }
-}
-
-extern "C" fn error_cb(_data: *mut c_void, _msg: *const c_char, _errnum: c_int) {
-    // do nothing for now
-}
-
-/// Type of the `data` pointer passed into `syminfo_cb`
-struct SyminfoState<'a> {
-    cb: &'a mut (dyn FnMut(&super::Symbol) + 'a),
-    pc: usize,
-}
-
-extern "C" fn syminfo_cb(
-    data: *mut c_void,
-    pc: uintptr_t,
-    symname: *const c_char,
-    _symval: uintptr_t,
-    _symsize: uintptr_t,
-) {
-    let mut bomb = crate::Bomb { enabled: true };
-
-    // Once this callback is invoked from `backtrace_syminfo` when we start
-    // resolving we go further to call `backtrace_pcinfo`. The
-    // `backtrace_pcinfo` function will consult debug information and attemp tto
-    // do things like recover file/line information as well as inlined frames.
-    // Note though that `backtrace_pcinfo` can fail or not do much if there's
-    // not debug info, so if that happens we're sure to call the callback with
-    // at least one symbol from the `syminfo_cb`.
-    unsafe {
-        let syminfo_state = &mut *(data as *mut SyminfoState<'_>);
-        let mut pcinfo_state = PcinfoState {
-            symname,
-            called: false,
-            cb: syminfo_state.cb,
-        };
-        bt::backtrace_pcinfo(
-            init_state(),
-            syminfo_state.pc as uintptr_t,
-            pcinfo_cb,
-            error_cb,
-            &mut pcinfo_state as *mut _ as *mut _,
-        );
-        if !pcinfo_state.called {
-            (pcinfo_state.cb)(&super::Symbol {
-                inner: Symbol::Syminfo {
-                    pc: pc,
-                    symname: symname,
-                    _marker: marker::PhantomData,
-                },
-            });
-        }
-    }
-
-    bomb.enabled = false;
-}
-
-/// Type of the `data` pointer passed into `pcinfo_cb`
-struct PcinfoState<'a> {
-    cb: &'a mut (dyn FnMut(&super::Symbol) + 'a),
-    symname: *const c_char,
-    called: bool,
-}
-
-extern "C" fn pcinfo_cb(
-    data: *mut c_void,
-    pc: uintptr_t,
-    filename: *const c_char,
-    lineno: c_int,
-    function: *const c_char,
-) -> c_int {
-    let mut bomb = crate::Bomb { enabled: true };
-
-    unsafe {
-        let state = &mut *(data as *mut PcinfoState<'_>);
-        state.called = true;
-        (state.cb)(&super::Symbol {
-            inner: Symbol::Pcinfo {
-                pc: pc,
-                filename: filename,
-                lineno: lineno,
-                symname: state.symname,
-                function,
-            },
-        });
-    }
-
-    bomb.enabled = false;
-    return 0;
-}
-
-// The libbacktrace API supports creating a state, but it does not
-// support destroying a state. I personally take this to mean that a
-// state is meant to be created and then live forever.
-//
-// I would love to register an at_exit() handler which cleans up this
-// state, but libbacktrace provides no way to do so.
-//
-// With these constraints, this function has a statically cached state
-// that is calculated the first time this is requested. Remember that
-// backtracing all happens serially (one global lock).
-//
-// Note the lack of synchronization here is due to the requirement that
-// `resolve` is externally synchronized.
-unsafe fn init_state() -> *mut bt::backtrace_state {
-    static mut STATE: *mut bt::backtrace_state = 0 as *mut _;
-
-    if !STATE.is_null() {
-        return STATE;
-    }
-
-    STATE = bt::backtrace_create_state(
-        load_filename(),
-        // Don't exercise threadsafe capabilities of libbacktrace since
-        // we're always calling it in a synchronized fashion.
-        0,
-        error_cb,
-        ptr::null_mut(), // no extra data
-    );
-
-    return STATE;
-
-    // Note that for libbacktrace to operate at all it needs to find the DWARF
-    // debug info for the current executable. It typically does that via a
-    // number of mechanisms including, but not limited to:
-    //
-    // * /proc/self/exe on supported platforms
-    // * The filename passed in explicitly when creating state
-    //
-    // The libbacktrace library is a big wad of C code. This naturally means
-    // it's got memory safety vulnerabilities, especially when handling
-    // malformed debuginfo. Libstd has run into plenty of these historically.
-    //
-    // If /proc/self/exe is used then we can typically ignore these as we
-    // assume that libbacktrace is "mostly correct" and otherwise doesn't do
-    // weird things with "attempted to be correct" dwarf debug info.
-    //
-    // If we pass in a filename, however, then it's possible on some platforms
-    // (like BSDs) where a malicious actor can cause an arbitrary file to be
-    // placed at that location. This means that if we tell libbacktrace about a
-    // filename it may be using an arbitrary file, possibly causing segfaults.
-    // If we don't tell libbacktrace anything though then it won't do anything
-    // on platforms that don't support paths like /proc/self/exe!
-    //
-    // Given all that we try as hard as possible to *not* pass in a filename,
-    // but we must on platforms that don't support /proc/self/exe at all.
-    cfg_if::cfg_if! {
-        if #[cfg(any(target_os = "macos", target_os = "ios"))] {
-            // Note that ideally we'd use `std::env::current_exe`, but we can't
-            // require `std` here.
-            //
-            // Use `_NSGetExecutablePath` to load the current executable path
-            // into a static area (which if it's too small just give up).
-            //
-            // Note that we're seriously trusting libbacktrace here to not die
-            // on corrupt executables, but it surely does...
-            unsafe fn load_filename() -> *const libc::c_char {
-                const N: usize = 256;
-                static mut BUF: [u8; N] = [0; N];
-                extern {
-                    fn _NSGetExecutablePath(
-                        buf: *mut libc::c_char,
-                        bufsize: *mut u32,
-                    ) -> libc::c_int;
-                }
-                let mut sz: u32 = BUF.len() as u32;
-                let ptr = BUF.as_mut_ptr() as *mut libc::c_char;
-                if _NSGetExecutablePath(ptr, &mut sz) == 0 {
-                    ptr
-                } else {
-                    ptr::null()
-                }
-            }
-        } else if #[cfg(windows)] {
-            use crate::windows::*;
-
-            // Windows has a mode of opening files where after it's opened it
-            // can't be deleted. That's in general what we want here because we
-            // want to ensure that our executable isn't changing out from under
-            // us after we hand it off to libbacktrace, hopefully mitigating the
-            // ability to pass in arbitrary data into libbacktrace (which may be
-            // mishandled).
-            //
-            // Given that we do a bit of a dance here to attempt to get a sort
-            // of lock on our own image:
-            //
-            // * Get a handle to the current process, load its filename.
-            // * Open a file to that filename with the right flags.
-            // * Reload the current process's filename, making sure it's the same
-            //
-            // If that all passes we in theory have indeed opened our process's
-            // file and we're guaranteed it won't change. FWIW a bunch of this
-            // is copied from libstd historically, so this is my best
-            // interpretation of what was happening.
-            unsafe fn load_filename() -> *const libc::c_char {
-                load_filename_opt().unwrap_or(ptr::null())
-            }
-
-            unsafe fn load_filename_opt() -> Result<*const libc::c_char, ()> {
-                const N: usize = 256;
-                // This lives in static memory so we can return it..
-                static mut BUF: [i8; N] = [0; N];
-                // ... and this lives on the stack since it's temporary
-                let mut stack_buf = [0; N];
-                let name1 = query_full_name(&mut BUF)?;
-
-                let handle = CreateFileA(
-                    name1.as_ptr(),
-                    GENERIC_READ,
-                    FILE_SHARE_READ | FILE_SHARE_WRITE,
-                    ptr::null_mut(),
-                    OPEN_EXISTING,
-                    0,
-                    ptr::null_mut(),
-                );
-                if handle.is_null() {
-                    return Err(());
-                }
-
-                let name2 = query_full_name(&mut stack_buf)?;
-                if name1 != name2 {
-                    CloseHandle(handle);
-                    return Err(())
-                }
-                // intentionally leak `handle` here because having that open
-                // should preserve our lock on this file name.
-                Ok(name1.as_ptr())
-            }
-
-            unsafe fn query_full_name(buf: &mut [i8]) -> Result<&[i8], ()> {
-                let dll = GetModuleHandleA(b"kernel32.dll\0".as_ptr() as *const i8);
-                if dll.is_null() {
-                    return Err(())
-                }
-                let ptrQueryFullProcessImageNameA =
-                    GetProcAddress(dll, b"QueryFullProcessImageNameA\0".as_ptr() as *const _) as usize;
-                if ptrQueryFullProcessImageNameA == 0
-                {
-                    return Err(());
-                }
-                use core::mem;
-                let p1 = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId());
-                let mut len = buf.len() as u32;
-                let pfnQueryFullProcessImageNameA : extern "system" fn(
-                    hProcess: HANDLE,
-                    dwFlags: DWORD,
-                    lpExeName: LPSTR,
-                    lpdwSize: PDWORD,
-                ) -> BOOL = mem::transmute(ptrQueryFullProcessImageNameA);
-
-                let rc = pfnQueryFullProcessImageNameA(p1, 0, buf.as_mut_ptr(), &mut len);
-                CloseHandle(p1);
-
-                // We want to return a slice that is nul-terminated, so if
-                // everything was filled in and it equals the total length
-                // then equate that to failure.
-                //
-                // Otherwise when returning success make sure the nul byte is
-                // included in the slice.
-                if rc == 0 || len == buf.len() as u32 {
-                    Err(())
-                } else {
-                    assert_eq!(buf[len as usize], 0);
-                    Ok(&buf[..(len + 1) as usize])
-                }
-            }
-        } else if #[cfg(target_os = "vxworks")] {
-            unsafe fn load_filename() -> *const libc::c_char {
-                use libc;
-                use core::mem;
-
-                const N: usize = libc::VX_RTP_NAME_LENGTH as usize + 1;
-                static mut BUF: [libc::c_char; N] = [0; N];
-
-                let mut rtp_desc : libc::RTP_DESC = mem::zeroed();
-                if (libc::rtpInfoGet(0, &mut rtp_desc as *mut libc::RTP_DESC) == 0) {
-                    BUF.copy_from_slice(&rtp_desc.pathName);
-                    BUF.as_ptr()
-                } else {
-                    ptr::null()
-                }
-            }
-        } else {
-            unsafe fn load_filename() -> *const libc::c_char {
-                ptr::null()
-            }
-        }
-    }
-}
-
-pub unsafe fn resolve(what: ResolveWhat<'_>, cb: &mut dyn FnMut(&super::Symbol)) {
-    let symaddr = what.address_or_ip() as usize;
-
-    // backtrace errors are currently swept under the rug
-    let state = init_state();
-    if state.is_null() {
-        return;
-    }
-
-    // Call the `backtrace_syminfo` API which (from reading the code)
-    // should call `syminfo_cb` exactly once (or fail with an error
-    // presumably). We then handle more within the `syminfo_cb`.
-    //
-    // Note that we do this since `syminfo` will consult the symbol table,
-    // finding symbol names even if there's no debug information in the binary.
-    let mut syminfo_state = SyminfoState { pc: symaddr, cb };
-    bt::backtrace_syminfo(
-        state,
-        symaddr as uintptr_t,
-        syminfo_cb,
-        error_cb,
-        &mut syminfo_state as *mut _ as *mut _,
-    );
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/miri.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/miri.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/miri.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/miri.rs	2021-12-09 12:01:26.000000000 +0000
@@ -52,3 +52,5 @@
         ))
     }
 }
+
+pub unsafe fn clear_symbol_cache() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -159,7 +159,7 @@
 where
     F: FnMut(&Symbol),
 {
-    resolve_imp(ResolveWhat::Address(addr), &mut cb)
+    imp::resolve(ResolveWhat::Address(addr), &mut cb)
 }
 
 /// Same as `resolve_frame`, only unsafe as it's unsynchronized.
@@ -175,7 +175,7 @@
 where
     F: FnMut(&Symbol),
 {
-    resolve_imp(ResolveWhat::Frame(frame), &mut cb)
+    imp::resolve(ResolveWhat::Frame(frame), &mut cb)
 }
 
 /// A trait representing the resolution of a symbol in a file.
@@ -191,7 +191,7 @@
     // TODO: this lifetime bound needs to be persisted eventually to `Symbol`,
     // but that's currently a breaking change. For now this is safe since
     // `Symbol` is only ever handed out by reference and can't be cloned.
-    inner: SymbolImp<'static>,
+    inner: imp::Symbol<'static>,
 }
 
 impl Symbol {
@@ -383,7 +383,7 @@
 cfg_if::cfg_if! {
     if #[cfg(feature = "cpp_demangle")] {
         impl<'a> fmt::Display for SymbolName<'a> {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                 if let Some(ref s) = self.demangled {
                     s.fmt(f)
                 } else if let Some(ref cpp) = self.cpp_demangled.0 {
@@ -409,7 +409,7 @@
 cfg_if::cfg_if! {
     if #[cfg(all(feature = "std", feature = "cpp_demangle"))] {
         impl<'a> fmt::Debug for SymbolName<'a> {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                 use std::fmt::Write;
 
                 if let Some(ref s) = self.demangled {
@@ -459,48 +459,26 @@
 pub fn clear_symbol_cache() {
     let _guard = crate::lock::lock();
     unsafe {
-        clear_symbol_cache_imp();
+        imp::clear_symbol_cache();
     }
 }
 
 cfg_if::cfg_if! {
     if #[cfg(miri)] {
         mod miri;
-        use self::miri::resolve as resolve_imp;
-        use self::miri::Symbol as SymbolImp;
-        unsafe fn clear_symbol_cache_imp() {}
+        use miri as imp;
     } else if #[cfg(all(windows, target_env = "msvc", not(target_vendor = "uwp")))] {
         mod dbghelp;
-        use self::dbghelp::resolve as resolve_imp;
-        use self::dbghelp::Symbol as SymbolImp;
-        unsafe fn clear_symbol_cache_imp() {}
-    } else if #[cfg(all(
-        feature = "libbacktrace",
-        any(unix, all(windows, not(target_vendor = "uwp"), target_env = "gnu")),
-        not(target_os = "fuchsia"),
-        not(target_os = "emscripten"),
-        not(target_env = "uclibc"),
-        not(target_env = "libnx"),
-    ))] {
-        mod libbacktrace;
-        use self::libbacktrace::resolve as resolve_imp;
-        use self::libbacktrace::Symbol as SymbolImp;
-        unsafe fn clear_symbol_cache_imp() {}
+        use dbghelp as imp;
     } else if #[cfg(all(
-        feature = "gimli-symbolize",
         any(unix, windows),
         not(target_vendor = "uwp"),
         not(target_os = "emscripten"),
     ))] {
         mod gimli;
-        use self::gimli::resolve as resolve_imp;
-        use self::gimli::Symbol as SymbolImp;
-        use self::gimli::clear_symbol_cache as clear_symbol_cache_imp;
+        use gimli as imp;
     } else {
         mod noop;
-        use self::noop::resolve as resolve_imp;
-        use self::noop::Symbol as SymbolImp;
-        #[allow(unused)]
-        unsafe fn clear_symbol_cache_imp() {}
+        use noop as imp;
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/noop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/noop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/src/symbolize/noop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/src/symbolize/noop.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,5 @@
         None
     }
 }
+
+pub unsafe fn clear_symbol_cache() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/tests/accuracy/main.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/tests/accuracy/main.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/tests/accuracy/main.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/tests/accuracy/main.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,8 +20,6 @@
     // Skip musl which is by default statically linked and doesn't support
     // dynamic libraries.
     !cfg!(target_env = "musl")
-    // Skip MinGW on libbacktrace which doesn't have support for DLLs.
-    && !(cfg!(windows) && cfg!(target_env = "gnu") && cfg!(feature = "libbacktrace"))
     // Skip Miri, since it doesn't support dynamic libraries.
     && !cfg!(miri)
     {
@@ -36,11 +34,13 @@
         } else {
             dir.push("libdylib_dep.so");
         }
-        let lib = libloading::Library::new(&dir).unwrap();
-        let api = unsafe { lib.get::<extern "C" fn(Pos, fn(Pos, Pos))>(b"foo").unwrap() };
-        api(pos!(), |a, b| {
-            check!(a, b);
-        });
+        unsafe {
+            let lib = libloading::Library::new(&dir).unwrap();
+            let api = lib.get::<extern "C" fn(Pos, fn(Pos, Pos))>(b"foo").unwrap();
+            api(pos!(), |a, b| {
+                check!(a, b);
+            });
+        }
     }
 
     outer(pos!());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/tests/smoke.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/tests/smoke.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/backtrace/tests/smoke.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/backtrace/tests/smoke.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,38 +1,6 @@
 use backtrace::Frame;
 use std::thread;
 
-// Reflects the conditional compilation logic at end of src/symbolize/mod.rs
-static NOOP: bool = false;
-static DBGHELP: bool = !NOOP
-    && cfg!(all(
-        windows,
-        target_env = "msvc",
-        not(target_vendor = "uwp")
-    ));
-static LIBBACKTRACE: bool = !NOOP
-    && !DBGHELP
-    && cfg!(all(
-        feature = "libbacktrace",
-        any(
-            unix,
-            all(windows, not(target_vendor = "uwp"), target_env = "gnu")
-        ),
-        not(target_os = "fuchsia"),
-        not(target_os = "emscripten"),
-        not(target_env = "uclibc"),
-        not(target_env = "libnx"),
-    ));
-static GIMLI_SYMBOLIZE: bool = !NOOP
-    && !DBGHELP
-    && !LIBBACKTRACE
-    && cfg!(all(
-        feature = "gimli-symbolize",
-        any(unix, windows),
-        not(target_vendor = "uwp"),
-        not(target_os = "emscripten"),
-    ));
-static MIRI_SYMBOLIZE: bool = cfg!(miri);
-
 #[test]
 // FIXME: shouldn't ignore this test on i686-msvc, unsure why it's failing
 #[cfg_attr(all(target_arch = "x86", target_env = "msvc"), ignore)]
@@ -159,8 +127,6 @@
         }
 
         let mut resolved = 0;
-        let can_resolve = LIBBACKTRACE || GIMLI_SYMBOLIZE || MIRI_SYMBOLIZE;
-        let can_resolve_cols = GIMLI_SYMBOLIZE || MIRI_SYMBOLIZE;
 
         let mut name = None;
         let mut addr = None;
@@ -175,31 +141,22 @@
             line = sym.lineno();
             file = sym.filename().map(|v| v.to_path_buf());
         });
+        assert!(resolved > 0);
 
-        // dbghelp doesn't always resolve symbols right now
-        match resolved {
-            0 => return assert!(!can_resolve),
-            _ => {}
-        }
-
-        if can_resolve {
-            let name = name.expect("didn't find a name");
+        let name = name.expect("didn't find a name");
 
-            // in release mode names get weird as functions can get merged
-            // together with `mergefunc`, so only assert this in debug mode
-            if cfg!(debug_assertions) {
-                assert!(
-                    name.contains(expected_name),
-                    "didn't find `{}` in `{}`",
-                    expected_name,
-                    name
-                );
-            }
+        // in release mode names get weird as functions can get merged
+        // together with `mergefunc`, so only assert this in debug mode
+        if cfg!(debug_assertions) {
+            assert!(
+                name.contains(expected_name),
+                "didn't find `{}` in `{}`",
+                expected_name,
+                name
+            );
         }
 
-        if can_resolve {
-            addr.expect("didn't find a symbol");
-        }
+        addr.expect("didn't find a symbol");
 
         if cfg!(debug_assertions) {
             let line = line.expect("didn't find a line number");
@@ -221,7 +178,9 @@
                     expected_line
                 );
             }
-            if can_resolve_cols {
+
+            // dbghelp on MSVC doesn't support column numbers
+            if !cfg!(target_env = "msvc") {
                 let col = col.expect("didn't find a column number");
                 if expected_col != 0 {
                     assert!(
@@ -321,9 +280,8 @@
 
             let mut is_recursive_stack_references = false;
             backtrace::resolve(frame.ip(), |sym| {
-                is_recursive_stack_references |= (LIBBACKTRACE || GIMLI_SYMBOLIZE)
-                    && sym
-                        .name()
+                is_recursive_stack_references |=
+                    sym.name()
                         .and_then(|name| name.as_str())
                         .map_or(false, |name| {
                             eprintln!("name = {}", name);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-use std::env;
-use std::process::Command;
-use std::str::{self, FromStr};
-
-fn main(){
-    let minor = match rustc_minor_version() {
-        Some(minor) => minor,
-        None => return,
-    };
-
-    // const fn stabilized in Rust 1.31:
-    if minor >= 31 {
-        println!("cargo:rustc-cfg=bitflags_const_fn");
-    }
-}
-
-fn rustc_minor_version() -> Option<u32> {
-    let rustc = match env::var_os("RUSTC") {
-        Some(rustc) => rustc,
-        None => return None,
-    };
-
-    let output = match Command::new(rustc).arg("--version").output() {
-        Ok(output) => output,
-        Err(_) => return None,
-    };
-
-    let version = match str::from_utf8(&output.stdout) {
-        Ok(version) => version,
-        Err(_) => return None,
-    };
-
-    let mut pieces = version.split('.');
-    if pieces.next() != Some("rustc 1") {
-        return None;
-    }
-
-    let next = match pieces.next() {
-        Some(next) => next,
-        None => return None,
-    };
-
-    u32::from_str(next).ok()
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"00224cc8d292567bdd212c36db66a1f662cd2e6c58e947900680234937e288a9","CODE_OF_CONDUCT.md":"42634d0f6d922f49857175af991802822f7f920487aefa2ee250a50d12251a66","Cargo.toml":"abacd42e33056c16008ab8eefd16eb2403cbc3393f8a6ed352a9a39d945ad3a5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"6b236f8b62c82f189fabce0756e01a2c0ab1f32cb84cad9ff3c96b2ce5282bda","build.rs":"8923f38056f859b30aa9022980bb517755cbef57e1b09c34b33b27eb03b0626c","src/example_generated.rs":"e43eb59e90f317f38d436670a6067d2fd9eb35fb319fe716184e4a04e24ed1b2","src/lib.rs":"bd4e44ac35831c75af8815ba3a11ee1659afe0f72ce9c5f638a66bf50aa23d2a"},"package":"cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"d362fc1fccaaf4d421bcf0fe8b80ddb4f625dade0c1ee52d08bd0b95509a49d1","CODE_OF_CONDUCT.md":"42634d0f6d922f49857175af991802822f7f920487aefa2ee250a50d12251a66","Cargo.toml":"87aced7532a7974eb37ab5fe6037f0abafc36d6b2d74891ecd2bf2f14f50d11e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"baa8604f8afb34fd93b9c79729daafb884dedcaf34023e4af8ad037d916061fd","src/example_generated.rs":"e43eb59e90f317f38d436670a6067d2fd9eb35fb319fe716184e4a04e24ed1b2","src/lib.rs":"e6477688535ee326d27238aeedc9cb4320ac35b9d17a4deda09e0587b0ccdbd4","tests/basic.rs":"146f1cbf6279bc609242cd3349f29cb21b41294f5e4921875f5ec95bd83529a2","tests/compile-fail/impls/copy.rs":"b791371237ddc75a7c04d2130e03b462c9c00a80dca08bd45aa97433d9c0d13a","tests/compile-fail/impls/copy.stderr.beta":"77d83484ce221d4b6ff2f7de843929a452d779fcfff428122710dd8218c298e3","tests/compile-fail/impls/eq.rs":"0cee8b9e07d537890e0189710293b53972d0fab63c09366f33c391065afafa99","tests/compile-fail/impls/eq.stderr.beta":"381fc6143d45ce76d7cecc47aa59cb69fe5e79c0b60a4a85d5c6163b400b3cc7","tests/compile-fail/non_integer_base/all_defined.rs":"95e14cad9e94560262f2862c3c01865ac30369b69da1001b0e7285cb55e6cb75","tests/compile-fail/non_integer_base/all_defined.stderr.beta":"1760739a276690903bb03844025587d37939f5dfcbfab309db3c86f32bdbf748","tests/compile-fail/non_integer_base/all_missing.rs":"b3d9da619d23213731ba2581aa7999c796c3c79aaf4f0ee6b11ceec08a11537f","tests/compile-fail/non_integer_base/all_missing.stderr.beta":"37e102290d3867e175b21976be798939f294efb17580d5b51e7b17b590d55132","tests/compile-fail/visibility/private_field.rs":"38e4d3fe6471829360d12c8d09b097f6a21aa93fb51eac3b215d96bdae23316b","tests/compile-fail/visibility/private_field.stderr.beta":"5aa24a3ebb39326f31927721c5017b8beb66c3e501fb865a3fa814c9763bfa0f","tests/compile-fail/visibility/private_flags.rs":"2ce4235802aa4e9c96c4e77d9e31d8401ef58dcda4741325184f0764ab1fe393","tests/compile-fail/visibility/private_flags.stderr.beta":"f3eb9f7baf2689258f3519ff7ee5c6ec3c237264ebcfe63f40c40f2023e5022f","tests/compile-fail/visibility/pub_const.rs":"8f813a97ac518c5ea8ac65b184101912452384afaf7b8d6c5e62f8370eca3c0a","tests/compile-fail/visibility/pub_const.stderr.beta":"823976ae1794d7f5372e2ec9aabba497e7bb88004722904c38da342ed98e8962","tests/compile-pass/impls/convert.rs":"88fe80bfb9cd5779f0e1d92c9ec02a8b6bb67e334c07f2309e9c0ba5ef776eb0","tests/compile-pass/impls/default.rs":"c508f9a461691f44b45142fa5ad599f02326e1de4c0cbca6c0593f4652eba109","tests/compile-pass/impls/inherent_methods.rs":"ecc26388e9a394bfa7a5bb69a5d621ab3d4d1e53f28f657bb8e78fe79f437913","tests/compile-pass/redefinition/core.rs":"ff5b6e72f87acc6ebb12405d3c0f6e3fa62e669933656a454bb63b30ea44179c","tests/compile-pass/redefinition/stringify.rs":"1edbce42b900c14425d7ffa14e83e165ebe452d7dccd8c0a8a821bdec64f5c93","tests/compile-pass/repr/c.rs":"6fda17f7c2edfcd155314579e83d0fc8a16209e400f1f9a5ca77bd9a799041f2","tests/compile-pass/repr/transparent.rs":"6cdc87a2137d8a4e0c8ce9b6cba83c82255f8ea125951bf614418685600489ce","tests/compile-pass/visibility/bits_field.rs":"1f3e5ba5a047440066a9f6bf7b7af33f5b06f6b1da3dd9af6886168199a7ea0a","tests/compile-pass/visibility/pub_in.rs":"e95312ff60966d42ec4bc00225507895a9b8ec24056ce6a9edd9145be35d730f","tests/compile.rs":"f27c67a7dd183ca30efea1b6e0880e3469a6dd63b92b1fd711c082df182c9eec"},"package":"bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,11 +11,11 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 authors = ["The Rust Project Developers"]
-build = "build.rs"
-exclude = [".travis.yml", "appveyor.yml", "bors.toml"]
+exclude = ["bors.toml"]
 description = "A macro to generate structures which behave like bitflags.\n"
 homepage = "https://github.com/bitflags/bitflags"
 documentation = "https://docs.rs/bitflags"
@@ -26,9 +26,33 @@
 repository = "https://github.com/bitflags/bitflags"
 [package.metadata.docs.rs]
 features = ["example_generated"]
+[dependencies.compiler_builtins]
+version = "0.1.2"
+optional = true
+
+[dependencies.core]
+version = "1.0.0"
+optional = true
+package = "rustc-std-workspace-core"
+[dev-dependencies.rustversion]
+version = "1.0"
+
+[dev-dependencies.serde]
+version = "1.0"
+
+[dev-dependencies.serde_derive]
+version = "1.0"
+
+[dev-dependencies.serde_json]
+version = "1.0"
+
+[dev-dependencies.trybuild]
+version = "1.0"
+
+[dev-dependencies.walkdir]
+version = "2.3"
 
 [features]
 default = []
 example_generated = []
-[badges.travis-ci]
-repository = "bitflags/bitflags"
+rustc-dep-of-std = ["core", "compiler_builtins"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,60 @@
+# 1.3.2
+
+- Allow `non_snake_case` in generated flags types ([#256])
+
+[#252]: https://github.com/bitflags/bitflags/pull/256
+
+# 1.3.1
+
+- Revert unconditional `#[repr(transparent)]` ([#252])
+
+[#252]: https://github.com/bitflags/bitflags/pull/252
+
+# 1.3.0 (yanked)
+
+- Add `#[repr(transparent)]` ([#187])
+
+- End `empty` doc comment with full stop ([#202])
+
+- Fix typo in crate root docs ([#206])
+
+- Document from_bits_unchecked unsafety ([#207])
+
+- Let `is_all` ignore extra bits ([#211])
+
+- Allows empty flag definition ([#225])
+
+- Making crate accessible from std ([#227])
+
+- Make `from_bits` a const fn ([#229])
+
+- Allow multiple bitflags structs in one macro invocation ([#235])
+
+- Add named functions to perform set operations ([#244])
+
+- Fix typos in method docs ([#245])
+
+- Modernization of the `bitflags` macro to take advantage of newer features and 2018 idioms ([#246])
+
+- Fix regression (in an unreleased feature) and simplify tests ([#247])
+
+- Use `Self` and fix bug when overriding `stringify!` ([#249])
+
+[#187]: https://github.com/bitflags/bitflags/pull/187
+[#202]: https://github.com/bitflags/bitflags/pull/202
+[#206]: https://github.com/bitflags/bitflags/pull/206
+[#207]: https://github.com/bitflags/bitflags/pull/207
+[#211]: https://github.com/bitflags/bitflags/pull/211
+[#225]: https://github.com/bitflags/bitflags/pull/225
+[#227]: https://github.com/bitflags/bitflags/pull/227
+[#229]: https://github.com/bitflags/bitflags/pull/229
+[#235]: https://github.com/bitflags/bitflags/pull/235
+[#244]: https://github.com/bitflags/bitflags/pull/244
+[#245]: https://github.com/bitflags/bitflags/pull/245
+[#246]: https://github.com/bitflags/bitflags/pull/246
+[#247]: https://github.com/bitflags/bitflags/pull/247
+[#249]: https://github.com/bitflags/bitflags/pull/249
+
 # 1.2.1
 
 - Remove extraneous `#[inline]` attributes ([#194])
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,10 @@
 bitflags
 ========
 
-[![Build Status](https://travis-ci.com/bitflags/bitflags.svg?branch=master)](https://travis-ci.com/bitflags/bitflags)
+[![Rust](https://github.com/bitflags/bitflags/workflows/Rust/badge.svg)](https://github.com/bitflags/bitflags/actions)
 [![Join the chat at https://gitter.im/bitflags/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bitflags/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)
 [![Latest version](https://img.shields.io/crates/v/bitflags.svg)](https://crates.io/crates/bitflags)
 [![Documentation](https://docs.rs/bitflags/badge.svg)](https://docs.rs/bitflags)
-![Minimum rustc version](https://img.shields.io/badge/rustc-1.20+-yellow.svg)
 ![License](https://img.shields.io/crates/l/bitflags.svg)
 
 A Rust macro to generate structures which behave like a set of bitflags
@@ -19,16 +18,15 @@
 
 ```toml
 [dependencies]
-bitflags = "1.0"
+bitflags = "1.3"
 ```
 
-and this to your crate root:
+and this to your source code:
 
 ```rust
-#[macro_use]
-extern crate bitflags;
+use bitflags::bitflags;
 ```
 
 ## Rust Version Support
 
-The minimum supported Rust version is 1.20 due to use of associated constants.
+The minimum supported Rust version is 1.46 due to use of associated constants and const functions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,15 +11,14 @@
 //! A typesafe bitmask flag generator useful for sets of C-style bitmask flags.
 //! It can be used for creating typesafe wrappers around C APIs.
 //!
-//! The `bitflags!` macro generates a `struct` that manages a set of flags. The
+//! The `bitflags!` macro generates `struct`s that manage a set of flags. The
 //! flags should only be defined for integer types, otherwise unexpected type
 //! errors may occur at compile time.
 //!
 //! # Example
 //!
 //! ```
-//! #[macro_use]
-//! extern crate bitflags;
+//! use bitflags::bitflags;
 //!
 //! bitflags! {
 //!     struct Flags: u32 {
@@ -47,11 +46,10 @@
 //! implementations:
 //!
 //! ```
-//! #[macro_use]
-//! extern crate bitflags;
-//!
 //! use std::fmt;
 //!
+//! use bitflags::bitflags;
+//!
 //! bitflags! {
 //!     struct Flags: u32 {
 //!         const A = 0b00000001;
@@ -84,21 +82,19 @@
 //!
 //! # Visibility
 //!
-//! The generated struct and its associated flag constants are not exported
+//! The generated structs and their associated flag constants are not exported
 //! out of the current module by default. A definition can be exported out of
-//! the current module by adding `pub` before `flags`:
+//! the current module by adding `pub` before `struct`:
 //!
 //! ```
-//! #[macro_use]
-//! extern crate bitflags;
-//!
 //! mod example {
+//!     use bitflags::bitflags;
+//!
 //!     bitflags! {
 //!         pub struct Flags1: u32 {
 //!             const A = 0b00000001;
 //!         }
-//!     }
-//!     bitflags! {
+//!
 //! #       pub
 //!         struct Flags2: u32 {
 //!             const B = 0b00000010;
@@ -114,26 +110,44 @@
 //!
 //! # Attributes
 //!
-//! Attributes can be attached to the generated `struct` by placing them
-//! before the `flags` keyword.
+//! Attributes can be attached to the generated `struct`s by placing them
+//! before the `struct` keyword.
+//!
+//! ## Representations
+//!
+//! It's valid to add a `#[repr(C)]` or `#[repr(transparent)]` attribute to a type
+//! generated by `bitflags!`. In these cases, the type is guaranteed to be a newtype.
+//!
+//! ```
+//! use bitflags::bitflags;
+//!
+//! bitflags! {
+//!     #[repr(transparent)]
+//!     struct Flags: u32 {
+//!         const A = 0b00000001;
+//!         const B = 0b00000010;
+//!         const C = 0b00000100;
+//!     }
+//! }
+//! ```
 //!
 //! # Trait implementations
 //!
 //! The `Copy`, `Clone`, `PartialEq`, `Eq`, `PartialOrd`, `Ord` and `Hash`
-//! traits automatically derived for the `struct` using the `derive` attribute.
+//! traits are automatically derived for the `struct`s using the `derive` attribute.
 //! Additional traits can be derived by providing an explicit `derive`
-//! attribute on `flags`.
+//! attribute on `struct`.
 //!
-//! The `Extend` and `FromIterator` traits are implemented for the `struct`,
+//! The `Extend` and `FromIterator` traits are implemented for the `struct`s,
 //! too: `Extend` adds the union of the instances of the `struct` iterated over,
 //! while `FromIterator` calculates the union.
 //!
-//! The `Binary`, `Debug`, `LowerHex`, `Octal` and `UpperHex` trait is also
+//! The `Binary`, `Debug`, `LowerHex`, `Octal` and `UpperHex` traits are also
 //! implemented by displaying the bits value of the internal struct.
 //!
 //! ## Operators
 //!
-//! The following operator traits are implemented for the generated `struct`:
+//! The following operator traits are implemented for the generated `struct`s:
 //!
 //! - `BitOr` and `BitOrAssign`: union
 //! - `BitAnd` and `BitAndAssign`: intersection
@@ -143,7 +157,7 @@
 //!
 //! # Methods
 //!
-//! The following methods are defined for the generated `struct`:
+//! The following methods are defined for the generated `struct`s:
 //!
 //! - `empty`: an empty set of flags
 //! - `all`: the set of all defined flags
@@ -159,23 +173,34 @@
 //! - `is_empty`: `true` if no flags are currently stored
 //! - `is_all`: `true` if currently set flags exactly equal all defined flags
 //! - `intersects`: `true` if there are flags common to both `self` and `other`
-//! - `contains`: `true` all of the flags in `other` are contained within `self`
+//! - `contains`: `true` if all of the flags in `other` are contained within `self`
 //! - `insert`: inserts the specified flags in-place
 //! - `remove`: removes the specified flags in-place
 //! - `toggle`: the specified flags will be inserted if not present, and removed
 //!             if they are.
 //! - `set`: inserts or removes the specified flags depending on the passed value
+//! - `intersection`: returns a new set of flags, containing only the flags present
+//!                   in both `self` and `other` (the argument to the function).
+//! - `union`: returns a new set of flags, containing any flags present in
+//!            either `self` or `other` (the argument to the function).
+//! - `difference`: returns a new set of flags, containing all flags present in
+//!                 `self` without any of the flags present in `other` (the
+//!                 argument to the function).
+//! - `symmetric_difference`: returns a new set of flags, containing all flags
+//!                           present in either `self` or `other` (the argument
+//!                           to the function), but not both.
+//! - `complement`: returns a new set of flags, containing all flags which are
+//!                 not set in `self`, but which are allowed for this type.
 //!
 //! ## Default
 //!
-//! The `Default` trait is not automatically implemented for the generated struct.
+//! The `Default` trait is not automatically implemented for the generated structs.
 //!
 //! If your default value is equal to `0` (which is the same value as calling `empty()`
 //! on the generated struct), you can simply derive `Default`:
 //!
 //! ```
-//! #[macro_use]
-//! extern crate bitflags;
+//! use bitflags::bitflags;
 //!
 //! bitflags! {
 //!     // Results in default value with bits: 0
@@ -196,8 +221,7 @@
 //! If your default value is not equal to `0` you need to implement `Default` yourself:
 //!
 //! ```
-//! #[macro_use]
-//! extern crate bitflags;
+//! use bitflags::bitflags;
 //!
 //! bitflags! {
 //!     struct Flags: u32 {
@@ -225,8 +249,7 @@
 //! Flags with a value equal to zero will have some strange behavior that one should be aware of.
 //!
 //! ```
-//! #[macro_use]
-//! extern crate bitflags;
+//! use bitflags::bitflags;
 //!
 //! bitflags! {
 //!     struct Flags: u32 {
@@ -249,28 +272,23 @@
 //!     assert!(none.is_empty());
 //! }
 //! ```
+//!
+//! Users should generally avoid defining a flag with a value of zero.
 
-#![no_std]
-#![doc(html_root_url = "https://docs.rs/bitflags/1.2.1")]
-
-#[cfg(test)]
-#[macro_use]
-extern crate std;
+#![cfg_attr(not(test), no_std)]
+#![doc(html_root_url = "https://docs.rs/bitflags/1.3.2")]
 
-// Re-export libcore using an alias so that the macros can work without
-// requiring `extern crate core` downstream.
 #[doc(hidden)]
 pub extern crate core as _core;
 
-/// The macro used to generate the flag structure.
+/// The macro used to generate the flag structures.
 ///
 /// See the [crate level docs](../bitflags/index.html) for complete documentation.
 ///
 /// # Example
 ///
 /// ```
-/// #[macro_use]
-/// extern crate bitflags;
+/// use bitflags::bitflags;
 ///
 /// bitflags! {
 ///     struct Flags: u32 {
@@ -295,11 +313,10 @@
 /// implementations:
 ///
 /// ```
-/// #[macro_use]
-/// extern crate bitflags;
-///
 /// use std::fmt;
 ///
+/// use bitflags::bitflags;
+///
 /// bitflags! {
 ///     struct Flags: u32 {
 ///         const A = 0b00000001;
@@ -333,78 +350,18 @@
 macro_rules! bitflags {
     (
         $(#[$outer:meta])*
-        pub struct $BitFlags:ident: $T:ty {
-            $(
-                $(#[$inner:ident $($args:tt)*])*
-                const $Flag:ident = $value:expr;
-            )+
-        }
-    ) => {
-        __bitflags! {
-            $(#[$outer])*
-            (pub) $BitFlags: $T {
-                $(
-                    $(#[$inner $($args)*])*
-                    $Flag = $value;
-                )+
-            }
-        }
-    };
-    (
-        $(#[$outer:meta])*
-        struct $BitFlags:ident: $T:ty {
+        $vis:vis struct $BitFlags:ident: $T:ty {
             $(
                 $(#[$inner:ident $($args:tt)*])*
                 const $Flag:ident = $value:expr;
-            )+
+            )*
         }
-    ) => {
-        __bitflags! {
-            $(#[$outer])*
-            () $BitFlags: $T {
-                $(
-                    $(#[$inner $($args)*])*
-                    $Flag = $value;
-                )+
-            }
-        }
-    };
-    (
-        $(#[$outer:meta])*
-        pub ($($vis:tt)+) struct $BitFlags:ident: $T:ty {
-            $(
-                $(#[$inner:ident $($args:tt)*])*
-                const $Flag:ident = $value:expr;
-            )+
-        }
-    ) => {
-        __bitflags! {
-            $(#[$outer])*
-            (pub ($($vis)+)) $BitFlags: $T {
-                $(
-                    $(#[$inner $($args)*])*
-                    $Flag = $value;
-                )+
-            }
-        }
-    };
-}
 
-#[macro_export(local_inner_macros)]
-#[doc(hidden)]
-macro_rules! __bitflags {
-    (
-        $(#[$outer:meta])*
-        ($($vis:tt)*) $BitFlags:ident: $T:ty {
-            $(
-                $(#[$inner:ident $($args:tt)*])*
-                $Flag:ident = $value:expr;
-            )+
-        }
+        $($t:tt)*
     ) => {
         $(#[$outer])*
         #[derive(Copy, PartialEq, Eq, Clone, PartialOrd, Ord, Hash)]
-        $($vis)* struct $BitFlags {
+        $vis struct $BitFlags {
             bits: $T,
         }
 
@@ -413,63 +370,52 @@
                 $(
                     $(#[$inner $($args)*])*
                     $Flag = $value;
-                )+
+                )*
             }
         }
-    };
-}
 
-#[macro_export(local_inner_macros)]
-#[doc(hidden)]
-#[cfg(bitflags_const_fn)]
-macro_rules! __fn_bitflags {
-    (
-        $(# $attr_args:tt)*
-        const fn $($item:tt)*
-    ) => {
-        $(# $attr_args)*
-        const fn $($item)*
-    };
-    (
-        $(# $attr_args:tt)*
-        pub const fn $($item:tt)*
-    ) => {
-        $(# $attr_args)*
-        pub const fn $($item)*
-    };
-    (
-        $(# $attr_args:tt)*
-        pub const unsafe fn $($item:tt)*
-    ) => {
-        $(# $attr_args)*
-        pub const unsafe fn $($item)*
+        bitflags! {
+            $($t)*
+        }
     };
+    () => {};
 }
 
+// A helper macro to implement the `all` function.
 #[macro_export(local_inner_macros)]
 #[doc(hidden)]
-#[cfg(not(bitflags_const_fn))]
-macro_rules! __fn_bitflags {
+macro_rules! __impl_all_bitflags {
     (
-        $(# $attr_args:tt)*
-        const fn $($item:tt)*
-    ) => {
-        $(# $attr_args)*
-        fn $($item)*
-    };
-    (
-        $(# $attr_args:tt)*
-        pub const fn $($item:tt)*
+        $BitFlags:ident: $T:ty {
+            $(
+                $(#[$attr:ident $($args:tt)*])*
+                $Flag:ident = $value:expr;
+            )+
+        }
     ) => {
-        $(# $attr_args)*
-        pub fn $($item)*
+        // See `Debug::fmt` for why this approach is taken.
+        #[allow(non_snake_case)]
+        trait __BitFlags {
+            $(
+                const $Flag: $T = 0;
+            )+
+        }
+        #[allow(non_snake_case)]
+        impl __BitFlags for $BitFlags {
+            $(
+                __impl_bitflags! {
+                    #[allow(deprecated)]
+                    $(? #[$attr $($args)*])*
+                    const $Flag: $T = Self::$Flag.bits;
+                }
+            )+
+        }
+        Self { bits: $(<Self as __BitFlags>::$Flag)|+ }
     };
     (
-        $(# $attr_args:tt)*
-        pub const unsafe fn $($item:tt)*
+        $BitFlags:ident: $T:ty { }
     ) => {
-        $(# $attr_args)*
-        pub unsafe fn $($item)*
+        Self { bits: 0 }
     };
 }
 
@@ -481,7 +427,7 @@
             $(
                 $(#[$attr:ident $($args:tt)*])*
                 $Flag:ident = $value:expr;
-            )+
+            )*
         }
     ) => {
         impl $crate::_core::fmt::Debug for $BitFlags {
@@ -499,11 +445,12 @@
                     $(
                         #[inline]
                         fn $Flag(&self) -> bool { false }
-                    )+
+                    )*
                 }
 
                 // Conditionally override the check for just those flags that
                 // are not #[cfg]ed away.
+                #[allow(non_snake_case)]
                 impl __BitFlags for $BitFlags {
                     $(
                         __impl_bitflags! {
@@ -518,20 +465,20 @@
                                 }
                             }
                         }
-                    )+
+                    )*
                 }
 
                 let mut first = true;
                 $(
-                    if <$BitFlags as __BitFlags>::$Flag(self) {
+                    if <Self as __BitFlags>::$Flag(self) {
                         if !first {
                             f.write_str(" | ")?;
                         }
                         first = false;
-                        f.write_str(__bitflags_stringify!($Flag))?;
+                        f.write_str($crate::_core::stringify!($Flag))?;
                     }
-                )+
-                let extra_bits = self.bits & !$BitFlags::all().bits();
+                )*
+                let extra_bits = self.bits & !Self::all().bits();
                 if extra_bits != 0 {
                     if !first {
                         f.write_str(" | ")?;
@@ -571,227 +518,295 @@
         impl $BitFlags {
             $(
                 $(#[$attr $($args)*])*
-                pub const $Flag: $BitFlags = $BitFlags { bits: $value };
-            )+
+                pub const $Flag: Self = Self { bits: $value };
+            )*
 
-            __fn_bitflags! {
-                /// Returns an empty set of flags
-                #[inline]
-                pub const fn empty() -> $BitFlags {
-                    $BitFlags { bits: 0 }
-                }
+            /// Returns an empty set of flags.
+            #[inline]
+            pub const fn empty() -> Self {
+                Self { bits: 0 }
             }
 
-            __fn_bitflags! {
-                /// Returns the set containing all flags.
-                #[inline]
-                pub const fn all() -> $BitFlags {
-                    // See `Debug::fmt` for why this approach is taken.
-                    #[allow(non_snake_case)]
-                    trait __BitFlags {
-                        $(
-                            const $Flag: $T = 0;
-                        )+
-                    }
-                    impl __BitFlags for $BitFlags {
+            /// Returns the set containing all flags.
+            #[inline]
+            pub const fn all() -> Self {
+                __impl_all_bitflags! {
+                    $BitFlags: $T {
                         $(
-                            __impl_bitflags! {
-                                #[allow(deprecated)]
-                                $(? #[$attr $($args)*])*
-                                const $Flag: $T = Self::$Flag.bits;
-                            }
-                        )+
+                            $(#[$attr $($args)*])*
+                            $Flag = $value;
+                        )*
                     }
-                    $BitFlags { bits: $(<$BitFlags as __BitFlags>::$Flag)|+ }
                 }
             }
 
-            __fn_bitflags! {
-                /// Returns the raw value of the flags currently stored.
-                #[inline]
-                pub const fn bits(&self) -> $T {
-                    self.bits
-                }
+            /// Returns the raw value of the flags currently stored.
+            #[inline]
+            pub const fn bits(&self) -> $T {
+                self.bits
             }
 
             /// Convert from underlying bit representation, unless that
             /// representation contains bits that do not correspond to a flag.
             #[inline]
-            pub fn from_bits(bits: $T) -> $crate::_core::option::Option<$BitFlags> {
-                if (bits & !$BitFlags::all().bits()) == 0 {
-                    $crate::_core::option::Option::Some($BitFlags { bits })
+            pub const fn from_bits(bits: $T) -> $crate::_core::option::Option<Self> {
+                if (bits & !Self::all().bits()) == 0 {
+                    $crate::_core::option::Option::Some(Self { bits })
                 } else {
                     $crate::_core::option::Option::None
                 }
             }
 
-            __fn_bitflags! {
-                /// Convert from underlying bit representation, dropping any bits
-                /// that do not correspond to flags.
-                #[inline]
-                pub const fn from_bits_truncate(bits: $T) -> $BitFlags {
-                    $BitFlags { bits: bits & $BitFlags::all().bits }
-                }
+            /// Convert from underlying bit representation, dropping any bits
+            /// that do not correspond to flags.
+            #[inline]
+            pub const fn from_bits_truncate(bits: $T) -> Self {
+                Self { bits: bits & Self::all().bits }
             }
 
-            __fn_bitflags! {
-                /// Convert from underlying bit representation, preserving all
-                /// bits (even those not corresponding to a defined flag).
-                #[inline]
-                pub const unsafe fn from_bits_unchecked(bits: $T) -> $BitFlags {
-                    $BitFlags { bits }
-                }
+            /// Convert from underlying bit representation, preserving all
+            /// bits (even those not corresponding to a defined flag).
+            ///
+            /// # Safety
+            ///
+            /// The caller of the `bitflags!` macro can chose to allow or
+            /// disallow extra bits for their bitflags type.
+            ///
+            /// The caller of `from_bits_unchecked()` has to ensure that
+            /// all bits correspond to a defined flag or that extra bits
+            /// are valid for this bitflags type.
+            #[inline]
+            pub const unsafe fn from_bits_unchecked(bits: $T) -> Self {
+                Self { bits }
             }
 
-            __fn_bitflags! {
-                /// Returns `true` if no flags are currently stored.
-                #[inline]
-                pub const fn is_empty(&self) -> bool {
-                    self.bits() == $BitFlags::empty().bits()
-                }
+            /// Returns `true` if no flags are currently stored.
+            #[inline]
+            pub const fn is_empty(&self) -> bool {
+                self.bits() == Self::empty().bits()
             }
 
-            __fn_bitflags! {
-                /// Returns `true` if all flags are currently set.
-                #[inline]
-                pub const fn is_all(&self) -> bool {
-                    self.bits == $BitFlags::all().bits
-                }
+            /// Returns `true` if all flags are currently set.
+            #[inline]
+            pub const fn is_all(&self) -> bool {
+                Self::all().bits | self.bits == self.bits
             }
 
-            __fn_bitflags! {
-                /// Returns `true` if there are flags common to both `self` and `other`.
-                #[inline]
-                pub const fn intersects(&self, other: $BitFlags) -> bool {
-                    !$BitFlags{ bits: self.bits & other.bits}.is_empty()
-                }
+            /// Returns `true` if there are flags common to both `self` and `other`.
+            #[inline]
+            pub const fn intersects(&self, other: Self) -> bool {
+                !(Self { bits: self.bits & other.bits}).is_empty()
             }
 
-            __fn_bitflags! {
-                /// Returns `true` all of the flags in `other` are contained within `self`.
-                #[inline]
-                pub const fn contains(&self, other: $BitFlags) -> bool {
-                    (self.bits & other.bits) == other.bits
-                }
+            /// Returns `true` if all of the flags in `other` are contained within `self`.
+            #[inline]
+            pub const fn contains(&self, other: Self) -> bool {
+                (self.bits & other.bits) == other.bits
             }
 
             /// Inserts the specified flags in-place.
             #[inline]
-            pub fn insert(&mut self, other: $BitFlags) {
+            pub fn insert(&mut self, other: Self) {
                 self.bits |= other.bits;
             }
 
             /// Removes the specified flags in-place.
             #[inline]
-            pub fn remove(&mut self, other: $BitFlags) {
+            pub fn remove(&mut self, other: Self) {
                 self.bits &= !other.bits;
             }
 
             /// Toggles the specified flags in-place.
             #[inline]
-            pub fn toggle(&mut self, other: $BitFlags) {
+            pub fn toggle(&mut self, other: Self) {
                 self.bits ^= other.bits;
             }
 
             /// Inserts or removes the specified flags depending on the passed value.
             #[inline]
-            pub fn set(&mut self, other: $BitFlags, value: bool) {
+            pub fn set(&mut self, other: Self, value: bool) {
                 if value {
                     self.insert(other);
                 } else {
                     self.remove(other);
                 }
             }
+
+            /// Returns the intersection between the flags in `self` and
+            /// `other`.
+            ///
+            /// Specifically, the returned set contains only the flags which are
+            /// present in *both* `self` *and* `other`.
+            ///
+            /// This is equivalent to using the `&` operator (e.g.
+            /// [`ops::BitAnd`]), as in `flags & other`.
+            ///
+            /// [`ops::BitAnd`]: https://doc.rust-lang.org/std/ops/trait.BitAnd.html
+            #[inline]
+            #[must_use]
+            pub const fn intersection(self, other: Self) -> Self {
+                Self { bits: self.bits & other.bits }
+            }
+
+            /// Returns the union of between the flags in `self` and `other`.
+            ///
+            /// Specifically, the returned set contains all flags which are
+            /// present in *either* `self` *or* `other`, including any which are
+            /// present in both (see [`Self::symmetric_difference`] if that
+            /// is undesirable).
+            ///
+            /// This is equivalent to using the `|` operator (e.g.
+            /// [`ops::BitOr`]), as in `flags | other`.
+            ///
+            /// [`ops::BitOr`]: https://doc.rust-lang.org/std/ops/trait.BitOr.html
+            #[inline]
+            #[must_use]
+            pub const fn union(self, other: Self) -> Self {
+                Self { bits: self.bits | other.bits }
+            }
+
+            /// Returns the difference between the flags in `self` and `other`.
+            ///
+            /// Specifically, the returned set contains all flags present in
+            /// `self`, except for the ones present in `other`.
+            ///
+            /// It is also conceptually equivalent to the "bit-clear" operation:
+            /// `flags & !other` (and this syntax is also supported).
+            ///
+            /// This is equivalent to using the `-` operator (e.g.
+            /// [`ops::Sub`]), as in `flags - other`.
+            ///
+            /// [`ops::Sub`]: https://doc.rust-lang.org/std/ops/trait.Sub.html
+            #[inline]
+            #[must_use]
+            pub const fn difference(self, other: Self) -> Self {
+                Self { bits: self.bits & !other.bits }
+            }
+
+            /// Returns the [symmetric difference][sym-diff] between the flags
+            /// in `self` and `other`.
+            ///
+            /// Specifically, the returned set contains the flags present which
+            /// are present in `self` or `other`, but that are not present in
+            /// both. Equivalently, it contains the flags present in *exactly
+            /// one* of the sets `self` and `other`.
+            ///
+            /// This is equivalent to using the `^` operator (e.g.
+            /// [`ops::BitXor`]), as in `flags ^ other`.
+            ///
+            /// [sym-diff]: https://en.wikipedia.org/wiki/Symmetric_difference
+            /// [`ops::BitXor`]: https://doc.rust-lang.org/std/ops/trait.BitXor.html
+            #[inline]
+            #[must_use]
+            pub const fn symmetric_difference(self, other: Self) -> Self {
+                Self { bits: self.bits ^ other.bits }
+            }
+
+            /// Returns the complement of this set of flags.
+            ///
+            /// Specifically, the returned set contains all the flags which are
+            /// not set in `self`, but which are allowed for this type.
+            ///
+            /// Alternatively, it can be thought of as the set difference
+            /// between [`Self::all()`] and `self` (e.g. `Self::all() - self`)
+            ///
+            /// This is equivalent to using the `!` operator (e.g.
+            /// [`ops::Not`]), as in `!flags`.
+            ///
+            /// [`Self::all()`]: Self::all
+            /// [`ops::Not`]: https://doc.rust-lang.org/std/ops/trait.Not.html
+            #[inline]
+            #[must_use]
+            pub const fn complement(self) -> Self {
+                Self::from_bits_truncate(!self.bits)
+            }
+
         }
 
         impl $crate::_core::ops::BitOr for $BitFlags {
-            type Output = $BitFlags;
+            type Output = Self;
 
             /// Returns the union of the two sets of flags.
             #[inline]
-            fn bitor(self, other: $BitFlags) -> $BitFlags {
-                $BitFlags { bits: self.bits | other.bits }
+            fn bitor(self, other: $BitFlags) -> Self {
+                Self { bits: self.bits | other.bits }
             }
         }
 
         impl $crate::_core::ops::BitOrAssign for $BitFlags {
-
             /// Adds the set of flags.
             #[inline]
-            fn bitor_assign(&mut self, other: $BitFlags) {
+            fn bitor_assign(&mut self, other: Self) {
                 self.bits |= other.bits;
             }
         }
 
         impl $crate::_core::ops::BitXor for $BitFlags {
-            type Output = $BitFlags;
+            type Output = Self;
 
             /// Returns the left flags, but with all the right flags toggled.
             #[inline]
-            fn bitxor(self, other: $BitFlags) -> $BitFlags {
-                $BitFlags { bits: self.bits ^ other.bits }
+            fn bitxor(self, other: Self) -> Self {
+                Self { bits: self.bits ^ other.bits }
             }
         }
 
         impl $crate::_core::ops::BitXorAssign for $BitFlags {
-
             /// Toggles the set of flags.
             #[inline]
-            fn bitxor_assign(&mut self, other: $BitFlags) {
+            fn bitxor_assign(&mut self, other: Self) {
                 self.bits ^= other.bits;
             }
         }
 
         impl $crate::_core::ops::BitAnd for $BitFlags {
-            type Output = $BitFlags;
+            type Output = Self;
 
             /// Returns the intersection between the two sets of flags.
             #[inline]
-            fn bitand(self, other: $BitFlags) -> $BitFlags {
-                $BitFlags { bits: self.bits & other.bits }
+            fn bitand(self, other: Self) -> Self {
+                Self { bits: self.bits & other.bits }
             }
         }
 
         impl $crate::_core::ops::BitAndAssign for $BitFlags {
-
             /// Disables all flags disabled in the set.
             #[inline]
-            fn bitand_assign(&mut self, other: $BitFlags) {
+            fn bitand_assign(&mut self, other: Self) {
                 self.bits &= other.bits;
             }
         }
 
         impl $crate::_core::ops::Sub for $BitFlags {
-            type Output = $BitFlags;
+            type Output = Self;
 
             /// Returns the set difference of the two sets of flags.
             #[inline]
-            fn sub(self, other: $BitFlags) -> $BitFlags {
-                $BitFlags { bits: self.bits & !other.bits }
+            fn sub(self, other: Self) -> Self {
+                Self { bits: self.bits & !other.bits }
             }
         }
 
         impl $crate::_core::ops::SubAssign for $BitFlags {
-
             /// Disables all flags enabled in the set.
             #[inline]
-            fn sub_assign(&mut self, other: $BitFlags) {
+            fn sub_assign(&mut self, other: Self) {
                 self.bits &= !other.bits;
             }
         }
 
         impl $crate::_core::ops::Not for $BitFlags {
-            type Output = $BitFlags;
+            type Output = Self;
 
             /// Returns the complement of this set of flags.
             #[inline]
-            fn not(self) -> $BitFlags {
-                $BitFlags { bits: !self.bits } & $BitFlags::all()
+            fn not(self) -> Self {
+                Self { bits: !self.bits } & Self::all()
             }
         }
 
         impl $crate::_core::iter::Extend<$BitFlags> for $BitFlags {
-            fn extend<T: $crate::_core::iter::IntoIterator<Item=$BitFlags>>(&mut self, iterator: T) {
+            fn extend<T: $crate::_core::iter::IntoIterator<Item=Self>>(&mut self, iterator: T) {
                 for item in iterator {
                     self.insert(item)
                 }
@@ -799,7 +814,7 @@
         }
 
         impl $crate::_core::iter::FromIterator<$BitFlags> for $BitFlags {
-            fn from_iter<T: $crate::_core::iter::IntoIterator<Item=$BitFlags>>(iterator: T) -> $BitFlags {
+            fn from_iter<T: $crate::_core::iter::IntoIterator<Item=Self>>(iterator: T) -> Self {
                 let mut result = Self::empty();
                 result.extend(iterator);
                 result
@@ -817,7 +832,7 @@
     // Input:
     //
     //     ? #[cfg(feature = "advanced")]
-    //     ? #[deprecated(note = "Use somthing else.")]
+    //     ? #[deprecated(note = "Use something else.")]
     //     ? #[doc = r"High quality documentation."]
     //     fn f() -> i32 { /* ... */ }
     //
@@ -872,7 +887,7 @@
     // Input:
     //
     //     ? #[cfg(feature = "advanced")]
-    //     ? #[deprecated(note = "Use somthing else.")]
+    //     ? #[deprecated(note = "Use something else.")]
     //     ? #[doc = r"High quality documentation."]
     //     const f: i32 { /* ... */ }
     //
@@ -916,16 +931,6 @@
     };
 }
 
-// Same as std::stringify but callable from __impl_bitflags, which needs to use
-// local_inner_macros so can only directly call macros from this crate.
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __bitflags_stringify {
-    ($s:ident) => {
-        stringify!($s)
-    };
-}
-
 #[cfg(feature = "example_generated")]
 pub mod example_generated;
 
@@ -939,6 +944,7 @@
         #[doc = "> you are the easiest person to fool."]
         #[doc = "> "]
         #[doc = "> - Richard Feynman"]
+        #[derive(Default)]
         struct Flags: u32 {
             const A = 0b00000001;
             #[doc = "<pcwalton> macros are way better at generating code than trans is"]
@@ -949,9 +955,7 @@
             #[doc = "<strcat> wait what?"]
             const ABC = Self::A.bits | Self::B.bits | Self::C.bits;
         }
-    }
 
-    bitflags! {
         struct _CfgFlags: u32 {
             #[cfg(unix)]
             const _CFG_A = 0b01;
@@ -960,20 +964,21 @@
             #[cfg(unix)]
             const _CFG_C = Self::_CFG_A.bits | 0b10;
         }
-    }
 
-    bitflags! {
         struct AnotherSetOfFlags: i8 {
             const ANOTHER_FLAG = -1_i8;
         }
-    }
 
-    bitflags! {
         struct LongFlags: u32 {
             const LONG_A = 0b1111111111111111;
         }
     }
 
+    bitflags! {
+        struct EmptyFlags: u32 {
+        }
+    }
+
     #[test]
     fn test_bits() {
         assert_eq!(Flags::empty().bits(), 0b00000000);
@@ -982,6 +987,8 @@
 
         assert_eq!(AnotherSetOfFlags::empty().bits(), 0b00);
         assert_eq!(AnotherSetOfFlags::ANOTHER_FLAG.bits(), !0_i8);
+
+        assert_eq!(EmptyFlags::empty().bits(), 0b00000000);
     }
 
     #[test]
@@ -996,6 +1003,9 @@
             AnotherSetOfFlags::from_bits(!0_i8),
             Some(AnotherSetOfFlags::ANOTHER_FLAG)
         );
+
+        assert_eq!(EmptyFlags::from_bits(0), Some(EmptyFlags::empty()));
+        assert_eq!(EmptyFlags::from_bits(0b1), None);
     }
 
     #[test]
@@ -1011,6 +1021,9 @@
             AnotherSetOfFlags::from_bits_truncate(0_i8),
             AnotherSetOfFlags::empty()
         );
+
+        assert_eq!(EmptyFlags::from_bits_truncate(0), EmptyFlags::empty());
+        assert_eq!(EmptyFlags::from_bits_truncate(0b1), EmptyFlags::empty());
     }
 
     #[test]
@@ -1019,9 +1032,25 @@
         assert_eq!(unsafe { Flags::from_bits_unchecked(0) }, Flags::empty());
         assert_eq!(unsafe { Flags::from_bits_unchecked(0b1) }, Flags::A);
         assert_eq!(unsafe { Flags::from_bits_unchecked(0b10) }, Flags::B);
-        assert_eq!(unsafe { Flags::from_bits_unchecked(0b11) }, (Flags::A | Flags::B));
-        assert_eq!(unsafe { Flags::from_bits_unchecked(0b1000) }, (extra | Flags::empty()));
-        assert_eq!(unsafe { Flags::from_bits_unchecked(0b1001) }, (extra | Flags::A));
+
+        assert_eq!(
+            unsafe { Flags::from_bits_unchecked(0b11) },
+            (Flags::A | Flags::B)
+        );
+        assert_eq!(
+            unsafe { Flags::from_bits_unchecked(0b1000) },
+            (extra | Flags::empty())
+        );
+        assert_eq!(
+            unsafe { Flags::from_bits_unchecked(0b1001) },
+            (extra | Flags::A)
+        );
+
+        let extra = unsafe { EmptyFlags::from_bits_unchecked(0b1000) };
+        assert_eq!(
+            unsafe { EmptyFlags::from_bits_unchecked(0b1000) },
+            (extra | EmptyFlags::empty())
+        );
     }
 
     #[test]
@@ -1031,6 +1060,9 @@
         assert!(!Flags::ABC.is_empty());
 
         assert!(!AnotherSetOfFlags::ANOTHER_FLAG.is_empty());
+
+        assert!(EmptyFlags::empty().is_empty());
+        assert!(EmptyFlags::all().is_empty());
     }
 
     #[test]
@@ -1039,7 +1071,15 @@
         assert!(!Flags::A.is_all());
         assert!(Flags::ABC.is_all());
 
+        let extra = unsafe { Flags::from_bits_unchecked(0b1000) };
+        assert!(!extra.is_all());
+        assert!(!(Flags::A | extra).is_all());
+        assert!((Flags::ABC | extra).is_all());
+
         assert!(AnotherSetOfFlags::ANOTHER_FLAG.is_all());
+
+        assert!(EmptyFlags::all().is_all());
+        assert!(EmptyFlags::empty().is_all());
     }
 
     #[test]
@@ -1081,6 +1121,8 @@
         assert!(Flags::ABC.contains(e2));
 
         assert!(AnotherSetOfFlags::ANOTHER_FLAG.contains(AnotherSetOfFlags::ANOTHER_FLAG));
+
+        assert!(EmptyFlags::empty().contains(EmptyFlags::empty()));
     }
 
     #[test]
@@ -1142,6 +1184,188 @@
     }
 
     #[test]
+    fn test_set_ops_basic() {
+        let ab = Flags::A.union(Flags::B);
+        let ac = Flags::A.union(Flags::C);
+        let bc = Flags::B.union(Flags::C);
+        assert_eq!(ab.bits, 0b011);
+        assert_eq!(bc.bits, 0b110);
+        assert_eq!(ac.bits, 0b101);
+
+        assert_eq!(ab, Flags::B.union(Flags::A));
+        assert_eq!(ac, Flags::C.union(Flags::A));
+        assert_eq!(bc, Flags::C.union(Flags::B));
+
+        assert_eq!(ac, Flags::A | Flags::C);
+        assert_eq!(bc, Flags::B | Flags::C);
+        assert_eq!(ab.union(bc), Flags::ABC);
+
+        assert_eq!(ac, Flags::A | Flags::C);
+        assert_eq!(bc, Flags::B | Flags::C);
+
+        assert_eq!(ac.union(bc), ac | bc);
+        assert_eq!(ac.union(bc), Flags::ABC);
+        assert_eq!(bc.union(ac), Flags::ABC);
+
+        assert_eq!(ac.intersection(bc), ac & bc);
+        assert_eq!(ac.intersection(bc), Flags::C);
+        assert_eq!(bc.intersection(ac), Flags::C);
+
+        assert_eq!(ac.difference(bc), ac - bc);
+        assert_eq!(bc.difference(ac), bc - ac);
+        assert_eq!(ac.difference(bc), Flags::A);
+        assert_eq!(bc.difference(ac), Flags::B);
+
+        assert_eq!(bc.complement(), !bc);
+        assert_eq!(bc.complement(), Flags::A);
+        assert_eq!(ac.symmetric_difference(bc), Flags::A.union(Flags::B));
+        assert_eq!(bc.symmetric_difference(ac), Flags::A.union(Flags::B));
+    }
+
+    #[test]
+    fn test_set_ops_const() {
+        // These just test that these compile and don't cause use-site panics
+        // (would be possible if we had some sort of UB)
+        const INTERSECT: Flags = Flags::all().intersection(Flags::C);
+        const UNION: Flags = Flags::A.union(Flags::C);
+        const DIFFERENCE: Flags = Flags::all().difference(Flags::A);
+        const COMPLEMENT: Flags = Flags::C.complement();
+        const SYM_DIFFERENCE: Flags = UNION.symmetric_difference(DIFFERENCE);
+        assert_eq!(INTERSECT, Flags::C);
+        assert_eq!(UNION, Flags::A | Flags::C);
+        assert_eq!(DIFFERENCE, Flags::all() - Flags::A);
+        assert_eq!(COMPLEMENT, !Flags::C);
+        assert_eq!(SYM_DIFFERENCE, (Flags::A | Flags::C) ^ (Flags::all() - Flags::A));
+    }
+
+    #[test]
+    fn test_set_ops_unchecked() {
+        let extra = unsafe { Flags::from_bits_unchecked(0b1000) };
+        let e1 = Flags::A.union(Flags::C).union(extra);
+        let e2 = Flags::B.union(Flags::C);
+        assert_eq!(e1.bits, 0b1101);
+        assert_eq!(e1.union(e2), (Flags::ABC | extra));
+        assert_eq!(e1.intersection(e2), Flags::C);
+        assert_eq!(e1.difference(e2), Flags::A | extra);
+        assert_eq!(e2.difference(e1), Flags::B);
+        assert_eq!(e2.complement(), Flags::A);
+        assert_eq!(e1.complement(), Flags::B);
+        assert_eq!(e1.symmetric_difference(e2), Flags::A | Flags::B | extra); // toggle
+    }
+
+    #[test]
+    fn test_set_ops_exhaustive() {
+        // Define a flag that contains gaps to help exercise edge-cases,
+        // especially around "unknown" flags (e.g. ones outside of `all()`
+        // `from_bits_unchecked`).
+        // - when lhs and rhs both have different sets of unknown flags.
+        // - unknown flags at both ends, and in the middle
+        // - cases with "gaps".
+        bitflags! {
+            struct Test: u16 {
+                // Intentionally no `A`
+                const B = 0b000000010;
+                // Intentionally no `C`
+                const D = 0b000001000;
+                const E = 0b000010000;
+                const F = 0b000100000;
+                const G = 0b001000000;
+                // Intentionally no `H`
+                const I = 0b100000000;
+            }
+        }
+        let iter_test_flags =
+            || (0..=0b111_1111_1111).map(|bits| unsafe { Test::from_bits_unchecked(bits) });
+
+        for a in iter_test_flags() {
+            assert_eq!(
+                a.complement(),
+                Test::from_bits_truncate(!a.bits),
+                "wrong result: !({:?})",
+                a,
+            );
+            assert_eq!(a.complement(), !a, "named != op: !({:?})", a);
+            for b in iter_test_flags() {
+                // Check that the named operations produce the expected bitwise
+                // values.
+                assert_eq!(
+                    a.union(b).bits,
+                    a.bits | b.bits,
+                    "wrong result: `{:?}` | `{:?}`",
+                    a,
+                    b,
+                );
+                assert_eq!(
+                    a.intersection(b).bits,
+                    a.bits & b.bits,
+                    "wrong result: `{:?}` & `{:?}`",
+                    a,
+                    b,
+                );
+                assert_eq!(
+                    a.symmetric_difference(b).bits,
+                    a.bits ^ b.bits,
+                    "wrong result: `{:?}` ^ `{:?}`",
+                    a,
+                    b,
+                );
+                assert_eq!(
+                    a.difference(b).bits,
+                    a.bits & !b.bits,
+                    "wrong result: `{:?}` - `{:?}`",
+                    a,
+                    b,
+                );
+                // Note: Difference is checked as both `a - b` and `b - a`
+                assert_eq!(
+                    b.difference(a).bits,
+                    b.bits & !a.bits,
+                    "wrong result: `{:?}` - `{:?}`",
+                    b,
+                    a,
+                );
+                // Check that the named set operations are equivalent to the
+                // bitwise equivalents
+                assert_eq!(a.union(b), a | b, "named != op: `{:?}` | `{:?}`", a, b,);
+                assert_eq!(
+                    a.intersection(b),
+                    a & b,
+                    "named != op: `{:?}` & `{:?}`",
+                    a,
+                    b,
+                );
+                assert_eq!(
+                    a.symmetric_difference(b),
+                    a ^ b,
+                    "named != op: `{:?}` ^ `{:?}`",
+                    a,
+                    b,
+                );
+                assert_eq!(a.difference(b), a - b, "named != op: `{:?}` - `{:?}`", a, b,);
+                // Note: Difference is checked as both `a - b` and `b - a`
+                assert_eq!(b.difference(a), b - a, "named != op: `{:?}` - `{:?}`", b, a,);
+                // Verify that the operations which should be symmetric are
+                // actually symmetric.
+                assert_eq!(a.union(b), b.union(a), "asymmetry: `{:?}` | `{:?}`", a, b,);
+                assert_eq!(
+                    a.intersection(b),
+                    b.intersection(a),
+                    "asymmetry: `{:?}` & `{:?}`",
+                    a,
+                    b,
+                );
+                assert_eq!(
+                    a.symmetric_difference(b),
+                    b.symmetric_difference(a),
+                    "asymmetry: `{:?}` ^ `{:?}`",
+                    a,
+                    b,
+                );
+            }
+        }
+    }
+
+    #[test]
     fn test_set() {
         let mut e1 = Flags::A | Flags::C;
         e1.set(Flags::B, true);
@@ -1168,8 +1392,6 @@
         assert_eq!(m1, e1);
     }
 
-
-    #[cfg(bitflags_const_fn)]
     #[test]
     fn test_const_fn() {
         const _M1: Flags = Flags::empty();
@@ -1260,6 +1482,11 @@
     }
 
     #[test]
+    fn test_default() {
+        assert_eq!(Flags::empty(), Flags::default());
+    }
+
+    #[test]
     fn test_debug() {
         assert_eq!(format!("{:?}", Flags::A | Flags::B), "A | B");
         assert_eq!(format!("{:?}", Flags::empty()), "(empty)");
@@ -1267,7 +1494,13 @@
         let extra = unsafe { Flags::from_bits_unchecked(0xb8) };
         assert_eq!(format!("{:?}", extra), "0xb8");
         assert_eq!(format!("{:?}", Flags::A | extra), "A | 0xb8");
-        assert_eq!(format!("{:?}", Flags::ABC | extra), "A | B | C | ABC | 0xb8");
+
+        assert_eq!(
+            format!("{:?}", Flags::ABC | extra),
+            "A | B | C | ABC | 0xb8"
+        );
+
+        assert_eq!(format!("{:?}", EmptyFlags::empty()), "(empty)");
     }
 
     #[test]
@@ -1311,8 +1544,7 @@
             pub struct PublicFlags: i8 {
                 const X = 0;
             }
-        }
-        bitflags! {
+
             struct PrivateFlags: i8 {
                 const Y = 0;
             }
@@ -1427,4 +1659,71 @@
         assert_eq!(format!("{:?}", Flags::empty()), "NONE");
         assert_eq!(format!("{:?}", Flags::SOME), "SOME");
     }
+
+    #[test]
+    fn test_empty_bitflags() {
+        bitflags! {}
+    }
+
+    #[test]
+    fn test_u128_bitflags() {
+        bitflags! {
+            struct Flags128: u128 {
+                const A = 0x0000_0000_0000_0000_0000_0000_0000_0001;
+                const B = 0x0000_0000_0000_1000_0000_0000_0000_0000;
+                const C = 0x8000_0000_0000_0000_0000_0000_0000_0000;
+                const ABC = Self::A.bits | Self::B.bits | Self::C.bits;
+            }
+        }
+
+        assert_eq!(Flags128::ABC, Flags128::A | Flags128::B | Flags128::C);
+        assert_eq!(Flags128::A.bits, 0x0000_0000_0000_0000_0000_0000_0000_0001);
+        assert_eq!(Flags128::B.bits, 0x0000_0000_0000_1000_0000_0000_0000_0000);
+        assert_eq!(Flags128::C.bits, 0x8000_0000_0000_0000_0000_0000_0000_0000);
+        assert_eq!(
+            Flags128::ABC.bits,
+            0x8000_0000_0000_1000_0000_0000_0000_0001
+        );
+        assert_eq!(format!("{:?}", Flags128::A), "A");
+        assert_eq!(format!("{:?}", Flags128::B), "B");
+        assert_eq!(format!("{:?}", Flags128::C), "C");
+        assert_eq!(format!("{:?}", Flags128::ABC), "A | B | C | ABC");
+    }
+
+    #[test]
+    fn test_serde_bitflags_serialize() {
+        let flags = SerdeFlags::A | SerdeFlags::B;
+
+        let serialized = serde_json::to_string(&flags).unwrap();
+
+        assert_eq!(serialized, r#"{"bits":3}"#);
+    }
+
+    #[test]
+    fn test_serde_bitflags_deserialize() {
+        let deserialized: SerdeFlags = serde_json::from_str(r#"{"bits":12}"#).unwrap();
+
+        let expected = SerdeFlags::C | SerdeFlags::D;
+
+        assert_eq!(deserialized.bits, expected.bits);
+    }
+
+    #[test]
+    fn test_serde_bitflags_roundtrip() {
+        let flags = SerdeFlags::A | SerdeFlags::B;
+
+        let deserialized: SerdeFlags = serde_json::from_str(&serde_json::to_string(&flags).unwrap()).unwrap();
+
+        assert_eq!(deserialized.bits, flags.bits);
+    }
+
+    bitflags! {
+        #[derive(serde::Serialize, serde::Deserialize)]
+        struct SerdeFlags: u32 {
+            const A = 1;
+            const B = 2;
+            const C = 4;
+            const D = 8;
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/basic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/basic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/basic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/basic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+#![no_std]
+
+use bitflags::bitflags;
+
+bitflags! {
+    /// baz
+    struct Flags: u32 {
+        const A = 0b00000001;
+        #[doc = "bar"]
+        const B = 0b00000010;
+        const C = 0b00000100;
+        #[doc = "foo"]
+        const ABC = Flags::A.bits | Flags::B.bits | Flags::C.bits;
+    }
+}
+
+#[test]
+fn basic() {
+    assert_eq!(Flags::ABC, Flags::A | Flags::B | Flags::C);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/copy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/copy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/copy.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/copy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+use bitflags::bitflags;
+
+bitflags! {
+    #[derive(Clone, Copy)]
+    struct Flags: u32 {
+        const A = 0b00000001;
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/copy.stderr.beta thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/copy.stderr.beta
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/copy.stderr.beta	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/copy.stderr.beta	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+error[E0119]: conflicting implementations of trait `std::clone::Clone` for type `Flags`
+ --> $DIR/copy.rs:3:1
+  |
+3 | / bitflags! {
+4 | |     #[derive(Clone, Copy)]
+  | |              ----- first implementation here
+5 | |     struct Flags: u32 {
+6 | |         const A = 0b00000001;
+7 | |     }
+8 | | }
+  | |_^ conflicting implementation for `Flags`
+  |
+  = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0119]: conflicting implementations of trait `std::marker::Copy` for type `Flags`
+ --> $DIR/copy.rs:3:1
+  |
+3 | / bitflags! {
+4 | |     #[derive(Clone, Copy)]
+  | |                     ---- first implementation here
+5 | |     struct Flags: u32 {
+6 | |         const A = 0b00000001;
+7 | |     }
+8 | | }
+  | |_^ conflicting implementation for `Flags`
+  |
+  = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/eq.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/eq.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/eq.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/eq.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+use bitflags::bitflags;
+
+bitflags! {
+    #[derive(PartialEq, Eq)]
+    struct Flags: u32 {
+        const A = 0b00000001;
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/eq.stderr.beta thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/eq.stderr.beta
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/eq.stderr.beta	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/impls/eq.stderr.beta	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,55 @@
+error[E0119]: conflicting implementations of trait `std::cmp::PartialEq` for type `Flags`
+ --> $DIR/eq.rs:3:1
+  |
+3 | / bitflags! {
+4 | |     #[derive(PartialEq, Eq)]
+  | |              --------- first implementation here
+5 | |     struct Flags: u32 {
+6 | |         const A = 0b00000001;
+7 | |     }
+8 | | }
+  | |_^ conflicting implementation for `Flags`
+  |
+  = note: this error originates in the derive macro `PartialEq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0119]: conflicting implementations of trait `std::cmp::Eq` for type `Flags`
+ --> $DIR/eq.rs:3:1
+  |
+3 | / bitflags! {
+4 | |     #[derive(PartialEq, Eq)]
+  | |                         -- first implementation here
+5 | |     struct Flags: u32 {
+6 | |         const A = 0b00000001;
+7 | |     }
+8 | | }
+  | |_^ conflicting implementation for `Flags`
+  |
+  = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0119]: conflicting implementations of trait `std::marker::StructuralPartialEq` for type `Flags`
+ --> $DIR/eq.rs:3:1
+  |
+3 | / bitflags! {
+4 | |     #[derive(PartialEq, Eq)]
+  | |              --------- first implementation here
+5 | |     struct Flags: u32 {
+6 | |         const A = 0b00000001;
+7 | |     }
+8 | | }
+  | |_^ conflicting implementation for `Flags`
+  |
+  = note: this error originates in the derive macro `PartialEq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0119]: conflicting implementations of trait `std::marker::StructuralEq` for type `Flags`
+ --> $DIR/eq.rs:3:1
+  |
+3 | / bitflags! {
+4 | |     #[derive(PartialEq, Eq)]
+  | |                         -- first implementation here
+5 | |     struct Flags: u32 {
+6 | |         const A = 0b00000001;
+7 | |     }
+8 | | }
+  | |_^ conflicting implementation for `Flags`
+  |
+  = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_defined.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_defined.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_defined.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_defined.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,123 @@
+use std::{
+    fmt::{
+        self,
+        Debug,
+        Display,
+        LowerHex,
+        UpperHex,
+        Octal,
+        Binary,
+    },
+    ops::{
+        BitAnd,
+        BitOr,
+        BitXor,
+        BitAndAssign,
+        BitOrAssign,
+        BitXorAssign,
+        Not,
+    },
+};
+
+use bitflags::bitflags;
+
+// Ideally we'd actually want this to work, but currently need something like `num`'s `Zero`
+// With some design work it could be made possible
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+struct MyInt(u8);
+
+impl BitAnd for MyInt {
+    type Output = Self;
+
+    fn bitand(self, other: Self) -> Self {
+        MyInt(self.0 & other.0)
+    }
+}
+
+impl BitOr for MyInt {
+    type Output = Self;
+
+    fn bitor(self, other: Self) -> Self {
+        MyInt(self.0 | other.0)
+    }
+}
+
+impl BitXor for MyInt {
+    type Output = Self;
+
+    fn bitxor(self, other: Self) -> Self {
+        MyInt(self.0 ^ other.0)
+    }
+}
+
+impl BitAndAssign for MyInt {
+    fn bitand_assign(&mut self, other: Self) {
+        self.0 &= other.0
+    }
+}
+
+impl BitOrAssign for MyInt {
+    fn bitor_assign(&mut self, other: Self) {
+        self.0 |= other.0
+    }
+}
+
+impl BitXorAssign for MyInt {
+    fn bitxor_assign(&mut self, other: Self) {
+        self.0 ^= other.0
+    }
+}
+
+impl Debug for MyInt {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        Debug::fmt(&self.0, f)
+    }
+}
+
+impl Display for MyInt {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        Display::fmt(&self.0, f)
+    }
+}
+
+impl LowerHex for MyInt {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        LowerHex::fmt(&self.0, f)
+    }
+}
+
+impl UpperHex for MyInt {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        UpperHex::fmt(&self.0, f)
+    }
+}
+
+impl Octal for MyInt {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        Octal::fmt(&self.0, f)
+    }
+}
+
+impl Binary for MyInt {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        Binary::fmt(&self.0, f)
+    }
+}
+
+impl Not for MyInt {
+    type Output = MyInt;
+
+    fn not(self) -> Self {
+        MyInt(!self.0)
+    }
+}
+
+bitflags! {
+    struct Flags128: MyInt {
+        const A = MyInt(0b0000_0001u8);
+        const B = MyInt(0b0000_0010u8);
+        const C = MyInt(0b0000_0100u8);
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_defined.stderr.beta thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_defined.stderr.beta
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_defined.stderr.beta	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_defined.stderr.beta	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+error[E0308]: mismatched types
+   --> $DIR/all_defined.rs:115:1
+    |
+115 | / bitflags! {
+116 | |     struct Flags128: MyInt {
+117 | |         const A = MyInt(0b0000_0001u8);
+118 | |         const B = MyInt(0b0000_0010u8);
+119 | |         const C = MyInt(0b0000_0100u8);
+120 | |     }
+121 | | }
+    | |_^ expected struct `MyInt`, found integer
+    |
+    = note: this error originates in the macro `__impl_all_bitflags` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0308]: mismatched types
+   --> $DIR/all_defined.rs:115:1
+    |
+115 | / bitflags! {
+116 | |     struct Flags128: MyInt {
+117 | |         const A = MyInt(0b0000_0001u8);
+118 | |         const B = MyInt(0b0000_0010u8);
+119 | |         const C = MyInt(0b0000_0100u8);
+120 | |     }
+121 | | }
+    | |_^ expected struct `MyInt`, found integer
+    |
+    = note: this error originates in the macro `__impl_bitflags` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_missing.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_missing.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_missing.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_missing.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+use bitflags::bitflags;
+
+struct MyInt(u8);
+
+bitflags! {
+    struct Flags128: MyInt {
+        const A = MyInt(0b0000_0001);
+        const B = MyInt(0b0000_0010);
+        const C = MyInt(0b0000_0100);
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_missing.stderr.beta thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_missing.stderr.beta
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_missing.stderr.beta	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/non_integer_base/all_missing.stderr.beta	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+error[E0204]: the trait `Copy` may not be implemented for this type
+  --> $DIR/all_missing.rs:5:1
+   |
+5  | / bitflags! {
+6  | |     struct Flags128: MyInt {
+7  | |         const A = MyInt(0b0000_0001);
+8  | |         const B = MyInt(0b0000_0010);
+9  | |         const C = MyInt(0b0000_0100);
+10 | |     }
+11 | | }
+   | |_^ this field does not implement `Copy`
+   |
+   = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_field.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_field.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+mod example {
+    use bitflags::bitflags;
+
+    bitflags! {
+        pub struct Flags1: u32 {
+            const FLAG_A = 0b00000001;
+        }
+    }
+}
+
+fn main() {
+    let flag1 = example::Flags1::FLAG_A.bits;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_field.stderr.beta thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_field.stderr.beta
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_field.stderr.beta	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_field.stderr.beta	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+error[E0616]: field `bits` of struct `Flags1` is private
+  --> $DIR/private_field.rs:12:41
+   |
+12 |     let flag1 = example::Flags1::FLAG_A.bits;
+   |                                         ^^^^ private field
+   |
+help: a method `bits` also exists, call it with parentheses
+   |
+12 |     let flag1 = example::Flags1::FLAG_A.bits();
+   |                                             ^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_flags.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_flags.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_flags.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_flags.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+mod example {
+    use bitflags::bitflags;
+
+    bitflags! {
+        pub struct Flags1: u32 {
+            const FLAG_A = 0b00000001;
+        }
+
+        struct Flags2: u32 {
+            const FLAG_B = 0b00000010;
+        }
+    }
+}
+
+fn main() {
+    let flag1 = example::Flags1::FLAG_A;
+    let flag2 = example::Flags2::FLAG_B;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_flags.stderr.beta thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_flags.stderr.beta
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_flags.stderr.beta	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/private_flags.stderr.beta	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+error[E0603]: struct `Flags2` is private
+  --> $DIR/private_flags.rs:17:26
+   |
+17 |     let flag2 = example::Flags2::FLAG_B;
+   |                          ^^^^^^ private struct
+   |
+note: the struct `Flags2` is defined here
+  --> $DIR/private_flags.rs:4:5
+   |
+4  | /     bitflags! {
+5  | |         pub struct Flags1: u32 {
+6  | |             const FLAG_A = 0b00000001;
+7  | |         }
+...  |
+11 | |         }
+12 | |     }
+   | |_____^
+   = note: this error originates in the macro `bitflags` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/pub_const.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/pub_const.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/pub_const.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/pub_const.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+use bitflags::bitflags;
+
+bitflags! {
+    pub struct Flags1: u32 {
+        pub const FLAG_A = 0b00000001;
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/pub_const.stderr.beta thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/pub_const.stderr.beta
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/pub_const.stderr.beta	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-fail/visibility/pub_const.stderr.beta	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5 @@
+error: no rules expected the token `pub`
+ --> $DIR/pub_const.rs:5:9
+  |
+5 |         pub const FLAG_A = 0b00000001;
+  |         ^^^ no rules expected this token in macro call
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/convert.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/convert.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/convert.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/convert.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+use bitflags::bitflags;
+
+bitflags! {
+    struct Flags: u32 {
+        const A = 0b00000001;
+    }
+}
+
+impl From<u32> for Flags {
+    fn from(v: u32) -> Flags {
+        Flags::from_bits_truncate(v)
+    }
+}
+
+fn main() {
+
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/default.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/default.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/default.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/default.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+use bitflags::bitflags;
+
+bitflags! {
+    #[derive(Default)]
+    struct Flags: u32 {
+        const A = 0b00000001;
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/inherent_methods.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/inherent_methods.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/inherent_methods.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/impls/inherent_methods.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+use bitflags::bitflags;
+
+bitflags! {
+    struct Flags: u32 {
+        const A = 0b00000001;
+    }
+}
+
+impl Flags {
+    pub fn new() -> Flags {
+        Flags::A
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/redefinition/core.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/redefinition/core.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/redefinition/core.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/redefinition/core.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+use bitflags::bitflags;
+
+// Checks for possible errors caused by overriding names used by `bitflags!` internally.
+
+mod core {}
+mod _core {}
+
+bitflags! {
+    struct Test: u8 {
+        const A = 1;
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/redefinition/stringify.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/redefinition/stringify.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/redefinition/stringify.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/redefinition/stringify.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+use bitflags::bitflags;
+
+// Checks for possible errors caused by overriding names used by `bitflags!` internally.
+
+#[allow(unused_macros)]
+macro_rules! stringify {
+    ($($t:tt)*) => { "..." };
+}
+
+bitflags! {
+    struct Test: u8 {
+        const A = 1;
+    }
+}
+
+fn main() {
+    // Just make sure we don't call the redefined `stringify` macro
+    assert_eq!(format!("{:?}", Test::A), "A");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/repr/c.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/repr/c.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/repr/c.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/repr/c.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+use bitflags::bitflags;
+
+bitflags! {
+    #[repr(C)]
+    struct Flags: u32 {
+        const A = 0b00000001;
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/repr/transparent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/repr/transparent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/repr/transparent.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/repr/transparent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+use bitflags::bitflags;
+
+bitflags! {
+    #[repr(transparent)]
+    struct Flags: u32 {
+        const A = 0b00000001;
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/visibility/bits_field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/visibility/bits_field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/visibility/bits_field.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/visibility/bits_field.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+use bitflags::bitflags;
+
+bitflags! {
+    pub struct Flags1: u32 {
+        const FLAG_A = 0b00000001;
+    }
+}
+
+fn main() {
+    assert_eq!(0b00000001, Flags1::FLAG_A.bits);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/visibility/pub_in.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/visibility/pub_in.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile-pass/visibility/pub_in.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile-pass/visibility/pub_in.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+mod a {
+    mod b {
+        use bitflags::bitflags;
+
+        bitflags! {
+            pub(in crate::a) struct Flags: u32 {
+                const FLAG_A = 0b00000001;
+            }
+        }
+    }
+
+    pub fn flags() -> u32 {
+        b::Flags::FLAG_A.bits()
+    }
+}
+
+fn main() {
+    assert_eq!(0b00000001, a::flags());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitflags/tests/compile.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitflags/tests/compile.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,63 @@
+use std::{
+    fs,
+    ffi::OsStr,
+    io,
+    path::Path,
+};
+
+use walkdir::WalkDir;
+
+#[test]
+fn fail() {
+    prepare_stderr_files("tests/compile-fail").unwrap();
+
+    let t = trybuild::TestCases::new();
+    t.compile_fail("tests/compile-fail/**/*.rs");
+}
+
+#[test]
+fn pass() {
+    let t = trybuild::TestCases::new();
+    t.pass("tests/compile-pass/**/*.rs");
+}
+
+// Compiler messages may change between versions
+// We don't want to have to track these too closely for `bitflags`, but
+// having some message to check makes sure user-facing errors are sensical.
+// 
+// The approach we use is to run the test on all compilers, but only check stderr
+// output on beta (which is the next stable release). We do this by default ignoring
+// any `.stderr` files in the `compile-fail` directory, and copying `.stderr.beta` files
+// when we happen to be running on a beta compiler.
+fn prepare_stderr_files(path: impl AsRef<Path>) -> io::Result<()> {
+    for entry in WalkDir::new(path) {
+        let entry = entry?;
+
+        if entry.path().extension().and_then(OsStr::to_str) == Some("beta") {
+            let renamed = entry.path().with_extension("");
+
+            // Unconditionally remove a corresponding `.stderr` file for a `.stderr.beta`
+            // file if it exists. On `beta` compilers, we'll recreate it. On other compilers,
+            // we don't want to end up checking it anyways.
+            if renamed.exists() {
+                fs::remove_file(&renamed)?;
+            }
+
+            rename_beta_stderr(entry.path(), renamed)?;
+        }
+    }
+
+    Ok(())
+}
+
+#[rustversion::beta]
+fn rename_beta_stderr(from: impl AsRef<Path>, to: impl AsRef<Path>) -> io::Result<()> {
+    fs::copy(from, to)?;
+
+    Ok(())
+}
+
+#[rustversion::not(beta)]
+fn rename_beta_stderr(_: impl AsRef<Path>, _: impl AsRef<Path>) -> io::Result<()> {
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/benches/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/benches/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/benches/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/benches/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,153 @@
+/*! Macro construction benchmarks.
+
+This is taken from [issue #28], which noted that the `bitvec![bit; rep]`
+expansion was horribly inefficient.
+
+This benchmark crate should be used for all macro performance recording, and
+compare the macros against `vec!`. While `vec!` will always be faster, because
+`bitvec!` does more work than `vec!`, they should at least be close.
+
+Original performance was 10,000x slower. Performance after the fix for #28 was
+within 20ns.
+
+[issue #28]: https://github.com/myrrlyn/bitvec/issues/28
+!*/
+
+#![feature(test)]
+
+extern crate test;
+
+use bitvec::prelude::*;
+use test::Bencher;
+
+#[bench]
+fn bits_seq_u8(b: &mut Bencher) {
+	b.iter(|| {
+		bitarr![LocalBits, u8;
+			0, 1, 0, 1, 0, 0, 1, 1,
+			0, 1, 1, 0, 0, 0, 0, 1,
+			0, 1, 1, 0, 1, 1, 0, 0,
+			0, 1, 1, 1, 0, 1, 0, 1,
+			0, 1, 1, 1, 0, 1, 0, 0,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 1, 1, 0, 1, 1, 1, 0,
+			0, 0, 1, 0, 1, 1, 0, 0,
+			0, 0, 1, 0, 0, 0, 0, 0,
+			0, 1, 1, 0, 1, 1, 0, 1,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 1, 1, 0, 1, 1, 1, 0,
+			0, 1, 1, 0, 0, 1, 0, 0,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 0, 1, 0, 0, 0, 0, 1,
+		]
+	});
+}
+
+#[bench]
+fn bits_seq_u16(b: &mut Bencher) {
+	b.iter(|| {
+		bitarr![LocalBits, u16;
+			0, 1, 0, 1, 0, 0, 1, 1,
+			0, 1, 1, 0, 0, 0, 0, 1,
+			0, 1, 1, 0, 1, 1, 0, 0,
+			0, 1, 1, 1, 0, 1, 0, 1,
+			0, 1, 1, 1, 0, 1, 0, 0,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 1, 1, 0, 1, 1, 1, 0,
+			0, 0, 1, 0, 1, 1, 0, 0,
+			0, 0, 1, 0, 0, 0, 0, 0,
+			0, 1, 1, 0, 1, 1, 0, 1,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 1, 1, 0, 1, 1, 1, 0,
+			0, 1, 1, 0, 0, 1, 0, 0,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 0, 1, 0, 0, 0, 0, 1,
+		]
+	});
+}
+
+#[bench]
+fn bits_seq_u32(b: &mut Bencher) {
+	b.iter(|| {
+		bitarr![LocalBits, u32;
+			0, 1, 0, 1, 0, 0, 1, 1,
+			0, 1, 1, 0, 0, 0, 0, 1,
+			0, 1, 1, 0, 1, 1, 0, 0,
+			0, 1, 1, 1, 0, 1, 0, 1,
+			0, 1, 1, 1, 0, 1, 0, 0,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 1, 1, 0, 1, 1, 1, 0,
+			0, 0, 1, 0, 1, 1, 0, 0,
+			0, 0, 1, 0, 0, 0, 0, 0,
+			0, 1, 1, 0, 1, 1, 0, 1,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 1, 1, 0, 1, 1, 1, 0,
+			0, 1, 1, 0, 0, 1, 0, 0,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 0, 1, 0, 0, 0, 0, 1,
+		]
+	});
+}
+
+#[bench]
+#[cfg(target_pointer_width = "64")]
+fn bits_seq_u64(b: &mut Bencher) {
+	b.iter(|| {
+		bitarr![LocalBits, u64;
+			0, 1, 0, 1, 0, 0, 1, 1,
+			0, 1, 1, 0, 0, 0, 0, 1,
+			0, 1, 1, 0, 1, 1, 0, 0,
+			0, 1, 1, 1, 0, 1, 0, 1,
+			0, 1, 1, 1, 0, 1, 0, 0,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 1, 1, 0, 1, 1, 1, 0,
+			0, 0, 1, 0, 1, 1, 0, 0,
+			0, 0, 1, 0, 0, 0, 0, 0,
+			0, 1, 1, 0, 1, 1, 0, 1,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 1, 1, 0, 1, 1, 1, 0,
+			0, 1, 1, 0, 0, 1, 0, 0,
+			0, 1, 1, 0, 1, 1, 1, 1,
+			0, 0, 1, 0, 0, 0, 0, 1,
+		]
+	});
+}
+
+// The repetition macros run at compile time, so should bench at zero.
+
+#[bench]
+fn bits_rep_u8(b: &mut Bencher) {
+	b.iter(|| bitarr![LocalBits, u8; 0; 120]);
+	b.iter(|| bitarr![LocalBits, u8; 1; 120]);
+}
+
+#[bench]
+fn bits_rep_u16(b: &mut Bencher) {
+	b.iter(|| bitarr![LocalBits, u16; 0; 120]);
+	b.iter(|| bitarr![LocalBits, u16; 1; 120]);
+}
+
+#[bench]
+fn bits_rep_u32(b: &mut Bencher) {
+	b.iter(|| bitarr![LocalBits, u32; 0; 120]);
+	b.iter(|| bitarr![LocalBits, u32; 1; 120]);
+}
+
+#[bench]
+#[cfg(target_pointer_width = "64")]
+fn bits_rep_u64(b: &mut Bencher) {
+	b.iter(|| bitarr![LocalBits, u64; 0; 120]);
+	b.iter(|| bitarr![LocalBits, u64; 1; 120]);
+}
+
+#[bench]
+fn bitvec_rep(b: &mut Bencher) {
+	b.iter(|| bitvec![0; 16 * 16 * 9]);
+	b.iter(|| bitvec![1; 16 * 16 * 9]);
+}
+
+#[bench]
+fn vec_rep(b: &mut Bencher) {
+	b.iter(|| vec![0u8; 16 * 16 * 9 / 8]);
+	b.iter(|| vec![-1i8; 16 * 16 * 9 / 8]);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/benches/memcpy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/benches/memcpy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/benches/memcpy.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/benches/memcpy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,88 @@
+/*! Benchmarks for `BitSlice::copy_from_slice`.
+
+The `copy_from_slice` implementation attempts to detect slice conditions that
+allow element-wise `memcpy` behavior, rather than the conservative bit-by-bit
+iteration, in the hopes that element load/stores are faster than reading and
+writing each bit in an element individually.
+
+At least on the author’s machine, this appears not to be the case. The author
+has not inspected the object code emitted by `clone_from_bitslice` and has no
+speculation on why this is the case.
+!*/
+
+use bitvec::prelude::*;
+
+use criterion::{
+	criterion_group,
+	criterion_main,
+	BenchmarkId,
+	Criterion,
+	Throughput,
+};
+
+const FACTOR: usize = 1024;
+
+pub fn benchmarks(crit: &mut Criterion) {
+	let mut group = crit.benchmark_group("accel");
+	for (kibi, bits) in [1, 2, 4, 8, 16, 32, 64, 128]
+		.iter()
+		.copied()
+		.map(|n| (n, n * FACTOR))
+	{
+		group.throughput(Throughput::Elements(bits as u64));
+		group.bench_with_input(
+			BenchmarkId::from_parameter(kibi),
+			&bits,
+			|b, bits| {
+				let mut dst: BitVec = BitVec::repeat(false, *bits);
+				let src: BitVec = BitVec::repeat(true, *bits);
+				b.iter(|| {
+					dst[10 .. *bits - 10]
+						.copy_from_bitslice(&src[10 .. *bits - 10])
+				});
+			},
+		);
+	}
+	group.finish();
+
+	let mut group = crit.benchmark_group("bitwise");
+	for (kibi, bits) in [1, 2, 4, 8, 16, 32, 64, 128]
+		.iter()
+		.copied()
+		.map(|n| (n, n * FACTOR))
+	{
+		group.throughput(Throughput::Elements(bits as u64));
+		group.bench_with_input(
+			BenchmarkId::from_parameter(kibi),
+			&bits,
+			|b, bits| {
+				let mut dst: BitVec = BitVec::repeat(false, *bits);
+				let src: BitVec = BitVec::repeat(true, *bits);
+				b.iter(|| dst.clone_from_bitslice(&src));
+			},
+		);
+	}
+	group.finish();
+
+	let mut group = crit.benchmark_group("mismatch");
+	for (kibi, bits) in [1, 2, 4, 8, 16, 32, 64, 128]
+		.iter()
+		.copied()
+		.map(|n| (n, n * FACTOR))
+	{
+		group.throughput(Throughput::Elements(bits as u64));
+		group.bench_with_input(
+			BenchmarkId::from_parameter(kibi),
+			&bits,
+			|b, bits| {
+				let mut dst: BitVec<Msb0, u16> = BitVec::repeat(false, *bits);
+				let src: BitVec<Lsb0, u32> = BitVec::repeat(true, *bits);
+				b.iter(|| dst.clone_from_bitslice(&src));
+			},
+		);
+	}
+	group.finish();
+}
+
+criterion_group!(benches, benchmarks);
+criterion_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/benches/slice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/benches/slice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/benches/slice.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/benches/slice.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,139 @@
+#![feature(test)]
+
+extern crate test;
+
+use bitvec::prelude::*;
+use test::{
+	bench::black_box,
+	Bencher,
+};
+
+/* `BitSlice::empty` is not benched, because the compiler const-folds it. It
+is not a `const fn`, but it has exactly one function call, which is `const`, and
+creates a value object from that function. As such, the compiler can prove that
+the return value is a `const` value, and insert the value at all
+`BitSlice::empty` call sites. It takes 0ns.
+*/
+
+#[bench]
+fn element(b: &mut Bencher) {
+	b.iter(|| BitSlice::<Msb0, u8>::from_element(&!0));
+	b.iter(|| BitSlice::<Lsb0, u8>::from_element(&!0));
+	b.iter(|| BitSlice::<Msb0, u16>::from_element(&!0));
+	b.iter(|| BitSlice::<Lsb0, u16>::from_element(&!0));
+	b.iter(|| BitSlice::<Msb0, u32>::from_element(&!0));
+	b.iter(|| BitSlice::<Lsb0, u32>::from_element(&!0));
+
+	#[cfg(target_pointer_width = "64")]
+	{
+		b.iter(|| BitSlice::<Msb0, u64>::from_element(&!0));
+		b.iter(|| BitSlice::<Lsb0, u64>::from_element(&!0));
+	}
+}
+
+#[bench]
+fn slice(b: &mut Bencher) {
+	b.iter(|| BitSlice::<Msb0, u8>::from_slice(&[0, 1, !0 - 1, !0][..]));
+	b.iter(|| BitSlice::<Lsb0, u8>::from_slice(&[0, 1, !0 - 1, !0][..]));
+	b.iter(|| BitSlice::<Msb0, u16>::from_slice(&[0, 1, !0 - 1, !0][..]));
+	b.iter(|| BitSlice::<Lsb0, u16>::from_slice(&[0, 1, !0 - 1, !0][..]));
+	b.iter(|| BitSlice::<Msb0, u32>::from_slice(&[0, 1, !0 - 1, !0][..]));
+	b.iter(|| BitSlice::<Lsb0, u32>::from_slice(&[0, 1, !0 - 1, !0][..]));
+
+	#[cfg(target_pointer_width = "64")]
+	{
+		b.iter(|| BitSlice::<Msb0, u64>::from_slice(&[0, 1, !0 - 1, !0][..]));
+		b.iter(|| BitSlice::<Lsb0, u64>::from_slice(&[0, 1, !0 - 1, !0][..]));
+	}
+}
+
+#[bench]
+fn len(b: &mut Bencher) {
+	let bsb08 = [0u8; 16].view_bits::<Msb0>();
+	let bsl08 = [0u8; 16].view_bits::<Lsb0>();
+	b.iter(|| bsb08.len());
+	b.iter(|| bsl08.len());
+
+	let bsb16 = [0u16; 8].view_bits::<Msb0>();
+	let bsl16 = [0u16; 8].view_bits::<Lsb0>();
+	b.iter(|| bsb16.len());
+	b.iter(|| bsl16.len());
+
+	let bsb32 = [0u32; 4].view_bits::<Msb0>();
+	let bsl32 = [0u32; 4].view_bits::<Lsb0>();
+	b.iter(|| bsb32.len());
+	b.iter(|| bsl32.len());
+
+	#[cfg(target_pointer_width = "64")]
+	{
+		let bsb64 = [0u64; 2].view_bits::<Msb0>();
+		let bsl64 = [0u64; 2].view_bits::<Lsb0>();
+		b.iter(|| bsb64.len());
+		b.iter(|| bsl64.len());
+	}
+}
+
+//  This index value is not only "nice", it also ensures that the hard path is
+//  hit in `BitIdx::offset`.
+#[bench]
+fn index(b: &mut Bencher) {
+	let bsb08 = [0u8; 16].view_bits::<Msb0>();
+	let bsl08 = [0u8; 16].view_bits::<Lsb0>();
+	b.iter(|| assert!(!black_box(bsb08)[black_box(69)]));
+	b.iter(|| assert!(!black_box(bsl08)[black_box(69)]));
+
+	let bsb16 = [0u16; 8].view_bits::<Msb0>();
+	let bsl16 = [0u16; 8].view_bits::<Lsb0>();
+	b.iter(|| assert!(!black_box(bsb16)[black_box(69)]));
+	b.iter(|| assert!(!black_box(bsl16)[black_box(69)]));
+
+	let bsb32 = [0u32; 4].view_bits::<Msb0>();
+	let bsl32 = [0u32; 4].view_bits::<Lsb0>();
+	b.iter(|| assert!(!black_box(bsb32)[black_box(69)]));
+	b.iter(|| assert!(!black_box(bsl32)[black_box(69)]));
+
+	#[cfg(target_pointer_width = "64")]
+	{
+		let bsb64 = [0u64; 2].view_bits::<Msb0>();
+		let bsl64 = [0u64; 2].view_bits::<Lsb0>();
+		b.iter(|| assert!(!black_box(bsb64)[black_box(69)]));
+		b.iter(|| assert!(!black_box(bsl64)[black_box(69)]));
+	}
+}
+
+/* This routine has more work to do: index, create a reference struct, and drop
+it. The compiler *should* be able to properly arrange immediate drops, though.
+*/
+#[bench]
+fn get_mut(b: &mut Bencher) {
+	let mut src = [0u8; 16];
+	let bsb08 = src.view_bits_mut::<Msb0>();
+	b.iter(|| *bsb08.get_mut(69).unwrap() = true);
+	let mut src = [0u8; 16];
+	let bsl08 = src.view_bits_mut::<Lsb0>();
+	b.iter(|| *bsl08.get_mut(69).unwrap() = true);
+
+	let mut src = [0u16; 8];
+	let bsb16 = src.view_bits_mut::<Msb0>();
+	b.iter(|| *bsb16.get_mut(69).unwrap() = true);
+	let mut src = [0u16; 8];
+	let bsl16 = src.view_bits_mut::<Lsb0>();
+	b.iter(|| *bsl16.get_mut(69).unwrap() = true);
+
+	let mut src = [0u32; 4];
+	let bsb32 = src.view_bits_mut::<Msb0>();
+	b.iter(|| *bsb32.get_mut(69).unwrap() = true);
+	let mut src = [0u32; 4];
+	let bsl32 = src.view_bits_mut::<Lsb0>();
+	b.iter(|| *bsl32.get_mut(69).unwrap() = true);
+
+	#[cfg(target_pointer_width = "64")]
+	{
+		let mut src = [0u64; 2];
+		let bsb64 = src.view_bits_mut::<Msb0>();
+		b.iter(|| *bsb64.get_mut(69).unwrap() = true);
+		let mut src = [0u64; 2];
+		let bsl64 = src.view_bits_mut::<Lsb0>();
+		b.iter(|| *bsl64.get_mut(69).unwrap() = true);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"f1eafd51a14e0995d441433b631a1e92dffe68f5e190e48a866d4970aca17847","benches/macros.rs":"b52ad74eb0300ed4c1de47d5f2adde79ee66e97d0cce3f159b9cdb76dba09cc8","benches/memcpy.rs":"f851fc7b415be913ca8edd66910ecf48d4d6ef31581bdc90c44025c656bf6305","benches/slice.rs":"3f84ace69e41f62eb7dbab9f44a596c16933e62eaccdad68c89e54b7be11c412","src/access.rs":"fef22e2f1b9e28fc25671ad8ac6cde7c3f67810a279f994d754d20965a799b4f","src/array.rs":"77cec3eb49ac11afc883ed95e1751f730117c968306c2051884b9e10a73f877e","src/array/ops.rs":"2184ae7bda07763e6b764126419002412c279e2ef946ba42cb7ef51e6a0afe09","src/array/traits.rs":"aa3d34b6663357c2525ba489903f5c3ca5987475a7133617bc013bf203b19445","src/boxed.rs":"02530613b2655b7ff28877babe396e2a96abaa35e2bfefb6638ec05f01b67aac","src/boxed/api.rs":"77d07102d9877a3f66c8cca56d0a28835b60a9506a38598a5336084143e83286","src/boxed/ops.rs":"91a234bc20105dd7c22046264854c3e671f19cf3ea74f510c0b9e8f9f5f46d05","src/boxed/tests.rs":"916279ace1a5b4b8dafa86d65bd27e04e42bae0277a3349fbc3741c021709cde","src/boxed/traits.rs":"d5ad03a4aa1162b80a17724fb8e9abc0e1773cdc441cab327e9fb534e8b52d2e","src/devel.rs":"339a787e0d1dad893a14f718305dc3f08c2b422e8bdd41f4ca9e1ce912fbcdf6","src/domain.rs":"a86da4fe2dfcbc0921ac6e9452865f85e7f233932bc3957159ed65a232f31314","src/field.rs":"67a415db08e2e6ee00d988c83aef2ff1007efac551a5aa631142ee2923f74703","src/field/io.rs":"26674fb98b2477e1d5bb42e191ac8cec10bb928ee185e91132606865879d402a","src/field/permutation_tests.rs":"cf79c1d01825f7063fd1ecb2c8305ab7db99de4d3942fa9fe983367571e9a499","src/field/tests.rs":"75805f138cddb323e522939a9b0b2689007538fb28e35596328762f6e4d25acb","src/index.rs":"e541f779a7c19db6a06ca47db5b5613d4cab02e770fce19c14fbb3ed77605077","src/lib.rs":"214409f466a09fcb212e765aea77c12f4177ff7b541db5358ad504d21f960c97","src/macros.rs":"7a86a6b2d2f6779ba2f0c58aeeb922525b63ebb2a7befb0f27e8ddd1669251c2","src/macros/internal.rs":"6f8611dc3954bc6912fd9a65bbe9e81add8ee19c5bb1e33508f6751783c67ccb","src/mem.rs":"19fe72caecc0f5e7bf086e2fa948d606a9adb733bc1efec4f596d1219d1078dd","src/order.rs":"5e8d5d05121973538e5b4a68b9f8665bc552a03fbe348d0c823b14aadcf75f77","src/pointer.rs":"e5901ad0ab51efd8c40d0cf79f7d6bd8a007e8f562ad858e70de968a1e5b943f","src/prelude.rs":"c3e21deb2e595a0b97ad62596b57c4ca4e044ee777760315965384e7646c2c13","src/serdes.rs":"1f08683c1a70782e2326af3786f4a3d19efe8dffa97140ffa4f40bad2e5ce618","src/slice.rs":"b9e7e7ec62c9d4864de602741c6d02547d055554983eb8dfd08b303fa4d1be79","src/slice/api.rs":"f29e28823c34aae0abe36e12a05db0b4716d624068326e756323463715afc193","src/slice/iter.rs":"b4aaaab1cde1a120d573fcf5aadfdbfd3042184880fbdc2ab703fc87c6fa02a6","src/slice/ops.rs":"a55548de7d12aeed8fbd87fd95f4dfdbb09f1f9458b3b8a683b6fdb5d58e5c4c","src/slice/proxy.rs":"1272f78d4cc747e1f223386ba0a956dcd7850898da5720d4540dedbd8a22c824","src/slice/tests.rs":"d362aef0afcd1c2e437379c821362ba171134528263eac911071b202f495843a","src/slice/traits.rs":"4270cfa28b4dc1286be9649e1d0d9024da2a16dbae5f91142fdef4e71901c5e6","src/store.rs":"9ae0377234806c962019757b8726e3391c1dcb9e8a3df7f68d97f8f39cfe2c82","src/vec.rs":"e5b62de7ce969d23518823d561d36fdf12b35edf21898c61dc5e469cdbe4d836","src/vec/api.rs":"4c416c460f538a31b8dbe12a98e8b43fd50a2e25314b607eecc3090e707daf6e","src/vec/iter.rs":"e2eb3c7716c4914a6ff1ebe5923a3a2792090b4366872ceae4d1ce43c208a942","src/vec/ops.rs":"c98c1a27c6551483ed220c9d1b1961c5de7994bca63360fcfe726bbf7475c074","src/vec/tests.rs":"9b288075e8920f65942f4a50c5818a0fba84f2265418dd9a8a8ec0f83c4d24cd","src/vec/traits.rs":"e878856e623e86bffd21b4ae729272b6ca85cc4dbf60bbf8587d0063ea16e46a","src/view.rs":"a26732b0430dac953da6b2c77f1f14d322d5cd91af55184b213ff411a8b465f0"},"package":"8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,83 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "bitvec"
+version = "0.19.5"
+authors = ["myrrlyn <self@myrrlyn.dev>"]
+include = ["Cargo.toml", "src/**/*.rs", "benches/*.rs"]
+description = "A crate for manipulating memory, bit by bit"
+homepage = "https://myrrlyn.net/crates/bitvec"
+documentation = "https://docs.rs/bitvec"
+readme = "README.md"
+keywords = ["bitfields", "bits", "bitstream", "bitvec", "bitvector"]
+categories = ["data-structures", "embedded", "no-std", "rust-patterns"]
+license = "MIT"
+repository = "https://github.com/myrrlyn/bitvec"
+[package.metadata.docs.rs]
+features = ["atomic", "serde", "std"]
+
+[[bench]]
+name = "memcpy"
+harness = false
+[dependencies.funty]
+version = "~1.1"
+default-features = false
+
+[dependencies.radium]
+version = "0.5"
+
+[dependencies.serde]
+version = "1"
+optional = true
+default-features = false
+
+[dependencies.tap]
+version = "1"
+
+[dependencies.wyz]
+version = "0.2"
+default-features = false
+[dev-dependencies.criterion]
+version = "0.3"
+
+[dev-dependencies.serde]
+version = "1"
+
+[dev-dependencies.serde_json]
+version = "1"
+
+[dev-dependencies.serde_test]
+version = "1"
+
+[dev-dependencies.static_assertions]
+version = "1"
+
+[features]
+alloc = ["wyz/alloc"]
+atomic = []
+default = ["atomic", "std"]
+std = ["alloc"]
+[badges.codecov]
+branch = "master"
+repository = "myrrlyn/bitvec"
+service = "github"
+
+[badges.is-it-maintained-issue-resolution]
+repository = "myrrlyn/bitvec"
+
+[badges.is-it-maintained-open-issues]
+repository = "myrrlyn/bitvec"
+
+[badges.maintenance]
+status = "actively-developed"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/access.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/access.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/access.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/access.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,387 @@
+/*! Memory access control.
+
+`bitvec` allows a program to produce handles over memory that do not logically
+alias, but may alias in hardware. This module provides a unified interface for
+memory accesses that can be specialized to handle aliased and unaliased access
+events.
+
+The `BitAccess` trait provides capabilities to access bits in memory elements
+through shared references, and its implementations are responsible for
+coördinating synchronization and contention as needed.
+!*/
+
+use crate::{
+	index::{
+		BitIdx,
+		BitMask,
+		BitRegister,
+	},
+	order::BitOrder,
+};
+
+use core::{
+	fmt::Debug,
+	sync::atomic::Ordering,
+};
+
+use radium::Radium;
+
+/** Access interface to memory locations.
+
+This trait abstracts over the specific instructions used to perform accesses to
+memory locations, so that use sites elsewhere in the crate can select their
+required behavior without changing the interface.
+
+This is automatically implemented for all types that permit shared/mutable
+memory access to register types through the `radium` crate. Its use is
+constrained in the `store` module.
+**/
+pub trait BitAccess: Debug + Radium + Sized
+where <Self as Radium>::Item: BitRegister
+{
+	/// Sets one bit in a memory element to `0`.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: A bit ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `index`: The semantic index of the bit in `*self` to be erased.
+	///
+	/// # Effects
+	///
+	/// The memory element at `*self` has the bit corresponding to `index` set
+	/// to `0`, and all other bits are unchanged.
+	#[inline]
+	fn clear_bit<O>(&self, index: BitIdx<<Self as Radium>::Item>)
+	where O: BitOrder {
+		self.fetch_and(!index.select::<O>().value(), Ordering::Relaxed);
+	}
+
+	/// Set any number of bits in a memory element to `0`.
+	///
+	/// The mask provided to this method must be constructed from indices that
+	/// are valid in the caller’s context. As the mask is already computed by
+	/// the caller, this does not take an ordering type parameter.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `mask`: A mask of any number of bits. This is a selection mask of bits
+	///   to modify.
+	///
+	/// # Effects
+	///
+	/// All bits in `*self` that are selected (set to `1`) in `mask` will be set
+	/// to `0`, and all bits in `*self` that are not selected (set to `0`) in
+	/// `mask` will be unchanged.
+	///
+	/// Do not invert the mask prior to calling this function in order to save
+	/// the unselected bits and erase the selected bits. `BitMask` is a
+	/// selection type, not a bitwise-operation argument.
+	#[inline]
+	fn clear_bits(&self, mask: BitMask<<Self as Radium>::Item>) {
+		self.fetch_and(!mask.value(), Ordering::Relaxed);
+	}
+
+	/// Sets one bit in a memory element to `1`.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: A bit ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `index`: The semantic index of the bit in `*self` to be written.
+	///
+	/// # Effects
+	///
+	/// The memory element at `*self` has the bit corresponding to `index` set
+	/// to `1`, and all other bits are unchanged.
+	#[inline]
+	fn set_bit<O>(&self, index: BitIdx<<Self as Radium>::Item>)
+	where O: BitOrder {
+		self.fetch_or(index.select::<O>().value(), Ordering::Relaxed);
+	}
+
+	/// Sets any number of bits in a memory element to `1`.
+	///
+	/// The mask provided to this method must be constructed from indices that
+	/// are valid in the caller’s context. As the mask is already computed by
+	/// the caller, this does not need to take an ordering type parameter.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `mask`: A mask of any number of bits. This is a selection mask of bits
+	///   to modify.
+	///
+	/// # Effects
+	///
+	/// All bits in `*self` that are selected (set to `1`) in `mask` will be set
+	/// to `1`, and all bits in `*self` that are not selected (set to `0`) in
+	/// `mask` will be unchanged.
+	#[inline]
+	fn set_bits(&self, mask: BitMask<<Self as Radium>::Item>) {
+		self.fetch_or(mask.value(), Ordering::Relaxed);
+	}
+
+	/// Inverts the value of one bit in a memory element.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: A bit ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `index`: The semantic index of the bit in `*self` to be inverted.
+	///
+	/// # Effects
+	///
+	/// The memory element at `*self` has the bit corresponding to `index` set
+	/// to the opposite of its current value. All other bits are unchanged.
+	#[inline]
+	fn invert_bit<O>(&self, index: BitIdx<<Self as Radium>::Item>)
+	where O: BitOrder {
+		self.fetch_xor(index.select::<O>().value(), Ordering::Relaxed);
+	}
+
+	/// Invert any number of bits in a memory element.
+	///
+	/// The mask provided to this method must be constructed from indices that
+	/// are valid in the caller’s context. As the mask is already computed by
+	/// the caller, this does not take an ordering type parameter.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `mask`: A mask of any number of bits. This is a selection mask of bits
+	///   to modify.
+	///
+	/// # Effects
+	///
+	/// All bits in `*self` that are selected (set to `1`) in `mask` will be set
+	/// to the opposite of their current value, and all bits in `*self` that are
+	/// not selected (set to `0`) in `mask` will be unchanged.
+	#[inline]
+	fn invert_bits(&self, mask: BitMask<<Self as Radium>::Item>) {
+		self.fetch_xor(mask.value(), Ordering::Relaxed);
+	}
+
+	/// Writes a bit to an index within the `self` element.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: A bit ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `index`: The semantic index of the bit in `*self` to be written.
+	/// - `value`: The bit value to write into `*self` at `index`.
+	///
+	/// # Effects
+	///
+	/// The bit in `*self` at `index` is set to the `value` bit.
+	#[inline]
+	fn write_bit<O>(&self, index: BitIdx<<Self as Radium>::Item>, value: bool)
+	where O: BitOrder {
+		if value {
+			self.set_bit::<O>(index);
+		}
+		else {
+			self.clear_bit::<O>(index);
+		}
+	}
+
+	/// Writes a bit value to any number of bits within the `self` element.
+	///
+	/// The mask provided to this method must be constructed from indices that
+	/// are valid in the caller’s context. As the mask is already computed by
+	/// the caller, this does not need to take an ordering type parameter.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `mask`: A mask of any number of bits. This is a selection mask of bits
+	///   to modify.
+	///
+	/// # Effects
+	///
+	/// All bits in `*self` that are selected (set to `1`) in `mask` will be set
+	/// to `value`, and all bits in `*self` that are not selected (set to `0`)
+	/// in `mask` will be unchanged.
+	#[inline]
+	fn write_bits(&self, mask: BitMask<<Self as Radium>::Item>, value: bool) {
+		if value {
+			self.set_bits(mask);
+		}
+		else {
+			self.clear_bits(mask);
+		}
+	}
+
+	/// Gets the function that writes `value` to an index.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: A bit ordering.
+	///
+	/// # Parameters
+	///
+	/// - `value`: The bit that will be directly written by the returned
+	///   function.
+	///
+	/// # Returns
+	///
+	/// A function which, when applied to a reference and an index, will write
+	/// `value` into memory. If `value` is `false`, then this produces
+	/// [`clear_bit`]; if it is `true`, then this produces [`set_bit`].
+	///
+	/// [`clear_bit`]: #method.clear_bit
+	/// [`set_bit`]: #method.set_bit
+	#[inline]
+	fn get_writer<O>(
+		value: bool,
+	) -> for<'a> fn(&'a Self, BitIdx<<Self as Radium>::Item>)
+	where O: BitOrder {
+		[Self::clear_bit::<O>, Self::set_bit::<O>][value as usize]
+	}
+
+	/// Gets the function that writes `value` into all bits under a mask.
+	///
+	/// # Parameters
+	///
+	/// - `value`: The bit that will be directly written by the returned
+	///   function.
+	///
+	/// # Returns
+	///
+	/// A function which, when applied to a reference and a mask, will write
+	/// `value` into memory. If `value` is `false`, then this produces
+	/// [`clear_bits`]; if it is `true`, then this produces [`set_bits`].
+	///
+	/// [`clear_bits`]: #method.clear_bits
+	/// [`set_bits`]: #method.set_bits
+	#[inline]
+	fn get_writers(
+		value: bool,
+	) -> for<'a> fn(&'a Self, BitMask<<Self as Radium>::Item>) {
+		[Self::clear_bits, Self::set_bits][value as usize]
+	}
+
+	/// Unconditionally writes a value into a memory location.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `value`: The new value to write into `*self`.
+	///
+	/// # Effects
+	///
+	/// The current value at `*self` is replaced with `value`.
+	///
+	/// # Safety
+	///
+	/// The calling context must either have write permissions to the entire
+	/// memory element at `*self`, or construct a `value` that does not modify
+	/// the bits of `*self` that the caller does not currently own.
+	///
+	/// As this directly permits the modification of memory outside the logical
+	/// ownership of the caller, this method risks behavior that violates the
+	/// Rust memory model, even if it may not be technically undefined.
+	#[inline]
+	unsafe fn store_value(&self, value: <Self as Radium>::Item) {
+		self.store(value, Ordering::Relaxed)
+	}
+}
+
+impl<A> BitAccess for A
+where
+	A: Debug + Radium,
+	<Self as Radium>::Item: BitRegister,
+{
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::prelude::*;
+
+	#[test]
+	fn touch_memory() {
+		let mut data = 0u8;
+		let bits = data.view_bits_mut::<LocalBits>();
+		let accessor = unsafe { &*(bits.bitptr().pointer().to_access()) };
+
+		BitAccess::set_bit::<Lsb0>(accessor, BitIdx::ZERO);
+		assert_eq!(accessor.get(), 1);
+
+		BitAccess::set_bits(accessor, BitMask::ALL);
+		assert_eq!(accessor.get(), !0);
+
+		BitAccess::clear_bit::<Lsb0>(accessor, BitIdx::ZERO);
+		assert_eq!(accessor.get(), !1);
+
+		BitAccess::clear_bits(accessor, BitMask::ALL);
+		assert_eq!(accessor.get(), 0);
+
+		BitAccess::invert_bit::<Lsb0>(accessor, BitIdx::ZERO);
+		assert_eq!(accessor.get(), 1);
+		BitAccess::invert_bits(accessor, BitMask::ALL);
+		assert_eq!(accessor.get(), !1);
+
+		assert!(!BitStore::get_bit::<Lsb0>(accessor, BitIdx::ZERO));
+		assert_eq!(accessor.get(), !1);
+
+		BitAccess::write_bit::<Lsb0>(accessor, BitIdx::new(1).unwrap(), false);
+		assert_eq!(accessor.get(), !3);
+
+		BitAccess::write_bits(accessor, BitMask::ALL, true);
+		assert_eq!(accessor.get(), !0);
+		BitAccess::write_bits(accessor, Lsb0::mask(BitIdx::new(2), None), false);
+		assert_eq!(
+			BitStore::get_bits(accessor, Lsb0::mask(BitIdx::new(2), None)),
+			0
+		);
+		assert_eq!(accessor.get(), 3);
+
+		BitAccess::get_writer::<Lsb0>(false)(accessor, BitIdx::ZERO);
+		assert_eq!(accessor.get(), 2);
+
+		unsafe {
+			BitAccess::store_value(accessor, !1);
+		}
+		assert_eq!(accessor.get(), !1);
+	}
+
+	#[test]
+	#[cfg(not(miri))]
+	fn sanity_check_prefetch() {
+		use core::cell::Cell;
+
+		assert_eq!(
+			<Cell<u8> as BitAccess>::get_writer::<Msb0>(false) as *const (),
+			<Cell<u8> as BitAccess>::clear_bit::<Msb0> as *const ()
+		);
+
+		assert_eq!(
+			<Cell<u8> as BitAccess>::get_writer::<Msb0>(true) as *const (),
+			<Cell<u8> as BitAccess>::set_bit::<Msb0> as *const ()
+		);
+
+		assert_eq!(
+			<Cell<u8> as BitAccess>::get_writers(false) as *const (),
+			<Cell<u8> as BitAccess>::clear_bits as *const ()
+		);
+
+		assert_eq!(
+			<Cell<u8> as BitAccess>::get_writers(true) as *const (),
+			<Cell<u8> as BitAccess>::set_bits as *const ()
+		);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/array/ops.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/array/ops.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/array/ops.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/array/ops.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,176 @@
+//! Operator implementations on `BitArray`.
+
+use crate::{
+	array::BitArray,
+	order::BitOrder,
+	slice::BitSlice,
+	view::BitView,
+};
+
+use core::ops::{
+	BitAnd,
+	BitAndAssign,
+	BitOr,
+	BitOrAssign,
+	BitXor,
+	BitXorAssign,
+	Deref,
+	DerefMut,
+	Index,
+	IndexMut,
+	Not,
+};
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, Rhs> BitAnd<Rhs> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	BitSlice<O, V::Store>: BitAndAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitand(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() &= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, Rhs> BitAndAssign<Rhs> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	BitSlice<O, V::Store>: BitAndAssign<Rhs>,
+{
+	#[inline]
+	fn bitand_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() &= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, Rhs> BitOr<Rhs> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	BitSlice<O, V::Store>: BitOrAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitor(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() |= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, Rhs> BitOrAssign<Rhs> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	BitSlice<O, V::Store>: BitOrAssign<Rhs>,
+{
+	#[inline]
+	fn bitor_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() |= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, Rhs> BitXor<Rhs> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	BitSlice<O, V::Store>: BitXorAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitxor(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() ^= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, Rhs> BitXorAssign<Rhs> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	BitSlice<O, V::Store>: BitXorAssign<Rhs>,
+{
+	#[inline]
+	fn bitxor_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() ^= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Deref for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	type Target = BitSlice<O, V::Store>;
+
+	#[inline(always)]
+	fn deref(&self) -> &Self::Target {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> DerefMut for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline(always)]
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		self.as_mut_bitslice()
+	}
+}
+
+impl<O, V, Idx> Index<Idx> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	BitSlice<O, V::Store>: Index<Idx>,
+{
+	type Output = <BitSlice<O, V::Store> as Index<Idx>>::Output;
+
+	#[inline]
+	fn index(&self, index: Idx) -> &Self::Output {
+		self.as_bitslice().index(index)
+	}
+}
+
+impl<O, V, Idx> IndexMut<Idx> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	BitSlice<O, V::Store>: IndexMut<Idx>,
+{
+	#[inline]
+	fn index_mut(&mut self, index: Idx) -> &mut Self::Output {
+		self.as_mut_bitslice().index_mut(index)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Not for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	type Output = Self;
+
+	#[inline]
+	fn not(mut self) -> Self::Output {
+		let _ = !self.as_mut_bitslice();
+		self
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/array/traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/array/traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/array/traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/array/traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,441 @@
+//! Trait implementations on `BitArray`.
+
+use crate::{
+	array::BitArray,
+	index::BitIdx,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+	view::BitView,
+};
+
+use core::{
+	borrow::{
+		Borrow,
+		BorrowMut,
+	},
+	cmp,
+	convert::TryFrom,
+	fmt::{
+		self,
+		Binary,
+		Debug,
+		Display,
+		Formatter,
+		LowerHex,
+		Octal,
+		UpperHex,
+	},
+	hash::{
+		Hash,
+		Hasher,
+	},
+};
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Borrow<BitSlice<O, V::Store>> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline(always)]
+	fn borrow(&self) -> &BitSlice<O, V::Store> {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> BorrowMut<BitSlice<O, V::Store>> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline(always)]
+	fn borrow_mut(&mut self) -> &mut BitSlice<O, V::Store> {
+		self.as_mut_bitslice()
+	}
+}
+
+impl<O, V> Eq for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Ord for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline]
+	fn cmp(&self, other: &Self) -> cmp::Ordering {
+		self.as_bitslice().cmp(other.as_bitslice())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, T> PartialEq<BitArray<O, V>> for BitSlice<O, T>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	T: BitStore,
+{
+	#[inline]
+	fn eq(&self, other: &BitArray<O, V>) -> bool {
+		self == other.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, Rhs> PartialEq<Rhs> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	Rhs: ?Sized,
+	BitSlice<O, V::Store>: PartialEq<Rhs>,
+{
+	#[inline]
+	fn eq(&self, other: &Rhs) -> bool {
+		self.as_bitslice() == other
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, T> PartialOrd<BitArray<O, V>> for BitSlice<O, T>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	T: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, other: &BitArray<O, V>) -> Option<cmp::Ordering> {
+		self.partial_cmp(other.as_bitslice())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V, Rhs> PartialOrd<Rhs> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+	Rhs: ?Sized,
+	BitSlice<O, V::Store>: PartialOrd<Rhs>,
+{
+	#[inline]
+	fn partial_cmp(&self, other: &Rhs) -> Option<cmp::Ordering> {
+		self.as_bitslice().partial_cmp(other)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> AsRef<BitSlice<O, V::Store>> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline(always)]
+	fn as_ref(&self) -> &BitSlice<O, V::Store> {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> AsMut<BitSlice<O, V::Store>> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline(always)]
+	fn as_mut(&mut self) -> &mut BitSlice<O, V::Store> {
+		self.as_mut_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> From<V> for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline(always)]
+	fn from(data: V) -> Self {
+		Self::new(data)
+	}
+}
+
+impl<O1, O2, T, V> TryFrom<&'_ BitSlice<O2, T>> for BitArray<O1, V>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T: BitStore,
+	V: BitView + Sized,
+{
+	type Error = TryFromBitSliceError;
+
+	#[inline]
+	fn try_from(src: &BitSlice<O2, T>) -> Result<Self, Self::Error> {
+		if src.len() != V::const_bits() {
+			return Self::Error::err();
+		}
+		let mut out = Self::zeroed();
+		out.clone_from_bitslice(src);
+		Ok(out)
+	}
+}
+
+impl<'a, O, V> TryFrom<&'a BitSlice<O, V::Store>> for &'a BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	type Error = TryFromBitSliceError;
+
+	#[inline]
+	fn try_from(src: &'a BitSlice<O, V::Store>) -> Result<Self, Self::Error> {
+		let bitptr = src.bitptr();
+		//  This pointer cast can only happen if the slice is exactly as long as
+		//  the array, and is aligned to the front of the element.
+		if src.len() != V::const_bits() || bitptr.head() != BitIdx::ZERO {
+			return Self::Error::err();
+		}
+		Ok(unsafe { &*(bitptr.pointer().to_const() as *const BitArray<O, V>) })
+	}
+}
+
+impl<'a, O, V> TryFrom<&'a mut BitSlice<O, V::Store>> for &'a mut BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	type Error = TryFromBitSliceError;
+
+	#[inline]
+	fn try_from(
+		src: &'a mut BitSlice<O, V::Store>,
+	) -> Result<Self, Self::Error> {
+		let bitptr = src.bitptr();
+		if src.len() != V::const_bits() || bitptr.head() != BitIdx::ZERO {
+			return Self::Error::err();
+		}
+		Ok(unsafe { &mut *(bitptr.pointer().to_mut() as *mut BitArray<O, V>) })
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Default for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline(always)]
+	fn default() -> Self {
+		Self::zeroed()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Binary for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Binary::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+impl<O, V> Debug for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		if fmt.alternate() {
+			self.bitptr().render(
+				fmt,
+				"Array",
+				Some(core::any::type_name::<O>()),
+				None,
+			)?;
+			fmt.write_str(" ")?;
+		}
+		Binary::fmt(self, fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Display for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Binary::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> LowerHex for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		LowerHex::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Octal for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Octal::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> UpperHex for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		UpperHex::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> Hash for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	#[inline]
+	fn hash<H>(&self, hasher: &mut H)
+	where H: Hasher {
+		self.as_bitslice().hash(hasher)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, V> IntoIterator for &'a BitArray<O, V>
+where
+	O: 'a + BitOrder,
+	V: 'a + BitView + Sized,
+{
+	type IntoIter = <&'a BitSlice<O, V::Store> as IntoIterator>::IntoIter;
+	type Item = <&'a BitSlice<O, V::Store> as IntoIterator>::Item;
+
+	#[inline]
+	fn into_iter(self) -> Self::IntoIter {
+		self.as_bitslice().into_iter()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, V> IntoIterator for &'a mut BitArray<O, V>
+where
+	O: 'a + BitOrder,
+	V: 'a + BitView + Sized,
+{
+	type IntoIter = <&'a mut BitSlice<O, V::Store> as IntoIterator>::IntoIter;
+	type Item = <&'a mut BitSlice<O, V::Store> as IntoIterator>::Item;
+
+	#[inline]
+	fn into_iter(self) -> Self::IntoIter {
+		self.as_mut_bitslice().into_iter()
+	}
+}
+
+impl<O, V> Unpin for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+}
+
+/// The error type returned when a conversion from a bitslice to a bitarray
+/// fails.
+#[derive(Clone, Copy, Debug)]
+pub struct TryFromBitSliceError;
+
+#[cfg(not(tarpaulin_include))]
+impl TryFromBitSliceError {
+	#[inline(always)]
+	fn err<T>() -> Result<T, Self> {
+		Err(Self)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl Display for TryFromBitSliceError {
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		fmt.write_str("could not convert bitslice to bitarray")
+	}
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for TryFromBitSliceError {
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::prelude::*;
+	use core::convert::TryInto;
+
+	#[test]
+	fn convert() {
+		let arr: BitArray<Lsb0, _> = 2u8.into();
+		assert!(arr.any());
+
+		let bits = bits![1; 128];
+		let arr: BitArray<Msb0, [u16; 8]> = bits.try_into().unwrap();
+		assert!(arr.all());
+
+		let bits = bits![Lsb0, u32; 0; 64];
+		let arr: &BitArray<Lsb0, [u32; 2]> = bits.try_into().unwrap();
+		assert!(arr.not_any());
+
+		let bits = bits![mut Msb0, u16; 0; 64];
+		let arr: &mut BitArray<Msb0, [u16; 4]> = bits.try_into().unwrap();
+		assert!(arr.not_any());
+
+		let bits = bits![mut 0; 4];
+		let bit_arr: Result<&BitArray<LocalBits, usize>, _> =
+			(&*bits).try_into();
+		assert!(bit_arr.is_err());
+		let bit_arr: Result<&mut BitArray<LocalBits, usize>, _> =
+			bits.try_into();
+		assert!(bit_arr.is_err());
+	}
+
+	#[test]
+	#[cfg(feature = "std")]
+	fn format() {
+		let render = format!("{:#?}", bitarr![Msb0, u8; 0, 1, 0, 0]);
+		assert!(
+			render.starts_with("BitArray<bitvec::order::Msb0, u8> {"),
+			"{}",
+			render
+		);
+		assert!(
+			render.ends_with(
+				"    head: 000,\n    bits: 8,\n} [\n    0b01000000,\n]"
+			),
+			"{}",
+			render
+		);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/array.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/array.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/array.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/array.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,298 @@
+/*! A fixed-size region viewed as individual bits, corresponding to `[bool]`.
+
+You can read the language’s [array fundamental documentation][std] here.
+
+This module defines the [`BitArray`] immediate type, and its associated support
+code.
+
+`BitArray` has little behavior or properties in its own right. It serves solely
+as a type capable of being used in immediate value position, and delegates to
+`BitSlice` for all actual work.
+
+[`BitArray`]: struct.BitArray.html
+[std]: https://doc.rust-lang.org/std/primitive.array.html
+!*/
+
+use crate::{
+	order::{
+		BitOrder,
+		Lsb0,
+	},
+	slice::BitSlice,
+	view::BitView,
+};
+
+use core::{
+	marker::PhantomData,
+	mem::MaybeUninit,
+	slice,
+};
+
+/* Note on C++ `std::bitset<N>` compatibility:
+
+The ideal API for `BitArray` is as follows:
+
+```rust
+struct BitArray<O, T, const N: usize>
+where
+  O: BitOrder,
+  T: BitStore,
+  N < T::MAX_BITS,
+{
+  _ord: PhantomData<O>,
+  data: [T; crate::mem::elts::<T>(N)],
+}
+
+impl<O, T, const N: usize> BitArray<O, T, N>
+where
+  O: BitOrder,
+  T: BitStore,
+{
+  pub fn len(&self) -> usize { N }
+}
+```
+
+This allows the structure to be parametric over the number of bits, rather than
+a scalar or array type that satisfies the number of bits. Unfortunately, it is
+inexpressible until the Rust compiler’s const-evaluation engine permits using
+numeric type parameters in type-level expressions.
+*/
+
+/** An array of individual bits, able to be held by value on the stack.
+
+This type is generic over all `Sized` implementors of the `BitView` trait. Due
+to limitations in the Rust language’s const-generics implementation (it is both
+unstable and incomplete), this must take an array type parameter, rather than a
+bit-count integer parameter, making it inconvenient to use. The [`bitarr!`]
+macro is capable of constructing both values and specific types of `BitArray`,
+and this macro should be preferred for most use.
+
+The advantage of using this wrapper is that it implements `Deref`/`Mut` to
+`BitSlice`, as well as implementing all of `BitSlice`’s traits by forwarding to
+the bit-slice view of its contained data. This allows it to have `BitSlice`
+behavior by itself, without requiring explicit `.as_bitslice()` calls in user
+code.
+
+> Note: Not all traits may be implemented for forwarding, as a matter of effort
+> and perceived need. Please file an issue for any additional traits that you
+> need to be forwarded.
+
+# Limitations
+
+This always produces a bit-slice that fully spans its data; you cannot produce,
+for example, an array of twelve bits.
+
+# Type Parameters
+
+- `O`: The ordering of bits within memory elements.
+- `V`: Some amount of memory which can be used as the basis for a `BitSlice`
+  view. This will usually be an array `[T: BitStore; N]`.
+
+# Examples
+
+This type is useful for marking that some value is always to be used as a
+bit-slice.
+
+**/
+/// ```rust
+/// use bitvec::prelude::*;
+///
+/// struct HasBitfields {
+///   header: u32,
+///   //  creates a type declaration
+///   fields: bitarr!(for 20, in Msb0, u8),
+/// }
+///
+/// impl HasBitfields {
+///   pub fn new() -> Self {
+///     Self {
+///       header: 0,
+///       //  creates a value object. the type paramaters must be repeated.
+///       fields: bitarr![Msb0, u8; 0; 20],
+///     }
+///   }
+///
+///   /// Access a bit region directly
+///   pub fn get_subfield(&self) -> &BitSlice<Msb0, u8> {
+///     &self.fields[.. 4]
+///   }
+///
+///   /// Read a 12-bit value out of a region
+///   pub fn read_value(&self) -> u16 {
+///     self.fields[4 .. 16].load()
+///   }
+///
+///   /// Write a 12-bit value into a region
+///   pub fn set_value(&mut self, value: u16) {
+///     self.fields[4 .. 16].store(value);
+///   }
+/// }
+/// ```
+/**
+# Eventual Obsolescence
+
+When const-generics stabilize, this will be modified to have a signature more
+like `BitArray<O, T: BitStore, const N: usize>([T; elts::<T>(N)]);`, to mirror
+the behavior of ordinary arrays `[T; N]` as they stand today.
+
+[`bitarr!`]: ../../macro.bitarr.html
+**/
+#[repr(transparent)]
+#[derive(Clone, Copy)]
+pub struct BitArray<O = Lsb0, V = usize>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	/// Bit ordering when viewed as a bitslice.
+	_ord: PhantomData<O>,
+	/// The wrapped data store.
+	data: V,
+}
+
+impl<O, V> BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView + Sized,
+{
+	/// Constructs a new `BitArray` with zeroed memory.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn zeroed() -> Self {
+		Self {
+			_ord: PhantomData,
+			data: unsafe { MaybeUninit::zeroed().assume_init() },
+		}
+	}
+
+	/// Constructs a new `BitArray` from a data store.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	/// ```
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn new(data: V) -> Self {
+		Self {
+			_ord: PhantomData,
+			data,
+		}
+	}
+
+	/// Removes the bit-array wrapper, returning the contained data.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bitarr: BitArray<LocalBits, [usize; 1]> = bitarr![0; 30];
+	/// let native: [usize; 1] = bitarr.unwrap();
+	/// ```
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn unwrap(self) -> V {
+		self.data
+	}
+
+	/// Views the array as a bit-slice.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_bitslice(&self) -> &BitSlice<O, V::Store> {
+		self.data.view_bits::<O>()
+	}
+
+	/// Views the array as a mutable bit-slice.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_bitslice(&mut self) -> &mut BitSlice<O, V::Store> {
+		self.data.view_bits_mut::<O>()
+	}
+
+	/// Views the array as a slice of its underlying elements.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_slice(&self) -> &[V::Store] {
+		unsafe {
+			slice::from_raw_parts(
+				&self.data as *const V as *const V::Store,
+				V::const_elts(),
+			)
+		}
+	}
+
+	/// Views the array as a mutable slice of its underlying elements.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_slice(&mut self) -> &mut [V::Store] {
+		unsafe {
+			slice::from_raw_parts_mut(
+				&mut self.data as *mut V as *mut V::Store,
+				V::const_elts(),
+			)
+		}
+	}
+
+	/// Views the array as a slice of its raw underlying memory type.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_raw_slice(&self) -> &[V::Mem] {
+		unsafe {
+			slice::from_raw_parts(
+				&self.data as *const V as *const V::Mem,
+				V::const_elts(),
+			)
+		}
+	}
+
+	/// Views the array as a mutable slice of its raw underlying memory type.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_raw_mut_slice(&mut self) -> &mut [V::Mem] {
+		unsafe {
+			slice::from_raw_parts_mut(
+				&mut self.data as *mut V as *mut V::Mem,
+				V::const_elts(),
+			)
+		}
+	}
+}
+
+mod ops;
+mod traits;
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::prelude::*;
+
+	#[test]
+	fn create_arrays() {
+		macro_rules! make {
+			($($elts:literal),+ $(,)?) => { $(
+				let _ = BitArray::<LocalBits, [u8; $elts]>::zeroed();
+				let _ = BitArray::<LocalBits, [u16; $elts]>::zeroed();
+				let _ = BitArray::<LocalBits, [u32; $elts]>::zeroed();
+				let _ = BitArray::<LocalBits, [usize; $elts]>::zeroed();
+
+				#[cfg(target_pointer_width = "64")] {
+				let _ = BitArray::<LocalBits, [u64; $elts]>::zeroed();
+				}
+			)+ };
+		}
+
+		make!(
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+			19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32
+		);
+	}
+
+	#[test]
+	fn wrap_unwrap() {
+		let data: [u8; 15] = *b"Saluton, mondo!";
+		let bits = BitArray::<LocalBits, _>::new(data);
+		assert_eq!(bits.unwrap(), data);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed/api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed/api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed/api.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed/api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,258 @@
+//! Port of the `Box<[T]>` function API.
+
+use crate::{
+	boxed::BitBox,
+	order::BitOrder,
+	pointer::BitPtr,
+	slice::BitSlice,
+	store::BitStore,
+	vec::BitVec,
+};
+
+use core::{
+	marker::Unpin,
+	mem::ManuallyDrop,
+	pin::Pin,
+};
+
+use tap::pipe::Pipe;
+
+impl<O, T> BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Allocates memory on the heap and copies `x` into it.
+	///
+	/// This doesn’t actually allocate if `x` is zero-length.
+	///
+	/// # Original
+	///
+	/// [`Box::new`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#method.new)
+	///
+	/// # API Differences
+	///
+	/// `Box::<[T]>::new` does not exist, because `new` cannot take unsized
+	/// types by value. Instead, this takes a slice reference, and boxes the
+	/// referent slice.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let boxed = BitBox::new(bits![0; 5]);
+	/// ```
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(since = "0.18.0", note = "Prefer `::from_bitslice`")]
+	pub fn new(x: &BitSlice<O, T>) -> Self {
+		Self::from_bitslice(x)
+	}
+
+	/// Constructs a new `Pin<BitBox<O, T>>`.
+	///
+	/// `BitSlice` is always `Unpin`, so this has no actual immobility effect.
+	///
+	/// # Original
+	///
+	/// [`Box::pin`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#method.pin)
+	///
+	/// # API Differences
+	///
+	/// As with `::new`, this only exists on `Box` when `T` is not unsized. This
+	/// takes a slice reference, and pins the referent slice.
+	#[inline]
+	pub fn pin(x: &BitSlice<O, T>) -> Pin<Self>
+	where
+		O: Unpin,
+		T: Unpin,
+	{
+		x.pipe(Self::from_bitslice).pipe(Pin::new)
+	}
+
+	/// Constructs a box from a raw pointer.
+	///
+	/// After calling this function, the raw pointer is owned by the
+	/// resulting `BitBox`. Specifically, the `Box` destructor will free the
+	/// allocated memory. For this to be safe, the memory must have been
+	/// allocated in accordance with the [memory layout] used by `BitBox`.
+	///
+	/// # Original
+	///
+	/// [`Box::from_raw`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#method.from_raw)
+	///
+	/// # Safety
+	///
+	/// This function is unsafe because improper use may lead to
+	/// memory problems. For example, a double-free may occur if the
+	/// function is called twice on the same raw pointer.
+	///
+	/// # Examples
+	///
+	/// Recreate a `BitBox` which was previously converted to a raw pointer
+	/// using [`BitBox::into_raw`]:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let x = bitbox![0; 10];
+	/// let ptr = BitBox::into_raw(x);
+	/// let x = unsafe { BitBox::from_raw(ptr) };
+	/// ```
+	///
+	/// [memory layout]: https://doc.rust-lang.org/alloc/boxed/index.html#memory-layout
+	/// [`Layout`]: https://doc.rust-lang.org/alloc/struct.Layout.html
+	/// [`BitBox::into_raw`]: #method.into_raw
+	#[inline]
+	pub unsafe fn from_raw(raw: *mut BitSlice<O, T>) -> Self {
+		raw.pipe(BitPtr::from_bitslice_ptr_mut)
+			.to_nonnull()
+			.pipe(|pointer| Self { pointer })
+	}
+
+	/// Consumes the `BitBox`, returning a wrapped raw pointer.
+	///
+	/// The pointer will be properly aligned and non-null.
+	///
+	/// After calling this function, the caller is responsible for the memory
+	/// previously managed by the `BitBox`. In particular, the caller should
+	/// properly release the memory by converting the pointer back into a
+	/// `BitBox` with the [`BitBox::from_raw`] function, allowing the `BitBox`
+	/// destructor to perform the cleanup.
+	///
+	/// Note: this is an associated function, which means that you have to call
+	/// it as `BitBox::into_raw(b)` instead of `b.into_raw()`. This is to match
+	/// layout with the standard library’s `Box` API; there will never be a name
+	/// conflict with `BitSlice`.
+	///
+	/// # Original
+	///
+	/// [`Box::into_raw`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#method.into_raw)
+	///
+	/// # Examples
+	///
+	/// Converting the raw pointer back into a `BitBox` with
+	/// [`BitBox::from_raw`] for automatic cleanup:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let b = BitBox::new(bits![Msb0, u32; 0; 32]);
+	/// let ptr = BitBox::into_raw(b);
+	/// let b = unsafe { BitBox::from_raw(ptr) };
+	/// ```
+	///
+	/// [`BitBox::from_raw`]: #method.from_raw
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	pub fn into_raw(b: Self) -> *mut BitSlice<O, T> {
+		Self::leak(b)
+	}
+
+	/// Consumes and leaks the `BitBox`, returning a mutable reference,
+	/// `&'a mut BitSlice<O, T>`. Note that the memory region `[T]` must outlive
+	/// the chosen lifetime `'a`.
+	///
+	/// This function is mainly useful for bit regions that live for the
+	/// remainder of the program’s life. Dropping the returned reference will
+	/// cause a memory leak. If this is not acceptable, the reference should
+	/// first be wrapped with the [`BitBox::from_raw`] function, producing a
+	/// `BitBox`. This `BitBox` can then be dropped which will properly
+	/// deallocate the memory.
+	///
+	/// Note: this is an associated function, which means that you have to call
+	/// it as `BitBox::leak(b)` instead of `b.leak()`. This is to match layout
+	/// with the standard library’s `Box` API; there will never be a name
+	/// conflict with `BitSlice`.
+	///
+	/// # Original
+	///
+	/// [`Box::leak`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#method.leak)
+	///
+	/// # Examples
+	///
+	/// Simple usage:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let b = bitbox![LocalBits, u32; 0; 32];
+	/// let static_ref: &'static mut BitSlice<LocalBits, u32> = BitBox::leak(b);
+	/// static_ref.set(0, true);
+	/// assert_eq!(static_ref.count_ones(), 1);
+	/// ```
+	///
+	/// [`BitBox::from_raw`]: #method.from_raw
+	#[inline]
+	pub fn leak<'a>(b: Self) -> &'a mut BitSlice<O, T>
+	where T: 'a {
+		b.pipe(ManuallyDrop::new).bitptr().to_bitslice_mut()
+	}
+
+	/// Converts `self` into a vector without clones or allocation.
+	///
+	/// The resulting vector can be converted back into a box via `BitVec<O,
+	/// T>`’s `into_boxed_bitslice` method.
+	///
+	/// # Original
+	///
+	/// [`slice::into_vec`](https://doc.rust-lang.org/std/primitive.slice.html#method.into_vec)
+	///
+	/// # API Differences
+	///
+	/// Despite taking a `Box<[T]>` receiver, this function is written in an
+	/// `impl<T> [T]` block.
+	///
+	/// Rust does not allow the text
+	///
+	/// ```rust,ignore
+	/// impl<O, T> BitSlice<O, T> {
+	///   fn into_bitvec(self: BitBox<O, T>);
+	/// }
+	/// ```
+	///
+	/// to be written, and `BitBox` exists specifically because
+	/// `Box<BitSlice<>>` cannot be written either, so this function must be
+	/// implemented directly on `BitBox` rather than on `BitSlice` with a boxed
+	/// receiver.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bb = bitbox![0, 1, 0, 1];
+	/// let bv = bb.into_bitvec();
+	///
+	/// assert_eq!(bv, bitvec![0, 1, 0, 1]);
+	/// ```
+	#[inline]
+	pub fn into_bitvec(self) -> BitVec<O, T> {
+		let mut bitptr = self.bitptr();
+		let raw = self
+			//  Disarm the `self` destructor
+			.pipe(ManuallyDrop::new)
+			//  Extract the `Box<[T]>` handle, invalidating `self`
+			.with_box(|b| unsafe { ManuallyDrop::take(b) })
+			//  The distribution guarantees this to be correct and in-place.
+			.into_vec()
+			//  Disarm the `Vec<T>` destructor *also*.
+			.pipe(ManuallyDrop::new);
+		/* The distribution claims that `[T]::into_vec(Box<[T]>) -> Vec<T>` does
+		not alter the address of the heap allocation, and only modifies the
+		buffer handle. Nevertheless, update the bit-pointer with the address of
+		the vector as returned by this transformation Just In Case.
+
+		Inspection of the distribution’s implementation shows that the
+		conversion from `(buf, len)` to `(buf, cap, len)` is done by using the
+		slice length as the buffer capacity. However, this is *not* a behavior
+		guaranteed by the distribution, and so the pipeline above must remain in
+		place in the event that this behavior ever changes. It should compile
+		away to nothing, as it is almost entirely typesystem manipulation.
+		*/
+		unsafe {
+			bitptr.set_pointer(raw.as_ptr() as *const T as *mut T);
+			BitVec::from_raw_parts(bitptr.to_bitslice_ptr_mut(), raw.capacity())
+		}
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed/ops.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed/ops.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed/ops.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed/ops.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,196 @@
+//! Operator trait implementations.
+
+use crate::{
+	boxed::BitBox,
+	devel as dvl,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+};
+
+use core::{
+	mem::ManuallyDrop,
+	ops::{
+		BitAnd,
+		BitAndAssign,
+		BitOr,
+		BitOrAssign,
+		BitXor,
+		BitXorAssign,
+		Deref,
+		DerefMut,
+		Index,
+		IndexMut,
+		Not,
+	},
+};
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitAnd<Rhs> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitAndAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitand(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() &= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitAndAssign<Rhs> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitAndAssign<Rhs>,
+{
+	#[inline]
+	fn bitand_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() &= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitOr<Rhs> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitOrAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitor(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() |= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitOrAssign<Rhs> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitOrAssign<Rhs>,
+{
+	#[inline]
+	fn bitor_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() |= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitXor<Rhs> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitXorAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitxor(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() ^= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitXorAssign<Rhs> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitXorAssign<Rhs>,
+{
+	#[inline]
+	fn bitxor_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() ^= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Deref for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Target = BitSlice<O, T>;
+
+	#[inline(always)]
+	fn deref(&self) -> &Self::Target {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> DerefMut for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		self.as_mut_bitslice()
+	}
+}
+
+impl<O, T> Drop for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn drop(&mut self) {
+		//  Run the `Box` destructor to deällocate the buffer.
+		self.with_box(|boxed| unsafe { ManuallyDrop::drop(boxed) });
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Idx> Index<Idx> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: Index<Idx>,
+{
+	type Output = <BitSlice<O, T> as Index<Idx>>::Output;
+
+	#[inline]
+	fn index(&self, index: Idx) -> &Self::Output {
+		self.as_bitslice().index(index)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Idx> IndexMut<Idx> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: IndexMut<Idx>,
+{
+	#[inline]
+	fn index_mut(&mut self, index: Idx) -> &mut Self::Output {
+		self.as_mut_bitslice().index_mut(index)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Not for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Output = Self;
+
+	#[inline]
+	fn not(mut self) -> Self::Output {
+		for elem in self.as_mut_slice().iter_mut().map(dvl::mem_mut) {
+			*elem = !*elem;
+		}
+		self
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+//! Unit tests for the `boxed` module.
+
+use crate::prelude::*;
+
+#[test]
+#[allow(deprecated)]
+fn api() {
+	let boxed: Box<[u8]> = Box::new([0; 4]);
+	let bb = BitBox::<LocalBits, _>::from_boxed_slice(boxed);
+	assert_eq!(bb, bits![0; 32]);
+	let boxed = bb.into_boxed_slice();
+	assert_eq!(boxed[..], [0u8; 4][..]);
+
+	let pinned = BitBox::pin(bits![0, 1, 0, 1]);
+	let unpinned = BitBox::new(bits![0, 1, 0, 1]);
+	assert_eq!(pinned.as_ref().get_ref(), unpinned[..]);
+
+	let boxed = bitbox![0; 10];
+	let bitptr = boxed.bitptr();
+	let reboxed = unsafe { BitBox::from_raw(BitBox::into_raw(boxed)) };
+	let bv = reboxed.into_bitvec();
+	let bb = bv.into_boxed_bitslice();
+	assert_eq!(bb.bitptr(), bitptr);
+
+	let mut bb = 0b1001_0110u8.view_bits::<Msb0>()[2 .. 6]
+		.to_bitvec()
+		.into_boxed_bitslice();
+	bb.set_uninitialized(false);
+	assert_eq!(bb.as_slice(), &[0b0001_0100]);
+	bb.set_uninitialized(true);
+	assert_eq!(bb.as_slice(), &[0b1101_0111]);
+	assert_eq!(bb, bits![0, 1, 0, 1]);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed/traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed/traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed/traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed/traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,425 @@
+//! Trait implementations for `BitBox`.
+
+use crate::{
+	boxed::BitBox,
+	order::BitOrder,
+	pointer::BitPtr,
+	slice::BitSlice,
+	store::BitStore,
+	vec::BitVec,
+};
+
+use alloc::boxed::Box;
+
+use core::{
+	any,
+	borrow::{
+		Borrow,
+		BorrowMut,
+	},
+	cmp,
+	convert::TryFrom,
+	fmt::{
+		self,
+		Binary,
+		Debug,
+		Display,
+		Formatter,
+		LowerHex,
+		Octal,
+		Pointer,
+		UpperHex,
+	},
+	hash::{
+		Hash,
+		Hasher,
+	},
+};
+
+use tap::pipe::Pipe;
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Borrow<BitSlice<O, T>> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn borrow(&self) -> &BitSlice<O, T> {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> BorrowMut<BitSlice<O, T>> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn borrow_mut(&mut self) -> &mut BitSlice<O, T> {
+		self.as_mut_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Clone for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn clone(&self) -> Self {
+		self.as_bitslice().pipe(Self::from_bitslice)
+	}
+}
+
+impl<O, T> Eq for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Ord for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn cmp(&self, other: &Self) -> cmp::Ordering {
+		self.as_bitslice().cmp(other.as_bitslice())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<BitBox<O2, T2>> for BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, other: &BitBox<O2, T2>) -> bool {
+		self == other.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<BitBox<O2, T2>> for &BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, other: &BitBox<O2, T2>) -> bool {
+		*self == other.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<BitBox<O2, T2>> for &mut BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, other: &BitBox<O2, T2>) -> bool {
+		**self == other.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> PartialEq<Rhs> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	Rhs: ?Sized + PartialEq<BitSlice<O, T>>,
+{
+	#[inline]
+	fn eq(&self, other: &Rhs) -> bool {
+		other == self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> PartialOrd<BitBox<O, T>> for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, other: &BitBox<O, T>) -> Option<cmp::Ordering> {
+		self.partial_cmp(other.as_bitslice())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> PartialOrd<Rhs> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	Rhs: ?Sized + PartialOrd<BitSlice<O, T>>,
+{
+	#[inline]
+	fn partial_cmp(&self, other: &Rhs) -> Option<cmp::Ordering> {
+		other.partial_cmp(self.as_bitslice())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> AsRef<BitSlice<O, T>> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn as_ref(&self) -> &BitSlice<O, T> {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> AsMut<BitSlice<O, T>> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn as_mut(&mut self) -> &mut BitSlice<O, T> {
+		self.as_mut_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, T> From<&'a BitSlice<O, T>> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn from(slice: &'a BitSlice<O, T>) -> Self {
+		Self::from_bitslice(slice)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> From<BitVec<O, T>> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn from(bv: BitVec<O, T>) -> Self {
+		bv.into_boxed_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Into<Box<[T]>> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn into(self) -> Box<[T]> {
+		self.into_boxed_slice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> TryFrom<Box<[T]>> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Error = Box<[T]>;
+
+	#[inline(always)]
+	fn try_from(boxed: Box<[T]>) -> Result<Self, Self::Error> {
+		Self::try_from_boxed_slice(boxed)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Default for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn default() -> Self {
+		Self {
+			pointer: BitPtr::EMPTY.to_nonnull(),
+		}
+	}
+}
+
+impl<O, T> Debug for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		if fmt.alternate() {
+			self.bitptr().render(
+				fmt,
+				"Box",
+				Some(any::type_name::<O>()),
+				None,
+			)?;
+			fmt.write_str(" ")?;
+		}
+		Display::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Display for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Display::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Binary for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Binary::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> LowerHex for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		LowerHex::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Octal for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Octal::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Pointer for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		self.bitptr()
+			.render(fmt, "Box", Some(any::type_name::<O>()), None)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> UpperHex for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		UpperHex::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Hash for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn hash<H>(&self, state: &mut H)
+	where H: Hasher {
+		self.as_bitslice().hash(state)
+	}
+}
+
+unsafe impl<O, T> Send for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+unsafe impl<O, T> Sync for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+impl<O, T> Unpin for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::prelude::*;
+	use core::convert::TryInto;
+
+	#[test]
+	fn convert() {
+		let boxed: BitBox = bits![1; 64].into();
+		assert!(boxed.all());
+
+		let boxed: BitBox<Lsb0, u32> = bitvec![Lsb0, u32; 0; 64].into();
+		assert!(boxed.not_any());
+		let boxed: Box<[u32]> = boxed.into();
+		assert_eq!(&boxed[..], &[0; 2]);
+
+		let _: BitBox<Lsb0, u32> = boxed.try_into().unwrap();
+	}
+
+	#[test]
+	#[cfg(feature = "std")]
+	fn format() {
+		let render = format!("{:#?}", bitbox![Msb0, u8; 0, 1, 0, 0]);
+		assert!(
+			render.starts_with("BitBox<bitvec::order::Msb0, u8> {"),
+			"{}",
+			render
+		);
+		assert!(
+			render
+				.ends_with("    head: 000,\n    bits: 4,\n} [\n    0b0100,\n]"),
+			"{}",
+			render
+		);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/boxed.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/boxed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,459 @@
+/*! A dynamically-allocated, fixed-size, buffer containing a `BitSlice` region.
+
+You can read the standard library’s [`alloc::boxed` module documentation][std]
+here.
+
+This module defines the [`BitBox`] buffer, and all of its associated support
+code.
+
+`BitBox` is equivalent to `Box<[bool]>`, in its operation and in its
+relationship to the `BitSlice` and [`BitVec`] types. Most of the interesting
+work to be done on a bit-sequence is implemented in `BitSlice`, to which
+`BitBox` dereferences, and the box container itself only exists to maintain
+wonership and provide some specializations that cannot safely be done on
+`BitSlice` alone.
+
+There is almost never a reason to use this type, as it is a mixture of
+[`BitArray`]’s fixed width and [`BitVec`]’s heap allocation. You should only use
+it when you have a bit-sequence whose width is either unknowable at compile-time
+or inexpressable in `BitArray`, and are constructing the sequence in a `BitVec`
+before freezing it.
+
+[`BitArray`]: ../array/struct.BitArray.html
+[`BitBox`]: struct.BitBox.html
+[`BitSlice`]: ../slice/struct.BitSlice.html
+[`BitVec`]: ../vec/struct.BitVec.html
+[std]: https://doc.rust-lang.org/alloc/boxed
+!*/
+
+#![cfg(feature = "alloc")]
+
+use crate::{
+	index::BitIdx,
+	mem::BitMemory,
+	order::{
+		BitOrder,
+		Lsb0,
+	},
+	pointer::BitPtr,
+	slice::BitSlice,
+	store::BitStore,
+};
+
+use alloc::boxed::Box;
+
+use core::{
+	mem::ManuallyDrop,
+	ptr::NonNull,
+	slice,
+};
+
+use tap::pipe::Pipe;
+
+/** A frozen heap-allocated buffer of individual bits.
+
+This is essentially a [`BitVec`] that has frozen its allocation, and given up
+the ability to change size. It is analagous to `Box<[bool]>`, and is written to
+be as close as possible to drop-in replacable for it. This type contains almost
+no interesting behavior in its own right; it dereferences to [`BitSlice`] to
+manipulate its contents, and it converts to and from `BitVec` for allocation
+control.
+
+If you know the length of your bit sequence at compile-time, and it is
+expressible within the limits of [`BitArray`], you should prefer that type
+instead. Large `BitArray`s can be `Box`ed normally as desired.
+
+# Documentation
+
+All APIs that mirror something in the standard library will have an `Original`
+section linking to the corresponding item. All APIs that have a different
+signature or behavior than the original will have an `API Differences` section
+explaining what has changed, and how to adapt your existing code to the change.
+
+These sections look like this:
+
+# Original
+
+[`Box<[T]>`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html)
+
+# API Differences
+
+The buffer type `Box<[bool]>` has no type parameters. `BitBox<O, T>` has the
+same two type parameters as `BitSlice<O, T>`. Otherwise, `BitBox` is able to
+implement the full API surface of `Box<[bool]>`.
+
+# Behavior
+
+Because `BitBox` is a fully-owned buffer, it is able to operate on its memory
+without concern for any other views that may alias. This enables it to
+specialize some `BitSlice` behavior to be faster or more efficient.
+
+# Type Parameters
+
+This takes the same two type parameters, `O: BitOrder` and `T: BitStore`, as
+`BitSlice`.
+
+# Safety
+
+Like `BitSlice`, `BitBox` is exactly equal in size to `Box<[bool]>`, and is also
+absolutely representation-incompatible with it. You must never attempt to
+type-cast between `Box<[bool]>` and `BitBox` in any way, nor attempt to modify
+the memory value of a `BitBox` handle. Doing so will cause allocator and memory
+errors in your program, likely inducing a panic.
+
+Everything in the `BitBox` public API, even the `unsafe` parts, are guaranteed
+to have no more unsafety than their equivalent items in the standard library.
+All `unsafe` APIs will have documentation explicitly detailing what the API
+requires you to uphold in order for it to function safely and correctly. All
+safe APIs will do so themselves.
+
+# Performance
+
+Iteration over the buffer is governed by the `BitSlice` characteristics on the
+type parameter. You are generally better off using larger types when your buffer
+is a data collection rather than a specific I/O protocol buffer.
+
+# Macro Construction
+
+Heap allocation can only occur at runtime, but the [`bitbox!`] macro will
+construct an appropriate `BitSlice` buffer at compile-time, and at run-time,
+only copy the buffer into a heap allocation.
+
+[`BitArray`]: ../array/struct.BitArray.html
+[`BitSlice`]: ../slice/struct.BitSlice.html
+[`BitVec`]: ../vec/struct.BitVec.html
+[`bitbox!`]: ../macro.bitbox.html
+**/
+#[repr(transparent)]
+pub struct BitBox<O = Lsb0, T = usize>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	pointer: NonNull<BitSlice<O, T>>,
+}
+
+/// Methods specific to `BitBox<_, T>`, and not present on `Box<[T]>`.
+impl<O, T> BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Clones a `&BitSlice` into a `BitVec`.
+	///
+	/// # Original
+	///
+	/// [`<Box<T: Clone> as Clone>::clone`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#impl-Clone)
+	///
+	/// # Effects
+	///
+	/// This performs a direct element-wise copy from the source slice to the
+	/// newly-allocated buffer, then sets the box to have the same starting bit
+	/// as the slice did. This allows for faster behavior.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 0, 1, 1, 0, 1, 1];
+	/// let bb = BitBox::from_bitslice(&bits[2 ..]);
+	/// assert_eq!(bb, bits[2 ..]);
+	/// ```
+	#[inline]
+	pub fn from_bitslice(slice: &BitSlice<O, T>) -> Self {
+		slice.to_bitvec().into_boxed_bitslice()
+	}
+
+	/// Converts a `Box<[T]>` into a `BitBox`<O, T>` without copying its buffer.
+	///
+	/// # Parameters
+	///
+	/// - `boxed`: A boxed slice to view as bits.
+	///
+	/// # Returns
+	///
+	/// A `BitBox` over the `boxed` buffer.
+	///
+	/// # Panics
+	///
+	/// This panics if `boxed` is too long to convert into a `BitBox`. See
+	/// [`BitSlice::MAX_ELTS`].
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let boxed: Box<[u8]> = Box::new([0; 4]);
+	/// let bb = BitBox::<LocalBits, _>::from_boxed_slice(boxed);
+	/// assert_eq!(bb, bits![0; 32]);
+	/// ```
+	///
+	/// [`BitSlice::MAX_ELTS`]:
+	/// ../slice/struct.BitSlice.html#associatedconstant.MAX_ELTS
+	#[inline]
+	pub fn from_boxed_slice(boxed: Box<[T]>) -> Self {
+		Self::try_from_boxed_slice(boxed)
+			.expect("Slice was too long to be converted into a `BitBox`")
+	}
+
+	/// Converts a `Box<[T]>` into a `BitBox<O, T>` without copying its buffer.
+	///
+	/// This method takes ownership of a memory buffer and enables it to be used
+	/// as a bit-box. Because `Box<[T]>` can be longer than `BitBox`es, this is
+	/// a fallible method, and the original box will be returned if it cannot be
+	/// converted.
+	///
+	/// # Parameters
+	///
+	/// - `boxed`: Some boxed slice of memory, to be viewed as bits.
+	///
+	/// # Returns
+	///
+	/// If `boxed` is short enough to be viewed as a `BitBox`, then this returns
+	/// a `BitBox` over the `boxed` buffer. If `boxed` is too long, then this
+	/// returns `boxed` unmodified.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let boxed: Box<[u8]> = Box::new([0; 4]);
+	/// let bb = BitBox::<LocalBits, _>::try_from_boxed_slice(boxed).unwrap();
+	/// assert_eq!(bb[..], bits![0; 32]);
+	/// ```
+	#[inline]
+	pub fn try_from_boxed_slice(boxed: Box<[T]>) -> Result<Self, Box<[T]>> {
+		let len = boxed.len();
+		if len > BitSlice::<O, T>::MAX_ELTS {
+			return Err(boxed);
+		}
+
+		let boxed = ManuallyDrop::new(boxed);
+		let base = boxed.as_ptr();
+		Ok(Self {
+			pointer: unsafe {
+				BitPtr::new_unchecked(
+					base,
+					BitIdx::ZERO,
+					len * T::Mem::BITS as usize,
+				)
+			}
+			.to_nonnull(),
+		})
+	}
+
+	/// Converts the slice back into an ordinary slice of memory elements.
+	///
+	/// This does not affect the slice’s buffer, only the handle used to control
+	/// it.
+	///
+	/// # Parameters
+	///
+	/// - `self`
+	///
+	/// # Returns
+	///
+	/// An ordinary boxed slice containing all of the bit-slice’s memory buffer.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bb = bitbox![0; 5];
+	/// let boxed = bb.into_boxed_slice();
+	/// assert_eq!(boxed[..], [0][..]);
+	/// ```
+	#[inline]
+	pub fn into_boxed_slice(self) -> Box<[T]> {
+		let mut this = ManuallyDrop::new(self);
+		unsafe { Box::from_raw(this.as_mut_slice()) }
+	}
+
+	/// Views the buffer’s contents as a `BitSlice`.
+	///
+	/// This is equivalent to `&bb[..]`.
+	///
+	/// # Original
+	///
+	/// [`<Box<[T]> as AsRef<[T]>>::as_ref`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#impl-AsRef%3CT%3E)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bb = bitbox![0, 1, 1, 0];
+	/// let bits = bb.as_bitslice();
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_bitslice(&self) -> &BitSlice<O, T> {
+		self.bitptr().to_bitslice_ref()
+	}
+
+	/// Extracts a mutable bit-slice of the entire vector.
+	///
+	/// Equivalent to `&mut bv[..]`.
+	///
+	/// # Original
+	///
+	/// [`<Box<[T]> as AsMut<[T]>>::as_mut`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#impl-AsMut%3CT%3E)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 1, 0, 1];
+	/// let bits = bv.as_mut_bitslice();
+	/// bits.set(0, true);
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_bitslice(&mut self) -> &mut BitSlice<O, T> {
+		self.bitptr().to_bitslice_mut()
+	}
+
+	/// Extracts an element slice containing the entire box.
+	///
+	/// # Original
+	///
+	/// [`<Box<[T]> as AsRef<[T]>>::as_ref`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#impl-AsRef%3CT%3E)
+	///
+	/// # Analogue
+	///
+	/// See [`as_bitslice`] for a `&BitBox -> &BitSlice` transform.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// # #[cfg(feature = "std")] {
+	/// use bitvec::prelude::*;
+	/// use std::io::{self, Write};
+	/// let buffer = bitbox![Msb0, u8; 0, 1, 0, 1, 1, 0, 0, 0];
+	/// io::sink().write(buffer.as_slice()).unwrap();
+	/// # }
+	/// ```
+	///
+	/// [`as_bitslice`]: #method.as_bitslice
+	#[inline]
+	pub fn as_slice(&self) -> &[T] {
+		let bitptr = self.bitptr();
+		let (base, elts) = (bitptr.pointer().to_const(), bitptr.elements());
+		unsafe { slice::from_raw_parts(base, elts) }
+	}
+
+	/// Extracts a mutable slice of the entire box.
+	///
+	/// # Original
+	///
+	/// [`<Box<[T]> as AsMut<[T]>>::as_mut`](https://doc.rust-lang.org/alloc/boxed/struct.Box.html#impl-AsMut%3CT%3E)
+	///
+	/// # Analogue
+	///
+	/// See [`as_mut_bitslice`] for a `&mut BitBox -> &mut BitSlice` transform.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// # #[cfg(feature = "std")] {
+	/// use bitvec::prelude::*;
+	/// use std::io::{self, Read};
+	/// let mut buffer = bitbox![Msb0, u8; 0; 24];
+	/// io::repeat(0b101).read_exact(buffer.as_mut_slice()).unwrap();
+	/// # }
+	/// ```
+	///
+	/// [`as_mut_bitslice`]: #method.as_mut_bitslice
+	#[inline]
+	pub fn as_mut_slice(&mut self) -> &mut [T] {
+		let bitptr = self.bitptr();
+		let (base, elts) = (bitptr.pointer().to_mut(), bitptr.elements());
+		unsafe { slice::from_raw_parts_mut(base, elts) }
+	}
+
+	/// Sets the uninitialized bits of the vector to a fixed value.
+	///
+	/// This method modifies all bits in the allocated buffer that are outside
+	/// the `self.as_bitslice()` view so that they have a consistent value. This
+	/// can be used to zero the uninitialized memory so that when viewed as a
+	/// raw memory slice, bits outside the live region have a predictable value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bb = BitBox::new(&220u8.view_bits::<Lsb0>()[.. 4]);
+	/// assert_eq!(bb.count_ones(), 2);
+	/// assert_eq!(bb.as_slice(), &[220u8]);
+	///
+	/// bb.set_uninitialized(false);
+	/// assert_eq!(bb.as_slice(), &[12u8]);
+	///
+	/// bb.set_uninitialized(true);
+	/// assert_eq!(bb.as_slice(), &[!3u8]);
+	/// ```
+	#[inline]
+	pub fn set_uninitialized(&mut self, value: bool) {
+		let head = self.bitptr().head().value() as usize;
+		let tail = head + self.len();
+		let elts = self.bitptr().elements() * T::Mem::BITS as usize;
+		let mut bp = self.bitptr();
+		unsafe {
+			bp.set_head(BitIdx::ZERO);
+			bp.set_len(elts);
+			let bits = bp.to_bitslice_mut::<O>();
+			bits.get_unchecked_mut(.. head).set_all(value);
+			bits.get_unchecked_mut(tail ..).set_all(value);
+		}
+	}
+
+	#[inline]
+	pub(crate) fn bitptr(&self) -> BitPtr<T> {
+		self.pointer.as_ptr().pipe(BitPtr::from_bitslice_ptr_mut)
+	}
+
+	/// Permits a function to modify the `Box<[T]>` backing storage of a
+	/// `BitBox<_, T>`.
+	///
+	/// This produces a temporary `Box<[T::Mem]>` structure governing the
+	/// `BitBox`’s buffer and allows a function to view it mutably. After the
+	/// callback returns, the `Box` is written back into `self` and forgotten.
+	///
+	/// # Type Parameters
+	///
+	/// - `F`: A function which operates on a mutable borrow of a
+	///   `Box<[T::Mem]>` buffer controller.
+	/// - `R`: The return type of the `F` function.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `func`: A function which receives a mutable borrow of a
+	///   `Box<[T::Mem]>` controlling `self`’s buffer.
+	///
+	/// # Returns
+	///
+	/// The return value of `func`. `func` is forbidden from borrowing any part
+	/// of the `Box<[T::Mem]>` temporary view.
+	fn with_box<F, R>(&mut self, func: F) -> R
+	where F: FnOnce(&mut ManuallyDrop<Box<[T::Mem]>>) -> R {
+		self.as_mut_slice()
+			.pipe(|s| s as *mut [T] as *mut [T::Mem])
+			.pipe(|raw| unsafe { Box::from_raw(raw) })
+			.pipe(ManuallyDrop::new)
+			.pipe_ref_mut(func)
+	}
+}
+
+mod api;
+mod ops;
+mod traits;
+
+#[cfg(test)]
+mod tests;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/devel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/devel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/devel.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/devel.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,191 @@
+/*! Utilities needed to develop `bitvec` itself.
+
+This module contains required to perform generic programming in the `bitvec`
+type system. These are not part of the SemVer public API, as they are only
+required when interacting directly with the `bitvec` type system, and are not
+needed to use its data structures directly.
+
+This module is provided, under `feature = "devel"`, for the use of other crates
+that wish to safely perform generic programming with `bitvec` region types.
+!*/
+
+#![allow(dead_code)]
+#![cfg_attr(tarpaulin, skip)]
+
+use crate::{
+	index::BitMask,
+	pointer::BitPtr,
+	store::BitStore,
+};
+
+use core::{
+	ops::{
+		Bound,
+		Range,
+		RangeBounds,
+	},
+	ptr::{
+		self,
+		NonNull,
+	},
+};
+
+use tap::pipe::Pipe;
+
+/// Views a `BitStore` reference as its accessor.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn accessor<T>(x: &T) -> &T::Access
+where T: BitStore {
+	unsafe { &*(x as *const T as *const T::Access) }
+}
+
+/// Inserts an `::Alias` marker into a `BitMask`’s type parameter.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn alias_mask<T>(
+	x: BitMask<T::Mem>,
+) -> BitMask<<T::Alias as BitStore>::Mem>
+where T: BitStore {
+	unsafe { *(&x as *const _ as *const _) }
+}
+
+/// Inserts an `::Alias` marker into a `T::Mem` value’s type.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn alias_mem<T>(x: T::Mem) -> <T::Alias as BitStore>::Mem
+where T: BitStore {
+	unsafe { *(&x as *const _ as *const _) }
+}
+
+/// Loads through an aliased reference into an unmarked local.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn load_aliased_local<T>(x: &T::Alias) -> T::Mem
+where T: BitStore {
+	x.load_value().pipe(remove_alias::<T>)
+}
+
+/// Converts a mutable reference into its memory register type.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn mem_mut<T>(x: &mut T) -> &mut T::Mem
+where T: BitStore {
+	unsafe { &mut *(x as *mut _ as *mut _) }
+}
+
+/// Removes the `::Alias` marker from a register value’s type.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn remove_alias<T>(x: <<T as BitStore>::Alias as BitStore>::Mem) -> T::Mem
+where T: BitStore {
+	unsafe { *(&x as *const _ as *const _) }
+}
+
+/// Removes the `::Alias` marker from a `BitPtr`’s referent type.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn remove_bitptr_alias<T>(x: BitPtr<T::Alias>) -> BitPtr<T>
+where T: BitStore {
+	unsafe { *(&x as *const _ as *const _) }
+}
+
+/// Removes the `::Mem` marker from a memory value.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn remove_mem<T>(x: T::Mem) -> T
+where T: BitStore {
+	unsafe { ptr::read(&x as *const T::Mem as *const T) }
+}
+
+/// Gets a `NonNull<T>` base pointer from a `NonNull<[T]>` slice pointer.
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn nonnull_slice_to_base<T>(mut nn_slice: NonNull<[T]>) -> NonNull<T> {
+	unsafe { nn_slice.as_mut() }
+		.pipe(<[T]>::as_mut_ptr)
+		.pipe(|p| unsafe { NonNull::new_unchecked(p) })
+}
+
+/** Normalizes any range into a basic `Range`.
+
+This unpacks any range type into an ordinary `Range`, returning the start and
+exclusive end markers. If the start marker is not provided, it is assumed to be
+zero; if the end marker is not provided, then it is assumed to be `end`.
+
+The end marker, if provided, may be greater than `end`. This is not checked in
+the function, and must be inspected by the caller.
+
+# Type Parameters
+
+- `R`: A range of some kind
+
+# Parameters
+
+- `bounds`: A range of some kind
+- `end`: The value to use as the exclusive end, if the range does not have an
+  end.
+
+# Returns
+
+`bounds` normalized to an ordinary `Range`, optionally clamped to `end`.
+**/
+#[inline]
+pub fn normalize_range<R>(bounds: R, end: usize) -> Range<usize>
+where R: RangeBounds<usize> {
+	let min = match bounds.start_bound() {
+		Bound::Included(&n) => n,
+		Bound::Excluded(&n) => n + 1,
+		Bound::Unbounded => 0,
+	};
+	let max = match bounds.end_bound() {
+		Bound::Included(&n) => n + 1,
+		Bound::Excluded(&n) => n,
+		Bound::Unbounded => end,
+	};
+	min .. max
+}
+
+/** Asserts that a range satisfies bounds constraints.
+
+This requires that the range start be not greater than the range end, and the
+range end be not greater than the ending marker (if provided).
+
+# Parameters
+
+- `range`: The range to validate
+- `end`: An optional maximal value that the range cannot exceed
+
+# Panics
+
+This panics if the range fails a requirement.
+**/
+#[inline]
+pub fn assert_range(range: Range<usize>, end: impl Into<Option<usize>>) {
+	if range.start > range.end {
+		panic!(
+			"Malformed range: `{} .. {}` must run from lower to higher",
+			range.start, range.end
+		);
+	}
+	if let Some(end) = end.into() {
+		if range.end > end {
+			panic!(
+				"Range out of bounds: `{} .. {}` must not exceed `{}`",
+				range.start, range.end, end
+			);
+		}
+	}
+}
+
+#[cfg(all(test, feature = "std"))]
+mod tests {
+	use super::*;
+	use std::panic::catch_unwind;
+
+	#[test]
+	fn check_range_asserts() {
+		assert!(catch_unwind(|| assert_range(7 .. 2, None)).is_err());
+		assert!(catch_unwind(|| assert_range(0 .. 8, 4)).is_err());
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/domain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/domain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/domain.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/domain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,734 @@
+/*! Representation of the `BitSlice` region memory model
+
+This module allows any `BitSlice` region to be decomposed into domains with
+more detailed aliasing information.
+
+Specifically, any particular `BitSlice` region is one of:
+
+- touches only interior indices of one element
+- touches at least one edge index of any number of elements (including zero)
+
+In the latter case, any elements *completely* spanned by the slice handle are
+known to not have any other write-capable views to them, and in the case of an
+`&mut BitSlice` handle specifically, no other views at all. As such, the domain
+view of this memory is able to remove the aliasing marker type and permit direct
+memory access for the duration of its existence.
+!*/
+
+use crate::{
+	index::{
+		BitIdx,
+		BitTail,
+	},
+	mem::BitMemory,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+};
+
+use core::{
+	fmt::{
+		self,
+		Binary,
+		Debug,
+		Formatter,
+		LowerHex,
+		Octal,
+		UpperHex,
+	},
+	slice,
+};
+
+use tap::{
+	pipe::Pipe,
+	tap::Tap,
+};
+
+use wyz::fmt::FmtForward;
+
+macro_rules! bit_domain {
+	($t:ident $(=> $m:ident)? $(@ $a:ident)?) => {
+		/// Granular representation of the memory region containing a
+		/// `BitSlice`.
+		///
+		/// `BitSlice` regions can be described in terms of edge and center
+		/// elements, where the edge elements retain the aliasing status of the
+		/// source `BitSlice` handle, and the center elements are known to be
+		/// completely unaliased by any other view. This property allows any
+		/// `BitSlice` handle to be decomposed into smaller regions, and safely
+		/// remove any aliasing markers from the subregion of memory that no
+		/// longer requires them for correct access.
+		///
+		/// This enum acts like the `.split*` methods in that it only subdivides
+		/// the source `BitSlice` into smaller `BitSlices`, and makes
+		/// appropriate modifications to the aliasing markers. It does not
+		/// provide references to the underlying memory elements. If you need
+		/// such access directly, use the [`Domain`] or [`DomainMut`] enums.
+		///
+		/// # Lifetimes
+		///
+		/// - `'a`: The lifetime of the referent storage region.
+		///
+		/// # Type Parameters
+		///
+		/// - `O`: The ordering type of the source `BitSlice` handle.
+		/// - `T`: The element type of the source `BitSlice` handle, including
+		///   aliasing markers.
+		///
+		/// # Aliasing Awareness
+		///
+		/// This enum does not grant access to memory outside the scope of the
+		/// original `&BitSlice` handle, and so does not need to modfiy any
+		/// aliasing conditions.
+		///
+		/// [`Domain`]: enum.Domain.html
+		/// [`DomainMut`]: enum.DomainMut.html
+		#[derive(Debug)]
+		pub enum $t <'a, O, T>
+		where
+			O: BitOrder,
+			T: 'a + BitStore
+		{
+			/// Indicates that a `BitSlice` is contained entirely in the
+			/// interior indices of a single memory element.
+			Enclave {
+				/// The start index of the `BitSlice`.
+				///
+				/// This is not likely to be useful information, but is retained
+				/// for structural similarity with the rest of the module.
+				head: BitIdx<T::Mem>,
+				/// The original `BitSlice` used to create this bit-domain view.
+				body: &'a $($m)? BitSlice<O, T>,
+				/// The end index of the `BitSlice`.
+				///
+				/// This is not likely to be useful information, but is retained
+				/// for structural similarity with the rest of the module.
+				tail: BitTail<T::Mem>,
+			},
+			/// Indicates that a `BitSlice` region touches at least one edge
+			/// index of any number of elements.
+			///
+			/// This contains two bitslices representing the partially-occupied
+			/// edge elements, with their original aliasing marker, and one
+			/// bitslice representing the fully-occupied interior elements,
+			/// marked as unaliased.
+			Region {
+				/// Any bits that partially-fill the base element of the slice
+				/// region.
+				///
+				/// This does not modify its aliasing status, as it will already
+				/// be appropriately marked before constructing this view.
+				head: &'a $($m)? BitSlice<O, T>,
+				/// Any bits inside elements that the source bitslice completely
+				/// covers.
+				///
+				/// This is marked as unaliased, because it is statically
+				/// impossible for any other handle to have write access to the
+				/// region it covers. As such, a bitslice that was marked as
+				/// entirely aliased, but contains interior unaliased elements,
+				/// can safely remove its aliasing protections.
+				body: &'a $($m)? BitSlice<O, T::Mem>,
+				/// Any bits that partially fill the last element of the slice
+				/// region.
+				///
+				/// This does not modify its aliasing status, as it will already
+				/// be appropriately marked before constructing this view.
+				tail: &'a $($m)? BitSlice<O, T>,
+			},
+		}
+
+		impl<'a, O, T> $t <'a, O, T>
+		where
+			O: BitOrder,
+			T: 'a + BitStore,
+		{
+			/// Attempts to view the domain as an enclave variant.
+			///
+			/// # Parameters
+			///
+			/// - `self`
+			///
+			/// # Returns
+			///
+			/// If `self` is the [`Enclave`] variant, this returns `Some` of the
+			/// enclave fields, as a tuple. Otherwise, it returns `None`.
+			///
+			/// [`Enclave`]: #variant.Enclave
+			#[inline]
+			pub fn enclave(self) -> Option<(
+				BitIdx<T::Mem>,
+				&'a $($m)? BitSlice<O, T>,
+				BitTail<T::Mem>,
+			)> {
+				if let Self::Enclave { head, body, tail } = self {
+					Some((head, body, tail))
+				}
+				else {
+					None
+				}
+			}
+
+			/// Attempts to view the domain as a region variant.
+			///
+			/// # Parameters
+			///
+			/// - `self`
+			///
+			/// # Returns
+			///
+			/// If `self` is the [`Region`] variant, this returns `Some` of the
+			/// region fields, as a tuple. Otherwise, it returns `None`.
+			///
+			/// [`Region`]: #variant.Region
+			#[inline]
+			pub fn region(self) -> Option<(
+				&'a $($m)? BitSlice<O, T>,
+				&'a $($m)? BitSlice<O, T::Mem>,
+				&'a $($m)? BitSlice<O, T>,
+			)> {
+				if let Self::Region { head, body, tail } = self {
+					Some((head, body, tail))
+				}
+				else {
+					None
+				}
+			}
+
+			/// Constructs a bit-domain view from a bitslice.
+			///
+			/// # Parameters
+			///
+			/// - `slice`: The source bitslice for which the view is constructed
+			///
+			/// # Returns
+			///
+			/// A bit-domain view over the source slice.
+			#[inline]
+			pub(crate) fn new(slice: &'a $($m)? BitSlice<O, T>) -> Self {
+				let bitptr = slice.bitptr();
+				let h = bitptr.head();
+				let (e, t) = h.span(bitptr.len());
+				let w = T::Mem::BITS;
+
+				match (h.value(), e, t.value()) {
+					(_, 0, _) => Self::empty(),
+					(0, _, t) if t == w => Self::spanning(slice),
+					(_, _, t) if t == w => Self::partial_head(slice, h),
+					(0, ..) => Self::partial_tail(slice, h, t),
+					(_, 1, _) => Self::minor(slice, h, t),
+					_ => Self::major(slice, h, t),
+				}
+			}
+
+			#[inline]
+			fn empty() -> Self {
+				Self::Region {
+					head: Default::default(),
+					body: Default::default(),
+					tail: Default::default(),
+				}
+			}
+
+			#[inline]
+			fn major(
+				slice: &'a $($m)? BitSlice<O, T>,
+				head: BitIdx<T::Mem>,
+				tail: BitTail<T::Mem>,
+			) -> Self {
+				let (head, rest) = bit_domain!(split $($m)?
+					slice,
+					(T::Mem::BITS - head.value()) as usize,
+				);
+				let (body, tail) = bit_domain!(split $($m)?
+					rest,
+					rest.len() - (tail.value() as usize),
+				);
+				Self::Region {
+					head: bit_domain!(retype $($m)? head),
+					body: bit_domain!(retype $($m)? body),
+					tail: bit_domain!(retype $($m)? tail),
+				}
+			}
+
+			#[inline]
+			fn minor(
+				slice: &'a $($m)? BitSlice<O, T>,
+				head: BitIdx<T::Mem>,
+				tail: BitTail<T::Mem>,
+			) -> Self {
+				Self::Enclave {
+					head,
+					body: slice,
+					tail,
+				}
+			}
+
+			#[inline]
+			fn partial_head(
+				slice: &'a $($m)? BitSlice<O, T>,
+				head: BitIdx<T::Mem>,
+			) -> Self {
+				let (head, rest) = bit_domain!(split $($m)?
+					slice,
+					(T::Mem::BITS - head.value()) as usize,
+				);
+				let (head, body) = (
+					bit_domain!(retype $($m)? head),
+					bit_domain!(retype $($m)? rest),
+				);
+				Self::Region {
+					head,
+					body,
+					tail: Default::default(),
+				}
+			}
+
+			#[inline]
+			fn partial_tail(
+				slice: &'a $($m)? BitSlice<O, T>,
+				/* This discarded head argument makes all constructor functions
+				have the same register layout for the call, allowing the `::new`
+				function to establish the arguments ahead of time, then select a
+				constructor function to jump into.
+				*/
+				_head: BitIdx<T::Mem>,
+				tail: BitTail<T::Mem>,
+			) -> Self {
+				let (rest, tail) = bit_domain!(split $($m)?
+					slice,
+					slice.len() - (tail.value() as usize),
+				);
+				let (body, tail) = (
+					bit_domain!(retype $($m)? rest),
+					bit_domain!(retype $($m)? tail),
+				);
+				Self::Region {
+					head: Default::default(),
+					body,
+					tail,
+				}
+			}
+
+			#[inline]
+			fn spanning(slice: &'a $($m)? BitSlice<O, T>) -> Self {
+				Self::Region {
+					head: Default::default(),
+					body: bit_domain!(retype $($m)? slice),
+					tail: Default::default(),
+				}
+			}
+		}
+	};
+
+	(retype mut $slice:ident $(,)? ) => {
+		unsafe { &mut *($slice as *mut BitSlice<O, _> as *mut BitSlice<O, _>) }
+	};
+	(retype $slice:ident $(,)? ) => {
+		unsafe { &*($slice as *const BitSlice<O, _> as *const BitSlice<O, _>) }
+	};
+
+	(split mut $slice:ident, $at:expr $(,)? ) => {
+		unsafe { $slice.split_at_unchecked_mut($at) }
+	};
+	(split $slice:ident, $at:expr $(,)? ) => {
+		unsafe { $slice.split_at_unchecked($at) }
+	};
+}
+
+bit_domain!(BitDomain);
+bit_domain!(BitDomainMut => mut @ Alias);
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Clone for BitDomain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn clone(&self) -> Self {
+		*self
+	}
+}
+
+impl<O, T> Copy for BitDomain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+macro_rules! domain {
+	($t:ident $(=> $m:ident @ $a:ident)?) => {
+		/// Granular representation of the memory region containing a
+		/// `BitSlice`.
+		///
+		/// `BitSlice` regions can be described in terms of edge and center
+		/// elements, where the edge elements retain the aliasing status of the
+		/// source `BitSlice` handle, and the center elements are known to be
+		/// completely unaliased by any other view. This property allows any
+		/// `BitSlice` handle to be decomposed into smaller regions, and safely
+		/// remove any aliasing markers from the subregion of memory that no
+		/// longer requires them for correct access.
+		///
+		/// This enum splits the element region backing a `BitSlice` into
+		/// maybe-aliased and known-unaliased subslices. If you do not need to
+		/// work directly with the memory elements, and only need to firmly
+		/// specify the aliasing status of a `BitSlice`, see the [`BitDomain`]
+		/// and [`BitDomainMut`] enums.
+		///
+		/// # Lifetimes
+		///
+		/// - `'a`: The lifetime of the referent storage region.
+		///
+		/// # Type Parameters
+		///
+		/// - `T`: The element type of the source `BitSlice` handle, including
+		///   aliasing markers.
+		///
+		/// [`BitDomain`]: enum.BitDomain.html
+		/// [`BitDomainMut`]: enum.BitDomainMut.html
+		#[derive(Debug)]
+		pub enum $t <'a, T>
+		where
+			T: 'a + BitStore,
+		{
+			/// Indicates that a `BitSlice` is contained entirely in the
+			/// interior indices of a single memory element.
+			Enclave {
+				/// The start index of the `BitSlice`.
+				head: BitIdx<T::Mem>,
+				/// An aliased view of the element containing the `BitSlice`.
+				///
+				/// This is necessary even on immutable views, because other
+				/// views to the referent element may be permitted to modify it.
+				elem: &'a T $(::$a)?,
+				/// The end index of the `BitSlice`.
+				tail: BitTail<T::Mem>,
+			},
+			/// Indicates that a `BitSlice` region touches at least one edge
+			/// index of any number of elements.
+			///
+			/// This contains two optional references to the aliased edges, and
+			/// one reference to the unaliased middle. Each can be queried and
+			/// used individually.
+			Region {
+				/// If the `BitSlice` started in the interior of its first
+				/// element, this contains the starting index and the base
+				/// address.
+				head: Option<(BitIdx<T::Mem>, &'a T $(::$a)?)>,
+				/// All fully-spanned, unaliased, elements.
+				///
+				/// This is marked as bare memory without any access
+				/// protections, because it is statically impossible for any
+				/// other handle to have write access to the region it covers.
+				/// As such, a bitslice that was marked as entirely aliased, but
+				/// contains interior unaliased elements, can safely remove its
+				/// aliasing protections.
+				///
+				/// # Safety Exception
+				///
+				/// `&BitSlice<O, T::Alias>` references have access to a
+				/// `.set_aliased` method, which represents the only means in
+				/// `bitvec` of writing to memory without an exclusive `&mut `
+				/// reference.
+				///
+				/// Construction of two such shared, aliasing, references over
+				/// the same data, then construction of a domain view over one
+				/// of them and simultaneous writing through the other to
+				/// interior elements marked as unaliased, will cause the domain
+				/// view to be undefined behavior. Do not combine domain views
+				/// and `.set_aliased` calls.
+				body: &'a $($m)? [T::Mem],
+				/// If the `BitSlice` ended in the interior of its last element,
+				/// this contains the ending index and the last address.
+				tail: Option<(&'a T $(::$a)?, BitTail<T::Mem>)>,
+			}
+		}
+
+		impl<'a, T> $t <'a, T>
+		where
+			T: 'a + BitStore,
+		{
+			/// Attempts to view the domain as an enclave variant.
+			///
+			/// # Parameters
+			///
+			/// - `self`
+			///
+			/// # Returns
+			///
+			/// If `self` is the [`Enclave`] variant, this returns `Some` of the
+			/// enclave fields, as a tuple. Otherwise, it returns `None`.
+			///
+			/// [`Enclave`]: #variant.Enclave
+			#[inline]
+			pub fn enclave(self) -> Option<(
+				BitIdx<T::Mem>,
+				&'a T $(::$a)?,
+				BitTail<T::Mem>,
+			)> {
+				if let Self::Enclave { head, elem, tail } = self {
+					Some((head, elem, tail))
+				} else {
+					None
+				}
+			}
+
+			/// Attempts to view the domain as the region variant.
+			///
+			/// # Parameters
+			///
+			/// - `self`
+			///
+			/// # Returns
+			///
+			/// If `self` is the [`Region`] variant, this returns `Some` of the
+			/// region fields, as a tuple. Otherwise, it returns `None`.
+			///
+			/// [`Region`]: #variant.Region
+			#[inline]
+			pub fn region(self) -> Option<(
+				Option<(BitIdx<T::Mem>, &'a T $(::$a)?)>,
+				&'a $($m)? [T::Mem],
+				Option<(&'a T $(::$a)?, BitTail<T::Mem>)>,
+			)> {
+				if let Self::Region { head, body, tail } = self {
+					Some((head,body,tail))
+				}
+				else {
+					None
+				}
+			}
+
+			#[inline]
+			pub(crate) fn new<O>(slice: &'a $($m)? BitSlice<O, T>) -> Self
+			where O: BitOrder {
+				let bitptr = slice.bitptr();
+				let head = bitptr.head();
+				let elts = bitptr.elements();
+				let tail = bitptr.tail();
+				let bits = T::Mem::BITS;
+				let base = bitptr.pointer().to_const() as *const _;
+				match (head.value(), elts, tail.value()) {
+					(_, 0, _) => Self::empty(),
+					(0, _, t) if t == bits => Self::spanning(base, elts),
+					(_, _, t) if t == bits => Self::partial_head(base, elts, head),
+					(0, ..) => Self::partial_tail(base, elts, tail),
+					(_, 1, _) => Self::minor(base, head, tail),
+					_ => Self::major(base, elts, head, tail),
+				}
+			}
+
+			#[inline]
+			fn empty() -> Self {
+				Self::Region {
+					head: None,
+					body: & $($m)? [],
+					tail: None,
+				}
+			}
+
+			#[inline]
+			fn major(
+				base: *const T $(::$a)?,
+				elts: usize,
+				head: BitIdx<T::Mem>,
+				tail: BitTail<T::Mem>,
+			) -> Self {
+				let h = unsafe { &*base };
+				let t = unsafe { &*base.add(elts - 1) };
+				let body = domain!(slice $($m)? base.add(1), elts - 2);
+				Self::Region {
+					head: Some((head, h)),
+					body,
+					tail: Some((t, tail)),
+				}
+			}
+
+			#[inline]
+			fn minor(
+				addr: *const T $(::$a)?,
+				head: BitIdx<T::Mem>,
+				tail: BitTail<T::Mem>,
+			) -> Self {
+				Self::Enclave {
+					head,
+					elem: unsafe { &*addr },
+					tail,
+				}
+			}
+
+			#[inline]
+			fn partial_head(
+				base: *const T $(::$a)?,
+				elts: usize,
+				head: BitIdx<T::Mem>,
+			) -> Self {
+				let h = unsafe { &*base };
+				let body = domain!(slice $($m)? base.add(1), elts - 1);
+				Self::Region {
+					head: Some((head, h)),
+					body,
+					tail: None,
+				}
+			}
+
+			#[inline]
+			fn partial_tail(
+				base: *const T $(::$a)?,
+				elts: usize,
+				tail: BitTail<T::Mem>,
+			) -> Self {
+				let t = unsafe { &*base.add(elts - 1) };
+				let body = domain!(slice $($m)? base, elts - 1);
+				Self::Region {
+					head: None,
+					body,
+					tail: Some((t, tail)),
+				}
+			}
+
+			#[inline]
+			fn spanning(base: *const T $(::$a)?, elts: usize) -> Self {
+				Self::Region {
+					head: None,
+					body: domain!(slice $($m)? base, elts),
+					tail: None,
+				}
+			}
+		}
+	};
+
+	(slice mut $base:expr, $elts:expr) => {
+		unsafe { slice::from_raw_parts_mut($base as *const _ as *mut _, $elts) }
+	};
+	(slice $base:expr, $elts:expr) => {
+		unsafe { slice::from_raw_parts($base as *const _, $elts) }
+	};
+}
+
+domain!(Domain);
+domain!(DomainMut => mut @ Alias);
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Clone for Domain<'_, T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn clone(&self) -> Self {
+		*self
+	}
+}
+
+impl<'a, T> Iterator for Domain<'a, T>
+where T: 'a + BitStore
+{
+	type Item = T::Mem;
+
+	#[inline]
+	fn next(&mut self) -> Option<Self::Item> {
+		match self {
+			Self::Enclave { elem, .. } => {
+				elem.load_value().pipe(Some).tap(|_| *self = Self::empty())
+			},
+			Self::Region { head, body, tail } => {
+				if let Some((_, elem)) = *head {
+					return elem.load_value().pipe(Some).tap(|_| *head = None);
+				}
+				if let Some((elem, rest)) = body.split_first() {
+					*body = rest;
+					return Some(*elem);
+				}
+				if let Some((elem, _)) = *tail {
+					return elem.load_value().pipe(Some).tap(|_| *tail = None);
+				}
+				None
+			},
+		}
+	}
+}
+
+impl<'a, T> DoubleEndedIterator for Domain<'a, T>
+where T: 'a + BitStore
+{
+	#[inline]
+	fn next_back(&mut self) -> Option<Self::Item> {
+		match self {
+			Self::Enclave { elem, .. } => {
+				elem.load_value().pipe(Some).tap(|_| *self = Self::empty())
+			},
+			Self::Region { head, body, tail } => {
+				if let Some((elem, _)) = *tail {
+					return elem.load_value().pipe(Some).tap(|_| *tail = None);
+				}
+				if let Some((elem, rest)) = body.split_last() {
+					*body = rest;
+					return Some(*elem);
+				}
+				if let Some((_, elem)) = *head {
+					return elem.load_value().pipe(Some).tap(|_| *head = None);
+				}
+				None
+			},
+		}
+	}
+}
+
+impl<T> ExactSizeIterator for Domain<'_, T>
+where T: BitStore
+{
+	#[inline]
+	fn len(&self) -> usize {
+		match self {
+			Self::Enclave { .. } => 1,
+			Self::Region { head, body, tail } => {
+				head.is_some() as usize + body.len() + tail.is_some() as usize
+			},
+		}
+	}
+}
+
+impl<T> core::iter::FusedIterator for Domain<'_, T> where T: BitStore
+{
+}
+
+impl<T> Copy for Domain<'_, T> where T: BitStore
+{
+}
+
+macro_rules! fmt {
+	($($f:ty => $fwd:ident),+ $(,)?) => { $(
+		impl<T> $f for Domain<'_, T>
+		where T: BitStore
+		{
+			#[inline]
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				fmt.debug_list()
+					.entries(self.into_iter().map(FmtForward::$fwd))
+					.finish()
+			}
+		}
+	)+ };
+}
+
+fmt!(
+	Binary => fmt_binary,
+	LowerHex => fmt_lower_hex,
+	Octal => fmt_octal,
+	UpperHex => fmt_upper_hex,
+);
+
+#[cfg(test)]
+mod tests {
+	use crate::prelude::*;
+
+	#[test]
+	fn domain_iter() {
+		let data = [1u32, 2, 3];
+		let bits = &data.view_bits::<LocalBits>()[4 .. 92];
+
+		for (iter, elem) in bits.domain().rev().zip([3, 2, 1].iter().copied()) {
+			assert_eq!(iter, elem);
+		}
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/field/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/field/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/field/io.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/field/io.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,179 @@
+/*! I/O trait implementations.
+
+The standard library defines byte-based I/O protocols that form the basis of
+exchanging memory buffers with I/O controllers. As `BitSlice` is designed to be
+used with I/O buffers, it makes sense for it to implement these protocols.
+
+This module is a subset of the `field` module because it relies on the
+`BitField` trait’s ability to map `BitSlice` to a value-storage region. The I/O
+protocols `Read` and `Write` are strictly byte-based, and cannot be altered to
+be bit-based. As such, they are only implemented on types with a `BitField`
+implementation.
+
+Calling `BitField` methods in a loop imposes a non-trivial, and irremovable,
+per-loop overhead cost. Use of `bitvec` data structures directly, rather than
+their underlying buffers, will have a performance penalty.
+!*/
+
+#![cfg(feature = "std")]
+
+use crate::{
+	field::BitField,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+	vec::BitVec,
+};
+
+use core::mem;
+
+use std::io::{
+	self,
+	Read,
+	Write,
+};
+
+/** Mirrors the implementation on `[u8]` (found [here]).
+
+The implementation loads bytes out of the `&BitSlice` reference until exhaustion
+of either the source `BitSlice` or destination `[u8]`. When `.read()` returns,
+`self` will have been updated to no longer include the leading segment copied
+out as bytes of `buf`.
+
+[here]: https://doc.rust-lang.org/std/primitive.slice.html#impl-Read
+**/
+impl<'a, O, T> Read for &'a BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitField,
+{
+	#[inline]
+	fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+		let mut idx = 0;
+		for (byte, slot) in self.chunks_exact(8).zip(buf.iter_mut()) {
+			*slot = byte.load();
+			idx += 1;
+		}
+		*self = unsafe { self.get_unchecked(idx * 8 ..) };
+		Ok(idx)
+	}
+}
+
+/** Mirrors the implementation on `[u8]` (found [here]).
+
+The implementation copies bytes into the `&mut BitSlice` reference until
+exhaustion of either the source `[u8]` or destination `BitSlice`. When
+`.write()` returns, `self` will have been updated to no longer include the
+leading segment containing bytes copied in from `buf`.
+
+[here]: https://doc.rust-lang.org/std/primitive.slice.html#impl-Write
+**/
+impl<'a, O, T> Write for &'a mut BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T::Alias>: BitField,
+{
+	#[inline]
+	fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+		let mut idx = 0;
+		for (slot, byte) in self.chunks_exact_mut(8).zip(buf.iter().copied()) {
+			slot.store(byte);
+			idx += 1;
+		}
+		*self = unsafe { mem::take(self).get_unchecked_mut(idx * 8 ..) };
+		Ok(idx)
+	}
+
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	fn flush(&mut self) -> io::Result<()> {
+		Ok(())
+	}
+}
+
+/** Mirrors the implementation on `Vec<u8>` (found [here]).
+
+The implementation copies bytes from `buf` into the tail end of `self`. The
+performance characteristics of this operation are dependent on the type
+parameters of the `BitVec`, and the position of its tail.
+
+[here]: https://doc.rust-lang.org/std/vec/struct.Vec.html#impl-Write
+**/
+impl<O, T> Write for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T::Alias>: BitField,
+{
+	#[inline]
+	fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+		let len = self.len();
+		self.resize(len + buf.len() * 8, false);
+		unsafe { self.get_unchecked_mut(len ..) }.write(buf)
+	}
+
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	fn flush(&mut self) -> io::Result<()> {
+		Ok(())
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::prelude::*;
+
+	#[test]
+	fn read_bits() {
+		let data = [0x136Cu16, 0x8C63];
+		let mut bits = &data.view_bits::<Msb0>()[4 ..];
+		assert_eq!(bits.len(), 28);
+
+		let mut transfer = [0u8; 4];
+		let last_ptr = &mut transfer[3] as *mut _;
+		let mut transfer_handle = &mut transfer[..];
+
+		assert_eq!(io::copy(&mut bits, &mut transfer_handle).unwrap(), 3);
+
+		//  Once a bitslice cannot produce a byte, it stops `Read`ing
+		assert_eq!(bits, data.view_bits::<Msb0>()[28 ..]);
+		//  So the destination slice does not fill up.
+		assert_eq!(transfer_handle.as_mut_ptr() as *mut _, last_ptr);
+
+		if cfg!(target_endian = "little") {
+			assert_eq!(transfer[.. 3], [0x36, 0x8C, 0xC6][..]);
+			/* note the backwards nibbles here! ^^
+
+			When crossing element boundaries, `.load_le()` assumes that the
+			lesser memory address is less significant, and the greater memory
+			address is more significant. The last nibble of the first element
+			is therefore assumed to be numerically less significant than the
+			first nibble of the second word.
+
+			If this behavior surprises users, then an iterative copy may be more
+			appropriate than a `BitField`-based load/store behavior. A bitwise
+			crawl is slower, which is why `BitField` was chosen as the
+			implementation. But “quickly wrong� is worse than “slowly right�.
+			*/
+		}
+	}
+
+	#[test]
+	fn write_bits() {
+		let mut bv = bitvec![Msb0, usize; 0, 0, 0, 0];
+		assert_eq!(
+			3,
+			io::copy(&mut &[0xC3u8, 0xF0, 0x69][..], &mut bv).unwrap()
+		);
+
+		assert_eq!(bv, bits![
+			0, 0, 0, 0, // byte 0
+			1, 1, 0, 0, 0, 0, 1, 1, // byte 1
+			1, 1, 1, 1, 0, 0, 0, 0, // byte 2
+			0, 1, 1, 0, 1, 0, 0, 1,
+		]);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/field/permutation_tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/field/permutation_tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/field/permutation_tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/field/permutation_tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,121 @@
+/*! Permutation testing.
+
+This module runs battery tests on implementations of `BitField` to check that
+they behave as expected.
+!*/
+
+use super::*;
+
+#[cfg(not(miri))]
+use crate::prelude::*;
+
+/// Resizing always preserves the LSedge.
+#[test]
+fn check_resize() {
+	assert_eq!(resize::<u8, u8>(0xA5u8), 0xA5u8);
+	assert_eq!(resize::<u8, u16>(0xA5u8), 0xA5u16);
+	assert_eq!(resize::<u8, u32>(0xA5u8), 0xA5u32);
+
+	assert_eq!(resize::<u16, u8>(0x1234u16), 0x34u8);
+	assert_eq!(resize::<u16, u16>(0x1234u16), 0x1234u16);
+	assert_eq!(resize::<u16, u32>(0x1234u16), 0x1234u32);
+
+	assert_eq!(resize::<u32, u8>(0x1234_5678u32), 0x78u8);
+	assert_eq!(resize::<u32, u16>(0x1234_5678u32), 0x5678u16);
+	assert_eq!(resize::<u32, u32>(0x1234_5678u32), 0x1234_5678u32);
+
+	#[cfg(target_pointer_width = "64")]
+	{
+		assert_eq!(resize::<u8, u64>(0xA5u8), 0xA5u64);
+		assert_eq!(resize::<u16, u64>(0x1234u16), 0x1234u64);
+		assert_eq!(resize::<u32, u64>(0x1234_5678u32), 0x1234_5678u64);
+
+		assert_eq!(resize::<u64, u8>(0x0123_4567_89AB_CDEFu64), 0xEFu8);
+		assert_eq!(resize::<u64, u16>(0x0123_4567_89AB_CDEFu64), 0xCDEFu16);
+		assert_eq!(resize::<u64, u32>(0x0123_4567_89AB_CDEFu64), 0x89AB_CDEFu32);
+		assert_eq!(
+			resize::<u64, u64>(0x0123_4567_89AB_CDEFu64),
+			0x0123_4567_89AB_CDEFu64
+		);
+	}
+}
+
+#[test]
+#[cfg(not(miri))]
+fn l08() {
+	let bits = bits![mut Lsb0, u8; 0; 32];
+
+	for i in 0 .. 8 {
+		for n in 0u8 ..= !0 {
+			bits[i ..][.. 8].store_le::<u8>(n);
+			assert_eq!(bits[i ..][.. 8].load_le::<u8>(), n);
+		}
+	}
+
+	for i in 0 .. 16 {
+		for n in 0u16 ..= !0 {
+			bits[i ..][.. 16].store_le::<u16>(n);
+			assert_eq!(bits[i ..][.. 16].load_le::<u16>(), n);
+		}
+	}
+}
+
+#[test]
+#[cfg(not(miri))]
+fn m08() {
+	let bits = bits![mut Msb0, u8; 0; 32];
+
+	for i in 0 .. 8 {
+		for n in 0u8 ..= !0 {
+			bits[i ..][.. 8].store_le::<u8>(n);
+			assert_eq!(bits[i ..][.. 8].load_le::<u8>(), n);
+		}
+	}
+
+	for i in 0 .. 16 {
+		for n in 0u16 ..= !0 {
+			bits[i ..][.. 16].store_le::<u16>(n);
+			assert_eq!(bits[i ..][.. 16].load_le::<u16>(), n);
+		}
+	}
+}
+
+#[test]
+#[cfg(not(miri))]
+fn l16() {
+	let bits = bits![mut Lsb0, u16; 0; 32];
+
+	for i in 0 .. 8 {
+		for n in 0u8 ..= !0 {
+			bits[i ..][.. 8].store_le::<u8>(n);
+			assert_eq!(bits[i ..][.. 8].load_le::<u8>(), n);
+		}
+	}
+
+	for i in 0 .. 16 {
+		for n in 0u16 ..= !0 {
+			bits[i ..][.. 16].store_le::<u16>(n);
+			assert_eq!(bits[i ..][.. 16].load_le::<u16>(), n);
+		}
+	}
+}
+
+#[test]
+#[cfg(not(miri))]
+fn m16() {
+	let bits = bits![mut Msb0, u16; 0; 32];
+
+	for i in 0 .. 8 {
+		for n in 0u8 ..= !0 {
+			bits[i ..][.. 8].store_le::<u8>(n);
+			assert_eq!(bits[i ..][.. 8].load_le::<u8>(), n);
+		}
+	}
+
+	for i in 0 .. 16 {
+		for n in 0u16 ..= !0 {
+			bits[i ..][.. 16].store_le::<u16>(n);
+			assert_eq!(bits[i ..][.. 16].load_le::<u16>(), n);
+		}
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/field/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/field/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/field/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/field/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,103 @@
+//! Tests for the `field` module.
+
+use super::*;
+
+#[test]
+fn get_value() {
+	let data = [5u32 << 3, 0x01234567, !5];
+	let bits = data.view_bits::<Lsb0>();
+
+	let (head, elem, tail) = bits[3 .. 6].domain().enclave().unwrap();
+	let byte = get::<u32, u8>(elem, Lsb0::mask(head, tail), 3);
+	assert_eq!(byte, 5u8);
+
+	let (head, body, tail) = bits[32 .. 48].domain().region().unwrap();
+	assert!(head.is_none());
+	assert!(body.is_empty());
+	let (elem, tail) = tail.unwrap();
+	let short = get::<u32, u16>(elem, Lsb0::mask(None, tail), 0);
+	assert_eq!(short, 0x4567u16);
+
+	let (head, body, tail) = bits[48 .. 64].domain().region().unwrap();
+	assert!(tail.is_none());
+	assert!(body.is_empty());
+	let (head, elem) = head.unwrap();
+	let short = get::<u32, u16>(elem, Lsb0::mask(head, None), 16);
+	assert_eq!(short, 0x0123u16);
+
+	let (head, body, tail) = bits[64 .. 96].domain().region().unwrap();
+	assert!(head.is_none());
+	assert_eq!(body, &[!5]);
+	assert!(tail.is_none());
+}
+
+#[test]
+fn set_value() {
+	let mut data = [0u32; 3];
+	let bits = data.view_bits_mut::<Lsb0>();
+
+	let (head, elem, tail) = bits[3 .. 6].domain_mut().enclave().unwrap();
+	set::<u32, u16>(elem, 13u16, Lsb0::mask(head, tail), 3);
+
+	let (head, body, tail) = bits[32 .. 48].domain_mut().region().unwrap();
+	assert!(head.is_none());
+	assert!(body.is_empty());
+	let (elem, tail) = tail.unwrap();
+	set::<u32, u16>(elem, 0x4567u16, Lsb0::mask(None, tail), 0);
+
+	let (head, body, tail) = bits[48 .. 64].domain_mut().region().unwrap();
+	assert!(tail.is_none());
+	assert!(body.is_empty());
+	let (head, elem) = head.unwrap();
+	set::<u32, u16>(elem, 0x0123u16, Lsb0::mask(head, None), 16);
+
+	assert_eq!(data[0], 5 << 3);
+	assert_eq!(data[1], 0x01234567u32);
+}
+
+#[test]
+fn byte_fields() {
+	let mut data = [0u8; 3];
+
+	data.view_bits_mut::<Msb0>()[4 .. 20].store_be(0xABCDu16);
+	assert_eq!(data, [0x0A, 0xBC, 0xD0]);
+	assert_eq!(data.view_bits::<Msb0>()[4 .. 20].load_be::<u16>(), 0xABCD);
+
+	data.view_bits_mut::<Msb0>()[2 .. 6].store_be(9u8);
+	assert_eq!(data, [0x26, 0xBC, 0xD0]);
+	assert_eq!(data.view_bits::<Msb0>()[2 .. 6].load_be::<u8>(), 9);
+
+	data = [0; 3];
+	data.view_bits_mut::<Lsb0>()[4 .. 20].store_be(0xABCDu16);
+	assert_eq!(data, [0xA0, 0xBC, 0x0D]);
+	assert_eq!(data.view_bits::<Lsb0>()[4 .. 20].load_be::<u16>(), 0xABCD);
+
+	data.view_bits_mut::<Lsb0>()[2 .. 6].store_be(9u8);
+	//  0b1010_0000 | 0b00_1001_00
+	assert_eq!(data, [0xA4, 0xBC, 0x0D]);
+	assert_eq!(data.view_bits::<Lsb0>()[2 .. 6].load_be::<u8>(), 9);
+
+	data = [0; 3];
+	data.view_bits_mut::<Msb0>()[4 .. 20].store_le(0xABCDu16);
+	assert_eq!(data, [0x0D, 0xBC, 0xA0]);
+	assert_eq!(data.view_bits::<Msb0>()[4 .. 20].load_le::<u16>(), 0xABCD);
+
+	data = [0; 3];
+	data.view_bits_mut::<Lsb0>()[4 .. 20].store_le(0xABCDu16);
+	assert_eq!(data, [0xD0, 0xBC, 0x0A]);
+	assert_eq!(data.view_bits::<Lsb0>()[4 .. 20].load_le::<u16>(), 0xABCD);
+}
+
+#[test]
+fn wide_load() {
+	let mut data = bitarr![Lsb0, u16; 0; 256];
+	assert_eq!(data[16 .. 144].load::<u128>(), 0u128);
+	data[16 .. 144].store(!0u128);
+	assert_eq!(data[16 .. 144].load::<u128>(), !0u128);
+}
+
+#[test]
+#[should_panic]
+fn check_panic() {
+	check("fail", 10, 8);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/field.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/field.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,923 @@
+/*! Parallel bitfield access.
+
+This module provides parallel, multiple-bit, access to a `BitSlice`. This
+functionality permits the use of `BitSlice` as a library-level implementation of
+the bitfield language feature found in C and C++.
+
+The `BitField` trait is not sealed against client implementation, as there is no
+useful way to automatically use a `BitOrder` implementation to provide a
+universal behavior. As such, the trait has some requirements that the compiler
+cannot enforce for client implementations.
+
+# Batch Behavior
+
+The purpose of this trait is to provide access to arbitrary bit regions as if
+they were an ordinary memory location. As such, it is important for
+implementations of this trait to provide shift/mask register transfer behavior
+where possible, for as wide a span as possible in each action. Implementations
+of this trait should *not* use bit-by-bit iteration.
+
+# Register Bit Order Preservation
+
+As a default assumption – user orderings *may* violate this, but *should* not –
+each element of slice memory used to store part of a value should not reorder
+the value bits. Transfer between slice memory and a CPU register should solely
+be an ordinary value load or store between memory and the register, and a
+shift/mask operation to select the part of the value that is live.
+
+# Endianness
+
+The `_le` and `_be` methods of `BitField` refer to the order in which
+`T: BitStore` elements of the slice are assigned significance when containing
+fragments of a stored data value. Within any `T` element, the order of its
+constituent bytes is *not* governed by the `BitField` trait method.
+
+The provided `BitOrder` implementors `Lsb0` and `Msb0` use the local machine’s
+byte ordering. Other cursors *may* implement ordering of bytes within `T`
+elements differently, for instance by calling `.to_be_bytes` before store and
+`from_be_bytes` after load.
+!*/
+
+use crate::{
+	access::BitAccess,
+	array::BitArray,
+	devel as dvl,
+	domain::{
+		Domain,
+		DomainMut,
+	},
+	index::BitMask,
+	mem::BitMemory,
+	order::{
+		BitOrder,
+		Lsb0,
+		Msb0,
+	},
+	slice::BitSlice,
+	store::BitStore,
+	view::BitView,
+};
+
+use core::{
+	mem,
+	ops::{
+		Shl,
+		Shr,
+	},
+	ptr,
+};
+
+use tap::pipe::Pipe;
+
+#[cfg(feature = "alloc")]
+use crate::{
+	boxed::BitBox,
+	vec::BitVec,
+};
+
+/** Performs C-style bitfield access through a `BitSlice`.
+
+Bit orderings that permit batched access to regions of memory are enabled to
+load data from, and store data to, a `BitStore` with faster behavior than the
+default bit-by-bit traversal.
+
+This trait transfers data between a `BitSlice` and a local element. The trait
+functions always place the live bit region of the slice against the least
+significant bit edge of the local element (return value of `load`, argument of
+`store`).
+
+Implementations are encouraged to preserve in-memory bit ordering within a
+memory element, so that call sites can provide a value pattern that the user can
+clearly see matches what they expect for memory ordering. These methods should
+only move data between locations, without modifying the data itself.
+
+Methods should be called as `bits[start .. end].load_or_store()`, where the
+range subslice selects no mor than the `M::BITS` element width being
+transferred.
+**/
+pub trait BitField {
+	/// Loads the bits in the `self` region into a local value.
+	///
+	/// This can load into any of the unsigned integers which implement
+	/// `BitMemory`. Any further transformation must be done by the user.
+	///
+	/// The default implementation of this function calls [`load_le`] on
+	/// little-endian byte-ordered CPUs, and [`load_be`] on big-endian
+	/// byte-ordered CPUs.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: A read reference to some bits in memory. This slice must be
+	///   trimmed to have a width no more than the `M::BITS` width of the type
+	///   being loaded. This can be accomplished with range indexing on a larger
+	///   slice.
+	///
+	/// # Returns
+	///
+	/// A value `M` whose least `self.len()` significant bits are filled with
+	/// the bits of `self`.
+	///
+	/// # Panics
+	///
+	/// This method is encouraged to panic if `self` is empty, or wider than a
+	/// single element `M`.
+	///
+	/// [`load_be`]: #tymethod.load_be
+	/// [`load_le`]: #tymethod.load_le
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	fn load<M>(&self) -> M
+	where M: BitMemory {
+		#[cfg(target_endian = "little")]
+		return self.load_le::<M>();
+
+		#[cfg(target_endian = "big")]
+		return self.load_be::<M>();
+	}
+
+	/// Stores a sequence of bits from the user into the domain of `self`.
+	///
+	/// This can store any of the unsigned integers which implement
+	/// `BitMemory`. Any other types must first be transformed by the user.
+	///
+	/// The default implementation of this function calls [`store_le`] on
+	/// little-endian byte-ordered CPUs, and [`store_be`] on big-endian
+	/// byte-ordered CPUs.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`: A write reference to some bits in memory. This slice must
+	///   be trimmed to have a width no more than the `M::BITS` width of the
+	///   type being stored. This can be accomplished with range indexing on a
+	///   larger slice.
+	/// - `value`: A value, whose `self.len()` least significant bits will be
+	///   stored into `self`.
+	///
+	/// # Behavior
+	///
+	/// The `self.len()` least significant bits of `value` are written into the
+	/// domain of `self`.
+	///
+	/// # Panics
+	///
+	/// This method is encouraged to panic if `self` is empty, or wider than a
+	/// single element `M`.
+	///
+	/// [`store_be`]: #tymethod.store_be
+	/// [`store_le`]: #tymethod.store_le
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	fn store<M>(&mut self, value: M)
+	where M: BitMemory {
+		#[cfg(target_endian = "little")]
+		self.store_le(value);
+
+		#[cfg(target_endian = "big")]
+		self.store_be(value);
+	}
+
+	/// Loads from `self`, using little-endian element `T` ordering.
+	///
+	/// This function interprets a multi-element slice as having its least
+	/// significant chunk in the low memory address, and its most significant
+	/// chunk in the high memory address. Each element `T` is still interpreted
+	/// from individual bytes according to the local CPU ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: A read reference to some bits in memory. This slice must be
+	///   trimmed to have a width no more than the `M::BITS` width of the type
+	///   being loaded. This can be accomplished with range indexing on a larger
+	///   slice.
+	///
+	/// # Returns
+	///
+	/// A value `M` whose least `self.len()` significant bits are filled with
+	/// the bits of `self`. If `self` spans multiple elements `T`, then the
+	/// lowest-address `T` is interpreted as containing the least significant
+	/// bits of the return value `M`, and the highest-address `T` is interpreted
+	/// as containing its most significant bits.
+	///
+	/// # Panics
+	///
+	/// This method is encouraged to panic if `self` is empty, or wider than a
+	/// single element `M`.
+	fn load_le<M>(&self) -> M
+	where M: BitMemory;
+
+	/// Loads from `self`, using big-endian element `T` ordering.
+	///
+	/// This function interprets a multi-element slice as having its most
+	/// significant chunk in the low memory address, and its least significant
+	/// chunk in the high memory address. Each element `T` is still interpreted
+	/// from individual bytes according to the local CPU ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: A read reference to some bits in memory. This slice must be
+	///   trimmed to have a width no more than the `M::BITS` width of the type
+	///   being loaded. This can be accomplished with range indexing on a larger
+	///   slice.
+	///
+	/// # Returns
+	///
+	/// A value `M` whose least `self.len()` significant bits are filled with
+	/// the bits of `self`. If `self` spans multiple elements `T`, then the
+	/// lowest-address `T` is interpreted as containing the most significant
+	/// bits of the return value `M`, and the highest-address `T` is interpreted
+	/// as containing its least significant bits.
+	///
+	/// # Panics
+	///
+	/// This method is encouraged to panic if `self` is empty, or wider than a
+	/// single element `M`.
+	fn load_be<M>(&self) -> M
+	where M: BitMemory;
+
+	/// Stores into `self`, using little-endian element ordering.
+	///
+	/// This function interprets a multi-element slice as having its least
+	/// significant chunk in the low memory address, and its most significant
+	/// chunk in the high memory address. Each element `T` is still interpreted
+	/// from individual bytes according to the local CPU ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`: A write reference to some bits in memory. This slice must
+	///   be trimmed to have a width no more than the `M::BITS` width of the
+	///   type being stored. This can be accomplished with range indexing on a
+	///   larger slice.
+	/// - `value`: A value, whose `self.len()` least significant bits will be
+	///   stored into `self`.
+	///
+	/// # Behavior
+	///
+	/// The `self.len()` least significant bits of `value` are written into the
+	/// domain of `self`. If `self` spans multiple elements `T`, then the
+	/// lowest-address `T` is interpreted as containing the least significant
+	/// bits of the `M` return value, and the highest-address `T` is interpreted
+	/// as containing its most significant bits.
+	///
+	/// # Panics
+	///
+	/// This method is encouraged to panic if `self` is empty, or wider than a
+	/// single element `M`.
+	fn store_le<M>(&mut self, value: M)
+	where M: BitMemory;
+
+	/// Stores into `self`, using big-endian element ordering.
+	///
+	/// This function interprets a multi-element slice as having its most
+	/// significant chunk in the low memory address, and its least significant
+	/// chunk in the high memory address. Each element `T` is still interpreted
+	/// from individual bytes according to the local CPU ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`: A write reference to some bits in memory. This slice must
+	///   be trimmed to have a width no more than the `M::BITS` width of the
+	///   type being stored. This can be accomplished with range indexing on a
+	///   larger slice.
+	/// - `value`: A value, whose `self.len()` least significant bits will be
+	///   stored into `self`.
+	///
+	/// # Behavior
+	///
+	/// The `self.len()` least significant bits of `value` are written into the
+	/// domain of `self`. If `self` spans multiple elements `T`, then the
+	/// lowest-address `T` is interpreted as containing the most significant
+	/// bits of the `M` return value, and the highest-address `T` is interpreted
+	/// as containing its least significant bits.
+	///
+	/// # Panics
+	///
+	/// This method is encouraged to panic if `self` is empty, or wider than a
+	/// single element `M`.
+	fn store_be<M>(&mut self, value: M)
+	where M: BitMemory;
+}
+
+impl<T> BitField for BitSlice<Lsb0, T>
+where T: BitStore
+{
+	#[inline]
+	fn load_le<M>(&self) -> M
+	where M: BitMemory {
+		let len = self.len();
+		check("load", len, M::BITS);
+
+		match self.domain() {
+			//  In Lsb0, a `head` index counts distance from LSedge, and a
+			//  `tail` index counts element width minus distance from MSedge.
+			Domain::Enclave { head, elem, tail } => {
+				get::<T, M>(elem, Lsb0::mask(head, tail), head.value())
+			},
+			Domain::Region { head, body, tail } => {
+				let mut accum = M::ZERO;
+
+				/* For multi-`T::Mem` domains, the most significant chunk is
+				stored in the highest memory address, the tail. Each successive
+				memory address lower has a chunk of decreasing significance,
+				until the least significant chunk is stored in the lowest memory
+				address, the head.
+				*/
+
+				if let Some((elem, tail)) = tail {
+					accum = get::<T, M>(elem, Lsb0::mask(None, tail), 0);
+				}
+
+				for elem in body.iter().rev().copied() {
+					/* Rust does not allow the use of shift instructions of
+					exactly a type width to clear a value. This loop only enters
+					when `M` is not narrower than `T::Mem`, and the shift is
+					only needed when `M` occupies *more than one* `T::Mem` slot.
+					When `M` is exactly as wide as `T::Mem`, this loop either
+					does not runs (head and tail only), or runs once (single
+					element), and thus the shift is unnecessary.
+
+					As a const-expression, this branch folds at compile-time to
+					conditionally remove or retain the instruction.
+					*/
+					if M::BITS > T::Mem::BITS {
+						accum <<= T::Mem::BITS;
+					}
+					accum |= resize::<T::Mem, M>(elem);
+				}
+
+				if let Some((head, elem)) = head {
+					let shamt = head.value();
+					accum <<= T::Mem::BITS - shamt;
+					accum |= get::<T, M>(elem, Lsb0::mask(head, None), shamt);
+				}
+
+				accum
+			},
+		}
+	}
+
+	#[inline]
+	fn load_be<M>(&self) -> M
+	where M: BitMemory {
+		let len = self.len();
+		check("load", len, M::BITS);
+
+		match self.domain() {
+			Domain::Enclave { head, elem, tail } => {
+				get::<T, M>(elem, Lsb0::mask(head, tail), head.value())
+			},
+			Domain::Region { head, body, tail } => {
+				let mut accum = M::ZERO;
+
+				if let Some((head, elem)) = head {
+					accum =
+						get::<T, M>(elem, Lsb0::mask(head, None), head.value());
+				}
+
+				for elem in body.iter().copied() {
+					if M::BITS > T::Mem::BITS {
+						accum <<= T::Mem::BITS;
+					}
+					accum |= resize::<T::Mem, M>(elem);
+				}
+
+				if let Some((elem, tail)) = tail {
+					accum <<= tail.value();
+					accum |= get::<T, M>(elem, Lsb0::mask(None, tail), 0);
+				}
+
+				accum
+			},
+		}
+	}
+
+	#[inline]
+	fn store_le<M>(&mut self, mut value: M)
+	where M: BitMemory {
+		let len = self.len();
+		check("store", len, M::BITS);
+
+		match self.domain_mut() {
+			DomainMut::Enclave { head, elem, tail } => {
+				set::<T, M>(elem, value, Lsb0::mask(head, tail), head.value())
+			},
+			DomainMut::Region { head, body, tail } => {
+				if let Some((head, elem)) = head {
+					let shamt = head.value();
+					set::<T, M>(elem, value, Lsb0::mask(head, None), shamt);
+					value >>= T::Mem::BITS - shamt;
+				}
+
+				for elem in body {
+					*elem = resize(value);
+					if M::BITS > T::Mem::BITS {
+						value >>= T::Mem::BITS;
+					}
+				}
+
+				if let Some((elem, tail)) = tail {
+					set::<T, M>(elem, value, Lsb0::mask(None, tail), 0);
+				}
+			},
+		}
+	}
+
+	#[inline]
+	fn store_be<M>(&mut self, mut value: M)
+	where M: BitMemory {
+		let len = self.len();
+		check("store", len, M::BITS);
+
+		match self.domain_mut() {
+			DomainMut::Enclave { head, elem, tail } => {
+				set::<T, M>(elem, value, Lsb0::mask(head, tail), head.value())
+			},
+			DomainMut::Region { head, body, tail } => {
+				if let Some((elem, tail)) = tail {
+					set::<T, M>(elem, value, Lsb0::mask(None, tail), 0);
+					value >>= tail.value()
+				}
+
+				for elem in body.iter_mut().rev() {
+					*elem = resize(value);
+					if M::BITS > T::Mem::BITS {
+						value >>= T::Mem::BITS;
+					}
+				}
+
+				if let Some((head, elem)) = head {
+					set::<T, M>(
+						elem,
+						value,
+						Lsb0::mask(head, None),
+						head.value(),
+					);
+				}
+			},
+		}
+	}
+}
+
+impl<T> BitField for BitSlice<Msb0, T>
+where T: BitStore
+{
+	#[inline]
+	fn load_le<M>(&self) -> M
+	where M: BitMemory {
+		let len = self.len();
+		check("load", len, M::BITS);
+
+		match self.domain() {
+			Domain::Enclave { head, elem, tail } => get::<T, M>(
+				elem,
+				Msb0::mask(head, tail),
+				T::Mem::BITS - tail.value(),
+			),
+			Domain::Region { head, body, tail } => {
+				let mut accum = M::ZERO;
+
+				if let Some((elem, tail)) = tail {
+					accum = get::<T, M>(
+						elem,
+						Msb0::mask(None, tail),
+						T::Mem::BITS - tail.value(),
+					);
+				}
+
+				for elem in body.iter().rev().copied() {
+					if M::BITS > T::Mem::BITS {
+						accum <<= T::Mem::BITS;
+					}
+					accum |= resize::<T::Mem, M>(elem);
+				}
+
+				if let Some((head, elem)) = head {
+					accum <<= T::Mem::BITS - head.value();
+					accum |= get::<T, M>(elem, Msb0::mask(head, None), 0);
+				}
+
+				accum
+			},
+		}
+	}
+
+	#[inline]
+	fn load_be<M>(&self) -> M
+	where M: BitMemory {
+		let len = self.len();
+		check("load", len, M::BITS);
+
+		match self.domain() {
+			Domain::Enclave { head, elem, tail } => get::<T, M>(
+				elem,
+				Msb0::mask(head, tail),
+				T::Mem::BITS - tail.value(),
+			),
+			Domain::Region { head, body, tail } => {
+				let mut accum = M::ZERO;
+
+				if let Some((head, elem)) = head {
+					accum = get::<T, M>(elem, Msb0::mask(head, None), 0);
+				}
+
+				for elem in body.iter().copied() {
+					if M::BITS > T::Mem::BITS {
+						accum <<= T::Mem::BITS;
+					}
+					accum |= resize::<T::Mem, M>(elem);
+				}
+
+				if let Some((elem, tail)) = tail {
+					let width = tail.value();
+					accum <<= width;
+					accum |= get::<T, M>(
+						elem,
+						Msb0::mask(None, tail),
+						T::Mem::BITS - width,
+					);
+				}
+
+				accum
+			},
+		}
+	}
+
+	#[inline]
+	fn store_le<M>(&mut self, mut value: M)
+	where M: BitMemory {
+		let len = self.len();
+		check("store", len, M::BITS);
+
+		match self.domain_mut() {
+			DomainMut::Enclave { head, elem, tail } => set::<T, M>(
+				elem,
+				value,
+				Msb0::mask(head, tail),
+				T::Mem::BITS - tail.value(),
+			),
+			DomainMut::Region { head, body, tail } => {
+				if let Some((head, elem)) = head {
+					set::<T, M>(elem, value, Msb0::mask(head, None), 0);
+					value >>= T::Mem::BITS - head.value();
+				}
+
+				for elem in body.iter_mut() {
+					*elem = resize(value);
+					if M::BITS > T::Mem::BITS {
+						value >>= T::Mem::BITS;
+					}
+				}
+
+				if let Some((elem, tail)) = tail {
+					set::<T, M>(
+						elem,
+						value,
+						Msb0::mask(None, tail),
+						T::Mem::BITS - tail.value(),
+					);
+				}
+			},
+		}
+	}
+
+	#[inline]
+	fn store_be<M>(&mut self, mut value: M)
+	where M: BitMemory {
+		let len = self.len();
+		check("store", len, M::BITS);
+
+		match self.domain_mut() {
+			DomainMut::Enclave { head, elem, tail } => set::<T, M>(
+				elem,
+				value,
+				Msb0::mask(head, tail),
+				T::Mem::BITS - tail.value(),
+			),
+			DomainMut::Region { head, body, tail } => {
+				if let Some((elem, tail)) = tail {
+					set::<T, M>(
+						elem,
+						value,
+						Msb0::mask(None, tail),
+						T::Mem::BITS - tail.value(),
+					);
+					value >>= tail.value();
+				}
+
+				for elem in body.iter_mut().rev() {
+					*elem = resize(value);
+					if M::BITS > T::Mem::BITS {
+						value >>= T::Mem::BITS;
+					}
+				}
+
+				if let Some((head, elem)) = head {
+					set::<T, M>(elem, value, Msb0::mask(head, None), 0);
+				}
+			},
+		}
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, V> BitField for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView,
+	BitSlice<O, V::Store>: BitField,
+{
+	#[inline]
+	fn load_le<M>(&self) -> M
+	where M: BitMemory {
+		self.as_bitslice().load_le()
+	}
+
+	#[inline]
+	fn load_be<M>(&self) -> M
+	where M: BitMemory {
+		self.as_bitslice().load_be()
+	}
+
+	#[inline]
+	fn store_le<M>(&mut self, value: M)
+	where M: BitMemory {
+		self.as_mut_bitslice().store_le(value)
+	}
+
+	#[inline]
+	fn store_be<M>(&mut self, value: M)
+	where M: BitMemory {
+		self.as_mut_bitslice().store_be(value)
+	}
+}
+
+#[cfg(feature = "alloc")]
+#[cfg(not(tarpaulin_include))]
+impl<O, T> BitField for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitField,
+{
+	#[inline]
+	fn load_le<M>(&self) -> M
+	where M: BitMemory {
+		self.as_bitslice().load_le()
+	}
+
+	#[inline]
+	fn load_be<M>(&self) -> M
+	where M: BitMemory {
+		self.as_bitslice().load_be()
+	}
+
+	#[inline]
+	fn store_le<M>(&mut self, value: M)
+	where M: BitMemory {
+		self.as_mut_bitslice().store_le(value)
+	}
+
+	#[inline]
+	fn store_be<M>(&mut self, value: M)
+	where M: BitMemory {
+		self.as_mut_bitslice().store_be(value)
+	}
+}
+
+#[cfg(feature = "alloc")]
+#[cfg(not(tarpaulin_include))]
+impl<O, T> BitField for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitField,
+{
+	#[inline]
+	fn load_le<M>(&self) -> M
+	where M: BitMemory {
+		self.as_bitslice().load_le()
+	}
+
+	#[inline]
+	fn load_be<M>(&self) -> M
+	where M: BitMemory {
+		self.as_bitslice().load_be()
+	}
+
+	#[inline]
+	fn store_le<M>(&mut self, value: M)
+	where M: BitMemory {
+		self.as_mut_bitslice().store_le(value)
+	}
+
+	#[inline]
+	fn store_be<M>(&mut self, value: M)
+	where M: BitMemory {
+		self.as_mut_bitslice().store_be(value)
+	}
+}
+
+/// Asserts that a slice length is within a memory element width.
+#[inline]
+fn check(action: &'static str, len: usize, width: u8) {
+	if !(1 ..= width as usize).contains(&len) {
+		panic!("Cannot {} {} bits from a {}-bit region", action, width, len);
+	}
+}
+
+/** Reads a value out of a section of a memory element.
+
+This function is used to extract a portion of an `M` value from a portion of a
+`T` value. The `BitField` implementations call it as they assemble a complete
+`M`. It performs the following steps:
+
+1. the referent value of the `elem` pointer is copied into local memory,
+2. `mask`ed to discard the portions of `*elem` that are not live,
+3. shifted to the LSedge of the `T::Mem` temporary,
+4. then `resize`d into an `M` value.
+
+This is the exact inverse of `set`.
+
+# Type Parameters
+
+- `T`: The `BitStore` type of a `BitSlice` that is the source of a read event.
+- `M`: The local type of the data contained in that `BitSlice`.
+
+# Parameters
+
+- `elem`: An aliased reference to a single element of a `BitSlice` storage. This
+  is required to remain aliased, as other write-capable references to the
+  location may exist.
+- `mask`: A `BitMask` of the live region of the value at `*elem` to be used as
+  the contents of the returned value.
+- `shamt`: The distance of the least significant bit of the mask region from the
+  least significant edge of the `T::Mem` fetched value.
+
+# Returns
+
+`resize((*elem & mask) >> shamt)`
+**/
+#[inline]
+fn get<T, M>(elem: &T, mask: BitMask<T::Mem>, shamt: u8) -> M
+where
+	T: BitStore,
+	M: BitMemory,
+{
+	elem.load_value()
+		.pipe(|val| mask & val)
+		.value()
+		.pipe(|val| Shr::<u8>::shr(val, shamt))
+		.pipe(resize::<T::Mem, M>)
+}
+
+/** Writes a value into a section of a memory element.
+
+This function is used to emplace a portion of an `M` value into a portion of a
+`T` value. The `BitField` implementations call it as they disassemble a complete
+`M`. It performs the following steps:
+
+1. the provided `value` is `resize`d from `M` to `T::Mem`,
+2. then shifted from the LSedge of the `T::Mem` temporary by `shamt`,
+3. `mask`ed to discard the portions of `value` that are not live,
+4. then written into the `mask`ed portion of `*elem`.
+
+This is the exact inverse of `get`.
+
+# Type Parameters
+
+- `T`: The `BitStore` type of a `BitSlice` that is the sink of a write event.
+- `M`: The local type of the data being written into that `BitSlice`.
+
+# Parameters
+
+- `elem`: An aliased reference to a single element of a `BitSlice` storage.
+- `value`: The value whose least-significant bits will be written into the
+  subsection of `*elt` covered by `mask`.
+- `mask`: A `BitMask` of the live region of the value at `*elem` to be used as
+  a filter on the provided value.
+- `shamt`: The distance of the least significant bit of the mask region from the
+  least significant edge of the `T::Mem` destination value.
+
+# Effects
+
+`*elem &= !mask; *elem |= (resize(value) << shamt) & mask;`
+**/
+#[inline]
+fn set<T, M>(elem: &T::Alias, value: M, mask: BitMask<T::Mem>, shamt: u8)
+where
+	T: BitStore,
+	M: BitMemory,
+{
+	//  Convert the aliasing reference into its accessing type.
+	let elem = dvl::accessor(elem);
+	//  Mark the mask as aliased, to fit into the accessor reference.
+	let mask = dvl::alias_mask::<T>(mask);
+	//  Modify `value` to fit the accessor reference, by:
+	let value = value
+		//  resizing from `M` to `T::Mem`,
+		.pipe(resize::<M, T::Mem>)
+		//  marking it as `T::Alias::Mem`,
+		.pipe(dvl::alias_mem::<T>)
+		//  and shifting it left by `shamt` to be in the mask region,
+		.pipe(|val| Shl::<u8>::shl(val, shamt))
+		//  then masking it.
+		.pipe(|val| mask & val);
+
+	elem.clear_bits(mask);
+	elem.set_bits(value);
+}
+
+/** Resizes a value from one register width to another
+
+This zero-extends or truncates its source value in order to fit in the target
+type.
+
+# Type Parameters
+
+- `T`: The initial register type of the value to resize.
+- `U`: The final register type of the resized value.
+
+# Parameters
+
+- `value`: Any register value
+
+# Returns
+
+`value`, either zero-extended if `U` is wider than `T` or truncated if `U` is
+narrower than `T`.
+**/
+#[inline]
+fn resize<T, U>(value: T) -> U
+where
+	T: BitMemory,
+	U: BitMemory,
+{
+	let mut out = U::ZERO;
+	let size_t = mem::size_of::<T>();
+	let size_u = mem::size_of::<U>();
+
+	unsafe {
+		resize_inner::<T, U>(&value, &mut out, size_t, size_u);
+	}
+
+	out
+}
+
+/// Performs little-endian byte-order register resizing.
+#[inline(always)]
+#[cfg(target_endian = "little")]
+#[cfg(not(tarpaulin_include))]
+unsafe fn resize_inner<T, U>(
+	src: &T,
+	dst: &mut U,
+	size_t: usize,
+	size_u: usize,
+)
+{
+	//  In LE, the least significant byte is the base address, so resizing is
+	//  just a memcpy into a zeroed slot, taking only the smaller width.
+	ptr::copy_nonoverlapping(
+		src as *const T as *const u8,
+		dst as *mut U as *mut u8,
+		core::cmp::min(size_t, size_u),
+	);
+}
+
+/// Performs big-endian byte-order register resizing.
+#[inline(always)]
+#[cfg(target_endian = "big")]
+#[cfg(not(tarpaulin_include))]
+unsafe fn resize_inner<T, U>(
+	src: &T,
+	dst: &mut U,
+	size_t: usize,
+	size_u: usize,
+)
+{
+	let src = src as *const T as *const u8;
+	let dst = dst as *mut U as *mut u8;
+
+	//  In BE, shrinking a value requires moving the source base pointer up,
+	if size_t > size_u {
+		ptr::copy_nonoverlapping(src.add(size_t - size_u), dst, size_u);
+	}
+	//  While expanding a value requires moving the destination base pointer up.
+	else {
+		ptr::copy_nonoverlapping(src, dst.add(size_u - size_t), size_t);
+	}
+}
+
+#[cfg(not(any(target_endian = "big", target_endian = "little")))]
+compile_fail!(concat!(
+	"This architecture is currently not supported. File an issue at ",
+	env!(CARGO_PKG_REPOSITORY)
+));
+
+#[cfg(feature = "std")]
+mod io;
+
+#[cfg(test)]
+mod tests;
+
+// These tests are purely mathematical, and do not need to run more than once.
+#[cfg(all(test, feature = "std", not(miri), not(tarpaulin)))]
+mod permutation_tests;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/index.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/index.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/index.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/index.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1255 @@
+/*! Typed metadata of registers.
+
+This module provides types which guarantee certain properties about working with
+individual bits of registers.
+
+The main advantage of the types in this module is that they provide
+type-dependent range constrictions for index values, making it impossible to
+have an index out of bounds for a register, and creating a sequence of type
+transformations that give assurance about the continued validity of each value
+in its surrounding context.
+
+By eliminating public constructors from arbitrary integers, `bitvec` can
+guarantee that only it can produce seed values, and only trusted functions can
+transform their numeric values or types, until the program reaches the property
+it requires. This chain of assurance means that operations that interact with
+memory can be confident in the correctness of their actions and effects.
+
+# Type Sequence
+
+The library produces `BitIdx` values from region computation. These types cannot
+be publicly constructed, and are only ever the result of pointer analysis. As
+such, they rely on correctness of the memory regions provided to library entry
+points, and those entry points can leverage the Rust type system to ensure
+safety there.
+
+`BitIdx` is transformed to `BitPos` through the `BitOrder` trait, which has an
+associated verification function to prove that implementations are correct.
+`BitPos` is the only type that can describe memory operations, and is used to
+create selection masks of `BitSel` and `BitMask`.
+!*/
+
+use crate::{
+	mem::BitMemory,
+	order::BitOrder,
+	store::BitStore,
+};
+
+use core::{
+	any::type_name,
+	fmt::{
+		self,
+		Binary,
+		Debug,
+		Display,
+		Formatter,
+	},
+	iter::{
+		FusedIterator,
+		Sum,
+	},
+	marker::PhantomData,
+	ops::{
+		BitAnd,
+		BitOr,
+		Not,
+	},
+};
+
+use radium::marker::BitOps;
+
+#[cfg(feature = "serde")]
+use core::convert::TryFrom;
+
+macro_rules! make {
+	(idx $e:expr) => {
+		BitIdx {
+			idx: $e,
+			_ty: PhantomData,
+			}
+	};
+	(tail $e:expr) => {
+		BitTail {
+			end: $e,
+			_ty: PhantomData,
+			}
+	};
+	(pos $e:expr) => {
+		BitPos {
+			pos: $e,
+			_ty: PhantomData,
+			}
+	};
+	(sel $e:expr) => {
+		BitSel { sel: $e }
+	};
+	(mask $e:expr) => {
+		BitMask { mask: $e }
+	};
+}
+
+/// Marks that an integer can be used in a processor register.
+pub trait BitRegister: BitMemory + BitOps + BitStore {}
+
+macro_rules! register {
+	($($t:ty),+ $(,)?) => { $(
+		impl BitRegister for $t {
+		}
+	)* };
+}
+
+register!(u8, u16, u32);
+
+/** `u64` can only be used as a register on processors whose word size is at
+least 64 bits.
+
+This implementation is not present on targets with 32-bit processor words.
+**/
+#[cfg(target_pointer_width = "64")]
+impl BitRegister for u64 {
+}
+
+register!(usize);
+
+/** A semantic index of a single bit within a register `R`.
+
+This type is a counter in the range `0 .. R::BITS`, and marks the semantic
+position of a bit according to some [`BitOrder`] implementation. As an abstract
+counter, it can be used in arithmetic without having to go through `BitOrder`
+translation to an electrical position.
+
+# Type Parameters
+
+- `R`: The register type that these values govern.
+
+# Validity
+
+Values of this type are required to be in the range `0 .. R::BITS`. Any value
+outside this range will cause the program state to become invalid, and the
+library’s behavior is unspecified. The library will never produce such an
+invalid value.
+
+# Construction
+
+This type cannot be constructed outside the `bitvec` crate. `bitvec` will
+construct safe values of this type, and allows users to view them and use them
+to construct other index types from them. All values of this type constructed by
+`bitvec` are known to be correct based on user input to the crate.
+**/
+// #[rustc_layout_scalar_valid_range_end(R::BITS)]
+#[repr(transparent)]
+#[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct BitIdx<R>
+where R: BitRegister
+{
+	/// Semantic index counter within a register, constrained to `0 .. R::BITS`.
+	idx: u8,
+	/// Marker for the indexed type.
+	_ty: PhantomData<R>,
+}
+
+impl<R> BitIdx<R>
+where R: BitRegister
+{
+	/// The inclusive-maximum index.
+	pub(crate) const LAST: Self = make!(idx R::MASK);
+	/// The zero index.
+	pub(crate) const ZERO: Self = make!(idx 0);
+
+	/// Wraps a counter value as a known-good index into an `R` register.
+	///
+	/// # Parameters
+	///
+	/// - `idx`: A semantic index of a bit within an `R` register.
+	///
+	/// # Returns
+	///
+	/// If `idx` is outside the valid range `0 .. R::BITS`, this returns `None`;
+	/// otherwise, it returns a `BitIdx` wrapping the `idx` value.
+	#[inline]
+	#[doc(hidden)]
+	pub(crate) fn new(idx: u8) -> Option<Self> {
+		if idx >= R::BITS {
+			return None;
+		}
+		Some(make!(idx idx))
+	}
+
+	/// Wraps a counter value as an assumed-good index into an `R` register.
+	///
+	/// # Parameters
+	///
+	/// - `idx`: A semantic index of a bit within an `R` register.
+	///
+	/// # Returns
+	///
+	/// `idx` wrapped in a `BitIdx`.
+	///
+	/// # Safety
+	///
+	/// `idx` **must** be within the valid range `0 .. R::BITS`. In debug
+	/// builds, invalid `idx` values cause a panic; release builds do not check
+	/// the input.
+	#[inline]
+	#[doc(hidden)]
+	pub unsafe fn new_unchecked(idx: u8) -> Self {
+		debug_assert!(
+			idx < R::BITS,
+			"Bit index {} cannot exceed type width {}",
+			idx,
+			R::BITS
+		);
+		make!(idx idx)
+	}
+
+	/// Increments an index counter, wrapping at the back edge of the register.
+	///
+	/// # Parameters
+	///
+	/// - `self`: The index to increment.
+	///
+	/// # Returns
+	///
+	/// - `.0`: The next index after `self`.
+	/// - `.1`: Indicates that the new index is in the next register.
+	#[inline]
+	pub(crate) fn incr(self) -> (Self, bool) {
+		let next = self.idx + 1;
+		(make!(idx next & R::MASK), next == R::BITS)
+	}
+
+	/// Decrements an index counter, wrapping at the front edge of the register.
+	///
+	/// # Parameters
+	///
+	/// - `self`: The inedx to decrement.
+	///
+	/// # Returns
+	///
+	/// - `.0`: The previous index before `self`.
+	/// - `.1`: Indicates that the new index is in the previous register.
+	#[inline]
+	pub(crate) fn decr(self) -> (Self, bool) {
+		let next = self.idx.wrapping_sub(1);
+		(make!(idx next & R::MASK), self.idx == 0)
+	}
+
+	/// Computes the bit position corresponding to `self` under some ordering.
+	///
+	/// This forwards to `O::at::<R>`, and is the only public, safe, constructor
+	/// for a position counter.
+	#[inline(always)]
+	pub fn position<O>(self) -> BitPos<R>
+	where O: BitOrder {
+		O::at::<R>(self)
+	}
+
+	/// Computes the bit selector corresponding to `self` under an ordering.
+	///
+	/// This forwards to `O::select::<R>`, and is the only public, safe,
+	/// constructor for a bit selector.
+	#[inline(always)]
+	pub fn select<O>(self) -> BitSel<R>
+	where O: BitOrder {
+		O::select::<R>(self)
+	}
+
+	/// Computes the bit selector for `self` as an accessor mask.
+	///
+	/// This is a type-cast over `Self::select`. It is one of the few public,
+	/// safe, constructors of a multi-bit mask.
+	#[inline]
+	pub fn mask<O>(self) -> BitMask<R>
+	where O: BitOrder {
+		self.select::<O>().mask()
+	}
+
+	/// Views the internal index value.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn value(self) -> u8 {
+		self.idx
+	}
+
+	/// Ranges over all possible index values.
+	#[inline]
+	pub(crate) fn range_all() -> impl Iterator<Item = Self>
+	+ DoubleEndedIterator
+	+ ExactSizeIterator
+	+ FusedIterator {
+		(Self::ZERO.idx ..= Self::LAST.idx).map(|val| make!(idx val))
+	}
+
+	/// Constructs a range over all indices between a start and end point.
+	///
+	/// Because implementation details of the `RangeOps` family are not yet
+	/// stable, and heterogenous ranges are not supported, this must be an
+	/// opaque iterator rather than a direct `Range<BitIdx<R>>`.
+	///
+	/// # Parameters
+	///
+	/// - `from`: The inclusive low bound of the range. This will be the first
+	///   index produced by the iterator.
+	/// - `upto`: The exclusive high bound of the range. The iterator will halt
+	///   before yielding an index of this value.
+	///
+	/// # Returns
+	///
+	/// An opaque iterator that is equivalent to the range `from .. upto`.
+	///
+	/// # Requirements
+	///
+	/// `from` must be no greater than `upto`.
+	#[inline]
+	pub fn range(
+		from: Self,
+		upto: BitTail<R>,
+	) -> impl Iterator<Item = Self>
+	+ DoubleEndedIterator
+	+ ExactSizeIterator
+	+ FusedIterator
+	{
+		debug_assert!(
+			from.value() <= upto.value(),
+			"Ranges must run from low to high"
+		);
+		(from.value() .. upto.value()).map(|val| make!(idx val))
+	}
+
+	/// Computes the the jump distance for a number of bits away from a start.
+	///
+	/// This produces the number of elements to move from the starting point,
+	/// and then the bit index of the destination bit in the destination
+	/// element.
+	///
+	/// # Parameters
+	///
+	/// - `self`: A bit index in some memory element, used as the starting
+	///   position for the offset calculation.
+	/// - `by`: The number of bits by which to move. Negative values go towards
+	///   the zero bit index and element address; positive values go towards the
+	///   maximal bit index and element address.
+	///
+	/// # Returns
+	///
+	/// - `.0`: The number of elements by which to offset the caller’s element
+	///   address. This value can be passed directly into [`ptr::offset`].
+	/// - `.1`: The bit index of the destination bit in the element selected by
+	///   applying the `.0` pointer offset.
+	///
+	/// [`ptr::offset`]: https://doc.rust-lang.org/std/primitive.pointer.html#method.offset
+	#[inline]
+	pub(crate) fn offset(self, by: isize) -> (isize, Self) {
+		let val = self.value();
+
+		/* Signed-add `*self` and the jump distance. Overflowing is the unlikely
+		branch. The result is a bit index, and an overflow marker. `far` is
+		permitted to be negative; this means that it is lower in memory than the
+		origin bit. The number line has its origin at the front edge of the
+		origin element, so `-1` is the *last* bit of the prior memory element.
+		*/
+		let (far, ovf) = by.overflowing_add(val as isize);
+		//  If the `isize` addition does not overflow, then the sum can be used
+		//  directly.
+		if !ovf {
+			//  If `far` is in the origin element, then the jump moves zero
+			//  elements and produces `far` as an absolute index directly.
+			if (0 .. R::BITS as isize).contains(&far) {
+				(0, make!(idx far as u8))
+			}
+			/* Otherwise, downshift the bit distance to compute the number of
+			elements moved in either direction, and mask to compute the absolute
+			bit index in the destination element.
+			*/
+			else {
+				(far >> R::INDX, make!(idx far as u8 & R::MASK))
+			}
+		}
+		else {
+			/* Overflowing `isize` addition happens to produce ordinary `usize`
+			addition. In point of fact, `isize` addition and `usize` addition
+			are the same machine instruction to perform the sum; it is merely
+			the signed interpretation of the sum that differs. The sum can be
+			recast back to `usize` without issue.
+			*/
+			let far = far as usize;
+			//  This is really only needed in order to prevent sign-extension of
+			//  the downshift; once shifted, the value can be safely re-signed.
+			((far >> R::INDX) as isize, make!(idx far as u8 & R::MASK))
+		}
+	}
+
+	/// Computes the span information for a region beginning at `self` for `len`
+	/// bits.
+	///
+	/// The span information is the number of elements in the region that hold
+	/// live bits, and the position of the tail marker after the live bits.
+	///
+	/// This forwards to [`BitTail::span`], as the computation is identical for
+	/// the two types. Beginning a span at any `Idx` is equivalent to beginning
+	/// it at the tail of a previous span.
+	///
+	/// # Parameters
+	///
+	/// - `self`: The start bit of the span.
+	/// - `len`: The number of bits in the span.
+	///
+	/// # Returns
+	///
+	/// - `.0`: The number of elements, starting in the element that contains
+	///   `self`, that contain live bits of the span.
+	/// - `.1`: The tail counter of the span’s end point.
+	#[inline]
+	pub(crate) fn span(self, len: usize) -> (usize, BitTail<R>) {
+		make!(tail self.value()).span(len)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Binary for BitIdx<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "{:0>1$b}", self.idx, R::INDX as usize)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Debug for BitIdx<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "BitIdx<{}>(", type_name::<R>())?;
+		Display::fmt(&self.idx, fmt)?;
+		fmt.write_str(")")
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Display for BitIdx<R>
+where R: BitRegister
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Display::fmt(&self.idx, fmt)
+	}
+}
+
+/// Represents an error encountered in `TryFrom<u8> for BitIdx<R>`.
+#[repr(transparent)]
+#[cfg(feature = "serde")]
+pub struct BitIdxErr<R>
+where R: BitRegister
+{
+	/// The value that cannot be wrapped into a `BitIdx`.
+	err: u8,
+	/// The register type marker.
+	_ty: PhantomData<R>,
+}
+
+#[cfg(feature = "serde")]
+impl<R> TryFrom<u8> for BitIdx<R>
+where R: BitRegister
+{
+	type Error = BitIdxErr<R>;
+
+	#[inline]
+	fn try_from(idx: u8) -> Result<Self, Self::Error> {
+		Self::new(idx).ok_or(BitIdxErr {
+			err: idx,
+			_ty: PhantomData,
+		})
+	}
+}
+
+#[cfg(feature = "serde")]
+#[cfg(not(tarpaulin_include))]
+impl<R> Debug for BitIdxErr<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "BitIdxErr<{}>(", type_name::<R>())?;
+		Display::fmt(&self.err, fmt)?;
+		fmt.write_str(")")
+	}
+}
+
+#[cfg(feature = "serde")]
+#[cfg(not(tarpaulin_include))]
+impl<R> Display for BitIdxErr<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(
+			fmt,
+			"The value {} is too large to index into {}",
+			self.err,
+			core::any::type_name::<R>()
+		)
+	}
+}
+
+#[cfg(all(feature = "serde", feature = "std"))]
+#[cfg(not(tarpaulin_include))]
+impl<R> std::error::Error for BitIdxErr<R> where R: BitRegister
+{
+}
+
+/** Semantic index of a dead bit *after* a live region.
+
+Like `BitIdx<R>`, this type indicates a semantic counter within a register `R`.
+However, it marks the position of a *dead* bit *after* a live range. This means
+that it is permitted to have the value of `R::BITS`, to indicate that a live
+region touches the semantic back edge of the register `R`.
+
+Instances of this type will only contain the value `0` when the span that
+created them is empty. Otherwise, they will have the range `1 ..= R::BITS`.
+
+This type cannot be used for indexing into a register `R`, and does not
+translate to a `BitPos<R>`. It has no behavior other than viewing its internal
+counter for region arithmetic.
+
+# Type Parameters
+
+- `R`: The register type that these values govern.
+
+# Validity
+
+Values of this type are required to be in the range `0 ..= R::BITS`. Any value
+outside this range will cause the program state to become invalid, and the
+library’s behavior is unspecified. The library will never produce such an
+invalid value.
+
+# Construction
+
+This type cannot be directly constructed outside the `bitvec` crate. `bitvec`
+will construct safe values of this type, and allows users to view them and use
+them for region computation. All values of this type constructed by `bitvec` are
+known to be correct based on user input to the crate.
+**/
+// #[rustc_layout_scalar_valid_range_end(R::BITS + 1)]
+#[repr(transparent)]
+#[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct BitTail<R>
+where R: BitRegister
+{
+	/// Semantic tail counter of a register, constrained to `0 ..= R::BITS`.
+	end: u8,
+	/// Marker for the tailed type.
+	_ty: PhantomData<R>,
+}
+
+impl<R> BitTail<R>
+where R: BitRegister
+{
+	/// The inclusive-maximum tail counter.
+	pub(crate) const END: Self = make!(tail R::BITS);
+	/// The zero tail.
+	pub(crate) const ZERO: Self = make!(tail 0);
+
+	/// Wraps a counter value as an assumed-good tail of an `R` register.
+	///
+	/// # Parameters
+	///
+	/// - `end`: A semantic index of a dead bit in or after an `R` register.
+	///
+	/// # Returns
+	///
+	/// `end` wrapped in a `BitTail`.
+	///
+	/// # Safety
+	///
+	/// `end` **must** be within the valid range `0 ..= R::BITS`. In debug
+	/// builds, invalid `end` values cause a panic; release builds do not check
+	/// the input.
+	#[inline]
+	pub(crate) unsafe fn new_unchecked(end: u8) -> Self {
+		debug_assert!(
+			end <= R::BITS,
+			"Bit tail {} cannot exceed type width {}",
+			end,
+			R::BITS
+		);
+		make!(tail end)
+	}
+
+	/// Views the internal tail value.
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn value(self) -> u8 {
+		self.end
+	}
+
+	/// Ranges over all valid tails for a starting index.
+	#[inline]
+	#[cfg(test)]
+	pub(crate) fn range_from(
+		start: BitIdx<R>,
+	) -> impl Iterator<Item = Self>
+	+ DoubleEndedIterator
+	+ ExactSizeIterator
+	+ FusedIterator {
+		(start.idx ..= Self::END.end).map(|val| make!(tail val))
+	}
+
+	/// Computes span information for a region beginning immediately after a
+	/// preceding region.
+	///
+	/// The computed region of `len` bits has its start at the *live* bit that
+	/// corresponds to the `self` dead tail. The return value is the number of
+	/// memory elements containing live bits of the computed span and its tail
+	/// marker.
+	///
+	/// # Parameters
+	///
+	/// - `self`
+	/// - `len`: The number of live bits in the span starting after `self`.
+	///
+	/// # Returns
+	///
+	/// - `.0`: The number of elements `R` that contain live bits in the
+	///   computed region.
+	/// - `.1`: The tail counter of the first dead bit after the new span.
+	///
+	/// # Behavior
+	///
+	/// If `len` is `0`, this returns `(0, self)`, as the span has no live bits.
+	/// If `self` is `BitTail::END`, then the new region starts at
+	/// `BitIdx::ZERO` in the next element.
+	pub(crate) fn span(self, len: usize) -> (usize, Self) {
+		if len == 0 {
+			return (0, self);
+		}
+
+		let val = self.end;
+
+		let head = val & R::MASK;
+		let bits_in_head = (R::BITS - head) as usize;
+
+		if len <= bits_in_head {
+			return (1, make!(tail head + len as u8));
+		}
+
+		let bits_after_head = len - bits_in_head;
+		let elts = bits_after_head >> R::INDX;
+		let tail = bits_after_head as u8 & R::MASK;
+
+		let is_zero = (tail == 0) as u8;
+		let edges = 2 - is_zero as usize;
+		(elts + edges, make!(tail(is_zero << R::INDX) | tail))
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Debug for BitTail<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "BitTail<{}>(", type_name::<R>())?;
+		Display::fmt(&self.end, fmt)?;
+		fmt.write_str(")")
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Display for BitTail<R>
+where R: BitRegister
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Display::fmt(&self.end, fmt)
+	}
+}
+
+/** An electrical position of a single bit within a register `R`.
+
+This type is used as the shift distance in the expression `1 << shamt`. It is
+only produced by the translation of a semantic `BitIdx<R>` according to some
+[`BitOrder`] implementation using `BitOrder::at`. It can only be used for the
+construction of bit masks used to manipulate a register value during memory
+access, and serves no other purpose.
+
+# Type Parameters
+
+- `R`: The register type that these values govern.
+
+# Validity
+
+Values of this type are required to be in the range `0 .. R::BITS`. Any value
+outside this range will cause the program state to become invalid, and the
+library’s behavior is unspecified. The library will never produce such an
+invalid value, and users are required to do the same.
+
+# Construction
+
+This type offers public unsafe constructors. `bitvec` does not offer any public
+APIs that take values of this type directly; it always routes through `BitOrder`
+implementations. As `BitIdx` will only be constructed from safe, correct,
+values, and `BitOrder::at` is the only `BitIdx -> BitPos` transform function,
+all constructed `BitPos` values are known to be memory-correct.
+**/
+// #[rustc_layout_scalar_valid_range_end(R::BITS)]
+#[repr(transparent)]
+#[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct BitPos<R>
+where R: BitRegister
+{
+	/// Electrical position within a register, constrained to `0 .. R::BITS`.
+	pos: u8,
+	/// Marker for the positioned type.
+	_ty: PhantomData<R>,
+}
+
+impl<R> BitPos<R>
+where R: BitRegister
+{
+	/// Wraps a value as a known-good position within an `R` register.
+	///
+	/// # Parameters
+	///
+	/// - `pos`: An electrical position of a bit within an `R` register.
+	///
+	/// # Returns
+	///
+	/// If `pos` is outside the valid range `0 .. R::BITS`, this returns `None`;
+	/// otherwise, it returns a `BitPos` wrapping the `pos` value.
+	///
+	/// # Safety
+	///
+	/// This function must only be called within a `BitOrder::at` implementation
+	/// which is verified to be correct.
+	#[inline]
+	pub unsafe fn new(pos: u8) -> Option<Self> {
+		//  Reject a position value that is not within the range `0 .. R::BITS`.
+		if pos >= R::BITS {
+			return None;
+		}
+		Some(make!(pos pos))
+	}
+
+	/// Wraps a value as an assumed-good position within an `R` register.
+	///
+	/// # Parameters
+	///
+	/// - `pos`: An electrical position within an `R` register.
+	///
+	/// # Returns
+	///
+	/// `pos` wrapped in a `BitPos`.
+	///
+	/// # Safety
+	///
+	/// `pos` **must** be within the valid range `0 .. R::BITS`. In debug
+	/// builds, invalid `pos` values cause a panic; release builds do not check
+	/// the input.
+	///
+	/// This function must only be called in a correct `BitOrder::at`
+	/// implementation.
+	#[inline]
+	pub unsafe fn new_unchecked(pos: u8) -> Self {
+		debug_assert!(
+			pos < R::BITS,
+			"Bit position {} cannot exceed type width {}",
+			pos,
+			R::BITS
+		);
+		make!(pos pos)
+	}
+
+	/// Constructs a one-hot selection mask from the position counter.
+	///
+	/// This is a well-typed `1 << pos`.
+	///
+	/// # Parameters
+	///
+	/// - `self`
+	///
+	/// # Returns
+	///
+	/// A one-hot mask for `R` selecting the bit specified by `self`.
+	#[inline]
+	pub fn select(self) -> BitSel<R> {
+		make!(sel R::ONE << self.pos)
+	}
+
+	/// Constructs an untyped bitmask from the position counter.
+	///
+	/// This removes the one-hot requirement from the selection mask.
+	///
+	/// # Parameters
+	///
+	/// - `self`
+	///
+	/// # Returns
+	///
+	/// A mask for `R` selecting only the bit specified by `self`.
+	#[inline]
+	pub fn mask(self) -> BitMask<R> {
+		make!(mask self.select().sel)
+	}
+
+	/// Views the internal position value.
+	#[inline]
+	pub fn value(self) -> u8 {
+		self.pos
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Debug for BitPos<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "BitPos<{}>(", type_name::<R>())?;
+		Display::fmt(&self.pos, fmt)?;
+		fmt.write_str(")")
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Display for BitPos<R>
+where R: BitRegister
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Display::fmt(&self.pos, fmt)
+	}
+}
+
+/** A one-hot selection mask, to be applied to a register `R`.
+
+This type selects exactly one bit, and is produced by the conversion of a
+semantic [`BitIdx`] to a [`BitPos`] through a [`BitOrder`] implementation, and
+then applying `1 << pos`. Values of this type are used to select only the bit
+specified by a `BitIdx` when performing memory operations.
+
+# Type Parameters
+
+- `R`: The register type that these values govern.
+
+# Validity
+
+Values of this type are required to have exactly one bit set to `1` and all
+other bits set to `0`.
+
+# Construction
+
+This type is only constructed from `BitPos` values, which are themselves only
+constructed by a chain of known-good `BitIdx` values passed into known-correct
+`BitOrder` implementations. As such, `bitvec` can use `BitSel` values with full
+confidence that they are correct in the surrounding context.
+**/
+#[repr(transparent)]
+#[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct BitSel<R>
+where R: BitRegister
+{
+	/// The one-hot selector mask.
+	sel: R,
+}
+
+impl<R> BitSel<R>
+where R: BitRegister
+{
+	/// Wraps a selector value as a known-good selection of an `R` register.
+	///
+	/// # Parameters
+	///
+	/// - `sel`: A one-hot selection mask of a bit in an `R` register.
+	///
+	/// # Returns
+	///
+	/// If `sel` does not have exactly one bit set, this returns `None`;
+	/// otherwise, it returns a `BitSel` wrapping the `sel` value.
+	///
+	/// # Safety
+	///
+	/// This function must only be called within a `BitOrder::select`
+	/// implementation that is verified to be correct.
+	#[inline]
+	pub unsafe fn new(sel: R) -> Option<Self> {
+		if sel.count_ones() != 1 {
+			return None;
+		}
+		Some(make!(sel sel))
+	}
+
+	/// Wraps a selector value as an assumed-good selection of an `R` register.
+	///
+	/// # Parameters
+	///
+	/// - `sel`: A one-hot selection mask of a bit in an `R` register.
+	///
+	/// # Returns
+	///
+	/// `sel` wrapped in a `BitSel`.
+	///
+	/// # Safety
+	///
+	/// `sel` **must** have exactly one bit set high and all others low. In
+	/// debug builds, invalid `sel` values cause a panic; release builds do not
+	/// check the input.
+	///
+	/// This function must only be called in a correct `BitOrder::select`
+	/// implementation.
+	#[inline]
+	pub unsafe fn new_unchecked(sel: R) -> Self {
+		debug_assert!(
+			sel.count_ones() == 1,
+			"Selections are required to have exactly one set bit: {:0>1$b}",
+			sel,
+			R::BITS as usize
+		);
+		make!(sel sel)
+	}
+
+	/// Converts the selector into a bit mask.
+	///
+	/// This is a type-cast.
+	#[inline]
+	pub fn mask(self) -> BitMask<R>
+	where R: BitRegister {
+		make!(mask self.sel)
+	}
+
+	/// Views the internal selector value.
+	#[inline]
+	pub fn value(self) -> R {
+		self.sel
+	}
+
+	/// Ranges over all possible selector values.
+	pub fn range_all() -> impl Iterator<Item = Self>
+	+ DoubleEndedIterator
+	+ ExactSizeIterator
+	+ FusedIterator {
+		BitIdx::<R>::range_all().map(|i| make!(pos i.idx).select())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Binary for BitSel<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "{:0>1$b}", self.sel, R::BITS as usize)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Debug for BitSel<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "BitSel<{}>(", type_name::<R>())?;
+		Binary::fmt(&self, fmt)?;
+		fmt.write_str(")")
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Display for BitSel<R>
+where R: BitRegister
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Display::fmt(&self.sel, fmt)
+	}
+}
+
+/** A multi-bit selection mask.
+
+Unlike [`BitSel`], which enforces a strict one-hot mask encoding, this mask type
+permits any number of bits to be set or unset. This is used to accumulate
+selections for a batch operation on a register.
+
+# Construction
+
+It is only constructed by accumulating `BitSel` values. The chain of custody for
+safe construction in this module and in `order` ensures that all masks that are
+applied to register values can be trusted to not cause memory unsafety.
+**/
+#[repr(transparent)]
+#[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct BitMask<R>
+where R: BitRegister
+{
+	/// A mask of any number of bits to select.
+	mask: R,
+}
+
+impl<R> BitMask<R>
+where R: BitRegister
+{
+	/// A full mask.
+	pub const ALL: Self = make!(mask R::ALL);
+	/// An empty mask.
+	pub const ZERO: Self = make!(mask R::ZERO);
+
+	/// Wraps any `R` value as a bit-mask.
+	///
+	/// This constructor is provided to explicitly declare that an operation is
+	/// discarding the numeric value of an integer and reading it only as a
+	/// bit-mask.
+	///
+	/// # Parameters
+	///
+	/// - `mask`: Some integer value
+	///
+	/// # Returns
+	///
+	/// `mask` wrapped as a bit-mask, with its numeric context discarded.
+	///
+	/// # Safety
+	///
+	/// This function must only be called within a `BitOrder::mask`
+	/// implementation which is verified to be correct.
+	///
+	/// Prefer accumulating `BitSel` values using the `Sum` implementation.
+	#[inline]
+	pub unsafe fn new(mask: R) -> Self {
+		make!(mask mask)
+	}
+
+	/// Creates a new mask with a selector bit activated.
+	///
+	/// # Parameters
+	///
+	/// - `self`
+	/// - `sel`: The selector bit to activate in the new mask.
+	///
+	/// # Returns
+	///
+	/// A copy of `self`, with the selector at `sel` activated.
+	#[inline]
+	pub fn combine(mut self, sel: BitSel<R>) -> Self {
+		self.insert(sel);
+		self
+	}
+
+	/// Inserts a selector into an existing mask.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `sel`: The selector bit to insert into the mask.
+	///
+	/// # Effects
+	///
+	/// The selector’s bit in the `self` mask is activated.
+	#[inline]
+	pub fn insert(&mut self, sel: BitSel<R>) {
+		self.mask |= sel.sel;
+	}
+
+	/// Tests whether a mask contains a given selector bit.
+	///
+	/// # Paramters
+	///
+	/// - `self`
+	/// - `sel`: The selector bit to test in the `self` mask.
+	///
+	/// # Returns
+	///
+	/// Whether `self` has set the bit at `sel`.
+	#[inline]
+	pub fn test(self, sel: BitSel<R>) -> bool {
+		self.mask & sel.sel != R::ZERO
+	}
+
+	/// Views the internal mask value.
+	#[inline]
+	pub fn value(self) -> R {
+		self.mask
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Binary for BitMask<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "{:0>1$b}", self.mask, R::BITS as usize)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Debug for BitMask<R>
+where R: BitRegister
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "BitMask<{}>(", type_name::<R>())?;
+		Binary::fmt(&self, fmt)?;
+		fmt.write_str(")")
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<R> Display for BitMask<R>
+where R: BitRegister
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Display::fmt(&self.mask, fmt)
+	}
+}
+
+impl<R> Sum<BitSel<R>> for BitMask<R>
+where R: BitRegister
+{
+	fn sum<I>(iter: I) -> Self
+	where I: Iterator<Item = BitSel<R>> {
+		iter.fold(Self::ZERO, Self::combine)
+	}
+}
+
+impl<R> BitAnd<R> for BitMask<R>
+where R: BitRegister
+{
+	type Output = Self;
+
+	fn bitand(self, rhs: R) -> Self {
+		make!(mask self.mask & rhs)
+	}
+}
+
+impl<R> BitOr<R> for BitMask<R>
+where R: BitRegister
+{
+	type Output = Self;
+
+	fn bitor(self, rhs: R) -> Self {
+		make!(mask self.mask | rhs)
+	}
+}
+
+impl<R> Not for BitMask<R>
+where R: BitRegister
+{
+	type Output = Self;
+
+	fn not(self) -> Self::Output {
+		make!(mask !self.mask)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::order::{
+		Lsb0,
+		Msb0,
+	};
+
+	#[test]
+	fn index_fns() {
+		assert!(BitIdx::<u8>::new(8).is_none());
+
+		for n in 0 .. 8 {
+			assert_eq!(
+				BitIdx::<u8>::new(n).unwrap().position::<Lsb0>().value(),
+				n
+			);
+		}
+
+		for n in 0 .. 8 {
+			assert_eq!(
+				BitIdx::<u8>::new(n).unwrap().position::<Msb0>().value(),
+				7 - n
+			);
+		}
+
+		for n in 0 .. 8 {
+			assert_eq!(
+				BitIdx::<u8>::new(n).unwrap().mask::<Lsb0>().value(),
+				1 << n
+			);
+		}
+
+		for n in 0 .. 8 {
+			assert_eq!(
+				BitIdx::<u8>::new(n).unwrap().mask::<Msb0>().value(),
+				128 >> n
+			);
+		}
+
+		for n in 0 .. 8 {
+			assert_eq!(BitIdx::<u8>::new(n).unwrap().value(), n);
+		}
+	}
+
+	#[test]
+	fn tail_fns() {
+		for n in 0 .. 8 {
+			let tail: BitTail<u8> = make!(tail n);
+			assert_eq!(tail.value(), n);
+		}
+	}
+
+	#[test]
+	fn position_fns() {
+		assert!(unsafe { BitPos::<u8>::new(8) }.is_none());
+
+		for n in 0 .. 8 {
+			let pos: BitPos<u8> = make!(pos n);
+			let mask: BitMask<u8> = make!(mask 1 << n);
+			assert_eq!(pos.mask(), mask);
+		}
+	}
+
+	#[test]
+	fn select_fns() {
+		assert!(unsafe { BitSel::<u8>::new(1) }.is_some());
+		assert!(unsafe { BitSel::<u8>::new(3) }.is_none());
+
+		for (n, sel) in BitSel::<u8>::range_all().enumerate() {
+			assert_eq!(sel, make!(sel(1 << n) as u8));
+		}
+	}
+
+	#[test]
+	fn fold_masks() {
+		assert_eq!(
+			BitSel::<u8>::range_all()
+				.map(BitSel::mask)
+				.fold(BitMask::<u8>::ZERO, |accum, mask| accum | mask.value()),
+			BitMask::<u8>::ALL
+		);
+
+		assert_eq!(!BitMask::<u8>::ALL, BitMask::ZERO);
+	}
+
+	#[test]
+	fn offset() {
+		let (elts, idx) =
+			BitIdx::<u32>::new(31).unwrap().offset(isize::max_value());
+		assert_eq!(elts, (isize::max_value() >> 5) + 1);
+		assert_eq!(idx, BitIdx::new(30).unwrap());
+	}
+
+	#[test]
+	fn span() {
+		let start: BitTail<u8> = make!(tail 4);
+		assert_eq!(start.span(0), (0, start));
+
+		assert_eq!(start.span(4), (1, make!(tail 8)));
+		assert_eq!(start.span(8), (2, start));
+	}
+
+	#[test]
+	fn walk() {
+		let end: BitIdx<u8> = make!(idx 7);
+		assert_eq!(end.incr(), (make!(idx 0), true));
+		assert_eq!(end.decr(), (make!(idx 6), false));
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,184 @@
+/*! # Addressable Bits
+
+`bitvec` is a foundation library for memory compaction techniques that rely on
+viewing memory as bit-addressed rather than byte-addressed.
+
+The `bitvec` project is designed to provide a comprehensive set of tools for
+users who need memory compaction, with as low a cost as possible.
+
+# Usage
+
+`bitvec` provides data structures that specialize the major sequence types in
+the standard library:
+
+- `[bool]` becomes [`BitSlice`]
+- `[bool; N]` becomes [`BitArray`]
+- `Box<[bool]>` becomes [`BitBox`]
+- `Vec<bool>` becomes [`BitVec`]
+
+You can start using the crate in an existing codebase by replacing types and
+chasing compiler errors from there.
+
+As an example,
+
+```rust
+# #[cfg(feature = "alloc")] {
+let mut io_buf: Vec<u8> = Vec::new();
+io_buf.extend(&[0x47, 0xA5]);
+
+let mut stats: Vec<bool> = Vec::new();
+stats.extend(&[true, false, true, true, false, false, true, false]);
+# }
+```
+
+would become
+
+```rust
+# #[cfg(feature = "alloc")] {
+use bitvec::prelude::*;
+
+let mut io_buf = bitvec![Msb0, u8; 0; 16];
+io_buf[.. 4].store(4u8);
+io_buf[4 .. 8].store(7u8);
+io_buf[8 .. 16].store(0xA5u8);
+
+let mut stats: BitVec = BitVec::new();
+stats.extend(&[true, false, true, true, false, false, true, false]);
+# }
+```
+
+# Capabilities
+
+`bitvec` stands out from other bit-vector libraries, both in Rust and in other
+languages, in a few significant ways.
+
+Unlike other Rust libraries, `bitvec` stores its information in pointers to
+memory regions, rather than in the region directly. By using its own pointer
+encoding scheme, it can use references `&BitSlice` and `&mut BitSlice` to manage
+memory and fit seamlessly into the Rust language rules and API signatures.
+
+Unlike *any* other bit-sequence system, `bitvec` enables users to specify the
+register element type used to store data, and the ordering of bits within those
+elements. This sidesteps the problems found in C [bitfields], C++
+[`std::bitset`], Python [`bitstring`], Erlang [`bitstream`], and Rust libraries
+such as [`bit-vec`].
+
+By permitting the in-memory layout to be specified by the user, rather than
+within the library, users are able to have the behavior characteristics they
+want without effort or workarounds.
+
+This works by suppling two type parameters: `O: BitOrder` specifies the ordering
+of bits within a register element, and `T: BitStore` specifies which register
+element is used to store bits. `T` is restricted to be only the unsigned
+integers, and `Cell` or `Atomic` variants of them.
+
+`bitvec` correctly handles memory aliasing by leveraging the type system to mark
+regions that have become subject to concurrency and either force the use of
+atomic memory accesses or forbid simultaneous multiprocessing. You will never
+need to insert your own guards to prevent race conditions, and [`BitSlice`]
+provides APIs to separate any slice into its aliased and unaliased sub-regions.
+
+# Library Structure
+
+You should generally import the library prelude, with
+
+```rust
+use bitvec::prelude::*;
+```
+
+The prelude contains all the symbols you will need to make use of the crate.
+Almost all begin with the prefix `Bit`; only the orderings `Lsb0` and `Msb0` do
+not. This will reduce the likelihood of name collisions. See the prelude module
+documentation for more detail on which symbols are imported, and how you can
+more precisely control this.
+
+Each major component in the library is divided into its own module. This
+includes each data structure and trait, as well as utility objects used for
+implementation. The data structures that mirror the language distribution have
+submodules for each part of their mirroring: `api` ports inherent methods,
+`iter` contains iteration logic, `ops` operator overrides, and `traits` all
+other trait implementations.The data structure’s own module only contains its
+own definition and its inherent methods that are not ports of the standard
+libraries.
+
+# Usage
+
+As a replacement for `bool` data structures, you should be able to replace old
+type definition and value construction sites with their corresponding items from
+this crate, and the rest of your project should just work with the new types.
+
+To use `bitvec` for bitfields, use [`BitArray`] or [`BitVec`] to manage your data
+buffers (compile-time static and run-time dynamic, respectively), and the
+[`BitField`] trait to manage transferring values into and out of them.
+
+The [`BitSlice`] type contains most of the methods and trait implementations used
+to interact with the *contents* of a memory buffer. [`BitVec`] adds methods for
+operating on allocations, and specializes [`BitSlice`] methods that can take
+advantage of owned buffers.
+
+The `domain` module, whose types are accessed by the `.{bit_,}domain{,_mut}`
+methods on [`BitSlice`], allows users to split their views of memory on aliasing
+boundaries, removing synchronization where provably safe.
+
+There are many ways to construct a bit-level view of data. The [`BitArray`],
+`BitBox`, and [`BitVec`] types are all owning types that contain a buffer of
+memory and dereference to [`BitSlice`] in order to view it. In addition, you can
+borrow any piece of ordinary Rust memory as a [`BitSlice`] view using its
+borrowing constructor functions, and the [`BitView`] trait methods.
+
+# Examples
+
+See the `examples/` directory of the project repository for detailed examples,
+or the type documentation for introductory samples.
+
+[`BitArray`]: array/struct.BitArray.html
+[`BitBox`]: boxed/struct.BitBox.html
+[`BitField`]: field/trait.BitField.html
+[`BitSlice`]: slice/struct.BitSlice.html
+[`BitVec`]: vec/struct.BitVec.html
+[`BitView`]: view/trait.BitView.html
+[`bitstream`]: https://erlang.org/doc/programming_examples/bit_syntax.html
+[`bitstring`]: https://pypi.org/project/bitstring/
+[`bit-vec`]: https://crates.io/crates/bit-vec
+[`std::bitset`]: https://en.cppreference.com/w/cpp/utility/bitset
+[bitfields]: https://en.cppreference.com/w/c/language/bit_field
+!*/
+
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(debug_assertions, warn(missing_docs))]
+#![cfg_attr(not(debug_assertions), deny(missing_docs))]
+#![deny(unconditional_recursion)]
+
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+#[macro_use]
+pub mod macros;
+
+mod access;
+pub mod array;
+pub mod domain;
+pub mod field;
+pub mod index;
+pub mod mem;
+pub mod order;
+mod pointer;
+pub mod prelude;
+pub mod slice;
+pub mod store;
+pub mod view;
+
+#[cfg(feature = "alloc")]
+pub mod boxed;
+
+#[cfg(feature = "alloc")]
+pub mod vec;
+
+#[cfg(not(feature = "devel"))]
+mod devel;
+
+#[cfg(feature = "devel")]
+pub mod devel;
+
+#[cfg(feature = "serde")]
+mod serdes;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/macros/internal.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/macros/internal.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/macros/internal.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/macros/internal.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,378 @@
+/*! Internal implementation macros for the public exports.
+
+The macros in this module are required to be exported from the crate, as the
+public macros will call them from client contexts (`macro_rules!` expansion
+bodies are not in source crate scope, as they are token expansion rather than
+symbolic calls). However, they are not part of the public *API* of the crate,
+and are not intended for use anywhere but in the expansion bodies of the
+public-API constructor macros.
+!*/
+
+#![doc(hidden)]
+
+/** Accumulates a stream of bit expressions into a compacted array of elements.
+
+This macro constructs a well-ordered `[T; N]` array expression usable in `const`
+contexts. Callers may then use that expression as the source slice over which to
+construct `bitvec` types.
+**/
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __bits_store_array {
+	//  Reroute `usize` to the correct concrete type, and mark the alias.
+	//  The `@ usz` causes `as usize` to be appended to exprs as needed.
+	($order:tt, usize; $($val:expr),*) => {{
+		const LEN: usize = $crate::__count_elts!(usize; $($val),*);
+
+		//  Attributes are not currently allowed on expressions, only items and
+		//  statements, so the routing here must bind to a name.
+		#[cfg(target_pointer_width = "32")]
+		const OUT: [usize; LEN] = $crate::__bits_store_array!(
+			$order, u32 @ usz; $($val),*
+		);
+
+		#[cfg(target_pointer_width = "64")]
+		const OUT: [usize; LEN] = $crate::__bits_store_array!(
+			$order, u64 @ usz; $($val),*
+		);
+
+		OUT
+	}};
+	// Entry point.
+	($order:tt, $store:ident $(@ $usz:ident )?; $($val:expr),*) => {
+		$crate::__bits_store_array!(
+			 $order, $store $(@ $usz)?, []; $($val,)*
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 16
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 32
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 48
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0  // 64
+		);
+	};
+
+	/* NOTE: These have to be first. They (ab)use a quirk of `macro_rules!`
+	where `:expr` captures are considered a single `:tt` after being matched.
+	Even if the `:expr` matcher was a literal `0`, after being wrapped by the
+	`:expr` fragment, it is no longer considered to match a literal `0`, so
+	these patterns will only match the extra padding `0`s added at the end.
+
+	Once the user-provided `$val` expressions are all consumed, the remaining
+	`0` tokens inserted by the arm above are all removed, ensuring that the
+	produced array has no wasted elements.
+	*/
+	($order:tt, $store:ident @ usz, [$( ($($elt:tt),*) )*]; $(0),*) => {
+		[$(
+			$crate::__elt_from_bits!($order, $store; $($elt),*) as usize
+		),*]
+	};
+	($order:tt, $store:ident, [$( ($($elt:tt),*) )*]; $(0),*) => {
+		[$(
+			$crate::__elt_from_bits!($order, $store; $($elt),*)
+		),*]
+	};
+
+	// Matchers for each size of word. The end of the word may be padded out
+	// with `0`s.
+	(
+		$order:tt, u8 $(@ $usz:ident)?, [$($w:tt)*];
+		$a0:tt, $b0:tt, $c0:tt, $d0:tt, $e0:tt, $f0:tt, $g0:tt, $h0:tt
+		$(, $($t:tt)*)?
+	) => {
+		$crate::__bits_store_array!(
+			$order, u8 $(@ $usz)?, [$($w)* (
+				$a0, $b0, $c0, $d0, $e0, $f0, $g0, $h0
+			)];
+			$($($t)*)?
+		)
+	};
+	(
+		$order:tt, u16 $(@ $usz:ident)?, [$($w:tt)*];
+		$a0:tt, $b0:tt, $c0:tt, $d0:tt, $e0:tt, $f0:tt, $g0:tt, $h0:tt,
+		$a1:tt, $b1:tt, $c1:tt, $d1:tt, $e1:tt, $f1:tt, $g1:tt, $h1:tt
+		$(, $($t:tt)*)?
+	) => {
+		$crate::__bits_store_array!(
+			$order, u16 $(@ $usz)?, [$($w)* (
+				$a0, $b0, $c0, $d0, $e0, $f0, $g0, $h0,
+				$a1, $b1, $c1, $d1, $e1, $f1, $g1, $h1
+			)];
+			$($($t)*)?
+		)
+	};
+	(
+		$order:tt, u32 $(@ $usz:ident)?, [$($w:tt)*];
+		$a0:tt, $b0:tt, $c0:tt, $d0:tt, $e0:tt, $f0:tt, $g0:tt, $h0:tt,
+		$a1:tt, $b1:tt, $c1:tt, $d1:tt, $e1:tt, $f1:tt, $g1:tt, $h1:tt,
+		$a2:tt, $b2:tt, $c2:tt, $d2:tt, $e2:tt, $f2:tt, $g2:tt, $h2:tt,
+		$a3:tt, $b3:tt, $c3:tt, $d3:tt, $e3:tt, $f3:tt, $g3:tt, $h3:tt
+		$(, $($t:tt)*)?
+	) => {
+		$crate::__bits_store_array!(
+			$order, u32 $(@ $usz)?, [$($w)* (
+				$a0, $b0, $c0, $d0, $e0, $f0, $g0, $h0,
+				$a1, $b1, $c1, $d1, $e1, $f1, $g1, $h1,
+				$a2, $b2, $c2, $d2, $e2, $f2, $g2, $h2,
+				$a3, $b3, $c3, $d3, $e3, $f3, $g3, $h3
+			)];
+			$($($t)*)?
+		)
+	};
+	(
+		$order:tt, u64 $(@ $usz:ident)?, [$($w:tt)*];
+		$a0:tt, $b0:tt, $c0:tt, $d0:tt, $e0:tt, $f0:tt, $g0:tt, $h0:tt,
+		$a1:tt, $b1:tt, $c1:tt, $d1:tt, $e1:tt, $f1:tt, $g1:tt, $h1:tt,
+		$a2:tt, $b2:tt, $c2:tt, $d2:tt, $e2:tt, $f2:tt, $g2:tt, $h2:tt,
+		$a3:tt, $b3:tt, $c3:tt, $d3:tt, $e3:tt, $f3:tt, $g3:tt, $h3:tt,
+		$a4:tt, $b4:tt, $c4:tt, $d4:tt, $e4:tt, $f4:tt, $g4:tt, $h4:tt,
+		$a5:tt, $b5:tt, $c5:tt, $d5:tt, $e5:tt, $f5:tt, $g5:tt, $h5:tt,
+		$a6:tt, $b6:tt, $c6:tt, $d6:tt, $e6:tt, $f6:tt, $g6:tt, $h6:tt,
+		$a7:tt, $b7:tt, $c7:tt, $d7:tt, $e7:tt, $f7:tt, $g7:tt, $h7:tt
+		$(, $($t:tt)*)?
+	) => {
+		$crate::__bits_store_array!(
+			$order, u64 $(@ $usz)?, [$($w)* (
+				$a0, $b0, $c0, $d0, $e0, $f0, $g0, $h0,
+				$a1, $b1, $c1, $d1, $e1, $f1, $g1, $h1,
+				$a2, $b2, $c2, $d2, $e2, $f2, $g2, $h2,
+				$a3, $b3, $c3, $d3, $e3, $f3, $g3, $h3,
+				$a4, $b4, $c4, $d4, $e4, $f4, $g4, $h4,
+				$a5, $b5, $c5, $d5, $e5, $f5, $g5, $h5,
+				$a6, $b6, $c6, $d6, $e6, $f6, $g6, $h6,
+				$a7, $b7, $c7, $d7, $e7, $f7, $g7, $h7
+			)];
+			$($($t)*)?
+		)
+	};
+}
+
+/// Counts the number of repetitions inside a `$()*` sequence.
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __count {
+	(@ $val:expr) => { 1 };
+	($($val:expr),*) => {{
+		/* Clippy warns that `.. EXPR + 1`, for any value of `EXPR`, should be
+		replaced with `..= EXPR`. This means that `.. $crate::__count!` raises
+		the lint, causing `bits![(val,)…]` to have an unfixable lint warning.
+		By binding to a `const`, then returning the `const`, this syntax
+		construction is avoided as macros only expand to
+		`.. { const LEN = …; LEN }` rather than `.. 0 (+ 1)…`.
+		*/
+		const LEN: usize = 0usize $(+ $crate::__count!(@ $val))*;
+		LEN
+	}};
+}
+
+/// Counts the number of elements needed to store a number of bits.
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __count_elts {
+	($t:ident; $($val:expr),*) => {{
+		$crate::mem::elts::<$t>($crate::__count!($($val),*))
+	}};
+}
+
+/// Construct a `T` element from an array of `u8`.
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __elt_from_bits {
+	//  Known orderings can be performed immediately.
+	(
+		Lsb0, $store:ident;
+		$(
+			$a:expr, $b:expr, $c:expr, $d:expr,
+			$e:expr, $f:expr, $g:expr, $h:expr
+		),*
+	) => {
+		$crate::__ty_from_bytes!(
+			Lsb0, $store, [$($crate::macros::internal::u8_from_le_bits(
+				$a != 0, $b != 0, $c != 0, $d != 0,
+				$e != 0, $f != 0, $g != 0, $h != 0,
+			)),*]
+		)
+	};
+	(
+		Msb0, $store:ident;
+		$(
+			$a:expr, $b:expr, $c:expr, $d:expr,
+			$e:expr, $f:expr, $g:expr, $h:expr
+		),*
+	) => {
+		$crate::__ty_from_bytes!(
+			Msb0, $store, [$($crate::macros::internal::u8_from_be_bits(
+				$a != 0, $b != 0, $c != 0, $d != 0,
+				$e != 0, $f != 0, $g != 0, $h != 0,
+			)),*]
+		)
+	};
+	(
+		LocalBits, $store:ident;
+		$(
+			$a:expr, $b:expr, $c:expr, $d:expr,
+			$e:expr, $f:expr, $g:expr, $h:expr
+		),*
+	) => {
+		$crate::__ty_from_bytes!(
+			LocalBits, $store, [$($crate::macros::internal::u8_from_ne_bits(
+				$a != 0, $b != 0, $c != 0, $d != 0,
+				$e != 0, $f != 0, $g != 0, $h != 0,
+			)),*]
+		)
+	};
+
+	(
+		$order:tt, $store:ident;
+		$(
+			$a:expr, $b:expr, $c:expr, $d:expr,
+			$e:expr, $f:expr, $g:expr, $h:expr
+		),*
+	) => {{
+		let mut tmp: $store = 0;
+		let _tmp_bits = BitSlice::<$order, $store>::from_element_mut(&mut tmp);
+		let mut _idx = 0;
+		$(
+			_tmp_bits.set(_idx, $a != 0); _idx += 1;
+			_tmp_bits.set(_idx, $b != 0); _idx += 1;
+			_tmp_bits.set(_idx, $c != 0); _idx += 1;
+			_tmp_bits.set(_idx, $d != 0); _idx += 1;
+			_tmp_bits.set(_idx, $e != 0); _idx += 1;
+			_tmp_bits.set(_idx, $f != 0); _idx += 1;
+			_tmp_bits.set(_idx, $g != 0); _idx += 1;
+			_tmp_bits.set(_idx, $h != 0); _idx += 1;
+		)*
+		tmp
+	}};
+}
+
+/// Extend a single bit to fill an element.
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __extend_bool {
+	($val:expr, $typ:ident) => {
+		(0 as $typ).wrapping_sub(($val != 0) as $typ)
+	};
+}
+
+/// Constructs a fundamental integer from a list of bytes.
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __ty_from_bytes {
+	(Msb0, u8, [$($byte:expr),*]) => {
+		u8::from_be_bytes([$($byte),*])
+	};
+	(Lsb0, u8, [$($byte:expr),*]) => {
+		u8::from_le_bytes([$($byte),*])
+	};
+	(LocalBits, u8, [$($byte:expr),*]) => {
+		u8::from_ne_bytes([$($byte),*])
+	};
+	(Msb0, u16, [$($byte:expr),*]) => {
+		u16::from_be_bytes([$($byte),*])
+	};
+	(Lsb0, u16, [$($byte:expr),*]) => {
+		u16::from_le_bytes([$($byte),*])
+	};
+	(LocalBits, u16, [$($byte:expr),*]) => {
+		u16::from_ne_bytes([$($byte),*])
+	};
+	(Msb0, u32, [$($byte:expr),*]) => {
+		u32::from_be_bytes([$($byte),*])
+	};
+	(Lsb0, u32, [$($byte:expr),*]) => {
+		u32::from_le_bytes([$($byte),*])
+	};
+	(LocalBits, u32, [$($byte:expr),*]) => {
+		u32::from_ne_bytes([$($byte),*])
+	};
+	(Msb0, u64, [$($byte:expr),*]) => {
+		u64::from_be_bytes([$($byte),*])
+	};
+	(Lsb0, u64, [$($byte:expr),*]) => {
+		u64::from_le_bytes([$($byte),*])
+	};
+	(LocalBits, u64, [$($byte:expr),*]) => {
+		u64::from_ne_bytes([$($byte),*])
+	};
+	(Msb0, usize, [$($byte:expr),*]) => {
+		usize::from_be_bytes([$($byte),*])
+	};
+	(Lsb0, usize, [$($byte:expr),*]) => {
+		usize::from_le_bytes([$($byte),*])
+	};
+	(LocalBits, usize, [$($byte:expr),*]) => {
+		usize::from_ne_bytes([$($byte),*])
+	};
+}
+
+/// Construct a `u8` from bits applied in Lsb0-order.
+#[allow(clippy::many_single_char_names)]
+#[allow(clippy::too_many_arguments)]
+pub const fn u8_from_le_bits(
+	a: bool,
+	b: bool,
+	c: bool,
+	d: bool,
+	e: bool,
+	f: bool,
+	g: bool,
+	h: bool,
+) -> u8
+{
+	(a as u8)
+		| ((b as u8) << 1)
+		| ((c as u8) << 2)
+		| ((d as u8) << 3)
+		| ((e as u8) << 4)
+		| ((f as u8) << 5)
+		| ((g as u8) << 6)
+		| ((h as u8) << 7)
+}
+
+/// Construct a `u8` from bits applied in Msb0-order.
+#[allow(clippy::many_single_char_names)]
+#[allow(clippy::too_many_arguments)]
+pub const fn u8_from_be_bits(
+	a: bool,
+	b: bool,
+	c: bool,
+	d: bool,
+	e: bool,
+	f: bool,
+	g: bool,
+	h: bool,
+) -> u8
+{
+	(h as u8)
+		| ((g as u8) << 1)
+		| ((f as u8) << 2)
+		| ((e as u8) << 3)
+		| ((d as u8) << 4)
+		| ((c as u8) << 5)
+		| ((b as u8) << 6)
+		| ((a as u8) << 7)
+}
+
+#[doc(hidden)]
+#[cfg(target_endian = "little")]
+pub use self::u8_from_le_bits as u8_from_ne_bits;
+
+#[doc(hidden)]
+#[cfg(target_endian = "big")]
+pub use self::u8_from_be_bits as u8_from_ne_bits;
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn byte_assembly() {
+		assert_eq!(
+			u8_from_le_bits(false, false, true, true, false, true, false, true),
+			0b1010_1100
+		);
+
+		assert_eq!(
+			u8_from_be_bits(false, false, true, true, false, true, false, true),
+			0b0011_0101
+		);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,477 @@
+//! Constructor macros for the crate’s collection types.
+
+#[macro_use]
+#[doc(hidden)]
+pub mod internal;
+
+/** Constructs a `BitSlice` handle out of a literal array in source code, like
+`vec!`.
+
+`bits!` can be invoked in a number of ways. It takes the name of a `BitOrder`
+implementation, the name of a `BitStore`-implementing core type (which can be
+any of the fundamental integers, their `Cell` wrappers, or their `Atomic`
+sibling types), and zero or more expressions which are used to build the bits.
+Each value expression corresponds to one bit. If the expression evaluates to
+`0`, it is the zero bit; otherwise, it is the `1` bit.
+
+`bits!` can be invoked with no type specifiers, a `BitOrder` specifier only, or
+both a `BitOrder` and a `BitStore` specifier. It cannot be invoked with a
+`BitStore` but no `BitOrder`, as the macro grammar is incapable of
+distinguishing between these two.
+
+In addition, a `mut` marker may be used as the first argument to produce an
+`&mut BitSlice` handle instead of a `&BitSlice` handle.
+
+Like `vec!`, `bits!` supports bit lists `[0, 1, …]` and repetition markers
+`[1; n]`.
+
+# Examples
+
+```rust
+use bitvec::prelude::*;
+
+bits![Msb0, u8; 0, 1];
+bits![mut Lsb0, u8; 0, 1,];
+bits![Msb0; 0, 1];
+bits![mut Lsb0; 0, 1,];
+bits![0, 1];
+bits![mut 0, 1,];
+bits![0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0];
+bits![Msb0, u8; 1; 5];
+bits![mut Lsb0; 0; 5];
+bits![1; 5];
+bits![mut LocalBits; 0, 1,];
+```
+**/
+#[macro_export]
+macro_rules! bits {
+	//  Sequence syntax `[bit (, bit)*]` or `[(bit ,)*]`.
+
+	//  Explicit order and store.
+
+	(mut $order:ident, $store:ident; $($val:expr),* $(,)?) => {{
+		&mut $crate::bitarr![$order, $store; $($val),*][.. $crate::__count!($($val),*)]
+	}};
+
+	/* These arms differ in `$order:ident` and `$order:path` in order to force
+	the matcher to wrap a `:path`, which is `[:tt]`, as a single opaque `:tt`
+	for propagation through the macro call. Since the literal `$order` values
+	will match as `:ident`, not `:path`, this will only ever enter for orderings
+	that the rest of the macros would not be able to inspect and special-case
+	*anyway*.
+	*/
+
+	(mut $order:path, $store:ident; $($val:expr),* $(,)?) => {{
+		&mut $crate::bitarr![$order, $store; $($val),*][.. $crate::__count!($($val),*)]
+	}};
+
+	//  Explicit order, default store.
+
+	(mut $order:ident; $($val:expr),* $(,)?) => {
+		unsafe { $crate::bits!(mut $order, usize; $($val),*) }
+	};
+
+	(mut $order:path; $($val:expr),* $(,)?) => {
+		unsafe { $crate::bits!(mut $order, usize; $($val),*) }
+	};
+
+	//  Default order and store.
+
+	(mut $($val:expr),* $(,)?) => {
+		unsafe { $crate::bits!(mut Lsb0, usize; $($val),*) }
+	};
+
+	//  Repetition syntax `[bit ; count]`.
+	//  NOTE: `count` must be a `const`, as this is a non-allocating macro.
+
+	//  Explicit order and store.
+
+	(mut $order:ident, $store:ident; $val:expr; $len:expr) => {{
+		&mut $crate::bitarr![$order, $store; $val; $len][.. $len]
+	}};
+
+	(mut $order:path, $store:ident; $val:expr; $len:expr) => {{
+		&mut $crate::bitarr![$order, $store; $val; $len][.. $len]
+	}};
+
+	//  Explicit order, default store.
+
+	(mut $order:ident; $val:expr; $len:expr) => {
+		$crate::bits!(mut $order, usize; $val; $len)
+	};
+
+	(mut $order:path; $val:expr; $len:expr) => {
+		$crate::bits!(mut $order, usize; $val; $len)
+	};
+
+	//  Default order and store.
+
+	(mut $val:expr; $len:expr) => {
+		$crate::bits!(mut Lsb0, usize; $val; $len)
+	};
+
+	//  Repeat everything from above, but now immutable.
+
+	($order:ident, $store:ident; $($val:expr),* $(,)?) => {{
+		&$crate::bitarr![$order, $store; $($val),*][.. $crate::__count!($($val),*)]
+	}};
+
+	($order:path, $store:ident; $($val:expr),* $(,)?) => {{
+		&$crate::bitarr![$order, $store; $($val),*][.. $crate::__count!($($val),*)]
+	}};
+
+	($order:ident; $($val:expr),* $(,)?) => {
+		$crate::bits!($order, usize; $($val),*)
+	};
+
+	($order:path; $($val:expr),* $(,)?) => {
+		$crate::bits!($order, usize; $($val),*)
+	};
+
+	($($val:expr),* $(,)?) => {
+		$crate::bits!(Lsb0, usize; $($val),*)
+	};
+
+	($order:ident, $store:ident; $val:expr; $len:expr) => {{
+		&$crate::bitarr![$order, $store; $val; $len][.. $len]
+	}};
+
+	($order:path, $store:ident; $val:expr; $len:expr) => {{
+		&$crate::bitarr![$order, $store; $val; $len][.. $len]
+	}};
+
+	($order:ident; $val:expr; $len:expr) => {
+		$crate::bits!($order, usize; $val; $len)
+	};
+
+	($order:path; $val:expr; $len:expr) => {
+		$crate::bits!($order, usize; $val; $len)
+	};
+
+	($val:expr; $len:expr) => {
+		$crate::bits!(Lsb0, usize; $val; $len)
+	};
+}
+
+/** Constructs a `BitArray` wrapper out of a literal array in source code, like
+`bits!`
+
+As with all macro constructors, `bitarr!` can be invoked with either a sequence
+of individual bit expressions (`expr, expr`) or a repeated bit (`expr; count`).
+Additionally, the bit-ordering and element type can be provided as optional
+prefix arguments.
+
+The produced value is of type `BitArray<O, [T; N]>`, and is subject to
+[`BitArray`]’s restricitons of element `T` length `N`. For instance, attempting
+to produce a bit array that fills more than 32 `T` elements will fail.
+
+In addition, `bitarr!` can be used to produce a type name instead of a value by
+using the syntax `bitarr!(for N [, in [O,] T])`. This syntax allows the
+production of a monomorphized `BitArray<O, V>` type that is capable of holding
+`N` bits. It can be used to type static sites such as `struct` fields and
+`const` or `static` declarations, and in these positions must specify both type
+arguments as well as the length. It can also be used to type `let`-bindings, but
+as type inference is permitted here, it is less useful in this position.
+
+# Examples
+
+```rust
+use bitvec::prelude::*;
+
+bitarr![Msb0, u8; 0, 1];
+bitarr![Msb0; 0, 1];
+bitarr![0, 1];
+bitarr![0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0];
+bitarr![Msb0, u8; 1; 5];
+bitarr![1; 5];
+```
+
+This example shows how the `for N, in O, T` syntax can be used to type locations
+that cannot use inference:
+
+```rust
+use bitvec::prelude::*;
+
+struct ContainsBitfield {
+  data: bitarr!(for 10, in Msb0, u8),
+}
+
+fn zero() -> ContainsBitfield {
+  ContainsBitfield { data: bitarr![Msb0, u8; 0; 10] }
+}
+```
+
+The order/store type parameters must be repeated in the macros to construct both
+the typename and the value. Mismatches will result in a compiler error.
+**/
+#[macro_export]
+macro_rules! bitarr {
+	//  Produces a typename instead of a value expression
+
+	(for $len:literal, in $order:path, $store:ident) => {
+		$crate::array::BitArray::<
+			$order,
+			[$store; $crate::mem::elts::<$store>($len)],
+		>
+	};
+
+	(for $len:literal, in $store:ident) => {
+		$crate::bitarr!(for $len, in $crate::order::Lsb0, usize)
+	};
+
+	(for $len:literal) => {
+		$crate::bitarr!(for $len, in usize)
+	};
+
+	//  Produces a value expression
+
+	($order:ident, $store:ident; $($val:expr),* $(,)?) => {
+		$crate::array::BitArray::<
+			$order,
+			[$store; $crate::__count_elts!($store; $($val),*)],
+		>::new(
+			$crate::__bits_store_array!($order, $store; $($val),*)
+		)
+	};
+
+	($order:path, $store:ident; $($val:expr),* $(,)?) => {
+		$crate::array::BitArray::<
+			$order,
+			[$store; $crate::__count_elts!($store; $($val),*)],
+		>::new(
+			$crate::__bits_store_array!($order, $store; $($val),*)
+		)
+	};
+
+	($order:ident; $($val:expr),* $(,)?) => {
+		$crate::bitarr!($order, usize; $($val),*)
+	};
+
+	($order:path; $($val:expr),* $(,)?) => {
+		$crate::bitarr!($order, usize; $($val),*)
+	};
+
+	($($val:expr),* $(,)?) => {
+		$crate::bitarr!(Lsb0, usize; $($val),*)
+	};
+
+	($order:ident, $store:ident; $val:expr; $len:expr) => {
+		$crate::array::BitArray::<
+			$order,
+			[$store; $crate::mem::elts::<$store>($len)],
+		>::new([
+			$crate::__extend_bool!($val, $store);
+			$crate::mem::elts::<$store>($len)
+		])
+	};
+
+	($order:path, $store:ident; $val:expr; $len:expr) => {
+		$crate::array::BitArray::<
+			$order,
+			[$store; $crate::mem::elts::<$store>($len)],
+		>::new([
+			$crate::__extend_bool!($val, $store);
+			$crate::mem::elts::<$store>($len)
+		])
+	};
+
+	($order:ident; $val:expr; $len:expr) => {
+		$crate::bitarr!($order, usize; $val; $len)
+	};
+
+	($order:path; $val:expr; $len:expr) => {
+		$crate::bitarr!($order, usize; $val; $len)
+	};
+
+	($val:expr; $len:expr) => {
+		$crate::bitarr!(Lsb0, usize; $val; $len)
+	};
+}
+
+/** Constructs a `BitVec` out of a literal array in source code, like `vec!`.
+
+`bitvec!` can be invoked in a number of ways. It takes the name of a `BitOrder`
+implementation, the name of a `BitStore`-implementing fundamental, and zero or
+more fundamentals (integer, floating-point, or boolean) which are used to build
+the bits. Each fundamental literal corresponds to one bit, and is considered to
+represent `1` if it is any other value than exactly zero.
+
+`bitvec!` can be invoked with no specifiers, a `BitOrder` specifier, or a
+`BitOrder` and a `BitStore` specifier. It cannot be invoked with a `BitStore`
+specifier but no `BitOrder` specifier, due to overlap in how those tokens are
+matched by the macro system.
+
+Like `vec!`, `bitvec!` supports bit lists `[0, 1, …]` and repetition markers
+`[1; n]`.
+
+# Examples
+
+```rust
+use bitvec::prelude::*;
+
+bitvec![Msb0, u8; 0, 1];
+bitvec![Lsb0, u8; 0, 1,];
+bitvec![Msb0; 0, 1];
+bitvec![Lsb0; 0, 1,];
+bitvec![0, 1];
+bitvec![0, 1,];
+bitvec![Msb0, u8; 1; 5];
+bitvec![Lsb0; 0; 5];
+bitvec![1; 5];
+```
+**/
+#[macro_export]
+#[cfg(feature = "alloc")]
+macro_rules! bitvec {
+	//  First, capture the repetition syntax, as it is permitted to use runtime
+	//  values for the repetition count.
+	($order:ty, $store:ident; $val:expr; $rep:expr) => {
+		$crate::vec::BitVec::<$order, $store>::repeat($val != 0, $rep)
+	};
+
+	($order:ty; $val:expr; $rep:expr) => {
+		$crate::vec::BitVec::<$order, usize>::repeat($val != 0, $rep)
+	};
+
+	($val:expr; $rep:expr) => {
+		$crate::vec::BitVec::<$crate::order::Lsb0, usize>::repeat($val != 0, $rep)
+	};
+
+	//  Delegate all others to the `bits!` macro.
+	($($arg:tt)*) => {{
+		$crate::vec::BitVec::from_bitslice($crate::bits!($($arg)*))
+	}};
+}
+
+/** Constructs a `BitBox` out of a literal array in source code, like `bitvec!`.
+
+This has exactly the same syntax as [`bitvec!`], and in fact is a thin wrapper
+around `bitvec!` that calls `.into_boxed_slice()` on the produced `BitVec` to
+freeze it.
+
+[`bitvec!`]: #macro.bitvec
+**/
+#[macro_export]
+#[cfg(feature = "alloc")]
+macro_rules! bitbox {
+	($($arg:tt)*) => {
+		$crate::bitvec!($($arg)*).into_boxed_bitslice()
+	};
+}
+
+#[cfg(test)]
+mod tests {
+	#[allow(unused_imports)]
+	use crate::order::{
+		Lsb0,
+		Msb0,
+	};
+
+	#[test]
+	#[cfg(feature = "alloc")]
+	fn compile_bits_macros() {
+		bits![0, 1];
+		bits![Msb0; 0, 1];
+		bits![Lsb0; 0, 1];
+		bits![Msb0, u8; 0, 1];
+		bits![Lsb0, u8; 0, 1];
+		bits![Msb0, u16; 0, 1];
+		bits![Lsb0, u16; 0, 1];
+		bits![Msb0, u32; 0, 1];
+		bits![Lsb0, u32; 0, 1];
+
+		#[cfg(target_pointer_width = "64")]
+		{
+			bits![Msb0, u64; 0, 1];
+			bits![Lsb0, u64; 0, 1];
+		}
+
+		bits![1; 70];
+		bits![Msb0; 0; 70];
+		bits![Lsb0; 1; 70];
+		bits![Msb0, u8; 0; 70];
+		bits![Lsb0, u8; 1; 70];
+		bits![Msb0, u16; 0; 70];
+		bits![Lsb0, u16; 1; 70];
+		bits![Msb0, u32; 0; 70];
+		bits![Lsb0, u32; 1; 70];
+
+		#[cfg(target_pointer_width = "64")]
+		{
+			bits![Msb0, u64; 0; 70];
+			bits![Lsb0, u64; 1; 70];
+		}
+	}
+
+	#[test]
+	#[cfg(feature = "alloc")]
+	fn compile_bitvec_macros() {
+		bitvec![0, 1];
+		bitvec![Msb0; 0, 1];
+		bitvec![Lsb0; 0, 1];
+		bitvec![Msb0, u8; 0, 1];
+		bitvec![Lsb0, u8; 0, 1];
+		bitvec![Msb0, u16; 0, 1];
+		bitvec![Lsb0, u16; 0, 1];
+		bitvec![Msb0, u32; 0, 1];
+		bitvec![Lsb0, u32; 0, 1];
+
+		#[cfg(target_pointer_width = "64")]
+		{
+			bitvec![Msb0, u64; 0, 1];
+			bitvec![Lsb0, u64; 0, 1];
+		}
+
+		bitvec![1; 70];
+		bitvec![Msb0; 0; 70];
+		bitvec![Lsb0; 1; 70];
+		bitvec![Msb0, u8; 0; 70];
+		bitvec![Lsb0, u8; 1; 70];
+		bitvec![Msb0, u16; 0; 70];
+		bitvec![Lsb0, u16; 1; 70];
+		bitvec![Msb0, u32; 0; 70];
+		bitvec![Lsb0, u32; 1; 70];
+
+		#[cfg(target_pointer_width = "64")]
+		{
+			bitvec![Msb0, u64; 0; 70];
+			bitvec![Lsb0, u64; 1; 70];
+		}
+	}
+
+	#[test]
+	#[cfg(feature = "alloc")]
+	fn compile_bitbox_macros() {
+		bitbox![0, 1];
+		bitbox![Msb0; 0, 1];
+		bitbox![Lsb0; 0, 1];
+		bitbox![Msb0, u8; 0, 1];
+		bitbox![Lsb0, u8; 0, 1];
+		bitbox![Msb0, u16; 0, 1];
+		bitbox![Lsb0, u16; 0, 1];
+		bitbox![Msb0, u32; 0, 1];
+		bitbox![Lsb0, u32; 0, 1];
+
+		#[cfg(target_pointer_width = "64")]
+		{
+			bitbox![Msb0, u64; 0, 1];
+			bitbox![Lsb0, u64; 0, 1];
+		}
+
+		bitbox![1; 70];
+		bitbox![Msb0; 0; 70];
+		bitbox![Lsb0; 1; 70];
+		bitbox![Msb0, u8; 0; 70];
+		bitbox![Lsb0, u8; 1; 70];
+		bitbox![Msb0, u16; 0; 70];
+		bitbox![Lsb0, u16; 1; 70];
+		bitbox![Msb0, u32; 0; 70];
+		bitbox![Lsb0, u32; 1; 70];
+
+		#[cfg(target_pointer_width = "64")]
+		{
+			bitbox![Msb0, u64; 0; 70];
+			bitbox![Lsb0, u64; 1; 70];
+		}
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/mem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/mem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/mem.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/mem.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,118 @@
+/*! Descriptions of integer types
+
+This module describes the integer types used to hold bare data. This module
+governs the way the processor manipulates integer regions of memory, without
+concern for interaction with specifics of register or bus behavior.
+!*/
+
+use core::mem;
+
+use funty::IsUnsigned;
+
+/** Description of an integer type.
+
+This trait provides information used to describe integer-typed regions of memory
+and enables other parts of the crate to adequately describe the memory bus. This
+trait has **no** bearing on the processor instructions or registers used to
+interact with memory.
+
+This trait cannot be implemented outside this crate.
+**/
+pub trait BitMemory: IsUnsigned + seal::Sealed {
+	/// The bit width of the integer.
+	///
+	/// `mem::size_of` returns the size in bytes, and bytes are always eight
+	/// bits on architectures Rust targets.
+	///
+	/// Issue #76904 will place this constant on the fundamentals directly, as a
+	/// `u32`.
+	const BITS: u8 = mem::size_of::<Self>() as u8 * 8;
+	/// The number of bits required to store an index in the range `0 .. BITS`.
+	const INDX: u8 = Self::BITS.trailing_zeros() as u8;
+	/// A mask over all bits that can be used as an index within the element.
+	const MASK: u8 = Self::BITS - 1;
+
+	/// The value with only its least significant bit set to `1`.
+	const ONE: Self;
+	/// The value with all of its bits set to `1`.
+	const ALL: Self;
+}
+
+macro_rules! memory {
+	($($t:ty),+ $(,)?) => { $(
+		impl BitMemory for $t {
+			const ONE: Self = 1;
+			const ALL: Self = !0;
+		}
+		impl seal::Sealed for $t {}
+	)+ };
+}
+
+memory!(u8, u16, u32, u64, u128, usize);
+
+/** Computes the number of elements required to store some number of bits.
+
+# Parameters
+
+- `bits`: The number of bits to store in a `[T]` array.
+
+# Returns
+
+The number of elements `T` required to store `bits`.
+
+As this is a const function, when `bits` is a constant expression, this can be
+used to compute the size of an array type `[T; elts(bits)]`.
+**/
+#[doc(hidden)]
+pub const fn elts<T>(bits: usize) -> usize {
+	let width = mem::size_of::<T>() * 8;
+	bits / width + (bits % width != 0) as usize
+}
+
+/** Tests that a type is aligned to its size.
+
+This property is not necessarily true for all integers; for instance, `u64` on
+32-bit x86 is permitted to be 4-byte-aligned. `bitvec` requires this property to
+hold for the pointer representation to correctly function.
+
+# Type Parameters
+
+- `T`: A type whose alignment and size are to be compared
+
+# Returns
+
+`0` if the alignment matches the size; `1` if they differ
+**/
+#[doc(hidden)]
+pub(crate) const fn aligned_to_size<T>() -> usize {
+	(mem::align_of::<T>() != mem::size_of::<T>()) as usize
+}
+
+/** Tests whether two types have compatible layouts.
+
+# Type Parameters
+
+- `A`
+- `B`
+
+# Returns
+
+Zero if `A` and `B` have equal alignments and sizes, non-zero if they do not.
+
+# Uses
+
+This function is designed to be used in the expression
+`const CHECK: [(): 0] = [(); cmp_layout::<A, B>()];`. It will cause a compiler
+error if the conditions do not hold.
+**/
+#[doc(hidden)]
+pub(crate) const fn cmp_layout<A, B>() -> usize {
+	(mem::align_of::<A>() != mem::align_of::<B>()) as usize
+		+ (mem::size_of::<A>() != mem::size_of::<B>()) as usize
+}
+
+#[doc(hidden)]
+mod seal {
+	#[doc(hidden)]
+	pub trait Sealed {}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/order.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/order.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/order.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/order.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,562 @@
+/*! Ordering of bits within register elements.
+
+`bitvec` structures are parametric over any ordering of bits within a register.
+The `BitOrder` trait maps a cursor position (indicated by the `BitIdx` type) to an
+electrical position (indicated by the `BitPos` type) within that element, and
+also defines the order of traversal over a register.
+
+The only requirement on implementors of `BitOrder` is that the transform function
+from cursor (`BitIdx`) to position (`BitPos`) is *total* (every integer in the
+domain `0 .. T::BITS` is used) and *unique* (each cursor maps to one and only
+one position, and each position is mapped by one and only one cursor).
+Contiguity is not required.
+
+`BitOrder` is a stateless trait, and implementors should be zero-sized types.
+!*/
+
+use crate::index::{
+	BitIdx,
+	BitMask,
+	BitPos,
+	BitRegister,
+	BitSel,
+	BitTail,
+};
+
+/** An ordering over a register.
+
+# Usage
+
+`bitvec` structures store and operate on semantic counts, not bit positions. The
+`BitOrder::at` function takes a semantic ordering, `BitIdx`, and produces an
+electrical position, `BitPos`.
+
+# Safety
+
+If your implementation violates any of the requirements on these functions, then
+the program will become incorrect and have unspecified behavior. The best-case
+scenario is that operations relying on your implementation will crash the
+program; the worst-case is that memory access will silently become corrupt.
+
+You are responsible for adhering to the requirements of these functions. In the
+future, a verification function may be provided for your test suite; however, it
+is not yet possible to verify your implementation at compile-time.
+
+This is an `unsafe trait` to implement, because you are responsible for
+upholding the state requirements. The types you manipulate have `unsafe fn`
+constructors, because they require you to maintain correct and consistent
+processes in order for the rest of the library to use them.
+
+The implementations of `BitOrder` are trusted to drive safe code, and once data
+leaves a `BitOrder` implementation, it is considered safe to use as the basis
+for interaction with memory.
+
+# Verification
+
+Rust currently lacks Zig’s compile-time computation capability. This means that
+`bitvec` cannot fail a compile if it detects that a `BitOrder` implementation is
+invalid and breaks the stated requirements. `bitvec` does offer a function,
+[`verify`], which ensures the correctness of an implementation. When Rust gains
+the capability to run this function in generic `const` contexts, `bitvec` will
+use it to prevent at compile-time the construction of data structures that use
+incorrect ordering implementations.
+
+The verifier function panics when it detects invalid behavior, with an error
+message intended to clearly indicate the broken requirement.
+
+```rust
+use bitvec::{
+  index::{BitIdx, BitPos, BitRegister},
+  order::{self, BitOrder},
+};
+# use bitvec::{index::*, order::Lsb0};
+
+pub struct Custom;
+unsafe impl BitOrder for Custom {
+  fn at<R: BitRegister>(idx: BitIdx<R>) -> BitPos<R> {
+  // impl
+  # return Lsb0::at::<R>(idx);
+  }
+}
+
+#[test]
+#[cfg(test)]
+fn prove_custom() {
+  order::verify::<Custom>();
+}
+```
+
+[`verify`]: fn.verify.html
+**/
+pub unsafe trait BitOrder {
+	/// Converts a semantic bit index into an electrical bit position.
+	///
+	/// This function is the basis of the trait, and must adhere to a number of
+	/// requirements in order for an implementation to be considered correct.
+	///
+	/// # Parameters
+	///
+	/// - `index`: The semantic index of a bit within a register `R`.
+	///
+	/// # Returns
+	///
+	/// The electrical position of the indexed bit within a register `R`. See
+	/// the `BitPos` documentation for what electrical positions are considered
+	/// to mean.
+	///
+	/// # Type Parameters
+	///
+	/// - `R`: The register type which the index and position describe.
+	///
+	/// # Requirements
+	///
+	/// This function must satisfy the following requirements for all possible
+	/// input and output values for all possible type parameters:
+	///
+	/// ## Totality
+	///
+	/// This function must be able to accept every input in the `BitIdx<R>`
+	/// value range, and produce a corresponding `BitPos<R>`. It must not abort
+	/// the program or return an invalid `BitPos<R>` for any input value in the
+	/// `BitIdx<R>` range.
+	///
+	/// ## Bijection
+	///
+	/// There must be an exactly one-to-one correspondence between input value
+	/// and output value. No input index may select from a set of more than one
+	/// output position, and no output position may be produced by more than one
+	/// input index.
+	///
+	/// ## Purity
+	///
+	/// The translation from index to position must be consistent for the
+	/// lifetime of the program. This function *may* refer to global state, but
+	/// that state **must** be immutable for the program lifetime, and must not
+	/// be used to violate the totality or bijection requirements.
+	///
+	/// ## Output Validity
+	///
+	/// The produced `BitPos<R>` must be within the valid range of that type.
+	/// Call sites of this function will not take any steps to constrain the
+	/// output value. If you use `unsafe` code to produce an invalid
+	/// `BitPos<R>`, the program is permanently incorrect, and will likely
+	/// crash.
+	///
+	/// # Usage
+	///
+	/// This function will only ever be called with input values in the valid
+	/// `BitIdx<R>` range. Implementors are not required to consider any values
+	/// outside this range in their function body.
+	fn at<R>(index: BitIdx<R>) -> BitPos<R>
+	where R: BitRegister;
+
+	/// Converts a semantic bit index into a one-hot selector mask.
+	///
+	/// This is an optional function; a default implementation is provided for
+	/// you.
+	///
+	/// The default implementation of this function calls `Self::at` to produce
+	/// an electrical position, then turns that into a selector mask by setting
+	/// the `n`th bit more significant than the least significant bit of the
+	/// element. `BitOrder` implementations may choose to provide a faster mask
+	/// production here, but they must satisfy the requirements listed below.
+	///
+	/// # Parameters
+	///
+	/// - `index`: The semantic index of a bit within a register `R`.
+	///
+	/// # Returns
+	///
+	/// A one-hot selector mask for the bit indicated by the index value.
+	///
+	/// # Type Parameters
+	///
+	/// - `R`: The storage type for which the mask will be calculated. The mask
+	///   must also be this type, as it will be applied to a register of `R` in
+	///   order to set, clear, or test a single bit.
+	///
+	/// # Requirements
+	///
+	/// A one-hot encoding means that there is exactly one bit set in the
+	/// produced value. It must be equivalent to `1 << Self::at::<R>(place)`.
+	///
+	/// As with `at`, this function must produce a unique mapping from each
+	/// legal index in the `R` domain to a one-hot value of `R`.
+	#[inline]
+	fn select<R>(index: BitIdx<R>) -> BitSel<R>
+	where R: BitRegister {
+		Self::at::<R>(index).select()
+	}
+
+	/// Constructs a multi-bit selector mask for batch operations on a single
+	/// register `R`.
+	///
+	/// The default implementation of this function traverses the index range,
+	/// converting each index into a single-bit selector with `Self::select` and
+	/// accumulating into a combined register value.
+	///
+	/// # Parameters
+	///
+	/// - `from`: The inclusive starting index for the mask.
+	/// - `upto`: The exclusive ending index for the mask.
+	///
+	/// # Returns
+	///
+	/// A bit-mask with all bits corresponding to the input index range set high
+	/// and all others set low.
+	///
+	/// # Type Parameters
+	///
+	/// - `R`: The storage type for which the mask will be calculated. The mask
+	///   must also be this type, as it will be applied to a register of `R` in
+	///   order to set, clear, or test all the selected bits.
+	///
+	/// # Requirements
+	///
+	/// This function must always be equivalent to
+	///
+	/// ```rust,ignore
+	/// (from .. upto)
+	///   .map(1 << Self::at::<R>)
+	///   .fold(0, |mask, sel| mask | sel)
+	/// ```
+	#[inline]
+	fn mask<R>(
+		from: impl Into<Option<BitIdx<R>>>,
+		upto: impl Into<Option<BitTail<R>>>,
+	) -> BitMask<R>
+	where
+		R: BitRegister,
+	{
+		let (from, upto) = match (from.into(), upto.into()) {
+			(None, None) => return BitMask::ALL,
+			(Some(from), None) => (from, BitTail::<R>::END),
+			(None, Some(upto)) => (BitIdx::<R>::ZERO, upto),
+			(Some(from), Some(upto)) => (from, upto),
+		};
+		BitIdx::<R>::range(from, upto).map(Self::select::<R>).sum()
+	}
+}
+
+/// Traverses a register from `MSbit` to `LSbit`.
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Msb0;
+
+unsafe impl BitOrder for Msb0 {
+	#[cfg_attr(not(tarpaulin_include), inline(always))]
+	fn at<R>(index: BitIdx<R>) -> BitPos<R>
+	where R: BitRegister {
+		unsafe { BitPos::new_unchecked(R::MASK - index.value()) }
+	}
+
+	#[cfg_attr(not(tarpaulin_include), inline(always))]
+	fn select<R>(index: BitIdx<R>) -> BitSel<R>
+	where R: BitRegister {
+		/* Set the MSbit, then shift it down. The left expr is const-folded.
+		Note: this is not equivalent to `1 << (mask - index)`, because that
+		requires a runtime subtraction, but the expression below is only a
+		single right-shift.
+		*/
+		unsafe { BitSel::new_unchecked((R::ONE << R::MASK) >> index.value()) }
+	}
+
+	#[inline]
+	fn mask<R>(
+		from: impl Into<Option<BitIdx<R>>>,
+		upto: impl Into<Option<BitTail<R>>>,
+	) -> BitMask<R>
+	where
+		R: BitRegister,
+	{
+		let from = from.into().unwrap_or(BitIdx::ZERO).value();
+		let upto = upto.into().unwrap_or(BitTail::END).value();
+		debug_assert!(upto >= from, "Ranges must run from low index to high");
+		let ct = upto - from;
+		if ct == R::BITS {
+			return BitMask::ALL;
+		}
+		//  1. Set all bits high.
+		//  2. Shift right by the number of bits in the mask. These are now low.
+		//  3. Invert. The mask bits (at MSedge) are high; the rest are low.
+		//  4. Shift right by the distance from MSedge.
+		unsafe { BitMask::new(!(R::ALL >> ct) >> from) }
+	}
+}
+
+/// Traverses a register from `LSbit` to `MSbit`.
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Lsb0;
+
+unsafe impl BitOrder for Lsb0 {
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	fn at<R>(index: BitIdx<R>) -> BitPos<R>
+	where R: BitRegister {
+		unsafe { BitPos::new_unchecked(index.value()) }
+	}
+
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	fn select<R>(index: BitIdx<R>) -> BitSel<R>
+	where R: BitRegister {
+		unsafe { BitSel::new_unchecked(R::ONE << index.value()) }
+	}
+
+	#[inline]
+	fn mask<R>(
+		from: impl Into<Option<BitIdx<R>>>,
+		upto: impl Into<Option<BitTail<R>>>,
+	) -> BitMask<R>
+	where
+		R: BitRegister,
+	{
+		let from = from.into().unwrap_or(BitIdx::ZERO).value();
+		let upto = upto.into().unwrap_or(BitTail::END).value();
+		debug_assert!(upto >= from, "Ranges must run from low index to high");
+		let ct = upto - from;
+		if ct == R::BITS {
+			return BitMask::ALL;
+		}
+		//  1. Set all bits high.
+		//  2. Shift left by the number of bits in the mask. These are now low.
+		//  3. Invert. The mask bits at LSedge are high; the rest are low.
+		//  4. Shift left by the distance from LSedge.
+		unsafe { BitMask::new(!(R::ALL << ct) << from) }
+	}
+}
+
+/** A default bit ordering.
+
+Typically, your platform’s C compiler uses most-significant-bit-first ordering
+for bitfields. The Msb0 bit ordering and big-endian byte ordering are otherwise
+completely unrelated.
+**/
+#[cfg(target_endian = "big")]
+pub type LocalBits = Msb0;
+
+/** A default bit ordering.
+
+Typically, your platform’s C compiler uses least-significant-bit-first ordering
+for bitfields. The Lsb0 bit ordering and little-endian byte ordering are
+otherwise completely unrelated.
+**/
+#[cfg(target_endian = "little")]
+pub type LocalBits = Lsb0;
+
+#[cfg(not(any(target_endian = "big", target_endian = "little")))]
+compile_fail!(concat!(
+	"This architecture is currently not supported. File an issue at ",
+	env!(CARGO_PKG_REPOSITORY)
+));
+
+/** Verifies a `BitOrder` implementation’s adherence to the stated rules.
+
+This function checks some `BitOrder` implementation’s behavior on each of the
+`BitRegister` types it must handle, and reports any violation of the rules that
+it detects.
+
+# Type Parameters
+
+- `O`: The `BitOrder` implementation to test.
+
+# Parameters
+
+- `verbose`: Sets whether the test should print diagnostic information to
+  `stdout`.
+
+# Panics
+
+This panics if it detects any violation of the `BitOrder` implementation rules
+for `O`.
+**/
+#[cfg(test)]
+pub fn verify<O>(verbose: bool)
+where O: BitOrder {
+	verify_for_type::<O, u8>(verbose);
+	verify_for_type::<O, u16>(verbose);
+	verify_for_type::<O, u32>(verbose);
+	verify_for_type::<O, usize>(verbose);
+
+	#[cfg(target_pointer_width = "64")]
+	verify_for_type::<O, u64>(verbose);
+}
+
+/** Verifies a `BitOrder` implementation’s adherence to the stated rules, for
+one register type.
+
+This function checks some `BitOrder` implementation against only one of the
+`BitRegister` types that it will encounter. This is useful if you are
+implementing an ordering that only needs to be concerned with a subset of the
+types, and you know that you will never use it with the types it does not
+support.
+
+# Type Parameters
+
+- `O`: The `BitOrder` implementation to test.
+- `R`: The `BitRegister` type for which to test `O`.
+
+# Parameters
+
+- `verbose`: Sets whether the test should print diagnostic information to
+  `stdout`.
+
+# Panics
+
+This panics if it detects any violation of the `BitOrder` implementation rules
+for the combination of input types and index values.
+**/
+#[cfg(test)]
+pub fn verify_for_type<O, R>(verbose: bool)
+where
+	O: BitOrder,
+	R: BitRegister,
+{
+	use core::any::type_name;
+	let mut accum = BitMask::<R>::ZERO;
+
+	let oname = type_name::<O>();
+	let mname = type_name::<R>();
+
+	for n in 0 .. R::BITS {
+		//  Wrap the counter as an index.
+		let idx = unsafe { BitIdx::<R>::new_unchecked(n) };
+
+		//  Compute the bit position for the index.
+		let pos = O::at::<R>(idx);
+		if verbose {
+			#[cfg(feature = "std")]
+			println!(
+				"`<{} as BitOrder>::at::<{}>({})` produces {}",
+				oname,
+				mname,
+				n,
+				pos.value(),
+			);
+		}
+
+		//  If the computed position exceeds the valid range, fail.
+		assert!(
+			pos.value() < R::BITS,
+			"Error when verifying the implementation of `BitOrder` for `{}`: \
+			 Index {} produces a bit position ({}) that exceeds the type width \
+			 {}",
+			oname,
+			n,
+			pos.value(),
+			R::BITS,
+		);
+
+		//  Check `O`’s implementation of `select`
+		let sel = O::select::<R>(idx);
+		if verbose {
+			#[cfg(feature = "std")]
+			println!(
+				"`<{} as BitOrder>::select::<{}>({})` produces {:b}",
+				oname, mname, n, sel,
+			);
+		}
+
+		//  If the selector bit is not one-hot, fail.
+		assert_eq!(
+			sel.value().count_ones(),
+			1,
+			"Error when verifying the implementation of `BitOrder` for `{}`: \
+			 Index {} produces a bit selector ({:b}) that is not a one-hot mask",
+			oname,
+			n,
+			sel,
+		);
+
+		//  Check that the selection computed from the index matches the
+		//  selection computed from the position.
+		let shl = pos.select();
+		//  If `O::select(idx)` does not produce `1 << pos`, fail.
+		assert_eq!(
+			sel,
+			shl,
+			"Error when verifying the implementation of `BitOrder` for `{}`: \
+			 Index {} produces a bit selector ({:b}) that is not equal to `1 \
+			 << {}` ({:b})",
+			oname,
+			n,
+			sel,
+			pos.value(),
+			shl,
+		);
+
+		//  Check that the produced selector bit has not already been added to
+		//  the accumulator.
+		assert!(
+			!accum.test(sel),
+			"Error when verifying the implementation of `BitOrder` for `{}`: \
+			 Index {} produces a bit position ({}) that has already been \
+			 produced by a prior index",
+			oname,
+			n,
+			pos.value(),
+		);
+		accum.insert(sel);
+		if verbose {
+			#[cfg(feature = "std")]
+			println!(
+				"`<{} as BitOrder>::at::<{}>({})` accumulates  {:b}",
+				oname, mname, n, accum,
+			);
+		}
+	}
+
+	//  Check that all indices produced all positions.
+	assert_eq!(
+		accum,
+		BitMask::ALL,
+		"Error when verifying the implementation of `BitOrder` for `{}`: The \
+		 bit positions marked with a `0` here were never produced from an \
+		 index, despite all possible indices being passed in for translation: \
+		 {:b}",
+		oname,
+		accum,
+	);
+
+	//  Check that `O::mask` is correct for all range combinations.
+	for from in BitIdx::<R>::range_all() {
+		for upto in BitTail::<R>::range_from(from) {
+			let mask = O::mask(from, upto);
+			let check = BitIdx::<R>::range(from, upto)
+				.map(O::at::<R>)
+				.map(BitPos::<R>::select)
+				.sum::<BitMask<R>>();
+			assert_eq!(
+				mask,
+				check,
+				"Error when verifying the implementation of `BitOrder` for \
+				 `{o}`: `{o}::mask::<{m}>({f}, {u})` produced {bad:b}, but \
+				 expected {good:b}",
+				o = oname,
+				m = mname,
+				f = from,
+				u = upto,
+				bad = mask,
+				good = check,
+			);
+		}
+	}
+}
+
+#[cfg(all(test, not(miri)))]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn verify_impls() {
+		verify::<Lsb0>(cfg!(feature = "testing"));
+		verify::<Msb0>(cfg!(feature = "testing"));
+
+		struct DefaultImpl;
+		unsafe impl BitOrder for DefaultImpl {
+			fn at<R>(index: BitIdx<R>) -> BitPos<R>
+			where R: BitRegister {
+				unsafe { BitPos::new_unchecked(index.value()) }
+			}
+		}
+
+		verify::<DefaultImpl>(cfg!(feature = "testing"));
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/pointer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/pointer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/pointer.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/pointer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1121 @@
+/*! Bitslice pointer encoding
+
+This module defines the in-memory representation of the handle to a `BitSlice`
+region. This structure is crate-internal, and defines the methods required to
+store a `BitSlice` pointer in memory and retrieve values from it suitable for
+work.
+
+Currently, this module is absolutely forbidden for export outside the crate, and
+its implementation cannot be relied upon. Future work *may* choose to stabilize
+the encoding, and make it available, but this work is not a priority for the
+project.
+!*/
+
+use crate::{
+	access::BitAccess,
+	devel as dvl,
+	index::{
+		BitIdx,
+		BitTail,
+	},
+	mem::BitMemory,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+};
+
+use core::{
+	any,
+	fmt::{
+		self,
+		Debug,
+		Formatter,
+		Pointer,
+	},
+	marker::PhantomData,
+	ptr::{
+		self,
+		NonNull,
+	},
+	slice,
+};
+
+use wyz::fmt::FmtForward;
+
+/** Pointer to memory with limited typecasting support.
+
+# Type Parameters
+
+- `T`: The referent data type.
+**/
+#[doc(hidden)]
+#[derive(Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Address<T>
+where T: BitStore
+{
+	/// The numeric value of the address.
+	addr: usize,
+	/// The referent type of data at the address.
+	_ty: PhantomData<T>,
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Address<T>
+where T: BitStore
+{
+	/// Views a numeric address as a typed data address.
+	#[inline(always)]
+	pub(crate) fn new(addr: usize) -> Self {
+		Self {
+			addr,
+			_ty: PhantomData,
+		}
+	}
+
+	/// Views the memory address as an access pointer.
+	#[inline(always)]
+	pub(crate) fn to_access(self) -> *const T::Access {
+		self.addr as *const T::Access
+	}
+
+	/// Views the memory address as an alias pointer.
+	#[inline(always)]
+	pub(crate) fn to_alias(self) -> *const T::Alias {
+		self.addr as *const T::Alias
+	}
+
+	/// Views the memory address as an immutable pointer.
+	#[inline(always)]
+	pub(crate) fn to_const(self) -> *const T {
+		self.addr as *const T
+	}
+
+	/// Views the memory address as a mutable pointer.
+	#[inline(always)]
+	#[allow(clippy::wrong_self_convention)]
+	pub(crate) fn to_mut(self) -> *mut T {
+		self.addr as *mut T
+	}
+
+	/// Gets the numeric value of the address.
+	#[inline(always)]
+	pub(crate) fn value(self) -> usize {
+		self.addr
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Clone for Address<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn clone(&self) -> Self {
+		Self { ..*self }
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> From<&T> for Address<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn from(addr: &T) -> Self {
+		(addr as *const T).into()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> From<*const T> for Address<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn from(addr: *const T) -> Self {
+		Self::new((addr) as usize)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> From<&mut T> for Address<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn from(addr: &mut T) -> Self {
+		(addr as *mut T).into()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> From<*mut T> for Address<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn from(addr: *mut T) -> Self {
+		Self::new(addr as usize)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Debug for Address<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		<Self as Pointer>::fmt(&self, fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Pointer for Address<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Pointer::fmt(&self.to_const(), fmt)
+	}
+}
+
+impl<T> Copy for Address<T> where T: BitStore
+{
+}
+
+/** Bit-precision slice pointer encoding.
+
+Rust slices use a pointer/length encoding to represent regions of memory.
+References to slices of data, `&[T]`, have the ABI layout `(*const T, usize)`.
+
+`BitPtr` encodes a base address, a first-bit index, and a length counter, into
+the Rust slice reference layout using this structure, permitting `bitvec` to use
+an opaque reference type in its implementation of Rust interfaces that require
+references, rather than immediate value types.
+
+# Layout
+
+This structure is a more complex version of the `*const T`/`usize` tuple that
+Rust uses to represent slices throughout the language. It breaks the pointer and
+counter fundamentals into sub-field components. Rust does not have bitfield
+syntax, so the below description of the structure layout is in C++.
+
+```cpp
+template <typename T>
+struct BitPtr {
+  uintptr_t ptr_head : __builtin_ctzll(alignof(T));
+  uintptr_t ptr_addr : sizeof(uintptr_T) * 8 - __builtin_ctzll(alignof(T));
+
+  size_t len_head : 3;
+  size_t len_bits : sizeof(size_t) * 8 - 3;
+};
+```
+
+This means that the `BitPtr<T>` has three *logical* fields, stored in four
+segments across the two *structural* fields of the type. The widths and
+placements of each segment are functions of the size of `*const T` and `usize`,
+and of the alignment of the `T` referent buffer element type.
+
+# Fields
+
+This section describes the purpose, semantic meaning, and layout of the three
+logical fields.
+
+## Base Address
+
+The address of the base element in a memory region is stored in all but the
+lowest bits of the `ptr` field. An aligned pointer to `T` will always have its
+lowest log<sub>2</sub>(byte width) bits zeroed, so those bits can be used to
+store other information, as long as they are erased before dereferencing the
+address as a pointer to `T`.
+
+## Head Bit Index
+
+For any referent element type `T`, the selection of a single bit within the
+element requires log<sub>2</sub>(byte width) bits to select a byte within the
+element `T`, and another three bits to select a bit within the selected byte.
+
+|Type |Alignment|Trailing Zeros|Count Bits|
+|:----|--------:|-------------:|---------:|
+|`u8` |        1|             0|         3|
+|`u16`|        2|             1|         4|
+|`u32`|        4|             2|         5|
+|`u64`|        8|             3|         6|
+
+The index of the first live bit in the base element is split to have its three
+least significant bits stored in the least significant edge of the `len` field,
+and its remaining bits stored in the least significant edge of the `ptr` field.
+
+## Length Counter
+
+All but the lowest three bits of the `len` field are used to store a counter of
+live bits in the referent region. When this is zero, the region is empty.
+Because it is missing three bits, a `BitPtr` has only â…› of the index space of
+a `usize` value.
+
+# Significant Values
+
+The following values represent significant instances of the `BitPtr` type.
+
+## Null Slice
+
+The fully-zeroed slot is not a valid member of the `BitPtr<T>` type; it is
+reserved as the sentinel value for `Option::<BitPtr<T>>::None`.
+
+## Canonical Empty Slice
+
+All pointers with a `bits: 0` logical field are empty. Pointers used to maintain
+ownership of heap buffers are not permitted to erase their `addr` field, but
+unowning pointers may do so. When an unowning pointer becomes empty, it may
+replace its `addr` with the `NonNull::<T>::dangling()` value.
+
+All empty pointers are equivalent to each other.
+
+### Uninhabited Slices
+
+Any empty pointer with a non-`dangling()` base address is considered to be an
+uninhabited region.
+
+# Type Parameters
+
+- `T`: The memory type of the referent region. `BitPtr<T>` is a refined `*[T]`
+  slice pointer, and operates on memory in terms of the `T` type for access and
+  pointer calculation.
+
+# Safety
+
+A `BitPtr` must never be constructed such that the element addressed by
+`self.pointer().to_const().offset(self.elements())` causes an addition overflow.
+This will be checked in `new()`.
+
+It is difficult to cause an arithmetic overflow with pointer offsets, as most
+targets divide the address space such that programs see a highest address of
+`0x7FFF…`. This restriction is inherited from restrictions in the distribution
+collection libraries, which have studied these problems extensively and are
+reasonable sources of trustworthy plagiarism.
+
+# Undefined Behavior
+
+Values of this type are incompatible with slice pointers. Transmutation of these
+values into any other type will result in an incorrect program, and permit the
+program to begin illegal or undefined behaviors. This type may never be
+manipulated in any way by user code outside of the APIs it offers to this crate;
+it certainly may not be seen or observed by other crates.
+**/
+#[repr(C)]
+#[derive(Eq, Hash)]
+pub struct BitPtr<T>
+where T: BitStore
+{
+	/// Two-element bitfield structure, holding pointer and head information.
+	///
+	/// This stores a pointer to the zeroth element of the slice, and the high
+	/// bits of the head bit cursor. It is typed as a `NonNull<u8>` in order to
+	/// provide null-value optimizations to `Option<BitPtr<T>>`, and because the
+	/// presence of head-bit cursor information in the lowest bits means the
+	/// bit pattern will not uphold alignment properties assumed by
+	/// `NonNull<T>`.
+	///
+	/// This field cannot be treated as an address of the zeroth byte of the
+	/// slice domain, because the owning handle’s [`BitOrder`] implementation
+	/// governs the bit pattern of the head cursor.
+	///
+	/// [`BitOrder`]: ../order/trait.BitOrder.html
+	ptr: NonNull<u8>,
+	/// Two-element bitfield structure, holding bit-count and head-index
+	/// information.
+	///
+	/// This stores the bit count in its highest bits and the low three bits of
+	/// the head `BitIdx` in the lowest three bits.
+	///
+	/// [`BitIdx`]: ../struct.BitIdx.html
+	len: usize,
+	_ty: PhantomData<*mut T>,
+}
+
+impl<T> BitPtr<T>
+where T: BitStore
+{
+	/// The canonical representation of a pointer to an empty region.
+	pub(crate) const EMPTY: Self = Self {
+		/* Note: this must always construct the `T` dangling pointer, and then
+		convert it into a pointer to `u8`. Creating `NonNull::dangling()`
+		directly will always instantiate the `NonNull::<u8>::dangling()`
+		pointer, which is VERY incorrect for any other `T` typarams.
+		*/
+		ptr: unsafe {
+			NonNull::new_unchecked(NonNull::<T>::dangling().as_ptr() as *mut u8)
+		},
+		len: 0,
+		_ty: PhantomData,
+	};
+	/// The number of low bits of `self.len` required to hold the low bits of
+	/// the head `BitIdx` cursor.
+	///
+	/// This is always `3`, until Rust tries to target an architecture that does
+	/// not have 8-bit bytes.
+	pub(crate) const LEN_HEAD_BITS: usize = 3;
+	/// Marks the bits of `self.len` that hold part of the `head` logical field.
+	pub(crate) const LEN_HEAD_MASK: usize = 0b0111;
+	/// Marks the bits of `self.ptr` that hold the `addr` logical field.
+	pub(crate) const PTR_ADDR_MASK: usize = !0 << Self::PTR_HEAD_BITS;
+	/// The number of low bits of `self.ptr` required to hold the high bits of
+	/// the head `BitIdx` cursor.
+	pub(crate) const PTR_HEAD_BITS: usize =
+		T::Mem::INDX as usize - Self::LEN_HEAD_BITS;
+	/// Marks the bits of `self.ptr` that hold part of the `head` logical field.
+	pub(crate) const PTR_HEAD_MASK: usize = !Self::PTR_ADDR_MASK;
+	/// The inclusive maximum number of bits that a `BitPtr` can cover.
+	pub(crate) const REGION_MAX_BITS: usize = !0 >> Self::LEN_HEAD_BITS;
+	/// The inclusive maximum number of elements that the region described by a
+	/// `BitPtr` can cover in memory.
+	///
+	/// This is the number of elements required to store `MAX_BITS`, plus one
+	/// because a region could start in the middle of its base element and thus
+	/// push the final bits into a new element.
+	///
+	/// Since the region is â…›th the bit span of a `usize` counter already, this
+	/// number is guaranteed to be well below the limits of arithmetic or Rust’s
+	/// own constraints on memory region handles.
+	pub(crate) const REGION_MAX_ELTS: usize =
+		crate::mem::elts::<T::Mem>(Self::REGION_MAX_BITS) + 1;
+
+	/// Constructs an empty `BitPtr` at a bare pointer.
+	///
+	/// # Parameters
+	///
+	/// - `addr`: Some allocated address of a `T` element or region.
+	///
+	/// # Returns
+	///
+	/// A zero-length `BitPtr` at `addr`.
+	///
+	/// # Panics
+	///
+	/// This function panics if `addr` is not well-aligned to `T`. All addresses
+	/// received from the Rust allocation system are required to satisfy this
+	/// constraint.
+	#[cfg(feature = "alloc")]
+	pub(crate) fn uninhabited(addr: impl Into<Address<T>>) -> Self {
+		let addr = addr.into();
+		assert!(
+			addr.value().trailing_zeros() as usize >= Self::PTR_HEAD_BITS,
+			"Pointer {:p} does not satisfy minimum alignment requirements {}",
+			addr.to_const(),
+			Self::PTR_HEAD_BITS
+		);
+		Self {
+			ptr: match NonNull::new(addr.to_mut() as *mut u8) {
+				Some(nn) => nn,
+				None => return Self::EMPTY,
+			},
+			len: 0,
+			_ty: PhantomData,
+		}
+	}
+
+	/// Constructs a new `BitPtr` from its components.
+	///
+	/// # Parameters
+	///
+	/// - `addr`: A well-aligned pointer to a storage element.
+	/// - `head`: The bit index of the first live bit in the element under
+	///   `*addr`.
+	/// - `bits`: The number of live bits in the region the produced `BitPtr<T>`
+	///   describes.
+	///
+	/// # Returns
+	///
+	/// This returns `None` in the following cases:
+	///
+	/// - `addr` is the null pointer, or is not adequately aligned for `T`.
+	/// - `bits` is greater than `Self::REGION_MAX_BITS`, and cannot be encoded
+	///   into a `BitPtr`.
+	/// - addr` is so high in the address space that the element slice wraps
+	///   around the address space boundary.
+	///
+	/// # Safety
+	///
+	/// The caller must provide an `addr` pointer and a `bits` counter which
+	/// describe a `[T]` region which is correctly aligned and validly allocated
+	/// in the caller’s memory space. The caller is responsible for ensuring
+	/// that the slice of memory the produced `BitPtr<T>` describes is all
+	/// governable in the caller’s context.
+	pub(crate) fn new(
+		addr: impl Into<Address<T>>,
+		head: BitIdx<T::Mem>,
+		bits: usize,
+	) -> Option<Self>
+	{
+		let addr = addr.into();
+
+		if addr.to_const().is_null()
+			|| (addr.value().trailing_zeros() as usize) < Self::PTR_HEAD_BITS
+			|| bits > Self::REGION_MAX_BITS
+		{
+			return None;
+		}
+
+		let elts = head.span(bits).0;
+		let last = addr.to_const().wrapping_add(elts);
+		if last < addr.to_const() {
+			return None;
+		}
+
+		Some(unsafe { Self::new_unchecked(addr, head, bits) })
+	}
+
+	/// Creates a new `BitPtr<T>` from its components, without any validity
+	/// checks.
+	///
+	/// # Safety
+	///
+	/// ***ABSOLUTELY NONE.*** This function *only* packs its arguments into the
+	/// bit pattern of the `BitPtr<T>` type. It should only be used in contexts
+	/// where a previously extant `BitPtr<T>` was constructed with ancestry
+	/// known to have survived [`::new`], and any manipulations of its raw
+	/// components are known to be valid for reconstruction.
+	///
+	/// # Parameters
+	///
+	/// See [`::new`].
+	///
+	/// # Returns
+	///
+	/// See [`::new`].
+	///
+	/// [`::new`]: #method.new
+	#[inline]
+	pub(crate) unsafe fn new_unchecked(
+		addr: impl Into<Address<T>>,
+		head: BitIdx<T::Mem>,
+		bits: usize,
+	) -> Self
+	{
+		let (addr, head) = (addr.into(), head.value() as usize);
+
+		let ptr_data = addr.value() & Self::PTR_ADDR_MASK;
+		let ptr_head = head >> Self::LEN_HEAD_BITS;
+
+		let len_head = head & Self::LEN_HEAD_MASK;
+		let len_bits = bits << Self::LEN_HEAD_BITS;
+
+		let ptr = Address::new(ptr_data | ptr_head);
+
+		Self {
+			ptr: NonNull::new_unchecked(ptr.to_mut()),
+			len: len_bits | len_head,
+			_ty: PhantomData,
+		}
+	}
+
+	/// Gets the base element address of the referent region.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// The address of the starting element of the memory region. This address
+	/// is weakly typed so that it can be cast by call sites to the most useful
+	/// access type.
+	#[inline]
+	pub(crate) fn pointer(&self) -> Address<T> {
+		Address::new(self.ptr.as_ptr() as usize & Self::PTR_ADDR_MASK)
+	}
+
+	/// Overwrites the data pointer with a new address. This method does not
+	/// perform safety checks on the new pointer.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `ptr`: The new address of the `BitPtr<T>`’s domain.
+	///
+	/// # Safety
+	///
+	/// None. The invariants of `::new` must be checked at the caller.
+	#[inline]
+	#[cfg(feature = "alloc")]
+	pub(crate) unsafe fn set_pointer(&mut self, addr: impl Into<Address<T>>) {
+		let mut addr = addr.into();
+		if addr.to_const().is_null() {
+			*self = Self::EMPTY;
+			return;
+		}
+		addr.addr &= Self::PTR_ADDR_MASK;
+		addr.addr |= self.ptr.as_ptr() as usize & Self::PTR_HEAD_MASK;
+		self.ptr = NonNull::new_unchecked(addr.to_mut() as *mut u8);
+	}
+
+	/// Gets the starting bit index of the referent region.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A `BitIdx` of the first live bit in the element at the `self.pointer()`
+	/// address.
+	pub(crate) fn head(&self) -> BitIdx<T::Mem> {
+		//  Get the high part of the head counter out of the pointer.
+		let ptr = self.ptr.as_ptr() as usize;
+		let ptr_head = (ptr & Self::PTR_HEAD_MASK) << Self::LEN_HEAD_BITS;
+		//  Get the low part of the head counter out of the length.
+		let len_head = self.len & Self::LEN_HEAD_MASK;
+		//  Combine and mark as an index.
+		unsafe { BitIdx::new_unchecked((ptr_head | len_head) as u8) }
+	}
+
+	/// Write a new `head` value into the pointer, with no other effects.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `head`: A new starting index.
+	///
+	/// # Effects
+	///
+	/// `head` is written into the `.head` logical field, without affecting
+	/// `.addr` or `.bits`.
+	#[cfg(feature = "alloc")]
+	pub(crate) unsafe fn set_head(&mut self, head: BitIdx<T::Mem>) {
+		let head = head.value() as usize;
+		let mut ptr = self.ptr.as_ptr() as usize;
+
+		ptr &= Self::PTR_ADDR_MASK;
+		ptr |= head >> Self::LEN_HEAD_BITS;
+		self.ptr = NonNull::new_unchecked(ptr as *mut u8);
+
+		self.len &= !Self::LEN_HEAD_MASK;
+		self.len |= head & Self::LEN_HEAD_MASK;
+	}
+
+	/// Gets the number of live bits in the referent region.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A count of how many live bits the region pointer describes.
+	#[inline]
+	pub(crate) fn len(&self) -> usize {
+		self.len >> Self::LEN_HEAD_BITS
+	}
+
+	/// Sets the `.bits` logical member to a new value.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `len`: A new bit length. This must not be greater than
+	///   `Self::REGION_MAX_BITS`.
+	///
+	/// # Effects
+	///
+	/// The `new_len` value is written directly into the `.bits` logical field.
+	#[inline]
+	pub(crate) unsafe fn set_len(&mut self, new_len: usize) {
+		debug_assert!(
+			new_len <= Self::REGION_MAX_BITS,
+			"Length {} out of range",
+			new_len,
+		);
+		self.len &= Self::LEN_HEAD_MASK;
+		self.len |= new_len << Self::LEN_HEAD_BITS;
+	}
+
+	/// Gets the three logical components of the pointer.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// - `.0`: The base address of the referent memory region.
+	/// - `.1`: The index of the first live bit in the first element of the
+	///   region.
+	/// - `.2`: The number of live bits in the region.
+	#[inline]
+	pub(crate) fn raw_parts(&self) -> (Address<T>, BitIdx<T::Mem>, usize) {
+		(self.pointer(), self.head(), self.len())
+	}
+
+	/// Computes the number of elements, starting at `self.pointer()`, that the
+	/// region touches.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// The count of all elements, starting at `self.pointer()`, that contain
+	/// live bits included in the referent region.
+	pub(crate) fn elements(&self) -> usize {
+		//  Find the distance of the last bit from the base address.
+		let total = self.len() + self.head().value() as usize;
+		//  The element count is always the bit count divided by the bit width,
+		let base = total >> T::Mem::INDX;
+		//  plus whether any fractional element exists after the division.
+		let tail = total as u8 & T::Mem::MASK;
+		base + (tail != 0) as usize
+	}
+
+	/// Computes the tail index for the first dead bit after the live bits.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A `BitTail` that is the index of the first dead bit after the last live
+	/// bit in the last element. This will almost always be in the range `1 ..=
+	/// T::Mem::BITS`.
+	///
+	/// It will be zero only when `self` is empty.
+	#[inline]
+	pub(crate) fn tail(&self) -> BitTail<T::Mem> {
+		let (head, len) = (self.head(), self.len());
+
+		if head.value() == 0 && len == 0 {
+			return BitTail::ZERO;
+		}
+
+		//  Compute the in-element tail index as the head plus the length,
+		//  modulated by the element width.
+		let tail = (head.value() as usize + len) & T::Mem::MASK as usize;
+		/* If the tail is zero, wrap it to `T::Mem::BITS` as the maximal. This
+		upshifts `1` (tail is zero) or `0` (tail is not), then sets the upshift
+		on the rest of the tail, producing something in the range
+		`1 ..= T::Mem::BITS`.
+		*/
+		unsafe {
+			BitTail::new_unchecked(
+				(((tail == 0) as u8) << T::Mem::INDX) | tail as u8,
+			)
+		}
+	}
+
+	/// Increments the `.head` logical field, rolling over into `.addr`.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	///
+	/// # Effects
+	///
+	/// Increments `.head` by one. If the increment resulted in a rollover to
+	/// `0`, then the `.addr` field is increased to the next `T::Mem` stepping.
+	#[inline]
+	pub(crate) unsafe fn incr_head(&mut self) {
+		//  Increment the cursor, permitting rollover to `T::Mem::BITS`.
+		let head = self.head().value() as usize + 1;
+
+		//  Write the low bits into the `.len` field, then discard them.
+		self.len &= !Self::LEN_HEAD_MASK;
+		self.len |= head & Self::LEN_HEAD_MASK;
+		let head = head >> Self::LEN_HEAD_BITS;
+
+		//  Erase the high bits of `.head` from `.ptr`,
+		let mut ptr = self.ptr.as_ptr() as usize;
+		ptr &= Self::PTR_ADDR_MASK;
+		/* Then numerically add the high bits of `.head` into the low bits of
+		`.ptr`. If the head increment rolled over into a new element, this will
+		have the effect of raising the `.addr` logical field to the next element
+		address, in one instruction.
+		*/
+		ptr += head;
+		self.ptr = NonNull::new_unchecked(ptr as *mut u8);
+	}
+
+	/// Views the referent memory region as a slice of aliased elements.
+	///
+	/// This view will cause UB if it is used simultaneously with views of the
+	/// referent region that assume full immutability of referent data.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A slice handle over all memory elements this pointer describes.
+	///
+	/// # Safety
+	///
+	/// `T` will be marked as `::Alias` where necessary by `BitSlice`, and so
+	/// this pointer already contains the aliasing information it needs to be
+	/// safe.
+	#[inline]
+	pub(crate) fn as_aliased_slice<'a>(&self) -> &'a [T::Alias] {
+		unsafe {
+			slice::from_raw_parts(self.pointer().to_alias(), self.elements())
+		}
+	}
+
+	/// Reads a bit some distance away from `self`.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: A bit ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `index`: The bit distance away from `self` at which to read.
+	///
+	/// # Returns
+	///
+	/// The value of the bit `index` bits away from `self.head()`, according to
+	/// the `O` ordering.
+	#[inline]
+	pub(crate) unsafe fn read<O>(&self, index: usize) -> bool
+	where O: BitOrder {
+		let (elt, bit) = self.head().offset(index as isize);
+		let base = self.pointer().to_const();
+		(&*base.offset(elt)).get_bit::<O>(bit)
+	}
+
+	/// Writes a bit some distance away from `self`.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: A bit ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: The `self` pointer must be describing a write-capable region.
+	/// - `index`: The bit distance away from `self` at which to write,
+	///   according to the `O` ordering.
+	/// - `value`: The bit value to insert at `index`.
+	///
+	/// # Effects
+	///
+	/// `value` is written to the bit specified by `index`, relative to
+	/// `self.head()` and `self.pointer()`.
+	#[inline]
+	pub(crate) unsafe fn write<O>(&self, index: usize, value: bool)
+	where O: BitOrder {
+		let (elt, bit) = self.head().offset(index as isize);
+		let base = self.pointer().to_access();
+		(&*base.offset(elt)).write_bit::<O>(bit, value);
+	}
+
+	/// Produces the distance, in elements and bits, between two bit-pointers.
+	///
+	/// # Undefined Behavior
+	///
+	/// It is undefined to calculate the distance between pointers that are not
+	/// part of the same allocation region. This function is defined only when
+	/// `self` and `other` are produced from the same region.
+	///
+	/// # Parameters
+	///
+	/// - `self`
+	/// - `other`: Another `BitPtr<T>`. This function is undefined if it is not
+	///   produced from the same region as `self`.
+	///
+	/// # Returns
+	///
+	/// - `.0`: The distance in elements between the first element of `self` and
+	///   the first element of `other`. Negative if `other` is lower in memory
+	///   than `self`; positive if `other` is higher.
+	/// - `.1`: The distance in bits between the first bit of `self` and the
+	///   first bit of `other`. Negative if `other`’s first bit is lower in its
+	///   element than is `self`’s first bit; positive if `other`’s first bit is
+	///   higher in its element than is `self`’s first bit.
+	///
+	/// # Truth Tables
+	///
+	/// Consider two adjacent bytes in memory. We will define four pairs of
+	/// bit-pointers of width `1` at various points in this span in order to
+	/// demonstrate the four possible states of difference.
+	///
+	/// ```text
+	///    [ 0 1 2 3 4 5 6 7 ] [ 8 9 a b c d e f ]
+	/// 1.       A                       B
+	/// 2.             A             B
+	/// 3.           B           A
+	/// 4.     B                             A
+	/// ```
+	///
+	/// 1. The pointer `A` is in the lower element and `B` is in the higher. The
+	///    first bit of `A` is lower in its element than the first bit of `B` is
+	///    in its element. `A.ptr_diff(B)` thus produces positive element and
+	///    bit distances: `(1, 2)`.
+	/// 2. The pointer `A` is in the lower element and `B` is in the higher. The
+	///    first bit of `A` is higher in its element than the first bit of `B`
+	///    is in its element. `A.ptr_diff(B)` thus produces a positive element
+	///    distance and a negative bit distance: `(1, -3)`.
+	/// 3. The pointer `A` is in the higher element and `B` is in the lower. The
+	///    first bit of `A` is lower in its element than the first bit of `B` is
+	///    in its element. `A.ptr_diff(B)` thus produces a negative element
+	///    distance and a positive bit distance: `(-1, 4)`.
+	/// 4. The pointer `A` is in the higher element and `B` is in the lower. The
+	///    first bit of `A` is higher in its element than the first bit of `B`
+	///    is in its element. `A.ptr_diff(B)` thus produces negative element and
+	///    bit distances: `(-1, -5)`.
+	pub(crate) unsafe fn ptr_diff(self, other: Self) -> (isize, i8) {
+		let self_ptr = self.pointer();
+		let other_ptr = other.pointer();
+		//  FIXME(myrrlyn): `core::ptr::offset_from` stabilizes in 1.47.
+		//  let elts = other_ptr.to_const().offset_from(self_ptr.to_const());
+		let elts = other_ptr
+		.value()
+		.wrapping_sub(self_ptr.value())
+			//  Pointers are byte-addressed, so remember to divide the byte
+			//  distance by the element width.
+			.wrapping_div(core::mem::size_of::<T>()) as isize;
+		let bits = other.head().value() as i8 - self.head().value() as i8;
+		(elts, bits)
+	}
+
+	/// Typecasts a raw region pointer into a pointer structure.
+	#[inline]
+	pub(crate) fn from_bitslice_ptr<O>(raw: *const BitSlice<O, T>) -> Self
+	where O: BitOrder {
+		let slice_nn = match NonNull::new(raw as *const [()] as *mut [()]) {
+			Some(r) => r,
+			None => return Self::EMPTY,
+		};
+		let ptr = dvl::nonnull_slice_to_base(slice_nn).cast::<u8>();
+		let len = unsafe { slice_nn.as_ref() }.len();
+		Self {
+			ptr,
+			len,
+			_ty: PhantomData,
+		}
+	}
+
+	/// Typecasts a raw region pointer into a pointer structure.
+	#[inline(always)]
+	#[cfg(feature = "alloc")]
+	pub(crate) fn from_bitslice_ptr_mut<O>(raw: *mut BitSlice<O, T>) -> Self
+	where O: BitOrder {
+		Self::from_bitslice_ptr(raw as *const BitSlice<O, T>)
+	}
+
+	/// Type-casts the pointer structure into a raw region pointer.
+	#[inline]
+	pub(crate) fn to_bitslice_ptr<O>(self) -> *const BitSlice<O, T>
+	where O: BitOrder {
+		ptr::slice_from_raw_parts(
+			self.ptr.as_ptr() as *const u8 as *const (),
+			self.len,
+		) as *const BitSlice<O, T>
+	}
+
+	/// Typecasts the pointer structure into a raw mutable-region pointer.
+	#[inline(always)]
+	pub(crate) fn to_bitslice_ptr_mut<O>(self) -> *mut BitSlice<O, T>
+	where O: BitOrder {
+		self.to_bitslice_ptr::<O>() as *mut BitSlice<O, T>
+	}
+
+	/// Typecasts the pointer structure into a region reference.
+	///
+	/// # Safety
+	///
+	/// This must only be used when the pointer refers to a region that is
+	/// correctly initialized in the caller’s context. There must be no `&mut
+	/// BitSlice<O, T>` references to the referent region.
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The minimum lifetime of the referent region, as understood by
+	///   the caller.
+	#[inline(always)]
+	pub(crate) fn to_bitslice_ref<'a, O>(self) -> &'a BitSlice<O, T>
+	where O: BitOrder {
+		unsafe { &*self.to_bitslice_ptr::<O>() }
+	}
+
+	/// Typecasts the pointer structure into a mutable-region reference.
+	///
+	/// # Safety
+	///
+	/// This must only be used when the pointer refers to a region that is
+	/// correctly initialized *and uniquely mutable* in the caller’s context.
+	/// There must be no other references of any kind to the referent region.
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The minimum lifetime of the referent region, as understood by
+	///   the caller.
+	#[inline(always)]
+	pub(crate) fn to_bitslice_mut<'a, O>(self) -> &'a mut BitSlice<O, T>
+	where O: BitOrder {
+		unsafe { &mut *self.to_bitslice_ptr_mut::<O>() }
+	}
+
+	/// Typecasts the pointer structure into a `NonNull<BitSlice>` pointer.
+	///
+	/// This function is used by the owning indirect handles, and does not yet
+	/// have any purpose in non-`alloc` programs.
+	#[inline]
+	#[cfg(feature = "alloc")]
+	pub(crate) fn to_nonnull<O>(self) -> NonNull<BitSlice<O, T>>
+	where
+		O: BitOrder,
+		T: BitStore,
+	{
+		unsafe { NonNull::new_unchecked(self.to_bitslice_ptr_mut()) }
+	}
+
+	/// Renders the pointer structure into a formatter for use during
+	/// higher-level type `Debug` implementations.
+	///
+	/// # Parameters
+	///
+	/// - `self`
+	/// - `fmt`: The formatter into which the pointer is written.
+	/// - `name`: The suffix of the higher-level object rendering its pointer.
+	///   The `Bit` prefix is applied to the object type name in this format.
+	/// - `ord`: The name of a `BitOrder` type parameter, if any.
+	/// - `fields`: Any additional fields in the object’s debuginfo to be
+	///   rendered.
+	///
+	/// # Returns
+	///
+	/// The result of formatting the pointer into the receiver.
+	///
+	/// # Behavior
+	///
+	/// This function writes `Bit{name}<[{ord}, ]T> {{ {fields} }}` into the
+	/// `fmt` formatter, where `{fields}` includes the address, head index, and
+	/// bit count of the pointer, as well as any additional fields provided by
+	/// the caller.
+	///
+	/// Higher types in the crate should use this function to drive their
+	/// `Debug` implementations, and then use `BitSlice`’s list formatters to
+	/// display their contents if appropriate.
+	#[inline]
+	pub(crate) fn render<'a>(
+		&'a self,
+		fmt: &'a mut Formatter,
+		name: &'a str,
+		ord: Option<&'a str>,
+		fields: impl IntoIterator<Item = &'a (&'a str, &'a dyn Debug)>,
+	) -> fmt::Result
+	{
+		write!(fmt, "Bit{}<", name)?;
+		if let Some(ord) = ord {
+			write!(fmt, "{}, ", ord)?;
+		}
+		write!(fmt, "{}>", any::type_name::<T::Mem>())?;
+		let mut builder = fmt.debug_struct("");
+		builder
+			.field("addr", &self.pointer().fmt_pointer())
+			.field("head", &self.head().fmt_binary())
+			.field("bits", &self.len());
+		for (name, value) in fields {
+			builder.field(name, value);
+		}
+		builder.finish()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Clone for BitPtr<T>
+where T: BitStore
+{
+	fn clone(&self) -> Self {
+		Self { ..*self }
+	}
+}
+
+impl<T, U> PartialEq<BitPtr<U>> for BitPtr<T>
+where
+	T: BitStore,
+	U: BitStore,
+{
+	fn eq(&self, other: &BitPtr<U>) -> bool {
+		let (addr_a, head_a, bits_a) = self.raw_parts();
+		let (addr_b, head_b, bits_b) = other.raw_parts();
+		//  Since ::BITS is an associated const, the compiler will automatically
+		//  replace the entire function with `false` when the types don’t match.
+		T::Mem::BITS == U::Mem::BITS
+			&& addr_a.value() == addr_b.value()
+			&& head_a.value() == head_b.value()
+			&& bits_a == bits_b
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Default for BitPtr<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn default() -> Self {
+		Self::EMPTY
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Debug for BitPtr<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Pointer::fmt(self, fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> Pointer for BitPtr<T>
+where T: BitStore
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		self.render(fmt, "Ptr", None, None)
+	}
+}
+
+impl<T> Copy for BitPtr<T> where T: BitStore
+{
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::{
+		bits,
+		order::Msb0,
+	};
+
+	#[test]
+	#[cfg(feature = "alloc")]
+	fn render() {
+		let bits = bits![Msb0, u8; 0, 1, 0, 0];
+
+		let render = format!("{:?}", bits.bitptr());
+		assert!(render.starts_with("BitPtr<u8> { addr: 0x"));
+		assert!(render.ends_with(", head: 000, bits: 4 }"));
+
+		let render = format!("{:#?}", bits);
+		assert!(render.starts_with("BitSlice<bitvec::order::Msb0, u8> {"));
+		assert!(render.ends_with("} [\n    0b0100,\n]"), "{}", render);
+	}
+
+	#[test]
+	fn ptr_diff() {
+		let bits = bits![Msb0, u8; 0; 16];
+
+		let a = bits[2 .. 3].bitptr();
+		let b = bits[12 .. 13].bitptr();
+		assert_eq!(unsafe { a.ptr_diff(b) }, (1, 2));
+
+		let a = bits[5 .. 6].bitptr();
+		let b = bits[10 .. 11].bitptr();
+		assert_eq!(unsafe { a.ptr_diff(b) }, (1, -3));
+
+		let a = bits[8 .. 9].bitptr();
+		let b = bits[4 .. 5].bitptr();
+		assert_eq!(unsafe { a.ptr_diff(b) }, (-1, 4));
+
+		let a = bits[14 .. 15].bitptr();
+		let b = bits[1 .. 2].bitptr();
+		assert_eq!(unsafe { a.ptr_diff(b) }, (-1, -5));
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/prelude.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/prelude.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/prelude.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/prelude.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,117 @@
+/*! `bitvec` symbol export
+
+This module collects the general public API into a single spot for inclusion, as
+`use bitvec::prelude::*;`, without polluting the root namespace of the crate.
+
+The prelude has a number of submodules, which can be used to limit the symbols
+imported.
+
+The `base` module (`use bitvec::prelude::base::*;`) imports only the data types
+and macros needed to make direct use of the crate. It also imports trait
+*methods* from `BitField` and `BitView`, without importing those trait names.
+
+The `macros` module imports only the constructor macros.
+
+The `traits` module imports the names of all traits in the crate.
+
+The `types` module imports all data types in the crate.
+
+You may alternatively wish to import the crate root, or this prelude, under a
+shorter name, without bringing any other items into scope. The import statements
+
+```rust,ignore
+use bitvec as bv;
+//  or
+use bitvec::prelude as bv;
+```
+
+will make the crate symbols available under the `bv` namespace instead of the
+longer `bitvec`. The prelude contains all the major public symbols of the crate
+directly, while the crate root does not reëxport the items in its submodules.
+Use whichever path root you prefer: crate for full paths, and prelude for
+shortcuts.
+!*/
+
+/// The base symbols, containing only the minimum needed to use the crate.
+pub mod base {
+	pub use super::{
+		macros::*,
+		trait_methods::*,
+	};
+
+	pub use crate::{
+		array::BitArray,
+		order::{
+			LocalBits,
+			Lsb0,
+			Msb0,
+		},
+		slice::BitSlice,
+	};
+
+	#[cfg(feature = "alloc")]
+	pub use crate::{
+		boxed::BitBox,
+		vec::BitVec,
+	};
+}
+
+/// Macros available for default export.
+pub mod macros {
+	pub use crate::{
+		bitarr,
+		bits,
+	};
+
+	#[cfg(feature = "alloc")]
+	pub use crate::{
+		bitbox,
+		bitvec,
+	};
+}
+
+/// Traits available for default export.
+pub mod traits {
+	pub use crate::{
+		field::BitField,
+		mem::BitMemory,
+		order::BitOrder,
+		store::BitStore,
+		view::BitView,
+	};
+}
+
+/// Imports trait methods without importing the traits themselves.
+pub mod trait_methods {
+	pub use crate::{
+		field::BitField as _,
+		view::BitView as _,
+	};
+}
+
+/// Datatypes available for default export.
+pub mod types {
+	pub use crate::{
+		array::BitArray,
+		domain::{
+			BitDomain,
+			BitDomainMut,
+		},
+		order::{
+			LocalBits,
+			Lsb0,
+			Msb0,
+		},
+		slice::BitSlice,
+	};
+
+	#[cfg(feature = "alloc")]
+	pub use crate::{
+		boxed::BitBox,
+		vec::BitVec,
+	};
+}
+
+pub use macros::*;
+pub use traits::*;
+pub use types::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/serdes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/serdes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/serdes.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/serdes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,466 @@
+/*! `serde`-powered de/serialization.
+
+This module implements the Serde traits for the `bitvec` types.
+
+`BitSlice` is able to implement `Serialize`, but `serde` does not provide a
+mechanism for deserializing into data borrowed from the calling context. Thus,
+`BitSlice` can only deserialize into `BitBox` or `BitVec`, when built with the
+`"alloc"` feature.
+
+`BitBox` and `BitVec` implement serialization through `BitSlice`, and
+deserialize `BitSlice`s into themselves.
+
+`BitArray` has different behavior: because it always spans the full memory
+buffer, and has no partial edge elements, it de/serializes the underlying memory
+array without any additional information. It is currently incapable of
+deserializing the stream produced by serializing `BitSlice`, and can only
+deserialize the streams produced by `BitArray`s and ordinary arrays.
+
+If you require de/serialization compatibility between `BitArray` and the other
+structures, please file an issue.
+!*/
+
+#![cfg(feature = "serde")]
+
+use crate::{
+	array::BitArray,
+	devel as dvl,
+	domain::Domain,
+	index::BitRegister,
+	mem::BitMemory,
+	order::BitOrder,
+	pointer::BitPtr,
+	slice::BitSlice,
+	store::BitStore,
+	view::BitView,
+};
+
+use core::{
+	cmp,
+	convert::TryInto,
+	fmt::{
+		self,
+		Formatter,
+	},
+	marker::PhantomData,
+	mem::ManuallyDrop,
+	ptr,
+};
+
+use serde::{
+	de::{
+		self,
+		Deserialize,
+		Deserializer,
+		MapAccess,
+		SeqAccess,
+		Unexpected,
+		Visitor,
+	},
+	ser::{
+		Serialize,
+		SerializeSeq,
+		SerializeStruct,
+		Serializer,
+	},
+};
+
+use tap::pipe::Pipe;
+
+#[cfg(feature = "alloc")]
+use crate::{
+	boxed::BitBox,
+	vec::BitVec,
+};
+
+impl<O, T> Serialize for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Mem: Serialize,
+{
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		let head = self.bitptr().head();
+		let mut state = serializer.serialize_struct("BitSet", 3)?;
+
+		state.serialize_field("head", &head.value())?;
+		state.serialize_field("bits", &(self.len() as u64))?;
+		state.serialize_field("data", &self.domain())?;
+
+		state.end()
+	}
+}
+
+impl<T> Serialize for Domain<'_, T>
+where
+	T: BitStore,
+	T::Mem: Serialize,
+{
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		let mut state = serializer.serialize_seq(Some(self.len()))?;
+		for elem in *self {
+			state.serialize_element(&elem)?;
+		}
+		state.end()
+	}
+}
+
+impl<O, V> Serialize for BitArray<O, V>
+where
+	O: BitOrder,
+	V: BitView,
+	V::Mem: Serialize,
+{
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		self.as_raw_slice().serialize(serializer)
+	}
+}
+
+#[cfg(feature = "alloc")]
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Serialize for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Mem: Serialize,
+{
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		self.as_bitslice().serialize(serializer)
+	}
+}
+
+#[cfg(feature = "alloc")]
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Serialize for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Mem: Serialize,
+{
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		self.as_bitslice().serialize(serializer)
+	}
+}
+
+impl<'de, O, T> Deserialize<'de> for BitArray<O, T>
+where
+	O: BitOrder,
+	T: BitStore + BitRegister,
+	T::Mem: Deserialize<'de>,
+{
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'de> {
+		deserializer
+			.pipe(<T::Mem as Deserialize<'de>>::deserialize)?
+			.pipe(dvl::remove_mem::<T>)
+			.pipe(Self::new)
+			.pipe(Ok)
+	}
+}
+
+macro_rules! deser_array {
+	($($n:expr),+ $(,)?) => { $(
+		impl<'de, O, T> Deserialize<'de> for BitArray<O, [T; $n]>
+		where
+			O: BitOrder,
+			T: BitStore,
+			T::Mem: Deserialize<'de>
+		{
+			fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+			where D: Deserializer<'de> {
+				deserializer
+					.pipe(<[T::Mem; $n] as Deserialize<'de>>::deserialize)?
+					.pipe(|arr| unsafe { ptr::read(&arr as *const [T::Mem; $n] as *const [T; $n]) })
+					.pipe(Self::new)
+					.pipe(Ok)
+			}
+		}
+	)+ };
+}
+
+deser_array!(
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32
+);
+
+#[cfg(feature = "alloc")]
+#[derive(Clone, Copy, Debug, Default)]
+struct BitVecVisitor<'de, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Mem: Deserialize<'de>,
+{
+	_lt: PhantomData<&'de ()>,
+	_bs: PhantomData<BitVec<O, T>>,
+}
+
+#[cfg(feature = "alloc")]
+impl<'de, O, T> BitVecVisitor<'de, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Mem: Deserialize<'de>,
+{
+	const THIS: Self = Self {
+		_lt: PhantomData,
+		_bs: PhantomData,
+	};
+
+	/// Constructs a `BitVec` from deserialized components.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: A visitor, only needed for access to an error message.
+	/// - `head`: The deserialized head-bit index.
+	/// - `bits`: The deserialized length counter.
+	/// - `data`: A vector of memory containing the bitslice. Its dest
+	///
+	/// # Returns
+	///
+	/// The result of assembling the deserialized components into a `BitVec`.
+	/// This can fail if the `head` is invalid, or if the deserialized data
+	/// cannot be encoded into a `BitPtr`.
+	fn assemble<E>(
+		&self,
+		head: u8,
+		bits: usize,
+		data: Vec<T::Mem>,
+	) -> Result<<Self as Visitor<'de>>::Value, E>
+	where
+		E: de::Error,
+	{
+		//  Disable the destructor on the deserialized buffer
+		let data = ManuallyDrop::new(data);
+		//  Assemble a region pointer
+		BitPtr::new(
+			data.as_ptr() as *mut T,
+			//  Attempt to read the `head` index as a `BitIdx` bounded by the
+			//  destination type.
+			head.try_into().map_err(|_| {
+				de::Error::invalid_value(
+					Unexpected::Unsigned(head as u64),
+					&"a head-bit index less than the deserialized element \
+					  type’s bit width",
+				)
+			})?,
+			//  Ensure that the `bits` counter is not lying about the data size.
+			cmp::min(bits, data.len().saturating_mul(T::Mem::BITS as usize)),
+		)
+		//  Fail if the source cannot be encoded into a bit pointer.
+		.ok_or_else(|| {
+			de::Error::invalid_value(
+				Unexpected::Other("invalid bit-region source data"),
+				self,
+			)
+		})?
+		//  No more branches remain, only typesystem manipulation,
+		.pipe(BitPtr::to_bitslice_ptr_mut)
+		.pipe(|bp| unsafe { BitVec::from_raw_parts(bp, data.capacity()) })
+		.pipe(Ok)
+	}
+}
+
+#[cfg(feature = "alloc")]
+impl<'de, O, T> Visitor<'de> for BitVecVisitor<'de, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Mem: Deserialize<'de>,
+{
+	type Value = BitVec<O, T>;
+
+	fn expecting(&self, fmt: &mut Formatter) -> fmt::Result {
+		fmt.write_str("a BitSet data series")
+	}
+
+	/// Visit a sequence of anonymous data elements. These must be in the order
+	/// `u8` (head-bit index), `u64` (length counter), `[T::Mem]` (data
+	/// contents).
+	fn visit_seq<V>(self, mut seq: V) -> Result<Self::Value, V::Error>
+	where V: SeqAccess<'de> {
+		let head = seq
+			.next_element::<u8>()?
+			.ok_or_else(|| de::Error::invalid_length(0, &self))?;
+		let bits = seq
+			.next_element::<u64>()?
+			.ok_or_else(|| de::Error::invalid_length(1, &self))?;
+		let data = seq
+			.next_element::<Vec<T::Mem>>()?
+			.ok_or_else(|| de::Error::invalid_length(2, &self))?;
+
+		self.assemble(head, bits as usize, data)
+	}
+
+	/// Visit a map of named data elements. These may be in any order, and must
+	/// be the pairs `head: u8`, `bits: u64`, and `data: [T::Mem]`.
+	fn visit_map<V>(self, mut map: V) -> Result<Self::Value, V::Error>
+	where V: MapAccess<'de> {
+		let mut head: Option<u8> = None;
+		let mut bits: Option<u64> = None;
+		let mut data: Option<Vec<T::Mem>> = None;
+
+		while let Some(key) = map.next_key()? {
+			match key {
+				"head" => {
+					if head.replace(map.next_value()?).is_some() {
+						return Err(de::Error::duplicate_field("head"));
+					}
+				},
+				"bits" => {
+					if bits.replace(map.next_value()?).is_some() {
+						return Err(de::Error::duplicate_field("bits"));
+					}
+				},
+				"data" => {
+					if data.replace(map.next_value()?).is_some() {
+						return Err(de::Error::duplicate_field("data"));
+					}
+				},
+				f => {
+					return Err(de::Error::unknown_field(f, &[
+						"head", "bits", "data",
+					]));
+				},
+			}
+		}
+		let head = head.ok_or_else(|| de::Error::missing_field("head"))?;
+		let bits = bits.ok_or_else(|| de::Error::missing_field("bits"))?;
+		let data = data.ok_or_else(|| de::Error::missing_field("data"))?;
+
+		self.assemble(head, bits as usize, data)
+	}
+}
+
+#[cfg(feature = "alloc")]
+impl<'de, O, T> Deserialize<'de> for BitBox<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Mem: Deserialize<'de>,
+{
+	#[inline]
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'de> {
+		deserializer
+			.pipe(<BitVec<O, T> as Deserialize<'de>>::deserialize)
+			.map(BitVec::into_boxed_bitslice)
+	}
+}
+
+#[cfg(feature = "alloc")]
+impl<'de, O, T> Deserialize<'de> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Mem: Deserialize<'de>,
+{
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'de> {
+		deserializer.deserialize_struct(
+			"BitSet",
+			&["head", "bits", "data"],
+			BitVecVisitor::THIS,
+		)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::prelude::*;
+
+	use serde_test::{
+		assert_ser_tokens,
+		Token,
+	};
+
+	#[cfg(feature = "alloc")]
+	use serde_test::{
+		assert_de_tokens,
+		assert_de_tokens_error,
+	};
+
+	macro_rules! bvtok {
+		( s $elts:expr, $head:expr, $bits:expr, $ty:ident $( , $data:expr )* ) => {
+			&[
+				Token::Struct { name: "BitSet", len: 3, },
+				Token::Str("head"), Token::U8( $head ),
+				Token::Str("bits"), Token::U64( $bits ),
+				Token::Str("data"), Token::Seq { len: Some( $elts ) },
+				$( Token:: $ty ( $data ), )*
+				Token::SeqEnd,
+				Token::StructEnd,
+			]
+		};
+		( d $elts:expr, $head:expr, $bits:expr, $ty:ident $( , $data:expr )* ) => {
+			&[
+				Token::Struct { name: "BitSet", len: 3, },
+				Token::BorrowedStr("head"), Token::U8( $head ),
+				Token::BorrowedStr("bits"), Token::U64( $bits ),
+				Token::BorrowedStr("data"), Token::Seq { len: Some( $elts ) },
+				$( Token:: $ty ( $data ), )*
+				Token::SeqEnd,
+				Token::StructEnd,
+			]
+		};
+	}
+
+	#[test]
+	fn empty() {
+		let slice = BitSlice::<Msb0, u8>::empty();
+
+		assert_ser_tokens(&slice, bvtok![s 0, 0, 0, U8]);
+
+		#[cfg(feature = "alloc")]
+		assert_de_tokens(&bitvec![], bvtok![ d 0, 0, 0, U8 ]);
+	}
+
+	#[test]
+	fn small() {
+		let bits = 0b1111_1000u8.view_bits::<Msb0>();
+		let bits = &bits[1 .. 5];
+		assert_ser_tokens(&bits, bvtok![s 1, 1, 4, U8, 0b1111_1000]);
+
+		let bits = 0b00001111_11111111u16.view_bits::<Lsb0>();
+		let bits = &bits[.. 12];
+		assert_ser_tokens(&bits, bvtok![s 1, 0, 12, U16, 0b00001111_11111111]);
+
+		let bits = 0b11_11111111u32.view_bits::<LocalBits>();
+		let bits = &bits[.. 10];
+		assert_ser_tokens(&bits, bvtok![s 1, 0, 10, U32, 0x00_00_03_FF]);
+	}
+
+	#[test]
+	#[cfg(feature = "alloc")]
+	fn wide() {
+		let src: &[u8] = &[0, !0];
+		let bs = src.view_bits::<LocalBits>();
+		assert_ser_tokens(&(&bs[1 .. 15]), bvtok![s 2, 1, 14, U8, 0, !0]);
+	}
+
+	#[test]
+	#[cfg(feature = "alloc")]
+	fn deser() {
+		let bv = bitvec![Msb0, u8; 0, 1, 1, 0, 1, 0];
+		assert_de_tokens(&bv, bvtok![d 1, 0, 6, U8, 0b0110_1000]);
+		//  test that the bits outside the bits domain don't matter in deser
+		assert_de_tokens(&bv, bvtok![d 1, 0, 6, U8, 0b0110_1001]);
+		assert_de_tokens(&bv, bvtok![d 1, 0, 6, U8, 0b0110_1010]);
+		assert_de_tokens(&bv, bvtok![d 1, 0, 6, U8, 0b0110_1011]);
+	}
+
+	#[test]
+	#[cfg(feature = "alloc")]
+	fn error_paths() {
+		assert_de_tokens_error::<BitVec<Msb0, u8>>(
+			bvtok!(d 0, 9, 0, U8),
+			"invalid value: integer `9`, expected a head-bit index less than \
+			 the deserialized element type’s bit width",
+		);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/api.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2906 @@
+//! Port of the `[T]` function API.
+
+use crate::{
+	access::BitAccess,
+	array::BitArray,
+	devel as dvl,
+	domain::{
+		Domain,
+		DomainMut,
+	},
+	index::BitRegister,
+	mem::BitMemory,
+	order::BitOrder,
+	pointer::BitPtr,
+	slice::{
+		iter::{
+			Chunks,
+			ChunksExact,
+			ChunksExactMut,
+			ChunksMut,
+			Iter,
+			IterMut,
+			RChunks,
+			RChunksExact,
+			RChunksExactMut,
+			RChunksMut,
+			RSplit,
+			RSplitMut,
+			RSplitN,
+			RSplitNMut,
+			Split,
+			SplitMut,
+			SplitN,
+			SplitNMut,
+			Windows,
+		},
+		BitMut,
+		BitSlice,
+	},
+	store::BitStore,
+};
+
+use core::{
+	cmp,
+	ops::{
+		Range,
+		RangeBounds,
+		RangeFrom,
+		RangeFull,
+		RangeInclusive,
+		RangeTo,
+		RangeToInclusive,
+	},
+};
+
+use tap::{
+	pipe::Pipe,
+	tap::Tap,
+};
+
+#[cfg(feature = "alloc")]
+use crate::vec::BitVec;
+
+/// Port of the `[T]` inherent API.
+impl<O, T> BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Returns the number of bits in the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::len`](https://doc.rust-lang.org/std/primitive.slice.html#method.len)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// assert_eq!(bits![0].len(), 1);
+	/// ```
+	#[inline]
+	pub fn len(&self) -> usize {
+		self.bitptr().len()
+	}
+
+	/// Returns `true` if the slice has a length of 0.
+	///
+	/// # Original
+	///
+	/// [`slice::is_empty`](https://doc.rust-lang.org/std/primitive.slice.html#method.is_empty)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// assert!(bits![].is_empty());
+	/// assert!(!bits![0].is_empty());
+	/// ```
+	#[inline]
+	pub fn is_empty(&self) -> bool {
+		/* TODO(myrrlyn): Investigate coercing all empty slices to `empty()`
+
+		The empty slice pointer represents its entire `.len` field as zero,
+		which removes a shift operation in the pointer decoding. `BitSlice` only
+		monotonically decreases, so when it becomes empty, writing `0` to `.len`
+		may be more advantageous than preserving the `head` component.
+		*/
+		self.bitptr().len() == 0
+	}
+
+	/// Returns the first bit of the slice, or `None` if it is empty.
+	///
+	/// # Original
+	///
+	/// [`slice::first`](https://doc.rust-lang.org/std/primitive.slice.html#method.first)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// assert_eq!(Some(&true), bits![1, 0].first());
+	/// assert!(bits![].first().is_none());
+	/// ```
+	#[inline]
+	pub fn first(&self) -> Option<&bool> {
+		self.get(0)
+	}
+
+	/// Returns a mutable pointer to the first bit of the slice, or `None` if it
+	/// is empty.
+	///
+	/// # Original
+	///
+	/// [`slice::first_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.first_mut)
+	///
+	/// # API Differences
+	///
+	/// This crate cannot manifest `&mut bool` references, and must use the
+	/// `BitMut` proxy type where `&mut bool` exists in the standard library
+	/// API. The proxy value must be bound as `mut` in order to write through
+	/// it.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0];
+	/// assert!(!bits[0]);
+	/// if let Some(mut first) = bits.first_mut() {
+	///   *first = true;
+	/// }
+	/// assert!(bits[0]);
+	/// ```
+	#[inline]
+	pub fn first_mut(&mut self) -> Option<BitMut<O, T>> {
+		self.get_mut(0)
+	}
+
+	/// Returns the first and all the rest of the bits of the slice, or `None`
+	/// if it is empty.
+	///
+	/// # Original
+	///
+	/// [`slice::split_first`](https://doc.rust-lang.org/std/primitive.slice.html#split_first)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// if let Some((first, rest)) = bits![1].split_first() {
+	///   assert!(*first);
+	///   assert!(rest.is_empty());
+	/// }
+	/// ```
+	#[inline]
+	pub fn split_first(&self) -> Option<(&bool, &Self)> {
+		match self.len() {
+			0 => None,
+			_ => unsafe {
+				let (head, rest) = self.split_at_unchecked(1);
+				Some((head.get_unchecked(0), rest))
+			},
+		}
+	}
+
+	/// Returns the first and all the rest of the bits of the slice, or `None`
+	/// if it is empty.
+	///
+	/// # Original
+	///
+	/// [`slice::split_first_mut`](https://doc.rust-lang.org/std/primitive.slice.html#split_first_mut)
+	///
+	/// # API Differences
+	///
+	/// This crate cannot manifest `&mut bool` references, and must use the
+	/// `BitMut` proxy type where `&mut bool` exists in the standard library
+	/// API. The proxy value must be bound as `mut` in order to write through
+	/// it.
+	///
+	/// Because the references are permitted to use the same memory address,
+	/// they are marked as aliasing in order to satisfy Rust’s requirements
+	/// about freedom from data races.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0; 3];
+	/// if let Some((mut first, rest)) = bits.split_first_mut() {
+	///   *first = true;
+	///   *rest.get_mut(1).unwrap() = true;
+	/// }
+	/// assert_eq!(bits.count_ones(), 2);
+	/// assert!(bits![mut].split_first_mut().is_none());
+	/// ```
+	#[inline]
+	//  `pub type Aliased = BitSlice<O, T::Alias>;` is not allowed in inherents,
+	//  so this will not be aliased.
+	#[allow(clippy::type_complexity)]
+	pub fn split_first_mut(
+		&mut self,
+	) -> Option<(BitMut<O, T::Alias>, &mut BitSlice<O, T::Alias>)> {
+		match self.len() {
+			0 => None,
+			_ => unsafe {
+				let (head, rest) = self.split_at_unchecked_mut(1);
+				Some((head.get_unchecked_mut(0), rest))
+			},
+		}
+	}
+
+	/// Returns the last and all the rest of the bits of the slice, or `None` if
+	/// it is empty.
+	///
+	/// # Original
+	///
+	/// [`slice::split_last`](https://doc.rust-lang.org/std/primitive.slice.html#method.split_last)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1];
+	/// if let Some((last, rest)) = bits.split_last() {
+	///   assert!(*last);
+	///   assert!(rest.is_empty());
+	/// }
+	/// ```
+	#[inline]
+	pub fn split_last(&self) -> Option<(&bool, &Self)> {
+		match self.len() {
+			0 => None,
+			len => unsafe {
+				let (rest, tail) = self.split_at_unchecked(len.wrapping_sub(1));
+				Some((tail.get_unchecked(0), rest))
+			},
+		}
+	}
+
+	/// Returns the last and all the rest of the bits of the slice, or `None` if
+	/// it is empty.
+	///
+	/// # Original
+	///
+	/// [`slice::split_last_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.split_last_mut)
+	///
+	/// # API Differences
+	///
+	/// This crate cannot manifest `&mut bool` references, and must use the
+	/// `BitMut` proxy type where `&mut bool` exists in the standard library
+	/// API. The proxy value must be bound as `mut` in order to write through
+	/// it.
+	///
+	/// Because the references are permitted to use the same memory address,
+	/// they are marked as aliasing in order to satisfy Rust’s requirements
+	/// about freedom from data races.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0; 3];
+	///
+	/// if let Some((mut last, rest)) = bits.split_last_mut() {
+	///   *last = true;
+	///   *rest.get_mut(1).unwrap() = true;
+	/// }
+	/// assert_eq!(bits.count_ones(), 2);
+	/// assert!(bits![mut].split_last_mut().is_none());
+	/// ```
+	#[inline]
+	//  `pub type Aliased = BitSlice<O, T::Alias>;` is not allowed in inherents,
+	//  so this will not be aliased.
+	#[allow(clippy::type_complexity)]
+	pub fn split_last_mut(
+		&mut self,
+	) -> Option<(BitMut<O, T::Alias>, &mut BitSlice<O, T::Alias>)> {
+		match self.len() {
+			0 => None,
+			len => unsafe {
+				let (rest, tail) = self.split_at_unchecked_mut(len - 1);
+				Some((tail.get_unchecked_mut(0), rest))
+			},
+		}
+	}
+
+	/// Returns the last bit of the slice, or `None` if it is empty.
+	///
+	/// # Original
+	///
+	/// [`slice::last`](https://doc.rust-lang.org/std/primitive.slice.html#method.last)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// assert_eq!(Some(&true), bits![0, 1].last());
+	/// assert!(bits![].last().is_none());
+	/// ```
+	#[inline]
+	pub fn last(&self) -> Option<&bool> {
+		match self.len() {
+			0 => None,
+			len => Some(unsafe { self.get_unchecked(len - 1) }),
+		}
+	}
+
+	/// Returns a mutable pointer to the last bit of the slice, or `None` if it
+	/// is empty.
+	///
+	/// # Original
+	///
+	/// [`slice::last_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.last_mut)
+	///
+	/// # API Differences
+	///
+	/// This crate cannot manifest `&mut bool` references, and must use the
+	/// `BitMut` proxy type where `&mut bool` exists in the standard library
+	/// API. The proxy value must be bound as `mut` in order to write through
+	/// it.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0];
+	/// if let Some(mut last) = bits.last_mut() {
+	///   *last = true;
+	/// }
+	/// assert!(bits[0]);
+	/// ```
+	#[inline]
+	pub fn last_mut(&mut self) -> Option<BitMut<O, T>> {
+		match self.len() {
+			0 => None,
+			len => Some(unsafe { self.get_unchecked_mut(len - 1) }),
+		}
+	}
+
+	/// Returns a reference to an element or subslice depending on the type of
+	/// index.
+	///
+	/// - If given a position, returns a reference to the element at that
+	///   position or `None` if out of bounds.
+	/// - If given a range, returns the subslice corresponding to that range, or
+	///   `None` if out of bounds.
+	///
+	/// # Original
+	///
+	/// [`slice::get`](https://doc.rust-lang.org/std/primitive.slice.html#method.get)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 0, 0];
+	///
+	/// assert_eq!(Some(&true), bits.get(1));
+	/// assert_eq!(Some(&bits[1 .. 3]), bits.get(1 .. 3));
+	/// assert!(bits.get(9).is_none());
+	/// assert!(bits.get(8 .. 10).is_none());
+	/// ```
+	#[inline]
+	pub fn get<'a, I>(&'a self, index: I) -> Option<I::Immut>
+	where I: BitSliceIndex<'a, O, T> {
+		index.get(self)
+	}
+
+	/// Returns a mutable reference to an element or subslice depending on the
+	/// type of index (see [`get`]) or `None` if the index is out of bounds.
+	///
+	/// # Original
+	///
+	/// [`slice::get_mut`](https://doc.rust-lang.org/core/slice/trait.SliceIndex.html#method.get_mut)
+	///
+	/// # API Differences
+	///
+	/// When `I` is `usize`, this returns `BitMut` instead of `&mut bool`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0; 2];
+	/// assert!(!bits.get(1).unwrap());
+	/// *bits.get_mut(1).unwrap() = true;
+	/// assert!(bits.get(1).unwrap());
+	/// ```
+	///
+	/// [`get`]: #method.get
+	#[inline]
+	pub fn get_mut<'a, I>(&'a mut self, index: I) -> Option<I::Mut>
+	where I: BitSliceIndex<'a, O, T> {
+		index.get_mut(self)
+	}
+
+	/// Returns a reference to an element or subslice, without doing bounds
+	/// checking.
+	///
+	/// This is generally not recommended; use with caution!
+	///
+	/// Unlike the original slice function, calling this with an out-of-bounds
+	/// index is not *technically* compile-time [undefined behavior], as the
+	/// references produced do not actually describe local memory. However, the
+	/// use of an out-of-bounds index will eventually cause an out-of-bounds
+	/// memory read, which is a runtime safety violation. For a safe alternative
+	/// see [`get`].
+	///
+	/// # Original
+	///
+	/// [`slice::get_unchecked`](https://doc.rust-lang.org/std/primitive.slice.html#method.get_unchecked)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1];
+	/// unsafe {
+	///   assert!(*bits.get_unchecked(1));
+	/// }
+	/// ```
+	///
+	/// [`get`]: #method.get
+	/// [undefined behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html
+	#[inline]
+	#[allow(clippy::missing_safety_doc)]
+	pub unsafe fn get_unchecked<'a, I>(&'a self, index: I) -> I::Immut
+	where I: BitSliceIndex<'a, O, T> {
+		index.get_unchecked(self)
+	}
+
+	/// Returns a mutable reference to the output at this location, without
+	/// doing bounds checking.
+	///
+	/// This is generally not recommended; use with caution!
+	///
+	/// Unlike the original slice function, calling this with an out-of-bounds
+	/// index is not *technically* compile-time [undefined behavior], as the
+	/// references produced do not actually describe local memory. However, the
+	/// use of an out-of-bounds index will eventually cause an out-of-bounds
+	/// memory write, which is a runtime safety violation. For a safe
+	/// alternative see [`get_mut`].
+	///
+	/// # Original
+	///
+	/// [`slice::get_unchecked_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.get_unchecked_mut)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0; 2];
+	/// unsafe {
+	///   let mut bit = bits.get_unchecked_mut(1);
+	///   *bit = true;
+	/// }
+	/// assert!(bits[1]);
+	/// ```
+	///
+	/// [`get_mut`]: #method.get_mut
+	/// [undefined behavior]: ../../reference/behavior-considered-undefined.html
+	#[inline]
+	#[allow(clippy::missing_safety_doc)]
+	pub unsafe fn get_unchecked_mut<'a, I>(&'a mut self, index: I) -> I::Mut
+	where I: BitSliceIndex<'a, O, T> {
+		index.get_unchecked_mut(self)
+	}
+
+	/// Returns a raw bit-slice pointer to the region.
+	///
+	/// The caller must ensure that the slice outlives the pointer this function
+	/// returns, or else it will end up pointing to garbage.
+	///
+	/// The caller must also ensure that the memory the pointer
+	/// (non-transitively) points to is only written to if `T` allows shared
+	/// mutation, using this pointer or any pointer derived from it. If you need
+	/// to mutate the contents of the slice, use [`as_mut_ptr`].
+	///
+	/// Modifying the container (such as `BitVec`) referenced by this slice may
+	/// cause its buffer to be reällocated, which would also make any pointers
+	/// to it invalid.
+	///
+	/// # Original
+	///
+	/// [`slice::as_ptr`](https://doc.rust-lang.org/std/primitive.slice.html#method.as_ptr)
+	///
+	/// # API Differences
+	///
+	/// This returns `*const BitSlice`, which is the equivalent of `*const [T]`
+	/// instead of `*const T`. The pointer encoding used requires more than one
+	/// CPU word of space to address a single bit, so there is no advantage to
+	/// removing the length information from the encoded pointer value.
+	///
+	/// # Notes
+	///
+	/// You **cannot** use any of the methods in the `pointer` fundamental type
+	/// or the `core::ptr` module on the `*_ BitSlice` type. This pointer
+	/// retains the `bitvec`-specific value encoding, and is incomprehensible by
+	/// the Rust standard library.
+	///
+	/// The only thing you can do with this pointer is dereference it.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 1, 0];
+	/// let bits_ptr = bits.as_ptr();
+	///
+	/// for i in 0 .. bits.len() {
+	///   assert_eq!(bits[i], unsafe {
+	///     (&*bits_ptr)[i]
+	///   });
+	/// }
+	/// ```
+	///
+	/// [`as_mut_ptr`]: #method.as_mut_ptr
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_ptr(&self) -> *const Self {
+		self as *const Self
+	}
+
+	/// Returns an unsafe mutable bit-slice pointer to the region.
+	///
+	/// The caller must ensure that the slice outlives the pointer this function
+	/// returns, or else it will end up pointing to garbage.
+	///
+	/// Modifying the container (such as `BitVec`) referenced by this slice may
+	/// cause its buffer to be reällocated, which would also make any pointers
+	/// to it invalid.
+	///
+	/// # Original
+	///
+	/// [`slice::as_mut_ptr`](https://doc.rust-lang.org/std/primitive.slice.html#method.as_mut_ptr)
+	///
+	/// # API Differences
+	///
+	/// This returns `*mut BitSlice`, which is the equivalont of `*mut [T]`
+	/// instead of `*mut T`. The pointer encoding used requires more than one
+	/// CPU word of space to address a single bit, so there is no advantage to
+	/// removing the length information from the encoded pointer value.
+	///
+	/// # Notes
+	///
+	/// You **cannot** use any of the methods in the `pointer` fundamental type
+	/// or the `core::ptr` module on the `*_ BitSlice` type. This pointer
+	/// retains the `bitvec`-specific value encoding, and is incomprehensible by
+	/// the Rust standard library.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Lsb0, u8; 0; 8];
+	/// let bits_ptr = bits.as_mut_ptr();
+	///
+	/// for i in 0 .. bits.len() {
+	///   unsafe { &mut *bits_ptr }.set(i, i % 3 == 0);
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b0100_1001);
+	/// ```
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_ptr(&mut self) -> *mut Self {
+		self as *mut Self
+	}
+
+	/// Swaps two bits in the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::swap`](https://doc.rust-lang.org/std/primitive.slice.html#method.swap)
+	///
+	/// # Arguments
+	///
+	/// - `a`: The index of the first bit
+	/// - `b`: The index of the second bit
+	///
+	/// # Panics
+	///
+	/// Panics if `a` or `b` are out of bounds.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0, 1];
+	/// bits.swap(0, 1);
+	/// assert_eq!(bits, bits![1, 0]);
+	/// ```
+	#[inline]
+	pub fn swap(&mut self, a: usize, b: usize) {
+		let len = self.len();
+		assert!(a < len, "Index {} out of bounds: {}", a, len);
+		assert!(b < len, "Index {} out of bounds: {}", b, len);
+		unsafe {
+			self.swap_unchecked(a, b);
+		}
+	}
+
+	/// Reverses the order of bits in the slice, in place.
+	///
+	/// # Original
+	///
+	/// [`slice::reverse`](https://doc.rust-lang.org/std/primitive.slice.html#method.reverse)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0b1_1001100u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// bits[1 ..].reverse();
+	/// assert_eq!(data, 0b1_0011001);
+	/// ```
+	#[inline]
+	pub fn reverse(&mut self) {
+		/* This would be better written as a recursive algorithm that swaps the
+		edge bits and recurses on `[1 .. len - 1]`, but Rust does not guarantee
+		tail-call optimization, and manual iteration allows for slight
+		performance optimization on the range reduction.
+
+		Begin with raw pointer manipulation. That’s how you know this is a good
+		function.
+		*/
+		let mut bitptr = self.bitptr();
+		//  The length does not need to be encoded into, and decoded back out
+		//  of, the pointer at each iteration. It is just a loop counter.
+		let mut len = bitptr.len();
+		//  Reversing 1 or 0 bits has no effect.
+		while len > 1 {
+			unsafe {
+				//  Bring `len` from one past the last to the last exactly.
+				len -= 1;
+				//  Swap the 0 and last indices.
+				bitptr.to_bitslice_mut::<O>().swap_unchecked(0, len);
+
+				//  Move the pointer upwards by one bit.
+				bitptr.incr_head();
+				//  `incr_head` slides the tail up by one, so decrease it again.
+				len -= 1;
+
+				//  TODO(myrrlyn): See if range subslicing can be made faster
+				//  than this unpacking.
+			}
+		}
+	}
+
+	/// Returns an iterator over the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::iter`](https://doc.rust-lang.org/std/primitive.slice.html#method.iter)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 0, 0, 0, 0, 0, 1];
+	/// let mut iterator = bits.iter();
+	///
+	/// assert_eq!(iterator.next(), Some(&false));
+	/// assert_eq!(iterator.next(), Some(&true));
+	/// assert_eq!(iterator.nth(5), Some(&true));
+	/// assert_eq!(iterator.next(), None);
+	/// ```
+	#[inline]
+	pub fn iter(&self) -> Iter<O, T> {
+		self.into_iter()
+	}
+
+	/// Returns an iterator that allows modifying each bit.
+	///
+	/// # Original
+	///
+	/// [`slice::iter_mut`](https://doc.rust-lang.org/std/primitive.slice.html#Method.iter_mut)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Msb0, u8; 0; 8];
+	/// for (idx, mut elem) in bits.iter_mut().enumerate() {
+	///   *elem = idx % 3 == 0;
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b100_100_10);
+	/// ```
+	#[inline]
+	pub fn iter_mut(&mut self) -> IterMut<O, T> {
+		self.into_iter()
+	}
+
+	/// Returns an iterator over all contiguous windows of length `size`. The
+	/// windows overlap. If the slice is shorter than `size`, the iterator
+	/// returns no values.
+	///
+	/// # Original
+	///
+	/// [`slice::windows`](https://doc.rust-lang.org/std/primitive.slice.html#method.windows)
+	///
+	/// # Panics
+	///
+	/// Panics if `size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1, 0, 1, 0, 0, 1, 0, 1];
+	/// let mut iter = bits.windows(6);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[.. 6]);
+	/// assert_eq!(iter.next().unwrap(), &bits[1 .. 7]);
+	/// assert_eq!(iter.next().unwrap(), &bits[2 ..]);
+	/// assert!(iter.next().is_none());
+	/// ```
+	///
+	/// If the slice is shorter than `size`:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = BitSlice::<LocalBits, usize>::empty();
+	/// let mut iter = bits.windows(1);
+	/// assert!(iter.next().is_none());
+	/// ```
+	#[inline]
+	pub fn windows(&self, size: usize) -> Windows<O, T> {
+		assert_ne!(size, 0, "Window width cannot be 0");
+		Windows::new(self, size)
+	}
+
+	/// Returns an iterator over `chunk_size` bits of the slice at a time,
+	/// starting at the beginning of the slice.
+	///
+	/// The chunks are slices and do not overlap. If `chunk_size` does not
+	/// divide the length of the slice, then the last chunk will not have length
+	/// `chunk_size`.
+	///
+	/// See [`chunks_exact`] for a variant of this iterator that returns chunks
+	/// of always exactly `chunk_size` bits, and [`rchunks`] for the same
+	/// iterator but starting at the end of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::chunks`](https://doc.rust-lang.org/std/primitive.slice.html#method.chunks)
+	///
+	/// # Panics
+	///
+	/// Panics if `chunk_size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 0, 1, 1, 1, 1, 0, 0];
+	/// let mut iter = bits.chunks(3);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[.. 3]);
+	/// assert_eq!(iter.next().unwrap(), &bits[3 .. 6]);
+	/// assert_eq!(iter.next().unwrap(), &bits[6 ..]);
+	/// assert!(iter.next().is_none());
+	/// ```
+	///
+	/// [`chunks_exact`]: #method.chunks_exact
+	/// [`rchunks`]: #method.rchunks
+	#[inline]
+	pub fn chunks(&self, chunk_size: usize) -> Chunks<O, T> {
+		assert_ne!(chunk_size, 0, "Chunk width cannot be 0");
+		Chunks::new(self, chunk_size)
+	}
+
+	/// Returns an iterator over `chunk_size` bits of the slice at a time,
+	/// starting at the beginning of the slice.
+	///
+	/// The chunks are mutable slices, and do not overlap. If `chunk_size` does
+	/// not divide the length of the slice, then the last chunk will not have
+	/// length `chunk_size`.
+	///
+	/// See [`chunks_exact_mut`] for a variant of this iterator that returns
+	/// chunks of always exactly `chunk_size` bits, and [`rchunks_mut`] for the
+	/// same iterator but starting at the end of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::chunks_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.chunks_mut)
+	///
+	/// # Panics
+	///
+	/// Panics if `chunk_size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Lsb0, u8; 0; 8];
+	/// for (idx, chunk) in bits.chunks_mut(3).enumerate() {
+	///   chunk.set(2 - idx, true);
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b01_010_100);
+	/// ```
+	///
+	/// [`chunks_exact_mut`]: #method.chunks_exact_mut
+	/// [`rchunks_mut`]: #method.rchunks_mut
+	#[inline]
+	pub fn chunks_mut(&mut self, chunk_size: usize) -> ChunksMut<O, T> {
+		assert_ne!(chunk_size, 0, "Chunk width cannot be 0");
+		ChunksMut::new(self, chunk_size)
+	}
+
+	/// Returns an iterator over `chunk_size` bits of the slice at a time,
+	/// starting at the beginning of the slice.
+	///
+	/// The chunks are slices and do not overlap. If `chunk_size` does not
+	/// divide the length of the slice, then the last up to `chunk_size-1` bits
+	/// will be omitted and can be retrieved from the `remainder` function of
+	/// the iterator.
+	///
+	/// Due to each chunk having exactly `chunk_size` bits, the compiler may
+	/// optimize the resulting code better than in the case of [`chunks`].
+	///
+	/// See [`chunks`] for a variant of this iterator that also returns the
+	/// remainder as a smaller chunk, and [`rchunks_exact`] for the same
+	/// iterator but starting at the end of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::chunks_exact`](https://doc.rust-lang.org/std/primitive.slice.html#method.chunks_exact)
+	///
+	/// # Panics
+	///
+	/// Panics if `chunk_size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1, 1, 0, 0, 1, 0, 1, 1];
+	/// let mut iter = bits.chunks_exact(3);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[.. 3]);
+	/// assert_eq!(iter.next().unwrap(), &bits[3 .. 6]);
+	/// assert!(iter.next().is_none());
+	/// assert_eq!(iter.remainder(), &bits[6 ..]);
+	/// ```
+	///
+	/// [`chunks`]: #method.chunks
+	/// [`rchunks_exact`]: #method.rchunks_exact
+	#[inline]
+	pub fn chunks_exact(&self, chunk_size: usize) -> ChunksExact<O, T> {
+		assert_ne!(chunk_size, 0, "Chunk width cannot be 0");
+		ChunksExact::new(self, chunk_size)
+	}
+
+	/// Returns an iterator over `chunk_size` bits of the slice at a time,
+	/// starting at the beginning of the slice.
+	///
+	/// The chunks are mutable slices, and do not overlap. If `chunk_size` does
+	/// not divide the beginning length of the slice, then the last up to
+	/// `chunk_size-1` bits will be omitted and can be retrieved from the
+	/// `into_remainder` function of the iterator.
+	///
+	/// Due to each chunk having exactly `chunk_size` bits, the compiler may
+	/// optimize the resulting code better than in the case of [`chunks_mut`].
+	///
+	/// See [`chunks_mut`] for a variant of this iterator that also returns the
+	/// remainder as a smaller chunk, and [`rchunks_exact_mut`] for the same
+	/// iterator but starting at the end of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::chunks_exact_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.chunks_exact_mut)
+	///
+	/// # Panics
+	///
+	/// Panics if `chunk_size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Lsb0, u8; 0; 8];
+	/// for (idx, chunk) in bits.chunks_exact_mut(3).enumerate() {
+	///   chunk.set(idx, true);
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b00_010_001);
+	/// ```
+	///
+	/// [`chunks_mut`]: #method.chunks_mut
+	/// [`rchunks_exact_mut`]: #method.rchunks_exact_mut
+	#[inline]
+	pub fn chunks_exact_mut(
+		&mut self,
+		chunk_size: usize,
+	) -> ChunksExactMut<O, T>
+	{
+		assert_ne!(chunk_size, 0, "Chunk width cannot be 0");
+		ChunksExactMut::new(self, chunk_size)
+	}
+
+	/// Returns an iterator over `chunk_size` bits of the slice at a time,
+	/// starting at the end of the slice.
+	///
+	/// The chunks are slices and do not overlap. If `chunk_size` does not
+	/// divide the length of the slice, then the last chunk will not have length
+	/// `chunk_size`.
+	///
+	/// See [`rchunks_exact`] for a variant of this iterator that returns chunks
+	/// of always exactly `chunk_size` bits, and [`chunks`] for the same
+	/// iterator but starting at the beginning of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::rchunks`](https://doc.rust-lang.org/std/primitive.slice.html#method.rchunks)
+	///
+	/// # Panics
+	///
+	/// Panics if `chunk_size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 0, 1, 1, 0, 1, 1, 0];
+	/// let mut iter = bits.rchunks(3);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[5 ..]);
+	/// assert_eq!(iter.next().unwrap(), &bits[2 .. 5]);
+	/// assert_eq!(iter.next().unwrap(), &bits[.. 2]);
+	/// assert!(iter.next().is_none());
+	/// ```
+	///
+	/// [`chunks`]: #method.chunks
+	/// [`rchunks_exact`]: #method.rchunks_exact
+	#[inline]
+	pub fn rchunks(&self, chunk_size: usize) -> RChunks<O, T> {
+		assert_ne!(chunk_size, 0, "Chunk width cannot be 0");
+		RChunks::new(self, chunk_size)
+	}
+
+	/// Returns an iterator over `chunk_size` bits of the slice at a time,
+	/// starting at the end of the slice.
+	///
+	/// The chunks are mutable slices, and do not overlap. If `chunk_size` does
+	/// not divide the length of the slice, then the last chunk will not have
+	/// length `chunk_size`.
+	///
+	/// See [`rchunks_exact_mut`] for a variant of this iterator that returns
+	/// chunks of always exactly `chunk_size` bits, and [`chunks_mut`] for the
+	/// same iterator but starting at the beginning of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::rchunks_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.rchunks_mut)
+	///
+	/// # Panics
+	///
+	/// Panics if `chunk_size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Lsb0, u8; 0; 8];
+	/// for (idx, chunk) in bits.rchunks_mut(3).enumerate() {
+	///   chunk.set(2 - idx, true);
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b100_010_01);
+	/// ```
+	///
+	/// [`chunks_mut`]: #method.chunks_mut
+	/// [`rchunks_exact_mut`]: #method.rchunks_exact_mut
+	#[inline]
+	pub fn rchunks_mut(&mut self, chunk_size: usize) -> RChunksMut<O, T> {
+		assert_ne!(chunk_size, 0, "Chunk width cannot be 0");
+		RChunksMut::new(self, chunk_size)
+	}
+
+	/// Returns an iterator over `chunk_size` bits of the slice at a time,
+	/// starting at the end of the slice.
+	///
+	/// The chunks are slices and do not overlap. If `chunk_size` does not
+	/// divide the length of the slice, then the last up to `chunk_size-1` bits
+	/// will be omitted and can be retrieved from the `remainder` function of
+	/// the iterator.
+	///
+	/// Due to each chunk having exactly `chunk_size` bits, the compiler can
+	/// often optimize the resulting code better than in the case of [`chunks`].
+	///
+	/// See [`rchunks`] for a variant of this iterator that also returns the
+	/// remainder as a smaller chunk, and [`chunks_exact`] for the same iterator
+	/// but starting at the beginning of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::rchunks_exact`](https://doc.rust-lang.org/std/primitive.slice.html#method.rchunks_exact)
+	///
+	/// # Panics
+	///
+	/// Panics if `chunk_size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0, 1, 1, 1, 0, 0, 1, 0];
+	/// let mut iter = bits.rchunks_exact(3);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[5 ..]);
+	/// assert_eq!(iter.next().unwrap(), &bits[2 .. 5]);
+	/// assert!(iter.next().is_none());
+	/// assert_eq!(iter.remainder(), &bits[.. 2]);
+	/// ```
+	///
+	/// [`chunks`]: #method.chunks
+	/// [`rchunks`]: #method.rchunks
+	/// [`chunks_exact`]: #method.chunks_exact
+	#[inline]
+	pub fn rchunks_exact(&self, chunk_size: usize) -> RChunksExact<O, T> {
+		assert_ne!(chunk_size, 0, "Chunk width cannot be 0");
+		RChunksExact::new(self, chunk_size)
+	}
+
+	/// Returns an iterator over `chunk_size` bits of the slice at a time,
+	/// starting at the end of the slice.
+	///
+	/// The chunks are mutable slices, and do not overlap. If `chunk_size` does
+	/// not divide the length of the slice, then the last up to `chunk_size-1`
+	/// bits will be omitted and can be retrieved from the `into_remainder`
+	/// function of the iterator.
+	///
+	/// Due to each chunk having exactly `chunk_size` bits, the compiler can
+	/// often optimize the resulting code better than in the case of
+	/// [`chunks_mut`].
+	///
+	/// See [`rchunks_mut`] for a variant of this iterator that also returns the
+	/// remainder as a smaller chunk, and [`chunks_exact_mut`] for the same
+	/// iterator but starting at the beginning of the slice.
+	///
+	/// # Panics
+	///
+	/// Panics if `chunk_size` is 0.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Lsb0, u8; 0; 8];
+	/// for (idx, chunk) in bits.rchunks_exact_mut(3).enumerate() {
+	///   chunk.set(idx, true);
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b001_010_00);
+	/// ```
+	///
+	/// [`chunks_mut`]: #method.chunks_mut
+	/// [`rchunks_mut`]: #method.rchunks_mut
+	/// [`chunks_exact_mut`]: #method.chunks_exact_mut
+	#[inline]
+	pub fn rchunks_exact_mut(
+		&mut self,
+		chunk_size: usize,
+	) -> RChunksExactMut<O, T>
+	{
+		assert_ne!(chunk_size, 0, "Chunk width cannot be 0");
+		RChunksExactMut::new(self, chunk_size)
+	}
+
+	/// Divides one slice into two at an index.
+	///
+	/// The first will contain all indices from `[0, mid)` (excluding the index
+	/// `mid` itself) and the second will contain all indices from `[mid, len)`
+	/// (excluding the index `len` itself).
+	///
+	/// # Original
+	///
+	/// [`slice::split_at`](https://doc.rust-lang.org/std/primitive.slice.html#method.split_at)
+	///
+	/// # Panics
+	///
+	/// Panics if `mid > len`.
+	///
+	/// # Behavior
+	///
+	/// When `mid` is `0` or `self.len()`, then the left or right return values,
+	/// respectively, are empty slices. Empty slice references produced by this
+	/// method are specified to have the address information you would expect:
+	/// a left empty slice has the same base address and start bit as `self`,
+	/// and a right empty slice will have its address raised by `self.len()`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1, 1, 0, 0, 0, 0, 1, 1];
+	///
+	/// let (left, right) = bits.split_at(0);
+	/// assert!(left.is_empty());
+	/// assert_eq!(right, bits);
+	///
+	/// let (left, right) = bits.split_at(2);
+	/// assert_eq!(left, &bits[.. 2]);
+	/// assert_eq!(right, &bits[2 ..]);
+	///
+	/// let (left, right) = bits.split_at(8);
+	/// assert_eq!(left, bits);
+	/// assert!(right.is_empty());
+	/// ```
+	#[inline]
+	pub fn split_at(&self, mid: usize) -> (&Self, &Self) {
+		let len = self.len();
+		assert!(mid <= len, "Index {} out of bounds: {}", mid, len);
+		unsafe { self.split_at_unchecked(mid) }
+	}
+
+	/// Divides one mutable slice into two at an index.
+	///
+	/// The first will contain all indices from `[0, mid)` (excluding the index
+	/// `mid` itself) and the second will contain all indices from `[mid, len)`
+	/// (excluding the index `len` itself).
+	///
+	/// # Original
+	///
+	/// [`slice::split_at_mut`](https://doc.rust-lang.org/std/primitive.html#method.split_at_mut)
+	///
+	/// # API Differences
+	///
+	/// Because the partition point `mid` is permitted to occur in the interior
+	/// of a memory element `T`, this method is required to mark the returned
+	/// slices as being to aliased memory. This marking ensures that writes to
+	/// the covered memory use the appropriate synchronization behavior of your
+	/// build to avoid data races – by default, this makes all writes atomic; on
+	/// builds with the `atomic` feature disabled, this uses `Cell`s and
+	/// forbids the produced subslices from leaving the current thread.
+	///
+	/// See the [`BitStore`] documentation for more information.
+	///
+	/// # Panics
+	///
+	/// Panics if `mid > len`.
+	///
+	/// # Behavior
+	///
+	/// When `mid` is `0` or `self.len()`, then the left or right return values,
+	/// respectively, are empty slices. Empty slice references produced by this
+	/// method are specified to have the address information you would expect:
+	/// a left empty slice has the same base address and start bit as `self`,
+	/// and a right empty slice will have its address raised by `self.len()`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Msb0, u8; 0; 8];
+	/// // scoped to restrict the lifetime of the borrows
+	/// {
+	///   let (left, right) = bits.split_at_mut(3);
+	///   *left.get_mut(1).unwrap() = true;
+	///   *right.get_mut(2).unwrap() = true;
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b010_00100);
+	/// ```
+	///
+	/// [`BitStore`]: ../store/trait.BitStore.html
+	#[inline]
+	//  `pub type Aliased = BitSlice<O, T::Alias>;` is not allowed in inherents,
+	//  so this will not be aliased.
+	#[allow(clippy::type_complexity)]
+	pub fn split_at_mut(
+		&mut self,
+		mid: usize,
+	) -> (&mut BitSlice<O, T::Alias>, &mut BitSlice<O, T::Alias>)
+	{
+		let len = self.len();
+		assert!(mid <= len, "Index {} out of bounds: {}", mid, len);
+		unsafe { self.split_at_unchecked_mut(mid) }
+	}
+
+	/// Returns an iterator over subslices separated by bits that match `pred`.
+	/// The matched bit is not contained in the subslices.
+	///
+	/// # Original
+	///
+	/// [`slice::split`](https://doc.rust-lang.org/std/primitive.slice.html#method.split)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 0, 0, 1, 0, 0, 0];
+	/// let mut iter = bits.split(|_pos, bit| *bit);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[.. 1]);
+	/// assert_eq!(iter.next().unwrap(), &bits[2 .. 4]);
+	/// assert_eq!(iter.next().unwrap(), &bits[5 ..]);
+	/// assert!(iter.next().is_none());
+	/// ```
+	///
+	/// If the first bit is matched, an empty slice will be the first item
+	/// returned by the iterator. Similarly, if the last element in the slice is
+	/// matched, an empty slice will be the last item returned by the iterator:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 0, 0, 1];
+	/// let mut iter = bits.split(|_pos, bit| *bit);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[.. 3]);
+	/// assert!(iter.next().unwrap().is_empty());
+	/// assert!(iter.next().is_none());
+	/// ```
+	///
+	/// If two matched bits are directly adjacent, an empty slice will be
+	/// present between them:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 0, 1, 1, 0, 0, 0, 0,];
+	/// let mut iter = bits.split(|pos, bit| *bit);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[0 .. 2]);
+	/// assert!(iter.next().unwrap().is_empty());
+	/// assert_eq!(iter.next().unwrap(), &bits[4 .. 8]);
+	/// assert!(iter.next().is_none());
+	/// ```
+	#[inline]
+	pub fn split<F>(&self, pred: F) -> Split<O, T, F>
+	where F: FnMut(usize, &bool) -> bool {
+		Split::new(self, pred)
+	}
+
+	/// Returns an iterator over mutable subslices separated by bits that match
+	/// `pred`. The matched bit is not contained in the subslices.
+	///
+	/// # Original
+	///
+	/// [`slice::split_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.split_mut)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Msb0, u8; 0, 0, 1, 0, 0, 0, 1, 0];
+	/// for group in bits.split_mut(|_pos, bit| *bit) {
+	///   *group.get_mut(0).unwrap() = true;
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b101_100_11);
+	/// ```
+	#[inline]
+	pub fn split_mut<F>(&mut self, pred: F) -> SplitMut<O, T, F>
+	where F: FnMut(usize, &bool) -> bool {
+		SplitMut::new(self.alias_mut(), pred)
+	}
+
+	/// Returns an iterator over subslices separated by bits that match `pred`,
+	/// starting at the end of the slice and working backwards. The matched bit
+	/// is not contained in the subslices.
+	///
+	/// # Original
+	///
+	/// [`slice::rsplit`](https://doc.rust-lang.org/std/primitive.slice.html#method.rsplit)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Msb0, u8; 0, 0, 0, 1, 0, 0, 0, 0];
+	/// let mut iter = bits.rsplit(|_pos, bit| *bit);
+	///
+	/// assert_eq!(iter.next().unwrap(), &bits[4 ..]);
+	/// assert_eq!(iter.next().unwrap(), &bits[.. 3]);
+	/// assert!(iter.next().is_none());
+	/// ```
+	///
+	/// As with `split()`, if the first or last bit is matched, an empty slice
+	/// will be the first (or last) item returned by the iterator.
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Msb0, u8; 1, 0, 0, 1, 0, 0, 0, 1];
+	/// let mut iter = bits.rsplit(|_pos, bit| *bit);
+	///
+	/// assert!(iter.next().unwrap().is_empty());
+	/// assert_eq!(iter.next().unwrap(), &bits[4 .. 7]);
+	/// assert_eq!(iter.next().unwrap(), &bits[1 .. 3]);
+	/// assert!(iter.next().unwrap().is_empty());
+	/// assert!(iter.next().is_none());
+	/// ```
+	#[inline]
+	pub fn rsplit<F>(&self, pred: F) -> RSplit<O, T, F>
+	where F: FnMut(usize, &bool) -> bool {
+		RSplit::new(self, pred)
+	}
+
+	/// Returns an iterator over mutable subslices separated by bits that match
+	/// `pred`, starting at the end of the slice and working backwards. The
+	/// matched bit is not contained in the subslices.
+	///
+	/// # Original
+	///
+	/// [`slice::rsplit_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.rsplit_mut)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Msb0, u8; 0, 0, 1, 0, 0, 0, 1, 0];
+	/// for group in bits.rsplit_mut(|_pos, bit| *bit) {
+	///   *group.get_mut(0).unwrap() = true;
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b101_100_11);
+	/// ```
+	#[inline]
+	pub fn rsplit_mut<F>(&mut self, pred: F) -> RSplitMut<O, T, F>
+	where F: FnMut(usize, &bool) -> bool {
+		RSplitMut::new(self.alias_mut(), pred)
+	}
+
+	/// Returns an iterator over subslices separated by bits that match `pred`,
+	/// limited to returning at most `n` items. The matched bit is not contained
+	/// in the subslices.
+	///
+	/// The last item returned, if any, will contain the remainder of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::splitn`](https://doc.rust-lang.org/std/primitive.slice.html#method.splitn)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1, 0, 1, 0, 0, 1, 0, 1];
+	/// for group in bits.splitn(2, |pos, _bit| pos % 3 == 2) {
+	/// # #[cfg(feature = "std")] {
+	///   println!("{}", group.len());
+	/// # }
+	/// }
+	/// //  2
+	/// //  5
+	/// # //  [10]
+	/// # //  [00101]
+	/// ```
+	#[inline]
+	pub fn splitn<F>(&self, n: usize, pred: F) -> SplitN<O, T, F>
+	where F: FnMut(usize, &bool) -> bool {
+		SplitN::new(self, pred, n)
+	}
+
+	/// Returns an iterator over subslices separated by bits that match `pred`,
+	/// limited to returning at most `n` items. The matched element is not
+	/// contained in the subslices.
+	///
+	/// The last item returned, if any, will contain the remainder of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::splitn_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.splitn_mut)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Msb0, u8; 0, 0, 1, 0, 0, 0, 1, 0];
+	/// for group in bits.splitn_mut(2, |_pos, bit| *bit) {
+	///   *group.get_mut(0).unwrap() = true;
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b101_100_10);
+	/// ```
+	#[inline]
+	pub fn splitn_mut<F>(&mut self, n: usize, pred: F) -> SplitNMut<O, T, F>
+	where F: FnMut(usize, &bool) -> bool {
+		SplitNMut::new(self.alias_mut(), pred, n)
+	}
+
+	/// Returns an iterator over subslices separated by bits that match `pred`
+	/// limited to returining at most `n` items. This starts at the end of the
+	/// slice and works backwards. The matched bit is not contained in the
+	/// subslices.
+	///
+	/// The last item returned, if any, will contain the remainder of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::rsplitn`](https://doc.rust-lang.org/std/primitive.slice.html#method.rsplitn)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![Msb0, u8; 1, 0, 1, 0, 0, 1, 0, 1];
+	/// for group in bits.rsplitn(2, |pos, _bit| pos % 3 == 2) {
+	/// # #[cfg(feature = "std")] {
+	///   println!("{}", group.len());
+	/// # }
+	/// }
+	/// //  2
+	/// //  5
+	/// # //  [10]
+	/// # //  [00101]
+	/// ```
+	#[inline]
+	pub fn rsplitn<F>(&self, n: usize, pred: F) -> RSplitN<O, T, F>
+	where F: FnMut(usize, &bool) -> bool {
+		RSplitN::new(self, pred, n)
+	}
+
+	/// Returns an iterator over subslices separated by bits that match `pred`
+	/// limited to returning at most `n` items. This starts at the end of the
+	/// slice and works backwards. The matched bit is not contained in the
+	/// subslices.
+	///
+	/// The last item returned, if any, will contain the remainder of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::rsplitn_mut`](https://doc.rust-lang.org/std/primitive.slice.html#method.rsplitn_mut)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut Msb0, u8; 0, 0, 1, 0, 0, 0, 1, 0];
+	/// for group in bits.rsplitn_mut(2, |_pos, bit| *bit) {
+	///   *group.get_mut(0).unwrap() = true;
+	/// }
+	/// assert_eq!(bits.as_slice()[0], 0b101_000_11);
+	/// ```
+	#[inline]
+	pub fn rsplitn_mut<F>(&mut self, n: usize, pred: F) -> RSplitNMut<O, T, F>
+	where F: FnMut(usize, &bool) -> bool {
+		RSplitNMut::new(self.alias_mut(), pred, n)
+	}
+
+	/// Returns `true` if the slice contains a subslice that matches the given
+	/// span.
+	///
+	/// # Original
+	///
+	/// [`slice::contains`](https://doc.rust-lang.org/std/primitive.slice.html#method.contains)
+	///
+	/// # API Differences
+	///
+	/// This searches for a matching subslice (allowing different type
+	/// parameters) rather than for a specific bit. Searching for a contained
+	/// element with a given value is not as useful on a collection of `bool`.
+	///
+	/// Furthermore, `BitSlice` defines [`any`] and [`not_all`], which are
+	/// optimized searchers for any `true` or `false` bit, respectively, in a
+	/// sequence.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let data = 0b0101_1010u8;
+	/// let bits_msb = data.view_bits::<Msb0>();
+	/// let bits_lsb = data.view_bits::<Lsb0>();
+	/// assert!(bits_msb.contains(&bits_lsb[1 .. 5]));
+	/// ```
+	///
+	/// This example uses a palindrome pattern to demonstrate that the slice
+	/// being searched for does not need to have the same type parameters as the
+	/// slice being searched.
+	///
+	/// [`any`]: #method.any
+	/// [`not_all`]: #method.not_all
+	#[inline]
+	pub fn contains<O2, T2>(&self, x: &BitSlice<O2, T2>) -> bool
+	where
+		O2: BitOrder,
+		T2: BitStore,
+	{
+		let len = x.len();
+		if len > self.len() {
+			return false;
+		};
+		self.windows(len).any(|s| s == x)
+	}
+
+	/// Returns `true` if `needle` is a prefix of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::starts_with`](https://doc.rust-lang.org/std/primitive.slice.html#method.starts_with)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let data = 0b0100_1011u8;
+	/// let haystack = data.view_bits::<Msb0>();
+	/// let needle = &data.view_bits::<Lsb0>()[2 .. 5];
+	///
+	/// assert!(haystack.starts_with(&needle[.. 2]));
+	/// assert!(haystack.starts_with(needle));
+	/// assert!(!haystack.starts_with(&haystack[2 .. 4]));
+	/// ```
+	///
+	/// Always returns `true` if `needle` is an empty slice:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let empty = BitSlice::<LocalBits, usize>::empty();
+	/// assert!(0u8.view_bits::<LocalBits>().starts_with(empty));
+	/// assert!(empty.starts_with(empty));
+	/// ```
+	#[inline]
+	pub fn starts_with<O2, T2>(&self, needle: &BitSlice<O2, T2>) -> bool
+	where
+		O2: BitOrder,
+		T2: BitStore,
+	{
+		let len = needle.len();
+		self.len() >= len && needle == unsafe { self.get_unchecked(.. len) }
+	}
+
+	/// Returns `true` if `needle` is a suffix of the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::ends_with`](https://doc.rust-lang.org/std/primitive.slice.html#method.ends_with)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let data = 0b0100_1011u8;
+	/// let haystack = data.view_bits::<Lsb0>();
+	/// let needle = &data.view_bits::<Msb0>()[3 .. 6];
+	///
+	/// assert!(haystack.ends_with(&needle[1 ..]));
+	/// assert!(haystack.ends_with(needle));
+	/// assert!(!haystack.ends_with(&haystack[2 .. 4]));
+	/// ```
+	///
+	/// Always returns `true` if `needle` is an empty slice:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let empty = BitSlice::<LocalBits, usize>::empty();
+	/// assert!(0u8.view_bits::<LocalBits>().ends_with(empty));
+	/// assert!(empty.ends_with(empty));
+	/// ```
+	#[inline]
+	pub fn ends_with<O2, T2>(&self, needle: &BitSlice<O2, T2>) -> bool
+	where
+		O2: BitOrder,
+		T2: BitStore,
+	{
+		let nlen = needle.len();
+		let len = self.len();
+		len >= nlen && needle == unsafe { self.get_unchecked(len - nlen ..) }
+	}
+
+	/// Rotates the slice in-place such that the first `by` bits of the slice
+	/// move to the end while the last `self.len() - by` bits move to the front.
+	/// After calling `rotate_left`, the bit previously at index `by` will
+	/// become the first bit in the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::rotate_left`](https://doc.rust-lang.org/std/primitive.slice.html#rotate_left)
+	///
+	/// # Panics
+	///
+	/// This function will panic if `by` is greater than the length of the
+	/// slice. Note that `by == self.len()` does *not* panic and is a no-op
+	/// rotation.
+	///
+	/// # Complexity
+	///
+	/// Takes linear (in `self.len()`) time.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0xF0u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// bits.rotate_left(2);
+	/// assert_eq!(data, 0xC3);
+	/// ```
+	///
+	/// Rotating a subslice:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0xF0u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// bits[1 .. 5].rotate_left(1);
+	/// assert_eq!(data, 0b1_1101_000);
+	/// ```
+	#[inline]
+	pub fn rotate_left(&mut self, mut by: usize) {
+		let len = self.len();
+		assert!(
+			by <= len,
+			"Slices cannot be rotated by more than their length"
+		);
+		if by == 0 || by == len {
+			return;
+		}
+		/* The standard one-element-at-a-time algorithm is necessary for `[T]`
+		rotation, because it must not allocate, but bit slices have an advantage
+		in that placing a single processor word on the stack as a temporary has
+		significant logical acceleration.
+
+		Instead, we can move `min(usize::BITS, by)` bits from the front of the
+		slice into the stack, then shunt the rest of the slice downwards, then
+		insert the stack bits into the now-open back, repeating until complete.
+
+		There is no reason to use a stack temporary smaller than a processor
+		word, so this uses `usize` instead of `T` for performance benefits.
+		*/
+		let mut tmp = BitArray::<O, usize>::new(0);
+		while by > 0 {
+			let shamt = cmp::min(<usize as BitMemory>::BITS as usize, by);
+			unsafe {
+				let tmp_bits = tmp.get_unchecked_mut(.. shamt);
+				tmp_bits.clone_from_bitslice(self.get_unchecked(.. shamt));
+				self.copy_within_unchecked(shamt .., 0);
+				self.get_unchecked_mut(len - shamt ..)
+					.clone_from_bitslice(tmp_bits);
+			}
+			by -= shamt;
+		}
+	}
+
+	/// Rotates the slice in-place such that the first `self.len() - by` bits of
+	/// the slice move to the end while the last `by` bits move to the front.
+	/// After calling `rotate_right`, the bit previously at index `self.len() -
+	/// by` will become the first bit in the slice.
+	///
+	/// # Original
+	///
+	/// [`slice::rotate_right`](https://doc.rust-lang.org/std/primitive.slice.html#rotate_right)
+	///
+	/// # Panics
+	///
+	/// This function will panic if `by` is greater than the length of the
+	/// slice. Note that `by == self.len()` does *not* panic and is a no-op
+	/// rotation.
+	///
+	/// # Complexity
+	///
+	/// Takes linear (in `self.len()`) time.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0xF0u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// bits.rotate_right(2);
+	/// assert_eq!(data, 0x3C);
+	/// ```
+	///
+	/// Rotate a subslice:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0xF0u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// bits[1 .. 5].rotate_right(1);
+	/// assert_eq!(data, 0b1_0111_000);
+	/// ```
+	#[inline]
+	pub fn rotate_right(&mut self, mut by: usize) {
+		let len = self.len();
+		assert!(
+			by <= len,
+			"Slices cannot be rotated by more than their length"
+		);
+		if by == 0 || by == len {
+			return;
+		}
+		let mut tmp = BitArray::<O, usize>::new(0);
+		while by > 0 {
+			let shamt = cmp::min(<usize as BitMemory>::BITS as usize, by);
+			let mid = len - shamt;
+			unsafe {
+				let tmp_bits = tmp.get_unchecked_mut(.. shamt);
+				tmp_bits.clone_from_bitslice(self.get_unchecked(mid ..));
+				self.copy_within_unchecked(.. mid, shamt);
+				self.get_unchecked_mut(.. shamt)
+					.clone_from_bitslice(tmp_bits);
+			}
+			by -= shamt;
+		}
+	}
+
+	/// Copies the bits from `src` into `self`.
+	///
+	/// The length of `src` must be the same as `self`.
+	///
+	/// If you are attempting to write an integer value into a `BitSlice`, see
+	/// the [`BitField::store`] trait function.
+	///
+	/// # Implementation
+	///
+	/// This method is by necessity a bit-by-bit individual walk across both
+	/// slices. Benchmarks indicate that where the slices share type parameters,
+	/// this is very close in performance to an element-wise `memcpy`. You
+	/// should use this method as the default transfer behavior, and only switch
+	/// to [`.copy_from_bitslice()`] where you know that your performance is an
+	/// issue *and* you can demonstrate that `.copy_from_bitslice()` is
+	/// meaningfully better.
+	///
+	/// Where `self` and `src` are not of the same type parameters, crate
+	/// benchmarks show a roughly halved runtime performance.
+	///
+	/// # Original
+	///
+	/// [`slice::clone_from_slice`](https://doc.rust-lang.org/std/primitive.slice.html#method.clone_from_slice)
+	///
+	/// # API Differences
+	///
+	/// This method is renamed, as it takes a bit slice rather than an element
+	/// slice.
+	///
+	/// # Panics
+	///
+	/// This function will panic if the two slices have different lengths.
+	///
+	/// # Examples
+	///
+	/// Cloning two bits from a slice into another:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// let src = 0x0Fu16.view_bits::<Lsb0>();
+	/// bits[.. 2].clone_from_bitslice(&src[2 .. 4]);
+	/// assert_eq!(data, 0xC0);
+	/// ```
+	///
+	/// Rust enforces that there can only be one mutable reference with no
+	/// immutable references to a particular piece of data in a particular
+	/// scope. Because of this, attempting to use `clone_from_bitslice` on a
+	/// single slice will result in a compile failure:
+	///
+	/// ```rust,compile_fail
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 3u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// bits[.. 2].clone_from_bitslice(&bits[6 ..]);
+	/// ```
+	///
+	/// To work around this, we can use [`split_at_mut`] to create two distinct
+	/// sub-slices from a slice:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 3u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// let (head, tail) = bits.split_at_mut(4);
+	/// head.clone_from_bitslice(tail);
+	/// assert_eq!(data, 0x33);
+	/// ```
+	///
+	/// [`BitField::store`]: ../field/trait.BitField.html#method.store
+	/// [`split_at_mut`]: #method.split_at_mut
+	#[inline]
+	pub fn clone_from_bitslice<O2, T2>(&mut self, src: &BitSlice<O2, T2>)
+	where
+		O2: BitOrder,
+		T2: BitStore,
+	{
+		let len = self.len();
+		assert_eq!(
+			len,
+			src.len(),
+			"Cloning between slices requires equal lengths"
+		);
+		for idx in 0 .. len {
+			unsafe {
+				self.set_unchecked(idx, *src.get_unchecked(idx));
+			}
+		}
+	}
+
+	#[doc(hidden)]
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(note = "Use `.clone_from_bitslice` to copy between bitslices")]
+	pub fn clone_from_slice<O2, T2>(&mut self, src: &BitSlice<O2, T2>)
+	where
+		O2: BitOrder,
+		T2: BitStore,
+	{
+		self.clone_from_bitslice(src)
+	}
+
+	/// Copies all bits from `src` into `self`.
+	///
+	/// The length of `src` must be the same as `self`.
+	///
+	/// If you are attempting to write an integer value into a `BitSlice`, see
+	/// the [`BitField::store`] trait function.
+	///
+	/// # Implementation
+	///
+	/// This method attempts to use `memcpy` element-wise copy acceleration
+	/// where possible. This will only occur when both `src` and `self` are
+	/// exactly similar: in addition to having the same type parameters and
+	/// length, they must begin at the same offset in an element.
+	///
+	/// Benchmarks do not indicate that `memcpy` element-wise copy is
+	/// significantly faster than [`.clone_from_bitslice()`]’s bit-wise crawl.
+	/// This implementation is retained so that you have the ability to observe
+	/// performance characteristics on your own targets and choose as
+	/// appropriate.
+	///
+	/// # Original
+	///
+	/// [`slice::copy_from_slice`](https://doc.rust-lang.org/std/primitive.std.html#method.copy_from_slice)
+	///
+	/// # API Differences
+	///
+	/// This method is renamed, as it takes a bit slice rather than an element
+	/// slice.
+	///
+	/// # Panics
+	///
+	/// This function will panic if the two slices have different lengths.
+	///
+	/// # Examples
+	///
+	/// Copying two bits from a slice into another:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut dst = bits![mut 0; 200];
+	/// let src = bits![1; 200];
+	///
+	/// assert!(dst.not_any());
+	/// dst.copy_from_bitslice(src);
+	/// assert!(dst.all());
+	/// ```
+	/// [`BitField::store`]: ../field/trait.BitField.html#method.store
+	/// [`.clone_from_bitslice()`]: #method.clone_from_bitslice
+	#[inline]
+	pub fn copy_from_bitslice(&mut self, src: &Self) {
+		let len = self.len();
+		assert_eq!(
+			len,
+			src.len(),
+			"Copying between slices requires equal lengths"
+		);
+
+		let (d_head, s_head) = (self.bitptr().head(), src.bitptr().head());
+		if d_head == s_head {
+			match (self.domain_mut(), src.domain()) {
+				(
+					DomainMut::Enclave {
+						elem: d_elem, tail, ..
+					},
+					Domain::Enclave { elem: s_elem, .. },
+				) => {
+					let mask = O::mask(d_head, tail);
+					d_elem.clear_bits(mask);
+					d_elem.set_bits(mask & s_elem.load_value());
+				},
+				(
+					DomainMut::Region {
+						head: d_head,
+						body: d_body,
+						tail: d_tail,
+					},
+					Domain::Region {
+						head: s_head,
+						body: s_body,
+						tail: s_tail,
+					},
+				) => {
+					if let (Some((h_idx, dh_elem)), Some((_, sh_elem))) =
+						(d_head, s_head)
+					{
+						let mask = O::mask(h_idx, None);
+						dh_elem.clear_bits(mask);
+						dh_elem.set_bits(mask & sh_elem.load_value());
+					}
+					d_body.copy_from_slice(s_body);
+					if let (Some((dt_elem, t_idx)), Some((st_elem, _))) =
+						(d_tail, s_tail)
+					{
+						let mask = O::mask(None, t_idx);
+						dt_elem.clear_bits(mask);
+						dt_elem.set_bits(mask & st_elem.load_value());
+					}
+				},
+				_ => unreachable!(
+					"Slices with equal type parameters, lengths, and heads \
+					 will always have equal domains"
+				),
+			}
+		}
+		self.clone_from_bitslice(src);
+	}
+
+	#[doc(hidden)]
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(note = "Use `.copy_from_bitslice` to copy between bitslices")]
+	pub fn copy_from_slice(&mut self, src: &Self) {
+		self.copy_from_bitslice(src)
+	}
+
+	/// Copies bits from one part of the slice to another part of itself.
+	///
+	/// `src` is the range within `self` to copy from. `dest` is the starting
+	/// index of the range within `self` to copy to, which will have the same
+	/// length as `src`. The two ranges may overlap. The ends of the two ranges
+	/// must be less than or equal to `self.len()`.
+	///
+	/// # Original
+	///
+	/// [`slice::copy_within`](https://doc.rust-lang.org/std/primitive.slice.html#method.copy_within)
+	///
+	/// # Panics
+	///
+	/// This function will panic if either range exceeds the end of the slice,
+	/// or if the end of `src` is before the start.
+	///
+	/// # Examples
+	///
+	/// Copying four bytes within a slice:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0x07u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// bits.copy_within(5 .., 0);
+	/// assert_eq!(data, 0xE7);
+	/// ```
+	#[inline]
+	pub fn copy_within<R>(&mut self, src: R, dest: usize)
+	where R: RangeBounds<usize> {
+		let len = self.len();
+		let src = dvl::normalize_range(src, len);
+		//  Check that the source range is within bounds,
+		dvl::assert_range(src.clone(), len);
+		//  And that the destination range is within bounds.
+		dvl::assert_range(dest .. dest + (src.end - src.start), len);
+		unsafe {
+			self.copy_within_unchecked(src, dest);
+		}
+	}
+
+	/// Swaps all bits in `self` with those in `other`.
+	///
+	/// The length of `other` must be the same as `self`.
+	///
+	/// # Original
+	///
+	/// [`slice::swap_with_slice`](https://doc.rust-lang.org/std/primitive.slice.html#method.swap_with_slice)
+	///
+	/// # API Differences
+	///
+	/// This method is renamed, as it takes a bit slice rather than an element
+	/// slice.
+	///
+	/// # Panics
+	///
+	/// This function will panic if the two slices have different lengths.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut one = [0xA5u8, 0x69];
+	/// let mut two = 0x1234u16;
+	/// let one_bits = one.view_bits_mut::<Msb0>();
+	/// let two_bits = two.view_bits_mut::<Lsb0>();
+	///
+	/// one_bits.swap_with_bitslice(two_bits);
+	///
+	/// assert_eq!(one, [0x2C, 0x48]);
+	/// # #[cfg(target_endian = "little")] {
+	/// assert_eq!(two, 0x96A5);
+	/// # }
+	/// ```
+	#[inline]
+	pub fn swap_with_bitslice<O2, T2>(&mut self, other: &mut BitSlice<O2, T2>)
+	where
+		O2: BitOrder,
+		T2: BitStore,
+	{
+		let len = self.len();
+		assert_eq!(len, other.len());
+		for n in 0 .. len {
+			unsafe {
+				let (this, that) =
+					(*self.get_unchecked(n), *other.get_unchecked(n));
+				self.set_unchecked(n, that);
+				other.set_unchecked(n, this);
+			}
+		}
+	}
+
+	#[doc(hidden)]
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(note = "Use `.swap_with_bitslice` to swap between bitslices")]
+	pub fn swap_with_slice<O2, T2>(&mut self, other: &mut BitSlice<O2, T2>)
+	where
+		O2: BitOrder,
+		T2: BitStore,
+	{
+		self.swap_with_bitslice(other);
+	}
+
+	/// Transmute the bitslice to a bitslice of another type, ensuring alignment
+	/// of the types is maintained.
+	///
+	/// This method splits the bitslice into three distinct bitslices: prefix,
+	/// correctly aligned middle bitslice of a new type, and the suffix
+	/// bitslice. The method may make the middle bitslice the greatest
+	/// length possible for a given type and input bitslice, but only your
+	/// algorithm's performance should depend on that, not its correctness. It
+	/// is permissible for all of the input data to be returned as the prefix or
+	/// suffix bitslice.
+	///
+	/// # Original
+	///
+	/// [`slice::align_to`](https://doc.rust-lang.org/std/primitive.slice.html#method.align_to)
+	///
+	/// # API Differences
+	///
+	/// Type `U` is **required** to have the same type family as type `T`.
+	/// Whatever `T` is of the fundamental integers, atomics, or `Cell`
+	/// wrappers, `U` must be a different width in the same family. Changing the
+	/// type family with this method is **unsound** and strictly forbidden.
+	/// Unfortunately, it cannot be guaranteed by this function, so you are
+	/// required to abide by this limitation.
+	///
+	/// # Safety
+	///
+	/// This method is essentially a `transmute` with respect to the elements in
+	/// the returned middle bitslice, so all the usual caveats pertaining to
+	/// `transmute::<T, U>` also apply here.
+	///
+	/// # Examples
+	///
+	/// Basic usage:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// unsafe {
+	///   let bytes: [u8; 7] = [1, 2, 3, 4, 5, 6, 7];
+	///   let bits = bytes.view_bits::<LocalBits>();
+	///   let (prefix, shorts, suffix) = bits.align_to::<u16>();
+	///   match prefix.len() {
+	///     0 => {
+	///       assert_eq!(shorts, bits[.. 48]);
+	///       assert_eq!(suffix, bits[48 ..]);
+	///     },
+	///     8 => {
+	///       assert_eq!(prefix, bits[.. 8]);
+	///       assert_eq!(shorts, bits[8 ..]);
+	///     },
+	///     _ => unreachable!("This case will not occur")
+	///   }
+	/// }
+	/// ```
+	#[inline]
+	pub unsafe fn align_to<U>(&self) -> (&Self, &BitSlice<O, U>, &Self)
+	where U: BitStore {
+		let bitptr = self.bitptr();
+		let bp_len = bitptr.len();
+		let (l, c, r) = bitptr.as_aliased_slice().align_to::<U::Alias>();
+		let l_start = bitptr.head().value() as usize;
+		let mut l = BitSlice::<O, T>::from_aliased_slice_unchecked(l);
+		if l.len() > l_start {
+			l = l.get_unchecked(l_start ..);
+		}
+		let mut c = BitSlice::<O, U>::from_aliased_slice_unchecked(c);
+		let c_len = cmp::min(c.len(), bp_len - l.len());
+		c = c.get_unchecked(.. c_len);
+		let mut r = BitSlice::<O, T>::from_aliased_slice_unchecked(r);
+		let r_len = bp_len - l.len() - c.len();
+		if r.len() > r_len {
+			r = r.get_unchecked(.. r_len);
+		}
+		(
+			l.bitptr()
+				.pipe(dvl::remove_bitptr_alias::<T>)
+				.to_bitslice_ref(),
+			c.bitptr()
+				.pipe(dvl::remove_bitptr_alias::<U>)
+				.to_bitslice_ref(),
+			r.bitptr()
+				.pipe(dvl::remove_bitptr_alias::<T>)
+				.to_bitslice_ref(),
+		)
+	}
+
+	/// Transmute the bitslice to a bitslice of another type, ensuring alignment
+	/// of the types is maintained.
+	///
+	/// This method splits the bitslice into three distinct bitslices: prefix,
+	/// correctly aligned middle bitslice of a new type, and the suffix
+	/// bitslice. The method may make the middle bitslice the greatest
+	/// length possible for a given type and input bitslice, but only your
+	/// algorithm's performance should depend on that, not its correctness. It
+	/// is permissible for all of the input data to be returned as the prefix or
+	/// suffix bitslice.
+	///
+	/// # Original
+	///
+	/// [`slice::align_to`](https://doc.rust-lang.org/std/primitive.slice.html#method.align_to)
+	///
+	/// # API Differences
+	///
+	/// Type `U` is **required** to have the same type family as type `T`.
+	/// Whatever `T` is of the fundamental integers, atomics, or `Cell`
+	/// wrappers, `U` must be a different width in the same family. Changing the
+	/// type family with this method is **unsound** and strictly forbidden.
+	/// Unfortunately, it cannot be guaranteed by this function, so you are
+	/// required to abide by this limitation.
+	///
+	/// # Safety
+	///
+	/// This method is essentially a `transmute` with respect to the elements in
+	/// the returned middle bitslice, so all the usual caveats pertaining to
+	/// `transmute::<T, U>` also apply here.
+	///
+	/// # Examples
+	///
+	/// Basic usage:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// unsafe {
+	///   let mut bytes: [u8; 7] = [1, 2, 3, 4, 5, 6, 7];
+	///   let bits = bytes.view_bits_mut::<LocalBits>();
+	///   let (prefix, shorts, suffix) = bits.align_to_mut::<u16>();
+	///   //  same access and behavior as in `align_to`
+	/// }
+	/// ```
+	#[inline]
+	pub unsafe fn align_to_mut<U>(
+		&mut self,
+	) -> (&mut Self, &mut BitSlice<O, U>, &mut Self)
+	where U: BitStore {
+		let (l, c, r) = self.align_to::<U>();
+		(
+			l.bitptr().to_bitslice_mut(),
+			c.bitptr().to_bitslice_mut(),
+			r.bitptr().to_bitslice_mut(),
+		)
+	}
+}
+
+/// These functions only exist when `BitVec` does.
+#[cfg(feature = "alloc")]
+impl<O, T> BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Copies `self` into a new `BitVec`.
+	///
+	/// # Original
+	///
+	/// [`slice::to_vec`](https://doc.rust-lang.org/std.primitive.html#method.to_vec)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// # #[cfg(feature = "stde")] {
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 0, 1];
+	/// let bv = bits.to_bitvec();
+	/// assert_eq!(bits, bv);
+	/// # }
+	/// ```
+	#[inline(always)]
+	pub fn to_bitvec(&self) -> BitVec<O, T> {
+		BitVec::from_bitslice(self)
+	}
+
+	#[doc(hidden)]
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(note = "Use `.to_bitvec` to convert a bit slice into a vector")]
+	pub fn to_vec(&self) -> BitVec<O, T> {
+		self.to_bitvec()
+	}
+
+	/// Creates a vector by repeating a slice `n` times.
+	///
+	/// # Original
+	///
+	/// [`slice::repeat`](https://doc.rust-lang.org/std/primitive.slice.html#method.repeat)
+	///
+	/// # Panics
+	///
+	/// This function will panic if the capacity would overflow.
+	///
+	/// # Examples
+	///
+	/// Basic usage:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// assert_eq!(bits![0, 1].repeat(3), bits![0, 1, 0, 1, 0, 1]);
+	/// ```
+	///
+	/// A panic upon overflow:
+	///
+	/// ```rust,should_panic
+	/// use bitvec::prelude::*;
+	///
+	/// // this will panic at runtime
+	/// bits![0, 1].repeat(BitSlice::<LocalBits, usize>::MAX_BITS);
+	/// ```
+	#[inline]
+	pub fn repeat(&self, n: usize) -> BitVec<O, T>
+	where
+		O: BitOrder,
+		T: BitStore,
+	{
+		let len = self.len();
+		let total = len.checked_mul(n).expect("capacity overflow");
+		//  The memory has to be initialized before `.copy_from_bitslice` can
+		//  write into it.
+		let mut out = BitVec::repeat(false, total);
+		for span in (0 .. n).map(|rep| rep * len .. (rep + 1) * len) {
+			unsafe { out.get_unchecked_mut(span) }.copy_from_bitslice(self);
+		}
+		unsafe {
+			out.set_len(total);
+		}
+		out
+	}
+
+	/* As of 1.44, the `concat` and `join` methods use still-unstable traits to
+	govern the collection of multiple subslices into one vector. These are
+	possible to copy over and redefine locally, but unless a user asks for it,
+	doing so is considered a low priority.
+	*/
+}
+
+/** Converts a reference to `T` into a bitslice over one element.
+
+# Original
+
+[`slice::from_ref`](https://doc.rust-lang.org/core/slice/fn.from_ref.html)
+**/
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn from_ref<O, T>(elem: &T) -> &BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore + BitRegister,
+{
+	BitSlice::from_element(elem)
+}
+
+/** Converts a reference to `T` into a bitslice over one element.
+
+# Original
+
+[`slice::from_mut`](https://doc.rust-lang.org/core/slice/fn.from_mut.html)
+**/
+#[inline(always)]
+#[cfg(not(tarpaulin_include))]
+pub fn from_mut<O, T>(elem: &mut T) -> &mut BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore + BitRegister,
+{
+	BitSlice::from_element_mut(elem)
+}
+
+/* NOTE: Crate style is to use block doc comments at the left margin. A bug in
+`rustfmt` replaces four spaces at left margin with hard tab, which is incorrect
+in comments. Once `rustfmt` is fixed, revert these to block comments.
+*/
+
+/** Forms a bitslice from a pointer and a length.
+
+The `len` argument is the number of **elements**, not the number of bits.
+
+# Original
+
+[`slice::from_raw_parts`](https://doc.rust-lang.org/core/slice/fn.from_raw_parts.html)
+
+# Safety
+
+Behavior is undefined if any of the following conditions are violated:
+
+**/
+/// - `data` must be [valid] for `len * mem::size_of::<T>()` many bytes, and it
+///   must be properly aligned. This means in particular:
+///   - The entire memory range of this slice must be contained within a single
+///     allocated object! Slices can never span across multiple allocated
+///     objects.
+///   - `data` must be non-null and aligned even for zero-length slices. The
+///     `&BitSlice` pointer encoding requires this porperty to hold. You can
+///     obtain a pointer that is usable as `data` for zero-length slices using
+///     [`NonNull::dangling()`].
+/// - The memory referenced by the returned bitslice must not be mutated for the
+///   duration of the lifetime `'a`, except inside an `UnsafeCell`.
+/// - The total size `len * T::Mem::BITS` of the slice must be no larger than
+///   [`BitSlice::<_, T>::MAX_BITS`].
+/**
+
+# Caveat
+
+The lifetime for the returned slice is inferred from its usage. To prevent
+accidental misuse, it's suggested to tie the lifetime to whichever source
+lifetime is safe in the context, such as by providing a helper function taking
+the lifetime of a host value for the slice, or by explicit annotation.
+
+# Examples
+
+```rust
+use bitvec::prelude::*;
+use bitvec::slice as bv_slice;
+
+let x = 42u8;
+let ptr = &x as *const _;
+let bits = unsafe {
+  bv_slice::from_raw_parts::<LocalBits, u8>(ptr, 1)
+};
+assert_eq!(bits.count_ones(), 3);
+```
+
+[valid]: https://doc.rust-lang.org/core/ptr/index.html#safety
+[`BitSlice::<_, T>::MAX_BITS`]: struct.BitSlice.html#associatedconstant.MAX_BITS
+[`NonNull::dangling()`]: https://doc.rust-lang.org/core/ptr/struct.NonNull.html#method.dangling
+**/
+#[inline]
+#[cfg(not(tarpaulin_include))]
+pub unsafe fn from_raw_parts<'a, O, T>(
+	data: *const T,
+	len: usize,
+) -> &'a BitSlice<O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore + BitMemory,
+{
+	super::bits_from_raw_parts(data, 0, len * T::Mem::BITS as usize)
+		.unwrap_or_else(|| {
+			panic!(
+				"Failed to construct `&{}BitSlice` from invalid pointer {:p} \
+				 or element count {}",
+				"", data, len
+			)
+		})
+}
+
+/**
+Performs the same functionality as [`from_raw_parts`], except that a mutable
+bitslice is returned.
+
+# Original
+
+[`slice::from_raw_parts_mut`](https://doc.rust-lang.org/core/slice/fn.from_raw_parts_mut.html)
+
+# Safety
+
+Behavior is undefined if any of the following conditions are violated:
+**/
+///
+/// - `data` must be [valid] for `len * mem::size_of::<T>()` many bytes, and it
+///   must be properly aligned. This means in particular:
+///   - The entire memory range of this slice must be contained within a single
+///     allocated object! Slices can never span across multiple allocated
+///     objects.
+///   - `data` must be non-null and aligned even for zero-length slices. The
+///     `&BitSlice` pointer encoding requires this porperty to hold. You can
+///     obtain a pointer that is usable as `data` for zero-length slices using
+///     [`NonNull::dangling()`].
+/// - The memory referenced by the returned bitslice must not be accessed
+///   through other pointer (not derived from the return value) for the duration
+///   of the lifetime `'a`. Both read and write accesses are forbidden.
+/// - The total size `len * T::Mem::BITS` of the slice must be no larger than
+///   [`BitSlice::<_, T>::MAX_BITS`].
+///
+/// [valid]: https://doc.rust-lang.org/core/ptr/index.html#safety
+/// [`from_raw_parts`]: fn.from_raw_parts.html
+/// [`NonNull::dangling()`]: https://doc.rust-lang.org/core/ptr/struct.NonNull.html#method.dangling
+///
+/// [`BitSlice::<_, T>::MAX_BITS`]:
+/// struct.BitSlice.html#associatedconstant.MAX_BITS
+#[inline]
+#[cfg(not(tarpaulin_include))]
+pub unsafe fn from_raw_parts_mut<'a, O, T>(
+	data: *mut T,
+	len: usize,
+) -> &'a mut BitSlice<O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore + BitMemory,
+{
+	super::bits_from_raw_parts_mut(data, 0, len * T::Mem::BITS as usize)
+		.unwrap_or_else(|| {
+			panic!(
+				"Failed to construct `&{}BitSlice` from invalid pointer {:p} \
+				 or element count {}",
+				"mut ", data, len
+			)
+		})
+}
+
+/** A helper trait used for indexing operations.
+
+This trait has its definition stabilized, but has not stabilized its associated
+functions. This means it cannot be implemented outside of the distribution
+libraries. *Furthermore*, since `bitvec` cannot create `&mut bool` references,
+it is insufficient for `bitvec`’s uses.
+
+There is no tracking issue for `feature(slice_index_methods)`.
+
+# Original
+
+[`slice::SliceIndex`](https://doc.rust-lang.org/stable/core/slice/trait.SliceIndex.html)
+
+# API Differences
+
+`SliceIndex::Output` is not usable here, because the `usize` implementation
+cannot produce `&mut bool`. Instead, two output types `Immut` and `Mut` are
+defined. The range implementations define these to be the appropriately mutable
+`BitSlice` reference; the `usize` implementation defines them to be `&bool` and
+the proxy type.
+**/
+pub trait BitSliceIndex<'a, O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	/// The output type for immutable functions.
+	type Immut;
+
+	/// The output type for mutable functions.
+	type Mut;
+
+	/// Returns a shared reference to the output at this location, if in bounds.
+	///
+	/// # Original
+	///
+	/// [`SliceIndex::get`](https://doc.rust-lang.org/core/slice/trait.SliceIndex.html#method.get)
+	fn get(self, slice: &'a BitSlice<O, T>) -> Option<Self::Immut>;
+
+	/// Returns a mutable reference to the output at this location, if in
+	/// bounds.
+	///
+	/// # Original
+	///
+	/// [`SliceIndex::get_mut`](https://doc.rust-lang.org/core/slice/trait.SliceIndex.html#method.get_mut)
+	fn get_mut(self, slice: &'a mut BitSlice<O, T>) -> Option<Self::Mut>;
+
+	/// Returns a shared reference to the output at this location, without
+	/// performing any bounds checking. Calling this method with an
+	/// out-of-bounds index is [undefined behavior] even if the resulting
+	/// reference is not used.
+	///
+	/// # Original
+	///
+	/// [`SliceIndex::get_unchecked`](https://doc.rust-lang.org/core/slice/trait.SliceIndex.html#method.get_unchecked)
+	///
+	/// # Safety
+	///
+	/// As this function does not perform boundary checking, the caller must
+	/// ensure that `self` is an index within the boundaries of `slice` before
+	/// calling in order to prevent boundary escapes and the ensuing safety
+	/// violations.
+	///
+	/// [undefined behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html
+	unsafe fn get_unchecked(self, slice: &'a BitSlice<O, T>) -> Self::Immut;
+
+	/// Returns a mutable reference to the output at this location, without
+	/// performing any bounds checking. Calling this method with an
+	/// out-of-bounds index is [undefined behavior] even if the resulting
+	/// reference is not used.
+	///
+	/// # Original
+	///
+	/// [`SliceIndex::get_unchecked_mut`](https://doc.rust-lang.org/core/slice/trait.SliceIndex.html#method.get_unchecked_mut)
+	///
+	/// # Safety
+	///
+	/// As this function does not perform boundary checking, the caller must
+	/// ensure that `self` is an index within the boundaries of `slice` before
+	/// calling in order to prevent boundary escapes and the ensuing safety
+	/// violations.
+	///
+	/// [undefined behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html
+	unsafe fn get_unchecked_mut(
+		self,
+		slice: &'a mut BitSlice<O, T>,
+	) -> Self::Mut;
+
+	/// Returns a shared reference to the output at this location, panicking if
+	/// out of bounds.
+	///
+	/// # Original
+	///
+	/// [`SliceIndex::index`](https://doc.rust-lang.org/core/slice/trait.SliceIndex.html#method.index)
+	fn index(self, slice: &'a BitSlice<O, T>) -> Self::Immut;
+
+	/// Returns a mutable reference to the output at this location, panicking if
+	/// out of bounds.
+	///
+	/// # Original
+	///
+	/// [`SliceIndex::index_mut`](https://doc.rust-lang.org/core/slice/trait.SliceIndex.html#method.index_mut)
+	fn index_mut(self, slice: &'a mut BitSlice<O, T>) -> Self::Mut;
+}
+
+impl<'a, O, T> BitSliceIndex<'a, O, T> for usize
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	type Immut = &'a bool;
+	type Mut = BitMut<'a, O, T>;
+
+	#[inline]
+	fn get(self, slice: &'a BitSlice<O, T>) -> Option<Self::Immut> {
+		if self < slice.len() {
+			Some(unsafe { self.get_unchecked(slice) })
+		}
+		else {
+			None
+		}
+	}
+
+	#[inline]
+	fn get_mut(self, slice: &'a mut BitSlice<O, T>) -> Option<Self::Mut> {
+		if self < slice.len() {
+			Some(unsafe { self.get_unchecked_mut(slice) })
+		}
+		else {
+			None
+		}
+	}
+
+	#[inline]
+	unsafe fn get_unchecked(self, slice: &'a BitSlice<O, T>) -> Self::Immut {
+		if slice.bitptr().read::<O>(self) {
+			&true
+		}
+		else {
+			&false
+		}
+	}
+
+	#[inline]
+	unsafe fn get_unchecked_mut(
+		self,
+		slice: &'a mut BitSlice<O, T>,
+	) -> Self::Mut
+	{
+		let bitptr = slice.bitptr();
+		let (elt, bit) = bitptr.head().offset(self as isize);
+		let addr = bitptr.pointer().to_access().offset(elt);
+		BitMut::new_unchecked(addr, bit)
+	}
+
+	#[inline]
+	fn index(self, slice: &'a BitSlice<O, T>) -> Self::Immut {
+		self.get(slice).unwrap_or_else(|| {
+			panic!("Index {} out of bounds: {}", self, slice.len())
+		})
+	}
+
+	#[inline]
+	fn index_mut(self, slice: &'a mut BitSlice<O, T>) -> Self::Mut {
+		let len = slice.len();
+		self.get_mut(slice)
+			.unwrap_or_else(|| panic!("Index {} out of bounds: {}", self, len))
+	}
+}
+
+/// Implement indexing for the different range types.
+macro_rules! range_impl {
+	( $r:ty { $get:item $unchecked:item } ) => {
+		impl<'a, O, T> BitSliceIndex<'a, O, T> for $r
+		where O: 'a + BitOrder, T: 'a + BitStore {
+			type Immut = &'a BitSlice<O, T>;
+			type Mut = &'a mut BitSlice<O, T>;
+
+			#[inline]
+			$get
+
+			#[inline]
+			fn get_mut(self, slice: Self::Mut) -> Option<Self::Mut> {
+				self.get(slice).map(|s| s.bitptr().to_bitslice_mut())
+			}
+
+			#[inline]
+			$unchecked
+
+			#[inline]
+			unsafe fn get_unchecked_mut(self, slice: Self::Mut) -> Self::Mut {
+				self.get_unchecked(slice).bitptr().to_bitslice_mut()
+			}
+
+			fn index(self, slice: Self::Immut) -> Self::Immut {
+				let r = self.clone();
+				let l = slice.len();
+				self.get(slice)
+					.unwrap_or_else(|| {
+						panic!("Range {:?} out of bounds: {}", r, l)
+					})
+			}
+
+			#[inline]
+			fn index_mut(self, slice: Self::Mut) -> Self::Mut {
+				self.index(slice).bitptr().to_bitslice_mut()
+			}
+		}
+	};
+
+	( $( $r:ty => map $func:expr; )* ) => { $(
+		impl<'a, O, T> BitSliceIndex<'a, O, T> for $r
+		where O: 'a + BitOrder, T: 'a + BitStore {
+			type Immut = &'a BitSlice<O, T>;
+			type Mut = &'a mut BitSlice<O, T>;
+
+			#[inline]
+			fn get(self, slice: Self::Immut) -> Option<Self::Immut> {
+				$func(self).get(slice)
+			}
+
+			#[inline]
+			fn get_mut(self, slice: Self::Mut) -> Option<Self::Mut> {
+				$func(self).get_mut(slice)
+			}
+
+			#[inline]
+			unsafe fn get_unchecked(self, slice: Self::Immut) -> Self::Immut {
+				$func(self).get_unchecked(slice)
+			}
+
+			#[inline]
+			unsafe fn get_unchecked_mut(self, slice: Self::Mut) -> Self::Mut {
+				$func(self).get_unchecked_mut(slice)
+			}
+
+			#[inline]
+			fn index(self, slice: Self::Immut) -> Self::Immut {
+				$func(self).index(slice)
+			}
+
+			#[inline]
+			fn index_mut(self, slice: Self::Mut) -> Self::Mut {
+				$func(self).index_mut(slice)
+			}
+		}
+	)* };
+}
+
+range_impl!(Range<usize> {
+	fn get(self, slice: Self::Immut) -> Option<Self::Immut> {
+		let len = slice.len();
+
+		if self.start > len || self.end > len || self.start > self.end {
+			return None;
+		}
+
+		Some(unsafe { (self.start .. self.end).get_unchecked(slice) })
+	}
+
+	unsafe fn get_unchecked(self, slice: Self::Immut) -> Self::Immut {
+		let (addr, head, _) = slice.bitptr().raw_parts();
+
+		let (skip, new_head) = head.offset(self.start as isize);
+
+		BitPtr::new_unchecked(
+			addr.to_const().offset(skip),
+			new_head,
+			self.end - self.start,
+		).to_bitslice_ref()
+	}
+});
+
+range_impl!(RangeFrom<usize> {
+	fn get(self, slice: Self::Immut) -> Option<Self::Immut> {
+		let len = slice.len();
+		if self.start <= len {
+			Some(unsafe { (self.start ..).get_unchecked(slice) })
+		}
+		else {
+			None
+		}
+	}
+
+	unsafe fn get_unchecked(self, slice: Self::Immut) -> Self::Immut {
+		let (addr, head, bits) = slice.bitptr().raw_parts();
+
+		let (skip, new_head) = head.offset(self.start as isize);
+
+		BitPtr::new_unchecked(
+			addr.to_const().offset(skip),
+			new_head,
+			bits - self.start,
+		).to_bitslice_ref()
+	}
+});
+
+range_impl!(RangeTo<usize> {
+	// `.. end` just changes the length
+	fn get(self, slice: Self::Immut) -> Option<Self::Immut> {
+		let len = slice.len();
+		if self.end <= len {
+			Some(unsafe { (.. self.end).get_unchecked(slice) })
+		}
+		else {
+			None
+		}
+	}
+
+	unsafe fn get_unchecked(self, slice: Self::Immut) -> Self::Immut {
+		slice.bitptr().tap_mut(|bp| bp.set_len(self.end)).to_bitslice_ref()
+	}
+});
+
+range_impl! {
+	RangeInclusive<usize> => map |this: Self| {
+		#[allow(clippy::range_plus_one)]
+		(*this.start() .. *this.end() + 1)
+	};
+
+	RangeToInclusive<usize> => map |RangeToInclusive { end }| {
+		#[allow(clippy::range_plus_one)]
+		(.. end + 1)
+	};
+}
+
+/// `RangeFull` is the identity function.
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, T> BitSliceIndex<'a, O, T> for RangeFull
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	type Immut = &'a BitSlice<O, T>;
+	type Mut = &'a mut BitSlice<O, T>;
+
+	#[inline(always)]
+	fn get(self, slice: Self::Immut) -> Option<Self::Immut> {
+		Some(slice)
+	}
+
+	#[inline(always)]
+	fn get_mut(self, slice: Self::Mut) -> Option<Self::Mut> {
+		Some(slice)
+	}
+
+	#[inline(always)]
+	unsafe fn get_unchecked(self, slice: Self::Immut) -> Self::Immut {
+		slice
+	}
+
+	#[inline(always)]
+	unsafe fn get_unchecked_mut(self, slice: Self::Mut) -> Self::Mut {
+		slice
+	}
+
+	#[inline(always)]
+	fn index(self, slice: Self::Immut) -> Self::Immut {
+		slice
+	}
+
+	#[inline(always)]
+	fn index_mut(self, slice: Self::Mut) -> Self::Mut {
+		slice
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/iter.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2533 @@
+//! `BitSlice` iterators
+
+use crate::{
+	index::BitIdx,
+	mem::BitMemory,
+	order::BitOrder,
+	pointer::BitPtr,
+	slice::{
+		proxy::BitMut,
+		BitSlice,
+		BitSliceIndex,
+	},
+	store::BitStore,
+};
+
+use core::{
+	cmp,
+	fmt::{
+		self,
+		Debug,
+		Formatter,
+	},
+	iter::FusedIterator,
+	marker::PhantomData,
+	mem,
+	ptr::NonNull,
+};
+
+/** Immutable slice iterator
+
+This struct is created by the [`iter`] method on [`BitSlice`]s.
+
+# Original
+
+[`slice::Iter`](https://doc.rust-lang.org/core/slice/struct.Iter.html)
+
+# Examples
+
+Basic usage:
+
+```rust
+# #[cfg(feature = "std")] {
+use bitvec::prelude::*;
+
+// First, we declare a type which has `iter` method to get the `Iter` struct (&BitSlice here):
+let data = 129u8;
+let bits = BitSlice::<LocalBits, _>::from_element(&data);
+
+// Then, we iterato over it:
+for bit in bits.iter() {
+  println!("{}", bit);
+}
+# }
+```
+
+[`BitSlice`]: struct.BitSlice.html
+[`iter`]: struct.BitSlice.html#method.iter
+**/
+#[derive(Debug)]
+pub struct Iter<'a, O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	/// Address of the element with the first live bit.
+	base: *const T,
+	/// Address of the element containing the first dead bit.
+	///
+	/// This address may or may not be dereferencable, but thanks to a rule in
+	/// the C++ (and thus LLVM) memory model emplaced specifically to allow
+	/// double-pointer iteration, creation of an address one element after the
+	/// end of a live region is required to be legal. It is not required to be
+	/// equal to a numerically-identical base address of a separate adjoining
+	/// region, but that is not important here.
+	last: *const T,
+	/// Semantic index of the first live bit.
+	head: BitIdx<T::Mem>,
+	/// Semantic index of the first dead bit after the last live bit. This may
+	/// be in an element beyond the dereferencable region.
+	///
+	/// This is not a `BitTail` because reverse iteration requires a valid
+	/// index, and the use of a pointer that may point outside the element
+	/// region has a smoother codepath than the use of an index that may be
+	/// outside the element.
+	tail: BitIdx<T::Mem>,
+	/// `Iter` is semantically equivalent to a `&BitSlice`.
+	_ref: PhantomData<&'a BitSlice<O, T>>,
+}
+
+impl<'a, O, T> Iter<'a, O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	/// Views the underlying data as a subslice of the original data.
+	///
+	/// This has the same lifetime as the original bit slice, and so the
+	/// iterator can continue to be used while this exists.
+	///
+	/// # Original
+	///
+	/// [`Iter::as_slice`](https://doc.rust-lang.org/core/slice/struct.Iter.html#method.as_slice)
+	///
+	/// # API Differences
+	///
+	/// This is renamed, as its return type is not an element slice `&[T]` or
+	/// `&[bool]` but a bit slice.
+	///
+	/// # Examples
+	///
+	/// Basic usage:
+	///
+	/// ```rust
+	/// # #[cfg(feature = "std")] {
+	/// use bitvec::prelude::*;
+	///
+	/// // First, we declare a type which has the `iter` method to get the `Iter`
+	/// // struct (&BitSlice here):
+	/// let data = 129u8;
+	/// let bits = BitSlice::<Msb0, _>::from_element(&data);
+	///
+	/// // Then, we get the iterator:
+	/// let mut iter = bits.iter();
+	/// // So if we print what `as_bitslice` returns here, we have "[1, 0, 0, 0, 0, 0, 0, 1]":
+	/// println!("{:?}", iter.as_bitslice());
+	///
+	/// // Next, we move to the second element of the slice:
+	/// iter.next();
+	/// // Now `as_bitslice` returns "[0, 0, 0, 0, 0, 0, 1]":
+	/// println!("{:?}", iter.as_bitslice());
+	/// # }
+	/// ```
+	#[inline]
+	pub fn as_bitslice(&self) -> &'a BitSlice<O, T> {
+		unsafe { BitPtr::new_unchecked(self.base, self.head, self.len()) }
+			.to_bitslice_ref()
+	}
+
+	/* Allow the standard-library name to resolve, but instruct the user to
+	rename.
+
+	It is important not to use the name `slice` to refer to any `BitSlice`
+	regions, and to keep distinct the views of a `BitSlice` from the views of
+	the underlying `[T]` storage slice.
+	*/
+	#[inline]
+	#[doc(hidden)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(
+		note = "Use `.as_bitslice` on iterators to view the remaining data"
+	)]
+	pub fn as_slice(&self) -> &'a BitSlice<O, T> {
+		self.as_bitslice()
+	}
+
+	/// Removes the bit at the front of the iterator.
+	fn pop_front(&mut self) -> <Self as Iterator>::Item {
+		let out = unsafe { &*self.base }.get_bit::<O>(self.head);
+		let (head, incr) = self.head.incr();
+		self.base = unsafe { self.base.add(incr as usize) };
+		self.head = head;
+
+		if out { &true } else { &false }
+	}
+
+	/// Removes the bit at the back of the iterator.
+	fn pop_back(&mut self) -> <Self as Iterator>::Item {
+		let (tail, offset) = self.tail.decr();
+		self.last = unsafe { self.last.offset(-(offset as isize)) };
+		self.tail = tail;
+		if unsafe { &*self.last }.get_bit::<O>(self.tail) {
+			&true
+		}
+		else {
+			&false
+		}
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Clone for Iter<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	fn clone(&self) -> Self {
+		*self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> AsRef<BitSlice<O, T>> for Iter<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	fn as_ref(&self) -> &BitSlice<O, T> {
+		self.as_bitslice()
+	}
+}
+
+impl<'a, O, T> IntoIterator for &'a BitSlice<O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	type IntoIter = Iter<'a, O, T>;
+	type Item = <Self::IntoIter as Iterator>::Item;
+
+	fn into_iter(self) -> Self::IntoIter {
+		let (addr, head, bits) = self.bitptr().raw_parts();
+
+		let base = addr.to_const();
+
+		let (elts, tail) = head.offset(bits as isize);
+		let last = unsafe { base.offset(elts) };
+
+		Self::IntoIter {
+			base,
+			last,
+			head,
+			tail,
+			_ref: PhantomData,
+		}
+	}
+}
+
+impl<O, T> Copy for Iter<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+/** Mutable bit slice iterator.
+
+This struct is created by the [`iter_mut`] method on [`BitSlice`]s.
+
+# Original
+
+[`slice::IterMut`](https://doc.rust-lang.org/core/slice/struct.IterMut.html)
+
+# API Differences
+
+In addition to returning `BitMut` instead of `&mut bool`, all references
+produced from this iterator are marked as aliasing. This is necessary because
+the references receive the lifetime of the original slice, not of the iterator
+object, and the iterator is able to produce multiple live references in the same
+scope.
+
+# Examples
+
+Basic usage:
+
+```rust
+use bitvec::prelude::*;
+// First, we declare a type which has `iter_mut` method to get the `IterMut`
+// struct (&BitSlice here):
+let mut data = 0u8;
+let bits = data.view_bits_mut::<Msb0>();
+
+// Then, we iterate over it and modify bits:
+for (idx, mut bit) in bits.iter_mut().enumerate() {
+  *bit = idx % 3 == 0;
+}
+assert_eq!(data, 0b100_100_10);
+```
+
+[`BitSlice`]: struct.BitSlice.html
+[`iter_mut`]: struct.BitSlice.html#method.iter_mut
+**/
+#[derive(Debug)]
+pub struct IterMut<'a, O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	/// Address of the element with the first live bit.
+	base: NonNull<<T::Alias as BitStore>::Access>,
+	/// Address of the element with the first dead bit. See `Iter.last`.
+	last: NonNull<<T::Alias as BitStore>::Access>,
+	/// Index of the first live bit in `*base`.
+	head: BitIdx<<T::Alias as BitStore>::Mem>,
+	/// Index of the first dead bit in `*last`. See `Iter.tail`.
+	tail: BitIdx<<T::Alias as BitStore>::Mem>,
+	/// `IterMut` is semantically an aliasing `&mut BitSlice`.
+	_ref: PhantomData<&'a mut BitSlice<O, T::Alias>>,
+}
+
+impl<'a, O, T> IterMut<'a, O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	/// Views the underlying data as a subslice of the original data.
+	///
+	/// To avoid creating `&mut` references that alias the same *bits*, this is
+	/// forced to consume the iterator.
+	///
+	/// # Original
+	///
+	/// [`IterMut::into_bitslice`](https://doc.rust-lang.org/core/slice/struct.IterMut.html#method.into_bitslice)
+	///
+	/// # API Differences
+	///
+	/// This is renamed, as its return type is not an element slice `&mut [T]`
+	/// or `&mut [bool]` but a bit slice.
+	///
+	/// # Examples
+	///
+	/// Basic usage:
+	///
+	/// ```rust
+	/// # #[cfg(feature = "std")] {
+	/// use bitvec::prelude::*;
+	///
+	/// // First, we declare a type which has `iter_mut` method to get the `IterMut`
+	/// // struct (&BitSlice here):
+	/// let mut data = 0u8;
+	/// let bits = data.view_bits_mut::<Lsb0>();
+	///
+	/// {
+	///   // Then, we get the iterator:
+	///   let mut iter = bits.iter_mut();
+	///   // We move to the next element:
+	///   iter.next();
+	///   // So if we print what `into_bitslice` method returns here, we have
+	///   // "[0, 0, 0, 0, 0, 0, 0]":
+	///   println!("{:?}", iter.into_bitslice());
+	/// }
+	///
+	/// // Now let's modify a value of the slice:
+	/// {
+	///   // First we get back the iterator:
+	///   let mut iter = bits.iter_mut();
+	///   // We change the value of the first bit of the slice returned by the `next` method:
+	///   *iter.next().unwrap() = true;
+	/// }
+	/// // Now data is "1":
+	/// assert_eq!(data, 1);
+	/// # }
+	pub fn into_bitslice(self) -> &'a mut BitSlice<O, T::Alias> {
+		unsafe {
+			BitPtr::new_unchecked(
+				self.base.as_ptr()
+					as *const <<T as BitStore>::Alias as BitStore>::Access
+					as *const <T as BitStore>::Alias,
+				self.head,
+				self.len(),
+			)
+		}
+		.to_bitslice_mut()
+	}
+
+	/* Allow the standard-library name to resolve, but instruct the user to
+	rename.
+
+	It is important not to use the name `slice` to refer to any `BitSlice`
+	regions, and to keep distinct the views of a `BitSlice` from the views of
+	the underlying `[T]` storage slice.
+	*/
+	#[inline]
+	#[doc(hidden)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(note = "Use `.into_bitslice` on mutable iterators to view \
+	                     the remaining data")]
+	pub fn into_slice(self) -> &'a mut BitSlice<O, T::Alias> {
+		self.into_bitslice()
+	}
+
+	/// Removes the bit at the front of the iterator.
+	fn pop_front(&mut self) -> <Self as Iterator>::Item {
+		let out =
+			unsafe { BitMut::new_unchecked(self.base.as_ptr(), self.head) };
+
+		let (head, incr) = self.head.incr();
+		self.base = unsafe {
+			NonNull::new_unchecked(self.base.as_ptr().add(incr as usize))
+		};
+		self.head = head;
+
+		out
+	}
+
+	/// Removes the bit at the back of the iterator.
+	fn pop_back(&mut self) -> <Self as Iterator>::Item {
+		let (tail, decr) = self.tail.decr();
+		self.last = unsafe {
+			NonNull::new_unchecked(self.last.as_ptr().sub(decr as usize))
+		};
+		self.tail = tail;
+
+		unsafe { BitMut::new_unchecked(self.last.as_ptr(), self.tail) }
+	}
+}
+
+impl<'a, O, T> IntoIterator for &'a mut BitSlice<O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	type IntoIter = IterMut<'a, O, T>;
+	type Item = <Self::IntoIter as Iterator>::Item;
+
+	fn into_iter(self) -> Self::IntoIter {
+		let (addr, head, bits) = self.alias().bitptr().raw_parts();
+
+		let addr = addr.to_access()
+			as *mut <<T as BitStore>::Alias as BitStore>::Access;
+		let base = unsafe { NonNull::new_unchecked(addr) };
+
+		let (elts, tail) = head.offset(bits as isize);
+		let last = unsafe { NonNull::new_unchecked(addr.offset(elts)) };
+
+		Self::IntoIter {
+			base,
+			last,
+			head,
+			tail,
+			_ref: PhantomData,
+		}
+	}
+}
+
+impl<'a, O, T> Iter<'a, O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	/// The canonical empty iterator.
+	const EMPTY: Self = Self {
+		base: NonNull::dangling().as_ptr() as *const T,
+		last: NonNull::dangling().as_ptr() as *const T,
+		head: BitIdx::ZERO,
+		tail: BitIdx::ZERO,
+		_ref: PhantomData,
+	};
+
+	#[inline(always)]
+	fn get_base(&self) -> *const T {
+		self.base
+	}
+
+	#[inline(always)]
+	fn get_last(&self) -> *const T {
+		self.last
+	}
+
+	#[inline(always)]
+	fn set_base(&mut self, base: *const T) {
+		self.base = base
+	}
+
+	#[inline(always)]
+	fn set_last(&mut self, last: *const T) {
+		self.last = last
+	}
+}
+
+impl<'a, O, T> IterMut<'a, O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	/// The canonical empty iterator.
+	const EMPTY: Self = Self {
+		base: NonNull::dangling(),
+		last: NonNull::dangling(),
+		head: BitIdx::ZERO,
+		tail: BitIdx::ZERO,
+		_ref: PhantomData,
+	};
+
+	#[inline(always)]
+	fn get_base(&self) -> *mut <T::Alias as BitStore>::Access {
+		self.base.as_ptr()
+	}
+
+	#[inline(always)]
+	fn get_last(&self) -> *mut <T::Alias as BitStore>::Access {
+		self.last.as_ptr()
+	}
+
+	#[inline(always)]
+	fn set_base(&mut self, base: *mut <T::Alias as BitStore>::Access) {
+		self.base = unsafe { NonNull::new_unchecked(base) }
+	}
+
+	#[inline(always)]
+	fn set_last(&mut self, last: *mut <T::Alias as BitStore>::Access) {
+		self.last = unsafe { NonNull::new_unchecked(last) }
+	}
+}
+
+/// `Iter` and `IterMut` have very nearly the same implementation text.
+macro_rules! iter {
+	($($t:ident => $i:ty),+ $(,)?) => { $(
+		impl<'a, O, T> $t<'a, O, T>
+		where
+			O: 'a + BitOrder,
+			T: 'a + BitStore,
+		{
+			/// Tests whether the iterator is *any* empty iterator.
+			pub(crate) fn inherent_is_empty(&self) -> bool {
+				self.base == self.last && self.head == self.tail
+			}
+		}
+
+		impl<'a, O, T> Iterator for $t<'a, O, T>
+		where
+			O: 'a + BitOrder,
+			T: 'a + BitStore,
+		{
+			type Item = $i;
+
+			#[inline]
+			fn next(&mut self) -> Option<Self::Item> {
+				if self.inherent_is_empty() {
+					return None;
+				}
+				Some(self.pop_front())
+			}
+
+			#[inline]
+			fn size_hint(&self) -> (usize, Option<usize>) {
+				let len = self.len();
+				(len, Some(len))
+			}
+
+			#[inline]
+			fn count(self) -> usize {
+				self.len()
+			}
+
+			#[inline]
+			fn nth(&mut self, n: usize) -> Option<Self::Item> {
+				if n >= self.len() {
+					*self = Self::EMPTY;
+					return None;
+				}
+
+				//  Move the head cursors up by `n` bits before producing a bit.
+				let (elts, head) = self.head.offset(n as isize);
+				self.set_base(unsafe{self.get_base().offset(elts)});
+				self.head = head;
+				Some(self.pop_front())
+			}
+
+			#[inline]
+			fn last(mut self) -> Option<Self::Item> {
+				self.next_back()
+			}
+		}
+
+		impl<'a, O, T> DoubleEndedIterator for $t <'a, O, T>
+		where
+			O: 'a + BitOrder,
+			T: 'a + BitStore,
+		{
+			#[inline]
+			fn next_back(&mut self) -> Option<Self::Item> {
+				if self.inherent_is_empty() {
+					return None;
+				}
+				Some(self.pop_back())
+			}
+
+			#[inline]
+			fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+				if n >= self.len() {
+					*self = Self::EMPTY;
+					return None;
+				}
+
+				//  Move the tail cursors down by `n` bits before producing a
+				//  bit.
+				let (elts, tail) = self.tail.offset(-(n as isize));
+				self.set_last(unsafe{self.get_last().offset(elts)});
+				self.tail = tail;
+				Some(self.pop_back())
+			}
+		}
+
+		impl<O, T> ExactSizeIterator for $t <'_, O, T>
+		where
+			O: BitOrder,
+			T: BitStore,
+		{
+			fn len(&self) -> usize {
+				let (base, last) =
+					(self.get_base() as usize, self.get_last() as usize);
+				/* Get the total number of bits in the element range
+				`self.base .. self.last`. Wrapping arithmetic is used because
+				`last` is known to never be less than base, so we always want a
+				bare `sub` instruction without any checks. We also know that the
+				difference between the two addresses can support a `shl`
+				instruction without overflow.
+				*/
+				last.wrapping_sub(base)
+					//  Pointers are always byte-stepped, not element-stepped.
+					.wrapping_shl(<u8 as BitMemory>::INDX as u32)
+					//  Now, add the live bits before `self.tail` in `*last`,
+					.wrapping_add(self.tail.value() as usize)
+					//  And remove the dead bits before `self.head` in `*base`.
+					.wrapping_sub(self.head.value() as usize)
+			}
+		}
+
+		impl<O, T> FusedIterator for $t <'_, O, T>
+		where
+			O: BitOrder,
+			T: BitStore
+		{
+		}
+
+		unsafe impl<O, T> Send for $t <'_, O, T>
+		where
+			O: BitOrder,
+			T: BitStore,
+		{
+		}
+
+		unsafe impl<O, T> Sync for $t <'_, O, T>
+		where
+			O: BitOrder,
+			T: BitStore,
+		{
+		}
+	)+ };
+}
+
+iter!(
+	Iter => <usize as BitSliceIndex<'a, O, T>>::Immut,
+	IterMut => <usize as BitSliceIndex<'a, O, T::Alias>>::Mut,
+);
+
+/// Creates a full iterator set from only the base functions needed to build it.
+macro_rules! group {
+	(
+		//  The type for the iteration set. This must be an immutable group.
+		$iter:ident => $item:ty $( where $alias:ident )? {
+			//  The eponymous functions from the iterator traits.
+			$next:item
+			$nth:item
+			$next_back:item
+			$nth_back:item
+			$len:item
+		}
+	) => {
+		//  Immutable iterator implementation
+		impl<'a, O, T> Iterator for $iter <'a, O, T>
+		where
+			O: BitOrder,
+			T: 'a + BitStore,
+		{
+			type Item = $item;
+
+			#[inline]
+			$next
+
+			#[inline]
+			$nth
+
+			#[inline]
+			fn size_hint(&self) -> (usize, Option<usize>) {
+				let len = self.len();
+				(len, Some(len))
+			}
+
+			#[inline]
+			fn count(self) -> usize {
+				self.len()
+			}
+
+			#[inline]
+			fn last(mut self) -> Option<Self::Item> {
+				self.next_back()
+			}
+		}
+
+		impl<'a, O, T> DoubleEndedIterator for $iter <'a, O, T>
+		where
+			O: BitOrder,
+			T: 'a + BitStore,
+		{
+			#[inline]
+			$next_back
+
+			#[inline]
+			$nth_back
+		}
+
+		impl<O, T> ExactSizeIterator for $iter <'_, O, T>
+		where
+			O: BitOrder,
+			T: BitStore,
+		{
+			#[inline]
+			$len
+		}
+
+		impl<O, T> FusedIterator for $iter <'_, O, T>
+		where
+			O: BitOrder,
+			T: BitStore,
+		{
+		}
+	}
+}
+
+/** An iterator over overlapping subslices of length `size`.
+
+This struct is created by the [`windows`] method on [bit slices].
+
+# Original
+
+[`slice::Windows`](https://doc.rust-lang.org/core/slice/struct.Windows.html)
+
+[bit slices]: struct.BitSlice.html
+[`windows`]: struct.BitSlice.html#method.windows
+**/
+#[derive(Clone, Debug)]
+pub struct Windows<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being windowed.
+	slice: &'a BitSlice<O, T>,
+	/// The width of the produced windows.
+	width: usize,
+}
+
+group!(Windows => &'a BitSlice<O, T> {
+	fn next(&mut self) -> Option<Self::Item> {
+		if self.width > self.slice.len() {
+			self.slice = Default::default();
+			return None;
+		}
+		unsafe {
+			let out = self.slice.get_unchecked(.. self.width);
+			self.slice = self.slice.get_unchecked(1 ..);
+			Some(out)
+		}
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let (end, ovf) = self.width.overflowing_add(n);
+		if end > self.slice.len() || ovf {
+			self.slice = Default::default();
+			return None;
+		}
+		unsafe {
+			let out = self.slice.get_unchecked(n .. end);
+			self.slice = self.slice.get_unchecked(n + 1 ..);
+			Some(out)
+		}
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		let len = self.slice.len();
+		if self.width > len {
+			self.slice = Default::default();
+			return None;
+		}
+		unsafe {
+			let out = self.slice.get_unchecked(len - self.width ..);
+			self.slice = self.slice.get_unchecked(.. len - 1);
+			Some(out)
+		}
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let (end, ovf) = self.slice.len().overflowing_sub(n);
+		if end < self.width || ovf {
+			self.slice = Default::default();
+			return None;
+		}
+		unsafe {
+			let out = self.slice.get_unchecked(end - self.width .. end);
+			self.slice = self.slice.get_unchecked(.. end - 1);
+			Some(out)
+		}
+	}
+
+	fn len(&self) -> usize {
+		let len = self.slice.len();
+		if self.width > len {
+			return 0;
+		}
+		len - self.width + 1
+	}
+});
+
+/** An iterator over a bit slice in (non-overlapping) chunks (`chunk_size` bits
+at a time), starting at the beginning of the slice.
+
+When the slice length is not evenly divided by the chunk size, the last slice of
+the iteration will be the remainder.
+
+This struct is created by the [`chunks`] method on [bit slices].
+
+# Original
+
+[`slice::Chunks`](https://doc.rust-lang.org/core/slice/struct.Chunks.html)
+
+[bit slices]: struct.BitSlice.html
+[`chunks`]: struct.BitSlice.html#method.chunks
+**/
+#[derive(Clone, Debug)]
+pub struct Chunks<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being chunked.
+	slice: &'a BitSlice<O, T>,
+	/// The width of the produced chunks.
+	width: usize,
+}
+
+group!(Chunks => &'a BitSlice<O, T> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let len = self.slice.len();
+		if len == 0 {
+			return None;
+		}
+		let mid = cmp::min(len, self.width);
+		let (out, rest) = unsafe { self.slice.split_at_unchecked(mid) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.slice.len();
+		let (start, ovf) = n.overflowing_mul(self.width);
+		if start >= len || ovf {
+			self.slice = Default::default();
+			return None;
+		}
+		let (out, rest) = unsafe {
+			self.slice
+				//  Discard the skipped front chunks,
+				.get_unchecked(start ..)
+				//  then split at the chunk width, or remnant length.
+				.split_at_unchecked(cmp::min(len, self.width))
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		match self.slice.len() {
+			0 => None,
+			len => {
+				//  Determine if the back chunk is a remnant or a whole chunk.
+				let rem = len % self.width;
+				let size = if rem == 0 { self.width } else { rem };
+				let (rest, out) =
+					unsafe { self.slice.split_at_unchecked(len - size) };
+				self.slice = rest;
+				Some(out)
+			},
+		}
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.len();
+		if n >= len {
+			self.slice = Default::default();
+			return None;
+		}
+		let start = (len - 1 - n) * self.width;
+		let width = cmp::min(start + self.width, self.slice.len());
+		let (rest, out) = unsafe {
+			self.slice
+				//  Truncate to the end of the returned chunk,
+				.get_unchecked(.. start + width)
+				//  then split at the start of the returned chunk.
+				.split_at_unchecked(start)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn len(&self) -> usize {
+		match self.slice.len() {
+			0 => 0,
+			len => {
+				//  an explicit `div_mod` would be nice here
+				let (n, r) = (len / self.width, len % self.width);
+				n + (r > 0) as usize
+			},
+		}
+	}
+});
+
+/** An iterator over a bit slice in (non-overlapping) mutable chunks
+(`chunk_size` bits at a time), starting at the beginning of the slice.
+
+When the slice len is not evenly divided by the chunk size, the last slice of
+the iteration will be the remainder.
+
+This struct is created by the [`chunks_mut`] method on [bit slices].
+
+# Original
+
+[`slice::ChunksMut`](https://doc.rust-lang.org/core/slice/struct.ChunksMut.html)
+
+# API Differences
+
+All slices yielded from this iterator are marked as aliased.
+
+[bit slices]: struct.BitSlice.html
+[`chunks_mut`]: struct.BitSlice.html#chunks_mut
+**/
+#[derive(Debug)]
+pub struct ChunksMut<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being chunked.
+	slice: &'a mut BitSlice<O, T::Alias>,
+	/// The width of the produced chunks.
+	width: usize,
+}
+
+group!(ChunksMut => &'a mut BitSlice<O, T::Alias> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let len = slice.len();
+		if len == 0 {
+			return None;
+		}
+		let mid = cmp::min(len, self.width);
+		let (out, rest) = unsafe { slice.split_at_unchecked_mut_noalias(mid) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let len = slice.len();
+		let (start, ovf) = n.overflowing_mul(self.width);
+		if start >= len || ovf {
+			return None;
+		}
+		let (out, rest) = unsafe {
+			slice
+				//  Discard the skipped front chunks,
+				.get_unchecked_mut(start ..)
+				//  then split at the chunk width, or remnant length.
+				.split_at_unchecked_mut_noalias(cmp::min(len, self.width))
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		match slice.len() {
+			0 => None,
+			len => {
+				//  Determine if the back chunk is a remnant or a whole chunk.
+				let rem = len % self.width;
+				let size = if rem == 0 { self.width } else { rem };
+				let (rest, out) =
+					unsafe { slice.split_at_unchecked_mut_noalias(len - size) };
+				self.slice = rest;
+				Some(out)
+			},
+		}
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.len();
+		let slice = mem::take(&mut self.slice);
+		if n >= len {
+			return None;
+		}
+		let start = (len - 1 - n) * self.width;
+		let width = cmp::min(start + self.width, slice.len());
+		let (rest, out) = unsafe {
+			slice
+				//  Truncate to the end of the returned chunk,
+				.get_unchecked_mut(.. start + width)
+				//  then split at the start of the returned chunk.
+				.split_at_unchecked_mut_noalias(start)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn len(&self) -> usize {
+		match self.slice.len() {
+			0 => 0,
+			len => {
+				//  an explicit `div_mod` would be nice here
+				let (n, r) = (len / self.width, len % self.width);
+				n + (r > 0) as usize
+			},
+		}
+	}
+});
+
+/** An iterator over a bit slice in (non-overlapping) chunks (`chunk_size` bits
+at a time), starting at the beginning of the slice.
+
+When the slice len is not evenly divided by the chunk size, the last up to
+`chunk_size - 1` bits will be ommitted but can be retrieved from the
+[`remainder`] function from the iterator.
+
+This struct is created by the [`chunks_exact`] method on [bit slices].
+
+# Original
+
+[`slice::ChunksExact`](https://doc.rust-lang.org/core/slice/struct.ChunksExact.html)
+
+[bit slices]: struct.BitSlice.html
+[`chunks_exact`]: struct.BitSlice.html#method.chunks_exact
+[`remainder`]: #method.remainder
+**/
+#[derive(Clone, Debug)]
+pub struct ChunksExact<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being chunked.
+	slice: &'a BitSlice<O, T>,
+	/// Any remnant of the chunked `BitSlice` not divisible by `width`.
+	extra: &'a BitSlice<O, T>,
+	/// The width of the produced chunks.
+	width: usize,
+}
+
+impl<'a, O, T> ChunksExact<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	pub(super) fn new(slice: &'a BitSlice<O, T>, width: usize) -> Self {
+		let len = slice.len();
+		let rem = len % width;
+		let (slice, extra) = unsafe { slice.split_at_unchecked(len - rem) };
+		Self {
+			slice,
+			extra,
+			width,
+		}
+	}
+
+	/// Returns the remainder of the original bit slice that is not going to be
+	/// returned by the iterator. The returned slice has at most `chunk_size-1`
+	/// bits.
+	///
+	/// # Original
+	///
+	/// [`slice::ChunksExact::remainder`](https://doc.rust-lang.org/core/slice/struct.ChunksExact.html#method.remainder)
+	pub fn remainder(&self) -> &'a BitSlice<O, T> {
+		self.extra
+	}
+}
+
+group!(ChunksExact => &'a BitSlice<O, T> {
+	fn next(&mut self) -> Option<Self::Item> {
+		if self.slice.len() < self.width {
+			return None;
+		}
+		let (out, rest) = unsafe { self.slice.split_at_unchecked(self.width) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let (start, ovf) = n.overflowing_mul(self.width);
+		if start + self.width >= self.slice.len() || ovf {
+			self.slice = Default::default();
+			return None;
+		}
+		let (out, rest) = unsafe {
+			self.slice
+				.get_unchecked(start ..)
+				.split_at_unchecked(self.width)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		let len = self.slice.len();
+		if len < self.width {
+			return None;
+		}
+		let (rest, out) =
+			unsafe { self.slice.split_at_unchecked(len - self.width) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.len();
+		if n >= len {
+			self.slice = Default::default();
+			return None;
+		}
+		let end = (len - n) * self.width;
+		let (rest, out) = unsafe {
+			self.slice
+				.get_unchecked(.. end)
+				.split_at_unchecked(end - self.width)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn len(&self) -> usize {
+		self.slice.len() / self.width
+	}
+});
+
+/** An iterator over a bit slice in (non-overlapping) mutable chunks
+(`chunk_size` bits at a time), starting at the beginning of the slice.
+
+When the slice len is not evenly divided by the chunk size, the last up to
+`chunk_size-1` bits will be omitted but can be retrieved from the
+[`into_remainder`] function from the iterator.
+
+This struct is created by the [`chunks_exact_mut`] method on [bit slices].
+
+# Original
+
+[`slice::ChunksExactMut`](https://doc.rust-lang.org/core/slice/struct.ChunksExactMut.html)
+
+# API Differences
+
+All slices yielded from this iterator are marked as aliased.
+
+[bit slices]: struct.BitSlice.html
+[`chunks_exact_mut`]: struct.BitSlice.html#method.chunks_exact_mut
+[`into_remainder`]: #method.into_remainder
+**/
+#[derive(Debug)]
+pub struct ChunksExactMut<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being chunked.
+	slice: &'a mut BitSlice<O, T::Alias>,
+	/// Any remnant of the chunked `BitSlice` not divisible by `width`.
+	extra: &'a mut BitSlice<O, T::Alias>,
+	/// The width of the produced chunks.
+	width: usize,
+}
+
+impl<'a, O, T> ChunksExactMut<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	pub(super) fn new(slice: &'a mut BitSlice<O, T>, width: usize) -> Self {
+		let len = slice.len();
+		let rem = len % width;
+		let (slice, extra) = unsafe { slice.split_at_unchecked_mut(len - rem) };
+		Self {
+			slice,
+			extra,
+			width,
+		}
+	}
+
+	/// Returns the remainder of the original slice that is not going to be
+	/// returned by the iterator. The returned slice has at most `chunk_size-1`
+	/// bits.
+	///
+	/// # Original
+	///
+	/// [`slice::ChunksExactMut::into_remainder`](https://doc.rust-lang.org/core/slice/struct.ChunksExactMut.html#method.into_remainder)
+	///
+	/// # API Differences
+	///
+	/// The remainder slice, as with all slices yielded from this iterator, is
+	/// marked as aliased.
+	#[inline]
+	pub fn into_remainder(self) -> &'a mut BitSlice<O, T::Alias> {
+		self.extra
+	}
+}
+
+group!(ChunksExactMut => &'a mut BitSlice<O, T::Alias> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		if slice.len() < self.width {
+			return None;
+		}
+		let (out, rest) =
+			unsafe { slice.split_at_unchecked_mut_noalias(self.width) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let (start, ovf) = n.overflowing_mul(self.width);
+		if start + self.width >= slice.len() || ovf {
+			return None;
+		}
+		let (out, rest) = unsafe {
+			slice.get_unchecked_mut(start ..)
+				.split_at_unchecked_mut_noalias(self.width)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let len = slice.len();
+		if len < self.width {
+			return None;
+		}
+		let (rest, out) =
+			unsafe { slice.split_at_unchecked_mut_noalias(len - self.width) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.len();
+		let slice = mem::take(&mut self.slice);
+		if n >= len {
+			return None;
+		}
+		let end = (len - n) * self.width;
+		let (rest, out) = unsafe {
+			slice.get_unchecked_mut(.. end)
+				.split_at_unchecked_mut_noalias(end - self.width)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn len(&self) -> usize {
+		self.slice.len() / self.width
+	}
+});
+
+/** An iterator over a bit slice in (non-overlapping) chunks (`chunk_size` bits
+at a time), starting at the end of the slice.
+
+When the slice length is not evenly divided by the chunk size, the last slice of
+the iteration will be the remainder.
+
+This struct is created by the [`rchunks`] method on [`BitSlice`]s.
+
+# Original
+
+[`slice::RChunks`](https://doc.rust-lang.org/core/slice/struct.RChunks.html)
+
+[`BitSlice`]: struct.BitSlice.html
+[`rchunks`]: struct.BitSlice.html#method.rchunks
+**/
+#[derive(Clone, Debug)]
+pub struct RChunks<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being chunked.
+	slice: &'a BitSlice<O, T>,
+	/// The width of the produced chunks.
+	width: usize,
+}
+
+group!(RChunks => &'a BitSlice<O, T> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let len = self.slice.len();
+		if len == 0 {
+			return None;
+		}
+		let mid = len - cmp::min(len, self.width);
+		let (rest, out) = unsafe { self.slice.split_at_unchecked(mid) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.slice.len();
+		let (num, ovf) = n.overflowing_mul(self.width);
+		if num >= len || ovf {
+			self.slice = Default::default();
+			return None;
+		}
+		let end = len - num;
+		//  Find the partition between `[.. retain]` and `[return ..][..w]`
+		let mid = end.saturating_sub(self.width);
+		let (rest, out) = unsafe {
+			self.slice
+				.get_unchecked(.. end)
+				.split_at_unchecked(mid)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		match self.slice.len() {
+			0 => None,
+			n => {
+				let rem = n % self.width;
+				let len = if rem == 0 { self.width } else { rem };
+				let (out, rest) = unsafe { self.slice.split_at_unchecked(len) };
+				self.slice = rest;
+				Some(out)
+			},
+		}
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.len();
+		if n >= len {
+			self.slice = Default::default();
+			return None;
+		}
+		/* Taking from the back of a reverse iterator means taking from the
+		front of the slice.
+
+		`len` gives us the total number of subslices remaining. In order to find
+		the partition point, we need to subtract `n - 1` full subslices from
+		that count (because the back slice of the iteration might not be full),
+		compute their bit width, and offset *that* from the end of the memory
+		region. This gives us the zero-based index of the partition point
+		between what is returned and what is retained.
+
+		The `part ..` section of the slice is retained, and the very end of the
+		`.. part` section is returned. The head section is split at no less than
+		`self.width` bits below the end marker (this could be the partial
+		section, so a wrapping subtraction cannot be used), and `.. start` is
+		discarded.
+
+		Source:
+		https://doc.rust-lang.org/1.43.0/src/core/slice/mod.rs.html#5141-5156
+		*/
+		let from_end = (len - 1 - n) * self.width;
+		let end = self.slice.len() - from_end;
+		let start = end.saturating_sub(self.width);
+		let (out, rest) = unsafe { self.slice.split_at_unchecked(end) };
+		self.slice = rest;
+		Some(unsafe { out.get_unchecked(start ..) })
+	}
+
+	fn len(&self) -> usize {
+		match self.slice.len() {
+			0 => 0,
+			len => {
+				let (n, r) = (len / self.width, len % self.width);
+				n + (r > 0) as usize
+			},
+		}
+	}
+});
+
+/** An iterator over a slice in (non-overlapping) mutable chunks (`chunk_size`
+bits at a time), starting at the end of the slice.
+
+When the slice length is not evenly divided by the chunk size, the last slice of
+the iteration will be the remainder.
+
+This struct is created by the [`rchunks_mut`] method on [bit slices].
+
+# API Differences
+
+All slices yielded from this iterator are marked as aliased.
+
+[bit slices]: struct.BitSlice.html
+[`rchunks_mut`]: struct.BitSlice.html#method.rchunks_mut
+**/
+#[derive(Debug)]
+pub struct RChunksMut<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being chunked.
+	slice: &'a mut BitSlice<O, T::Alias>,
+	/// The width of the produced chunks.
+	width: usize,
+}
+
+group!(RChunksMut => &'a mut BitSlice<O, T::Alias> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let len = slice.len();
+		if len == 0 {
+			return None;
+		}
+		let mid = len - cmp::min(len, self.width);
+		let (rest, out) = unsafe { slice.split_at_unchecked_mut_noalias(mid) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let len = slice.len();
+		let (num, ovf) = n.overflowing_mul(self.width);
+		if num >= len || ovf {
+			return None;
+		}
+		let end = len - num;
+		//  Find the partition between `[.. retain]` and `[return ..][..w]`
+		let mid = end.saturating_sub(self.width);
+		let (rest, out) = unsafe {
+			slice.get_unchecked_mut(.. end)
+				.split_at_unchecked_mut_noalias(mid)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		match slice.len() {
+			0 => None,
+			n => {
+				let rem = n % self.width;
+				let len = if rem == 0 { self.width } else { rem };
+				let (out, rest) =
+					unsafe { slice.split_at_unchecked_mut_noalias(len) };
+				self.slice = rest;
+				Some(out)
+			},
+		}
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.len();
+		let slice = mem::take(&mut self.slice);
+		if n >= len {
+			return None;
+		}
+		let from_end = (len - 1 - n) * self.width;
+		let end = slice.len() - from_end;
+		let start = end.saturating_sub(self.width);
+		let (out, rest) = unsafe { slice.split_at_unchecked_mut_noalias(end) };
+		self.slice = rest;
+		Some(unsafe { out.get_unchecked_mut(start ..) })
+	}
+
+	fn len(&self) -> usize {
+		match self.slice.len() {
+			0 => 0,
+			len => {
+				let (n, r) = (len / self.width, len % self.width);
+				n + (r > 0) as usize
+			},
+		}
+	}
+});
+
+/** An iterator over a bit slice in (non-overlapping) chunks (`chunk_size` bits
+at a time), starting at the end of the slice.
+
+When the slice len is not evenly divided by the chunk size, the last up to
+`chunk_size-1` bits will be omitted but can be retrieved from the [`remainder`]
+function from the iterator.
+
+This struct is created by the [`rchunks_exact`] method on [bit slices].
+
+# Original
+
+[`slice::RChunksExact`](https://doc.rust-lang.org/core/slice/struct.RChunksExact.html)
+
+[bit slices]: struct.BitSlice.html
+[`rchunks_exact`]: struct.BitSlice.html#method.rchunks_exact
+[`remainder`]: #method.remainder
+**/
+#[derive(Clone, Debug)]
+pub struct RChunksExact<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being chunked.
+	slice: &'a BitSlice<O, T>,
+	/// Any remnant of the chunked `BitSlice` not divisible by `width`.
+	extra: &'a BitSlice<O, T>,
+	/// The width of the produced chunks.
+	width: usize,
+}
+
+impl<'a, O, T> RChunksExact<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	pub(super) fn new(slice: &'a BitSlice<O, T>, width: usize) -> Self {
+		let (extra, slice) =
+			unsafe { slice.split_at_unchecked(slice.len() % width) };
+		Self {
+			slice,
+			extra,
+			width,
+		}
+	}
+
+	/// Returns the remainder of the original slice that is not going to be
+	/// returned by the iterator. The returned slice has at most `chunk_size-1`
+	/// bits.
+	///
+	/// # Original
+	///
+	/// [`slice::RChunksExact::remainder`](https://doc.rust-lang.org/core/slice/struct.RChunksExact.html#method.remainder)
+	#[inline]
+	pub fn remainder(&self) -> &'a BitSlice<O, T> {
+		self.extra
+	}
+}
+
+group!(RChunksExact => &'a BitSlice<O, T> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let len = self.slice.len();
+		if len < self.width {
+			return None;
+		}
+		let (rest, out) =
+			unsafe { self.slice.split_at_unchecked(len - self.width) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.slice.len();
+		let (split, ovf) = n.overflowing_mul(self.width);
+		if split >= len || ovf {
+			self.slice = Default::default();
+			return None;
+		}
+		let end = len - split;
+		let (rest, out) = unsafe {
+			self.slice
+				.get_unchecked(.. end)
+				.split_at_unchecked(end - self.width)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		if self.slice.len() < self.width {
+			return None;
+		}
+		let (out, rest) = unsafe { self.slice.split_at_unchecked(self.width) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let len = self.slice.len();
+		let (start, ovf) = n.overflowing_mul(self.width);
+		if start >= len || ovf {
+			self.slice = Default::default();
+			return None;
+		}
+		//  At this point, `start` is at least `self.width` less than `len`.
+		let (out, rest) = unsafe {
+			self.slice.get_unchecked(start ..).split_at_unchecked(self.width)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn len(&self) -> usize {
+		self.slice.len() / self.width
+	}
+});
+
+/** An iterator over a bit slice in (non-overlapping) mutable chunks
+(`chunk_size` bits at a time), starting at the end of the slice.
+
+When the slice len is not evenly divided by the chunk size, the last up to
+`chunk_size-1` bits will be omitted but can be retrieved from the
+[`into_remainder`] function from the iterator.
+
+This struct is created by the [`rchunks_exact_mut`] method on [bit slices].
+
+# Original
+
+[`slice::RChunksExactMut`](https://doc.rust-lang.org/core/slice/struct.RChunksExactMut.html)
+
+# API Differences
+
+All slices yielded from this iterator are marked as aliased.
+
+[bit slices]: struct.BitSlice.html
+[`into_remainder`]: #method.into_remainder
+[`rchunks_exact_mut`]: struct.BitSlice.html#method.rchunks_exact_mut
+**/
+#[derive(Debug)]
+pub struct RChunksExactMut<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// The `BitSlice` being chunked.
+	slice: &'a mut BitSlice<O, T::Alias>,
+	/// Any remnant of the chunked `BitSlice` not divisible by `width`.
+	extra: &'a mut BitSlice<O, T::Alias>,
+	/// The width of the produced chunks.
+	width: usize,
+}
+
+impl<'a, O, T> RChunksExactMut<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	pub(super) fn new(slice: &'a mut BitSlice<O, T>, width: usize) -> Self {
+		let (extra, slice) =
+			unsafe { slice.split_at_unchecked_mut(slice.len() % width) };
+		Self {
+			slice,
+			extra,
+			width,
+		}
+	}
+
+	/// Returns the remainder of the original slice that is not going to be
+	/// returned by the iterator. The returned slice has at most `chunk_size-1`
+	/// bits.
+	///
+	/// # Original
+	///
+	/// [`slice::RChunksExactMut::into_remainder`](https://doc.rust-lang.org/core/slice/struct.RChunksExactMut.html#method.into_remainder)
+	///
+	/// # API Differences
+	///
+	/// The remainder slice, as with all slices yielded from this iterator, is
+	/// marked as aliased.
+	#[inline]
+	pub fn into_remainder(self) -> &'a mut BitSlice<O, T::Alias> {
+		self.extra
+	}
+}
+
+group!(RChunksExactMut => &'a mut BitSlice<O, T::Alias> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let len = slice.len();
+		if len < self.width {
+			return None;
+		}
+		let (rest, out) =
+			unsafe { slice.split_at_unchecked_mut_noalias(len - self.width) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let len = slice.len();
+		let (split, ovf) = n.overflowing_mul(self.width);
+		if split >= len || ovf {
+			return None;
+		}
+		let end = len - split;
+		let (rest, out) = unsafe {
+			slice.get_unchecked_mut(.. end)
+				.split_at_unchecked_mut_noalias(end - self.width)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		if slice.len() < self.width {
+			return None;
+		}
+		let (out, rest) =
+			unsafe { slice.split_at_unchecked_mut_noalias(self.width) };
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let slice = mem::take(&mut self.slice);
+		let len = slice.len();
+		let (start, ovf) = n.overflowing_mul(self.width);
+		if start >= len || ovf {
+			return None;
+		}
+		//  At this point, `start` is at least `self.width` less than `len`.
+		let (out, rest) = unsafe {
+			slice.get_unchecked_mut(start ..)
+				.split_at_unchecked_mut_noalias(self.width)
+		};
+		self.slice = rest;
+		Some(out)
+	}
+
+	fn len(&self) -> usize {
+		self.slice.len() / self.width
+	}
+});
+
+macro_rules! new_group {
+	($($t:ident $($m:ident)? $( . $a:ident ())?),+ $(,)?) => { $(
+		impl<'a, O, T> $t <'a, O, T>
+		where
+			O: BitOrder,
+			T: BitStore
+		{
+			#[cfg_attr(not(tarpaulin), inline(always))]
+			#[allow(clippy::redundant_field_names)]
+			pub(super) fn new(
+				slice: &'a $($m)? BitSlice<O, T>,
+				width: usize,
+			) -> Self {
+				Self { slice: slice $( . $a () )?, width }
+			}
+		}
+	)+ };
+}
+
+new_group!(
+	Windows,
+	Chunks,
+	ChunksMut mut .alias_mut(),
+	RChunks,
+	RChunksMut mut .alias_mut(),
+);
+
+macro_rules! split {
+	($iter:ident => $item:ty $( where $alias:ident )? {
+		$next:item
+		$next_back:item
+	}) => {
+		impl<'a, O, T, P> $iter <'a, O, T, P>
+		where
+			O: BitOrder,
+			T: 'a + BitStore,
+			P: FnMut(usize, &bool) -> bool,
+		{
+			#[inline]
+			pub(super) fn new(slice: $item, pred: P) -> Self {
+				Self {
+					slice,
+					pred,
+					done: false,
+				}
+			}
+		}
+
+		impl<O, T, P> Debug for $iter <'_, O, T, P>
+		where
+			O: BitOrder,
+			T: BitStore,
+			P: FnMut(usize, &bool) -> bool,
+		{
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				fmt.debug_struct(stringify!($iter))
+					.field("slice", &self.slice)
+					.field("done", &self.done)
+					.finish()
+			}
+		}
+
+		impl<'a, O, T, P> Iterator for $iter <'a, O, T, P>
+		where
+			O: 'a + BitOrder,
+			T: 'a + BitStore,
+			P: FnMut(usize, &bool) -> bool,
+		{
+			type Item = $item;
+
+			#[inline]
+			$next
+
+			#[inline]
+			fn size_hint(&self) -> (usize, Option<usize>) {
+				if self.done {
+					(0, Some(0))
+				}
+				else {
+					(1, Some(self.slice.len() + 1))
+				}
+			}
+		}
+
+		impl<'a, O, T, P> DoubleEndedIterator for $iter <'a, O, T, P>
+		where
+			O: 'a + BitOrder,
+			T: 'a + BitStore,
+			P: FnMut(usize, &bool) -> bool,
+		{
+			#[inline]
+			$next_back
+		}
+
+		impl<'a, O, T, P> core::iter::FusedIterator for $iter <'a, O, T, P>
+		where
+			O: 'a + BitOrder,
+			T: 'a + BitStore,
+			P: FnMut(usize, &bool) -> bool,
+		{
+		}
+
+		impl<'a, O, T, P> SplitIter for $iter <'a, O, T, P>
+		where
+			O: 'a + BitOrder,
+			T: 'a + BitStore,
+			P: FnMut(usize, &bool) -> bool,
+		{
+			#[inline]
+			fn finish(&mut self) -> Option<Self::Item> {
+				if self.done {
+					None
+				}
+				else {
+					self.done = true;
+					Some(mem::take(&mut self.slice))
+				}
+			}
+		}
+	};
+}
+
+/** An iterator over subslices separated by bits that match a predicate
+function.
+
+This struct is created by the [`split`] method on [bit slices].
+
+# Original
+
+[`slice::Split`](https://doc.rust-lang.org/core/slice/struct.Split.html)
+
+# API Differences
+
+In order to allow more than one bit of information for the split decision, the
+predicate receives the index of each bit, as well as its value.
+
+[bit slices]: struct.BitSlice.html
+[`split`]: struct.BitSlice.html#method.split
+**/
+#[derive(Clone)]
+pub struct Split<'a, O, T, P>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	P: FnMut(usize, &bool) -> bool,
+{
+	/// The `BitSlice` being split.
+	slice: &'a BitSlice<O, T>,
+	/// The function used to test whether a split should occur.
+	pred: P,
+	/// Whether the split is finished.
+	done: bool,
+}
+
+split!(Split => &'a BitSlice<O, T> {
+	fn next(&mut self) -> Option<Self::Item> {
+		if self.done {
+			return None;
+		}
+		match self.slice
+			.iter()
+			.enumerate()
+			.position(|(idx, bit)| (self.pred)(idx, bit))
+		{
+			None => self.finish(),
+			Some(idx) => unsafe {
+				let out = self.slice.get_unchecked(.. idx);
+				self.slice = self.slice.get_unchecked(idx + 1 ..);
+				Some(out)
+			},
+		}
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		if self.done {
+			return None;
+		}
+		match self.slice
+			.iter()
+			.enumerate()
+			.rposition(|(idx, bit)| (self.pred)(idx, bit))
+		{
+			None => self.finish(),
+			Some(idx) => unsafe {
+				let out = self.slice.get_unchecked(idx + 1 ..);
+				self.slice = self.slice.get_unchecked(.. idx);
+				Some(out)
+			},
+		}
+	}
+});
+
+/** An iterator over the mutable subslices of the slice which are separated by
+bits that match `pred`.
+
+This struct is created by the [`split_mut`] method on [bit slices].
+
+# Original
+
+[`slice::SplitMut`](https://doc.rust-lang.org/core/slice/struct.SplitMut.html)
+
+# API Differences
+
+In order to allow more than one bit of information for the split decision, the
+predicate receives the index of each bit, as well as its value.
+
+[bit slices]: struct.BitSlice.html
+[`split_mut`]: struct.BitSlice.html#method.split_mut
+**/
+pub struct SplitMut<'a, O, T, P>
+where
+	O: BitOrder,
+	T: BitStore,
+	P: FnMut(usize, &bool) -> bool,
+{
+	slice: &'a mut BitSlice<O, T::Alias>,
+	pred: P,
+	done: bool,
+}
+
+split!(SplitMut => &'a mut BitSlice<O, T::Alias> {
+	fn next(&mut self) -> Option<Self::Item> {
+		if self.done {
+			return None;
+		}
+		let idx_opt = {
+			let pred = &mut self.pred;
+			self.slice
+				.iter()
+				.enumerate()
+				.position(|(idx, bit)| (pred)(idx, bit))
+		};
+		match idx_opt
+		{
+			None => self.finish(),
+			Some(idx) => unsafe {
+				let slice = mem::take(&mut self.slice);
+				let (out, rest) = slice.split_at_unchecked_mut_noalias(idx);
+				self.slice = rest.get_unchecked_mut(1 ..);
+				Some(out)
+			},
+		}
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		if self.done {
+			return None;
+		}
+		let idx_opt = {
+			let pred = &mut self.pred;
+			self.slice
+				.iter()
+				.enumerate()
+				.rposition(|(idx, bit)| (pred)(idx, bit))
+		};
+		match idx_opt
+		{
+			None => self.finish(),
+			Some(idx) => unsafe {
+				let slice = mem::take(&mut self.slice);
+				let (rest, out) = slice.split_at_unchecked_mut_noalias(idx);
+				self.slice = rest;
+				Some(out.get_unchecked_mut(1 ..))
+			},
+		}
+	}
+});
+
+/** An iterator over subslices separated by bits that match a predicate
+function, starting from the end of the slice.
+
+This struct is created by the [`rsplit`] method on [bit slices].
+
+# Original
+
+[`slice::RSplit`](https://doc.rust-lang.org/core/slice/struct.RSplit.html)
+
+# API Differences
+
+In order to allow more than one bit of information for the split decision, the
+predicate receives the index of each bit, as well as its value.
+
+[bit slices]: struct.BitSlice.html
+[`rsplit`]: struct.BitSlice.html#method.rsplit
+**/
+#[derive(Clone)]
+pub struct RSplit<'a, O, T, P>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	P: FnMut(usize, &bool) -> bool,
+{
+	/// The `BitSlice` being split.
+	slice: &'a BitSlice<O, T>,
+	/// The function used to test whether a split should occur.
+	pred: P,
+	/// Whether the split is finished.
+	done: bool,
+}
+
+split!(RSplit => &'a BitSlice<O, T> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let mut split = Split::<'a, O, T, &mut P> {
+			slice: mem::take(&mut self.slice),
+			pred: &mut self.pred,
+			done: self.done,
+		};
+		let out = split.next_back();
+		self.slice = mem::take(&mut split.slice);
+		self.done = split.done;
+		out
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		let mut split = Split::<'a, O, T, &mut P> {
+			slice: mem::take(&mut self.slice),
+			pred: &mut self.pred,
+			done: self.done,
+		};
+		let out = split.next();
+		self.slice = mem::take(&mut split.slice);
+		self.done = split.done;
+		out
+	}
+});
+
+/** An iterator over subslices separated by bits that match a predicate
+function, starting from the end of the slice.
+
+This struct is created by the [`rsplit_mut`] method on [bit slices].
+
+# Original
+
+[`slice::RSplit`](https://doc.rust-lang.org/core/slice/struct.RSplit.html)
+
+# API Differences
+
+In order to allow more than one bit of information for the split decision, the
+predicate receives the index of each bit, as well as its value.
+
+[bit slices]: struct.BitSlice.html
+[`rsplit_mut`]: struct.BitSlice.html#method.rsplit_mut
+**/
+pub struct RSplitMut<'a, O, T, P>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	P: FnMut(usize, &bool) -> bool,
+{
+	slice: &'a mut BitSlice<O, T::Alias>,
+	pred: P,
+	done: bool,
+}
+
+split!(RSplitMut => &'a mut BitSlice<O, T::Alias> {
+	fn next(&mut self) -> Option<Self::Item> {
+		let mut split = SplitMut::<'a, O, T, &mut P> {
+			slice: mem::take(&mut self.slice),
+			pred: &mut self.pred,
+			done: self.done,
+		};
+		let out = split.next_back();
+		self.slice = mem::take(&mut split.slice);
+		self.done = split.done;
+		out
+	}
+
+	fn next_back(&mut self) -> Option<Self::Item> {
+		let mut split = SplitMut::<'a, O, T, &mut P> {
+			slice: mem::take(&mut self.slice),
+			pred: &mut self.pred,
+			done: self.done,
+		};
+		let out = split.next();
+		self.slice = mem::take(&mut split.slice);
+		self.done = split.done;
+		out
+	}
+});
+
+/// An internal abstraction over the splitting iterators, so that `splitn`,
+/// `splitn_mut`, etc, can be implemented once.
+#[doc(hidden)]
+trait SplitIter: DoubleEndedIterator {
+	/// Marks the underlying iterator as complete, extracting the remaining
+	/// portion of the slice.
+	fn finish(&mut self) -> Option<Self::Item>;
+}
+
+/** An iterator over subslices separated by bits that match a predicate
+function, limited to a given number of splits.
+
+This struct is created by the [`splitn`] method on [bit slices].
+
+# Original
+
+[`slice::SplitN`](https://doc.rust-lang.org/core/slice/struct.SplitN.html)
+
+# API Differences
+
+In order to allow more than one bit of information for the split decision, the
+predicate receives the index of each bit, as well as its value.
+
+[bit slices]: struct.BitSlice.html
+[`splitn`]: struct.BitSlice.html#method.splitn
+**/
+pub struct SplitN<'a, O, T, P>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	P: FnMut(usize, &bool) -> bool,
+{
+	/// The `BitSlice` being split.
+	inner: Split<'a, O, T, P>,
+	/// The number of splits remaining.
+	count: usize,
+}
+
+/** An iterator over subslices separated by bits that match a predicate
+function, limited to a given number of splits.
+
+This struct is created by the [`splitn_mut`] method on [bit slices].
+
+# Original
+
+[`slice::SplitNMut`](https://doc.rust-lang.org/core/slice/struct.SplitNMut.html)
+
+# API Differences
+
+In order to allow more than one bit of information for the split decision, the
+predicate receives the index of each bit, as well as its value.
+
+[bit slices]: struct.BitSlice.html
+[`splitn_mut`]: struct.BitSlice.html#method.splitn_mut
+**/
+pub struct SplitNMut<'a, O, T, P>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	P: FnMut(usize, &bool) -> bool,
+{
+	/// The `BitSlice` being split.
+	inner: SplitMut<'a, O, T, P>,
+	/// The number of splits remaining.
+	count: usize,
+}
+
+/** An iterator over subslices separated by bits that match a predicate
+function, limited to a given number of splits, starting from the end of the
+slice.
+
+This struct is created by the [`rsplitn`] method on [bit slices].
+
+# Original
+
+[`slice::RSplitN`](https://doc.rust-lang.org/core/slice/struct.RSplitN.html)
+
+# API Differences
+
+In order to allow more than one bit of information for the split decision, the
+predicate receives the index of each bit, as well as its value.
+
+[bit slices]: struct.BitSlice.html
+[`rsplitn`]: struct.BitSlice.html#method.rsplitn
+**/
+pub struct RSplitN<'a, O, T, P>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	P: FnMut(usize, &bool) -> bool,
+{
+	/// The `BitSlice` being split.
+	inner: RSplit<'a, O, T, P>,
+	/// The number of splits remaining.
+	count: usize,
+}
+
+/** An iterator over subslices separated by bits that match a predicate
+function, limited to a given number of splits, starting from the end of the
+slice.
+
+This struct is created by the [`rsplitn_mut`] method on [bit slices].
+
+# Original
+
+[`slice::RSplitNMut`](https://doc.rust-lang.org/core/slice/struct.RSplitNMut.html)
+
+# API Differences
+
+In order to allow more than one bit of information for the split decision, the
+predicate receives the index of each bit, as well as its value.
+
+[bit slices]: struct.BitSlice.html
+[`rsplitn_mut`]: struct.BitSlice.html#method.rsplitn_mut
+**/
+pub struct RSplitNMut<'a, O, T, P>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	P: FnMut(usize, &bool) -> bool,
+{
+	/// The `BitSlice` being split.
+	inner: RSplitMut<'a, O, T, P>,
+	/// The number of splits remaining.
+	count: usize,
+}
+
+macro_rules! split_n {
+	($outer:ident => $inner:ident => $item:ty $( where $alias:ident )?) => {
+		impl<'a, O, T, P> $outer<'a, O, T, P>
+		where
+			O: BitOrder,
+			T: 'a + BitStore,
+			P: FnMut(usize, &bool) -> bool,
+		{
+			pub(super) fn new(
+				slice: $item,
+				pred: P,
+				count: usize,
+			) -> Self
+			{Self{
+				inner: <$inner<'a, O, T, P>>::new(slice, pred),
+				count,
+			}}
+		}
+
+		impl<O, T, P> Debug for $outer<'_, O, T, P>
+		where
+			O: BitOrder,
+			T: BitStore,
+			P: FnMut(usize, &bool) -> bool
+		{
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				fmt.debug_struct(stringify!($outer))
+					.field("slice", &self.inner.slice)
+					.field("count", &self.count)
+					.finish()
+			}
+		}
+
+		impl<'a, O, T, P> Iterator for $outer<'a, O, T, P>
+		where
+			O: 'a + BitOrder,
+			T: 'a + BitStore,
+			P: FnMut(usize, &bool) -> bool,
+			$( T::$alias: radium::Radium<<<T as BitStore>::Alias as BitStore>::Mem>, )?
+		{
+			type Item = <$inner <'a, O, T, P> as Iterator>::Item;
+
+			#[inline]
+			fn next(&mut self) -> Option<Self::Item> {
+				match self.count {
+					0 => None,
+					1 => {
+						self.count -= 1;
+						self.inner.finish()
+					},
+					_ => {
+						self.count -= 1;
+						self.inner.next()
+					},
+				}
+			}
+
+			#[inline]
+			fn size_hint(&self) -> (usize, Option<usize>) {
+				let (low, hi) = self.inner.size_hint();
+				(low, hi.map(|h| cmp::min(self.count, h)))
+			}
+		}
+
+		impl<O, T, P> core::iter::FusedIterator for $outer<'_, O, T, P>
+		where
+			O: BitOrder,
+			T: BitStore,
+			P: FnMut(usize, &bool) -> bool,
+			$( T::$alias: radium::Radium<<<T as BitStore>::Alias as BitStore>::Mem>, )?
+		{
+		}
+	};
+}
+
+split_n!(SplitN => Split => &'a BitSlice<O, T>);
+split_n!(SplitNMut => SplitMut => &'a mut BitSlice<O, T::Alias> );
+split_n!(RSplitN => RSplit => &'a BitSlice<O, T>);
+split_n!(RSplitNMut => RSplitMut => &'a mut BitSlice<O, T::Alias> );
+
+#[cfg(test)]
+mod tests {
+	use crate::prelude::*;
+
+	#[test]
+	fn iter() {
+		let data = 0b0110_1001u8;
+		let bits = data.view_bits::<Msb0>();
+		let mut iter = bits.iter();
+
+		assert_eq!(iter.as_bitslice(), bits);
+		assert_eq!(iter.next(), Some(&false));
+		assert_eq!(iter.as_bitslice(), &bits[1 ..]);
+		assert_eq!(iter.next(), Some(&true));
+
+		assert_eq!(iter.as_bitslice(), &bits[2 ..]);
+		assert_eq!(iter.next_back(), Some(&true));
+		assert_eq!(iter.as_bitslice(), &bits[2 .. 7]);
+		assert_eq!(iter.next_back(), Some(&false));
+
+		assert_eq!(iter.as_bitslice(), &bits[2 .. 6]);
+		assert_eq!(iter.next(), Some(&true));
+		assert_eq!(iter.as_bitslice(), &bits[3 .. 6]);
+		assert_eq!(iter.next(), Some(&false));
+
+		assert_eq!(iter.as_bitslice(), &bits[4 .. 6]);
+		assert_eq!(iter.next_back(), Some(&false));
+		assert_eq!(iter.as_bitslice(), &bits[4 .. 5]);
+
+		assert_eq!(iter.next_back(), Some(&true));
+		assert!(iter.as_bitslice().is_empty());
+		assert!(iter.next().is_none());
+		assert!(iter.next_back().is_none());
+	}
+
+	#[test]
+	fn iter_mut() {
+		let mut data = 0b0110_1001u8;
+		let bits = data.view_bits_mut::<Msb0>();
+		let mut iter = bits.iter_mut();
+
+		*iter.next().unwrap() = true;
+		*iter.nth_back(1).unwrap() = true;
+		*iter.nth(2).unwrap() = true;
+		*iter.next_back().unwrap() = true;
+
+		assert_eq!(iter.into_bitslice().bitptr(), bits[4 .. 5].bitptr());
+	}
+
+	#[test]
+	fn windows() {
+		let data = 0u8;
+		let bits = data.view_bits::<LocalBits>();
+
+		let mut windows = bits.windows(5);
+		assert_eq!(windows.next().unwrap().bitptr(), bits[.. 5].bitptr());
+		assert_eq!(windows.next_back().unwrap().bitptr(), bits[3 ..].bitptr());
+
+		let mut windows = bits.windows(3);
+		assert_eq!(windows.nth(2).unwrap().bitptr(), bits[2 .. 5].bitptr());
+		assert_eq!(windows.nth_back(2).unwrap().bitptr(), bits[3 .. 6].bitptr());
+		assert!(windows.next().is_none());
+		assert!(windows.next_back().is_none());
+		assert!(windows.nth(1).is_none());
+		assert!(windows.nth_back(1).is_none());
+	}
+
+	#[test]
+	fn chunks() {
+		let data = 0u16;
+		let bits = data.view_bits::<LocalBits>();
+
+		let mut chunks = bits.chunks(5);
+		assert_eq!(chunks.next().unwrap().bitptr(), bits[.. 5].bitptr());
+		assert_eq!(chunks.next_back().unwrap().bitptr(), bits[15 ..].bitptr());
+
+		let mut chunks = bits.chunks(3);
+		assert_eq!(chunks.nth(2).unwrap().bitptr(), bits[6 .. 9].bitptr());
+		assert_eq!(chunks.nth_back(2).unwrap().bitptr(), bits[9 .. 12].bitptr());
+	}
+
+	#[test]
+	fn chunks_mut() {
+		let mut data = 0u16;
+		let bits = data.view_bits_mut::<LocalBits>();
+		let (one, two, three, four) = (
+			bits[.. 5].bitptr(),
+			bits[15 ..].bitptr(),
+			bits[6 .. 9].bitptr(),
+			bits[9 .. 12].bitptr(),
+		);
+
+		let mut chunks = bits.chunks_mut(5);
+		assert_eq!(chunks.next().unwrap().bitptr(), one);
+		assert_eq!(chunks.next_back().unwrap().bitptr(), two);
+
+		let mut chunks = bits.chunks_mut(3);
+		assert_eq!(chunks.nth(2).unwrap().bitptr(), three);
+		assert_eq!(chunks.nth_back(2).unwrap().bitptr(), four);
+	}
+
+	#[test]
+	fn chunks_exact() {
+		let data = 0u32;
+		let bits = data.view_bits::<LocalBits>();
+
+		let mut chunks = bits.chunks_exact(5);
+		assert_eq!(chunks.remainder().bitptr(), bits[30 ..].bitptr());
+		assert_eq!(chunks.next().unwrap().bitptr(), bits[.. 5].bitptr());
+		assert_eq!(
+			chunks.next_back().unwrap().bitptr(),
+			bits[25 .. 30].bitptr(),
+		);
+		assert_eq!(chunks.nth(1).unwrap().bitptr(), bits[10 .. 15].bitptr());
+		assert_eq!(
+			chunks.nth_back(1).unwrap().bitptr(),
+			bits[15 .. 20].bitptr(),
+		);
+
+		assert!(chunks.next().is_none());
+		assert!(chunks.next_back().is_none());
+		assert!(chunks.nth(1).is_none());
+		assert!(chunks.nth_back(1).is_none());
+	}
+
+	#[test]
+	fn chunks_exact_mut() {
+		let mut data = 0u32;
+		let bits = data.view_bits_mut::<LocalBits>();
+
+		let (one, two, three, four, rest) = (
+			bits[.. 5].bitptr(),
+			bits[10 .. 15].bitptr(),
+			bits[15 .. 20].bitptr(),
+			bits[25 .. 30].bitptr(),
+			bits[30 ..].bitptr(),
+		);
+
+		let mut chunks = bits.chunks_exact_mut(5);
+		assert_eq!(chunks.next().unwrap().bitptr(), one);
+		assert_eq!(chunks.next_back().unwrap().bitptr(), four);
+		assert_eq!(chunks.nth(1).unwrap().bitptr(), two);
+		assert_eq!(chunks.nth_back(1).unwrap().bitptr(), three);
+
+		assert!(chunks.next().is_none());
+		assert!(chunks.next_back().is_none());
+		assert!(chunks.nth(1).is_none());
+		assert!(chunks.nth_back(1).is_none());
+
+		assert_eq!(chunks.into_remainder().bitptr(), rest);
+	}
+
+	#[test]
+	fn rchunks() {
+		let data = 0u16;
+		let bits = data.view_bits::<LocalBits>();
+
+		let mut rchunks = bits.rchunks(5);
+		assert_eq!(rchunks.next().unwrap().bitptr(), bits[11 ..].bitptr());
+		assert_eq!(rchunks.next_back().unwrap().bitptr(), bits[.. 1].bitptr());
+
+		let mut rchunks = bits.rchunks(3);
+		assert_eq!(rchunks.nth(2).unwrap().bitptr(), bits[7 .. 10].bitptr());
+		assert_eq!(rchunks.nth_back(2).unwrap().bitptr(), bits[4 .. 7].bitptr());
+	}
+
+	#[test]
+	fn rchunks_mut() {
+		let mut data = 0u16;
+		let bits = data.view_bits_mut::<LocalBits>();
+		let (one, two, three, four) = (
+			bits[11 ..].bitptr(),
+			bits[.. 1].bitptr(),
+			bits[7 .. 10].bitptr(),
+			bits[4 .. 7].bitptr(),
+		);
+
+		let mut rchunks = bits.rchunks_mut(5);
+		assert_eq!(rchunks.next().unwrap().bitptr(), one);
+		assert_eq!(rchunks.next_back().unwrap().bitptr(), two);
+
+		let mut rchunks = bits.rchunks_mut(3);
+		assert_eq!(rchunks.nth(2).unwrap().bitptr(), three);
+		assert_eq!(rchunks.nth_back(2).unwrap().bitptr(), four);
+	}
+
+	#[test]
+	fn rchunks_exact() {
+		let data = 0u32;
+		let bits = data.view_bits::<LocalBits>();
+
+		let mut rchunks = bits.rchunks_exact(5);
+		assert_eq!(rchunks.remainder().bitptr(), bits[.. 2].bitptr());
+		assert_eq!(rchunks.next().unwrap().bitptr(), bits[27 ..].bitptr());
+		assert_eq!(rchunks.next_back().unwrap().bitptr(), bits[2 .. 7].bitptr(),);
+		assert_eq!(rchunks.nth(1).unwrap().bitptr(), bits[17 .. 22].bitptr());
+		assert_eq!(
+			rchunks.nth_back(1).unwrap().bitptr(),
+			bits[12 .. 17].bitptr(),
+		);
+
+		assert!(rchunks.next().is_none());
+		assert!(rchunks.next_back().is_none());
+		assert!(rchunks.nth(1).is_none());
+		assert!(rchunks.nth_back(1).is_none());
+	}
+
+	#[test]
+	fn rchunks_exact_mut() {
+		let mut data = 0u32;
+		let bits = data.view_bits_mut::<LocalBits>();
+
+		let (rest, one, two, three, four) = (
+			bits[.. 2].bitptr(),
+			bits[2 .. 7].bitptr(),
+			bits[12 .. 17].bitptr(),
+			bits[17 .. 22].bitptr(),
+			bits[27 ..].bitptr(),
+		);
+
+		let mut rchunks = bits.rchunks_exact_mut(5);
+		assert_eq!(rchunks.next().unwrap().bitptr(), four);
+		assert_eq!(rchunks.next_back().unwrap().bitptr(), one);
+		assert_eq!(rchunks.nth(1).unwrap().bitptr(), three);
+		assert_eq!(rchunks.nth_back(1).unwrap().bitptr(), two);
+
+		assert!(rchunks.next().is_none());
+		assert!(rchunks.next_back().is_none());
+		assert!(rchunks.nth(1).is_none());
+		assert!(rchunks.nth_back(1).is_none());
+
+		assert_eq!(rchunks.into_remainder().bitptr(), rest);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/ops.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/ops.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/ops.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/ops.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,170 @@
+//! Operator trait implementations
+
+use crate::{
+	access::BitAccess,
+	devel as dvl,
+	domain::DomainMut,
+	order::BitOrder,
+	slice::{
+		BitSlice,
+		BitSliceIndex,
+	},
+	store::BitStore,
+};
+
+use core::ops::{
+	BitAndAssign,
+	BitOrAssign,
+	BitXorAssign,
+	Index,
+	IndexMut,
+	Not,
+	Range,
+	RangeFrom,
+	RangeFull,
+	RangeInclusive,
+	RangeTo,
+	RangeToInclusive,
+};
+
+use tap::pipe::Pipe;
+
+impl<O, T, Rhs> BitAndAssign<Rhs> for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	Rhs: IntoIterator<Item = bool>,
+{
+	fn bitand_assign(&mut self, rhs: Rhs) {
+		let mut iter = rhs.into_iter();
+		self.for_each(|_, bit| bit & iter.next().unwrap_or(false));
+	}
+}
+
+impl<O, T, Rhs> BitOrAssign<Rhs> for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	Rhs: IntoIterator<Item = bool>,
+{
+	fn bitor_assign(&mut self, rhs: Rhs) {
+		let mut iter = rhs.into_iter();
+		self.for_each(|_, bit| bit | iter.next().unwrap_or(false));
+	}
+}
+
+impl<O, T, Rhs> BitXorAssign<Rhs> for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	Rhs: IntoIterator<Item = bool>,
+{
+	fn bitxor_assign(&mut self, rhs: Rhs) {
+		let mut iter = rhs.into_iter();
+		self.for_each(|_, bit| bit ^ iter.next().unwrap_or(false));
+	}
+}
+
+impl<O, T> Index<usize> for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Output = bool;
+
+	/// Looks up a single bit by semantic index.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![Msb0, u8; 0, 0, 0, 0, 0, 0, 0, 0, 1, 0];
+	/// assert!(!bits[7]); // --------------------------^  |  |
+	/// assert!( bits[8]); // -----------------------------^  |
+	/// assert!(!bits[9]); // --------------------------------^
+	/// ```
+	///
+	/// If the index is greater than or equal to the length, indexing will
+	/// panic.
+	///
+	/// The below test will panic when accessing index 1, as only index 0 is
+	/// valid.
+	///
+	/// ```rust,should_panic
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0,  ];
+	/// bits[1]; // --------^
+	/// ```
+	fn index(&self, index: usize) -> &Self::Output {
+		index.index(self)
+	}
+}
+
+/// Generate `Index`/`Mut` implementations for subslicing.
+macro_rules! index {
+	($($t:ty),+ $(,)?) => { $(
+		impl<O, T> Index<$t> for BitSlice<O, T>
+		where
+			O: BitOrder,
+			T: BitStore,
+		{
+			type Output = Self;
+
+			fn index(&self, index: $t) -> &Self::Output {
+				index.index(self)
+			}
+		}
+
+		impl<O, T> IndexMut<$t> for BitSlice<O, T>
+		where
+			O: BitOrder,
+			T: BitStore,
+		{
+			fn index_mut(&mut self, index: $t) -> &mut Self::Output {
+				index.index_mut(self)
+			}
+		}
+	)+ };
+}
+
+//  Implement `Index`/`Mut` subslicing with all the ranges.
+index!(
+	Range<usize>,
+	RangeFrom<usize>,
+	RangeFull,
+	RangeInclusive<usize>,
+	RangeTo<usize>,
+	RangeToInclusive<usize>,
+);
+
+impl<'a, O, T> Not for &'a mut BitSlice<O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	type Output = Self;
+
+	fn not(self) -> Self::Output {
+		match self.domain_mut() {
+			DomainMut::Enclave { head, elem, tail } => elem
+				.pipe(dvl::accessor)
+				.invert_bits(dvl::alias_mask::<T>(O::mask(head, tail))),
+			DomainMut::Region { head, body, tail } => {
+				if let Some((head, elem)) = head {
+					elem.pipe(dvl::accessor)
+						.invert_bits(dvl::alias_mask::<T>(O::mask(head, None)));
+				}
+				for elem in body {
+					*elem = !*elem;
+				}
+				if let Some((elem, tail)) = tail {
+					elem.pipe(dvl::accessor)
+						.invert_bits(dvl::alias_mask::<T>(O::mask(None, tail)));
+				}
+			},
+		}
+		self
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/proxy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/proxy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/proxy.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/proxy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,234 @@
+/*! Proxy reference for `&mut bool`
+
+`BitSlice` regions can easily produce *read* references to `bool`s that they
+contain, by testing the bit and producing the appropriate `&'static bool`, but
+Rust’s rules forbid production of a *write* reference to a `bool` stored within
+a `BitSlice` region. This is because references `&mut T` must be dereferencable
+addresses of type `T`, and `&mut BitSlice` is a non-dereferencable encoded
+pointer.
+
+As Rust does not permit defining a method on `&mut _` references that can be
+used to store a value into the referenced location, this type must be used
+instead. Rust’s strict use of references, rather than arbitrary referential
+types, makes this the only major API incompatibility with the rest of the
+standard library.
+!*/
+
+use crate::{
+	access::BitAccess,
+	index::BitIdx,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+};
+
+use core::{
+	fmt::{
+		self,
+		Debug,
+		Formatter,
+	},
+	marker::PhantomData,
+	mem,
+	ops::{
+		Deref,
+		DerefMut,
+	},
+	ptr::NonNull,
+};
+
+use wyz::fmt::FmtForward;
+
+/** Proxy reference type, equivalent to `&mut bool`.
+
+This is a two-word structure capable of correctly referring to a single bit in
+a memory element. Because Rust does not permit reference-like objects in the
+same manner that C++ does – `&T` and `&mut T` values are required to be
+immediately-valid pointers, not objects – `bitvec` cannot manifest encoded
+`&mut Bit` values in the same way that it can manifest `&mut BitSlice`.
+
+Instead, this type implements `Deref` and `DerefMut` to an internal `bool` slot,
+and in `Drop` commits the value of that `bool` to the proxied bit in the source
+`BitSlice` from which the `BitMut` value was created. The combination of Rust’s
+own exclusion rules and the aliasing type system in this library ensure that a
+`BitMut` value has unique access to the bit it proxies, and the memory element
+it uses will not have destructive data races from other views.
+
+# Lifetimes
+
+- `'a`: The lifetime of the source `&'a mut BitSlice` that created the `BitMut`.
+
+# Type Parameters
+
+- `O`: The `BitOrder` type parameter from the source `&mut BitSlice`.
+- `T`: The `BitStore` type parameter from the source `&mut BitSlice`.
+
+# Examples
+
+```rust
+use bitvec::prelude::*;
+
+let bits = bits![mut 0; 2];
+
+let (left, right) = bits.split_at_mut(1);
+let mut first = left.get_mut(0).unwrap();
+let second = right.get_mut(0).unwrap();
+
+// Referential behavior
+*first = true;
+// Direct write
+second.set(true);
+
+drop(first); // it’s not a reference!
+assert_eq!(bits, bits![1; 2]);
+```
+**/
+pub struct BitMut<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// Accessing pointer to the containing element.
+	addr: NonNull<T::Access>,
+	/// Index of the proxied bit within the containing element.
+	head: BitIdx<T::Mem>,
+	/// A local cache for `Deref` usage.
+	data: bool,
+	/// This type is semantically equivalent to a mutable slice of length 1.
+	_ref: PhantomData<&'a mut BitSlice<O, T>>,
+}
+
+impl<O, T> BitMut<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Constructs a new proxy from provided element and bit addresses.
+	///
+	/// # Parameters
+	///
+	/// - `addr`: The address of a memory element, correctly typed for access.
+	/// - `head`: The index of a bit within `*addr`.
+	///
+	/// # Safety
+	///
+	/// The caller must produce `addr`’s value from a valid reference, and its
+	/// type from the correct access requirements at time of construction.
+	#[inline]
+	pub(crate) unsafe fn new_unchecked(
+		addr: *const T::Access,
+		head: BitIdx<T::Mem>,
+	) -> Self
+	{
+		Self {
+			_ref: PhantomData,
+			addr: NonNull::new_unchecked(addr as *mut T::Access),
+			head,
+			data: (&*(addr as *const T)).get_bit::<O>(head),
+		}
+	}
+
+	/// Writes a bit into the proxied location without an intermediate copy.
+	///
+	/// This function writes `value` directly into the proxied location, and
+	/// does not store `value` in the proxy’s internal cache. This should be
+	/// equivalent to the behavior seen when using ordinary `DerefMut` proxying,
+	/// but the latter depends on compiler optimization.
+	///
+	/// # Parameters
+	///
+	/// - `self`: This destroys the proxy, as it becomes invalid when writing
+	///   directly to the location without updating the cache.
+	/// - `value`: The new bit to write into the proxied slot.
+	#[inline]
+	pub fn set(mut self, value: bool) {
+		self.write(value);
+		mem::forget(self);
+	}
+
+	/// Commits a bit into memory.
+	///
+	/// This is the internal function used to drive `.set()` and `.drop()`.
+	#[inline]
+	fn write(&mut self, value: bool) {
+		unsafe { (&*self.addr.as_ptr()).write_bit::<O>(self.head, value) }
+	}
+}
+
+impl<O, T> Debug for BitMut<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		write!(fmt, "BitMut<{}>", core::any::type_name::<T::Mem>())?;
+		fmt.debug_struct("")
+			.field("addr", &self.addr.as_ptr().fmt_pointer())
+			.field("head", &self.head.fmt_binary())
+			.field("data", &self.data)
+			.finish()
+	}
+}
+
+impl<O, T> Deref for BitMut<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Target = bool;
+
+	#[inline]
+	fn deref(&self) -> &Self::Target {
+		&self.data
+	}
+}
+
+impl<O, T> DerefMut for BitMut<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.data
+	}
+}
+
+impl<O, T> Drop for BitMut<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn drop(&mut self) {
+		let value = self.data;
+		self.write(value);
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::prelude::*;
+
+	#[test]
+	fn proxy_ref() {
+		let mut data = 0u32;
+		let bits = BitSlice::<Lsb0, _>::from_element_mut(&mut data);
+		assert!(!bits[0]);
+
+		let mut proxy = bits.first_mut().unwrap();
+		*proxy = true;
+
+		//  We can inspect the cache, but `proxy` locks the entire `bits` for
+		//  the duration of its binding, so we cannot observe that the cache is
+		//  not written into the main buffer.
+		assert!(*proxy);
+		drop(proxy);
+
+		//  The proxy commits the cache on drop, releasing its lock on the main
+		//  buffer, permitting us to see that the writeback occurred.
+		assert!(bits[0]);
+		assert_eq!(data, 1);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,323 @@
+//! Unit tests for the `slice` module.
+
+#![cfg(test)]
+
+use crate::{
+	index::BitIdx,
+	pointer::BitPtr,
+	prelude::*,
+};
+
+#[test]
+fn construction() {
+	#[cfg(not(miri))]
+	use core::slice;
+
+	let data = 0u8;
+	let bits = data.view_bits::<LocalBits>();
+	assert_eq!(bits.len(), 8);
+
+	#[cfg(not(miri))]
+	assert!(
+		BitSlice::<LocalBits, u8>::from_slice(unsafe {
+			slice::from_raw_parts(
+				1usize as *const _,
+				BitSlice::<LocalBits, u8>::MAX_ELTS,
+			)
+		})
+		.is_none()
+	);
+
+	#[cfg(not(miri))]
+	assert!(
+		BitSlice::<LocalBits, u8>::from_slice_mut(unsafe {
+			slice::from_raw_parts_mut(
+				1usize as *mut _,
+				BitSlice::<LocalBits, u8>::MAX_ELTS,
+			)
+		})
+		.is_none()
+	);
+
+	assert_eq!(
+		unsafe { crate::slice::bits_from_raw_parts(&data, 0, 8) },
+		Some(bits)
+	);
+	assert!(
+		unsafe {
+			crate::slice::bits_from_raw_parts::<LocalBits, _>(&data, 0, !0)
+		}
+		.is_none()
+	);
+
+	let mut data = 0u8;
+	assert_eq!(
+		unsafe {
+			crate::slice::bits_from_raw_parts_mut(&mut data as *mut _, 0, 8)
+		},
+		Some(data.view_bits_mut::<LocalBits>())
+	);
+}
+
+#[test]
+fn get_set() {
+	let bits = bits![mut LocalBits, u8; 0; 8];
+
+	for n in 0 .. 8 {
+		assert!(!bits.get(n).unwrap());
+		bits.set(n, true);
+		assert!(bits.get(n).unwrap());
+	}
+
+	assert!(bits.get(9).is_none());
+	assert!(bits.get_mut(9).is_none());
+	assert!(bits.get(8 .. 10).is_none());
+	assert!(bits.get_mut(8 .. 10).is_none());
+
+	assert_eq!(bits.first(), Some(&true));
+	*bits.first_mut().unwrap() = false;
+	assert_eq!(bits.last(), Some(&true));
+	*bits.last_mut().unwrap() = false;
+
+	*crate::slice::BitSliceIndex::index_mut(1usize, bits) = false;
+	assert_eq!(bits, bits![0, 0, 1, 1, 1, 1, 1, 0]);
+	assert!(bits.get(100 ..).is_none());
+	assert!(bits.get(.. 100).is_none());
+
+	let (a, b) = (bits![mut Msb0, u8; 0, 1], bits![mut Lsb0, u16; 1, 0]);
+	assert_eq!(a, bits![0, 1]);
+	assert_eq!(b, bits![1, 0]);
+	a.swap_with_bitslice(b);
+	assert_eq!(a, bits![1, 0]);
+	assert_eq!(b, bits![0, 1]);
+}
+
+#[test]
+fn memcpy() {
+	let mut dst = bitarr![0; 500];
+	let src = bitarr![1; 500];
+
+	//  Equal heads will fall into the fast path.
+	dst[10 .. 20].copy_from_bitslice(&src[74 .. 84]);
+	dst[100 .. 500].copy_from_bitslice(&src[36 .. 436]);
+
+	//  Unequal heads will trip the slow path.
+	dst[.. 490].copy_from_bitslice(&src[10 .. 500]);
+}
+
+#[test]
+fn query() {
+	let data = [0x0Fu8, !0, 0xF0, 0, 0x0E];
+	let bits = data.view_bits::<Msb0>();
+
+	assert!(bits[36 .. 39].all());
+	assert!(bits[4 .. 20].all());
+	assert!(bits[.. 8].any());
+	assert!(bits[4 .. 20].any());
+	assert!(bits[32 ..].not_all());
+	assert!(bits[.. 4].not_any());
+	assert!(bits[.. 8].some());
+
+	assert_eq!(bits[1 .. 7].count_ones(), 3);
+	assert_eq!(bits[1 .. 7].count_zeros(), 3);
+	assert_eq!(bits[.. 24].count_ones(), 16);
+	assert_eq!(bits[16 ..].count_zeros(), 17);
+
+	assert!(!bits![0].contains(bits![0, 1]));
+	assert!(bits![0, 1, 0].contains(bits![1, 0]));
+	assert!(bits![0, 1, 0].starts_with(bits![0, 1]));
+	assert!(bits![0, 1, 0].ends_with(bits![1, 0]));
+}
+
+#[test]
+fn modify() {
+	let mut data = 0b0000_1111u8;
+
+	let bits = data.view_bits_mut::<LocalBits>();
+	bits.swap(3, 4);
+	assert_eq!(data, 0b0001_0111);
+
+	let bits = data.view_bits_mut::<Lsb0>();
+	bits[1 .. 7].reverse();
+	assert_eq!(data, 0b0110_1001);
+	data.view_bits_mut::<Msb0>()[1 .. 7].reverse();
+
+	let bits = data.view_bits_mut::<Msb0>();
+	bits.copy_within(2 .. 4, 0);
+	assert_eq!(data, 0b0101_0111);
+
+	let bits = data.view_bits_mut::<Msb0>();
+	bits.copy_within(5 .., 2);
+	assert_eq!(data, 0b0111_1111);
+}
+
+#[test]
+fn split() {
+	assert!(
+		BitSlice::<LocalBits, usize>::empty()
+			.split_first()
+			.is_none()
+	);
+	assert_eq!(
+		1u8.view_bits::<Lsb0>().split_first(),
+		Some((&true, bits![Lsb0, u8; 0; 7]))
+	);
+
+	assert!(
+		BitSlice::<LocalBits, usize>::empty_mut()
+			.split_first_mut()
+			.is_none()
+	);
+	let mut data = 0u8;
+	let (head, _) = data.view_bits_mut::<Lsb0>().split_first_mut().unwrap();
+	head.set(true);
+	assert_eq!(data, 1);
+
+	assert!(BitSlice::<LocalBits, usize>::empty().split_last().is_none());
+	assert_eq!(
+		1u8.view_bits::<Msb0>().split_last(),
+		Some((&true, bits![Msb0, u8; 0; 7]))
+	);
+
+	assert!(
+		BitSlice::<LocalBits, usize>::empty_mut()
+			.split_first_mut()
+			.is_none()
+	);
+	let mut data = 0u8;
+	let (head, _) = data.view_bits_mut::<Msb0>().split_last_mut().unwrap();
+	head.set(true);
+	assert_eq!(data, 1);
+
+	let mut data = 0b0000_1111u8;
+
+	let bits = data.view_bits::<Msb0>();
+	let (left, right) = bits.split_at(4);
+	assert!(left.not_any());
+	assert!(right.all());
+
+	let bits = data.view_bits_mut::<Msb0>();
+	let (left, right) = bits.split_at_mut(4);
+	left.set_all(true);
+	right.set_all(false);
+	assert_eq!(data, 0b1111_0000u8);
+
+	let data = 0u8;
+	let bits = data.view_bits::<Lsb0>();
+	let base = bits.as_slice().as_ptr();
+	let base_ptr = unsafe { BitPtr::new_unchecked(base, BitIdx::ZERO, 0) };
+	let next_ptr =
+		unsafe { BitPtr::new_unchecked(base.add(1), BitIdx::ZERO, 0) };
+	let (l, _) = bits.split_at(0);
+	let (_, r) = bits.split_at(8);
+	let (l_ptr, r_ptr) = (l.bitptr(), r.bitptr());
+	assert_eq!(l_ptr, base_ptr);
+	assert_eq!(r_ptr, next_ptr);
+}
+
+#[test]
+fn iterators() {
+	0b0100_1000u8
+		.view_bits::<Msb0>()
+		.split(|_, bit| *bit)
+		.zip([1usize, 2, 3].iter())
+		.for_each(|(bits, len)| assert_eq!(bits.len(), *len));
+
+	let mut data = 0b0100_1000u8;
+	data.view_bits_mut::<Msb0>()
+		.split_mut(|_, bit| *bit)
+		.zip([1usize, 2, 3].iter())
+		.for_each(|(bits, len)| {
+			assert_eq!(bits.len(), *len);
+			bits.set_all(true)
+		});
+	assert_eq!(data, !0);
+
+	0b0100_1000u8
+		.view_bits::<Msb0>()
+		.rsplit(|_, bit| *bit)
+		.zip([3usize, 2, 1].iter())
+		.for_each(|(bits, len)| assert_eq!(bits.len(), *len));
+
+	let mut data = 0b0100_1000u8;
+	data.view_bits_mut::<Msb0>()
+		.rsplit_mut(|_, bit| *bit)
+		.zip([3usize, 2, 1].iter())
+		.for_each(|(bits, len)| {
+			assert_eq!(bits.len(), *len);
+			bits.set_all(true)
+		});
+	assert_eq!(data, !0);
+
+	0b0100_1000u8
+		.view_bits::<Msb0>()
+		.splitn(2, |_, bit| *bit)
+		.zip([1usize, 6].iter())
+		.for_each(|(bits, len)| assert_eq!(bits.len(), *len));
+
+	let mut data = 0b0100_1000u8;
+	data.view_bits_mut::<Msb0>()
+		.splitn_mut(2, |_, bit| *bit)
+		.zip([1usize, 6].iter())
+		.for_each(|(bits, len)| {
+			assert_eq!(bits.len(), *len);
+			bits.set_all(true)
+		});
+	assert_eq!(data, !0);
+
+	0b0100_1000u8
+		.view_bits::<Msb0>()
+		.rsplitn(2, |_, bit| *bit)
+		.zip([3usize, 4].iter())
+		.for_each(|(bits, len)| assert_eq!(bits.len(), *len));
+
+	let mut data = 0b0100_1000u8;
+	data.view_bits_mut::<Msb0>()
+		.rsplitn_mut(2, |_, bit| *bit)
+		.zip([3usize, 4].iter())
+		.for_each(|(bits, len)| {
+			assert_eq!(bits.len(), *len);
+			bits.set_all(true)
+		});
+	assert_eq!(data, !0);
+}
+
+#[test]
+fn alignment() {
+	let mut data = [0u16; 5];
+	let addr = &data as *const [u16; 5] as *const u16 as usize;
+	let bits = data.view_bits_mut::<LocalBits>();
+
+	let (head, body, tail) = unsafe { bits[5 .. 75].align_to_mut::<u32>() };
+
+	//  `data` is aligned to the back half of a `u32`
+	if addr % 4 == 2 {
+		assert_eq!(head.len(), 11);
+		assert_eq!(body.len(), 59);
+		assert!(tail.is_empty());
+	}
+	//  `data` is aligned to the front half of a `u32`
+	else {
+		assert!(head.is_empty());
+		assert_eq!(body.len(), 64);
+		assert_eq!(tail.len(), 6);
+	}
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn repetition() {
+	let bits = bits![0, 0, 1, 1];
+	let bv = bits.repeat(2);
+	assert_eq!(bv, bits![0, 0, 1, 1, 0, 0, 1, 1]);
+}
+
+#[test]
+fn pointer_offset() {
+	let data = [0u16; 2];
+	let bits = data.view_bits::<Msb0>();
+
+	let a = &bits[10 .. 11];
+	let b = &bits[20 .. 21];
+	assert_eq!(a.offset_from(b), 10);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice/traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice/traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,780 @@
+//! Trait implementations for `BitSlice`
+
+use crate::{
+	domain::Domain,
+	index::BitRegister,
+	mem::BitMemory,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+	view::BitView,
+};
+
+use core::{
+	any,
+	cmp,
+	convert::TryFrom,
+	fmt::{
+		self,
+		Binary,
+		Debug,
+		Display,
+		Formatter,
+		LowerHex,
+		Octal,
+		Pointer,
+		UpperHex,
+	},
+	hash::{
+		Hash,
+		Hasher,
+	},
+	str,
+};
+
+use tap::pipe::Pipe;
+
+#[cfg(feature = "alloc")]
+use crate::vec::BitVec;
+
+#[cfg(feature = "alloc")]
+use alloc::borrow::ToOwned;
+
+impl<O, T> Eq for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+impl<O, T> Ord for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn cmp(&self, rhs: &Self) -> cmp::Ordering {
+		self.partial_cmp(rhs)
+			.expect("BitSlice has a total ordering")
+	}
+}
+
+/** Tests if two `BitSlice`s are semantically — not bitwise — equal.
+
+It is valid to compare slices of different ordering or memory types.
+
+The equality condition requires that they have the same length and that at each
+index, the two slices have the same bit value.
+**/
+impl<O1, O2, T1, T2> PartialEq<BitSlice<O2, T2>> for BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	fn eq(&self, rhs: &BitSlice<O2, T2>) -> bool {
+		self.len() == rhs.len()
+			&& self.iter().zip(rhs.iter()).all(|(l, r)| l == r)
+	}
+}
+
+//  ref-to-val equality
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<BitSlice<O2, T2>> for &BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, rhs: &BitSlice<O2, T2>) -> bool {
+		**self == rhs
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<BitSlice<O2, T2>> for &mut BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, rhs: &BitSlice<O2, T2>) -> bool {
+		**self == rhs
+	}
+}
+
+//  val-to-ref equality
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<&BitSlice<O2, T2>> for BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, rhs: &&BitSlice<O2, T2>) -> bool {
+		*self == **rhs
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<&mut BitSlice<O2, T2>> for BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, rhs: &&mut BitSlice<O2, T2>) -> bool {
+		*self == **rhs
+	}
+}
+
+/** Compares two `BitSlice`s by semantic — not bitwise — ordering.
+
+The comparison sorts by testing at each index if one slice has a high bit where
+the other has a low. At the first index where the slices differ, the slice with
+the high bit is greater. If the slices are equal until at least one terminates,
+then they are compared by length.
+**/
+impl<O1, O2, T1, T2> PartialOrd<BitSlice<O2, T2>> for BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	fn partial_cmp(&self, rhs: &BitSlice<O2, T2>) -> Option<cmp::Ordering> {
+		for (l, r) in self.iter().zip(rhs.iter()) {
+			match (l, r) {
+				(true, false) => return Some(cmp::Ordering::Greater),
+				(false, true) => return Some(cmp::Ordering::Less),
+				_ => continue,
+			}
+		}
+		self.len().partial_cmp(&rhs.len())
+	}
+}
+
+//  ref-to-val ordering
+
+impl<O1, O2, T1, T2> PartialOrd<BitSlice<O2, T2>> for &BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, rhs: &BitSlice<O2, T2>) -> Option<cmp::Ordering> {
+		(*self).partial_cmp(rhs)
+	}
+}
+
+impl<O1, O2, T1, T2> PartialOrd<BitSlice<O2, T2>> for &mut BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, rhs: &BitSlice<O2, T2>) -> Option<cmp::Ordering> {
+		(**self).partial_cmp(rhs)
+	}
+}
+
+//  val-to-ref ordering
+
+impl<O1, O2, T1, T2> PartialOrd<&BitSlice<O2, T2>> for BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, rhs: &&BitSlice<O2, T2>) -> Option<cmp::Ordering> {
+		(*self).partial_cmp(&**rhs)
+	}
+}
+
+impl<O1, O2, T1, T2> PartialOrd<&mut BitSlice<O2, T2>> for BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, rhs: &&mut BitSlice<O2, T2>) -> Option<cmp::Ordering> {
+		(*self).partial_cmp(&**rhs)
+	}
+}
+
+//  &mut-to-& ordering
+
+impl<O1, O2, T1, T2> PartialOrd<&mut BitSlice<O2, T2>> for &BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, rhs: &&mut BitSlice<O2, T2>) -> Option<cmp::Ordering> {
+		(**self).partial_cmp(&**rhs)
+	}
+}
+
+impl<O1, O2, T1, T2> PartialOrd<&BitSlice<O2, T2>> for &mut BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, rhs: &&BitSlice<O2, T2>) -> Option<cmp::Ordering> {
+		(**self).partial_cmp(&**rhs)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, T> TryFrom<&'a [T]> for &'a BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore + BitRegister,
+{
+	type Error = &'a [T];
+
+	#[inline]
+	fn try_from(slice: &'a [T]) -> Result<Self, Self::Error> {
+		BitSlice::from_slice(slice).ok_or(slice)
+	}
+}
+
+impl<O, T> Default for &BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn default() -> Self {
+		BitSlice::empty()
+	}
+}
+
+impl<O, T> Default for &mut BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn default() -> Self {
+		BitSlice::empty_mut()
+	}
+}
+
+impl<O, T> Debug for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		if fmt.alternate() {
+			Pointer::fmt(self, fmt)?;
+			fmt.write_str(" ")?;
+		}
+		Binary::fmt(self, fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Display for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Binary::fmt(self, fmt)
+	}
+}
+
+/** Renders a `BitSlice` handle as its pointer representation.
+
+This does not enable `{:p}` in a format string, as there is a blanket `Pointer`
+implementation for all references, and unsized types cannot format by
+themselves. It is only reachable by forwarding from another format marker, such
+as `Debug`.
+**/
+impl<O, T> Pointer for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		self.bitptr()
+			.render(fmt, "Slice", Some(any::type_name::<O>()), None)
+	}
+}
+
+/// Constructs numeric formatting implementations.
+macro_rules! fmt {
+	($trait:ident, $base:expr, $pfx:expr, $blksz:expr) => {
+		/// Render the contents of a `BitSlice` in a numeric format.
+		///
+		/// These implementations render the bits of memory contained in a
+		/// `BitSlice` as one of the three numeric bases that the Rust format
+		/// system supports:
+		///
+		/// - `Binary` renders each bit individually as `0` or `1`,
+		/// - `Octal` renders clusters of three bits as the numbers `0` through
+		///   `7`,
+		/// - and `UpperHex` and `LowerHex` render clusters of four bits as the
+		///   numbers `0` through `9` and `A` through `F`.
+		///
+		/// The formatters produce a “word� for each element `T` of memory. The
+		/// chunked formats (octal and hexadecimal) operate somewhat peculiarly:
+		/// they show the semantic value of the memory, as interpreted by the
+		/// ordering parameter’s implementation rather than the raw value of
+		/// memory you might observe with a debugger. In order to ease the
+		/// process of expanding numbers back into bits, each digit is grouped to
+		/// the right edge of the memory element. So, for example, the byte
+		/// `0xFF` would be rendered in as `0o377` rather than `0o773`.
+		///
+		/// Rendered words are chunked by memory elements, rather than by as
+		/// clean as possible a number of digits, in order to aid visualization
+		/// of the slice’s place in memory.
+		impl<O, T> $trait for BitSlice<O, T>
+		where
+			O: BitOrder,
+			T: BitStore,
+		{
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				/// Renders an accumulated text buffer as UTF-8.
+				struct Seq<'a>(&'a [u8]);
+				impl Debug for Seq<'_> {
+					fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+						fmt.write_str(unsafe {
+							str::from_utf8_unchecked(self.0)
+						})
+					}
+				}
+				//  If the alternate flag is set, include the radix prefix.
+				let start = if fmt.alternate() { 0 } else { 2 };
+				//  Create a list format accumulator.
+				let mut dbg = fmt.debug_list();
+				/* Create a static buffer of the maximum number of UTF-8 bytes
+				needed to render a `usize` in the selected radix. Rust does not
+				yet grant access to trait constants for use in constant
+				expressions within generics.
+				*/
+				const W: usize = <usize as BitMemory>::BITS as usize / $blksz;
+				let mut w: [u8; W + 2] = [b'0'; W + 2];
+				//  Write the prefix symbol into the buffer.
+				w[1] = $pfx;
+				//  This closure does the main work of rendering a bit slice as
+				//  text. It will be called on each memory element of the slice
+				//  undergoing formatting.
+				let mut writer = |bits: &BitSlice<O, T::Mem>| {
+					//  Set the end index of the format buffer.
+					let mut end = 2;
+					/* Taking `rchunks` clusters the bits to the right edge, so
+					that any remainder is in the left-most (first-rendered)
+					digit, in the same manner as how English clusters digits in
+					ordinary writing.
+
+					Since `rchunks` takes from the back, it must be reversed in
+					order to traverse from front to back. The enumeration
+					provides the offset from the buffer start for writing the
+					computed digit into the format buffer.
+					*/
+					for (index, chunk) in bits.rchunks($blksz).rev().enumerate()
+					{
+						//  Accumulate an Lsb0 representation of the slice
+						//  contents.
+						let mut val = 0u8;
+						for bit in chunk {
+							val <<= 1;
+							val |= *bit as u8;
+						}
+						//  Translate the accumulator into ASCII hexadecimal
+						//  glyphs, and write the glyph into the format buffer.
+						w[2 + index] = match val {
+							v @ 0 ..= 9 => b'0' + v,
+							v @ 10 ..= 16 => $base + (v - 10),
+							_ => unsafe { core::hint::unreachable_unchecked() },
+						};
+						end += 1;
+					}
+					//  View the format buffer as UTF-8 and write it into the
+					//  main formatter.
+					dbg.entry(&Seq(&w[start .. end]));
+				};
+				//  Break the source `BitSlice` into its element-wise components.
+				match self.domain() {
+					Domain::Enclave { head, elem, tail } => {
+						//  Load a copy of `*elem` into the stack,
+						let tmp = elem.load_value();
+						//  View it as a `BitSlice` over the whole element,
+						// narrow it to the live range, and render it.
+						let bits = tmp.view_bits::<O>();
+						unsafe {
+							bits.get_unchecked(
+								head.value() as usize .. tail.value() as usize,
+							)
+						}
+						.pipe(writer);
+					},
+					//  Same process as above, but with different truncations.
+					Domain::Region { head, body, tail } => {
+						if let Some((head, elem)) = head {
+							let tmp = elem.load_value();
+							let bits = tmp.view_bits::<O>();
+							unsafe {
+								bits.get_unchecked(head.value() as usize ..)
+							}
+							.pipe(&mut writer);
+						}
+						for elem in body.iter() {
+							elem.pipe(BitSlice::<O, T::Mem>::from_element)
+								.pipe(&mut writer);
+						}
+						if let Some((elem, tail)) = tail {
+							let tmp = elem.load_value();
+							let bits = tmp.view_bits::<O>();
+							unsafe {
+								bits.get_unchecked(.. tail.value() as usize)
+							}
+							.pipe(&mut writer);
+						}
+					},
+				}
+				dbg.finish()
+			}
+		}
+	};
+}
+
+fmt!(Binary, b'0', b'b', 1);
+fmt!(Octal, b'0', b'o', 3);
+fmt!(LowerHex, b'a', b'x', 4);
+fmt!(UpperHex, b'A', b'x', 4);
+
+/// Writes the contents of the `BitSlice`, in semantic bit order, into a hasher.
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Hash for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn hash<H>(&self, hasher: &mut H)
+	where H: Hasher {
+		for bit in self {
+			hasher.write_u8(*bit as u8);
+		}
+	}
+}
+
+unsafe impl<O, T> Send for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Threadsafe: Send,
+{
+}
+
+unsafe impl<O, T> Sync for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	T::Threadsafe: Sync,
+{
+}
+
+#[cfg(feature = "alloc")]
+impl<O, T> ToOwned for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Owned = BitVec<O, T>;
+
+	#[inline]
+	fn to_owned(&self) -> Self::Owned {
+		BitVec::from_bitslice(self)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::prelude::*;
+
+	#[test]
+	fn cmp() {
+		let data = 0x45u8;
+		let bits = data.view_bits::<Msb0>();
+		let a = &bits[.. 3]; // 010
+		let b = &bits[.. 4]; // 0100
+		let c = &bits[.. 5]; // 01000
+		let d = &bits[4 ..]; // 0101
+
+		assert!(a < b); // by length
+		assert!(b < c); // by length
+		assert!(c < d); // by different bit
+	}
+}
+
+#[cfg(all(test, feature = "alloc"))]
+mod format {
+	use crate::prelude::*;
+
+	//  The `format!` macro is not in the `alloc` prelude.
+	#[cfg(not(feature = "std"))]
+	use alloc::format;
+
+	#[test]
+	fn binary() {
+		let data = [0u8, 0x0F, !0];
+		let bits = data.view_bits::<Msb0>();
+
+		assert_eq!(format!("{:b}", &bits[.. 0]), "[]");
+		assert_eq!(format!("{:#b}", &bits[.. 0]), "[]");
+
+		assert_eq!(format!("{:b}", &bits[9 .. 15]), "[000111]");
+		assert_eq!(
+			format!("{:#b}", &bits[9 .. 15]),
+			"[
+    0b000111,
+]"
+		);
+
+		assert_eq!(format!("{:b}", &bits[4 .. 20]), "[0000, 00001111, 1111]");
+		assert_eq!(
+			format!("{:#b}", &bits[4 .. 20]),
+			"[
+    0b0000,
+    0b00001111,
+    0b1111,
+]"
+		);
+
+		assert_eq!(format!("{:b}", &bits[4 ..]), "[0000, 00001111, 11111111]");
+		assert_eq!(
+			format!("{:#b}", &bits[4 ..]),
+			"[
+    0b0000,
+    0b00001111,
+    0b11111111,
+]"
+		);
+
+		assert_eq!(format!("{:b}", &bits[.. 20]), "[00000000, 00001111, 1111]");
+		assert_eq!(
+			format!("{:#b}", &bits[.. 20]),
+			"[
+    0b00000000,
+    0b00001111,
+    0b1111,
+]"
+		);
+
+		assert_eq!(format!("{:b}", bits), "[00000000, 00001111, 11111111]");
+		assert_eq!(
+			format!("{:#b}", bits),
+			"[
+    0b00000000,
+    0b00001111,
+    0b11111111,
+]"
+		);
+	}
+
+	#[test]
+	fn octal() {
+		let data = [0u8, 0x0F, !0];
+		let bits = data.view_bits::<Msb0>();
+
+		assert_eq!(format!("{:o}", &bits[.. 0]), "[]");
+		assert_eq!(format!("{:#o}", &bits[.. 0]), "[]");
+
+		assert_eq!(format!("{:o}", &bits[9 .. 15]), "[07]");
+		assert_eq!(
+			format!("{:#o}", &bits[9 .. 15]),
+			"[
+    0o07,
+]"
+		);
+
+		//  …0_000 00_001_111 1_111…
+		assert_eq!(format!("{:o}", &bits[4 .. 20]), "[00, 017, 17]");
+		assert_eq!(
+			format!("{:#o}", &bits[4 .. 20]),
+			"[
+    0o00,
+    0o017,
+    0o17,
+]"
+		);
+
+		assert_eq!(format!("{:o}", &bits[4 ..]), "[00, 017, 377]");
+		assert_eq!(
+			format!("{:#o}", &bits[4 ..]),
+			"[
+    0o00,
+    0o017,
+    0o377,
+]"
+		);
+
+		assert_eq!(format!("{:o}", &bits[.. 20]), "[000, 017, 17]");
+		assert_eq!(
+			format!("{:#o}", &bits[.. 20]),
+			"[
+    0o000,
+    0o017,
+    0o17,
+]"
+		);
+
+		assert_eq!(format!("{:o}", bits), "[000, 017, 377]");
+		assert_eq!(
+			format!("{:#o}", bits),
+			"[
+    0o000,
+    0o017,
+    0o377,
+]"
+		);
+	}
+
+	#[test]
+	fn hex_lower() {
+		let data = [0u8, 0x0F, !0];
+		let bits = data.view_bits::<Msb0>();
+
+		assert_eq!(format!("{:x}", &bits[.. 0]), "[]");
+		assert_eq!(format!("{:#x}", &bits[.. 0]), "[]");
+
+		//  …00_0111 …
+		assert_eq!(format!("{:x}", &bits[9 .. 15]), "[07]");
+		assert_eq!(
+			format!("{:#x}", &bits[9 .. 15]),
+			"[
+    0x07,
+]"
+		);
+
+		//  …0000 00001111 1111…
+		assert_eq!(format!("{:x}", &bits[4 .. 20]), "[0, 0f, f]");
+		assert_eq!(
+			format!("{:#x}", &bits[4 .. 20]),
+			"[
+    0x0,
+    0x0f,
+    0xf,
+]"
+		);
+
+		assert_eq!(format!("{:x}", &bits[4 ..]), "[0, 0f, ff]");
+		assert_eq!(
+			format!("{:#x}", &bits[4 ..]),
+			"[
+    0x0,
+    0x0f,
+    0xff,
+]"
+		);
+
+		assert_eq!(format!("{:x}", &bits[.. 20]), "[00, 0f, f]");
+		assert_eq!(
+			format!("{:#x}", &bits[.. 20]),
+			"[
+    0x00,
+    0x0f,
+    0xf,
+]"
+		);
+
+		assert_eq!(format!("{:x}", bits), "[00, 0f, ff]");
+		assert_eq!(
+			format!("{:#x}", bits),
+			"[
+    0x00,
+    0x0f,
+    0xff,
+]"
+		);
+	}
+
+	#[test]
+	fn hex_upper() {
+		let data = [0u8, 0x0F, !0];
+		let bits = data.view_bits::<Msb0>();
+
+		assert_eq!(format!("{:X}", &bits[.. 0]), "[]");
+		assert_eq!(format!("{:#X}", &bits[.. 0]), "[]");
+
+		assert_eq!(format!("{:X}", &bits[9 .. 15]), "[07]");
+		assert_eq!(
+			format!("{:#X}", &bits[9 .. 15]),
+			"[
+    0x07,
+]"
+		);
+
+		assert_eq!(format!("{:X}", &bits[4 .. 20]), "[0, 0F, F]");
+		assert_eq!(
+			format!("{:#X}", &bits[4 .. 20]),
+			"[
+    0x0,
+    0x0F,
+    0xF,
+]"
+		);
+
+		assert_eq!(format!("{:X}", &bits[4 ..]), "[0, 0F, FF]");
+		assert_eq!(
+			format!("{:#X}", &bits[4 ..]),
+			"[
+    0x0,
+    0x0F,
+    0xFF,
+]"
+		);
+
+		assert_eq!(format!("{:X}", &bits[.. 20]), "[00, 0F, F]");
+		assert_eq!(
+			format!("{:#X}", &bits[.. 20]),
+			"[
+    0x00,
+    0x0F,
+    0xF,
+]"
+		);
+
+		assert_eq!(format!("{:X}", bits), "[00, 0F, FF]");
+		assert_eq!(
+			format!("{:#X}", bits),
+			"[
+    0x00,
+    0x0F,
+    0xFF,
+]"
+		);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/slice.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/slice.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2137 @@
+/*! A dynamically-sized view into individual bits of a memory region.
+
+You can read the language’s [`slice` module documentation][std] here.
+
+This module defines the [`BitSlice`] region, and all of its associated support
+code.
+
+`BitSlice` is the primary working type of this crate. It is a wrapper type over
+`[T]` which enables you to view, manipulate, and take the address of individual
+bits in memory. It behaves in every possible respect exactly like an ordinary
+slice: it is dynamically-sized, and must be held by `&` or `&mut` reference,
+just like `[T]`, and implements every inherent method and trait that `[T]` does,
+to the absolute limits of what Rust permits.
+
+The key to `BitSlice`’s powerful capability is that references to it use a
+special encoding that store, in addition to the address of the base element and
+the bit length, the index of the starting bit in the base element. This custom
+reference encoding has some costs in what APIs are possible – for instance, Rust
+forbids it from supporting `&mut BitSlice[index] = bool` write indexing – but in
+exchange, enables it to be *far* more capable than any other bit-slice crate in
+existence.
+
+Because of the volume of code that must be written to match the `[T]` standard
+API, this module is organized very differently than the slice implementation in
+the `core` and `std` distribution libraries.
+
+- the root module `slice` contains new APIs that have no counterpart in `[T]`
+- `slice/api` contains reïmplementations of the `[T]` inherent methods
+- `slice/iter` implements all of the iteration capability
+- `slice/ops` implements the traits in `core::ops`
+- `slice/proxy` implements the proxy reference used in place of `&mut bool`
+- `slice/traits` implements all other traits not in `core::ops`
+- lastly, `slice/tests` contains all the unit tests.
+
+[`BitSlice`]: struct.BitSlice.html
+[std]: https://doc.rust-lang.org/std/slice
+!*/
+
+use crate::{
+	access::BitAccess,
+	devel as dvl,
+	domain::{
+		BitDomain,
+		BitDomainMut,
+		Domain,
+		DomainMut,
+	},
+	index::{
+		BitIdx,
+		BitMask,
+		BitRegister,
+	},
+	mem::BitMemory,
+	order::{
+		BitOrder,
+		Lsb0,
+	},
+	pointer::BitPtr,
+	store::BitStore,
+};
+
+use core::{
+	cmp,
+	marker::PhantomData,
+	ops::RangeBounds,
+	ptr,
+	slice,
+};
+
+use funty::IsInteger;
+
+use radium::Radium;
+
+use tap::pipe::Pipe;
+
+/** A slice of individual bits, anywhere in memory.
+
+This is the main working type of the crate. It is analagous to `[bool]`, and is
+written to be as close as possible to drop-in replacable for it. This type
+contains most of the *methods* used to operate on memory, but it will rarely be
+named directly in your code. You should generally prefer to use [`BitArray`] for
+fixed-size arrays or [`BitVec`] for dynamic vectors, and use `&BitSlice`
+references only where you would directly use `&[bool]` or `&[u8]` references
+before using this crate.
+
+As it is a slice wrapper, you are intended to work with this through references
+(`&BitSlice<O, T>` and `&mut BitSlice<O, T>`) or through the other data
+structures provided by `bitvec` that are implemented atop it. Once created,
+references to `BitSlice` are guaranteed to work just like references to `[bool]`
+to the fullest extent possible in the Rust language.
+
+Every bit-vector crate can give you an opaque type that hides shift/mask
+operations from you. `BitSlice` does far more than this: it offers you the full
+Rust guarantees about reference behavior, including lifetime tracking,
+mutability and aliasing awareness, and explicit memory control, *as well as* the
+full set of tools and APIs available to the standard `[bool]` slice type.
+`BitSlice` can arbitrarily split and subslice, just like `[bool]`. You can write
+a linear consuming function and keep the patterns already know.
+
+For example, to trim all the bits off either edge that match a condition, you
+could write
+
+```rust
+use bitvec::prelude::*;
+
+fn trim<O: BitOrder, T: BitStore>(
+  bits: &BitSlice<O, T>,
+  to_trim: bool,
+) -> &BitSlice<O, T> {
+  let stop = |b: &bool| *b != to_trim;
+  let front = bits.iter().position(stop).unwrap_or(0);
+  let back = bits.iter().rposition(stop).unwrap_or(0);
+  &bits[front ..= back]
+}
+# assert_eq!(trim(bits![0, 0, 1, 1, 0, 1, 0], false), bits![1, 1, 0, 1]);
+```
+
+to get behavior something like
+`trim(&BitSlice[0, 0, 1, 1, 0, 1, 0], false) == &BitSlice[1, 1, 0, 1]`.
+
+# Documentation
+
+All APIs that mirror something in the standard library will have an `Original`
+section linking to the corresponding item. All APIs that have a different
+signature or behavior than the original will have an `API Differences` section
+explaining what has changed, and how to adapt your existing code to the change.
+
+These sections look like this:
+
+# Original
+
+[`slice`](https://doc.rust-lang.org/std/primitive.slice.html)
+
+# API Differences
+
+The slice type `[bool]` has no type parameters. `BitSlice<O, T>` has two: one
+for the memory type used as backing storage, and one for the order of bits
+within that memory type.
+
+`&BitSlice<O, T>` is capable of producing `&bool` references to read bits out
+of its memory, but is not capable of producing `&mut bool` references to write
+bits *into* its memory. Any `[bool]` API that would produce a `&mut bool` will
+instead produce a [`BitMut<O, T>`] proxy reference.
+
+# Behavior
+
+`BitSlice` is a wrapper over `[T]`. It describes a region of memory, and must be
+handled indirectly. This is most commonly through the reference types
+`&BitSlice` and `&mut BitSlice`, which borrow memory owned by some other value
+in the program. These buffers can be directly owned by the sibling types
+`BitBox`, which behavios like `Box<[T]>`, and `BitVec`, which behaves like
+`Vec<T>`. It cannot be used as the type parameter to a standard-library-provided
+handle type.
+
+The `BitSlice` region provides access to each individual bit in the region, as
+if each bit had a memory address that you could use to dereference it. It packs
+each logical bit into exactly one bit of storage memory, just like
+[`std::bitset`] and [`std::vector<bool>`] in C++.
+
+# Type Parameters
+
+`BitSlice` has two type parameters which propagate through nearly every public
+API in the crate. These are very important to its operation, and your choice
+of type arguments informs nearly every part of this library’s behavior.
+
+## `T: BitStore`
+
+This is the simpler of the two parameters. It refers to the integer type used to
+hold bits. It must be one of the Rust unsigned integer fundamentals: `u8`,
+`u16`, `u32`, `usize`, and on 64-bit systems only, `u64`. In addition, it can
+also be the `Cell<N>` wrapper over any of those, or their equivalent types in
+`core::sync::atomic`. Unless you know you need to have `Cell` or atomic
+properties, though, you should use a plain integer.
+
+The default type argument is `usize`.
+
+The argument you choose is used as the basis of a `[T]` slice, over which the
+`BitSlice` view type is placed. `BitSlice<_, T>` is subject to all of the rules
+about alignment that `[T]` is. If you are working with in-memory representation
+formats, chances are that you already have a `T` type with which you’ve been
+working, and should use it here.
+
+If you are only using this crate to discard the seven wasted bits per `bool`
+of a collection of `bool`s, and are not too concerned about the in-memory
+representation, then you should use the default type argument of `usize`. This
+is because most processors work best when moving an entire `usize` between
+memory and the processor itself, and using a smaller type may cause it to slow
+down.
+
+## `O: BitOrder`
+
+This is the more complex parameter. It has a default argument which, like
+`usize`, is the good-enough choice when you do not explicitly need to control
+the representation of bits in memory.
+
+This parameter determines how to index the bits within a single memory element
+`T`. Computers all agree that in a slice of elements `T`, the element with the
+lower index has a lower memory address than the element with the higher index.
+But the individual bits within an element do not have addresses, and so there is
+no uniform standard of which bit is the zeroth, which is the first, which is the
+penultimate, and which is the last.
+
+To make matters even more confusing, there are two predominant ideas of
+in-element ordering that often *correlate* with the in-element *byte* ordering
+of integer types, but are in fact wholly unrelated! `bitvec` provides these two
+main orders as types for you, and if you need a different one, it also provides
+the tools you need to make your own.
+
+### Least Significant Bit Comes First
+
+This ordering, named the [`Lsb0`] type, indexes bits within an element by
+placing the `0` index at the least significant bit (numeric value `1`) and the
+final index at the most significant bit (numeric value `T::min_value()`, for
+signed integers on most machines).
+
+For example, this is the ordering used by the [TCP wire format], and by most C
+compilers to lay out bit-field struct members on little-endian **byte**-ordered
+machines.
+
+### Most Significant Bit Comes First
+
+This ordering, named the [`Msb0`] type, indexes bits within an element by
+placing the `0` index at the most significant bit (numeric value `T::min_value()`
+for most signed integers) and the final index at the least significant bit
+(numeric value `1`).
+
+This is the ordering used by most C compilers to lay out bit-field struct
+members on big-endian **byte**-ordered machines.
+
+### Default Ordering
+
+The default ordering is `Lsb0`, as it typically produces shorter object code
+than `Msb0` does. If you are implementing a collection, then `Lsb0` is likely
+the more performant ordering; if you are implementing a buffer protocol, then
+your choice of ordering is dictated by the protocol definition.
+
+# Safety
+
+`BitSlice` is designed to never introduce new memory unsafety that you did not
+provide yourself, either before or during the use of this crate. Bugs do, and
+have, occured, and you are encouraged to submit any discovered flaw as a defect
+report.
+
+The `&BitSlice` reference type uses a private encoding scheme to hold all the
+information needed in its stack value. This encoding is **not** part of the
+public API of the library, and is not binary-compatible with `&[T]`.
+Furthermore, in order to satisfy Rust’s requirements about alias conditions,
+`BitSlice` performs type transformations on the `T` parameter to ensure that it
+never creates the potential for undefined behavior.
+
+You must never attempt to type-cast a reference to `BitSlice` in any way. You
+must not use `mem::transmute` with `BitSlice` anywhere in its type arguments.
+You must not use `as`-casting to convert between `*BitSlice` and any other type.
+You must not attempt to modify the binary representation of a `&BitSlice`
+reference value. These actions will all lead to runtime memory unsafety, are
+(hopefully) likely to induce a program crash, and may possibly cause undefined
+behavior at compile-time.
+
+Everything in the `BitSlice` public API, even the `unsafe` parts, are guaranteed
+to have no more unsafety than their equivalent parts in the standard library.
+All `unsafe` APIs will have documentation explicitly detailing what the API
+requires you to uphold in order for it to function safely and correctly. All
+safe APIs will do so themselves.
+
+# Performance
+
+Like the standard library’s `[T]` slice, `BitSlice` is designed to be very easy
+to use safely, while supporting `unsafe` when necessary. Rust has a powerful
+optimizing engine, and `BitSlice` will frequently be compiled to have zero
+runtime cost. Where it is slower, it will not be significantly slower than a
+manual replacement.
+
+As the machine instructions operate on registers rather than bits, your choice
+of `T: BitOrder` type parameter can influence your slice’s performance. Using
+larger register types means that slices can gallop over completely-filled
+interior elements faster, while narrower register types permit more graceful
+handling of subslicing and aliased splits.
+
+# Construction
+
+`BitSlice` views of memory can be constructed over borrowed data in a number of
+ways. As this is a reference-only type, it can only ever be built by borrowing
+an existing memory buffer and taking temporary control of your program’s view of
+the region.
+
+## Macro Constructor
+
+`BitSlice` buffers can be constructed at compile-time through the [`bits!`]
+macro. This macro accepts a superset of the `vec!` arguments, and creates an
+appropriate buffer in your program’s static memory.
+
+```rust
+use bitvec::prelude::*;
+
+let static_borrow = bits![0, 1, 0, 0, 1, 0, 0, 1];
+let mutable_static: &mut BitSlice<_, _> = bits![mut 0; 8];
+
+assert_ne!(static_borrow, mutable_static);
+mutable_static.clone_from_bitslice(static_borrow);
+assert_eq!(static_borrow, mutable_static);
+```
+
+Note that, despite constructing a `static mut` binding, the `bits![mut …]` call
+is not `unsafe`, as the constructed symbol is hidden and only accessible by the
+sole `&mut` reference returned by the macro call.
+
+## Borrowing Constructors
+
+The functions [`from_element`], [`from_element_mut`], [`from_slice`], and
+[`from_slice_mut`] take references to existing memory, and construct `BitSlice`
+references over them. These are the most basic ways to borrow memory and view it
+as bits.
+
+```rust
+use bitvec::prelude::*;
+
+let data = [0u16; 3];
+let local_borrow = BitSlice::<Lsb0, _>::from_slice(&data);
+
+let mut data = [0u8; 5];
+let local_mut = BitSlice::<Lsb0, _>::from_slice_mut(&mut data);
+```
+
+## Trait Method Constructors
+
+The [`BitView`] trait implements `.view_bits::<O>()` and `.view_bits_mut::<O>()`
+methods on elements, arrays not larger than 32 elements, and slices. This trait,
+imported in the crate prelude, is *probably* the easiest way for you to borrow
+memory.
+
+```rust
+use bitvec::prelude::*;
+
+let data = [0u32; 5];
+let trait_view = data.view_bits::<Msb0>();
+
+let mut data = 0usize;
+let trait_mut = data.view_bits_mut::<Msb0>();
+```
+
+## Owned Bit Slices
+
+If you wish to take ownership of a memory region and enforce that it is always
+viewed as a `BitSlice` by default, you can use one of the [`BitArray`],
+[`BitBox`], or [`BitVec`] types, rather than pairing ordinary buffer types with
+the borrowing constructors.
+
+```rust
+use bitvec::prelude::*;
+
+let slice = bits![0; 27];
+let array = bitarr![LocalBits, u8; 0; 10];
+# #[cfg(feature = "alloc")] fn allocs() {
+let boxed = bitbox![0; 10];
+let vec = bitvec![0; 20];
+# } #[cfg(feature = "alloc")] allocs();
+
+// arrays always round up
+assert_eq!(array.as_bitslice(), slice[.. 16]);
+# #[cfg(feature = "alloc")] fn allocs2() {
+# let slice = bits![0; 27];
+# let boxed = bitbox![0; 10];
+# let vec = bitvec![0; 20];
+assert_eq!(boxed.as_bitslice(), slice[.. 10]);
+assert_eq!(vec.as_bitslice(), slice[.. 20]);
+# } #[cfg(feature = "alloc")] allocs2();
+```
+
+[TCP wire format]: https://en.wikipedia.org/wiki/Transmission_Control_Protocol#TCP_segment_structure
+[`BitArray`]: ../array/struct.BitArray.html
+[`BitBox`]: ../boxed/struct.BitBox.html
+[`BitMut<O, T>`]: struct.BitMut.html
+[`BitVec`]: ../vec/struct.BitVec.html
+[`BitView`]: ../view/trait.BitView.html
+[`Lsb0`]: ../order/struct.Lsb0.html
+[`Msb0`]: ../order/struct.Msb0.html
+[`bits!`]: ../macro.bits.html
+[`bitvec::prelude::LocalBits`]: ../order/type.LocalBits.html
+[`std::bitset`]: https://en.cppreference.com/w/cpp/utility/bitset
+[`std::vector<bool>`]: https://en.cppreference.com/w/cpp/container/vector_bool
+**/
+#[repr(transparent)]
+pub struct BitSlice<O = Lsb0, T = usize>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Mark the in-element ordering of bits
+	_ord: PhantomData<O>,
+	/// Mark the element type of memory
+	_typ: PhantomData<[T]>,
+	/// Indicate that this is a newtype wrapper over a wholly-untyped slice.
+	///
+	/// This is necessary in order for the Rust compiler to remove restrictions
+	/// on the possible values of references to this slice `&BitSlice` and
+	/// `&mut BitSlice`.
+	///
+	/// Rust has firm requirements that *any* reference that is directly usable
+	/// to dereference a real value must conform to its rules about address
+	/// liveness, type alignment, and for slices, trustworthy length. It is
+	/// undefined behavior for a slice reference *to a dereferencable type* to
+	/// violate any of these restrictions.
+	///
+	/// However, the value of a reference to a zero-sized type has *no* such
+	/// restrictions, because that reference can never perform direct memory
+	/// access. The compiler will accept any value in a slot typed as `&[()]`,
+	/// because the values in it will never be used for a load or store
+	/// instruction. If this were `[T]`, then Rust would make the pointer
+	/// encoding used to manage values of `&BitSlice` become undefined behavior.
+	///
+	/// See the `pointer` module for information on the encoding used.
+	_mem: [()],
+}
+
+/// Constructors are limited to integers only, and not their `Cell`s or atomics.
+impl<O, T> BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore + BitRegister,
+{
+	/// Constructs a shared `&BitSlice` reference over a shared element.
+	///
+	/// The [`BitView`] trait, implemented on all `T` elements, provides a
+	/// method [`.view_bits::<O>()`] which delegates to this function and may be
+	/// more convenient for you to write.
+	///
+	/// # Parameters
+	///
+	/// - `elem`: A shared reference to a memory element.
+	///
+	/// # Returns
+	///
+	/// A shared `&BitSlice` over the `elem` element.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let elem = 0u8;
+	/// let bits = BitSlice::<LocalBits, _>::from_element(&elem);
+	/// assert_eq!(bits.len(), 8);
+	/// ```
+	///
+	/// [`BitView`]: ../view/trait.BitView.html
+	/// [`.view_bits::<O>()`]: ../view/trait.BitView.html#method.view_bits
+	#[inline]
+	pub fn from_element(elem: &T) -> &Self {
+		unsafe {
+			BitPtr::new_unchecked(elem, BitIdx::ZERO, T::Mem::BITS as usize)
+		}
+		.to_bitslice_ref()
+	}
+
+	/// Constructs an exclusive `&mut BitSlice` reference over an element.
+	///
+	/// The [`BitView`] trait, implemented on all `T` elements, provides a
+	/// method [`.view_bits_mut::<O>()`] which delegates to this function and
+	/// may be more convenient for you to write.
+	///
+	/// # Parameters
+	///
+	/// - `elem`: An exclusive reference to a memory element.
+	///
+	/// # Returns
+	///
+	/// An exclusive `&mut BitSlice` over the `elem` element.
+	///
+	/// Note that the original `elem` reference will be inaccessible for the
+	/// duration of the returned slice handle’s lifetime.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut elem = 0u16;
+	/// let bits = BitSlice::<Msb0, _>::from_element_mut(&mut elem);
+	/// bits.set(15, true);
+	/// assert!(bits.get(15).unwrap());
+	/// assert_eq!(elem, 1);
+	/// ```
+	///
+	/// [`BitView`]: ../view/trait.BitView.html
+	/// [`.view_bits_mut::<O>()`]:
+	/// ../view/trait.BitView.html#method.view_bits_mut
+	#[inline]
+	pub fn from_element_mut(elem: &mut T) -> &mut Self {
+		unsafe {
+			BitPtr::new_unchecked(elem, BitIdx::ZERO, T::Mem::BITS as usize)
+		}
+		.to_bitslice_mut()
+	}
+
+	/// Constructs a shared `&BitSlice` reference over a shared element slice.
+	///
+	/// The [`BitView`] trait, implemented on all `[T]` slices, provides a
+	/// method [`.view_bits::<O>()`] that is equivalent to this function and may
+	/// be more convenient for you to write.
+	///
+	/// # Parameters
+	///
+	/// - `slice`: A shared reference over a sequence of memory elements.
+	///
+	/// # Returns
+	///
+	/// If `slice` does not have fewer than [`MAX_ELTS`] elements, this returns
+	/// `None`. Otherwise, it returns a shared `&BitSlice` over the `slice`
+	/// elements.
+	///
+	/// # Conditions
+	///
+	/// The produced `&BitSlice` handle always begins at the zeroth bit.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let slice = &[0u8, 1];
+	/// let bits = BitSlice::<Msb0, _>::from_slice(slice).unwrap();
+	/// assert!(bits[15]);
+	/// ```
+	///
+	/// An example showing this function failing would require a slice exceeding
+	/// `!0usize >> 3` bytes in size, which is infeasible to produce.
+	///
+	/// [`BitView`]: ../view/trait.BitView.html
+	/// [`MAX_ELTS`]: #associatedconstant.MAX_ELTS
+	/// [`.view_bits::<O>()`]: ../view/trait.BitView.html#method.view_bits
+	#[inline]
+	pub fn from_slice(slice: &[T]) -> Option<&Self> {
+		let elts = slice.len();
+		//  Starting at the zeroth bit makes this counter an exclusive cap, not
+		//  an inclusive cap.
+		if elts >= Self::MAX_ELTS {
+			return None;
+		}
+		Some(unsafe { Self::from_slice_unchecked(slice) })
+	}
+
+	/// Converts a slice reference into a `BitSlice` reference without checking
+	/// that its size can be safely used.
+	///
+	/// # Safety
+	///
+	/// If the `slice` length is too long, then it will be capped at
+	/// [`MAX_BITS`]. You are responsible for ensuring that the input slice is
+	/// not unduly truncated.
+	///
+	/// Prefer [`from_slice`].
+	///
+	/// [`MAX_BITS`]: #associatedconstant.MAX_BITS
+	/// [`from_slice`]: #method.from_slice
+	#[inline]
+	pub unsafe fn from_slice_unchecked(slice: &[T]) -> &Self {
+		//  This branch could be removed by lowering the element ceiling by one,
+		//  but `from_slice` should not be in any tight loops, so it’s fine.
+		let bits = cmp::min(slice.len() * T::Mem::BITS as usize, Self::MAX_BITS);
+		BitPtr::new_unchecked(slice.as_ptr(), BitIdx::ZERO, bits)
+			.to_bitslice_ref()
+	}
+
+	/// Constructs an exclusive `&mut BitSlice` reference over a slice.
+	///
+	/// The [`BitView`] trait, implemented on all `[T]` slices, provides a
+	/// method [`.view_bits_mut::<O>()`] that is equivalent to this function and
+	/// may be more convenient for you to write.
+	///
+	/// # Parameters
+	///
+	/// - `slice`: An exclusive reference over a sequence of memory elements.
+	///
+	/// # Returns
+	///
+	/// An exclusive `&mut BitSlice` over the `slice` elements.
+	///
+	/// Note that the original `slice` reference will be inaccessible for the
+	/// duration of the returned slice handle’s lifetime.
+	///
+	/// # Panics
+	///
+	/// This panics if `slice` does not have fewer than [`MAX_ELTS`] elements.
+	///
+	/// [`MAX_ELTS`]: #associatedconstant.MAX_ELTS
+	///
+	/// # Conditions
+	///
+	/// The produced `&mut BitSlice` handle always begins at the zeroth bit of
+	/// the zeroth element in `slice`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut slice = [0u8; 2];
+	/// let bits = BitSlice::<Lsb0, _>::from_slice_mut(&mut slice).unwrap();
+	///
+	/// assert!(!bits[0]);
+	/// bits.set(0, true);
+	/// assert!(bits[0]);
+	/// assert_eq!(slice[0], 1);
+	/// ```
+	///
+	/// This example attempts to construct a `&mut BitSlice` handle from a slice
+	/// that is too large to index. Either the `vec!` allocation will fail, or
+	/// the bit-slice constructor will fail.
+	///
+	/// ```rust,should_panic
+	/// # #[cfg(feature = "alloc")] {
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = vec![0usize; BitSlice::<LocalBits, usize>::MAX_ELTS];
+	/// let bits = BitSlice::<LocalBits, _>::from_slice_mut(&mut data[..]).unwrap();
+	/// # }
+	/// # #[cfg(not(feature = "alloc"))] panic!("No allocator present");
+	/// ```
+	///
+	/// [`BitView`]: ../view/trait.BitView.html
+	/// [`.view_bits_mut::<O>()`]:
+	/// ../view/trait.BitView.html#method.view_bits_mut
+	#[inline]
+	pub fn from_slice_mut(slice: &mut [T]) -> Option<&mut Self> {
+		let elts = slice.len();
+		if elts >= Self::MAX_ELTS {
+			return None;
+		}
+		Some(unsafe { Self::from_slice_unchecked_mut(slice) })
+	}
+
+	/// Converts a slice reference into a `BitSlice` reference without checking
+	/// that its size can be safely used.
+	///
+	/// # Safety
+	///
+	/// If the `slice` length is too long, then it will be capped at
+	/// [`MAX_BITS`]. You are responsible for ensuring that the input slice is
+	/// not unduly truncated.
+	///
+	/// Prefer [`from_slice_mut`].
+	///
+	/// [`MAX_BITS`]: #associatedconstant.MAX_BITS
+	/// [`from_slice_mut`]: #method.from_slice_mut
+	#[inline]
+	pub unsafe fn from_slice_unchecked_mut(slice: &mut [T]) -> &mut Self {
+		let bits = cmp::min(slice.len() * T::Mem::BITS as usize, Self::MAX_BITS);
+		BitPtr::new_unchecked(slice.as_ptr(), BitIdx::ZERO, bits)
+			.to_bitslice_mut()
+	}
+}
+
+/// Methods specific to `BitSlice<_, T>`, and not present on `[T]`.
+impl<O, T> BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Produces the empty slice. This is equivalent to `&[]` for ordinary
+	/// slices.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits: &BitSlice = BitSlice::empty();
+	/// assert!(bits.is_empty());
+	/// ```
+	#[inline]
+	pub fn empty<'a>() -> &'a Self {
+		BitPtr::EMPTY.to_bitslice_ref()
+	}
+
+	/// Produces the empty mutable slice. This is equivalent to `&mut []` for
+	/// ordinary slices.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits: &mut BitSlice = BitSlice::empty_mut();
+	/// assert!(bits.is_empty());
+	/// ```
+	#[inline]
+	pub fn empty_mut<'a>() -> &'a mut Self {
+		BitPtr::EMPTY.to_bitslice_mut()
+	}
+
+	/// Sets the bit value at the given position.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `index`: The bit index to set. It must be in the range `0 ..
+	///   self.len()`.
+	/// - `value`: The value to be set, `true` for `1` and `false` for `0`.
+	///
+	/// # Effects
+	///
+	/// If `index` is valid, then the bit to which it refers is set to `value`.
+	///
+	/// # Panics
+	///
+	/// This method panics if `index` is outside the slice domain.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	///
+	/// assert!(!bits.get(7).unwrap());
+	/// bits.set(7, true);
+	/// assert!(bits.get(7).unwrap());
+	/// assert_eq!(data, 1);
+	/// ```
+	///
+	/// This example panics when it attempts to set a bit that is out of bounds.
+	///
+	/// ```rust,should_panic
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![mut 0];
+	/// bits.set(1, false);
+	/// ```
+	#[inline]
+	pub fn set(&mut self, index: usize, value: bool) {
+		let len = self.len();
+		assert!(index < len, "Index out of range: {} >= {}", index, len);
+		unsafe {
+			self.set_unchecked(index, value);
+		}
+	}
+
+	/// Sets a bit at an index, without checking boundary conditions.
+	///
+	/// This is generally not recommended; use with caution! For a safe
+	/// alternative, see [`set`].
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `index`: The bit index to set. It must be in the range `0 ..
+	///   self.len()`. It will not be checked.
+	///
+	/// # Effects
+	///
+	/// The bit at `index` is set to `value`.
+	///
+	/// # Safety
+	///
+	/// This method is **not** safe. It performs raw pointer arithmetic to seek
+	/// from the start of the slice to the requested index, and set the bit
+	/// there. It does not inspect the length of `self`, and it is free to
+	/// perform out-of-bounds memory *write* access.
+	///
+	/// Use this method **only** when you have already performed the bounds
+	/// check, and can guarantee that the call occurs with a safely in-bounds
+	/// index.
+	///
+	/// # Examples
+	///
+	/// This example uses a bit slice of length 2, and demonstrates
+	/// out-of-bounds access to the last bit in the element.
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0u8;
+	/// let bits = &mut data.view_bits_mut::<Msb0>()[2 .. 4];
+	///
+	/// assert_eq!(bits.len(), 2);
+	/// unsafe {
+	///   bits.set_unchecked(5, true);
+	/// }
+	/// assert_eq!(data, 1);
+	/// ```
+	///
+	/// [`set`]: #method.set
+	#[inline]
+	pub unsafe fn set_unchecked(&mut self, index: usize, value: bool) {
+		self.bitptr().write::<O>(index, value);
+	}
+
+	/// Tests if *all* bits in the slice domain are set (logical `∧`).
+	///
+	/// # Truth Table
+	///
+	/// ```text
+	/// 0 0 => 0
+	/// 0 1 => 0
+	/// 1 0 => 0
+	/// 1 1 => 1
+	/// ```
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// Whether all bits in the slice domain are set. The empty slice returns
+	/// `true`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1, 1, 0, 1];
+	/// assert!(bits[.. 2].all());
+	/// assert!(!bits[2 ..].all());
+	/// ```
+	#[inline]
+	pub fn all(&self) -> bool {
+		match self.domain() {
+			Domain::Enclave { head, elem, tail } => {
+				/* Due to a bug in `rustc`, calling `.value()` on the two
+				`BitMask` types, to use `T::Mem | T::Mem == T::Mem`, causes type
+				resolution failure and only discovers the
+				`for<'a> BitOr<&'a Self>` implementation in the trait bounds
+				`T::Mem: BitMemory: IsUnsigned: BitOr<Self> + for<'a> BitOr<&'a Self>`.
+
+				Until this is fixed, routing through the `BitMask`
+				implementation suffices. The by-val and by-ref operator traits
+				are at the same position in the bounds chain, making this quite
+				a strange bug.
+				*/
+				!O::mask(head, tail) | elem.load_value() == BitMask::ALL
+			},
+			Domain::Region { head, body, tail } => {
+				head.map_or(true, |(head, elem)| {
+					!O::mask(head, None) | elem.load_value() == BitMask::ALL
+				}) && body.iter().copied().all(|e| e == T::Mem::ALL)
+					&& tail.map_or(true, |(elem, tail)| {
+						!O::mask(None, tail) | elem.load_value() == BitMask::ALL
+					})
+			},
+		}
+	}
+
+	/// Tests if *any* bit in the slice is set (logical `∨`).
+	///
+	/// # Truth Table
+	///
+	/// ```text
+	/// 0 0 => 0
+	/// 0 1 => 1
+	/// 1 0 => 1
+	/// 1 1 => 1
+	/// ```
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// Whether any bit in the slice domain is set. The empty slice returns
+	/// `false`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 0, 0];
+	/// assert!(bits[.. 2].any());
+	/// assert!(!bits[2 ..].any());
+	/// ```
+	#[inline]
+	pub fn any(&self) -> bool {
+		match self.domain() {
+			Domain::Enclave { head, elem, tail } => {
+				O::mask(head, tail) & elem.load_value() != BitMask::ZERO
+			},
+			Domain::Region { head, body, tail } => {
+				head.map_or(false, |(head, elem)| {
+					O::mask(head, None) & elem.load_value() != BitMask::ZERO
+				}) || body.iter().copied().any(|e| e != T::Mem::ZERO)
+					|| tail.map_or(false, |(elem, tail)| {
+						O::mask(None, tail) & elem.load_value() != BitMask::ZERO
+					})
+			},
+		}
+	}
+
+	/// Tests if *any* bit in the slice is unset (logical `¬∧`).
+	///
+	/// # Truth Table
+	///
+	/// ```text
+	/// 0 0 => 1
+	/// 0 1 => 1
+	/// 1 0 => 1
+	/// 1 1 => 0
+	/// ```
+	///
+	/// # Parameters
+	///
+	/// - `&self
+	///
+	/// # Returns
+	///
+	/// Whether any bit in the slice domain is unset.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1, 1, 0, 1];
+	/// assert!(!bits[.. 2].not_all());
+	/// assert!(bits[2 ..].not_all());
+	/// ```
+	#[inline]
+	pub fn not_all(&self) -> bool {
+		!self.all()
+	}
+
+	/// Tests if *all* bits in the slice are unset (logical `¬∨`).
+	///
+	/// # Truth Table
+	///
+	/// ```text
+	/// 0 0 => 1
+	/// 0 1 => 0
+	/// 1 0 => 0
+	/// 1 1 => 0
+	/// ```
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// Whether all bits in the slice domain are unset.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 0, 0];
+	/// assert!(!bits[.. 2].not_any());
+	/// assert!(bits[2 ..].not_any());
+	/// ```
+	#[inline]
+	pub fn not_any(&self) -> bool {
+		!self.any()
+	}
+
+	/// Tests whether the slice has some, but not all, bits set and some, but
+	/// not all, bits unset.
+	///
+	/// This is `false` if either [`.all`] or [`.not_any`] are `true`.
+	///
+	/// # Truth Table
+	///
+	/// ```text
+	/// 0 0 => 0
+	/// 0 1 => 1
+	/// 1 0 => 1
+	/// 1 1 => 0
+	/// ```
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// Whether the slice domain has mixed content. The empty slice returns
+	/// `false`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let data = 0b111_000_10u8;
+	/// let bits = bits![1, 1, 0, 0, 1, 0];
+	///
+	/// assert!(!bits[.. 2].some());
+	/// assert!(!bits[2 .. 4].some());
+	/// assert!(bits.some());
+	/// ```
+	///
+	/// [`.all`]: #method.all
+	/// [`.not_any`]: #method.not_any
+	#[inline]
+	pub fn some(&self) -> bool {
+		self.any() && self.not_all()
+	}
+
+	/// Returns the number of ones in the memory region backing `self`.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// The number of high bits in the slice domain.
+	///
+	/// # Examples
+	///
+	/// Basic usage:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1, 1, 0, 0];
+	/// assert_eq!(bits[.. 2].count_ones(), 2);
+	/// assert_eq!(bits[2 ..].count_ones(), 0);
+	/// ```
+	#[inline]
+	pub fn count_ones(&self) -> usize {
+		match self.domain() {
+			Domain::Enclave { head, elem, tail } => (O::mask(head, tail)
+				& elem.load_value())
+			.value()
+			.count_ones() as usize,
+			Domain::Region { head, body, tail } => {
+				head.map_or(0, |(head, elem)| {
+					(O::mask(head, None) & elem.load_value())
+						.value()
+						.count_ones() as usize
+				}) + body
+					.iter()
+					.copied()
+					.map(|e| e.count_ones() as usize)
+					.sum::<usize>() + tail.map_or(0, |(elem, tail)| {
+					(O::mask(None, tail) & elem.load_value())
+						.value()
+						.count_ones() as usize
+				})
+			},
+		}
+	}
+
+	/// Returns the number of zeros in the memory region backing `self`.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// The number of low bits in the slice domain.
+	///
+	/// # Examples
+	///
+	/// Basic usage:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![1, 1, 0, 0];
+	/// assert_eq!(bits[.. 2].count_zeros(), 0);
+	/// assert_eq!(bits[2 ..].count_zeros(), 2);
+	/// ```
+	#[inline]
+	pub fn count_zeros(&self) -> usize {
+		match self.domain() {
+			Domain::Enclave { head, elem, tail } => (!O::mask(head, tail)
+				| elem.load_value())
+			.value()
+			.count_zeros() as usize,
+			Domain::Region { head, body, tail } => {
+				head.map_or(0, |(head, elem)| {
+					(!O::mask(head, None) | elem.load_value())
+						.value()
+						.count_zeros() as usize
+				}) + body
+					.iter()
+					.copied()
+					.map(|e| e.count_zeros() as usize)
+					.sum::<usize>() + tail.map_or(0, |(elem, tail)| {
+					(!O::mask(None, tail) | elem.load_value())
+						.value()
+						.count_zeros() as usize
+				})
+			},
+		}
+	}
+
+	/// Sets all bits in the slice to a value.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `value`: The bit value to which all bits in the slice will be set.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut src = 0u8;
+	/// let bits = src.view_bits_mut::<Msb0>();
+	/// bits[2 .. 6].set_all(true);
+	/// assert_eq!(bits.as_slice(), &[0b0011_1100]);
+	/// bits[3 .. 5].set_all(false);
+	/// assert_eq!(bits.as_slice(), &[0b0010_0100]);
+	/// bits[.. 1].set_all(true);
+	/// assert_eq!(bits.as_slice(), &[0b1010_0100]);
+	/// ```
+	#[inline]
+	pub fn set_all(&mut self, value: bool) {
+		//  Grab the function pointers used to commit bit-masks into memory.
+		let setter = <<T::Alias as BitStore>::Access>::get_writers(value);
+		match self.domain_mut() {
+			DomainMut::Enclave { head, elem, tail } => {
+				//  Step three: write the bitmask through the accessor.
+				setter(
+					//  Step one: attach an `::Access` marker to the reference
+					dvl::accessor(elem),
+					//  Step two: insert an `::Alias` marker *into the bitmask*
+					//  because typechecking is “fun�
+					O::mask(head, tail).pipe(dvl::alias_mask::<T>),
+				);
+			},
+			DomainMut::Region { head, body, tail } => {
+				if let Some((head, elem)) = head {
+					setter(
+						dvl::accessor(elem),
+						O::mask(head, None).pipe(dvl::alias_mask::<T>),
+					);
+				}
+				//  loop assignment is `memset`’s problem, not ours
+				unsafe {
+					ptr::write_bytes(
+						body.as_mut_ptr(),
+						[0, !0][value as usize],
+						body.len(),
+					);
+				}
+				if let Some((elem, tail)) = tail {
+					setter(
+						dvl::accessor(elem),
+						O::mask(None, tail).pipe(dvl::alias_mask::<T>),
+					);
+				}
+			},
+		}
+	}
+
+	/// Applies a function to each bit in the slice.
+	///
+	/// `BitSlice` cannot implement `IndexMut`, as it cannot manifest `&mut
+	/// bool` references, and the [`BitMut`] proxy reference has an unavoidable
+	/// overhead. This method bypasses both problems, by applying a function to
+	/// each pair of index and value in the slice, without constructing a proxy
+	/// reference.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `func`: A function which receives two arguments, `index: usize` and
+	///   `value: bool`, and returns a `bool`.
+	///
+	/// # Effects
+	///
+	/// For each index in the slice, the result of invoking `func` with the
+	/// index number and current bit value is written into the slice.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// bits.for_each(|idx, _bit| idx % 3 == 0);
+	/// assert_eq!(data, 0b100_100_10);
+	/// ```
+	#[inline]
+	pub fn for_each<F>(&mut self, mut func: F)
+	where F: FnMut(usize, bool) -> bool {
+		for idx in 0 .. self.len() {
+			unsafe {
+				let tmp = *self.get_unchecked(idx);
+				let new = func(idx, tmp);
+				self.set_unchecked(idx, new);
+			}
+		}
+	}
+
+	/// Accesses the total backing storage of the `BitSlice`, as a slice of its
+	/// elements.
+	///
+	/// This method produces a slice over all the memory elements it touches,
+	/// using the current storage parameter. This is safe to do, as any events
+	/// that would create an aliasing view into the elements covered by the
+	/// returned slice will also have caused the slice to use its alias-aware
+	/// type.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A view of the entire memory region this slice covers, including the edge
+	/// elements.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let data = 0x3Cu8;
+	/// let bits = &data.view_bits::<LocalBits>()[2 .. 6];
+	///
+	/// assert!(bits.all());
+	/// assert_eq!(bits.len(), 4);
+	/// assert_eq!(bits.as_slice(), &[0x3Cu8]);
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_slice(&self) -> &[T] {
+		let bitptr = self.bitptr();
+		let (base, elts) = (bitptr.pointer().to_const(), bitptr.elements());
+		unsafe { slice::from_raw_parts(base, elts) }
+	}
+
+	/// Views the wholly-filled elements of the `BitSlice`.
+	///
+	/// This will not include partially-owned edge elements, as they may be
+	/// aliased by other handles. To gain access to all elements that the
+	/// `BitSlice` region covers, use one of the following:
+	///
+	/// - [`.as_slice`] produces a shared slice over all elements, marked
+	///   aliased as appropriate.
+	/// - [`.domain`] produces a view describing each component of the region,
+	///   marking only the contended edges as aliased and the uncontended
+	///   interior as unaliased.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A slice of all the wholly-filled elements in the `BitSlice` backing
+	/// storage.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let data = [1u8, 66];
+	/// let bits = data.view_bits::<Msb0>();
+	///
+	/// let accum = bits
+	///   .as_raw_slice()
+	///   .iter()
+	///   .copied()
+	///   .map(u8::count_ones)
+	///   .sum::<u32>();
+	/// assert_eq!(accum, 3);
+	/// ```
+	///
+	/// [`.as_slice`]: #method.as_slice
+	/// [`.domain`]: #method.domain
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_raw_slice(&self) -> &[T::Mem] {
+		self.domain().region().map_or(&[], |(_, b, _)| b)
+	}
+
+	/// Views the wholly-filled elements of the `BitSlice`.
+	///
+	/// This will not include partially-owned edge elements, as they may be
+	/// aliased by other handles. To gain access to all elements that the
+	/// `BitSlice` region covers, use one of the following:
+	///
+	/// - [`.as_aliased_slice`] produces a shared slice over all elements,
+	///   marked as aliased to allow for the possibliity of mutation.
+	/// - [`.domain_mut`] produces a view describing each component of the
+	///   region, marking only the contended edges as aliased and the
+	///   uncontended interior as unaliased.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	///
+	/// # Returns
+	///
+	/// A mutable slice of all the wholly-filled elements in the `BitSlice`
+	/// backing storage.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = [1u8, 64];
+	/// let bits = data.view_bits_mut::<Msb0>();
+	/// for elt in bits.as_raw_slice_mut() {
+	///   *elt |= 2;
+	/// }
+	/// assert_eq!(&[3, 66], bits.as_slice());
+	/// ```
+	///
+	/// [`.as_aliased_slice`]: #method.as_aliased_slice
+	/// [`.domain_mut`]: #method.domain_mut
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_raw_slice_mut(&mut self) -> &mut [T::Mem] {
+		self.domain_mut().region().map_or(&mut [], |(_, b, _)| b)
+	}
+
+	/// Splits the slice into the logical components of its memory domain.
+	///
+	/// This produces a set of read-only subslices, marking as much as possible
+	/// as affirmatively lacking any write-capable view (`T::NoAlias`). The
+	/// unaliased view is able to safely perform unsynchronized reads from
+	/// memory without causing undefined behavior, as the type system is able to
+	/// statically prove that no other write-capable views exist.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A `BitDomain` structure representing the logical components of the
+	/// memory region.
+	///
+	/// # Safety Exception
+	///
+	/// The following snippet describes a means of constructing a `T::NoAlias`
+	/// view into memory that is, in fact, aliased:
+	///
+	/// ```rust
+	/// # #[cfg(feature = "atomic")] {
+	/// use bitvec::prelude::*;
+	/// use core::sync::atomic::AtomicU8;
+	/// type Bs<T> = BitSlice<LocalBits, T>;
+	///
+	/// let data = [AtomicU8::new(0), AtomicU8::new(0), AtomicU8::new(0)];
+	/// let bits: &Bs<AtomicU8> = data.view_bits::<LocalBits>();
+	/// let subslice: &Bs<AtomicU8> = &bits[4 .. 20];
+	///
+	/// let (_, noalias, _): (_, &Bs<u8>, _) =
+	///   subslice.bit_domain().region().unwrap();
+	/// # }
+	/// ```
+	///
+	/// The `noalias` reference, which has memory type `u8`, assumes that it can
+	/// act as an `&u8` reference: unsynchronized loads are permitted, as no
+	/// handle exists which is capable of modifying the middle bit of `data`.
+	/// This means that LLVM is permitted to issue loads from memory *wherever*
+	/// it wants in the block during which `noalias` is live, as all loads are
+	/// equivalent.
+	///
+	/// Use of the `bits` or `subslice` handles, which are still live for the
+	/// lifetime of `noalias`, to issue [`.set_aliased`] calls into the middle
+	/// element introduce **undefined behavior**. `bitvec` permits safe code to
+	/// introduce this undefined behavior solely because it requires deliberate
+	/// opt-in – you must start from atomic data; this cannot occur when `data`
+	/// is non-atomic – and use of the shared-mutation facility simultaneously
+	/// with the unaliasing view.
+	///
+	/// The [`.set_aliased`] method is speculative, and will be marked as
+	/// `unsafe` or removed at any suspicion that its presence in the library
+	/// has any costs.
+	///
+	/// # Examples
+	///
+	/// This method can be used to accelerate reads from a slice that is marked
+	/// as aliased.
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	/// type Bs<T> = BitSlice<LocalBits, T>;
+	///
+	/// let bits = bits![mut LocalBits, u8; 0; 24];
+	/// let (a, b): (
+	///   &mut Bs<<u8 as BitStore>::Alias>,
+	///   &mut Bs<<u8 as BitStore>::Alias>,
+	/// ) = bits.split_at_mut(4);
+	/// let (partial, full, _): (
+	///   &Bs<<u8 as BitStore>::Alias>,
+	///   &Bs<<u8 as BitStore>::Mem>,
+	///   _,
+	/// ) = b.bit_domain().region().unwrap();
+	/// read_from(partial); // uses alias-aware reads
+	/// read_from(full); // uses ordinary reads
+	/// # fn read_from<T: BitStore>(_: &BitSlice<LocalBits, T>) {}
+	/// ```
+	///
+	/// [`.set_aliased`]: #method.set_aliased
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn bit_domain(&self) -> BitDomain<O, T> {
+		BitDomain::new(self)
+	}
+
+	/// Splits the slice into the logical components of its memory domain.
+	///
+	/// This produces a set of mutable subslices, marking as much as possible as
+	/// affirmatively lacking any other view (`T::Mem`). The bare view is able
+	/// to safely perform unsynchronized reads from and writes to memory without
+	/// causing undefined behavior, as the type system is able to statically
+	/// prove that no other views exist.
+	///
+	/// # Why This Is More Sound Than `.bit_domain`
+	///
+	/// The `&mut` exclusion rule makes it impossible to construct two
+	/// references over the same memory where one of them is marked `&mut`. This
+	/// makes it impossible to hold a live reference to memory *separately* from
+	/// any references produced from this method. For the duration of all
+	/// references produced by this method, all ancestor references used to
+	/// reach this method call are either suspended or dead, and the compiler
+	/// will not allow you to use them.
+	///
+	/// As such, this method cannot introduce undefined behavior where a
+	/// reference incorrectly believes that the referent memory region is
+	/// immutable.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn bit_domain_mut(&mut self) -> BitDomainMut<O, T> {
+		BitDomainMut::new(self)
+	}
+
+	/// Splits the slice into immutable references to its underlying memory
+	/// components.
+	///
+	/// Unlike [`.bit_domain`] and [`.bit_domain_mut`], this does not return
+	/// smaller `BitSlice` handles but rather appropriately-marked references to
+	/// the underlying memory elements.
+	///
+	/// The aliased references allow mutation of these elements. You are
+	/// required to not use mutating methods on these references *at all*. This
+	/// function is not marked `unsafe`, but this is a contract you must uphold.
+	/// Use [`.domain_mut`] to modify the underlying elements.
+	///
+	/// > It is not currently possible to forbid mutation through these
+	/// > references. This may change in the future.
+	///
+	/// # Safety Exception
+	///
+	/// As with [`.bit_domain`], this produces unsynchronized immutable
+	/// references over the fully-populated interior elements. If this view is
+	/// constructed from a `BitSlice` handle over atomic memory, then it will
+	/// remove the atomic access behavior for the interior elements. This *by
+	/// itself* is safe, as long as no contemporaneous atomic writes to that
+	/// memory can occur. You must not retain and use an atomic reference to the
+	/// memory region marked as `NoAlias` for the duration of this view’s
+	/// existence.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A read-only descriptor of the memory elements backing `*self`.
+	///
+	/// [`.bit_domain`]: #method.bit_domain
+	/// [`.bit_domain_mut`]: #method.bit_domain_mut
+	/// [`.domain_mut`]: #method.domain_mut
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn domain(&self) -> Domain<T> {
+		Domain::new(self)
+	}
+
+	/// Splits the slice into mutable references to its underlying memory
+	/// elements.
+	///
+	/// Like [`.domain`], this returns appropriately-marked references to the
+	/// underlying memory elements. These references are all writable.
+	///
+	/// The aliased edge references permit modifying memory beyond their bit
+	/// marker. You are required to only mutate the region of these edge
+	/// elements that you currently govern. This function is not marked
+	/// `unsafe`, but this is a contract you must uphold.
+	///
+	/// > It is not currently possible to forbid out-of-bounds mutation through
+	/// > these references. This may change in the future.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	///
+	/// # Returns
+	///
+	/// A descriptor of the memory elements underneath `*self`, permitting
+	/// mutation.
+	///
+	/// [`.domain`]: #method.domain
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn domain_mut(&mut self) -> DomainMut<T> {
+		DomainMut::new(self)
+	}
+
+	/// Splits a slice at some mid-point, without checking boundary conditions.
+	///
+	/// This is generally not recommended; use with caution! For a safe
+	/// alternative, see [`split_at`].
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `mid`: The index at which to split the slice. This must be in the
+	///   range `0 .. self.len()`.
+	///
+	/// # Returns
+	///
+	/// - `.0`: `&self[.. mid]`
+	/// - `.1`: `&self[mid ..]`
+	///
+	/// # Safety
+	///
+	/// This function is **not** safe. It performs raw pointer arithmetic to
+	/// construct two new references. If `mid` is out of bounds, then the first
+	/// slice will be too large, and the second will be *catastrophically*
+	/// incorrect. As both are references to invalid memory, they are undefined
+	/// to *construct*, and may not ever be used.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let data = 0x0180u16;
+	/// let bits = data.view_bits::<Msb0>();
+	///
+	/// let (one, two) = unsafe { bits.split_at_unchecked(8) };
+	/// assert!(one[7]);
+	/// assert!(two[0]);
+	/// ```
+	///
+	/// [`split_at`]: #method.split_at
+	#[inline]
+	pub unsafe fn split_at_unchecked(&self, mid: usize) -> (&Self, &Self) {
+		(self.get_unchecked(.. mid), self.get_unchecked(mid ..))
+	}
+
+	/// Splits a mutable slice at some mid-point, without checking boundary
+	/// conditions.
+	///
+	/// This is generally not recommended; use with caution! For a safe
+	/// alternative, see [`split_at_mut`].
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `mid`: The index at which to split the slice. This must be in the
+	///   range `0 .. self.len()`.
+	///
+	/// # Returns
+	///
+	/// - `.0`: `&mut self[.. mid]`
+	/// - `.1`: `&mut self[mid ..]`
+	///
+	/// # Safety
+	///
+	/// This function is **not** safe. It performs raw pointer arithmetic to
+	/// construct two new references. If `mid` is out of bounds, then the first
+	/// slice will be too large, and the second will be *catastrophically*
+	/// incorrect. As both are references to invalid memory, they are undefined
+	/// to *construct*, and may not ever be used.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0u16;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	///
+	/// let (one, two) = unsafe { bits.split_at_unchecked_mut(8) };
+	/// one.set(7, true);
+	/// two.set(0, true);
+	/// assert_eq!(data, 0x0180u16);
+	/// ```
+	///
+	/// [`split_at_mut`]: #method.split_at_mut
+	#[inline]
+	#[allow(clippy::type_complexity)]
+	pub unsafe fn split_at_unchecked_mut(
+		&mut self,
+		mid: usize,
+	) -> (&mut BitSlice<O, T::Alias>, &mut BitSlice<O, T::Alias>)
+	{
+		let bp = self.alias_mut().bitptr();
+		(
+			bp.to_bitslice_mut().get_unchecked_mut(.. mid),
+			bp.to_bitslice_mut().get_unchecked_mut(mid ..),
+		)
+	}
+
+	/// Splits a mutable slice at some mid-point, without checking boundary
+	/// conditions or adding an alias marker.
+	///
+	/// This method has the same behavior as [`split_at_unchecked_mut`], except
+	/// that it does not apply an aliasing marker to the partitioned subslices.
+	///
+	/// # Safety
+	///
+	/// See [`split_at_unchecked_mut`] for safety requirements.
+	///
+	/// Additionally, this is only safe when `T` is alias-safe.
+	///
+	/// [`split_at_unchecked_mut`]: #method.split_at_unchecked_mut
+	#[inline]
+	pub(crate) unsafe fn split_at_unchecked_mut_noalias(
+		&mut self,
+		mid: usize,
+	) -> (&mut Self, &mut Self)
+	{
+		//  Split the slice at the requested midpoint, adding an alias layer
+		let (head, tail) = self.split_at_unchecked_mut(mid);
+		//  Remove the new alias layer.
+		(Self::unalias_mut(head), Self::unalias_mut(tail))
+	}
+
+	/// Swaps the bits at two indices without checking boundary conditions.
+	///
+	/// This is generally not recommended; use with caution! For a safe
+	/// alternative, see [`swap`].
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `a`: One index to swap.
+	/// - `b`: The other index to swap.
+	///
+	/// # Effects
+	///
+	/// The bit at index `a` is written into index `b`, and the bit at index `b`
+	/// is written into `a`.
+	///
+	/// # Safety
+	///
+	/// Both `a` and `b` must be less than `self.len()`. Indices greater than
+	/// the length will cause out-of-bounds memory access, which can lead to
+	/// memory unsafety and a program crash.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 8u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	///
+	/// unsafe { bits.swap_unchecked(0, 4); }
+	///
+	/// assert_eq!(data, 128);
+	/// ```
+	///
+	/// [`swap`]: #method.swap
+	#[inline]
+	pub unsafe fn swap_unchecked(&mut self, a: usize, b: usize) {
+		let bit_a = *self.get_unchecked(a);
+		let bit_b = *self.get_unchecked(b);
+		self.set_unchecked(a, bit_b);
+		self.set_unchecked(b, bit_a);
+	}
+
+	/// Copies a bit from one index to another without checking boundary
+	/// conditions.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `from`: The index whose bit is to be copied
+	/// - `to`: The index into which the copied bit is written.
+	///
+	/// # Effects
+	///
+	/// The bit at `from` is written into `to`.
+	///
+	/// # Safety
+	///
+	/// Both `from` and `to` must be less than `self.len()`, in order for
+	/// `self` to legally read from and write to them, respectively.
+	///
+	/// If `self` had been split from a larger slice, reading from `from` or
+	/// writing to `to` may not *necessarily* cause a memory-safety violation in
+	/// the Rust model, due to the aliasing system `bitvec` employs. However,
+	/// writing outside the bounds of a slice reference is *always* a logical
+	/// error, as it causes changes observable by another reference handle.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 1u8;
+	/// let bits = data.view_bits_mut::<Lsb0>();
+	///
+	/// unsafe { bits.copy_unchecked(0, 2) };
+	///
+	/// assert_eq!(data, 5);
+	/// ```
+	#[inline]
+	pub unsafe fn copy_unchecked(&mut self, from: usize, to: usize) {
+		let tmp = *self.get_unchecked(from);
+		self.set_unchecked(to, tmp);
+	}
+
+	/// Copies bits from one part of the slice to another part of itself.
+	///
+	/// `src` is the range within `self` to copy from. `dest` is the starting
+	/// index of the range within `self` to copy to, which will have the same
+	/// length as `src`. The two ranges may overlap. The ends of the two ranges
+	/// must be less than or equal to `self.len()`.
+	///
+	/// # Effects
+	///
+	/// `self[src]` is copied to `self[dest .. dest + src.end() - src.start()]`.
+	///
+	/// # Panics
+	///
+	/// This function will panic if either range exceeds the end of the slice,
+	/// or if the end of `src` is before the start.
+	///
+	/// # Safety
+	///
+	/// Both the `src` range and the target range `dest .. dest + src.len()`
+	/// must not exceed the `self.len()` slice range.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut data = 0x07u8;
+	/// let bits = data.view_bits_mut::<Msb0>();
+	///
+	/// unsafe { bits.copy_within_unchecked(5 .., 0); }
+	///
+	/// assert_eq!(data, 0xE7);
+	/// ```
+	#[inline]
+	pub unsafe fn copy_within_unchecked<R>(&mut self, src: R, dest: usize)
+	where R: RangeBounds<usize> {
+		let len = self.len();
+		let rev = src.contains(&dest);
+		let source = dvl::normalize_range(src, len);
+		let iter = source.zip(dest .. len);
+		if rev {
+			for (from, to) in iter.rev() {
+				self.copy_unchecked(from, to);
+			}
+		}
+		else {
+			for (from, to) in iter {
+				self.copy_unchecked(from, to);
+			}
+		}
+	}
+
+	/// Produces the absolute offset in bits between two slice heads.
+	///
+	/// While this method is sound for any two arbitrary bit slices, the answer
+	/// it produces is meaningful *only* when one argument is a strict subslice
+	/// of the other. If the two slices are created from different buffers
+	/// entirely, a comparison is undefined; if the two slices are disjoint
+	/// regions of the same buffer, then the semantically correct distance is
+	/// between the tail of the lower and the head of the upper, which this
+	/// does not measure.
+	///
+	/// # Visual Description
+	///
+	/// Consider the following sequence of bits:
+	///
+	/// ```text
+	/// [ 0 1 2 3 4 5 6 7 8 9 a b ]
+	///   |       ^^^^^^^       |
+	///   ^^^^^^^^^^^^^^^^^^^^^^^
+	/// ```
+	///
+	/// It does not matter whether there are bits between the tail of the
+	/// smaller and the larger slices. The offset is computed from the bit
+	/// distance between the two heads.
+	///
+	/// # Behavior
+	///
+	/// This function computes the *semantic* distance between the heads, rather
+	/// than the *electrical. It does not take into account the `BitOrder`
+	/// implementation of the slice. See the [`::electrical_distance`] method
+	/// for that comparison.
+	///
+	/// # Safety and Soundness
+	///
+	/// One of `self` or `other` must contain the other for this comparison to
+	/// be meaningful.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `other`: Another bit slice. This must be either a strict subregion or
+	///   a strict superregion of `self`.
+	///
+	/// # Returns
+	///
+	/// The distance in (semantic) bits betwen the heads of each region. The
+	/// value is positive when `other` is higher in the address space than
+	/// `self`, and negative when `other` is lower in the address space than
+	/// `self`.
+	///
+	/// [`::electrical_distance]`: #method.electrical_comparison
+	pub fn offset_from(&self, other: &Self) -> isize {
+		let (elts, bits) = unsafe { self.bitptr().ptr_diff(other.bitptr()) };
+		elts.saturating_mul(T::Mem::BITS as isize)
+			.saturating_add(bits as isize)
+	}
+
+	/// Computes the electrical distance between the heads of two slices.
+	///
+	/// This method uses the slices’ `BitOrder` implementation to compute the
+	/// bit position of their heads, then computes the shift distance, in bits,
+	/// between them.
+	///
+	/// This computation presumes that the bits are counted in the same
+	/// direction as are bytes in the abstract memory map.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `other`: Another bit slice. This must be either a strict subregion or
+	///   a strict superregion of `self`.
+	///
+	/// # Returns
+	///
+	/// The electrical bit distance between the heads of `self` and `other`.
+	pub fn electrical_distance(&self, other: &Self) -> isize {
+		let this = self.bitptr();
+		let that = other.bitptr();
+		let (elts, bits) = unsafe {
+			let this = BitPtr::new_unchecked(
+				this.pointer(),
+				BitIdx::new_unchecked(this.head().position::<O>().value()),
+				1,
+			);
+			let that = BitPtr::new_unchecked(
+				that.pointer(),
+				BitIdx::new_unchecked(that.head().position::<O>().value()),
+				1,
+			);
+			this.ptr_diff(that)
+		};
+		elts.saturating_mul(T::Mem::BITS as isize)
+			.saturating_add(bits as isize)
+	}
+
+	/// Marks an immutable slice as referring to aliased memory region.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub(crate) fn alias(&self) -> &BitSlice<O, T::Alias> {
+		unsafe { &*(self.as_ptr() as *const BitSlice<O, T::Alias>) }
+	}
+
+	/// Marks a mutable slice as describing an aliased memory region.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub(crate) fn alias_mut(&mut self) -> &mut BitSlice<O, T::Alias> {
+		unsafe { &mut *(self as *mut Self as *mut BitSlice<O, T::Alias>) }
+	}
+
+	/// Removes the aliasing marker from a mutable slice handle.
+	///
+	/// # Safety
+	///
+	/// This must only be used when the slice is either known to be unaliased,
+	/// or this call is combined with an operation that adds an aliasing marker
+	/// and the total number of aliasing markers must remain unchanged.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub(crate) unsafe fn unalias_mut(
+		this: &mut BitSlice<O, T::Alias>,
+	) -> &mut Self {
+		&mut *(this as *mut BitSlice<O, T::Alias> as *mut Self)
+	}
+
+	/// Type-cast the slice reference to its pointer structure.
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub(crate) fn bitptr(&self) -> BitPtr<T> {
+		BitPtr::from_bitslice_ptr(self.as_ptr())
+	}
+
+	/// Constructs a `BitSlice` over aliased memory.
+	///
+	/// This is restricted so that it can only be used within the crate.
+	/// Construction of a `BitSlice` over externally-aliased memory is unsound.
+	#[cfg(not(tarpaulin_include))]
+	pub(crate) unsafe fn from_aliased_slice_unchecked(
+		slice: &[T::Alias],
+	) -> &BitSlice<O, T::Alias> {
+		BitPtr::new_unchecked(
+			slice.as_ptr(),
+			BitIdx::ZERO,
+			slice.len() * T::Mem::BITS as usize,
+		)
+		.to_bitslice_ref()
+	}
+}
+
+/// Methods available only when `T` allows shared mutability.
+impl<O, T> BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore + Radium<Item = <T as BitStore>::Mem>,
+{
+	/// Splits a mutable slice at some mid-point.
+	///
+	/// This method has the same behavior as [`split_at_mut`], except that it
+	/// does not apply an aliasing marker to the partitioned subslices.
+	///
+	/// # Safety
+	///
+	/// Because this method is defined only on `BitSlice`s whose `T` type is
+	/// alias-safe, the subslices do not need to be additionally marked.
+	///
+	/// [`split_at_mut`]: #method.split_at_mut
+	#[inline]
+	//  `.split_at_mut` is already tested, and `::unalias_mut` is a noöp.
+	#[cfg(not(tarpaulin_include))]
+	pub fn split_at_aliased_mut(
+		&mut self,
+		mid: usize,
+	) -> (&mut Self, &mut Self)
+	{
+		let (head, tail) = self.split_at_mut(mid);
+		unsafe { (Self::unalias_mut(head), Self::unalias_mut(tail)) }
+	}
+}
+
+/// Miscellaneous information.
+impl<O, T> BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// The inclusive maximum length of a `BitSlice<_, T>`.
+	///
+	/// As `BitSlice` is zero-indexed, the largest possible index is one less
+	/// than this value.
+	///
+	/// |CPU word width|         Value         |
+	/// |-------------:|----------------------:|
+	/// |32 bits       |     `0x1fff_ffff`     |
+	/// |64 bits       |`0x1fff_ffff_ffff_ffff`|
+	pub const MAX_BITS: usize = BitPtr::<T>::REGION_MAX_BITS;
+	/// The inclusive maximum length that a slice `[T]` can be for
+	/// `BitSlice<_, T>` to cover it.
+	///
+	/// A `BitSlice<_, T>` that begins in the interior of an element and
+	/// contains the maximum number of bits will extend one element past the
+	/// cutoff that would occur if the slice began at the zeroth bit. Such a
+	/// slice must be manually constructed, but will not otherwise fail.
+	///
+	/// |Type Bits|Max Elements (32-bit)| Max Elements (64-bit) |
+	/// |--------:|--------------------:|----------------------:|
+	/// |        8|    `0x0400_0001`    |`0x0400_0000_0000_0001`|
+	/// |       16|    `0x0200_0001`    |`0x0200_0000_0000_0001`|
+	/// |       32|    `0x0100_0001`    |`0x0100_0000_0000_0001`|
+	/// |       64|    `0x0080_0001`    |`0x0080_0000_0000_0001`|
+	pub const MAX_ELTS: usize = BitPtr::<T>::REGION_MAX_ELTS;
+}
+
+/** Constructs a `&BitSlice` reference from its component data.
+
+This is logically equivalent to [`slice::from_raw_parts`] for `[T]`.
+
+# Lifetimes
+
+- `'a`: The lifetime of the returned bitslice handle. This must be no longer
+  than the duration of the referent region, as it is illegal for references to
+  dangle.
+
+# Type Parameters
+
+- `O`: The ordering of bits within elements `T`.
+- `T`: The type of each memory element in the backing storage region.
+
+# Parameters
+
+- `addr`: The base address of the memory region that the `BitSlice` covers.
+- `head`: The index of the first live bit in `*addr`, at which the `BitSlice`
+  begins. This is required to be in the range `0 .. T::Mem::BITS`.
+- `bits`: The number of live bits, beginning at `head` in `*addr`, that the
+  `BitSlice` contains. This must be no greater than `BitSlice::MAX_BITS`.
+
+# Returns
+
+If the input parameters are valid, this returns `Some` shared reference to a
+`BitSlice`. The failure conditions causing this to return `None` are:
+
+- `head` is not less than [`T::Mem::BITS`]
+- `bits` is greater than [`BitSlice::<O, T>::MAX_BITS`]
+- `addr` is not adequately aligned to `T`
+- `addr` is so high in the memory space that the region wraps to the base of the
+  memory space
+
+# Safety
+
+The memory region described by the returned `BitSlice` must be validly allocated
+within the caller’s memory management system. It must also not be modified for
+the duration of the lifetime `'a`, unless the `T` type parameter permits safe
+shared mutation.
+
+[`BitSlice::<O, T>::MAX_BITS`]: struct.BitSlice.html#associatedconstant.MAX_BITS
+[`T::Mem::BITS`]: ../mem/trait.BitMemory.html#associatedconstant.BITS
+[`slice::from_raw_parts`]: https://doc.rust-lang.org/core/slice/fn.from_raw_parts.html
+**/
+#[inline]
+pub unsafe fn bits_from_raw_parts<'a, O, T>(
+	addr: *const T,
+	head: u8,
+	bits: usize,
+) -> Option<&'a BitSlice<O, T>>
+where
+	O: BitOrder,
+	T: 'a + BitStore + BitMemory,
+{
+	let head = crate::index::BitIdx::new(head)?;
+	BitPtr::new(addr, head, bits).map(BitPtr::to_bitslice_ref)
+}
+
+/** Constructs a `&mut BitSlice` reference from its component data.
+
+This is logically equivalent to [`slice::from_raw_parts_mut`] for `[T]`.
+
+# Lifetimes
+
+- `'a`: The lifetime of the returned bitslice handle. This must be no longer
+  than the duration of the referent region, as it is illegal for references to
+  dangle.
+
+# Type Parameters
+
+- `O`: The ordering of bits within elements `T`.
+- `T`: The type of each memory element in the backing storage region.
+
+# Parameters
+
+- `addr`: The base address of the memory region that the `BitSlice` covers.
+- `head`: The index of the first live bit in `*addr`, at which the `BitSlice`
+  begins. This is required to be in the range `0 .. T::Mem::BITS`.
+- `bits`: The number of live bits, beginning at `head` in `*addr`, that the
+  `BitSlice` contains. This must be no greater than `BitSlice::MAX_BITS`.
+
+# Returns
+
+If the input parameters are valid, this returns `Some` shared reference to a
+`BitSlice`. The failure conditions causing this to return `None` are:
+
+- `head` is not less than [`T::Mem::BITS`]
+- `bits` is greater than [`BitSlice::<O, T>::MAX_BITS`]
+- `addr` is not adequately aligned to `T`
+- `addr` is so high in the memory space that the region wraps to the base of the
+  memory space
+
+# Safety
+
+The memory region described by the returned `BitSlice` must be validly allocated
+within the caller’s memory management system. It must also not be reachable for
+the lifetime `'a` by any path other than references derived from the return
+value.
+
+[`BitSlice::<O, T>::MAX_BITS`]: struct.BitSlice.html#associatedconstant.MAX_BITS
+[`T::Mem::BITS`]: ../mem/trait.BitMemory.html#associatedconstant.BITS
+[`slice::from_raw_parts_mut`]: https://doc.rust-lang.org/core/slice/fn.from_raw_parts_mut.html
+**/
+#[inline]
+pub unsafe fn bits_from_raw_parts_mut<'a, O, T>(
+	addr: *mut T,
+	head: u8,
+	bits: usize,
+) -> Option<&'a mut BitSlice<O, T>>
+where
+	O: BitOrder,
+	T: 'a + BitStore + BitMemory,
+{
+	let head = crate::index::BitIdx::new(head)?;
+	BitPtr::new(addr, head, bits).map(BitPtr::to_bitslice_mut)
+}
+
+mod api;
+mod iter;
+mod ops;
+mod proxy;
+mod traits;
+
+//  Match the `core::slice` API module topology.
+
+pub use self::{
+	api::{
+		from_mut,
+		from_raw_parts,
+		from_raw_parts_mut,
+		from_ref,
+		BitSliceIndex,
+	},
+	iter::{
+		Chunks,
+		ChunksExact,
+		ChunksExactMut,
+		ChunksMut,
+		Iter,
+		IterMut,
+		RChunks,
+		RChunksExact,
+		RChunksExactMut,
+		RChunksMut,
+		RSplit,
+		RSplitMut,
+		RSplitN,
+		RSplitNMut,
+		Split,
+		SplitMut,
+		SplitN,
+		SplitNMut,
+		Windows,
+	},
+	proxy::BitMut,
+};
+
+#[cfg(test)]
+mod tests;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/store.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/store.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/store.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/store.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,346 @@
+/*! Memory modeling.
+
+This module provides a `BitStore` trait, which mediates how handles access
+memory and perform analysis on the regions they describe.
+!*/
+
+use crate::{
+	access::BitAccess,
+	index::{
+		BitIdx,
+		BitMask,
+		BitRegister,
+	},
+	mem,
+	order::BitOrder,
+};
+
+use core::{
+	cell::Cell,
+	fmt::Debug,
+};
+
+use radium::Radium;
+
+/** Common interface for memory regions.
+
+This trait is implemented on the fundamental integers no wider than the target
+processor word size, their `Cell` wrappers, and (if present) their `Atomic`
+variants. Users provide this type as a parameter to their data structures in
+order to inform the structure of how it may access the memory it describes.
+
+Currently, `bitvec` is only tested on 32- and 64- bit architectures. This means
+that `u8`, `u16`, `u32`, and `usize` unconditionally implement `BitStore`, but
+`u64` will only do so on 64-bit targets, and will be unavailable on 32-bit
+targets. This is a necessary restriction of `bitvec` internals. Please comment
+on [Issue #76](https://github.com/myrrlyn/bitvec/issues/76) if this affects you.
+
+Specifically, this has the davantage that a `BitSlice<_, Cell<_>>` knows that it
+has a view of memory that will not undergo concurrent modification. As such, it
+can forego atomic accesses, and just use ordinary load/store instructions
+without fear of causing observable race conditions.
+
+The associated types `Mem` and `Alias` allow implementors to know the register
+width of the memory they describe (`Mem`) and to know the aliasing status of the
+region.
+
+# Generic Programming
+
+Generic programming with associated types is *hard*, especially when using them,
+as in this trait, to implement a closed graph of relationships between types.
+
+For example, this trait is implemented such that for any given type `T`,
+`T::Alias::Mem` == `T::Mem` == `T::NoAlias::Mem`, `T::Alias::Alias == T::Alias`,
+and `T::NoAlias::NoAlias == T::NoAlias`. Unfortunately, the Rust type system
+does not allow these relationships to be described, so generic programming that
+performs type transitions will *rapidly* become uncomfortable to use.
+
+Internally, `bitvec` makes use of type-manipulation functions that are known to
+be correct with respect to the implementations of `BitStore` in order to ease
+implementation of library methods.
+
+You are not expected to do significant programming that is generic over the
+`BitStore` memory parameter. When using a concrete type, the compiler will
+gladly reduce the abstract type associations into their instantiated selections,
+allowing monomorphized code to be *much* more convenient than generic.
+
+If you have a use case that involves generic programming over this trait, and
+you are encountering difficulties dealing with the type associations, please
+file an issue asking for support in this area.
+
+# Supertraits
+
+This trait has trait requirements that better express its behavior:
+
+- `Sealed` prevents it from being implemented by downstream libraries (`Sealed`
+  is a public trait in a private module, that only this crate can name).
+- `Sized` instructs the compiler that values of this type can be used as
+  immediates.
+- `Debug` informs the compiler that other structures using this trait bound can
+  correctly derive `Debug`.
+  **/
+pub trait BitStore: seal::Sealed + Sized + Debug {
+	/// The register type that the implementor describes.
+	type Mem: BitRegister + Into<Self>;
+
+	/// The modifier type over `Self::Mem` used to perform memory access.
+	type Access: BitAccess<Item = Self::Mem>;
+
+	/// A sibling `BitStore` implementor that performs alias-aware memory
+	/// access.
+	///
+	/// While the associated type always has the same `Mem` concrete type as
+	/// `Self`, attempting to encode this requirement as `<Mem = Self::Mem>
+	/// causes Rust to enter an infinite recursion in the trait solver.
+	///
+	/// Instead, the two `Radium` bounds inform the compiler that the `Alias` is
+	/// irradiant over both the current memory and the destination memory types,
+	/// allowing generic type algebra to resolve correctly even though the fact
+	/// that `Radium` is only implemented once is not guaranteed.
+	type Alias: BitStore + Radium<Item = Self::Mem>;
+
+	/// Marker for the thread safety of the implementor.
+	///
+	/// This is necessary because `Cell<T: Send>` is `Send`, but `Cell` does not
+	/// use synchronization instructions and thus cannot be used for aliased
+	/// parallelized memory manipulation.
+	#[doc(hidden)]
+	type Threadsafe;
+
+	/// Require that all implementors are aligned to their width.
+	#[doc(hidden)]
+	const __ALIGNED_TO_SIZE: [(); 0];
+
+	/// Require that the `::Alias` associated type has the same width and
+	/// alignment as `Self`.
+	#[doc(hidden)]
+	const __ALIAS_WIDTH: [(); 0];
+
+	/// Copies a memory element into the caller’s local context.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	///
+	/// # Returns
+	///
+	/// A copy of the value at `*self`.
+	fn load_value(&self) -> Self::Mem;
+
+	/// Fetches the value of one bit in a memory element.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: A bit ordering.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `index`: The semantic index of the bit in `*self` to read.
+	///
+	/// # Returns
+	///
+	/// The value of the bit in `*self` corresponding to `index`.
+	fn get_bit<O>(&self, index: BitIdx<Self::Mem>) -> bool
+	where O: BitOrder {
+		unsafe { BitMask::new(self.load_value()) }.test(index.select::<O>())
+	}
+
+	/// Fetches any number of bits from a memory element.
+	///
+	/// The mask provided to this method must be constructed from indices that
+	/// are valid in the caller’s context. As the mask is already computed by
+	/// the caller, this does not take an ordering type parameter.
+	///
+	/// # Parameters
+	///
+	/// - `&self`
+	/// - `mask`: A mask of any number of bits. This is a selection mask of bits
+	///   to read.
+	///
+	/// # Returns
+	///
+	/// A copy of the memory element at `*self`, with all bits not selected (set
+	/// to `0`) in `mask` erased and all bits selected (set to `1`) in `mask`
+	/// preserved.
+	#[inline]
+	fn get_bits(&self, mask: BitMask<Self::Mem>) -> Self::Mem {
+		self.load_value() & mask.value()
+	}
+}
+
+/// Batch implementation of `BitStore` for appropriate types.
+macro_rules! store {
+	($($t:ty => $a:ty),+ $(,)?) => { $(
+		impl BitStore for $t {
+			/// The unsigned integers will only be `BitStore` type parameters
+			/// for handles to unaliased memory, following the normal Rust
+			/// reference rules.
+			type Access = Cell<Self>;
+
+			/// In atomic builds, use `radium`’s best-effort atomic export.
+			#[cfg(feature = "atomic")]
+			type Alias = $a;
+
+			/// In non-atomic builds, use cell wrappers for aliased access.
+			#[cfg(not(feature = "atomic"))]
+			type Alias = Cell<Self>;
+
+			type Mem = Self;
+
+			#[doc(hidden)]
+			type Threadsafe = Self;
+
+			#[doc(hidden)]
+			const __ALIGNED_TO_SIZE: [(); 0] = [(); mem::aligned_to_size::<Self>()];
+
+			#[doc(hidden)]
+			const __ALIAS_WIDTH: [(); 0] = [(); mem::cmp_layout::<Self::Mem, Self::Alias>()];
+
+			#[inline(always)]
+			fn load_value(&self) -> Self::Mem {
+				*self
+			}
+		}
+
+		#[cfg(feature = "atomic")]
+		impl BitStore for $a {
+			type Access = Self;
+
+			type Alias = Self;
+
+			type Mem = $t;
+
+			#[doc(hidden)]
+			type Threadsafe = Self;
+
+			#[doc(hidden)]
+			const __ALIGNED_TO_SIZE: [(); 0] = [(); mem::aligned_to_size::<Self>()];
+
+			#[doc(hidden)]
+			const __ALIAS_WIDTH: [(); 0] = [(); mem::cmp_layout::<Self::Mem, Self::Alias>()];
+
+			#[inline(always)]
+			fn load_value(&self) -> Self::Mem {
+				Self::load(self, core::sync::atomic::Ordering::Relaxed)
+			}
+		}
+
+		impl seal::Sealed for $t {}
+
+		#[cfg(feature = "atomic")]
+		impl seal::Sealed for $a {}
+	)+ };
+}
+
+store!(
+	u8 => radium::types::RadiumU8,
+	u16 => radium::types::RadiumU16,
+	u32 => radium::types::RadiumU32,
+);
+
+#[cfg(target_pointer_width = "64")]
+store!(u64 => radium::types::RadiumU64);
+
+store!(usize => radium::types::RadiumUsize);
+
+impl<R> BitStore for Cell<R>
+where
+	Self: Radium<Item = R>,
+	R: BitRegister,
+{
+	type Access = Self;
+	type Alias = Self;
+	type Mem = R;
+	/// Raw pointers are never threadsafe, so this prevents handles using
+	/// `Cell<_>` type parameters from crossing thread boundaries.
+	#[doc(hidden)]
+	type Threadsafe = *const Self;
+
+	// If these are true for `R: BitRegister`, then they are true for `Cell<R>`.
+
+	#[doc(hidden)]
+	const __ALIAS_WIDTH: [(); 0] = [];
+	#[doc(hidden)]
+	const __ALIGNED_TO_SIZE: [(); 0] = [];
+
+	#[inline(always)]
+	fn load_value(&self) -> Self::Mem {
+		self.get()
+	}
+}
+
+impl<R> seal::Sealed for Cell<R> where R: BitRegister
+{
+}
+
+#[cfg(not(any(target_pointer_width = "32", target_pointer_width = "64")))]
+compile_fail!(concat!(
+	"This architecture is currently not supported. File an issue at ",
+	env!("CARGO_PKG_REPOSITORY")
+));
+
+/// Enclose the `Sealed` trait against client use.
+mod seal {
+	/// Marker trait to seal `BitStore` against downstream implementation.
+	///
+	/// This trait is public in the module, so that other modules in the crate
+	/// can use it, but so long as it is not exported by the crate root and this
+	/// module is private, this trait effectively forbids downstream
+	/// implementation of the `BitStore` trait.
+	#[doc(hidden)]
+	pub trait Sealed {}
+}
+
+#[cfg(test)]
+#[cfg(not(tarpaulin_include))]
+mod tests {
+	use crate::prelude::*;
+	use core::cell::Cell;
+	use static_assertions::*;
+
+	#[test]
+	fn traits() {
+		//  The integers are threadsafe, as they are known to be unaliased.
+		assert_impl_all!(BitSlice<LocalBits, u8>: Send, Sync);
+		assert_impl_all!(BitSlice<LocalBits, u16>: Send, Sync);
+		assert_impl_all!(BitSlice<LocalBits, u32>: Send, Sync);
+		assert_impl_all!(BitSlice<LocalBits, usize>: Send, Sync);
+
+		#[cfg(target_pointer_width = "64")]
+		assert_impl_all!(BitSlice<LocalBits, u64>: Send, Sync);
+
+		//  The integer alias is threadsafe when atomics are enabled.
+		#[cfg(feature = "atomic")]
+		{
+			assert_impl_all!(BitSlice<LocalBits, <u8 as BitStore>::Alias>: Send, Sync);
+			assert_impl_all!(BitSlice<LocalBits, <u16 as BitStore>::Alias>: Send, Sync);
+			assert_impl_all!(BitSlice<LocalBits, <u32 as BitStore>::Alias>: Send, Sync);
+			assert_impl_all!(BitSlice<LocalBits, <usize as BitStore>::Alias>: Send, Sync);
+
+			#[cfg(target_pointer_width = "64")]
+			assert_impl_all!(BitSlice<LocalBits, <u64 as BitStore>::Alias>: Send, Sync);
+		}
+
+		//  The integer alias is thread unsafe when atomics are disabled.
+		#[cfg(not(feature = "atomic"))]
+		{
+			assert_not_impl_any!(BitSlice<LocalBits, <u8 as BitStore>::Alias>: Send, Sync);
+			assert_not_impl_any!(BitSlice<LocalBits, <u16 as BitStore>::Alias>: Send, Sync);
+			assert_not_impl_any!(BitSlice<LocalBits, <u32 as BitStore>::Alias>: Send, Sync);
+			assert_not_impl_any!(BitSlice<LocalBits, <usize as BitStore>::Alias>: Send, Sync);
+
+			#[cfg(target_pointer_width = "64")]
+			assert_not_impl_any!(BitSlice<LocalBits, <u64 as BitStore>::Alias>: Send, Sync);
+		}
+
+		//  `Cell`s are never threadsafe.
+		assert_not_impl_any!(BitSlice<LocalBits, Cell<u8>>: Send, Sync);
+		assert_not_impl_any!(BitSlice<LocalBits, Cell<u16>>: Send, Sync);
+		assert_not_impl_any!(BitSlice<LocalBits, Cell<u32>>: Send, Sync);
+		assert_not_impl_any!(BitSlice<LocalBits, Cell<usize>>: Send, Sync);
+
+		#[cfg(target_pointer_width = "64")]
+		assert_not_impl_any!(BitSlice<LocalBits, Cell<u64>>: Send, Sync);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/api.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1226 @@
+//! Port of the `Vec<T>` function API.
+
+use crate::{
+	mem::BitMemory,
+	order::BitOrder,
+	pointer::BitPtr,
+	slice::BitSlice,
+	store::BitStore,
+	vec::{
+		iter::{
+			Drain,
+			Splice,
+		},
+		BitVec,
+	},
+};
+
+use alloc::{
+	borrow::ToOwned,
+	boxed::Box,
+	vec::Vec,
+};
+
+use core::{
+	mem,
+	ops::RangeBounds,
+	slice,
+};
+
+use funty::IsInteger;
+
+use tap::{
+	pipe::Pipe,
+	tap::Tap,
+};
+
+impl<O, T> BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Constructs a new, empty `BitVec<O, T>`.
+	///
+	/// The vector will not allocate until bits are pushed into it.
+	///
+	/// # Original
+	///
+	/// [`Vec::new`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.new)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = BitVec::<LocalBits, usize>::new();
+	/// ```
+	#[inline]
+	pub fn new() -> Self {
+		Self {
+			pointer: BitPtr::<T>::EMPTY.to_nonnull(),
+			capacity: 0,
+		}
+	}
+
+	/// Constructs a new, empty `BitVec<O, T>` with the specified capacity.
+	///
+	/// The vector will be able to hold at least `capacity` bits without
+	/// reällocating. If `capacity` is 0, the vector will not allocate.
+	///
+	/// It is important to note that although the returned vector has the
+	/// *capacity* specified, the vector will have a zero *length*. For an
+	/// explanation of the difference between length and capacity, see
+	/// *[Capacity and reällocation]*.
+	///
+	/// # Original
+	///
+	/// [`Vec::with_capacity`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.with_capacity)
+	///
+	/// # Panics
+	///
+	/// Panics if the requested capacity exceeds the vector’s limits.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = BitVec::<LocalBits, usize>::with_capacity(10);
+	///
+	/// // The vector contains no items, even though it has capacity for more
+	/// assert_eq!(bv.len(), 0);
+	///
+	/// // These are all done without reallocating...
+	/// for i in 0..10 {
+	///   bv.push(true);
+	/// }
+	///
+	/// // ...but this may make the vector reallocate
+	/// bv.push(false);
+	/// ```
+	///
+	/// [Capacity and reällocation]: #capacity-and-reallocation
+	#[inline]
+	pub fn with_capacity(capacity: usize) -> Self {
+		assert!(
+			capacity <= BitSlice::<O, T>::MAX_BITS,
+			"Vector capacity exceeded: {} > {}",
+			capacity,
+			BitSlice::<O, T>::MAX_BITS
+		);
+		let vec = capacity
+			.pipe(crate::mem::elts::<T>)
+			.pipe(Vec::<T>::with_capacity);
+		let (ptr, capacity) = (vec.as_ptr(), vec.capacity());
+		mem::forget(vec);
+		ptr.pipe(BitPtr::uninhabited)
+			.pipe(BitPtr::to_nonnull)
+			.pipe(|pointer| Self { pointer, capacity })
+	}
+
+	/// Creates a `BitVec<O, T>` directly from the raw components of another
+	/// bit-vector.
+	///
+	/// # Original
+	///
+	/// [`Vec::from_raw_parts`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.from_raw_parts)
+	///
+	/// # API Differences
+	///
+	/// Ordinary vectors decompose into their buffer pointer and element length
+	/// separately; bit vectors must keep these two components bundled into the
+	/// `*BitSlice` region pointer. As such, this only accepts two components;
+	/// the slice pointer and the buffer capacity.
+	///
+	/// `Vec` could define its raw parts as `*[T]` and `usize` also, but Rust
+	/// does not make working with raw slice pointers easy.
+	///
+	/// # Panics
+	///
+	/// This function panics if `pointer` is the null pointer.
+	///
+	/// # Safety
+	///
+	/// This is highly unsafe, due to the number of invariants that aren’t
+	/// checked:
+	///
+	/// - `pointer` needs to have been previously allocated via `BitVec<O, T>`
+	///   (at least, it’s highly likely to be incorrect if it wasn’t).
+	/// - `T` needs to have the same size and alignment as what `pointer` was
+	///   allocated with. (`T` having a less strict alignment is not sufficient;
+	///   the alignment really needs to be equal to satisfy the [`dealloc`]
+	///   requirement that memory must be allocated and deällocated with the
+	///   same layout.)
+	/// - `capacity` needs to be the capacity that the pointer was allocated
+	///   with.
+	///
+	/// In addition to the invariants inherited from `Vec::from_raw_parts`, the
+	/// fact that this function takes a bit-slice pointer adds another one:
+	///
+	/// - **`pointer` MUST NOT have had its value modified in any way in the**
+	/// **time when it was outside of a `bitvec` container type.**
+	///
+	/// Violating these *will* cause problems like corrupting the allocator’s
+	/// internal data structures. For example it is **not** safe to build a
+	/// `BitVec<_, u8>` from a pointer to a C `char` array with length `size_t`.
+	/// It’s also not safe to build one from a `BitVec<_, u16>` and its length,
+	/// becauset the allocator cares about the alignment, and these two types
+	/// have different alignments. The buffer was allocated with alignment 2
+	/// (for `u16`), but after turning it into a `BitVec<_, u8>`, it’ll be
+	/// deällocated with alignment 1.
+	///
+	/// The ownership of `pointer` is effectively transferred to the `BitVec<O,
+	/// T>` which may then deällocate, reällocate, or change the contents of
+	/// memory pointed to by the pointer at will. Ensure that nothing else uses
+	/// the pointer after calling this function.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// # extern crate core;
+	/// use bitvec::prelude::*;
+	/// use bitvec as bv;
+	/// use core::mem;
+	///
+	/// let bv = bitvec![0, 1, 0, 1];
+	///
+	/// // Prevent running `bv`’s destructor so we are in complete control
+	/// // of the allocation.
+	/// let mut bv = mem::ManuallyDrop::new(bv);
+	///
+	/// // Pull out the various important pieces of information about `bv`
+	/// let p = bv.as_mut_ptr();
+	/// let e = bv.elements();
+	/// let cap = bv.capacity();
+	///
+	/// unsafe {
+	///   let bits = bv::slice::from_raw_parts_mut::<LocalBits, _>(p, e);
+	///   let len = bits.len();
+	///
+	///   // Overwrite memory with a new pattern
+	///   bits.iter_mut().for_each(|mut b| *b = true);
+	///
+	///   // Put everything back together into a BitVec
+	///   let rebuilt = BitVec::from_raw_parts(bits as *mut _, cap);
+	///   assert_eq!(rebuilt.len(), len);
+	/// }
+	/// ```
+	#[inline]
+	pub unsafe fn from_raw_parts(
+		pointer: *mut BitSlice<O, T>,
+		capacity: usize,
+	) -> Self
+	{
+		if (pointer as *mut [()]).is_null() {
+			panic!("Attempted to reconstruct a `BitVec` from a null pointer");
+		}
+		pointer
+			.pipe(BitPtr::from_bitslice_ptr_mut)
+			.to_nonnull()
+			.pipe(|pointer| Self { pointer, capacity })
+	}
+
+	/// Returns the number of bits the vector can hold without reällocating.
+	///
+	/// # Original
+	///
+	/// [`Vec::capacity`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.capacity)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv: BitVec<LocalBits, usize> = BitVec::with_capacity(100);
+	/// assert!(bv.capacity() >= 100);
+	/// ```
+	#[inline]
+	pub fn capacity(&self) -> usize {
+		self.capacity
+			.checked_mul(T::Mem::BITS as usize)
+			.expect("Vector capacity exceeded")
+			//  Don’t forget to subtract any dead bits in the front of the base!
+			//  This has to be saturating, becase a non-zero head on a zero
+			//  capacity underflows.
+			.saturating_sub(self.bitptr().head().value() as usize)
+	}
+
+	/// Reserves capacity for at least `additional` more bits to be inserted in
+	/// the given `BitVec<O, T>`. The collection may reserve more space to avoid
+	/// frequent reällocations. After calling `reserve`, capacity will be
+	/// greater than or equal to `self.len() + additional`. Does nothing if
+	/// capacity is already sufficient.
+	///
+	/// # Original
+	///
+	/// [`Vec::reserve`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.reserve)
+	///
+	/// # Panics
+	///
+	/// Panics if the new capacity exceeds the vector’s limits.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![1];
+	/// bv.reserve(100);
+	/// assert!(bv.capacity() >= 101);
+	/// ```
+	#[inline]
+	pub fn reserve(&mut self, additional: usize) {
+		let len = self.len();
+		let new_len = len
+			.checked_add(additional)
+			.expect("Vector capacity exceeded");
+		assert!(
+			new_len <= BitSlice::<O, T>::MAX_BITS,
+			"Vector capacity exceeded: {} > {}",
+			new_len,
+			BitSlice::<O, T>::MAX_BITS
+		);
+		let bitptr = self.bitptr();
+		let head = bitptr.head();
+		let elts = bitptr.elements();
+		//  Only reserve if the request needs new elements.
+		if let Some(extra) = head.span(new_len).0.checked_sub(elts) {
+			self.with_vec(|v| v.reserve(extra));
+			let capa = self.capacity();
+			//  Zero the newly-reserved buffer.
+			unsafe { self.get_unchecked_mut(len .. capa) }.set_all(false);
+		}
+	}
+
+	/// Reserves the minimum capacity for exactly `additional` more bits to be
+	/// inserted in the given `BitVec<O, T>`. After calling `reserve_exact`,
+	/// capacity will be greater than or equal to `self.len() + additional`.
+	/// Does nothing if the capacity is already sufficient.
+	///
+	/// Note that the allocator may give the collection more space than it
+	/// requests. Therefore, capacity can not be relied upon to be precisely
+	/// minimal. Prefer `reserve` if future insertions are expected.
+	///
+	/// # Original
+	///
+	/// [`Vec::reserve_exact`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.reserve_exact)
+	///
+	/// # Panics
+	///
+	/// Panics if the new capacity exceeds the vector’s limits.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![1];
+	/// bv.reserve_exact(100);
+	/// assert!(bv.capacity() >= 101);
+	/// ```
+	#[inline]
+	pub fn reserve_exact(&mut self, additional: usize) {
+		let new_len = self
+			.len()
+			.checked_add(additional)
+			.expect("Vector capacity exceeded");
+		assert!(
+			new_len <= BitSlice::<O, T>::MAX_BITS,
+			"Vector capacity exceeded: {} > {}",
+			new_len,
+			BitSlice::<O, T>::MAX_BITS
+		);
+		let bitptr = self.bitptr();
+		let head = bitptr.head();
+		let elts = bitptr.elements();
+		//  Only reserve if the request needs new elements.
+		if let Some(extra) = head.span(new_len).0.checked_sub(elts) {
+			self.with_vec(|v| v.reserve_exact(extra));
+		}
+	}
+
+	/// Shrinks the capacity of the vector as much as possible.
+	///
+	/// It will drop down as close as possible to the length but the allocator
+	/// may still inform the vector that there is space for a few more bits.
+	///
+	/// # Original
+	///
+	/// [`Vec::shrink_to_fit`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.shrink_to_fit)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = BitVec::<LocalBits, usize>::with_capacity(100);
+	/// bv.extend([false, true, false].iter().copied());
+	/// assert!(bv.capacity() >= 100);
+	/// bv.shrink_to_fit();
+	/// assert!(bv.capacity() >= 3);
+	/// ```
+	#[inline]
+	pub fn shrink_to_fit(&mut self) {
+		self.with_vec(|v| v.shrink_to_fit());
+	}
+
+	/// Converts the vector into [`Box<[T]>`].
+	///
+	/// Note that this will drop any excess capacity.
+	///
+	/// # Original
+	///
+	/// [`Vec::into_boxed_slice`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.into_boxed_slice)
+	///
+	/// # Analogue
+	///
+	/// See [`into_boxed_bitslice`] for a `BitVec -> BitBox` transform.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = bitvec![0, 1, 0];
+	///
+	/// let slice = bv.into_boxed_slice();
+	/// assert_eq!(slice.len(), 1);
+	/// ```
+	///
+	/// Any excess capacity is removed:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv: BitVec = BitVec::with_capacity(100);
+	/// bv.extend([false, true, false].iter().copied());
+	///
+	/// assert!(bv.capacity() >= 100);
+	/// let slice = bv.into_boxed_slice();
+	/// assert_eq!(slice.into_vec().capacity(), 1);
+	/// ```
+	///
+	/// [`Box<[T]>`]: https://doc.rust-lang.org/alloc/boxed/struct.Box.html
+	/// [`into_boxed_bitslice`]: #method.into_boxed_bitslice
+	#[inline]
+	pub fn into_boxed_slice(self) -> Box<[T]> {
+		self.into_vec().into_boxed_slice()
+	}
+
+	/// Shortens the vector, keeping the first `len` bits and dropping the rest.
+	///
+	/// If `len` is greater than the vector’s current length, this has no
+	/// effect.
+	///
+	/// The [`drain`] method can emulate `truncate`, but causes the excess bits
+	/// to be returned instead of dropped.
+	///
+	/// Note that this method has no effect on the allocated capacity of the
+	/// vector, **nor does it erase truncated memory**. Bits in the allocated
+	/// memory that are outside of the `.as_bitslice()` view always have
+	/// **unspecified** values, and cannot be relied upon to be zero.
+	///
+	/// # Original
+	///
+	/// [`Vec::truncate`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.truncate)
+	///
+	/// # Examples
+	///
+	/// Truncating a five bit vector to two bits:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![1; 5];
+	/// bv.truncate(2);
+	/// assert_eq!(bv.len(), 2);
+	/// assert!(bv.as_slice()[0].count_ones() >= 5);
+	/// ```
+	///
+	/// No truncation occurs when `len` is greater than the vector’s current
+	/// length:
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![1; 3];
+	/// bv.truncate(8);
+	/// assert_eq!(bv.len(), 3);
+	/// ```
+	///
+	/// Truncating when `len == 0` is equivalent to calling the [`clear`]
+	/// method.
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0; 3];
+	/// bv.truncate(0);
+	/// assert!(bv.is_empty());
+	/// ```
+	///
+	/// [`clear`]: #method.clear
+	/// [`drain`]: #method.drain
+	#[inline]
+	pub fn truncate(&mut self, len: usize) {
+		if len < self.len() {
+			unsafe { self.set_len(len) }
+		}
+	}
+
+	/// Extracts an element slice containing the entire vector.
+	///
+	/// # Original
+	///
+	/// [`Vec::as_slice`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.as_slice)
+	///
+	/// # Analogue
+	///
+	/// See [`as_bitslice`] for a `&BitVec -> &BitSlice` transform.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// # #[cfg(feature = "std")] {
+	/// use bitvec::prelude::*;
+	/// use std::io::{self, Write};
+	/// let buffer = bitvec![Msb0, u8; 0, 1, 0, 1, 1, 0, 0, 0];
+	/// io::sink().write(buffer.as_slice()).unwrap();
+	/// # }
+	/// ```
+	///
+	/// [`as_bitslice`]: #method.as_bitslice
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_slice(&self) -> &[T] {
+		let bitptr = self.bitptr();
+		let (base, elts) = (bitptr.pointer().to_const(), bitptr.elements());
+		unsafe { slice::from_raw_parts(base, elts) }
+	}
+
+	/// Extracts a mutable slice of the entire vector.
+	///
+	/// # Original
+	///
+	/// [`Vec::as_mut_slice`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.as_mut_slice)
+	///
+	/// # Analogue
+	///
+	/// See [`as_mut_bitslice`] for a `&mut BitVec -> &mut BitSlice` transform.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// # #[cfg(feature = "std")] {
+	/// use bitvec::prelude::*;
+	/// use std::io::{self, Read};
+	/// let mut buffer = bitvec![Msb0, u8; 0; 24];
+	/// io::repeat(0b101).read_exact(buffer.as_mut_slice()).unwrap();
+	/// # }
+	/// ```
+	///
+	/// [`as_mut_bitslice`]: #method.as_mut_bitslice
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_slice(&mut self) -> &mut [T] {
+		let bitptr = self.bitptr();
+		let (base, elts) = (bitptr.pointer().to_mut(), bitptr.elements());
+		unsafe { slice::from_raw_parts_mut(base, elts) }
+	}
+
+	/// Returns a raw pointer to the vector’s buffer.
+	///
+	/// The caller must ensure that the vector outlives the pointer this
+	/// function returns, or else it will end up pointing to garbage. Modifying
+	/// the vector may cause its buffer to be reällocated, which would also make
+	/// any pointers to it invalid.
+	///
+	/// The caller must also ensure that the memory the pointer
+	/// (non-transitively) points to is never written to (except inside an
+	/// `UnsafeCell`) using this pointer or any pointer derived from it. If you
+	/// need to mutate the contents of the slice, use [`as_mut_ptr`].
+	///
+	/// # Original
+	///
+	/// [`Vec::as_ptr`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.as_ptr)
+	///
+	/// # Analogue
+	///
+	/// See [`as_bitptr`] for a `&BitVec -> *const BitSlice` transform.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = bitvec![Lsb0; 0, 1, 0, 1];
+	/// let bv_ptr = bv.as_ptr();
+	///
+	/// unsafe {
+	///   assert_eq!(*bv_ptr, 0b1010);
+	/// }
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_ptr(&self) -> *const T {
+		self.bitptr().pointer().to_const()
+	}
+
+	/// Returns an unsafe mutable pointer to the vector’s buffer.
+	///
+	/// The caller must ensure that the vector outlives the pointer this
+	/// function returns, or else it will end up pointing to garbage. Modifying
+	/// the vector may cause its buffer to be reällocated, which would also make
+	/// any pointers to it invalid.
+	///
+	/// # Original
+	///
+	/// [`Vec::as_mut_ptr`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.as_mut_ptr)
+	///
+	/// # Analogue
+	///
+	/// See [`as_mut_bitptr`] for a `&mut BitVec -> *mut BitSlice` transform.
+	///
+	/// # Eaxmples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let size = 4;
+	/// let mut bv: BitVec<Msb0, usize> = BitVec::with_capacity(size);
+	/// let bv_ptr = bv.as_mut_ptr();
+	///
+	/// unsafe {
+	///   *bv_ptr = !0;
+	///   bv.set_len(size);
+	/// }
+	/// assert_eq!(bv.len(), 4);
+	/// assert!(bv.all());
+	/// ```
+	///
+	/// [`as_mut_bitptr`]: #method.as_mut_bitptr
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_ptr(&mut self) -> *mut T {
+		self.bitptr().pointer().to_mut()
+	}
+
+	/// Forces the length of the vector to `new_len`.
+	///
+	/// This is a low-level operation that maintains none of the normal
+	/// invariants of the type. Normally changing the length of a vector is done
+	/// using one of the safe operations instead, such as [`truncate`],
+	/// [`resize`], [`extend`], or [`clear`].
+	///
+	/// # Original
+	///
+	/// [`Vec::set_len`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.set_len)
+	///
+	/// # Safety
+	///
+	/// - `new_len` must be less than or equal to [`capacity()`].
+	///
+	/// # Examples
+	///
+	/// This method can be useful for situations in which the vector is serving
+	/// as a buffer for other code, particularly over FFI:
+	///
+	/// ```rust
+	/// # #![allow(dead_code)]
+	/// # #![allow(improper_ctypes)]
+	/// # const ERL_OK: i32 = 0;
+	/// # extern "C" {
+	/// #   fn erl_read_bits(
+	/// #     bv: *mut BitVec<Msb0, u8>,
+	/// #     bits_reqd: usize,
+	/// #     bits_read: *mut usize,
+	/// #   ) -> i32;
+	/// # }
+	/// use bitvec::prelude::*;
+	///
+	/// // `bitvec` could pair with `rustler` for a better bitstream
+	/// type ErlBitstring = BitVec<Msb0, u8>;
+	/// # pub fn _test() {
+	/// let mut bits_read = 0;
+	/// // An imaginary Erlang function wants a large bit buffer.
+	/// let mut buf = ErlBitstring::with_capacity(32_768);
+	/// // SAFETY: When `erl_read_bits` returns `ERL_OK`, it holds that:
+	/// // 1. `bits_read` bits were initialized.
+	/// // 2. `bits_read` <= the capacity (32_768)
+	/// // which makes `set_len` safe to call.
+	/// unsafe {
+	///   // Make the FFI call...
+	///   let status = erl_read_bits(&mut buf, 10, &mut bits_read);
+	///   if status == ERL_OK {
+	///     // ...and update the length to what was read in.
+	///     buf.set_len(bits_read);
+	///   }
+	/// }
+	/// # }
+	/// ```
+	///
+	/// [`capacity()`]: #method.capacity
+	/// [`clear`]: #method.clear
+	/// [`extend`]: #method.extend
+	/// [`resize`]: #method.resize
+	/// [`truncate`]: #method.truncate
+	#[inline]
+	pub unsafe fn set_len(&mut self, new_len: usize) {
+		assert!(
+			new_len <= BitPtr::<T>::REGION_MAX_BITS,
+			"Capacity exceeded: {} exceeds maximum length {}",
+			new_len,
+			BitPtr::<T>::REGION_MAX_BITS,
+		);
+		let cap = self.capacity();
+		assert!(
+			new_len <= cap,
+			"Capacity exceeded: {} exceeds allocation size {}",
+			new_len,
+			cap,
+		);
+		self.pointer = self
+			.pointer
+			.as_ptr()
+			.pipe(BitPtr::from_bitslice_ptr_mut)
+			.tap_mut(|bp| bp.set_len(new_len))
+			.to_nonnull()
+	}
+
+	/// Removes a bit from the vector and returns it.
+	///
+	/// The removed bit is replaced by the last bit of the vector.
+	///
+	/// This does not preserve ordering, but is O(1).
+	///
+	/// # Original
+	///
+	/// [`Vec::swap_remove`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.swap_remove)
+	///
+	/// # Panics
+	///
+	/// Panics if `index` is out of bounds.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 0, 1, 0, 1];
+	/// assert!(!bv.swap_remove(1));
+	/// assert_eq!(bv, bits![0, 1, 1, 0]);
+	///
+	/// assert!(!bv.swap_remove(0));
+	/// assert_eq!(bv, bits![0, 1, 1]);
+	/// ```
+	#[inline]
+	pub fn swap_remove(&mut self, index: usize) -> bool {
+		let len = self.len();
+		assert!(index < len, "Index {} out of bounds: {}", index, len);
+		let last = len - 1;
+		//  TODO(myrrlyn): Implement `BitSlice::xchg`?
+		unsafe {
+			self.swap_unchecked(index, last);
+			self.set_len(last);
+			*self.get_unchecked(last)
+		}
+	}
+
+	/// Inserts a bit at position `index` within the vector, shifting all bits
+	/// after it to the right.
+	///
+	/// # Original
+	///
+	/// [`Vec::insert`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.insert)
+	///
+	/// # Panics
+	///
+	/// Panics if `index > len`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0; 5];
+	/// bv.insert(4, true);
+	/// assert_eq!(bv, bits![0, 0, 0, 0, 1, 0]);
+	/// bv.insert(2, true);
+	/// assert_eq!(bv, bits![0, 0, 1, 0, 0, 1, 0]);
+	/// ```
+	#[inline]
+	pub fn insert(&mut self, index: usize, value: bool) {
+		let len = self.len();
+		assert!(index <= len, "Index {} out of bounds: {}", index, len);
+		self.push(value);
+		unsafe { self.get_unchecked_mut(index ..) }.rotate_right(1);
+	}
+
+	/// Removes and returns the bit at position `index` within the vector,
+	/// shifting all bits after it to the left.
+	///
+	/// # Original
+	///
+	/// [`Vec::remove`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.remove)
+	///
+	/// # Panics
+	///
+	/// Panics if `index` is out of bounds.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 1, 0];
+	/// assert!(bv.remove(1));
+	/// assert_eq!(bv, bits![0, 0]);
+	/// ```
+	#[inline]
+	pub fn remove(&mut self, index: usize) -> bool {
+		let len = self.len();
+		assert!(index < len, "Index {} out of bounds: {}", index, len);
+		let last = len - 1;
+		unsafe {
+			self.get_unchecked_mut(index ..).rotate_left(1);
+			self.set_len(last);
+			*self.get_unchecked(last)
+		}
+	}
+
+	/// Retains only the bits specified by the predicate.
+	///
+	/// In other words, remove all bits `b` such that `func(idx(b), &b)` returns
+	/// `false`. This method operates in place, visiting each bit exactly once
+	/// in the original order, and preserves the order of the retained bits.
+	///
+	/// # Original
+	///
+	/// [`Vec::retain`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.retain)
+	///
+	/// # API Differences
+	///
+	/// In order to allow more than one bit of information for the split
+	/// decision, the predicate receives the index of each bit, as well as its
+	/// value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 1, 1, 0, 0, 1];
+	/// bv.retain(|i, b| (i % 2 == 0) ^ b);
+	/// assert_eq!(bv, bits![0, 1, 0, 1]);
+	/// ```
+	#[inline]
+	pub fn retain<F>(&mut self, mut func: F)
+	where F: FnMut(usize, &bool) -> bool {
+		for n in (0 .. self.len()).rev() {
+			if !func(n, unsafe { self.get_unchecked(n) }) {
+				self.remove(n);
+			}
+		}
+	}
+
+	/// Appends a bit to the back of a collection.
+	///
+	/// # Original
+	///
+	/// [`Vec::push`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.push)
+	///
+	/// # Panics
+	///
+	/// Panics if the number of bits in the vector exceeds the maximum vector
+	/// capacity.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 0];
+	/// bv.push(true);
+	/// assert_eq!(bv.count_ones(), 1);
+	/// ```
+	#[inline]
+	pub fn push(&mut self, value: bool) {
+		let len = self.len();
+		assert!(
+			len <= BitSlice::<O, T>::MAX_BITS,
+			"Exceeded capacity: {} >= {}",
+			len,
+			BitSlice::<O, T>::MAX_BITS,
+		);
+		if self.is_empty() || self.bitptr().tail().value() == T::Mem::BITS {
+			self.with_vec(|v| v.push(T::Mem::ZERO));
+		}
+		unsafe {
+			self.pointer = self
+				.pointer
+				.as_ptr()
+				.pipe(BitPtr::from_bitslice_ptr_mut)
+				.tap_mut(|bp| bp.set_len(len + 1))
+				.to_nonnull();
+			self.set_unchecked(len, value);
+		}
+	}
+
+	/// Removes the last bit from a vector and returns it, or [`None`] if it is
+	/// empty.
+	///
+	/// # Original
+	///
+	/// [`Vec::pop`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.pop)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 0, 1];
+	/// assert_eq!(bv.pop(), Some(true));
+	/// assert!(bv.not_any());
+	/// ```
+	///
+	/// [`None`]: https://doc.rust-lang.org/core/option/enum.Option.html#variant.None
+	#[inline]
+	pub fn pop(&mut self) -> Option<bool> {
+		match self.len() {
+			0 => None,
+			n => unsafe {
+				let m = n - 1;
+				(*self.get_unchecked(m)).tap(|_| self.set_len(m)).pipe(Some)
+			},
+		}
+	}
+
+	/// Moves all the bits of `other` into `self`, leaving `other` empty.
+	///
+	/// # Original
+	///
+	/// [`Vec::append`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.append)
+	///
+	/// # Panics
+	///
+	/// Panics if the number of bits overflows the maximum vector capacity.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv1 = bitvec![0; 10];
+	/// let mut bv2 = bitvec![1; 10];
+	///
+	/// bv1.append(&mut bv2);
+	///
+	/// assert_eq!(bv1.count_ones(), 10);
+	/// assert!(bv2.is_empty());
+	/// ```
+	#[inline]
+	pub fn append<O2, T2>(&mut self, other: &mut BitVec<O2, T2>)
+	where
+		O2: BitOrder,
+		T2: BitStore,
+	{
+		self.extend(other.iter().copied());
+		other.clear();
+	}
+
+	/// Creates a draining iterator that removes the specified range in the
+	/// vector and yields the removed items.
+	///
+	/// Note 1: The bit range is removed even if the iterator is only partially
+	/// consumed or not consumed at all.
+	///
+	/// Note 2: It is unspecified how many bits are removed from the vector if
+	/// the `Drain` value is leaked.
+	///
+	/// # Original
+	///
+	/// [`Vec::drain`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.drain)
+	///
+	/// # Panics
+	///
+	/// Panics if the starting point is greater than the end point or if the end
+	/// point is greater than the length of the vector.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 1, 1];
+	/// let bv2: BitVec = bv.drain(1 ..).collect();
+	/// assert_eq!(bv, bits![0]);
+	/// assert_eq!(bv2, bits![1, 1]);
+	///
+	/// // A full range clears the vector
+	/// bv.drain(..);
+	/// assert_eq!(bv, bits![]);
+	/// ```
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn drain<R>(&mut self, range: R) -> Drain<O, T>
+	where R: RangeBounds<usize> {
+		Drain::new(self, range)
+	}
+
+	/// Clears the vector, removing all values.
+	///
+	/// Note that this method has no effect on the allocated capacity of the
+	/// vector.
+	///
+	/// # Original
+	///
+	/// [`Vec::clear`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.clear)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 1, 0, 1];
+	///
+	/// bv.clear();
+	///
+	/// assert!(bv.is_empty());
+	/// ```
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	pub fn clear(&mut self) {
+		unsafe {
+			self.set_len(0);
+		}
+	}
+
+	/// Splits the collection into two at the given index.
+	///
+	/// Returns a newly allocated vector containing the elements in range `[at,
+	/// len)`. After the call, the original vector will be left containing the
+	/// bits `[0, at)` with its previous capacity unchanged.
+	///
+	/// # Original
+	///
+	/// [`Vec::split_off`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.split_off)
+	///
+	/// # Panics
+	///
+	/// Panics if `at > len`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 0, 1];
+	/// let bv2 = bv.split_off(1);
+	/// assert_eq!(bv, bits![0]);
+	/// assert_eq!(bv2, bits![0, 1]);
+	/// ```
+	#[inline]
+	pub fn split_off(&mut self, at: usize) -> Self {
+		let len = self.len();
+		assert!(at <= len, "Index {} out of bounds: {}", at, len);
+		match at {
+			0 => mem::replace(self, Self::with_capacity(self.capacity())),
+			n if n == len => Self::new(),
+			_ => unsafe {
+				self.set_len(at);
+				self.get_unchecked(at .. len).to_owned()
+			},
+		}
+	}
+
+	/// Resizes the `BitVec` in-place so that `len` is equal to `new_len`.
+	///
+	/// If `new_len` is greater than `len`, the `BitVec` is extended by the
+	/// difference, with each additional slot filled with the result of calling
+	/// the closure `func`. The return values from `func` will end up in the
+	/// `BitVec` in the order they have been generated.
+	///
+	/// If `new_len` is less than `len`, the `Vec` is simply truncated.
+	///
+	/// This method uses a closure to create new values on every push. If you’d
+	/// rather [`Clone`] a given bit, use [`resize`]. If you want to use the
+	/// [`Default`] trait to generate values, you can pass [`Default::default`]
+	/// as the second argument.
+	///
+	/// # Original
+	///
+	/// [`Vec::resize_with`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.resize_with)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![1; 3];
+	/// bv.resize_with(5, Default::default);
+	/// assert_eq!(bv, bits![1, 1, 1, 0, 0]);
+	///
+	/// let mut bv = bitvec![];
+	/// let mut p = 0;
+	/// bv.resize_with(4, || { p += 1; p % 2 == 0 });
+	/// assert_eq!(bv, bits![0, 1, 0, 1]);
+	/// ```
+	///
+	/// [`Clone`]: https://doc.rust-lang.org/std/clone/trait.Clone.html
+	/// [`Default`]: https://doc.rust-lang.org/std/default/trait.Default.html
+	/// [`Default::default`]: https://doc.rust-lang.org/std/default/trait.Default.html#tymethod.default
+	/// [`resize`]: #method.resize
+	#[inline]
+	pub fn resize_with<F>(&mut self, new_len: usize, mut func: F)
+	where F: FnMut() -> bool {
+		let len = self.len();
+		if new_len > len {
+			let ext = new_len - len;
+			self.reserve(ext);
+			unsafe {
+				self.get_unchecked_mut(len .. new_len)
+					.for_each(|_, _| func());
+			}
+		}
+		unsafe {
+			self.set_len(new_len);
+		}
+	}
+
+	/// Resizes the `BitVec` in-place so that `len` is equal to `new_len`.
+	///
+	/// If `new_len` is greater than `len`, the `BitVec` is extended by the
+	/// difference, with each additional slot filled with `value`. If `new_len`
+	/// is less than `len`, the `BitVec` is simply truncated.
+	///
+	/// This method requires a single `bool` value. If you need more
+	/// flexibility, use [`resize_with`].
+	///
+	/// # Original
+	///
+	/// [`Vec::resize`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.resize)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![1];
+	/// bv.resize(3, false);
+	/// assert_eq!(bv, bits![1, 0, 0]);
+	///
+	/// let mut bv = bitvec![1; 4];
+	/// bv.resize(2, false);
+	/// assert_eq!(bv, bits![1; 2]);
+	/// ```
+	///
+	/// [`resize_with`]: #method.resize_with
+	#[inline]
+	pub fn resize(&mut self, new_len: usize, value: bool) {
+		let len = self.len();
+		if new_len > len {
+			let ext = new_len - len;
+			self.reserve(ext);
+			/* Initialize all of the newly-allocated memory, not just the bits
+			that will become live. This is a requirement for correctness.
+
+			*Strictly speaking*, only `len .. ⌈new_len / bit_width⌉` needs to be
+			initialized, but computing the correct boundary is probably not
+			sufficiently less effort than just initializing the complete
+			allocation to be worth the instructions. If users complain about
+			performance on this method, revisit this decision, but if they don’t
+			then the naïve solution is fine.
+			*/
+			let capa = self.capacity();
+			unsafe {
+				self.get_unchecked_mut(len .. capa).set_all(value);
+			}
+		}
+		unsafe {
+			self.set_len(new_len);
+		}
+	}
+
+	/// Clones and appends all `bool`s in a slice to the `BitVec`.
+	///
+	/// Iterates over the slice `other`, clones each `bool`, and then appends it
+	/// to the `BitVec`. The `other` slice is traversed in-order.
+	///
+	/// Prefer the [`Extend`] implementation; this method is retained only for
+	/// API compatibility, and offers no performance benefit.
+	///
+	/// # Original
+	///
+	/// [`Vec::extend_from_slice`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.extend_from_slice)
+	///
+	/// # Analogue
+	///
+	/// See [`extend_from_bitslice`] for the method to append a bit-slice of the
+	/// same type parameters to a bit-vector.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0];
+	/// bv.extend_from_slice(&[true]);
+	/// assert_eq!(bv, bits![0, 1]);
+	/// ```
+	///
+	/// [`extend`]: #impl-Extend<%26'a bool>
+	/// [`extend_from_bitslice`]: #method.extend_from_bitslice
+	#[cfg_attr(not(tarpaulin), inline(always))]
+	pub fn extend_from_slice(&mut self, other: &[bool]) {
+		self.extend(other)
+	}
+
+	/// Creates a splicing iterator that replaces the specified range in the
+	/// vector with the given `replace_with` iterator and yields the removed
+	/// items. `replace_with` does not need to be the same length as `range`.
+	///
+	/// The element range is removed even if the iterator is not consumed until
+	/// the end.
+	///
+	/// It is unspecified how many bits are removed from the vector if the
+	/// `Splice` value is leaked.
+	///
+	/// The input iterator `replace_with` is only consumed when the `Splice`
+	/// value is dropped.
+	///
+	/// This is optimal if:
+	///
+	/// - the tail (bits in the vector after `range`) is empty
+	/// - or `replace_with` yields fewer bits than `range`’s length
+	/// - or the lower bound of its `size_hint()` is exact
+	///
+	/// Otherwise, a temporary vector is allocated and the tail is moved twice.
+	///
+	/// # Original
+	///
+	/// [`Vec::splice`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.splice)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 1, 0];
+	/// let new = bits![1, 0];
+	/// let old: BitVec = bv.splice(.. 2, new.iter().copied()).collect();
+	/// assert_eq!(bv, bits![1, 0, 0]);
+	/// assert_eq!(old, bits![0, 1]);
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn splice<R, I>(
+		&mut self,
+		range: R,
+		replace_with: I,
+	) -> Splice<O, T, I::IntoIter>
+	where
+		R: RangeBounds<usize>,
+		I: IntoIterator<Item = bool>,
+	{
+		Splice::new(self.drain(range), replace_with)
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/iter.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,832 @@
+//! `BitVec` iterators
+
+use crate::{
+	devel as dvl,
+	order::BitOrder,
+	slice::{
+		BitSlice,
+		Iter,
+	},
+	store::BitStore,
+	vec::BitVec,
+};
+
+use core::{
+	fmt::{
+		self,
+		Debug,
+		Formatter,
+	},
+	iter::{
+		FromIterator,
+		FusedIterator,
+	},
+	mem,
+	ops::{
+		Range,
+		RangeBounds,
+	},
+	ptr::NonNull,
+};
+
+use tap::{
+	pipe::Pipe,
+	tap::TapOptional,
+};
+
+impl<O, T> Extend<bool> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn extend<I>(&mut self, iter: I)
+	where I: IntoIterator<Item = bool> {
+		let mut iter = iter.into_iter();
+		match iter.size_hint() {
+			(n, None) | (_, Some(n)) => {
+				// This body exists to try to accelerate the push-per-bit loop.
+				self.reserve(n);
+				let len = self.len();
+				let new_len = len + n;
+				let new = unsafe { self.get_unchecked_mut(len .. new_len) };
+				let mut pulled = 0;
+				for (slot, bit) in new.iter_mut().zip(iter.by_ref()) {
+					slot.set(bit);
+					pulled += 1;
+				}
+				unsafe {
+					self.set_len(len + pulled);
+				}
+			},
+		}
+		iter.for_each(|bit| self.push(bit));
+	}
+}
+
+impl<'a, O, T> Extend<&'a bool> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn extend<I>(&mut self, iter: I)
+	where I: IntoIterator<Item = &'a bool> {
+		self.extend(iter.into_iter().copied());
+	}
+}
+
+impl<O, T> FromIterator<bool> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn from_iter<I>(iter: I) -> Self
+	where I: IntoIterator<Item = bool> {
+		let iter = iter.into_iter();
+		let mut out = match iter.size_hint() {
+			(n, None) | (_, Some(n)) => Self::with_capacity(n),
+		};
+		out.extend(iter);
+		out
+	}
+}
+
+impl<'a, O, T> FromIterator<&'a bool> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn from_iter<I>(iter: I) -> Self
+	where I: IntoIterator<Item = &'a bool> {
+		iter.into_iter().copied().pipe(Self::from_iter)
+	}
+}
+
+impl<O, T> IntoIterator for BitVec<O, T>
+where
+	O: 'static + BitOrder,
+	T: 'static + BitStore,
+{
+	type IntoIter = IntoIter<O, T>;
+	type Item = bool;
+
+	#[inline]
+	fn into_iter(self) -> Self::IntoIter {
+		IntoIter {
+			iter: self.as_bitslice().bitptr().to_bitslice_ref().iter(),
+			_bv: self,
+		}
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, T> IntoIterator for &'a BitVec<O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	type IntoIter = <&'a BitSlice<O, T> as IntoIterator>::IntoIter;
+	type Item = <&'a BitSlice<O, T> as IntoIterator>::Item;
+
+	#[inline]
+	fn into_iter(self) -> Self::IntoIter {
+		self.as_bitslice().into_iter()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, T> IntoIterator for &'a mut BitVec<O, T>
+where
+	O: 'a + BitOrder,
+	T: 'a + BitStore,
+{
+	type IntoIter = <&'a mut BitSlice<O, T> as IntoIterator>::IntoIter;
+	type Item = <&'a mut BitSlice<O, T> as IntoIterator>::Item;
+
+	#[inline]
+	fn into_iter(self) -> Self::IntoIter {
+		self.as_mut_bitslice().into_iter()
+	}
+}
+
+/** An iterator that moves out of a vector.
+
+This `struct` is created by the `into_iter` method on [`BitVec`] (provided by
+the [`IntoIterator`] trait).
+
+# Original
+
+[`vec::IntoIter`](https://doc.rust-lang.org/alloc/vec/struct.IntoIter.html)
+
+# API Differences
+
+This explicitly requires that `O` and `T` type parameters are `'static`, which
+is not a bound present in the original. However, it is always *true*, so it will
+not cause a compilation error.
+
+[`BitVec`]: struct.BitVec.html
+[`IntoIterator`]: https://doc.rust-lang.org/core/iter/trait.IntoIterator.html
+**/
+#[derive(Clone, Debug)]
+pub struct IntoIter<O, T>
+where
+	O: 'static + BitOrder,
+	T: 'static + BitStore,
+{
+	/// Take ownership of the vector for destruction.
+	_bv: BitVec<O, T>,
+	/// Use `BitSlice` iteration processes. This requires a `'static` lifetime,
+	/// since it cannot borrow from itself.
+	iter: Iter<'static, O, T>,
+}
+
+impl<O, T> IntoIter<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Returns the remaining bits of this iterator as a bitslice.
+	///
+	/// # Original
+	///
+	/// [`vec::IntoIter::as_slice`](https://doc.rust-lang.org/alloc/vec/struct.IntoIter.html#method.as_slice)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = bitvec![0, 1, 0, 1];
+	/// let mut into_iter = bv.into_iter();
+	/// assert_eq!(into_iter.as_bitslice(), bits![0, 1, 0, 1]);
+	/// let _ = into_iter.next().unwrap();
+	/// assert_eq!(into_iter.as_bitslice(), bits![1, 0, 1]);
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_bitslice(&self) -> &BitSlice<O, T> {
+		self.iter.as_bitslice()
+	}
+
+	#[doc(hidden)]
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(
+		note = "Use `.as_bitslice()` on iterators to view the remaining data."
+	)]
+	pub fn as_slice(&self) -> &BitSlice<O, T> {
+		self.as_bitslice()
+	}
+
+	/// Returns the remaining bits of this iterator as a mutable slice.
+	///
+	/// # Original
+	///
+	/// [`vec::IntoIter::as_mut_slice`](https://doc.rust-lang.org/alloc/vec/struct.IntoIter.html#method.as_mut_slice)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = bitvec![0, 1, 0, 1];
+	/// let mut into_iter = bv.into_iter();
+	/// assert_eq!(into_iter.as_bitslice(), bits![0, 1, 0, 1]);
+	/// into_iter.as_mut_bitslice().set(2, true);
+	/// assert!(!into_iter.next().unwrap());
+	/// assert!(into_iter.next().unwrap());
+	/// assert!(into_iter.next().unwrap());
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_bitslice(&mut self) -> &mut BitSlice<O, T> {
+		self.iter.as_bitslice().bitptr().to_bitslice_mut()
+	}
+
+	#[cfg_attr(not(tarpaulin_include), inline(always))]
+	#[doc(hidden)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(note = "Use `.as_mut_bitslice()` on iterators to view the \
+	                     remaining data.")]
+	pub fn as_mut_slice(&mut self) -> &mut BitSlice<O, T> {
+		self.as_mut_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Iterator for IntoIter<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Item = bool;
+
+	#[inline(always)]
+	fn next(&mut self) -> Option<Self::Item> {
+		self.iter.next().copied()
+	}
+
+	#[inline(always)]
+	fn size_hint(&self) -> (usize, Option<usize>) {
+		self.iter.size_hint()
+	}
+
+	#[inline(always)]
+	fn count(self) -> usize {
+		self.len()
+	}
+
+	#[inline(always)]
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		self.iter.nth(n).copied()
+	}
+
+	#[inline(always)]
+	fn last(mut self) -> Option<Self::Item> {
+		self.next_back()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> DoubleEndedIterator for IntoIter<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn next_back(&mut self) -> Option<Self::Item> {
+		self.iter.next_back().copied()
+	}
+
+	#[inline(always)]
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		self.iter.nth_back(n).copied()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> ExactSizeIterator for IntoIter<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn len(&self) -> usize {
+		self.iter.len()
+	}
+}
+
+impl<O, T> FusedIterator for IntoIter<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+/** A draining iterator for `BitVec<O, T>`.
+
+This `struct` is created by the [`drain`] method on [`BitVec`].
+
+# Original
+
+[`vec::Drain`](https://doc.rust-lang.org/alloc/vec/struct.Drain.html)
+
+[`BitVec`]: struct.BitVec.html
+[`drain`]: struct.BitVec.html#method.drain
+**/
+pub struct Drain<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	/// Exclusive reference to the vector this drains.
+	source: NonNull<BitVec<O, T>>,
+	/// The range of the source vector’s buffer being drained.
+	drain: Iter<'a, O, T>,
+	/// The range of the source vector’s preserved tail. This runs from the back
+	/// edge of the drained region to the vector’s original length.
+	tail: Range<usize>,
+}
+
+impl<'a, O, T> Drain<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	#[inline]
+	pub(super) fn new<R>(source: &'a mut BitVec<O, T>, range: R) -> Self
+	where R: RangeBounds<usize> {
+		//  Hold the current vector size for bounds comparison.
+		let len = source.len();
+		//  Normalize the input range and assert that it is within bounds.
+		let drain = dvl::normalize_range(range, len);
+		dvl::assert_range(drain.clone(), len);
+
+		//  The tail region is everything after the drain, before the real end.
+		let tail = drain.end .. len;
+		//  The drain span is an iterator over the provided range.
+		let drain = unsafe {
+			//  Set the source vector to end before the drain.
+			source.set_len(drain.start);
+			//  Grab the drain range and produce an iterator over it.
+			source
+				.as_bitslice()
+				.get_unchecked(drain)
+				//  Detach the region from the `source` borrow.
+				.bitptr()
+				.to_bitslice_ref()
+				.iter()
+		};
+		let source = source.into();
+		Self {
+			source,
+			drain,
+			tail,
+		}
+	}
+
+	/// Returns the remaining bits of this iterator as a bit-slice.
+	///
+	/// # Original
+	///
+	/// [`Drain::as_slice`](https://doc.rust-lang.org/alloc/vec/struct.Drain.html#method.as_slice)
+	///
+	/// # API Differences
+	///
+	/// This method is renamed, as it operates on a bit-slice rather than an
+	/// element slice.
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_bitslice(&self) -> &'a BitSlice<O, T> {
+		self.drain.as_bitslice()
+	}
+
+	/// Attempts to overwrite the drained region with another iterator.
+	///
+	/// # Type Parameters
+	///
+	/// - `I`: Some source of `bool`s.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `iter`: A source of `bool`s with which to overwrite the drained span.
+	///
+	/// # Returns
+	///
+	/// Whether the drained span was completely filled, or if the replacement
+	/// source `iter`ator was exhausted first.
+	///
+	/// # Effects
+	///
+	/// The source vector is extended to include all bits filled in from the
+	/// replacement `iter`ator, but is *not* extended to include the tail, even
+	/// if drained region is completely filled. This work is done in the
+	/// destructor.
+	#[inline]
+	fn fill<I>(&mut self, iter: &mut I) -> FillStatus
+	where I: Iterator<Item = bool> {
+		let bitvec = unsafe { self.source.as_mut() };
+		//  Get the length of the source vector. This will be grown as `iter`
+		//  writes into the drain span.
+		let mut len = bitvec.len();
+		//  Get the drain span as a bit-slice.
+		let span = unsafe { bitvec.get_unchecked_mut(len .. self.tail.start) };
+
+		//  Set the exit flag to assume completion.
+		let mut out = FillStatus::FullSpan;
+		//  Write the `iter` bits into the drain `span`.
+		for slot in span {
+			//  While the `iter` is not exhausted, write it into the span and
+			//  increase the vector length counter.
+			if let Some(bit) = iter.next() {
+				slot.set(bit);
+				len += 1;
+			}
+			//  If the `iter` exhausts before the drain `span` is filled, set
+			//  the exit flag accordingly.
+			else {
+				out = FillStatus::EmptyInput;
+				break;
+			}
+		}
+		//  Update the vector length counter to include the bits written by
+		//  `iter`.
+		unsafe {
+			bitvec.set_len(len);
+		}
+		out
+	}
+
+	/// Inserts `additional` capacity between the vector and the tail.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `additional`: The amount of new bits to reserve between the head and
+	///   tail sections of the vector.
+	///
+	/// # Effects
+	///
+	/// This is permitted to reällocate the buffer in order to grow capacity.
+	/// After completion, the tail segment will be relocated to begin
+	/// `additional` bits after the head segment ends. The drain iteration
+	/// cursor will not be modified.
+	#[inline]
+	unsafe fn move_tail(&mut self, additional: usize) {
+		let bitvec = self.source.as_mut();
+		let tail_len = self.tail.end - self.tail.start;
+
+		//  Reserve allocation capacity for `additional` and the tail.
+		//  `.reserve()` begins from the `bitvec.len()`, so the tail length must
+		//  still be included.
+		let full_len = additional + tail_len;
+		bitvec.reserve(full_len);
+		let new_tail_start = additional + self.tail.start;
+		let orig_tail = mem::replace(
+			&mut self.tail,
+			new_tail_start .. new_tail_start + tail_len,
+		);
+		//  Temporarily resize the vector to include the full buffer. This is
+		//  necessary until `copy_within_unchecked` stops using `.len()`
+		//  internally.
+		let len = bitvec.len();
+		bitvec.set_len(full_len);
+		bitvec.copy_within_unchecked(orig_tail, new_tail_start);
+		bitvec.set_len(len);
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> AsRef<BitSlice<O, T>> for Drain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn as_ref(&self) -> &BitSlice<O, T> {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, T> Debug for Drain<'a, O, T>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		fmt.debug_tuple("Drain")
+			.field(&self.drain.as_bitslice())
+			.finish()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Iterator for Drain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Item = bool;
+
+	#[inline(always)]
+	fn next(&mut self) -> Option<Self::Item> {
+		self.drain.next().copied()
+	}
+
+	#[inline(always)]
+	fn size_hint(&self) -> (usize, Option<usize>) {
+		self.drain.size_hint()
+	}
+
+	#[inline(always)]
+	fn count(self) -> usize {
+		self.len()
+	}
+
+	#[inline(always)]
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		self.drain.nth(n).copied()
+	}
+
+	#[inline(always)]
+	fn last(mut self) -> Option<Self::Item> {
+		self.next_back()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> DoubleEndedIterator for Drain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn next_back(&mut self) -> Option<Self::Item> {
+		self.drain.next_back().copied()
+	}
+
+	#[inline(always)]
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		self.drain.nth_back(n).copied()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> ExactSizeIterator for Drain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn len(&self) -> usize {
+		self.drain.len()
+	}
+}
+
+impl<O, T> FusedIterator for Drain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+unsafe impl<O, T> Send for Drain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+unsafe impl<O, T> Sync for Drain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+impl<O, T> Drop for Drain<'_, O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn drop(&mut self) {
+		//  Grab the tail range descriptor
+		let tail = self.tail.clone();
+		//  And compute its length.
+		let tail_len = tail.end - tail.start;
+		//  If the tail region is empty, then there is no cleanup work to do.
+		if tail_len == 0 {
+			return;
+		}
+		//  Otherwise, access the source vector,
+		let bitvec = unsafe { self.source.as_mut() };
+		//  And grab its current end.
+		let old_len = bitvec.len();
+		let new_len = old_len + tail_len;
+		unsafe {
+			//  Expand the vector to include where the tail bits will be.
+			bitvec.set_len(new_len);
+			//  Then move the tail bits into the new location.
+			bitvec.copy_within_unchecked(tail, old_len);
+			//  This ordering is important! `copy_within_unchecked` uses the
+			//  `len` boundary.
+		}
+	}
+}
+
+/// `std` uses a `bool` flag for done/not done, which is less clear about what
+/// it signals.
+#[repr(u8)]
+#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
+enum FillStatus {
+	/// The drain span is completely filled.
+	FullSpan   = 0,
+	/// The replacement source is completely emptied.
+	EmptyInput = 1,
+}
+
+/** A splicing iterator for `BitVec`.
+
+This struct is created by the [`splice()`] method on [`BitVec`]. See its
+documentation for more.
+
+# Original
+
+[`vec::Splice`](https://doc.rust-lang.org/alloc/vec/struct.Splice.html)
+
+[`BitVec`]: struct.BitVec.html
+[`splice()`]: struct.BitVec.html#method.splice
+**/
+#[derive(Debug)]
+pub struct Splice<'a, O, T, I>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	I: Iterator<Item = bool>,
+{
+	/// The region of the vector being spliced.
+	drain: Drain<'a, O, T>,
+	/// The bitstream to be written into the drain.
+	splice: I,
+}
+
+impl<'a, O, T, I> Splice<'a, O, T, I>
+where
+	O: BitOrder,
+	T: 'a + BitStore,
+	I: Iterator<Item = bool>,
+{
+	/// Constructs a splice out of a drain and a replacement.
+	pub(super) fn new<II>(drain: Drain<'a, O, T>, splice: II) -> Self
+	where II: IntoIterator<IntoIter = I, Item = bool> {
+		let splice = splice.into_iter();
+		Self { drain, splice }
+	}
+}
+
+impl<O, T, I> Iterator for Splice<'_, O, T, I>
+where
+	O: BitOrder,
+	T: BitStore,
+	I: Iterator<Item = bool>,
+{
+	type Item = bool;
+
+	#[inline]
+	fn next(&mut self) -> Option<Self::Item> {
+		self.drain.next().tap_some(|_| {
+			/* Attempt to write a bit into the now-vacated slot at the front of
+			the `Drain`. If the `splice` stream produces a bit, then it is
+			written into the end of the `Drain`’s buffer, extending it by one.
+			This works because `Drain` always truncates its vector to the front
+			edge of the drain region, so `bv.len()` is always the first bit of
+			the `Drain` region if the `Drain` is willing to yield a bit.
+			*/
+			if let Some(bit) = self.splice.next() {
+				unsafe {
+					let bv = self.drain.source.as_mut();
+					let len = bv.len();
+					/* TODO(myrrlyn): Investigate adding functionality to `Iter`
+					that permits an exchange behavior, rather than separated
+					computations of the pointer for read and write access.
+					*/
+					bv.set_unchecked(len, bit);
+					bv.set_len(len + 1);
+				}
+			}
+		})
+	}
+
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	fn size_hint(&self) -> (usize, Option<usize>) {
+		self.drain.size_hint()
+	}
+
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	fn count(self) -> usize {
+		self.drain.len()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, I> DoubleEndedIterator for Splice<'_, O, T, I>
+where
+	O: BitOrder,
+	T: BitStore,
+	I: Iterator<Item = bool>,
+{
+	#[inline(always)]
+	fn next_back(&mut self) -> Option<Self::Item> {
+		self.drain.next_back()
+	}
+
+	#[inline(always)]
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		self.drain.nth_back(n)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, I> ExactSizeIterator for Splice<'_, O, T, I>
+where
+	O: BitOrder,
+	T: BitStore,
+	I: Iterator<Item = bool>,
+{
+	#[inline(always)]
+	fn len(&self) -> usize {
+		self.drain.len()
+	}
+}
+
+impl<O, T, I> FusedIterator for Splice<'_, O, T, I>
+where
+	O: BitOrder,
+	T: BitStore,
+	I: Iterator<Item = bool>,
+{
+}
+
+impl<O, T, I> Drop for Splice<'_, O, T, I>
+where
+	O: BitOrder,
+	T: BitStore,
+	I: Iterator<Item = bool>,
+{
+	#[inline]
+	fn drop(&mut self) {
+		let tail = self.drain.tail.clone();
+		let tail_len = tail.end - tail.start;
+		let bitvec = unsafe { self.drain.source.as_mut() };
+
+		//  If the `drain` has no tail span, then extend the vector with the
+		//  splice and exit.
+		if tail_len == 0 {
+			bitvec.extend(self.splice.by_ref());
+			return;
+		}
+
+		//  Fill the drained range first. If the `splice` exhausts, then the
+		//  `Drain` destructor will handle relocating the vector tail segment.
+		if let FillStatus::EmptyInput = self.drain.fill(&mut self.splice) {
+			return;
+		}
+
+		//  If the `splice` has not yet exhausted, then the `Drain` needs to
+		//  adjust to receive its contents.
+		let len = match self.splice.size_hint() {
+			(n, None) | (_, Some(n)) => n,
+		};
+		unsafe {
+			self.drain.move_tail(len);
+		}
+		//  Now that the tail has been relocated, fill the `splice` into it. If
+		//  this exhausts the `splice`, exit.
+		if let FillStatus::EmptyInput = self.drain.fill(&mut self.splice) {
+			return;
+		}
+
+		//  If the `splice` *still* has bits to provide, then its `.size_hint()`
+		//  is untrustworthy. Collect the `splice` into a vector, then insert
+		//  the vector into the spliced region.
+		let mut collected = self.splice.by_ref().collect::<BitVec>().into_iter();
+		let len = collected.len();
+		if len > 0 {
+			unsafe {
+				self.drain.move_tail(len);
+			}
+			let filled = self.drain.fill(&mut collected);
+			debug_assert_eq!(filled, FillStatus::EmptyInput);
+			debug_assert_eq!(collected.len(), 0);
+		}
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/ops.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/ops.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/ops.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/ops.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,202 @@
+//! Operator implementations for `BitVec`.
+
+use crate::{
+	devel as dvl,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+	vec::BitVec,
+};
+
+use core::{
+	mem::ManuallyDrop,
+	ops::{
+		BitAnd,
+		BitAndAssign,
+		BitOr,
+		BitOrAssign,
+		BitXor,
+		BitXorAssign,
+		Deref,
+		DerefMut,
+		Index,
+		IndexMut,
+		Not,
+	},
+};
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitAnd<Rhs> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitAndAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitand(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() &= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitAndAssign<Rhs> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitAndAssign<Rhs>,
+{
+	#[inline]
+	fn bitand_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() &= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitOr<Rhs> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitOrAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitor(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() |= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitOrAssign<Rhs> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitOrAssign<Rhs>,
+{
+	#[inline]
+	fn bitor_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() |= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitXor<Rhs> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitXorAssign<Rhs>,
+{
+	type Output = Self;
+
+	#[inline]
+	fn bitxor(mut self, rhs: Rhs) -> Self::Output {
+		*self.as_mut_bitslice() ^= rhs;
+		self
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> BitXorAssign<Rhs> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: BitXorAssign<Rhs>,
+{
+	#[inline]
+	fn bitxor_assign(&mut self, rhs: Rhs) {
+		*self.as_mut_bitslice() ^= rhs;
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Deref for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Target = BitSlice<O, T>;
+
+	#[inline(always)]
+	fn deref(&self) -> &Self::Target {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> DerefMut for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		self.as_mut_bitslice()
+	}
+}
+
+impl<O, T> Drop for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn drop(&mut self) {
+		//  The buffer elements do not have destructors.
+		self.clear();
+		//  Run the `Vec` destructor to deällocate the buffer.
+		self.with_vec(|vec| unsafe { ManuallyDrop::drop(vec) });
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Idx> Index<Idx> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: Index<Idx>,
+{
+	type Output = <BitSlice<O, T> as Index<Idx>>::Output;
+
+	#[inline]
+	fn index(&self, index: Idx) -> &Self::Output {
+		self.as_bitslice().index(index)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Idx> IndexMut<Idx> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	BitSlice<O, T>: IndexMut<Idx>,
+{
+	#[inline]
+	fn index_mut(&mut self, index: Idx) -> &mut Self::Output {
+		self.as_mut_bitslice().index_mut(index)
+	}
+}
+
+/** This implementation inverts all elements in the live buffer. You cannot rely
+on the value of bits in the buffer that are outside the domain of
+`BitVec::as_mit_bitslice`.
+**/
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Not for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Output = Self;
+
+	#[inline]
+	fn not(mut self) -> Self::Output {
+		for elem in self.as_mut_slice().iter_mut().map(dvl::mem_mut) {
+			*elem = !*elem;
+		}
+		self
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,235 @@
+#![cfg(test)]
+
+use crate::prelude::*;
+
+use core::{
+	iter,
+	ptr,
+};
+
+use std::panic::catch_unwind;
+
+#[test]
+fn from_vec() {
+	let bv = BitVec::<Msb0, u8>::from_vec(vec![0, 1, 2, 3]);
+	assert_eq!(bv.len(), 32);
+	assert_eq!(bv.count_ones(), 4);
+}
+
+#[test]
+fn push() {
+	let mut bvm08 = BitVec::<Msb0, u8>::new();
+	assert!(bvm08.is_empty());
+
+	bvm08.push(false);
+	assert_eq!(bvm08.len(), 1);
+	assert!(!bvm08[0]);
+
+	bvm08.push(true);
+	assert_eq!(bvm08.len(), 2);
+	assert!(bvm08[1]);
+
+	bvm08.extend(&[true; 3]);
+	bvm08.extend(&[false; 3]);
+	assert_eq!(bvm08, bits![0, 1, 1, 1, 1, 0, 0, 0]);
+}
+
+#[test]
+fn inspect() {
+	let bv = bitvec![LocalBits, u16; 0; 40];
+	assert_eq!(bv.elements(), 3);
+}
+
+#[test]
+fn buffer_control() {
+	let data = 0xA5u8;
+	let bits = data.view_bits::<Msb0>();
+
+	let mut bv = bits[2 ..].to_bitvec();
+	assert_eq!(bv.as_slice(), &[0xA5u8]);
+	bv.force_align();
+	assert_eq!(bv.as_slice(), &[0b1001_0101]);
+	bv.force_align();
+	assert_eq!(bv.as_slice(), &[0b1001_0101]);
+
+	bv.truncate(6);
+	bv.set_uninitialized(false);
+	assert_eq!(bv.as_slice(), &[0b1001_0100]);
+	bv.set_uninitialized(true);
+	assert_eq!(bv.as_slice(), &[0b1001_0111]);
+	assert_eq!(bv, bits![1, 0, 0, 1, 0, 1]);
+}
+
+#[test]
+#[should_panic(expected = "Vector capacity exceeded")]
+fn overcommit() {
+	BitVec::<LocalBits, usize>::with_capacity(
+		BitSlice::<LocalBits, usize>::MAX_BITS + 1,
+	);
+}
+
+#[test]
+#[should_panic(
+	expected = "Attempted to reconstruct a `BitVec` from a null pointer"
+)]
+fn from_null() {
+	unsafe {
+		BitVec::from_raw_parts(
+			ptr::slice_from_raw_parts_mut(ptr::null_mut::<u8>(), 64)
+				as *mut BitSlice<LocalBits, usize>,
+			0,
+		);
+	}
+}
+
+#[test]
+fn reservations() {
+	let mut bv = bitvec![1; 40];
+	assert!(bv.capacity() >= 40);
+	bv.reserve(100);
+	assert!(bv.capacity() >= 140, "{}", bv.capacity());
+	bv.shrink_to_fit();
+	assert!(bv.capacity() >= 40);
+
+	//  Trip the first assertion by wrapping around the `usize` boundary.
+	assert!(
+		catch_unwind(|| {
+			let mut bv = bitvec![1; 100];
+			bv.reserve(!0 - 50);
+		})
+		.is_err()
+	);
+
+	//  Trip the second assertion by exceeding `MAX_BITS` without wrapping.
+	assert!(
+		catch_unwind(|| {
+			let mut bv = bitvec![1; 100];
+			bv.reserve(BitSlice::<LocalBits, usize>::MAX_BITS - 50);
+		})
+		.is_err()
+	);
+
+	let mut bv = bitvec![1; 40];
+	assert!(bv.capacity() >= 40);
+	bv.reserve_exact(100);
+	assert!(bv.capacity() >= 140, "{}", bv.capacity());
+
+	//  Trip the first assertion by wrapping around the `usize` boundary.
+	assert!(
+		catch_unwind(|| {
+			let mut bv = bitvec![1; 100];
+			bv.reserve_exact(!0 - 50);
+		})
+		.is_err()
+	);
+
+	//  Trip the second assertion by exceeding `MAX_BITS` without wrapping.
+	assert!(
+		catch_unwind(|| {
+			let mut bv = bitvec![1; 100];
+			bv.reserve_exact(BitSlice::<LocalBits, usize>::MAX_BITS - 50);
+		})
+		.is_err()
+	);
+}
+
+#[test]
+fn iterators() {
+	let data = 0x35u8.view_bits::<Msb0>();
+	let bv: BitVec<Msb0, u8> = data.iter().collect();
+	assert_eq!(bv.count_ones(), 4);
+
+	for (l, r) in (&bv).into_iter().zip(bits![0, 0, 1, 1, 0, 1, 0, 1]) {
+		/* Unimportant but interesting implementation detail: all accessors in
+		the crate that return an `&bool` use the same two addresses, because
+		the compiler unifies `&literal` references into secret statics. You
+		could argue that, much like YAML accepting yes/no as boolean literals,
+		there are now four valid boolean values in the crate: `true`, `false`,
+		and the addresses of their secret statics.
+
+		Switch to a by-value comparison instead of by-ref if this test fails.
+
+		Fun fact: Addresses are not stably observable in Miri.
+		*/
+		#[cfg(not(miri))]
+		assert_eq!(l as *const _, r as *const _);
+
+		#[cfg(miri)]
+		assert_eq!(*l, *r);
+	}
+
+	let mut iter = bv.into_iter();
+	assert!(!iter.next().unwrap());
+	assert_eq!(iter.as_bitslice(), data[1 ..]);
+
+	let mut bv = bitvec![0, 0, 1, 0, 1, 1, 0, 1, 0, 0];
+	let mut splice = bv.splice(2 .. 8, iter::repeat(false).take(4));
+	assert!(splice.next().unwrap());
+	assert!(splice.next_back().unwrap());
+	assert!(splice.nth(1).unwrap());
+	assert!(splice.nth_back(1).unwrap());
+	drop(splice);
+	assert_eq!(bv, bits![0; 8]);
+
+	let mut bv = bitvec![0, 1, 1, 1, 1, 0];
+	let splice = bv.splice(1 .. 5, iter::once(false));
+	drop(splice);
+	assert_eq!(bv, bits![0; 3]);
+}
+
+#[test]
+fn misc() {
+	let mut bv = bitvec![1; 10];
+	bv.truncate(20);
+	assert_eq!(bv, bits![1; 10]);
+	bv.truncate(5);
+	assert_eq!(bv, bits![1; 5]);
+
+	let mut bv = bitvec![0, 0, 1, 0, 0];
+	assert!(bv.swap_remove(2));
+	assert!(bv.not_any());
+
+	bv.insert(2, true);
+	assert_eq!(bv, bits![0, 0, 1, 0, 0]);
+
+	bv.remove(2);
+	assert!(bv.not_any());
+
+	let mut bv = bitvec![0, 0, 1, 1, 0, 1, 0, 1, 0, 0];
+	bv.retain(|idx, bit| !(idx & 1 == 0 && *bit));
+	//                                         ^^^ even ^^^    prime
+	assert_eq!(bv, bits![0, 0, 1, 0, 1, 0, 1, 0, 0]);
+	//                        ^ 2 is the only even prime
+
+	let mut bv_1 = bitvec![Lsb0, u8; 0; 5];
+	let mut bv_2 = bitvec![Msb0, u16; 1; 5];
+	bv_1.append(&mut bv_2);
+
+	assert_eq!(bv_1, bits![0, 0, 0, 0, 0, 1, 1, 1, 1, 1]);
+	assert!(bv_2.is_empty());
+
+	let bv_3 = bv_1.split_off(5);
+	assert!(bv_1.not_any());
+	assert!(bv_3.all());
+
+	let mut last = false;
+	bv_1.resize_with(10, || {
+		last = !last;
+		last
+	});
+	assert_eq!(bv_1, bits![0, 0, 0, 0, 0, 1, 0, 1, 0, 1]);
+
+	let mut bv = bitvec![];
+	bv.extend_from_slice(&[false, false, true, true, false, true]);
+	assert_eq!(bv, bits![0, 0, 1, 1, 0, 1]);
+}
+
+#[test]
+fn cloning() {
+	let mut a = bitvec![0];
+	let b = bitvec![1; 20];
+
+	assert_ne!(a, b);
+	a.clone_from(&b);
+	assert_eq!(a, b);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec/traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec/traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,414 @@
+//! Trait implementations for `BitVec`.
+
+use crate::{
+	boxed::BitBox,
+	order::BitOrder,
+	slice::BitSlice,
+	store::BitStore,
+	vec::BitVec,
+};
+
+use alloc::vec::Vec;
+
+use core::{
+	any,
+	borrow::{
+		Borrow,
+		BorrowMut,
+	},
+	cmp,
+	convert::TryFrom,
+	fmt::{
+		self,
+		Binary,
+		Debug,
+		Display,
+		Formatter,
+		LowerHex,
+		Octal,
+		Pointer,
+		UpperHex,
+	},
+	hash::{
+		Hash,
+		Hasher,
+	},
+};
+
+use tap::{
+	pipe::Pipe,
+	tap::Tap,
+};
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Borrow<BitSlice<O, T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn borrow(&self) -> &BitSlice<O, T> {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> BorrowMut<BitSlice<O, T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn borrow_mut(&mut self) -> &mut BitSlice<O, T> {
+		self.as_mut_bitslice()
+	}
+}
+
+impl<O, T> Clone for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	fn clone(&self) -> Self {
+		self.as_bitslice().pipe(Self::from_bitslice)
+	}
+
+	#[inline]
+	fn clone_from(&mut self, other: &Self) {
+		self.clear();
+		self.reserve(other.len());
+		self.with_vec(|v| {
+			v.extend(other.as_slice().iter().map(BitStore::load_value))
+		});
+		unsafe {
+			self.set_len(other.len());
+		}
+		self.pointer = self
+			.bitptr()
+			.tap_mut(|bp| unsafe { bp.set_head(other.bitptr().head()) })
+			.to_nonnull();
+	}
+}
+
+impl<O, T> Eq for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Ord for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn cmp(&self, other: &Self) -> cmp::Ordering {
+		self.as_bitslice().cmp(other.as_bitslice())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<BitVec<O2, T2>> for BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, other: &BitVec<O2, T2>) -> bool {
+		self == other.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<BitVec<O2, T2>> for &BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, other: &BitVec<O2, T2>) -> bool {
+		*self == other.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O1, O2, T1, T2> PartialEq<BitVec<O2, T2>> for &mut BitSlice<O1, T1>
+where
+	O1: BitOrder,
+	O2: BitOrder,
+	T1: BitStore,
+	T2: BitStore,
+{
+	#[inline]
+	fn eq(&self, other: &BitVec<O2, T2>) -> bool {
+		**self == other.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> PartialEq<Rhs> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	Rhs: ?Sized + PartialEq<BitSlice<O, T>>,
+{
+	#[inline]
+	fn eq(&self, other: &Rhs) -> bool {
+		other == self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> PartialOrd<BitVec<O, T>> for BitSlice<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn partial_cmp(&self, other: &BitVec<O, T>) -> Option<cmp::Ordering> {
+		self.partial_cmp(other.as_bitslice())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T, Rhs> PartialOrd<Rhs> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+	Rhs: ?Sized + PartialOrd<BitSlice<O, T>>,
+{
+	#[inline]
+	fn partial_cmp(&self, other: &Rhs) -> Option<cmp::Ordering> {
+		other.partial_cmp(self.as_bitslice())
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> AsRef<BitSlice<O, T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn as_ref(&self) -> &BitSlice<O, T> {
+		self.as_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> AsMut<BitSlice<O, T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn as_mut(&mut self) -> &mut BitSlice<O, T> {
+		self.as_mut_bitslice()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, T> From<&'a BitSlice<O, T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn from(slice: &'a BitSlice<O, T>) -> Self {
+		slice.to_bitvec()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<'a, O, T> From<&'a mut BitSlice<O, T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn from(slice: &'a mut BitSlice<O, T>) -> Self {
+		slice.to_bitvec()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> From<BitBox<O, T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn from(boxed: BitBox<O, T>) -> Self {
+		boxed.into_bitvec()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Into<Vec<T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn into(self) -> Vec<T> {
+		self.into_vec()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> TryFrom<Vec<T>> for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	type Error = Vec<T>;
+
+	#[inline(always)]
+	fn try_from(vec: Vec<T>) -> Result<Self, Self::Error> {
+		Self::try_from_vec(vec)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Default for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline(always)]
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
+impl<O, T> Debug for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		if fmt.alternate() {
+			Pointer::fmt(self, fmt)?;
+			fmt.write_str(" ")?;
+		}
+		Display::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Display for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Display::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Binary for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Binary::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> LowerHex for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		LowerHex::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Octal for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		Octal::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+impl<O, T> Pointer for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		self.bitptr()
+			.render(fmt, "Vec", Some(any::type_name::<O>()), &[(
+				"capacity",
+				&self.capacity() as &dyn Debug,
+			)])
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> UpperHex for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+		UpperHex::fmt(self.as_bitslice(), fmt)
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<O, T> Hash for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	#[inline]
+	fn hash<H>(&self, state: &mut H)
+	where H: Hasher {
+		self.as_bitslice().hash(state)
+	}
+}
+
+unsafe impl<O, T> Send for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+unsafe impl<O, T> Sync for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
+
+impl<O, T> Unpin for BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/vec.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/vec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,699 @@
+/*! A dynamically-allocated buffer containing a `BitSlice<O, T>` region.
+
+You can read the standard library’s [`alloc::vec` module documentation][std]
+here.
+
+This module defines the [`BitVec`] buffer, and all of its associated support
+code.
+
+`BitVec` is equivalent to `Vec<bool>`, in its operation and in its relationship
+to the `BitSlice` type. Most of the interesting work to be done on a
+bit-sequence is implemented in `BitSlice`, to which `BitVec` dereferences, and
+the vector container itself only exists to maintain ownership, implement dynamic
+resizing, and provide some specializations that cannot safely be done on
+`BitSlice` alone.
+
+[`BitVec`]: struct.BitVec.html
+[std]: https://doc.rust-lang.org/alloc/vec
+!*/
+
+#![cfg(feature = "alloc")]
+
+use crate::{
+	boxed::BitBox,
+	index::BitIdx,
+	mem::BitMemory,
+	order::{
+		BitOrder,
+		Lsb0,
+	},
+	pointer::BitPtr,
+	slice::BitSlice,
+	store::BitStore,
+};
+
+use alloc::vec::Vec;
+
+use core::{
+	mem::ManuallyDrop,
+	ptr::NonNull,
+	slice,
+};
+
+use funty::IsInteger;
+
+use tap::{
+	pipe::Pipe,
+	tap::Tap,
+};
+
+/** A vector of individual bits, allocated on the heap.
+
+This is a managed, heap-allocated, buffer that contains a `BitSlice` region. It
+is analagous to `Vec<bool>`, and is written to be as close as possible to
+drop-in replacabale for it. This type contains little interesting behavior in
+its own right, dereferencing instead to [`BitSlice`] for manipulation of the
+buffer contents, and serves primarily as an interface to the allocator. If you
+require statically-allocated, fixed-size, owned buffers, you should use the
+[`BitArray`] type.
+
+Because `BitVec` directly owns its memory, and can guarantee that no other
+object in a program has access to its buffers, `BitVec` is able to override some
+behavior from `BitSlice` in more efficient manners.
+
+# Documentation
+
+All APIs that mirror something in the standard library will have an `Original`
+section linking to the corresponding item. All APIs that have a different
+signature or behavior than the original will have an `API Differences` section
+explaining what has changed, and how to adapt your existing code to the change.
+
+These sections look like this:
+
+# Original
+
+[`Vec<T>`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html)
+
+# API Differences
+
+The buffer type `Vec<bool>` has no type parameters. `BitVec<O, T>` has the same
+two type parameters as `BitSlice<O, T>`. Otherwise, `BitVec` is able to
+implement the full API surface of `Vec<bool>`.
+
+# Behavior
+
+Because `BitVec` is a fully-owned buffer, it is able to operate on its memory
+without concern for any other views that may alias. This enables it to
+specialize some `BitSlice` behavior to be faster or more efficient.
+
+# Type Parameters
+
+This takes the same two type parameters, `O: BitOrder` and `T: BitStore`, as
+`BitSlice`.
+
+# Safety
+
+Like `BitSlice`, `BitVec` is exactly equal in size to `Vec`, and is also
+absolutely representation-incompatible with it. You must never attempt to
+type-cast between `Vec<T>` and `BitVec` in any way, nor attempt to modify the
+memory value of a `BitVec` handle. Doing so will cause allocator and memory
+errors in your program, likely inducing a panic.
+
+Everything in the `BitVec` public API, even the `unsafe` parts, are guaranteed
+to have no more unsafety than their equivalent items in the standard library.
+All `unsafe` APIs will have documentation explicitly detailing what the API
+requires you to uphold in order for it to function safely and correctly. All
+safe APIs will do so themselves.
+
+# Performance
+
+The choice of `T: BitStore` type parameter can impact your vector’s performance,
+as the allocator operates in units of `T` rather than in bits. This means that
+larger register types will increase the amount of memory reserved in each call
+to the allocator, meaning fewer calls to `.push()` will actually cause a
+reällocation. In addition, iteration over the vector is governed by the
+`BitSlice` characteristics on the type parameter. You are generally better off
+using larger types when your vector is a data collection rather than a specific
+I/O protocol buffer.
+
+# Macro Construction
+
+Heap allocation can only occur at runtime, but the [`bitvec!`] macro will
+construct an appropriate `BitSlice` buffer at compile-time, and at run-time,
+only copy the buffer into a heap allocation.
+
+[`BitArray`]: ../array/struct.BitArray.html
+[`BitSlice`]: ../slice/struct.BitSlice.html
+[`bitvec!`]: ../macro.bitvec.html
+**/
+#[repr(C)]
+pub struct BitVec<O = Lsb0, T = usize>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Region pointer describing the live portion of the owned buffer.
+	pointer: NonNull<BitSlice<O, T>>,
+	/// Allocated capacity, in elements `T`, of the owned buffer.
+	capacity: usize,
+}
+
+/// Methods specific to `BitVec<_, T>`, and not present on `Vec<T>`.
+impl<O, T> BitVec<O, T>
+where
+	O: BitOrder,
+	T: BitStore,
+{
+	/// Constructs a `BitVec` from a value repeated many times.
+	///
+	/// This function is equivalent to the `bitvec![O, T; bit; len]` macro call,
+	/// and is in fact the implementation of that macro syntax.
+	///
+	/// # Parameters
+	///
+	/// - `bit`: The bit value to which all `len` allocated bits will be set.
+	/// - `len`: The number of live bits in the constructed `BitVec`.
+	///
+	/// # Returns
+	///
+	/// A `BitVec` with `len` live bits, all set to `bit`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = BitVec::<Msb0, u8>::repeat(true, 20);
+	/// assert_eq!(bv, bits![1; 20]);
+	/// ```
+	#[inline]
+	pub fn repeat(bit: bool, len: usize) -> Self {
+		let mut out = Self::with_capacity(len);
+		unsafe {
+			out.set_len(len);
+		}
+		out.set_elements(if bit { T::Mem::ALL } else { T::Mem::ZERO });
+		out
+	}
+
+	/// Clones a `&BitSlice` into a `BitVec`.
+	///
+	/// # Original
+	///
+	/// [`<Vec<T: Clone> as Clone>::clone`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#impl-Clone)
+	///
+	/// # Effects
+	///
+	/// This performs a direct element-wise copy from the source slice to the
+	/// newly-allocated buffer, then sets the vector to have the same starting
+	/// bit as the slice did. This allows for faster behavior. If you require
+	/// that the vector start at the leading edge of the first element, use
+	/// [`force_align`] to guarantee this.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bits = bits![0, 1, 0, 1, 1, 0, 1, 1];
+	/// let bv = BitVec::from_bitslice(&bits[2 ..]);
+	/// assert_eq!(bv, bits[2 ..]);
+	/// ```
+	///
+	/// [`force_align`]: #method.force_align
+	#[inline]
+	pub fn from_bitslice(slice: &BitSlice<O, T>) -> Self {
+		let mut bitptr = slice.bitptr();
+		let (base, elts) = (bitptr.pointer().to_const(), bitptr.elements());
+		let source = unsafe { slice::from_raw_parts(base, elts) };
+
+		let vec = elts
+			.pipe(Vec::with_capacity)
+			.pipe(ManuallyDrop::new)
+			.tap_mut(|v| v.extend(source.iter().map(BitStore::load_value)));
+
+		unsafe {
+			bitptr.set_pointer(vec.as_ptr() as *const T);
+		}
+
+		let capacity = vec.capacity();
+		Self {
+			pointer: bitptr.to_nonnull(),
+			capacity,
+		}
+	}
+
+	/// Converts a `Vec<T>` into a `BitVec<O, T>` without copying its buffer.
+	///
+	/// # Parameters
+	///
+	/// - `vec`: A vector to view as bits.
+	///
+	/// # Returns
+	///
+	/// A `BitVec` over the `vec` buffer.
+	///
+	/// # Panics
+	///
+	/// This panics if `vec` is too long to convert into a `BitVec`. See
+	/// [`BitSlice::MAX_ELTS`].
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let vec = vec![0u8; 4];
+	/// let bv = BitVec::<LocalBits, _>::from_vec(vec);
+	/// assert_eq!(bv, bits![0; 32]);
+	/// ```
+	///
+	/// [`BitSlice::MAX_ELTS`]:
+	/// ../slice/struct.BitSlice.html#associatedconstant.MAX_ELTS
+	#[inline]
+	pub fn from_vec(vec: Vec<T>) -> Self {
+		Self::try_from_vec(vec)
+			.expect("Vector was too long to be converted into a `BitVec`")
+	}
+
+	/// Converts a `Vec<T>` into a `BitVec<O, T>` without copying its buffer.
+	///
+	/// This method takes ownership of a memory buffer and enables it to be used
+	/// as a bit-vector. Because `Vec` can be longer than `BitVec`s, this is a
+	/// fallible method, and the original vector will be returned if it cannot
+	/// be converted.
+	///
+	/// # Parameters
+	///
+	/// - `vec`: Some vector of memory, to be viewed as bits.
+	///
+	/// # Returns
+	///
+	/// If `vec` is short enough to be viewed as a `BitVec`, then this returns
+	/// a `BitVec` over the `vec` buffer. If `vec` is too long, then this
+	/// returns `vec` unmodified.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let vec = vec![0u8; 4];
+	/// let bv = BitVec::<LocalBits, _>::try_from_vec(vec).unwrap();
+	/// assert_eq!(bv, bits![0; 32]);
+	/// ```
+	///
+	/// An example showing this function failing would require an allocation
+	/// exceeding `!0usize >> 3` bytes in size, which is infeasible to produce.
+	#[inline]
+	pub fn try_from_vec(vec: Vec<T>) -> Result<Self, Vec<T>> {
+		let len = vec.len();
+		if len > BitSlice::<O, T>::MAX_ELTS {
+			return Err(vec);
+		}
+
+		let vec = ManuallyDrop::new(vec);
+		let (base, capacity) = (vec.as_ptr(), vec.capacity());
+		Ok(Self {
+			pointer: unsafe {
+				BitPtr::new_unchecked(
+					base,
+					BitIdx::ZERO,
+					len * T::Mem::BITS as usize,
+				)
+			}
+			.to_nonnull(),
+			capacity,
+		})
+	}
+
+	/// Copies all bits in a `BitSlice` into the `BitVec`.
+	///
+	/// This is provided for API completeness; it has no performance benefits
+	/// compared to use of the [`Extend`] implementation.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `other`: A `BitSlice` reference of the same type parameters as `self`.
+	///
+	/// # Behavior
+	///
+	/// `self` is extended by the length of `other`, and then the contents of
+	/// `other` are copied into the newly-allocated end of `self`.
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 1];
+	/// bv.extend_from_bitslice(bits![1, 1, 0, 1]);
+	///
+	/// assert_eq!(bv, bits![0, 1, 1, 1, 0, 1]);
+	/// ```
+	///
+	/// [`Extend`]: #impl-Extend<%26'a bool>
+	/// [`.as_bitslice()`]: #method.as_bitslice()
+	#[inline]
+	pub fn extend_from_bitslice(&mut self, other: &BitSlice<O, T>) {
+		let len = self.len();
+		let olen = other.len();
+		self.resize(len + olen, false);
+		unsafe { self.get_unchecked_mut(len ..) }.clone_from_bitslice(other);
+	}
+
+	/// Converts the vector into [`BitBox<O, T>`].
+	///
+	/// Note that this will drop any excess capacity.
+	///
+	/// # Original
+	///
+	/// [`Vec::into_boxed_slice`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.into_boxed_slice)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![1; 50];
+	/// let bb: BitBox = bv.into_boxed_bitslice();
+	/// assert_eq!(bb, bits![1; 50]);
+	/// ```
+	///
+	/// [`BitBox<O, T>`]: ../boxed/struct.BitBox.html
+	#[inline]
+	pub fn into_boxed_bitslice(self) -> BitBox<O, T> {
+		let mut bitptr = self.bitptr();
+		let boxed = self.into_boxed_slice().pipe(ManuallyDrop::new);
+		unsafe {
+			bitptr.set_pointer(boxed.as_ptr());
+		}
+		unsafe { BitBox::from_raw(bitptr.to_bitslice_ptr_mut::<O>()) }
+	}
+
+	/// Converts the vector back into an ordinary vector of memory elements.
+	///
+	/// This does not affect the vector’s buffer, only the handle used to
+	/// control it.
+	///
+	/// # Parameters
+	///
+	/// - `self`
+	///
+	/// # Returns
+	///
+	/// An ordinary vector containing all of the bit-vector’s memory buffer.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = bitvec![0; 5];
+	/// let vec = bv.into_vec();
+	/// assert_eq!(vec, [0]);
+	/// ```
+	#[inline]
+	pub fn into_vec(self) -> Vec<T> {
+		let mut this = ManuallyDrop::new(self);
+		let buf = this.as_mut_slice();
+		unsafe {
+			Vec::from_raw_parts(
+				buf.as_mut_ptr() as *mut T,
+				buf.len(),
+				this.capacity,
+			)
+		}
+	}
+
+	/// Gets the number of elements `T` that contain live bits of the vector.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = bitvec![LocalBits, u16; 1; 50];
+	/// assert_eq!(bv.elements(), 4);
+	/// ```
+	#[inline]
+	pub fn elements(&self) -> usize {
+		self.bitptr().elements()
+	}
+
+	/// Sets the uninitialized bits of the vector to a fixed value.
+	///
+	/// This method modifies all bits in the allocated buffer that are outside
+	/// the `self.as_bitslice()` view so that they have a consistent value. This
+	/// can be used to zero the uninitialized memory so that when viewed as a
+	/// raw memory slice, bits outside the live region have a predictable value.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = 220u8.view_bits::<Lsb0>().to_bitvec();
+	/// assert_eq!(bv.as_slice(), &[220u8]);
+	/// bv.truncate(4);
+	/// assert_eq!(bv.count_ones(), 2);
+	/// assert_eq!(bv.as_slice(), &[220u8]);
+	///
+	/// bv.set_uninitialized(false);
+	/// assert_eq!(bv.as_slice(), &[12u8]);
+	///
+	/// bv.set_uninitialized(true);
+	/// assert_eq!(bv.as_slice(), &[!3u8]);
+	/// ```
+	#[inline]
+	pub fn set_uninitialized(&mut self, value: bool) {
+		let head = self.bitptr().head().value() as usize;
+		let tail = head + self.len();
+		let capa = self.capacity();
+		let mut bp = self.bitptr();
+		unsafe {
+			bp.set_head(BitIdx::ZERO);
+			bp.set_len(capa);
+			let bits = bp.to_bitslice_mut::<O>();
+			bits.get_unchecked_mut(.. head).set_all(value);
+			bits.get_unchecked_mut(tail ..).set_all(value);
+		}
+	}
+
+	/// Ensures that the live region of the vector’s contents begins at the
+	/// leading edge of the buffer.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let data = 0x3Cu8;
+	/// let bits = data.view_bits::<Msb0>();
+	///
+	/// let mut bv = bits[2 .. 6].to_bitvec();
+	/// assert_eq!(bv, bits[2 .. 6]);
+	/// assert_eq!(bv.as_slice()[0], data);
+	///
+	/// bv.force_align();
+	/// assert_eq!(bv, bits[2 .. 6]);
+	/// //  It is not specified what happens to bits that are no longer used.
+	/// assert_eq!(bv.as_slice()[0] & 0xF0, 0xF0);
+	/// ```
+	#[inline]
+	pub fn force_align(&mut self) {
+		let bitptr = self.bitptr();
+		let head = bitptr.head().value() as usize;
+		if head == 0 {
+			return;
+		}
+		let last = bitptr.len() + head;
+		unsafe {
+			self.pointer =
+				bitptr.tap_mut(|bp| bp.set_head(BitIdx::ZERO)).to_nonnull();
+			self.copy_within_unchecked(head .. last, 0);
+		}
+	}
+
+	/// Writes a value into every element that the vector considers live.
+	///
+	/// This unconditionally writes `element` into each live location in the
+	/// backing buffer, without altering the `BitVec`’s length or capacity.
+	///
+	/// It is unspecified what effects this has on the allocated but dead
+	/// elements in the buffer.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `element`: The value which will be written to each live location in
+	///   the vector’s buffer.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![LocalBits, u8; 0; 10];
+	/// assert_eq!(bv.as_slice(), [0, 0]);
+	/// bv.set_elements(0xA5);
+	/// assert_eq!(bv.as_slice(), [0xA5, 0xA5]);
+	/// ```
+	#[inline]
+	pub fn set_elements(&mut self, element: T::Mem) {
+		self.as_mut_slice()
+			.iter_mut()
+			.for_each(|elt| *elt = element.into());
+	}
+
+	/// Views the buffer’s contents as a `BitSlice`.
+	///
+	/// This is equivalent to `&bv[..]`.
+	///
+	/// # Original
+	///
+	/// [`Vec::as_slice`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.as_slice)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = bitvec![0, 1, 1, 0];
+	/// let bits = bv.as_bitslice();
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_bitslice(&self) -> &BitSlice<O, T> {
+		unsafe { &*self.pointer.as_ptr() }
+	}
+
+	/// Extracts a mutable bit-slice of the entire vector.
+	///
+	/// Equivalent to `&mut bv[..]`.
+	///
+	/// # Original
+	///
+	/// [`Vec::as_mut_slice`](https://doc.rust-lang.org/alloc/vec/struct.Vec.html#method.as_mut_slice)
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0, 1, 0, 1];
+	/// let bits = bv.as_mut_bitslice();
+	/// bits.set(0, true);
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_bitslice(&mut self) -> &mut BitSlice<O, T> {
+		unsafe { &mut *self.pointer.as_ptr() }
+	}
+
+	/// Returns a raw pointer to the vector’s region.
+	///
+	/// The caller must ensure that the vector outlives the pointer this
+	/// function returns, or else it will end up pointing to garbage. Modifying
+	/// the vector may cause its buffer to be reallocated, which would also make
+	/// any pointers to it invalid.
+	///
+	/// The caller must also ensure that the memory the pointer
+	/// (non-transitively) points to is never written to (except inside an
+	/// `UnsafeCell`) using this pointer or any pointer derived from it. If you
+	/// need to mutate the contents of the region, use [`as_mut_bitptr`].
+	///
+	/// This pointer is an opaque crate-internal type. Its in-memory
+	/// representation is unsafe to modify in any way. The only safe action to
+	/// take with this pointer is to pass it, unchanged, back into a `bitvec`
+	/// API.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let bv = bitvec![0; 20];
+	/// let ptr = bv.as_bitptr();
+	///
+	/// let bits = unsafe { &*ptr };
+	/// assert_eq!(bv, bits);
+	/// ```
+	///
+	/// [`as_mut_bitptr`]: #method.as_mut_bitptr
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_bitptr(&self) -> *const BitSlice<O, T> {
+		self.pointer.as_ptr() as *const BitSlice<O, T>
+	}
+
+	/// Returns an unsafe mutable pointer to the vector’s region.
+	///
+	/// The caller must ensure that the vector outlives the pointer this
+	/// function returns, or else it will end up pointing to garbage. Modifying
+	/// the vector may cause its buffer to be reallocated, which would also make
+	/// any pointers to it invalid.
+	///
+	/// This pointer is an opaque crate-internal type. Its in-memory
+	/// representation is unsafe to modify in any way. The only safe action to
+	/// take with this pointer is to pass it, unchanged, back into a `bitvec`
+	/// API.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use bitvec::prelude::*;
+	///
+	/// let mut bv = bitvec![0; 20];
+	/// let ptr = bv.as_mut_bitptr();
+	///
+	/// let bits = unsafe { &mut *ptr };
+	/// assert_eq!(bv, bits);
+	/// ```
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub fn as_mut_bitptr(&mut self) -> *mut BitSlice<O, T> {
+		self.pointer.as_ptr()
+	}
+
+	#[inline]
+	#[cfg(not(tarpaulin_include))]
+	pub(crate) fn bitptr(&self) -> BitPtr<T> {
+		self.pointer.as_ptr().pipe(BitPtr::from_bitslice_ptr_mut)
+	}
+
+	/// Permits a function to modify the `Vec<T>` backing storage of a
+	/// `BitVec<_, T>`.
+	///
+	/// This produces a temporary `Vec<T::Mem>` structure governing the
+	/// `BitVec`’s buffer and allows a function to view it mutably. After the
+	/// callback returns, the `Vec` is written back into `self` and forgotten.
+	///
+	/// # Type Parameters
+	///
+	/// - `F`: A function which operates on a mutable borrow of a `Vec<T::Mem>`
+	///   buffer controller.
+	/// - `R`: The return type of the `F` function.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`
+	/// - `func`: A function which receives a mutable borrow of a `Vec<T::Mem>`
+	///   controlling `self`’s buffer.
+	///
+	/// # Returns
+	///
+	/// The return value of `func`. `func` is forbidden from borrowing any part
+	/// of the `Vec<T::Mem>` temporary view.
+	fn with_vec<F, R>(&mut self, func: F) -> R
+	where F: FnOnce(&mut ManuallyDrop<Vec<T::Mem>>) -> R {
+		let cap = self.capacity;
+		let mut bitptr = self.bitptr();
+		let (base, elts) =
+			(bitptr.pointer().to_mut() as *mut T::Mem, bitptr.elements());
+
+		let mut vec = unsafe { Vec::from_raw_parts(base, elts, cap) }
+			.pipe(ManuallyDrop::new);
+		let out = func(&mut vec);
+
+		unsafe {
+			bitptr.set_pointer(vec.as_ptr() as *mut T);
+		}
+		self.pointer = bitptr.to_nonnull();
+		self.capacity = vec.capacity();
+		out
+	}
+}
+
+mod api;
+mod iter;
+mod ops;
+mod traits;
+
+pub use iter::{
+	Drain,
+	IntoIter,
+	Splice,
+};
+
+#[cfg(test)]
+mod tests;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/view.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/view.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bitvec/src/view.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bitvec/src/view.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,373 @@
+/*! View constructors for memory regions.
+
+The `&BitSlice` type is a referential view over existing memory. The inherent
+constructors are awkward to call, as they require function syntax rather than
+method syntax, and must provide a token for the memory type even though this is
+provided by the prior binding.
+
+This module provides a view trait, `ViewBits`, which provides `BitSlice`
+constructors available in method-call syntax with only ordering type parameters.
+
+In addition, the traits `AsBits` and `AsBitsMut` are analogues of [`AsRef`] and
+[`AsMut`], respectively. These traits have a blanket implementation for all
+`A: As{Ref,Mut}<[T: BitStore]>`, so that any type that implements a view to a
+suitable memory region automatically implements a view to that region’s bits.
+
+These traits are distinct because `ViewBits` combines the im/mutable view
+functions into one trait, and can provide specialized implementations with a
+slight performance increase over the generic, but `AsBits{,Mut}` can fit in the
+generic type system of any library without undue effort.
+
+[`AsMut`]: https://doc.rust-lang.org/core/convert/trait.AsMut.html
+[`AsRef`]: https://doc.rust-lang.org/core/convert/trait.AsRef.html
+!*/
+
+use crate::{
+	index::{
+		BitIdx,
+		BitRegister,
+	},
+	mem::BitMemory,
+	order::BitOrder,
+	pointer::BitPtr,
+	slice::BitSlice,
+	store::BitStore,
+};
+
+/** Views a type that can store bits as a bit-slice.
+
+This trait is implemented on all `T: BitStore` types, and the arrays and slices
+of them that are supported by the standard library.
+
+This means that until type-level integers are stabilized, only arrays in
+`[T: BitStore; 0 ..= 32]` will implement the trait; wider arrays will need to
+reborrow as slices `[T]` in order to use the slice implementation.
+
+If you have a type that contains a bit-storage type that can be viewed with this
+trait, then you can implement this trait by forwarding to the interior view.
+**/
+pub trait BitView {
+	/// The access-control type of the storage region.
+	type Store: BitStore;
+
+	/// The underlying register type of the storage region.
+	type Mem: BitMemory;
+
+	/// Views a memory region as a `BitSlice`.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: The bit ordering used for the region.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: The region to view as individual bits.
+	///
+	/// # Returns
+	///
+	/// A `&BitSlice` view over the region at `*self`.
+	fn view_bits<O>(&self) -> &BitSlice<O, Self::Store>
+	where O: BitOrder;
+
+	#[doc(hidden)]
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(
+		since = "0.18.0",
+		note = "The method is renamed to `.view_bits`"
+	)]
+	fn bits<O>(&self) -> &BitSlice<O, Self::Store>
+	where O: BitOrder {
+		self.view_bits::<O>()
+	}
+
+	/// Views a memory region as a mutable `BitSlice`.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: The bit ordering used for the region.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: The region to view as individual mutable bits.
+	///
+	/// # Returns
+	///
+	/// A `&mut BitSlice` view over the region at `*self`.
+	fn view_bits_mut<O>(&mut self) -> &mut BitSlice<O, Self::Store>
+	where O: BitOrder;
+
+	#[doc(hidden)]
+	#[inline(always)]
+	#[cfg(not(tarpaulin_include))]
+	#[deprecated(
+		since = "0.18.0",
+		note = "The method is renamed to `.view_bits_mut`"
+	)]
+	fn bits_mut<O>(&mut self) -> &BitSlice<O, Self::Store>
+	where O: BitOrder {
+		self.view_bits_mut::<O>()
+	}
+
+	/// Produces the number of bits that the implementing type can hold.
+	#[doc(hidden)]
+	fn const_bits() -> usize
+	where Self: Sized {
+		Self::const_elts() << <<Self::Store as BitStore>::Mem as BitMemory>::INDX
+	}
+
+	/// Produces the number of memory elements that the implementing type holds.
+	#[doc(hidden)]
+	fn const_elts() -> usize
+	where Self: Sized;
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> BitView for T
+where T: BitStore + BitRegister
+{
+	type Mem = T::Mem;
+	type Store = Self;
+
+	#[inline(always)]
+	fn view_bits<O>(&self) -> &BitSlice<O, Self::Store>
+	where O: BitOrder {
+		BitSlice::from_element(self)
+	}
+
+	#[inline(always)]
+	fn view_bits_mut<O>(&mut self) -> &mut BitSlice<O, Self::Store>
+	where O: BitOrder {
+		BitSlice::from_element_mut(self)
+	}
+
+	#[doc(hidden)]
+	#[inline(always)]
+	fn const_elts() -> usize {
+		1
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> BitView for [T]
+where T: BitStore + BitRegister
+{
+	type Mem = T::Mem;
+	type Store = T;
+
+	#[inline]
+	fn view_bits<O>(&self) -> &BitSlice<O, Self::Store>
+	where O: BitOrder {
+		BitSlice::from_slice(self).expect("slice was too long to view as bits")
+	}
+
+	#[inline]
+	fn view_bits_mut<O>(&mut self) -> &mut BitSlice<O, Self::Store>
+	where O: BitOrder {
+		BitSlice::from_slice_mut(self)
+			.expect("slice was too long to view as bits")
+	}
+
+	/// Slices cannot implement this function.
+	#[cold]
+	#[doc(hidden)]
+	#[inline(never)]
+	fn const_elts() -> usize {
+		unreachable!("This cannot be called on unsized slices")
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<T> BitView for [T; 0]
+where T: BitStore
+{
+	type Mem = T::Mem;
+	type Store = T;
+
+	#[inline(always)]
+	fn view_bits<O>(&self) -> &BitSlice<O, Self::Store>
+	where O: BitOrder {
+		BitSlice::empty()
+	}
+
+	#[inline(always)]
+	fn view_bits_mut<O>(&mut self) -> &mut BitSlice<O, Self::Store>
+	where O: BitOrder {
+		BitSlice::empty_mut()
+	}
+
+	#[doc(hidden)]
+	#[inline(always)]
+	fn const_elts() -> usize {
+		0
+	}
+}
+
+//  Replace with a const-generic once that becomes available.
+macro_rules! view_bits {
+	($($n:expr),+ $(,)?) => { $(
+		#[cfg(not(tarpaulin_include))]
+		impl<T> BitView for [T; $n]
+		where T: BitStore {
+			type Store = T;
+			type Mem = T::Mem;
+
+			#[inline]
+			fn view_bits<O>(&self) -> &BitSlice<O, Self::Store>
+			where O: BitOrder {
+				unsafe {
+					BitPtr::new_unchecked(
+						self.as_ptr(),
+						BitIdx::ZERO,
+						$n * T::Mem::BITS as usize,
+					)
+				}
+				.to_bitslice_ref()
+			}
+
+			#[inline]
+			fn view_bits_mut<O>(&mut self) -> &mut BitSlice<O, Self::Store>
+			where O: BitOrder {
+				unsafe {
+					BitPtr::new_unchecked(
+						self.as_mut_ptr(),
+						BitIdx::ZERO,
+						$n * T::Mem::BITS as usize,
+					)
+				}
+				.to_bitslice_mut()
+			}
+
+			#[doc(hidden)]
+			#[inline(always)]
+			fn const_elts() -> usize {
+				$n
+			}
+		}
+	)+ };
+}
+
+view_bits!(
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+	22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+	41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+	60, 61, 62, 63, 64
+);
+
+/** Views a region as an immutable bit-slice only.
+
+This trait is an analogue to the [`AsRef`] trait, in that it enables any type to
+provide an immutable-only view of a bit slice.
+
+It does not require an `AsRef<[T: BitStore]>` implementation, and a blanket
+implementation for all such types is provided. This allows you to choose whether
+to implement only one of `AsBits<T>` or `AsRef<[T]>`, and gain a bit-slice view
+with either choice.
+
+# Type Parameters
+
+- `T`: The underlying storage region.
+
+# Notes
+
+You are not *forbidden* from creating multiple views with different element
+types to the same region, but doing so is likely to cause inconsistent and
+unsurprising behavior.
+
+Refrain from implementing this trait with more than one storage argument unless
+you are sure that you can uphold the memory region requirements of all of them,
+and are aware of the behavior conflicts that may arise.
+
+[`AsRef`]: https://doc.rust-lang.org/core/convert/trait.AsRef.html
+**/
+pub trait AsBits<T>
+where T: BitStore
+{
+	/// Views memory as a slice of immutable bits.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: The bit ordering used for the region.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: The value that is providing a bit-slice view.
+	///
+	/// # Returns
+	///
+	/// An immutable view into some bits.
+	fn as_bits<O>(&self) -> &BitSlice<O, T>
+	where O: BitOrder;
+}
+
+/** Views a region as a mutable bit-slice.
+
+This trait is an analogue to the [`AsMut`] trait, in that it enables any type to
+provide a mutable view of a bit slice.
+
+It does not require an `AsMut<[T: BitStore]>` implementation, and a blanket
+implementation for all such types is provided. This allows you to choose whether
+to implement only one of `AsBitsMut<T>` or `AsMut<[T]>`, and gain a bit-slice
+view with either choice.
+
+# Type Parameters
+
+- `T`: The underlying storage region.
+
+# Notes
+
+You are not *forbidden* from creating multiple views with different element
+types to the same region, but doing so is likely to cause inconsistent and
+unsurprising behavior.
+
+Refrain from implementing this trait with more than one storage argument unless
+you are sure that you can uphold the memory region requirements of all of them,
+and are aware of the behavior conflicts that may arise.
+
+[`AsMut`]: https://doc.rust-lang.org/core/convert/trait.AsMut.html
+**/
+pub trait AsBitsMut<T>
+where T: BitStore
+{
+	/// Views memory as a slice of mutable bits.
+	///
+	/// # Type Parameters
+	///
+	/// - `O`: The bit ordering used for the region.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`: The value that is providing a bit-slice view.
+	///
+	/// # Returns
+	///
+	/// A mutable view into some bits.
+	fn as_bits_mut<O>(&mut self) -> &mut BitSlice<O, T>
+	where O: BitOrder;
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<A, T> AsBits<T> for A
+where
+	A: AsRef<[T]>,
+	T: BitStore + BitRegister,
+{
+	#[inline]
+	fn as_bits<O>(&self) -> &BitSlice<O, T>
+	where O: BitOrder {
+		self.as_ref().view_bits::<O>()
+	}
+}
+
+#[cfg(not(tarpaulin_include))]
+impl<A, T> AsBitsMut<T> for A
+where
+	A: AsMut<[T]>,
+	T: BitStore + BitRegister,
+{
+	#[inline]
+	fn as_bits_mut<O>(&mut self) -> &mut BitSlice<O, T>
+	where O: BitOrder {
+		self.as_mut().view_bits_mut::<O>()
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"b79e2347297dee32b9483747ee3cf145bd60e8c9d14cc02929287dabde4685ff","README.md":"b90c7a163a0fbff29e2c049953968c8cbfe8aa616d7e36775f0a565761dcc671","src/avx2.rs":"b79f36e3a7442d241e3fdf2ec159866aea31b78883660a63cdc9b1a262f18d10","src/blake2bp.rs":"83577d4a22db3b92030d9bd4563aa9ad440f23c64a6ad5f10a9d709f22d50589","src/guts.rs":"1189cab87b18eaaf2abd5bcb3d7d799c75401a312cee6f1f65fdaad30203eb6f","src/lib.rs":"b0404c81988e4de8d8864437c512937d9e888c681ef4739ef2d5db1650bd8766","src/many.rs":"60d07e4d7ad63949fb5432ad05f7c6a525a3eee39d325f7d4e65e901b466be95","src/portable.rs":"a274acd298a394c014096a8214a0dc1db7439d1e920bd2ad75707fadcc501e10","src/sse41.rs":"58e9e2ec97d266e9fb4cfa874f8cfcf5ee046911837824ceea4b99cd4007560b","src/test.rs":"1685eec6fedc30fca1332cbb78c85e6c9b56eca962b6c6343c91ba69eefac754"},"package":"afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "blake2b_simd"
-version = "0.5.11"
-authors = ["Jack O'Connor"]
-description = "a pure Rust BLAKE2b implementation with dynamic SIMD"
-documentation = "https://docs.rs/blake2b_simd"
-readme = "README.md"
-keywords = ["blake2b", "blake2bp", "blake2"]
-license = "MIT"
-repository = "https://github.com/oconnor663/blake2_simd"
-[dependencies.arrayref]
-version = "0.3.5"
-
-[dependencies.arrayvec]
-version = "0.5.0"
-default-features = false
-
-[dependencies.constant_time_eq]
-version = "0.1.3"
-
-[features]
-default = ["std"]
-std = []
-uninline_portable = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-# blake2b_simd [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Actions Status](https://github.com/oconnor663/blake2_simd/workflows/tests/badge.svg)](https://github.com/oconnor663/blake2_simd/actions)
-
-An implementation of the BLAKE2b and BLAKE2bp hash functions. See also
-[`blake2s_simd`](../blake2s).
-
-This crate includes:
-
-- 100% stable Rust.
-- SIMD implementations based on Samuel Neves' [`blake2-avx2`](https://github.com/sneves/blake2-avx2).
-  These are very fast. For benchmarks, see [the Performance section of the
-  README](https://github.com/oconnor663/blake2_simd#performance).
-- Portable, safe implementations for other platforms.
-- Dynamic CPU feature detection. Binaries include multiple implementations by default and
-  choose the fastest one the processor supports at runtime.
-- All the features from the [the BLAKE2 spec](https://blake2.net/blake2.pdf), like adjustable
-  length, keying, and associated data for tree hashing.
-- `no_std` support. The `std` Cargo feature is on by default, for CPU feature detection and
-  for implementing `std::io::Write`.
-- Support for computing multiple BLAKE2b hashes in parallel, matching the efficiency of
-  BLAKE2bp. See the [`many`](many/index.html) module.
-
-# Example
-
-```
-use blake2b_simd::{blake2b, Params};
-
-let expected = "ca002330e69d3e6b84a46a56a6533fd79d51d97a3bb7cad6c2ff43b354185d6d\
-                c1e723fb3db4ae0737e120378424c714bb982d9dc5bbd7a0ab318240ddd18f8d";
-let hash = blake2b(b"foo");
-assert_eq!(expected, &hash.to_hex());
-
-let hash = Params::new()
-    .hash_length(16)
-    .key(b"The Magic Words are Squeamish Ossifrage")
-    .personal(b"L. P. Waterhouse")
-    .to_state()
-    .update(b"foo")
-    .update(b"bar")
-    .update(b"baz")
-    .finalize();
-assert_eq!("ee8ff4e9be887297cf79348dc35dab56", &hash.to_hex());
-```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/avx2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/avx2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/avx2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/avx2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,929 +0,0 @@
-#[cfg(target_arch = "x86")]
-use core::arch::x86::*;
-#[cfg(target_arch = "x86_64")]
-use core::arch::x86_64::*;
-
-use crate::guts::{
-    assemble_count, count_high, count_low, final_block, flag_word, input_debug_asserts, Finalize,
-    Job, LastNode, Stride,
-};
-use crate::{Count, Word, BLOCKBYTES, IV, SIGMA};
-use arrayref::{array_refs, mut_array_refs};
-use core::cmp;
-use core::mem;
-
-pub const DEGREE: usize = 4;
-
-#[inline(always)]
-unsafe fn loadu(src: *const [Word; DEGREE]) -> __m256i {
-    // This is an unaligned load, so the pointer cast is allowed.
-    _mm256_loadu_si256(src as *const __m256i)
-}
-
-#[inline(always)]
-unsafe fn storeu(src: __m256i, dest: *mut [Word; DEGREE]) {
-    // This is an unaligned store, so the pointer cast is allowed.
-    _mm256_storeu_si256(dest as *mut __m256i, src)
-}
-
-#[inline(always)]
-unsafe fn loadu_128(mem_addr: &[u8; 16]) -> __m128i {
-    _mm_loadu_si128(mem_addr.as_ptr() as *const __m128i)
-}
-
-#[inline(always)]
-unsafe fn add(a: __m256i, b: __m256i) -> __m256i {
-    _mm256_add_epi64(a, b)
-}
-
-#[inline(always)]
-unsafe fn eq(a: __m256i, b: __m256i) -> __m256i {
-    _mm256_cmpeq_epi64(a, b)
-}
-
-#[inline(always)]
-unsafe fn and(a: __m256i, b: __m256i) -> __m256i {
-    _mm256_and_si256(a, b)
-}
-
-#[inline(always)]
-unsafe fn negate_and(a: __m256i, b: __m256i) -> __m256i {
-    // Note that "and not" implies the reverse of the actual arg order.
-    _mm256_andnot_si256(a, b)
-}
-
-#[inline(always)]
-unsafe fn xor(a: __m256i, b: __m256i) -> __m256i {
-    _mm256_xor_si256(a, b)
-}
-
-#[inline(always)]
-unsafe fn set1(x: u64) -> __m256i {
-    _mm256_set1_epi64x(x as i64)
-}
-
-#[inline(always)]
-unsafe fn set4(a: u64, b: u64, c: u64, d: u64) -> __m256i {
-    _mm256_setr_epi64x(a as i64, b as i64, c as i64, d as i64)
-}
-
-// Adapted from https://github.com/rust-lang-nursery/stdsimd/pull/479.
-macro_rules! _MM_SHUFFLE {
-    ($z:expr, $y:expr, $x:expr, $w:expr) => {
-        ($z << 6) | ($y << 4) | ($x << 2) | $w
-    };
-}
-
-// These rotations are the "simple version". For the "complicated version", see
-// https://github.com/sneves/blake2-avx2/blob/b3723921f668df09ece52dcd225a36d4a4eea1d9/blake2b-common.h#L43-L46.
-// For a discussion of the tradeoffs, see
-// https://github.com/sneves/blake2-avx2/pull/5. In short:
-// - Due to an LLVM bug (https://bugs.llvm.org/show_bug.cgi?id=44379), this
-//   version performs better on recent x86 chips.
-// - LLVM is able to optimize this version to AVX-512 rotation instructions
-//   when those are enabled.
-
-#[inline(always)]
-unsafe fn rot32(x: __m256i) -> __m256i {
-    _mm256_or_si256(_mm256_srli_epi64(x, 32), _mm256_slli_epi64(x, 64 - 32))
-}
-
-#[inline(always)]
-unsafe fn rot24(x: __m256i) -> __m256i {
-    _mm256_or_si256(_mm256_srli_epi64(x, 24), _mm256_slli_epi64(x, 64 - 24))
-}
-
-#[inline(always)]
-unsafe fn rot16(x: __m256i) -> __m256i {
-    _mm256_or_si256(_mm256_srli_epi64(x, 16), _mm256_slli_epi64(x, 64 - 16))
-}
-
-#[inline(always)]
-unsafe fn rot63(x: __m256i) -> __m256i {
-    _mm256_or_si256(_mm256_srli_epi64(x, 63), _mm256_slli_epi64(x, 64 - 63))
-}
-
-#[inline(always)]
-unsafe fn g1(a: &mut __m256i, b: &mut __m256i, c: &mut __m256i, d: &mut __m256i, m: &mut __m256i) {
-    *a = add(*a, *m);
-    *a = add(*a, *b);
-    *d = xor(*d, *a);
-    *d = rot32(*d);
-    *c = add(*c, *d);
-    *b = xor(*b, *c);
-    *b = rot24(*b);
-}
-
-#[inline(always)]
-unsafe fn g2(a: &mut __m256i, b: &mut __m256i, c: &mut __m256i, d: &mut __m256i, m: &mut __m256i) {
-    *a = add(*a, *m);
-    *a = add(*a, *b);
-    *d = xor(*d, *a);
-    *d = rot16(*d);
-    *c = add(*c, *d);
-    *b = xor(*b, *c);
-    *b = rot63(*b);
-}
-
-// Note the optimization here of leaving b as the unrotated row, rather than a.
-// All the message loads below are adjusted to compensate for this. See
-// discussion at https://github.com/sneves/blake2-avx2/pull/4
-#[inline(always)]
-unsafe fn diagonalize(a: &mut __m256i, _b: &mut __m256i, c: &mut __m256i, d: &mut __m256i) {
-    *a = _mm256_permute4x64_epi64(*a, _MM_SHUFFLE!(2, 1, 0, 3));
-    *d = _mm256_permute4x64_epi64(*d, _MM_SHUFFLE!(1, 0, 3, 2));
-    *c = _mm256_permute4x64_epi64(*c, _MM_SHUFFLE!(0, 3, 2, 1));
-}
-
-#[inline(always)]
-unsafe fn undiagonalize(a: &mut __m256i, _b: &mut __m256i, c: &mut __m256i, d: &mut __m256i) {
-    *a = _mm256_permute4x64_epi64(*a, _MM_SHUFFLE!(0, 3, 2, 1));
-    *d = _mm256_permute4x64_epi64(*d, _MM_SHUFFLE!(1, 0, 3, 2));
-    *c = _mm256_permute4x64_epi64(*c, _MM_SHUFFLE!(2, 1, 0, 3));
-}
-
-#[inline(always)]
-unsafe fn compress_block(
-    block: &[u8; BLOCKBYTES],
-    words: &mut [Word; 8],
-    count: Count,
-    last_block: Word,
-    last_node: Word,
-) {
-    let (words_low, words_high) = mut_array_refs!(words, DEGREE, DEGREE);
-    let (iv_low, iv_high) = array_refs!(&IV, DEGREE, DEGREE);
-    let mut a = loadu(words_low);
-    let mut b = loadu(words_high);
-    let mut c = loadu(iv_low);
-    let flags = set4(count_low(count), count_high(count), last_block, last_node);
-    let mut d = xor(loadu(iv_high), flags);
-
-    let msg_chunks = array_refs!(block, 16, 16, 16, 16, 16, 16, 16, 16);
-    let m0 = _mm256_broadcastsi128_si256(loadu_128(msg_chunks.0));
-    let m1 = _mm256_broadcastsi128_si256(loadu_128(msg_chunks.1));
-    let m2 = _mm256_broadcastsi128_si256(loadu_128(msg_chunks.2));
-    let m3 = _mm256_broadcastsi128_si256(loadu_128(msg_chunks.3));
-    let m4 = _mm256_broadcastsi128_si256(loadu_128(msg_chunks.4));
-    let m5 = _mm256_broadcastsi128_si256(loadu_128(msg_chunks.5));
-    let m6 = _mm256_broadcastsi128_si256(loadu_128(msg_chunks.6));
-    let m7 = _mm256_broadcastsi128_si256(loadu_128(msg_chunks.7));
-
-    let iv0 = a;
-    let iv1 = b;
-    let mut t0;
-    let mut t1;
-    let mut b0;
-
-    // round 1
-    t0 = _mm256_unpacklo_epi64(m0, m1);
-    t1 = _mm256_unpacklo_epi64(m2, m3);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m0, m1);
-    t1 = _mm256_unpackhi_epi64(m2, m3);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_unpacklo_epi64(m7, m4);
-    t1 = _mm256_unpacklo_epi64(m5, m6);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m7, m4);
-    t1 = _mm256_unpackhi_epi64(m5, m6);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 2
-    t0 = _mm256_unpacklo_epi64(m7, m2);
-    t1 = _mm256_unpackhi_epi64(m4, m6);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpacklo_epi64(m5, m4);
-    t1 = _mm256_alignr_epi8(m3, m7, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_unpackhi_epi64(m2, m0);
-    t1 = _mm256_blend_epi32(m5, m0, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_alignr_epi8(m6, m1, 8);
-    t1 = _mm256_blend_epi32(m3, m1, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 3
-    t0 = _mm256_alignr_epi8(m6, m5, 8);
-    t1 = _mm256_unpackhi_epi64(m2, m7);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpacklo_epi64(m4, m0);
-    t1 = _mm256_blend_epi32(m6, m1, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_alignr_epi8(m5, m4, 8);
-    t1 = _mm256_unpackhi_epi64(m1, m3);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpacklo_epi64(m2, m7);
-    t1 = _mm256_blend_epi32(m0, m3, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 4
-    t0 = _mm256_unpackhi_epi64(m3, m1);
-    t1 = _mm256_unpackhi_epi64(m6, m5);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m4, m0);
-    t1 = _mm256_unpacklo_epi64(m6, m7);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_alignr_epi8(m1, m7, 8);
-    t1 = _mm256_shuffle_epi32(m2, _MM_SHUFFLE!(1, 0, 3, 2));
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpacklo_epi64(m4, m3);
-    t1 = _mm256_unpacklo_epi64(m5, m0);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 5
-    t0 = _mm256_unpackhi_epi64(m4, m2);
-    t1 = _mm256_unpacklo_epi64(m1, m5);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_blend_epi32(m3, m0, 0x33);
-    t1 = _mm256_blend_epi32(m7, m2, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_alignr_epi8(m7, m1, 8);
-    t1 = _mm256_alignr_epi8(m3, m5, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m6, m0);
-    t1 = _mm256_unpacklo_epi64(m6, m4);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 6
-    t0 = _mm256_unpacklo_epi64(m1, m3);
-    t1 = _mm256_unpacklo_epi64(m0, m4);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpacklo_epi64(m6, m5);
-    t1 = _mm256_unpackhi_epi64(m5, m1);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_alignr_epi8(m2, m0, 8);
-    t1 = _mm256_unpackhi_epi64(m3, m7);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m4, m6);
-    t1 = _mm256_alignr_epi8(m7, m2, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 7
-    t0 = _mm256_blend_epi32(m0, m6, 0x33);
-    t1 = _mm256_unpacklo_epi64(m7, m2);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m2, m7);
-    t1 = _mm256_alignr_epi8(m5, m6, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_unpacklo_epi64(m4, m0);
-    t1 = _mm256_blend_epi32(m4, m3, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m5, m3);
-    t1 = _mm256_shuffle_epi32(m1, _MM_SHUFFLE!(1, 0, 3, 2));
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 8
-    t0 = _mm256_unpackhi_epi64(m6, m3);
-    t1 = _mm256_blend_epi32(m1, m6, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_alignr_epi8(m7, m5, 8);
-    t1 = _mm256_unpackhi_epi64(m0, m4);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_blend_epi32(m2, m1, 0x33);
-    t1 = _mm256_alignr_epi8(m4, m7, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpacklo_epi64(m5, m0);
-    t1 = _mm256_unpacklo_epi64(m2, m3);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 9
-    t0 = _mm256_unpacklo_epi64(m3, m7);
-    t1 = _mm256_alignr_epi8(m0, m5, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m7, m4);
-    t1 = _mm256_alignr_epi8(m4, m1, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_unpacklo_epi64(m5, m6);
-    t1 = _mm256_unpackhi_epi64(m6, m0);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_alignr_epi8(m1, m2, 8);
-    t1 = _mm256_alignr_epi8(m2, m3, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 10
-    t0 = _mm256_unpacklo_epi64(m5, m4);
-    t1 = _mm256_unpackhi_epi64(m3, m0);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpacklo_epi64(m1, m2);
-    t1 = _mm256_blend_epi32(m2, m3, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_unpackhi_epi64(m6, m7);
-    t1 = _mm256_unpackhi_epi64(m4, m1);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_blend_epi32(m5, m0, 0x33);
-    t1 = _mm256_unpacklo_epi64(m7, m6);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 11
-    t0 = _mm256_unpacklo_epi64(m0, m1);
-    t1 = _mm256_unpacklo_epi64(m2, m3);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m0, m1);
-    t1 = _mm256_unpackhi_epi64(m2, m3);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_unpacklo_epi64(m7, m4);
-    t1 = _mm256_unpacklo_epi64(m5, m6);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpackhi_epi64(m7, m4);
-    t1 = _mm256_unpackhi_epi64(m5, m6);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    // round 12
-    t0 = _mm256_unpacklo_epi64(m7, m2);
-    t1 = _mm256_unpackhi_epi64(m4, m6);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_unpacklo_epi64(m5, m4);
-    t1 = _mm256_alignr_epi8(m3, m7, 8);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    diagonalize(&mut a, &mut b, &mut c, &mut d);
-    t0 = _mm256_unpackhi_epi64(m2, m0);
-    t1 = _mm256_blend_epi32(m5, m0, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g1(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    t0 = _mm256_alignr_epi8(m6, m1, 8);
-    t1 = _mm256_blend_epi32(m3, m1, 0x33);
-    b0 = _mm256_blend_epi32(t0, t1, 0xF0);
-    g2(&mut a, &mut b, &mut c, &mut d, &mut b0);
-    undiagonalize(&mut a, &mut b, &mut c, &mut d);
-
-    a = xor(a, c);
-    b = xor(b, d);
-    a = xor(a, iv0);
-    b = xor(b, iv1);
-
-    storeu(a, words_low);
-    storeu(b, words_high);
-}
-
-#[target_feature(enable = "avx2")]
-pub unsafe fn compress1_loop(
-    input: &[u8],
-    words: &mut [Word; 8],
-    mut count: Count,
-    last_node: LastNode,
-    finalize: Finalize,
-    stride: Stride,
-) {
-    input_debug_asserts(input, finalize);
-
-    let mut local_words = *words;
-
-    let mut fin_offset = input.len().saturating_sub(1);
-    fin_offset -= fin_offset % stride.padded_blockbytes();
-    let mut buf = [0; BLOCKBYTES];
-    let (fin_block, fin_len, _) = final_block(input, fin_offset, &mut buf, stride);
-    let fin_last_block = flag_word(finalize.yes());
-    let fin_last_node = flag_word(finalize.yes() && last_node.yes());
-
-    let mut offset = 0;
-    loop {
-        let block;
-        let count_delta;
-        let last_block;
-        let last_node;
-        if offset == fin_offset {
-            block = fin_block;
-            count_delta = fin_len;
-            last_block = fin_last_block;
-            last_node = fin_last_node;
-        } else {
-            // This unsafe cast avoids bounds checks. There's guaranteed to be
-            // enough input because `offset < fin_offset`.
-            block = &*(input.as_ptr().add(offset) as *const [u8; BLOCKBYTES]);
-            count_delta = BLOCKBYTES;
-            last_block = flag_word(false);
-            last_node = flag_word(false);
-        };
-
-        count = count.wrapping_add(count_delta as Count);
-        compress_block(block, &mut local_words, count, last_block, last_node);
-
-        // Check for termination before bumping the offset, to avoid overflow.
-        if offset == fin_offset {
-            break;
-        }
-
-        offset += stride.padded_blockbytes();
-    }
-
-    *words = local_words;
-}
-
-// Performance note: Factoring out a G function here doesn't hurt performance,
-// unlike in the case of BLAKE2s where it hurts substantially. In fact, on my
-// machine, it helps a tiny bit. But the difference it tiny, so I'm going to
-// stick to the approach used by https://github.com/sneves/blake2-avx2
-// until/unless I can be sure the (tiny) improvement is consistent across
-// different Intel microarchitectures. Smaller code size is nice, but a
-// divergence between the BLAKE2b and BLAKE2s implementations is less nice.
-#[inline(always)]
-unsafe fn round(v: &mut [__m256i; 16], m: &[__m256i; 16], r: usize) {
-    v[0] = add(v[0], m[SIGMA[r][0] as usize]);
-    v[1] = add(v[1], m[SIGMA[r][2] as usize]);
-    v[2] = add(v[2], m[SIGMA[r][4] as usize]);
-    v[3] = add(v[3], m[SIGMA[r][6] as usize]);
-    v[0] = add(v[0], v[4]);
-    v[1] = add(v[1], v[5]);
-    v[2] = add(v[2], v[6]);
-    v[3] = add(v[3], v[7]);
-    v[12] = xor(v[12], v[0]);
-    v[13] = xor(v[13], v[1]);
-    v[14] = xor(v[14], v[2]);
-    v[15] = xor(v[15], v[3]);
-    v[12] = rot32(v[12]);
-    v[13] = rot32(v[13]);
-    v[14] = rot32(v[14]);
-    v[15] = rot32(v[15]);
-    v[8] = add(v[8], v[12]);
-    v[9] = add(v[9], v[13]);
-    v[10] = add(v[10], v[14]);
-    v[11] = add(v[11], v[15]);
-    v[4] = xor(v[4], v[8]);
-    v[5] = xor(v[5], v[9]);
-    v[6] = xor(v[6], v[10]);
-    v[7] = xor(v[7], v[11]);
-    v[4] = rot24(v[4]);
-    v[5] = rot24(v[5]);
-    v[6] = rot24(v[6]);
-    v[7] = rot24(v[7]);
-    v[0] = add(v[0], m[SIGMA[r][1] as usize]);
-    v[1] = add(v[1], m[SIGMA[r][3] as usize]);
-    v[2] = add(v[2], m[SIGMA[r][5] as usize]);
-    v[3] = add(v[3], m[SIGMA[r][7] as usize]);
-    v[0] = add(v[0], v[4]);
-    v[1] = add(v[1], v[5]);
-    v[2] = add(v[2], v[6]);
-    v[3] = add(v[3], v[7]);
-    v[12] = xor(v[12], v[0]);
-    v[13] = xor(v[13], v[1]);
-    v[14] = xor(v[14], v[2]);
-    v[15] = xor(v[15], v[3]);
-    v[12] = rot16(v[12]);
-    v[13] = rot16(v[13]);
-    v[14] = rot16(v[14]);
-    v[15] = rot16(v[15]);
-    v[8] = add(v[8], v[12]);
-    v[9] = add(v[9], v[13]);
-    v[10] = add(v[10], v[14]);
-    v[11] = add(v[11], v[15]);
-    v[4] = xor(v[4], v[8]);
-    v[5] = xor(v[5], v[9]);
-    v[6] = xor(v[6], v[10]);
-    v[7] = xor(v[7], v[11]);
-    v[4] = rot63(v[4]);
-    v[5] = rot63(v[5]);
-    v[6] = rot63(v[6]);
-    v[7] = rot63(v[7]);
-
-    v[0] = add(v[0], m[SIGMA[r][8] as usize]);
-    v[1] = add(v[1], m[SIGMA[r][10] as usize]);
-    v[2] = add(v[2], m[SIGMA[r][12] as usize]);
-    v[3] = add(v[3], m[SIGMA[r][14] as usize]);
-    v[0] = add(v[0], v[5]);
-    v[1] = add(v[1], v[6]);
-    v[2] = add(v[2], v[7]);
-    v[3] = add(v[3], v[4]);
-    v[15] = xor(v[15], v[0]);
-    v[12] = xor(v[12], v[1]);
-    v[13] = xor(v[13], v[2]);
-    v[14] = xor(v[14], v[3]);
-    v[15] = rot32(v[15]);
-    v[12] = rot32(v[12]);
-    v[13] = rot32(v[13]);
-    v[14] = rot32(v[14]);
-    v[10] = add(v[10], v[15]);
-    v[11] = add(v[11], v[12]);
-    v[8] = add(v[8], v[13]);
-    v[9] = add(v[9], v[14]);
-    v[5] = xor(v[5], v[10]);
-    v[6] = xor(v[6], v[11]);
-    v[7] = xor(v[7], v[8]);
-    v[4] = xor(v[4], v[9]);
-    v[5] = rot24(v[5]);
-    v[6] = rot24(v[6]);
-    v[7] = rot24(v[7]);
-    v[4] = rot24(v[4]);
-    v[0] = add(v[0], m[SIGMA[r][9] as usize]);
-    v[1] = add(v[1], m[SIGMA[r][11] as usize]);
-    v[2] = add(v[2], m[SIGMA[r][13] as usize]);
-    v[3] = add(v[3], m[SIGMA[r][15] as usize]);
-    v[0] = add(v[0], v[5]);
-    v[1] = add(v[1], v[6]);
-    v[2] = add(v[2], v[7]);
-    v[3] = add(v[3], v[4]);
-    v[15] = xor(v[15], v[0]);
-    v[12] = xor(v[12], v[1]);
-    v[13] = xor(v[13], v[2]);
-    v[14] = xor(v[14], v[3]);
-    v[15] = rot16(v[15]);
-    v[12] = rot16(v[12]);
-    v[13] = rot16(v[13]);
-    v[14] = rot16(v[14]);
-    v[10] = add(v[10], v[15]);
-    v[11] = add(v[11], v[12]);
-    v[8] = add(v[8], v[13]);
-    v[9] = add(v[9], v[14]);
-    v[5] = xor(v[5], v[10]);
-    v[6] = xor(v[6], v[11]);
-    v[7] = xor(v[7], v[8]);
-    v[4] = xor(v[4], v[9]);
-    v[5] = rot63(v[5]);
-    v[6] = rot63(v[6]);
-    v[7] = rot63(v[7]);
-    v[4] = rot63(v[4]);
-}
-
-// We'd rather make this a regular function with #[inline(always)], but for
-// some reason that blows up compile times by about 10 seconds, at least in
-// some cases (BLAKE2b avx2.rs). This macro seems to get the same performance
-// result, without the compile time issue.
-macro_rules! compress4_transposed {
-    (
-        $h_vecs:expr,
-        $msg_vecs:expr,
-        $count_low:expr,
-        $count_high:expr,
-        $lastblock:expr,
-        $lastnode:expr,
-    ) => {
-        let h_vecs: &mut [__m256i; 8] = $h_vecs;
-        let msg_vecs: &[__m256i; 16] = $msg_vecs;
-        let count_low: __m256i = $count_low;
-        let count_high: __m256i = $count_high;
-        let lastblock: __m256i = $lastblock;
-        let lastnode: __m256i = $lastnode;
-
-        let mut v = [
-            h_vecs[0],
-            h_vecs[1],
-            h_vecs[2],
-            h_vecs[3],
-            h_vecs[4],
-            h_vecs[5],
-            h_vecs[6],
-            h_vecs[7],
-            set1(IV[0]),
-            set1(IV[1]),
-            set1(IV[2]),
-            set1(IV[3]),
-            xor(set1(IV[4]), count_low),
-            xor(set1(IV[5]), count_high),
-            xor(set1(IV[6]), lastblock),
-            xor(set1(IV[7]), lastnode),
-        ];
-
-        round(&mut v, &msg_vecs, 0);
-        round(&mut v, &msg_vecs, 1);
-        round(&mut v, &msg_vecs, 2);
-        round(&mut v, &msg_vecs, 3);
-        round(&mut v, &msg_vecs, 4);
-        round(&mut v, &msg_vecs, 5);
-        round(&mut v, &msg_vecs, 6);
-        round(&mut v, &msg_vecs, 7);
-        round(&mut v, &msg_vecs, 8);
-        round(&mut v, &msg_vecs, 9);
-        round(&mut v, &msg_vecs, 10);
-        round(&mut v, &msg_vecs, 11);
-
-        h_vecs[0] = xor(xor(h_vecs[0], v[0]), v[8]);
-        h_vecs[1] = xor(xor(h_vecs[1], v[1]), v[9]);
-        h_vecs[2] = xor(xor(h_vecs[2], v[2]), v[10]);
-        h_vecs[3] = xor(xor(h_vecs[3], v[3]), v[11]);
-        h_vecs[4] = xor(xor(h_vecs[4], v[4]), v[12]);
-        h_vecs[5] = xor(xor(h_vecs[5], v[5]), v[13]);
-        h_vecs[6] = xor(xor(h_vecs[6], v[6]), v[14]);
-        h_vecs[7] = xor(xor(h_vecs[7], v[7]), v[15]);
-    };
-}
-
-#[inline(always)]
-unsafe fn interleave128(a: __m256i, b: __m256i) -> (__m256i, __m256i) {
-    (
-        _mm256_permute2x128_si256(a, b, 0x20),
-        _mm256_permute2x128_si256(a, b, 0x31),
-    )
-}
-
-// There are several ways to do a transposition. We could do it naively, with 8 separate
-// _mm256_set_epi64x instructions, referencing each of the 64 words explicitly. Or we could copy
-// the vecs into contiguous storage and then use gather instructions. This third approach is to use
-// a series of unpack instructions to interleave the vectors. In my benchmarks, interleaving is the
-// fastest approach. To test this, run `cargo +nightly bench --bench libtest load_4` in the
-// https://github.com/oconnor663/bao_experiments repo.
-#[inline(always)]
-unsafe fn transpose_vecs(
-    vec_a: __m256i,
-    vec_b: __m256i,
-    vec_c: __m256i,
-    vec_d: __m256i,
-) -> [__m256i; DEGREE] {
-    // Interleave 64-bit lates. The low unpack is lanes 00/22 and the high is 11/33.
-    let ab_02 = _mm256_unpacklo_epi64(vec_a, vec_b);
-    let ab_13 = _mm256_unpackhi_epi64(vec_a, vec_b);
-    let cd_02 = _mm256_unpacklo_epi64(vec_c, vec_d);
-    let cd_13 = _mm256_unpackhi_epi64(vec_c, vec_d);
-
-    // Interleave 128-bit lanes.
-    let (abcd_0, abcd_2) = interleave128(ab_02, cd_02);
-    let (abcd_1, abcd_3) = interleave128(ab_13, cd_13);
-
-    [abcd_0, abcd_1, abcd_2, abcd_3]
-}
-
-#[inline(always)]
-unsafe fn transpose_state_vecs(jobs: &[Job; DEGREE]) -> [__m256i; 8] {
-    // Load all the state words into transposed vectors, where the first vector
-    // has the first word of each state, etc. Transposing once at the beginning
-    // and once at the end is more efficient that repeating it for each block.
-    let words0 = array_refs!(&jobs[0].words, DEGREE, DEGREE);
-    let words1 = array_refs!(&jobs[1].words, DEGREE, DEGREE);
-    let words2 = array_refs!(&jobs[2].words, DEGREE, DEGREE);
-    let words3 = array_refs!(&jobs[3].words, DEGREE, DEGREE);
-    let [h0, h1, h2, h3] = transpose_vecs(
-        loadu(words0.0),
-        loadu(words1.0),
-        loadu(words2.0),
-        loadu(words3.0),
-    );
-    let [h4, h5, h6, h7] = transpose_vecs(
-        loadu(words0.1),
-        loadu(words1.1),
-        loadu(words2.1),
-        loadu(words3.1),
-    );
-    [h0, h1, h2, h3, h4, h5, h6, h7]
-}
-
-#[inline(always)]
-unsafe fn untranspose_state_vecs(h_vecs: &[__m256i; 8], jobs: &mut [Job; DEGREE]) {
-    // Un-transpose the updated state vectors back into the caller's arrays.
-    let [job0, job1, job2, job3] = jobs;
-    let words0 = mut_array_refs!(&mut job0.words, DEGREE, DEGREE);
-    let words1 = mut_array_refs!(&mut job1.words, DEGREE, DEGREE);
-    let words2 = mut_array_refs!(&mut job2.words, DEGREE, DEGREE);
-    let words3 = mut_array_refs!(&mut job3.words, DEGREE, DEGREE);
-    let out = transpose_vecs(h_vecs[0], h_vecs[1], h_vecs[2], h_vecs[3]);
-    storeu(out[0], words0.0);
-    storeu(out[1], words1.0);
-    storeu(out[2], words2.0);
-    storeu(out[3], words3.0);
-    let out = transpose_vecs(h_vecs[4], h_vecs[5], h_vecs[6], h_vecs[7]);
-    storeu(out[0], words0.1);
-    storeu(out[1], words1.1);
-    storeu(out[2], words2.1);
-    storeu(out[3], words3.1);
-}
-
-#[inline(always)]
-unsafe fn transpose_msg_vecs(blocks: [*const [u8; BLOCKBYTES]; DEGREE]) -> [__m256i; 16] {
-    // These input arrays have no particular alignment, so we use unaligned
-    // loads to read from them.
-    let block0 = blocks[0] as *const [Word; DEGREE];
-    let block1 = blocks[1] as *const [Word; DEGREE];
-    let block2 = blocks[2] as *const [Word; DEGREE];
-    let block3 = blocks[3] as *const [Word; DEGREE];
-    let [m0, m1, m2, m3] = transpose_vecs(
-        loadu(block0.add(0)),
-        loadu(block1.add(0)),
-        loadu(block2.add(0)),
-        loadu(block3.add(0)),
-    );
-    let [m4, m5, m6, m7] = transpose_vecs(
-        loadu(block0.add(1)),
-        loadu(block1.add(1)),
-        loadu(block2.add(1)),
-        loadu(block3.add(1)),
-    );
-    let [m8, m9, m10, m11] = transpose_vecs(
-        loadu(block0.add(2)),
-        loadu(block1.add(2)),
-        loadu(block2.add(2)),
-        loadu(block3.add(2)),
-    );
-    let [m12, m13, m14, m15] = transpose_vecs(
-        loadu(block0.add(3)),
-        loadu(block1.add(3)),
-        loadu(block2.add(3)),
-        loadu(block3.add(3)),
-    );
-    [
-        m0, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15,
-    ]
-}
-
-#[inline(always)]
-unsafe fn load_counts(jobs: &[Job; DEGREE]) -> (__m256i, __m256i) {
-    (
-        set4(
-            count_low(jobs[0].count),
-            count_low(jobs[1].count),
-            count_low(jobs[2].count),
-            count_low(jobs[3].count),
-        ),
-        set4(
-            count_high(jobs[0].count),
-            count_high(jobs[1].count),
-            count_high(jobs[2].count),
-            count_high(jobs[3].count),
-        ),
-    )
-}
-
-#[inline(always)]
-unsafe fn store_counts(jobs: &mut [Job; DEGREE], low: __m256i, high: __m256i) {
-    let low_ints: [Word; DEGREE] = mem::transmute(low);
-    let high_ints: [Word; DEGREE] = mem::transmute(high);
-    for i in 0..DEGREE {
-        jobs[i].count = assemble_count(low_ints[i], high_ints[i]);
-    }
-}
-
-#[inline(always)]
-unsafe fn add_to_counts(lo: &mut __m256i, hi: &mut __m256i, delta: __m256i) {
-    // If the low counts reach zero, that means they wrapped, unless the delta
-    // was also zero.
-    *lo = add(*lo, delta);
-    let lo_reached_zero = eq(*lo, set1(0));
-    let delta_was_zero = eq(delta, set1(0));
-    let hi_inc = and(set1(1), negate_and(delta_was_zero, lo_reached_zero));
-    *hi = add(*hi, hi_inc);
-}
-
-#[inline(always)]
-unsafe fn flags_vec(flags: [bool; DEGREE]) -> __m256i {
-    set4(
-        flag_word(flags[0]),
-        flag_word(flags[1]),
-        flag_word(flags[2]),
-        flag_word(flags[3]),
-    )
-}
-
-#[target_feature(enable = "avx2")]
-pub unsafe fn compress4_loop(jobs: &mut [Job; DEGREE], finalize: Finalize, stride: Stride) {
-    // If we're not finalizing, there can't be a partial block at the end.
-    for job in jobs.iter() {
-        input_debug_asserts(job.input, finalize);
-    }
-
-    let msg_ptrs = [
-        jobs[0].input.as_ptr(),
-        jobs[1].input.as_ptr(),
-        jobs[2].input.as_ptr(),
-        jobs[3].input.as_ptr(),
-    ];
-    let mut h_vecs = transpose_state_vecs(&jobs);
-    let (mut counts_lo, mut counts_hi) = load_counts(&jobs);
-
-    // Prepare the final blocks (note, which could be empty if the input is
-    // empty). Do all this before entering the main loop.
-    let min_len = jobs.iter().map(|job| job.input.len()).min().unwrap();
-    let mut fin_offset = min_len.saturating_sub(1);
-    fin_offset -= fin_offset % stride.padded_blockbytes();
-    // Performance note, making these buffers mem::uninitialized() seems to
-    // cause problems in the optimizer.
-    let mut buf0: [u8; BLOCKBYTES] = [0; BLOCKBYTES];
-    let mut buf1: [u8; BLOCKBYTES] = [0; BLOCKBYTES];
-    let mut buf2: [u8; BLOCKBYTES] = [0; BLOCKBYTES];
-    let mut buf3: [u8; BLOCKBYTES] = [0; BLOCKBYTES];
-    let (block0, len0, finalize0) = final_block(jobs[0].input, fin_offset, &mut buf0, stride);
-    let (block1, len1, finalize1) = final_block(jobs[1].input, fin_offset, &mut buf1, stride);
-    let (block2, len2, finalize2) = final_block(jobs[2].input, fin_offset, &mut buf2, stride);
-    let (block3, len3, finalize3) = final_block(jobs[3].input, fin_offset, &mut buf3, stride);
-    let fin_blocks: [*const [u8; BLOCKBYTES]; DEGREE] = [block0, block1, block2, block3];
-    let fin_counts_delta = set4(len0 as Word, len1 as Word, len2 as Word, len3 as Word);
-    let fin_last_block;
-    let fin_last_node;
-    if finalize.yes() {
-        fin_last_block = flags_vec([finalize0, finalize1, finalize2, finalize3]);
-        fin_last_node = flags_vec([
-            finalize0 && jobs[0].last_node.yes(),
-            finalize1 && jobs[1].last_node.yes(),
-            finalize2 && jobs[2].last_node.yes(),
-            finalize3 && jobs[3].last_node.yes(),
-        ]);
-    } else {
-        fin_last_block = set1(0);
-        fin_last_node = set1(0);
-    }
-
-    // The main loop.
-    let mut offset = 0;
-    loop {
-        let blocks;
-        let counts_delta;
-        let last_block;
-        let last_node;
-        if offset == fin_offset {
-            blocks = fin_blocks;
-            counts_delta = fin_counts_delta;
-            last_block = fin_last_block;
-            last_node = fin_last_node;
-        } else {
-            blocks = [
-                msg_ptrs[0].add(offset) as *const [u8; BLOCKBYTES],
-                msg_ptrs[1].add(offset) as *const [u8; BLOCKBYTES],
-                msg_ptrs[2].add(offset) as *const [u8; BLOCKBYTES],
-                msg_ptrs[3].add(offset) as *const [u8; BLOCKBYTES],
-            ];
-            counts_delta = set1(BLOCKBYTES as Word);
-            last_block = set1(0);
-            last_node = set1(0);
-        };
-
-        let m_vecs = transpose_msg_vecs(blocks);
-        add_to_counts(&mut counts_lo, &mut counts_hi, counts_delta);
-        compress4_transposed!(
-            &mut h_vecs,
-            &m_vecs,
-            counts_lo,
-            counts_hi,
-            last_block,
-            last_node,
-        );
-
-        // Check for termination before bumping the offset, to avoid overflow.
-        if offset == fin_offset {
-            break;
-        }
-
-        offset += stride.padded_blockbytes();
-    }
-
-    // Write out the results.
-    untranspose_state_vecs(&h_vecs, &mut *jobs);
-    store_counts(&mut *jobs, counts_lo, counts_hi);
-    let max_consumed = offset.saturating_add(stride.padded_blockbytes());
-    for job in jobs.iter_mut() {
-        let consumed = cmp::min(max_consumed, job.input.len());
-        job.input = &job.input[consumed..];
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/blake2bp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/blake2bp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/blake2bp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/blake2bp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,570 +0,0 @@
-//! BLAKE2bp, a variant of BLAKE2b that uses SIMD more efficiently.
-//!
-//! The AVX2 implementation of BLAKE2bp is about twice as fast that of BLAKE2b.
-//! However, note that it's a different hash function, and it gives a different
-//! hash from BLAKE2b for the same input.
-//!
-//! # Example
-//!
-//! ```
-//! use blake2b_simd::blake2bp;
-//!
-//! let hash = blake2bp::Params::new()
-//!     .hash_length(16)
-//!     .key(b"The Magic Words are Squeamish Ossifrage")
-//!     .to_state()
-//!     .update(b"foo")
-//!     .update(b"bar")
-//!     .update(b"baz")
-//!     .finalize();
-//! assert_eq!("e69c7d2c42a5ac14948772231c68c552", &hash.to_hex());
-//! ```
-
-use crate::guts::{Finalize, Implementation, Job, LastNode, Stride};
-use crate::many;
-use crate::Count;
-use crate::Hash;
-use crate::Word;
-use crate::BLOCKBYTES;
-use crate::KEYBYTES;
-use crate::OUTBYTES;
-use core::cmp;
-use core::fmt;
-use core::mem::size_of;
-
-#[cfg(feature = "std")]
-use std;
-
-pub(crate) const DEGREE: usize = 4;
-
-/// Compute the BLAKE2bp hash of a slice of bytes all at once, using default
-/// parameters.
-///
-/// # Example
-///
-/// ```
-/// # use blake2b_simd::blake2bp::blake2bp;
-/// let expected = "8ca9ccee7946afcb686fe7556628b5ba1bf9a691da37ca58cd049354d99f3704\
-///                 2c007427e5f219b9ab5063707ec6823872dee413ee014b4d02f2ebb6abb5f643";
-/// let hash = blake2bp(b"foo");
-/// assert_eq!(expected, &hash.to_hex());
-/// ```
-pub fn blake2bp(input: &[u8]) -> Hash {
-    Params::new().hash(input)
-}
-
-/// A parameter builder for BLAKE2bp, just like the [`Params`](../struct.Params.html) type for
-/// BLAKE2b.
-///
-/// This builder only supports configuring the hash length and a secret key. This matches the
-/// options provided by the [reference
-/// implementation](https://github.com/BLAKE2/BLAKE2/blob/320c325437539ae91091ce62efec1913cd8093c2/ref/blake2.h#L162-L165).
-///
-/// # Example
-///
-/// ```
-/// use blake2b_simd::blake2bp;
-/// let mut state = blake2bp::Params::new().hash_length(32).to_state();
-/// ```
-#[derive(Clone)]
-pub struct Params {
-    hash_length: u8,
-    key_length: u8,
-    key: [u8; KEYBYTES],
-    implementation: Implementation,
-}
-
-impl Params {
-    /// Equivalent to `Params::default()`.
-    pub fn new() -> Self {
-        Self {
-            hash_length: OUTBYTES as u8,
-            key_length: 0,
-            key: [0; KEYBYTES],
-            implementation: Implementation::detect(),
-        }
-    }
-
-    fn to_words(&self) -> ([[Word; 8]; DEGREE], [Word; 8]) {
-        let mut base_params = crate::Params::new();
-        base_params
-            .hash_length(self.hash_length as usize)
-            .key(&self.key[..self.key_length as usize])
-            .fanout(DEGREE as u8)
-            .max_depth(2)
-            .max_leaf_length(0)
-            // Note that inner_hash_length is always OUTBYTES, regardless of the hash_length
-            // parameter. This isn't documented in the spec, but it matches the behavior of the
-            // reference implementation: https://github.com/BLAKE2/BLAKE2/blob/320c325437539ae91091ce62efec1913cd8093c2/ref/blake2bp-ref.c#L55
-            .inner_hash_length(OUTBYTES);
-        let leaf_words = |worker_index| {
-            base_params
-                .clone()
-                .node_offset(worker_index)
-                .node_depth(0)
-                // Note that setting the last_node flag here has no effect,
-                // because it isn't included in the state words.
-                .to_words()
-        };
-        let leaf_words = [leaf_words(0), leaf_words(1), leaf_words(2), leaf_words(3)];
-        let root_words = base_params
-            .clone()
-            .node_offset(0)
-            .node_depth(1)
-            // Note that setting the last_node flag here has no effect, because
-            // it isn't included in the state words. Also note that because
-            // we're only preserving its state words, the root node won't hash
-            // any key bytes.
-            .to_words();
-        (leaf_words, root_words)
-    }
-
-    /// Hash an input all at once with these parameters.
-    pub fn hash(&self, input: &[u8]) -> Hash {
-        // If there's a key, just fall back to using the State.
-        if self.key_length > 0 {
-            return self.to_state().update(input).finalize();
-        }
-        let (mut leaf_words, mut root_words) = self.to_words();
-        // Hash each leaf in parallel.
-        let jobs = leaf_words.iter_mut().enumerate().map(|(i, words)| {
-            let input_start = cmp::min(input.len(), i * BLOCKBYTES);
-            Job {
-                input: &input[input_start..],
-                words,
-                count: 0,
-                last_node: if i == DEGREE - 1 {
-                    LastNode::Yes
-                } else {
-                    LastNode::No
-                },
-            }
-        });
-        many::compress_many(jobs, self.implementation, Finalize::Yes, Stride::Parallel);
-        // Hash each leaf into the root.
-        finalize_root_words(
-            &leaf_words,
-            &mut root_words,
-            self.hash_length,
-            self.implementation,
-        )
-    }
-
-    /// Construct a BLAKE2bp `State` object based on these parameters.
-    pub fn to_state(&self) -> State {
-        State::with_params(self)
-    }
-
-    /// Set the length of the final hash, from 1 to `OUTBYTES` (64). Apart from controlling the
-    /// length of the final `Hash`, this is also associated data, and changing it will result in a
-    /// totally different hash.
-    pub fn hash_length(&mut self, length: usize) -> &mut Self {
-        assert!(
-            1 <= length && length <= OUTBYTES,
-            "Bad hash length: {}",
-            length
-        );
-        self.hash_length = length as u8;
-        self
-    }
-
-    /// Use a secret key, so that BLAKE2bp acts as a MAC. The maximum key length is `KEYBYTES`
-    /// (64). An empty key is equivalent to having no key at all.
-    pub fn key(&mut self, key: &[u8]) -> &mut Self {
-        assert!(key.len() <= KEYBYTES, "Bad key length: {}", key.len());
-        self.key_length = key.len() as u8;
-        self.key = [0; KEYBYTES];
-        self.key[..key.len()].copy_from_slice(key);
-        self
-    }
-}
-
-impl Default for Params {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl fmt::Debug for Params {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "Params {{ hash_length: {}, key_length: {} }}",
-            self.hash_length,
-            // NB: Don't print the key itself. Debug shouldn't leak secrets.
-            self.key_length,
-        )
-    }
-}
-
-/// An incremental hasher for BLAKE2bp, just like the [`State`](../struct.State.html) type for
-/// BLAKE2b.
-///
-/// # Example
-///
-/// ```
-/// use blake2b_simd::blake2bp;
-///
-/// let mut state = blake2bp::State::new();
-/// state.update(b"foo");
-/// state.update(b"bar");
-/// let hash = state.finalize();
-///
-/// let expected = "e654427b6ef02949471712263e59071abbb6aa94855674c1daeed6cfaf127c33\
-///                 dfa3205f7f7f71e4f0673d25fa82a368488911f446bccd323af3ab03f53e56e5";
-/// assert_eq!(expected, &hash.to_hex());
-/// ```
-#[derive(Clone)]
-pub struct State {
-    leaf_words: [[Word; 8]; DEGREE],
-    root_words: [Word; 8],
-    // Note that this buffer is twice as large as what compress4 needs. That guarantees that we
-    // have enough input when we compress to know we don't need to finalize any of the leaves.
-    buf: [u8; 2 * DEGREE * BLOCKBYTES],
-    buf_len: u16,
-    // Note that this is the *per-leaf* count.
-    count: Count,
-    hash_length: u8,
-    implementation: Implementation,
-    is_keyed: bool,
-}
-
-impl State {
-    /// Equivalent to `State::default()` or `Params::default().to_state()`.
-    pub fn new() -> Self {
-        Self::with_params(&Params::default())
-    }
-
-    fn with_params(params: &Params) -> Self {
-        let (leaf_words, root_words) = params.to_words();
-
-        // If a key is set, initalize the buffer to contain the key bytes. Note
-        // that only the leaves hash key bytes. The root doesn't, even though
-        // the key length it still set in its parameters. Again this isn't
-        // documented in the spec, but it matches the behavior of the reference
-        // implementation:
-        // https://github.com/BLAKE2/BLAKE2/blob/320c325437539ae91091ce62efec1913cd8093c2/ref/blake2bp-ref.c#L128
-        // This particular behavior (though not the inner hash length behavior
-        // above) is also corroborated by the official test vectors; see
-        // tests/vector_tests.rs.
-        let mut buf = [0; 2 * DEGREE * BLOCKBYTES];
-        let mut buf_len = 0;
-        if params.key_length > 0 {
-            for i in 0..DEGREE {
-                let keybytes = &params.key[..params.key_length as usize];
-                buf[i * BLOCKBYTES..][..keybytes.len()].copy_from_slice(keybytes);
-                buf_len = BLOCKBYTES * DEGREE;
-            }
-        }
-
-        Self {
-            leaf_words,
-            root_words,
-            buf,
-            buf_len: buf_len as u16,
-            count: 0, // count gets updated in self.compress()
-            hash_length: params.hash_length,
-            implementation: params.implementation,
-            is_keyed: params.key_length > 0,
-        }
-    }
-
-    fn fill_buf(&mut self, input: &mut &[u8]) {
-        let take = cmp::min(self.buf.len() - self.buf_len as usize, input.len());
-        self.buf[self.buf_len as usize..][..take].copy_from_slice(&input[..take]);
-        self.buf_len += take as u16;
-        *input = &input[take..];
-    }
-
-    fn compress_to_leaves(
-        leaves: &mut [[Word; 8]; DEGREE],
-        input: &[u8],
-        count: &mut Count,
-        implementation: Implementation,
-    ) {
-        // Input is assumed to be an even number of blocks for each leaf. Since
-        // we're not finilizing, debug asserts will fire otherwise.
-        let jobs = leaves.iter_mut().enumerate().map(|(i, words)| {
-            Job {
-                input: &input[i * BLOCKBYTES..],
-                words,
-                count: *count,
-                last_node: LastNode::No, // irrelevant when not finalizing
-            }
-        });
-        many::compress_many(jobs, implementation, Finalize::No, Stride::Parallel);
-        // Note that count is the bytes input *per-leaf*.
-        *count = count.wrapping_add((input.len() / DEGREE) as Count);
-    }
-
-    /// Add input to the hash. You can call `update` any number of times.
-    pub fn update(&mut self, mut input: &[u8]) -> &mut Self {
-        // If we have a partial buffer, try to complete it. If we complete it and there's more
-        // input waiting, we need to compress to make more room. However, because we need to be
-        // sure that *none* of the leaves would need to be finalized as part of this round of
-        // compression, we need to buffer more than we would for BLAKE2b.
-        if self.buf_len > 0 {
-            self.fill_buf(&mut input);
-            // The buffer is large enough for two compressions. If we've filled
-            // the buffer and there's still more input coming, then we have to
-            // do at least one compression. If there's enough input still
-            // coming that all the leaves are guaranteed to get more, do both
-            // compressions in the buffer. Otherwise, do just one and shift the
-            // back half of the buffer to the front.
-            if !input.is_empty() {
-                if input.len() > (DEGREE - 1) * BLOCKBYTES {
-                    // Enough input coming to do both compressions.
-                    Self::compress_to_leaves(
-                        &mut self.leaf_words,
-                        &self.buf,
-                        &mut self.count,
-                        self.implementation,
-                    );
-                    self.buf_len = 0;
-                } else {
-                    // Only enough input coming for one compression.
-                    Self::compress_to_leaves(
-                        &mut self.leaf_words,
-                        &self.buf[..DEGREE * BLOCKBYTES],
-                        &mut self.count,
-                        self.implementation,
-                    );
-                    self.buf_len = (DEGREE * BLOCKBYTES) as u16;
-                    let (buf_front, buf_back) = self.buf.split_at_mut(DEGREE * BLOCKBYTES);
-                    buf_front.copy_from_slice(buf_back);
-                }
-            }
-        }
-
-        // Now we directly compress as much input as possible, without copying
-        // it into the buffer. We need to make sure we buffer at least one byte
-        // for each of the leaves, so that we know we don't need to finalize
-        // them.
-        let needed_tail = (DEGREE - 1) * BLOCKBYTES + 1;
-        let mut bulk_bytes = input.len().saturating_sub(needed_tail);
-        bulk_bytes -= bulk_bytes % (DEGREE * BLOCKBYTES);
-        if bulk_bytes > 0 {
-            Self::compress_to_leaves(
-                &mut self.leaf_words,
-                &input[..bulk_bytes],
-                &mut self.count,
-                self.implementation,
-            );
-            input = &input[bulk_bytes..];
-        }
-
-        // Buffer any remaining input, to be either compressed or finalized in
-        // a subsequent call.
-        self.fill_buf(&mut input);
-        debug_assert_eq!(0, input.len());
-        self
-    }
-
-    /// Finalize the state and return a `Hash`. This method is idempotent, and calling it multiple
-    /// times will give the same result. It's also possible to `update` with more input in between.
-    pub fn finalize(&self) -> Hash {
-        // Hash whatever's remaining in the buffer and finalize the leaves.
-        let buf_len = self.buf_len as usize;
-        let mut leaves_copy = self.leaf_words;
-        let jobs = leaves_copy
-            .iter_mut()
-            .enumerate()
-            .map(|(leaf_index, leaf_words)| {
-                let input = &self.buf[cmp::min(leaf_index * BLOCKBYTES, buf_len)..buf_len];
-                Job {
-                    input,
-                    words: leaf_words,
-                    count: self.count,
-                    last_node: if leaf_index == DEGREE - 1 {
-                        LastNode::Yes
-                    } else {
-                        LastNode::No
-                    },
-                }
-            });
-        many::compress_many(jobs, self.implementation, Finalize::Yes, Stride::Parallel);
-
-        // Concatenate each leaf into the root and hash that.
-        let mut root_words_copy = self.root_words;
-        finalize_root_words(
-            &leaves_copy,
-            &mut root_words_copy,
-            self.hash_length,
-            self.implementation,
-        )
-    }
-
-    /// Return the total number of bytes input so far.
-    ///
-    /// Note that `count` doesn't include the bytes of the key block, if any.
-    /// It's exactly the total number of input bytes fed to `update`.
-    pub fn count(&self) -> Count {
-        // Remember that self.count is *per-leaf*.
-        let mut ret = self
-            .count
-            .wrapping_mul(DEGREE as Count)
-            .wrapping_add(self.buf_len as Count);
-        if self.is_keyed {
-            ret -= (DEGREE * BLOCKBYTES) as Count;
-        }
-        ret
-    }
-}
-
-#[cfg(feature = "std")]
-impl std::io::Write for State {
-    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        self.update(buf);
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> std::io::Result<()> {
-        Ok(())
-    }
-}
-
-impl fmt::Debug for State {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "State {{ count: {}, hash_length: {} }}",
-            self.count(),
-            self.hash_length,
-        )
-    }
-}
-
-impl Default for State {
-    fn default() -> Self {
-        Self::with_params(&Params::default())
-    }
-}
-
-// Compress each of the four finalized hashes into the root words as input,
-// using two compressions. Note that even if a future version of this
-// implementation supports the hash_length parameter and sets it as associated
-// data for all nodes, this step must still use the untruncated output of each
-// leaf. Note also that, as mentioned above, the root node doesn't hash any key
-// bytes.
-fn finalize_root_words(
-    leaf_words: &[[Word; 8]; DEGREE],
-    root_words: &mut [Word; 8],
-    hash_length: u8,
-    imp: Implementation,
-) -> Hash {
-    debug_assert_eq!(OUTBYTES, 8 * size_of::<Word>());
-    let mut block = [0; DEGREE * OUTBYTES];
-    for (word, chunk) in leaf_words
-        .iter()
-        .flat_map(|words| words.iter())
-        .zip(block.chunks_exact_mut(size_of::<Word>()))
-    {
-        chunk.copy_from_slice(&word.to_le_bytes());
-    }
-    imp.compress1_loop(
-        &block,
-        root_words,
-        0,
-        LastNode::Yes,
-        Finalize::Yes,
-        Stride::Serial,
-    );
-    Hash {
-        bytes: crate::state_words_to_bytes(&root_words),
-        len: hash_length,
-    }
-}
-
-pub(crate) fn force_portable(params: &mut Params) {
-    params.implementation = Implementation::portable();
-}
-
-#[cfg(test)]
-pub(crate) mod test {
-    use super::*;
-    use crate::paint_test_input;
-
-    // This is a simple reference implementation without the complicated buffering or parameter
-    // support of the real implementation. We need this because the official test vectors don't
-    // include any inputs large enough to exercise all the branches in the buffering logic.
-    fn blake2bp_reference(input: &[u8]) -> Hash {
-        let mut leaves = arrayvec::ArrayVec::<[_; DEGREE]>::new();
-        for leaf_index in 0..DEGREE {
-            leaves.push(
-                crate::Params::new()
-                    .fanout(DEGREE as u8)
-                    .max_depth(2)
-                    .node_offset(leaf_index as u64)
-                    .inner_hash_length(OUTBYTES)
-                    .to_state(),
-            );
-        }
-        leaves[DEGREE - 1].set_last_node(true);
-        for (i, chunk) in input.chunks(BLOCKBYTES).enumerate() {
-            leaves[i % DEGREE].update(chunk);
-        }
-        let mut root = crate::Params::new()
-            .fanout(DEGREE as u8)
-            .max_depth(2)
-            .node_depth(1)
-            .inner_hash_length(OUTBYTES)
-            .last_node(true)
-            .to_state();
-        for leaf in &mut leaves {
-            root.update(leaf.finalize().as_bytes());
-        }
-        root.finalize()
-    }
-
-    #[test]
-    fn test_against_reference() {
-        let mut buf = [0; 21 * BLOCKBYTES];
-        paint_test_input(&mut buf);
-        // - 8 blocks is just enought to fill the double buffer.
-        // - 9 blocks triggers the "perform one compression on the double buffer" case.
-        // - 11 blocks is the largest input where only one compression may be performed, on the
-        //   first half of the buffer, because there's not enough input to avoid needing to
-        //   finalize the second half.
-        // - 12 blocks triggers the "perform both compressions in the double buffer" case.
-        // - 15 blocks is the largest input where, after compressing 8 blocks from the buffer,
-        //   there's not enough input to hash directly from memory.
-        // - 16 blocks triggers "after emptying the buffer, hash directly from memory".
-        for num_blocks in 0..=20 {
-            for &extra in &[0, 1, BLOCKBYTES - 1] {
-                for &portable in &[false, true] {
-                    // eprintln!("\ncase -----");
-                    // dbg!(num_blocks);
-                    // dbg!(extra);
-                    // dbg!(portable);
-
-                    // First hash the input all at once, as a sanity check.
-                    let mut params = Params::new();
-                    if portable {
-                        force_portable(&mut params);
-                    }
-                    let input = &buf[..num_blocks * BLOCKBYTES + extra];
-                    let expected = blake2bp_reference(&input);
-                    let mut state = params.to_state();
-                    let found = state.update(input).finalize();
-                    assert_eq!(expected, found);
-
-                    // Then, do it again, but buffer 1 byte of input first. That causes the buffering
-                    // branch to trigger.
-                    let mut state = params.to_state();
-                    let maybe_one = cmp::min(1, input.len());
-                    state.update(&input[..maybe_one]);
-                    assert_eq!(maybe_one as Count, state.count());
-                    // Do a throwaway finalize here to check for idempotency.
-                    state.finalize();
-                    state.update(&input[maybe_one..]);
-                    assert_eq!(input.len() as Count, state.count());
-                    let found = state.finalize();
-                    assert_eq!(expected, found);
-
-                    // Finally, do it again with the all-at-once interface.
-                    assert_eq!(expected, blake2bp(input));
-                }
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/guts.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/guts.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/guts.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/guts.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,565 +0,0 @@
-use crate::*;
-use arrayref::array_ref;
-use core::cmp;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub const MAX_DEGREE: usize = 4;
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-pub const MAX_DEGREE: usize = 1;
-
-// Variants other than Portable are unreachable in no_std, unless CPU features
-// are explicitly enabled for the build with e.g. RUSTFLAGS="-C target-feature=avx2".
-// This might change in the future if is_x86_feature_detected moves into libcore.
-#[allow(dead_code)]
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-enum Platform {
-    Portable,
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    SSE41,
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    AVX2,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct Implementation(Platform);
-
-impl Implementation {
-    pub fn detect() -> Self {
-        // Try the different implementations in order of how fast/modern they
-        // are. Currently on non-x86, everything just uses portable.
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        {
-            if let Some(avx2_impl) = Self::avx2_if_supported() {
-                return avx2_impl;
-            }
-        }
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        {
-            if let Some(sse41_impl) = Self::sse41_if_supported() {
-                return sse41_impl;
-            }
-        }
-        Self::portable()
-    }
-
-    pub fn portable() -> Self {
-        Implementation(Platform::Portable)
-    }
-
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    #[allow(unreachable_code)]
-    pub fn sse41_if_supported() -> Option<Self> {
-        // Check whether SSE4.1 support is assumed by the build.
-        #[cfg(target_feature = "sse4.1")]
-        {
-            return Some(Implementation(Platform::SSE41));
-        }
-        // Otherwise dynamically check for support if we can.
-        #[cfg(feature = "std")]
-        {
-            if is_x86_feature_detected!("sse4.1") {
-                return Some(Implementation(Platform::SSE41));
-            }
-        }
-        None
-    }
-
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    #[allow(unreachable_code)]
-    pub fn avx2_if_supported() -> Option<Self> {
-        // Check whether AVX2 support is assumed by the build.
-        #[cfg(target_feature = "avx2")]
-        {
-            return Some(Implementation(Platform::AVX2));
-        }
-        // Otherwise dynamically check for support if we can.
-        #[cfg(feature = "std")]
-        {
-            if is_x86_feature_detected!("avx2") {
-                return Some(Implementation(Platform::AVX2));
-            }
-        }
-        None
-    }
-
-    pub fn degree(&self) -> usize {
-        match self.0 {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-            Platform::AVX2 => avx2::DEGREE,
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-            Platform::SSE41 => sse41::DEGREE,
-            Platform::Portable => 1,
-        }
-    }
-
-    pub fn compress1_loop(
-        &self,
-        input: &[u8],
-        words: &mut [Word; 8],
-        count: Count,
-        last_node: LastNode,
-        finalize: Finalize,
-        stride: Stride,
-    ) {
-        match self.0 {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-            Platform::AVX2 => unsafe {
-                avx2::compress1_loop(input, words, count, last_node, finalize, stride);
-            },
-            // Note that there's an SSE version of compress1 in the official C
-            // implementation, but I haven't ported it yet.
-            _ => {
-                portable::compress1_loop(input, words, count, last_node, finalize, stride);
-            }
-        }
-    }
-
-    pub fn compress2_loop(&self, jobs: &mut [Job; 2], finalize: Finalize, stride: Stride) {
-        match self.0 {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-            Platform::AVX2 | Platform::SSE41 => unsafe {
-                sse41::compress2_loop(jobs, finalize, stride)
-            },
-            _ => panic!("unsupported"),
-        }
-    }
-
-    pub fn compress4_loop(&self, jobs: &mut [Job; 4], finalize: Finalize, stride: Stride) {
-        match self.0 {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-            Platform::AVX2 => unsafe { avx2::compress4_loop(jobs, finalize, stride) },
-            _ => panic!("unsupported"),
-        }
-    }
-}
-
-pub struct Job<'a, 'b> {
-    pub input: &'a [u8],
-    pub words: &'b mut [Word; 8],
-    pub count: Count,
-    pub last_node: LastNode,
-}
-
-impl<'a, 'b> core::fmt::Debug for Job<'a, 'b> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        // NB: Don't print the words. Leaking them would allow length extension.
-        write!(
-            f,
-            "Job {{ input_len: {}, count: {}, last_node: {} }}",
-            self.input.len(),
-            self.count,
-            self.last_node.yes(),
-        )
-    }
-}
-
-// Finalize could just be a bool, but this is easier to read at callsites.
-#[derive(Clone, Copy, Debug)]
-pub enum Finalize {
-    Yes,
-    No,
-}
-
-impl Finalize {
-    pub fn yes(&self) -> bool {
-        match self {
-            Finalize::Yes => true,
-            Finalize::No => false,
-        }
-    }
-}
-
-// Like Finalize, this is easier to read at callsites.
-#[derive(Clone, Copy, Debug)]
-pub enum LastNode {
-    Yes,
-    No,
-}
-
-impl LastNode {
-    pub fn yes(&self) -> bool {
-        match self {
-            LastNode::Yes => true,
-            LastNode::No => false,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum Stride {
-    Serial,   // BLAKE2b/BLAKE2s
-    Parallel, // BLAKE2bp/BLAKE2sp
-}
-
-impl Stride {
-    pub fn padded_blockbytes(&self) -> usize {
-        match self {
-            Stride::Serial => BLOCKBYTES,
-            Stride::Parallel => blake2bp::DEGREE * BLOCKBYTES,
-        }
-    }
-}
-
-pub(crate) fn count_low(count: Count) -> Word {
-    count as Word
-}
-
-pub(crate) fn count_high(count: Count) -> Word {
-    (count >> 8 * size_of::<Word>()) as Word
-}
-
-pub(crate) fn assemble_count(low: Word, high: Word) -> Count {
-    low as Count + ((high as Count) << 8 * size_of::<Word>())
-}
-
-pub(crate) fn flag_word(flag: bool) -> Word {
-    if flag {
-        !0
-    } else {
-        0
-    }
-}
-
-// Pull a array reference at the given offset straight from the input, if
-// there's a full block of input available. If there's only a partial block,
-// copy it into the provided buffer, and return an array reference that. Along
-// with the array, return the number of bytes of real input, and whether the
-// input can be finalized (i.e. whether there aren't any more bytes after this
-// block). Note that this is written so that the optimizer can elide bounds
-// checks, see: https://godbolt.org/z/0hH2bC
-pub fn final_block<'a>(
-    input: &'a [u8],
-    offset: usize,
-    buffer: &'a mut [u8; BLOCKBYTES],
-    stride: Stride,
-) -> (&'a [u8; BLOCKBYTES], usize, bool) {
-    let capped_offset = cmp::min(offset, input.len());
-    let offset_slice = &input[capped_offset..];
-    if offset_slice.len() >= BLOCKBYTES {
-        let block = array_ref!(offset_slice, 0, BLOCKBYTES);
-        let should_finalize = offset_slice.len() <= stride.padded_blockbytes();
-        (block, BLOCKBYTES, should_finalize)
-    } else {
-        // Copy the final block to the front of the block buffer. The rest of
-        // the buffer is assumed to be initialized to zero.
-        buffer[..offset_slice.len()].copy_from_slice(offset_slice);
-        (buffer, offset_slice.len(), true)
-    }
-}
-
-pub fn input_debug_asserts(input: &[u8], finalize: Finalize) {
-    // If we're not finalizing, the input must not be empty, and it must be an
-    // even multiple of the block size.
-    if !finalize.yes() {
-        debug_assert!(!input.is_empty());
-        debug_assert_eq!(0, input.len() % BLOCKBYTES);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use arrayvec::ArrayVec;
-    use core::mem::size_of;
-
-    #[test]
-    fn test_detection() {
-        assert_eq!(Platform::Portable, Implementation::portable().0);
-
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        #[cfg(feature = "std")]
-        {
-            if is_x86_feature_detected!("avx2") {
-                assert_eq!(Platform::AVX2, Implementation::detect().0);
-                assert_eq!(
-                    Platform::AVX2,
-                    Implementation::avx2_if_supported().unwrap().0
-                );
-                assert_eq!(
-                    Platform::SSE41,
-                    Implementation::sse41_if_supported().unwrap().0
-                );
-            } else if is_x86_feature_detected!("sse4.1") {
-                assert_eq!(Platform::SSE41, Implementation::detect().0);
-                assert!(Implementation::avx2_if_supported().is_none());
-                assert_eq!(
-                    Platform::SSE41,
-                    Implementation::sse41_if_supported().unwrap().0
-                );
-            } else {
-                assert_eq!(Platform::Portable, Implementation::detect().0);
-                assert!(Implementation::avx2_if_supported().is_none());
-                assert!(Implementation::sse41_if_supported().is_none());
-            }
-        }
-    }
-
-    // TODO: Move all of these case tests into the implementation files.
-    fn exercise_cases<F>(mut f: F)
-    where
-        F: FnMut(Stride, usize, LastNode, Finalize, Count),
-    {
-        // Chose counts to hit the relevant overflow cases.
-        let counts = &[
-            (0 as Count),
-            ((1 as Count) << (8 * size_of::<Word>())) - BLOCKBYTES as Count,
-            (0 as Count).wrapping_sub(BLOCKBYTES as Count),
-        ];
-        for &stride in &[Stride::Serial, Stride::Parallel] {
-            let lengths = [
-                0,
-                1,
-                BLOCKBYTES - 1,
-                BLOCKBYTES,
-                BLOCKBYTES + 1,
-                2 * BLOCKBYTES - 1,
-                2 * BLOCKBYTES,
-                2 * BLOCKBYTES + 1,
-                stride.padded_blockbytes() - 1,
-                stride.padded_blockbytes(),
-                stride.padded_blockbytes() + 1,
-                2 * stride.padded_blockbytes() - 1,
-                2 * stride.padded_blockbytes(),
-                2 * stride.padded_blockbytes() + 1,
-            ];
-            for &length in &lengths {
-                for &last_node in &[LastNode::No, LastNode::Yes] {
-                    for &finalize in &[Finalize::No, Finalize::Yes] {
-                        if !finalize.yes() && (length == 0 || length % BLOCKBYTES != 0) {
-                            // Skip these cases, they're invalid.
-                            continue;
-                        }
-                        for &count in counts {
-                            // eprintln!("\ncase -----");
-                            // dbg!(stride);
-                            // dbg!(length);
-                            // dbg!(last_node);
-                            // dbg!(finalize);
-                            // dbg!(count);
-
-                            f(stride, length, last_node, finalize, count);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn initial_test_words(input_index: usize) -> [Word; 8] {
-        crate::Params::new()
-            .node_offset(input_index as u64)
-            .to_words()
-    }
-
-    // Use the portable implementation, one block at a time, to compute the
-    // final state words expected for a given test case.
-    fn reference_compression(
-        input: &[u8],
-        stride: Stride,
-        last_node: LastNode,
-        finalize: Finalize,
-        mut count: Count,
-        input_index: usize,
-    ) -> [Word; 8] {
-        let mut words = initial_test_words(input_index);
-        let mut offset = 0;
-        while offset == 0 || offset < input.len() {
-            let block_size = cmp::min(BLOCKBYTES, input.len() - offset);
-            let maybe_finalize = if offset + stride.padded_blockbytes() < input.len() {
-                Finalize::No
-            } else {
-                finalize
-            };
-            portable::compress1_loop(
-                &input[offset..][..block_size],
-                &mut words,
-                count,
-                last_node,
-                maybe_finalize,
-                Stride::Serial,
-            );
-            offset += stride.padded_blockbytes();
-            count = count.wrapping_add(BLOCKBYTES as Count);
-        }
-        words
-    }
-
-    // For various loop lengths and finalization parameters, make sure that the
-    // implementation gives the same answer as the portable implementation does
-    // when invoked one block at a time. (So even the portable implementation
-    // itself is being tested here, to make sure its loop is correct.) Note
-    // that this doesn't include any fixed test vectors; those are taken from
-    // the blake2-kat.json file (copied from upstream) and tested elsewhere.
-    fn exercise_compress1_loop(implementation: Implementation) {
-        let mut input = [0; 100 * BLOCKBYTES];
-        paint_test_input(&mut input);
-
-        exercise_cases(|stride, length, last_node, finalize, count| {
-            let reference_words =
-                reference_compression(&input[..length], stride, last_node, finalize, count, 0);
-
-            let mut test_words = initial_test_words(0);
-            implementation.compress1_loop(
-                &input[..length],
-                &mut test_words,
-                count,
-                last_node,
-                finalize,
-                stride,
-            );
-            assert_eq!(reference_words, test_words);
-        });
-    }
-
-    #[test]
-    fn test_compress1_loop_portable() {
-        exercise_compress1_loop(Implementation::portable());
-    }
-
-    #[test]
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn test_compress1_loop_sse41() {
-        // Currently this just falls back to portable, but we test it anyway.
-        if let Some(imp) = Implementation::sse41_if_supported() {
-            exercise_compress1_loop(imp);
-        }
-    }
-
-    #[test]
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn test_compress1_loop_avx2() {
-        if let Some(imp) = Implementation::avx2_if_supported() {
-            exercise_compress1_loop(imp);
-        }
-    }
-
-    // I use ArrayVec everywhere in here becuase currently these tests pass
-    // under no_std. I might decide that's not worth maintaining at some point,
-    // since really all we care about with no_std is that the library builds,
-    // but for now it's here. Everything is keyed off of this N constant so
-    // that it's easy to copy the code to exercise_compress4_loop.
-    fn exercise_compress2_loop(implementation: Implementation) {
-        const N: usize = 2;
-
-        let mut input_buffer = [0; 100 * BLOCKBYTES];
-        paint_test_input(&mut input_buffer);
-        let mut inputs = ArrayVec::<[_; N]>::new();
-        for i in 0..N {
-            inputs.push(&input_buffer[i..]);
-        }
-
-        exercise_cases(|stride, length, last_node, finalize, count| {
-            let mut reference_words = ArrayVec::<[_; N]>::new();
-            for i in 0..N {
-                let words = reference_compression(
-                    &inputs[i][..length],
-                    stride,
-                    last_node,
-                    finalize,
-                    count.wrapping_add((i * BLOCKBYTES) as Count),
-                    i,
-                );
-                reference_words.push(words);
-            }
-
-            let mut test_words = ArrayVec::<[_; N]>::new();
-            for i in 0..N {
-                test_words.push(initial_test_words(i));
-            }
-            let mut jobs = ArrayVec::<[_; N]>::new();
-            for (i, words) in test_words.iter_mut().enumerate() {
-                jobs.push(Job {
-                    input: &inputs[i][..length],
-                    words,
-                    count: count.wrapping_add((i * BLOCKBYTES) as Count),
-                    last_node,
-                });
-            }
-            let mut jobs = jobs.into_inner().expect("full");
-            implementation.compress2_loop(&mut jobs, finalize, stride);
-
-            for i in 0..N {
-                assert_eq!(reference_words[i], test_words[i], "words {} unequal", i);
-            }
-        });
-    }
-
-    #[test]
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn test_compress2_loop_sse41() {
-        if let Some(imp) = Implementation::sse41_if_supported() {
-            exercise_compress2_loop(imp);
-        }
-    }
-
-    #[test]
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn test_compress2_loop_avx2() {
-        // Currently this just falls back to SSE4.1, but we test it anyway.
-        if let Some(imp) = Implementation::avx2_if_supported() {
-            exercise_compress2_loop(imp);
-        }
-    }
-
-    // Copied from exercise_compress2_loop, with a different value of N and an
-    // interior call to compress4_loop.
-    fn exercise_compress4_loop(implementation: Implementation) {
-        const N: usize = 4;
-
-        let mut input_buffer = [0; 100 * BLOCKBYTES];
-        paint_test_input(&mut input_buffer);
-        let mut inputs = ArrayVec::<[_; N]>::new();
-        for i in 0..N {
-            inputs.push(&input_buffer[i..]);
-        }
-
-        exercise_cases(|stride, length, last_node, finalize, count| {
-            let mut reference_words = ArrayVec::<[_; N]>::new();
-            for i in 0..N {
-                let words = reference_compression(
-                    &inputs[i][..length],
-                    stride,
-                    last_node,
-                    finalize,
-                    count.wrapping_add((i * BLOCKBYTES) as Count),
-                    i,
-                );
-                reference_words.push(words);
-            }
-
-            let mut test_words = ArrayVec::<[_; N]>::new();
-            for i in 0..N {
-                test_words.push(initial_test_words(i));
-            }
-            let mut jobs = ArrayVec::<[_; N]>::new();
-            for (i, words) in test_words.iter_mut().enumerate() {
-                jobs.push(Job {
-                    input: &inputs[i][..length],
-                    words,
-                    count: count.wrapping_add((i * BLOCKBYTES) as Count),
-                    last_node,
-                });
-            }
-            let mut jobs = jobs.into_inner().expect("full");
-            implementation.compress4_loop(&mut jobs, finalize, stride);
-
-            for i in 0..N {
-                assert_eq!(reference_words[i], test_words[i], "words {} unequal", i);
-            }
-        });
-    }
-
-    #[test]
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn test_compress4_loop_avx2() {
-        if let Some(imp) = Implementation::avx2_if_supported() {
-            exercise_compress4_loop(imp);
-        }
-    }
-
-    #[test]
-    fn sanity_check_count_size() {
-        assert_eq!(size_of::<Count>(), 2 * size_of::<Word>());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,674 +0,0 @@
-//! [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Actions Status](https://github.com/oconnor663/blake2_simd/workflows/tests/badge.svg)](https://github.com/oconnor663/blake2_simd/actions)
-//!
-//! An implementation of the BLAKE2b and BLAKE2bp hash functions. See also
-//! [`blake2s_simd`](https://docs.rs/blake2s_simd).
-//!
-//! This crate includes:
-//!
-//! - 100% stable Rust.
-//! - SIMD implementations based on Samuel Neves' [`blake2-avx2`](https://github.com/sneves/blake2-avx2).
-//!   These are very fast. For benchmarks, see [the Performance section of the
-//!   README](https://github.com/oconnor663/blake2_simd#performance).
-//! - Portable, safe implementations for other platforms.
-//! - Dynamic CPU feature detection. Binaries include multiple implementations by default and
-//!   choose the fastest one the processor supports at runtime.
-//! - All the features from the [the BLAKE2 spec](https://blake2.net/blake2.pdf), like adjustable
-//!   length, keying, and associated data for tree hashing.
-//! - `no_std` support. The `std` Cargo feature is on by default, for CPU feature detection and
-//!   for implementing `std::io::Write`.
-//! - Support for computing multiple BLAKE2b hashes in parallel, matching the efficiency of
-//!   BLAKE2bp. See the [`many`](many/index.html) module.
-//!
-//! # Example
-//!
-//! ```
-//! use blake2b_simd::{blake2b, Params};
-//!
-//! let expected = "ca002330e69d3e6b84a46a56a6533fd79d51d97a3bb7cad6c2ff43b354185d6d\
-//!                 c1e723fb3db4ae0737e120378424c714bb982d9dc5bbd7a0ab318240ddd18f8d";
-//! let hash = blake2b(b"foo");
-//! assert_eq!(expected, &hash.to_hex());
-//!
-//! let hash = Params::new()
-//!     .hash_length(16)
-//!     .key(b"The Magic Words are Squeamish Ossifrage")
-//!     .personal(b"L. P. Waterhouse")
-//!     .to_state()
-//!     .update(b"foo")
-//!     .update(b"bar")
-//!     .update(b"baz")
-//!     .finalize();
-//! assert_eq!("ee8ff4e9be887297cf79348dc35dab56", &hash.to_hex());
-//! ```
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use arrayref::{array_refs, mut_array_refs};
-use core::cmp;
-use core::fmt;
-use core::mem::size_of;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod avx2;
-mod portable;
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod sse41;
-
-pub mod blake2bp;
-mod guts;
-pub mod many;
-
-#[cfg(test)]
-mod test;
-
-type Word = u64;
-type Count = u128;
-
-/// The max hash length.
-pub const OUTBYTES: usize = 8 * size_of::<Word>();
-/// The max key length.
-pub const KEYBYTES: usize = 8 * size_of::<Word>();
-/// The max salt length.
-pub const SALTBYTES: usize = 2 * size_of::<Word>();
-/// The max personalization length.
-pub const PERSONALBYTES: usize = 2 * size_of::<Word>();
-/// The number input bytes passed to each call to the compression function. Small benchmarks need
-/// to use an even multiple of `BLOCKBYTES`, or else their apparent throughput will be low.
-pub const BLOCKBYTES: usize = 16 * size_of::<Word>();
-
-const IV: [Word; 8] = [
-    0x6A09E667F3BCC908,
-    0xBB67AE8584CAA73B,
-    0x3C6EF372FE94F82B,
-    0xA54FF53A5F1D36F1,
-    0x510E527FADE682D1,
-    0x9B05688C2B3E6C1F,
-    0x1F83D9ABFB41BD6B,
-    0x5BE0CD19137E2179,
-];
-
-const SIGMA: [[u8; 16]; 12] = [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3],
-    [11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4],
-    [7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8],
-    [9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13],
-    [2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9],
-    [12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11],
-    [13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10],
-    [6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5],
-    [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3],
-];
-
-/// Compute the BLAKE2b hash of a slice of bytes all at once, using default
-/// parameters.
-///
-/// # Example
-///
-/// ```
-/// # use blake2b_simd::{blake2b, Params};
-/// let expected = "ca002330e69d3e6b84a46a56a6533fd79d51d97a3bb7cad6c2ff43b354185d6d\
-///                 c1e723fb3db4ae0737e120378424c714bb982d9dc5bbd7a0ab318240ddd18f8d";
-/// let hash = blake2b(b"foo");
-/// assert_eq!(expected, &hash.to_hex());
-/// ```
-pub fn blake2b(input: &[u8]) -> Hash {
-    Params::new().hash(input)
-}
-
-/// A parameter builder that exposes all the non-default BLAKE2 features.
-///
-/// Apart from `hash_length`, which controls the length of the final `Hash`,
-/// all of these parameters are just associated data that gets mixed with the
-/// input. For more details, see [the BLAKE2 spec](https://blake2.net/blake2.pdf).
-///
-/// Several of the parameters have a valid range defined in the spec and
-/// documented below. Trying to set an invalid parameter will panic.
-///
-/// # Example
-///
-/// ```
-/// # use blake2b_simd::Params;
-/// // Create a Params object with a secret key and a non-default length.
-/// let mut params = Params::new();
-/// params.key(b"my secret key");
-/// params.hash_length(16);
-///
-/// // Use those params to hash an input all at once.
-/// let hash = params.hash(b"my input");
-///
-/// // Or use those params to build an incremental State.
-/// let mut state = params.to_state();
-/// ```
-#[derive(Clone)]
-pub struct Params {
-    hash_length: u8,
-    key_length: u8,
-    key_block: [u8; BLOCKBYTES],
-    salt: [u8; SALTBYTES],
-    personal: [u8; PERSONALBYTES],
-    fanout: u8,
-    max_depth: u8,
-    max_leaf_length: u32,
-    node_offset: u64,
-    node_depth: u8,
-    inner_hash_length: u8,
-    last_node: guts::LastNode,
-    implementation: guts::Implementation,
-}
-
-impl Params {
-    /// Equivalent to `Params::default()`.
-    #[inline]
-    pub fn new() -> Self {
-        Self {
-            hash_length: OUTBYTES as u8,
-            key_length: 0,
-            key_block: [0; BLOCKBYTES],
-            salt: [0; SALTBYTES],
-            personal: [0; PERSONALBYTES],
-            // NOTE: fanout and max_depth don't default to zero!
-            fanout: 1,
-            max_depth: 1,
-            max_leaf_length: 0,
-            node_offset: 0,
-            node_depth: 0,
-            inner_hash_length: 0,
-            last_node: guts::LastNode::No,
-            implementation: guts::Implementation::detect(),
-        }
-    }
-
-    #[inline(always)]
-    fn to_words(&self) -> [Word; 8] {
-        let (salt_left, salt_right) = array_refs!(&self.salt, SALTBYTES / 2, SALTBYTES / 2);
-        let (personal_left, personal_right) =
-            array_refs!(&self.personal, PERSONALBYTES / 2, PERSONALBYTES / 2);
-        [
-            IV[0]
-                ^ self.hash_length as u64
-                ^ (self.key_length as u64) << 8
-                ^ (self.fanout as u64) << 16
-                ^ (self.max_depth as u64) << 24
-                ^ (self.max_leaf_length as u64) << 32,
-            IV[1] ^ self.node_offset,
-            IV[2] ^ self.node_depth as u64 ^ (self.inner_hash_length as u64) << 8,
-            IV[3],
-            IV[4] ^ Word::from_le_bytes(*salt_left),
-            IV[5] ^ Word::from_le_bytes(*salt_right),
-            IV[6] ^ Word::from_le_bytes(*personal_left),
-            IV[7] ^ Word::from_le_bytes(*personal_right),
-        ]
-    }
-
-    /// Hash an input all at once with these parameters.
-    #[inline]
-    pub fn hash(&self, input: &[u8]) -> Hash {
-        // If there's a key, just fall back to using the State.
-        if self.key_length > 0 {
-            return self.to_state().update(input).finalize();
-        }
-        let mut words = self.to_words();
-        self.implementation.compress1_loop(
-            input,
-            &mut words,
-            0,
-            self.last_node,
-            guts::Finalize::Yes,
-            guts::Stride::Serial,
-        );
-        Hash {
-            bytes: state_words_to_bytes(&words),
-            len: self.hash_length,
-        }
-    }
-
-    /// Construct a `State` object based on these parameters, for hashing input
-    /// incrementally.
-    pub fn to_state(&self) -> State {
-        State::with_params(self)
-    }
-
-    /// Set the length of the final hash in bytes, from 1 to `OUTBYTES` (64). Apart from
-    /// controlling the length of the final `Hash`, this is also associated data, and changing it
-    /// will result in a totally different hash.
-    #[inline]
-    pub fn hash_length(&mut self, length: usize) -> &mut Self {
-        assert!(
-            1 <= length && length <= OUTBYTES,
-            "Bad hash length: {}",
-            length
-        );
-        self.hash_length = length as u8;
-        self
-    }
-
-    /// Use a secret key, so that BLAKE2 acts as a MAC. The maximum key length is `KEYBYTES` (64).
-    /// An empty key is equivalent to having no key at all.
-    #[inline]
-    pub fn key(&mut self, key: &[u8]) -> &mut Self {
-        assert!(key.len() <= KEYBYTES, "Bad key length: {}", key.len());
-        self.key_length = key.len() as u8;
-        self.key_block = [0; BLOCKBYTES];
-        self.key_block[..key.len()].copy_from_slice(key);
-        self
-    }
-
-    /// At most `SALTBYTES` (16). Shorter salts are padded with null bytes. An empty salt is
-    /// equivalent to having no salt at all.
-    #[inline]
-    pub fn salt(&mut self, salt: &[u8]) -> &mut Self {
-        assert!(salt.len() <= SALTBYTES, "Bad salt length: {}", salt.len());
-        self.salt = [0; SALTBYTES];
-        self.salt[..salt.len()].copy_from_slice(salt);
-        self
-    }
-
-    /// At most `PERSONALBYTES` (16). Shorter personalizations are padded with null bytes. An empty
-    /// personalization is equivalent to having no personalization at all.
-    #[inline]
-    pub fn personal(&mut self, personalization: &[u8]) -> &mut Self {
-        assert!(
-            personalization.len() <= PERSONALBYTES,
-            "Bad personalization length: {}",
-            personalization.len()
-        );
-        self.personal = [0; PERSONALBYTES];
-        self.personal[..personalization.len()].copy_from_slice(personalization);
-        self
-    }
-
-    /// From 0 (meaning unlimited) to 255. The default is 1 (meaning sequential).
-    #[inline]
-    pub fn fanout(&mut self, fanout: u8) -> &mut Self {
-        self.fanout = fanout;
-        self
-    }
-
-    /// From 0 (meaning BLAKE2X B2 hashes), through 1 (the default, meaning sequential) to 255 (meaning unlimited).
-    #[inline]
-    pub fn max_depth(&mut self, depth: u8) -> &mut Self {
-        self.max_depth = depth;
-        self
-    }
-
-    /// From 0 (the default, meaning unlimited or sequential) to `2^32 - 1`.
-    #[inline]
-    pub fn max_leaf_length(&mut self, length: u32) -> &mut Self {
-        self.max_leaf_length = length;
-        self
-    }
-
-    /// From 0 (the default, meaning first, leftmost, leaf, or sequential) to `2^64 - 1`.
-    #[inline]
-    pub fn node_offset(&mut self, offset: u64) -> &mut Self {
-        self.node_offset = offset;
-        self
-    }
-
-    /// From 0 (the default, meaning leaf or sequential) to 255.
-    #[inline]
-    pub fn node_depth(&mut self, depth: u8) -> &mut Self {
-        self.node_depth = depth;
-        self
-    }
-
-    /// From 0 (the default, meaning sequential) to `OUTBYTES` (64).
-    #[inline]
-    pub fn inner_hash_length(&mut self, length: usize) -> &mut Self {
-        assert!(length <= OUTBYTES, "Bad inner hash length: {}", length);
-        self.inner_hash_length = length as u8;
-        self
-    }
-
-    /// Indicates the rightmost node in a row. This can also be changed on the
-    /// `State` object, potentially after hashing has begun. See
-    /// [`State::set_last_node`].
-    ///
-    /// [`State::set_last_node`]: struct.State.html#method.set_last_node
-    #[inline]
-    pub fn last_node(&mut self, last_node: bool) -> &mut Self {
-        self.last_node = if last_node {
-            guts::LastNode::Yes
-        } else {
-            guts::LastNode::No
-        };
-        self
-    }
-}
-
-impl Default for Params {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl fmt::Debug for Params {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "Params {{ hash_length: {}, key_length: {}, salt: {:?}, personal: {:?}, fanout: {}, \
-             max_depth: {}, max_leaf_length: {}, node_offset: {}, node_depth: {}, \
-             inner_hash_length: {}, last_node: {} }}",
-            self.hash_length,
-            // NB: Don't print the key itself. Debug shouldn't leak secrets.
-            self.key_length,
-            &self.salt,
-            &self.personal,
-            self.fanout,
-            self.max_depth,
-            self.max_leaf_length,
-            self.node_offset,
-            self.node_depth,
-            self.inner_hash_length,
-            self.last_node.yes(),
-        )
-    }
-}
-
-/// An incremental hasher for BLAKE2b.
-///
-/// To construct a `State` with non-default parameters, see `Params::to_state`.
-///
-/// # Example
-///
-/// ```
-/// use blake2b_simd::{State, blake2b};
-///
-/// let mut state = blake2b_simd::State::new();
-///
-/// state.update(b"foo");
-/// assert_eq!(blake2b(b"foo"), state.finalize());
-///
-/// state.update(b"bar");
-/// assert_eq!(blake2b(b"foobar"), state.finalize());
-/// ```
-#[derive(Clone)]
-pub struct State {
-    words: [Word; 8],
-    count: Count,
-    buf: [u8; BLOCKBYTES],
-    buflen: u8,
-    last_node: guts::LastNode,
-    hash_length: u8,
-    implementation: guts::Implementation,
-    is_keyed: bool,
-}
-
-impl State {
-    /// Equivalent to `State::default()` or `Params::default().to_state()`.
-    pub fn new() -> Self {
-        Self::with_params(&Params::default())
-    }
-
-    fn with_params(params: &Params) -> Self {
-        let mut state = Self {
-            words: params.to_words(),
-            count: 0,
-            buf: [0; BLOCKBYTES],
-            buflen: 0,
-            last_node: params.last_node,
-            hash_length: params.hash_length,
-            implementation: params.implementation,
-            is_keyed: params.key_length > 0,
-        };
-        if state.is_keyed {
-            state.buf = params.key_block;
-            state.buflen = state.buf.len() as u8;
-        }
-        state
-    }
-
-    fn fill_buf(&mut self, input: &mut &[u8]) {
-        let take = cmp::min(BLOCKBYTES - self.buflen as usize, input.len());
-        self.buf[self.buflen as usize..self.buflen as usize + take].copy_from_slice(&input[..take]);
-        self.buflen += take as u8;
-        *input = &input[take..];
-    }
-
-    // If the state already has some input in its buffer, try to fill the buffer and perform a
-    // compression. However, only do the compression if there's more input coming, otherwise it
-    // will give the wrong hash it the caller finalizes immediately after.
-    fn compress_buffer_if_possible(&mut self, input: &mut &[u8]) {
-        if self.buflen > 0 {
-            self.fill_buf(input);
-            if !input.is_empty() {
-                self.implementation.compress1_loop(
-                    &self.buf,
-                    &mut self.words,
-                    self.count,
-                    self.last_node,
-                    guts::Finalize::No,
-                    guts::Stride::Serial,
-                );
-                self.count = self.count.wrapping_add(BLOCKBYTES as Count);
-                self.buflen = 0;
-            }
-        }
-    }
-
-    /// Add input to the hash. You can call `update` any number of times.
-    pub fn update(&mut self, mut input: &[u8]) -> &mut Self {
-        // If we have a partial buffer, try to complete it.
-        self.compress_buffer_if_possible(&mut input);
-        // While there's more than a block of input left (which also means we cleared the buffer
-        // above), compress blocks directly without copying.
-        let mut end = input.len().saturating_sub(1);
-        end -= end % BLOCKBYTES;
-        if end > 0 {
-            self.implementation.compress1_loop(
-                &input[..end],
-                &mut self.words,
-                self.count,
-                self.last_node,
-                guts::Finalize::No,
-                guts::Stride::Serial,
-            );
-            self.count = self.count.wrapping_add(end as Count);
-            input = &input[end..];
-        }
-        // Buffer any remaining input, to be either compressed or finalized in a subsequent call.
-        // Note that this represents some copying overhead, which in theory we could avoid in
-        // all-at-once setting. A function hardcoded for exactly BLOCKSIZE input bytes is about 10%
-        // faster than using this implementation for the same input.
-        self.fill_buf(&mut input);
-        self
-    }
-
-    /// Finalize the state and return a `Hash`. This method is idempotent, and calling it multiple
-    /// times will give the same result. It's also possible to `update` with more input in between.
-    pub fn finalize(&self) -> Hash {
-        let mut words_copy = self.words;
-        self.implementation.compress1_loop(
-            &self.buf[..self.buflen as usize],
-            &mut words_copy,
-            self.count,
-            self.last_node,
-            guts::Finalize::Yes,
-            guts::Stride::Serial,
-        );
-        Hash {
-            bytes: state_words_to_bytes(&words_copy),
-            len: self.hash_length,
-        }
-    }
-
-    /// Set a flag indicating that this is the last node of its level in a tree hash. This is
-    /// equivalent to [`Params::last_node`], except that it can be set at any time before calling
-    /// `finalize`. That allows callers to begin hashing a node without knowing ahead of time
-    /// whether it's the last in its level. For more details about the intended use of this flag
-    /// [the BLAKE2 spec].
-    ///
-    /// [`Params::last_node`]: struct.Params.html#method.last_node
-    /// [the BLAKE2 spec]: https://blake2.net/blake2.pdf
-    pub fn set_last_node(&mut self, last_node: bool) -> &mut Self {
-        self.last_node = if last_node {
-            guts::LastNode::Yes
-        } else {
-            guts::LastNode::No
-        };
-        self
-    }
-
-    /// Return the total number of bytes input so far.
-    ///
-    /// Note that `count` doesn't include the bytes of the key block, if any.
-    /// It's exactly the total number of input bytes fed to `update`.
-    pub fn count(&self) -> Count {
-        let mut ret = self.count.wrapping_add(self.buflen as Count);
-        if self.is_keyed {
-            ret -= BLOCKBYTES as Count;
-        }
-        ret
-    }
-}
-
-#[inline(always)]
-fn state_words_to_bytes(state_words: &[Word; 8]) -> [u8; OUTBYTES] {
-    let mut bytes = [0; OUTBYTES];
-    {
-        const W: usize = size_of::<Word>();
-        let refs = mut_array_refs!(&mut bytes, W, W, W, W, W, W, W, W);
-        *refs.0 = state_words[0].to_le_bytes();
-        *refs.1 = state_words[1].to_le_bytes();
-        *refs.2 = state_words[2].to_le_bytes();
-        *refs.3 = state_words[3].to_le_bytes();
-        *refs.4 = state_words[4].to_le_bytes();
-        *refs.5 = state_words[5].to_le_bytes();
-        *refs.6 = state_words[6].to_le_bytes();
-        *refs.7 = state_words[7].to_le_bytes();
-    }
-    bytes
-}
-
-#[cfg(feature = "std")]
-impl std::io::Write for State {
-    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        self.update(buf);
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> std::io::Result<()> {
-        Ok(())
-    }
-}
-
-impl fmt::Debug for State {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        // NB: Don't print the words. Leaking them would allow length extension.
-        write!(
-            f,
-            "State {{ count: {}, hash_length: {}, last_node: {} }}",
-            self.count(),
-            self.hash_length,
-            self.last_node.yes(),
-        )
-    }
-}
-
-impl Default for State {
-    fn default() -> Self {
-        Self::with_params(&Params::default())
-    }
-}
-
-type HexString = arrayvec::ArrayString<[u8; 2 * OUTBYTES]>;
-
-/// A finalized BLAKE2 hash, with constant-time equality.
-#[derive(Clone, Copy)]
-pub struct Hash {
-    bytes: [u8; OUTBYTES],
-    len: u8,
-}
-
-impl Hash {
-    /// Convert the hash to a byte slice. Note that if you're using BLAKE2 as a MAC, you need
-    /// constant time equality, which `&[u8]` doesn't provide.
-    pub fn as_bytes(&self) -> &[u8] {
-        &self.bytes[..self.len as usize]
-    }
-
-    /// Convert the hash to a byte array. Note that if you're using BLAKE2 as a
-    /// MAC, you need constant time equality, which arrays don't provide. This
-    /// panics in debug mode if the length of the hash isn't `OUTBYTES`.
-    #[inline]
-    pub fn as_array(&self) -> &[u8; OUTBYTES] {
-        debug_assert_eq!(self.len as usize, OUTBYTES);
-        &self.bytes
-    }
-
-    /// Convert the hash to a lowercase hexadecimal
-    /// [`ArrayString`](https://docs.rs/arrayvec/0.4/arrayvec/struct.ArrayString.html).
-    pub fn to_hex(&self) -> HexString {
-        bytes_to_hex(self.as_bytes())
-    }
-}
-
-fn bytes_to_hex(bytes: &[u8]) -> HexString {
-    let mut s = arrayvec::ArrayString::new();
-    let table = b"0123456789abcdef";
-    for &b in bytes {
-        s.push(table[(b >> 4) as usize] as char);
-        s.push(table[(b & 0xf) as usize] as char);
-    }
-    s
-}
-
-/// This implementation is constant time, if the two hashes are the same length.
-impl PartialEq for Hash {
-    fn eq(&self, other: &Hash) -> bool {
-        constant_time_eq::constant_time_eq(&self.as_bytes(), &other.as_bytes())
-    }
-}
-
-/// This implementation is constant time, if the slice is the same length as the hash.
-impl PartialEq<[u8]> for Hash {
-    fn eq(&self, other: &[u8]) -> bool {
-        constant_time_eq::constant_time_eq(&self.as_bytes(), other)
-    }
-}
-
-impl Eq for Hash {}
-
-impl AsRef<[u8]> for Hash {
-    fn as_ref(&self) -> &[u8] {
-        self.as_bytes()
-    }
-}
-
-impl fmt::Debug for Hash {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Hash(0x{})", self.to_hex())
-    }
-}
-
-// Paint a byte pattern that won't repeat, so that we don't accidentally miss
-// buffer offset bugs. This is the same as what Bao uses in its tests.
-#[cfg(test)]
-fn paint_test_input(buf: &mut [u8]) {
-    let mut offset = 0;
-    let mut counter: u32 = 1;
-    while offset < buf.len() {
-        let bytes = counter.to_le_bytes();
-        let take = cmp::min(bytes.len(), buf.len() - offset);
-        buf[offset..][..take].copy_from_slice(&bytes[..take]);
-        counter += 1;
-        offset += take;
-    }
-}
-
-// This module is pub for internal benchmarks only. Please don't use it.
-#[doc(hidden)]
-pub mod benchmarks {
-    use super::*;
-
-    pub fn force_portable(params: &mut Params) {
-        params.implementation = guts::Implementation::portable();
-    }
-
-    pub fn force_portable_blake2bp(params: &mut blake2bp::Params) {
-        blake2bp::force_portable(params);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/many.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/many.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/many.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/many.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,529 +0,0 @@
-//! Interfaces for hashing multiple inputs at once, using SIMD more
-//! efficiently.
-//!
-//! The throughput of these interfaces is comparable to BLAKE2bp, about twice
-//! the throughput of regular BLAKE2b when AVX2 is available.
-//!
-//! These interfaces can accept any number of inputs, and the implementation
-//! does its best to parallelize them. In general, the more inputs you can pass
-//! in at once the better. If you need to batch your inputs in smaller groups,
-//! see the [`degree`](fn.degree.html) function for a good batch size.
-//!
-//! The implementation keeps working in parallel even when inputs are of
-//! different lengths, by managing a working set of jobs whose input isn't yet
-//! exhausted. However, if one or two inputs are much longer than the others,
-//! and they're encountered only at the end, there might not be any remaining
-//! work to parallelize them with. In this case, sorting the inputs
-//! longest-first can improve parallelism.
-//!
-//! # Example
-//!
-//! ```
-//! use blake2b_simd::{blake2b, State, many::update_many};
-//!
-//! let mut states = [
-//!     State::new(),
-//!     State::new(),
-//!     State::new(),
-//!     State::new(),
-//! ];
-//!
-//! let inputs = [
-//!     &b"foo"[..],
-//!     &b"bar"[..],
-//!     &b"baz"[..],
-//!     &b"bing"[..],
-//! ];
-//!
-//! update_many(states.iter_mut().zip(inputs.iter()));
-//!
-//! for (state, input) in states.iter_mut().zip(inputs.iter()) {
-//!     assert_eq!(blake2b(input), state.finalize());
-//! }
-//! ```
-
-use crate::guts::{self, Finalize, Implementation, Job, LastNode, Stride};
-use crate::state_words_to_bytes;
-use crate::Count;
-use crate::Hash;
-use crate::Params;
-use crate::State;
-use crate::Word;
-use crate::BLOCKBYTES;
-use arrayref::array_mut_ref;
-use arrayvec::ArrayVec;
-use core::fmt;
-
-/// The largest possible value of [`degree`](fn.degree.html) on the target
-/// platform.
-///
-/// Note that this constant reflects the parallelism degree supported by this
-/// crate, so it will change over time as support is added or removed. For
-/// example, when Rust stabilizes AVX-512 support and this crate adds an
-/// AVX-512 implementation, this constant will double on x86 targets. If that
-/// implementation is an optional feature (e.g. because it's nightly-only), the
-/// value of this constant will depend on that optional feature also.
-pub const MAX_DEGREE: usize = guts::MAX_DEGREE;
-
-/// The parallelism degree of the implementation, detected at runtime. If you
-/// hash your inputs in small batches, making the batch size a multiple of
-/// `degree` will generally give good performance.
-///
-/// For example, an x86 processor that supports AVX2 can compute four BLAKE2b
-/// hashes in parallel, so `degree` returns 4 on that machine. If you call
-/// [`hash_many`] with only three inputs, that's not enough to use the AVX2
-/// implementation, and your average throughput will be lower. Likewise if you
-/// call it with five inputs of equal length, the first four will be hashed in
-/// parallel with AVX2, but the last one will have to be hashed by itself, and
-/// again your average throughput will be lower.
-///
-/// As noted in the module level docs, performance is more complicated if your
-/// inputs are of different lengths. When parallelizing long and short inputs
-/// together, the longer ones will have bytes left over, and the implementation
-/// will try to parallelize those leftover bytes with subsequent inputs. The
-/// more inputs available in that case, the more the implementation will be
-/// able to parallelize.
-///
-/// If you need a constant batch size, for example to collect inputs in an
-/// array, see [`MAX_DEGREE`].
-///
-/// [`hash_many`]: fn.hash_many.html
-/// [`MAX_DEGREE`]: constant.MAX_DEGREE.html
-pub fn degree() -> usize {
-    guts::Implementation::detect().degree()
-}
-
-type JobsVec<'a, 'b> = ArrayVec<[Job<'a, 'b>; guts::MAX_DEGREE]>;
-
-#[inline(always)]
-fn fill_jobs_vec<'a, 'b>(
-    jobs_iter: &mut impl Iterator<Item = Job<'a, 'b>>,
-    vec: &mut JobsVec<'a, 'b>,
-    target_len: usize,
-) {
-    while vec.len() < target_len {
-        if let Some(job) = jobs_iter.next() {
-            vec.push(job);
-        } else {
-            break;
-        }
-    }
-}
-
-#[inline(always)]
-fn evict_finished<'a, 'b>(vec: &mut JobsVec<'a, 'b>, num_jobs: usize) {
-    // Iterate backwards so that removal doesn't cause an out-of-bounds panic.
-    for i in (0..num_jobs).rev() {
-        // Note that is_empty() is only valid because we know all these jobs
-        // have been run at least once. Otherwise we could confuse the empty
-        // input for a finished job, which would be incorrect.
-        //
-        // Avoid a panic branch here in release mode.
-        debug_assert!(vec.len() > i);
-        if vec.len() > i && vec[i].input.is_empty() {
-            // Note that calling pop_at() repeatedly has some overhead, because
-            // later elements need to be shifted up. However, the JobsVec is
-            // small, and this approach guarantees that jobs are encountered in
-            // order.
-            vec.pop_at(i);
-        }
-    }
-}
-
-pub(crate) fn compress_many<'a, 'b, I>(
-    jobs: I,
-    imp: Implementation,
-    finalize: Finalize,
-    stride: Stride,
-) where
-    I: IntoIterator<Item = Job<'a, 'b>>,
-{
-    // Fuse is important for correctness, since each of these blocks tries to
-    // advance the iterator, even if a previous block emptied it.
-    let mut jobs_iter = jobs.into_iter().fuse();
-    let mut jobs_vec = JobsVec::new();
-
-    if imp.degree() >= 4 {
-        loop {
-            fill_jobs_vec(&mut jobs_iter, &mut jobs_vec, 4);
-            if jobs_vec.len() < 4 {
-                break;
-            }
-            let jobs_array = array_mut_ref!(jobs_vec, 0, 4);
-            imp.compress4_loop(jobs_array, finalize, stride);
-            evict_finished(&mut jobs_vec, 4);
-        }
-    }
-
-    if imp.degree() >= 2 {
-        loop {
-            fill_jobs_vec(&mut jobs_iter, &mut jobs_vec, 2);
-            if jobs_vec.len() < 2 {
-                break;
-            }
-            let jobs_array = array_mut_ref!(jobs_vec, 0, 2);
-            imp.compress2_loop(jobs_array, finalize, stride);
-            evict_finished(&mut jobs_vec, 2);
-        }
-    }
-
-    for job in jobs_vec.into_iter().chain(jobs_iter) {
-        let Job {
-            input,
-            words,
-            count,
-            last_node,
-        } = job;
-        imp.compress1_loop(input, words, count, last_node, finalize, stride);
-    }
-}
-
-/// Update any number of `State` objects at once.
-///
-/// # Example
-///
-/// ```
-/// use blake2b_simd::{blake2b, State, many::update_many};
-///
-/// let mut states = [
-///     State::new(),
-///     State::new(),
-///     State::new(),
-///     State::new(),
-/// ];
-///
-/// let inputs = [
-///     &b"foo"[..],
-///     &b"bar"[..],
-///     &b"baz"[..],
-///     &b"bing"[..],
-/// ];
-///
-/// update_many(states.iter_mut().zip(inputs.iter()));
-///
-/// for (state, input) in states.iter_mut().zip(inputs.iter()) {
-///     assert_eq!(blake2b(input), state.finalize());
-/// }
-/// ```
-pub fn update_many<'a, 'b, I, T>(pairs: I)
-where
-    I: IntoIterator<Item = (&'a mut State, &'b T)>,
-    T: 'b + AsRef<[u8]> + ?Sized,
-{
-    // Get the guts::Implementation from the first state, if any.
-    let mut peekable_pairs = pairs.into_iter().peekable();
-    let implementation = if let Some((state, _)) = peekable_pairs.peek() {
-        state.implementation
-    } else {
-        // No work items, just short circuit.
-        return;
-    };
-
-    // Adapt the pairs iterator into a Jobs iterator, but skip over the Jobs
-    // where there's not actually any work to do (e.g. because there's not much
-    // input and it's all just going in the State buffer).
-    let jobs = peekable_pairs.flat_map(|(state, input_t)| {
-        let mut input = input_t.as_ref();
-        // For each pair, if the State has some input in its buffer, try to
-        // finish that buffer. If there wasn't enough input to do that --
-        // or if the input was empty to begin with -- skip this pair.
-        state.compress_buffer_if_possible(&mut input);
-        if input.is_empty() {
-            return None;
-        }
-        // Now we know the buffer is empty and there's more input. Make sure we
-        // buffer the final block, because update() doesn't finalize.
-        let mut last_block_start = input.len() - 1;
-        last_block_start -= last_block_start % BLOCKBYTES;
-        let (blocks, last_block) = input.split_at(last_block_start);
-        state.buf[..last_block.len()].copy_from_slice(last_block);
-        state.buflen = last_block.len() as u8;
-        // Finally, if the full blocks slice is non-empty, prepare that job for
-        // compression, and bump the State count.
-        if blocks.is_empty() {
-            None
-        } else {
-            let count = state.count;
-            state.count = state.count.wrapping_add(blocks.len() as Count);
-            Some(Job {
-                input: blocks,
-                words: &mut state.words,
-                count,
-                last_node: state.last_node,
-            })
-        }
-    });
-
-    // Run all the Jobs in the iterator.
-    compress_many(jobs, implementation, Finalize::No, Stride::Serial);
-}
-
-/// A job for the [`hash_many`] function. After calling [`hash_many`] on a
-/// collection of `HashManyJob` objects, you can call [`to_hash`] on each job
-/// to get the result.
-///
-/// [`hash_many`]: fn.hash_many.html
-/// [`to_hash`]: struct.HashManyJob.html#method.to_hash
-#[derive(Clone)]
-pub struct HashManyJob<'a> {
-    words: [Word; 8],
-    count: Count,
-    last_node: LastNode,
-    hash_length: u8,
-    input: &'a [u8],
-    finished: bool,
-    implementation: guts::Implementation,
-}
-
-impl<'a> HashManyJob<'a> {
-    /// Construct a new `HashManyJob` from a set of hashing parameters and an
-    /// input.
-    #[inline]
-    pub fn new(params: &Params, input: &'a [u8]) -> Self {
-        let mut words = params.to_words();
-        let mut count = 0;
-        let mut finished = false;
-        // If we have key bytes, compress them into the state words. If there's
-        // no additional input, this compression needs to finalize and set
-        // finished=true.
-        if params.key_length > 0 {
-            let mut finalization = Finalize::No;
-            if input.is_empty() {
-                finalization = Finalize::Yes;
-                finished = true;
-            }
-            params.implementation.compress1_loop(
-                &params.key_block,
-                &mut words,
-                0,
-                params.last_node,
-                finalization,
-                Stride::Serial,
-            );
-            count = BLOCKBYTES as Count;
-        }
-        Self {
-            words,
-            count,
-            last_node: params.last_node,
-            hash_length: params.hash_length,
-            input,
-            finished,
-            implementation: params.implementation,
-        }
-    }
-
-    /// Get the hash from a finished job. If you call this before calling
-    /// [`hash_many`], it will panic in debug mode.
-    ///
-    /// [`hash_many`]: fn.hash_many.html
-    #[inline]
-    pub fn to_hash(&self) -> Hash {
-        debug_assert!(self.finished, "job hasn't been run yet");
-        Hash {
-            bytes: state_words_to_bytes(&self.words),
-            len: self.hash_length,
-        }
-    }
-}
-
-impl<'a> fmt::Debug for HashManyJob<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        // NB: Don't print the words. Leaking them would allow length extension.
-        write!(
-            f,
-            "HashManyJob {{ count: {}, hash_length: {}, last_node: {}, input_len: {} }}",
-            self.count,
-            self.hash_length,
-            self.last_node.yes(),
-            self.input.len(),
-        )
-    }
-}
-
-/// Hash any number of complete inputs all at once.
-///
-/// This is slightly more efficient than using `update_many` with `State`
-/// objects, because it doesn't need to do any buffering.
-///
-/// Running `hash_many` on the same `HashManyJob` object more than once has no
-/// effect.
-///
-/// # Example
-///
-/// ```
-/// use blake2b_simd::{blake2b, Params, many::{HashManyJob, hash_many}};
-///
-/// let inputs = [
-///     &b"foo"[..],
-///     &b"bar"[..],
-///     &b"baz"[..],
-///     &b"bing"[..],
-/// ];
-///
-/// let mut params = Params::new();
-/// params.hash_length(16);
-///
-/// let mut jobs = [
-///     HashManyJob::new(&params, inputs[0]),
-///     HashManyJob::new(&params, inputs[1]),
-///     HashManyJob::new(&params, inputs[2]),
-///     HashManyJob::new(&params, inputs[3]),
-/// ];
-///
-/// hash_many(jobs.iter_mut());
-///
-/// for (input, job) in inputs.iter().zip(jobs.iter()) {
-///     let expected = params.hash(input);
-///     assert_eq!(expected, job.to_hash());
-/// }
-/// ```
-pub fn hash_many<'a, 'b, I>(hash_many_jobs: I)
-where
-    'b: 'a,
-    I: IntoIterator<Item = &'a mut HashManyJob<'b>>,
-{
-    // Get the guts::Implementation from the first job, if any.
-    let mut peekable_jobs = hash_many_jobs.into_iter().peekable();
-    let implementation = if let Some(job) = peekable_jobs.peek() {
-        job.implementation
-    } else {
-        // No work items, just short circuit.
-        return;
-    };
-
-    // In the jobs iterator, skip HashManyJobs that have already been run. This
-    // is less because we actually expect callers to call hash_many twice
-    // (though they're allowed to if they want), and more because
-    // HashManyJob::new might need to finalize if there are key bytes but no
-    // input. Tying the job lifetime to the Params reference is an alternative,
-    // but I've found it too constraining in practice. We could also put key
-    // bytes in every HashManyJob, but that would add unnecessary storage and
-    // zeroing for all callers.
-    let unfinished_jobs = peekable_jobs.into_iter().filter(|j| !j.finished);
-    let jobs = unfinished_jobs.map(|j| {
-        j.finished = true;
-        Job {
-            input: j.input,
-            words: &mut j.words,
-            count: j.count,
-            last_node: j.last_node,
-        }
-    });
-    compress_many(jobs, implementation, Finalize::Yes, Stride::Serial);
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::guts;
-    use crate::paint_test_input;
-    use crate::BLOCKBYTES;
-    use arrayvec::ArrayVec;
-
-    #[test]
-    fn test_degree() {
-        assert!(degree() <= MAX_DEGREE);
-
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        #[cfg(feature = "std")]
-        {
-            if is_x86_feature_detected!("avx2") {
-                assert!(degree() >= 4);
-            }
-            if is_x86_feature_detected!("sse4.1") {
-                assert!(degree() >= 2);
-            }
-        }
-    }
-
-    #[test]
-    fn test_hash_many() {
-        // Use a length of inputs that will exercise all of the power-of-two loops.
-        const LEN: usize = 2 * guts::MAX_DEGREE - 1;
-
-        // Rerun LEN inputs LEN different times, with the empty input starting in a
-        // different spot each time.
-        let mut input = [0; LEN * BLOCKBYTES];
-        paint_test_input(&mut input);
-        for start_offset in 0..LEN {
-            let mut inputs: [&[u8]; LEN] = [&[]; LEN];
-            for i in 0..LEN {
-                let chunks = (i + start_offset) % LEN;
-                inputs[i] = &input[..chunks * BLOCKBYTES];
-            }
-
-            let mut params: ArrayVec<[Params; LEN]> = ArrayVec::new();
-            for i in 0..LEN {
-                let mut p = Params::new();
-                p.node_offset(i as u64);
-                if i % 2 == 1 {
-                    p.last_node(true);
-                    p.key(b"foo");
-                }
-                params.push(p);
-            }
-
-            let mut jobs: ArrayVec<[HashManyJob; LEN]> = ArrayVec::new();
-            for i in 0..LEN {
-                jobs.push(HashManyJob::new(&params[i], inputs[i]));
-            }
-
-            hash_many(&mut jobs);
-
-            // Check the outputs.
-            for i in 0..LEN {
-                let expected = params[i].hash(inputs[i]);
-                assert_eq!(expected, jobs[i].to_hash());
-            }
-        }
-    }
-
-    #[test]
-    fn test_update_many() {
-        // Use a length of inputs that will exercise all of the power-of-two loops.
-        const LEN: usize = 2 * guts::MAX_DEGREE - 1;
-
-        // Rerun LEN inputs LEN different times, with the empty input starting in a
-        // different spot each time.
-        let mut input = [0; LEN * BLOCKBYTES];
-        paint_test_input(&mut input);
-        for start_offset in 0..LEN {
-            let mut inputs: [&[u8]; LEN] = [&[]; LEN];
-            for i in 0..LEN {
-                let chunks = (i + start_offset) % LEN;
-                inputs[i] = &input[..chunks * BLOCKBYTES];
-            }
-
-            let mut params: ArrayVec<[Params; LEN]> = ArrayVec::new();
-            for i in 0..LEN {
-                let mut p = Params::new();
-                p.node_offset(i as u64);
-                if i % 2 == 1 {
-                    p.last_node(true);
-                    p.key(b"foo");
-                }
-                params.push(p);
-            }
-
-            let mut states: ArrayVec<[State; LEN]> = ArrayVec::new();
-            for i in 0..LEN {
-                states.push(params[i].to_state());
-            }
-
-            // Run each input twice through, to exercise buffering.
-            update_many(states.iter_mut().zip(inputs.iter()));
-            update_many(states.iter_mut().zip(inputs.iter()));
-
-            // Check the outputs.
-            for i in 0..LEN {
-                let mut reference_state = params[i].to_state();
-                // Again, run the input twice.
-                reference_state.update(inputs[i]);
-                reference_state.update(inputs[i]);
-                assert_eq!(reference_state.finalize(), states[i].finalize());
-                assert_eq!(2 * inputs[i].len() as Count, states[i].count());
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/portable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/portable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/portable.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/portable.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,168 +0,0 @@
-use arrayref::{array_ref, array_refs};
-
-use super::*;
-use crate::guts::{
-    count_high, count_low, final_block, flag_word, input_debug_asserts, Finalize, LastNode, Stride,
-};
-
-// G is the mixing function, called eight times per round in the compression
-// function. V is the 16-word state vector of the compression function, usually
-// described as a 4x4 matrix. A, B, C, and D are the mixing indices, set by the
-// caller first to the four columns of V, and then to its four diagonals. X and
-// Y are words of input, chosen by the caller according to the message
-// schedule, SIGMA.
-#[inline(always)]
-fn g(v: &mut [Word; 16], a: usize, b: usize, c: usize, d: usize, x: Word, y: Word) {
-    v[a] = v[a].wrapping_add(v[b]).wrapping_add(x);
-    v[d] = (v[d] ^ v[a]).rotate_right(32);
-    v[c] = v[c].wrapping_add(v[d]);
-    v[b] = (v[b] ^ v[c]).rotate_right(24);
-    v[a] = v[a].wrapping_add(v[b]).wrapping_add(y);
-    v[d] = (v[d] ^ v[a]).rotate_right(16);
-    v[c] = v[c].wrapping_add(v[d]);
-    v[b] = (v[b] ^ v[c]).rotate_right(63);
-}
-
-// This is too much inlining for some small chips like ARM Cortex-M0, so the
-// uninline_portable feature is provided to disable it.
-#[cfg_attr(not(feature = "uninline_portable"), inline(always))]
-fn round(r: usize, m: &[Word; 16], v: &mut [Word; 16]) {
-    // Select the message schedule based on the round.
-    let s = SIGMA[r];
-
-    // Mix the columns.
-    g(v, 0, 4, 8, 12, m[s[0] as usize], m[s[1] as usize]);
-    g(v, 1, 5, 9, 13, m[s[2] as usize], m[s[3] as usize]);
-    g(v, 2, 6, 10, 14, m[s[4] as usize], m[s[5] as usize]);
-    g(v, 3, 7, 11, 15, m[s[6] as usize], m[s[7] as usize]);
-
-    // Mix the rows.
-    g(v, 0, 5, 10, 15, m[s[8] as usize], m[s[9] as usize]);
-    g(v, 1, 6, 11, 12, m[s[10] as usize], m[s[11] as usize]);
-    g(v, 2, 7, 8, 13, m[s[12] as usize], m[s[13] as usize]);
-    g(v, 3, 4, 9, 14, m[s[14] as usize], m[s[15] as usize]);
-}
-
-#[inline(always)]
-fn compress_block(
-    block: &[u8; BLOCKBYTES],
-    words: &mut [Word; 8],
-    count: Count,
-    last_block: Word,
-    last_node: Word,
-) {
-    // Initialize the compression state.
-    let mut v = [
-        words[0],
-        words[1],
-        words[2],
-        words[3],
-        words[4],
-        words[5],
-        words[6],
-        words[7],
-        IV[0],
-        IV[1],
-        IV[2],
-        IV[3],
-        IV[4] ^ count_low(count),
-        IV[5] ^ count_high(count),
-        IV[6] ^ last_block,
-        IV[7] ^ last_node,
-    ];
-
-    // Parse the message bytes as ints in little endian order.
-    const W: usize = size_of::<Word>();
-    let msg_refs = array_refs!(block, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W);
-    let m = [
-        Word::from_le_bytes(*msg_refs.0),
-        Word::from_le_bytes(*msg_refs.1),
-        Word::from_le_bytes(*msg_refs.2),
-        Word::from_le_bytes(*msg_refs.3),
-        Word::from_le_bytes(*msg_refs.4),
-        Word::from_le_bytes(*msg_refs.5),
-        Word::from_le_bytes(*msg_refs.6),
-        Word::from_le_bytes(*msg_refs.7),
-        Word::from_le_bytes(*msg_refs.8),
-        Word::from_le_bytes(*msg_refs.9),
-        Word::from_le_bytes(*msg_refs.10),
-        Word::from_le_bytes(*msg_refs.11),
-        Word::from_le_bytes(*msg_refs.12),
-        Word::from_le_bytes(*msg_refs.13),
-        Word::from_le_bytes(*msg_refs.14),
-        Word::from_le_bytes(*msg_refs.15),
-    ];
-
-    round(0, &m, &mut v);
-    round(1, &m, &mut v);
-    round(2, &m, &mut v);
-    round(3, &m, &mut v);
-    round(4, &m, &mut v);
-    round(5, &m, &mut v);
-    round(6, &m, &mut v);
-    round(7, &m, &mut v);
-    round(8, &m, &mut v);
-    round(9, &m, &mut v);
-    round(10, &m, &mut v);
-    round(11, &m, &mut v);
-
-    words[0] ^= v[0] ^ v[8];
-    words[1] ^= v[1] ^ v[9];
-    words[2] ^= v[2] ^ v[10];
-    words[3] ^= v[3] ^ v[11];
-    words[4] ^= v[4] ^ v[12];
-    words[5] ^= v[5] ^ v[13];
-    words[6] ^= v[6] ^ v[14];
-    words[7] ^= v[7] ^ v[15];
-}
-
-pub fn compress1_loop(
-    input: &[u8],
-    words: &mut [Word; 8],
-    mut count: Count,
-    last_node: LastNode,
-    finalize: Finalize,
-    stride: Stride,
-) {
-    input_debug_asserts(input, finalize);
-
-    let mut local_words = *words;
-
-    let mut fin_offset = input.len().saturating_sub(1);
-    fin_offset -= fin_offset % stride.padded_blockbytes();
-    let mut buf = [0; BLOCKBYTES];
-    let (fin_block, fin_len, _) = final_block(input, fin_offset, &mut buf, stride);
-    let fin_last_block = flag_word(finalize.yes());
-    let fin_last_node = flag_word(finalize.yes() && last_node.yes());
-
-    let mut offset = 0;
-    loop {
-        let block;
-        let count_delta;
-        let last_block;
-        let last_node;
-        if offset == fin_offset {
-            block = fin_block;
-            count_delta = fin_len;
-            last_block = fin_last_block;
-            last_node = fin_last_node;
-        } else {
-            block = array_ref!(input, offset, BLOCKBYTES);
-            count_delta = BLOCKBYTES;
-            last_block = flag_word(false);
-            last_node = flag_word(false);
-        };
-
-        count = count.wrapping_add(count_delta as Count);
-        compress_block(block, &mut local_words, count, last_block, last_node);
-
-        // Check for termination before bumping the offset, to avoid overflow.
-        if offset == fin_offset {
-            break;
-        }
-
-        offset += stride.padded_blockbytes();
-    }
-
-    *words = local_words;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/sse41.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/sse41.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/sse41.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/sse41.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,461 +0,0 @@
-#[cfg(target_arch = "x86")]
-use core::arch::x86::*;
-#[cfg(target_arch = "x86_64")]
-use core::arch::x86_64::*;
-
-use crate::guts::{
-    assemble_count, count_high, count_low, final_block, flag_word, input_debug_asserts, Finalize,
-    Job, Stride,
-};
-use crate::{Word, BLOCKBYTES, IV, SIGMA};
-use arrayref::{array_refs, mut_array_refs};
-use core::cmp;
-use core::mem;
-
-pub const DEGREE: usize = 2;
-
-#[inline(always)]
-unsafe fn loadu(src: *const [Word; DEGREE]) -> __m128i {
-    // This is an unaligned load, so the pointer cast is allowed.
-    _mm_loadu_si128(src as *const __m128i)
-}
-
-#[inline(always)]
-unsafe fn storeu(src: __m128i, dest: *mut [Word; DEGREE]) {
-    // This is an unaligned store, so the pointer cast is allowed.
-    _mm_storeu_si128(dest as *mut __m128i, src)
-}
-
-#[inline(always)]
-unsafe fn add(a: __m128i, b: __m128i) -> __m128i {
-    _mm_add_epi64(a, b)
-}
-
-#[inline(always)]
-unsafe fn eq(a: __m128i, b: __m128i) -> __m128i {
-    _mm_cmpeq_epi64(a, b)
-}
-
-#[inline(always)]
-unsafe fn and(a: __m128i, b: __m128i) -> __m128i {
-    _mm_and_si128(a, b)
-}
-
-#[inline(always)]
-unsafe fn negate_and(a: __m128i, b: __m128i) -> __m128i {
-    // Note that "and not" implies the reverse of the actual arg order.
-    _mm_andnot_si128(a, b)
-}
-
-#[inline(always)]
-unsafe fn xor(a: __m128i, b: __m128i) -> __m128i {
-    _mm_xor_si128(a, b)
-}
-
-#[inline(always)]
-unsafe fn set1(x: u64) -> __m128i {
-    _mm_set1_epi64x(x as i64)
-}
-
-#[inline(always)]
-unsafe fn set2(a: u64, b: u64) -> __m128i {
-    // There's no _mm_setr_epi64x, so note the arg order is backwards.
-    _mm_set_epi64x(b as i64, a as i64)
-}
-
-// Adapted from https://github.com/rust-lang-nursery/stdsimd/pull/479.
-macro_rules! _MM_SHUFFLE {
-    ($z:expr, $y:expr, $x:expr, $w:expr) => {
-        ($z << 6) | ($y << 4) | ($x << 2) | $w
-    };
-}
-
-// These rotations are the "simple version". For the "complicated version", see
-// https://github.com/sneves/blake2-avx2/blob/b3723921f668df09ece52dcd225a36d4a4eea1d9/blake2b-common.h#L43-L46.
-// For a discussion of the tradeoffs, see
-// https://github.com/sneves/blake2-avx2/pull/5. In short:
-// - Due to an LLVM bug (https://bugs.llvm.org/show_bug.cgi?id=44379), this
-//   version performs better on recent x86 chips.
-// - LLVM is able to optimize this version to AVX-512 rotation instructions
-//   when those are enabled.
-
-#[inline(always)]
-unsafe fn rot32(x: __m128i) -> __m128i {
-    _mm_or_si128(_mm_srli_epi64(x, 32), _mm_slli_epi64(x, 64 - 32))
-}
-
-#[inline(always)]
-unsafe fn rot24(x: __m128i) -> __m128i {
-    _mm_or_si128(_mm_srli_epi64(x, 24), _mm_slli_epi64(x, 64 - 24))
-}
-
-#[inline(always)]
-unsafe fn rot16(x: __m128i) -> __m128i {
-    _mm_or_si128(_mm_srli_epi64(x, 16), _mm_slli_epi64(x, 64 - 16))
-}
-
-#[inline(always)]
-unsafe fn rot63(x: __m128i) -> __m128i {
-    _mm_or_si128(_mm_srli_epi64(x, 63), _mm_slli_epi64(x, 64 - 63))
-}
-
-#[inline(always)]
-unsafe fn round(v: &mut [__m128i; 16], m: &[__m128i; 16], r: usize) {
-    v[0] = add(v[0], m[SIGMA[r][0] as usize]);
-    v[1] = add(v[1], m[SIGMA[r][2] as usize]);
-    v[2] = add(v[2], m[SIGMA[r][4] as usize]);
-    v[3] = add(v[3], m[SIGMA[r][6] as usize]);
-    v[0] = add(v[0], v[4]);
-    v[1] = add(v[1], v[5]);
-    v[2] = add(v[2], v[6]);
-    v[3] = add(v[3], v[7]);
-    v[12] = xor(v[12], v[0]);
-    v[13] = xor(v[13], v[1]);
-    v[14] = xor(v[14], v[2]);
-    v[15] = xor(v[15], v[3]);
-    v[12] = rot32(v[12]);
-    v[13] = rot32(v[13]);
-    v[14] = rot32(v[14]);
-    v[15] = rot32(v[15]);
-    v[8] = add(v[8], v[12]);
-    v[9] = add(v[9], v[13]);
-    v[10] = add(v[10], v[14]);
-    v[11] = add(v[11], v[15]);
-    v[4] = xor(v[4], v[8]);
-    v[5] = xor(v[5], v[9]);
-    v[6] = xor(v[6], v[10]);
-    v[7] = xor(v[7], v[11]);
-    v[4] = rot24(v[4]);
-    v[5] = rot24(v[5]);
-    v[6] = rot24(v[6]);
-    v[7] = rot24(v[7]);
-    v[0] = add(v[0], m[SIGMA[r][1] as usize]);
-    v[1] = add(v[1], m[SIGMA[r][3] as usize]);
-    v[2] = add(v[2], m[SIGMA[r][5] as usize]);
-    v[3] = add(v[3], m[SIGMA[r][7] as usize]);
-    v[0] = add(v[0], v[4]);
-    v[1] = add(v[1], v[5]);
-    v[2] = add(v[2], v[6]);
-    v[3] = add(v[3], v[7]);
-    v[12] = xor(v[12], v[0]);
-    v[13] = xor(v[13], v[1]);
-    v[14] = xor(v[14], v[2]);
-    v[15] = xor(v[15], v[3]);
-    v[12] = rot16(v[12]);
-    v[13] = rot16(v[13]);
-    v[14] = rot16(v[14]);
-    v[15] = rot16(v[15]);
-    v[8] = add(v[8], v[12]);
-    v[9] = add(v[9], v[13]);
-    v[10] = add(v[10], v[14]);
-    v[11] = add(v[11], v[15]);
-    v[4] = xor(v[4], v[8]);
-    v[5] = xor(v[5], v[9]);
-    v[6] = xor(v[6], v[10]);
-    v[7] = xor(v[7], v[11]);
-    v[4] = rot63(v[4]);
-    v[5] = rot63(v[5]);
-    v[6] = rot63(v[6]);
-    v[7] = rot63(v[7]);
-
-    v[0] = add(v[0], m[SIGMA[r][8] as usize]);
-    v[1] = add(v[1], m[SIGMA[r][10] as usize]);
-    v[2] = add(v[2], m[SIGMA[r][12] as usize]);
-    v[3] = add(v[3], m[SIGMA[r][14] as usize]);
-    v[0] = add(v[0], v[5]);
-    v[1] = add(v[1], v[6]);
-    v[2] = add(v[2], v[7]);
-    v[3] = add(v[3], v[4]);
-    v[15] = xor(v[15], v[0]);
-    v[12] = xor(v[12], v[1]);
-    v[13] = xor(v[13], v[2]);
-    v[14] = xor(v[14], v[3]);
-    v[15] = rot32(v[15]);
-    v[12] = rot32(v[12]);
-    v[13] = rot32(v[13]);
-    v[14] = rot32(v[14]);
-    v[10] = add(v[10], v[15]);
-    v[11] = add(v[11], v[12]);
-    v[8] = add(v[8], v[13]);
-    v[9] = add(v[9], v[14]);
-    v[5] = xor(v[5], v[10]);
-    v[6] = xor(v[6], v[11]);
-    v[7] = xor(v[7], v[8]);
-    v[4] = xor(v[4], v[9]);
-    v[5] = rot24(v[5]);
-    v[6] = rot24(v[6]);
-    v[7] = rot24(v[7]);
-    v[4] = rot24(v[4]);
-    v[0] = add(v[0], m[SIGMA[r][9] as usize]);
-    v[1] = add(v[1], m[SIGMA[r][11] as usize]);
-    v[2] = add(v[2], m[SIGMA[r][13] as usize]);
-    v[3] = add(v[3], m[SIGMA[r][15] as usize]);
-    v[0] = add(v[0], v[5]);
-    v[1] = add(v[1], v[6]);
-    v[2] = add(v[2], v[7]);
-    v[3] = add(v[3], v[4]);
-    v[15] = xor(v[15], v[0]);
-    v[12] = xor(v[12], v[1]);
-    v[13] = xor(v[13], v[2]);
-    v[14] = xor(v[14], v[3]);
-    v[15] = rot16(v[15]);
-    v[12] = rot16(v[12]);
-    v[13] = rot16(v[13]);
-    v[14] = rot16(v[14]);
-    v[10] = add(v[10], v[15]);
-    v[11] = add(v[11], v[12]);
-    v[8] = add(v[8], v[13]);
-    v[9] = add(v[9], v[14]);
-    v[5] = xor(v[5], v[10]);
-    v[6] = xor(v[6], v[11]);
-    v[7] = xor(v[7], v[8]);
-    v[4] = xor(v[4], v[9]);
-    v[5] = rot63(v[5]);
-    v[6] = rot63(v[6]);
-    v[7] = rot63(v[7]);
-    v[4] = rot63(v[4]);
-}
-
-// We'd rather make this a regular function with #[inline(always)], but for
-// some reason that blows up compile times by about 10 seconds, at least in
-// some cases (BLAKE2b avx2.rs). This macro seems to get the same performance
-// result, without the compile time issue.
-macro_rules! compress2_transposed {
-    (
-        $h_vecs:expr,
-        $msg_vecs:expr,
-        $count_low:expr,
-        $count_high:expr,
-        $lastblock:expr,
-        $lastnode:expr,
-    ) => {
-        let h_vecs: &mut [__m128i; 8] = $h_vecs;
-        let msg_vecs: &[__m128i; 16] = $msg_vecs;
-        let count_low: __m128i = $count_low;
-        let count_high: __m128i = $count_high;
-        let lastblock: __m128i = $lastblock;
-        let lastnode: __m128i = $lastnode;
-        let mut v = [
-            h_vecs[0],
-            h_vecs[1],
-            h_vecs[2],
-            h_vecs[3],
-            h_vecs[4],
-            h_vecs[5],
-            h_vecs[6],
-            h_vecs[7],
-            set1(IV[0]),
-            set1(IV[1]),
-            set1(IV[2]),
-            set1(IV[3]),
-            xor(set1(IV[4]), count_low),
-            xor(set1(IV[5]), count_high),
-            xor(set1(IV[6]), lastblock),
-            xor(set1(IV[7]), lastnode),
-        ];
-
-        round(&mut v, &msg_vecs, 0);
-        round(&mut v, &msg_vecs, 1);
-        round(&mut v, &msg_vecs, 2);
-        round(&mut v, &msg_vecs, 3);
-        round(&mut v, &msg_vecs, 4);
-        round(&mut v, &msg_vecs, 5);
-        round(&mut v, &msg_vecs, 6);
-        round(&mut v, &msg_vecs, 7);
-        round(&mut v, &msg_vecs, 8);
-        round(&mut v, &msg_vecs, 9);
-        round(&mut v, &msg_vecs, 10);
-        round(&mut v, &msg_vecs, 11);
-
-        h_vecs[0] = xor(xor(h_vecs[0], v[0]), v[8]);
-        h_vecs[1] = xor(xor(h_vecs[1], v[1]), v[9]);
-        h_vecs[2] = xor(xor(h_vecs[2], v[2]), v[10]);
-        h_vecs[3] = xor(xor(h_vecs[3], v[3]), v[11]);
-        h_vecs[4] = xor(xor(h_vecs[4], v[4]), v[12]);
-        h_vecs[5] = xor(xor(h_vecs[5], v[5]), v[13]);
-        h_vecs[6] = xor(xor(h_vecs[6], v[6]), v[14]);
-        h_vecs[7] = xor(xor(h_vecs[7], v[7]), v[15]);
-    };
-}
-
-#[inline(always)]
-unsafe fn transpose_vecs(a: __m128i, b: __m128i) -> [__m128i; DEGREE] {
-    let a_words: [Word; DEGREE] = mem::transmute(a);
-    let b_words: [Word; DEGREE] = mem::transmute(b);
-    [set2(a_words[0], b_words[0]), set2(a_words[1], b_words[1])]
-}
-
-#[inline(always)]
-unsafe fn transpose_state_vecs(jobs: &[Job; DEGREE]) -> [__m128i; 8] {
-    // Load all the state words into transposed vectors, where the first vector
-    // has the first word of each state, etc. Transposing once at the beginning
-    // and once at the end is more efficient that repeating it for each block.
-    let words0 = array_refs!(&jobs[0].words, DEGREE, DEGREE, DEGREE, DEGREE);
-    let words1 = array_refs!(&jobs[1].words, DEGREE, DEGREE, DEGREE, DEGREE);
-    let [h0, h1] = transpose_vecs(loadu(words0.0), loadu(words1.0));
-    let [h2, h3] = transpose_vecs(loadu(words0.1), loadu(words1.1));
-    let [h4, h5] = transpose_vecs(loadu(words0.2), loadu(words1.2));
-    let [h6, h7] = transpose_vecs(loadu(words0.3), loadu(words1.3));
-    [h0, h1, h2, h3, h4, h5, h6, h7]
-}
-
-#[inline(always)]
-unsafe fn untranspose_state_vecs(h_vecs: &[__m128i; 8], jobs: &mut [Job; DEGREE]) {
-    // Un-transpose the updated state vectors back into the caller's arrays.
-    let [job0, job1] = jobs;
-    let words0 = mut_array_refs!(&mut job0.words, DEGREE, DEGREE, DEGREE, DEGREE);
-    let words1 = mut_array_refs!(&mut job1.words, DEGREE, DEGREE, DEGREE, DEGREE);
-
-    let out = transpose_vecs(h_vecs[0], h_vecs[1]);
-    storeu(out[0], words0.0);
-    storeu(out[1], words1.0);
-    let out = transpose_vecs(h_vecs[2], h_vecs[3]);
-    storeu(out[0], words0.1);
-    storeu(out[1], words1.1);
-    let out = transpose_vecs(h_vecs[4], h_vecs[5]);
-    storeu(out[0], words0.2);
-    storeu(out[1], words1.2);
-    let out = transpose_vecs(h_vecs[6], h_vecs[7]);
-    storeu(out[0], words0.3);
-    storeu(out[1], words1.3);
-}
-
-#[inline(always)]
-unsafe fn transpose_msg_vecs(blocks: [*const [u8; BLOCKBYTES]; DEGREE]) -> [__m128i; 16] {
-    // These input arrays have no particular alignment, so we use unaligned
-    // loads to read from them.
-    let block0 = blocks[0] as *const [Word; DEGREE];
-    let block1 = blocks[1] as *const [Word; DEGREE];
-    let [m0, m1] = transpose_vecs(loadu(block0.add(0)), loadu(block1.add(0)));
-    let [m2, m3] = transpose_vecs(loadu(block0.add(1)), loadu(block1.add(1)));
-    let [m4, m5] = transpose_vecs(loadu(block0.add(2)), loadu(block1.add(2)));
-    let [m6, m7] = transpose_vecs(loadu(block0.add(3)), loadu(block1.add(3)));
-    let [m8, m9] = transpose_vecs(loadu(block0.add(4)), loadu(block1.add(4)));
-    let [m10, m11] = transpose_vecs(loadu(block0.add(5)), loadu(block1.add(5)));
-    let [m12, m13] = transpose_vecs(loadu(block0.add(6)), loadu(block1.add(6)));
-    let [m14, m15] = transpose_vecs(loadu(block0.add(7)), loadu(block1.add(7)));
-    [
-        m0, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15,
-    ]
-}
-
-#[inline(always)]
-unsafe fn load_counts(jobs: &[Job; DEGREE]) -> (__m128i, __m128i) {
-    (
-        set2(count_low(jobs[0].count), count_low(jobs[1].count)),
-        set2(count_high(jobs[0].count), count_high(jobs[1].count)),
-    )
-}
-
-#[inline(always)]
-unsafe fn store_counts(jobs: &mut [Job; DEGREE], low: __m128i, high: __m128i) {
-    let low_ints: [Word; DEGREE] = mem::transmute(low);
-    let high_ints: [Word; DEGREE] = mem::transmute(high);
-    for i in 0..DEGREE {
-        jobs[i].count = assemble_count(low_ints[i], high_ints[i]);
-    }
-}
-
-#[inline(always)]
-unsafe fn add_to_counts(lo: &mut __m128i, hi: &mut __m128i, delta: __m128i) {
-    // If the low counts reach zero, that means they wrapped, unless the delta
-    // was also zero.
-    *lo = add(*lo, delta);
-    let lo_reached_zero = eq(*lo, set1(0));
-    let delta_was_zero = eq(delta, set1(0));
-    let hi_inc = and(set1(1), negate_and(delta_was_zero, lo_reached_zero));
-    *hi = add(*hi, hi_inc);
-}
-
-#[inline(always)]
-unsafe fn flags_vec(flags: [bool; DEGREE]) -> __m128i {
-    set2(flag_word(flags[0]), flag_word(flags[1]))
-}
-
-#[target_feature(enable = "sse4.1")]
-pub unsafe fn compress2_loop(jobs: &mut [Job; DEGREE], finalize: Finalize, stride: Stride) {
-    // If we're not finalizing, there can't be a partial block at the end.
-    for job in jobs.iter() {
-        input_debug_asserts(job.input, finalize);
-    }
-
-    let msg_ptrs = [jobs[0].input.as_ptr(), jobs[1].input.as_ptr()];
-    let mut h_vecs = transpose_state_vecs(&jobs);
-    let (mut counts_lo, mut counts_hi) = load_counts(&jobs);
-
-    // Prepare the final blocks (note, which could be empty if the input is
-    // empty). Do all this before entering the main loop.
-    let min_len = jobs.iter().map(|job| job.input.len()).min().unwrap();
-    let mut fin_offset = min_len.saturating_sub(1);
-    fin_offset -= fin_offset % stride.padded_blockbytes();
-    // Performance note, making these buffers mem::uninitialized() seems to
-    // cause problems in the optimizer.
-    let mut buf0: [u8; BLOCKBYTES] = [0; BLOCKBYTES];
-    let mut buf1: [u8; BLOCKBYTES] = [0; BLOCKBYTES];
-    let (block0, len0, finalize0) = final_block(jobs[0].input, fin_offset, &mut buf0, stride);
-    let (block1, len1, finalize1) = final_block(jobs[1].input, fin_offset, &mut buf1, stride);
-    let fin_blocks: [*const [u8; BLOCKBYTES]; DEGREE] = [block0, block1];
-    let fin_counts_delta = set2(len0 as Word, len1 as Word);
-    let fin_last_block;
-    let fin_last_node;
-    if finalize.yes() {
-        fin_last_block = flags_vec([finalize0, finalize1]);
-        fin_last_node = flags_vec([
-            finalize0 && jobs[0].last_node.yes(),
-            finalize1 && jobs[1].last_node.yes(),
-        ]);
-    } else {
-        fin_last_block = set1(0);
-        fin_last_node = set1(0);
-    }
-
-    // The main loop.
-    let mut offset = 0;
-    loop {
-        let blocks;
-        let counts_delta;
-        let last_block;
-        let last_node;
-        if offset == fin_offset {
-            blocks = fin_blocks;
-            counts_delta = fin_counts_delta;
-            last_block = fin_last_block;
-            last_node = fin_last_node;
-        } else {
-            blocks = [
-                msg_ptrs[0].add(offset) as *const [u8; BLOCKBYTES],
-                msg_ptrs[1].add(offset) as *const [u8; BLOCKBYTES],
-            ];
-            counts_delta = set1(BLOCKBYTES as Word);
-            last_block = set1(0);
-            last_node = set1(0);
-        };
-
-        let m_vecs = transpose_msg_vecs(blocks);
-        add_to_counts(&mut counts_lo, &mut counts_hi, counts_delta);
-        compress2_transposed!(
-            &mut h_vecs,
-            &m_vecs,
-            counts_lo,
-            counts_hi,
-            last_block,
-            last_node,
-        );
-
-        // Check for termination before bumping the offset, to avoid overflow.
-        if offset == fin_offset {
-            break;
-        }
-
-        offset += stride.padded_blockbytes();
-    }
-
-    // Write out the results.
-    untranspose_state_vecs(&h_vecs, &mut *jobs);
-    store_counts(&mut *jobs, counts_lo, counts_hi);
-    let max_consumed = offset.saturating_add(stride.padded_blockbytes());
-    for job in jobs.iter_mut() {
-        let consumed = cmp::min(max_consumed, job.input.len());
-        job.input = &job.input[consumed..];
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/blake2b_simd/src/test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/blake2b_simd/src/test.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-use super::*;
-
-const EMPTY_HASH: &str = "786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419\
-                          d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce";
-const ABC_HASH: &str = "ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d1\
-                        7d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923";
-const ONE_BLOCK_HASH: &str = "865939e120e6805438478841afb739ae4250cf372653078a065cdcfffca4caf7\
-                              98e6d462b65d658fc165782640eded70963449ae1500fb0f24981d7727e22c41";
-const THOUSAND_HASH: &str = "1ee4e51ecab5210a518f26150e882627ec839967f19d763e1508b12cfefed148\
-                             58f6a1c9d1f969bc224dc9440f5a6955277e755b9c513f9ba4421c5e50c8d787";
-
-#[test]
-fn test_update_state() {
-    let io = &[
-        (&b""[..], EMPTY_HASH),
-        (&b"abc"[..], ABC_HASH),
-        (&[0; BLOCKBYTES], ONE_BLOCK_HASH),
-        (&[0; 1000], THOUSAND_HASH),
-    ];
-    // Test each input all at once.
-    for &(input, output) in io {
-        let hash = blake2b(input);
-        assert_eq!(&hash.to_hex(), output, "hash mismatch");
-    }
-    // Now in two chunks. This is especially important for the ONE_BLOCK case, because it would be
-    // a mistake for update() to call compress, even though the buffer is full.
-    for &(input, output) in io {
-        let mut state = State::new();
-        let split = input.len() / 2;
-        state.update(&input[..split]);
-        assert_eq!(split as Count, state.count());
-        state.update(&input[split..]);
-        assert_eq!(input.len() as Count, state.count());
-        let hash = state.finalize();
-        assert_eq!(&hash.to_hex(), output, "hash mismatch");
-    }
-    // Now one byte at a time.
-    for &(input, output) in io {
-        let mut state = State::new();
-        let mut count = 0;
-        for &b in input {
-            state.update(&[b]);
-            count += 1;
-            assert_eq!(count, state.count());
-        }
-        let hash = state.finalize();
-        assert_eq!(&hash.to_hex(), output, "hash mismatch");
-    }
-}
-
-#[test]
-fn test_multiple_finalizes() {
-    let mut state = State::new();
-    assert_eq!(&state.finalize().to_hex(), EMPTY_HASH, "hash mismatch");
-    assert_eq!(&state.finalize().to_hex(), EMPTY_HASH, "hash mismatch");
-    assert_eq!(&state.finalize().to_hex(), EMPTY_HASH, "hash mismatch");
-    state.update(b"abc");
-    assert_eq!(&state.finalize().to_hex(), ABC_HASH, "hash mismatch");
-    assert_eq!(&state.finalize().to_hex(), ABC_HASH, "hash mismatch");
-    assert_eq!(&state.finalize().to_hex(), ABC_HASH, "hash mismatch");
-}
-
-#[cfg(feature = "std")]
-#[test]
-fn test_write() {
-    use std::io::prelude::*;
-
-    let mut state = State::new();
-    state.write_all(&[0; 1000]).unwrap();
-    let hash = state.finalize();
-    assert_eq!(&hash.to_hex(), THOUSAND_HASH, "hash mismatch");
-}
-
-// You can check this case against the equivalent Python:
-//
-// import hashlib
-// hashlib.blake2b(
-//     b'foo',
-//     digest_size=18,
-//     key=b"bar",
-//     salt=b"bazbazbazbazbazb",
-//     person=b"bing bing bing b",
-//     fanout=2,
-//     depth=3,
-//     leaf_size=0x04050607,
-//     node_offset=0x08090a0b0c0d0e0f,
-//     node_depth=16,
-//     inner_size=17,
-//     last_node=True,
-// ).hexdigest()
-#[test]
-fn test_all_parameters() {
-    let mut params = Params::new();
-    params
-        .hash_length(18)
-        // Make sure a shorter key properly overwrites a longer one.
-        .key(b"not the real key")
-        .key(b"bar")
-        .salt(b"bazbazbazbazbazb")
-        .personal(b"bing bing bing b")
-        .fanout(2)
-        .max_depth(3)
-        .max_leaf_length(0x04050607)
-        .node_offset(0x08090a0b0c0d0e0f)
-        .node_depth(16)
-        .inner_hash_length(17)
-        .last_node(true);
-
-    // Check the State API.
-    assert_eq!(
-        "ec0f59cb65f92e7fcca1280ba859a6925ded",
-        &params.to_state().update(b"foo").finalize().to_hex()
-    );
-
-    // Check the all-at-once API.
-    assert_eq!(
-        "ec0f59cb65f92e7fcca1280ba859a6925ded",
-        &params.hash(b"foo").to_hex()
-    );
-}
-
-#[test]
-fn test_all_parameters_blake2bp() {
-    let mut params = blake2bp::Params::new();
-    params
-        .hash_length(18)
-        // Make sure a shorter key properly overwrites a longer one.
-        .key(b"not the real key")
-        .key(b"bar");
-
-    // Check the State API.
-    assert_eq!(
-        "8c54e888a8a01c63da6585c058fe54ea81df",
-        &params.to_state().update(b"foo").finalize().to_hex()
-    );
-
-    // Check the all-at-once API.
-    assert_eq!(
-        "8c54e888a8a01c63da6585c058fe54ea81df",
-        &params.hash(b"foo").to_hex()
-    );
-}
-
-#[test]
-#[should_panic]
-fn test_short_hash_length_panics() {
-    Params::new().hash_length(0);
-}
-
-#[test]
-#[should_panic]
-fn test_long_hash_length_panics() {
-    Params::new().hash_length(OUTBYTES + 1);
-}
-
-#[test]
-#[should_panic]
-fn test_long_key_panics() {
-    Params::new().key(&[0; KEYBYTES + 1]);
-}
-
-#[test]
-#[should_panic]
-fn test_long_salt_panics() {
-    Params::new().salt(&[0; SALTBYTES + 1]);
-}
-
-#[test]
-#[should_panic]
-fn test_long_personal_panics() {
-    Params::new().personal(&[0; PERSONALBYTES + 1]);
-}
-
-#[test]
-fn test_zero_max_depth_supported() {
-    Params::new().max_depth(0);
-}
-
-#[test]
-#[should_panic]
-fn test_long_inner_hash_length_panics() {
-    Params::new().inner_hash_length(OUTBYTES + 1);
-}
-
-#[test]
-#[should_panic]
-fn test_blake2bp_short_hash_length_panics() {
-    blake2bp::Params::new().hash_length(0);
-}
-
-#[test]
-#[should_panic]
-fn test_blake2bp_long_hash_length_panics() {
-    blake2bp::Params::new().hash_length(OUTBYTES + 1);
-}
-
-#[test]
-#[should_panic]
-fn test_blake2bp_long_key_panics() {
-    blake2bp::Params::new().key(&[0; KEYBYTES + 1]);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"e4e9e182794c2185438af0c505714df9e051d1d1b17aec7a42265be672b1d027","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"d5c22aa3118d240e877ad41c5d9fa232f9c77d757d4aac0c2f943afc0a95e0ef","src/lib.rs":"59dd4084e456153bee968153ee45e34c8e853abfb756a53571c5844ccaf18c23"},"package":"c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "block-buffer"
-version = "0.7.3"
-authors = ["RustCrypto Developers"]
-description = "Fixed size buffer for block processing of data"
-documentation = "https://docs.rs/block-buffer"
-keywords = ["block", "buffer"]
-categories = ["cryptography", "no-std"]
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/RustCrypto/utils"
-[dependencies.block-padding]
-version = "0.1"
-
-[dependencies.byte-tools]
-version = "0.3"
-
-[dependencies.byteorder]
-version = "1.1"
-default-features = false
-
-[dependencies.generic-array]
-version = "0.12"
-[badges.travis-ci]
-repository = "RustCrypto/utils"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2018-2019 The RustCrypto Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-buffer-0.7.3/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-buffer-0.7.3/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,210 +0,0 @@
-#![no_std]
-pub extern crate byteorder;
-pub extern crate block_padding;
-pub extern crate generic_array;
-extern crate byte_tools;
-
-use byteorder::{ByteOrder, BE};
-use byte_tools::zero;
-use block_padding::{Padding, PadError};
-use generic_array::{GenericArray, ArrayLength};
-use core::slice;
-
-/// Buffer for block processing of data
-#[derive(Clone, Default)]
-pub struct BlockBuffer<BlockSize: ArrayLength<u8>>  {
-    buffer: GenericArray<u8, BlockSize>,
-    pos: usize,
-}
-
-#[inline(always)]
-unsafe fn cast<N: ArrayLength<u8>>(block: &[u8]) -> &GenericArray<u8, N> {
-    debug_assert_eq!(block.len(), N::to_usize());
-    &*(block.as_ptr() as *const GenericArray<u8, N>)
-}
-
-
-
-impl<BlockSize: ArrayLength<u8>> BlockBuffer<BlockSize> {
-    /// Process data in `input` in blocks of size `BlockSize` using function `f`.
-    #[inline]
-    pub fn input<F>(&mut self, mut input: &[u8], mut f: F)
-        where F: FnMut(&GenericArray<u8, BlockSize>)
-    {
-        // If there is already data in the buffer, process it if we have
-        // enough to complete the chunk.
-        let rem = self.remaining();
-        if self.pos != 0 && input.len() >= rem {
-            let (l, r) = input.split_at(rem);
-            input = r;
-            self.buffer[self.pos..].copy_from_slice(l);
-            self.pos = 0;
-            f(&self.buffer);
-        }
-
-        // While we have at least a full buffer size chunks's worth of data,
-        // process that data without copying it into the buffer
-        while input.len() >= self.size() {
-            let (block, r) = input.split_at(self.size());
-            input = r;
-            f(unsafe { cast(block) });
-        }
-
-        // Copy any remaining data into the buffer.
-        self.buffer[self.pos..self.pos+input.len()].copy_from_slice(input);
-        self.pos += input.len();
-    }
-
-    /*
-    /// Process data in `input` in blocks of size `BlockSize` using function `f`, which accepts
-    /// slice of blocks.
-    #[inline]
-    pub fn input2<F>(&mut self, mut input: &[u8], mut f: F)
-        where F: FnMut(&[GenericArray<u8, BlockSize>])
-    {
-        // If there is already data in the buffer, process it if we have
-        // enough to complete the chunk.
-        let rem = self.remaining();
-        if self.pos != 0 && input.len() >= rem {
-            let (l, r) = input.split_at(rem);
-            input = r;
-            self.buffer[self.pos..].copy_from_slice(l);
-            self.pos = 0;
-            f(slice::from_ref(&self.buffer));
-        }
-
-        // While we have at least a full buffer size chunks's worth of data,
-        // process it data without copying into the buffer
-        let n_blocks = input.len()/self.size();
-        let (left, right) = input.split_at(n_blocks*self.size());
-        // safe because we guarantee that `blocks` does not point outside of `input` 
-        let blocks = unsafe {
-            slice::from_raw_parts(
-                left.as_ptr() as *const GenericArray<u8, BlockSize>,
-                n_blocks,
-            )
-        };
-        f(blocks);
-
-        // Copy remaining data into the buffer.
-        self.buffer[self.pos..self.pos+right.len()].copy_from_slice(right);
-        self.pos += right.len();
-    }
-    */
-
-    /// Variant that doesn't flush the buffer until there's additional
-    /// data to be processed. Suitable for tweakable block ciphers
-    /// like Threefish that need to know whether a block is the *last*
-    /// data block before processing it.
-    #[inline]
-    pub fn input_lazy<F>(&mut self, mut input: &[u8], mut f: F)
-        where F: FnMut(&GenericArray<u8, BlockSize>)
-    {
-        let rem = self.remaining();
-        if self.pos != 0 && input.len() > rem {
-            let (l, r) = input.split_at(rem);
-            input = r;
-            self.buffer[self.pos..].copy_from_slice(l);
-            self.pos = 0;
-            f(&self.buffer);
-        }
-
-        while input.len() > self.size() {
-            let (block, r) = input.split_at(self.size());
-            input = r;
-            f(unsafe { cast(block) });
-        }
-
-        self.buffer[self.pos..self.pos+input.len()].copy_from_slice(input);
-        self.pos += input.len();
-    }
-
-    /// Pad buffer with `prefix` and make sure that internall buffer
-    /// has at least `up_to` free bytes. All remaining bytes get
-    /// zeroed-out.
-    #[inline]
-    fn digest_pad<F>(&mut self, up_to: usize, f: &mut F)
-        where F: FnMut(&GenericArray<u8, BlockSize>)
-    {
-        if self.pos == self.size() {
-            f(&self.buffer);
-            self.pos = 0;
-        }
-        self.buffer[self.pos] = 0x80;
-        self.pos += 1;
-
-        zero(&mut self.buffer[self.pos..]);
-
-        if self.remaining() < up_to {
-            f(&self.buffer);
-            zero(&mut self.buffer[..self.pos]);
-        }
-    }
-
-    /// Pad message with 0x80, zeros and 64-bit message length
-    /// in a byte order specified by `B`
-    #[inline]
-    pub fn len64_padding<B, F>(&mut self, data_len: u64, mut f: F)
-        where B: ByteOrder, F: FnMut(&GenericArray<u8, BlockSize>)
-    {
-        // TODO: replace `F` with `impl Trait` on MSRV bump
-        self.digest_pad(8, &mut f);
-        let s = self.size();
-        B::write_u64(&mut self.buffer[s-8..], data_len);
-        f(&self.buffer);
-        self.pos = 0;
-    }
-
-
-    /// Pad message with 0x80, zeros and 128-bit message length
-    /// in the big-endian byte order
-    #[inline]
-    pub fn len128_padding_be<F>(&mut self, hi: u64, lo: u64, mut f: F)
-        where F: FnMut(&GenericArray<u8, BlockSize>)
-    {
-        // TODO: on MSRV bump replace `F` with `impl Trait`, use `u128`, add `B`
-        self.digest_pad(16, &mut f);
-        let s = self.size();
-        BE::write_u64(&mut self.buffer[s-16..s-8], hi);
-        BE::write_u64(&mut self.buffer[s-8..], lo);
-        f(&self.buffer);
-        self.pos = 0;
-    }
-
-    /// Pad message with a given padding `P`
-    ///
-    /// Returns `PadError` if internall buffer is full, which can only happen if
-    /// `input_lazy` was used.
-    #[inline]
-    pub fn pad_with<P: Padding>(&mut self)
-        -> Result<&mut GenericArray<u8, BlockSize>, PadError>
-    {
-        P::pad_block(&mut self.buffer[..], self.pos)?;
-        self.pos = 0;
-        Ok(&mut self.buffer)
-    }
-
-    /// Return size of the internall buffer in bytes
-    #[inline]
-    pub fn size(&self) -> usize {
-        BlockSize::to_usize()
-    }
-
-    /// Return current cursor position
-    #[inline]
-    pub fn position(&self) -> usize {
-        self.pos
-    }
-
-    /// Return number of remaining bytes in the internall buffer
-    #[inline]
-    pub fn remaining(&self) -> usize {
-        self.size() - self.pos
-    }
-
-    /// Reset buffer by setting cursor position to zero
-    #[inline]
-    pub fn reset(&mut self)  {
-        self.pos = 0
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"f895c4794f1c00f5f01376dae2b66870d939a01b9a366ee4d177b6b7ad99bd4a","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"d5c22aa3118d240e877ad41c5d9fa232f9c77d757d4aac0c2f943afc0a95e0ef","src/lib.rs":"962c90d43c7c2761b3c96fab2713ae357a7a8d2d048e37ce4f3354941ad41b97"},"package":"fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "block-padding"
-version = "0.1.5"
-authors = ["RustCrypto Developers"]
-description = "Padding and unpadding of messages divided into blocks."
-documentation = "https://docs.rs/block-padding"
-keywords = ["padding", "pkcs7", "ansix923", "iso7816"]
-categories = ["cryptography", "no-std"]
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/RustCrypto/utils"
-[dependencies.byte-tools]
-version = "0.3"
-[badges.travis-ci]
-repository = "RustCrypto/utils"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2018-2019 The RustCrypto Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/block-padding/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/block-padding/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,323 +0,0 @@
-//! Padding and unpadding of messages divided into blocks.
-//!
-//! This crate provides `Padding` trait which provides padding and unpadding
-//! operations. Additionally several common padding schemes are available out
-//! of the box.
-#![no_std]
-#![doc(html_logo_url =
-    "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
-extern crate byte_tools;
-
-use byte_tools::{zero, set};
-
-/// Error for indicating failed padding operation
-#[derive(Clone, Copy, Debug)]
-pub struct PadError;
-
-/// Error for indicating failed unpadding operation
-#[derive(Clone, Copy, Debug)]
-pub struct UnpadError;
-
-/// Trait for padding messages divided into blocks
-pub trait Padding {
-    /// Pads `block` filled with data up to `pos`.
-    ///
-    /// `pos` should be inside of the block and block must not be full, i.e.
-    /// `pos < block.len()` must be true. Otherwise method will return
-    /// `PadError`. Some potentially irreversible padding schemes can allow
-    /// padding of the full block, in this case aforementioned condition is
-    /// relaxed to `pos <= block.len()`.
-    fn pad_block(block: &mut [u8], pos: usize) -> Result<(), PadError>;
-
-    /// Pads message with length `pos` in the provided buffer.
-    ///
-    /// `&buf[..pos]` is perceived as the message, the buffer must contain
-    /// enough leftover space for padding: `block_size - (pos % block_size)`
-    /// extra bytes must be available. Otherwise method will return
-    /// `PadError`.
-    fn pad(buf: &mut [u8], pos: usize, block_size: usize)
-        -> Result<&mut [u8], PadError>
-    {
-        let bs = block_size * (pos / block_size);
-        if buf.len() < bs || buf.len() - bs < block_size { Err(PadError)? }
-        Self::pad_block(&mut buf[bs..bs+block_size], pos - bs)?;
-        Ok(&mut buf[..bs+block_size])
-    }
-
-    /// Unpad given `data` by truncating it according to the used padding.
-    /// In case of the malformed padding will return `UnpadError`
-    fn unpad(data: &[u8]) -> Result<&[u8], UnpadError>;
-}
-
-/// Pad block with zeros.
-///
-/// ```
-/// use block_padding::{ZeroPadding, Padding};
-///
-/// let msg = b"test";
-/// let n = msg.len();
-/// let mut buffer = [0xff; 16];
-/// buffer[..n].copy_from_slice(msg);
-/// let padded_msg = ZeroPadding::pad(&mut buffer, n, 8).unwrap();
-/// assert_eq!(padded_msg, b"test\x00\x00\x00\x00");
-/// assert_eq!(ZeroPadding::unpad(&padded_msg).unwrap(), msg);
-/// ```
-/// ```
-/// # use block_padding::{ZeroPadding, Padding};
-/// # let msg = b"test";
-/// # let n = msg.len();
-/// # let mut buffer = [0xff; 16];
-/// # buffer[..n].copy_from_slice(msg);
-/// let padded_msg = ZeroPadding::pad(&mut buffer, n, 2).unwrap();
-/// assert_eq!(padded_msg, b"test");
-/// assert_eq!(ZeroPadding::unpad(&padded_msg).unwrap(), msg);
-/// ```
-///
-/// Note that zero padding may not be reversible if the original message ends
-/// with one or more zero bytes.
-pub enum ZeroPadding{}
-
-impl Padding for ZeroPadding {
-    fn pad_block(block: &mut [u8], pos: usize) -> Result<(), PadError> {
-        if pos > block.len() { Err(PadError)? }
-        zero(&mut block[pos..]);
-        Ok(())
-    }
-
-    fn pad(buf: &mut [u8], pos: usize, block_size: usize)
-        -> Result<&mut [u8], PadError>
-    {
-        if pos % block_size == 0 {
-            Ok(&mut buf[..pos])
-        } else {
-            let bs = block_size * (pos / block_size);
-            let be = bs + block_size;
-            if buf.len() < be { Err(PadError)? }
-            Self::pad_block(&mut buf[bs..be], pos - bs)?;
-            Ok(&mut buf[..be])
-        }
-    }
-
-    fn unpad(data: &[u8]) -> Result<&[u8], UnpadError> {
-        let mut n = data.len() - 1;
-        while n != 0 {
-            if data[n] != 0 {
-                break;
-            }
-            n -= 1;
-        }
-        Ok(&data[..n+1])
-    }
-}
-
-/// Pad block with bytes with value equal to the number of bytes added.
-///
-/// PKCS#7 described in the [RFC 5652](https://tools.ietf.org/html/rfc5652#section-6.3).
-///
-/// ```
-/// use block_padding::{Pkcs7, Padding};
-///
-/// let msg = b"test";
-/// let n = msg.len();
-/// let mut buffer = [0xff; 8];
-/// buffer[..n].copy_from_slice(msg);
-/// let padded_msg = Pkcs7::pad(&mut buffer, n, 8).unwrap();
-/// assert_eq!(padded_msg, b"test\x04\x04\x04\x04");
-/// assert_eq!(Pkcs7::unpad(&padded_msg).unwrap(), msg);
-/// ```
-/// ```
-/// # use block_padding::{Pkcs7, Padding};
-/// # let msg = b"test";
-/// # let n = msg.len();
-/// # let mut buffer = [0xff; 8];
-/// # buffer[..n].copy_from_slice(msg);
-/// let padded_msg = Pkcs7::pad(&mut buffer, n, 2).unwrap();
-/// assert_eq!(padded_msg, b"test\x02\x02");
-/// assert_eq!(Pkcs7::unpad(&padded_msg).unwrap(), msg);
-/// ```
-/// ```
-/// # use block_padding::{Pkcs7, Padding};
-/// let mut buffer = [0xff; 5];
-/// assert!(Pkcs7::pad(&mut buffer, 4, 2).is_err());
-/// ```
-/// ```
-/// # use block_padding::{Pkcs7, Padding};
-/// # let buffer = [0xff; 16];
-/// assert!(Pkcs7::unpad(&buffer).is_err());
-/// ```
-///
-/// In addition to conditions stated in the `Padding` trait documentation,
-/// `pad_block` will return `PadError` if `block.len() > 255`, and in case of
-/// `pad` if `block_size > 255`.
-pub enum Pkcs7{}
-
-impl Padding for Pkcs7 {
-    fn pad_block(block: &mut [u8], pos: usize) -> Result<(), PadError> {
-        if block.len() > 255 { Err(PadError)? }
-        if pos >= block.len() { Err(PadError)? }
-        let n = block.len() - pos;
-        set(&mut block[pos..], n as u8);
-        Ok(())
-    }
-
-    fn unpad(data: &[u8]) -> Result<&[u8], UnpadError> {
-        if data.is_empty() { Err(UnpadError)? }
-        let l = data.len();
-        let n = data[l-1];
-        if n == 0 || n as usize > l { Err(UnpadError)? }
-        for v in &data[l-n as usize..l-1] {
-            if *v != n { Err(UnpadError)? }
-        }
-        Ok(&data[..l - n as usize])
-    }
-}
-
-/// Pad block with zeros except the last byte which will be set to the number
-/// bytes.
-///
-/// ```
-/// use block_padding::{AnsiX923, Padding};
-///
-/// let msg = b"test";
-/// let n = msg.len();
-/// let mut buffer = [0xff; 16];
-/// buffer[..n].copy_from_slice(msg);
-/// let padded_msg = AnsiX923::pad(&mut buffer, n, 8).unwrap();
-/// assert_eq!(padded_msg, b"test\x00\x00\x00\x04");
-/// assert_eq!(AnsiX923::unpad(&padded_msg).unwrap(), msg);
-/// ```
-/// ```
-/// # use block_padding::{AnsiX923, Padding};
-/// # let msg = b"test";
-/// # let n = msg.len();
-/// # let mut buffer = [0xff; 16];
-/// # buffer[..n].copy_from_slice(msg);
-/// let padded_msg = AnsiX923::pad(&mut buffer, n, 2).unwrap();
-/// assert_eq!(padded_msg, b"test\x00\x02");
-/// assert_eq!(AnsiX923::unpad(&padded_msg).unwrap(), msg);
-/// ```
-/// ```
-/// # use block_padding::{AnsiX923, Padding};
-/// # let buffer = [0xff; 16];
-/// assert!(AnsiX923::unpad(&buffer).is_err());
-/// ```
-///
-/// In addition to conditions stated in the `Padding` trait documentation,
-/// `pad_block` will return `PadError` if `block.len() > 255`, and in case of
-/// `pad` if `block_size > 255`.
-pub enum AnsiX923{}
-
-impl Padding for AnsiX923 {
-    fn pad_block(block: &mut [u8], pos: usize) -> Result<(), PadError>{
-        if block.len() > 255 { Err(PadError)? }
-        if pos >= block.len() { Err(PadError)? }
-        let bs = block.len();
-        zero(&mut block[pos..bs-1]);
-        block[bs-1] = (bs - pos) as u8;
-        Ok(())
-    }
-
-    fn unpad(data: &[u8]) -> Result<&[u8], UnpadError> {
-        if data.is_empty() { Err(UnpadError)? }
-        let l = data.len();
-        let n = data[l-1] as usize;
-        if n == 0 || n > l {
-            return Err(UnpadError)
-        }
-        for v in &data[l-n..l-1] {
-            if *v != 0 { Err(UnpadError)? }
-        }
-        Ok(&data[..l-n])
-    }
-}
-
-/// Pad block with byte sequence `\x80 00...00 00`.
-///
-/// ```
-/// use block_padding::{Iso7816, Padding};
-///
-/// let msg = b"test";
-/// let n = msg.len();
-/// let mut buffer = [0xff; 16];
-/// buffer[..n].copy_from_slice(msg);
-/// let padded_msg = Iso7816::pad(&mut buffer, n, 8).unwrap();
-/// assert_eq!(padded_msg, b"test\x80\x00\x00\x00");
-/// assert_eq!(Iso7816::unpad(&padded_msg).unwrap(), msg);
-/// ```
-/// ```
-/// # use block_padding::{Iso7816, Padding};
-/// # let msg = b"test";
-/// # let n = msg.len();
-/// # let mut buffer = [0xff; 16];
-/// # buffer[..n].copy_from_slice(msg);
-/// let padded_msg = Iso7816::pad(&mut buffer, n, 2).unwrap();
-/// assert_eq!(padded_msg, b"test\x80\x00");
-/// assert_eq!(Iso7816::unpad(&padded_msg).unwrap(), msg);
-/// ```
-pub enum Iso7816{}
-
-impl Padding for Iso7816 {
-    fn pad_block(block: &mut [u8], pos: usize) -> Result<(), PadError> {
-        if pos >= block.len() { Err(PadError)? }
-        block[pos] = 0x80;
-        zero(&mut block[pos+1..]);
-        Ok(())
-    }
-
-    fn unpad(data: &[u8]) -> Result<&[u8], UnpadError> {
-        if data.is_empty() { Err(UnpadError)? }
-        let mut n = data.len() - 1;
-        while n != 0 {
-            if data[n] != 0 { break; }
-            n -= 1;
-        }
-        if data[n] != 0x80 { Err(UnpadError)? }
-        Ok(&data[..n])
-    }
-}
-
-/// Don't pad the data. Useful for key wrapping. Padding will fail if the data cannot be
-/// fitted into blocks without padding.
-///
-/// ```
-/// use block_padding::{NoPadding, Padding};
-///
-/// let msg = b"test";
-/// let n = msg.len();
-/// let mut buffer = [0xff; 16];
-/// buffer[..n].copy_from_slice(msg);
-/// let padded_msg = NoPadding::pad(&mut buffer, n, 4).unwrap();
-/// assert_eq!(padded_msg, b"test");
-/// assert_eq!(NoPadding::unpad(&padded_msg).unwrap(), msg);
-/// ```
-/// ```
-/// # use block_padding::{NoPadding, Padding};
-/// # let msg = b"test";
-/// # let n = msg.len();
-/// # let mut buffer = [0xff; 16];
-/// # buffer[..n].copy_from_slice(msg);
-/// let padded_msg = NoPadding::pad(&mut buffer, n, 2).unwrap();
-/// assert_eq!(padded_msg, b"test");
-/// assert_eq!(NoPadding::unpad(&padded_msg).unwrap(), msg);
-/// ```
-pub enum NoPadding {}
-
-impl Padding for NoPadding {
-    fn pad_block(block: &mut [u8], pos: usize) -> Result<(), PadError> {
-        if pos % block.len() != 0 {
-            Err(PadError)?
-        }
-        Ok(())
-    }
-
-    fn pad(buf: &mut [u8], pos: usize, block_size: usize) -> Result<&mut [u8], PadError> {
-        if pos % block_size != 0 {
-            Err(PadError)?
-        }
-        Ok(&mut buf[..pos])
-    }
-
-    fn unpad(data: &[u8]) -> Result<&[u8], UnpadError> {
-        Ok(data)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"ad5e54eb08d0d4ab3a35f5b4b6ff4ddfa0f5ae6bd2a50c0f4d0602d6a486b212","LICENSE":"2684de17300e0a434686f1ec7f8af6045207a4b457a3fe04b2b9ce655e7c5d50","README.md":"284c31ecb025d4d5f5c946bc72c376c16d7c8c5f4df1d0689bf391609f2f421a","src/builder.rs":"704d9aa8e7db775be9de09544be80577a928944634d53c1533ba4a78be666443","src/lib.rs":"37d7312bc03f427a37808aaa167a9f833f16e6c133e08ae5ec6d690ba90dcde0","src/move_builder.rs":"3342076747d249394096fc833fd62ab94ea32c93b3ad3ab820ec607db68b7f28"},"package":"83b83224877479161e925498306710f448b13a7f6fdcf69022a60dad1fe3d1bd"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "brownstone"
+version = "1.0.1"
+authors = ["Nathan West <Lucretiel@gmail.com>"]
+description = "Utilities for building fixed-size arrays"
+readme = "README.md"
+license = "MPL-2.0"
+repository = "https://github.com/Lucretiel/brownstone"
+[dependencies.arrayvec]
+version = "0.7.1"
+default-features = false
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2 @@
+# brownstone
+A library for safely constructing statically sized arrays
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/src/builder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/src/builder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/src/builder.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/src/builder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,178 @@
+/*!
+A low level builder type for creating fixed size arrays.
+*/
+
+use core::fmt::{self, Debug, Formatter};
+
+use arrayvec::ArrayVec;
+
+/// Error type returned from [`ArrayBuilder::try_push`], indicating that the
+/// builder was already full. Includes the value that couldn't be pushed to the
+/// array.
+#[derive(Debug, Clone, Copy)]
+pub struct Overflow<T>(pub T);
+
+/// Result type returned from [`ArrayBuilder::push`], indicating whether the
+/// array is full after the push. `ArrayBuilder::push` panics on overflow, so
+/// this only indicates if there is room to push additional elements.
+#[derive(Debug, Clone, Copy)]
+pub enum PushResult {
+    NotFull,
+    Full,
+}
+
+/// Low-level builder type for `[T; N]` arrays. Uses a [`push`][ArrayBuilder::push]
+/// + [`finish`][ArrayBuilder::finish] interface to build an array 1 element
+/// at a time.
+///
+/// The interface provided by this type is fairly low level; most of its
+/// methods are fallible in some way (returning a [`Result`] or panicking on
+/// errors). Consider instead the misuse-resistant
+/// [`move_builder::ArrayBuilder`][crate::move_builder::ArrayBuilder], which
+/// uses ownership semantics to provide only infallible operations, or the
+/// builder functions at the [top-level][crate] of the crate.
+#[derive(Clone)]
+pub struct ArrayBuilder<T, const N: usize> {
+    vec: ArrayVec<T, N>,
+}
+
+// TODO: virtually every unsafe here can be replaced by a better version with
+// a (currently unstable) method on MaybeUninit
+impl<T, const N: usize> ArrayBuilder<T, N> {
+    /// Create a new, empty `ArrayBuilder`
+    pub const fn new() -> Self {
+        Self {
+            vec: ArrayVec::new_const(),
+        }
+    }
+
+    /// Returns true if every element in the array is initialized. If the
+    /// builder is full, the next call to `finish` will return the built array.
+    #[inline]
+    pub fn is_full(&self) -> bool {
+        self.vec.is_full()
+    }
+
+    /// Returns true if no elements in the array are initialized.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.vec.is_empty()
+    }
+
+    /// Returns the number of initialized elements in the array
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.vec.len()
+    }
+
+    /// Get a PushResult after a push
+    fn push_result(&self) -> PushResult {
+        match self.len() >= N {
+            true => PushResult::Full,
+            false => PushResult::NotFull,
+        }
+    }
+
+    /// Add an initialized element to the array, without performing a bounds
+    /// check.
+    ///
+    /// # Safety
+    ///
+    /// This must only be called when the builder is not full
+    #[inline]
+    pub unsafe fn push_unchecked(&mut self, value: T) -> PushResult {
+        self.vec.push_unchecked(value);
+        self.push_result()
+    }
+
+    /// Try to add an initialized element to the array. Returns an error if the
+    /// array is already full.
+    #[inline]
+    pub fn try_push(&mut self, value: T) -> Result<PushResult, Overflow<T>> {
+        self.vec
+            .try_push(value)
+            .map(|()| self.push_result())
+            .map_err(|err| Overflow(err.element()))
+    }
+
+    /// Add an initialized element to the array.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the array is already full
+    #[inline]
+    pub fn push(&mut self, value: T) -> PushResult {
+        match self.try_push(value) {
+            Ok(result) => result,
+            Err(..) => panic!("ArrayBuilder::push overflow"),
+        }
+    }
+
+    /// Return the fully initialized array without checking that it's fully
+    /// initialized.
+    ///
+    /// # Safety
+    ///
+    /// This must only be called when the builder is full.
+    #[inline]
+    pub unsafe fn finish_unchecked(self) -> [T; N] {
+        self.vec.into_inner_unchecked()
+    }
+
+    /// Try to return the fully initialized array. Returns the builder if the
+    /// array isn't fully initialized yet.
+    #[inline]
+    pub fn try_finish(self) -> Result<[T; N], Self> {
+        self.vec.into_inner().map_err(|vec| Self { vec })
+    }
+
+    /// Return the fully initialized array.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the array isn't fully initialized yet.
+    #[inline]
+    pub fn finish(self) -> [T; N] {
+        match self.try_finish() {
+            Ok(array) => array,
+            Err(..) => panic!("ArrayBuilder::finish incomplete"),
+        }
+    }
+
+    /// Get the slice of the array that has already been initialized.
+    #[inline]
+    pub fn finished_slice(&self) -> &[T] {
+        self.vec.as_slice()
+    }
+
+    /// Get the mutable slice of the array that has already been initialized.
+    #[inline]
+    pub fn finished_slice_mut(&mut self) -> &mut [T] {
+        self.vec.as_mut_slice()
+    }
+}
+
+impl<T, const N: usize> Default for ArrayBuilder<T, N> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<T: Debug, const N: usize> Debug for ArrayBuilder<T, N> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ArrayBuilder")
+            .field("array", &self.finished_slice())
+            .field("progress", &format_args!("{} / {}", self.len(), N))
+            .finish()
+    }
+}
+
+impl<T, const N: usize> Extend<T> for ArrayBuilder<T, N> {
+    fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
+        iter.into_iter().for_each(|item| {
+            self.push(item);
+        })
+    }
+
+    // TODO: extend_one, when it's stable
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,173 @@
+/*!
+`brownstone` is a library for building fixed-size arrays. It provides a
+collection of optimizer-friendly fallible and infallible function that build
+arrays by calling initializer functions in a loop. It also provides a low-level
+[builder type][builder::ArrayBuilder], with a [`push`][builder::ArrayBuilder::push`]
++ [`finish`][builder::ArrayBuilder::finish] interface, as well as a [misuse-
+immune builder type][move_builder::ArrayBuilder] with a move-based interface
+that can never panic or return errors.
+*/
+
+#![no_std]
+
+pub mod builder;
+pub mod move_builder;
+
+use core::convert::Infallible;
+
+/// Error returned from the fallible `try_build_*` functions in this crate.
+/// This includes the original error returned from the input function, along
+/// with the index where the error occurred.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct TryBuildError<E> {
+    pub error: E,
+    pub index: usize,
+}
+
+/// Build a fixed-size array with a fallible initializer function. The
+/// initializer is called once for each item in the length of the array, in
+/// order; if it ever returns an `Err`, that error is propagated (along with
+/// the index of the failed item).
+///
+/// Each time the method is called, it is provided with context in the form of
+/// the prefix of the array that has already been initialized.
+#[inline]
+pub fn try_build_with<T, F, E, const N: usize>(
+    mut next_value: F,
+) -> Result<[T; N], TryBuildError<E>>
+where
+    F: for<'a> FnMut(&'a mut [T]) -> Result<T, E>,
+{
+    use move_builder::{ArrayBuilder, PushResult};
+
+    match ArrayBuilder::start() {
+        PushResult::Full(array) => Ok(array),
+        PushResult::NotFull(mut builder) => loop {
+            let value =
+                next_value(builder.finished_slice_mut()).map_err(|error| TryBuildError {
+                    error,
+                    index: builder.len(),
+                })?;
+
+            match builder.push(value) {
+                PushResult::Full(array) => break Ok(array),
+                PushResult::NotFull(updated) => builder = updated,
+            }
+        },
+    }
+}
+
+/// Build a fixed-size array with an initializer function. The initializer is
+/// called once for each item in the length of the array, and the completed
+/// array is returned.
+///
+/// Each time the method is called, it is provided with context in the form of
+/// the prefix of the array that has already been initialized.
+#[inline]
+pub fn build_with<T, F, const N: usize>(mut next_value: F) -> [T; N]
+where
+    F: for<'a> FnMut(&'a mut [T]) -> T,
+{
+    match try_build_with(move |slice| -> Result<T, Infallible> { Ok(next_value(slice)) }) {
+        Ok(array) => array,
+        Err(inf) => match inf.error {},
+    }
+}
+
+/// Build a fixed-size array with a fallible initializer function. The
+/// initializer is called once for each item in the length of the array, in
+/// order; if it ever returns an `Err`, that error is propagated (along with
+/// the index of the failed item).
+///
+/// Each time the method is called, it is provided with the index of the
+/// element being produced.
+#[inline]
+pub fn try_build_indexed<T, F, E, const N: usize>(
+    mut next_value: F,
+) -> Result<[T; N], TryBuildError<E>>
+where
+    F: FnMut(usize) -> Result<T, E>,
+{
+    try_build_with(move |slice| next_value(slice.len()))
+}
+
+/// Build a fixed-size array with an initializer function. The initializer is
+/// called once for each item in the length of the array, and the completed
+/// array is returned.
+///
+/// Each time the method is called, it is provided with the index of the
+/// element being produced.
+#[inline]
+pub fn build_indexed<T, F, const N: usize>(mut next_value: F) -> [T; N]
+where
+    F: FnMut(usize) -> T,
+{
+    build_with(move |slice| next_value(slice.len()))
+}
+
+/// Build a fixed-size array with a fallible initializer function. The
+/// initializer is called once for each item in the length of the array, in
+/// order; if it ever returns an `Err`, that error is propagated (along with
+/// the index of the failed item).
+#[inline]
+pub fn try_build<T, F, E, const N: usize>(mut next_value: F) -> Result<[T; N], TryBuildError<E>>
+where
+    F: FnMut() -> Result<T, E>,
+{
+    try_build_with(move |_slice| next_value())
+}
+
+/// Build a fixed-size array with an initializer function. The initializer is
+/// called once for each item in the length of the array, and the completed
+/// array is returned.
+#[inline]
+pub fn build<T, F, const N: usize>(mut next_value: F) -> [T; N]
+where
+    F: FnMut() -> T,
+{
+    build_with(move |_slice| next_value())
+}
+
+/// Build a fixed-size array from an iterator. The first `N` elements of the
+/// iterator are collected into an array of length `N`. Returns `None` if the
+/// iterator doesn't yield enough elements.
+#[inline]
+pub fn try_build_iter<I: IntoIterator, const N: usize>(iterator: I) -> Option<[I::Item; N]> {
+    let mut iterator = iterator.into_iter();
+
+    let (_min, max) = iterator.size_hint();
+
+    // Premptively check if the iterator will be too short.
+    if let Some(max) = max {
+        if max < N {
+            return None;
+        }
+    }
+
+    try_build(move || iterator.next().ok_or(())).ok()
+}
+
+/// Build a fixed-size array from an iterator. The first `N` elements of the
+/// iterator are collected into an array of length `N`.
+///
+/// # Panics
+///
+/// Panics if the iterator doesn't yield enough elements
+#[inline]
+pub fn build_iter<I: IntoIterator, const N: usize>(iterator: I) -> [I::Item; N] {
+    try_build_iter(iterator).expect("build_iter: iterator too short")
+}
+
+/// Build a fixed-size array out of clones of some element. The element itself
+/// is used as the first element in the array.
+#[inline]
+pub fn build_cloned<T: Clone, const N: usize>(item: T) -> [T; N] {
+    // The Option here is a bit clunky, but we rely on that the optimizer will
+    // clean it all up
+    let mut item = Some(item);
+
+    build_with(|slice: &mut [T]| match item.take() {
+        Some(item) => item,
+        None => slice.first().unwrap().clone(),
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/src/move_builder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/src/move_builder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/brownstone/src/move_builder.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/brownstone/src/move_builder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,80 @@
+/*!
+A misuse-immune array builder.
+*/
+
+use crate::builder;
+
+/// The result of pushing to an [`ArrayBuilder`]. If the push resulted in a
+/// full array, the array is returned directly; otherwise, the builder is
+/// returned with updated state.
+#[derive(Debug, Clone)]
+pub enum PushResult<T, const N: usize> {
+    Full([T; N]),
+    NotFull(ArrayBuilder<T, N>),
+}
+
+/// Misuse-immune array builder
+///
+/// This `ArrayBuilder` uses move semantics to provide an array builder that
+/// never panics or returns errors. Each call to [`push`][ArrayBuilder::push]
+/// takes `self` by move, and returns either the builder (if it's not full yet)
+/// or the fully initialized array (if it is). The builder therefore can only
+/// exist while the array being built isn't full yet.
+#[derive(Debug, Clone)]
+pub struct ArrayBuilder<T, const N: usize> {
+    builder: builder::ArrayBuilder<T, N>,
+    // Invariant: while this instance exists, the builder is not full
+}
+
+impl<T, const N: usize> ArrayBuilder<T, N> {
+    /// Create a new [`ArrayBuilder`]. If `N == 0`, immediately return an empty
+    /// array, rather than the builder.
+    #[inline]
+    pub fn start() -> PushResult<T, N> {
+        // Invariant preserved: if N == 0, return the array immediately
+        match builder::ArrayBuilder::new().try_finish() {
+            Ok(array) => PushResult::Full(array),
+            Err(builder) => PushResult::NotFull(Self { builder }),
+        }
+    }
+
+    /// Returns true if there are no initialized elements in the array
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.builder.is_empty()
+    }
+
+    /// Returns the number of initialized elements in the array
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.builder.len()
+    }
+
+    /// Add a new initialized element to the array. If this causes the array
+    /// to become fully initialzed, the array is returned; otherwise, the
+    /// builder is returned.
+    #[inline]
+    pub fn push(mut self, value: T) -> PushResult<T, N> {
+        // The unsafes here have debug_asserts checking their correctness.
+        // Invariant preserved: if this push fills the array, the array is
+        // returned.
+        match unsafe { self.builder.push_unchecked(value) } {
+            builder::PushResult::NotFull => PushResult::NotFull(self),
+            builder::PushResult::Full => {
+                PushResult::Full(unsafe { self.builder.finish_unchecked() })
+            }
+        }
+    }
+
+    /// Get the slice of the array that has already been initialized.
+    #[inline]
+    pub fn finished_slice(&self) -> &[T] {
+        self.builder.finished_slice()
+    }
+
+    /// Get the mutable slice of the array that has already been initialized.
+    #[inline]
+    pub fn finished_slice_mut(&mut self) -> &mut [T] {
+        self.builder.finished_slice_mut()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/azure-pipelines.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/azure-pipelines.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/azure-pipelines.yml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/azure-pipelines.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-pr: ["master"]
-
-jobs:
-  - job: tests
-    displayName: "Tests"
-    pool:
-      vmImage: 'ubuntu-16.04'
-    steps:
-      - template: ci/install-rust.yml
-        parameters:
-          rust_version: stable
-      - template: ci/install-cargo-readme.yml
-      - bash: |
-          set -ex
-          export RUST_BACKTRACE=1
-          cargo test
-          cargo test --all-features
-        displayName: "Run `cargo test`"
-      - bash: |
-          set -ex
-          sudo apt install valgrind
-        displayName: "Install Valgrind"
-      - bash: |
-          set -ex
-          export RUST_BACKTRACE=1
-          # Don't leak-check, as Rust globals tend to cause false positives.
-          export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="valgrind --suppressions=valgrind.supp --leak-check=no --error-exitcode=1"
-          cargo test
-          cargo test --all-features
-        displayName: "Run `cargo test` under Valgrind"
-  - job: check_benches
-    displayName: "Check that benches build"
-    steps:
-      - template: ci/install-rust.yml
-        parameters:
-          rust_version: stable
-      - bash: |
-          set -ex
-          cargo check --benches --all-features
-        displayName: "Run cargo check"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/benches/benches.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/benches/benches.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/benches/benches.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/benches/benches.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,6 +24,64 @@
     }
 }
 
+fn alloc_try_with<T: Default, E>(n: usize) {
+    let arena = bumpalo::Bump::with_capacity(n * std::mem::size_of::<Result<T, E>>());
+    for _ in 0..n {
+        let arena = black_box(&arena);
+        let val: Result<&mut T, E> = arena.alloc_try_with(|| black_box(Ok(Default::default())));
+        let _ = black_box(val);
+    }
+}
+
+fn alloc_try_with_err<T, E: Default>(n: usize) {
+    // Only enough capacity for one, since the allocation is undone.
+    let arena = bumpalo::Bump::with_capacity(std::mem::size_of::<Result<T, E>>());
+    for _ in 0..n {
+        let arena = black_box(&arena);
+        let val: Result<&mut T, E> = arena.alloc_try_with(|| black_box(Err(Default::default())));
+        let _ = black_box(val);
+    }
+}
+
+fn try_alloc<T: Default>(n: usize) {
+    let arena = bumpalo::Bump::with_capacity(n * std::mem::size_of::<T>());
+    for _ in 0..n {
+        let arena = black_box(&arena);
+        let val: Result<&mut T, _> = arena.try_alloc(black_box(Default::default()));
+        let _ = black_box(val);
+    }
+}
+
+fn try_alloc_with<T: Default>(n: usize) {
+    let arena = bumpalo::Bump::with_capacity(n * std::mem::size_of::<T>());
+    for _ in 0..n {
+        let arena = black_box(&arena);
+        let val: Result<&mut T, _> = arena.try_alloc_with(|| black_box(Default::default()));
+        let _ = black_box(val);
+    }
+}
+
+fn try_alloc_try_with<T: Default, E>(n: usize) {
+    let arena = bumpalo::Bump::with_capacity(n * std::mem::size_of::<Result<T, E>>());
+    for _ in 0..n {
+        let arena = black_box(&arena);
+        let val: Result<&mut T, bumpalo::AllocOrInitError<E>> =
+            arena.try_alloc_try_with(|| black_box(Ok(Default::default())));
+        let _ = black_box(val);
+    }
+}
+
+fn try_alloc_try_with_err<T, E: Default>(n: usize) {
+    // Only enough capacity for one, since the allocation is undone.
+    let arena = bumpalo::Bump::with_capacity(std::mem::size_of::<Result<T, E>>());
+    for _ in 0..n {
+        let arena = black_box(&arena);
+        let val: Result<&mut T, bumpalo::AllocOrInitError<E>> =
+            arena.try_alloc_try_with(|| black_box(Err(Default::default())));
+        let _ = black_box(val);
+    }
+}
+
 #[cfg(feature = "collections")]
 fn format_realloc(bump: &bumpalo::Bump, n: usize) {
     let n = criterion::black_box(n);
@@ -47,6 +105,88 @@
     group.bench_function("big", |b| b.iter(|| alloc_with::<Big>(ALLOCATIONS)));
 }
 
+fn bench_alloc_try_with(c: &mut Criterion) {
+    let mut group = c.benchmark_group("alloc-try-with");
+    group.throughput(Throughput::Elements(ALLOCATIONS as u64));
+    group.bench_function("small, small", |b| {
+        b.iter(|| alloc_try_with::<Small, Small>(ALLOCATIONS))
+    });
+    group.bench_function("small, big", |b| {
+        b.iter(|| alloc_try_with::<Small, Big>(ALLOCATIONS))
+    });
+    group.bench_function("big, small", |b| {
+        b.iter(|| alloc_try_with::<Big, Small>(ALLOCATIONS))
+    });
+    group.bench_function("big, big", |b| {
+        b.iter(|| alloc_try_with::<Big, Big>(ALLOCATIONS))
+    });
+}
+
+fn bench_alloc_try_with_err(c: &mut Criterion) {
+    let mut group = c.benchmark_group("alloc-try-with-err");
+    group.throughput(Throughput::Elements(ALLOCATIONS as u64));
+    group.bench_function("small, small", |b| {
+        b.iter(|| alloc_try_with_err::<Small, Small>(ALLOCATIONS))
+    });
+    group.bench_function("small, big", |b| {
+        b.iter(|| alloc_try_with_err::<Small, Big>(ALLOCATIONS))
+    });
+    group.bench_function("big, small", |b| {
+        b.iter(|| alloc_try_with_err::<Big, Small>(ALLOCATIONS))
+    });
+    group.bench_function("big, big", |b| {
+        b.iter(|| alloc_try_with_err::<Big, Big>(ALLOCATIONS))
+    });
+}
+
+fn bench_try_alloc(c: &mut Criterion) {
+    let mut group = c.benchmark_group("try-alloc");
+    group.throughput(Throughput::Elements(ALLOCATIONS as u64));
+    group.bench_function("small", |b| b.iter(|| try_alloc::<Small>(ALLOCATIONS)));
+    group.bench_function("big", |b| b.iter(|| try_alloc::<Big>(ALLOCATIONS)));
+}
+
+fn bench_try_alloc_with(c: &mut Criterion) {
+    let mut group = c.benchmark_group("try-alloc-with");
+    group.throughput(Throughput::Elements(ALLOCATIONS as u64));
+    group.bench_function("small", |b| b.iter(|| try_alloc_with::<Small>(ALLOCATIONS)));
+    group.bench_function("big", |b| b.iter(|| try_alloc_with::<Big>(ALLOCATIONS)));
+}
+
+fn bench_try_alloc_try_with(c: &mut Criterion) {
+    let mut group = c.benchmark_group("try-alloc-try-with");
+    group.throughput(Throughput::Elements(ALLOCATIONS as u64));
+    group.bench_function("small, small", |b| {
+        b.iter(|| try_alloc_try_with::<Small, Small>(ALLOCATIONS))
+    });
+    group.bench_function("small, big", |b| {
+        b.iter(|| try_alloc_try_with::<Small, Big>(ALLOCATIONS))
+    });
+    group.bench_function("big, small", |b| {
+        b.iter(|| try_alloc_try_with::<Big, Small>(ALLOCATIONS))
+    });
+    group.bench_function("big, big", |b| {
+        b.iter(|| try_alloc_try_with::<Big, Big>(ALLOCATIONS))
+    });
+}
+
+fn bench_try_alloc_try_with_err(c: &mut Criterion) {
+    let mut group = c.benchmark_group("try-alloc-try-with-err");
+    group.throughput(Throughput::Elements(ALLOCATIONS as u64));
+    group.bench_function("small, small", |b| {
+        b.iter(|| try_alloc_try_with_err::<Small, Small>(ALLOCATIONS))
+    });
+    group.bench_function("small, big", |b| {
+        b.iter(|| try_alloc_try_with_err::<Small, Big>(ALLOCATIONS))
+    });
+    group.bench_function("big, small", |b| {
+        b.iter(|| try_alloc_try_with_err::<Big, Small>(ALLOCATIONS))
+    });
+    group.bench_function("big, big", |b| {
+        b.iter(|| try_alloc_try_with_err::<Big, Big>(ALLOCATIONS))
+    });
+}
+
 fn bench_format_realloc(c: &mut Criterion) {
     let mut group = c.benchmark_group("format-realloc");
 
@@ -62,5 +202,16 @@
     }
 }
 
-criterion_group!(benches, bench_alloc, bench_alloc_with, bench_format_realloc);
+criterion_group!(
+    benches,
+    bench_alloc,
+    bench_alloc_with,
+    bench_alloc_try_with,
+    bench_alloc_try_with_err,
+    bench_try_alloc,
+    bench_try_alloc_with,
+    bench_try_alloc_try_with,
+    bench_try_alloc_try_with_err,
+    bench_format_realloc
+);
 criterion_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"3610f408c7ea975d47ef18a5a4c7dd03126e6fa75dfce9bd0b48b462e4eb856d","Cargo.toml":"3f7d94adde546d00303245d148031e80466893c494e0ce0895462e61eb55b950","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"65f94e99ddaf4f5d1782a6dae23f35d4293a9a01444a13135a6887017d353cee","README.md":"c241d97e982576d7d9776c9e2fcb42c2a8ab8c419e477d2b6d89a9063a781f49","README.tpl":"ec385000e14590a306855e7893daed0168102f33166bdc1e5cf5fa5599dac03f","azure-pipelines.yml":"b7747e8f16efb79e6af6276bda1dce9f7bc5f1ae5a678fcccf59b7d759134f0d","benches/benches.rs":"8143c1e334b5233124da0bb6c07b923bc467321e320b7eaf07d7105924d2a96d","bumpalo.png":"2ca8dcb837e9cdcb7b290f2a5276145a15fca0c2d81ed09695345471175923a0","ci/install-cargo-readme.yml":"7011fca5618acc8893ade88a112ef21d1a4a23b714c1192889dd58f7dd523315","ci/install-rust.yml":"33208be34b5d4b2c8d2a9ae9a5966e238bd9ba725561f6414a0024077e3ce48d","src/alloc.rs":"399d18423662ed1f402f7c833fcb4ea05719f90e3cc48c41aa890df92c28f8a8","src/boxed.rs":"3fae23f74a735e3e60247597ea0da6f75042a1bcf1ebabef396b42853d5988ef","src/collections/mod.rs":"6061a8499a83f8033f5525cab73f4d5d6090759a42d496fc12fb2b6aa6fcd5ff","src/collections/raw_vec.rs":"11395868cfd0802fab3fe43417751a5755abb516136923e6d8fdbc2f0ff49d19","src/collections/str/lossy.rs":"c5d62b16e01071e2a574ae41ef6693ad12f1e6c786c5d38f7a13ebd6cb23c088","src/collections/str/mod.rs":"d82a8bd417fbf52a589d89a16ea2a0ac4f6ac920c3976ab1f5b6ac0c8493c4f2","src/collections/string.rs":"5e727f6dc6198901765b50c85c91283d2d5908b45bcf91634e50ce360ec49496","src/collections/vec.rs":"ae01db81905fd4b14698fde9250e4698ab68b0aa1a95d9f674ccff6bb0dbddd4","src/lib.rs":"bebcf8798be76cef1d6d4e5672a0c7a456c6e6ee948488e893f605dc0363fed7","tests/alloc_fill.rs":"e9e4a47b6b82de284c958f65e80937f65bc44f884b331721288ae7f95d836806","tests/alloc_with.rs":"67d5020f984ce7a3a8b57935eb5d9d1585772146e4eaaa6c5834e797755ece6e","tests/quickchecks.rs":"0b0b87a86360a760a552818bf38168fd33efed9b9783bc1f86a1ee7abb412a64","tests/readme_up_to_date.rs":"8db3e41d803e2a10307e7e35cb2afa6733e1c39ad34789752a927564bf6795b6","tests/string.rs":"6879e2765bd00e99344a9b0f856d299688d2e74213188c2dada6712bcc22d9a6","tests/tests.rs":"2632fcf974fde16e1faf85e28e1fff97849e4b0650b93cf19518bb963038265c","tests/try_alloc.rs":"1e02c3cd1ae67f8e7bf27126488e1e1a24195ab96dd99ff0c974a0b8c5bea4d0","tests/vec.rs":"cc0d63d494ea3654fbb4e0a9da7ade47af46119f819387a861fa7e56e26fe093","valgrind.supp":"8fdaa3cd177b762ded70c46e00096a91dc0b334fe22e516fe904407608c768fc"},"package":"2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"17692cda9e530e580e3cf44a5104ef9cb684f1779219cb3d6540052d7da5cfa4","Cargo.toml":"2d0d5652ee6a7d940b0610229035474581e0529d0b097eca628012a5c55cf05c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"65f94e99ddaf4f5d1782a6dae23f35d4293a9a01444a13135a6887017d353cee","README.md":"7d9f55c8067d21305b4beef74fa380845f9c1c1e44de3e30a284d74d26a6f3d6","README.tpl":"ec385000e14590a306855e7893daed0168102f33166bdc1e5cf5fa5599dac03f","benches/benches.rs":"f01a371c0e6725be6a34a52fd30f0e3d3e5b984da6a1dd52d0d3df0cb870cd9c","bumpalo.png":"2ca8dcb837e9cdcb7b290f2a5276145a15fca0c2d81ed09695345471175923a0","src/alloc.rs":"fec6d09d5612012e2de224077ed6d0c57174a874d9a9289603929bfc64caf133","src/boxed.rs":"3fae23f74a735e3e60247597ea0da6f75042a1bcf1ebabef396b42853d5988ef","src/collections/mod.rs":"17721aa95afe171ee7c3b77adfcae16673f42c367e05d2c58badb8b4f9991ea8","src/collections/raw_vec.rs":"11395868cfd0802fab3fe43417751a5755abb516136923e6d8fdbc2f0ff49d19","src/collections/str/lossy.rs":"c5d62b16e01071e2a574ae41ef6693ad12f1e6c786c5d38f7a13ebd6cb23c088","src/collections/str/mod.rs":"d82a8bd417fbf52a589d89a16ea2a0ac4f6ac920c3976ab1f5b6ac0c8493c4f2","src/collections/string.rs":"5d90fc63f0a9e4c40f082f1c0b784404c1221329d9a9e2e38a1a31f61cebabf9","src/collections/vec.rs":"8f445224c914c7a4f532636798f2b6ac254e650aa58aa57bd61aee1003d7f6af","src/lib.rs":"e1c2b3904ddba2e586359941a7256aa6646f47c5ed579ab8139419fa0b3bb253","tests/alloc_fill.rs":"e9e4a47b6b82de284c958f65e80937f65bc44f884b331721288ae7f95d836806","tests/alloc_try_with.rs":"2e8671db1301488d7eb890882e2676490f1fe746102e09d74b27d688300830ed","tests/alloc_with.rs":"b80de1628a2d337f990cb5361c7b6722e3afde5591f6edb248b52e272f5cf278","tests/allocator_api.rs":"b81af74216de38b932ec19bebaa10b01c6e5b4d56b9eb31e959f6560f50f8e55","tests/quickchecks.rs":"0b0b87a86360a760a552818bf38168fd33efed9b9783bc1f86a1ee7abb412a64","tests/readme_up_to_date.rs":"8db3e41d803e2a10307e7e35cb2afa6733e1c39ad34789752a927564bf6795b6","tests/string.rs":"6879e2765bd00e99344a9b0f856d299688d2e74213188c2dada6712bcc22d9a6","tests/tests.rs":"2632fcf974fde16e1faf85e28e1fff97849e4b0650b93cf19518bb963038265c","tests/try_alloc.rs":"d1ba1e2196241179cabf2600ab2e419606c64364c05710e25618cd1dc2bb9004","tests/try_alloc_try_with.rs":"79e33a00d709887936836ced6ebce1a924e45dc62581f8e2acfbe3f9c4b4b77d","tests/try_alloc_with.rs":"a504b08eddf6b53cf274e99d8ba34dcf78912c34ee923900f5227cd3966a8df9","tests/vec.rs":"cc0d63d494ea3654fbb4e0a9da7ade47af46119f819387a861fa7e56e26fe093","valgrind.supp":"74457b5cc24d98ea349a73ab91ee9e898e8442148a4919cf046a02b1fe648b18"},"package":"9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "bumpalo"
-version = "3.4.0"
+version = "3.7.0"
 authors = ["Nick Fitzgerald <fitzgen@gmail.com>"]
 description = "A fast bump allocation arena for Rust."
 documentation = "https://docs.rs/bumpalo"
@@ -48,6 +48,7 @@
 version = "0.7"
 
 [features]
+allocator_api = []
 boxed = []
 collections = []
 default = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -28,6 +28,122 @@
 
 --------------------------------------------------------------------------------
 
+## 3.7.0
+
+Released 2020-05-28.
+
+### Added
+
+* Added `Borrow` and `BorrowMut` trait implementations for
+  `bumpalo::collections::Vec` and
+  `bumpalo::collections::String`. [#108](https://github.com/fitzgen/bumpalo/pull/108)
+
+### Changed
+
+* When allocating a new chunk fails, don't immediately give up. Instead, try
+  allocating a chunk that is half that size, and if that fails, then try half of
+  *that* size, etc until either we successfully allocate a chunk or we fail to
+  allocate the minimum chunk size and then finally give
+  up. [#111](https://github.com/fitzgen/bumpalo/pull/111)
+
+--------------------------------------------------------------------------------
+
+## 3.6.1
+
+Released 2020-02-18.
+
+### Added
+
+* Improved performance of `Bump`'s `Allocator::grow_zeroed` trait method
+  implementation. [#99](https://github.com/fitzgen/bumpalo/pull/99)
+
+--------------------------------------------------------------------------------
+
+## 3.6.0
+
+Released 2020-01-29.
+
+### Added
+
+* Added a few new flavors of allocation:
+
+  * `try_alloc` for fallible, by-value allocation
+
+  * `try_alloc_with` for fallible allocation with an infallible initializer
+    function
+
+  * `alloc_try_with` for infallible allocation with a fallible initializer
+    function
+
+  * `try_alloc_try_with` method for fallible allocation with a fallible
+    initializer function
+
+  We already have infallible, by-value allocation (`alloc`) and infallible
+  allocation with an infallible initializer (`alloc_with`). With these new
+  methods, we now have every combination covered.
+
+  Thanks to [Tamme Schichler](https://github.com/Tamschi) for contributing these
+  methods!
+
+--------------------------------------------------------------------------------
+
+## 3.5.0
+
+Released 2020-01-22.
+
+### Added
+
+* Added experimental, unstable support for the unstable, nightly Rust
+  `allocator_api` feature.
+
+  The `allocator_api` feature defines an `Allocator` trait and exposes custom
+  allocators for `std` types. Bumpalo has a matching `allocator_api` cargo
+  feature to enable implementing `Allocator` and using `Bump` with `std`
+  collections.
+
+  First, enable the `allocator_api` feature in your `Cargo.toml`:
+
+  ```toml
+  [dependencies]
+  bumpalo = { version = "3.4.0", features = ["allocator_api"] }
+  ```
+
+  Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
+
+  ```rust
+  # #[cfg(feature = "allocator_api")]
+  # {
+  #![feature(allocator_api)]
+  # }
+  ```
+
+  Finally, use `std` collections with `Bump`, so that their internal heap
+  allocations are made within the given bump arena:
+
+  ```
+  # #![cfg_attr(feature = "allocator_api", feature(allocator_api))]
+  # #[cfg(feature = "allocator_api")]
+  # {
+  #![feature(allocator_api)]
+  use bumpalo::Bump;
+
+  // Create a new bump arena.
+  let bump = Bump::new();
+
+  // Create a `Vec` whose elements are allocated within the bump arena.
+  let mut v = Vec::new_in(&bump);
+  v.push(0);
+  v.push(1);
+  v.push(2);
+  # }
+  ```
+
+  I'm very excited to see custom allocators in `std` coming along! Thanks to
+  Arthur Gautier for implementing support for the `allocator_api` feature for
+  Bumpalo.
+
+--------------------------------------------------------------------------------
+
 ## 3.4.0
 
 Released 2020-06-01.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/ci/install-cargo-readme.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/ci/install-cargo-readme.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/ci/install-cargo-readme.yml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/ci/install-cargo-readme.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-steps:
-  - script: cargo install --vers "^3" cargo-readme
-    displayName: Install `cargo readme`
-  - script: cargo readme --version
-    displayName: Query `cargo readme` version
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/ci/install-rust.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/ci/install-rust.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/ci/install-rust.yml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/ci/install-rust.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-steps:
-  - script: |
-      set -e
-      curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
-      echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
-    env:
-      RUSTUP_TOOLCHAIN: ${{parameters.rust_version}}
-    displayName: Install Rust
-
-  # All platforms.
-  - script: |
-        rustc -Vv
-        cargo -V
-    displayName: Query rust and cargo versions
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 [![](https://docs.rs/bumpalo/badge.svg)](https://docs.rs/bumpalo/)
 [![](https://img.shields.io/crates/v/bumpalo.svg)](https://crates.io/crates/bumpalo)
 [![](https://img.shields.io/crates/d/bumpalo.svg)](https://crates.io/crates/bumpalo)
-[![Build Status](https://dev.azure.com/fitzgen/bumpalo/_apis/build/status/fitzgen.bumpalo?branchName=master)](https://dev.azure.com/fitzgen/bumpalo/_build/latest?definitionId=2&branchName=master)
+[![Build Status](https://github.com/fitzgen/bumpalo/workflows/Rust/badge.svg)](https://github.com/fitzgen/bumpalo/actions?query=workflow%3ARust)
 
 ![](https://github.com/fitzgen/bumpalo/raw/master/bumpalo.png)
 
@@ -67,7 +67,9 @@
     scritches_required: true,
 });
 
+// Exclusive, mutable references to the just-allocated value are returned.
 assert!(scooter.scritches_required);
+scooter.age += 1;
 ```
 
 ### Collections
@@ -98,6 +100,9 @@
 allocator](https://github.com/rust-lang/rust/issues/42774) and we can remove
 this `collections` module and use the `std` versions.
 
+For unstable, nightly-only support for custom allocators in `std`, see the
+`allocator_api` section below.
+
 ### `bumpalo::boxed::Box`
 
 When the `"boxed"` cargo feature is enabled, a fork of `std::boxed::Box` library
@@ -142,3 +147,59 @@
 
 Bumpalo is a `no_std` crate. It depends only on the `alloc` and `core` crates.
 
+### Thread support
+
+The `Bump` is `!Send`, which makes it hard to use in certain situations around threads ‒ for
+example in `rayon`.
+
+The [`bumpalo-herd`](https://crates.io/crates/bumpalo-herd) crate provides a pool of `Bump`
+allocators for use in such situations.
+
+### Nightly Rust `feature(allocator_api)` Support
+
+The unstable, nightly-only Rust `allocator_api` feature defines an `Allocator`
+trait and exposes custom allocators for `std` types. Bumpalo has a matching
+`allocator_api` cargo feature to enable implementing `Allocator` and using
+`Bump` with `std` collections. Note that, as `feature(allocator_api)` is
+unstable and only in nightly Rust, Bumpalo's matching `allocator_api` cargo
+feature should be considered unstable, and will not follow the semver
+conventions that the rest of the crate does.
+
+First, enable the `allocator_api` feature in your `Cargo.toml`:
+
+```toml
+[dependencies]
+bumpalo = { version = "3.4.0", features = ["allocator_api"] }
+```
+
+Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
+
+```rust
+#![feature(allocator_api)]
+```
+
+Finally, use `std` collections with `Bump`, so that their internal heap
+allocations are made within the given bump arena:
+
+```rust
+#![feature(allocator_api)]
+use bumpalo::Bump;
+
+// Create a new bump arena.
+let bump = Bump::new();
+
+// Create a `Vec` whose elements are allocated within the bump arena.
+let mut v = Vec::new_in(&bump);
+v.push(0);
+v.push(1);
+v.push(2);
+```
+
+#### Minimum Supported Rust Version (MSRV)
+
+This crate is guaranteed to compile on stable Rust 1.44 and up. It might compile
+with older versions but that may change in any new patch release.
+
+We reserve the right to increment the MSRV on minor releases, however we will strive
+to only do it deliberately and for good reasons.
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/alloc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/alloc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/alloc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/alloc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,6 +10,7 @@
 
 #![allow(unstable_name_collisions)]
 #![allow(dead_code)]
+#![allow(deprecated)]
 
 //! Memory allocation APIs
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/collections/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/collections/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/collections/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/collections/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,6 +10,8 @@
 
 //! Collection types.
 
+#![allow(deprecated)]
+
 mod raw_vec;
 
 pub mod vec;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/collections/string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/collections/string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/collections/string.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/collections/string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -62,6 +62,7 @@
 use crate::collections::str::lossy;
 use crate::collections::vec::Vec;
 use crate::Bump;
+use core::borrow::{Borrow, BorrowMut};
 use core::char::decode_utf16;
 use core::fmt;
 use core::hash;
@@ -2079,6 +2080,20 @@
     }
 }
 
+impl<'bump> Borrow<str> for String<'bump> {
+    #[inline]
+    fn borrow(&self) -> &str {
+        &self[..]
+    }
+}
+
+impl<'bump> BorrowMut<str> for String<'bump> {
+    #[inline]
+    fn borrow_mut(&mut self) -> &mut str {
+        &mut self[..]
+    }
+}
+
 /// A draining iterator for `String`.
 ///
 /// This struct is created by the [`drain`] method on [`String`]. See its
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/collections/vec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/collections/vec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/collections/vec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/collections/vec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -86,6 +86,7 @@
 use super::raw_vec::RawVec;
 use crate::collections::CollectionAllocErr;
 use crate::Bump;
+use core::borrow::{Borrow, BorrowMut};
 use core::cmp::Ordering;
 use core::fmt;
 use core::hash::{self, Hash};
@@ -2058,6 +2059,20 @@
     }
 }
 
+impl<'bump, T: 'bump> Borrow<[T]> for Vec<'bump, T> {
+    #[inline]
+    fn borrow(&self) -> &[T] {
+        &self[..]
+    }
+}
+
+impl<'bump, T: 'bump> BorrowMut<[T]> for Vec<'bump, T> {
+    #[inline]
+    fn borrow_mut(&mut self) -> &mut [T] {
+        &mut self[..]
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Clone-on-write
 ////////////////////////////////////////////////////////////////////////////////
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
 [![](https://docs.rs/bumpalo/badge.svg)](https://docs.rs/bumpalo/)
 [![](https://img.shields.io/crates/v/bumpalo.svg)](https://crates.io/crates/bumpalo)
 [![](https://img.shields.io/crates/d/bumpalo.svg)](https://crates.io/crates/bumpalo)
-[![Build Status](https://dev.azure.com/fitzgen/bumpalo/_apis/build/status/fitzgen.bumpalo?branchName=master)](https://dev.azure.com/fitzgen/bumpalo/_build/latest?definitionId=2&branchName=master)
+[![Build Status](https://github.com/fitzgen/bumpalo/workflows/Rust/badge.svg)](https://github.com/fitzgen/bumpalo/actions?query=workflow%3ARust)
 
 ![](https://github.com/fitzgen/bumpalo/raw/master/bumpalo.png)
 
@@ -66,7 +66,9 @@
     scritches_required: true,
 });
 
+// Exclusive, mutable references to the just-allocated value are returned.
 assert!(scooter.scritches_required);
+scooter.age += 1;
 ```
 
 ## Collections
@@ -100,6 +102,9 @@
 allocator](https://github.com/rust-lang/rust/issues/42774) and we can remove
 this `collections` module and use the `std` versions.
 
+For unstable, nightly-only support for custom allocators in `std`, see the
+`allocator_api` section below.
+
 ## `bumpalo::boxed::Box`
 
 When the `"boxed"` cargo feature is enabled, a fork of `std::boxed::Box` library
@@ -147,11 +152,78 @@
 
 Bumpalo is a `no_std` crate. It depends only on the `alloc` and `core` crates.
 
+## Thread support
+
+The `Bump` is `!Send`, which makes it hard to use in certain situations around threads ‒ for
+example in `rayon`.
+
+The [`bumpalo-herd`](https://crates.io/crates/bumpalo-herd) crate provides a pool of `Bump`
+allocators for use in such situations.
+
+## Nightly Rust `feature(allocator_api)` Support
+
+The unstable, nightly-only Rust `allocator_api` feature defines an `Allocator`
+trait and exposes custom allocators for `std` types. Bumpalo has a matching
+`allocator_api` cargo feature to enable implementing `Allocator` and using
+`Bump` with `std` collections. Note that, as `feature(allocator_api)` is
+unstable and only in nightly Rust, Bumpalo's matching `allocator_api` cargo
+feature should be considered unstable, and will not follow the semver
+conventions that the rest of the crate does.
+
+First, enable the `allocator_api` feature in your `Cargo.toml`:
+
+```toml
+[dependencies]
+bumpalo = { version = "3.4.0", features = ["allocator_api"] }
+```
+
+Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
+
+```rust
+# #[cfg(feature = "allocator_api")]
+# {
+#![feature(allocator_api)]
+# }
+```
+
+Finally, use `std` collections with `Bump`, so that their internal heap
+allocations are made within the given bump arena:
+
+```
+# #![cfg_attr(feature = "allocator_api", feature(allocator_api))]
+# #[cfg(feature = "allocator_api")]
+# {
+#![feature(allocator_api)]
+use bumpalo::Bump;
+
+// Create a new bump arena.
+let bump = Bump::new();
+
+// Create a `Vec` whose elements are allocated within the bump arena.
+let mut v = Vec::new_in(&bump);
+v.push(0);
+v.push(1);
+v.push(2);
+# }
+```
+
+### Minimum Supported Rust Version (MSRV)
+
+This crate is guaranteed to compile on stable Rust 1.44 and up. It might compile
+with older versions but that may change in any new patch release.
+
+We reserve the right to increment the MSRV on minor releases, however we will strive
+to only do it deliberately and for good reasons.
+
  */
 
 #![deny(missing_debug_implementations)]
 #![deny(missing_docs)]
 #![no_std]
+#![cfg_attr(
+    feature = "allocator_api",
+    feature(allocator_api, nonnull_slice_from_raw_parts)
+)]
 
 #[doc(hidden)]
 pub extern crate alloc as core_alloc;
@@ -164,6 +236,7 @@
 mod alloc;
 
 use core::cell::Cell;
+use core::fmt::Display;
 use core::iter;
 use core::marker::PhantomData;
 use core::mem;
@@ -171,6 +244,34 @@
 use core::slice;
 use core::str;
 use core_alloc::alloc::{alloc, dealloc, Layout};
+#[cfg(feature = "allocator_api")]
+use core_alloc::alloc::{AllocError, Allocator};
+
+/// An error returned from [`Bump::try_alloc_try_with`].
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum AllocOrInitError<E> {
+    /// Indicates that the initial allocation failed.
+    Alloc(alloc::AllocErr),
+    /// Indicates that the initializer failed with the contained error after
+    /// allocation.
+    ///
+    /// It is possible but not guaranteed that the allocated memory has been
+    /// released back to the allocator at this point.
+    Init(E),
+}
+impl<E> From<alloc::AllocErr> for AllocOrInitError<E> {
+    fn from(e: alloc::AllocErr) -> Self {
+        Self::Alloc(e)
+    }
+}
+impl<E: Display> Display for AllocOrInitError<E> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        match self {
+            AllocOrInitError::Alloc(err) => err.fmt(f),
+            AllocOrInitError::Init(err) => write!(f, "initialization failed: {}", err),
+        }
+    }
+}
 
 /// An arena to bump allocate into.
 ///
@@ -190,14 +291,19 @@
 /// then if you allocate that type with a `Bump`, you need to find a new way to
 /// clean up after it yourself.
 ///
-/// Potential solutions are
+/// Potential solutions are:
+///
+/// * Using [`bumpalo::boxed::Box::new_in`] instead of [`Bump::alloc`], that
+///   will drop wrapped values similarly to [`std::boxed::Box`]. Note that this
+///   requires enabling the `"boxed"` Cargo feature for this crate. **This is
+///   often the easiest solution.**
+///
+/// * Calling [`drop_in_place`][drop_in_place] or using
+///   [`std::mem::ManuallyDrop`][manuallydrop] to manually drop these types.
+///
+/// * Using [`bumpalo::collections::Vec`] instead of [`std::vec::Vec`].
 ///
-/// * calling [`drop_in_place`][drop_in_place] or using
-///   [`std::mem::ManuallyDrop`][manuallydrop] to manually drop these types,
-/// * using [`bumpalo::collections::Vec`] instead of [`std::vec::Vec`]
-/// * using [`bumpalo::boxed::Box::new_in`] instead of [`Bump::alloc`],
-///   that will drop wrapped values similarly to [`std::boxed::Box`].
-/// * simply avoiding allocating these problematic types within a `Bump`.
+/// * Avoiding allocating these problematic types within a `Bump`.
 ///
 /// Note that not calling `Drop` is memory safe! Destructors are never
 /// guaranteed to run in Rust, you can't rely on them for enforcing memory
@@ -227,6 +333,135 @@
 /// let mut s = bump.alloc("bumpalo");
 /// *s = "the bump allocator; and also is a buffalo";
 /// ```
+///
+/// ## Allocation Methods Come in Many Flavors
+///
+/// There are various allocation methods on `Bump`, the simplest being
+/// [`alloc`][Bump::alloc]. The others exist to satisfy some combination of
+/// fallible allocation and initialization. The allocation methods are
+/// summarized in the following table:
+///
+/// <table>
+///   <thead>
+///     <tr>
+///       <th></th>
+///       <th>Infallible Allocation</th>
+///       <th>Fallible Allocation</th>
+///     </tr>
+///   </thead>
+///     <tr>
+///       <th>By Value</th>
+///       <td><a href="#method.alloc"><code>alloc</code></a></td>
+///       <td><a href="#method.try_alloc"><code>try_alloc</code></a></td>
+///     </tr>
+///     <tr>
+///       <th>Infallible Initializer Function</th>
+///       <td><a href="#method.alloc_with"><code>alloc_with</code></a></td>
+///       <td><a href="#method.try_alloc_with"><code>try_alloc_with</code></a></td>
+///     </tr>
+///     <tr>
+///       <th>Fallible Initializer Function</th>
+///       <td><a href="#method.alloc_try_with"><code>alloc_try_with</code></a></td>
+///       <td><a href="#method.try_alloc_try_with"><code>try_alloc_try_with</code></a></td>
+///     </tr>
+///   <tbody>
+///   </tbody>
+/// </table>
+///
+/// ### Fallible Allocation: The `try_alloc_` Method Prefix
+///
+/// These allocation methods let you recover from out-of-memory (OOM)
+/// scenarioes, rather than raising a panic on OOM.
+///
+/// ```
+/// use bumpalo::Bump;
+///
+/// let bump = Bump::new();
+///
+/// match bump.try_alloc(MyStruct {
+///     // ...
+/// }) {
+///     Ok(my_struct) => {
+///         // Allocation succeeded.
+///     }
+///     Err(e) => {
+///         // Out of memory.
+///     }
+/// }
+///
+/// struct MyStruct {
+///     // ...
+/// }
+/// ```
+///
+/// ### Initializer Functions: The `_with` Method Suffix
+///
+/// Calling one of the generic `…alloc(x)` methods is essentially equivalent to
+/// the matching [`…alloc_with(|| x)`](?search=alloc_with). However if you use
+/// `…alloc_with`, then the closure will not be invoked until after allocating
+/// space for storing `x` on the heap.
+///
+/// This can be useful in certain edge-cases related to compiler optimizations.
+/// When evaluating for example `bump.alloc(x)`, semantically `x` is first put
+/// on the stack and then moved onto the heap. In some cases, the compiler is
+/// able to optimize this into constructing `x` directly on the heap, however
+/// in many cases it does not.
+///
+/// The `*alloc_with` functions try to help the compiler be smarter. In most
+/// cases doing for example `bump.try_alloc_with(|| x)` on release mode will be
+/// enough to help the compiler realize that this optimization is valid and
+/// to construct `x` directly onto the heap.
+///
+/// #### Warning
+///
+/// These functions critically depend on compiler optimizations to achieve their
+/// desired effect. This means that it is not an effective tool when compiling
+/// without optimizations on.
+///
+/// Even when optimizations are on, these functions do not **guarantee** that
+/// the value is constructed on the heap. To the best of our knowledge no such
+/// guarantee can be made in stable Rust as of 1.44.
+///
+/// ### Fallible Initialization: The `_try_with` Method Suffix
+///
+/// The generic [`…alloc_try_with(|| x)`](?search=_try_with) methods behave
+/// like the purely `_with` suffixed methods explained above. However, they
+/// allow for fallible initialization by accepting a closure that returns a
+/// [`Result`] and will attempt to undo the initial allocation if this closure
+/// returns [`Err`].
+///
+/// #### Warning
+///
+/// If the inner closure returns [`Ok`], space for the entire [`Result`] remains
+/// allocated inside `self`. This can be a problem especially if the [`Err`]
+/// variant is larger, but even otherwise there may be overhead for the
+/// [`Result`]'s discriminant.
+///
+/// <p><details><summary>Undoing the allocation in the <code>Err</code> case
+/// always fails if <code>f</code> successfully made any additional allocations
+/// in <code>self</code>.</summary>
+///
+/// For example, the following will always leak also space for the [`Result`]
+/// into this `Bump`, even though the inner reference isn't kept and the [`Err`]
+/// payload is returned semantically by value:
+///
+/// ```rust
+/// let bump = bumpalo::Bump::new();
+///
+/// let r: Result<&mut [u8; 1000], ()> = bump.alloc_try_with(|| {
+///     let _ = bump.alloc(0_u8);
+///     Err(())
+/// });
+///
+/// assert!(r.is_err());
+/// ```
+///
+///</details></p>
+///
+/// Since [`Err`] payloads are first placed on the heap and then moved to the
+/// stack, `bump.…alloc_try_with(|| x)?` is likely to execute more slowly than
+/// the matching `bump.…alloc(x?)` in case of initialization failure. If this
+/// happens frequently, using the plain un-suffixed method may perform better.
 #[derive(Debug)]
 pub struct Bump {
     // The current chunk we are bump allocating within.
@@ -318,27 +553,6 @@
 // take the alignment into account.
 const DEFAULT_CHUNK_SIZE_WITHOUT_FOOTER: usize = FIRST_ALLOCATION_GOAL - OVERHEAD;
 
-#[inline]
-fn layout_for_array<T>(len: usize) -> Option<Layout> {
-    // TODO: use Layout::array once the rust feature `alloc_layout_extra`
-    // gets stabilized
-    //
-    // According to https://doc.rust-lang.org/reference/type-layout.html#size-and-alignment
-    // the size of a value is always a multiple of it's alignment. But that does not seem to match
-    // with https://doc.rust-lang.org/std/alloc/struct.Layout.html#method.from_size_align
-    //
-    // Let's be on the safe size and round up to the padding in any case.
-    //
-    // An interesting question is whether there needs to be padding at the end of
-    // the last object in the array. Again, we take the safe approach and include it.
-
-    let layout = Layout::new::<T>();
-    let size_rounded_up = round_up_to(layout.size(), layout.align())?;
-    let total_size = len.checked_mul(size_rounded_up)?;
-
-    Layout::from_size_align(total_size, layout.align()).ok()
-}
-
 /// Wrapper around `Layout::from_size_align` that adds debug assertions.
 #[inline]
 unsafe fn layout_from_size_align(size: usize, align: usize) -> Layout {
@@ -418,20 +632,13 @@
     /// layout of the allocation request that triggered us to fall back to
     /// allocating a new chunk of memory.
     fn new_chunk(
-        old_size_with_footer: Option<usize>,
+        new_size_without_footer: Option<usize>,
         requested_layout: Option<Layout>,
         prev: Option<NonNull<ChunkFooter>>,
     ) -> Option<NonNull<ChunkFooter>> {
         unsafe {
-            // As a sane default, we want our new allocation to be about twice as
-            // big as the previous allocation
             let mut new_size_without_footer =
-                if let Some(old_size_with_footer) = old_size_with_footer {
-                    let old_size_without_footer = old_size_with_footer - FOOTER_SIZE;
-                    old_size_without_footer.checked_mul(2)?
-                } else {
-                    DEFAULT_CHUNK_SIZE_WITHOUT_FOOTER
-                };
+                new_size_without_footer.unwrap_or(DEFAULT_CHUNK_SIZE_WITHOUT_FOOTER);
 
             // We want to have CHUNK_ALIGN or better alignment
             let mut align = CHUNK_ALIGN;
@@ -467,7 +674,7 @@
                 .unwrap_or_else(allocation_size_overflow);
             let layout = layout_from_size_align(size, align);
 
-            debug_assert!(size >= old_size_with_footer.unwrap_or(0) * 2);
+            debug_assert!(requested_layout.map_or(true, |layout| size >= layout.size()));
 
             let data = alloc(layout);
             let data = NonNull::new(data)?;
@@ -563,7 +770,7 @@
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for `T` would cause an overflow.
+    /// Panics if reserving space for `T` fails.
     ///
     /// ## Example
     ///
@@ -578,38 +785,37 @@
         self.alloc_with(|| val)
     }
 
+    /// Try to allocate an object in this `Bump` and return an exclusive
+    /// reference to it.
+    ///
+    /// ## Errors
+    ///
+    /// Errors if reserving space for `T` fails.
+    ///
+    /// ## Example
+    ///
+    /// ```
+    /// let bump = bumpalo::Bump::new();
+    /// let x = bump.try_alloc("hello");
+    /// assert_eq!(x, Ok(&mut"hello"));
+    /// ```
+    #[inline(always)]
+    #[allow(clippy::mut_from_ref)]
+    pub fn try_alloc<T>(&self, val: T) -> Result<&mut T, alloc::AllocErr> {
+        self.try_alloc_with(|| val)
+    }
+
     /// Pre-allocate space for an object in this `Bump`, initializes it using
     /// the closure, then returns an exclusive reference to it.
     ///
-    /// Calling `bump.alloc(x)` is essentially equivalent to calling
-    /// `bump.alloc_with(|| x)`. However if you use `alloc_with`, then the
-    /// closure will not be invoked until after allocating space for storing
-    /// `x` on the heap.
-    ///
-    /// This can be useful in certain edge-cases related to compiler
-    /// optimizations. When evaluating `bump.alloc(x)`, semantically `x` is
-    /// first put on the stack and then moved onto the heap. In some cases,
-    /// the compiler is able to optimize this into constructing `x` directly
-    /// on the heap, however in many cases it does not.
-    ///
-    /// The function `alloc_with` tries to help the compiler be smarter. In
-    /// most cases doing `bump.alloc_with(|| x)` on release mode will be
-    /// enough to help the compiler to realize this optimization is valid
-    /// and construct `x` directly onto the heap.
-    ///
-    /// ## Warning
-    ///
-    /// This function critically depends on compiler optimizations to achieve
-    /// its desired effect. This means that it is not an effective tool when
-    /// compiling without optimizations on.
-    ///
-    /// Even when optimizations are on, this function does not **guarantee**
-    /// that the value is constructed on the heap. To the best of our
-    /// knowledge no such guarantee can be made in stable Rust as of 1.33.
+    /// See [The `_with` Method Suffix](#the-_with-method-suffix) for a
+    /// discussion on the differences between the `_with` suffixed methods and
+    /// those methods without it, their performance characteristics, and when
+    /// you might or might not choose a `_with` suffixed method.
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for `T` would cause an overflow.
+    /// Panics if reserving space for `T` fails.
     ///
     /// ## Example
     ///
@@ -652,12 +858,277 @@
         }
     }
 
+    /// Tries to pre-allocate space for an object in this `Bump`, initializes
+    /// it using the closure, then returns an exclusive reference to it.
+    ///
+    /// See [The `_with` Method Suffix](#the-_with-method-suffix) for a
+    /// discussion on the differences between the `_with` suffixed methods and
+    /// those methods without it, their performance characteristics, and when
+    /// you might or might not choose a `_with` suffixed method.
+    ///
+    /// ## Errors
+    ///
+    /// Errors if reserving space for `T` fails.
+    ///
+    /// ## Example
+    ///
+    /// ```
+    /// let bump = bumpalo::Bump::new();
+    /// let x = bump.try_alloc_with(|| "hello");
+    /// assert_eq!(x, Ok(&mut "hello"));
+    /// ```
+    #[inline(always)]
+    #[allow(clippy::mut_from_ref)]
+    pub fn try_alloc_with<F, T>(&self, f: F) -> Result<&mut T, alloc::AllocErr>
+    where
+        F: FnOnce() -> T,
+    {
+        #[inline(always)]
+        unsafe fn inner_writer<T, F>(ptr: *mut T, f: F)
+        where
+            F: FnOnce() -> T,
+        {
+            // This function is translated as:
+            // - allocate space for a T on the stack
+            // - call f() with the return value being put onto this stack space
+            // - memcpy from the stack to the heap
+            //
+            // Ideally we want LLVM to always realize that doing a stack
+            // allocation is unnecessary and optimize the code so it writes
+            // directly into the heap instead. It seems we get it to realize
+            // this most consistently if we put this critical line into it's
+            // own function instead of inlining it into the surrounding code.
+            ptr::write(ptr, f())
+        }
+
+        //SAFETY: Self-contained:
+        // `p` is allocated for `T` and then a `T` is written.
+        let layout = Layout::new::<T>();
+        let p = self.try_alloc_layout(layout)?;
+        let p = p.as_ptr() as *mut T;
+
+        unsafe {
+            inner_writer(p, f);
+            Ok(&mut *p)
+        }
+    }
+
+    /// Pre-allocates space for a [`Result`] in this `Bump`, initializes it using
+    /// the closure, then returns an exclusive reference to its `T` if [`Ok`].
+    ///
+    /// Iff the allocation fails, the closure is not run.
+    ///
+    /// Iff [`Err`], an allocator rewind is *attempted* and the `E` instance is
+    /// moved out of the allocator to be consumed or dropped as normal.
+    ///
+    /// See [The `_with` Method Suffix](#the-_with-method-suffix) for a
+    /// discussion on the differences between the `_with` suffixed methods and
+    /// those methods without it, their performance characteristics, and when
+    /// you might or might not choose a `_with` suffixed method.
+    ///
+    /// For caveats specific to fallible initialization, see
+    /// [The `_try_with` Method Suffix](#the-_try_with-method-suffix).
+    ///
+    /// ## Errors
+    ///
+    /// Iff the allocation succeeds but `f` fails, that error is forwarded by value.
+    ///
+    /// ## Panics
+    ///
+    /// Panics if reserving space for `Result<T, E>` fails.
+    ///
+    /// ## Example
+    ///
+    /// ```
+    /// let bump = bumpalo::Bump::new();
+    /// let x = bump.alloc_try_with(|| Ok("hello"))?;
+    /// assert_eq!(*x, "hello");
+    /// # Result::<_, ()>::Ok(())
+    /// ```
+    #[inline(always)]
+    #[allow(clippy::mut_from_ref)]
+    pub fn alloc_try_with<F, T, E>(&self, f: F) -> Result<&mut T, E>
+    where
+        F: FnOnce() -> Result<T, E>,
+    {
+        let rewind_footer = self.current_chunk_footer.get();
+        let rewind_ptr = unsafe { rewind_footer.as_ref() }.ptr.get();
+        let mut inner_result_ptr = NonNull::from(self.alloc_with(f));
+        let inner_result_address = inner_result_ptr.as_ptr() as usize;
+        match unsafe { inner_result_ptr.as_mut() } {
+            Ok(t) => Ok(unsafe {
+                //SAFETY:
+                // The `&mut Result<T, E>` returned by `alloc_with` may be
+                // lifetime-limited by `E`, but the derived `&mut T` still has
+                // the same validity as in `alloc_with` since the error variant
+                // is already ruled out here.
+
+                // We could conditionally truncate the allocation here, but
+                // since it grows backwards, it seems unlikely that we'd get
+                // any more than the `Result`'s discriminant this way, if
+                // anything at all.
+                &mut *(t as *mut _)
+            }),
+            Err(e) => unsafe {
+                // If this result was the last allocation in this arena, we can
+                // reclaim its space. In fact, sometimes we can do even better
+                // than simply calling `dealloc` on the result pointer: we can
+                // reclaim any alignment padding we might have added (which
+                // `dealloc` cannot do) if we didn't allocate a new chunk for
+                // this result.
+                if self.is_last_allocation(NonNull::new_unchecked(inner_result_address as *mut _)) {
+                    let current_footer_p = self.current_chunk_footer.get();
+                    let current_ptr = &current_footer_p.as_ref().ptr;
+                    if current_footer_p == rewind_footer {
+                        // It's still the same chunk, so reset the bump pointer
+                        // to its original value upon entry to this method
+                        // (reclaiming any alignment padding we may have
+                        // added).
+                        current_ptr.set(rewind_ptr);
+                    } else {
+                        // We allocated a new chunk for this result.
+                        //
+                        // We know the result is the only allocation in this
+                        // chunk: Any additional allocations since the start of
+                        // this method could only have happened when running
+                        // the initializer function, which is called *after*
+                        // reserving space for this result. Therefore, since we
+                        // already determined via the check above that this
+                        // result was the last allocation, there must not have
+                        // been any other allocations, and this result is the
+                        // only allocation in this chunk.
+                        //
+                        // Because this is the only allocation in this chunk,
+                        // we can reset the chunk's bump finger to the start of
+                        // the chunk.
+                        current_ptr.set(current_footer_p.as_ref().data);
+                    }
+                }
+                //SAFETY:
+                // As we received `E` semantically by value from `f`, we can
+                // just copy that value here as long as we avoid a double-drop
+                // (which can't happen as any specific references to the `E`'s
+                // data in `self` are destroyed when this function returns).
+                //
+                // The order between this and the deallocation doesn't matter
+                // because `Self: !Sync`.
+                Err(ptr::read(e as *const _))
+            },
+        }
+    }
+
+    /// Tries to pre-allocates space for a [`Result`] in this `Bump`,
+    /// initializes it using the closure, then returns an exclusive reference
+    /// to its `T` if all [`Ok`].
+    ///
+    /// Iff the allocation fails, the closure is not run.
+    ///
+    /// Iff the closure returns [`Err`], an allocator rewind is *attempted* and
+    /// the `E` instance is moved out of the allocator to be consumed or dropped
+    /// as normal.
+    ///
+    /// See [The `_with` Method Suffix](#the-_with-method-suffix) for a
+    /// discussion on the differences between the `_with` suffixed methods and
+    /// those methods without it, their performance characteristics, and when
+    /// you might or might not choose a `_with` suffixed method.
+    ///
+    /// For caveats specific to fallible initialization, see
+    /// [The `_try_with` Method Suffix](#the-_try_with-method-suffix).
+    ///
+    /// ## Errors
+    ///
+    /// Errors with the [`Alloc`](`AllocOrInitError::Alloc`) variant iff
+    /// reserving space for `Result<T, E>` fails.
+    ///
+    /// Iff the allocation succeeds but `f` fails, that error is forwarded by
+    /// value inside the [`Init`](`AllocOrInitError::Init`) variant.
+    ///
+    /// ## Example
+    ///
+    /// ```
+    /// let bump = bumpalo::Bump::new();
+    /// let x = bump.try_alloc_try_with(|| Ok("hello"))?;
+    /// assert_eq!(*x, "hello");
+    /// # Result::<_, bumpalo::AllocOrInitError<()>>::Ok(())
+    /// ```
+    #[inline(always)]
+    #[allow(clippy::mut_from_ref)]
+    pub fn try_alloc_try_with<F, T, E>(&self, f: F) -> Result<&mut T, AllocOrInitError<E>>
+    where
+        F: FnOnce() -> Result<T, E>,
+    {
+        let rewind_footer = self.current_chunk_footer.get();
+        let rewind_ptr = unsafe { rewind_footer.as_ref() }.ptr.get();
+        let mut inner_result_ptr = NonNull::from(self.try_alloc_with(f)?);
+        let inner_result_address = inner_result_ptr.as_ptr() as usize;
+        match unsafe { inner_result_ptr.as_mut() } {
+            Ok(t) => Ok(unsafe {
+                //SAFETY:
+                // The `&mut Result<T, E>` returned by `alloc_with` may be
+                // lifetime-limited by `E`, but the derived `&mut T` still has
+                // the same validity as in `alloc_with` since the error variant
+                // is already ruled out here.
+
+                // We could conditionally truncate the allocation here, but
+                // since it grows backwards, it seems unlikely that we'd get
+                // any more than the `Result`'s discriminant this way, if
+                // anything at all.
+                &mut *(t as *mut _)
+            }),
+            Err(e) => unsafe {
+                // If this result was the last allocation in this arena, we can
+                // reclaim its space. In fact, sometimes we can do even better
+                // than simply calling `dealloc` on the result pointer: we can
+                // reclaim any alignment padding we might have added (which
+                // `dealloc` cannot do) if we didn't allocate a new chunk for
+                // this result.
+                if self.is_last_allocation(NonNull::new_unchecked(inner_result_address as *mut _)) {
+                    let current_footer_p = self.current_chunk_footer.get();
+                    let current_ptr = &current_footer_p.as_ref().ptr;
+                    if current_footer_p == rewind_footer {
+                        // It's still the same chunk, so reset the bump pointer
+                        // to its original value upon entry to this method
+                        // (reclaiming any alignment padding we may have
+                        // added).
+                        current_ptr.set(rewind_ptr);
+                    } else {
+                        // We allocated a new chunk for this result.
+                        //
+                        // We know the result is the only allocation in this
+                        // chunk: Any additional allocations since the start of
+                        // this method could only have happened when running
+                        // the initializer function, which is called *after*
+                        // reserving space for this result. Therefore, since we
+                        // already determined via the check above that this
+                        // result was the last allocation, there must not have
+                        // been any other allocations, and this result is the
+                        // only allocation in this chunk.
+                        //
+                        // Because this is the only allocation in this chunk,
+                        // we can reset the chunk's bump finger to the start of
+                        // the chunk.
+                        current_ptr.set(current_footer_p.as_ref().data);
+                    }
+                }
+                //SAFETY:
+                // As we received `E` semantically by value from `f`, we can
+                // just copy that value here as long as we avoid a double-drop
+                // (which can't happen as any specific references to the `E`'s
+                // data in `self` are destroyed when this function returns).
+                //
+                // The order between this and the deallocation doesn't matter
+                // because `Self: !Sync`.
+                Err(AllocOrInitError::Init(ptr::read(e as *const _)))
+            },
+        }
+    }
+
     /// `Copy` a slice into this `Bump` and return an exclusive reference to
     /// the copy.
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for the slice would cause an overflow.
+    /// Panics if reserving space for the slice fails.
     ///
     /// ## Example
     ///
@@ -686,7 +1157,7 @@
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for the slice would cause an overflow.
+    /// Panics if reserving space for the slice fails.
     ///
     /// ## Example
     ///
@@ -728,7 +1199,7 @@
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for the string would cause an overflow.
+    /// Panics if reserving space for the string fails.
     ///
     /// ## Example
     ///
@@ -755,7 +1226,7 @@
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for the slice would cause an overflow.
+    /// Panics if reserving space for the slice fails.
     ///
     /// ## Example
     ///
@@ -770,7 +1241,7 @@
     where
         F: FnMut(usize) -> T,
     {
-        let layout = layout_for_array::<T>(len).unwrap_or_else(|| oom());
+        let layout = Layout::array::<T>(len).unwrap_or_else(|_| oom());
         let dst = self.alloc_layout(layout).cast::<T>();
 
         unsafe {
@@ -791,7 +1262,7 @@
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for the slice would cause an overflow.
+    /// Panics if reserving space for the slice fails.
     ///
     /// ## Example
     ///
@@ -813,7 +1284,7 @@
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for the slice would cause an overflow.
+    /// Panics if reserving space for the slice fails.
     ///
     /// ## Example
     ///
@@ -838,7 +1309,7 @@
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for the slice would cause an overflow, or if the supplied
+    /// Panics if reserving space for the slice fails, or if the supplied
     /// iterator returns fewer elements than it promised.
     ///
     /// ## Example
@@ -868,7 +1339,7 @@
     ///
     /// ## Panics
     ///
-    /// Panics if reserving space for the slice would cause an overflow.
+    /// Panics if reserving space for the slice fails.
     ///
     /// ## Example
     ///
@@ -888,6 +1359,10 @@
     /// The returned pointer points at uninitialized memory, and should be
     /// initialized with
     /// [`std::ptr::write`](https://doc.rust-lang.org/std/ptr/fn.write.html).
+    ///
+    /// # Panics
+    ///
+    /// Panics if reserving space matching `layout` fails.
     #[inline(always)]
     pub fn alloc_layout(&self, layout: Layout) -> NonNull<u8> {
         self.try_alloc_layout(layout).unwrap_or_else(|_| oom())
@@ -899,6 +1374,10 @@
     /// The returned pointer points at uninitialized memory, and should be
     /// initialized with
     /// [`std::ptr::write`](https://doc.rust-lang.org/std/ptr/fn.write.html).
+    ///
+    /// # Errors
+    ///
+    /// Errors if reserving space matching `layout` fails.
     #[inline(always)]
     pub fn try_alloc_layout(&self, layout: Layout) -> Result<NonNull<u8>, alloc::AllocErr> {
         if let Some(p) = self.try_alloc_layout_fast(layout) {
@@ -964,11 +1443,29 @@
             // Get a new chunk from the global allocator.
             let current_footer = self.current_chunk_footer.get();
             let current_layout = current_footer.as_ref().layout;
-            let new_footer = Bump::new_chunk(
-                Some(current_layout.size()),
-                Some(layout),
-                Some(current_footer),
-            )?;
+
+            // By default, we want our new chunk to be about twice as big
+            // as the previous chunk. If the global allocator refuses it,
+            // we try to divide it by half until it works or the requested
+            // size is smaller than the default footer size.
+            let min_new_chunk_size = layout.size().max(DEFAULT_CHUNK_SIZE_WITHOUT_FOOTER);
+            let mut base_size = (current_layout.size() - FOOTER_SIZE)
+                .checked_mul(2)?
+                .max(min_new_chunk_size);
+            let sizes = iter::from_fn(|| {
+                if base_size >= min_new_chunk_size {
+                    let size = base_size;
+                    base_size = base_size / 2;
+                    Some(size)
+                } else {
+                    None
+                }
+            });
+
+            let new_footer = sizes
+                .filter_map(|size| Bump::new_chunk(Some(size), Some(layout), Some(current_footer)))
+                .next()?;
+
             debug_assert_eq!(
                 new_footer.as_ref().data.as_ptr() as usize % layout.align(),
                 0
@@ -1089,7 +1586,8 @@
         }
     }
 
-    /// Calculates the number of bytes currently allocated across all chunks.
+    /// Calculates the number of bytes currently allocated across all chunks in
+    /// this bump arena.
     ///
     /// If you allocate types of different alignments or types with
     /// larger-than-typical alignment in the same arena, some padding
@@ -1131,6 +1629,73 @@
         let footer = footer.as_ref();
         footer.ptr.get() == ptr
     }
+
+    #[inline]
+    unsafe fn dealloc(&self, ptr: NonNull<u8>, layout: Layout) {
+        // If the pointer is the last allocation we made, we can reuse the bytes,
+        // otherwise they are simply leaked -- at least until somebody calls reset().
+        if self.is_last_allocation(ptr) {
+            let ptr = NonNull::new_unchecked(ptr.as_ptr().add(layout.size()));
+            self.current_chunk_footer.get().as_ref().ptr.set(ptr);
+        }
+    }
+
+    #[inline]
+    unsafe fn shrink(
+        &self,
+        ptr: NonNull<u8>,
+        layout: Layout,
+        new_size: usize,
+    ) -> Result<NonNull<u8>, alloc::AllocErr> {
+        let old_size = layout.size();
+        if self.is_last_allocation(ptr)
+                // Only reclaim the excess space (which requires a copy) if it
+                // is worth it: we are actually going to recover "enough" space
+                // and we can do a non-overlapping copy.
+                && new_size <= old_size / 2
+        {
+            let delta = old_size - new_size;
+            let footer = self.current_chunk_footer.get();
+            let footer = footer.as_ref();
+            footer
+                .ptr
+                .set(NonNull::new_unchecked(footer.ptr.get().as_ptr().add(delta)));
+            let new_ptr = footer.ptr.get();
+            // NB: we know it is non-overlapping because of the size check
+            // in the `if` condition.
+            ptr::copy_nonoverlapping(ptr.as_ptr(), new_ptr.as_ptr(), new_size);
+            return Ok(new_ptr);
+        } else {
+            return Ok(ptr);
+        }
+    }
+
+    #[inline]
+    unsafe fn grow(
+        &self,
+        ptr: NonNull<u8>,
+        layout: Layout,
+        new_size: usize,
+    ) -> Result<NonNull<u8>, alloc::AllocErr> {
+        let old_size = layout.size();
+        if self.is_last_allocation(ptr) {
+            // Try to allocate the delta size within this same block so we can
+            // reuse the currently allocated space.
+            let delta = new_size - old_size;
+            if let Some(p) =
+                self.try_alloc_layout_fast(layout_from_size_align(delta, layout.align()))
+            {
+                ptr::copy(ptr.as_ptr(), p.as_ptr(), old_size);
+                return Ok(p);
+            }
+        }
+
+        // Fallback: do a fresh allocation and copy the existing data into it.
+        let new_layout = layout_from_size_align(new_size, layout.align());
+        let new_ptr = self.try_alloc_layout(new_layout)?;
+        ptr::copy_nonoverlapping(ptr.as_ptr(), new_ptr.as_ptr(), old_size);
+        Ok(new_ptr)
+    }
 }
 
 /// An iterator over each chunk of allocated memory that
@@ -1188,12 +1753,7 @@
 
     #[inline]
     unsafe fn dealloc(&mut self, ptr: NonNull<u8>, layout: Layout) {
-        // If the pointer is the last allocation we made, we can reuse the bytes,
-        // otherwise they are simply leaked -- at least until somebody calls reset().
-        if self.is_last_allocation(ptr) {
-            let ptr = NonNull::new_unchecked(ptr.as_ptr().add(layout.size()));
-            self.current_chunk_footer.get().as_ref().ptr.set(ptr);
-        }
+        Bump::dealloc(self, ptr, layout)
     }
 
     #[inline]
@@ -1206,49 +1766,62 @@
         let old_size = layout.size();
 
         if old_size == 0 {
-            return self.alloc(layout);
+            return self.try_alloc_layout(layout);
         }
 
         if new_size <= old_size {
-            if self.is_last_allocation(ptr)
-                // Only reclaim the excess space (which requires a copy) if it
-                // is worth it: we are actually going to recover "enough" space
-                // and we can do a non-overlapping copy.
-                && new_size <= old_size / 2
-            {
-                let delta = old_size - new_size;
-                let footer = self.current_chunk_footer.get();
-                let footer = footer.as_ref();
-                footer
-                    .ptr
-                    .set(NonNull::new_unchecked(footer.ptr.get().as_ptr().add(delta)));
-                let new_ptr = footer.ptr.get();
-                // NB: we know it is non-overlapping because of the size check
-                // in the `if` condition.
-                ptr::copy_nonoverlapping(ptr.as_ptr(), new_ptr.as_ptr(), new_size);
-                return Ok(new_ptr);
-            } else {
-                return Ok(ptr);
-            }
+            self.shrink(ptr, layout, new_size)
+        } else {
+            self.grow(ptr, layout, new_size)
         }
+    }
+}
 
-        if self.is_last_allocation(ptr) {
-            // Try to allocate the delta size within this same block so we can
-            // reuse the currently allocated space.
-            let delta = new_size - old_size;
-            if let Some(p) =
-                self.try_alloc_layout_fast(layout_from_size_align(delta, layout.align()))
-            {
-                ptr::copy(ptr.as_ptr(), p.as_ptr(), old_size);
-                return Ok(p);
-            }
-        }
+#[cfg(feature = "allocator_api")]
+unsafe impl<'a> Allocator for &'a Bump {
+    fn allocate(&self, layout: Layout) -> Result<NonNull<[u8]>, AllocError> {
+        self.try_alloc_layout(layout)
+            .map(|p| NonNull::slice_from_raw_parts(p, layout.size()))
+            .map_err(|_| AllocError)
+    }
 
-        // Fallback: do a fresh allocation and copy the existing data into it.
-        let new_layout = layout_from_size_align(new_size, layout.align());
-        let new_ptr = self.try_alloc_layout(new_layout)?;
-        ptr::copy_nonoverlapping(ptr.as_ptr(), new_ptr.as_ptr(), old_size);
-        Ok(new_ptr)
+    unsafe fn deallocate(&self, ptr: NonNull<u8>, layout: Layout) {
+        Bump::dealloc(self, ptr, layout)
+    }
+
+    unsafe fn shrink(
+        &self,
+        ptr: NonNull<u8>,
+        old_layout: Layout,
+        new_layout: Layout,
+    ) -> Result<NonNull<[u8]>, AllocError> {
+        let new_size = new_layout.size();
+        Bump::shrink(self, ptr, old_layout, new_size)
+            .map(|p| NonNull::slice_from_raw_parts(p, new_size))
+            .map_err(|_| AllocError)
+    }
+
+    unsafe fn grow(
+        &self,
+        ptr: NonNull<u8>,
+        old_layout: Layout,
+        new_layout: Layout,
+    ) -> Result<NonNull<[u8]>, AllocError> {
+        let new_size = new_layout.size();
+        Bump::grow(self, ptr, old_layout, new_size)
+            .map(|p| NonNull::slice_from_raw_parts(p, new_size))
+            .map_err(|_| AllocError)
+    }
+
+    unsafe fn grow_zeroed(
+        &self,
+        ptr: NonNull<u8>,
+        old_layout: Layout,
+        new_layout: Layout,
+    ) -> Result<NonNull<[u8]>, AllocError> {
+        let mut ptr = self.grow(ptr, old_layout, new_layout)?;
+        ptr.as_mut()[old_layout.size()..].fill(0);
+        Ok(ptr)
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/allocator_api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/allocator_api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/allocator_api.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/allocator_api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,116 @@
+#![feature(allocator_api)]
+#![cfg(feature = "allocator_api")]
+use bumpalo::Bump;
+
+use std::alloc::{AllocError, Allocator, Layout};
+use std::ptr::NonNull;
+use std::sync::atomic::{AtomicUsize, Ordering::Relaxed};
+
+#[derive(Debug)]
+struct AllocatorDebug {
+    bump: Bump,
+    grows: AtomicUsize,
+    shrinks: AtomicUsize,
+    allocs: AtomicUsize,
+    deallocs: AtomicUsize,
+}
+
+impl AllocatorDebug {
+    fn new(bump: Bump) -> AllocatorDebug {
+        AllocatorDebug {
+            bump,
+            grows: AtomicUsize::new(0),
+            shrinks: AtomicUsize::new(0),
+            allocs: AtomicUsize::new(0),
+            deallocs: AtomicUsize::new(0),
+        }
+    }
+}
+
+unsafe impl Allocator for AllocatorDebug {
+    fn allocate(&self, layout: Layout) -> Result<NonNull<[u8]>, AllocError> {
+        self.allocs.fetch_add(1, Relaxed);
+        let ref bump = self.bump;
+        bump.allocate(layout)
+    }
+
+    unsafe fn deallocate(&self, ptr: NonNull<u8>, layout: Layout) {
+        self.deallocs.fetch_add(1, Relaxed);
+        let ref bump = self.bump;
+        bump.deallocate(ptr, layout)
+    }
+
+    unsafe fn shrink(
+        &self,
+        ptr: NonNull<u8>,
+        old_layout: Layout,
+        new_layout: Layout,
+    ) -> Result<NonNull<[u8]>, AllocError> {
+        self.shrinks.fetch_add(1, Relaxed);
+        let ref bump = self.bump;
+        bump.shrink(ptr, old_layout, new_layout)
+    }
+
+    unsafe fn grow(
+        &self,
+        ptr: NonNull<u8>,
+        old_layout: Layout,
+        new_layout: Layout,
+    ) -> Result<NonNull<[u8]>, AllocError> {
+        self.grows.fetch_add(1, Relaxed);
+        let ref bump = self.bump;
+        bump.grow(ptr, old_layout, new_layout)
+    }
+}
+
+#[test]
+fn allocator_api_push_a_bunch_of_items() {
+    let b = AllocatorDebug::new(Bump::new());
+    let mut v = Vec::with_capacity_in(1024, &b);
+    assert_eq!(b.allocs.load(Relaxed), 1);
+
+    for x in 0..1024 {
+        v.push(x);
+    }
+
+    // Ensure we trigger a grow
+    assert_eq!(b.grows.load(Relaxed), 0);
+    for x in 1024..2048 {
+        v.push(x);
+    }
+    assert_ne!(b.grows.load(Relaxed), 0);
+
+    // Ensure we trigger a shrink
+    v.truncate(1024);
+    v.shrink_to_fit();
+    assert_eq!(b.shrinks.load(Relaxed), 1);
+
+    // Ensure we trigger a deallocation
+    assert_eq!(b.deallocs.load(Relaxed), 0);
+    drop(v);
+    assert_eq!(b.deallocs.load(Relaxed), 1);
+}
+
+#[test]
+fn allocator_grow_zeroed() {
+    // Create a new bump arena.
+    let ref bump = Bump::new();
+
+    // Make an initial allocation.
+    let first_layout = Layout::from_size_align(4, 4).expect("create a layout");
+    let mut p = bump
+        .allocate_zeroed(first_layout)
+        .expect("allocate a first chunk");
+    let allocated = bump.allocated_bytes();
+    unsafe { p.as_mut().fill(42) };
+    let p = p.cast();
+
+    // Grow the last allocation. This should just reserve a few more bytes
+    // within the current chunk, not allocate a whole new memory block within a
+    // new chunk.
+    let second_layout = Layout::from_size_align(8, 4).expect("create a expanded layout");
+    let p = unsafe { bump.grow_zeroed(p, first_layout, second_layout) }
+        .expect("should grow_zeroed okay");
+    assert!(bump.allocated_bytes() <= allocated * 2);
+    assert_eq!(unsafe { p.as_ref() }, [42, 42, 42, 42, 0, 0, 0, 0]);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/alloc_try_with.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/alloc_try_with.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/alloc_try_with.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/alloc_try_with.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,119 @@
+// All of these alloc_try_with tests will fail with "fatal runtime error: stack overflow" unless
+// LLVM manages to optimize the stack writes away.
+//
+// We only run them when debug_assertions are not set, as we expect them to fail outside release
+// mode.
+
+use bumpalo::Bump;
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn alloc_try_with_large_array() -> Result<(), ()> {
+    let b = Bump::new();
+
+    b.alloc_try_with(|| Ok([4u8; 10_000_000]))?;
+
+    Ok(())
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn alloc_try_with_large_array_err() {
+    let b = Bump::new();
+
+    assert!(b
+        .alloc_try_with(|| Result::<[u8; 10_000_000], _>::Err(()))
+        .is_err());
+}
+
+#[allow(dead_code)]
+struct LargeStruct {
+    small: usize,
+    big1: [u8; 20_000_000],
+    big2: [u8; 20_000_000],
+    big3: [u8; 20_000_000],
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn alloc_try_with_large_struct() -> Result<(), ()> {
+    let b = Bump::new();
+
+    b.alloc_try_with(|| {
+        Ok(LargeStruct {
+            small: 1,
+            big1: [2; 20_000_000],
+            big2: [3; 20_000_000],
+            big3: [4; 20_000_000],
+        })
+    })?;
+
+    Ok(())
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn alloc_try_with_large_struct_err() {
+    let b = Bump::new();
+
+    assert!(b
+        .alloc_try_with(|| Result::<LargeStruct, _>::Err(()))
+        .is_err());
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn alloc_try_with_large_tuple() -> Result<(), ()> {
+    let b = Bump::new();
+
+    b.alloc_try_with(|| {
+        Ok((
+            1u32,
+            LargeStruct {
+                small: 2,
+                big1: [3; 20_000_000],
+                big2: [4; 20_000_000],
+                big3: [5; 20_000_000],
+            },
+        ))
+    })?;
+
+    Ok(())
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn alloc_try_with_large_tuple_err() {
+    let b = Bump::new();
+
+    assert!(b
+        .alloc_try_with(|| { Result::<(u32, LargeStruct), _>::Err(()) })
+        .is_err());
+}
+
+#[allow(clippy::large_enum_variant)]
+enum LargeEnum {
+    Small,
+    #[allow(dead_code)]
+    Large([u8; 10_000_000]),
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn alloc_try_with_large_enum() -> Result<(), ()> {
+    let b = Bump::new();
+
+    b.alloc_try_with(|| Ok(LargeEnum::Small))?;
+
+    Ok(())
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn alloc_try_with_large_enum_err() {
+    let b = Bump::new();
+
+    assert!(b
+        .alloc_try_with(|| Result::<LargeEnum, _>::Err(()))
+        .is_err());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/alloc_with.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/alloc_with.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/alloc_with.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/alloc_with.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,3 @@
-#![cfg(not(debug_assertions))]
-
 // All of these alloc_with tests will fail with "fatal runtime error: stack overflow" unless LLVM
 // manages to optimize the stack writes away.
 //
@@ -9,6 +7,7 @@
 use bumpalo::Bump;
 
 #[test]
+#[cfg_attr(debug_assertions, ignore)]
 fn alloc_with_large_array() {
     let b = Bump::new();
 
@@ -24,6 +23,7 @@
 }
 
 #[test]
+#[cfg_attr(debug_assertions, ignore)]
 fn alloc_with_large_struct() {
     let b = Bump::new();
 
@@ -36,6 +36,7 @@
 }
 
 #[test]
+#[cfg_attr(debug_assertions, ignore)]
 fn alloc_with_large_tuple() {
     let b = Bump::new();
 
@@ -59,6 +60,7 @@
 }
 
 #[test]
+#[cfg_attr(debug_assertions, ignore)]
 fn alloc_with_large_enum() {
     let b = Bump::new();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/try_alloc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/try_alloc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/try_alloc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/try_alloc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use bumpalo::Bump;
+use bumpalo::{AllocOrInitError, Bump};
 use rand::Rng;
 use std::alloc::{GlobalAlloc, Layout, System};
 use std::sync::atomic::{AtomicBool, Ordering};
@@ -91,6 +91,36 @@
         };
     }
 
+    fn test_static_size_alloc(assert_alloc_ok: fn(bump: &Bump), assert_alloc_err: fn(bump: &Bump)) {
+        // Unlike with `try_alloc_layout`, it's not that easy to test a variety
+        // of size/capacity combinations here.
+        // Since nothing in Bump is really random, and we have to start fresh
+        // each time, just checking each case once is enough.
+        for &fail_alloc in &[false, true] {
+            let bump = GLOBAL_ALLOCATOR.with_successful_allocs(|| {
+                // We can't query the remaining free space in the current chunk,
+                // so we have to create a new Bump for each test and fill it to
+                // the brink of a new allocation.
+                let bump = Bump::try_new().unwrap();
+
+                // Bump preallocates space in the initial chunk, so we need to
+                // use up this block prior to the actual test
+                let layout = Layout::from_size_align(bump.chunk_capacity(), 1).unwrap();
+                assert!(bump.try_alloc_layout(layout).is_ok());
+
+                bump
+            });
+
+            GLOBAL_ALLOCATOR.set_returning_null(fail_alloc);
+
+            if fail_alloc {
+                assert_alloc_err(&bump)
+            } else {
+                assert_alloc_ok(&bump)
+            }
+        }
+    }
+
     let tests = [
         test!("Bump::try_new fails when global allocator fails", || {
             GLOBAL_ALLOCATOR.with_alloc_failures(|| {
@@ -133,6 +163,52 @@
                 }
             },
         ),
+        test!(
+            "test try_alloc with and without global allocation failures",
+            || {
+                test_static_size_alloc(
+                    |bump| assert!(bump.try_alloc(1u8).is_ok()),
+                    |bump| assert!(bump.try_alloc(1u8).is_err()),
+                )
+            },
+        ),
+        test!(
+            "test try_alloc_with with and without global allocation failures",
+            || {
+                test_static_size_alloc(
+                    |bump| assert!(bump.try_alloc_with(|| 1u8).is_ok()),
+                    |bump| assert!(bump.try_alloc_with(|| 1u8).is_err()),
+                )
+            },
+        ),
+        test!(
+            "test try_alloc_try_with (Ok) with and without global allocation failures",
+            || {
+                test_static_size_alloc(
+                    |bump| assert!(bump.try_alloc_try_with::<_, _, ()>(|| Ok(1u8)).is_ok()),
+                    |bump| assert!(bump.try_alloc_try_with::<_, _, ()>(|| Ok(1u8)).is_err()),
+                )
+            },
+        ),
+        test!(
+            "test try_alloc_try_with (Err) with and without global allocation failures",
+            || {
+                test_static_size_alloc(
+                    |bump| {
+                        assert!(matches!(
+                            bump.try_alloc_try_with::<_, u8, _>(|| Err(())),
+                            Err(AllocOrInitError::Init(_))
+                        ))
+                    },
+                    |bump| {
+                        assert!(matches!(
+                            bump.try_alloc_try_with::<_, u8, _>(|| Err(())),
+                            Err(AllocOrInitError::Alloc(_))
+                        ))
+                    },
+                )
+            },
+        ),
         #[cfg(feature = "collections")]
         test!("test Vec::try_reserve and Vec::try_reserve_exact", || {
             use bumpalo::collections::Vec;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/try_alloc_try_with.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/try_alloc_try_with.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/try_alloc_try_with.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/try_alloc_try_with.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,119 @@
+// All of these try_alloc_try_with tests will fail with "fatal runtime error: stack overflow" unless
+// LLVM manages to optimize the stack writes away.
+//
+// We only run them when debug_assertions are not set, as we expect them to fail outside release
+// mode.
+
+use bumpalo::{AllocOrInitError, Bump};
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_try_with_large_array() -> Result<(), AllocOrInitError<()>> {
+    let b = Bump::new();
+
+    b.try_alloc_try_with(|| Ok([4u8; 10_000_000]))?;
+
+    Ok(())
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_try_with_large_array_err() {
+    let b = Bump::new();
+
+    assert!(b
+        .try_alloc_try_with(|| Result::<[u8; 10_000_000], _>::Err(()))
+        .is_err());
+}
+
+#[allow(dead_code)]
+struct LargeStruct {
+    small: usize,
+    big1: [u8; 20_000_000],
+    big2: [u8; 20_000_000],
+    big3: [u8; 20_000_000],
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_try_with_large_struct() -> Result<(), AllocOrInitError<()>> {
+    let b = Bump::new();
+
+    b.try_alloc_try_with(|| {
+        Ok(LargeStruct {
+            small: 1,
+            big1: [2; 20_000_000],
+            big2: [3; 20_000_000],
+            big3: [4; 20_000_000],
+        })
+    })?;
+
+    Ok(())
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_try_with_large_struct_err() {
+    let b = Bump::new();
+
+    assert!(b
+        .try_alloc_try_with(|| Result::<LargeStruct, _>::Err(()))
+        .is_err());
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_try_with_large_tuple() -> Result<(), AllocOrInitError<()>> {
+    let b = Bump::new();
+
+    b.try_alloc_try_with(|| {
+        Ok((
+            1u32,
+            LargeStruct {
+                small: 2,
+                big1: [3; 20_000_000],
+                big2: [4; 20_000_000],
+                big3: [5; 20_000_000],
+            },
+        ))
+    })?;
+
+    Ok(())
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_try_with_large_tuple_err() {
+    let b = Bump::new();
+
+    assert!(b
+        .try_alloc_try_with(|| { Result::<(u32, LargeStruct), _>::Err(()) })
+        .is_err());
+}
+
+#[allow(clippy::large_enum_variant)]
+enum LargeEnum {
+    Small,
+    #[allow(dead_code)]
+    Large([u8; 10_000_000]),
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_try_with_large_enum() -> Result<(), AllocOrInitError<()>> {
+    let b = Bump::new();
+
+    b.try_alloc_try_with(|| Ok(LargeEnum::Small))?;
+
+    Ok(())
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_try_with_large_enum_err() {
+    let b = Bump::new();
+
+    assert!(b
+        .try_alloc_try_with(|| Result::<LargeEnum, _>::Err(()))
+        .is_err());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/try_alloc_with.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/try_alloc_with.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/tests/try_alloc_with.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/tests/try_alloc_with.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,70 @@
+// All of these try_alloc_with tests will fail with "fatal runtime error: stack overflow" unless LLVM
+// manages to optimize the stack writes away.
+//
+// We only run them when debug_assertions are not set, as we expect them to fail outside release
+// mode.
+
+use bumpalo::Bump;
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_with_large_array() {
+    let b = Bump::new();
+
+    b.try_alloc_with(|| [4u8; 10_000_000]).unwrap();
+}
+
+#[allow(dead_code)]
+struct LargeStruct {
+    small: usize,
+    big1: [u8; 20_000_000],
+    big2: [u8; 20_000_000],
+    big3: [u8; 20_000_000],
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_with_large_struct() {
+    let b = Bump::new();
+
+    b.try_alloc_with(|| LargeStruct {
+        small: 1,
+        big1: [2; 20_000_000],
+        big2: [3; 20_000_000],
+        big3: [4; 20_000_000],
+    })
+    .unwrap();
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_with_large_tuple() {
+    let b = Bump::new();
+
+    b.try_alloc_with(|| {
+        (
+            1u32,
+            LargeStruct {
+                small: 2,
+                big1: [3; 20_000_000],
+                big2: [4; 20_000_000],
+                big3: [5; 20_000_000],
+            },
+        )
+    })
+    .unwrap();
+}
+
+enum LargeEnum {
+    Small,
+    #[allow(dead_code)]
+    Large([u8; 10_000_000]),
+}
+
+#[test]
+#[cfg_attr(debug_assertions, ignore)]
+fn try_alloc_with_large_enum() {
+    let b = Bump::new();
+
+    b.try_alloc_with(|| LargeEnum::Small).unwrap();
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/valgrind.supp thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/valgrind.supp
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bumpalo/valgrind.supp	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bumpalo/valgrind.supp	2021-12-09 12:01:26.000000000 +0000
@@ -5,3 +5,31 @@
    fun:malloc
    obj:/**/target/*/deps/tests-*
 }
+{
+   <false positive fixed in valgrind 3.16 and higher part 1>
+   Memcheck:Param
+   statx(buf)
+   fun:syscall
+   fun:statx
+}
+{
+   <false positive fixed in valgrind 3.16 and higher part 2>
+   Memcheck:Param
+   statx(file_name)
+   fun:syscall
+   fun:statx
+}
+{
+   <false positive fixed in valgrind 3.16 and higher part 3>
+   Memcheck:Param
+   statx(buf)
+   fun:statx
+   fun:statx
+}
+{
+   <false positive fixed in valgrind 3.16 and higher part 4>
+   Memcheck:Param
+   statx(file_name)
+   fun:statx
+   fun:statx
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/benches/bench.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,15 @@
 #![feature(test)]
 
-extern crate byteorder;
-extern crate rand;
 extern crate test;
 
 macro_rules! bench_num {
-    ($name:ident, $read:ident, $bytes:expr, $data:expr) => (
+    ($name:ident, $read:ident, $bytes:expr, $data:expr) => {
         mod $name {
-            use byteorder::{ByteOrder, BigEndian, NativeEndian, LittleEndian};
-            use super::test::Bencher;
-            use super::test::black_box as bb;
+            use byteorder::{
+                BigEndian, ByteOrder, LittleEndian, NativeEndian,
+            };
+            use test::black_box as bb;
+            use test::Bencher;
 
             const NITER: usize = 100_000;
 
@@ -43,14 +43,16 @@
                 });
             }
         }
-    );
+    };
     ($ty:ident, $max:ident,
-     $read:ident, $write:ident, $size:expr, $data:expr) => (
+     $read:ident, $write:ident, $size:expr, $data:expr) => {
         mod $ty {
+            use byteorder::{
+                BigEndian, ByteOrder, LittleEndian, NativeEndian,
+            };
             use std::$ty;
-            use byteorder::{ByteOrder, BigEndian, NativeEndian, LittleEndian};
-            use super::test::Bencher;
-            use super::test::black_box as bb;
+            use test::black_box as bb;
+            use test::Bencher;
 
             const NITER: usize = 100_000;
 
@@ -117,7 +119,7 @@
                 });
             }
         }
-    );
+    };
 }
 
 bench_num!(u16, MAX, read_u16, write_u16, 2, [1, 2]);
@@ -127,8 +129,7 @@
 bench_num!(u64, MAX, read_u64, write_u64, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
 bench_num!(i64, MAX, read_i64, write_i64, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
 bench_num!(f32, MAX, read_f32, write_f32, 4, [1, 2, 3, 4]);
-bench_num!(f64, MAX, read_f64, write_f64, 8,
-           [1, 2, 3, 4, 5, 6, 7, 8]);
+bench_num!(f64, MAX, read_f64, write_f64, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
 
 bench_num!(uint_1, read_uint, 1, [1]);
 bench_num!(uint_2, read_uint, 2, [1, 2]);
@@ -148,120 +149,115 @@
 bench_num!(int_7, read_int, 7, [1, 2, 3, 4, 5, 6, 7]);
 bench_num!(int_8, read_int, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
 
-#[cfg(byteorder_i128)]
-bench_num!(u128, MAX, read_u128, write_u128,
-    16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
-#[cfg(byteorder_i128)]
-bench_num!(i128, MAX, read_i128, write_i128,
-    16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
-
-#[cfg(byteorder_i128)]
-bench_num!(uint128_1, read_uint128,
-    1, [1]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_2, read_uint128,
-    2, [1, 2]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_3, read_uint128,
-    3, [1, 2, 3]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_4, read_uint128,
-    4, [1, 2, 3, 4]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_5, read_uint128,
-    5, [1, 2, 3, 4, 5]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_6, read_uint128,
-    6, [1, 2, 3, 4, 5, 6]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_7, read_uint128,
-    7, [1, 2, 3, 4, 5, 6, 7]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_8, read_uint128,
-    8, [1, 2, 3, 4, 5, 6, 7, 8]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_9, read_uint128,
-    9, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_10, read_uint128,
-    10, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_11, read_uint128,
-    11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_12, read_uint128,
-    12, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_13, read_uint128,
-    13, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_14, read_uint128,
-    14, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_15, read_uint128,
-    15, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
-#[cfg(byteorder_i128)]
-bench_num!(uint128_16, read_uint128,
-    16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
-
-#[cfg(byteorder_i128)]
-bench_num!(int128_1, read_int128,
-    1, [1]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_2, read_int128,
-    2, [1, 2]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_3, read_int128,
-    3, [1, 2, 3]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_4, read_int128,
-    4, [1, 2, 3, 4]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_5, read_int128,
-    5, [1, 2, 3, 4, 5]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_6, read_int128,
-    6, [1, 2, 3, 4, 5, 6]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_7, read_int128,
-    7, [1, 2, 3, 4, 5, 6, 7]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_8, read_int128,
-    8, [1, 2, 3, 4, 5, 6, 7, 8]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_9, read_int128,
-    9, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_10, read_int128,
-    10, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_11, read_int128,
-    11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_12, read_int128,
-    12, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_13, read_int128,
-    13, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_14, read_int128,
-    14, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_15, read_int128,
-    15, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
-#[cfg(byteorder_i128)]
-bench_num!(int128_16, read_int128,
-    16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
-
+bench_num!(
+    u128,
+    MAX,
+    read_u128,
+    write_u128,
+    16,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+);
+bench_num!(
+    i128,
+    MAX,
+    read_i128,
+    write_i128,
+    16,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+);
+
+bench_num!(uint128_1, read_uint128, 1, [1]);
+bench_num!(uint128_2, read_uint128, 2, [1, 2]);
+bench_num!(uint128_3, read_uint128, 3, [1, 2, 3]);
+bench_num!(uint128_4, read_uint128, 4, [1, 2, 3, 4]);
+bench_num!(uint128_5, read_uint128, 5, [1, 2, 3, 4, 5]);
+bench_num!(uint128_6, read_uint128, 6, [1, 2, 3, 4, 5, 6]);
+bench_num!(uint128_7, read_uint128, 7, [1, 2, 3, 4, 5, 6, 7]);
+bench_num!(uint128_8, read_uint128, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
+bench_num!(uint128_9, read_uint128, 9, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
+bench_num!(uint128_10, read_uint128, 10, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+bench_num!(uint128_11, read_uint128, 11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+bench_num!(
+    uint128_12,
+    read_uint128,
+    12,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+);
+bench_num!(
+    uint128_13,
+    read_uint128,
+    13,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
+);
+bench_num!(
+    uint128_14,
+    read_uint128,
+    14,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
+);
+bench_num!(
+    uint128_15,
+    read_uint128,
+    15,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+);
+bench_num!(
+    uint128_16,
+    read_uint128,
+    16,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+);
+
+bench_num!(int128_1, read_int128, 1, [1]);
+bench_num!(int128_2, read_int128, 2, [1, 2]);
+bench_num!(int128_3, read_int128, 3, [1, 2, 3]);
+bench_num!(int128_4, read_int128, 4, [1, 2, 3, 4]);
+bench_num!(int128_5, read_int128, 5, [1, 2, 3, 4, 5]);
+bench_num!(int128_6, read_int128, 6, [1, 2, 3, 4, 5, 6]);
+bench_num!(int128_7, read_int128, 7, [1, 2, 3, 4, 5, 6, 7]);
+bench_num!(int128_8, read_int128, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
+bench_num!(int128_9, read_int128, 9, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
+bench_num!(int128_10, read_int128, 10, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+bench_num!(int128_11, read_int128, 11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+bench_num!(
+    int128_12,
+    read_int128,
+    12,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+);
+bench_num!(
+    int128_13,
+    read_int128,
+    13,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
+);
+bench_num!(
+    int128_14,
+    read_int128,
+    14,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
+);
+bench_num!(
+    int128_15,
+    read_int128,
+    15,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+);
+bench_num!(
+    int128_16,
+    read_int128,
+    16,
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+);
 
 macro_rules! bench_slice {
     ($name:ident, $numty:ty, $read:ident, $write:ident) => {
         mod $name {
             use std::mem::size_of;
 
-            use byteorder::{ByteOrder, BigEndian, LittleEndian};
-            use rand::{self, Rng};
+            use byteorder::{BigEndian, ByteOrder, LittleEndian};
             use rand::distributions;
+            use rand::{self, Rng};
             use test::Bencher;
 
             #[bench]
@@ -322,7 +318,7 @@
                 });
             }
         }
-    }
+    };
 }
 
 bench_slice!(slice_u64, u64, read_u64_into, write_u64_into);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-// For the 'try!' macro, until we bump MSRV past 1.12.
-#![allow(deprecated)]
-
-use std::env;
-use std::ffi::OsString;
-use std::io::{self, Write};
-use std::process::Command;
-
-fn main() {
-    let version = match Version::read() {
-        Ok(version) => version,
-        Err(err) => {
-            writeln!(
-                &mut io::stderr(),
-                "failed to parse `rustc --version`: {}",
-                err
-            ).unwrap();
-            return;
-        }
-    };
-    enable_i128(version);
-}
-
-fn enable_i128(version: Version) {
-    if version < (Version { major: 1, minor: 26, patch: 0 }) {
-        return;
-    }
-
-    println!("cargo:rustc-cfg=byteorder_i128");
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
-struct Version {
-    major: u32,
-    minor: u32,
-    patch: u32,
-}
-
-impl Version {
-    fn read() -> Result<Version, String> {
-        let rustc = env::var_os("RUSTC").unwrap_or(OsString::from("rustc"));
-        let output = Command::new(&rustc)
-            .arg("--version")
-            .output()
-            .unwrap()
-            .stdout;
-        Version::parse(&String::from_utf8(output).unwrap())
-    }
-
-    fn parse(mut s: &str) -> Result<Version, String> {
-        if !s.starts_with("rustc ") {
-            return Err(format!("unrecognized version string: {}", s));
-        }
-        s = &s["rustc ".len()..];
-
-        let parts: Vec<&str> = s.split(".").collect();
-        if parts.len() < 3 {
-            return Err(format!("not enough version parts: {:?}", parts));
-        }
-
-        let mut num = String::new();
-        for c in parts[0].chars() {
-            if !c.is_digit(10) {
-                break;
-            }
-            num.push(c);
-        }
-        let major = try!(num.parse::<u32>().map_err(|e| e.to_string()));
-
-        num.clear();
-        for c in parts[1].chars() {
-            if !c.is_digit(10) {
-                break;
-            }
-            num.push(c);
-        }
-        let minor = try!(num.parse::<u32>().map_err(|e| e.to_string()));
-
-        num.clear();
-        for c in parts[2].chars() {
-            if !c.is_digit(10) {
-                break;
-            }
-            num.push(c);
-        }
-        let patch = try!(num.parse::<u32>().map_err(|e| e.to_string()));
-
-        Ok(Version { major: major, minor: minor, patch: patch })
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"51f0eb3b6139fc1a908d41a7b3cba7d58d684700986b3518f82e5af254c39e8e","COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"fb8b84be3b93b1aa065558cf9f8a867e1fc0f9bda8323d686ece79bbcfe50868","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"b2dd89866b56f619661b90e8b3b7d3f741b0a8d5710e229df86843ae0881284f","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","benches/bench.rs":"80e43e07f34bc6d3ebe4f37cea79ba02cafce6cf30b737a1db65de55f2c38ca5","build.rs":"9671089eb30f52975911effd1fa0b30a0ab14473f44a315af0bafd6701dda6da","src/io.rs":"8f22d1b0e01fa4ce9c7c5cd727dbc40ca35c22d9c82fe8d324d9d83d37cdcc4a","src/lib.rs":"c43331d25d0d12e150b64137d6f180ae46a8c41124a374e4f62d2867482bd3d8"},"package":"08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"3a745d94ee9dce0d9dc638c02078cd5001d3d9d12d58b4f220c0101e32cfc16a","COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"8585455e5a0e638cf5d489a21e286e93680f835cb8a13595918b5eb7c8c7f212","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"9d57556868344534de2489317e3c6bb611348ecd44438dcb982bd8d2a55a5a1b","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","benches/bench.rs":"a80bf3cd446c9b6c0cca3865c4de047bdf4644b74cdf696822f8ff87adfa1fca","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/io.rs":"9612530634d0e7ce9887a23836b58c0d972c1f45b05d9ada8355961567075627","src/lib.rs":"813ce6a8beafee3fd4e63325d783108aa02e8c57e412bc97580191d84082fbc9"},"package":"14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,17 +11,17 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.3"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
-build = "build.rs"
 exclude = ["/ci/*"]
 description = "Library for reading/writing numbers in big-endian and little-endian."
 homepage = "https://github.com/BurntSushi/byteorder"
 documentation = "https://docs.rs/byteorder"
 readme = "README.md"
 keywords = ["byte", "endian", "big-endian", "little-endian", "binary"]
-categories = ["encoding", "parsing"]
+categories = ["encoding", "parsing", "no-std"]
 license = "Unlicense OR MIT"
 repository = "https://github.com/BurntSushi/byteorder"
 [profile.bench]
@@ -30,19 +30,14 @@
 [lib]
 name = "byteorder"
 bench = false
-[dev-dependencies.doc-comment]
-version = "0.3"
-
 [dev-dependencies.quickcheck]
-version = "0.8"
+version = "0.9.2"
 default-features = false
 
 [dev-dependencies.rand]
-version = "0.6"
+version = "0.7"
 
 [features]
 default = ["std"]
 i128 = []
 std = []
-[badges.travis-ci]
-repository = "BurntSushi/byteorder"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,28 @@
+1.3.4
+=====
+This patch release squashes deprecation warnings for the `try!` macro, in
+accordance with byteorder's minimum supported Rust version (currently at Rust
+1.12.0).
+
+
+1.3.3
+=====
+This patch release adds `ByteOrder::write_i8_into()` as a simple, safe interface
+for ordinarily unsafe or tedious code.
+
+
+1.3.2
+=====
+This patch release adds `ReadBytesExt::read_i8_into()` as a simple, safe interface
+for ordinarily unsafe or tedious code.
+
+
+1.3.1
+=====
+This minor release performs mostly small internal changes. Going forward, these
+are not going to be incorporated into the changelog.
+
+
 1.3.0
 =====
 This new minor release now enables `i128` support automatically on Rust
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,12 @@
+byteorder
+=========
 This crate provides convenience methods for encoding and decoding
 numbers in either big-endian or little-endian order.
 
-[![Build status](https://api.travis-ci.org/BurntSushi/byteorder.svg)](https://travis-ci.org/BurntSushi/byteorder)
-[![](http://meritbadge.herokuapp.com/byteorder)](https://crates.io/crates/byteorder)
+[![Build status](https://github.com/BurntSushi/byteorder/workflows/ci/badge.svg)](https://github.com/BurntSushi/byteorder/actions)
+[![](https://meritbadge.herokuapp.com/byteorder)](https://crates.io/crates/byteorder)
 
-Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org).
+Dual-licensed under MIT or the [UNLICENSE](https://unlicense.org/).
 
 
 ### Documentation
@@ -27,8 +29,6 @@
 extension methods like so:
 
 ```rust
-extern crate byteorder;
-
 use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian, LittleEndian};
 ```
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/rustfmt.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2 @@
+max_width = 79
+use_small_heuristics = "max"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/src/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/src/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/src/io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/src/io.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,9 @@
-use std::io::{self, Result};
-use std::slice;
+use std::{
+    io::{self, Result},
+    slice,
+};
 
-use ByteOrder;
+use crate::ByteOrder;
 
 /// Extends [`Read`] with methods for reading numbers. (For `std::io`.)
 ///
@@ -52,7 +54,7 @@
     #[inline]
     fn read_u8(&mut self) -> Result<u8> {
         let mut buf = [0; 1];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(buf[0])
     }
 
@@ -82,7 +84,7 @@
     #[inline]
     fn read_i8(&mut self) -> Result<i8> {
         let mut buf = [0; 1];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(buf[0] as i8)
     }
 
@@ -109,7 +111,7 @@
     #[inline]
     fn read_u16<T: ByteOrder>(&mut self) -> Result<u16> {
         let mut buf = [0; 2];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_u16(&buf))
     }
 
@@ -136,7 +138,7 @@
     #[inline]
     fn read_i16<T: ByteOrder>(&mut self) -> Result<i16> {
         let mut buf = [0; 2];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_i16(&buf))
     }
 
@@ -162,7 +164,7 @@
     #[inline]
     fn read_u24<T: ByteOrder>(&mut self) -> Result<u32> {
         let mut buf = [0; 3];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_u24(&buf))
     }
 
@@ -188,7 +190,7 @@
     #[inline]
     fn read_i24<T: ByteOrder>(&mut self) -> Result<i32> {
         let mut buf = [0; 3];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_i24(&buf))
     }
 
@@ -214,7 +216,7 @@
     #[inline]
     fn read_u32<T: ByteOrder>(&mut self) -> Result<u32> {
         let mut buf = [0; 4];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_u32(&buf))
     }
 
@@ -240,7 +242,7 @@
     #[inline]
     fn read_i32<T: ByteOrder>(&mut self) -> Result<i32> {
         let mut buf = [0; 4];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_i32(&buf))
     }
 
@@ -266,7 +268,7 @@
     #[inline]
     fn read_u48<T: ByteOrder>(&mut self) -> Result<u64> {
         let mut buf = [0; 6];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_u48(&buf))
     }
 
@@ -292,7 +294,7 @@
     #[inline]
     fn read_i48<T: ByteOrder>(&mut self) -> Result<i64> {
         let mut buf = [0; 6];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_i48(&buf))
     }
 
@@ -318,7 +320,7 @@
     #[inline]
     fn read_u64<T: ByteOrder>(&mut self) -> Result<u64> {
         let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_u64(&buf))
     }
 
@@ -344,7 +346,7 @@
     #[inline]
     fn read_i64<T: ByteOrder>(&mut self) -> Result<i64> {
         let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_i64(&buf))
     }
 
@@ -370,11 +372,10 @@
     /// ]);
     /// assert_eq!(16947640962301618749969007319746179, rdr.read_u128::<BigEndian>().unwrap());
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128<T: ByteOrder>(&mut self) -> Result<u128> {
         let mut buf = [0; 16];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_u128(&buf))
     }
 
@@ -397,11 +398,10 @@
     /// let mut rdr = Cursor::new(vec![0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
     /// assert_eq!(i128::min_value(), rdr.read_i128::<BigEndian>().unwrap());
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_i128<T: ByteOrder>(&mut self) -> Result<i128> {
         let mut buf = [0; 16];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_i128(&buf))
     }
 
@@ -426,7 +426,7 @@
     #[inline]
     fn read_uint<T: ByteOrder>(&mut self, nbytes: usize) -> Result<u64> {
         let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf[..nbytes]));
+        self.read_exact(&mut buf[..nbytes])?;
         Ok(T::read_uint(&buf[..nbytes], nbytes))
     }
 
@@ -451,25 +451,23 @@
     #[inline]
     fn read_int<T: ByteOrder>(&mut self, nbytes: usize) -> Result<i64> {
         let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf[..nbytes]));
+        self.read_exact(&mut buf[..nbytes])?;
         Ok(T::read_int(&buf[..nbytes], nbytes))
     }
 
     /// Reads an unsigned n-bytes integer from the underlying reader.
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_uint128<T: ByteOrder>(&mut self, nbytes: usize) -> Result<u128> {
         let mut buf = [0; 16];
-        try!(self.read_exact(&mut buf[..nbytes]));
+        self.read_exact(&mut buf[..nbytes])?;
         Ok(T::read_uint128(&buf[..nbytes], nbytes))
     }
 
     /// Reads a signed n-bytes integer from the underlying reader.
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_int128<T: ByteOrder>(&mut self, nbytes: usize) -> Result<i128> {
         let mut buf = [0; 16];
-        try!(self.read_exact(&mut buf[..nbytes]));
+        self.read_exact(&mut buf[..nbytes])?;
         Ok(T::read_int128(&buf[..nbytes], nbytes))
     }
 
@@ -500,7 +498,7 @@
     #[inline]
     fn read_f32<T: ByteOrder>(&mut self) -> Result<f32> {
         let mut buf = [0; 4];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_f32(&buf))
     }
 
@@ -531,7 +529,7 @@
     #[inline]
     fn read_f64<T: ByteOrder>(&mut self) -> Result<f64> {
         let mut buf = [0; 8];
-        try!(self.read_exact(&mut buf));
+        self.read_exact(&mut buf)?;
         Ok(T::read_f64(&buf))
     }
 
@@ -564,7 +562,7 @@
     fn read_u16_into<T: ByteOrder>(&mut self, dst: &mut [u16]) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_u16(dst);
         Ok(())
@@ -599,7 +597,7 @@
     fn read_u32_into<T: ByteOrder>(&mut self, dst: &mut [u32]) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_u32(dst);
         Ok(())
@@ -637,7 +635,7 @@
     fn read_u64_into<T: ByteOrder>(&mut self, dst: &mut [u64]) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_u64(dst);
         Ok(())
@@ -671,7 +669,6 @@
     /// rdr.read_u128_into::<BigEndian>(&mut dst).unwrap();
     /// assert_eq!([517, 768], dst);
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128_into<T: ByteOrder>(
         &mut self,
@@ -679,7 +676,7 @@
     ) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_u128(dst);
         Ok(())
@@ -750,7 +747,7 @@
     fn read_i16_into<T: ByteOrder>(&mut self, dst: &mut [i16]) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_i16(dst);
         Ok(())
@@ -785,7 +782,7 @@
     fn read_i32_into<T: ByteOrder>(&mut self, dst: &mut [i32]) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_i32(dst);
         Ok(())
@@ -823,7 +820,7 @@
     fn read_i64_into<T: ByteOrder>(&mut self, dst: &mut [i64]) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_i64(dst);
         Ok(())
@@ -857,7 +854,6 @@
     /// rdr.read_i128_into::<BigEndian>(&mut dst).unwrap();
     /// assert_eq!([517, 768], dst);
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_i128_into<T: ByteOrder>(
         &mut self,
@@ -865,7 +861,7 @@
     ) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_i128(dst);
         Ok(())
@@ -903,13 +899,10 @@
     /// assert_eq!([f32::consts::PI, 1.0], dst);
     /// ```
     #[inline]
-    fn read_f32_into<T: ByteOrder>(
-        &mut self,
-        dst: &mut [f32],
-    ) -> Result<()> {
+    fn read_f32_into<T: ByteOrder>(&mut self, dst: &mut [f32]) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_f32(dst);
         Ok(())
@@ -951,7 +944,7 @@
     /// assert_eq!([f32::consts::PI, 1.0], dst);
     /// ```
     #[inline]
-    #[deprecated(since="1.2.0", note="please use `read_f32_into` instead")]
+    #[deprecated(since = "1.2.0", note = "please use `read_f32_into` instead")]
     fn read_f32_into_unchecked<T: ByteOrder>(
         &mut self,
         dst: &mut [f32],
@@ -991,13 +984,10 @@
     /// assert_eq!([f64::consts::PI, 1.0], dst);
     /// ```
     #[inline]
-    fn read_f64_into<T: ByteOrder>(
-        &mut self,
-        dst: &mut [f64],
-    ) -> Result<()> {
+    fn read_f64_into<T: ByteOrder>(&mut self, dst: &mut [f64]) -> Result<()> {
         {
             let buf = unsafe { slice_to_u8_mut(dst) };
-            try!(self.read_exact(buf));
+            self.read_exact(buf)?;
         }
         T::from_slice_f64(dst);
         Ok(())
@@ -1045,7 +1035,7 @@
     /// assert_eq!([f64::consts::PI, 1.0], dst);
     /// ```
     #[inline]
-    #[deprecated(since="1.2.0", note="please use `read_f64_into` instead")]
+    #[deprecated(since = "1.2.0", note = "please use `read_f64_into` instead")]
     fn read_f64_into_unchecked<T: ByteOrder>(
         &mut self,
         dst: &mut [f64],
@@ -1408,7 +1398,6 @@
     }
 
     /// Writes an unsigned 128 bit integer to the underlying writer.
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128<T: ByteOrder>(&mut self, n: u128) -> Result<()> {
         let mut buf = [0; 16];
@@ -1417,7 +1406,6 @@
     }
 
     /// Writes a signed 128 bit integer to the underlying writer.
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_i128<T: ByteOrder>(&mut self, n: i128) -> Result<()> {
         let mut buf = [0; 16];
@@ -1501,7 +1489,6 @@
     ///
     /// If the given integer is not representable in the given number of bytes,
     /// this method panics. If `nbytes > 16`, this method panics.
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_uint128<T: ByteOrder>(
         &mut self,
@@ -1517,7 +1504,6 @@
     ///
     /// If the given integer is not representable in the given number of bytes,
     /// this method panics. If `nbytes > 16`, this method panics.
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_int128<T: ByteOrder>(
         &mut self,
@@ -1596,7 +1582,8 @@
 /// representation.
 ///
 /// This function is wildly unsafe because it permits arbitrary modification of
-/// the binary representation of any `Copy` type. Use with care.
+/// the binary representation of any `Copy` type. Use with care. It's intended
+/// to be called only where `T` is a numeric type.
 unsafe fn slice_to_u8_mut<T: Copy>(slice: &mut [T]) -> &mut [u8] {
     use std::mem::size_of;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byteorder/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byteorder/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -67,29 +67,15 @@
 [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
 */
 
-// For the 'try!' macro, until we bump MSRV past 1.12.
-#![allow(deprecated)]
-
 #![deny(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(feature = "std")]
-extern crate core;
-
-#[cfg(test)]
-#[macro_use]
-extern crate doc_comment;
-
-#[cfg(test)]
-doctest!("../README.md");
-
-use core::fmt::Debug;
-use core::hash::Hash;
-use core::ptr::copy_nonoverlapping;
-use core::slice;
+use core::{
+    convert::TryInto, fmt::Debug, hash::Hash, ptr::copy_nonoverlapping, slice,
+};
 
 #[cfg(feature = "std")]
-pub use io::{ReadBytesExt, WriteBytesExt};
+pub use crate::io::{ReadBytesExt, WriteBytesExt};
 
 #[cfg(feature = "std")]
 mod io;
@@ -100,7 +86,6 @@
     (val << shift) as i64 >> shift
 }
 
-#[cfg(byteorder_i128)]
 #[inline]
 fn extend_sign128(val: u128, nbytes: usize) -> i128 {
     let shift = (16 - nbytes) * 8;
@@ -113,7 +98,6 @@
     (val << shift) as u64 >> shift
 }
 
-#[cfg(byteorder_i128)]
 #[inline]
 fn unextend_sign128(val: i128, nbytes: usize) -> u128 {
     let shift = (16 - nbytes) * 8;
@@ -141,7 +125,6 @@
     }
 }
 
-#[cfg(byteorder_i128)]
 #[inline]
 fn pack_size128(n: u128) -> usize {
     if n < 1 << 8 {
@@ -182,7 +165,7 @@
 mod private {
     /// Sealed stops crates other than byteorder from implementing any traits
     /// that use it.
-    pub trait Sealed{}
+    pub trait Sealed {}
     impl Sealed for super::LittleEndian {}
     impl Sealed for super::BigEndian {}
 }
@@ -222,8 +205,16 @@
 ///
 /// [`BigEndian`]: enum.BigEndian.html
 /// [`LittleEndian`]: enum.LittleEndian.html
-pub trait ByteOrder
-    : Clone + Copy + Debug + Default + Eq + Hash + Ord + PartialEq + PartialOrd
+pub trait ByteOrder:
+    Clone
+    + Copy
+    + Debug
+    + Default
+    + Eq
+    + Hash
+    + Ord
+    + PartialEq
+    + PartialOrd
     + private::Sealed
 {
     /// Reads an unsigned 16 bit integer from `buf`.
@@ -330,7 +321,6 @@
     /// LittleEndian::write_u128(&mut buf, 1_000_000);
     /// assert_eq!(1_000_000, LittleEndian::read_u128(&buf));
     /// ```
-    #[cfg(byteorder_i128)]
     fn read_u128(buf: &[u8]) -> u128;
 
     /// Reads an unsigned n-bytes integer from `buf`.
@@ -371,7 +361,6 @@
     /// LittleEndian::write_uint128(&mut buf, 1_000_000, 3);
     /// assert_eq!(1_000_000, LittleEndian::read_uint128(&buf, 3));
     /// ```
-    #[cfg(byteorder_i128)]
     fn read_uint128(buf: &[u8], nbytes: usize) -> u128;
 
     /// Writes an unsigned 16 bit integer `n` to `buf`.
@@ -490,7 +479,6 @@
     /// LittleEndian::write_u128(&mut buf, 1_000_000);
     /// assert_eq!(1_000_000, LittleEndian::read_u128(&buf));
     /// ```
-    #[cfg(byteorder_i128)]
     fn write_u128(buf: &mut [u8], n: u128);
 
     /// Writes an unsigned integer `n` to `buf` using only `nbytes`.
@@ -531,7 +519,6 @@
     /// LittleEndian::write_uint128(&mut buf, 1_000_000, 3);
     /// assert_eq!(1_000_000, LittleEndian::read_uint128(&buf, 3));
     /// ```
-    #[cfg(byteorder_i128)]
     fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize);
 
     /// Reads a signed 16 bit integer from `buf`.
@@ -661,7 +648,6 @@
     /// LittleEndian::write_i128(&mut buf, -1_000_000_000);
     /// assert_eq!(-1_000_000_000, LittleEndian::read_i128(&buf));
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_i128(buf: &[u8]) -> i128 {
         Self::read_u128(buf) as i128
@@ -708,7 +694,6 @@
     /// LittleEndian::write_int128(&mut buf, -1_000, 3);
     /// assert_eq!(-1_000, LittleEndian::read_int128(&buf, 3));
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_int128(buf: &[u8], nbytes: usize) -> i128 {
         extend_sign128(Self::read_uint128(buf, nbytes), nbytes)
@@ -734,7 +719,7 @@
     /// ```
     #[inline]
     fn read_f32(buf: &[u8]) -> f32 {
-        unsafe { *(&Self::read_u32(buf) as *const u32 as *const f32) }
+        f32::from_bits(Self::read_u32(buf))
     }
 
     /// Reads a IEEE754 double-precision (8 bytes) floating point number.
@@ -757,7 +742,7 @@
     /// ```
     #[inline]
     fn read_f64(buf: &[u8]) -> f64 {
-        unsafe { *(&Self::read_u64(buf) as *const u64 as *const f64) }
+        f64::from_bits(Self::read_u64(buf))
     }
 
     /// Writes a signed 16 bit integer `n` to `buf`.
@@ -887,7 +872,6 @@
     /// LittleEndian::write_i128(&mut buf, -1_000_000_000);
     /// assert_eq!(-1_000_000_000, LittleEndian::read_i128(&buf));
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_i128(buf: &mut [u8], n: i128) {
         Self::write_u128(buf, n as u128)
@@ -934,7 +918,6 @@
     /// LittleEndian::write_int128(&mut buf, -1_000, 3);
     /// assert_eq!(-1_000, LittleEndian::read_int128(&buf, 3));
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_int128(buf: &mut [u8], n: i128, nbytes: usize) {
         Self::write_uint128(buf, unextend_sign128(n, nbytes), nbytes)
@@ -960,8 +943,7 @@
     /// ```
     #[inline]
     fn write_f32(buf: &mut [u8], n: f32) {
-        let n = unsafe { *(&n as *const f32 as *const u32) };
-        Self::write_u32(buf, n)
+        Self::write_u32(buf, n.to_bits())
     }
 
     /// Writes a IEEE754 double-precision (8 bytes) floating point number.
@@ -984,8 +966,7 @@
     /// ```
     #[inline]
     fn write_f64(buf: &mut [u8], n: f64) {
-        let n = unsafe { *(&n as *const f64 as *const u64) };
-        Self::write_u64(buf, n)
+        Self::write_u64(buf, n.to_bits())
     }
 
     /// Reads unsigned 16 bit integers from `src` into `dst`.
@@ -1078,7 +1059,6 @@
     /// LittleEndian::read_u128_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
-    #[cfg(byteorder_i128)]
     fn read_u128_into(src: &[u8], dst: &mut [u128]);
 
     /// Reads signed 16 bit integers from `src` to `dst`.
@@ -1189,7 +1169,6 @@
     /// LittleEndian::read_i128_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_i128_into(src: &[u8], dst: &mut [i128]) {
         let dst = unsafe {
@@ -1254,7 +1233,7 @@
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
     #[inline]
-    #[deprecated(since="1.3.0", note="please use `read_f32_into` instead")]
+    #[deprecated(since = "1.3.0", note = "please use `read_f32_into` instead")]
     fn read_f32_into_unchecked(src: &[u8], dst: &mut [f32]) {
         Self::read_f32_into(src, dst);
     }
@@ -1316,7 +1295,7 @@
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
     #[inline]
-    #[deprecated(since="1.3.0", note="please use `read_f64_into` instead")]
+    #[deprecated(since = "1.3.0", note = "please use `read_f64_into` instead")]
     fn read_f64_into_unchecked(src: &[u8], dst: &mut [f64]) {
         Self::read_f64_into(src, dst);
     }
@@ -1411,7 +1390,6 @@
     /// LittleEndian::read_u128_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
-    #[cfg(byteorder_i128)]
     fn write_u128_into(src: &[u128], dst: &mut [u8]);
 
     /// Writes signed 8 bit integers from `src` into `dst`.
@@ -1553,7 +1531,6 @@
     /// LittleEndian::read_i128_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
-    #[cfg(byteorder_i128)]
     fn write_i128_into(src: &[i128], dst: &mut [u8]) {
         let src = unsafe {
             slice::from_raw_parts(src.as_ptr() as *const u128, src.len())
@@ -1580,9 +1557,7 @@
     /// LittleEndian::write_f32_into(&numbers_given, &mut bytes);
     ///
     /// let mut numbers_got = [0.0; 4];
-    /// unsafe {
-    ///     LittleEndian::read_f32_into(&bytes, &mut numbers_got);
-    /// }
+    /// LittleEndian::read_f32_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
     fn write_f32_into(src: &[f32], dst: &mut [u8]) {
@@ -1611,9 +1586,7 @@
     /// LittleEndian::write_f64_into(&numbers_given, &mut bytes);
     ///
     /// let mut numbers_got = [0.0; 4];
-    /// unsafe {
-    ///     LittleEndian::read_f64_into(&bytes, &mut numbers_got);
-    /// }
+    /// LittleEndian::read_f64_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
     fn write_f64_into(src: &[f64], dst: &mut [u8]) {
@@ -1697,7 +1670,6 @@
     /// BigEndian::from_slice_u128(&mut numbers);
     /// assert_eq!(numbers, [5u128.to_be(), 65000u128.to_be()]);
     /// ```
-    #[cfg(byteorder_i128)]
     fn from_slice_u128(numbers: &mut [u128]);
 
     /// Converts the given slice of signed 16 bit integers to a particular
@@ -1720,7 +1692,7 @@
     #[inline]
     fn from_slice_i16(src: &mut [i16]) {
         let src = unsafe {
-            slice::from_raw_parts_mut(src.as_ptr() as *mut u16, src.len())
+            slice::from_raw_parts_mut(src.as_mut_ptr() as *mut u16, src.len())
         };
         Self::from_slice_u16(src);
     }
@@ -1745,7 +1717,7 @@
     #[inline]
     fn from_slice_i32(src: &mut [i32]) {
         let src = unsafe {
-            slice::from_raw_parts_mut(src.as_ptr() as *mut u32, src.len())
+            slice::from_raw_parts_mut(src.as_mut_ptr() as *mut u32, src.len())
         };
         Self::from_slice_u32(src);
     }
@@ -1770,7 +1742,7 @@
     #[inline]
     fn from_slice_i64(src: &mut [i64]) {
         let src = unsafe {
-            slice::from_raw_parts_mut(src.as_ptr() as *mut u64, src.len())
+            slice::from_raw_parts_mut(src.as_mut_ptr() as *mut u64, src.len())
         };
         Self::from_slice_u64(src);
     }
@@ -1792,11 +1764,10 @@
     /// BigEndian::from_slice_i128(&mut numbers);
     /// assert_eq!(numbers, [5i128.to_be(), 65000i128.to_be()]);
     /// ```
-    #[cfg(byteorder_i128)]
     #[inline]
     fn from_slice_i128(src: &mut [i128]) {
         let src = unsafe {
-            slice::from_raw_parts_mut(src.as_ptr() as *mut u128, src.len())
+            slice::from_raw_parts_mut(src.as_mut_ptr() as *mut u128, src.len())
         };
         Self::from_slice_u128(src);
     }
@@ -1924,33 +1895,30 @@
 #[cfg(target_endian = "big")]
 pub type NativeEndian = BigEndian;
 
-macro_rules! read_num_bytes {
-    ($ty:ty, $size:expr, $src:expr, $which:ident) => ({
-        assert!($size == ::core::mem::size_of::<$ty>());
-        assert!($size <= $src.len());
-        let mut data: $ty = 0;
-        unsafe {
-            copy_nonoverlapping(
-                $src.as_ptr(),
-                &mut data as *mut $ty as *mut u8,
-                $size);
-        }
-        data.$which()
-    });
-}
-
-macro_rules! write_num_bytes {
-    ($ty:ty, $size:expr, $n:expr, $dst:expr, $which:ident) => ({
+/// Copies $size bytes from a number $n to a &mut [u8] $dst. $ty represents the
+/// numeric type of $n and $which must be either to_be or to_le, depending on
+/// which endianness one wants to use when writing to $dst.
+///
+/// This macro is only safe to call when $ty is a numeric type and $size ==
+/// size_of::<$ty>() and where $dst is a &mut [u8].
+macro_rules! unsafe_write_num_bytes {
+    ($ty:ty, $size:expr, $n:expr, $dst:expr, $which:ident) => {{
         assert!($size <= $dst.len());
         unsafe {
             // N.B. https://github.com/rust-lang/rust/issues/22776
             let bytes = *(&$n.$which() as *const _ as *const [u8; $size]);
             copy_nonoverlapping((&bytes).as_ptr(), $dst.as_mut_ptr(), $size);
         }
-    });
+    }};
 }
 
-macro_rules! read_slice {
+/// Copies a &[u8] $src into a &mut [<numeric>] $dst for the endianness given
+/// by $which (must be either to_be or to_le).
+///
+/// This macro is only safe to call when $src and $dst are &[u8] and &mut [u8],
+/// respectively. The macro will panic if $src.len() != $size * $dst.len(),
+/// where $size represents the size of the integers encoded in $src.
+macro_rules! unsafe_read_slice {
     ($src:expr, $dst:expr, $size:expr, $which:ident) => {{
         assert_eq!($src.len(), $size * $dst.len());
 
@@ -1958,7 +1926,8 @@
             copy_nonoverlapping(
                 $src.as_ptr(),
                 $dst.as_mut_ptr() as *mut u8,
-                $src.len());
+                $src.len(),
+            );
         }
         for v in $dst.iter_mut() {
             *v = v.$which();
@@ -1966,51 +1935,57 @@
     }};
 }
 
-macro_rules! write_slice_native {
-    ($src:expr, $dst:expr, $ty:ty, $size:expr) => {{
-        assert!($size == ::core::mem::size_of::<$ty>());
-        assert_eq!($size * $src.len(), $dst.len());
+/// Copies a &[$ty] $src into a &mut [u8] $dst, where $ty must be a numeric
+/// type. This panics if size_of::<$ty>() * $src.len() != $dst.len().
+///
+/// This macro is only safe to call when $src is a slice of numeric types and
+/// $dst is a &mut [u8] and where $ty represents the type of the integers in
+/// $src.
+macro_rules! unsafe_write_slice_native {
+    ($src:expr, $dst:expr, $ty:ty) => {{
+        let size = core::mem::size_of::<$ty>();
+        assert_eq!(size * $src.len(), $dst.len());
 
         unsafe {
             copy_nonoverlapping(
                 $src.as_ptr() as *const u8,
                 $dst.as_mut_ptr(),
-                $dst.len());
+                $dst.len(),
+            );
         }
     }};
 }
 
 macro_rules! write_slice {
-    ($src:expr, $dst:expr, $ty:ty, $size:expr, $write:expr) => ({
+    ($src:expr, $dst:expr, $ty:ty, $size:expr, $write:expr) => {{
         assert!($size == ::core::mem::size_of::<$ty>());
         assert_eq!($size * $src.len(), $dst.len());
 
         for (&n, chunk) in $src.iter().zip($dst.chunks_mut($size)) {
             $write(chunk, n);
         }
-    });
+    }};
 }
 
 impl ByteOrder for BigEndian {
     #[inline]
     fn read_u16(buf: &[u8]) -> u16 {
-        read_num_bytes!(u16, 2, buf, to_be)
+        u16::from_be_bytes(buf[..2].try_into().unwrap())
     }
 
     #[inline]
     fn read_u32(buf: &[u8]) -> u32 {
-        read_num_bytes!(u32, 4, buf, to_be)
+        u32::from_be_bytes(buf[..4].try_into().unwrap())
     }
 
     #[inline]
     fn read_u64(buf: &[u8]) -> u64 {
-        read_num_bytes!(u64, 8, buf, to_be)
+        u64::from_be_bytes(buf[..8].try_into().unwrap())
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128(buf: &[u8]) -> u128 {
-        read_num_bytes!(u128, 16, buf, to_be)
+        u128::from_be_bytes(buf[..16].try_into().unwrap())
     }
 
     #[inline]
@@ -2020,12 +1995,14 @@
         let ptr_out = &mut out as *mut u64 as *mut u8;
         unsafe {
             copy_nonoverlapping(
-                buf.as_ptr(), ptr_out.offset((8 - nbytes) as isize), nbytes);
+                buf.as_ptr(),
+                ptr_out.offset((8 - nbytes) as isize),
+                nbytes,
+            );
         }
         out.to_be()
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_uint128(buf: &[u8], nbytes: usize) -> u128 {
         assert!(1 <= nbytes && nbytes <= 16 && nbytes <= buf.len());
@@ -2033,30 +2010,32 @@
         let ptr_out = &mut out as *mut u128 as *mut u8;
         unsafe {
             copy_nonoverlapping(
-                buf.as_ptr(), ptr_out.offset((16 - nbytes) as isize), nbytes);
+                buf.as_ptr(),
+                ptr_out.offset((16 - nbytes) as isize),
+                nbytes,
+            );
         }
         out.to_be()
     }
 
     #[inline]
     fn write_u16(buf: &mut [u8], n: u16) {
-        write_num_bytes!(u16, 2, n, buf, to_be);
+        unsafe_write_num_bytes!(u16, 2, n, buf, to_be);
     }
 
     #[inline]
     fn write_u32(buf: &mut [u8], n: u32) {
-        write_num_bytes!(u32, 4, n, buf, to_be);
+        unsafe_write_num_bytes!(u32, 4, n, buf, to_be);
     }
 
     #[inline]
     fn write_u64(buf: &mut [u8], n: u64) {
-        write_num_bytes!(u64, 8, n, buf, to_be);
+        unsafe_write_num_bytes!(u64, 8, n, buf, to_be);
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128(buf: &mut [u8], n: u128) {
-        write_num_bytes!(u128, 16, n, buf, to_be);
+        unsafe_write_num_bytes!(u128, 16, n, buf, to_be);
     }
 
     #[inline]
@@ -2068,11 +2047,11 @@
             copy_nonoverlapping(
                 bytes.as_ptr().offset((8 - nbytes) as isize),
                 buf.as_mut_ptr(),
-                nbytes);
+                nbytes,
+            );
         }
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize) {
         assert!(pack_size128(n) <= nbytes && nbytes <= 16);
@@ -2082,35 +2061,35 @@
             copy_nonoverlapping(
                 bytes.as_ptr().offset((16 - nbytes) as isize),
                 buf.as_mut_ptr(),
-                nbytes);
+                nbytes,
+            );
         }
     }
 
     #[inline]
     fn read_u16_into(src: &[u8], dst: &mut [u16]) {
-        read_slice!(src, dst, 2, to_be);
+        unsafe_read_slice!(src, dst, 2, to_be);
     }
 
     #[inline]
     fn read_u32_into(src: &[u8], dst: &mut [u32]) {
-        read_slice!(src, dst, 4, to_be);
+        unsafe_read_slice!(src, dst, 4, to_be);
     }
 
     #[inline]
     fn read_u64_into(src: &[u8], dst: &mut [u64]) {
-        read_slice!(src, dst, 8, to_be);
+        unsafe_read_slice!(src, dst, 8, to_be);
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128_into(src: &[u8], dst: &mut [u128]) {
-        read_slice!(src, dst, 16, to_be);
+        unsafe_read_slice!(src, dst, 16, to_be);
     }
 
     #[inline]
     fn write_u16_into(src: &[u16], dst: &mut [u8]) {
         if cfg!(target_endian = "big") {
-            write_slice_native!(src, dst, u16, 2);
+            unsafe_write_slice_native!(src, dst, u16);
         } else {
             write_slice!(src, dst, u16, 2, Self::write_u16);
         }
@@ -2119,7 +2098,7 @@
     #[inline]
     fn write_u32_into(src: &[u32], dst: &mut [u8]) {
         if cfg!(target_endian = "big") {
-            write_slice_native!(src, dst, u32, 4);
+            unsafe_write_slice_native!(src, dst, u32);
         } else {
             write_slice!(src, dst, u32, 4, Self::write_u32);
         }
@@ -2128,17 +2107,16 @@
     #[inline]
     fn write_u64_into(src: &[u64], dst: &mut [u8]) {
         if cfg!(target_endian = "big") {
-            write_slice_native!(src, dst, u64, 8);
+            unsafe_write_slice_native!(src, dst, u64);
         } else {
             write_slice!(src, dst, u64, 8, Self::write_u64);
         }
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128_into(src: &[u128], dst: &mut [u8]) {
         if cfg!(target_endian = "big") {
-            write_slice_native!(src, dst, u128, 16);
+            unsafe_write_slice_native!(src, dst, u128);
         } else {
             write_slice!(src, dst, u128, 16, Self::write_u128);
         }
@@ -2171,7 +2149,6 @@
         }
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn from_slice_u128(numbers: &mut [u128]) {
         if cfg!(target_endian = "little") {
@@ -2209,23 +2186,22 @@
 impl ByteOrder for LittleEndian {
     #[inline]
     fn read_u16(buf: &[u8]) -> u16 {
-        read_num_bytes!(u16, 2, buf, to_le)
+        u16::from_le_bytes(buf[..2].try_into().unwrap())
     }
 
     #[inline]
     fn read_u32(buf: &[u8]) -> u32 {
-        read_num_bytes!(u32, 4, buf, to_le)
+        u32::from_le_bytes(buf[..4].try_into().unwrap())
     }
 
     #[inline]
     fn read_u64(buf: &[u8]) -> u64 {
-        read_num_bytes!(u64, 8, buf, to_le)
+        u64::from_le_bytes(buf[..8].try_into().unwrap())
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128(buf: &[u8]) -> u128 {
-        read_num_bytes!(u128, 16, buf, to_le)
+        u128::from_le_bytes(buf[..16].try_into().unwrap())
     }
 
     #[inline]
@@ -2239,7 +2215,6 @@
         out.to_le()
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_uint128(buf: &[u8], nbytes: usize) -> u128 {
         assert!(1 <= nbytes && nbytes <= 16 && nbytes <= buf.len());
@@ -2253,23 +2228,22 @@
 
     #[inline]
     fn write_u16(buf: &mut [u8], n: u16) {
-        write_num_bytes!(u16, 2, n, buf, to_le);
+        unsafe_write_num_bytes!(u16, 2, n, buf, to_le);
     }
 
     #[inline]
     fn write_u32(buf: &mut [u8], n: u32) {
-        write_num_bytes!(u32, 4, n, buf, to_le);
+        unsafe_write_num_bytes!(u32, 4, n, buf, to_le);
     }
 
     #[inline]
     fn write_u64(buf: &mut [u8], n: u64) {
-        write_num_bytes!(u64, 8, n, buf, to_le);
+        unsafe_write_num_bytes!(u64, 8, n, buf, to_le);
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128(buf: &mut [u8], n: u128) {
-        write_num_bytes!(u128, 16, n, buf, to_le);
+        unsafe_write_num_bytes!(u128, 16, n, buf, to_le);
     }
 
     #[inline]
@@ -2282,7 +2256,6 @@
         }
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize) {
         assert!(pack_size128(n as u128) <= nbytes && nbytes <= 16);
@@ -2295,29 +2268,28 @@
 
     #[inline]
     fn read_u16_into(src: &[u8], dst: &mut [u16]) {
-        read_slice!(src, dst, 2, to_le);
+        unsafe_read_slice!(src, dst, 2, to_le);
     }
 
     #[inline]
     fn read_u32_into(src: &[u8], dst: &mut [u32]) {
-        read_slice!(src, dst, 4, to_le);
+        unsafe_read_slice!(src, dst, 4, to_le);
     }
 
     #[inline]
     fn read_u64_into(src: &[u8], dst: &mut [u64]) {
-        read_slice!(src, dst, 8, to_le);
+        unsafe_read_slice!(src, dst, 8, to_le);
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128_into(src: &[u8], dst: &mut [u128]) {
-        read_slice!(src, dst, 16, to_le);
+        unsafe_read_slice!(src, dst, 16, to_le);
     }
 
     #[inline]
     fn write_u16_into(src: &[u16], dst: &mut [u8]) {
         if cfg!(target_endian = "little") {
-            write_slice_native!(src, dst, u16, 2);
+            unsafe_write_slice_native!(src, dst, u16);
         } else {
             write_slice!(src, dst, u16, 2, Self::write_u16);
         }
@@ -2326,7 +2298,7 @@
     #[inline]
     fn write_u32_into(src: &[u32], dst: &mut [u8]) {
         if cfg!(target_endian = "little") {
-            write_slice_native!(src, dst, u32, 4);
+            unsafe_write_slice_native!(src, dst, u32);
         } else {
             write_slice!(src, dst, u32, 4, Self::write_u32);
         }
@@ -2335,17 +2307,16 @@
     #[inline]
     fn write_u64_into(src: &[u64], dst: &mut [u8]) {
         if cfg!(target_endian = "little") {
-            write_slice_native!(src, dst, u64, 8);
+            unsafe_write_slice_native!(src, dst, u64);
         } else {
             write_slice!(src, dst, u64, 8, Self::write_u64);
         }
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128_into(src: &[u128], dst: &mut [u8]) {
         if cfg!(target_endian = "little") {
-            write_slice_native!(src, dst, u128, 16);
+            unsafe_write_slice_native!(src, dst, u128);
         } else {
             write_slice!(src, dst, u128, 16, Self::write_u128);
         }
@@ -2378,7 +2349,6 @@
         }
     }
 
-    #[cfg(byteorder_i128)]
     #[inline]
     fn from_slice_u128(numbers: &mut [u128]) {
         if cfg!(target_endian = "big") {
@@ -2415,15 +2385,8 @@
 
 #[cfg(test)]
 mod test {
-    extern crate quickcheck;
-    extern crate rand;
-
-    use self::quickcheck::{QuickCheck, StdGen, Testable};
-    use self::rand::thread_rng;
-    #[cfg(byteorder_i128)]
-    use self::rand::Rng;
-    #[cfg(byteorder_i128)]
-    use self::quickcheck::{Arbitrary, Gen};
+    use quickcheck::{Arbitrary, Gen, QuickCheck, StdGen, Testable};
+    use rand::{thread_rng, Rng};
 
     pub const U24_MAX: u32 = 16_777_215;
     pub const I24_MAX: i32 = 8_388_607;
@@ -2434,7 +2397,9 @@
     pub const I64_MAX: u64 = ::core::i64::MAX as u64;
 
     macro_rules! calc_max {
-        ($max:expr, $bytes:expr) => { calc_max!($max, $bytes, 8) };
+        ($max:expr, $bytes:expr) => {
+            calc_max!($max, $bytes, 8)
+        };
         ($max:expr, $bytes:expr, $maxbytes:expr) => {
             ($max - 1) >> (8 * ($maxbytes - $bytes))
         };
@@ -2443,7 +2408,6 @@
     #[derive(Clone, Debug)]
     pub struct Wi128<T>(pub T);
 
-    #[cfg(byteorder_i128)]
     impl<T: Clone> Wi128<T> {
         pub fn clone(&self) -> T {
             self.0.clone()
@@ -2456,24 +2420,20 @@
         }
     }
 
-    #[cfg(byteorder_i128)]
     impl Arbitrary for Wi128<u128> {
         fn arbitrary<G: Gen>(gen: &mut G) -> Wi128<u128> {
             let max = calc_max!(::core::u128::MAX, gen.size(), 16);
-            let output =
-                (gen.gen::<u64>() as u128) |
-                ((gen.gen::<u64>() as u128) << 64);
+            let output = (gen.gen::<u64>() as u128)
+                | ((gen.gen::<u64>() as u128) << 64);
             Wi128(output & (max - 1))
         }
     }
 
-    #[cfg(byteorder_i128)]
     impl Arbitrary for Wi128<i128> {
         fn arbitrary<G: Gen>(gen: &mut G) -> Wi128<i128> {
             let max = calc_max!(::core::i128::MAX, gen.size(), 16);
-            let output =
-                (gen.gen::<i64>() as i128) |
-                ((gen.gen::<i64>() as i128) << 64);
+            let output = (gen.gen::<i64>() as i128)
+                | ((gen.gen::<i64>() as i128) << 64);
             Wi128(output & (max - 1))
         }
     }
@@ -2488,10 +2448,13 @@
 
     macro_rules! qc_byte_order {
         ($name:ident, $ty_int:ty, $max:expr,
-         $bytes:expr, $read:ident, $write:ident) => (
+         $bytes:expr, $read:ident, $write:ident) => {
             mod $name {
-                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
-                #[allow(unused_imports)] use super::{ qc_sized, Wi128 };
+                #[allow(unused_imports)]
+                use super::{qc_sized, Wi128};
+                use crate::{
+                    BigEndian, ByteOrder, LittleEndian, NativeEndian,
+                };
 
                 #[test]
                 fn big_endian() {
@@ -2523,13 +2486,16 @@
                     qc_sized(prop as fn($ty_int) -> bool, $max);
                 }
             }
-        );
+        };
         ($name:ident, $ty_int:ty, $max:expr,
-         $read:ident, $write:ident) => (
+         $read:ident, $write:ident) => {
             mod $name {
+                #[allow(unused_imports)]
+                use super::{qc_sized, Wi128};
+                use crate::{
+                    BigEndian, ByteOrder, LittleEndian, NativeEndian,
+                };
                 use core::mem::size_of;
-                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
-                #[allow(unused_imports)] use super::{ qc_sized, Wi128 };
 
                 #[test]
                 fn big_endian() {
@@ -2564,159 +2530,484 @@
                     qc_sized(prop as fn($ty_int) -> bool, $max - 1);
                 }
             }
-        );
+        };
     }
 
-    qc_byte_order!(prop_u16, u16, ::core::u16::MAX as u64, read_u16, write_u16);
-    qc_byte_order!(prop_i16, i16, ::core::i16::MAX as u64, read_i16, write_i16);
-    qc_byte_order!(prop_u24, u32, ::test::U24_MAX as u64, read_u24, write_u24);
-    qc_byte_order!(prop_i24, i32, ::test::I24_MAX as u64, read_i24, write_i24);
-    qc_byte_order!(prop_u32, u32, ::core::u32::MAX as u64, read_u32, write_u32);
-    qc_byte_order!(prop_i32, i32, ::core::i32::MAX as u64, read_i32, write_i32);
-    qc_byte_order!(prop_u48, u64, ::test::U48_MAX as u64, read_u48, write_u48);
-    qc_byte_order!(prop_i48, i64, ::test::I48_MAX as u64, read_i48, write_i48);
-    qc_byte_order!(prop_u64, u64, ::core::u64::MAX as u64, read_u64, write_u64);
-    qc_byte_order!(prop_i64, i64, ::core::i64::MAX as u64, read_i64, write_i64);
-    qc_byte_order!(prop_f32, f32, ::core::u64::MAX as u64, read_f32, write_f32);
-    qc_byte_order!(prop_f64, f64, ::core::i64::MAX as u64, read_f64, write_f64);
+    qc_byte_order!(
+        prop_u16,
+        u16,
+        ::core::u16::MAX as u64,
+        read_u16,
+        write_u16
+    );
+    qc_byte_order!(
+        prop_i16,
+        i16,
+        ::core::i16::MAX as u64,
+        read_i16,
+        write_i16
+    );
+    qc_byte_order!(
+        prop_u24,
+        u32,
+        crate::test::U24_MAX as u64,
+        read_u24,
+        write_u24
+    );
+    qc_byte_order!(
+        prop_i24,
+        i32,
+        crate::test::I24_MAX as u64,
+        read_i24,
+        write_i24
+    );
+    qc_byte_order!(
+        prop_u32,
+        u32,
+        ::core::u32::MAX as u64,
+        read_u32,
+        write_u32
+    );
+    qc_byte_order!(
+        prop_i32,
+        i32,
+        ::core::i32::MAX as u64,
+        read_i32,
+        write_i32
+    );
+    qc_byte_order!(
+        prop_u48,
+        u64,
+        crate::test::U48_MAX as u64,
+        read_u48,
+        write_u48
+    );
+    qc_byte_order!(
+        prop_i48,
+        i64,
+        crate::test::I48_MAX as u64,
+        read_i48,
+        write_i48
+    );
+    qc_byte_order!(
+        prop_u64,
+        u64,
+        ::core::u64::MAX as u64,
+        read_u64,
+        write_u64
+    );
+    qc_byte_order!(
+        prop_i64,
+        i64,
+        ::core::i64::MAX as u64,
+        read_i64,
+        write_i64
+    );
+    qc_byte_order!(
+        prop_f32,
+        f32,
+        ::core::u64::MAX as u64,
+        read_f32,
+        write_f32
+    );
+    qc_byte_order!(
+        prop_f64,
+        f64,
+        ::core::i64::MAX as u64,
+        read_f64,
+        write_f64
+    );
 
-    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_u128, Wi128<u128>, 16 + 1, read_u128, write_u128);
-    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_i128, Wi128<i128>, 16 + 1, read_i128, write_i128);
 
-    qc_byte_order!(prop_uint_1,
-        u64, calc_max!(super::U64_MAX, 1), 1, read_uint, write_uint);
-    qc_byte_order!(prop_uint_2,
-        u64, calc_max!(super::U64_MAX, 2), 2, read_uint, write_uint);
-    qc_byte_order!(prop_uint_3,
-        u64, calc_max!(super::U64_MAX, 3), 3, read_uint, write_uint);
-    qc_byte_order!(prop_uint_4,
-        u64, calc_max!(super::U64_MAX, 4), 4, read_uint, write_uint);
-    qc_byte_order!(prop_uint_5,
-        u64, calc_max!(super::U64_MAX, 5), 5, read_uint, write_uint);
-    qc_byte_order!(prop_uint_6,
-        u64, calc_max!(super::U64_MAX, 6), 6, read_uint, write_uint);
-    qc_byte_order!(prop_uint_7,
-        u64, calc_max!(super::U64_MAX, 7), 7, read_uint, write_uint);
-    qc_byte_order!(prop_uint_8,
-        u64, calc_max!(super::U64_MAX, 8), 8, read_uint, write_uint);
-
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_1,
-        Wi128<u128>, 1, 1, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_2,
-        Wi128<u128>, 2, 2, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_3,
-        Wi128<u128>, 3, 3, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_4,
-        Wi128<u128>, 4, 4, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_5,
-        Wi128<u128>, 5, 5, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_6,
-        Wi128<u128>, 6, 6, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_7,
-        Wi128<u128>, 7, 7, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_8,
-        Wi128<u128>, 8, 8, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_9,
-        Wi128<u128>, 9, 9, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_10,
-        Wi128<u128>, 10, 10, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_11,
-        Wi128<u128>, 11, 11, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_12,
-        Wi128<u128>, 12, 12, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_13,
-        Wi128<u128>, 13, 13, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_14,
-        Wi128<u128>, 14, 14, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_15,
-        Wi128<u128>, 15, 15, read_uint128, write_uint128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_uint128_16,
-        Wi128<u128>, 16, 16, read_uint128, write_uint128);
-
-    qc_byte_order!(prop_int_1,
-        i64, calc_max!(super::I64_MAX, 1), 1, read_int, write_int);
-    qc_byte_order!(prop_int_2,
-        i64, calc_max!(super::I64_MAX, 2), 2, read_int, write_int);
-    qc_byte_order!(prop_int_3,
-        i64, calc_max!(super::I64_MAX, 3), 3, read_int, write_int);
-    qc_byte_order!(prop_int_4,
-        i64, calc_max!(super::I64_MAX, 4), 4, read_int, write_int);
-    qc_byte_order!(prop_int_5,
-        i64, calc_max!(super::I64_MAX, 5), 5, read_int, write_int);
-    qc_byte_order!(prop_int_6,
-        i64, calc_max!(super::I64_MAX, 6), 6, read_int, write_int);
-    qc_byte_order!(prop_int_7,
-        i64, calc_max!(super::I64_MAX, 7), 7, read_int, write_int);
-    qc_byte_order!(prop_int_8,
-        i64, calc_max!(super::I64_MAX, 8), 8, read_int, write_int);
-
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_1,
-        Wi128<i128>, 1, 1, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_2,
-        Wi128<i128>, 2, 2, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_3,
-        Wi128<i128>, 3, 3, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_4,
-        Wi128<i128>, 4, 4, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_5,
-        Wi128<i128>, 5, 5, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_6,
-        Wi128<i128>, 6, 6, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_7,
-        Wi128<i128>, 7, 7, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_8,
-        Wi128<i128>, 8, 8, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_9,
-        Wi128<i128>, 9, 9, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_10,
-        Wi128<i128>, 10, 10, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_11,
-        Wi128<i128>, 11, 11, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_12,
-        Wi128<i128>, 12, 12, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_13,
-        Wi128<i128>, 13, 13, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_14,
-        Wi128<i128>, 14, 14, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_15,
-        Wi128<i128>, 15, 15, read_int128, write_int128);
-    #[cfg(byteorder_i128)]
-    qc_byte_order!(prop_int128_16,
-        Wi128<i128>, 16, 16, read_int128, write_int128);
-
+    qc_byte_order!(
+        prop_uint_1,
+        u64,
+        calc_max!(super::U64_MAX, 1),
+        1,
+        read_uint,
+        write_uint
+    );
+    qc_byte_order!(
+        prop_uint_2,
+        u64,
+        calc_max!(super::U64_MAX, 2),
+        2,
+        read_uint,
+        write_uint
+    );
+    qc_byte_order!(
+        prop_uint_3,
+        u64,
+        calc_max!(super::U64_MAX, 3),
+        3,
+        read_uint,
+        write_uint
+    );
+    qc_byte_order!(
+        prop_uint_4,
+        u64,
+        calc_max!(super::U64_MAX, 4),
+        4,
+        read_uint,
+        write_uint
+    );
+    qc_byte_order!(
+        prop_uint_5,
+        u64,
+        calc_max!(super::U64_MAX, 5),
+        5,
+        read_uint,
+        write_uint
+    );
+    qc_byte_order!(
+        prop_uint_6,
+        u64,
+        calc_max!(super::U64_MAX, 6),
+        6,
+        read_uint,
+        write_uint
+    );
+    qc_byte_order!(
+        prop_uint_7,
+        u64,
+        calc_max!(super::U64_MAX, 7),
+        7,
+        read_uint,
+        write_uint
+    );
+    qc_byte_order!(
+        prop_uint_8,
+        u64,
+        calc_max!(super::U64_MAX, 8),
+        8,
+        read_uint,
+        write_uint
+    );
+
+    qc_byte_order!(
+        prop_uint128_1,
+        Wi128<u128>,
+        1,
+        1,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_2,
+        Wi128<u128>,
+        2,
+        2,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_3,
+        Wi128<u128>,
+        3,
+        3,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_4,
+        Wi128<u128>,
+        4,
+        4,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_5,
+        Wi128<u128>,
+        5,
+        5,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_6,
+        Wi128<u128>,
+        6,
+        6,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_7,
+        Wi128<u128>,
+        7,
+        7,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_8,
+        Wi128<u128>,
+        8,
+        8,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_9,
+        Wi128<u128>,
+        9,
+        9,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_10,
+        Wi128<u128>,
+        10,
+        10,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_11,
+        Wi128<u128>,
+        11,
+        11,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_12,
+        Wi128<u128>,
+        12,
+        12,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_13,
+        Wi128<u128>,
+        13,
+        13,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_14,
+        Wi128<u128>,
+        14,
+        14,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_15,
+        Wi128<u128>,
+        15,
+        15,
+        read_uint128,
+        write_uint128
+    );
+    qc_byte_order!(
+        prop_uint128_16,
+        Wi128<u128>,
+        16,
+        16,
+        read_uint128,
+        write_uint128
+    );
+
+    qc_byte_order!(
+        prop_int_1,
+        i64,
+        calc_max!(super::I64_MAX, 1),
+        1,
+        read_int,
+        write_int
+    );
+    qc_byte_order!(
+        prop_int_2,
+        i64,
+        calc_max!(super::I64_MAX, 2),
+        2,
+        read_int,
+        write_int
+    );
+    qc_byte_order!(
+        prop_int_3,
+        i64,
+        calc_max!(super::I64_MAX, 3),
+        3,
+        read_int,
+        write_int
+    );
+    qc_byte_order!(
+        prop_int_4,
+        i64,
+        calc_max!(super::I64_MAX, 4),
+        4,
+        read_int,
+        write_int
+    );
+    qc_byte_order!(
+        prop_int_5,
+        i64,
+        calc_max!(super::I64_MAX, 5),
+        5,
+        read_int,
+        write_int
+    );
+    qc_byte_order!(
+        prop_int_6,
+        i64,
+        calc_max!(super::I64_MAX, 6),
+        6,
+        read_int,
+        write_int
+    );
+    qc_byte_order!(
+        prop_int_7,
+        i64,
+        calc_max!(super::I64_MAX, 7),
+        7,
+        read_int,
+        write_int
+    );
+    qc_byte_order!(
+        prop_int_8,
+        i64,
+        calc_max!(super::I64_MAX, 8),
+        8,
+        read_int,
+        write_int
+    );
+
+    qc_byte_order!(
+        prop_int128_1,
+        Wi128<i128>,
+        1,
+        1,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_2,
+        Wi128<i128>,
+        2,
+        2,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_3,
+        Wi128<i128>,
+        3,
+        3,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_4,
+        Wi128<i128>,
+        4,
+        4,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_5,
+        Wi128<i128>,
+        5,
+        5,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_6,
+        Wi128<i128>,
+        6,
+        6,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_7,
+        Wi128<i128>,
+        7,
+        7,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_8,
+        Wi128<i128>,
+        8,
+        8,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_9,
+        Wi128<i128>,
+        9,
+        9,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_10,
+        Wi128<i128>,
+        10,
+        10,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_11,
+        Wi128<i128>,
+        11,
+        11,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_12,
+        Wi128<i128>,
+        12,
+        12,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_13,
+        Wi128<i128>,
+        13,
+        13,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_14,
+        Wi128<i128>,
+        14,
+        14,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_15,
+        Wi128<i128>,
+        15,
+        15,
+        read_int128,
+        write_int128
+    );
+    qc_byte_order!(
+        prop_int128_16,
+        Wi128<i128>,
+        16,
+        16,
+        read_int128,
+        write_int128
+    );
 
     // Test that all of the byte conversion functions panic when given a
     // buffer that is too small.
@@ -2725,9 +3016,11 @@
     // with a buffer overflow.
     macro_rules! too_small {
         ($name:ident, $maximally_small:expr, $zero:expr,
-         $read:ident, $write:ident) => (
+         $read:ident, $write:ident) => {
             mod $name {
-                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
+                use crate::{
+                    BigEndian, ByteOrder, LittleEndian, NativeEndian,
+                };
 
                 #[test]
                 #[should_panic]
@@ -2771,10 +3064,12 @@
                     NativeEndian::$write(&mut buf, $zero);
                 }
             }
-        );
-        ($name:ident, $maximally_small:expr, $read:ident) => (
+        };
+        ($name:ident, $maximally_small:expr, $read:ident) => {
             mod $name {
-                use {BigEndian, ByteOrder, NativeEndian, LittleEndian};
+                use crate::{
+                    BigEndian, ByteOrder, LittleEndian, NativeEndian,
+                };
 
                 #[test]
                 #[should_panic]
@@ -2797,7 +3092,7 @@
                     NativeEndian::$read(&buf, $maximally_small + 1);
                 }
             }
-        );
+        };
     }
 
     too_small!(small_u16, 1, 0, read_u16, write_u16);
@@ -2808,9 +3103,7 @@
     too_small!(small_i64, 7, 0, read_i64, write_i64);
     too_small!(small_f32, 3, 0.0, read_f32, write_f32);
     too_small!(small_f64, 7, 0.0, read_f64, write_f64);
-    #[cfg(byteorder_i128)]
     too_small!(small_u128, 15, 0, read_u128, write_u128);
-    #[cfg(byteorder_i128)]
     too_small!(small_i128, 15, 0, read_i128, write_i128);
 
     too_small!(small_uint_1, 1, read_uint);
@@ -2821,35 +3114,20 @@
     too_small!(small_uint_6, 6, read_uint);
     too_small!(small_uint_7, 7, read_uint);
 
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_1, 1, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_2, 2, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_3, 3, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_4, 4, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_5, 5, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_6, 6, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_7, 7, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_8, 8, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_9, 9, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_10, 10, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_11, 11, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_12, 12, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_13, 13, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_14, 14, read_uint128);
-    #[cfg(byteorder_i128)]
     too_small!(small_uint128_15, 15, read_uint128);
 
     too_small!(small_int_1, 1, read_int);
@@ -2860,35 +3138,20 @@
     too_small!(small_int_6, 6, read_int);
     too_small!(small_int_7, 7, read_int);
 
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_1, 1, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_2, 2, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_3, 3, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_4, 4, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_5, 5, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_6, 6, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_7, 7, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_8, 8, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_9, 9, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_10, 10, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_11, 11, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_12, 12, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_13, 13, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_14, 14, read_int128);
-    #[cfg(byteorder_i128)]
     too_small!(small_int128_15, 15, read_int128);
 
     // Test that reading/writing slices enforces the correct lengths.
@@ -2896,7 +3159,9 @@
         ($name:ident, $read:ident, $write:ident,
          $num_bytes:expr, $numbers:expr) => {
             mod $name {
-                use {ByteOrder, BigEndian, NativeEndian, LittleEndian};
+                use crate::{
+                    BigEndian, ByteOrder, LittleEndian, NativeEndian,
+                };
 
                 #[test]
                 #[should_panic]
@@ -2946,55 +3211,172 @@
                     NativeEndian::$write(&numbers, &mut bytes);
                 }
             }
-        }
+        };
     }
 
     slice_lengths!(
-        slice_len_too_small_u16, read_u16_into, write_u16_into, 3, [0, 0]);
+        slice_len_too_small_u16,
+        read_u16_into,
+        write_u16_into,
+        3,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_big_u16, read_u16_into, write_u16_into, 5, [0, 0]);
+        slice_len_too_big_u16,
+        read_u16_into,
+        write_u16_into,
+        5,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_small_i16, read_i16_into, write_i16_into, 3, [0, 0]);
+        slice_len_too_small_i16,
+        read_i16_into,
+        write_i16_into,
+        3,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_big_i16, read_i16_into, write_i16_into, 5, [0, 0]);
+        slice_len_too_big_i16,
+        read_i16_into,
+        write_i16_into,
+        5,
+        [0, 0]
+    );
 
     slice_lengths!(
-        slice_len_too_small_u32, read_u32_into, write_u32_into, 7, [0, 0]);
+        slice_len_too_small_u32,
+        read_u32_into,
+        write_u32_into,
+        7,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_big_u32, read_u32_into, write_u32_into, 9, [0, 0]);
+        slice_len_too_big_u32,
+        read_u32_into,
+        write_u32_into,
+        9,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_small_i32, read_i32_into, write_i32_into, 7, [0, 0]);
+        slice_len_too_small_i32,
+        read_i32_into,
+        write_i32_into,
+        7,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_big_i32, read_i32_into, write_i32_into, 9, [0, 0]);
+        slice_len_too_big_i32,
+        read_i32_into,
+        write_i32_into,
+        9,
+        [0, 0]
+    );
 
     slice_lengths!(
-        slice_len_too_small_u64, read_u64_into, write_u64_into, 15, [0, 0]);
+        slice_len_too_small_u64,
+        read_u64_into,
+        write_u64_into,
+        15,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_big_u64, read_u64_into, write_u64_into, 17, [0, 0]);
+        slice_len_too_big_u64,
+        read_u64_into,
+        write_u64_into,
+        17,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_small_i64, read_i64_into, write_i64_into, 15, [0, 0]);
+        slice_len_too_small_i64,
+        read_i64_into,
+        write_i64_into,
+        15,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_big_i64, read_i64_into, write_i64_into, 17, [0, 0]);
+        slice_len_too_big_i64,
+        read_i64_into,
+        write_i64_into,
+        17,
+        [0, 0]
+    );
 
-    #[cfg(byteorder_i128)]
     slice_lengths!(
-        slice_len_too_small_u128, read_u128_into, write_u128_into, 31, [0, 0]);
-    #[cfg(byteorder_i128)]
+        slice_len_too_small_u128,
+        read_u128_into,
+        write_u128_into,
+        31,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_big_u128, read_u128_into, write_u128_into, 33, [0, 0]);
-    #[cfg(byteorder_i128)]
+        slice_len_too_big_u128,
+        read_u128_into,
+        write_u128_into,
+        33,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_small_i128, read_i128_into, write_i128_into, 31, [0, 0]);
-    #[cfg(byteorder_i128)]
+        slice_len_too_small_i128,
+        read_i128_into,
+        write_i128_into,
+        31,
+        [0, 0]
+    );
     slice_lengths!(
-        slice_len_too_big_i128, read_i128_into, write_i128_into, 33, [0, 0]);
+        slice_len_too_big_i128,
+        read_i128_into,
+        write_i128_into,
+        33,
+        [0, 0]
+    );
 
     #[test]
     fn uint_bigger_buffer() {
-        use {ByteOrder, LittleEndian};
+        use crate::{ByteOrder, LittleEndian};
         let n = LittleEndian::read_uint(&[1, 2, 3, 4, 5, 6, 7, 8], 5);
         assert_eq!(n, 0x05_0403_0201);
     }
+
+    #[test]
+    fn regression173_array_impl() {
+        use crate::{BigEndian, ByteOrder, LittleEndian};
+
+        let xs = [0; 100];
+
+        let x = BigEndian::read_u16(&xs);
+        assert_eq!(x, 0);
+        let x = BigEndian::read_u32(&xs);
+        assert_eq!(x, 0);
+        let x = BigEndian::read_u64(&xs);
+        assert_eq!(x, 0);
+        let x = BigEndian::read_u128(&xs);
+        assert_eq!(x, 0);
+        let x = BigEndian::read_i16(&xs);
+        assert_eq!(x, 0);
+        let x = BigEndian::read_i32(&xs);
+        assert_eq!(x, 0);
+        let x = BigEndian::read_i64(&xs);
+        assert_eq!(x, 0);
+        let x = BigEndian::read_i128(&xs);
+        assert_eq!(x, 0);
+
+        let x = LittleEndian::read_u16(&xs);
+        assert_eq!(x, 0);
+        let x = LittleEndian::read_u32(&xs);
+        assert_eq!(x, 0);
+        let x = LittleEndian::read_u64(&xs);
+        assert_eq!(x, 0);
+        let x = LittleEndian::read_u128(&xs);
+        assert_eq!(x, 0);
+        let x = LittleEndian::read_i16(&xs);
+        assert_eq!(x, 0);
+        let x = LittleEndian::read_i32(&xs);
+        assert_eq!(x, 0);
+        let x = LittleEndian::read_i64(&xs);
+        assert_eq!(x, 0);
+        let x = LittleEndian::read_i128(&xs);
+        assert_eq!(x, 0);
+    }
 }
 
 #[cfg(test)]
@@ -3007,7 +3389,6 @@
     use self::rand::thread_rng;
 
     fn qc_unsized<A: Testable>(f: A) {
-
         QuickCheck::new()
             .gen(StdGen::new(thread_rng(), 16))
             .tests(1_00)
@@ -3016,19 +3397,22 @@
     }
 
     macro_rules! calc_max {
-        ($max:expr, $bytes:expr) => { ($max - 1) >> (8 * (8 - $bytes)) };
+        ($max:expr, $bytes:expr) => {
+            ($max - 1) >> (8 * (8 - $bytes))
+        };
     }
 
     macro_rules! qc_bytes_ext {
         ($name:ident, $ty_int:ty, $max:expr,
-         $bytes:expr, $read:ident, $write:ident) => (
+         $bytes:expr, $read:ident, $write:ident) => {
             mod $name {
-                use std::io::Cursor;
-                use {
-                    ReadBytesExt, WriteBytesExt,
-                    BigEndian, NativeEndian, LittleEndian,
+                #[allow(unused_imports)]
+                use crate::test::{qc_sized, Wi128};
+                use crate::{
+                    BigEndian, LittleEndian, NativeEndian, ReadBytesExt,
+                    WriteBytesExt,
                 };
-                #[allow(unused_imports)] use test::{qc_sized, Wi128};
+                use std::io::Cursor;
 
                 #[test]
                 fn big_endian() {
@@ -3069,15 +3453,16 @@
                     qc_sized(prop as fn($ty_int) -> bool, $max);
                 }
             }
-        );
-        ($name:ident, $ty_int:ty, $max:expr, $read:ident, $write:ident) => (
+        };
+        ($name:ident, $ty_int:ty, $max:expr, $read:ident, $write:ident) => {
             mod $name {
-                use std::io::Cursor;
-                use {
-                    ReadBytesExt, WriteBytesExt,
-                    BigEndian, NativeEndian, LittleEndian,
+                #[allow(unused_imports)]
+                use crate::test::{qc_sized, Wi128};
+                use crate::{
+                    BigEndian, LittleEndian, NativeEndian, ReadBytesExt,
+                    WriteBytesExt,
                 };
-                #[allow(unused_imports)] use test::{qc_sized, Wi128};
+                use std::io::Cursor;
 
                 #[test]
                 fn big_endian() {
@@ -3112,188 +3497,484 @@
                     qc_sized(prop as fn($ty_int) -> bool, $max - 1);
                 }
             }
-        );
+        };
     }
 
-    qc_bytes_ext!(prop_ext_u16,
-        u16, ::std::u16::MAX as u64, read_u16, write_u16);
-    qc_bytes_ext!(prop_ext_i16,
-        i16, ::std::i16::MAX as u64, read_i16, write_i16);
-    qc_bytes_ext!(prop_ext_u32,
-        u32, ::std::u32::MAX as u64, read_u32, write_u32);
-    qc_bytes_ext!(prop_ext_i32,
-        i32, ::std::i32::MAX as u64, read_i32, write_i32);
-    qc_bytes_ext!(prop_ext_u64,
-        u64, ::std::u64::MAX as u64, read_u64, write_u64);
-    qc_bytes_ext!(prop_ext_i64,
-        i64, ::std::i64::MAX as u64, read_i64, write_i64);
-    qc_bytes_ext!(prop_ext_f32,
-        f32, ::std::u64::MAX as u64, read_f32, write_f32);
-    qc_bytes_ext!(prop_ext_f64,
-        f64, ::std::i64::MAX as u64, read_f64, write_f64);
+    qc_bytes_ext!(
+        prop_ext_u16,
+        u16,
+        ::std::u16::MAX as u64,
+        read_u16,
+        write_u16
+    );
+    qc_bytes_ext!(
+        prop_ext_i16,
+        i16,
+        ::std::i16::MAX as u64,
+        read_i16,
+        write_i16
+    );
+    qc_bytes_ext!(
+        prop_ext_u32,
+        u32,
+        ::std::u32::MAX as u64,
+        read_u32,
+        write_u32
+    );
+    qc_bytes_ext!(
+        prop_ext_i32,
+        i32,
+        ::std::i32::MAX as u64,
+        read_i32,
+        write_i32
+    );
+    qc_bytes_ext!(
+        prop_ext_u64,
+        u64,
+        ::std::u64::MAX as u64,
+        read_u64,
+        write_u64
+    );
+    qc_bytes_ext!(
+        prop_ext_i64,
+        i64,
+        ::std::i64::MAX as u64,
+        read_i64,
+        write_i64
+    );
+    qc_bytes_ext!(
+        prop_ext_f32,
+        f32,
+        ::std::u64::MAX as u64,
+        read_f32,
+        write_f32
+    );
+    qc_bytes_ext!(
+        prop_ext_f64,
+        f64,
+        ::std::i64::MAX as u64,
+        read_f64,
+        write_f64
+    );
 
-    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_u128, Wi128<u128>, 16 + 1, read_u128, write_u128);
-    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_i128, Wi128<i128>, 16 + 1, read_i128, write_i128);
 
-    qc_bytes_ext!(prop_ext_uint_1,
-        u64, calc_max!(::test::U64_MAX, 1), 1, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_2,
-        u64, calc_max!(::test::U64_MAX, 2), 2, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_3,
-        u64, calc_max!(::test::U64_MAX, 3), 3, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_4,
-        u64, calc_max!(::test::U64_MAX, 4), 4, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_5,
-        u64, calc_max!(::test::U64_MAX, 5), 5, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_6,
-        u64, calc_max!(::test::U64_MAX, 6), 6, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_7,
-        u64, calc_max!(::test::U64_MAX, 7), 7, read_uint, write_u64);
-    qc_bytes_ext!(prop_ext_uint_8,
-        u64, calc_max!(::test::U64_MAX, 8), 8, read_uint, write_u64);
-
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_1,
-        Wi128<u128>, 1, 1, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_2,
-        Wi128<u128>, 2, 2, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_3,
-        Wi128<u128>, 3, 3, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_4,
-        Wi128<u128>, 4, 4, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_5,
-        Wi128<u128>, 5, 5, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_6,
-        Wi128<u128>, 6, 6, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_7,
-        Wi128<u128>, 7, 7, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_8,
-        Wi128<u128>, 8, 8, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_9,
-        Wi128<u128>, 9, 9, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_10,
-        Wi128<u128>, 10, 10, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_11,
-        Wi128<u128>, 11, 11, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_12,
-        Wi128<u128>, 12, 12, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_13,
-        Wi128<u128>, 13, 13, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_14,
-        Wi128<u128>, 14, 14, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_15,
-        Wi128<u128>, 15, 15, read_uint128, write_u128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_uint128_16,
-        Wi128<u128>, 16, 16, read_uint128, write_u128);
-
-    qc_bytes_ext!(prop_ext_int_1,
-        i64, calc_max!(::test::I64_MAX, 1), 1, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_2,
-        i64, calc_max!(::test::I64_MAX, 2), 2, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_3,
-        i64, calc_max!(::test::I64_MAX, 3), 3, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_4,
-        i64, calc_max!(::test::I64_MAX, 4), 4, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_5,
-        i64, calc_max!(::test::I64_MAX, 5), 5, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_6,
-        i64, calc_max!(::test::I64_MAX, 6), 6, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_7,
-        i64, calc_max!(::test::I64_MAX, 1), 7, read_int, write_i64);
-    qc_bytes_ext!(prop_ext_int_8,
-        i64, calc_max!(::test::I64_MAX, 8), 8, read_int, write_i64);
-
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_1,
-        Wi128<i128>, 1, 1, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_2,
-        Wi128<i128>, 2, 2, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_3,
-        Wi128<i128>, 3, 3, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_4,
-        Wi128<i128>, 4, 4, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_5,
-        Wi128<i128>, 5, 5, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_6,
-        Wi128<i128>, 6, 6, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_7,
-        Wi128<i128>, 7, 7, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_8,
-        Wi128<i128>, 8, 8, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_9,
-        Wi128<i128>, 9, 9, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_10,
-        Wi128<i128>, 10, 10, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_11,
-        Wi128<i128>, 11, 11, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_12,
-        Wi128<i128>, 12, 12, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_13,
-        Wi128<i128>, 13, 13, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_14,
-        Wi128<i128>, 14, 14, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_15,
-        Wi128<i128>, 15, 15, read_int128, write_i128);
-    #[cfg(byteorder_i128)]
-    qc_bytes_ext!(prop_ext_int128_16,
-        Wi128<i128>, 16, 16, read_int128, write_i128);
+    qc_bytes_ext!(
+        prop_ext_uint_1,
+        u64,
+        calc_max!(crate::test::U64_MAX, 1),
+        1,
+        read_uint,
+        write_u64
+    );
+    qc_bytes_ext!(
+        prop_ext_uint_2,
+        u64,
+        calc_max!(crate::test::U64_MAX, 2),
+        2,
+        read_uint,
+        write_u64
+    );
+    qc_bytes_ext!(
+        prop_ext_uint_3,
+        u64,
+        calc_max!(crate::test::U64_MAX, 3),
+        3,
+        read_uint,
+        write_u64
+    );
+    qc_bytes_ext!(
+        prop_ext_uint_4,
+        u64,
+        calc_max!(crate::test::U64_MAX, 4),
+        4,
+        read_uint,
+        write_u64
+    );
+    qc_bytes_ext!(
+        prop_ext_uint_5,
+        u64,
+        calc_max!(crate::test::U64_MAX, 5),
+        5,
+        read_uint,
+        write_u64
+    );
+    qc_bytes_ext!(
+        prop_ext_uint_6,
+        u64,
+        calc_max!(crate::test::U64_MAX, 6),
+        6,
+        read_uint,
+        write_u64
+    );
+    qc_bytes_ext!(
+        prop_ext_uint_7,
+        u64,
+        calc_max!(crate::test::U64_MAX, 7),
+        7,
+        read_uint,
+        write_u64
+    );
+    qc_bytes_ext!(
+        prop_ext_uint_8,
+        u64,
+        calc_max!(crate::test::U64_MAX, 8),
+        8,
+        read_uint,
+        write_u64
+    );
+
+    qc_bytes_ext!(
+        prop_ext_uint128_1,
+        Wi128<u128>,
+        1,
+        1,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_2,
+        Wi128<u128>,
+        2,
+        2,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_3,
+        Wi128<u128>,
+        3,
+        3,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_4,
+        Wi128<u128>,
+        4,
+        4,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_5,
+        Wi128<u128>,
+        5,
+        5,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_6,
+        Wi128<u128>,
+        6,
+        6,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_7,
+        Wi128<u128>,
+        7,
+        7,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_8,
+        Wi128<u128>,
+        8,
+        8,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_9,
+        Wi128<u128>,
+        9,
+        9,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_10,
+        Wi128<u128>,
+        10,
+        10,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_11,
+        Wi128<u128>,
+        11,
+        11,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_12,
+        Wi128<u128>,
+        12,
+        12,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_13,
+        Wi128<u128>,
+        13,
+        13,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_14,
+        Wi128<u128>,
+        14,
+        14,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_15,
+        Wi128<u128>,
+        15,
+        15,
+        read_uint128,
+        write_u128
+    );
+    qc_bytes_ext!(
+        prop_ext_uint128_16,
+        Wi128<u128>,
+        16,
+        16,
+        read_uint128,
+        write_u128
+    );
+
+    qc_bytes_ext!(
+        prop_ext_int_1,
+        i64,
+        calc_max!(crate::test::I64_MAX, 1),
+        1,
+        read_int,
+        write_i64
+    );
+    qc_bytes_ext!(
+        prop_ext_int_2,
+        i64,
+        calc_max!(crate::test::I64_MAX, 2),
+        2,
+        read_int,
+        write_i64
+    );
+    qc_bytes_ext!(
+        prop_ext_int_3,
+        i64,
+        calc_max!(crate::test::I64_MAX, 3),
+        3,
+        read_int,
+        write_i64
+    );
+    qc_bytes_ext!(
+        prop_ext_int_4,
+        i64,
+        calc_max!(crate::test::I64_MAX, 4),
+        4,
+        read_int,
+        write_i64
+    );
+    qc_bytes_ext!(
+        prop_ext_int_5,
+        i64,
+        calc_max!(crate::test::I64_MAX, 5),
+        5,
+        read_int,
+        write_i64
+    );
+    qc_bytes_ext!(
+        prop_ext_int_6,
+        i64,
+        calc_max!(crate::test::I64_MAX, 6),
+        6,
+        read_int,
+        write_i64
+    );
+    qc_bytes_ext!(
+        prop_ext_int_7,
+        i64,
+        calc_max!(crate::test::I64_MAX, 1),
+        7,
+        read_int,
+        write_i64
+    );
+    qc_bytes_ext!(
+        prop_ext_int_8,
+        i64,
+        calc_max!(crate::test::I64_MAX, 8),
+        8,
+        read_int,
+        write_i64
+    );
+
+    qc_bytes_ext!(
+        prop_ext_int128_1,
+        Wi128<i128>,
+        1,
+        1,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_2,
+        Wi128<i128>,
+        2,
+        2,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_3,
+        Wi128<i128>,
+        3,
+        3,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_4,
+        Wi128<i128>,
+        4,
+        4,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_5,
+        Wi128<i128>,
+        5,
+        5,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_6,
+        Wi128<i128>,
+        6,
+        6,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_7,
+        Wi128<i128>,
+        7,
+        7,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_8,
+        Wi128<i128>,
+        8,
+        8,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_9,
+        Wi128<i128>,
+        9,
+        9,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_10,
+        Wi128<i128>,
+        10,
+        10,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_11,
+        Wi128<i128>,
+        11,
+        11,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_12,
+        Wi128<i128>,
+        12,
+        12,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_13,
+        Wi128<i128>,
+        13,
+        13,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_14,
+        Wi128<i128>,
+        14,
+        14,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_15,
+        Wi128<i128>,
+        15,
+        15,
+        read_int128,
+        write_i128
+    );
+    qc_bytes_ext!(
+        prop_ext_int128_16,
+        Wi128<i128>,
+        16,
+        16,
+        read_int128,
+        write_i128
+    );
 
     // Test slice serialization/deserialization.
     macro_rules! qc_slice {
         ($name:ident, $ty_int:ty, $read:ident, $write:ident, $zero:expr) => {
             mod $name {
-                use core::mem::size_of;
-                use {ByteOrder, BigEndian, NativeEndian, LittleEndian};
                 use super::qc_unsized;
                 #[allow(unused_imports)]
-                use test::Wi128;
+                use crate::test::Wi128;
+                use crate::{
+                    BigEndian, ByteOrder, LittleEndian, NativeEndian,
+                };
+                use core::mem::size_of;
 
                 #[test]
                 fn big_endian() {
                     #[allow(unused_unsafe)]
                     fn prop(numbers: Vec<$ty_int>) -> bool {
-                        let numbers: Vec<_> = numbers
-                            .into_iter()
-                            .map(|x| x.clone())
-                            .collect();
+                        let numbers: Vec<_> =
+                            numbers.into_iter().map(|x| x.clone()).collect();
                         let num_bytes = size_of::<$ty_int>() * numbers.len();
                         let mut bytes = vec![0; num_bytes];
 
                         BigEndian::$write(&numbers, &mut bytes);
 
                         let mut got = vec![$zero; numbers.len()];
-                        unsafe { BigEndian::$read(&bytes, &mut got); }
+                        unsafe {
+                            BigEndian::$read(&bytes, &mut got);
+                        }
 
                         numbers == got
                     }
@@ -3304,17 +3985,17 @@
                 fn little_endian() {
                     #[allow(unused_unsafe)]
                     fn prop(numbers: Vec<$ty_int>) -> bool {
-                        let numbers: Vec<_> = numbers
-                            .into_iter()
-                            .map(|x| x.clone())
-                            .collect();
+                        let numbers: Vec<_> =
+                            numbers.into_iter().map(|x| x.clone()).collect();
                         let num_bytes = size_of::<$ty_int>() * numbers.len();
                         let mut bytes = vec![0; num_bytes];
 
                         LittleEndian::$write(&numbers, &mut bytes);
 
                         let mut got = vec![$zero; numbers.len()];
-                        unsafe { LittleEndian::$read(&bytes, &mut got); }
+                        unsafe {
+                            LittleEndian::$read(&bytes, &mut got);
+                        }
 
                         numbers == got
                     }
@@ -3325,24 +4006,24 @@
                 fn native_endian() {
                     #[allow(unused_unsafe)]
                     fn prop(numbers: Vec<$ty_int>) -> bool {
-                        let numbers: Vec<_> = numbers
-                            .into_iter()
-                            .map(|x| x.clone())
-                            .collect();
+                        let numbers: Vec<_> =
+                            numbers.into_iter().map(|x| x.clone()).collect();
                         let num_bytes = size_of::<$ty_int>() * numbers.len();
                         let mut bytes = vec![0; num_bytes];
 
                         NativeEndian::$write(&numbers, &mut bytes);
 
                         let mut got = vec![$zero; numbers.len()];
-                        unsafe { NativeEndian::$read(&bytes, &mut got); }
+                        unsafe {
+                            NativeEndian::$read(&bytes, &mut got);
+                        }
 
                         numbers == got
                     }
                     qc_unsized(prop as fn(_) -> bool);
                 }
             }
-        }
+        };
     }
 
     qc_slice!(prop_slice_u16, u16, read_u16_into, write_u16_into, 0);
@@ -3351,15 +4032,21 @@
     qc_slice!(prop_slice_i32, i32, read_i32_into, write_i32_into, 0);
     qc_slice!(prop_slice_u64, u64, read_u64_into, write_u64_into, 0);
     qc_slice!(prop_slice_i64, i64, read_i64_into, write_i64_into, 0);
-    #[cfg(byteorder_i128)]
     qc_slice!(
-        prop_slice_u128, Wi128<u128>, read_u128_into, write_u128_into, 0);
-    #[cfg(byteorder_i128)]
+        prop_slice_u128,
+        Wi128<u128>,
+        read_u128_into,
+        write_u128_into,
+        0
+    );
     qc_slice!(
-        prop_slice_i128, Wi128<i128>, read_i128_into, write_i128_into, 0);
+        prop_slice_i128,
+        Wi128<i128>,
+        read_i128_into,
+        write_i128_into,
+        0
+    );
 
-    qc_slice!(
-        prop_slice_f32, f32, read_f32_into, write_f32_into, 0.0);
-    qc_slice!(
-        prop_slice_f64, f64, read_f64_into, write_f64_into, 0.0);
+    qc_slice!(prop_slice_f32, f32, read_f32_into, write_f32_into, 0.0);
+    qc_slice!(prop_slice_f64, f64, read_f64_into, write_f64_into, 0.0);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/benches/buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/benches/buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/benches/buf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/benches/buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -53,7 +53,7 @@
         assert!(self.pos <= self.buf.len());
         self.next_readlen();
     }
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         if self.readlen == 0 {
             Default::default()
         } else {
@@ -87,8 +87,8 @@
         self.inner.advance(cnt)
     }
     #[inline(never)]
-    fn bytes(&self) -> &[u8] {
-        self.inner.bytes()
+    fn chunk(&self) -> &[u8] {
+        self.inner.chunk()
     }
 }
 
@@ -159,7 +159,6 @@
 mod get_u8 {
     use super::*;
     bench_group!(get_u8);
-    bench!(option, option);
 }
 mod get_u16 {
     use super::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"7c1c6fe9fa6aa8a155d4a04dab5d4e3abadb349121886b2f24252db0e45fba51","Cargo.toml":"bb5072cd9bad83919ed35f49f3a7f88b608a0150d6ccdcbb4bf17dfb3c64ef3f","LICENSE":"45f522cacecb1023856e46df79ca625dfc550c94910078bd8aec6e02880b3d42","README.md":"2c2f6f1a240ad375f9dbd8e7f023510b645d98e327ea0a42ba339c94fd9baaa9","benches/buf.rs":"b0f4f1130081680f6f99d1efd49a75bd1d97d9a30117b7ad9525c96b7c8968e6","benches/bytes.rs":"dc5289a9ce82be35e71ed5853ab33aa108a30460e481135f6058fe4d2f7dc15e","benches/bytes_mut.rs":"1326fe6224b26826228e02b4133151e756f38152c2d9cfe66adf83af76c3ec98","ci/test-stable.sh":"6e010f1a95b72fea7bebdd217fda78427f3eb07b1e753f79507c71d982b2d38a","ci/tsan.sh":"466b86b19225dd26c756cf2252cb1973f87a145642c99364b462ed7ceb55c7dd","src/buf/buf_impl.rs":"fe1bc64bb9aef5b57d83901268f89bf148490e71bebc340c7ecc40ff95bcfb70","src/buf/buf_mut.rs":"d226189d9db76c9023537dcca0687aa5dd25851a9052d19154de8ee9b25bdee3","src/buf/ext/chain.rs":"337f58e1a8da5b4768e55921ff394f4ba3a0c6d476448fd5bceab6f3c1db1b3e","src/buf/ext/limit.rs":"a705d7cf38f9a11a904d6ee5e7afea83e9abdf8f454bb8e16b407b0e055dc11a","src/buf/ext/mod.rs":"ba2fa392c61b7429530c71797114e3f09d9b6b750b6f77f57fde964d2b218bc4","src/buf/ext/reader.rs":"ee4733fa2c2d893c6df8151c2333a46171619e8a45ec9bae863edc8deb438ac5","src/buf/ext/take.rs":"e92be765539b8b0c1cb67a01b691319cccd35fc098f2bb59ced3bbbe41ee0257","src/buf/ext/writer.rs":"3c52df6e73d09935d37bed9a05689c1966952f980b85b40aaab05081ec7ef6d8","src/buf/iter.rs":"a0de69367fa61d0d1c6c2ff4b4d337de9c5f4213d0c86e083226cf409666d860","src/buf/mod.rs":"4f8e3b4c4b69b7d004306d458ad835801e53659b38ca08312d7217d82da4c64f","src/buf/vec_deque.rs":"5a4063961d10380c1ab3681f8b3f6201112766d9f57a63e2861dc9f2b134668d","src/bytes.rs":"8c3aa5fe425604206ffc1b85a8bff5a9be38917786453450955984523f829cec","src/bytes_mut.rs":"e276f74da841ab65ca681cb09820de98aa2e9837dd975ed564b1a9be40440cf3","src/fmt/debug.rs":"19ebe7e5516e40ab712995f3ec2e0ba78ddfa905cce117e6d01e8eb330f3970a","src/fmt/hex.rs":"13755ec6f1b79923e1f1a05c51b179a38c03c40bb8ed2db0210e8901812e61e7","src/fmt/mod.rs":"176da4e359da99b8e5cf16e480cb7b978f574876827f1b9bb9c08da4d74ac0f5","src/lib.rs":"9b96e2a011a782ceb82428e6b71fd212a46bc186bd152102018c7b6428a0d441","src/loom.rs":"5dc97a5afce14875a66e44cbf0afa67e084c8b6b8c560bc14e7a70ef73aee96e","src/serde.rs":"3ecd7e828cd4c2b7db93c807cb1548fad209e674df493edf7cda69a7b04d405d","tests/test_buf.rs":"3ca99c58f470e7c4beb18e5dc69250ce541dd8ac96b88fb1162640510a735ada","tests/test_buf_mut.rs":"56636e439cb07af2fabdfb60a08995829680c9730a8ebe5c6ad2f54dbf208e32","tests/test_bytes.rs":"3ec0a82ce98fea633ed7d635caca21cd8035d0c9ea4287d1cc0199e167a4a3c1","tests/test_bytes_odd_alloc.rs":"87d51d4ab6ad98193b140ea8158f6631eba985a204c2ea94d34b3bb157791a16","tests/test_bytes_vec_alloc.rs":"2b686b6ab44f924e69d8270a4f256eb3626a3b4db8c1919b74bc422c10124899","tests/test_chain.rs":"71772fbc0bab72a697bd85c6c1be0eddfe7d7dc4f4737a0cd53be4ad191d076b","tests/test_debug.rs":"13299107172809e8cbbd823964ac9450cd0d6b6de79f2e6a2e0f44b9225a0593","tests/test_iter.rs":"c1f46823df26a90139645fd8728a03138edd95b2849dfec830452a80ddd9726d","tests/test_reader.rs":"9c94e164aa7de4c10966f8084ad04d06f4e9c66e156d017d194a1dac3dfc6619","tests/test_serde.rs":"2691f891796ba259de0ecf926de05c514f4912cc5fcd3e6a1591efbcd23ed4d0","tests/test_take.rs":"975aa2e216b6a3c939b31e41ecfbb3a90938096413a14a2ae986c842d2250180"},"package":"0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"3ae0ceffbd69f54380bb44fdaf82dd674015471875a8da55686718afc3e58bdd","Cargo.toml":"5e1c5c02693e7afe119c1f82caec24ad41f51ce3b6899393ebeb1769ff50f1ab","LICENSE":"45f522cacecb1023856e46df79ca625dfc550c94910078bd8aec6e02880b3d42","README.md":"b691d6e144eb133c181e869dc2f6a6eedbf76c4f832a9ecfbed5b9c560160c7f","benches/buf.rs":"f76240b8c8872185d831382216eb536b3e05b23913c815cd36edd5d903fbeaf7","benches/bytes.rs":"dc5289a9ce82be35e71ed5853ab33aa108a30460e481135f6058fe4d2f7dc15e","benches/bytes_mut.rs":"1326fe6224b26826228e02b4133151e756f38152c2d9cfe66adf83af76c3ec98","ci/miri.sh":"1f27dc786a0f1e930c1c8429b1d60d2e107ff6998ec8efd4674c78a5d0594dd7","ci/test-stable.sh":"57dd709bc25a20103ee85e24965566900817b2e603f067fb1251a5c03e4b1d93","ci/tsan.sh":"466b86b19225dd26c756cf2252cb1973f87a145642c99364b462ed7ceb55c7dd","src/buf/buf_impl.rs":"bdd9d5bc3318185ef1bea8d7c6a9dd3712ec297e0045fd84024f188c0ad96ac0","src/buf/buf_mut.rs":"d4387228d687414d0ad3eb2bd1c2f0fc84be8ec7d8746b95075f186b467293d4","src/buf/chain.rs":"d31989886d8ca01a9e3b42d6756391f5bdf8c102f83fa6dac51dd86312a91c14","src/buf/iter.rs":"49e9990a2303252ef7c66c2cc24459097dbbf4900c978453982ef513467bbf67","src/buf/limit.rs":"e005ba140b70f68654877c96b981a220477e415ff5c92438c1b0cb9bc866d872","src/buf/mod.rs":"19ff6fb7e19cba3884bc3f1a50ef20117dbc807f6d146ed355f42344a74fdf44","src/buf/reader.rs":"856c1e7129a1eceaa3c8f9ed4da8c3b5e1cc267eeffa99fa8f7c56c5ca7834d1","src/buf/take.rs":"a897e79bf579391227816973b2aa1f1d63614bd48bc029d9371f61607dcfa23f","src/buf/uninit_slice.rs":"0532041bf0128311eb6a2edbc4b720be30395882744dbc437874753fd8f249b4","src/buf/vec_deque.rs":"8d552c26ac6ce28a471f74c388e4749432e86b1d8f5a9759b9fc32a2549d395f","src/buf/writer.rs":"c92b5f8b9b42e2e784de474c987fe4ac50af4b5c51ac9548d19a54e8ac9ff521","src/bytes.rs":"f8d26a3de35977225abb4a416846f713f3ab2dc1215119bdac6b43ce4ef3fa0e","src/bytes_mut.rs":"6dab0856996c1bf07fd8786cf876a6c8c27df001ae78d23ba2d220d6d3ef9360","src/fmt/debug.rs":"19ebe7e5516e40ab712995f3ec2e0ba78ddfa905cce117e6d01e8eb330f3970a","src/fmt/hex.rs":"13755ec6f1b79923e1f1a05c51b179a38c03c40bb8ed2db0210e8901812e61e7","src/fmt/mod.rs":"176da4e359da99b8e5cf16e480cb7b978f574876827f1b9bb9c08da4d74ac0f5","src/lib.rs":"d8be90ade0cf78a30d73493086c109049d8ff442d69589a07f16480578eb4b17","src/loom.rs":"5dc97a5afce14875a66e44cbf0afa67e084c8b6b8c560bc14e7a70ef73aee96e","src/serde.rs":"3ecd7e828cd4c2b7db93c807cb1548fad209e674df493edf7cda69a7b04d405d","tests/test_buf.rs":"a04fb90644fcf0444092c49a4ca848bb0fd8b2ffeeebcb705eeea2de58560859","tests/test_buf_mut.rs":"5643866cd7b0967fb36053a1da73a23b26ffaa2746c05dca91e82df91aee7f81","tests/test_bytes.rs":"2349daa82fd079037ba4059273a8339fadf2a1d59ac2ce58e83269de6f133a0f","tests/test_bytes_odd_alloc.rs":"9a02cc9b1f09e2353554d9a33f6630250e6b5cf04faa00de3b9fecf247e65edb","tests/test_bytes_vec_alloc.rs":"2b686b6ab44f924e69d8270a4f256eb3626a3b4db8c1919b74bc422c10124899","tests/test_chain.rs":"69661c21b7257bf9c52792cb66d16f4dd5b62131381b8e6dbee1fb177433aec9","tests/test_debug.rs":"13299107172809e8cbbd823964ac9450cd0d6b6de79f2e6a2e0f44b9225a0593","tests/test_iter.rs":"c1f46823df26a90139645fd8728a03138edd95b2849dfec830452a80ddd9726d","tests/test_reader.rs":"bf83669d4e0960dad6aa47b46a9a454814fab626eb83572aba914c3d71618f43","tests/test_serde.rs":"2691f891796ba259de0ecf926de05c514f4912cc5fcd3e6a1591efbcd23ed4d0","tests/test_take.rs":"db01bf6855097f318336e90d12c0725a92cee426d330e477a6bd1d32dac34a27"},"package":"c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,15 +13,16 @@
 [package]
 edition = "2018"
 name = "bytes"
-version = "0.5.6"
+version = "1.1.0"
 authors = ["Carl Lerche <me@carllerche.com>", "Sean McArthur <sean@seanmonstar.com>"]
 description = "Types and traits for working with bytes"
-documentation = "https://docs.rs/bytes"
 readme = "README.md"
 keywords = ["buffers", "zero-copy", "io"]
 categories = ["network-programming", "data-structures"]
 license = "MIT"
 repository = "https://github.com/tokio-rs/bytes"
+[package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.serde]
 version = "1.0.60"
 features = ["alloc"]
@@ -34,4 +35,4 @@
 default = ["std"]
 std = []
 [target."cfg(loom)".dev-dependencies.loom]
-version = "0.3"
+version = "0.5"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,57 @@
+# 1.1.0 (August 25, 2021)
+
+### Added
+
+- `BufMut::put_bytes(self, val, cnt)` (#487)
+- Implement `From<Box<[u8]>>` for `Bytes` (#504)
+
+### Changed
+
+- Override `put_slice` for `&mut [u8]` (#483)
+- Panic on integer overflow in `Chain::remaining` (#482)
+- Add inline tags to `UninitSlice` methods (#443)
+- Override `copy_to_bytes` for Chain and Take (#481)
+- Keep capacity when unsplit on empty other buf (#502)
+
+### Documented
+
+- Clarify `BufMut` allocation guarantees (#501)
+- Clarify `BufMut::put_int` behavior (#486)
+- Clarify actions of `clear` and `truncate`. (#508)
+
+# 1.0.1 (January 11, 2021)
+
+### Changed
+- mark `Vec::put_slice` with `#[inline]` (#459)
+
+### Fixed
+- Fix deprecation warning (#457)
+- use `Box::into_raw` instead of `mem::forget`-in-disguise (#458)
+
+# 1.0.0 (December 22, 2020)
+
+### Changed
+- Rename `Buf`/`BufMut` methods `bytes()` and `bytes_mut()` to `chunk()` and `chunk_mut()` (#450)
+
+### Removed
+- remove unused Buf implementation. (#449)
+
+# 0.6.0 (October 21, 2020)
+
+API polish in preparation for a 1.0 release.
+
+### Changed
+- `BufMut` is now an `unsafe` trait (#432).
+- `BufMut::bytes_mut()` returns `&mut UninitSlice`, a type owned by `bytes` to
+  avoid undefined behavior (#433).
+- `Buf::copy_to_bytes(len)` replaces `Buf::into_bytes()` (#439).
+- `Buf`/`BufMut` utility methods are moved onto the trait and `*Ext` traits are
+  removed (#431).
+
+### Removed
+- `BufMut::bytes_vectored_mut()` (#430).
+- `new` methods on combinator types (#434).
+
 # 0.5.6 (July 13, 2020)
 
 - Improve `BytesMut` to reuse buffer when fully `advance`d.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/ci/miri.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/ci/miri.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/ci/miri.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/ci/miri.sh	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+MIRI_NIGHTLY=nightly-$(curl -s https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/miri)
+echo "Installing latest nightly with Miri: $MIRI_NIGHTLY"
+rustup set profile minimal
+rustup default "$MIRI_NIGHTLY"
+rustup component add miri
+
+cargo miri test
+cargo miri test --target mips64-unknown-linux-gnuabi64
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/ci/test-stable.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/ci/test-stable.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/ci/test-stable.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/ci/test-stable.sh	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,8 @@
 cmd="${1:-test}"
 
 # Install cargo-hack for feature flag test
-cargo install cargo-hack
+host=$(rustc -Vv | grep host | sed 's/host: //')
+curl -LsSf https://github.com/taiki-e/cargo-hack/releases/latest/download/cargo-hack-$host.tar.gz | tar xzf - -C ~/.cargo/bin
 
 # Run with each feature
 # * --each-feature includes both default/no-default features
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -18,7 +18,7 @@
 
 ```toml
 [dependencies]
-bytes = "0.5"
+bytes = "1"
 ```
 
 Next, add this to your crate:
@@ -33,7 +33,7 @@
 
 ```toml
 [dependencies]
-bytes = { version = "0.5", features = ["serde"] }
+bytes = { version = "1", features = ["serde"] }
 ```
 
 ## License
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/buf_impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/buf_impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/buf_impl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/buf_impl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,7 @@
+#[cfg(feature = "std")]
+use crate::buf::{reader, Reader};
+use crate::buf::{take, Chain, Take};
+
 use core::{cmp, mem, ptr};
 
 #[cfg(feature = "std")]
@@ -12,7 +16,7 @@
         // this Option<ret> trick is to avoid keeping a borrow on self
         // when advance() is called (mut borrow) and to call bytes() only once
         let ret = $this
-            .bytes()
+            .chunk()
             .get(..SIZE)
             .map(|src| unsafe { $typ::$conv(*(src as *const _ as *const [_; SIZE])) });
 
@@ -74,7 +78,7 @@
     /// the buffer.
     ///
     /// This value is greater than or equal to the length of the slice returned
-    /// by `bytes`.
+    /// by `chunk()`.
     ///
     /// # Examples
     ///
@@ -111,31 +115,34 @@
     ///
     /// let mut buf = &b"hello world"[..];
     ///
-    /// assert_eq!(buf.bytes(), &b"hello world"[..]);
+    /// assert_eq!(buf.chunk(), &b"hello world"[..]);
     ///
     /// buf.advance(6);
     ///
-    /// assert_eq!(buf.bytes(), &b"world"[..]);
+    /// assert_eq!(buf.chunk(), &b"world"[..]);
     /// ```
     ///
     /// # Implementer notes
     ///
     /// This function should never panic. Once the end of the buffer is reached,
-    /// i.e., `Buf::remaining` returns 0, calls to `bytes` should return an
+    /// i.e., `Buf::remaining` returns 0, calls to `chunk()` should return an
     /// empty slice.
-    fn bytes(&self) -> &[u8];
+    // The `chunk` method was previously called `bytes`. This alias makes the rename
+    // more easily discoverable.
+    #[cfg_attr(docsrs, doc(alias = "bytes"))]
+    fn chunk(&self) -> &[u8];
 
     /// Fills `dst` with potentially multiple slices starting at `self`'s
     /// current position.
     ///
-    /// If the `Buf` is backed by disjoint slices of bytes, `bytes_vectored` enables
+    /// If the `Buf` is backed by disjoint slices of bytes, `chunk_vectored` enables
     /// fetching more than one slice at once. `dst` is a slice of `IoSlice`
     /// references, enabling the slice to be directly used with [`writev`]
     /// without any further conversion. The sum of the lengths of all the
     /// buffers in `dst` will be less than or equal to `Buf::remaining()`.
     ///
     /// The entries in `dst` will be overwritten, but the data **contained** by
-    /// the slices **will not** be modified. If `bytes_vectored` does not fill every
+    /// the slices **will not** be modified. If `chunk_vectored` does not fill every
     /// entry in `dst`, then `dst` is guaranteed to contain all remaining slices
     /// in `self.
     ///
@@ -145,7 +152,7 @@
     /// # Implementer notes
     ///
     /// This function should never panic. Once the end of the buffer is reached,
-    /// i.e., `Buf::remaining` returns 0, calls to `bytes_vectored` must return 0
+    /// i.e., `Buf::remaining` returns 0, calls to `chunk_vectored` must return 0
     /// without mutating `dst`.
     ///
     /// Implementations should also take care to properly handle being called
@@ -153,13 +160,13 @@
     ///
     /// [`writev`]: http://man7.org/linux/man-pages/man2/readv.2.html
     #[cfg(feature = "std")]
-    fn bytes_vectored<'a>(&'a self, dst: &mut [IoSlice<'a>]) -> usize {
+    fn chunks_vectored<'a>(&'a self, dst: &mut [IoSlice<'a>]) -> usize {
         if dst.is_empty() {
             return 0;
         }
 
         if self.has_remaining() {
-            dst[0] = IoSlice::new(self.bytes());
+            dst[0] = IoSlice::new(self.chunk());
             1
         } else {
             0
@@ -168,7 +175,7 @@
 
     /// Advance the internal cursor of the Buf
     ///
-    /// The next call to `bytes` will return a slice starting `cnt` bytes
+    /// The next call to `chunk()` will return a slice starting `cnt` bytes
     /// further into the underlying buffer.
     ///
     /// # Examples
@@ -178,11 +185,11 @@
     ///
     /// let mut buf = &b"hello world"[..];
     ///
-    /// assert_eq!(buf.bytes(), &b"hello world"[..]);
+    /// assert_eq!(buf.chunk(), &b"hello world"[..]);
     ///
     /// buf.advance(6);
     ///
-    /// assert_eq!(buf.bytes(), &b"world"[..]);
+    /// assert_eq!(buf.chunk(), &b"world"[..]);
     /// ```
     ///
     /// # Panics
@@ -249,7 +256,7 @@
             let cnt;
 
             unsafe {
-                let src = self.bytes();
+                let src = self.chunk();
                 cnt = cmp::min(src.len(), dst.len() - off);
 
                 ptr::copy_nonoverlapping(src.as_ptr(), dst[off..].as_mut_ptr(), cnt);
@@ -279,7 +286,7 @@
     /// This function panics if there is no more remaining data in `self`.
     fn get_u8(&mut self) -> u8 {
         assert!(self.remaining() >= 1);
-        let ret = self.bytes()[0];
+        let ret = self.chunk()[0];
         self.advance(1);
         ret
     }
@@ -302,7 +309,7 @@
     /// This function panics if there is no more remaining data in `self`.
     fn get_i8(&mut self) -> i8 {
         assert!(self.remaining() >= 1);
-        let ret = self.bytes()[0] as i8;
+        let ret = self.chunk()[0] as i8;
         self.advance(1);
         ret
     }
@@ -791,22 +798,111 @@
         f64::from_bits(Self::get_u64_le(self))
     }
 
-    /// Consumes remaining bytes inside self and returns new instance of `Bytes`
+    /// Consumes `len` bytes inside self and returns new instance of `Bytes`
+    /// with this data.
+    ///
+    /// This function may be optimized by the underlying type to avoid actual
+    /// copies. For example, `Bytes` implementation will do a shallow copy
+    /// (ref-count increment).
     ///
     /// # Examples
     ///
     /// ```
     /// use bytes::Buf;
     ///
-    /// let bytes = (&b"hello world"[..]).to_bytes();
-    /// assert_eq!(&bytes[..], &b"hello world"[..]);
+    /// let bytes = (&b"hello world"[..]).copy_to_bytes(5);
+    /// assert_eq!(&bytes[..], &b"hello"[..]);
     /// ```
-    fn to_bytes(&mut self) -> crate::Bytes {
+    fn copy_to_bytes(&mut self, len: usize) -> crate::Bytes {
         use super::BufMut;
-        let mut ret = crate::BytesMut::with_capacity(self.remaining());
-        ret.put(self);
+
+        assert!(len <= self.remaining(), "`len` greater than remaining");
+
+        let mut ret = crate::BytesMut::with_capacity(len);
+        ret.put(self.take(len));
         ret.freeze()
     }
+
+    /// Creates an adaptor which will read at most `limit` bytes from `self`.
+    ///
+    /// This function returns a new instance of `Buf` which will read at most
+    /// `limit` bytes.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::{Buf, BufMut};
+    ///
+    /// let mut buf = b"hello world"[..].take(5);
+    /// let mut dst = vec![];
+    ///
+    /// dst.put(&mut buf);
+    /// assert_eq!(dst, b"hello");
+    ///
+    /// let mut buf = buf.into_inner();
+    /// dst.clear();
+    /// dst.put(&mut buf);
+    /// assert_eq!(dst, b" world");
+    /// ```
+    fn take(self, limit: usize) -> Take<Self>
+    where
+        Self: Sized,
+    {
+        take::new(self, limit)
+    }
+
+    /// Creates an adaptor which will chain this buffer with another.
+    ///
+    /// The returned `Buf` instance will first consume all bytes from `self`.
+    /// Afterwards the output is equivalent to the output of next.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::Buf;
+    ///
+    /// let mut chain = b"hello "[..].chain(&b"world"[..]);
+    ///
+    /// let full = chain.copy_to_bytes(11);
+    /// assert_eq!(full.chunk(), b"hello world");
+    /// ```
+    fn chain<U: Buf>(self, next: U) -> Chain<Self, U>
+    where
+        Self: Sized,
+    {
+        Chain::new(self, next)
+    }
+
+    /// Creates an adaptor which implements the `Read` trait for `self`.
+    ///
+    /// This function returns a new value which implements `Read` by adapting
+    /// the `Read` trait functions to the `Buf` trait functions. Given that
+    /// `Buf` operations are infallible, none of the `Read` functions will
+    /// return with `Err`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::{Bytes, Buf};
+    /// use std::io::Read;
+    ///
+    /// let buf = Bytes::from("hello world");
+    ///
+    /// let mut reader = buf.reader();
+    /// let mut dst = [0; 1024];
+    ///
+    /// let num = reader.read(&mut dst).unwrap();
+    ///
+    /// assert_eq!(11, num);
+    /// assert_eq!(&dst[..11], &b"hello world"[..]);
+    /// ```
+    #[cfg(feature = "std")]
+    fn reader(self) -> Reader<Self>
+    where
+        Self: Sized,
+    {
+        reader::new(self)
+    }
 }
 
 macro_rules! deref_forward_buf {
@@ -815,13 +911,13 @@
             (**self).remaining()
         }
 
-        fn bytes(&self) -> &[u8] {
-            (**self).bytes()
+        fn chunk(&self) -> &[u8] {
+            (**self).chunk()
         }
 
         #[cfg(feature = "std")]
-        fn bytes_vectored<'b>(&'b self, dst: &mut [IoSlice<'b>]) -> usize {
-            (**self).bytes_vectored(dst)
+        fn chunks_vectored<'b>(&'b self, dst: &mut [IoSlice<'b>]) -> usize {
+            (**self).chunks_vectored(dst)
         }
 
         fn advance(&mut self, cnt: usize) {
@@ -908,8 +1004,8 @@
             (**self).get_int_le(nbytes)
         }
 
-        fn to_bytes(&mut self) -> crate::Bytes {
-            (**self).to_bytes()
+        fn copy_to_bytes(&mut self, len: usize) -> crate::Bytes {
+            (**self).copy_to_bytes(len)
         }
     };
 }
@@ -929,7 +1025,7 @@
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         self
     }
 
@@ -939,35 +1035,6 @@
     }
 }
 
-impl Buf for Option<[u8; 1]> {
-    fn remaining(&self) -> usize {
-        if self.is_some() {
-            1
-        } else {
-            0
-        }
-    }
-
-    fn bytes(&self) -> &[u8] {
-        self.as_ref()
-            .map(AsRef::as_ref)
-            .unwrap_or(Default::default())
-    }
-
-    fn advance(&mut self, cnt: usize) {
-        if cnt == 0 {
-            return;
-        }
-
-        if self.is_none() {
-            panic!("overflow");
-        } else {
-            assert_eq!(1, cnt);
-            *self = None;
-        }
-    }
-}
-
 #[cfg(feature = "std")]
 impl<T: AsRef<[u8]>> Buf for std::io::Cursor<T> {
     fn remaining(&self) -> usize {
@@ -981,7 +1048,7 @@
         len - pos as usize
     }
 
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         let len = self.get_ref().as_ref().len();
         let pos = self.position();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/buf_mut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/buf_mut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/buf_mut.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/buf_mut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,8 @@
-use core::{
-    cmp,
-    mem::{self, MaybeUninit},
-    ptr, usize,
-};
-
+use crate::buf::{limit, Chain, Limit, UninitSlice};
 #[cfg(feature = "std")]
-use std::fmt;
+use crate::buf::{writer, Writer};
+
+use core::{cmp, mem, ptr, usize};
 
 use alloc::{boxed::Box, vec::Vec};
 
@@ -29,12 +26,16 @@
 ///
 /// assert_eq!(buf, b"hello world");
 /// ```
-pub trait BufMut {
+pub unsafe trait BufMut {
     /// Returns the number of bytes that can be written from the current
     /// position until the end of the buffer is reached.
     ///
     /// This value is greater than or equal to the length of the slice returned
-    /// by `bytes_mut`.
+    /// by `chunk_mut()`.
+    ///
+    /// Writing to a `BufMut` may involve allocating more memory on the fly.
+    /// Implementations may fail before reaching the number of bytes indicated
+    /// by this method if they encounter an allocation failure.
     ///
     /// # Examples
     ///
@@ -59,7 +60,7 @@
 
     /// Advance the internal cursor of the BufMut
     ///
-    /// The next call to `bytes_mut` will return a slice starting `cnt` bytes
+    /// The next call to `chunk_mut` will return a slice starting `cnt` bytes
     /// further into the underlying buffer.
     ///
     /// This function is unsafe because there is no guarantee that the bytes
@@ -72,19 +73,14 @@
     ///
     /// let mut buf = Vec::with_capacity(16);
     ///
-    /// unsafe {
-    ///     // MaybeUninit::as_mut_ptr
-    ///     buf.bytes_mut()[0].as_mut_ptr().write(b'h');
-    ///     buf.bytes_mut()[1].as_mut_ptr().write(b'e');
-    ///
-    ///     buf.advance_mut(2);
+    /// // Write some data
+    /// buf.chunk_mut()[0..2].copy_from_slice(b"he");
+    /// unsafe { buf.advance_mut(2) };
     ///
-    ///     buf.bytes_mut()[0].as_mut_ptr().write(b'l');
-    ///     buf.bytes_mut()[1].as_mut_ptr().write(b'l');
-    ///     buf.bytes_mut()[2].as_mut_ptr().write(b'o');
+    /// // write more bytes
+    /// buf.chunk_mut()[0..3].copy_from_slice(b"llo");
     ///
-    ///     buf.advance_mut(3);
-    /// }
+    /// unsafe { buf.advance_mut(3); }
     ///
     /// assert_eq!(5, buf.len());
     /// assert_eq!(buf, b"hello");
@@ -143,14 +139,14 @@
     ///
     /// unsafe {
     ///     // MaybeUninit::as_mut_ptr
-    ///     buf.bytes_mut()[0].as_mut_ptr().write(b'h');
-    ///     buf.bytes_mut()[1].as_mut_ptr().write(b'e');
+    ///     buf.chunk_mut()[0..].as_mut_ptr().write(b'h');
+    ///     buf.chunk_mut()[1..].as_mut_ptr().write(b'e');
     ///
     ///     buf.advance_mut(2);
     ///
-    ///     buf.bytes_mut()[0].as_mut_ptr().write(b'l');
-    ///     buf.bytes_mut()[1].as_mut_ptr().write(b'l');
-    ///     buf.bytes_mut()[2].as_mut_ptr().write(b'o');
+    ///     buf.chunk_mut()[0..].as_mut_ptr().write(b'l');
+    ///     buf.chunk_mut()[1..].as_mut_ptr().write(b'l');
+    ///     buf.chunk_mut()[2..].as_mut_ptr().write(b'o');
     ///
     ///     buf.advance_mut(3);
     /// }
@@ -161,54 +157,18 @@
     ///
     /// # Implementer notes
     ///
-    /// This function should never panic. `bytes_mut` should return an empty
-    /// slice **if and only if** `remaining_mut` returns 0. In other words,
-    /// `bytes_mut` returning an empty slice implies that `remaining_mut` will
-    /// return 0 and `remaining_mut` returning 0 implies that `bytes_mut` will
+    /// This function should never panic. `chunk_mut` should return an empty
+    /// slice **if and only if** `remaining_mut()` returns 0. In other words,
+    /// `chunk_mut()` returning an empty slice implies that `remaining_mut()` will
+    /// return 0 and `remaining_mut()` returning 0 implies that `chunk_mut()` will
     /// return an empty slice.
-    fn bytes_mut(&mut self) -> &mut [MaybeUninit<u8>];
-
-    /// Fills `dst` with potentially multiple mutable slices starting at `self`'s
-    /// current position.
-    ///
-    /// If the `BufMut` is backed by disjoint slices of bytes, `bytes_vectored_mut`
-    /// enables fetching more than one slice at once. `dst` is a slice of
-    /// mutable `IoSliceMut` references, enabling the slice to be directly used with
-    /// [`readv`] without any further conversion. The sum of the lengths of all
-    /// the buffers in `dst` will be less than or equal to
-    /// `Buf::remaining_mut()`.
-    ///
-    /// The entries in `dst` will be overwritten, but the data **contained** by
-    /// the slices **will not** be modified. If `bytes_vectored_mut` does not fill every
-    /// entry in `dst`, then `dst` is guaranteed to contain all remaining slices
-    /// in `self.
-    ///
-    /// This is a lower level function. Most operations are done with other
-    /// functions.
-    ///
-    /// # Implementer notes
     ///
-    /// This function should never panic. Once the end of the buffer is reached,
-    /// i.e., `BufMut::remaining_mut` returns 0, calls to `bytes_vectored_mut` must
-    /// return 0 without mutating `dst`.
-    ///
-    /// Implementations should also take care to properly handle being called
-    /// with `dst` being a zero length slice.
-    ///
-    /// [`readv`]: http://man7.org/linux/man-pages/man2/readv.2.html
-    #[cfg(feature = "std")]
-    fn bytes_vectored_mut<'a>(&'a mut self, dst: &mut [IoSliceMut<'a>]) -> usize {
-        if dst.is_empty() {
-            return 0;
-        }
-
-        if self.has_remaining_mut() {
-            dst[0] = IoSliceMut::from(self.bytes_mut());
-            1
-        } else {
-            0
-        }
-    }
+    /// This function may trigger an out-of-memory abort if it tries to allocate
+    /// memory and fails to do so.
+    // The `chunk_mut` method was previously called `bytes_mut`. This alias makes the
+    // rename more easily discoverable.
+    #[cfg_attr(docsrs, doc(alias = "bytes_mut"))]
+    fn chunk_mut(&mut self) -> &mut UninitSlice;
 
     /// Transfer bytes into `self` from `src` and advance the cursor by the
     /// number of bytes written.
@@ -240,8 +200,8 @@
             let l;
 
             unsafe {
-                let s = src.bytes();
-                let d = self.bytes_mut();
+                let s = src.chunk();
+                let d = self.chunk_mut();
                 l = cmp::min(s.len(), d.len());
 
                 ptr::copy_nonoverlapping(s.as_ptr(), d.as_mut_ptr() as *mut u8, l);
@@ -287,7 +247,7 @@
             let cnt;
 
             unsafe {
-                let dst = self.bytes_mut();
+                let dst = self.chunk_mut();
                 cnt = cmp::min(dst.len(), src.len() - off);
 
                 ptr::copy_nonoverlapping(src[off..].as_ptr(), dst.as_mut_ptr() as *mut u8, cnt);
@@ -301,6 +261,37 @@
         }
     }
 
+    /// Put `cnt` bytes `val` into `self`.
+    ///
+    /// Logically equivalent to calling `self.put_u8(val)` `cnt` times, but may work faster.
+    ///
+    /// `self` must have at least `cnt` remaining capacity.
+    ///
+    /// ```
+    /// use bytes::BufMut;
+    ///
+    /// let mut dst = [0; 6];
+    ///
+    /// {
+    ///     let mut buf = &mut dst[..];
+    ///     buf.put_bytes(b'a', 4);
+    ///
+    ///     assert_eq!(2, buf.remaining_mut());
+    /// }
+    ///
+    /// assert_eq!(b"aaaa\0\0", &dst);
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// This function panics if there is not enough remaining capacity in
+    /// `self`.
+    fn put_bytes(&mut self, val: u8, cnt: usize) {
+        for _ in 0..cnt {
+            self.put_u8(val);
+        }
+    }
+
     /// Writes an unsigned 8 bit integer to `self`.
     ///
     /// The current position is advanced by 1.
@@ -743,7 +734,7 @@
         self.put_slice(&n.to_le_bytes()[0..nbytes]);
     }
 
-    /// Writes a signed n-byte integer to `self` in big-endian byte order.
+    /// Writes low `nbytes` of a signed integer to `self` in big-endian byte order.
     ///
     /// The current position is advanced by `nbytes`.
     ///
@@ -753,19 +744,19 @@
     /// use bytes::BufMut;
     ///
     /// let mut buf = vec![];
-    /// buf.put_int(0x010203, 3);
+    /// buf.put_int(0x0504010203, 3);
     /// assert_eq!(buf, b"\x01\x02\x03");
     /// ```
     ///
     /// # Panics
     ///
     /// This function panics if there is not enough remaining capacity in
-    /// `self`.
+    /// `self` or if `nbytes` is greater than 8.
     fn put_int(&mut self, n: i64, nbytes: usize) {
         self.put_slice(&n.to_be_bytes()[mem::size_of_val(&n) - nbytes..]);
     }
 
-    /// Writes a signed n-byte integer to `self` in little-endian byte order.
+    /// Writes low `nbytes` of a signed integer to `self` in little-endian byte order.
     ///
     /// The current position is advanced by `nbytes`.
     ///
@@ -775,14 +766,14 @@
     /// use bytes::BufMut;
     ///
     /// let mut buf = vec![];
-    /// buf.put_int_le(0x010203, 3);
+    /// buf.put_int_le(0x0504010203, 3);
     /// assert_eq!(buf, b"\x03\x02\x01");
     /// ```
     ///
     /// # Panics
     ///
     /// This function panics if there is not enough remaining capacity in
-    /// `self`.
+    /// `self` or if `nbytes` is greater than 8.
     fn put_int_le(&mut self, n: i64, nbytes: usize) {
         self.put_slice(&n.to_le_bytes()[0..nbytes]);
     }
@@ -878,6 +869,83 @@
     fn put_f64_le(&mut self, n: f64) {
         self.put_u64_le(n.to_bits());
     }
+
+    /// Creates an adaptor which can write at most `limit` bytes to `self`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::BufMut;
+    ///
+    /// let arr = &mut [0u8; 128][..];
+    /// assert_eq!(arr.remaining_mut(), 128);
+    ///
+    /// let dst = arr.limit(10);
+    /// assert_eq!(dst.remaining_mut(), 10);
+    /// ```
+    fn limit(self, limit: usize) -> Limit<Self>
+    where
+        Self: Sized,
+    {
+        limit::new(self, limit)
+    }
+
+    /// Creates an adaptor which implements the `Write` trait for `self`.
+    ///
+    /// This function returns a new value which implements `Write` by adapting
+    /// the `Write` trait functions to the `BufMut` trait functions. Given that
+    /// `BufMut` operations are infallible, none of the `Write` functions will
+    /// return with `Err`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::BufMut;
+    /// use std::io::Write;
+    ///
+    /// let mut buf = vec![].writer();
+    ///
+    /// let num = buf.write(&b"hello world"[..]).unwrap();
+    /// assert_eq!(11, num);
+    ///
+    /// let buf = buf.into_inner();
+    ///
+    /// assert_eq!(*buf, b"hello world"[..]);
+    /// ```
+    #[cfg(feature = "std")]
+    fn writer(self) -> Writer<Self>
+    where
+        Self: Sized,
+    {
+        writer::new(self)
+    }
+
+    /// Creates an adapter which will chain this buffer with another.
+    ///
+    /// The returned `BufMut` instance will first write to all bytes from
+    /// `self`. Afterwards, it will write to `next`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::BufMut;
+    ///
+    /// let mut a = [0u8; 5];
+    /// let mut b = [0u8; 6];
+    ///
+    /// let mut chain = (&mut a[..]).chain_mut(&mut b[..]);
+    ///
+    /// chain.put_slice(b"hello world");
+    ///
+    /// assert_eq!(&a[..], b"hello");
+    /// assert_eq!(&b[..], b" world");
+    /// ```
+    fn chain_mut<U: BufMut>(self, next: U) -> Chain<Self, U>
+    where
+        Self: Sized,
+    {
+        Chain::new(self, next)
+    }
 }
 
 macro_rules! deref_forward_bufmut {
@@ -886,13 +954,8 @@
             (**self).remaining_mut()
         }
 
-        fn bytes_mut(&mut self) -> &mut [MaybeUninit<u8>] {
-            (**self).bytes_mut()
-        }
-
-        #[cfg(feature = "std")]
-        fn bytes_vectored_mut<'b>(&'b mut self, dst: &mut [IoSliceMut<'b>]) -> usize {
-            (**self).bytes_vectored_mut(dst)
+        fn chunk_mut(&mut self) -> &mut UninitSlice {
+            (**self).chunk_mut()
         }
 
         unsafe fn advance_mut(&mut self, cnt: usize) {
@@ -961,24 +1024,24 @@
     };
 }
 
-impl<T: BufMut + ?Sized> BufMut for &mut T {
+unsafe impl<T: BufMut + ?Sized> BufMut for &mut T {
     deref_forward_bufmut!();
 }
 
-impl<T: BufMut + ?Sized> BufMut for Box<T> {
+unsafe impl<T: BufMut + ?Sized> BufMut for Box<T> {
     deref_forward_bufmut!();
 }
 
-impl BufMut for &mut [u8] {
+unsafe impl BufMut for &mut [u8] {
     #[inline]
     fn remaining_mut(&self) -> usize {
         self.len()
     }
 
     #[inline]
-    fn bytes_mut(&mut self) -> &mut [MaybeUninit<u8>] {
-        // MaybeUninit is repr(transparent), so safe to transmute
-        unsafe { mem::transmute(&mut **self) }
+    fn chunk_mut(&mut self) -> &mut UninitSlice {
+        // UninitSlice is repr(transparent), so safe to transmute
+        unsafe { &mut *(*self as *mut [u8] as *mut _) }
     }
 
     #[inline]
@@ -987,12 +1050,29 @@
         let (_, b) = core::mem::replace(self, &mut []).split_at_mut(cnt);
         *self = b;
     }
+
+    #[inline]
+    fn put_slice(&mut self, src: &[u8]) {
+        self[..src.len()].copy_from_slice(src);
+        unsafe {
+            self.advance_mut(src.len());
+        }
+    }
+
+    fn put_bytes(&mut self, val: u8, cnt: usize) {
+        assert!(self.remaining_mut() >= cnt);
+        unsafe {
+            ptr::write_bytes(self.as_mut_ptr(), val, cnt);
+            self.advance_mut(cnt);
+        }
+    }
 }
 
-impl BufMut for Vec<u8> {
+unsafe impl BufMut for Vec<u8> {
     #[inline]
     fn remaining_mut(&self) -> usize {
-        usize::MAX - self.len()
+        // A vector can never have more than isize::MAX bytes
+        core::isize::MAX as usize - self.len()
     }
 
     #[inline]
@@ -1011,9 +1091,7 @@
     }
 
     #[inline]
-    fn bytes_mut(&mut self) -> &mut [MaybeUninit<u8>] {
-        use core::slice;
-
+    fn chunk_mut(&mut self) -> &mut UninitSlice {
         if self.capacity() == self.len() {
             self.reserve(64); // Grow the vec
         }
@@ -1021,13 +1099,12 @@
         let cap = self.capacity();
         let len = self.len();
 
-        let ptr = self.as_mut_ptr() as *mut MaybeUninit<u8>;
-        unsafe { &mut slice::from_raw_parts_mut(ptr, cap)[len..] }
+        let ptr = self.as_mut_ptr();
+        unsafe { &mut UninitSlice::from_raw_parts_mut(ptr, cap)[len..] }
     }
 
     // Specialize these methods so they can skip checking `remaining_mut`
     // and `advance_mut`.
-
     fn put<T: super::Buf>(&mut self, mut src: T)
     where
         Self: Sized,
@@ -1040,7 +1117,7 @@
 
             // a block to contain the src.bytes() borrow
             {
-                let s = src.bytes();
+                let s = src.chunk();
                 l = s.len();
                 self.extend_from_slice(s);
             }
@@ -1049,52 +1126,17 @@
         }
     }
 
+    #[inline]
     fn put_slice(&mut self, src: &[u8]) {
         self.extend_from_slice(src);
     }
+
+    fn put_bytes(&mut self, val: u8, cnt: usize) {
+        let new_len = self.len().checked_add(cnt).unwrap();
+        self.resize(new_len, val);
+    }
 }
 
 // The existence of this function makes the compiler catch if the BufMut
 // trait is "object-safe" or not.
 fn _assert_trait_object(_b: &dyn BufMut) {}
-
-// ===== impl IoSliceMut =====
-
-/// A buffer type used for `readv`.
-///
-/// This is a wrapper around an `std::io::IoSliceMut`, but does not expose
-/// the inner bytes in a safe API, as they may point at uninitialized memory.
-///
-/// This is `repr(transparent)` of the `std::io::IoSliceMut`, so it is valid to
-/// transmute them. However, as the memory might be uninitialized, care must be
-/// taken to not *read* the internal bytes, only *write* to them.
-#[repr(transparent)]
-#[cfg(feature = "std")]
-pub struct IoSliceMut<'a>(std::io::IoSliceMut<'a>);
-
-#[cfg(feature = "std")]
-impl fmt::Debug for IoSliceMut<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("IoSliceMut")
-            .field("len", &self.0.len())
-            .finish()
-    }
-}
-
-#[cfg(feature = "std")]
-impl<'a> From<&'a mut [u8]> for IoSliceMut<'a> {
-    fn from(buf: &'a mut [u8]) -> IoSliceMut<'a> {
-        IoSliceMut(std::io::IoSliceMut::new(buf))
-    }
-}
-
-#[cfg(feature = "std")]
-impl<'a> From<&'a mut [MaybeUninit<u8>]> for IoSliceMut<'a> {
-    fn from(buf: &'a mut [MaybeUninit<u8>]) -> IoSliceMut<'a> {
-        IoSliceMut(std::io::IoSliceMut::new(unsafe {
-            // We don't look at the contents, and `std::io::IoSliceMut`
-            // doesn't either.
-            mem::transmute::<&'a mut [MaybeUninit<u8>], &'a mut [u8]>(buf)
-        }))
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/chain.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/chain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,243 @@
+use crate::buf::{IntoIter, UninitSlice};
+use crate::{Buf, BufMut, Bytes};
+
+#[cfg(feature = "std")]
+use std::io::IoSlice;
+
+/// A `Chain` sequences two buffers.
+///
+/// `Chain` is an adapter that links two underlying buffers and provides a
+/// continuous view across both buffers. It is able to sequence either immutable
+/// buffers ([`Buf`] values) or mutable buffers ([`BufMut`] values).
+///
+/// This struct is generally created by calling [`Buf::chain`]. Please see that
+/// function's documentation for more detail.
+///
+/// # Examples
+///
+/// ```
+/// use bytes::{Bytes, Buf};
+///
+/// let mut buf = (&b"hello "[..])
+///     .chain(&b"world"[..]);
+///
+/// let full: Bytes = buf.copy_to_bytes(11);
+/// assert_eq!(full[..], b"hello world"[..]);
+/// ```
+///
+/// [`Buf::chain`]: trait.Buf.html#method.chain
+/// [`Buf`]: trait.Buf.html
+/// [`BufMut`]: trait.BufMut.html
+#[derive(Debug)]
+pub struct Chain<T, U> {
+    a: T,
+    b: U,
+}
+
+impl<T, U> Chain<T, U> {
+    /// Creates a new `Chain` sequencing the provided values.
+    pub(crate) fn new(a: T, b: U) -> Chain<T, U> {
+        Chain { a, b }
+    }
+
+    /// Gets a reference to the first underlying `Buf`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::Buf;
+    ///
+    /// let buf = (&b"hello"[..])
+    ///     .chain(&b"world"[..]);
+    ///
+    /// assert_eq!(buf.first_ref()[..], b"hello"[..]);
+    /// ```
+    pub fn first_ref(&self) -> &T {
+        &self.a
+    }
+
+    /// Gets a mutable reference to the first underlying `Buf`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::Buf;
+    ///
+    /// let mut buf = (&b"hello"[..])
+    ///     .chain(&b"world"[..]);
+    ///
+    /// buf.first_mut().advance(1);
+    ///
+    /// let full = buf.copy_to_bytes(9);
+    /// assert_eq!(full, b"elloworld"[..]);
+    /// ```
+    pub fn first_mut(&mut self) -> &mut T {
+        &mut self.a
+    }
+
+    /// Gets a reference to the last underlying `Buf`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::Buf;
+    ///
+    /// let buf = (&b"hello"[..])
+    ///     .chain(&b"world"[..]);
+    ///
+    /// assert_eq!(buf.last_ref()[..], b"world"[..]);
+    /// ```
+    pub fn last_ref(&self) -> &U {
+        &self.b
+    }
+
+    /// Gets a mutable reference to the last underlying `Buf`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::Buf;
+    ///
+    /// let mut buf = (&b"hello "[..])
+    ///     .chain(&b"world"[..]);
+    ///
+    /// buf.last_mut().advance(1);
+    ///
+    /// let full = buf.copy_to_bytes(10);
+    /// assert_eq!(full, b"hello orld"[..]);
+    /// ```
+    pub fn last_mut(&mut self) -> &mut U {
+        &mut self.b
+    }
+
+    /// Consumes this `Chain`, returning the underlying values.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::Buf;
+    ///
+    /// let chain = (&b"hello"[..])
+    ///     .chain(&b"world"[..]);
+    ///
+    /// let (first, last) = chain.into_inner();
+    /// assert_eq!(first[..], b"hello"[..]);
+    /// assert_eq!(last[..], b"world"[..]);
+    /// ```
+    pub fn into_inner(self) -> (T, U) {
+        (self.a, self.b)
+    }
+}
+
+impl<T, U> Buf for Chain<T, U>
+where
+    T: Buf,
+    U: Buf,
+{
+    fn remaining(&self) -> usize {
+        self.a.remaining().checked_add(self.b.remaining()).unwrap()
+    }
+
+    fn chunk(&self) -> &[u8] {
+        if self.a.has_remaining() {
+            self.a.chunk()
+        } else {
+            self.b.chunk()
+        }
+    }
+
+    fn advance(&mut self, mut cnt: usize) {
+        let a_rem = self.a.remaining();
+
+        if a_rem != 0 {
+            if a_rem >= cnt {
+                self.a.advance(cnt);
+                return;
+            }
+
+            // Consume what is left of a
+            self.a.advance(a_rem);
+
+            cnt -= a_rem;
+        }
+
+        self.b.advance(cnt);
+    }
+
+    #[cfg(feature = "std")]
+    fn chunks_vectored<'a>(&'a self, dst: &mut [IoSlice<'a>]) -> usize {
+        let mut n = self.a.chunks_vectored(dst);
+        n += self.b.chunks_vectored(&mut dst[n..]);
+        n
+    }
+
+    fn copy_to_bytes(&mut self, len: usize) -> Bytes {
+        let a_rem = self.a.remaining();
+        if a_rem >= len {
+            self.a.copy_to_bytes(len)
+        } else if a_rem == 0 {
+            self.b.copy_to_bytes(len)
+        } else {
+            assert!(
+                len - a_rem <= self.b.remaining(),
+                "`len` greater than remaining"
+            );
+            let mut ret = crate::BytesMut::with_capacity(len);
+            ret.put(&mut self.a);
+            ret.put((&mut self.b).take(len - a_rem));
+            ret.freeze()
+        }
+    }
+}
+
+unsafe impl<T, U> BufMut for Chain<T, U>
+where
+    T: BufMut,
+    U: BufMut,
+{
+    fn remaining_mut(&self) -> usize {
+        self.a
+            .remaining_mut()
+            .checked_add(self.b.remaining_mut())
+            .unwrap()
+    }
+
+    fn chunk_mut(&mut self) -> &mut UninitSlice {
+        if self.a.has_remaining_mut() {
+            self.a.chunk_mut()
+        } else {
+            self.b.chunk_mut()
+        }
+    }
+
+    unsafe fn advance_mut(&mut self, mut cnt: usize) {
+        let a_rem = self.a.remaining_mut();
+
+        if a_rem != 0 {
+            if a_rem >= cnt {
+                self.a.advance_mut(cnt);
+                return;
+            }
+
+            // Consume what is left of a
+            self.a.advance_mut(a_rem);
+
+            cnt -= a_rem;
+        }
+
+        self.b.advance_mut(cnt);
+    }
+}
+
+impl<T, U> IntoIterator for Chain<T, U>
+where
+    T: Buf,
+    U: Buf,
+{
+    type Item = u8;
+    type IntoIter = IntoIter<Chain<T, U>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        IntoIter::new(self)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/chain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/chain.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,233 +0,0 @@
-use crate::buf::IntoIter;
-use crate::{Buf, BufMut};
-
-use core::mem::MaybeUninit;
-
-#[cfg(feature = "std")]
-use crate::buf::IoSliceMut;
-#[cfg(feature = "std")]
-use std::io::IoSlice;
-
-/// A `Chain` sequences two buffers.
-///
-/// `Chain` is an adapter that links two underlying buffers and provides a
-/// continuous view across both buffers. It is able to sequence either immutable
-/// buffers ([`Buf`] values) or mutable buffers ([`BufMut`] values).
-///
-/// This struct is generally created by calling [`Buf::chain`]. Please see that
-/// function's documentation for more detail.
-///
-/// # Examples
-///
-/// ```
-/// use bytes::{Bytes, Buf, buf::BufExt};
-///
-/// let mut buf = (&b"hello "[..])
-///     .chain(&b"world"[..]);
-///
-/// let full: Bytes = buf.to_bytes();
-/// assert_eq!(full[..], b"hello world"[..]);
-/// ```
-///
-/// [`Buf::chain`]: trait.Buf.html#method.chain
-/// [`Buf`]: trait.Buf.html
-/// [`BufMut`]: trait.BufMut.html
-#[derive(Debug)]
-pub struct Chain<T, U> {
-    a: T,
-    b: U,
-}
-
-impl<T, U> Chain<T, U> {
-    /// Creates a new `Chain` sequencing the provided values.
-    pub fn new(a: T, b: U) -> Chain<T, U> {
-        Chain { a, b }
-    }
-
-    /// Gets a reference to the first underlying `Buf`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::buf::BufExt;
-    ///
-    /// let buf = (&b"hello"[..])
-    ///     .chain(&b"world"[..]);
-    ///
-    /// assert_eq!(buf.first_ref()[..], b"hello"[..]);
-    /// ```
-    pub fn first_ref(&self) -> &T {
-        &self.a
-    }
-
-    /// Gets a mutable reference to the first underlying `Buf`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::{Buf, buf::BufExt};
-    ///
-    /// let mut buf = (&b"hello"[..])
-    ///     .chain(&b"world"[..]);
-    ///
-    /// buf.first_mut().advance(1);
-    ///
-    /// let full = buf.to_bytes();
-    /// assert_eq!(full, b"elloworld"[..]);
-    /// ```
-    pub fn first_mut(&mut self) -> &mut T {
-        &mut self.a
-    }
-
-    /// Gets a reference to the last underlying `Buf`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::buf::BufExt;
-    ///
-    /// let buf = (&b"hello"[..])
-    ///     .chain(&b"world"[..]);
-    ///
-    /// assert_eq!(buf.last_ref()[..], b"world"[..]);
-    /// ```
-    pub fn last_ref(&self) -> &U {
-        &self.b
-    }
-
-    /// Gets a mutable reference to the last underlying `Buf`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::{Buf, buf::BufExt};
-    ///
-    /// let mut buf = (&b"hello "[..])
-    ///     .chain(&b"world"[..]);
-    ///
-    /// buf.last_mut().advance(1);
-    ///
-    /// let full = buf.to_bytes();
-    /// assert_eq!(full, b"hello orld"[..]);
-    /// ```
-    pub fn last_mut(&mut self) -> &mut U {
-        &mut self.b
-    }
-
-    /// Consumes this `Chain`, returning the underlying values.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::buf::BufExt;
-    ///
-    /// let chain = (&b"hello"[..])
-    ///     .chain(&b"world"[..]);
-    ///
-    /// let (first, last) = chain.into_inner();
-    /// assert_eq!(first[..], b"hello"[..]);
-    /// assert_eq!(last[..], b"world"[..]);
-    /// ```
-    pub fn into_inner(self) -> (T, U) {
-        (self.a, self.b)
-    }
-}
-
-impl<T, U> Buf for Chain<T, U>
-where
-    T: Buf,
-    U: Buf,
-{
-    fn remaining(&self) -> usize {
-        self.a.remaining() + self.b.remaining()
-    }
-
-    fn bytes(&self) -> &[u8] {
-        if self.a.has_remaining() {
-            self.a.bytes()
-        } else {
-            self.b.bytes()
-        }
-    }
-
-    fn advance(&mut self, mut cnt: usize) {
-        let a_rem = self.a.remaining();
-
-        if a_rem != 0 {
-            if a_rem >= cnt {
-                self.a.advance(cnt);
-                return;
-            }
-
-            // Consume what is left of a
-            self.a.advance(a_rem);
-
-            cnt -= a_rem;
-        }
-
-        self.b.advance(cnt);
-    }
-
-    #[cfg(feature = "std")]
-    fn bytes_vectored<'a>(&'a self, dst: &mut [IoSlice<'a>]) -> usize {
-        let mut n = self.a.bytes_vectored(dst);
-        n += self.b.bytes_vectored(&mut dst[n..]);
-        n
-    }
-}
-
-impl<T, U> BufMut for Chain<T, U>
-where
-    T: BufMut,
-    U: BufMut,
-{
-    fn remaining_mut(&self) -> usize {
-        self.a.remaining_mut() + self.b.remaining_mut()
-    }
-
-    fn bytes_mut(&mut self) -> &mut [MaybeUninit<u8>] {
-        if self.a.has_remaining_mut() {
-            self.a.bytes_mut()
-        } else {
-            self.b.bytes_mut()
-        }
-    }
-
-    unsafe fn advance_mut(&mut self, mut cnt: usize) {
-        let a_rem = self.a.remaining_mut();
-
-        if a_rem != 0 {
-            if a_rem >= cnt {
-                self.a.advance_mut(cnt);
-                return;
-            }
-
-            // Consume what is left of a
-            self.a.advance_mut(a_rem);
-
-            cnt -= a_rem;
-        }
-
-        self.b.advance_mut(cnt);
-    }
-
-    #[cfg(feature = "std")]
-    fn bytes_vectored_mut<'a>(&'a mut self, dst: &mut [IoSliceMut<'a>]) -> usize {
-        let mut n = self.a.bytes_vectored_mut(dst);
-        n += self.b.bytes_vectored_mut(&mut dst[n..]);
-        n
-    }
-}
-
-impl<T, U> IntoIterator for Chain<T, U>
-where
-    T: Buf,
-    U: Buf,
-{
-    type Item = u8;
-    type IntoIter = IntoIter<Chain<T, U>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        IntoIter::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/limit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/limit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/limit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/limit.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-use crate::BufMut;
-
-use core::{cmp, mem::MaybeUninit};
-
-/// A `BufMut` adapter which limits the amount of bytes that can be written
-/// to an underlying buffer.
-#[derive(Debug)]
-pub struct Limit<T> {
-    inner: T,
-    limit: usize,
-}
-
-pub(super) fn new<T>(inner: T, limit: usize) -> Limit<T> {
-    Limit { inner, limit }
-}
-
-impl<T> Limit<T> {
-    /// Consumes this `Limit`, returning the underlying value.
-    pub fn into_inner(self) -> T {
-        self.inner
-    }
-
-    /// Gets a reference to the underlying `BufMut`.
-    ///
-    /// It is inadvisable to directly write to the underlying `BufMut`.
-    pub fn get_ref(&self) -> &T {
-        &self.inner
-    }
-
-    /// Gets a mutable reference to the underlying `BufMut`.
-    ///
-    /// It is inadvisable to directly write to the underlying `BufMut`.
-    pub fn get_mut(&mut self) -> &mut T {
-        &mut self.inner
-    }
-
-    /// Returns the maximum number of bytes that can be written
-    ///
-    /// # Note
-    ///
-    /// If the inner `BufMut` has fewer bytes than indicated by this method then
-    /// that is the actual number of available bytes.
-    pub fn limit(&self) -> usize {
-        self.limit
-    }
-
-    /// Sets the maximum number of bytes that can be written.
-    ///
-    /// # Note
-    ///
-    /// If the inner `BufMut` has fewer bytes than `lim` then that is the actual
-    /// number of available bytes.
-    pub fn set_limit(&mut self, lim: usize) {
-        self.limit = lim
-    }
-}
-
-impl<T: BufMut> BufMut for Limit<T> {
-    fn remaining_mut(&self) -> usize {
-        cmp::min(self.inner.remaining_mut(), self.limit)
-    }
-
-    fn bytes_mut(&mut self) -> &mut [MaybeUninit<u8>] {
-        let bytes = self.inner.bytes_mut();
-        let end = cmp::min(bytes.len(), self.limit);
-        &mut bytes[..end]
-    }
-
-    unsafe fn advance_mut(&mut self, cnt: usize) {
-        assert!(cnt <= self.limit);
-        self.inner.advance_mut(cnt);
-        self.limit -= cnt;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-//! Extra utilities for `Buf` and `BufMut` types.
-
-use super::{Buf, BufMut};
-
-mod chain;
-mod limit;
-#[cfg(feature = "std")]
-mod reader;
-mod take;
-#[cfg(feature = "std")]
-mod writer;
-
-pub use self::chain::Chain;
-pub use self::limit::Limit;
-pub use self::take::Take;
-
-#[cfg(feature = "std")]
-pub use self::{reader::Reader, writer::Writer};
-
-/// Extra methods for implementations of `Buf`.
-pub trait BufExt: Buf {
-    /// Creates an adaptor which will read at most `limit` bytes from `self`.
-    ///
-    /// This function returns a new instance of `Buf` which will read at most
-    /// `limit` bytes.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::{BufMut, buf::BufExt};
-    ///
-    /// let mut buf = b"hello world"[..].take(5);
-    /// let mut dst = vec![];
-    ///
-    /// dst.put(&mut buf);
-    /// assert_eq!(dst, b"hello");
-    ///
-    /// let mut buf = buf.into_inner();
-    /// dst.clear();
-    /// dst.put(&mut buf);
-    /// assert_eq!(dst, b" world");
-    /// ```
-    fn take(self, limit: usize) -> Take<Self>
-    where
-        Self: Sized,
-    {
-        take::new(self, limit)
-    }
-
-    /// Creates an adaptor which will chain this buffer with another.
-    ///
-    /// The returned `Buf` instance will first consume all bytes from `self`.
-    /// Afterwards the output is equivalent to the output of next.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::{Buf, buf::BufExt};
-    ///
-    /// let mut chain = b"hello "[..].chain(&b"world"[..]);
-    ///
-    /// let full = chain.to_bytes();
-    /// assert_eq!(full.bytes(), b"hello world");
-    /// ```
-    fn chain<U: Buf>(self, next: U) -> Chain<Self, U>
-    where
-        Self: Sized,
-    {
-        Chain::new(self, next)
-    }
-
-    /// Creates an adaptor which implements the `Read` trait for `self`.
-    ///
-    /// This function returns a new value which implements `Read` by adapting
-    /// the `Read` trait functions to the `Buf` trait functions. Given that
-    /// `Buf` operations are infallible, none of the `Read` functions will
-    /// return with `Err`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::{Bytes, buf::BufExt};
-    /// use std::io::Read;
-    ///
-    /// let buf = Bytes::from("hello world");
-    ///
-    /// let mut reader = buf.reader();
-    /// let mut dst = [0; 1024];
-    ///
-    /// let num = reader.read(&mut dst).unwrap();
-    ///
-    /// assert_eq!(11, num);
-    /// assert_eq!(&dst[..11], &b"hello world"[..]);
-    /// ```
-    #[cfg(feature = "std")]
-    fn reader(self) -> Reader<Self>
-    where
-        Self: Sized,
-    {
-        reader::new(self)
-    }
-}
-
-impl<B: Buf + ?Sized> BufExt for B {}
-
-/// Extra methods for implementations of `BufMut`.
-pub trait BufMutExt: BufMut {
-    /// Creates an adaptor which can write at most `limit` bytes to `self`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::{BufMut, buf::BufMutExt};
-    ///
-    /// let arr = &mut [0u8; 128][..];
-    /// assert_eq!(arr.remaining_mut(), 128);
-    ///
-    /// let dst = arr.limit(10);
-    /// assert_eq!(dst.remaining_mut(), 10);
-    /// ```
-    fn limit(self, limit: usize) -> Limit<Self>
-    where
-        Self: Sized,
-    {
-        limit::new(self, limit)
-    }
-
-    /// Creates an adaptor which implements the `Write` trait for `self`.
-    ///
-    /// This function returns a new value which implements `Write` by adapting
-    /// the `Write` trait functions to the `BufMut` trait functions. Given that
-    /// `BufMut` operations are infallible, none of the `Write` functions will
-    /// return with `Err`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::buf::BufMutExt;
-    /// use std::io::Write;
-    ///
-    /// let mut buf = vec![].writer();
-    ///
-    /// let num = buf.write(&b"hello world"[..]).unwrap();
-    /// assert_eq!(11, num);
-    ///
-    /// let buf = buf.into_inner();
-    ///
-    /// assert_eq!(*buf, b"hello world"[..]);
-    /// ```
-    #[cfg(feature = "std")]
-    fn writer(self) -> Writer<Self>
-    where
-        Self: Sized,
-    {
-        writer::new(self)
-    }
-
-    /// Creates an adapter which will chain this buffer with another.
-    ///
-    /// The returned `BufMut` instance will first write to all bytes from
-    /// `self`. Afterwards, it will write to `next`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use bytes::{BufMut, buf::BufMutExt};
-    ///
-    /// let mut a = [0u8; 5];
-    /// let mut b = [0u8; 6];
-    ///
-    /// let mut chain = (&mut a[..]).chain_mut(&mut b[..]);
-    ///
-    /// chain.put_slice(b"hello world");
-    ///
-    /// assert_eq!(&a[..], b"hello");
-    /// assert_eq!(&b[..], b" world");
-    /// ```
-    fn chain_mut<U: BufMut>(self, next: U) -> Chain<Self, U>
-    where
-        Self: Sized,
-    {
-        Chain::new(self, next)
-    }
-}
-
-impl<B: BufMut + ?Sized> BufMutExt for B {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/reader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-use crate::Buf;
-
-use std::{cmp, io};
-
-/// A `Buf` adapter which implements `io::Read` for the inner value.
-///
-/// This struct is generally created by calling `reader()` on `Buf`. See
-/// documentation of [`reader()`](trait.Buf.html#method.reader) for more
-/// details.
-#[derive(Debug)]
-pub struct Reader<B> {
-    buf: B,
-}
-
-pub fn new<B>(buf: B) -> Reader<B> {
-    Reader { buf }
-}
-
-impl<B: Buf> Reader<B> {
-    /// Gets a reference to the underlying `Buf`.
-    ///
-    /// It is inadvisable to directly read from the underlying `Buf`.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::buf::BufExt;
-    ///
-    /// let buf = b"hello world".reader();
-    ///
-    /// assert_eq!(b"hello world", buf.get_ref());
-    /// ```
-    pub fn get_ref(&self) -> &B {
-        &self.buf
-    }
-
-    /// Gets a mutable reference to the underlying `Buf`.
-    ///
-    /// It is inadvisable to directly read from the underlying `Buf`.
-    pub fn get_mut(&mut self) -> &mut B {
-        &mut self.buf
-    }
-
-    /// Consumes this `Reader`, returning the underlying value.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::{Buf, buf::BufExt};
-    /// use std::io;
-    ///
-    /// let mut buf = b"hello world".reader();
-    /// let mut dst = vec![];
-    ///
-    /// io::copy(&mut buf, &mut dst).unwrap();
-    ///
-    /// let buf = buf.into_inner();
-    /// assert_eq!(0, buf.remaining());
-    /// ```
-    pub fn into_inner(self) -> B {
-        self.buf
-    }
-}
-
-impl<B: Buf + Sized> io::Read for Reader<B> {
-    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
-        let len = cmp::min(self.buf.remaining(), dst.len());
-
-        Buf::copy_to_slice(&mut self.buf, &mut dst[0..len]);
-        Ok(len)
-    }
-}
-
-impl<B: Buf + Sized> io::BufRead for Reader<B> {
-    fn fill_buf(&mut self) -> io::Result<&[u8]> {
-        Ok(self.buf.bytes())
-    }
-    fn consume(&mut self, amt: usize) {
-        self.buf.advance(amt)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/take.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/take.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/take.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/take.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-use crate::Buf;
-
-use core::cmp;
-
-/// A `Buf` adapter which limits the bytes read from an underlying buffer.
-///
-/// This struct is generally created by calling `take()` on `Buf`. See
-/// documentation of [`take()`](trait.BufExt.html#method.take) for more details.
-#[derive(Debug)]
-pub struct Take<T> {
-    inner: T,
-    limit: usize,
-}
-
-pub fn new<T>(inner: T, limit: usize) -> Take<T> {
-    Take { inner, limit }
-}
-
-impl<T> Take<T> {
-    /// Consumes this `Take`, returning the underlying value.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::buf::{BufMut, BufExt};
-    ///
-    /// let mut buf = b"hello world".take(2);
-    /// let mut dst = vec![];
-    ///
-    /// dst.put(&mut buf);
-    /// assert_eq!(*dst, b"he"[..]);
-    ///
-    /// let mut buf = buf.into_inner();
-    ///
-    /// dst.clear();
-    /// dst.put(&mut buf);
-    /// assert_eq!(*dst, b"llo world"[..]);
-    /// ```
-    pub fn into_inner(self) -> T {
-        self.inner
-    }
-
-    /// Gets a reference to the underlying `Buf`.
-    ///
-    /// It is inadvisable to directly read from the underlying `Buf`.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::{Buf, buf::BufExt};
-    ///
-    /// let buf = b"hello world".take(2);
-    ///
-    /// assert_eq!(11, buf.get_ref().remaining());
-    /// ```
-    pub fn get_ref(&self) -> &T {
-        &self.inner
-    }
-
-    /// Gets a mutable reference to the underlying `Buf`.
-    ///
-    /// It is inadvisable to directly read from the underlying `Buf`.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::{Buf, BufMut, buf::BufExt};
-    ///
-    /// let mut buf = b"hello world".take(2);
-    /// let mut dst = vec![];
-    ///
-    /// buf.get_mut().advance(2);
-    ///
-    /// dst.put(&mut buf);
-    /// assert_eq!(*dst, b"ll"[..]);
-    /// ```
-    pub fn get_mut(&mut self) -> &mut T {
-        &mut self.inner
-    }
-
-    /// Returns the maximum number of bytes that can be read.
-    ///
-    /// # Note
-    ///
-    /// If the inner `Buf` has fewer bytes than indicated by this method then
-    /// that is the actual number of available bytes.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::{Buf, buf::BufExt};
-    ///
-    /// let mut buf = b"hello world".take(2);
-    ///
-    /// assert_eq!(2, buf.limit());
-    /// assert_eq!(b'h', buf.get_u8());
-    /// assert_eq!(1, buf.limit());
-    /// ```
-    pub fn limit(&self) -> usize {
-        self.limit
-    }
-
-    /// Sets the maximum number of bytes that can be read.
-    ///
-    /// # Note
-    ///
-    /// If the inner `Buf` has fewer bytes than `lim` then that is the actual
-    /// number of available bytes.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::{BufMut, buf::BufExt};
-    ///
-    /// let mut buf = b"hello world".take(2);
-    /// let mut dst = vec![];
-    ///
-    /// dst.put(&mut buf);
-    /// assert_eq!(*dst, b"he"[..]);
-    ///
-    /// dst.clear();
-    ///
-    /// buf.set_limit(3);
-    /// dst.put(&mut buf);
-    /// assert_eq!(*dst, b"llo"[..]);
-    /// ```
-    pub fn set_limit(&mut self, lim: usize) {
-        self.limit = lim
-    }
-}
-
-impl<T: Buf> Buf for Take<T> {
-    fn remaining(&self) -> usize {
-        cmp::min(self.inner.remaining(), self.limit)
-    }
-
-    fn bytes(&self) -> &[u8] {
-        let bytes = self.inner.bytes();
-        &bytes[..cmp::min(bytes.len(), self.limit)]
-    }
-
-    fn advance(&mut self, cnt: usize) {
-        assert!(cnt <= self.limit);
-        self.inner.advance(cnt);
-        self.limit -= cnt;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/ext/writer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/ext/writer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-use crate::BufMut;
-
-use std::{cmp, io};
-
-/// A `BufMut` adapter which implements `io::Write` for the inner value.
-///
-/// This struct is generally created by calling `writer()` on `BufMut`. See
-/// documentation of [`writer()`](trait.BufMut.html#method.writer) for more
-/// details.
-#[derive(Debug)]
-pub struct Writer<B> {
-    buf: B,
-}
-
-pub fn new<B>(buf: B) -> Writer<B> {
-    Writer { buf }
-}
-
-impl<B: BufMut> Writer<B> {
-    /// Gets a reference to the underlying `BufMut`.
-    ///
-    /// It is inadvisable to directly write to the underlying `BufMut`.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::buf::BufMutExt;
-    ///
-    /// let buf = Vec::with_capacity(1024).writer();
-    ///
-    /// assert_eq!(1024, buf.get_ref().capacity());
-    /// ```
-    pub fn get_ref(&self) -> &B {
-        &self.buf
-    }
-
-    /// Gets a mutable reference to the underlying `BufMut`.
-    ///
-    /// It is inadvisable to directly write to the underlying `BufMut`.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::buf::BufMutExt;
-    ///
-    /// let mut buf = vec![].writer();
-    ///
-    /// buf.get_mut().reserve(1024);
-    ///
-    /// assert_eq!(1024, buf.get_ref().capacity());
-    /// ```
-    pub fn get_mut(&mut self) -> &mut B {
-        &mut self.buf
-    }
-
-    /// Consumes this `Writer`, returning the underlying value.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use bytes::buf::BufMutExt;
-    /// use std::io;
-    ///
-    /// let mut buf = vec![].writer();
-    /// let mut src = &b"hello world"[..];
-    ///
-    /// io::copy(&mut src, &mut buf).unwrap();
-    ///
-    /// let buf = buf.into_inner();
-    /// assert_eq!(*buf, b"hello world"[..]);
-    /// ```
-    pub fn into_inner(self) -> B {
-        self.buf
-    }
-}
-
-impl<B: BufMut + Sized> io::Write for Writer<B> {
-    fn write(&mut self, src: &[u8]) -> io::Result<usize> {
-        let n = cmp::min(self.buf.remaining_mut(), src.len());
-
-        self.buf.put(&src[0..n]);
-        Ok(n)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,17 +34,16 @@
     ///
     /// ```
     /// use bytes::Bytes;
-    /// use bytes::buf::IntoIter;
     ///
     /// let buf = Bytes::from_static(b"abc");
-    /// let mut iter = IntoIter::new(buf);
+    /// let mut iter = buf.into_iter();
     ///
     /// assert_eq!(iter.next(), Some(b'a'));
     /// assert_eq!(iter.next(), Some(b'b'));
     /// assert_eq!(iter.next(), Some(b'c'));
     /// assert_eq!(iter.next(), None);
     /// ```
-    pub fn new(inner: T) -> IntoIter<T> {
+    pub(crate) fn new(inner: T) -> IntoIter<T> {
         IntoIter { inner }
     }
 
@@ -118,7 +117,7 @@
             return None;
         }
 
-        let b = self.inner.bytes()[0];
+        let b = self.inner.chunk()[0];
         self.inner.advance(1);
 
         Some(b)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/limit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/limit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/limit.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/limit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,75 @@
+use crate::buf::UninitSlice;
+use crate::BufMut;
+
+use core::cmp;
+
+/// A `BufMut` adapter which limits the amount of bytes that can be written
+/// to an underlying buffer.
+#[derive(Debug)]
+pub struct Limit<T> {
+    inner: T,
+    limit: usize,
+}
+
+pub(super) fn new<T>(inner: T, limit: usize) -> Limit<T> {
+    Limit { inner, limit }
+}
+
+impl<T> Limit<T> {
+    /// Consumes this `Limit`, returning the underlying value.
+    pub fn into_inner(self) -> T {
+        self.inner
+    }
+
+    /// Gets a reference to the underlying `BufMut`.
+    ///
+    /// It is inadvisable to directly write to the underlying `BufMut`.
+    pub fn get_ref(&self) -> &T {
+        &self.inner
+    }
+
+    /// Gets a mutable reference to the underlying `BufMut`.
+    ///
+    /// It is inadvisable to directly write to the underlying `BufMut`.
+    pub fn get_mut(&mut self) -> &mut T {
+        &mut self.inner
+    }
+
+    /// Returns the maximum number of bytes that can be written
+    ///
+    /// # Note
+    ///
+    /// If the inner `BufMut` has fewer bytes than indicated by this method then
+    /// that is the actual number of available bytes.
+    pub fn limit(&self) -> usize {
+        self.limit
+    }
+
+    /// Sets the maximum number of bytes that can be written.
+    ///
+    /// # Note
+    ///
+    /// If the inner `BufMut` has fewer bytes than `lim` then that is the actual
+    /// number of available bytes.
+    pub fn set_limit(&mut self, lim: usize) {
+        self.limit = lim
+    }
+}
+
+unsafe impl<T: BufMut> BufMut for Limit<T> {
+    fn remaining_mut(&self) -> usize {
+        cmp::min(self.inner.remaining_mut(), self.limit)
+    }
+
+    fn chunk_mut(&mut self) -> &mut UninitSlice {
+        let bytes = self.inner.chunk_mut();
+        let end = cmp::min(bytes.len(), self.limit);
+        &mut bytes[..end]
+    }
+
+    unsafe fn advance_mut(&mut self, cnt: usize) {
+        assert!(cnt <= self.limit);
+        self.inner.advance_mut(cnt);
+        self.limit -= cnt;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,13 +18,24 @@
 
 mod buf_impl;
 mod buf_mut;
-pub mod ext;
+mod chain;
 mod iter;
+mod limit;
+#[cfg(feature = "std")]
+mod reader;
+mod take;
+mod uninit_slice;
 mod vec_deque;
+#[cfg(feature = "std")]
+mod writer;
 
 pub use self::buf_impl::Buf;
 pub use self::buf_mut::BufMut;
-#[cfg(feature = "std")]
-pub use self::buf_mut::IoSliceMut;
-pub use self::ext::{BufExt, BufMutExt};
+pub use self::chain::Chain;
 pub use self::iter::IntoIter;
+pub use self::limit::Limit;
+pub use self::take::Take;
+pub use self::uninit_slice::UninitSlice;
+
+#[cfg(feature = "std")]
+pub use self::{reader::Reader, writer::Writer};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/reader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,81 @@
+use crate::Buf;
+
+use std::{cmp, io};
+
+/// A `Buf` adapter which implements `io::Read` for the inner value.
+///
+/// This struct is generally created by calling `reader()` on `Buf`. See
+/// documentation of [`reader()`](trait.Buf.html#method.reader) for more
+/// details.
+#[derive(Debug)]
+pub struct Reader<B> {
+    buf: B,
+}
+
+pub fn new<B>(buf: B) -> Reader<B> {
+    Reader { buf }
+}
+
+impl<B: Buf> Reader<B> {
+    /// Gets a reference to the underlying `Buf`.
+    ///
+    /// It is inadvisable to directly read from the underlying `Buf`.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::Buf;
+    ///
+    /// let buf = b"hello world".reader();
+    ///
+    /// assert_eq!(b"hello world", buf.get_ref());
+    /// ```
+    pub fn get_ref(&self) -> &B {
+        &self.buf
+    }
+
+    /// Gets a mutable reference to the underlying `Buf`.
+    ///
+    /// It is inadvisable to directly read from the underlying `Buf`.
+    pub fn get_mut(&mut self) -> &mut B {
+        &mut self.buf
+    }
+
+    /// Consumes this `Reader`, returning the underlying value.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::Buf;
+    /// use std::io;
+    ///
+    /// let mut buf = b"hello world".reader();
+    /// let mut dst = vec![];
+    ///
+    /// io::copy(&mut buf, &mut dst).unwrap();
+    ///
+    /// let buf = buf.into_inner();
+    /// assert_eq!(0, buf.remaining());
+    /// ```
+    pub fn into_inner(self) -> B {
+        self.buf
+    }
+}
+
+impl<B: Buf + Sized> io::Read for Reader<B> {
+    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
+        let len = cmp::min(self.buf.remaining(), dst.len());
+
+        Buf::copy_to_slice(&mut self.buf, &mut dst[0..len]);
+        Ok(len)
+    }
+}
+
+impl<B: Buf + Sized> io::BufRead for Reader<B> {
+    fn fill_buf(&mut self) -> io::Result<&[u8]> {
+        Ok(self.buf.chunk())
+    }
+    fn consume(&mut self, amt: usize) {
+        self.buf.advance(amt)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/take.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/take.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/take.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/take.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,155 @@
+use crate::{Buf, Bytes};
+
+use core::cmp;
+
+/// A `Buf` adapter which limits the bytes read from an underlying buffer.
+///
+/// This struct is generally created by calling `take()` on `Buf`. See
+/// documentation of [`take()`](trait.Buf.html#method.take) for more details.
+#[derive(Debug)]
+pub struct Take<T> {
+    inner: T,
+    limit: usize,
+}
+
+pub fn new<T>(inner: T, limit: usize) -> Take<T> {
+    Take { inner, limit }
+}
+
+impl<T> Take<T> {
+    /// Consumes this `Take`, returning the underlying value.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::{Buf, BufMut};
+    ///
+    /// let mut buf = b"hello world".take(2);
+    /// let mut dst = vec![];
+    ///
+    /// dst.put(&mut buf);
+    /// assert_eq!(*dst, b"he"[..]);
+    ///
+    /// let mut buf = buf.into_inner();
+    ///
+    /// dst.clear();
+    /// dst.put(&mut buf);
+    /// assert_eq!(*dst, b"llo world"[..]);
+    /// ```
+    pub fn into_inner(self) -> T {
+        self.inner
+    }
+
+    /// Gets a reference to the underlying `Buf`.
+    ///
+    /// It is inadvisable to directly read from the underlying `Buf`.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::Buf;
+    ///
+    /// let buf = b"hello world".take(2);
+    ///
+    /// assert_eq!(11, buf.get_ref().remaining());
+    /// ```
+    pub fn get_ref(&self) -> &T {
+        &self.inner
+    }
+
+    /// Gets a mutable reference to the underlying `Buf`.
+    ///
+    /// It is inadvisable to directly read from the underlying `Buf`.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::{Buf, BufMut};
+    ///
+    /// let mut buf = b"hello world".take(2);
+    /// let mut dst = vec![];
+    ///
+    /// buf.get_mut().advance(2);
+    ///
+    /// dst.put(&mut buf);
+    /// assert_eq!(*dst, b"ll"[..]);
+    /// ```
+    pub fn get_mut(&mut self) -> &mut T {
+        &mut self.inner
+    }
+
+    /// Returns the maximum number of bytes that can be read.
+    ///
+    /// # Note
+    ///
+    /// If the inner `Buf` has fewer bytes than indicated by this method then
+    /// that is the actual number of available bytes.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::Buf;
+    ///
+    /// let mut buf = b"hello world".take(2);
+    ///
+    /// assert_eq!(2, buf.limit());
+    /// assert_eq!(b'h', buf.get_u8());
+    /// assert_eq!(1, buf.limit());
+    /// ```
+    pub fn limit(&self) -> usize {
+        self.limit
+    }
+
+    /// Sets the maximum number of bytes that can be read.
+    ///
+    /// # Note
+    ///
+    /// If the inner `Buf` has fewer bytes than `lim` then that is the actual
+    /// number of available bytes.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::{Buf, BufMut};
+    ///
+    /// let mut buf = b"hello world".take(2);
+    /// let mut dst = vec![];
+    ///
+    /// dst.put(&mut buf);
+    /// assert_eq!(*dst, b"he"[..]);
+    ///
+    /// dst.clear();
+    ///
+    /// buf.set_limit(3);
+    /// dst.put(&mut buf);
+    /// assert_eq!(*dst, b"llo"[..]);
+    /// ```
+    pub fn set_limit(&mut self, lim: usize) {
+        self.limit = lim
+    }
+}
+
+impl<T: Buf> Buf for Take<T> {
+    fn remaining(&self) -> usize {
+        cmp::min(self.inner.remaining(), self.limit)
+    }
+
+    fn chunk(&self) -> &[u8] {
+        let bytes = self.inner.chunk();
+        &bytes[..cmp::min(bytes.len(), self.limit)]
+    }
+
+    fn advance(&mut self, cnt: usize) {
+        assert!(cnt <= self.limit);
+        self.inner.advance(cnt);
+        self.limit -= cnt;
+    }
+
+    fn copy_to_bytes(&mut self, len: usize) -> Bytes {
+        assert!(len <= self.remaining(), "`len` greater than remaining");
+
+        let r = self.inner.copy_to_bytes(len);
+        self.limit -= len;
+        r
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/uninit_slice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/uninit_slice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/uninit_slice.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/uninit_slice.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,183 @@
+use core::fmt;
+use core::mem::MaybeUninit;
+use core::ops::{
+    Index, IndexMut, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive,
+};
+
+/// Uninitialized byte slice.
+///
+/// Returned by `BufMut::chunk_mut()`, the referenced byte slice may be
+/// uninitialized. The wrapper provides safe access without introducing
+/// undefined behavior.
+///
+/// The safety invariants of this wrapper are:
+///
+///  1. Reading from an `UninitSlice` is undefined behavior.
+///  2. Writing uninitialized bytes to an `UninitSlice` is undefined behavior.
+///
+/// The difference between `&mut UninitSlice` and `&mut [MaybeUninit<u8>]` is
+/// that it is possible in safe code to write uninitialized bytes to an
+/// `&mut [MaybeUninit<u8>]`, which this type prohibits.
+#[repr(transparent)]
+pub struct UninitSlice([MaybeUninit<u8>]);
+
+impl UninitSlice {
+    /// Create a `&mut UninitSlice` from a pointer and a length.
+    ///
+    /// # Safety
+    ///
+    /// The caller must ensure that `ptr` references a valid memory region owned
+    /// by the caller representing a byte slice for the duration of `'a`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::buf::UninitSlice;
+    ///
+    /// let bytes = b"hello world".to_vec();
+    /// let ptr = bytes.as_ptr() as *mut _;
+    /// let len = bytes.len();
+    ///
+    /// let slice = unsafe { UninitSlice::from_raw_parts_mut(ptr, len) };
+    /// ```
+    #[inline]
+    pub unsafe fn from_raw_parts_mut<'a>(ptr: *mut u8, len: usize) -> &'a mut UninitSlice {
+        let maybe_init: &mut [MaybeUninit<u8>] =
+            core::slice::from_raw_parts_mut(ptr as *mut _, len);
+        &mut *(maybe_init as *mut [MaybeUninit<u8>] as *mut UninitSlice)
+    }
+
+    /// Write a single byte at the specified offset.
+    ///
+    /// # Panics
+    ///
+    /// The function panics if `index` is out of bounds.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::buf::UninitSlice;
+    ///
+    /// let mut data = [b'f', b'o', b'o'];
+    /// let slice = unsafe { UninitSlice::from_raw_parts_mut(data.as_mut_ptr(), 3) };
+    ///
+    /// slice.write_byte(0, b'b');
+    ///
+    /// assert_eq!(b"boo", &data[..]);
+    /// ```
+    #[inline]
+    pub fn write_byte(&mut self, index: usize, byte: u8) {
+        assert!(index < self.len());
+
+        unsafe { self[index..].as_mut_ptr().write(byte) }
+    }
+
+    /// Copies bytes  from `src` into `self`.
+    ///
+    /// The length of `src` must be the same as `self`.
+    ///
+    /// # Panics
+    ///
+    /// The function panics if `src` has a different length than `self`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::buf::UninitSlice;
+    ///
+    /// let mut data = [b'f', b'o', b'o'];
+    /// let slice = unsafe { UninitSlice::from_raw_parts_mut(data.as_mut_ptr(), 3) };
+    ///
+    /// slice.copy_from_slice(b"bar");
+    ///
+    /// assert_eq!(b"bar", &data[..]);
+    /// ```
+    #[inline]
+    pub fn copy_from_slice(&mut self, src: &[u8]) {
+        use core::ptr;
+
+        assert_eq!(self.len(), src.len());
+
+        unsafe {
+            ptr::copy_nonoverlapping(src.as_ptr(), self.as_mut_ptr(), self.len());
+        }
+    }
+
+    /// Return a raw pointer to the slice's buffer.
+    ///
+    /// # Safety
+    ///
+    /// The caller **must not** read from the referenced memory and **must not**
+    /// write **uninitialized** bytes to the slice either.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::BufMut;
+    ///
+    /// let mut data = [0, 1, 2];
+    /// let mut slice = &mut data[..];
+    /// let ptr = BufMut::chunk_mut(&mut slice).as_mut_ptr();
+    /// ```
+    #[inline]
+    pub fn as_mut_ptr(&mut self) -> *mut u8 {
+        self.0.as_mut_ptr() as *mut _
+    }
+
+    /// Returns the number of bytes in the slice.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use bytes::BufMut;
+    ///
+    /// let mut data = [0, 1, 2];
+    /// let mut slice = &mut data[..];
+    /// let len = BufMut::chunk_mut(&mut slice).len();
+    ///
+    /// assert_eq!(len, 3);
+    /// ```
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+}
+
+impl fmt::Debug for UninitSlice {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("UninitSlice[...]").finish()
+    }
+}
+
+macro_rules! impl_index {
+    ($($t:ty),*) => {
+        $(
+            impl Index<$t> for UninitSlice {
+                type Output = UninitSlice;
+
+                #[inline]
+                fn index(&self, index: $t) -> &UninitSlice {
+                    let maybe_uninit: &[MaybeUninit<u8>] = &self.0[index];
+                    unsafe { &*(maybe_uninit as *const [MaybeUninit<u8>] as *const UninitSlice) }
+                }
+            }
+
+            impl IndexMut<$t> for UninitSlice {
+                #[inline]
+                fn index_mut(&mut self, index: $t) -> &mut UninitSlice {
+                    let maybe_uninit: &mut [MaybeUninit<u8>] = &mut self.0[index];
+                    unsafe { &mut *(maybe_uninit as *mut [MaybeUninit<u8>] as *mut UninitSlice) }
+                }
+            }
+        )*
+    };
+}
+
+impl_index!(
+    Range<usize>,
+    RangeFrom<usize>,
+    RangeFull,
+    RangeInclusive<usize>,
+    RangeTo<usize>,
+    RangeToInclusive<usize>
+);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/vec_deque.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/vec_deque.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/vec_deque.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/vec_deque.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
         self.len()
     }
 
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         let (s1, s2) = self.as_slices();
         if s1.is_empty() {
             s2
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/buf/writer.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/buf/writer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,88 @@
+use crate::BufMut;
+
+use std::{cmp, io};
+
+/// A `BufMut` adapter which implements `io::Write` for the inner value.
+///
+/// This struct is generally created by calling `writer()` on `BufMut`. See
+/// documentation of [`writer()`](trait.BufMut.html#method.writer) for more
+/// details.
+#[derive(Debug)]
+pub struct Writer<B> {
+    buf: B,
+}
+
+pub fn new<B>(buf: B) -> Writer<B> {
+    Writer { buf }
+}
+
+impl<B: BufMut> Writer<B> {
+    /// Gets a reference to the underlying `BufMut`.
+    ///
+    /// It is inadvisable to directly write to the underlying `BufMut`.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::BufMut;
+    ///
+    /// let buf = Vec::with_capacity(1024).writer();
+    ///
+    /// assert_eq!(1024, buf.get_ref().capacity());
+    /// ```
+    pub fn get_ref(&self) -> &B {
+        &self.buf
+    }
+
+    /// Gets a mutable reference to the underlying `BufMut`.
+    ///
+    /// It is inadvisable to directly write to the underlying `BufMut`.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::BufMut;
+    ///
+    /// let mut buf = vec![].writer();
+    ///
+    /// buf.get_mut().reserve(1024);
+    ///
+    /// assert_eq!(1024, buf.get_ref().capacity());
+    /// ```
+    pub fn get_mut(&mut self) -> &mut B {
+        &mut self.buf
+    }
+
+    /// Consumes this `Writer`, returning the underlying value.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use bytes::BufMut;
+    /// use std::io;
+    ///
+    /// let mut buf = vec![].writer();
+    /// let mut src = &b"hello world"[..];
+    ///
+    /// io::copy(&mut src, &mut buf).unwrap();
+    ///
+    /// let buf = buf.into_inner();
+    /// assert_eq!(*buf, b"hello world"[..]);
+    /// ```
+    pub fn into_inner(self) -> B {
+        self.buf
+    }
+}
+
+impl<B: BufMut + Sized> io::Write for Writer<B> {
+    fn write(&mut self, src: &[u8]) -> io::Result<usize> {
+        let n = cmp::min(self.buf.remaining_mut(), src.len());
+
+        self.buf.put(&src[0..n]);
+        Ok(n)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/bytes_mut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/bytes_mut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/bytes_mut.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/bytes_mut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
     vec::Vec,
 };
 
-use crate::buf::IntoIter;
+use crate::buf::{IntoIter, UninitSlice};
 use crate::bytes::Vtable;
 #[allow(unused)]
 use crate::loom::sync::atomic::AtomicMut;
@@ -380,6 +380,8 @@
     /// If `len` is greater than the buffer's current length, this has no
     /// effect.
     ///
+    /// Existing underlying capacity is preserved.
+    ///
     /// The [`split_off`] method can emulate `truncate`, but this causes the
     /// excess bytes to be returned instead of dropped.
     ///
@@ -402,7 +404,7 @@
         }
     }
 
-    /// Clears the buffer, removing all data.
+    /// Clears the buffer, removing all data. Existing capacity is preserved.
     ///
     /// # Examples
     ///
@@ -445,7 +447,7 @@
             let additional = new_len - len;
             self.reserve(additional);
             unsafe {
-                let dst = self.bytes_mut().as_mut_ptr();
+                let dst = self.chunk_mut().as_mut_ptr();
                 ptr::write_bytes(dst, value, additional);
                 self.set_len(new_len);
             }
@@ -684,7 +686,7 @@
         self.reserve(cnt);
 
         unsafe {
-            let dst = self.maybe_uninit_bytes();
+            let dst = self.uninit_slice();
             // Reserved above
             debug_assert!(dst.len() >= cnt);
 
@@ -819,7 +821,7 @@
     }
 
     fn try_unsplit(&mut self, other: BytesMut) -> Result<(), BytesMut> {
-        if other.is_empty() {
+        if other.capacity() == 0 {
             return Ok(());
         }
 
@@ -910,12 +912,12 @@
     }
 
     #[inline]
-    fn maybe_uninit_bytes(&mut self) -> &mut [mem::MaybeUninit<u8>] {
+    fn uninit_slice(&mut self) -> &mut UninitSlice {
         unsafe {
             let ptr = self.ptr.as_ptr().offset(self.len as isize);
             let len = self.cap - self.len;
 
-            slice::from_raw_parts_mut(ptr as *mut mem::MaybeUninit<u8>, len)
+            UninitSlice::from_raw_parts_mut(ptr, len)
         }
     }
 }
@@ -944,7 +946,7 @@
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         self.as_slice()
     }
 
@@ -961,12 +963,12 @@
         }
     }
 
-    fn to_bytes(&mut self) -> crate::Bytes {
-        self.split().freeze()
+    fn copy_to_bytes(&mut self, len: usize) -> crate::Bytes {
+        self.split_to(len).freeze()
     }
 }
 
-impl BufMut for BytesMut {
+unsafe impl BufMut for BytesMut {
     #[inline]
     fn remaining_mut(&self) -> usize {
         usize::MAX - self.len()
@@ -985,11 +987,11 @@
     }
 
     #[inline]
-    fn bytes_mut(&mut self) -> &mut [mem::MaybeUninit<u8>] {
+    fn chunk_mut(&mut self) -> &mut UninitSlice {
         if self.capacity() == self.len() {
             self.reserve(64);
         }
-        self.maybe_uninit_bytes()
+        self.uninit_slice()
     }
 
     // Specialize these methods so they can skip checking `remaining_mut`
@@ -1000,7 +1002,7 @@
         Self: Sized,
     {
         while src.has_remaining() {
-            let s = src.bytes();
+            let s = src.chunk();
             let l = s.len();
             self.extend_from_slice(s);
             src.advance(l);
@@ -1010,6 +1012,19 @@
     fn put_slice(&mut self, src: &[u8]) {
         self.extend_from_slice(src);
     }
+
+    fn put_bytes(&mut self, val: u8, cnt: usize) {
+        self.reserve(cnt);
+        unsafe {
+            let dst = self.uninit_slice();
+            // Reserved above
+            debug_assert!(dst.len() >= cnt);
+
+            ptr::write_bytes(dst.as_mut_ptr(), val, cnt);
+
+            self.advance_mut(cnt);
+        }
+    }
 }
 
 impl AsRef<[u8]> for BytesMut {
@@ -1250,6 +1265,7 @@
     }
 }
 
+#[inline]
 fn original_capacity_to_repr(cap: usize) -> usize {
     let width = PTR_WIDTH - ((cap >> MIN_ORIGINAL_CAPACITY_WIDTH).leading_zeros() as usize);
     cmp::min(
@@ -1476,6 +1492,7 @@
     }
 }
 
+#[inline]
 fn vptr(ptr: *mut u8) -> NonNull<u8> {
     if cfg!(debug_assertions) {
         NonNull::new(ptr).expect("Vec pointer should be non-null")
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,16 +10,23 @@
 use crate::loom::sync::atomic::{self, AtomicPtr, AtomicUsize, Ordering};
 use crate::Buf;
 
-/// A reference counted contiguous slice of memory.
+/// A cheaply cloneable and sliceable chunk of contiguous memory.
 ///
 /// `Bytes` is an efficient container for storing and operating on contiguous
 /// slices of memory. It is intended for use primarily in networking code, but
 /// could have applications elsewhere as well.
 ///
 /// `Bytes` values facilitate zero-copy network programming by allowing multiple
-/// `Bytes` objects to point to the same underlying memory. This is managed by
-/// using a reference count to track when the memory is no longer needed and can
-/// be freed.
+/// `Bytes` objects to point to the same underlying memory.
+///
+/// `Bytes` does not have a single implementation. It is an interface, whose
+/// exact behavior is implemented through dynamic dispatch in several underlying
+/// implementations of `Bytes`.
+///
+/// All `Bytes` implementations must fulfill the following requirements:
+/// - They are cheaply cloneable and thereby shareable between an unlimited amount
+///   of components, for example by modifying a reference count.
+/// - Instances can be sliced to refer to a subset of the the original buffer.
 ///
 /// ```
 /// use bytes::Bytes;
@@ -41,17 +48,33 @@
 /// to track information about which segment of the underlying memory the
 /// `Bytes` handle has access to.
 ///
-/// `Bytes` keeps both a pointer to the shared `Arc` containing the full memory
+/// `Bytes` keeps both a pointer to the shared state containing the full memory
 /// slice and a pointer to the start of the region visible by the handle.
 /// `Bytes` also tracks the length of its view into the memory.
 ///
 /// # Sharing
 ///
-/// The memory itself is reference counted, and multiple `Bytes` objects may
-/// point to the same region. Each `Bytes` handle point to different sections within
-/// the memory region, and `Bytes` handle may or may not have overlapping views
+/// `Bytes` contains a vtable, which allows implementations of `Bytes` to define
+/// how sharing/cloneing is implemented in detail.
+/// When `Bytes::clone()` is called, `Bytes` will call the vtable function for
+/// cloning the backing storage in order to share it behind between multiple
+/// `Bytes` instances.
+///
+/// For `Bytes` implementations which refer to constant memory (e.g. created
+/// via `Bytes::from_static()`) the cloning implementation will be a no-op.
+///
+/// For `Bytes` implementations which point to a reference counted shared storage
+/// (e.g. an `Arc<[u8]>`), sharing will be implemented by increasing the
+/// the reference count.
+///
+/// Due to this mechanism, multiple `Bytes` instances may point to the same
+/// shared memory region.
+/// Each `Bytes` instance can point to different sections within that
+/// memory region, and `Bytes` instances may or may not have overlapping views
 /// into the memory.
 ///
+/// The following diagram visualizes a scenario where 2 `Bytes` instances make
+/// use of an `Arc`-based backing storage, and provide access to different views:
 ///
 /// ```text
 ///
@@ -175,7 +198,7 @@
         self.len == 0
     }
 
-    ///Creates `Bytes` instance from slice, by copying it.
+    /// Creates `Bytes` instance from slice, by copying it.
     pub fn copy_from_slice(data: &[u8]) -> Self {
         data.to_vec().into()
     }
@@ -214,7 +237,7 @@
         };
 
         let end = match range.end_bound() {
-            Bound::Included(&n) => n + 1,
+            Bound::Included(&n) => n.checked_add(1).expect("out of range"),
             Bound::Excluded(&n) => n,
             Bound::Unbounded => len,
         };
@@ -507,7 +530,7 @@
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         self.as_slice()
     }
 
@@ -525,8 +548,14 @@
         }
     }
 
-    fn to_bytes(&mut self) -> crate::Bytes {
-        core::mem::replace(self, Bytes::new())
+    fn copy_to_bytes(&mut self, len: usize) -> crate::Bytes {
+        if len == self.remaining() {
+            core::mem::replace(self, Bytes::new())
+        } else {
+            let ret = self.slice(..len);
+            self.advance(len);
+            ret
+        }
     }
 }
 
@@ -768,17 +797,22 @@
 
 impl From<Vec<u8>> for Bytes {
     fn from(vec: Vec<u8>) -> Bytes {
-        // into_boxed_slice doesn't return a heap allocation for empty vectors,
+        let slice = vec.into_boxed_slice();
+        slice.into()
+    }
+}
+
+impl From<Box<[u8]>> for Bytes {
+    fn from(slice: Box<[u8]>) -> Bytes {
+        // Box<[u8]> doesn't contain a heap allocation for empty slices,
         // so the pointer isn't aligned enough for the KIND_VEC stashing to
         // work.
-        if vec.is_empty() {
+        if slice.is_empty() {
             return Bytes::new();
         }
 
-        let slice = vec.into_boxed_slice();
         let len = slice.len();
-        let ptr = slice.as_ptr();
-        drop(Box::into_raw(slice));
+        let ptr = Box::into_raw(slice) as *mut u8;
 
         if ptr as usize & 0x1 == 0 {
             let data = ptr as usize | KIND_VEC;
@@ -994,33 +1028,35 @@
     // `Release` is used synchronize with other threads that
     // will load the `arc` field.
     //
-    // If the `compare_and_swap` fails, then the thread lost the
+    // If the `compare_exchange` fails, then the thread lost the
     // race to promote the buffer to shared. The `Acquire`
-    // ordering will synchronize with the `compare_and_swap`
+    // ordering will synchronize with the `compare_exchange`
     // that happened in the other thread and the `Shared`
     // pointed to by `actual` will be visible.
-    let actual = atom.compare_and_swap(ptr as _, shared as _, Ordering::AcqRel);
-
-    if actual as usize == ptr as usize {
-        // The upgrade was successful, the new handle can be
-        // returned.
-        return Bytes {
-            ptr: offset,
-            len,
-            data: AtomicPtr::new(shared as _),
-            vtable: &SHARED_VTABLE,
-        };
+    match atom.compare_exchange(ptr as _, shared as _, Ordering::AcqRel, Ordering::Acquire) {
+        Ok(actual) => {
+            debug_assert!(actual as usize == ptr as usize);
+            // The upgrade was successful, the new handle can be
+            // returned.
+            Bytes {
+                ptr: offset,
+                len,
+                data: AtomicPtr::new(shared as _),
+                vtable: &SHARED_VTABLE,
+            }
+        }
+        Err(actual) => {
+            // The upgrade failed, a concurrent clone happened. Release
+            // the allocation that was made in this thread, it will not
+            // be needed.
+            let shared = Box::from_raw(shared);
+            mem::forget(*shared);
+
+            // Buffer already promoted to shared storage, so increment ref
+            // count.
+            shallow_clone_arc(actual as _, offset, len)
+        }
     }
-
-    // The upgrade failed, a concurrent clone happened. Release
-    // the allocation that was made in this thread, it will not
-    // be needed.
-    let shared = Box::from_raw(shared);
-    mem::forget(*shared);
-
-    // Buffer already promoted to shared storage, so increment ref
-    // count.
-    shallow_clone_arc(actual as _, offset, len)
 }
 
 unsafe fn release_shared(ptr: *mut Shared) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,6 @@
     no_crate_inject,
     attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
 ))]
-#![doc(html_root_url = "https://docs.rs/bytes/0.5.6")]
 #![no_std]
 
 //! Provides abstractions for working with bytes.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_buf_mut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_buf_mut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_buf_mut.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_buf_mut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,6 @@
 #![warn(rust_2018_idioms)]
 
-#[cfg(feature = "std")]
-use bytes::buf::IoSliceMut;
+use bytes::buf::UninitSlice;
 use bytes::{BufMut, BytesMut};
 use core::fmt::Write;
 use core::usize;
@@ -10,15 +9,15 @@
 fn test_vec_as_mut_buf() {
     let mut buf = Vec::with_capacity(64);
 
-    assert_eq!(buf.remaining_mut(), usize::MAX);
+    assert_eq!(buf.remaining_mut(), isize::MAX as usize);
 
-    assert!(buf.bytes_mut().len() >= 64);
+    assert!(buf.chunk_mut().len() >= 64);
 
     buf.put(&b"zomg"[..]);
 
     assert_eq!(&buf, b"zomg");
 
-    assert_eq!(buf.remaining_mut(), usize::MAX - 4);
+    assert_eq!(buf.remaining_mut(), isize::MAX as usize - 4);
     assert_eq!(buf.capacity(), 64);
 
     for _ in 0..16 {
@@ -29,6 +28,14 @@
 }
 
 #[test]
+fn test_vec_put_bytes() {
+    let mut buf = Vec::new();
+    buf.push(17);
+    buf.put_bytes(19, 2);
+    assert_eq!([17, 19, 19], &buf[..]);
+}
+
+#[test]
 fn test_put_u8() {
     let mut buf = Vec::with_capacity(8);
     buf.put_u8(33);
@@ -47,6 +54,34 @@
 }
 
 #[test]
+fn test_put_int() {
+    let mut buf = Vec::with_capacity(8);
+    buf.put_int(0x1020304050607080, 3);
+    assert_eq!(b"\x60\x70\x80", &buf[..]);
+}
+
+#[test]
+#[should_panic]
+fn test_put_int_nbytes_overflow() {
+    let mut buf = Vec::with_capacity(8);
+    buf.put_int(0x1020304050607080, 9);
+}
+
+#[test]
+fn test_put_int_le() {
+    let mut buf = Vec::with_capacity(8);
+    buf.put_int_le(0x1020304050607080, 3);
+    assert_eq!(b"\x80\x70\x60", &buf[..]);
+}
+
+#[test]
+#[should_panic]
+fn test_put_int_le_nbytes_overflow() {
+    let mut buf = Vec::with_capacity(8);
+    buf.put_int_le(0x1020304050607080, 9);
+}
+
+#[test]
 #[should_panic(expected = "cannot advance")]
 fn test_vec_advance_mut() {
     // Verify fix for #354
@@ -66,41 +101,37 @@
     assert!(buf != buf2);
 }
 
-#[cfg(feature = "std")]
-#[test]
-fn test_bufs_vec_mut() {
-    let b1: &mut [u8] = &mut [];
-    let b2: &mut [u8] = &mut [];
-    let mut dst = [IoSliceMut::from(b1), IoSliceMut::from(b2)];
-
-    // with no capacity
-    let mut buf = BytesMut::new();
-    assert_eq!(buf.capacity(), 0);
-    assert_eq!(1, buf.bytes_vectored_mut(&mut dst[..]));
-
-    // with capacity
-    let mut buf = BytesMut::with_capacity(64);
-    assert_eq!(1, buf.bytes_vectored_mut(&mut dst[..]));
-}
-
 #[test]
 fn test_mut_slice() {
     let mut v = vec![0, 0, 0, 0];
     let mut s = &mut v[..];
     s.put_u32(42);
+
+    assert_eq!(s.len(), 0);
+    assert_eq!(&v, &[0, 0, 0, 42]);
+}
+
+#[test]
+fn test_slice_put_bytes() {
+    let mut v = [0, 0, 0, 0];
+    let mut s = &mut v[..];
+    s.put_u8(17);
+    s.put_bytes(19, 2);
+    assert_eq!(1, s.remaining_mut());
+    assert_eq!(&[17, 19, 19, 0], &v[..]);
 }
 
 #[test]
 fn test_deref_bufmut_forwards() {
     struct Special;
 
-    impl BufMut for Special {
+    unsafe impl BufMut for Special {
         fn remaining_mut(&self) -> usize {
             unreachable!("remaining_mut");
         }
 
-        fn bytes_mut(&mut self) -> &mut [std::mem::MaybeUninit<u8>] {
-            unreachable!("bytes_mut");
+        fn chunk_mut(&mut self) -> &mut UninitSlice {
+            unreachable!("chunk_mut");
         }
 
         unsafe fn advance_mut(&mut self, _: usize) {
@@ -118,3 +149,30 @@
     (Box::new(Special) as Box<dyn BufMut>).put_u8(b'x');
     Box::new(Special).put_u8(b'x');
 }
+
+#[test]
+#[should_panic]
+fn write_byte_panics_if_out_of_bounds() {
+    let mut data = [b'b', b'a', b'r'];
+
+    let slice = unsafe { UninitSlice::from_raw_parts_mut(data.as_mut_ptr(), 3) };
+    slice.write_byte(4, b'f');
+}
+
+#[test]
+#[should_panic]
+fn copy_from_slice_panics_if_different_length_1() {
+    let mut data = [b'b', b'a', b'r'];
+
+    let slice = unsafe { UninitSlice::from_raw_parts_mut(data.as_mut_ptr(), 3) };
+    slice.copy_from_slice(b"a");
+}
+
+#[test]
+#[should_panic]
+fn copy_from_slice_panics_if_different_length_2() {
+    let mut data = [b'b', b'a', b'r'];
+
+    let slice = unsafe { UninitSlice::from_raw_parts_mut(data.as_mut_ptr(), 3) };
+    slice.copy_from_slice(b"abcd");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_buf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,17 +9,17 @@
     let mut buf = &b"hello"[..];
 
     assert_eq!(buf.remaining(), 5);
-    assert_eq!(buf.bytes(), b"hello");
+    assert_eq!(buf.chunk(), b"hello");
 
     buf.advance(2);
 
     assert_eq!(buf.remaining(), 3);
-    assert_eq!(buf.bytes(), b"llo");
+    assert_eq!(buf.chunk(), b"llo");
 
     buf.advance(3);
 
     assert_eq!(buf.remaining(), 0);
-    assert_eq!(buf.bytes(), b"");
+    assert_eq!(buf.chunk(), b"");
 }
 
 #[test]
@@ -53,7 +53,7 @@
 
     let mut dst = [IoSlice::new(b1), IoSlice::new(b2)];
 
-    assert_eq!(1, buf.bytes_vectored(&mut dst[..]));
+    assert_eq!(1, buf.chunks_vectored(&mut dst[..]));
 }
 
 #[test]
@@ -63,9 +63,9 @@
     let mut buffer: VecDeque<u8> = VecDeque::new();
     buffer.extend(b"hello world");
     assert_eq!(11, buffer.remaining());
-    assert_eq!(b"hello world", buffer.bytes());
+    assert_eq!(b"hello world", buffer.chunk());
     buffer.advance(6);
-    assert_eq!(b"world", buffer.bytes());
+    assert_eq!(b"world", buffer.chunk());
     buffer.extend(b" piece");
     let mut out = [0; 11];
     buffer.copy_to_slice(&mut out);
@@ -81,8 +81,8 @@
             unreachable!("remaining");
         }
 
-        fn bytes(&self) -> &[u8] {
-            unreachable!("bytes");
+        fn chunk(&self) -> &[u8] {
+            unreachable!("chunk");
         }
 
         fn advance(&mut self, _: usize) {
@@ -101,3 +101,20 @@
     assert_eq!((Box::new(Special) as Box<dyn Buf>).get_u8(), b'x');
     assert_eq!(Box::new(Special).get_u8(), b'x');
 }
+
+#[test]
+fn copy_to_bytes_less() {
+    let mut buf = &b"hello world"[..];
+
+    let bytes = buf.copy_to_bytes(5);
+    assert_eq!(bytes, &b"hello"[..]);
+    assert_eq!(buf, &b" world"[..])
+}
+
+#[test]
+#[should_panic]
+fn copy_to_bytes_overflow() {
+    let mut buf = &b"hello world"[..];
+
+    let _bytes = buf.copy_to_bytes(12);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_bytes_odd_alloc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_bytes_odd_alloc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_bytes_odd_alloc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_bytes_odd_alloc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,8 @@
 //! Test using `Bytes` with an allocator that hands out "odd" pointers for
 //! vectors (pointers where the LSB is set).
 
+#![cfg(not(miri))] // Miri does not support custom allocators (also, Miri is "odd" by default with 50% chance)
+
 use std::alloc::{GlobalAlloc, Layout, System};
 use std::ptr;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -461,6 +461,7 @@
 }
 
 #[test]
+#[cfg_attr(miri, ignore)] // Miri is too slow
 fn reserve_max_original_capacity_value() {
     const SIZE: usize = 128 * 1024;
 
@@ -608,15 +609,15 @@
 
 #[test]
 // Only run these tests on little endian systems. CI uses qemu for testing
-// little endian... and qemu doesn't really support threading all that well.
-#[cfg(target_endian = "little")]
+// big endian... and qemu doesn't really support threading all that well.
+#[cfg(any(miri, target_endian = "little"))]
 fn stress() {
     // Tests promoting a buffer from a vec -> shared in a concurrent situation
     use std::sync::{Arc, Barrier};
     use std::thread;
 
     const THREADS: usize = 8;
-    const ITERS: usize = 1_000;
+    const ITERS: usize = if cfg!(miri) { 100 } else { 1_000 };
 
     for i in 0..ITERS {
         let data = [i as u8; 256];
@@ -784,6 +785,31 @@
 }
 
 #[test]
+fn bytes_mut_unsplit_other_keeps_capacity() {
+    let mut buf = BytesMut::with_capacity(64);
+    buf.extend_from_slice(b"aabb");
+
+    // non empty other created "from" buf
+    let mut other = buf.split_off(buf.len());
+    other.extend_from_slice(b"ccddee");
+    buf.unsplit(other);
+
+    assert_eq!(buf.capacity(), 64);
+}
+
+#[test]
+fn bytes_mut_unsplit_empty_other_keeps_capacity() {
+    let mut buf = BytesMut::with_capacity(64);
+    buf.extend_from_slice(b"aabbccddee");
+
+    // empty other created "from" buf
+    let other = buf.split_off(buf.len());
+    buf.unsplit(other);
+
+    assert_eq!(buf.capacity(), 64);
+}
+
+#[test]
 fn bytes_mut_unsplit_arc_different() {
     let mut buf = BytesMut::with_capacity(64);
     buf.extend_from_slice(b"aaaabbbbeeee");
@@ -912,20 +938,20 @@
     let mut bytes = BytesMut::with_capacity(1024);
 
     unsafe {
-        let ptr = bytes.bytes_mut().as_ptr();
-        assert_eq!(1024, bytes.bytes_mut().len());
+        let ptr = bytes.chunk_mut().as_mut_ptr();
+        assert_eq!(1024, bytes.chunk_mut().len());
 
         bytes.advance_mut(10);
 
-        let next = bytes.bytes_mut().as_ptr();
-        assert_eq!(1024 - 10, bytes.bytes_mut().len());
+        let next = bytes.chunk_mut().as_mut_ptr();
+        assert_eq!(1024 - 10, bytes.chunk_mut().len());
         assert_eq!(ptr.offset(10), next);
 
         // advance to the end
         bytes.advance_mut(1024 - 10);
 
         // The buffer size is doubled
-        assert_eq!(1024, bytes.bytes_mut().len());
+        assert_eq!(1024, bytes.chunk_mut().len());
     }
 }
 
@@ -960,3 +986,19 @@
     let vec = Vec::with_capacity(1);
     let _ = Bytes::from(vec);
 }
+
+#[test]
+fn bytes_put_bytes() {
+    let mut bytes = BytesMut::new();
+    bytes.put_u8(17);
+    bytes.put_bytes(19, 2);
+    assert_eq!([17, 19, 19], bytes.as_ref());
+}
+
+#[test]
+fn box_slice_empty() {
+    // See https://github.com/tokio-rs/bytes/issues/340
+    let empty: Box<[u8]> = Default::default();
+    let b = Bytes::from(empty);
+    assert!(b.is_empty());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_chain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_chain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,5 @@
 #![warn(rust_2018_idioms)]
 
-use bytes::buf::{BufExt, BufMutExt};
 use bytes::{Buf, BufMut, Bytes};
 #[cfg(feature = "std")]
 use std::io::IoSlice;
@@ -10,7 +9,7 @@
     let a = Bytes::from(&b"hello"[..]);
     let b = Bytes::from(&b"world"[..]);
 
-    let res = a.chain(b).to_bytes();
+    let res = a.chain(b).copy_to_bytes(10);
     assert_eq!(res, &b"helloworld"[..]);
 }
 
@@ -63,7 +62,7 @@
             IoSlice::new(b4),
         ];
 
-        assert_eq!(2, buf.bytes_vectored(&mut iovecs));
+        assert_eq!(2, buf.chunks_vectored(&mut iovecs));
         assert_eq!(iovecs[0][..], b"hello"[..]);
         assert_eq!(iovecs[1][..], b"world"[..]);
         assert_eq!(iovecs[2][..], b""[..]);
@@ -84,7 +83,7 @@
             IoSlice::new(b4),
         ];
 
-        assert_eq!(2, buf.bytes_vectored(&mut iovecs));
+        assert_eq!(2, buf.chunks_vectored(&mut iovecs));
         assert_eq!(iovecs[0][..], b"llo"[..]);
         assert_eq!(iovecs[1][..], b"world"[..]);
         assert_eq!(iovecs[2][..], b""[..]);
@@ -105,7 +104,7 @@
             IoSlice::new(b4),
         ];
 
-        assert_eq!(1, buf.bytes_vectored(&mut iovecs));
+        assert_eq!(1, buf.chunks_vectored(&mut iovecs));
         assert_eq!(iovecs[0][..], b"world"[..]);
         assert_eq!(iovecs[1][..], b""[..]);
         assert_eq!(iovecs[2][..], b""[..]);
@@ -126,10 +125,31 @@
             IoSlice::new(b4),
         ];
 
-        assert_eq!(1, buf.bytes_vectored(&mut iovecs));
+        assert_eq!(1, buf.chunks_vectored(&mut iovecs));
         assert_eq!(iovecs[0][..], b"ld"[..]);
         assert_eq!(iovecs[1][..], b""[..]);
         assert_eq!(iovecs[2][..], b""[..]);
         assert_eq!(iovecs[3][..], b""[..]);
     }
 }
+
+#[test]
+fn chain_get_bytes() {
+    let mut ab = Bytes::copy_from_slice(b"ab");
+    let mut cd = Bytes::copy_from_slice(b"cd");
+    let ab_ptr = ab.as_ptr();
+    let cd_ptr = cd.as_ptr();
+    let mut chain = (&mut ab).chain(&mut cd);
+    let a = chain.copy_to_bytes(1);
+    let bc = chain.copy_to_bytes(2);
+    let d = chain.copy_to_bytes(1);
+
+    assert_eq!(Bytes::copy_from_slice(b"a"), a);
+    assert_eq!(Bytes::copy_from_slice(b"bc"), bc);
+    assert_eq!(Bytes::copy_from_slice(b"d"), d);
+
+    // assert `get_bytes` did not allocate
+    assert_eq!(ab_ptr, a.as_ptr());
+    // assert `get_bytes` did not allocate
+    assert_eq!(cd_ptr.wrapping_offset(1), d.as_ptr());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,13 +3,13 @@
 
 use std::io::{BufRead, Read};
 
-use bytes::buf::BufExt;
+use bytes::Buf;
 
 #[test]
 fn read() {
     let buf1 = &b"hello "[..];
     let buf2 = &b"world"[..];
-    let buf = BufExt::chain(buf1, buf2); // Disambiguate with Read::chain
+    let buf = Buf::chain(buf1, buf2); // Disambiguate with Read::chain
     let mut buffer = Vec::new();
     buf.reader().read_to_end(&mut buffer).unwrap();
     assert_eq!(b"hello world", &buffer[..]);
@@ -19,7 +19,7 @@
 fn buf_read() {
     let buf1 = &b"hell"[..];
     let buf2 = &b"o\nworld"[..];
-    let mut reader = BufExt::chain(buf1, buf2).reader();
+    let mut reader = Buf::chain(buf1, buf2).reader();
     let mut line = String::new();
     reader.read_line(&mut line).unwrap();
     assert_eq!("hello\n", &line);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_take.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_take.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bytes/tests/test_take.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bytes/tests/test_take.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 #![warn(rust_2018_idioms)]
 
-use bytes::buf::{Buf, BufExt};
+use bytes::buf::Buf;
+use bytes::Bytes;
 
 #[test]
 fn long_take() {
@@ -8,5 +9,24 @@
     // overrun the buffer. Regression test for #138.
     let buf = b"hello world".take(100);
     assert_eq!(11, buf.remaining());
-    assert_eq!(b"hello world", buf.bytes());
+    assert_eq!(b"hello world", buf.chunk());
+}
+
+#[test]
+fn take_copy_to_bytes() {
+    let mut abcd = Bytes::copy_from_slice(b"abcd");
+    let abcd_ptr = abcd.as_ptr();
+    let mut take = (&mut abcd).take(2);
+    let a = take.copy_to_bytes(1);
+    assert_eq!(Bytes::copy_from_slice(b"a"), a);
+    // assert `to_bytes` did not allocate
+    assert_eq!(abcd_ptr, a.as_ptr());
+    assert_eq!(Bytes::copy_from_slice(b"bcd"), abcd);
+}
+
+#[test]
+#[should_panic]
+fn take_copy_to_bytes_panics() {
+    let abcd = Bytes::copy_from_slice(b"abcd");
+    abcd.take(2).copy_to_bytes(3);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"0542f7bd3605206297b6708b28bfff87a2ef7fa65ccab1474ddb53072600d7e1","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"d5c22aa3118d240e877ad41c5d9fa232f9c77d757d4aac0c2f943afc0a95e0ef","src/lib.rs":"c8fb45d44cae0b1094bf8cef5059827b28b490eb14a3865fa536b61241c2c8c4"},"package":"e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "byte-tools"
-version = "0.3.1"
-authors = ["RustCrypto Developers"]
-description = "Bytes related utility functions"
-documentation = "https://docs.rs/byte-tools"
-keywords = ["bytes"]
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/RustCrypto/utils"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2018-2019 The RustCrypto Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/byte-tools/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/byte-tools/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#![no_std]
-use core::ptr;
-
-/// Copy bytes from `src` to `dst`
-///
-/// Panics if `src.len() < dst.len()`
-#[inline(always)]
-pub fn copy(src: &[u8], dst: &mut [u8]) {
-    assert!(dst.len() >= src.len());
-    unsafe {
-        ptr::copy_nonoverlapping(src.as_ptr(), dst.as_mut_ptr(), src.len());
-    }
-}
-
-/// Zero all bytes in `dst`
-#[inline(always)]
-pub fn zero(dst: &mut [u8]) {
-    unsafe {
-        ptr::write_bytes(dst.as_mut_ptr(), 0, dst.len());
-    }
-}
-
-/// Sets all bytes in `dst` equal to `value`
-#[inline(always)]
-pub fn set(dst: &mut [u8], value: u8) {
-    unsafe {
-        ptr::write_bytes(dst.as_mut_ptr(), value, dst.len());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/appveyor.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/appveyor.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/appveyor.yml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-  - TARGET: i686-pc-windows-msvc
-  - TARGET: i686-pc-windows-gnu
-install:
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
-  - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
-  - SET PATH=%PATH%;C:\MinGW\bin
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo test --verbose --target %TARGET%
-  - cargo test --verbose --target %TARGET% --features tokio
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"d962efcc23b6bedf3c52415fe51497c139b96ca776cc128a15c4cf6db884c2f7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"e0140d74b3a685910dbe17186148e860a15944efc64fbd55041f553d347ea0ce","appveyor.yml":"a39fd7664bf538147bfb494b9f9c96d6f898d9896a5d5e1806019f399cc44bff","src/bufread.rs":"2d4dc93a26131cd483ecdfa862f559c187ea3afc6252bf7ab120b69f5aa58a96","src/lib.rs":"ed02f2e9c98b21cf4663546b1a9f216102f23f5f2a731f7a50bbbf56473c0e1b","src/mem.rs":"d09e02ed13d10a9940fda7d42c048acab94787eea4509b02ed209bbfe02db063","src/read.rs":"f7391c1fc0712c81b4f47899f007be0befbdf4a533e64949fe57c65ec95d4c94","src/write.rs":"8b7b58ef37232458d3d4df59ed1b754174362e6c82a08a1459af3008c008d71c","tests/tokio.rs":"b148e0909a10636ead355bf8cd1a5b9cdd9b1ad5f0ab4fbf5c20c49c03cd0975"},"package":"42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"}
\ No newline at end of file
+{"files":{"Cargo.toml":"64779dd3736e34bb8a3704831228d1ac037fe5fcda547500f581cdc05191d708","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"22c9ff6d80100ad81d44b21e6c198ae7f35c2c61abde4bc59f9c0c8c1d9a1d31","src/bufread.rs":"e85014f6324960c5a18da133eafbb5520bec573891c1a462eec648e81d2730c8","src/lib.rs":"9fee511a5376dd73b318125b416b8e9cf6d8c05aa89d59220df76731acbdc9fb","src/mem.rs":"51fbf3bb8271f1d3e1b64776649daa729e2b2d029dd5d5f9fa91100a2b6964dd","src/read.rs":"29399710fe94e76266110f15de3662792573e9457bfea2e3e746924810464c2a","src/write.rs":"fc6ea7ab34cfafac860adfc7e1204e368b499917fdef1b9197935c3b5c5a5107","tests/bug_61.bz2":"d88f1a392799402471505dc1c3a9158da2a5021998555d56bbd0abadf21bee37","tests/bug_61.raw":"55e089c780e1d802dd3d057b59b44d85263a0dbeab654172efa84c3fe45730e2","tests/tokio.rs":"67badd14dcb396894452437a485735c34aa4684593f52dbd4bb228911494525a"},"package":"6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -12,7 +12,7 @@
 
 [package]
 name = "bzip2"
-version = "0.3.3"
+version = "0.4.3"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Bindings to libbzip2 for bzip2 compression and decompression exposed as\nReader/Writer streams.\n"
 homepage = "https://github.com/alexcrichton/bzip2-rs"
@@ -23,7 +23,7 @@
 license = "MIT/Apache-2.0"
 repository = "https://github.com/alexcrichton/bzip2-rs"
 [dependencies.bzip2-sys]
-version = "0.1"
+version = "0.1.11"
 
 [dependencies.futures]
 version = "0.1"
@@ -36,17 +36,22 @@
 version = "0.1"
 optional = true
 [dev-dependencies.partial-io]
-version = "^0.2.1"
+version = "0.3"
 features = ["quickcheck"]
 
 [dev-dependencies.quickcheck]
-version = "0.4"
+version = "1.0"
+
+[dev-dependencies.quickcheck6]
+version = "0.6"
+package = "quickcheck"
 
 [dev-dependencies.rand]
-version = "0.3"
+version = "0.8"
 
 [dev-dependencies.tokio-core]
 version = "0.1"
 
 [features]
+static = ["bzip2-sys/static"]
 tokio = ["tokio-io", "futures"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,5 @@
 # bzip2
 
-[![Build Status](https://travis-ci.org/alexcrichton/bzip2-rs.svg?branch=master)](https://travis-ci.org/alexcrichton/bzip2-rs)
-[![Build status](https://ci.appveyor.com/api/projects/status/joowqvvwfhxgdw5x?svg=true)](https://ci.appveyor.com/project/alexcrichton/bzip2-rs)
-
 [Documentation](https://docs.rs/bzip2)
 
 A streaming compression/decompression library for rust with bindings to libbz2.
@@ -10,7 +7,7 @@
 ```toml
 # Cargo.toml
 [dependencies]
-bzip2 = "0.3.2"
+bzip2 = "0.4"
 ```
 
 
@@ -28,5 +25,5 @@
 ### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
+for inclusion in this repository by you, as defined in the Apache-2.0 license, shall be
 dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/bufread.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/bufread.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/bufread.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/bufread.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
 //! I/O streams for wrapping `BufRead` types as encoders/decoders
 
-use std::io::prelude::*;
 use std::io;
+use std::io::prelude::*;
 
 #[cfg(feature = "tokio")]
 use futures::Poll;
 #[cfg(feature = "tokio")]
 use tokio_io::{AsyncRead, AsyncWrite};
 
-use {Compress, Decompress, Compression, Action, Status};
+use {Action, Compress, Compression, Decompress, Status};
 
 /// A bz2 encoder, or compressor.
 ///
@@ -28,6 +28,7 @@
     obj: R,
     data: Decompress,
     done: bool,
+    multi: bool,
 }
 
 impl<R: BufRead> BzEncoder<R> {
@@ -84,16 +85,16 @@
 impl<R: BufRead> Read for BzEncoder<R> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         if self.done {
-            return Ok(0)
+            return Ok(0);
         }
         loop {
             let (read, consumed, eof, ret);
             {
-                let input = try!(self.obj.fill_buf());
+                let input = self.obj.fill_buf()?;
                 eof = input.is_empty();
                 let before_out = self.data.total_out();
                 let before_in = self.data.total_in();
-                let action = if eof {Action::Finish} else {Action::Run};
+                let action = if eof { Action::Finish } else { Action::Run };
                 ret = self.data.compress(input, buf, action);
                 read = (self.data.total_out() - before_out) as usize;
                 consumed = (self.data.total_in() - before_in) as usize;
@@ -108,19 +109,18 @@
             // need to keep asking for more data because if we return that 0
             // bytes of data have been read then it will be interpreted as EOF.
             if read == 0 && !eof && buf.len() > 0 {
-                continue
+                continue;
             }
             if ret == Status::StreamEnd {
                 self.done = true;
             }
-            return Ok(read)
+            return Ok(read);
         }
     }
 }
 
 #[cfg(feature = "tokio")]
-impl<R: AsyncRead + BufRead> AsyncRead for BzEncoder<R> {
-}
+impl<R: AsyncRead + BufRead> AsyncRead for BzEncoder<R> {}
 
 impl<W: Write> Write for BzEncoder<W> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
@@ -147,8 +147,14 @@
             obj: r,
             data: Decompress::new(false),
             done: false,
+            multi: false,
         }
     }
+
+    fn multi(mut self, flag: bool) -> BzDecoder<R> {
+        self.multi = flag;
+        self
+    }
 }
 
 impl<R> BzDecoder<R> {
@@ -186,39 +192,52 @@
 
 impl<R: BufRead> Read for BzDecoder<R> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        if self.done {
-            return Ok(0)
-        }
         loop {
-            let (read, consumed, eof, ret);
+            if self.done && !self.multi {
+                return Ok(0);
+            }
+            let (read, consumed, remaining, ret);
             {
-                let input = try!(self.obj.fill_buf());
-                eof = input.is_empty();
+                let input = self.obj.fill_buf()?;
+                if self.done {
+                    assert!(self.multi);
+                    if input.is_empty() {
+                        // beyond last stream in multi-stream case
+                        return Ok(0);
+                    } else {
+                        // previous stream ended, more data follows => create new decompressor
+                        self.data = Decompress::new(false);
+                        self.done = false;
+                    }
+                }
                 let before_out = self.data.total_out();
                 let before_in = self.data.total_in();
                 ret = self.data.decompress(input, buf);
                 read = (self.data.total_out() - before_out) as usize;
                 consumed = (self.data.total_in() - before_in) as usize;
+                remaining = input.len() - consumed;
             }
             self.obj.consume(consumed);
 
-            let ret = try!(ret.map_err(|e| {
-                io::Error::new(io::ErrorKind::InvalidInput, e)
-            }));
+            let ret = ret.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
             if ret == Status::StreamEnd {
                 self.done = true;
-                return Ok(read)
+            } else if consumed == 0 && remaining == 0 && read == 0 {
+                return Err(io::Error::new(
+                    io::ErrorKind::UnexpectedEof,
+                    "decompression not finished but EOF reached",
+                ));
             }
-            if read > 0 || eof || buf.len() == 0 {
-                return Ok(read)
+
+            if read > 0 || buf.len() == 0 {
+                return Ok(read);
             }
         }
     }
 }
 
 #[cfg(feature = "tokio")]
-impl<R: AsyncRead + BufRead> AsyncRead for BzDecoder<R> {
-}
+impl<R: AsyncRead + BufRead> AsyncRead for BzDecoder<R> {}
 
 impl<W: Write> Write for BzDecoder<W> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
@@ -236,3 +255,82 @@
         self.get_mut().shutdown()
     }
 }
+
+/// A bzip2 streaming decoder that decodes all members of a multistream.
+///
+/// Wikipedia, particularly, uses bzip2 multistream for their dumps, and the
+/// `pbzip2` tool creates such data as well;
+pub struct MultiBzDecoder<R>(BzDecoder<R>);
+
+impl<R: BufRead> MultiBzDecoder<R> {
+    /// Creates a new decoder from the given reader. If the bzip2 stream contains multiple members
+    /// all will be decoded.
+    pub fn new(r: R) -> MultiBzDecoder<R> {
+        MultiBzDecoder(BzDecoder::new(r).multi(true))
+    }
+}
+
+impl<R> MultiBzDecoder<R> {
+    /// Acquires a reference to the underlying reader.
+    pub fn get_ref(&self) -> &R {
+        self.0.get_ref()
+    }
+
+    /// Acquires a mutable reference to the underlying stream.
+    ///
+    /// Note that mutation of the stream may result in surprising results if
+    /// this encoder is continued to be used.
+    pub fn get_mut(&mut self) -> &mut R {
+        self.0.get_mut()
+    }
+
+    /// Consumes this decoder, returning the underlying reader.
+    pub fn into_inner(self) -> R {
+        self.0.into_inner()
+    }
+}
+
+impl<R: BufRead> Read for MultiBzDecoder<R> {
+    fn read(&mut self, into: &mut [u8]) -> io::Result<usize> {
+        self.0.read(into)
+    }
+}
+
+#[cfg(feature = "tokio")]
+impl<R: AsyncRead + BufRead> AsyncRead for MultiBzDecoder<R> {}
+
+impl<R: BufRead + Write> Write for MultiBzDecoder<R> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.get_mut().write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.get_mut().flush()
+    }
+}
+
+#[cfg(feature = "tokio")]
+impl<R: AsyncWrite + BufRead> AsyncWrite for MultiBzDecoder<R> {
+    fn shutdown(&mut self) -> Poll<(), io::Error> {
+        self.get_mut().shutdown()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::MultiBzDecoder;
+    use std::io::{BufReader, Read};
+
+    #[test]
+    fn bug_61() {
+        let compressed_bytes = include_bytes!("../tests/bug_61.bz2");
+        let uncompressed_bytes = include_bytes!("../tests/bug_61.raw");
+        let reader = BufReader::with_capacity(8192, compressed_bytes.as_ref());
+
+        let mut d = MultiBzDecoder::new(reader);
+        let mut data = Vec::new();
+
+        assert_eq!(d.read_to_end(&mut data).unwrap(), uncompressed_bytes.len());
+        assert_eq!(data, uncompressed_bytes);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
 //! // Round trip some bytes from a byte source, into a compressor, into a
 //! // decompressor, and finally into a vector.
 //! let data = "Hello, World!".as_bytes();
-//! let compressor = BzEncoder::new(data, Compression::Best);
+//! let compressor = BzEncoder::new(data, Compression::best());
 //! let mut decompressor = BzDecoder::new(compressor);
 //!
 //! let mut contents = String::new();
@@ -27,13 +27,26 @@
 //! assert_eq!(contents, "Hello, World!");
 //! ```
 //!
+//! # Multistreams (e.g. Wikipedia or pbzip2)
+//!
+//! Some tools such as pbzip2 or data from sources such as Wikipedia
+//! are encoded as so called bzip2 "multistreams," meaning they
+//! contain back to back chunks of bzip'd data. `BzDecoder` does not
+//! attempt to convert anything after the the first bzip chunk in the
+//! source stream. Thus, if you wish to decode all bzip chunks from
+//! the input until end of file, use `MultiBzDecoder`.
+//!
+//! *Protip*: If you use `BzDecoder` to decode data and the output is
+//! incomplete and exactly 900K bytes, you probably need a
+//! `MultiBzDecoder`.
+//!
 //! # Async I/O
 //!
 //! This crate optionally can support async I/O streams with the Tokio stack via
 //! the `tokio` feature of this crate:
 //!
 //! ```toml
-//! bzip2 = { version = "0.3", features = ["tokio"] }
+//! bzip2 = { version = "0.4", features = ["tokio"] }
 //! ```
 //!
 //! All methods are internally capable of working with streams that may return
@@ -47,24 +60,24 @@
 //! time to perform I/O. If I/O streams are flushed before drop, however, then
 //! these operations will be a noop.
 
-#![deny(missing_docs, warnings)]
-#![doc(html_root_url = "https://docs.rs/bzip2/0.3")]
+#![deny(missing_docs)]
+#![doc(html_root_url = "https://docs.rs/bzip2/")]
 
 extern crate bzip2_sys as ffi;
 extern crate libc;
 #[cfg(test)]
-extern crate rand;
-#[cfg(test)]
 extern crate partial_io;
 #[cfg(test)]
 extern crate quickcheck;
+#[cfg(test)]
+extern crate rand;
 #[cfg(feature = "tokio")]
 #[macro_use]
 extern crate tokio_io;
 #[cfg(feature = "tokio")]
 extern crate futures;
 
-pub use mem::{Compress, Decompress, Action, Status, Error};
+pub use mem::{Action, Compress, Decompress, Error, Status};
 
 mod mem;
 
@@ -75,12 +88,38 @@
 /// When compressing data, the compression level can be specified by a value in
 /// this enum.
 #[derive(Copy, Clone, Debug)]
-pub enum Compression {
+pub struct Compression(u32);
+
+impl Compression {
+    /// Create a new compression spec with a specific numeric level (0-9).
+    pub fn new(level: u32) -> Compression {
+        Compression(level)
+    }
+
+    /// Do not compress.
+    pub fn none() -> Compression {
+        Compression(0)
+    }
+
     /// Optimize for the best speed of encoding.
-    Fastest = 1,
+    pub fn fast() -> Compression {
+        Compression(1)
+    }
+
     /// Optimize for the size of data being encoded.
-    Best = 9,
-    /// Choose the default compression, a balance between speed and size.
-    Default = 6,
+    pub fn best() -> Compression {
+        Compression(9)
+    }
+
+    /// Return the compression level as an integer.
+    pub fn level(&self) -> u32 {
+        self.0
+    }
 }
 
+impl Default for Compression {
+    /// Choose the default compression, a balance between speed and size.
+    fn default() -> Compression {
+        Compression(6)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/mem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/mem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/mem.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/mem.rs	2021-12-09 12:01:26.000000000 +0000
@@ -120,10 +120,15 @@
     pub fn new(lvl: Compression, work_factor: u32) -> Compress {
         unsafe {
             let mut raw = Box::new(mem::zeroed());
-            assert_eq!(ffi::BZ2_bzCompressInit(&mut *raw, lvl as c_int, 0,
-                                               work_factor as c_int), 0);
+            assert_eq!(
+                ffi::BZ2_bzCompressInit(&mut *raw, lvl.level() as c_int, 0, work_factor as c_int),
+                0
+            );
             Compress {
-                inner: Stream { raw: raw, _marker: marker::PhantomData },
+                inner: Stream {
+                    raw: raw,
+                    _marker: marker::PhantomData,
+                },
             }
         }
     }
@@ -132,13 +137,17 @@
     ///
     /// If anything other than BZ_OK is seen, `Err` is returned. The action
     /// given must be one of Run, Flush or Finish.
-    pub fn compress(&mut self, input: &[u8], output: &mut [u8],
-                    action: Action) -> Result<Status, Error> {
+    pub fn compress(
+        &mut self,
+        input: &[u8],
+        output: &mut [u8],
+        action: Action,
+    ) -> Result<Status, Error> {
         // apparently 0-length compression requests which don't actually make
         // any progress are returned as BZ_PARAM_ERROR, which we don't want, to
         // just translate to a success here.
         if input.len() == 0 && action == Action::Run {
-            return Ok(Status::RunOk)
+            return Ok(Status::RunOk);
         }
         self.inner.raw.next_in = input.as_ptr() as *mut _;
         self.inner.raw.avail_in = input.len() as c_uint;
@@ -161,10 +170,12 @@
     /// This function will not grow `output`, but it will fill the space after
     /// its current length up to its capacity. The length of the vector will be
     /// adjusted appropriately.
-    pub fn compress_vec(&mut self,
-                        input: &[u8],
-                        output: &mut Vec<u8>,
-                        action: Action) -> Result<Status, Error> {
+    pub fn compress_vec(
+        &mut self,
+        input: &[u8],
+        output: &mut Vec<u8>,
+        action: Action,
+    ) -> Result<Status, Error> {
         let cap = output.capacity();
         let len = output.len();
 
@@ -176,7 +187,7 @@
                 self.compress(input, out, action)
             };
             output.set_len((self.total_out() - before) as usize + len);
-            return ret
+            return ret;
         }
     }
 
@@ -203,14 +214,16 @@
             let mut raw = Box::new(mem::zeroed());
             assert_eq!(ffi::BZ2_bzDecompressInit(&mut *raw, 0, small as c_int), 0);
             Decompress {
-                inner: Stream { raw: raw, _marker: marker::PhantomData },
+                inner: Stream {
+                    raw: raw,
+                    _marker: marker::PhantomData,
+                },
             }
         }
     }
 
     /// Decompress a block of input into a block of output.
-    pub fn decompress(&mut self, input: &[u8], output: &mut [u8])
-                      -> Result<Status, Error> {
+    pub fn decompress(&mut self, input: &[u8], output: &mut [u8]) -> Result<Status, Error> {
         self.inner.raw.next_in = input.as_ptr() as *mut _;
         self.inner.raw.avail_in = input.len() as c_uint;
         self.inner.raw.next_out = output.as_mut_ptr() as *mut _;
@@ -234,8 +247,7 @@
     /// This function will not grow `output`, but it will fill the space after
     /// its current length up to its capacity. The length of the vector will be
     /// adjusted appropriately.
-    pub fn decompress_vec(&mut self, input: &[u8], output: &mut Vec<u8>)
-                          -> Result<Status, Error> {
+    pub fn decompress_vec(&mut self, input: &[u8], output: &mut Vec<u8>) -> Result<Status, Error> {
         let cap = output.capacity();
         let len = output.len();
 
@@ -247,7 +259,7 @@
                 self.decompress(input, out)
             };
             output.set_len((self.total_out() - before) as usize + len);
-            return ret
+            return ret;
         }
     }
 
@@ -264,23 +276,31 @@
 
 impl<D: Direction> Stream<D> {
     fn total_in(&self) -> u64 {
-        (self.raw.total_in_lo32 as u64) |
-        ((self.raw.total_in_hi32 as u64) << 32)
+        (self.raw.total_in_lo32 as u64) | ((self.raw.total_in_hi32 as u64) << 32)
     }
 
     fn total_out(&self) -> u64 {
-        (self.raw.total_out_lo32 as u64) |
-        ((self.raw.total_out_hi32 as u64) << 32)
+        (self.raw.total_out_lo32 as u64) | ((self.raw.total_out_hi32 as u64) << 32)
     }
 }
 
-impl error::Error for Error {
-    fn description(&self) -> &str { "bz2 data error" }
-}
+impl error::Error for Error {}
 
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        error::Error::description(self).fmt(f)
+        let description = match self {
+            Error::Sequence => "bzip2: sequence of operations invalid",
+            Error::Data => "bzip2: invalid data",
+            Error::DataMagic => "bzip2: bz2 header missing",
+            Error::Param => "bzip2: invalid parameters",
+        };
+        f.write_str(description)
+    }
+}
+
+impl From<Error> for std::io::Error {
+    fn from(data: Error) -> std::io::Error {
+        std::io::Error::new(std::io::ErrorKind::Other, data)
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -77,8 +77,7 @@
 }
 
 #[cfg(feature = "tokio")]
-impl<R: AsyncRead> AsyncRead for BzEncoder<R> {
-}
+impl<R: AsyncRead> AsyncRead for BzEncoder<R> {}
 
 impl<W: Write + Read> Write for BzEncoder<W> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
@@ -149,8 +148,7 @@
 }
 
 #[cfg(feature = "tokio")]
-impl<R: AsyncRead + Read> AsyncRead for BzDecoder<R> {
-}
+impl<R: AsyncRead + Read> AsyncRead for BzDecoder<R> {}
 
 impl<W: Write + Read> Write for BzDecoder<W> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
@@ -169,18 +167,83 @@
     }
 }
 
+/// A bzip2 streaming decoder that decodes all members of a multistream
+///
+/// Wikipedia, particularly, uses bzip2 multistream for their dumps.
+pub struct MultiBzDecoder<R> {
+    inner: bufread::MultiBzDecoder<BufReader<R>>,
+}
+
+impl<R: Read> MultiBzDecoder<R> {
+    /// Creates a new decoder from the given reader, immediately parsing the
+    /// (first) gzip header. If the gzip stream contains multiple members all will
+    /// be decoded.
+    pub fn new(r: R) -> MultiBzDecoder<R> {
+        MultiBzDecoder {
+            inner: bufread::MultiBzDecoder::new(BufReader::new(r)),
+        }
+    }
+}
+
+impl<R> MultiBzDecoder<R> {
+    /// Acquires a reference to the underlying reader.
+    pub fn get_ref(&self) -> &R {
+        self.inner.get_ref().get_ref()
+    }
+
+    /// Acquires a mutable reference to the underlying stream.
+    ///
+    /// Note that mutation of the stream may result in surprising results if
+    /// this encoder is continued to be used.
+    pub fn get_mut(&mut self) -> &mut R {
+        self.inner.get_mut().get_mut()
+    }
+
+    /// Consumes this decoder, returning the underlying reader.
+    pub fn into_inner(self) -> R {
+        self.inner.into_inner().into_inner()
+    }
+}
+
+impl<R: Read> Read for MultiBzDecoder<R> {
+    fn read(&mut self, into: &mut [u8]) -> io::Result<usize> {
+        self.inner.read(into)
+    }
+}
+
+#[cfg(feature = "tokio")]
+impl<R: AsyncRead> AsyncRead for MultiBzDecoder<R> {}
+
+impl<R: Read + Write> Write for MultiBzDecoder<R> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.get_mut().write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.get_mut().flush()
+    }
+}
+
+#[cfg(feature = "tokio")]
+impl<R: AsyncWrite + AsyncRead> AsyncWrite for MultiBzDecoder<R> {
+    fn shutdown(&mut self) -> Poll<(), io::Error> {
+        self.get_mut().shutdown()
+    }
+}
+
 #[cfg(test)]
 mod tests {
+    use partial_io::{GenInterrupted, PartialRead, PartialWithErrors};
+    use rand::distributions::Standard;
+    use rand::{thread_rng, Rng};
+    use read::{BzDecoder, BzEncoder, MultiBzDecoder};
     use std::io::prelude::*;
-    use read::{BzEncoder, BzDecoder};
     use Compression;
-    use rand::{thread_rng, Rng};
-    use partial_io::{GenInterrupted, PartialRead, PartialWithErrors};
 
     #[test]
     fn smoke() {
         let m: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 8];
-        let mut c = BzEncoder::new(m, Compression::Default);
+        let mut c = BzEncoder::new(m, Compression::default());
         let mut data = vec![];
         c.read_to_end(&mut data).unwrap();
         let mut d = BzDecoder::new(&data[..]);
@@ -192,7 +255,7 @@
     #[test]
     fn smoke2() {
         let m: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 8];
-        let c = BzEncoder::new(m, Compression::Default);
+        let c = BzEncoder::new(m, Compression::default());
         let mut d = BzDecoder::new(c);
         let mut data = vec![];
         d.read_to_end(&mut data).unwrap();
@@ -202,7 +265,7 @@
     #[test]
     fn smoke3() {
         let m = vec![3u8; 128 * 1024 + 1];
-        let c = BzEncoder::new(&m[..], Compression::Default);
+        let c = BzEncoder::new(&m[..], Compression::default());
         let mut d = BzDecoder::new(c);
         let mut data = vec![];
         d.read_to_end(&mut data).unwrap();
@@ -212,19 +275,24 @@
     #[test]
     fn self_terminating() {
         let m = vec![3u8; 128 * 1024 + 1];
-        let mut c = BzEncoder::new(&m[..], Compression::Default);
+        let mut c = BzEncoder::new(&m[..], Compression::default());
 
         let mut result = Vec::new();
         c.read_to_end(&mut result).unwrap();
 
-        let v = thread_rng().gen_iter::<u8>().take(1024).collect::<Vec<_>>();
+        let v = thread_rng()
+            .sample_iter(&Standard)
+            .take(1024)
+            .collect::<Vec<_>>();
         for _ in 0..200 {
-            result.extend(v.iter().map(|x| *x));
+            result.extend(v.iter().map(|x: &u8| *x));
         }
 
         let mut d = BzDecoder::new(&result[..]);
         let mut data = Vec::with_capacity(m.len());
-        unsafe { data.set_len(m.len()); }
+        unsafe {
+            data.set_len(m.len());
+        }
         assert!(d.read(&mut data).unwrap() == m.len());
         assert!(data == &m[..]);
     }
@@ -232,7 +300,7 @@
     #[test]
     fn zero_length_read_at_eof() {
         let m = Vec::new();
-        let mut c = BzEncoder::new(&m[..], Compression::Default);
+        let mut c = BzEncoder::new(&m[..], Compression::default());
 
         let mut result = Vec::new();
         c.read_to_end(&mut result).unwrap();
@@ -245,7 +313,7 @@
     #[test]
     fn zero_length_read_with_data() {
         let m = vec![3u8; 128 * 1024 + 1];
-        let mut c = BzEncoder::new(&m[..], Compression::Default);
+        let mut c = BzEncoder::new(&m[..], Compression::default());
 
         let mut result = Vec::new();
         c.read_to_end(&mut result).unwrap();
@@ -256,8 +324,27 @@
     }
 
     #[test]
+    fn multistream_read_till_eof() {
+        let m = vec![3u8; 128 * 1024 + 1];
+        let repeat = 3;
+        let mut result = Vec::new();
+
+        for _i in 0..repeat {
+            let mut c = BzEncoder::new(&m[..], Compression::default());
+            c.read_to_end(&mut result).unwrap();
+        }
+
+        let mut d = MultiBzDecoder::new(&result[..]);
+        let mut data = Vec::new();
+
+        let a = d.read_to_end(&mut data).unwrap();
+        let b = m.len() * repeat;
+        assert!(a == b, "{} {}", a, b);
+    }
+
+    #[test]
     fn empty() {
-        let r = BzEncoder::new(&[][..], Compression::Default);
+        let r = BzEncoder::new(&[][..], Compression::default());
         let mut r = BzDecoder::new(r);
         let mut v2 = Vec::new();
         r.read_to_end(&mut v2).unwrap();
@@ -269,7 +356,7 @@
         ::quickcheck::quickcheck(test as fn(_) -> _);
 
         fn test(v: Vec<u8>) -> bool {
-            let r = BzEncoder::new(&v[..], Compression::Default);
+            let r = BzEncoder::new(&v[..], Compression::default());
             let mut r = BzDecoder::new(r);
             let mut v2 = Vec::new();
             r.read_to_end(&mut v2).unwrap();
@@ -279,12 +366,14 @@
 
     #[test]
     fn qc_partial() {
-        ::quickcheck::quickcheck(test as fn(_, _, _) -> _);
+        quickcheck6::quickcheck(test as fn(_, _, _) -> _);
 
-        fn test(v: Vec<u8>,
-                encode_ops: PartialWithErrors<GenInterrupted>,
-                decode_ops: PartialWithErrors<GenInterrupted>) -> bool {
-            let r = BzEncoder::new(PartialRead::new(&v[..], encode_ops), Compression::Default);
+        fn test(
+            v: Vec<u8>,
+            encode_ops: PartialWithErrors<GenInterrupted>,
+            decode_ops: PartialWithErrors<GenInterrupted>,
+        ) -> bool {
+            let r = BzEncoder::new(PartialRead::new(&v[..], encode_ops), Compression::default());
             let mut r = BzDecoder::new(PartialRead::new(r, decode_ops));
             let mut v2 = Vec::new();
             r.read_to_end(&mut v2).unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/write.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/write.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/src/write.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/src/write.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
 //! Writer-based compression/decompression streams
 
-use std::io::prelude::*;
 use std::io;
+use std::io::prelude::*;
 
 #[cfg(feature = "tokio")]
 use futures::Poll;
 #[cfg(feature = "tokio")]
 use tokio_io::{AsyncRead, AsyncWrite};
 
-use {Action, Status, Compression, Compress, Decompress};
+use {Action, Compress, Compression, Decompress, Status};
 
 /// A compression stream which will have uncompressed data written to it and
 /// will write compressed data to an output stream.
@@ -77,11 +77,11 @@
     /// function is called.
     pub fn try_finish(&mut self) -> io::Result<()> {
         while !self.done {
-            try!(self.dump());
+            self.dump()?;
             let res = self.data.compress_vec(&[], &mut self.buf, Action::Finish);
             if res == Ok(Status::StreamEnd) {
                 self.done = true;
-                break
+                break;
             }
         }
         self.dump()
@@ -98,7 +98,7 @@
     /// re-acquire ownership of a stream it is safe to call this method after
     /// `try_finish` or `shutdown` has returned `Ok`.
     pub fn finish(mut self) -> io::Result<W> {
-        try!(self.try_finish());
+        self.try_finish()?;
         Ok(self.obj.take().unwrap())
     }
 
@@ -121,28 +121,30 @@
 impl<W: Write> Write for BzEncoder<W> {
     fn write(&mut self, data: &[u8]) -> io::Result<usize> {
         loop {
-            try!(self.dump());
+            self.dump()?;
 
             let total_in = self.total_in();
-            self.data.compress_vec(data, &mut self.buf, Action::Run)
+            self.data
+                .compress_vec(data, &mut self.buf, Action::Run)
                 .unwrap();
             let written = (self.total_in() - total_in) as usize;
 
             if written > 0 || data.len() == 0 {
-                return Ok(written)
+                return Ok(written);
             }
         }
     }
 
     fn flush(&mut self) -> io::Result<()> {
         loop {
-            try!(self.dump());
+            self.dump()?;
             let before = self.total_out();
-            self.data.compress_vec(&[], &mut self.buf, Action::Flush)
+            self.data
+                .compress_vec(&[], &mut self.buf, Action::Flush)
                 .unwrap();
 
             if before == self.total_out() {
-                break
+                break;
             }
         }
         self.obj.as_mut().unwrap().flush()
@@ -164,8 +166,7 @@
 }
 
 #[cfg(feature = "tokio")]
-impl<W: AsyncRead + AsyncWrite> AsyncRead for BzEncoder<W> {
-}
+impl<W: AsyncRead + AsyncWrite> AsyncRead for BzEncoder<W> {}
 
 impl<W: Write> Drop for BzEncoder<W> {
     fn drop(&mut self) {
@@ -224,7 +225,7 @@
     /// function is called.
     pub fn try_finish(&mut self) -> io::Result<()> {
         while !self.done {
-            try!(self.write(&[]));
+            self.write(&[])?;
         }
         self.dump()
     }
@@ -237,7 +238,7 @@
     /// re-acquire ownership of a stream it is safe to call this method after
     /// `try_finish` or `shutdown` has returned `Ok`.
     pub fn finish(&mut self) -> io::Result<W> {
-        try!(self.try_finish());
+        self.try_finish()?;
         Ok(self.obj.take().unwrap())
     }
 
@@ -260,30 +261,28 @@
 impl<W: Write> Write for BzDecoder<W> {
     fn write(&mut self, data: &[u8]) -> io::Result<usize> {
         if self.done {
-            return Ok(0)
+            return Ok(0);
         }
         loop {
-            try!(self.dump());
+            self.dump()?;
 
             let before = self.total_in();
             let res = self.data.decompress_vec(data, &mut self.buf);
             let written = (self.total_in() - before) as usize;
 
-            let res = try!(res.map_err(|e| {
-                io::Error::new(io::ErrorKind::InvalidInput, e)
-            }));
+            let res = res.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
 
             if res == Status::StreamEnd {
                 self.done = true;
             }
             if written > 0 || data.len() == 0 || self.done {
-                return Ok(written)
+                return Ok(written);
             }
         }
     }
 
     fn flush(&mut self) -> io::Result<()> {
-        try!(self.dump());
+        self.dump()?;
         self.obj.as_mut().unwrap().flush()
     }
 }
@@ -303,8 +302,7 @@
 }
 
 #[cfg(feature = "tokio")]
-impl<W: AsyncRead + AsyncWrite> AsyncRead for BzDecoder<W> {
-}
+impl<W: AsyncRead + AsyncWrite> AsyncRead for BzDecoder<W> {}
 
 impl<W: Write> Drop for BzDecoder<W> {
     fn drop(&mut self) {
@@ -316,15 +314,15 @@
 
 #[cfg(test)]
 mod tests {
+    use super::{BzDecoder, BzEncoder};
+    use partial_io::{GenInterrupted, PartialWithErrors, PartialWrite};
     use std::io::prelude::*;
     use std::iter::repeat;
-    use partial_io::{GenInterrupted, PartialWithErrors, PartialWrite};
-    use super::{BzEncoder, BzDecoder};
 
     #[test]
     fn smoke() {
         let d = BzDecoder::new(Vec::new());
-        let mut c = BzEncoder::new(d, ::Compression::Default);
+        let mut c = BzEncoder::new(d, ::Compression::default());
         c.write_all(b"12834").unwrap();
         let s = repeat("12345").take(100000).collect::<String>();
         c.write_all(s.as_bytes()).unwrap();
@@ -337,7 +335,7 @@
     #[test]
     fn write_empty() {
         let d = BzDecoder::new(Vec::new());
-        let mut c = BzEncoder::new(d, ::Compression::Default);
+        let mut c = BzEncoder::new(d, ::Compression::default());
         c.write(b"").unwrap();
         let data = c.finish().unwrap().finish().unwrap();
         assert_eq!(&data[..], b"");
@@ -349,7 +347,7 @@
 
         fn test(v: Vec<u8>) -> bool {
             let w = BzDecoder::new(Vec::new());
-            let mut w = BzEncoder::new(w, ::Compression::Default);
+            let mut w = BzEncoder::new(w, ::Compression::default());
             w.write_all(&v).unwrap();
             v == w.finish().unwrap().finish().unwrap()
         }
@@ -357,15 +355,23 @@
 
     #[test]
     fn qc_partial() {
-        ::quickcheck::quickcheck(test as fn(_, _, _) -> _);
+        quickcheck6::quickcheck(test as fn(_, _, _) -> _);
 
-        fn test(v: Vec<u8>,
-                encode_ops: PartialWithErrors<GenInterrupted>,
-                decode_ops: PartialWithErrors<GenInterrupted>) -> bool {
+        fn test(
+            v: Vec<u8>,
+            encode_ops: PartialWithErrors<GenInterrupted>,
+            decode_ops: PartialWithErrors<GenInterrupted>,
+        ) -> bool {
             let w = BzDecoder::new(PartialWrite::new(Vec::new(), decode_ops));
-            let mut w = BzEncoder::new(PartialWrite::new(w, encode_ops), ::Compression::Default);
+            let mut w = BzEncoder::new(PartialWrite::new(w, encode_ops), ::Compression::default());
             w.write_all(&v).unwrap();
-            v == w.finish().unwrap().into_inner().finish().unwrap().into_inner()
+            v == w
+                .finish()
+                .unwrap()
+                .into_inner()
+                .finish()
+                .unwrap()
+                .into_inner()
         }
     }
 }
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/tests/bug_61.bz2 and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/tests/bug_61.bz2 differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/tests/bug_61.raw and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/tests/bug_61.raw differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/tests/tokio.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/tests/tokio.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2/tests/tokio.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2/tests/tokio.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,24 +1,24 @@
 #![cfg(feature = "tokio")]
 
-extern crate tokio_core;
 extern crate bzip2;
-extern crate tokio_io;
 extern crate futures;
 extern crate rand;
+extern crate tokio_core;
+extern crate tokio_io;
 
-use std::thread;
-use std::net::{Shutdown, TcpListener};
 use std::io::{Read, Write};
+use std::net::{Shutdown, TcpListener};
+use std::thread;
 
-use bzip2::Compression;
 use bzip2::read;
 use bzip2::write;
+use bzip2::Compression;
 use futures::Future;
-use rand::{Rng, thread_rng};
+use rand::{thread_rng, Rng};
 use tokio_core::net::TcpStream;
 use tokio_core::reactor::Core;
-use tokio_io::AsyncRead;
 use tokio_io::io::{copy, shutdown};
+use tokio_io::AsyncRead;
 
 #[test]
 fn tcp_stream_echo_pattern() {
@@ -45,29 +45,30 @@
             assert_eq!(b.read(&mut buf).unwrap(), 0);
         });
 
-        let mut a = write::BzEncoder::new(a, Compression::Default);
+        let mut a = write::BzEncoder::new(a, Compression::default());
         for i in 0..N {
             let buf = [i; M];
             a.write_all(&buf).unwrap();
         }
-        a.finish().unwrap()
-         .shutdown(Shutdown::Write).unwrap();
+        a.finish().unwrap().shutdown(Shutdown::Write).unwrap();
 
         t.join().unwrap();
     });
 
     let handle = core.handle();
     let stream = TcpStream::connect(&addr, &handle);
-    let copy = stream.and_then(|s| {
-        let (a, b) = s.split();
-        let a = read::BzDecoder::new(a);
-        let b = write::BzEncoder::new(b, Compression::Default);
-        copy(a, b)
-    }).then(|result| {
-        let (amt, _a, b) = result.unwrap();
-        assert_eq!(amt, (N as u64) * (M as u64));
-        shutdown(b).map(|_| ())
-    });
+    let copy = stream
+        .and_then(|s| {
+            let (a, b) = s.split();
+            let a = read::BzDecoder::new(a);
+            let b = write::BzEncoder::new(b, Compression::default());
+            copy(a, b)
+        })
+        .then(|result| {
+            let (amt, _a, b) = result.unwrap();
+            assert_eq!(amt, (N as u64) * (M as u64));
+            shutdown(b).map(|_| ())
+        });
 
     core.run(copy).unwrap();
     t.join().unwrap();
@@ -75,7 +76,8 @@
 
 #[test]
 fn echo_random() {
-    let v = thread_rng().gen_iter::<u8>().take(1024 * 1024).collect::<Vec<_>>();
+    let mut v = vec![0; 1024 * 1024];
+    thread_rng().fill(v.as_mut_slice());
     let mut core = Core::new().unwrap();
     let listener = TcpListener::bind("127.0.0.1:0").unwrap();
     let addr = listener.local_addr().unwrap();
@@ -99,26 +101,27 @@
             assert_eq!(b.read(&mut buf).unwrap(), 0);
         });
 
-        let mut a = write::BzEncoder::new(a, Compression::Default);
+        let mut a = write::BzEncoder::new(a, Compression::default());
         a.write_all(&v2).unwrap();
-        a.finish().unwrap()
-         .shutdown(Shutdown::Write).unwrap();
+        a.finish().unwrap().shutdown(Shutdown::Write).unwrap();
 
         t.join().unwrap();
     });
 
     let handle = core.handle();
     let stream = TcpStream::connect(&addr, &handle);
-    let copy = stream.and_then(|s| {
-        let (a, b) = s.split();
-        let a = read::BzDecoder::new(a);
-        let b = write::BzEncoder::new(b, Compression::Default);
-        copy(a, b)
-    }).then(|result| {
-        let (amt, _a, b) = result.unwrap();
-        assert_eq!(amt, v.len() as u64);
-        shutdown(b).map(|_| ())
-    });
+    let copy = stream
+        .and_then(|s| {
+            let (a, b) = s.split();
+            let a = read::BzDecoder::new(a);
+            let b = write::BzEncoder::new(b, Compression::default());
+            copy(a, b)
+        })
+        .then(|result| {
+            let (amt, _a, b) = result.unwrap();
+            assert_eq!(amt, v.len() as u64);
+            shutdown(b).map(|_| ())
+        });
 
     core.run(copy).unwrap();
     t.join().unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,8 @@
     if target.contains("windows") {
         cfg.define("_WIN32", None);
         cfg.define("BZ_EXPORT", None);
-    } else {
+    } else if !cfg!(feature = "static") {
+        // pkg-config doesn't guarantee static link
         if pkg_config::Config::new()
             .cargo_metadata(true)
             .probe("bzip2")
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"c81b296bac47246d12365c726b37fa2e6e4ade4c6d06bff426a0eca975973423","build.rs":"5c05e582d5be7a97a6854ab4447dcf01d96ab136961f2618021c97cf40957361","bzip2-1.0.8/CHANGES":"67d96e05c081c0784abbb566a70a36bc856cb5f913d52b96832d1d35c4f68eaf","bzip2-1.0.8/LICENSE":"c6dbbf828498be844a89eaa3b84adbab3199e342eb5cb2ed2f0d4ba7ec0f38a3","bzip2-1.0.8/Makefile":"7e7cf0f050748c29caa9cb6abd30639d46d3b9c7880562f2834f9b908ac97f80","bzip2-1.0.8/Makefile-libbz2_so":"0c3c80f466d648432a5e11f0dd188dc86de273476726283cc35a38e39a6d3960","bzip2-1.0.8/README":"152f0da2867a1160a8f956628296ff45e766e492ad0d7054ffb8d981f7518782","bzip2-1.0.8/README.COMPILATION.PROBLEMS":"8d19a9e83b36016aa55d7e4014da04ef0def40b43b34f40a370f7f8ff582939e","bzip2-1.0.8/README.XML.STUFF":"5c0bc2b3a1ed9103dcf65d0aa23d3082318ab99fb96d862eb63f5e37537e5d8d","bzip2-1.0.8/blocksort.c":"4e48cd2ccff44699e67a7c949b0e9576c05b8dcbe20f863475c4fcc8db11a409","bzip2-1.0.8/bz-common.xsl":"cceeb48f5ddf2bcac9cd196f67413466e70c9f801e1c508aaa1de574cbe71cbc","bzip2-1.0.8/bz-fo.xsl":"a25683b9893709d92ab61fb91c3bc6b1892498d9f43fd0c22b3917a3789cdc2d","bzip2-1.0.8/bz-html.xsl":"351f5730e016ebe1757b028de19837545caea286c995c3077c1dcdfe13e4e5dc","bzip2-1.0.8/bzdiff":"1c1f96193cdf14b85ea65f140a7557a07ece8783a53ec5ba6b5c30644a9d3012","bzip2-1.0.8/bzdiff.1":"32d1a7cd115430398e58537532584ef2ab76343c9f094dcd1253d9c4c0f705bf","bzip2-1.0.8/bzgrep":"a8e368a31766c7862b8d0feeffe274c3bb43b969e3ccb4f9e77d13bfa447a5c9","bzip2-1.0.8/bzgrep.1":"924aa4a7c7c1467400181e4c0ee1b527db142b6399a717171f2351b72b5899df","bzip2-1.0.8/bzip.css":"8a48849a905066534deb41630cf94b4540c269491f7b028c4510d0bc9c1c4f5c","bzip2-1.0.8/bzip2.1":"27b984bb2e8bbee2651d11cda87449cfc4138d2e479b9eaa77b8f60fa5d0bf5d","bzip2-1.0.8/bzip2.1.preformatted":"e1a5e610dc52c49b4fc479c12320d07db329d06fb20f90564d300108c434d491","bzip2-1.0.8/bzip2.c":"1e83a6afe1018600208d97b80351fa951689204f3fad508bd99ca36dc7e32e88","bzip2-1.0.8/bzip2.txt":"4e25ed103828141f371ffa4ed0446d139e2c3626517e6f4335855bdad021afcd","bzip2-1.0.8/bzip2recover.c":"36c0cb1ced40d5c62d02fda48f0bd717d1acfeb19b5f4f997b1ac9921f56a790","bzip2-1.0.8/bzlib.c":"d06cf1bd991df1f2dc8ef4f7713d186eb636767111cbd4807ef5fc4a54ca6838","bzip2-1.0.8/bzlib.h":"6ac62e811669598ee30c9e1c379b9e627f6ff17a5a3dc1e0b4fa8b8ea75e580d","bzip2-1.0.8/bzlib_private.h":"c0cda4f35ee1f2d54c9beacd524f8d28e0dbf8494aca30d854af3f143af4341b","bzip2-1.0.8/bzmore":"836536d4c7469788c730355d59f8ae8d16ba07cb0754174878d99ed90f04448d","bzip2-1.0.8/bzmore.1":"ccfcf3f995e11adae3035e287252091bb72d165da21e0c385a4965d17c9051c7","bzip2-1.0.8/compress.c":"75995bd6e8c5f1e1dad05178f3cf53137df99ce860a1984324f78591f28deed3","bzip2-1.0.8/crctable.c":"2fb7a564629386456e731f431a5cf4f5026747bace4cd10be8f5ecf082066a92","bzip2-1.0.8/decompress.c":"31a89f8bf408ef0e4acae83e8be60a8eb4edece6c866d6e32b8f7e557ca54bc6","bzip2-1.0.8/dlltest.c":"1568b2dd44d3007dd52bfb1bdf9f31ffc90706d260ec5a3504bc47dc32a040a1","bzip2-1.0.8/dlltest.dsp":"5073bbf71a35876e8f82e34c66ccc578552713d0798576d944d9ec7ab61070c8","bzip2-1.0.8/entities.xml":"d8abc241dfd1fb2e4350b47f00fed992b2a8b68c9759a58155797989fcd91826","bzip2-1.0.8/format.pl":"6d858d3285fc89610dd8d67ee1e37590afa6e2058693c718bb2202b6b270afe1","bzip2-1.0.8/huffman.c":"bdeb45f3f535546a672811b68aa87cc58fd395b28ecebc34fa3566a656a4d1d1","bzip2-1.0.8/libbz2.def":"7c72d18c550afbf464c92aeb3869eb559c9faba5c7828546d1ec8620e9d5c7a3","bzip2-1.0.8/libbz2.dsp":"e92bc39a2fc6a8c7e095971a55e5779d4c255b4484d259914614ab49bf09db8f","bzip2-1.0.8/makefile.msc":"aa4179750a47298dd61dd296937735afb04cff81957852eaf491819c20e1f406","bzip2-1.0.8/manual.html":"34f5eaeb37488b51662316b8d9f54228c96f72b54aec3bfc17cd731e3ce9bbd2","bzip2-1.0.8/manual.ps":"18d0971311ef13e62463acb888435bade35748523341d45a26ec6fcad5c1c69b","bzip2-1.0.8/manual.xml":"f333eb33556218995a79870a1d2c01a06bdaa9994549142cfbeb0c8b96425234","bzip2-1.0.8/mk251.c":"12a3031e2b1f2bd98a0b4e70669bfee81864304e43b696951f18120d39d1bdd9","bzip2-1.0.8/randtable.c":"407054ca6f54cd737dbc26ceb6b7874b55a0fcff86c2eb23cbec2fbdbb884815","bzip2-1.0.8/sample1.bz2":"d4b442283e085497c528c0122c7ec64bf12aac422b3faff57b97de3378b7a7a4","bzip2-1.0.8/sample1.ref":"af423164ec87f495f7d450fee9bdd418c12114cd305de2384fd20b91ba7994c2","bzip2-1.0.8/sample2.bz2":"c74d44033766ea66171f51bd2ce6e3ad9ce4e0749e03ee4bee3074ab2a4b9c7f","bzip2-1.0.8/sample2.ref":"316ad6713f2c05413e0b9eac132840d092674e7de4138251d3552f98671fcf9a","bzip2-1.0.8/sample3.bz2":"fc60721da6329daa4bfe5ef3b32d2de0bebac626ce8522ae033dc3a9296c7779","bzip2-1.0.8/sample3.ref":"6be9c2bd214924b18db0d57b9a14d6f4eeb0b276cd3a980aed91521cca3199dd","bzip2-1.0.8/spewG.c":"14aed503d0e03b32a5393eb033f4cd39d40af154b431b2f888ff6d1639816a87","bzip2-1.0.8/unzcrash.c":"d166748e4f8842b5aaaafc13dd7362fdbf67f01ef9e7ba438579ca8a83da0879","bzip2-1.0.8/words0":"cb3ad1756ad30df2b53e4abc0cc5fa19f120de5582bee32481460cb6991d4b24","bzip2-1.0.8/words1":"199303545d9a074b351c9d58fe41032a65840eb9638a8a1be9aea6b63ce55a19","bzip2-1.0.8/words2":"dbc836878df8abee6f509bb60665fa75e783d654f1a55dd4bd5d9c430009cb41","bzip2-1.0.8/words3":"6c9b45d0f7a9d5a1aee52016b48bef8171be2cda23cf18144ef1d5d36eceb260","bzip2-1.0.8/xmlproc.sh":"f965a7fd70dcc92ed168b650162acb2163f1b76dffbd47e59a315430acbe9830","lib.rs":"8973f26cea9eba53cdfea66fce84eaf7fe9553b6554460b91089a202b27c41f6"},"package":"ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e"}
\ No newline at end of file
+{"files":{"Cargo.toml":"65489e85f0ff141c2908071937d667be15002b19451bff19f10c2f189d657d20","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","build.rs":"5ea6bf7f9cfaa58d2fa4405309d77c9742de45bbc03af9c9f6f1a699b8b82281","bzip2-1.0.8/CHANGES":"67d96e05c081c0784abbb566a70a36bc856cb5f913d52b96832d1d35c4f68eaf","bzip2-1.0.8/LICENSE":"c6dbbf828498be844a89eaa3b84adbab3199e342eb5cb2ed2f0d4ba7ec0f38a3","bzip2-1.0.8/Makefile":"7e7cf0f050748c29caa9cb6abd30639d46d3b9c7880562f2834f9b908ac97f80","bzip2-1.0.8/Makefile-libbz2_so":"0c3c80f466d648432a5e11f0dd188dc86de273476726283cc35a38e39a6d3960","bzip2-1.0.8/README":"152f0da2867a1160a8f956628296ff45e766e492ad0d7054ffb8d981f7518782","bzip2-1.0.8/README.COMPILATION.PROBLEMS":"8d19a9e83b36016aa55d7e4014da04ef0def40b43b34f40a370f7f8ff582939e","bzip2-1.0.8/README.XML.STUFF":"5c0bc2b3a1ed9103dcf65d0aa23d3082318ab99fb96d862eb63f5e37537e5d8d","bzip2-1.0.8/blocksort.c":"4e48cd2ccff44699e67a7c949b0e9576c05b8dcbe20f863475c4fcc8db11a409","bzip2-1.0.8/bz-common.xsl":"cceeb48f5ddf2bcac9cd196f67413466e70c9f801e1c508aaa1de574cbe71cbc","bzip2-1.0.8/bz-fo.xsl":"a25683b9893709d92ab61fb91c3bc6b1892498d9f43fd0c22b3917a3789cdc2d","bzip2-1.0.8/bz-html.xsl":"351f5730e016ebe1757b028de19837545caea286c995c3077c1dcdfe13e4e5dc","bzip2-1.0.8/bzdiff":"1c1f96193cdf14b85ea65f140a7557a07ece8783a53ec5ba6b5c30644a9d3012","bzip2-1.0.8/bzdiff.1":"32d1a7cd115430398e58537532584ef2ab76343c9f094dcd1253d9c4c0f705bf","bzip2-1.0.8/bzgrep":"a8e368a31766c7862b8d0feeffe274c3bb43b969e3ccb4f9e77d13bfa447a5c9","bzip2-1.0.8/bzgrep.1":"924aa4a7c7c1467400181e4c0ee1b527db142b6399a717171f2351b72b5899df","bzip2-1.0.8/bzip.css":"8a48849a905066534deb41630cf94b4540c269491f7b028c4510d0bc9c1c4f5c","bzip2-1.0.8/bzip2.1":"27b984bb2e8bbee2651d11cda87449cfc4138d2e479b9eaa77b8f60fa5d0bf5d","bzip2-1.0.8/bzip2.1.preformatted":"e1a5e610dc52c49b4fc479c12320d07db329d06fb20f90564d300108c434d491","bzip2-1.0.8/bzip2.c":"1e83a6afe1018600208d97b80351fa951689204f3fad508bd99ca36dc7e32e88","bzip2-1.0.8/bzip2.txt":"4e25ed103828141f371ffa4ed0446d139e2c3626517e6f4335855bdad021afcd","bzip2-1.0.8/bzip2recover.c":"36c0cb1ced40d5c62d02fda48f0bd717d1acfeb19b5f4f997b1ac9921f56a790","bzip2-1.0.8/bzlib.c":"d06cf1bd991df1f2dc8ef4f7713d186eb636767111cbd4807ef5fc4a54ca6838","bzip2-1.0.8/bzlib.h":"6ac62e811669598ee30c9e1c379b9e627f6ff17a5a3dc1e0b4fa8b8ea75e580d","bzip2-1.0.8/bzlib_private.h":"c0cda4f35ee1f2d54c9beacd524f8d28e0dbf8494aca30d854af3f143af4341b","bzip2-1.0.8/bzmore":"836536d4c7469788c730355d59f8ae8d16ba07cb0754174878d99ed90f04448d","bzip2-1.0.8/bzmore.1":"ccfcf3f995e11adae3035e287252091bb72d165da21e0c385a4965d17c9051c7","bzip2-1.0.8/compress.c":"75995bd6e8c5f1e1dad05178f3cf53137df99ce860a1984324f78591f28deed3","bzip2-1.0.8/crctable.c":"2fb7a564629386456e731f431a5cf4f5026747bace4cd10be8f5ecf082066a92","bzip2-1.0.8/decompress.c":"31a89f8bf408ef0e4acae83e8be60a8eb4edece6c866d6e32b8f7e557ca54bc6","bzip2-1.0.8/dlltest.c":"1568b2dd44d3007dd52bfb1bdf9f31ffc90706d260ec5a3504bc47dc32a040a1","bzip2-1.0.8/dlltest.dsp":"5073bbf71a35876e8f82e34c66ccc578552713d0798576d944d9ec7ab61070c8","bzip2-1.0.8/entities.xml":"d8abc241dfd1fb2e4350b47f00fed992b2a8b68c9759a58155797989fcd91826","bzip2-1.0.8/format.pl":"6d858d3285fc89610dd8d67ee1e37590afa6e2058693c718bb2202b6b270afe1","bzip2-1.0.8/huffman.c":"bdeb45f3f535546a672811b68aa87cc58fd395b28ecebc34fa3566a656a4d1d1","bzip2-1.0.8/libbz2.def":"7c72d18c550afbf464c92aeb3869eb559c9faba5c7828546d1ec8620e9d5c7a3","bzip2-1.0.8/libbz2.dsp":"e92bc39a2fc6a8c7e095971a55e5779d4c255b4484d259914614ab49bf09db8f","bzip2-1.0.8/makefile.msc":"aa4179750a47298dd61dd296937735afb04cff81957852eaf491819c20e1f406","bzip2-1.0.8/manual.html":"34f5eaeb37488b51662316b8d9f54228c96f72b54aec3bfc17cd731e3ce9bbd2","bzip2-1.0.8/manual.ps":"18d0971311ef13e62463acb888435bade35748523341d45a26ec6fcad5c1c69b","bzip2-1.0.8/manual.xml":"f333eb33556218995a79870a1d2c01a06bdaa9994549142cfbeb0c8b96425234","bzip2-1.0.8/mk251.c":"12a3031e2b1f2bd98a0b4e70669bfee81864304e43b696951f18120d39d1bdd9","bzip2-1.0.8/randtable.c":"407054ca6f54cd737dbc26ceb6b7874b55a0fcff86c2eb23cbec2fbdbb884815","bzip2-1.0.8/sample1.bz2":"d4b442283e085497c528c0122c7ec64bf12aac422b3faff57b97de3378b7a7a4","bzip2-1.0.8/sample1.ref":"af423164ec87f495f7d450fee9bdd418c12114cd305de2384fd20b91ba7994c2","bzip2-1.0.8/sample2.bz2":"c74d44033766ea66171f51bd2ce6e3ad9ce4e0749e03ee4bee3074ab2a4b9c7f","bzip2-1.0.8/sample2.ref":"316ad6713f2c05413e0b9eac132840d092674e7de4138251d3552f98671fcf9a","bzip2-1.0.8/sample3.bz2":"fc60721da6329daa4bfe5ef3b32d2de0bebac626ce8522ae033dc3a9296c7779","bzip2-1.0.8/sample3.ref":"6be9c2bd214924b18db0d57b9a14d6f4eeb0b276cd3a980aed91521cca3199dd","bzip2-1.0.8/spewG.c":"14aed503d0e03b32a5393eb033f4cd39d40af154b431b2f888ff6d1639816a87","bzip2-1.0.8/unzcrash.c":"d166748e4f8842b5aaaafc13dd7362fdbf67f01ef9e7ba438579ca8a83da0879","bzip2-1.0.8/words0":"cb3ad1756ad30df2b53e4abc0cc5fa19f120de5582bee32481460cb6991d4b24","bzip2-1.0.8/words1":"199303545d9a074b351c9d58fe41032a65840eb9638a8a1be9aea6b63ce55a19","bzip2-1.0.8/words2":"dbc836878df8abee6f509bb60665fa75e783d654f1a55dd4bd5d9c430009cb41","bzip2-1.0.8/words3":"6c9b45d0f7a9d5a1aee52016b48bef8171be2cda23cf18144ef1d5d36eceb260","bzip2-1.0.8/xmlproc.sh":"f965a7fd70dcc92ed168b650162acb2163f1b76dffbd47e59a315430acbe9830","lib.rs":"8efc837c2aa2f35edead6ec2cc08d7f9d7da49ca6694b6ea889c7fed3681de77"},"package":"736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "bzip2-sys"
-version = "0.1.9+1.0.8"
+version = "0.1.11+1.0.8"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 build = "build.rs"
 links = "bzip2"
@@ -33,3 +33,6 @@
 
 [build-dependencies.pkg-config]
 version = "0.3.9"
+
+[features]
+static = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -48,7 +48,7 @@
         extern "system" {
             $(pub fn $name($($arg: $t),*) -> $ret;)*
         }
-        #[cfg(any(unix, target_os = "redox"))]
+        #[cfg(not(windows))]
         extern {
             $(pub fn $name($($arg: $t),*) -> $ret;)*
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/bzip2-sys/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/bzip2-sys/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2014 Alex Crichton
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"e7f53256b803536940678cee654d7e2318882aa7cd163acbe8be0caa72087b65","Cargo.toml":"ecb8c7e0fccad7f2d42412b5a227bf51f8e53b9fd526e036fc1b8f41c5024a68","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"3055cc70608f92dab0dcd10338264357ef891f01d02219fa64457b4aa016936b","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"e1a05e4a092b903dbbc45612ee924c038585d5f680233792afc551000eb6aac5","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"52afe8554f577c87841c48ddee3ba7ffe70a00129e1d6eeb2ec0efb3d2b9aa11","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"16274867f23871e9b07614eda4c7344da13d1751fed63d4f633857e40be86394","tests/test.rs":"65c073e0e2cf4aa0433066102788e9f57442719e6f32f5ad5248aa7132bb4597"},"package":"4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"}
\ No newline at end of file
+{"files":{"Cargo.lock":"80af52afb5e95100c7c480bf7787da9b36bc10d6bb206f1532785e5d581c8586","Cargo.toml":"fa1e64b64ffb20974689c18921df58f20d5476141f2eb2311306a6b8c2851d38","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"1fd66e1fe6d618030b9452c667e89d7a31b27331ad831d83b41f9762fd6858d4","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"6f1a2b2a92066b8ff413d3a58fe89ab35d5ff9ee97aaa4d4045ef9748b27fed4","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"d8f3014140d637b50a1fa4a9739b3617299ab43f829e65b2728f515a969a5376","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"16274867f23871e9b07614eda4c7344da13d1751fed63d4f633857e40be86394","tests/test.rs":"65c073e0e2cf4aa0433066102788e9f57442719e6f32f5ad5248aa7132bb4597"},"package":"d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,10 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "cc"
-version = "1.0.66"
+version = "1.0.70"
 dependencies = [
  "jobserver",
  "tempfile",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "cc"
-version = "1.0.66"
+version = "1.0.70"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 exclude = ["/.github", "/.travis.yml", "/appveyor.yml"]
 description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -101,7 +101,7 @@
 build-script driver][cargo] that it has the `TARGET`, `OUT_DIR`, `OPT_LEVEL`,
 and `HOST` variables.
 
-[cargo]: http://doc.crates.io/build-script.html#inputs-to-the-build-script
+[cargo]: https://doc.rust-lang.org/cargo/reference/build-scripts.html#inputs-to-the-build-script
 
 ## Optional features
 
@@ -128,7 +128,7 @@
 required varies per platform, but there are three broad categories:
 
 * Unix platforms require `cc` to be the C compiler. This can be found by
-  installing cc/clang on Linux distributions and Xcode on OSX, for example.
+  installing cc/clang on Linux distributions and Xcode on macOS, for example.
 * Windows platforms targeting MSVC (e.g. your target triple ends in `-msvc`)
   require `cl.exe` to be available and in `PATH`. This is typically found in
   standard Visual Studio installations and the `PATH` can be set up by running
@@ -138,12 +138,12 @@
   [MinGW-w64](http://mingw-w64.org) distribution, which is using the
   [Win-builds](http://win-builds.org) installation system.
   You may also acquire it via
-  [MSYS2](http://msys2.github.io), as explained [here][msys2-help].  Make sure
+  [MSYS2](https://www.msys2.org/), as explained [here][msys2-help].  Make sure
   to install the appropriate architecture corresponding to your installation of
   rustc. GCC from older [MinGW](http://www.mingw.org) project is compatible
   only with 32-bit rust compiler.
 
-[msys2-help]: http://github.com/rust-lang/rust#building-on-windows
+[msys2-help]: https://github.com/rust-lang/rust#building-on-windows
 
 ## C++ support
 
@@ -161,7 +161,7 @@
 
 For C++ libraries, the `CXX` and `CXXFLAGS` environment variables are used instead of `CC` and `CFLAGS`.
 
-The C++ standard library may be linked to the crate target. By default it's `libc++` for OS X, FreeBSD, and OpenBSD, `libc++_shared` for Android, nothing for MSVC, and `libstdc++` for anything else. It can be changed in one of two ways:
+The C++ standard library may be linked to the crate target. By default it's `libc++` for macOS, FreeBSD, and OpenBSD, `libc++_shared` for Android, nothing for MSVC, and `libstdc++` for anything else. It can be changed in one of two ways:
 
 1. by using the `cpp_link_stdlib` method on `Build`:
     ```rust,no-run
@@ -189,6 +189,7 @@
     cc::Build::new()
         // Switch to CUDA C++ library compilation using NVCC.
         .cuda(true)
+        .cudart("static")
         // Generate code for Maxwell (GTX 970, 980, 980 Ti, Titan X).
         .flag("-gencode").flag("arch=compute_52,code=sm_52")
         // Generate code for Maxwell (Jetson TX1).
@@ -209,9 +210,9 @@
 This project is licensed under either of
 
  * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
+   https://www.apache.org/licenses/LICENSE-2.0)
  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
+   https://opensource.org/licenses/MIT)
 
 at your option.
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -78,6 +78,8 @@
 mod com;
 #[cfg(windows)]
 mod setup_config;
+#[cfg(windows)]
+mod vs_instances;
 
 pub mod windows_registry;
 
@@ -101,6 +103,7 @@
     cpp_link_stdlib: Option<Option<String>>,
     cpp_set_stdlib: Option<String>,
     cuda: bool,
+    cudart: Option<String>,
     target: Option<String>,
     host: Option<String>,
     out_dir: Option<PathBuf>,
@@ -296,6 +299,7 @@
             cpp_link_stdlib: None,
             cpp_set_stdlib: None,
             cuda: false,
+            cudart: None,
             target: None,
             host: None,
             out_dir: None,
@@ -609,6 +613,20 @@
         self.cuda = cuda;
         if cuda {
             self.cpp = true;
+            self.cudart = Some("static".to_string());
+        }
+        self
+    }
+
+    /// Link CUDA run-time.
+    ///
+    /// This option mimics the `--cudart` NVCC command-line option. Just like
+    /// the original it accepts `{none|shared|static}`, with default being
+    /// `static`. The method has to be invoked after `.cuda(true)`, or not
+    /// at all, if the default is right for the project.
+    pub fn cudart(&mut self, cudart: &str) -> &mut Build {
+        if self.cuda {
+            self.cudart = Some(cudart.to_string());
         }
         self
     }
@@ -730,7 +748,7 @@
     /// This option sets the `-stdlib` flag, which is only supported by some
     /// compilers (clang, icc) but not by others (gcc). The library will not
     /// detect which compiler is used, as such it is the responsibility of the
-    /// caller to ensure that this option is only used in conjuction with a
+    /// caller to ensure that this option is only used in conjunction with a
     /// compiler which supports the `-stdlib` flag.
     ///
     /// A value of `None` indicates that no specific C++ standard library should
@@ -994,6 +1012,56 @@
             }
         }
 
+        let cudart = match &self.cudart {
+            Some(opt) => opt.as_str(), // {none|shared|static}
+            None => "none",
+        };
+        if cudart != "none" {
+            if let Some(nvcc) = which(&self.get_compiler().path) {
+                // Try to figure out the -L search path. If it fails,
+                // it's on user to specify one by passing it through
+                // RUSTFLAGS environment variable.
+                let mut libtst = false;
+                let mut libdir = nvcc;
+                libdir.pop(); // remove 'nvcc'
+                libdir.push("..");
+                let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+                if cfg!(target_os = "linux") {
+                    libdir.push("targets");
+                    libdir.push(target_arch.to_owned() + "-linux");
+                    libdir.push("lib");
+                    libtst = true;
+                } else if cfg!(target_env = "msvc") {
+                    libdir.push("lib");
+                    match target_arch.as_str() {
+                        "x86_64" => {
+                            libdir.push("x64");
+                            libtst = true;
+                        }
+                        "x86" => {
+                            libdir.push("Win32");
+                            libtst = true;
+                        }
+                        _ => libtst = false,
+                    }
+                }
+                if libtst && libdir.is_dir() {
+                    println!(
+                        "cargo:rustc-link-search=native={}",
+                        libdir.to_str().unwrap()
+                    );
+                }
+
+                // And now the -l flag.
+                let lib = match cudart {
+                    "shared" => "cudart",
+                    "static" => "cudart_static",
+                    bad => panic!("unsupported cudart option: {}", bad),
+                };
+                println!("cargo:rustc-link-lib={}", lib);
+            }
+        }
+
         Ok(())
     }
 
@@ -1203,6 +1271,9 @@
         if !msvc || !is_asm || !is_arm {
             cmd.arg("-c");
         }
+        if self.cuda && self.files.len() > 1 {
+            cmd.arg("--device-c");
+        }
         cmd.arg(&obj.src);
         if cfg!(target_os = "macos") {
             self.fix_env_for_apple_os(&mut cmd)?;
@@ -1414,7 +1485,7 @@
                     cmd.push_opt_unless_duplicate("-DANDROID".into());
                 }
 
-                if !target.contains("-ios") {
+                if !target.contains("apple-ios") {
                     cmd.push_cc_arg("-ffunction-sections".into());
                     cmd.push_cc_arg("-fdata-sections".into());
                 }
@@ -1464,10 +1535,27 @@
                         if let Some(arch) =
                             map_darwin_target_from_rust_to_compiler_architecture(target)
                         {
-                            let ios = if arch == "arm64" { "ios" } else { "ios13.0" };
                             cmd.args
-                                .push(format!("--target={}-apple-{}-macabi", arch, ios).into());
+                                .push(format!("--target={}-apple-ios13.0-macabi", arch).into());
                         }
+                    } else if target.contains("ios-sim") {
+                        if let Some(arch) =
+                            map_darwin_target_from_rust_to_compiler_architecture(target)
+                        {
+                            let deployment_target = env::var("IPHONEOS_DEPLOYMENT_TARGET")
+                                .unwrap_or_else(|_| "7.0".into());
+                            cmd.args.push(
+                                format!(
+                                    "--target={}-apple-ios{}-simulator",
+                                    arch, deployment_target
+                                )
+                                .into(),
+                            );
+                        }
+                    } else if target.starts_with("riscv64gc-") {
+                        cmd.args.push(
+                            format!("--target={}", target.replace("riscv64gc", "riscv64")).into(),
+                        );
                     } else {
                         cmd.args.push(format!("--target={}", target).into());
                     }
@@ -1600,7 +1688,7 @@
                     cmd.args.push("-march=i686".into());
                 }
 
-                // Looks like `musl-gcc` makes is hard for `-m32` to make its way
+                // Looks like `musl-gcc` makes it hard for `-m32` to make its way
                 // all the way to the linker, so we need to actually instruct the
                 // linker that we're generating 32-bit executables as well. This'll
                 // typically only be used for build scripts which transitively use
@@ -1677,14 +1765,17 @@
                     let mut parts = target.split('-');
                     if let Some(arch) = parts.next() {
                         let arch = &arch[5..];
-                        cmd.args.push(("-march=rv".to_owned() + arch).into());
                         if target.contains("linux") && arch.starts_with("64") {
+                            cmd.args.push(("-march=rv64gc").into());
                             cmd.args.push("-mabi=lp64d".into());
                         } else if target.contains("linux") && arch.starts_with("32") {
+                            cmd.args.push(("-march=rv32gc").into());
                             cmd.args.push("-mabi=ilp32d".into());
                         } else if arch.starts_with("64") {
+                            cmd.args.push(("-march=rv".to_owned() + arch).into());
                             cmd.args.push("-mabi=lp64".into());
                         } else {
+                            cmd.args.push(("-march=rv".to_owned() + arch).into());
                             cmd.args.push("-mabi=ilp32".into());
                         }
                         cmd.args.push("-mcmodel=medany".into());
@@ -1693,9 +1784,7 @@
             }
         }
 
-        if target.contains("-ios") {
-            // FIXME: potential bug. iOS is always compiled with Clang, but Gcc compiler may be
-            // detected instead.
+        if target.contains("apple-ios") {
             self.ios_flags(cmd)?;
         }
 
@@ -1790,6 +1879,21 @@
             self.assemble_progressive(dst, chunk)?;
         }
 
+        if self.cuda {
+            // Link the device-side code and add it to the target library,
+            // so that non-CUDA linker can link the final binary.
+
+            let out_dir = self.get_out_dir()?;
+            let dlink = out_dir.join(lib_name.to_owned() + "_dlink.o");
+            let mut nvcc = self.get_compiler().to_command();
+            nvcc.arg("--device-link")
+                .arg("-o")
+                .arg(dlink.clone())
+                .arg(dst);
+            run(&mut nvcc, "nvcc")?;
+            self.assemble_progressive(dst, &[dlink])?;
+        }
+
         let target = self.get_target()?;
         if target.contains("msvc") {
             // The Rust compiler will look for libfoo.a and foo.lib, but the
@@ -1832,7 +1936,7 @@
             for flag in self.ar_flags.iter() {
                 cmd.arg(flag);
             }
-            // If the library file already exists, add the libary name
+            // If the library file already exists, add the library name
             // as an argument to let lib.exe know we are appending the objs.
             if dst.exists() {
                 cmd.arg(dst);
@@ -1894,6 +1998,11 @@
             None => false,
         };
 
+        let is_sim = match target.split('-').nth(3) {
+            Some(v) => v == "sim",
+            None => false,
+        };
+
         let arch = if is_catalyst {
             match arch {
                 "arm64e" => ArchSpec::Catalyst("arm64e"),
@@ -1906,6 +2015,16 @@
                     ));
                 }
             }
+        } else if is_sim {
+            match arch {
+                "arm64" | "aarch64" => ArchSpec::Simulator("-arch arm64"),
+                _ => {
+                    return Err(Error::new(
+                        ErrorKind::ArchitectureInvalid,
+                        "Unknown architecture for iOS simulator target.",
+                    ));
+                }
+            }
         } else {
             match arch {
                 "arm" | "armv7" | "thumbv7" => ArchSpec::Device("armv7"),
@@ -2044,6 +2163,8 @@
                     } else {
                         format!("{}.exe", gnu)
                     }
+                } else if target.contains("apple-ios") {
+                    clang.to_string()
                 } else if target.contains("android") {
                     autodetect_android_compiler(&target, &host, gnu, clang)
                 } else if target.contains("cloudabi") {
@@ -2105,7 +2226,7 @@
         //
         // As the shell script calls the main clang binary, the command line limit length
         // on Windows is restricted to around 8k characters instead of around 32k characters.
-        // To remove this limit, we call the main clang binary directly and contruct the
+        // To remove this limit, we call the main clang binary directly and construct the
         // `--target=` ourselves.
         if host.contains("windows") && android_clang_compiler_uses_target_arg_internally(&tool.path)
         {
@@ -2187,13 +2308,13 @@
         // No explicit CC wrapper was detected, but check if RUSTC_WRAPPER
         // is defined and is a build accelerator that is compatible with
         // C/C++ compilers (e.g. sccache)
-        let valid_wrappers = ["sccache"];
+        const VALID_WRAPPERS: &[&'static str] = &["sccache", "cachepot"];
 
         let rustc_wrapper = std::env::var_os("RUSTC_WRAPPER")?;
         let wrapper_path = Path::new(&rustc_wrapper);
         let wrapper_stem = wrapper_path.file_stem()?;
 
-        if valid_wrappers.contains(&wrapper_stem.to_str()?) {
+        if VALID_WRAPPERS.contains(&wrapper_stem.to_str()?) {
             Some(rustc_wrapper.to_str()?.to_owned())
         } else {
             None
@@ -2325,6 +2446,12 @@
                 Some(t) => return Ok((t, "lib.exe".to_string())),
                 None => "lib.exe".to_string(),
             }
+        } else if target.contains("illumos") {
+            // The default 'ar' on illumos uses a non-standard flags,
+            // but the OS comes bundled with a GNU-compatible variant.
+            //
+            // Use the GNU-variant to match other Unix systems.
+            "gar".to_string()
         } else if self.get_host()? != target {
             match self.prefix_for_target(&target) {
                 Some(p) => {
@@ -2420,6 +2547,9 @@
                 "riscv-none-embed",
             ]),
             "riscv64gc-unknown-linux-gnu" => Some("riscv64-linux-gnu"),
+            "riscv32gc-unknown-linux-gnu" => Some("riscv32-linux-gnu"),
+            "riscv64gc-unknown-linux-musl" => Some("riscv64-linux-musl"),
+            "riscv32gc-unknown-linux-musl" => Some("riscv32-linux-musl"),
             "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"),
             "sparc-unknown-linux-gnu" => Some("sparc-linux-gnu"),
             "sparc64-unknown-linux-gnu" => Some("sparc64-linux-gnu"),
@@ -2624,7 +2754,7 @@
     }
 
     #[cfg(windows)]
-    /// Explictly set the `ToolFamily`, skipping name-based detection.
+    /// Explicitly set the `ToolFamily`, skipping name-based detection.
     fn with_family(path: PathBuf, family: ToolFamily) -> Self {
         Self {
             path: path,
@@ -2643,11 +2773,7 @@
         let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
             if fname.contains("clang-cl") {
                 ToolFamily::Msvc { clang_cl: true }
-            } else if fname.contains("cl")
-                && !fname.contains("cloudabi")
-                && !fname.contains("uclibc")
-                && !fname.contains("clang")
-            {
+            } else if fname.ends_with("cl") || fname == "cl.exe" {
                 ToolFamily::Msvc { clang_cl: false }
             } else if fname.contains("clang") {
                 match clang_driver {
@@ -2929,15 +3055,18 @@
                 &format!("Failed to find tool. Is `{}` installed?{}", program, extra),
             ))
         }
-        Err(_) => Err(Error::new(
+        Err(ref e) => Err(Error::new(
             ErrorKind::ToolExecError,
-            &format!("Command {:?} with args {:?} failed to start.", cmd, program),
+            &format!(
+                "Command {:?} with args {:?} failed to start: {:?}",
+                cmd, program, e
+            ),
         )),
     }
 }
 
 fn fail(s: &str) -> ! {
-    let _ = writeln!(io::stderr(), "\n\nerror occurred: {}\n\n", s);
+    eprintln!("\n\nerror occurred: {}\n\n", s);
     std::process::exit(1);
 }
 
@@ -3062,7 +3191,33 @@
         Some("arm64e")
     } else if target.contains("aarch64") {
         Some("arm64")
+    } else if target.contains("i686") {
+        Some("i386")
+    } else if target.contains("powerpc") {
+        Some("ppc")
+    } else if target.contains("powerpc64") {
+        Some("ppc64")
     } else {
         None
     }
 }
+
+fn which(tool: &Path) -> Option<PathBuf> {
+    fn check_exe(exe: &mut PathBuf) -> bool {
+        let exe_ext = std::env::consts::EXE_EXTENSION;
+        exe.exists() || (!exe_ext.is_empty() && exe.set_extension(exe_ext) && exe.exists())
+    }
+
+    // If |tool| is not just one "word," assume it's an actual path...
+    if tool.components().count() > 1 {
+        let mut exe = PathBuf::from(tool);
+        return if check_exe(&mut exe) { Some(exe) } else { None };
+    }
+
+    // Loop through PATH entries searching for the |tool|.
+    let path_entries = env::var_os("PATH")?;
+    env::split_paths(&path_entries).find_map(|path_entry| {
+        let mut exe = path_entry.join(tool);
+        return if check_exe(&mut exe) { Some(exe) } else { None };
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/src/vs_instances.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/src/vs_instances.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/src/vs_instances.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/src/vs_instances.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,199 @@
+use std::borrow::Cow;
+use std::collections::HashMap;
+use std::convert::TryFrom;
+use std::io::BufRead;
+use std::path::PathBuf;
+
+use crate::setup_config::{EnumSetupInstances, SetupInstance};
+
+pub enum VsInstance {
+    Com(SetupInstance),
+    Vswhere(VswhereInstance),
+}
+
+impl VsInstance {
+    pub fn installation_name(&self) -> Option<Cow<str>> {
+        match self {
+            VsInstance::Com(s) => s
+                .installation_name()
+                .ok()
+                .and_then(|s| s.into_string().ok())
+                .map(Cow::from),
+            VsInstance::Vswhere(v) => v.map.get("installationName").map(Cow::from),
+        }
+    }
+
+    pub fn installation_path(&self) -> Option<PathBuf> {
+        match self {
+            VsInstance::Com(s) => s.installation_path().ok().map(PathBuf::from),
+            VsInstance::Vswhere(v) => v.map.get("installationPath").map(PathBuf::from),
+        }
+    }
+
+    pub fn installation_version(&self) -> Option<Cow<str>> {
+        match self {
+            VsInstance::Com(s) => s
+                .installation_version()
+                .ok()
+                .and_then(|s| s.into_string().ok())
+                .map(Cow::from),
+            VsInstance::Vswhere(v) => v.map.get("installationVersion").map(Cow::from),
+        }
+    }
+}
+
+pub enum VsInstances {
+    ComBased(EnumSetupInstances),
+    VswhereBased(VswhereInstance),
+}
+
+impl IntoIterator for VsInstances {
+    type Item = VsInstance;
+    #[allow(bare_trait_objects)]
+    type IntoIter = Box<Iterator<Item = Self::Item>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        match self {
+            VsInstances::ComBased(e) => {
+                Box::new(e.into_iter().filter_map(Result::ok).map(VsInstance::Com))
+            }
+            VsInstances::VswhereBased(v) => Box::new(std::iter::once(VsInstance::Vswhere(v))),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct VswhereInstance {
+    map: HashMap<String, String>,
+}
+
+impl TryFrom<&Vec<u8>> for VswhereInstance {
+    type Error = &'static str;
+
+    fn try_from(output: &Vec<u8>) -> Result<Self, Self::Error> {
+        let map: HashMap<_, _> = output
+            .lines()
+            .filter_map(Result::ok)
+            .filter_map(|s| {
+                let mut splitn = s.splitn(2, ": ");
+                Some((splitn.next()?.to_owned(), splitn.next()?.to_owned()))
+            })
+            .collect();
+
+        if !map.contains_key("installationName")
+            || !map.contains_key("installationPath")
+            || !map.contains_key("installationVersion")
+        {
+            return Err("required properties not found");
+        }
+
+        Ok(Self { map })
+    }
+}
+
+#[cfg(test)]
+mod tests_ {
+    use std::borrow::Cow;
+    use std::convert::TryFrom;
+    use std::path::PathBuf;
+
+    #[test]
+    fn it_parses_vswhere_output_correctly() {
+        let output = br"instanceId: 58104422
+installDate: 21/02/2021 21:50:33
+installationName: VisualStudio/16.9.2+31112.23
+installationPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools
+installationVersion: 16.9.31112.23
+productId: Microsoft.VisualStudio.Product.BuildTools
+productPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\LaunchDevCmd.bat
+state: 4294967295
+isComplete: 1
+isLaunchable: 1
+isPrerelease: 0
+isRebootRequired: 0
+displayName: Visual Studio Build Tools 2019
+description: The Visual Studio Build Tools allows you to build native and managed MSBuild-based applications without requiring the Visual Studio IDE. There are options to install the Visual C++ compilers and libraries, MFC, ATL, and C++/CLI support.
+channelId: VisualStudio.16.Release
+channelUri: https://aka.ms/vs/16/release/channel
+enginePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service
+releaseNotes: https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes-v16.9#16.9.2
+thirdPartyNotices: https://go.microsoft.com/fwlink/?LinkId=660909
+updateDate: 2021-03-17T21:16:46.5963702Z
+catalog_buildBranch: d16.9
+catalog_buildVersion: 16.9.31112.23
+catalog_id: VisualStudio/16.9.2+31112.23
+catalog_localBuild: build-lab
+catalog_manifestName: VisualStudio
+catalog_manifestType: installer
+catalog_productDisplayVersion: 16.9.2
+catalog_productLine: Dev16
+catalog_productLineVersion: 2019
+catalog_productMilestone: RTW
+catalog_productMilestoneIsPreRelease: False
+catalog_productName: Visual Studio
+catalog_productPatchVersion: 2
+catalog_productPreReleaseMilestoneSuffix: 1.0
+catalog_productSemanticVersion: 16.9.2+31112.23
+catalog_requiredEngineVersion: 2.9.3365.38425
+properties_campaignId: 156063665.1613940062
+properties_channelManifestId: VisualStudio.16.Release/16.9.2+31112.23
+properties_nickname: 
+properties_setupEngineFilePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installershell.exe
+"
+        .to_vec();
+
+        let vswhere_instance = super::VswhereInstance::try_from(&output);
+        assert!(vswhere_instance.is_ok());
+
+        let vs_instance = super::VsInstance::Vswhere(vswhere_instance.unwrap());
+        assert_eq!(
+            vs_instance.installation_name(),
+            Some(Cow::from("VisualStudio/16.9.2+31112.23"))
+        );
+        assert_eq!(
+            vs_instance.installation_path(),
+            Some(PathBuf::from(
+                r"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools"
+            ))
+        );
+        assert_eq!(
+            vs_instance.installation_version(),
+            Some(Cow::from("16.9.31112.23"))
+        );
+    }
+
+    #[test]
+    fn it_returns_an_error_for_empty_output() {
+        let output = b"".to_vec();
+
+        let vswhere_instance = super::VswhereInstance::try_from(&output);
+
+        assert!(vswhere_instance.is_err());
+    }
+
+    #[test]
+    fn it_returns_an_error_for_output_consisting_of_empty_lines() {
+        let output = br"
+
+"
+        .to_vec();
+
+        let vswhere_instance = super::VswhereInstance::try_from(&output);
+
+        assert!(vswhere_instance.is_err());
+    }
+
+    #[test]
+    fn it_returns_an_error_for_output_without_required_properties() {
+        let output = br"instanceId: 58104422
+installDate: 21/02/2021 21:50:33
+productId: Microsoft.VisualStudio.Product.BuildTools
+productPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\LaunchDevCmd.bat
+"
+        .to_vec();
+
+        let vswhere_instance = super::VswhereInstance::try_from(&output);
+
+        assert!(vswhere_instance.is_err());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/src/windows_registry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/src/windows_registry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cc/src/windows_registry.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cc/src/windows_registry.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,8 +47,6 @@
 /// Documented above.
 #[cfg(windows)]
 pub fn find_tool(target: &str, tool: &str) -> Option<Tool> {
-    use std::env;
-
     // This logic is all tailored for MSVC, if we're not that then bail out
     // early.
     if !target.contains("msvc") {
@@ -66,18 +64,6 @@
         return impl_::find_devenv(target);
     }
 
-    // If VCINSTALLDIR is set, then someone's probably already run vcvars and we
-    // should just find whatever that indicates.
-    if env::var_os("VCINSTALLDIR").is_some() {
-        return env::var_os("PATH")
-            .and_then(|path| {
-                env::split_paths(&path)
-                    .map(|p| p.join(tool))
-                    .find(|p| p.exists())
-            })
-            .map(|path| Tool::with_family(path.into(), MSVC_FAMILY));
-    }
-
     // Ok, if we're here, now comes the fun part of the probing. Default shells
     // or shells like MSYS aren't really configured to execute `cl.exe` and the
     // various compiler tools shipped as part of Visual Studio. Here we try to
@@ -85,7 +71,8 @@
     // environment variables like `LIB`, `INCLUDE`, and `PATH` to ensure that
     // the tool is actually usable.
 
-    return impl_::find_msvc_15plus(tool, target)
+    return impl_::find_msvc_environment(tool, target)
+        .or_else(|| impl_::find_msvc_15plus(tool, target))
         .or_else(|| impl_::find_msvc_14(tool, target))
         .or_else(|| impl_::find_msvc_12(tool, target))
         .or_else(|| impl_::find_msvc_11(tool, target));
@@ -142,7 +129,7 @@
             )),
         },
         _ => {
-            // Check for the presense of a specific registry key
+            // Check for the presence of a specific registry key
             // that indicates visual studio is installed.
             if impl_::has_msbuild_version("16.0") {
                 Ok(VsVers::Vs16)
@@ -170,7 +157,9 @@
 mod impl_ {
     use crate::com;
     use crate::registry::{RegistryKey, LOCAL_MACHINE};
-    use crate::setup_config::{EnumSetupInstances, SetupConfiguration, SetupInstance};
+    use crate::setup_config::SetupConfiguration;
+    use crate::vs_instances::{VsInstances, VswhereInstance};
+    use std::convert::TryFrom;
     use std::env;
     use std::ffi::OsString;
     use std::fs::File;
@@ -178,6 +167,7 @@
     use std::iter;
     use std::mem;
     use std::path::{Path, PathBuf};
+    use std::process::Command;
     use std::str::FromStr;
 
     use super::MSVC_FAMILY;
@@ -215,23 +205,61 @@
         }
     }
 
+    /// Checks to see if the `VSCMD_ARG_TGT_ARCH` environment variable matches the
+    /// given target's arch. Returns `None` if the variable does not exist.
+    #[cfg(windows)]
+    fn is_vscmd_target(target: &str) -> Option<bool> {
+        let vscmd_arch = env::var("VSCMD_ARG_TGT_ARCH").ok()?;
+        // Convert the Rust target arch to its VS arch equivalent.
+        let arch = match target.split("-").next() {
+            Some("x86_64") => "x64",
+            Some("aarch64") => "arm64",
+            Some("i686") | Some("i586") => "x86",
+            Some("thumbv7a") => "arm",
+            // An unrecognized arch.
+            _ => return Some(false),
+        };
+        Some(vscmd_arch == arch)
+    }
+
+    /// Attempt to find the tool using environment variables set by vcvars.
+    pub fn find_msvc_environment(target: &str, tool: &str) -> Option<Tool> {
+        // Early return if the environment doesn't contain a VC install.
+        if env::var_os("VCINSTALLDIR").is_none() {
+            return None;
+        }
+        let vs_install_dir = env::var_os("VSINSTALLDIR")?.into();
+
+        // If the vscmd target differs from the requested target then
+        // attempt to get the tool using the VS install directory.
+        if is_vscmd_target(target) == Some(false) {
+            // We will only get here with versions 15+.
+            tool_from_vs15plus_instance(tool, target, &vs_install_dir)
+        } else {
+            // Fallback to simply using the current environment.
+            env::var_os("PATH")
+                .and_then(|path| {
+                    env::split_paths(&path)
+                        .map(|p| p.join(tool))
+                        .find(|p| p.exists())
+                })
+                .map(|path| Tool::with_family(path.into(), MSVC_FAMILY))
+        }
+    }
+
     #[allow(bare_trait_objects)]
-    fn vs16_instances() -> Box<Iterator<Item = PathBuf>> {
-        let instances = if let Some(instances) = vs15plus_instances() {
+    fn vs16_instances(target: &str) -> Box<Iterator<Item = PathBuf>> {
+        let instances = if let Some(instances) = vs15plus_instances(target) {
             instances
         } else {
             return Box::new(iter::empty());
         };
-        Box::new(instances.filter_map(|instance| {
-            let instance = instance.ok()?;
-            let installation_name = instance.installation_name().ok()?;
-            if installation_name.to_str()?.starts_with("VisualStudio/16.") {
-                Some(PathBuf::from(instance.installation_path().ok()?))
-            } else if installation_name
-                .to_str()?
-                .starts_with("VisualStudioPreview/16.")
-            {
-                Some(PathBuf::from(instance.installation_path().ok()?))
+        Box::new(instances.into_iter().filter_map(|instance| {
+            let installation_name = instance.installation_name()?;
+            if installation_name.starts_with("VisualStudio/16.") {
+                Some(instance.installation_path()?)
+            } else if installation_name.starts_with("VisualStudioPreview/16.") {
+                Some(instance.installation_path()?)
             } else {
                 None
             }
@@ -239,7 +267,7 @@
     }
 
     fn find_tool_in_vs16_path(tool: &str, target: &str) -> Option<Tool> {
-        vs16_instances()
+        vs16_instances(target)
             .filter_map(|path| {
                 let path = path.join(tool);
                 if !path.is_file() {
@@ -249,6 +277,9 @@
                 if target.contains("x86_64") {
                     tool.env.push(("Platform".into(), "X64".into()));
                 }
+                if target.contains("aarch64") {
+                    tool.env.push(("Platform".into(), "ARM64".into()));
+                }
                 Some(tool)
             })
             .next()
@@ -267,11 +298,62 @@
     // [online]: https://blogs.msdn.microsoft.com/vcblog/2017/03/06/finding-the-visual-c-compiler-tools-in-visual-studio-2017/
     //
     // Returns MSVC 15+ instances (15, 16 right now), the order should be consider undefined.
-    fn vs15plus_instances() -> Option<EnumSetupInstances> {
+    //
+    // However, on ARM64 this method doesn't work because VS Installer fails to register COM component on ARM64.
+    // Hence, as the last resort we try to use vswhere.exe to list available instances.
+    fn vs15plus_instances(target: &str) -> Option<VsInstances> {
+        vs15plus_instances_using_com().or_else(|| vs15plus_instances_using_vswhere(target))
+    }
+
+    fn vs15plus_instances_using_com() -> Option<VsInstances> {
         com::initialize().ok()?;
 
         let config = SetupConfiguration::new().ok()?;
-        config.enum_all_instances().ok()
+        let enum_setup_instances = config.enum_all_instances().ok()?;
+
+        Some(VsInstances::ComBased(enum_setup_instances))
+    }
+
+    fn vs15plus_instances_using_vswhere(target: &str) -> Option<VsInstances> {
+        let program_files_path: PathBuf = env::var("ProgramFiles(x86)")
+            .or_else(|_| env::var("ProgramFiles"))
+            .ok()?
+            .into();
+
+        let vswhere_path =
+            program_files_path.join(r"Microsoft Visual Studio\Installer\vswhere.exe");
+
+        if !vswhere_path.exists() {
+            return None;
+        }
+
+        let arch = target.split('-').next().unwrap();
+        let tools_arch = match arch {
+            "i586" | "i686" | "x86_64" => Some("x86.x64"),
+            "arm" | "thumbv7a" => Some("ARM"),
+            "aarch64" => Some("ARM64"),
+            _ => None,
+        };
+
+        let vswhere_output = Command::new(vswhere_path)
+            .args(&[
+                "-latest",
+                "-products",
+                "*",
+                "-requires",
+                &format!("Microsoft.VisualStudio.Component.VC.Tools.{}", tools_arch?),
+                "-format",
+                "text",
+                "-nologo",
+            ])
+            .stderr(std::process::Stdio::inherit())
+            .output()
+            .ok()?;
+
+        let vs_instances =
+            VsInstances::VswhereBased(VswhereInstance::try_from(&vswhere_output.stdout).ok()?);
+
+        Some(vs_instances)
     }
 
     // Inspired from official microsoft/vswhere ParseVersionString
@@ -284,15 +366,16 @@
     }
 
     pub fn find_msvc_15plus(tool: &str, target: &str) -> Option<Tool> {
-        let iter = vs15plus_instances()?;
-        iter.filter_map(|instance| {
-            let instance = instance.ok()?;
-            let version = parse_version(instance.installation_version().ok()?.to_str()?)?;
-            let tool = tool_from_vs15plus_instance(tool, target, &instance)?;
-            Some((version, tool))
-        })
-        .max_by(|(a_version, _), (b_version, _)| a_version.cmp(b_version))
-        .map(|(_version, tool)| tool)
+        let iter = vs15plus_instances(target)?;
+        iter.into_iter()
+            .filter_map(|instance| {
+                let version = parse_version(&instance.installation_version()?)?;
+                let instance_path = instance.installation_path()?;
+                let tool = tool_from_vs15plus_instance(tool, target, &instance_path)?;
+                Some((version, tool))
+            })
+            .max_by(|(a_version, _), (b_version, _)| a_version.cmp(b_version))
+            .map(|(_version, tool)| tool)
     }
 
     // While the paths to Visual Studio 2017's devenv and MSBuild could
@@ -303,14 +386,11 @@
     //
     // [more reliable]: https://github.com/alexcrichton/cc-rs/pull/331
     fn find_tool_in_vs15_path(tool: &str, target: &str) -> Option<Tool> {
-        let mut path = match vs15plus_instances() {
+        let mut path = match vs15plus_instances(target) {
             Some(instances) => instances
-                .filter_map(|instance| {
-                    instance
-                        .ok()
-                        .and_then(|instance| instance.installation_path().ok())
-                })
-                .map(|path| PathBuf::from(path).join(tool))
+                .into_iter()
+                .filter_map(|instance| instance.installation_path())
+                .map(|path| path.join(tool))
                 .find(|ref path| path.is_file()),
             None => None,
         };
@@ -330,6 +410,9 @@
             if target.contains("x86_64") {
                 tool.env.push(("Platform".into(), "X64".into()));
             }
+            if target.contains("aarch64") {
+                tool.env.push(("Platform".into(), "ARM64".into()));
+            }
             tool
         })
     }
@@ -337,10 +420,10 @@
     fn tool_from_vs15plus_instance(
         tool: &str,
         target: &str,
-        instance: &SetupInstance,
+        instance_path: &PathBuf,
     ) -> Option<Tool> {
         let (bin_path, host_dylib_path, lib_path, include_path) =
-            vs15plus_vc_paths(target, instance)?;
+            vs15plus_vc_paths(target, instance_path)?;
         let tool_path = bin_path.join(tool);
         if !tool_path.exists() {
             return None;
@@ -364,9 +447,8 @@
 
     fn vs15plus_vc_paths(
         target: &str,
-        instance: &SetupInstance,
+        instance_path: &PathBuf,
     ) -> Option<(PathBuf, PathBuf, PathBuf, PathBuf)> {
-        let instance_path: PathBuf = instance.installation_path().ok()?.into();
         let version_path =
             instance_path.join(r"VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt");
         let mut version_file = File::open(version_path).ok()?;
@@ -403,7 +485,7 @@
     }
 
     fn atl_paths(target: &str, path: &Path) -> Option<(PathBuf, PathBuf)> {
-        let atl_path = path.join("atlfmc");
+        let atl_path = path.join("atlmfc");
         let sub = lib_subdir(target)?;
         if atl_path.exists() {
             Some((atl_path.join("lib").join(sub), atl_path.join("include")))
@@ -600,7 +682,7 @@
 
     // Interestingly there are several subdirectories, `win7` `win8` and
     // `winv6.3`. Vcvars seems to only care about `winv6.3` though, so the same
-    // applies to us. Note that if we were targetting kernel mode drivers
+    // applies to us. Note that if we were targeting kernel mode drivers
     // instead of user mode applications, we would care.
     fn get_sdk81_dir() -> Option<PathBuf> {
         let key = r"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1";
@@ -734,10 +816,12 @@
             "16.0" => {
                 find_msbuild_vs16("x86_64-pc-windows-msvc").is_some()
                     || find_msbuild_vs16("i686-pc-windows-msvc").is_some()
+                    || find_msbuild_vs16("aarch64-pc-windows-msvc").is_some()
             }
             "15.0" => {
                 find_msbuild_vs15("x86_64-pc-windows-msvc").is_some()
                     || find_msbuild_vs15("i686-pc-windows-msvc").is_some()
+                    || find_msbuild_vs15("aarch64-pc-windows-msvc").is_some()
             }
             "12.0" | "14.0" => LOCAL_MACHINE
                 .open(&OsString::from(format!(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"2cb2370b62c56a7d51b51f9e405b2f377b3ad6f7f8d33bc69e20eb819ad66012","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"2406e83ee174e30aa67f8ab266836fa78545012b196395aff37c152321e2c713","src/lib.rs":"8dfd667d32d8b06e529643c975dfa14c29ce9a894a80e381a1bd867252e65e56","tests/xcrate.rs":"c0734dae6e63beafcd60bf53546115a2320735b51035c9e2387fdf9301580934"},"package":"4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "cfg-if"
-version = "0.1.10"
-authors = ["Alex Crichton <alex@alexcrichton.com>"]
-description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n"
-homepage = "https://github.com/alexcrichton/cfg-if"
-documentation = "https://docs.rs/cfg-if"
-readme = "README.md"
-license = "MIT/Apache-2.0"
-repository = "https://github.com/alexcrichton/cfg-if"
-[dependencies.compiler_builtins]
-version = "0.1.2"
-optional = true
-
-[dependencies.core]
-version = "1.0.0"
-optional = true
-package = "rustc-std-workspace-core"
-
-[features]
-rustc-dep-of-std = ["core", "compiler_builtins"]
-[badges.travis-ci]
-repository = "alexcrichton/cfg-if"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2014 Alex Crichton
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-# cfg-if
-
-[Documentation](https://docs.rs/cfg-if)
-
-A macro to ergonomically define an item depending on a large number of #[cfg]
-parameters. Structured like an if-else chain, the first matching branch is the
-item that gets emitted.
-
-```toml
-[dependencies]
-cfg-if = "0.1"
-```
-
-## Example
-
-```rust
-cfg_if::cfg_if! {
-    if #[cfg(unix)] {
-        fn foo() { /* unix specific functionality */ }
-    } else if #[cfg(target_pointer_width = "32")] {
-        fn foo() { /* non-unix, 32-bit functionality */ }
-    } else {
-        fn foo() { /* fallback implementation */ }
-    }
-}
-
-fn main() {
-    foo();
-}
-```
-
-# License
-
-This project is licensed under either of
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in `cfg-if` by you, as defined in the Apache-2.0 license, shall be
-dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-//! A macro for defining `#[cfg]` if-else statements.
-//!
-//! The macro provided by this crate, `cfg_if`, is similar to the `if/elif` C
-//! preprocessor macro by allowing definition of a cascade of `#[cfg]` cases,
-//! emitting the implementation which matches first.
-//!
-//! This allows you to conveniently provide a long list `#[cfg]`'d blocks of code
-//! without having to rewrite each clause multiple times.
-//!
-//! # Example
-//!
-//! ```
-//! cfg_if::cfg_if! {
-//!     if #[cfg(unix)] {
-//!         fn foo() { /* unix specific functionality */ }
-//!     } else if #[cfg(target_pointer_width = "32")] {
-//!         fn foo() { /* non-unix, 32-bit functionality */ }
-//!     } else {
-//!         fn foo() { /* fallback implementation */ }
-//!     }
-//! }
-//!
-//! # fn main() {}
-//! ```
-
-#![no_std]
-#![doc(html_root_url = "https://docs.rs/cfg-if")]
-#![deny(missing_docs)]
-#![cfg_attr(test, deny(warnings))]
-
-/// The main macro provided by this crate. See crate documentation for more
-/// information.
-#[macro_export]
-macro_rules! cfg_if {
-    // match if/else chains with a final `else`
-    ($(
-        if #[cfg($($meta:meta),*)] { $($tokens:tt)* }
-    ) else * else {
-        $($tokens2:tt)*
-    }) => {
-        $crate::cfg_if! {
-            @__items
-            () ;
-            $( ( ($($meta),*) ($($tokens)*) ), )*
-            ( () ($($tokens2)*) ),
-        }
-    };
-
-    // match if/else chains lacking a final `else`
-    (
-        if #[cfg($($i_met:meta),*)] { $($i_tokens:tt)* }
-        $(
-            else if #[cfg($($e_met:meta),*)] { $($e_tokens:tt)* }
-        )*
-    ) => {
-        $crate::cfg_if! {
-            @__items
-            () ;
-            ( ($($i_met),*) ($($i_tokens)*) ),
-            $( ( ($($e_met),*) ($($e_tokens)*) ), )*
-            ( () () ),
-        }
-    };
-
-    // Internal and recursive macro to emit all the items
-    //
-    // Collects all the negated cfgs in a list at the beginning and after the
-    // semicolon is all the remaining items
-    (@__items ($($not:meta,)*) ; ) => {};
-    (@__items ($($not:meta,)*) ; ( ($($m:meta),*) ($($tokens:tt)*) ), $($rest:tt)*) => {
-        // Emit all items within one block, applying an appropriate #[cfg]. The
-        // #[cfg] will require all `$m` matchers specified and must also negate
-        // all previous matchers.
-        #[cfg(all($($m,)* not(any($($not),*))))] $crate::cfg_if! { @__identity $($tokens)* }
-
-        // Recurse to emit all other items in `$rest`, and when we do so add all
-        // our `$m` matchers to the list of `$not` matchers as future emissions
-        // will have to negate everything we just matched as well.
-        $crate::cfg_if! { @__items ($($not,)* $($m,)*) ; $($rest)* }
-    };
-
-    // Internal macro to make __apply work out right for different match types,
-    // because of how macros matching/expand stuff.
-    (@__identity $($tokens:tt)*) => {
-        $($tokens)*
-    };
-}
-
-#[cfg(test)]
-mod tests {
-    cfg_if! {
-        if #[cfg(test)] {
-            use core::option::Option as Option2;
-            fn works1() -> Option2<u32> { Some(1) }
-        } else {
-            fn works1() -> Option<u32> { None }
-        }
-    }
-
-    cfg_if! {
-        if #[cfg(foo)] {
-            fn works2() -> bool { false }
-        } else if #[cfg(test)] {
-            fn works2() -> bool { true }
-        } else {
-            fn works2() -> bool { false }
-        }
-    }
-
-    cfg_if! {
-        if #[cfg(foo)] {
-            fn works3() -> bool { false }
-        } else {
-            fn works3() -> bool { true }
-        }
-    }
-
-    cfg_if! {
-        if #[cfg(test)] {
-            use core::option::Option as Option3;
-            fn works4() -> Option3<u32> { Some(1) }
-        }
-    }
-
-    cfg_if! {
-        if #[cfg(foo)] {
-            fn works5() -> bool { false }
-        } else if #[cfg(test)] {
-            fn works5() -> bool { true }
-        }
-    }
-
-    #[test]
-    fn it_works() {
-        assert!(works1().is_some());
-        assert!(works2());
-        assert!(works3());
-        assert!(works4().is_some());
-        assert!(works5());
-    }
-
-    #[test]
-    #[allow(clippy::assertions_on_constants)]
-    fn test_usage_within_a_function() {
-        cfg_if! {if #[cfg(debug_assertions)] {
-            // we want to put more than one thing here to make sure that they
-            // all get configured properly.
-            assert!(cfg!(debug_assertions));
-            assert_eq!(4, 2+2);
-        } else {
-            assert!(works1().is_some());
-            assert_eq!(10, 5+5);
-        }}
-    }
-
-    trait Trait {
-        fn blah(&self);
-    }
-
-    #[allow(dead_code)]
-    struct Struct;
-
-    impl Trait for Struct {
-        cfg_if! {
-            if #[cfg(feature = "blah")] {
-                fn blah(&self) {
-                    unimplemented!();
-                }
-            } else {
-                fn blah(&self) {
-                    unimplemented!();
-                }
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/tests/xcrate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/tests/xcrate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cfg-if-0.1.10/tests/xcrate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cfg-if-0.1.10/tests/xcrate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-cfg_if::cfg_if! {
-    if #[cfg(foo)] {
-        fn works() -> bool { false }
-    } else if #[cfg(test)] {
-        fn works() -> bool { true }
-    } else {
-        fn works() -> bool { false }
-    }
-}
-
-#[test]
-fn smoke() {
-    assert!(works());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/benches/bench.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#![feature(test)]
-
-extern crate constant_time_eq;
-extern crate test;
-
-use constant_time_eq::constant_time_eq;
-use test::{Bencher, black_box};
-
-fn bench(b: &mut Bencher, left: &[u8], right: &[u8]) {
-    b.bytes = (left.len() + right.len()) as u64;
-    b.iter(|| {
-        constant_time_eq(black_box(left), black_box(right))
-    })
-}
-
-#[bench]
-fn bench_16(b: &mut Bencher) {
-    bench(b, &[0; 16], &[0; 16])
-}
-
-#[bench]
-fn bench_4096(b: &mut Bencher) {
-    bench(b, &[0; 4096], &[0; 4096])
-}
-
-#[bench]
-fn bench_65536(b: &mut Bencher) {
-    bench(b, &[0; 65536], &[0; 65536])
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"5039cc861ab84d85162dc1b3acf268a98d63d299a99b897ab21d390a9e9fb0f3","LICENSE.txt":"a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499","README":"4f0deec2ec32eeabaa065fef2ddd7816a32550b8395da5c47fc458bd45143bea","benches/bench.rs":"ffc599703d114cc4943db322f433b0819787db0c1ff41d7be3efc5c0940e0001","src/lib.rs":"ab735430ea1eaea0673a9a15d9437d591a718bc061c70f3499e42b65e4eb8ba4"},"package":"245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "constant_time_eq"
-version = "0.1.5"
-authors = ["Cesar Eduardo Barros <cesarb@cesarb.eti.br>"]
-description = "Compares two equal-sized byte strings in constant time."
-documentation = "https://docs.rs/constant_time_eq"
-readme = "README"
-keywords = ["constant_time"]
-categories = ["cryptography", "no-std"]
-license = "CC0-1.0"
-repository = "https://github.com/cesarb/constant_time_eq"
-[badges.travis-ci]
-repository = "cesarb/constant_time_eq"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/LICENSE.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/LICENSE.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/LICENSE.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/LICENSE.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/README thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/README
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/README	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-Compares two equal-sized byte strings in constant time.
-
-Inspired by the Linux kernel's crypto_memneq.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/constant_time_eq/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/constant_time_eq/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-#![no_std]
-
-// This function is non-inline to prevent the optimizer from looking inside it.
-#[inline(never)]
-fn constant_time_ne(a: &[u8], b: &[u8]) -> u8 {
-    assert!(a.len() == b.len());
-
-    // These useless slices make the optimizer elide the bounds checks.
-    // See the comment in clone_from_slice() added on Rust commit 6a7bc47.
-    let len = a.len();
-    let a = &a[..len];
-    let b = &b[..len];
-
-    let mut tmp = 0;
-    for i in 0..len {
-        tmp |= a[i] ^ b[i];
-    }
-    tmp // The compare with 0 must happen outside this function.
-}
-
-/// Compares two equal-sized byte strings in constant time.
-///
-/// # Examples
-///
-/// ```
-/// use constant_time_eq::constant_time_eq;
-///
-/// assert!(constant_time_eq(b"foo", b"foo"));
-/// assert!(!constant_time_eq(b"foo", b"bar"));
-/// assert!(!constant_time_eq(b"bar", b"baz"));
-/// # assert!(constant_time_eq(b"", b""));
-///
-/// // Not equal-sized, so won't take constant time.
-/// assert!(!constant_time_eq(b"foo", b""));
-/// assert!(!constant_time_eq(b"foo", b"quux"));
-/// ```
-#[inline]
-pub fn constant_time_eq(a: &[u8], b: &[u8]) -> bool {
-    a.len() == b.len() && constant_time_ne(a, b) == 0
-}
-
-// Fixed-size variants for the most common sizes.
-
-macro_rules! constant_time_ne_n {
-    ($ne:ident, $n:expr) => {
-        // This function is non-inline to prevent the optimizer from looking inside it.
-        #[inline(never)]
-        fn $ne(a: &[u8; $n], b: &[u8; $n]) -> u8 {
-            let mut tmp = 0;
-            for i in 0..$n {
-                tmp |= a[i] ^ b[i];
-            }
-            tmp // The compare with 0 must happen outside this function.
-        }
-    };
-}
-
-constant_time_ne_n!(constant_time_ne_16, 16);
-constant_time_ne_n!(constant_time_ne_32, 32);
-constant_time_ne_n!(constant_time_ne_64, 64);
-
-/// Compares two 128-bit byte strings in constant time.
-///
-/// # Examples
-///
-/// ```
-/// use constant_time_eq::constant_time_eq_16;
-///
-/// assert!(constant_time_eq_16(&[3; 16], &[3; 16]));
-/// assert!(!constant_time_eq_16(&[3; 16], &[7; 16]));
-/// ```
-#[inline]
-pub fn constant_time_eq_16(a: &[u8; 16], b: &[u8; 16]) -> bool {
-    constant_time_ne_16(a, b) == 0
-}
-
-/// Compares two 256-bit byte strings in constant time.
-///
-/// # Examples
-///
-/// ```
-/// use constant_time_eq::constant_time_eq_32;
-///
-/// assert!(constant_time_eq_32(&[3; 32], &[3; 32]));
-/// assert!(!constant_time_eq_32(&[3; 32], &[7; 32]));
-/// ```
-#[inline]
-pub fn constant_time_eq_32(a: &[u8; 32], b: &[u8; 32]) -> bool {
-    constant_time_ne_32(a, b) == 0
-}
-
-/// Compares two 512-bit byte strings in constant time.
-///
-/// # Examples
-///
-/// ```
-/// use constant_time_eq::constant_time_eq_64;
-///
-/// assert!(constant_time_eq_64(&[3; 64], &[3; 64]));
-/// assert!(!constant_time_eq_64(&[3; 64], &[7; 64]));
-/// ```
-#[inline]
-pub fn constant_time_eq_64(a: &[u8; 64], b: &[u8; 64]) -> bool {
-    constant_time_ne_64(a, b) == 0
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-#![forbid(unsafe_code)]
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-use std::{
-    env, fs,
-    path::{Path, PathBuf},
-    process::Command,
-    str,
-};
-
-// The rustc-cfg strings below are *not* public API. Please let us know by
-// opening a GitHub issue if your build environment requires some way to enable
-// these cfgs other than by executing our build script.
-fn main() {
-    let rustc = env::var_os("RUSTC").map_or_else(|| "rustc".into(), PathBuf::from);
-    let version = match Version::from_rustc(&rustc) {
-        Ok(version) => version.print(),
-        Err(e) => {
-            println!(
-                "cargo:warning={}: unable to determine rustc version: {}",
-                env!("CARGO_PKG_NAME"),
-                e
-            );
-            return;
-        }
-    };
-
-    let out_dir = env::var_os("OUT_DIR").map(PathBuf::from).expect("OUT_DIR not set");
-    let out_file = out_dir.join("version");
-    fs::write(out_file, version).expect("failed to write version.rs");
-
-    // Mark as build script has been run successfully.
-    println!("cargo:rustc-cfg=const_fn_has_build_script");
-}
-
-struct Version {
-    minor: u32,
-    nightly: bool,
-}
-
-impl Version {
-    // Based on https://github.com/cuviper/autocfg/blob/1.0.1/src/version.rs#L25-L59
-    //
-    // TODO: use autocfg if https://github.com/cuviper/autocfg/issues/28 merged
-    // or https://github.com/taiki-e/const_fn/issues/27 rejected.
-    fn from_rustc(rustc: &Path) -> Result<Self, String> {
-        let output =
-            Command::new(rustc).args(&["--version", "--verbose"]).output().map_err(|e| {
-                format!("could not execute `{} --version --verbose`: {}", rustc.display(), e)
-            })?;
-        if !output.status.success() {
-            return Err(format!(
-                "process didn't exit successfully: `{} --version --verbose`",
-                rustc.display()
-            ));
-        }
-        let output = str::from_utf8(&output.stdout).map_err(|e| {
-            format!("failed to parse output of `{} --version --verbose`: {}", rustc.display(), e)
-        })?;
-
-        // Find the release line in the verbose version output.
-        let release = output
-            .lines()
-            .find(|line| line.starts_with("release: "))
-            .map(|line| &line["release: ".len()..])
-            .ok_or_else(|| {
-                format!(
-                    "could not find rustc release from output of `{} --version --verbose`: {}",
-                    rustc.display(),
-                    output
-                )
-            })?;
-
-        // Split the version and channel info.
-        let mut version_channel = release.split('-');
-        let version = version_channel.next().unwrap();
-        let channel = version_channel.next();
-
-        let minor = (|| {
-            // Split the version into semver components.
-            let mut digits = version.splitn(3, '.');
-            let major = digits.next()?;
-            if major != "1" {
-                return None;
-            }
-            let minor = digits.next()?.parse().ok()?;
-            let _patch = digits.next()?;
-            Some(minor)
-        })()
-        .ok_or_else(|| {
-            format!("unexpected output from `{} --version --verbose`: {}", rustc.display(), output)
-        })?;
-
-        let nightly = channel.map_or(false, |c| c == "dev" || c == "nightly");
-        Ok(Self { minor, nightly })
-    }
-
-    fn print(&self) -> String {
-        format!("Version {{ minor: {}, nightly: {} }}\n", self.minor, self.nightly)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"7c4a01be0207dc788c3982b30fbfbbd7b64229631032ab3bcebaf79734cb704a","Cargo.toml":"41c62e0faa5321466c06a6c448915719d83f7fba7569fa2de5bb83c5e05f64f1","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"840d1d7b797507357f6ebb733566b712f015202dbcf88db481602d0035f18de2","build.rs":"fbe09135ea1e4c87fefff42e3b743ce581ee1fb9d71efcbf7be4bdbe337971ac","clippy.toml":"5fffc035ff09b7a19a63f85f10d58fb993f070ac806f509e537f3899a7710082","rustfmt.toml":"0c420a9179757bf3014d4a3754d313ee2327bccc010d905f9528ac787233f74e","scripts/README.md":"92e65b7d3cae9a72bf4d893f7f7de8fd16eefbe080e9ed7dc0e039f7ba432bc6","scripts/check-minimal-versions.sh":"ccf3047e104d64d586530ded564440daa14e29bd1919b6433ced5ac957453b58","scripts/publish.sh":"06895c0c98937625db70e240c80fe6e6c8677fb91cf56a7fb5b9d2b5eb6a890e","src/ast.rs":"4d4a1ddb8deefa31c3e798ffe9cb32752f9b5418c61a8e45be32ca0d5f9b63f3","src/error.rs":"9bc6f12801616dc1750346bf4228d1b172bee88777e9c8cb841dd9348fecbcf3","src/iter.rs":"4eccd018075a4f4839adef2e2cf05198780b9b60d6fbfa8188522c2ad8e82cb5","src/lib.rs":"ad7e77fd06e7df55c06b86a28f618f045ac42dfd678b7f17403000665ff994c5","src/to_tokens.rs":"5e831889f220c5abaf0403e56b485fbbbb1c4516023e82934f69a230d76694bf","src/utils.rs":"b73f44e9260d32d71aa2712b242f8c451317f62ee1523595fca19878ac07dcd4"},"package":"cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "const_fn"
-version = "0.4.4"
-authors = ["Taiki Endo <te316e89@gmail.com>"]
-description = "An attribute for easy generation of const functions with conditional compilations.\n"
-documentation = "https://docs.rs/const_fn"
-readme = "README.md"
-keywords = ["macros", "attribute", "const", "static"]
-categories = ["rust-patterns", "no-std"]
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/taiki-e/const_fn"
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[lib]
-proc-macro = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-This project adheres to [Semantic Versioning](https://semver.org).
-
-## [Unreleased]
-
-## [0.4.4] - 2020-11-02
-
-* Accept `const_fn` attribute with no arguments and functions without `const` keyword.
-  This allows `const_fn` to be used as an optional dependency.
-
-  ```rust
-  #[cfg_attr(feature = "...", const_fn::const_fn)]
-  pub fn func() {
-      /* ... */
-  }
-  ```
-
-## [0.4.3] - 2020-11-02
-
-* [`const_fn` no longer fails to compile if unable to determine rustc version. Instead, it now displays a warning.](https://github.com/taiki-e/const_fn/pull/31)
-
-* [`const_fn` no longer relies on debug print format.](https://github.com/taiki-e/const_fn/pull/30)
-
-## [0.4.2] - 2020-08-31
-
-* [Improve error messages when failed to parse version information.](https://github.com/taiki-e/const_fn/pull/26)
-
-* [Fix compile failure with cargo installed by yum.](https://github.com/taiki-e/const_fn/pull/26)
-
-## [0.4.1] - 2020-08-25
-
-* [Fix compile failure with non-cargo build systems.](https://github.com/taiki-e/const_fn/pull/23)
-
-## [0.4.0] - 2020-08-25
-
-* [Add support for version-based code generation.](https://github.com/taiki-e/const_fn/pull/17) The following conditions are available:
-
-  ```rust
-  use const_fn::const_fn;
-
-  // function is `const` on specified version and later compiler (including beta and nightly)
-  #[const_fn("1.36")]
-  pub const fn version() {
-      /* ... */
-  }
-
-  // function is `const` on nightly compiler (including dev build)
-  #[const_fn(nightly)]
-  pub const fn nightly() {
-      /* ... */
-  }
-
-  // function is `const` if `cfg(...)` is true
-  #[const_fn(cfg(...))]
-  pub const fn cfg() {
-      /* ... */
-  }
-
-  // function is `const` if `cfg(feature = "...")` is true
-  #[const_fn(feature = "...")]
-  pub const fn feature() {
-      /* ... */
-  }
-  ```
-
-* Improve compile time by removing proc-macro related dependencies ([#18](https://github.com/taiki-e/const_fn/pull/18), [#20](https://github.com/taiki-e/const_fn/pull/20)).
-
-## [0.3.1] - 2019-12-09
-
-* Updated `syn-mid` to 0.5.
-
-## [0.3.0] - 2019-10-20
-
-* `#[const_fn]` attribute may only be used on const functions.
-
-## [0.2.1] - 2019-08-15
-
-* Updated `proc-macro2`, `syn`, and `quote` to 1.0.
-
-* Updated `syn-mid` to 0.4.
-
-## [0.2.0] - 2019-06-16
-
-* Transition to Rust 2018. With this change, the minimum required version will go up to Rust 1.31.
-
-## [0.1.7] - 2019-02-18
-
-* Update syn-mid version to 0.3
-
-## [0.1.6] - 2019-02-15
-
-* Reduce compilation time
-
-## [0.1.5] - 2019-02-15
-
-* Revert 0.1.4
-
-## [0.1.4] - 2019-02-15
-
-**Note: This release has been yanked.**
-
-* Reduce compilation time
-
-## [0.1.3] - 2019-01-06
-
-* Fix dependencies
-
-## [0.1.2] - 2018-12-27
-
-* Improve error messages
-
-## [0.1.1] - 2018-12-27
-
-* Improve an error message
-
-## [0.1.0] - 2018-12-25
-
-Initial release
-
-[Unreleased]: https://github.com/taiki-e/const_fn/compare/v0.4.4...HEAD
-[0.4.4]: https://github.com/taiki-e/const_fn/compare/v0.4.3...v0.4.4
-[0.4.3]: https://github.com/taiki-e/const_fn/compare/v0.4.2...v0.4.3
-[0.4.2]: https://github.com/taiki-e/const_fn/compare/v0.4.1...v0.4.2
-[0.4.1]: https://github.com/taiki-e/const_fn/compare/v0.4.0...v0.4.1
-[0.4.0]: https://github.com/taiki-e/const_fn/compare/v0.3.1...v0.4.0
-[0.3.1]: https://github.com/taiki-e/const_fn/compare/v0.3.0...v0.3.1
-[0.3.0]: https://github.com/taiki-e/const_fn/compare/v0.2.1...v0.3.0
-[0.2.1]: https://github.com/taiki-e/const_fn/compare/v0.2.0...v0.2.1
-[0.2.0]: https://github.com/taiki-e/const_fn/compare/v0.1.7...v0.2.0
-[0.1.7]: https://github.com/taiki-e/const_fn/compare/v0.1.6...v0.1.7
-[0.1.6]: https://github.com/taiki-e/const_fn/compare/v0.1.5...v0.1.6
-[0.1.5]: https://github.com/taiki-e/const_fn/compare/v0.1.4...v0.1.5
-[0.1.4]: https://github.com/taiki-e/const_fn/compare/v0.1.3...v0.1.4
-[0.1.3]: https://github.com/taiki-e/const_fn/compare/v0.1.2...v0.1.3
-[0.1.2]: https://github.com/taiki-e/const_fn/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/taiki-e/const_fn/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/taiki-e/const_fn/releases/tag/v0.1.0
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/clippy.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/clippy.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/clippy.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/clippy.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-msrv = "1.31"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-# \#\[const\_fn\]
-
-[![crates.io](https://img.shields.io/crates/v/const_fn.svg?style=flat-square&logo=rust)](https://crates.io/crates/const_fn)
-[![docs.rs](https://img.shields.io/badge/docs.rs-const__fn-blue?style=flat-square)](https://docs.rs/const_fn)
-[![license](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue.svg?style=flat-square)](#license)
-[![rustc](https://img.shields.io/badge/rustc-1.31+-blue.svg?style=flat-square)](https://www.rust-lang.org)
-[![build status](https://img.shields.io/github/workflow/status/taiki-e/const_fn/CI/master?style=flat-square)](https://github.com/taiki-e/const_fn/actions?query=workflow%3ACI+branch%3Amaster)
-
-An attribute for easy generation of const functions with conditional
-compilations.
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-const_fn = "0.4"
-```
-
-*Compiler support: requires rustc 1.31+*
-
-## Examples
-
-```rust
-use const_fn::const_fn;
-
-// function is `const` on specified version and later compiler (including beta and nightly)
-#[const_fn("1.36")]
-pub const fn version() {
-    /* ... */
-}
-
-// function is `const` on nightly compiler (including dev build)
-#[const_fn(nightly)]
-pub const fn nightly() {
-    /* ... */
-}
-
-// function is `const` if `cfg(...)` is true
-#[const_fn(cfg(...))]
-pub const fn cfg() {
-    /* ... */
-}
-
-// function is `const` if `cfg(feature = "...")` is true
-#[const_fn(feature = "...")]
-pub const fn feature() {
-    /* ... */
-}
-```
-
-## Alternatives
-
-This crate is proc-macro, but is very lightweight, and has no dependencies.
-
-You can manually define declarative macros with similar functionality (see
-[`if_rust_version`](https://github.com/ogoffart/if_rust_version#examples)),
-or [you can define the same function twice with different cfg](https://github.com/crossbeam-rs/crossbeam/blob/0b6ea5f69fde8768c1cfac0d3601e0b4325d7997/crossbeam-epoch/src/atomic.rs#L340-L372).
-(Note: the former approach requires more macros to be defined depending on the
-number of version requirements, the latter approach requires more functions to
-be maintained manually)
-
-## License
-
-Licensed under either of [Apache License, Version 2.0](LICENSE-APACHE) or
-[MIT license](LICENSE-MIT) at your option.
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# Rustfmt configuration
-# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md
-
-# This is required for bug-fixes, which technically can't be made to the stable
-# first version.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3383).
-version = "Two"
-# Rustfmt cannot format long lines inside macros, but this option detects this.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3391)
-error_on_line_overflow = true
-
-# Override the default formatting style.
-# See https://internals.rust-lang.org/t/running-rustfmt-on-rust-lang-rust-and-other-rust-lang-repositories/8732/81.
-use_small_heuristics = "Max"
-# See https://github.com/rust-dev-tools/fmt-rfcs/issues/149.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3370)
-overflow_delimited_expr = true
-
-# Apply rustfmt to more places.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3362).
-merge_imports = true
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3348).
-format_code_in_doc_comments = true
-
-# Fix deprecated style.
-# This is also detected by clippy::redundant_field_names lint.
-use_field_init_shorthand = true
-# This is also detected by deprecated lint.
-use_try_shorthand = true
-
-# Set the default settings again to always apply the proper formatting without
-# being affected by the editor settings.
-edition = "2018"
-hard_tabs = false
-newline_style = "Unix"
-tab_spaces = 4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/scripts/check-minimal-versions.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/scripts/check-minimal-versions.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/scripts/check-minimal-versions.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/scripts/check-minimal-versions.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# Check all public crates with minimal version dependencies.
-#
-# Usage:
-#    bash scripts/check-minimal-versions.sh [+toolchain] [check|test] [options]
-#
-# Note:
-# - This script modifies Cargo.toml and Cargo.lock while running
-# - This script exits with 1 if there are any unstaged changes on Cargo.toml
-# - This script requires nightly toolchain and cargo-hack
-#
-# Refs: https://github.com/rust-lang/cargo/issues/5657
-
-set -euo pipefail
-IFS=$'\n\t'
-
-function error {
-  if [[ -n "${GITHUB_ACTIONS:-}" ]]; then
-    echo "::error::$*"
-  else
-    echo "error: $*" >&2
-  fi
-}
-
-cd "$(cd "$(dirname "${0}")" && pwd)"/..
-
-# Decide Rust toolchain.
-# Nightly is used by default if the `CI` environment variable is unset.
-if [[ "${1:-}" == "+"* ]]; then
-  toolchain="${1}"
-  shift
-elif [[ -z "${CI:-}" ]]; then
-  toolchain="+nightly"
-fi
-# Make sure toolchain is installed.
-cargo ${toolchain:-} -V >/dev/null
-if [[ "${toolchain:-+nightly}" != "+nightly"* ]] || ! cargo hack -V &>/dev/null; then
-  error "this script requires nightly toolchain and cargo-hack"
-  exit 1
-fi
-
-# Decide subcommand.
-subcmd="check"
-if [[ "${1:-}" =~ ^(check|test)$ ]]; then
-  subcmd="${1}"
-  shift
-fi
-
-# This script modifies Cargo.toml, so make sure there are no unstaged changes
-# on Cargo.toml.
-# shellcheck disable=SC2046
-git diff --exit-code $(git ls-files '*Cargo.toml')
-# Restore original Cargo.toml and Cargo.lock on exit.
-trap 'git checkout $(git ls-files ''*Cargo.toml'')' EXIT
-
-if [[ "${subcmd}" == "check" ]]; then
-  # Remove dev-dependencies from Cargo.toml to prevent the next `cargo update`
-  # from determining minimal versions based on dev-dependencies.
-  cargo hack --remove-dev-deps --workspace
-fi
-
-# Update Cargo.lock to minimal version dependencies.
-cargo ${toolchain:-} update -Z minimal-versions
-# Run check for all public members of the workspace.
-cargo ${toolchain:-} hack "${subcmd}" \
-  --workspace --all-features --ignore-private -Z features=all \
-  "$@"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/scripts/publish.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/scripts/publish.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/scripts/publish.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/scripts/publish.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# Automate the local side release step.
-#
-# Note: This script does not intend to use with projects that have multiple
-# public packages with different version numbers in the workspace, like crossbeam.
-
-set -euo pipefail
-IFS=$'\n\t'
-
-# A list of paths to the crate to be published.
-# It will be published in the order listed.
-MEMBERS=(
-  "."
-)
-
-function error {
-  echo "error: $*" >&2
-}
-
-function retry() {
-  local -i max_retry=${1}
-  local -i count=0
-  while ! eval "${2}"; do
-    ((count++))
-    if ((count > max_retry)); then
-      error "${3}"
-      exit 1
-    fi
-    echo "info: retry after $((10 * count)) seconds"
-    sleep $((10 * count))
-  done
-}
-
-cd "$(cd "$(dirname "${0}")" && pwd)"/..
-
-git diff --exit-code
-git diff --exit-code --staged
-
-# parsing & verifying
-version="${1:?}"
-tag="v${version}"
-if [[ ! "${version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z_0-9\.-]+)?(\+[a-zA-Z_0-9\.-]+)?$ ]]; then
-  error "invalid version format: ${version}"
-  exit 1
-fi
-if [[ "${2:-}" == "--dry-run" ]]; then
-  dryrun="--dry-run"
-  shift
-fi
-if [[ -n "${2:-}" ]]; then
-  error "invalid argument: ${2}"
-  exit 1
-fi
-for member in "${MEMBERS[@]}"; do
-  if [[ ! -d "${member}" ]]; then
-    error "not found workspace member ${member}"
-    exit 1
-  fi
-  (
-    cd "${member}"
-    actual=$(cargo pkgid | sed 's/.*#//')
-    if [[ "${actual}" != "${version}" ]]; then
-      error "expected to release version ${version}, but ${member}/Cargo.toml contained ${actual}"
-      exit 1
-    fi
-  )
-done
-
-# tagging
-if gh release view "${tag}" &>/dev/null; then
-  echo "info: tag '${tag}' has already been created and pushed"
-else
-  if [[ -n "${dryrun:-}" ]]; then
-    echo "warning: skip creating a new tag '${tag}' due to dry run"
-  else
-    echo "info: creating and pushing a new tag '${tag}'"
-    git tag "${tag}"
-    git push origin --tags
-
-    # .github/workflows/release.yml should be able to create a new github release in less than a minute.
-    echo "info: waiting for github actions to create a new github release for ${version}"
-    sleep 20
-    retry 2 "gh release view ${tag} &>/dev/null" "unable to create a new github release for ${version}"
-  fi
-fi
-
-# publishing
-for member in "${MEMBERS[@]}"; do
-  (
-    cd "${member}"
-    pwd
-    echo "info: running 'cargo publish ${dryrun:-}'"
-    retry 2 "cargo publish ${dryrun:-}" "unable to publish ${member}"
-  )
-done
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/scripts/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/scripts/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/scripts/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/scripts/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-This directory contains scripts used by the developers of this project.
-
-Some scripts in this directory are also used in CI, but scripts intended to be
-used only in CI and scripts not intended to be used directly by the developers
-are basically in the `ci` directory.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/ast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/ast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/ast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/ast.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-use proc_macro::{Delimiter, Ident, Literal, Span, TokenStream, TokenTree};
-
-use crate::{
-    iter::TokenIter,
-    to_tokens::ToTokens,
-    utils::{parse_as_empty, tt_span},
-    Result,
-};
-
-pub(crate) struct Func {
-    pub(crate) attrs: Vec<Attribute>,
-    pub(crate) sig: Vec<TokenTree>,
-    pub(crate) body: TokenTree,
-    pub(crate) print_const: bool,
-}
-
-pub(crate) fn parse_input(input: TokenStream) -> Result<Func> {
-    let mut input = TokenIter::new(input);
-
-    let attrs = parse_attrs(&mut input)?;
-    let sig = parse_signature(&mut input);
-    let body = input.next();
-    parse_as_empty(input)?;
-
-    if body.is_none()
-        || !sig
-            .iter()
-            .any(|tt| if let TokenTree::Ident(i) = tt { i.to_string() == "fn" } else { false })
-    {
-        return Err(error!(
-            Span::call_site(),
-            "#[const_fn] attribute may only be used on functions"
-        ));
-    }
-
-    Ok(Func { attrs, sig, body: body.unwrap(), print_const: true })
-}
-
-impl ToTokens for Func {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        self.attrs.iter().for_each(|attr| attr.to_tokens(tokens));
-        if self.print_const {
-            self.sig.iter().for_each(|attr| attr.to_tokens(tokens));
-        } else {
-            self.sig
-                .iter()
-                .filter(
-                    |tt| if let TokenTree::Ident(i) = tt { i.to_string() != "const" } else { true },
-                )
-                .for_each(|tt| tt.to_tokens(tokens));
-        }
-        self.body.to_tokens(tokens);
-    }
-}
-
-fn parse_signature(input: &mut TokenIter) -> Vec<TokenTree> {
-    let mut sig = Vec::new();
-    let mut has_const = false;
-    loop {
-        match input.peek() {
-            Some(TokenTree::Group(group)) if group.delimiter() == Delimiter::Brace => break,
-            None => break,
-            Some(TokenTree::Ident(i)) if !has_const => {
-                match &*i.to_string() {
-                    "const" => has_const = true,
-                    "async" | "unsafe" | "extern" | "fn" => {
-                        sig.push(TokenTree::Ident(Ident::new("const", i.span())));
-                        has_const = true;
-                    }
-                    _ => {}
-                }
-                sig.push(input.next().unwrap());
-            }
-            Some(_) => sig.push(input.next().unwrap()),
-        }
-    }
-    sig
-}
-
-fn parse_attrs(input: &mut TokenIter) -> Result<Vec<Attribute>> {
-    let mut attrs = Vec::new();
-    loop {
-        let pound_token = match input.peek() {
-            Some(TokenTree::Punct(p)) if p.as_char() == '#' => input.next().unwrap(),
-            _ => break,
-        };
-        let group = match input.peek() {
-            Some(TokenTree::Group(g)) if g.delimiter() == Delimiter::Bracket => {
-                input.next().unwrap()
-            }
-            tt => return Err(error!(tt_span(tt), "expected `[`")),
-        };
-        attrs.push(Attribute { pound_token, group });
-    }
-    Ok(attrs)
-}
-
-pub(crate) struct Attribute {
-    // `#`
-    pub(crate) pound_token: TokenTree,
-    // `[...]`
-    pub(crate) group: TokenTree,
-}
-
-impl ToTokens for Attribute {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        self.pound_token.to_tokens(tokens);
-        self.group.to_tokens(tokens);
-    }
-}
-
-pub(crate) struct LitStr {
-    pub(crate) token: Literal,
-    value: String,
-}
-
-impl LitStr {
-    pub(crate) fn new(token: Literal) -> Result<Self> {
-        let value = token.to_string();
-        // unlike `syn::LitStr`, only accepts `"..."`
-        if value.starts_with('"') && value.ends_with('"') {
-            Ok(Self { token, value })
-        } else {
-            Err(error!(token.span(), "expected string literal"))
-        }
-    }
-
-    pub(crate) fn value(&self) -> &str {
-        &self.value[1..self.value.len() - 1]
-    }
-
-    pub(crate) fn span(&self) -> Span {
-        self.token.span()
-    }
-}
-
-impl ToTokens for LitStr {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        self.token.to_tokens(tokens);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/error.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-use proc_macro::{Delimiter, Group, Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
-use std::iter::FromIterator;
-
-pub(crate) struct Error {
-    span: Span,
-    msg: String,
-}
-
-impl Error {
-    pub(crate) fn new(span: Span, msg: impl Into<String>) -> Self {
-        Self { span, msg: msg.into() }
-    }
-
-    // https://github.com/dtolnay/syn/blob/1.0.39/src/error.rs#L218-L237
-    pub(crate) fn to_compile_error(&self) -> TokenStream {
-        // compile_error!($msg)
-        TokenStream::from_iter(vec![
-            TokenTree::Ident(Ident::new("compile_error", self.span)),
-            TokenTree::Punct({
-                let mut punct = Punct::new('!', Spacing::Alone);
-                punct.set_span(self.span);
-                punct
-            }),
-            TokenTree::Group({
-                let mut group = Group::new(Delimiter::Brace, {
-                    TokenStream::from_iter(vec![TokenTree::Literal({
-                        let mut string = Literal::string(&self.msg);
-                        string.set_span(self.span);
-                        string
-                    })])
-                });
-                group.set_span(self.span);
-                group
-            }),
-        ])
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/iter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-// Based on https://github.com/dtolnay/proc-macro-hack/blob/0.5.18/src/iter.rs
-
-use proc_macro::{token_stream, Delimiter, TokenStream, TokenTree};
-
-pub(crate) struct TokenIter {
-    stack: Vec<token_stream::IntoIter>,
-    peeked: Option<TokenTree>,
-}
-
-impl TokenIter {
-    pub(crate) fn new(tokens: TokenStream) -> Self {
-        Self { stack: vec![tokens.into_iter()], peeked: None }
-    }
-
-    pub(crate) fn peek(&mut self) -> Option<&TokenTree> {
-        self.peeked = self.next();
-        self.peeked.as_ref()
-    }
-}
-
-impl Iterator for TokenIter {
-    type Item = TokenTree;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(tt) = self.peeked.take() {
-            return Some(tt);
-        }
-        loop {
-            let top = self.stack.last_mut()?;
-            match top.next() {
-                None => drop(self.stack.pop()),
-                Some(TokenTree::Group(ref group)) if group.delimiter() == Delimiter::None => {
-                    self.stack.push(group.stream().into_iter());
-                }
-                Some(tt) => return Some(tt),
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,232 +0,0 @@
-//! An attribute for easy generation of const functions with conditional
-//! compilations.
-//!
-//! # Examples
-//!
-//! ```rust
-//! use const_fn::const_fn;
-//!
-//! // function is `const` on specified version and later compiler (including beta and nightly)
-//! #[const_fn("1.36")]
-//! pub const fn version() {
-//!     /* ... */
-//! }
-//!
-//! // function is `const` on nightly compiler (including dev build)
-//! #[const_fn(nightly)]
-//! pub const fn nightly() {
-//!     /* ... */
-//! }
-//!
-//! // function is `const` if `cfg(...)` is true
-//! # #[cfg(any())]
-//! #[const_fn(cfg(...))]
-//! # pub fn _cfg() { unimplemented!() }
-//! pub const fn cfg() {
-//!     /* ... */
-//! }
-//!
-//! // function is `const` if `cfg(feature = "...")` is true
-//! #[const_fn(feature = "...")]
-//! pub const fn feature() {
-//!     /* ... */
-//! }
-//! ```
-//!
-//! # Alternatives
-//!
-//! This crate is proc-macro, but is very lightweight, and has no dependencies.
-//!
-//! You can manually define declarative macros with similar functionality (see [`if_rust_version`](https://github.com/ogoffart/if_rust_version#examples)), or [you can define the same function twice with different cfg](https://github.com/crossbeam-rs/crossbeam/blob/0b6ea5f69fde8768c1cfac0d3601e0b4325d7997/crossbeam-epoch/src/atomic.rs#L340-L372).
-//! (Note: the former approach requires more macros to be defined depending on the number of version requirements, the latter approach requires more functions to be maintained manually)
-
-#![doc(test(
-    no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms, single_use_lifetimes), allow(dead_code))
-))]
-#![forbid(unsafe_code)]
-#![warn(future_incompatible, rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
-#![warn(clippy::all, clippy::default_trait_access)]
-// mem::take requires Rust 1.40
-#![allow(clippy::mem_replace_with_default)]
-
-// older compilers require explicit `extern crate`.
-#[allow(unused_extern_crates)]
-extern crate proc_macro;
-
-#[macro_use]
-mod utils;
-
-mod ast;
-mod error;
-mod iter;
-mod to_tokens;
-
-use proc_macro::{Delimiter, TokenStream, TokenTree};
-use std::str::FromStr;
-
-use crate::{
-    ast::{Func, LitStr},
-    error::Error,
-    to_tokens::ToTokens,
-    utils::{cfg_attrs, parse_as_empty, tt_span},
-};
-
-type Result<T, E = Error> = std::result::Result<T, E>;
-
-/// An attribute for easy generation of const functions with conditional compilations.
-///
-/// See crate level documentation for details.
-#[proc_macro_attribute]
-pub fn const_fn(args: TokenStream, input: TokenStream) -> TokenStream {
-    let arg = match parse_arg(args) {
-        Ok(arg) => arg,
-        Err(e) => return e.to_compile_error(),
-    };
-    let func = match ast::parse_input(input) {
-        Ok(func) => func,
-        Err(e) => return e.to_compile_error(),
-    };
-
-    expand(arg, func)
-}
-
-fn expand(arg: Arg, mut func: Func) -> TokenStream {
-    match arg {
-        Arg::Cfg(cfg) => {
-            let (mut tokens, cfg_not) = cfg_attrs(cfg);
-            tokens.extend(func.to_token_stream());
-            tokens.extend(cfg_not);
-            func.print_const = false;
-            tokens.extend(func.to_token_stream());
-            tokens
-        }
-        Arg::Feature(feat) => {
-            let (mut tokens, cfg_not) = cfg_attrs(feat);
-            tokens.extend(func.to_token_stream());
-            tokens.extend(cfg_not);
-            func.print_const = false;
-            tokens.extend(func.to_token_stream());
-            tokens
-        }
-        Arg::Version(req) => {
-            if req.major > 1 || req.minor > VERSION.minor {
-                func.print_const = false;
-            }
-            func.to_token_stream()
-        }
-        Arg::Nightly => {
-            func.print_const = VERSION.nightly;
-            func.to_token_stream()
-        }
-        Arg::Always => func.to_token_stream(),
-    }
-}
-
-enum Arg {
-    // `const_fn("...")`
-    Version(VersionReq),
-    // `const_fn(nightly)`
-    Nightly,
-    // `const_fn(cfg(...))`
-    Cfg(TokenStream),
-    // `const_fn(feature = "...")`
-    Feature(TokenStream),
-    // `const_fn`
-    Always,
-}
-
-fn parse_arg(tokens: TokenStream) -> Result<Arg> {
-    let mut iter = tokens.into_iter();
-
-    let next = iter.next();
-    let next_span = tt_span(next.as_ref());
-    match next {
-        None => return Ok(Arg::Always),
-        Some(TokenTree::Ident(i)) => match &*i.to_string() {
-            "nightly" => {
-                parse_as_empty(iter)?;
-                return Ok(Arg::Nightly);
-            }
-            "cfg" => {
-                return match iter.next().as_ref() {
-                    Some(TokenTree::Group(g)) if g.delimiter() == Delimiter::Parenthesis => {
-                        parse_as_empty(iter)?;
-                        Ok(Arg::Cfg(g.stream()))
-                    }
-                    tt => Err(error!(tt_span(tt), "expected `(`")),
-                };
-            }
-            "feature" => {
-                let next = iter.next();
-                return match next.as_ref() {
-                    Some(TokenTree::Punct(p)) if p.as_char() == '=' => match iter.next() {
-                        Some(TokenTree::Literal(l)) => {
-                            let l = LitStr::new(l)?;
-                            parse_as_empty(iter)?;
-                            Ok(Arg::Feature(
-                                vec![TokenTree::Ident(i), next.unwrap(), l.token.into()]
-                                    .into_iter()
-                                    .collect(),
-                            ))
-                        }
-                        tt => Err(error!(tt_span(tt.as_ref()), "expected string literal")),
-                    },
-                    tt => Err(error!(tt_span(tt), "expected `=`")),
-                };
-            }
-            _ => {}
-        },
-        Some(TokenTree::Literal(l)) => {
-            if let Ok(l) = LitStr::new(l) {
-                parse_as_empty(iter)?;
-                return match l.value().parse::<VersionReq>() {
-                    Ok(req) => Ok(Arg::Version(req)),
-                    Err(e) => Err(error!(l.span(), "{}", e)),
-                };
-            }
-        }
-        Some(_) => {}
-    }
-
-    Err(error!(next_span, "expected one of: `nightly`, `cfg`, `feature`, string literal"))
-}
-
-struct VersionReq {
-    major: u32,
-    minor: u32,
-}
-
-impl FromStr for VersionReq {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut pieces = s.split('.');
-        let major = pieces
-            .next()
-            .ok_or("need to specify the major version")?
-            .parse::<u32>()
-            .map_err(|e| e.to_string())?;
-        let minor = pieces
-            .next()
-            .ok_or("need to specify the minor version")?
-            .parse::<u32>()
-            .map_err(|e| e.to_string())?;
-        if let Some(s) = pieces.next() {
-            Err(format!("unexpected input: .{}", s))
-        } else {
-            Ok(Self { major, minor })
-        }
-    }
-}
-
-struct Version {
-    minor: u32,
-    nightly: bool,
-}
-
-#[cfg(const_fn_has_build_script)]
-const VERSION: Version = include!(concat!(env!("OUT_DIR"), "/version"));
-// If build script has not run or unable to determine version, it is considered as Rust 1.0.
-#[cfg(not(const_fn_has_build_script))]
-const VERSION: Version = Version { minor: 0, nightly: false };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/to_tokens.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/to_tokens.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/to_tokens.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/to_tokens.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-use proc_macro::{Ident, Literal, TokenStream, TokenTree};
-use std::iter;
-
-pub(crate) trait ToTokens {
-    fn to_tokens(&self, tokens: &mut TokenStream);
-
-    fn to_token_stream(&self) -> TokenStream {
-        let mut tokens = TokenStream::new();
-        self.to_tokens(&mut tokens);
-        tokens
-    }
-}
-
-impl ToTokens for Ident {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        tokens.extend(iter::once(TokenTree::Ident(self.clone())));
-    }
-}
-
-impl ToTokens for Literal {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        tokens.extend(iter::once(TokenTree::Literal(self.clone())));
-    }
-}
-
-impl ToTokens for TokenTree {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        tokens.extend(iter::once(self.clone()));
-    }
-}
-
-impl ToTokens for TokenStream {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        tokens.extend(self.clone());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/const_fn/src/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/const_fn/src/utils.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-use proc_macro::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
-use std::iter::FromIterator;
-
-use crate::Result;
-
-macro_rules! error {
-    ($span:expr, $msg:expr) => {{
-        crate::error::Error::new($span, $msg)
-    }};
-    ($span:expr, $($tt:tt)*) => {
-        error!($span, format!($($tt)*))
-    };
-}
-
-pub(crate) fn tt_span(tt: Option<&TokenTree>) -> Span {
-    tt.map_or_else(Span::call_site, TokenTree::span)
-}
-
-pub(crate) fn parse_as_empty(mut tokens: impl Iterator<Item = TokenTree>) -> Result<()> {
-    match tokens.next() {
-        Some(tt) => Err(error!(tt.span(), "unexpected token: {}", tt)),
-        None => Ok(()),
-    }
-}
-
-// (`#[cfg(<tokens>)]`, `#[cfg(not(<tokens>))]`)
-pub(crate) fn cfg_attrs(tokens: TokenStream) -> (TokenStream, TokenStream) {
-    let f = |tokens| {
-        let tokens = TokenStream::from_iter(vec![
-            TokenTree::Ident(Ident::new("cfg", Span::call_site())),
-            TokenTree::Group(Group::new(Delimiter::Parenthesis, tokens)),
-        ]);
-        TokenStream::from_iter(vec![
-            TokenTree::Punct(Punct::new('#', Spacing::Alone)),
-            TokenTree::Group(Group::new(Delimiter::Bracket, tokens)),
-        ])
-    };
-
-    let cfg_not = TokenTree::Group(Group::new(Delimiter::Parenthesis, tokens.clone()));
-    let cfg_not = TokenStream::from_iter(vec![
-        TokenTree::Ident(Ident::new("not", Span::call_site())),
-        cfg_not,
-    ]);
-
-    (f(tokens), f(cfg_not))
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,8 @@
-extern crate glob;
-
-use glob::glob;
 use std::collections::HashSet;
 use std::env;
 use std::fs;
 use std::io::{self, BufRead, Write};
-use std::path;
+use std::path::{self, Path};
 
 fn get_crate_dir() -> io::Result<path::PathBuf> {
     Ok(path::PathBuf::from(
@@ -59,11 +56,6 @@
 "
     )?;
 
-    for entry in glob("./in/*").expect("should read glob pattern") {
-        if let Ok(path) = entry {
-            println!("cargo:rerun-if-changed={}", path.display());
-        }
-    }
     println!("cargo:rerun-if-changed=tests/afl_seeds.rs");
 
     let entries = fs::read_dir(in_dir)?;
@@ -78,6 +70,7 @@
                 "no file name for AFL.rs seed test case",
             )
         })?;
+        println!("cargo:rerun-if-changed=in/{}", Path::new(file_name).display());
 
         writeln!(
             &mut test_file,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"d4a4f5aa0f07b8ec8299b7ed2bea9643241da3fd053e130bc5ab2a6dc4da6eeb","CONTRIBUTING.md":"bbc181b760be8fa1ee8719d610fade6549e231fbc33f37f7048e3282174e65e4","Cargo.lock":"bc6ef81eb6e4a037d9a586b816517f6acf053141e3b68349cbc03671a301b0ba","Cargo.toml":"a281ccc9297b0193f839ab088e83d9882ed5ed88f74c37c605ac5cb2c50d37df","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"5f982c01ae244abb9c99b75b9a4ba248699fc2a354ba200baa0c5da2bbd1d925","build.rs":"1bbf9047428269070ad7d0780e2d5de123d60c51a278f5d5db3d35d4449cabee","examples/cppfilt.rs":"9709ade28ed68071033e24584fa02acb3678f3c206beb922f8a084b9e6013390","src/ast.rs":"092279453403979f2ecd09c3725b53d8f4af3da851cc415ec15062d4c9cb128a","src/bin/afl_runner.rs":"12f024c37dc61623d6dc6c839d5b276384bec3381136158fe1e7de2cf83a526e","src/error.rs":"d2522b61f2fa9fd8b735b834e4f38b99f39e976ed50dccc0c50714a90ee1d797","src/index_str.rs":"01ab2cdcfd45db70815c917f8b1466072ae6514149490bcc536aeb7271f560d7","src/lib.rs":"750efc8e3c835b719ea4b953940bcbe352a1072a9afa59c9ceed3e3af7967e71","src/logging.rs":"bd3efa727d6b3016718df7c6588cee0b867c49c52380e02f99947d268e36dbe0","src/subs.rs":"e077d041f567df25ce170cf8e4f8ddc6d0f444e3f4779e5a3b16af8ef0d87596"},"package":"44919ecaf6f99e8e737bc239408931c9a01e9a6c74814fee8242dd2506b65390"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"6e2e68557d1399b549c6a650bafd126e615f1adaf3c49c770a9dadefb97f6054","CONTRIBUTING.md":"bbc181b760be8fa1ee8719d610fade6549e231fbc33f37f7048e3282174e65e4","Cargo.lock":"7c76c65b31a6e8100ebec11140508146d60de35ae1bfb8931f28a0ad49d0e1a1","Cargo.toml":"3c500ca321c445f55ddddedbbff6782fa5f5857d23336bb37bc317b8f8ecf64b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"eef202390b0502f5b437d7664346e5c95d4e7789e4a53fce78ca8ac69492a730","build.rs":"1b7c6c558c00c62e4bdf181c3572cf669dd13e40aba9875d1c91b547ab8f6396","examples/cppfilt.rs":"9709ade28ed68071033e24584fa02acb3678f3c206beb922f8a084b9e6013390","src/ast.rs":"0f8602d92a9b40df821295814bbb163c99996d07a4c18e19ac772ba7ed7d7b4c","src/bin/afl_runner.rs":"12f024c37dc61623d6dc6c839d5b276384bec3381136158fe1e7de2cf83a526e","src/error.rs":"d2522b61f2fa9fd8b735b834e4f38b99f39e976ed50dccc0c50714a90ee1d797","src/index_str.rs":"01ab2cdcfd45db70815c917f8b1466072ae6514149490bcc536aeb7271f560d7","src/lib.rs":"750efc8e3c835b719ea4b953940bcbe352a1072a9afa59c9ceed3e3af7967e71","src/logging.rs":"bd3efa727d6b3016718df7c6588cee0b867c49c52380e02f99947d268e36dbe0","src/subs.rs":"e077d041f567df25ce170cf8e4f8ddc6d0f444e3f4779e5a3b16af8ef0d87596"},"package":"8ea47428dc9d2237f3c6bc134472edfd63ebba0af932e783506dcfd66f10d18a"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "afl"
-version = "0.8.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2797f92fb146a37560af914b5d5328f8330d6a39b6eaf00f5b184ac73c0c81e7"
+checksum = "d16d691836db1a0927dab30b21add058acec42e177534128e7f00a7cf60bafc2"
 dependencies = [
  "cc",
  "clap",
@@ -41,9 +43,9 @@
 
 [[package]]
 name = "cc"
-version = "1.0.65"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
 
 [[package]]
 name = "cfg-if"
@@ -68,13 +70,12 @@
 
 [[package]]
 name = "cpp_demangle"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "afl",
  "cfg-if",
  "clap",
  "diff",
- "glob",
 ]
 
 [[package]]
@@ -84,12 +85,6 @@
 checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 
 [[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
 name = "hermit-abi"
 version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -100,33 +95,45 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+
+[[package]]
+name = "pest"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
+]
 
 [[package]]
 name = "rustc_version"
-version = "0.2.3"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "semver"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
  "semver-parser",
 ]
 
 [[package]]
 name = "semver-parser"
-version = "0.7.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
+dependencies = [
+ "pest",
+]
 
 [[package]]
 name = "strsim"
@@ -144,6 +151,12 @@
 ]
 
 [[package]]
+name = "ucd-trie"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
+[[package]]
 name = "unicode-width"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "cpp_demangle"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Nick Fitzgerald <fitzgen@gmail.com>", "Jim Blandy <jimb@red-bean.com>"]
 build = "build.rs"
 exclude = ["tests/**", "in/**"]
@@ -31,7 +31,7 @@
 path = "src/bin/afl_runner.rs"
 required-features = ["afl"]
 [dependencies.afl]
-version = "0.8.0"
+version = "0.10.0"
 optional = true
 
 [dependencies.cfg-if]
@@ -41,8 +41,6 @@
 
 [dev-dependencies.diff]
 version = "0.1.11"
-[build-dependencies.glob]
-version = "0.3.0"
 
 [features]
 alloc = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -30,6 +30,20 @@
 
 # 0.3.2
 
+Released 2021/7/8
+
+## Added
+
+* The builtin `char8_t` type is now recognized #224
+
+## Changed
+
+* `glob` is no longer a build time dependency #220
+
+--------------------------------------------------------------------------------
+
+# 0.3.2
+
 Released 2020/11/27
 
 ## Added
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
 
 ```toml
 [dependencies]
-cpp_demangle = "0.3.2"
+cpp_demangle = "0.3.3"
 ```
 
 And then demangle some C++ symbols!
@@ -64,7 +64,7 @@
 ```tom
 [dependencies]
 cpp_demangle = {
-  version = "0.3.2",
+  version = "0.3.3",
   default-features = false,
   features = ["alloc"]
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/src/ast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/src/ast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpp_demangle/src/ast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpp_demangle/src/ast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4011,6 +4011,7 @@
     ///                ::= Dh # IEEE 754r half-precision floating point (16 bits)
     ///                ::= Di # char32_t
     ///                ::= Ds # char16_t
+    ///                ::= Du # char8_t
     ///                ::= Da # auto
     ///                ::= Dc # decltype(auto)
     ///                ::= Dn # std::nullptr_t (i.e., decltype(nullptr))
@@ -4044,6 +4045,7 @@
         DecimalFloat16   (b"Dh", "half"),
         Char32           (b"Di", "char32_t"),
         Char16           (b"Ds", "char16_t"),
+        Char8            (b"Du", "char8_t"),
         Auto             (b"Da", "auto"),
         Decltype         (b"Dc", "decltype(auto)"),
         Nullptr          (b"Dn", "std::nullptr_t")
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"1366b7c657641400830c7cea524e6f45e698281b433fe8bb796065af44fe43a7","Cargo.toml":"b8a50c2ce267054803e4ec92b3622f7b8543654923b83ff5b951208e573fef4c","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"904801faf3f1850328af8e1aa1047b9190cc22ed40df5c87f2d93d17f847ef67","README.md":"95f4b7be0af7c1dcbc81f6cae8c6593ec9de93708d746da3707f3bee2e2d8a6a","src/aarch64.rs":"538b948f3e21a97d00f57a960d648df94e439636e0ce2535d452bc9e436313ca","src/lib.rs":"025e9336f18ca8a8854ee74b5b1ce6f926f72478113106f5c61596646dd6ede9","src/x86.rs":"45926715bc5dec0d9b37de0f0409c2c0b578dc3f7ac51f10e58cbc87cf3dcd9f","tests/aarch64.rs":"bdabbe67316c128b57003ba5faa07707b5f339b1f3e984da4bc383cc93c2bedd","tests/x86.rs":"fcf476ca6ebd0845ab547cea4fe40c2ba2a2324c024264d9a86f666586f3a480"},"package":"95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,28 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "cpufeatures"
+version = "0.2.1"
+authors = ["RustCrypto Developers"]
+description = "Lightweight and efficient no-std compatible alternative to the\nis_x86_feature_detected! macro\n"
+documentation = "https://docs.rs/cpufeatures"
+readme = "README.md"
+keywords = ["cpuid", "target-feature"]
+categories = ["no-std"]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/RustCrypto/utils"
+[target.aarch64-apple-darwin.dependencies.libc]
+version = "0.2.101"
+[target."cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))".dependencies.libc]
+version = "0.2.101"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,60 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.2.1 (2021-08-26)
+### Changed
+- Revert [#583] "Use from_bytes_with_nul for string check" ([#597])
+
+[#583]: https://github.com/RustCrypto/utils/pull/583
+[#597]: https://github.com/RustCrypto/utils/pull/597
+
+## 0.2.0 (2021-08-26) [YANKED]
+### Removed
+- AArch64 `crypto` target feature ([#594])
+
+[#594]: https://github.com/RustCrypto/utils/pull/594
+
+## 0.1.5 (2021-06-21)
+### Added
+- iOS support ([#435], [#501])
+
+### Changed
+- Map `aarch64` HWCAPs to target features; add `crypto` ([#456])
+
+[#435]: https://github.com/RustCrypto/utils/pull/435
+[#456]: https://github.com/RustCrypto/utils/pull/456
+[#501]: https://github.com/RustCrypto/utils/pull/501
+
+## 0.1.4 (2021-05-14)
+### Added
+- Support compiling on non-Linux/macOS aarch64 targets ([#408])
+
+[#408]: https://github.com/RustCrypto/utils/pull/408
+
+## 0.1.3 (2021-05-13)
+### Removed
+- `neon` on `aarch64` targets: already enabled by default ([#406])
+
+[#406]: https://github.com/RustCrypto/utils/pull/406
+
+## 0.1.2 (2021-05-13) [YANKED]
+### Added
+- `neon` feature detection on `aarch64` targets ([#403])
+
+### Fixed
+- Support for `musl`-based targets ([#403])
+
+[#403]: https://github.com/RustCrypto/utils/pull/403
+
+## 0.1.1 (2021-05-06)
+### Added
+- `aarch64` support for Linux and macOS/M4 targets ([#393])
+
+[#393]: https://github.com/RustCrypto/utils/pull/393
+
+## 0.1.0 (2021-04-29)
+- Initial release
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2020 The RustCrypto Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,86 @@
+# [RustCrypto]: CPU Feature Detection
+
+[![crate][crate-image]][crate-link]
+[![Docs][docs-image]][docs-link]
+![Apache2/MIT licensed][license-image]
+![Rust Version][rustc-image]
+[![Project Chat][chat-image]][chat-link]
+[![Build Status][build-image]][build-link]
+
+Lightweight and efficient `no_std` compatible alternative to the
+`is_x86_feature_detected!` macro providing runtime CPU feature detection
+for x86/x86_64 and ARM64 CPUs.
+
+[Documentation][docs-link]
+
+## Supported architectures
+
+### `aarch64`: Linux and macOS/M4 only
+
+Note: ARM64 does not support OS-independent feature detection 
+
+Target features:
+
+- `aes`
+- `sha2`
+- `sha3`
+
+Note: please open a GitHub Issue to request support for additional features.
+
+### `x86`/`x86_64`: OS independent and `no_std`-friendly
+
+Target features:
+
+- `adx`
+- `aes`
+- `avx`
+- `avx2`
+- `bmi1`
+- `bmi2`
+- `fma`
+- `mmx`
+- `pclmulqdq`
+- `popcnt`
+- `rdrand`
+- `rdseed`
+- `sgx`
+- `sha`
+- `sse`
+- `sse2`
+- `sse3`
+- `sse4.1`
+- `sse4.2`
+- `ssse3`
+
+## License
+
+Licensed under either of:
+
+ * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+ * [MIT license](http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
+
+[//]: # (badges)
+
+[crate-image]: https://img.shields.io/crates/v/cpufeatures.svg
+[crate-link]: https://crates.io/crates/cpufeatures
+[docs-image]: https://docs.rs/cpufeatures/badge.svg
+[docs-link]: https://docs.rs/cpufeatures/
+[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.40+-blue.svg
+[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
+[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260052-utils
+[build-image]: https://github.com/RustCrypto/utils/workflows/cpufeatures/badge.svg?branch=master&event=push
+[build-link]: https://github.com/RustCrypto/utils/actions/workflows/cpufeatures.yml
+
+[//]: # (general links)
+
+[RustCrypto]: https://github.com/rustcrypto
+[RustCrypto/utils#378]: https://github.com/RustCrypto/utils/issues/378
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/src/aarch64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/src/aarch64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/src/aarch64.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/src/aarch64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,178 @@
+//! ARM64 CPU feature detection support.
+//!
+//! Unfortunately ARM instructions to detect CPU features cannot be called from
+//! unprivileged userspace code, so this implementation relies on OS-specific
+//! APIs for feature detection.
+
+// Evaluate the given `$body` expression any of the supplied target features
+// are not enabled. Otherwise returns true.
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __unless_target_features {
+    ($($tf:tt),+ => $body:expr ) => {
+        {
+            #[cfg(not(all($(target_feature=$tf,)*)))]
+            $body
+
+            #[cfg(all($(target_feature=$tf,)*))]
+            true
+        }
+    };
+}
+
+// Linux runtime detection of target CPU features using `getauxval`.
+#[cfg(target_os = "linux")]
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __detect_target_features {
+    ($($tf:tt),+) => {{
+        let hwcaps = $crate::aarch64::getauxval_hwcap();
+        $($crate::check!(hwcaps, $tf) & )+ true
+    }};
+}
+
+/// Linux helper function for calling `getauxval` to get `AT_HWCAP`.
+#[cfg(target_os = "linux")]
+pub fn getauxval_hwcap() -> u64 {
+    unsafe { libc::getauxval(libc::AT_HWCAP) }
+}
+
+// MacOS runtime detection of target CPU features using `sysctlbyname`.
+#[cfg(target_os = "macos")]
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __detect_target_features {
+    ($($tf:tt),+) => {{
+        $($crate::check!($tf) & )+ true
+    }};
+}
+
+// Linux `expand_check_macro`
+#[cfg(target_os = "linux")]
+macro_rules! __expand_check_macro {
+    ($(($name:tt, $hwcap:ident)),* $(,)?) => {
+        #[macro_export]
+        #[doc(hidden)]
+        macro_rules! check {
+            $(
+                ($hwcaps:expr, $name) => {
+                    (($hwcaps & $crate::aarch64::hwcaps::$hwcap) != 0)
+                };
+            )*
+        }
+    };
+}
+
+// Linux `expand_check_macro`
+#[cfg(target_os = "linux")]
+__expand_check_macro! {
+    ("aes",    AES),    // Enable AES support.
+    ("sha2",   SHA2),   // Enable SHA1 and SHA256 support.
+    ("sha3",   SHA3),   // Enable SHA512 and SHA3 support.
+}
+
+/// Linux hardware capabilities mapped to target features.
+///
+/// Note that LLVM target features are coarser grained than what Linux supports
+/// and imply more capabilities under each feature. This module attempts to
+/// provide that mapping accordingly.
+///
+/// See this issue for more info: <https://github.com/RustCrypto/utils/issues/395>
+#[cfg(target_os = "linux")]
+pub mod hwcaps {
+    use libc::c_ulong;
+
+    pub const AES: c_ulong = libc::HWCAP_AES | libc::HWCAP_PMULL;
+    pub const CRYPTO: c_ulong = AES | SHA2;
+    pub const SHA2: c_ulong = libc::HWCAP_SHA2;
+    pub const SHA3: c_ulong = libc::HWCAP_SHA3 | libc::HWCAP_SHA512;
+}
+
+// macOS `check!` macro.
+//
+// NOTE: several of these instructions (e.g. `aes`, `sha2`) can be assumed to
+// be present on all Apple ARM64 hardware.
+//
+// Newer CPU instructions now have nodes within sysctl's `hw.optional`
+// namespace, however the ones that do not can safely be assumed to be
+// present on all Apple ARM64 devices, now and for the foreseeable future.
+//
+// See discussion on this issue for more information:
+// <https://github.com/RustCrypto/utils/issues/378>
+#[cfg(target_os = "macos")]
+#[macro_export]
+#[doc(hidden)]
+macro_rules! check {
+    ("aes") => {
+        true
+    };
+    ("sha2") => {
+        true
+    };
+    ("sha3") => {
+        unsafe {
+            // `sha3` target feature implies SHA-512 as well
+            $crate::aarch64::sysctlbyname(b"hw.optional.armv8_2_sha512\0")
+                && $crate::aarch64::sysctlbyname(b"hw.optional.armv8_2_sha3\0")
+        }
+    };
+}
+
+/// macOS helper function for calling `sysctlbyname`.
+#[cfg(target_os = "macos")]
+pub unsafe fn sysctlbyname(name: &[u8]) -> bool {
+    assert_eq!(
+        name.last().cloned(),
+        Some(0),
+        "name is not NUL terminated: {:?}",
+        name
+    );
+
+    let mut value: u32 = 0;
+    let mut size = core::mem::size_of::<u32>();
+
+    let rc = libc::sysctlbyname(
+        name.as_ptr() as *const i8,
+        &mut value as *mut _ as *mut libc::c_void,
+        &mut size,
+        core::ptr::null_mut(),
+        0,
+    );
+
+    assert_eq!(size, 4, "unexpected sysctlbyname(3) result size");
+    assert_eq!(rc, 0, "sysctlbyname returned error code: {}", rc);
+    value != 0
+}
+
+// iOS `check!` macro.
+//
+// Unfortunately iOS does not provide access to the `sysctl(3)` API which means
+// we can only return static values for CPU features which  can be assumed to
+// be present on all Apple ARM64 hardware.
+//
+// See discussion on this issue for more information:
+// <https://github.com/RustCrypto/utils/issues/378>
+#[cfg(target_os = "ios")]
+#[macro_export]
+#[doc(hidden)]
+macro_rules! check {
+    ("aes") => {
+        true
+    };
+    ("sha2") => {
+        true
+    };
+    ("sha3") => {
+        false
+    };
+}
+
+// On other targets, runtime CPU feature detection is unavailable
+#[cfg(not(any(target_os = "ios", target_os = "linux", target_os = "macos")))]
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __detect_target_features {
+    ($($tf:tt),+) => {
+        false
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,136 @@
+//! This crate provides macros for runtime CPU feature detection. It's intended
+//! as a stopgap until Rust [RFC 2725] adding first-class target feature detection
+//! macros to `libcore` is implemented.
+//!
+//! Supported target architectures:
+//! - `aarch64`: Linux and macOS/M4 only (ARM64 does not support OS-independent feature detection)
+//!   - Target features: `aes`, `sha2`, `sha3`
+//! - `x86`/`x86_64`: OS independent and `no_std`-friendly
+//!   - Target features: `adx`, `aes`, `avx`, `avx2`, `bmi1`, `bmi2`, `fma`,
+//!     `mmx`, `pclmulqdq`, `popcnt`, `rdrand`, `rdseed`, `sgx`, `sha`, `sse`,
+//!     `sse2`, `sse3`, `sse4.1`, `sse4.2`, `ssse3`
+//!
+//! If you would like detection support for a target feature which is not on
+//! this list, please [open a GitHub issue][gh].
+//!
+//! # Example
+//! ```
+//! # #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+//! # {
+//! // This macro creates `cpuid_aes_sha` module
+//! cpufeatures::new!(cpuid_aes_sha, "aes", "sha");
+//!
+//! // `token` is a Zero Sized Type (ZST) value, which guarantees
+//! // that underlying static storage got properly initialized,
+//! // which allows to omit initialization branch
+//! let token: cpuid_aes_sha::InitToken = cpuid_aes_sha::init();
+//!
+//! if token.get() {
+//!     println!("CPU supports both SHA and AES extensions");
+//! } else {
+//!     println!("SHA and AES extensions are not supported");
+//! }
+//!
+//! // If stored value needed only once you can get stored value
+//! // omitting the token
+//! let val = cpuid_aes_sha::get();
+//! assert_eq!(val, token.get());
+//!
+//! // Additionally you can get both token and value
+//! let (token, val) = cpuid_aes_sha::init_get();
+//! assert_eq!(val, token.get());
+//! # }
+//! ```
+//!
+//! Note that if all tested target features are enabled via compiler options
+//! (e.g. by using `RUSTFLAGS`), the `get` method will always return `true`
+//! and `init` will not use CPUID instruction. Such behavior allows
+//! compiler to completely eliminate fallback code.
+//!
+//! After first call macro caches result and returns it in subsequent
+//! calls, thus runtime overhead for them is minimal.
+//!
+//! [RFC 2725]: https://github.com/rust-lang/rfcs/pull/2725
+//! [gh]: https://github.com/RustCrypto/utils/issues/new?title=cpufeatures:%20requesting%20support%20for%20CHANGEME%20target%20feature
+
+#![no_std]
+#![doc(
+    html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo.svg",
+    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo.svg",
+    html_root_url = "https://docs.rs/cpufeatures/0.2.1"
+)]
+
+#[cfg(all(target_arch = "aarch64"))]
+#[doc(hidden)]
+pub mod aarch64;
+
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+mod x86;
+
+#[cfg(not(any(target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64")))]
+compile_error!("This crate works only on `aarch64`, `x86`, and `x86-64` targets.");
+
+/// Create module with CPU feature detection code.
+#[macro_export]
+macro_rules! new {
+    ($mod_name:ident, $($tf:tt),+ $(,)?) => {
+        mod $mod_name {
+            use core::sync::atomic::{AtomicU8, Ordering::Relaxed};
+
+            const UNINIT: u8 = u8::max_value();
+            static STORAGE: AtomicU8 = AtomicU8::new(UNINIT);
+
+            /// Initialization token
+            #[derive(Copy, Clone, Debug)]
+            pub struct InitToken(());
+
+            impl InitToken {
+                /// Get initialized value
+                #[inline(always)]
+                pub fn get(&self) -> bool {
+                    $crate::__unless_target_features! {
+                        $($tf),+ => {
+                            STORAGE.load(Relaxed) == 1
+                        }
+                    }
+                }
+            }
+
+            /// Initialize underlying storage if needed and get
+            /// stored value and initialization token.
+            #[inline]
+            pub fn init_get() -> (InitToken, bool) {
+                let res = $crate::__unless_target_features! {
+                    $($tf),+ => {
+                        // Relaxed ordering is fine, as we only have a single atomic variable.
+                        let val = STORAGE.load(Relaxed);
+
+                        if val == UNINIT {
+                            let res = $crate::__detect_target_features!($($tf),+);
+                            STORAGE.store(res as u8, Relaxed);
+                            res
+                        } else {
+                            val == 1
+                        }
+                    }
+                };
+
+                (InitToken(()), res)
+            }
+
+            /// Initialize underlying storage if needed and get
+            /// initialization token.
+            #[inline]
+            pub fn init() -> InitToken {
+                init_get().0
+            }
+
+            /// Initialize underlying storage if needed and get
+            /// stored value.
+            #[inline]
+            pub fn get() -> bool {
+                init_get().1
+            }
+        }
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/src/x86.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/src/x86.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/src/x86.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/src/x86.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,81 @@
+//! x86/x86-64 CPU feature detection support.
+//!
+//! Portable, `no_std`-friendly implementation that relies on the x86 `CPUID`
+//! instruction for feature detection.
+
+// Evaluate the given `$body` expression any of the supplied target features
+// are not enabled. Otherwise returns true.
+//
+// The `$body` expression is not evaluated on SGX targets, and returns false
+// on these targets unless *all* supplied target features are enabled.
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __unless_target_features {
+    ($($tf:tt),+ => $body:expr ) => {{
+        #[cfg(not(all($(target_feature=$tf,)*)))]
+        {
+            #[cfg(not(target_env = "sgx"))]
+            $body
+
+            // CPUID is not available on SGX targets
+            #[cfg(target_env = "sgx")]
+            false
+        }
+
+        #[cfg(all($(target_feature=$tf,)*))]
+        true
+    }};
+}
+
+// Use CPUID to detect the presence of all supplied target features.
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __detect_target_features {
+    ($($tf:tt),+) => {{
+        #[cfg(target_arch = "x86")]
+        use core::arch::x86::{__cpuid, __cpuid_count};
+        #[cfg(target_arch = "x86_64")]
+        use core::arch::x86_64::{__cpuid, __cpuid_count};
+
+        let cr = unsafe {
+            [__cpuid(1), __cpuid_count(7, 0)]
+        };
+
+        $($crate::check!(cr, $tf) & )+ true
+    }};
+}
+
+macro_rules! __expand_check_macro {
+    ($(($name:tt, $i:expr, $reg:ident, $offset:expr)),* $(,)?) => {
+        #[macro_export]
+        #[doc(hidden)]
+        macro_rules! check {
+            $(
+                ($cr:expr, $name) => { ($cr[$i].$reg & (1 << $offset) != 0) };
+            )*
+        }
+    };
+}
+
+__expand_check_macro! {
+    ("mmx", 0, edx, 23),
+    ("sse", 0, edx, 25),
+    ("sse2", 0, edx, 26),
+    ("sse3", 0, ecx, 0),
+    ("pclmulqdq", 0, ecx, 1),
+    ("ssse3", 0, ecx, 9),
+    ("fma", 0, ecx, 12),
+    ("sse4.1", 0, ecx, 19),
+    ("sse4.2", 0, ecx, 20),
+    ("popcnt", 0, ecx, 23),
+    ("aes", 0, ecx, 25),
+    ("avx", 0, ecx, 28),
+    ("rdrand", 0, ecx, 30),
+    ("sgx", 1, ebx, 2),
+    ("bmi1", 1, ebx, 3),
+    ("avx2", 1, ebx, 5),
+    ("bmi2", 1, ebx, 8),
+    ("rdseed", 1, ebx, 18),
+    ("adx", 1, ebx, 19),
+    ("sha", 1, ebx, 29),
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/tests/aarch64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/tests/aarch64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/tests/aarch64.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/tests/aarch64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+//! ARM64 tests
+
+#![cfg(target_arch = "aarch64")]
+
+cpufeatures::new!(armcaps, "aes", "sha2", "sha3");
+
+#[test]
+fn init() {
+    let token: armcaps::InitToken = armcaps::init();
+    assert_eq!(token.get(), armcaps::get());
+}
+
+#[test]
+fn init_get() {
+    let (token, val) = armcaps::init_get();
+    assert_eq!(val, token.get());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/tests/x86.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/tests/x86.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpufeatures/tests/x86.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpufeatures/tests/x86.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+//! x86/x86_64 tests
+
+#![cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+
+cpufeatures::new!(cpuid, "aes", "sha");
+
+#[test]
+fn init() {
+    let token: cpuid::InitToken = cpuid::init();
+    assert_eq!(token.get(), cpuid::get());
+}
+
+#[test]
+fn init_get() {
+    let (token, val) = cpuid::init_get();
+    assert_eq!(val, token.get());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"e0cd09e38fffd25bdf238995b8a1855e3162b6a6609decfd07e18a7ac9f18ec0","Cargo.toml":"081493bc0588bd6edc77176138e21039312aae65dcd2a700f8d8b4368d6ae3ad","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"904801faf3f1850328af8e1aa1047b9190cc22ed40df5c87f2d93d17f847ef67","src/lib.rs":"e724effc564546e40616f5a64e722a3c81a5b4837f178b7a0e656c4b39e816c9"},"package":"8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "cpuid-bool"
-version = "0.1.2"
-authors = ["RustCrypto Developers"]
-description = "A lightweight no-std compatible alternative to is_x86_feature_detected"
-documentation = "https://docs.rs/cpuid-bool"
-keywords = ["cpuid", "target-feature"]
-categories = ["no-std"]
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/RustCrypto/utils"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## 0.1.2 (2020-07-20)
-### Added
-- LICENSE files ([#70])
-
-[#70]: https://github.com/RustCrypto/utils/pull/70
-
-## 0.1.1 (2020-07-14)
-### Fixed
-- SGX target support ([#68])
-
-[#68]: https://github.com/RustCrypto/utils/pull/68
-
-## 0.1.0 (2020-06-11)
-- Initial release
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2020 The RustCrypto Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/cpuid-bool/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/cpuid-bool/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-//! Macro for checking CPU capabilities at runtime.
-//!
-//! # Usage example
-//! ```
-//! if cpuid_bool::cpuid_bool!("sha", "aes") {
-//!     println!("CPU supports both SHA and AES extensions");
-//! } else {
-//!     println!("SHA and AES extensions are not supported");
-//! }
-//! ```
-//! Note that if all tested target features are enabled via compiler options
-//! (e.g. by using `RUSTFLAGS`), `cpuid_bool!` macro immideatly will expand
-//! to `true` and will not use CPUID instruction. Such behavior allows
-//! compiler to eliminate fallback code.
-//!
-//! After first call macro caches result and returns it in subsequent
-//! calls, thus runtime overhead for them is minimal.
-#![no_std]
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-compile_error!("This crate works only on x86 and x86-64 targets.");
-
-use core::sync::atomic::{AtomicU8, Ordering::Relaxed};
-
-/// This structure represents a lazily initialized static boolean value.
-///
-/// Useful when it is preferable to just rerun initialization instead of
-/// locking. Used internally by the `cpuid_bool` macro.
-pub struct LazyBool(AtomicU8);
-
-impl LazyBool {
-    const UNINIT: u8 = u8::max_value();
-
-    pub const fn new() -> Self {
-        Self(AtomicU8::new(Self::UNINIT))
-    }
-
-    // Runs the init() function at least once, returning the value of some run
-    // of init(). Multiple callers can run their init() functions in parallel.
-    // init() should always return the same value, if it succeeds.
-    pub fn unsync_init(&self, init: impl FnOnce() -> bool) -> bool {
-        // Relaxed ordering is fine, as we only have a single atomic variable.
-        let mut val = self.0.load(Relaxed);
-        if val == Self::UNINIT {
-            val = init() as u8;
-            self.0.store(val as u8, Relaxed);
-        }
-        val != 0
-    }
-}
-
-// TODO: find how to define private macro usable inside a public one
-macro_rules! expand_check_macro {
-    ($(($name:tt, $i:expr, $reg:ident, $offset:expr)),* $(,)?) => {
-        #[macro_export]
-        #[doc(hidden)]
-        macro_rules! check {
-            $(
-                ($cr:expr, $name) => { ($cr[$i].$reg & (1 << $offset) != 0) };
-            )*
-        }
-    };
-}
-
-expand_check_macro! {
-    ("mmx", 0, edx, 23),
-    ("sse", 0, edx, 25),
-    ("sse2", 0, edx, 26),
-    ("sse3", 0, ecx, 0),
-    ("pclmulqdq", 0, ecx, 1),
-    ("ssse3", 0, ecx, 9),
-    ("fma", 0, ecx, 12),
-    ("sse4.1", 0, ecx, 19),
-    ("sse4.2", 0, ecx, 20),
-    ("popcnt", 0, ecx, 23),
-    ("aes", 0, ecx, 25),
-    ("avx", 0, ecx, 28),
-    ("rdrand", 0, ecx, 30),
-    ("sgx", 1, ebx, 2),
-    ("bmi1", 1, ebx, 3),
-    ("avx2", 1, ebx, 5),
-    ("bmi2", 1, ebx, 8),
-    ("rdseed", 1, ebx, 18),
-    ("adx", 1, ebx, 19),
-    ("sha", 1, ebx, 29),
-}
-
-/// Check at runtime if CPU supports sequence of target features.
-///
-/// During first execution this macro will use CPUID to check requested
-/// target features, results will be cached and further calls will return
-/// it instead.
-#[macro_export]
-macro_rules! cpuid_bool {
-    ($($tf:tt),+ $(,)? ) => {{
-        // CPUID is not available on SGX targets
-        #[cfg(all(not(target_env = "sgx"), not(all($(target_feature=$tf, )*))))]
-        let res = {
-            #[cfg(target_arch = "x86")]
-            use core::arch::x86::{__cpuid, __cpuid_count};
-            #[cfg(target_arch = "x86_64")]
-            use core::arch::x86_64::{__cpuid, __cpuid_count};
-
-            static CPUID_BOOL: cpuid_bool::LazyBool = cpuid_bool::LazyBool::new();
-            CPUID_BOOL.unsync_init(|| {
-                #[allow(unused_variables)]
-                let cr = unsafe {
-                    [__cpuid(1), __cpuid_count(7, 0)]
-                };
-                // TODO: find how to remove `true`
-                $(cpuid_bool::check!(cr, $tf) & )+ true
-            })
-        };
-
-        #[cfg(all(target_env = "sgx", not(all($(target_feature=$tf, )*))))]
-        let res = false;
-        #[cfg(all($(target_feature=$tf, )*))]
-        let res = true;
-
-        res
-    }};
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"0cfbdb0bd9dd1a1c162655d51df1c30f5cf986c8b11db6e533ddce1aab5b19c4","Cargo.toml":"c0c47a1a4d760726268d3ef78b69e402e56e86b669478177becf33bdb7b90d49","LICENSE-APACHE":"6f712474a3e3be1386d2d0c29449850ea788da64d35cff0fc8799acf741e9ecd","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"9a52588d920891b4f0b1edf8e951b1ff16aef3960a16537d15b7ab0e627b039d","src/lib.rs":"d898c46ee0b9c00f71713668eecdf8eb049f03836c2600780443f65fec70198e","tests/subcrates.rs":"69cbe766a855ad6278cc969a61ba871eba3594afb5c2d3c647dff5b794e160ab"},"package":"fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"e8dcdd4c84fced11ce3e9be9246dd511e9d09b0b36497c6e569ed0427b57424a","Cargo.toml":"a1452bb8649a66814e473799942aa624243bab0e5257a5b11ce994253b41ecb4","LICENSE-APACHE":"6f712474a3e3be1386d2d0c29449850ea788da64d35cff0fc8799acf741e9ecd","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"d1d81cf88e580608f27bf4d2bb7f6f2d01c2c1f1d26be86ec1daa7aa455e9f62","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/lib.rs":"e896ef1e4326db5202cebdd57dd606f96113d5a8700e746bfe8909978ac84a7f","tests/subcrates.rs":"69cbe766a855ad6278cc969a61ba871eba3594afb5c2d3c647dff5b794e160ab"},"package":"4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,13 +13,12 @@
 [package]
 edition = "2018"
 name = "crossbeam"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["The Crossbeam Project Developers"]
-exclude = ["/ci/*", "/bors.toml"]
+exclude = ["/.github", "/ci"]
 description = "Tools for concurrent programming"
 homepage = "https://github.com/crossbeam-rs/crossbeam"
 documentation = "https://docs.rs/crossbeam"
-readme = "README.md"
 keywords = ["atomic", "garbage", "non-blocking", "lock-free", "rcu"]
 categories = ["concurrency", "memory-management", "data-structures", "no-std"]
 license = "MIT OR Apache-2.0"
@@ -38,20 +37,20 @@
 default-features = false
 
 [dependencies.crossbeam-epoch]
-version = "0.9"
+version = "0.9.5"
 optional = true
 default-features = false
 
 [dependencies.crossbeam-queue]
-version = "0.3"
+version = "0.3.2"
 optional = true
 default-features = false
 
 [dependencies.crossbeam-utils]
-version = "0.8"
+version = "0.8.5"
 default-features = false
 [dev-dependencies.rand]
-version = "0.7.3"
+version = "0.8"
 
 [features]
 alloc = ["crossbeam-epoch/alloc", "crossbeam-queue/alloc"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,7 @@
+# Version 0.8.1
+
+- Support targets that do not have atomic CAS on stable Rust (#698)
+
 # Version 0.8.0
 
 - Bump the minimum supported Rust version to 1.36.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/no_atomic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/no_atomic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/no_atomic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/no_atomic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,59 @@
+// This file is @generated by no_atomic.sh.
+// It is not intended for manual editing.
+
+const NO_ATOMIC_CAS: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
+#[allow(dead_code)]
+const NO_ATOMIC_64: &[&str] = &[
+    "arm-linux-androideabi",
+    "armebv7r-none-eabi",
+    "armebv7r-none-eabihf",
+    "armv4t-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-musleabi",
+    "armv5te-unknown-linux-uclibceabi",
+    "armv7r-none-eabi",
+    "armv7r-none-eabihf",
+    "hexagon-unknown-linux-musl",
+    "mips-unknown-linux-gnu",
+    "mips-unknown-linux-musl",
+    "mips-unknown-linux-uclibc",
+    "mipsel-unknown-linux-gnu",
+    "mipsel-unknown-linux-musl",
+    "mipsel-unknown-linux-uclibc",
+    "mipsel-unknown-none",
+    "mipsisa32r6-unknown-linux-gnu",
+    "mipsisa32r6el-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnuspe",
+    "powerpc-unknown-linux-musl",
+    "powerpc-unknown-netbsd",
+    "powerpc-unknown-openbsd",
+    "powerpc-wrs-vxworks",
+    "powerpc-wrs-vxworks-spe",
+    "riscv32gc-unknown-linux-gnu",
+    "riscv32gc-unknown-linux-musl",
+    "riscv32imac-unknown-none-elf",
+    "thumbv7em-none-eabi",
+    "thumbv7em-none-eabihf",
+    "thumbv7m-none-eabi",
+    "thumbv8m.base-none-eabi",
+    "thumbv8m.main-none-eabi",
+    "thumbv8m.main-none-eabihf",
+    "mipsel-sony-psp",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
+#[allow(dead_code)]
+const NO_ATOMIC: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
 https://github.com/crossbeam-rs/crossbeam/actions)
-[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
+[![License](https://img.shields.io/badge/license-MIT_OR_Apache--2.0-blue.svg)](
 https://github.com/crossbeam-rs/crossbeam#license)
 [![Cargo](https://img.shields.io/crates/v/crossbeam.svg)](
 https://crates.io/crates/crossbeam)
@@ -10,7 +10,7 @@
 https://docs.rs/crossbeam)
 [![Rust 1.36+](https://img.shields.io/badge/rust-1.36+-lightgray.svg)](
 https://www.rust-lang.org)
-[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discordapp.com/invite/JXYwgWZ)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)
 
 This crate provides a set of tools for concurrent programming:
 
@@ -22,8 +22,8 @@
 #### Data structures
 
 * [`deque`], work-stealing deques for building task schedulers.
-* [`ArrayQueue`], a bounded MPMC queue that allocates a fixed-capacity buffer on construction.
-* [`SegQueue`], an unbounded MPMC queue that allocates small buffers, segments, on demand.
+* [`ArrayQueue`], a bounded MPMC queue that allocates a fixed-capacity buffer on construction.<sup>(alloc)</sup>
+* [`SegQueue`], an unbounded MPMC queue that allocates small buffers, segments, on demand.<sup>(alloc)</sup>
 
 #### Memory management
 
@@ -44,7 +44,7 @@
 
 *Features marked with <sup>(no_std)</sup> can be used in `no_std` environments.*<br/>
 *Features marked with <sup>(alloc)</sup> can be used in `no_std` environments, but only if `alloc`
-and `nightly` are enabled.*
+feature is enabled.*
 
 [`AtomicCell`]: https://docs.rs/crossbeam/*/crossbeam/atomic/struct.AtomicCell.html
 [`AtomicConsume`]: https://docs.rs/crossbeam/*/crossbeam/atomic/trait.AtomicConsume.html
@@ -87,7 +87,7 @@
 
 ```toml
 [dependencies]
-crossbeam = "0.7"
+crossbeam = "0.8"
 ```
 
 ## Compatibility
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,17 +45,22 @@
         allow(dead_code, unused_assignments, unused_variables)
     )
 ))]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
+#![warn(
+    missing_docs,
+    missing_debug_implementations,
+    rust_2018_idioms,
+    unreachable_pub
+)]
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
-// matches! requires Rust 1.42
-#![allow(clippy::match_like_matches_macro)]
 
-#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
 pub use crossbeam_utils::atomic;
 
-/// Miscellaneous utilities.
 pub mod utils {
+    //! Miscellaneous utilities.
+    //!
+    //! * [`Backoff`], for exponential backoff in spin loops.
+    //! * [`CachePadded`], for padding and aligning a value to the length of a cache line.
+
     pub use crossbeam_utils::Backoff;
     pub use crossbeam_utils::CachePadded;
 }
@@ -64,38 +69,28 @@
 
 cfg_if! {
     if #[cfg(feature = "alloc")] {
-        mod _epoch {
-            pub use crossbeam_epoch;
-        }
         #[doc(inline)]
-        pub use crate::_epoch::crossbeam_epoch as epoch;
+        pub use crossbeam_epoch as epoch;
 
-        mod _queue {
-            pub use crossbeam_queue;
-        }
         #[doc(inline)]
-        pub use crate::_queue::crossbeam_queue as queue;
+        pub use crossbeam_queue as queue;
     }
 }
 
 cfg_if! {
     if #[cfg(feature = "std")] {
-        mod _deque {
-            pub use crossbeam_deque;
-        }
         #[doc(inline)]
-        pub use crate::_deque::crossbeam_deque as deque;
+        pub use crossbeam_deque as deque;
 
-        mod _channel {
-            pub use crossbeam_channel;
-        }
         #[doc(inline)]
-        pub use crate::_channel::crossbeam_channel as channel;
-
+        pub use crossbeam_channel as channel;
         pub use crossbeam_channel::select;
 
         pub use crossbeam_utils::sync;
+
+        #[cfg(not(crossbeam_loom))]
         pub use crossbeam_utils::thread;
+        #[cfg(not(crossbeam_loom))]
         pub use crossbeam_utils::thread::scope;
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"0d433ba4c2a327604b582aa0cdbe7b841ee9dcca526f6cb368a07c389c485096","Cargo.lock":"97e544df9b9e169d315994dc220e7a274ac039a3a4f372f7cab333a2e93d9b96","Cargo.toml":"a493466e1330e58126818f0e46b82350ad9e6a7811ca6817159fcdd89c8c871a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"924a49392dc8304def57586be4ebd69aaf51e16fd245b55b4b69ad2cce6b715a","README.md":"d2c041f6fa5da30a6f87377421a8de4010c0c002dbff777e18ad2f8b36a65378","benches/crossbeam.rs":"f5720508d3458f2451271b9887f7557823304bd38288c928b0d6aa1f459865e5","examples/fibonacci.rs":"6a26ecd74c7493d2c93f4280c0804afc19adc612b77b3d9fea433119ff472a44","examples/matching.rs":"63c250e164607a7a9f643d46f107bb5da846d49e89cf9069909562d20e530f71","examples/stopwatch.rs":"87e4613e24083e877d97aaefdc6c78ee0308c3a2994974b2cbc7df042a82d488","src/channel.rs":"de23e68e7fa16a1e3278bd69f22fd499724e21533b2b601a71dada9cdda97181","src/context.rs":"ad24cabfc50dd5e6ae84aa46a0246da12da1f1a6fa19043244ad25136075c6ca","src/counter.rs":"8b6d4d69db59bc992ddc7ed33f709788c3fab482521bb1adf985f77499506c09","src/err.rs":"fdbde7279a1e74973e5c7d3e835a97836229a357fe465c0ba1a37f2a012d1bef","src/flavors/array.rs":"59d43e7292f5e3f7f1bb7799fdf99d97aae763ac93d2c1c2e0e807cbbae1657b","src/flavors/at.rs":"e6a169d91ee1057080b0ef55f3e38471212b4ef225e2cdc2fd25b2262371f921","src/flavors/list.rs":"fa6667a33e30fad94a8432b78dd70d143e0809ebf80fa881bb6221aca55b4229","src/flavors/mod.rs":"6188db53712b10add58364e3031101833d9fb0e384f3a2894c38c8b11abe4cdf","src/flavors/never.rs":"59ac4a46b5e32780b2b2f338064544a8b4ec1bc8b78a8a9cd0a683bcd01d5d36","src/flavors/tick.rs":"667fcaacb07d7556350a7e59b5906956224c57b1f43b7b0018a5e2dad0d91ff8","src/flavors/zero.rs":"97c13c89bce0ffd4f761a5ecd73e3221bdd320817061ef7bc7d76010da021b77","src/lib.rs":"5873568968cfd92c6970ef9c3b2643a9d68c61f2fe4c724e52243f3b555de758","src/select.rs":"da9446e51bdcc51e878e71d7a97f0b718639ea065d7ddf4fa7b561efebc84a0e","src/select_macro.rs":"96bc9acb9a22588a4e733b0ab0761ad2be9a6b3e03744e8fc9c6de9ae433b696","src/utils.rs":"4ec0d30835f42dffc7614a18c8f005abb40dd33f2b127809b297959c6aa43004","src/waker.rs":"27eb84dcd0eb58f7d0d79d412bb293becc2740f6166d2fc64acb0ad94cfb523e","tests/after.rs":"324c7d773f72bef62d150171f74ba7b7ac1b06f6030b3d4d2b1a35d211956b21","tests/array.rs":"62290dfd66740a1d1017daea8048df09a11ee8ff8eb614a3a0aa5f4d456a7c39","tests/golang.rs":"751743529b0354d152916e0854a0387ca0b3a898a1771c46e1e7fa2b1660edf9","tests/iter.rs":"7563dc7fdf4c63e31dd74ee3fedecdd3aed490f7ef599b98f6f75f929cf79edb","tests/list.rs":"6a9645c00aed88c1ad07d2e416b4f137ccef2e50f389c71589c6ac7d57373e5a","tests/mpsc.rs":"0c4c6b056f5cec77ca19eca45f99b083632700a4b67133e88071a1d22a61d6fe","tests/never.rs":"665441a9fb004f7cd44047619637ebe6766cf2faf58e68e6481397bbfc682e11","tests/ready.rs":"3848ee8bb16cc83269a462d830659ff29f91834eaab0749bca7be02f43d7db51","tests/same_channel.rs":"2bab761443671e841e1b2476bd8082d75533a2f6be7946f5dbcee67cdc82dccb","tests/select.rs":"58aa5421475bd98b3adc02e4241fc77669ca910cf9cac7a8b0a212b2e92cb7c7","tests/select_macro.rs":"00dd7963f79b96abf30851fdab29e86c8424b502a8a7d34abf4bc1714f493ecf","tests/thread_locals.rs":"3611db5502e6af0a8d15187d09fd195381819795544208b946e9f99b04579a81","tests/tick.rs":"06f205ace5fc44daaf1b6900a2e05bb5bda1c6071c1a07524f45769d8855968b","tests/zero.rs":"368eac99c6d9fb679f8dfbe93cdb96b01d77d1b6f840aa4e156b06f1786bb882"},"package":"dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"74ac49b84461217698d4430f81b1cdcba0595bc4e57216ffc52b8296ac44cd41","Cargo.lock":"7956079bcac40cc40c894f0260266365ecdb1c01c48636ae4c4080977603e7b8","Cargo.toml":"6a7acaffaa30dab2b5ea1f5ab86b20bc97370314ed03472288745b3b969786dc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"b16db96b93b1d7cf7bea533f572091ec6bca3234fbe0a83038be772ff391a44c","README.md":"415a71d4978cfd338a6ae1f1b41284652eccd277a815542c304647dc437a8274","benches/crossbeam.rs":"f5720508d3458f2451271b9887f7557823304bd38288c928b0d6aa1f459865e5","examples/fibonacci.rs":"6a26ecd74c7493d2c93f4280c0804afc19adc612b77b3d9fea433119ff472a44","examples/matching.rs":"63c250e164607a7a9f643d46f107bb5da846d49e89cf9069909562d20e530f71","examples/stopwatch.rs":"f9a00477b41823199e4af06bddeb0c6cfd22e272340eec1b98b333fc59ee6a1f","src/channel.rs":"a9baaad2f414c38cd324a60ac9375ca58462ce6662217683648e9b66cec43a8c","src/context.rs":"ad24cabfc50dd5e6ae84aa46a0246da12da1f1a6fa19043244ad25136075c6ca","src/counter.rs":"c49a9f44587888850edeb62f7c8ecd1acecb39c836834254ff3ac934c478440a","src/err.rs":"fdbde7279a1e74973e5c7d3e835a97836229a357fe465c0ba1a37f2a012d1bef","src/flavors/array.rs":"c125146771265058ac320226456b1e21667e93649531a3d20157f71cd715881d","src/flavors/at.rs":"65bf870b3ddb14738256706b0276f2656ad1fe9cd8eb91737489868edd088e92","src/flavors/list.rs":"50dbe59616c39b5aa184470023ce0cfb1cb0dbd92e1577375d299446981527c0","src/flavors/mod.rs":"3d9d43bc38b0adb18c96c995c2bd3421d8e33ab6c30b20c3c467d21d48e485dc","src/flavors/never.rs":"0e7921922d00c711552fb063c63c78192fa6ddc0762fb81c1713b847495ec39a","src/flavors/tick.rs":"38a479b9f4a72a5ccb9c407a1e7b44d36b6ad0f4e214e39266b12b9564c803dc","src/flavors/zero.rs":"1bda0c5483b04d53f36f9f4a6fe6f87b69f698068771e637e224c09400c6ce83","src/lib.rs":"3a65706d4124844ffc4c8cb1f8cc779631ec94f449f85cbb68364ad3619404f1","src/select.rs":"4eb4b1988c5dffff3e3d2138d14a1b86613bf62b78c45a5c70f65aaee92c11bb","src/select_macro.rs":"96bc9acb9a22588a4e733b0ab0761ad2be9a6b3e03744e8fc9c6de9ae433b696","src/utils.rs":"746fe315d6cfc832e3dda35e5055c0fd5c99907f1303b2ea7eacc4e37c8527e1","src/waker.rs":"9058cc441d467539c439ef88f0be1a187bf122d26fc116ce3e3a0265a693761f","tests/after.rs":"324c7d773f72bef62d150171f74ba7b7ac1b06f6030b3d4d2b1a35d211956b21","tests/array.rs":"574bff53aff0b0a8c365bf3f9ad77bb64675df9e6e0714be9c16eeeeac22e4d5","tests/golang.rs":"ec03806945fecd381cfce0634e2d776741423589c92e1bd4d8a431ac20f5d2d0","tests/iter.rs":"7563dc7fdf4c63e31dd74ee3fedecdd3aed490f7ef599b98f6f75f929cf79edb","tests/list.rs":"cc2971e69fd7f6a94b5463c9d4e9079df7955b37552e16dd66f4c6e65db60d96","tests/mpsc.rs":"0c4c6b056f5cec77ca19eca45f99b083632700a4b67133e88071a1d22a61d6fe","tests/never.rs":"665441a9fb004f7cd44047619637ebe6766cf2faf58e68e6481397bbfc682e11","tests/ready.rs":"eae3d7f16e817e63f3a6ceda062fece3de5e11c7a9631b32b02f23396a9d59c1","tests/same_channel.rs":"2bab761443671e841e1b2476bd8082d75533a2f6be7946f5dbcee67cdc82dccb","tests/select.rs":"3603f450b23f5e0d1e4014a167a9b23ab149b5f418c8b89636f1c02c90501569","tests/select_macro.rs":"00dd7963f79b96abf30851fdab29e86c8424b502a8a7d34abf4bc1714f493ecf","tests/thread_locals.rs":"3611db5502e6af0a8d15187d09fd195381819795544208b946e9f99b04579a81","tests/tick.rs":"dc4a7d3c8dd888ce135fe8a8c67f5dc8b5ab0c3fa57a48459f96d51fa0f1e6d5","tests/zero.rs":"0ff0587cc74569bfe389e0c619217799a960a0dfc5e6354603c88e6eea1b79a1"},"package":"06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "arc-swap"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
+version = 3
 
 [[package]]
 name = "autocfg"
@@ -14,27 +10,15 @@
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "const_fn"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2"
-
-[[package]]
 name = "crossbeam-channel"
-version = "0.5.0"
+version = "0.5.1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
  "num_cpus",
  "rand",
@@ -43,32 +27,31 @@
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
 dependencies = [
  "autocfg",
- "cfg-if 1.0.0",
- "const_fn",
+ "cfg-if",
  "lazy_static",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.1.15"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "libc",
  "wasi",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
  "libc",
 ]
@@ -81,9 +64,9 @@
 
 [[package]]
 name = "libc"
-version = "0.2.79"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
 
 [[package]]
 name = "num_cpus"
@@ -97,17 +80,16 @@
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "rand"
-version = "0.7.3"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
 dependencies = [
- "getrandom",
  "libc",
  "rand_chacha",
  "rand_core",
@@ -116,9 +98,9 @@
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
 dependencies = [
  "ppv-lite86",
  "rand_core",
@@ -126,27 +108,27 @@
 
 [[package]]
 name = "rand_core"
-version = "0.5.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
 dependencies = [
  "rand_core",
 ]
 
 [[package]]
 name = "signal-hook"
-version = "0.1.16"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed"
+checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -154,16 +136,15 @@
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035"
+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
 dependencies = [
- "arc-swap",
  "libc",
 ]
 
 [[package]]
 name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,12 +13,11 @@
 [package]
 edition = "2018"
 name = "crossbeam-channel"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["The Crossbeam Project Developers"]
 description = "Multi-producer multi-consumer channels for message passing"
 homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"
 documentation = "https://docs.rs/crossbeam-channel"
-readme = "README.md"
 keywords = ["channel", "mpmc", "select", "golang", "message"]
 categories = ["algorithms", "concurrency", "data-structures"]
 license = "MIT OR Apache-2.0"
@@ -34,10 +33,10 @@
 version = "1.13.0"
 
 [dev-dependencies.rand]
-version = "0.7.3"
+version = "0.8"
 
 [dev-dependencies.signal-hook]
-version = "0.1.15"
+version = "0.3"
 
 [features]
 default = ["std"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,7 @@
+# Version 0.5.1
+
+- Fix memory leak in unbounded channel. (#669)
+
 # Version 0.5.0
 
 - Bump the minimum supported Rust version to 1.36.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/examples/stopwatch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/examples/stopwatch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/examples/stopwatch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/examples/stopwatch.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,13 +12,13 @@
     use std::time::{Duration, Instant};
 
     use crossbeam_channel::{bounded, select, tick, Receiver};
+    use signal_hook::consts::SIGINT;
     use signal_hook::iterator::Signals;
-    use signal_hook::SIGINT;
 
     // Creates a channel that gets a message every time `SIGINT` is signalled.
     fn sigint_notifier() -> io::Result<Receiver<()>> {
         let (s, r) = bounded(100);
-        let signals = Signals::new(&[SIGINT])?;
+        let mut signals = Signals::new(&[SIGINT])?;
 
         thread::spawn(move || {
             for _ in signals.forever() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/LICENSE-THIRD-PARTY thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/LICENSE-THIRD-PARTY
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/LICENSE-THIRD-PARTY	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/LICENSE-THIRD-PARTY	2021-12-09 12:01:26.000000000 +0000
@@ -1,37 +1,5 @@
 ===============================================================================
 
-Bounded MPMC queue
-http://www.1024cores.net/home/code-license
-
-Copyright (c) 2010-2011 Dmitry Vyukov.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL DMITRY VYUKOV OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those
-of the authors and should not be interpreted as representing official policies,
-either expressed or implied, of Dmitry Vyukov.
-
-===============================================================================
-
 matching.go
 https://creativecommons.org/licenses/by/3.0/legalcode
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
 https://github.com/crossbeam-rs/crossbeam/actions)
-[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
+[![License](https://img.shields.io/badge/license-MIT_OR_Apache--2.0-blue.svg)](
 https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel#license)
 [![Cargo](https://img.shields.io/crates/v/crossbeam-channel.svg)](
 https://crates.io/crates/crossbeam-channel)
@@ -10,7 +10,7 @@
 https://docs.rs/crossbeam-channel)
 [![Rust 1.36+](https://img.shields.io/badge/rust-1.36+-lightgray.svg)](
 https://www.rust-lang.org)
-[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)
 
 This crate provides multi-producer multi-consumer channels for message passing.
 It is an alternative to [`std::sync::mpsc`] with more features and better performance.
@@ -41,7 +41,7 @@
 
 ```toml
 [dependencies]
-crossbeam-channel = "0.4"
+crossbeam-channel = "0.5"
 ```
 
 ## Compatibility
@@ -73,10 +73,6 @@
   [matching.go](http://www.nada.kth.se/~snilsson/concurrency/src/matching.go) by Stefan Nilsson,
   licensed under Creative Commons Attribution 3.0 Unported License.
 
-* [src/flavors/array.rs](src/flavors/array.rs) is based on
-  [Bounded MPMC queue](http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue)
-  by Dmitry Vyukov, licensed under the Simplified BSD License and the Apache License, Version 2.0.
-
 * [tests/mpsc.rs](tests/mpsc.rs) includes modifications of code from The Rust Programming Language,
   licensed under the MIT License and the Apache License, Version 2.0.
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/channel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/channel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/channel.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/channel.rs	2021-12-09 12:01:26.000000000 +0000
@@ -257,8 +257,6 @@
 ///     recv(timeout) -> _ => println!("timed out"),
 /// }
 /// ```
-///
-/// [`select!`]: macro.select.html
 pub fn never<T>() -> Receiver<T> {
     Receiver {
         flavor: ReceiverFlavor::Never(flavors::never::Channel::new()),
@@ -645,7 +643,7 @@
         unsafe {
             match &self.flavor {
                 SenderFlavor::Array(chan) => chan.release(|c| c.disconnect()),
-                SenderFlavor::List(chan) => chan.release(|c| c.disconnect()),
+                SenderFlavor::List(chan) => chan.release(|c| c.disconnect_senders()),
                 SenderFlavor::Zero(chan) => chan.release(|c| c.disconnect()),
             }
         }
@@ -1137,7 +1135,7 @@
         unsafe {
             match &self.flavor {
                 ReceiverFlavor::Array(chan) => chan.release(|c| c.disconnect()),
-                ReceiverFlavor::List(chan) => chan.release(|c| c.disconnect()),
+                ReceiverFlavor::List(chan) => chan.release(|c| c.disconnect_receivers()),
                 ReceiverFlavor::Zero(chan) => chan.release(|c| c.disconnect()),
                 ReceiverFlavor::At(_) => {}
                 ReceiverFlavor::Tick(_) => {}
@@ -1485,7 +1483,7 @@
 }
 
 /// Writes a message into the channel.
-pub unsafe fn write<T>(s: &Sender<T>, token: &mut Token, msg: T) -> Result<(), T> {
+pub(crate) unsafe fn write<T>(s: &Sender<T>, token: &mut Token, msg: T) -> Result<(), T> {
     match &s.flavor {
         SenderFlavor::Array(chan) => chan.write(token, msg),
         SenderFlavor::List(chan) => chan.write(token, msg),
@@ -1494,7 +1492,7 @@
 }
 
 /// Reads a message from the channel.
-pub unsafe fn read<T>(r: &Receiver<T>, token: &mut Token) -> Result<T, ()> {
+pub(crate) unsafe fn read<T>(r: &Receiver<T>, token: &mut Token) -> Result<T, ()> {
     match &r.flavor {
         ReceiverFlavor::Array(chan) => chan.read(token),
         ReceiverFlavor::List(chan) => chan.read(token),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/counter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/counter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/counter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/counter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -21,7 +21,7 @@
 }
 
 /// Wraps a channel into the reference counter.
-pub fn new<C>(chan: C) -> (Sender<C>, Receiver<C>) {
+pub(crate) fn new<C>(chan: C) -> (Sender<C>, Receiver<C>) {
     let counter = Box::into_raw(Box::new(Counter {
         senders: AtomicUsize::new(1),
         receivers: AtomicUsize::new(1),
@@ -34,7 +34,7 @@
 }
 
 /// The sending side.
-pub struct Sender<C> {
+pub(crate) struct Sender<C> {
     counter: *mut Counter<C>,
 }
 
@@ -45,7 +45,7 @@
     }
 
     /// Acquires another sender reference.
-    pub fn acquire(&self) -> Sender<C> {
+    pub(crate) fn acquire(&self) -> Sender<C> {
         let count = self.counter().senders.fetch_add(1, Ordering::Relaxed);
 
         // Cloning senders and calling `mem::forget` on the clones could potentially overflow the
@@ -63,7 +63,7 @@
     /// Releases the sender reference.
     ///
     /// Function `disconnect` will be called if this is the last sender reference.
-    pub unsafe fn release<F: FnOnce(&C) -> bool>(&self, disconnect: F) {
+    pub(crate) unsafe fn release<F: FnOnce(&C) -> bool>(&self, disconnect: F) {
         if self.counter().senders.fetch_sub(1, Ordering::AcqRel) == 1 {
             disconnect(&self.counter().chan);
 
@@ -89,7 +89,7 @@
 }
 
 /// The receiving side.
-pub struct Receiver<C> {
+pub(crate) struct Receiver<C> {
     counter: *mut Counter<C>,
 }
 
@@ -100,7 +100,7 @@
     }
 
     /// Acquires another receiver reference.
-    pub fn acquire(&self) -> Receiver<C> {
+    pub(crate) fn acquire(&self) -> Receiver<C> {
         let count = self.counter().receivers.fetch_add(1, Ordering::Relaxed);
 
         // Cloning receivers and calling `mem::forget` on the clones could potentially overflow the
@@ -118,7 +118,7 @@
     /// Releases the receiver reference.
     ///
     /// Function `disconnect` will be called if this is the last receiver reference.
-    pub unsafe fn release<F: FnOnce(&C) -> bool>(&self, disconnect: F) {
+    pub(crate) unsafe fn release<F: FnOnce(&C) -> bool>(&self, disconnect: F) {
         if self.counter().receivers.fetch_sub(1, Ordering::AcqRel) == 1 {
             disconnect(&self.counter().chan);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/array.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/array.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/array.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/array.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,13 +5,8 @@
 //! The implementation is based on Dmitry Vyukov's bounded MPMC queue.
 //!
 //! Source:
-//!   - http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
-//!   - https://docs.google.com/document/d/1yIAYmbvL3JxOKOjuCyon7JhW4cSv1wy5hC0ApeGMV9s/pub
-//!
-//! Copyright & License:
-//!   - Copyright (c) 2010-2011 Dmitry Vyukov
-//!   - Simplified BSD License and Apache License, Version 2.0
-//!   - http://www.1024cores.net/home/code-license
+//!   - <http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue>
+//!   - <https://docs.google.com/document/d/1yIAYmbvL3JxOKOjuCyon7JhW4cSv1wy5hC0ApeGMV9s/pub>
 
 use std::cell::UnsafeCell;
 use std::marker::PhantomData;
@@ -57,7 +52,7 @@
 }
 
 /// Bounded channel based on a preallocated array.
-pub struct Channel<T> {
+pub(crate) struct Channel<T> {
     /// The head of the channel.
     ///
     /// This value is a "stamp" consisting of an index into the buffer, a mark bit, and a lap, but
@@ -100,7 +95,7 @@
 
 impl<T> Channel<T> {
     /// Creates a bounded channel of capacity `cap`.
-    pub fn with_capacity(cap: usize) -> Self {
+    pub(crate) fn with_capacity(cap: usize) -> Self {
         assert!(cap > 0, "capacity must be positive");
 
         // Compute constants `mark_bit` and `one_lap`.
@@ -143,12 +138,12 @@
     }
 
     /// Returns a receiver handle to the channel.
-    pub fn receiver(&self) -> Receiver<'_, T> {
+    pub(crate) fn receiver(&self) -> Receiver<'_, T> {
         Receiver(self)
     }
 
     /// Returns a sender handle to the channel.
-    pub fn sender(&self) -> Sender<'_, T> {
+    pub(crate) fn sender(&self) -> Sender<'_, T> {
         Sender(self)
     }
 
@@ -224,7 +219,7 @@
     }
 
     /// Writes a message into the channel.
-    pub unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
+    pub(crate) unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
         // If there is no slot, the channel is disconnected.
         if token.array.slot.is_null() {
             return Err(msg);
@@ -314,7 +309,7 @@
     }
 
     /// Reads a message from the channel.
-    pub unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
+    pub(crate) unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
         if token.array.slot.is_null() {
             // The channel is disconnected.
             return Err(());
@@ -332,7 +327,7 @@
     }
 
     /// Attempts to send a message into the channel.
-    pub fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
+    pub(crate) fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
         let token = &mut Token::default();
         if self.start_send(token) {
             unsafe { self.write(token, msg).map_err(TrySendError::Disconnected) }
@@ -342,7 +337,11 @@
     }
 
     /// Sends a message into the channel.
-    pub fn send(&self, msg: T, deadline: Option<Instant>) -> Result<(), SendTimeoutError<T>> {
+    pub(crate) fn send(
+        &self,
+        msg: T,
+        deadline: Option<Instant>,
+    ) -> Result<(), SendTimeoutError<T>> {
         let token = &mut Token::default();
         loop {
             // Try sending a message several times.
@@ -391,7 +390,7 @@
     }
 
     /// Attempts to receive a message without blocking.
-    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+    pub(crate) fn try_recv(&self) -> Result<T, TryRecvError> {
         let token = &mut Token::default();
 
         if self.start_recv(token) {
@@ -402,7 +401,7 @@
     }
 
     /// Receives a message from the channel.
-    pub fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
+    pub(crate) fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
         let token = &mut Token::default();
         loop {
             // Try receiving a message several times.
@@ -453,7 +452,7 @@
     }
 
     /// Returns the current number of messages inside the channel.
-    pub fn len(&self) -> usize {
+    pub(crate) fn len(&self) -> usize {
         loop {
             // Load the tail, then load the head.
             let tail = self.tail.load(Ordering::SeqCst);
@@ -478,14 +477,15 @@
     }
 
     /// Returns the capacity of the channel.
-    pub fn capacity(&self) -> Option<usize> {
+    #[allow(clippy::unnecessary_wraps)] // This is intentional.
+    pub(crate) fn capacity(&self) -> Option<usize> {
         Some(self.cap)
     }
 
     /// Disconnects the channel and wakes up all blocked senders and receivers.
     ///
     /// Returns `true` if this call disconnected the channel.
-    pub fn disconnect(&self) -> bool {
+    pub(crate) fn disconnect(&self) -> bool {
         let tail = self.tail.fetch_or(self.mark_bit, Ordering::SeqCst);
 
         if tail & self.mark_bit == 0 {
@@ -498,12 +498,12 @@
     }
 
     /// Returns `true` if the channel is disconnected.
-    pub fn is_disconnected(&self) -> bool {
+    pub(crate) fn is_disconnected(&self) -> bool {
         self.tail.load(Ordering::SeqCst) & self.mark_bit != 0
     }
 
     /// Returns `true` if the channel is empty.
-    pub fn is_empty(&self) -> bool {
+    pub(crate) fn is_empty(&self) -> bool {
         let head = self.head.load(Ordering::SeqCst);
         let tail = self.tail.load(Ordering::SeqCst);
 
@@ -515,7 +515,7 @@
     }
 
     /// Returns `true` if the channel is full.
-    pub fn is_full(&self) -> bool {
+    pub(crate) fn is_full(&self) -> bool {
         let tail = self.tail.load(Ordering::SeqCst);
         let head = self.head.load(Ordering::SeqCst);
 
@@ -563,10 +563,10 @@
 }
 
 /// Receiver handle to a channel.
-pub struct Receiver<'a, T>(&'a Channel<T>);
+pub(crate) struct Receiver<'a, T>(&'a Channel<T>);
 
 /// Sender handle to a channel.
-pub struct Sender<'a, T>(&'a Channel<T>);
+pub(crate) struct Sender<'a, T>(&'a Channel<T>);
 
 impl<T> SelectHandle for Receiver<'_, T> {
     fn try_select(&self, token: &mut Token) -> bool {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/at.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/at.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/at.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/at.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,10 +12,10 @@
 use crate::utils;
 
 /// Result of a receive operation.
-pub type AtToken = Option<Instant>;
+pub(crate) type AtToken = Option<Instant>;
 
 /// Channel that delivers a message at a certain moment in time
-pub struct Channel {
+pub(crate) struct Channel {
     /// The instant at which the message will be delivered.
     delivery_time: Instant,
 
@@ -26,7 +26,7 @@
 impl Channel {
     /// Creates a channel that delivers a message at a certain instant in time.
     #[inline]
-    pub fn new_deadline(when: Instant) -> Self {
+    pub(crate) fn new_deadline(when: Instant) -> Self {
         Channel {
             delivery_time: when,
             received: AtomicBool::new(false),
@@ -34,13 +34,13 @@
     }
     /// Creates a channel that delivers a message after a certain duration of time.
     #[inline]
-    pub fn new_timeout(dur: Duration) -> Self {
+    pub(crate) fn new_timeout(dur: Duration) -> Self {
         Self::new_deadline(Instant::now() + dur)
     }
 
     /// Attempts to receive a message without blocking.
     #[inline]
-    pub fn try_recv(&self) -> Result<Instant, TryRecvError> {
+    pub(crate) fn try_recv(&self) -> Result<Instant, TryRecvError> {
         // We use relaxed ordering because this is just an optional optimistic check.
         if self.received.load(Ordering::Relaxed) {
             // The message has already been received.
@@ -64,7 +64,7 @@
 
     /// Receives a message from the channel.
     #[inline]
-    pub fn recv(&self, deadline: Option<Instant>) -> Result<Instant, RecvTimeoutError> {
+    pub(crate) fn recv(&self, deadline: Option<Instant>) -> Result<Instant, RecvTimeoutError> {
         // We use relaxed ordering because this is just an optional optimistic check.
         if self.received.load(Ordering::Relaxed) {
             // The message has already been received.
@@ -103,13 +103,13 @@
 
     /// Reads a message from the channel.
     #[inline]
-    pub unsafe fn read(&self, token: &mut Token) -> Result<Instant, ()> {
+    pub(crate) unsafe fn read(&self, token: &mut Token) -> Result<Instant, ()> {
         token.at.ok_or(())
     }
 
     /// Returns `true` if the channel is empty.
     #[inline]
-    pub fn is_empty(&self) -> bool {
+    pub(crate) fn is_empty(&self) -> bool {
         // We use relaxed ordering because this is just an optional optimistic check.
         if self.received.load(Ordering::Relaxed) {
             return true;
@@ -127,13 +127,13 @@
 
     /// Returns `true` if the channel is full.
     #[inline]
-    pub fn is_full(&self) -> bool {
+    pub(crate) fn is_full(&self) -> bool {
         !self.is_empty()
     }
 
     /// Returns the number of messages in the channel.
     #[inline]
-    pub fn len(&self) -> usize {
+    pub(crate) fn len(&self) -> usize {
         if self.is_empty() {
             0
         } else {
@@ -142,8 +142,9 @@
     }
 
     /// Returns the capacity of the channel.
+    #[allow(clippy::unnecessary_wraps)] // This is intentional.
     #[inline]
-    pub fn capacity(&self) -> Option<usize> {
+    pub(crate) fn capacity(&self) -> Option<usize> {
         Some(1)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/list.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -151,7 +151,7 @@
 ///
 /// Consecutive messages are grouped into blocks in order to put less pressure on the allocator and
 /// improve cache efficiency.
-pub struct Channel<T> {
+pub(crate) struct Channel<T> {
     /// The head of the channel.
     head: CachePadded<Position<T>>,
 
@@ -167,7 +167,7 @@
 
 impl<T> Channel<T> {
     /// Creates a new unbounded channel.
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         Channel {
             head: CachePadded::new(Position {
                 block: AtomicPtr::new(ptr::null_mut()),
@@ -183,12 +183,12 @@
     }
 
     /// Returns a receiver handle to the channel.
-    pub fn receiver(&self) -> Receiver<'_, T> {
+    pub(crate) fn receiver(&self) -> Receiver<'_, T> {
         Receiver(self)
     }
 
     /// Returns a sender handle to the channel.
-    pub fn sender(&self) -> Sender<'_, T> {
+    pub(crate) fn sender(&self) -> Sender<'_, T> {
         Sender(self)
     }
 
@@ -231,8 +231,8 @@
                 if self
                     .tail
                     .block
-                    .compare_and_swap(block, new, Ordering::Release)
-                    == block
+                    .compare_exchange(block, new, Ordering::Release, Ordering::Relaxed)
+                    .is_ok()
                 {
                     self.head.block.store(new, Ordering::Release);
                     block = new;
@@ -276,7 +276,7 @@
     }
 
     /// Writes a message into the channel.
-    pub unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
+    pub(crate) unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
         // If there is no slot, the channel is disconnected.
         if token.list.block.is_null() {
             return Err(msg);
@@ -380,7 +380,7 @@
     }
 
     /// Reads a message from the channel.
-    pub unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
+    pub(crate) unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
         if token.list.block.is_null() {
             // The channel is disconnected.
             return Err(());
@@ -405,7 +405,7 @@
     }
 
     /// Attempts to send a message into the channel.
-    pub fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
+    pub(crate) fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
         self.send(msg, None).map_err(|err| match err {
             SendTimeoutError::Disconnected(msg) => TrySendError::Disconnected(msg),
             SendTimeoutError::Timeout(_) => unreachable!(),
@@ -413,7 +413,11 @@
     }
 
     /// Sends a message into the channel.
-    pub fn send(&self, msg: T, _deadline: Option<Instant>) -> Result<(), SendTimeoutError<T>> {
+    pub(crate) fn send(
+        &self,
+        msg: T,
+        _deadline: Option<Instant>,
+    ) -> Result<(), SendTimeoutError<T>> {
         let token = &mut Token::default();
         assert!(self.start_send(token));
         unsafe {
@@ -423,7 +427,7 @@
     }
 
     /// Attempts to receive a message without blocking.
-    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+    pub(crate) fn try_recv(&self) -> Result<T, TryRecvError> {
         let token = &mut Token::default();
 
         if self.start_recv(token) {
@@ -434,7 +438,7 @@
     }
 
     /// Receives a message from the channel.
-    pub fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
+    pub(crate) fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
         let token = &mut Token::default();
         loop {
             // Try receiving a message several times.
@@ -486,7 +490,7 @@
     }
 
     /// Returns the current number of messages inside the channel.
-    pub fn len(&self) -> usize {
+    pub(crate) fn len(&self) -> usize {
         loop {
             // Load the tail index, then load the head index.
             let mut tail = self.tail.index.load(Ordering::SeqCst);
@@ -522,14 +526,14 @@
     }
 
     /// Returns the capacity of the channel.
-    pub fn capacity(&self) -> Option<usize> {
+    pub(crate) fn capacity(&self) -> Option<usize> {
         None
     }
 
-    /// Disconnects the channel and wakes up all blocked receivers.
+    /// Disconnects senders and wakes up all blocked receivers.
     ///
     /// Returns `true` if this call disconnected the channel.
-    pub fn disconnect(&self) -> bool {
+    pub(crate) fn disconnect_senders(&self) -> bool {
         let tail = self.tail.index.fetch_or(MARK_BIT, Ordering::SeqCst);
 
         if tail & MARK_BIT == 0 {
@@ -540,20 +544,90 @@
         }
     }
 
+    /// Disconnects receivers.
+    ///
+    /// Returns `true` if this call disconnected the channel.
+    pub(crate) fn disconnect_receivers(&self) -> bool {
+        let tail = self.tail.index.fetch_or(MARK_BIT, Ordering::SeqCst);
+
+        if tail & MARK_BIT == 0 {
+            // If receivers are dropped first, discard all messages to free
+            // memory eagerly.
+            self.discard_all_messages();
+            true
+        } else {
+            false
+        }
+    }
+
+    /// Discards all messages.
+    ///
+    /// This method should only be called when all receivers are dropped.
+    fn discard_all_messages(&self) {
+        let backoff = Backoff::new();
+        let mut tail = self.tail.index.load(Ordering::Acquire);
+        loop {
+            let offset = (tail >> SHIFT) % LAP;
+            if offset != BLOCK_CAP {
+                break;
+            }
+
+            // New updates to tail will be rejected by MARK_BIT and aborted unless it's
+            // at boundary. We need to wait for the updates take affect otherwise there
+            // can be memory leaks.
+            backoff.snooze();
+            tail = self.tail.index.load(Ordering::Acquire);
+        }
+
+        let mut head = self.head.index.load(Ordering::Acquire);
+        let mut block = self.head.block.load(Ordering::Acquire);
+
+        unsafe {
+            // Drop all messages between head and tail and deallocate the heap-allocated blocks.
+            while head >> SHIFT != tail >> SHIFT {
+                let offset = (head >> SHIFT) % LAP;
+
+                if offset < BLOCK_CAP {
+                    // Drop the message in the slot.
+                    let slot = (*block).slots.get_unchecked(offset);
+                    slot.wait_write();
+                    let p = &mut *slot.msg.get();
+                    p.as_mut_ptr().drop_in_place();
+                } else {
+                    (*block).wait_next();
+                    // Deallocate the block and move to the next one.
+                    let next = (*block).next.load(Ordering::Acquire);
+                    drop(Box::from_raw(block));
+                    block = next;
+                }
+
+                head = head.wrapping_add(1 << SHIFT);
+            }
+
+            // Deallocate the last remaining block.
+            if !block.is_null() {
+                drop(Box::from_raw(block));
+            }
+        }
+        head &= !MARK_BIT;
+        self.head.block.store(ptr::null_mut(), Ordering::Release);
+        self.head.index.store(head, Ordering::Release);
+    }
+
     /// Returns `true` if the channel is disconnected.
-    pub fn is_disconnected(&self) -> bool {
+    pub(crate) fn is_disconnected(&self) -> bool {
         self.tail.index.load(Ordering::SeqCst) & MARK_BIT != 0
     }
 
     /// Returns `true` if the channel is empty.
-    pub fn is_empty(&self) -> bool {
+    pub(crate) fn is_empty(&self) -> bool {
         let head = self.head.index.load(Ordering::SeqCst);
         let tail = self.tail.index.load(Ordering::SeqCst);
         head >> SHIFT == tail >> SHIFT
     }
 
     /// Returns `true` if the channel is full.
-    pub fn is_full(&self) -> bool {
+    pub(crate) fn is_full(&self) -> bool {
         false
     }
 }
@@ -597,10 +671,10 @@
 }
 
 /// Receiver handle to a channel.
-pub struct Receiver<'a, T>(&'a Channel<T>);
+pub(crate) struct Receiver<'a, T>(&'a Channel<T>);
 
 /// Sender handle to a channel.
-pub struct Sender<'a, T>(&'a Channel<T>);
+pub(crate) struct Sender<'a, T>(&'a Channel<T>);
 
 impl<T> SelectHandle for Receiver<'_, T> {
     fn try_select(&self, token: &mut Token) -> bool {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,9 +9,9 @@
 //! 5. `tick` - Channel that delivers messages periodically.
 //! 6. `zero` - Zero-capacity channel.
 
-pub mod array;
-pub mod at;
-pub mod list;
-pub mod never;
-pub mod tick;
-pub mod zero;
+pub(crate) mod array;
+pub(crate) mod at;
+pub(crate) mod list;
+pub(crate) mod never;
+pub(crate) mod tick;
+pub(crate) mod zero;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/never.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/never.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/never.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/never.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,17 +11,17 @@
 use crate::utils;
 
 /// This flavor doesn't need a token.
-pub type NeverToken = ();
+pub(crate) type NeverToken = ();
 
 /// Channel that never delivers messages.
-pub struct Channel<T> {
+pub(crate) struct Channel<T> {
     _marker: PhantomData<T>,
 }
 
 impl<T> Channel<T> {
     /// Creates a channel that never delivers messages.
     #[inline]
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         Channel {
             _marker: PhantomData,
         }
@@ -29,44 +29,45 @@
 
     /// Attempts to receive a message without blocking.
     #[inline]
-    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+    pub(crate) fn try_recv(&self) -> Result<T, TryRecvError> {
         Err(TryRecvError::Empty)
     }
 
     /// Receives a message from the channel.
     #[inline]
-    pub fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
+    pub(crate) fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
         utils::sleep_until(deadline);
         Err(RecvTimeoutError::Timeout)
     }
 
     /// Reads a message from the channel.
     #[inline]
-    pub unsafe fn read(&self, _token: &mut Token) -> Result<T, ()> {
+    pub(crate) unsafe fn read(&self, _token: &mut Token) -> Result<T, ()> {
         Err(())
     }
 
     /// Returns `true` if the channel is empty.
     #[inline]
-    pub fn is_empty(&self) -> bool {
+    pub(crate) fn is_empty(&self) -> bool {
         true
     }
 
     /// Returns `true` if the channel is full.
     #[inline]
-    pub fn is_full(&self) -> bool {
+    pub(crate) fn is_full(&self) -> bool {
         true
     }
 
     /// Returns the number of messages in the channel.
     #[inline]
-    pub fn len(&self) -> usize {
+    pub(crate) fn len(&self) -> usize {
         0
     }
 
     /// Returns the capacity of the channel.
+    #[allow(clippy::unnecessary_wraps)] // This is intentional.
     #[inline]
-    pub fn capacity(&self) -> Option<usize> {
+    pub(crate) fn capacity(&self) -> Option<usize> {
         Some(0)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/tick.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/tick.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/tick.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/tick.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,10 +12,10 @@
 use crate::select::{Operation, SelectHandle, Token};
 
 /// Result of a receive operation.
-pub type TickToken = Option<Instant>;
+pub(crate) type TickToken = Option<Instant>;
 
 /// Channel that delivers messages periodically.
-pub struct Channel {
+pub(crate) struct Channel {
     /// The instant at which the next message will be delivered.
     delivery_time: AtomicCell<Instant>,
 
@@ -26,7 +26,7 @@
 impl Channel {
     /// Creates a channel that delivers messages periodically.
     #[inline]
-    pub fn new(dur: Duration) -> Self {
+    pub(crate) fn new(dur: Duration) -> Self {
         Channel {
             delivery_time: AtomicCell::new(Instant::now() + dur),
             duration: dur,
@@ -35,7 +35,7 @@
 
     /// Attempts to receive a message without blocking.
     #[inline]
-    pub fn try_recv(&self) -> Result<Instant, TryRecvError> {
+    pub(crate) fn try_recv(&self) -> Result<Instant, TryRecvError> {
         loop {
             let now = Instant::now();
             let delivery_time = self.delivery_time.load();
@@ -56,7 +56,7 @@
 
     /// Receives a message from the channel.
     #[inline]
-    pub fn recv(&self, deadline: Option<Instant>) -> Result<Instant, RecvTimeoutError> {
+    pub(crate) fn recv(&self, deadline: Option<Instant>) -> Result<Instant, RecvTimeoutError> {
         loop {
             let delivery_time = self.delivery_time.load();
             let now = Instant::now();
@@ -85,25 +85,25 @@
 
     /// Reads a message from the channel.
     #[inline]
-    pub unsafe fn read(&self, token: &mut Token) -> Result<Instant, ()> {
+    pub(crate) unsafe fn read(&self, token: &mut Token) -> Result<Instant, ()> {
         token.tick.ok_or(())
     }
 
     /// Returns `true` if the channel is empty.
     #[inline]
-    pub fn is_empty(&self) -> bool {
+    pub(crate) fn is_empty(&self) -> bool {
         Instant::now() < self.delivery_time.load()
     }
 
     /// Returns `true` if the channel is full.
     #[inline]
-    pub fn is_full(&self) -> bool {
+    pub(crate) fn is_full(&self) -> bool {
         !self.is_empty()
     }
 
     /// Returns the number of messages in the channel.
     #[inline]
-    pub fn len(&self) -> usize {
+    pub(crate) fn len(&self) -> usize {
         if self.is_empty() {
             0
         } else {
@@ -112,8 +112,9 @@
     }
 
     /// Returns the capacity of the channel.
+    #[allow(clippy::unnecessary_wraps)] // This is intentional.
     #[inline]
-    pub fn capacity(&self) -> Option<usize> {
+    pub(crate) fn capacity(&self) -> Option<usize> {
         Some(1)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/zero.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/zero.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/zero.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/flavors/zero.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,7 +16,7 @@
 use crate::waker::Waker;
 
 /// A pointer to a packet.
-pub type ZeroToken = usize;
+pub(crate) type ZeroToken = usize;
 
 /// A slot for passing one message from a sender to a receiver.
 struct Packet<T> {
@@ -80,7 +80,7 @@
 }
 
 /// Zero-capacity channel.
-pub struct Channel<T> {
+pub(crate) struct Channel<T> {
     /// Inner representation of the channel.
     inner: Spinlock<Inner>,
 
@@ -90,7 +90,7 @@
 
 impl<T> Channel<T> {
     /// Constructs a new zero-capacity channel.
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         Channel {
             inner: Spinlock::new(Inner {
                 senders: Waker::new(),
@@ -102,12 +102,12 @@
     }
 
     /// Returns a receiver handle to the channel.
-    pub fn receiver(&self) -> Receiver<'_, T> {
+    pub(crate) fn receiver(&self) -> Receiver<'_, T> {
         Receiver(self)
     }
 
     /// Returns a sender handle to the channel.
-    pub fn sender(&self) -> Sender<'_, T> {
+    pub(crate) fn sender(&self) -> Sender<'_, T> {
         Sender(self)
     }
 
@@ -128,7 +128,7 @@
     }
 
     /// Writes a message into the packet.
-    pub unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
+    pub(crate) unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
         // If there is no packet, the channel is disconnected.
         if token.zero == 0 {
             return Err(msg);
@@ -157,7 +157,7 @@
     }
 
     /// Reads a message from the packet.
-    pub unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
+    pub(crate) unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
         // If there is no packet, the channel is disconnected.
         if token.zero == 0 {
             return Err(());
@@ -183,7 +183,7 @@
     }
 
     /// Attempts to send a message into the channel.
-    pub fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
+    pub(crate) fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
         let token = &mut Token::default();
         let mut inner = self.inner.lock();
 
@@ -203,7 +203,11 @@
     }
 
     /// Sends a message into the channel.
-    pub fn send(&self, msg: T, deadline: Option<Instant>) -> Result<(), SendTimeoutError<T>> {
+    pub(crate) fn send(
+        &self,
+        msg: T,
+        deadline: Option<Instant>,
+    ) -> Result<(), SendTimeoutError<T>> {
         let token = &mut Token::default();
         let mut inner = self.inner.lock();
 
@@ -256,7 +260,7 @@
     }
 
     /// Attempts to receive a message without blocking.
-    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+    pub(crate) fn try_recv(&self) -> Result<T, TryRecvError> {
         let token = &mut Token::default();
         let mut inner = self.inner.lock();
 
@@ -273,7 +277,7 @@
     }
 
     /// Receives a message from the channel.
-    pub fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
+    pub(crate) fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
         let token = &mut Token::default();
         let mut inner = self.inner.lock();
 
@@ -325,7 +329,7 @@
     /// Disconnects the channel and wakes up all blocked senders and receivers.
     ///
     /// Returns `true` if this call disconnected the channel.
-    pub fn disconnect(&self) -> bool {
+    pub(crate) fn disconnect(&self) -> bool {
         let mut inner = self.inner.lock();
 
         if !inner.is_disconnected {
@@ -339,31 +343,32 @@
     }
 
     /// Returns the current number of messages inside the channel.
-    pub fn len(&self) -> usize {
+    pub(crate) fn len(&self) -> usize {
         0
     }
 
     /// Returns the capacity of the channel.
-    pub fn capacity(&self) -> Option<usize> {
+    #[allow(clippy::unnecessary_wraps)] // This is intentional.
+    pub(crate) fn capacity(&self) -> Option<usize> {
         Some(0)
     }
 
     /// Returns `true` if the channel is empty.
-    pub fn is_empty(&self) -> bool {
+    pub(crate) fn is_empty(&self) -> bool {
         true
     }
 
     /// Returns `true` if the channel is full.
-    pub fn is_full(&self) -> bool {
+    pub(crate) fn is_full(&self) -> bool {
         true
     }
 }
 
 /// Receiver handle to a channel.
-pub struct Receiver<'a, T>(&'a Channel<T>);
+pub(crate) struct Receiver<'a, T>(&'a Channel<T>);
 
 /// Sender handle to a channel.
-pub struct Sender<'a, T>(&'a Channel<T>);
+pub(crate) struct Sender<'a, T>(&'a Channel<T>);
 
 impl<T> SelectHandle for Receiver<'_, T> {
     fn try_select(&self, token: &mut Token) -> bool {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -294,7 +294,7 @@
 //!
 //! * [`after`] creates a channel that delivers a single message after a certain duration of time.
 //! * [`tick`] creates a channel that delivers messages periodically.
-//! * [`never`] creates a channel that never delivers messages.
+//! * [`never`](never()) creates a channel that never delivers messages.
 //!
 //! These channels are very efficient because messages get lazily generated on receive operations.
 //!
@@ -328,10 +328,13 @@
         allow(dead_code, unused_assignments, unused_variables)
     )
 ))]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
+#![warn(
+    missing_docs,
+    missing_debug_implementations,
+    rust_2018_idioms,
+    unreachable_pub
+)]
 #![cfg_attr(not(feature = "std"), no_std)]
-// matches! requires Rust 1.42
-#![allow(clippy::match_like_matches_macro)]
 
 use cfg_if::cfg_if;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/select.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -486,7 +486,7 @@
 
 /// Blocks until a given deadline, or until one of the operations becomes ready and selects it.
 #[inline]
-pub fn select_deadline<'a>(
+pub(crate) fn select_deadline<'a>(
     handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
     deadline: Instant,
 ) -> Result<SelectedOperation<'a>, SelectTimeoutError> {
@@ -864,9 +864,6 @@
     /// The selected operation must be completed with [`SelectedOperation::send`]
     /// or [`SelectedOperation::recv`].
     ///
-    /// [`SelectedOperation::send`]: struct.SelectedOperation.html#method.send
-    /// [`SelectedOperation::recv`]: struct.SelectedOperation.html#method.recv
-    ///
     /// # Examples
     ///
     /// ```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/utils.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
 use crossbeam_utils::Backoff;
 
 /// Randomly shuffles a slice.
-pub fn shuffle<T>(v: &mut [T]) {
+pub(crate) fn shuffle<T>(v: &mut [T]) {
     let len = v.len();
     if len <= 1 {
         return;
@@ -46,7 +46,7 @@
 }
 
 /// Sleeps until the deadline, or forever if the deadline isn't specified.
-pub fn sleep_until(deadline: Option<Instant>) {
+pub(crate) fn sleep_until(deadline: Option<Instant>) {
     loop {
         match deadline {
             None => thread::sleep(Duration::from_secs(1000)),
@@ -62,14 +62,14 @@
 }
 
 /// A simple spinlock.
-pub struct Spinlock<T> {
+pub(crate) struct Spinlock<T> {
     flag: AtomicBool,
     value: UnsafeCell<T>,
 }
 
 impl<T> Spinlock<T> {
     /// Returns a new spinlock initialized with `value`.
-    pub fn new(value: T) -> Spinlock<T> {
+    pub(crate) fn new(value: T) -> Spinlock<T> {
         Spinlock {
             flag: AtomicBool::new(false),
             value: UnsafeCell::new(value),
@@ -77,7 +77,7 @@
     }
 
     /// Locks the spinlock.
-    pub fn lock(&self) -> SpinlockGuard<'_, T> {
+    pub(crate) fn lock(&self) -> SpinlockGuard<'_, T> {
         let backoff = Backoff::new();
         while self.flag.swap(true, Ordering::Acquire) {
             backoff.snooze();
@@ -87,7 +87,7 @@
 }
 
 /// A guard holding a spinlock locked.
-pub struct SpinlockGuard<'a, T> {
+pub(crate) struct SpinlockGuard<'a, T> {
     parent: &'a Spinlock<T>,
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/src/waker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/src/waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,22 +8,22 @@
 use crate::utils::Spinlock;
 
 /// Represents a thread blocked on a specific channel operation.
-pub struct Entry {
+pub(crate) struct Entry {
     /// The operation.
-    pub oper: Operation,
+    pub(crate) oper: Operation,
 
     /// Optional packet.
-    pub packet: usize,
+    pub(crate) packet: usize,
 
     /// Context associated with the thread owning this operation.
-    pub cx: Context,
+    pub(crate) cx: Context,
 }
 
 /// A queue of threads blocked on channel operations.
 ///
 /// This data structure is used by threads to register blocking operations and get woken up once
 /// an operation becomes ready.
-pub struct Waker {
+pub(crate) struct Waker {
     /// A list of select operations.
     selectors: Vec<Entry>,
 
@@ -34,7 +34,7 @@
 impl Waker {
     /// Creates a new `Waker`.
     #[inline]
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         Waker {
             selectors: Vec::new(),
             observers: Vec::new(),
@@ -43,13 +43,13 @@
 
     /// Registers a select operation.
     #[inline]
-    pub fn register(&mut self, oper: Operation, cx: &Context) {
+    pub(crate) fn register(&mut self, oper: Operation, cx: &Context) {
         self.register_with_packet(oper, 0, cx);
     }
 
     /// Registers a select operation and a packet.
     #[inline]
-    pub fn register_with_packet(&mut self, oper: Operation, packet: usize, cx: &Context) {
+    pub(crate) fn register_with_packet(&mut self, oper: Operation, packet: usize, cx: &Context) {
         self.selectors.push(Entry {
             oper,
             packet,
@@ -59,7 +59,7 @@
 
     /// Unregisters a select operation.
     #[inline]
-    pub fn unregister(&mut self, oper: Operation) -> Option<Entry> {
+    pub(crate) fn unregister(&mut self, oper: Operation) -> Option<Entry> {
         if let Some((i, _)) = self
             .selectors
             .iter()
@@ -75,7 +75,7 @@
 
     /// Attempts to find another thread's entry, select the operation, and wake it up.
     #[inline]
-    pub fn try_select(&mut self) -> Option<Entry> {
+    pub(crate) fn try_select(&mut self) -> Option<Entry> {
         let mut entry = None;
 
         if !self.selectors.is_empty() {
@@ -108,7 +108,7 @@
 
     /// Returns `true` if there is an entry which can be selected by the current thread.
     #[inline]
-    pub fn can_select(&self) -> bool {
+    pub(crate) fn can_select(&self) -> bool {
         if self.selectors.is_empty() {
             false
         } else {
@@ -122,7 +122,7 @@
 
     /// Registers an operation waiting to be ready.
     #[inline]
-    pub fn watch(&mut self, oper: Operation, cx: &Context) {
+    pub(crate) fn watch(&mut self, oper: Operation, cx: &Context) {
         self.observers.push(Entry {
             oper,
             packet: 0,
@@ -132,13 +132,13 @@
 
     /// Unregisters an operation waiting to be ready.
     #[inline]
-    pub fn unwatch(&mut self, oper: Operation) {
+    pub(crate) fn unwatch(&mut self, oper: Operation) {
         self.observers.retain(|e| e.oper != oper);
     }
 
     /// Notifies all operations waiting to be ready.
     #[inline]
-    pub fn notify(&mut self) {
+    pub(crate) fn notify(&mut self) {
         for entry in self.observers.drain(..) {
             if entry.cx.try_select(Selected::Operation(entry.oper)).is_ok() {
                 entry.cx.unpark();
@@ -148,7 +148,7 @@
 
     /// Notifies all registered operations that the channel is disconnected.
     #[inline]
-    pub fn disconnect(&mut self) {
+    pub(crate) fn disconnect(&mut self) {
         for entry in self.selectors.iter() {
             if entry.cx.try_select(Selected::Disconnected).is_ok() {
                 // Wake the thread up.
@@ -175,7 +175,7 @@
 /// A waker that can be shared among threads without locking.
 ///
 /// This is a simple wrapper around `Waker` that internally uses a mutex for synchronization.
-pub struct SyncWaker {
+pub(crate) struct SyncWaker {
     /// The inner `Waker`.
     inner: Spinlock<Waker>,
 
@@ -186,7 +186,7 @@
 impl SyncWaker {
     /// Creates a new `SyncWaker`.
     #[inline]
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         SyncWaker {
             inner: Spinlock::new(Waker::new()),
             is_empty: AtomicBool::new(true),
@@ -195,7 +195,7 @@
 
     /// Registers the current thread with an operation.
     #[inline]
-    pub fn register(&self, oper: Operation, cx: &Context) {
+    pub(crate) fn register(&self, oper: Operation, cx: &Context) {
         let mut inner = self.inner.lock();
         inner.register(oper, cx);
         self.is_empty.store(
@@ -206,7 +206,7 @@
 
     /// Unregisters an operation previously registered by the current thread.
     #[inline]
-    pub fn unregister(&self, oper: Operation) -> Option<Entry> {
+    pub(crate) fn unregister(&self, oper: Operation) -> Option<Entry> {
         let mut inner = self.inner.lock();
         let entry = inner.unregister(oper);
         self.is_empty.store(
@@ -218,7 +218,7 @@
 
     /// Attempts to find one thread (not the current one), select its operation, and wake it up.
     #[inline]
-    pub fn notify(&self) {
+    pub(crate) fn notify(&self) {
         if !self.is_empty.load(Ordering::SeqCst) {
             let mut inner = self.inner.lock();
             if !self.is_empty.load(Ordering::SeqCst) {
@@ -234,7 +234,7 @@
 
     /// Registers an operation waiting to be ready.
     #[inline]
-    pub fn watch(&self, oper: Operation, cx: &Context) {
+    pub(crate) fn watch(&self, oper: Operation, cx: &Context) {
         let mut inner = self.inner.lock();
         inner.watch(oper, cx);
         self.is_empty.store(
@@ -245,7 +245,7 @@
 
     /// Unregisters an operation waiting to be ready.
     #[inline]
-    pub fn unwatch(&self, oper: Operation) {
+    pub(crate) fn unwatch(&self, oper: Operation) {
         let mut inner = self.inner.lock();
         inner.unwatch(oper);
         self.is_empty.store(
@@ -256,7 +256,7 @@
 
     /// Notifies all threads that the channel is disconnected.
     #[inline]
-    pub fn disconnect(&self) {
+    pub(crate) fn disconnect(&self) {
         let mut inner = self.inner.lock();
         inner.disconnect();
         self.is_empty.store(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/array.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/array.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/array.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/array.rs	2021-12-09 12:01:26.000000000 +0000
@@ -497,8 +497,8 @@
     let mut rng = thread_rng();
 
     for _ in 0..RUNS {
-        let steps = rng.gen_range(0, 10_000);
-        let additional = rng.gen_range(0, 50);
+        let steps = rng.gen_range(0..10_000);
+        let additional = rng.gen_range(0..50);
 
         DROPS.store(0, Ordering::SeqCst);
         let (s, r) = bounded::<DropCounter>(50);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/golang.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/golang.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/golang.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/golang.rs	2021-12-09 12:01:26.000000000 +0000
@@ -315,7 +315,7 @@
     fn chain(ch: Chan<i32>, val: i32, inp: Chan<i32>, out: Chan<i32>) {
         inp.recv();
         if ch.recv() != Some(val) {
-            panic!(val);
+            panic!("{}", val);
         }
         out.send(1);
     }
@@ -1507,5 +1507,58 @@
 
 // https://github.com/golang/go/blob/master/test/ken/chan1.go
 mod chan1 {
-    // TODO
+    use super::*;
+
+    // sent messages
+    const N: usize = 1000;
+    // receiving "goroutines"
+    const M: usize = 10;
+    // channel buffering
+    const W: usize = 2;
+
+    fn r(c: Chan<usize>, m: usize, h: Arc<Mutex<[usize; N]>>) {
+        loop {
+            select! {
+                recv(c.rx()) -> rr => {
+                    let r = rr.unwrap();
+                    let mut data = h.lock().unwrap();
+                    if data[r] != 1 {
+                        println!("r\nm={}\nr={}\nh={}\n", m, r, data[r]);
+                        panic!("fail")
+                    }
+                    data[r] = 2;
+                }
+            }
+        }
+    }
+
+    fn s(c: Chan<usize>, h: Arc<Mutex<[usize; N]>>) {
+        for n in 0..N {
+            let r = n;
+            let mut data = h.lock().unwrap();
+            if data[r] != 0 {
+                println!("s");
+                panic!("fail");
+            }
+            data[r] = 1;
+            // https://github.com/crossbeam-rs/crossbeam/pull/615#discussion_r550281094
+            drop(data);
+            c.send(r);
+        }
+    }
+
+    #[test]
+    fn main() {
+        let h = Arc::new(Mutex::new([0usize; N]));
+        let c = make::<usize>(W);
+        for m in 0..M {
+            go!(c, h, {
+                r(c, m, h);
+            });
+            thread::yield_now();
+        }
+        thread::yield_now();
+        thread::yield_now();
+        s(c, h);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/list.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -387,8 +387,8 @@
     let mut rng = thread_rng();
 
     for _ in 0..100 {
-        let steps = rng.gen_range(0, 10_000);
-        let additional = rng.gen_range(0, 1000);
+        let steps = rng.gen_range(0..10_000);
+        let additional = rng.gen_range(0..1000);
 
         DROPS.store(0, Ordering::SeqCst);
         let (s, r) = unbounded::<DropCounter>();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/ready.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/ready.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/ready.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/ready.rs	2021-12-09 12:01:26.000000000 +0000
@@ -606,8 +606,7 @@
                     thread::sleep(ms(500));
                 }
 
-                let done = false;
-                while !done {
+                loop {
                     let mut sel = Select::new();
                     sel.send(&s);
                     match sel.ready_timeout(ms(100)) {
@@ -628,15 +627,14 @@
                     thread::sleep(ms(500));
                 }
 
-                let mut done = false;
-                while !done {
+                loop {
                     let mut sel = Select::new();
                     sel.recv(&r);
                     match sel.ready_timeout(ms(100)) {
                         Err(_) => {}
                         Ok(0) => {
                             assert_eq!(r.try_recv(), Ok(i));
-                            done = true;
+                            break;
                         }
                         Ok(_) => panic!(),
                     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/select.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -809,8 +809,7 @@
                     thread::sleep(ms(500));
                 }
 
-                let done = false;
-                while !done {
+                loop {
                     let mut sel = Select::new();
                     let oper1 = sel.send(&s);
                     let oper = sel.select_timeout(ms(100));
@@ -834,8 +833,7 @@
                     thread::sleep(ms(500));
                 }
 
-                let mut done = false;
-                while !done {
+                loop {
                     let mut sel = Select::new();
                     let oper1 = sel.recv(&r);
                     let oper = sel.select_timeout(ms(100));
@@ -844,7 +842,7 @@
                         Ok(oper) => match oper.index() {
                             ix if ix == oper1 => {
                                 assert_eq!(oper.recv(&r), Ok(i));
-                                done = true;
+                                break;
                             }
                             _ => unreachable!(),
                         },
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/tick.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/tick.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/tick.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/tick.rs	2021-12-09 12:01:26.000000000 +0000
@@ -127,6 +127,7 @@
     assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
 
+#[cfg(not(crossbeam_sanitize))] // TODO: assertions failed due to tsan is slow
 #[test]
 fn recv_timeout() {
     let start = Instant::now();
@@ -251,6 +252,7 @@
     assert_eq!(hits.load(Ordering::SeqCst), 8);
 }
 
+#[cfg(not(crossbeam_sanitize))] // TODO: assertions failed due to tsan is slow
 #[test]
 fn ready() {
     const THREADS: usize = 4;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/zero.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/zero.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-channel/tests/zero.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-channel/tests/zero.rs	2021-12-09 12:01:26.000000000 +0000
@@ -399,7 +399,7 @@
     let mut rng = thread_rng();
 
     for _ in 0..100 {
-        let steps = rng.gen_range(0, 3_000);
+        let steps = rng.gen_range(0..3_000);
 
         DROPS.store(0, Ordering::SeqCst);
         let (s, r) = bounded::<DropCounter>(0);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"628c53b9d367911dc12f8ee4518b25e08ac01cad5e221c6d73d383bf385734a2","Cargo.toml":"d1b440a335068d27d405cf9b112ba21c680962b5da74749f58d8b3c075168783","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"c2098e8531a9e6d08f2deed557ce5ee0247f603a31b42f6200b03028c35dcf36","src/deque.rs":"1ae47adb7848c7422b98a69a705baefedcfb6d895164c6e42ce6f37d0543467d","src/lib.rs":"9a28507974a371f5dad5311f97376e41bdeb043a2058e78d1ca6b923aeb15983","tests/fifo.rs":"b5ff91efac6c35ca62d7438fb6b65127cd8eea64fcf43d317726601b3e322581","tests/injector.rs":"ac33b424cc8a99bfaa4f1d4965b536f21e7c6a2fccc9ec8c8e39bf10f563b6ab","tests/lifo.rs":"c513e13cf389482edff89d397217ff315ffb8add6819b266def28a09b5b68c36","tests/steal.rs":"cdf588cc13eeb275ef1231eb18e3245faca7a2d054fa6527bfdba2a34bc8f7bf"},"package":"94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"7d5f333652da0da5f068ff91ecf259599f9ff4a4448bd987dd451699b66f0f59","Cargo.toml":"a9a138b4e005ddea76f588ca7004629ebd8f1a64cd1d55474fe36cae4c57a890","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"6b0a911f542186ef96eb56537cade0ecf1a5731d5d494b7094ff87f0fdeb7710","src/deque.rs":"64a2153dc566847fd9fa0e6b2b7adb3933af9984fbe3429b6f1200b058bb9850","src/lib.rs":"9f0581481691bc698176f369410726adf597d470b9d14e226a65f490d6aff8c6","tests/fifo.rs":"1d83f9ffeeba2cd6bd32f1ab136d843b8c73075d5045619be12dc3c27d8ab3ba","tests/injector.rs":"6812c97615e3f685b5612c390861f2e570ff469f3b9871ba97ddbed5c1f5266b","tests/lifo.rs":"b2ddc8154492322e734b23f35ce54040f9ec84ef878009de3a64d44d35c365a6","tests/steal.rs":"cdf588cc13eeb275ef1231eb18e3245faca7a2d054fa6527bfdba2a34bc8f7bf"},"package":"6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,22 +3,20 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["The Crossbeam Project Developers"]
 description = "Concurrent work-stealing deque"
 homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque"
 documentation = "https://docs.rs/crossbeam-deque"
-readme = "README.md"
 keywords = ["chase-lev", "lock-free", "scheduler", "scheduling"]
 categories = ["algorithms", "concurrency", "data-structures"]
 license = "MIT OR Apache-2.0"
@@ -36,7 +34,7 @@
 optional = true
 default-features = false
 [dev-dependencies.rand]
-version = "0.7.3"
+version = "0.8"
 
 [features]
 default = ["std"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,8 @@
+# Version 0.8.1
+
+- Fix deque steal race condition. (#726)
+- Add `Stealer::len` method. (#708)
+
 # Version 0.8.0
 
 - Bump the minimum supported Rust version to 1.36.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
 https://github.com/crossbeam-rs/crossbeam/actions)
-[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
+[![License](https://img.shields.io/badge/license-MIT_OR_Apache--2.0-blue.svg)](
 https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque#license)
 [![Cargo](https://img.shields.io/crates/v/crossbeam-deque.svg)](
 https://crates.io/crates/crossbeam-deque)
@@ -10,7 +10,7 @@
 https://docs.rs/crossbeam-deque)
 [![Rust 1.36+](https://img.shields.io/badge/rust-1.36+-lightgray.svg)](
 https://www.rust-lang.org)
-[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)
 
 This crate provides work-stealing deques, which are primarily intended for
 building task schedulers.
@@ -21,7 +21,7 @@
 
 ```toml
 [dependencies]
-crossbeam-deque = "0.7"
+crossbeam-deque = "0.8"
 ```
 
 ## Compatibility
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/src/deque.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/src/deque.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/src/deque.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/src/deque.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,3 @@
-// TODO(@jeehoonkang): we mutates `batch_size` inside `for i in 0..batch_size {}`. It is difficult
-// to read because we're mutating the range bound.
-#![allow(clippy::mut_range_bound)]
-
 use std::cell::{Cell, UnsafeCell};
 use std::cmp;
 use std::fmt;
@@ -592,6 +588,27 @@
         b.wrapping_sub(f) <= 0
     }
 
+    /// Returns the number of tasks in the deque.
+    ///
+    /// ```
+    /// use crossbeam_deque::Worker;
+    ///
+    /// let w = Worker::new_lifo();
+    /// let s = w.stealer();
+    ///
+    /// assert_eq!(s.len(), 0);
+    /// w.push(1);
+    /// assert_eq!(s.len(), 1);
+    /// w.push(2);
+    /// assert_eq!(s.len(), 2);
+    /// ```
+    pub fn len(&self) -> usize {
+        let f = self.inner.front.load(Ordering::Acquire);
+        atomic::fence(Ordering::SeqCst);
+        let b = self.inner.back.load(Ordering::Acquire);
+        b.wrapping_sub(f).max(0) as usize
+    }
+
     /// Steals a task from the queue.
     ///
     /// # Examples
@@ -635,11 +652,13 @@
         let task = unsafe { buffer.deref().read(f) };
 
         // Try incrementing the front index to steal the task.
-        if self
-            .inner
-            .front
-            .compare_exchange(f, f.wrapping_add(1), Ordering::SeqCst, Ordering::Relaxed)
-            .is_err()
+        // If the buffer has been swapped or the increment fails, we retry.
+        if self.inner.buffer.load(Ordering::Acquire, guard) != buffer
+            || self
+                .inner
+                .front
+                .compare_exchange(f, f.wrapping_add(1), Ordering::SeqCst, Ordering::Relaxed)
+                .is_err()
         {
             // We didn't steal this task, forget it.
             mem::forget(task);
@@ -741,16 +760,18 @@
                 }
 
                 // Try incrementing the front index to steal the batch.
-                if self
-                    .inner
-                    .front
-                    .compare_exchange(
-                        f,
-                        f.wrapping_add(batch_size),
-                        Ordering::SeqCst,
-                        Ordering::Relaxed,
-                    )
-                    .is_err()
+                // If the buffer has been swapped or the increment fails, we retry.
+                if self.inner.buffer.load(Ordering::Acquire, guard) != buffer
+                    || self
+                        .inner
+                        .front
+                        .compare_exchange(
+                            f,
+                            f.wrapping_add(batch_size),
+                            Ordering::SeqCst,
+                            Ordering::Relaxed,
+                        )
+                        .is_err()
                 {
                     return Steal::Retry;
                 }
@@ -760,7 +781,12 @@
 
             // Steal a batch of tasks from the front one by one.
             Flavor::Lifo => {
-                for i in 0..batch_size {
+                // This loop may modify the batch_size, which triggers a clippy lint warning.
+                // Use a new variable to avoid the warning, and to make it clear we aren't
+                // modifying the loop exit condition during iteration.
+                let original_batch_size = batch_size;
+
+                for i in 0..original_batch_size {
                     // If this is not the first steal, check whether the queue is empty.
                     if i > 0 {
                         // We've already got the current front index. Now execute the fence to
@@ -781,11 +807,18 @@
                     let task = unsafe { buffer.deref().read(f) };
 
                     // Try incrementing the front index to steal the task.
-                    if self
-                        .inner
-                        .front
-                        .compare_exchange(f, f.wrapping_add(1), Ordering::SeqCst, Ordering::Relaxed)
-                        .is_err()
+                    // If the buffer has been swapped or the increment fails, we retry.
+                    if self.inner.buffer.load(Ordering::Acquire, guard) != buffer
+                        || self
+                            .inner
+                            .front
+                            .compare_exchange(
+                                f,
+                                f.wrapping_add(1),
+                                Ordering::SeqCst,
+                                Ordering::Relaxed,
+                            )
+                            .is_err()
                     {
                         // We didn't steal this task, forget it and break from the loop.
                         mem::forget(task);
@@ -927,17 +960,19 @@
                     }
                 }
 
-                // Try incrementing the front index to steal the batch.
-                if self
-                    .inner
-                    .front
-                    .compare_exchange(
-                        f,
-                        f.wrapping_add(batch_size + 1),
-                        Ordering::SeqCst,
-                        Ordering::Relaxed,
-                    )
-                    .is_err()
+                // Try incrementing the front index to steal the task.
+                // If the buffer has been swapped or the increment fails, we retry.
+                if self.inner.buffer.load(Ordering::Acquire, guard) != buffer
+                    || self
+                        .inner
+                        .front
+                        .compare_exchange(
+                            f,
+                            f.wrapping_add(batch_size + 1),
+                            Ordering::SeqCst,
+                            Ordering::Relaxed,
+                        )
+                        .is_err()
                 {
                     // We didn't steal this task, forget it.
                     mem::forget(task);
@@ -965,7 +1000,12 @@
                 f = f.wrapping_add(1);
 
                 // Repeat the same procedure for the batch steals.
-                for i in 0..batch_size {
+                //
+                // This loop may modify the batch_size, which triggers a clippy lint warning.
+                // Use a new variable to avoid the warning, and to make it clear we aren't
+                // modifying the loop exit condition during iteration.
+                let original_batch_size = batch_size;
+                for i in 0..original_batch_size {
                     // We've already got the current front index. Now execute the fence to
                     // synchronize with other threads.
                     atomic::fence(Ordering::SeqCst);
@@ -983,11 +1023,18 @@
                     let tmp = unsafe { buffer.deref().read(f) };
 
                     // Try incrementing the front index to steal the task.
-                    if self
-                        .inner
-                        .front
-                        .compare_exchange(f, f.wrapping_add(1), Ordering::SeqCst, Ordering::Relaxed)
-                        .is_err()
+                    // If the buffer has been swapped or the increment fails, we retry.
+                    if self.inner.buffer.load(Ordering::Acquire, guard) != buffer
+                        || self
+                            .inner
+                            .front
+                            .compare_exchange(
+                                f,
+                                f.wrapping_add(1),
+                                Ordering::SeqCst,
+                                Ordering::Relaxed,
+                            )
+                            .is_err()
                     {
                         // We didn't steal this task, forget it and break from the loop.
                         mem::forget(tmp);
@@ -1367,7 +1414,9 @@
 
             // Destroy the block if we've reached the end, or if another thread wanted to destroy
             // but couldn't because we were busy reading from the slot.
-            if (offset + 1 == BLOCK_CAP) || (slot.state.fetch_or(READ, Ordering::AcqRel) & DESTROY != 0) {
+            if (offset + 1 == BLOCK_CAP)
+                || (slot.state.fetch_or(READ, Ordering::AcqRel) & DESTROY != 0)
+            {
                 Block::destroy(block, offset);
             }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -89,10 +89,13 @@
         allow(dead_code, unused_assignments, unused_variables)
     )
 ))]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
+#![warn(
+    missing_docs,
+    missing_debug_implementations,
+    rust_2018_idioms,
+    unreachable_pub
+)]
 #![cfg_attr(not(feature = "std"), no_std)]
-// matches! requires Rust 1.42
-#![allow(clippy::match_like_matches_macro)]
 
 use cfg_if::cfg_if;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/tests/fifo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/tests/fifo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/tests/fifo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/tests/fifo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -167,7 +167,7 @@
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -177,8 +177,8 @@
         let mut rng = rand::thread_rng();
         let mut expected = 0;
         while expected < COUNT {
-            if rng.gen_range(0, 3) == 0 {
-                while let Some(_) = w.pop() {
+            if rng.gen_range(0..3) == 0 {
+                while w.pop().is_some() {
                     hits.fetch_add(1, SeqCst);
                 }
             } else {
@@ -188,7 +188,7 @@
         }
 
         while hits.load(SeqCst) < COUNT {
-            while let Some(_) = w.pop() {
+            while w.pop().is_some() {
                 hits.fetch_add(1, SeqCst);
             }
         }
@@ -227,7 +227,7 @@
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -237,9 +237,9 @@
         let mut rng = rand::thread_rng();
         let mut my_hits = 0;
         loop {
-            for i in 0..rng.gen_range(0, COUNT) {
-                if rng.gen_range(0, 3) == 0 && my_hits == 0 {
-                    while let Some(_) = w.pop() {
+            for i in 0..rng.gen_range(0..COUNT) {
+                if rng.gen_range(0..3) == 0 && my_hits == 0 {
+                    while w.pop().is_some() {
                         my_hits += 1;
                     }
                 } else {
@@ -300,7 +300,7 @@
                         remaining.fetch_sub(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         cnt += 1;
                         remaining.fetch_sub(1, SeqCst);
                     }
@@ -309,7 +309,7 @@
         }
 
         for _ in 0..STEPS {
-            if let Some(_) = w.pop() {
+            if w.pop().is_some() {
                 remaining.fetch_sub(1, SeqCst);
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/tests/injector.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/tests/injector.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/tests/injector.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/tests/injector.rs	2021-12-09 12:01:26.000000000 +0000
@@ -178,7 +178,7 @@
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -188,7 +188,7 @@
         let mut rng = rand::thread_rng();
         let mut expected = 0;
         while expected < COUNT {
-            if rng.gen_range(0, 3) == 0 {
+            if rng.gen_range(0..3) == 0 {
                 while let Success(_) = q.steal() {
                     hits.fetch_add(1, SeqCst);
                 }
@@ -238,7 +238,7 @@
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -248,8 +248,8 @@
         let mut rng = rand::thread_rng();
         let mut my_hits = 0;
         loop {
-            for i in 0..rng.gen_range(0, COUNT) {
-                if rng.gen_range(0, 3) == 0 && my_hits == 0 {
+            for i in 0..rng.gen_range(0..COUNT) {
+                if rng.gen_range(0..3) == 0 && my_hits == 0 {
                     while let Success(_) = q.steal() {
                         my_hits += 1;
                     }
@@ -311,7 +311,7 @@
                         remaining.fetch_sub(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         cnt += 1;
                         remaining.fetch_sub(1, SeqCst);
                     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/tests/lifo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/tests/lifo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-deque/tests/lifo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-deque/tests/lifo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -167,7 +167,7 @@
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -177,8 +177,8 @@
         let mut rng = rand::thread_rng();
         let mut expected = 0;
         while expected < COUNT {
-            if rng.gen_range(0, 3) == 0 {
-                while let Some(_) = w.pop() {
+            if rng.gen_range(0..3) == 0 {
+                while w.pop().is_some() {
                     hits.fetch_add(1, SeqCst);
                 }
             } else {
@@ -188,7 +188,7 @@
         }
 
         while hits.load(SeqCst) < COUNT {
-            while let Some(_) = w.pop() {
+            while w.pop().is_some() {
                 hits.fetch_add(1, SeqCst);
             }
         }
@@ -227,7 +227,7 @@
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -237,9 +237,9 @@
         let mut rng = rand::thread_rng();
         let mut my_hits = 0;
         loop {
-            for i in 0..rng.gen_range(0, COUNT) {
-                if rng.gen_range(0, 3) == 0 && my_hits == 0 {
-                    while let Some(_) = w.pop() {
+            for i in 0..rng.gen_range(0..COUNT) {
+                if rng.gen_range(0..3) == 0 && my_hits == 0 {
+                    while w.pop().is_some() {
                         my_hits += 1;
                     }
                 } else {
@@ -300,7 +300,7 @@
                         remaining.fetch_sub(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         cnt += 1;
                         remaining.fetch_sub(1, SeqCst);
                     }
@@ -309,7 +309,7 @@
         }
 
         for _ in 0..STEPS {
-            if let Some(_) = w.pop() {
+            if w.pop().is_some() {
                 remaining.fetch_sub(1, SeqCst);
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,32 @@
+#![warn(rust_2018_idioms)]
+
+use std::env;
+
+include!("no_atomic.rs");
+
+// The rustc-cfg strings below are *not* public API. Please let us know by
+// opening a GitHub issue if your build environment requires some way to enable
+// these cfgs other than by executing our build script.
+fn main() {
+    let target = match env::var("TARGET") {
+        Ok(target) => target,
+        Err(e) => {
+            println!(
+                "cargo:warning={}: unable to get TARGET environment variable: {}",
+                env!("CARGO_PKG_NAME"),
+                e
+            );
+            return;
+        }
+    };
+
+    // Note that this is `no_*`, not `has_*`. This allows treating
+    // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't
+    // run. This is needed for compatibility with non-cargo build systems that
+    // don't run the build script.
+    if NO_ATOMIC_CAS.contains(&&*target) {
+        println!("cargo:rustc-cfg=crossbeam_no_atomic_cas");
+    }
+
+    println!("cargo:rerun-if-changed=no_atomic.rs");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"be05797b229bfb486c7b0432093aedc6be1129543979aad352f3e2c8b6ecb0e1","Cargo.lock":"701958899c3aeb45c5a8e46c7478f8899b85649c7f66ce63d0e6a5c3209f1ec1","Cargo.toml":"91e77f6969e25d10b83e69dc1274321329045712c7e7d389be20bc250b4409c1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dbab340cd33d900cf38d5bdee509e09ef7ec3c490c7b47931e840cefec1f1d53","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"80f9e65ba04a2ddec7a330172d0b0fbc698e20c221b3d8cdc70cc42e3b9099d1","examples/sanitize.rs":"30001550746a54d6a377f8913fa41c72bf85140d7e8777e07c38491a4e31664b","examples/treiber_stack.rs":"ce4a5f8da67f8497ab0321aaa1aed032ae343c0d36500f2e55a24e76230dedcb","src/atomic.rs":"b92192024336203b865496c8c398ce53ec15bd401eb98c85fa3634bcbd126f86","src/collector.rs":"c310be652b837f73048663c08e872bc14f64b4ae9030c34fe737e6fe0e2d768b","src/default.rs":"b2c9a86b392dc3d687b01abee61b479a6043c5c654a22b79e880f4226dcf65ae","src/deferred.rs":"1df28c99dad1e22ecad7515e829b78ba54bdbbce07ad0b7b122db22b7b215a1e","src/epoch.rs":"76dd63356d5bc52e741883d39abb636e4ccb04d20499fb2a0ce797bb81aa4e91","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"c6f0a79fb8bccbcc58c5db1135a9bc8a6fc69affaf346c5afb69aa725b46e2b7","src/lib.rs":"a4655d14fce9c4c028d9dd0c5d8ea56064eec1dbc0aef400a236d4ace3f49c7c","src/sync/list.rs":"b16e6dc7c2f94c8682926ea8627352f49ab2b464245b241cfc77b72fa1878dd3","src/sync/mod.rs":"2da979ca3a2293f7626a2e6a9ab2fad758d92e3d2bed6cc712ef59eeeea87eab","src/sync/queue.rs":"225d4878142c245226262346c18434436ffc35f14f15a600a3006758449cccb0"},"package":"a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"40b65a13f12e97a24c838fe2254a3563a5fe00922053ef7256ed4752876614fa","Cargo.lock":"35b1db42b892c01e72ff1f99fc7767e5e47208d083203866337f6f2f7d0738eb","Cargo.toml":"eab75399db818408fd4f45a91919b08e050e56547014816683a269270e292055","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"80f9e65ba04a2ddec7a330172d0b0fbc698e20c221b3d8cdc70cc42e3b9099d1","build.rs":"c8684300062c73e96eae8877d03e145ee95e0cd99d4d933696caa582c08e2416","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic.rs":"631d3062e3c30d8e505fda3a7e2c68a88abf7617881035d6131c39cb8fdddce0","src/collector.rs":"7d636f3f96fafd033298d1c2ab126205438a46deb84895d8e28bea9eef67798a","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"1ee67bd3200d3891076aac8cfc9767abdddc194602f2084d11455484096005ea","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"f3f8131819b2a4ec4d1a6d392c734688324f3ae708bac6745e88f2930657eba1","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"262e0d8f343e97df9e2a738461e4255e339710e81c479e484f9efe517ae47135","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -7,10 +9,10 @@
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
-name = "cfg-if"
-version = "0.1.10"
+name = "cc"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
 
 [[package]]
 name = "cfg-if"
@@ -20,18 +22,19 @@
 
 [[package]]
 name = "const_fn"
-version = "0.4.3"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
+checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.1"
+version = "0.9.5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "const_fn",
  "crossbeam-utils",
  "lazy_static",
+ "loom",
  "memoffset",
  "rand",
  "scopeguard",
@@ -39,22 +42,35 @@
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.1"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
 dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
+ "cfg-if",
  "lazy_static",
+ "loom",
+]
+
+[[package]]
+name = "generator"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustversion",
+ "winapi",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.1.15"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "libc",
  "wasi",
 ]
@@ -67,15 +83,35 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "loom"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aa5348dc45fa5f2419b6dd4ea20345e6b01b1fcc9d176a322eada1ac3f382ba"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+]
 
 [[package]]
 name = "memoffset"
-version = "0.6.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
  "autocfg",
 ]
@@ -88,11 +124,10 @@
 
 [[package]]
 name = "rand"
-version = "0.7.3"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
 dependencies = [
- "getrandom",
  "libc",
  "rand_chacha",
  "rand_core",
@@ -101,9 +136,9 @@
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
 dependencies = [
  "ppv-lite86",
  "rand_core",
@@ -111,23 +146,35 @@
 
 [[package]]
 name = "rand_core"
-version = "0.5.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
 dependencies = [
  "rand_core",
 ]
 
 [[package]]
+name = "rustversion"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+
+[[package]]
 name = "scopeguard"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -135,6 +182,28 @@
 
 [[package]]
 name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,12 +13,11 @@
 [package]
 edition = "2018"
 name = "crossbeam-epoch"
-version = "0.9.1"
+version = "0.9.5"
 authors = ["The Crossbeam Project Developers"]
 description = "Epoch-based garbage collection"
 homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch"
 documentation = "https://docs.rs/crossbeam-epoch"
-readme = "README.md"
 keywords = ["lock-free", "rcu", "atomic", "garbage"]
 categories = ["concurrency", "memory-management", "no-std"]
 license = "MIT OR Apache-2.0"
@@ -27,10 +26,11 @@
 version = "1"
 
 [dependencies.const_fn]
-version = "0.4"
+version = "0.4.4"
+optional = true
 
 [dependencies.crossbeam-utils]
-version = "0.8"
+version = "0.8.5"
 default-features = false
 
 [dependencies.lazy_static]
@@ -44,11 +44,15 @@
 version = "1.1.0"
 default-features = false
 [dev-dependencies.rand]
-version = "0.7.3"
+version = "0.8"
 
 [features]
 alloc = []
 default = ["std"]
-nightly = ["crossbeam-utils/nightly"]
-sanitize = []
+loom = ["loom-crate", "crossbeam-utils/loom"]
+nightly = ["crossbeam-utils/nightly", "const_fn"]
 std = ["alloc", "crossbeam-utils/std", "lazy_static"]
+[target."cfg(crossbeam_loom)".dependencies.loom-crate]
+version = "0.5"
+optional = true
+package = "loom"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,25 @@
+# Version 0.9.5
+
+- Fix UB in `Pointable` impl of `[MaybeUninit<T>]` (#694)
+- Support targets that do not have atomic CAS on stable Rust (#698)
+- Fix breakage with nightly feature due to rust-lang/rust#84510 (#692)
+
+# Version 0.9.4
+
+- Fix UB in `<[MaybeUninit<T>] as Pointable>::init` when global allocator failed allocation (#690)
+- Bump `loom` dependency to version 0.5. (#686)
+
+# Version 0.9.3
+
+- Make `loom` dependency optional. (#666)
+
+# Version 0.9.2
+
+- Add `Atomic::compare_exchange` and `Atomic::compare_exchange_weak`. (#628)
+- Deprecate `Atomic::compare_and_set` and `Atomic::compare_and_set_weak`. Use `Atomic::compare_exchange` or `Atomic::compare_exchange_weak` instead. (#628)
+- Make `const_fn` dependency optional. (#611)
+- Add unstable support for `loom`. (#487)
+
 # Version 0.9.1
 
 - Bump `memoffset` dependency to version 0.6. (#592)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/examples/sanitize.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/examples/sanitize.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/examples/sanitize.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/examples/sanitize.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,7 @@
     if rng.gen() {
         thread::sleep(Duration::from_millis(1));
     }
-    let timeout = Duration::from_millis(rng.gen_range(0, 10));
+    let timeout = Duration::from_millis(rng.gen_range(0..10));
     let now = Instant::now();
 
     while now.elapsed() < timeout {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/examples/treiber_stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/examples/treiber_stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/examples/treiber_stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/examples/treiber_stack.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-use std::mem::ManuallyDrop;
-use std::ptr;
-use std::sync::atomic::Ordering::{Acquire, Relaxed, Release};
-
-use crossbeam_epoch::{self as epoch, Atomic, Owned};
-use crossbeam_utils::thread::scope;
-
-/// Treiber's lock-free stack.
-///
-/// Usable with any number of producers and consumers.
-#[derive(Debug)]
-pub struct TreiberStack<T> {
-    head: Atomic<Node<T>>,
-}
-
-#[derive(Debug)]
-struct Node<T> {
-    data: ManuallyDrop<T>,
-    next: Atomic<Node<T>>,
-}
-
-impl<T> TreiberStack<T> {
-    /// Creates a new, empty stack.
-    pub fn new() -> TreiberStack<T> {
-        TreiberStack {
-            head: Atomic::null(),
-        }
-    }
-
-    /// Pushes a value on top of the stack.
-    pub fn push(&self, t: T) {
-        let mut n = Owned::new(Node {
-            data: ManuallyDrop::new(t),
-            next: Atomic::null(),
-        });
-
-        let guard = epoch::pin();
-
-        loop {
-            let head = self.head.load(Relaxed, &guard);
-            n.next.store(head, Relaxed);
-
-            match self.head.compare_and_set(head, n, Release, &guard) {
-                Ok(_) => break,
-                Err(e) => n = e.new,
-            }
-        }
-    }
-
-    /// Attempts to pop the top element from the stack.
-    ///
-    /// Returns `None` if the stack is empty.
-    pub fn pop(&self) -> Option<T> {
-        let guard = epoch::pin();
-        loop {
-            let head = self.head.load(Acquire, &guard);
-
-            match unsafe { head.as_ref() } {
-                Some(h) => {
-                    let next = h.next.load(Relaxed, &guard);
-
-                    if self
-                        .head
-                        .compare_and_set(head, next, Relaxed, &guard)
-                        .is_ok()
-                    {
-                        unsafe {
-                            guard.defer_destroy(head);
-                            return Some(ManuallyDrop::into_inner(ptr::read(&(*h).data)));
-                        }
-                    }
-                }
-                None => return None,
-            }
-        }
-    }
-
-    /// Returns `true` if the stack is empty.
-    pub fn is_empty(&self) -> bool {
-        let guard = epoch::pin();
-        self.head.load(Acquire, &guard).is_null()
-    }
-}
-
-impl<T> Drop for TreiberStack<T> {
-    fn drop(&mut self) {
-        while self.pop().is_some() {}
-    }
-}
-
-fn main() {
-    let stack = TreiberStack::new();
-
-    scope(|scope| {
-        for _ in 0..10 {
-            scope.spawn(|_| {
-                for i in 0..10_000 {
-                    stack.push(i);
-                    assert!(stack.pop().is_some());
-                }
-            });
-        }
-    })
-    .unwrap();
-
-    assert!(stack.pop().is_none());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/no_atomic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/no_atomic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/no_atomic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/no_atomic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,59 @@
+// This file is @generated by no_atomic.sh.
+// It is not intended for manual editing.
+
+const NO_ATOMIC_CAS: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
+#[allow(dead_code)]
+const NO_ATOMIC_64: &[&str] = &[
+    "arm-linux-androideabi",
+    "armebv7r-none-eabi",
+    "armebv7r-none-eabihf",
+    "armv4t-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-musleabi",
+    "armv5te-unknown-linux-uclibceabi",
+    "armv7r-none-eabi",
+    "armv7r-none-eabihf",
+    "hexagon-unknown-linux-musl",
+    "mips-unknown-linux-gnu",
+    "mips-unknown-linux-musl",
+    "mips-unknown-linux-uclibc",
+    "mipsel-unknown-linux-gnu",
+    "mipsel-unknown-linux-musl",
+    "mipsel-unknown-linux-uclibc",
+    "mipsel-unknown-none",
+    "mipsisa32r6-unknown-linux-gnu",
+    "mipsisa32r6el-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnuspe",
+    "powerpc-unknown-linux-musl",
+    "powerpc-unknown-netbsd",
+    "powerpc-unknown-openbsd",
+    "powerpc-wrs-vxworks",
+    "powerpc-wrs-vxworks-spe",
+    "riscv32gc-unknown-linux-gnu",
+    "riscv32gc-unknown-linux-musl",
+    "riscv32imac-unknown-none-elf",
+    "thumbv7em-none-eabi",
+    "thumbv7em-none-eabihf",
+    "thumbv7m-none-eabi",
+    "thumbv8m.base-none-eabi",
+    "thumbv8m.main-none-eabi",
+    "thumbv8m.main-none-eabihf",
+    "mipsel-sony-psp",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
+#[allow(dead_code)]
+const NO_ATOMIC: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
 https://github.com/crossbeam-rs/crossbeam/actions)
-[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
+[![License](https://img.shields.io/badge/license-MIT_OR_Apache--2.0-blue.svg)](
 https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch#license)
 [![Cargo](https://img.shields.io/crates/v/crossbeam-epoch.svg)](
 https://crates.io/crates/crossbeam-epoch)
@@ -10,7 +10,7 @@
 https://docs.rs/crossbeam-epoch)
 [![Rust 1.36+](https://img.shields.io/badge/rust-1.36+-lightgray.svg)](
 https://www.rust-lang.org)
-[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)
 
 This crate provides epoch-based garbage collection for building concurrent data structures.
 
@@ -20,7 +20,7 @@
 shared objects until no pointers to them can exist.
 
 Everything in this crate except the global GC can be used in `no_std` environments, provided that
-features `alloc` and `nightly` are enabled.
+`alloc` feature is enabled.
 
 ## Usage
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/atomic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/atomic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/atomic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/atomic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,12 +5,12 @@
 use core::mem::{self, MaybeUninit};
 use core::ops::{Deref, DerefMut};
 use core::slice;
-use core::sync::atomic::{AtomicUsize, Ordering};
+use core::sync::atomic::Ordering;
 
 use crate::alloc::alloc;
 use crate::alloc::boxed::Box;
 use crate::guard::Guard;
-use const_fn::const_fn;
+use crate::primitive::sync::atomic::AtomicUsize;
 use crossbeam_utils::atomic::AtomicConsume;
 
 /// Given ordering for the success case in a compare-exchange operation, returns the strongest
@@ -26,7 +26,12 @@
 }
 
 /// The error returned on failed compare-and-set operation.
-pub struct CompareAndSetError<'g, T: ?Sized + Pointable, P: Pointer<T>> {
+// TODO: remove in the next major version.
+#[deprecated(note = "Use `CompareExchangeError` instead")]
+pub type CompareAndSetError<'g, T, P> = CompareExchangeError<'g, T, P>;
+
+/// The error returned on failed compare-and-swap operation.
+pub struct CompareExchangeError<'g, T: ?Sized + Pointable, P: Pointer<T>> {
     /// The value in the atomic pointer at the time of the failed operation.
     pub current: Shared<'g, T>,
 
@@ -34,9 +39,9 @@
     pub new: P,
 }
 
-impl<'g, T: 'g, P: Pointer<T> + fmt::Debug> fmt::Debug for CompareAndSetError<'g, T, P> {
+impl<T, P: Pointer<T> + fmt::Debug> fmt::Debug for CompareExchangeError<'_, T, P> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("CompareAndSetError")
+        f.debug_struct("CompareExchangeError")
             .field("current", &self.current)
             .field("new", &self.new)
             .finish()
@@ -54,6 +59,11 @@
 ///    ordering is chosen.
 /// 2. A pair of `Ordering`s. The first one is for the success case, while the second one is
 ///    for the failure case.
+// TODO: remove in the next major version.
+#[deprecated(
+    note = "`compare_and_set` and `compare_and_set_weak` that use this trait are deprecated, \
+            use `compare_exchange` or `compare_exchange_weak instead`"
+)]
 pub trait CompareAndSetOrdering {
     /// The ordering of the operation when it succeeds.
     fn success(&self) -> Ordering;
@@ -65,6 +75,7 @@
     fn failure(&self) -> Ordering;
 }
 
+#[allow(deprecated)]
 impl CompareAndSetOrdering for Ordering {
     #[inline]
     fn success(&self) -> Ordering {
@@ -77,6 +88,7 @@
     }
 }
 
+#[allow(deprecated)]
 impl CompareAndSetOrdering for (Ordering, Ordering) {
     #[inline]
     fn success(&self) -> Ordering {
@@ -226,7 +238,8 @@
 // [`alloc::alloc::Layout::extend`] instead.
 #[repr(C)]
 struct Array<T> {
-    size: usize,
+    /// The number of elements (not the number of bytes).
+    len: usize,
     elements: [MaybeUninit<T>; 0],
 }
 
@@ -235,28 +248,31 @@
 
     type Init = usize;
 
-    unsafe fn init(size: Self::Init) -> usize {
-        let size = mem::size_of::<Array<T>>() + mem::size_of::<MaybeUninit<T>>() * size;
+    unsafe fn init(len: Self::Init) -> usize {
+        let size = mem::size_of::<Array<T>>() + mem::size_of::<MaybeUninit<T>>() * len;
         let align = mem::align_of::<Array<T>>();
         let layout = alloc::Layout::from_size_align(size, align).unwrap();
         let ptr = alloc::alloc(layout) as *mut Array<T>;
-        (*ptr).size = size;
+        if ptr.is_null() {
+            alloc::handle_alloc_error(layout);
+        }
+        (*ptr).len = len;
         ptr as usize
     }
 
     unsafe fn deref<'a>(ptr: usize) -> &'a Self {
         let array = &*(ptr as *const Array<T>);
-        slice::from_raw_parts(array.elements.as_ptr() as *const _, array.size)
+        slice::from_raw_parts(array.elements.as_ptr() as *const _, array.len)
     }
 
     unsafe fn deref_mut<'a>(ptr: usize) -> &'a mut Self {
         let array = &*(ptr as *mut Array<T>);
-        slice::from_raw_parts_mut(array.elements.as_ptr() as *mut _, array.size)
+        slice::from_raw_parts_mut(array.elements.as_ptr() as *mut _, array.len)
     }
 
     unsafe fn drop(ptr: usize) {
         let array = &*(ptr as *mut Array<T>);
-        let size = mem::size_of::<Array<T>>() + mem::size_of::<MaybeUninit<T>>() * array.size;
+        let size = mem::size_of::<Array<T>>() + mem::size_of::<MaybeUninit<T>>() * array.len;
         let align = mem::align_of::<Array<T>>();
         let layout = alloc::Layout::from_size_align(size, align).unwrap();
         alloc::dealloc(ptr as *mut u8, layout);
@@ -327,8 +343,8 @@
     /// let a = Atomic::<i32>::null();
     /// ```
     ///
-    #[const_fn(feature = "nightly")]
-    pub const fn null() -> Atomic<T> {
+    #[cfg_attr(all(feature = "nightly", not(crossbeam_loom)), const_fn::const_fn)]
+    pub fn null() -> Atomic<T> {
         Self {
             data: AtomicUsize::new(0),
             _marker: PhantomData,
@@ -426,8 +442,14 @@
     /// pointer that was written is returned. On failure the actual current value and `new` are
     /// returned.
     ///
-    /// This method takes a [`CompareAndSetOrdering`] argument which describes the memory
-    /// ordering of this operation.
+    /// This method takes two `Ordering` arguments to describe the memory
+    /// ordering of this operation. `success` describes the required ordering for the
+    /// read-modify-write operation that takes place if the comparison with `current` succeeds.
+    /// `failure` describes the required ordering for the load operation that takes place when
+    /// the comparison fails. Using `Acquire` as success ordering makes the store part
+    /// of this operation `Relaxed`, and using `Release` makes the successful load
+    /// `Relaxed`. The failure ordering can only be `SeqCst`, `Acquire` or `Relaxed`
+    /// and must be equivalent to or weaker than the success ordering.
     ///
     /// # Examples
     ///
@@ -439,26 +461,101 @@
     ///
     /// let guard = &epoch::pin();
     /// let curr = a.load(SeqCst, guard);
-    /// let res1 = a.compare_and_set(curr, Shared::null(), SeqCst, guard);
-    /// let res2 = a.compare_and_set(curr, Owned::new(5678), SeqCst, guard);
+    /// let res1 = a.compare_exchange(curr, Shared::null(), SeqCst, SeqCst, guard);
+    /// let res2 = a.compare_exchange(curr, Owned::new(5678), SeqCst, SeqCst, guard);
     /// ```
-    pub fn compare_and_set<'g, O, P>(
+    pub fn compare_exchange<'g, P>(
         &self,
         current: Shared<'_, T>,
         new: P,
-        ord: O,
+        success: Ordering,
+        failure: Ordering,
         _: &'g Guard,
-    ) -> Result<Shared<'g, T>, CompareAndSetError<'g, T, P>>
+    ) -> Result<Shared<'g, T>, CompareExchangeError<'g, T, P>>
+    where
+        P: Pointer<T>,
+    {
+        let new = new.into_usize();
+        self.data
+            .compare_exchange(current.into_usize(), new, success, failure)
+            .map(|_| unsafe { Shared::from_usize(new) })
+            .map_err(|current| unsafe {
+                CompareExchangeError {
+                    current: Shared::from_usize(current),
+                    new: P::from_usize(new),
+                }
+            })
+    }
+
+    /// Stores the pointer `new` (either `Shared` or `Owned`) into the atomic pointer if the current
+    /// value is the same as `current`. The tag is also taken into account, so two pointers to the
+    /// same object, but with different tags, will not be considered equal.
+    ///
+    /// Unlike [`compare_exchange`], this method is allowed to spuriously fail even when comparison
+    /// succeeds, which can result in more efficient code on some platforms.  The return value is a
+    /// result indicating whether the new pointer was written. On success the pointer that was
+    /// written is returned. On failure the actual current value and `new` are returned.
+    ///
+    /// This method takes two `Ordering` arguments to describe the memory
+    /// ordering of this operation. `success` describes the required ordering for the
+    /// read-modify-write operation that takes place if the comparison with `current` succeeds.
+    /// `failure` describes the required ordering for the load operation that takes place when
+    /// the comparison fails. Using `Acquire` as success ordering makes the store part
+    /// of this operation `Relaxed`, and using `Release` makes the successful load
+    /// `Relaxed`. The failure ordering can only be `SeqCst`, `Acquire` or `Relaxed`
+    /// and must be equivalent to or weaker than the success ordering.
+    ///
+    /// [`compare_exchange`]: Atomic::compare_exchange
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_epoch::{self as epoch, Atomic, Owned, Shared};
+    /// use std::sync::atomic::Ordering::SeqCst;
+    ///
+    /// let a = Atomic::new(1234);
+    /// let guard = &epoch::pin();
+    ///
+    /// let mut new = Owned::new(5678);
+    /// let mut ptr = a.load(SeqCst, guard);
+    /// loop {
+    ///     match a.compare_exchange_weak(ptr, new, SeqCst, SeqCst, guard) {
+    ///         Ok(p) => {
+    ///             ptr = p;
+    ///             break;
+    ///         }
+    ///         Err(err) => {
+    ///             ptr = err.current;
+    ///             new = err.new;
+    ///         }
+    ///     }
+    /// }
+    ///
+    /// let mut curr = a.load(SeqCst, guard);
+    /// loop {
+    ///     match a.compare_exchange_weak(curr, Shared::null(), SeqCst, SeqCst, guard) {
+    ///         Ok(_) => break,
+    ///         Err(err) => curr = err.current,
+    ///     }
+    /// }
+    /// ```
+    pub fn compare_exchange_weak<'g, P>(
+        &self,
+        current: Shared<'_, T>,
+        new: P,
+        success: Ordering,
+        failure: Ordering,
+        _: &'g Guard,
+    ) -> Result<Shared<'g, T>, CompareExchangeError<'g, T, P>>
     where
-        O: CompareAndSetOrdering,
         P: Pointer<T>,
     {
         let new = new.into_usize();
         self.data
-            .compare_exchange(current.into_usize(), new, ord.success(), ord.failure())
+            .compare_exchange_weak(current.into_usize(), new, success, failure)
             .map(|_| unsafe { Shared::from_usize(new) })
             .map_err(|current| unsafe {
-                CompareAndSetError {
+                CompareExchangeError {
                     current: Shared::from_usize(current),
                     new: P::from_usize(new),
                 }
@@ -469,6 +566,61 @@
     /// value is the same as `current`. The tag is also taken into account, so two pointers to the
     /// same object, but with different tags, will not be considered equal.
     ///
+    /// The return value is a result indicating whether the new pointer was written. On success the
+    /// pointer that was written is returned. On failure the actual current value and `new` are
+    /// returned.
+    ///
+    /// This method takes a [`CompareAndSetOrdering`] argument which describes the memory
+    /// ordering of this operation.
+    ///
+    /// # Migrating to `compare_exchange`
+    ///
+    /// `compare_and_set` is equivalent to `compare_exchange` with the following mapping for
+    /// memory orderings:
+    ///
+    /// Original | Success | Failure
+    /// -------- | ------- | -------
+    /// Relaxed  | Relaxed | Relaxed
+    /// Acquire  | Acquire | Acquire
+    /// Release  | Release | Relaxed
+    /// AcqRel   | AcqRel  | Acquire
+    /// SeqCst   | SeqCst  | SeqCst
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #![allow(deprecated)]
+    /// use crossbeam_epoch::{self as epoch, Atomic, Owned, Shared};
+    /// use std::sync::atomic::Ordering::SeqCst;
+    ///
+    /// let a = Atomic::new(1234);
+    ///
+    /// let guard = &epoch::pin();
+    /// let curr = a.load(SeqCst, guard);
+    /// let res1 = a.compare_and_set(curr, Shared::null(), SeqCst, guard);
+    /// let res2 = a.compare_and_set(curr, Owned::new(5678), SeqCst, guard);
+    /// ```
+    // TODO: remove in the next major version.
+    #[allow(deprecated)]
+    #[deprecated(note = "Use `compare_exchange` instead")]
+    pub fn compare_and_set<'g, O, P>(
+        &self,
+        current: Shared<'_, T>,
+        new: P,
+        ord: O,
+        guard: &'g Guard,
+    ) -> Result<Shared<'g, T>, CompareAndSetError<'g, T, P>>
+    where
+        O: CompareAndSetOrdering,
+        P: Pointer<T>,
+    {
+        self.compare_exchange(current, new, ord.success(), ord.failure(), guard)
+    }
+
+    /// Stores the pointer `new` (either `Shared` or `Owned`) into the atomic pointer if the current
+    /// value is the same as `current`. The tag is also taken into account, so two pointers to the
+    /// same object, but with different tags, will not be considered equal.
+    ///
     /// Unlike [`compare_and_set`], this method is allowed to spuriously fail even when comparison
     /// succeeds, which can result in more efficient code on some platforms.  The return value is a
     /// result indicating whether the new pointer was written. On success the pointer that was
@@ -479,9 +631,23 @@
     ///
     /// [`compare_and_set`]: Atomic::compare_and_set
     ///
+    /// # Migrating to `compare_exchange_weak`
+    ///
+    /// `compare_and_set_weak` is equivalent to `compare_exchange_weak` with the following mapping for
+    /// memory orderings:
+    ///
+    /// Original | Success | Failure
+    /// -------- | ------- | -------
+    /// Relaxed  | Relaxed | Relaxed
+    /// Acquire  | Acquire | Acquire
+    /// Release  | Release | Relaxed
+    /// AcqRel   | AcqRel  | Acquire
+    /// SeqCst   | SeqCst  | SeqCst
+    ///
     /// # Examples
     ///
     /// ```
+    /// # #![allow(deprecated)]
     /// use crossbeam_epoch::{self as epoch, Atomic, Owned, Shared};
     /// use std::sync::atomic::Ordering::SeqCst;
     ///
@@ -511,27 +677,21 @@
     ///     }
     /// }
     /// ```
+    // TODO: remove in the next major version.
+    #[allow(deprecated)]
+    #[deprecated(note = "Use `compare_exchange_weak` instead")]
     pub fn compare_and_set_weak<'g, O, P>(
         &self,
         current: Shared<'_, T>,
         new: P,
         ord: O,
-        _: &'g Guard,
+        guard: &'g Guard,
     ) -> Result<Shared<'g, T>, CompareAndSetError<'g, T, P>>
     where
         O: CompareAndSetOrdering,
         P: Pointer<T>,
     {
-        let new = new.into_usize();
-        self.data
-            .compare_exchange_weak(current.into_usize(), new, ord.success(), ord.failure())
-            .map(|_| unsafe { Shared::from_usize(new) })
-            .map_err(|current| unsafe {
-                CompareAndSetError {
-                    current: Shared::from_usize(current),
-                    new: P::from_usize(new),
-                }
-            })
+        self.compare_exchange_weak(current, new, ord.success(), ord.failure(), guard)
     }
 
     /// Bitwise "and" with the current tag.
@@ -638,7 +798,17 @@
     /// }
     /// ```
     pub unsafe fn into_owned(self) -> Owned<T> {
-        Owned::from_usize(self.data.into_inner())
+        #[cfg(crossbeam_loom)]
+        {
+            // FIXME: loom does not yet support into_inner, so we use unsync_load for now,
+            // which should have the same synchronization properties:
+            // https://github.com/tokio-rs/loom/issues/117
+            Owned::from_usize(self.data.unsync_load())
+        }
+        #[cfg(not(crossbeam_loom))]
+        {
+            Owned::from_usize(self.data.into_inner())
+        }
     }
 }
 
@@ -1358,9 +1528,10 @@
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
-    use super::Shared;
+    use super::{Owned, Shared};
+    use std::mem::MaybeUninit;
 
     #[test]
     fn valid_tag_i8() {
@@ -1371,4 +1542,18 @@
     fn valid_tag_i64() {
         Shared::<i64>::null().with_tag(7);
     }
+
+    #[cfg(feature = "nightly")]
+    #[test]
+    fn const_atomic_null() {
+        use super::Atomic;
+        static _U: Atomic<u8> = Atomic::<u8>::null();
+    }
+
+    #[test]
+    fn array_init() {
+        let owned = Owned::<[MaybeUninit<usize>]>::init(10);
+        let arr: &[MaybeUninit<usize>] = &*owned;
+        assert_eq!(arr.len(), 10);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/collector.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/collector.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/collector.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/collector.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,9 +14,9 @@
 /// ```
 use core::fmt;
 
-use crate::alloc::sync::Arc;
 use crate::guard::Guard;
 use crate::internal::{Global, Local};
+use crate::primitive::sync::Arc;
 
 /// An epoch-based garbage collector.
 pub struct Collector {
@@ -109,7 +109,7 @@
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
     use std::mem;
     use std::sync::atomic::{AtomicUsize, Ordering};
@@ -151,9 +151,9 @@
                 let a = Owned::new(7).into_shared(guard);
                 guard.defer_destroy(a);
 
-                assert!(!(*(*guard.local).bag.get()).is_empty());
+                assert!(!(*guard.local).bag.with(|b| (*b).is_empty()));
 
-                while !(*(*guard.local).bag.get()).is_empty() {
+                while !(*guard.local).bag.with(|b| (*b).is_empty()) {
                     guard.flush();
                 }
             }
@@ -172,7 +172,7 @@
                 let a = Owned::new(7).into_shared(guard);
                 guard.defer_destroy(a);
             }
-            assert!(!(*(*guard.local).bag.get()).is_empty());
+            assert!(!(*guard.local).bag.with(|b| (*b).is_empty()));
         }
     }
 
@@ -199,6 +199,7 @@
         .unwrap();
     }
 
+    #[cfg(not(crossbeam_sanitize))] // TODO: assertions failed due to `cfg(crossbeam_sanitize)` reduce `internal::MAX_OBJECTS`
     #[test]
     fn incremental() {
         const COUNT: usize = 100_000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/default.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/default.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/default.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/default.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 
 use crate::collector::{Collector, LocalHandle};
 use crate::guard::Guard;
-use lazy_static::lazy_static;
+use crate::primitive::{lazy_static, thread_local};
 
 lazy_static! {
     /// The global data for the default garbage collector.
@@ -45,7 +45,7 @@
         .unwrap_or_else(|_| f(&COLLECTOR.register()))
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
     use crossbeam_utils::thread;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/deferred.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/deferred.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/deferred.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/deferred.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,7 +16,7 @@
 /// A `FnOnce()` that is stored inline if small, or otherwise boxed on the heap.
 ///
 /// This is a handy way of keeping an unsized `FnOnce()` within a sized structure.
-pub struct Deferred {
+pub(crate) struct Deferred {
     call: unsafe fn(*mut u8),
     data: Data,
     _marker: PhantomData<*mut ()>, // !Send + !Sync
@@ -30,7 +30,7 @@
 
 impl Deferred {
     /// Constructs a new `Deferred` from a `FnOnce()`.
-    pub fn new<F: FnOnce()>(f: F) -> Self {
+    pub(crate) fn new<F: FnOnce()>(f: F) -> Self {
         let size = mem::size_of::<F>();
         let align = mem::align_of::<F>();
 
@@ -73,13 +73,13 @@
 
     /// Calls the function.
     #[inline]
-    pub fn call(mut self) {
+    pub(crate) fn call(mut self) {
         let call = self.call;
         unsafe { call(&mut self.data as *mut Data as *mut u8) };
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
     use super::Deferred;
     use std::cell::Cell;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/epoch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/epoch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/epoch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/epoch.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,14 +7,15 @@
 //! If an object became garbage in some epoch, then we can be sure that after two advancements no
 //! participant will hold a reference to it. That is the crux of safe memory reclamation.
 
-use core::sync::atomic::{AtomicUsize, Ordering};
+use crate::primitive::sync::atomic::AtomicUsize;
+use core::sync::atomic::Ordering;
 
 /// An epoch that can be marked as pinned or unpinned.
 ///
 /// Internally, the epoch is represented as an integer that wraps around at some unspecified point
 /// and a flag that represents whether it is pinned or unpinned.
 #[derive(Copy, Clone, Default, Debug, Eq, PartialEq)]
-pub struct Epoch {
+pub(crate) struct Epoch {
     /// The least significant bit is set if pinned. The rest of the bits hold the epoch.
     data: usize,
 }
@@ -22,7 +23,7 @@
 impl Epoch {
     /// Returns the starting epoch in unpinned state.
     #[inline]
-    pub fn starting() -> Self {
+    pub(crate) fn starting() -> Self {
         Self::default()
     }
 
@@ -30,7 +31,7 @@
     ///
     /// Internally, epochs are represented as numbers in the range `(isize::MIN / 2) .. (isize::MAX
     /// / 2)`, so the returned distance will be in the same interval.
-    pub fn wrapping_sub(self, rhs: Self) -> isize {
+    pub(crate) fn wrapping_sub(self, rhs: Self) -> isize {
         // The result is the same with `(self.data & !1).wrapping_sub(rhs.data & !1) as isize >> 1`,
         // because the possible difference of LSB in `(self.data & !1).wrapping_sub(rhs.data & !1)`
         // will be ignored in the shift operation.
@@ -39,13 +40,13 @@
 
     /// Returns `true` if the epoch is marked as pinned.
     #[inline]
-    pub fn is_pinned(self) -> bool {
+    pub(crate) fn is_pinned(self) -> bool {
         (self.data & 1) == 1
     }
 
     /// Returns the same epoch, but marked as pinned.
     #[inline]
-    pub fn pinned(self) -> Epoch {
+    pub(crate) fn pinned(self) -> Epoch {
         Epoch {
             data: self.data | 1,
         }
@@ -53,7 +54,7 @@
 
     /// Returns the same epoch, but marked as unpinned.
     #[inline]
-    pub fn unpinned(self) -> Epoch {
+    pub(crate) fn unpinned(self) -> Epoch {
         Epoch {
             data: self.data & !1,
         }
@@ -63,7 +64,7 @@
     ///
     /// The returned epoch will be marked as pinned only if the previous one was as well.
     #[inline]
-    pub fn successor(self) -> Epoch {
+    pub(crate) fn successor(self) -> Epoch {
         Epoch {
             data: self.data.wrapping_add(2),
         }
@@ -72,7 +73,7 @@
 
 /// An atomic value that holds an `Epoch`.
 #[derive(Default, Debug)]
-pub struct AtomicEpoch {
+pub(crate) struct AtomicEpoch {
     /// Since `Epoch` is just a wrapper around `usize`, an `AtomicEpoch` is similarly represented
     /// using an `AtomicUsize`.
     data: AtomicUsize,
@@ -81,14 +82,14 @@
 impl AtomicEpoch {
     /// Creates a new atomic epoch.
     #[inline]
-    pub fn new(epoch: Epoch) -> Self {
+    pub(crate) fn new(epoch: Epoch) -> Self {
         let data = AtomicUsize::new(epoch.data);
         AtomicEpoch { data }
     }
 
     /// Loads a value from the atomic epoch.
     #[inline]
-    pub fn load(&self, ord: Ordering) -> Epoch {
+    pub(crate) fn load(&self, ord: Ordering) -> Epoch {
         Epoch {
             data: self.data.load(ord),
         }
@@ -96,19 +97,37 @@
 
     /// Stores a value into the atomic epoch.
     #[inline]
-    pub fn store(&self, epoch: Epoch, ord: Ordering) {
+    pub(crate) fn store(&self, epoch: Epoch, ord: Ordering) {
         self.data.store(epoch.data, ord);
     }
 
     /// Stores a value into the atomic epoch if the current value is the same as `current`.
     ///
-    /// The return value is always the previous value. If it is equal to `current`, then the value
-    /// is updated.
+    /// The return value is a result indicating whether the new value was written and containing
+    /// the previous value. On success this value is guaranteed to be equal to `current`.
     ///
-    /// The `Ordering` argument describes the memory ordering of this operation.
-    #[inline]
-    pub fn compare_and_swap(&self, current: Epoch, new: Epoch, ord: Ordering) -> Epoch {
-        let data = self.data.compare_and_swap(current.data, new.data, ord);
-        Epoch { data }
+    /// This method takes two `Ordering` arguments to describe the memory
+    /// ordering of this operation. `success` describes the required ordering for the
+    /// read-modify-write operation that takes place if the comparison with `current` succeeds.
+    /// `failure` describes the required ordering for the load operation that takes place when
+    /// the comparison fails. Using `Acquire` as success ordering makes the store part
+    /// of this operation `Relaxed`, and using `Release` makes the successful load
+    /// `Relaxed`. The failure ordering can only be `SeqCst`, `Acquire` or `Relaxed`
+    /// and must be equivalent to or weaker than the success ordering.
+    #[inline]
+    pub(crate) fn compare_exchange(
+        &self,
+        current: Epoch,
+        new: Epoch,
+        success: Ordering,
+        failure: Ordering,
+    ) -> Result<Epoch, Epoch> {
+        match self
+            .data
+            .compare_exchange(current.data, new.data, success, failure)
+        {
+            Ok(data) => Ok(Epoch { data }),
+            Err(data) => Err(Epoch { data }),
+        }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/internal.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/internal.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/internal.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/internal.rs	2021-12-09 12:01:26.000000000 +0000
@@ -35,10 +35,11 @@
 //! Ideally each instance of concurrent data structure may have its own queue that gets fully
 //! destroyed as soon as the data structure gets dropped.
 
-use core::cell::{Cell, UnsafeCell};
+use crate::primitive::cell::UnsafeCell;
+use crate::primitive::sync::atomic;
+use core::cell::Cell;
 use core::mem::{self, ManuallyDrop};
 use core::num::Wrapping;
-use core::sync::atomic;
 use core::sync::atomic::Ordering;
 use core::{fmt, ptr};
 
@@ -54,13 +55,13 @@
 use crate::sync::queue::Queue;
 
 /// Maximum number of objects a bag can contain.
-#[cfg(not(feature = "sanitize"))]
+#[cfg(not(crossbeam_sanitize))]
 const MAX_OBJECTS: usize = 62;
-#[cfg(feature = "sanitize")]
+#[cfg(crossbeam_sanitize)]
 const MAX_OBJECTS: usize = 4;
 
 /// A bag of deferred functions.
-pub struct Bag {
+pub(crate) struct Bag {
     /// Stashed objects.
     deferreds: [Deferred; MAX_OBJECTS],
     len: usize,
@@ -71,12 +72,12 @@
 
 impl Bag {
     /// Returns a new, empty bag.
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         Self::default()
     }
 
     /// Returns `true` if the bag is empty.
-    pub fn is_empty(&self) -> bool {
+    pub(crate) fn is_empty(&self) -> bool {
         self.len == 0
     }
 
@@ -88,7 +89,7 @@
     /// # Safety
     ///
     /// It should be safe for another thread to execute the given function.
-    pub unsafe fn try_push(&mut self, deferred: Deferred) -> Result<(), Deferred> {
+    pub(crate) unsafe fn try_push(&mut self, deferred: Deferred) -> Result<(), Deferred> {
         if self.len < MAX_OBJECTS {
             self.deferreds[self.len] = deferred;
             self.len += 1;
@@ -108,7 +109,7 @@
     #[rustfmt::skip]
     fn default() -> Self {
         // TODO: [no_op; MAX_OBJECTS] syntax blocked by https://github.com/rust-lang/rust/issues/49147
-        #[cfg(not(feature = "sanitize"))]
+        #[cfg(not(crossbeam_sanitize))]
         return Bag {
             len: 0,
             deferreds: [
@@ -176,7 +177,7 @@
                 Deferred::new(no_op_func),
             ],
         };
-        #[cfg(feature = "sanitize")]
+        #[cfg(crossbeam_sanitize)]
         return Bag {
             len: 0,
             deferreds: [
@@ -231,7 +232,7 @@
 }
 
 /// The global data for a garbage collector.
-pub struct Global {
+pub(crate) struct Global {
     /// The intrusive linked list of `Local`s.
     locals: List<Local>,
 
@@ -248,7 +249,7 @@
 
     /// Creates a new global data for garbage collection.
     #[inline]
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         Self {
             locals: List::new(),
             queue: Queue::new(),
@@ -257,7 +258,7 @@
     }
 
     /// Pushes the bag into the global queue and replaces the bag with a new empty bag.
-    pub fn push_bag(&self, bag: &mut Bag, guard: &Guard) {
+    pub(crate) fn push_bag(&self, bag: &mut Bag, guard: &Guard) {
         let bag = mem::replace(bag, Bag::new());
 
         atomic::fence(Ordering::SeqCst);
@@ -274,10 +275,10 @@
     /// path. In other words, we want the compiler to optimize branching for the case when
     /// `collect()` is not called.
     #[cold]
-    pub fn collect(&self, guard: &Guard) {
+    pub(crate) fn collect(&self, guard: &Guard) {
         let global_epoch = self.try_advance(guard);
 
-        let steps = if cfg!(feature = "sanitize") {
+        let steps = if cfg!(crossbeam_sanitize) {
             usize::max_value()
         } else {
             Self::COLLECT_STEPS
@@ -303,7 +304,7 @@
     ///
     /// `try_advance()` is annotated `#[cold]` because it is rarely called.
     #[cold]
-    pub fn try_advance(&self, guard: &Guard) -> Epoch {
+    pub(crate) fn try_advance(&self, guard: &Guard) -> Epoch {
         let global_epoch = self.epoch.load(Ordering::Relaxed);
         atomic::fence(Ordering::SeqCst);
 
@@ -345,7 +346,7 @@
 }
 
 /// Participant for garbage collection.
-pub struct Local {
+pub(crate) struct Local {
     /// A node in the intrusive linked list of `Local`s.
     entry: Entry,
 
@@ -374,9 +375,13 @@
 
 // Make sure `Local` is less than or equal to 2048 bytes.
 // https://github.com/crossbeam-rs/crossbeam/issues/551
+#[cfg(not(crossbeam_sanitize))] // `crossbeam_sanitize` reduces the size of `Local`
 #[test]
 fn local_size() {
-    assert!(core::mem::size_of::<Local>() <= 2048, "An allocation of `Local` should be <= 2048 bytes.");
+    assert!(
+        core::mem::size_of::<Local>() <= 2048,
+        "An allocation of `Local` should be <= 2048 bytes."
+    );
 }
 
 impl Local {
@@ -385,7 +390,7 @@
     const PINNINGS_BETWEEN_COLLECT: usize = 128;
 
     /// Registers a new `Local` in the provided `Global`.
-    pub fn register(collector: &Collector) -> LocalHandle {
+    pub(crate) fn register(collector: &Collector) -> LocalHandle {
         unsafe {
             // Since we dereference no pointers in this block, it is safe to use `unprotected`.
 
@@ -408,19 +413,19 @@
 
     /// Returns a reference to the `Global` in which this `Local` resides.
     #[inline]
-    pub fn global(&self) -> &Global {
+    pub(crate) fn global(&self) -> &Global {
         &self.collector().global
     }
 
     /// Returns a reference to the `Collector` in which this `Local` resides.
     #[inline]
-    pub fn collector(&self) -> &Collector {
-        unsafe { &**self.collector.get() }
+    pub(crate) fn collector(&self) -> &Collector {
+        self.collector.with(|c| unsafe { &**c })
     }
 
     /// Returns `true` if the current participant is pinned.
     #[inline]
-    pub fn is_pinned(&self) -> bool {
+    pub(crate) fn is_pinned(&self) -> bool {
         self.guard_count.get() > 0
     }
 
@@ -429,8 +434,8 @@
     /// # Safety
     ///
     /// It should be safe for another thread to execute the given function.
-    pub unsafe fn defer(&self, mut deferred: Deferred, guard: &Guard) {
-        let bag = &mut *self.bag.get();
+    pub(crate) unsafe fn defer(&self, mut deferred: Deferred, guard: &Guard) {
+        let bag = self.bag.with_mut(|b| &mut *b);
 
         while let Err(d) = bag.try_push(deferred) {
             self.global().push_bag(bag, guard);
@@ -438,8 +443,8 @@
         }
     }
 
-    pub fn flush(&self, guard: &Guard) {
-        let bag = unsafe { &mut *self.bag.get() };
+    pub(crate) fn flush(&self, guard: &Guard) {
+        let bag = self.bag.with_mut(|b| unsafe { &mut *b });
 
         if !bag.is_empty() {
             self.global().push_bag(bag, guard);
@@ -450,7 +455,7 @@
 
     /// Pins the `Local`.
     #[inline]
-    pub fn pin(&self) -> Guard {
+    pub(crate) fn pin(&self) -> Guard {
         let guard = Guard { local: self };
 
         let guard_count = self.guard_count.get();
@@ -468,7 +473,7 @@
                 // a `SeqCst` fence.
                 //
                 // 1. `atomic::fence(SeqCst)`, which compiles into a `mfence` instruction.
-                // 2. `_.compare_and_swap(_, _, SeqCst)`, which compiles into a `lock cmpxchg`
+                // 2. `_.compare_exchange(_, _, SeqCst, SeqCst)`, which compiles into a `lock cmpxchg`
                 //    instruction.
                 //
                 // Both instructions have the effect of a full barrier, but benchmarks have shown
@@ -478,10 +483,13 @@
                 // works fine.  Using inline assembly would be a viable (and correct) alternative,
                 // but alas, that is not possible on stable Rust.
                 let current = Epoch::starting();
-                let previous = self
-                    .epoch
-                    .compare_and_swap(current, new_epoch, Ordering::SeqCst);
-                debug_assert_eq!(current, previous, "participant was expected to be unpinned");
+                let res = self.epoch.compare_exchange(
+                    current,
+                    new_epoch,
+                    Ordering::SeqCst,
+                    Ordering::SeqCst,
+                );
+                debug_assert!(res.is_ok(), "participant was expected to be unpinned");
                 // We add a compiler fence to make it less likely for LLVM to do something wrong
                 // here.  Formally, this is not enough to get rid of data races; practically,
                 // it should go a long way.
@@ -507,7 +515,7 @@
 
     /// Unpins the `Local`.
     #[inline]
-    pub fn unpin(&self) {
+    pub(crate) fn unpin(&self) {
         let guard_count = self.guard_count.get();
         self.guard_count.set(guard_count - 1);
 
@@ -522,7 +530,7 @@
 
     /// Unpins and then pins the `Local`.
     #[inline]
-    pub fn repin(&self) {
+    pub(crate) fn repin(&self) {
         let guard_count = self.guard_count.get();
 
         // Update the local epoch only if there's only one guard.
@@ -545,7 +553,7 @@
 
     /// Increments the handle count.
     #[inline]
-    pub fn acquire_handle(&self) {
+    pub(crate) fn acquire_handle(&self) {
         let handle_count = self.handle_count.get();
         debug_assert!(handle_count >= 1);
         self.handle_count.set(handle_count + 1);
@@ -553,7 +561,7 @@
 
     /// Decrements the handle count.
     #[inline]
-    pub fn release_handle(&self) {
+    pub(crate) fn release_handle(&self) {
         let guard_count = self.guard_count.get();
         let handle_count = self.handle_count.get();
         debug_assert!(handle_count >= 1);
@@ -577,7 +585,8 @@
             // Pin and move the local bag into the global queue. It's important that `push_bag`
             // doesn't defer destruction on any new garbage.
             let guard = &self.pin();
-            self.global().push_bag(&mut *self.bag.get(), guard);
+            self.global()
+                .push_bag(self.bag.with_mut(|b| &mut *b), guard);
         }
         // Revert the handle count back to zero.
         self.handle_count.set(0);
@@ -586,7 +595,7 @@
             // Take the reference to the `Global` out of this `Local`. Since we're not protected
             // by a guard at this time, it's crucial that the reference is read before marking the
             // `Local` as deleted.
-            let collector: Collector = ptr::read(&*(*self.collector.get()));
+            let collector: Collector = ptr::read(self.collector.with(|c| &*(*c)));
 
             // Mark this node in the linked list as deleted.
             self.entry.delete(unprotected());
@@ -617,7 +626,7 @@
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
     use std::sync::atomic::{AtomicUsize, Ordering};
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -55,16 +55,105 @@
         allow(dead_code, unused_assignments, unused_variables)
     )
 ))]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
+#![warn(
+    missing_docs,
+    missing_debug_implementations,
+    rust_2018_idioms,
+    unreachable_pub
+)]
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
-#![cfg_attr(feature = "nightly", feature(const_fn))]
-// matches! requires Rust 1.42
-#![allow(clippy::match_like_matches_macro)]
+#![cfg_attr(feature = "nightly", feature(const_fn_trait_bound))]
+
+#[cfg(crossbeam_loom)]
+extern crate loom_crate as loom;
 
 use cfg_if::cfg_if;
 
-#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
+#[cfg(crossbeam_loom)]
+#[allow(unused_imports, dead_code)]
+mod primitive {
+    pub(crate) mod cell {
+        pub(crate) use loom::cell::UnsafeCell;
+    }
+    pub(crate) mod sync {
+        pub(crate) mod atomic {
+            use core::sync::atomic::Ordering;
+            pub(crate) use loom::sync::atomic::AtomicUsize;
+            pub(crate) fn fence(ord: Ordering) {
+                if let Ordering::Acquire = ord {
+                } else {
+                    // FIXME: loom only supports acquire fences at the moment.
+                    // https://github.com/tokio-rs/loom/issues/117
+                    // let's at least not panic...
+                    // this may generate some false positives (`SeqCst` is stronger than `Acquire`
+                    // for example), and some false negatives (`Relaxed` is weaker than `Acquire`),
+                    // but it's the best we can do for the time being.
+                }
+                loom::sync::atomic::fence(Ordering::Acquire)
+            }
+
+            // FIXME: loom does not support compiler_fence at the moment.
+            // https://github.com/tokio-rs/loom/issues/117
+            // we use fence as a stand-in for compiler_fence for the time being.
+            // this may miss some races since fence is stronger than compiler_fence,
+            // but it's the best we can do for the time being.
+            pub(crate) use self::fence as compiler_fence;
+        }
+        pub(crate) use loom::sync::Arc;
+    }
+    pub(crate) use loom::lazy_static;
+    pub(crate) use loom::thread_local;
+}
+#[cfg(not(crossbeam_no_atomic_cas))]
+#[cfg(not(crossbeam_loom))]
+#[allow(unused_imports, dead_code)]
+mod primitive {
+    #[cfg(feature = "alloc")]
+    pub(crate) mod cell {
+        #[derive(Debug)]
+        #[repr(transparent)]
+        pub(crate) struct UnsafeCell<T>(::core::cell::UnsafeCell<T>);
+
+        // loom's UnsafeCell has a slightly different API than the standard library UnsafeCell.
+        // Since we want the rest of the code to be agnostic to whether it's running under loom or
+        // not, we write this small wrapper that provides the loom-supported API for the standard
+        // library UnsafeCell. This is also what the loom documentation recommends:
+        // https://github.com/tokio-rs/loom#handling-loom-api-differences
+        impl<T> UnsafeCell<T> {
+            #[inline]
+            pub(crate) fn new(data: T) -> UnsafeCell<T> {
+                UnsafeCell(::core::cell::UnsafeCell::new(data))
+            }
+
+            #[inline]
+            pub(crate) fn with<R>(&self, f: impl FnOnce(*const T) -> R) -> R {
+                f(self.0.get())
+            }
+
+            #[inline]
+            pub(crate) fn with_mut<R>(&self, f: impl FnOnce(*mut T) -> R) -> R {
+                f(self.0.get())
+            }
+        }
+    }
+    #[cfg(feature = "alloc")]
+    pub(crate) mod sync {
+        pub(crate) mod atomic {
+            pub(crate) use core::sync::atomic::compiler_fence;
+            pub(crate) use core::sync::atomic::fence;
+            pub(crate) use core::sync::atomic::AtomicUsize;
+        }
+        pub(crate) use alloc::sync::Arc;
+    }
+
+    #[cfg(feature = "std")]
+    pub(crate) use std::thread_local;
+
+    #[cfg(feature = "std")]
+    pub(crate) use lazy_static::lazy_static;
+}
+
+#[cfg(not(crossbeam_no_atomic_cas))]
 cfg_if! {
     if #[cfg(feature = "alloc")] {
         extern crate alloc;
@@ -77,9 +166,15 @@
         mod internal;
         mod sync;
 
-        pub use self::atomic::{Pointable, Atomic, CompareAndSetError, CompareAndSetOrdering, Owned, Pointer, Shared};
+        pub use self::atomic::{
+            Pointable, Atomic, CompareExchangeError,
+            Owned, Pointer, Shared,
+        };
         pub use self::collector::{Collector, LocalHandle};
         pub use self::guard::{unprotected, Guard};
+
+        #[allow(deprecated)]
+        pub use self::atomic::{CompareAndSetError, CompareAndSetOrdering};
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/list.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 /// An Entry is accessed from multiple threads, so it would be beneficial to put it in a different
 /// cache-line than thread-local data in terms of performance.
 #[derive(Debug)]
-pub struct Entry {
+pub(crate) struct Entry {
     /// The next entry in the linked list.
     /// If the tag is 1, this entry is marked as deleted.
     next: Atomic<Entry>,
@@ -64,7 +64,7 @@
 /// }
 /// ```
 ///
-pub trait IsElement<T> {
+pub(crate) trait IsElement<T> {
     /// Returns a reference to this element's `Entry`.
     fn entry_of(_: &T) -> &Entry;
 
@@ -93,7 +93,7 @@
 
 /// A lock-free, intrusive linked list of type `T`.
 #[derive(Debug)]
-pub struct List<T, C: IsElement<T> = T> {
+pub(crate) struct List<T, C: IsElement<T> = T> {
     /// The head of the linked list.
     head: Atomic<Entry>,
 
@@ -102,7 +102,7 @@
 }
 
 /// An iterator used for retrieving values from the list.
-pub struct Iter<'g, T, C: IsElement<T>> {
+pub(crate) struct Iter<'g, T, C: IsElement<T>> {
     /// The guard that protects the iteration.
     guard: &'g Guard,
 
@@ -122,7 +122,7 @@
 
 /// An error that occurs during iteration over the list.
 #[derive(PartialEq, Debug)]
-pub enum IterError {
+pub(crate) enum IterError {
     /// A concurrent thread modified the state of the list at the same place that this iterator
     /// was inspecting. Subsequent iteration will restart from the beginning of the list.
     Stalled,
@@ -145,14 +145,14 @@
     /// The entry should be a member of a linked list, and it should not have been deleted.
     /// It should be safe to call `C::finalize` on the entry after the `guard` is dropped, where `C`
     /// is the associated helper for the linked list.
-    pub unsafe fn delete(&self, guard: &Guard) {
+    pub(crate) unsafe fn delete(&self, guard: &Guard) {
         self.next.fetch_or(1, Release, guard);
     }
 }
 
 impl<T, C: IsElement<T>> List<T, C> {
     /// Returns a new, empty linked list.
-    pub fn new() -> Self {
+    pub(crate) fn new() -> Self {
         Self {
             head: Atomic::null(),
             _marker: PhantomData,
@@ -169,7 +169,7 @@
     /// - `container` is immovable, e.g. inside an `Owned`
     /// - the same `Entry` is not inserted more than once
     /// - the inserted object will be removed before the list is dropped
-    pub unsafe fn insert<'g>(&'g self, container: Shared<'g, T>, guard: &'g Guard) {
+    pub(crate) unsafe fn insert<'g>(&'g self, container: Shared<'g, T>, guard: &'g Guard) {
         // Insert right after head, i.e. at the beginning of the list.
         let to = &self.head;
         // Get the intrusively stored Entry of the new element to insert.
@@ -183,7 +183,7 @@
             // Set the Entry of the to-be-inserted element to point to the previous successor of
             // `to`.
             entry.next.store(next, Relaxed);
-            match to.compare_and_set_weak(next, entry_ptr, Release, guard) {
+            match to.compare_exchange_weak(next, entry_ptr, Release, Relaxed, guard) {
                 Ok(_) => break,
                 // We lost the race or weak CAS failed spuriously. Update the successor and try
                 // again.
@@ -204,7 +204,7 @@
     /// 2. If an object is deleted during iteration, it may or may not be returned.
     /// 3. The iteration may be aborted when it lost in a race condition. In this case, the winning
     ///    thread will continue to iterate over the same list.
-    pub fn iter<'g>(&'g self, guard: &'g Guard) -> Iter<'g, T, C> {
+    pub(crate) fn iter<'g>(&'g self, guard: &'g Guard) -> Iter<'g, T, C> {
         Iter {
             guard,
             pred: &self.head,
@@ -250,7 +250,7 @@
                 // Try to unlink `curr` from the list, and get the new value of `self.pred`.
                 let succ = match self
                     .pred
-                    .compare_and_set(self.curr, succ, Acquire, self.guard)
+                    .compare_exchange(self.curr, succ, Acquire, Acquire, self.guard)
                 {
                     Ok(_) => {
                         // We succeeded in unlinking `curr`, so we have to schedule
@@ -295,7 +295,7 @@
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
     use super::*;
     use crate::{Collector, Owned};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
 //! Synchronization primitives.
 
-pub mod list;
-pub mod queue;
+pub(crate) mod list;
+pub(crate) mod queue;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/src/sync/queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
 // the `tail` pointer may lag behind the actual tail. Non-sentinel nodes are either all `Data` or
 // all `Blocked` (requests for data from blocked threads).
 #[derive(Debug)]
-pub struct Queue<T> {
+pub(crate) struct Queue<T> {
     head: CachePadded<Atomic<Node<T>>>,
     tail: CachePadded<Atomic<Node<T>>>,
 }
@@ -42,7 +42,7 @@
 
 impl<T> Queue<T> {
     /// Create a new, empty queue.
-    pub fn new() -> Queue<T> {
+    pub(crate) fn new() -> Queue<T> {
         let q = Queue {
             head: CachePadded::new(Atomic::null()),
             tail: CachePadded::new(Atomic::null()),
@@ -74,24 +74,28 @@
         let next = o.next.load(Acquire, guard);
         if unsafe { next.as_ref().is_some() } {
             // if not, try to "help" by moving the tail pointer forward
-            let _ = self.tail.compare_and_set(onto, next, Release, guard);
+            let _ = self
+                .tail
+                .compare_exchange(onto, next, Release, Relaxed, guard);
             false
         } else {
             // looks like the actual tail; attempt to link in `n`
             let result = o
                 .next
-                .compare_and_set(Shared::null(), new, Release, guard)
+                .compare_exchange(Shared::null(), new, Release, Relaxed, guard)
                 .is_ok();
             if result {
                 // try to move the tail pointer forward
-                let _ = self.tail.compare_and_set(onto, new, Release, guard);
+                let _ = self
+                    .tail
+                    .compare_exchange(onto, new, Release, Relaxed, guard);
             }
             result
         }
     }
 
     /// Adds `t` to the back of the queue, possibly waking up threads blocked on `pop`.
-    pub fn push(&self, t: T, guard: &Guard) {
+    pub(crate) fn push(&self, t: T, guard: &Guard) {
         let new = Owned::new(Node {
             data: MaybeUninit::new(t),
             next: Atomic::null(),
@@ -118,12 +122,14 @@
         match unsafe { next.as_ref() } {
             Some(n) => unsafe {
                 self.head
-                    .compare_and_set(head, next, Release, guard)
+                    .compare_exchange(head, next, Release, Relaxed, guard)
                     .map(|_| {
                         let tail = self.tail.load(Relaxed, guard);
                         // Advance the tail so that we don't retire a pointer to a reachable node.
                         if head == tail {
-                            let _ = self.tail.compare_and_set(tail, next, Release, guard);
+                            let _ = self
+                                .tail
+                                .compare_exchange(tail, next, Release, Relaxed, guard);
                         }
                         guard.defer_destroy(head);
                         // TODO: Replace with MaybeUninit::read when api is stable
@@ -149,12 +155,14 @@
         match unsafe { next.as_ref() } {
             Some(n) if condition(unsafe { &*n.data.as_ptr() }) => unsafe {
                 self.head
-                    .compare_and_set(head, next, Release, guard)
+                    .compare_exchange(head, next, Release, Relaxed, guard)
                     .map(|_| {
                         let tail = self.tail.load(Relaxed, guard);
                         // Advance the tail so that we don't retire a pointer to a reachable node.
                         if head == tail {
-                            let _ = self.tail.compare_and_set(tail, next, Release, guard);
+                            let _ = self
+                                .tail
+                                .compare_exchange(tail, next, Release, Relaxed, guard);
                         }
                         guard.defer_destroy(head);
                         Some(n.data.as_ptr().read())
@@ -168,7 +176,7 @@
     /// Attempts to dequeue from the front.
     ///
     /// Returns `None` if the queue is observed to be empty.
-    pub fn try_pop(&self, guard: &Guard) -> Option<T> {
+    pub(crate) fn try_pop(&self, guard: &Guard) -> Option<T> {
         loop {
             if let Ok(head) = self.pop_internal(guard) {
                 return head;
@@ -180,7 +188,7 @@
     ///
     /// Returns `None` if the queue is observed to be empty, or the head does not satisfy the given
     /// condition.
-    pub fn try_pop_if<F>(&self, condition: F, guard: &Guard) -> Option<T>
+    pub(crate) fn try_pop_if<F>(&self, condition: F, guard: &Guard) -> Option<T>
     where
         T: Sync,
         F: Fn(&T) -> bool,
@@ -207,7 +215,7 @@
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(crossbeam_loom)))]
 mod test {
     use super::*;
     use crate::pin;
@@ -218,30 +226,30 @@
     }
 
     impl<T> Queue<T> {
-        pub fn new() -> Queue<T> {
+        pub(crate) fn new() -> Queue<T> {
             Queue {
                 queue: super::Queue::new(),
             }
         }
 
-        pub fn push(&self, t: T) {
+        pub(crate) fn push(&self, t: T) {
             let guard = &pin();
             self.queue.push(t, guard);
         }
 
-        pub fn is_empty(&self) -> bool {
+        pub(crate) fn is_empty(&self) -> bool {
             let guard = &pin();
             let head = self.queue.head.load(Acquire, guard);
             let h = unsafe { head.deref() };
             h.next.load(Acquire, guard).is_null()
         }
 
-        pub fn try_pop(&self) -> Option<T> {
+        pub(crate) fn try_pop(&self) -> Option<T> {
             let guard = &pin();
             self.queue.try_pop(guard)
         }
 
-        pub fn pop(&self) -> T {
+        pub(crate) fn pop(&self) -> T {
             loop {
                 match self.try_pop() {
                     None => continue,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/tests/loom.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/tests/loom.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-epoch/tests/loom.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-epoch/tests/loom.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,157 @@
+#![cfg(crossbeam_loom)]
+
+use crossbeam_epoch as epoch;
+use loom_crate as loom;
+
+use epoch::*;
+use epoch::{Atomic, Owned};
+use loom::sync::atomic::Ordering::{self, Acquire, Relaxed, Release};
+use loom::sync::Arc;
+use loom::thread::spawn;
+use std::mem::ManuallyDrop;
+use std::ptr;
+
+#[test]
+fn it_works() {
+    loom::model(|| {
+        let collector = Collector::new();
+        let item: Atomic<String> = Atomic::from(Owned::new(String::from("boom")));
+        let item2 = item.clone();
+        let collector2 = collector.clone();
+        let guard = collector.register().pin();
+
+        let jh = loom::thread::spawn(move || {
+            let guard = collector2.register().pin();
+            guard.defer(move || {
+                // this isn't really safe, since other threads may still have pointers to the
+                // value, but in this limited test scenario it's okay, since we know the test won't
+                // access item after all the pins are released.
+                let mut item = unsafe { item2.into_owned() };
+                // mutate it as a second measure to make sure the assert_eq below would fail
+                item.retain(|c| c == 'o');
+                drop(item);
+            });
+        });
+
+        let item = item.load(Ordering::SeqCst, &guard);
+        // we pinned strictly before the call to defer_destroy,
+        // so item cannot have been dropped yet
+        assert_eq!(*unsafe { item.deref() }, "boom");
+        drop(guard);
+
+        jh.join().unwrap();
+
+        drop(collector);
+    })
+}
+
+#[test]
+fn treiber_stack() {
+    /// Treiber's lock-free stack.
+    ///
+    /// Usable with any number of producers and consumers.
+    #[derive(Debug)]
+    pub struct TreiberStack<T> {
+        head: Atomic<Node<T>>,
+    }
+
+    #[derive(Debug)]
+    struct Node<T> {
+        data: ManuallyDrop<T>,
+        next: Atomic<Node<T>>,
+    }
+
+    impl<T> TreiberStack<T> {
+        /// Creates a new, empty stack.
+        pub fn new() -> TreiberStack<T> {
+            TreiberStack {
+                head: Atomic::null(),
+            }
+        }
+
+        /// Pushes a value on top of the stack.
+        pub fn push(&self, t: T) {
+            let mut n = Owned::new(Node {
+                data: ManuallyDrop::new(t),
+                next: Atomic::null(),
+            });
+
+            let guard = epoch::pin();
+
+            loop {
+                let head = self.head.load(Relaxed, &guard);
+                n.next.store(head, Relaxed);
+
+                match self
+                    .head
+                    .compare_exchange(head, n, Release, Relaxed, &guard)
+                {
+                    Ok(_) => break,
+                    Err(e) => n = e.new,
+                }
+            }
+        }
+
+        /// Attempts to pop the top element from the stack.
+        ///
+        /// Returns `None` if the stack is empty.
+        pub fn pop(&self) -> Option<T> {
+            let guard = epoch::pin();
+            loop {
+                let head = self.head.load(Acquire, &guard);
+
+                match unsafe { head.as_ref() } {
+                    Some(h) => {
+                        let next = h.next.load(Relaxed, &guard);
+
+                        if self
+                            .head
+                            .compare_exchange(head, next, Relaxed, Relaxed, &guard)
+                            .is_ok()
+                        {
+                            unsafe {
+                                guard.defer_destroy(head);
+                                return Some(ManuallyDrop::into_inner(ptr::read(&(*h).data)));
+                            }
+                        }
+                    }
+                    None => return None,
+                }
+            }
+        }
+
+        /// Returns `true` if the stack is empty.
+        pub fn is_empty(&self) -> bool {
+            let guard = epoch::pin();
+            self.head.load(Acquire, &guard).is_null()
+        }
+    }
+
+    impl<T> Drop for TreiberStack<T> {
+        fn drop(&mut self) {
+            while self.pop().is_some() {}
+        }
+    }
+
+    loom::model(|| {
+        let stack1 = Arc::new(TreiberStack::new());
+        let stack2 = Arc::clone(&stack1);
+
+        // use 5 since it's greater than the 4 used for the sanitize feature
+        let jh = spawn(move || {
+            for i in 0..5 {
+                stack2.push(i);
+                assert!(stack2.pop().is_some());
+            }
+        });
+
+        for i in 0..5 {
+            stack1.push(i);
+            assert!(stack1.pop().is_some());
+        }
+
+        jh.join().unwrap();
+        assert!(stack1.pop().is_none());
+        assert!(stack1.is_empty());
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,32 @@
+#![warn(rust_2018_idioms)]
+
+use std::env;
+
+include!("no_atomic.rs");
+
+// The rustc-cfg strings below are *not* public API. Please let us know by
+// opening a GitHub issue if your build environment requires some way to enable
+// these cfgs other than by executing our build script.
+fn main() {
+    let target = match env::var("TARGET") {
+        Ok(target) => target,
+        Err(e) => {
+            println!(
+                "cargo:warning={}: unable to get TARGET environment variable: {}",
+                env!("CARGO_PKG_NAME"),
+                e
+            );
+            return;
+        }
+    };
+
+    // Note that this is `no_*`, not `has_*`. This allows treating
+    // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't
+    // run. This is needed for compatibility with non-cargo build systems that
+    // don't run the build script.
+    if NO_ATOMIC_CAS.contains(&&*target) {
+        println!("cargo:rustc-cfg=crossbeam_no_atomic_cas");
+    }
+
+    println!("cargo:rerun-if-changed=no_atomic.rs");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"689dc2c6eca526bd8ee9705a4aebcde069c5010985694ae158b40dea5efdab0a","Cargo.toml":"b27fec4efaf117f72c4ccd7508bde07668c96250046a27abf6ab408d46448f7b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"abb1905b1c2b7db73902e6c328d332d82f3797d7fab61e6fc1c2fc366b132014","README.md":"1b69b0b08d31caa29b4214c3a53ea1025879565d9ce9f3abd67b3cce5339182e","src/array_queue.rs":"abddfc3a1fe5705da657f836d61b54c892921e9cb29264ae61f656befa83e197","src/lib.rs":"1294905b37f4b5aa48856f59a26fce0a524173ff764990889b8c71d8b4ad9806","src/seg_queue.rs":"4e663b882b446be460d4f53b34f98b802a9daee48825405919ff015f335e6d5c","tests/array_queue.rs":"5aee610e5b9b60ad4c101bf1fc7dd661880892046cc38b08c28674c0c2511031","tests/seg_queue.rs":"1a42e99a5806d6430c34374cfda5d70f708c50454de5510b79231597f6dd3eca"},"package":"0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"784848ad3f95f0aee5942d7005dd4474fe33e9cea524b9a1d1cac99ec6845e75","Cargo.toml":"4d064ffcf1ded6cc88270c44ef5afbf1320f4fe8bbd9f42b5da55ca57ff32c71","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2d4f1cc484ab54dfb9597bf121b3e8ef5416bb56ae52541976016a4776129447","build.rs":"c8684300062c73e96eae8877d03e145ee95e0cd99d4d933696caa582c08e2416","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/array_queue.rs":"9b660997f73743f7c48052f6cd860f070c46a7b2797fa045febaafe9dcdc970e","src/lib.rs":"effccc001c5168217291e435ae79f4889495cb943a6720d1e73e65b64831e4ed","src/seg_queue.rs":"d494b248afb9e09d78174c8827248fa09a85107717a426c2069f30b4653b829e","tests/array_queue.rs":"97668ab362f68b046890a3b07ee2ca981974b21b445fda5ac599d3dddf1e7e0b","tests/seg_queue.rs":"8e1bbaa4f6f0d86e74da1a3ed74eb6575db55da895b62353fd4a2b47fd4e9394"},"package":"9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,24 +13,23 @@
 [package]
 edition = "2018"
 name = "crossbeam-queue"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["The Crossbeam Project Developers"]
 description = "Concurrent queues"
-homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
+homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-queue"
 documentation = "https://docs.rs/crossbeam-queue"
-readme = "README.md"
 keywords = ["queue", "mpmc", "lock-free", "producer", "consumer"]
-categories = ["concurrency", "data-structures"]
+categories = ["concurrency", "data-structures", "no-std"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/crossbeam-rs/crossbeam"
 [dependencies.cfg-if]
 version = "1"
 
 [dependencies.crossbeam-utils]
-version = "0.8"
+version = "0.8.5"
 default-features = false
 [dev-dependencies.rand]
-version = "0.7.3"
+version = "0.8"
 
 [features]
 alloc = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,7 @@
+# Version 0.3.2
+
+- Support targets that do not have atomic CAS on stable Rust (#698)
+
 # Version 0.3.1
 
 - Make `SegQueue::new` const fn. (#584)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/LICENSE-THIRD-PARTY thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/LICENSE-THIRD-PARTY
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/LICENSE-THIRD-PARTY	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/LICENSE-THIRD-PARTY	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-===============================================================================
-
-Bounded MPMC queue
-http://www.1024cores.net/home/code-license
-
-Copyright (c) 2010-2011 Dmitry Vyukov.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL DMITRY VYUKOV OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those
-of the authors and should not be interpreted as representing official policies,
-either expressed or implied, of Dmitry Vyukov.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/no_atomic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/no_atomic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/no_atomic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/no_atomic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,59 @@
+// This file is @generated by no_atomic.sh.
+// It is not intended for manual editing.
+
+const NO_ATOMIC_CAS: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
+#[allow(dead_code)]
+const NO_ATOMIC_64: &[&str] = &[
+    "arm-linux-androideabi",
+    "armebv7r-none-eabi",
+    "armebv7r-none-eabihf",
+    "armv4t-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-musleabi",
+    "armv5te-unknown-linux-uclibceabi",
+    "armv7r-none-eabi",
+    "armv7r-none-eabihf",
+    "hexagon-unknown-linux-musl",
+    "mips-unknown-linux-gnu",
+    "mips-unknown-linux-musl",
+    "mips-unknown-linux-uclibc",
+    "mipsel-unknown-linux-gnu",
+    "mipsel-unknown-linux-musl",
+    "mipsel-unknown-linux-uclibc",
+    "mipsel-unknown-none",
+    "mipsisa32r6-unknown-linux-gnu",
+    "mipsisa32r6el-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnuspe",
+    "powerpc-unknown-linux-musl",
+    "powerpc-unknown-netbsd",
+    "powerpc-unknown-openbsd",
+    "powerpc-wrs-vxworks",
+    "powerpc-wrs-vxworks-spe",
+    "riscv32gc-unknown-linux-gnu",
+    "riscv32gc-unknown-linux-musl",
+    "riscv32imac-unknown-none-elf",
+    "thumbv7em-none-eabi",
+    "thumbv7em-none-eabihf",
+    "thumbv7m-none-eabi",
+    "thumbv8m.base-none-eabi",
+    "thumbv8m.main-none-eabi",
+    "thumbv8m.main-none-eabihf",
+    "mipsel-sony-psp",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
+#[allow(dead_code)]
+const NO_ATOMIC: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
 https://github.com/crossbeam-rs/crossbeam/actions)
-[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
+[![License](https://img.shields.io/badge/license-MIT_OR_Apache--2.0-blue.svg)](
 https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-queue#license)
 [![Cargo](https://img.shields.io/crates/v/crossbeam-queue.svg)](
 https://crates.io/crates/crossbeam-queue)
@@ -10,13 +10,16 @@
 https://docs.rs/crossbeam-queue)
 [![Rust 1.36+](https://img.shields.io/badge/rust-1.36+-lightgray.svg)](
 https://www.rust-lang.org)
-[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)
 
 This crate provides concurrent queues that can be shared among threads:
 
 * [`ArrayQueue`], a bounded MPMC queue that allocates a fixed-capacity buffer on construction.
 * [`SegQueue`], an unbounded MPMC queue that allocates small buffers, segments, on demand.
 
+Everything in this crate can be used in `no_std` environments, provided that `alloc` feature is
+enabled.
+
 [`ArrayQueue`]: https://docs.rs/crossbeam-queue/*/crossbeam_queue/struct.ArrayQueue.html
 [`SegQueue`]: https://docs.rs/crossbeam-queue/*/crossbeam_queue/struct.SegQueue.html
 
@@ -49,15 +52,3 @@
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
 dual licensed as above, without any additional terms or conditions.
-
-#### Third party software
-
-This product includes copies and modifications of software developed by third parties:
-
-* [src/array_queue.rs](src/array_queue.rs) is based on
-  [Bounded MPMC queue](http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue)
-  by Dmitry Vyukov, licensed under the Simplified BSD License and the Apache License, Version 2.0.
-
-See the source code files for more details.
-
-Copies of third party licenses can be found in [LICENSE-THIRD-PARTY](LICENSE-THIRD-PARTY).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/src/array_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/src/array_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/src/array_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/src/array_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,11 +2,6 @@
 //!
 //! Source:
 //!   - <http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue>
-//!
-//! Copyright & License:
-//!   - Copyright (c) 2010-2011 Dmitry Vyukov
-//!   - Simplified BSD License and Apache License, Version 2.0
-//!   - <http://www.1024cores.net/home/code-license>
 
 use alloc::boxed::Box;
 use core::cell::UnsafeCell;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,13 +12,15 @@
         allow(dead_code, unused_assignments, unused_variables)
     )
 ))]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
+#![warn(
+    missing_docs,
+    missing_debug_implementations,
+    rust_2018_idioms,
+    unreachable_pub
+)]
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
-// matches! requires Rust 1.42
-#![allow(clippy::match_like_matches_macro)]
 
-#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
+#[cfg(not(crossbeam_no_atomic_cas))]
 cfg_if::cfg_if! {
     if #[cfg(feature = "alloc")] {
         extern crate alloc;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/src/seg_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/src/seg_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/src/seg_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/src/seg_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -213,8 +213,8 @@
                 if self
                     .tail
                     .block
-                    .compare_and_swap(block, new, Ordering::Release)
-                    == block
+                    .compare_exchange(block, new, Ordering::Release, Ordering::Relaxed)
+                    .is_ok()
                 {
                     self.head.block.store(new, Ordering::Release);
                     block = new;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/tests/array_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/tests/array_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/tests/array_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/tests/array_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -196,8 +196,8 @@
     let mut rng = thread_rng();
 
     for _ in 0..RUNS {
-        let steps = rng.gen_range(0, 10_000);
-        let additional = rng.gen_range(0, 50);
+        let steps = rng.gen_range(0..10_000);
+        let additional = rng.gen_range(0..50);
 
         DROPS.store(0, Ordering::SeqCst);
         let q = ArrayQueue::new(50);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/tests/seg_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/tests/seg_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-queue/tests/seg_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-queue/tests/seg_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -131,8 +131,8 @@
     let mut rng = thread_rng();
 
     for _ in 0..100 {
-        let steps = rng.gen_range(0, 10_000);
-        let additional = rng.gen_range(0, 1000);
+        let steps = rng.gen_range(0..10_000);
+        let additional = rng.gen_range(0..1000);
 
         DROPS.store(0, Ordering::SeqCst);
         let q = SegQueue::new();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/benches/atomic_cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/benches/atomic_cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/benches/atomic_cell.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/benches/atomic_cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,11 +28,11 @@
 }
 
 #[bench]
-fn compare_and_swap_u8(b: &mut test::Bencher) {
+fn compare_exchange_u8(b: &mut test::Bencher) {
     let a = AtomicCell::new(0u8);
     let mut i = 0;
     b.iter(|| {
-        a.compare_and_swap(i, i.wrapping_add(1));
+        let _ = a.compare_exchange(i, i.wrapping_add(1));
         i = i.wrapping_add(1);
     });
 }
@@ -102,11 +102,11 @@
 }
 
 #[bench]
-fn compare_and_swap_usize(b: &mut test::Bencher) {
+fn compare_exchange_usize(b: &mut test::Bencher) {
     let a = AtomicCell::new(0usize);
     let mut i = 0;
     b.iter(|| {
-        a.compare_and_swap(i, i.wrapping_add(1));
+        let _ = a.compare_exchange(i, i.wrapping_add(1));
         i = i.wrapping_add(1);
     });
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,23 +1,40 @@
-use autocfg::AutoCfg;
+#![warn(rust_2018_idioms)]
+
+use std::env;
+
+include!("no_atomic.rs");
 
 // The rustc-cfg strings below are *not* public API. Please let us know by
 // opening a GitHub issue if your build environment requires some way to enable
 // these cfgs other than by executing our build script.
 fn main() {
-    let cfg = match AutoCfg::new() {
-        Ok(cfg) => cfg,
+    let target = match env::var("TARGET") {
+        Ok(target) => target,
         Err(e) => {
             println!(
-                "cargo:warning=crossbeam-utils: unable to determine rustc version: {}",
+                "cargo:warning={}: unable to get TARGET environment variable: {}",
+                env!("CARGO_PKG_NAME"),
                 e
             );
             return;
         }
     };
 
-    cfg.emit_type_cfg("core::sync::atomic::AtomicU8", "has_atomic_u8");
-    cfg.emit_type_cfg("core::sync::atomic::AtomicU16", "has_atomic_u16");
-    cfg.emit_type_cfg("core::sync::atomic::AtomicU32", "has_atomic_u32");
-    cfg.emit_type_cfg("core::sync::atomic::AtomicU64", "has_atomic_u64");
-    cfg.emit_type_cfg("core::sync::atomic::AtomicU128", "has_atomic_u128");
+    // Note that this is `no_*`, not `has_*`. This allows treating
+    // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't
+    // run. This is needed for compatibility with non-cargo build systems that
+    // don't run the build script.
+    if NO_ATOMIC_CAS.contains(&&*target) {
+        println!("cargo:rustc-cfg=crossbeam_no_atomic_cas");
+    }
+    if NO_ATOMIC.contains(&&*target) {
+        println!("cargo:rustc-cfg=crossbeam_no_atomic");
+        println!("cargo:rustc-cfg=crossbeam_no_atomic_64");
+    } else if NO_ATOMIC_64.contains(&&*target) {
+        println!("cargo:rustc-cfg=crossbeam_no_atomic_64");
+    } else {
+        // Otherwise, assuming `"max-atomic-width" == 64`.
+    }
+
+    println!("cargo:rerun-if-changed=no_atomic.rs");
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"36557d1a612004b5108ed46be3716bb2e06368d5bb0cd9e7ea4b6bcc4d81c07a","Cargo.toml":"648a34c3609f0cb729929fd5c6d1288475232a4daeb79363e629ecadcc5d3a4f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"5bbcf23ea854d44870790a316dbcdb8d7b0c2e0f17a521e8d4fbffdd9dd5b464","benches/atomic_cell.rs":"de327015cf811fb74b7a624719f678ba0677025dc703d56cbd2094a3c92da23b","build.rs":"f927f9796b0cbae832f458e82833b24c7ced9f27f4f1e76de9d11ad30d21c88a","src/atomic/atomic_cell.rs":"4b86367084da93176c335650524220ef7b3df4df09b6535d0b55a03446dee7e0","src/atomic/consume.rs":"1ee5de160b6e3755c02940c24fa90f85f3ef2f7afb971e9e9c6f481609bbc7b7","src/atomic/mod.rs":"c84d068944388c1385d6fec9211b6be26c777a21fc04e7231d1f3b564de62708","src/atomic/seq_lock.rs":"ee50097cd582cfe6e28ebc54935fc6488f52e2fed19d4b26bafd5eab5c229291","src/atomic/seq_lock_wide.rs":"f03ee779c2ebebcfb0df8baac49be7d38e920876260c8da9dff0fc894068c35d","src/backoff.rs":"98d1daee75bbd6243bc0784c92c56086e57658baff93a2a1f0729426901c03ee","src/cache_padded.rs":"5671f3a02f6e407f1dc562d4fb17e4659f18d1e5206b8566b38d2e447e5f6fa4","src/lib.rs":"61c6bc2b43d87550c4547693f3eacfe126581560a8884b32b23f01a7e2c6d833","src/sync/mod.rs":"e5f4087c4e63b0e6e0b291f3946a224aa9d2a4a0c299c23014b822d6346f6986","src/sync/parker.rs":"6137fccce8c03045440cbc3166721e4e4b5f73013165c9c260cff904cfcab6f3","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"932e11753764b238f764892978a6b70fb288111faf7fae7766e603bed4e5b444","src/thread.rs":"6c44bf4c4515a769b8ccd0c9d9b80f5b46bd4768ec323a909773301d375033fb","tests/atomic_cell.rs":"5efe71777d7687ee01e387d5ca20436c3e8171e1e879a63074d1f79ccc88ff5e","tests/cache_padded.rs":"6ba6ad1b3060bfb2f7bf0a1d006f949d91c49e506564b0d28e4f06129b94665d","tests/parker.rs":"a1f63cf99b3524bfc91d0797133d0b75165445ecbaa92f78bd8101fa7cc828ec","tests/sharded_lock.rs":"c7d9f7185900b3ff84d00f5252793d5d28c47374678b8e6f758a67fa32c71fca","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"68cfc4be02429834a19411fba29cb1cb52c841f03ac8104d1bae59a8b2184f9c","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,12 +13,11 @@
 [package]
 edition = "2018"
 name = "crossbeam-utils"
-version = "0.8.1"
+version = "0.8.5"
 authors = ["The Crossbeam Project Developers"]
 description = "Utilities for concurrent programming"
 homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
 documentation = "https://docs.rs/crossbeam-utils"
-readme = "README.md"
 keywords = ["scoped", "thread", "atomic", "cache"]
 categories = ["algorithms", "concurrency", "data-structures", "no-std"]
 license = "MIT OR Apache-2.0"
@@ -30,11 +29,12 @@
 version = "1.4.0"
 optional = true
 [dev-dependencies.rand]
-version = "0.7.3"
-[build-dependencies.autocfg]
-version = "1.0.0"
+version = "0.8"
 
 [features]
 default = ["std"]
 nightly = []
 std = ["lazy_static"]
+[target."cfg(crossbeam_loom)".dependencies.loom]
+version = "0.5"
+optional = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,23 @@
+# Version 0.8.5
+
+- Add `AtomicCell::fetch_update` (#704)
+- Support targets that do not have atomic CAS on stable Rust (#698)
+
+# Version 0.8.4
+
+- Bump `loom` dependency to version 0.5. (#686)
+
+# Version 0.8.3
+
+- Make `loom` dependency optional. (#666)
+
+# Version 0.8.2
+
+- Deprecate `AtomicCell::compare_and_swap`. Use `AtomicCell::compare_exchange` instead. (#619)
+- Add `Parker::park_deadline`. (#563)
+- Improve implementation of `CachePadded`. (#636)
+- Add unstable support for `loom`. (#487)
+
 # Version 0.8.1
 
 - Make `AtomicCell::is_lock_free` always const fn. (#600)
@@ -8,7 +28,7 @@
 # Version 0.8.0
 
 - Bump the minimum supported Rust version to 1.36.
-- Remove deprecated `AtomicCell::get_mut()` and `Backoff::is_complete()` methods
+- Remove deprecated `AtomicCell::get_mut()` and `Backoff::is_complete()` methods.
 - Remove `alloc` feature.
 - Make `CachePadded::new()` const function.
 - Make `AtomicCell::is_lock_free()` const function at 1.46+.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/no_atomic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/no_atomic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/no_atomic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/no_atomic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,59 @@
+// This file is @generated by no_atomic.sh.
+// It is not intended for manual editing.
+
+const NO_ATOMIC_CAS: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
+#[allow(dead_code)]
+const NO_ATOMIC_64: &[&str] = &[
+    "arm-linux-androideabi",
+    "armebv7r-none-eabi",
+    "armebv7r-none-eabihf",
+    "armv4t-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-gnueabi",
+    "armv5te-unknown-linux-musleabi",
+    "armv5te-unknown-linux-uclibceabi",
+    "armv7r-none-eabi",
+    "armv7r-none-eabihf",
+    "hexagon-unknown-linux-musl",
+    "mips-unknown-linux-gnu",
+    "mips-unknown-linux-musl",
+    "mips-unknown-linux-uclibc",
+    "mipsel-unknown-linux-gnu",
+    "mipsel-unknown-linux-musl",
+    "mipsel-unknown-linux-uclibc",
+    "mipsel-unknown-none",
+    "mipsisa32r6-unknown-linux-gnu",
+    "mipsisa32r6el-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnu",
+    "powerpc-unknown-linux-gnuspe",
+    "powerpc-unknown-linux-musl",
+    "powerpc-unknown-netbsd",
+    "powerpc-unknown-openbsd",
+    "powerpc-wrs-vxworks",
+    "powerpc-wrs-vxworks-spe",
+    "riscv32gc-unknown-linux-gnu",
+    "riscv32gc-unknown-linux-musl",
+    "riscv32imac-unknown-none-elf",
+    "thumbv7em-none-eabi",
+    "thumbv7em-none-eabihf",
+    "thumbv7m-none-eabi",
+    "thumbv8m.base-none-eabi",
+    "thumbv8m.main-none-eabi",
+    "thumbv8m.main-none-eabihf",
+    "mipsel-sony-psp",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
+#[allow(dead_code)]
+const NO_ATOMIC: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/crossbeam-rs/crossbeam/workflows/CI/badge.svg)](
 https://github.com/crossbeam-rs/crossbeam/actions)
-[![License](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](
+[![License](https://img.shields.io/badge/license-MIT_OR_Apache--2.0-blue.svg)](
 https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils#license)
 [![Cargo](https://img.shields.io/crates/v/crossbeam-utils.svg)](
 https://crates.io/crates/crossbeam-utils)
@@ -10,7 +10,7 @@
 https://docs.rs/crossbeam-utils)
 [![Rust 1.36+](https://img.shields.io/badge/rust-1.36+-lightgray.svg)](
 https://www.rust-lang.org)
-[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)
 
 This crate provides miscellaneous tools for concurrent programming:
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/atomic_cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/atomic_cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/atomic_cell.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/atomic_cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,15 +2,19 @@
 #![allow(clippy::unit_arg)]
 #![allow(clippy::let_unit_value)]
 
+use crate::primitive::sync::atomic::{self, AtomicBool};
 use core::cell::UnsafeCell;
 use core::fmt;
 use core::mem;
+use core::sync::atomic::Ordering;
+
+#[cfg(not(crossbeam_loom))]
 use core::ptr;
-use core::sync::atomic::{self, AtomicBool, Ordering};
 
 #[cfg(feature = "std")]
 use std::panic::{RefUnwindSafe, UnwindSafe};
 
+#[cfg(not(crossbeam_loom))]
 use super::seq_lock::SeqLock;
 
 /// A thread-safe mutable memory location.
@@ -213,6 +217,7 @@
     /// # Examples
     ///
     /// ```
+    /// # #![allow(deprecated)]
     /// use crossbeam_utils::atomic::AtomicCell;
     ///
     /// let a = AtomicCell::new(1);
@@ -223,6 +228,8 @@
     /// assert_eq!(a.compare_and_swap(1, 2), 1);
     /// assert_eq!(a.load(), 2);
     /// ```
+    // TODO: remove in the next major version.
+    #[deprecated(note = "Use `compare_exchange` instead")]
     pub fn compare_and_swap(&self, current: T, new: T) -> T {
         match self.compare_exchange(current, new) {
             Ok(v) => v,
@@ -251,6 +258,40 @@
     pub fn compare_exchange(&self, current: T, new: T) -> Result<T, T> {
         unsafe { atomic_compare_exchange_weak(self.value.get(), current, new) }
     }
+
+    /// Fetches the value, and applies a function to it that returns an optional
+    /// new value. Returns a `Result` of `Ok(previous_value)` if the function returned `Some(_)`, else
+    /// `Err(previous_value)`.
+    ///
+    /// Note: This may call the function multiple times if the value has been changed from other threads in
+    /// the meantime, as long as the function returns `Some(_)`, but the function will have been applied
+    /// only once to the stored value.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(7);
+    /// assert_eq!(a.fetch_update(|_| None), Err(7));
+    /// assert_eq!(a.fetch_update(|a| Some(a + 1)), Ok(7));
+    /// assert_eq!(a.fetch_update(|a| Some(a + 1)), Ok(8));
+    /// assert_eq!(a.load(), 9);
+    /// ```
+    #[inline]
+    pub fn fetch_update<F>(&self, mut f: F) -> Result<T, T>
+    where
+        F: FnMut(T) -> Option<T>,
+    {
+        let mut prev = self.load();
+        while let Some(next) = f(prev) {
+            match self.compare_exchange(prev, next) {
+                x @ Ok(_) => return x,
+                Err(next_prev) => prev = next_prev,
+            }
+        }
+        Err(prev)
+    }
 }
 
 macro_rules! impl_arithmetic {
@@ -490,26 +531,19 @@
     };
 }
 
-#[cfg(has_atomic_u8)]
 impl_arithmetic!(u8, atomic::AtomicU8, "let a = AtomicCell::new(7u8);");
-#[cfg(has_atomic_u8)]
 impl_arithmetic!(i8, atomic::AtomicI8, "let a = AtomicCell::new(7i8);");
-#[cfg(has_atomic_u16)]
 impl_arithmetic!(u16, atomic::AtomicU16, "let a = AtomicCell::new(7u16);");
-#[cfg(has_atomic_u16)]
 impl_arithmetic!(i16, atomic::AtomicI16, "let a = AtomicCell::new(7i16);");
-#[cfg(has_atomic_u32)]
 impl_arithmetic!(u32, atomic::AtomicU32, "let a = AtomicCell::new(7u32);");
-#[cfg(has_atomic_u32)]
 impl_arithmetic!(i32, atomic::AtomicI32, "let a = AtomicCell::new(7i32);");
-#[cfg(has_atomic_u64)]
+#[cfg(not(crossbeam_no_atomic_64))]
 impl_arithmetic!(u64, atomic::AtomicU64, "let a = AtomicCell::new(7u64);");
-#[cfg(has_atomic_u64)]
+#[cfg(not(crossbeam_no_atomic_64))]
 impl_arithmetic!(i64, atomic::AtomicI64, "let a = AtomicCell::new(7i64);");
-#[cfg(has_atomic_u128)]
-impl_arithmetic!(u128, atomic::AtomicU128, "let a = AtomicCell::new(7u128);");
-#[cfg(has_atomic_u128)]
-impl_arithmetic!(i128, atomic::AtomicI128, "let  a = AtomicCell::new(7i128);");
+// TODO: AtomicU128 is unstable
+// impl_arithmetic!(u128, atomic::AtomicU128, "let a = AtomicCell::new(7u128);");
+// impl_arithmetic!(i128, atomic::AtomicI128, "let a = AtomicCell::new(7i128);");
 
 impl_arithmetic!(
     usize,
@@ -624,6 +658,7 @@
 /// scalability.
 #[inline]
 #[must_use]
+#[cfg(not(crossbeam_loom))]
 fn lock(addr: usize) -> &'static SeqLock {
     // The number of locks is a prime number because we want to make sure `addr % LEN` gets
     // dispersed across all locks.
@@ -769,6 +804,7 @@
     #[inline]
     fn swap(&self, _val: (), _order: Ordering) {}
 
+    #[allow(clippy::unnecessary_wraps)] // This is intentional.
     #[inline]
     fn compare_exchange_weak(
         &self,
@@ -799,17 +835,17 @@
             atomic!(@check, $t, AtomicUnit, $a, $atomic_op);
             atomic!(@check, $t, atomic::AtomicUsize, $a, $atomic_op);
 
-            #[cfg(has_atomic_u8)]
             atomic!(@check, $t, atomic::AtomicU8, $a, $atomic_op);
-            #[cfg(has_atomic_u16)]
             atomic!(@check, $t, atomic::AtomicU16, $a, $atomic_op);
-            #[cfg(has_atomic_u32)]
             atomic!(@check, $t, atomic::AtomicU32, $a, $atomic_op);
-            #[cfg(has_atomic_u64)]
+            #[cfg(not(crossbeam_no_atomic_64))]
             atomic!(@check, $t, atomic::AtomicU64, $a, $atomic_op);
-            #[cfg(has_atomic_u128)]
-            atomic!(@check, $t, atomic::AtomicU128, $a, $atomic_op);
+            // TODO: AtomicU128 is unstable
+            // atomic!(@check, $t, atomic::AtomicU128, $a, $atomic_op);
 
+            #[cfg(crossbeam_loom)]
+            unimplemented!("loom does not support non-atomic atomic ops");
+            #[cfg(not(crossbeam_loom))]
             break $fallback_op;
         }
     };
@@ -818,17 +854,15 @@
 /// Returns `true` if operations on `AtomicCell<T>` are lock-free.
 const fn atomic_is_lock_free<T>() -> bool {
     // HACK(taiki-e): This is equivalent to `atomic! { T, _a, true, false }`, but can be used in const fn even in Rust 1.36.
-    let is_lock_free = can_transmute::<T, AtomicUnit>() | can_transmute::<T, atomic::AtomicUsize>();
-    #[cfg(has_atomic_u8)]
-    let is_lock_free = is_lock_free | can_transmute::<T, atomic::AtomicU8>();
-    #[cfg(has_atomic_u16)]
-    let is_lock_free = is_lock_free | can_transmute::<T, atomic::AtomicU16>();
-    #[cfg(has_atomic_u32)]
-    let is_lock_free = is_lock_free | can_transmute::<T, atomic::AtomicU32>();
-    #[cfg(has_atomic_u64)]
+    let is_lock_free = can_transmute::<T, AtomicUnit>()
+        | can_transmute::<T, atomic::AtomicUsize>()
+        | can_transmute::<T, atomic::AtomicU8>()
+        | can_transmute::<T, atomic::AtomicU16>()
+        | can_transmute::<T, atomic::AtomicU32>();
+    #[cfg(not(crossbeam_no_atomic_64))]
     let is_lock_free = is_lock_free | can_transmute::<T, atomic::AtomicU64>();
-    #[cfg(has_atomic_u128)]
-    let is_lock_free = is_lock_free | can_transmute::<T, atomic::AtomicU128>();
+    // TODO: AtomicU128 is unstable
+    // let is_lock_free = is_lock_free | can_transmute::<T, atomic::AtomicU128>();
     is_lock_free
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/consume.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/consume.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/consume.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/consume.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
-use core::sync::atomic::compiler_fence;
+use crate::primitive::sync::atomic::compiler_fence;
+#[cfg(not(crossbeam_no_atomic))]
 use core::sync::atomic::Ordering;
 
 /// Trait which allows reading from primitive atomic types with "consume" ordering.
@@ -25,6 +26,7 @@
     fn load_consume(&self) -> Self::Val;
 }
 
+#[cfg(not(crossbeam_no_atomic))]
 #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
 macro_rules! impl_consume {
     () => {
@@ -37,6 +39,7 @@
     };
 }
 
+#[cfg(not(crossbeam_no_atomic))]
 #[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
 macro_rules! impl_consume {
     () => {
@@ -49,7 +52,13 @@
 
 macro_rules! impl_atomic {
     ($atomic:ident, $val:ty) => {
-        impl AtomicConsume for ::core::sync::atomic::$atomic {
+        #[cfg(not(crossbeam_no_atomic))]
+        impl AtomicConsume for core::sync::atomic::$atomic {
+            type Val = $val;
+            impl_consume!();
+        }
+        #[cfg(crossbeam_loom)]
+        impl AtomicConsume for loom::sync::atomic::$atomic {
             type Val = $val;
             impl_consume!();
         }
@@ -59,24 +68,25 @@
 impl_atomic!(AtomicBool, bool);
 impl_atomic!(AtomicUsize, usize);
 impl_atomic!(AtomicIsize, isize);
-#[cfg(has_atomic_u8)]
 impl_atomic!(AtomicU8, u8);
-#[cfg(has_atomic_u8)]
 impl_atomic!(AtomicI8, i8);
-#[cfg(has_atomic_u16)]
 impl_atomic!(AtomicU16, u16);
-#[cfg(has_atomic_u16)]
 impl_atomic!(AtomicI16, i16);
-#[cfg(has_atomic_u32)]
 impl_atomic!(AtomicU32, u32);
-#[cfg(has_atomic_u32)]
 impl_atomic!(AtomicI32, i32);
-#[cfg(has_atomic_u64)]
+#[cfg(not(crossbeam_no_atomic_64))]
 impl_atomic!(AtomicU64, u64);
-#[cfg(has_atomic_u64)]
+#[cfg(not(crossbeam_no_atomic_64))]
 impl_atomic!(AtomicI64, i64);
 
-impl<T> AtomicConsume for ::core::sync::atomic::AtomicPtr<T> {
+#[cfg(not(crossbeam_no_atomic))]
+impl<T> AtomicConsume for core::sync::atomic::AtomicPtr<T> {
+    type Val = *mut T;
+    impl_consume!();
+}
+
+#[cfg(crossbeam_loom)]
+impl<T> AtomicConsume for loom::sync::atomic::AtomicPtr<T> {
     type Val = *mut T;
     impl_consume!();
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,11 @@
 //! Atomic types.
+//!
+//! * [`AtomicCell`], a thread-safe mutable memory location.
+//! * [`AtomicConsume`], for reading from primitive atomic types with "consume" ordering.
 
-use cfg_if::cfg_if;
-
-cfg_if! {
+#[cfg(not(crossbeam_no_atomic_cas))]
+#[cfg(not(crossbeam_loom))]
+cfg_if::cfg_if! {
     // Use "wide" sequence lock if the pointer width <= 32 for preventing its counter against wrap
     // around.
     //
@@ -20,8 +23,10 @@
     }
 }
 
+#[cfg(not(crossbeam_no_atomic_cas))]
 mod atomic_cell;
 mod consume;
 
+#[cfg(not(crossbeam_no_atomic_cas))]
 pub use self::atomic_cell::AtomicCell;
 pub use self::consume::AtomicConsume;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/seq_lock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/seq_lock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/seq_lock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/seq_lock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 use crate::Backoff;
 
 /// A simple stamped lock.
-pub struct SeqLock {
+pub(crate) struct SeqLock {
     /// The current state of the lock.
     ///
     /// All bits except the least significant one hold the current stamp. When locked, the state
@@ -13,7 +13,7 @@
 }
 
 impl SeqLock {
-    pub const fn new() -> Self {
+    pub(crate) const fn new() -> Self {
         Self {
             state: AtomicUsize::new(0),
         }
@@ -23,7 +23,7 @@
     ///
     /// This method should be called before optimistic reads.
     #[inline]
-    pub fn optimistic_read(&self) -> Option<usize> {
+    pub(crate) fn optimistic_read(&self) -> Option<usize> {
         let state = self.state.load(Ordering::Acquire);
         if state == 1 {
             None
@@ -37,14 +37,14 @@
     /// This method should be called after optimistic reads to check whether they are valid. The
     /// argument `stamp` should correspond to the one returned by method `optimistic_read`.
     #[inline]
-    pub fn validate_read(&self, stamp: usize) -> bool {
+    pub(crate) fn validate_read(&self, stamp: usize) -> bool {
         atomic::fence(Ordering::Acquire);
         self.state.load(Ordering::Relaxed) == stamp
     }
 
     /// Grabs the lock for writing.
     #[inline]
-    pub fn write(&'static self) -> SeqLockWriteGuard {
+    pub(crate) fn write(&'static self) -> SeqLockWriteGuard {
         let backoff = Backoff::new();
         loop {
             let previous = self.state.swap(1, Ordering::Acquire);
@@ -64,7 +64,7 @@
 }
 
 /// An RAII guard that releases the lock and increments the stamp when dropped.
-pub struct SeqLockWriteGuard {
+pub(crate) struct SeqLockWriteGuard {
     /// The parent lock.
     lock: &'static SeqLock,
 
@@ -75,7 +75,7 @@
 impl SeqLockWriteGuard {
     /// Releases the lock without incrementing the stamp.
     #[inline]
-    pub fn abort(self) {
+    pub(crate) fn abort(self) {
         self.lock.state.store(self.state, Ordering::Release);
 
         // We specifically don't want to call drop(), since that's
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/seq_lock_wide.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/seq_lock_wide.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/seq_lock_wide.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/atomic/seq_lock_wide.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
 ///
 /// The state is represented as two `AtomicUsize`: `state_hi` for high bits and `state_lo` for low
 /// bits.
-pub struct SeqLock {
+pub(crate) struct SeqLock {
     /// The high bits of the current state of the lock.
     state_hi: AtomicUsize,
 
@@ -19,7 +19,7 @@
 }
 
 impl SeqLock {
-    pub const fn new() -> Self {
+    pub(crate) const fn new() -> Self {
         Self {
             state_hi: AtomicUsize::new(0),
             state_lo: AtomicUsize::new(0),
@@ -30,7 +30,7 @@
     ///
     /// This method should be called before optimistic reads.
     #[inline]
-    pub fn optimistic_read(&self) -> Option<(usize, usize)> {
+    pub(crate) fn optimistic_read(&self) -> Option<(usize, usize)> {
         // The acquire loads from `state_hi` and `state_lo` synchronize with the release stores in
         // `SeqLockWriteGuard::drop`.
         //
@@ -51,7 +51,7 @@
     /// This method should be called after optimistic reads to check whether they are valid. The
     /// argument `stamp` should correspond to the one returned by method `optimistic_read`.
     #[inline]
-    pub fn validate_read(&self, stamp: (usize, usize)) -> bool {
+    pub(crate) fn validate_read(&self, stamp: (usize, usize)) -> bool {
         // Thanks to the fence, if we're noticing any modification to the data at the critical
         // section of `(a, b)`, then the critical section's write of 1 to state_lo should be
         // visible.
@@ -76,7 +76,7 @@
 
     /// Grabs the lock for writing.
     #[inline]
-    pub fn write(&'static self) -> SeqLockWriteGuard {
+    pub(crate) fn write(&'static self) -> SeqLockWriteGuard {
         let backoff = Backoff::new();
         loop {
             let previous = self.state_lo.swap(1, Ordering::Acquire);
@@ -98,7 +98,7 @@
 }
 
 /// An RAII guard that releases the lock and increments the stamp when dropped.
-pub struct SeqLockWriteGuard {
+pub(crate) struct SeqLockWriteGuard {
     /// The parent lock.
     lock: &'static SeqLock,
 
@@ -109,7 +109,7 @@
 impl SeqLockWriteGuard {
     /// Releases the lock without incrementing the stamp.
     #[inline]
-    pub fn abort(self) {
+    pub(crate) fn abort(self) {
         self.lock.state_lo.store(self.state_lo, Ordering::Release);
         mem::forget(self);
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/backoff.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/backoff.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/backoff.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/backoff.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
+use crate::primitive::sync::atomic;
 use core::cell::Cell;
 use core::fmt;
-use core::sync::atomic;
 
 const SPIN_LIMIT: u32 = 6;
 const YIELD_LIMIT: u32 = 10;
@@ -27,7 +27,7 @@
 ///     let backoff = Backoff::new();
 ///     loop {
 ///         let val = a.load(SeqCst);
-///         if a.compare_and_swap(val, val.wrapping_mul(b), SeqCst) == val {
+///         if a.compare_exchange(val, val.wrapping_mul(b), SeqCst, SeqCst).is_ok() {
 ///             return val;
 ///         }
 ///         backoff.spin();
@@ -131,7 +131,7 @@
     ///     let backoff = Backoff::new();
     ///     loop {
     ///         let val = a.load(SeqCst);
-    ///         if a.compare_and_swap(val, val.wrapping_mul(b), SeqCst) == val {
+    ///         if a.compare_exchange(val, val.wrapping_mul(b), SeqCst, SeqCst).is_ok() {
     ///             return val;
     ///         }
     ///         backoff.spin();
@@ -145,6 +145,9 @@
     #[inline]
     pub fn spin(&self) {
         for _ in 0..1 << self.step.get().min(SPIN_LIMIT) {
+            // TODO(taiki-e): once we bump the minimum required Rust version to 1.49+,
+            // use [`core::hint::spin_loop`] instead.
+            #[allow(deprecated)]
             atomic::spin_loop_hint();
         }
 
@@ -205,11 +208,17 @@
     pub fn snooze(&self) {
         if self.step.get() <= SPIN_LIMIT {
             for _ in 0..1 << self.step.get() {
+                // TODO(taiki-e): once we bump the minimum required Rust version to 1.49+,
+                // use [`core::hint::spin_loop`] instead.
+                #[allow(deprecated)]
                 atomic::spin_loop_hint();
             }
         } else {
             #[cfg(not(feature = "std"))]
             for _ in 0..1 << self.step.get() {
+                // TODO(taiki-e): once we bump the minimum required Rust version to 1.49+,
+                // use [`core::hint::spin_loop`] instead.
+                #[allow(deprecated)]
                 atomic::spin_loop_hint();
             }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/cache_padded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/cache_padded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/cache_padded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/cache_padded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,9 @@
 ///
 /// Cache lines are assumed to be N bytes long, depending on the architecture:
 ///
-/// * On x86-64 and aarch64, N = 128.
+/// * On x86-64, aarch64, and powerpc64, N = 128.
+/// * On arm, mips, mips64, and riscv64, N = 32.
+/// * On s390x, N = 256.
 /// * On all others, N = 64.
 ///
 /// Note that N is just a reasonable guess and is not guaranteed to match the actual cache line
@@ -64,13 +66,63 @@
 // - https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf
 // - https://github.com/facebook/folly/blob/1b5288e6eea6df074758f877c849b6e73bbb9fbb/folly/lang/Align.h#L107
 //
-// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128 byte cache line size
+// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128-byte cache line size.
+//
 // Sources:
 // - https://www.mono-project.com/news/2016/09/12/arm64-icache/
 //
-#[cfg_attr(any(target_arch = "x86_64", target_arch = "aarch64"), repr(align(128)))]
+// powerpc64 has 128-byte cache line size.
+//
+// Sources:
+// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_ppc64x.go#L9
+#[cfg_attr(
+    any(
+        target_arch = "x86_64",
+        target_arch = "aarch64",
+        target_arch = "powerpc64",
+    ),
+    repr(align(128))
+)]
+// arm, mips, mips64, and riscv64 have 32-byte cache line size.
+//
+// Sources:
+// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_arm.go#L7
+// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mips.go#L7
+// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mipsle.go#L7
+// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mips64x.go#L9
+// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_riscv64.go#L7
+#[cfg_attr(
+    any(
+        target_arch = "arm",
+        target_arch = "mips",
+        target_arch = "mips64",
+        target_arch = "riscv64",
+    ),
+    repr(align(32))
+)]
+// s390x has 256-byte cache line size.
+//
+// Sources:
+// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_s390x.go#L7
+#[cfg_attr(target_arch = "s390x", repr(align(256)))]
+// x86 and wasm have 64-byte cache line size.
+//
+// Sources:
+// - https://github.com/golang/go/blob/dda2991c2ea0c5914714469c4defc2562a907230/src/internal/cpu/cpu_x86.go#L9
+// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_wasm.go#L7
+//
+// All others are assumed to have 64-byte cache line size.
 #[cfg_attr(
-    not(any(target_arch = "x86_64", target_arch = "aarch64")),
+    not(any(
+        target_arch = "x86_64",
+        target_arch = "aarch64",
+        target_arch = "powerpc64",
+        target_arch = "arm",
+        target_arch = "mips",
+        target_arch = "mips64",
+        target_arch = "riscv64",
+        target_arch = "s390x",
+    )),
     repr(align(64))
 )]
 pub struct CachePadded<T> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -31,13 +31,59 @@
         allow(dead_code, unused_assignments, unused_variables)
     )
 ))]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
+#![warn(
+    missing_docs,
+    missing_debug_implementations,
+    rust_2018_idioms,
+    unreachable_pub
+)]
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
-// matches! requires Rust 1.42
-#![allow(clippy::match_like_matches_macro)]
 
-#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
+#[cfg(crossbeam_loom)]
+#[allow(unused_imports)]
+mod primitive {
+    pub(crate) mod sync {
+        pub(crate) mod atomic {
+            pub(crate) use loom::sync::atomic::spin_loop_hint;
+            pub(crate) use loom::sync::atomic::{
+                AtomicBool, AtomicI16, AtomicI32, AtomicI64, AtomicI8, AtomicIsize, AtomicU16,
+                AtomicU32, AtomicU64, AtomicU8, AtomicUsize,
+            };
+
+            // FIXME: loom does not support compiler_fence at the moment.
+            // https://github.com/tokio-rs/loom/issues/117
+            // we use fence as a stand-in for compiler_fence for the time being.
+            // this may miss some races since fence is stronger than compiler_fence,
+            // but it's the best we can do for the time being.
+            pub(crate) use loom::sync::atomic::fence as compiler_fence;
+        }
+        pub(crate) use loom::sync::{Arc, Condvar, Mutex};
+    }
+}
+#[cfg(not(crossbeam_loom))]
+#[allow(unused_imports)]
+mod primitive {
+    pub(crate) mod sync {
+        pub(crate) mod atomic {
+            pub(crate) use core::sync::atomic::compiler_fence;
+            // TODO(taiki-e): once we bump the minimum required Rust version to 1.49+,
+            // use [`core::hint::spin_loop`] instead.
+            #[allow(deprecated)]
+            pub(crate) use core::sync::atomic::spin_loop_hint;
+            #[cfg(not(crossbeam_no_atomic))]
+            pub(crate) use core::sync::atomic::{
+                AtomicBool, AtomicI16, AtomicI32, AtomicI8, AtomicIsize, AtomicU16, AtomicU32,
+                AtomicU8, AtomicUsize,
+            };
+            #[cfg(not(crossbeam_no_atomic_64))]
+            pub(crate) use core::sync::atomic::{AtomicI64, AtomicU64};
+        }
+
+        #[cfg(feature = "std")]
+        pub(crate) use std::sync::{Arc, Condvar, Mutex};
+    }
+}
+
 pub mod atomic;
 
 mod cache_padded;
@@ -51,6 +97,8 @@
 cfg_if! {
     if #[cfg(feature = "std")] {
         pub mod sync;
+
+        #[cfg(not(crossbeam_loom))]
         pub mod thread;
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/sync/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/sync/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/sync/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/sync/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,9 +5,11 @@
 //! * [`WaitGroup`], for synchronizing the beginning or end of some computation.
 
 mod parker;
+#[cfg(not(crossbeam_loom))]
 mod sharded_lock;
 mod wait_group;
 
 pub use self::parker::{Parker, Unparker};
+#[cfg(not(crossbeam_loom))]
 pub use self::sharded_lock::{ShardedLock, ShardedLockReadGuard, ShardedLockWriteGuard};
 pub use self::wait_group::WaitGroup;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/sync/parker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/sync/parker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/sync/parker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/sync/parker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,19 @@
+use crate::primitive::sync::atomic::AtomicUsize;
+use crate::primitive::sync::{Arc, Condvar, Mutex};
+use core::sync::atomic::Ordering::SeqCst;
 use std::fmt;
 use std::marker::PhantomData;
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering::SeqCst;
-use std::sync::{Arc, Condvar, Mutex};
-use std::time::Duration;
+use std::time::{Duration, Instant};
 
 /// A thread parking primitive.
 ///
 /// Conceptually, each `Parker` has an associated token which is initially not present:
 ///
 /// * The [`park`] method blocks the current thread unless or until the token is available, at
-///   which point it automatically consumes the token. It may also return *spuriously*, without
-///   consuming the token.
+///   which point it automatically consumes the token.
 ///
-/// * The [`park_timeout`] method works the same as [`park`], but blocks for a specified maximum
-///   time.
+/// * The [`park_timeout`] and [`park_deadline`] methods work the same as [`park`], but block for
+///   a specified maximum time.
 ///
 /// * The [`unpark`] method atomically makes the token available if it wasn't already. Because the
 ///   token is initially absent, [`unpark`] followed by [`park`] will result in the second call
@@ -43,13 +42,13 @@
 ///     u.unpark();
 /// });
 ///
-/// // Wakes up when `u.unpark()` provides the token, but may also wake up
-/// // spuriously before that without consuming the token.
+/// // Wakes up when `u.unpark()` provides the token.
 /// p.park();
 /// ```
 ///
 /// [`park`]: Parker::park
 /// [`park_timeout`]: Parker::park_timeout
+/// [`park_deadline`]: Parker::park_deadline
 /// [`unpark`]: Unparker::unpark
 pub struct Parker {
     unparker: Unparker,
@@ -90,9 +89,6 @@
 
     /// Blocks the current thread until the token is made available.
     ///
-    /// A call to `park` may wake up spuriously without consuming the token, and callers should be
-    /// prepared for this possibility.
-    ///
     /// # Examples
     ///
     /// ```
@@ -113,9 +109,6 @@
 
     /// Blocks the current thread until the token is made available, but only for a limited time.
     ///
-    /// A call to `park_timeout` may wake up spuriously without consuming the token, and callers
-    /// should be prepared for this possibility.
-    ///
     /// # Examples
     ///
     /// ```
@@ -128,7 +121,25 @@
     /// p.park_timeout(Duration::from_millis(500));
     /// ```
     pub fn park_timeout(&self, timeout: Duration) {
-        self.unparker.inner.park(Some(timeout));
+        self.park_deadline(Instant::now() + timeout)
+    }
+
+    /// Blocks the current thread until the token is made available, or until a certain deadline.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::time::{Duration, Instant};
+    /// use crossbeam_utils::sync::Parker;
+    ///
+    /// let p = Parker::new();
+    /// let deadline = Instant::now() + Duration::from_millis(500);
+    ///
+    /// // Waits for the token to become available, but will not wait longer than 500 ms.
+    /// p.park_deadline(deadline);
+    /// ```
+    pub fn park_deadline(&self, deadline: Instant) {
+        self.unparker.inner.park(Some(deadline))
     }
 
     /// Returns a reference to an associated [`Unparker`].
@@ -227,8 +238,7 @@
     ///     u.unpark();
     /// });
     ///
-    /// // Wakes up when `u.unpark()` provides the token, but may also wake up
-    /// // spuriously before that without consuming the token.
+    /// // Wakes up when `u.unpark()` provides the token.
     /// p.park();
     /// ```
     ///
@@ -302,7 +312,7 @@
 }
 
 impl Inner {
-    fn park(&self, timeout: Option<Duration>) {
+    fn park(&self, deadline: Option<Instant>) {
         // If we were previously notified then we consume this notification and return quickly.
         if self
             .state
@@ -313,8 +323,8 @@
         }
 
         // If the timeout is zero, then there is no need to actually block.
-        if let Some(ref dur) = timeout {
-            if *dur == Duration::from_millis(0) {
+        if let Some(deadline) = deadline {
+            if deadline <= Instant::now() {
                 return;
             }
         }
@@ -338,40 +348,42 @@
             Err(n) => panic!("inconsistent park_timeout state: {}", n),
         }
 
-        match timeout {
-            None => {
-                loop {
-                    // Block the current thread on the conditional variable.
-                    m = self.cvar.wait(m).unwrap();
-
-                    if self
-                        .state
-                        .compare_exchange(NOTIFIED, EMPTY, SeqCst, SeqCst)
-                        .is_ok()
-                    {
-                        // got a notification
-                        return;
+        loop {
+            // Block the current thread on the conditional variable.
+            m = match deadline {
+                None => self.cvar.wait(m).unwrap(),
+                Some(deadline) => {
+                    let now = Instant::now();
+                    if now < deadline {
+                        // We could check for a timeout here, in the return value of wait_timeout,
+                        // but in the case that a timeout and an unpark arrive simultaneously, we
+                        // prefer to report the former.
+                        self.cvar.wait_timeout(m, deadline - now).unwrap().0
+                    } else {
+                        // We've timed out; swap out the state back to empty on our way out
+                        match self.state.swap(EMPTY, SeqCst) {
+                            NOTIFIED | PARKED => return,
+                            n => panic!("inconsistent park_timeout state: {}", n),
+                        };
                     }
-
-                    // spurious wakeup, go back to sleep
-                }
-            }
-            Some(timeout) => {
-                // Wait with a timeout, and if we spuriously wake up or otherwise wake up from a
-                // notification we just want to unconditionally set `state` back to `EMPTY`, either
-                // consuming a notification or un-flagging ourselves as parked.
-                let (_m, _result) = self.cvar.wait_timeout(m, timeout).unwrap();
-
-                match self.state.swap(EMPTY, SeqCst) {
-                    NOTIFIED => {} // got a notification
-                    PARKED => {}   // no notification
-                    n => panic!("inconsistent park_timeout state: {}", n),
                 }
+            };
+
+            if self
+                .state
+                .compare_exchange(NOTIFIED, EMPTY, SeqCst, SeqCst)
+                .is_ok()
+            {
+                // got a notification
+                return;
             }
+
+            // Spurious wakeup, go back to sleep. Alternatively, if we timed out, it will be caught
+            // in the branch above, when we discover the deadline is in the past
         }
     }
 
-    pub fn unpark(&self) {
+    pub(crate) fn unpark(&self) {
         // To ensure the unparked thread will observe any writes we made before this call, we must
         // perform a release operation that `park` can synchronize with. To do that we must write
         // `NOTIFIED` even if `state` is already `NOTIFIED`. That is why this must be a swap rather
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/sync/wait_group.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/sync/wait_group.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/sync/wait_group.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/sync/wait_group.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
 // Necessary for using `Mutex<usize>` for conditional variables
 #![allow(clippy::mutex_atomic)]
 
+use crate::primitive::sync::{Arc, Condvar, Mutex};
 use std::fmt;
-use std::sync::{Arc, Condvar, Mutex};
 
 /// Enables threads to synchronize the beginning or end of some computation.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/thread.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/thread.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/src/thread.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/src/thread.rs	2021-12-09 12:01:26.000000000 +0000
@@ -110,8 +110,6 @@
 //!     });
 //! }).unwrap();
 //! ```
-//!
-//! [`std::thread::spawn`]: std::thread::spawn
 
 use std::fmt;
 use std::io;
@@ -572,7 +570,6 @@
             }
         }
 
-        #[cfg(windows)]
         impl<T> IntoRawHandle for ScopedJoinHandle<'_, T> {
             fn into_raw_handle(self) -> RawHandle {
                 self.as_raw_handle()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/tests/atomic_cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/tests/atomic_cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/tests/atomic_cell.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/tests/atomic_cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use std::mem;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering::SeqCst;
 
@@ -8,18 +9,47 @@
     struct UsizeWrap(usize);
     struct U8Wrap(bool);
     struct I16Wrap(i16);
+    #[repr(align(8))]
+    struct U64Align8(u64);
 
-    assert_eq!(AtomicCell::<usize>::is_lock_free(), true);
-    assert_eq!(AtomicCell::<isize>::is_lock_free(), true);
-    assert_eq!(AtomicCell::<UsizeWrap>::is_lock_free(), true);
+    assert!(AtomicCell::<usize>::is_lock_free());
+    assert!(AtomicCell::<isize>::is_lock_free());
+    assert!(AtomicCell::<UsizeWrap>::is_lock_free());
+
+    assert!(AtomicCell::<()>::is_lock_free());
+
+    assert!(AtomicCell::<u8>::is_lock_free());
+    assert!(AtomicCell::<i8>::is_lock_free());
+    assert!(AtomicCell::<bool>::is_lock_free());
+    assert!(AtomicCell::<U8Wrap>::is_lock_free());
+
+    assert!(AtomicCell::<u16>::is_lock_free());
+    assert!(AtomicCell::<i16>::is_lock_free());
+    assert!(AtomicCell::<I16Wrap>::is_lock_free());
+
+    assert!(AtomicCell::<u32>::is_lock_free());
+    assert!(AtomicCell::<i32>::is_lock_free());
+
+    // Sizes of both types must be equal, and the alignment of `u64` must be greater or equal than
+    // that of `AtomicU64`. In i686-unknown-linux-gnu, the alignment of `u64` is `4` and alignment
+    // of `AtomicU64` is `8`, so `AtomicCell<u64>` is not lock-free.
+    assert_eq!(
+        AtomicCell::<u64>::is_lock_free(),
+        cfg!(not(crossbeam_no_atomic_64))
+            && cfg!(any(
+                target_pointer_width = "64",
+                target_pointer_width = "128"
+            ))
+    );
+    assert_eq!(mem::size_of::<U64Align8>(), 8);
+    assert_eq!(mem::align_of::<U64Align8>(), 8);
+    assert_eq!(
+        AtomicCell::<U64Align8>::is_lock_free(),
+        cfg!(not(crossbeam_no_atomic_64))
+    );
 
-    assert_eq!(AtomicCell::<u8>::is_lock_free(), cfg!(has_atomic_u8));
-    assert_eq!(AtomicCell::<bool>::is_lock_free(), cfg!(has_atomic_u8));
-    assert_eq!(AtomicCell::<U8Wrap>::is_lock_free(), cfg!(has_atomic_u8));
-
-    assert_eq!(AtomicCell::<I16Wrap>::is_lock_free(), cfg!(has_atomic_u16));
-
-    assert_eq!(AtomicCell::<u128>::is_lock_free(), cfg!(has_atomic_u128));
+    // AtomicU128 is unstable
+    assert!(!AtomicCell::<u128>::is_lock_free());
 }
 
 #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/tests/cache_padded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/tests/cache_padded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/tests/cache_padded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/tests/cache_padded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -27,7 +27,9 @@
     let arr = [CachePadded::new(17u8), CachePadded::new(37u8)];
     let a = &*arr[0] as *const u8;
     let b = &*arr[1] as *const u8;
-    assert!(unsafe { a.offset(64) } <= b);
+    let align = mem::align_of::<CachePadded<()>>();
+    assert!(align >= 32);
+    assert_eq!(unsafe { a.add(align) }, b);
 }
 
 #[test]
@@ -83,6 +85,7 @@
     assert_eq!(count.get(), 2);
 }
 
+#[allow(clippy::clone_on_copy)] // This is intentional.
 #[test]
 fn clone() {
     let a = CachePadded::new(17);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/tests/parker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/tests/parker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/tests/parker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/tests/parker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,7 +18,7 @@
 fn park_timeout_unpark_not_called() {
     let p = Parker::new();
     for _ in 0..10 {
-        p.park_timeout(Duration::from_millis(10));
+        p.park_timeout(Duration::from_millis(10))
     }
 }
 
@@ -34,7 +34,7 @@
                 u.unpark();
             });
 
-            p.park_timeout(Duration::from_millis(u32::MAX as u64));
+            p.park_timeout(Duration::from_millis(u32::MAX as u64))
         })
         .unwrap();
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/tests/sharded_lock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/tests/sharded_lock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/crossbeam-utils/tests/sharded_lock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/crossbeam-utils/tests/sharded_lock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -138,7 +138,7 @@
 fn arc_access_in_unwind() {
     let arc = Arc::new(ShardedLock::new(1));
     let arc2 = arc.clone();
-    let _ = thread::spawn(move || -> () {
+    let _ = thread::spawn(move || {
         struct Unwinder {
             i: Arc<ShardedLock<isize>>,
         }
@@ -176,11 +176,8 @@
     let write_result = lock.try_write();
     match write_result {
         Err(TryLockError::WouldBlock) => (),
-        Ok(_) => assert!(
-            false,
-            "try_write should not succeed while read_guard is in scope"
-        ),
-        Err(_) => assert!(false, "unexpected error"),
+        Ok(_) => panic!("try_write should not succeed while read_guard is in scope"),
+        Err(_) => panic!("unexpected error"),
     }
 
     drop(read_guard);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"bfdc024e55a5d9f2f415045e9083abb13159e0276c3eb3dbdca290c69f8b4824","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"9e0dfd2dd4173a530e238cb6adb37aa78c34c6bc7444e0e10c1ab5d8881f63ba","src/dev.rs":"5890305be2cd3d221d1c2ce295b911cc57017dc341966ba434def4a072f8bf1c","src/digest.rs":"73f564cb8084e61baf850948443bacdea81727dfbff5abeb520c0e5bb690da7a","src/dyn_digest.rs":"abfa9a30ed2dc71ad2042501961146c87fe3cbf9254b5b203fe24920d0e246b8","src/errors.rs":"2584007e98d691160313cc27e6237db9bd886e9774137b59a1289a20054e9375","src/lib.rs":"71d838697e87561de4b6b2fda94df44639a525d4469316d4ad21f0f0075a130d"},"package":"f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "digest"
-version = "0.8.1"
-authors = ["RustCrypto Developers"]
-description = "Traits for cryptographic hash functions"
-documentation = "https://docs.rs/digest"
-keywords = ["digest", "crypto", "hash"]
-categories = ["cryptography", "no-std"]
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/RustCrypto/traits"
-[package.metadata.docs.rs]
-features = ["std"]
-[dependencies.blobby]
-version = "0.1"
-optional = true
-
-[dependencies.generic-array]
-version = "0.12"
-
-[features]
-dev = ["blobby"]
-std = []
-[badges.travis-ci]
-repository = "RustCrypto/traits"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2017 Artyom Pavlov
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/dev.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/dev.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/dev.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/dev.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,218 +0,0 @@
-use super::{Input, VariableOutput, ExtendableOutput, Reset, XofReader};
-use core::fmt::Debug;
-
-#[macro_export]
-macro_rules! new_test {
-    ($name:ident, $test_name:expr, $hasher:ty, $test_func:ident) => {
-        #[test]
-        fn $name() {
-            use digest::blobby::Blob2Iterator;
-            let data = include_bytes!(concat!("data/", $test_name, ".blb"));
-
-            for (i, row) in Blob2Iterator::new(data).unwrap().enumerate() {
-                let input = row[0];
-                let output = row[1];
-                if let Some(desc) = $test_func::<$hasher>(input, output) {
-                    panic!("\n\
-                        Failed test â„–{}: {}\n\
-                        input:\t{:?}\n\
-                        output:\t{:?}\n",
-                        i, desc, input, output,
-                    );
-                }
-            }
-        }
-    }
-}
-
-// module to separate Digest from other traits
-mod foo {
-    use super::super::Digest;
-    use core::fmt::Debug;
-
-    pub fn digest_test<D>(input: &[u8], output: &[u8]) -> Option<&'static str>
-        where D: Digest + Debug + Clone
-    {
-        let mut hasher = D::new();
-        // Test that it works when accepting the message all at once
-        hasher.input(input);
-        let mut hasher2 = hasher.clone();
-        if hasher.result().as_slice() != output {
-            return Some("whole message");
-        }
-
-        // Test if reset works correctly
-        hasher2.reset();
-        hasher2.input(input);
-        if hasher2.result().as_slice() != output {
-            return Some("whole message after reset");
-        }
-
-        // Test that it works when accepting the message in pieces
-        let mut hasher = D::new();
-        let len = input.len();
-        let mut left = len;
-        while left > 0 {
-            let take = (left + 1) / 2;
-            hasher.input(&input[len - left..take + len - left]);
-            left = left - take;
-        }
-        if hasher.result().as_slice() != output {
-            return Some("message in pieces");
-        }
-
-        // Test processing byte-by-byte
-        let mut hasher = D::new();
-        for chunk in input.chunks(1) {
-            hasher.input(chunk)
-        }
-        if hasher.result().as_slice() != output {
-            return Some("message byte-by-byte");
-        }
-        None
-    }
-
-
-    pub fn one_million_a<D>(expected: &[u8])
-        where D: Digest + Debug + Clone
-    {
-        let mut sh = D::new();
-        for _ in 0..50_000 {
-            sh.input(&[b'a'; 10]);
-        }
-        sh.input(&[b'a'; 500_000][..]);
-        let out = sh.result();
-        assert_eq!(out[..], expected[..]);
-    }
-}
-
-pub use self::foo::{digest_test, one_million_a};
-
-pub fn xof_test<D>(input: &[u8], output: &[u8])
-    -> Option<&'static str>
-    where D: Input + ExtendableOutput + Default + Debug + Reset  + Clone
-{
-    let mut hasher = D::default();
-    let mut buf = [0u8; 1024];
-    // Test that it works when accepting the message all at once
-    hasher.input(input);
-
-    let mut hasher2 = hasher.clone();
-    {
-        let out = &mut buf[..output.len()];
-        hasher.xof_result().read(out);
-
-        if out != output { return Some("whole message"); }
-    }
-
-    // Test if hasher resets correctly
-    hasher2.reset();
-    hasher2.input(input);
-
-    {
-        let out = &mut buf[..output.len()];
-        hasher2.xof_result().read(out);
-
-        if out != output { return Some("whole message after reset"); }
-    }
-
-    // Test if hasher accepts message in pieces correctly
-    let mut hasher = D::default();
-    let len = input.len();
-    let mut left = len;
-    while left > 0 {
-        let take = (left + 1) / 2;
-        hasher.input(&input[len - left..take + len - left]);
-        left = left - take;
-    }
-
-    {
-        let out = &mut buf[..output.len()];
-        hasher.xof_result().read(out);
-        if out != output { return Some("message in pieces"); }
-    }
-
-    // Test reading from reader byte by byte
-    let mut hasher = D::default();
-    hasher.input(input);
-
-    let mut reader = hasher.xof_result();
-    let out = &mut buf[..output.len()];
-    for chunk in out.chunks_mut(1) {
-        reader.read(chunk);
-    }
-
-    if out != output { return Some("message in pieces"); }
-    None
-}
-
-pub fn variable_test<D>(input: &[u8], output: &[u8])
-    -> Option<&'static str>
-    where D: Input + VariableOutput  + Reset + Debug + Clone
-{
-    let mut hasher = D::new(output.len()).unwrap();
-    let mut buf = [0u8; 128];
-    let buf = &mut buf[..output.len()];
-    // Test that it works when accepting the message all at once
-    hasher.input(input);
-    let mut hasher2 = hasher.clone();
-    hasher.variable_result(|res| buf.copy_from_slice(res));
-    if buf != output { return Some("whole message"); }
-
-    // Test if reset works correctly
-    hasher2.reset();
-    hasher2.input(input);
-    hasher2.variable_result(|res| buf.copy_from_slice(res));
-    if buf != output { return Some("whole message after reset"); }
-
-    // Test that it works when accepting the message in pieces
-    let mut hasher = D::new(output.len()).unwrap();
-    let len = input.len();
-    let mut left = len;
-    while left > 0 {
-        let take = (left + 1) / 2;
-        hasher.input(&input[len - left..take + len - left]);
-        left = left - take;
-    }
-    hasher.variable_result(|res| buf.copy_from_slice(res));
-    if buf != output { return Some("message in pieces"); }
-
-    // Test processing byte-by-byte
-    let mut hasher = D::new(output.len()).unwrap();
-    for chunk in input.chunks(1) {
-        hasher.input(chunk)
-    }
-    hasher.variable_result(|res| buf.copy_from_slice(res));
-    if buf != output { return Some("message byte-by-byte"); }
-    None
-}
-
-
-#[macro_export]
-macro_rules! bench {
-    ($name:ident, $engine:path, $bs:expr) => {
-        #[bench]
-        fn $name(b: &mut Bencher) {
-            let mut d = <$engine>::default();
-            let data = [0; $bs];
-
-            b.iter(|| {
-                d.input(&data[..]);
-            });
-
-            b.bytes = $bs;
-        }
-    };
-
-    ($engine:path) => {
-        extern crate test;
-
-        use test::Bencher;
-        use digest::Digest;
-
-        bench!(bench1_10,    $engine, 10);
-        bench!(bench2_100,   $engine, 100);
-        bench!(bench3_1000,  $engine, 1000);
-        bench!(bench4_10000, $engine, 10000);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/digest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/digest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/digest.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/digest.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-use super::{Input, FixedOutput, Reset};
-use generic_array::{GenericArray, ArrayLength};
-use generic_array::typenum::Unsigned;
-
-/// The `Digest` trait specifies an interface common for digest functions.
-///
-/// It's a convenience wrapper around `Input`, `FixedOutput`, `Reset`, `Clone`,
-/// and `Default` traits. It also provides additional convenience methods.
-pub trait Digest {
-    type OutputSize: ArrayLength<u8>;
-    /// Create new hasher instance
-    fn new() -> Self;
-
-    /// Digest input data.
-    ///
-    /// This method can be called repeatedly for use with streaming messages.
-    fn input<B: AsRef<[u8]>>(&mut self, data: B);
-
-    /// Digest input data in a chained manner.
-    fn chain<B: AsRef<[u8]>>(self, data: B) -> Self where Self: Sized;
-
-    /// Retrieve result and consume hasher instance.
-    fn result(self) -> GenericArray<u8, Self::OutputSize>;
-
-    /// Retrieve result and reset hasher instance.
-    ///
-    /// This method sometimes can be more efficient compared to hasher
-    /// re-creation.
-    fn result_reset(&mut self) -> GenericArray<u8, Self::OutputSize>;
-
-    /// Reset hasher instance to its initial state.
-    fn reset(&mut self);
-
-    /// Get output size of the hasher
-    fn output_size() -> usize;
-
-    /// Convenience function to compute hash of the `data`. It will handle
-    /// hasher creation, data feeding and finalization.
-    ///
-    /// Example:
-    ///
-    /// ```rust,ignore
-    /// println!("{:x}", sha2::Sha256::digest(b"Hello world"));
-    /// ```
-    fn digest(data: &[u8]) -> GenericArray<u8, Self::OutputSize>;
-}
-
-impl<D: Input + FixedOutput + Reset + Clone + Default> Digest for D {
-    type OutputSize = <Self as FixedOutput>::OutputSize;
-
-    fn new() -> Self {
-        Self::default()
-    }
-
-    fn input<B: AsRef<[u8]>>(&mut self, data: B) {
-        Input::input(self, data);
-    }
-
-    fn chain<B: AsRef<[u8]>>(self, data: B) -> Self where Self: Sized {
-        Input::chain(self, data)
-    }
-
-    fn result(self) -> GenericArray<u8, Self::OutputSize> {
-        self.fixed_result()
-    }
-
-    fn result_reset(&mut self) -> GenericArray<u8, Self::OutputSize> {
-        let res = self.clone().fixed_result();
-        self.reset();
-        res
-    }
-
-    fn reset(&mut self) {
-        <Self as Reset>::reset(self)
-    }
-
-    fn output_size() -> usize {
-        Self::OutputSize::to_usize()
-    }
-
-    fn digest(data: &[u8]) -> GenericArray<u8, Self::OutputSize> {
-        let mut hasher = Self::default();
-        Input::input(&mut hasher, data);
-        hasher.fixed_result()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/dyn_digest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/dyn_digest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/dyn_digest.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/dyn_digest.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-#![cfg(feature = "std")]
-use std::boxed::Box;
-
-use super::{Input, FixedOutput, Reset};
-use generic_array::typenum::Unsigned;
-
-/// The `DynDigest` trait is a modification of `Digest` trait suitable
-/// for trait objects.
-pub trait DynDigest {
-    /// Digest input data.
-    ///
-    /// This method can be called repeatedly for use with streaming messages.
-    fn input(&mut self, data: &[u8]);
-
-    /// Retrieve result and reset hasher instance
-    fn result_reset(&mut self) -> Box<[u8]>;
-
-    /// Retrieve result and consume boxed hasher instance
-    fn result(self: Box<Self>) -> Box<[u8]>;
-
-    /// Reset hasher instance to its initial state.
-    fn reset(&mut self);
-
-    /// Get output size of the hasher
-    fn output_size(&self) -> usize;
-
-    /// Clone hasher state into a boxed trait object
-    fn box_clone(&self) -> Box<DynDigest>;
-}
-
-impl<D: Input + FixedOutput + Reset + Clone + 'static> DynDigest for D {
-    fn input(&mut self, data: &[u8]) {
-        Input::input(self, data);
-    }
-
-    fn result_reset(&mut self) -> Box<[u8]> {
-        let res = self.clone().fixed_result().to_vec().into_boxed_slice();
-        Reset::reset(self);
-        res
-    }
-
-    fn result(self: Box<Self>) -> Box<[u8]> {
-        self.fixed_result().to_vec().into_boxed_slice()
-    }
-
-    fn reset(&mut self) {
-        Reset::reset(self);
-    }
-
-    fn output_size(&self) -> usize {
-        <Self as FixedOutput>::OutputSize::to_usize()
-    }
-
-    fn box_clone(&self) -> Box<DynDigest> {
-        Box::new(self.clone())
-    }
-}
-
-impl Clone for Box<DynDigest> {
-    fn clone(&self) -> Self {
-        self.box_clone()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/errors.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/errors.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/errors.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/errors.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-use core::fmt;
-#[cfg(feature = "std")]
-use std::error;
-
-/// The error type for variable hasher initialization
-#[derive(Clone, Copy, Debug, Default)]
-pub struct InvalidOutputSize;
-
-impl fmt::Display for InvalidOutputSize {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("invalid output size")
-    }
-}
-
-#[cfg(feature = "std")]
-impl error::Error for InvalidOutputSize {
-    fn description(&self) -> &str {
-        "invalid output size"
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/digest-0.8.1/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/digest-0.8.1/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-//! This crate provides traits which describe functionality of cryptographic hash
-//! functions.
-//!
-//! Traits in this repository can be separated into two levels:
-//! - Low level traits: `Input`, `BlockInput`, `Reset`, `FixedOutput`,
-//! `VariableOutput`, `ExtendableOutput`. These traits atomically describe
-//! available functionality of hash function implementations.
-//! - Convenience trait: `Digest`, `DynDigest`. They are wrappers around
-//! low level traits for most common hash-function use-cases.
-//!
-//! Additionally hash functions implement traits from `std`: `Default`, `Clone`,
-//! `Write`. (the latter depends on enabled-by-default `std` crate feature)
-//!
-//! The `Digest` trait is the most commonly used trait.
-#![no_std]
-#![doc(html_logo_url =
-    "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
-pub extern crate generic_array;
-#[cfg(feature = "std")]
-#[macro_use] extern crate std;
-#[cfg(feature = "dev")]
-pub extern crate blobby;
-use generic_array::{GenericArray, ArrayLength};
-#[cfg(feature = "std")]
-use std::vec::Vec;
-
-mod digest;
-mod dyn_digest;
-mod errors;
-#[cfg(feature = "dev")]
-pub mod dev;
-
-pub use errors::InvalidOutputSize;
-pub use digest::Digest;
-#[cfg(feature = "std")]
-pub use dyn_digest::DynDigest;
-
-/// Trait for processing input data
-pub trait Input {
-    /// Digest input data.
-    ///
-    /// This method can be called repeatedly, e.g. for processing streaming
-    /// messages.
-    fn input<B: AsRef<[u8]>>(&mut self, data: B);
-
-    /// Digest input data in a chained manner.
-    fn chain<B: AsRef<[u8]>>(mut self, data: B) -> Self where Self: Sized {
-        self.input(data);
-        self
-    }
-}
-
-/// Trait to indicate that digest function processes data in blocks of size
-/// `BlockSize`.
-///
-/// The main usage of this trait is for implementing HMAC generically.
-pub trait BlockInput {
-    type BlockSize: ArrayLength<u8>;
-}
-
-/// Trait for returning digest result with the fixed size
-pub trait FixedOutput {
-    type OutputSize: ArrayLength<u8>;
-
-    /// Retrieve result and consume hasher instance.
-    fn fixed_result(self) -> GenericArray<u8, Self::OutputSize>;
-}
-
-/// Trait for returning digest result with the variable size
-pub trait VariableOutput: core::marker::Sized {
-    /// Create new hasher instance with the given output size.
-    ///
-    /// It will return `Err(InvalidOutputSize)` in case if hasher can not return
-    /// specified output size. It will always return an error if output size
-    /// equals to zero.
-    fn new(output_size: usize) -> Result<Self, InvalidOutputSize>;
-
-    /// Get output size of the hasher instance provided to the `new` method
-    fn output_size(&self) -> usize;
-
-    /// Retrieve result via closure and consume hasher.
-    ///
-    /// Closure is guaranteed to be called, length of the buffer passed to it
-    /// will be equal to `output_size`.
-    fn variable_result<F: FnOnce(&[u8])>(self, f: F);
-
-    /// Retrieve result into vector and consume hasher.
-    #[cfg(feature = "std")]
-    fn vec_result(self) -> Vec<u8> {
-        let mut buf = Vec::with_capacity(self.output_size());
-        self.variable_result(|res| buf.extend_from_slice(res));
-        buf
-    }
-}
-
-/// Trait for describing readers which are used to extract extendable output
-/// from XOF (extendable-output function) result.
-pub trait XofReader {
-    /// Read output into the `buffer`. Can be called unlimited number of times.
-    fn read(&mut self, buffer: &mut [u8]);
-}
-
-/// Trait which describes extendable-output functions (XOF).
-pub trait ExtendableOutput: core::marker::Sized {
-    type Reader: XofReader;
-
-    /// Retrieve XOF reader and consume hasher instance.
-    fn xof_result(self) -> Self::Reader;
-
-    /// Retrieve result into vector of specified length.
-    #[cfg(feature = "std")]
-    fn vec_result(self, n: usize) -> Vec<u8> {
-        let mut buf = vec![0u8; n];
-        self.xof_result().read(&mut buf);
-        buf
-    }
-}
-
-/// Trait for resetting hash instances
-pub trait Reset {
-    /// Reset hasher instance to its initial state and return current state.
-    fn reset(&mut self);
-}
-
-#[macro_export]
-/// Implements `std::io::Write` trait for implementer of `Input`
-macro_rules! impl_write {
-    ($hasher:ident) => {
-        #[cfg(feature = "std")]
-        impl ::std::io::Write for $hasher {
-            fn write(&mut self, buf: &[u8]) -> ::std::io::Result<usize> {
-                Input::input(self, buf);
-                Ok(buf.len())
-            }
-
-            fn flush(&mut self) -> ::std::io::Result<()> {
-                Ok(())
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"484dfe4111dc697ed30f99974df9abc4bbff53c39d74e8524fccde3608002b4c","LICENSE-APACHE":"d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9","LICENSE-MIT":"6a2e0ade09a7d5f816f11566fee2b151b32235a7fad52b41d49cce96f833c1a9","README.md":"4d00f673e64fd2081ad1b8e893539d12da852253e6fa256817669d4b7273c854","src/lib.rs":"e6f5f9f6bf6e59487044d1a62d0b064172b69d821b54ca05ea311f6d23fd63d9","src/lin.rs":"a766f304b3ff57c89a99e4758bdab68ec6574f4260f7d9eef597e29946287bb0","src/mac.rs":"0a46b1ac65fa4862e6fbd6b48c30728549a7012f2681673ff4376412ca7ac1c8","src/wasm.rs":"4b360672a329c21465fa8404310f887785b31c5901b933b78d92eece2dcb4af0","src/win.rs":"ef2ffee565be720e155a8cbbf489ecf7e56c1f20023731d614e89e6e54f03cd9"},"package":"142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff"}
\ No newline at end of file
+{"files":{"Cargo.toml":"82a8ddb211dd3f6db471a5375aa2d55a3ac62b052b8c2569294e3dc12a371cfd","LICENSE-APACHE":"d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9","LICENSE-MIT":"6a2e0ade09a7d5f816f11566fee2b151b32235a7fad52b41d49cce96f833c1a9","README.md":"4d00f673e64fd2081ad1b8e893539d12da852253e6fa256817669d4b7273c854","src/lib.rs":"e6f5f9f6bf6e59487044d1a62d0b064172b69d821b54ca05ea311f6d23fd63d9","src/lin.rs":"a766f304b3ff57c89a99e4758bdab68ec6574f4260f7d9eef597e29946287bb0","src/mac.rs":"0a46b1ac65fa4862e6fbd6b48c30728549a7012f2681673ff4376412ca7ac1c8","src/wasm.rs":"4b360672a329c21465fa8404310f887785b31c5901b933b78d92eece2dcb4af0","src/win.rs":"ef2ffee565be720e155a8cbbf489ecf7e56c1f20023731d614e89e6e54f03cd9"},"package":"30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "dirs"
-version = "3.0.1"
+version = "3.0.2"
 authors = ["Simon Ochsenreither <simon@ochsenreither.de>"]
 description = "A tiny low-level library that provides platform-specific standard locations of directories for config, cache and other data on Linux, Windows, macOS and Redox by leveraging the mechanisms defined by the XDG base/user directory specifications on Linux, the Known Folder API on Windows, and the Standard Directory guidelines on macOS."
 readme = "README.md"
@@ -20,4 +20,4 @@
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/soc/dirs-rs"
 [dependencies.dirs-sys]
-version = "0.3.5"
+version = "0.3.6"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs-sys/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs-sys/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"e3275b30fa8db88cf0e0db5bd34fb1a46ea99c8f5dbe3a9882f096be8d9c5b24","LICENSE-APACHE":"d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9","LICENSE-MIT":"6a2e0ade09a7d5f816f11566fee2b151b32235a7fad52b41d49cce96f833c1a9","README.md":"1c818a4ea3bf85aaafe27421528a285db92c1f20ae9651c669379cb603495f37","src/lib.rs":"7641c8b0f3951e8ce233cc6dc428b3e4919b4959b25efb6e88d4ecdedc672fd2","src/xdg_user_dirs.rs":"225ae21a97b839330a8c3bc8e0a0b48e40580cbae25bfc47581dff724bb0ebec"},"package":"8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"}
\ No newline at end of file
+{"files":{"Cargo.toml":"141e80efbaefa9322513f4900a2ac4c5209b135bb36bf7ca347e3deebc75965f","LICENSE-APACHE":"d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9","LICENSE-MIT":"6a2e0ade09a7d5f816f11566fee2b151b32235a7fad52b41d49cce96f833c1a9","README.md":"1c818a4ea3bf85aaafe27421528a285db92c1f20ae9651c669379cb603495f37","src/lib.rs":"5c1aff249eb1f6abd52785f58318c1b0641ca810c15ce349e9c3797d86b1c8c5","src/xdg_user_dirs.rs":"225ae21a97b839330a8c3bc8e0a0b48e40580cbae25bfc47581dff724bb0ebec"},"package":"03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs-sys/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs-sys/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,14 +12,15 @@
 
 [package]
 name = "dirs-sys"
-version = "0.3.5"
+version = "0.3.6"
 authors = ["Simon Ochsenreither <simon@ochsenreither.de>"]
 description = "System-level helper functions for the dirs and directories crates."
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dirs-dev/dirs-sys-rs"
 [target."cfg(target_os = \"redox\")".dependencies.redox_users]
-version = "0.3.0"
+version = "0.4"
+default-features = false
 [target."cfg(unix)".dependencies.libc]
 version = "0.2"
 [target."cfg(windows)".dependencies.winapi]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs-sys/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs-sys/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/dirs-sys/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/dirs-sys/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -158,6 +158,7 @@
             combaseapi::CoTaskMemFree(path_ptr as *mut winapi::ctypes::c_void);
             Some(PathBuf::from(ostr))
         } else {
+            combaseapi::CoTaskMemFree(path_ptr as *mut winapi::ctypes::c_void);
             None
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"1289503b378176ea03041fbae390a58d7f4a77e055140f058b63d0fcf57f71ce","LICENSE":"b35fea088bb24ed70ae01d6b9dd787e69f0beeabbbce0dd14c672a2e873033fd","README.md":"5ea449df520989258acaee162e91a55d3b3089123251cc71a766edd2e5e10aa6","examples/basic.rs":"391dd42e7603842e4a4b667069d995ca2f5392ee99638d2e1f99a37845de74a8","examples/test.xml":"7909787907723b03ffb9e96f66c0063a382eaabb7075bb82aed0678155873e88","src/lib.rs":"c890f66aade75c4709b39b692a6af8a2ca3c84a203244d72b35917bd82863c1b","tests/test_basic.rs":"d86aac7fe0771aa31edc6a4443d8d7f634f9a6960feb4d81cb70b4c214508a0e"},"package":"19c5d32d0ab83734d2d7452047ef901c105991044b7b07da30fe82371a149a25"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+[package]
+name = "elementtree"
+version = "0.5.0"
+authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
+description = "Parse an XML file into Python elementtree like structure"
+documentation = "http://docs.rs/elementtree"
+repository = "https://github.com/mitsuhiko/elementtree-rust"
+keywords = ["xml", "parse", "elementtree"]
+license = "BSD-3-Clause"
+readme = "README.md"
+
+[dependencies]
+xml-rs = "0"
+string_cache = "0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/examples/basic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/examples/basic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/examples/basic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/examples/basic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+extern crate elementtree;
+
+use elementtree::Element;
+
+
+const XML: &'static str = include_str!("test.xml");
+
+
+pub fn main() {
+    let root = Element::from_reader(&mut XML.as_bytes()).unwrap();
+    println!("Print some stuff");
+    for child in root.children() {
+        println!("{}", child.tag());
+        for child in child.children() {
+            println!("  {}", child.tag());
+        }
+    }
+
+    println!("");
+    println!("FIND CHILDREN");
+    let ns = "urn:oasis:names:tc:SAML:2.0:assertion";
+    let list = root.find((ns, "list")).unwrap();
+    for item in list.find_all((ns, "item")) {
+        println!("-> {}", item.tag());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/examples/test.xml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/examples/test.xml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/examples/test.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/examples/test.xml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<foo xmlns="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:x="tag:foo">
+  <list x:bar="42" baz="23">
+    <item>Test 1</item>Tail1
+    <item>Test 2</item>Tail2
+  </list>
+  <list x:bar="42" baz="23">
+    <item>Test 3</item>Tail3
+    <item>Test 4</item>Tail4
+  </list>
+</foo>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+Copyright (c) 2017 by Armin Ronacher.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * The names of the contributors may not be used to endorse or
+      promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+ElementTree for Rust
+====================
+
+[API Documentation](https://docs.rs/elementtree/)
+
+This library parses XML into a Python ElementTree like structure.  It currently
+has basic support for reading and writing with pretty good namespace support and the
+ability to inspect the file.
+
+It's not recommended to use this for larger documents as the entire document
+will be loaded into memory.  However it's pretty good for working with configuration
+files and similar things.
+
+## Installation
+
+Add this to your `Cargo.toml`
+
+```toml
+[dependencies]
+elementtree = "0"
+```
+
+
+## Example
+
+```rust
+let root = Element::from_reader(r#"<?xml version="1.0"?>
+<root xmlns="tag:myns" xmlns:foo="tag:otherns">
+    <list a="1" b="2" c="3">
+        <item foo:attr="foo1"/>
+        <item foo:attr="foo2"/>
+        <item foo:attr="foo3"/>
+    </list>
+</root>
+"#.as_bytes()).unwrap();
+let list = root.find("{tag:myns}list").unwrap();
+for child in list.find_all("{tag:myns}item") {
+    println!("attribute: {}", child.get_attr("{tag:otherns}attr").unwrap());
+}
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1290 @@
+//! A simple library for parsing an XML file into an in-memory tree structure
+//!
+//! Not recommended for large XML files, as it will load the entire file into memory.
+//!
+//! ## Installation
+//!
+//! ```ini
+//! [dependencies]
+//! elementtree = "0"
+//! ```
+//!
+//! ## Reading
+//!
+//! For reading XML you can use the `Element::from_reader` method which will
+//! parse from a given reader.  Afterwards you end up with a fancy element
+//! tree that can be accessed in various different ways.
+//!
+//! You can use ``("ns", "tag")`` or ``{ns}tag`` to refer to fully qualified
+//! elements.
+//!
+//! ```rust
+//! # use elementtree::Element;
+//! let root = Element::from_reader(r#"<?xml version="1.0"?>
+//! <root xmlns="tag:myns" xmlns:foo="tag:otherns">
+//!     <list a="1" b="2" c="3">
+//!         <item foo:attr="foo1"/>
+//!         <item foo:attr="foo2"/>
+//!         <item foo:attr="foo3"/>
+//!     </list>
+//! </root>
+//! "#.as_bytes()).unwrap();
+//! let list = root.find("{tag:myns}list").unwrap();
+//! for child in list.find_all("{tag:myns}item") {
+//!     println!("attribute: {}", child.get_attr("{tag:otherns}attr").unwrap());
+//! }
+//! ```
+//!
+//! ## Writing
+//!
+//! Writing is easy as well but if you work with namespaces you will need to
+//! register them with the root.  If namespaces are not used yet they will
+//! otherwise be registered with an empty (and once that is used a random prefix)
+//! on the element itself which will blow up the XML size.
+//!
+//! Most methods for modification support chaining in one form or another which
+//! makes modifications slightly more ergonomic.
+//!
+//! ```
+//! # use elementtree::Element;
+//! let ns = "http://example.invalid/#myns";
+//! let other_ns = "http://example.invalid/#otherns";
+//!
+//! let mut root = Element::new((ns, "mydoc"));
+//! root.set_namespace_prefix(other_ns, "other");
+//!
+//! {
+//!     let mut list = root.append_new_child((ns, "list"));
+//!     for x in 0..3 {
+//!         list.append_new_child((ns, "item"))
+//!             .set_text(format!("Item {}", x))
+//!             .set_attr((other_ns, "id"), x.to_string());
+//!     }
+//! }
+//! ```
+//!
+//! ## Design Notes
+//!
+//! This library largely follows the ideas of Python's ElementTree but it has some
+//! specific changes that simplify the model for Rust.  In particular nodes do not
+//! know about their parents or siblings.  While this obviously reduces a lot of
+//! what would be possible with the library it significantly simplifies memory
+//! management and the external API.
+//!
+//! If you are coming from a DOM environment the following differences are the
+//! most striking:
+//!
+//! *   There are no text nodes, instead text is stored either in the `text`
+//!     attribute of a node or in the `tail` of a child node.  This means that
+//!     for most situations just working with the `text` is what you want and
+//!     you can ignore the existence of the `tail`.
+//! *   tags and attributes are implemented through a `QName` abstraction that
+//!     simplifies working wiht namespaces.  Most APIs just accept strings and
+//!     will create `QName`s automatically.
+//! *   namespace prefixes never play a role and are in fact not really exposed.
+//!     Instead all namespaces are managed through their canonical identifier.
+//!
+//! ## Notes on Namespaces
+//!
+//! Namespaces are internally tracked in a shared map attached to elements.  The
+//! map is not exposed but when an element is created another element can be passed
+//! in and the namespace map is copied over.  Internally a copy on write mechanism
+//! is used so when changes are performed on the namespace the namespaces will be
+//! copied and the writer will emit them accordingly.
+//!
+//! Namespaces need to be registered or the XML generated will be malformed.
+extern crate xml;
+extern crate string_cache;
+
+use std::cmp::Ord;
+use std::collections::BTreeMap;
+use std::collections::btree_map::Iter as BTreeMapIter;
+use std::io::{Read, Write};
+use std::io;
+use std::fmt;
+use std::mem;
+use std::str::Utf8Error;
+use std::ops::Deref;
+use std::cmp::Ordering;
+use std::hash::{Hash, Hasher};
+use std::borrow::Cow;
+use std::rc::Rc;
+
+use string_cache::DefaultAtom as Atom;
+
+use xml::reader::{EventReader, ParserConfig, XmlEvent, Error as XmlReadError,
+                  ErrorKind as XmlReadErrorKind};
+use xml::writer::{EventWriter, XmlEvent as XmlWriteEvent, Error as XmlWriteError};
+use xml::common::{XmlVersion, Position as XmlPosition};
+use xml::attribute::{Attribute, OwnedAttribute};
+use xml::name::{Name, OwnedName};
+use xml::namespace::{Namespace as XmlNamespaceMap, NS_EMPTY_URI,
+                     NS_XMLNS_URI, NS_XML_URI};
+use xml::EmitterConfig;
+
+enum XmlAtom<'a> {
+    Shared(Atom),
+    Borrowed(&'a str),
+}
+
+impl<'a> Deref for XmlAtom<'a> {
+    type Target = str;
+
+    #[inline(always)]
+    fn deref(&self) -> &str {
+        match *self {
+            XmlAtom::Shared(ref atom) => atom.deref(),
+            XmlAtom::Borrowed(s) => s,
+        }
+    }
+}
+
+impl<'a> XmlAtom<'a> {
+    #[inline(always)]
+    pub fn borrow(&self) -> &str {
+        &self
+    }
+}
+
+impl<'a> fmt::Debug for XmlAtom<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}", self.borrow())
+    }
+}
+
+impl<'a> Clone for XmlAtom<'a> {
+    fn clone(&self) -> XmlAtom<'a> {
+        XmlAtom::Shared(Atom::from(self.borrow()))
+    }
+}
+
+impl<'a> PartialEq for XmlAtom<'a> {
+    fn eq(&self, other: &XmlAtom<'a>) -> bool {
+        self.borrow().eq(other.borrow())
+    }
+}
+
+impl<'a> Eq for XmlAtom<'a> {}
+
+impl<'a> PartialOrd for XmlAtom<'a> {
+    fn partial_cmp(&self, other: &XmlAtom<'a>) -> Option<Ordering> {
+        self.borrow().partial_cmp(other.borrow())
+    }
+}
+
+impl<'a> Ord for XmlAtom<'a> {
+    fn cmp(&self, other: &XmlAtom<'a>) -> Ordering {
+        self.borrow().cmp(other.borrow())
+    }
+}
+
+/// Convenience trait to get a `QName` from an object.
+///
+/// This is used for the accessor interface on elements.
+pub trait AsQName<'a> {
+    /// Returns a Cow'ed `QName` from the given object.
+    fn as_qname(&self) -> Cow<'a, QName<'a>>;
+}
+
+impl<'a> AsQName<'a> for &'a QName<'a> {
+    #[inline(always)]
+    fn as_qname(&self) -> Cow<'a, QName<'a>> {
+        Cow::Borrowed(self)
+    }
+}
+
+impl<'a> AsQName<'a> for &'a str {
+    #[inline(always)]
+    fn as_qname(&self) -> Cow<'a, QName<'a>> {
+        Cow::Owned(QName::from(self))
+    }
+}
+
+impl<'a> AsQName<'a> for (&'a str, &'a str) {
+    #[inline(always)]
+    fn as_qname(&self) -> Cow<'a, QName<'a>> {
+        Cow::Owned(QName::from_ns_name(Some(self.0), self.1))
+    }
+}
+
+/// A `QName` represents a qualified name.
+///
+/// A qualified name is a tag or attribute name that has a namespace and a
+/// local name.  If the namespace is empty no namespace is assumed.  It
+/// can be constructed from a qualified name string with the ``from``
+/// method.
+///
+/// ## Notes on Memory Management
+///
+/// Qualified names that are user constructed for comparison purposes
+/// usually have a static lifetime because they are created from static
+/// strings.  Creating qualified names from other strings might make
+/// memory management harder which is why `share()` exists which moves
+/// the `QName` internal strings to shared storage in which the lifetime
+/// changes to `'static`.
+///
+/// Common usage examples:
+///
+/// ```no_run
+/// # use elementtree::QName;
+/// let href = QName::from_name("href");
+/// let a = QName::from("{http://www.w3.org/1999/xhtml}a");
+/// ```
+#[derive(Clone)]
+pub struct QName<'a> {
+    ns: Option<XmlAtom<'a>>,
+    name: XmlAtom<'a>,
+}
+
+impl<'a> QName<'a> {
+    /// Creates a qualified name from a given string.
+    ///
+    /// Two formats are supported ``{namespace}tag`` or just ``tag``.
+    ///
+    /// ```
+    /// # use elementtree::QName;
+    /// let a = QName::from("{http://www.w3.org/1999/xhtml}a");
+    /// ```
+    pub fn from(s: &'a str) -> QName<'a> {
+        let mut ns = None;
+        let mut name = None;
+        if s.starts_with('{') {
+            if let Some(index) = s.find('}') {
+                if index > 1 {
+                    ns = Some(XmlAtom::Borrowed(&s[1..index]));
+                }
+                name = Some(XmlAtom::Borrowed(&s[index + 1..]));
+            }
+        }
+
+        QName {
+            ns: ns,
+            name: name.unwrap_or_else(|| XmlAtom::Borrowed(s)),
+        }
+    }
+
+    /// Creates a qualified name from a given string without namespace.
+    ///
+    /// This is slightly faster than using ``from()``.
+    pub fn from_name(name: &'a str) -> QName<'a> {
+        QName {
+            ns: None,
+            name: XmlAtom::Borrowed(name),
+        }
+    }
+
+    /// Creates a qualified name from a namespace and name.
+    pub fn from_ns_name(ns: Option<&'a str>, name: &'a str) -> QName<'a> {
+        QName {
+            ns: ns.map(|x| XmlAtom::Borrowed(x)),
+            name: XmlAtom::Borrowed(name),
+        }
+    }
+
+    /// Returns the name portion of the qualified name.  This is the local
+    /// tag or attribute name.
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    /// Returns the optional namespace of this element.  This is the URL of
+    /// the namespace and not the prefix.  The information about the latter
+    /// is not retained.
+    pub fn ns(&self) -> Option<&str> {
+        self.ns.as_ref().map(|x| x.borrow())
+    }
+
+    /// Creates a shared `QName` with static lifetime from an already
+    /// existing `QName`.  The internal strings are interned and might
+    /// be shared with other instances.
+    pub fn share(&self) -> QName<'static> {
+        QName {
+            name: XmlAtom::Shared(Atom::from(self.name.borrow())),
+            ns: self.ns.as_ref().map(|x| XmlAtom::Shared(Atom::from(x.borrow()))),
+        }
+    }
+
+    fn from_owned_name(name: OwnedName) -> QName<'static> {
+        QName {
+            name: XmlAtom::Shared(Atom::from(name.local_name)),
+            ns: match name.namespace {
+                Some(ns) => {
+                    if ns.len() > 0 {
+                        Some(XmlAtom::Shared(Atom::from(ns)))
+                    } else {
+                        None
+                    }
+                },
+                _ => None,
+            }
+        }
+    }
+}
+
+impl<'a> PartialEq for QName<'a> {
+    fn eq(&self, other: &QName<'a>) -> bool {
+         self.name() == other.name() && self.ns() == other.ns()
+    }
+}
+
+impl<'a> fmt::Debug for QName<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "QName(\"{}\")", self)
+    }
+}
+
+impl<'a> fmt::Display for QName<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if let Some(ref ns) = self.ns {
+            write!(f, "{{{}}}", ns.borrow())?;
+        }
+        write!(f, "{}", self.name.borrow())
+    }
+}
+
+impl<'a> Eq for QName<'a> {}
+
+impl<'a> Hash for QName<'a> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.name.hash(state);
+        if let Some(ref ns) = self.ns {
+            ns.hash(state);
+        }
+    }
+}
+
+impl<'a> PartialOrd for QName<'a> {
+    fn partial_cmp(&self, other: &QName<'a>) -> Option<Ordering> {
+        self.name().partial_cmp(other.name())
+    }
+}
+
+impl<'a> Ord for QName<'a> {
+    fn cmp(&self, other: &QName<'a>) -> Ordering {
+        self.name().cmp(other.name())
+    }
+}
+
+#[derive(Debug, Clone)]
+struct NamespaceMap {
+    prefix_to_ns: BTreeMap<XmlAtom<'static>, XmlAtom<'static>>,
+    ns_to_prefix: BTreeMap<XmlAtom<'static>, XmlAtom<'static>>,
+}
+
+impl NamespaceMap {
+    pub fn new() -> NamespaceMap {
+        NamespaceMap {
+            prefix_to_ns: BTreeMap::new(),
+            ns_to_prefix: BTreeMap::new(),
+        }
+    }
+
+    pub fn get_prefix(&self, url: &str) -> Option<&str> {
+        // same shit as with remove_attr below for the explanation.
+        let atom = XmlAtom::Borrowed(url);
+        let static_atom: &XmlAtom<'static> = unsafe { mem::transmute(&atom) };
+        self.ns_to_prefix.get(static_atom).map(|x| x.borrow())
+    }
+
+    pub fn set_prefix(&mut self, url: &str, prefix: &str) -> Result<(), Error> {
+        let prefix = XmlAtom::Shared(Atom::from(prefix));
+        if self.prefix_to_ns.contains_key(&prefix) {
+            return Err(Error::DuplicateNamespacePrefix);
+        }
+
+        let url = XmlAtom::Shared(Atom::from(url));
+        if let Some(old_prefix) = self.ns_to_prefix.remove(&url) {
+            self.prefix_to_ns.remove(&old_prefix);
+        }
+
+        self.ns_to_prefix.insert(url.clone(), prefix.clone());
+        self.prefix_to_ns.insert(prefix.clone(), url.clone());
+
+        Ok(())
+    }
+
+    fn generate_prefix(&self) -> XmlAtom<'static> {
+        let mut i = 1;
+        loop {
+            let random_prefix = format!("ns{}", i);
+            if !self.prefix_to_ns.contains_key(&XmlAtom::Borrowed(&random_prefix)) {
+                return XmlAtom::Shared(Atom::from(random_prefix));
+            }
+            i += 1;
+        }
+    }
+
+    pub fn register_if_missing(&mut self, url: &str, prefix: Option<&str>) -> bool {
+        if self.get_prefix(url).is_some() {
+            return false;
+        }
+
+        let stored_prefix = if let Some(prefix) = prefix {
+            let prefix = XmlAtom::Borrowed(prefix);
+            if self.prefix_to_ns.get(&prefix).is_some() {
+                self.generate_prefix()
+            } else {
+                XmlAtom::Shared(Atom::from(prefix.borrow()))
+            }
+        } else {
+            self.generate_prefix()
+        };
+
+        let url = XmlAtom::Shared(Atom::from(url));
+        self.prefix_to_ns.insert(stored_prefix.clone(), url.clone());
+        self.ns_to_prefix.insert(url, stored_prefix);
+        true
+    }
+}
+
+/// Represents an XML element.
+///
+/// Usually constructed from either parsing or one of the two constructors
+/// an element is part of a tree and represents an XML element and the
+/// children contained.
+///
+/// Imagine a structure like this:
+///
+/// ```xml
+/// <p>Hello <strong>World</strong>!</p>
+/// ```
+///
+/// In this case the structure is more or less represented like this:
+///
+/// ```ignore
+/// Element {
+///   tag: "p",
+///   text: "Hello ",
+///   tail: None,
+///   children: [
+///     Element {
+///       tag: "strong",
+///       text: "World",
+///       tail: Some("!")
+///     }
+///   ]
+/// }
+/// ```
+///
+/// Namespaces are internally managed and inherited downwards when an
+/// element is created.
+#[derive(Debug, Clone)]
+pub struct Element {
+    tag: QName<'static>,
+    attributes: BTreeMap<QName<'static>, String>,
+    children: Vec<Element>,
+    nsmap: Option<Rc<NamespaceMap>>,
+    emit_nsmap: bool,
+    text: Option<String>,
+    tail: Option<String>
+}
+
+/// An iterator over children of an element.
+pub struct Children<'a> {
+    idx: usize,
+    element: &'a Element,
+}
+
+/// A mutable iterator over children of an element.
+pub struct ChildrenMut<'a> {
+    iter: ::std::slice::IterMut<'a, Element>,
+}
+
+/// An iterator over attributes of an element.
+pub struct Attrs<'a> {
+    iter: BTreeMapIter<'a, QName<'a>, String>,
+}
+
+/// An iterator over matching children.
+pub struct FindChildren<'a> {
+    tag: Cow<'a, QName<'a>>,
+    child_iter: Children<'a>,
+}
+
+/// A mutable iterator over matching children.
+pub struct FindChildrenMut<'a> {
+    tag: Cow<'a, QName<'a>>,
+    child_iter: ChildrenMut<'a>,
+}
+
+/// Represents a position in the source.
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd)]
+pub struct Position {
+    line: u64,
+    column: u64
+}
+
+impl Position {
+    /// Creates a new position.
+    pub fn new(line: u64, column: u64) -> Position {
+        Position {
+            line: line,
+            column: column,
+        }
+    }
+
+    fn from_xml_position(pos: &XmlPosition) -> Position {
+        let pos = pos.position();
+        Position::new(pos.row, pos.column)
+    }
+
+    /// Returns the line number of the position
+    pub fn line(&self) -> u64 {
+        self.line
+    }
+    /// Returns the column of the position
+    pub fn column(&self) -> u64 {
+        self.column
+    }
+}
+
+impl fmt::Display for Position {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}:{}", self.line, self.column)
+    }
+}
+
+/// Errors that can occur parsing XML
+#[derive(Debug)]
+pub enum Error {
+    /// The XML is invalid
+    MalformedXml {
+        msg: Cow<'static, str>,
+        pos: Position
+    },
+    /// An IO Error
+    Io(io::Error),
+    /// A UTF-8 Error
+    Utf8(Utf8Error),
+    /// This library is unable to process this XML. This can occur if, for
+    /// example, the XML contains processing instructions.
+    UnexpectedEvent {
+        msg: Cow<'static, str>,
+        pos: Position
+    },
+    /// A namespace prefix was already used
+    DuplicateNamespacePrefix,
+}
+
+impl Error {
+    /// Returns the position of the error if known
+    pub fn position(&self) -> Option<Position> {
+        match self {
+            &Error::MalformedXml { pos, .. } => Some(pos),
+            &Error::UnexpectedEvent { pos, .. } => Some(pos),
+            _ => None,
+        }
+    }
+
+    /// Returns the line number of the error or 0 if unknown
+    pub fn line(&self) -> u64 {
+        self.position().map(|x| x.line()).unwrap_or(0)
+    }
+
+    /// Returns the column of the error or 0 if unknown
+    pub fn column(&self) -> u64 {
+        self.position().map(|x| x.column()).unwrap_or(0)
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            &Error::MalformedXml { ref pos, ref msg } =>
+                write!(f, "Malformed XML: {} ({})", msg, pos),
+            &Error::Io(ref e) => write!(f, "{}", e),
+            &Error::Utf8(ref e) => write!(f, "{}", e),
+            &Error::UnexpectedEvent { ref msg, .. } =>
+                write!(f, "Unexpected XML event: {}", msg),
+            &Error::DuplicateNamespacePrefix => write!(
+                f, "Encountered duplicated namespace prefix"),
+        }
+    }
+}
+
+impl std::error::Error for Error {
+    fn description(&self) -> &str {
+        match self {
+            &Error::MalformedXml { .. } => "Malformed XML",
+            &Error::Io(..) => "IO error",
+            &Error::Utf8(..) => "utf-8 error",
+            &Error::UnexpectedEvent { .. } => "Unexpected XML element",
+            &Error::DuplicateNamespacePrefix => "Duplicated namespace prefix",
+        }
+    }
+
+    fn cause(&self) -> Option<&std::error::Error> {
+        match self {
+            &Error::Io(ref e) => Some(e),
+            &Error::Utf8(ref e) => Some(e),
+            _ => None,
+        }
+    }
+}
+
+impl From<XmlReadError> for Error {
+    fn from(err: XmlReadError) -> Error {
+        use std::error::Error as StdError;
+        match err.kind() {
+            &XmlReadErrorKind::Io(ref err) => Error::Io(
+                io::Error::new(err.kind(), err.description())),
+            &XmlReadErrorKind::Utf8(ref err) => Error::Utf8(err.clone()),
+            &XmlReadErrorKind::UnexpectedEof => Error::Io(
+                io::Error::new(io::ErrorKind::UnexpectedEof,
+                               "Encountered unexpected eof")),
+            &XmlReadErrorKind::Syntax(ref msg) => {
+                Error::MalformedXml {
+                    msg: msg.clone(),
+                    pos: Position::from_xml_position(&err),
+                }
+            }
+        }
+    }
+}
+
+impl From<XmlWriteError> for Error {
+    fn from(err: XmlWriteError) -> Error {
+        match err {
+            XmlWriteError::Io(err) => Error::Io(err),
+            err => { return Err(err).unwrap(); }
+        }
+    }
+}
+
+impl<'a> Iterator for Children<'a> {
+    type Item = &'a Element;
+
+    fn next(&mut self) -> Option<&'a Element> {
+        if self.idx < self.element.children.len() {
+            let rv = &self.element.children[self.idx];
+            self.idx += 1;
+            Some(rv)
+        } else {
+            None
+        }
+    }
+}
+
+impl<'a> Iterator for ChildrenMut<'a> {
+    type Item = &'a mut Element;
+
+    fn next(&mut self) -> Option<&'a mut Element> {
+        self.iter.next()
+    }
+}
+
+impl<'a> Iterator for Attrs<'a> {
+    type Item = (&'a QName<'a>, &'a str);
+
+    fn next(&mut self) -> Option<(&'a QName<'a>, &'a str)> {
+        if let Some((k, v)) = self.iter.next() {
+            Some((k, v.as_str()))
+        } else {
+            None
+        }
+    }
+}
+
+impl<'a> Iterator for FindChildren<'a> {
+    type Item = &'a Element;
+
+    fn next(&mut self) -> Option<&'a Element> {
+        use std::borrow::Borrow;
+        loop {
+            if let Some(child) = self.child_iter.next() {
+                if child.tag() == self.tag.borrow() {
+                    return Some(child);
+                }
+            } else {
+                return None;
+            }
+        }
+    }
+}
+
+impl<'a> Iterator for FindChildrenMut<'a> {
+    type Item = &'a mut Element;
+
+    fn next(&mut self) -> Option<&'a mut Element> {
+        use std::borrow::Borrow;
+        let tag: &QName = &self.tag.borrow();
+        self.child_iter.find(|x| x.tag() == tag)
+    }
+}
+
+impl Element {
+    /// Creates a new element without any children but a given tag.
+    ///
+    /// This can be used at all times to create a new element however when you
+    /// work with namespaces it's recommended to only use this for the root
+    /// element and then create further children through `new_with_namespaces`
+    /// as otherwise namespaces will not be propagaged downwards properly.
+    pub fn new<'a, Q: AsQName<'a>>(tag: Q) -> Element {
+        Element::new_with_nsmap(&tag.as_qname(), None)
+    }
+
+    /// Creates a new element without any children but inheriting the
+    /// namespaces from another element.
+    ///
+    /// This has the advantage that internally the map will be shared
+    /// across elements for as long as no further modifications are
+    /// taking place.
+    pub fn new_with_namespaces<'a, Q: AsQName<'a>>(tag: Q, reference: &Element) -> Element {
+        Element::new_with_nsmap(&tag.as_qname(), reference.nsmap.clone())
+    }
+
+    fn new_with_nsmap<'a>(tag: &QName<'a>, nsmap: Option<Rc<NamespaceMap>>) -> Element {
+        let mut rv = Element {
+            tag: tag.share(),
+            attributes: BTreeMap::new(),
+            nsmap: nsmap,
+            emit_nsmap: false,
+            children: vec![],
+            text: None,
+            tail: None,
+        };
+        if let Some(url) = tag.ns() {
+            let prefix = rv.get_namespace_prefix(url).unwrap_or("").to_string();
+            rv.register_namespace(url, Some(&prefix));
+        }
+        rv
+    }
+
+    /// Parses some XML data into an `Element` from a reader.
+    pub fn from_reader<R: Read>(r: R) -> Result<Element, Error> {
+        let cfg = ParserConfig::new()
+            .whitespace_to_characters(true);
+        let mut reader = cfg.create_reader(r);
+        loop {
+            match reader.next() {
+                Ok(XmlEvent::StartElement { name, attributes, namespace }) => {
+                    return Element::from_start_element(
+                        name, attributes, namespace, None, &mut reader);
+                }
+                Ok(XmlEvent::Comment(..)) |
+                Ok(XmlEvent::Whitespace(..)) |
+                Ok(XmlEvent::StartDocument { .. }) |
+                Ok(XmlEvent::ProcessingInstruction { .. }) => {
+                    continue;
+                }
+                Ok(_) => return Err(Error::UnexpectedEvent {
+                    msg: Cow::Borrowed("xml construct"),
+                    pos: Position::from_xml_position(&reader),
+                }),
+                Err(e) => return Err(e.into()),
+            }
+        }
+    }
+
+    /// Dump an element as XML document into a writer.
+    ///
+    /// This will create an XML document with a processing instruction
+    /// to start it.  There is currently no API to only serialize a non
+    /// standalone element.
+    ///
+    /// Currently the writer has no way to customize what is generated
+    /// in particular there is no support yet for automatically indenting
+    /// elements.  The reason for this is that there is no way to ignore
+    /// this information automatically in the absence of DTD support which
+    /// is not really planned.
+    pub fn to_writer<W: Write>(&self, w: W) -> Result<(), Error> {
+        self.to_writer_with_options(w, WriteOptions::new())
+    }
+
+    /// Dump an element as XML document into a writer with option.
+    ///
+    /// This will create an XML document with a processing instruction
+    /// to start it.  There is currently no API to only serialize a non
+    /// standalone element.
+    ///
+    /// Currently the writer has no way to customize what is generated
+    /// in particular there is no support yet for automatically indenting
+    /// elements.  The reason for this is that there is no way to ignore
+    /// this information automatically in the absence of DTD support which
+    /// is not really planned.
+    pub fn to_writer_with_options<W: Write>(&self, w: W, options: WriteOptions) -> Result<(), Error> {
+        let mut writer = EmitterConfig::new()
+            .write_document_declaration(options.xml_prolog.is_some())
+            .create_writer(w);
+
+        if options.xml_prolog.is_some() {
+            writer.write(XmlWriteEvent::StartDocument {
+                version: match options.xml_prolog.unwrap() {
+                    XmlProlog::Version10 => XmlVersion::Version10,
+                    XmlProlog::Version11 => XmlVersion::Version11,
+                },
+                encoding: Some("utf-8"),
+                standalone: None,
+            })?;
+        }
+
+        self.dump_into_writer(&mut writer)
+    }
+
+    /// Dump an element as XML document into a string
+    pub fn to_string(&self) -> Result<String, Error> {
+        let mut out: Vec<u8> = Vec::new();
+        self.to_writer(&mut out)?;
+        Ok(String::from_utf8(out).unwrap())
+    }
+
+    fn get_xml_name<'a>(&'a self, qname: &'a QName<'a>) -> Name<'a> {
+        let mut name = Name::local(qname.name());
+        if let Some(url) = qname.ns() {
+            name.namespace = Some(url);
+            if let Some(prefix) = self.get_namespace_prefix(url) {
+                if !prefix.is_empty() {
+                    name.prefix = Some(prefix);
+                }
+            }
+        }
+        name
+    }
+
+    fn dump_into_writer<W: Write>(&self, w: &mut EventWriter<W>) -> Result<(), Error> {
+        let name = self.get_xml_name(&self.tag);
+
+        let mut attributes = Vec::with_capacity(self.attributes.len());
+        for (k, v) in self.attributes.iter() {
+            attributes.push(Attribute {
+                name: self.get_xml_name(k),
+                value: v,
+            });
+        }
+
+        let mut namespace = XmlNamespaceMap::empty();
+        if self.emit_nsmap {
+            if let Some(ref nsmap) = self.nsmap {
+                for (prefix, url) in &nsmap.prefix_to_ns {
+                    namespace.put(prefix.borrow(), url.borrow());
+                }
+            }
+        }
+
+        w.write(XmlWriteEvent::StartElement {
+            name: name,
+            attributes: Cow::Owned(attributes),
+            namespace: Cow::Owned(namespace),
+        })?;
+
+        let text = self.text();
+        if !text.is_empty() {
+            w.write(XmlWriteEvent::Characters(text))?;
+        }
+
+        for elem in &self.children {
+            elem.dump_into_writer(w)?;
+            let text = elem.tail();
+            if !text.is_empty() {
+                w.write(XmlWriteEvent::Characters(text))?;
+            }
+        }
+
+        w.write(XmlWriteEvent::EndElement {
+            name: Some(name),
+        })?;
+
+        Ok(())
+    }
+
+    fn from_start_element<R: Read>(name: OwnedName,
+                                   attributes: Vec<OwnedAttribute>,
+                                   namespace: XmlNamespaceMap,
+                                   parent_nsmap: Option<Rc<NamespaceMap>>,
+                                   reader: &mut EventReader<R>)
+        -> Result<Element, Error>
+    {
+        let mut root = Element {
+            tag: QName::from_owned_name(name),
+            attributes: BTreeMap::new(),
+            nsmap: parent_nsmap,
+            emit_nsmap: false,
+            children: vec![],
+            text: None,
+            tail: None,
+        };
+        for attr in attributes {
+            root.attributes.insert(QName::from_owned_name(attr.name), attr.value);
+        }
+
+        if !namespace.is_essentially_empty() {
+            for (prefix, url) in namespace.0.iter() {
+                root.register_namespace(url, Some(prefix));
+            }
+        };
+
+        root.parse_children(reader)?;
+        Ok(root)
+    }
+
+    fn parse_children<R: Read>(&mut self,
+                               reader: &mut EventReader<R>)
+        -> Result<(), Error>
+    {
+        loop {
+            match reader.next() {
+                Ok(XmlEvent::EndElement { ref name }) => {
+                    if &name.local_name == self.tag.name() &&
+                       name.namespace.as_ref().map(|x| x.as_str()) == self.tag.ns() {
+                        return Ok(());
+                    } else {
+                        return Err(Error::UnexpectedEvent {
+                            msg: Cow::Owned(format!("Unexpected end element {}", &name.local_name)),
+                            pos: Position::from_xml_position(reader),
+                        });
+                    }
+                }
+                Ok(XmlEvent::StartElement { name, attributes, namespace }) => {
+                    self.children.push(Element::from_start_element(
+                        name, attributes, namespace, self.nsmap.clone(), reader)?);
+                }
+                Ok(XmlEvent::Characters(s)) => {
+                    let child_count = self.children.len();
+                    if child_count > 0 {
+                        self.children[child_count - 1].tail = Some(s);
+                    } else {
+                        self.text = Some(s);
+                    }
+                }
+                Ok(XmlEvent::CData(s)) => {
+                    self.text = Some(s);
+                }
+                Ok(XmlEvent::Comment(..)) |
+                Ok(XmlEvent::Whitespace(..)) |
+                Ok(XmlEvent::StartDocument { .. }) |
+                Ok(XmlEvent::ProcessingInstruction { .. }) => {
+                    continue;
+                }
+                Ok(_) => {
+                    return Err(Error::UnexpectedEvent {
+                        msg: Cow::Borrowed("unknown element"),
+                        pos: Position::from_xml_position(reader),
+                    })
+                }
+                Err(e) => {
+                    return Err(e.into());
+                }
+            }
+        }
+    }
+
+    /// Returns the text of a tag.
+    ///
+    /// Note that this does not trim or modify whitespace so the return
+    /// value might contain structural information from the XML file.
+    pub fn text(&self) -> &str {
+        self.text.as_ref().map(|x| x.as_str()).unwrap_or("")
+    }
+
+    /// Sets a new text value for the tag.
+    pub fn set_text<S: Into<String>>(&mut self, value: S) -> &mut Element {
+        let value = value.into();
+        if value.is_empty() {
+            self.text = None;
+        } else {
+            self.text = Some(value);
+        }
+        self
+    }
+
+    /// Returns the tail text of a tag.
+    ///
+    /// The tail is the text following an element.
+    pub fn tail(&self) -> &str {
+        self.tail.as_ref().map(|x| x.as_str()).unwrap_or("")
+    }
+
+    /// Sets a new tail text value for the tag.
+    pub fn set_tail<S: Into<String>>(&mut self, value: S) -> &mut Element {
+        let value = value.into();
+        if value.is_empty() {
+            self.tail = None;
+        } else {
+            self.tail = Some(value);
+        }
+        self
+    }
+
+    /// The tag of the element as qualified name.
+    ///
+    /// Use the `QName` functionality to extract the information from the
+    /// tag name you care about (like the local name).
+    pub fn tag(&self) -> &QName {
+        &self.tag
+    }
+
+    /// Sets a new tag for the element.
+    pub fn set_tag<'a>(&mut self, tag: &QName<'a>) -> &mut Element {
+        self.tag = tag.share();
+        self
+    }
+
+    /// Returns the number of children
+    pub fn child_count(&self) -> usize {
+        self.children.len()
+    }
+
+    /// Returns the nth child.
+    pub fn get_child(&self, idx: usize) -> Option<&Element> {
+        self.children.get(idx)
+    }
+
+    /// Returns the nth child as a mutable reference.
+    pub fn get_child_mut(&mut self, idx: usize) -> Option<&mut Element> {
+        self.children.get_mut(idx)
+    }
+
+    /// Removes a child.
+    ///
+    /// This returns the element if it was removed or None if the
+    /// index was out of bounds.
+    pub fn remove_child(&mut self, idx: usize) -> Option<Element> {
+        if self.children.len() > idx {
+            Some(self.children.remove(idx))
+        } else {
+            None
+        }
+    }
+
+    /// Appends a new child and returns a reference to self.
+    pub fn append_child(&mut self, child: Element) -> &mut Element {
+        self.children.push(child);
+        self
+    }
+
+    /// Appends a new child to the element and returns a reference to it.
+    ///
+    /// This uses ``Element::new_with_namespaces`` internally and can
+    /// then be used like this:
+    ///
+    /// ```
+    /// use elementtree::Element;
+    ///
+    /// let ns = "http://example.invalid/#ns";
+    /// let mut root = Element::new((ns, "mydoc"));
+    ///
+    /// {
+    ///     let mut list = root.append_new_child((ns, "list"));
+    ///     for x in 0..3 {
+    ///         list.append_new_child((ns, "item")).set_text(format!("Item {}", x));
+    ///     }
+    /// }
+    /// ```
+    pub fn append_new_child<'a, Q: AsQName<'a>>(&'a mut self, tag: Q) -> &'a mut Element {
+        let child = Element::new_with_namespaces(tag, self);
+        self.append_child(child);
+        let idx = self.children.len() - 1;
+        &mut self.children[idx]
+    }
+
+    /// Returns an iterator over all children.
+    pub fn children<'a>(&'a self) -> Children<'a> {
+        Children {
+            idx: 0,
+            element: self,
+        }
+    }
+
+    /// Returns a mutable iterator over all children.
+    pub fn children_mut<'a>(&'a mut self) -> ChildrenMut<'a> {
+        ChildrenMut {
+            iter: self.children.iter_mut(),
+        }
+    }
+
+    /// Returns all children with the given name.
+    pub fn find_all<'a, Q: AsQName<'a>>(&'a self, tag: Q) -> FindChildren<'a>
+    {
+        FindChildren {
+            tag: tag.as_qname(),
+            child_iter: self.children(),
+        }
+    }
+
+    /// Returns all children with the given name.
+    pub fn find_all_mut<'a, Q: AsQName<'a>>(&'a mut self, tag: Q) -> FindChildrenMut<'a>
+    {
+        FindChildrenMut {
+            tag: tag.as_qname(),
+            child_iter: self.children_mut(),
+        }
+    }
+
+    /// Finds the first matching child
+    pub fn find<'a, Q: AsQName<'a>>(&'a self, tag: Q) -> Option<&'a Element> {
+        use std::borrow::Borrow;
+        let tag = tag.as_qname();
+
+        for child in self.children() {
+            if child.tag() == tag.borrow() {
+                return Some(child);
+            }
+        }
+        None
+    }
+
+    /// Finds the first matching child and returns a mut ref
+    pub fn find_mut<'a, Q: AsQName<'a>>(&'a mut self, tag: Q) -> Option<&'a mut Element> {
+        self.find_all_mut(tag).next()
+    }
+
+    /// Look up an attribute by qualified name.
+    pub fn get_attr<'a, Q: AsQName<'a>>(&'a self, name: Q) -> Option<&'a str> {
+        self.attributes.get(&name.as_qname()).map(|x| x.as_str())
+    }
+
+    /// Sets a new attribute.
+    ///
+    /// This returns a reference to the element so you can chain the calls.
+    pub fn set_attr<'a, Q: AsQName<'a>, S: Into<String>>(
+        &'a mut self, name: Q, value: S) -> &'a mut Element
+    {
+        self.attributes.insert(name.as_qname().share(), value.into());
+        self
+    }
+
+    /// Removes an attribute and returns the stored string.
+    pub fn remove_attr<'a, Q: AsQName<'a>>(&'a mut self, name: Q) -> Option<String> {
+        // so this requires some explanation.  We store internally QName<'static>
+        // which means the QName has a global lifetime.  This works because we
+        // move the internal string storage into a global string cache or we are
+        // pointing to static memory in the binary.
+        //
+        // However while Rust can coerce our BTreeMap from QName<'static> to
+        // QName<'a> when reading, we can't do the same when writing.  This is
+        // to prevent us from stashing a QName<'a> into the btreemap.  However on
+        // remove that restriction makes no sense so we can unsafely transmute it
+        // away.  I wish there was a better way though.
+        use std::borrow::Borrow;
+        let name = name.as_qname();
+        let name_ref: &QName<'a> = name.borrow();
+        let name_ref_static: &QName<'static> = unsafe { mem::transmute(name_ref) };
+        self.attributes.remove(name_ref_static)
+    }
+
+    /// Returns an iterator over all attributes
+    pub fn attrs<'a>(&'a self) -> Attrs<'a> {
+        Attrs {
+            iter: self.attributes.iter(),
+        }
+    }
+
+    /// Count the attributes
+    pub fn attr_count(&self) -> usize {
+        self.attributes.len()
+    }
+
+    fn get_nsmap_mut(&mut self) -> &mut NamespaceMap {
+        let new_map = match self.nsmap {
+            Some(ref mut nsmap) if Rc::strong_count(nsmap) == 1 => None,
+            Some(ref mut nsmap) => Some(Rc::new((**nsmap).clone())),
+            None => Some(Rc::new(NamespaceMap::new())),
+        };
+        if let Some(nsmap) = new_map {
+            self.nsmap = Some(nsmap);
+        }
+        Rc::get_mut(self.nsmap.as_mut().unwrap()).unwrap()
+    }
+
+    /// Registers a namespace with the internal namespace map.
+    ///
+    /// Note that there is no API to remove namespaces from an element once
+    /// the namespace has been set so be careful with modifying this!
+    ///
+    /// This optionally also registers a specific prefix however if that prefix
+    /// is already used a random one is used instead.
+    pub fn register_namespace(&mut self, url: &str, prefix: Option<&str>) {
+        if self.get_namespace_prefix(url).is_none() {
+            if self.get_nsmap_mut().register_if_missing(url, prefix) {
+                self.emit_nsmap = true;
+            }
+        }
+    }
+
+    /// Sets a specific namespace prefix.  This will also register the
+    /// namespace if it was unknown so far.
+    ///
+    /// In case a prefix is set that is already set elsewhere an error is
+    /// returned.  It's recommended that this method is only used on the
+    /// root node before other prefixes are added.
+    pub fn set_namespace_prefix(&mut self, url: &str, prefix: &str) -> Result<(), Error> {
+        if self.get_namespace_prefix(url) == Some(prefix) {
+            Ok(())
+        } else {
+            self.get_nsmap_mut().set_prefix(url, prefix)
+        }
+    }
+
+    /// Returns the assigned prefix for a namespace.
+    pub fn get_namespace_prefix(&self, url: &str) -> Option<&str> {
+        match url {
+            NS_EMPTY_URI => Some(""),
+            NS_XML_URI => Some("xml"),
+            NS_XMLNS_URI => Some("xmlns"),
+            _ => {
+                if let Some(ref nsmap) = self.nsmap {
+                    nsmap.get_prefix(url)
+                } else {
+                    None
+                }
+            }
+        }
+    }
+
+    /// Finds the first element that match a given path downwards
+    pub fn navigate<'a, Q: AsQName<'a>>(&'a self, path: &[Q]) -> Option<&'a Element> {
+        use std::borrow::Borrow;
+        let mut node = self;
+
+        'outer: for piece in path {
+            let reftag = piece.as_qname();
+            for child in node.children() {
+                if child.tag() == reftag.borrow() {
+                    node = child;
+                    continue 'outer;
+                }
+            }
+            return None;
+        }
+
+        Some(node)
+    }
+}
+
+/// Xml Prolog version handle by elementtree
+pub enum XmlProlog {
+    Version10,
+    Version11,
+}
+
+/// A struct that define write options.
+pub struct WriteOptions {
+    xml_prolog: Option<XmlProlog>
+}
+
+impl Default for WriteOptions {
+    fn default() -> WriteOptions {
+        WriteOptions {
+            xml_prolog: Some(XmlProlog::Version10)
+        }
+    }
+}
+
+impl WriteOptions {
+    pub fn new() -> WriteOptions {
+        WriteOptions {
+            ..WriteOptions::default()
+        }
+    }
+
+    /// Define which xml prolog will be displayed when rendering an Element.
+    ///
+    /// Note that prolog is optional, an XML document with a missing prolog is well-formed but not valid.
+    ///
+    /// See RFC: [W3C XML 26 November 2008](https://www.w3.org/TR/xml/#sec-prolog-dtd)
+    pub fn set_xml_prolog(mut self, prolog: Option<XmlProlog>) -> Self {
+        self.xml_prolog = prolog;
+
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/tests/test_basic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/tests/test_basic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/elementtree/tests/test_basic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/elementtree/tests/test_basic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,331 @@
+extern crate elementtree;
+use std::str;
+use elementtree::{Element, QName, WriteOptions, XmlProlog};
+
+
+#[test]
+fn test_basics() {
+    let root = Element::from_reader(r#"<?xml version="1.0"?>
+    <root>
+        <list>
+            <item>Item 1</item>Tail 1
+            <item>Item 2</item>Tail 2
+            <item>Item 3</item>Tail 3
+        </list>
+    </root>
+    "#.as_bytes()).unwrap();
+
+    let list = root.find("list").unwrap();
+    assert_eq!(list.tag(), &QName::from("list"));
+
+    let items: Vec<_> = list.children().map(|x| x.text()).collect();
+    assert_eq!(items.as_slice(), &["Item 1", "Item 2", "Item 3"]);
+
+    let tails: Vec<_> = list.children().map(|x| x.tail().trim()).collect();
+    assert_eq!(tails.as_slice(), &["Tail 1", "Tail 2", "Tail 3"]);
+}
+
+#[test]
+fn test_attributes() {
+    let root = Element::from_reader(r#"<?xml version="1.0"?>
+    <root>
+        <list a="1" b="2" c="3">
+            <item attr="foo1"/>
+            <item attr="foo2"/>
+            <item attr="foo3"/>
+        </list>
+    </root>
+    "#.as_bytes()).unwrap();
+
+    let list = root.find("list").unwrap();
+    assert_eq!(list.tag(), &QName::from("list"));
+
+    let items: Vec<_> = list.children().map(|x| x.get_attr("attr").unwrap_or("")).collect();
+    assert_eq!(items.as_slice(), &["foo1", "foo2", "foo3"]);
+
+    let mut attrs: Vec<_> = list.attrs().map(|(k, v)| format!("{}={}", k, v)).collect();
+    attrs.sort();
+    assert_eq!(attrs.iter().map(|x| x.as_str()).collect::<Vec<_>>(), vec!["a=1", "b=2", "c=3"]);
+
+    assert_eq!(list.attr_count(), 3);
+}
+
+#[test]
+fn test_namespaces() {
+    let root = Element::from_reader(r#"<?xml version="1.0"?>
+    <root xmlns="root" xmlns:foo="child">
+        <list a="1" b="2" c="3">
+            <item foo:attr="foo1"/>
+            <item foo:attr="foo2"/>
+            <item foo:attr="foo3"/>
+        </list>
+    </root>
+    "#.as_bytes()).unwrap();
+
+    let list = root.find("{root}list").unwrap();
+    assert_eq!(list.tag(), &QName::from("{root}list"));
+
+    let items: Vec<_> = list.children().map(|x| x.get_attr("{child}attr").unwrap_or("")).collect();
+    assert_eq!(items.as_slice(), &["foo1", "foo2", "foo3"]);
+
+    let mut attrs: Vec<_> = list.attrs().map(|(k, v)| format!("{}={}", k, v)).collect();
+    attrs.sort();
+    assert_eq!(attrs.iter().map(|x| x.as_str()).collect::<Vec<_>>(), vec!["a=1", "b=2", "c=3"]);
+
+    assert_eq!(list.attr_count(), 3);
+
+    assert_eq!(root.get_namespace_prefix("http://www.w3.org/2000/xmlns/"), Some("xmlns"));
+
+    assert_eq!(root.get_namespace_prefix("child"), Some("foo"));
+    assert_eq!(root.get_namespace_prefix("root"), Some(""));
+    assert_eq!(root.get_namespace_prefix("missing"), None);
+
+    assert_eq!(list.get_namespace_prefix("child"), Some("foo"));
+    assert_eq!(list.get_namespace_prefix("root"), Some(""));
+    assert_eq!(list.get_namespace_prefix("missing"), None);
+}
+
+#[test]
+fn test_entities() {
+    let root = Element::from_reader(r#"<?xml version="1.0"?>
+    <root>&#83;</root>
+    "#.as_bytes()).unwrap();
+
+    assert_eq!(root.text(), "S");
+}
+
+#[test]
+fn test_write_stuff() {
+    let mut root = Element::new(&QName::from("{myns}root"));
+    root.set_namespace_prefix("myns", "x").unwrap();
+    let mut out: Vec<u8> = Vec::new();
+    root.to_writer(&mut out).unwrap();
+    let out = String::from_utf8(out).unwrap();
+    assert_eq!(&out, "<?xml version=\"1.0\" encoding=\"utf-8\"?><x:root xmlns:x=\"myns\" />");
+}
+
+#[test]
+fn test_basic_creation() {
+    let mut root = Element::new("{demo}mydoc");
+    root.set_namespace_prefix("demo", "").unwrap();
+
+    let mut list = Element::new_with_namespaces("{demo}list", &root);
+
+    for x in 0..3 {
+        let mut child = Element::new_with_namespaces("{demo}item", &root);
+        child.set_text(format!("Item {}", x));
+        list.append_child(child);
+    }
+
+    root.append_child(list);
+    assert_eq!(&root.to_string().unwrap(), "\
+        <?xml version=\"1.0\" encoding=\"utf-8\"?>\
+        <mydoc xmlns=\"demo\">\
+            <list>\
+                <item>Item 0</item>\
+                <item>Item 1</item>\
+                <item>Item 2</item>\
+            </list>\
+        </mydoc>");
+}
+
+#[test]
+fn test_alternative_creation() {
+    let mut root = Element::new("{demo}mydoc");
+    root.set_namespace_prefix("demo", "").unwrap();
+
+    {
+        let mut list = root.append_new_child("{demo}list");
+        for x in 0..3 {
+            let mut child = list.append_new_child("{demo}item");
+            child.set_text(format!("Item {}", x));
+        }
+    }
+
+    assert_eq!(&root.to_string().unwrap(), "\
+        <?xml version=\"1.0\" encoding=\"utf-8\"?>\
+        <mydoc xmlns=\"demo\">\
+            <list>\
+                <item>Item 0</item>\
+                <item>Item 1</item>\
+                <item>Item 2</item>\
+            </list>\
+        </mydoc>");
+}
+
+#[test]
+fn test_whitespace() {
+    let root = Element::from_reader(r#"<?xml version="1.0"?>
+    <root>
+        <list>
+            <item> Item 1 </item>Tail 1
+            <item> Item 2 </item>Tail 2
+            <item> Item 3 </item>Tail 3
+        </list>
+    </root>
+    "#.as_bytes()).unwrap();
+
+    assert_eq!(root.text(), "\n        ");
+
+    let list = root.find("list").unwrap();
+    assert_eq!(list.tag(), &QName::from("list"));
+
+    let items: Vec<_> = list.children().map(|x| x.text()).collect();
+    assert_eq!(items.as_slice(), &[" Item 1 ", " Item 2 ", " Item 3 "]);
+}
+
+
+#[test]
+fn test_creation_without_xml_declaration() {
+    let mut root = Element::new("{demo}mydoc");
+    root.set_namespace_prefix("demo", "").unwrap();
+    {
+        let mut list = root.append_new_child("{demo}list");
+        for x in 0..3 {
+            let mut child = list.append_new_child("{demo}item");
+            child.set_text(format!("Item {}", x));
+        }
+    }
+
+    let mut out:Vec<u8> = Vec::new();
+    let options = WriteOptions::new()
+        .set_xml_prolog(None);
+
+    root.to_writer_with_options(&mut out, options).unwrap();
+    assert_eq!(str::from_utf8(&out).unwrap(), "\
+        <mydoc xmlns=\"demo\">\
+            <list>\
+                <item>Item 0</item>\
+                <item>Item 1</item>\
+                <item>Item 2</item>\
+            </list>\
+        </mydoc>");
+}
+
+#[test]
+fn test_creation_with_xml_prolog_10() {
+    let mut root = Element::new("{demo}mydoc");
+    root.set_namespace_prefix("demo", "").unwrap();
+    {
+        let mut list = root.append_new_child("{demo}list");
+        for x in 0..3 {
+            let mut child = list.append_new_child("{demo}item");
+            child.set_text(format!("Item {}", x));
+        }
+    }
+
+    let mut out:Vec<u8> = Vec::new();
+    let options = WriteOptions::new()
+        .set_xml_prolog(Some(XmlProlog::Version10));
+
+    root.to_writer_with_options(&mut out, options).unwrap();
+    assert_eq!(str::from_utf8(&out).unwrap(), "\
+        <?xml version=\"1.0\" encoding=\"utf-8\"?>\
+        <mydoc xmlns=\"demo\">\
+            <list>\
+                <item>Item 0</item>\
+                <item>Item 1</item>\
+                <item>Item 2</item>\
+            </list>\
+        </mydoc>");
+}
+
+#[test]
+fn test_creation_with_xml_prolog_11() {
+    let mut root = Element::new("{demo}mydoc");
+    root.set_namespace_prefix("demo", "").unwrap();
+    {
+        let mut list = root.append_new_child("{demo}list");
+        for x in 0..3 {
+            let mut child = list.append_new_child("{demo}item");
+            child.set_text(format!("Item {}", x));
+        }
+    }
+
+    let mut out:Vec<u8> = Vec::new();
+    let options = WriteOptions::new()
+        .set_xml_prolog(Some(XmlProlog::Version11));
+
+    root.to_writer_with_options(&mut out, options).unwrap();
+    assert_eq!(str::from_utf8(&out).unwrap(), "\
+        <?xml version=\"1.1\" encoding=\"utf-8\"?>\
+        <mydoc xmlns=\"demo\">\
+            <list>\
+                <item>Item 0</item>\
+                <item>Item 1</item>\
+                <item>Item 2</item>\
+            </list>\
+        </mydoc>");
+}
+
+#[test]
+fn test_creation_with_no_xml_prolog_defined() {
+    let mut root = Element::new("{demo}mydoc");
+    root.set_namespace_prefix("demo", "").unwrap();
+    {
+        let mut list = root.append_new_child("{demo}list");
+        for x in 0..3 {
+            let mut child = list.append_new_child("{demo}item");
+            child.set_text(format!("Item {}", x));
+        }
+    }
+
+    let mut out:Vec<u8> = Vec::new();
+    let options = WriteOptions::new();
+
+    root.to_writer_with_options(&mut out, options).unwrap();
+    assert_eq!(str::from_utf8(&out).unwrap(), "\
+        <?xml version=\"1.0\" encoding=\"utf-8\"?>\
+        <mydoc xmlns=\"demo\">\
+            <list>\
+                <item>Item 0</item>\
+                <item>Item 1</item>\
+                <item>Item 2</item>\
+            </list>\
+        </mydoc>");
+}
+
+#[test]
+fn test_render_multiple_times() {
+    let mut root = Element::new("{demo}mydoc");
+    root.set_namespace_prefix("demo", "").unwrap();
+    root.set_attr(("demo", "id"), "some_id".to_string())
+        .set_attr(("demo", "name"), "some_name".to_string())
+        .set_attr(("demo", "some-other-attr"), "other_attr".to_string());
+
+    let mut out:Vec<u8> = Vec::new();
+
+    root.to_writer_with_options(&mut out, WriteOptions::new()).unwrap();
+    assert_eq!(str::from_utf8(&out).unwrap(), "\
+        <?xml version=\"1.0\" encoding=\"utf-8\"?>\
+        <mydoc xmlns=\"demo\" id=\"some_id\" name=\"some_name\" some-other-attr=\"other_attr\" />");
+
+    let mut out2:Vec<u8> = Vec::new();
+    root.to_writer_with_options(&mut out2, WriteOptions::new()).unwrap();
+    assert_eq!(str::from_utf8(&out2).unwrap(), "\
+        <?xml version=\"1.0\" encoding=\"utf-8\"?>\
+        <mydoc xmlns=\"demo\" id=\"some_id\" name=\"some_name\" some-other-attr=\"other_attr\" />");
+}
+
+#[test]
+fn test_mut_finding() {
+    let mut root = Element::from_reader(r#"<?xml version="1.0"?>
+    <root>
+        <list>
+            <item> Item 1 </item>Tail 1
+            <item> Item 2 </item>Tail 2
+            <item> Item 3 </item>Tail 3
+        </list>
+    </root>
+    "#.as_bytes()).unwrap();
+
+    {
+        let mut list = root.find_mut("list").unwrap();
+        for item in list.find_all_mut("item") {
+            item.set_text("wat");
+        }
+    }
+
+    let v: Vec<_> = root.find("list").unwrap().find_all("item").map(|x| x.text()).collect();
+    assert_eq!(&v, &["wat", "wat", "wat"]);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CONTRIBUTING.md":"ca1901f3e8532fb4cec894fd3664f0eaa898c0c4b961d1b992d1ed54eacf362a","COPYRIGHT":"e082d51871d7fd2a5c4bf4db17accdd9ae445d66daf41c5fd6233bf338569ea6","Cargo.toml":"b8f951961cc1cc6d0e13f9777a0934ed74878838bda706b6ee26b0312871261a","Ideas.md":"b7452893f500163868d8de52c09addaf91e1632454ed02e892c467ed7ec39dbd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","README.md":"88ba57c123201a7cfe0f13bc198d93113d61e8d69a2939c4ad123add8301cb8d","build.rs":"9276ee24ef71433d46323c15296b3fbbb29c0b37c4b1ca45416587f14ba8e777","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":"a1e42df20974e226617fa822aafedb78f3f8ce5cd03bffa02eed558288750d60","src/big5.rs":"7886d0447e01d60e594f81ad43f7d35945c95f2626f32cb61a890186246e3d32","src/data.rs":"8a617cc57032092d65850eb27e00de687c80aea3299e839a1f58b42d0b35abf3","src/euc_jp.rs":"85ca100b6eb5a8881b7f7fc00c2977cb52f27861af33b1e5f9c08e87de8943f4","src/euc_kr.rs":"d4f132ed4d4b327c932c1cbb877aada74376278b888a9dea64d103ba5ca489a0","src/gb18030.rs":"fa2260f310225e27f7049cfddef14b2653daf4e25fa28832d861dc9b32b3fd75","src/handles.rs":"05ae5e0cc9d1f7a1d07b053b69c7cd6caf9b0c26073f4166f4fd8f1cc7751cb0","src/iso_2022_jp.rs":"e40be2a37dad274a9fb1803da52a4390231048ad0f5ee5825fab0f2237940062","src/lib.rs":"d32740f7d387e81f4a0b867912cf879aaf3f07aad84208fccceab3e798ae6b71","src/macros.rs":"200997f8870de8bfd8cdc475e92115df42108c0df661e49d3d1cbc32056e1d99","src/mem.rs":"c8030f38328a5011d106dfcb9940fdb0d656a816af9b3173ac7c966b7bed61fe","src/replacement.rs":"cc99e36815fb2a2948718f19fd144f0e9c97477977f0ad1236bbe512db649cec","src/shift_jis.rs":"303c65f7a6bd1a07b2b4bf2890701cc869ab40cbcf70813250c048846810ee48","src/simd_funcs.rs":"a044ed1e8fd4834757b2dd93c84629cb71935b333a4720b770a2b6b20996b46e","src/single_byte.rs":"5704afbd6fff832dfcbf89ab7a58a1472c9277ae65505f39e854fc0369e15d68","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":"c962c7aeac3d9ef2aca70c9e21983b231d4cf998cb06879374b0401e5149d1da","src/testing.rs":"f59e671e95a98a56f6b573e8c6be4d71e670bf52f7e20eb1605d990aafa1894e","src/utf_16.rs":"0ed5217e824d1ddc4a08e4a0c68c42d73506a7f80c2209a557b71bb3f800877c","src/utf_8.rs":"8c59f98bc43879c5d5f3b769e41cec53c93447324c9e9b9f3c1ec0dd93efdaea","src/variant.rs":"8699c4f3a11b183d9c7918067057581457c7bc1fdb82c683792035a7c30d69e6","src/x_user_defined.rs":"782d66fb340c6d0ae524e6e798f5d780de6f4612f82407f12f6c6fd0bfd8c3c0"},"package":"801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283"}
\ No newline at end of file
+{"files":{"CONTRIBUTING.md":"ca1901f3e8532fb4cec894fd3664f0eaa898c0c4b961d1b992d1ed54eacf362a","COPYRIGHT":"e082d51871d7fd2a5c4bf4db17accdd9ae445d66daf41c5fd6233bf338569ea6","Cargo.toml":"969300ac072ad3223efa55497b4c62eca4b4a550a5e045113569c9bf1aaa1a30","Ideas.md":"b7452893f500163868d8de52c09addaf91e1632454ed02e892c467ed7ec39dbd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","README.md":"eb9f00340e0f6ba3d01f4770356062ab2142e1646c7c2556c9b35348f90980f0","build.rs":"9276ee24ef71433d46323c15296b3fbbb29c0b37c4b1ca45416587f14ba8e777","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":"26a7b66589b7ec441bdeaae0c02b05687d8b209954d9c620e8c7da13ede764fb","src/big5.rs":"7886d0447e01d60e594f81ad43f7d35945c95f2626f32cb61a890186246e3d32","src/data.rs":"8a617cc57032092d65850eb27e00de687c80aea3299e839a1f58b42d0b35abf3","src/euc_jp.rs":"85ca100b6eb5a8881b7f7fc00c2977cb52f27861af33b1e5f9c08e87de8943f4","src/euc_kr.rs":"d4f132ed4d4b327c932c1cbb877aada74376278b888a9dea64d103ba5ca489a0","src/gb18030.rs":"fa2260f310225e27f7049cfddef14b2653daf4e25fa28832d861dc9b32b3fd75","src/handles.rs":"cc83dc0754751d67f5688a65c5e0191cba02f6bacce81a0813a243cba55eef7a","src/iso_2022_jp.rs":"e40be2a37dad274a9fb1803da52a4390231048ad0f5ee5825fab0f2237940062","src/lib.rs":"af4ff013841da9bf00cf88ad3ae468f30c122b730ed37327d965d11b8e367459","src/macros.rs":"200997f8870de8bfd8cdc475e92115df42108c0df661e49d3d1cbc32056e1d99","src/mem.rs":"a189e5320ca0274e2871bd8635897447a2ad1468f26d5c1c65342085a0d0dcee","src/replacement.rs":"cc99e36815fb2a2948718f19fd144f0e9c97477977f0ad1236bbe512db649cec","src/shift_jis.rs":"303c65f7a6bd1a07b2b4bf2890701cc869ab40cbcf70813250c048846810ee48","src/simd_funcs.rs":"103ab4f21229270f97f5ca639ad4f8d82e0d5099974b63db4b3faa486012064b","src/single_byte.rs":"ddd19aca70f1ac3590a564b19ae7f7620a3b8147ba27867d4c9c4166e5f009ca","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":"c962c7aeac3d9ef2aca70c9e21983b231d4cf998cb06879374b0401e5149d1da","src/testing.rs":"f59e671e95a98a56f6b573e8c6be4d71e670bf52f7e20eb1605d990aafa1894e","src/utf_16.rs":"0ed5217e824d1ddc4a08e4a0c68c42d73506a7f80c2209a557b71bb3f800877c","src/utf_8.rs":"7dbd7d8be3112030351114bca1f2d2691ed84371d0a5e1de4ba1a3785565606e","src/variant.rs":"8699c4f3a11b183d9c7918067057581457c7bc1fdb82c683792035a7c30d69e6","src/x_user_defined.rs":"782d66fb340c6d0ae524e6e798f5d780de6f4612f82407f12f6c6fd0bfd8c3c0"},"package":"80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "encoding_rs"
-version = "0.8.26"
+version = "0.8.28"
 authors = ["Henri Sivonen <hsivonen@hsivonen.fi>"]
 description = "A Gecko-oriented implementation of the Encoding Standard"
 homepage = "https://docs.rs/encoding_rs/"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -75,6 +75,14 @@
 `std::io::Read`. The [`encoding_rs_io`](https://crates.io/crates/encoding_rs_io)
 crate provides that capability.
 
+## `no_std` Environment
+
+The crate works in a `no_std` environment assuming that `alloc` is present.
+The `alloc`-using part are on the outer edge of the crate, so if there is
+interest in using the crate in environments without `alloc` it would be
+feasible to add a way to turn off those parts of the API of this crate that
+use `Vec`/`String`/`Cow`.
+
 ## Decoding Email
 
 For decoding character encodings that occur in email, use the
@@ -358,7 +366,8 @@
 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 2020-11-02, MSRV appears to be Rust 1.36.0.
+As of 2021-02-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.
 
 ## Compatibility with rust-encoding
 
@@ -418,9 +427,19 @@
       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).~
+- [ ] Provide a build mode that works without `alloc` (with lesser API surface).
+- [ ] Migrate to `std::simd` once it is stable and declare 1.0.
 
 ## Release Notes
 
+### 0.8.28
+
+* Fix error in Serde support introduced as part of `no_std` support.
+
+### 0.8.27
+
+* Make the crate works in a `no_std` environment (with `alloc`).
+
 ### 0.8.26
 
 * Fix oversights in edition 2018 migration that broke the `simd-accel` feature.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/ascii.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/ascii.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/ascii.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/ascii.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,9 +34,9 @@
 cfg_if! {
     if #[cfg(feature = "simd-accel")] {
         #[allow(unused_imports)]
-        use ::std::intrinsics::unlikely;
+        use ::core::intrinsics::unlikely;
         #[allow(unused_imports)]
-        use ::std::intrinsics::likely;
+        use ::core::intrinsics::likely;
     } else {
         #[allow(dead_code)]
         #[inline(always)]
@@ -103,7 +103,7 @@
                 let mut until_alignment = {
                     // Check if the other unit aligns if we move the narrower unit
                     // to alignment.
-                    //               if ::std::mem::size_of::<$src_unit>() == ::std::mem::size_of::<$dst_unit>() {
+                    //               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;
@@ -111,7 +111,7 @@
                         break;
                     }
                     (ALU_ALIGNMENT - src_alignment) & ALU_ALIGNMENT_MASK
-                    //               } else if ::std::mem::size_of::<$src_unit>() < ::std::mem::size_of::<$dst_unit>() {
+                    //               } 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 {
@@ -197,7 +197,7 @@
                 let mut until_alignment = {
                     // Check if the other unit aligns if we move the narrower unit
                     // to alignment.
-                    //               if ::std::mem::size_of::<$src_unit>() == ::std::mem::size_of::<$dst_unit>() {
+                    //               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;
@@ -206,7 +206,7 @@
                     //                   }
                     //                   (ALIGNMENT - src_alignment) & ALIGNMENT_MASK
                     //               } else
-                    if ::std::mem::size_of::<$src_unit>() < ::std::mem::size_of::<$dst_unit>() {
+                    if ::core::mem::size_of::<$src_unit>() < ::core::mem::size_of::<$dst_unit>() {
                         // ascii_to_basic_latin
                         let src_until_alignment = (ALU_ALIGNMENT
                             - ((src as usize) & ALU_ALIGNMENT_MASK))
@@ -290,7 +290,7 @@
             // This loop is only broken out of as a `goto` forward
             loop {
                 let mut until_alignment = {
-                    if ::std::mem::size_of::<$src_unit>() < ::std::mem::size_of::<$dst_unit>() {
+                    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))
@@ -447,7 +447,7 @@
             dst: *mut $dst_unit,
             len: usize,
         ) -> Option<($src_unit, usize)> {
-            let unit_size = ::std::mem::size_of::<$src_unit>();
+            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
@@ -629,7 +629,7 @@
     ) => {
         #[inline(always)]
         pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) {
-            let unit_size = ::std::mem::size_of::<$src_unit>();
+            let unit_size = ::core::mem::size_of::<$src_unit>();
             let mut offset = 0usize;
             if SIMD_STRIDE_SIZE <= len {
                 let mut until_alignment = ((SIMD_STRIDE_SIZE
@@ -1511,6 +1511,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloc::vec::Vec;
 
     macro_rules! test_ascii {
         ($test_name:ident, $fn_tested:ident, $src_unit:ty, $dst_unit:ty) => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/handles.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/handles.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/handles.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/handles.rs	2021-12-09 12:01:26.000000000 +0000
@@ -108,12 +108,12 @@
 
     #[inline(always)]
     pub fn at(&self, i: usize) -> u16 {
-        use std::mem::MaybeUninit;
+        use core::mem::MaybeUninit;
 
         assert!(i < self.len);
         unsafe {
             let mut u: MaybeUninit<u16> = MaybeUninit::uninit();
-            ::std::ptr::copy_nonoverlapping(self.ptr.add(i * 2), u.as_mut_ptr() as *mut u8, 2);
+            ::core::ptr::copy_nonoverlapping(self.ptr.add(i * 2), u.as_mut_ptr() as *mut u8, 2);
             u.assume_init()
         }
     }
@@ -195,7 +195,7 @@
     dst: &mut [u8],
     offset: usize,
 ) -> CopyAsciiResult<usize, (u16, usize)> {
-    let len = ::std::cmp::min(src.len(), dst.len());
+    let len = ::core::cmp::min(src.len(), dst.len());
     let mut i = 0usize;
     loop {
         if i == len {
@@ -234,7 +234,7 @@
     src: UnalignedU16Slice,
     dst: &mut [u8],
 ) -> CopyAsciiResult<usize, (u16, usize)> {
-    let len = ::std::cmp::min(src.len(), dst.len());
+    let len = ::core::cmp::min(src.len(), dst.len());
     let mut offset = 0;
     if SIMD_STRIDE_SIZE <= len {
         let len_minus_stride = len - SIMD_STRIDE_SIZE;
@@ -736,7 +736,7 @@
         let mut src_unaligned = unsafe {
             UnalignedU16Slice::new(
                 src_remaining.as_ptr(),
-                ::std::cmp::min(src_remaining.len() / 2, dst_remaining.len()),
+                ::core::cmp::min(src_remaining.len() / 2, dst_remaining.len()),
             )
         };
         if src_unaligned.len() == 0 {
@@ -1080,7 +1080,7 @@
     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 min_len = ::std::cmp::min(src_remaining.len(), dst_remaining.len());
+        let min_len = ::core::cmp::min(src_remaining.len(), dst_remaining.len());
         // Validate first, then memcpy to let memcpy do its thing even for
         // non-ASCII. (And potentially do something better than SSE2 for ASCII.)
         let valid_len = utf8_valid_up_to(&src_remaining[..min_len]);
@@ -1156,7 +1156,7 @@
         self.pos += 1;
         let unit_minus_surrogate_start = unit.wrapping_sub(0xD800);
         if unit_minus_surrogate_start > (0xDFFF - 0xD800) {
-            return unsafe { ::std::char::from_u32_unchecked(u32::from(unit)) };
+            return unsafe { ::core::char::from_u32_unchecked(u32::from(unit)) };
         }
         if unit_minus_surrogate_start <= (0xDBFF - 0xD800) {
             // high surrogate
@@ -1167,7 +1167,7 @@
                     // The next code unit is a low surrogate. Advance position.
                     self.pos += 1;
                     return unsafe {
-                        ::std::char::from_u32_unchecked(
+                        ::core::char::from_u32_unchecked(
                             (u32::from(unit) << 10) + u32::from(second)
                                 - (((0xD800u32 << 10) - 0x10000u32) + 0xDC00u32),
                         )
@@ -1204,7 +1204,7 @@
                     // The next code unit is a low surrogate. Advance position.
                     self.pos += 1;
                     return Unicode::NonAscii(NonAscii::Astral(unsafe {
-                        ::std::char::from_u32_unchecked(
+                        ::core::char::from_u32_unchecked(
                             (u32::from(unit) << 10) + u32::from(second)
                                 - (((0xD800u32 << 10) - 0x10000u32) + 0xDC00u32),
                         )
@@ -1268,7 +1268,7 @@
                                     // The next code unit is a low surrogate. Advance position.
                                     self.pos += 1;
                                     NonAscii::Astral(unsafe {
-                                        ::std::char::from_u32_unchecked(
+                                        ::core::char::from_u32_unchecked(
                                             (u32::from(unit) << 10) + u32::from(second)
                                                 - (((0xD800u32 << 10) - 0x10000u32) + 0xDC00u32),
                                         )
@@ -1341,7 +1341,7 @@
                                     // The next code unit is a low surrogate. Advance position.
                                     self.pos += 1;
                                     NonAscii::Astral(unsafe {
-                                        ::std::char::from_u32_unchecked(
+                                        ::core::char::from_u32_unchecked(
                                             (u32::from(unit) << 10) + u32::from(second)
                                                 - (((0xD800u32 << 10) - 0x1_0000u32) + 0xDC00u32),
                                         )
@@ -1469,21 +1469,21 @@
             let point =
                 ((u32::from(unit) & 0x1F) << 6) | (u32::from(self.slice[self.pos + 1]) & 0x3F);
             self.pos += 2;
-            return unsafe { ::std::char::from_u32_unchecked(point) };
+            return unsafe { ::core::char::from_u32_unchecked(point) };
         }
         if unit < 0xF0 {
             let point = ((u32::from(unit) & 0xF) << 12)
                 | ((u32::from(self.slice[self.pos + 1]) & 0x3F) << 6)
                 | (u32::from(self.slice[self.pos + 2]) & 0x3F);
             self.pos += 3;
-            return unsafe { ::std::char::from_u32_unchecked(point) };
+            return unsafe { ::core::char::from_u32_unchecked(point) };
         }
         let point = ((u32::from(unit) & 0x7) << 18)
             | ((u32::from(self.slice[self.pos + 1]) & 0x3F) << 12)
             | ((u32::from(self.slice[self.pos + 2]) & 0x3F) << 6)
             | (u32::from(self.slice[self.pos + 3]) & 0x3F);
         self.pos += 4;
-        unsafe { ::std::char::from_u32_unchecked(point) }
+        unsafe { ::core::char::from_u32_unchecked(point) }
     }
     #[inline(always)]
     fn read_enum(&mut self) -> Unicode {
@@ -1512,7 +1512,7 @@
             | (u32::from(self.slice[self.pos + 3]) & 0x3F);
         self.pos += 4;
         Unicode::NonAscii(NonAscii::Astral(unsafe {
-            ::std::char::from_u32_unchecked(point)
+            ::core::char::from_u32_unchecked(point)
         }))
     }
     #[inline(always)]
@@ -1567,7 +1567,7 @@
                             | ((u32::from(self.slice[self.pos + 2]) & 0x3F) << 6)
                             | (u32::from(self.slice[self.pos + 3]) & 0x3F);
                         self.pos += 4;
-                        NonAscii::Astral(unsafe { ::std::char::from_u32_unchecked(point) })
+                        NonAscii::Astral(unsafe { ::core::char::from_u32_unchecked(point) })
                     }
                 }
             }
@@ -1617,7 +1617,7 @@
                                 | ((u32::from(self.slice[self.pos + 2]) & 0x3F) << 6)
                                 | (u32::from(self.slice[self.pos + 3]) & 0x3F);
                             self.pos += 4;
-                            NonAscii::Astral(unsafe { ::std::char::from_u32_unchecked(point) })
+                            NonAscii::Astral(unsafe { ::core::char::from_u32_unchecked(point) })
                         }
                     } else {
                         return CopyAsciiResult::Stop((
@@ -1674,7 +1674,7 @@
                                 | ((u32::from(self.slice[self.pos + 2]) & 0x3F) << 6)
                                 | (u32::from(self.slice[self.pos + 3]) & 0x3F);
                             self.pos += 4;
-                            NonAscii::Astral(unsafe { ::std::char::from_u32_unchecked(point) })
+                            NonAscii::Astral(unsafe { ::core::char::from_u32_unchecked(point) })
                         }
                     } else {
                         return CopyAsciiResult::Stop((
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -679,8 +679,12 @@
 //! 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(stdsimd, core_intrinsics))]
 
+#[cfg_attr(test, macro_use)]
+extern crate alloc;
+extern crate core;
 #[macro_use]
 extern crate cfg_if;
 
@@ -746,10 +750,12 @@
 use crate::utf_8::utf8_valid_up_to;
 use crate::variant::*;
 
-use std::borrow::Cow;
-use std::cmp::Ordering;
-use std::hash::Hash;
-use std::hash::Hasher;
+use alloc::borrow::Cow;
+use alloc::string::String;
+use alloc::vec::Vec;
+use core::cmp::Ordering;
+use core::hash::Hash;
+use core::hash::Hasher;
 
 #[cfg(feature = "serde")]
 use serde::de::Visitor;
@@ -3022,7 +3028,7 @@
                 ascii_valid_up_to(bytes)
             };
             if valid_up_to == bytes.len() {
-                let str: &str = unsafe { std::str::from_utf8_unchecked(bytes) };
+                let str: &str = unsafe { core::str::from_utf8_unchecked(bytes) };
                 return (Cow::Borrowed(str), false);
             }
             let decoder = self.new_decoder_without_bom_handling();
@@ -3041,7 +3047,7 @@
             unsafe {
                 let vec = string.as_mut_vec();
                 vec.set_len(valid_up_to);
-                std::ptr::copy_nonoverlapping(bytes.as_ptr(), vec.as_mut_ptr(), valid_up_to);
+                core::ptr::copy_nonoverlapping(bytes.as_ptr(), vec.as_mut_ptr(), valid_up_to);
             }
             (decoder, string, valid_up_to)
         } else {
@@ -3114,7 +3120,7 @@
         if self == UTF_8 {
             let valid_up_to = utf8_valid_up_to(bytes);
             if valid_up_to == bytes.len() {
-                let str: &str = unsafe { std::str::from_utf8_unchecked(bytes) };
+                let str: &str = unsafe { core::str::from_utf8_unchecked(bytes) };
                 return Some(Cow::Borrowed(str));
             }
             return None;
@@ -3126,7 +3132,7 @@
                 ascii_valid_up_to(bytes)
             };
             if valid_up_to == bytes.len() {
-                let str: &str = unsafe { std::str::from_utf8_unchecked(bytes) };
+                let str: &str = unsafe { core::str::from_utf8_unchecked(bytes) };
                 return Some(Cow::Borrowed(str));
             }
             let decoder = self.new_decoder_without_bom_handling();
@@ -3140,7 +3146,7 @@
             unsafe {
                 let vec = string.as_mut_vec();
                 vec.set_len(valid_up_to);
-                std::ptr::copy_nonoverlapping(bytes.as_ptr(), vec.as_mut_ptr(), valid_up_to);
+                core::ptr::copy_nonoverlapping(bytes.as_ptr(), vec.as_mut_ptr(), valid_up_to);
             }
             (decoder, string, &bytes[valid_up_to..])
         } else {
@@ -3228,7 +3234,7 @@
         );
         unsafe {
             vec.set_len(valid_up_to);
-            std::ptr::copy_nonoverlapping(bytes.as_ptr(), vec.as_mut_ptr(), valid_up_to);
+            core::ptr::copy_nonoverlapping(bytes.as_ptr(), vec.as_mut_ptr(), valid_up_to);
         }
         let mut total_read = valid_up_to;
         let mut total_had_errors = false;
@@ -3357,6 +3363,20 @@
 
 impl Eq for Encoding {}
 
+#[cfg(test)]
+impl PartialOrd for Encoding {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        (self as *const Encoding as usize).partial_cmp(&(other as *const Encoding as usize))
+    }
+}
+
+#[cfg(test)]
+impl Ord for Encoding {
+    fn cmp(&self, other: &Self) -> Ordering {
+        (self as *const Encoding as usize).cmp(&(other as *const Encoding as usize))
+    }
+}
+
 impl Hash for Encoding {
     #[inline]
     fn hash<H: Hasher>(&self, state: &mut H) {
@@ -3364,9 +3384,9 @@
     }
 }
 
-impl std::fmt::Debug for Encoding {
+impl core::fmt::Debug for Encoding {
     #[inline]
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
         write!(f, "Encoding {{ {} }}", self.name)
     }
 }
@@ -3389,7 +3409,7 @@
 impl<'de> Visitor<'de> for EncodingVisitor {
     type Value = &'static Encoding;
 
-    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+    fn expecting(&self, formatter: &mut core::fmt::Formatter) -> core::fmt::Result {
         formatter.write_str("a valid encoding label")
     }
 
@@ -3400,7 +3420,7 @@
         if let Some(enc) = Encoding::for_label(value.as_bytes()) {
             Ok(enc)
         } else {
-            Err(E::custom(format!("invalid encoding label: {}", value)))
+            Err(E::custom(alloc::format!("invalid encoding label: {}", value)))
         }
     }
 }
@@ -3674,7 +3694,7 @@
                         1,
                         checked_mul(3, checked_div(byte_length.checked_add(1), 2)),
                     ) {
-                        let utf_bom = std::cmp::max(utf8_bom, utf16_bom);
+                        let utf_bom = core::cmp::max(utf8_bom, utf16_bom);
                         let encoding = self.encoding();
                         if encoding == UTF_8 || encoding == UTF_16LE || encoding == UTF_16BE {
                             // No need to consider the internal state of the underlying decoder,
@@ -3683,7 +3703,7 @@
                         } else if let Some(non_bom) =
                             self.variant.max_utf8_buffer_length(byte_length)
                         {
-                            return Some(std::cmp::max(utf_bom, non_bom));
+                            return Some(core::cmp::max(utf_bom, non_bom));
                         }
                     }
                 }
@@ -3701,7 +3721,7 @@
                             // because it is at start, because no data has reached it yet.
                             return Some(utf8_bom);
                         } else if let Some(non_bom) = self.variant.max_utf8_buffer_length(sum) {
-                            return Some(std::cmp::max(utf8_bom, non_bom));
+                            return Some(core::cmp::max(utf8_bom, non_bom));
                         }
                     }
                 }
@@ -3727,7 +3747,7 @@
                             // because it is at start, because no data has reached it yet.
                             return Some(utf16_bom);
                         } else if let Some(non_bom) = self.variant.max_utf8_buffer_length(sum) {
-                            return Some(std::cmp::max(utf16_bom, non_bom));
+                            return Some(core::cmp::max(utf16_bom, non_bom));
                         }
                     }
                 }
@@ -3766,7 +3786,7 @@
                         1,
                         checked_mul(3, checked_div(byte_length.checked_add(1), 2)),
                     ) {
-                        let utf_bom = std::cmp::max(utf8_bom, utf16_bom);
+                        let utf_bom = core::cmp::max(utf8_bom, utf16_bom);
                         let encoding = self.encoding();
                         if encoding == UTF_8 || encoding == UTF_16LE || encoding == UTF_16BE {
                             // No need to consider the internal state of the underlying decoder,
@@ -3776,7 +3796,7 @@
                             .variant
                             .max_utf8_buffer_length_without_replacement(byte_length)
                         {
-                            return Some(std::cmp::max(utf_bom, non_bom));
+                            return Some(core::cmp::max(utf_bom, non_bom));
                         }
                     }
                 }
@@ -3796,7 +3816,7 @@
                         } else if let Some(non_bom) =
                             self.variant.max_utf8_buffer_length_without_replacement(sum)
                         {
-                            return Some(std::cmp::max(utf8_bom, non_bom));
+                            return Some(core::cmp::max(utf8_bom, non_bom));
                         }
                     }
                 }
@@ -3824,7 +3844,7 @@
                         } else if let Some(non_bom) =
                             self.variant.max_utf8_buffer_length_without_replacement(sum)
                         {
-                            return Some(std::cmp::max(utf16_bom, non_bom));
+                            return Some(core::cmp::max(utf16_bom, non_bom));
                         }
                     }
                 }
@@ -3918,7 +3938,7 @@
         // bytes of trailing garbage. No need to optimize non-ASCII-compatible
         // encodings to avoid overwriting here.
         if self.encoding != UTF_8 {
-            let max = std::cmp::min(len, trail + ascii::MAX_STRIDE_SIZE);
+            let max = core::cmp::min(len, trail + ascii::MAX_STRIDE_SIZE);
             while trail < max {
                 bytes[trail] = 0;
                 trail += 1;
@@ -4008,7 +4028,7 @@
         // bytes of trailing garbage. No need to optimize non-ASCII-compatible
         // encodings to avoid overwriting here.
         if self.encoding != UTF_8 {
-            let max = std::cmp::min(len, trail + ascii::MAX_STRIDE_SIZE);
+            let max = core::cmp::min(len, trail + ascii::MAX_STRIDE_SIZE);
             while trail < max {
                 bytes[trail] = 0;
                 trail += 1;
@@ -4081,7 +4101,7 @@
                     if let Some(utf16_bom) =
                         checked_add(1, checked_div(byte_length.checked_add(1), 2))
                     {
-                        let utf_bom = std::cmp::max(utf8_bom, utf16_bom);
+                        let utf_bom = core::cmp::max(utf8_bom, utf16_bom);
                         let encoding = self.encoding();
                         if encoding == UTF_8 || encoding == UTF_16LE || encoding == UTF_16BE {
                             // No need to consider the internal state of the underlying decoder,
@@ -4090,7 +4110,7 @@
                         } else if let Some(non_bom) =
                             self.variant.max_utf16_buffer_length(byte_length)
                         {
-                            return Some(std::cmp::max(utf_bom, non_bom));
+                            return Some(core::cmp::max(utf_bom, non_bom));
                         }
                     }
                 }
@@ -4108,7 +4128,7 @@
                             // because it is at start, because no data has reached it yet.
                             return Some(utf8_bom);
                         } else if let Some(non_bom) = self.variant.max_utf16_buffer_length(sum) {
-                            return Some(std::cmp::max(utf8_bom, non_bom));
+                            return Some(core::cmp::max(utf8_bom, non_bom));
                         }
                     }
                 }
@@ -4132,7 +4152,7 @@
                             // because it is at start, because no data has reached it yet.
                             return Some(utf16_bom);
                         } else if let Some(non_bom) = self.variant.max_utf16_buffer_length(sum) {
-                            return Some(std::cmp::max(utf16_bom, non_bom));
+                            return Some(core::cmp::max(utf16_bom, non_bom));
                         }
                     }
                 }
@@ -4267,7 +4287,7 @@
 
 impl EncoderResult {
     fn unmappable_from_bmp(bmp: u16) -> EncoderResult {
-        EncoderResult::Unmappable(::std::char::from_u32(u32::from(bmp)).unwrap())
+        EncoderResult::Unmappable(::core::char::from_u32(u32::from(bmp)).unwrap())
     }
 }
 
@@ -4847,7 +4867,7 @@
 fn checked_min(one: Option<usize>, other: Option<usize>) -> Option<usize> {
     if let Some(a) = one {
         if let Some(b) = other {
-            Some(::std::cmp::min(a, b))
+            Some(::core::cmp::min(a, b))
         } else {
             Some(a)
         }
@@ -4872,7 +4892,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::borrow::Cow;
+    use alloc::borrow::Cow;
 
     fn sniff_to_utf16(
         initial_encoding: &'static Encoding,
@@ -5625,7 +5645,7 @@
 
     #[test]
     fn test_hash() {
-        let mut encodings = ::std::collections::HashSet::new();
+        let mut encodings = ::alloc::collections::btree_set::BTreeSet::new();
         encodings.insert(UTF_8);
         encodings.insert(ISO_2022_JP);
         assert!(encodings.contains(UTF_8));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/mem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/mem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/mem.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/mem.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,7 +24,9 @@
 //! The FFI binding for this module are in the
 //! [encoding_c_mem crate](https://github.com/hsivonen/encoding_c_mem).
 
-use std::borrow::Cow;
+use alloc::borrow::Cow;
+use alloc::string::String;
+use alloc::vec::Vec;
 
 use super::in_inclusive_range16;
 use super::in_inclusive_range32;
@@ -41,8 +43,8 @@
 
 cfg_if! {
     if #[cfg(feature = "simd-accel")] {
-        use ::std::intrinsics::likely;
-        use ::std::intrinsics::unlikely;
+        use ::core::intrinsics::likely;
+        use ::core::intrinsics::unlikely;
     } else {
         #[inline(always)]
         // Unsafe to match the intrinsic, which is needlessly unsafe.
@@ -85,7 +87,7 @@
         fn $name(buffer: &[$unit]) -> bool {
             let mut offset = 0usize;
             let mut accu = 0usize;
-            let unit_size = ::std::mem::size_of::<$unit>();
+            let unit_size = ::core::mem::size_of::<$unit>();
             let len = buffer.len();
             if len >= ALU_ALIGNMENT / unit_size {
                 // The most common reason to return `false` is for the first code
@@ -157,7 +159,7 @@
         fn $name(buffer: &[$unit]) -> bool {
             let mut offset = 0usize;
             let mut accu = 0usize;
-            let unit_size = ::std::mem::size_of::<$unit>();
+            let unit_size = ::core::mem::size_of::<$unit>();
             let len = buffer.len();
             if len >= SIMD_STRIDE_SIZE / unit_size {
                 // The most common reason to return `false` is for the first code
@@ -248,7 +250,7 @@
             // only aligned SIMD (perhaps misguidedly) and needs to deal with
             // the last code unit in a SIMD stride being part of a valid
             // surrogate pair.
-            let unit_size = ::std::mem::size_of::<u16>();
+            let unit_size = ::core::mem::size_of::<u16>();
             let src = buffer.as_ptr();
             let len = buffer.len();
             let mut offset = 0usize;
@@ -1781,7 +1783,7 @@
         // src can't advance more than dst
         let src_left = src_len - total_read;
         let dst_left = dst_len - total_written;
-        let min_left = ::std::cmp::min(src_left, dst_left);
+        let min_left = ::core::cmp::min(src_left, dst_left);
         if let Some((non_ascii, consumed)) = unsafe {
             ascii_to_ascii(
                 src_ptr.add(total_read),
@@ -1850,7 +1852,7 @@
     let (read, written) = convert_latin1_to_utf8_partial(src, bytes);
     let len = bytes.len();
     let mut trail = written;
-    let max = ::std::cmp::min(len, trail + MAX_STRIDE_SIZE);
+    let max = ::core::cmp::min(len, trail + MAX_STRIDE_SIZE);
     while trail < max {
         bytes[trail] = 0;
         trail += 1;
@@ -1991,7 +1993,7 @@
     // >= makes later things optimize better than ==
     if up_to >= bytes.len() {
         debug_assert_eq!(up_to, bytes.len());
-        let s: &str = unsafe { ::std::str::from_utf8_unchecked(bytes) };
+        let s: &str = unsafe { ::core::str::from_utf8_unchecked(bytes) };
         return Cow::Borrowed(s);
     }
     let (head, tail) = bytes.split_at(up_to);
@@ -3152,11 +3154,11 @@
     #[cfg_attr(miri, ignore)] // Miri is too slow
     fn test_is_char_bidi_thoroughly() {
         for i in 0..0xD800u32 {
-            let c: char = ::std::char::from_u32(i).unwrap();
+            let c: char = ::core::char::from_u32(i).unwrap();
             assert_eq!(is_char_bidi(c), reference_is_char_bidi(c));
         }
         for i in 0xE000..0x110000u32 {
-            let c: char = ::std::char::from_u32(i).unwrap();
+            let c: char = ::core::char::from_u32(i).unwrap();
             assert_eq!(is_char_bidi(c), reference_is_char_bidi(c));
         }
     }
@@ -3178,14 +3180,14 @@
     fn test_is_str_bidi_thoroughly() {
         let mut buf = [0; 4];
         for i in 0..0xD800u32 {
-            let c: char = ::std::char::from_u32(i).unwrap();
+            let c: char = ::core::char::from_u32(i).unwrap();
             assert_eq!(
                 is_str_bidi(c.encode_utf8(&mut buf[..])),
                 reference_is_char_bidi(c)
             );
         }
         for i in 0xE000..0x110000u32 {
-            let c: char = ::std::char::from_u32(i).unwrap();
+            let c: char = ::core::char::from_u32(i).unwrap();
             assert_eq!(
                 is_str_bidi(c.encode_utf8(&mut buf[..])),
                 reference_is_char_bidi(c)
@@ -3198,7 +3200,7 @@
     fn test_is_utf8_bidi_thoroughly() {
         let mut buf = [0; 8];
         for i in 0..0xD800u32 {
-            let c: char = ::std::char::from_u32(i).unwrap();
+            let c: char = ::core::char::from_u32(i).unwrap();
             let expect = reference_is_char_bidi(c);
             {
                 let len = {
@@ -3216,7 +3218,7 @@
             assert_eq!(is_utf8_bidi(&buf[..]), expect);
         }
         for i in 0xE000..0x110000u32 {
-            let c: char = ::std::char::from_u32(i).unwrap();
+            let c: char = ::core::char::from_u32(i).unwrap();
             let expect = reference_is_char_bidi(c);
             {
                 let len = {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/simd_funcs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/simd_funcs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/simd_funcs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/simd_funcs.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,8 +16,8 @@
 
 #[inline(always)]
 pub unsafe fn load16_unaligned(ptr: *const u8) -> u8x16 {
-    let mut simd = ::std::mem::uninitialized();
-    ::std::ptr::copy_nonoverlapping(ptr, &mut simd as *mut u8x16 as *mut u8, 16);
+    let mut simd = ::core::mem::uninitialized();
+    ::core::ptr::copy_nonoverlapping(ptr, &mut simd as *mut u8x16 as *mut u8, 16);
     simd
 }
 
@@ -29,7 +29,7 @@
 
 #[inline(always)]
 pub unsafe fn store16_unaligned(ptr: *mut u8, s: u8x16) {
-    ::std::ptr::copy_nonoverlapping(&s as *const u8x16 as *const u8, ptr, 16);
+    ::core::ptr::copy_nonoverlapping(&s as *const u8x16 as *const u8, ptr, 16);
 }
 
 #[allow(dead_code)]
@@ -40,8 +40,8 @@
 
 #[inline(always)]
 pub unsafe fn load8_unaligned(ptr: *const u16) -> u16x8 {
-    let mut simd = ::std::mem::uninitialized();
-    ::std::ptr::copy_nonoverlapping(ptr as *const u8, &mut simd as *mut u16x8 as *mut u8, 16);
+    let mut simd = ::core::mem::uninitialized();
+    ::core::ptr::copy_nonoverlapping(ptr as *const u8, &mut simd as *mut u16x8 as *mut u8, 16);
     simd
 }
 
@@ -53,7 +53,7 @@
 
 #[inline(always)]
 pub unsafe fn store8_unaligned(ptr: *mut u16, s: u16x8) {
-    ::std::ptr::copy_nonoverlapping(&s as *const u16x8 as *const u8, ptr as *mut u8, 16);
+    ::core::ptr::copy_nonoverlapping(&s as *const u16x8 as *const u8, ptr as *mut u8, 16);
 }
 
 #[allow(dead_code)]
@@ -64,18 +64,18 @@
 
 cfg_if! {
     if #[cfg(all(target_feature = "sse2", target_arch = "x86_64"))] {
-        use std::arch::x86_64::__m128i;
-        use std::arch::x86_64::_mm_movemask_epi8;
-        use std::arch::x86_64::_mm_packus_epi16;
+        use core::arch::x86_64::__m128i;
+        use core::arch::x86_64::_mm_movemask_epi8;
+        use core::arch::x86_64::_mm_packus_epi16;
     } else if #[cfg(all(target_feature = "sse2", target_arch = "x86"))] {
-        use std::arch::x86::__m128i;
-        use std::arch::x86::_mm_movemask_epi8;
-        use std::arch::x86::_mm_packus_epi16;
+        use core::arch::x86::__m128i;
+        use core::arch::x86::_mm_movemask_epi8;
+        use core::arch::x86::_mm_packus_epi16;
     } else if #[cfg(target_arch = "aarch64")]{
-        use std::arch::aarch64::uint8x16_t;
-        use std::arch::aarch64::uint16x8_t;
-        use std::arch::aarch64::vmaxvq_u8;
-        use std::arch::aarch64::vmaxvq_u16;
+        use core::arch::aarch64::uint8x16_t;
+        use core::arch::aarch64::uint16x8_t;
+        use core::arch::aarch64::vmaxvq_u8;
+        use core::arch::aarch64::vmaxvq_u16;
     } else {
 
     }
@@ -327,6 +327,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloc::vec::Vec;
 
     #[test]
     fn test_unpack() {
@@ -446,7 +447,7 @@
         ];
         let mut alu = 0u64;
         unsafe {
-            ::std::ptr::copy_nonoverlapping(input.as_ptr(), &mut alu as *mut u64 as *mut u8, 8);
+            ::core::ptr::copy_nonoverlapping(input.as_ptr(), &mut alu as *mut u64 as *mut u8, 8);
         }
         let masked = alu & 0x8080808080808080;
         assert_eq!(masked.trailing_zeros(), 39);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/single_byte.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/single_byte.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/single_byte.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/single_byte.rs	2021-12-09 12:01:26.000000000 +0000
@@ -432,7 +432,7 @@
                                     }
                                     // The next code unit is a low surrogate.
                                     let astral: char = unsafe {
-                                        ::std::char::from_u32_unchecked(
+                                        ::core::char::from_u32_unchecked(
                                             (u32::from(non_ascii) << 10) + second
                                                 - (((0xD800u32 << 10) - 0x1_0000u32) + 0xDC00u32),
                                         )
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/utf_8.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/utf_8.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/encoding_rs/src/utf_8.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/encoding_rs/src/utf_8.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,8 +17,8 @@
 
 cfg_if! {
     if #[cfg(feature = "simd-accel")] {
-        use ::std::intrinsics::unlikely;
-        use ::std::intrinsics::likely;
+        use ::core::intrinsics::unlikely;
+        use ::core::intrinsics::likely;
     } else {
         #[inline(always)]
         // Unsafe to match the intrinsic, which is needlessly unsafe.
@@ -236,7 +236,7 @@
         let mut byte = {
             let src_remaining = &src[read..];
             let dst_remaining = &mut dst[written..];
-            let length = ::std::cmp::min(src_remaining.len(), dst_remaining.len());
+            let length = ::core::cmp::min(src_remaining.len(), dst_remaining.len());
             match unsafe {
                 ascii_to_basic_latin(src_remaining.as_ptr(), dst_remaining.as_mut_ptr(), length)
             } {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"c63db0226f9aac6e001898735c81392b8f01dfc8b7245f37e290990562c3c0d8","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"52232c2cee3bb7d8cabe47ef367f1bf8bb607c22bdfca0219d6156cb7f446e9d","src/lib.rs":"2cd66d61acfb96f3425194c12695d8e55cf56c6fbd02de90033c45bdcc338c1a"},"package":"e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-[package]
-name = "fake-simd"
-version = "0.1.2"
-authors = ["The Rust-Crypto Project Developers"]
-license = "MIT/Apache-2.0"
-description = "Crate for mimicking simd crate on stable Rust"
-documentation = "https://docs.rs/fake-simd"
-repository = "https://github.com/RustCrypto/utils"
-keywords = ["simd"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Copyright (c) 2006-2009 Graydon Hoare
-Copyright (c) 2009-2013 Mozilla Foundation
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fake-simd/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fake-simd/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-#![no_std]
-use core::ops::{Add, BitAnd, BitOr, BitXor, Shl, Shr, Sub};
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-#[allow(non_camel_case_types)]
-pub struct u32x4(pub u32, pub u32, pub u32, pub u32);
-
-impl Add for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn add(self, rhs: u32x4) -> u32x4 {
-        u32x4(
-            self.0.wrapping_add(rhs.0),
-            self.1.wrapping_add(rhs.1),
-            self.2.wrapping_add(rhs.2),
-            self.3.wrapping_add(rhs.3))
-    }
-}
-
-impl Sub for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn sub(self, rhs: u32x4) -> u32x4 {
-        u32x4(
-            self.0.wrapping_sub(rhs.0),
-            self.1.wrapping_sub(rhs.1),
-            self.2.wrapping_sub(rhs.2),
-            self.3.wrapping_sub(rhs.3))
-    }
-}
-
-impl BitAnd for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn bitand(self, rhs: u32x4) -> u32x4 {
-        u32x4(self.0 & rhs.0, self.1 & rhs.1, self.2 & rhs.2, self.3 & rhs.3)
-    }
-}
-
-impl BitOr for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn bitor(self, rhs: u32x4) -> u32x4 {
-        u32x4(self.0 | rhs.0, self.1 | rhs.1, self.2 | rhs.2, self.3 | rhs.3)
-    }
-}
-
-impl BitXor for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn bitxor(self, rhs: u32x4) -> u32x4 {
-        u32x4(self.0 ^ rhs.0, self.1 ^ rhs.1, self.2 ^ rhs.2, self.3 ^ rhs.3)
-    }
-}
-
-impl Shl<usize> for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn shl(self, amt: usize) -> u32x4 {
-        u32x4(self.0 << amt, self.1 << amt, self.2 << amt, self.3 << amt)
-    }
-}
-
-impl Shl<u32x4> for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn shl(self, rhs: u32x4) -> u32x4 {
-        u32x4(self.0 << rhs.0, self.1 << rhs.1, self.2 << rhs.2, self.3 << rhs.3)
-    }
-}
-
-impl Shr<usize> for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn shr(self, amt: usize) -> u32x4 {
-        u32x4(self.0 >> amt, self.1 >> amt, self.2 >> amt, self.3 >> amt)
-    }
-}
-
-impl Shr<u32x4> for u32x4 {
-    type Output = u32x4;
-
-    #[inline(always)]
-    fn shr(self, rhs: u32x4) -> u32x4 {
-        u32x4(self.0 >> rhs.0, self.1 >> rhs.1, self.2 >> rhs.2, self.3 >> rhs.3)
-    }
-}
-
-#[derive(Clone, Copy)]
-#[allow(non_camel_case_types)]
-pub struct u64x2(pub u64, pub u64);
-
-impl Add for u64x2 {
-    type Output = u64x2;
-
-    #[inline(always)]
-    fn add(self, rhs: u64x2) -> u64x2 {
-        u64x2(self.0.wrapping_add(rhs.0), self.1.wrapping_add(rhs.1))
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"8057fb9114d5690ed7fd68e78a46c4663d5bd8c5df45f1852f3557cd887e82cc","Cargo.toml":"5d0e49885d316107f8ad83d091d5a4c3cbd80de64ccede374dd14ffb4fda95d0","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"fbad05179827ff52e95df4015cae8ab8bb57df4d74bf767cb2fd710cd6528439","examples/compress_file.rs":"65cac39f50420861cb86120b0e7edce4704eb5afd1e27f790a66b8138176fc4d","examples/deflatedecoder-bufread.rs":"59aaa1dcf999da7909ea0a01bef757b80e366f8adf60984cc2e2c70acc774e1a","examples/deflatedecoder-read.rs":"7784b03156600d9a0efadb830920439a8a8f7fe70250090ee8c637033c1338eb","examples/deflatedecoder-write.rs":"6e6952cef15adbf465d4985802d315a3b51f3137be36e62bbcaed0bb27a8d5a6","examples/deflateencoder-bufread.rs":"0cefcb1edef04834e684c9c3d4048a32c7831617e51a102a7bd6a7351d4799be","examples/deflateencoder-read.rs":"56c65a0a1c951d0cf8281d0689bc520d7a9562e3e90fd35c333e4d832971e61d","examples/deflateencoder-write.rs":"79203d1db1128df2a3fa5cbd61d60776e02959c4da67a473f3b96dfb5f01f964","examples/gzbuilder.rs":"67ec1288b5ccb800a5f20148be61e47c7ebacdc1b96d404e2810f397314b39b3","examples/gzdecoder-bufread.rs":"e19ebd1085eeb9cf49b081953184207b949464ece5add8bb75700fdb514f2cad","examples/gzdecoder-read.rs":"0a191c6215e8eed01b9cfaa10804869693e2d4fbff29e8d5469fbabc65ded610","examples/gzdecoder-write.rs":"a8843c75fa725de84b8eb75b08525e61586f60f9f8bfd874fbfd44039d119c5f","examples/gzencoder-bufread.rs":"aaad311ad799c2e739b58fc4e570225d8f52d3bc407f9c71c28023b321e02100","examples/gzencoder-read.rs":"d28ec1d0ab3d4dabb6f0d98917efd4a8b72ff0a70b2b8596009c2d6e86328226","examples/gzencoder-write.rs":"2eea8a8c8bf22f060d8749d786835ce9454abe2cfd24bf0f7a23b5a8d1030121","examples/gzmultidecoder-bufread.rs":"1e4b31da4f1352e748b4516ba60dcd52e5d5e62733fa1c8e7da7bee4efcce1c4","examples/gzmultidecoder-read.rs":"3976274ac8b8190b3f7ed9fd855a193c38458bd40a2dba6a7de21986f78682f6","examples/hello_world.txt":"d2a84f4b8b650937ec8f73cd8be2c74add5a911ba64df27458ed8229da804a26","examples/zlibdecoder-bufread.rs":"e57a597030e6bd87e79329d87b3743b7fb0ff4c217846b0ba2c2d32264208ff1","examples/zlibdecoder-read.rs":"83b3abd1c12586f820d55e4d86c328fdccbdec963e90c44a44cd7d5f1caa4c8f","examples/zlibdecoder-write.rs":"e7cbec46414eb5d67fee95bf1e4a4e6a1ba2a41f4ce9542dd4481035d3f8070d","examples/zlibencoder-bufread.rs":"13d79baeffb6080b4b4f837e23092b52b92b85466ed9e42b0a33a864232e693f","examples/zlibencoder-read.rs":"120496c8d0854d13914fd5d23cc78994b6c9450ca97dead668eb4b616bbfcdda","examples/zlibencoder-write.rs":"47c25fb6711e22f95bdc89309c6e367d1060a0120d4259011e97908563e2b8bc","src/bufreader.rs":"7fc0b74ca751e9e11689d3e57abc3aadbda92f25f2a9a80fca009f43a112642d","src/crc.rs":"fa8b95d789848ccd835af17f0d733ccebdbf260feadd69e0f0016f7d94644582","src/deflate/bufread.rs":"bb4e02f5c292105def3cee998d4f5163cafcf3a9eede0b1ba2071f8366825c56","src/deflate/mod.rs":"c76346b014be16947e836e752a3e88095471f7656b894b1b2789ce5fbd130794","src/deflate/read.rs":"1824254346d7b95f56611be38b6baca154fa45b37866cbc93195a52522925e41","src/deflate/write.rs":"08dafb0ccc5e6a92d667470d2b8e9aa8e828001375e144522813b052d4a8463f","src/ffi/c.rs":"c75b7a1e878fa0e1f9e5e8c9f7fd9c150960c7863a23995cdc0e0edf39594360","src/ffi/mod.rs":"c5106dc28233c97610c321456a69b3a7ffb4c03442112cccb4174eac871e2fe3","src/ffi/rust.rs":"909dec8e979e5b076ef3fd118e3f8aedea68c8011000869e26497d2faedf2348","src/gz/bufread.rs":"1eb3ddccceda75a1574663f5583bf4ab809ee5f0ff690a29ea0e08f857eb933e","src/gz/mod.rs":"798203ecb5b05ebbdd8d2e5705794300a84ca07f2f78aa52549be0df649daf14","src/gz/read.rs":"51404bb8477aad79816b716e1387abc18155bd11225597a374d115b8b6ffb41f","src/gz/write.rs":"506aee09388008f60a2ad86e1766e44ae5546fa8bce52ceccc6df95c1350e3db","src/lib.rs":"e6b230a5dcd76d143986fcde7207a33a0c194bd5b54403984b6acd68844b2bb8","src/mem.rs":"6a85ee716e186d66826d87eaec9b05265ab2deb10d802cd177d21c332551ec69","src/zio.rs":"a7d50602b06c156bd3f520c80b9e1c273234f18a0213e2789896dea4e8e85588","src/zlib/bufread.rs":"bb9d158f2005acb468bf81f66fd6dcc0f2b3e8fdf9ceb96626315e62029f8fd4","src/zlib/mod.rs":"facb051b288a065cdcce92a0c42b546c53264f6facd1bbd3cbf14a79c93c6dcd","src/zlib/read.rs":"660fa0f54417193a0a5d318aa8e3ab995e3228ac7d37e088efd5198394c27fc2","src/zlib/write.rs":"a3ac0303870ddf3231a7d928ae83ed494f0f48311f2295913632db0c6c490ef4","tests/async-reader.rs":"7a1d4fb1324a075ed2dee0d10f932d1ac8ddbc6f80befea95d65cda390491b1e","tests/corrupt-file.gz":"083dd284aa1621916a2d0f66ea048c8d3ba7a722b22d0d618722633f51e7d39c","tests/early-flush.rs":"5ed4b0f8e66cab9209e079d5636e5f1b780606cd553a182c809cf73a24e77e8e","tests/empty-read.rs":"45477d316f77a048d747e9d18292abfec0cac667768385c8a061e18fd1240238","tests/good-file.gz":"87296963e53024a74752179ce7e54087565d358a85d3e65c3b37ef36eaa3d4a6","tests/good-file.txt":"bc4e03658a441fe2ad2df7cd2197144b87e41696f01e327b380e869cd9b485a0","tests/gunzip.rs":"623a90c6688c850d3c46d23acabc0f88a17d3b86c90d269ecc0766dc7138943d","tests/multi.gz":"efa3341da052f95056314cc6920e02a3da15bdef30234b2552fb407812db5cc6","tests/multi.txt":"dbea9325179efe46ea2add94f7b6b745ca983fabb208dc6d34aa064623d7ee23","tests/tokio.rs":"6a5a0fa838b81ef747bb3eed8ea09111132da71f44de5dfba64d47f4ec5a4e8f","tests/zero-write.rs":"ff8d0349a540b54363c55807c5fd7fbbdc363d08a536d35a3a40f0ce92c16489"},"package":"7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"}
\ No newline at end of file
+{"files":{"Cargo.lock":"f371787c23426c7be99289a49237b2fd3433b01618c681ba778c94152fb69660","Cargo.toml":"cc9a3f812b7335b96aab31ef2779ad2e7cc50edb74b6f881f479fd7590686ce1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"fbad05179827ff52e95df4015cae8ab8bb57df4d74bf767cb2fd710cd6528439","examples/compress_file.rs":"65cac39f50420861cb86120b0e7edce4704eb5afd1e27f790a66b8138176fc4d","examples/deflatedecoder-bufread.rs":"59aaa1dcf999da7909ea0a01bef757b80e366f8adf60984cc2e2c70acc774e1a","examples/deflatedecoder-read.rs":"7784b03156600d9a0efadb830920439a8a8f7fe70250090ee8c637033c1338eb","examples/deflatedecoder-write.rs":"6e6952cef15adbf465d4985802d315a3b51f3137be36e62bbcaed0bb27a8d5a6","examples/deflateencoder-bufread.rs":"0cefcb1edef04834e684c9c3d4048a32c7831617e51a102a7bd6a7351d4799be","examples/deflateencoder-read.rs":"5d3ca0a6d075fcff0127801c10a9d8fe31905960bf37e25291d771be3ff115c2","examples/deflateencoder-write.rs":"79203d1db1128df2a3fa5cbd61d60776e02959c4da67a473f3b96dfb5f01f964","examples/gzbuilder.rs":"67ec1288b5ccb800a5f20148be61e47c7ebacdc1b96d404e2810f397314b39b3","examples/gzdecoder-bufread.rs":"e19ebd1085eeb9cf49b081953184207b949464ece5add8bb75700fdb514f2cad","examples/gzdecoder-read.rs":"0a191c6215e8eed01b9cfaa10804869693e2d4fbff29e8d5469fbabc65ded610","examples/gzdecoder-write.rs":"a8843c75fa725de84b8eb75b08525e61586f60f9f8bfd874fbfd44039d119c5f","examples/gzencoder-bufread.rs":"aaad311ad799c2e739b58fc4e570225d8f52d3bc407f9c71c28023b321e02100","examples/gzencoder-read.rs":"797522cd3d5815321bbb5c26fdfeae027807219e429e36a1b99fff50fcdf0a64","examples/gzencoder-write.rs":"2eea8a8c8bf22f060d8749d786835ce9454abe2cfd24bf0f7a23b5a8d1030121","examples/gzmultidecoder-bufread.rs":"1e4b31da4f1352e748b4516ba60dcd52e5d5e62733fa1c8e7da7bee4efcce1c4","examples/gzmultidecoder-read.rs":"3976274ac8b8190b3f7ed9fd855a193c38458bd40a2dba6a7de21986f78682f6","examples/hello_world.txt":"d2a84f4b8b650937ec8f73cd8be2c74add5a911ba64df27458ed8229da804a26","examples/zlibdecoder-bufread.rs":"e57a597030e6bd87e79329d87b3743b7fb0ff4c217846b0ba2c2d32264208ff1","examples/zlibdecoder-read.rs":"83b3abd1c12586f820d55e4d86c328fdccbdec963e90c44a44cd7d5f1caa4c8f","examples/zlibdecoder-write.rs":"e7cbec46414eb5d67fee95bf1e4a4e6a1ba2a41f4ce9542dd4481035d3f8070d","examples/zlibencoder-bufread.rs":"13d79baeffb6080b4b4f837e23092b52b92b85466ed9e42b0a33a864232e693f","examples/zlibencoder-read.rs":"7f95783b38e0005740f05dbcc03af3bbf28dfe7c9f0542d3fb015d09554163bd","examples/zlibencoder-write.rs":"47c25fb6711e22f95bdc89309c6e367d1060a0120d4259011e97908563e2b8bc","src/bufreader.rs":"7fc0b74ca751e9e11689d3e57abc3aadbda92f25f2a9a80fca009f43a112642d","src/crc.rs":"fa8b95d789848ccd835af17f0d733ccebdbf260feadd69e0f0016f7d94644582","src/deflate/bufread.rs":"bb4e02f5c292105def3cee998d4f5163cafcf3a9eede0b1ba2071f8366825c56","src/deflate/mod.rs":"c76346b014be16947e836e752a3e88095471f7656b894b1b2789ce5fbd130794","src/deflate/read.rs":"1824254346d7b95f56611be38b6baca154fa45b37866cbc93195a52522925e41","src/deflate/write.rs":"08dafb0ccc5e6a92d667470d2b8e9aa8e828001375e144522813b052d4a8463f","src/ffi/c.rs":"147712f7242ae9b813bb6cc60c09431868f9f14898255dd670f70cf16bbd9444","src/ffi/mod.rs":"f2dfca8af9a6dc7471c1dc1c8e07cfe568692683b2847e58c4d0e147622c1a35","src/ffi/rust.rs":"235cf72391d4077b569f88854b6468e371c19c417b4815468070e155268d83dd","src/gz/bufread.rs":"358d020cd8ce22c221d66c961b229da5018e2487b74801835e26b26e402d9a0c","src/gz/mod.rs":"798203ecb5b05ebbdd8d2e5705794300a84ca07f2f78aa52549be0df649daf14","src/gz/read.rs":"51404bb8477aad79816b716e1387abc18155bd11225597a374d115b8b6ffb41f","src/gz/write.rs":"506aee09388008f60a2ad86e1766e44ae5546fa8bce52ceccc6df95c1350e3db","src/lib.rs":"e6b230a5dcd76d143986fcde7207a33a0c194bd5b54403984b6acd68844b2bb8","src/mem.rs":"8d99dcc0d62008bbb5650ef18b47befa2489cec1a36b87dd0ef48db4a0f8094a","src/zio.rs":"a7d50602b06c156bd3f520c80b9e1c273234f18a0213e2789896dea4e8e85588","src/zlib/bufread.rs":"bb9d158f2005acb468bf81f66fd6dcc0f2b3e8fdf9ceb96626315e62029f8fd4","src/zlib/mod.rs":"facb051b288a065cdcce92a0c42b546c53264f6facd1bbd3cbf14a79c93c6dcd","src/zlib/read.rs":"660fa0f54417193a0a5d318aa8e3ab995e3228ac7d37e088efd5198394c27fc2","src/zlib/write.rs":"a3ac0303870ddf3231a7d928ae83ed494f0f48311f2295913632db0c6c490ef4","tests/async-reader.rs":"7a1d4fb1324a075ed2dee0d10f932d1ac8ddbc6f80befea95d65cda390491b1e","tests/corrupt-gz-file.bin":"083dd284aa1621916a2d0f66ea048c8d3ba7a722b22d0d618722633f51e7d39c","tests/early-flush.rs":"5ed4b0f8e66cab9209e079d5636e5f1b780606cd553a182c809cf73a24e77e8e","tests/empty-read.rs":"45477d316f77a048d747e9d18292abfec0cac667768385c8a061e18fd1240238","tests/good-file.gz":"87296963e53024a74752179ce7e54087565d358a85d3e65c3b37ef36eaa3d4a6","tests/good-file.txt":"bc4e03658a441fe2ad2df7cd2197144b87e41696f01e327b380e869cd9b485a0","tests/gunzip.rs":"a67f2e2dc2e6fbdc42f9ea003eae70f862478a5226d961658b30c8c7928fb7f5","tests/multi.gz":"efa3341da052f95056314cc6920e02a3da15bdef30234b2552fb407812db5cc6","tests/multi.txt":"dbea9325179efe46ea2add94f7b6b745ca983fabb208dc6d34aa064623d7ee23","tests/tokio.rs":"6a5a0fa838b81ef747bb3eed8ea09111132da71f44de5dfba64d47f4ec5a4e8f","tests/zero-write.rs":"ff8d0349a540b54363c55807c5fd7fbbdc363d08a536d35a3a40f0ce92c16489"},"package":"80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "adler"
 version = "0.2.3"
@@ -36,9 +38,9 @@
 
 [[package]]
 name = "cc"
-version = "1.0.61"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
 
 [[package]]
 name = "cfg-if"
@@ -63,18 +65,18 @@
 
 [[package]]
 name = "cloudflare-zlib-sys"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e195cb274a0d6ee87e718838a09baecd7cbc9f6075dac256a84cb5842739c06"
+checksum = "2040b6d1edfee6d75f172d81e2d2a7807534f3f294ce18184c70e7bb0105cd6f"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "cmake"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb"
+checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855"
 dependencies = [
  "cc",
 ]
@@ -138,7 +140,7 @@
 
 [[package]]
 name = "flate2"
-version = "1.0.19"
+version = "1.0.21"
 dependencies = [
  "cfg-if 1.0.0",
  "cloudflare-zlib-sys",
@@ -230,9 +232,9 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
 
 [[package]]
 name = "libz-sys"
@@ -302,9 +304,9 @@
 
 [[package]]
 name = "mio"
-version = "0.6.22"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
 dependencies = [
  "cfg-if 0.1.10",
  "fuchsia-zircon",
@@ -321,9 +323,9 @@
 
 [[package]]
 name = "miow"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
 dependencies = [
  "kernel32-sys",
  "net2",
@@ -333,9 +335,9 @@
 
 [[package]]
 name = "net2"
-version = "0.2.35"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -386,9 +388,9 @@
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "quickcheck"
@@ -575,9 +577,9 @@
 
 [[package]]
 name = "vcpkg"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
 
 [[package]]
 name = "wasi"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "flate2"
-version = "1.0.19"
+version = "1.0.21"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Josh Triplett <josh@joshtriplett.org>"]
 description = "DEFLATE compression and decompression exposed as Read/BufRead/Write streams.\nSupports miniz_oxide, miniz.c, and multiple zlib implementations. Supports\nzlib, gzip, and raw deflate streams.\n"
 homepage = "https://github.com/rust-lang/flate2-rs"
@@ -27,7 +27,7 @@
 version = "1.0.0"
 
 [dependencies.cloudflare-zlib-sys]
-version = "0.2.0"
+version = "0.3.0"
 optional = true
 
 [dependencies.crc32fast]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/examples/deflateencoder-read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/examples/deflateencoder-read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/examples/deflateencoder-read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/examples/deflateencoder-read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,9 +12,9 @@
 
 // Return a vector containing the Defalte compressed version of hello world
 fn deflateencoder_read_hello_world() -> io::Result<Vec<u8>> {
-    let mut ret_vec = [0; 100];
+    let mut result = Vec::new();
     let c = b"hello world";
     let mut deflater = DeflateEncoder::new(&c[..], Compression::fast());
-    let count = deflater.read(&mut ret_vec)?;
-    Ok(ret_vec[0..count].to_vec())
+    deflater.read_to_end(&mut result)?;
+    Ok(result)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/examples/gzencoder-read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/examples/gzencoder-read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/examples/gzencoder-read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/examples/gzencoder-read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,9 +12,9 @@
 
 // Return a vector containing the GZ compressed version of hello world
 fn gzencoder_read_hello_world() -> io::Result<Vec<u8>> {
-    let mut ret_vec = [0; 100];
+    let mut result = Vec::new();
     let c = b"hello world";
     let mut z = GzEncoder::new(&c[..], Compression::fast());
-    let count = z.read(&mut ret_vec)?;
-    Ok(ret_vec[0..count].to_vec())
+    z.read_to_end(&mut result)?;
+    Ok(result)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/examples/zlibencoder-read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/examples/zlibencoder-read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/examples/zlibencoder-read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/examples/zlibencoder-read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,7 +15,7 @@
 fn open_hello_world() -> std::io::Result<Vec<u8>> {
     let f = File::open("examples/hello_world.txt")?;
     let mut z = ZlibEncoder::new(f, Compression::fast());
-    let mut buffer = [0; 50];
-    let byte_count = z.read(&mut buffer)?;
-    Ok(buffer[0..byte_count].to_vec())
+    let mut result = Vec::new();
+    z.read_to_end(&mut result)?;
+    Ok(result)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/ffi/c.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/ffi/c.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/ffi/c.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/ffi/c.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,6 +12,23 @@
 use super::*;
 use crate::mem::{self, FlushDecompress, Status};
 
+// miniz doesn't provide any error messages, so only enable the field when we use a real zlib
+#[derive(Default)]
+pub struct ErrorMessage(#[cfg(feature = "any_zlib")] Option<&'static str>);
+
+impl ErrorMessage {
+    pub fn get(&self) -> Option<&str> {
+        #[cfg(feature = "any_zlib")]
+        {
+            self.0
+        }
+        #[cfg(not(feature = "any_zlib"))]
+        {
+            None
+        }
+    }
+}
+
 pub struct StreamWrapper {
     pub inner: Box<mz_stream>,
 }
@@ -38,13 +55,13 @@
                 reserved: 0,
                 opaque: ptr::null_mut(),
                 state: ptr::null_mut(),
-                #[cfg(feature = "any_zlib")]
+                #[cfg(all(feature = "any_zlib", not(feature = "cloudflare-zlib-sys")))]
                 zalloc,
-                #[cfg(feature = "any_zlib")]
+                #[cfg(all(feature = "any_zlib", not(feature = "cloudflare-zlib-sys")))]
                 zfree,
-                #[cfg(not(feature = "any_zlib"))]
+                #[cfg(not(all(feature = "any_zlib", not(feature = "cloudflare-zlib-sys"))))]
                 zalloc: Some(zalloc),
-                #[cfg(not(feature = "any_zlib"))]
+                #[cfg(not(all(feature = "any_zlib", not(feature = "cloudflare-zlib-sys"))))]
                 zfree: Some(zfree),
             }),
         }
@@ -138,6 +155,25 @@
     pub _marker: marker::PhantomData<D>,
 }
 
+impl<D: Direction> Stream<D> {
+    pub fn msg(&self) -> ErrorMessage {
+        #[cfg(feature = "any_zlib")]
+        {
+            let msg = self.stream_wrapper.msg;
+            ErrorMessage(if msg.is_null() {
+                None
+            } else {
+                let s = unsafe { std::ffi::CStr::from_ptr(msg) };
+                std::str::from_utf8(s.to_bytes()).ok()
+            })
+        }
+        #[cfg(not(feature = "any_zlib"))]
+        {
+            ErrorMessage()
+        }
+    }
+}
+
 impl<D: Direction> Drop for Stream<D> {
     fn drop(&mut self) {
         unsafe {
@@ -164,10 +200,6 @@
 
 impl InflateBackend for Inflate {
     fn make(zlib_header: bool, window_bits: u8) -> Self {
-        assert!(
-            window_bits > 8 && window_bits < 16,
-            "window_bits must be within 9 ..= 15"
-        );
         unsafe {
             let mut state = StreamWrapper::default();
             let ret = mz_inflateInit2(
@@ -197,6 +229,7 @@
         flush: FlushDecompress,
     ) -> Result<Status, DecompressError> {
         let raw = &mut *self.inner.stream_wrapper;
+        raw.msg = ptr::null_mut();
         raw.next_in = input.as_ptr() as *mut u8;
         raw.avail_in = cmp::min(input.len(), c_uint::max_value() as usize) as c_uint;
         raw.next_out = output.as_mut_ptr();
@@ -210,7 +243,7 @@
         self.inner.total_out += (raw.next_out as usize - output.as_ptr() as usize) as u64;
 
         match rc {
-            MZ_DATA_ERROR | MZ_STREAM_ERROR => mem::decompress_failed(),
+            MZ_DATA_ERROR | MZ_STREAM_ERROR => mem::decompress_failed(self.inner.msg()),
             MZ_OK => Ok(Status::Ok),
             MZ_BUF_ERROR => Ok(Status::BufError),
             MZ_STREAM_END => Ok(Status::StreamEnd),
@@ -258,10 +291,6 @@
 
 impl DeflateBackend for Deflate {
     fn make(level: Compression, zlib_header: bool, window_bits: u8) -> Self {
-        assert!(
-            window_bits > 8 && window_bits < 16,
-            "window_bits must be within 9 ..= 15"
-        );
         unsafe {
             let mut state = StreamWrapper::default();
             let ret = mz_deflateInit2(
@@ -294,6 +323,7 @@
         flush: FlushCompress,
     ) -> Result<Status, CompressError> {
         let raw = &mut *self.inner.stream_wrapper;
+        raw.msg = ptr::null_mut();
         raw.next_in = input.as_ptr() as *mut _;
         raw.avail_in = cmp::min(input.len(), c_uint::max_value() as usize) as c_uint;
         raw.next_out = output.as_mut_ptr();
@@ -310,7 +340,7 @@
             MZ_OK => Ok(Status::Ok),
             MZ_BUF_ERROR => Ok(Status::BufError),
             MZ_STREAM_END => Ok(Status::StreamEnd),
-            MZ_STREAM_ERROR => Err(CompressError(())),
+            MZ_STREAM_ERROR => mem::compress_failed(self.inner.msg()),
             c => panic!("unknown return code: {}", c),
         }
     }
@@ -344,103 +374,41 @@
     pub type AllocSize = libc::size_t;
 }
 
-/// Zlib specific
-#[cfg(any(
-    feature = "zlib-ng-compat",
-    all(feature = "zlib", not(feature = "cloudflare_zlib"))
-))]
-#[allow(bad_style)]
-mod c_backend {
-    use libc::{c_char, c_int};
-    use std::mem;
-
-    pub use libz_sys::deflate as mz_deflate;
-    pub use libz_sys::deflateEnd as mz_deflateEnd;
-    pub use libz_sys::deflateReset as mz_deflateReset;
-    pub use libz_sys::inflate as mz_inflate;
-    pub use libz_sys::inflateEnd as mz_inflateEnd;
-    pub use libz_sys::z_stream as mz_stream;
-    pub use libz_sys::*;
-
-    pub use libz_sys::Z_BLOCK as MZ_BLOCK;
-    pub use libz_sys::Z_BUF_ERROR as MZ_BUF_ERROR;
-    pub use libz_sys::Z_DATA_ERROR as MZ_DATA_ERROR;
-    pub use libz_sys::Z_DEFAULT_STRATEGY as MZ_DEFAULT_STRATEGY;
-    pub use libz_sys::Z_DEFLATED as MZ_DEFLATED;
-    pub use libz_sys::Z_FINISH as MZ_FINISH;
-    pub use libz_sys::Z_FULL_FLUSH as MZ_FULL_FLUSH;
-    pub use libz_sys::Z_NEED_DICT as MZ_NEED_DICT;
-    pub use libz_sys::Z_NO_FLUSH as MZ_NO_FLUSH;
-    pub use libz_sys::Z_OK as MZ_OK;
-    pub use libz_sys::Z_PARTIAL_FLUSH as MZ_PARTIAL_FLUSH;
-    pub use libz_sys::Z_STREAM_END as MZ_STREAM_END;
-    pub use libz_sys::Z_STREAM_ERROR as MZ_STREAM_ERROR;
-    pub use libz_sys::Z_SYNC_FLUSH as MZ_SYNC_FLUSH;
-    pub type AllocSize = libz_sys::uInt;
-
-    pub const MZ_DEFAULT_WINDOW_BITS: c_int = 15;
-
-    const ZLIB_VERSION: &'static str = "1.2.8\0";
-
-    pub unsafe extern "C" fn mz_deflateInit2(
-        stream: *mut mz_stream,
-        level: c_int,
-        method: c_int,
-        window_bits: c_int,
-        mem_level: c_int,
-        strategy: c_int,
-    ) -> c_int {
-        libz_sys::deflateInit2_(
-            stream,
-            level,
-            method,
-            window_bits,
-            mem_level,
-            strategy,
-            ZLIB_VERSION.as_ptr() as *const c_char,
-            mem::size_of::<mz_stream>() as c_int,
-        )
-    }
-    pub unsafe extern "C" fn mz_inflateInit2(stream: *mut mz_stream, window_bits: c_int) -> c_int {
-        libz_sys::inflateInit2_(
-            stream,
-            window_bits,
-            ZLIB_VERSION.as_ptr() as *const c_char,
-            mem::size_of::<mz_stream>() as c_int,
-        )
-    }
-}
-
-/// Cloudflare optimized Zlib specific
-#[cfg(all(feature = "cloudflare_zlib", not(feature = "zlib-ng-compat")))]
+/// Zlib specific - make zlib mimic miniz' API
+#[cfg(feature = "any_zlib")]
 #[allow(bad_style)]
 mod c_backend {
     use libc::{c_char, c_int};
     use std::mem;
 
-    pub use cloudflare_zlib_sys::deflate as mz_deflate;
-    pub use cloudflare_zlib_sys::deflateEnd as mz_deflateEnd;
-    pub use cloudflare_zlib_sys::deflateReset as mz_deflateReset;
-    pub use cloudflare_zlib_sys::inflate as mz_inflate;
-    pub use cloudflare_zlib_sys::inflateEnd as mz_inflateEnd;
-    pub use cloudflare_zlib_sys::z_stream as mz_stream;
-    pub use cloudflare_zlib_sys::*;
-
-    pub use cloudflare_zlib_sys::Z_BLOCK as MZ_BLOCK;
-    pub use cloudflare_zlib_sys::Z_BUF_ERROR as MZ_BUF_ERROR;
-    pub use cloudflare_zlib_sys::Z_DATA_ERROR as MZ_DATA_ERROR;
-    pub use cloudflare_zlib_sys::Z_DEFAULT_STRATEGY as MZ_DEFAULT_STRATEGY;
-    pub use cloudflare_zlib_sys::Z_DEFLATED as MZ_DEFLATED;
-    pub use cloudflare_zlib_sys::Z_FINISH as MZ_FINISH;
-    pub use cloudflare_zlib_sys::Z_FULL_FLUSH as MZ_FULL_FLUSH;
-    pub use cloudflare_zlib_sys::Z_NEED_DICT as MZ_NEED_DICT;
-    pub use cloudflare_zlib_sys::Z_NO_FLUSH as MZ_NO_FLUSH;
-    pub use cloudflare_zlib_sys::Z_OK as MZ_OK;
-    pub use cloudflare_zlib_sys::Z_PARTIAL_FLUSH as MZ_PARTIAL_FLUSH;
-    pub use cloudflare_zlib_sys::Z_STREAM_END as MZ_STREAM_END;
-    pub use cloudflare_zlib_sys::Z_STREAM_ERROR as MZ_STREAM_ERROR;
-    pub use cloudflare_zlib_sys::Z_SYNC_FLUSH as MZ_SYNC_FLUSH;
-    pub type AllocSize = cloudflare_zlib_sys::uInt;
+    #[cfg(feature = "cloudflare_zlib")]
+    use cloudflare_zlib_sys as libz;
+    #[cfg(not(feature = "cloudflare_zlib"))]
+    use libz_sys as libz;
+
+    pub use libz::deflate as mz_deflate;
+    pub use libz::deflateEnd as mz_deflateEnd;
+    pub use libz::deflateReset as mz_deflateReset;
+    pub use libz::inflate as mz_inflate;
+    pub use libz::inflateEnd as mz_inflateEnd;
+    pub use libz::z_stream as mz_stream;
+    pub use libz::*;
+
+    pub use libz::Z_BLOCK as MZ_BLOCK;
+    pub use libz::Z_BUF_ERROR as MZ_BUF_ERROR;
+    pub use libz::Z_DATA_ERROR as MZ_DATA_ERROR;
+    pub use libz::Z_DEFAULT_STRATEGY as MZ_DEFAULT_STRATEGY;
+    pub use libz::Z_DEFLATED as MZ_DEFLATED;
+    pub use libz::Z_FINISH as MZ_FINISH;
+    pub use libz::Z_FULL_FLUSH as MZ_FULL_FLUSH;
+    pub use libz::Z_NEED_DICT as MZ_NEED_DICT;
+    pub use libz::Z_NO_FLUSH as MZ_NO_FLUSH;
+    pub use libz::Z_OK as MZ_OK;
+    pub use libz::Z_PARTIAL_FLUSH as MZ_PARTIAL_FLUSH;
+    pub use libz::Z_STREAM_END as MZ_STREAM_END;
+    pub use libz::Z_STREAM_ERROR as MZ_STREAM_ERROR;
+    pub use libz::Z_SYNC_FLUSH as MZ_SYNC_FLUSH;
+    pub type AllocSize = libz::uInt;
 
     pub const MZ_DEFAULT_WINDOW_BITS: c_int = 15;
 
@@ -454,7 +422,7 @@
         mem_level: c_int,
         strategy: c_int,
     ) -> c_int {
-        cloudflare_zlib_sys::deflateInit2_(
+        libz::deflateInit2_(
             stream,
             level,
             method,
@@ -466,7 +434,7 @@
         )
     }
     pub unsafe extern "C" fn mz_inflateInit2(stream: *mut mz_stream, window_bits: c_int) -> c_int {
-        cloudflare_zlib_sys::inflateInit2_(
+        libz::inflateInit2_(
             stream,
             window_bits,
             ZLIB_VERSION.as_ptr() as *const c_char,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/ffi/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/ffi/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/ffi/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/ffi/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -44,3 +44,9 @@
         pub use self::rust::*;
     }
 }
+
+impl std::fmt::Debug for ErrorMessage {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        self.get().fmt(f)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/ffi/rust.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/ffi/rust.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/ffi/rust.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/ffi/rust.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,6 +16,16 @@
 use super::*;
 use crate::mem;
 
+// miniz_oxide doesn't provide any error messages (yet?)
+#[derive(Default)]
+pub struct ErrorMessage;
+
+impl ErrorMessage {
+    pub fn get(&self) -> Option<&str> {
+        None
+    }
+}
+
 fn format_from_bool(zlib_header: bool) -> DataFormat {
     if zlib_header {
         DataFormat::Zlib
@@ -41,12 +51,7 @@
 }
 
 impl InflateBackend for Inflate {
-    fn make(zlib_header: bool, window_bits: u8) -> Self {
-        assert!(
-            window_bits > 8 && window_bits < 16,
-            "window_bits must be within 9 ..= 15"
-        );
-
+    fn make(zlib_header: bool, _window_bits: u8) -> Self {
         let format = format_from_bool(zlib_header);
 
         Inflate {
@@ -78,7 +83,7 @@
             },
             Err(status) => match status {
                 MZError::Buf => Ok(Status::BufError),
-                _ => mem::decompress_failed(),
+                _ => mem::decompress_failed(ErrorMessage),
             },
         }
     }
@@ -119,12 +124,7 @@
 }
 
 impl DeflateBackend for Deflate {
-    fn make(level: Compression, zlib_header: bool, window_bits: u8) -> Self {
-        assert!(
-            window_bits > 8 && window_bits < 16,
-            "window_bits must be within 9 ..= 15"
-        );
-
+    fn make(level: Compression, zlib_header: bool, _window_bits: u8) -> Self {
         // Check in case the integer value changes at some point.
         debug_assert!(level.level() <= 10);
 
@@ -154,11 +154,11 @@
             Ok(status) => match status {
                 MZStatus::Ok => Ok(Status::Ok),
                 MZStatus::StreamEnd => Ok(Status::StreamEnd),
-                MZStatus::NeedDict => Err(CompressError(())),
+                MZStatus::NeedDict => mem::compress_failed(ErrorMessage),
             },
             Err(status) => match status {
                 MZError::Buf => Ok(Status::BufError),
-                _ => Err(CompressError(())),
+                _ => mem::compress_failed(ErrorMessage),
             },
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/gz/bufread.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/gz/bufread.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/gz/bufread.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/gz/bufread.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
 
 use super::{GzBuilder, GzHeader};
 use super::{FCOMMENT, FEXTRA, FHCRC, FNAME};
-use crate::crc::CrcReader;
+use crate::crc::{Crc, CrcReader};
 use crate::deflate;
 use crate::Compression;
 
@@ -34,87 +34,107 @@
     io::Error::new(io::ErrorKind::InvalidInput, "invalid gzip header")
 }
 
-fn read_le_u16<R: Read>(r: &mut R) -> io::Result<u16> {
+fn read_le_u16<R: Read>(r: &mut Buffer<R>) -> io::Result<u16> {
     let mut b = [0; 2];
-    r.read_exact(&mut b)?;
+    r.read_and_forget(&mut b)?;
     Ok((b[0] as u16) | ((b[1] as u16) << 8))
 }
 
-pub(crate) fn read_gz_header<R: Read>(r: &mut R) -> io::Result<GzHeader> {
-    let mut crc_reader = CrcReader::new(r);
-    let mut header = [0; 10];
-    crc_reader.read_exact(&mut header)?;
-
-    let id1 = header[0];
-    let id2 = header[1];
-    if id1 != 0x1f || id2 != 0x8b {
-        return Err(bad_header());
-    }
-    let cm = header[2];
-    if cm != 8 {
-        return Err(bad_header());
-    }
-
-    let flg = header[3];
-    let mtime = ((header[4] as u32) << 0)
-        | ((header[5] as u32) << 8)
-        | ((header[6] as u32) << 16)
-        | ((header[7] as u32) << 24);
-    let _xfl = header[8];
-    let os = header[9];
-
-    let extra = if flg & FEXTRA != 0 {
-        let xlen = read_le_u16(&mut crc_reader)?;
-        let mut extra = vec![0; xlen as usize];
-        crc_reader.read_exact(&mut extra)?;
-        Some(extra)
-    } else {
-        None
-    };
-    let filename = if flg & FNAME != 0 {
-        // wow this is slow
-        let mut b = Vec::new();
-        for byte in crc_reader.by_ref().bytes() {
-            let byte = byte?;
-            if byte == 0 {
-                break;
-            }
-            b.push(byte);
-        }
-        Some(b)
-    } else {
-        None
-    };
-    let comment = if flg & FCOMMENT != 0 {
-        // wow this is slow
-        let mut b = Vec::new();
-        for byte in crc_reader.by_ref().bytes() {
-            let byte = byte?;
-            if byte == 0 {
-                break;
-            }
-            b.push(byte);
-        }
-        Some(b)
-    } else {
-        None
-    };
+fn read_gz_header_part<'a, R: Read>(r: &'a mut Buffer<'a, R>) -> io::Result<()> {
+    loop {
+        match r.part.state {
+            GzHeaderParsingState::Start => {
+                let mut header = [0; 10];
+                r.read_and_forget(&mut header)?;
+
+                if header[0] != 0x1f || header[1] != 0x8b {
+                    return Err(bad_header());
+                }
+                if header[2] != 8 {
+                    return Err(bad_header());
+                }
 
-    if flg & FHCRC != 0 {
-        let calced_crc = crc_reader.crc().sum() as u16;
-        let stored_crc = read_le_u16(&mut crc_reader)?;
-        if calced_crc != stored_crc {
-            return Err(corrupt());
+                r.part.flg = header[3];
+                r.part.header.mtime = ((header[4] as u32) << 0)
+                    | ((header[5] as u32) << 8)
+                    | ((header[6] as u32) << 16)
+                    | ((header[7] as u32) << 24);
+                let _xfl = header[8];
+                r.part.header.operating_system = header[9];
+                r.part.state = GzHeaderParsingState::Xlen;
+            }
+            GzHeaderParsingState::Xlen => {
+                if r.part.flg & FEXTRA != 0 {
+                    r.part.xlen = read_le_u16(r)?;
+                }
+                r.part.state = GzHeaderParsingState::Extra;
+            }
+            GzHeaderParsingState::Extra => {
+                if r.part.flg & FEXTRA != 0 {
+                    let mut extra = vec![0; r.part.xlen as usize];
+                    r.read_and_forget(&mut extra)?;
+                    r.part.header.extra = Some(extra);
+                }
+                r.part.state = GzHeaderParsingState::Filename;
+            }
+            GzHeaderParsingState::Filename => {
+                if r.part.flg & FNAME != 0 {
+                    if None == r.part.header.filename {
+                        r.part.header.filename = Some(Vec::new());
+                    };
+                    for byte in r.bytes() {
+                        let byte = byte?;
+                        if byte == 0 {
+                            break;
+                        }
+                    }
+                }
+                r.part.state = GzHeaderParsingState::Comment;
+            }
+            GzHeaderParsingState::Comment => {
+                if r.part.flg & FCOMMENT != 0 {
+                    if None == r.part.header.comment {
+                        r.part.header.comment = Some(Vec::new());
+                    };
+                    for byte in r.bytes() {
+                        let byte = byte?;
+                        if byte == 0 {
+                            break;
+                        }
+                    }
+                }
+                r.part.state = GzHeaderParsingState::Crc;
+            }
+            GzHeaderParsingState::Crc => {
+                if r.part.flg & FHCRC != 0 {
+                    let stored_crc = read_le_u16(r)?;
+                    let calced_crc = r.part.crc.sum() as u16;
+                    if stored_crc != calced_crc {
+                        return Err(corrupt());
+                    }
+                }
+                return Ok(());
+            }
         }
     }
+}
 
-    Ok(GzHeader {
-        extra: extra,
-        filename: filename,
-        comment: comment,
-        operating_system: os,
-        mtime: mtime,
-    })
+pub(crate) fn read_gz_header<R: Read>(r: &mut R) -> io::Result<GzHeader> {
+    let mut part = GzHeaderPartial::new();
+
+    let result = {
+        let mut reader = Buffer::new(&mut part, r);
+        read_gz_header_part(&mut reader)
+    };
+
+    match result {
+        Ok(()) => {
+            return Ok(part.take_header());
+        }
+        Err(err) => {
+            return Err(err);
+        }
+    };
 }
 
 /// A gzip streaming encoder
@@ -305,8 +325,51 @@
 }
 
 #[derive(Debug)]
+pub enum GzHeaderParsingState {
+    Start,
+    Xlen,
+    Extra,
+    Filename,
+    Comment,
+    Crc,
+}
+
+#[derive(Debug)]
+pub struct GzHeaderPartial {
+    buf: Vec<u8>,
+    state: GzHeaderParsingState,
+    flg: u8,
+    xlen: u16,
+    crc: Crc,
+    header: GzHeader,
+}
+
+impl GzHeaderPartial {
+    fn new() -> GzHeaderPartial {
+        GzHeaderPartial {
+            buf: Vec::with_capacity(10), // minimum header length
+            state: GzHeaderParsingState::Start,
+            flg: 0,
+            xlen: 0,
+            crc: Crc::new(),
+            header: GzHeader {
+                extra: None,
+                filename: None,
+                comment: None,
+                operating_system: 0,
+                mtime: 0,
+            },
+        }
+    }
+
+    pub fn take_header(self) -> GzHeader {
+        return self.header;
+    }
+}
+
+#[derive(Debug)]
 enum GzState {
-    Header(Vec<u8>),
+    Header(GzHeaderPartial),
     Body,
     Finished(usize, [u8; 8]),
     Err(io::Error),
@@ -317,55 +380,91 @@
 /// further data from `reader`. This will also buffer all data read from
 /// `reader` into `buf` for reuse on a further call.
 struct Buffer<'a, T: 'a> {
-    buf: &'a mut Vec<u8>,
+    part: &'a mut GzHeaderPartial,
     buf_cur: usize,
     buf_max: usize,
     reader: &'a mut T,
 }
 
 impl<'a, T> Buffer<'a, T> {
-    fn new(buf: &'a mut Vec<u8>, reader: &'a mut T) -> Buffer<'a, T> {
+    fn new(part: &'a mut GzHeaderPartial, reader: &'a mut T) -> Buffer<'a, T> {
         Buffer {
             reader,
             buf_cur: 0,
-            buf_max: buf.len(),
-            buf,
+            buf_max: part.buf.len(),
+            part,
         }
     }
 }
 
 impl<'a, T: Read> Read for Buffer<'a, T> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        if self.buf_cur == self.buf_max {
+        let mut bufref = match self.part.state {
+            GzHeaderParsingState::Filename => self.part.header.filename.as_mut(),
+            GzHeaderParsingState::Comment => self.part.header.comment.as_mut(),
+            _ => None,
+        };
+        if let Some(ref mut b) = bufref {
+            // we have a direct reference to a buffer where to write
             let len = self.reader.read(buf)?;
-            self.buf.extend_from_slice(&buf[..len]);
+            if len > 0 && buf[len - 1] == 0 {
+                // we do not append the final 0
+                b.extend_from_slice(&buf[..len - 1]);
+            } else {
+                b.extend_from_slice(&buf[..len]);
+            }
+            self.part.crc.update(&buf[..len]);
+            Ok(len)
+        } else if self.buf_cur == self.buf_max {
+            // we read new bytes and also save them in self.part.buf
+            let len = self.reader.read(buf)?;
+            self.part.buf.extend_from_slice(&buf[..len]);
+            self.part.crc.update(&buf[..len]);
             Ok(len)
         } else {
-            let len = (&self.buf[self.buf_cur..self.buf_max]).read(buf)?;
+            // we first read the previously saved bytes
+            let len = (&self.part.buf[self.buf_cur..self.buf_max]).read(buf)?;
             self.buf_cur += len;
             Ok(len)
         }
     }
 }
 
+impl<'a, T> Buffer<'a, T>
+where
+    T: std::io::Read,
+{
+    // If we manage to read all the bytes, we reset the buffer
+    fn read_and_forget(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.read_exact(buf)?;
+        // we managed to read the whole buf
+        // we will no longer need the previously saved bytes in self.part.buf
+        let rlen = buf.len();
+        self.part.buf.truncate(0);
+        self.buf_cur = 0;
+        self.buf_max = 0;
+        return Ok(rlen);
+    }
+}
+
 impl<R: BufRead> GzDecoder<R> {
     /// Creates a new decoder from the given reader, immediately parsing the
     /// gzip header.
     pub fn new(mut r: R) -> GzDecoder<R> {
-        let mut buf = Vec::with_capacity(10); // minimum header length
+        let mut part = GzHeaderPartial::new();
         let mut header = None;
 
         let result = {
-            let mut reader = Buffer::new(&mut buf, &mut r);
-            read_gz_header(&mut reader)
+            let mut reader = Buffer::new(&mut part, &mut r);
+            read_gz_header_part(&mut reader)
         };
 
         let state = match result {
-            Ok(hdr) => {
-                header = Some(hdr);
+            Ok(()) => {
+                header = Some(part.take_header());
                 GzState::Body
             }
-            Err(ref err) if io::ErrorKind::WouldBlock == err.kind() => GzState::Header(buf),
+            Err(ref err) if io::ErrorKind::WouldBlock == err.kind() => GzState::Header(part),
             Err(err) => GzState::Err(err),
         };
 
@@ -419,20 +518,22 @@
 
         loop {
             *inner = match mem::replace(inner, GzState::End) {
-                GzState::Header(mut buf) => {
+                GzState::Header(mut part) => {
                     let result = {
-                        let mut reader = Buffer::new(&mut buf, reader.get_mut().get_mut());
-                        read_gz_header(&mut reader)
+                        let mut reader = Buffer::new(&mut part, reader.get_mut().get_mut());
+                        read_gz_header_part(&mut reader)
                     };
-                    let hdr = result.map_err(|err| {
-                        if io::ErrorKind::WouldBlock == err.kind() {
-                            *inner = GzState::Header(buf);
+                    let state = match result {
+                        Ok(()) => {
+                            *header = Some(part.take_header());
+                            GzState::Body
                         }
-
-                        err
-                    })?;
-                    *header = Some(hdr);
-                    GzState::Body
+                        Err(ref err) if io::ErrorKind::WouldBlock == err.kind() => {
+                            GzState::Header(part)
+                        }
+                        Err(err) => GzState::Err(err),
+                    };
+                    state
                 }
                 GzState::Body => {
                     if into.is_empty() {
@@ -503,7 +604,7 @@
                                 reader.reset();
                                 reader.get_mut().reset_data();
                                 header.take();
-                                GzState::Header(Vec::with_capacity(10))
+                                GzState::Header(GzHeaderPartial::new())
                             }
                         } else {
                             GzState::End
@@ -639,3 +740,156 @@
         self.get_mut().shutdown()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::gz::bufread::*;
+    use std::io;
+    use std::io::{Cursor, Read, Write};
+
+    //a cursor turning EOF into blocking errors
+    #[derive(Debug)]
+    pub struct BlockingCursor {
+        pub cursor: Cursor<Vec<u8>>,
+    }
+
+    impl BlockingCursor {
+        pub fn new() -> BlockingCursor {
+            BlockingCursor {
+                cursor: Cursor::new(Vec::new()),
+            }
+        }
+
+        pub fn set_position(&mut self, pos: u64) {
+            return self.cursor.set_position(pos);
+        }
+
+        pub fn position(&mut self) -> u64 {
+            return self.cursor.position();
+        }
+    }
+
+    impl Write for BlockingCursor {
+        fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+            return self.cursor.write(buf);
+        }
+        fn flush(&mut self) -> io::Result<()> {
+            return self.cursor.flush();
+        }
+    }
+
+    impl Read for BlockingCursor {
+        fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+            //use the cursor, except it turns eof into blocking error
+            let r = self.cursor.read(buf);
+            match r {
+                Err(ref err) => {
+                    if err.kind() == io::ErrorKind::UnexpectedEof {
+                        return Err(io::ErrorKind::WouldBlock.into());
+                    }
+                }
+                Ok(0) => {
+                    //regular EOF turned into blocking error
+                    return Err(io::ErrorKind::WouldBlock.into());
+                }
+                Ok(_n) => {}
+            }
+            return r;
+        }
+    }
+    #[test]
+    // test function read_and_forget of Buffer
+    fn buffer_read_and_forget() {
+        // this is unused except for the buffering
+        let mut part = GzHeaderPartial::new();
+        // this is a reader which receives data afterwards
+        let mut r = BlockingCursor::new();
+        let data = vec![1, 2, 3];
+        let mut out = Vec::with_capacity(7);
+
+        match r.write_all(&data) {
+            Ok(()) => {}
+            _ => {
+                panic!("Unexpected result for write_all");
+            }
+        }
+        r.set_position(0);
+
+        // First read : successful for one byte
+        let mut reader = Buffer::new(&mut part, &mut r);
+        out.resize(1, 0);
+        match reader.read_and_forget(&mut out) {
+            Ok(1) => {}
+            _ => {
+                panic!("Unexpected result for read_and_forget with data");
+            }
+        }
+
+        // Second read : incomplete for 7 bytes (we have only 2)
+        out.resize(7, 0);
+        match reader.read_and_forget(&mut out) {
+            Err(ref err) => {
+                assert_eq!(io::ErrorKind::WouldBlock, err.kind());
+            }
+            _ => {
+                panic!("Unexpected result for read_and_forget with incomplete");
+            }
+        }
+
+        // 3 more data bytes have arrived
+        let pos = r.position();
+        let data2 = vec![4, 5, 6];
+        match r.write_all(&data2) {
+            Ok(()) => {}
+            _ => {
+                panic!("Unexpected result for write_all");
+            }
+        }
+        r.set_position(pos);
+
+        // Third read : still incomplete for 7 bytes (we have 5)
+        let mut reader2 = Buffer::new(&mut part, &mut r);
+        match reader2.read_and_forget(&mut out) {
+            Err(ref err) => {
+                assert_eq!(io::ErrorKind::WouldBlock, err.kind());
+            }
+            _ => {
+                panic!("Unexpected result for read_and_forget with more incomplete");
+            }
+        }
+
+        // 3 more data bytes have arrived again
+        let pos2 = r.position();
+        let data3 = vec![7, 8, 9];
+        match r.write_all(&data3) {
+            Ok(()) => {}
+            _ => {
+                panic!("Unexpected result for write_all");
+            }
+        }
+        r.set_position(pos2);
+
+        // Fourth read : now succesful for 7 bytes
+        let mut reader3 = Buffer::new(&mut part, &mut r);
+        match reader3.read_and_forget(&mut out) {
+            Ok(7) => {
+                assert_eq!(out[0], 2);
+                assert_eq!(out[6], 8);
+            }
+            _ => {
+                panic!("Unexpected result for read_and_forget with data");
+            }
+        }
+
+        // Fifth read : succesful for one more byte
+        out.resize(1, 0);
+        match reader3.read_and_forget(&mut out) {
+            Ok(1) => {
+                assert_eq!(out[0], 9);
+            }
+            _ => {
+                panic!("Unexpected result for read_and_forget with data");
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/mem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/mem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/src/mem.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/src/mem.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 use std::io;
 use std::slice;
 
-use crate::ffi::{self, Backend, Deflate, DeflateBackend, Inflate, InflateBackend};
+use crate::ffi::{self, Backend, Deflate, DeflateBackend, ErrorMessage, Inflate, InflateBackend};
 use crate::Compression;
 
 /// Raw in-memory compression stream for blocks of data.
@@ -114,9 +114,10 @@
 }
 
 /// The inner state for an error when decompressing
-#[derive(Debug, Default)]
-pub(crate) struct DecompressErrorInner {
-    pub(crate) needs_dictionary: Option<u32>,
+#[derive(Debug)]
+pub(crate) enum DecompressErrorInner {
+    General { msg: ErrorMessage },
+    NeedsDictionary(u32),
 }
 
 /// Error returned when a decompression object finds that the input stream of
@@ -130,26 +131,36 @@
     /// The resulting integer is the Adler-32 checksum of the dictionary
     /// required.
     pub fn needs_dictionary(&self) -> Option<u32> {
-        self.0.needs_dictionary
+        match self.0 {
+            DecompressErrorInner::NeedsDictionary(adler) => Some(adler),
+            _ => None,
+        }
     }
 }
 
 #[inline]
-pub(crate) fn decompress_failed() -> Result<Status, DecompressError> {
-    Err(DecompressError(Default::default()))
+pub(crate) fn decompress_failed<T>(msg: ErrorMessage) -> Result<T, DecompressError> {
+    Err(DecompressError(DecompressErrorInner::General { msg }))
 }
 
 #[inline]
-pub(crate) fn decompress_need_dict(adler: u32) -> Result<Status, DecompressError> {
-    Err(DecompressError(DecompressErrorInner {
-        needs_dictionary: Some(adler),
-    }))
+pub(crate) fn decompress_need_dict<T>(adler: u32) -> Result<T, DecompressError> {
+    Err(DecompressError(DecompressErrorInner::NeedsDictionary(
+        adler,
+    )))
 }
 
 /// Error returned when a compression object is used incorrectly or otherwise
 /// generates an error.
 #[derive(Debug)]
-pub struct CompressError(pub(crate) ());
+pub struct CompressError {
+    pub(crate) msg: ErrorMessage,
+}
+
+#[inline]
+pub(crate) fn compress_failed<T>(msg: ErrorMessage) -> Result<T, CompressError> {
+    Err(CompressError { msg })
+}
 
 /// Possible status results of compressing some data or successfully
 /// decompressing a block of data.
@@ -215,11 +226,43 @@
         zlib_header: bool,
         window_bits: u8,
     ) -> Compress {
+        assert!(
+            window_bits > 8 && window_bits < 16,
+            "window_bits must be within 9 ..= 15"
+        );
         Compress {
             inner: Deflate::make(level, zlib_header, window_bits),
         }
     }
 
+    /// Creates a new object ready for compressing data that it's given.
+    ///
+    /// The `level` argument here indicates what level of compression is going
+    /// to be performed.
+    ///
+    /// The Compress object produced by this constructor outputs gzip headers
+    /// for the compressed data.
+    ///
+    /// # Panics
+    ///
+    /// If `window_bits` does not fall into the range 9 ..= 15,
+    /// `new_with_window_bits` will panic.
+    ///
+    /// # Note
+    ///
+    /// This constructor is only available when the `zlib` feature is used.
+    /// Other backends currently do not support gzip headers for Compress.
+    #[cfg(feature = "any_zlib")]
+    pub fn new_gzip(level: Compression, window_bits: u8) -> Compress {
+        assert!(
+            window_bits > 8 && window_bits < 16,
+            "window_bits must be within 9 ..= 15"
+        );
+        Compress {
+            inner: Deflate::make(level, true, window_bits + 16),
+        }
+    }
+
     /// Returns the total number of input bytes which have been processed by
     /// this compression object.
     pub fn total_in(&self) -> u64 {
@@ -238,13 +281,14 @@
     #[cfg(feature = "any_zlib")]
     pub fn set_dictionary(&mut self, dictionary: &[u8]) -> Result<u32, CompressError> {
         let stream = &mut *self.inner.inner.stream_wrapper;
+        stream.msg = std::ptr::null_mut();
         let rc = unsafe {
             assert!(dictionary.len() < ffi::uInt::max_value() as usize);
             ffi::deflateSetDictionary(stream, dictionary.as_ptr(), dictionary.len() as ffi::uInt)
         };
 
         match rc {
-            ffi::MZ_STREAM_ERROR => Err(CompressError(())),
+            ffi::MZ_STREAM_ERROR => compress_failed(self.inner.inner.msg()),
             ffi::MZ_OK => Ok(stream.adler as u32),
             c => panic!("unknown return code: {}", c),
         }
@@ -271,12 +315,13 @@
     pub fn set_level(&mut self, level: Compression) -> Result<(), CompressError> {
         use libc::c_int;
         let stream = &mut *self.inner.inner.stream_wrapper;
+        stream.msg = std::ptr::null_mut();
 
         let rc = unsafe { ffi::deflateParams(stream, level.0 as c_int, ffi::MZ_DEFAULT_STRATEGY) };
 
         match rc {
             ffi::MZ_OK => Ok(()),
-            ffi::MZ_BUF_ERROR => Err(CompressError(())),
+            ffi::MZ_BUF_ERROR => compress_failed(self.inner.inner.msg()),
             c => panic!("unknown return code: {}", c),
         }
     }
@@ -355,11 +400,40 @@
     /// Other backends currently do not support custom window bits.
     #[cfg(feature = "any_zlib")]
     pub fn new_with_window_bits(zlib_header: bool, window_bits: u8) -> Decompress {
+        assert!(
+            window_bits > 8 && window_bits < 16,
+            "window_bits must be within 9 ..= 15"
+        );
         Decompress {
             inner: Inflate::make(zlib_header, window_bits),
         }
     }
 
+    /// Creates a new object ready for decompressing data that it's given.
+    ///
+    /// The Deompress object produced by this constructor expects gzip headers
+    /// for the compressed data.
+    ///
+    /// # Panics
+    ///
+    /// If `window_bits` does not fall into the range 9 ..= 15,
+    /// `new_with_window_bits` will panic.
+    ///
+    /// # Note
+    ///
+    /// This constructor is only available when the `zlib` feature is used.
+    /// Other backends currently do not support gzip headers for Decompress.
+    #[cfg(feature = "any_zlib")]
+    pub fn new_gzip(window_bits: u8) -> Decompress {
+        assert!(
+            window_bits > 8 && window_bits < 16,
+            "window_bits must be within 9 ..= 15"
+        );
+        Decompress {
+            inner: Inflate::make(true, window_bits + 16),
+        }
+    }
+
     /// Returns the total number of input bytes which have been processed by
     /// this decompression object.
     pub fn total_in(&self) -> u64 {
@@ -442,16 +516,15 @@
     #[cfg(feature = "any_zlib")]
     pub fn set_dictionary(&mut self, dictionary: &[u8]) -> Result<u32, DecompressError> {
         let stream = &mut *self.inner.inner.stream_wrapper;
+        stream.msg = std::ptr::null_mut();
         let rc = unsafe {
             assert!(dictionary.len() < ffi::uInt::max_value() as usize);
             ffi::inflateSetDictionary(stream, dictionary.as_ptr(), dictionary.len() as ffi::uInt)
         };
 
         match rc {
-            ffi::MZ_STREAM_ERROR => Err(DecompressError(Default::default())),
-            ffi::MZ_DATA_ERROR => Err(DecompressError(DecompressErrorInner {
-                needs_dictionary: Some(stream.adler as u32),
-            })),
+            ffi::MZ_STREAM_ERROR => decompress_failed(self.inner.inner.msg()),
+            ffi::MZ_DATA_ERROR => decompress_need_dict(stream.adler as u32),
             ffi::MZ_OK => Ok(stream.adler as u32),
             c => panic!("unknown return code: {}", c),
         }
@@ -472,6 +545,16 @@
 
 impl Error for DecompressError {}
 
+impl DecompressError {
+    /// Retrieve the implementation's message about why the operation failed, if one exists.
+    pub fn message(&self) -> Option<&str> {
+        match &self.0 {
+            DecompressErrorInner::General { msg } => msg.get(),
+            _ => None,
+        }
+    }
+}
+
 impl From<DecompressError> for io::Error {
     fn from(data: DecompressError) -> io::Error {
         io::Error::new(io::ErrorKind::Other, data)
@@ -480,12 +563,26 @@
 
 impl fmt::Display for DecompressError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "deflate decompression error")
+        let msg = match &self.0 {
+            DecompressErrorInner::General { msg } => msg.get(),
+            DecompressErrorInner::NeedsDictionary { .. } => Some("requires a dictionary"),
+        };
+        match msg {
+            Some(msg) => write!(f, "deflate decompression error: {}", msg),
+            None => write!(f, "deflate decompression error"),
+        }
     }
 }
 
 impl Error for CompressError {}
 
+impl CompressError {
+    /// Retrieve the implementation's message about why the operation failed, if one exists.
+    pub fn message(&self) -> Option<&str> {
+        self.msg.get()
+    }
+}
+
 impl From<CompressError> for io::Error {
     fn from(data: CompressError) -> io::Error {
         io::Error::new(io::ErrorKind::Other, data)
@@ -494,7 +591,10 @@
 
 impl fmt::Display for CompressError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "deflate decompression error")
+        match self.msg.get() {
+            Some(msg) => write!(f, "deflate compression error: {}", msg),
+            None => write!(f, "deflate compression error"),
+        }
     }
 }
 
@@ -645,4 +745,44 @@
 
         assert_eq!(&decoded[..decoder.total_out() as usize], string);
     }
+
+    #[cfg(feature = "any_zlib")]
+    #[test]
+    fn test_gzip_flate() {
+        let string = "hello, hello!".as_bytes();
+
+        let mut encoded = Vec::with_capacity(1024);
+
+        let mut encoder = Compress::new_gzip(Compression::default(), 9);
+
+        encoder
+            .compress_vec(string, &mut encoded, FlushCompress::Finish)
+            .unwrap();
+
+        assert_eq!(encoder.total_in(), string.len() as u64);
+        assert_eq!(encoder.total_out(), encoded.len() as u64);
+
+        let mut decoder = Decompress::new_gzip(9);
+
+        let mut decoded = [0; 1024];
+        decoder
+            .decompress(&encoded, &mut decoded, FlushDecompress::Finish)
+            .unwrap();
+
+        assert_eq!(&decoded[..decoder.total_out() as usize], string);
+    }
+
+    #[cfg(feature = "any_zlib")]
+    #[test]
+    fn test_error_message() {
+        let mut decoder = Decompress::new(false);
+        let mut decoded = [0; 128];
+        let garbage = b"xbvxzi";
+
+        let err = decoder
+            .decompress(&*garbage, &mut decoded, FlushDecompress::Finish)
+            .unwrap_err();
+
+        assert_eq!(err.message(), Some("invalid stored block lengths"));
+    }
 }
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/tests/corrupt-file.gz and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/tests/corrupt-file.gz differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/tests/corrupt-gz-file.bin and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/tests/corrupt-gz-file.bin differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/tests/gunzip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/tests/gunzip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/flate2/tests/gunzip.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/flate2/tests/gunzip.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,7 +33,7 @@
 // test extraction fails on a corrupt file
 #[test]
 fn test_extract_failure() {
-    let result = extract_file(Path::new("tests/corrupt-file.gz"));
+    let result = extract_file(Path::new("tests/corrupt-gz-file.bin"));
     assert_eq!(result.err().unwrap().kind(), io::ErrorKind::InvalidInput);
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/form_urlencoded/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/form_urlencoded/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/form_urlencoded/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/form_urlencoded/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"046aa6b4fb96aa67f8db4e0e1f8238f75f94b8f93ed2298177e4b7eb11e30f21","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","src/lib.rs":"b8773556f5fcbdcce84bd7bc9ec57de80b95328d3b97b1a00f1102e8a152e6ca","src/query_encoding.rs":"88d31936327461af1382393117fc07bbdf064c6930aaff3cd8b38d2343e41b51"},"package":"ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"}
\ No newline at end of file
+{"files":{"Cargo.toml":"aadc4e4ba33e86861d8d1d8b848ac11a27b6f87340d082b47f762387464c61ed","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","src/lib.rs":"5d30edec687843447c97e4ea87583983eb9fc06135ae718c8ecc0fa8cebef2df"},"package":"5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/form_urlencoded/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/form_urlencoded/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/form_urlencoded/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/form_urlencoded/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "form_urlencoded"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["The rust-url developers"]
 description = "Parser and serializer for the application/x-www-form-urlencoded syntax, as used by HTML forms."
 license = "MIT/Apache-2.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/form_urlencoded/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/form_urlencoded/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/form_urlencoded/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/form_urlencoded/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,19 +13,13 @@
 //! Converts between a string (such as an URL’s query string)
 //! and a sequence of (name, value) pairs.
 
-extern crate percent_encoding;
 #[macro_use]
 extern crate matches;
 
 use percent_encoding::{percent_decode, percent_encode_byte};
-use query_encoding::decode_utf8_lossy;
 use std::borrow::{Borrow, Cow};
 use std::str;
 
-mod query_encoding;
-
-pub use query_encoding::EncodingOverride;
-
 /// Convert a byte string in the `application/x-www-form-urlencoded` syntax
 /// into a iterator of (name, value) pairs.
 ///
@@ -34,7 +28,7 @@
 /// The names and values are percent-decoded. For instance, `%23first=%25try%25` will be
 /// converted to `[("#first", "%try%")]`.
 #[inline]
-pub fn parse(input: &[u8]) -> Parse {
+pub fn parse(input: &[u8]) -> Parse<'_> {
     Parse { input }
 }
 /// The return type of `parse()`.
@@ -65,7 +59,7 @@
     }
 }
 
-fn decode(input: &[u8]) -> Cow<str> {
+fn decode(input: &[u8]) -> Cow<'_, str> {
     let replaced = replace_plus(input);
     decode_utf8_lossy(match percent_decode(&replaced).into() {
         Cow::Owned(vec) => Cow::Owned(vec),
@@ -74,7 +68,7 @@
 }
 
 /// Replace b'+' with b' '
-fn replace_plus(input: &[u8]) -> Cow<[u8]> {
+fn replace_plus(input: &[u8]) -> Cow<'_, [u8]> {
     match input.iter().position(|&b| b == b'+') {
         None => Cow::Borrowed(input),
         Some(first_position) => {
@@ -116,7 +110,7 @@
 /// https://url.spec.whatwg.org/#concept-urlencoded-byte-serializer).
 ///
 /// Return an iterator of `&str` slices.
-pub fn byte_serialize(input: &[u8]) -> ByteSerialize {
+pub fn byte_serialize(input: &[u8]) -> ByteSerialize<'_> {
     ByteSerialize { bytes: input }
 }
 
@@ -150,6 +144,10 @@
                 None => (self.bytes, &[][..]),
             };
             self.bytes = remaining;
+            // This unsafe is appropriate because we have already checked these
+            // bytes in byte_serialized_unchanged, which checks for a subset
+            // of UTF-8. So we know these bytes are valid UTF-8, and doing
+            // another UTF-8 check would be wasteful.
             Some(unsafe { str::from_utf8_unchecked(unchanged_slice) })
         } else {
             None
@@ -214,7 +212,14 @@
     /// If that suffix is non-empty,
     /// its content is assumed to already be in `application/x-www-form-urlencoded` syntax.
     pub fn for_suffix(mut target: T, start_position: usize) -> Self {
-        &target.as_mut_string()[start_position..]; // Panic if out of bounds
+        if target.as_mut_string().len() < start_position {
+            panic!(
+                "invalid length {} for target of length {}",
+                start_position,
+                target.as_mut_string().len()
+            );
+        }
+
         Serializer {
             target: Some(target),
             start_position,
@@ -250,6 +255,19 @@
         self
     }
 
+    /// Serialize and append a name of parameter without any value.
+    ///
+    /// Panics if called after `.finish()`.
+    pub fn append_key_only(&mut self, name: &str) -> &mut Self {
+        append_key_only(
+            string(&mut self.target),
+            self.start_position,
+            self.encoding,
+            name,
+        );
+        self
+    }
+
     /// Serialize and append a number of name/value pairs.
     ///
     /// This simply calls `append_pair` repeatedly.
@@ -280,6 +298,29 @@
         self
     }
 
+    /// Serialize and append a number of names without values.
+    ///
+    /// This simply calls `append_key_only` repeatedly.
+    /// This can be more convenient, so the user doesn’t need to introduce a block
+    /// to limit the scope of `Serializer`’s borrow of its string.
+    ///
+    /// Panics if called after `.finish()`.
+    pub fn extend_keys_only<I, K>(&mut self, iter: I) -> &mut Self
+    where
+        I: IntoIterator,
+        I::Item: Borrow<K>,
+        K: AsRef<str>,
+    {
+        {
+            let string = string(&mut self.target);
+            for key in iter {
+                let k = key.borrow().as_ref();
+                append_key_only(string, self.start_position, self.encoding, k);
+            }
+        }
+        self
+    }
+
     /// If this serializer was constructed with a string, take and return that string.
     ///
     /// ```rust
@@ -316,7 +357,7 @@
 fn append_pair(
     string: &mut String,
     start_position: usize,
-    encoding: EncodingOverride,
+    encoding: EncodingOverride<'_>,
     name: &str,
     value: &str,
 ) {
@@ -326,6 +367,54 @@
     append_encoded(value, string, encoding);
 }
 
-fn append_encoded(s: &str, string: &mut String, encoding: EncodingOverride) {
-    string.extend(byte_serialize(&query_encoding::encode(encoding, s.into())))
+fn append_key_only(
+    string: &mut String,
+    start_position: usize,
+    encoding: EncodingOverride,
+    name: &str,
+) {
+    append_separator_if_needed(string, start_position);
+    append_encoded(name, string, encoding);
+}
+
+fn append_encoded(s: &str, string: &mut String, encoding: EncodingOverride<'_>) {
+    string.extend(byte_serialize(&encode(encoding, s)))
 }
+
+pub(crate) fn encode<'a>(encoding_override: EncodingOverride<'_>, input: &'a str) -> Cow<'a, [u8]> {
+    if let Some(o) = encoding_override {
+        return o(input);
+    }
+    input.as_bytes().into()
+}
+
+pub(crate) fn decode_utf8_lossy(input: Cow<'_, [u8]>) -> Cow<'_, str> {
+    // Note: This function is duplicated in `percent_encoding/lib.rs`.
+    match input {
+        Cow::Borrowed(bytes) => String::from_utf8_lossy(bytes),
+        Cow::Owned(bytes) => {
+            match String::from_utf8_lossy(&bytes) {
+                Cow::Borrowed(utf8) => {
+                    // If from_utf8_lossy returns a Cow::Borrowed, then we can
+                    // be sure our original bytes were valid UTF-8. This is because
+                    // if the bytes were invalid UTF-8 from_utf8_lossy would have
+                    // to allocate a new owned string to back the Cow so it could
+                    // replace invalid bytes with a placeholder.
+
+                    // First we do a debug_assert to confirm our description above.
+                    let raw_utf8: *const [u8];
+                    raw_utf8 = utf8.as_bytes();
+                    debug_assert!(raw_utf8 == &*bytes as *const [u8]);
+
+                    // Given we know the original input bytes are valid UTF-8,
+                    // and we have ownership of those bytes, we re-use them and
+                    // return a Cow::Owned here.
+                    Cow::Owned(unsafe { String::from_utf8_unchecked(bytes) })
+                }
+                Cow::Owned(s) => Cow::Owned(s),
+            }
+        }
+    }
+}
+
+pub type EncodingOverride<'a> = Option<&'a dyn Fn(&str) -> Cow<'_, [u8]>>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/form_urlencoded/src/query_encoding.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/form_urlencoded/src/query_encoding.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/form_urlencoded/src/query_encoding.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/form_urlencoded/src/query_encoding.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// Copyright 2019 The rust-url developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::borrow::Cow;
-
-pub type EncodingOverride<'a> = Option<&'a dyn Fn(&str) -> Cow<[u8]>>;
-
-pub(crate) fn encode<'a>(encoding_override: EncodingOverride, input: &'a str) -> Cow<'a, [u8]> {
-    if let Some(o) = encoding_override {
-        return o(input);
-    }
-    input.as_bytes().into()
-}
-
-pub(crate) fn decode_utf8_lossy(input: Cow<[u8]>) -> Cow<str> {
-    match input {
-        Cow::Borrowed(bytes) => String::from_utf8_lossy(bytes),
-        Cow::Owned(bytes) => {
-            let raw_utf8: *const [u8];
-            match String::from_utf8_lossy(&bytes) {
-                Cow::Borrowed(utf8) => raw_utf8 = utf8.as_bytes(),
-                Cow::Owned(s) => return s.into(),
-            }
-            // from_utf8_lossy returned a borrow of `bytes` unchanged.
-            debug_assert!(raw_utf8 == &*bytes as *const [u8]);
-            // Reuse the existing `Vec` allocation.
-            unsafe { String::from_utf8_unchecked(bytes) }.into()
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/BUILD.gn thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/BUILD.gn
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/BUILD.gn	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/rust/rust_library.gni")
-
-rust_library("fuchsia-zircon") {
-  deps = [
-    "//garnet/public/rust/crates/fuchsia-zircon/fuchsia-zircon-sys",
-    "//third_party/rust-crates:bitflags-0.7.0",
-  ]
-
-  with_tests = true
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"BUILD.gn":"651b841730c01aa677f22906fd5eee96234a01d13139e4be12943698dd486a17","Cargo.toml":"0f744f8a2ee868ebcb30356bebc5dcf9be09927f9b72fd7c0625d4c4a35b1803","LICENSE":"f82f9062a6dff28145c185f90f94c485eebdc2bb4c6f1c840513709e6d228453","README.md":"f4bff6efc5d888460e2d1eaf62fa0eaca8afe7b51df528ad7829340ec397b32c","examples/BUILD.gn":"51c9291631e59d368709d9959a88bc8be1fe7375c65f2e1fc6e26184e8971137","src/channel.rs":"15c2a404f760d1594b9b8cfbaf8a828f5c506c6cb09a3408b4d5e894360eb1fc","src/cprng.rs":"cd8a163f7e5e75e536ee898a00c1c377b10c748c7dc574c7c3582bb86fdc86c5","src/event.rs":"bbf0c91d154f01ec1618182efbaaa8c71580f05a807cac1d12208b5cbe8f6b74","src/eventpair.rs":"0bf0b1137c2fb08398edb4d09b89ded5990d07f94ffe55b6ec917c7bc9059ebe","src/fifo.rs":"9ac29d11330fdea847902b8dba6b2004ad44878d8ef65d26a197780cd443ebb8","src/handle.rs":"8741c4b5056a200cfb4237af2d2d2c1db083075b112df68166e351e6d81eb3f3","src/job.rs":"827db2e4ea1bbf5ecabec9fb279f2721792032e4223b6bd15b56922d80c7ac01","src/lib.rs":"9f65dd6ba52e56190825542d6d2dfeca2a5610257513f373fa2cdb4d45d9fc6b","src/port.rs":"32501f17218ec9ad4d97741f4ff2d5ca8e89b7da7226473c82441fd06adbecc4","src/process.rs":"0b5e42c4eb79b2a7fff9c70f0d99c8b805cefab99285e94fabf2542290b4b990","src/rights.rs":"679422da3c0ff9f4e4928b8f41098ef0f5ec09af098496e088e2bac82fc9568d","src/signals.rs":"c07501df58b3c6264e37ebc0f5fd28f44ced040273a5ab5e839e3a204d351ea7","src/socket.rs":"cfb2f6ecb5ba9d9e354c18088061d6e5330dd420a20d0ced4a11f05d3332e3b8","src/status.rs":"4831adf17c1fbd4d52a0aacc63eebd98e49f6c0e28c407e8a0e40f380b3f3b2b","src/thread.rs":"d703414c440b5fa597dbafe7b8be925a94d1fe0cf8b47366c786b45eaaec4c60","src/time.rs":"33d9662c58b921ebe701d927d30ebc01d95594d081c38824355093206f29fba0","src/vmar.rs":"e69a51287e3cb016fa39bb8d884c88ffba4799a452c17e881af9d63a507b37f7","src/vmo.rs":"377968eec57b79a7f4b117dff2f59f26a57ba97ca7f2f0334bd27b99fe87b299","tools/gen_status.py":"a2330db86564e12412af2dce60d4c605c0ab203fcdea8039d5c6a8e7f218a3c3"},"package":"2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "fuchsia-zircon"
-version = "0.3.3"
-authors = ["Raph Levien <raph@google.com>"]
-description = "Rust bindings for the Zircon kernel"
-license = "BSD-3-Clause"
-repository = "https://fuchsia.googlesource.com/garnet/"
-[dependencies.bitflags]
-version = "1.0.0"
-
-[dependencies.fuchsia-zircon-sys]
-version = "0.3.3"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/examples/BUILD.gn thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/examples/BUILD.gn
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/examples/BUILD.gn	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/examples/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/package.gni")
-
-package("zircon_rust_examples") {
-  system_image = true
-
-  deps = [
-    "zx_toy",
-  ]
-
-  binaries = [ {
-        name = "example_zx_toy"
-      } ]
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-Rust bindings for Zircon kernel
-================================
-
-This repository contains Rust language bindings for Zircon kernel syscalls. The
-main crate contains type-safe wrappers, while the inner "sys" crate contains the
-raw types and FFI declarations.
-
-There are two ways to build Rust artifacts targeting Fuchsia; using the
-[Fargo](https://fuchsia.googlesource.com/fargo/) cross compiling tool or
-including your [artifact in the GN
-build](https://fuchsia.googlesource.com/docs/+/master/rust.md). Of the two,
-Fargo is likely better for exploration and experimentation.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/channel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/channel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/channel.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/channel.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,418 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon channel objects.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef, Peered, Status, Time, usize_into_u32, size_to_u32_sat};
-use {sys, ok};
-use std::mem;
-
-/// An object representing a Zircon
-/// [channel](https://fuchsia.googlesource.com/zircon/+/master/docs/objects/channel.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq, Hash)]
-pub struct Channel(Handle);
-impl_handle_based!(Channel);
-impl Peered for Channel {}
-
-impl Channel {
-    /// Create a channel, resulting an a pair of `Channel` objects representing both
-    /// sides of the channel. Messages written into one maybe read from the opposite.
-    ///
-    /// Wraps the
-    /// [zx_channel_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/channel_create.md)
-    /// syscall.
-    pub fn create() -> Result<(Channel, Channel), Status> {
-        unsafe {
-            let mut handle0 = 0;
-            let mut handle1 = 0;
-            let opts = 0;
-            ok(sys::zx_channel_create(opts, &mut handle0, &mut handle1))?;
-            Ok((
-                Self::from(Handle::from_raw(handle0)),
-                Self::from(Handle::from_raw(handle1))
-                ))
-        }
-    }
-
-    /// Read a message from a channel. Wraps the
-    /// [zx_channel_read](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/channel_read.md)
-    /// syscall.
-    ///
-    /// If the `MessageBuf` lacks the capacity to hold the pending message,
-    /// returns an `Err` with the number of bytes and number of handles needed.
-    /// Otherwise returns an `Ok` with the result as usual.
-    pub fn read_raw(&self, buf: &mut MessageBuf)
-        -> Result<Result<(), Status>, (usize, usize)>
-    {
-        let opts = 0;
-        unsafe {
-            buf.clear();
-            let raw_handle = self.raw_handle();
-            let mut num_bytes: u32 = size_to_u32_sat(buf.bytes.capacity());
-            let mut num_handles: u32 = size_to_u32_sat(buf.handles.capacity());
-            let status = ok(sys::zx_channel_read(raw_handle, opts,
-                buf.bytes.as_mut_ptr(), buf.handles.as_mut_ptr() as *mut _,
-                num_bytes, num_handles, &mut num_bytes, &mut num_handles));
-            if status == Err(Status::BUFFER_TOO_SMALL) {
-                Err((num_bytes as usize, num_handles as usize))
-            } else {
-                Ok(status.map(|()| {
-                    buf.bytes.set_len(num_bytes as usize);
-                    buf.handles.set_len(num_handles as usize);
-                }))
-            }
-        }
-    }
-
-    /// Read a message from a channel.
-    ///
-    /// Note that this method can cause internal reallocations in the `MessageBuf`
-    /// if it is lacks capacity to hold the full message. If such reallocations
-    /// are not desirable, use `read_raw` instead.
-    pub fn read(&self, buf: &mut MessageBuf) -> Result<(), Status> {
-        loop {
-            match self.read_raw(buf) {
-                Ok(result) => return result,
-                Err((num_bytes, num_handles)) => {
-                    buf.ensure_capacity_bytes(num_bytes);
-                    buf.ensure_capacity_handles(num_handles);
-                }
-            }
-        }
-    }
-
-    /// Write a message to a channel. Wraps the
-    /// [zx_channel_write](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/channel_write.md)
-    /// syscall.
-    pub fn write(&self, bytes: &[u8], handles: &mut Vec<Handle>)
-            -> Result<(), Status>
-    {
-        let opts = 0;
-        let n_bytes = try!(usize_into_u32(bytes.len()).map_err(|_| Status::OUT_OF_RANGE));
-        let n_handles = try!(usize_into_u32(handles.len()).map_err(|_| Status::OUT_OF_RANGE));
-        unsafe {
-            let status = sys::zx_channel_write(self.raw_handle(), opts, bytes.as_ptr(), n_bytes,
-                handles.as_ptr() as *const sys::zx_handle_t, n_handles);
-            ok(status)?;
-            // Handles were successfully transferred, forget them on sender side
-            handles.set_len(0);
-            Ok(())
-        }
-    }
-
-    /// Send a message consisting of the given bytes and handles to a channel and await a reply. The
-    /// bytes should start with a four byte 'txid' which is used to identify the matching reply.
-    ///
-    /// Wraps the
-    /// [zx_channel_call](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/channel_call.md)
-    /// syscall.
-    ///
-    /// Note that unlike [`read`][read], the caller must ensure that the MessageBuf has enough
-    /// capacity for the bytes and handles which will be received, as replies which are too large
-    /// are discarded.
-    ///
-    /// On failure returns the both the main and read status.
-    ///
-    /// [read]: struct.Channel.html#method.read
-    pub fn call(&self, timeout: Time, bytes: &[u8], handles: &mut Vec<Handle>,
-        buf: &mut MessageBuf) -> Result<(), (Status, Status)>
-    {
-        let write_num_bytes = try!(usize_into_u32(bytes.len()).map_err(
-            |_| (Status::OUT_OF_RANGE, Status::OK)));
-        let write_num_handles = try!(usize_into_u32(handles.len()).map_err(
-            |_| (Status::OUT_OF_RANGE, Status::OK)));
-        buf.clear();
-        let read_num_bytes: u32 = size_to_u32_sat(buf.bytes.capacity());
-        let read_num_handles: u32 = size_to_u32_sat(buf.handles.capacity());
-        let args = sys::zx_channel_call_args_t {
-            wr_bytes: bytes.as_ptr(),
-            wr_handles: handles.as_ptr() as *const sys::zx_handle_t,
-            rd_bytes: buf.bytes.as_mut_ptr(),
-            rd_handles: buf.handles.as_mut_ptr() as *mut _,
-            wr_num_bytes: write_num_bytes,
-            wr_num_handles: write_num_handles,
-            rd_num_bytes: read_num_bytes,
-            rd_num_handles: read_num_handles,
-        };
-        let mut actual_read_bytes: u32 = 0;
-        let mut actual_read_handles: u32 = 0;
-        let mut read_status = Status::OK.into_raw();
-        let options = 0;
-        let status = unsafe {
-            Status::from_raw(
-                sys::zx_channel_call(
-                    self.raw_handle(), options, timeout.nanos(), &args, &mut actual_read_bytes,
-                    &mut actual_read_handles, &mut read_status))
-        };
-
-        match status {
-            Status::OK |
-            Status::TIMED_OUT |
-            Status::CALL_FAILED => {
-                // Handles were successfully transferred,
-                // even if we didn't get a response, so forget
-                // them on the sender side.
-                unsafe { handles.set_len(0); }
-            }
-            _ => {}
-        }
-
-        unsafe {
-            buf.bytes.set_len(actual_read_bytes as usize);
-            buf.handles.set_len(actual_read_handles as usize);
-        }
-        if Status::OK == status {
-            Ok(())
-        } else {
-            Err((status, Status::from_raw(read_status)))
-        }
-    }
-}
-
-#[test]
-pub fn test_handle_repr() {
-    assert_eq!(::std::mem::size_of::<sys::zx_handle_t>(), 4);
-    assert_eq!(::std::mem::size_of::<Handle>(), 4);
-    assert_eq!(::std::mem::align_of::<sys::zx_handle_t>(), ::std::mem::align_of::<Handle>());
-
-    // This test asserts that repr(transparent) still works for Handle -> zx_handle_t
-
-    let n: Vec<sys::zx_handle_t> = vec![0, 100, 2<<32-1];
-    let v: Vec<Handle> = n.iter().map(|h| unsafe { Handle::from_raw(*h) } ).collect();
-
-    for (handle, raw) in v.iter().zip(n.iter()) {
-        unsafe {
-            assert_eq!(*(handle as *const _ as *const [u8; 4]), *(raw as *const _ as *const [u8; 4]));
-        }
-    }
-
-    for h in v.into_iter() {
-        ::std::mem::forget(h);
-    }
-}
-
-impl AsRef<Channel> for Channel {
-    fn as_ref(&self) -> &Self {
-        &self
-    }
-}
-
-/// A buffer for _receiving_ messages from a channel.
-///
-/// A `MessageBuf` is essentially a byte buffer and a vector of
-/// handles, but move semantics for "taking" handles requires special handling.
-///
-/// Note that for sending messages to a channel, the caller manages the buffers,
-/// using a plain byte slice and `Vec<Handle>`.
-#[derive(Default)]
-#[derive(Debug)]
-pub struct MessageBuf {
-    bytes: Vec<u8>,
-    handles: Vec<Handle>,
-}
-
-impl MessageBuf {
-    /// Create a new, empty, message buffer.
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    /// Create a new non-empty message buffer.
-    pub fn new_with(v: Vec<u8>, h: Vec<Handle>) -> Self {
-        Self{
-            bytes: v,
-            handles: h,
-        }
-    }
-
-    /// Ensure that the buffer has the capacity to hold at least `n_bytes` bytes.
-    pub fn ensure_capacity_bytes(&mut self, n_bytes: usize) {
-        ensure_capacity(&mut self.bytes, n_bytes);
-    }
-
-    /// Ensure that the buffer has the capacity to hold at least `n_handles` handles.
-    pub fn ensure_capacity_handles(&mut self, n_handles: usize) {
-        ensure_capacity(&mut self.handles, n_handles);
-    }
-
-    /// Ensure that at least n_bytes bytes are initialized (0 fill).
-    pub fn ensure_initialized_bytes(&mut self, n_bytes: usize) {
-        if n_bytes <= self.bytes.len() {
-            return;
-        }
-        self.bytes.resize(n_bytes, 0);
-    }
-
-    /// Get a reference to the bytes of the message buffer, as a `&[u8]` slice.
-    pub fn bytes(&self) -> &[u8] {
-        self.bytes.as_slice()
-    }
-
-    /// The number of handles in the message buffer. Note this counts the number
-    /// available when the message was received; `take_handle` does not affect
-    /// the count.
-    pub fn n_handles(&self) -> usize {
-        self.handles.len()
-    }
-
-    /// Take the handle at the specified index from the message buffer. If the
-    /// method is called again with the same index, it will return `None`, as
-    /// will happen if the index exceeds the number of handles available.
-    pub fn take_handle(&mut self, index: usize) -> Option<Handle> {
-        self.handles.get_mut(index).and_then(|handle|
-            if handle.is_invalid() {
-                None
-            } else {
-                Some(mem::replace(handle, Handle::invalid()))
-            }
-        )
-    }
-
-    /// Clear the bytes and handles contained in the buf. This will drop any
-    /// contained handles, resulting in their resources being freed.
-    pub fn clear(&mut self) {
-        self.bytes.clear();
-        self.handles.clear();
-    }
-}
-
-fn ensure_capacity<T>(vec: &mut Vec<T>, size: usize) {
-    let len = vec.len();
-    if size > len {
-        vec.reserve(size - len);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use {DurationNum, Rights, Signals, Vmo};
-    use std::thread;
-
-    #[test]
-    fn channel_basic() {
-        let (p1, p2) = Channel::create().unwrap();
-
-        let mut empty = vec![];
-        assert!(p1.write(b"hello", &mut empty).is_ok());
-
-        let mut buf = MessageBuf::new();
-        assert!(p2.read(&mut buf).is_ok());
-        assert_eq!(buf.bytes(), b"hello");
-    }
-
-    #[test]
-    fn channel_read_raw_too_small() {
-        let (p1, p2) = Channel::create().unwrap();
-
-        let mut empty = vec![];
-        assert!(p1.write(b"hello", &mut empty).is_ok());
-
-        let mut buf = MessageBuf::new();
-        let result = p2.read_raw(&mut buf);
-        assert_eq!(result, Err((5, 0)));
-        assert_eq!(buf.bytes(), b"");
-    }
-
-    #[test]
-    fn channel_send_handle() {
-        let hello_length: usize = 5;
-
-        // Create a pair of channels and a virtual memory object.
-        let (p1, p2) = Channel::create().unwrap();
-        let vmo = Vmo::create(hello_length as u64).unwrap();
-
-        // Duplicate VMO handle and send it down the channel.
-        let duplicate_vmo_handle = vmo.duplicate_handle(Rights::SAME_RIGHTS).unwrap().into();
-        let mut handles_to_send: Vec<Handle> = vec![duplicate_vmo_handle];
-        assert!(p1.write(b"", &mut handles_to_send).is_ok());
-        // Handle should be removed from vector.
-        assert!(handles_to_send.is_empty());
-
-        // Read the handle from the receiving channel.
-        let mut buf = MessageBuf::new();
-        assert!(p2.read(&mut buf).is_ok());
-        assert_eq!(buf.n_handles(), 1);
-        // Take the handle from the buffer.
-        let received_handle = buf.take_handle(0).unwrap();
-        // Should not affect number of handles.
-        assert_eq!(buf.n_handles(), 1);
-        // Trying to take it again should fail.
-        assert!(buf.take_handle(0).is_none());
-
-        // Now to test that we got the right handle, try writing something to it...
-        let received_vmo = Vmo::from(received_handle);
-        assert_eq!(received_vmo.write(b"hello", 0).unwrap(), hello_length);
-
-        // ... and reading it back from the original VMO.
-        let mut read_vec = vec![0; hello_length];
-        assert_eq!(vmo.read(&mut read_vec, 0).unwrap(), hello_length);
-        assert_eq!(read_vec, b"hello");
-    }
-
-    #[test]
-    fn channel_call_timeout() {
-        let ten_ms = 10.millis();
-
-        // Create a pair of channels and a virtual memory object.
-        let (p1, p2) = Channel::create().unwrap();
-        let vmo = Vmo::create(0 as u64).unwrap();
-
-        // Duplicate VMO handle and send it along with the call.
-        let duplicate_vmo_handle = vmo.duplicate_handle(Rights::SAME_RIGHTS).unwrap().into();
-        let mut handles_to_send: Vec<Handle> = vec![duplicate_vmo_handle];
-        let mut buf = MessageBuf::new();
-        assert_eq!(p1.call(ten_ms.after_now(), b"call", &mut handles_to_send, &mut buf),
-            Err((Status::TIMED_OUT, Status::OK)));
-        // Handle should be removed from vector even though we didn't get a response, as it was
-        // still sent over the channel.
-        assert!(handles_to_send.is_empty());
-
-        // Should be able to read call even though it timed out waiting for a response.
-        let mut buf = MessageBuf::new();
-        assert!(p2.read(&mut buf).is_ok());
-        assert_eq!(buf.bytes(), b"call");
-        assert_eq!(buf.n_handles(), 1);
-    }
-
-    #[test]
-    fn channel_call() {
-        // Create a pair of channels
-        let (p1, p2) = Channel::create().unwrap();
-
-        // create an mpsc channel for communicating the call data for later assertion
-        let (tx, rx) = ::std::sync::mpsc::channel();
-
-        // Start a new thread to respond to the call.
-        thread::spawn(move || {
-            let mut buf = MessageBuf::new();
-            // if either the read or the write fail, this thread will panic,
-            // resulting in tx being dropped, which will be noticed by the rx.
-            p2.wait_handle(Signals::CHANNEL_READABLE, 1.seconds().after_now()).expect("callee wait error");
-            p2.read(&mut buf).expect("callee read error");
-            p2.write(b"txidresponse", &mut vec![]).expect("callee write error");
-            tx.send(buf).expect("callee mpsc send error");
-        });
-
-        // Make the call.
-        let mut buf = MessageBuf::new();
-        buf.ensure_capacity_bytes(12);
-        // NOTE(raggi): CQ has been seeing some long stalls from channel call,
-        // and it's as yet unclear why. The timeout here has been made much
-        // larger in order to avoid that, as the issues are not issues with this
-        // crate's concerns. The timeout is here just to prevent the tests from
-        // stalling forever if a developer makes a mistake locally in this
-        // crate. Tests of Zircon behavior or virtualization behavior should be
-        // covered elsewhere. See ZX-1324.
-        p1.call(30.seconds().after_now(), b"txidcall", &mut vec![], &mut buf).expect("channel call error");
-        assert_eq!(buf.bytes(), b"txidresponse");
-        assert_eq!(buf.n_handles(), 0);
-
-        let sbuf = rx.recv().expect("mpsc channel recv error");
-        assert_eq!(sbuf.bytes(), b"txidcall");
-        assert_eq!(sbuf.n_handles(), 0);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/cprng.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/cprng.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/cprng.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/cprng.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-use {Status, ok, sys};
-
-/// Draw random bytes from the kernel's CPRNG to fill the given buffer. Returns the actual number of
-/// bytes drawn, which may sometimes be less than the size of the buffer provided.
-///
-/// The buffer must have length less than `ZX_CPRNG_DRAW_MAX_LEN`.
-///
-/// Wraps the
-/// [zx_cprng_draw](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/cprng_draw.md)
-/// syscall.
-pub fn cprng_draw(buffer: &mut [u8]) -> Result<usize, Status> {
-    let mut actual = 0;
-    let status = unsafe { sys::zx_cprng_draw(buffer.as_mut_ptr(), buffer.len(), &mut actual) };
-    ok(status).map(|()| actual)
-}
-
-/// Mix the given entropy into the kernel CPRNG.
-///
-/// The buffer must have length less than `ZX_CPRNG_ADD_ENTROPY_MAX_LEN`.
-///
-/// Wraps the
-/// [zx_cprng_add_entropy](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/cprng_add_entropy.md)
-/// syscall.
-pub fn cprng_add_entropy(buffer: &[u8]) -> Result<(), Status> {
-    let status = unsafe { sys::zx_cprng_add_entropy(buffer.as_ptr(), buffer.len()) };
-    ok(status)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn cprng() {
-        let mut buffer = [0; 20];
-        assert_eq!(cprng_draw(&mut buffer), Ok(20));
-        let mut first_zero = 0;
-        let mut last_zero = 0;
-        for _ in 0..30 {
-            let mut buffer = [0; 20];
-            assert_eq!(cprng_draw(&mut buffer), Ok(20));
-            if buffer[0] == 0 {
-                first_zero += 1;
-            }
-            if buffer[19] == 0 {
-                last_zero += 1;
-            }
-        }
-        assert_ne!(first_zero, 30);
-        assert_ne!(last_zero, 30);
-    }
-
-    #[test]
-    fn cprng_too_large() {
-        let mut buffer = [0; sys::ZX_CPRNG_DRAW_MAX_LEN + 1];
-        assert_eq!(cprng_draw(&mut buffer), Err(Status::INVALID_ARGS));
-
-        for mut s in buffer.chunks_mut(sys::ZX_CPRNG_DRAW_MAX_LEN) {
-            assert_eq!(cprng_draw(&mut s), Ok(s.len()));
-        }
-    }
-
-    #[test]
-    fn cprng_add() {
-        let buffer = [0, 1, 2];
-        assert_eq!(cprng_add_entropy(&buffer), Ok(()));
-    }
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/eventpair.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/eventpair.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/eventpair.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/eventpair.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon event pairs.
-
-use {AsHandleRef, Cookied, HandleBased, Handle, HandleRef, Peered, Status};
-use {sys, ok};
-
-/// An object representing a Zircon
-/// [event pair](https://fuchsia.googlesource.com/zircon/+/master/docs/concepts.md#Other-IPC_Events_Event-Pairs_and-User-Signals).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct EventPair(Handle);
-impl_handle_based!(EventPair);
-impl Peered for EventPair {}
-impl Cookied for EventPair {}
-
-impl EventPair {
-    /// Create an event pair, a pair of objects which can signal each other. Wraps the
-    /// [zx_eventpair_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/eventpair_create.md)
-    /// syscall.
-    pub fn create() -> Result<(EventPair, EventPair), Status> {
-        let mut out0 = 0;
-        let mut out1 = 0;
-        let options = 0;
-        let status = unsafe { sys::zx_eventpair_create(options, &mut out0, &mut out1) };
-        ok(status)?;
-        unsafe {
-            Ok((
-                Self::from(Handle::from_raw(out0)),
-                Self::from(Handle::from_raw(out1))
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use {DurationNum, Signals};
-
-    #[test]
-    fn wait_and_signal_peer() {
-        let (p1, p2) = EventPair::create().unwrap();
-        let eighty_ms = 80.millis();
-
-        // Waiting on one without setting any signal should time out.
-        assert_eq!(p2.wait_handle(Signals::USER_0, eighty_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we set a signal, we should be able to wait for it.
-        assert!(p1.signal_peer(Signals::NONE, Signals::USER_0).is_ok());
-        assert_eq!(p2.wait_handle(Signals::USER_0, eighty_ms.after_now()).unwrap(),
-            Signals::USER_0);
-
-        // Should still work, signals aren't automatically cleared.
-        assert_eq!(p2.wait_handle(Signals::USER_0, eighty_ms.after_now()).unwrap(),
-            Signals::USER_0);
-
-        // Now clear it, and waiting should time out again.
-        assert!(p1.signal_peer(Signals::USER_0, Signals::NONE).is_ok());
-        assert_eq!(p2.wait_handle(Signals::USER_0, eighty_ms.after_now()), Err(Status::TIMED_OUT));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/event.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/event.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/event.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/event.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon event objects.
-
-use {AsHandleRef, Cookied, HandleBased, Handle, HandleRef, Status};
-use {sys, ok};
-
-/// An object representing a Zircon
-/// [event object](https://fuchsia.googlesource.com/zircon/+/master/docs/objects/event.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Event(Handle);
-impl_handle_based!(Event);
-impl Cookied for Event {}
-
-impl Event {
-    /// Create an event object, an object which is signalable but nothing else. Wraps the
-    /// [zx_event_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/event_create.md)
-    /// syscall.
-    pub fn create() -> Result<Event, Status> {
-        let mut out = 0;
-        let opts = 0;
-        let status = unsafe { sys::zx_event_create(opts, &mut out) };
-        ok(status)?;
-        unsafe {
-            Ok(Self::from(Handle::from_raw(out)))
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/fifo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/fifo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/fifo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/fifo.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon fifo objects.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef, Status};
-use {sys, ok};
-
-/// An object representing a Zircon fifo.
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Fifo(Handle);
-impl_handle_based!(Fifo);
-
-impl Fifo {
-    /// Create a pair of fifos and return their endpoints. Writing to one endpoint enqueues an
-    /// element into the fifo from which the opposing endpoint reads. Wraps the
-    /// [zx_fifo_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/fifo_create.md)
-    /// syscall.
-    pub fn create(elem_count: u32, elem_size: u32)
-        -> Result<(Fifo, Fifo), Status>
-    {
-        let mut out0 = 0;
-        let mut out1 = 0;
-        let options = 0;
-        let status = unsafe {
-            sys::zx_fifo_create(elem_count, elem_size, options, &mut out0, &mut out1)
-        };
-        ok(status)?;
-        unsafe { Ok((
-            Self::from(Handle::from_raw(out0)),
-            Self::from(Handle::from_raw(out1))
-        ))}
-    }
-
-    /// Attempts to write some number of elements into the fifo. The number of bytes written will be
-    /// rounded down to a multiple of the fifo's element size.
-    /// Return value (on success) is number of elements actually written.
-    ///
-    /// Wraps
-    /// [zx_fifo_write](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/fifo_write.md).
-    pub fn write(&self, bytes: &[u8]) -> Result<u32, Status> {
-        let mut num_entries_written = 0;
-        let status = unsafe {
-            sys::zx_fifo_write(self.raw_handle(), bytes.as_ptr(), bytes.len(),
-                &mut num_entries_written)
-        };
-        ok(status).map(|()| num_entries_written)
-    }
-
-    /// Attempts to read some number of elements out of the fifo. The number of bytes read will
-    /// always be a multiple of the fifo's element size.
-    /// Return value (on success) is number of elements actually read.
-    ///
-    /// Wraps
-    /// [zx_fifo_read](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/fifo_read.md).
-    pub fn read(&self, bytes: &mut [u8]) -> Result<u32, Status> {
-        let mut num_entries_read = 0;
-        let status = unsafe {
-            sys::zx_fifo_read(self.raw_handle(), bytes.as_mut_ptr(), bytes.len(),
-                &mut num_entries_read)
-        };
-        ok(status).map(|()| num_entries_read)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn fifo_basic() {
-        let (fifo1, fifo2) = Fifo::create(4, 2).unwrap();
-
-        // Trying to write less than one element should fail.
-        assert_eq!(fifo1.write(b""), Err(Status::OUT_OF_RANGE));
-        assert_eq!(fifo1.write(b"h"), Err(Status::OUT_OF_RANGE));
-
-        // Should write one element "he" and ignore the last half-element as it rounds down.
-        assert_eq!(fifo1.write(b"hex").unwrap(), 1);
-
-        // Should write three elements "ll" "o " "wo" and drop the rest as it is full.
-        assert_eq!(fifo1.write(b"llo worlds").unwrap(), 3);
-
-        // Now that the fifo is full any further attempts to write should fail.
-        assert_eq!(fifo1.write(b"blah blah"), Err(Status::SHOULD_WAIT));
-
-        // Read all 4 entries from the other end.
-        let mut read_vec = vec![0; 8];
-        assert_eq!(fifo2.read(&mut read_vec).unwrap(), 4);
-        assert_eq!(read_vec, b"hello wo");
-
-        // Reading again should fail as the fifo is empty.
-        assert_eq!(fifo2.read(&mut read_vec), Err(Status::SHOULD_WAIT));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/handle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/handle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/handle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/handle.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,243 +0,0 @@
-use {Port, Rights, Signals, Status, Time, WaitAsyncOpts, ok, sys};
-use std::marker::PhantomData;
-use std::mem;
-
-/// An object representing a Zircon
-/// [handle](https://fuchsia.googlesource.com/zircon/+/master/docs/handles.md).
-///
-/// Internally, it is represented as a 32-bit integer, but this wrapper enforces
-/// strict ownership semantics. The `Drop` implementation closes the handle.
-///
-/// This type represents the most general reference to a kernel object, and can
-/// be interconverted to and from more specific types. Those conversions are not
-/// enforced in the type system; attempting to use them will result in errors
-/// returned by the kernel. These conversions don't change the underlying
-/// representation, but do change the type and thus what operations are available.
-#[derive(Debug, Eq, PartialEq, Hash)]
-pub struct Handle(sys::zx_handle_t);
-
-impl AsHandleRef for Handle {
-    fn as_handle_ref(&self) -> HandleRef {
-        HandleRef { handle: self.0, phantom: Default::default() }
-    }
-}
-
-impl HandleBased for Handle {}
-
-impl Drop for Handle {
-    fn drop(&mut self) {
-        if self.0 != sys::ZX_HANDLE_INVALID {
-            unsafe { sys::zx_handle_close(self.0) };
-        }
-    }
-}
-
-impl Handle {
-    /// Initialize a handle backed by ZX_HANDLE_INVALID, the only safe non-handle.
-    pub fn invalid() -> Handle {
-        Handle(sys::ZX_HANDLE_INVALID)
-    }
-
-    /// If a raw handle is obtained from some other source, this method converts
-    /// it into a type-safe owned handle.
-    pub unsafe fn from_raw(raw: sys::zx_handle_t) -> Handle {
-        Handle(raw)
-    }
-
-    pub fn is_invalid(&self) -> bool {
-        self.0 == sys::ZX_HANDLE_INVALID
-    }
-
-    pub fn replace(self, rights: Rights) -> Result<Handle, Status> {
-        let handle = self.0;
-        let mut out = 0;
-        let status = unsafe { sys::zx_handle_replace(handle, rights.bits(), &mut out) };
-        ok(status).map(|()| Handle(out))
-    }
-}
-
-/// A borrowed reference to a `Handle`.
-///
-/// Mostly useful as part of a `WaitItem`.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub struct HandleRef<'a> {
-    handle: sys::zx_handle_t,
-    phantom: PhantomData<&'a sys::zx_handle_t>,
-}
-
-impl<'a> HandleRef<'a> {
-    pub fn raw_handle(&self) -> sys::zx_handle_t {
-        self.handle
-    }
-
-    pub fn duplicate(&self, rights: Rights) -> Result<Handle, Status> {
-        let handle = self.handle;
-        let mut out = 0;
-        let status = unsafe { sys::zx_handle_duplicate(handle, rights.bits(), &mut out) };
-        ok(status).map(|()| Handle(out))
-    }
-
-    pub fn signal(&self, clear_mask: Signals, set_mask: Signals) -> Result<(), Status> {
-        let handle = self.handle;
-        let status = unsafe { sys::zx_object_signal(handle, clear_mask.bits(), set_mask.bits()) };
-        ok(status)
-    }
-
-    pub fn wait(&self, signals: Signals, deadline: Time) -> Result<Signals, Status> {
-        let handle = self.handle;
-        let mut pending = Signals::empty().bits();
-        let status = unsafe {
-            sys::zx_object_wait_one(handle, signals.bits(), deadline.nanos(), &mut pending)
-        };
-        ok(status).map(|()| Signals::from_bits_truncate(pending))
-    }
-
-    pub fn wait_async(&self, port: &Port, key: u64, signals: Signals, options: WaitAsyncOpts)
-        -> Result<(), Status>
-    {
-        let handle = self.handle;
-        let status = unsafe {
-            sys::zx_object_wait_async(
-                handle, port.raw_handle(), key, signals.bits(), options as u32)
-        };
-        ok(status)
-    }
-}
-
-/// A trait to get a reference to the underlying handle of an object.
-pub trait AsHandleRef {
-    /// Get a reference to the handle. One important use of such a reference is
-    /// for `object_wait_many`.
-    fn as_handle_ref(&self) -> HandleRef;
-
-    /// Interpret the reference as a raw handle (an integer type). Two distinct
-    /// handles will have different raw values (so it can perhaps be used as a
-    /// key in a data structure).
-    fn raw_handle(&self) -> sys::zx_handle_t {
-        self.as_handle_ref().raw_handle()
-    }
-
-    /// Set and clear userspace-accessible signal bits on an object. Wraps the
-    /// [zx_object_signal](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_signal.md)
-    /// syscall.
-    fn signal_handle(&self, clear_mask: Signals, set_mask: Signals) -> Result<(), Status> {
-        self.as_handle_ref().signal(clear_mask, set_mask)
-    }
-
-    /// Waits on a handle. Wraps the
-    /// [zx_object_wait_one](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_wait_one.md)
-    /// syscall.
-    fn wait_handle(&self, signals: Signals, deadline: Time) -> Result<Signals, Status> {
-        self.as_handle_ref().wait(signals, deadline)
-    }
-
-    /// Causes packet delivery on the given port when the object changes state and matches signals.
-    /// [zx_object_wait_async](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_wait_async.md)
-    /// syscall.
-    fn wait_async_handle(&self, port: &Port, key: u64, signals: Signals, options: WaitAsyncOpts)
-        -> Result<(), Status>
-    {
-        self.as_handle_ref().wait_async(port, key, signals, options)
-    }
-}
-
-impl<'a> AsHandleRef for HandleRef<'a> {
-    fn as_handle_ref(&self) -> HandleRef { *self }
-}
-
-/// A trait implemented by all handle-based types.
-///
-/// Note: it is reasonable for user-defined objects wrapping a handle to implement
-/// this trait. For example, a specific interface in some protocol might be
-/// represented as a newtype of `Channel`, and implement the `as_handle_ref`
-/// method and the `From<Handle>` trait to facilitate conversion from and to the
-/// interface.
-pub trait HandleBased: AsHandleRef + From<Handle> + Into<Handle> {
-    /// Duplicate a handle, possibly reducing the rights available. Wraps the
-    /// [zx_handle_duplicate](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/handle_duplicate.md)
-    /// syscall.
-    fn duplicate_handle(&self, rights: Rights) -> Result<Self, Status> {
-        self.as_handle_ref().duplicate(rights).map(|handle| Self::from(handle))
-    }
-
-    /// Create a replacement for a handle, possibly reducing the rights available. This invalidates
-    /// the original handle. Wraps the
-    /// [zx_handle_replace](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/handle_replace.md)
-    /// syscall.
-    fn replace_handle(self, rights: Rights) -> Result<Self, Status> {
-        <Self as Into<Handle>>::into(self)
-            .replace(rights).map(|handle| Self::from(handle))
-    }
-
-    /// Converts the value into its inner handle.
-    ///
-    /// This is a convenience function which simply forwards to the `Into` trait.
-    fn into_handle(self) -> Handle {
-        self.into()
-    }
-
-    /// Converts the handle into it's raw representation.
-    ///
-    /// The caller takes ownership over the raw handle, and must close or transfer it to avoid a handle leak.
-    fn into_raw(self) -> sys::zx_handle_t {
-        let h = self.into_handle();
-        let r = h.0;
-        mem::forget(h);
-        r
-   }
-
-    /// Creates an instance of this type from a handle.
-    ///
-    /// This is a convenience function which simply forwards to the `From` trait.
-    fn from_handle(handle: Handle) -> Self {
-        Self::from(handle)
-    }
-
-    /// Creates an instance of another handle-based type from this value's inner handle.
-    fn into_handle_based<H: HandleBased>(self) -> H {
-        H::from_handle(self.into_handle())
-    }
-
-    /// Creates an instance of this type from the inner handle of another
-    /// handle-based type.
-    fn from_handle_based<H: HandleBased>(h: H) -> Self {
-        Self::from_handle(h.into_handle())
-    }
-}
-
-/// A trait implemented by all handles for objects which have a peer.
-pub trait Peered: HandleBased {
-    /// Set and clear userspace-accessible signal bits on the object's peer. Wraps the
-    /// [zx_object_signal_peer](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_signal.md)
-    /// syscall.
-    fn signal_peer(&self, clear_mask: Signals, set_mask: Signals) -> Result<(), Status> {
-        let handle = self.as_handle_ref().handle;
-        let status = unsafe {
-            sys::zx_object_signal_peer(handle, clear_mask.bits(), set_mask.bits())
-        };
-        ok(status)
-    }
-}
-
-/// A trait implemented by all handles for objects which can have a cookie attached.
-pub trait Cookied: HandleBased {
-    /// Get the cookie attached to this object, if any. Wraps the
-    /// [zx_object_get_cookie](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/object_get_cookie.md)
-    /// syscall.
-    fn get_cookie(&self, scope: &HandleRef) -> Result<u64, Status> {
-        let handle = self.as_handle_ref().handle;
-        let mut cookie = 0;
-        let status = unsafe { sys::zx_object_get_cookie(handle, scope.handle, &mut cookie) };
-        ok(status).map(|()| cookie)
-    }
-
-    /// Attach an opaque cookie to this object with the given scope. The cookie may be read or
-    /// changed in future only with the same scope. Wraps the
-    /// [zx_object_set_cookie](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/object_set_cookie.md)
-    /// syscall.
-    fn set_cookie(&self, scope: &HandleRef, cookie: u64) -> Result<(), Status> {
-        let handle = self.as_handle_ref().handle;
-        let status = unsafe { sys::zx_object_set_cookie(handle, scope.handle, cookie) };
-        ok(status)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/job.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/job.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/job.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/job.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon job.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef};
-
-/// An object representing a Zircon job.
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Job(Handle);
-impl_handle_based!(Job);
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,365 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon kernel
-//! [syscalls](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls.md).
-
-#![deny(warnings)]
-
-#[macro_use]
-extern crate bitflags;
-
-pub extern crate fuchsia_zircon_sys as sys;
-
-#[deprecated(note="use fuchsia_zircon::sys::ZX_CPRNG_DRAW_MAX_LEN instead")]
-#[doc(hidden)]
-pub use sys::ZX_CPRNG_DRAW_MAX_LEN;
-
-// Implements the HandleBased traits for a Handle newtype struct
-macro_rules! impl_handle_based {
-    ($type_name:path) => {
-        impl AsHandleRef for $type_name {
-            fn as_handle_ref(&self) -> HandleRef {
-                self.0.as_handle_ref()
-            }
-        }
-
-        impl From<Handle> for $type_name {
-            fn from(handle: Handle) -> Self {
-                $type_name(handle)
-            }
-        }
-
-        impl From<$type_name> for Handle {
-            fn from(x: $type_name) -> Handle {
-                x.0
-            }
-        }
-
-        impl HandleBased for $type_name {}
-    }
-}
-
-// Creates associated constants of TypeName of the form
-// `pub const NAME: TypeName = TypeName(value);`
-macro_rules! assoc_consts {
-    ($typename:ident, [$($name:ident = $num:expr;)*]) => {
-        #[allow(non_upper_case_globals)]
-        impl $typename {
-            $(
-                pub const $name: $typename = $typename($num);
-            )*
-        }
-    }
-}
-
-mod channel;
-mod cprng;
-mod event;
-mod eventpair;
-mod fifo;
-mod handle;
-mod job;
-mod port;
-mod process;
-mod rights;
-mod socket;
-mod signals;
-mod status;
-mod time;
-mod thread;
-mod vmar;
-mod vmo;
-
-pub use channel::*;
-pub use cprng::*;
-pub use event::*;
-pub use eventpair::*;
-pub use fifo::*;
-pub use handle::*;
-pub use job::*;
-pub use port::*;
-pub use process::*;
-pub use rights::*;
-pub use socket::*;
-pub use signals::*;
-pub use status::*;
-pub use thread::*;
-pub use time::*;
-pub use vmar::*;
-pub use vmo::*;
-
-/// Prelude containing common utility traits.
-/// Designed for use like `use fuchsia_zircon::prelude::*;`
-pub mod prelude {
-    pub use {
-        AsHandleRef,
-        Cookied,
-        DurationNum,
-        HandleBased,
-        Peered,
-    };
-}
-
-/// Convenience re-export of `Status::ok`.
-pub fn ok(raw: sys::zx_status_t) -> Result<(), Status> {
-    Status::ok(raw)
-}
-
-/// A "wait item" containing a handle reference and information about what signals
-/// to wait on, and, on return from `object_wait_many`, which are pending.
-#[repr(C)]
-#[derive(Debug)]
-pub struct WaitItem<'a> {
-    /// The handle to wait on.
-    pub handle: HandleRef<'a>,
-    /// A set of signals to wait for.
-    pub waitfor: Signals,
-    /// The set of signals pending, on return of `object_wait_many`.
-    pub pending: Signals,
-}
-
-/// An identifier to select a particular clock. See
-/// [zx_time_get](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/time_get.md)
-/// for more information about the possible values.
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum ClockId {
-    /// The number of nanoseconds since the system was powered on. Corresponds to
-    /// `ZX_CLOCK_MONOTONIC`.
-    Monotonic = 0,
-    /// The number of wall clock nanoseconds since the Unix epoch (midnight on January 1 1970) in
-    /// UTC. Corresponds to ZX_CLOCK_UTC.
-    UTC = 1,
-    /// The number of nanoseconds the current thread has been running for. Corresponds to
-    /// ZX_CLOCK_THREAD.
-    Thread = 2,
-}
-
-/// Wait on multiple handles.
-/// The success return value is a bool indicating whether one or more of the
-/// provided handle references was closed during the wait.
-///
-/// Wraps the
-/// [zx_object_wait_many](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_wait_many.md)
-/// syscall.
-pub fn object_wait_many(items: &mut [WaitItem], deadline: Time) -> Result<bool, Status>
-{
-    let len = try!(usize_into_u32(items.len()).map_err(|_| Status::OUT_OF_RANGE));
-    let items_ptr = items.as_mut_ptr() as *mut sys::zx_wait_item_t;
-    let status = unsafe { sys::zx_object_wait_many( items_ptr, len, deadline.nanos()) };
-    if status == sys::ZX_ERR_CANCELED {
-        return Ok(true)
-    }
-    ok(status).map(|()| false)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[allow(unused_imports)]
-    use super::prelude::*;
-
-    #[test]
-    fn monotonic_time_increases() {
-        let time1 = Time::get(ClockId::Monotonic);
-        1_000.nanos().sleep();
-        let time2 = Time::get(ClockId::Monotonic);
-        assert!(time2 > time1);
-    }
-
-    #[test]
-    fn utc_time_increases() {
-        let time1 = Time::get(ClockId::UTC);
-        1_000.nanos().sleep();
-        let time2 = Time::get(ClockId::UTC);
-        assert!(time2 > time1);
-    }
-
-    #[test]
-    fn thread_time_increases() {
-        let time1 = Time::get(ClockId::Thread);
-        1_000.nanos().sleep();
-        let time2 = Time::get(ClockId::Thread);
-        assert!(time2 > time1);
-    }
-
-    #[test]
-    fn ticks_increases() {
-        let ticks1 = ticks_get();
-        1_000.nanos().sleep();
-        let ticks2 = ticks_get();
-        assert!(ticks2 > ticks1);
-    }
-
-    #[test]
-    fn tick_length() {
-        let sleep_time = 1.milli();
-        let ticks1 = ticks_get();
-        sleep_time.sleep();
-        let ticks2 = ticks_get();
-
-        // The number of ticks should have increased by at least 1 ms worth
-        let sleep_ticks = sleep_time.millis() * ticks_per_second() / 1000;
-        assert!(ticks2 >= (ticks1 + sleep_ticks));
-    }
-
-    #[test]
-    fn into_raw() {
-        let vmo = Vmo::create(1).unwrap();
-        let h = vmo.into_raw();
-        let vmo2 = Vmo::from(unsafe { Handle::from_raw(h) });
-        assert!(vmo2.write(b"1", 0).is_ok());
-    }
-
-    #[test]
-    fn sleep() {
-        let sleep_ns = 1.millis();
-        let time1 = Time::get(ClockId::Monotonic);
-        sleep_ns.sleep();
-        let time2 = Time::get(ClockId::Monotonic);
-        assert!(time2 > time1 + sleep_ns);
-    }
-
-    /// Test duplication by means of a VMO
-    #[test]
-    fn duplicate() {
-        let hello_length: usize = 5;
-
-        // Create a VMO and write some data to it.
-        let vmo = Vmo::create(hello_length as u64).unwrap();
-        assert!(vmo.write(b"hello", 0).is_ok());
-
-        // Replace, reducing rights to read.
-        let readonly_vmo = vmo.duplicate_handle(Rights::READ).unwrap();
-        // Make sure we can read but not write.
-        let mut read_vec = vec![0; hello_length];
-        assert_eq!(readonly_vmo.read(&mut read_vec, 0).unwrap(), hello_length);
-        assert_eq!(read_vec, b"hello");
-        assert_eq!(readonly_vmo.write(b"", 0), Err(Status::ACCESS_DENIED));
-
-        // Write new data to the original handle, and read it from the new handle
-        assert!(vmo.write(b"bye", 0).is_ok());
-        assert_eq!(readonly_vmo.read(&mut read_vec, 0).unwrap(), hello_length);
-        assert_eq!(read_vec, b"byelo");
-    }
-
-    // Test replace by means of a VMO
-    #[test]
-    fn replace() {
-        let hello_length: usize = 5;
-
-        // Create a VMO and write some data to it.
-        let vmo = Vmo::create(hello_length as u64).unwrap();
-        assert!(vmo.write(b"hello", 0).is_ok());
-
-        // Replace, reducing rights to read.
-        let readonly_vmo = vmo.replace_handle(Rights::READ).unwrap();
-        // Make sure we can read but not write.
-        let mut read_vec = vec![0; hello_length];
-        assert_eq!(readonly_vmo.read(&mut read_vec, 0).unwrap(), hello_length);
-        assert_eq!(read_vec, b"hello");
-        assert_eq!(readonly_vmo.write(b"", 0), Err(Status::ACCESS_DENIED));
-    }
-
-    #[test]
-    fn wait_and_signal() {
-        let event = Event::create().unwrap();
-        let ten_ms = 10.millis();
-
-        // Waiting on it without setting any signal should time out.
-        assert_eq!(event.wait_handle(
-            Signals::USER_0, ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we set a signal, we should be able to wait for it.
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        assert_eq!(event.wait_handle(Signals::USER_0, ten_ms.after_now()).unwrap(),
-            Signals::USER_0);
-
-        // Should still work, signals aren't automatically cleared.
-        assert_eq!(event.wait_handle(Signals::USER_0, ten_ms.after_now()).unwrap(),
-            Signals::USER_0);
-
-        // Now clear it, and waiting should time out again.
-        assert!(event.signal_handle(Signals::USER_0, Signals::NONE).is_ok());
-        assert_eq!(event.wait_handle(
-            Signals::USER_0, ten_ms.after_now()), Err(Status::TIMED_OUT));
-    }
-
-    #[test]
-    fn wait_many_and_signal() {
-        let ten_ms = 10.millis();
-        let e1 = Event::create().unwrap();
-        let e2 = Event::create().unwrap();
-
-        // Waiting on them now should time out.
-        let mut items = vec![
-          WaitItem { handle: e1.as_handle_ref(), waitfor: Signals::USER_0, pending: Signals::NONE },
-          WaitItem { handle: e2.as_handle_ref(), waitfor: Signals::USER_1, pending: Signals::NONE },
-        ];
-        assert_eq!(object_wait_many(&mut items, ten_ms.after_now()), Err(Status::TIMED_OUT));
-        assert_eq!(items[0].pending, Signals::NONE);
-        assert_eq!(items[1].pending, Signals::NONE);
-
-        // Signal one object and it should return success.
-        assert!(e1.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        assert!(object_wait_many(&mut items, ten_ms.after_now()).is_ok());
-        assert_eq!(items[0].pending, Signals::USER_0);
-        assert_eq!(items[1].pending, Signals::NONE);
-
-        // Signal the other and it should return both.
-        assert!(e2.signal_handle(Signals::NONE, Signals::USER_1).is_ok());
-        assert!(object_wait_many(&mut items, ten_ms.after_now()).is_ok());
-        assert_eq!(items[0].pending, Signals::USER_0);
-        assert_eq!(items[1].pending, Signals::USER_1);
-
-        // Clear signals on both; now it should time out again.
-        assert!(e1.signal_handle(Signals::USER_0, Signals::NONE).is_ok());
-        assert!(e2.signal_handle(Signals::USER_1, Signals::NONE).is_ok());
-        assert_eq!(object_wait_many(&mut items, ten_ms.after_now()), Err(Status::TIMED_OUT));
-        assert_eq!(items[0].pending, Signals::NONE);
-        assert_eq!(items[1].pending, Signals::NONE);
-    }
-
-    #[test]
-    fn cookies() {
-        let event = Event::create().unwrap();
-        let scope = Event::create().unwrap();
-
-        // Getting a cookie when none has been set should fail.
-        assert_eq!(event.get_cookie(&scope.as_handle_ref()), Err(Status::ACCESS_DENIED));
-
-        // Set a cookie.
-        assert_eq!(event.set_cookie(&scope.as_handle_ref(), 42), Ok(()));
-
-        // Should get it back....
-        assert_eq!(event.get_cookie(&scope.as_handle_ref()), Ok(42));
-
-        // but not with the wrong scope!
-        assert_eq!(event.get_cookie(&event.as_handle_ref()), Err(Status::ACCESS_DENIED));
-
-        // Can change it, with the same scope...
-        assert_eq!(event.set_cookie(&scope.as_handle_ref(), 123), Ok(()));
-
-        // but not with a different scope.
-        assert_eq!(event.set_cookie(&event.as_handle_ref(), 123), Err(Status::ACCESS_DENIED));
-    }
-}
-
-pub fn usize_into_u32(n: usize) -> Result<u32, ()> {
-    if n > ::std::u32::MAX as usize || n < ::std::u32::MIN as usize {
-        return Err(())
-    }
-    Ok(n as u32)
-}
-
-pub fn size_to_u32_sat(n: usize) -> u32 {
-    if n > ::std::u32::MAX as usize {
-        return ::std::u32::MAX;
-    }
-    if n < ::std::u32::MIN as usize {
-        return ::std::u32::MIN;
-    }
-    n as u32
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/port.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/port.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/port.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/port.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,344 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon port objects.
-
-use std::mem;
-
-use {AsHandleRef, HandleBased, Handle, HandleRef, Signals, Status, Time};
-use {sys, ok};
-
-/// An object representing a Zircon
-/// [port](https://fuchsia.googlesource.com/zircon/+/master/docs/objects/port.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Port(Handle);
-impl_handle_based!(Port);
-
-/// A packet sent through a port. This is a type-safe wrapper for
-/// [zx_port_packet_t](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_wait.md).
-#[derive(PartialEq, Eq, Debug)]
-pub struct Packet(sys::zx_port_packet_t);
-
-/// The contents of a `Packet`.
-#[derive(Debug, Copy, Clone)]
-pub enum PacketContents {
-    /// A user-generated packet.
-    User(UserPacket),
-    /// A one-shot signal packet generated via `object_wait_async`.
-    SignalOne(SignalPacket),
-    /// A repeating signal packet generated via `object_wait_async`.
-    SignalRep(SignalPacket),
-
-    #[doc(hidden)]
-    __Nonexhaustive
-}
-
-/// Contents of a user packet (one sent by `port_queue`). This is a type-safe wrapper for
-/// [zx_packet_user_t](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_wait.md).
-#[derive(Debug, Copy, Clone)]
-pub struct UserPacket(sys::zx_packet_user_t);
-
-/// Contents of a signal packet (one generated by the kernel). This is a type-safe wrapper for
-/// [zx_packet_signal_t](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_wait.md).
-#[derive(Debug, Copy, Clone)]
-pub struct SignalPacket(sys::zx_packet_signal_t);
-
-impl Packet {
-    /// Creates a new packet with `UserPacket` data.
-    pub fn from_user_packet(key: u64, status: i32, user: UserPacket) -> Packet {
-        Packet(
-            sys::zx_port_packet_t {
-                key: key,
-                packet_type: sys::zx_packet_type_t::ZX_PKT_TYPE_USER,
-                status: status,
-                union: user.0,
-            }
-        )
-    }
-
-    /// The packet's key.
-    pub fn key(&self) -> u64 {
-        self.0.key
-    }
-
-    /// The packet's status.
-    // TODO: should this type be wrapped?
-    pub fn status(&self) -> i32 {
-        self.0.status
-    }
-
-    /// The contents of the packet.
-    pub fn contents(&self) -> PacketContents {
-        if self.0.packet_type == sys::zx_packet_type_t::ZX_PKT_TYPE_USER {
-            PacketContents::User(UserPacket(self.0.union))
-        } else if self.0.packet_type == sys::zx_packet_type_t::ZX_PKT_TYPE_SIGNAL_ONE {
-            PacketContents::SignalOne(SignalPacket(unsafe { mem::transmute_copy(&self.0.union) }))
-        } else if self.0.packet_type == sys::zx_packet_type_t::ZX_PKT_TYPE_SIGNAL_REP {
-            PacketContents::SignalRep(SignalPacket(unsafe { mem::transmute_copy(&self.0.union) }))
-        } else {
-            panic!("unexpected packet type");
-        }
-    }
-}
-
-impl UserPacket {
-    pub fn from_u8_array(val: [u8; 32]) -> UserPacket {
-        UserPacket(val)
-    }
-
-    pub fn as_u8_array(&self) -> &[u8; 32] {
-        &self.0
-    }
-
-    pub fn as_mut_u8_array(&mut self) -> &mut [u8; 32] {
-        &mut self.0
-    }
-}
-
-impl SignalPacket {
-    /// The signals used in the call to `object_wait_async`.
-    pub fn trigger(&self) -> Signals {
-        Signals::from_bits_truncate(self.0.trigger)
-    }
-
-    /// The observed signals.
-    pub fn observed(&self) -> Signals {
-        Signals::from_bits_truncate(self.0.observed)
-    }
-
-    /// A per object count of pending operations.
-    pub fn count(&self) -> u64 {
-        self.0.count
-    }
-}
-
-impl Port {
-    /// Create an IO port, allowing IO packets to be read and enqueued.
-    ///
-    /// Wraps the
-    /// [zx_port_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_create.md)
-    /// syscall.
-    pub fn create() -> Result<Port, Status> {
-        unsafe {
-            let mut handle = 0;
-            let opts = 0;
-            let status = sys::zx_port_create(opts, &mut handle);
-            ok(status)?;
-            Ok(Handle::from_raw(handle).into())
-        }
-    }
-
-    /// Attempt to queue a user packet to the IO port.
-    ///
-    /// Wraps the
-    /// [zx_port_queue](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_queue.md)
-    /// syscall.
-    pub fn queue(&self, packet: &Packet) -> Result<(), Status> {
-        let status = unsafe {
-            sys::zx_port_queue(self.raw_handle(),
-                &packet.0 as *const sys::zx_port_packet_t, 0)
-        };
-        ok(status)
-    }
-
-    /// Wait for a packet to arrive on a (V2) port.
-    ///
-    /// Wraps the
-    /// [zx_port_wait](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_wait.md)
-    /// syscall.
-    pub fn wait(&self, deadline: Time) -> Result<Packet, Status> {
-        let mut packet = Default::default();
-        let status = unsafe {
-            sys::zx_port_wait(self.raw_handle(), deadline.nanos(),
-                &mut packet as *mut sys::zx_port_packet_t, 0)
-        };
-        ok(status)?;
-        Ok(Packet(packet))
-    }
-
-    /// Cancel pending wait_async calls for an object with the given key.
-    ///
-    /// Wraps the
-    /// [zx_port_cancel](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/port_cancel.md)
-    /// syscall.
-    pub fn cancel<H>(&self, source: &H, key: u64) -> Result<(), Status> where H: HandleBased {
-        let status = unsafe {
-            sys::zx_port_cancel(self.raw_handle(), source.raw_handle(), key)
-        };
-        ok(status)
-    }
-}
-
-/// Options for wait_async.
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum WaitAsyncOpts {
-    Once = sys::ZX_WAIT_ASYNC_ONCE,
-    Repeating = sys::ZX_WAIT_ASYNC_REPEATING,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use {DurationNum, Event};
-
-    #[test]
-    fn port_basic() {
-        let ten_ms = 10.millis();
-
-        let port = Port::create().unwrap();
-
-        // Waiting now should time out.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // Send a valid packet.
-        let packet = Packet::from_user_packet(
-            42,
-            123,
-            UserPacket::from_u8_array([13; 32]),
-        );
-        assert!(port.queue(&packet).is_ok());
-
-        // Waiting should succeed this time. We should get back the packet we sent.
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet, packet);
-    }
-
-    #[test]
-    fn wait_async_once() {
-        let ten_ms = 10.millis();
-        let key = 42;
-
-        let port = Port::create().unwrap();
-        let event = Event::create().unwrap();
-
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0 | Signals::USER_1,
-            WaitAsyncOpts::Once).is_ok());
-
-        // Waiting without setting any signal should time out.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we set a signal, we should be able to wait for it.
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalOne(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0 | Signals::USER_1);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Shouldn't get any more packets.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // Calling wait_async again should result in another packet.
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0, WaitAsyncOpts::Once).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalOne(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Calling wait_async_handle then cancel, we should not get a packet as cancel will
-        // remove it from  the queue.
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0, WaitAsyncOpts::Once).is_ok());
-        assert!(port.cancel(&event, key).is_ok());
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If the event is signalled after the cancel, we also shouldn't get a packet.
-        assert!(event.signal_handle(Signals::USER_0, Signals::NONE).is_ok());  // clear signal
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0, WaitAsyncOpts::Once).is_ok());
-        assert!(port.cancel(&event, key).is_ok());
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-    }
-
-    #[test]
-    fn wait_async_repeating() {
-        let ten_ms = 10.millis();
-        let key = 42;
-
-        let port = Port::create().unwrap();
-        let event = Event::create().unwrap();
-
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0 | Signals::USER_1,
-            WaitAsyncOpts::Repeating).is_ok());
-
-        // Waiting without setting any signal should time out.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we set a signal, we should be able to wait for it.
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalRep(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0 | Signals::USER_1);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Should not get any more packets, as ZX_WAIT_ASYNC_REPEATING is edge triggered rather than
-        // level triggered.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we clear and resignal, we should get the same packet again,
-        // even though we didn't call event.wait_async again.
-        assert!(event.signal_handle(Signals::USER_0, Signals::NONE).is_ok());  // clear signal
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalRep(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0 | Signals::USER_1);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Cancelling the wait should stop us getting packets...
-        assert!(port.cancel(&event, key).is_ok());
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-        // ... even if we clear and resignal
-        assert!(event.signal_handle(Signals::USER_0, Signals::NONE).is_ok());  // clear signal
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // Calling wait_async again should result in another packet.
-        assert!(event.wait_async_handle(
-            &port, key, Signals::USER_0, WaitAsyncOpts::Repeating).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalRep(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Closing the handle should stop us getting packets.
-        drop(event);
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/process.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/process.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/process.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/process.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon process.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef};
-
-/// An object representing a Zircon process.
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Process(Handle);
-impl_handle_based!(Process);
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/rights.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/rights.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/rights.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/rights.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-use sys;
-
-bitflags! {
-    /// Rights associated with a handle.
-    ///
-    /// See [rights.md](https://fuchsia.googlesource.com/zircon/+/master/docs/rights.md)
-    /// for more information.
-    #[repr(C)]
-    pub struct Rights: sys::zx_rights_t {
-        const NONE         = sys::ZX_RIGHT_NONE;
-        const DUPLICATE    = sys::ZX_RIGHT_DUPLICATE;
-        const TRANSFER     = sys::ZX_RIGHT_TRANSFER;
-        const READ         = sys::ZX_RIGHT_READ;
-        const WRITE        = sys::ZX_RIGHT_WRITE;
-        const EXECUTE      = sys::ZX_RIGHT_EXECUTE;
-        const MAP          = sys::ZX_RIGHT_MAP;
-        const GET_PROPERTY = sys::ZX_RIGHT_GET_PROPERTY;
-        const SET_PROPERTY = sys::ZX_RIGHT_SET_PROPERTY;
-        const ENUMERATE    = sys::ZX_RIGHT_ENUMERATE;
-        const DESTROY      = sys::ZX_RIGHT_DESTROY;
-        const SET_POLICY   = sys::ZX_RIGHT_SET_POLICY;
-        const GET_POLICY   = sys::ZX_RIGHT_GET_POLICY;
-        const SIGNAL       = sys::ZX_RIGHT_SIGNAL;
-        const SIGNAL_PEER  = sys::ZX_RIGHT_SIGNAL_PEER;
-        const WAIT         = sys::ZX_RIGHT_WAIT;
-        const SAME_RIGHTS  = sys::ZX_RIGHT_SAME_RIGHTS;
-    }
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/signals.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/signals.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/signals.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/signals.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-use sys::*;
-
-bitflags! {
-    /// Signals that can be waited upon.
-    ///
-    /// See
-    /// [Objects and signals](https://fuchsia.googlesource.com/zircon/+/master/docs/concepts.md#Objects-and-Signals)
-    /// in the Zircon kernel documentation. Note: the names of signals are still in flux.
-    #[repr(C)]
-    pub struct Signals: zx_signals_t {
-        const NONE          = ZX_SIGNAL_NONE;
-        const OBJECT_ALL    = ZX_OBJECT_SIGNAL_ALL;
-        const USER_ALL      = ZX_USER_SIGNAL_ALL;
-        const OBJECT_0      = ZX_OBJECT_SIGNAL_0;
-        const OBJECT_1      = ZX_OBJECT_SIGNAL_1;
-        const OBJECT_2      = ZX_OBJECT_SIGNAL_2;
-        const OBJECT_3      = ZX_OBJECT_SIGNAL_3;
-        const OBJECT_4      = ZX_OBJECT_SIGNAL_4;
-        const OBJECT_5      = ZX_OBJECT_SIGNAL_5;
-        const OBJECT_6      = ZX_OBJECT_SIGNAL_6;
-        const OBJECT_7      = ZX_OBJECT_SIGNAL_7;
-        const OBJECT_8      = ZX_OBJECT_SIGNAL_8;
-        const OBJECT_9      = ZX_OBJECT_SIGNAL_9;
-        const OBJECT_10     = ZX_OBJECT_SIGNAL_10;
-        const OBJECT_11     = ZX_OBJECT_SIGNAL_11;
-        const OBJECT_12     = ZX_OBJECT_SIGNAL_12;
-        const OBJECT_13     = ZX_OBJECT_SIGNAL_13;
-        const OBJECT_14     = ZX_OBJECT_SIGNAL_14;
-        const OBJECT_15     = ZX_OBJECT_SIGNAL_15;
-        const OBJECT_16     = ZX_OBJECT_SIGNAL_16;
-        const OBJECT_17     = ZX_OBJECT_SIGNAL_17;
-        const OBJECT_18     = ZX_OBJECT_SIGNAL_18;
-        const OBJECT_19     = ZX_OBJECT_SIGNAL_19;
-        const OBJECT_20     = ZX_OBJECT_SIGNAL_20;
-        const OBJECT_21     = ZX_OBJECT_SIGNAL_21;
-        const OBJECT_22     = ZX_OBJECT_SIGNAL_22;
-        const OBJECT_HANDLE_CLOSED = ZX_OBJECT_HANDLE_CLOSED;
-        const USER_0        = ZX_USER_SIGNAL_0;
-        const USER_1        = ZX_USER_SIGNAL_1;
-        const USER_2        = ZX_USER_SIGNAL_2;
-        const USER_3        = ZX_USER_SIGNAL_3;
-        const USER_4        = ZX_USER_SIGNAL_4;
-        const USER_5        = ZX_USER_SIGNAL_5;
-        const USER_6        = ZX_USER_SIGNAL_6;
-        const USER_7        = ZX_USER_SIGNAL_7;
-
-        const OBJECT_READABLE    = ZX_OBJECT_READABLE;
-        const OBJECT_WRITABLE    = ZX_OBJECT_WRITABLE;
-        const OBJECT_PEER_CLOSED = ZX_OBJECT_PEER_CLOSED;
-
-        // Cancelation (handle was closed while waiting with it)
-        const HANDLE_CLOSED = ZX_SIGNAL_HANDLE_CLOSED;
-
-        // Event
-        const EVENT_SIGNALED = ZX_EVENT_SIGNALED;
-
-        // EventPair
-        const EVENT_PAIR_SIGNALED = ZX_EPAIR_SIGNALED;
-        const EVENT_PAIR_CLOSED   = ZX_EPAIR_CLOSED;
-
-        // Task signals (process, thread, job)
-        const TASK_TERMINATED = ZX_TASK_TERMINATED;
-
-        // Channel
-        const CHANNEL_READABLE    = ZX_CHANNEL_READABLE;
-        const CHANNEL_WRITABLE    = ZX_CHANNEL_WRITABLE;
-        const CHANNEL_PEER_CLOSED = ZX_CHANNEL_PEER_CLOSED;
-
-        // Socket
-        const SOCKET_READABLE    = ZX_SOCKET_READABLE;
-        const SOCKET_WRITABLE    = ZX_SOCKET_WRITABLE;
-        const SOCKET_PEER_CLOSED = ZX_SOCKET_PEER_CLOSED;
-
-        // Port
-        const PORT_READABLE = ZX_PORT_READABLE;
-
-        // Resource
-        const RESOURCE_DESTROYED   = ZX_RESOURCE_DESTROYED;
-        const RESOURCE_READABLE    = ZX_RESOURCE_READABLE;
-        const RESOURCE_WRITABLE    = ZX_RESOURCE_WRITABLE;
-        const RESOURCE_CHILD_ADDED = ZX_RESOURCE_CHILD_ADDED;
-
-        // Fifo
-        const FIFO_READABLE    = ZX_FIFO_READABLE;
-        const FIFO_WRITABLE    = ZX_FIFO_WRITABLE;
-        const FIFO_PEER_CLOSED = ZX_FIFO_PEER_CLOSED;
-
-        // Job
-        const JOB_NO_PROCESSES = ZX_JOB_NO_PROCESSES;
-        const JOB_NO_JOBS      = ZX_JOB_NO_JOBS;
-
-        // Process
-        const PROCESS_TERMINATED = ZX_PROCESS_TERMINATED;
-
-        // Thread
-        const THREAD_TERMINATED = ZX_THREAD_TERMINATED;
-
-        // Log
-        const LOG_READABLE = ZX_LOG_READABLE;
-        const LOG_WRITABLE = ZX_LOG_WRITABLE;
-
-        // Timer
-        const TIMER_SIGNALED = ZX_TIMER_SIGNALED;
-    }
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/socket.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/socket.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/socket.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/socket.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon sockets.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef, Peered};
-use {sys, Status, ok};
-
-use std::ptr;
-
-/// An object representing a Zircon
-/// [socket](https://fuchsia.googlesource.com/zircon/+/master/docs/concepts.md#Message-Passing_Sockets-and-Channels).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Socket(Handle);
-impl_handle_based!(Socket);
-impl Peered for Socket {}
-
-impl Socket {
-    /// Create a socket, accessed through a pair of endpoints. Data written
-    /// into one may be read from the other.
-    ///
-    /// Wraps
-    /// [zx_socket_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/socket_create.md).
-    pub fn create() -> Result<(Socket, Socket), Status> {
-        unsafe {
-            let mut out0 = 0;
-            let mut out1 = 0;
-            let opts = 0;
-            let status = sys::zx_socket_create(opts, &mut out0, &mut out1);
-            ok(status)?;
-            Ok((
-                Self::from(Handle::from_raw(out0)),
-                Self::from(Handle::from_raw(out1))
-            ))
-        }
-    }
-
-    /// Write the given bytes into the socket.
-    /// Return value (on success) is number of bytes actually written.
-    ///
-    /// Wraps
-    /// [zx_socket_write](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/socket_write.md).
-    pub fn write(&self, bytes: &[u8]) -> Result<usize, Status> {
-        let mut actual = 0;
-        let opts = 0;
-        let status = unsafe {
-            sys::zx_socket_write(self.raw_handle(), opts, bytes.as_ptr(), bytes.len(),
-                &mut actual)
-        };
-        ok(status).map(|()| actual)
-    }
-
-    /// Read the given bytes from the socket.
-    /// Return value (on success) is number of bytes actually read.
-    ///
-    /// Wraps
-    /// [zx_socket_read](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/socket_read.md).
-    pub fn read(&self, bytes: &mut [u8]) -> Result<usize, Status> {
-        let mut actual = 0;
-        let opts = 0;
-        let status = unsafe {
-            sys::zx_socket_read(self.raw_handle(), opts, bytes.as_mut_ptr(),
-                bytes.len(), &mut actual)
-        };
-        ok(status)
-            .map(|()| actual)
-            .map_err(|status| {
-                // If an error is returned then actual is undefined, so to be safe
-                // we set it to 0 and ignore any data that is set in bytes.
-                actual = 0;
-                status
-            })
-    }
-
-    /// Close half of the socket, so attempts by the other side to write will fail.
-    ///
-    /// Implements the `ZX_SOCKET_HALF_CLOSE` option of
-    /// [zx_socket_write](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/socket_write.md).
-    pub fn half_close(&self) -> Result<(), Status> {
-        let status = unsafe { sys::zx_socket_write(self.raw_handle(), sys::ZX_SOCKET_HALF_CLOSE,
-            ptr::null(), 0, ptr::null_mut()) };
-        ok(status)
-    }
-
-    pub fn outstanding_read_bytes(&self) -> Result<usize, Status> {
-        let mut outstanding = 0;
-        let status = unsafe {
-            sys::zx_socket_read(self.raw_handle(), 0, ptr::null_mut(), 0, &mut outstanding)
-        };
-        ok(status).map(|()| outstanding)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn socket_basic() {
-        let (s1, s2) = Socket::create().unwrap();
-
-        // Write in one end and read it back out the other.
-        assert_eq!(s1.write(b"hello").unwrap(), 5);
-
-        let mut read_vec = vec![0; 8];
-        assert_eq!(s2.read(&mut read_vec).unwrap(), 5);
-        assert_eq!(&read_vec[0..5], b"hello");
-
-        // Try reading when there is nothing to read.
-        assert_eq!(s2.read(&mut read_vec), Err(Status::SHOULD_WAIT));
-
-        // Close the socket from one end.
-        assert!(s1.half_close().is_ok());
-        assert_eq!(s2.read(&mut read_vec), Err(Status::BAD_STATE));
-        assert_eq!(s1.write(b"fail"), Err(Status::BAD_STATE));
-
-        // Writing in the other direction should still work.
-        assert_eq!(s1.read(&mut read_vec), Err(Status::SHOULD_WAIT));
-        assert_eq!(s2.write(b"back").unwrap(), 4);
-        assert_eq!(s1.read(&mut read_vec).unwrap(), 4);
-        assert_eq!(&read_vec[0..4], b"back");
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/status.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/status.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/status.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/status.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-use std::ffi::NulError;
-use std::io;
-use sys;
-
-/// Status type indicating the result of a Fuchsia syscall.
-///
-/// This type is generally used to indicate the reason for an error.
-/// While this type can contain `Status::OK` (`ZX_OK` in C land), elements of this type are
-/// generally constructed using the `ok` method, which checks for `ZX_OK` and returns a
-/// `Result<(), Status>` appropriately.
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
-pub struct Status(sys::zx_status_t);
-impl Status {
-    /// Returns `Ok(())` if the status was `OK`,
-    /// otherwise returns `Err(status)`.
-    pub fn ok(raw: sys::zx_status_t) -> Result<(), Status> {
-        if raw == Status::OK.0 {
-            Ok(())
-        } else {
-            Err(Status(raw))
-        }
-    }
-
-    pub fn from_raw(raw: sys::zx_status_t) -> Self {
-        Status(raw)
-    }
-
-    pub fn into_raw(self) -> sys::zx_status_t {
-        self.0
-    }
-}
-assoc_consts!(Status, [
-    OK                 = sys::ZX_OK;
-    INTERNAL           = sys::ZX_ERR_INTERNAL;
-    NOT_SUPPORTED      = sys::ZX_ERR_NOT_SUPPORTED;
-    NO_RESOURCES       = sys::ZX_ERR_NO_RESOURCES;
-    NO_MEMORY          = sys::ZX_ERR_NO_MEMORY;
-    CALL_FAILED        = sys::ZX_ERR_CALL_FAILED;
-    INTERRUPTED_RETRY  = sys::ZX_ERR_INTERRUPTED_RETRY;
-    INVALID_ARGS       = sys::ZX_ERR_INVALID_ARGS;
-    BAD_HANDLE         = sys::ZX_ERR_BAD_HANDLE;
-    WRONG_TYPE         = sys::ZX_ERR_WRONG_TYPE;
-    BAD_SYSCALL        = sys::ZX_ERR_BAD_SYSCALL;
-    OUT_OF_RANGE       = sys::ZX_ERR_OUT_OF_RANGE;
-    BUFFER_TOO_SMALL   = sys::ZX_ERR_BUFFER_TOO_SMALL;
-    BAD_STATE          = sys::ZX_ERR_BAD_STATE;
-    TIMED_OUT          = sys::ZX_ERR_TIMED_OUT;
-    SHOULD_WAIT        = sys::ZX_ERR_SHOULD_WAIT;
-    CANCELED           = sys::ZX_ERR_CANCELED;
-    PEER_CLOSED        = sys::ZX_ERR_PEER_CLOSED;
-    NOT_FOUND          = sys::ZX_ERR_NOT_FOUND;
-    ALREADY_EXISTS     = sys::ZX_ERR_ALREADY_EXISTS;
-    ALREADY_BOUND      = sys::ZX_ERR_ALREADY_BOUND;
-    UNAVAILABLE        = sys::ZX_ERR_UNAVAILABLE;
-    ACCESS_DENIED      = sys::ZX_ERR_ACCESS_DENIED;
-    IO                 = sys::ZX_ERR_IO;
-    IO_REFUSED         = sys::ZX_ERR_IO_REFUSED;
-    IO_DATA_INTEGRITY  = sys::ZX_ERR_IO_DATA_INTEGRITY;
-    IO_DATA_LOSS       = sys::ZX_ERR_IO_DATA_LOSS;
-    BAD_PATH           = sys::ZX_ERR_BAD_PATH;
-    NOT_DIR            = sys::ZX_ERR_NOT_DIR;
-    NOT_FILE           = sys::ZX_ERR_NOT_FILE;
-    FILE_BIG           = sys::ZX_ERR_FILE_BIG;
-    NO_SPACE           = sys::ZX_ERR_NO_SPACE;
-    STOP               = sys::ZX_ERR_STOP;
-    NEXT               = sys::ZX_ERR_NEXT;
-]);
-
-impl Status {
-    pub fn into_io_error(self) -> io::Error {
-        self.into()
-    }
-}
-
-impl From<io::ErrorKind> for Status {
-    fn from(kind: io::ErrorKind) -> Self {
-        use std::io::ErrorKind::*;
-        match kind {
-            NotFound => Status::NOT_FOUND,
-            PermissionDenied => Status::ACCESS_DENIED,
-            ConnectionRefused => Status::IO_REFUSED,
-            ConnectionAborted => Status::PEER_CLOSED,
-            AddrInUse => Status::ALREADY_BOUND,
-            AddrNotAvailable => Status::UNAVAILABLE,
-            BrokenPipe => Status::PEER_CLOSED,
-            AlreadyExists => Status::ALREADY_EXISTS,
-            WouldBlock => Status::SHOULD_WAIT,
-            InvalidInput => Status::INVALID_ARGS,
-            TimedOut => Status::TIMED_OUT,
-            Interrupted => Status::INTERRUPTED_RETRY,
-            UnexpectedEof |
-            WriteZero |
-            ConnectionReset |
-            NotConnected |
-            Other | _ => Status::IO,
-        }
-    }
-}
-
-impl From<Status> for io::ErrorKind {
-    fn from(status: Status) -> io::ErrorKind {
-        use std::io::ErrorKind::*;
-        match status {
-            Status::INTERRUPTED_RETRY => Interrupted,
-            Status::BAD_HANDLE => BrokenPipe,
-            Status::TIMED_OUT => TimedOut,
-            Status::SHOULD_WAIT => WouldBlock,
-            Status::PEER_CLOSED => ConnectionAborted,
-            Status::NOT_FOUND => NotFound,
-            Status::ALREADY_EXISTS => AlreadyExists,
-            Status::ALREADY_BOUND => AlreadyExists,
-            Status::UNAVAILABLE => AddrNotAvailable,
-            Status::ACCESS_DENIED => PermissionDenied,
-            Status::IO_REFUSED => ConnectionRefused,
-            Status::IO_DATA_INTEGRITY => InvalidData,
-
-            Status::BAD_PATH |
-            Status::INVALID_ARGS |
-            Status::OUT_OF_RANGE |
-            Status::WRONG_TYPE => InvalidInput,
-
-            Status::OK |
-            Status::NEXT |
-            Status::STOP |
-            Status::NO_SPACE |
-            Status::FILE_BIG |
-            Status::NOT_FILE |
-            Status::NOT_DIR |
-            Status::IO_DATA_LOSS |
-            Status::IO |
-            Status::CANCELED |
-            Status::BAD_STATE |
-            Status::BUFFER_TOO_SMALL |
-            Status::BAD_SYSCALL |
-            Status::INTERNAL |
-            Status::NOT_SUPPORTED |
-            Status::NO_RESOURCES |
-            Status::NO_MEMORY |
-            Status::CALL_FAILED |
-            _ => Other,
-        }
-    }
-}
-
-impl From<io::Error> for Status {
-    fn from(err: io::Error) -> Status {
-        err.kind().into()
-    }
-}
-
-impl From<Status> for io::Error {
-    fn from(status: Status) -> io::Error {
-        io::Error::from(io::ErrorKind::from(status))
-    }
-}
-
-impl From<NulError> for Status {
-    fn from(_error: NulError) -> Status {
-        Status::INVALID_ARGS
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/thread.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/thread.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/thread.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/thread.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon thread.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef};
-
-/// An object representing a Zircon thread.
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Thread(Handle);
-impl_handle_based!(Thread);
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/time.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/time.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/time.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/time.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon timer objects.
-
-use {AsHandleRef, ClockId, HandleBased, Handle, HandleRef, Status};
-use {sys, ok};
-use std::ops;
-use std::time as stdtime;
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct Duration(sys::zx_duration_t);
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct Time(sys::zx_time_t);
-
-impl From<stdtime::Duration> for Duration {
-    fn from(dur: stdtime::Duration) -> Self {
-        Duration::from_seconds(dur.as_secs()) +
-        Duration::from_nanos(dur.subsec_nanos() as u64)
-    }
-}
-
-impl From<Duration> for stdtime::Duration {
-    fn from(dur: Duration) -> Self {
-        let secs = dur.seconds();
-        let nanos = (dur.nanos() - (secs * 1_000_000_000)) as u32;
-        stdtime::Duration::new(secs, nanos)
-    }
-}
-
-impl ops::Add<Duration> for Time {
-    type Output = Time;
-    fn add(self, dur: Duration) -> Time {
-        Time::from_nanos(dur.nanos() + self.nanos())
-    }
-}
-
-impl ops::Add<Time> for Duration {
-    type Output = Time;
-    fn add(self, time: Time) -> Time {
-        Time::from_nanos(self.nanos() + time.nanos())
-    }
-}
-
-impl ops::Add for Duration {
-    type Output = Duration;
-    fn add(self, dur: Duration) -> Duration {
-        Duration::from_nanos(self.nanos() + dur.nanos())
-    }
-}
-
-impl ops::Sub for Duration {
-    type Output = Duration;
-    fn sub(self, dur: Duration) -> Duration {
-        Duration::from_nanos(self.nanos() - dur.nanos())
-    }
-}
-
-impl ops::Sub<Duration> for Time {
-    type Output = Time;
-    fn sub(self, dur: Duration) -> Time {
-        Time::from_nanos(self.nanos() - dur.nanos())
-    }
-}
-
-impl ops::AddAssign for Duration {
-    fn add_assign(&mut self, dur: Duration) {
-        self.0 += dur.nanos()
-    }
-}
-
-impl ops::SubAssign for Duration {
-    fn sub_assign(&mut self, dur: Duration) {
-        self.0 -= dur.nanos()
-    }
-}
-
-impl ops::AddAssign<Duration> for Time {
-    fn add_assign(&mut self, dur: Duration) {
-        self.0 += dur.nanos()
-    }
-}
-
-impl ops::SubAssign<Duration> for Time {
-    fn sub_assign(&mut self, dur: Duration) {
-        self.0 -= dur.nanos()
-    }
-}
-
-impl<T> ops::Mul<T> for Duration
-    where T: Into<u64>
-{
-    type Output = Self;
-    fn mul(self, mul: T) -> Self {
-        Duration::from_nanos(self.0 * mul.into())
-    }
-}
-
-impl<T> ops::Div<T> for Duration
-    where T: Into<u64>
-{
-    type Output = Self;
-    fn div(self, div: T) -> Self {
-        Duration::from_nanos(self.0 / div.into())
-    }
-}
-
-impl Duration {
-    /// Sleep for the given amount of time.
-    pub fn sleep(self) {
-        Time::after(self).sleep()
-    }
-
-    pub fn nanos(self) -> u64 {
-        self.0
-    }
-
-    pub fn millis(self) -> u64 {
-        self.0 / 1_000_000
-    }
-
-    pub fn seconds(self) -> u64 {
-        self.millis() / 1_000
-    }
-
-    pub fn minutes(self) -> u64 {
-        self.seconds() / 60
-    }
-
-    pub fn hours(self) -> u64 {
-        self.minutes() / 60
-    }
-
-    pub fn from_nanos(nanos: u64) -> Self {
-        Duration(nanos)
-    }
-
-    pub fn from_millis(millis: u64) -> Self {
-        Duration(millis * 1_000_000)
-    }
-
-    pub fn from_seconds(secs: u64) -> Self {
-        Duration::from_millis(secs * 1_000)
-    }
-
-    pub fn from_minutes(min: u64) -> Self {
-        Duration::from_seconds(min * 60)
-    }
-
-    pub fn from_hours(hours: u64) -> Self {
-        Duration::from_minutes(hours * 60)
-    }
-
-    /// Returns a `Time` which is a `Duration` after the current time.
-    /// `duration.after_now()` is equivalent to `Time::after(duration)`.
-    pub fn after_now(self) -> Time {
-        Time::after(self)
-    }
-}
-
-pub trait DurationNum: Sized {
-    fn nanos(self) -> Duration;
-    fn millis(self) -> Duration;
-    fn seconds(self) -> Duration;
-    fn minutes(self) -> Duration;
-    fn hours(self) -> Duration;
-
-    // Singular versions to allow for `1.milli()` and `1.second()`, etc.
-    fn milli(self) -> Duration { self.millis() }
-    fn second(self) -> Duration { self.seconds() }
-    fn minute(self) -> Duration { self.minutes() }
-    fn hour(self) -> Duration { self.hours() }
-}
-
-// Note: this could be implemented for other unsized integer types, but it doesn't seem
-// necessary to support the usual case.
-impl DurationNum for u64 {
-    fn nanos(self) -> Duration {
-        Duration::from_nanos(self)
-    }
-
-    fn millis(self) -> Duration {
-        Duration::from_millis(self)
-    }
-
-    fn seconds(self) -> Duration {
-        Duration::from_seconds(self)
-    }
-
-    fn minutes(self) -> Duration {
-        Duration::from_minutes(self)
-    }
-
-    fn hours(self) -> Duration {
-        Duration::from_hours(self)
-    }
-}
-
-impl Time {
-    pub const INFINITE: Time = Time(sys::ZX_TIME_INFINITE);
-
-    /// Get the current time, from the specific clock id.
-    ///
-    /// Wraps the
-    /// [zx_time_get](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/time_get.md)
-    /// syscall.
-    pub fn get(clock_id: ClockId) -> Time {
-        unsafe { Time(sys::zx_time_get(clock_id as u32)) }
-    }
-
-    /// Compute a deadline for the time in the future that is the given `Duration` away.
-    ///
-    /// Wraps the
-    /// [zx_deadline_after](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/deadline_after.md)
-    /// syscall.
-    pub fn after(duration: Duration) -> Time {
-        unsafe { Time(sys::zx_deadline_after(duration.0)) }
-    }
-
-    /// Sleep until the given time.
-    ///
-    /// Wraps the
-    /// [zx_nanosleep](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/nanosleep.md)
-    /// syscall.
-    pub fn sleep(self) {
-        unsafe { sys::zx_nanosleep(self.0); }
-    }
-
-    pub fn nanos(self) -> u64 {
-        self.0
-    }
-
-    pub fn from_nanos(nanos: u64) -> Self {
-        Time(nanos)
-    }
-}
-
-/// Read the number of high-precision timer ticks since boot. These ticks may be processor cycles,
-/// high speed timer, profiling timer, etc. They are not guaranteed to continue advancing when the
-/// system is asleep.
-///
-/// Wraps the
-/// [zx_ticks_get](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/ticks_get.md)
-/// syscall.
-pub fn ticks_get() -> u64 {
-    unsafe { sys::zx_ticks_get() }
-}
-
-/// Return the number of high-precision timer ticks in a second.
-///
-/// Wraps the
-/// [zx_ticks_per_second](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/ticks_per_second.md)
-/// syscall.
-pub fn ticks_per_second() -> u64 {
-    unsafe { sys::zx_ticks_per_second() }
-}
-
-/// An object representing a Zircon timer, such as the one returned by
-/// [zx_timer_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/timer_create.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Timer(Handle);
-impl_handle_based!(Timer);
-
-impl Timer {
-    /// Create a timer, an object that can signal when a specified point in time has been reached.
-    /// Wraps the
-    /// [zx_timer_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/timer_create.md)
-    /// syscall.
-    pub fn create(clock_id: ClockId) -> Result<Timer, Status> {
-        let mut out = 0;
-        let opts = 0;
-        let status = unsafe { sys::zx_timer_create(opts, clock_id as u32, &mut out) };
-        ok(status)?;
-        unsafe {
-            Ok(Self::from(Handle::from_raw(out)))
-        }
-    }
-
-    /// Start a one-shot timer that will fire when `deadline` passes. Wraps the
-    /// [zx_timer_set](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/timer_set.md)
-    /// syscall.
-    pub fn set(&self, deadline: Time, slack: Duration) -> Result<(), Status> {
-        let status = unsafe {
-            sys::zx_timer_set(self.raw_handle(), deadline.nanos(), slack.nanos())
-        };
-        ok(status)
-    }
-
-    /// Cancels a pending timer that was started with start(). Wraps the
-    /// [zx_timer_cancel](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/timer_cancel.md)
-    /// syscall.
-    pub fn cancel(&self) -> Result<(), Status> {
-        let status = unsafe { sys::zx_timer_cancel(self.raw_handle()) };
-        ok(status)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use Signals;
-
-    #[test]
-    fn create_timer_invalid_clock() {
-        assert_eq!(Timer::create(ClockId::UTC).unwrap_err(), Status::INVALID_ARGS);
-        assert_eq!(Timer::create(ClockId::Thread), Err(Status::INVALID_ARGS));
-    }
-
-    #[test]
-    fn into_from_std() {
-        let std_dur = stdtime::Duration::new(25, 25);
-        assert_eq!(std_dur, stdtime::Duration::from(Duration::from(std_dur)));
-    }
-
-    #[test]
-    fn timer_basic() {
-        let slack = 0.millis();
-        let ten_ms = 10.millis();
-        let five_secs = 5.seconds();
-        let six_secs = 6.seconds();
-
-        // Create a timer
-        let timer = Timer::create(ClockId::Monotonic).unwrap();
-
-        // Should not signal yet.
-        assert_eq!(
-            timer.wait_handle(Signals::TIMER_SIGNALED, ten_ms.after_now()),
-            Err(Status::TIMED_OUT));
-
-        // Set it, and soon it should signal.
-        assert_eq!(timer.set(five_secs.after_now(), slack), Ok(()));
-        assert_eq!(
-            timer.wait_handle(Signals::TIMER_SIGNALED, six_secs.after_now()),
-            Ok(Signals::TIMER_SIGNALED));
-
-        // Cancel it, and it should stop signalling.
-        assert_eq!(timer.cancel(), Ok(()));
-        assert_eq!(
-            timer.wait_handle(Signals::TIMER_SIGNALED, ten_ms.after_now()),
-            Err(Status::TIMED_OUT));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/vmar.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/vmar.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/vmar.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/vmar.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use sys;
-
-bitflags! {
-    /// Flags to VMAR routines
-    #[repr(C)]
-    pub struct VmarFlags: u32 {
-        const PERM_READ          = sys::ZX_VM_FLAG_PERM_READ;
-        const PERM_WRITE         = sys::ZX_VM_FLAG_PERM_WRITE;
-        const PERM_EXECUTE       = sys::ZX_VM_FLAG_PERM_EXECUTE;
-        const COMPACT            = sys::ZX_VM_FLAG_COMPACT;
-        const SPECIFIC           = sys::ZX_VM_FLAG_SPECIFIC;
-        const SPECIFIC_OVERWRITE = sys::ZX_VM_FLAG_SPECIFIC_OVERWRITE;
-        const CAN_MAP_SPECIFIC   = sys::ZX_VM_FLAG_CAN_MAP_SPECIFIC;
-        const CAN_MAP_READ       = sys::ZX_VM_FLAG_CAN_MAP_READ;
-        const CAN_MAP_WRITE      = sys::ZX_VM_FLAG_CAN_MAP_WRITE;
-        const CAN_MAP_EXECUTE    = sys::ZX_VM_FLAG_CAN_MAP_EXECUTE;
-    }
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/vmo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/vmo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/src/vmo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/src/vmo.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,256 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon vmo objects.
-
-use {AsHandleRef, Cookied, HandleBased, Handle, HandleRef, Status};
-use {sys, ok};
-use std::{mem, ptr};
-
-/// An object representing a Zircon
-/// [virtual memory object](https://fuchsia.googlesource.com/zircon/+/master/docs/objects/vm_object.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Vmo(Handle);
-impl_handle_based!(Vmo);
-impl Cookied for Vmo {}
-
-impl Vmo {
-    /// Create a virtual memory object.
-    ///
-    /// Wraps the
-    /// `zx_vmo_create`
-    /// syscall. See the
-    /// [Shared Memory: Virtual Memory Objects (VMOs)](https://fuchsia.googlesource.com/zircon/+/master/docs/concepts.md#Shared-Memory_Virtual-Memory-Objects-VMOs)
-    /// for more information.
-    pub fn create(size: u64) -> Result<Vmo, Status> {
-        let mut handle = 0;
-        let opts = 0;
-        let status = unsafe { sys::zx_vmo_create(size, opts, &mut handle) };
-        ok(status)?;
-        unsafe {
-            Ok(Vmo::from(Handle::from_raw(handle)))
-        }
-    }
-
-    /// Read from a virtual memory object.
-    ///
-    /// Wraps the `zx_vmo_read` syscall.
-    pub fn read(&self, data: &mut [u8], offset: u64) -> Result<usize, Status> {
-        unsafe {
-            let mut actual = 0;
-            let status = sys::zx_vmo_read(self.raw_handle(), data.as_mut_ptr(),
-                offset, data.len(), &mut actual);
-            ok(status).map(|()| actual)
-        }
-    }
-
-    /// Write to a virtual memory object.
-    ///
-    /// Wraps the `zx_vmo_write` syscall.
-    pub fn write(&self, data: &[u8], offset: u64) -> Result<usize, Status> {
-        unsafe {
-            let mut actual = 0;
-            let status = sys::zx_vmo_write(self.raw_handle(), data.as_ptr(),
-                offset, data.len(), &mut actual);
-            ok(status).map(|()| actual)
-        }
-    }
-
-    /// Get the size of a virtual memory object.
-    ///
-    /// Wraps the `zx_vmo_get_size` syscall.
-    pub fn get_size(&self) -> Result<u64, Status> {
-        let mut size = 0;
-        let status = unsafe { sys::zx_vmo_get_size(self.raw_handle(), &mut size) };
-        ok(status).map(|()| size)
-    }
-
-    /// Attempt to change the size of a virtual memory object.
-    ///
-    /// Wraps the `zx_vmo_set_size` syscall.
-    pub fn set_size(&self, size: u64) -> Result<(), Status> {
-        let status = unsafe { sys::zx_vmo_set_size(self.raw_handle(), size) };
-        ok(status)
-    }
-
-    /// Perform an operation on a range of a virtual memory object.
-    ///
-    /// Wraps the
-    /// [zx_vmo_op_range](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/vmo_op_range.md)
-    /// syscall.
-    pub fn op_range(&self, op: VmoOp, offset: u64, size: u64) -> Result<(), Status> {
-        let status = unsafe {
-            sys::zx_vmo_op_range(self.raw_handle(), op.into_raw(), offset, size, ptr::null_mut(), 0)
-        };
-        ok(status)
-    }
-
-    /// Look up a list of physical addresses corresponding to the pages held by the VMO from
-    /// `offset` to `offset`+`size`, and store them in `buffer`.
-    ///
-    /// Wraps the
-    /// [zx_vmo_op_range](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/vmo_op_range.md)
-    /// syscall with ZX_VMO_OP_LOOKUP.
-    pub fn lookup(&self, offset: u64, size: u64, buffer: &mut [sys::zx_paddr_t])
-        -> Result<(), Status>
-    {
-        let status = unsafe {
-            sys::zx_vmo_op_range(self.raw_handle(), VmoOp::LOOKUP.into_raw(), offset, size,
-                buffer.as_mut_ptr() as *mut u8, buffer.len() * mem::size_of::<sys::zx_paddr_t>())
-        };
-        ok(status)
-    }
-
-    /// Create a new virtual memory object that clones a range of this one.
-    ///
-    /// Wraps the
-    /// [zx_vmo_clone](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/vmo_clone.md)
-    /// syscall.
-    pub fn clone(&self, offset: u64, size: u64) -> Result<Vmo, Status> {
-        let mut out = 0;
-        let opts = sys::ZX_VMO_CLONE_COPY_ON_WRITE;
-        let status = unsafe {
-            sys::zx_vmo_clone(self.raw_handle(), opts, offset, size, &mut out)
-        };
-        ok(status)?;
-        unsafe { Ok(Vmo::from(Handle::from_raw(out))) }
-    }
-}
-
-/// VM Object opcodes
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct VmoOp(u32);
-impl VmoOp {
-    pub fn from_raw(raw: u32) -> VmoOp {
-        VmoOp(raw)
-    }
-    pub fn into_raw(self) -> u32 {
-        self.0
-    }
-}
-
-assoc_consts!(VmoOp, [
-    COMMIT =           sys::ZX_VMO_OP_COMMIT;
-    DECOMMIT =         sys::ZX_VMO_OP_DECOMMIT;
-    LOCK =             sys::ZX_VMO_OP_LOCK;
-    UNLOCK =           sys::ZX_VMO_OP_UNLOCK;
-    LOOKUP =           sys::ZX_VMO_OP_LOOKUP;
-    CACHE_SYNC =       sys::ZX_VMO_OP_CACHE_SYNC;
-    CACHE_INVALIDATE = sys::ZX_VMO_OP_CACHE_INVALIDATE;
-    CACHE_CLEAN =      sys::ZX_VMO_OP_CACHE_CLEAN;
-    CACHE_CLEAN_INVALIDATE = sys::ZX_VMO_OP_CACHE_CLEAN_INVALIDATE;
-]);
-
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn vmo_get_size() {
-        let size = 16 * 1024 * 1024;
-        let vmo = Vmo::create(size).unwrap();
-        assert_eq!(size, vmo.get_size().unwrap());
-    }
-
-    #[test]
-    fn vmo_set_size() {
-        let start_size = 12;
-        let vmo = Vmo::create(start_size).unwrap();
-        assert_eq!(start_size, vmo.get_size().unwrap());
-
-        // Change the size and make sure the new size is reported
-        let new_size = 23;
-        assert!(vmo.set_size(new_size).is_ok());
-        assert_eq!(new_size, vmo.get_size().unwrap());
-    }
-
-    #[test]
-    fn vmo_read_write() {
-        let mut vec1 = vec![0; 16];
-        let vmo = Vmo::create(vec1.len() as u64).unwrap();
-        assert_eq!(vmo.write(b"abcdef", 0), Ok(6));
-        assert_eq!(16, vmo.read(&mut vec1, 0).unwrap());
-        assert_eq!(b"abcdef", &vec1[0..6]);
-        assert_eq!(vmo.write(b"123", 2), Ok(3));
-        assert_eq!(16, vmo.read(&mut vec1, 0).unwrap());
-        assert_eq!(b"ab123f", &vec1[0..6]);
-        assert_eq!(15, vmo.read(&mut vec1, 1).unwrap());
-        assert_eq!(b"b123f", &vec1[0..5]);
-    }
-
-    #[test]
-    fn vmo_op_range_unsupported() {
-        let vmo = Vmo::create(12).unwrap();
-        assert_eq!(vmo.op_range(VmoOp::LOCK, 0, 1), Err(Status::NOT_SUPPORTED));
-        assert_eq!(vmo.op_range(VmoOp::UNLOCK, 0, 1), Err(Status::NOT_SUPPORTED));
-    }
-
-    #[test]
-    fn vmo_lookup() {
-        let vmo = Vmo::create(12).unwrap();
-        let mut buffer = vec![0; 2];
-
-        // Lookup will fail as it is not committed yet.
-        assert_eq!(vmo.lookup(0, 12, &mut buffer), Err(Status::NO_MEMORY));
-
-        // COMMIT and try again.
-        assert_eq!(vmo.op_range(VmoOp::COMMIT, 0, 12), Ok(()));
-        assert_eq!(vmo.lookup(0, 12, &mut buffer), Ok(()));
-        assert_ne!(buffer[0], 0);
-        assert_eq!(buffer[1], 0);
-
-        // If we decommit then lookup should go back to failing.
-        assert_eq!(vmo.op_range(VmoOp::DECOMMIT, 0, 12), Ok(()));
-        assert_eq!(vmo.lookup(0, 12, &mut buffer), Err(Status::NO_MEMORY));
-    }
-
-    #[test]
-    fn vmo_cache() {
-        let vmo = Vmo::create(12).unwrap();
-
-        // Cache operations should all succeed.
-        assert_eq!(vmo.op_range(VmoOp::CACHE_SYNC, 0, 12), Ok(()));
-        assert_eq!(vmo.op_range(VmoOp::CACHE_INVALIDATE, 0, 12), Ok(()));
-        assert_eq!(vmo.op_range(VmoOp::CACHE_CLEAN, 0, 12), Ok(()));
-        assert_eq!(vmo.op_range(VmoOp::CACHE_CLEAN_INVALIDATE, 0, 12), Ok(()));
-    }
-
-    #[test]
-    fn vmo_clone() {
-        let original = Vmo::create(12).unwrap();
-        assert_eq!(original.write(b"one", 0), Ok(3));
-
-        // Clone the VMO, and make sure it contains what we expect.
-        let clone = original.clone(0, 10).unwrap();
-        let mut read_buffer = vec![0; 16];
-        assert_eq!(clone.read(&mut read_buffer, 0), Ok(10));
-        assert_eq!(&read_buffer[0..3], b"one");
-
-        // Writing to the original will affect the clone too, surprisingly.
-        assert_eq!(original.write(b"two", 0), Ok(3));
-        assert_eq!(original.read(&mut read_buffer, 0), Ok(12));
-        assert_eq!(&read_buffer[0..3], b"two");
-        assert_eq!(clone.read(&mut read_buffer, 0), Ok(10));
-        assert_eq!(&read_buffer[0..3], b"two");
-
-        // However, writing to the clone will not affect the original
-        assert_eq!(clone.write(b"three", 0), Ok(5));
-        assert_eq!(original.read(&mut read_buffer, 0), Ok(12));
-        assert_eq!(&read_buffer[0..3], b"two");
-        assert_eq!(clone.read(&mut read_buffer, 0), Ok(10));
-        assert_eq!(&read_buffer[0..5], b"three");
-
-        // And now that the copy-on-write has happened, writing to the original will not affect the
-        // clone. How bizarre.
-        assert_eq!(original.write(b"four", 0), Ok(4));
-        assert_eq!(original.read(&mut read_buffer, 0), Ok(12));
-        assert_eq!(&read_buffer[0..4], b"four");
-        assert_eq!(clone.read(&mut read_buffer, 0), Ok(10));
-        assert_eq!(&read_buffer[0..5], b"three");
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/tools/gen_status.py thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/tools/gen_status.py
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon/tools/gen_status.py	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon/tools/gen_status.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright 2016 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# A tool for autogenerating the mapping between Status and zx_status_t
-# Usage: python gen_status.py zircon/system/public/zircon/errors.h {sys,enum,match}
-import re
-import sys
-
-status_re = re.compile('#define\s+(ZX_\w+)\s+\((\-?\d+)\)$')
-
-def parse(in_filename):
-    result = []
-    for line in file(in_filename):
-        m = status_re.match(line)
-        if m:
-            result.append((m.group(1), int(m.group(2))))
-    return result
-
-def to_snake_case(name):
-    result = []
-    for element in name.split('_'):
-        result.append(element[0] + element[1:].lower())
-    return ''.join(result)
-
-def out(style, l):
-    print('// Auto-generated using tools/gen_status.py')
-    longest = max(len(name) for (name, num) in l)
-    if style == 'sys':
-        for (name, num) in l:
-            print('pub const %s : zx_status_t = %d;' % (name.ljust(longest), num))
-    if style == 'enum':
-        print('pub enum Status {')
-        for (name, num) in l:
-            print('    %s = %d,' % (to_snake_case(name[3:]), num))
-        print('');
-        print('    /// Any zx_status_t not in the set above will map to the following:')
-        print('    UnknownOther = -32768,')
-        print('}')
-    if style == 'match':
-        for (name, num) in l:
-            print('            sys::%s => Status::%s,' % (name, to_snake_case(name[3:])))
-        print('            _ => Status::UnknownOther,')
-
-
-l = parse(sys.argv[1])
-out(sys.argv[2], l)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/BUILD.gn thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/BUILD.gn
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/BUILD.gn	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/rust/rust_library.gni")
-
-rust_library("fuchsia-zircon-sys") {
-  deps = []
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"BUILD.gn":"0a1529e038693c7d136f277d0987ccc35ebeaa46e5a8238ebce22da927e51bb2","Cargo.toml":"a952982a5ffbbb97d0e095c07903436dcc8fce0d4bf6c925877e751a98904967","examples/hello.rs":"66c6a147b98b913fef8e7a7da6387fb735f7f1e2c00abc8794a32a8cf0320851","src/definitions.rs":"557c48c3ae148158901abbc479cfefe4852141bafb0b926faa8669440bf6123b","src/lib.rs":"a3d9eb3d2243fea31ee2cfd2bf1bbf8ed77e15accf0542f133b83a97c87f6ca7"},"package":"3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-authors = ["Raph Levien <raph@google.com>"]
-description = "Low-level Rust bindings for the Zircon kernel"
-license = "BSD-3-Clause"
-repository = "https://fuchsia.googlesource.com/garnet/"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/examples/hello.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/examples/hello.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/examples/hello.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/examples/hello.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-extern crate fuchsia_zircon_sys as zircon_sys;
-
-pub fn main() {
-    let time = unsafe { zircon_sys::zx_time_get(zircon_sys::ZX_CLOCK_MONOTONIC) };
-    println!("before sleep, time = {}", time);
-    unsafe { zircon_sys::zx_nanosleep(zircon_sys::zx_deadline_after(1000_000_000)); }
-    let time = unsafe { zircon_sys::zx_time_get(zircon_sys::ZX_CLOCK_MONOTONIC) };
-    println!("after sleep, time = {}", time);
-}
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/src/definitions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/src/definitions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/src/definitions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/src/definitions.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,903 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// This is a GENERATED file, see //zircon/system/host/sysgen.
-// The license governing this file can be found in the LICENSE file.
-
-#[link(name = "zircon")]
-extern {
-    pub fn zx_time_get(
-        clock_id: u32
-        ) -> zx_time_t;
-
-    pub fn zx_nanosleep(
-        deadline: zx_time_t
-        ) -> zx_status_t;
-
-    pub fn zx_ticks_get(
-        ) -> u64;
-
-    pub fn zx_ticks_per_second(
-        ) -> u64;
-
-    pub fn zx_deadline_after(
-        nanoseconds: zx_duration_t
-        ) -> zx_time_t;
-
-    pub fn zx_clock_adjust(
-        handle: zx_handle_t,
-        clock_id: u32,
-        offset: i64
-        ) -> zx_status_t;
-
-    pub fn zx_system_get_num_cpus(
-        ) -> u32;
-
-    pub fn zx_system_get_version(
-        version: *mut u8,
-        version_len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_system_get_physmem(
-        ) -> u64;
-
-    pub fn zx_cache_flush(
-        addr: *const u8,
-        len: usize,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_handle_close(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_handle_duplicate(
-        handle: zx_handle_t,
-        rights: zx_rights_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_handle_replace(
-        handle: zx_handle_t,
-        rights: zx_rights_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_object_wait_one(
-        handle: zx_handle_t,
-        waitfor: zx_signals_t,
-        deadline: zx_time_t,
-        observed: *mut zx_signals_t
-        ) -> zx_status_t;
-
-    pub fn zx_object_wait_many(
-        items: *mut zx_wait_item_t,
-        count: u32,
-        deadline: zx_time_t
-        ) -> zx_status_t;
-
-    pub fn zx_object_wait_async(
-        handle: zx_handle_t,
-        port_handle: zx_handle_t,
-        key: u64,
-        signals: zx_signals_t,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_object_signal(
-        handle: zx_handle_t,
-        clear_mask: u32,
-        set_mask: u32
-        ) -> zx_status_t;
-
-    pub fn zx_object_signal_peer(
-        handle: zx_handle_t,
-        clear_mask: u32,
-        set_mask: u32
-        ) -> zx_status_t;
-
-    pub fn zx_object_get_property(
-        handle: zx_handle_t,
-        property: u32,
-        value: *mut u8,
-        size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_object_set_property(
-        handle: zx_handle_t,
-        property: u32,
-        value: *const u8,
-        size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_object_set_cookie(
-        handle: zx_handle_t,
-        scope: zx_handle_t,
-        cookie: u64
-        ) -> zx_status_t;
-
-    pub fn zx_object_get_cookie(
-        handle: zx_handle_t,
-        scope: zx_handle_t,
-        cookie: *mut u64
-        ) -> zx_status_t;
-
-    pub fn zx_object_get_info(
-        handle: zx_handle_t,
-        topic: u32,
-        buffer: *mut u8,
-        buffer_size: usize,
-        actual_count: *mut usize,
-        avail_count: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_object_get_child(
-        handle: zx_handle_t,
-        koid: u64,
-        rights: zx_rights_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_channel_create(
-        options: u32,
-        out0: *mut zx_handle_t,
-        out1: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_channel_read(
-        handle: zx_handle_t,
-        options: u32,
-        bytes: *mut u8,
-        handles: *mut zx_handle_t,
-        num_bytes: u32,
-        num_handles: u32,
-        actual_bytes: *mut u32,
-        actual_handles: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_channel_write(
-        handle: zx_handle_t,
-        options: u32,
-        bytes: *const u8,
-        num_bytes: u32,
-        handles: *const zx_handle_t,
-        num_handles: u32
-        ) -> zx_status_t;
-
-    pub fn zx_channel_call_noretry(
-        handle: zx_handle_t,
-        options: u32,
-        deadline: zx_time_t,
-        args: *const zx_channel_call_args_t,
-        actual_bytes: *mut u32,
-        actual_handles: *mut u32,
-        read_status: *mut zx_status_t
-        ) -> zx_status_t;
-
-    pub fn zx_channel_call_finish(
-        deadline: zx_time_t,
-        args: *const zx_channel_call_args_t,
-        actual_bytes: *mut u32,
-        actual_handles: *mut u32,
-        read_status: *mut zx_status_t
-        ) -> zx_status_t;
-
-    pub fn zx_channel_call(
-        handle: zx_handle_t,
-        options: u32,
-        deadline: zx_time_t,
-        args: *const zx_channel_call_args_t,
-        actual_bytes: *mut u32,
-        actual_handles: *mut u32,
-        read_status: *mut zx_status_t
-        ) -> zx_status_t;
-
-    pub fn zx_socket_create(
-        options: u32,
-        out0: *mut zx_handle_t,
-        out1: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_socket_write(
-        handle: zx_handle_t,
-        options: u32,
-        buffer: *const u8,
-        size: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_socket_read(
-        handle: zx_handle_t,
-        options: u32,
-        buffer: *mut u8,
-        size: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_thread_exit(
-        );
-
-    pub fn zx_thread_create(
-        process: zx_handle_t,
-        name: *const u8,
-        name_len: u32,
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_thread_start(
-        handle: zx_handle_t,
-        thread_entry: usize,
-        stack: usize,
-        arg1: usize,
-        arg2: usize
-        ) -> zx_status_t;
-
-    pub fn zx_thread_read_state(
-        handle: zx_handle_t,
-        kind: u32,
-        buffer: *mut u8,
-        len: u32,
-        actual: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_thread_write_state(
-        handle: zx_handle_t,
-        kind: u32,
-        buffer: *const u8,
-        buffer_len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_thread_set_priority(
-        prio: i32
-        ) -> zx_status_t;
-
-    pub fn zx_process_exit(
-        retcode: isize
-        );
-
-    pub fn zx_process_create(
-        job: zx_handle_t,
-        name: *const u8,
-        name_len: u32,
-        options: u32,
-        proc_handle: *mut zx_handle_t,
-        vmar_handle: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_process_start(
-        process_handle: zx_handle_t,
-        thread_handle: zx_handle_t,
-        entry: usize,
-        stack: usize,
-        arg_handle: zx_handle_t,
-        arg2: usize
-        ) -> zx_status_t;
-
-    pub fn zx_process_read_memory(
-        proc_: zx_handle_t,
-        vaddr: usize,
-        buffer: *mut u8,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_process_write_memory(
-        proc_: zx_handle_t,
-        vaddr: usize,
-        buffer: *const u8,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_job_create(
-        parent_job: zx_handle_t,
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_job_set_policy(
-        job: zx_handle_t,
-        options: u32,
-        topic: u32,
-        policy: *const u8,
-        count: u32
-        ) -> zx_status_t;
-
-    pub fn zx_task_bind_exception_port(
-        object: zx_handle_t,
-        eport: zx_handle_t,
-        key: u64,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_task_suspend(
-        task_handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_task_resume(
-        task_handle: zx_handle_t,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_task_kill(
-        task_handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_event_create(
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_eventpair_create(
-        options: u32,
-        out0: *mut zx_handle_t,
-        out1: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_futex_wait(
-        value_ptr: *mut zx_futex_t,
-        current_value: isize,
-        deadline: zx_time_t
-        ) -> zx_status_t;
-
-    pub fn zx_futex_wake(
-        value_ptr: *const zx_futex_t,
-        count: u32
-        ) -> zx_status_t;
-
-    pub fn zx_futex_requeue(
-        wake_ptr: *mut zx_futex_t,
-        wake_count: u32,
-        current_value: isize,
-        requeue_ptr: *mut zx_futex_t,
-        requeue_count: u32
-        ) -> zx_status_t;
-
-    pub fn zx_port_create(
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_port_queue(
-        handle: zx_handle_t,
-        packet: *const zx_port_packet_t,
-        size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_port_wait(
-        handle: zx_handle_t,
-        deadline: zx_time_t,
-        packet: *mut zx_port_packet_t,
-        size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_port_cancel(
-        handle: zx_handle_t,
-        source: zx_handle_t,
-        key: u64
-        ) -> zx_status_t;
-
-    pub fn zx_timer_create(
-        options: u32,
-        clock_id: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_timer_set(
-        handle: zx_handle_t,
-        deadline: zx_time_t,
-        slack: zx_duration_t
-        ) -> zx_status_t;
-
-    pub fn zx_timer_cancel(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_create(
-        size: u64,
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_read(
-        handle: zx_handle_t,
-        data: *mut u8,
-        offset: u64,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_write(
-        handle: zx_handle_t,
-        data: *const u8,
-        offset: u64,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_get_size(
-        handle: zx_handle_t,
-        size: *mut u64
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_set_size(
-        handle: zx_handle_t,
-        size: u64
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_op_range(
-        handle: zx_handle_t,
-        op: u32,
-        offset: u64,
-        size: u64,
-        buffer: *mut u8,
-        buffer_size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_clone(
-        handle: zx_handle_t,
-        options: u32,
-        offset: u64,
-        size: u64,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_set_cache_policy(
-        handle: zx_handle_t,
-        cache_policy: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_allocate(
-        parent_vmar_handle: zx_handle_t,
-        offset: usize,
-        size: usize,
-        map_flags: u32,
-        child_vmar: *mut zx_handle_t,
-        child_addr: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_destroy(
-        vmar_handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_map(
-        vmar_handle: zx_handle_t,
-        vmar_offset: usize,
-        vmo_handle: zx_handle_t,
-        vmo_offset: u64,
-        len: usize,
-        map_flags: u32,
-        mapped_addr: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_unmap(
-        vmar_handle: zx_handle_t,
-        addr: usize,
-        len: usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_protect(
-        vmar_handle: zx_handle_t,
-        addr: usize,
-        len: usize,
-        prot_flags: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_root_self() -> zx_handle_t;
-
-    pub fn zx_cprng_draw(
-        buffer: *mut u8,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_cprng_add_entropy(
-        buffer: *const u8,
-        len: usize
-        ) -> zx_status_t;
-
-    pub fn zx_fifo_create(
-        elem_count: u32,
-        elem_size: u32,
-        options: u32,
-        out0: *mut zx_handle_t,
-        out1: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_fifo_read(
-        handle: zx_handle_t,
-        data: *mut u8,
-        len: usize,
-        num_written: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_fifo_write(
-        handle: zx_handle_t,
-        data: *const u8,
-        len: usize,
-        num_written: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_unmap_handle_close_thread_exit(
-        vmar_handle: zx_handle_t,
-        addr: usize,
-        len: usize,
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_futex_wake_handle_close_thread_exit(
-        value_ptr: *const zx_futex_t,
-        count: u32,
-        new_value: isize,
-        handle: zx_handle_t
-        );
-
-    pub fn zx_log_create(
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_log_write(
-        handle: zx_handle_t,
-        len: u32,
-        buffer: *const u8,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_log_read(
-        handle: zx_handle_t,
-        len: u32,
-        buffer: *mut u8,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_ktrace_read(
-        handle: zx_handle_t,
-        data: *mut u8,
-        offset: u32,
-        len: u32,
-        actual: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_ktrace_control(
-        handle: zx_handle_t,
-        action: u32,
-        options: u32,
-        ptr: *mut u8
-        ) -> zx_status_t;
-
-    pub fn zx_ktrace_write(
-        handle: zx_handle_t,
-        id: u32,
-        arg0: u32,
-        arg1: u32
-        ) -> zx_status_t;
-
-    pub fn zx_mtrace_control(
-        handle: zx_handle_t,
-        kind: u32,
-        action: u32,
-        options: u32,
-        ptr: *mut u8,
-        size: u32
-        ) -> zx_status_t;
-
-    pub fn zx_debug_read(
-        handle: zx_handle_t,
-        buffer: *mut u8,
-        length: u32
-        ) -> zx_status_t;
-
-    pub fn zx_debug_write(
-        buffer: *const u8,
-        length: u32
-        ) -> zx_status_t;
-
-    pub fn zx_debug_send_command(
-        resource_handle: zx_handle_t,
-        buffer: *const u8,
-        length: u32
-        ) -> zx_status_t;
-
-    pub fn zx_interrupt_create(
-        handle: zx_handle_t,
-        vector: u32,
-        options: u32,
-        out_handle: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_interrupt_complete(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_interrupt_wait(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_interrupt_signal(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_mmap_device_io(
-        handle: zx_handle_t,
-        io_addr: u32,
-        len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_create_contiguous(
-        rsrc_handle: zx_handle_t,
-        size: usize,
-        alignment_log2: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_create_physical(
-        rsrc_handle: zx_handle_t,
-        paddr: zx_paddr_t,
-        size: usize,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_bootloader_fb_get_info(
-        format: *mut u32,
-        width: *mut u32,
-        height: *mut u32,
-        stride: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_set_framebuffer(
-        handle: zx_handle_t,
-        vaddr: *mut u8,
-        len: u32,
-        format: u32,
-        width: u32,
-        height: u32,
-        stride: u32
-        ) -> zx_status_t;
-
-    pub fn zx_set_framebuffer_vmo(
-        handle: zx_handle_t,
-        vmo: zx_handle_t,
-        len: u32,
-        format: u32,
-        width: u32,
-        height: u32,
-        stride: u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_get_nth_device(
-        handle: zx_handle_t,
-        index: u32,
-        out_info: *mut zx_pcie_device_info_t,
-        out_handle: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_enable_bus_master(
-        handle: zx_handle_t,
-        enable: bool
-        ) -> zx_status_t;
-
-    pub fn zx_pci_enable_pio(
-        handle: zx_handle_t,
-        enable: bool
-        ) -> zx_status_t;
-
-    pub fn zx_pci_reset_device(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_cfg_pio_rw(
-        handle: zx_handle_t,
-        bus: u8,
-        dev: u8,
-        func: u8,
-        offset: u8,
-        val: *mut u32,
-        width: usize,
-        write: bool
-        ) -> zx_status_t;
-
-    pub fn zx_pci_get_bar(
-        handle: zx_handle_t,
-        bar_num: u32,
-        out_bar: *mut zx_pci_resource_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_get_config(
-        handle: zx_handle_t,
-        out_config: *mut zx_pci_resource_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_io_write(
-        handle: zx_handle_t,
-        bar_num: u32,
-        offset: u32,
-        len: u32,
-        value: u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_io_read(
-        handle: zx_handle_t,
-        bar_num: u32,
-        offset: u32,
-        len: u32,
-        out_value: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_map_interrupt(
-        handle: zx_handle_t,
-        which_irq: i32,
-        out_handle: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_query_irq_mode_caps(
-        handle: zx_handle_t,
-        mode: u32,
-        out_max_irqs: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_set_irq_mode(
-        handle: zx_handle_t,
-        mode: u32,
-        requested_irq_count: u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_init(
-        handle: zx_handle_t,
-        init_buf: *const zx_pci_init_arg_t,
-        len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_add_subtract_io_range(
-        handle: zx_handle_t,
-        mmio: bool,
-        base: u64,
-        len: u64,
-        add: bool
-        ) -> zx_status_t;
-
-    pub fn zx_acpi_uefi_rsdp(
-        handle: zx_handle_t
-        ) -> u64;
-
-    pub fn zx_acpi_cache_flush(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_resource_create(
-        parent_handle: zx_handle_t,
-        kind: u32,
-        low: u64,
-        high: u64,
-        resource_out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_guest_create(
-        resource: zx_handle_t,
-        options: u32,
-        physmem_vmo: zx_handle_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_guest_set_trap(
-        guest: zx_handle_t,
-        kind: u32,
-        addr: zx_vaddr_t,
-        len: usize,
-        fifo: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_create(
-        guest: zx_handle_t,
-        options: u32,
-        args: *const zx_vcpu_create_args_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_resume(
-        vcpu: zx_handle_t,
-        packet: *mut zx_guest_packet_t
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_interrupt(
-        vcpu: zx_handle_t,
-        vector: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_read_state(
-        vcpu: zx_handle_t,
-        kind: u32,
-        buffer: *mut u8,
-        len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_write_state(
-        vcpu: zx_handle_t,
-        kind: u32,
-        buffer: *const u8,
-        len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_system_mexec(
-        kernel: zx_handle_t,
-        bootimage: zx_handle_t,
-        cmdline: *const u8,
-        cmdline_len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_job_set_relative_importance(
-        root_resource: zx_handle_t,
-        job: zx_handle_t,
-        less_important_job: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_0(
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_1(
-        a: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_2(
-        a: isize,
-        b: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_3(
-        a: isize,
-        b: isize,
-        c: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_4(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_5(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize,
-        e: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_6(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize,
-        e: isize,
-        f: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_7(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize,
-        e: isize,
-        f: isize,
-        g: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_8(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize,
-        e: isize,
-        f: isize,
-        g: isize,
-        h: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_wrapper(
-        a: isize,
-        b: isize,
-        c: isize
-        ) -> zx_status_t;
-
-
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/fuchsia-zircon-sys/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/fuchsia-zircon-sys/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,474 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#![allow(non_camel_case_types)]
-#![deny(warnings)]
-
-use std::{cmp, fmt};
-
-pub type zx_addr_t = usize;
-pub type zx_duration_t = u64;
-pub type zx_futex_t = i32;
-pub type zx_handle_t = u32;
-pub type zx_off_t = u64;
-pub type zx_paddr_t = usize;
-pub type zx_rights_t = u32;
-pub type zx_signals_t = u32;
-pub type zx_size_t = usize;
-pub type zx_ssize_t = isize;
-pub type zx_status_t = i32;
-pub type zx_time_t = u64;
-pub type zx_vaddr_t = usize;
-
-// TODO: combine these macros with the bitflags and assoc consts macros below
-// so that we only have to do one macro invocation.
-// The result would look something like:
-// multiconst!(bitflags, zx_rights_t, Rights, [RIGHT_NONE => ZX_RIGHT_NONE = 0; ...]);
-// multiconst!(assoc_consts, zx_status_t, Status, [OK => ZX_OK = 0; ...]);
-// Note that the actual name of the inner macro (e.g. `bitflags`) can't be a variable.
-// It'll just have to be matched on manually
-macro_rules! multiconst {
-    ($typename:ident, [$($rawname:ident = $value:expr;)*]) => {
-        $(
-            pub const $rawname: $typename = $value;
-        )*
-    }
-}
-
-multiconst!(zx_handle_t, [
-    ZX_HANDLE_INVALID = 0;
-]);
-
-multiconst!(zx_time_t, [
-    ZX_TIME_INFINITE = ::std::u64::MAX;
-]);
-
-multiconst!(zx_rights_t, [
-    ZX_RIGHT_NONE         = 0;
-    ZX_RIGHT_DUPLICATE    = 1 << 0;
-    ZX_RIGHT_TRANSFER     = 1 << 1;
-    ZX_RIGHT_READ         = 1 << 2;
-    ZX_RIGHT_WRITE        = 1 << 3;
-    ZX_RIGHT_EXECUTE      = 1 << 4;
-    ZX_RIGHT_MAP          = 1 << 5;
-    ZX_RIGHT_GET_PROPERTY = 1 << 6;
-    ZX_RIGHT_SET_PROPERTY = 1 << 7;
-    ZX_RIGHT_ENUMERATE    = 1 << 8;
-    ZX_RIGHT_DESTROY      = 1 << 9;
-    ZX_RIGHT_SET_POLICY   = 1 << 10;
-    ZX_RIGHT_GET_POLICY   = 1 << 11;
-    ZX_RIGHT_SIGNAL       = 1 << 12;
-    ZX_RIGHT_SIGNAL_PEER  = 1 << 13;
-    ZX_RIGHT_WAIT         = 0 << 14; // Coming Soon!
-    ZX_RIGHT_SAME_RIGHTS  = 1 << 31;
-]);
-
-// TODO: add an alias for this type in the C headers.
-multiconst!(u32, [
-    ZX_VMO_OP_COMMIT = 1;
-    ZX_VMO_OP_DECOMMIT = 2;
-    ZX_VMO_OP_LOCK = 3;
-    ZX_VMO_OP_UNLOCK = 4;
-    ZX_VMO_OP_LOOKUP = 5;
-    ZX_VMO_OP_CACHE_SYNC = 6;
-    ZX_VMO_OP_CACHE_INVALIDATE = 7;
-    ZX_VMO_OP_CACHE_CLEAN = 8;
-    ZX_VMO_OP_CACHE_CLEAN_INVALIDATE = 9;
-]);
-
-// TODO: add an alias for this type in the C headers.
-multiconst!(u32, [
-    ZX_VM_FLAG_PERM_READ          = 1  << 0;
-    ZX_VM_FLAG_PERM_WRITE         = 1  << 1;
-    ZX_VM_FLAG_PERM_EXECUTE       = 1  << 2;
-    ZX_VM_FLAG_COMPACT            = 1  << 3;
-    ZX_VM_FLAG_SPECIFIC           = 1  << 4;
-    ZX_VM_FLAG_SPECIFIC_OVERWRITE = 1  << 5;
-    ZX_VM_FLAG_CAN_MAP_SPECIFIC   = 1  << 6;
-    ZX_VM_FLAG_CAN_MAP_READ       = 1  << 7;
-    ZX_VM_FLAG_CAN_MAP_WRITE      = 1  << 8;
-    ZX_VM_FLAG_CAN_MAP_EXECUTE    = 1  << 9;
-]);
-
-multiconst!(zx_status_t, [
-    ZX_OK                    = 0;
-    ZX_ERR_INTERNAL          = -1;
-    ZX_ERR_NOT_SUPPORTED     = -2;
-    ZX_ERR_NO_RESOURCES      = -3;
-    ZX_ERR_NO_MEMORY         = -4;
-    ZX_ERR_CALL_FAILED       = -5;
-    ZX_ERR_INTERRUPTED_RETRY = -6;
-    ZX_ERR_INVALID_ARGS      = -10;
-    ZX_ERR_BAD_HANDLE        = -11;
-    ZX_ERR_WRONG_TYPE        = -12;
-    ZX_ERR_BAD_SYSCALL       = -13;
-    ZX_ERR_OUT_OF_RANGE      = -14;
-    ZX_ERR_BUFFER_TOO_SMALL  = -15;
-    ZX_ERR_BAD_STATE         = -20;
-    ZX_ERR_TIMED_OUT         = -21;
-    ZX_ERR_SHOULD_WAIT       = -22;
-    ZX_ERR_CANCELED          = -23;
-    ZX_ERR_PEER_CLOSED       = -24;
-    ZX_ERR_NOT_FOUND         = -25;
-    ZX_ERR_ALREADY_EXISTS    = -26;
-    ZX_ERR_ALREADY_BOUND     = -27;
-    ZX_ERR_UNAVAILABLE       = -28;
-    ZX_ERR_ACCESS_DENIED     = -30;
-    ZX_ERR_IO                = -40;
-    ZX_ERR_IO_REFUSED        = -41;
-    ZX_ERR_IO_DATA_INTEGRITY = -42;
-    ZX_ERR_IO_DATA_LOSS      = -43;
-    ZX_ERR_BAD_PATH          = -50;
-    ZX_ERR_NOT_DIR           = -51;
-    ZX_ERR_NOT_FILE          = -52;
-    ZX_ERR_FILE_BIG          = -53;
-    ZX_ERR_NO_SPACE          = -54;
-    ZX_ERR_STOP              = -60;
-    ZX_ERR_NEXT              = -61;
-]);
-
-multiconst!(zx_signals_t, [
-    ZX_SIGNAL_NONE              = 0;
-    ZX_OBJECT_SIGNAL_ALL        = 0x00ffffff;
-    ZX_USER_SIGNAL_ALL          = 0xff000000;
-    ZX_OBJECT_SIGNAL_0          = 1 << 0;
-    ZX_OBJECT_SIGNAL_1          = 1 << 1;
-    ZX_OBJECT_SIGNAL_2          = 1 << 2;
-    ZX_OBJECT_SIGNAL_3          = 1 << 3;
-    ZX_OBJECT_SIGNAL_4          = 1 << 4;
-    ZX_OBJECT_SIGNAL_5          = 1 << 5;
-    ZX_OBJECT_SIGNAL_6          = 1 << 6;
-    ZX_OBJECT_SIGNAL_7          = 1 << 7;
-    ZX_OBJECT_SIGNAL_8          = 1 << 8;
-    ZX_OBJECT_SIGNAL_9          = 1 << 9;
-    ZX_OBJECT_SIGNAL_10         = 1 << 10;
-    ZX_OBJECT_SIGNAL_11         = 1 << 11;
-    ZX_OBJECT_SIGNAL_12         = 1 << 12;
-    ZX_OBJECT_SIGNAL_13         = 1 << 13;
-    ZX_OBJECT_SIGNAL_14         = 1 << 14;
-    ZX_OBJECT_SIGNAL_15         = 1 << 15;
-    ZX_OBJECT_SIGNAL_16         = 1 << 16;
-    ZX_OBJECT_SIGNAL_17         = 1 << 17;
-    ZX_OBJECT_SIGNAL_18         = 1 << 18;
-    ZX_OBJECT_SIGNAL_19         = 1 << 19;
-    ZX_OBJECT_SIGNAL_20         = 1 << 20;
-    ZX_OBJECT_SIGNAL_21         = 1 << 21;
-    ZX_OBJECT_SIGNAL_22         = 1 << 22;
-    ZX_OBJECT_HANDLE_CLOSED     = 1 << 23;
-    ZX_USER_SIGNAL_0            = 1 << 24;
-    ZX_USER_SIGNAL_1            = 1 << 25;
-    ZX_USER_SIGNAL_2            = 1 << 26;
-    ZX_USER_SIGNAL_3            = 1 << 27;
-    ZX_USER_SIGNAL_4            = 1 << 28;
-    ZX_USER_SIGNAL_5            = 1 << 29;
-    ZX_USER_SIGNAL_6            = 1 << 30;
-    ZX_USER_SIGNAL_7            = 1 << 31;
-
-    ZX_OBJECT_READABLE          = ZX_OBJECT_SIGNAL_0;
-    ZX_OBJECT_WRITABLE          = ZX_OBJECT_SIGNAL_1;
-    ZX_OBJECT_PEER_CLOSED       = ZX_OBJECT_SIGNAL_2;
-
-    // Cancelation (handle was closed while waiting with it)
-    ZX_SIGNAL_HANDLE_CLOSED     = ZX_OBJECT_HANDLE_CLOSED;
-
-    // Event
-    ZX_EVENT_SIGNALED           = ZX_OBJECT_SIGNAL_3;
-
-    // EventPair
-    ZX_EPAIR_SIGNALED           = ZX_OBJECT_SIGNAL_3;
-    ZX_EPAIR_CLOSED             = ZX_OBJECT_SIGNAL_2;
-
-    // Task signals (process, thread, job)
-    ZX_TASK_TERMINATED          = ZX_OBJECT_SIGNAL_3;
-
-    // Channel
-    ZX_CHANNEL_READABLE         = ZX_OBJECT_SIGNAL_0;
-    ZX_CHANNEL_WRITABLE         = ZX_OBJECT_SIGNAL_1;
-    ZX_CHANNEL_PEER_CLOSED      = ZX_OBJECT_SIGNAL_2;
-
-    // Socket
-    ZX_SOCKET_READABLE          = ZX_OBJECT_SIGNAL_0;
-    ZX_SOCKET_WRITABLE          = ZX_OBJECT_SIGNAL_1;
-    ZX_SOCKET_PEER_CLOSED       = ZX_OBJECT_SIGNAL_2;
-
-    // Port
-    ZX_PORT_READABLE            = ZX_OBJECT_READABLE;
-
-    // Resource
-    ZX_RESOURCE_DESTROYED       = ZX_OBJECT_SIGNAL_3;
-    ZX_RESOURCE_READABLE        = ZX_OBJECT_READABLE;
-    ZX_RESOURCE_WRITABLE        = ZX_OBJECT_WRITABLE;
-    ZX_RESOURCE_CHILD_ADDED     = ZX_OBJECT_SIGNAL_4;
-
-    // Fifo
-    ZX_FIFO_READABLE            = ZX_OBJECT_READABLE;
-    ZX_FIFO_WRITABLE            = ZX_OBJECT_WRITABLE;
-    ZX_FIFO_PEER_CLOSED         = ZX_OBJECT_PEER_CLOSED;
-
-    // Job
-    ZX_JOB_NO_PROCESSES         = ZX_OBJECT_SIGNAL_3;
-    ZX_JOB_NO_JOBS              = ZX_OBJECT_SIGNAL_4;
-
-    // Process
-    ZX_PROCESS_TERMINATED       = ZX_OBJECT_SIGNAL_3;
-
-    // Thread
-    ZX_THREAD_TERMINATED        = ZX_OBJECT_SIGNAL_3;
-
-    // Log
-    ZX_LOG_READABLE             = ZX_OBJECT_READABLE;
-    ZX_LOG_WRITABLE             = ZX_OBJECT_WRITABLE;
-
-    // Timer
-    ZX_TIMER_SIGNALED           = ZX_OBJECT_SIGNAL_3;
-]);
-
-// clock ids
-pub const ZX_CLOCK_MONOTONIC: u32 = 0;
-
-// Buffer size limits on the cprng syscalls
-pub const ZX_CPRNG_DRAW_MAX_LEN: usize = 256;
-pub const ZX_CPRNG_ADD_ENTROPY_MAX_LEN: usize = 256;
-
-// Socket flags and limits.
-pub const ZX_SOCKET_HALF_CLOSE: u32 = 1;
-
-// VM Object clone flags
-pub const ZX_VMO_CLONE_COPY_ON_WRITE: u32 = 1;
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum zx_cache_policy_t {
-    ZX_CACHE_POLICY_CACHED = 0,
-    ZX_CACHE_POLICY_UNCACHED = 1,
-    ZX_CACHE_POLICY_UNCACHED_DEVICE = 2,
-    ZX_CACHE_POLICY_WRITE_COMBINING = 3,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_wait_item_t {
-    pub handle: zx_handle_t,
-    pub waitfor: zx_signals_t,
-    pub pending: zx_signals_t,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_waitset_result_t {
-    pub cookie: u64,
-    pub status: zx_status_t,
-    pub observed: zx_signals_t,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_channel_call_args_t {
-    pub wr_bytes: *const u8,
-    pub wr_handles: *const zx_handle_t,
-    pub rd_bytes: *mut u8,
-    pub rd_handles: *mut zx_handle_t,
-    pub wr_num_bytes: u32,
-    pub wr_num_handles: u32,
-    pub rd_num_bytes: u32,
-    pub rd_num_handles: u32,
-}
-
-pub type zx_pci_irq_swizzle_lut_t = [[[u32; 4]; 8]; 32];
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_pci_init_arg_t {
-    pub dev_pin_to_global_irq: zx_pci_irq_swizzle_lut_t,
-    pub num_irqs: u32,
-    pub irqs: [zx_irq_t; 32],
-    pub ecam_window_count: u32,
-    // Note: the ecam_windows field is actually a variable size array.
-    // We use a fixed size array to match the C repr.
-    pub ecam_windows: [zx_ecam_window_t; 1],
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_irq_t {
-    pub global_irq: u32,
-    pub level_triggered: bool,
-    pub active_high: bool,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_ecam_window_t {
-    pub base: u64,
-    pub size: usize,
-    pub bus_start: u8,
-    pub bus_end: u8,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_pcie_device_info_t {
-    pub vendor_id: u16,
-    pub device_id: u16,
-    pub base_class: u8,
-    pub sub_class: u8,
-    pub program_interface: u8,
-    pub revision_id: u8,
-    pub bus_id: u8,
-    pub dev_id: u8,
-    pub func_id: u8,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_pci_resource_t {
-    pub type_: u32,
-    pub size: usize,
-    // TODO: Actually a union
-    pub pio_addr: usize,
-}
-
-// TODO: Actually a union
-pub type zx_rrec_t = [u8; 64];
-
-// Ports V2
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum zx_packet_type_t {
-    ZX_PKT_TYPE_USER = 0,
-    ZX_PKT_TYPE_SIGNAL_ONE = 1,
-    ZX_PKT_TYPE_SIGNAL_REP = 2,
-}
-
-impl Default for zx_packet_type_t {
-    fn default() -> Self {
-        zx_packet_type_t::ZX_PKT_TYPE_USER
-    }
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct zx_packet_signal_t {
-    pub trigger: zx_signals_t,
-    pub observed: zx_signals_t,
-    pub count: u64,
-}
-
-pub const ZX_WAIT_ASYNC_ONCE: u32 = 0;
-pub const ZX_WAIT_ASYNC_REPEATING: u32 = 1;
-
-// Actually a union of different integer types, but this should be good enough.
-pub type zx_packet_user_t = [u8; 32];
-
-#[repr(C)]
-#[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]
-pub struct zx_port_packet_t {
-    pub key: u64,
-    pub packet_type: zx_packet_type_t,
-    pub status: i32,
-    pub union: [u8; 32],
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_guest_io_t {
-    port: u16,
-    access_size: u8,
-    input: bool,
-    // TODO: Actually a union
-    data: [u8; 4],
-}
-
-#[cfg(target_arch="aarch64")]
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_guest_memory_t {
-    addr: zx_vaddr_t,
-    inst: u32,
-}
-
-pub const X86_MAX_INST_LEN: usize = 15;
-
-#[cfg(target_arch="x86_64")]
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_guest_memory_t {
-    addr: zx_vaddr_t,
-    inst_len: u8,
-    inst_buf: [u8; X86_MAX_INST_LEN],
-}
-
-#[repr(u8)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum zx_guest_packet_t_type {
-    ZX_GUEST_PKT_MEMORY = 1,
-    ZX_GUEST_PKT_IO = 2,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union zx_guest_packet_t_union {
-    // ZX_GUEST_PKT_MEMORY
-    memory: zx_guest_memory_t,
-    // ZX_GUEST_PKT_IO
-    io: zx_guest_io_t,
-}
-
-// Note: values of this type must maintain the invariant that
-// `packet_type` correctly indicates the type of `contents`.
-// Failure to do so will result in unsafety.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct zx_guest_packet_t {
-    packet_type: zx_guest_packet_t_type,
-    contents: zx_guest_packet_t_union,
-}
-
-impl fmt::Debug for zx_guest_packet_t {
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f, "zx_guest_packet_t {{ packet_type: {:?}, contents: ", self.packet_type)?;
-        match self.packet_type {
-            zx_guest_packet_t_type::ZX_GUEST_PKT_MEMORY =>
-                write!(f, "zx_guest_packet_t_union {{ memory: {:?} }} }}",
-                    unsafe { self.contents.memory }
-                ),
-            zx_guest_packet_t_type::ZX_GUEST_PKT_IO =>
-                write!(f, "zx_guest_packet_t_union {{ io: {:?} }} }}",
-                    unsafe { self.contents.io }
-                ),
-        }
-    }
-}
-
-impl cmp::PartialEq for zx_guest_packet_t {
-    fn eq(&self, other: &Self) -> bool {
-        (self.packet_type == other.packet_type) &&
-        match self.packet_type {
-            zx_guest_packet_t_type::ZX_GUEST_PKT_MEMORY =>
-                unsafe { self.contents.memory == other.contents.memory },
-            zx_guest_packet_t_type::ZX_GUEST_PKT_IO =>
-                unsafe { self.contents.io == other.contents.io },
-        }
-    }
-}
-
-impl cmp::Eq for zx_guest_packet_t {}
-
-#[cfg(target_arch="x86_64")]
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_vcpu_create_args_t {
-    pub ip: zx_vaddr_t,
-    pub cr3: zx_vaddr_t,
-    pub apic_vmo: zx_handle_t,
-}
-
-#[cfg(not(target_arch="x86_64"))]
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_vcpu_create_args_t {
-    pub ip: zx_vaddr_t,
-}
-
-include!("definitions.rs");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/funty/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/funty/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/funty/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/funty/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"6849d2910b58738971b31fd8a72d67e2236e0e1977498e89c72e46f7e7208c2d","src/lib.rs":"e6ff9f12221287497eae8cbe1e69d52f502455092e75f761e45b2d22c8d242c6"},"package":"fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/funty/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/funty/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/funty/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/funty/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "funty"
+version = "1.1.0"
+authors = ["myrrlyn <self@myrrlyn.dev>"]
+include = ["Cargo.toml", "src/lib.rs"]
+description = "Trait generalization over the primitive types"
+documentation = "https://docs.rs/funty"
+readme = "README.md"
+keywords = ["numerics", "primitives", "traits"]
+categories = ["no-std", "rust-patterns"]
+license = "MIT"
+repository = "https://github.com/myrrlyn/funty"
+[dev-dependencies.static_assertions]
+version = "1"
+
+[features]
+default = ["std"]
+std = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/funty/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/funty/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/funty/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/funty/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1557 @@
+/*! `fun`damental `ty`pes
+
+This crate provides trait unification of the Rust fundamental numbers, allowing
+users to declare the behavior they want from a number without committing to a
+single particular numeric type.
+
+The number types can be categorized along two axes: behavior and width. Traits
+for each axis and group on that axis are provided:
+
+## Numeric Categories
+
+The most general category is represented by the trait [`IsNumber`]. It is
+implemented by all the numeric fundamentals, and includes only the traits that
+they all implement. This is an already-large amount: basic memory management,
+comparison, rendering, and numeric arithmetic.
+
+The numbers are then split into [`IsInteger`] and [`IsFloat`]. The former fills
+out the API of `f32` and `f64`, while the latter covers all of the `iN` and `uN`
+numbers.
+
+Lastly, [`IsInteger`] splits further, into [`IsSigned`] and [`IsUnsigned`].
+These provide the last specializations unique to the differences between `iN`
+and `uN`.
+
+## Width Categories
+
+Every number implements the trait `IsN` for the `N` of its bit width. `isize`
+and `usize` implement the trait that matches their width on the target platform.
+
+In addition, the trait groups `AtLeastN` and `AtMostN` enable clamping the range
+of acceptable widths to lower or upper bounds. These traits are equivalent to
+`mem::size_of::<T>() >= N` and `mem::size_of::<T>() <= N`, respectively.
+
+[`IsFloat`]: trait.IsFloat.html
+[`IsInteger`]: trait.IsInteger.html
+[`IsNumber`]: trait.IsNumber.html
+[`IsSigned`]: trait.IsSigned.html
+[`IsUnsigned`]: trait.IsUnsigned.html
+!*/
+
+#![cfg_attr(not(feature = "std"), no_std)]
+#![deny(unconditional_recursion)]
+
+use core::{
+	convert::{
+		TryFrom,
+		TryInto,
+	},
+	fmt::{
+		Binary,
+		Debug,
+		Display,
+		LowerExp,
+		LowerHex,
+		Octal,
+		UpperExp,
+		UpperHex,
+	},
+	hash::Hash,
+	iter::{
+		Product,
+		Sum,
+	},
+	num::{
+		FpCategory,
+		ParseIntError,
+	},
+	ops::{
+		Add,
+		AddAssign,
+		BitAnd,
+		BitAndAssign,
+		BitOr,
+		BitOrAssign,
+		BitXor,
+		BitXorAssign,
+		Div,
+		DivAssign,
+		Mul,
+		MulAssign,
+		Neg,
+		Not,
+		Rem,
+		RemAssign,
+		Shl,
+		ShlAssign,
+		Shr,
+		ShrAssign,
+		Sub,
+		SubAssign,
+	},
+	str::FromStr,
+};
+
+/// Declare that a type is an abstract number.
+///
+/// This unifies all of the signed-integer, unsigned-integer, and floating-point
+/// types.
+pub trait IsNumber: Sized
+	+ Send
+	+ Sync
+	+ Unpin
+	+ Clone
+	+ Copy
+	+ Default
+	+ FromStr
+	//  cmp
+	+ PartialEq<Self>
+	+ PartialOrd<Self>
+	//  fmt
+	+ Debug
+	+ Display
+	//  iter
+	+ Product<Self>
+	+ for<'a> Product<&'a Self>
+	+ Sum<Self>
+	+ for<'a> Sum<&'a Self>
+	//  numeric ops
+	+ Add<Self, Output = Self>
+	+ for<'a> Add<&'a Self, Output = Self>
+	+ AddAssign<Self>
+	+ for<'a> AddAssign<&'a Self>
+	+ Sub<Self, Output = Self>
+	+ for<'a> Sub<&'a Self, Output = Self>
+	+ SubAssign<Self>
+	+ for<'a> SubAssign<&'a Self>
+	+ Mul<Self, Output = Self>
+	+ for<'a> Mul<&'a Self, Output = Self>
+	+ MulAssign<Self>
+	+ for<'a> MulAssign<&'a Self>
+	+ Div<Self, Output = Self>
+	+ for<'a> Div<&'a Self, Output = Self>
+	+ DivAssign<Self>
+	+ for<'a> DivAssign<&'a Self>
+	+ Rem<Self, Output = Self>
+	+ for<'a> Rem<&'a Self, Output = Self>
+	+ RemAssign<Self>
+	+ for<'a> RemAssign<&'a Self>
+{
+	type Bytes;
+
+	/// Return the memory representation of this number as a byte array in
+	/// big-endian (network) byte order.
+	fn to_be_bytes(self) -> Self::Bytes;
+
+	/// Return the memory representation of this number as a byte array in
+	/// little-endian byte order.
+	fn to_le_bytes(self) -> Self::Bytes;
+
+	/// Return the memory representation of this number as a byte array in
+	/// native byte order.
+	fn to_ne_bytes(self) -> Self::Bytes;
+
+	/// Create a numeric value from its representation as a byte array in big
+	/// endian.
+	fn from_be_bytes(bytes: Self::Bytes) -> Self;
+
+	/// Create a numeric value from its representation as a byte array in little
+	/// endian.
+	fn from_le_bytes(bytes: Self::Bytes) -> Self;
+
+	/// Create a numeric value from its memory representation as a byte array in
+	/// native endianness.
+	fn from_ne_bytes(bytes: Self::Bytes) -> Self;
+}
+
+/// Declare that a type is a fixed-point integer.
+///
+/// This unifies all of the signed and unsigned integral types.
+pub trait IsInteger:
+	IsNumber
+	+ Hash
+	+ Eq
+	+ Ord
+	+ Binary
+	+ LowerHex
+	+ UpperHex
+	+ Octal
+	+ BitAnd<Self, Output = Self>
+	+ for<'a> BitAnd<&'a Self, Output = Self>
+	+ BitAndAssign<Self>
+	+ for<'a> BitAndAssign<&'a Self>
+	+ BitOr<Self, Output = Self>
+	+ for<'a> BitOr<&'a Self, Output = Self>
+	+ BitOrAssign<Self>
+	+ for<'a> BitOrAssign<&'a Self>
+	+ BitXor<Self, Output = Self>
+	+ for<'a> BitXor<&'a Self, Output = Self>
+	+ BitXorAssign<Self>
+	+ for<'a> BitXorAssign<&'a Self>
+	+ Not<Output = Self>
+	+ TryFrom<i8>
+	+ TryFrom<u8>
+	+ TryFrom<i16>
+	+ TryFrom<u16>
+	+ TryFrom<i32>
+	+ TryFrom<u32>
+	+ TryFrom<i64>
+	+ TryFrom<u64>
+	+ TryFrom<i128>
+	+ TryFrom<u128>
+	+ TryFrom<isize>
+	+ TryFrom<usize>
+	+ TryInto<i8>
+	+ TryInto<u8>
+	+ TryInto<i16>
+	+ TryInto<u16>
+	+ TryInto<i32>
+	+ TryInto<u32>
+	+ TryInto<i64>
+	+ TryInto<u64>
+	+ TryInto<i128>
+	+ TryInto<u128>
+	+ TryInto<isize>
+	+ TryInto<usize>
+	+ Shl<i8, Output = Self>
+	+ for<'a> Shl<&'a i8, Output = Self>
+	+ ShlAssign<i8>
+	+ for<'a> ShlAssign<&'a i8>
+	+ Shr<i8, Output = Self>
+	+ for<'a> Shr<&'a i8, Output = Self>
+	+ ShrAssign<i8>
+	+ for<'a> ShrAssign<&'a i8>
+	+ Shl<u8, Output = Self>
+	+ for<'a> Shl<&'a u8, Output = Self>
+	+ ShlAssign<u8>
+	+ for<'a> ShlAssign<&'a u8>
+	+ Shr<u8, Output = Self>
+	+ for<'a> Shr<&'a u8, Output = Self>
+	+ ShrAssign<u8>
+	+ for<'a> ShrAssign<&'a u8>
+	+ Shl<i16, Output = Self>
+	+ for<'a> Shl<&'a i16, Output = Self>
+	+ ShlAssign<i16>
+	+ for<'a> ShlAssign<&'a i16>
+	+ Shr<i16, Output = Self>
+	+ for<'a> Shr<&'a i16, Output = Self>
+	+ ShrAssign<i16>
+	+ for<'a> ShrAssign<&'a i16>
+	+ Shl<u16, Output = Self>
+	+ for<'a> Shl<&'a u16, Output = Self>
+	+ ShlAssign<u16>
+	+ for<'a> ShlAssign<&'a u16>
+	+ Shr<u16, Output = Self>
+	+ for<'a> Shr<&'a u16, Output = Self>
+	+ ShrAssign<u16>
+	+ for<'a> ShrAssign<&'a u16>
+	+ Shl<i32, Output = Self>
+	+ for<'a> Shl<&'a i32, Output = Self>
+	+ ShlAssign<i32>
+	+ for<'a> ShlAssign<&'a i32>
+	+ Shr<i32, Output = Self>
+	+ for<'a> Shr<&'a i32, Output = Self>
+	+ ShrAssign<i32>
+	+ for<'a> ShrAssign<&'a i32>
+	+ Shl<u32, Output = Self>
+	+ for<'a> Shl<&'a u32, Output = Self>
+	+ ShlAssign<u32>
+	+ for<'a> ShlAssign<&'a u32>
+	+ Shr<u32, Output = Self>
+	+ for<'a> Shr<&'a u32, Output = Self>
+	+ ShrAssign<u32>
+	+ for<'a> ShrAssign<&'a u32>
+	+ Shl<i64, Output = Self>
+	+ for<'a> Shl<&'a i64, Output = Self>
+	+ ShlAssign<i64>
+	+ for<'a> ShlAssign<&'a i64>
+	+ Shr<i64, Output = Self>
+	+ for<'a> Shr<&'a i64, Output = Self>
+	+ ShrAssign<i64>
+	+ for<'a> ShrAssign<&'a i64>
+	+ Shl<u64, Output = Self>
+	+ for<'a> Shl<&'a u64, Output = Self>
+	+ ShlAssign<u64>
+	+ for<'a> ShlAssign<&'a u64>
+	+ Shr<u64, Output = Self>
+	+ for<'a> Shr<&'a u64, Output = Self>
+	+ ShrAssign<u64>
+	+ for<'a> ShrAssign<&'a u64>
+	+ Shl<i128, Output = Self>
+	+ for<'a> Shl<&'a i128, Output = Self>
+	+ ShlAssign<i128>
+	+ for<'a> ShlAssign<&'a i128>
+	+ Shr<i128, Output = Self>
+	+ for<'a> Shr<&'a i128, Output = Self>
+	+ ShrAssign<i128>
+	+ for<'a> ShrAssign<&'a i128>
+	+ Shl<u128, Output = Self>
+	+ for<'a> Shl<&'a u128, Output = Self>
+	+ ShlAssign<u128>
+	+ for<'a> ShlAssign<&'a u128>
+	+ Shr<u128, Output = Self>
+	+ for<'a> Shr<&'a u128, Output = Self>
+	+ ShrAssign<u128>
+	+ for<'a> ShrAssign<&'a u128>
+	+ Shl<isize, Output = Self>
+	+ for<'a> Shl<&'a isize, Output = Self>
+	+ ShlAssign<isize>
+	+ for<'a> ShlAssign<&'a isize>
+	+ Shr<isize, Output = Self>
+	+ for<'a> Shr<&'a isize, Output = Self>
+	+ ShrAssign<isize>
+	+ for<'a> ShrAssign<&'a isize>
+	+ Shl<usize, Output = Self>
+	+ for<'a> Shl<&'a usize, Output = Self>
+	+ ShlAssign<usize>
+	+ for<'a> ShlAssign<&'a usize>
+	+ Shr<usize, Output = Self>
+	+ for<'a> Shr<&'a usize, Output = Self>
+	+ ShrAssign<usize>
+	+ for<'a> ShrAssign<&'a usize>
+{
+	/// The type’s zero value.
+	const ZERO: Self;
+
+	/// The type’s minimum value. This is zero for unsigned integers.
+	const MIN: Self;
+
+	/// The type’s maximum value.
+	const MAX: Self;
+
+	/// Returns the smallest value that can be represented by this integer type.
+	fn min_value() -> Self;
+
+	/// Returns the largest value that can be represented by this integer type.
+	fn max_value() -> Self;
+
+	/// Converts a string slice in a given base to an integer.
+	///
+	/// The string is expected to be an optional `+` or `-` sign followed by
+	/// digits. Leading and trailing whitespace represent an error. Digits are a
+	/// subset of these characters, depending on `radix`:
+	///
+	/// - `0-9`
+	/// - `a-z`
+	/// - `A-Z`
+	///
+	/// # Panics
+	///
+	/// This function panics if `radix` is not in the range from 2 to 36.
+	fn from_str_radix(src: &str, radix: u32) -> Result<Self, ParseIntError>;
+
+	/// Returns the number of ones in the binary representation of `self`.
+	fn count_ones(self) -> u32;
+
+	/// Returns the number of zeros in the binary representation of `self`.
+	fn count_zeros(self) -> u32;
+
+	/// Returns the number of leading zeros in the binary representation of
+	/// `self`.
+	fn leading_zeros(self) -> u32;
+
+	/// Returns the number of trailing zeros in the binary representation of
+	/// `self`.
+	fn trailing_zeros(self) -> u32;
+
+	/// Returns the number of leading ones in the binary representation of
+	/// `self`.
+	fn leading_ones(self) -> u32;
+
+	/// Returns the number of trailing ones in the binary representation of
+	/// `self`.
+	fn trailing_ones(self) -> u32;
+
+	/// Shifts the bits to the left by a specified amount, `n`, wrapping the
+	/// truncated bits to the end of the resulting integer.
+	///
+	/// Please note this isn’t the same operation as the `<<` shifting operator!
+	fn rotate_left(self, n: u32) -> Self;
+
+	/// Shifts the bits to the right by a specified amount, `n`, wrapping the
+	/// truncated bits to the beginning of the resulting integer.
+	///
+	/// Please note this isn’t the same operation as the `>>` shifting operator!
+	fn rotate_right(self, n: u32) -> Self;
+
+	/// Reverses the byte order of the integer.
+	fn swap_bytes(self) -> Self;
+
+	/// Reverses the bit pattern of the integer.
+	fn reverse_bits(self) -> Self;
+
+	/// Converts an integer from big endian to the target’s endianness.
+	///
+	/// On big endian this is a no-op. On little endian the bytes are swapped.
+	fn from_be(self) -> Self;
+
+	/// Converts an integer frm little endian to the target’s endianness.
+	///
+	/// On little endian this is a no-op. On big endian the bytes are swapped.
+	fn from_le(self) -> Self;
+
+	/// Converts `self` to big endian from the target’s endianness.
+	///
+	/// On big endian this is a no-op. On little endian the bytes are swapped.
+	fn to_be(self) -> Self;
+
+	/// Converts `self` to little endian from the target’s endianness.
+	///
+	/// On little endian this is a no-op. On big endian the bytes are swapped.
+	fn to_le(self) -> Self;
+
+	/// Checked integer addition. Computes `self + rhs`, returning `None` if
+	/// overflow occurred.
+	fn checked_add(self, rhs: Self) -> Option<Self>;
+
+	/// Checked integer subtraction. Computes `self - rhs`, returning `None` if
+	/// overflow occurred.
+	fn checked_sub(self, rhs: Self) -> Option<Self>;
+
+	/// Checked integer multiplication. Computes `self * rhs`, returning `None`
+	/// if overflow occurred.
+	fn checked_mul(self, rhs: Self) -> Option<Self>;
+
+	/// Checked integer division. Computes `self / rhs`, returning `None` if
+	/// `rhs == 0` or the division results in overflow.
+	fn checked_div(self, rhs: Self) -> Option<Self>;
+
+	/// Checked Euclidean division. Computes `self.div_euclid(rhs)`, returning
+	/// `None` if `rhs == 0` or the division results in overflow.
+	fn checked_div_euclid(self, rhs: Self) -> Option<Self>;
+
+	/// Checked integer remainder. Computes `self % rhs`, returning `None` if
+	/// `rhs == 0` or the division results in overflow.
+	fn checked_rem(self, rhs: Self) -> Option<Self>;
+
+	/// Checked Euclidean remainder. Computes `self.rem_euclid(rhs)`, returning
+	/// `None` if `rhs == 0` or the division results in overflow.
+	fn checked_rem_euclid(self, rhs: Self) -> Option<Self>;
+
+	/// Checked negation. Computes `-self`, returning `None` if `self == MIN`.
+	///
+	/// Note that negating any positive integer will overflow.
+	fn checked_neg(self) -> Option<Self>;
+
+	/// Checked shift left. Computes `self << rhs`, returning `None` if `rhs` is
+	/// larger than or equal to the number of bits in `self`.
+	fn checked_shl(self, rhs: u32) -> Option<Self>;
+
+	/// Checked shift right. Computes `self >> rhs`, returning `None` if `rhs`
+	/// is larger than or equal to the number of bits in `self`.
+	fn checked_shr(self, rhs: u32) -> Option<Self>;
+
+	/// Checked exponentiation. Computes `self.pow(exp)`, returning `None` if
+	/// overflow occurred.
+	fn checked_pow(self, rhs: u32) -> Option<Self>;
+
+	/// Saturating integer addition. Computes `self + rhs`, saturating at the
+	/// numeric bounds instead of overflowing.
+	fn saturating_add(self, rhs: Self) -> Self;
+
+	/// Saturating integer subtraction. Computes `self - rhs`, saturating at the
+	/// numeric bounds instead of overflowing.
+	fn saturating_sub(self, rhs: Self) -> Self;
+
+	/// Saturating integer multiplication. Computes `self * rhs`, saturating at
+	/// the numeric bounds instead of overflowing.
+	fn saturating_mul(self, rhs: Self) -> Self;
+
+	/// Saturating integer exponentiation. Computes `self.pow(exp)`, saturating
+	/// at the numeric bounds instead of overflowing.
+	fn saturating_pow(self, rhs: u32) -> Self;
+
+	/// Wrapping (modular) addition. Computes `self + rhs`, wrapping around at
+	/// the boundary of the type.
+	fn wrapping_add(self, rhs: Self) -> Self;
+
+	/// Wrapping (modular) subtraction. Computes `self - rhs`, wrapping around
+	/// at the boundary of the type.
+	fn wrapping_sub(self, rhs: Self) -> Self;
+
+	/// Wrapping (modular) multiplication. Computes `self * rhs`, wrapping
+	/// around at the boundary of the type.
+	fn wrapping_mul(self, rhs: Self) -> Self;
+
+	/// Wrapping (modular) division. Computes `self / rhs`, wrapping around at
+	/// the boundary of the type.
+	///
+	/// # Signed Integers
+	///
+	/// The only case where such wrapping can occur is when one divides
+	/// `MIN / -1` on a signed type (where `MIN` is the negative minimal value
+	/// for the type); this is equivalent to `-MIN`, a positive value that is
+	/// too large to represent in the type. In such a case, this function
+	/// returns `MIN` itself.
+	///
+	/// # Unsigned Integers
+	///
+	/// Wrapping (modular) division. Computes `self / rhs`. Wrapped division on
+	/// unsigned types is just normal division. There’s no way wrapping could
+	/// ever happen. This function exists, so that all operations are accounted
+	/// for in the wrapping operations.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0.
+	fn wrapping_div(self, rhs: Self) -> Self;
+
+	/// Wrapping Eulidean division. Computes `self.div_euclid(rhs)`, wrapping
+	/// around at the boundary of the type.
+	///
+	/// # Signed Types
+	///
+	/// Wrapping will only occur in `MIN / -1` on a signed type (where `MIN` is
+	/// the negative minimal value for the type). This is equivalent to `-MIN`,
+	/// a positive value that is too large to represent in the type. In this
+	/// case, this method returns `MIN` itself.
+	///
+	/// # Unsigned Types
+	///
+	/// Wrapped division on unsigned types is just normal division. There’s no
+	/// way wrapping could ever happen. This function exists, so that all
+	/// operations are accounted for in the wrapping operations. Since, for the
+	/// positive integers, all common definitions of division are equal, this is
+	/// exactly equal to `self.wrapping_div(rhs)`.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0.
+	fn wrapping_div_euclid(self, rhs: Self) -> Self;
+
+	/// Wrapping (modular) remainder. Computes `self % rhs`, wrapping around at
+	/// the boundary of the type.
+	///
+	/// # Signed Integers
+	///
+	/// Such wrap-around never actually occurs mathematically; implementation
+	/// artifacts make `x % y` invalid for `MIN / -1` on a signed type (where
+	/// `MIN` is the negative minimal value). In such a case, this function
+	/// returns `0`.
+	///
+	/// # Unsigned Integers
+	///
+	/// Wrapped remainder calculation on unsigned types is just the regular
+	/// remainder calculation. There’s no way wrapping could ever happen. This
+	/// function exists, so that all operations are accounted for in the
+	/// wrapping operations.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0.
+	fn wrapping_rem(self, rhs: Self) -> Self;
+
+	/// Wrapping Euclidean remainder. Computes `self.rem_euclid(rhs)`, wrapping
+	/// around at the boundary of the type.
+	///
+	/// # Signed Integers
+	///
+	/// Wrapping will only occur in `MIN % -1` on a signed type (where `MIN` is
+	/// the negative minimal value for the type). In this case, this method
+	/// returns 0.
+	///
+	/// # Unsigned Integers
+	///
+	/// Wrapped modulo calculation on unsigned types is just the regular
+	/// remainder calculation. There’s no way wrapping could ever happen. This
+	/// function exists, so that all operations are accounted for in the
+	/// wrapping operations. Since, for the positive integers, all common
+	/// definitions of division are equal, this is exactly equal to
+	/// `self.wrapping_rem(rhs)`.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0.
+	fn wrapping_rem_euclid(self, rhs: Self) -> Self;
+
+	/// Wrapping (modular) negation. Computes `-self`, wrapping around at the
+	/// boundary of the type.
+	///
+	/// # Signed Integers
+	///
+	/// The  only case where such wrapping can occur is when one negates `MIN`
+	/// on a signed type (where `MIN` is the negative minimal value for the
+	/// type); this is a positive value that is too large to represent in the
+	/// type. In such a case, this function returns `MIN` itself.
+	///
+	/// # Unsigned Integers
+	///
+	/// Since unsigned types do not have negative equivalents all applications
+	/// of this function will wrap (except for `-0`). For values smaller than
+	/// the corresponding signed type’s maximum the result is the same as
+	/// casting the corresponding signed value. Any larger values are equivalent
+	/// to `MAX + 1 - (val - MAX - 1)` where `MAX` is the corresponding signed
+	/// type’s maximum.
+	fn wrapping_neg(self) -> Self;
+
+	/// Panic-free bitwise shift-left; yields `self << mask(rhs)`, where `mask`
+	/// removes any high-order bits of `rhs` that would cause the shift to
+	/// exceed the bitwidth of the type.
+	///
+	/// Note that this is not the same as a rotate-left; the RHS of a wrapping
+	/// shift-left is restricted to the range of the type, rather than the bits
+	/// shifted out of the LHS being returned to the other end. The primitive
+	/// integer types all implement a `rotate_left` function, which may be what
+	/// you want instead.
+	fn wrapping_shl(self, rhs: u32) -> Self;
+
+	/// Panic-free bitwise shift-right; yields `self >> mask(rhs)`, where `mask`
+	/// removes any high-order bits of `rhs` that would cause the shift to
+	/// exceed the bitwidth of the type.
+	///
+	/// Note that this is not the same as a rotate-right; the RHS of a wrapping
+	/// shift-right is restricted to the range of the type, rather than the bits
+	/// shifted out of the LHS being returned to the other end. The primitive
+	/// integer types all implement a `rotate_right` function, which may be what
+	/// you want instead.
+	fn wrapping_shr(self, rhs: u32) -> Self;
+
+	/// Wrapping (modular) exponentiation. Computes `self.pow(exp)`, wrapping
+	/// around at the boundary of the type.
+	fn wrapping_pow(self, rhs: u32) -> Self;
+
+	/// Calculates `self + rhs`
+	///
+	/// Returns a tuple of the addition along with a boolean indicating whether
+	/// an arithmetic overflow would occur. If an overflow would have occurred
+	/// then the wrapped value is returned.
+	fn overflowing_add(self, rhs: Self) -> (Self, bool);
+
+	/// Calculates `self - rhs`
+	///
+	/// Returns a tuple of the subtraction along with a boolean indicating
+	/// whether an arithmetic overflow would occur. If an overflow would have
+	/// occurred then the wrapped value is returned.
+	fn overflowing_sub(self, rhs: Self) -> (Self, bool);
+
+	/// Calculates the multiplication of `self` and `rhs`.
+	///
+	/// Returns a tuple of the multiplication along with a boolean indicating
+	/// whether an arithmetic overflow would occur. If an overflow would have
+	/// occurred then the wrapped value is returned.
+	fn overflowing_mul(self, rhs: Self) -> (Self, bool);
+
+	/// Calculates the divisor when `self` is divided by `rhs`.
+	///
+	/// Returns a tuple of the divisor along with a boolean indicating whether
+	/// an arithmetic overflow would occur. If an overflow would occur then self
+	/// is returned.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0.
+	fn overflowing_div(self, rhs: Self) -> (Self, bool);
+
+	/// Calculates the quotient of Euclidean division `self.div_euclid(rhs)`.
+	///
+	/// Returns a tuple of the divisor along with a boolean indicating whether
+	/// an arithmetic overflow would occur. If an overflow would occur then self
+	/// is returned.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0.
+	fn overflowing_div_euclid(self, rhs: Self) -> (Self, bool);
+
+	/// Calculates the remainder when `self` is divided by `rhs`.
+	///
+	/// Returns a tuple of the remainder after dividing along with a boolean
+	/// indicating whether an arithmetic overflow would occur. If an overflow
+	/// would occur then 0 is returned.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0.
+	fn overflowing_rem(self, rhs: Self) -> (Self, bool);
+
+	/// Overflowing Euclidean remainder. Calculates `self.rem_euclid(rhs)`.
+	///
+	/// Returns a tuple of the remainder after dividing along with a boolean
+	/// indicating whether an arithmetic overflow would occur. If an overflow
+	/// would occur then 0 is returned.
+	///
+	/// # Panics
+	///
+	/// This function will panic if rhs is 0.
+	fn overflowing_rem_euclid(self, rhs: Self) -> (Self, bool);
+
+	/// Negates self, overflowing if this is equal to the minimum value.
+	///
+	/// Returns a tuple of the negated version of self along with a boolean
+	/// indicating whether an overflow happened. If `self` is the minimum value
+	/// (e.g., `i32::MIN` for values of type `i32`), then the minimum value will
+	/// be returned again and `true` will be returned for an overflow happening.
+	fn overflowing_neg(self) -> (Self, bool);
+
+	/// Shifts self left by `rhs` bits.
+	///
+	/// Returns a tuple of the shifted version of self along with a boolean
+	/// indicating whether the shift value was larger than or equal to the
+	/// number of bits. If the shift value is too large, then value is masked
+	/// (N-1) where N is the number of bits, and this value is then used to
+	/// perform the shift.
+	fn overflowing_shl(self, rhs: u32) -> (Self, bool);
+
+	/// Shifts self right by `rhs` bits.
+	///
+	/// Returns a tuple of the shifted version of self along with a boolean
+	/// indicating whether the shift value was larger than or equal to the
+	/// number of bits. If the shift value is too large, then value is masked
+	/// (N-1) where N is the number of bits, and this value is then used to
+	/// perform the shift.
+	fn overflowing_shr(self, rhs: u32) -> (Self, bool);
+
+	/// Raises self to the power of `exp`, using exponentiation by squaring.
+	///
+	/// Returns a tuple of the exponentiation along with a bool indicating
+	/// whether an overflow happened.
+	fn overflowing_pow(self, rhs: u32) -> (Self, bool);
+
+	/// Raises self to the power of `exp`, using exponentiation by squaring.
+	fn pow(self, rhs: u32) -> Self;
+
+	/// Calculates the quotient of Euclidean division of self by rhs.
+	///
+	/// This computes the integer `n` such that
+	/// `self = n * rhs + self.rem_euclid(rhs)`, with
+	/// `0 <= self.rem_euclid(rhs) < rhs`.
+	///
+	/// In other words, the result is `self / rhs` rounded to the integer `n`
+	/// such that `self >= n * rhs`. If `self > 0`, this is equal to round
+	/// towards zero (the default in Rust); if `self < 0`, this is equal to
+	/// round towards +/- infinity.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0 or the division results in
+	/// overflow.
+	fn div_euclid(self, rhs: Self) -> Self;
+
+	/// Calculates the least nonnegative remainder of `self (mod rhs)`.
+	///
+	/// This is done as if by the Euclidean division algorithm -- given
+	/// `r = self.rem_euclid(rhs)`, `self = rhs * self.div_euclid(rhs) + r`, and
+	/// `0 <= r < abs(rhs)`.
+	///
+	/// # Panics
+	///
+	/// This function will panic if `rhs` is 0 or the division results in
+	/// overflow.
+	fn rem_euclid(self, rhs: Self) -> Self;
+}
+
+/// Declare that a type is a signed integer.
+pub trait IsSigned: IsInteger + Neg {
+	/// Checked absolute value. Computes `self.abs()`, returning `None` if
+	/// `self == MIN`.
+	fn checked_abs(self) -> Option<Self>;
+
+	/// Wrapping (modular) absolute value. Computes `self.abs()`, wrapping
+	/// around at the boundary of the type.
+	///
+	/// The only case where such wrapping can occur is when one takes the
+	/// absolute value of the negative minimal value for the type this is a
+	/// positive value that is too large to represent in the type. In such a
+	/// case, this function returns `MIN` itself.
+	fn wrapping_abs(self) -> Self;
+
+	/// Computes the absolute value of `self`.
+	///
+	/// Returns a tuple of the absolute version of self along with a boolean
+	/// indicating whether an overflow happened. If self is the minimum value
+	/// (e.g., iN::MIN for values of type iN), then the minimum value will be
+	/// returned again and true will be returned for an overflow happening.
+	fn overflowing_abs(self) -> (Self, bool);
+
+	//// Computes the absolute value of self.
+	///
+	/// # Overflow behavior
+	///
+	/// The absolute value of `iN::min_value()` cannot be represented as an
+	/// `iN`, and attempting to calculate it will cause an overflow. This means
+	/// that code in debug mode will trigger a panic on this case and optimized
+	/// code will return `iN::min_value()` without a panic.
+	fn abs(self) -> Self;
+
+	/// Returns a number representing sign of `self`.
+	///
+	/// - `0` if the number is zero
+	/// - `1` if the number is positive
+	/// - `-1` if the number is negative
+	fn signum(self) -> Self;
+
+	/// Returns `true` if `self` is positive and `false` if the number is zero
+	/// or negative.
+	fn is_positive(self) -> bool;
+
+	/// Returns `true` if `self` is negative and `false` if the number is zero
+	/// or positive.
+	fn is_negative(self) -> bool;
+}
+
+/// Declare that a type is an unsigned integer.
+pub trait IsUnsigned: IsInteger {
+	/// Returns `true` if and only if `self == 2^k` for some `k`.
+	fn is_power_of_two(self) -> bool;
+
+	/// Returns the smallest power of two greater than or equal to `self`.
+	///
+	/// When return value overflows (i.e., `self > (1 << (N-1))` for type `uN`),
+	/// it panics in debug mode and return value is wrapped to 0 in release mode
+	/// (the only situation in which method can return 0).
+	fn next_power_of_two(self) -> Self;
+
+	/// Returns the smallest power of two greater than or equal to `n`. If the
+	/// next power of two is greater than the type’s maximum value, `None` is
+	/// returned, otherwise the power of two is wrapped in `Some`.
+	fn checked_next_power_of_two(self) -> Option<Self>;
+}
+
+/// Declare that a type is a floating-point number.
+pub trait IsFloat:
+	IsNumber
+	+ LowerExp
+	+ UpperExp
+	+ Neg
+	+ From<f32>
+	+ From<i8>
+	+ From<i16>
+	+ From<u8>
+	+ From<u16>
+{
+	/// The unsigned integer type of the same width as `Self`.
+	type Raw: IsUnsigned;
+
+	/// The radix or base of the internal representation of `f32`.
+	const RADIX: u32;
+
+	/// Number of significant digits in base 2.
+	const MANTISSA_DIGITS: u32;
+
+	/// Approximate number of significant digits in base 10.
+	const DIGITS: u32;
+
+	/// [Machine epsilon] value for `f32`.
+	///
+	/// This is the difference between `1.0` and the next larger representable
+	/// number.
+	///
+	/// [Machine epsilon]: https://en.wikipedia.org/wiki/Machine_epsilon
+	const EPSILON: Self;
+
+	/// Smallest finite `f32` value.
+	const MIN: Self;
+
+	/// Smallest positive normal `f32` value.
+	const MIN_POSITIVE: Self;
+
+	/// Largest finite `f32` value.
+	const MAX: Self;
+
+	/// One greater than the minimum possible normal power of 2 exponent.
+	const MIN_EXP: i32;
+
+	/// Maximum possible power of 2 exponent.
+	const MAX_EXP: i32;
+
+	/// Minimum possible normal power of 10 exponent.
+	const MIN_10_EXP: i32;
+
+	/// Maximum possible power of 10 exponent.
+	const MAX_10_EXP: i32;
+
+	/// Not a Number (NaN).
+	const NAN: Self;
+
+	/// Infinity (∞).
+	const INFINITY: Self;
+
+	/// Negative infinity (−∞).
+	const NEG_INFINITY: Self;
+
+	/// Archimedes' constant (Ï€)
+	const PI: Self;
+
+	/// π/2
+	const FRAC_PI_2: Self;
+
+	/// π/3
+	const FRAC_PI_3: Self;
+
+	/// π/4
+	const FRAC_PI_4: Self;
+
+	/// π/6
+	const FRAC_PI_6: Self;
+
+	/// π/8
+	const FRAC_PI_8: Self;
+
+	/// 1/Ï€
+	const FRAC_1_PI: Self;
+
+	/// 2/Ï€
+	const FRAC_2_PI: Self;
+
+	/// 2/sqrt(Ï€)
+	const FRAC_2_SQRT_PI: Self;
+
+	/// sqrt(2)
+	const SQRT_2: Self;
+
+	/// 1/sqrt(2)
+	const FRAC_1_SQRT_2: Self;
+
+	/// Euler’s number (e)
+	const E: Self;
+
+	/// log<sub>2</sub>(e)
+	const LOG2_E: Self;
+
+	/// log<sub>10</sub>(e)
+	const LOG10_E: Self;
+
+	/// ln(2)
+	const LN_2: Self;
+
+	/// ln(10)
+	const LN_10: Self;
+
+	//  These functions are only available in `libstd`, because they rely on the
+	//  system math library `libm` which is not provided by `libcore`.
+
+	/// Returns the largest integer less than or equal to a number.
+	#[cfg(feature = "std")]
+	fn floor(self) -> Self;
+
+	/// Returns the smallest integer greater than or equal to a number.
+	#[cfg(feature = "std")]
+	fn ceil(self) -> Self;
+
+	/// Returns the nearest integer to a number. Round half-way cases away from
+	/// `0.0`.
+	#[cfg(feature = "std")]
+	fn round(self) -> Self;
+
+	/// Returns the integer part of a number.
+	#[cfg(feature = "std")]
+	fn trunc(self) -> Self;
+
+	/// Returns the fractional part of a number.
+	#[cfg(feature = "std")]
+	fn fract(self) -> Self;
+
+	/// Computes the absolute value of `self`. Returns `NAN` if the
+	/// number is `NAN`.
+	#[cfg(feature = "std")]
+	fn abs(self) -> Self;
+
+	/// Returns a number that represents the sign of `self`.
+	///
+	/// - `1.0` if the number is positive, `+0.0` or `INFINITY`
+	/// - `-1.0` if the number is negative, `-0.0` or `NEG_INFINITY`
+	/// - `NAN` if the number is `NAN`
+	#[cfg(feature = "std")]
+	fn signum(self) -> Self;
+
+	/// Returns a number composed of the magnitude of `self` and the sign of
+	/// `sign`.
+	///
+	/// Equal to `self` if the sign of `self` and `sign` are the same, otherwise
+	/// equal to `-self`. If `self` is a `NAN`, then a `NAN` with the sign of
+	/// `sign` is returned.
+	#[cfg(feature = "std")]
+	fn copysign(self, sign: Self) -> Self;
+
+	/// Fused multiply-add. Computes `(self * a) + b` with only one rounding
+	/// error, yielding a more accurate result than an unfused multiply-add.
+	///
+	/// Using `mul_add` can be more performant than an unfused multiply-add if
+	/// the target architecture has a dedicated `fma` CPU instruction.
+	#[cfg(feature = "std")]
+	fn mul_add(self, a: Self, b: Self) -> Self;
+
+	/// Calculates Euclidean division, the matching method for `rem_euclid`.
+	///
+	/// This computes the integer `n` such that
+	/// `self = n * rhs + self.rem_euclid(rhs)`.
+	/// In other words, the result is `self / rhs` rounded to the integer `n`
+	/// such that `self >= n * rhs`.
+	#[cfg(feature = "std")]
+	fn div_euclid(self, rhs: Self) -> Self;
+
+	/// Calculates the least nonnegative remainder of `self (mod rhs)`.
+	///
+	/// In particular, the return value `r` satisfies `0.0 <= r < rhs.abs()` in
+	/// most cases. However, due to a floating point round-off error it can
+	/// result in `r == rhs.abs()`, violating the mathematical definition, if
+	/// `self` is much smaller than `rhs.abs()` in magnitude and `self < 0.0`.
+	/// This result is not an element of the function's codomain, but it is the
+	/// closest floating point number in the real numbers and thus fulfills the
+	/// property `self == self.div_euclid(rhs) * rhs + self.rem_euclid(rhs)`
+	/// approximatively.
+	#[cfg(feature = "std")]
+	fn rem_euclid(self, rhs: Self) -> Self;
+
+	/// Raises a number to an integer power.
+	///
+	/// Using this function is generally faster than using `powf`
+	#[cfg(feature = "std")]
+	fn powi(self, n: i32) -> Self;
+
+	/// Raises a number to a floating point power.
+	#[cfg(feature = "std")]
+	fn powf(self, n: Self) -> Self;
+
+	/// Returns the square root of a number.
+	///
+	/// Returns NaN if `self` is a negative number.
+	#[cfg(feature = "std")]
+	fn sqrt(self) -> Self;
+
+	/// Returns `e^(self)`, (the exponential function).
+	#[cfg(feature = "std")]
+	fn exp(self) -> Self;
+
+	/// Returns `2^(self)`.
+	#[cfg(feature = "std")]
+	fn exp2(self) -> Self;
+
+	/// Returns the natural logarithm of the number.
+	#[cfg(feature = "std")]
+	fn ln(self) -> Self;
+
+	/// Returns the logarithm of the number with respect to an arbitrary base.
+	///
+	/// The result may not be correctly rounded owing to implementation details;
+	/// `self.log2()` can produce more accurate results for base 2, and
+	/// `self.log10()` can produce more accurate results for base 10.
+	#[cfg(feature = "std")]
+	fn log(self, base: Self) -> Self;
+
+	/// Returns the base 2 logarithm of the number.
+	#[cfg(feature = "std")]
+	fn log2(self) -> Self;
+
+	/// Returns the base 10 logarithm of the number.
+	#[cfg(feature = "std")]
+	fn log10(self) -> Self;
+
+	/// Returns the cubic root of a number.
+	#[cfg(feature = "std")]
+	fn cbrt(self) -> Self;
+
+	/// Computes the sine of a number (in radians).
+	#[cfg(feature = "std")]
+	fn hypot(self, other: Self) -> Self;
+
+	/// Computes the sine of a number (in radians).
+	#[cfg(feature = "std")]
+	fn sin(self) -> Self;
+
+	/// Computes the cosine of a number (in radians).
+	#[cfg(feature = "std")]
+	fn cos(self) -> Self;
+
+	/// Computes the tangent of a number (in radians).
+	#[cfg(feature = "std")]
+	fn tan(self) -> Self;
+
+	/// Computes the arcsine of a number. Return value is in radians in the
+	/// range [-pi/2, pi/2] or NaN if the number is outside the range [-1, 1].
+	#[cfg(feature = "std")]
+	fn asin(self) -> Self;
+
+	/// Computes the arccosine of a number. Return value is in radians in the
+	/// range [0, pi] or NaN if the number is outside the range [-1, 1].
+	#[cfg(feature = "std")]
+	fn acos(self) -> Self;
+
+	/// Computes the arctangent of a number. Return value is in radians in the
+	/// range [-pi/2, pi/2];
+	#[cfg(feature = "std")]
+	fn atan(self) -> Self;
+
+	/// Computes the four quadrant arctangent of `self` (`y`) and `other` (`x`)
+	/// in radians.
+	///
+	/// - `x = 0`, `y = 0`: `0`
+	/// - `x >= 0`: `arctan(y/x)` -> `[-pi/2, pi/2]`
+	/// - `y >= 0`: `arctan(y/x) + pi` -> `(pi/2, pi]`
+	/// - `y < 0`: `arctan(y/x) - pi` -> `(-pi, -pi/2)`
+	#[cfg(feature = "std")]
+	fn atan2(self, other: Self) -> Self;
+
+	/// Simultaneously computes the sine and cosine of the number, `x`. Returns
+	/// `(sin(x), cos(x))`.
+	#[cfg(feature = "std")]
+	fn sin_cos(self) -> (Self, Self);
+
+	/// Returns `e^(self) - 1` in a way that is accurate even if the number is
+	/// close to zero.
+	#[cfg(feature = "std")]
+	fn exp_m1(self) -> Self;
+
+	/// Returns `ln(1+n)` (natural logarithm) more accurately than if the
+	/// operations were performed separately.
+	#[cfg(feature = "std")]
+	fn ln_1p(self) -> Self;
+
+	/// Hyperbolic sine function.
+	#[cfg(feature = "std")]
+	fn sinh(self) -> Self;
+
+	/// Hyperbolic cosine function.
+	#[cfg(feature = "std")]
+	fn cosh(self) -> Self;
+
+	/// Hyperbolic tangent function.
+	#[cfg(feature = "std")]
+	fn tanh(self) -> Self;
+
+	/// Inverse hyperbolic sine function.
+	#[cfg(feature = "std")]
+	fn asinh(self) -> Self;
+
+	/// Inverse hyperbolic cosine function.
+	#[cfg(feature = "std")]
+	fn acosh(self) -> Self;
+
+	/// Inverse hyperbolic tangent function.
+	#[cfg(feature = "std")]
+	fn atanh(self) -> Self;
+
+	/// Returns `true` if this value is `NaN`.
+	fn is_nan(self) -> bool;
+
+	/// Returns `true` if this value is positive infinity or negative infinity,
+	/// and `false` otherwise.
+	fn is_infinite(self) -> bool;
+
+	/// Returns `true` if this number is neither infinite nor `NaN`.
+	fn is_finite(self) -> bool;
+
+	/// Returns `true` if the number is neither zero, infinite, [subnormal], or
+	/// `NaN`.
+	///
+	/// [subnormal]: https://en.wixipedia.org/wiki/Denormal_number
+	fn is_normal(self) -> bool;
+
+	/// Returns the floating point category of the number. If only one property
+	/// is going to be tested, it is generally faster to use the specific
+	/// predicate instead.
+	fn classify(self) -> FpCategory;
+
+	/// Returns `true` if `self` has a positive sign, including `+0.0`, `NaN`s
+	/// with positive sign bit and positive infinity.
+	fn is_sign_positive(self) -> bool;
+
+	/// Returns `true` if `self` has a negative sign, including `-0.0`, `NaN`s
+	/// with negative sign bit and negative infinity.
+	fn is_sign_negative(self) -> bool;
+
+	/// Takes the reciprocal (inverse) of a number, `1/x`.
+	fn recip(self) -> Self;
+
+	/// Converts radians to degrees.
+	fn to_degrees(self) -> Self;
+
+	/// Converts degrees to radians.
+	fn to_radians(self) -> Self;
+
+	/// Returns the maximum of the two numbers.
+	fn max(self, other: Self) -> Self;
+
+	/// Returns the minimum of the two numbers.
+	fn min(self, other: Self) -> Self;
+
+	/// Raw transmutation to `u32`.
+	///
+	/// This is currently identical to `transmute::<f32, u32>(self)` on all
+	/// platforms.
+	///
+	/// See `from_bits` for some discussion of the portability of this operation
+	/// (there are almost no issues).
+	///
+	/// Note that this function is distinct from `as` casting, which attempts to
+	/// preserve the *numeric* value, and not the bitwise value.
+	fn to_bits(self) -> Self::Raw;
+
+	/// Raw transmutation from `u32`.
+	///
+	/// This is currently identical to `transmute::<u32, f32>(v)` on all
+	/// platforms. It turns out this is incredibly portable, for two reasons:
+	///
+	/// - Floats and Ints have the same endianness on all supported platforms.
+	/// - IEEE-754 very precisely specifies the bit layout of floats.
+	///
+	/// However there is one caveat: prior to the 2008 version of IEEE-754, how
+	/// to interpret the NaN signaling bit wasn't actually specified. Most
+	/// platforms (notably x86 and ARM) picked the interpretation that was
+	/// ultimately standardized in 2008, but some didn't (notably MIPS). As a
+	/// result, all signaling NaNs on MIPS are quiet NaNs on x86, and
+	/// vice-versa.
+	///
+	/// Rather than trying to preserve signaling-ness cross-platform, this
+	/// implementation favors preserving the exact bits. This means that
+	/// any payloads encoded in NaNs will be preserved even if the result of
+	/// this method is sent over the network from an x86 machine to a MIPS one.
+	///
+	/// If the results of this method are only manipulated by the same
+	/// architecture that produced them, then there is no portability concern.
+	///
+	/// If the input isn't NaN, then there is no portability concern.
+	///
+	/// If you don't care about signalingness (very likely), then there is no
+	/// portability concern.
+	///
+	/// Note that this function is distinct from `as` casting, which attempts to
+	/// preserve the *numeric* value, and not the bitwise value.
+	fn from_bits(bits: Self::Raw) -> Self;
+}
+
+/// Declare that a type is exactly eight bits wide.
+pub trait Is8: IsNumber {}
+
+/// Declare that a type is exactly sixteen bits wide.
+pub trait Is16: IsNumber {}
+
+/// Declare that a type is exactly thirty-two bits wide.
+pub trait Is32: IsNumber {}
+
+/// Declare that a type is exactly sixty-four bits wide.
+pub trait Is64: IsNumber {}
+
+/// Declare that a type is exactly one hundred twenty-eight bits wide.
+pub trait Is128: IsNumber {}
+
+/// Declare that a type is eight or more bits wide.
+pub trait AtLeast8: IsNumber {}
+
+/// Declare that a type is sixteen or more bits wide.
+pub trait AtLeast16: IsNumber {}
+
+/// Declare that a type is thirty-two or more bits wide.
+pub trait AtLeast32: IsNumber {}
+
+/// Declare that a type is sixty-four or more bits wide.
+pub trait AtLeast64: IsNumber {}
+
+/// Declare that a type is one hundred twenty-eight or more bits wide.
+pub trait AtLeast128: IsNumber {}
+
+/// Declare that a type is eight or fewer bits wide.
+pub trait AtMost8: IsNumber {}
+
+/// Declare that a type is sixteen or fewer bits wide.
+pub trait AtMost16: IsNumber {}
+
+/// Declare that a type is thirty-two or fewer bits wide.
+pub trait AtMost32: IsNumber {}
+
+/// Declare that a type is sixty-four or fewer bits wide.
+pub trait AtMost64: IsNumber {}
+
+/// Declare that a type is one hundred twenty-eight or fewer bits wide.
+pub trait AtMost128: IsNumber {}
+
+macro_rules! func {
+	( $name:ident ( self $(, $arg:ident : $t:ty)* ) $( -> $ret:ty )? ) => {
+		fn $name ( self $(, $arg : $t )* ) $( -> $ret )? { <Self>:: $name ( self $(, $arg )* )}
+	};
+	( $name:ident ( &self $(, $arg:ident : $t:ty)* ) $( -> $ret:ty )? ) => {
+		fn $name ( &self $(, $arg : $t )* ) $( -> $ret )? { <Self>:: $name ( &self $(, $arg )* )}
+	};
+	( $name:ident ( &mut self $(, $arg:ident : $t:ty)* ) $( -> $ret:ty )? ) => {
+		fn $name ( &mut self $(, $arg : $t )* ) $( -> $ret )? { <Self>:: $name ( &mut self $(, $arg )* )}
+	};
+	( $name:ident ( $($arg:ident : $t:ty),* ) $( -> $ret:ty )? ) => {
+		fn $name ( $($arg : $t ),* ) $( -> $ret )? { <Self>:: $name ( $( $arg ),* )}
+	};
+}
+
+macro_rules! stdfunc {
+	( $name:ident ( self $(, $arg:ident : $t:ty)* ) $( -> $ret:ty )? ) => {
+		#[cfg(feature = "std")]
+		fn $name ( self $(, $arg : $t )* ) $( -> $ret )? { <Self>:: $name ( self $(, $arg )* )}
+	};
+	( $name:ident ( &self $(, $arg:ident : $t:ty)* ) $( -> $ret:ty )? ) => {
+		#[cfg(feature = "std")]
+		fn $name ( &self $(, $arg : $t )* ) $( -> $ret )? { <Self>:: $name ( &self $(, $arg )* )}
+	};
+	( $name:ident ( &mut self $(, $arg:ident : $t:ty)* ) $( -> $ret:ty )? ) => {
+		#[cfg(feature = "std")]
+		fn $name ( &mut self $(, $arg : $t )* ) $( -> $ret )? { <Self>:: $name ( &mut self $(, $arg )* )}
+	};
+	( $name:ident ( $($arg:ident : $t:ty),* ) $( -> $ret:ty )? ) => {
+		#[cfg(feature = "std")]
+		fn $name ( $($arg : $t ),* ) $( -> $ret )? { <Self>:: $name ( $( $arg ),* )}
+	};
+}
+
+macro_rules! impl_for {
+	( IsNumber => $($t:ty),+ $(,)? ) => { $(
+		impl IsNumber for $t {
+			type Bytes = [u8; core::mem::size_of::<Self>()];
+
+			func!(to_be_bytes(self) -> Self::Bytes);
+			func!(to_le_bytes(self) -> Self::Bytes);
+			func!(to_ne_bytes(self) -> Self::Bytes);
+			func!(from_be_bytes(bytes: Self::Bytes) -> Self);
+			func!(from_le_bytes(bytes: Self::Bytes) -> Self);
+			func!(from_ne_bytes(bytes: Self::Bytes) -> Self);
+		}
+	)+ };
+	( IsInteger => $($t:ty),+ $(,)? ) => { $(
+		impl IsInteger for $t {
+			const ZERO: Self = 0;
+			const MIN: Self = <Self>::min_value();
+			const MAX: Self = <Self>::max_value();
+
+			func!(min_value() -> Self);
+			func!(max_value() -> Self);
+			func!(from_str_radix(src: &str, radix: u32) -> Result<Self, ParseIntError>);
+			func!(count_ones(self) -> u32);
+			func!(count_zeros(self) -> u32);
+			func!(leading_zeros(self) -> u32);
+			func!(trailing_zeros(self) -> u32);
+			func!(leading_ones(self) -> u32);
+			func!(trailing_ones(self) -> u32);
+			func!(rotate_left(self, n: u32) -> Self);
+			func!(rotate_right(self, n: u32) -> Self);
+			func!(swap_bytes(self) -> Self);
+			func!(reverse_bits(self) -> Self);
+			func!(from_be(self) -> Self);
+			func!(from_le(self) -> Self);
+			func!(to_be(self) -> Self);
+			func!(to_le(self) -> Self);
+			func!(checked_add(self, rhs: Self) -> Option<Self>);
+			func!(checked_sub(self, rhs: Self) -> Option<Self>);
+			func!(checked_mul(self, rhs: Self) -> Option<Self>);
+			func!(checked_div(self, rhs: Self) -> Option<Self>);
+			func!(checked_div_euclid(self, rhs: Self) -> Option<Self>);
+			func!(checked_rem(self, rhs: Self) -> Option<Self>);
+			func!(checked_rem_euclid(self, rhs: Self) -> Option<Self>);
+			func!(checked_neg(self) -> Option<Self>);
+			func!(checked_shl(self, rhs: u32) -> Option<Self>);
+			func!(checked_shr(self, rhs: u32) -> Option<Self>);
+			func!(checked_pow(self, rhs: u32) -> Option<Self>);
+			func!(saturating_add(self, rhs: Self) -> Self);
+			func!(saturating_sub(self, rhs: Self) -> Self);
+			func!(saturating_mul(self, rhs: Self) -> Self);
+			func!(saturating_pow(self, rhs: u32) -> Self);
+			func!(wrapping_add(self, rhs: Self) -> Self);
+			func!(wrapping_sub(self, rhs: Self) -> Self);
+			func!(wrapping_mul(self, rhs: Self) -> Self);
+			func!(wrapping_div(self, rhs: Self) -> Self);
+			func!(wrapping_div_euclid(self, rhs: Self) -> Self);
+			func!(wrapping_rem(self, rhs: Self) -> Self);
+			func!(wrapping_rem_euclid(self, rhs: Self) -> Self);
+			func!(wrapping_neg(self) -> Self);
+			func!(wrapping_shl(self, rhs: u32) -> Self);
+			func!(wrapping_shr(self, rhs: u32) -> Self);
+			func!(wrapping_pow(self, rhs: u32) -> Self);
+			func!(overflowing_add(self, rhs: Self) -> (Self, bool));
+			func!(overflowing_sub(self, rhs: Self) -> (Self, bool));
+			func!(overflowing_mul(self, rhs: Self) -> (Self, bool));
+			func!(overflowing_div(self, rhs: Self) -> (Self, bool));
+			func!(overflowing_div_euclid(self, rhs: Self) -> (Self, bool));
+			func!(overflowing_rem(self, rhs: Self) -> (Self, bool));
+			func!(overflowing_rem_euclid(self, rhs: Self) -> (Self, bool));
+			func!(overflowing_neg(self) -> (Self, bool));
+			func!(overflowing_shl(self, rhs: u32) -> (Self, bool));
+			func!(overflowing_shr(self, rhs: u32) -> (Self, bool));
+			func!(overflowing_pow(self, rhs: u32) -> (Self, bool));
+			func!(pow(self, rhs: u32) -> Self);
+			func!(div_euclid(self, rhs: Self) -> Self);
+			func!(rem_euclid(self, rhs: Self) -> Self);
+		}
+	)+ };
+	( IsSigned => $($t:ty),+ $(,)? ) => { $(
+		impl IsSigned for $t {
+			func!(checked_abs(self) -> Option<Self>);
+			func!(wrapping_abs(self) -> Self);
+			func!(overflowing_abs(self) -> (Self, bool));
+			func!(abs(self) -> Self);
+			func!(signum(self) -> Self);
+			func!(is_positive(self) -> bool);
+			func!(is_negative(self) -> bool);
+		}
+	)+ };
+	( IsUnsigned => $($t:ty),+ $(,)? ) => { $(
+		impl IsUnsigned for $t {
+			func!(is_power_of_two(self) -> bool);
+			func!(next_power_of_two(self) -> Self);
+			func!(checked_next_power_of_two(self) -> Option<Self>);
+		}
+	)+ };
+	( IsFloat => $($t:ident | $u:ty),+ $(,)? ) => { $(
+		impl IsFloat for $t {
+			type Raw = $u;
+
+			const RADIX: u32 = core::$t::RADIX;
+			const MANTISSA_DIGITS: u32 = core::$t::MANTISSA_DIGITS;
+			const DIGITS: u32 = core::$t::DIGITS;
+			const EPSILON: Self = core::$t::EPSILON;
+			const MIN: Self = core::$t::MIN;
+			const MIN_POSITIVE: Self = core::$t::MIN_POSITIVE;
+			const MAX: Self = core::$t::MAX;
+			const MIN_EXP: i32 = core::$t::MIN_EXP;
+			const MAX_EXP: i32 = core::$t::MAX_EXP;
+			const MIN_10_EXP: i32 = core::$t::MIN_10_EXP;
+			const MAX_10_EXP: i32 = core::$t::MAX_10_EXP;
+			const NAN: Self = core::$t::NAN;
+			const INFINITY: Self = core::$t::INFINITY;
+			const NEG_INFINITY: Self = core::$t::NEG_INFINITY;
+
+			const PI: Self = core::$t::consts::PI;
+			const FRAC_PI_2: Self = core::$t::consts::FRAC_PI_2;
+			const FRAC_PI_3: Self = core::$t::consts::FRAC_PI_3;
+			const FRAC_PI_4: Self = core::$t::consts::FRAC_PI_4;
+			const FRAC_PI_6: Self = core::$t::consts::FRAC_PI_6;
+			const FRAC_PI_8: Self = core::$t::consts::FRAC_PI_8;
+			const FRAC_1_PI: Self = core::$t::consts::FRAC_1_PI;
+			const FRAC_2_PI: Self = core::$t::consts::FRAC_2_PI;
+			const FRAC_2_SQRT_PI: Self = core::$t::consts::FRAC_2_SQRT_PI;
+			const SQRT_2: Self = core::$t::consts::SQRT_2;
+			const FRAC_1_SQRT_2: Self = core::$t::consts::FRAC_1_SQRT_2;
+			const E: Self = core::$t::consts::E;
+			const LOG2_E: Self = core::$t::consts::LOG2_E;
+			const LOG10_E: Self = core::$t::consts::LOG10_E;
+			const LN_2: Self = core::$t::consts::LN_2;
+			const LN_10: Self = core::$t::consts::LN_10;
+
+			stdfunc!(floor(self) -> Self);
+			stdfunc!(ceil(self) -> Self);
+			stdfunc!(round(self) -> Self);
+			stdfunc!(trunc(self) -> Self);
+			stdfunc!(fract(self) -> Self);
+			stdfunc!(abs(self) -> Self);
+			stdfunc!(signum(self) -> Self);
+			stdfunc!(copysign(self, sign: Self) -> Self);
+			stdfunc!(mul_add(self, a: Self, b: Self) -> Self);
+			stdfunc!(div_euclid(self, rhs: Self) -> Self);
+			stdfunc!(rem_euclid(self, rhs: Self) -> Self);
+			stdfunc!(powi(self, n: i32) -> Self);
+			stdfunc!(powf(self, n: Self) -> Self);
+			stdfunc!(sqrt(self) -> Self);
+			stdfunc!(exp(self) -> Self);
+			stdfunc!(exp2(self) -> Self);
+			stdfunc!(ln(self) -> Self);
+			stdfunc!(log(self, base: Self) -> Self);
+			stdfunc!(log2(self) -> Self);
+			stdfunc!(log10(self) -> Self);
+			stdfunc!(cbrt(self) -> Self);
+			stdfunc!(hypot(self, other: Self) -> Self);
+			stdfunc!(sin(self) -> Self);
+			stdfunc!(cos(self) -> Self);
+			stdfunc!(tan(self) -> Self);
+			stdfunc!(asin(self) -> Self);
+			stdfunc!(acos(self) -> Self);
+			stdfunc!(atan(self) -> Self);
+			stdfunc!(atan2(self, other: Self) -> Self);
+			stdfunc!(sin_cos(self) -> (Self, Self));
+			stdfunc!(exp_m1(self) -> Self);
+			stdfunc!(ln_1p(self) -> Self);
+			stdfunc!(sinh(self) -> Self);
+			stdfunc!(cosh(self) -> Self);
+			stdfunc!(tanh(self) -> Self);
+			stdfunc!(asinh(self) -> Self);
+			stdfunc!(acosh(self) -> Self);
+			stdfunc!(atanh(self) -> Self);
+
+			func!(is_nan(self) -> bool);
+			func!(is_infinite(self) -> bool);
+			func!(is_finite(self) -> bool);
+			func!(is_normal(self) -> bool);
+			func!(classify(self) -> FpCategory);
+			func!(is_sign_positive(self) -> bool);
+			func!(is_sign_negative(self) -> bool);
+			func!(recip(self) -> Self);
+			func!(to_degrees(self) -> Self);
+			func!(to_radians(self) -> Self);
+			func!(max(self, other: Self) -> Self);
+			func!(min(self, other: Self) -> Self);
+			func!(to_bits(self) -> Self::Raw);
+			func!(from_bits(bits: Self::Raw) -> Self);
+		}
+	)+ };
+	( $which:ty => $($t:ty),+ $(,)? ) => { $(
+		impl $which for $t {}
+	)+ };
+}
+
+impl_for!(IsNumber => i8, i16, i32, i64, i128, isize, u8, u16, u32, u64, u128, usize, f32, f64);
+impl_for!(IsInteger => i8, i16, i32, i64, i128, isize, u8, u16, u32, u64, u128, usize);
+impl_for!(IsSigned => i8, i16, i32, i64, i128, isize);
+impl_for!(IsUnsigned => u8, u16, u32, u64, u128, usize);
+impl_for!(IsFloat => f32 | u32, f64 | u64);
+
+impl_for!(Is8 => i8, u8);
+impl_for!(Is16 => i16, u16);
+impl_for!(Is32 => i32, u32, f32);
+impl_for!(Is64 => i64, u64, f64);
+impl_for!(Is128 => i128, u128);
+
+#[cfg(target_pointer_width = "16")]
+impl_for!(Is16 => isize, usize);
+
+#[cfg(target_pointer_width = "32")]
+impl_for!(Is32 => isize, usize);
+
+#[cfg(target_pointer_width = "64")]
+impl_for!(Is64 => isize, usize);
+
+impl_for!(AtLeast8 => i8, i16, i32, i64, i128, isize, u8, u16, u32, u64, u128, usize, f32, f64);
+impl_for!(AtLeast16 => i16, i32, i64, i128, u16, u32, u64, u128, f32, f64);
+impl_for!(AtLeast32 => i32, i64, i128, u32, u64, u128, f32, f64);
+impl_for!(AtLeast64 => i64, i128, u64, u128, f64);
+impl_for!(AtLeast128 => i128, u128);
+
+#[cfg(any(
+	target_pointer_width = "16",
+	target_pointer_width = "32",
+	target_pointer_width = "64"
+))]
+impl_for!(AtLeast16 => isize, usize);
+
+#[cfg(any(target_pointer_width = "32", target_pointer_width = "64"))]
+impl_for!(AtLeast32 => isize, usize);
+
+#[cfg(target_pointer_width = "64")]
+impl_for!(AtLeast64 => isize, usize);
+
+impl_for!(AtMost8 => i8, u8);
+impl_for!(AtMost16 => i8, i16, u8, u16);
+impl_for!(AtMost32 => i8, i16, i32, u8, u16, u32, f32);
+impl_for!(AtMost64 => i8, i16, i32, i64, isize, u8, u16, u32, u64, usize, f32, f64);
+impl_for!(AtMost128 => i8, i16, i32, i64, i128, isize, u8, u16, u32, u64, u128, usize, f32, f64);
+
+#[cfg(target_pointer_width = "16")]
+impl_for!(AtMost16 => isize, usize);
+
+#[cfg(any(target_pointer_width = "16", target_pointer_width = "32"))]
+impl_for!(AtMost32 => isize, usize);
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use static_assertions::*;
+
+	assert_impl_all!(i8: IsInteger, IsSigned, Is8);
+	assert_impl_all!(i16: IsInteger, IsSigned, Is16);
+	assert_impl_all!(i32: IsInteger, IsSigned, Is32);
+	assert_impl_all!(i64: IsInteger, IsSigned, Is64);
+	assert_impl_all!(i128: IsInteger, IsSigned, Is128);
+	assert_impl_all!(isize: IsInteger, IsSigned);
+
+	assert_impl_all!(u8: IsInteger, IsUnsigned, Is8);
+	assert_impl_all!(u16: IsInteger, IsUnsigned, Is16);
+	assert_impl_all!(u32: IsInteger, IsUnsigned, Is32);
+	assert_impl_all!(u64: IsInteger, IsUnsigned, Is64);
+	assert_impl_all!(u128: IsInteger, IsUnsigned, Is128);
+	assert_impl_all!(usize: IsInteger, IsUnsigned);
+
+	assert_impl_all!(f32: IsFloat, Is32);
+	assert_impl_all!(f64: IsFloat, Is64);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"ada95ad396b6e2a7729720f088a3226e5a2a0f56e9a5c513eb154298967c957e","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/lib.rs":"ef37b6ac0db5b839aa6d9be32a010e67b50b69e265a8cb596ce216379457d345","tests/_require_features.rs":"9ada801a1008101250b8a8f8fccfb2bc5d08348d70d50c2b2cd0c208930c07fe","tests/abortable.rs":"51d972ce72b24b6120c7acf038ed58e50491d0c5422c4aefb24eb5d6f53cf660","tests/arc_wake.rs":"7976c1f7178305b1b0aa9bda2c609c5df41f46f56acbc9b20ad2685f9ed8ae82","tests/async_await_macros.rs":"27a8cf6f60c0572f8c0c53dc2956d1637fade5b84107d6cfd0c0476824bc0072","tests/atomic_waker.rs":"8186be2328c6ab4d6da08ff45a71df71ae09b65a41dccf3a95ddcc178a6e09e2","tests/basic_combinators.rs":"6e37b0a62f16abb66576136f248439f4a2d496e337507d1033dc8f0a059b832d","tests/buffer_unordered.rs":"3cc91adb1dbc932fe412d78d5332dcc324c0fc0ae92a6edc46fcaf7d341fef66","tests/compat.rs":"6d9eb9bcd360935e9fe1e59e4d57abda93370d6cb3a80ac5b751a43dbd5d078c","tests/eager_drop.rs":"a19cd1faba9c9150f6f2a704023d553ecb1b0c5bad24a100559e1e8d0b9eb2b6","tests/eventual.rs":"4e3db25ac3f5ebb191caf538c460234eb95413b17441372cc3234d2cbecdc551","tests/fuse.rs":"bb63141f1486e755d0cdea1d93e302ad864a2186aa5287f909a0b3a922e82065","tests/future_obj.rs":"d3583f9caed8369e510650b0a7e260cd70b56faf483b395cfa6f1d7bdb9b5fdc","tests/future_try_flatten_stream.rs":"c3a96f69a68f1f05395831037e33bbacfe547c068f59b219f4e1cb80ad5dc503","tests/futures_ordered.rs":"2fd64d53c6f2b922a7c42211fc8d632c0569eed0bc1ff91739b90727967b8da6","tests/futures_unordered.rs":"db657f4a49ac6bbfb03a53d6a5d1825c1e5958fe900b44373578b66dff786db4","tests/inspect.rs":"edd4127f23a11dbda5e01c398165802744b48c05fdc2102f45d7c4c4dcff4735","tests/io_buf_reader.rs":"80330de847914895f38b211283ca8be01af7651762c63284d0e80b1d642c9c8c","tests/io_buf_writer.rs":"3317297f94589bda55847cd16da6b2ffe56f8b55e82fc6006d9af46309a62e09","tests/io_cursor.rs":"ba680826f1fccec31e7e5d41607042b951ec3737756faa141dbaed4d91a276f8","tests/io_lines.rs":"9836a9b505b8d98b570579858a4ca19e6ee535c03f8bc8fe88a8e3314eb31ae1","tests/io_read.rs":"3e3514a9c36a4eb725c90a7a1603b8cf1f4ae223f6062deef125839cca439b71","tests/io_read_exact.rs":"1c25bcba969d338f6dc4d078d05c1461a0f9cd24fe559fd45df01f780c9da878","tests/io_read_line.rs":"16552df0f0e8cd970eb1932e3bd425c7f3d52bc4245104bc2f39cba11d94d101","tests/io_read_to_string.rs":"a425f2352309c56e4927ff6c90dcf9f77632601d2b2441c95eced22ba061b206","tests/io_read_until.rs":"28a7f8a9b3b2c38f4f6c0ecec101241c3532d9c5426ec8fa5e9e92681e56cf24","tests/io_window.rs":"0d18334b1eb35f5e93099e19c0cab22abe5971d8531176b81345fc89d07692a8","tests/io_write.rs":"2676c41b74bb86a225aab4bd855920c696bf6b630227b93b5a686ea91eeab306","tests/join_all.rs":"ad4160975feffe9aa5be75290925cdd8420e90796a579a2557a39ec4b09dbef8","tests/macro_comma_support.rs":"8724177c1d0b1d91205437a5b2577a42a14acd46272e72de61048c5bc61d2401","tests/mutex.rs":"70103a673615e8497ce27fe1dbd12fdc11ef5b8c38b2258047d653deb157434e","tests/object_safety.rs":"9d047190387ed8334113687003c23407c80c858411f5ec7d5c505500f9639dfc","tests/oneshot.rs":"b0c126acac05d01d0d359561ab757256363fadf977b33e7cad3fa1b344cfc0af","tests/ready_queue.rs":"c0162775a4cf35e8131b361cb577a5485875ed1be518440794110c535176f968","tests/recurse.rs":"4888b1fc33e759f40595f03b5eb7bd5b94d45a7bb96454ecfea375221e1c5fb9","tests/select_all.rs":"ce4853a7f64a84778cc8400c0d46ecb5e4a1c01f94a366f14c374acf709db50e","tests/select_ok.rs":"35161a60336dcba9316f9f90db87634261022846e35c2601eb7ff7aa3661d7c9","tests/shared.rs":"559e568e0275c68adf10ae302b2678f684acb89cd4596182a9bc39f3e7612451","tests/sink.rs":"ff9432b8ac0de249b8ce9a7af820282ba80d5a7c2bb2a7b46d8a5ab061ceb117","tests/sink_fanout.rs":"5ce5fc6b73f973ef0e4ca51feea41505f91279713de97cbfc470b6880f3d6cd4","tests/split.rs":"72b16e19c1efe1bfab47b723e1ac55a28e69f831734b592887d1474c1adbef1a","tests/stream.rs":"e14a56043168bdeae713b250653946d4ae275ceab2480ff7ae905758445192df","tests/stream_catch_unwind.rs":"d8c8a07b57f67d8905f5a4f471304e84d6495410ae17b1f4ae26707c0327a1c9","tests/stream_into_async_read.rs":"d29912076b62a1fa66e3bd06c087726e0f80884477ce5eb56c806e25f22ca463","tests/stream_peekable.rs":"07d9a42299943f6b616cccdace7ca564b2241ccd639b6baa25b91558cf79ab49","tests/stream_select_all.rs":"d1f6478f17d75c7f31698dcda94151aaad5169a08b3d58f304ede216e098bf47","tests/stream_select_next_some.rs":"d7f6a85eafc7ae950595081a895a8684098f2cf4ec56924037262b1d1b922d59","tests/try_join.rs":"1eda385b53b1d99af140f54ddad26fe652cf558baf43e0aa2a69f6491c1d731f","tests/try_join_all.rs":"1f5e71db731826b8b7adad43d33ccad5b182f38bd40adf08fcadd286b48bee5c","tests/try_stream.rs":"cf9af07a31697a43ab0071d958f71fba6d84b2f3031301fd309821a72f3de5f7","tests/unfold.rs":"b04075b4dce395aea72393ea7d562f7ff63539ef32c6cccdf74c6f6634b19e8b","tests_disabled/all.rs":"038e4dc5b6a3585437a20ef3218bcc3f1010d59395d261ab0a71ecc2530fb348","tests_disabled/bilock.rs":"53e2cc7eb28a21b7b65e4cd2949dada2c505d5649586c8ffe79ca6d8cecba1b3","tests_disabled/stream.rs":"54d19c97376c1d5220b3e8b872da1be615e66a39c6a2e3dc7d12506b21596940"},"package":"9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"}
\ No newline at end of file
+{"files":{"Cargo.toml":"18b2346090f16bc528f7a074a629f12870ff3a6c62a49dc9b24ac7f2acdec0e8","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/lib.rs":"c1969daa78ded2285a3f881d4e5ed874d4bc940593fd9a018c6bbec6c24db3e5","tests/_require_features.rs":"5ad24019430b498addfc1fd853e955c7b646d78d0727a8ca29f586c9aab45cff","tests/async_await_macros.rs":"e171f9f02e7b7b0d9c254ad9b0f777b0282a6742b7c72a0080d9f6e4a6a44a4d","tests/auto_traits.rs":"afd108f67ce7a1549071c0f2316af63be3cb9ef864ff9856c9b2d4e47987c349","tests/compat.rs":"1ab5af07f13fad9b8fbf29c0df89102687b6abe855ce92bac153d5f916b28689","tests/eager_drop.rs":"dc25d067207c06bbe094752d70bf161e206f00e162ffa3219583c8b4eb0816a1","tests/eventual.rs":"4e3db25ac3f5ebb191caf538c460234eb95413b17441372cc3234d2cbecdc551","tests/future_abortable.rs":"4c81607472a85c5d87a5fe8a510a24cf1e8793fedf7f6cd6741ba1efd66615cd","tests/future_basic_combinators.rs":"4508c1250b85a4f749b7261bbd0ba728d3970e7ba277e84a006e76cf068fb54f","tests/future_fuse.rs":"bb63141f1486e755d0cdea1d93e302ad864a2186aa5287f909a0b3a922e82065","tests/future_inspect.rs":"9c03ceb770ce04fe9fd88a3489362642a0e34ae86a7b4958703e89e8b7a1ecf4","tests/future_join_all.rs":"4c7ab90afc4a0ae721e16f92615cd990a7a608de50b88ba06e6f931478ea04cd","tests/future_obj.rs":"a6aae88a194dc7d3bb961c20db78f180a01796cf7ea4bf106da98c40d89ed36d","tests/future_select_all.rs":"4cefc84d6b7ae2cf0007912cd0325fff6b926a4c26310e7b14a21868de61616f","tests/future_select_ok.rs":"1cabd03268641e1ac42b880344528bad73e3aeb6d6a8a141e652f339dd40184b","tests/future_shared.rs":"778e8763dea8df205581ec8dd9bf1453ca9f17065b496cecb6728147a148efeb","tests/future_try_flatten_stream.rs":"aa4542b5d88f62522b736fac4567613081df45ad3eb54b0b659cdadc9409c4db","tests/future_try_join_all.rs":"2bdd2e7d7f6d8b9c28b05e374906e10a914c2ff36762a0fd81ca4d892fad1341","tests/io_buf_reader.rs":"1d60479224d5aa9378d4aed6246362b08a823ee7c9977f6a5e44fce7c40116be","tests/io_buf_writer.rs":"8f7a78ab2955d2beb69d0881321d4191235540aef6448e875e7f76a2ffc55b89","tests/io_cursor.rs":"cba5a7b968b9f816ac33316ce1e4da67cb320aa5a21332c0f9a45694fa445dd7","tests/io_lines.rs":"72a310c885591793ed724d0aa2158ac2c9d1af22de417044d96b714f78317586","tests/io_read.rs":"e0a8fa9b27e042f03c9fe14e8f0f329a67e24afad1ce40b906a1ab4d2abef23a","tests/io_read_exact.rs":"42049cd67589992dc09764ffb3836c475115b26dee441fd4cc7e847b2d166667","tests/io_read_line.rs":"f360c30c32fc8c73b371281e86c3f1095da7ef23b702debb30d335046dc77dac","tests/io_read_to_end.rs":"ea3e961e39a0b92930bded05e8ba26e4902461ab53818843d40fae8065b1a803","tests/io_read_to_string.rs":"824921601ac49f15b9a0b349c900f9cc9081cf2646e6a86f443166f841f1320e","tests/io_read_until.rs":"36d9a98149b2410894121ccba49e5134e3209826b2225acfc787016cea2bc92a","tests/io_window.rs":"0d18334b1eb35f5e93099e19c0cab22abe5971d8531176b81345fc89d07692a8","tests/io_write.rs":"701032ff3d5a6e6a3d8cb4e373d1c93e4708f2e5ee0a6742fa626f27b6094b4d","tests/lock_mutex.rs":"055ec0365e7ccd3698aa4b02336fd4dd801017aeb2c19345c58b43415d40fa06","tests/macro_comma_support.rs":"627024ccadfe95194469d5bae2cc29b897b0118a664d7222408a2e234a10e939","tests/object_safety.rs":"9d047190387ed8334113687003c23407c80c858411f5ec7d5c505500f9639dfc","tests/oneshot.rs":"2109a8b3b524f4b36be9fb100f9b8c0d38bbd38d51716adcafdb65994b4a81d6","tests/ready_queue.rs":"cf7047cefab12ff0e2e0ca1ff2123ae87b85a2464fa4c2b6a0e2fc8ee5f25aa1","tests/recurse.rs":"b01b3d73b69ad90a767d297f974dac435817c39e12556fa6a3e6c725dd84f706","tests/sink.rs":"a96700307d6b2bea87c5567a93e0ac81d9ebc7ed354a35fa1b893b39ac8b3759","tests/sink_fanout.rs":"67ab58422040308353955311f75222e55378e4cc34557c7b34140bd20c259132","tests/stream.rs":"78be652d49845b2562e275293398686079b512d88e12661ea644e0881c97be27","tests/stream_abortable.rs":"60052b83b5eeb2395b77bc213f35098d2d5880529f0d83884582a8bbff78b139","tests/stream_buffer_unordered.rs":"143ee19056b9ee9e480903cf4a1b00da7d4e528c5804569bf8c40869e6ac6eed","tests/stream_catch_unwind.rs":"5cdaaf70436c49d3a7107bdc5547ddb8757c3d2057635aded70e485d0cb9cbfc","tests/stream_futures_ordered.rs":"b6f8beafd37e44e82c1f6de322ecba752f9d833d5520ed3ea63c303ea1979644","tests/stream_futures_unordered.rs":"32dac90b8abfe896b07f5bb5c9faa473c174f4df16440cb75aacc0fd683ccd29","tests/stream_into_async_read.rs":"00ecb18289ebc8f46ea0cf43e0dce0631d7698bd1303a7bcd84d0addc9d8b645","tests/stream_peekable.rs":"c0addb0c510e13183ba3d6102633b75a9223651ae80a64542e913c712fe69a30","tests/stream_select_all.rs":"3a9045754939da5b30305e78f0571d79a03aaa77030c6ccf82225f076e9843c9","tests/stream_select_next_some.rs":"871edcee3ffc16c697251b29c9ba500aa4e3e503aa738748d7392e3462c82dce","tests/stream_split.rs":"074e9c9b51b6f7ea83d77347b5a0c8d414ca32b90445fec9b85f7f4cd2a6049f","tests/stream_try_stream.rs":"cf9af07a31697a43ab0071d958f71fba6d84b2f3031301fd309821a72f3de5f7","tests/stream_unfold.rs":"7c6fbd10c782828793cbe1eb347ec776d99b185dad498e886f7161da76f76880","tests/task_arc_wake.rs":"5a49d074d1d5d9d5ec383dcd9a3868f636c1d7e34662e2573e467948db126206","tests/task_atomic_waker.rs":"8e85b4bc1360788646a52633dfe896d852773d6b482f81626cf534b97b7d937a","tests/test_macro.rs":"a46a946169c342c576936b60909165a50b94350501280ed9bba89d365af69287","tests/try_join.rs":"65f282f8351bd9a74642f2465c7aaf72ee7097002920989f156d60271652549e","tests_disabled/all.rs":"ddcd8fefb0d4a4a91a78328e7e652c35f93dc3669639d76fa0f56452b51abc23","tests_disabled/bilock.rs":"74e598568403df45460085166b7b90012d40dae8670b1c8dec126322a4ce171f","tests_disabled/stream.rs":"10e701f0eb83bcc6ec74d96529ad7dad5ad38bf5826574049501aeb07c5b76fa"},"package":"a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,21 +3,20 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "An implementation of futures and streams featuring zero allocations,\ncomposability, and iterator-like interfaces.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures/0.3.8"
+documentation = "https://docs.rs/futures/0.3"
 readme = "../README.md"
 keywords = ["futures", "async", "future"]
 categories = ["asynchronous"]
@@ -30,41 +29,55 @@
 [package.metadata.playground]
 features = ["std", "async-await", "compat", "io-compat", "executor", "thread-pool"]
 [dependencies.futures-channel]
-version = "0.3.8"
+version = "0.3.17"
 features = ["sink"]
 default-features = false
 
 [dependencies.futures-core]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-executor]
-version = "0.3.8"
+version = "0.3.17"
 optional = true
 default-features = false
 
 [dependencies.futures-io]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-sink]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-task]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-util]
-version = "0.3.8"
+version = "0.3.17"
 features = ["sink"]
 default-features = false
+[dev-dependencies.assert_matches]
+version = "1.3.0"
+
+[dev-dependencies.pin-project]
+version = "1.0.1"
+
+[dev-dependencies.pin-utils]
+version = "0.1.0"
+
+[dev-dependencies.static_assertions]
+version = "1"
+
+[dev-dependencies.tokio]
+version = "0.1.11"
 
 [features]
 alloc = ["futures-core/alloc", "futures-task/alloc", "futures-sink/alloc", "futures-channel/alloc", "futures-util/alloc"]
 async-await = ["futures-util/async-await", "futures-util/async-await-macro"]
 bilock = ["futures-util/bilock"]
-cfg-target-has-atomic = ["futures-core/cfg-target-has-atomic", "futures-task/cfg-target-has-atomic", "futures-channel/cfg-target-has-atomic", "futures-util/cfg-target-has-atomic"]
+cfg-target-has-atomic = []
 compat = ["std", "futures-util/compat"]
 default = ["std", "async-await", "executor"]
 executor = ["std", "futures-executor/std"]
@@ -74,5 +87,3 @@
 thread-pool = ["executor", "futures-executor/thread-pool"]
 unstable = ["futures-core/unstable", "futures-task/unstable", "futures-channel/unstable", "futures-io/unstable", "futures-util/unstable"]
 write-all-vectored = ["futures-util/write-all-vectored"]
-[badges.travis-ci]
-repository = "rust-lang/futures-rs"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,12 +3,12 @@
 //! This crate provides a number of core abstractions for writing asynchronous
 //! code:
 //!
-//! - [Futures](crate::future::Future) are single eventual values produced by
+//! - [Futures](crate::future) are single eventual values produced by
 //!   asynchronous computations. Some programming languages (e.g. JavaScript)
 //!   call this concept "promise".
-//! - [Streams](crate::stream::Stream) represent a series of values
+//! - [Streams](crate::stream) represent a series of values
 //!   produced asynchronously.
-//! - [Sinks](crate::sink::Sink) provide support for asynchronous writing of
+//! - [Sinks](crate::sink) provide support for asynchronous writing of
 //!   data.
 //! - [Executors](crate::executor) are responsible for running asynchronous
 //!   tasks.
@@ -29,7 +29,7 @@
 //! # use futures::executor; ///standard executors to provide a context for futures and streams
 //! # use futures::executor::ThreadPool;
 //! # use futures::StreamExt;
-//!
+//! #
 //! fn main() {
 //!     let pool = ThreadPool::new().expect("Failed to build pool");
 //!     let (tx, rx) = mpsc::unbounded::<i32>();
@@ -67,7 +67,7 @@
 //!     };
 //!
 //!     // Actually execute the above future, which will invoke Future::poll and
-//!     // subsequenty chain appropriate Future::poll and methods needing executors
+//!     // subsequently chain appropriate Future::poll and methods needing executors
 //!     // to drive all futures. Eventually fut_values will be driven to completion.
 //!     let values: Vec<i32> = executor::block_on(fut_values);
 //!
@@ -78,293 +78,89 @@
 //! The majority of examples and code snippets in this crate assume that they are
 //! inside an async block as written above.
 
-#![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
 #![cfg_attr(feature = "read-initializer", feature(read_initializer))]
-
 #![cfg_attr(not(feature = "std"), no_std)]
-
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
-// It cannot be included in the published code because this lints have false positives in the minimum required version.
-#![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures/0.3.8")]
-
+#![warn(
+    missing_debug_implementations,
+    missing_docs,
+    rust_2018_idioms,
+    single_use_lifetimes,
+    unreachable_pub
+)]
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-#[cfg(all(feature = "cfg-target-has-atomic", not(feature = "unstable")))]
-compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feature as an explicit opt-in to unstable features");
-
 #[cfg(all(feature = "bilock", not(feature = "unstable")))]
 compile_error!("The `bilock` feature requires the `unstable` feature as an explicit opt-in to unstable features");
 
 #[cfg(all(feature = "read-initializer", not(feature = "unstable")))]
 compile_error!("The `read-initializer` feature requires the `unstable` feature as an explicit opt-in to unstable features");
 
-#[doc(hidden)] pub use futures_core::future::{Future, TryFuture};
-#[doc(hidden)] pub use futures_util::future::{FutureExt, TryFutureExt};
-
-#[doc(hidden)] pub use futures_core::stream::{Stream, TryStream};
-#[doc(hidden)] pub use futures_util::stream::{StreamExt, TryStreamExt};
-
-#[doc(hidden)] pub use futures_sink::Sink;
-#[doc(hidden)] pub use futures_util::sink::SinkExt;
+#[doc(no_inline)]
+pub use futures_core::future::{Future, TryFuture};
+#[doc(no_inline)]
+pub use futures_util::future::{FutureExt, TryFutureExt};
+
+#[doc(no_inline)]
+pub use futures_core::stream::{Stream, TryStream};
+#[doc(no_inline)]
+pub use futures_util::stream::{StreamExt, TryStreamExt};
+
+#[doc(no_inline)]
+pub use futures_sink::Sink;
+#[doc(no_inline)]
+pub use futures_util::sink::SinkExt;
 
 #[cfg(feature = "std")]
-#[doc(hidden)] pub use futures_io::{AsyncRead, AsyncWrite, AsyncSeek, AsyncBufRead};
+#[doc(no_inline)]
+pub use futures_io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite};
 #[cfg(feature = "std")]
-#[doc(hidden)] pub use futures_util::{AsyncReadExt, AsyncWriteExt, AsyncSeekExt, AsyncBufReadExt};
+#[doc(no_inline)]
+pub use futures_util::{AsyncBufReadExt, AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
 
 // Macro reexports
 pub use futures_core::ready; // Readiness propagation
 pub use futures_util::pin_mut;
-#[cfg(feature = "async-await")]
-pub use futures_util::{pending, poll, join, try_join, select_biased}; // Async-await
 #[cfg(feature = "std")]
 #[cfg(feature = "async-await")]
 pub use futures_util::select;
+#[cfg(feature = "async-await")]
+pub use futures_util::{join, pending, poll, select_biased, try_join}; // Async-await
 
-#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-#[cfg(feature = "alloc")]
-pub mod channel {
-    //! Cross-task communication.
-    //!
-    //! Like threads, concurrent tasks sometimes need to communicate with each
-    //! other. This module contains two basic abstractions for doing so:
-    //!
-    //! - [oneshot](crate::channel::oneshot), a way of sending a single value
-    //!   from one task to another.
-    //! - [mpsc](crate::channel::mpsc), a multi-producer, single-consumer
-    //!   channel for sending values between tasks, analogous to the
-    //!   similarly-named structure in the standard library.
-    //!
-    //! This module is only available when the `std` or `alloc` feature of this
-    //! library is activated, and it is activated by default.
-
-    pub use futures_channel::oneshot;
-
-    #[cfg(feature = "std")]
-    pub use futures_channel::mpsc;
-}
-
-#[cfg(feature = "compat")]
-#[cfg_attr(docsrs, doc(cfg(feature = "compat")))]
-pub mod compat {
-    //! Interop between `futures` 0.1 and 0.3.
-    //!
-    //! This module is only available when the `compat` feature of this
-    //! library is activated.
-
-    pub use futures_util::compat::{
-        Compat,
-        CompatSink,
-        Compat01As03,
-        Compat01As03Sink,
-        Executor01Future,
-        Executor01As03,
-        Executor01CompatExt,
-        Future01CompatExt,
-        Stream01CompatExt,
-        Sink01CompatExt,
-    };
-
-    #[cfg(feature = "io-compat")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "io-compat")))]
-    pub use futures_util::compat::{
-        AsyncRead01CompatExt,
-        AsyncWrite01CompatExt,
-    };
-}
-
-#[cfg(feature = "executor")]
-pub mod executor {
-    //! Task execution.
-    //!
-    //! All asynchronous computation occurs within an executor, which is
-    //! capable of spawning futures as tasks. This module provides several
-    //! built-in executors, as well as tools for building your own.
-    //!
-    //! This module is only available when the `executor` feature of this
-    //! library is activated, and it is activated by default.
-    //!
-    //! # Using a thread pool (M:N task scheduling)
-    //!
-    //! Most of the time tasks should be executed on a [thread
-    //! pool](crate::executor::ThreadPool). A small set of worker threads can
-    //! handle a very large set of spawned tasks (which are much lighter weight
-    //! than threads). Tasks spawned onto the pool with the
-    //! [`spawn_ok()`](crate::executor::ThreadPool::spawn_ok)
-    //! function will run ambiently on the created threads.
-    //!
-    //! # Spawning additional tasks
-    //!
-    //! Tasks can be spawned onto a spawner by calling its
-    //! [`spawn_obj`](crate::task::Spawn::spawn_obj) method directly.
-    //! In the case of `!Send` futures,
-    //! [`spawn_local_obj`](crate::task::LocalSpawn::spawn_local_obj)
-    //! can be used instead.
-    //!
-    //! # Single-threaded execution
-    //!
-    //! In addition to thread pools, it's possible to run a task (and the tasks
-    //! it spawns) entirely within a single thread via the
-    //! [`LocalPool`](crate::executor::LocalPool) executor. Aside from cutting
-    //! down on synchronization costs, this executor also makes it possible to
-    //! spawn non-`Send` tasks, via
-    //! [`spawn_local_obj`](crate::task::LocalSpawn::spawn_local_obj).
-    //! The `LocalPool` is best suited for running I/O-bound tasks that do
-    //! relatively little work between I/O operations.
-    //!
-    //! There is also a convenience function
-    //! [`block_on`](crate::executor::block_on) for simply running a future to
-    //! completion on the current thread.
-
-    pub use futures_executor::{
-        BlockingStream,
-        Enter, EnterError,
-        LocalSpawner, LocalPool,
-        block_on, block_on_stream, enter,
-    };
-
-    #[cfg(feature = "thread-pool")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "thread-pool")))]
-    pub use futures_executor::{ThreadPool, ThreadPoolBuilder};
-}
-
-pub mod future {
-    //! Asynchronous values.
-    //!
-    //! This module contains:
-    //!
-    //! - The [`Future` trait](crate::future::Future).
-    //! - The [`FutureExt`](crate::future::FutureExt) trait, which provides
-    //!   adapters for chaining and composing futures.
-    //! - Top-level future combinators like [`lazy`](crate::future::lazy) which
-    //!   creates a future from a closure that defines its return value, and
-    //!   [`ready`](crate::future::ready), which constructs a future with an
-    //!   immediate defined value.
-
-    pub use futures_core::future::{
-        Future, TryFuture, FusedFuture,
-    };
-
-    #[cfg(feature = "alloc")]
-    pub use futures_core::future::{BoxFuture, LocalBoxFuture};
-
-    pub use futures_task::{FutureObj, LocalFutureObj, UnsafeFutureObj};
-
-    pub use futures_util::future::{
-        lazy, Lazy,
-        maybe_done, MaybeDone,
-        pending, Pending,
-        poll_fn, PollFn,
-        ready, ok, err, Ready,
-        join, join3, join4, join5,
-        Join, Join3, Join4, Join5,
-        select, Select,
-        try_join, try_join3, try_join4, try_join5,
-        TryJoin, TryJoin3, TryJoin4, TryJoin5,
-        try_select, TrySelect,
-        Either,
-        OptionFuture,
-
-        FutureExt,
-        FlattenStream, Flatten, Fuse, Inspect, IntoStream, Map, Then, UnitError,
-        NeverError,
-
-        TryFutureExt,
-        AndThen, ErrInto, FlattenSink, IntoFuture, MapErr, MapOk, OrElse,
-        InspectOk, InspectErr, TryFlattenStream, UnwrapOrElse,
-    };
-
-    #[cfg(feature = "alloc")]
-    pub use futures_util::future::{
-        join_all, JoinAll,
-        select_all, SelectAll,
-        try_join_all, TryJoinAll,
-        select_ok, SelectOk,
-    };
-
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-    #[cfg(feature = "alloc")]
-    pub use futures_util::future::{
-        abortable, Abortable, AbortHandle, AbortRegistration, Aborted,
-    };
-
-    #[cfg(feature = "std")]
-    pub use futures_util::future::{
-        Remote, RemoteHandle,
-        CatchUnwind, Shared, WeakShared,
-    };
-}
+// Module reexports
+#[doc(inline)]
+pub use futures_util::{future, never, sink, stream, task};
 
 #[cfg(feature = "std")]
-pub mod io {
-    //! Asynchronous I/O.
-    //!
-    //! This module is the asynchronous version of `std::io`. It defines four
-    //! traits, [`AsyncRead`](crate::io::AsyncRead),
-    //! [`AsyncWrite`](crate::io::AsyncWrite),
-    //! [`AsyncSeek`](crate::io::AsyncSeek), and
-    //! [`AsyncBufRead`](crate::io::AsyncBufRead), which mirror the `Read`,
-    //! `Write`, `Seek`, and `BufRead` traits of the standard library. However,
-    //! these traits integrate
-    //! with the asynchronous task system, so that if an I/O object isn't ready
-    //! for reading (or writing), the thread is not blocked, and instead the
-    //! current task is queued to be woken when I/O is ready.
-    //!
-    //! In addition, the [`AsyncReadExt`](crate::io::AsyncReadExt),
-    //! [`AsyncWriteExt`](crate::io::AsyncWriteExt),
-    //! [`AsyncSeekExt`](crate::io::AsyncSeekExt), and
-    //! [`AsyncBufReadExt`](crate::io::AsyncBufReadExt) extension traits offer a
-    //! variety of useful combinators for operating with asynchronous I/O
-    //! objects, including ways to work with them using futures, streams and
-    //! sinks.
-    //!
-    //! This module is only available when the `std` feature of this
-    //! library is activated, and it is activated by default.
-
-    pub use futures_io::{
-        AsyncRead, AsyncWrite, AsyncSeek, AsyncBufRead, Error, ErrorKind,
-        IoSlice, IoSliceMut, Result, SeekFrom,
-    };
-
-    #[cfg(feature = "read-initializer")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "read-initializer")))]
-    pub use futures_io::Initializer;
-
-    pub use futures_util::io::{
-        AsyncReadExt, AsyncWriteExt, AsyncSeekExt, AsyncBufReadExt, AllowStdIo,
-        BufReader, BufWriter, Cursor, Chain, Close, copy, Copy, copy_buf, CopyBuf,
-        empty, Empty, FillBuf, Flush, IntoSink, Lines, Read, ReadExact, ReadHalf,
-        ReadLine, ReadToEnd, ReadToString, ReadUntil, ReadVectored, repeat,
-        Repeat, ReuniteError, Seek, sink, Sink, Take, Window, Write, WriteAll, WriteHalf,
-        WriteVectored,
-    };
-}
+#[cfg(feature = "async-await")]
+pub use futures_util::stream_select;
 
-#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
 #[cfg(feature = "alloc")]
-pub mod lock {
-    //! Futures-powered synchronization primitives.
-    //!
-    //! This module is only available when the `std` or `alloc` feature of this
-    //! library is activated, and it is activated by default.
+#[doc(inline)]
+pub use futures_channel as channel;
+#[cfg(feature = "alloc")]
+#[doc(inline)]
+pub use futures_util::lock;
 
-    #[cfg(feature = "bilock")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "bilock")))]
-    pub use futures_util::lock::{BiLock, BiLockAcquire, BiLockGuard, ReuniteError};
+#[cfg(feature = "std")]
+#[doc(inline)]
+pub use futures_util::io;
 
-    #[cfg(feature = "std")]
-    pub use futures_util::lock::{MappedMutexGuard, Mutex, MutexLockFuture, MutexGuard};
-}
+#[cfg(feature = "executor")]
+#[cfg_attr(docsrs, doc(cfg(feature = "executor")))]
+#[doc(inline)]
+pub use futures_executor as executor;
+
+#[cfg(feature = "compat")]
+#[cfg_attr(docsrs, doc(cfg(feature = "compat")))]
+#[doc(inline)]
+pub use futures_util::compat;
 
 pub mod prelude {
     //! A "prelude" for crates using the `futures` crate.
@@ -381,170 +177,22 @@
     //! The prelude may grow over time as additional items see ubiquitous use.
 
     pub use crate::future::{self, Future, TryFuture};
-    pub use crate::stream::{self, Stream, TryStream};
     pub use crate::sink::{self, Sink};
+    pub use crate::stream::{self, Stream, TryStream};
 
     #[doc(no_inline)]
     pub use crate::future::{FutureExt as _, TryFutureExt as _};
     #[doc(no_inline)]
-    pub use crate::stream::{StreamExt as _, TryStreamExt as _};
-    #[doc(no_inline)]
     pub use crate::sink::SinkExt as _;
+    #[doc(no_inline)]
+    pub use crate::stream::{StreamExt as _, TryStreamExt as _};
 
     #[cfg(feature = "std")]
-    pub use crate::io::{
-        AsyncRead, AsyncWrite, AsyncSeek, AsyncBufRead,
-    };
+    pub use crate::io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite};
 
     #[cfg(feature = "std")]
     #[doc(no_inline)]
     pub use crate::io::{
-        AsyncReadExt as _, AsyncWriteExt as _, AsyncSeekExt as _, AsyncBufReadExt as _,
-    };
-}
-
-pub mod sink {
-    //! Asynchronous sinks.
-    //!
-    //! This module contains:
-    //!
-    //! - The [`Sink` trait](crate::sink::Sink), which allows you to
-    //!   asynchronously write data.
-    //! - The [`SinkExt`](crate::sink::SinkExt) trait, which provides adapters
-    //!   for chaining and composing sinks.
-
-    pub use futures_sink::Sink;
-
-    pub use futures_util::sink::{
-        Close, Flush, Send, SendAll, SinkErrInto, SinkMapErr, With,
-        SinkExt, Fanout, Drain, drain,
-        WithFlatMap,
+        AsyncBufReadExt as _, AsyncReadExt as _, AsyncSeekExt as _, AsyncWriteExt as _,
     };
-
-    #[cfg(feature = "alloc")]
-    pub use futures_util::sink::Buffer;
-}
-
-pub mod stream {
-    //! Asynchronous streams.
-    //!
-    //! This module contains:
-    //!
-    //! - The [`Stream` trait](crate::stream::Stream), for objects that can
-    //!   asynchronously produce a sequence of values.
-    //! - The [`StreamExt`](crate::stream::StreamExt) trait, which provides
-    //!   adapters for chaining and composing streams.
-    //! - Top-level stream constructors like [`iter`](crate::stream::iter)
-    //!   which creates a stream from an iterator.
-
-    pub use futures_core::stream::{
-        Stream, TryStream, FusedStream,
-    };
-
-    #[cfg(feature = "alloc")]
-    pub use futures_core::stream::{BoxStream, LocalBoxStream};
-
-    pub use futures_util::stream::{
-        iter, Iter,
-        repeat, Repeat,
-        empty, Empty,
-        pending, Pending,
-        once, Once,
-        poll_fn, PollFn,
-        select, Select,
-        unfold, Unfold,
-        try_unfold, TryUnfold,
-
-        StreamExt,
-        Chain, Collect, Concat, Cycle, Enumerate, Filter, FilterMap, FlatMap, Flatten,
-        Fold, Forward, ForEach, Fuse, StreamFuture, Inspect, Map, Next,
-        SelectNextSome, Peek, Peekable, Scan, Skip, SkipWhile, Take, TakeUntil,
-        TakeWhile, Then, Zip,
-
-        TryStreamExt,
-        AndThen, ErrInto, MapOk, MapErr, OrElse,
-        InspectOk, InspectErr,
-        TryNext, TryForEach, TryFilter, TryFilterMap, TryFlatten,
-        TryCollect, TryConcat, TryFold, TrySkipWhile, TryTakeWhile,
-        IntoStream,
-    };
-
-    #[cfg(feature = "alloc")]
-    pub use futures_util::stream::{
-        // For StreamExt:
-        Chunks, ReadyChunks,
-    };
-
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-    #[cfg(feature = "alloc")]
-    pub use futures_util::stream::{
-        FuturesOrdered,
-        futures_unordered, FuturesUnordered,
-
-        // For StreamExt:
-        BufferUnordered, Buffered, ForEachConcurrent, SplitStream, SplitSink,
-        ReuniteError,
-
-        select_all, SelectAll,
-    };
-
-    #[cfg(feature = "std")]
-    pub use futures_util::stream::{
-        // For StreamExt:
-        CatchUnwind,
-    };
-
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-    #[cfg(feature = "alloc")]
-    pub use futures_util::stream::{
-        // For TryStreamExt:
-        TryBufferUnordered, TryBuffered, TryForEachConcurrent,
-    };
-
-    #[cfg(feature = "std")]
-    pub use futures_util::stream::IntoAsyncRead;
-}
-
-pub mod task {
-    //! Tools for working with tasks.
-    //!
-    //! This module contains:
-    //!
-    //! - [`Spawn`](crate::task::Spawn), a trait for spawning new tasks.
-    //! - [`Context`](crate::task::Context), a context of an asynchronous task,
-    //!   including a handle for waking up the task.
-    //! - [`Waker`](crate::task::Waker), a handle for waking up a task.
-    //!
-    //! The remaining types and traits in the module are used for implementing
-    //! executors or dealing with synchronization issues around task wakeup.
-
-    pub use futures_core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
-
-    pub use futures_task::{
-        Spawn, LocalSpawn, SpawnError,
-        FutureObj, LocalFutureObj, UnsafeFutureObj,
-    };
-
-    pub use futures_util::task::noop_waker;
-
-    #[cfg(feature = "std")]
-    pub use futures_util::task::noop_waker_ref;
-
-    #[cfg(feature = "alloc")]
-    pub use futures_util::task::{SpawnExt, LocalSpawnExt};
-
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-    #[cfg(feature = "alloc")]
-    pub use futures_util::task::{waker, waker_ref, WakerRef, ArcWake};
-
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-    pub use futures_util::task::AtomicWaker;
-}
-
-pub mod never {
-    //! This module contains the `Never` type.
-    //!
-    //! Values of this type can never be created and will never exist.
-
-    pub use futures_util::never::Never;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/abortable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/abortable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/abortable.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/abortable.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#[test]
-fn abortable_works() {
-    use futures::channel::oneshot;
-    use futures::future::{abortable, Aborted};
-    use futures::executor::block_on;
-
-    let (_tx, a_rx) = oneshot::channel::<()>();
-    let (abortable_rx, abort_handle) = abortable(a_rx);
-
-    abort_handle.abort();
-    assert_eq!(Err(Aborted), block_on(abortable_rx));
-}
-
-#[test]
-fn abortable_awakens() {
-    use futures::channel::oneshot;
-    use futures::future::{abortable, Aborted, FutureExt};
-    use futures::task::{Context, Poll};
-    use futures_test::task::new_count_waker;
-
-    let (_tx, a_rx) = oneshot::channel::<()>();
-    let (mut abortable_rx, abort_handle) = abortable(a_rx);
-
-    let (waker, counter) = new_count_waker();
-    let mut cx = Context::from_waker(&waker);
-    assert_eq!(counter, 0);
-    assert_eq!(Poll::Pending, abortable_rx.poll_unpin(&mut cx));
-    assert_eq!(counter, 0);
-    abort_handle.abort();
-    assert_eq!(counter, 1);
-    assert_eq!(Poll::Ready(Err(Aborted)), abortable_rx.poll_unpin(&mut cx));
-}
-
-#[test]
-fn abortable_resolves() {
-    use futures::channel::oneshot;
-    use futures::future::abortable;
-    use futures::executor::block_on;
-    let (tx, a_rx) = oneshot::channel::<()>();
-    let (abortable_rx, _abort_handle) = abortable(a_rx);
-
-    tx.send(()).unwrap();
-
-    assert_eq!(Ok(Ok(())), block_on(abortable_rx));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/arc_wake.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/arc_wake.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/arc_wake.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/arc_wake.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-mod countingwaker {
-    use futures::task::{self, ArcWake, Waker};
-    use std::sync::{Arc, Mutex};
-
-    struct CountingWaker {
-        nr_wake: Mutex<i32>,
-    }
-
-    impl CountingWaker {
-        fn new() -> Self {
-            Self {
-                nr_wake: Mutex::new(0),
-            }
-        }
-
-        fn wakes(&self) -> i32 {
-            *self.nr_wake.lock().unwrap()
-        }
-    }
-
-    impl ArcWake for CountingWaker {
-        fn wake_by_ref(arc_self: &Arc<Self>) {
-            let mut lock = arc_self.nr_wake.lock().unwrap();
-            *lock += 1;
-        }
-    }
-
-    #[test]
-    fn create_from_arc() {
-        let some_w = Arc::new(CountingWaker::new());
-
-        let w1: Waker = task::waker(some_w.clone());
-        assert_eq!(2, Arc::strong_count(&some_w));
-        w1.wake_by_ref();
-        assert_eq!(1, some_w.wakes());
-
-        let w2 = w1.clone();
-        assert_eq!(3, Arc::strong_count(&some_w));
-
-        w2.wake_by_ref();
-        assert_eq!(2, some_w.wakes());
-
-        drop(w2);
-        assert_eq!(2, Arc::strong_count(&some_w));
-        drop(w1);
-        assert_eq!(1, Arc::strong_count(&some_w));
-    }
-
-    #[test]
-    fn ref_wake_same() {
-        let some_w = Arc::new(CountingWaker::new());
-
-        let w1: Waker = task::waker(some_w.clone());
-        let w2 = task::waker_ref(&some_w);
-        let w3 = w2.clone();
-
-        assert!(w1.will_wake(&w2));
-        assert!(w2.will_wake(&w3));
-    }
-}
-
-#[test]
-fn proper_refcount_on_wake_panic() {
-    use futures::task::{self, ArcWake, Waker};
-    use std::sync::Arc;
-
-    struct PanicWaker;
-
-    impl ArcWake for PanicWaker {
-        fn wake_by_ref(_arc_self: &Arc<Self>) {
-            panic!("WAKE UP");
-        }
-    }
-
-    let some_w = Arc::new(PanicWaker);
-
-    let w1: Waker = task::waker(some_w.clone());
-    assert_eq!("WAKE UP", *std::panic::catch_unwind(|| w1.wake_by_ref()).unwrap_err().downcast::<&str>().unwrap());
-    assert_eq!(2, Arc::strong_count(&some_w)); // some_w + w1
-    drop(w1);
-    assert_eq!(1, Arc::strong_count(&some_w)); // some_w
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/async_await_macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/async_await_macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/async_await_macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/async_await_macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,16 @@
+use futures::channel::{mpsc, oneshot};
+use futures::executor::block_on;
+use futures::future::{self, poll_fn, FutureExt};
+use futures::sink::SinkExt;
+use futures::stream::StreamExt;
+use futures::task::{Context, Poll};
+use futures::{
+    join, pending, pin_mut, poll, select, select_biased, stream, stream_select, try_join,
+};
+use std::mem;
+
 #[test]
 fn poll_and_pending() {
-    use futures::{pending, pin_mut, poll};
-    use futures::executor::block_on;
-    use futures::task::Poll;
-
     let pending_once = async { pending!() };
     block_on(async {
         pin_mut!(pending_once);
@@ -14,11 +21,6 @@
 
 #[test]
 fn join() {
-    use futures::{pin_mut, poll, join};
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::task::Poll;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (tx2, rx2) = oneshot::channel::<i32>();
 
@@ -39,11 +41,6 @@
 
 #[test]
 fn select() {
-    use futures::select;
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (_tx2, rx2) = oneshot::channel::<i32>();
     tx1.send(1).unwrap();
@@ -62,11 +59,6 @@
 
 #[test]
 fn select_biased() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-    use futures::select_biased;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (_tx2, rx2) = oneshot::channel::<i32>();
     tx1.send(1).unwrap();
@@ -85,12 +77,6 @@
 
 #[test]
 fn select_streams() {
-    use futures::select;
-    use futures::channel::mpsc;
-    use futures::executor::block_on;
-    use futures::sink::SinkExt;
-    use futures::stream::StreamExt;
-
     let (mut tx1, rx1) = mpsc::channel::<i32>(1);
     let (mut tx2, rx2) = mpsc::channel::<i32>(1);
     let mut rx1 = rx1.fuse();
@@ -134,11 +120,6 @@
 
 #[test]
 fn select_can_move_uncompleted_futures() {
-    use futures::select;
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (tx2, rx2) = oneshot::channel::<i32>();
     tx1.send(1).unwrap();
@@ -165,10 +146,6 @@
 
 #[test]
 fn select_nested() {
-    use futures::select;
-    use futures::executor::block_on;
-    use futures::future;
-
     let mut outer_fut = future::ready(1);
     let mut inner_fut = future::ready(2);
     let res = block_on(async {
@@ -183,18 +160,16 @@
     assert_eq!(res, 3);
 }
 
+#[cfg_attr(not(target_pointer_width = "64"), ignore)]
 #[test]
 fn select_size() {
-    use futures::select;
-    use futures::future;
-
     let fut = async {
         let mut ready = future::ready(0i32);
         select! {
             _ = ready => {},
         }
     };
-    assert_eq!(::std::mem::size_of_val(&fut), 24);
+    assert_eq!(mem::size_of_val(&fut), 24);
 
     let fut = async {
         let mut ready1 = future::ready(0i32);
@@ -204,19 +179,13 @@
             _ = ready2 => {},
         }
     };
-    assert_eq!(::std::mem::size_of_val(&fut), 40);
+    assert_eq!(mem::size_of_val(&fut), 40);
 }
 
 #[test]
 fn select_on_non_unpin_expressions() {
-    use futures::select;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-
     // The returned Future is !Unpin
-    let make_non_unpin_fut = || { async {
-        5
-    }};
+    let make_non_unpin_fut = || async { 5 };
 
     let res = block_on(async {
         let select_res;
@@ -231,14 +200,8 @@
 
 #[test]
 fn select_on_non_unpin_expressions_with_default() {
-    use futures::select;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-
     // The returned Future is !Unpin
-    let make_non_unpin_fut = || { async {
-        5
-    }};
+    let make_non_unpin_fut = || async { 5 };
 
     let res = block_on(async {
         let select_res;
@@ -252,15 +215,11 @@
     assert_eq!(res, 5);
 }
 
+#[cfg_attr(not(target_pointer_width = "64"), ignore)]
 #[test]
 fn select_on_non_unpin_size() {
-    use futures::select;
-    use futures::future::FutureExt;
-
     // The returned Future is !Unpin
-    let make_non_unpin_fut = || { async {
-        5
-    }};
+    let make_non_unpin_fut = || async { 5 };
 
     let fut = async {
         let select_res;
@@ -271,15 +230,11 @@
         select_res
     };
 
-    assert_eq!(32, std::mem::size_of_val(&fut));
+    assert_eq!(32, mem::size_of_val(&fut));
 }
 
 #[test]
 fn select_can_be_used_as_expression() {
-    use futures::select;
-    use futures::executor::block_on;
-    use futures::future;
-
     block_on(async {
         let res = select! {
             x = future::ready(7) => x,
@@ -291,11 +246,6 @@
 
 #[test]
 fn select_with_default_can_be_used_as_expression() {
-    use futures::select;
-    use futures::executor::block_on;
-    use futures::future::{FutureExt, poll_fn};
-    use futures::task::{Context, Poll};
-
     fn poll_always_pending<T>(_cx: &mut Context<'_>) -> Poll<T> {
         Poll::Pending
     }
@@ -312,10 +262,6 @@
 
 #[test]
 fn select_with_complete_can_be_used_as_expression() {
-    use futures::select;
-    use futures::executor::block_on;
-    use futures::future;
-
     block_on(async {
         let res = select! {
             x = future::pending::<i32>() => x,
@@ -330,10 +276,6 @@
 #[test]
 #[allow(unused_assignments)]
 fn select_on_mutable_borrowing_future_with_same_borrow_in_block() {
-    use futures::select;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-
     async fn require_mutable(_: &mut i32) {}
     async fn async_noop() {}
 
@@ -351,10 +293,6 @@
 #[test]
 #[allow(unused_assignments)]
 fn select_on_mutable_borrowing_future_with_same_borrow_in_block_and_default() {
-    use futures::select;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-
     async fn require_mutable(_: &mut i32) {}
     async fn async_noop() {}
 
@@ -373,60 +311,79 @@
 }
 
 #[test]
-fn join_size() {
-    use futures::join;
-    use futures::future;
+#[allow(unused_assignments)]
+fn stream_select() {
+    // stream_select! macro
+    block_on(async {
+        let endless_ints = |i| stream::iter(vec![i].into_iter().cycle());
+
+        let mut endless_ones = stream_select!(endless_ints(1i32), stream::pending());
+        assert_eq!(endless_ones.next().await, Some(1));
+        assert_eq!(endless_ones.next().await, Some(1));
+
+        let mut finite_list =
+            stream_select!(stream::iter(vec![1].into_iter()), stream::iter(vec![1].into_iter()));
+        assert_eq!(finite_list.next().await, Some(1));
+        assert_eq!(finite_list.next().await, Some(1));
+        assert_eq!(finite_list.next().await, None);
+
+        let endless_mixed = stream_select!(endless_ints(1i32), endless_ints(2), endless_ints(3));
+        // Take 1000, and assert a somewhat even distribution of values.
+        // The fairness is randomized, but over 1000 samples we should be pretty close to even.
+        // This test may be a bit flaky. Feel free to adjust the margins as you see fit.
+        let mut count = 0;
+        let results = endless_mixed
+            .take_while(move |_| {
+                count += 1;
+                let ret = count < 1000;
+                async move { ret }
+            })
+            .collect::<Vec<_>>()
+            .await;
+        assert!(results.iter().filter(|x| **x == 1).count() >= 299);
+        assert!(results.iter().filter(|x| **x == 2).count() >= 299);
+        assert!(results.iter().filter(|x| **x == 3).count() >= 299);
+    });
+}
 
+#[test]
+fn join_size() {
     let fut = async {
         let ready = future::ready(0i32);
         join!(ready)
     };
-    assert_eq!(::std::mem::size_of_val(&fut), 16);
+    assert_eq!(mem::size_of_val(&fut), 16);
 
     let fut = async {
         let ready1 = future::ready(0i32);
         let ready2 = future::ready(0i32);
         join!(ready1, ready2)
     };
-    assert_eq!(::std::mem::size_of_val(&fut), 28);
+    assert_eq!(mem::size_of_val(&fut), 28);
 }
 
 #[test]
 fn try_join_size() {
-    use futures::try_join;
-    use futures::future;
-
     let fut = async {
         let ready = future::ready(Ok::<i32, i32>(0));
         try_join!(ready)
     };
-    assert_eq!(::std::mem::size_of_val(&fut), 16);
+    assert_eq!(mem::size_of_val(&fut), 16);
 
     let fut = async {
         let ready1 = future::ready(Ok::<i32, i32>(0));
         let ready2 = future::ready(Ok::<i32, i32>(0));
         try_join!(ready1, ready2)
     };
-    assert_eq!(::std::mem::size_of_val(&fut), 28);
+    assert_eq!(mem::size_of_val(&fut), 28);
 }
 
 #[test]
 fn join_doesnt_require_unpin() {
-    use futures::join;
-
-    let _ = async {
-        join!(async {}, async {})
-    };
+    let _ = async { join!(async {}, async {}) };
 }
 
 #[test]
 fn try_join_doesnt_require_unpin() {
-    use futures::try_join;
-
-    let _ = async {
-        try_join!(
-            async { Ok::<(), ()>(()) },
-            async { Ok::<(), ()>(()) },
-        )
-    };
+    let _ = async { try_join!(async { Ok::<(), ()>(()) }, async { Ok::<(), ()>(()) },) };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/atomic_waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/atomic_waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/atomic_waker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/atomic_waker.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#[test]
-fn basic() {
-    use std::sync::atomic::AtomicUsize;
-    use std::sync::atomic::Ordering;
-    use std::sync::Arc;
-    use std::thread;
-
-    use futures::executor::block_on;
-    use futures::future::poll_fn;
-    use futures::task::{AtomicWaker, Poll};
-
-    let atomic_waker = Arc::new(AtomicWaker::new());
-    let atomic_waker_copy = atomic_waker.clone();
-
-    let returned_pending = Arc::new(AtomicUsize::new(0));
-    let returned_pending_copy = returned_pending.clone();
-
-    let woken = Arc::new(AtomicUsize::new(0));
-    let woken_copy = woken.clone();
-
-    let t = thread::spawn(move || {
-        let mut pending_count = 0;
-
-        block_on(poll_fn(move |cx| {
-            if woken_copy.load(Ordering::Relaxed) == 1 {
-                Poll::Ready(())
-            } else {
-                // Assert we return pending exactly once
-                assert_eq!(0, pending_count);
-                pending_count += 1;
-                atomic_waker_copy.register(cx.waker());
-
-                returned_pending_copy.store(1, Ordering::Relaxed);
-
-                Poll::Pending
-            }
-        }))
-    });
-
-    while returned_pending.load(Ordering::Relaxed) == 0 {}
-
-    // give spawned thread some time to sleep in `block_on`
-    thread::yield_now();
-
-    woken.store(1, Ordering::Relaxed);
-    atomic_waker.wake();
-
-    t.join().unwrap();
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/auto_traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/auto_traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/auto_traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/auto_traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1891 @@
+#![cfg(feature = "compat")]
+
+//! Assert Send/Sync/Unpin for all public types.
+
+use futures::{
+    future::Future,
+    sink::Sink,
+    stream::Stream,
+    task::{Context, Poll},
+};
+use static_assertions::{assert_impl_all as assert_impl, assert_not_impl_all as assert_not_impl};
+use std::marker::PhantomPinned;
+use std::{marker::PhantomData, pin::Pin};
+
+pub type LocalFuture<T = *const ()> = Pin<Box<dyn Future<Output = T>>>;
+pub type LocalTryFuture<T = *const (), E = *const ()> = LocalFuture<Result<T, E>>;
+pub type SendFuture<T = *const ()> = Pin<Box<dyn Future<Output = T> + Send>>;
+pub type SendTryFuture<T = *const (), E = *const ()> = SendFuture<Result<T, E>>;
+pub type SyncFuture<T = *const ()> = Pin<Box<dyn Future<Output = T> + Sync>>;
+pub type SyncTryFuture<T = *const (), E = *const ()> = SyncFuture<Result<T, E>>;
+pub type UnpinFuture<T = PhantomPinned> = LocalFuture<T>;
+pub type UnpinTryFuture<T = PhantomPinned, E = PhantomPinned> = UnpinFuture<Result<T, E>>;
+pub struct PinnedFuture<T = PhantomPinned>(PhantomPinned, PhantomData<T>);
+impl<T> Future for PinnedFuture<T> {
+    type Output = T;
+    fn poll(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Self::Output> {
+        unimplemented!()
+    }
+}
+pub type PinnedTryFuture<T = PhantomPinned, E = PhantomPinned> = PinnedFuture<Result<T, E>>;
+
+pub type LocalStream<T = *const ()> = Pin<Box<dyn Stream<Item = T>>>;
+pub type LocalTryStream<T = *const (), E = *const ()> = LocalStream<Result<T, E>>;
+pub type SendStream<T = *const ()> = Pin<Box<dyn Stream<Item = T> + Send>>;
+pub type SendTryStream<T = *const (), E = *const ()> = SendStream<Result<T, E>>;
+pub type SyncStream<T = *const ()> = Pin<Box<dyn Stream<Item = T> + Sync>>;
+pub type SyncTryStream<T = *const (), E = *const ()> = SyncStream<Result<T, E>>;
+pub type UnpinStream<T = PhantomPinned> = LocalStream<T>;
+pub type UnpinTryStream<T = PhantomPinned, E = PhantomPinned> = UnpinStream<Result<T, E>>;
+pub struct PinnedStream<T = PhantomPinned>(PhantomPinned, PhantomData<T>);
+impl<T> Stream for PinnedStream<T> {
+    type Item = T;
+    fn poll_next(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        unimplemented!()
+    }
+}
+pub type PinnedTryStream<T = PhantomPinned, E = PhantomPinned> = PinnedStream<Result<T, E>>;
+
+pub type LocalSink<T = *const (), E = *const ()> = Pin<Box<dyn Sink<T, Error = E>>>;
+pub type SendSink<T = *const (), E = *const ()> = Pin<Box<dyn Sink<T, Error = E> + Send>>;
+pub type SyncSink<T = *const (), E = *const ()> = Pin<Box<dyn Sink<T, Error = E> + Sync>>;
+pub type UnpinSink<T = PhantomPinned, E = PhantomPinned> = LocalSink<T, E>;
+pub struct PinnedSink<T = PhantomPinned, E = PhantomPinned>(PhantomPinned, PhantomData<(T, E)>);
+impl<T, E> Sink<T> for PinnedSink<T, E> {
+    type Error = E;
+    fn poll_ready(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        unimplemented!()
+    }
+    fn start_send(self: Pin<&mut Self>, _: T) -> Result<(), Self::Error> {
+        unimplemented!()
+    }
+    fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        unimplemented!()
+    }
+    fn poll_close(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        unimplemented!()
+    }
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::channel`.
+pub mod channel {
+    use super::*;
+    use futures::channel::*;
+
+    assert_impl!(mpsc::Receiver<()>: Send);
+    assert_not_impl!(mpsc::Receiver<*const ()>: Send);
+    assert_impl!(mpsc::Receiver<()>: Sync);
+    assert_not_impl!(mpsc::Receiver<*const ()>: Sync);
+    assert_impl!(mpsc::Receiver<PhantomPinned>: Unpin);
+
+    assert_impl!(mpsc::SendError: Send);
+    assert_impl!(mpsc::SendError: Sync);
+    assert_impl!(mpsc::SendError: Unpin);
+
+    assert_impl!(mpsc::Sender<()>: Send);
+    assert_not_impl!(mpsc::Sender<*const ()>: Send);
+    assert_impl!(mpsc::Sender<()>: Sync);
+    assert_not_impl!(mpsc::Sender<*const ()>: Sync);
+    assert_impl!(mpsc::Sender<PhantomPinned>: Unpin);
+
+    assert_impl!(mpsc::TryRecvError: Send);
+    assert_impl!(mpsc::TryRecvError: Sync);
+    assert_impl!(mpsc::TryRecvError: Unpin);
+
+    assert_impl!(mpsc::TrySendError<()>: Send);
+    assert_not_impl!(mpsc::TrySendError<*const ()>: Send);
+    assert_impl!(mpsc::TrySendError<()>: Sync);
+    assert_not_impl!(mpsc::TrySendError<*const ()>: Sync);
+    assert_impl!(mpsc::TrySendError<()>: Unpin);
+    assert_not_impl!(mpsc::TrySendError<PhantomPinned>: Unpin);
+
+    assert_impl!(mpsc::UnboundedReceiver<()>: Send);
+    assert_not_impl!(mpsc::UnboundedReceiver<*const ()>: Send);
+    assert_impl!(mpsc::UnboundedReceiver<()>: Sync);
+    assert_not_impl!(mpsc::UnboundedReceiver<*const ()>: Sync);
+    assert_impl!(mpsc::UnboundedReceiver<PhantomPinned>: Unpin);
+
+    assert_impl!(mpsc::UnboundedReceiver<()>: Send);
+    assert_not_impl!(mpsc::UnboundedReceiver<*const ()>: Send);
+    assert_impl!(mpsc::UnboundedReceiver<()>: Sync);
+    assert_not_impl!(mpsc::UnboundedReceiver<*const ()>: Sync);
+    assert_impl!(mpsc::UnboundedReceiver<PhantomPinned>: Unpin);
+
+    assert_impl!(oneshot::Canceled: Send);
+    assert_impl!(oneshot::Canceled: Sync);
+    assert_impl!(oneshot::Canceled: Unpin);
+
+    assert_impl!(oneshot::Cancellation<()>: Send);
+    assert_not_impl!(oneshot::Cancellation<*const ()>: Send);
+    assert_impl!(oneshot::Cancellation<()>: Sync);
+    assert_not_impl!(oneshot::Cancellation<*const ()>: Sync);
+    assert_impl!(oneshot::Cancellation<PhantomPinned>: Unpin);
+
+    assert_impl!(oneshot::Receiver<()>: Send);
+    assert_not_impl!(oneshot::Receiver<*const ()>: Send);
+    assert_impl!(oneshot::Receiver<()>: Sync);
+    assert_not_impl!(oneshot::Receiver<*const ()>: Sync);
+    assert_impl!(oneshot::Receiver<PhantomPinned>: Unpin);
+
+    assert_impl!(oneshot::Sender<()>: Send);
+    assert_not_impl!(oneshot::Sender<*const ()>: Send);
+    assert_impl!(oneshot::Sender<()>: Sync);
+    assert_not_impl!(oneshot::Sender<*const ()>: Sync);
+    assert_impl!(oneshot::Sender<PhantomPinned>: Unpin);
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::compat`.
+pub mod compat {
+    use super::*;
+    use futures::compat::*;
+
+    assert_impl!(Compat<()>: Send);
+    assert_not_impl!(Compat<*const ()>: Send);
+    assert_impl!(Compat<()>: Sync);
+    assert_not_impl!(Compat<*const ()>: Sync);
+    assert_impl!(Compat<()>: Unpin);
+    assert_not_impl!(Compat<PhantomPinned>: Unpin);
+
+    assert_impl!(Compat01As03<()>: Send);
+    assert_not_impl!(Compat01As03<*const ()>: Send);
+    assert_not_impl!(Compat01As03<()>: Sync);
+    assert_impl!(Compat01As03<PhantomPinned>: Unpin);
+
+    assert_impl!(Compat01As03Sink<(), ()>: Send);
+    assert_not_impl!(Compat01As03Sink<(), *const ()>: Send);
+    assert_not_impl!(Compat01As03Sink<*const (), ()>: Send);
+    assert_not_impl!(Compat01As03Sink<(), ()>: Sync);
+    assert_impl!(Compat01As03Sink<PhantomPinned, PhantomPinned>: Unpin);
+
+    assert_impl!(CompatSink<(), *const ()>: Send);
+    assert_not_impl!(CompatSink<*const (), ()>: Send);
+    assert_impl!(CompatSink<(), *const ()>: Sync);
+    assert_not_impl!(CompatSink<*const (), ()>: Sync);
+    assert_impl!(CompatSink<(), PhantomPinned>: Unpin);
+    assert_not_impl!(CompatSink<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Executor01As03<()>: Send);
+    assert_not_impl!(Executor01As03<*const ()>: Send);
+    assert_impl!(Executor01As03<()>: Sync);
+    assert_not_impl!(Executor01As03<*const ()>: Sync);
+    assert_impl!(Executor01As03<()>: Unpin);
+    assert_not_impl!(Executor01As03<PhantomPinned>: Unpin);
+
+    assert_impl!(Executor01Future: Send);
+    assert_not_impl!(Executor01Future: Sync);
+    assert_impl!(Executor01Future: Unpin);
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::executor`.
+pub mod executor {
+    use super::*;
+    use futures::executor::*;
+
+    assert_impl!(BlockingStream<SendStream>: Send);
+    assert_not_impl!(BlockingStream<LocalStream>: Send);
+    assert_impl!(BlockingStream<SyncStream>: Sync);
+    assert_not_impl!(BlockingStream<LocalStream>: Sync);
+    assert_impl!(BlockingStream<UnpinStream>: Unpin);
+    // BlockingStream requires `S: Unpin`
+    // assert_not_impl!(BlockingStream<PinnedStream>: Unpin);
+
+    assert_impl!(Enter: Send);
+    assert_impl!(Enter: Sync);
+    assert_impl!(Enter: Unpin);
+
+    assert_impl!(EnterError: Send);
+    assert_impl!(EnterError: Sync);
+    assert_impl!(EnterError: Unpin);
+
+    assert_not_impl!(LocalPool: Send);
+    assert_not_impl!(LocalPool: Sync);
+    assert_impl!(LocalPool: Unpin);
+
+    assert_not_impl!(LocalSpawner: Send);
+    assert_not_impl!(LocalSpawner: Sync);
+    assert_impl!(LocalSpawner: Unpin);
+
+    assert_impl!(ThreadPool: Send);
+    assert_impl!(ThreadPool: Sync);
+    assert_impl!(ThreadPool: Unpin);
+
+    assert_impl!(ThreadPoolBuilder: Send);
+    assert_impl!(ThreadPoolBuilder: Sync);
+    assert_impl!(ThreadPoolBuilder: Unpin);
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::future`.
+pub mod future {
+    use super::*;
+    use futures::future::*;
+
+    assert_impl!(AbortHandle: Send);
+    assert_impl!(AbortHandle: Sync);
+    assert_impl!(AbortHandle: Unpin);
+
+    assert_impl!(AbortRegistration: Send);
+    assert_impl!(AbortRegistration: Sync);
+    assert_impl!(AbortRegistration: Unpin);
+
+    assert_impl!(Abortable<SendFuture>: Send);
+    assert_not_impl!(Abortable<LocalFuture>: Send);
+    assert_impl!(Abortable<SyncFuture>: Sync);
+    assert_not_impl!(Abortable<LocalFuture>: Sync);
+    assert_impl!(Abortable<UnpinFuture>: Unpin);
+    assert_not_impl!(Abortable<PinnedFuture>: Unpin);
+
+    assert_impl!(Aborted: Send);
+    assert_impl!(Aborted: Sync);
+    assert_impl!(Aborted: Unpin);
+
+    assert_impl!(AndThen<SendFuture, SendFuture, ()>: Send);
+    assert_not_impl!(AndThen<SendFuture, LocalFuture, ()>: Send);
+    assert_not_impl!(AndThen<LocalFuture, SendFuture, ()>: Send);
+    assert_not_impl!(AndThen<SendFuture, SendFuture, *const ()>: Send);
+    assert_impl!(AndThen<SyncFuture, SyncFuture, ()>: Sync);
+    assert_not_impl!(AndThen<SyncFuture, LocalFuture, ()>: Sync);
+    assert_not_impl!(AndThen<LocalFuture, SyncFuture, ()>: Sync);
+    assert_not_impl!(AndThen<SyncFuture, SyncFuture, *const ()>: Sync);
+    assert_impl!(AndThen<UnpinFuture, UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(AndThen<PinnedFuture, UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(AndThen<UnpinFuture, PinnedFuture, PhantomPinned>: Unpin);
+
+    assert_impl!(CatchUnwind<SendFuture>: Send);
+    assert_not_impl!(CatchUnwind<LocalFuture>: Send);
+    assert_impl!(CatchUnwind<SyncFuture>: Sync);
+    assert_not_impl!(CatchUnwind<LocalFuture>: Sync);
+    assert_impl!(CatchUnwind<UnpinFuture>: Unpin);
+    assert_not_impl!(CatchUnwind<PinnedFuture>: Unpin);
+
+    assert_impl!(ErrInto<SendTryFuture, *const ()>: Send);
+    assert_not_impl!(ErrInto<LocalTryFuture, ()>: Send);
+    assert_impl!(ErrInto<SyncTryFuture, *const ()>: Sync);
+    assert_not_impl!(ErrInto<LocalTryFuture, ()>: Sync);
+    assert_impl!(ErrInto<UnpinTryFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(ErrInto<PinnedTryFuture, PhantomPinned>: Unpin);
+
+    assert_impl!(Flatten<SendFuture<()>>: Send);
+    assert_not_impl!(Flatten<LocalFuture>: Send);
+    assert_not_impl!(Flatten<SendFuture>: Send);
+    assert_impl!(Flatten<SyncFuture<()>>: Sync);
+    assert_not_impl!(Flatten<LocalFuture>: Sync);
+    assert_not_impl!(Flatten<SyncFuture>: Sync);
+    assert_impl!(Flatten<UnpinFuture<()>>: Unpin);
+    assert_not_impl!(Flatten<PinnedFuture>: Unpin);
+    assert_not_impl!(Flatten<UnpinFuture>: Unpin);
+
+    assert_impl!(FlattenSink<SendFuture, ()>: Send);
+    assert_not_impl!(FlattenSink<SendFuture, *const ()>: Send);
+    assert_not_impl!(FlattenSink<LocalFuture, ()>: Send);
+    assert_impl!(FlattenSink<SyncFuture, ()>: Sync);
+    assert_not_impl!(FlattenSink<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(FlattenSink<LocalFuture, ()>: Sync);
+    assert_impl!(FlattenSink<UnpinFuture, ()>: Unpin);
+    assert_not_impl!(FlattenSink<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(FlattenSink<PinnedFuture, ()>: Unpin);
+
+    assert_impl!(FlattenStream<SendFuture<()>>: Send);
+    assert_not_impl!(FlattenStream<LocalFuture>: Send);
+    assert_not_impl!(FlattenStream<SendFuture>: Send);
+    assert_impl!(FlattenStream<SyncFuture<()>>: Sync);
+    assert_not_impl!(FlattenStream<LocalFuture>: Sync);
+    assert_not_impl!(FlattenStream<SyncFuture>: Sync);
+    assert_impl!(FlattenStream<UnpinFuture<()>>: Unpin);
+    assert_not_impl!(FlattenStream<PinnedFuture>: Unpin);
+    assert_not_impl!(FlattenStream<UnpinFuture>: Unpin);
+
+    assert_impl!(Fuse<SendFuture>: Send);
+    assert_not_impl!(Fuse<LocalFuture>: Send);
+    assert_impl!(Fuse<SyncFuture>: Sync);
+    assert_not_impl!(Fuse<LocalFuture>: Sync);
+    assert_impl!(Fuse<UnpinFuture>: Unpin);
+    assert_not_impl!(Fuse<PinnedFuture>: Unpin);
+
+    assert_impl!(FutureObj<*const ()>: Send);
+    assert_not_impl!(FutureObj<()>: Sync);
+    assert_impl!(FutureObj<PhantomPinned>: Unpin);
+
+    assert_impl!(Inspect<SendFuture, ()>: Send);
+    assert_not_impl!(Inspect<SendFuture, *const ()>: Send);
+    assert_not_impl!(Inspect<LocalFuture, ()>: Send);
+    assert_impl!(Inspect<SyncFuture, ()>: Sync);
+    assert_not_impl!(Inspect<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(Inspect<LocalFuture, ()>: Sync);
+    assert_impl!(Inspect<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(Inspect<PhantomPinned, PhantomPinned>: Unpin);
+
+    assert_impl!(InspectErr<SendFuture, ()>: Send);
+    assert_not_impl!(InspectErr<SendFuture, *const ()>: Send);
+    assert_not_impl!(InspectErr<LocalFuture, ()>: Send);
+    assert_impl!(InspectErr<SyncFuture, ()>: Sync);
+    assert_not_impl!(InspectErr<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(InspectErr<LocalFuture, ()>: Sync);
+    assert_impl!(InspectErr<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(InspectErr<PhantomPinned, PhantomPinned>: Unpin);
+
+    assert_impl!(InspectOk<SendFuture, ()>: Send);
+    assert_not_impl!(InspectOk<SendFuture, *const ()>: Send);
+    assert_not_impl!(InspectOk<LocalFuture, ()>: Send);
+    assert_impl!(InspectOk<SyncFuture, ()>: Sync);
+    assert_not_impl!(InspectOk<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(InspectOk<LocalFuture, ()>: Sync);
+    assert_impl!(InspectOk<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(InspectOk<PhantomPinned, PhantomPinned>: Unpin);
+
+    assert_impl!(IntoFuture<SendFuture>: Send);
+    assert_not_impl!(IntoFuture<LocalFuture>: Send);
+    assert_impl!(IntoFuture<SyncFuture>: Sync);
+    assert_not_impl!(IntoFuture<LocalFuture>: Sync);
+    assert_impl!(IntoFuture<UnpinFuture>: Unpin);
+    assert_not_impl!(IntoFuture<PinnedFuture>: Unpin);
+
+    assert_impl!(IntoStream<SendFuture>: Send);
+    assert_not_impl!(IntoStream<LocalFuture>: Send);
+    assert_impl!(IntoStream<SyncFuture>: Sync);
+    assert_not_impl!(IntoStream<LocalFuture>: Sync);
+    assert_impl!(IntoStream<UnpinFuture>: Unpin);
+    assert_not_impl!(IntoStream<PinnedFuture>: Unpin);
+
+    assert_impl!(Join<SendFuture<()>, SendFuture<()>>: Send);
+    assert_not_impl!(Join<SendFuture<()>, SendFuture>: Send);
+    assert_not_impl!(Join<SendFuture, SendFuture<()>>: Send);
+    assert_not_impl!(Join<SendFuture, LocalFuture>: Send);
+    assert_not_impl!(Join<LocalFuture, SendFuture>: Send);
+    assert_impl!(Join<SyncFuture<()>, SyncFuture<()>>: Sync);
+    assert_not_impl!(Join<SyncFuture<()>, SyncFuture>: Sync);
+    assert_not_impl!(Join<SyncFuture, SyncFuture<()>>: Sync);
+    assert_not_impl!(Join<SyncFuture, LocalFuture>: Sync);
+    assert_not_impl!(Join<LocalFuture, SyncFuture>: Sync);
+    assert_impl!(Join<UnpinFuture, UnpinFuture>: Unpin);
+    assert_not_impl!(Join<PinnedFuture, UnpinFuture>: Unpin);
+    assert_not_impl!(Join<UnpinFuture, PinnedFuture>: Unpin);
+
+    // Join3, Join4, Join5 are the same as Join
+
+    assert_impl!(JoinAll<SendFuture<()>>: Send);
+    assert_not_impl!(JoinAll<LocalFuture>: Send);
+    assert_not_impl!(JoinAll<SendFuture>: Send);
+    assert_impl!(JoinAll<SyncFuture<()>>: Sync);
+    assert_not_impl!(JoinAll<LocalFuture>: Sync);
+    assert_not_impl!(JoinAll<SyncFuture>: Sync);
+    assert_impl!(JoinAll<PinnedFuture>: Unpin);
+
+    assert_impl!(Lazy<()>: Send);
+    assert_not_impl!(Lazy<*const ()>: Send);
+    assert_impl!(Lazy<()>: Sync);
+    assert_not_impl!(Lazy<*const ()>: Sync);
+    assert_impl!(Lazy<PhantomPinned>: Unpin);
+
+    assert_not_impl!(LocalFutureObj<()>: Send);
+    assert_not_impl!(LocalFutureObj<()>: Sync);
+    assert_impl!(LocalFutureObj<PhantomPinned>: Unpin);
+
+    assert_impl!(Map<SendFuture, ()>: Send);
+    assert_not_impl!(Map<SendFuture, *const ()>: Send);
+    assert_not_impl!(Map<LocalFuture, ()>: Send);
+    assert_impl!(Map<SyncFuture, ()>: Sync);
+    assert_not_impl!(Map<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(Map<LocalFuture, ()>: Sync);
+    assert_impl!(Map<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(Map<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(MapErr<SendFuture, ()>: Send);
+    assert_not_impl!(MapErr<SendFuture, *const ()>: Send);
+    assert_not_impl!(MapErr<LocalFuture, ()>: Send);
+    assert_impl!(MapErr<SyncFuture, ()>: Sync);
+    assert_not_impl!(MapErr<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(MapErr<LocalFuture, ()>: Sync);
+    assert_impl!(MapErr<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(MapErr<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(MapInto<SendFuture, *const ()>: Send);
+    assert_not_impl!(MapInto<LocalFuture, ()>: Send);
+    assert_impl!(MapInto<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(MapInto<LocalFuture, ()>: Sync);
+    assert_impl!(MapInto<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(MapInto<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(MapOk<SendFuture, ()>: Send);
+    assert_not_impl!(MapOk<SendFuture, *const ()>: Send);
+    assert_not_impl!(MapOk<LocalFuture, ()>: Send);
+    assert_impl!(MapOk<SyncFuture, ()>: Sync);
+    assert_not_impl!(MapOk<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(MapOk<LocalFuture, ()>: Sync);
+    assert_impl!(MapOk<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(MapOk<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(MapOkOrElse<SendFuture, (), ()>: Send);
+    assert_not_impl!(MapOkOrElse<SendFuture, (), *const ()>: Send);
+    assert_not_impl!(MapOkOrElse<SendFuture, *const (), ()>: Send);
+    assert_not_impl!(MapOkOrElse<LocalFuture, (), ()>: Send);
+    assert_impl!(MapOkOrElse<SyncFuture, (), ()>: Sync);
+    assert_not_impl!(MapOkOrElse<SyncFuture, (), *const ()>: Sync);
+    assert_not_impl!(MapOkOrElse<SyncFuture, *const (), ()>: Sync);
+    assert_not_impl!(MapOkOrElse<LocalFuture, (), ()>: Sync);
+    assert_impl!(MapOkOrElse<UnpinFuture, PhantomPinned, PhantomPinned>: Unpin);
+    assert_not_impl!(MapOkOrElse<PhantomPinned, (), ()>: Unpin);
+
+    assert_impl!(NeverError<SendFuture>: Send);
+    assert_not_impl!(NeverError<LocalFuture>: Send);
+    assert_impl!(NeverError<SyncFuture>: Sync);
+    assert_not_impl!(NeverError<LocalFuture>: Sync);
+    assert_impl!(NeverError<UnpinFuture>: Unpin);
+    assert_not_impl!(NeverError<PinnedFuture>: Unpin);
+
+    assert_impl!(OkInto<SendFuture, *const ()>: Send);
+    assert_not_impl!(OkInto<LocalFuture, ()>: Send);
+    assert_impl!(OkInto<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(OkInto<LocalFuture, ()>: Sync);
+    assert_impl!(OkInto<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(OkInto<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(OptionFuture<SendFuture>: Send);
+    assert_not_impl!(OptionFuture<LocalFuture>: Send);
+    assert_impl!(OptionFuture<SyncFuture>: Sync);
+    assert_not_impl!(OptionFuture<LocalFuture>: Sync);
+    assert_impl!(OptionFuture<UnpinFuture>: Unpin);
+    assert_not_impl!(OptionFuture<PinnedFuture>: Unpin);
+
+    assert_impl!(OrElse<SendFuture, SendFuture, ()>: Send);
+    assert_not_impl!(OrElse<SendFuture, LocalFuture, ()>: Send);
+    assert_not_impl!(OrElse<LocalFuture, SendFuture, ()>: Send);
+    assert_not_impl!(OrElse<SendFuture, SendFuture, *const ()>: Send);
+    assert_impl!(OrElse<SyncFuture, SyncFuture, ()>: Sync);
+    assert_not_impl!(OrElse<SyncFuture, LocalFuture, ()>: Sync);
+    assert_not_impl!(OrElse<LocalFuture, SyncFuture, ()>: Sync);
+    assert_not_impl!(OrElse<SyncFuture, SyncFuture, *const ()>: Sync);
+    assert_impl!(OrElse<UnpinFuture, UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(OrElse<PinnedFuture, UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(OrElse<UnpinFuture, PinnedFuture, PhantomPinned>: Unpin);
+
+    assert_impl!(Pending<()>: Send);
+    assert_not_impl!(Pending<*const ()>: Send);
+    assert_impl!(Pending<()>: Sync);
+    assert_not_impl!(Pending<*const ()>: Sync);
+    assert_impl!(Pending<PhantomPinned>: Unpin);
+
+    assert_impl!(PollFn<()>: Send);
+    assert_not_impl!(PollFn<*const ()>: Send);
+    assert_impl!(PollFn<()>: Sync);
+    assert_not_impl!(PollFn<*const ()>: Sync);
+    assert_impl!(PollFn<PhantomPinned>: Unpin);
+
+    assert_impl!(PollImmediate<SendStream>: Send);
+    assert_not_impl!(PollImmediate<LocalStream<()>>: Send);
+    assert_impl!(PollImmediate<SyncStream>: Sync);
+    assert_not_impl!(PollImmediate<LocalStream<()>>: Sync);
+    assert_impl!(PollImmediate<UnpinStream>: Unpin);
+    assert_not_impl!(PollImmediate<PinnedStream>: Unpin);
+
+    assert_impl!(Ready<()>: Send);
+    assert_not_impl!(Ready<*const ()>: Send);
+    assert_impl!(Ready<()>: Sync);
+    assert_not_impl!(Ready<*const ()>: Sync);
+    assert_impl!(Ready<PhantomPinned>: Unpin);
+
+    assert_impl!(Remote<SendFuture<()>>: Send);
+    assert_not_impl!(Remote<LocalFuture>: Send);
+    assert_not_impl!(Remote<SendFuture>: Send);
+    assert_impl!(Remote<SyncFuture<()>>: Sync);
+    assert_not_impl!(Remote<LocalFuture>: Sync);
+    assert_not_impl!(Remote<SyncFuture>: Sync);
+    assert_impl!(Remote<UnpinFuture>: Unpin);
+    assert_not_impl!(Remote<PinnedFuture>: Unpin);
+
+    assert_impl!(RemoteHandle<()>: Send);
+    assert_not_impl!(RemoteHandle<*const ()>: Send);
+    assert_impl!(RemoteHandle<()>: Sync);
+    assert_not_impl!(RemoteHandle<*const ()>: Sync);
+    assert_impl!(RemoteHandle<PhantomPinned>: Unpin);
+
+    assert_impl!(Select<SendFuture, SendFuture>: Send);
+    assert_not_impl!(Select<SendFuture, LocalFuture>: Send);
+    assert_not_impl!(Select<LocalFuture, SendFuture>: Send);
+    assert_impl!(Select<SyncFuture, SyncFuture>: Sync);
+    assert_not_impl!(Select<SyncFuture, LocalFuture>: Sync);
+    assert_not_impl!(Select<LocalFuture, SyncFuture>: Sync);
+    assert_impl!(Select<UnpinFuture, UnpinFuture>: Unpin);
+    assert_not_impl!(Select<PinnedFuture, UnpinFuture>: Unpin);
+    assert_not_impl!(Select<UnpinFuture, PinnedFuture>: Unpin);
+
+    assert_impl!(SelectAll<SendFuture>: Send);
+    assert_not_impl!(SelectAll<LocalFuture>: Send);
+    assert_impl!(SelectAll<SyncFuture>: Sync);
+    assert_not_impl!(SelectAll<LocalFuture>: Sync);
+    assert_impl!(SelectAll<UnpinFuture>: Unpin);
+    assert_not_impl!(SelectAll<PinnedFuture>: Unpin);
+
+    assert_impl!(SelectOk<SendFuture>: Send);
+    assert_not_impl!(SelectOk<LocalFuture>: Send);
+    assert_impl!(SelectOk<SyncFuture>: Sync);
+    assert_not_impl!(SelectOk<LocalFuture>: Sync);
+    assert_impl!(SelectOk<UnpinFuture>: Unpin);
+    assert_not_impl!(SelectOk<PinnedFuture>: Unpin);
+
+    assert_impl!(Shared<SendFuture<()>>: Send);
+    assert_not_impl!(Shared<SendFuture>: Send);
+    assert_not_impl!(Shared<LocalFuture>: Send);
+    assert_not_impl!(Shared<SyncFuture<()>>: Sync);
+    assert_impl!(Shared<PinnedFuture>: Unpin);
+
+    assert_impl!(Then<SendFuture, SendFuture, ()>: Send);
+    assert_not_impl!(Then<SendFuture, SendFuture, *const ()>: Send);
+    assert_not_impl!(Then<SendFuture, LocalFuture, ()>: Send);
+    assert_not_impl!(Then<LocalFuture, SendFuture, ()>: Send);
+    assert_impl!(Then<SyncFuture, SyncFuture, ()>: Sync);
+    assert_not_impl!(Then<SyncFuture, SyncFuture, *const ()>: Sync);
+    assert_not_impl!(Then<SyncFuture, LocalFuture, ()>: Sync);
+    assert_not_impl!(Then<LocalFuture, SyncFuture, ()>: Sync);
+    assert_impl!(Then<UnpinFuture, UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(Then<PinnedFuture, UnpinFuture, ()>: Unpin);
+    assert_not_impl!(Then<UnpinFuture, PinnedFuture, ()>: Unpin);
+
+    assert_impl!(TryFlatten<SendTryFuture<()>, ()>: Send);
+    assert_not_impl!(TryFlatten<LocalTryFuture, ()>: Send);
+    assert_not_impl!(TryFlatten<SendTryFuture, *const ()>: Send);
+    assert_impl!(TryFlatten<SyncTryFuture<()>, ()>: Sync);
+    assert_not_impl!(TryFlatten<LocalTryFuture, ()>: Sync);
+    assert_not_impl!(TryFlatten<SyncTryFuture, *const ()>: Sync);
+    assert_impl!(TryFlatten<UnpinTryFuture<()>, ()>: Unpin);
+    assert_not_impl!(TryFlatten<PinnedTryFuture, ()>: Unpin);
+    assert_not_impl!(TryFlatten<UnpinTryFuture, PhantomPinned>: Unpin);
+
+    assert_impl!(TryFlattenStream<SendTryFuture<()>>: Send);
+    assert_not_impl!(TryFlattenStream<LocalTryFuture>: Send);
+    assert_not_impl!(TryFlattenStream<SendTryFuture>: Send);
+    assert_impl!(TryFlattenStream<SyncTryFuture<()>>: Sync);
+    assert_not_impl!(TryFlattenStream<LocalTryFuture>: Sync);
+    assert_not_impl!(TryFlattenStream<SyncTryFuture>: Sync);
+    assert_impl!(TryFlattenStream<UnpinTryFuture<()>>: Unpin);
+    assert_not_impl!(TryFlattenStream<PinnedTryFuture>: Unpin);
+    assert_not_impl!(TryFlattenStream<UnpinTryFuture>: Unpin);
+
+    assert_impl!(TryJoin<SendTryFuture<()>, SendTryFuture<()>>: Send);
+    assert_not_impl!(TryJoin<SendTryFuture<()>, SendTryFuture>: Send);
+    assert_not_impl!(TryJoin<SendTryFuture, SendTryFuture<()>>: Send);
+    assert_not_impl!(TryJoin<SendTryFuture, LocalTryFuture>: Send);
+    assert_not_impl!(TryJoin<LocalTryFuture, SendTryFuture>: Send);
+    assert_impl!(TryJoin<SyncTryFuture<()>, SyncTryFuture<()>>: Sync);
+    assert_not_impl!(TryJoin<SyncTryFuture<()>, SyncTryFuture>: Sync);
+    assert_not_impl!(TryJoin<SyncTryFuture, SyncTryFuture<()>>: Sync);
+    assert_not_impl!(TryJoin<SyncTryFuture, LocalTryFuture>: Sync);
+    assert_not_impl!(TryJoin<LocalTryFuture, SyncTryFuture>: Sync);
+    assert_impl!(TryJoin<UnpinTryFuture, UnpinTryFuture>: Unpin);
+    assert_not_impl!(TryJoin<PinnedTryFuture, UnpinTryFuture>: Unpin);
+    assert_not_impl!(TryJoin<UnpinTryFuture, PinnedTryFuture>: Unpin);
+
+    // TryJoin3, TryJoin4, TryJoin5 are the same as TryJoin
+
+    assert_impl!(TryJoinAll<SendTryFuture<()>>: Send);
+    assert_not_impl!(TryJoinAll<LocalTryFuture>: Send);
+    assert_not_impl!(TryJoinAll<SendTryFuture>: Send);
+    assert_impl!(TryJoinAll<SyncTryFuture<()>>: Sync);
+    assert_not_impl!(TryJoinAll<LocalTryFuture>: Sync);
+    assert_not_impl!(TryJoinAll<SyncTryFuture>: Sync);
+    assert_impl!(TryJoinAll<PinnedTryFuture>: Unpin);
+
+    assert_impl!(TrySelect<SendFuture, SendFuture>: Send);
+    assert_not_impl!(TrySelect<SendFuture, LocalFuture>: Send);
+    assert_not_impl!(TrySelect<LocalFuture, SendFuture>: Send);
+    assert_impl!(TrySelect<SyncFuture, SyncFuture>: Sync);
+    assert_not_impl!(TrySelect<SyncFuture, LocalFuture>: Sync);
+    assert_not_impl!(TrySelect<LocalFuture, SyncFuture>: Sync);
+    assert_impl!(TrySelect<UnpinFuture, UnpinFuture>: Unpin);
+    assert_not_impl!(TrySelect<PinnedFuture, UnpinFuture>: Unpin);
+    assert_not_impl!(TrySelect<UnpinFuture, PinnedFuture>: Unpin);
+
+    assert_impl!(UnitError<SendFuture>: Send);
+    assert_not_impl!(UnitError<LocalFuture>: Send);
+    assert_impl!(UnitError<SyncFuture>: Sync);
+    assert_not_impl!(UnitError<LocalFuture>: Sync);
+    assert_impl!(UnitError<UnpinFuture>: Unpin);
+    assert_not_impl!(UnitError<PinnedFuture>: Unpin);
+
+    assert_impl!(UnwrapOrElse<SendFuture, ()>: Send);
+    assert_not_impl!(UnwrapOrElse<SendFuture, *const ()>: Send);
+    assert_not_impl!(UnwrapOrElse<LocalFuture, ()>: Send);
+    assert_impl!(UnwrapOrElse<SyncFuture, ()>: Sync);
+    assert_not_impl!(UnwrapOrElse<SyncFuture, *const ()>: Sync);
+    assert_not_impl!(UnwrapOrElse<LocalFuture, ()>: Sync);
+    assert_impl!(UnwrapOrElse<UnpinFuture, PhantomPinned>: Unpin);
+    assert_not_impl!(UnwrapOrElse<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(WeakShared<SendFuture<()>>: Send);
+    assert_not_impl!(WeakShared<SendFuture>: Send);
+    assert_not_impl!(WeakShared<LocalFuture>: Send);
+    assert_not_impl!(WeakShared<SyncFuture<()>>: Sync);
+    assert_impl!(WeakShared<PinnedFuture>: Unpin);
+
+    assert_impl!(Either<SendFuture, SendFuture>: Send);
+    assert_not_impl!(Either<SendFuture, LocalFuture>: Send);
+    assert_not_impl!(Either<LocalFuture, SendFuture>: Send);
+    assert_impl!(Either<SyncFuture, SyncFuture>: Sync);
+    assert_not_impl!(Either<SyncFuture, LocalFuture>: Sync);
+    assert_not_impl!(Either<LocalFuture, SyncFuture>: Sync);
+    assert_impl!(Either<UnpinFuture, UnpinFuture>: Unpin);
+    assert_not_impl!(Either<UnpinFuture, PinnedFuture>: Unpin);
+    assert_not_impl!(Either<PinnedFuture, UnpinFuture>: Unpin);
+
+    assert_impl!(MaybeDone<SendFuture<()>>: Send);
+    assert_not_impl!(MaybeDone<SendFuture>: Send);
+    assert_not_impl!(MaybeDone<LocalFuture>: Send);
+    assert_impl!(MaybeDone<SyncFuture<()>>: Sync);
+    assert_not_impl!(MaybeDone<SyncFuture>: Sync);
+    assert_not_impl!(MaybeDone<LocalFuture>: Sync);
+    assert_impl!(MaybeDone<UnpinFuture>: Unpin);
+    assert_not_impl!(MaybeDone<PinnedFuture>: Unpin);
+
+    assert_impl!(TryMaybeDone<SendTryFuture<()>>: Send);
+    assert_not_impl!(TryMaybeDone<SendTryFuture>: Send);
+    assert_not_impl!(TryMaybeDone<LocalTryFuture>: Send);
+    assert_impl!(TryMaybeDone<SyncTryFuture<()>>: Sync);
+    assert_not_impl!(TryMaybeDone<SyncTryFuture>: Sync);
+    assert_not_impl!(TryMaybeDone<LocalTryFuture>: Sync);
+    assert_impl!(TryMaybeDone<UnpinTryFuture>: Unpin);
+    assert_not_impl!(TryMaybeDone<PinnedTryFuture>: Unpin);
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::io`.
+pub mod io {
+    use super::*;
+    use futures::io::{Sink, *};
+
+    assert_impl!(AllowStdIo<()>: Send);
+    assert_not_impl!(AllowStdIo<*const ()>: Send);
+    assert_impl!(AllowStdIo<()>: Sync);
+    assert_not_impl!(AllowStdIo<*const ()>: Sync);
+    assert_impl!(AllowStdIo<PhantomPinned>: Unpin);
+
+    assert_impl!(BufReader<()>: Send);
+    assert_not_impl!(BufReader<*const ()>: Send);
+    assert_impl!(BufReader<()>: Sync);
+    assert_not_impl!(BufReader<*const ()>: Sync);
+    assert_impl!(BufReader<()>: Unpin);
+    assert_not_impl!(BufReader<PhantomPinned>: Unpin);
+
+    assert_impl!(BufWriter<()>: Send);
+    assert_not_impl!(BufWriter<*const ()>: Send);
+    assert_impl!(BufWriter<()>: Sync);
+    assert_not_impl!(BufWriter<*const ()>: Sync);
+    assert_impl!(BufWriter<()>: Unpin);
+    assert_not_impl!(BufWriter<PhantomPinned>: Unpin);
+
+    assert_impl!(Chain<(), ()>: Send);
+    assert_not_impl!(Chain<(), *const ()>: Send);
+    assert_not_impl!(Chain<*const (), ()>: Send);
+    assert_impl!(Chain<(), ()>: Sync);
+    assert_not_impl!(Chain<(), *const ()>: Sync);
+    assert_not_impl!(Chain<*const (), ()>: Sync);
+    assert_impl!(Chain<(), ()>: Unpin);
+    assert_not_impl!(Chain<(), PhantomPinned>: Unpin);
+    assert_not_impl!(Chain<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Close<'_, ()>: Send);
+    assert_not_impl!(Close<'_, *const ()>: Send);
+    assert_impl!(Close<'_, ()>: Sync);
+    assert_not_impl!(Close<'_, *const ()>: Sync);
+    assert_impl!(Close<'_, ()>: Unpin);
+    assert_not_impl!(Close<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(Copy<(), ()>: Send);
+    assert_not_impl!(Copy<(), *const ()>: Send);
+    assert_not_impl!(Copy<*const (), ()>: Send);
+    assert_impl!(Copy<(), ()>: Sync);
+    assert_not_impl!(Copy<(), *const ()>: Sync);
+    assert_not_impl!(Copy<*const (), ()>: Sync);
+    assert_impl!(Copy<(), PhantomPinned>: Unpin);
+    assert_not_impl!(Copy<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(CopyBuf<(), ()>: Send);
+    assert_not_impl!(CopyBuf<(), *const ()>: Send);
+    assert_not_impl!(CopyBuf<*const (), ()>: Send);
+    assert_impl!(CopyBuf<(), ()>: Sync);
+    assert_not_impl!(CopyBuf<(), *const ()>: Sync);
+    assert_not_impl!(CopyBuf<*const (), ()>: Sync);
+    assert_impl!(CopyBuf<(), PhantomPinned>: Unpin);
+    assert_not_impl!(CopyBuf<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Cursor<()>: Send);
+    assert_not_impl!(Cursor<*const ()>: Send);
+    assert_impl!(Cursor<()>: Sync);
+    assert_not_impl!(Cursor<*const ()>: Sync);
+    assert_impl!(Cursor<()>: Unpin);
+    assert_not_impl!(Cursor<PhantomPinned>: Unpin);
+
+    assert_impl!(Empty: Send);
+    assert_impl!(Empty: Sync);
+    assert_impl!(Empty: Unpin);
+
+    assert_impl!(FillBuf<'_, ()>: Send);
+    assert_not_impl!(FillBuf<'_, *const ()>: Send);
+    assert_impl!(FillBuf<'_, ()>: Sync);
+    assert_not_impl!(FillBuf<'_, *const ()>: Sync);
+    assert_impl!(FillBuf<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(Flush<'_, ()>: Send);
+    assert_not_impl!(Flush<'_, *const ()>: Send);
+    assert_impl!(Flush<'_, ()>: Sync);
+    assert_not_impl!(Flush<'_, *const ()>: Sync);
+    assert_impl!(Flush<'_, ()>: Unpin);
+    assert_not_impl!(Flush<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(IntoSink<(), ()>: Send);
+    assert_not_impl!(IntoSink<(), *const ()>: Send);
+    assert_not_impl!(IntoSink<*const (), ()>: Send);
+    assert_impl!(IntoSink<(), ()>: Sync);
+    assert_not_impl!(IntoSink<(), *const ()>: Sync);
+    assert_not_impl!(IntoSink<*const (), ()>: Sync);
+    assert_impl!(IntoSink<(), PhantomPinned>: Unpin);
+    assert_not_impl!(IntoSink<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Lines<()>: Send);
+    assert_not_impl!(Lines<*const ()>: Send);
+    assert_impl!(Lines<()>: Sync);
+    assert_not_impl!(Lines<*const ()>: Sync);
+    assert_impl!(Lines<()>: Unpin);
+    assert_not_impl!(Lines<PhantomPinned>: Unpin);
+
+    assert_impl!(Read<'_, ()>: Send);
+    assert_not_impl!(Read<'_, *const ()>: Send);
+    assert_impl!(Read<'_, ()>: Sync);
+    assert_not_impl!(Read<'_, *const ()>: Sync);
+    assert_impl!(Read<'_, ()>: Unpin);
+    assert_not_impl!(Read<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(ReadExact<'_, ()>: Send);
+    assert_not_impl!(ReadExact<'_, *const ()>: Send);
+    assert_impl!(ReadExact<'_, ()>: Sync);
+    assert_not_impl!(ReadExact<'_, *const ()>: Sync);
+    assert_impl!(ReadExact<'_, ()>: Unpin);
+    assert_not_impl!(ReadExact<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(ReadHalf<()>: Send);
+    assert_not_impl!(ReadHalf<*const ()>: Send);
+    assert_impl!(ReadHalf<()>: Sync);
+    assert_not_impl!(ReadHalf<*const ()>: Sync);
+    assert_impl!(ReadHalf<PhantomPinned>: Unpin);
+
+    assert_impl!(ReadLine<'_, ()>: Send);
+    assert_not_impl!(ReadLine<'_, *const ()>: Send);
+    assert_impl!(ReadLine<'_, ()>: Sync);
+    assert_not_impl!(ReadLine<'_, *const ()>: Sync);
+    assert_impl!(ReadLine<'_, ()>: Unpin);
+    assert_not_impl!(ReadLine<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(ReadToEnd<'_, ()>: Send);
+    assert_not_impl!(ReadToEnd<'_, *const ()>: Send);
+    assert_impl!(ReadToEnd<'_, ()>: Sync);
+    assert_not_impl!(ReadToEnd<'_, *const ()>: Sync);
+    assert_impl!(ReadToEnd<'_, ()>: Unpin);
+    assert_not_impl!(ReadToEnd<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(ReadToString<'_, ()>: Send);
+    assert_not_impl!(ReadToString<'_, *const ()>: Send);
+    assert_impl!(ReadToString<'_, ()>: Sync);
+    assert_not_impl!(ReadToString<'_, *const ()>: Sync);
+    assert_impl!(ReadToString<'_, ()>: Unpin);
+    assert_not_impl!(ReadToString<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(ReadUntil<'_, ()>: Send);
+    assert_not_impl!(ReadUntil<'_, *const ()>: Send);
+    assert_impl!(ReadUntil<'_, ()>: Sync);
+    assert_not_impl!(ReadUntil<'_, *const ()>: Sync);
+    assert_impl!(ReadUntil<'_, ()>: Unpin);
+    assert_not_impl!(ReadUntil<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(ReadVectored<'_, ()>: Send);
+    assert_not_impl!(ReadVectored<'_, *const ()>: Send);
+    assert_impl!(ReadVectored<'_, ()>: Sync);
+    assert_not_impl!(ReadVectored<'_, *const ()>: Sync);
+    assert_impl!(ReadVectored<'_, ()>: Unpin);
+    assert_not_impl!(ReadVectored<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(Repeat: Send);
+    assert_impl!(Repeat: Sync);
+    assert_impl!(Repeat: Unpin);
+
+    assert_impl!(ReuniteError<()>: Send);
+    assert_not_impl!(ReuniteError<*const ()>: Send);
+    assert_impl!(ReuniteError<()>: Sync);
+    assert_not_impl!(ReuniteError<*const ()>: Sync);
+    assert_impl!(ReuniteError<PhantomPinned>: Unpin);
+
+    assert_impl!(Seek<'_, ()>: Send);
+    assert_not_impl!(Seek<'_, *const ()>: Send);
+    assert_impl!(Seek<'_, ()>: Sync);
+    assert_not_impl!(Seek<'_, *const ()>: Sync);
+    assert_impl!(Seek<'_, ()>: Unpin);
+    assert_not_impl!(Seek<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(SeeKRelative<'_, ()>: Send);
+    assert_not_impl!(SeeKRelative<'_, *const ()>: Send);
+    assert_impl!(SeeKRelative<'_, ()>: Sync);
+    assert_not_impl!(SeeKRelative<'_, *const ()>: Sync);
+    assert_impl!(SeeKRelative<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(Sink: Send);
+    assert_impl!(Sink: Sync);
+    assert_impl!(Sink: Unpin);
+
+    assert_impl!(Take<()>: Send);
+    assert_not_impl!(Take<*const ()>: Send);
+    assert_impl!(Take<()>: Sync);
+    assert_not_impl!(Take<*const ()>: Sync);
+    assert_impl!(Take<()>: Unpin);
+    assert_not_impl!(Take<PhantomPinned>: Unpin);
+
+    assert_impl!(Window<()>: Send);
+    assert_not_impl!(Window<*const ()>: Send);
+    assert_impl!(Window<()>: Sync);
+    assert_not_impl!(Window<*const ()>: Sync);
+    assert_impl!(Window<()>: Unpin);
+    assert_not_impl!(Window<PhantomPinned>: Unpin);
+
+    assert_impl!(Write<'_, ()>: Send);
+    assert_not_impl!(Write<'_, *const ()>: Send);
+    assert_impl!(Write<'_, ()>: Sync);
+    assert_not_impl!(Write<'_, *const ()>: Sync);
+    assert_impl!(Write<'_, ()>: Unpin);
+    assert_not_impl!(Write<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(WriteAll<'_, ()>: Send);
+    assert_not_impl!(WriteAll<'_, *const ()>: Send);
+    assert_impl!(WriteAll<'_, ()>: Sync);
+    assert_not_impl!(WriteAll<'_, *const ()>: Sync);
+    assert_impl!(WriteAll<'_, ()>: Unpin);
+    assert_not_impl!(WriteAll<'_, PhantomPinned>: Unpin);
+
+    #[cfg(feature = "write-all-vectored")]
+    assert_impl!(WriteAllVectored<'_, ()>: Send);
+    #[cfg(feature = "write-all-vectored")]
+    assert_not_impl!(WriteAllVectored<'_, *const ()>: Send);
+    #[cfg(feature = "write-all-vectored")]
+    assert_impl!(WriteAllVectored<'_, ()>: Sync);
+    #[cfg(feature = "write-all-vectored")]
+    assert_not_impl!(WriteAllVectored<'_, *const ()>: Sync);
+    #[cfg(feature = "write-all-vectored")]
+    assert_impl!(WriteAllVectored<'_, ()>: Unpin);
+    // WriteAllVectored requires `W: Unpin`
+    // #[cfg(feature = "write-all-vectored")]
+    // assert_not_impl!(WriteAllVectored<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(WriteHalf<()>: Send);
+    assert_not_impl!(WriteHalf<*const ()>: Send);
+    assert_impl!(WriteHalf<()>: Sync);
+    assert_not_impl!(WriteHalf<*const ()>: Sync);
+    assert_impl!(WriteHalf<PhantomPinned>: Unpin);
+
+    assert_impl!(WriteVectored<'_, ()>: Send);
+    assert_not_impl!(WriteVectored<'_, *const ()>: Send);
+    assert_impl!(WriteVectored<'_, ()>: Sync);
+    assert_not_impl!(WriteVectored<'_, *const ()>: Sync);
+    assert_impl!(WriteVectored<'_, ()>: Unpin);
+    assert_not_impl!(WriteVectored<'_, PhantomPinned>: Unpin);
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::lock`.
+pub mod lock {
+    use super::*;
+    use futures::lock::*;
+
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLock<()>: Send);
+    #[cfg(feature = "bilock")]
+    assert_not_impl!(BiLock<*const ()>: Send);
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLock<()>: Sync);
+    #[cfg(feature = "bilock")]
+    assert_not_impl!(BiLock<*const ()>: Sync);
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLock<PhantomPinned>: Unpin);
+
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLockAcquire<'_, ()>: Send);
+    #[cfg(feature = "bilock")]
+    assert_not_impl!(BiLockAcquire<'_, *const ()>: Send);
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLockAcquire<'_, ()>: Sync);
+    #[cfg(feature = "bilock")]
+    assert_not_impl!(BiLockAcquire<'_, *const ()>: Sync);
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLockAcquire<'_, PhantomPinned>: Unpin);
+
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLockGuard<'_, ()>: Send);
+    #[cfg(feature = "bilock")]
+    assert_not_impl!(BiLockGuard<'_, *const ()>: Send);
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLockGuard<'_, ()>: Sync);
+    #[cfg(feature = "bilock")]
+    assert_not_impl!(BiLockGuard<'_, *const ()>: Sync);
+    #[cfg(feature = "bilock")]
+    assert_impl!(BiLockGuard<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(MappedMutexGuard<'_, (), ()>: Send);
+    assert_not_impl!(MappedMutexGuard<'_, (), *const ()>: Send);
+    assert_not_impl!(MappedMutexGuard<'_, *const (), ()>: Send);
+    assert_impl!(MappedMutexGuard<'_, (), ()>: Sync);
+    assert_not_impl!(MappedMutexGuard<'_, (), *const ()>: Sync);
+    assert_not_impl!(MappedMutexGuard<'_, *const (), ()>: Sync);
+    assert_impl!(MappedMutexGuard<'_, PhantomPinned, PhantomPinned>: Unpin);
+
+    assert_impl!(Mutex<()>: Send);
+    assert_not_impl!(Mutex<*const ()>: Send);
+    assert_impl!(Mutex<()>: Sync);
+    assert_not_impl!(Mutex<*const ()>: Sync);
+    assert_impl!(Mutex<()>: Unpin);
+    assert_not_impl!(Mutex<PhantomPinned>: Unpin);
+
+    assert_impl!(MutexGuard<'_, ()>: Send);
+    assert_not_impl!(MutexGuard<'_, *const ()>: Send);
+    assert_impl!(MutexGuard<'_, ()>: Sync);
+    assert_not_impl!(MutexGuard<'_, *const ()>: Sync);
+    assert_impl!(MutexGuard<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(MutexLockFuture<'_, ()>: Send);
+    assert_not_impl!(MutexLockFuture<'_, *const ()>: Send);
+    assert_impl!(MutexLockFuture<'_, *const ()>: Sync);
+    assert_impl!(MutexLockFuture<'_, PhantomPinned>: Unpin);
+
+    #[cfg(feature = "bilock")]
+    assert_impl!(ReuniteError<()>: Send);
+    #[cfg(feature = "bilock")]
+    assert_not_impl!(ReuniteError<*const ()>: Send);
+    #[cfg(feature = "bilock")]
+    assert_impl!(ReuniteError<()>: Sync);
+    #[cfg(feature = "bilock")]
+    assert_not_impl!(ReuniteError<*const ()>: Sync);
+    #[cfg(feature = "bilock")]
+    assert_impl!(ReuniteError<PhantomPinned>: Unpin);
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::sink`.
+pub mod sink {
+    use super::*;
+    use futures::sink::{self, *};
+    use std::marker::Send;
+
+    assert_impl!(Buffer<(), ()>: Send);
+    assert_not_impl!(Buffer<(), *const ()>: Send);
+    assert_not_impl!(Buffer<*const (), ()>: Send);
+    assert_impl!(Buffer<(), ()>: Sync);
+    assert_not_impl!(Buffer<(), *const ()>: Sync);
+    assert_not_impl!(Buffer<*const (), ()>: Sync);
+    assert_impl!(Buffer<(), PhantomPinned>: Unpin);
+    assert_not_impl!(Buffer<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Close<'_, (), *const ()>: Send);
+    assert_not_impl!(Close<'_, *const (), ()>: Send);
+    assert_impl!(Close<'_, (), *const ()>: Sync);
+    assert_not_impl!(Close<'_, *const (), ()>: Sync);
+    assert_impl!(Close<'_, (), PhantomPinned>: Unpin);
+    assert_not_impl!(Close<'_, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Drain<()>: Send);
+    assert_not_impl!(Drain<*const ()>: Send);
+    assert_impl!(Drain<()>: Sync);
+    assert_not_impl!(Drain<*const ()>: Sync);
+    assert_impl!(Drain<PhantomPinned>: Unpin);
+
+    assert_impl!(Fanout<(), ()>: Send);
+    assert_not_impl!(Fanout<(), *const ()>: Send);
+    assert_not_impl!(Fanout<*const (), ()>: Send);
+    assert_impl!(Fanout<(), ()>: Sync);
+    assert_not_impl!(Fanout<(), *const ()>: Sync);
+    assert_not_impl!(Fanout<*const (), ()>: Sync);
+    assert_impl!(Fanout<(), ()>: Unpin);
+    assert_not_impl!(Fanout<(), PhantomPinned>: Unpin);
+    assert_not_impl!(Fanout<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Feed<'_, (), ()>: Send);
+    assert_not_impl!(Feed<'_, (), *const ()>: Send);
+    assert_not_impl!(Feed<'_, *const (), ()>: Send);
+    assert_impl!(Feed<'_, (), ()>: Sync);
+    assert_not_impl!(Feed<'_, (), *const ()>: Sync);
+    assert_not_impl!(Feed<'_, *const (), ()>: Sync);
+    assert_impl!(Feed<'_, (), PhantomPinned>: Unpin);
+    assert_not_impl!(Feed<'_, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Flush<'_, (), *const ()>: Send);
+    assert_not_impl!(Flush<'_, *const (), ()>: Send);
+    assert_impl!(Flush<'_, (), *const ()>: Sync);
+    assert_not_impl!(Flush<'_, *const (), ()>: Sync);
+    assert_impl!(Flush<'_, (), PhantomPinned>: Unpin);
+    assert_not_impl!(Flush<'_, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(sink::Send<'_, (), ()>: Send);
+    assert_not_impl!(sink::Send<'_, (), *const ()>: Send);
+    assert_not_impl!(sink::Send<'_, *const (), ()>: Send);
+    assert_impl!(sink::Send<'_, (), ()>: Sync);
+    assert_not_impl!(sink::Send<'_, (), *const ()>: Sync);
+    assert_not_impl!(sink::Send<'_, *const (), ()>: Sync);
+    assert_impl!(sink::Send<'_, (), PhantomPinned>: Unpin);
+    assert_not_impl!(sink::Send<'_, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(SendAll<'_, (), SendTryStream<()>>: Send);
+    assert_not_impl!(SendAll<'_, (), SendTryStream>: Send);
+    assert_not_impl!(SendAll<'_, (), LocalTryStream>: Send);
+    assert_not_impl!(SendAll<'_, *const (), SendTryStream<()>>: Send);
+    assert_impl!(SendAll<'_, (), SyncTryStream<()>>: Sync);
+    assert_not_impl!(SendAll<'_, (), SyncTryStream>: Sync);
+    assert_not_impl!(SendAll<'_, (), LocalTryStream>: Sync);
+    assert_not_impl!(SendAll<'_, *const (), SyncTryStream<()>>: Sync);
+    assert_impl!(SendAll<'_, (), UnpinTryStream>: Unpin);
+    assert_not_impl!(SendAll<'_, PhantomPinned, UnpinTryStream>: Unpin);
+    assert_not_impl!(SendAll<'_, (), PinnedTryStream>: Unpin);
+
+    assert_impl!(SinkErrInto<SendSink, *const (), *const ()>: Send);
+    assert_not_impl!(SinkErrInto<LocalSink<()>, (), ()>: Send);
+    assert_impl!(SinkErrInto<SyncSink, *const (), *const ()>: Sync);
+    assert_not_impl!(SinkErrInto<LocalSink<()>, (), ()>: Sync);
+    assert_impl!(SinkErrInto<UnpinSink, PhantomPinned, PhantomPinned>: Unpin);
+    assert_not_impl!(SinkErrInto<PinnedSink<()>, (), ()>: Unpin);
+
+    assert_impl!(SinkMapErr<SendSink, ()>: Send);
+    assert_not_impl!(SinkMapErr<SendSink, *const ()>: Send);
+    assert_not_impl!(SinkMapErr<LocalSink<()>, ()>: Send);
+    assert_impl!(SinkMapErr<SyncSink, ()>: Sync);
+    assert_not_impl!(SinkMapErr<SyncSink, *const ()>: Sync);
+    assert_not_impl!(SinkMapErr<LocalSink<()>, ()>: Sync);
+    assert_impl!(SinkMapErr<UnpinSink, PhantomPinned>: Unpin);
+    assert_not_impl!(SinkMapErr<PinnedSink<()>, ()>: Unpin);
+
+    assert_impl!(Unfold<(), (), ()>: Send);
+    assert_not_impl!(Unfold<*const (), (), ()>: Send);
+    assert_not_impl!(Unfold<(), *const (), ()>: Send);
+    assert_not_impl!(Unfold<(), (), *const ()>: Send);
+    assert_impl!(Unfold<(), (), ()>: Sync);
+    assert_not_impl!(Unfold<*const (), (), ()>: Sync);
+    assert_not_impl!(Unfold<(), *const (), ()>: Sync);
+    assert_not_impl!(Unfold<(), (), *const ()>: Sync);
+    assert_impl!(Unfold<PhantomPinned, PhantomPinned, ()>: Unpin);
+    assert_not_impl!(Unfold<PinnedSink<()>, (), PhantomPinned>: Unpin);
+
+    assert_impl!(With<(), *const (), *const (), (), ()>: Send);
+    assert_not_impl!(With<*const (), (), (), (), ()>: Send);
+    assert_not_impl!(With<(), (), (), *const (), ()>: Send);
+    assert_not_impl!(With<(), (), (), (), *const ()>: Send);
+    assert_impl!(With<(), *const (), *const (), (), ()>: Sync);
+    assert_not_impl!(With<*const (), (), (), (), ()>: Sync);
+    assert_not_impl!(With<(), (), (), *const (), ()>: Sync);
+    assert_not_impl!(With<(), (), (), (), *const ()>: Sync);
+    assert_impl!(With<(), PhantomPinned, PhantomPinned, (), PhantomPinned>: Unpin);
+    assert_not_impl!(With<PhantomPinned, (), (), (), ()>: Unpin);
+    assert_not_impl!(With<(), (), (), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(WithFlatMap<(), (), *const (), (), ()>: Send);
+    assert_not_impl!(WithFlatMap<*const (), (), (), (), ()>: Send);
+    assert_not_impl!(WithFlatMap<(), *const (), (), (), ()>: Send);
+    assert_not_impl!(WithFlatMap<(), (), (), *const (), ()>: Send);
+    assert_not_impl!(WithFlatMap<(), (), (), (), *const ()>: Send);
+    assert_impl!(WithFlatMap<(), (), *const (), (), ()>: Sync);
+    assert_not_impl!(WithFlatMap<*const (), (), (), (), ()>: Sync);
+    assert_not_impl!(WithFlatMap<(), *const (), (), (), ()>: Sync);
+    assert_not_impl!(WithFlatMap<(), (), (), *const (), ()>: Sync);
+    assert_not_impl!(WithFlatMap<(), (), (), (), *const ()>: Sync);
+    assert_impl!(WithFlatMap<(), PhantomPinned, PhantomPinned, (), PhantomPinned>: Unpin);
+    assert_not_impl!(WithFlatMap<PhantomPinned, (), (), (), ()>: Unpin);
+    assert_not_impl!(WithFlatMap<(), (), (), PhantomPinned, ()>: Unpin);
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::stream`.
+pub mod stream {
+    use super::*;
+    use futures::{io, stream::*};
+
+    assert_impl!(AndThen<(), (), ()>: Send);
+    assert_not_impl!(AndThen<*const (), (), ()>: Send);
+    assert_not_impl!(AndThen<(), *const (), ()>: Send);
+    assert_not_impl!(AndThen<(), (), *const ()>: Send);
+    assert_impl!(AndThen<(), (), ()>: Sync);
+    assert_not_impl!(AndThen<*const (), (), ()>: Sync);
+    assert_not_impl!(AndThen<(), *const (), ()>: Sync);
+    assert_not_impl!(AndThen<(), (), *const ()>: Sync);
+    assert_impl!(AndThen<(), (), PhantomPinned>: Unpin);
+    assert_not_impl!(AndThen<PhantomPinned, (), ()>: Unpin);
+    assert_not_impl!(AndThen<(), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(BufferUnordered<SendStream<()>>: Send);
+    assert_not_impl!(BufferUnordered<SendStream>: Send);
+    assert_not_impl!(BufferUnordered<LocalStream>: Send);
+    assert_impl!(BufferUnordered<SyncStream<()>>: Sync);
+    assert_not_impl!(BufferUnordered<SyncStream>: Sync);
+    assert_not_impl!(BufferUnordered<LocalStream>: Sync);
+    assert_impl!(BufferUnordered<UnpinStream>: Unpin);
+    assert_not_impl!(BufferUnordered<PinnedStream>: Unpin);
+
+    assert_impl!(Buffered<SendStream<SendFuture<()>>>: Send);
+    assert_not_impl!(Buffered<SendStream<SendFuture>>: Send);
+    assert_not_impl!(Buffered<SendStream<LocalFuture>>: Send);
+    assert_not_impl!(Buffered<LocalStream<SendFuture<()>>>: Send);
+    assert_impl!(Buffered<SyncStream<SyncFuture<()>>>: Sync);
+    assert_not_impl!(Buffered<SyncStream<SyncFuture>>: Sync);
+    assert_not_impl!(Buffered<SyncStream<LocalFuture>>: Sync);
+    assert_not_impl!(Buffered<LocalStream<SyncFuture<()>>>: Sync);
+    assert_impl!(Buffered<UnpinStream<PinnedFuture>>: Unpin);
+    assert_not_impl!(Buffered<PinnedStream<PinnedFuture>>: Unpin);
+
+    assert_impl!(CatchUnwind<SendStream>: Send);
+    assert_not_impl!(CatchUnwind<LocalStream>: Send);
+    assert_impl!(CatchUnwind<SyncStream>: Sync);
+    assert_not_impl!(CatchUnwind<LocalStream>: Sync);
+    assert_impl!(CatchUnwind<UnpinStream>: Unpin);
+    assert_not_impl!(CatchUnwind<PinnedStream>: Unpin);
+
+    assert_impl!(Chain<(), ()>: Send);
+    assert_not_impl!(Chain<(), *const ()>: Send);
+    assert_not_impl!(Chain<*const (), ()>: Send);
+    assert_impl!(Chain<(), ()>: Sync);
+    assert_not_impl!(Chain<(), *const ()>: Sync);
+    assert_not_impl!(Chain<*const (), ()>: Sync);
+    assert_impl!(Chain<(), ()>: Unpin);
+    assert_not_impl!(Chain<(), PhantomPinned>: Unpin);
+    assert_not_impl!(Chain<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Chunks<SendStream<()>>: Send);
+    assert_not_impl!(Chunks<SendStream>: Send);
+    assert_not_impl!(Chunks<LocalStream>: Send);
+    assert_impl!(Chunks<SyncStream<()>>: Sync);
+    assert_not_impl!(Chunks<SyncStream>: Sync);
+    assert_not_impl!(Chunks<LocalStream>: Sync);
+    assert_impl!(Chunks<UnpinStream>: Unpin);
+    assert_not_impl!(Chunks<PinnedStream>: Unpin);
+
+    assert_impl!(Collect<(), ()>: Send);
+    assert_not_impl!(Collect<*const (), ()>: Send);
+    assert_not_impl!(Collect<(), *const ()>: Send);
+    assert_impl!(Collect<(), ()>: Sync);
+    assert_not_impl!(Collect<*const (), ()>: Sync);
+    assert_not_impl!(Collect<(), *const ()>: Sync);
+    assert_impl!(Collect<(), PhantomPinned>: Unpin);
+    assert_not_impl!(Collect<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Concat<SendStream<()>>: Send);
+    assert_not_impl!(Concat<SendStream>: Send);
+    assert_not_impl!(Concat<LocalStream>: Send);
+    assert_impl!(Concat<SyncStream<()>>: Sync);
+    assert_not_impl!(Concat<SyncStream>: Sync);
+    assert_not_impl!(Concat<LocalStream>: Sync);
+    assert_impl!(Concat<UnpinStream>: Unpin);
+    assert_not_impl!(Concat<PinnedStream>: Unpin);
+
+    assert_impl!(Cycle<()>: Send);
+    assert_not_impl!(Cycle<*const ()>: Send);
+    assert_impl!(Cycle<()>: Sync);
+    assert_not_impl!(Cycle<*const ()>: Sync);
+    assert_impl!(Cycle<()>: Unpin);
+    assert_not_impl!(Cycle<PhantomPinned>: Unpin);
+
+    assert_impl!(Empty<()>: Send);
+    assert_not_impl!(Empty<*const ()>: Send);
+    assert_impl!(Empty<()>: Sync);
+    assert_not_impl!(Empty<*const ()>: Sync);
+    assert_impl!(Empty<PhantomPinned>: Unpin);
+
+    assert_impl!(Enumerate<()>: Send);
+    assert_not_impl!(Enumerate<*const ()>: Send);
+    assert_impl!(Enumerate<()>: Sync);
+    assert_not_impl!(Enumerate<*const ()>: Sync);
+    assert_impl!(Enumerate<()>: Unpin);
+    assert_not_impl!(Enumerate<PhantomPinned>: Unpin);
+
+    assert_impl!(ErrInto<(), *const ()>: Send);
+    assert_not_impl!(ErrInto<*const (), ()>: Send);
+    assert_impl!(ErrInto<(), *const ()>: Sync);
+    assert_not_impl!(ErrInto<*const (), ()>: Sync);
+    assert_impl!(ErrInto<(), PhantomPinned>: Unpin);
+    assert_not_impl!(ErrInto<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Filter<SendStream<()>, (), ()>: Send);
+    assert_not_impl!(Filter<LocalStream<()>, (), ()>: Send);
+    assert_not_impl!(Filter<SendStream, (), ()>: Send);
+    assert_not_impl!(Filter<SendStream<()>, *const (), ()>: Send);
+    assert_not_impl!(Filter<SendStream<()>, (), *const ()>: Send);
+    assert_impl!(Filter<SyncStream<()>, (), ()>: Sync);
+    assert_not_impl!(Filter<LocalStream<()>, (), ()>: Sync);
+    assert_not_impl!(Filter<SyncStream, (), ()>: Sync);
+    assert_not_impl!(Filter<SyncStream<()>, *const (), ()>: Sync);
+    assert_not_impl!(Filter<SyncStream<()>, (), *const ()>: Sync);
+    assert_impl!(Filter<UnpinStream, (), PhantomPinned>: Unpin);
+    assert_not_impl!(Filter<PinnedStream, (), ()>: Unpin);
+    assert_not_impl!(Filter<UnpinStream, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(FilterMap<(), (), ()>: Send);
+    assert_not_impl!(FilterMap<*const (), (), ()>: Send);
+    assert_not_impl!(FilterMap<(), *const (), ()>: Send);
+    assert_not_impl!(FilterMap<(), (), *const ()>: Send);
+    assert_impl!(FilterMap<(), (), ()>: Sync);
+    assert_not_impl!(FilterMap<*const (), (), ()>: Sync);
+    assert_not_impl!(FilterMap<(), *const (), ()>: Sync);
+    assert_not_impl!(FilterMap<(), (), *const ()>: Sync);
+    assert_impl!(FilterMap<(), (), PhantomPinned>: Unpin);
+    assert_not_impl!(FilterMap<PhantomPinned, (), ()>: Unpin);
+    assert_not_impl!(FilterMap<(), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(FlatMap<(), (), ()>: Send);
+    assert_not_impl!(FlatMap<*const (), (), ()>: Send);
+    assert_not_impl!(FlatMap<(), *const (), ()>: Send);
+    assert_not_impl!(FlatMap<(), (), *const ()>: Send);
+    assert_impl!(FlatMap<(), (), ()>: Sync);
+    assert_not_impl!(FlatMap<*const (), (), ()>: Sync);
+    assert_not_impl!(FlatMap<(), *const (), ()>: Sync);
+    assert_not_impl!(FlatMap<(), (), *const ()>: Sync);
+    assert_impl!(FlatMap<(), (), PhantomPinned>: Unpin);
+    assert_not_impl!(FlatMap<PhantomPinned, (), ()>: Unpin);
+    assert_not_impl!(FlatMap<(), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Flatten<SendStream<()>>: Send);
+    assert_not_impl!(Flatten<SendStream>: Send);
+    assert_not_impl!(Flatten<SendStream>: Send);
+    assert_impl!(Flatten<SyncStream<()>>: Sync);
+    assert_not_impl!(Flatten<LocalStream<()>>: Sync);
+    assert_not_impl!(Flatten<LocalStream<()>>: Sync);
+    assert_impl!(Flatten<UnpinStream<()>>: Unpin);
+    assert_not_impl!(Flatten<UnpinStream>: Unpin);
+    assert_not_impl!(Flatten<PinnedStream>: Unpin);
+
+    assert_impl!(Fold<(), (), (), ()>: Send);
+    assert_not_impl!(Fold<*const (), (), (), ()>: Send);
+    assert_not_impl!(Fold<(), *const (), (), ()>: Send);
+    assert_not_impl!(Fold<(), (), *const (), ()>: Send);
+    assert_not_impl!(Fold<(), (), (), *const ()>: Send);
+    assert_impl!(Fold<(), (), (), ()>: Sync);
+    assert_not_impl!(Fold<*const (), (), (), ()>: Sync);
+    assert_not_impl!(Fold<(), *const (), (), ()>: Sync);
+    assert_not_impl!(Fold<(), (), *const (), ()>: Sync);
+    assert_not_impl!(Fold<(), (), (), *const ()>: Sync);
+    assert_impl!(Fold<(), (), PhantomPinned, PhantomPinned>: Unpin);
+    assert_not_impl!(Fold<PhantomPinned, (), (), ()>: Unpin);
+    assert_not_impl!(Fold<(), PhantomPinned, (), ()>: Unpin);
+
+    assert_impl!(ForEach<(), (), ()>: Send);
+    assert_not_impl!(ForEach<*const (), (), ()>: Send);
+    assert_not_impl!(ForEach<(), *const (), ()>: Send);
+    assert_not_impl!(ForEach<(), (), *const ()>: Send);
+    assert_impl!(ForEach<(), (), ()>: Sync);
+    assert_not_impl!(ForEach<*const (), (), ()>: Sync);
+    assert_not_impl!(ForEach<(), *const (), ()>: Sync);
+    assert_not_impl!(ForEach<(), (), *const ()>: Sync);
+    assert_impl!(ForEach<(), (), PhantomPinned>: Unpin);
+    assert_not_impl!(ForEach<PhantomPinned, (), ()>: Unpin);
+    assert_not_impl!(ForEach<(), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(ForEachConcurrent<(), (), ()>: Send);
+    assert_not_impl!(ForEachConcurrent<*const (), (), ()>: Send);
+    assert_not_impl!(ForEachConcurrent<(), *const (), ()>: Send);
+    assert_not_impl!(ForEachConcurrent<(), (), *const ()>: Send);
+    assert_impl!(ForEachConcurrent<(), (), ()>: Sync);
+    assert_not_impl!(ForEachConcurrent<*const (), (), ()>: Sync);
+    assert_not_impl!(ForEachConcurrent<(), *const (), ()>: Sync);
+    assert_not_impl!(ForEachConcurrent<(), (), *const ()>: Sync);
+    assert_impl!(ForEachConcurrent<(), PhantomPinned, PhantomPinned>: Unpin);
+    assert_not_impl!(ForEachConcurrent<PhantomPinned, (), ()>: Unpin);
+
+    assert_impl!(Forward<SendTryStream<()>, ()>: Send);
+    assert_not_impl!(Forward<SendTryStream, ()>: Send);
+    assert_not_impl!(Forward<SendTryStream<()>, *const ()>: Send);
+    assert_not_impl!(Forward<LocalTryStream, ()>: Send);
+    assert_impl!(Forward<SyncTryStream<()>, ()>: Sync);
+    assert_not_impl!(Forward<SyncTryStream, ()>: Sync);
+    assert_not_impl!(Forward<SyncTryStream<()>, *const ()>: Sync);
+    assert_not_impl!(Forward<LocalTryStream, ()>: Sync);
+    assert_impl!(Forward<UnpinTryStream, ()>: Unpin);
+    assert_not_impl!(Forward<UnpinTryStream, PhantomPinned>: Unpin);
+    assert_not_impl!(Forward<PinnedTryStream, ()>: Unpin);
+
+    assert_impl!(Fuse<()>: Send);
+    assert_not_impl!(Fuse<*const ()>: Send);
+    assert_impl!(Fuse<()>: Sync);
+    assert_not_impl!(Fuse<*const ()>: Sync);
+    assert_impl!(Fuse<()>: Unpin);
+    assert_not_impl!(Fuse<PhantomPinned>: Unpin);
+
+    assert_impl!(FuturesOrdered<SendFuture<()>>: Send);
+    assert_not_impl!(FuturesOrdered<SendFuture>: Send);
+    assert_not_impl!(FuturesOrdered<SendFuture>: Send);
+    assert_impl!(FuturesOrdered<SyncFuture<()>>: Sync);
+    assert_not_impl!(FuturesOrdered<LocalFuture<()>>: Sync);
+    assert_not_impl!(FuturesOrdered<LocalFuture<()>>: Sync);
+    assert_impl!(FuturesOrdered<PinnedFuture>: Unpin);
+
+    assert_impl!(FuturesUnordered<()>: Send);
+    assert_not_impl!(FuturesUnordered<*const ()>: Send);
+    assert_impl!(FuturesUnordered<()>: Sync);
+    assert_not_impl!(FuturesUnordered<*const ()>: Sync);
+    assert_impl!(FuturesUnordered<PhantomPinned>: Unpin);
+
+    assert_impl!(Inspect<(), ()>: Send);
+    assert_not_impl!(Inspect<*const (), ()>: Send);
+    assert_not_impl!(Inspect<(), *const ()>: Send);
+    assert_impl!(Inspect<(), ()>: Sync);
+    assert_not_impl!(Inspect<*const (), ()>: Sync);
+    assert_not_impl!(Inspect<(), *const ()>: Sync);
+    assert_impl!(Inspect<(), PhantomPinned>: Unpin);
+    assert_not_impl!(Inspect<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(InspectErr<(), ()>: Send);
+    assert_not_impl!(InspectErr<*const (), ()>: Send);
+    assert_not_impl!(InspectErr<(), *const ()>: Send);
+    assert_impl!(InspectErr<(), ()>: Sync);
+    assert_not_impl!(InspectErr<*const (), ()>: Sync);
+    assert_not_impl!(InspectErr<(), *const ()>: Sync);
+    assert_impl!(InspectErr<(), PhantomPinned>: Unpin);
+    assert_not_impl!(InspectErr<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(InspectOk<(), ()>: Send);
+    assert_not_impl!(InspectOk<*const (), ()>: Send);
+    assert_not_impl!(InspectOk<(), *const ()>: Send);
+    assert_impl!(InspectOk<(), ()>: Sync);
+    assert_not_impl!(InspectOk<*const (), ()>: Sync);
+    assert_not_impl!(InspectOk<(), *const ()>: Sync);
+    assert_impl!(InspectOk<(), PhantomPinned>: Unpin);
+    assert_not_impl!(InspectOk<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(IntoAsyncRead<SendTryStream<Vec<u8>, io::Error>>: Send);
+    assert_not_impl!(IntoAsyncRead<LocalTryStream<Vec<u8>, io::Error>>: Send);
+    assert_impl!(IntoAsyncRead<SyncTryStream<Vec<u8>, io::Error>>: Sync);
+    assert_not_impl!(IntoAsyncRead<LocalTryStream<Vec<u8>, io::Error>>: Sync);
+    assert_impl!(IntoAsyncRead<UnpinTryStream<Vec<u8>, io::Error>>: Unpin);
+    // IntoAsyncRead requires `St: Unpin`
+    // assert_not_impl!(IntoAsyncRead<PinnedTryStream<Vec<u8>, io::Error>>: Unpin);
+
+    assert_impl!(IntoStream<()>: Send);
+    assert_not_impl!(IntoStream<*const ()>: Send);
+    assert_impl!(IntoStream<()>: Sync);
+    assert_not_impl!(IntoStream<*const ()>: Sync);
+    assert_impl!(IntoStream<()>: Unpin);
+    assert_not_impl!(IntoStream<PhantomPinned>: Unpin);
+
+    assert_impl!(Iter<()>: Send);
+    assert_not_impl!(Iter<*const ()>: Send);
+    assert_impl!(Iter<()>: Sync);
+    assert_not_impl!(Iter<*const ()>: Sync);
+    assert_impl!(Iter<PhantomPinned>: Unpin);
+
+    assert_impl!(Map<(), ()>: Send);
+    assert_not_impl!(Map<*const (), ()>: Send);
+    assert_not_impl!(Map<(), *const ()>: Send);
+    assert_impl!(Map<(), ()>: Sync);
+    assert_not_impl!(Map<*const (), ()>: Sync);
+    assert_not_impl!(Map<(), *const ()>: Sync);
+    assert_impl!(Map<(), PhantomPinned>: Unpin);
+    assert_not_impl!(Map<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(MapErr<(), ()>: Send);
+    assert_not_impl!(MapErr<*const (), ()>: Send);
+    assert_not_impl!(MapErr<(), *const ()>: Send);
+    assert_impl!(MapErr<(), ()>: Sync);
+    assert_not_impl!(MapErr<*const (), ()>: Sync);
+    assert_not_impl!(MapErr<(), *const ()>: Sync);
+    assert_impl!(MapErr<(), PhantomPinned>: Unpin);
+    assert_not_impl!(MapErr<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(MapOk<(), ()>: Send);
+    assert_not_impl!(MapOk<*const (), ()>: Send);
+    assert_not_impl!(MapOk<(), *const ()>: Send);
+    assert_impl!(MapOk<(), ()>: Sync);
+    assert_not_impl!(MapOk<*const (), ()>: Sync);
+    assert_not_impl!(MapOk<(), *const ()>: Sync);
+    assert_impl!(MapOk<(), PhantomPinned>: Unpin);
+    assert_not_impl!(MapOk<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Next<'_, ()>: Send);
+    assert_not_impl!(Next<'_, *const ()>: Send);
+    assert_impl!(Next<'_, ()>: Sync);
+    assert_not_impl!(Next<'_, *const ()>: Sync);
+    assert_impl!(Next<'_, ()>: Unpin);
+    assert_not_impl!(Next<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(NextIf<'_, SendStream<()>, ()>: Send);
+    assert_not_impl!(NextIf<'_, SendStream<()>, *const ()>: Send);
+    assert_not_impl!(NextIf<'_, SendStream, ()>: Send);
+    assert_not_impl!(NextIf<'_, LocalStream<()>, ()>: Send);
+    assert_impl!(NextIf<'_, SyncStream<()>, ()>: Sync);
+    assert_not_impl!(NextIf<'_, SyncStream<()>, *const ()>: Sync);
+    assert_not_impl!(NextIf<'_, SyncStream, ()>: Sync);
+    assert_not_impl!(NextIf<'_, LocalStream<()>, ()>: Send);
+    assert_impl!(NextIf<'_, PinnedStream, PhantomPinned>: Unpin);
+
+    assert_impl!(NextIfEq<'_, SendStream<()>, ()>: Send);
+    assert_not_impl!(NextIfEq<'_, SendStream<()>, *const ()>: Send);
+    assert_not_impl!(NextIfEq<'_, SendStream, ()>: Send);
+    assert_not_impl!(NextIfEq<'_, LocalStream<()>, ()>: Send);
+    assert_impl!(NextIfEq<'_, SyncStream<()>, ()>: Sync);
+    assert_not_impl!(NextIfEq<'_, SyncStream<()>, *const ()>: Sync);
+    assert_not_impl!(NextIfEq<'_, SyncStream, ()>: Sync);
+    assert_not_impl!(NextIfEq<'_, LocalStream<()>, ()>: Send);
+    assert_impl!(NextIfEq<'_, PinnedStream, PhantomPinned>: Unpin);
+
+    assert_impl!(Once<()>: Send);
+    assert_not_impl!(Once<*const ()>: Send);
+    assert_impl!(Once<()>: Sync);
+    assert_not_impl!(Once<*const ()>: Sync);
+    assert_impl!(Once<()>: Unpin);
+    assert_not_impl!(Once<PhantomPinned>: Unpin);
+
+    assert_impl!(OrElse<(), (), ()>: Send);
+    assert_not_impl!(OrElse<*const (), (), ()>: Send);
+    assert_not_impl!(OrElse<(), *const (), ()>: Send);
+    assert_not_impl!(OrElse<(), (), *const ()>: Send);
+    assert_impl!(OrElse<(), (), ()>: Sync);
+    assert_not_impl!(OrElse<*const (), (), ()>: Sync);
+    assert_not_impl!(OrElse<(), *const (), ()>: Sync);
+    assert_not_impl!(OrElse<(), (), *const ()>: Sync);
+    assert_impl!(OrElse<(), (), PhantomPinned>: Unpin);
+    assert_not_impl!(OrElse<PhantomPinned, (), ()>: Unpin);
+    assert_not_impl!(OrElse<(), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Peek<'_, SendStream<()>>: Send);
+    assert_not_impl!(Peek<'_, SendStream>: Send);
+    assert_not_impl!(Peek<'_, LocalStream<()>>: Send);
+    assert_impl!(Peek<'_, SyncStream<()>>: Sync);
+    assert_not_impl!(Peek<'_, SyncStream>: Sync);
+    assert_not_impl!(Peek<'_, LocalStream<()>>: Sync);
+    assert_impl!(Peek<'_, PinnedStream>: Unpin);
+
+    assert_impl!(PeekMut<'_, SendStream<()>>: Send);
+    assert_not_impl!(PeekMut<'_, SendStream>: Send);
+    assert_not_impl!(PeekMut<'_, LocalStream<()>>: Send);
+    assert_impl!(PeekMut<'_, SyncStream<()>>: Sync);
+    assert_not_impl!(PeekMut<'_, SyncStream>: Sync);
+    assert_not_impl!(PeekMut<'_, LocalStream<()>>: Sync);
+    assert_impl!(PeekMut<'_, PinnedStream>: Unpin);
+
+    assert_impl!(Peekable<SendStream<()>>: Send);
+    assert_not_impl!(Peekable<SendStream>: Send);
+    assert_not_impl!(Peekable<LocalStream>: Send);
+    assert_impl!(Peekable<SyncStream<()>>: Sync);
+    assert_not_impl!(Peekable<SyncStream>: Sync);
+    assert_not_impl!(Peekable<LocalStream>: Sync);
+    assert_impl!(Peekable<UnpinStream>: Unpin);
+    assert_not_impl!(Peekable<PinnedStream>: Unpin);
+
+    assert_impl!(Pending<()>: Send);
+    assert_not_impl!(Pending<*const ()>: Send);
+    assert_impl!(Pending<()>: Sync);
+    assert_not_impl!(Pending<*const ()>: Sync);
+    assert_impl!(Pending<PhantomPinned>: Unpin);
+
+    assert_impl!(PollFn<()>: Send);
+    assert_not_impl!(PollFn<*const ()>: Send);
+    assert_impl!(PollFn<()>: Sync);
+    assert_not_impl!(PollFn<*const ()>: Sync);
+    assert_impl!(PollFn<PhantomPinned>: Unpin);
+
+    assert_impl!(PollImmediate<SendStream>: Send);
+    assert_not_impl!(PollImmediate<LocalStream<()>>: Send);
+    assert_impl!(PollImmediate<SyncStream>: Sync);
+    assert_not_impl!(PollImmediate<LocalStream<()>>: Sync);
+    assert_impl!(PollImmediate<UnpinStream>: Unpin);
+    assert_not_impl!(PollImmediate<PinnedStream>: Unpin);
+
+    assert_impl!(ReadyChunks<SendStream<()>>: Send);
+    assert_not_impl!(ReadyChunks<SendStream>: Send);
+    assert_not_impl!(ReadyChunks<LocalStream>: Send);
+    assert_impl!(ReadyChunks<SyncStream<()>>: Sync);
+    assert_not_impl!(ReadyChunks<SyncStream>: Sync);
+    assert_not_impl!(ReadyChunks<LocalStream>: Sync);
+    assert_impl!(ReadyChunks<UnpinStream>: Unpin);
+    assert_not_impl!(ReadyChunks<PinnedStream>: Unpin);
+
+    assert_impl!(Repeat<()>: Send);
+    assert_not_impl!(Repeat<*const ()>: Send);
+    assert_impl!(Repeat<()>: Sync);
+    assert_not_impl!(Repeat<*const ()>: Sync);
+    assert_impl!(Repeat<PhantomPinned>: Unpin);
+
+    assert_impl!(RepeatWith<()>: Send);
+    assert_not_impl!(RepeatWith<*const ()>: Send);
+    assert_impl!(RepeatWith<()>: Sync);
+    assert_not_impl!(RepeatWith<*const ()>: Sync);
+    // RepeatWith requires `F: FnMut() -> A`
+    assert_impl!(RepeatWith<fn() -> ()>: Unpin);
+    // assert_impl!(RepeatWith<PhantomPinned>: Unpin);
+
+    assert_impl!(ReuniteError<(), ()>: Send);
+    assert_not_impl!(ReuniteError<*const (), ()>: Send);
+    assert_not_impl!(ReuniteError<(), *const ()>: Send);
+    assert_impl!(ReuniteError<(), ()>: Sync);
+    assert_not_impl!(ReuniteError<*const (), ()>: Sync);
+    assert_not_impl!(ReuniteError<(), *const ()>: Sync);
+    assert_impl!(ReuniteError<PhantomPinned, PhantomPinned>: Unpin);
+
+    assert_impl!(Scan<SendStream, (), (), ()>: Send);
+    assert_not_impl!(Scan<LocalStream<()>, (), (), ()>: Send);
+    assert_not_impl!(Scan<SendStream<()>, *const (), (), ()>: Send);
+    assert_not_impl!(Scan<SendStream<()>, (), *const (), ()>: Send);
+    assert_not_impl!(Scan<SendStream<()>, (), (), *const ()>: Send);
+    assert_impl!(Scan<SyncStream, (), (), ()>: Sync);
+    assert_not_impl!(Scan<LocalStream<()>, (), (), ()>: Sync);
+    assert_not_impl!(Scan<SyncStream<()>, *const (), (), ()>: Sync);
+    assert_not_impl!(Scan<SyncStream<()>, (), *const (), ()>: Sync);
+    assert_not_impl!(Scan<SyncStream<()>, (), (), *const ()>: Sync);
+    assert_impl!(Scan<UnpinStream, PhantomPinned, (), PhantomPinned>: Unpin);
+    assert_not_impl!(Scan<PinnedStream, (), (), ()>: Unpin);
+    assert_not_impl!(Scan<UnpinStream, (), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Select<(), ()>: Send);
+    assert_not_impl!(Select<*const (), ()>: Send);
+    assert_not_impl!(Select<(), *const ()>: Send);
+    assert_impl!(Select<(), ()>: Sync);
+    assert_not_impl!(Select<*const (), ()>: Sync);
+    assert_not_impl!(Select<(), *const ()>: Sync);
+    assert_impl!(Select<(), ()>: Unpin);
+    assert_not_impl!(Select<PhantomPinned, ()>: Unpin);
+    assert_not_impl!(Select<(), PhantomPinned>: Unpin);
+
+    assert_impl!(SelectAll<()>: Send);
+    assert_not_impl!(SelectAll<*const ()>: Send);
+    assert_impl!(SelectAll<()>: Sync);
+    assert_not_impl!(SelectAll<*const ()>: Sync);
+    assert_impl!(SelectAll<PhantomPinned>: Unpin);
+
+    assert_impl!(SelectNextSome<'_, ()>: Send);
+    assert_not_impl!(SelectNextSome<'_, *const ()>: Send);
+    assert_impl!(SelectNextSome<'_, ()>: Sync);
+    assert_not_impl!(SelectNextSome<'_, *const ()>: Sync);
+    assert_impl!(SelectNextSome<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(Skip<()>: Send);
+    assert_not_impl!(Skip<*const ()>: Send);
+    assert_impl!(Skip<()>: Sync);
+    assert_not_impl!(Skip<*const ()>: Sync);
+    assert_impl!(Skip<()>: Unpin);
+    assert_not_impl!(Skip<PhantomPinned>: Unpin);
+
+    assert_impl!(SkipWhile<SendStream<()>, (), ()>: Send);
+    assert_not_impl!(SkipWhile<LocalStream<()>, (), ()>: Send);
+    assert_not_impl!(SkipWhile<SendStream, (), ()>: Send);
+    assert_not_impl!(SkipWhile<SendStream<()>, *const (), ()>: Send);
+    assert_not_impl!(SkipWhile<SendStream<()>, (), *const ()>: Send);
+    assert_impl!(SkipWhile<SyncStream<()>, (), ()>: Sync);
+    assert_not_impl!(SkipWhile<LocalStream<()>, (), ()>: Sync);
+    assert_not_impl!(SkipWhile<SyncStream, (), ()>: Sync);
+    assert_not_impl!(SkipWhile<SyncStream<()>, *const (), ()>: Sync);
+    assert_not_impl!(SkipWhile<SyncStream<()>, (), *const ()>: Sync);
+    assert_impl!(SkipWhile<UnpinStream, (), PhantomPinned>: Unpin);
+    assert_not_impl!(SkipWhile<PinnedStream, (), ()>: Unpin);
+    assert_not_impl!(SkipWhile<UnpinStream, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(SplitSink<(), ()>: Send);
+    assert_not_impl!(SplitSink<*const (), ()>: Send);
+    assert_not_impl!(SplitSink<(), *const ()>: Send);
+    assert_impl!(SplitSink<(), ()>: Sync);
+    assert_not_impl!(SplitSink<*const (), ()>: Sync);
+    assert_not_impl!(SplitSink<(), *const ()>: Sync);
+    assert_impl!(SplitSink<PhantomPinned, PhantomPinned>: Unpin);
+
+    assert_impl!(SplitStream<()>: Send);
+    assert_not_impl!(SplitStream<*const ()>: Send);
+    assert_impl!(SplitStream<()>: Sync);
+    assert_not_impl!(SplitStream<*const ()>: Sync);
+    assert_impl!(SplitStream<PhantomPinned>: Unpin);
+
+    assert_impl!(StreamFuture<()>: Send);
+    assert_not_impl!(StreamFuture<*const ()>: Send);
+    assert_impl!(StreamFuture<()>: Sync);
+    assert_not_impl!(StreamFuture<*const ()>: Sync);
+    assert_impl!(StreamFuture<()>: Unpin);
+    assert_not_impl!(StreamFuture<PhantomPinned>: Unpin);
+
+    assert_impl!(Take<()>: Send);
+    assert_not_impl!(Take<*const ()>: Send);
+    assert_impl!(Take<()>: Sync);
+    assert_not_impl!(Take<*const ()>: Sync);
+    assert_impl!(Take<()>: Unpin);
+    assert_not_impl!(Take<PhantomPinned>: Unpin);
+
+    assert_impl!(TakeUntil<SendStream, SendFuture<()>>: Send);
+    assert_not_impl!(TakeUntil<SendStream, SendFuture>: Send);
+    assert_not_impl!(TakeUntil<SendStream, LocalFuture<()>>: Send);
+    assert_not_impl!(TakeUntil<LocalStream, SendFuture<()>>: Send);
+    assert_impl!(TakeUntil<SyncStream, SyncFuture<()>>: Sync);
+    assert_not_impl!(TakeUntil<SyncStream, SyncFuture>: Sync);
+    assert_not_impl!(TakeUntil<SyncStream, LocalFuture<()>>: Sync);
+    assert_not_impl!(TakeUntil<LocalStream, SyncFuture<()>>: Sync);
+    assert_impl!(TakeUntil<UnpinStream, UnpinFuture>: Unpin);
+    assert_not_impl!(TakeUntil<PinnedStream, UnpinFuture>: Unpin);
+    assert_not_impl!(TakeUntil<UnpinStream, PinnedFuture>: Unpin);
+
+    assert_impl!(TakeWhile<SendStream<()>, (), ()>: Send);
+    assert_not_impl!(TakeWhile<LocalStream<()>, (), ()>: Send);
+    assert_not_impl!(TakeWhile<SendStream, (), ()>: Send);
+    assert_not_impl!(TakeWhile<SendStream<()>, *const (), ()>: Send);
+    assert_not_impl!(TakeWhile<SendStream<()>, (), *const ()>: Send);
+    assert_impl!(TakeWhile<SyncStream<()>, (), ()>: Sync);
+    assert_not_impl!(TakeWhile<LocalStream<()>, (), ()>: Sync);
+    assert_not_impl!(TakeWhile<SyncStream, (), ()>: Sync);
+    assert_not_impl!(TakeWhile<SyncStream<()>, *const (), ()>: Sync);
+    assert_not_impl!(TakeWhile<SyncStream<()>, (), *const ()>: Sync);
+    assert_impl!(TakeWhile<UnpinStream, (), PhantomPinned>: Unpin);
+    assert_not_impl!(TakeWhile<PinnedStream, (), ()>: Unpin);
+    assert_not_impl!(TakeWhile<UnpinStream, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(Then<SendStream, (), ()>: Send);
+    assert_not_impl!(Then<LocalStream<()>, (), ()>: Send);
+    assert_not_impl!(Then<SendStream<()>, *const (), ()>: Send);
+    assert_not_impl!(Then<SendStream<()>, (), *const ()>: Send);
+    assert_impl!(Then<SyncStream, (), ()>: Sync);
+    assert_not_impl!(Then<LocalStream<()>, (), ()>: Sync);
+    assert_not_impl!(Then<SyncStream<()>, *const (), ()>: Sync);
+    assert_not_impl!(Then<SyncStream<()>, (), *const ()>: Sync);
+    assert_impl!(Then<UnpinStream, (), PhantomPinned>: Unpin);
+    assert_not_impl!(Then<PinnedStream, (), ()>: Unpin);
+    assert_not_impl!(Then<UnpinStream, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(TryBufferUnordered<SendTryStream<()>>: Send);
+    assert_not_impl!(TryBufferUnordered<SendTryStream>: Send);
+    assert_not_impl!(TryBufferUnordered<LocalTryStream>: Send);
+    assert_impl!(TryBufferUnordered<SyncTryStream<()>>: Sync);
+    assert_not_impl!(TryBufferUnordered<SyncTryStream>: Sync);
+    assert_not_impl!(TryBufferUnordered<LocalTryStream>: Sync);
+    assert_impl!(TryBufferUnordered<UnpinTryStream>: Unpin);
+    assert_not_impl!(TryBufferUnordered<PinnedTryStream>: Unpin);
+
+    assert_impl!(TryBuffered<SendTryStream<SendTryFuture<(), ()>>>: Send);
+    assert_not_impl!(TryBuffered<SendTryStream<SendTryFuture<*const (), ()>>>: Send);
+    assert_not_impl!(TryBuffered<SendTryStream<SendTryFuture<(), *const ()>>>: Send);
+    assert_not_impl!(TryBuffered<SendTryStream<LocalTryFuture<(), ()>>>: Send);
+    assert_not_impl!(TryBuffered<LocalTryStream<SendTryFuture<(), ()>>>: Send);
+    assert_impl!(TryBuffered<SyncTryStream<SyncTryFuture<(), ()>>>: Sync);
+    assert_not_impl!(TryBuffered<SyncTryStream<SyncTryFuture<*const (), ()>>>: Sync);
+    assert_not_impl!(TryBuffered<SyncTryStream<SyncTryFuture<(), *const ()>>>: Sync);
+    assert_not_impl!(TryBuffered<SyncTryStream<LocalTryFuture<(), ()>>>: Sync);
+    assert_not_impl!(TryBuffered<LocalTryStream<SyncTryFuture<(), ()>>>: Sync);
+    assert_impl!(TryBuffered<UnpinTryStream<PinnedTryFuture>>: Unpin);
+    assert_not_impl!(TryBuffered<PinnedTryStream<UnpinTryFuture>>: Unpin);
+
+    assert_impl!(TryCollect<(), ()>: Send);
+    assert_not_impl!(TryCollect<*const (), ()>: Send);
+    assert_not_impl!(TryCollect<(), *const ()>: Send);
+    assert_impl!(TryCollect<(), ()>: Sync);
+    assert_not_impl!(TryCollect<*const (), ()>: Sync);
+    assert_not_impl!(TryCollect<(), *const ()>: Sync);
+    assert_impl!(TryCollect<(), PhantomPinned>: Unpin);
+    assert_not_impl!(TryCollect<PhantomPinned, ()>: Unpin);
+
+    assert_impl!(TryConcat<SendTryStream<()>>: Send);
+    assert_not_impl!(TryConcat<SendTryStream>: Send);
+    assert_not_impl!(TryConcat<LocalTryStream>: Send);
+    assert_impl!(TryConcat<SyncTryStream<()>>: Sync);
+    assert_not_impl!(TryConcat<SyncTryStream>: Sync);
+    assert_not_impl!(TryConcat<LocalTryStream>: Sync);
+    assert_impl!(TryConcat<UnpinTryStream>: Unpin);
+    assert_not_impl!(TryConcat<PinnedTryStream>: Unpin);
+
+    assert_impl!(TryFilter<SendTryStream<()>, (), ()>: Send);
+    assert_not_impl!(TryFilter<LocalTryStream<()>, (), ()>: Send);
+    assert_not_impl!(TryFilter<SendTryStream, (), ()>: Send);
+    assert_not_impl!(TryFilter<SendTryStream<()>, *const (), ()>: Send);
+    assert_not_impl!(TryFilter<SendTryStream<()>, (), *const ()>: Send);
+    assert_impl!(TryFilter<SyncTryStream<()>, (), ()>: Sync);
+    assert_not_impl!(TryFilter<LocalTryStream<()>, (), ()>: Sync);
+    assert_not_impl!(TryFilter<SyncTryStream, (), ()>: Sync);
+    assert_not_impl!(TryFilter<SyncTryStream<()>, *const (), ()>: Sync);
+    assert_not_impl!(TryFilter<SyncTryStream<()>, (), *const ()>: Sync);
+    assert_impl!(TryFilter<UnpinTryStream, (), PhantomPinned>: Unpin);
+    assert_not_impl!(TryFilter<PinnedTryStream, (), ()>: Unpin);
+    assert_not_impl!(TryFilter<UnpinTryStream, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(TryFilterMap<(), (), ()>: Send);
+    assert_not_impl!(TryFilterMap<*const (), (), ()>: Send);
+    assert_not_impl!(TryFilterMap<(), *const (), ()>: Send);
+    assert_not_impl!(TryFilterMap<(), (), *const ()>: Send);
+    assert_impl!(TryFilterMap<(), (), ()>: Sync);
+    assert_not_impl!(TryFilterMap<*const (), (), ()>: Sync);
+    assert_not_impl!(TryFilterMap<(), *const (), ()>: Sync);
+    assert_not_impl!(TryFilterMap<(), (), *const ()>: Sync);
+    assert_impl!(TryFilterMap<(), (), PhantomPinned>: Unpin);
+    assert_not_impl!(TryFilterMap<PhantomPinned, (), ()>: Unpin);
+    assert_not_impl!(TryFilterMap<(), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(TryFlatten<SendTryStream<()>>: Send);
+    assert_not_impl!(TryFlatten<SendTryStream>: Send);
+    assert_not_impl!(TryFlatten<SendTryStream>: Send);
+    assert_impl!(TryFlatten<SyncTryStream<()>>: Sync);
+    assert_not_impl!(TryFlatten<LocalTryStream<()>>: Sync);
+    assert_not_impl!(TryFlatten<LocalTryStream<()>>: Sync);
+    assert_impl!(TryFlatten<UnpinTryStream<()>>: Unpin);
+    assert_not_impl!(TryFlatten<UnpinTryStream>: Unpin);
+    assert_not_impl!(TryFlatten<PinnedTryStream>: Unpin);
+
+    assert_impl!(TryFold<(), (), (), ()>: Send);
+    assert_not_impl!(TryFold<*const (), (), (), ()>: Send);
+    assert_not_impl!(TryFold<(), *const (), (), ()>: Send);
+    assert_not_impl!(TryFold<(), (), *const (), ()>: Send);
+    assert_not_impl!(TryFold<(), (), (), *const ()>: Send);
+    assert_impl!(TryFold<(), (), (), ()>: Sync);
+    assert_not_impl!(TryFold<*const (), (), (), ()>: Sync);
+    assert_not_impl!(TryFold<(), *const (), (), ()>: Sync);
+    assert_not_impl!(TryFold<(), (), *const (), ()>: Sync);
+    assert_not_impl!(TryFold<(), (), (), *const ()>: Sync);
+    assert_impl!(TryFold<(), (), PhantomPinned, PhantomPinned>: Unpin);
+    assert_not_impl!(TryFold<PhantomPinned, (), (), ()>: Unpin);
+    assert_not_impl!(TryFold<(), PhantomPinned, (), ()>: Unpin);
+
+    assert_impl!(TryForEach<(), (), ()>: Send);
+    assert_not_impl!(TryForEach<*const (), (), ()>: Send);
+    assert_not_impl!(TryForEach<(), *const (), ()>: Send);
+    assert_not_impl!(TryForEach<(), (), *const ()>: Send);
+    assert_impl!(TryForEach<(), (), ()>: Sync);
+    assert_not_impl!(TryForEach<*const (), (), ()>: Sync);
+    assert_not_impl!(TryForEach<(), *const (), ()>: Sync);
+    assert_not_impl!(TryForEach<(), (), *const ()>: Sync);
+    assert_impl!(TryForEach<(), (), PhantomPinned>: Unpin);
+    assert_not_impl!(TryForEach<PhantomPinned, (), ()>: Unpin);
+    assert_not_impl!(TryForEach<(), PhantomPinned, ()>: Unpin);
+
+    assert_impl!(TryForEachConcurrent<(), (), ()>: Send);
+    assert_not_impl!(TryForEachConcurrent<*const (), (), ()>: Send);
+    assert_not_impl!(TryForEachConcurrent<(), *const (), ()>: Send);
+    assert_not_impl!(TryForEachConcurrent<(), (), *const ()>: Send);
+    assert_impl!(TryForEachConcurrent<(), (), ()>: Sync);
+    assert_not_impl!(TryForEachConcurrent<*const (), (), ()>: Sync);
+    assert_not_impl!(TryForEachConcurrent<(), *const (), ()>: Sync);
+    assert_not_impl!(TryForEachConcurrent<(), (), *const ()>: Sync);
+    assert_impl!(TryForEachConcurrent<(), PhantomPinned, PhantomPinned>: Unpin);
+    assert_not_impl!(TryForEachConcurrent<PhantomPinned, (), ()>: Unpin);
+
+    assert_impl!(TryNext<'_, ()>: Send);
+    assert_not_impl!(TryNext<'_, *const ()>: Send);
+    assert_impl!(TryNext<'_, ()>: Sync);
+    assert_not_impl!(TryNext<'_, *const ()>: Sync);
+    assert_impl!(TryNext<'_, ()>: Unpin);
+    assert_not_impl!(TryNext<'_, PhantomPinned>: Unpin);
+
+    assert_impl!(TrySkipWhile<SendTryStream<()>, (), ()>: Send);
+    assert_not_impl!(TrySkipWhile<LocalTryStream<()>, (), ()>: Send);
+    assert_not_impl!(TrySkipWhile<SendTryStream, (), ()>: Send);
+    assert_not_impl!(TrySkipWhile<SendTryStream<()>, *const (), ()>: Send);
+    assert_not_impl!(TrySkipWhile<SendTryStream<()>, (), *const ()>: Send);
+    assert_impl!(TrySkipWhile<SyncTryStream<()>, (), ()>: Sync);
+    assert_not_impl!(TrySkipWhile<LocalTryStream<()>, (), ()>: Sync);
+    assert_not_impl!(TrySkipWhile<SyncTryStream, (), ()>: Sync);
+    assert_not_impl!(TrySkipWhile<SyncTryStream<()>, *const (), ()>: Sync);
+    assert_not_impl!(TrySkipWhile<SyncTryStream<()>, (), *const ()>: Sync);
+    assert_impl!(TrySkipWhile<UnpinTryStream, (), PhantomPinned>: Unpin);
+    assert_not_impl!(TrySkipWhile<PinnedTryStream, (), ()>: Unpin);
+    assert_not_impl!(TrySkipWhile<UnpinTryStream, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(TryTakeWhile<SendTryStream<()>, (), ()>: Send);
+    assert_not_impl!(TryTakeWhile<LocalTryStream<()>, (), ()>: Send);
+    assert_not_impl!(TryTakeWhile<SendTryStream, (), ()>: Send);
+    assert_not_impl!(TryTakeWhile<SendTryStream<()>, *const (), ()>: Send);
+    assert_not_impl!(TryTakeWhile<SendTryStream<()>, (), *const ()>: Send);
+    assert_impl!(TryTakeWhile<SyncTryStream<()>, (), ()>: Sync);
+    assert_not_impl!(TryTakeWhile<LocalTryStream<()>, (), ()>: Sync);
+    assert_not_impl!(TryTakeWhile<SyncTryStream, (), ()>: Sync);
+    assert_not_impl!(TryTakeWhile<SyncTryStream<()>, *const (), ()>: Sync);
+    assert_not_impl!(TryTakeWhile<SyncTryStream<()>, (), *const ()>: Sync);
+    assert_impl!(TryTakeWhile<UnpinTryStream, (), PhantomPinned>: Unpin);
+    assert_not_impl!(TryTakeWhile<PinnedTryStream, (), ()>: Unpin);
+    assert_not_impl!(TryTakeWhile<UnpinTryStream, PhantomPinned, ()>: Unpin);
+
+    assert_impl!(TryUnfold<(), (), ()>: Send);
+    assert_not_impl!(TryUnfold<*const (), (), ()>: Send);
+    assert_not_impl!(TryUnfold<(), *const (), ()>: Send);
+    assert_not_impl!(TryUnfold<(), (), *const ()>: Send);
+    assert_impl!(TryUnfold<(), (), ()>: Sync);
+    assert_not_impl!(TryUnfold<*const (), (), ()>: Sync);
+    assert_not_impl!(TryUnfold<(), *const (), ()>: Sync);
+    assert_not_impl!(TryUnfold<(), (), *const ()>: Sync);
+    assert_impl!(TryUnfold<PhantomPinned, PhantomPinned, ()>: Unpin);
+    assert_not_impl!(TryUnfold<(), (), PhantomPinned>: Unpin);
+
+    assert_impl!(Unfold<(), (), ()>: Send);
+    assert_not_impl!(Unfold<*const (), (), ()>: Send);
+    assert_not_impl!(Unfold<(), *const (), ()>: Send);
+    assert_not_impl!(Unfold<(), (), *const ()>: Send);
+    assert_impl!(Unfold<(), (), ()>: Sync);
+    assert_not_impl!(Unfold<*const (), (), ()>: Sync);
+    assert_not_impl!(Unfold<(), *const (), ()>: Sync);
+    assert_not_impl!(Unfold<(), (), *const ()>: Sync);
+    assert_impl!(Unfold<PhantomPinned, PhantomPinned, ()>: Unpin);
+    assert_not_impl!(Unfold<(), (), PhantomPinned>: Unpin);
+
+    assert_impl!(Unzip<(), (), ()>: Send);
+    assert_not_impl!(Unzip<*const (), (), ()>: Send);
+    assert_not_impl!(Unzip<(), *const (), ()>: Send);
+    assert_not_impl!(Unzip<(), (), *const ()>: Send);
+    assert_impl!(Unzip<(), (), ()>: Sync);
+    assert_not_impl!(Unzip<*const (), (), ()>: Sync);
+    assert_not_impl!(Unzip<(), *const (), ()>: Sync);
+    assert_not_impl!(Unzip<(), (), *const ()>: Sync);
+    assert_impl!(Unzip<(), PhantomPinned, PhantomPinned>: Unpin);
+    assert_not_impl!(Unzip<PhantomPinned, (), ()>: Unpin);
+
+    assert_impl!(Zip<SendStream<()>, SendStream<()>>: Send);
+    assert_not_impl!(Zip<SendStream, SendStream<()>>: Send);
+    assert_not_impl!(Zip<SendStream<()>, SendStream>: Send);
+    assert_not_impl!(Zip<LocalStream, SendStream<()>>: Send);
+    assert_not_impl!(Zip<SendStream<()>, LocalStream>: Send);
+    assert_impl!(Zip<SyncStream<()>, SyncStream<()>>: Sync);
+    assert_not_impl!(Zip<SyncStream, SyncStream<()>>: Sync);
+    assert_not_impl!(Zip<SyncStream<()>, SyncStream>: Sync);
+    assert_not_impl!(Zip<LocalStream, SyncStream<()>>: Sync);
+    assert_not_impl!(Zip<SyncStream<()>, LocalStream>: Sync);
+    assert_impl!(Zip<UnpinStream, UnpinStream>: Unpin);
+    assert_not_impl!(Zip<UnpinStream, PinnedStream>: Unpin);
+    assert_not_impl!(Zip<PinnedStream, UnpinStream>: Unpin);
+
+    assert_impl!(futures_unordered::Iter<()>: Send);
+    assert_not_impl!(futures_unordered::Iter<*const ()>: Send);
+    assert_impl!(futures_unordered::Iter<()>: Sync);
+    assert_not_impl!(futures_unordered::Iter<*const ()>: Sync);
+    assert_impl!(futures_unordered::Iter<()>: Unpin);
+    // The definition of futures_unordered::Iter has `Fut: Unpin` bounds.
+    // assert_not_impl!(futures_unordered::Iter<PhantomPinned>: Unpin);
+
+    assert_impl!(futures_unordered::IterMut<()>: Send);
+    assert_not_impl!(futures_unordered::IterMut<*const ()>: Send);
+    assert_impl!(futures_unordered::IterMut<()>: Sync);
+    assert_not_impl!(futures_unordered::IterMut<*const ()>: Sync);
+    assert_impl!(futures_unordered::IterMut<()>: Unpin);
+    // The definition of futures_unordered::IterMut has `Fut: Unpin` bounds.
+    // assert_not_impl!(futures_unordered::IterMut<PhantomPinned>: Unpin);
+
+    assert_impl!(futures_unordered::IterPinMut<()>: Send);
+    assert_not_impl!(futures_unordered::IterPinMut<*const ()>: Send);
+    assert_impl!(futures_unordered::IterPinMut<()>: Sync);
+    assert_not_impl!(futures_unordered::IterPinMut<*const ()>: Sync);
+    assert_impl!(futures_unordered::IterPinMut<PhantomPinned>: Unpin);
+
+    assert_impl!(futures_unordered::IterPinRef<()>: Send);
+    assert_not_impl!(futures_unordered::IterPinRef<*const ()>: Send);
+    assert_impl!(futures_unordered::IterPinRef<()>: Sync);
+    assert_not_impl!(futures_unordered::IterPinRef<*const ()>: Sync);
+    assert_impl!(futures_unordered::IterPinRef<PhantomPinned>: Unpin);
+
+    assert_impl!(futures_unordered::IntoIter<()>: Send);
+    assert_not_impl!(futures_unordered::IntoIter<*const ()>: Send);
+    assert_impl!(futures_unordered::IntoIter<()>: Sync);
+    assert_not_impl!(futures_unordered::IntoIter<*const ()>: Sync);
+    // The definition of futures_unordered::IntoIter has `Fut: Unpin` bounds.
+    // assert_not_impl!(futures_unordered::IntoIter<PhantomPinned>: Unpin);
+}
+
+/// Assert Send/Sync/Unpin for all public types in `futures::task`.
+pub mod task {
+    use super::*;
+    use futures::task::*;
+
+    assert_impl!(AtomicWaker: Send);
+    assert_impl!(AtomicWaker: Sync);
+    assert_impl!(AtomicWaker: Unpin);
+
+    assert_impl!(FutureObj<*const ()>: Send);
+    assert_not_impl!(FutureObj<()>: Sync);
+    assert_impl!(FutureObj<PhantomPinned>: Unpin);
+
+    assert_not_impl!(LocalFutureObj<()>: Send);
+    assert_not_impl!(LocalFutureObj<()>: Sync);
+    assert_impl!(LocalFutureObj<PhantomPinned>: Unpin);
+
+    assert_impl!(SpawnError: Send);
+    assert_impl!(SpawnError: Sync);
+    assert_impl!(SpawnError: Unpin);
+
+    assert_impl!(WakerRef<'_>: Send);
+    assert_impl!(WakerRef<'_>: Sync);
+    assert_impl!(WakerRef<'_>: Unpin);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/basic_combinators.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/basic_combinators.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/basic_combinators.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/basic_combinators.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-use futures::future::{self, FutureExt, TryFutureExt};
-use futures_test::future::FutureTestExt;
-use std::sync::mpsc;
-
-#[test]
-fn basic_future_combinators() {
-    let (tx1, rx) = mpsc::channel();
-    let tx2 = tx1.clone();
-    let tx3 = tx1.clone();
-
-    let fut = future::ready(1)
-        .then(move |x| {
-            tx1.send(x).unwrap(); // Send 1
-            tx1.send(2).unwrap(); // Send 2
-            future::ready(3)
-        }).map(move |x| {
-            tx2.send(x).unwrap(); // Send 3
-            tx2.send(4).unwrap(); // Send 4
-            5
-        }).map(move |x| {
-            tx3.send(x).unwrap(); // Send 5
-        });
-
-    assert!(rx.try_recv().is_err()); // Not started yet
-    fut.run_in_background(); // Start it
-    for i in 1..=5 { assert_eq!(rx.recv(), Ok(i)); } // Check it
-    assert!(rx.recv().is_err()); // Should be done
-}
-
-#[test]
-fn basic_try_future_combinators() {
-    let (tx1, rx) = mpsc::channel();
-    let tx2 = tx1.clone();
-    let tx3 = tx1.clone();
-    let tx4 = tx1.clone();
-    let tx5 = tx1.clone();
-    let tx6 = tx1.clone();
-    let tx7 = tx1.clone();
-    let tx8 = tx1.clone();
-    let tx9 = tx1.clone();
-    let tx10 = tx1.clone();
-
-    let fut = future::ready(Ok(1))
-        .and_then(move |x: i32| {
-            tx1.send(x).unwrap(); // Send 1
-            tx1.send(2).unwrap(); // Send 2
-            future::ready(Ok(3))
-        })
-        .or_else(move |x: i32| {
-            tx2.send(x).unwrap(); // Should not run
-            tx2.send(-1).unwrap();
-            future::ready(Ok(-1))
-        })
-        .map_ok(move |x: i32| {
-            tx3.send(x).unwrap(); // Send 3
-            tx3.send(4).unwrap(); // Send 4
-            5
-        })
-        .map_err(move |x: i32| {
-            tx4.send(x).unwrap(); // Should not run
-            tx4.send(-1).unwrap();
-            -1
-        })
-        .map(move |x: Result<i32, i32>| {
-            tx5.send(x.unwrap()).unwrap(); // Send 5
-            tx5.send(6).unwrap(); // Send 6
-            Err(7) // Now return errors!
-        })
-        .and_then(move |x: i32| {
-            tx6.send(x).unwrap(); // Should not run
-            tx6.send(-1).unwrap();
-            future::ready(Err(-1))
-        })
-        .or_else(move |x: i32| {
-            tx7.send(x).unwrap(); // Send 7
-            tx7.send(8).unwrap(); // Send 8
-            future::ready(Err(9))
-        })
-        .map_ok(move |x: i32| {
-            tx8.send(x).unwrap(); // Should not run
-            tx8.send(-1).unwrap();
-            -1
-        })
-        .map_err(move |x: i32| {
-            tx9.send(x).unwrap(); // Send 9
-            tx9.send(10).unwrap(); // Send 10
-            11
-        })
-        .map(move |x: Result<i32, i32>| {
-            tx10.send(x.err().unwrap()).unwrap(); // Send 11
-            tx10.send(12).unwrap(); // Send 12
-        });
-
-    assert!(rx.try_recv().is_err()); // Not started yet
-    fut.run_in_background(); // Start it
-    for i in 1..=12 { assert_eq!(rx.recv(), Ok(i)); } // Check it
-    assert!(rx.recv().is_err()); // Should be done
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/buffer_unordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/buffer_unordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/buffer_unordered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/buffer_unordered.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-#[test]
-#[ignore] // FIXME: https://github.com/rust-lang/futures-rs/issues/1790
-fn works() {
-    use futures::channel::{oneshot, mpsc};
-    use futures::executor::{block_on, block_on_stream};
-    use futures::sink::SinkExt;
-    use futures::stream::StreamExt;
-    use std::sync::mpsc as std_mpsc;
-    use std::thread;
-
-    const N: usize = 4;
-
-    let (mut tx, rx) = mpsc::channel(1);
-
-    let (tx2, rx2) = std_mpsc::channel();
-    let (tx3, rx3) = std_mpsc::channel();
-    let t1 = thread::spawn(move || {
-        for _ in 0..=N {
-            let (mytx, myrx) = oneshot::channel();
-            block_on(tx.send(myrx)).unwrap();
-            tx3.send(mytx).unwrap();
-        }
-        rx2.recv().unwrap();
-        for _ in 0..N {
-            let (mytx, myrx) = oneshot::channel();
-            block_on(tx.send(myrx)).unwrap();
-            tx3.send(mytx).unwrap();
-        }
-    });
-
-    let (tx4, rx4) = std_mpsc::channel();
-    let t2 = thread::spawn(move || {
-        for item in block_on_stream(rx.buffer_unordered(N)) {
-            tx4.send(item.unwrap()).unwrap();
-        }
-    });
-
-    let o1 = rx3.recv().unwrap();
-    let o2 = rx3.recv().unwrap();
-    let o3 = rx3.recv().unwrap();
-    let o4 = rx3.recv().unwrap();
-    assert!(rx4.try_recv().is_err());
-
-    o1.send(1).unwrap();
-    assert_eq!(rx4.recv(), Ok(1));
-    o3.send(3).unwrap();
-    assert_eq!(rx4.recv(), Ok(3));
-    tx2.send(()).unwrap();
-    o2.send(2).unwrap();
-    assert_eq!(rx4.recv(), Ok(2));
-    o4.send(4).unwrap();
-    assert_eq!(rx4.recv(), Ok(4));
-
-    let o5 = rx3.recv().unwrap();
-    let o6 = rx3.recv().unwrap();
-    let o7 = rx3.recv().unwrap();
-    let o8 = rx3.recv().unwrap();
-    let o9 = rx3.recv().unwrap();
-
-    o5.send(5).unwrap();
-    assert_eq!(rx4.recv(), Ok(5));
-    o8.send(8).unwrap();
-    assert_eq!(rx4.recv(), Ok(8));
-    o9.send(9).unwrap();
-    assert_eq!(rx4.recv(), Ok(9));
-    o7.send(7).unwrap();
-    assert_eq!(rx4.recv(), Ok(7));
-    o6.send(6).unwrap();
-    assert_eq!(rx4.recv(), Ok(6));
-
-    t1.join().unwrap();
-    t2.join().unwrap();
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/compat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/compat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/compat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/compat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
-use tokio::timer::Delay;
-use tokio::runtime::Runtime;
-use std::time::Instant;
-use futures::prelude::*;
+#![cfg(feature = "compat")]
+
 use futures::compat::Future01CompatExt;
+use futures::prelude::*;
+use std::time::Instant;
+use tokio::runtime::Runtime;
+use tokio::timer::Delay;
 
 #[test]
 fn can_use_01_futures_in_a_03_future_running_on_a_01_executor() {
-    let f = async {
-        Delay::new(Instant::now()).compat().await
-    };
+    let f = async { Delay::new(Instant::now()).compat().await };
 
     let mut runtime = Runtime::new().unwrap();
     runtime.block_on(f.boxed().compat()).unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/eager_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/eager_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/eager_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/eager_drop.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,23 @@
+use futures::channel::oneshot;
+use futures::future::{self, Future, FutureExt, TryFutureExt};
+use futures::task::{Context, Poll};
+use futures_test::future::FutureTestExt;
+use pin_project::pin_project;
+use std::pin::Pin;
+use std::sync::mpsc;
+
 #[test]
 fn map_ok() {
-    use futures::future::{self, FutureExt, TryFutureExt};
-    use futures_test::future::FutureTestExt;
-    use std::sync::mpsc;
-
     // The closure given to `map_ok` should have been dropped by the time `map`
     // runs.
     let (tx1, rx1) = mpsc::channel::<()>();
     let (tx2, rx2) = mpsc::channel::<()>();
 
     future::ready::<Result<i32, i32>>(Err(1))
-        .map_ok(move |_| { let _tx1 = tx1; panic!("should not run"); })
+        .map_ok(move |_| {
+            let _tx1 = tx1;
+            panic!("should not run");
+        })
         .map(move |_| {
             assert!(rx1.recv().is_err());
             tx2.send(()).unwrap()
@@ -22,17 +29,16 @@
 
 #[test]
 fn map_err() {
-    use futures::future::{self, FutureExt, TryFutureExt};
-    use futures_test::future::FutureTestExt;
-    use std::sync::mpsc;
-
     // The closure given to `map_err` should have been dropped by the time `map`
     // runs.
     let (tx1, rx1) = mpsc::channel::<()>();
     let (tx2, rx2) = mpsc::channel::<()>();
 
     future::ready::<Result<i32, i32>>(Ok(1))
-        .map_err(move |_| { let _tx1 = tx1; panic!("should not run"); })
+        .map_err(move |_| {
+            let _tx1 = tx1;
+            panic!("should not run");
+        })
         .map(move |_| {
             assert!(rx1.recv().is_err());
             tx2.send(()).unwrap()
@@ -42,96 +48,74 @@
     rx2.recv().unwrap();
 }
 
-mod channelled {
-    use futures::future::Future;
-    use futures::task::{Context,Poll};
-    use pin_project::pin_project;
-    use std::pin::Pin;
-
-    #[pin_project]
-    struct FutureData<F, T> {
-        _data: T,
-        #[pin]
-        future: F,
-    }
+#[pin_project]
+struct FutureData<F, T> {
+    _data: T,
+    #[pin]
+    future: F,
+}
 
-    impl<F: Future, T: Send + 'static> Future for FutureData<F, T> {
-        type Output = F::Output;
+impl<F: Future, T: Send + 'static> Future for FutureData<F, T> {
+    type Output = F::Output;
 
-        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<F::Output> {
-            self.project().future.poll(cx)
-        }
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<F::Output> {
+        self.project().future.poll(cx)
     }
+}
 
-    #[test]
-    fn then_drops_eagerly() {
-        use futures::channel::oneshot;
-        use futures::future::{self, FutureExt, TryFutureExt};
-        use futures_test::future::FutureTestExt;
-        use std::sync::mpsc;
-
-        let (tx0, rx0) = oneshot::channel::<()>();
-        let (tx1, rx1) = mpsc::channel::<()>();
-        let (tx2, rx2) = mpsc::channel::<()>();
-
-        FutureData { _data: tx1, future: rx0.unwrap_or_else(|_| { panic!() }) }
-            .then(move |_| {
-                assert!(rx1.recv().is_err()); // tx1 should have been dropped
-                tx2.send(()).unwrap();
-                future::ready(())
-            })
-            .run_in_background();
-
-        assert_eq!(Err(mpsc::TryRecvError::Empty), rx2.try_recv());
-        tx0.send(()).unwrap();
-        rx2.recv().unwrap();
-    }
+#[test]
+fn then_drops_eagerly() {
+    let (tx0, rx0) = oneshot::channel::<()>();
+    let (tx1, rx1) = mpsc::channel::<()>();
+    let (tx2, rx2) = mpsc::channel::<()>();
 
-    #[test]
-    fn and_then_drops_eagerly() {
-        use futures::channel::oneshot;
-        use futures::future::{self, TryFutureExt};
-        use futures_test::future::FutureTestExt;
-        use std::sync::mpsc;
-
-        let (tx0, rx0) = oneshot::channel::<Result<(), ()>>();
-        let (tx1, rx1) = mpsc::channel::<()>();
-        let (tx2, rx2) = mpsc::channel::<()>();
-
-        FutureData { _data: tx1, future: rx0.unwrap_or_else(|_| { panic!() }) }
-            .and_then(move |_| {
-                assert!(rx1.recv().is_err()); // tx1 should have been dropped
-                tx2.send(()).unwrap();
-                future::ready(Ok(()))
-            })
-            .run_in_background();
-
-        assert_eq!(Err(mpsc::TryRecvError::Empty), rx2.try_recv());
-        tx0.send(Ok(())).unwrap();
-        rx2.recv().unwrap();
-    }
+    FutureData { _data: tx1, future: rx0.unwrap_or_else(|_| panic!()) }
+        .then(move |_| {
+            assert!(rx1.recv().is_err()); // tx1 should have been dropped
+            tx2.send(()).unwrap();
+            future::ready(())
+        })
+        .run_in_background();
 
-    #[test]
-    fn or_else_drops_eagerly() {
-        use futures::channel::oneshot;
-        use futures::future::{self, TryFutureExt};
-        use futures_test::future::FutureTestExt;
-        use std::sync::mpsc;
-
-        let (tx0, rx0) = oneshot::channel::<Result<(), ()>>();
-        let (tx1, rx1) = mpsc::channel::<()>();
-        let (tx2, rx2) = mpsc::channel::<()>();
-
-        FutureData { _data: tx1, future: rx0.unwrap_or_else(|_| { panic!() }) }
-            .or_else(move |_| {
-                assert!(rx1.recv().is_err()); // tx1 should have been dropped
-                tx2.send(()).unwrap();
-                future::ready::<Result<(), ()>>(Ok(()))
-            })
-            .run_in_background();
-
-        assert_eq!(Err(mpsc::TryRecvError::Empty), rx2.try_recv());
-        tx0.send(Err(())).unwrap();
-        rx2.recv().unwrap();
-    }
+    assert_eq!(Err(mpsc::TryRecvError::Empty), rx2.try_recv());
+    tx0.send(()).unwrap();
+    rx2.recv().unwrap();
+}
+
+#[test]
+fn and_then_drops_eagerly() {
+    let (tx0, rx0) = oneshot::channel::<Result<(), ()>>();
+    let (tx1, rx1) = mpsc::channel::<()>();
+    let (tx2, rx2) = mpsc::channel::<()>();
+
+    FutureData { _data: tx1, future: rx0.unwrap_or_else(|_| panic!()) }
+        .and_then(move |_| {
+            assert!(rx1.recv().is_err()); // tx1 should have been dropped
+            tx2.send(()).unwrap();
+            future::ready(Ok(()))
+        })
+        .run_in_background();
+
+    assert_eq!(Err(mpsc::TryRecvError::Empty), rx2.try_recv());
+    tx0.send(Ok(())).unwrap();
+    rx2.recv().unwrap();
+}
+
+#[test]
+fn or_else_drops_eagerly() {
+    let (tx0, rx0) = oneshot::channel::<Result<(), ()>>();
+    let (tx1, rx1) = mpsc::channel::<()>();
+    let (tx2, rx2) = mpsc::channel::<()>();
+
+    FutureData { _data: tx1, future: rx0.unwrap_or_else(|_| panic!()) }
+        .or_else(move |_| {
+            assert!(rx1.recv().is_err()); // tx1 should have been dropped
+            tx2.send(()).unwrap();
+            future::ready::<Result<(), ()>>(Ok(()))
+        })
+        .run_in_background();
+
+    assert_eq!(Err(mpsc::TryRecvError::Empty), rx2.try_recv());
+    tx0.send(Err(())).unwrap();
+    rx2.recv().unwrap();
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/fuse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/fuse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/fuse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/fuse.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-use futures::future::{self, FutureExt};
-use futures::task::Context;
-use futures_test::task::panic_waker;
-
-#[test]
-fn fuse() {
-    let mut future = future::ready::<i32>(2).fuse();
-    let waker = panic_waker();
-    let mut cx = Context::from_waker(&waker);
-    assert!(future.poll_unpin(&mut cx).is_ready());
-    assert!(future.poll_unpin(&mut cx).is_pending());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_abortable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_abortable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_abortable.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_abortable.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+use futures::channel::oneshot;
+use futures::executor::block_on;
+use futures::future::{abortable, Aborted, FutureExt};
+use futures::task::{Context, Poll};
+use futures_test::task::new_count_waker;
+
+#[test]
+fn abortable_works() {
+    let (_tx, a_rx) = oneshot::channel::<()>();
+    let (abortable_rx, abort_handle) = abortable(a_rx);
+
+    abort_handle.abort();
+    assert!(abortable_rx.is_aborted());
+    assert_eq!(Err(Aborted), block_on(abortable_rx));
+}
+
+#[test]
+fn abortable_awakens() {
+    let (_tx, a_rx) = oneshot::channel::<()>();
+    let (mut abortable_rx, abort_handle) = abortable(a_rx);
+
+    let (waker, counter) = new_count_waker();
+    let mut cx = Context::from_waker(&waker);
+
+    assert_eq!(counter, 0);
+    assert_eq!(Poll::Pending, abortable_rx.poll_unpin(&mut cx));
+    assert_eq!(counter, 0);
+
+    abort_handle.abort();
+    assert_eq!(counter, 1);
+    assert!(abortable_rx.is_aborted());
+    assert_eq!(Poll::Ready(Err(Aborted)), abortable_rx.poll_unpin(&mut cx));
+}
+
+#[test]
+fn abortable_resolves() {
+    let (tx, a_rx) = oneshot::channel::<()>();
+    let (abortable_rx, _abort_handle) = abortable(a_rx);
+
+    tx.send(()).unwrap();
+
+    assert!(!abortable_rx.is_aborted());
+    assert_eq!(Ok(Ok(())), block_on(abortable_rx));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_basic_combinators.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_basic_combinators.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_basic_combinators.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_basic_combinators.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,104 @@
+use futures::future::{self, FutureExt, TryFutureExt};
+use futures_test::future::FutureTestExt;
+use std::sync::mpsc;
+
+#[test]
+fn basic_future_combinators() {
+    let (tx1, rx) = mpsc::channel();
+    let tx2 = tx1.clone();
+    let tx3 = tx1.clone();
+
+    let fut = future::ready(1)
+        .then(move |x| {
+            tx1.send(x).unwrap(); // Send 1
+            tx1.send(2).unwrap(); // Send 2
+            future::ready(3)
+        })
+        .map(move |x| {
+            tx2.send(x).unwrap(); // Send 3
+            tx2.send(4).unwrap(); // Send 4
+            5
+        })
+        .map(move |x| {
+            tx3.send(x).unwrap(); // Send 5
+        });
+
+    assert!(rx.try_recv().is_err()); // Not started yet
+    fut.run_in_background(); // Start it
+    for i in 1..=5 {
+        assert_eq!(rx.recv(), Ok(i));
+    } // Check it
+    assert!(rx.recv().is_err()); // Should be done
+}
+
+#[test]
+fn basic_try_future_combinators() {
+    let (tx1, rx) = mpsc::channel();
+    let tx2 = tx1.clone();
+    let tx3 = tx1.clone();
+    let tx4 = tx1.clone();
+    let tx5 = tx1.clone();
+    let tx6 = tx1.clone();
+    let tx7 = tx1.clone();
+    let tx8 = tx1.clone();
+    let tx9 = tx1.clone();
+    let tx10 = tx1.clone();
+
+    let fut = future::ready(Ok(1))
+        .and_then(move |x: i32| {
+            tx1.send(x).unwrap(); // Send 1
+            tx1.send(2).unwrap(); // Send 2
+            future::ready(Ok(3))
+        })
+        .or_else(move |x: i32| {
+            tx2.send(x).unwrap(); // Should not run
+            tx2.send(-1).unwrap();
+            future::ready(Ok(-1))
+        })
+        .map_ok(move |x: i32| {
+            tx3.send(x).unwrap(); // Send 3
+            tx3.send(4).unwrap(); // Send 4
+            5
+        })
+        .map_err(move |x: i32| {
+            tx4.send(x).unwrap(); // Should not run
+            tx4.send(-1).unwrap();
+            -1
+        })
+        .map(move |x: Result<i32, i32>| {
+            tx5.send(x.unwrap()).unwrap(); // Send 5
+            tx5.send(6).unwrap(); // Send 6
+            Err(7) // Now return errors!
+        })
+        .and_then(move |x: i32| {
+            tx6.send(x).unwrap(); // Should not run
+            tx6.send(-1).unwrap();
+            future::ready(Err(-1))
+        })
+        .or_else(move |x: i32| {
+            tx7.send(x).unwrap(); // Send 7
+            tx7.send(8).unwrap(); // Send 8
+            future::ready(Err(9))
+        })
+        .map_ok(move |x: i32| {
+            tx8.send(x).unwrap(); // Should not run
+            tx8.send(-1).unwrap();
+            -1
+        })
+        .map_err(move |x: i32| {
+            tx9.send(x).unwrap(); // Send 9
+            tx9.send(10).unwrap(); // Send 10
+            11
+        })
+        .map(move |x: Result<i32, i32>| {
+            tx10.send(x.err().unwrap()).unwrap(); // Send 11
+            tx10.send(12).unwrap(); // Send 12
+        });
+
+    assert!(rx.try_recv().is_err()); // Not started yet
+    fut.run_in_background(); // Start it
+    for i in 1..=12 {
+        assert_eq!(rx.recv(), Ok(i));
+    } // Check it
+    assert!(rx.recv().is_err()); // Should be done
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_fuse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_fuse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_fuse.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_fuse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,12 @@
+use futures::future::{self, FutureExt};
+use futures::task::Context;
+use futures_test::task::panic_waker;
+
+#[test]
+fn fuse() {
+    let mut future = future::ready::<i32>(2).fuse();
+    let waker = panic_waker();
+    let mut cx = Context::from_waker(&waker);
+    assert!(future.poll_unpin(&mut cx).is_ready());
+    assert!(future.poll_unpin(&mut cx).is_pending());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_inspect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_inspect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_inspect.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_inspect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+use futures::executor::block_on;
+use futures::future::{self, FutureExt};
+
+#[test]
+fn smoke() {
+    let mut counter = 0;
+
+    {
+        let work = future::ready::<i32>(40).inspect(|val| {
+            counter += *val;
+        });
+        assert_eq!(block_on(work), 40);
+    }
+
+    assert_eq!(counter, 40);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_join_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_join_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_join_all.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_join_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+use futures::executor::block_on;
+use futures::future::{join_all, ready, Future, JoinAll};
+use std::fmt::Debug;
+
+fn assert_done<T, F>(actual_fut: F, expected: T)
+where
+    T: PartialEq + Debug,
+    F: FnOnce() -> Box<dyn Future<Output = T> + Unpin>,
+{
+    let output = block_on(actual_fut());
+    assert_eq!(output, expected);
+}
+
+#[test]
+fn collect_collects() {
+    assert_done(|| Box::new(join_all(vec![ready(1), ready(2)])), vec![1, 2]);
+    assert_done(|| Box::new(join_all(vec![ready(1)])), vec![1]);
+    // REVIEW: should this be implemented?
+    // assert_done(|| Box::new(join_all(Vec::<i32>::new())), vec![]);
+
+    // TODO: needs more tests
+}
+
+#[test]
+fn join_all_iter_lifetime() {
+    // In futures-rs version 0.1, this function would fail to typecheck due to an overly
+    // conservative type parameterization of `JoinAll`.
+    fn sizes(bufs: Vec<&[u8]>) -> Box<dyn Future<Output = Vec<usize>> + Unpin> {
+        let iter = bufs.into_iter().map(|b| ready::<usize>(b.len()));
+        Box::new(join_all(iter))
+    }
+
+    assert_done(|| sizes(vec![&[1, 2, 3], &[], &[0]]), vec![3_usize, 0, 1]);
+}
+
+#[test]
+fn join_all_from_iter() {
+    assert_done(
+        || Box::new(vec![ready(1), ready(2)].into_iter().collect::<JoinAll<_>>()),
+        vec![1, 2],
+    )
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_obj.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_obj.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_obj.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_obj.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
-use futures::future::{Future, FutureObj, FutureExt};
-use std::pin::Pin;
+use futures::future::{Future, FutureExt, FutureObj};
 use futures::task::{Context, Poll};
+use std::pin::Pin;
 
 #[test]
 fn dropping_does_not_segfault() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_select_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_select_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_select_all.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_select_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+use futures::executor::block_on;
+use futures::future::{ready, select_all};
+use std::collections::HashSet;
+
+#[test]
+fn smoke() {
+    let v = vec![ready(1), ready(2), ready(3)];
+
+    let mut c = vec![1, 2, 3].into_iter().collect::<HashSet<_>>();
+
+    let (i, idx, v) = block_on(select_all(v));
+    assert!(c.remove(&i));
+    assert_eq!(idx, 0);
+
+    let (i, idx, v) = block_on(select_all(v));
+    assert!(c.remove(&i));
+    assert_eq!(idx, 0);
+
+    let (i, idx, v) = block_on(select_all(v));
+    assert!(c.remove(&i));
+    assert_eq!(idx, 0);
+
+    assert!(c.is_empty());
+    assert!(v.is_empty());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_select_ok.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_select_ok.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_select_ok.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_select_ok.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+use futures::executor::block_on;
+use futures::future::{err, ok, select_ok};
+
+#[test]
+fn ignore_err() {
+    let v = vec![err(1), err(2), ok(3), ok(4)];
+
+    let (i, v) = block_on(select_ok(v)).ok().unwrap();
+    assert_eq!(i, 3);
+
+    assert_eq!(v.len(), 1);
+
+    let (i, v) = block_on(select_ok(v)).ok().unwrap();
+    assert_eq!(i, 4);
+
+    assert!(v.is_empty());
+}
+
+#[test]
+fn last_err() {
+    let v = vec![ok(1), err(2), err(3)];
+
+    let (i, v) = block_on(select_ok(v)).ok().unwrap();
+    assert_eq!(i, 1);
+
+    assert_eq!(v.len(), 2);
+
+    let i = block_on(select_ok(v)).err().unwrap();
+    assert_eq!(i, 3);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_shared.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_shared.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_shared.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_shared.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,195 @@
+use futures::channel::oneshot;
+use futures::executor::{block_on, LocalPool};
+use futures::future::{self, FutureExt, LocalFutureObj, TryFutureExt};
+use futures::task::LocalSpawn;
+use std::cell::{Cell, RefCell};
+use std::rc::Rc;
+use std::task::Poll;
+use std::thread;
+
+struct CountClone(Rc<Cell<i32>>);
+
+impl Clone for CountClone {
+    fn clone(&self) -> Self {
+        self.0.set(self.0.get() + 1);
+        Self(self.0.clone())
+    }
+}
+
+fn send_shared_oneshot_and_wait_on_multiple_threads(threads_number: u32) {
+    let (tx, rx) = oneshot::channel::<i32>();
+    let f = rx.shared();
+    let join_handles = (0..threads_number)
+        .map(|_| {
+            let cloned_future = f.clone();
+            thread::spawn(move || {
+                assert_eq!(block_on(cloned_future).unwrap(), 6);
+            })
+        })
+        .collect::<Vec<_>>();
+
+    tx.send(6).unwrap();
+
+    assert_eq!(block_on(f).unwrap(), 6);
+    for join_handle in join_handles {
+        join_handle.join().unwrap();
+    }
+}
+
+#[test]
+fn one_thread() {
+    send_shared_oneshot_and_wait_on_multiple_threads(1);
+}
+
+#[test]
+fn two_threads() {
+    send_shared_oneshot_and_wait_on_multiple_threads(2);
+}
+
+#[test]
+fn many_threads() {
+    send_shared_oneshot_and_wait_on_multiple_threads(1000);
+}
+
+#[test]
+fn drop_on_one_task_ok() {
+    let (tx, rx) = oneshot::channel::<u32>();
+    let f1 = rx.shared();
+    let f2 = f1.clone();
+
+    let (tx2, rx2) = oneshot::channel::<u32>();
+
+    let t1 = thread::spawn(|| {
+        let f = future::try_select(f1.map_err(|_| ()), rx2.map_err(|_| ()));
+        drop(block_on(f));
+    });
+
+    let (tx3, rx3) = oneshot::channel::<u32>();
+
+    let t2 = thread::spawn(|| {
+        let _ = block_on(f2.map_ok(|x| tx3.send(x).unwrap()).map_err(|_| ()));
+    });
+
+    tx2.send(11).unwrap(); // cancel `f1`
+    t1.join().unwrap();
+
+    tx.send(42).unwrap(); // Should cause `f2` and then `rx3` to get resolved.
+    let result = block_on(rx3).unwrap();
+    assert_eq!(result, 42);
+    t2.join().unwrap();
+}
+
+#[test]
+fn drop_in_poll() {
+    let slot1 = Rc::new(RefCell::new(None));
+    let slot2 = slot1.clone();
+
+    let future1 = future::lazy(move |_| {
+        slot2.replace(None); // Drop future
+        1
+    })
+    .shared();
+
+    let future2 = LocalFutureObj::new(Box::new(future1.clone()));
+    slot1.replace(Some(future2));
+
+    assert_eq!(block_on(future1), 1);
+}
+
+#[test]
+fn peek() {
+    let mut local_pool = LocalPool::new();
+    let spawn = &mut local_pool.spawner();
+
+    let (tx0, rx0) = oneshot::channel::<i32>();
+    let f1 = rx0.shared();
+    let f2 = f1.clone();
+
+    // Repeated calls on the original or clone do not change the outcome.
+    for _ in 0..2 {
+        assert!(f1.peek().is_none());
+        assert!(f2.peek().is_none());
+    }
+
+    // Completing the underlying future has no effect, because the value has not been `poll`ed in.
+    tx0.send(42).unwrap();
+    for _ in 0..2 {
+        assert!(f1.peek().is_none());
+        assert!(f2.peek().is_none());
+    }
+
+    // Once the Shared has been polled, the value is peekable on the clone.
+    spawn.spawn_local_obj(LocalFutureObj::new(Box::new(f1.map(|_| ())))).unwrap();
+    local_pool.run();
+    for _ in 0..2 {
+        assert_eq!(*f2.peek().unwrap(), Ok(42));
+    }
+}
+
+#[test]
+fn downgrade() {
+    let (tx, rx) = oneshot::channel::<i32>();
+    let shared = rx.shared();
+    // Since there are outstanding `Shared`s, we can get a `WeakShared`.
+    let weak = shared.downgrade().unwrap();
+    // It should upgrade fine right now.
+    let mut shared2 = weak.upgrade().unwrap();
+
+    tx.send(42).unwrap();
+    assert_eq!(block_on(shared).unwrap(), 42);
+
+    // We should still be able to get a new `WeakShared` and upgrade it
+    // because `shared2` is outstanding.
+    assert!(shared2.downgrade().is_some());
+    assert!(weak.upgrade().is_some());
+
+    assert_eq!(block_on(&mut shared2).unwrap(), 42);
+    // Now that all `Shared`s have been exhausted, we should not be able
+    // to get a new `WeakShared` or upgrade an existing one.
+    assert!(weak.upgrade().is_none());
+    assert!(shared2.downgrade().is_none());
+}
+
+#[test]
+fn dont_clone_in_single_owner_shared_future() {
+    let counter = CountClone(Rc::new(Cell::new(0)));
+    let (tx, rx) = oneshot::channel();
+
+    let rx = rx.shared();
+
+    tx.send(counter).ok().unwrap();
+
+    assert_eq!(block_on(rx).unwrap().0.get(), 0);
+}
+
+#[test]
+fn dont_do_unnecessary_clones_on_output() {
+    let counter = CountClone(Rc::new(Cell::new(0)));
+    let (tx, rx) = oneshot::channel();
+
+    let rx = rx.shared();
+
+    tx.send(counter).ok().unwrap();
+
+    assert_eq!(block_on(rx.clone()).unwrap().0.get(), 1);
+    assert_eq!(block_on(rx.clone()).unwrap().0.get(), 2);
+    assert_eq!(block_on(rx).unwrap().0.get(), 2);
+}
+
+#[test]
+fn shared_future_that_wakes_itself_until_pending_is_returned() {
+    let proceed = Cell::new(false);
+    let fut = futures::future::poll_fn(|cx| {
+        if proceed.get() {
+            Poll::Ready(())
+        } else {
+            cx.waker().wake_by_ref();
+            Poll::Pending
+        }
+    })
+    .shared();
+
+    // The join future can only complete if the second future gets a chance to run after the first
+    // has returned pending
+    assert_eq!(block_on(futures::future::join(fut, async { proceed.set(true) })), ((), ()));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/futures_ordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/futures_ordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/futures_ordered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/futures_ordered.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-#[test]
-fn works_1() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on_stream;
-    use futures::stream::{StreamExt, FuturesOrdered};
-    use futures_test::task::noop_context;
-
-    let (a_tx, a_rx) = oneshot::channel::<i32>();
-    let (b_tx, b_rx) = oneshot::channel::<i32>();
-    let (c_tx, c_rx) = oneshot::channel::<i32>();
-
-    let mut stream = vec![a_rx, b_rx, c_rx].into_iter().collect::<FuturesOrdered<_>>();
-
-    b_tx.send(99).unwrap();
-    assert!(stream.poll_next_unpin(&mut noop_context()).is_pending());
-
-    a_tx.send(33).unwrap();
-    c_tx.send(33).unwrap();
-
-    let mut iter = block_on_stream(stream);
-    assert_eq!(Some(Ok(33)), iter.next());
-    assert_eq!(Some(Ok(99)), iter.next());
-    assert_eq!(Some(Ok(33)), iter.next());
-    assert_eq!(None, iter.next());
-}
-
-#[test]
-fn works_2() {
-    use futures::channel::oneshot;
-    use futures::future::{join, FutureExt};
-    use futures::stream::{StreamExt, FuturesOrdered};
-    use futures_test::task::noop_context;
-
-    let (a_tx, a_rx) = oneshot::channel::<i32>();
-    let (b_tx, b_rx) = oneshot::channel::<i32>();
-    let (c_tx, c_rx) = oneshot::channel::<i32>();
-
-    let mut stream = vec![
-        a_rx.boxed(),
-        join(b_rx, c_rx).map(|(a, b)| Ok(a? + b?)).boxed(),
-    ].into_iter().collect::<FuturesOrdered<_>>();
-
-    let mut cx = noop_context();
-    a_tx.send(33).unwrap();
-    b_tx.send(33).unwrap();
-    assert!(stream.poll_next_unpin(&mut cx).is_ready());
-    assert!(stream.poll_next_unpin(&mut cx).is_pending());
-    c_tx.send(33).unwrap();
-    assert!(stream.poll_next_unpin(&mut cx).is_ready());
-}
-
-#[test]
-fn from_iterator() {
-    use futures::executor::block_on;
-    use futures::future;
-    use futures::stream::{StreamExt, FuturesOrdered};
-
-    let stream = vec![
-        future::ready::<i32>(1),
-        future::ready::<i32>(2),
-        future::ready::<i32>(3)
-    ].into_iter().collect::<FuturesOrdered<_>>();
-    assert_eq!(stream.len(), 3);
-    assert_eq!(block_on(stream.collect::<Vec<_>>()), vec![1,2,3]);
-}
-
-#[test]
-fn queue_never_unblocked() {
-    use futures::channel::oneshot;
-    use futures::future::{self, Future, TryFutureExt};
-    use futures::stream::{StreamExt, FuturesOrdered};
-    use futures_test::task::noop_context;
-    use std::any::Any;
-
-    let (_a_tx, a_rx) = oneshot::channel::<Box<dyn Any + Send>>();
-    let (b_tx, b_rx) = oneshot::channel::<Box<dyn Any + Send>>();
-    let (c_tx, c_rx) = oneshot::channel::<Box<dyn Any + Send>>();
-
-    let mut stream = vec![
-        Box::new(a_rx) as Box<dyn Future<Output = _> + Unpin>,
-        Box::new(future::try_select(b_rx, c_rx)
-            .map_err(|e| e.factor_first().0)
-            .and_then(|e| future::ok(Box::new(e) as Box<dyn Any + Send>))) as _,
-    ].into_iter().collect::<FuturesOrdered<_>>();
-
-    let cx = &mut noop_context();
-    for _ in 0..10 {
-        assert!(stream.poll_next_unpin(cx).is_pending());
-    }
-
-    b_tx.send(Box::new(())).unwrap();
-    assert!(stream.poll_next_unpin(cx).is_pending());
-    c_tx.send(Box::new(())).unwrap();
-    assert!(stream.poll_next_unpin(cx).is_pending());
-    assert!(stream.poll_next_unpin(cx).is_pending());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/futures_unordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/futures_unordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/futures_unordered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/futures_unordered.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,328 +0,0 @@
-#[test]
-fn is_terminated() {
-    use futures::future;
-    use futures::stream::{FusedStream, FuturesUnordered, StreamExt};
-    use futures::task::Poll;
-    use futures_test::task::noop_context;
-
-    let mut cx = noop_context();
-    let mut tasks = FuturesUnordered::new();
-
-    assert_eq!(tasks.is_terminated(), false);
-    assert_eq!(tasks.poll_next_unpin(&mut cx), Poll::Ready(None));
-    assert_eq!(tasks.is_terminated(), true);
-
-    // Test that the sentinel value doesn't leak
-    assert_eq!(tasks.is_empty(), true);
-    assert_eq!(tasks.len(), 0);
-    assert_eq!(tasks.iter_mut().len(), 0);
-
-    tasks.push(future::ready(1));
-
-    assert_eq!(tasks.is_empty(), false);
-    assert_eq!(tasks.len(), 1);
-    assert_eq!(tasks.iter_mut().len(), 1);
-
-    assert_eq!(tasks.is_terminated(), false);
-    assert_eq!(tasks.poll_next_unpin(&mut cx), Poll::Ready(Some(1)));
-    assert_eq!(tasks.is_terminated(), false);
-    assert_eq!(tasks.poll_next_unpin(&mut cx), Poll::Ready(None));
-    assert_eq!(tasks.is_terminated(), true);
-}
-
-#[test]
-fn works_1() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on_stream;
-    use futures::stream::FuturesUnordered;
-
-    let (a_tx, a_rx) = oneshot::channel::<i32>();
-    let (b_tx, b_rx) = oneshot::channel::<i32>();
-    let (c_tx, c_rx) = oneshot::channel::<i32>();
-
-    let mut iter = block_on_stream(
-        vec![a_rx, b_rx, c_rx]
-            .into_iter()
-            .collect::<FuturesUnordered<_>>(),
-    );
-
-    b_tx.send(99).unwrap();
-    assert_eq!(Some(Ok(99)), iter.next());
-
-    a_tx.send(33).unwrap();
-    c_tx.send(33).unwrap();
-    assert_eq!(Some(Ok(33)), iter.next());
-    assert_eq!(Some(Ok(33)), iter.next());
-    assert_eq!(None, iter.next());
-}
-
-#[test]
-fn works_2() {
-    use futures::channel::oneshot;
-    use futures::future::{join, FutureExt};
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures::task::Poll;
-    use futures_test::task::noop_context;
-
-    let (a_tx, a_rx) = oneshot::channel::<i32>();
-    let (b_tx, b_rx) = oneshot::channel::<i32>();
-    let (c_tx, c_rx) = oneshot::channel::<i32>();
-
-    let mut stream = vec![
-        a_rx.boxed(),
-        join(b_rx, c_rx).map(|(a, b)| Ok(a? + b?)).boxed(),
-    ]
-    .into_iter()
-    .collect::<FuturesUnordered<_>>();
-
-    a_tx.send(9).unwrap();
-    b_tx.send(10).unwrap();
-
-    let mut cx = noop_context();
-    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(9))));
-    c_tx.send(20).unwrap();
-    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(30))));
-    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(None));
-}
-
-#[test]
-fn from_iterator() {
-    use futures::executor::block_on;
-    use futures::future;
-    use futures::stream::{FuturesUnordered, StreamExt};
-
-    let stream = vec![
-        future::ready::<i32>(1),
-        future::ready::<i32>(2),
-        future::ready::<i32>(3),
-    ]
-    .into_iter()
-    .collect::<FuturesUnordered<_>>();
-    assert_eq!(stream.len(), 3);
-    assert_eq!(block_on(stream.collect::<Vec<_>>()), vec![1, 2, 3]);
-}
-
-#[test]
-fn finished_future() {
-    use std::marker::Unpin;
-    use futures::channel::oneshot;
-    use futures::future::{self, Future, FutureExt};
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures_test::task::noop_context;
-
-    let (_a_tx, a_rx) = oneshot::channel::<i32>();
-    let (b_tx, b_rx) = oneshot::channel::<i32>();
-    let (c_tx, c_rx) = oneshot::channel::<i32>();
-
-    let mut stream = vec![
-        Box::new(a_rx) as Box<dyn Future<Output = Result<_, _>> + Unpin>,
-        Box::new(future::select(b_rx, c_rx).map(|e| e.factor_first().0)) as _,
-    ]
-    .into_iter()
-    .collect::<FuturesUnordered<_>>();
-
-    let cx = &mut noop_context();
-    for _ in 0..10 {
-        assert!(stream.poll_next_unpin(cx).is_pending());
-    }
-
-    b_tx.send(12).unwrap();
-    c_tx.send(3).unwrap();
-    assert!(stream.poll_next_unpin(cx).is_ready());
-    assert!(stream.poll_next_unpin(cx).is_pending());
-    assert!(stream.poll_next_unpin(cx).is_pending());
-}
-
-#[test]
-fn iter_mut_cancel() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on_stream;
-    use futures::stream::FuturesUnordered;
-
-    let (a_tx, a_rx) = oneshot::channel::<i32>();
-    let (b_tx, b_rx) = oneshot::channel::<i32>();
-    let (c_tx, c_rx) = oneshot::channel::<i32>();
-
-    let mut stream = vec![a_rx, b_rx, c_rx]
-        .into_iter()
-        .collect::<FuturesUnordered<_>>();
-
-    for rx in stream.iter_mut() {
-        rx.close();
-    }
-
-    let mut iter = block_on_stream(stream);
-
-    assert!(a_tx.is_canceled());
-    assert!(b_tx.is_canceled());
-    assert!(c_tx.is_canceled());
-
-    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
-    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
-    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
-    assert_eq!(iter.next(), None);
-}
-
-#[test]
-fn iter_mut_len() {
-    use futures::future;
-    use futures::stream::FuturesUnordered;
-
-    let mut stream = vec![
-        future::pending::<()>(),
-        future::pending::<()>(),
-        future::pending::<()>(),
-    ]
-    .into_iter()
-    .collect::<FuturesUnordered<_>>();
-
-    let mut iter_mut = stream.iter_mut();
-    assert_eq!(iter_mut.len(), 3);
-    assert!(iter_mut.next().is_some());
-    assert_eq!(iter_mut.len(), 2);
-    assert!(iter_mut.next().is_some());
-    assert_eq!(iter_mut.len(), 1);
-    assert!(iter_mut.next().is_some());
-    assert_eq!(iter_mut.len(), 0);
-    assert!(iter_mut.next().is_none());
-}
-
-#[test]
-fn iter_cancel() {
-    use std::marker::Unpin;
-    use std::pin::Pin;
-    use std::sync::atomic::{AtomicBool, Ordering};
-
-    use futures::executor::block_on_stream;
-    use futures::future::{self, Future, FutureExt};
-    use futures::stream::FuturesUnordered;
-    use futures::task::{Context, Poll};
-
-    struct AtomicCancel<F> {
-        future: F,
-        cancel: AtomicBool,
-    }
-
-    impl<F: Future + Unpin> Future for AtomicCancel<F> {
-        type Output = Option<<F as Future>::Output>;
-
-        fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-            if self.cancel.load(Ordering::Relaxed) {
-                Poll::Ready(None)
-            } else {
-                self.future.poll_unpin(cx).map(Some)
-            }
-        }
-    }
-
-    impl<F: Future + Unpin> AtomicCancel<F> {
-        fn new(future: F) -> Self {
-            Self { future, cancel: AtomicBool::new(false) }
-        }
-    }
-
-    let stream = vec![
-        AtomicCancel::new(future::pending::<()>()),
-        AtomicCancel::new(future::pending::<()>()),
-        AtomicCancel::new(future::pending::<()>()),
-    ]
-    .into_iter()
-    .collect::<FuturesUnordered<_>>();
-
-    for f in stream.iter() {
-        f.cancel.store(true, Ordering::Relaxed);
-    }
-
-    let mut iter = block_on_stream(stream);
-
-    assert_eq!(iter.next(), Some(None));
-    assert_eq!(iter.next(), Some(None));
-    assert_eq!(iter.next(), Some(None));
-    assert_eq!(iter.next(), None);
-}
-
-#[test]
-fn iter_len() {
-    use futures::future;
-    use futures::stream::FuturesUnordered;
-
-    let stream = vec![
-        future::pending::<()>(),
-        future::pending::<()>(),
-        future::pending::<()>(),
-    ]
-    .into_iter()
-    .collect::<FuturesUnordered<_>>();
-
-    let mut iter = stream.iter();
-    assert_eq!(iter.len(), 3);
-    assert!(iter.next().is_some());
-    assert_eq!(iter.len(), 2);
-    assert!(iter.next().is_some());
-    assert_eq!(iter.len(), 1);
-    assert!(iter.next().is_some());
-    assert_eq!(iter.len(), 0);
-    assert!(iter.next().is_none());
-}
-
-#[test]
-fn futures_not_moved_after_poll() {
-    use futures::future;
-    use futures::stream::FuturesUnordered;
-    use futures_test::future::FutureTestExt;
-    use futures_test::{assert_stream_done, assert_stream_next};
-
-    // Future that will be ready after being polled twice,
-    // asserting that it does not move.
-    let fut = future::ready(()).pending_once().assert_unmoved();
-    let mut stream = vec![fut; 3].into_iter().collect::<FuturesUnordered<_>>();
-    assert_stream_next!(stream, ());
-    assert_stream_next!(stream, ());
-    assert_stream_next!(stream, ());
-    assert_stream_done!(stream);
-}
-
-#[test]
-fn len_valid_during_out_of_order_completion() {
-    use futures::channel::oneshot;
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures::task::Poll;
-    use futures_test::task::noop_context;
-
-    // Complete futures out-of-order and add new futures afterwards to ensure
-    // length values remain correct.
-    let (a_tx, a_rx) = oneshot::channel::<i32>();
-    let (b_tx, b_rx) = oneshot::channel::<i32>();
-    let (c_tx, c_rx) = oneshot::channel::<i32>();
-    let (d_tx, d_rx) = oneshot::channel::<i32>();
-
-    let mut cx = noop_context();
-    let mut stream = FuturesUnordered::new();
-    assert_eq!(stream.len(), 0);
-
-    stream.push(a_rx);
-    assert_eq!(stream.len(), 1);
-    stream.push(b_rx);
-    assert_eq!(stream.len(), 2);
-    stream.push(c_rx);
-    assert_eq!(stream.len(), 3);
-
-    b_tx.send(4).unwrap();
-    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(4))));
-    assert_eq!(stream.len(), 2);
-
-    stream.push(d_rx);
-    assert_eq!(stream.len(), 3);
-
-    c_tx.send(5).unwrap();
-    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(5))));
-    assert_eq!(stream.len(), 2);
-
-    d_tx.send(6).unwrap();
-    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(6))));
-    assert_eq!(stream.len(), 1);
-
-    a_tx.send(7).unwrap();
-    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(7))));
-    assert_eq!(stream.len(), 0);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_try_flatten_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_try_flatten_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_try_flatten_stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_try_flatten_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,14 @@
+use futures::executor::block_on_stream;
+use futures::future::{err, ok, TryFutureExt};
+use futures::sink::Sink;
+use futures::stream::Stream;
+use futures::stream::{self, StreamExt};
+use futures::task::{Context, Poll};
+use std::marker::PhantomData;
+use std::pin::Pin;
+
 #[test]
 fn successful_future() {
-    use futures::executor::block_on_stream;
-    use futures::future::{ok, TryFutureExt};
-    use futures::stream::{self, StreamExt};
-
     let stream_items = vec![17, 19];
     let future_of_a_stream = ok::<_, bool>(stream::iter(stream_items).map(Ok));
 
@@ -17,15 +22,8 @@
 
 #[test]
 fn failed_future() {
-    use core::marker::PhantomData;
-    use core::pin::Pin;
-    use futures::executor::block_on_stream;
-    use futures::future::{err, TryFutureExt};
-    use futures::stream::Stream;
-    use futures::task::{Context, Poll};
-
     struct PanickingStream<T, E> {
-        _marker: PhantomData<(T, E)>
+        _marker: PhantomData<(T, E)>,
     }
 
     impl<T, E> Stream for PanickingStream<T, E> {
@@ -45,13 +43,6 @@
 
 #[test]
 fn assert_impls() {
-    use core::marker::PhantomData;
-    use core::pin::Pin;
-    use futures::sink::Sink;
-    use futures::stream::Stream;
-    use futures::task::{Context, Poll};
-    use futures::future::{ok, TryFutureExt};
-
     struct StreamSink<T, E, Item>(PhantomData<(T, E, Item)>);
 
     impl<T, E, Item> Stream for StreamSink<T, E, Item> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_try_join_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_try_join_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/future_try_join_all.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/future_try_join_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+use futures::executor::block_on;
+use futures_util::future::{err, ok, try_join_all, TryJoinAll};
+use std::fmt::Debug;
+use std::future::Future;
+
+fn assert_done<T, F>(actual_fut: F, expected: T)
+where
+    T: PartialEq + Debug,
+    F: FnOnce() -> Box<dyn Future<Output = T> + Unpin>,
+{
+    let output = block_on(actual_fut());
+    assert_eq!(output, expected);
+}
+
+#[test]
+fn collect_collects() {
+    assert_done(|| Box::new(try_join_all(vec![ok(1), ok(2)])), Ok::<_, usize>(vec![1, 2]));
+    assert_done(|| Box::new(try_join_all(vec![ok(1), err(2)])), Err(2));
+    assert_done(|| Box::new(try_join_all(vec![ok(1)])), Ok::<_, usize>(vec![1]));
+    // REVIEW: should this be implemented?
+    // assert_done(|| Box::new(try_join_all(Vec::<i32>::new())), Ok(vec![]));
+
+    // TODO: needs more tests
+}
+
+#[test]
+fn try_join_all_iter_lifetime() {
+    // In futures-rs version 0.1, this function would fail to typecheck due to an overly
+    // conservative type parameterization of `TryJoinAll`.
+    fn sizes(bufs: Vec<&[u8]>) -> Box<dyn Future<Output = Result<Vec<usize>, ()>> + Unpin> {
+        let iter = bufs.into_iter().map(|b| ok::<usize, ()>(b.len()));
+        Box::new(try_join_all(iter))
+    }
+
+    assert_done(|| sizes(vec![&[1, 2, 3], &[], &[0]]), Ok(vec![3_usize, 0, 1]));
+}
+
+#[test]
+fn try_join_all_from_iter() {
+    assert_done(
+        || Box::new(vec![ok(1), ok(2)].into_iter().collect::<TryJoinAll<_>>()),
+        Ok::<_, usize>(vec![1, 2]),
+    )
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/inspect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/inspect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/inspect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/inspect.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#[test]
-fn smoke() {
-    use futures::executor::block_on;
-    use futures::future::{self, FutureExt};
-
-    let mut counter = 0;
-
-    {
-        let work = future::ready::<i32>(40).inspect(|val| { counter += *val; });
-        assert_eq!(block_on(work), 40);
-    }
-
-    assert_eq!(counter, 40);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_buf_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_buf_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_buf_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_buf_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,156 +1,240 @@
-macro_rules! run_fill_buf {
-    ($reader:expr) => {{
-        use futures_test::task::noop_context;
-        use futures::task::Poll;
-        use std::pin::Pin;
-
-        let mut cx = noop_context();
-        loop {
-            if let Poll::Ready(x) = Pin::new(&mut $reader).poll_fill_buf(&mut cx) {
-                break x;
-            }
+use futures::executor::block_on;
+use futures::future::{Future, FutureExt};
+use futures::io::{
+    AllowStdIo, AsyncBufRead, AsyncBufReadExt, AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt,
+    BufReader, SeekFrom,
+};
+use futures::pin_mut;
+use futures::task::{Context, Poll};
+use futures_test::task::noop_context;
+use pin_project::pin_project;
+use std::cmp;
+use std::io;
+use std::pin::Pin;
+
+// helper for maybe_pending_* tests
+fn run<F: Future + Unpin>(mut f: F) -> F::Output {
+    let mut cx = noop_context();
+    loop {
+        if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
+            return x;
         }
-    }};
+    }
 }
 
-mod util {
-    use futures::future::Future;
-    pub fn run<F: Future + Unpin>(mut f: F) -> F::Output {
-        use futures_test::task::noop_context;
-        use futures::task::Poll;
-        use futures::future::FutureExt;
-
-        let mut cx = noop_context();
-        loop {
-            if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
-                return x;
-            }
-        }
-    }
+// https://github.com/rust-lang/futures-rs/pull/2489#discussion_r697865719
+#[pin_project(!Unpin)]
+struct Cursor<T> {
+    #[pin]
+    inner: futures::io::Cursor<T>,
 }
 
-mod maybe_pending {
-    use futures::task::{Context,Poll};
-    use std::{cmp,io};
-    use std::pin::Pin;
-    use futures::io::{AsyncRead,AsyncBufRead};
-
-    pub struct MaybePending<'a> {
-        inner: &'a [u8],
-        ready_read: bool,
-        ready_fill_buf: bool,
-    }
-
-    impl<'a> MaybePending<'a> {
-        pub fn new(inner: &'a [u8]) -> Self {
-            Self { inner, ready_read: false, ready_fill_buf: false }
-        }
+impl<T> Cursor<T> {
+    fn new(inner: T) -> Self {
+        Self { inner: futures::io::Cursor::new(inner) }
     }
+}
 
-    impl AsyncRead for MaybePending<'_> {
-        fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8])
-            -> Poll<io::Result<usize>>
-        {
-            if self.ready_read {
-                self.ready_read = false;
-                Pin::new(&mut self.inner).poll_read(cx, buf)
-            } else {
-                self.ready_read = true;
-                Poll::Pending
-            }
-        }
+impl AsyncRead for Cursor<&[u8]> {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut [u8],
+    ) -> Poll<io::Result<usize>> {
+        self.project().inner.poll_read(cx, buf)
     }
+}
 
-    impl AsyncBufRead for MaybePending<'_> {
-        fn poll_fill_buf(mut self: Pin<&mut Self>, _: &mut Context<'_>)
-            -> Poll<io::Result<&[u8]>>
-        {
-            if self.ready_fill_buf {
-                self.ready_fill_buf = false;
-                if self.inner.is_empty() { return Poll::Ready(Ok(&[])) }
-                let len = cmp::min(2, self.inner.len());
-                Poll::Ready(Ok(&self.inner[0..len]))
-            } else {
-                self.ready_fill_buf = true;
-                Poll::Pending
-            }
-        }
+impl AsyncBufRead for Cursor<&[u8]> {
+    fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
+        self.project().inner.poll_fill_buf(cx)
+    }
 
-        fn consume(mut self: Pin<&mut Self>, amt: usize) {
-            self.inner = &self.inner[amt..];
-        }
+    fn consume(self: Pin<&mut Self>, amt: usize) {
+        self.project().inner.consume(amt)
     }
 }
 
-#[test]
-fn test_buffered_reader() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncReadExt, BufReader};
+impl AsyncSeek for Cursor<&[u8]> {
+    fn poll_seek(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        pos: SeekFrom,
+    ) -> Poll<io::Result<u64>> {
+        self.project().inner.poll_seek(cx, pos)
+    }
+}
 
-    let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
-    let mut reader = BufReader::with_capacity(2, inner);
+struct MaybePending<'a> {
+    inner: &'a [u8],
+    ready_read: bool,
+    ready_fill_buf: bool,
+}
 
-    let mut buf = [0, 0, 0];
-    let nread = block_on(reader.read(&mut buf));
-    assert_eq!(nread.unwrap(), 3);
-    assert_eq!(buf, [5, 6, 7]);
-    assert_eq!(reader.buffer(), []);
+impl<'a> MaybePending<'a> {
+    fn new(inner: &'a [u8]) -> Self {
+        Self { inner, ready_read: false, ready_fill_buf: false }
+    }
+}
 
-    let mut buf = [0, 0];
-    let nread = block_on(reader.read(&mut buf));
-    assert_eq!(nread.unwrap(), 2);
-    assert_eq!(buf, [0, 1]);
-    assert_eq!(reader.buffer(), []);
+impl AsyncRead for MaybePending<'_> {
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut [u8],
+    ) -> Poll<io::Result<usize>> {
+        if self.ready_read {
+            self.ready_read = false;
+            Pin::new(&mut self.inner).poll_read(cx, buf)
+        } else {
+            self.ready_read = true;
+            Poll::Pending
+        }
+    }
+}
 
-    let mut buf = [0];
-    let nread = block_on(reader.read(&mut buf));
-    assert_eq!(nread.unwrap(), 1);
-    assert_eq!(buf, [2]);
-    assert_eq!(reader.buffer(), [3]);
+impl AsyncBufRead for MaybePending<'_> {
+    fn poll_fill_buf(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
+        if self.ready_fill_buf {
+            self.ready_fill_buf = false;
+            if self.inner.is_empty() {
+                return Poll::Ready(Ok(&[]));
+            }
+            let len = cmp::min(2, self.inner.len());
+            Poll::Ready(Ok(&self.inner[0..len]))
+        } else {
+            self.ready_fill_buf = true;
+            Poll::Pending
+        }
+    }
 
-    let mut buf = [0, 0, 0];
-    let nread = block_on(reader.read(&mut buf));
-    assert_eq!(nread.unwrap(), 1);
-    assert_eq!(buf, [3, 0, 0]);
-    assert_eq!(reader.buffer(), []);
+    fn consume(mut self: Pin<&mut Self>, amt: usize) {
+        self.inner = &self.inner[amt..];
+    }
+}
 
-    let nread = block_on(reader.read(&mut buf));
-    assert_eq!(nread.unwrap(), 1);
-    assert_eq!(buf, [4, 0, 0]);
-    assert_eq!(reader.buffer(), []);
+#[test]
+fn test_buffered_reader() {
+    block_on(async {
+        let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+        let mut reader = BufReader::with_capacity(2, inner);
+
+        let mut buf = [0, 0, 0];
+        let nread = reader.read(&mut buf).await.unwrap();
+        assert_eq!(nread, 3);
+        assert_eq!(buf, [5, 6, 7]);
+        assert_eq!(reader.buffer(), []);
+
+        let mut buf = [0, 0];
+        let nread = reader.read(&mut buf).await.unwrap();
+        assert_eq!(nread, 2);
+        assert_eq!(buf, [0, 1]);
+        assert_eq!(reader.buffer(), []);
+
+        let mut buf = [0];
+        let nread = reader.read(&mut buf).await.unwrap();
+        assert_eq!(nread, 1);
+        assert_eq!(buf, [2]);
+        assert_eq!(reader.buffer(), [3]);
+
+        let mut buf = [0, 0, 0];
+        let nread = reader.read(&mut buf).await.unwrap();
+        assert_eq!(nread, 1);
+        assert_eq!(buf, [3, 0, 0]);
+        assert_eq!(reader.buffer(), []);
+
+        let nread = reader.read(&mut buf).await.unwrap();
+        assert_eq!(nread, 1);
+        assert_eq!(buf, [4, 0, 0]);
+        assert_eq!(reader.buffer(), []);
 
-    assert_eq!(block_on(reader.read(&mut buf)).unwrap(), 0);
+        assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+    });
 }
 
 #[test]
 fn test_buffered_reader_seek() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncSeekExt, AsyncBufRead, BufReader, Cursor, SeekFrom};
-    use std::pin::Pin;
-    use util::run;
+    block_on(async {
+        let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+        let reader = BufReader::with_capacity(2, Cursor::new(inner));
+        pin_mut!(reader);
+
+        assert_eq!(reader.seek(SeekFrom::Start(3)).await.unwrap(), 3);
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1][..]);
+        assert!(reader.seek(SeekFrom::Current(i64::MIN)).await.is_err());
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1][..]);
+        assert_eq!(reader.seek(SeekFrom::Current(1)).await.unwrap(), 4);
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[1, 2][..]);
+        reader.as_mut().consume(1);
+        assert_eq!(reader.seek(SeekFrom::Current(-2)).await.unwrap(), 3);
+    });
+}
 
-    let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
-    let mut reader = BufReader::with_capacity(2, Cursor::new(inner));
+#[test]
+fn test_buffered_reader_seek_relative() {
+    block_on(async {
+        let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+        let reader = BufReader::with_capacity(2, Cursor::new(inner));
+        pin_mut!(reader);
+
+        assert!(reader.as_mut().seek_relative(3).await.is_ok());
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1][..]);
+        assert!(reader.as_mut().seek_relative(0).await.is_ok());
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1][..]);
+        assert!(reader.as_mut().seek_relative(1).await.is_ok());
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[1][..]);
+        assert!(reader.as_mut().seek_relative(-1).await.is_ok());
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1][..]);
+        assert!(reader.as_mut().seek_relative(2).await.is_ok());
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[2, 3][..]);
+    });
+}
 
-    assert_eq!(block_on(reader.seek(SeekFrom::Start(3))).ok(), Some(3));
-    assert_eq!(run_fill_buf!(reader).ok(), Some(&[0, 1][..]));
-    assert_eq!(run(reader.seek(SeekFrom::Current(i64::min_value()))).ok(), None);
-    assert_eq!(run_fill_buf!(reader).ok(), Some(&[0, 1][..]));
-    assert_eq!(block_on(reader.seek(SeekFrom::Current(1))).ok(), Some(4));
-    assert_eq!(run_fill_buf!(reader).ok(), Some(&[1, 2][..]));
-    Pin::new(&mut reader).consume(1);
-    assert_eq!(block_on(reader.seek(SeekFrom::Current(-2))).ok(), Some(3));
+#[test]
+fn test_buffered_reader_invalidated_after_read() {
+    block_on(async {
+        let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+        let reader = BufReader::with_capacity(3, Cursor::new(inner));
+        pin_mut!(reader);
+
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[5, 6, 7][..]);
+        reader.as_mut().consume(3);
+
+        let mut buffer = [0, 0, 0, 0, 0];
+        assert_eq!(reader.read(&mut buffer).await.unwrap(), 5);
+        assert_eq!(buffer, [0, 1, 2, 3, 4]);
+
+        assert!(reader.as_mut().seek_relative(-2).await.is_ok());
+        let mut buffer = [0, 0];
+        assert_eq!(reader.read(&mut buffer).await.unwrap(), 2);
+        assert_eq!(buffer, [3, 4]);
+    });
 }
 
 #[test]
-fn test_buffered_reader_seek_underflow() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncSeekExt, AsyncBufRead, AllowStdIo, BufReader, SeekFrom};
-    use std::io;
+fn test_buffered_reader_invalidated_after_seek() {
+    block_on(async {
+        let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+        let reader = BufReader::with_capacity(3, Cursor::new(inner));
+        pin_mut!(reader);
+
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[5, 6, 7][..]);
+        reader.as_mut().consume(3);
+
+        assert!(reader.seek(SeekFrom::Current(5)).await.is_ok());
+
+        assert!(reader.as_mut().seek_relative(-2).await.is_ok());
+        let mut buffer = [0, 0];
+        assert_eq!(reader.read(&mut buffer).await.unwrap(), 2);
+        assert_eq!(buffer, [3, 4]);
+    });
+}
 
+#[test]
+fn test_buffered_reader_seek_underflow() {
     // gimmick reader that yields its position modulo 256 for each byte
     struct PositionReader {
-        pos: u64
+        pos: u64,
     }
     impl io::Read for PositionReader {
         fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
@@ -172,32 +256,31 @@
                     self.pos = self.pos.wrapping_add(n as u64);
                 }
                 SeekFrom::End(n) => {
-                    self.pos = u64::max_value().wrapping_add(n as u64);
+                    self.pos = u64::MAX.wrapping_add(n as u64);
                 }
             }
             Ok(self.pos)
         }
     }
 
-    let mut reader = BufReader::with_capacity(5, AllowStdIo::new(PositionReader { pos: 0 }));
-    assert_eq!(run_fill_buf!(reader).ok(), Some(&[0, 1, 2, 3, 4][..]));
-    assert_eq!(block_on(reader.seek(SeekFrom::End(-5))).ok(), Some(u64::max_value()-5));
-    assert_eq!(run_fill_buf!(reader).ok().map(|s| s.len()), Some(5));
-    // the following seek will require two underlying seeks
-    let expected = 9_223_372_036_854_775_802;
-    assert_eq!(block_on(reader.seek(SeekFrom::Current(i64::min_value()))).ok(), Some(expected));
-    assert_eq!(run_fill_buf!(reader).ok().map(|s| s.len()), Some(5));
-    // seeking to 0 should empty the buffer.
-    assert_eq!(block_on(reader.seek(SeekFrom::Current(0))).ok(), Some(expected));
-    assert_eq!(reader.get_ref().get_ref().pos, expected);
+    block_on(async {
+        let reader = BufReader::with_capacity(5, AllowStdIo::new(PositionReader { pos: 0 }));
+        pin_mut!(reader);
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1, 2, 3, 4][..]);
+        assert_eq!(reader.seek(SeekFrom::End(-5)).await.unwrap(), u64::MAX - 5);
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap().len(), 5);
+        // the following seek will require two underlying seeks
+        let expected = 9_223_372_036_854_775_802;
+        assert_eq!(reader.seek(SeekFrom::Current(i64::MIN)).await.unwrap(), expected);
+        assert_eq!(reader.as_mut().fill_buf().await.unwrap().len(), 5);
+        // seeking to 0 should empty the buffer.
+        assert_eq!(reader.seek(SeekFrom::Current(0)).await.unwrap(), expected);
+        assert_eq!(reader.get_ref().get_ref().pos, expected);
+    });
 }
 
 #[test]
 fn test_short_reads() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncReadExt, AllowStdIo, BufReader};
-    use std::io;
-
     /// A dummy reader intended at testing short-reads propagation.
     struct ShortReader {
         lengths: Vec<usize>,
@@ -213,24 +296,22 @@
         }
     }
 
-    let inner = ShortReader { lengths: vec![0, 1, 2, 0, 1, 0] };
-    let mut reader = BufReader::new(AllowStdIo::new(inner));
-    let mut buf = [0, 0];
-    assert_eq!(block_on(reader.read(&mut buf)).unwrap(), 0);
-    assert_eq!(block_on(reader.read(&mut buf)).unwrap(), 1);
-    assert_eq!(block_on(reader.read(&mut buf)).unwrap(), 2);
-    assert_eq!(block_on(reader.read(&mut buf)).unwrap(), 0);
-    assert_eq!(block_on(reader.read(&mut buf)).unwrap(), 1);
-    assert_eq!(block_on(reader.read(&mut buf)).unwrap(), 0);
-    assert_eq!(block_on(reader.read(&mut buf)).unwrap(), 0);
+    block_on(async {
+        let inner = ShortReader { lengths: vec![0, 1, 2, 0, 1, 0] };
+        let mut reader = BufReader::new(AllowStdIo::new(inner));
+        let mut buf = [0, 0];
+        assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+        assert_eq!(reader.read(&mut buf).await.unwrap(), 1);
+        assert_eq!(reader.read(&mut buf).await.unwrap(), 2);
+        assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+        assert_eq!(reader.read(&mut buf).await.unwrap(), 1);
+        assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+        assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+    });
 }
 
 #[test]
 fn maybe_pending() {
-    use futures::io::{AsyncReadExt, BufReader};
-    use util::run;
-    use maybe_pending::MaybePending;
-
     let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
     let mut reader = BufReader::with_capacity(2, MaybePending::new(inner));
 
@@ -268,10 +349,6 @@
 
 #[test]
 fn maybe_pending_buf_read() {
-    use futures::io::{AsyncBufReadExt, BufReader};
-    use util::run;
-    use maybe_pending::MaybePending;
-
     let inner = MaybePending::new(&[0, 1, 2, 3, 1, 0]);
     let mut reader = BufReader::with_capacity(2, inner);
     let mut v = Vec::new();
@@ -291,68 +368,65 @@
 // https://github.com/rust-lang/futures-rs/pull/1573#discussion_r281162309
 #[test]
 fn maybe_pending_seek() {
-    use futures::io::{AsyncBufRead, AsyncSeek, AsyncSeekExt, AsyncRead, BufReader,
-        Cursor, SeekFrom
-    };
-    use futures::task::{Context,Poll};
-    use std::io;
-    use std::pin::Pin;
-    use util::run;
-    pub struct MaybePendingSeek<'a> {
+    #[pin_project]
+    struct MaybePendingSeek<'a> {
+        #[pin]
         inner: Cursor<&'a [u8]>,
         ready: bool,
     }
 
     impl<'a> MaybePendingSeek<'a> {
-        pub fn new(inner: &'a [u8]) -> Self {
+        fn new(inner: &'a [u8]) -> Self {
             Self { inner: Cursor::new(inner), ready: true }
         }
     }
 
     impl AsyncRead for MaybePendingSeek<'_> {
-        fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8])
-            -> Poll<io::Result<usize>>
-        {
-            Pin::new(&mut self.inner).poll_read(cx, buf)
+        fn poll_read(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &mut [u8],
+        ) -> Poll<io::Result<usize>> {
+            self.project().inner.poll_read(cx, buf)
         }
     }
 
     impl AsyncBufRead for MaybePendingSeek<'_> {
-        fn poll_fill_buf(mut self: Pin<&mut Self>, cx: &mut Context<'_>)
-            -> Poll<io::Result<&[u8]>>
-        {
-            let this: *mut Self = &mut *self as *mut _;
-            Pin::new(&mut unsafe { &mut *this }.inner).poll_fill_buf(cx)
+        fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
+            self.project().inner.poll_fill_buf(cx)
         }
 
-        fn consume(mut self: Pin<&mut Self>, amt: usize) {
-            Pin::new(&mut self.inner).consume(amt)
+        fn consume(self: Pin<&mut Self>, amt: usize) {
+            self.project().inner.consume(amt)
         }
     }
 
     impl AsyncSeek for MaybePendingSeek<'_> {
-        fn poll_seek(mut self: Pin<&mut Self>, cx: &mut Context<'_>, pos: SeekFrom)
-            -> Poll<io::Result<u64>>
-        {
+        fn poll_seek(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            pos: SeekFrom,
+        ) -> Poll<io::Result<u64>> {
             if self.ready {
-                self.ready = false;
-                Pin::new(&mut self.inner).poll_seek(cx, pos)
+                *self.as_mut().project().ready = false;
+                self.project().inner.poll_seek(cx, pos)
             } else {
-                self.ready = true;
+                *self.project().ready = true;
                 Poll::Pending
             }
         }
     }
 
     let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
-    let mut reader = BufReader::with_capacity(2, MaybePendingSeek::new(inner));
+    let reader = BufReader::with_capacity(2, MaybePendingSeek::new(inner));
+    pin_mut!(reader);
 
     assert_eq!(run(reader.seek(SeekFrom::Current(3))).ok(), Some(3));
-    assert_eq!(run_fill_buf!(reader).ok(), Some(&[0, 1][..]));
-    assert_eq!(run(reader.seek(SeekFrom::Current(i64::min_value()))).ok(), None);
-    assert_eq!(run_fill_buf!(reader).ok(), Some(&[0, 1][..]));
+    assert_eq!(run(reader.as_mut().fill_buf()).ok(), Some(&[0, 1][..]));
+    assert_eq!(run(reader.seek(SeekFrom::Current(i64::MIN))).ok(), None);
+    assert_eq!(run(reader.as_mut().fill_buf()).ok(), Some(&[0, 1][..]));
     assert_eq!(run(reader.seek(SeekFrom::Current(1))).ok(), Some(4));
-    assert_eq!(run_fill_buf!(reader).ok(), Some(&[1, 2][..]));
+    assert_eq!(run(reader.as_mut().fill_buf()).ok(), Some(&[1, 2][..]));
     Pin::new(&mut reader).consume(1);
     assert_eq!(run(reader.seek(SeekFrom::Current(-2))).ok(), Some(3));
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_buf_writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_buf_writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_buf_writer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_buf_writer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,67 +1,59 @@
-mod maybe_pending {
-    use futures::io::AsyncWrite;
-    use futures::task::{Context, Poll};
-    use std::io;
-    use std::pin::Pin;
+use futures::executor::block_on;
+use futures::future::{Future, FutureExt};
+use futures::io::{
+    AsyncSeek, AsyncSeekExt, AsyncWrite, AsyncWriteExt, BufWriter, Cursor, SeekFrom,
+};
+use futures::task::{Context, Poll};
+use futures_test::task::noop_context;
+use std::io;
+use std::pin::Pin;
 
-    pub struct MaybePending {
-        pub inner: Vec<u8>,
-        ready: bool,
-    }
+struct MaybePending {
+    inner: Vec<u8>,
+    ready: bool,
+}
 
-    impl MaybePending {
-        pub fn new(inner: Vec<u8>) -> Self {
-            Self { inner, ready: false }
-        }
+impl MaybePending {
+    fn new(inner: Vec<u8>) -> Self {
+        Self { inner, ready: false }
     }
+}
 
-    impl AsyncWrite for MaybePending {
-        fn poll_write(
-            mut self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-            buf: &[u8],
-        ) -> Poll<io::Result<usize>> {
-            if self.ready {
-                self.ready = false;
-                Pin::new(&mut self.inner).poll_write(cx, buf)
-            } else {
-                self.ready = true;
-                Poll::Pending
-            }
+impl AsyncWrite for MaybePending {
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
+        if self.ready {
+            self.ready = false;
+            Pin::new(&mut self.inner).poll_write(cx, buf)
+        } else {
+            self.ready = true;
+            Poll::Pending
         }
+    }
 
-        fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-            Pin::new(&mut self.inner).poll_flush(cx)
-        }
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Pin::new(&mut self.inner).poll_flush(cx)
+    }
 
-        fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-            Pin::new(&mut self.inner).poll_close(cx)
-        }
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Pin::new(&mut self.inner).poll_close(cx)
     }
 }
 
-mod util {
-    use futures::future::Future;
-
-    pub fn run<F: Future + Unpin>(mut f: F) -> F::Output {
-        use futures::future::FutureExt;
-        use futures::task::Poll;
-        use futures_test::task::noop_context;
-
-        let mut cx = noop_context();
-        loop {
-            if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
-                return x;
-            }
+fn run<F: Future + Unpin>(mut f: F) -> F::Output {
+    let mut cx = noop_context();
+    loop {
+        if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
+            return x;
         }
     }
 }
 
 #[test]
 fn buf_writer() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncWriteExt, BufWriter};
-
     let mut writer = BufWriter::with_capacity(2, Vec::new());
 
     block_on(writer.write(&[0, 1])).unwrap();
@@ -104,9 +96,6 @@
 
 #[test]
 fn buf_writer_inner_flushes() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncWriteExt, BufWriter};
-
     let mut w = BufWriter::with_capacity(3, Vec::new());
     block_on(w.write(&[0, 1])).unwrap();
     assert_eq!(*w.get_ref(), []);
@@ -117,9 +106,6 @@
 
 #[test]
 fn buf_writer_seek() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncSeekExt, AsyncWriteExt, BufWriter, Cursor, SeekFrom};
-
     // FIXME: when https://github.com/rust-lang/futures-rs/issues/1510 fixed,
     // use `Vec::new` instead of `vec![0; 8]`.
     let mut w = BufWriter::with_capacity(3, Cursor::new(vec![0; 8]));
@@ -135,11 +121,6 @@
 
 #[test]
 fn maybe_pending_buf_writer() {
-    use futures::io::{AsyncWriteExt, BufWriter};
-
-    use maybe_pending::MaybePending;
-    use util::run;
-
     let mut writer = BufWriter::with_capacity(2, MaybePending::new(Vec::new()));
 
     run(writer.write(&[0, 1])).unwrap();
@@ -182,11 +163,6 @@
 
 #[test]
 fn maybe_pending_buf_writer_inner_flushes() {
-    use futures::io::{AsyncWriteExt, BufWriter};
-
-    use maybe_pending::MaybePending;
-    use util::run;
-
     let mut w = BufWriter::with_capacity(3, MaybePending::new(Vec::new()));
     run(w.write(&[0, 1])).unwrap();
     assert_eq!(&w.get_ref().inner, &[]);
@@ -197,13 +173,6 @@
 
 #[test]
 fn maybe_pending_buf_writer_seek() {
-    use futures::io::{AsyncSeek, AsyncSeekExt, AsyncWrite, AsyncWriteExt, BufWriter, Cursor, SeekFrom};
-    use futures::task::{Context, Poll};
-    use std::io;
-    use std::pin::Pin;
-
-    use util::run;
-
     struct MaybePendingSeek {
         inner: Cursor<Vec<u8>>,
         ready_write: bool,
@@ -241,9 +210,11 @@
     }
 
     impl AsyncSeek for MaybePendingSeek {
-        fn poll_seek(mut self: Pin<&mut Self>, cx: &mut Context<'_>, pos: SeekFrom)
-            -> Poll<io::Result<u64>>
-        {
+        fn poll_seek(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            pos: SeekFrom,
+        ) -> Poll<io::Result<u64>> {
             if self.ready_seek {
                 self.ready_seek = false;
                 Pin::new(&mut self.inner).poll_seek(cx, pos)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_cursor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_cursor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_cursor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_cursor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,14 @@
+use assert_matches::assert_matches;
+use futures::executor::block_on;
+use futures::future::lazy;
+use futures::io::{AsyncWrite, Cursor};
+use futures::task::Poll;
+use std::pin::Pin;
+
 #[test]
 fn cursor_asyncwrite_vec() {
-    use assert_matches::assert_matches;
-    use futures::future::lazy;
-    use futures::io::{AsyncWrite, Cursor};
-    use futures::task::Poll;
-    use std::pin::Pin;
-
     let mut cursor = Cursor::new(vec![0; 5]);
-    futures::executor::block_on(lazy(|cx| {
+    block_on(lazy(|cx| {
         assert_matches!(Pin::new(&mut cursor).poll_write(cx, &[1, 2]), Poll::Ready(Ok(2)));
         assert_matches!(Pin::new(&mut cursor).poll_write(cx, &[3, 4]), Poll::Ready(Ok(2)));
         assert_matches!(Pin::new(&mut cursor).poll_write(cx, &[5, 6]), Poll::Ready(Ok(2)));
@@ -18,14 +19,8 @@
 
 #[test]
 fn cursor_asyncwrite_box() {
-    use assert_matches::assert_matches;
-    use futures::future::lazy;
-    use futures::io::{AsyncWrite, Cursor};
-    use futures::task::Poll;
-    use std::pin::Pin;
-
     let mut cursor = Cursor::new(vec![0; 5].into_boxed_slice());
-    futures::executor::block_on(lazy(|cx| {
+    block_on(lazy(|cx| {
         assert_matches!(Pin::new(&mut cursor).poll_write(cx, &[1, 2]), Poll::Ready(Ok(2)));
         assert_matches!(Pin::new(&mut cursor).poll_write(cx, &[3, 4]), Poll::Ready(Ok(2)));
         assert_matches!(Pin::new(&mut cursor).poll_write(cx, &[5, 6]), Poll::Ready(Ok(1)));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_lines.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_lines.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_lines.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_lines.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,32 +1,34 @@
-mod util {
-    use futures::future::Future;
-
-    pub fn run<F: Future + Unpin>(mut f: F) -> F::Output {
-        use futures_test::task::noop_context;
-        use futures::task::Poll;
-        use futures::future::FutureExt;
-
-        let mut cx = noop_context();
-        loop {
-            if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
-                return x;
-            }
+use futures::executor::block_on;
+use futures::future::{Future, FutureExt};
+use futures::io::{AsyncBufReadExt, Cursor};
+use futures::stream::{self, StreamExt, TryStreamExt};
+use futures::task::Poll;
+use futures_test::io::AsyncReadTestExt;
+use futures_test::task::noop_context;
+
+fn run<F: Future + Unpin>(mut f: F) -> F::Output {
+    let mut cx = noop_context();
+    loop {
+        if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
+            return x;
         }
     }
 }
 
+macro_rules! block_on_next {
+    ($expr:expr) => {
+        block_on($expr.next()).unwrap().unwrap()
+    };
+}
+
+macro_rules! run_next {
+    ($expr:expr) => {
+        run($expr.next()).unwrap().unwrap()
+    };
+}
+
 #[test]
 fn lines() {
-    use futures::executor::block_on;
-    use futures::stream::StreamExt;
-    use futures::io::{AsyncBufReadExt, Cursor};
-
-    macro_rules! block_on_next {
-        ($expr:expr) => {
-            block_on($expr.next()).unwrap().unwrap()
-        };
-    }
-
     let buf = Cursor::new(&b"12\r"[..]);
     let mut s = buf.lines();
     assert_eq!(block_on_next!(s), "12\r".to_string());
@@ -41,22 +43,8 @@
 
 #[test]
 fn maybe_pending() {
-    use futures::stream::{self, StreamExt, TryStreamExt};
-    use futures::io::AsyncBufReadExt;
-    use futures_test::io::AsyncReadTestExt;
-
-    use util::run;
-
-    macro_rules! run_next {
-        ($expr:expr) => {
-            run($expr.next()).unwrap().unwrap()
-        };
-    }
-
-    let buf = stream::iter(vec![&b"12"[..], &b"\r"[..]])
-        .map(Ok)
-        .into_async_read()
-        .interleave_pending();
+    let buf =
+        stream::iter(vec![&b"12"[..], &b"\r"[..]]).map(Ok).into_async_read().interleave_pending();
     let mut s = buf.lines();
     assert_eq!(run_next!(s), "12\r".to_string());
     assert!(run(s.next()).is_none());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_exact.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_exact.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_exact.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_exact.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
+use futures::executor::block_on;
+use futures::io::AsyncReadExt;
+
 #[test]
 fn read_exact() {
-    use futures::executor::block_on;
-    use futures::io::AsyncReadExt;
-
     let mut reader: &[u8] = &[1, 2, 3, 4, 5];
     let mut out = [0u8; 3];
 
     let res = block_on(reader.read_exact(&mut out)); // read 3 bytes out
     assert!(res.is_ok());
-    assert_eq!(out, [1,2,3]);
+    assert_eq!(out, [1, 2, 3]);
     assert_eq!(reader.len(), 2);
 
     let res = block_on(reader.read_exact(&mut out)); // read another 3 bytes, but only 2 bytes left
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,22 @@
+use futures::executor::block_on;
+use futures::future::{Future, FutureExt};
+use futures::io::{AsyncBufReadExt, Cursor};
+use futures::stream::{self, StreamExt, TryStreamExt};
+use futures::task::Poll;
+use futures_test::io::AsyncReadTestExt;
+use futures_test::task::noop_context;
+
+fn run<F: Future + Unpin>(mut f: F) -> F::Output {
+    let mut cx = noop_context();
+    loop {
+        if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
+            return x;
+        }
+    }
+}
+
 #[test]
 fn read_line() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncBufReadExt, Cursor};
-
     let mut buf = Cursor::new(b"12");
     let mut v = String::new();
     assert_eq!(block_on(buf.read_line(&mut v)).unwrap(), 2);
@@ -22,34 +36,13 @@
 
 #[test]
 fn maybe_pending() {
-    use futures::future::Future;
-
-    fn run<F: Future + Unpin>(mut f: F) -> F::Output {
-        use futures::future::FutureExt;
-        use futures::task::Poll;
-        use futures_test::task::noop_context;
-
-        let mut cx = noop_context();
-        loop {
-            if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
-                return x;
-            }
-        }
-    }
-
-    use futures::stream::{self, StreamExt, TryStreamExt};
-    use futures::io::AsyncBufReadExt;
-    use futures_test::io::AsyncReadTestExt;
-
     let mut buf = b"12".interleave_pending();
     let mut v = String::new();
     assert_eq!(run(buf.read_line(&mut v)).unwrap(), 2);
     assert_eq!(v, "12");
 
-    let mut buf = stream::iter(vec![&b"12"[..], &b"\n\n"[..]])
-        .map(Ok)
-        .into_async_read()
-        .interleave_pending();
+    let mut buf =
+        stream::iter(vec![&b"12"[..], &b"\n\n"[..]]).map(Ok).into_async_read().interleave_pending();
     let mut v = String::new();
     assert_eq!(run(buf.read_line(&mut v)).unwrap(), 3);
     assert_eq!(v, "12\n");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,27 +1,26 @@
-mod mock_reader {
-    use futures::io::AsyncRead;
-    use std::io;
-    use std::pin::Pin;
-    use std::task::{Context, Poll};
+use futures::io::AsyncRead;
+use futures_test::task::panic_context;
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
-    pub struct MockReader {
-        fun: Box<dyn FnMut(&mut [u8]) -> Poll<io::Result<usize>>>,
-    }
+struct MockReader {
+    fun: Box<dyn FnMut(&mut [u8]) -> Poll<io::Result<usize>>>,
+}
 
-    impl MockReader {
-        pub fn new(fun: impl FnMut(&mut [u8]) -> Poll<io::Result<usize>> + 'static) -> Self {
-            Self { fun: Box::new(fun) }
-        }
+impl MockReader {
+    fn new(fun: impl FnMut(&mut [u8]) -> Poll<io::Result<usize>> + 'static) -> Self {
+        Self { fun: Box::new(fun) }
     }
+}
 
-    impl AsyncRead for MockReader {
-        fn poll_read(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-            buf: &mut [u8]
-        ) -> Poll<io::Result<usize>> {
-            (self.get_mut().fun)(buf)
-        }
+impl AsyncRead for MockReader {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        _cx: &mut Context<'_>,
+        buf: &mut [u8],
+    ) -> Poll<io::Result<usize>> {
+        (self.get_mut().fun)(buf)
     }
 }
 
@@ -29,14 +28,6 @@
 /// calls `poll_read` with an empty slice if no buffers are provided.
 #[test]
 fn read_vectored_no_buffers() {
-    use futures::io::AsyncRead;
-    use futures_test::task::panic_context;
-    use std::io;
-    use std::pin::Pin;
-    use std::task::Poll;
-
-    use mock_reader::MockReader;
-
     let mut reader = MockReader::new(|buf| {
         assert_eq!(buf, b"");
         Err(io::ErrorKind::BrokenPipe.into()).into()
@@ -53,14 +44,6 @@
 /// calls `poll_read` with the first non-empty buffer.
 #[test]
 fn read_vectored_first_non_empty() {
-    use futures::io::AsyncRead;
-    use futures_test::task::panic_context;
-    use std::io;
-    use std::pin::Pin;
-    use std::task::Poll;
-
-    use mock_reader::MockReader;
-
     let mut reader = MockReader::new(|buf| {
         assert_eq!(buf.len(), 4);
         buf.copy_from_slice(b"four");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_to_end.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_to_end.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_to_end.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_to_end.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,65 @@
+use futures::{
+    executor::block_on,
+    io::{self, AsyncRead, AsyncReadExt},
+    task::{Context, Poll},
+};
+use std::pin::Pin;
+
+#[test]
+#[should_panic(expected = "assertion failed: n <= buf.len()")]
+fn issue2310() {
+    struct MyRead {
+        first: bool,
+    }
+
+    impl MyRead {
+        fn new() -> Self {
+            MyRead { first: false }
+        }
+    }
+
+    impl AsyncRead for MyRead {
+        fn poll_read(
+            mut self: Pin<&mut Self>,
+            _cx: &mut Context,
+            _buf: &mut [u8],
+        ) -> Poll<io::Result<usize>> {
+            Poll::Ready(if !self.first {
+                self.first = true;
+                // First iteration: return more than the buffer size
+                Ok(64)
+            } else {
+                // Second iteration: indicate that we are done
+                Ok(0)
+            })
+        }
+    }
+
+    struct VecWrapper {
+        inner: Vec<u8>,
+    }
+
+    impl VecWrapper {
+        fn new() -> Self {
+            VecWrapper { inner: Vec::new() }
+        }
+    }
+
+    impl Drop for VecWrapper {
+        fn drop(&mut self) {
+            // Observe uninitialized bytes
+            println!("{:?}", &self.inner);
+            // Overwrite heap contents
+            for b in &mut self.inner {
+                *b = 0x90;
+            }
+        }
+    }
+
+    block_on(async {
+        let mut vec = VecWrapper::new();
+        let mut read = MyRead::new();
+
+        read.read_to_end(&mut vec.inner).await.unwrap();
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_to_string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_to_string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_to_string.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_to_string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,13 @@
+use futures::executor::block_on;
+use futures::future::{Future, FutureExt};
+use futures::io::{AsyncReadExt, Cursor};
+use futures::stream::{self, StreamExt, TryStreamExt};
+use futures::task::Poll;
+use futures_test::io::AsyncReadTestExt;
+use futures_test::task::noop_context;
+
 #[test]
 fn read_to_string() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncReadExt, Cursor};
-
     let mut c = Cursor::new(&b""[..]);
     let mut v = String::new();
     assert_eq!(block_on(c.read_to_string(&mut v)).unwrap(), 0);
@@ -20,16 +25,7 @@
 
 #[test]
 fn interleave_pending() {
-    use futures::future::Future;
-    use futures::stream::{self, StreamExt, TryStreamExt};
-    use futures::io::AsyncReadExt;
-    use futures_test::io::AsyncReadTestExt;
-
     fn run<F: Future + Unpin>(mut f: F) -> F::Output {
-        use futures::future::FutureExt;
-        use futures_test::task::noop_context;
-        use futures::task::Poll;
-
         let mut cx = noop_context();
         loop {
             if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_until.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_until.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_read_until.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_read_until.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,22 @@
+use futures::executor::block_on;
+use futures::future::{Future, FutureExt};
+use futures::io::{AsyncBufReadExt, Cursor};
+use futures::stream::{self, StreamExt, TryStreamExt};
+use futures::task::Poll;
+use futures_test::io::AsyncReadTestExt;
+use futures_test::task::noop_context;
+
+fn run<F: Future + Unpin>(mut f: F) -> F::Output {
+    let mut cx = noop_context();
+    loop {
+        if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
+            return x;
+        }
+    }
+}
+
 #[test]
 fn read_until() {
-    use futures::executor::block_on;
-    use futures::io::{AsyncBufReadExt, Cursor};
-
     let mut buf = Cursor::new(b"12");
     let mut v = Vec::new();
     assert_eq!(block_on(buf.read_until(b'3', &mut v)).unwrap(), 2);
@@ -22,25 +36,6 @@
 
 #[test]
 fn maybe_pending() {
-    use futures::future::Future;
-
-    fn run<F: Future + Unpin>(mut f: F) -> F::Output {
-        use futures::future::FutureExt;
-        use futures_test::task::noop_context;
-        use futures::task::Poll;
-
-        let mut cx = noop_context();
-        loop {
-            if let Poll::Ready(x) = f.poll_unpin(&mut cx) {
-                return x;
-            }
-        }
-    }
-
-    use futures::stream::{self, StreamExt, TryStreamExt};
-    use futures::io::AsyncBufReadExt;
-    use futures_test::io::AsyncReadTestExt;
-
     let mut buf = b"12".interleave_pending();
     let mut v = Vec::new();
     assert_eq!(run(buf.read_until(b'3', &mut v)).unwrap(), 2);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_write.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_write.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/io_write.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/io_write.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,35 +1,34 @@
-mod mock_writer {
-    use futures::io::AsyncWrite;
-    use std::io;
-    use std::pin::Pin;
-    use std::task::{Context, Poll};
+use futures::io::AsyncWrite;
+use futures_test::task::panic_context;
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
-    pub struct MockWriter {
-        fun: Box<dyn FnMut(&[u8]) -> Poll<io::Result<usize>>>,
+struct MockWriter {
+    fun: Box<dyn FnMut(&[u8]) -> Poll<io::Result<usize>>>,
+}
+
+impl MockWriter {
+    fn new(fun: impl FnMut(&[u8]) -> Poll<io::Result<usize>> + 'static) -> Self {
+        Self { fun: Box::new(fun) }
+    }
+}
+
+impl AsyncWrite for MockWriter {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        _cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
+        (self.get_mut().fun)(buf)
     }
 
-    impl MockWriter {
-        pub fn new(fun: impl FnMut(&[u8]) -> Poll<io::Result<usize>> + 'static) -> Self {
-            Self { fun: Box::new(fun) }
-        }
+    fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        panic!()
     }
 
-    impl AsyncWrite for MockWriter {
-        fn poll_write(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-            buf: &[u8],
-        ) -> Poll<io::Result<usize>> {
-            (self.get_mut().fun)(buf)
-        }
-
-        fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-            panic!()
-        }
-
-        fn poll_close(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-            panic!()
-        }
+    fn poll_close(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        panic!()
     }
 }
 
@@ -37,14 +36,6 @@
 /// calls `poll_write` with an empty slice if no buffers are provided.
 #[test]
 fn write_vectored_no_buffers() {
-    use futures::io::AsyncWrite;
-    use futures_test::task::panic_context;
-    use std::io;
-    use std::pin::Pin;
-    use std::task::Poll;
-
-    use mock_writer::MockWriter;
-
     let mut writer = MockWriter::new(|buf| {
         assert_eq!(buf, b"");
         Err(io::ErrorKind::BrokenPipe.into()).into()
@@ -61,24 +52,12 @@
 /// calls `poll_write` with the first non-empty buffer.
 #[test]
 fn write_vectored_first_non_empty() {
-    use futures::io::AsyncWrite;
-    use futures_test::task::panic_context;
-    use std::io;
-    use std::pin::Pin;
-    use std::task::Poll;
-
-    use mock_writer::MockWriter;
-
     let mut writer = MockWriter::new(|buf| {
         assert_eq!(buf, b"four");
         Poll::Ready(Ok(4))
     });
     let cx = &mut panic_context();
-    let bufs = &mut [
-        io::IoSlice::new(&[]),
-        io::IoSlice::new(&[]),
-        io::IoSlice::new(b"four")
-    ];
+    let bufs = &mut [io::IoSlice::new(&[]), io::IoSlice::new(&[]), io::IoSlice::new(b"four")];
 
     let res = Pin::new(&mut writer).poll_write_vectored(cx, bufs);
     let res = res.map_err(|e| e.kind());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/join_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/join_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/join_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/join_all.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-mod util {
-    use std::future::Future;
-    use std::fmt::Debug;
-
-    pub fn assert_done<T, F>(actual_fut: F, expected: T)
-    where
-        T: PartialEq + Debug,
-        F: FnOnce() -> Box<dyn Future<Output = T> + Unpin>,
-    {
-        use futures::executor::block_on;
-
-        let output = block_on(actual_fut());
-        assert_eq!(output, expected);
-    }
-}
-
-#[test]
-fn collect_collects() {
-    use futures_util::future::{join_all,ready};
-
-    util::assert_done(|| Box::new(join_all(vec![ready(1), ready(2)])), vec![1, 2]);
-    util::assert_done(|| Box::new(join_all(vec![ready(1)])), vec![1]);
-    // REVIEW: should this be implemented?
-    // assert_done(|| Box::new(join_all(Vec::<i32>::new())), vec![]);
-
-    // TODO: needs more tests
-}
-
-#[test]
-fn join_all_iter_lifetime() {
-    use futures_util::future::{join_all,ready};
-    use std::future::Future;
-    // In futures-rs version 0.1, this function would fail to typecheck due to an overly
-    // conservative type parameterization of `JoinAll`.
-    fn sizes(bufs: Vec<&[u8]>) -> Box<dyn Future<Output = Vec<usize>> + Unpin> {
-        let iter = bufs.into_iter().map(|b| ready::<usize>(b.len()));
-        Box::new(join_all(iter))
-    }
-
-    util::assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), vec![3_usize, 0, 1]);
-}
-
-#[test]
-fn join_all_from_iter() {
-    use futures_util::future::{JoinAll,ready};
-
-    util::assert_done(
-        || Box::new(vec![ready(1), ready(2)].into_iter().collect::<JoinAll<_>>()),
-        vec![1, 2],
-    )
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/lock_mutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/lock_mutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/lock_mutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/lock_mutex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,66 @@
+use futures::channel::mpsc;
+use futures::executor::{block_on, ThreadPool};
+use futures::future::{ready, FutureExt};
+use futures::lock::Mutex;
+use futures::stream::StreamExt;
+use futures::task::{Context, SpawnExt};
+use futures_test::future::FutureTestExt;
+use futures_test::task::{new_count_waker, panic_context};
+use std::sync::Arc;
+
+#[test]
+fn mutex_acquire_uncontested() {
+    let mutex = Mutex::new(());
+    for _ in 0..10 {
+        assert!(mutex.lock().poll_unpin(&mut panic_context()).is_ready());
+    }
+}
+
+#[test]
+fn mutex_wakes_waiters() {
+    let mutex = Mutex::new(());
+    let (waker, counter) = new_count_waker();
+    let lock = mutex.lock().poll_unpin(&mut panic_context());
+    assert!(lock.is_ready());
+
+    let mut cx = Context::from_waker(&waker);
+    let mut waiter = mutex.lock();
+    assert!(waiter.poll_unpin(&mut cx).is_pending());
+    assert_eq!(counter, 0);
+
+    drop(lock);
+
+    assert_eq!(counter, 1);
+    assert!(waiter.poll_unpin(&mut panic_context()).is_ready());
+}
+
+#[test]
+fn mutex_contested() {
+    let (tx, mut rx) = mpsc::unbounded();
+    let pool = ThreadPool::builder().pool_size(16).create().unwrap();
+
+    let tx = Arc::new(tx);
+    let mutex = Arc::new(Mutex::new(0));
+
+    let num_tasks = 1000;
+    for _ in 0..num_tasks {
+        let tx = tx.clone();
+        let mutex = mutex.clone();
+        pool.spawn(async move {
+            let mut lock = mutex.lock().await;
+            ready(()).pending_once().await;
+            *lock += 1;
+            tx.unbounded_send(()).unwrap();
+            drop(lock);
+        })
+        .unwrap();
+    }
+
+    block_on(async {
+        for _ in 0..num_tasks {
+            rx.next().await.unwrap();
+        }
+        let lock = mutex.lock().await;
+        assert_eq!(num_tasks, *lock);
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/macro_comma_support.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/macro_comma_support.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/macro_comma_support.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/macro_comma_support.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,13 @@
+use futures::{
+    executor::block_on,
+    future::{self, FutureExt},
+    join, ready,
+    task::Poll,
+    try_join,
+};
+
 #[test]
 fn ready() {
-    use futures::{
-        executor::block_on,
-        future,
-        task::Poll,
-        ready,
-    };
-
     block_on(future::poll_fn(|_| {
         ready!(Poll::Ready(()),);
         Poll::Ready(())
@@ -15,11 +16,7 @@
 
 #[test]
 fn poll() {
-    use futures::{
-        executor::block_on,
-        future::FutureExt,
-        poll,
-    };
+    use futures::poll;
 
     block_on(async {
         let _ = poll!(async {}.boxed(),);
@@ -28,11 +25,6 @@
 
 #[test]
 fn join() {
-    use futures::{
-        executor::block_on,
-        join
-    };
-
     block_on(async {
         let future1 = async { 1 };
         let future2 = async { 2 };
@@ -42,12 +34,6 @@
 
 #[test]
 fn try_join() {
-    use futures::{
-        executor::block_on,
-        future::FutureExt,
-        try_join,
-    };
-
     block_on(async {
         let future1 = async { 1 }.never_error();
         let future2 = async { 2 }.never_error();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/mutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/mutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/mutex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/mutex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-#[test]
-fn mutex_acquire_uncontested() {
-    use futures::future::FutureExt;
-    use futures::lock::Mutex;
-    use futures_test::task::panic_context;
-
-    let mutex = Mutex::new(());
-    for _ in 0..10 {
-        assert!(mutex.lock().poll_unpin(&mut panic_context()).is_ready());
-    }
-}
-
-#[test]
-fn mutex_wakes_waiters() {
-    use futures::future::FutureExt;
-    use futures::lock::Mutex;
-    use futures::task::Context;
-    use futures_test::task::{new_count_waker, panic_context};
-
-    let mutex = Mutex::new(());
-    let (waker, counter) = new_count_waker();
-    let lock = mutex.lock().poll_unpin(&mut panic_context());
-    assert!(lock.is_ready());
-
-    let mut cx = Context::from_waker(&waker);
-    let mut waiter = mutex.lock();
-    assert!(waiter.poll_unpin(&mut cx).is_pending());
-    assert_eq!(counter, 0);
-
-    drop(lock);
-
-    assert_eq!(counter, 1);
-    assert!(waiter.poll_unpin(&mut panic_context()).is_ready());
-}
-
-#[test]
-fn mutex_contested() {
-    use futures::channel::mpsc;
-    use futures::executor::block_on;
-    use futures::future::ready;
-    use futures::lock::Mutex;
-    use futures::stream::StreamExt;
-    use futures::task::SpawnExt;
-    use futures_test::future::FutureTestExt;
-    use std::sync::Arc;
-
-    let (tx, mut rx) = mpsc::unbounded();
-    let pool = futures::executor::ThreadPool::builder()
-        .pool_size(16)
-        .create()
-        .unwrap();
-
-    let tx = Arc::new(tx);
-    let mutex = Arc::new(Mutex::new(0));
-
-    let num_tasks = 1000;
-    for _ in 0..num_tasks {
-        let tx = tx.clone();
-        let mutex = mutex.clone();
-        pool.spawn(async move {
-            let mut lock = mutex.lock().await;
-            ready(()).pending_once().await;
-            *lock += 1;
-            tx.unbounded_send(()).unwrap();
-            drop(lock);
-        })
-        .unwrap();
-    }
-
-    block_on(async {
-        for _ in 0..num_tasks {
-            rx.next().await.unwrap();
-        }
-        let lock = mutex.lock().await;
-        assert_eq!(num_tasks, *lock);
-    })
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/oneshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/oneshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/oneshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/oneshot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
+use futures::channel::oneshot;
+use futures::future::{FutureExt, TryFutureExt};
+use futures_test::future::FutureTestExt;
+use std::sync::mpsc;
+use std::thread;
+
 #[test]
 fn oneshot_send1() {
-    use futures::channel::oneshot;
-    use futures::future::TryFutureExt;
-    use futures_test::future::FutureTestExt;
-    use std::sync::mpsc;
-    use std::thread;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (tx2, rx2) = mpsc::channel();
 
@@ -17,12 +17,6 @@
 
 #[test]
 fn oneshot_send2() {
-    use futures::channel::oneshot;
-    use futures::future::TryFutureExt;
-    use futures_test::future::FutureTestExt;
-    use std::sync::mpsc;
-    use std::thread;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (tx2, rx2) = mpsc::channel();
 
@@ -33,12 +27,6 @@
 
 #[test]
 fn oneshot_send3() {
-    use futures::channel::oneshot;
-    use futures::future::TryFutureExt;
-    use futures_test::future::FutureTestExt;
-    use std::sync::mpsc;
-    use std::thread;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (tx2, rx2) = mpsc::channel();
 
@@ -49,11 +37,6 @@
 
 #[test]
 fn oneshot_drop_tx1() {
-    use futures::channel::oneshot;
-    use futures::future::FutureExt;
-    use futures_test::future::FutureTestExt;
-    use std::sync::mpsc;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (tx2, rx2) = mpsc::channel();
 
@@ -65,12 +48,6 @@
 
 #[test]
 fn oneshot_drop_tx2() {
-    use futures::channel::oneshot;
-    use futures::future::FutureExt;
-    use futures_test::future::FutureTestExt;
-    use std::sync::mpsc;
-    use std::thread;
-
     let (tx1, rx1) = oneshot::channel::<i32>();
     let (tx2, rx2) = mpsc::channel();
 
@@ -83,9 +60,19 @@
 
 #[test]
 fn oneshot_drop_rx() {
-    use futures::channel::oneshot;
-
     let (tx, rx) = oneshot::channel::<i32>();
     drop(rx);
     assert_eq!(Err(2), tx.send(2));
 }
+
+#[test]
+fn oneshot_debug() {
+    let (tx, rx) = oneshot::channel::<i32>();
+    assert_eq!(format!("{:?}", tx), "Sender { complete: false }");
+    assert_eq!(format!("{:?}", rx), "Receiver { complete: false }");
+    drop(rx);
+    assert_eq!(format!("{:?}", tx), "Sender { complete: true }");
+    let (tx, rx) = oneshot::channel::<i32>();
+    drop(tx);
+    assert_eq!(format!("{:?}", rx), "Receiver { complete: true }");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/ready_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/ready_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/ready_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/ready_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,15 @@
-mod assert_send_sync {
-    use futures::stream::FuturesUnordered;
-
-    pub trait AssertSendSync: Send + Sync {}
-    impl AssertSendSync for FuturesUnordered<()> {}
-}
+use futures::channel::oneshot;
+use futures::executor::{block_on, block_on_stream};
+use futures::future;
+use futures::stream::{FuturesUnordered, StreamExt};
+use futures::task::Poll;
+use futures_test::task::noop_context;
+use std::panic::{self, AssertUnwindSafe};
+use std::sync::{Arc, Barrier};
+use std::thread;
 
 #[test]
 fn basic_usage() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future;
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures::task::Poll;
-
     block_on(future::lazy(move |cx| {
         let mut queue = FuturesUnordered::new();
         let (tx1, rx1) = oneshot::channel();
@@ -41,12 +38,6 @@
 
 #[test]
 fn resolving_errors() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future;
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures::task::Poll;
-
     block_on(future::lazy(move |cx| {
         let mut queue = FuturesUnordered::new();
         let (tx1, rx1) = oneshot::channel();
@@ -75,12 +66,6 @@
 
 #[test]
 fn dropping_ready_queue() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future;
-    use futures::stream::FuturesUnordered;
-    use futures_test::task::noop_context;
-
     block_on(future::lazy(move |_| {
         let queue = FuturesUnordered::new();
         let (mut tx1, rx1) = oneshot::channel::<()>();
@@ -108,12 +93,6 @@
 
 #[test]
 fn stress() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on_stream;
-    use futures::stream::FuturesUnordered;
-    use std::sync::{Arc, Barrier};
-    use std::thread;
-
     const ITER: usize = 300;
 
     for i in 0..ITER {
@@ -157,12 +136,6 @@
 
 #[test]
 fn panicking_future_dropped() {
-    use futures::executor::block_on;
-    use futures::future;
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures::task::Poll;
-    use std::panic::{self, AssertUnwindSafe};
-
     block_on(future::lazy(move |cx| {
         let mut queue = FuturesUnordered::new();
         queue.push(future::poll_fn(|_| -> Poll<Result<i32, i32>> { panic!() }));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/recurse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/recurse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/recurse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/recurse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,14 @@
+use futures::executor::block_on;
+use futures::future::{self, BoxFuture, FutureExt};
+use std::sync::mpsc;
+use std::thread;
+
 #[test]
 fn lots() {
-    use futures::executor::block_on;
-    use futures::future::{self, FutureExt, BoxFuture};
-    use std::sync::mpsc;
-    use std::thread;
+    #[cfg(not(futures_sanitizer))]
+    const N: i32 = 1_000;
+    #[cfg(futures_sanitizer)] // If N is many, asan reports stack-overflow: https://gist.github.com/taiki-e/099446d21cbec69d4acbacf7a9646136
+    const N: i32 = 100;
 
     fn do_it(input: (i32, i32)) -> BoxFuture<'static, i32> {
         let (n, x) = input;
@@ -15,8 +20,6 @@
     }
 
     let (tx, rx) = mpsc::channel();
-    thread::spawn(|| {
-        block_on(do_it((1_000, 0)).map(move |x| tx.send(x).unwrap()))
-    });
-    assert_eq!(500_500, rx.recv().unwrap());
+    thread::spawn(|| block_on(do_it((N, 0)).map(move |x| tx.send(x).unwrap())));
+    assert_eq!((0..=N).sum::<i32>(), rx.recv().unwrap());
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/_require_features.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/_require_features.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/_require_features.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/_require_features.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,13 @@
 #[cfg(not(all(
-    feature = "std", feature = "alloc", feature = "async-await",
-    feature = "compat", feature = "io-compat",
-    feature = "executor", feature = "thread-pool",
+    feature = "std",
+    feature = "alloc",
+    feature = "async-await",
+    feature = "compat",
+    feature = "io-compat",
+    feature = "executor",
+    feature = "thread-pool",
 )))]
-compile_error!("`futures` tests must have all stable features activated: \
+compile_error!(
+    "`futures` tests must have all stable features activated: \
     use `--all-features` or `--features default,thread-pool,io-compat`"
 );
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/select_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/select_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/select_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/select_all.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#[test]
-fn smoke() {
-    use futures::executor::block_on;
-    use futures::future::{ready, select_all};
-    use std::collections::HashSet;
-
-    let v = vec![
-        ready(1),
-        ready(2),
-        ready(3),
-    ];
-
-    let mut c = vec![1, 2, 3].into_iter().collect::<HashSet<_>>();
-
-    let (i, idx, v) = block_on(select_all(v));
-    assert!(c.remove(&i));
-    assert_eq!(idx, 0);
-
-    let (i, idx, v) = block_on(select_all(v));
-    assert!(c.remove(&i));
-    assert_eq!(idx, 0);
-
-    let (i, idx, v) = block_on(select_all(v));
-    assert!(c.remove(&i));
-    assert_eq!(idx, 0);
-
-    assert!(c.is_empty());
-    assert!(v.is_empty());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/select_ok.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/select_ok.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/select_ok.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/select_ok.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-#[test]
-fn ignore_err() {
-    use futures::executor::block_on;
-    use futures::future::{err, ok, select_ok};
-
-    let v = vec![
-        err(1),
-        err(2),
-        ok(3),
-        ok(4),
-    ];
-
-    let (i, v) = block_on(select_ok(v)).ok().unwrap();
-    assert_eq!(i, 3);
-
-    assert_eq!(v.len(), 1);
-
-    let (i, v) = block_on(select_ok(v)).ok().unwrap();
-    assert_eq!(i, 4);
-
-    assert!(v.is_empty());
-}
-
-#[test]
-fn last_err() {
-    use futures::executor::block_on;
-    use futures::future::{err, ok, select_ok};
-
-    let v = vec![
-        ok(1),
-        err(2),
-        err(3),
-    ];
-
-    let (i, v) = block_on(select_ok(v)).ok().unwrap();
-    assert_eq!(i, 1);
-
-    assert_eq!(v.len(), 2);
-
-    let i = block_on(select_ok(v)).err().unwrap();
-    assert_eq!(i, 3);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/shared.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/shared.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/shared.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/shared.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,240 +0,0 @@
-mod count_clone {
-    use std::cell::Cell;
-    use std::rc::Rc;
-
-    pub struct CountClone(pub Rc<Cell<i32>>);
-
-    impl Clone for CountClone {
-        fn clone(&self) -> Self {
-            self.0.set(self.0.get() + 1);
-            Self(self.0.clone())
-        }
-    }
-}
-
-fn send_shared_oneshot_and_wait_on_multiple_threads(threads_number: u32) {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-    use std::thread;
-    let (tx, rx) = oneshot::channel::<i32>();
-    let f = rx.shared();
-    let join_handles = (0..threads_number)
-        .map(|_| {
-            let cloned_future = f.clone();
-            thread::spawn(move || {
-                assert_eq!(block_on(cloned_future).unwrap(), 6);
-            })
-        })
-        .collect::<Vec<_>>();
-
-    tx.send(6).unwrap();
-
-    assert_eq!(block_on(f).unwrap(), 6);
-    for join_handle in join_handles {
-        join_handle.join().unwrap();
-    }
-}
-
-#[test]
-fn one_thread() {
-    send_shared_oneshot_and_wait_on_multiple_threads(1);
-}
-
-#[test]
-fn two_threads() {
-    send_shared_oneshot_and_wait_on_multiple_threads(2);
-}
-
-#[test]
-fn many_threads() {
-    send_shared_oneshot_and_wait_on_multiple_threads(1000);
-}
-
-#[test]
-fn drop_on_one_task_ok() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::{self, FutureExt, TryFutureExt};
-    use std::thread;
-
-    let (tx, rx) = oneshot::channel::<u32>();
-    let f1 = rx.shared();
-    let f2 = f1.clone();
-
-    let (tx2, rx2) = oneshot::channel::<u32>();
-
-    let t1 = thread::spawn(|| {
-        let f = future::try_select(f1.map_err(|_| ()), rx2.map_err(|_| ()));
-        drop(block_on(f));
-    });
-
-    let (tx3, rx3) = oneshot::channel::<u32>();
-
-    let t2 = thread::spawn(|| {
-        let _ = block_on(f2.map_ok(|x| tx3.send(x).unwrap()).map_err(|_| ()));
-    });
-
-    tx2.send(11).unwrap(); // cancel `f1`
-    t1.join().unwrap();
-
-    tx.send(42).unwrap(); // Should cause `f2` and then `rx3` to get resolved.
-    let result = block_on(rx3).unwrap();
-    assert_eq!(result, 42);
-    t2.join().unwrap();
-}
-
-#[test]
-fn drop_in_poll() {
-    use futures::executor::block_on;
-    use futures::future::{self, FutureExt, LocalFutureObj};
-    use std::cell::RefCell;
-    use std::rc::Rc;
-
-    let slot1 = Rc::new(RefCell::new(None));
-    let slot2 = slot1.clone();
-
-    let future1 = future::lazy(move |_| {
-        slot2.replace(None); // Drop future
-        1
-    })
-    .shared();
-
-    let future2 = LocalFutureObj::new(Box::new(future1.clone()));
-    slot1.replace(Some(future2));
-
-    assert_eq!(block_on(future1), 1);
-}
-
-#[test]
-fn peek() {
-    use futures::channel::oneshot;
-    use futures::executor::LocalPool;
-    use futures::future::{FutureExt, LocalFutureObj};
-    use futures::task::LocalSpawn;
-
-    let mut local_pool = LocalPool::new();
-    let spawn = &mut local_pool.spawner();
-
-    let (tx0, rx0) = oneshot::channel::<i32>();
-    let f1 = rx0.shared();
-    let f2 = f1.clone();
-
-    // Repeated calls on the original or clone do not change the outcome.
-    for _ in 0..2 {
-        assert!(f1.peek().is_none());
-        assert!(f2.peek().is_none());
-    }
-
-    // Completing the underlying future has no effect, because the value has not been `poll`ed in.
-    tx0.send(42).unwrap();
-    for _ in 0..2 {
-        assert!(f1.peek().is_none());
-        assert!(f2.peek().is_none());
-    }
-
-    // Once the Shared has been polled, the value is peekable on the clone.
-    spawn
-        .spawn_local_obj(LocalFutureObj::new(Box::new(f1.map(|_| ()))))
-        .unwrap();
-    local_pool.run();
-    for _ in 0..2 {
-        assert_eq!(*f2.peek().unwrap(), Ok(42));
-    }
-}
-
-#[test]
-fn downgrade() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-
-    let (tx, rx) = oneshot::channel::<i32>();
-    let shared = rx.shared();
-    // Since there are outstanding `Shared`s, we can get a `WeakShared`.
-    let weak = shared.downgrade().unwrap();
-    // It should upgrade fine right now.
-    let mut shared2 = weak.upgrade().unwrap();
-
-    tx.send(42).unwrap();
-    assert_eq!(block_on(shared).unwrap(), 42);
-
-    // We should still be able to get a new `WeakShared` and upgrade it
-    // because `shared2` is outstanding.
-    assert!(shared2.downgrade().is_some());
-    assert!(weak.upgrade().is_some());
-
-    assert_eq!(block_on(&mut shared2).unwrap(), 42);
-    // Now that all `Shared`s have been exhausted, we should not be able
-    // to get a new `WeakShared` or upgrade an existing one.
-    assert!(weak.upgrade().is_none());
-    assert!(shared2.downgrade().is_none());
-}
-
-#[test]
-fn dont_clone_in_single_owner_shared_future() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-    use std::cell::Cell;
-    use std::rc::Rc;
-
-    use count_clone::CountClone;
-
-    let counter = CountClone(Rc::new(Cell::new(0)));
-    let (tx, rx) = oneshot::channel();
-
-    let rx = rx.shared();
-
-    tx.send(counter).ok().unwrap();
-
-    assert_eq!(block_on(rx).unwrap().0.get(), 0);
-}
-
-#[test]
-fn dont_do_unnecessary_clones_on_output() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-    use std::cell::Cell;
-    use std::rc::Rc;
-
-    use count_clone::CountClone;
-
-    let counter = CountClone(Rc::new(Cell::new(0)));
-    let (tx, rx) = oneshot::channel();
-
-    let rx = rx.shared();
-
-    tx.send(counter).ok().unwrap();
-
-    assert_eq!(block_on(rx.clone()).unwrap().0.get(), 1);
-    assert_eq!(block_on(rx.clone()).unwrap().0.get(), 2);
-    assert_eq!(block_on(rx).unwrap().0.get(), 2);
-}
-
-#[test]
-fn shared_future_that_wakes_itself_until_pending_is_returned() {
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-    use std::cell::Cell;
-    use std::task::Poll;
-
-    let proceed = Cell::new(false);
-    let fut = futures::future::poll_fn(|cx| {
-        if proceed.get() {
-            Poll::Ready(())
-        } else {
-            cx.waker().wake_by_ref();
-            Poll::Pending
-        }
-    })
-    .shared();
-
-    // The join future can only complete if the second future gets a chance to run after the first
-    // has returned pending
-    assert_eq!(
-        block_on(futures::future::join(fut, async { proceed.set(true) })),
-        ((), ())
-    );
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/sink_fanout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/sink_fanout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/sink_fanout.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/sink_fanout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
+use futures::channel::mpsc;
+use futures::executor::block_on;
+use futures::future::join3;
+use futures::sink::SinkExt;
+use futures::stream::{self, StreamExt};
+
 #[test]
 fn it_works() {
-    use futures::channel::mpsc;
-    use futures::executor::block_on;
-    use futures::future::join3;
-    use futures::sink::SinkExt;
-    use futures::stream::{self, StreamExt};
-
     let (tx1, rx1) = mpsc::channel(1);
     let (tx2, rx2) = mpsc::channel(2);
     let tx = tx1.fanout(tx2).sink_map_err(|_| ());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/sink.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/sink.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/sink.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/sink.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,264 +1,221 @@
-mod sassert_next {
-    use futures::stream::{Stream, StreamExt};
-    use futures::task::Poll;
-    use futures_test::task::panic_context;
-    use std::fmt;
-
-    pub fn sassert_next<S>(s: &mut S, item: S::Item)
-    where
-        S: Stream + Unpin,
-        S::Item: Eq + fmt::Debug,
-    {
-        match s.poll_next_unpin(&mut panic_context()) {
-            Poll::Ready(None) => panic!("stream is at its end"),
-            Poll::Ready(Some(e)) => assert_eq!(e, item),
-            Poll::Pending => panic!("stream wasn't ready"),
-        }
+use futures::channel::{mpsc, oneshot};
+use futures::executor::block_on;
+use futures::future::{self, poll_fn, Future, FutureExt, TryFutureExt};
+use futures::never::Never;
+use futures::ready;
+use futures::sink::{self, Sink, SinkErrInto, SinkExt};
+use futures::stream::{self, Stream, StreamExt};
+use futures::task::{self, ArcWake, Context, Poll, Waker};
+use futures_test::task::panic_context;
+use std::cell::{Cell, RefCell};
+use std::collections::VecDeque;
+use std::fmt;
+use std::mem;
+use std::pin::Pin;
+use std::rc::Rc;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+
+fn sassert_next<S>(s: &mut S, item: S::Item)
+where
+    S: Stream + Unpin,
+    S::Item: Eq + fmt::Debug,
+{
+    match s.poll_next_unpin(&mut panic_context()) {
+        Poll::Ready(None) => panic!("stream is at its end"),
+        Poll::Ready(Some(e)) => assert_eq!(e, item),
+        Poll::Pending => panic!("stream wasn't ready"),
     }
 }
 
-mod unwrap {
-    use futures::task::Poll;
-    use std::fmt;
-
-    pub fn unwrap<T, E: fmt::Debug>(x: Poll<Result<T, E>>) -> T {
-        match x {
-            Poll::Ready(Ok(x)) => x,
-            Poll::Ready(Err(_)) => panic!("Poll::Ready(Err(_))"),
-            Poll::Pending => panic!("Poll::Pending"),
-        }
+fn unwrap<T, E: fmt::Debug>(x: Poll<Result<T, E>>) -> T {
+    match x {
+        Poll::Ready(Ok(x)) => x,
+        Poll::Ready(Err(_)) => panic!("Poll::Ready(Err(_))"),
+        Poll::Pending => panic!("Poll::Pending"),
     }
 }
 
-mod flag_cx {
-    use futures::task::{self, ArcWake, Context};
-    use std::sync::Arc;
-    use std::sync::atomic::{AtomicBool, Ordering};
-
-    // An Unpark struct that records unpark events for inspection
-    pub struct Flag(AtomicBool);
-
-    impl Flag {
-        pub fn new() -> Arc<Self> {
-            Arc::new(Self(AtomicBool::new(false)))
-        }
+// An Unpark struct that records unpark events for inspection
+struct Flag(AtomicBool);
 
-        pub fn take(&self) -> bool {
-            self.0.swap(false, Ordering::SeqCst)
-        }
+impl Flag {
+    fn new() -> Arc<Self> {
+        Arc::new(Self(AtomicBool::new(false)))
+    }
 
-        pub fn set(&self, v: bool) {
-            self.0.store(v, Ordering::SeqCst)
-        }
+    fn take(&self) -> bool {
+        self.0.swap(false, Ordering::SeqCst)
     }
 
-    impl ArcWake for Flag {
-        fn wake_by_ref(arc_self: &Arc<Self>) {
-            arc_self.set(true)
-        }
+    fn set(&self, v: bool) {
+        self.0.store(v, Ordering::SeqCst)
     }
+}
 
-    pub fn flag_cx<F, R>(f: F) -> R
-    where
-        F: FnOnce(Arc<Flag>, &mut Context<'_>) -> R,
-    {
-        let flag = Flag::new();
-        let waker = task::waker_ref(&flag);
-        let cx = &mut Context::from_waker(&waker);
-        f(flag.clone(), cx)
+impl ArcWake for Flag {
+    fn wake_by_ref(arc_self: &Arc<Self>) {
+        arc_self.set(true)
     }
 }
 
-mod start_send_fut {
-    use futures::future::Future;
-    use futures::ready;
-    use futures::sink::Sink;
-    use futures::task::{Context, Poll};
-    use std::pin::Pin;
-
-    // Sends a value on an i32 channel sink
-    pub struct StartSendFut<S: Sink<Item> + Unpin, Item: Unpin>(Option<S>, Option<Item>);
-
-    impl<S: Sink<Item> + Unpin, Item: Unpin> StartSendFut<S, Item> {
-        pub fn new(sink: S, item: Item) -> Self {
-            Self(Some(sink), Some(item))
-        }
+fn flag_cx<F, R>(f: F) -> R
+where
+    F: FnOnce(Arc<Flag>, &mut Context<'_>) -> R,
+{
+    let flag = Flag::new();
+    let waker = task::waker_ref(&flag);
+    let cx = &mut Context::from_waker(&waker);
+    f(flag.clone(), cx)
+}
+
+// Sends a value on an i32 channel sink
+struct StartSendFut<S: Sink<Item> + Unpin, Item: Unpin>(Option<S>, Option<Item>);
+
+impl<S: Sink<Item> + Unpin, Item: Unpin> StartSendFut<S, Item> {
+    fn new(sink: S, item: Item) -> Self {
+        Self(Some(sink), Some(item))
     }
+}
 
-    impl<S: Sink<Item> + Unpin, Item: Unpin> Future for StartSendFut<S, Item> {
-        type Output = Result<S, S::Error>;
+impl<S: Sink<Item> + Unpin, Item: Unpin> Future for StartSendFut<S, Item> {
+    type Output = Result<S, S::Error>;
 
-        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-            let Self(inner, item) = self.get_mut();
-            {
-                let mut inner = inner.as_mut().unwrap();
-                ready!(Pin::new(&mut inner).poll_ready(cx))?;
-                Pin::new(&mut inner).start_send(item.take().unwrap())?;
-            }
-            Poll::Ready(Ok(inner.take().unwrap()))
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let Self(inner, item) = self.get_mut();
+        {
+            let mut inner = inner.as_mut().unwrap();
+            ready!(Pin::new(&mut inner).poll_ready(cx))?;
+            Pin::new(&mut inner).start_send(item.take().unwrap())?;
         }
+        Poll::Ready(Ok(inner.take().unwrap()))
     }
 }
 
-mod manual_flush {
-    use futures::sink::Sink;
-    use futures::task::{Context, Poll, Waker};
-    use std::mem;
-    use std::pin::Pin;
-
-    // Immediately accepts all requests to start pushing, but completion is managed
-    // by manually flushing
-    pub struct ManualFlush<T: Unpin> {
-        data: Vec<T>,
-        waiting_tasks: Vec<Waker>,
-    }
+// Immediately accepts all requests to start pushing, but completion is managed
+// by manually flushing
+struct ManualFlush<T: Unpin> {
+    data: Vec<T>,
+    waiting_tasks: Vec<Waker>,
+}
 
-    impl<T: Unpin> Sink<Option<T>> for ManualFlush<T> {
-        type Error = ();
+impl<T: Unpin> Sink<Option<T>> for ManualFlush<T> {
+    type Error = ();
 
-        fn poll_ready(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
+    fn poll_ready(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
 
-        fn start_send(mut self: Pin<&mut Self>, item: Option<T>) -> Result<(), Self::Error> {
-            if let Some(item) = item {
-                self.data.push(item);
-            } else {
-                self.force_flush();
-            }
-            Ok(())
+    fn start_send(mut self: Pin<&mut Self>, item: Option<T>) -> Result<(), Self::Error> {
+        if let Some(item) = item {
+            self.data.push(item);
+        } else {
+            self.force_flush();
         }
+        Ok(())
+    }
 
-        fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-            if self.data.is_empty() {
-                Poll::Ready(Ok(()))
-            } else {
-                self.waiting_tasks.push(cx.waker().clone());
-                Poll::Pending
-            }
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        if self.data.is_empty() {
+            Poll::Ready(Ok(()))
+        } else {
+            self.waiting_tasks.push(cx.waker().clone());
+            Poll::Pending
         }
+    }
 
-        fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-            self.poll_flush(cx)
-        }
+    fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        self.poll_flush(cx)
     }
+}
 
-    impl<T: Unpin> ManualFlush<T> {
-        pub fn new() -> Self {
-            Self {
-                data: Vec::new(),
-                waiting_tasks: Vec::new(),
-            }
-        }
+impl<T: Unpin> ManualFlush<T> {
+    fn new() -> Self {
+        Self { data: Vec::new(), waiting_tasks: Vec::new() }
+    }
 
-        pub fn force_flush(&mut self) -> Vec<T> {
-            for task in self.waiting_tasks.drain(..) {
-                task.wake()
-            }
-            mem::replace(&mut self.data, Vec::new())
+    fn force_flush(&mut self) -> Vec<T> {
+        for task in self.waiting_tasks.drain(..) {
+            task.wake()
         }
+        mem::replace(&mut self.data, Vec::new())
     }
 }
 
-mod allowance {
-    use futures::sink::Sink;
-    use futures::task::{Context, Poll, Waker};
-    use std::cell::{Cell, RefCell};
-    use std::pin::Pin;
-    use std::rc::Rc;
-
-    pub struct ManualAllow<T: Unpin> {
-        pub data: Vec<T>,
-        allow: Rc<Allow>,
-    }
-
-    pub struct Allow {
-        flag: Cell<bool>,
-        tasks: RefCell<Vec<Waker>>,
-    }
-
-    impl Allow {
-        pub fn new() -> Self {
-            Self {
-                flag: Cell::new(false),
-                tasks: RefCell::new(Vec::new()),
-            }
-        }
+struct ManualAllow<T: Unpin> {
+    data: Vec<T>,
+    allow: Rc<Allow>,
+}
 
-        pub fn check(&self, cx: &mut Context<'_>) -> bool {
-            if self.flag.get() {
-                true
-            } else {
-                self.tasks.borrow_mut().push(cx.waker().clone());
-                false
-            }
-        }
+struct Allow {
+    flag: Cell<bool>,
+    tasks: RefCell<Vec<Waker>>,
+}
 
-        pub fn start(&self) {
-            self.flag.set(true);
-            let mut tasks = self.tasks.borrow_mut();
-            for task in tasks.drain(..) {
-                task.wake();
-            }
-        }
+impl Allow {
+    fn new() -> Self {
+        Self { flag: Cell::new(false), tasks: RefCell::new(Vec::new()) }
     }
 
-    impl<T: Unpin> Sink<T> for ManualAllow<T> {
-        type Error = ();
-
-        fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-            if self.allow.check(cx) {
-                Poll::Ready(Ok(()))
-            } else {
-                Poll::Pending
-            }
+    fn check(&self, cx: &mut Context<'_>) -> bool {
+        if self.flag.get() {
+            true
+        } else {
+            self.tasks.borrow_mut().push(cx.waker().clone());
+            false
         }
+    }
 
-        fn start_send(mut self: Pin<&mut Self>, item: T) -> Result<(), Self::Error> {
-            self.data.push(item);
-            Ok(())
+    fn start(&self) {
+        self.flag.set(true);
+        let mut tasks = self.tasks.borrow_mut();
+        for task in tasks.drain(..) {
+            task.wake();
         }
+    }
+}
 
-        fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
+impl<T: Unpin> Sink<T> for ManualAllow<T> {
+    type Error = ();
 
-        fn poll_close(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        if self.allow.check(cx) {
             Poll::Ready(Ok(()))
+        } else {
+            Poll::Pending
         }
     }
 
-    pub fn manual_allow<T: Unpin>() -> (ManualAllow<T>, Rc<Allow>) {
-        let allow = Rc::new(Allow::new());
-        let manual_allow = ManualAllow {
-            data: Vec::new(),
-            allow: allow.clone(),
-        };
-        (manual_allow, allow)
+    fn start_send(mut self: Pin<&mut Self>, item: T) -> Result<(), Self::Error> {
+        self.data.push(item);
+        Ok(())
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn poll_close(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
     }
 }
 
+fn manual_allow<T: Unpin>() -> (ManualAllow<T>, Rc<Allow>) {
+    let allow = Rc::new(Allow::new());
+    let manual_allow = ManualAllow { data: Vec::new(), allow: allow.clone() };
+    (manual_allow, allow)
+}
+
 #[test]
 fn either_sink() {
-    use futures::sink::{Sink, SinkExt};
-    use std::collections::VecDeque;
-    use std::pin::Pin;
-
-    let mut s = if true {
-        Vec::<i32>::new().left_sink()
-    } else {
-        VecDeque::<i32>::new().right_sink()
-    };
+    let mut s =
+        if true { Vec::<i32>::new().left_sink() } else { VecDeque::<i32>::new().right_sink() };
 
     Pin::new(&mut s).start_send(0).unwrap();
 }
 
 #[test]
 fn vec_sink() {
-    use futures::executor::block_on;
-    use futures::sink::{Sink, SinkExt};
-    use std::pin::Pin;
-
     let mut v = Vec::new();
     Pin::new(&mut v).start_send(0).unwrap();
     Pin::new(&mut v).start_send(1).unwrap();
@@ -269,10 +226,6 @@
 
 #[test]
 fn vecdeque_sink() {
-    use futures::sink::Sink;
-    use std::collections::VecDeque;
-    use std::pin::Pin;
-
     let mut deque = VecDeque::new();
     Pin::new(&mut deque).start_send(2).unwrap();
     Pin::new(&mut deque).start_send(3).unwrap();
@@ -284,9 +237,6 @@
 
 #[test]
 fn send() {
-    use futures::executor::block_on;
-    use futures::sink::SinkExt;
-
     let mut v = Vec::new();
 
     block_on(v.send(0)).unwrap();
@@ -301,10 +251,6 @@
 
 #[test]
 fn send_all() {
-    use futures::executor::block_on;
-    use futures::sink::SinkExt;
-    use futures::stream::{self, StreamExt};
-
     let mut v = Vec::new();
 
     block_on(v.send_all(&mut stream::iter(vec![0, 1]).map(Ok))).unwrap();
@@ -321,15 +267,6 @@
 // channel is full
 #[test]
 fn mpsc_blocking_start_send() {
-    use futures::channel::mpsc;
-    use futures::executor::block_on;
-    use futures::future::{self, FutureExt};
-
-    use start_send_fut::StartSendFut;
-    use flag_cx::flag_cx;
-    use sassert_next::sassert_next;
-    use unwrap::unwrap;
-
     let (mut tx, mut rx) = mpsc::channel::<i32>(0);
 
     block_on(future::lazy(|_| {
@@ -353,17 +290,6 @@
 // until a oneshot is completed
 #[test]
 fn with_flush() {
-    use futures::channel::oneshot;
-    use futures::executor::block_on;
-    use futures::future::{self, FutureExt, TryFutureExt};
-    use futures::never::Never;
-    use futures::sink::{Sink, SinkExt};
-    use std::mem;
-    use std::pin::Pin;
-
-    use flag_cx::flag_cx;
-    use unwrap::unwrap;
-
     let (tx, rx) = oneshot::channel();
     let mut block = rx.boxed();
     let mut sink = Vec::new().with(|elem| {
@@ -390,11 +316,6 @@
 // test simple use of with to change data
 #[test]
 fn with_as_map() {
-    use futures::executor::block_on;
-    use futures::future;
-    use futures::never::Never;
-    use futures::sink::SinkExt;
-
     let mut sink = Vec::new().with(|item| future::ok::<i32, Never>(item * 2));
     block_on(sink.send(0)).unwrap();
     block_on(sink.send(1)).unwrap();
@@ -405,10 +326,6 @@
 // test simple use of with_flat_map
 #[test]
 fn with_flat_map() {
-    use futures::executor::block_on;
-    use futures::sink::SinkExt;
-    use futures::stream::{self, StreamExt};
-
     let mut sink = Vec::new().with_flat_map(|item| stream::iter(vec![item; item]).map(Ok));
     block_on(sink.send(0)).unwrap();
     block_on(sink.send(1)).unwrap();
@@ -421,16 +338,6 @@
 // Regression test for the issue #1834.
 #[test]
 fn with_propagates_poll_ready() {
-    use futures::channel::mpsc;
-    use futures::executor::block_on;
-    use futures::future;
-    use futures::sink::{Sink, SinkExt};
-    use futures::task::Poll;
-    use std::pin::Pin;
-
-    use flag_cx::flag_cx;
-    use sassert_next::sassert_next;
-
     let (tx, mut rx) = mpsc::channel::<i32>(0);
     let mut tx = tx.with(|item: i32| future::ok::<i32, mpsc::SendError>(item + 10));
 
@@ -457,14 +364,6 @@
 // but doesn't claim to be flushed until the underlying sink is
 #[test]
 fn with_flush_propagate() {
-    use futures::future::{self, FutureExt};
-    use futures::sink::{Sink, SinkExt};
-    use std::pin::Pin;
-
-    use manual_flush::ManualFlush;
-    use flag_cx::flag_cx;
-    use unwrap::unwrap;
-
     let mut sink = ManualFlush::new().with(future::ok::<Option<i32>, ()>);
     flag_cx(|flag, cx| {
         unwrap(Pin::new(&mut sink).poll_ready(cx));
@@ -483,12 +382,33 @@
     })
 }
 
+// test that `Clone` is implemented on `with` sinks
+#[test]
+fn with_implements_clone() {
+    let (mut tx, rx) = mpsc::channel(5);
+
+    {
+        let mut is_positive = tx.clone().with(|item| future::ok::<bool, mpsc::SendError>(item > 0));
+
+        let mut is_long =
+            tx.clone().with(|item: &str| future::ok::<bool, mpsc::SendError>(item.len() > 5));
+
+        block_on(is_positive.clone().send(-1)).unwrap();
+        block_on(is_long.clone().send("123456")).unwrap();
+        block_on(is_long.send("123")).unwrap();
+        block_on(is_positive.send(1)).unwrap();
+    }
+
+    block_on(tx.send(false)).unwrap();
+
+    block_on(tx.close()).unwrap();
+
+    assert_eq!(block_on(rx.collect::<Vec<_>>()), vec![false, true, false, true, false]);
+}
+
 // test that a buffer is a no-nop around a sink that always accepts sends
 #[test]
 fn buffer_noop() {
-    use futures::executor::block_on;
-    use futures::sink::SinkExt;
-
     let mut sink = Vec::new().buffer(0);
     block_on(sink.send(0)).unwrap();
     block_on(sink.send(1)).unwrap();
@@ -504,15 +424,6 @@
 // and writing out when the underlying sink is ready
 #[test]
 fn buffer() {
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-    use futures::sink::SinkExt;
-
-    use start_send_fut::StartSendFut;
-    use flag_cx::flag_cx;
-    use unwrap::unwrap;
-    use allowance::manual_allow;
-
     let (sink, allow) = manual_allow::<i32>();
     let sink = sink.buffer(2);
 
@@ -532,10 +443,6 @@
 
 #[test]
 fn fanout_smoke() {
-    use futures::executor::block_on;
-    use futures::sink::SinkExt;
-    use futures::stream::{self, StreamExt};
-
     let sink1 = Vec::new();
     let sink2 = Vec::new();
     let mut sink = sink1.fanout(sink2);
@@ -547,16 +454,6 @@
 
 #[test]
 fn fanout_backpressure() {
-    use futures::channel::mpsc;
-    use futures::executor::block_on;
-    use futures::future::FutureExt;
-    use futures::sink::SinkExt;
-    use futures::stream::StreamExt;
-
-    use start_send_fut::StartSendFut;
-    use flag_cx::flag_cx;
-    use unwrap::unwrap;
-
     let (left_send, mut left_recv) = mpsc::channel(0);
     let (right_send, mut right_recv) = mpsc::channel(0);
     let sink = left_send.fanout(right_send);
@@ -589,12 +486,6 @@
 
 #[test]
 fn sink_map_err() {
-    use futures::channel::mpsc;
-    use futures::sink::{Sink, SinkExt};
-    use futures::task::Poll;
-    use futures_test::task::panic_context;
-    use std::pin::Pin;
-
     {
         let cx = &mut panic_context();
         let (tx, _rx) = mpsc::channel(1);
@@ -604,22 +495,45 @@
     }
 
     let tx = mpsc::channel(0).0;
-    assert_eq!(
-        Pin::new(&mut tx.sink_map_err(|_| ())).start_send(()),
-        Err(())
-    );
+    assert_eq!(Pin::new(&mut tx.sink_map_err(|_| ())).start_send(()), Err(()));
 }
 
 #[test]
-fn err_into() {
-    use futures::channel::mpsc;
-    use futures::sink::{Sink, SinkErrInto, SinkExt};
-    use futures::task::Poll;
-    use futures_test::task::panic_context;
-    use std::pin::Pin;
+fn sink_unfold() {
+    block_on(poll_fn(|cx| {
+        let (tx, mut rx) = mpsc::channel(1);
+        let unfold = sink::unfold((), |(), i: i32| {
+            let mut tx = tx.clone();
+            async move {
+                tx.send(i).await.unwrap();
+                Ok::<_, String>(())
+            }
+        });
+        futures::pin_mut!(unfold);
+        assert_eq!(unfold.as_mut().start_send(1), Ok(()));
+        assert_eq!(unfold.as_mut().poll_flush(cx), Poll::Ready(Ok(())));
+        assert_eq!(rx.try_next().unwrap(), Some(1));
+
+        assert_eq!(unfold.as_mut().poll_ready(cx), Poll::Ready(Ok(())));
+        assert_eq!(unfold.as_mut().start_send(2), Ok(()));
+        assert_eq!(unfold.as_mut().poll_ready(cx), Poll::Ready(Ok(())));
+        assert_eq!(unfold.as_mut().start_send(3), Ok(()));
+        assert_eq!(rx.try_next().unwrap(), Some(2));
+        assert!(rx.try_next().is_err());
+        assert_eq!(unfold.as_mut().poll_ready(cx), Poll::Ready(Ok(())));
+        assert_eq!(unfold.as_mut().start_send(4), Ok(()));
+        assert_eq!(unfold.as_mut().poll_flush(cx), Poll::Pending); // Channel full
+        assert_eq!(rx.try_next().unwrap(), Some(3));
+        assert_eq!(rx.try_next().unwrap(), Some(4));
+
+        Poll::Ready(())
+    }))
+}
 
+#[test]
+fn err_into() {
     #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-    pub struct ErrIntoTest;
+    struct ErrIntoTest;
 
     impl From<mpsc::SendError> for ErrIntoTest {
         fn from(_: mpsc::SendError) -> Self {
@@ -636,8 +550,5 @@
     }
 
     let tx = mpsc::channel(0).0;
-    assert_eq!(
-        Pin::new(&mut tx.sink_err_into()).start_send(()),
-        Err(ErrIntoTest)
-    );
+    assert_eq!(Pin::new(&mut tx.sink_err_into()).start_send(()), Err(ErrIntoTest));
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/split.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-#[test]
-fn test_split() {
-    use futures::executor::block_on;
-    use futures::sink::{Sink, SinkExt};
-    use futures::stream::{self, Stream, StreamExt};
-    use futures::task::{Context, Poll};
-    use pin_project::pin_project;
-    use std::pin::Pin;
-
-    #[pin_project]
-    struct Join<T, U> {
-        #[pin]
-        stream: T,
-        #[pin]
-        sink: U,
-    }
-
-    impl<T: Stream, U> Stream for Join<T, U> {
-        type Item = T::Item;
-
-        fn poll_next(
-            self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-        ) -> Poll<Option<T::Item>> {
-            self.project().stream.poll_next(cx)
-        }
-    }
-
-    impl<T, U: Sink<Item>, Item> Sink<Item> for Join<T, U> {
-        type Error = U::Error;
-
-        fn poll_ready(
-            self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-        ) -> Poll<Result<(), Self::Error>> {
-            self.project().sink.poll_ready(cx)
-        }
-
-        fn start_send(
-            self: Pin<&mut Self>,
-            item: Item,
-        ) -> Result<(), Self::Error> {
-            self.project().sink.start_send(item)
-        }
-
-        fn poll_flush(
-            self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-        ) -> Poll<Result<(), Self::Error>> {
-            self.project().sink.poll_flush(cx)
-        }
-
-        fn poll_close(
-            self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-        ) -> Poll<Result<(), Self::Error>> {
-            self.project().sink.poll_close(cx)
-        }
-    }
-
-    let mut dest: Vec<i32> = Vec::new();
-    {
-       let join = Join {
-            stream: stream::iter(vec![10, 20, 30]),
-            sink: &mut dest
-        };
-
-        let (sink, stream) = join.split();
-        let join = sink.reunite(stream).expect("test_split: reunite error");
-        let (mut sink, stream) = join.split();
-        let mut stream = stream.map(Ok);
-        block_on(sink.send_all(&mut stream)).unwrap();
-    }
-    assert_eq!(dest, vec![10, 20, 30]);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_abortable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_abortable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_abortable.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_abortable.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,46 @@
+use futures::channel::mpsc;
+use futures::executor::block_on;
+use futures::stream::{abortable, Stream, StreamExt};
+use futures::task::{Context, Poll};
+use futures::SinkExt;
+use futures_test::task::new_count_waker;
+use std::pin::Pin;
+
+#[test]
+fn abortable_works() {
+    let (_tx, a_rx) = mpsc::channel::<()>(1);
+    let (mut abortable_rx, abort_handle) = abortable(a_rx);
+
+    abort_handle.abort();
+    assert!(abortable_rx.is_aborted());
+    assert_eq!(None, block_on(abortable_rx.next()));
+}
+
+#[test]
+fn abortable_awakens() {
+    let (_tx, a_rx) = mpsc::channel::<()>(1);
+    let (mut abortable_rx, abort_handle) = abortable(a_rx);
+
+    let (waker, counter) = new_count_waker();
+    let mut cx = Context::from_waker(&waker);
+
+    assert_eq!(counter, 0);
+    assert_eq!(Poll::Pending, Pin::new(&mut abortable_rx).poll_next(&mut cx));
+    assert_eq!(counter, 0);
+
+    abort_handle.abort();
+    assert_eq!(counter, 1);
+    assert!(abortable_rx.is_aborted());
+    assert_eq!(Poll::Ready(None), Pin::new(&mut abortable_rx).poll_next(&mut cx));
+}
+
+#[test]
+fn abortable_resolves() {
+    let (mut tx, a_rx) = mpsc::channel::<()>(1);
+    let (mut abortable_rx, _abort_handle) = abortable(a_rx);
+
+    block_on(tx.send(())).unwrap();
+
+    assert!(!abortable_rx.is_aborted());
+    assert_eq!(Some(()), block_on(abortable_rx.next()));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_buffer_unordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_buffer_unordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_buffer_unordered.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_buffer_unordered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,73 @@
+use futures::channel::{mpsc, oneshot};
+use futures::executor::{block_on, block_on_stream};
+use futures::sink::SinkExt;
+use futures::stream::StreamExt;
+use std::sync::mpsc as std_mpsc;
+use std::thread;
+
+#[test]
+#[ignore] // FIXME: https://github.com/rust-lang/futures-rs/issues/1790
+fn works() {
+    const N: usize = 4;
+
+    let (mut tx, rx) = mpsc::channel(1);
+
+    let (tx2, rx2) = std_mpsc::channel();
+    let (tx3, rx3) = std_mpsc::channel();
+    let t1 = thread::spawn(move || {
+        for _ in 0..=N {
+            let (mytx, myrx) = oneshot::channel();
+            block_on(tx.send(myrx)).unwrap();
+            tx3.send(mytx).unwrap();
+        }
+        rx2.recv().unwrap();
+        for _ in 0..N {
+            let (mytx, myrx) = oneshot::channel();
+            block_on(tx.send(myrx)).unwrap();
+            tx3.send(mytx).unwrap();
+        }
+    });
+
+    let (tx4, rx4) = std_mpsc::channel();
+    let t2 = thread::spawn(move || {
+        for item in block_on_stream(rx.buffer_unordered(N)) {
+            tx4.send(item.unwrap()).unwrap();
+        }
+    });
+
+    let o1 = rx3.recv().unwrap();
+    let o2 = rx3.recv().unwrap();
+    let o3 = rx3.recv().unwrap();
+    let o4 = rx3.recv().unwrap();
+    assert!(rx4.try_recv().is_err());
+
+    o1.send(1).unwrap();
+    assert_eq!(rx4.recv(), Ok(1));
+    o3.send(3).unwrap();
+    assert_eq!(rx4.recv(), Ok(3));
+    tx2.send(()).unwrap();
+    o2.send(2).unwrap();
+    assert_eq!(rx4.recv(), Ok(2));
+    o4.send(4).unwrap();
+    assert_eq!(rx4.recv(), Ok(4));
+
+    let o5 = rx3.recv().unwrap();
+    let o6 = rx3.recv().unwrap();
+    let o7 = rx3.recv().unwrap();
+    let o8 = rx3.recv().unwrap();
+    let o9 = rx3.recv().unwrap();
+
+    o5.send(5).unwrap();
+    assert_eq!(rx4.recv(), Ok(5));
+    o8.send(8).unwrap();
+    assert_eq!(rx4.recv(), Ok(8));
+    o9.send(9).unwrap();
+    assert_eq!(rx4.recv(), Ok(9));
+    o7.send(7).unwrap();
+    assert_eq!(rx4.recv(), Ok(7));
+    o6.send(6).unwrap();
+    assert_eq!(rx4.recv(), Ok(6));
+
+    t1.join().unwrap();
+    t2.join().unwrap();
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_catch_unwind.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_catch_unwind.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_catch_unwind.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_catch_unwind.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
+use futures::executor::block_on_stream;
+use futures::stream::{self, StreamExt};
+
 #[test]
 fn panic_in_the_middle_of_the_stream() {
-    use futures::executor::block_on_stream;
-    use futures::stream::{self, StreamExt};
-
     let stream = stream::iter(vec![Some(10), None, Some(11)]);
 
     // panic on second element
@@ -16,9 +16,6 @@
 
 #[test]
 fn no_panic() {
-    use futures::executor::block_on_stream;
-    use futures::stream::{self, StreamExt};
-
     let stream = stream::iter(vec![10, 11, 12]);
 
     let mut iter = block_on_stream(stream.catch_unwind());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_futures_ordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_futures_ordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_futures_ordered.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_futures_ordered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,84 @@
+use futures::channel::oneshot;
+use futures::executor::{block_on, block_on_stream};
+use futures::future::{self, join, Future, FutureExt, TryFutureExt};
+use futures::stream::{FuturesOrdered, StreamExt};
+use futures_test::task::noop_context;
+use std::any::Any;
+
+#[test]
+fn works_1() {
+    let (a_tx, a_rx) = oneshot::channel::<i32>();
+    let (b_tx, b_rx) = oneshot::channel::<i32>();
+    let (c_tx, c_rx) = oneshot::channel::<i32>();
+
+    let mut stream = vec![a_rx, b_rx, c_rx].into_iter().collect::<FuturesOrdered<_>>();
+
+    b_tx.send(99).unwrap();
+    assert!(stream.poll_next_unpin(&mut noop_context()).is_pending());
+
+    a_tx.send(33).unwrap();
+    c_tx.send(33).unwrap();
+
+    let mut iter = block_on_stream(stream);
+    assert_eq!(Some(Ok(33)), iter.next());
+    assert_eq!(Some(Ok(99)), iter.next());
+    assert_eq!(Some(Ok(33)), iter.next());
+    assert_eq!(None, iter.next());
+}
+
+#[test]
+fn works_2() {
+    let (a_tx, a_rx) = oneshot::channel::<i32>();
+    let (b_tx, b_rx) = oneshot::channel::<i32>();
+    let (c_tx, c_rx) = oneshot::channel::<i32>();
+
+    let mut stream = vec![a_rx.boxed(), join(b_rx, c_rx).map(|(a, b)| Ok(a? + b?)).boxed()]
+        .into_iter()
+        .collect::<FuturesOrdered<_>>();
+
+    let mut cx = noop_context();
+    a_tx.send(33).unwrap();
+    b_tx.send(33).unwrap();
+    assert!(stream.poll_next_unpin(&mut cx).is_ready());
+    assert!(stream.poll_next_unpin(&mut cx).is_pending());
+    c_tx.send(33).unwrap();
+    assert!(stream.poll_next_unpin(&mut cx).is_ready());
+}
+
+#[test]
+fn from_iterator() {
+    let stream = vec![future::ready::<i32>(1), future::ready::<i32>(2), future::ready::<i32>(3)]
+        .into_iter()
+        .collect::<FuturesOrdered<_>>();
+    assert_eq!(stream.len(), 3);
+    assert_eq!(block_on(stream.collect::<Vec<_>>()), vec![1, 2, 3]);
+}
+
+#[test]
+fn queue_never_unblocked() {
+    let (_a_tx, a_rx) = oneshot::channel::<Box<dyn Any + Send>>();
+    let (b_tx, b_rx) = oneshot::channel::<Box<dyn Any + Send>>();
+    let (c_tx, c_rx) = oneshot::channel::<Box<dyn Any + Send>>();
+
+    let mut stream = vec![
+        Box::new(a_rx) as Box<dyn Future<Output = _> + Unpin>,
+        Box::new(
+            future::try_select(b_rx, c_rx)
+                .map_err(|e| e.factor_first().0)
+                .and_then(|e| future::ok(Box::new(e) as Box<dyn Any + Send>)),
+        ) as _,
+    ]
+    .into_iter()
+    .collect::<FuturesOrdered<_>>();
+
+    let cx = &mut noop_context();
+    for _ in 0..10 {
+        assert!(stream.poll_next_unpin(cx).is_pending());
+    }
+
+    b_tx.send(Box::new(())).unwrap();
+    assert!(stream.poll_next_unpin(cx).is_pending());
+    c_tx.send(Box::new(())).unwrap();
+    assert!(stream.poll_next_unpin(cx).is_pending());
+    assert!(stream.poll_next_unpin(cx).is_pending());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_futures_unordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_futures_unordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_futures_unordered.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_futures_unordered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,369 @@
+use futures::channel::oneshot;
+use futures::executor::{block_on, block_on_stream};
+use futures::future::{self, join, Future, FutureExt};
+use futures::stream::{FusedStream, FuturesUnordered, StreamExt};
+use futures::task::{Context, Poll};
+use futures_test::future::FutureTestExt;
+use futures_test::task::noop_context;
+use futures_test::{assert_stream_done, assert_stream_next, assert_stream_pending};
+use std::iter::FromIterator;
+use std::pin::Pin;
+use std::sync::atomic::{AtomicBool, Ordering};
+
+#[test]
+fn is_terminated() {
+    let mut cx = noop_context();
+    let mut tasks = FuturesUnordered::new();
+
+    assert_eq!(tasks.is_terminated(), false);
+    assert_eq!(tasks.poll_next_unpin(&mut cx), Poll::Ready(None));
+    assert_eq!(tasks.is_terminated(), true);
+
+    // Test that the sentinel value doesn't leak
+    assert_eq!(tasks.is_empty(), true);
+    assert_eq!(tasks.len(), 0);
+    assert_eq!(tasks.iter_mut().len(), 0);
+
+    tasks.push(future::ready(1));
+
+    assert_eq!(tasks.is_empty(), false);
+    assert_eq!(tasks.len(), 1);
+    assert_eq!(tasks.iter_mut().len(), 1);
+
+    assert_eq!(tasks.is_terminated(), false);
+    assert_eq!(tasks.poll_next_unpin(&mut cx), Poll::Ready(Some(1)));
+    assert_eq!(tasks.is_terminated(), false);
+    assert_eq!(tasks.poll_next_unpin(&mut cx), Poll::Ready(None));
+    assert_eq!(tasks.is_terminated(), true);
+}
+
+#[test]
+fn works_1() {
+    let (a_tx, a_rx) = oneshot::channel::<i32>();
+    let (b_tx, b_rx) = oneshot::channel::<i32>();
+    let (c_tx, c_rx) = oneshot::channel::<i32>();
+
+    let mut iter =
+        block_on_stream(vec![a_rx, b_rx, c_rx].into_iter().collect::<FuturesUnordered<_>>());
+
+    b_tx.send(99).unwrap();
+    assert_eq!(Some(Ok(99)), iter.next());
+
+    a_tx.send(33).unwrap();
+    c_tx.send(33).unwrap();
+    assert_eq!(Some(Ok(33)), iter.next());
+    assert_eq!(Some(Ok(33)), iter.next());
+    assert_eq!(None, iter.next());
+}
+
+#[test]
+fn works_2() {
+    let (a_tx, a_rx) = oneshot::channel::<i32>();
+    let (b_tx, b_rx) = oneshot::channel::<i32>();
+    let (c_tx, c_rx) = oneshot::channel::<i32>();
+
+    let mut stream = vec![a_rx.boxed(), join(b_rx, c_rx).map(|(a, b)| Ok(a? + b?)).boxed()]
+        .into_iter()
+        .collect::<FuturesUnordered<_>>();
+
+    a_tx.send(9).unwrap();
+    b_tx.send(10).unwrap();
+
+    let mut cx = noop_context();
+    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(9))));
+    c_tx.send(20).unwrap();
+    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(30))));
+    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(None));
+}
+
+#[test]
+fn from_iterator() {
+    let stream = vec![future::ready::<i32>(1), future::ready::<i32>(2), future::ready::<i32>(3)]
+        .into_iter()
+        .collect::<FuturesUnordered<_>>();
+    assert_eq!(stream.len(), 3);
+    assert_eq!(block_on(stream.collect::<Vec<_>>()), vec![1, 2, 3]);
+}
+
+#[test]
+fn finished_future() {
+    let (_a_tx, a_rx) = oneshot::channel::<i32>();
+    let (b_tx, b_rx) = oneshot::channel::<i32>();
+    let (c_tx, c_rx) = oneshot::channel::<i32>();
+
+    let mut stream = vec![
+        Box::new(a_rx) as Box<dyn Future<Output = Result<_, _>> + Unpin>,
+        Box::new(future::select(b_rx, c_rx).map(|e| e.factor_first().0)) as _,
+    ]
+    .into_iter()
+    .collect::<FuturesUnordered<_>>();
+
+    let cx = &mut noop_context();
+    for _ in 0..10 {
+        assert!(stream.poll_next_unpin(cx).is_pending());
+    }
+
+    b_tx.send(12).unwrap();
+    c_tx.send(3).unwrap();
+    assert!(stream.poll_next_unpin(cx).is_ready());
+    assert!(stream.poll_next_unpin(cx).is_pending());
+    assert!(stream.poll_next_unpin(cx).is_pending());
+}
+
+#[test]
+fn iter_mut_cancel() {
+    let (a_tx, a_rx) = oneshot::channel::<i32>();
+    let (b_tx, b_rx) = oneshot::channel::<i32>();
+    let (c_tx, c_rx) = oneshot::channel::<i32>();
+
+    let mut stream = vec![a_rx, b_rx, c_rx].into_iter().collect::<FuturesUnordered<_>>();
+
+    for rx in stream.iter_mut() {
+        rx.close();
+    }
+
+    let mut iter = block_on_stream(stream);
+
+    assert!(a_tx.is_canceled());
+    assert!(b_tx.is_canceled());
+    assert!(c_tx.is_canceled());
+
+    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
+    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
+    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
+    assert_eq!(iter.next(), None);
+}
+
+#[test]
+fn iter_mut_len() {
+    let mut stream =
+        vec![future::pending::<()>(), future::pending::<()>(), future::pending::<()>()]
+            .into_iter()
+            .collect::<FuturesUnordered<_>>();
+
+    let mut iter_mut = stream.iter_mut();
+    assert_eq!(iter_mut.len(), 3);
+    assert!(iter_mut.next().is_some());
+    assert_eq!(iter_mut.len(), 2);
+    assert!(iter_mut.next().is_some());
+    assert_eq!(iter_mut.len(), 1);
+    assert!(iter_mut.next().is_some());
+    assert_eq!(iter_mut.len(), 0);
+    assert!(iter_mut.next().is_none());
+}
+
+#[test]
+fn iter_cancel() {
+    struct AtomicCancel<F> {
+        future: F,
+        cancel: AtomicBool,
+    }
+
+    impl<F: Future + Unpin> Future for AtomicCancel<F> {
+        type Output = Option<<F as Future>::Output>;
+
+        fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            if self.cancel.load(Ordering::Relaxed) {
+                Poll::Ready(None)
+            } else {
+                self.future.poll_unpin(cx).map(Some)
+            }
+        }
+    }
+
+    impl<F: Future + Unpin> AtomicCancel<F> {
+        fn new(future: F) -> Self {
+            Self { future, cancel: AtomicBool::new(false) }
+        }
+    }
+
+    let stream = vec![
+        AtomicCancel::new(future::pending::<()>()),
+        AtomicCancel::new(future::pending::<()>()),
+        AtomicCancel::new(future::pending::<()>()),
+    ]
+    .into_iter()
+    .collect::<FuturesUnordered<_>>();
+
+    for f in stream.iter() {
+        f.cancel.store(true, Ordering::Relaxed);
+    }
+
+    let mut iter = block_on_stream(stream);
+
+    assert_eq!(iter.next(), Some(None));
+    assert_eq!(iter.next(), Some(None));
+    assert_eq!(iter.next(), Some(None));
+    assert_eq!(iter.next(), None);
+}
+
+#[test]
+fn iter_len() {
+    let stream = vec![future::pending::<()>(), future::pending::<()>(), future::pending::<()>()]
+        .into_iter()
+        .collect::<FuturesUnordered<_>>();
+
+    let mut iter = stream.iter();
+    assert_eq!(iter.len(), 3);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 2);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 1);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 0);
+    assert!(iter.next().is_none());
+}
+
+#[test]
+fn into_iter_cancel() {
+    let (a_tx, a_rx) = oneshot::channel::<i32>();
+    let (b_tx, b_rx) = oneshot::channel::<i32>();
+    let (c_tx, c_rx) = oneshot::channel::<i32>();
+
+    let stream = vec![a_rx, b_rx, c_rx].into_iter().collect::<FuturesUnordered<_>>();
+
+    let stream = stream
+        .into_iter()
+        .map(|mut rx| {
+            rx.close();
+            rx
+        })
+        .collect::<FuturesUnordered<_>>();
+
+    let mut iter = block_on_stream(stream);
+
+    assert!(a_tx.is_canceled());
+    assert!(b_tx.is_canceled());
+    assert!(c_tx.is_canceled());
+
+    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
+    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
+    assert_eq!(iter.next(), Some(Err(futures::channel::oneshot::Canceled)));
+    assert_eq!(iter.next(), None);
+}
+
+#[test]
+fn into_iter_len() {
+    let stream = vec![future::pending::<()>(), future::pending::<()>(), future::pending::<()>()]
+        .into_iter()
+        .collect::<FuturesUnordered<_>>();
+
+    let mut into_iter = stream.into_iter();
+    assert_eq!(into_iter.len(), 3);
+    assert!(into_iter.next().is_some());
+    assert_eq!(into_iter.len(), 2);
+    assert!(into_iter.next().is_some());
+    assert_eq!(into_iter.len(), 1);
+    assert!(into_iter.next().is_some());
+    assert_eq!(into_iter.len(), 0);
+    assert!(into_iter.next().is_none());
+}
+
+#[test]
+fn futures_not_moved_after_poll() {
+    // Future that will be ready after being polled twice,
+    // asserting that it does not move.
+    let fut = future::ready(()).pending_once().assert_unmoved();
+    let mut stream = vec![fut; 3].into_iter().collect::<FuturesUnordered<_>>();
+    assert_stream_pending!(stream);
+    assert_stream_next!(stream, ());
+    assert_stream_next!(stream, ());
+    assert_stream_next!(stream, ());
+    assert_stream_done!(stream);
+}
+
+#[test]
+fn len_valid_during_out_of_order_completion() {
+    // Complete futures out-of-order and add new futures afterwards to ensure
+    // length values remain correct.
+    let (a_tx, a_rx) = oneshot::channel::<i32>();
+    let (b_tx, b_rx) = oneshot::channel::<i32>();
+    let (c_tx, c_rx) = oneshot::channel::<i32>();
+    let (d_tx, d_rx) = oneshot::channel::<i32>();
+
+    let mut cx = noop_context();
+    let mut stream = FuturesUnordered::new();
+    assert_eq!(stream.len(), 0);
+
+    stream.push(a_rx);
+    assert_eq!(stream.len(), 1);
+    stream.push(b_rx);
+    assert_eq!(stream.len(), 2);
+    stream.push(c_rx);
+    assert_eq!(stream.len(), 3);
+
+    b_tx.send(4).unwrap();
+    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(4))));
+    assert_eq!(stream.len(), 2);
+
+    stream.push(d_rx);
+    assert_eq!(stream.len(), 3);
+
+    c_tx.send(5).unwrap();
+    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(5))));
+    assert_eq!(stream.len(), 2);
+
+    d_tx.send(6).unwrap();
+    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(6))));
+    assert_eq!(stream.len(), 1);
+
+    a_tx.send(7).unwrap();
+    assert_eq!(stream.poll_next_unpin(&mut cx), Poll::Ready(Some(Ok(7))));
+    assert_eq!(stream.len(), 0);
+}
+
+#[test]
+fn polled_only_once_at_most_per_iteration() {
+    #[derive(Debug, Clone, Copy, Default)]
+    struct F {
+        polled: bool,
+    }
+
+    impl Future for F {
+        type Output = ();
+
+        fn poll(mut self: Pin<&mut Self>, _: &mut Context) -> Poll<Self::Output> {
+            if self.polled {
+                panic!("polled twice")
+            } else {
+                self.polled = true;
+                Poll::Pending
+            }
+        }
+    }
+
+    let cx = &mut noop_context();
+
+    let mut tasks = FuturesUnordered::from_iter(vec![F::default(); 10]);
+    assert!(tasks.poll_next_unpin(cx).is_pending());
+    assert_eq!(10, tasks.iter().filter(|f| f.polled).count());
+
+    let mut tasks = FuturesUnordered::from_iter(vec![F::default(); 33]);
+    assert!(tasks.poll_next_unpin(cx).is_pending());
+    assert_eq!(33, tasks.iter().filter(|f| f.polled).count());
+
+    let mut tasks = FuturesUnordered::<F>::new();
+    assert_eq!(Poll::Ready(None), tasks.poll_next_unpin(cx));
+}
+
+#[test]
+fn clear() {
+    let mut tasks = FuturesUnordered::from_iter(vec![future::ready(1), future::ready(2)]);
+
+    assert_eq!(block_on(tasks.next()), Some(1));
+    assert!(!tasks.is_empty());
+
+    tasks.clear();
+    assert!(tasks.is_empty());
+
+    tasks.push(future::ready(3));
+    assert!(!tasks.is_empty());
+
+    tasks.clear();
+    assert!(tasks.is_empty());
+
+    assert_eq!(block_on(tasks.next()), None);
+    assert!(tasks.is_terminated());
+    tasks.clear();
+    assert!(!tasks.is_terminated());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_into_async_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_into_async_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_into_async_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_into_async_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,31 +1,51 @@
-#[test]
-fn test_into_async_read() {
-    use core::pin::Pin;
-    use futures::io::AsyncRead;
-    use futures::stream::{self, TryStreamExt};
-    use futures::task::Poll;
-    use futures_test::{task::noop_context, stream::StreamTestExt};
-
-    macro_rules! assert_read {
-        ($reader:expr, $buf:expr, $item:expr) => {
-            let mut cx = noop_context();
-            loop {
-                match Pin::new(&mut $reader).poll_read(&mut cx, $buf) {
-                    Poll::Ready(Ok(x)) => {
-                        assert_eq!(x, $item);
-                        break;
-                    }
-                    Poll::Ready(Err(err)) => {
-                        panic!("assertion failed: expected value but got {}", err);
-                    }
-                    Poll::Pending => {
-                        continue;
-                    }
+use core::pin::Pin;
+use futures::io::{AsyncBufRead, AsyncRead};
+use futures::stream::{self, TryStreamExt};
+use futures::task::Poll;
+use futures_test::{stream::StreamTestExt, task::noop_context};
+
+macro_rules! assert_read {
+    ($reader:expr, $buf:expr, $item:expr) => {
+        let mut cx = noop_context();
+        loop {
+            match Pin::new(&mut $reader).poll_read(&mut cx, $buf) {
+                Poll::Ready(Ok(x)) => {
+                    assert_eq!(x, $item);
+                    break;
+                }
+                Poll::Ready(Err(err)) => {
+                    panic!("assertion failed: expected value but got {}", err);
+                }
+                Poll::Pending => {
+                    continue;
                 }
             }
-        };
-    }
+        }
+    };
+}
 
+macro_rules! assert_fill_buf {
+    ($reader:expr, $buf:expr) => {
+        let mut cx = noop_context();
+        loop {
+            match Pin::new(&mut $reader).poll_fill_buf(&mut cx) {
+                Poll::Ready(Ok(x)) => {
+                    assert_eq!(x, $buf);
+                    break;
+                }
+                Poll::Ready(Err(err)) => {
+                    panic!("assertion failed: expected value but got {}", err);
+                }
+                Poll::Pending => {
+                    continue;
+                }
+            }
+        }
+    };
+}
+
+#[test]
+fn test_into_async_read() {
     let stream = stream::iter((1..=3).flat_map(|_| vec![Ok(vec![]), Ok(vec![1, 2, 3, 4, 5])]));
     let mut reader = stream.interleave_pending().into_async_read();
     let mut buf = vec![0; 3];
@@ -52,33 +72,7 @@
 }
 
 #[test]
-fn test_into_async_bufread() -> std::io::Result<()> {
-    use core::pin::Pin;
-    use futures::io::AsyncBufRead;
-    use futures::stream::{self, TryStreamExt};
-    use futures::task::Poll;
-    use futures_test::{task::noop_context, stream::StreamTestExt};
-
-    macro_rules! assert_fill_buf {
-        ($reader:expr, $buf:expr) => {
-            let mut cx = noop_context();
-            loop {
-                match Pin::new(&mut $reader).poll_fill_buf(&mut cx) {
-                    Poll::Ready(Ok(x)) => {
-                        assert_eq!(x, $buf);
-                        break;
-                    }
-                    Poll::Ready(Err(err)) => {
-                        panic!("assertion failed: expected value but got {}", err);
-                    }
-                    Poll::Pending => {
-                        continue;
-                    }
-                }
-            }
-        };
-    }
-
+fn test_into_async_bufread() {
     let stream = stream::iter((1..=2).flat_map(|_| vec![Ok(vec![]), Ok(vec![1, 2, 3, 4, 5])]));
     let mut reader = stream.interleave_pending().into_async_read();
 
@@ -97,6 +91,4 @@
     reader.as_mut().consume(3);
 
     assert_fill_buf!(reader, &[][..]);
-
-    Ok(())
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_peekable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_peekable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_peekable.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_peekable.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,58 @@
+use futures::executor::block_on;
+use futures::pin_mut;
+use futures::stream::{self, Peekable, StreamExt};
+
 #[test]
 fn peekable() {
-    use futures::executor::block_on;
-    use futures::pin_mut;
-    use futures::stream::{self, Peekable, StreamExt};
-
     block_on(async {
         let peekable: Peekable<_> = stream::iter(vec![1u8, 2, 3]).peekable();
         pin_mut!(peekable);
         assert_eq!(peekable.as_mut().peek().await, Some(&1u8));
         assert_eq!(peekable.collect::<Vec<u8>>().await, vec![1, 2, 3]);
+
+        let s = stream::once(async { 1 }).peekable();
+        pin_mut!(s);
+        assert_eq!(s.as_mut().peek().await, Some(&1u8));
+        assert_eq!(s.collect::<Vec<u8>>().await, vec![1]);
+    });
+}
+
+#[test]
+fn peekable_mut() {
+    block_on(async {
+        let s = stream::iter(vec![1u8, 2, 3]).peekable();
+        pin_mut!(s);
+        if let Some(p) = s.as_mut().peek_mut().await {
+            if *p == 1 {
+                *p = 5;
+            }
+        }
+        assert_eq!(s.collect::<Vec<_>>().await, vec![5, 2, 3]);
+    });
+}
+
+#[test]
+fn peekable_next_if_eq() {
+    block_on(async {
+        // first, try on references
+        let s = stream::iter(vec!["Heart", "of", "Gold"]).peekable();
+        pin_mut!(s);
+        // try before `peek()`
+        assert_eq!(s.as_mut().next_if_eq(&"trillian").await, None);
+        assert_eq!(s.as_mut().next_if_eq(&"Heart").await, Some("Heart"));
+        // try after peek()
+        assert_eq!(s.as_mut().peek().await, Some(&"of"));
+        assert_eq!(s.as_mut().next_if_eq(&"of").await, Some("of"));
+        assert_eq!(s.as_mut().next_if_eq(&"zaphod").await, None);
+        // make sure `next()` still behaves
+        assert_eq!(s.next().await, Some("Gold"));
+
+        // make sure comparison works for owned values
+        let s = stream::iter(vec![String::from("Ludicrous"), "speed".into()]).peekable();
+        pin_mut!(s);
+        // make sure basic functionality works
+        assert_eq!(s.as_mut().next_if_eq("Ludicrous").await, Some("Ludicrous".into()));
+        assert_eq!(s.as_mut().next_if_eq("speed").await, Some("speed".into()));
+        assert_eq!(s.as_mut().next_if_eq("").await, None);
     });
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,14 @@
+use futures::channel::mpsc;
+use futures::executor::block_on;
+use futures::future::{self, Future};
+use futures::sink::SinkExt;
+use futures::stream::{self, StreamExt};
+use futures::task::Poll;
+use futures::FutureExt;
+use futures_test::task::noop_context;
+
 #[test]
 fn select() {
-    use futures::executor::block_on;
-    use futures::stream::{self, StreamExt};
-
     fn select_and_compare(a: Vec<u32>, b: Vec<u32>, expected: Vec<u32>) {
         let a = stream::iter(a);
         let b = stream::iter(b);
@@ -17,19 +23,12 @@
 
 #[test]
 fn flat_map() {
-    use futures::stream::{self, StreamExt};
+    block_on(async {
+        let st =
+            stream::iter(vec![stream::iter(0..=4u8), stream::iter(6..=10), stream::iter(0..=2)]);
 
-    futures::executor::block_on(async {
-        let st = stream::iter(vec![
-            stream::iter(0..=4u8),
-            stream::iter(6..=10),
-            stream::iter(0..=2),
-        ]);
-
-        let values: Vec<_> = st
-            .flat_map(|s| s.filter(|v| futures::future::ready(v % 2 == 0)))
-            .collect()
-            .await;
+        let values: Vec<_> =
+            st.flat_map(|s| s.filter(|v| futures::future::ready(v % 2 == 0))).collect().await;
 
         assert_eq!(values, vec![0, 2, 4, 6, 8, 10, 0, 2]);
     });
@@ -37,28 +36,21 @@
 
 #[test]
 fn scan() {
-    use futures::stream::{self, StreamExt};
+    block_on(async {
+        let values = stream::iter(vec![1u8, 2, 3, 4, 6, 8, 2])
+            .scan(1, |state, e| {
+                *state += 1;
+                futures::future::ready(if e < *state { Some(e) } else { None })
+            })
+            .collect::<Vec<_>>()
+            .await;
 
-    futures::executor::block_on(async {
-        assert_eq!(
-            stream::iter(vec![1u8, 2, 3, 4, 6, 8, 2])
-                .scan(1, |state, e| {
-                    *state += 1;
-                    futures::future::ready(if e < *state { Some(e) } else { None })
-                })
-                .collect::<Vec<_>>()
-                .await,
-            vec![1u8, 2, 3, 4]
-        );
+        assert_eq!(values, vec![1u8, 2, 3, 4]);
     });
 }
 
 #[test]
 fn take_until() {
-    use futures::future::{self, Future};
-    use futures::stream::{self, StreamExt};
-    use futures::task::Poll;
-
     fn make_stop_fut(stop_on: u32) -> impl Future<Output = ()> {
         let mut i = 0;
         future::poll_fn(move |_cx| {
@@ -71,7 +63,7 @@
         })
     }
 
-    futures::executor::block_on(async {
+    block_on(async {
         // Verify stopping works:
         let stream = stream::iter(1u32..=10);
         let stop_fut = make_stop_fut(5);
@@ -123,10 +115,15 @@
 
 #[test]
 #[should_panic]
-fn ready_chunks_panic_on_cap_zero() {
-    use futures::channel::mpsc;
-    use futures::stream::StreamExt;
+fn chunks_panic_on_cap_zero() {
+    let (_, rx1) = mpsc::channel::<()>(1);
 
+    let _ = rx1.chunks(0);
+}
+
+#[test]
+#[should_panic]
+fn ready_chunks_panic_on_cap_zero() {
     let (_, rx1) = mpsc::channel::<()>(1);
 
     let _ = rx1.ready_chunks(0);
@@ -134,12 +131,6 @@
 
 #[test]
 fn ready_chunks() {
-    use futures::channel::mpsc;
-    use futures::stream::StreamExt;
-    use futures::sink::SinkExt;
-    use futures::FutureExt;
-    use futures_test::task::noop_context;
-
     let (mut tx, rx1) = mpsc::channel::<i32>(16);
 
     let mut s = rx1.ready_chunks(2);
@@ -147,14 +138,14 @@
     let mut cx = noop_context();
     assert!(s.next().poll_unpin(&mut cx).is_pending());
 
-    futures::executor::block_on(async {
+    block_on(async {
         tx.send(1).await.unwrap();
 
         assert_eq!(s.next().await.unwrap(), vec![1]);
         tx.send(2).await.unwrap();
         tx.send(3).await.unwrap();
         tx.send(4).await.unwrap();
-        assert_eq!(s.next().await.unwrap(), vec![2,3]);
+        assert_eq!(s.next().await.unwrap(), vec![2, 3]);
         assert_eq!(s.next().await.unwrap(), vec![4]);
     });
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_select_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_select_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_select_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_select_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,12 @@
+use futures::channel::mpsc;
+use futures::executor::{block_on, block_on_stream};
+use futures::future::{self, FutureExt};
+use futures::stream::{self, select_all, FusedStream, SelectAll, StreamExt};
+use futures::task::Poll;
+use futures_test::task::noop_context;
+
 #[test]
 fn is_terminated() {
-    use futures::future::{self, FutureExt};
-    use futures::stream::{FusedStream, SelectAll, StreamExt};
-    use futures::task::Poll;
-    use futures_test::task::noop_context;
-
     let mut cx = noop_context();
     let mut tasks = SelectAll::new();
 
@@ -30,9 +32,6 @@
 
 #[test]
 fn issue_1626() {
-    use futures::executor::block_on_stream;
-    use futures::stream;
-
     let a = stream::iter(0..=2);
     let b = stream::iter(10..=14);
 
@@ -51,10 +50,6 @@
 
 #[test]
 fn works_1() {
-    use futures::channel::mpsc;
-    use futures::executor::block_on_stream;
-    use futures::stream::select_all;
-
     let (a_tx, a_rx) = mpsc::unbounded::<u32>();
     let (b_tx, b_rx) = mpsc::unbounded::<u32>();
     let (c_tx, c_rx) = mpsc::unbounded::<u32>();
@@ -81,3 +76,122 @@
     drop((a_tx, b_tx, c_tx));
     assert_eq!(None, stream.next());
 }
+
+#[test]
+fn clear() {
+    let mut tasks =
+        select_all(vec![stream::iter(vec![1].into_iter()), stream::iter(vec![2].into_iter())]);
+
+    assert_eq!(block_on(tasks.next()), Some(1));
+    assert!(!tasks.is_empty());
+
+    tasks.clear();
+    assert!(tasks.is_empty());
+
+    tasks.push(stream::iter(vec![3].into_iter()));
+    assert!(!tasks.is_empty());
+
+    tasks.clear();
+    assert!(tasks.is_empty());
+
+    assert_eq!(block_on(tasks.next()), None);
+    assert!(tasks.is_terminated());
+    tasks.clear();
+    assert!(!tasks.is_terminated());
+}
+
+#[test]
+fn iter_mut() {
+    let mut stream =
+        vec![stream::pending::<()>(), stream::pending::<()>(), stream::pending::<()>()]
+            .into_iter()
+            .collect::<SelectAll<_>>();
+
+    let mut iter = stream.iter_mut();
+    assert_eq!(iter.len(), 3);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 2);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 1);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 0);
+    assert!(iter.next().is_none());
+
+    let mut stream = vec![stream::iter(vec![]), stream::iter(vec![1]), stream::iter(vec![2])]
+        .into_iter()
+        .collect::<SelectAll<_>>();
+
+    assert_eq!(stream.len(), 3);
+    assert_eq!(block_on(stream.next()), Some(1));
+    assert_eq!(stream.len(), 2);
+    let mut iter = stream.iter_mut();
+    assert_eq!(iter.len(), 2);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 1);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 0);
+    assert!(iter.next().is_none());
+
+    assert_eq!(block_on(stream.next()), Some(2));
+    assert_eq!(stream.len(), 2);
+    assert_eq!(block_on(stream.next()), None);
+    let mut iter = stream.iter_mut();
+    assert_eq!(iter.len(), 0);
+    assert!(iter.next().is_none());
+}
+
+#[test]
+fn iter() {
+    let stream = vec![stream::pending::<()>(), stream::pending::<()>(), stream::pending::<()>()]
+        .into_iter()
+        .collect::<SelectAll<_>>();
+
+    let mut iter = stream.iter();
+    assert_eq!(iter.len(), 3);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 2);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 1);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 0);
+    assert!(iter.next().is_none());
+
+    let mut stream = vec![stream::iter(vec![]), stream::iter(vec![1]), stream::iter(vec![2])]
+        .into_iter()
+        .collect::<SelectAll<_>>();
+
+    assert_eq!(stream.len(), 3);
+    assert_eq!(block_on(stream.next()), Some(1));
+    assert_eq!(stream.len(), 2);
+    let mut iter = stream.iter();
+    assert_eq!(iter.len(), 2);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 1);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 0);
+    assert!(iter.next().is_none());
+
+    assert_eq!(block_on(stream.next()), Some(2));
+    assert_eq!(stream.len(), 2);
+    assert_eq!(block_on(stream.next()), None);
+    let mut iter = stream.iter();
+    assert_eq!(iter.len(), 0);
+    assert!(iter.next().is_none());
+}
+
+#[test]
+fn into_iter() {
+    let stream = vec![stream::pending::<()>(), stream::pending::<()>(), stream::pending::<()>()]
+        .into_iter()
+        .collect::<SelectAll<_>>();
+
+    let mut iter = stream.into_iter();
+    assert_eq!(iter.len(), 3);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 2);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 1);
+    assert!(iter.next().is_some());
+    assert_eq!(iter.len(), 0);
+    assert!(iter.next().is_none());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_select_next_some.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_select_next_some.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_select_next_some.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_select_next_some.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,13 @@
+use futures::executor::block_on;
+use futures::future::{self, FusedFuture, FutureExt};
+use futures::select;
+use futures::stream::{FuturesUnordered, StreamExt};
+use futures::task::{Context, Poll};
+use futures_test::future::FutureTestExt;
+use futures_test::task::new_count_waker;
+
 #[test]
 fn is_terminated() {
-    use futures::future;
-    use futures::future::{FusedFuture, FutureExt};
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures::task::{Context, Poll};
-    use futures_test::task::new_count_waker;
-
     let (waker, counter) = new_count_waker();
     let mut cx = Context::from_waker(&waker);
 
@@ -30,15 +32,11 @@
 
 #[test]
 fn select() {
-    use futures::{future, select};
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures_test::future::FutureTestExt;
-
     // Checks that even though `async_tasks` will yield a `None` and return
     // `is_terminated() == true` during the first poll, it manages to toggle
     // back to having items after a future is pushed into it during the second
     // poll (after pending_once completes).
-    futures::executor::block_on(async {
+    block_on(async {
         let mut fut = future::ready(1).pending_once();
         let mut async_tasks = FuturesUnordered::new();
         let mut total = 0;
@@ -61,17 +59,13 @@
 // Check that `select!` macro does not fail when importing from `futures_util`.
 #[test]
 fn futures_util_select() {
-    use futures::future;
-    use futures::stream::{FuturesUnordered, StreamExt};
-    use futures_test::future::FutureTestExt;
-
     use futures_util::select;
 
     // Checks that even though `async_tasks` will yield a `None` and return
     // `is_terminated() == true` during the first poll, it manages to toggle
     // back to having items after a future is pushed into it during the second
     // poll (after pending_once completes).
-    futures::executor::block_on(async {
+    block_on(async {
         let mut fut = future::ready(1).pending_once();
         let mut async_tasks = FuturesUnordered::new();
         let mut total = 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_split.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,57 @@
+use futures::executor::block_on;
+use futures::sink::{Sink, SinkExt};
+use futures::stream::{self, Stream, StreamExt};
+use futures::task::{Context, Poll};
+use pin_project::pin_project;
+use std::pin::Pin;
+
+#[test]
+fn test_split() {
+    #[pin_project]
+    struct Join<T, U> {
+        #[pin]
+        stream: T,
+        #[pin]
+        sink: U,
+    }
+
+    impl<T: Stream, U> Stream for Join<T, U> {
+        type Item = T::Item;
+
+        fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T::Item>> {
+            self.project().stream.poll_next(cx)
+        }
+    }
+
+    impl<T, U: Sink<Item>, Item> Sink<Item> for Join<T, U> {
+        type Error = U::Error;
+
+        fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+            self.project().sink.poll_ready(cx)
+        }
+
+        fn start_send(self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
+            self.project().sink.start_send(item)
+        }
+
+        fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+            self.project().sink.poll_flush(cx)
+        }
+
+        fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+            self.project().sink.poll_close(cx)
+        }
+    }
+
+    let mut dest: Vec<i32> = Vec::new();
+    {
+        let join = Join { stream: stream::iter(vec![10, 20, 30]), sink: &mut dest };
+
+        let (sink, stream) = join.split();
+        let join = sink.reunite(stream).expect("test_split: reunite error");
+        let (mut sink, stream) = join.split();
+        let mut stream = stream.map(Ok);
+        block_on(sink.send_all(&mut stream)).unwrap();
+    }
+    assert_eq!(dest, vec![10, 20, 30]);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_try_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_try_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_try_stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_try_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,38 @@
+use futures::{
+    stream::{self, StreamExt, TryStreamExt},
+    task::Poll,
+};
+use futures_test::task::noop_context;
+
+#[test]
+fn try_filter_map_after_err() {
+    let cx = &mut noop_context();
+    let mut s = stream::iter(1..=3)
+        .map(Ok)
+        .try_filter_map(|v| async move { Err::<Option<()>, _>(v) })
+        .filter_map(|r| async move { r.ok() })
+        .boxed();
+    assert_eq!(Poll::Ready(None), s.poll_next_unpin(cx));
+}
+
+#[test]
+fn try_skip_while_after_err() {
+    let cx = &mut noop_context();
+    let mut s = stream::iter(1..=3)
+        .map(Ok)
+        .try_skip_while(|_| async move { Err::<_, ()>(()) })
+        .filter_map(|r| async move { r.ok() })
+        .boxed();
+    assert_eq!(Poll::Ready(None), s.poll_next_unpin(cx));
+}
+
+#[test]
+fn try_take_while_after_err() {
+    let cx = &mut noop_context();
+    let mut s = stream::iter(1..=3)
+        .map(Ok)
+        .try_take_while(|_| async move { Err::<_, ()>(()) })
+        .filter_map(|r| async move { r.ok() })
+        .boxed();
+    assert_eq!(Poll::Ready(None), s.poll_next_unpin(cx));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_unfold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_unfold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/stream_unfold.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/stream_unfold.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,32 @@
+use futures::future;
+use futures::stream;
+use futures_test::future::FutureTestExt;
+use futures_test::{assert_stream_done, assert_stream_next, assert_stream_pending};
+
+#[test]
+fn unfold1() {
+    let mut stream = stream::unfold(0, |state| {
+        if state <= 2 {
+            future::ready(Some((state * 2, state + 1))).pending_once()
+        } else {
+            future::ready(None).pending_once()
+        }
+    });
+
+    // Creates the future with the closure
+    // Not ready (delayed future)
+    assert_stream_pending!(stream);
+    // Future is ready, yields the item
+    assert_stream_next!(stream, 0);
+
+    // Repeat
+    assert_stream_pending!(stream);
+    assert_stream_next!(stream, 2);
+
+    assert_stream_pending!(stream);
+    assert_stream_next!(stream, 4);
+
+    // No more items
+    assert_stream_pending!(stream);
+    assert_stream_done!(stream);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/task_arc_wake.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/task_arc_wake.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/task_arc_wake.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/task_arc_wake.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,79 @@
+use futures::task::{self, ArcWake, Waker};
+use std::panic;
+use std::sync::{Arc, Mutex};
+
+struct CountingWaker {
+    nr_wake: Mutex<i32>,
+}
+
+impl CountingWaker {
+    fn new() -> Self {
+        Self { nr_wake: Mutex::new(0) }
+    }
+
+    fn wakes(&self) -> i32 {
+        *self.nr_wake.lock().unwrap()
+    }
+}
+
+impl ArcWake for CountingWaker {
+    fn wake_by_ref(arc_self: &Arc<Self>) {
+        let mut lock = arc_self.nr_wake.lock().unwrap();
+        *lock += 1;
+    }
+}
+
+#[test]
+fn create_from_arc() {
+    let some_w = Arc::new(CountingWaker::new());
+
+    let w1: Waker = task::waker(some_w.clone());
+    assert_eq!(2, Arc::strong_count(&some_w));
+    w1.wake_by_ref();
+    assert_eq!(1, some_w.wakes());
+
+    let w2 = w1.clone();
+    assert_eq!(3, Arc::strong_count(&some_w));
+
+    w2.wake_by_ref();
+    assert_eq!(2, some_w.wakes());
+
+    drop(w2);
+    assert_eq!(2, Arc::strong_count(&some_w));
+    drop(w1);
+    assert_eq!(1, Arc::strong_count(&some_w));
+}
+
+#[test]
+fn ref_wake_same() {
+    let some_w = Arc::new(CountingWaker::new());
+
+    let w1: Waker = task::waker(some_w.clone());
+    let w2 = task::waker_ref(&some_w);
+    let w3 = w2.clone();
+
+    assert!(w1.will_wake(&w2));
+    assert!(w2.will_wake(&w3));
+}
+
+#[test]
+fn proper_refcount_on_wake_panic() {
+    struct PanicWaker;
+
+    impl ArcWake for PanicWaker {
+        fn wake_by_ref(_arc_self: &Arc<Self>) {
+            panic!("WAKE UP");
+        }
+    }
+
+    let some_w = Arc::new(PanicWaker);
+
+    let w1: Waker = task::waker(some_w.clone());
+    assert_eq!(
+        "WAKE UP",
+        *panic::catch_unwind(|| w1.wake_by_ref()).unwrap_err().downcast::<&str>().unwrap()
+    );
+    assert_eq!(2, Arc::strong_count(&some_w)); // some_w + w1
+    drop(w1);
+    assert_eq!(1, Arc::strong_count(&some_w)); // some_w
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/task_atomic_waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/task_atomic_waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/task_atomic_waker.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/task_atomic_waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+use futures::executor::block_on;
+use futures::future::poll_fn;
+use futures::task::{AtomicWaker, Poll};
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+use std::sync::Arc;
+use std::thread;
+
+#[test]
+fn basic() {
+    let atomic_waker = Arc::new(AtomicWaker::new());
+    let atomic_waker_copy = atomic_waker.clone();
+
+    let returned_pending = Arc::new(AtomicUsize::new(0));
+    let returned_pending_copy = returned_pending.clone();
+
+    let woken = Arc::new(AtomicUsize::new(0));
+    let woken_copy = woken.clone();
+
+    let t = thread::spawn(move || {
+        let mut pending_count = 0;
+
+        block_on(poll_fn(move |cx| {
+            if woken_copy.load(Ordering::Relaxed) == 1 {
+                Poll::Ready(())
+            } else {
+                // Assert we return pending exactly once
+                assert_eq!(0, pending_count);
+                pending_count += 1;
+                atomic_waker_copy.register(cx.waker());
+
+                returned_pending_copy.store(1, Ordering::Relaxed);
+
+                Poll::Pending
+            }
+        }))
+    });
+
+    while returned_pending.load(Ordering::Relaxed) == 0 {}
+
+    // give spawned thread some time to sleep in `block_on`
+    thread::yield_now();
+
+    woken.store(1, Ordering::Relaxed);
+    atomic_waker.wake();
+
+    t.join().unwrap();
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/test_macro.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/test_macro.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/test_macro.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/test_macro.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+#[futures_test::test]
+async fn it_works() {
+    let fut = async { true };
+    assert!(fut.await);
+
+    let fut = async { false };
+    assert!(!fut.await);
+}
+
+#[should_panic]
+#[futures_test::test]
+async fn it_is_being_run() {
+    let fut = async { false };
+    assert!(fut.await);
+}
+
+#[futures_test::test]
+async fn return_ty() -> Result<(), ()> {
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/try_join_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/try_join_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/try_join_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/try_join_all.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-mod util {
-    use std::future::Future;
-    use futures::executor::block_on;
-    use std::fmt::Debug;
-
-    pub fn assert_done<T, F>(actual_fut: F, expected: T)
-    where
-        T: PartialEq + Debug,
-        F: FnOnce() -> Box<dyn Future<Output = T> + Unpin>,
-    {
-        let output = block_on(actual_fut());
-        assert_eq!(output, expected);
-    }
-}
-
-#[test]
-fn collect_collects() {
-    use futures_util::future::{err, ok, try_join_all};
-
-    use util::assert_done;
-
-    assert_done(|| Box::new(try_join_all(vec![ok(1), ok(2)])), Ok::<_, usize>(vec![1, 2]));
-    assert_done(|| Box::new(try_join_all(vec![ok(1), err(2)])), Err(2));
-    assert_done(|| Box::new(try_join_all(vec![ok(1)])), Ok::<_, usize>(vec![1]));
-    // REVIEW: should this be implemented?
-    // assert_done(|| Box::new(try_join_all(Vec::<i32>::new())), Ok(vec![]));
-
-    // TODO: needs more tests
-}
-
-#[test]
-fn try_join_all_iter_lifetime() {
-    use futures_util::future::{ok, try_join_all};
-    use std::future::Future;
-
-    use util::assert_done;
-
-    // In futures-rs version 0.1, this function would fail to typecheck due to an overly
-    // conservative type parameterization of `TryJoinAll`.
-    fn sizes(bufs: Vec<&[u8]>) -> Box<dyn Future<Output = Result<Vec<usize>, ()>> + Unpin> {
-        let iter = bufs.into_iter().map(|b| ok::<usize, ()>(b.len()));
-        Box::new(try_join_all(iter))
-    }
-
-    assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), Ok(vec![3_usize, 0, 1]));
-}
-
-#[test]
-fn try_join_all_from_iter() {
-    use futures_util::future::{ok, TryJoinAll};
-
-    use util::assert_done;
-
-    assert_done(
-        || Box::new(vec![ok(1), ok(2)].into_iter().collect::<TryJoinAll<_>>()),
-        Ok::<_, usize>(vec![1, 2]),
-    )
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/try_join.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/try_join.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/try_join.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/try_join.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,9 @@
 #![deny(unreachable_code)]
 
-use futures::{try_join, executor::block_on};
+use futures::{executor::block_on, try_join};
 
 // TODO: This abuses https://github.com/rust-lang/rust/issues/58733 in order to
-// test behaviour of the `try_join!` macro with the never type before it is
+// test behavior of the `try_join!` macro with the never type before it is
 // stabilized. Once `!` is again stabilized this can be removed and replaced
 // with direct use of `!` below where `Never` is used.
 trait MyTrait {
@@ -14,7 +14,6 @@
 }
 type Never = <fn() -> ! as MyTrait>::Output;
 
-
 #[test]
 fn try_join_never_error() {
     block_on(async {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/try_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/try_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/try_stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/try_stream.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-use futures::{
-    stream::{self, StreamExt, TryStreamExt},
-    task::Poll,
-};
-use futures_test::task::noop_context;
-
-#[test]
-fn try_filter_map_after_err() {
-    let cx = &mut noop_context();
-    let mut s = stream::iter(1..=3)
-        .map(Ok)
-        .try_filter_map(|v| async move { Err::<Option<()>, _>(v) })
-        .filter_map(|r| async move { r.ok() })
-        .boxed();
-    assert_eq!(Poll::Ready(None), s.poll_next_unpin(cx));
-}
-
-#[test]
-fn try_skip_while_after_err() {
-    let cx = &mut noop_context();
-    let mut s = stream::iter(1..=3)
-        .map(Ok)
-        .try_skip_while(|_| async move { Err::<_, ()>(()) })
-        .filter_map(|r| async move { r.ok() })
-        .boxed();
-    assert_eq!(Poll::Ready(None), s.poll_next_unpin(cx));
-}
-
-#[test]
-fn try_take_while_after_err() {
-    let cx = &mut noop_context();
-    let mut s = stream::iter(1..=3)
-        .map(Ok)
-        .try_take_while(|_| async move { Err::<_, ()>(()) })
-        .filter_map(|r| async move { r.ok() })
-        .boxed();
-    assert_eq!(Poll::Ready(None), s.poll_next_unpin(cx));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/unfold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/unfold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests/unfold.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests/unfold.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-use futures::future;
-use futures::stream;
-
-use futures_test::future::FutureTestExt;
-use futures_test::{
-    assert_stream_done, assert_stream_next, assert_stream_pending,
-};
-
-#[test]
-fn unfold1() {
-    let mut stream = stream::unfold(0, |state| {
-        if state <= 2 {
-            future::ready(Some((state * 2, state + 1))).pending_once()
-        } else {
-            future::ready(None).pending_once()
-        }
-    });
-
-    // Creates the future with the closure
-    // Not ready (delayed future)
-    assert_stream_pending!(stream);
-    // Future is ready, yields the item
-    assert_stream_next!(stream, 0);
-
-    // Repeat
-    assert_stream_pending!(stream);
-    assert_stream_next!(stream, 2);
-
-    assert_stream_pending!(stream);
-    assert_stream_next!(stream, 4);
-
-    // No more items
-    assert_stream_pending!(stream);
-    assert_stream_done!(stream);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests_disabled/all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests_disabled/all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests_disabled/all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests_disabled/all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,27 +1,27 @@
-use futures::future;
-use futures::executor::block_on;
 use futures::channel::oneshot::{self, Canceled};
+use futures::executor::block_on;
+use futures::future;
 use std::sync::mpsc::{channel, TryRecvError};
 
-mod support;
-use support::*;
+// mod support;
+// use support::*;
 
 fn unselect<T, E, A, B>(r: Result<Either<(T, B), (T, A)>, Either<(E, B), (E, A)>>) -> Result<T, E> {
     match r {
-        Ok(Either::Left((t, _))) |
-        Ok(Either::Right((t, _))) => Ok(t),
-        Err(Either::Left((e, _))) |
-        Err(Either::Right((e, _))) => Err(e),
+        Ok(Either::Left((t, _))) | Ok(Either::Right((t, _))) => Ok(t),
+        Err(Either::Left((e, _))) | Err(Either::Right((e, _))) => Err(e),
     }
 }
 
 #[test]
 fn result_smoke() {
     fn is_future_v<A, B, C>(_: C)
-        where A: Send + 'static,
-              B: Send + 'static,
-              C: Future<Item=A, Error=B>
-    {}
+    where
+        A: Send + 'static,
+        B: Send + 'static,
+        C: Future<Item = A, Error = B>,
+    {
+    }
 
     is_future_v::<i32, u32, _>(f_ok(1).map(|a| a + 1));
     is_future_v::<i32, u32, _>(f_ok(1).map_err(|a| a + 1));
@@ -64,7 +64,9 @@
 
 #[test]
 fn test_empty() {
-    fn empty() -> Empty<i32, u32> { future::empty() }
+    fn empty() -> Empty<i32, u32> {
+        future::empty()
+    }
 
     assert_empty(|| empty());
     assert_empty(|| empty().select(empty()));
@@ -105,16 +107,22 @@
 
 #[test]
 fn smoke_oneshot() {
-    assert_done(|| {
-        let (c, p) = oneshot::channel();
-        c.send(1).unwrap();
-        p
-    }, Ok(1));
-    assert_done(|| {
-        let (c, p) = oneshot::channel::<i32>();
-        drop(c);
-        p
-    }, Err(Canceled));
+    assert_done(
+        || {
+            let (c, p) = oneshot::channel();
+            c.send(1).unwrap();
+            p
+        },
+        Ok(1),
+    );
+    assert_done(
+        || {
+            let (c, p) = oneshot::channel::<i32>();
+            drop(c);
+            p
+        },
+        Err(Canceled),
+    );
     let mut completes = Vec::new();
     assert_empty(|| {
         let (a, b) = oneshot::channel::<i32>();
@@ -129,9 +137,7 @@
     let (c, p) = oneshot::channel::<i32>();
     drop(c);
     let (tx, rx) = channel();
-    p.then(move |_| {
-        tx.send(())
-    }).forget();
+    p.then(move |_| tx.send(())).forget();
     rx.recv().unwrap();
 }
 
@@ -139,8 +145,14 @@
 fn select_cancels() {
     let ((a, b), (c, d)) = (oneshot::channel::<i32>(), oneshot::channel::<i32>());
     let ((btx, brx), (dtx, drx)) = (channel(), channel());
-    let b = b.map(move |b| { btx.send(b).unwrap(); b });
-    let d = d.map(move |d| { dtx.send(d).unwrap(); d });
+    let b = b.map(move |b| {
+        btx.send(b).unwrap();
+        b
+    });
+    let d = d.map(move |d| {
+        dtx.send(d).unwrap();
+        d
+    });
 
     let mut f = b.select(d).then(unselect);
     // assert!(f.poll(&mut Task::new()).is_pending());
@@ -156,8 +168,14 @@
 
         let ((a, b), (c, d)) = (oneshot::channel::<i32>(), oneshot::channel::<i32>());
         let ((btx, _brx), (dtx, drx)) = (channel(), channel());
-        let b = b.map(move |b| { btx.send(b).unwrap(); b });
-        let d = d.map(move |d| { dtx.send(d).unwrap(); d });
+        let b = b.map(move |b| {
+            btx.send(b).unwrap();
+            b
+        });
+        let d = d.map(move |d| {
+            dtx.send(d).unwrap();
+            d
+        });
 
         let mut f = b.select(d).then(unselect);
         assert!(f.poll(lw).ok().unwrap().is_pending());
@@ -173,8 +191,14 @@
 fn join_cancels() {
     let ((a, b), (c, d)) = (oneshot::channel::<i32>(), oneshot::channel::<i32>());
     let ((btx, _brx), (dtx, drx)) = (channel(), channel());
-    let b = b.map(move |b| { btx.send(b).unwrap(); b });
-    let d = d.map(move |d| { dtx.send(d).unwrap(); d });
+    let b = b.map(move |b| {
+        btx.send(b).unwrap();
+        b
+    });
+    let d = d.map(move |d| {
+        dtx.send(d).unwrap();
+        d
+    });
 
     let mut f = b.join(d);
     drop(a);
@@ -185,8 +209,14 @@
 
     let ((a, b), (c, d)) = (oneshot::channel::<i32>(), oneshot::channel::<i32>());
     let ((btx, _brx), (dtx, drx)) = (channel(), channel());
-    let b = b.map(move |b| { btx.send(b).unwrap(); b });
-    let d = d.map(move |d| { dtx.send(d).unwrap(); d });
+    let b = b.map(move |b| {
+        btx.send(b).unwrap();
+        b
+    });
+    let d = d.map(move |d| {
+        dtx.send(d).unwrap();
+        d
+    });
 
     let (tx, rx) = channel();
     let f = b.join(d);
@@ -194,7 +224,8 @@
         tx.send(()).unwrap();
         let res: Result<(), ()> = Ok(());
         res
-    }).forget();
+    })
+    .forget();
     assert!(rx.try_recv().is_err());
     drop(a);
     rx.recv().unwrap();
@@ -243,7 +274,6 @@
     })
 }
 
-
 #[test]
 fn select2() {
     assert_done(|| f_ok(2).select(empty()).then(unselect), Ok(2));
@@ -251,14 +281,15 @@
     assert_done(|| f_err(2).select(empty()).then(unselect), Err(2));
     assert_done(|| empty().select(f_err(2)).then(unselect), Err(2));
 
-    assert_done(|| {
-        f_ok(1).select(f_ok(2))
-               .map_err(|_| 0)
-               .and_then(|either_tup| {
-                   let (a, b) = either_tup.into_inner();
-                   b.map(move |b| a + b)
-               })
-    }, Ok(3));
+    assert_done(
+        || {
+            f_ok(1).select(f_ok(2)).map_err(|_| 0).and_then(|either_tup| {
+                let (a, b) = either_tup.into_inner();
+                b.map(move |b| a + b)
+            })
+        },
+        Ok(3),
+    );
 
     // Finish one half of a select and then fail the second, ensuring that we
     // get the notification of the second one.
@@ -297,8 +328,14 @@
     {
         let ((_a, b), (_c, d)) = (oneshot::channel::<i32>(), oneshot::channel::<i32>());
         let ((btx, brx), (dtx, drx)) = (channel(), channel());
-        let b = b.map(move |v| { btx.send(v).unwrap(); v });
-        let d = d.map(move |v| { dtx.send(v).unwrap(); v });
+        let b = b.map(move |v| {
+            btx.send(v).unwrap();
+            v
+        });
+        let d = d.map(move |v| {
+            dtx.send(v).unwrap();
+            v
+        });
         let f = b.select(d);
         drop(f);
         assert!(drx.recv().is_err());
@@ -309,8 +346,14 @@
     {
         let ((_a, b), (_c, d)) = (oneshot::channel::<i32>(), oneshot::channel::<i32>());
         let ((btx, brx), (dtx, drx)) = (channel(), channel());
-        let b = b.map(move |v| { btx.send(v).unwrap(); v });
-        let d = d.map(move |v| { dtx.send(v).unwrap(); v });
+        let b = b.map(move |v| {
+            btx.send(v).unwrap();
+            v
+        });
+        let d = d.map(move |v| {
+            dtx.send(v).unwrap();
+            v
+        });
         let mut f = b.select(d);
         let _res = noop_waker_lw(|lw| f.poll(lw));
         drop(f);
@@ -322,8 +365,14 @@
     {
         let ((a, b), (_c, d)) = (oneshot::channel::<i32>(), oneshot::channel::<i32>());
         let ((btx, brx), (dtx, drx)) = (channel(), channel());
-        let b = b.map(move |v| { btx.send(v).unwrap(); v });
-        let d = d.map(move |v| { dtx.send(v).unwrap(); v });
+        let b = b.map(move |v| {
+            btx.send(v).unwrap();
+            v
+        });
+        let d = d.map(move |v| {
+            dtx.send(v).unwrap();
+            v
+        });
         let (tx, rx) = channel();
         b.select(d).map(move |_| tx.send(()).unwrap()).forget();
         drop(a);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests_disabled/bilock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests_disabled/bilock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests_disabled/bilock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests_disabled/bilock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
-use futures::task;
-use futures::stream;
 use futures::future;
+use futures::stream;
+use futures::task;
 use futures_util::lock::BiLock;
 use std::thread;
 
-mod support;
-use support::*;
+// mod support;
+// use support::*;
 
 #[test]
 fn smoke() {
@@ -41,9 +41,9 @@
     });
 
     assert!(task::spawn(future)
-                .poll_future_notify(&notify_noop(), 0)
-                .expect("failure in poll")
-                .is_ready());
+        .poll_future_notify(&notify_noop(), 0)
+        .expect("failure in poll")
+        .is_ready());
 }
 
 #[test]
@@ -51,10 +51,7 @@
     const N: usize = 10000;
     let (a, b) = BiLock::new(0);
 
-    let a = Increment {
-        a: Some(a),
-        remaining: N,
-    };
+    let a = Increment { a: Some(a), remaining: N };
     let b = stream::iter_ok(0..N).fold(b, |b, _n| {
         b.lock().map(|mut b| {
             *b += 1;
@@ -89,7 +86,7 @@
         fn poll(&mut self) -> Poll<BiLock<usize>, ()> {
             loop {
                 if self.remaining == 0 {
-                    return Ok(self.a.take().unwrap().into())
+                    return Ok(self.a.take().unwrap().into());
                 }
 
                 let a = self.a.as_ref().unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests_disabled/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests_disabled/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures/tests_disabled/stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures/tests_disabled/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,26 @@
+use futures::channel::mpsc;
+use futures::channel::oneshot;
 use futures::executor::{block_on, block_on_stream};
 use futures::future::{err, ok};
 use futures::stream::{empty, iter_ok, poll_fn, Peekable};
-use futures::channel::oneshot;
-use futures::channel::mpsc;
 
-mod support;
-use support::*;
+// mod support;
+// use support::*;
 
 pub struct Iter<I> {
     iter: I,
 }
 
 pub fn iter<J, T, E>(i: J) -> Iter<J::IntoIter>
-    where J: IntoIterator<Item=Result<T, E>>,
+where
+    J: IntoIterator<Item = Result<T, E>>,
 {
-    Iter {
-        iter: i.into_iter(),
-    }
+    Iter { iter: i.into_iter() }
 }
 
 impl<I, T, E> Stream for Iter<I>
-    where I: Iterator<Item=Result<T, E>>,
+where
+    I: Iterator<Item = Result<T, E>>,
 {
     type Item = T;
     type Error = E;
@@ -34,21 +34,15 @@
     }
 }
 
-fn list() -> Box<Stream<Item=i32, Error=u32> + Send> {
+fn list() -> Box<Stream<Item = i32, Error = u32> + Send> {
     let (tx, rx) = mpsc::channel(1);
-    tx.send(Ok(1))
-      .and_then(|tx| tx.send(Ok(2)))
-      .and_then(|tx| tx.send(Ok(3)))
-      .forget();
+    tx.send(Ok(1)).and_then(|tx| tx.send(Ok(2))).and_then(|tx| tx.send(Ok(3))).forget();
     Box::new(rx.then(|r| r.unwrap()))
 }
 
-fn err_list() -> Box<Stream<Item=i32, Error=u32> + Send> {
+fn err_list() -> Box<Stream<Item = i32, Error = u32> + Send> {
     let (tx, rx) = mpsc::channel(1);
-    tx.send(Ok(1))
-      .and_then(|tx| tx.send(Ok(2)))
-      .and_then(|tx| tx.send(Err(3)))
-      .forget();
+    tx.send(Ok(1)).and_then(|tx| tx.send(Ok(2))).and_then(|tx| tx.send(Err(3))).forget();
     Box::new(rx.then(|r| r.unwrap()))
 }
 
@@ -89,40 +83,31 @@
 
 #[test]
 fn filter_map() {
-    assert_done(|| list().filter_map(|x| {
-        ok(if x % 2 == 0 {
-            Some(x + 10)
-        } else {
-            None
-        })
-    }).collect(), Ok(vec![12]));
+    assert_done(
+        || list().filter_map(|x| ok(if x % 2 == 0 { Some(x + 10) } else { None })).collect(),
+        Ok(vec![12]),
+    );
 }
 
 #[test]
 fn and_then() {
     assert_done(|| list().and_then(|a| Ok(a + 1)).collect(), Ok(vec![2, 3, 4]));
-    assert_done(|| list().and_then(|a| err::<i32, u32>(a as u32)).collect::<Vec<_>>(),
-                Err(1));
+    assert_done(|| list().and_then(|a| err::<i32, u32>(a as u32)).collect::<Vec<_>>(), Err(1));
 }
 
 #[test]
 fn then() {
     assert_done(|| list().then(|a| a.map(|e| e + 1)).collect(), Ok(vec![2, 3, 4]));
-
 }
 
 #[test]
 fn or_else() {
-    assert_done(|| err_list().or_else(|a| {
-        ok::<i32, u32>(a as i32)
-    }).collect(), Ok(vec![1, 2, 3]));
+    assert_done(|| err_list().or_else(|a| ok::<i32, u32>(a as i32)).collect(), Ok(vec![1, 2, 3]));
 }
 
 #[test]
 fn flatten() {
-    assert_done(|| list().map(|_| list()).flatten().collect(),
-                Ok(vec![1, 2, 3, 1, 2, 3, 1, 2, 3]));
-
+    assert_done(|| list().map(|_| list()).flatten().collect(), Ok(vec![1, 2, 3, 1, 2, 3, 1, 2, 3]));
 }
 
 #[test]
@@ -132,9 +117,7 @@
 
 #[test]
 fn skip_passes_errors_through() {
-    let mut s = block_on_stream(
-        iter(vec![Err(1), Err(2), Ok(3), Ok(4), Ok(5)]).skip(1)
-    );
+    let mut s = block_on_stream(iter(vec![Err(1), Err(2), Ok(3), Ok(4), Ok(5)]).skip(1));
     assert_eq!(s.next(), Some(Err(1)));
     assert_eq!(s.next(), Some(Err(2)));
     assert_eq!(s.next(), Some(Ok(4)));
@@ -144,8 +127,7 @@
 
 #[test]
 fn skip_while() {
-    assert_done(|| list().skip_while(|e| Ok(*e % 2 == 1)).collect(),
-                Ok(vec![2, 3]));
+    assert_done(|| list().skip_while(|e| Ok(*e % 2 == 1)).collect(), Ok(vec![2, 3]));
 }
 #[test]
 fn take() {
@@ -154,8 +136,7 @@
 
 #[test]
 fn take_while() {
-    assert_done(|| list().take_while(|e| Ok(*e < 3)).collect(),
-                Ok(vec![1, 2]));
+    assert_done(|| list().take_while(|e| Ok(*e < 3)).collect(), Ok(vec![1, 2]));
 }
 
 #[test]
@@ -193,9 +174,9 @@
     let (a, b) = oneshot::channel::<u32>();
     let (c, d) = oneshot::channel::<u32>();
 
-    tx.send(Box::new(b.recover(|_| panic!())) as Box<Future<Item=_, Error=_> + Send>)
-      .and_then(|tx| tx.send(Box::new(d.map_err(|_| panic!()))))
-      .forget();
+    tx.send(Box::new(b.recover(|_| panic!())) as Box<Future<Item = _, Error = _> + Send>)
+        .and_then(|tx| tx.send(Box::new(d.map_err(|_| panic!()))))
+        .forget();
 
     let mut rx = rx.buffered(2);
     sassert_empty(&mut rx);
@@ -211,9 +192,9 @@
     let (a, b) = oneshot::channel::<u32>();
     let (c, d) = oneshot::channel::<u32>();
 
-    tx.send(Box::new(b.recover(|_| panic!())) as Box<Future<Item=_, Error=_> + Send>)
-      .and_then(|tx| tx.send(Box::new(d.map_err(|_| panic!()))))
-      .forget();
+    tx.send(Box::new(b.recover(|_| panic!())) as Box<Future<Item = _, Error = _> + Send>)
+        .and_then(|tx| tx.send(Box::new(d.map_err(|_| panic!()))))
+        .forget();
 
     let mut rx = rx.buffered(1);
     sassert_empty(&mut rx);
@@ -233,8 +214,8 @@
     let (c, d) = oneshot::channel::<u32>();
 
     tx.send(Box::new(b.recover(|_| panic!())) as Box<Future<Item = _, Error = _> + Send>)
-      .and_then(|tx| tx.send(Box::new(d.recover(|_| panic!()))))
-      .forget();
+        .and_then(|tx| tx.send(Box::new(d.recover(|_| panic!()))))
+        .forget();
 
     let mut rx = rx.buffer_unordered(2);
     sassert_empty(&mut rx);
@@ -250,8 +231,8 @@
     let (c, d) = oneshot::channel::<u32>();
 
     tx.send(Box::new(b.recover(|_| panic!())) as Box<Future<Item = _, Error = _> + Send>)
-      .and_then(|tx| tx.send(Box::new(d.recover(|_| panic!()))))
-      .forget();
+        .and_then(|tx| tx.send(Box::new(d.recover(|_| panic!()))))
+        .forget();
 
     // We don't even get to see `c` until `a` completes.
     let mut rx = rx.buffer_unordered(1);
@@ -267,21 +248,17 @@
 
 #[test]
 fn zip() {
-    assert_done(|| list().zip(list()).collect(),
-                Ok(vec![(1, 1), (2, 2), (3, 3)]));
-    assert_done(|| list().zip(list().take(2)).collect(),
-                Ok(vec![(1, 1), (2, 2)]));
-    assert_done(|| list().take(2).zip(list()).collect(),
-                Ok(vec![(1, 1), (2, 2)]));
+    assert_done(|| list().zip(list()).collect(), Ok(vec![(1, 1), (2, 2), (3, 3)]));
+    assert_done(|| list().zip(list().take(2)).collect(), Ok(vec![(1, 1), (2, 2)]));
+    assert_done(|| list().take(2).zip(list()).collect(), Ok(vec![(1, 1), (2, 2)]));
     assert_done(|| err_list().zip(list()).collect::<Vec<_>>(), Err(3));
-    assert_done(|| list().zip(list().map(|x| x + 1)).collect(),
-                Ok(vec![(1, 2), (2, 3), (3, 4)]));
+    assert_done(|| list().zip(list().map(|x| x + 1)).collect(), Ok(vec![(1, 2), (2, 3), (3, 4)]));
 }
 
 #[test]
 fn peek() {
     struct Peek {
-        inner: Peekable<Box<Stream<Item = i32, Error =u32> + Send>>
+        inner: Peekable<Box<Stream<Item = i32, Error = u32> + Send>>,
     }
 
     impl Future for Peek {
@@ -299,15 +276,12 @@
         }
     }
 
-    block_on(Peek {
-        inner: list().peekable(),
-    }).unwrap()
+    block_on(Peek { inner: list().peekable() }).unwrap()
 }
 
 #[test]
 fn wait() {
-    assert_eq!(block_on_stream(list()).collect::<Result<Vec<_>, _>>(),
-               Ok(vec![1, 2, 3]));
+    assert_eq!(block_on_stream(list()).collect::<Result<Vec<_>, _>>(), Ok(vec![1, 2, 3]));
 }
 
 #[test]
@@ -337,8 +311,10 @@
     let v = block_on(iter_ok::<_, Never>(vec![2, 3]).forward(v)).unwrap().1;
     assert_eq!(v, vec![0, 1, 2, 3]);
 
-    assert_done(move || iter_ok::<_, Never>(vec![4, 5]).forward(v).map(|(_, s)| s),
-                Ok(vec![0, 1, 2, 3, 4, 5]));
+    assert_done(
+        move || iter_ok::<_, Never>(vec![4, 5]).forward(v).map(|(_, s)| s),
+        Ok(vec![0, 1, 2, 3, 4, 5]),
+    );
 }
 
 #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/benches/sync_mpsc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/benches/sync_mpsc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/benches/sync_mpsc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/benches/sync_mpsc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,8 +7,8 @@
     futures::{
         channel::mpsc::{self, Sender, UnboundedSender},
         ready,
-        stream::{Stream, StreamExt},
         sink::Sink,
+        stream::{Stream, StreamExt},
         task::{Context, Poll},
     },
     futures_test::task::noop_context,
@@ -25,7 +25,6 @@
         // 1000 iterations to avoid measuring overhead of initialization
         // Result should be divided by 1000
         for i in 0..1000 {
-
             // Poll, not ready, park
             assert_eq!(Poll::Pending, rx.poll_next_unpin(&mut cx));
 
@@ -73,7 +72,6 @@
     })
 }
 
-
 /// A Stream that continuously sends incrementing number of the queue
 struct TestSender {
     tx: Sender<u32>,
@@ -84,9 +82,7 @@
 impl Stream for TestSender {
     type Item = u32;
 
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>)
-        -> Poll<Option<Self::Item>>
-    {
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let this = &mut *self;
         let mut tx = Pin::new(&mut this.tx);
 
@@ -123,12 +119,7 @@
         // Each sender can send one item after specified capacity
         let (tx, mut rx) = mpsc::channel(0);
 
-        let mut tx: Vec<_> = (0..100).map(|_| {
-            TestSender {
-                tx: tx.clone(),
-                last: 0
-            }
-        }).collect();
+        let mut tx: Vec<_> = (0..100).map(|_| TestSender { tx: tx.clone(), last: 0 }).collect();
 
         for i in 0..10 {
             for x in &mut tx {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+#![warn(rust_2018_idioms, single_use_lifetimes)]
+
+use std::env;
+
+include!("no_atomic_cas.rs");
+
+// The rustc-cfg listed below are considered public API, but it is *unstable*
+// and outside of the normal semver guarantees:
+//
+// - `futures_no_atomic_cas`
+//      Assume the target does *not* support atomic CAS operations.
+//      This is usually detected automatically by the build script, but you may
+//      need to enable it manually when building for custom targets or using
+//      non-cargo build systems that don't run the build script.
+//
+// With the exceptions mentioned above, the rustc-cfg strings below are
+// *not* public API. Please let us know by opening a GitHub issue if your build
+// environment requires some way to enable these cfgs other than by executing
+// our build script.
+fn main() {
+    let target = match env::var("TARGET") {
+        Ok(target) => target,
+        Err(e) => {
+            println!(
+                "cargo:warning={}: unable to get TARGET environment variable: {}",
+                env!("CARGO_PKG_NAME"),
+                e
+            );
+            return;
+        }
+    };
+
+    // Note that this is `no_*`, not `has_*`. This allows treating
+    // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't
+    // run. This is needed for compatibility with non-cargo build systems that
+    // don't run the build script.
+    if NO_ATOMIC_CAS_TARGETS.contains(&&*target) {
+        println!("cargo:rustc-cfg=futures_no_atomic_cas");
+    }
+
+    println!("cargo:rerun-if-changed=no_atomic_cas.rs");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"f973e6c136726d53505971fa435ee34e82dc28ab754c7d174168ad997bb3eb36","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","benches/sync_mpsc.rs":"0df4edf979e0d95fcae41b47aeb9b8663d63fc3d60e53aeb8d4777f117405a3d","src/lib.rs":"e903842941db804fa9b28fd9ab684044c358fd9b68dab742549e33001851e9b5","src/lock.rs":"4bd5433db2d750b83420850698e5c62bf102fce8aea310e20e60f75c3532c0a4","src/mpsc/mod.rs":"385e3fa89a20c605432ae6ffe48ac8ad071ff3ddb2e69889a64d058a7fa35074","src/mpsc/queue.rs":"4079db228bea9d6dd2a3a5ea799d78abb1711e2aed7dcf481fe837002831f812","src/mpsc/sink_impl.rs":"b75fe55e6b935c9132fedcae00b0369b4d988aafe0b7145f12ff4d00a0ace833","src/oneshot.rs":"4344c38e08179c6b054e471a7701e7ec2fd01cbd1b26f2017e3d349d4571fde7","tests/channel.rs":"f90bd4996b4cfcc690e8497655d6f755d565b80335d77e7ef034ae4c1b31b25d","tests/mpsc-close.rs":"8cfa1dbec63658d70d02aa828d4d9f69a0bdad3414dec8e2ef8c93bcac9a11cf","tests/mpsc.rs":"cf757feea79b101431ff864d5248b8dc31ef26f067d6234e699f5728e3e60f66","tests/oneshot.rs":"d981e8733eecea7b3d49aa2ba63d579ea4e7ae9cc0b590b2446f7c5b5db9b8e3"},"package":"4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"}
\ No newline at end of file
+{"files":{"Cargo.toml":"b8267758fedef79bcec5e43650f2bf3291e86867424434cb60e7944b66cb4dc4","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","benches/sync_mpsc.rs":"1019dd027f104f58883f396ff70efc3dd69b3a7d62df17af090e07b2b05eaf66","build.rs":"f6e21c09f18cc405bd7048cb7a2958f92d5414b9ca6b301d137e120a84fa020a","no_atomic_cas.rs":"ff8be002b49a5cd9e4ca0db17b1c9e6b98e55f556319eb6b953dd6ff52c397a6","src/lib.rs":"2955e70d292208747fbb29810ef88f390f0f1b22b112fa59d60f95480d470e75","src/lock.rs":"38655a797456ea4f67d132c42055cf74f18195e875c3b337fc81a12901f79292","src/mpsc/mod.rs":"71c8fb3ac645bc587684a9e115b8859044acbade540299a1f9dd952aa27d6ba5","src/mpsc/queue.rs":"8822f466e7fe5a8d25ba994b7022ad7c14bcfd473d354a6cd0490240d3e170e7","src/mpsc/sink_impl.rs":"c9977b530187e82c912fcd46e08316e48ed246e77bb2419d53020e69e403d086","src/oneshot.rs":"d1170289b39656ea5f0d5f42b905ddbd5fa9c1202aa3297c9f25280a48229910","tests/channel.rs":"88f4a41d82b5c1b01e153d071a2bf48e0697355908c55ca42342ed45e63fdec8","tests/mpsc-close.rs":"456e43d3b4aad317c84da81297b05743609af57b26d10470e478f1677e4bf731","tests/mpsc.rs":"c929860c11be704692e709c10a3f5e046d6c01df2cacf568983419cdf82aab97","tests/oneshot.rs":"c44b90681c577f8d0c88e810e883328eefec1d4346b9aa615fa47cc3a7c25c01"},"package":"5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,39 +3,40 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures-channel"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Channels for asynchronous communication using futures-rs.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-channel/0.3.8"
+documentation = "https://docs.rs/futures-channel/0.3"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.futures-core]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-sink]
-version = "0.3.8"
+version = "0.3.17"
 optional = true
 default-features = false
 
+[dev-dependencies]
+
 [features]
 alloc = ["futures-core/alloc"]
-cfg-target-has-atomic = ["futures-core/cfg-target-has-atomic"]
+cfg-target-has-atomic = []
 default = ["std"]
 sink = ["futures-sink"]
 std = ["alloc", "futures-core/std"]
-unstable = ["futures-core/unstable"]
+unstable = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/no_atomic_cas.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/no_atomic_cas.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/no_atomic_cas.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/no_atomic_cas.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+// This file is @generated by no_atomic_cas.sh.
+// It is not intended for manual editing.
+
+const NO_ATOMIC_CAS_TARGETS: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "bpfeb-unknown-none",
+    "bpfel-unknown-none",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,47 +1,42 @@
 //! Asynchronous channels.
 //!
-//! This crate provides channels that can be used to communicate between
-//! asynchronous tasks.
+//! Like threads, concurrent tasks sometimes need to communicate with each
+//! other. This module contains two basic abstractions for doing so:
 //!
-//! All items of this library are only available when the `std` or `alloc` feature of this
+//! - [oneshot], a way of sending a single value from one task to another.
+//! - [mpsc], a multi-producer, single-consumer channel for sending values
+//!   between tasks, analogous to the similarly-named structure in the standard
+//!   library.
+//!
+//! All items are only available when the `std` or `alloc` feature of this
 //! library is activated, and it is activated by default.
 
-#![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
-
 #![cfg_attr(not(feature = "std"), no_std)]
-
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
-// It cannot be included in the published code because this lints have false positives in the minimum required version.
-#![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures-channel/0.3.8")]
-
-#[cfg(all(feature = "cfg-target-has-atomic", not(feature = "unstable")))]
-compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feature as an explicit opt-in to unstable features");
-
-macro_rules! cfg_target_has_atomic {
-    ($($item:item)*) => {$(
-        #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-        $item
-    )*};
-}
-
-cfg_target_has_atomic! {
-    #[cfg(feature = "alloc")]
-    extern crate alloc;
-
-    #[cfg(feature = "alloc")]
-    mod lock;
-    #[cfg(feature = "std")]
-    pub mod mpsc;
-    #[cfg(feature = "alloc")]
-    pub mod oneshot;
-}
+#![warn(
+    missing_debug_implementations,
+    missing_docs,
+    rust_2018_idioms,
+    single_use_lifetimes,
+    unreachable_pub
+)]
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod lock;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "std")]
+pub mod mpsc;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub mod oneshot;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/lock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/lock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/lock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/lock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,8 +6,8 @@
 
 use core::cell::UnsafeCell;
 use core::ops::{Deref, DerefMut};
-use core::sync::atomic::Ordering::SeqCst;
 use core::sync::atomic::AtomicBool;
+use core::sync::atomic::Ordering::SeqCst;
 
 /// A "mutex" around a value, similar to `std::sync::Mutex<T>`.
 ///
@@ -37,10 +37,7 @@
 impl<T> Lock<T> {
     /// Creates a new lock around the given value.
     pub(crate) fn new(t: T) -> Self {
-        Self {
-            locked: AtomicBool::new(false),
-            data: UnsafeCell::new(t),
-        }
+        Self { locked: AtomicBool::new(false), data: UnsafeCell::new(t) }
     }
 
     /// Attempts to acquire this lock, returning whether the lock was acquired or
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/mpsc/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/mpsc/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/mpsc/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/mpsc/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -79,13 +79,14 @@
 // by the queue structure.
 
 use futures_core::stream::{FusedStream, Stream};
-use futures_core::task::{Context, Poll, Waker};
 use futures_core::task::__internal::AtomicWaker;
+use futures_core::task::{Context, Poll, Waker};
 use std::fmt;
 use std::pin::Pin;
-use std::sync::{Arc, Mutex};
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering::SeqCst;
+use std::sync::{Arc, Mutex};
+use std::thread;
 
 use crate::mpsc::queue::Queue;
 
@@ -208,9 +209,7 @@
 
 impl<T> fmt::Debug for TrySendError<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TrySendError")
-            .field("kind", &self.err.kind)
-            .finish()
+        f.debug_struct("TrySendError").field("kind", &self.err.kind).finish()
     }
 }
 
@@ -250,8 +249,7 @@
 
 impl fmt::Debug for TryRecvError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("TryRecvError")
-            .finish()
+        f.debug_tuple("TryRecvError").finish()
     }
 }
 
@@ -334,10 +332,7 @@
 
 impl SenderTask {
     fn new() -> Self {
-        Self {
-            task: None,
-            is_parked: false,
-        }
+        Self { task: None, is_parked: false }
     }
 
     fn notify(&mut self) {
@@ -380,9 +375,7 @@
         maybe_parked: false,
     };
 
-    let rx = Receiver {
-        inner: Some(inner),
-    };
+    let rx = Receiver { inner: Some(inner) };
 
     (Sender(Some(tx)), rx)
 }
@@ -398,7 +391,6 @@
 /// the channel. Using an `unbounded` channel has the ability of causing the
 /// process to run out of memory. In this case, the process will be aborted.
 pub fn unbounded<T>() -> (UnboundedSender<T>, UnboundedReceiver<T>) {
-
     let inner = Arc::new(UnboundedInner {
         state: AtomicUsize::new(INIT_STATE),
         message_queue: Queue::new(),
@@ -406,13 +398,9 @@
         recv_task: AtomicWaker::new(),
     });
 
-    let tx = UnboundedSenderInner {
-        inner: inner.clone(),
-    };
+    let tx = UnboundedSenderInner { inner: inner.clone() };
 
-    let rx = UnboundedReceiver {
-        inner: Some(inner),
-    };
+    let rx = UnboundedReceiver { inner: Some(inner) };
 
     (UnboundedSender(Some(tx)), rx)
 }
@@ -429,13 +417,10 @@
         if state.is_open {
             Poll::Ready(Ok(()))
         } else {
-            Poll::Ready(Err(SendError {
-                kind: SendErrorKind::Disconnected,
-            }))
+            Poll::Ready(Err(SendError { kind: SendErrorKind::Disconnected }))
         }
     }
 
-
     // Push message to the queue and signal to the receiver
     fn queue_push_and_signal(&self, msg: T) {
         // Push the message onto the message queue
@@ -461,16 +446,17 @@
             // This probably is never hit? Odds are the process will run out of
             // memory first. It may be worth to return something else in this
             // case?
-            assert!(state.num_messages < MAX_CAPACITY, "buffer space \
-                    exhausted; sending this messages would overflow the state");
+            assert!(
+                state.num_messages < MAX_CAPACITY,
+                "buffer space \
+                    exhausted; sending this messages would overflow the state"
+            );
 
             state.num_messages += 1;
 
             let next = encode_state(&state);
             match self.inner.state.compare_exchange(curr, next, SeqCst, SeqCst) {
-                Ok(_) => {
-                    return Some(state.num_messages)
-                }
+                Ok(_) => return Some(state.num_messages),
                 Err(actual) => curr = actual,
             }
         }
@@ -515,12 +501,7 @@
     fn try_send(&mut self, msg: T) -> Result<(), TrySendError<T>> {
         // If the sender is currently blocked, reject the message
         if !self.poll_unparked(None).is_ready() {
-            return Err(TrySendError {
-                err: SendError {
-                    kind: SendErrorKind::Full,
-                },
-                val: msg,
-            });
+            return Err(TrySendError { err: SendError { kind: SendErrorKind::Full }, val: msg });
         }
 
         // The channel has capacity to accept the message, so send it
@@ -529,11 +510,8 @@
 
     // Do the send without failing.
     // Can be called only by bounded sender.
-    #[allow(clippy::debug_assert_with_mut_call)]
-    fn do_send_b(&mut self, msg: T)
-        -> Result<(), TrySendError<T>>
-    {
-        // Anyone callig do_send *should* make sure there is room first,
+    fn do_send_b(&mut self, msg: T) -> Result<(), TrySendError<T>> {
+        // Anyone calling do_send *should* make sure there is room first,
         // but assert here for tests as a sanity check.
         debug_assert!(self.poll_unparked(None).is_ready());
 
@@ -550,12 +528,12 @@
                 // the configured buffer size
                 num_messages > self.inner.buffer
             }
-            None => return Err(TrySendError {
-                err: SendError {
-                    kind: SendErrorKind::Disconnected,
-                },
-                val: msg,
-            }),
+            None => {
+                return Err(TrySendError {
+                    err: SendError { kind: SendErrorKind::Disconnected },
+                    val: msg,
+                })
+            }
         };
 
         // If the channel has reached capacity, then the sender task needs to
@@ -599,16 +577,17 @@
             // This probably is never hit? Odds are the process will run out of
             // memory first. It may be worth to return something else in this
             // case?
-            assert!(state.num_messages < MAX_CAPACITY, "buffer space \
-                    exhausted; sending this messages would overflow the state");
+            assert!(
+                state.num_messages < MAX_CAPACITY,
+                "buffer space \
+                    exhausted; sending this messages would overflow the state"
+            );
 
             state.num_messages += 1;
 
             let next = encode_state(&state);
             match self.inner.state.compare_exchange(curr, next, SeqCst, SeqCst) {
-                Ok(_) => {
-                    return Some(state.num_messages)
-                }
+                Ok(_) => return Some(state.num_messages),
                 Err(actual) => curr = actual,
             }
         }
@@ -643,15 +622,10 @@
     ///   capacity, in which case the current task is queued to be notified once
     ///   capacity is available;
     /// - `Poll::Ready(Err(SendError))` if the receiver has been dropped.
-    fn poll_ready(
-        &mut self,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), SendError>> {
+    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), SendError>> {
         let state = decode_state(self.inner.state.load(SeqCst));
         if !state.is_open {
-            return Poll::Ready(Err(SendError {
-                kind: SendErrorKind::Disconnected,
-            }));
+            return Poll::Ready(Err(SendError { kind: SendErrorKind::Disconnected }));
         }
 
         self.poll_unparked(Some(cx)).map(Ok)
@@ -698,7 +672,7 @@
 
             if !task.is_parked {
                 self.maybe_parked = false;
-                return Poll::Ready(())
+                return Poll::Ready(());
             }
 
             // At this point, an unpark request is pending, so there will be an
@@ -723,12 +697,7 @@
         if let Some(inner) = &mut self.0 {
             inner.try_send(msg)
         } else {
-            Err(TrySendError {
-                err: SendError {
-                    kind: SendErrorKind::Disconnected,
-                },
-                val: msg,
-            })
+            Err(TrySendError { err: SendError { kind: SendErrorKind::Disconnected }, val: msg })
         }
     }
 
@@ -738,8 +707,7 @@
     /// [`poll_ready`](Sender::poll_ready) has reported that the channel is
     /// ready to receive a message.
     pub fn start_send(&mut self, msg: T) -> Result<(), SendError> {
-        self.try_send(msg)
-            .map_err(|e| e.err)
+        self.try_send(msg).map_err(|e| e.err)
     }
 
     /// Polls the channel to determine if there is guaranteed capacity to send
@@ -754,13 +722,8 @@
     ///   capacity, in which case the current task is queued to be notified once
     ///   capacity is available;
     /// - `Poll::Ready(Err(SendError))` if the receiver has been dropped.
-    pub fn poll_ready(
-        &mut self,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), SendError>> {
-        let inner = self.0.as_mut().ok_or(SendError {
-            kind: SendErrorKind::Disconnected,
-        })?;
+    pub fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), SendError>> {
+        let inner = self.0.as_mut().ok_or(SendError { kind: SendErrorKind::Disconnected })?;
         inner.poll_ready(cx)
     }
 
@@ -798,7 +761,10 @@
     }
 
     /// Hashes the receiver into the provided hasher
-    pub fn hash_receiver<H>(&self, hasher: &mut H) where H: std::hash::Hasher {
+    pub fn hash_receiver<H>(&self, hasher: &mut H)
+    where
+        H: std::hash::Hasher,
+    {
         use std::hash::Hash;
 
         let ptr = self.0.as_ref().map(|inner| inner.ptr());
@@ -808,13 +774,8 @@
 
 impl<T> UnboundedSender<T> {
     /// Check if the channel is ready to receive a message.
-    pub fn poll_ready(
-        &self,
-        _: &mut Context<'_>,
-    ) -> Poll<Result<(), SendError>> {
-        let inner = self.0.as_ref().ok_or(SendError {
-            kind: SendErrorKind::Disconnected,
-        })?;
+    pub fn poll_ready(&self, _: &mut Context<'_>) -> Poll<Result<(), SendError>> {
+        let inner = self.0.as_ref().ok_or(SendError { kind: SendErrorKind::Disconnected })?;
         inner.poll_ready_nb()
     }
 
@@ -844,12 +805,7 @@
             }
         }
 
-        Err(TrySendError {
-            err: SendError {
-                kind: SendErrorKind::Disconnected,
-            },
-            val: msg,
-        })
+        Err(TrySendError { err: SendError { kind: SendErrorKind::Disconnected }, val: msg })
     }
 
     /// Send a message on the channel.
@@ -857,8 +813,7 @@
     /// This method should only be called after `poll_ready` has been used to
     /// verify that the channel is ready to receive a message.
     pub fn start_send(&mut self, msg: T) -> Result<(), SendError> {
-        self.do_send_nb(msg)
-            .map_err(|e| e.err)
+        self.do_send_nb(msg).map_err(|e| e.err)
     }
 
     /// Sends a message along this channel.
@@ -887,7 +842,10 @@
     }
 
     /// Hashes the receiver into the provided hasher
-    pub fn hash_receiver<H>(&self, hasher: &mut H) where H: std::hash::Hasher {
+    pub fn hash_receiver<H>(&self, hasher: &mut H)
+    where
+        H: std::hash::Hasher,
+    {
         use std::hash::Hash;
 
         let ptr = self.0.as_ref().map(|inner| inner.ptr());
@@ -923,17 +881,14 @@
             debug_assert!(curr < MAX_BUFFER);
 
             let next = curr + 1;
-            let actual = self.inner.num_senders.compare_and_swap(curr, next, SeqCst);
-
-            // The ABA problem doesn't matter here. We only care that the
-            // number of senders never exceeds the maximum.
-            if actual == curr {
-                return Self {
-                    inner: self.inner.clone(),
-                };
+            match self.inner.num_senders.compare_exchange(curr, next, SeqCst, SeqCst) {
+                Ok(_) => {
+                    // The ABA problem doesn't matter here. We only care that the
+                    // number of senders never exceeds the maximum.
+                    return Self { inner: self.inner.clone() };
+                }
+                Err(actual) => curr = actual,
             }
-
-            curr = actual;
         }
     }
 }
@@ -954,19 +909,18 @@
             debug_assert!(curr < self.inner.max_senders());
 
             let next = curr + 1;
-            let actual = self.inner.num_senders.compare_and_swap(curr, next, SeqCst);
-
-            // The ABA problem doesn't matter here. We only care that the
-            // number of senders never exceeds the maximum.
-            if actual == curr {
-                return Self {
-                    inner: self.inner.clone(),
-                    sender_task: Arc::new(Mutex::new(SenderTask::new())),
-                    maybe_parked: false,
-                };
+            match self.inner.num_senders.compare_exchange(curr, next, SeqCst, SeqCst) {
+                Ok(_) => {
+                    // The ABA problem doesn't matter here. We only care that the
+                    // number of senders never exceeds the maximum.
+                    return Self {
+                        inner: self.inner.clone(),
+                        sender_task: Arc::new(Mutex::new(SenderTask::new())),
+                        maybe_parked: false,
+                    };
+                }
+                Err(actual) => curr = actual,
             }
-
-            curr = actual;
         }
     }
 }
@@ -1022,19 +976,22 @@
     /// only when you've otherwise arranged to be notified when the channel is
     /// no longer empty.
     ///
-    /// This function will panic if called after `try_next` or `poll_next` has
-    /// returned `None`.
+    /// This function returns:
+    /// * `Ok(Some(t))` when message is fetched
+    /// * `Ok(None)` when channel is closed and no messages left in the queue
+    /// * `Err(e)` when there are no messages available, but channel is not yet closed
     pub fn try_next(&mut self) -> Result<Option<T>, TryRecvError> {
         match self.next_message() {
-            Poll::Ready(msg) => {
-                Ok(msg)
-            },
+            Poll::Ready(msg) => Ok(msg),
             Poll::Pending => Err(TryRecvError { _priv: () }),
         }
     }
 
     fn next_message(&mut self) -> Poll<Option<T>> {
-        let inner = self.inner.as_mut().expect("Receiver::next_message called after `None`");
+        let inner = match self.inner.as_mut() {
+            None => return Poll::Ready(None),
+            Some(inner) => inner,
+        };
         // Pop off a message
         match unsafe { inner.message_queue.pop_spin() } {
             Some(msg) => {
@@ -1049,7 +1006,12 @@
             }
             None => {
                 let state = decode_state(inner.state.load(SeqCst));
-                if state.is_open || state.num_messages != 0 {
+                if state.is_closed() {
+                    // If closed flag is set AND there are no pending messages
+                    // it means end of stream
+                    self.inner = None;
+                    Poll::Ready(None)
+                } else {
                     // If queue is open, we need to return Pending
                     // to be woken up when new messages arrive.
                     // If queue is closed but num_messages is non-zero,
@@ -1058,11 +1020,6 @@
                     // so we need to park until sender unparks the task
                     // after queueing the message.
                     Poll::Pending
-                } else {
-                    // If closed flag is set AND there are no pending messages
-                    // it means end of stream
-                    self.inner = None;
-                    Poll::Ready(None)
                 }
             }
         }
@@ -1099,18 +1056,15 @@
 impl<T> Stream for Receiver<T> {
     type Item = T;
 
-    fn poll_next(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<T>> {
-            // Try to read a message off of the message queue.
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
+        // Try to read a message off of the message queue.
         match self.next_message() {
             Poll::Ready(msg) => {
                 if msg.is_none() {
                     self.inner = None;
                 }
                 Poll::Ready(msg)
-            },
+            }
             Poll::Pending => {
                 // There are no messages to read, in this case, park.
                 self.inner.as_ref().unwrap().recv_task.register(cx.waker());
@@ -1128,8 +1082,26 @@
         // Drain the channel of all pending messages
         self.close();
         if self.inner.is_some() {
-            while let Poll::Ready(Some(..)) = self.next_message() {
-                // ...
+            loop {
+                match self.next_message() {
+                    Poll::Ready(Some(_)) => {}
+                    Poll::Ready(None) => break,
+                    Poll::Pending => {
+                        let state = decode_state(self.inner.as_ref().unwrap().state.load(SeqCst));
+
+                        // If the channel is closed, then there is no need to park.
+                        if state.is_closed() {
+                            break;
+                        }
+
+                        // TODO: Spinning isn't ideal, it might be worth
+                        // investigating using a condvar or some other strategy
+                        // here. That said, if this case is hit, then another thread
+                        // is about to push the value into the queue and this isn't
+                        // the only spinlock in the impl right now.
+                        thread::yield_now();
+                    }
+                }
             }
         }
     }
@@ -1152,19 +1124,22 @@
     /// only when you've otherwise arranged to be notified when the channel is
     /// no longer empty.
     ///
-    /// This function will panic if called after `try_next` or `poll_next` has
-    /// returned `None`.
+    /// This function returns:
+    /// * `Ok(Some(t))` when message is fetched
+    /// * `Ok(None)` when channel is closed and no messages left in the queue
+    /// * `Err(e)` when there are no messages available, but channel is not yet closed
     pub fn try_next(&mut self) -> Result<Option<T>, TryRecvError> {
         match self.next_message() {
-            Poll::Ready(msg) => {
-                Ok(msg)
-            },
+            Poll::Ready(msg) => Ok(msg),
             Poll::Pending => Err(TryRecvError { _priv: () }),
         }
     }
 
     fn next_message(&mut self) -> Poll<Option<T>> {
-        let inner = self.inner.as_mut().expect("Receiver::next_message called after `None`");
+        let inner = match self.inner.as_mut() {
+            None => return Poll::Ready(None),
+            Some(inner) => inner,
+        };
         // Pop off a message
         match unsafe { inner.message_queue.pop_spin() } {
             Some(msg) => {
@@ -1175,7 +1150,12 @@
             }
             None => {
                 let state = decode_state(inner.state.load(SeqCst));
-                if state.is_open || state.num_messages != 0 {
+                if state.is_closed() {
+                    // If closed flag is set AND there are no pending messages
+                    // it means end of stream
+                    self.inner = None;
+                    Poll::Ready(None)
+                } else {
                     // If queue is open, we need to return Pending
                     // to be woken up when new messages arrive.
                     // If queue is closed but num_messages is non-zero,
@@ -1184,11 +1164,6 @@
                     // so we need to park until sender unparks the task
                     // after queueing the message.
                     Poll::Pending
-                } else {
-                    // If closed flag is set AND there are no pending messages
-                    // it means end of stream
-                    self.inner = None;
-                    Poll::Ready(None)
                 }
             }
         }
@@ -1213,10 +1188,7 @@
 impl<T> Stream for UnboundedReceiver<T> {
     type Item = T;
 
-    fn poll_next(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<T>> {
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
         // Try to read a message off of the message queue.
         match self.next_message() {
             Poll::Ready(msg) => {
@@ -1224,7 +1196,7 @@
                     self.inner = None;
                 }
                 Poll::Ready(msg)
-            },
+            }
             Poll::Pending => {
                 // There are no messages to read, in this case, park.
                 self.inner.as_ref().unwrap().recv_task.register(cx.waker());
@@ -1242,8 +1214,26 @@
         // Drain the channel of all pending messages
         self.close();
         if self.inner.is_some() {
-            while let Poll::Ready(Some(..)) = self.next_message() {
-                // ...
+            loop {
+                match self.next_message() {
+                    Poll::Ready(Some(_)) => {}
+                    Poll::Ready(None) => break,
+                    Poll::Pending => {
+                        let state = decode_state(self.inner.as_ref().unwrap().state.load(SeqCst));
+
+                        // If the channel is closed, then there is no need to park.
+                        if state.is_closed() {
+                            break;
+                        }
+
+                        // TODO: Spinning isn't ideal, it might be worth
+                        // investigating using a condvar or some other strategy
+                        // here. That said, if this case is hit, then another thread
+                        // is about to push the value into the queue and this isn't
+                        // the only spinlock in the impl right now.
+                        thread::yield_now();
+                    }
+                }
             }
         }
     }
@@ -1291,6 +1281,12 @@
 unsafe impl<T: Send> Send for BoundedInner<T> {}
 unsafe impl<T: Send> Sync for BoundedInner<T> {}
 
+impl State {
+    fn is_closed(&self) -> bool {
+        !self.is_open && self.num_messages == 0
+    }
+}
+
 /*
  *
  * ===== Helpers =====
@@ -1298,10 +1294,7 @@
  */
 
 fn decode_state(num: usize) -> State {
-    State {
-        is_open: num & OPEN_MASK == OPEN_MASK,
-        num_messages: num & MAX_CAPACITY,
-    }
+    State { is_open: num & OPEN_MASK == OPEN_MASK, num_messages: num & MAX_CAPACITY }
 }
 
 fn encode_state(state: &State) -> usize {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/mpsc/queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/mpsc/queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/mpsc/queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/mpsc/queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -43,10 +43,10 @@
 
 pub(super) use self::PopResult::*;
 
-use std::thread;
 use std::cell::UnsafeCell;
 use std::ptr;
 use std::sync::atomic::{AtomicPtr, Ordering};
+use std::thread;
 
 /// A result of the `pop` function.
 pub(super) enum PopResult<T> {
@@ -76,15 +76,12 @@
     tail: UnsafeCell<*mut Node<T>>,
 }
 
-unsafe impl<T: Send> Send for Queue<T> { }
-unsafe impl<T: Send> Sync for Queue<T> { }
+unsafe impl<T: Send> Send for Queue<T> {}
+unsafe impl<T: Send> Sync for Queue<T> {}
 
 impl<T> Node<T> {
     unsafe fn new(v: Option<T>) -> *mut Self {
-        Box::into_raw(Box::new(Self {
-            next: AtomicPtr::new(ptr::null_mut()),
-            value: v,
-        }))
+        Box::into_raw(Box::new(Self { next: AtomicPtr::new(ptr::null_mut()), value: v }))
     }
 }
 
@@ -93,10 +90,7 @@
     /// one consumer.
     pub(super) fn new() -> Self {
         let stub = unsafe { Node::new(None) };
-        Self {
-            head: AtomicPtr::new(stub),
-            tail: UnsafeCell::new(stub),
-        }
+        Self { head: AtomicPtr::new(stub), tail: UnsafeCell::new(stub) }
     }
 
     /// Pushes a new value onto this queue.
@@ -133,7 +127,11 @@
             return Data(ret);
         }
 
-        if self.head.load(Ordering::Acquire) == tail {Empty} else {Inconsistent}
+        if self.head.load(Ordering::Acquire) == tail {
+            Empty
+        } else {
+            Inconsistent
+        }
     }
 
     /// Pop an element similarly to `pop` function, but spin-wait on inconsistent
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/mpsc/sink_impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/mpsc/sink_impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/mpsc/sink_impl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/mpsc/sink_impl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,24 +6,15 @@
 impl<T> Sink<T> for Sender<T> {
     type Error = SendError;
 
-    fn poll_ready(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         (*self).poll_ready(cx)
     }
 
-    fn start_send(
-        mut self: Pin<&mut Self>,
-        msg: T,
-    ) -> Result<(), Self::Error> {
+    fn start_send(mut self: Pin<&mut Self>, msg: T) -> Result<(), Self::Error> {
         (*self).start_send(msg)
     }
 
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         match (*self).poll_ready(cx) {
             Poll::Ready(Err(ref e)) if e.is_disconnected() => {
                 // If the receiver disconnected, we consider the sink to be flushed.
@@ -33,10 +24,7 @@
         }
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.disconnect();
         Poll::Ready(Ok(()))
     }
@@ -45,31 +33,19 @@
 impl<T> Sink<T> for UnboundedSender<T> {
     type Error = SendError;
 
-    fn poll_ready(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Self::poll_ready(&*self, cx)
     }
 
-    fn start_send(
-        mut self: Pin<&mut Self>,
-        msg: T,
-    ) -> Result<(), Self::Error> {
+    fn start_send(mut self: Pin<&mut Self>, msg: T) -> Result<(), Self::Error> {
         Self::start_send(&mut *self, msg)
     }
 
-    fn poll_flush(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(Ok(()))
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.disconnect();
         Poll::Ready(Ok(()))
     }
@@ -78,29 +54,19 @@
 impl<T> Sink<T> for &UnboundedSender<T> {
     type Error = SendError;
 
-    fn poll_ready(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         UnboundedSender::poll_ready(*self, cx)
     }
 
     fn start_send(self: Pin<&mut Self>, msg: T) -> Result<(), Self::Error> {
-        self.unbounded_send(msg)
-            .map_err(TrySendError::into_send_error)
+        self.unbounded_send(msg).map_err(TrySendError::into_send_error)
     }
 
-    fn poll_flush(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(Ok(()))
     }
 
-    fn poll_close(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.close_channel();
         Poll::Ready(Ok(()))
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/oneshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/oneshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/src/oneshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/src/oneshot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
 use core::pin::Pin;
 use core::sync::atomic::AtomicBool;
 use core::sync::atomic::Ordering::SeqCst;
-use futures_core::future::Future;
+use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Context, Poll, Waker};
 
 use crate::lock::Lock;
@@ -16,7 +16,6 @@
 ///
 /// This is created by the [`channel`](channel) function.
 #[must_use = "futures do nothing unless you `.await` or poll them"]
-#[derive(Debug)]
 pub struct Receiver<T> {
     inner: Arc<Inner<T>>,
 }
@@ -24,7 +23,6 @@
 /// A means of transmitting a single value to another task.
 ///
 /// This is created by the [`channel`](channel) function.
-#[derive(Debug)]
 pub struct Sender<T> {
     inner: Arc<Inner<T>>,
 }
@@ -35,7 +33,6 @@
 
 /// Internal state of the `Receiver`/`Sender` pair above. This is all used as
 /// the internal synchronization between the two for send/recv operations.
-#[derive(Debug)]
 struct Inner<T> {
     /// Indicates whether this oneshot is complete yet. This is filled in both
     /// by `Sender::drop` and by `Receiver::drop`, and both sides interpret it
@@ -106,12 +103,8 @@
 /// ```
 pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
     let inner = Arc::new(Inner::new());
-    let receiver = Receiver {
-        inner: inner.clone(),
-    };
-    let sender = Sender {
-        inner,
-    };
+    let receiver = Receiver { inner: inner.clone() };
+    let sender = Sender { inner };
     (sender, receiver)
 }
 
@@ -127,7 +120,7 @@
 
     fn send(&self, t: T) -> Result<(), T> {
         if self.complete.load(SeqCst) {
-            return Err(t)
+            return Err(t);
         }
 
         // Note that this lock acquisition may fail if the receiver
@@ -164,7 +157,7 @@
         // destructor, but our destructor hasn't run yet so if it's set then the
         // oneshot is gone.
         if self.complete.load(SeqCst) {
-            return Poll::Ready(())
+            return Poll::Ready(());
         }
 
         // If our other half is not gone then we need to park our current task
@@ -273,7 +266,10 @@
         } else {
             let task = cx.waker().clone();
             match self.rx_task.try_lock() {
-                Some(mut slot) => { *slot = Some(task); false },
+                Some(mut slot) => {
+                    *slot = Some(task);
+                    false
+                }
                 None => true,
             }
         };
@@ -394,6 +390,12 @@
     }
 }
 
+impl<T: fmt::Debug> fmt::Debug for Sender<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Sender").field("complete", &self.inner.complete).finish()
+    }
+}
+
 /// A future that resolves when the receiving end of a channel has hung up.
 ///
 /// This is an `.await`-friendly interface around [`poll_canceled`](Sender::poll_canceled).
@@ -453,16 +455,34 @@
 impl<T> Future for Receiver<T> {
     type Output = Result<T, Canceled>;
 
-    fn poll(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<T, Canceled>> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<T, Canceled>> {
         self.inner.recv(cx)
     }
 }
 
+impl<T> FusedFuture for Receiver<T> {
+    fn is_terminated(&self) -> bool {
+        if self.inner.complete.load(SeqCst) {
+            if let Some(slot) = self.inner.data.try_lock() {
+                if slot.is_some() {
+                    return false;
+                }
+            }
+            true
+        } else {
+            false
+        }
+    }
+}
+
 impl<T> Drop for Receiver<T> {
     fn drop(&mut self) {
         self.inner.drop_rx()
     }
 }
+
+impl<T: fmt::Debug> fmt::Debug for Receiver<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Receiver").field("complete", &self.inner.complete).finish()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/tests/channel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/tests/channel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/tests/channel.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/tests/channel.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
 use futures::channel::mpsc;
 use futures::executor::block_on;
 use futures::future::poll_fn;
-use futures::stream::StreamExt;
 use futures::sink::SinkExt;
+use futures::stream::StreamExt;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread;
 
@@ -11,9 +11,7 @@
     let (tx, rx) = mpsc::channel(1);
 
     let amt = 20;
-    let t = thread::spawn(move || {
-        block_on(send_sequence(amt, tx))
-    });
+    let t = thread::spawn(move || block_on(send_sequence(amt, tx)));
     let list: Vec<_> = block_on(rx.collect());
     let mut list = list.into_iter();
     for i in (1..=amt).rev() {
@@ -34,9 +32,7 @@
 fn drop_sender() {
     let (tx, mut rx) = mpsc::channel::<u32>(1);
     drop(tx);
-    let f = poll_fn(|cx| {
-        rx.poll_next_unpin(cx)
-    });
+    let f = poll_fn(|cx| rx.poll_next_unpin(cx));
     assert_eq!(block_on(f), None)
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/tests/mpsc-close.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/tests/mpsc-close.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/tests/mpsc-close.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/tests/mpsc-close.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,19 @@
 use futures::channel::mpsc;
 use futures::executor::block_on;
+use futures::future::Future;
 use futures::sink::SinkExt;
 use futures::stream::StreamExt;
-use std::sync::Arc;
+use futures::task::{Context, Poll};
+use std::pin::Pin;
+use std::sync::{Arc, Weak};
 use std::thread;
+use std::time::{Duration, Instant};
 
 #[test]
 fn smoke() {
     let (mut sender, receiver) = mpsc::channel(1);
 
-    let t = thread::spawn(move || {
-        while let Ok(()) = block_on(sender.send(42)) {}
-    });
+    let t = thread::spawn(move || while let Ok(()) = block_on(sender.send(42)) {});
 
     // `receiver` needs to be dropped for `sender` to stop sending and therefore before the join.
     block_on(receiver.take(3).for_each(|_| futures::future::ready(())));
@@ -142,3 +144,155 @@
         assert!(sender.is_closed());
     }
 }
+
+// Stress test that `try_send()`s occurring concurrently with receiver
+// close/drops don't appear as successful sends.
+#[test]
+fn stress_try_send_as_receiver_closes() {
+    const AMT: usize = 10000;
+    // To provide variable timing characteristics (in the hopes of
+    // reproducing the collision that leads to a race), we busy-re-poll
+    // the test MPSC receiver a variable number of times before actually
+    // stopping.  We vary this countdown between 1 and the following
+    // value.
+    const MAX_COUNTDOWN: usize = 20;
+    // When we detect that a successfully sent item is still in the
+    // queue after a disconnect, we spin for up to 100ms to confirm that
+    // it is a persistent condition and not a concurrency illusion.
+    const SPIN_TIMEOUT_S: u64 = 10;
+    const SPIN_SLEEP_MS: u64 = 10;
+    struct TestRx {
+        rx: mpsc::Receiver<Arc<()>>,
+        // The number of times to query `rx` before dropping it.
+        poll_count: usize,
+    }
+    struct TestTask {
+        command_rx: mpsc::Receiver<TestRx>,
+        test_rx: Option<mpsc::Receiver<Arc<()>>>,
+        countdown: usize,
+    }
+    impl TestTask {
+        /// Create a new TestTask
+        fn new() -> (TestTask, mpsc::Sender<TestRx>) {
+            let (command_tx, command_rx) = mpsc::channel::<TestRx>(0);
+            (
+                TestTask {
+                    command_rx,
+                    test_rx: None,
+                    countdown: 0, // 0 means no countdown is in progress.
+                },
+                command_tx,
+            )
+        }
+    }
+    impl Future for TestTask {
+        type Output = ();
+
+        fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            // Poll the test channel, if one is present.
+            if let Some(rx) = &mut self.test_rx {
+                if let Poll::Ready(v) = rx.poll_next_unpin(cx) {
+                    let _ = v.expect("test finished unexpectedly!");
+                }
+                self.countdown -= 1;
+                // Busy-poll until the countdown is finished.
+                cx.waker().wake_by_ref();
+            }
+            // Accept any newly submitted MPSC channels for testing.
+            match self.command_rx.poll_next_unpin(cx) {
+                Poll::Ready(Some(TestRx { rx, poll_count })) => {
+                    self.test_rx = Some(rx);
+                    self.countdown = poll_count;
+                    cx.waker().wake_by_ref();
+                }
+                Poll::Ready(None) => return Poll::Ready(()),
+                Poll::Pending => {}
+            }
+            if self.countdown == 0 {
+                // Countdown complete -- drop the Receiver.
+                self.test_rx = None;
+            }
+            Poll::Pending
+        }
+    }
+    let (f, mut cmd_tx) = TestTask::new();
+    let bg = thread::spawn(move || block_on(f));
+    for i in 0..AMT {
+        let (mut test_tx, rx) = mpsc::channel(0);
+        let poll_count = i % MAX_COUNTDOWN;
+        cmd_tx.try_send(TestRx { rx, poll_count }).unwrap();
+        let mut prev_weak: Option<Weak<()>> = None;
+        let mut attempted_sends = 0;
+        let mut successful_sends = 0;
+        loop {
+            // Create a test item.
+            let item = Arc::new(());
+            let weak = Arc::downgrade(&item);
+            match test_tx.try_send(item) {
+                Ok(_) => {
+                    prev_weak = Some(weak);
+                    successful_sends += 1;
+                }
+                Err(ref e) if e.is_full() => {}
+                Err(ref e) if e.is_disconnected() => {
+                    // Test for evidence of the race condition.
+                    if let Some(prev_weak) = prev_weak {
+                        if prev_weak.upgrade().is_some() {
+                            // The previously sent item is still allocated.
+                            // However, there appears to be some aspect of the
+                            // concurrency that can legitimately cause the Arc
+                            // to be momentarily valid.  Spin for up to 100ms
+                            // waiting for the previously sent item to be
+                            // dropped.
+                            let t0 = Instant::now();
+                            let mut spins = 0;
+                            loop {
+                                if prev_weak.upgrade().is_none() {
+                                    break;
+                                }
+                                assert!(
+                                    t0.elapsed() < Duration::from_secs(SPIN_TIMEOUT_S),
+                                    "item not dropped on iteration {} after \
+                                     {} sends ({} successful). spin=({})",
+                                    i,
+                                    attempted_sends,
+                                    successful_sends,
+                                    spins
+                                );
+                                spins += 1;
+                                thread::sleep(Duration::from_millis(SPIN_SLEEP_MS));
+                            }
+                        }
+                    }
+                    break;
+                }
+                Err(ref e) => panic!("unexpected error: {}", e),
+            }
+            attempted_sends += 1;
+        }
+    }
+    drop(cmd_tx);
+    bg.join().expect("background thread join");
+}
+
+#[test]
+fn unbounded_try_next_after_none() {
+    let (tx, mut rx) = mpsc::unbounded::<String>();
+    // Drop the sender, close the channel.
+    drop(tx);
+    // Receive the end of channel.
+    assert_eq!(Ok(None), rx.try_next().map_err(|_| ()));
+    // None received, check we can call `try_next` again.
+    assert_eq!(Ok(None), rx.try_next().map_err(|_| ()));
+}
+
+#[test]
+fn bounded_try_next_after_none() {
+    let (tx, mut rx) = mpsc::channel::<String>(17);
+    // Drop the sender, close the channel.
+    drop(tx);
+    // Receive the end of channel.
+    assert_eq!(Ok(None), rx.try_next().map_err(|_| ()));
+    // None received, check we can call `try_next` again.
+    assert_eq!(Ok(None), rx.try_next().map_err(|_| ()));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/tests/mpsc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/tests/mpsc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/tests/mpsc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/tests/mpsc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,13 @@
 use futures::channel::{mpsc, oneshot};
 use futures::executor::{block_on, block_on_stream};
-use futures::future::{FutureExt, poll_fn};
-use futures::stream::{Stream, StreamExt};
+use futures::future::{poll_fn, FutureExt};
+use futures::pin_mut;
 use futures::sink::{Sink, SinkExt};
+use futures::stream::{Stream, StreamExt};
 use futures::task::{Context, Poll};
-use futures::pin_mut;
 use futures_test::task::{new_count_waker, noop_context};
-use std::sync::{Arc, Mutex};
 use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::{Arc, Mutex};
 use std::thread;
 
 trait AssertSend: Send {}
@@ -77,7 +77,7 @@
 fn send_recv_threads() {
     let (mut tx, rx) = mpsc::channel::<i32>(16);
 
-    let t = thread::spawn(move|| {
+    let t = thread::spawn(move || {
         block_on(tx.send(1)).unwrap();
     });
 
@@ -204,7 +204,7 @@
     const NTHREADS: u32 = 8;
     let (tx, rx) = mpsc::unbounded::<i32>();
 
-    let t = thread::spawn(move|| {
+    let t = thread::spawn(move || {
         let result: Vec<_> = block_on(rx.collect());
         assert_eq!(result.len(), (AMT * NTHREADS) as usize);
         for item in result {
@@ -215,7 +215,7 @@
     for _ in 0..NTHREADS {
         let tx = tx.clone();
 
-        thread::spawn(move|| {
+        thread::spawn(move || {
             for _ in 0..AMT {
                 tx.unbounded_send(1).unwrap();
             }
@@ -233,7 +233,7 @@
     const NTHREADS: u32 = 8;
     let (tx, rx) = mpsc::channel::<i32>(0);
 
-    let t = thread::spawn(move|| {
+    let t = thread::spawn(move || {
         let result: Vec<_> = block_on(rx.collect());
         assert_eq!(result.len(), (AMT * NTHREADS) as usize);
         for item in result {
@@ -297,9 +297,9 @@
                             }
                             Poll::Ready(None) => {
                                 *rx_opt = None;
-                                break
-                            },
-                            Poll::Pending => {},
+                                break;
+                            }
+                            Poll::Pending => {}
                         }
                     }
                 } else {
@@ -311,7 +311,6 @@
         th.push(t);
     }
 
-
     for i in 0..AMT {
         block_on(tx.send(i)).unwrap();
     }
@@ -328,7 +327,7 @@
 /// after sender dropped.
 #[test]
 fn stress_drop_sender() {
-    fn list() -> impl Stream<Item=i32> {
+    fn list() -> impl Stream<Item = i32> {
         let (tx, rx) = mpsc::channel(1);
         thread::spawn(move || {
             block_on(send_one_two_three(tx));
@@ -407,9 +406,7 @@
         let mut threads = Vec::new();
         for _ in 0..NTHREADS {
             let sender = tx.clone();
-            threads.push(thread::spawn(move || {
-                block_on(stress_poll_ready_sender(sender, AMT))
-            }));
+            threads.push(thread::spawn(move || block_on(stress_poll_ready_sender(sender, AMT))));
         }
         drop(tx);
 
@@ -436,7 +433,7 @@
         for i in 0..N {
             loop {
                 if tx.try_send(i).is_ok() {
-                    break
+                    break;
                 }
             }
         }
@@ -542,8 +539,8 @@
 
 #[test]
 fn hash_receiver() {
-    use std::hash::Hasher;
     use std::collections::hash_map::DefaultHasher;
+    use std::hash::Hasher;
 
     let mut hasher_a1 = DefaultHasher::new();
     let mut hasher_a2 = DefaultHasher::new();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/tests/oneshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/tests/oneshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-channel/tests/oneshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-channel/tests/oneshot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 use futures::channel::oneshot::{self, Sender};
 use futures::executor::block_on;
-use futures::future::{FutureExt, poll_fn};
+use futures::future::{poll_fn, FutureExt};
 use futures::task::{Context, Poll};
 use futures_test::task::panic_waker_ref;
 use std::sync::mpsc;
@@ -70,7 +70,7 @@
     rx.close();
     block_on(poll_fn(|cx| {
         match rx.poll_unpin(cx) {
-            Poll::Ready(Err(_)) => {},
+            Poll::Ready(Err(_)) => {}
             _ => panic!(),
         };
         assert!(tx.poll_canceled(cx).is_ready());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+#![warn(rust_2018_idioms, single_use_lifetimes)]
+
+use std::env;
+
+include!("no_atomic_cas.rs");
+
+// The rustc-cfg listed below are considered public API, but it is *unstable*
+// and outside of the normal semver guarantees:
+//
+// - `futures_no_atomic_cas`
+//      Assume the target does *not* support atomic CAS operations.
+//      This is usually detected automatically by the build script, but you may
+//      need to enable it manually when building for custom targets or using
+//      non-cargo build systems that don't run the build script.
+//
+// With the exceptions mentioned above, the rustc-cfg strings below are
+// *not* public API. Please let us know by opening a GitHub issue if your build
+// environment requires some way to enable these cfgs other than by executing
+// our build script.
+fn main() {
+    let target = match env::var("TARGET") {
+        Ok(target) => target,
+        Err(e) => {
+            println!(
+                "cargo:warning={}: unable to get TARGET environment variable: {}",
+                env!("CARGO_PKG_NAME"),
+                e
+            );
+            return;
+        }
+    };
+
+    // Note that this is `no_*`, not `has_*`. This allows treating
+    // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't
+    // run. This is needed for compatibility with non-cargo build systems that
+    // don't run the build script.
+    if NO_ATOMIC_CAS_TARGETS.contains(&&*target) {
+        println!("cargo:rustc-cfg=futures_no_atomic_cas");
+    }
+
+    println!("cargo:rerun-if-changed=no_atomic_cas.rs");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"f77aa3de37fdbee203f73de2e5e0847e9cfc8eadbb6292e7dcfb705532c78614","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/future.rs":"6888856ecb09746b3610eb0818309c318ed3475021bdd4274691dc40803136af","src/lib.rs":"2ffaab02332c3f27bba890d2969a6408f78f1cdad98aa7ce10454c26fbc85ee1","src/stream.rs":"ae0c90b45e44c0690824d84be19927d4f8e950835ff9e7586dae4f0cf6102b36","src/task/__internal/atomic_waker.rs":"d6a6311fd236a6b7913962f7518c9e2f438bc5f126eb3fd5936e31d21264ec66","src/task/__internal/mod.rs":"c9dc3f5f75274b1c682f62f3cf04d2c1755aceefffd9f4bfdad59d8cbb4c4768","src/task/mod.rs":"4afe3c116b928afe49b4a445baa16c3816867e057f91bb0ed3b26ddf3b6b4487","src/task/poll.rs":"da03409f230c63f5226402217007d853116a9d6bf0e35572e60005acb032b6ef"},"package":"847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"}
\ No newline at end of file
+{"files":{"Cargo.toml":"d907d32d4837cc2e3f9fa30dfc8d290ef2b66ec4ab4ef81780313dd6fc7dcbc9","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","build.rs":"f6e21c09f18cc405bd7048cb7a2958f92d5414b9ca6b301d137e120a84fa020a","no_atomic_cas.rs":"ff8be002b49a5cd9e4ca0db17b1c9e6b98e55f556319eb6b953dd6ff52c397a6","src/future.rs":"0cb559fad0d43566dab959e929c4631c25cf749e2e29a5444fbcad464c9262ae","src/lib.rs":"eacd5816fbb914ca061d49ff6203723ebbe639eb7c45ebfa8a0613069d174111","src/stream.rs":"f1c7ab84161c5d5b424655b257fc3183eb6f2ed5324ba4006a70f9a4b0dc8872","src/task/__internal/atomic_waker.rs":"4ca94b25d3bcf4db863f008224cc4797dbbe7c93495a1abb232048846694a716","src/task/__internal/mod.rs":"7d0d297f58987b05ffa152605feb78ddc9b6e5168e7d621ec36dfbee558e4bec","src/task/mod.rs":"e213602a2fe5ae78ad5f1ca20e6d32dcbab17aba5b6b072fb927a72da99b4a11","src/task/poll.rs":"74c2717c1f9a37587a367da1b690d1cd2312e95dbaffca42be4755f1cd164bb8"},"package":"88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,21 +3,20 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures-core"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "The core traits and types in for the `futures` library.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-core/0.3.8"
+documentation = "https://docs.rs/futures-core/0.3"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 [package.metadata.docs.rs]
@@ -26,6 +25,8 @@
 
 [dependencies]
 
+[dev-dependencies]
+
 [features]
 alloc = []
 cfg-target-has-atomic = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/no_atomic_cas.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/no_atomic_cas.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/no_atomic_cas.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/no_atomic_cas.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+// This file is @generated by no_atomic_cas.sh.
+// It is not intended for manual editing.
+
+const NO_ATOMIC_CAS_TARGETS: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "bpfeb-unknown-none",
+    "bpfel-unknown-none",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/future.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/future.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/future.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/future.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,7 @@
 use core::pin::Pin;
 use core::task::{Context, Poll};
 
+#[doc(no_inline)]
 pub use core::future::Future;
 
 /// An owned dynamically typed [`Future`] for use in cases where you can't
@@ -66,14 +67,12 @@
     /// This method is a stopgap for a compiler limitation that prevents us from
     /// directly inheriting from the `Future` trait; in the future it won't be
     /// needed.
-    fn try_poll(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<Self::Ok, Self::Error>>;
+    fn try_poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<Self::Ok, Self::Error>>;
 }
 
 impl<F, T, E> TryFuture for F
-    where F: ?Sized + Future<Output = Result<T, E>>
+where
+    F: ?Sized + Future<Output = Result<T, E>>,
 {
     type Ok = T;
     type Error = E;
@@ -86,8 +85,8 @@
 
 #[cfg(feature = "alloc")]
 mod if_alloc {
-    use alloc::boxed::Box;
     use super::*;
+    use alloc::boxed::Box;
 
     impl<F: FusedFuture + ?Sized + Unpin> FusedFuture for Box<F> {
         fn is_terminated(&self) -> bool {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,40 +1,27 @@
 //! Core traits and types for asynchronous operations in Rust.
 
-#![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
-
 #![cfg_attr(not(feature = "std"), no_std)]
-
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
+#![warn(missing_debug_implementations, missing_docs, rust_2018_idioms, unreachable_pub)]
 // It cannot be included in the published code because this lints have false positives in the minimum required version.
 #![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures-core/0.3.8")]
-
-#[cfg(all(feature = "cfg-target-has-atomic", not(feature = "unstable")))]
-compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feature as an explicit opt-in to unstable features");
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
 
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
 pub mod future;
-#[doc(hidden)] pub use self::future::{Future, FusedFuture, TryFuture};
+#[doc(no_inline)]
+pub use self::future::{FusedFuture, Future, TryFuture};
 
 pub mod stream;
-#[doc(hidden)] pub use self::stream::{Stream, FusedStream, TryStream};
+#[doc(no_inline)]
+pub use self::stream::{FusedStream, Stream, TryStream};
 
 #[macro_use]
 pub mod task;
-
-// Not public API.
-#[doc(hidden)]
-pub mod __private {
-    pub use core::task::Poll;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -63,10 +63,7 @@
     /// calls.
     ///
     /// [`fuse`]: https://docs.rs/futures/0.3/futures/stream/trait.StreamExt.html#method.fuse
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>>;
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>>;
 
     /// Returns the bounds on the remaining length of the stream.
     ///
@@ -103,10 +100,7 @@
 impl<S: ?Sized + Stream + Unpin> Stream for &mut S {
     type Item = S::Item;
 
-    fn poll_next(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         S::poll_next(Pin::new(&mut **self), cx)
     }
 
@@ -122,10 +116,7 @@
 {
     type Item = <P::Target as Stream>::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         self.get_mut().as_mut().poll_next(cx)
     }
 
@@ -185,35 +176,36 @@
     /// This method is a stopgap for a compiler limitation that prevents us from
     /// directly inheriting from the `Stream` trait; in the future it won't be
     /// needed.
-    fn try_poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>)
-        -> Poll<Option<Result<Self::Ok, Self::Error>>>;
+    fn try_poll_next(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Self::Ok, Self::Error>>>;
 }
 
 impl<S, T, E> TryStream for S
-    where S: ?Sized + Stream<Item = Result<T, E>>
+where
+    S: ?Sized + Stream<Item = Result<T, E>>,
 {
     type Ok = T;
     type Error = E;
 
-    fn try_poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>)
-        -> Poll<Option<Result<Self::Ok, Self::Error>>>
-    {
+    fn try_poll_next(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Self::Ok, Self::Error>>> {
         self.poll_next(cx)
     }
 }
 
 #[cfg(feature = "alloc")]
 mod if_alloc {
-    use alloc::boxed::Box;
     use super::*;
+    use alloc::boxed::Box;
 
     impl<S: ?Sized + Stream + Unpin> Stream for Box<S> {
         type Item = S::Item;
 
-        fn poll_next(
-            mut self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-        ) -> Poll<Option<Self::Item>> {
+        fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
             Pin::new(&mut **self).poll_next(cx)
         }
 
@@ -226,10 +218,7 @@
     impl<S: Stream> Stream for std::panic::AssertUnwindSafe<S> {
         type Item = S::Item;
 
-        fn poll_next(
-            self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-        ) -> Poll<Option<S::Item>> {
+        fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<S::Item>> {
             unsafe { self.map_unchecked_mut(|x| &mut x.0) }.poll_next(cx)
         }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/task/__internal/atomic_waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/task/__internal/atomic_waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/task/__internal/atomic_waker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/task/__internal/atomic_waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use core::cell::UnsafeCell;
 use core::fmt;
 use core::sync::atomic::AtomicUsize;
-use core::sync::atomic::Ordering::{Acquire, Release, AcqRel};
+use core::sync::atomic::Ordering::{AcqRel, Acquire, Release};
 use core::task::Waker;
 
 /// A synchronization primitive for task wakeup.
@@ -202,10 +202,7 @@
         trait AssertSync: Sync {}
         impl AssertSync for Waker {}
 
-        Self {
-            state: AtomicUsize::new(WAITING),
-            waker: UnsafeCell::new(None),
-        }
+        Self { state: AtomicUsize::new(WAITING), waker: UnsafeCell::new(None) }
     }
 
     /// Registers the waker to be notified on calls to `wake`.
@@ -259,7 +256,11 @@
     /// }
     /// ```
     pub fn register(&self, waker: &Waker) {
-        match self.state.compare_and_swap(WAITING, REGISTERING, Acquire) {
+        match self
+            .state
+            .compare_exchange(WAITING, REGISTERING, Acquire, Acquire)
+            .unwrap_or_else(|x| x)
+        {
             WAITING => {
                 unsafe {
                     // Locked acquired, update the waker cell
@@ -275,8 +276,7 @@
                     // nothing to acquire, only release. In case of concurrent
                     // wakers, we need to acquire their releases, so success needs
                     // to do both.
-                    let res = self.state.compare_exchange(
-                        REGISTERING, WAITING, AcqRel, Acquire);
+                    let res = self.state.compare_exchange(REGISTERING, WAITING, AcqRel, Acquire);
 
                     match res {
                         Ok(_) => {
@@ -340,9 +340,7 @@
                 //
                 // We just want to maintain memory safety. It is ok to drop the
                 // call to `register`.
-                debug_assert!(
-                    state == REGISTERING ||
-                    state == REGISTERING | WAKING);
+                debug_assert!(state == REGISTERING || state == REGISTERING | WAKING);
             }
         }
     }
@@ -387,9 +385,8 @@
                 // not.
                 //
                 debug_assert!(
-                    state == REGISTERING ||
-                    state == REGISTERING | WAKING ||
-                    state == WAKING);
+                    state == REGISTERING || state == REGISTERING | WAKING || state == WAKING
+                );
                 None
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/task/__internal/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/task/__internal/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/task/__internal/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/task/__internal/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+#[cfg(not(futures_no_atomic_cas))]
 mod atomic_waker;
-#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+#[cfg(not(futures_no_atomic_cas))]
 pub use self::atomic_waker::AtomicWaker;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/task/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/task/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/task/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/task/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,4 +6,5 @@
 #[doc(hidden)]
 pub mod __internal;
 
-pub use core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
+#[doc(no_inline)]
+pub use core::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/task/poll.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/task/poll.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-core/src/task/poll.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-core/src/task/poll.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,9 +3,10 @@
 /// This macro bakes in propagation of `Pending` signals by returning early.
 #[macro_export]
 macro_rules! ready {
-    ($e:expr $(,)?) => (match $e {
-        $crate::__private::Poll::Ready(t) => t,
-        $crate::__private::Poll::Pending =>
-            return $crate::__private::Poll::Pending,
-    })
+    ($e:expr $(,)?) => {
+        match $e {
+            $crate::task::Poll::Ready(t) => t,
+            $crate::task::Poll::Pending => return $crate::task::Poll::Pending,
+        }
+    };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/benches/thread_notify.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/benches/thread_notify.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/benches/thread_notify.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/benches/thread_notify.rs	2021-12-09 12:01:26.000000000 +0000
@@ -102,10 +102,7 @@
     });
 
     b.iter(move || {
-        let y = Yield {
-            rem: NUM,
-            tx: tx.clone(),
-        };
+        let y = Yield { rem: NUM, tx: tx.clone() };
 
         block_on(y);
     });
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"9816ae26153b6d6b70dba7231c9067193aab32e3a33bc230182dd7e1ea65af2f","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","benches/thread_notify.rs":"aaafcaefed547c2699eb327b476c594e728e470d06f174b9d03c047f875ee2ec","src/enter.rs":"c1a771f373b469d98e2599d8e37da7d7a7083c30332d643f37867f86406ab1e2","src/lib.rs":"1b861829a733de215a2f23c81c95aad4f5de1fe6844f932c62093c903feb96c1","src/local_pool.rs":"406a5137c22d7445f5c501c06b4139c6021b50218025b9082c110957dac068af","src/thread_pool.rs":"467fa7d48c63ed1027a6d0e3480e1cd94d82d943b9d29c4713e9dfe1bc5141e2","src/unpark_mutex.rs":"42cfe5acbc9304c124d235ec489840bad13cb1700da7bdd619cfce61dc3acf13","tests/local_pool.rs":"de61b566fce3882382d49d4a4bee36e4595927718d2c15dbffbda4ad105cc208"},"package":"4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"}
\ No newline at end of file
+{"files":{"Cargo.toml":"f2352217f8dbf946a5a77f4de16a006e02372c495729b143cd95d7884ee287b3","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","benches/thread_notify.rs":"e601968527bee85766f32d2d11de5ed8f6b4bd5a29989b5c369a52bd3cd3d024","src/enter.rs":"c1a771f373b469d98e2599d8e37da7d7a7083c30332d643f37867f86406ab1e2","src/lib.rs":"08a25594c789cb4ce1c8929a9ddd745e67fee1db373e011a7ebe135933522614","src/local_pool.rs":"1661a58468491d714a358b6382df88bbd7557e19506009763f841cbcf85781f5","src/thread_pool.rs":"206d5c9d16857d6b2cc9aecb63cd1c9859177b2eaea9b1d7055f5c42bd1ce33f","src/unpark_mutex.rs":"e186464d9bdec22a6d1e1d900ed03a1154e6b0d422ede9bd3b768657cdbb6113","tests/local_pool.rs":"c7f870582a29cdb6ebbb3a325ddb8485c61efac80fb96656003162294f4ec923"},"package":"45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,42 +3,43 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures-executor"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Executors for asynchronous tasks based on the futures-rs library.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-executor/0.3.8"
+documentation = "https://docs.rs/futures-executor/0.3"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.futures-core]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-task]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-util]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.num_cpus]
 version = "1.8.0"
 optional = true
 
+[dev-dependencies]
+
 [features]
 default = ["std"]
 std = ["futures-core/std", "futures-task/std", "futures-util/std"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,24 +1,56 @@
 //! Built-in executors and related tools.
 //!
-//! All items of this library are only available when the `std` feature of this
+//! All asynchronous computation occurs within an executor, which is
+//! capable of spawning futures as tasks. This module provides several
+//! built-in executors, as well as tools for building your own.
+//!
+//! All items are only available when the `std` feature of this
 //! library is activated, and it is activated by default.
+//!
+//! # Using a thread pool (M:N task scheduling)
+//!
+//! Most of the time tasks should be executed on a [thread pool](ThreadPool).
+//! A small set of worker threads can handle a very large set of spawned tasks
+//! (which are much lighter weight than threads). Tasks spawned onto the pool
+//! with the [`spawn_ok`](ThreadPool::spawn_ok) function will run ambiently on
+//! the created threads.
+//!
+//! # Spawning additional tasks
+//!
+//! Tasks can be spawned onto a spawner by calling its [`spawn_obj`] method
+//! directly. In the case of `!Send` futures, [`spawn_local_obj`] can be used
+//! instead.
+//!
+//! # Single-threaded execution
+//!
+//! In addition to thread pools, it's possible to run a task (and the tasks
+//! it spawns) entirely within a single thread via the [`LocalPool`] executor.
+//! Aside from cutting down on synchronization costs, this executor also makes
+//! it possible to spawn non-`Send` tasks, via [`spawn_local_obj`]. The
+//! [`LocalPool`] is best suited for running I/O-bound tasks that do relatively
+//! little work between I/O operations.
+//!
+//! There is also a convenience function [`block_on`] for simply running a
+//! future to completion on the current thread.
+//!
+//! [`spawn_obj`]: https://docs.rs/futures/0.3/futures/task/trait.Spawn.html#tymethod.spawn_obj
+//! [`spawn_local_obj`]: https://docs.rs/futures/0.3/futures/task/trait.LocalSpawn.html#tymethod.spawn_local_obj
 
 #![cfg_attr(not(feature = "std"), no_std)]
-
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
-// It cannot be included in the published code because this lints have false positives in the minimum required version.
-#![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures-executor/0.3.8")]
-
+#![warn(
+    missing_debug_implementations,
+    missing_docs,
+    rust_2018_idioms,
+    single_use_lifetimes,
+    unreachable_pub
+)]
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
 #[cfg(feature = "std")]
@@ -27,13 +59,13 @@
 pub use crate::local_pool::{block_on, block_on_stream, BlockingStream, LocalPool, LocalSpawner};
 
 #[cfg(feature = "thread-pool")]
-#[cfg(feature = "std")]
-mod unpark_mutex;
-#[cfg(feature = "thread-pool")]
 #[cfg_attr(docsrs, doc(cfg(feature = "thread-pool")))]
 #[cfg(feature = "std")]
 mod thread_pool;
 #[cfg(feature = "thread-pool")]
+#[cfg(feature = "std")]
+mod unpark_mutex;
+#[cfg(feature = "thread-pool")]
 #[cfg_attr(docsrs, doc(cfg(feature = "thread-pool")))]
 #[cfg(feature = "std")]
 pub use crate::thread_pool::{ThreadPool, ThreadPoolBuilder};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/src/local_pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/src/local_pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/src/local_pool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/src/local_pool.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,10 @@
 use std::cell::RefCell;
 use std::ops::{Deref, DerefMut};
 use std::rc::{Rc, Weak};
-use std::sync::{Arc, atomic::{AtomicBool, Ordering}};
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
 use std::thread::{self, Thread};
 
 /// A single-threaded task pool for polling futures to completion.
@@ -119,17 +122,12 @@
 impl LocalPool {
     /// Create a new, empty pool of tasks.
     pub fn new() -> Self {
-        Self {
-            pool: FuturesUnordered::new(),
-            incoming: Default::default(),
-        }
+        Self { pool: FuturesUnordered::new(), incoming: Default::default() }
     }
 
     /// Get a clonable handle to the pool as a [`Spawn`].
     pub fn spawner(&self) -> LocalSpawner {
-        LocalSpawner {
-            incoming: Rc::downgrade(&self.incoming),
-        }
+        LocalSpawner { incoming: Rc::downgrade(&self.incoming) }
     }
 
     /// Run all tasks in the pool to completion.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/src/thread_pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/src/thread_pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/src/thread_pool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/src/thread_pool.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,8 +2,8 @@
 use crate::unpark_mutex::UnparkMutex;
 use futures_core::future::Future;
 use futures_core::task::{Context, Poll};
+use futures_task::{waker_ref, ArcWake};
 use futures_task::{FutureObj, Spawn, SpawnError};
-use futures_task::{ArcWake, waker_ref};
 use futures_util::future::FutureExt;
 use std::cmp;
 use std::fmt;
@@ -54,9 +54,7 @@
 
 impl fmt::Debug for ThreadPool {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("ThreadPool")
-            .field("size", &self.state.size)
-            .finish()
+        f.debug_struct("ThreadPool").field("size", &self.state.size).finish()
     }
 }
 
@@ -100,10 +98,7 @@
     pub fn spawn_obj_ok(&self, future: FutureObj<'static, ()>) {
         let task = Task {
             future,
-            wake_handle: Arc::new(WakeHandle {
-                exec: self.clone(),
-                mutex: UnparkMutex::new(),
-            }),
+            wake_handle: Arc::new(WakeHandle { exec: self.clone(), mutex: UnparkMutex::new() }),
             exec: self.clone(),
         };
         self.state.send(Message::Run(task));
@@ -132,10 +127,7 @@
 }
 
 impl Spawn for ThreadPool {
-    fn spawn_obj(
-        &self,
-        future: FutureObj<'static, ()>,
-    ) -> Result<(), SpawnError> {
+    fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
         self.spawn_obj_ok(future);
         Ok(())
     }
@@ -146,10 +138,12 @@
         self.tx.lock().unwrap().send(msg).unwrap();
     }
 
-    fn work(&self,
-            idx: usize,
-            after_start: Option<Arc<dyn Fn(usize) + Send + Sync>>,
-            before_stop: Option<Arc<dyn Fn(usize) + Send + Sync>>) {
+    fn work(
+        &self,
+        idx: usize,
+        after_start: Option<Arc<dyn Fn(usize) + Send + Sync>>,
+        before_stop: Option<Arc<dyn Fn(usize) + Send + Sync>>,
+    ) {
         let _scope = enter().unwrap();
         if let Some(after_start) = after_start {
             after_start(idx);
@@ -241,7 +235,8 @@
     /// The closure provided will receive an index corresponding to the worker
     /// thread it's running on.
     pub fn after_start<F>(&mut self, f: F) -> &mut Self
-        where F: Fn(usize) + Send + Sync + 'static
+    where
+        F: Fn(usize) + Send + Sync + 'static,
     {
         self.after_start = Some(Arc::new(f));
         self
@@ -250,13 +245,14 @@
     /// Execute closure `f` just prior to shutting down each worker thread.
     ///
     /// This hook is intended for bookkeeping and monitoring.
-    /// The closure `f` will be dropped after the `builder` is droppped
+    /// The closure `f` will be dropped after the `builder` is dropped
     /// and all threads in the pool have executed it.
     ///
     /// The closure provided will receive an index corresponding to the worker
     /// thread it's running on.
     pub fn before_stop<F>(&mut self, f: F) -> &mut Self
-        where F: Fn(usize) + Send + Sync + 'static
+    where
+        F: Fn(usize) + Send + Sync + 'static,
     {
         self.before_stop = Some(Arc::new(f));
         self
@@ -328,14 +324,11 @@
                     Poll::Pending => {}
                     Poll::Ready(()) => return wake_handle.mutex.complete(),
                 }
-                let task = Self {
-                    future,
-                    wake_handle: wake_handle.clone(),
-                    exec,
-                };
+                let task = Self { future, wake_handle: wake_handle.clone(), exec };
                 match wake_handle.mutex.wait(task) {
                     Ok(()) => return, // we've waited
-                    Err(task) => { // someone's notified us
+                    Err(task) => {
+                        // someone's notified us
                         future = task.future;
                         exec = task.exec;
                     }
@@ -347,9 +340,7 @@
 
 impl fmt::Debug for Task {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Task")
-            .field("contents", &"...")
-            .finish()
+        f.debug_struct("Task").field("contents", &"...").finish()
     }
 }
 
@@ -372,9 +363,11 @@
         let (tx, rx) = mpsc::sync_channel(2);
         let _cpu_pool = ThreadPoolBuilder::new()
             .pool_size(2)
-            .after_start(move |_| tx.send(1).unwrap()).create().unwrap();
+            .after_start(move |_| tx.send(1).unwrap())
+            .create()
+            .unwrap();
 
-        // After ThreadPoolBuilder is deconstructed, the tx should be droped
+        // After ThreadPoolBuilder is deconstructed, the tx should be dropped
         // so that we can use rx as an iterator.
         let count = rx.into_iter().count();
         assert_eq!(count, 2);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/src/unpark_mutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/src/unpark_mutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/src/unpark_mutex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/src/unpark_mutex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,25 +29,22 @@
 // transitions:
 
 // The task is blocked, waiting on an event
-const WAITING: usize = 0;       // --> POLLING
+const WAITING: usize = 0; // --> POLLING
 
 // The task is actively being polled by a thread; arrival of additional events
 // of interest should move it to the REPOLL state
-const POLLING: usize = 1;       // --> WAITING, REPOLL, or COMPLETE
+const POLLING: usize = 1; // --> WAITING, REPOLL, or COMPLETE
 
 // The task is actively being polled, but will need to be re-polled upon
 // completion to ensure that all events were observed.
-const REPOLL: usize = 2;        // --> POLLING
+const REPOLL: usize = 2; // --> POLLING
 
 // The task has finished executing (either successfully or with an error/panic)
-const COMPLETE: usize = 3;      // No transitions out
+const COMPLETE: usize = 3; // No transitions out
 
 impl<D> UnparkMutex<D> {
     pub(crate) fn new() -> Self {
-        Self {
-            status: AtomicUsize::new(WAITING),
-            inner: UnsafeCell::new(None),
-        }
+        Self { status: AtomicUsize::new(WAITING), inner: UnsafeCell::new(None) }
     }
 
     /// Attempt to "notify" the mutex that a poll should occur.
@@ -62,8 +59,7 @@
             match status {
                 // The task is idle, so try to run it immediately.
                 WAITING => {
-                    match self.status.compare_exchange(WAITING, POLLING,
-                                                       SeqCst, SeqCst) {
+                    match self.status.compare_exchange(WAITING, POLLING, SeqCst, SeqCst) {
                         Ok(_) => {
                             let data = unsafe {
                                 // SAFETY: we've ensured mutual exclusion via
@@ -82,13 +78,10 @@
 
                 // The task is being polled, so we need to record that it should
                 // be *repolled* when complete.
-                POLLING => {
-                    match self.status.compare_exchange(POLLING, REPOLL,
-                                                       SeqCst, SeqCst) {
-                        Ok(_) => return Err(()),
-                        Err(cur) => status = cur,
-                    }
-                }
+                POLLING => match self.status.compare_exchange(POLLING, REPOLL, SeqCst, SeqCst) {
+                    Ok(_) => return Err(()),
+                    Err(cur) => status = cur,
+                },
 
                 // The task is already scheduled for polling, or is complete, so
                 // we've got nothing to do.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/tests/local_pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/tests/local_pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-executor/tests/local_pool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-executor/tests/local_pool.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
 use futures::channel::oneshot;
 use futures::executor::LocalPool;
-use futures::future::{self, Future, lazy, poll_fn};
-use futures::task::{Context, Poll, Spawn, LocalSpawn, Waker};
+use futures::future::{self, lazy, poll_fn, Future};
+use futures::task::{Context, LocalSpawn, Poll, Spawn, Waker};
 use std::cell::{Cell, RefCell};
 use std::pin::Pin;
 use std::rc::Rc;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
-use std::sync::Arc;
-use std::sync::atomic::{Ordering, AtomicBool};
 
 struct Pending(Rc<()>);
 
@@ -52,9 +52,14 @@
     let (tx, rx) = oneshot::channel();
     let mut pool = LocalPool::new();
     let spawn = pool.spawner();
-    spawn.spawn_local_obj(Box::pin(lazy(move |_| {
-        tx.send(()).unwrap();
-    })).into()).unwrap();
+    spawn
+        .spawn_local_obj(
+            Box::pin(lazy(move |_| {
+                tx.send(()).unwrap();
+            }))
+            .into(),
+        )
+        .unwrap();
     pool.run_until(rx).unwrap();
 }
 
@@ -74,18 +79,27 @@
     let spawn = pool.spawner();
     let spawn2 = pool.spawner();
 
-    spawn.spawn_local_obj(Box::pin(lazy(move |_| {
-        spawn2.spawn_local_obj(Box::pin(lazy(move |_| {
-            cnt2.set(cnt2.get() + 1);
-        })).into()).unwrap();
-    })).into()).unwrap();
+    spawn
+        .spawn_local_obj(
+            Box::pin(lazy(move |_| {
+                spawn2
+                    .spawn_local_obj(
+                        Box::pin(lazy(move |_| {
+                            cnt2.set(cnt2.get() + 1);
+                        }))
+                        .into(),
+                    )
+                    .unwrap();
+            }))
+            .into(),
+        )
+        .unwrap();
 
     pool.run();
 
     assert_eq!(cnt.get(), 1);
 }
 
-
 #[test]
 fn run_spawn_many() {
     const ITER: usize = 200;
@@ -97,9 +111,14 @@
 
     for _ in 0..ITER {
         let cnt = cnt.clone();
-        spawn.spawn_local_obj(Box::pin(lazy(move |_| {
-            cnt.set(cnt.get() + 1);
-        })).into()).unwrap();
+        spawn
+            .spawn_local_obj(
+                Box::pin(lazy(move |_| {
+                    cnt.set(cnt.get() + 1);
+                }))
+                .into(),
+            )
+            .unwrap();
     }
 
     pool.run();
@@ -126,9 +145,14 @@
         spawn.spawn_local_obj(Box::pin(pending()).into()).unwrap();
 
         let cnt = cnt.clone();
-        spawn.spawn_local_obj(Box::pin(lazy(move |_| {
-            cnt.set(cnt.get() + 1);
-        })).into()).unwrap();
+        spawn
+            .spawn_local_obj(
+                Box::pin(lazy(move |_| {
+                    cnt.set(cnt.get() + 1);
+                }))
+                .into(),
+            )
+            .unwrap();
 
         spawn.spawn_local_obj(Box::pin(pending()).into()).unwrap();
     }
@@ -154,15 +178,20 @@
     {
         let cnt = cnt.clone();
         let waker = waker.clone();
-        spawn.spawn_local_obj(Box::pin(poll_fn(move |ctx| {
-            cnt.set(cnt.get() + 1);
-            waker.set(Some(ctx.waker().clone()));
-            if cnt.get() == ITER {
-                Poll::Ready(())
-            } else {
-                Poll::Pending
-            }
-        })).into()).unwrap();
+        spawn
+            .spawn_local_obj(
+                Box::pin(poll_fn(move |ctx| {
+                    cnt.set(cnt.get() + 1);
+                    waker.set(Some(ctx.waker().clone()));
+                    if cnt.get() == ITER {
+                        Poll::Ready(())
+                    } else {
+                        Poll::Pending
+                    }
+                }))
+                .into(),
+            )
+            .unwrap();
     }
 
     for i in 0..ITER - 1 {
@@ -185,16 +214,21 @@
 
     let inner_spawner = spawn.clone();
     let cnt1 = cnt.clone();
-    spawn.spawn_local_obj(Box::pin(poll_fn(move |_| {
-        cnt1.set(cnt1.get() + 1);
-        
-        let cnt2 = cnt1.clone();
-        inner_spawner.spawn_local_obj(Box::pin(lazy(move |_|{
-            cnt2.set(cnt2.get() + 1)
-        })).into()).unwrap();
+    spawn
+        .spawn_local_obj(
+            Box::pin(poll_fn(move |_| {
+                cnt1.set(cnt1.get() + 1);
+
+                let cnt2 = cnt1.clone();
+                inner_spawner
+                    .spawn_local_obj(Box::pin(lazy(move |_| cnt2.set(cnt2.get() + 1))).into())
+                    .unwrap();
 
-        Poll::Pending
-    })).into()).unwrap();
+                Poll::Pending
+            }))
+            .into(),
+        )
+        .unwrap();
 
     pool.try_run_one();
     assert_eq!(cnt.get(), 2);
@@ -214,12 +248,12 @@
     let cnt = Rc::new(Cell::new(0));
 
     let cnt1 = cnt.clone();
-    spawn.spawn_local_obj(Box::pin(lazy(move |_|{ cnt1.set(cnt1.get() + 1) })).into()).unwrap();
+    spawn.spawn_local_obj(Box::pin(lazy(move |_| cnt1.set(cnt1.get() + 1))).into()).unwrap();
     pool.run_until_stalled();
     assert_eq!(cnt.get(), 1);
 
     let cnt2 = cnt.clone();
-    spawn.spawn_local_obj(Box::pin(lazy(move |_|{ cnt2.set(cnt2.get() + 1) })).into()).unwrap();
+    spawn.spawn_local_obj(Box::pin(lazy(move |_| cnt2.set(cnt2.get() + 1))).into()).unwrap();
     pool.run_until_stalled();
     assert_eq!(cnt.get(), 2);
 }
@@ -232,16 +266,21 @@
 
     let inner_spawner = spawn.clone();
     let cnt1 = cnt.clone();
-    spawn.spawn_local_obj(Box::pin(poll_fn(move |_| {
-        cnt1.set(cnt1.get() + 1);
-        
-        let cnt2 = cnt1.clone();
-        inner_spawner.spawn_local_obj(Box::pin(lazy(move |_|{
-            cnt2.set(cnt2.get() + 1)
-        })).into()).unwrap();
+    spawn
+        .spawn_local_obj(
+            Box::pin(poll_fn(move |_| {
+                cnt1.set(cnt1.get() + 1);
+
+                let cnt2 = cnt1.clone();
+                inner_spawner
+                    .spawn_local_obj(Box::pin(lazy(move |_| cnt2.set(cnt2.get() + 1))).into())
+                    .unwrap();
 
-        Poll::Pending
-    })).into()).unwrap();
+                Poll::Pending
+            }))
+            .into(),
+        )
+        .unwrap();
 
     pool.run_until_stalled();
     assert_eq!(cnt.get(), 2);
@@ -262,9 +301,14 @@
             spawn.spawn_local_obj(Box::pin(pending()).into()).unwrap();
 
             let cnt = cnt.clone();
-            spawn.spawn_local_obj(Box::pin(lazy(move |_| {
-                cnt.set(cnt.get() + 1);
-            })).into()).unwrap();
+            spawn
+                .spawn_local_obj(
+                    Box::pin(lazy(move |_| {
+                        cnt.set(cnt.get() + 1);
+                    }))
+                    .into(),
+                )
+                .unwrap();
 
             // also add some pending tasks to test if they are ignored
             spawn.spawn_local_obj(Box::pin(pending()).into()).unwrap();
@@ -281,10 +325,15 @@
     let mut pool = LocalPool::new();
     let spawn = pool.spawner();
 
-    spawn.spawn_obj(Box::pin(lazy(|_| {
-        let mut pool = LocalPool::new();
-        pool.run();
-    })).into()).unwrap();
+    spawn
+        .spawn_obj(
+            Box::pin(lazy(|_| {
+                let mut pool = LocalPool::new();
+                pool.run();
+            }))
+            .into(),
+        )
+        .unwrap();
 
     pool.run();
 }
@@ -295,10 +344,15 @@
     let mut pool = LocalPool::new();
     let spawn = pool.spawner();
 
-    spawn.spawn_obj(Box::pin(lazy(|_| {
-        let mut pool = LocalPool::new();
-        pool.run_until_stalled();
-    })).into()).unwrap();
+    spawn
+        .spawn_obj(
+            Box::pin(lazy(|_| {
+                let mut pool = LocalPool::new();
+                pool.run_until_stalled();
+            }))
+            .into(),
+        )
+        .unwrap();
 
     pool.run();
 }
@@ -342,32 +396,26 @@
     let mut pool = LocalPool::new();
     let spawn = pool.spawner();
 
-    spawn.spawn_local_obj(Box::pin(Spin {
-        state: state.clone(),
-        idx: 0,
-    }).into()).unwrap();
-
-    spawn.spawn_local_obj(Box::pin(Spin {
-        state,
-        idx: 1,
-    }).into()).unwrap();
+    spawn.spawn_local_obj(Box::pin(Spin { state: state.clone(), idx: 0 }).into()).unwrap();
+
+    spawn.spawn_local_obj(Box::pin(Spin { state, idx: 1 }).into()).unwrap();
 
     pool.run();
 }
 
 // Tests that the use of park/unpark in user-code has no
-// effect on the expected behaviour of the executor.
+// effect on the expected behavior of the executor.
 #[test]
 fn park_unpark_independence() {
     let mut done = false;
 
     let future = future::poll_fn(move |cx| {
         if done {
-            return Poll::Ready(())
+            return Poll::Ready(());
         }
         done = true;
         cx.waker().clone().wake(); // (*)
-        // some user-code that temporarily parks the thread
+                                   // some user-code that temporarily parks the thread
         let test = thread::current();
         let latch = Arc::new(AtomicBool::new(false));
         let signal = latch.clone();
@@ -384,4 +432,3 @@
 
     futures::executor::block_on(future)
 }
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-io/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-io/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-io/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-io/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"9dad20810a9634f1e9d6f53befefe8ce5c3efbaa3ddd7e88afcdd743551a47c8","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/lib.rs":"2b6e0d2296fc235d994325654c22470e9dd117bf4785f2b98e089958fea79538"},"package":"611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"}
\ No newline at end of file
+{"files":{"Cargo.toml":"fe12f80320fce947570ec2471a984e22482fe043aeee0ab13d49f27bf205390a","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/lib.rs":"ed7cdabff6c25bf4f917b071055962a88809cc4a23a6fc98395d0d72d1d930fd"},"package":"522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-io/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-io/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-io/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-io/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,21 +3,20 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures-io"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "The `AsyncRead`, `AsyncWrite`, `AsyncSeek`, and `AsyncBufRead` traits for the futures-rs library.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-io/0.3.8"
+documentation = "https://docs.rs/futures-io/0.3"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 [package.metadata.docs.rs]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-io/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-io/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-io/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-io/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,23 +9,17 @@
 //! library is activated, and it is activated by default.
 
 #![cfg_attr(all(feature = "read-initializer", feature = "std"), feature(read_initializer))]
-
 #![cfg_attr(not(feature = "std"), no_std)]
-
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
+#![warn(missing_debug_implementations, missing_docs, rust_2018_idioms, unreachable_pub)]
 // It cannot be included in the published code because this lints have false positives in the minimum required version.
 #![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures-io/0.3.8")]
-
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
 #[cfg(all(feature = "read-initializer", not(feature = "unstable")))]
@@ -40,20 +34,14 @@
 
     // Re-export some types from `std::io` so that users don't have to deal
     // with conflicts when `use`ing `futures::io` and `std::io`.
-    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use io::{
-        Error as Error,
-        ErrorKind as ErrorKind,
-        Result as Result,
-        IoSlice as IoSlice,
-        IoSliceMut as IoSliceMut,
-        SeekFrom as SeekFrom,
-    };
-
     #[cfg(feature = "read-initializer")]
     #[cfg_attr(docsrs, doc(cfg(feature = "read-initializer")))]
+    #[doc(no_inline)]
     #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use io::Initializer as Initializer;
+    pub use io::Initializer;
+    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+    #[doc(no_inline)]
+    pub use io::{Error, ErrorKind, IoSlice, IoSliceMut, Result, SeekFrom};
 
     /// Read bytes asynchronously.
     ///
@@ -99,8 +87,11 @@
         /// `Interrupted`.  Implementations must convert `WouldBlock` into
         /// `Poll::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
-        fn poll_read(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8])
-            -> Poll<Result<usize>>;
+        fn poll_read(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &mut [u8],
+        ) -> Poll<Result<usize>>;
 
         /// Attempt to read from the `AsyncRead` into `bufs` using vectored
         /// IO operations.
@@ -124,9 +115,11 @@
         /// `Interrupted`.  Implementations must convert `WouldBlock` into
         /// `Poll::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
-        fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
-            -> Poll<Result<usize>>
-        {
+        fn poll_read_vectored(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            bufs: &mut [IoSliceMut<'_>],
+        ) -> Poll<Result<usize>> {
             for b in bufs {
                 if !b.is_empty() {
                     return self.poll_read(cx, b);
@@ -163,8 +156,11 @@
         ///
         /// `poll_write` must try to make progress by flushing the underlying object if
         /// that is the only way the underlying object can become writable again.
-        fn poll_write(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8])
-            -> Poll<Result<usize>>;
+        fn poll_write(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<Result<usize>>;
 
         /// Attempt to write bytes from `bufs` into the object using vectored
         /// IO operations.
@@ -189,9 +185,11 @@
         /// `Interrupted`.  Implementations must convert `WouldBlock` into
         /// `Poll::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
-        fn poll_write_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &[IoSlice<'_>])
-            -> Poll<Result<usize>>
-        {
+        fn poll_write_vectored(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            bufs: &[IoSlice<'_>],
+        ) -> Poll<Result<usize>> {
             for b in bufs {
                 if !b.is_empty() {
                     return self.poll_write(cx, b);
@@ -266,8 +264,11 @@
         /// `Interrupted`.  Implementations must convert `WouldBlock` into
         /// `Poll::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
-        fn poll_seek(self: Pin<&mut Self>, cx: &mut Context<'_>, pos: SeekFrom)
-            -> Poll<Result<u64>>;
+        fn poll_seek(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            pos: SeekFrom,
+        ) -> Poll<Result<u64>>;
     }
 
     /// Read bytes asynchronously.
@@ -306,8 +307,7 @@
         /// `Interrupted`.  Implementations must convert `WouldBlock` into
         /// `Poll::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
-        fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>)
-            -> Poll<Result<&[u8]>>;
+        fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<&[u8]>>;
 
         /// Tells this buffer that `amt` bytes have been consumed from the buffer,
         /// so they should no longer be returned in calls to [`poll_read`].
@@ -334,18 +334,22 @@
                 (**self).initializer()
             }
 
-            fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8])
-                -> Poll<Result<usize>>
-            {
+            fn poll_read(
+                mut self: Pin<&mut Self>,
+                cx: &mut Context<'_>,
+                buf: &mut [u8],
+            ) -> Poll<Result<usize>> {
                 Pin::new(&mut **self).poll_read(cx, buf)
             }
 
-            fn poll_read_vectored(mut self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
-                -> Poll<Result<usize>>
-            {
+            fn poll_read_vectored(
+                mut self: Pin<&mut Self>,
+                cx: &mut Context<'_>,
+                bufs: &mut [IoSliceMut<'_>],
+            ) -> Poll<Result<usize>> {
                 Pin::new(&mut **self).poll_read_vectored(cx, bufs)
             }
-        }
+        };
     }
 
     impl<T: ?Sized + AsyncRead + Unpin> AsyncRead for Box<T> {
@@ -366,15 +370,19 @@
             (**self).initializer()
         }
 
-        fn poll_read(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8])
-            -> Poll<Result<usize>>
-        {
+        fn poll_read(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &mut [u8],
+        ) -> Poll<Result<usize>> {
             self.get_mut().as_mut().poll_read(cx, buf)
         }
 
-        fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
-            -> Poll<Result<usize>>
-        {
+        fn poll_read_vectored(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            bufs: &mut [IoSliceMut<'_>],
+        ) -> Poll<Result<usize>> {
             self.get_mut().as_mut().poll_read_vectored(cx, bufs)
         }
     }
@@ -386,18 +394,22 @@
                 io::Read::initializer(self)
             }
 
-            fn poll_read(mut self: Pin<&mut Self>, _: &mut Context<'_>, buf: &mut [u8])
-                -> Poll<Result<usize>>
-            {
+            fn poll_read(
+                mut self: Pin<&mut Self>,
+                _: &mut Context<'_>,
+                buf: &mut [u8],
+            ) -> Poll<Result<usize>> {
                 Poll::Ready(io::Read::read(&mut *self, buf))
             }
 
-            fn poll_read_vectored(mut self: Pin<&mut Self>, _: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
-                -> Poll<Result<usize>>
-            {
+            fn poll_read_vectored(
+                mut self: Pin<&mut Self>,
+                _: &mut Context<'_>,
+                bufs: &mut [IoSliceMut<'_>],
+            ) -> Poll<Result<usize>> {
                 Poll::Ready(io::Read::read_vectored(&mut *self, bufs))
             }
-        }
+        };
     }
 
     impl AsyncRead for &[u8] {
@@ -406,15 +418,19 @@
 
     macro_rules! deref_async_write {
         () => {
-            fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8])
-                -> Poll<Result<usize>>
-            {
+            fn poll_write(
+                mut self: Pin<&mut Self>,
+                cx: &mut Context<'_>,
+                buf: &[u8],
+            ) -> Poll<Result<usize>> {
                 Pin::new(&mut **self).poll_write(cx, buf)
             }
 
-            fn poll_write_vectored(mut self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &[IoSlice<'_>])
-                -> Poll<Result<usize>>
-            {
+            fn poll_write_vectored(
+                mut self: Pin<&mut Self>,
+                cx: &mut Context<'_>,
+                bufs: &[IoSlice<'_>],
+            ) -> Poll<Result<usize>> {
                 Pin::new(&mut **self).poll_write_vectored(cx, bufs)
             }
 
@@ -425,7 +441,7 @@
             fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
                 Pin::new(&mut **self).poll_close(cx)
             }
-        }
+        };
     }
 
     impl<T: ?Sized + AsyncWrite + Unpin> AsyncWrite for Box<T> {
@@ -441,15 +457,19 @@
         P: DerefMut + Unpin,
         P::Target: AsyncWrite,
     {
-        fn poll_write(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8])
-            -> Poll<Result<usize>>
-        {
+        fn poll_write(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<Result<usize>> {
             self.get_mut().as_mut().poll_write(cx, buf)
         }
 
-        fn poll_write_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &[IoSlice<'_>])
-            -> Poll<Result<usize>>
-        {
+        fn poll_write_vectored(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            bufs: &[IoSlice<'_>],
+        ) -> Poll<Result<usize>> {
             self.get_mut().as_mut().poll_write_vectored(cx, bufs)
         }
 
@@ -464,15 +484,19 @@
 
     macro_rules! delegate_async_write_to_stdio {
         () => {
-            fn poll_write(mut self: Pin<&mut Self>, _: &mut Context<'_>, buf: &[u8])
-                -> Poll<Result<usize>>
-            {
+            fn poll_write(
+                mut self: Pin<&mut Self>,
+                _: &mut Context<'_>,
+                buf: &[u8],
+            ) -> Poll<Result<usize>> {
                 Poll::Ready(io::Write::write(&mut *self, buf))
             }
 
-            fn poll_write_vectored(mut self: Pin<&mut Self>, _: &mut Context<'_>, bufs: &[IoSlice<'_>])
-                -> Poll<Result<usize>>
-            {
+            fn poll_write_vectored(
+                mut self: Pin<&mut Self>,
+                _: &mut Context<'_>,
+                bufs: &[IoSlice<'_>],
+            ) -> Poll<Result<usize>> {
                 Poll::Ready(io::Write::write_vectored(&mut *self, bufs))
             }
 
@@ -483,7 +507,7 @@
             fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
                 self.poll_flush(cx)
             }
-        }
+        };
     }
 
     impl AsyncWrite for Vec<u8> {
@@ -492,12 +516,14 @@
 
     macro_rules! deref_async_seek {
         () => {
-            fn poll_seek(mut self: Pin<&mut Self>, cx: &mut Context<'_>, pos: SeekFrom)
-                -> Poll<Result<u64>>
-            {
+            fn poll_seek(
+                mut self: Pin<&mut Self>,
+                cx: &mut Context<'_>,
+                pos: SeekFrom,
+            ) -> Poll<Result<u64>> {
                 Pin::new(&mut **self).poll_seek(cx, pos)
             }
-        }
+        };
     }
 
     impl<T: ?Sized + AsyncSeek + Unpin> AsyncSeek for Box<T> {
@@ -513,25 +539,25 @@
         P: DerefMut + Unpin,
         P::Target: AsyncSeek,
     {
-        fn poll_seek(self: Pin<&mut Self>, cx: &mut Context<'_>, pos: SeekFrom)
-            -> Poll<Result<u64>>
-        {
+        fn poll_seek(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            pos: SeekFrom,
+        ) -> Poll<Result<u64>> {
             self.get_mut().as_mut().poll_seek(cx, pos)
         }
     }
 
     macro_rules! deref_async_buf_read {
         () => {
-            fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>)
-                -> Poll<Result<&[u8]>>
-            {
+            fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<&[u8]>> {
                 Pin::new(&mut **self.get_mut()).poll_fill_buf(cx)
             }
 
             fn consume(mut self: Pin<&mut Self>, amt: usize) {
                 Pin::new(&mut **self).consume(amt)
             }
-        }
+        };
     }
 
     impl<T: ?Sized + AsyncBufRead + Unpin> AsyncBufRead for Box<T> {
@@ -547,9 +573,7 @@
         P: DerefMut + Unpin,
         P::Target: AsyncBufRead,
     {
-        fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>)
-            -> Poll<Result<&[u8]>>
-        {
+        fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<&[u8]>> {
             self.get_mut().as_mut().poll_fill_buf(cx)
         }
 
@@ -560,16 +584,14 @@
 
     macro_rules! delegate_async_buf_read_to_stdio {
         () => {
-            fn poll_fill_buf(self: Pin<&mut Self>, _: &mut Context<'_>)
-                -> Poll<Result<&[u8]>>
-            {
+            fn poll_fill_buf(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<&[u8]>> {
                 Poll::Ready(io::BufRead::fill_buf(self.get_mut()))
             }
 
             fn consume(self: Pin<&mut Self>, amt: usize) {
                 io::BufRead::consume(self.get_mut(), amt)
             }
-        }
+        };
     }
 
     impl AsyncBufRead for &[u8] {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,28 @@
+#![warn(rust_2018_idioms, single_use_lifetimes)]
+
+use autocfg::AutoCfg;
+
+// The rustc-cfg strings below are *not* public API. Please let us know by
+// opening a GitHub issue if your build environment requires some way to enable
+// these cfgs other than by executing our build script.
+fn main() {
+    let cfg = match AutoCfg::new() {
+        Ok(cfg) => cfg,
+        Err(e) => {
+            println!(
+                "cargo:warning={}: unable to determine rustc version: {}",
+                env!("CARGO_PKG_NAME"),
+                e
+            );
+            return;
+        }
+    };
+
+    // Function like procedural macros in expressions patterns statements stabilized in Rust 1.45:
+    // https://blog.rust-lang.org/2020/07/16/Rust-1.45.0.html#stabilizing-function-like-procedural-macros-in-expressions-patterns-and-statements
+    if cfg.probe_rustc_version(1, 45) {
+        println!("cargo:rustc-cfg=fn_like_proc_macro");
+    }
+
+    println!("cargo:rerun-if-changed=build.rs");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"c4056c4d1d42c78d4976efa47bed1dfebb42382eef099ead79c935057f564352","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/join.rs":"501ecd91013e543fcdf2f0e983ee5aac30be317fd4ca1b393a667cba5aa50231","src/lib.rs":"abf48b880e78e5b32f1637d14b78bba6af72c65be7c0c5da09a19eb8dc85f868","src/select.rs":"d7939d834ec1895b7b191a72f675df756931d57243b4618a40503c17fc3e283a"},"package":"77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"}
\ No newline at end of file
+{"files":{"Cargo.toml":"891147151ead16d5b6a054220d4dce2e34ced278c9d0a8b7e61aa8976bc3fed1","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","build.rs":"d3c815ba8084078e529ecf5a1232df2995bed4f2ff2c408d16c1f2388c39081a","src/executor.rs":"2a6c40ebf1fb70ac5bd0dfb991c7b945210c731b558b546f2ecb6d7a8976f3f6","src/join.rs":"e0d286558bd944fd02c1bd2501d13e62de2aa65e6bd3a2e0567488ac1a2374ed","src/lib.rs":"0f7edd504895eab37ef3441b42c80776f67d5f6d8bc47a7c85825cee29d73f7a","src/select.rs":"a7ed344932225fbe1b070d132a937184250c31385ac6764a8a6e6817413c7538","src/stream_select.rs":"5fb84834a40876ab1fd975c3af67594d0c5a4f8d724cb164db9bee71e70d14b1"},"package":"18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,21 +3,20 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures-macro"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Taylor Cramer <cramertj@google.com>", "Taiki Endo <te316e89@gmail.com>"]
 description = "The futures-rs procedural macro implementations.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-macro/0.3.8"
+documentation = "https://docs.rs/futures-macro/0.3"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 
@@ -33,7 +32,9 @@
 version = "1.0"
 
 [dependencies.syn]
-version = "1.0"
+version = "1.0.56"
 features = ["full"]
+[build-dependencies.autocfg]
+version = "1"
 
 [features]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/executor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/executor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/executor.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/executor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,55 @@
+use proc_macro::TokenStream;
+use proc_macro2::Span;
+use quote::{quote, quote_spanned, ToTokens};
+
+pub(crate) fn test(args: TokenStream, item: TokenStream) -> TokenStream {
+    if !args.is_empty() {
+        return syn::Error::new_spanned(proc_macro2::TokenStream::from(args), "invalid argument")
+            .to_compile_error()
+            .into();
+    }
+
+    let mut input = syn::parse_macro_input!(item as syn::ItemFn);
+
+    if input.sig.asyncness.take().is_none() {
+        return syn::Error::new_spanned(input.sig.fn_token, "Only async functions are supported")
+            .to_compile_error()
+            .into();
+    }
+
+    // If type mismatch occurs, the current rustc points to the last statement.
+    let (last_stmt_start_span, last_stmt_end_span) = {
+        let mut last_stmt = input
+            .block
+            .stmts
+            .last()
+            .map(ToTokens::into_token_stream)
+            .unwrap_or_default()
+            .into_iter();
+        // `Span` on stable Rust has a limitation that only points to the first
+        // token, not the whole tokens. We can work around this limitation by
+        // using the first/last span of the tokens like
+        // `syn::Error::new_spanned` does.
+        let start = last_stmt.next().map_or_else(Span::call_site, |t| t.span());
+        let end = last_stmt.last().map_or(start, |t| t.span());
+        (start, end)
+    };
+
+    let path = quote_spanned! {last_stmt_start_span=>
+        ::futures_test::__private
+    };
+    let body = &input.block;
+    input.block.stmts = vec![syn::Stmt::Expr(
+        syn::parse2(quote_spanned! {last_stmt_end_span=>
+            #path::block_on(async #body)
+        })
+        .unwrap(),
+    )];
+
+    let gen = quote! {
+        #[::core::prelude::v1::test]
+        #input
+    };
+
+    gen.into()
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/join.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/join.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/join.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/join.rs	2021-12-09 12:01:26.000000000 +0000
@@ -27,10 +27,7 @@
     }
 }
 
-fn bind_futures(
-    fut_exprs: Vec<Expr>,
-    span: Span,
-) -> (Vec<TokenStream2>, Vec<Ident>) {
+fn bind_futures(fut_exprs: Vec<Expr>, span: Span) -> (Vec<TokenStream2>, Vec<Ident>) {
     let mut future_let_bindings = Vec::with_capacity(fut_exprs.len());
     let future_names: Vec<_> = fut_exprs
         .into_iter()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,13 @@
 //! The futures-rs procedural macro implementations.
 
-#![recursion_limit = "128"]
-#![warn(rust_2018_idioms, unreachable_pub)]
-// It cannot be included in the published code because this lints have false positives in the minimum required version.
-#![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures-join-macro/0.3.8")]
+#![warn(rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
 
 // Since https://github.com/rust-lang/cargo/pull/7700 `proc_macro` is part of the prelude for
 // proc-macro crates, but to support older compilers we still need this explicit `extern crate`.
@@ -21,31 +15,52 @@
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
-use proc_macro_hack::proc_macro_hack;
 
+mod executor;
 mod join;
 mod select;
+mod stream_select;
 
 /// The `join!` macro.
-#[proc_macro_hack]
+#[cfg_attr(fn_like_proc_macro, proc_macro)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)]
 pub fn join_internal(input: TokenStream) -> TokenStream {
     crate::join::join(input)
 }
 
 /// The `try_join!` macro.
-#[proc_macro_hack]
+#[cfg_attr(fn_like_proc_macro, proc_macro)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)]
 pub fn try_join_internal(input: TokenStream) -> TokenStream {
     crate::join::try_join(input)
 }
 
 /// The `select!` macro.
-#[proc_macro_hack]
+#[cfg_attr(fn_like_proc_macro, proc_macro)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)]
 pub fn select_internal(input: TokenStream) -> TokenStream {
     crate::select::select(input)
 }
 
 /// The `select_biased!` macro.
-#[proc_macro_hack]
+#[cfg_attr(fn_like_proc_macro, proc_macro)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)]
 pub fn select_biased_internal(input: TokenStream) -> TokenStream {
     crate::select::select_biased(input)
 }
+
+// TODO: Change this to doc comment once rustdoc bug fixed.
+// The `test` attribute.
+#[proc_macro_attribute]
+pub fn test_internal(input: TokenStream, item: TokenStream) -> TokenStream {
+    crate::executor::test(input, item)
+}
+
+/// The `stream_select!` macro.
+#[cfg_attr(fn_like_proc_macro, proc_macro)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)]
+pub fn stream_select_internal(input: TokenStream) -> TokenStream {
+    crate::stream_select::stream_select(input.into())
+        .unwrap_or_else(syn::Error::into_compile_error)
+        .into()
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/select.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,8 +3,8 @@
 use proc_macro::TokenStream;
 use proc_macro2::Span;
 use quote::{format_ident, quote};
-use syn::{parse_quote, Expr, Ident, Pat, Token};
 use syn::parse::{Parse, ParseStream};
+use syn::{parse_quote, Expr, Ident, Pat, Token};
 
 mod kw {
     syn::custom_keyword!(complete);
@@ -63,7 +63,10 @@
 
             // Commas after the expression are only optional if it's a `Block`
             // or it is the last branch in the `match`.
-            let is_block = match expr { Expr::Block(_) => true, _ => false };
+            let is_block = match expr {
+                Expr::Block(_) => true,
+                _ => false,
+            };
             if is_block || input.is_empty() {
                 input.parse::<Option<Token![,]>>()?;
             } else {
@@ -76,7 +79,7 @@
                 CaseKind::Normal(pat, fut_expr) => {
                     select.normal_fut_exprs.push(fut_expr);
                     select.normal_fut_handlers.push((pat, expr));
-                },
+                }
             }
         }
 
@@ -92,22 +95,16 @@
     result_ident: Ident,
     variants: usize,
     complete: bool,
-    span: Span
+    span: Span,
 ) -> (Vec<Ident>, syn::ItemEnum) {
     // "_0", "_1", "_2"
     let variant_names: Vec<Ident> =
-        (0..variants)
-            .map(|num| format_ident!("_{}", num, span = span))
-            .collect();
+        (0..variants).map(|num| format_ident!("_{}", num, span = span)).collect();
 
     let type_parameters = &variant_names;
     let variants = &variant_names;
 
-    let complete_variant = if complete {
-        Some(quote!(Complete))
-    } else {
-        None
-    };
+    let complete_variant = if complete { Some(quote!(Complete)) } else { None };
 
     let enum_item = parse_quote! {
         enum #result_ident<#(#type_parameters,)*> {
@@ -148,7 +145,9 @@
 
     // bind non-`Ident` future exprs w/ `let`
     let mut future_let_bindings = Vec::with_capacity(parsed.normal_fut_exprs.len());
-    let bound_future_names: Vec<_> = parsed.normal_fut_exprs.into_iter()
+    let bound_future_names: Vec<_> = parsed
+        .normal_fut_exprs
+        .into_iter()
         .zip(variant_names.iter())
         .map(|(expr, variant_name)| {
             match expr {
@@ -164,7 +163,7 @@
                         __futures_crate::async_await::assert_unpin(&#path);
                     });
                     path
-                },
+                }
                 _ => {
                     // Bind and pin the resulting Future on the stack. This is
                     // necessary to support direct select! calls on !Unpin
@@ -188,8 +187,8 @@
 
     // For each future, make an `&mut dyn FnMut(&mut Context<'_>) -> Option<Poll<__PrivResult<...>>`
     // to use for polling that individual future. These will then be put in an array.
-    let poll_functions = bound_future_names.iter().zip(variant_names.iter())
-        .map(|(bound_future_name, variant_name)| {
+    let poll_functions = bound_future_names.iter().zip(variant_names.iter()).map(
+        |(bound_future_name, variant_name)| {
             // Below we lazily create the Pin on the Future below.
             // This is done in order to avoid allocating memory in the generator
             // for the Pin variable.
@@ -216,7 +215,8 @@
                     &mut __futures_crate::task::Context<'_>
                 ) -> __futures_crate::Option<__futures_crate::task::Poll<_>> = &mut #variant_name;
             }
-        });
+        },
+    );
 
     let none_polled = if parsed.complete.is_some() {
         quote! {
@@ -229,13 +229,13 @@
         }
     };
 
-    let branches = parsed.normal_fut_handlers.into_iter()
-        .zip(variant_names.iter())
-        .map(|((pat, expr), variant_name)| {
+    let branches = parsed.normal_fut_handlers.into_iter().zip(variant_names.iter()).map(
+        |((pat, expr), variant_name)| {
             quote! {
                 #enum_ident::#variant_name(#pat) => { #expr },
             }
-        });
+        },
+    );
     let branches = quote! { #( #branches )* };
 
     let complete_branch = parsed.complete.map(|complete_expr| {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/stream_select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/stream_select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-macro/src/stream_select.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-macro/src/stream_select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,113 @@
+use proc_macro2::TokenStream;
+use quote::{format_ident, quote, ToTokens};
+use syn::{parse::Parser, punctuated::Punctuated, Expr, Index, Token};
+
+/// The `stream_select!` macro.
+pub(crate) fn stream_select(input: TokenStream) -> Result<TokenStream, syn::Error> {
+    let args = Punctuated::<Expr, Token![,]>::parse_terminated.parse2(input)?;
+    if args.len() < 2 {
+        return Ok(quote! {
+           compile_error!("stream select macro needs at least two arguments.")
+        });
+    }
+    let generic_idents = (0..args.len()).map(|i| format_ident!("_{}", i)).collect::<Vec<_>>();
+    let field_idents = (0..args.len()).map(|i| format_ident!("__{}", i)).collect::<Vec<_>>();
+    let field_idents_2 = (0..args.len()).map(|i| format_ident!("___{}", i)).collect::<Vec<_>>();
+    let field_indices = (0..args.len()).map(Index::from).collect::<Vec<_>>();
+    let args = args.iter().map(|e| e.to_token_stream());
+
+    Ok(quote! {
+        {
+            #[derive(Debug)]
+            struct StreamSelect<#(#generic_idents),*> (#(Option<#generic_idents>),*);
+
+            enum StreamEnum<#(#generic_idents),*> {
+                #(
+                    #generic_idents(#generic_idents)
+                ),*,
+                None,
+            }
+
+            impl<ITEM, #(#generic_idents),*> __futures_crate::stream::Stream for StreamEnum<#(#generic_idents),*>
+            where #(#generic_idents: __futures_crate::stream::Stream<Item=ITEM> + ::std::marker::Unpin,)*
+            {
+                type Item = ITEM;
+
+                fn poll_next(mut self: ::std::pin::Pin<&mut Self>, cx: &mut __futures_crate::task::Context<'_>) -> __futures_crate::task::Poll<Option<Self::Item>> {
+                    match self.get_mut() {
+                        #(
+                            Self::#generic_idents(#generic_idents) => ::std::pin::Pin::new(#generic_idents).poll_next(cx)
+                        ),*,
+                        Self::None => panic!("StreamEnum::None should never be polled!"),
+                    }
+                }
+            }
+
+            impl<ITEM, #(#generic_idents),*> __futures_crate::stream::Stream for StreamSelect<#(#generic_idents),*>
+            where #(#generic_idents: __futures_crate::stream::Stream<Item=ITEM> + ::std::marker::Unpin,)*
+            {
+                type Item = ITEM;
+
+                fn poll_next(mut self: ::std::pin::Pin<&mut Self>, cx: &mut __futures_crate::task::Context<'_>) -> __futures_crate::task::Poll<Option<Self::Item>> {
+                    let Self(#(ref mut #field_idents),*) = self.get_mut();
+                    #(
+                        let mut #field_idents_2 = false;
+                    )*
+                    let mut any_pending = false;
+                    {
+                        let mut stream_array = [#(#field_idents.as_mut().map(|f| StreamEnum::#generic_idents(f)).unwrap_or(StreamEnum::None)),*];
+                        __futures_crate::async_await::shuffle(&mut stream_array);
+
+                        for mut s in stream_array {
+                            if let StreamEnum::None = s {
+                                continue;
+                            } else {
+                                match __futures_crate::stream::Stream::poll_next(::std::pin::Pin::new(&mut s), cx) {
+                                    r @ __futures_crate::task::Poll::Ready(Some(_)) => {
+                                        return r;
+                                    },
+                                    __futures_crate::task::Poll::Pending => {
+                                        any_pending = true;
+                                    },
+                                    __futures_crate::task::Poll::Ready(None) => {
+                                        match s {
+                                            #(
+                                                StreamEnum::#generic_idents(_) => { #field_idents_2 = true; }
+                                            ),*,
+                                            StreamEnum::None => panic!("StreamEnum::None should never be polled!"),
+                                        }
+                                    },
+                                }
+                            }
+                        }
+                    }
+                    #(
+                        if #field_idents_2 {
+                            *#field_idents = None;
+                        }
+                    )*
+                    if any_pending {
+                        __futures_crate::task::Poll::Pending
+                    } else {
+                        __futures_crate::task::Poll::Ready(None)
+                    }
+                }
+
+                fn size_hint(&self) -> (usize, Option<usize>) {
+                    let mut s = (0, Some(0));
+                    #(
+                        if let Some(new_hint) = self.#field_indices.as_ref().map(|s| s.size_hint()) {
+                            s.0 += new_hint.0;
+                            // We can change this out for `.zip` when the MSRV is 1.46.0 or higher.
+                            s.1 = s.1.and_then(|a| new_hint.1.map(|b| a + b));
+                        }
+                    )*
+                    s
+                }
+            }
+
+            StreamSelect(#(Some(#args)),*)
+
+        }
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-sink/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-sink/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-sink/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-sink/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b674935ca4e36c4c74454bed3190c926eeb893e019525175497bf1ba8c6912df","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/lib.rs":"758a4ee288b343b9a0dd687c7ac05b0988718958f4a2d7438fe7e99624255286"},"package":"f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"}
\ No newline at end of file
+{"files":{"Cargo.toml":"0ee9bc98331de6f7d606b69931a0fa712c6361bc172d76ea4c7010a316874534","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/lib.rs":"90c41f91e4b6764a218d4f337a9a46fba1e256f59f67b0afa5352ba92bf641c0"},"package":"36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-sink/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-sink/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-sink/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-sink/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,21 +3,20 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures-sink"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "The asynchronous `Sink` trait for the futures-rs library.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-sink/0.3.8"
+documentation = "https://docs.rs/futures-sink/0.3"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 [package.metadata.docs.rs]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-sink/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-sink/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-sink/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-sink/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,19 +4,16 @@
 //! asynchronously.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
+#![warn(missing_debug_implementations, missing_docs, rust_2018_idioms, unreachable_pub)]
 // It cannot be included in the published code because this lints have false positives in the minimum required version.
 #![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures-sink/0.3.8")]
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
 
 #[cfg(feature = "alloc")]
 extern crate alloc;
@@ -215,7 +212,10 @@
     impl<S: ?Sized + Sink<Item> + Unpin, Item> Sink<Item> for alloc::boxed::Box<S> {
         type Error = S::Error;
 
-        fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        fn poll_ready(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+        ) -> Poll<Result<(), Self::Error>> {
             Pin::new(&mut **self).poll_ready(cx)
         }
 
@@ -223,11 +223,17 @@
             Pin::new(&mut **self).start_send(item)
         }
 
-        fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        fn poll_flush(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+        ) -> Poll<Result<(), Self::Error>> {
             Pin::new(&mut **self).poll_flush(cx)
         }
 
-        fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        fn poll_close(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+        ) -> Poll<Result<(), Self::Error>> {
             Pin::new(&mut **self).poll_close(cx)
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+#![warn(rust_2018_idioms, single_use_lifetimes)]
+
+use std::env;
+
+include!("no_atomic_cas.rs");
+
+// The rustc-cfg listed below are considered public API, but it is *unstable*
+// and outside of the normal semver guarantees:
+//
+// - `futures_no_atomic_cas`
+//      Assume the target does *not* support atomic CAS operations.
+//      This is usually detected automatically by the build script, but you may
+//      need to enable it manually when building for custom targets or using
+//      non-cargo build systems that don't run the build script.
+//
+// With the exceptions mentioned above, the rustc-cfg strings below are
+// *not* public API. Please let us know by opening a GitHub issue if your build
+// environment requires some way to enable these cfgs other than by executing
+// our build script.
+fn main() {
+    let target = match env::var("TARGET") {
+        Ok(target) => target,
+        Err(e) => {
+            println!(
+                "cargo:warning={}: unable to get TARGET environment variable: {}",
+                env!("CARGO_PKG_NAME"),
+                e
+            );
+            return;
+        }
+    };
+
+    // Note that this is `no_*`, not `has_*`. This allows treating
+    // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't
+    // run. This is needed for compatibility with non-cargo build systems that
+    // don't run the build script.
+    if NO_ATOMIC_CAS_TARGETS.contains(&&*target) {
+        println!("cargo:rustc-cfg=futures_no_atomic_cas");
+    }
+
+    println!("cargo:rerun-if-changed=no_atomic_cas.rs");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"ea2534fe65b43cf1c31104b274bafdee600ebcd35061c53df57728dca94df1d0","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","src/arc_wake.rs":"0e3f7d7883b75337b0b92ff55e477f0bf96f6eb08def7d953676a289fd9696ec","src/future_obj.rs":"761fdb79771d37c5ac7bf71188b1fee6a6c7456b490f3e6ad6891995f79ee5e9","src/lib.rs":"e5818350530c2467a13fe97046848e47a60973d58c402233c53d02700299ee70","src/noop_waker.rs":"094c2b701420bdcffaff44563c1eef8da3e0fc424f87eb665074c9a0a48bd301","src/spawn.rs":"37c7753e724d8346af5bb43462b1cf605e23bc5a3209feb2a6f33a018e9fa262","src/waker.rs":"fd951d3498739178c4b684ddb8d1a351b094bd300b52c1ccb0b9284affbcfed7","src/waker_ref.rs":"4189e2ad0ed1c1e73b374da6de448587bb39154efbd30b5c20ff92f95e91c3ad"},"package":"7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"}
\ No newline at end of file
+{"files":{"Cargo.toml":"c699849d5c550f366b38c07578a61c60b69a516be245627b55509f7b5c923e07","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","build.rs":"f6e21c09f18cc405bd7048cb7a2958f92d5414b9ca6b301d137e120a84fa020a","no_atomic_cas.rs":"ff8be002b49a5cd9e4ca0db17b1c9e6b98e55f556319eb6b953dd6ff52c397a6","src/arc_wake.rs":"0e3f7d7883b75337b0b92ff55e477f0bf96f6eb08def7d953676a289fd9696ec","src/future_obj.rs":"10dab39a613d938823f09c3ecdbf7e199ac173a775fd8c5db675c7ecb3b429a2","src/lib.rs":"c55281988768d44d3305b2352c7ebb66e6449797239c07b14257a2d8e612e06b","src/noop_waker.rs":"41246601dab77f69bf09257afc3321031a5a31a7eda51787029870eda9922356","src/spawn.rs":"afcf46b98d62e78d2c974f91df32590bd78fe8c79031e4ae7accf9270e1f6224","src/waker.rs":"748d4a045ea9be605a67f3c20607cc3a5ba20036942c0016cc4299df0446507c","src/waker_ref.rs":"8e3ce1aea4f433ce04c2d15eb065d89582527c1a3a15886c445eb3a78f4fd0d6"},"package":"1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,34 +3,32 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures-task"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Tools for working with tasks.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-task/0.3.8"
+documentation = "https://docs.rs/futures-task/0.3"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 [package.metadata.docs.rs]
 all-features = true
-[dependencies.once_cell]
-version = "1.3.1"
-features = ["std"]
-optional = true
-default-features = false
+
+[dependencies]
+
+[dev-dependencies]
 
 [features]
 alloc = []
 cfg-target-has-atomic = []
 default = ["std"]
-std = ["alloc", "once_cell"]
+std = ["alloc"]
 unstable = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/no_atomic_cas.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/no_atomic_cas.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/no_atomic_cas.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/no_atomic_cas.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+// This file is @generated by no_atomic_cas.sh.
+// It is not intended for manual editing.
+
+const NO_ATOMIC_CAS_TARGETS: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "bpfeb-unknown-none",
+    "bpfel-unknown-none",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/future_obj.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/future_obj.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/future_obj.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/future_obj.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
 use core::{
-    mem,
     fmt,
     future::Future,
     marker::PhantomData,
+    mem,
     pin::Pin,
     task::{Context, Poll},
 };
@@ -26,16 +26,16 @@
 
 #[allow(single_use_lifetimes)]
 #[allow(clippy::transmute_ptr_to_ptr)]
-unsafe fn remove_future_lifetime<'a, T>(ptr: *mut (dyn Future<Output = T> + 'a))
-    -> *mut (dyn Future<Output = T> + 'static)
-{
+unsafe fn remove_future_lifetime<'a, T>(
+    ptr: *mut (dyn Future<Output = T> + 'a),
+) -> *mut (dyn Future<Output = T> + 'static) {
     mem::transmute(ptr)
 }
 
 #[allow(single_use_lifetimes)]
-unsafe fn remove_drop_lifetime<'a, T>(ptr: unsafe fn (*mut (dyn Future<Output = T> + 'a)))
-    -> unsafe fn(*mut (dyn Future<Output = T> + 'static))
-{
+unsafe fn remove_drop_lifetime<'a, T>(
+    ptr: unsafe fn(*mut (dyn Future<Output = T> + 'a)),
+) -> unsafe fn(*mut (dyn Future<Output = T> + 'static)) {
     mem::transmute(ptr)
 }
 
@@ -65,8 +65,7 @@
 
 impl<T> fmt::Debug for LocalFutureObj<'_, T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("LocalFutureObj")
-            .finish()
+        f.debug_struct("LocalFutureObj").finish()
     }
 }
 
@@ -82,17 +81,13 @@
 
     #[inline]
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<T> {
-        unsafe {
-            Pin::new_unchecked(&mut *self.future).poll(cx)
-        }
+        unsafe { Pin::new_unchecked(&mut *self.future).poll(cx) }
     }
 }
 
 impl<T> Drop for LocalFutureObj<'_, T> {
     fn drop(&mut self) {
-        unsafe {
-            (self.drop_fn)(self.future)
-        }
+        unsafe { (self.drop_fn)(self.future) }
     }
 }
 
@@ -120,8 +115,7 @@
 
 impl<T> fmt::Debug for FutureObj<'_, T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("FutureObj")
-            .finish()
+        f.debug_struct("FutureObj").finish()
     }
 }
 
@@ -130,7 +124,7 @@
 
     #[inline]
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<T> {
-        Pin::new( &mut self.0 ).poll(cx)
+        Pin::new(&mut self.0).poll(cx)
     }
 }
 
@@ -180,7 +174,7 @@
 
 unsafe impl<'a, T, F> UnsafeFutureObj<'a, T> for &'a mut F
 where
-    F: Future<Output = T> + Unpin + 'a
+    F: Future<Output = T> + Unpin + 'a,
 {
     fn into_raw(self) -> *mut (dyn Future<Output = T> + 'a) {
         self as *mut dyn Future<Output = T>
@@ -189,8 +183,7 @@
     unsafe fn drop(_ptr: *mut (dyn Future<Output = T> + 'a)) {}
 }
 
-unsafe impl<'a, T> UnsafeFutureObj<'a, T> for &'a mut (dyn Future<Output = T> + Unpin + 'a)
-{
+unsafe impl<'a, T> UnsafeFutureObj<'a, T> for &'a mut (dyn Future<Output = T> + Unpin + 'a) {
     fn into_raw(self) -> *mut (dyn Future<Output = T> + 'a) {
         self as *mut dyn Future<Output = T>
     }
@@ -200,7 +193,7 @@
 
 unsafe impl<'a, T, F> UnsafeFutureObj<'a, T> for Pin<&'a mut F>
 where
-    F: Future<Output = T> + 'a
+    F: Future<Output = T> + 'a,
 {
     fn into_raw(self) -> *mut (dyn Future<Output = T> + 'a) {
         unsafe { self.get_unchecked_mut() as *mut dyn Future<Output = T> }
@@ -209,8 +202,7 @@
     unsafe fn drop(_ptr: *mut (dyn Future<Output = T> + 'a)) {}
 }
 
-unsafe impl<'a, T> UnsafeFutureObj<'a, T> for Pin<&'a mut (dyn Future<Output = T> + 'a)>
-{
+unsafe impl<'a, T> UnsafeFutureObj<'a, T> for Pin<&'a mut (dyn Future<Output = T> + 'a)> {
     fn into_raw(self) -> *mut (dyn Future<Output = T> + 'a) {
         unsafe { self.get_unchecked_mut() as *mut dyn Future<Output = T> }
     }
@@ -224,7 +216,8 @@
     use alloc::boxed::Box;
 
     unsafe impl<'a, T, F> UnsafeFutureObj<'a, T> for Box<F>
-        where F: Future<Output = T> + 'a
+    where
+        F: Future<Output = T> + 'a,
     {
         fn into_raw(self) -> *mut (dyn Future<Output = T> + 'a) {
             Box::into_raw(self)
@@ -257,7 +250,7 @@
 
     unsafe impl<'a, T, F> UnsafeFutureObj<'a, T> for Pin<Box<F>>
     where
-        F: Future<Output = T> + 'a
+        F: Future<Output = T> + 'a,
     {
         fn into_raw(mut self) -> *mut (dyn Future<Output = T> + 'a) {
             let ptr = unsafe { self.as_mut().get_unchecked_mut() as *mut _ };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,62 +1,50 @@
 //! Tools for working with tasks.
 
-#![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
-
 #![cfg_attr(not(feature = "std"), no_std)]
-
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
+#![warn(missing_debug_implementations, missing_docs, rust_2018_idioms, unreachable_pub)]
 // It cannot be included in the published code because this lints have false positives in the minimum required version.
 #![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures-task/0.3.8")]
-
-#[cfg(all(feature = "cfg-target-has-atomic", not(feature = "unstable")))]
-compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feature as an explicit opt-in to unstable features");
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
 
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
-macro_rules! cfg_target_has_atomic {
-    ($($item:item)*) => {$(
-        #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-        $item
-    )*};
-}
-
 mod spawn;
-pub use crate::spawn::{Spawn, SpawnError, LocalSpawn};
+pub use crate::spawn::{LocalSpawn, Spawn, SpawnError};
 
-cfg_target_has_atomic! {
-    #[cfg(feature = "alloc")]
-    mod arc_wake;
-    #[cfg(feature = "alloc")]
-    pub use crate::arc_wake::ArcWake;
-
-    #[cfg(feature = "alloc")]
-    mod waker;
-    #[cfg(feature = "alloc")]
-    pub use crate::waker::waker;
-
-    #[cfg(feature = "alloc")]
-    mod waker_ref;
-    #[cfg(feature = "alloc")]
-    pub use crate::waker_ref::{waker_ref, WakerRef};
-}
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod arc_wake;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use crate::arc_wake::ArcWake;
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod waker;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use crate::waker::waker;
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod waker_ref;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use crate::waker_ref::{waker_ref, WakerRef};
 
 mod future_obj;
 pub use crate::future_obj::{FutureObj, LocalFutureObj, UnsafeFutureObj};
 
 mod noop_waker;
 pub use crate::noop_waker::noop_waker;
-#[cfg(feature = "std")]
 pub use crate::noop_waker::noop_waker_ref;
 
-pub use core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
+#[doc(no_inline)]
+pub use core::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/noop_waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/noop_waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/noop_waker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/noop_waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,7 @@
 //! Utilities for creating zero-cost wakers that don't do anything.
 
-use core::task::{RawWaker, RawWakerVTable, Waker};
 use core::ptr::null;
-#[cfg(feature = "std")]
-use once_cell::sync::Lazy;
+use core::task::{RawWaker, RawWakerVTable, Waker};
 
 unsafe fn noop_clone(_data: *const ()) -> RawWaker {
     noop_raw_waker()
@@ -13,7 +11,7 @@
 
 const NOOP_WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(noop_clone, noop, noop, noop);
 
-fn noop_raw_waker() -> RawWaker {
+const fn noop_raw_waker() -> RawWaker {
     RawWaker::new(null(), &NOOP_WAKER_VTABLE)
 }
 
@@ -29,9 +27,8 @@
 /// ```
 #[inline]
 pub fn noop_waker() -> Waker {
-    unsafe {
-        Waker::from_raw(noop_raw_waker())
-    }
+    // FIXME: Since 1.46.0 we can use transmute in consts, allowing this function to be const.
+    unsafe { Waker::from_raw(noop_raw_waker()) }
 }
 
 /// Get a static reference to a [`Waker`] which
@@ -45,10 +42,14 @@
 /// waker.wake_by_ref();
 /// ```
 #[inline]
-#[cfg(feature = "std")]
 pub fn noop_waker_ref() -> &'static Waker {
-    static NOOP_WAKER_INSTANCE: Lazy<Waker> = Lazy::new(noop_waker);
-    &*NOOP_WAKER_INSTANCE
+    struct SyncRawWaker(RawWaker);
+    unsafe impl Sync for SyncRawWaker {}
+
+    static NOOP_WAKER_INSTANCE: SyncRawWaker = SyncRawWaker(noop_raw_waker());
+
+    // SAFETY: `Waker` is #[repr(transparent)] over its `RawWaker`.
+    unsafe { &*(&NOOP_WAKER_INSTANCE.0 as *const RawWaker as *const Waker) }
 }
 
 #[cfg(test)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/spawn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/spawn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/spawn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/spawn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -126,7 +126,7 @@
 #[cfg(feature = "alloc")]
 mod if_alloc {
     use super::*;
-    use alloc::{ boxed::Box, rc::Rc };
+    use alloc::{boxed::Box, rc::Rc};
 
     impl<Sp: ?Sized + Spawn> Spawn for Box<Sp> {
         fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
@@ -168,27 +168,25 @@
         }
     }
 
-    cfg_target_has_atomic! {
-        use alloc::{ sync::Arc };
+    #[cfg(not(futures_no_atomic_cas))]
+    impl<Sp: ?Sized + Spawn> Spawn for alloc::sync::Arc<Sp> {
+        fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
+            (**self).spawn_obj(future)
+        }
+
+        fn status(&self) -> Result<(), SpawnError> {
+            (**self).status()
+        }
+    }
 
-        impl<Sp: ?Sized + Spawn> Spawn for Arc<Sp> {
-            fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
-                (**self).spawn_obj(future)
-            }
-
-            fn status(&self) -> Result<(), SpawnError> {
-                (**self).status()
-            }
-        }
-
-        impl<Sp: ?Sized + LocalSpawn> LocalSpawn for Arc<Sp> {
-            fn spawn_local_obj(&self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
-                (**self).spawn_local_obj(future)
-            }
-
-            fn status_local(&self) -> Result<(), SpawnError> {
-                (**self).status_local()
-            }
+    #[cfg(not(futures_no_atomic_cas))]
+    impl<Sp: ?Sized + LocalSpawn> LocalSpawn for alloc::sync::Arc<Sp> {
+        fn spawn_local_obj(&self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
+            (**self).spawn_local_obj(future)
+        }
+
+        fn status_local(&self) -> Result<(), SpawnError> {
+            (**self).status_local()
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/waker_ref.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/waker_ref.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/waker_ref.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/waker_ref.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,10 @@
-use super::arc_wake::{ArcWake};
+use super::arc_wake::ArcWake;
 use super::waker::waker_vtable;
 use alloc::sync::Arc;
-use core::mem::ManuallyDrop;
 use core::marker::PhantomData;
+use core::mem::ManuallyDrop;
 use core::ops::Deref;
-use core::task::{Waker, RawWaker};
+use core::task::{RawWaker, Waker};
 
 /// A [`Waker`] that is only valid for a given lifetime.
 ///
@@ -22,10 +22,7 @@
         // copy the underlying (raw) waker without calling a clone,
         // as we won't call Waker::drop either.
         let waker = ManuallyDrop::new(unsafe { core::ptr::read(waker) });
-        Self {
-            waker,
-            _marker: PhantomData,
-        }
+        Self { waker, _marker: PhantomData }
     }
 
     /// Create a new [`WakerRef`] from a [`Waker`] that must not be dropped.
@@ -35,10 +32,7 @@
     /// by the caller), and the [`Waker`] doesn't need to or must not be
     /// destroyed.
     pub fn new_unowned(waker: ManuallyDrop<Waker>) -> Self {
-        Self {
-            waker,
-            _marker: PhantomData,
-        }
+        Self { waker, _marker: PhantomData }
     }
 }
 
@@ -57,14 +51,13 @@
 #[inline]
 pub fn waker_ref<W>(wake: &Arc<W>) -> WakerRef<'_>
 where
-    W: ArcWake
+    W: ArcWake,
 {
     // simply copy the pointer instead of using Arc::into_raw,
     // as we don't actually keep a refcount by using ManuallyDrop.<
     let ptr = (&**wake as *const W) as *const ();
 
-    let waker = ManuallyDrop::new(unsafe {
-        Waker::from_raw(RawWaker::new(ptr, waker_vtable::<W>()))
-    });
+    let waker =
+        ManuallyDrop::new(unsafe { Waker::from_raw(RawWaker::new(ptr, waker_vtable::<W>())) });
     WakerRef::new_unowned(waker)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-task/src/waker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-task/src/waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use super::arc_wake::ArcWake;
-use core::mem;
-use core::task::{Waker, RawWaker, RawWakerVTable};
 use alloc::sync::Arc;
+use core::mem;
+use core::task::{RawWaker, RawWakerVTable, Waker};
 
 pub(super) fn waker_vtable<W: ArcWake>() -> &'static RawWakerVTable {
     &RawWakerVTable::new(
@@ -22,9 +22,7 @@
 {
     let ptr = Arc::into_raw(wake) as *const ();
 
-    unsafe {
-        Waker::from_raw(RawWaker::new(ptr, waker_vtable::<W>()))
-    }
+    unsafe { Waker::from_raw(RawWaker::new(ptr, waker_vtable::<W>())) }
 }
 
 // FIXME: panics on Arc::clone / refcount changes could wreak havoc on the
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/benches/futures_unordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/benches/futures_unordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/benches/futures_unordered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/benches/futures_unordered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 use futures::channel::oneshot;
 use futures::executor::block_on;
 use futures::future;
-use futures::stream::{StreamExt, FuturesUnordered};
+use futures::stream::{FuturesUnordered, StreamExt};
 use futures::task::Poll;
 use std::collections::VecDeque;
 use std::thread;
@@ -34,7 +34,7 @@
         block_on(future::poll_fn(move |cx| {
             loop {
                 if let Poll::Ready(None) = rxs.poll_next_unpin(cx) {
-                    break
+                    break;
                 }
             }
             Poll::Ready(())
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/benches_disabled/bilock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/benches_disabled/bilock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/benches_disabled/bilock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/benches_disabled/bilock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,125 +2,121 @@
 
 #[cfg(feature = "bilock")]
 mod bench {
-use futures::task::{Context, Waker};
-use futures::executor::LocalPool;
-use futures_util::lock::BiLock;
-use futures_util::lock::BiLockAcquire;
-use futures_util::lock::BiLockAcquired;
-use futures_util::task::ArcWake;
+    use futures::executor::LocalPool;
+    use futures::task::{Context, Waker};
+    use futures_util::lock::BiLock;
+    use futures_util::lock::BiLockAcquire;
+    use futures_util::lock::BiLockAcquired;
+    use futures_util::task::ArcWake;
 
-use std::sync::Arc;
-use test::Bencher;
+    use std::sync::Arc;
+    use test::Bencher;
 
-fn notify_noop() -> Waker {
-    struct Noop;
+    fn notify_noop() -> Waker {
+        struct Noop;
 
-    impl ArcWake for Noop {
-        fn wake(_: &Arc<Self>) {}
-    }
-
-    ArcWake::into_waker(Arc::new(Noop))
-}
-
-
-/// Pseudo-stream which simply calls `lock.poll()` on `poll`
-struct LockStream {
-    lock: BiLockAcquire<u32>,
-}
-
-impl LockStream {
-    fn new(lock: BiLock<u32>) -> Self {
-        Self {
-            lock: lock.lock()
+        impl ArcWake for Noop {
+            fn wake(_: &Arc<Self>) {}
         }
+
+        ArcWake::into_waker(Arc::new(Noop))
     }
 
-    /// Release a lock after it was acquired in `poll`,
-    /// so `poll` could be called again.
-    fn release_lock(&mut self, guard: BiLockAcquired<u32>) {
-        self.lock = guard.unlock().lock()
+    /// Pseudo-stream which simply calls `lock.poll()` on `poll`
+    struct LockStream {
+        lock: BiLockAcquire<u32>,
     }
-}
 
-impl Stream for LockStream {
-    type Item = BiLockAcquired<u32>;
-    type Error = ();
+    impl LockStream {
+        fn new(lock: BiLock<u32>) -> Self {
+            Self { lock: lock.lock() }
+        }
 
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Self::Item>, Self::Error> {
-        self.lock.poll(cx).map(|a| a.map(Some))
+        /// Release a lock after it was acquired in `poll`,
+        /// so `poll` could be called again.
+        fn release_lock(&mut self, guard: BiLockAcquired<u32>) {
+            self.lock = guard.unlock().lock()
+        }
     }
-}
-
 
-#[bench]
-fn contended(b: &mut Bencher) {
-    let pool = LocalPool::new();
-    let mut exec = pool.executor();
-    let waker = notify_noop();
-    let mut map = task::LocalMap::new();
-    let mut waker = task::Context::new(&mut map, &waker, &mut exec);
-
-    b.iter(|| {
-        let (x, y) = BiLock::new(1);
-
-        let mut x = LockStream::new(x);
-        let mut y = LockStream::new(y);
-
-        for _ in 0..1000 {
-            let x_guard = match x.poll_next(&mut waker) {
-                Ok(Poll::Ready(Some(guard))) => guard,
-                _ => panic!(),
-            };
-
-            // Try poll second lock while first lock still holds the lock
-            match y.poll_next(&mut waker) {
-                Ok(Poll::Pending) => (),
-                _ => panic!(),
-            };
-
-            x.release_lock(x_guard);
-
-            let y_guard = match y.poll_next(&mut waker) {
-                Ok(Poll::Ready(Some(guard))) => guard,
-                _ => panic!(),
-            };
+    impl Stream for LockStream {
+        type Item = BiLockAcquired<u32>;
+        type Error = ();
 
-            y.release_lock(y_guard);
+        fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Self::Item>, Self::Error> {
+            self.lock.poll(cx).map(|a| a.map(Some))
         }
-        (x, y)
-    });
-}
+    }
 
-#[bench]
-fn lock_unlock(b: &mut Bencher) {
-    let pool = LocalPool::new();
-    let mut exec = pool.executor();
-    let waker = notify_noop();
-    let mut map = task::LocalMap::new();
-    let mut waker = task::Context::new(&mut map, &waker, &mut exec);
-
-    b.iter(|| {
-        let (x, y) = BiLock::new(1);
-
-        let mut x = LockStream::new(x);
-        let mut y = LockStream::new(y);
-
-        for _ in 0..1000 {
-            let x_guard = match x.poll_next(&mut waker) {
-                Ok(Poll::Ready(Some(guard))) => guard,
-                _ => panic!(),
-            };
-
-            x.release_lock(x_guard);
-
-            let y_guard = match y.poll_next(&mut waker) {
-                Ok(Poll::Ready(Some(guard))) => guard,
-                _ => panic!(),
-            };
+    #[bench]
+    fn contended(b: &mut Bencher) {
+        let pool = LocalPool::new();
+        let mut exec = pool.executor();
+        let waker = notify_noop();
+        let mut map = task::LocalMap::new();
+        let mut waker = task::Context::new(&mut map, &waker, &mut exec);
+
+        b.iter(|| {
+            let (x, y) = BiLock::new(1);
+
+            let mut x = LockStream::new(x);
+            let mut y = LockStream::new(y);
+
+            for _ in 0..1000 {
+                let x_guard = match x.poll_next(&mut waker) {
+                    Ok(Poll::Ready(Some(guard))) => guard,
+                    _ => panic!(),
+                };
+
+                // Try poll second lock while first lock still holds the lock
+                match y.poll_next(&mut waker) {
+                    Ok(Poll::Pending) => (),
+                    _ => panic!(),
+                };
+
+                x.release_lock(x_guard);
+
+                let y_guard = match y.poll_next(&mut waker) {
+                    Ok(Poll::Ready(Some(guard))) => guard,
+                    _ => panic!(),
+                };
+
+                y.release_lock(y_guard);
+            }
+            (x, y)
+        });
+    }
 
-            y.release_lock(y_guard);
-        }
-        (x, y)
-    })
-}
+    #[bench]
+    fn lock_unlock(b: &mut Bencher) {
+        let pool = LocalPool::new();
+        let mut exec = pool.executor();
+        let waker = notify_noop();
+        let mut map = task::LocalMap::new();
+        let mut waker = task::Context::new(&mut map, &waker, &mut exec);
+
+        b.iter(|| {
+            let (x, y) = BiLock::new(1);
+
+            let mut x = LockStream::new(x);
+            let mut y = LockStream::new(y);
+
+            for _ in 0..1000 {
+                let x_guard = match x.poll_next(&mut waker) {
+                    Ok(Poll::Ready(Some(guard))) => guard,
+                    _ => panic!(),
+                };
+
+                x.release_lock(x_guard);
+
+                let y_guard = match y.poll_next(&mut waker) {
+                    Ok(Poll::Ready(Some(guard))) => guard,
+                    _ => panic!(),
+                };
+
+                y.release_lock(y_guard);
+            }
+            (x, y)
+        })
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,61 @@
+#![warn(rust_2018_idioms, single_use_lifetimes)]
+
+use autocfg::AutoCfg;
+use std::env;
+
+include!("no_atomic_cas.rs");
+
+// The rustc-cfg listed below are considered public API, but it is *unstable*
+// and outside of the normal semver guarantees:
+//
+// - `futures_no_atomic_cas`
+//      Assume the target does *not* support atomic CAS operations.
+//      This is usually detected automatically by the build script, but you may
+//      need to enable it manually when building for custom targets or using
+//      non-cargo build systems that don't run the build script.
+//
+// With the exceptions mentioned above, the rustc-cfg strings below are
+// *not* public API. Please let us know by opening a GitHub issue if your build
+// environment requires some way to enable these cfgs other than by executing
+// our build script.
+fn main() {
+    let target = match env::var("TARGET") {
+        Ok(target) => target,
+        Err(e) => {
+            println!(
+                "cargo:warning={}: unable to get TARGET environment variable: {}",
+                env!("CARGO_PKG_NAME"),
+                e
+            );
+            return;
+        }
+    };
+
+    // Note that this is `no_*`, not `has_*`. This allows treating
+    // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't
+    // run. This is needed for compatibility with non-cargo build systems that
+    // don't run the build script.
+    if NO_ATOMIC_CAS_TARGETS.contains(&&*target) {
+        println!("cargo:rustc-cfg=futures_no_atomic_cas");
+    }
+
+    let cfg = match AutoCfg::new() {
+        Ok(cfg) => cfg,
+        Err(e) => {
+            println!(
+                "cargo:warning={}: unable to determine rustc version: {}",
+                env!("CARGO_PKG_NAME"),
+                e
+            );
+            return;
+        }
+    };
+
+    // Function like procedural macros in expressions patterns statements stabilized in Rust 1.45:
+    // https://blog.rust-lang.org/2020/07/16/Rust-1.45.0.html#stabilizing-function-like-procedural-macros-in-expressions-patterns-and-statements
+    if cfg.probe_rustc_version(1, 45) {
+        println!("cargo:rustc-cfg=fn_like_proc_macro");
+    }
+
+    println!("cargo:rerun-if-changed=no_atomic_cas.rs");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b46f48496aecf25d00f794818a184804e88abb4b55c7f9999471bf0ce5bac460","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","benches/futures_unordered.rs":"ff5b88edf9eb221f72ab14580d1367b96c190d52f023ebff9f99a00fa6d163bb","benches_disabled/bilock.rs":"35d0740e11dcc4e0bc6dce594cfd56c13817cce829e51027a9905f1c855b0fd6","src/async_await/join_mod.rs":"9bf0341faad58403a6e62ad701234dfe03bd397ac474a949a4c367782ee56a17","src/async_await/mod.rs":"7ec8e3ce2e42c5be4625a04b645562d049977547306f04eb6637a4e4f17e5aaa","src/async_await/pending.rs":"083cc78fe066e1ba69adf4c6452ee552ff3fc8e325f40989cc87096f412bc3c0","src/async_await/poll.rs":"3cfa551feb7bca2c72eb5624731dee88ae8f9b9daab368ed59834b36174f5dfc","src/async_await/random.rs":"daf229cd01595d38ef0f6284865fe2f60ed3b8134f7a15c82564b97ff3a5be98","src/async_await/select_mod.rs":"6a708df67f6b6d262efd362ad7acef82b2c3a0e4a91a0b2c65df5d6fb9c89903","src/compat/compat01as03.rs":"ed5afcedaf9e2dd591828e2c31dd7ae96f8a26f628d6cefb8df301199361920c","src/compat/compat03as01.rs":"4cccf1efdab1ceb0f707616a6aa94c22d64b3c62ccd39bbdbcaa96de5ec1aeca","src/compat/executor.rs":"46ad23758e667e7032f7d42769950276b52ff7be1d4ffd45006a3e6cc4ffee18","src/compat/mod.rs":"6c1efcc23416ef1ed8642e29bdb8dd9db513a5c9d1cdc2b7d3495901a5ae2e89","src/fns.rs":"81b625324be965331a10c09086d7039a9b3bcafac1100137def8554c0379fdf1","src/future/abortable.rs":"227a87f71bf1a597a8d5deaf0a98b460bdaae5d08f803221ea6b73902af1372c","src/future/either.rs":"ca2efc7ec5e9cf998f6f399a6bbb75d7c999be84eaf3c2ae0011d87690dc22ba","src/future/future/catch_unwind.rs":"eccff443c91e2a829616d751a814c9ebb812b9eaa0fd6dafb0ea93746aff0965","src/future/future/flatten.rs":"1efe23959f9e16c34a1e0d33424cdc2a51b15c01d3ce56ee12a6bd55eb7409e1","src/future/future/fuse.rs":"3941bd2f1e4498dcbfdb90d445f1143060d91a54f1c295939ad7b25bdb6912f3","src/future/future/map.rs":"9210019b644ea3d44744eee7064bfe082451793723dada8c20895974eb0b366c","src/future/future/mod.rs":"efbbe361e018c7cfe0b28dce5480b7d60bd905219fcae5857ad029606cadedd3","src/future/future/remote_handle.rs":"5b674e740fe350baf92d32e67b50c9db40fa7e8b66124636f38d9f56647f615f","src/future/future/shared.rs":"cd130fd14c4f68bbb5078ae16f194c1aa4ccec8dba922a2065256d32671ab734","src/future/join.rs":"098495570886b13c3991d8e4c6d525da9192f185493ef0075ebe13fa642430de","src/future/join_all.rs":"1b01c6eb7a71971897afe56aa96dd67526a73c3b6a17f9c52931c1b7c245d07f","src/future/lazy.rs":"207589a5bc9d7c12f015f02f63d84db65e9422c2e21ff641f7aabd00fe469e3a","src/future/maybe_done.rs":"15ce6ddcb46e8556ca2b586f93b3d959fd21cc111014a3d85fddd08aee884cc9","src/future/mod.rs":"c1be196831369f68a4d8bdbf82e545d95826dcfa2aa947cf91eff6a792342810","src/future/option.rs":"682e51335c5a35b9232eaef63a9b6e457c48a52c035ae3dc48cdb46e4446f281","src/future/pending.rs":"0b8dc16550735fff67ea223368028b2f41753c1a7c8d498fd7d7689917b02874","src/future/poll_fn.rs":"fef68fa7acab026464460d78cda09b30950ab044c52af0916869d6feeeefe562","src/future/ready.rs":"ae4ba19d7b56b55a67847cdb9c703b4057df46693ad3bed45013185e2c8582a2","src/future/select.rs":"ac311b2069f6fdb8c0686ed16161cff84f62827f62c09e999cb41086961e7b4d","src/future/select_all.rs":"1ac0171dc8bd0b875d4fd06ecd55744492702d15f2ce52c86cf7cfbd81f124c1","src/future/select_ok.rs":"671f2d072a575558403374544827695b9c03e75e1023c8a317bfe4e750391c09","src/future/try_future/into_future.rs":"8982aafedfe32b1ff4331ac962d8c2a899a5494e55fe3928e0db6d7e9595e57b","src/future/try_future/mod.rs":"c276f07c72534a374ac3ba20d8e3bd04d6acbee4071fc1e032e904bd143d2a47","src/future/try_future/try_flatten.rs":"044aa681e945b5da9dbd10755a2de2e94d656dc431e4ce8817224b92b6a2bb22","src/future/try_future/try_flatten_err.rs":"bb1d3f145f8264e4059d667319d1148a3e7bb8d82ef2e5acb24821e3c41553c6","src/future/try_join.rs":"56ce0df7a096c198c4f582c09b0599a103666e7edb135a775a3da470e7f16b61","src/future/try_join_all.rs":"28503eee3e8b372076d5c69271a35d0f51b2c5ca935d68d8842b1882be878709","src/future/try_maybe_done.rs":"117e11bbb0d27a064e17eb98b03fe81bc5ed1fa6c9f04ce083c7b0901b5fba30","src/future/try_select.rs":"181e7dddb008271e8340d68be9501d1c84fab81aa923ad1457a230414426f97c","src/io/allow_std.rs":"cc1397c155c1cfd0fa719d1f31ca30b6cdc9fcecf4a6559421250ad7f96d99cd","src/io/buf_reader.rs":"ba8dd206d5399728f770a678fcb756ad40cfba4825f0a21e45bd4b81df889838","src/io/buf_writer.rs":"cadd26dad94d01e10011513fb9b57060fd0771314b8da4ff36502b6642de36bc","src/io/chain.rs":"80fa98e30deeadf5fa42fba2d26680fe46db0eb539f9ce454efaefe6116d58d4","src/io/close.rs":"9832210a870637198fa58642cdf2779afab71f2e31a9953e663fa6854bd73ac7","src/io/copy.rs":"68cb8fcd59d94aee9a009cd44285bcca6fbd1d070135c819ccae31e9c9bd132b","src/io/copy_buf.rs":"716a3c54d89664c60c018703e4326dd3404b46b64ab9e763677308571dd812a0","src/io/cursor.rs":"ba8fee9dd705ecff03a224b4b20af7be594c20aa3d044e18df70e9f6771e0adc","src/io/empty.rs":"5c16ca08f04f08f06ee8e3a8c08a41497522ff30d25bb7b5d6fd538fe029c476","src/io/fill_buf.rs":"82ec73d8f2a8bef21696b03f6d77796c7817f2b851ecedf773255a4b84d83ed6","src/io/flush.rs":"215b1469c15a1b5e8c4bfc734ecd3440571aebec2f4d06c3208d4cea3a2f8ad5","src/io/into_sink.rs":"94d971a8118b158335cebfdd5bc601a13cdad442953cde35027af354a620fd73","src/io/lines.rs":"fe57adc33e02e46e2f03559a0fa852591f1e8ecb3778b0d3e77656fb854310be","src/io/mod.rs":"7a951e1a54632fde601fb041d29c984f2ba4ab58977f0e564ec8db9fa215e2dc","src/io/read.rs":"4ea675a83cec98a22c9c4731ff980209f0cf67f63c71871cd1deed53c1266345","src/io/read_exact.rs":"9fad109e76f15fcfb56d94b9a97dd3bbe86383099b665735a02e68f795dbe023","src/io/read_line.rs":"05b501eef946d7698b02adbd13399d1a5d5fc286d2b79d4ebfbff969d5f65795","src/io/read_to_end.rs":"15c4778e21c5af107151025fcaea041888747110b45aa98a482d03897cfe72e1","src/io/read_to_string.rs":"893a272f0cea7c97f9b38b1c56c95457fc78e4d5b60094feb7d5d0a47686d81d","src/io/read_until.rs":"1f35444e4121b2c7db468220d0a291509cade54df85a392781697291d53aa3c9","src/io/read_vectored.rs":"bd7f442c92f2cb320075d0983b0d08d51c23078898d72e6c2857cf6c7ad4cec7","src/io/repeat.rs":"d5403e78fa7c3980c712e2586e82da11ee045fa5363a84e6264760e964aceb02","src/io/seek.rs":"9863e9fb6495eb6e1f8c45c283c8a6993b9bdb1462f75a3e525e135c6840dec7","src/io/sink.rs":"30a503631d196e5da92c386d0afc1af9656a5f7682456cfa2489a2c30a05cac5","src/io/split.rs":"a4994e5d18e3ab5d0b803848444992313dff4547599b534c29269e436f82daa4","src/io/take.rs":"71c0f3d24915dd6d9f3b6247d8923ea1f52ec23ba5e04db3079138781eb5d47f","src/io/window.rs":"32a186c79ad4f2d10e5643f5912f5487d2a5a9b5f71078b09bf2ffef3da34083","src/io/write.rs":"60670eb00f999f2e2c43b099759a7fb030325b323744d88c9d20f75926ec30df","src/io/write_all.rs":"33c844d52ef7addd190a7aab18d4fc5a48049546cc3e4d61b5586b5c88839dcd","src/io/write_all_vectored.rs":"12f6d0bbf6a597c3b4530c411c164c1c8c6eeebc5f7b433d1b49166d5a5abb86","src/io/write_vectored.rs":"bc98ff4a709cb75cd9ffedefa8ef251089a49906b98e142d76447ddf4ac098bb","src/lib.rs":"b2cd260cb4a3f0acc8d24b20984c04523650fa8e02be2c5daf79e7d004b1e31b","src/lock/bilock.rs":"cbba1cc14ecba08cca5b785ea8361d9718430ac4b81c3243a8a9a1e2815061f8","src/lock/mod.rs":"6cb6efa62735225128c50c2ee737185f0a0a6a556d4e8727c0d91213dd64334e","src/lock/mutex.rs":"873859095e5495793df4e09c3fa369a3963b0b84e6138a7dde416c03805c1ebd","src/never.rs":"2522e54c3a6bedd9b9daf72b88a5656c8c6387d3cdb1aa5ea03d3b608f7b6405","src/sink/buffer.rs":"4d6700e309366f4916cce9264a6e28205bdcad4b9233f6e62df55670471a1ea5","src/sink/close.rs":"9caf7b84e167da72674077729d9023ada96d89573d67c2936ba21276addf9d87","src/sink/drain.rs":"c9ed8df8216e83a7153f10a57ce05945ff2c67b0b91435014afc3fb0ac7090d5","src/sink/err_into.rs":"e6911bff56b0282a612ccf1c1148e508e1036bf78be8a1f1362f298027411f6a","src/sink/fanout.rs":"7485f612aba2a259d5cb6a1250273eba975dda764af9e1b6d3907855aa3ddb18","src/sink/flush.rs":"3b8b43040577e9976212b44bd664d8f108bfbc6e0d90129363a9b670298a0446","src/sink/map_err.rs":"caf9fcedfae34e3d463beb34dbb5fb493db51c7c8b4717ec3637adc6dc85e869","src/sink/mod.rs":"2ae3bd35712b731654832382cfdb58f8f5df5827aab981aa492661bf2533f0ca","src/sink/send.rs":"7c1e3b4f00d6b2b813d23e983e72e0b0ae5a2469101ff6ad1377e59f0eebab5b","src/sink/send_all.rs":"a590ffe1613f3fd97eeca90072a55ed9535066a1a0574c4366b171f6fde61833","src/sink/with.rs":"940b6da72c38d90bcb9dad2b4638f0bd41d6a383a7a0143b0776a12c2eb0bd9e","src/sink/with_flat_map.rs":"b75f330de9066b9141ebc8e3744cb4d5bcb889d1156e74d7c8634fc1d0c35b7d","src/stream/empty.rs":"ea81fbdd9e03f94064c5338f559c76a607a939de3aa498b8cb061926bdb8cca8","src/stream/futures_ordered.rs":"10444f91456d15892ad1fc2dde307e52103b8a8d9a926d78774daee27ee531cc","src/stream/futures_unordered/abort.rs":"bdfece9f91accafd5122be36d628c37c5b219ac0eecec181267840fbb1e95a45","src/stream/futures_unordered/iter.rs":"34e8f8c3ba19a60465ee3d1ab363c2b1b6493904955fc98f93f2d279465f3f25","src/stream/futures_unordered/mod.rs":"6c2726c5e3528df60b66db3b0c62839140805a53a4786841e045cdeabc4683b7","src/stream/futures_unordered/ready_to_run_queue.rs":"97b1ae664c56697f861f6a37a994ec86a5b2ca83226c50c2948cdbaf379288ce","src/stream/futures_unordered/task.rs":"5cce7a18fa5a7bbfaa29a2de7af7beae707a3945e6e9f5d6121fa493665c5f33","src/stream/iter.rs":"ba511a7799d8adc4b155834e821c51b7506dcfac7358dbe1fa00b3ab3c0c716c","src/stream/mod.rs":"203e3477d6d5d847f427a22a9daf8c93d2f23174b3d5617dd691c85112eb1d48","src/stream/once.rs":"40cd3a7e02552385b20aff752bffcd8e92f47590ec007ab8501da427e10ec095","src/stream/pending.rs":"db32b36f1f20c0c5a014df2a128ddd8a793e029403687a17bc7b1b9552686f61","src/stream/poll_fn.rs":"eb1acc01131f67465bd93c362406cbeda17d0d0c2d8f81f5379f393e096b0c19","src/stream/repeat.rs":"fae222f2d7881365bfabcdc99c5ab6f0e555bd35934c69da25a9e901ee1593e6","src/stream/select.rs":"bfe0f15d1832403e36f391e67d05e508ee753c9278067c6a04f0341f19f20108","src/stream/select_all.rs":"ad7f7ed6d0e6b170f184d8dbb592aaac2e62293c9d9778880c89782c9af6fe58","src/stream/stream/buffer_unordered.rs":"2f0a2d03844c0a53f6cb01d195c20370c5d4907b06cc07e59fdd94e5fb5ba53c","src/stream/stream/buffered.rs":"0a9adf04666a1b0fa9070a7133ac3b57a3351ff71eed6e17d70d08e4b3b8328d","src/stream/stream/catch_unwind.rs":"d800fc0fb46accddc6d339a76ed3c25ef001488714c1db268f7349ca8b69f5ae","src/stream/stream/chain.rs":"c746eb74e1929d8950ecf73399f48d1de1af255ff134665fa2f60c9ec8cfff2a","src/stream/stream/chunks.rs":"55e9c39c93faac2c7421d4cbecc9164104e110fcb0c1ce698385f2977ccf6b8c","src/stream/stream/collect.rs":"d8182ba1d2e16e54f81b3b54daa47b17a607f7f8c5c20077a29f69d31595b064","src/stream/stream/concat.rs":"dbe01f34bfa23217511441c7eea0afacb29224d1a5710eaf7e5311f9f3283b01","src/stream/stream/cycle.rs":"88853c2ad71706b23bb5a25e3f1023b74ea8d75a7555b73de068ec782b7ae42d","src/stream/stream/enumerate.rs":"46ff20eb1eb0ee24256ac88d63c59012b9282467fc7e33d86584c4ada455758f","src/stream/stream/filter.rs":"4e400fc448c339120d6d773c7d75c911454efe0161ec90e447f9e3841e1dce76","src/stream/stream/filter_map.rs":"ce78f1170e09e31e6a3cc888c33dd53a2d87cd9b8ae735cccf800d4b0680312c","src/stream/stream/flatten.rs":"025cb5341829a2461f2abfe18f031a5158d152a37d5c5f58cb6990a4bfd9d999","src/stream/stream/fold.rs":"af8bd32cd349d1f67d7fda30d5e22b2f30da47bf5846b5641f4081190dc4d488","src/stream/stream/for_each.rs":"8cc7e138a7829a19c880b6f8c2718f509af6a40d5f6e791e28569870fbe87def","src/stream/stream/for_each_concurrent.rs":"0f42c1b7687ec147008dbd2b107525cbd81d1c2dcbef48e9ec3566ceef8c3367","src/stream/stream/forward.rs":"fce097b4e152d1b1e1eae6b1264e06d8103e0c8d3513ec72fdd782db10c4f1d1","src/stream/stream/fuse.rs":"278ab439addcc73c1aaf270d091a23b267f58e211b0d09a999939dcccf8a5e6d","src/stream/stream/into_future.rs":"73a1494a6568e95929169282de859d4f1bd8a771dd86c0738235e172973a0fa2","src/stream/stream/map.rs":"90024b112769f34d841433275d218e80c3bfadd6d71a5af0a1f23d12b27641c6","src/stream/stream/mod.rs":"28b0572584387c61df9a79bd248cbeeb184b6abe3cc00ad10d9c0796933c01ce","src/stream/stream/next.rs":"fc1734de6295c8b2d240b13e46084a0e9a6eff803c24ca4e4d267f56fba75554","src/stream/stream/peek.rs":"e4e7965a09e39ef6a729bd013afcdaf8691af37b3d8c9c67f91e5ccc8f25dfce","src/stream/stream/ready_chunks.rs":"9f470ed4147bb02a0c8c414c5cfdc4f498eb3ad5ee6597bfa29daba0b5d1ec02","src/stream/stream/scan.rs":"f0352bba77e95b2d3a77eaf782105dd48dcb01f7f1a4c738bc94d7dfc50b8472","src/stream/stream/select_next_some.rs":"81ae376d063662b50423aeb4a904ea85558072869293ff1a607b8623b80af6dc","src/stream/stream/skip.rs":"8e6bd96eec315e27baf22024ff606da35c733830c62868725219a01d1e2fafab","src/stream/stream/skip_while.rs":"1e86d5255d9b4024b33f268870f3dac46bb517ee9a5e672b2f268dd43902f4cd","src/stream/stream/split.rs":"a6cdf9953f8d99fae19cd55bb86ddb9fb331550b5e3b8352194f4747b07c4a45","src/stream/stream/take.rs":"7f76d59b560565d668f0c7cad060162d3387026dd00b7c4fadd748adfdb492dd","src/stream/stream/take_until.rs":"4c4678d37384625bde8573028cbbf36be898fbca55976421d7866a133e1d57f6","src/stream/stream/take_while.rs":"cbcc02076381cbe5a1f078d0ace91c8cd082e121613b36ff108834071e3bfd3f","src/stream/stream/then.rs":"00f5a9ce23aac78ef32f7190f7eba77bb62cd11f1785c43df4c9fec44a14b847","src/stream/stream/zip.rs":"a6c27eedd212407831f71634a8fc0cd625799c2af47d96b71ab20792bfbdf989","src/stream/try_stream/and_then.rs":"c1dc3ca087d550f851595f7c971723d605abf36a7a66a153db4bb9be6bf01a54","src/stream/try_stream/into_async_read.rs":"94f505a82b59fe7b1a27c96472d82af7b0d034014e089fa4ebdad2f58f7be390","src/stream/try_stream/into_stream.rs":"6d59cd337dbef044e70bfc3d5b33a4317123c2cf39a061e78c02c6616b150d21","src/stream/try_stream/mod.rs":"7bda9a74003b389c6d31f832bfd16930caecbf3e71ab151092166378706240d1","src/stream/try_stream/or_else.rs":"7532f053ea20098ec48da012aec5698557de3edfa67bff5ea38dae178c32e92b","src/stream/try_stream/try_buffer_unordered.rs":"6b5d09156904467c94162df02d088c52ded17a47bcd7e2bd6edfe00f5d7bd4c9","src/stream/try_stream/try_buffered.rs":"772d534458bdda002a5454375fa48479e724fc4073024e9f6b7d4f8065210d41","src/stream/try_stream/try_collect.rs":"0ee8ff9c702ffd80955d8b678cc0c2cab4bfb6cd51fe490d20f460e4ed45a00c","src/stream/try_stream/try_concat.rs":"f9a30da0587dedb72b4a4dcde8d6f7ae0051bb35ae29cec7fcff6db3d9c32d32","src/stream/try_stream/try_filter.rs":"ef92ae2119eb67f00020287423f3ccca3e15de11eacda38b86dbfd18f7eec4e1","src/stream/try_stream/try_filter_map.rs":"0f6eb9a72351c623ff0397fea7245dfff28f07c8e290acd124e77421b60edcea","src/stream/try_stream/try_flatten.rs":"8915bd793c6125958bf1ffd61e1cc09db5952e2decc9bf63ca1260710622915b","src/stream/try_stream/try_fold.rs":"402fe54a6a56c4fb497b173f12a59c726b918a32597582f58002c1021d291d79","src/stream/try_stream/try_for_each.rs":"77b68a9bf58775d733d9ce5bf173a0ef12612ad3f09b30b26e7129383a902628","src/stream/try_stream/try_for_each_concurrent.rs":"848bd6534a72ce1711155f0bd8bbfb595ba6fc200c7255c98170ac3fedb078d3","src/stream/try_stream/try_next.rs":"019b5e2e3dc0f222c97608264368fd8538518e4664d3bcbd320aa1157a2ddd55","src/stream/try_stream/try_skip_while.rs":"3f70c4342b80918d795ae56b7cb36c07695e625b7bdfa22065c88dfa9b4c7528","src/stream/try_stream/try_take_while.rs":"55ea2e36900eccc05d600f6b86920a08556509ea8d69360d64d652b9b4fa19d0","src/stream/try_stream/try_unfold.rs":"457394c58246e841078e27c39effa299579dced7a99a3f70d7e7106e5e8770aa","src/stream/unfold.rs":"902ae416a099f4f372c7650f1aede017c630b2373836929a73cec21ba7c287df","src/task/mod.rs":"8fbccd62099307167b158b1a43d817188b5777eb63a3ecd874c97bf0ed5d123f","src/task/spawn.rs":"26bbcf1d65e1467de0ecdad2b56f464a510cda7c1933427d69a1b50459836489"},"package":"d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"}
\ No newline at end of file
+{"files":{"Cargo.toml":"b89eeb20aa966ff84f0f7c1693c7fd640817405516495551a3eeec94194dd258","LICENSE-APACHE":"275c491d6d1160553c32fd6127061d7f9606c3ea25abfad6ca3f6ed088785427","LICENSE-MIT":"6652c868f35dfe5e8ef636810a4e576b9d663f3a17fb0f5613ad73583e1b88fd","benches/futures_unordered.rs":"5eb8280be8d8fb7bd5fb103ce20db10f618f47e180a402105e0d5e9f8c9fe35a","benches_disabled/bilock.rs":"ab8b47fba5cfa5366477ef1034a042efde9b0aff6b77110d1f3a2715ab7508e8","build.rs":"3fa4d283377a2df26a0676a5ec2f3dfba1baafcdc076d3823bf3d60d443ff457","no_atomic_cas.rs":"ff8be002b49a5cd9e4ca0db17b1c9e6b98e55f556319eb6b953dd6ff52c397a6","src/abortable.rs":"d88dd2501ed379b3540bd971d367b4629755d6d9f264e7b54ae59eea0ff83623","src/async_await/join_mod.rs":"e923d2eb28cb3525022c17235ebbe937cfad77aacff5ede3e3da604c09916fd3","src/async_await/mod.rs":"3d25c343cc3e789d3f982cdacd6f8ed91511ba656c3923da310700f318f423a4","src/async_await/pending.rs":"7971ec1d5d89ad80390e2a0c51e396257b2e78f1436cce79ea2b55ac2f13b328","src/async_await/poll.rs":"440c19a89fd42b12da09ff48a69523b5a8a5baea0bcd2f860589a0ab996ed781","src/async_await/random.rs":"daf229cd01595d38ef0f6284865fe2f60ed3b8134f7a15c82564b97ff3a5be98","src/async_await/select_mod.rs":"bfcab2ac3e89e03a3639154d96067a32b95c0cef9c9c5c8caffc8daef2cdf4d2","src/async_await/stream_select_mod.rs":"30ba88ce9f2e881f78a81a6ac21267447efe07500d077237e212683816e05005","src/compat/compat01as03.rs":"2af3b3d01aef53dba521f34f6be1cdde34923851c283eeb6fcbac001ef98aee8","src/compat/compat03as01.rs":"ccec9ddf4e9a34693f0729f4ba05f33a5fc87c57469458686f6f85fa5b7e6ca8","src/compat/executor.rs":"a0edd7baa2192daa14a5a26bf53bd229defaeac538d2ec771c60992c6dfeb393","src/compat/mod.rs":"6cf3412f6a3f9ee8406118ea75de65468a83febc6ba61bdbad69261f0cfea02e","src/fns.rs":"f8e396128791169098a38a82c3c28aaa6dd5d40718635f7cc30b59b32f7110b8","src/future/abortable.rs":"373ce61c0c7c31718ff572113503bb88f55e3b49ed5d028a3dfafd69070f44c1","src/future/either.rs":"572b24dec74db18a390f13ed044b7fc000632728315c87ea1430a454551f7546","src/future/future/catch_unwind.rs":"08b0ac049cdee28325d378209aa5bb4d91b14a29ddd9c2b0e5c661b61f9cfcfe","src/future/future/flatten.rs":"5bf9846cef8dec5dcc38b992653e11146bc149a0d3efc09b1f8268bd29de0b2b","src/future/future/fuse.rs":"6531a95dc1917b2a5724b35e364faa741143811afc654a45c360111e9807864c","src/future/future/map.rs":"de607c2a4d80d2bddb590781c37328ddd294bb9d5064a9ecb99455244239b597","src/future/future/mod.rs":"ecfac09dcba801cede7c58acfaa76a9ab76d26a3f4c968d66c2a49caa57faefe","src/future/future/remote_handle.rs":"2ae17a409569b32c78e20026a8ecdf667352c2597a4a0a8deefa4761fafcb223","src/future/future/shared.rs":"ebf46b4bf428676bf553015e384f7f41da03558481aaa38deb1e8a896d212dae","src/future/join.rs":"38b55fc7cdbbdaaa525e51f8ce09783dbbcb65eabfd7de9f46610593e0bbef17","src/future/join_all.rs":"294a8e76862f447dea8759f78f7224d885a826c80193ceef2389345221e6e3c0","src/future/lazy.rs":"d161fc4108a97348c1becbbd5ba8fccb7225dcf1d81c097666f5c8b40718251d","src/future/maybe_done.rs":"559e41cb170f9fe7246d2a5b112527a9f9cbca63b8a5a872b3aa9c861f70f307","src/future/mod.rs":"51e018100362f20b071225268f1d81f25c8e9664e94730af199069c2692bf26a","src/future/option.rs":"73daca814800b91b707753dcfe074265372b0077fae2504ea6efddc713453579","src/future/pending.rs":"86598a5d5ade7c0416566deb280150bac34bd4703c997d2c7af572342d8d6d02","src/future/poll_fn.rs":"8e54bf57d60e01d496ae31df35e0b96868f4bda504c024a14f51ab723d67885f","src/future/poll_immediate.rs":"7e199fc102894c9095de17af602a7c8f05d427269aefce5d71cd5136d54659c0","src/future/ready.rs":"c9860ccd8ac529f44f66dee73ca9b9d7f1b1b3e5e9e4dc70c59640c752553d58","src/future/select.rs":"a582b1ed9c1e6cd8dcaa80b5f45e2176ed4a1740fe303f7143e29cab8e0dbc22","src/future/select_all.rs":"179b8168370e2c7105e348fdfbeb965eb746336d9660aa7fbc9185d681ae8c2d","src/future/select_ok.rs":"fed28e1fd368cdd465d297a84ea9436a00757eff4b34e592d94d7747b3bf4996","src/future/try_future/into_future.rs":"d966bde7b06a88443f0efd877e95f91541778c4e713f3f4b66e00ca5d3f352b6","src/future/try_future/mod.rs":"4733167d93e8f728e87f79b7d4dfe66de6afb306735ca76f9f843270286b3f6b","src/future/try_future/try_flatten.rs":"16c02e1780bd312b8b386e41c1d9dd4bcc4e8ef10f26007364f857b3adcc6e99","src/future/try_future/try_flatten_err.rs":"130f3fc3fd95a19f4e4a50e69301106fab02f77d0faf3aac9c473a92b826c2ca","src/future/try_join.rs":"1836931f8ba32da41c6810e6acc0ea2fee75b74b3153e760c4542cb12b220540","src/future/try_join_all.rs":"d4f262e80bb5347597c75b25de3c7784ffb4bd766227d6dc70cdeb77a38f4a5d","src/future/try_maybe_done.rs":"1cce46b2ee43ad51b7c5f9c02bc90a890af32bc549ce99098a2c8813508051e1","src/future/try_select.rs":"2e1b7e0b0cb7343f766fade87269093558db206f7fbe7dddfa3143885e17bac4","src/io/allow_std.rs":"88a25cfcd436a7c113d781d81b8d7b4c241fb350d2524df66d9c5ae0277b30b4","src/io/buf_reader.rs":"e33a5569dfe4dae7895ae3c22c90c01172140435fc7e1f17920b9221a033f5e2","src/io/buf_writer.rs":"1b62cf025e7f0823114a1269465c4aa8ea9605717d8736a5504bfb500fff7a0c","src/io/chain.rs":"c2c1b56201f7f75f5e6f980fb1cf1733e124e891ae844b411f2f19cc90d99531","src/io/close.rs":"9832210a870637198fa58642cdf2779afab71f2e31a9953e663fa6854bd73ac7","src/io/copy.rs":"cb2466dcd7ea8bb1f07d00c03e66ed55abf71fe4be6937adc9f533ef9d99fb2d","src/io/copy_buf.rs":"e9a5f6aac8375e298bddb332f23d8b626d056ce452b58f772a05df7e2cd326cf","src/io/cursor.rs":"612bdb8b4055d26816fb0e4c3e9859b06b3d08c99e4a27ed4946c95e219a29ab","src/io/empty.rs":"5c16ca08f04f08f06ee8e3a8c08a41497522ff30d25bb7b5d6fd538fe029c476","src/io/fill_buf.rs":"4f217fed8eb3f66dbde2371c3fbcfa9420d38ba20da544a0658584e5778aa47d","src/io/flush.rs":"0c9b588dfd9da039dc123ba9448ac31ca21ee3da0a164a21f6c2c182183d43e2","src/io/into_sink.rs":"ab5bdb12bff62672175b69b8c9f5a4bbbea716b9cf89169ed6a723ab43da9df8","src/io/lines.rs":"ccfa24e212a610aad0c81042cfa64ada820c4305ba0e911a2c16221d7867468e","src/io/mod.rs":"6c4d474a61119265fbc1bb560ecd8b6292b0d33655eb81b756657659fad763bc","src/io/read.rs":"4ea675a83cec98a22c9c4731ff980209f0cf67f63c71871cd1deed53c1266345","src/io/read_exact.rs":"d27d5ec082ccb1b051d1292e029e398926a164c82e1f0c983ca9928410aa2abe","src/io/read_line.rs":"a3c62ca2034089a22ea9567e0b3cab0dfe09309782fcf151d92311a77223e37c","src/io/read_to_end.rs":"5e9e38dc087623dac5a3ae3ad329ed44ffe4f6205a78e546adadc3ffb76703fc","src/io/read_to_string.rs":"2c073d05f0361acda1f0172b24fd4c5da61840ac925a5bdfae9111c697759d1b","src/io/read_until.rs":"354507ce95242a735940f0aaa6ef11cc7d6d0505ae148f05277ce6e7537f168a","src/io/read_vectored.rs":"bd7f442c92f2cb320075d0983b0d08d51c23078898d72e6c2857cf6c7ad4cec7","src/io/repeat.rs":"f5e41529699076687c37d52ae673ea2b38a2e306624526a2a9d4fe9794341bf0","src/io/seek.rs":"9863e9fb6495eb6e1f8c45c283c8a6993b9bdb1462f75a3e525e135c6840dec7","src/io/sink.rs":"30a503631d196e5da92c386d0afc1af9656a5f7682456cfa2489a2c30a05cac5","src/io/split.rs":"2aa567452b713497d5b85813980b69e888aee32be14492c92404d261fd50eb09","src/io/take.rs":"1fb2eee12ea10fad0018b69a1f9eecc7d9ee53a3e4bb3cce0762a66655b275e1","src/io/window.rs":"295d7dc18ad101642003cd67687242e4bdba11552cfb7f18c521cbff369e6f71","src/io/write.rs":"60670eb00f999f2e2c43b099759a7fb030325b323744d88c9d20f75926ec30df","src/io/write_all.rs":"c88930fd23c88cc01fef2c6118d53d33996c011c4abf28778a27646fe1f7896a","src/io/write_all_vectored.rs":"53becf89c031bf4c3073f0903ce809eee7606b1b4fbeb518605875badba216d3","src/io/write_vectored.rs":"bc98ff4a709cb75cd9ffedefa8ef251089a49906b98e142d76447ddf4ac098bb","src/lib.rs":"1f46c0cc635989355b05e7062c9cfbd9c38c9e97e5e2f0dec7d8fd7ccdddb074","src/lock/bilock.rs":"f1b955cb2e10c906933e63bbfb8e953af634428ce15faf3696b07d11da0cc279","src/lock/mod.rs":"e964dd0d999ccf9d9d167d7ecbfeb7a66d180a80eeb6fd41ec3fa698c1067674","src/lock/mutex.rs":"782375724e4abbdaf3221eb422911c37fe13e794e6f30ea819acece7303c3368","src/never.rs":"2066481ab04921269cfa768cb8b778a035ab6aa49ec404d9ac0aeb07a4bf6094","src/sink/buffer.rs":"33a7380f8232225a8e9ac5ee138fd095979efa3a64f9fecf5fcaf2e78fcbc355","src/sink/close.rs":"f2f31c884f048163abebd4f5a877b7b4306f7d02beae428325636fd00ed42ca9","src/sink/drain.rs":"392d9487003fcd55a3373c3e2558f6549b9633b82fc08b5a665a573b137ae9f7","src/sink/err_into.rs":"ced2998b2b0b792d80f7543523c9e07e8f5d20a4336cae93084b995e46671b15","src/sink/fanout.rs":"66dcde056e0bbee4e0074d331838ed2743dc872ea1597f05d61970523dc34926","src/sink/feed.rs":"64b9d296d37aedde37e1421c459ebcd9a7e8814db905996996167850124f3b3f","src/sink/flush.rs":"fbba344f428ca7636541ba013f7db2ece480b404a9e0b421c5537552d61e2492","src/sink/map_err.rs":"0f68f444ef13fe7115164be855c3b7b1d269e1119e69fcdad1706988255641f1","src/sink/mod.rs":"37cf379170f3099992eb59f3181be4c4e4a5c2d3581dbe424d22ab360840d321","src/sink/send.rs":"56aaba9aa4a562e0af39473a5779206d91b0acb1fced4fc06cd8b959d1897524","src/sink/send_all.rs":"a8e4956604fe73e321b0a3896c2018bc5c27149f2862f8406112db140b3aa2dd","src/sink/unfold.rs":"428080b76213b504fcc981d2f05840f1a93c8db305301af1cf5852b6c47c4be5","src/sink/with.rs":"850cd3b96304df1f38360a0bc60b02d485535e399ef7642acdd9add7876867d8","src/sink/with_flat_map.rs":"5e0f527b33ee8f1cc6a6a46d45b6d74dad5c735d88b2cb24e1cb34fdc6ef501b","src/stream/abortable.rs":"935d79aa44d793f4abe87ca27a9e4a20891500488cf942693cd2756d65b3aab2","src/stream/empty.rs":"5000c856186408a17f68bbef432d4a1a3edb7fb5a07ed8699342fef04b10a181","src/stream/futures_ordered.rs":"46217ed3802d052724a4a3166370f74e6d5fcd248d6f983caea10bc3335a1f0e","src/stream/futures_unordered/abort.rs":"bdfece9f91accafd5122be36d628c37c5b219ac0eecec181267840fbb1e95a45","src/stream/futures_unordered/iter.rs":"e8862300ddb0504090c059b3dba2425af6335874cb6ef393fef26e87788b6d3e","src/stream/futures_unordered/mod.rs":"e92e7ac97f0bc0d0cadcbed0d8d857c9359d809f4a3532b7e2f4d05fa69f8880","src/stream/futures_unordered/ready_to_run_queue.rs":"6223c67519c1ae35cbc449dd5654fda422aaba61a2344cc0b190c73b4b1e9f80","src/stream/futures_unordered/task.rs":"ab2de99b2a42c1da70d56e4be43c0ef72e8d5a4504adc0f870f8d28afd332a37","src/stream/iter.rs":"609fa821a460e901a54ae51f8da58220881157cef02b8b7b8c9e4321c2d05a23","src/stream/mod.rs":"33873b13535443cce2d49fdb3f0b359286bfc74f3553419fe7174cf7c1840da0","src/stream/once.rs":"d7b70adabad1f10af711ac3dcef33fd4c287e9852fdb678406e7ff350ba8fd47","src/stream/pending.rs":"84aaa15c8bbb17a250da5b1b5f0c7f6717410915d63340a3fcbf098bebe19d6f","src/stream/poll_fn.rs":"35952ea514b8aade14a3934d7777006475f50bbf0c5b50141710e31637f980be","src/stream/poll_immediate.rs":"e7a53ff8275ebe89dab8f9b984cce2ee0fde0a828e540b77c5500ca017d5bb98","src/stream/repeat.rs":"e4e4a9b6f2fca72bcbf098c3ac0c4a41323a840741d4dce9d9416464b7e8bd0d","src/stream/repeat_with.rs":"525780d24f3f99152b879765ca6eab99bcc0c757dc6654b6635c099b93ea654d","src/stream/select.rs":"28eb422c0eca9fd02778a6003004471b3489db09746a70e617a506303ea8b81d","src/stream/select_all.rs":"4358fa26cfe8c1b56f19d077b841bbdfe22f7adc043034fd6313b004e94e310d","src/stream/select_with_strategy.rs":"7fe249fd92fc66ad2bfa5a2dec7148b2a0102b3a8d915b2103bfbcd1b8870447","src/stream/stream/all.rs":"43cfb69de0ea991497d26d0aeb02091f10eb241ef93758b54c5e7aced5b63b63","src/stream/stream/any.rs":"2582da02f9a1ce2bd0af87a64b65188fc93686c5e3dd9128e89e5f57c1d70e43","src/stream/stream/buffer_unordered.rs":"66c3f4bd2fabfbdf6a4033dfaed44dd0262b68e6533509029c984ae037e35392","src/stream/stream/buffered.rs":"eabd0c0e50eaaaf0a92a7b39fdb5b77e068bbfbbfd5e216a09c3a6e0c1fc102d","src/stream/stream/catch_unwind.rs":"b2e801ff744d5d9e17177ec1156b0ab67bdd56b94c618ed8590344ec8a0f35e7","src/stream/stream/chain.rs":"ba1a206b3ce0160186021f5c1e4c95a770d26b843e3640e52609a2facaf756ac","src/stream/stream/chunks.rs":"d3aaddc05779ef70e2f0e59570cf6d5a1d231ae4885c8b8b2e4813fc02832562","src/stream/stream/collect.rs":"977ed1970b46029517ecc45f4af924b8e585d3770f01b2a0d2df0e01519ca50f","src/stream/stream/concat.rs":"171ea941b45c0295ed978c3f318a449ea295e33cb4ea82c764f4e9e7c48ad5de","src/stream/stream/cycle.rs":"ed7e3d15e7b1adec5ad5789b0d3186b5995a3353cc974fb7f41a72f6d8ad4cbb","src/stream/stream/enumerate.rs":"fc7565d21d39565790859eeac9ae8dd74123a9d15b88258d3abe894f1876cc39","src/stream/stream/filter.rs":"3dd080914e6770f8790455fc9cbedf30c5f44a589ef99b19112344c75f9e9042","src/stream/stream/filter_map.rs":"3a8a3e06dfac48dd3f7b6b1a552a51a3e31ea943e012dd35729d461a1fcfad80","src/stream/stream/flatten.rs":"69493fc106a1447abe109fd54375bb30363f7bc419463a8f835e4c80d97f2186","src/stream/stream/fold.rs":"75d61d4321db1bcbbdd1a0102d9ad60206275777167c008fc8953e50cd978a09","src/stream/stream/for_each.rs":"07bca889821bad18ff083e54abe679fbeb8cd19c086581c2f2722cba6b42263f","src/stream/stream/for_each_concurrent.rs":"4e1e7eb3d4ccfae0e8000651b75834e2960a7f9c62ab92dba35a0bdbbf5bbb21","src/stream/stream/forward.rs":"cd024ba1a3d5098d3ff2d5178a12e068916cc4307284b00c18dbc54b554a5560","src/stream/stream/fuse.rs":"061c5385f12f80c7906cb15ddb8f455ced6ce21d1de9a97de9db2616407c0cac","src/stream/stream/into_future.rs":"b46ad45cc03ddd778a9ffaa0d603c8ee0b411f49333100160959942cde9588bd","src/stream/stream/map.rs":"b91bdd5b33821a50c9b5034261a14f89ff1a9d541ab99b9d9a6921b12a5d434e","src/stream/stream/mod.rs":"89dd9afaed097e236e567623c42e729cc20a2cf2d92e42359ea3e2c2d18e2ac8","src/stream/stream/next.rs":"7b4d5a22b5e00aa191ea82346bb1f392121cc68692864a8230e462d59e622928","src/stream/stream/peek.rs":"1ef5f11b1f0cc11d01690bebe282d8953ff8e860597f4ce21208fc274be5e98e","src/stream/stream/ready_chunks.rs":"4e6deb3a6d453fd4e982bdba416188311a72daca1b218d4e9ef20819fc09b5b2","src/stream/stream/scan.rs":"1db439088e1e8fd75cd8f23b5d316de40c38a5f1867237237a4931068ec9bd22","src/stream/stream/select_next_some.rs":"0094eccc96cfe78d9b6d0a9bdb82cada8fb7929770a3ac00ffcb5441d7dc4f51","src/stream/stream/skip.rs":"61f7ec7fe25663d2c87cffaad19ed27eda032842edb8af731b521025b244f120","src/stream/stream/skip_while.rs":"75ee580e0111200758d0c0fe154276007ff233db6b63a8223f0baeac1db18874","src/stream/stream/split.rs":"fa4adea18708dad384eb347260cfb965d30c40a677e15f9267f97aa382c6306c","src/stream/stream/take.rs":"505f83d341dc84eeab46f5e66adfa21a36207cb66f2394dd6a256576db665827","src/stream/stream/take_until.rs":"0f1fa7d158192a5dee32392dfdd062c15dab6d246b0ca267e91aae490d7d7fdb","src/stream/stream/take_while.rs":"51007dbde8434fd22c5ef2481a99463f11b3785e4bdeb73fa583a17f29f5c228","src/stream/stream/then.rs":"9dcfdc741d1d7dea0100aa9f1feadb932f8530f7a7d3071befc1e490a6cb50ed","src/stream/stream/unzip.rs":"9ad4db7522f66a9133e464c13d6c95682c797ae5a986e60d3aba358c65031fe8","src/stream/stream/zip.rs":"56f30f513e11754f59ead5ca4112014cba9278d02796eb8fe0937ae8bb4d44cd","src/stream/try_stream/and_then.rs":"22ca6e547d0db2e07b0a928c48118a532adaf28d85c60ab84b8366dbfeab9161","src/stream/try_stream/into_async_read.rs":"f584fd8dfdab90328fc89eac78306caa308d43f3035c1c5489e55384007e77ed","src/stream/try_stream/into_stream.rs":"4fee94e89956a42871fc4a0cdba7ae1b7d4265e884528799cd227c9dd851acce","src/stream/try_stream/mod.rs":"7a83406bfbefe4fe651b9535035fef80d52e995a44dcd0e16105bf274e0fef06","src/stream/try_stream/or_else.rs":"8cc7f602da1ffee21bf06c5203aa0427514a83b67941ae264459f1eff8dc8aec","src/stream/try_stream/try_buffer_unordered.rs":"64e698ea6aefbe7e32d48e737553b20b9cde5c258963bb20486b48b7d6899660","src/stream/try_stream/try_buffered.rs":"7546d396026bf700d3f37f55d5a4e39abe5fb05919e6a269feeb8be7af19256c","src/stream/try_stream/try_chunks.rs":"58b8c5af4914eae3698e528b0361532b391bf4b3463f4c790e43c8069cfe1bd7","src/stream/try_stream/try_collect.rs":"1132751055a51b936ed28b83c4eed7dee3f40a4be13ea374b30086e864e1ee09","src/stream/try_stream/try_concat.rs":"f2330ebeeab30273e9ac0e8600bfe2f405ce671f6386e688b3afb1d2fdd7c2c6","src/stream/try_stream/try_filter.rs":"7c2a09cdb1753ecb49a44d1d84742cb2050a999a8148448b31bb404eb2d17154","src/stream/try_stream/try_filter_map.rs":"5afc6ab35e2b425e37ed217a6bb038459c8828d6bcd6a3699883d6df071dc7e7","src/stream/try_stream/try_flatten.rs":"e05614d86a27ab8386476eea35fd424c07e5f7f99cf0401d63a6655eb7ca1247","src/stream/try_stream/try_fold.rs":"b96aa2fe1a16f625d5045028a86ff8684dcf5198ef8c7c072f52f39aeaa8b619","src/stream/try_stream/try_for_each.rs":"3f3901d618333b740d470eb02fcbb645df92483493872298bb7bd0382646028a","src/stream/try_stream/try_for_each_concurrent.rs":"78a94a77f329862c2a245ec3add97e49c534985f0d9da98f205b7fa3c7c08df3","src/stream/try_stream/try_next.rs":"6e29473153db1435906e79f7eaa13ce9da842d4528ba9eb1c0034665feacc565","src/stream/try_stream/try_skip_while.rs":"c0259ec70bdf4a81c1fa569275766e3e65db9d5715c81e93ada04817c1835add","src/stream/try_stream/try_take_while.rs":"54927dfa95ff58b542a1d7382f564eeae5e02e633c948b1a39ac09bc7e92f5f5","src/stream/try_stream/try_unfold.rs":"aaf0f4857a4ec8233ac842ae509f29e5a210827a0bb40cfc0dc3e858f153d2b4","src/stream/unfold.rs":"8b2feb00f979562b43064eb078d53a160cdb3c65deed17ec25a05938df2d370f","src/task/mod.rs":"7f058a5a6fbff4490bd02fa9efeb9dad520aeb8ca7234cd40bf456a0bfaf46ce","src/task/spawn.rs":"26bbcf1d65e1467de0ecdad2b56f464a510cda7c1933427d69a1b50459836489","src/unfold_state.rs":"ffe848071a99d6afcdbe8281a8a77a559a7dde434fc41f734c90e6b9b5d8a5af"},"package":"36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,54 +3,53 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "futures-util"
-version = "0.3.8"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Common utilities and extension traits for the futures-rs library.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-util/0.3.8"
+documentation = "https://docs.rs/futures-util/0.3"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.futures-channel]
-version = "0.3.8"
+version = "0.3.17"
 features = ["std"]
 optional = true
 default-features = false
 
 [dependencies.futures-core]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-io]
-version = "0.3.8"
+version = "0.3.17"
 features = ["std"]
 optional = true
 default-features = false
 
 [dependencies.futures-macro]
-version = "=0.3.8"
+version = "=0.3.17"
 optional = true
 default-features = false
 
 [dependencies.futures-sink]
-version = "0.3.8"
+version = "0.3.17"
 optional = true
 default-features = false
 
 [dependencies.futures-task]
-version = "0.3.8"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures_01]
@@ -62,8 +61,8 @@
 version = "2.2"
 optional = true
 
-[dependencies.pin-project]
-version = "1.0.1"
+[dependencies.pin-project-lite]
+version = "0.2.4"
 
 [dependencies.pin-utils]
 version = "0.1.0"
@@ -83,13 +82,17 @@
 [dependencies.tokio-io]
 version = "0.1.9"
 optional = true
+[dev-dependencies.tokio]
+version = "0.1.11"
+[build-dependencies.autocfg]
+version = "1"
 
 [features]
 alloc = ["futures-core/alloc", "futures-task/alloc"]
 async-await = []
 async-await-macro = ["async-await", "futures-macro", "proc-macro-hack", "proc-macro-nested"]
 bilock = []
-cfg-target-has-atomic = ["futures-core/cfg-target-has-atomic", "futures-task/cfg-target-has-atomic"]
+cfg-target-has-atomic = []
 channel = ["std", "futures-channel"]
 compat = ["std", "futures_01"]
 default = ["std", "async-await", "async-await-macro"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/no_atomic_cas.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/no_atomic_cas.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/no_atomic_cas.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/no_atomic_cas.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+// This file is @generated by no_atomic_cas.sh.
+// It is not intended for manual editing.
+
+const NO_ATOMIC_CAS_TARGETS: &[&str] = &[
+    "avr-unknown-gnu-atmega328",
+    "bpfeb-unknown-none",
+    "bpfel-unknown-none",
+    "msp430-none-elf",
+    "riscv32i-unknown-none-elf",
+    "riscv32imc-unknown-none-elf",
+    "thumbv4t-none-eabi",
+    "thumbv6m-none-eabi",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/abortable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/abortable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/abortable.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/abortable.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,185 @@
+use crate::task::AtomicWaker;
+use alloc::sync::Arc;
+use core::fmt;
+use core::pin::Pin;
+use core::sync::atomic::{AtomicBool, Ordering};
+use futures_core::future::Future;
+use futures_core::task::{Context, Poll};
+use futures_core::Stream;
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// A future/stream which can be remotely short-circuited using an `AbortHandle`.
+    #[derive(Debug, Clone)]
+    #[must_use = "futures/streams do nothing unless you poll them"]
+    pub struct Abortable<T> {
+        #[pin]
+        task: T,
+        inner: Arc<AbortInner>,
+    }
+}
+
+impl<T> Abortable<T> {
+    /// Creates a new `Abortable` future/stream using an existing `AbortRegistration`.
+    /// `AbortRegistration`s can be acquired through `AbortHandle::new`.
+    ///
+    /// When `abort` is called on the handle tied to `reg` or if `abort` has
+    /// already been called, the future/stream will complete immediately without making
+    /// any further progress.
+    ///
+    /// # Examples:
+    ///
+    /// Usage with futures:
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::future::{Abortable, AbortHandle, Aborted};
+    ///
+    /// let (abort_handle, abort_registration) = AbortHandle::new_pair();
+    /// let future = Abortable::new(async { 2 }, abort_registration);
+    /// abort_handle.abort();
+    /// assert_eq!(future.await, Err(Aborted));
+    /// # });
+    /// ```
+    ///
+    /// Usage with streams:
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// # use futures::future::{Abortable, AbortHandle};
+    /// # use futures::stream::{self, StreamExt};
+    ///
+    /// let (abort_handle, abort_registration) = AbortHandle::new_pair();
+    /// let mut stream = Abortable::new(stream::iter(vec![1, 2, 3]), abort_registration);
+    /// abort_handle.abort();
+    /// assert_eq!(stream.next().await, None);
+    /// # });
+    /// ```
+    pub fn new(task: T, reg: AbortRegistration) -> Self {
+        Self { task, inner: reg.inner }
+    }
+
+    /// Checks whether the task has been aborted. Note that all this
+    /// method indicates is whether [`AbortHandle::abort`] was *called*.
+    /// This means that it will return `true` even if:
+    /// * `abort` was called after the task had completed.
+    /// * `abort` was called while the task was being polled - the task may still be running and
+    /// will not be stopped until `poll` returns.
+    pub fn is_aborted(&self) -> bool {
+        self.inner.aborted.load(Ordering::Relaxed)
+    }
+}
+
+/// A registration handle for an `Abortable` task.
+/// Values of this type can be acquired from `AbortHandle::new` and are used
+/// in calls to `Abortable::new`.
+#[derive(Debug)]
+pub struct AbortRegistration {
+    inner: Arc<AbortInner>,
+}
+
+/// A handle to an `Abortable` task.
+#[derive(Debug, Clone)]
+pub struct AbortHandle {
+    inner: Arc<AbortInner>,
+}
+
+impl AbortHandle {
+    /// Creates an (`AbortHandle`, `AbortRegistration`) pair which can be used
+    /// to abort a running future or stream.
+    ///
+    /// This function is usually paired with a call to [`Abortable::new`].
+    pub fn new_pair() -> (Self, AbortRegistration) {
+        let inner =
+            Arc::new(AbortInner { waker: AtomicWaker::new(), aborted: AtomicBool::new(false) });
+
+        (Self { inner: inner.clone() }, AbortRegistration { inner })
+    }
+}
+
+// Inner type storing the waker to awaken and a bool indicating that it
+// should be aborted.
+#[derive(Debug)]
+struct AbortInner {
+    waker: AtomicWaker,
+    aborted: AtomicBool,
+}
+
+/// Indicator that the `Abortable` task was aborted.
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+pub struct Aborted;
+
+impl fmt::Display for Aborted {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "`Abortable` future has been aborted")
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for Aborted {}
+
+impl<T> Abortable<T> {
+    fn try_poll<I>(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        poll: impl Fn(Pin<&mut T>, &mut Context<'_>) -> Poll<I>,
+    ) -> Poll<Result<I, Aborted>> {
+        // Check if the task has been aborted
+        if self.is_aborted() {
+            return Poll::Ready(Err(Aborted));
+        }
+
+        // attempt to complete the task
+        if let Poll::Ready(x) = poll(self.as_mut().project().task, cx) {
+            return Poll::Ready(Ok(x));
+        }
+
+        // Register to receive a wakeup if the task is aborted in the future
+        self.inner.waker.register(cx.waker());
+
+        // Check to see if the task was aborted between the first check and
+        // registration.
+        // Checking with `is_aborted` which uses `Relaxed` is sufficient because
+        // `register` introduces an `AcqRel` barrier.
+        if self.is_aborted() {
+            return Poll::Ready(Err(Aborted));
+        }
+
+        Poll::Pending
+    }
+}
+
+impl<Fut> Future for Abortable<Fut>
+where
+    Fut: Future,
+{
+    type Output = Result<Fut::Output, Aborted>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        self.try_poll(cx, |fut, cx| fut.poll(cx))
+    }
+}
+
+impl<St> Stream for Abortable<St>
+where
+    St: Stream,
+{
+    type Item = St::Item;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        self.try_poll(cx, |stream, cx| stream.poll_next(cx)).map(Result::ok).map(Option::flatten)
+    }
+}
+
+impl AbortHandle {
+    /// Abort the `Abortable` stream/future associated with this handle.
+    ///
+    /// Notifies the Abortable task associated with this handle that it
+    /// should abort. Note that if the task is currently being polled on
+    /// another thread, it will not immediately stop running. Instead, it will
+    /// continue to run until its poll method returns.
+    pub fn abort(&self) {
+        self.inner.aborted.store(true, Ordering::Relaxed);
+        self.inner.waker.wake();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/join_mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/join_mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/join_mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/join_mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,12 @@
 //! The `join` macro.
 
-use proc_macro_hack::proc_macro_hack;
-
 macro_rules! document_join_macro {
     ($join:item $try_join:item) => {
         /// Polls multiple futures simultaneously, returning a tuple
         /// of all results once complete.
         ///
         /// While `join!(a, b)` is similar to `(a.await, b.await)`,
-        /// `join!` polls both futures concurrently and therefore is more efficent.
+        /// `join!` polls both futures concurrently and therefore is more efficient.
         ///
         /// This macro is only usable inside of async functions, closures, and blocks.
         /// It is also gated behind the `async-await` feature of this library, which is
@@ -81,12 +79,14 @@
     }
 }
 
+#[allow(unreachable_pub)]
 #[doc(hidden)]
-#[proc_macro_hack(support_nested, only_hack_old_rustc)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack(support_nested))]
 pub use futures_macro::join_internal;
 
+#[allow(unreachable_pub)]
 #[doc(hidden)]
-#[proc_macro_hack(support_nested, only_hack_old_rustc)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack(support_nested))]
 pub use futures_macro::try_join_internal;
 
 document_join_macro! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,8 +3,8 @@
 //! This module contains a number of functions and combinators for working
 //! with `async`/`await` code.
 
-use futures_core::future::{Future, FusedFuture};
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::future::{FusedFuture, Future};
+use futures_core::stream::{FusedStream, Stream};
 
 #[macro_use]
 mod poll;
@@ -30,6 +30,13 @@
 #[cfg(feature = "async-await-macro")]
 pub use self::select_mod::*;
 
+// Primary export is a macro
+#[cfg(feature = "async-await-macro")]
+mod stream_select_mod;
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/64762
+#[cfg(feature = "async-await-macro")]
+pub use self::stream_select_mod::*;
+
 #[cfg(feature = "std")]
 #[cfg(feature = "async-await-macro")]
 mod random;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/pending.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/pending.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/pending.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/pending.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,7 +16,7 @@
 macro_rules! pending {
     () => {
         $crate::__private::async_await::pending_once().await
-    }
+    };
 }
 
 #[doc(hidden)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/poll.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/poll.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/poll.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/poll.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,11 +9,15 @@
 /// This macro is only usable inside of `async` functions, closures, and blocks.
 /// It is also gated behind the `async-await` feature of this library, which is
 /// activated by default.
+///
+/// If you need the result of polling a [`Stream`](crate::stream::Stream),
+/// you can use this macro with the [`next`](crate::stream::StreamExt::next) method:
+/// `poll!(stream.next())`.
 #[macro_export]
 macro_rules! poll {
     ($x:expr $(,)?) => {
         $crate::__private::async_await::poll($x).await
-    }
+    };
 }
 
 #[doc(hidden)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/select_mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/select_mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/select_mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/select_mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,5 @@
 //! The `select` macro.
 
-use proc_macro_hack::proc_macro_hack;
-
 macro_rules! document_select_macro {
     // This branch is required for `futures 0.3.1`, from before select_biased was introduced
     ($select:item) => {
@@ -309,12 +307,14 @@
 }
 
 #[cfg(feature = "std")]
+#[allow(unreachable_pub)]
 #[doc(hidden)]
-#[proc_macro_hack(support_nested, only_hack_old_rustc)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack(support_nested))]
 pub use futures_macro::select_internal;
 
+#[allow(unreachable_pub)]
 #[doc(hidden)]
-#[proc_macro_hack(support_nested, only_hack_old_rustc)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack(support_nested))]
 pub use futures_macro::select_biased_internal;
 
 document_select_macro! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/stream_select_mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/stream_select_mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/async_await/stream_select_mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/async_await/stream_select_mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+//! The `stream_select` macro.
+
+#[cfg(feature = "std")]
+#[allow(unreachable_pub)]
+#[doc(hidden)]
+#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack(support_nested))]
+pub use futures_macro::stream_select_internal;
+
+/// Combines several streams, all producing the same `Item` type, into one stream.
+/// This is similar to `select_all` but does not require the streams to all be the same type.
+/// It also keeps the streams inline, and does not require `Box<dyn Stream>`s to be allocated.
+/// Streams passed to this macro must be `Unpin`.
+///
+/// If multiple streams are ready, one will be pseudo randomly selected at runtime.
+///
+/// This macro is gated behind the `async-await` feature of this library, which is activated by default.
+/// Note that `stream_select!` relies on `proc-macro-hack`, and may require to set the compiler's recursion
+/// limit very high, e.g. `#![recursion_limit="1024"]`.
+///
+/// # Examples
+///
+/// ```
+/// # futures::executor::block_on(async {
+/// use futures::{stream, StreamExt, stream_select};
+/// let endless_ints = |i| stream::iter(vec![i].into_iter().cycle()).fuse();
+///
+/// let mut endless_numbers = stream_select!(endless_ints(1i32), endless_ints(2), endless_ints(3));
+/// match endless_numbers.next().await {
+///     Some(1) => println!("Got a 1"),
+///     Some(2) => println!("Got a 2"),
+///     Some(3) => println!("Got a 3"),
+///     _ => unreachable!(),
+/// }
+/// # });
+/// ```
+#[cfg(feature = "std")]
+#[macro_export]
+macro_rules! stream_select {
+    ($($tokens:tt)*) => {{
+        use $crate::__private as __futures_crate;
+        $crate::stream_select_internal! {
+            $( $tokens )*
+        }
+    }}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/compat/compat01as03.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/compat/compat01as03.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/compat/compat01as03.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/compat/compat01as03.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,15 @@
 use futures_01::executor::{
-    spawn as spawn01, Notify as Notify01, NotifyHandle as NotifyHandle01,
-    Spawn as Spawn01, UnsafeNotify as UnsafeNotify01,
-};
-use futures_01::{
-    Async as Async01, Future as Future01,
-    Stream as Stream01,
+    spawn as spawn01, Notify as Notify01, NotifyHandle as NotifyHandle01, Spawn as Spawn01,
+    UnsafeNotify as UnsafeNotify01,
 };
+use futures_01::{Async as Async01, Future as Future01, Stream as Stream01};
 #[cfg(feature = "sink")]
 use futures_01::{AsyncSink as AsyncSink01, Sink as Sink01};
-use futures_core::{task as task03, future::Future as Future03, stream::Stream as Stream03};
-use std::pin::Pin;
-use std::task::Context;
+use futures_core::{future::Future as Future03, stream::Stream as Stream03, task as task03};
 #[cfg(feature = "sink")]
 use futures_sink::Sink as Sink03;
+use std::pin::Pin;
+use std::task::Context;
 
 #[cfg(feature = "io-compat")]
 #[cfg_attr(docsrs, doc(cfg(feature = "io-compat")))]
@@ -33,9 +30,7 @@
     /// Wraps a futures 0.1 Future, Stream, AsyncRead, or AsyncWrite
     /// object in a futures 0.3-compatible wrapper.
     pub fn new(object: T) -> Self {
-        Self {
-            inner: spawn01(object),
-        }
+        Self { inner: spawn01(object) }
     }
 
     fn in_notify<R>(&mut self, cx: &mut Context<'_>, f: impl FnOnce(&mut T) -> R) -> R {
@@ -157,10 +152,7 @@
 impl<Fut: Future01> Future03 for Compat01As03<Fut> {
     type Output = Result<Fut::Item, Fut::Error>;
 
-    fn poll(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> task03::Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> task03::Poll<Self::Output> {
         poll_01_to_03(self.in_notify(cx, Future01::poll))
     }
 }
@@ -198,18 +190,10 @@
 impl<S, SinkItem> Compat01As03Sink<S, SinkItem> {
     /// Wraps a futures 0.1 Sink object in a futures 0.3-compatible wrapper.
     pub fn new(inner: S) -> Self {
-        Self {
-            inner: spawn01(inner),
-            buffer: None,
-            close_started: false
-        }
+        Self { inner: spawn01(inner), buffer: None, close_started: false }
     }
 
-    fn in_notify<R>(
-        &mut self,
-        cx: &mut Context<'_>,
-        f: impl FnOnce(&mut S) -> R,
-    ) -> R {
+    fn in_notify<R>(&mut self, cx: &mut Context<'_>, f: impl FnOnce(&mut S) -> R) -> R {
         let notify = &WakerToHandle(cx.waker());
         self.inner.poll_fn_notify(notify, 0, f)
     }
@@ -256,10 +240,7 @@
 {
     type Error = S::SinkError;
 
-    fn start_send(
-        mut self: Pin<&mut Self>,
-        item: SinkItem,
-    ) -> Result<(), Self::Error> {
+    fn start_send(mut self: Pin<&mut Self>, item: SinkItem) -> Result<(), Self::Error> {
         debug_assert!(self.buffer.is_none());
         self.buffer = Some(item);
         Ok(())
@@ -289,9 +270,7 @@
         match self.in_notify(cx, |f| match item {
             Some(i) => match f.start_send(i)? {
                 AsyncSink01::Ready => f.poll_complete().map(|i| (i, None)),
-                AsyncSink01::NotReady(t) => {
-                    Ok((Async01::NotReady, Some(t)))
-                }
+                AsyncSink01::NotReady(t) => Ok((Async01::NotReady, Some(t))),
             },
             None => f.poll_complete().map(|i| (i, None)),
         })? {
@@ -447,29 +426,35 @@
             }
         }
 
-        fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8])
-            -> task03::Poll<Result<usize, Error>>
-        {
+        fn poll_read(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &mut [u8],
+        ) -> task03::Poll<Result<usize, Error>> {
             poll_01_to_03(self.in_notify(cx, |x| x.poll_read(buf)))
         }
     }
 
     impl<W: AsyncWrite01> AsyncWrite03 for Compat01As03<W> {
-        fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8])
-            -> task03::Poll<Result<usize, Error>>
-        {
+        fn poll_write(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> task03::Poll<Result<usize, Error>> {
             poll_01_to_03(self.in_notify(cx, |x| x.poll_write(buf)))
         }
 
-        fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>)
-            -> task03::Poll<Result<(), Error>>
-        {
+        fn poll_flush(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+        ) -> task03::Poll<Result<(), Error>> {
             poll_01_to_03(self.in_notify(cx, AsyncWrite01::poll_flush))
         }
 
-        fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>)
-            -> task03::Poll<Result<(), Error>>
-        {
+        fn poll_close(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+        ) -> task03::Poll<Result<(), Error>> {
             poll_01_to_03(self.in_notify(cx, AsyncWrite01::shutdown))
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/compat/compat03as01.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/compat/compat03as01.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/compat/compat03as01.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/compat/compat03as01.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,31 +1,19 @@
+use crate::task::{self as task03, ArcWake as ArcWake03, WakerRef};
 use futures_01::{
-    task as task01, Async as Async01, Future as Future01, Poll as Poll01,
-    Stream as Stream01,
+    task as task01, Async as Async01, Future as Future01, Poll as Poll01, Stream as Stream01,
 };
 #[cfg(feature = "sink")]
-use futures_01::{
-    AsyncSink as AsyncSink01, Sink as Sink01, StartSend as StartSend01,
-};
+use futures_01::{AsyncSink as AsyncSink01, Sink as Sink01, StartSend as StartSend01};
 use futures_core::{
-    task::{RawWaker, RawWakerVTable},
     future::TryFuture as TryFuture03,
     stream::TryStream as TryStream03,
+    task::{RawWaker, RawWakerVTable},
 };
 #[cfg(feature = "sink")]
 use futures_sink::Sink as Sink03;
-use crate::task::{
-    self as task03,
-    ArcWake as ArcWake03,
-    WakerRef,
-};
 #[cfg(feature = "sink")]
 use std::marker::PhantomData;
-use std::{
-    mem,
-    pin::Pin,
-    sync::Arc,
-    task::Context,
-};
+use std::{mem, pin::Pin, sync::Arc, task::Context};
 
 /// Converts a futures 0.3 [`TryFuture`](futures_core::future::TryFuture) or
 /// [`TryStream`](futures_core::stream::TryStream) into a futures 0.1
@@ -80,10 +68,7 @@
 impl<T, Item> CompatSink<T, Item> {
     /// Creates a new [`CompatSink`].
     pub fn new(inner: T) -> Self {
-        Self {
-            inner,
-            _phantom: PhantomData,
-        }
+        Self { inner, _phantom: PhantomData }
     }
 
     /// Get a reference to 0.3 Sink contained within.
@@ -102,9 +87,7 @@
     }
 }
 
-fn poll_03_to_01<T, E>(x: task03::Poll<Result<T, E>>)
-    -> Result<Async01<T>, E>
-{
+fn poll_03_to_01<T, E>(x: task03::Poll<Result<T, E>>) -> Result<Async01<T>, E> {
     match x? {
         task03::Poll::Ready(t) => Ok(Async01::Ready(t)),
         task03::Poll::Pending => Ok(Async01::NotReady),
@@ -147,17 +130,10 @@
     type SinkItem = Item;
     type SinkError = T::Error;
 
-    fn start_send(
-        &mut self,
-        item: Self::SinkItem,
-    ) -> StartSend01<Self::SinkItem, Self::SinkError> {
-        with_sink_context(self, |mut inner, cx| {
-            match inner.as_mut().poll_ready(cx)? {
-                task03::Poll::Ready(()) => {
-                    inner.start_send(item).map(|()| AsyncSink01::Ready)
-                }
-                task03::Poll::Pending => Ok(AsyncSink01::NotReady(item)),
-            }
+    fn start_send(&mut self, item: Self::SinkItem) -> StartSend01<Self::SinkItem, Self::SinkError> {
+        with_sink_context(self, |mut inner, cx| match inner.as_mut().poll_ready(cx)? {
+            task03::Poll::Ready(()) => inner.start_send(item).map(|()| AsyncSink01::Ready),
+            task03::Poll::Pending => Ok(AsyncSink01::NotReady(item)),
         })
     }
 
@@ -190,9 +166,9 @@
             // Lazily create the `Arc` only when the waker is actually cloned.
             // FIXME: remove `transmute` when a `Waker` -> `RawWaker` conversion
             // function is landed in `core`.
-            mem::transmute::<task03::Waker, RawWaker>(
-                task03::waker(Arc::new(ptr_to_current(ptr).clone()))
-            )
+            mem::transmute::<task03::Waker, RawWaker>(task03::waker(Arc::new(
+                ptr_to_current(ptr).clone(),
+            )))
         }
         unsafe fn drop(_: *const ()) {}
         unsafe fn wake(ptr: *const ()) {
@@ -243,9 +219,7 @@
     use futures_io::{AsyncRead as AsyncRead03, AsyncWrite as AsyncWrite03};
     use tokio_io::{AsyncRead as AsyncRead01, AsyncWrite as AsyncWrite01};
 
-    fn poll_03_to_io<T>(x: task03::Poll<Result<T, std::io::Error>>)
-        -> Result<T, std::io::Error>
-    {
+    fn poll_03_to_io<T>(x: task03::Poll<Result<T, std::io::Error>>) -> Result<T, std::io::Error> {
         match x {
             task03::Poll::Ready(Ok(t)) => Ok(t),
             task03::Poll::Pending => Err(std::io::ErrorKind::WouldBlock.into()),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/compat/executor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/compat/executor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/compat/executor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/compat/executor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -66,9 +66,7 @@
     fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError03> {
         let future = future.unit_error().compat();
 
-        self.executor01
-            .execute(future)
-            .map_err(|_| SpawnError03::shutdown())
+        self.executor01.execute(future).map_err(|_| SpawnError03::shutdown())
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/compat/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/compat/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/compat/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/compat/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,19 @@
-//! Futures 0.1 / 0.3 shims
+//! Interop between `futures` 0.1 and 0.3.
 //!
 //! This module is only available when the `compat` feature of this
 //! library is activated.
 
 mod executor;
-pub use self::executor::{Executor01CompatExt, Executor01Future, Executor01As03};
+pub use self::executor::{Executor01As03, Executor01CompatExt, Executor01Future};
 
 mod compat01as03;
+#[cfg(feature = "io-compat")]
+#[cfg_attr(docsrs, doc(cfg(feature = "io-compat")))]
+pub use self::compat01as03::{AsyncRead01CompatExt, AsyncWrite01CompatExt};
 pub use self::compat01as03::{Compat01As03, Future01CompatExt, Stream01CompatExt};
 #[cfg(feature = "sink")]
 #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
 pub use self::compat01as03::{Compat01As03Sink, Sink01CompatExt};
-#[cfg(feature = "io-compat")]
-#[cfg_attr(docsrs, doc(cfg(feature = "io-compat")))]
-pub use self::compat01as03::{AsyncRead01CompatExt, AsyncWrite01CompatExt};
 
 mod compat03as01;
 pub use self::compat03as01::Compat;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/fns.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/fns.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/fns.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/fns.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
-use core::marker::PhantomData;
 use core::fmt::{self, Debug};
+use core::marker::PhantomData;
 
 pub trait FnOnce1<A> {
     type Output;
@@ -8,7 +8,7 @@
 
 impl<T, A, R> FnOnce1<A> for T
 where
-    T: FnOnce(A) -> R
+    T: FnOnce(A) -> R,
 {
     type Output = R;
     fn call_once(self, arg: A) -> R {
@@ -22,7 +22,7 @@
 
 impl<T, A, R> FnMut1<A> for T
 where
-    T: FnMut(A) -> R
+    T: FnMut(A) -> R,
 {
     fn call_mut(&mut self, arg: A) -> R {
         self(arg)
@@ -37,7 +37,7 @@
 
 impl<T, A, R> Fn1<A> for T
 where
-    T: Fn(A) -> R
+    T: Fn(A) -> R,
 {
     fn call(&self, arg: A) -> R {
         self(arg)
@@ -143,7 +143,7 @@
 #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
 impl<F, A> FnOnce1<A> for InspectFn<F>
 where
-    F: for<'a> FnOnce1<&'a A, Output=()>,
+    F: for<'a> FnOnce1<&'a A, Output = ()>,
 {
     type Output = A;
     fn call_once(self, arg: A) -> Self::Output {
@@ -154,7 +154,7 @@
 #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
 impl<F, A> FnMut1<A> for InspectFn<F>
 where
-    F: for<'a> FnMut1<&'a A, Output=()>,
+    F: for<'a> FnMut1<&'a A, Output = ()>,
 {
     fn call_mut(&mut self, arg: A) -> Self::Output {
         self.0.call_mut(&arg);
@@ -164,7 +164,7 @@
 #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
 impl<F, A> Fn1<A> for InspectFn<F>
 where
-    F: for<'a> Fn1<&'a A, Output=()>,
+    F: for<'a> Fn1<&'a A, Output = ()>,
 {
     fn call(&self, arg: A) -> Self::Output {
         self.0.call(&arg);
@@ -244,27 +244,33 @@
 
 impl<'a, F, T, E> FnOnce1<&'a Result<T, E>> for InspectOkFn<F>
 where
-    F: FnOnce1<&'a T, Output=()>
+    F: FnOnce1<&'a T, Output = ()>,
 {
     type Output = ();
     fn call_once(self, arg: &'a Result<T, E>) -> Self::Output {
-        if let Ok(x) = arg { self.0.call_once(x) }
+        if let Ok(x) = arg {
+            self.0.call_once(x)
+        }
     }
 }
 impl<'a, F, T, E> FnMut1<&'a Result<T, E>> for InspectOkFn<F>
 where
-    F: FnMut1<&'a T, Output=()>,
+    F: FnMut1<&'a T, Output = ()>,
 {
     fn call_mut(&mut self, arg: &'a Result<T, E>) -> Self::Output {
-        if let Ok(x) = arg { self.0.call_mut(x) }
+        if let Ok(x) = arg {
+            self.0.call_mut(x)
+        }
     }
 }
 impl<'a, F, T, E> Fn1<&'a Result<T, E>> for InspectOkFn<F>
 where
-    F: Fn1<&'a T, Output=()>,
+    F: Fn1<&'a T, Output = ()>,
 {
     fn call(&self, arg: &'a Result<T, E>) -> Self::Output {
-        if let Ok(x) = arg { self.0.call(x) }
+        if let Ok(x) = arg {
+            self.0.call(x)
+        }
     }
 }
 pub(crate) fn inspect_ok_fn<F>(f: F) -> InspectOkFn<F> {
@@ -276,27 +282,33 @@
 
 impl<'a, F, T, E> FnOnce1<&'a Result<T, E>> for InspectErrFn<F>
 where
-    F: FnOnce1<&'a E, Output=()>
+    F: FnOnce1<&'a E, Output = ()>,
 {
     type Output = ();
     fn call_once(self, arg: &'a Result<T, E>) -> Self::Output {
-        if let Err(x) = arg { self.0.call_once(x) }
+        if let Err(x) = arg {
+            self.0.call_once(x)
+        }
     }
 }
 impl<'a, F, T, E> FnMut1<&'a Result<T, E>> for InspectErrFn<F>
 where
-    F: FnMut1<&'a E, Output=()>,
+    F: FnMut1<&'a E, Output = ()>,
 {
     fn call_mut(&mut self, arg: &'a Result<T, E>) -> Self::Output {
-        if let Err(x) = arg { self.0.call_mut(x) }
+        if let Err(x) = arg {
+            self.0.call_mut(x)
+        }
     }
 }
 impl<'a, F, T, E> Fn1<&'a Result<T, E>> for InspectErrFn<F>
 where
-    F: Fn1<&'a E, Output=()>,
+    F: Fn1<&'a E, Output = ()>,
 {
     fn call(&self, arg: &'a Result<T, E>) -> Self::Output {
-        if let Err(x) = arg { self.0.call(x) }
+        if let Err(x) = arg {
+            self.0.call(x)
+        }
     }
 }
 pub(crate) fn inspect_err_fn<F>(f: F) -> InspectErrFn<F> {
@@ -313,7 +325,7 @@
 
 impl<F, T, E> FnOnce1<Result<T, E>> for UnwrapOrElseFn<F>
 where
-    F: FnOnce1<E, Output=T>,
+    F: FnOnce1<E, Output = T>,
 {
     type Output = T;
     fn call_once(self, arg: Result<T, E>) -> Self::Output {
@@ -322,7 +334,7 @@
 }
 impl<F, T, E> FnMut1<Result<T, E>> for UnwrapOrElseFn<F>
 where
-    F: FnMut1<E, Output=T>,
+    F: FnMut1<E, Output = T>,
 {
     fn call_mut(&mut self, arg: Result<T, E>) -> Self::Output {
         arg.unwrap_or_else(|x| self.0.call_mut(x))
@@ -330,7 +342,7 @@
 }
 impl<F, T, E> Fn1<Result<T, E>> for UnwrapOrElseFn<F>
 where
-    F: Fn1<E, Output=T>,
+    F: Fn1<E, Output = T>,
 {
     fn call(&self, arg: Result<T, E>) -> Self::Output {
         arg.unwrap_or_else(|x| self.0.call(x))
@@ -347,7 +359,10 @@
         Self(PhantomData)
     }
 }
-impl<A, T> FnOnce1<A> for IntoFn<T> where A: Into<T> {
+impl<A, T> FnOnce1<A> for IntoFn<T>
+where
+    A: Into<T>,
+{
     type Output = T;
     fn call_once(self, arg: A) -> Self::Output {
         arg.into()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/abortable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/abortable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/abortable.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/abortable.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,108 +1,8 @@
-use crate::task::AtomicWaker;
+use super::assert_future;
+use crate::future::{AbortHandle, Abortable, Aborted};
 use futures_core::future::Future;
-use futures_core::task::{Context, Poll};
-use core::fmt;
-use core::pin::Pin;
-use core::sync::atomic::{AtomicBool, Ordering};
-use alloc::sync::Arc;
-use pin_project::pin_project;
 
-/// A future which can be remotely short-circuited using an `AbortHandle`.
-#[pin_project]
-#[derive(Debug, Clone)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Abortable<Fut> {
-    #[pin]
-    future: Fut,
-    inner: Arc<AbortInner>,
-}
-
-impl<Fut> Abortable<Fut> where Fut: Future {
-    /// Creates a new `Abortable` future using an existing `AbortRegistration`.
-    /// `AbortRegistration`s can be acquired through `AbortHandle::new`.
-    ///
-    /// When `abort` is called on the handle tied to `reg` or if `abort` has
-    /// already been called, the future will complete immediately without making
-    /// any further progress.
-    ///
-    /// Example:
-    ///
-    /// ```
-    /// # futures::executor::block_on(async {
-    /// use futures::future::{Abortable, AbortHandle, Aborted};
-    ///
-    /// let (abort_handle, abort_registration) = AbortHandle::new_pair();
-    /// let future = Abortable::new(async { 2 }, abort_registration);
-    /// abort_handle.abort();
-    /// assert_eq!(future.await, Err(Aborted));
-    /// # });
-    /// ```
-    pub fn new(future: Fut, reg: AbortRegistration) -> Self {
-        Self {
-            future,
-            inner: reg.inner,
-        }
-    }
-}
-
-/// A registration handle for a `Abortable` future.
-/// Values of this type can be acquired from `AbortHandle::new` and are used
-/// in calls to `Abortable::new`.
-#[derive(Debug)]
-pub struct AbortRegistration {
-    inner: Arc<AbortInner>,
-}
-
-/// A handle to a `Abortable` future.
-#[derive(Debug, Clone)]
-pub struct AbortHandle {
-    inner: Arc<AbortInner>,
-}
-
-impl AbortHandle {
-    /// Creates an (`AbortHandle`, `AbortRegistration`) pair which can be used
-    /// to abort a running future.
-    ///
-    /// This function is usually paired with a call to `Abortable::new`.
-    ///
-    /// Example:
-    ///
-    /// ```
-    /// # futures::executor::block_on(async {
-    /// use futures::future::{Abortable, AbortHandle, Aborted};
-    ///
-    /// let (abort_handle, abort_registration) = AbortHandle::new_pair();
-    /// let future = Abortable::new(async { 2 }, abort_registration);
-    /// abort_handle.abort();
-    /// assert_eq!(future.await, Err(Aborted));
-    /// # });
-    /// ```
-    pub fn new_pair() -> (Self, AbortRegistration) {
-        let inner = Arc::new(AbortInner {
-            waker: AtomicWaker::new(),
-            cancel: AtomicBool::new(false),
-        });
-
-        (
-            Self {
-                inner: inner.clone(),
-            },
-            AbortRegistration {
-                inner,
-            },
-        )
-    }
-}
-
-// Inner type storing the waker to awaken and a bool indicating that it
-// should be cancelled.
-#[derive(Debug)]
-struct AbortInner {
-    waker: AtomicWaker,
-    cancel: AtomicBool,
-}
-
-/// Creates a new `Abortable` future and a `AbortHandle` which can be used to stop it.
+/// Creates a new `Abortable` future and an `AbortHandle` which can be used to stop it.
 ///
 /// This function is a convenient (but less flexible) alternative to calling
 /// `AbortHandle::new` and `Abortable::new` manually.
@@ -110,66 +10,10 @@
 /// This function is only available when the `std` or `alloc` feature of this
 /// library is activated, and it is activated by default.
 pub fn abortable<Fut>(future: Fut) -> (Abortable<Fut>, AbortHandle)
-    where Fut: Future
+where
+    Fut: Future,
 {
     let (handle, reg) = AbortHandle::new_pair();
-    (
-        Abortable::new(future, reg),
-        handle,
-    )
-}
-
-/// Indicator that the `Abortable` future was aborted.
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub struct Aborted;
-
-impl fmt::Display for Aborted {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "`Abortable` future has been aborted")
-    }
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for Aborted {}
-
-impl<Fut> Future for Abortable<Fut> where Fut: Future {
-    type Output = Result<Fut::Output, Aborted>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        // Check if the future has been aborted
-        if self.inner.cancel.load(Ordering::Relaxed) {
-            return Poll::Ready(Err(Aborted))
-        }
-
-        // attempt to complete the future
-        if let Poll::Ready(x) = self.as_mut().project().future.poll(cx) {
-            return Poll::Ready(Ok(x))
-        }
-
-        // Register to receive a wakeup if the future is aborted in the... future
-        self.inner.waker.register(cx.waker());
-
-        // Check to see if the future was aborted between the first check and
-        // registration.
-        // Checking with `Relaxed` is sufficient because `register` introduces an
-        // `AcqRel` barrier.
-        if self.inner.cancel.load(Ordering::Relaxed) {
-            return Poll::Ready(Err(Aborted))
-        }
-
-        Poll::Pending
-    }
-}
-
-impl AbortHandle {
-    /// Abort the `Abortable` future associated with this handle.
-    ///
-    /// Notifies the Abortable future associated with this handle that it
-    /// should abort. Note that if the future is currently being polled on
-    /// another thread, it will not immediately stop running. Instead, it will
-    /// continue to run until its poll method returns.
-    pub fn abort(&self) {
-        self.inner.cancel.store(true, Ordering::Relaxed);
-        self.inner.waker.wake();
-    }
+    let abortable = assert_future::<Result<Fut::Output, Aborted>, _>(Abortable::new(future, reg));
+    (abortable, handle)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/either.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/either.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/either.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/either.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,17 +4,43 @@
 use futures_core::stream::{FusedStream, Stream};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
 
-/// Combines two different futures, streams, or sinks having the same associated types into a single
-/// type.
-#[pin_project(project = EitherProj)]
+/// Combines two different futures, streams, or sinks having the same associated types into a single type.
+///
+/// This is useful when conditionally choosing between two distinct future types:
+///
+/// ```rust
+/// use futures::future::Either;
+///
+/// # futures::executor::block_on(async {
+/// let cond = true;
+///
+/// let fut = if cond {
+///     Either::Left(async move { 12 })
+/// } else {
+///     Either::Right(async move { 44 })
+/// };
+///
+/// assert_eq!(fut.await, 12);
+/// # })
+/// ```
 #[derive(Debug, Clone)]
 pub enum Either<A, B> {
     /// First branch of the type
-    Left(#[pin] A),
+    Left(/* #[pin] */ A),
     /// Second branch of the type
-    Right(#[pin] B),
+    Right(/* #[pin] */ B),
+}
+
+impl<A, B> Either<A, B> {
+    fn project(self: Pin<&mut Self>) -> Either<Pin<&mut A>, Pin<&mut B>> {
+        unsafe {
+            match self.get_unchecked_mut() {
+                Either::Left(a) => Either::Left(Pin::new_unchecked(a)),
+                Either::Right(b) => Either::Right(Pin::new_unchecked(b)),
+            }
+        }
+    }
 }
 
 impl<A, B, T> Either<(T, A), (T, B)> {
@@ -60,8 +86,8 @@
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         match self.project() {
-            EitherProj::Left(x) => x.poll(cx),
-            EitherProj::Right(x) => x.poll(cx),
+            Either::Left(x) => x.poll(cx),
+            Either::Right(x) => x.poll(cx),
         }
     }
 }
@@ -88,8 +114,15 @@
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         match self.project() {
-            EitherProj::Left(x) => x.poll_next(cx),
-            EitherProj::Right(x) => x.poll_next(cx),
+            Either::Left(x) => x.poll_next(cx),
+            Either::Right(x) => x.poll_next(cx),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        match self {
+            Either::Left(x) => x.size_hint(),
+            Either::Right(x) => x.size_hint(),
         }
     }
 }
@@ -117,29 +150,29 @@
 
     fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         match self.project() {
-            EitherProj::Left(x) => x.poll_ready(cx),
-            EitherProj::Right(x) => x.poll_ready(cx),
+            Either::Left(x) => x.poll_ready(cx),
+            Either::Right(x) => x.poll_ready(cx),
         }
     }
 
     fn start_send(self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
         match self.project() {
-            EitherProj::Left(x) => x.start_send(item),
-            EitherProj::Right(x) => x.start_send(item),
+            Either::Left(x) => x.start_send(item),
+            Either::Right(x) => x.start_send(item),
         }
     }
 
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         match self.project() {
-            EitherProj::Left(x) => x.poll_flush(cx),
-            EitherProj::Right(x) => x.poll_flush(cx),
+            Either::Left(x) => x.poll_flush(cx),
+            Either::Right(x) => x.poll_flush(cx),
         }
     }
 
     fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         match self.project() {
-            EitherProj::Left(x) => x.poll_close(cx),
-            EitherProj::Right(x) => x.poll_close(cx),
+            Either::Left(x) => x.poll_close(cx),
+            Either::Right(x) => x.poll_close(cx),
         }
     }
 }
@@ -176,8 +209,8 @@
             buf: &mut [u8],
         ) -> Poll<Result<usize>> {
             match self.project() {
-                EitherProj::Left(x) => x.poll_read(cx, buf),
-                EitherProj::Right(x) => x.poll_read(cx, buf),
+                Either::Left(x) => x.poll_read(cx, buf),
+                Either::Right(x) => x.poll_read(cx, buf),
             }
         }
 
@@ -187,8 +220,8 @@
             bufs: &mut [IoSliceMut<'_>],
         ) -> Poll<Result<usize>> {
             match self.project() {
-                EitherProj::Left(x) => x.poll_read_vectored(cx, bufs),
-                EitherProj::Right(x) => x.poll_read_vectored(cx, bufs),
+                Either::Left(x) => x.poll_read_vectored(cx, bufs),
+                Either::Right(x) => x.poll_read_vectored(cx, bufs),
             }
         }
     }
@@ -204,8 +237,8 @@
             buf: &[u8],
         ) -> Poll<Result<usize>> {
             match self.project() {
-                EitherProj::Left(x) => x.poll_write(cx, buf),
-                EitherProj::Right(x) => x.poll_write(cx, buf),
+                Either::Left(x) => x.poll_write(cx, buf),
+                Either::Right(x) => x.poll_write(cx, buf),
             }
         }
 
@@ -215,22 +248,22 @@
             bufs: &[IoSlice<'_>],
         ) -> Poll<Result<usize>> {
             match self.project() {
-                EitherProj::Left(x) => x.poll_write_vectored(cx, bufs),
-                EitherProj::Right(x) => x.poll_write_vectored(cx, bufs),
+                Either::Left(x) => x.poll_write_vectored(cx, bufs),
+                Either::Right(x) => x.poll_write_vectored(cx, bufs),
             }
         }
 
         fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
             match self.project() {
-                EitherProj::Left(x) => x.poll_flush(cx),
-                EitherProj::Right(x) => x.poll_flush(cx),
+                Either::Left(x) => x.poll_flush(cx),
+                Either::Right(x) => x.poll_flush(cx),
             }
         }
 
         fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
             match self.project() {
-                EitherProj::Left(x) => x.poll_close(cx),
-                EitherProj::Right(x) => x.poll_close(cx),
+                Either::Left(x) => x.poll_close(cx),
+                Either::Right(x) => x.poll_close(cx),
             }
         }
     }
@@ -246,8 +279,8 @@
             pos: SeekFrom,
         ) -> Poll<Result<u64>> {
             match self.project() {
-                EitherProj::Left(x) => x.poll_seek(cx, pos),
-                EitherProj::Right(x) => x.poll_seek(cx, pos),
+                Either::Left(x) => x.poll_seek(cx, pos),
+                Either::Right(x) => x.poll_seek(cx, pos),
             }
         }
     }
@@ -259,15 +292,15 @@
     {
         fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<&[u8]>> {
             match self.project() {
-                EitherProj::Left(x) => x.poll_fill_buf(cx),
-                EitherProj::Right(x) => x.poll_fill_buf(cx),
+                Either::Left(x) => x.poll_fill_buf(cx),
+                Either::Right(x) => x.poll_fill_buf(cx),
             }
         }
 
         fn consume(self: Pin<&mut Self>, amt: usize) {
             match self.project() {
-                EitherProj::Left(x) => x.consume(amt),
-                EitherProj::Right(x) => x.consume(amt),
+                Either::Left(x) => x.consume(amt),
+                Either::Right(x) => x.consume(amt),
             }
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/catch_unwind.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/catch_unwind.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/catch_unwind.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/catch_unwind.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,38 @@
 use core::any::Any;
 use core::pin::Pin;
-use std::panic::{catch_unwind, UnwindSafe, AssertUnwindSafe};
+use std::panic::{catch_unwind, AssertUnwindSafe, UnwindSafe};
 
 use futures_core::future::Future;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`catch_unwind`](super::FutureExt::catch_unwind) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct CatchUnwind<Fut>(#[pin] Fut);
+pin_project! {
+    /// Future for the [`catch_unwind`](super::FutureExt::catch_unwind) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct CatchUnwind<Fut> {
+        #[pin]
+        future: Fut,
+    }
+}
 
-impl<Fut> CatchUnwind<Fut> where Fut: Future + UnwindSafe {
+impl<Fut> CatchUnwind<Fut>
+where
+    Fut: Future + UnwindSafe,
+{
     pub(super) fn new(future: Fut) -> Self {
-        Self(future)
+        Self { future }
     }
 }
 
 impl<Fut> Future for CatchUnwind<Fut>
-    where Fut: Future + UnwindSafe,
+where
+    Fut: Future + UnwindSafe,
 {
     type Output = Result<Fut::Output, Box<dyn Any + Send>>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let f = self.project().0;
+        let f = self.project().future;
         catch_unwind(AssertUnwindSafe(|| f.poll(cx)))?.map(Ok)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/flatten.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/flatten.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/flatten.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/flatten.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,28 +1,32 @@
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
+use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-#[pin_project(project = FlattenProj)]
-#[derive(Debug)]
-pub enum Flatten<Fut1, Fut2> {
-    First(#[pin] Fut1),
-    Second(#[pin] Fut2),
-    Empty,
+pin_project! {
+    #[project = FlattenProj]
+    #[derive(Debug)]
+    pub enum Flatten<Fut1, Fut2> {
+        First { #[pin] f: Fut1 },
+        Second { #[pin] f: Fut2 },
+        Empty,
+    }
 }
 
 impl<Fut1, Fut2> Flatten<Fut1, Fut2> {
     pub(crate) fn new(future: Fut1) -> Self {
-        Self::First(future)
+        Self::First { f: future }
     }
 }
 
 impl<Fut> FusedFuture for Flatten<Fut, Fut::Output>
-    where Fut: Future,
-          Fut::Output: Future,
+where
+    Fut: Future,
+    Fut::Output: Future,
 {
     fn is_terminated(&self) -> bool {
         match self {
@@ -33,23 +37,24 @@
 }
 
 impl<Fut> Future for Flatten<Fut, Fut::Output>
-    where Fut: Future,
-          Fut::Output: Future,
+where
+    Fut: Future,
+    Fut::Output: Future,
 {
     type Output = <Fut::Output as Future>::Output;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         Poll::Ready(loop {
             match self.as_mut().project() {
-                FlattenProj::First(f) => {
+                FlattenProj::First { f } => {
                     let f = ready!(f.poll(cx));
-                    self.set(Self::Second(f));
-                },
-                FlattenProj::Second(f) => {
+                    self.set(Self::Second { f });
+                }
+                FlattenProj::Second { f } => {
                     let output = ready!(f.poll(cx));
                     self.set(Self::Empty);
                     break output;
-                },
+                }
                 FlattenProj::Empty => panic!("Flatten polled after completion"),
             }
         })
@@ -57,8 +62,9 @@
 }
 
 impl<Fut> FusedStream for Flatten<Fut, Fut::Output>
-    where Fut: Future,
-          Fut::Output: Stream,
+where
+    Fut: Future,
+    Fut::Output: Stream,
 {
     fn is_terminated(&self) -> bool {
         match self {
@@ -69,32 +75,32 @@
 }
 
 impl<Fut> Stream for Flatten<Fut, Fut::Output>
-    where Fut: Future,
-          Fut::Output: Stream,
+where
+    Fut: Future,
+    Fut::Output: Stream,
 {
     type Item = <Fut::Output as Stream>::Item;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         Poll::Ready(loop {
             match self.as_mut().project() {
-                FlattenProj::First(f) => {
+                FlattenProj::First { f } => {
                     let f = ready!(f.poll(cx));
-                    self.set(Self::Second(f));
-                },
-                FlattenProj::Second(f) => {
+                    self.set(Self::Second { f });
+                }
+                FlattenProj::Second { f } => {
                     let output = ready!(f.poll_next(cx));
                     if output.is_none() {
                         self.set(Self::Empty);
                     }
                     break output;
-                },
+                }
                 FlattenProj::Empty => break None,
             }
         })
     }
 }
 
-
 #[cfg(feature = "sink")]
 impl<Fut, Item> Sink<Item> for Flatten<Fut, Fut::Output>
 where
@@ -103,19 +109,16 @@
 {
     type Error = <Fut::Output as Sink<Item>>::Error;
 
-    fn poll_ready(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(loop {
             match self.as_mut().project() {
-                FlattenProj::First(f) => {
+                FlattenProj::First { f } => {
                     let f = ready!(f.poll(cx));
-                    self.set(Self::Second(f));
-                },
-                FlattenProj::Second(f) => {
+                    self.set(Self::Second { f });
+                }
+                FlattenProj::Second { f } => {
                     break ready!(f.poll_ready(cx));
-                },
+                }
                 FlattenProj::Empty => panic!("poll_ready called after eof"),
             }
         })
@@ -123,26 +126,23 @@
 
     fn start_send(self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
         match self.project() {
-            FlattenProj::First(_) => panic!("poll_ready not called first"),
-            FlattenProj::Second(f) => f.start_send(item),
+            FlattenProj::First { .. } => panic!("poll_ready not called first"),
+            FlattenProj::Second { f } => f.start_send(item),
             FlattenProj::Empty => panic!("start_send called after eof"),
         }
     }
 
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         match self.project() {
-            FlattenProj::First(_) => Poll::Ready(Ok(())),
-            FlattenProj::Second(f) => f.poll_flush(cx),
+            FlattenProj::First { .. } => Poll::Ready(Ok(())),
+            FlattenProj::Second { f } => f.poll_flush(cx),
             FlattenProj::Empty => panic!("poll_flush called after eof"),
         }
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         let res = match self.as_mut().project() {
-            FlattenProj::Second(f) => f.poll_close(cx),
+            FlattenProj::Second { f } => f.poll_close(cx),
             _ => Poll::Ready(Ok(())),
         };
         if res.is_ready() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/fuse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/fuse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/fuse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/fuse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,22 @@
 use core::pin::Pin;
-use futures_core::future::{Future, FusedFuture};
+use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`fuse`](super::FutureExt::fuse) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Fuse<Fut>(#[pin] Option<Fut>);
+pin_project! {
+    /// Future for the [`fuse`](super::FutureExt::fuse) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Fuse<Fut> {
+        #[pin]
+        inner: Option<Fut>,
+    }
+}
 
 impl<Fut> Fuse<Fut> {
     pub(super) fn new(f: Fut) -> Self {
-        Self(Some(f))
+        Self { inner: Some(f) }
     }
 }
 
@@ -62,13 +67,13 @@
     /// # });
     /// ```
     pub fn terminated() -> Self {
-        Self(None)
+        Self { inner: None }
     }
 }
 
 impl<Fut: Future> FusedFuture for Fuse<Fut> {
     fn is_terminated(&self) -> bool {
-        self.0.is_none()
+        self.inner.is_none()
     }
 }
 
@@ -76,12 +81,12 @@
     type Output = Fut::Output;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Fut::Output> {
-        Poll::Ready(match self.as_mut().project().0.as_pin_mut() {
+        Poll::Ready(match self.as_mut().project().inner.as_pin_mut() {
             Some(fut) => {
                 let output = ready!(fut.poll(cx));
-                self.project().0.set(None);
+                self.project().inner.set(None);
                 output
-            },
+            }
             None => return Poll::Pending,
         })
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1,25 @@
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 use crate::fns::FnOnce1;
 
-/// Internal Map future
-#[pin_project(project = MapProj, project_replace = MapProjOwn)]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub enum Map<Fut, F> {
-    Incomplete {
-        #[pin]
-        future: Fut,
-        f: F,
-    },
-    Complete,
+pin_project! {
+    /// Internal Map future
+    #[project = MapProj]
+    #[project_replace = MapProjReplace]
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub enum Map<Fut, F> {
+        Incomplete {
+            #[pin]
+            future: Fut,
+            f: F,
+        },
+        Complete,
+    }
 }
 
 impl<Fut, F> Map<Fut, F> {
@@ -26,8 +30,9 @@
 }
 
 impl<Fut, F, T> FusedFuture for Map<Fut, F>
-    where Fut: Future,
-          F: FnOnce1<Fut::Output, Output=T>,
+where
+    Fut: Future,
+    F: FnOnce1<Fut::Output, Output = T>,
 {
     fn is_terminated(&self) -> bool {
         match self {
@@ -38,8 +43,9 @@
 }
 
 impl<Fut, F, T> Future for Map<Fut, F>
-    where Fut: Future,
-          F: FnOnce1<Fut::Output, Output=T>,
+where
+    Fut: Future,
+    F: FnOnce1<Fut::Output, Output = T>,
 {
     type Output = T;
 
@@ -47,12 +53,14 @@
         match self.as_mut().project() {
             MapProj::Incomplete { future, .. } => {
                 let output = ready!(future.poll(cx));
-                match self.project_replace(Self::Complete) {
-                    MapProjOwn::Incomplete { f, .. } => Poll::Ready(f.call_once(output)),
-                    MapProjOwn::Complete => unreachable!(),
+                match self.project_replace(Map::Complete) {
+                    MapProjReplace::Incomplete { f, .. } => Poll::Ready(f.call_once(output)),
+                    MapProjReplace::Complete => unreachable!(),
                 }
-            },
-            MapProj::Complete => panic!("Map must not be polled after it returned `Poll::Ready`"),
+            }
+            MapProj::Complete => {
+                panic!("Map must not be polled after it returned `Poll::Ready`")
+            }
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,10 +7,10 @@
 use alloc::boxed::Box;
 use core::pin::Pin;
 
-use crate::future::{assert_future, Either};
-use crate::stream::assert_stream;
 use crate::fns::{inspect_fn, into_fn, ok_fn, InspectFn, IntoFn, OkFn};
+use crate::future::{assert_future, Either};
 use crate::never::Never;
+use crate::stream::assert_stream;
 #[cfg(feature = "alloc")]
 use futures_core::future::{BoxFuture, LocalBoxFuture};
 use futures_core::{
@@ -506,7 +506,8 @@
     where
         Self: Sized,
     {
-        remote_handle::remote_handle(self)
+        let (wrapped, handle) = remote_handle::remote_handle(self);
+        (assert_future::<(), _>(wrapped), handle)
     }
 
     /// Wrap the future in a Box, pinning it.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/remote_handle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/remote_handle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/remote_handle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/remote_handle.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,23 @@
 use {
     crate::future::{CatchUnwind, FutureExt},
-    futures_channel::oneshot::{self, Sender, Receiver},
+    futures_channel::oneshot::{self, Receiver, Sender},
     futures_core::{
         future::Future,
+        ready,
         task::{Context, Poll},
     },
+    pin_project_lite::pin_project,
     std::{
         any::Any,
         fmt,
         panic::{self, AssertUnwindSafe},
         pin::Pin,
         sync::{
-            Arc,
             atomic::{AtomicBool, Ordering},
+            Arc,
         },
         thread,
     },
-    pin_project::pin_project,
 };
 
 /// The handle to a remote future returned by
@@ -35,7 +36,7 @@
 /// must be careful with regard to unwind safety because the thread in which the future
 /// is polled will keep running after the panic and the thread running the [RemoteHandle]
 /// will unwind.
-#[must_use = "futures do nothing unless you `.await` or poll them"]
+#[must_use = "dropping a remote handle cancels the underlying future"]
 #[derive(Debug)]
 #[cfg_attr(docsrs, doc(cfg(feature = "channel")))]
 pub struct RemoteHandle<T> {
@@ -69,23 +70,22 @@
 
 type SendMsg<Fut> = Result<<Fut as Future>::Output, Box<(dyn Any + Send + 'static)>>;
 
-/// A future which sends its output to the corresponding `RemoteHandle`.
-/// Created by [`remote_handle`](crate::future::FutureExt::remote_handle).
-#[pin_project]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-#[cfg_attr(docsrs, doc(cfg(feature = "channel")))]
-pub struct Remote<Fut: Future> {
-    tx: Option<Sender<SendMsg<Fut>>>,
-    keep_running: Arc<AtomicBool>,
-    #[pin]
-    future: CatchUnwind<AssertUnwindSafe<Fut>>,
+pin_project! {
+    /// A future which sends its output to the corresponding `RemoteHandle`.
+    /// Created by [`remote_handle`](crate::future::FutureExt::remote_handle).
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    #[cfg_attr(docsrs, doc(cfg(feature = "channel")))]
+    pub struct Remote<Fut: Future> {
+        tx: Option<Sender<SendMsg<Fut>>>,
+        keep_running: Arc<AtomicBool>,
+        #[pin]
+        future: CatchUnwind<AssertUnwindSafe<Fut>>,
+    }
 }
 
 impl<Fut: Future + fmt::Debug> fmt::Debug for Remote<Fut> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("Remote")
-            .field(&self.future)
-            .finish()
+        f.debug_tuple("Remote").field(&self.future).finish()
     }
 }
 
@@ -95,11 +95,11 @@
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
         let this = self.project();
 
-        if let Poll::Ready(_) = this.tx.as_mut().unwrap().poll_canceled(cx) {
-            if !this.keep_running.load(Ordering::SeqCst) {
-                // Cancelled, bail out
-                return Poll::Ready(())
-            }
+        if this.tx.as_mut().unwrap().poll_canceled(cx).is_ready()
+            && !this.keep_running.load(Ordering::SeqCst)
+        {
+            // Cancelled, bail out
+            return Poll::Ready(());
         }
 
         let output = ready!(this.future.poll(cx));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/shared.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/shared.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/future/shared.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/future/shared.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,6 +29,12 @@
 /// A weak reference to a [`Shared`] that can be upgraded much like an `Arc`.
 pub struct WeakShared<Fut: Future>(Weak<Inner<Fut>>);
 
+impl<Fut: Future> Clone for WeakShared<Fut> {
+    fn clone(&self) -> Self {
+        Self(self.0.clone())
+    }
+}
+
 // The future itself is polled behind the `Arc`, so it won't be moved
 // when `Shared` is moved.
 impl<Fut: Future> Unpin for Shared<Fut> {}
@@ -90,10 +96,7 @@
             }),
         };
 
-        Self {
-            inner: Some(Arc::new(inner)),
-            waker_key: NULL_WAKER_KEY,
-        }
+        Self { inner: Some(Arc::new(inner)), waker_key: NULL_WAKER_KEY }
     }
 }
 
@@ -126,6 +129,32 @@
         }
         None
     }
+
+    /// Gets the number of strong pointers to this allocation.
+    ///
+    /// Returns [`None`] if it has already been polled to completion.
+    ///
+    /// # Safety
+    ///
+    /// This method by itself is safe, but using it correctly requires extra care. Another thread
+    /// can change the strong count at any time, including potentially between calling this method
+    /// and acting on the result.
+    pub fn strong_count(&self) -> Option<usize> {
+        self.inner.as_ref().map(|arc| Arc::strong_count(arc))
+    }
+
+    /// Gets the number of weak pointers to this allocation.
+    ///
+    /// Returns [`None`] if it has already been polled to completion.
+    ///
+    /// # Safety
+    ///
+    /// This method by itself is safe, but using it correctly requires extra care. Another thread
+    /// can change the weak count at any time, including potentially between calling this method
+    /// and acting on the result.
+    pub fn weak_count(&self) -> Option<usize> {
+        self.inner.as_ref().map(|arc| Arc::weak_count(arc))
+    }
 }
 
 impl<Fut> Inner<Fut>
@@ -197,10 +226,7 @@
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = &mut *self;
 
-        let inner = this
-            .inner
-            .take()
-            .expect("Shared future polled again after completion");
+        let inner = this.inner.take().expect("Shared future polled again after completion");
 
         // Fast path for when the wrapped future has already completed
         if inner.notifier.state.load(Acquire) == COMPLETE {
@@ -210,7 +236,12 @@
 
         inner.record_waker(&mut this.waker_key, cx);
 
-        match inner.notifier.state.compare_and_swap(IDLE, POLLING, SeqCst) {
+        match inner
+            .notifier
+            .state
+            .compare_exchange(IDLE, POLLING, SeqCst, SeqCst)
+            .unwrap_or_else(|x| x)
+        {
             IDLE => {
                 // Lock acquired, fall through
             }
@@ -255,14 +286,14 @@
 
             match future.poll(&mut cx) {
                 Poll::Pending => {
-                    match inner.notifier.state.compare_and_swap(POLLING, IDLE, SeqCst) {
-                        POLLING => {
-                            // Success
-                            drop(_reset);
-                            this.inner = Some(inner);
-                            return Poll::Pending;
-                        }
-                        _ => unreachable!(),
+                    if inner.notifier.state.compare_exchange(POLLING, IDLE, SeqCst, SeqCst).is_ok()
+                    {
+                        // Success
+                        drop(_reset);
+                        this.inner = Some(inner);
+                        return Poll::Pending;
+                    } else {
+                        unreachable!()
                     }
                 }
                 Poll::Ready(output) => output,
@@ -278,10 +309,8 @@
         // Wake all tasks and drop the slab
         let mut wakers_guard = inner.notifier.wakers.lock().unwrap();
         let mut wakers = wakers_guard.take().unwrap();
-        for opt_waker in wakers.drain() {
-            if let Some(waker) = opt_waker {
-                waker.wake();
-            }
+        for waker in wakers.drain().flatten() {
+            waker.wake();
         }
 
         drop(_reset); // Make borrow checker happy
@@ -297,10 +326,7 @@
     Fut: Future,
 {
     fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-            waker_key: NULL_WAKER_KEY,
-        }
+        Self { inner: self.inner.clone(), waker_key: NULL_WAKER_KEY }
     }
 }
 
@@ -334,16 +360,12 @@
     }
 }
 
-impl<Fut: Future> WeakShared<Fut>
-{
+impl<Fut: Future> WeakShared<Fut> {
     /// Attempts to upgrade this [`WeakShared`] into a [`Shared`].
     ///
     /// Returns [`None`] if all clones of the [`Shared`] have been dropped or polled
     /// to completion.
     pub fn upgrade(&self) -> Option<Shared<Fut>> {
-        Some(Shared {
-            inner: Some(self.0.upgrade()?),
-            waker_key: NULL_WAKER_KEY,
-        })
+        Some(Shared { inner: Some(self.0.upgrade()?), waker_key: NULL_WAKER_KEY })
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/join_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/join_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/join_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/join_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,50 @@
 //! Definition of the `JoinAll` combinator, waiting for all of a list of futures
 //! to finish.
 
+use alloc::boxed::Box;
+use alloc::vec::Vec;
 use core::fmt;
 use core::future::Future;
 use core::iter::FromIterator;
 use core::mem;
 use core::pin::Pin;
 use core::task::{Context, Poll};
-use alloc::boxed::Box;
-use alloc::vec::Vec;
 
-use super::MaybeDone;
+use super::{assert_future, MaybeDone};
+
+#[cfg(not(futures_no_atomic_cas))]
+use crate::stream::{Collect, FuturesOrdered, StreamExt};
 
 fn iter_pin_mut<T>(slice: Pin<&mut [T]>) -> impl Iterator<Item = Pin<&mut T>> {
     // Safety: `std` _could_ make this unsound if it were to decide Pin's
     // invariants aren't required to transmit through slices. Otherwise this has
     // the same safety as a normal field pin projection.
-    unsafe { slice.get_unchecked_mut() }
-        .iter_mut()
-        .map(|t| unsafe { Pin::new_unchecked(t) })
+    unsafe { slice.get_unchecked_mut() }.iter_mut().map(|t| unsafe { Pin::new_unchecked(t) })
 }
 
-/// Future for the [`join_all`] function.
 #[must_use = "futures do nothing unless you `.await` or poll them"]
+/// Future for the [`join_all`] function.
 pub struct JoinAll<F>
 where
     F: Future,
 {
-    elems: Pin<Box<[MaybeDone<F>]>>,
+    kind: JoinAllKind<F>,
+}
+
+#[cfg(not(futures_no_atomic_cas))]
+const SMALL: usize = 30;
+
+pub(crate) enum JoinAllKind<F>
+where
+    F: Future,
+{
+    Small {
+        elems: Pin<Box<[MaybeDone<F>]>>,
+    },
+    #[cfg(not(futures_no_atomic_cas))]
+    Big {
+        fut: Collect<FuturesOrdered<F>, Vec<F::Output>>,
+    },
 }
 
 impl<F> fmt::Debug for JoinAll<F>
@@ -36,9 +53,13 @@
     F::Output: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("JoinAll")
-            .field("elems", &self.elems)
-            .finish()
+        match self.kind {
+            JoinAllKind::Small { ref elems } => {
+                f.debug_struct("JoinAll").field("elems", elems).finish()
+            }
+            #[cfg(not(futures_no_atomic_cas))]
+            JoinAllKind::Big { ref fut, .. } => fmt::Debug::fmt(fut, f),
+        }
     }
 }
 
@@ -54,10 +75,9 @@
 ///
 /// # See Also
 ///
-/// This is purposefully a very simple API for basic use-cases. In a lot of
-/// cases you will want to use the more powerful
-/// [`FuturesOrdered`][crate::stream::FuturesOrdered] APIs, or, if order does
-/// not matter, [`FuturesUnordered`][crate::stream::FuturesUnordered].
+/// `join_all` will switch to the more powerful [`FuturesOrdered`] for performance
+/// reasons if the number of futures is large. You may want to look into using it or
+/// it's counterpart [`FuturesUnordered`][crate::stream::FuturesUnordered] directly.
 ///
 /// Some examples for additional functionality provided by these are:
 ///
@@ -79,13 +99,33 @@
 /// assert_eq!(join_all(futures).await, [1, 2, 3]);
 /// # });
 /// ```
-pub fn join_all<I>(i: I) -> JoinAll<I::Item>
+pub fn join_all<I>(iter: I) -> JoinAll<I::Item>
 where
     I: IntoIterator,
     I::Item: Future,
 {
-    let elems: Box<[_]> = i.into_iter().map(MaybeDone::Future).collect();
-    JoinAll { elems: elems.into() }
+    #[cfg(futures_no_atomic_cas)]
+    {
+        let elems = iter.into_iter().map(MaybeDone::Future).collect::<Box<[_]>>().into();
+        let kind = JoinAllKind::Small { elems };
+        assert_future::<Vec<<I::Item as Future>::Output>, _>(JoinAll { kind })
+    }
+    #[cfg(not(futures_no_atomic_cas))]
+    {
+        let iter = iter.into_iter();
+        let kind = match iter.size_hint().1 {
+            None => JoinAllKind::Big { fut: iter.collect::<FuturesOrdered<_>>().collect() },
+            Some(max) => {
+                if max <= SMALL {
+                    let elems = iter.map(MaybeDone::Future).collect::<Box<[_]>>().into();
+                    JoinAllKind::Small { elems }
+                } else {
+                    JoinAllKind::Big { fut: iter.collect::<FuturesOrdered<_>>().collect() }
+                }
+            }
+        };
+        assert_future::<Vec<<I::Item as Future>::Output>, _>(JoinAll { kind })
+    }
 }
 
 impl<F> Future for JoinAll<F>
@@ -95,22 +135,27 @@
     type Output = Vec<F::Output>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut all_done = true;
-
-        for elem in iter_pin_mut(self.elems.as_mut()) {
-            if elem.poll(cx).is_pending() {
-                all_done = false;
+        match &mut self.kind {
+            JoinAllKind::Small { elems } => {
+                let mut all_done = true;
+
+                for elem in iter_pin_mut(elems.as_mut()) {
+                    if elem.poll(cx).is_pending() {
+                        all_done = false;
+                    }
+                }
+
+                if all_done {
+                    let mut elems = mem::replace(elems, Box::pin([]));
+                    let result =
+                        iter_pin_mut(elems.as_mut()).map(|e| e.take_output().unwrap()).collect();
+                    Poll::Ready(result)
+                } else {
+                    Poll::Pending
+                }
             }
-        }
-
-        if all_done {
-            let mut elems = mem::replace(&mut self.elems, Box::pin([]));
-            let result = iter_pin_mut(elems.as_mut())
-                .map(|e| e.take_output().unwrap())
-                .collect();
-            Poll::Ready(result)
-        } else {
-            Poll::Pending
+            #[cfg(not(futures_no_atomic_cas))]
+            JoinAllKind::Big { fut } => Pin::new(fut).poll(cx),
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/join.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/join.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/join.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/join.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,24 +1,24 @@
 #![allow(non_snake_case)]
 
-use crate::future::{MaybeDone, maybe_done};
+use super::assert_future;
+use crate::future::{maybe_done, MaybeDone};
 use core::fmt;
 use core::pin::Pin;
-use futures_core::future::{Future, FusedFuture};
+use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
-
-use super::assert_future;
+use pin_project_lite::pin_project;
 
 macro_rules! generate {
     ($(
         $(#[$doc:meta])*
         ($Join:ident, <$($Fut:ident),*>),
     )*) => ($(
-        $(#[$doc])*
-        #[pin_project]
-        #[must_use = "futures do nothing unless you `.await` or poll them"]
-        pub struct $Join<$($Fut: Future),*> {
-            $(#[pin] $Fut: MaybeDone<$Fut>,)*
+        pin_project! {
+            $(#[$doc])*
+            #[must_use = "futures do nothing unless you `.await` or poll them"]
+            pub struct $Join<$($Fut: Future),*> {
+                $(#[pin] $Fut: MaybeDone<$Fut>,)*
+            }
         }
 
         impl<$($Fut),*> fmt::Debug for $Join<$($Fut),*>
@@ -143,7 +143,8 @@
     Fut2: Future,
     Fut3: Future,
 {
-    Join3::new(future1, future2, future3)
+    let f = Join3::new(future1, future2, future3);
+    assert_future::<(Fut1::Output, Fut2::Output, Fut3::Output), _>(f)
 }
 
 /// Same as [`join`](join()), but with more futures.
@@ -175,7 +176,8 @@
     Fut3: Future,
     Fut4: Future,
 {
-    Join4::new(future1, future2, future3, future4)
+    let f = Join4::new(future1, future2, future3, future4);
+    assert_future::<(Fut1::Output, Fut2::Output, Fut3::Output, Fut4::Output), _>(f)
 }
 
 /// Same as [`join`](join()), but with more futures.
@@ -210,5 +212,6 @@
     Fut4: Future,
     Fut5: Future,
 {
-    Join5::new(future1, future2, future3, future4, future5)
+    let f = Join5::new(future1, future2, future3, future4, future5);
+    assert_future::<(Fut1::Output, Fut2::Output, Fut3::Output, Fut4::Output, Fut5::Output), _>(f)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/lazy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/lazy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/lazy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/lazy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use super::assert_future;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Context, Poll};
@@ -6,7 +7,7 @@
 #[derive(Debug)]
 #[must_use = "futures do nothing unless you `.await` or poll them"]
 pub struct Lazy<F> {
-    f: Option<F>
+    f: Option<F>,
 }
 
 // safe because we never generate `Pin<&mut F>`
@@ -32,19 +33,24 @@
 /// # });
 /// ```
 pub fn lazy<F, R>(f: F) -> Lazy<F>
-    where F: FnOnce(&mut Context<'_>) -> R,
+where
+    F: FnOnce(&mut Context<'_>) -> R,
 {
-    Lazy { f: Some(f) }
+    assert_future::<R, _>(Lazy { f: Some(f) })
 }
 
 impl<F, R> FusedFuture for Lazy<F>
-    where F: FnOnce(&mut Context<'_>) -> R,
+where
+    F: FnOnce(&mut Context<'_>) -> R,
 {
-    fn is_terminated(&self) -> bool { self.f.is_none() }
+    fn is_terminated(&self) -> bool {
+        self.f.is_none()
+    }
 }
 
 impl<F, R> Future for Lazy<F>
-    where F: FnOnce(&mut Context<'_>) -> R,
+where
+    F: FnOnce(&mut Context<'_>) -> R,
 {
     type Output = R;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/maybe_done.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/maybe_done.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/maybe_done.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/maybe_done.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,19 @@
 //! Definition of the MaybeDone combinator
 
+use super::assert_future;
+use core::mem;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
 
 /// A future that may have completed.
 ///
 /// This is created by the [`maybe_done()`] function.
-#[pin_project(project = MaybeDoneProj, project_replace = MaybeDoneProjOwn)]
 #[derive(Debug)]
 pub enum MaybeDone<Fut: Future> {
     /// A not-yet-completed future
-    Future(#[pin] Fut),
+    Future(/* #[pin] */ Fut),
     /// The output of the completed future
     Done(Fut::Output),
     /// The empty variant after the result of a [`MaybeDone`] has been
@@ -20,6 +21,8 @@
     Gone,
 }
 
+impl<Fut: Future + Unpin> Unpin for MaybeDone<Fut> {}
+
 /// Wraps a future into a `MaybeDone`
 ///
 /// # Examples
@@ -38,7 +41,7 @@
 /// # });
 /// ```
 pub fn maybe_done<Fut: Future>(future: Fut) -> MaybeDone<Fut> {
-    MaybeDone::Future(future)
+    assert_future::<(), _>(MaybeDone::Future(future))
 }
 
 impl<Fut: Future> MaybeDone<Fut> {
@@ -48,9 +51,11 @@
     /// has not yet been called.
     #[inline]
     pub fn output_mut(self: Pin<&mut Self>) -> Option<&mut Fut::Output> {
-        match self.project() {
-            MaybeDoneProj::Done(res) => Some(res),
-            _ => None,
+        unsafe {
+            match self.get_unchecked_mut() {
+                MaybeDone::Done(res) => Some(res),
+                _ => None,
+            }
         }
     }
 
@@ -62,9 +67,11 @@
             Self::Done(_) => {}
             Self::Future(_) | Self::Gone => return None,
         }
-        match self.project_replace(Self::Gone) {
-            MaybeDoneProjOwn::Done(output) => Some(output),
-            _ => unreachable!(),
+        unsafe {
+            match mem::replace(self.get_unchecked_mut(), Self::Gone) {
+                MaybeDone::Done(output) => Some(output),
+                _ => unreachable!(),
+            }
         }
     }
 }
@@ -82,13 +89,15 @@
     type Output = ();
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        match self.as_mut().project() {
-            MaybeDoneProj::Future(f) => {
-                let res = ready!(f.poll(cx));
-                self.set(Self::Done(res));
+        unsafe {
+            match self.as_mut().get_unchecked_mut() {
+                MaybeDone::Future(f) => {
+                    let res = ready!(Pin::new_unchecked(f).poll(cx));
+                    self.set(Self::Done(res));
+                }
+                MaybeDone::Done(_) => {}
+                MaybeDone::Gone => panic!("MaybeDone polled after value taken"),
             }
-            MaybeDoneProj::Done(_) => {}
-            MaybeDoneProj::Gone => panic!("MaybeDone polled after value taken"),
         }
         Poll::Ready(())
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,27 @@
-//! Futures
+//! Asynchronous values.
 //!
-//! This module contains a number of functions for working with `Future`s,
-//! including the [`FutureExt`] trait and the [`TryFutureExt`] trait which add
-//! methods to `Future` types.
+//! This module contains:
+//!
+//! - The [`Future`] trait.
+//! - The [`FutureExt`] and [`TryFutureExt`] trait, which provides adapters for
+//!   chaining and composing futures.
+//! - Top-level future combinators like [`lazy`](lazy()) which creates a future
+//!   from a closure that defines its return value, and [`ready`](ready()),
+//!   which constructs a future with an immediate defined value.
+
+#[doc(no_inline)]
+pub use core::future::Future;
 
 #[cfg(feature = "alloc")]
 pub use futures_core::future::{BoxFuture, LocalBoxFuture};
-pub use futures_core::future::{FusedFuture, Future, TryFuture};
+pub use futures_core::future::{FusedFuture, TryFuture};
 pub use futures_task::{FutureObj, LocalFutureObj, UnsafeFutureObj};
 
 // Extension traits and combinators
 #[allow(clippy::module_inception)]
 mod future;
 pub use self::future::{
-    Flatten, Fuse, FutureExt, Inspect, IntoStream, Map, NeverError, Then, UnitError, MapInto,
+    Flatten, Fuse, FutureExt, Inspect, IntoStream, Map, MapInto, NeverError, Then, UnitError,
 };
 
 #[deprecated(note = "This is now an alias for [Flatten](Flatten)")]
@@ -32,8 +40,8 @@
 
 mod try_future;
 pub use self::try_future::{
-    AndThen, ErrInto, OkInto, InspectErr, InspectOk, IntoFuture, MapErr, MapOk, OrElse, TryFlattenStream,
-    TryFutureExt, UnwrapOrElse, MapOkOrElse, TryFlatten,
+    AndThen, ErrInto, InspectErr, InspectOk, IntoFuture, MapErr, MapOk, MapOkOrElse, OkInto,
+    OrElse, TryFlatten, TryFlattenStream, TryFutureExt, UnwrapOrElse,
 };
 
 #[cfg(feature = "sink")]
@@ -60,6 +68,9 @@
 mod poll_fn;
 pub use self::poll_fn::{poll_fn, PollFn};
 
+mod poll_immediate;
+pub use self::poll_immediate::{poll_immediate, PollImmediate};
+
 mod ready;
 pub use self::ready::{err, ok, ready, Ready};
 
@@ -100,12 +111,15 @@
 mod either;
 pub use self::either::Either;
 
-cfg_target_has_atomic! {
-    #[cfg(feature = "alloc")]
-    mod abortable;
-    #[cfg(feature = "alloc")]
-    pub use self::abortable::{abortable, Abortable, AbortHandle, AbortRegistration, Aborted};
-}
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod abortable;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use crate::abortable::{AbortHandle, AbortRegistration, Abortable, Aborted};
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use abortable::abortable;
 
 // Just a helper function to ensure the futures we're returning all have the
 // right implementations.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/option.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/option.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/option.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/option.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,40 +1,47 @@
 //! Definition of the `Option` (optional step) combinator
 
 use core::pin::Pin;
-use futures_core::future::{Future, FusedFuture};
+use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// A future representing a value which may or may not be present.
-///
-/// Created by the [`From`] implementation for [`Option`](std::option::Option).
-///
-/// # Examples
-///
-/// ```
-/// # futures::executor::block_on(async {
-/// use futures::future::OptionFuture;
-///
-/// let mut a: OptionFuture<_> = Some(async { 123 }).into();
-/// assert_eq!(a.await, Some(123));
-///
-/// a = None.into();
-/// assert_eq!(a.await, None);
-/// # });
-/// ```
-#[pin_project]
-#[derive(Debug, Clone)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct OptionFuture<F>(#[pin] Option<F>);
+pin_project! {
+    /// A future representing a value which may or may not be present.
+    ///
+    /// Created by the [`From`] implementation for [`Option`](std::option::Option).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::future::OptionFuture;
+    ///
+    /// let mut a: OptionFuture<_> = Some(async { 123 }).into();
+    /// assert_eq!(a.await, Some(123));
+    ///
+    /// a = None.into();
+    /// assert_eq!(a.await, None);
+    /// # });
+    /// ```
+    #[derive(Debug, Clone)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct OptionFuture<F> {
+        #[pin]
+        inner: Option<F>,
+    }
+}
+
+impl<F> Default for OptionFuture<F> {
+    fn default() -> Self {
+        Self { inner: None }
+    }
+}
 
 impl<F: Future> Future for OptionFuture<F> {
     type Output = Option<F::Output>;
 
-    fn poll(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
-        match self.project().0.as_pin_mut() {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        match self.project().inner.as_pin_mut() {
             Some(x) => x.poll(cx).map(Some),
             None => Poll::Ready(None),
         }
@@ -43,7 +50,7 @@
 
 impl<F: FusedFuture> FusedFuture for OptionFuture<F> {
     fn is_terminated(&self) -> bool {
-        match &self.0 {
+        match &self.inner {
             Some(x) => x.is_terminated(),
             None => true,
         }
@@ -52,6 +59,6 @@
 
 impl<T> From<Option<T>> for OptionFuture<T> {
     fn from(option: Option<T>) -> Self {
-        Self(option)
+        Self { inner: option }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/pending.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/pending.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/pending.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/pending.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use super::assert_future;
 use core::marker;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
@@ -33,9 +34,7 @@
 /// # });
 /// ```
 pub fn pending<T>() -> Pending<T> {
-    Pending {
-        _data: marker::PhantomData,
-    }
+    assert_future::<T, _>(Pending { _data: marker::PhantomData })
 }
 
 impl<T> Future for Pending<T> {
@@ -46,8 +45,7 @@
     }
 }
 
-impl<T> Unpin for Pending<T> {
-}
+impl<T> Unpin for Pending<T> {}
 
 impl<T> Clone for Pending<T> {
     fn clone(&self) -> Self {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/poll_fn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/poll_fn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/poll_fn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/poll_fn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 //! Definition of the `PollFn` adapter combinator
 
+use super::assert_future;
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
@@ -34,9 +35,9 @@
 /// ```
 pub fn poll_fn<T, F>(f: F) -> PollFn<F>
 where
-    F: FnMut(&mut Context<'_>) -> Poll<T>
+    F: FnMut(&mut Context<'_>) -> Poll<T>,
 {
-    PollFn { f }
+    assert_future::<T, _>(PollFn { f })
 }
 
 impl<F> fmt::Debug for PollFn<F> {
@@ -46,7 +47,8 @@
 }
 
 impl<T, F> Future for PollFn<F>
-    where F: FnMut(&mut Context<'_>) -> Poll<T>,
+where
+    F: FnMut(&mut Context<'_>) -> Poll<T>,
 {
     type Output = T;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/poll_immediate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/poll_immediate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/poll_immediate.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/poll_immediate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,126 @@
+use super::assert_future;
+use core::pin::Pin;
+use futures_core::task::{Context, Poll};
+use futures_core::{FusedFuture, Future, Stream};
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// Future for the [`poll_immediate`](poll_immediate()) function.
+    ///
+    /// It will never return [Poll::Pending](core::task::Poll::Pending)
+    #[derive(Debug, Clone)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct PollImmediate<T> {
+        #[pin]
+        future: Option<T>
+    }
+}
+
+impl<T, F> Future for PollImmediate<F>
+where
+    F: Future<Output = T>,
+{
+    type Output = Option<T>;
+
+    #[inline]
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
+        let mut this = self.project();
+        let inner =
+            this.future.as_mut().as_pin_mut().expect("PollImmediate polled after completion");
+        match inner.poll(cx) {
+            Poll::Ready(t) => {
+                this.future.set(None);
+                Poll::Ready(Some(t))
+            }
+            Poll::Pending => Poll::Ready(None),
+        }
+    }
+}
+
+impl<T: Future> FusedFuture for PollImmediate<T> {
+    fn is_terminated(&self) -> bool {
+        self.future.is_none()
+    }
+}
+
+/// A [Stream](crate::stream::Stream) implementation that can be polled repeatedly until the future is done.
+/// The stream will never return [Poll::Pending](core::task::Poll::Pending)
+/// so polling it in a tight loop is worse than using a blocking synchronous function.
+/// ```
+/// # futures::executor::block_on(async {
+/// use futures::task::Poll;
+/// use futures::{StreamExt, future, pin_mut};
+/// use future::FusedFuture;
+///
+/// let f = async { 1_u32 };
+/// pin_mut!(f);
+/// let mut r = future::poll_immediate(f);
+/// assert_eq!(r.next().await, Some(Poll::Ready(1)));
+///
+/// let f = async {futures::pending!(); 42_u8};
+/// pin_mut!(f);
+/// let mut p = future::poll_immediate(f);
+/// assert_eq!(p.next().await, Some(Poll::Pending));
+/// assert!(!p.is_terminated());
+/// assert_eq!(p.next().await, Some(Poll::Ready(42)));
+/// assert!(p.is_terminated());
+/// assert_eq!(p.next().await, None);
+/// # });
+/// ```
+impl<T, F> Stream for PollImmediate<F>
+where
+    F: Future<Output = T>,
+{
+    type Item = Poll<T>;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        let mut this = self.project();
+        match this.future.as_mut().as_pin_mut() {
+            // inner is gone, so we can signal that the stream is closed.
+            None => Poll::Ready(None),
+            Some(fut) => Poll::Ready(Some(fut.poll(cx).map(|t| {
+                this.future.set(None);
+                t
+            }))),
+        }
+    }
+}
+
+/// Creates a future that is immediately ready with an Option of a value.
+/// Specifically this means that [poll](core::future::Future::poll()) always returns [Poll::Ready](core::task::Poll::Ready).
+///
+/// # Caution
+///
+/// When consuming the future by this function, note the following:
+///
+/// - This function does not guarantee that the future will run to completion, so it is generally incompatible with passing the non-cancellation-safe future by value.
+/// - Even if the future is cancellation-safe, creating and dropping new futures frequently may lead to performance problems.
+///
+/// # Examples
+///
+/// ```
+/// # futures::executor::block_on(async {
+/// use futures::future;
+///
+/// let r = future::poll_immediate(async { 1_u32 });
+/// assert_eq!(r.await, Some(1));
+///
+/// let p = future::poll_immediate(future::pending::<i32>());
+/// assert_eq!(p.await, None);
+/// # });
+/// ```
+///
+/// ### Reusing a future
+///
+/// ```
+/// # futures::executor::block_on(async {
+/// use futures::{future, pin_mut};
+/// let f = async {futures::pending!(); 42_u8};
+/// pin_mut!(f);
+/// assert_eq!(None, future::poll_immediate(&mut f).await);
+/// assert_eq!(42, f.await);
+/// # });
+/// ```
+pub fn poll_immediate<F: Future>(f: F) -> PollImmediate<F> {
+    assert_future::<Option<F::Output>, PollImmediate<F>>(PollImmediate { future: Some(f) })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/ready.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/ready.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/ready.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/ready.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use super::assert_future;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Context, Poll};
@@ -45,7 +46,7 @@
 /// # });
 /// ```
 pub fn ready<T>(t: T) -> Ready<T> {
-    Ready(Some(t))
+    assert_future::<T, _>(Ready(Some(t)))
 }
 
 /// Create a future that is immediately ready with a success value.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/select_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/select_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/select_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/select_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
+use super::assert_future;
 use crate::future::FutureExt;
+use alloc::vec::Vec;
 use core::iter::FromIterator;
 use core::mem;
 use core::pin::Pin;
-use alloc::vec::Vec;
 use futures_core::future::Future;
 use futures_core::task::{Context, Poll};
 
@@ -31,25 +32,29 @@
 ///
 /// This function will panic if the iterator specified contains no items.
 pub fn select_all<I>(iter: I) -> SelectAll<I::Item>
-    where I: IntoIterator,
-          I::Item: Future + Unpin,
+where
+    I: IntoIterator,
+    I::Item: Future + Unpin,
 {
-    let ret = SelectAll {
-        inner: iter.into_iter().collect()
-    };
+    let ret = SelectAll { inner: iter.into_iter().collect() };
     assert!(!ret.inner.is_empty());
-    ret
+    assert_future::<(<I::Item as Future>::Output, usize, Vec<I::Item>), _>(ret)
+}
+
+impl<Fut> SelectAll<Fut> {
+    /// Consumes this combinator, returning the underlying futures.
+    pub fn into_inner(self) -> Vec<Fut> {
+        self.inner
+    }
 }
 
 impl<Fut: Future + Unpin> Future for SelectAll<Fut> {
     type Output = (Fut::Output, usize, Vec<Fut>);
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let item = self.inner.iter_mut().enumerate().find_map(|(i, f)| {
-            match f.poll_unpin(cx) {
-                Poll::Pending => None,
-                Poll::Ready(e) => Some((i, e)),
-            }
+        let item = self.inner.iter_mut().enumerate().find_map(|(i, f)| match f.poll_unpin(cx) {
+            Poll::Pending => None,
+            Poll::Ready(e) => Some((i, e)),
         });
         match item {
             Some((idx, res)) => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/select_ok.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/select_ok.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/select_ok.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/select_ok.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
+use super::assert_future;
 use crate::future::TryFutureExt;
+use alloc::vec::Vec;
 use core::iter::FromIterator;
 use core::mem;
 use core::pin::Pin;
-use alloc::vec::Vec;
 use futures_core::future::{Future, TryFuture};
 use futures_core::task::{Context, Poll};
 
@@ -29,14 +30,16 @@
 ///
 /// This function will panic if the iterator specified contains no items.
 pub fn select_ok<I>(iter: I) -> SelectOk<I::Item>
-    where I: IntoIterator,
-          I::Item: TryFuture + Unpin,
+where
+    I: IntoIterator,
+    I::Item: TryFuture + Unpin,
 {
-    let ret = SelectOk {
-        inner: iter.into_iter().collect()
-    };
+    let ret = SelectOk { inner: iter.into_iter().collect() };
     assert!(!ret.inner.is_empty(), "iterator provided to select_ok was empty");
-    ret
+    assert_future::<
+        Result<(<I::Item as TryFuture>::Ok, Vec<I::Item>), <I::Item as TryFuture>::Error>,
+        _,
+    >(ret)
 }
 
 impl<Fut: TryFuture + Unpin> Future for SelectOk<Fut> {
@@ -45,12 +48,11 @@
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         // loop until we've either exhausted all errors, a success was hit, or nothing is ready
         loop {
-            let item = self.inner.iter_mut().enumerate().find_map(|(i, f)| {
-                match f.try_poll_unpin(cx) {
+            let item =
+                self.inner.iter_mut().enumerate().find_map(|(i, f)| match f.try_poll_unpin(cx) {
                     Poll::Pending => None,
                     Poll::Ready(e) => Some((i, e)),
-                }
-            });
+                });
             match item {
                 Some((idx, res)) => {
                     // always remove Ok or Err, if it's not the last Err continue looping
@@ -58,18 +60,18 @@
                     match res {
                         Ok(e) => {
                             let rest = mem::replace(&mut self.inner, Vec::new());
-                            return Poll::Ready(Ok((e, rest)))
+                            return Poll::Ready(Ok((e, rest)));
                         }
                         Err(e) => {
                             if self.inner.is_empty() {
-                                return Poll::Ready(Err(e))
+                                return Poll::Ready(Err(e));
                             }
                         }
                     }
                 }
                 None => {
                     // based on the filter above, nothing is ready, return
-                    return Poll::Pending
+                    return Poll::Pending;
                 }
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/select.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,8 @@
+use super::assert_future;
+use crate::future::{Either, FutureExt};
 use core::pin::Pin;
-use futures_core::future::{Future, FusedFuture};
+use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Context, Poll};
-use crate::future::{Either, FutureExt};
 
 /// Future for the [`select()`] function.
 #[must_use = "futures do nothing unless you `.await` or poll them"]
@@ -31,25 +32,33 @@
 ///
 /// ```
 /// # futures::executor::block_on(async {
-/// use futures::future::{self, Either};
-/// use futures::pin_mut;
+/// use futures::{
+///     pin_mut,
+///     future::Either,
+///     future::self,
+/// };
 ///
-/// // These two futures have different types even though their outputs have the same type
-/// let future1 = async { 1 };
-/// let future2 = async { 2 };
+/// // These two futures have different types even though their outputs have the same type.
+/// let future1 = async {
+///     future::pending::<()>().await; // will never finish
+///     1
+/// };
+/// let future2 = async {
+///     future::ready(2).await
+/// };
 ///
 /// // 'select' requires Future + Unpin bounds
 /// pin_mut!(future1);
 /// pin_mut!(future2);
 ///
 /// let value = match future::select(future1, future2).await {
-///     Either::Left((value1, _)) => value1, // `value1` is resolved from `future1`
-///                                          // `_` represents `future2`
+///     Either::Left((value1, _)) => value1,  // `value1` is resolved from `future1`
+///                                           // `_` represents `future2`
 ///     Either::Right((value2, _)) => value2, // `value2` is resolved from `future2`
 ///                                           // `_` represents `future1`
 /// };
 ///
-/// assert!(value == 1 || value == 2);
+/// assert!(value == 2);
 /// # });
 /// ```
 ///
@@ -73,9 +82,13 @@
 /// }
 /// ```
 pub fn select<A, B>(future1: A, future2: B) -> Select<A, B>
-    where A: Future + Unpin, B: Future + Unpin
+where
+    A: Future + Unpin,
+    B: Future + Unpin,
 {
-    Select { inner: Some((future1, future2)) }
+    assert_future::<Either<(A::Output, B), (B::Output, A)>, _>(Select {
+        inner: Some((future1, future2)),
+    })
 }
 
 impl<A, B> Future for Select<A, B>
@@ -95,7 +108,7 @@
                     self.inner = Some((a, b));
                     Poll::Pending
                 }
-            }
+            },
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_future/into_future.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_future/into_future.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_future/into_future.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_future/into_future.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,36 @@
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future, TryFuture};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`into_future`](super::TryFutureExt::into_future) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct IntoFuture<Fut>(#[pin] Fut);
+pin_project! {
+    /// Future for the [`into_future`](super::TryFutureExt::into_future) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct IntoFuture<Fut> {
+        #[pin]
+        future: Fut,
+    }
+}
 
 impl<Fut> IntoFuture<Fut> {
     #[inline]
     pub(crate) fn new(future: Fut) -> Self {
-        Self(future)
+        Self { future }
     }
 }
 
 impl<Fut: TryFuture + FusedFuture> FusedFuture for IntoFuture<Fut> {
-    fn is_terminated(&self) -> bool { self.0.is_terminated() }
+    fn is_terminated(&self) -> bool {
+        self.future.is_terminated()
+    }
 }
 
 impl<Fut: TryFuture> Future for IntoFuture<Fut> {
     type Output = Result<Fut::Ok, Fut::Error>;
 
     #[inline]
-    fn poll(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
-        self.project().0.try_poll(cx)
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        self.project().future.try_poll(cx)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_future/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_future/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_future/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_future/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -173,7 +173,7 @@
         Self::Ok: Sink<Item, Error = Self::Error>,
         Self: Sized,
     {
-        FlattenSink::new(self)
+        crate::sink::assert_sink::<Item, Self::Error, _>(FlattenSink::new(self))
     }
 
     /// Maps this future's success value to a different value.
@@ -501,7 +501,7 @@
         Self::Ok: TryFuture<Error = Self::Error>,
         Self: Sized,
     {
-        TryFlatten::new(self)
+        assert_future::<Result<<Self::Ok as TryFuture>::Ok, Self::Error>, _>(TryFlatten::new(self))
     }
 
     /// Flatten the execution of this future when the successful result of this
@@ -539,7 +539,7 @@
         ))
     }
 
-    /// Unwraps this future's ouput, producing a future with this future's
+    /// Unwraps this future's output, producing a future with this future's
     /// [`Ok`](TryFuture::Ok) type as its
     /// [`Output`](std::future::Future::Output) type.
     ///
@@ -569,8 +569,8 @@
         assert_future::<Self::Ok, _>(UnwrapOrElse::new(self, f))
     }
 
-    /// Wraps a [`TryFuture`] into a future compatable with libraries using
-    /// futures 0.1 future definitons. Requires the `compat` feature to enable.
+    /// Wraps a [`TryFuture`] into a future compatible with libraries using
+    /// futures 0.1 future definitions. Requires the `compat` feature to enable.
     #[cfg(feature = "compat")]
     #[cfg_attr(docsrs, doc(cfg(feature = "compat")))]
     fn compat(self) -> Compat<Self>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_future/try_flatten_err.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_future/try_flatten_err.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_future/try_flatten_err.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_future/try_flatten_err.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,29 @@
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future, TryFuture};
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-#[pin_project(project = TryFlattenErrProj)]
-#[derive(Debug)]
-pub enum TryFlattenErr<Fut1, Fut2> {
-    First(#[pin] Fut1),
-    Second(#[pin] Fut2),
-    Empty,
+pin_project! {
+    #[project = TryFlattenErrProj]
+    #[derive(Debug)]
+    pub enum TryFlattenErr<Fut1, Fut2> {
+        First { #[pin] f: Fut1 },
+        Second { #[pin] f: Fut2 },
+        Empty,
+    }
 }
 
 impl<Fut1, Fut2> TryFlattenErr<Fut1, Fut2> {
     pub(crate) fn new(future: Fut1) -> Self {
-        Self::First(future)
+        Self::First { f: future }
     }
 }
 
 impl<Fut> FusedFuture for TryFlattenErr<Fut, Fut::Error>
-    where Fut: TryFuture,
-          Fut::Error: TryFuture<Ok=Fut::Ok>,
+where
+    Fut: TryFuture,
+    Fut::Error: TryFuture<Ok = Fut::Ok>,
 {
     fn is_terminated(&self) -> bool {
         match self {
@@ -30,28 +34,27 @@
 }
 
 impl<Fut> Future for TryFlattenErr<Fut, Fut::Error>
-    where Fut: TryFuture,
-          Fut::Error: TryFuture<Ok=Fut::Ok>,
+where
+    Fut: TryFuture,
+    Fut::Error: TryFuture<Ok = Fut::Ok>,
 {
     type Output = Result<Fut::Ok, <Fut::Error as TryFuture>::Error>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         Poll::Ready(loop {
             match self.as_mut().project() {
-                TryFlattenErrProj::First(f) => {
-                    match ready!(f.try_poll(cx)) {
-                        Err(f) => self.set(Self::Second(f)),
-                        Ok(e) => {
-                            self.set(Self::Empty);
-                            break Ok(e);
-                        }
+                TryFlattenErrProj::First { f } => match ready!(f.try_poll(cx)) {
+                    Err(f) => self.set(Self::Second { f }),
+                    Ok(e) => {
+                        self.set(Self::Empty);
+                        break Ok(e);
                     }
                 },
-                TryFlattenErrProj::Second(f) => {
+                TryFlattenErrProj::Second { f } => {
                     let output = ready!(f.try_poll(cx));
                     self.set(Self::Empty);
                     break output;
-                },
+                }
                 TryFlattenErrProj::Empty => panic!("TryFlattenErr polled after completion"),
             }
         })
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_future/try_flatten.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_future/try_flatten.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_future/try_flatten.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_future/try_flatten.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,28 +1,32 @@
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future, TryFuture};
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream, TryStream};
+use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-#[pin_project(project = TryFlattenProj)]
-#[derive(Debug)]
-pub enum TryFlatten<Fut1, Fut2> {
-    First(#[pin] Fut1),
-    Second(#[pin] Fut2),
-    Empty,
+pin_project! {
+    #[project = TryFlattenProj]
+    #[derive(Debug)]
+    pub enum TryFlatten<Fut1, Fut2> {
+        First { #[pin] f: Fut1 },
+        Second { #[pin] f: Fut2 },
+        Empty,
+    }
 }
 
 impl<Fut1, Fut2> TryFlatten<Fut1, Fut2> {
     pub(crate) fn new(future: Fut1) -> Self {
-        Self::First(future)
+        Self::First { f: future }
     }
 }
 
 impl<Fut> FusedFuture for TryFlatten<Fut, Fut::Ok>
-    where Fut: TryFuture,
-          Fut::Ok: TryFuture<Error=Fut::Error>,
+where
+    Fut: TryFuture,
+    Fut::Ok: TryFuture<Error = Fut::Error>,
 {
     fn is_terminated(&self) -> bool {
         match self {
@@ -33,28 +37,27 @@
 }
 
 impl<Fut> Future for TryFlatten<Fut, Fut::Ok>
-    where Fut: TryFuture,
-          Fut::Ok: TryFuture<Error=Fut::Error>,
+where
+    Fut: TryFuture,
+    Fut::Ok: TryFuture<Error = Fut::Error>,
 {
     type Output = Result<<Fut::Ok as TryFuture>::Ok, Fut::Error>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         Poll::Ready(loop {
             match self.as_mut().project() {
-                TryFlattenProj::First(f) => {
-                    match ready!(f.try_poll(cx)) {
-                        Ok(f) => self.set(Self::Second(f)),
-                        Err(e) => {
-                            self.set(Self::Empty);
-                            break Err(e);
-                        }
+                TryFlattenProj::First { f } => match ready!(f.try_poll(cx)) {
+                    Ok(f) => self.set(Self::Second { f }),
+                    Err(e) => {
+                        self.set(Self::Empty);
+                        break Err(e);
                     }
                 },
-                TryFlattenProj::Second(f) => {
+                TryFlattenProj::Second { f } => {
                     let output = ready!(f.try_poll(cx));
                     self.set(Self::Empty);
                     break output;
-                },
+                }
                 TryFlattenProj::Empty => panic!("TryFlatten polled after completion"),
             }
         })
@@ -62,8 +65,9 @@
 }
 
 impl<Fut> FusedStream for TryFlatten<Fut, Fut::Ok>
-    where Fut: TryFuture,
-          Fut::Ok: TryStream<Error=Fut::Error>,
+where
+    Fut: TryFuture,
+    Fut::Ok: TryStream<Error = Fut::Error>,
 {
     fn is_terminated(&self) -> bool {
         match self {
@@ -74,63 +78,56 @@
 }
 
 impl<Fut> Stream for TryFlatten<Fut, Fut::Ok>
-    where Fut: TryFuture,
-          Fut::Ok: TryStream<Error=Fut::Error>,
+where
+    Fut: TryFuture,
+    Fut::Ok: TryStream<Error = Fut::Error>,
 {
     type Item = Result<<Fut::Ok as TryStream>::Ok, Fut::Error>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         Poll::Ready(loop {
             match self.as_mut().project() {
-                TryFlattenProj::First(f) => {
-                    match ready!(f.try_poll(cx)) {
-                        Ok(f) => self.set(Self::Second(f)),
-                        Err(e) => {
-                            self.set(Self::Empty);
-                            break Some(Err(e));
-                        }
+                TryFlattenProj::First { f } => match ready!(f.try_poll(cx)) {
+                    Ok(f) => self.set(Self::Second { f }),
+                    Err(e) => {
+                        self.set(Self::Empty);
+                        break Some(Err(e));
                     }
                 },
-                TryFlattenProj::Second(f) => {
+                TryFlattenProj::Second { f } => {
                     let output = ready!(f.try_poll_next(cx));
                     if output.is_none() {
                         self.set(Self::Empty);
                     }
                     break output;
-                },
+                }
                 TryFlattenProj::Empty => break None,
             }
         })
     }
 }
 
-
 #[cfg(feature = "sink")]
 impl<Fut, Item> Sink<Item> for TryFlatten<Fut, Fut::Ok>
 where
     Fut: TryFuture,
-    Fut::Ok: Sink<Item, Error=Fut::Error>,
+    Fut::Ok: Sink<Item, Error = Fut::Error>,
 {
     type Error = Fut::Error;
 
-    fn poll_ready(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(loop {
             match self.as_mut().project() {
-                TryFlattenProj::First(f) => {
-                    match ready!(f.try_poll(cx)) {
-                        Ok(f) => self.set(Self::Second(f)),
-                        Err(e) => {
-                            self.set(Self::Empty);
-                            break Err(e);
-                        }
+                TryFlattenProj::First { f } => match ready!(f.try_poll(cx)) {
+                    Ok(f) => self.set(Self::Second { f }),
+                    Err(e) => {
+                        self.set(Self::Empty);
+                        break Err(e);
                     }
                 },
-                TryFlattenProj::Second(f) => {
+                TryFlattenProj::Second { f } => {
                     break ready!(f.poll_ready(cx));
-                },
+                }
                 TryFlattenProj::Empty => panic!("poll_ready called after eof"),
             }
         })
@@ -138,26 +135,23 @@
 
     fn start_send(self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
         match self.project() {
-            TryFlattenProj::First(_) => panic!("poll_ready not called first"),
-            TryFlattenProj::Second(f) => f.start_send(item),
+            TryFlattenProj::First { .. } => panic!("poll_ready not called first"),
+            TryFlattenProj::Second { f } => f.start_send(item),
             TryFlattenProj::Empty => panic!("start_send called after eof"),
         }
     }
 
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         match self.project() {
-            TryFlattenProj::First(_) => Poll::Ready(Ok(())),
-            TryFlattenProj::Second(f) => f.poll_flush(cx),
+            TryFlattenProj::First { .. } => Poll::Ready(Ok(())),
+            TryFlattenProj::Second { f } => f.poll_flush(cx),
             TryFlattenProj::Empty => panic!("poll_flush called after eof"),
         }
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         let res = match self.as_mut().project() {
-            TryFlattenProj::Second(f) => f.poll_close(cx),
+            TryFlattenProj::Second { f } => f.poll_close(cx),
             _ => Poll::Ready(Ok(())),
         };
         if res.is_ready() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_join_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_join_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_join_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_join_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,28 @@
 //! Definition of the `TryJoinAll` combinator, waiting for all of a list of
 //! futures to finish with either success or error.
 
+use alloc::boxed::Box;
+use alloc::vec::Vec;
 use core::fmt;
 use core::future::Future;
 use core::iter::FromIterator;
 use core::mem;
 use core::pin::Pin;
 use core::task::{Context, Poll};
-use alloc::boxed::Box;
-use alloc::vec::Vec;
 
-use super::{TryFuture, TryMaybeDone};
+use super::{assert_future, TryFuture, TryMaybeDone};
 
 fn iter_pin_mut<T>(slice: Pin<&mut [T]>) -> impl Iterator<Item = Pin<&mut T>> {
     // Safety: `std` _could_ make this unsound if it were to decide Pin's
     // invariants aren't required to transmit through slices. Otherwise this has
     // the same safety as a normal field pin projection.
-    unsafe { slice.get_unchecked_mut() }
-        .iter_mut()
-        .map(|t| unsafe { Pin::new_unchecked(t) })
+    unsafe { slice.get_unchecked_mut() }.iter_mut().map(|t| unsafe { Pin::new_unchecked(t) })
 }
 
 enum FinalState<E = ()> {
     Pending,
     AllDone,
-    Error(E)
+    Error(E),
 }
 
 /// Future for the [`try_join_all`] function.
@@ -43,9 +41,7 @@
     F::Error: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TryJoinAll")
-            .field("elems", &self.elems)
-            .finish()
+        f.debug_struct("TryJoinAll").field("elems", &self.elems).finish()
     }
 }
 
@@ -93,9 +89,9 @@
     I::Item: TryFuture,
 {
     let elems: Box<[_]> = i.into_iter().map(TryMaybeDone::Future).collect();
-    TryJoinAll {
-        elems: elems.into(),
-    }
+    assert_future::<Result<Vec<<I::Item as TryFuture>::Ok>, <I::Item as TryFuture>::Error>, _>(
+        TryJoinAll { elems: elems.into() },
+    )
 }
 
 impl<F> Future for TryJoinAll<F>
@@ -110,7 +106,7 @@
         for elem in iter_pin_mut(self.elems.as_mut()) {
             match elem.try_poll(cx) {
                 Poll::Pending => state = FinalState::Pending,
-                Poll::Ready(Ok(())) => {},
+                Poll::Ready(Ok(())) => {}
                 Poll::Ready(Err(e)) => {
                     state = FinalState::Error(e);
                     break;
@@ -122,15 +118,14 @@
             FinalState::Pending => Poll::Pending,
             FinalState::AllDone => {
                 let mut elems = mem::replace(&mut self.elems, Box::pin([]));
-                let results = iter_pin_mut(elems.as_mut())
-                    .map(|e| e.take_output().unwrap())
-                    .collect();
+                let results =
+                    iter_pin_mut(elems.as_mut()).map(|e| e.take_output().unwrap()).collect();
                 Poll::Ready(Ok(results))
-            },
+            }
             FinalState::Error(e) => {
                 let _ = mem::replace(&mut self.elems, Box::pin([]));
                 Poll::Ready(Err(e))
-            },
+            }
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_join.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_join.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_join.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_join.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,23 +1,24 @@
 #![allow(non_snake_case)]
 
-use crate::future::{TryMaybeDone, try_maybe_done};
+use crate::future::{assert_future, try_maybe_done, TryMaybeDone};
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::{Future, TryFuture};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 macro_rules! generate {
     ($(
         $(#[$doc:meta])*
         ($Join:ident, <Fut1, $($Fut:ident),*>),
     )*) => ($(
-        $(#[$doc])*
-        #[pin_project]
-        #[must_use = "futures do nothing unless you `.await` or poll them"]
-        pub struct $Join<Fut1: TryFuture, $($Fut: TryFuture),*> {
-            #[pin] Fut1: TryMaybeDone<Fut1>,
-            $(#[pin] $Fut: TryMaybeDone<$Fut>,)*
+        pin_project! {
+            $(#[$doc])*
+            #[must_use = "futures do nothing unless you `.await` or poll them"]
+            pub struct $Join<Fut1: TryFuture, $($Fut: TryFuture),*> {
+                #[pin] Fut1: TryMaybeDone<Fut1>,
+                $(#[pin] $Fut: TryMaybeDone<$Fut>,)*
+            }
         }
 
         impl<Fut1, $($Fut),*> fmt::Debug for $Join<Fut1, $($Fut),*>
@@ -107,7 +108,7 @@
 ///
 /// This function will return a new future which awaits both futures to
 /// complete. If successful, the returned future will finish with a tuple of
-/// both results. If unsuccesful, it will complete with the first error
+/// both results. If unsuccessful, it will complete with the first error
 /// encountered.
 ///
 /// Note that this function consumes the passed futures and returns a
@@ -149,7 +150,7 @@
     Fut1: TryFuture,
     Fut2: TryFuture<Error = Fut1::Error>,
 {
-    TryJoin::new(future1, future2)
+    assert_future::<Result<(Fut1::Ok, Fut2::Ok), Fut1::Error>, _>(TryJoin::new(future1, future2))
 }
 
 /// Same as [`try_join`](try_join()), but with more futures.
@@ -178,7 +179,9 @@
     Fut2: TryFuture<Error = Fut1::Error>,
     Fut3: TryFuture<Error = Fut1::Error>,
 {
-    TryJoin3::new(future1, future2, future3)
+    assert_future::<Result<(Fut1::Ok, Fut2::Ok, Fut3::Ok), Fut1::Error>, _>(TryJoin3::new(
+        future1, future2, future3,
+    ))
 }
 
 /// Same as [`try_join`](try_join()), but with more futures.
@@ -210,7 +213,9 @@
     Fut3: TryFuture<Error = Fut1::Error>,
     Fut4: TryFuture<Error = Fut1::Error>,
 {
-    TryJoin4::new(future1, future2, future3, future4)
+    assert_future::<Result<(Fut1::Ok, Fut2::Ok, Fut3::Ok, Fut4::Ok), Fut1::Error>, _>(
+        TryJoin4::new(future1, future2, future3, future4),
+    )
 }
 
 /// Same as [`try_join`](try_join()), but with more futures.
@@ -245,5 +250,7 @@
     Fut4: TryFuture<Error = Fut1::Error>,
     Fut5: TryFuture<Error = Fut1::Error>,
 {
-    TryJoin5::new(future1, future2, future3, future4, future5)
+    assert_future::<Result<(Fut1::Ok, Fut2::Ok, Fut3::Ok, Fut4::Ok, Fut5::Ok), Fut1::Error>, _>(
+        TryJoin5::new(future1, future2, future3, future4, future5),
+    )
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_maybe_done.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_maybe_done.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_maybe_done.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_maybe_done.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,19 @@
 //! Definition of the TryMaybeDone combinator
 
+use super::assert_future;
+use core::mem;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future, TryFuture};
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
 
 /// A future that may have completed with an error.
 ///
 /// This is created by the [`try_maybe_done()`] function.
-#[pin_project(project = TryMaybeDoneProj, project_replace = TryMaybeDoneProjOwn)]
 #[derive(Debug)]
 pub enum TryMaybeDone<Fut: TryFuture> {
     /// A not-yet-completed future
-    Future(#[pin] Fut),
+    Future(/* #[pin] */ Fut),
     /// The output of the completed future
     Done(Fut::Ok),
     /// The empty variant after the result of a [`TryMaybeDone`] has been
@@ -21,9 +22,11 @@
     Gone,
 }
 
+impl<Fut: TryFuture + Unpin> Unpin for TryMaybeDone<Fut> {}
+
 /// Wraps a future into a `TryMaybeDone`
 pub fn try_maybe_done<Fut: TryFuture>(future: Fut) -> TryMaybeDone<Fut> {
-    TryMaybeDone::Future(future)
+    assert_future::<Result<(), Fut::Error>, _>(TryMaybeDone::Future(future))
 }
 
 impl<Fut: TryFuture> TryMaybeDone<Fut> {
@@ -33,9 +36,11 @@
     /// has not yet been called.
     #[inline]
     pub fn output_mut(self: Pin<&mut Self>) -> Option<&mut Fut::Ok> {
-        match self.project() {
-            TryMaybeDoneProj::Done(res) => Some(res),
-            _ => None,
+        unsafe {
+            match self.get_unchecked_mut() {
+                TryMaybeDone::Done(res) => Some(res),
+                _ => None,
+            }
         }
     }
 
@@ -44,12 +49,14 @@
     #[inline]
     pub fn take_output(self: Pin<&mut Self>) -> Option<Fut::Ok> {
         match &*self {
-            Self::Done(_) => {},
+            Self::Done(_) => {}
             Self::Future(_) | Self::Gone => return None,
         }
-        match self.project_replace(Self::Gone) {
-            TryMaybeDoneProjOwn::Done(output) => Some(output),
-            _ => unreachable!()
+        unsafe {
+            match mem::replace(self.get_unchecked_mut(), Self::Gone) {
+                TryMaybeDone::Done(output) => Some(output),
+                _ => unreachable!(),
+            }
         }
     }
 }
@@ -67,18 +74,18 @@
     type Output = Result<(), Fut::Error>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        match self.as_mut().project() {
-            TryMaybeDoneProj::Future(f) => {
-                match ready!(f.try_poll(cx)) {
+        unsafe {
+            match self.as_mut().get_unchecked_mut() {
+                TryMaybeDone::Future(f) => match ready!(Pin::new_unchecked(f).try_poll(cx)) {
                     Ok(res) => self.set(Self::Done(res)),
                     Err(e) => {
                         self.set(Self::Gone);
                         return Poll::Ready(Err(e));
                     }
-                }
-            },
-            TryMaybeDoneProj::Done(_) => {},
-            TryMaybeDoneProj::Gone => panic!("TryMaybeDone polled after value taken"),
+                },
+                TryMaybeDone::Done(_) => {}
+                TryMaybeDone::Gone => panic!("TryMaybeDone polled after value taken"),
+            }
         }
         Poll::Ready(Ok(()))
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/future/try_select.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/future/try_select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
+use crate::future::{Either, TryFutureExt};
 use core::pin::Pin;
 use futures_core::future::{Future, TryFuture};
 use futures_core::task::{Context, Poll};
-use crate::future::{Either, TryFutureExt};
 
 /// Future for the [`try_select()`] function.
 #[must_use = "futures do nothing unless you `.await` or poll them"]
@@ -48,19 +48,23 @@
 /// }
 /// ```
 pub fn try_select<A, B>(future1: A, future2: B) -> TrySelect<A, B>
-    where A: TryFuture + Unpin, B: TryFuture + Unpin
+where
+    A: TryFuture + Unpin,
+    B: TryFuture + Unpin,
 {
-    TrySelect { inner: Some((future1, future2)) }
+    super::assert_future::<
+        Result<Either<(A::Ok, B), (B::Ok, A)>, Either<(A::Error, B), (B::Error, A)>>,
+        _,
+    >(TrySelect { inner: Some((future1, future2)) })
 }
 
 impl<A: Unpin, B: Unpin> Future for TrySelect<A, B>
-    where A: TryFuture, B: TryFuture
+where
+    A: TryFuture,
+    B: TryFuture,
 {
     #[allow(clippy::type_complexity)]
-    type Output = Result<
-        Either<(A::Ok, B), (B::Ok, A)>,
-        Either<(A::Error, B), (B::Error, A)>,
-    >;
+    type Output = Result<Either<(A::Ok, B), (B::Ok, A)>, Either<(A::Error, B), (B::Error, A)>>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let (mut a, mut b) = self.inner.take().expect("cannot poll Select twice");
@@ -74,7 +78,7 @@
                     self.inner = Some((a, b));
                     Poll::Pending
                 }
-            }
+            },
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/allow_std.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/allow_std.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/allow_std.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/allow_std.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,9 @@
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "read-initializer")]
 use futures_io::Initializer;
-use futures_io::{AsyncRead, AsyncWrite, AsyncSeek, AsyncBufRead, IoSlice, IoSliceMut, SeekFrom};
-use std::{fmt, io};
+use futures_io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite, IoSlice, IoSliceMut, SeekFrom};
 use std::pin::Pin;
+use std::{fmt, io};
 
 /// A simple wrapper type which allows types which implement only
 /// implement `std::io::Read` or `std::io::Write`
@@ -35,7 +35,7 @@
                 }
             }
         }
-    }
+    };
 }
 
 impl<T> AllowStdIo<T> {
@@ -60,7 +60,10 @@
     }
 }
 
-impl<T> io::Write for AllowStdIo<T> where T: io::Write {
+impl<T> io::Write for AllowStdIo<T>
+where
+    T: io::Write,
+{
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         self.0.write(buf)
     }
@@ -78,16 +81,23 @@
     }
 }
 
-impl<T> AsyncWrite for AllowStdIo<T> where T: io::Write {
-    fn poll_write(mut self: Pin<&mut Self>, _: &mut Context<'_>, buf: &[u8])
-        -> Poll<io::Result<usize>>
-    {
+impl<T> AsyncWrite for AllowStdIo<T>
+where
+    T: io::Write,
+{
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
         Poll::Ready(Ok(try_with_interrupt!(self.0.write(buf))))
     }
 
-    fn poll_write_vectored(mut self: Pin<&mut Self>, _: &mut Context<'_>, bufs: &[IoSlice<'_>])
-        -> Poll<io::Result<usize>>
-    {
+    fn poll_write_vectored(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
         Poll::Ready(Ok(try_with_interrupt!(self.0.write_vectored(bufs))))
     }
 
@@ -101,7 +111,10 @@
     }
 }
 
-impl<T> io::Read for AllowStdIo<T> where T: io::Read {
+impl<T> io::Read for AllowStdIo<T>
+where
+    T: io::Read,
+{
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         self.0.read(buf)
     }
@@ -123,16 +136,23 @@
     }
 }
 
-impl<T> AsyncRead for AllowStdIo<T> where T: io::Read {
-    fn poll_read(mut self: Pin<&mut Self>, _: &mut Context<'_>, buf: &mut [u8])
-        -> Poll<io::Result<usize>>
-    {
+impl<T> AsyncRead for AllowStdIo<T>
+where
+    T: io::Read,
+{
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        buf: &mut [u8],
+    ) -> Poll<io::Result<usize>> {
         Poll::Ready(Ok(try_with_interrupt!(self.0.read(buf))))
     }
 
-    fn poll_read_vectored(mut self: Pin<&mut Self>, _: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
-        -> Poll<io::Result<usize>>
-    {
+    fn poll_read_vectored(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        bufs: &mut [IoSliceMut<'_>],
+    ) -> Poll<io::Result<usize>> {
         Poll::Ready(Ok(try_with_interrupt!(self.0.read_vectored(bufs))))
     }
 
@@ -142,21 +162,32 @@
     }
 }
 
-impl<T> io::Seek for AllowStdIo<T> where T: io::Seek {
+impl<T> io::Seek for AllowStdIo<T>
+where
+    T: io::Seek,
+{
     fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
         self.0.seek(pos)
     }
 }
 
-impl<T> AsyncSeek for AllowStdIo<T> where T: io::Seek {
-    fn poll_seek(mut self: Pin<&mut Self>, _: &mut Context<'_>, pos: SeekFrom)
-        -> Poll<io::Result<u64>>
-    {
+impl<T> AsyncSeek for AllowStdIo<T>
+where
+    T: io::Seek,
+{
+    fn poll_seek(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        pos: SeekFrom,
+    ) -> Poll<io::Result<u64>> {
         Poll::Ready(Ok(try_with_interrupt!(self.0.seek(pos))))
     }
 }
 
-impl<T> io::BufRead for AllowStdIo<T> where T: io::BufRead {
+impl<T> io::BufRead for AllowStdIo<T>
+where
+    T: io::BufRead,
+{
     fn fill_buf(&mut self) -> io::Result<&[u8]> {
         self.0.fill_buf()
     }
@@ -165,10 +196,11 @@
     }
 }
 
-impl<T> AsyncBufRead for AllowStdIo<T> where T: io::BufRead {
-    fn poll_fill_buf(mut self: Pin<&mut Self>, _: &mut Context<'_>)
-        -> Poll<io::Result<&[u8]>>
-    {
+impl<T> AsyncBufRead for AllowStdIo<T>
+where
+    T: io::BufRead,
+{
+    fn poll_fill_buf(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
         let this: *mut Self = &mut *self as *mut _;
         Poll::Ready(Ok(try_with_interrupt!(unsafe { &mut *this }.0.fill_buf())))
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/buf_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/buf_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/buf_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/buf_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,39 +1,42 @@
+use super::DEFAULT_BUF_SIZE;
+use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "read-initializer")]
 use futures_io::Initializer;
 use futures_io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite, IoSliceMut, SeekFrom};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use std::io::{self, Read};
 use std::pin::Pin;
 use std::{cmp, fmt};
-use super::DEFAULT_BUF_SIZE;
 
-/// The `BufReader` struct adds buffering to any reader.
-///
-/// It can be excessively inefficient to work directly with a [`AsyncRead`]
-/// instance. A `BufReader` performs large, infrequent reads on the underlying
-/// [`AsyncRead`] and maintains an in-memory buffer of the results.
-///
-/// `BufReader` can improve the speed of programs that make *small* and
-/// *repeated* read calls to the same file or network socket. It does not
-/// help when reading very large amounts at once, or reading just one or a few
-/// times. It also provides no advantage when reading from a source that is
-/// already in memory, like a `Vec<u8>`.
-///
-/// When the `BufReader` is dropped, the contents of its buffer will be
-/// discarded. Creating multiple instances of a `BufReader` on the same
-/// stream can cause data loss.
-///
-/// [`AsyncRead`]: futures_io::AsyncRead
-///
-// TODO: Examples
-#[pin_project]
-pub struct BufReader<R> {
-    #[pin]
-    inner: R,
-    buffer: Box<[u8]>,
-    pos: usize,
-    cap: usize,
+pin_project! {
+    /// The `BufReader` struct adds buffering to any reader.
+    ///
+    /// It can be excessively inefficient to work directly with a [`AsyncRead`]
+    /// instance. A `BufReader` performs large, infrequent reads on the underlying
+    /// [`AsyncRead`] and maintains an in-memory buffer of the results.
+    ///
+    /// `BufReader` can improve the speed of programs that make *small* and
+    /// *repeated* read calls to the same file or network socket. It does not
+    /// help when reading very large amounts at once, or reading just one or a few
+    /// times. It also provides no advantage when reading from a source that is
+    /// already in memory, like a `Vec<u8>`.
+    ///
+    /// When the `BufReader` is dropped, the contents of its buffer will be
+    /// discarded. Creating multiple instances of a `BufReader` on the same
+    /// stream can cause data loss.
+    ///
+    /// [`AsyncRead`]: futures_io::AsyncRead
+    ///
+    // TODO: Examples
+    pub struct BufReader<R> {
+        #[pin]
+        inner: R,
+        buffer: Box<[u8]>,
+        pos: usize,
+        cap: usize,
+    }
 }
 
 impl<R: AsyncRead> BufReader<R> {
@@ -49,12 +52,7 @@
             let mut buffer = Vec::with_capacity(capacity);
             buffer.set_len(capacity);
             super::initialize(&inner, &mut buffer);
-            Self {
-                inner,
-                buffer: buffer.into_boxed_slice(),
-                pos: 0,
-                cap: 0,
-            }
+            Self { inner, buffer: buffer.into_boxed_slice(), pos: 0, cap: 0 }
         }
     }
 
@@ -76,6 +74,40 @@
     }
 }
 
+impl<R: AsyncRead + AsyncSeek> BufReader<R> {
+    /// Seeks relative to the current position. If the new position lies within the buffer,
+    /// the buffer will not be flushed, allowing for more efficient seeks.
+    /// This method does not return the location of the underlying reader, so the caller
+    /// must track this information themselves if it is required.
+    pub fn seek_relative(self: Pin<&mut Self>, offset: i64) -> SeeKRelative<'_, R> {
+        SeeKRelative { inner: self, offset, first: true }
+    }
+
+    /// Attempts to seek relative to the current position. If the new position lies within the buffer,
+    /// the buffer will not be flushed, allowing for more efficient seeks.
+    /// This method does not return the location of the underlying reader, so the caller
+    /// must track this information themselves if it is required.
+    pub fn poll_seek_relative(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        offset: i64,
+    ) -> Poll<io::Result<()>> {
+        let pos = self.pos as u64;
+        if offset < 0 {
+            if let Some(new_pos) = pos.checked_sub((-offset) as u64) {
+                *self.project().pos = new_pos as usize;
+                return Poll::Ready(Ok(()));
+            }
+        } else if let Some(new_pos) = pos.checked_add(offset as u64) {
+            if new_pos <= self.cap as u64 {
+                *self.project().pos = new_pos as usize;
+                return Poll::Ready(Ok(()));
+            }
+        }
+        self.poll_seek(cx, SeekFrom::Current(offset)).map(|res| res.map(|_| ()))
+    }
+}
+
 impl<R: AsyncRead> AsyncRead for BufReader<R> {
     fn poll_read(
         mut self: Pin<&mut Self>,
@@ -121,10 +153,7 @@
 }
 
 impl<R: AsyncRead> AsyncBufRead for BufReader<R> {
-    fn poll_fill_buf(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<io::Result<&[u8]>> {
+    fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
         let this = self.project();
 
         // If we've reached the end of our internal buffer then we need to fetch
@@ -169,6 +198,10 @@
     /// `.into_inner()` immediately after a seek yields the underlying reader
     /// at the same position.
     ///
+    /// To seek without discarding the internal buffer, use
+    /// [`BufReader::seek_relative`](BufReader::seek_relative) or
+    /// [`BufReader::poll_seek_relative`](BufReader::poll_seek_relative).
+    ///
     /// See [`AsyncSeek`](futures_io::AsyncSeek) for more details.
     ///
     /// Note: In the edge case where you're seeking with `SeekFrom::Current(n)`
@@ -190,7 +223,8 @@
             // support seeking by i64::min_value() so we need to handle underflow when subtracting
             // remainder.
             if let Some(offset) = n.checked_sub(remainder) {
-                result = ready!(self.as_mut().project().inner.poll_seek(cx, SeekFrom::Current(offset)))?;
+                result =
+                    ready!(self.as_mut().project().inner.poll_seek(cx, SeekFrom::Current(offset)))?;
             } else {
                 // seek backwards by our remainder, and then by the offset
                 ready!(self.as_mut().project().inner.poll_seek(cx, SeekFrom::Current(-remainder)))?;
@@ -205,3 +239,33 @@
         Poll::Ready(Ok(result))
     }
 }
+
+/// Future for the [`BufReader::seek_relative`](self::BufReader::seek_relative) method.
+#[derive(Debug)]
+#[must_use = "futures do nothing unless polled"]
+pub struct SeeKRelative<'a, R> {
+    inner: Pin<&'a mut BufReader<R>>,
+    offset: i64,
+    first: bool,
+}
+
+impl<R> Future for SeeKRelative<'_, R>
+where
+    R: AsyncRead + AsyncSeek,
+{
+    type Output = io::Result<()>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let offset = self.offset;
+        if self.first {
+            self.first = false;
+            self.inner.as_mut().poll_seek_relative(cx, offset)
+        } else {
+            self.inner
+                .as_mut()
+                .as_mut()
+                .poll_seek(cx, SeekFrom::Current(offset))
+                .map(|res| res.map(|_| ()))
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/buf_writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/buf_writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/buf_writer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/buf_writer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,38 +1,40 @@
+use super::DEFAULT_BUF_SIZE;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite, IoSlice, SeekFrom};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use std::fmt;
 use std::io::{self, Write};
 use std::pin::Pin;
-use super::DEFAULT_BUF_SIZE;
 
-/// Wraps a writer and buffers its output.
-///
-/// It can be excessively inefficient to work directly with something that
-/// implements [`AsyncWrite`]. A `BufWriter` keeps an in-memory buffer of data and
-/// writes it to an underlying writer in large, infrequent batches.
-///
-/// `BufWriter` can improve the speed of programs that make *small* and
-/// *repeated* write calls to the same file or network socket. It does not
-/// help when writing very large amounts at once, or writing just one or a few
-/// times. It also provides no advantage when writing to a destination that is
-/// in memory, like a `Vec<u8>`.
-///
-/// When the `BufWriter` is dropped, the contents of its buffer will be
-/// discarded. Creating multiple instances of a `BufWriter` on the same
-/// stream can cause data loss. If you need to write out the contents of its
-/// buffer, you must manually call flush before the writer is dropped.
-///
-/// [`AsyncWrite`]: futures_io::AsyncWrite
-/// [`flush`]: super::AsyncWriteExt::flush
-///
-// TODO: Examples
-#[pin_project]
-pub struct BufWriter<W> {
-    #[pin]
-    inner: W,
-    buf: Vec<u8>,
-    written: usize,
+pin_project! {
+    /// Wraps a writer and buffers its output.
+    ///
+    /// It can be excessively inefficient to work directly with something that
+    /// implements [`AsyncWrite`]. A `BufWriter` keeps an in-memory buffer of data and
+    /// writes it to an underlying writer in large, infrequent batches.
+    ///
+    /// `BufWriter` can improve the speed of programs that make *small* and
+    /// *repeated* write calls to the same file or network socket. It does not
+    /// help when writing very large amounts at once, or writing just one or a few
+    /// times. It also provides no advantage when writing to a destination that is
+    /// in memory, like a `Vec<u8>`.
+    ///
+    /// When the `BufWriter` is dropped, the contents of its buffer will be
+    /// discarded. Creating multiple instances of a `BufWriter` on the same
+    /// stream can cause data loss. If you need to write out the contents of its
+    /// buffer, you must manually call flush before the writer is dropped.
+    ///
+    /// [`AsyncWrite`]: futures_io::AsyncWrite
+    /// [`flush`]: super::AsyncWriteExt::flush
+    ///
+    // TODO: Examples
+    pub struct BufWriter<W> {
+        #[pin]
+        inner: W,
+        buf: Vec<u8>,
+        written: usize,
+    }
 }
 
 impl<W: AsyncWrite> BufWriter<W> {
@@ -44,11 +46,7 @@
 
     /// Creates a new `BufWriter` with the specified buffer capacity.
     pub fn with_capacity(cap: usize, inner: W) -> Self {
-        Self {
-            inner,
-            buf: Vec::with_capacity(cap),
-            written: 0,
-        }
+        Self { inner, buf: Vec::with_capacity(cap), written: 0 }
     }
 
     fn flush_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/chain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/chain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1,23 @@
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "read-initializer")]
 use futures_io::Initializer;
 use futures_io::{AsyncBufRead, AsyncRead, IoSliceMut};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use std::fmt;
 use std::io;
 use std::pin::Pin;
 
-/// Reader for the [`chain`](super::AsyncReadExt::chain) method.
-#[pin_project]
-#[must_use = "readers do nothing unless polled"]
-pub struct Chain<T, U> {
-    #[pin]
-    first: T,
-    #[pin]
-    second: U,
-    done_first: bool,
+pin_project! {
+    /// Reader for the [`chain`](super::AsyncReadExt::chain) method.
+    #[must_use = "readers do nothing unless polled"]
+    pub struct Chain<T, U> {
+        #[pin]
+        first: T,
+        #[pin]
+        second: U,
+        done_first: bool,
+    }
 }
 
 impl<T, U> Chain<T, U>
@@ -24,11 +26,7 @@
     U: AsyncRead,
 {
     pub(super) fn new(first: T, second: U) -> Self {
-        Self {
-            first,
-            second,
-            done_first: false,
-        }
+        Self { first, second, done_first: false }
     }
 
     /// Gets references to the underlying readers in this `Chain`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/copy_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/copy_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/copy_buf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/copy_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,10 @@
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::{AsyncBufRead, AsyncWrite};
+use pin_project_lite::pin_project;
 use std::io;
 use std::pin::Pin;
-use pin_project::pin_project;
 
 /// Creates a future which copies all the bytes from one object to another.
 ///
@@ -35,27 +36,25 @@
     R: AsyncBufRead,
     W: AsyncWrite + Unpin + ?Sized,
 {
-    CopyBuf {
-        reader,
-        writer,
-        amt: 0,
-    }
+    CopyBuf { reader, writer, amt: 0 }
 }
 
-/// Future for the [`copy_buf()`] function.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct CopyBuf<'a, R, W: ?Sized> {
-    #[pin]
-    reader: R,
-    writer: &'a mut W,
-    amt: u64,
+pin_project! {
+    /// Future for the [`copy_buf()`] function.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct CopyBuf<'a, R, W: ?Sized> {
+        #[pin]
+        reader: R,
+        writer: &'a mut W,
+        amt: u64,
+    }
 }
 
 impl<R, W> Future for CopyBuf<'_, R, W>
-    where R: AsyncBufRead,
-          W: AsyncWrite + Unpin + ?Sized,
+where
+    R: AsyncBufRead,
+    W: AsyncWrite + Unpin + ?Sized,
 {
     type Output = io::Result<u64>;
 
@@ -70,7 +69,7 @@
 
             let i = ready!(Pin::new(&mut this.writer).poll_write(cx, buffer))?;
             if i == 0 {
-                return Poll::Ready(Err(io::ErrorKind::WriteZero.into()))
+                return Poll::Ready(Err(io::ErrorKind::WriteZero.into()));
             }
             *this.amt += i as u64;
             this.reader.as_mut().consume(i);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/copy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/copy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/copy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/copy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,10 @@
+use super::{copy_buf, BufReader, CopyBuf};
 use futures_core::future::Future;
 use futures_core::task::{Context, Poll};
 use futures_io::{AsyncRead, AsyncWrite};
+use pin_project_lite::pin_project;
 use std::io;
 use std::pin::Pin;
-use super::{BufReader, copy_buf, CopyBuf};
-use pin_project::pin_project;
 
 /// Creates a future which copies all the bytes from one object to another.
 ///
@@ -36,18 +36,17 @@
     R: AsyncRead,
     W: AsyncWrite + Unpin + ?Sized,
 {
-    Copy {
-        inner: copy_buf(BufReader::new(reader), writer),
-    }
+    Copy { inner: copy_buf(BufReader::new(reader), writer) }
 }
 
-/// Future for the [`copy()`] function.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Copy<'a, R, W: ?Sized> {
-    #[pin]
-    inner: CopyBuf<'a, BufReader<R>, W>,
+pin_project! {
+    /// Future for the [`copy()`] function.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Copy<'a, R, W: ?Sized> {
+        #[pin]
+        inner: CopyBuf<'a, BufReader<R>, W>,
+    }
 }
 
 impl<R: AsyncRead, W: AsyncWrite + Unpin + ?Sized> Future for Copy<'_, R, W> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/cursor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/cursor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/cursor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/cursor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 /// allowing these buffers to be used anywhere you might use a reader or writer
 /// that does actual I/O.
 ///
-/// The standard library implements some I/O traits on various types which
+/// This library implements some I/O traits on various types which
 /// are commonly used as a buffer, like `Cursor<`[`Vec`]`<u8>>` and
 /// `Cursor<`[`&[u8]`][bytes]`>`.
 ///
@@ -43,9 +43,7 @@
     /// # force_inference(&buff);
     /// ```
     pub fn new(inner: T) -> Self {
-        Self {
-            inner: io::Cursor::new(inner),
-        }
+        Self { inner: io::Cursor::new(inner) }
     }
 
     /// Consumes this cursor, returning the underlying value.
@@ -199,15 +197,19 @@
 
 macro_rules! delegate_async_write_to_stdio {
     () => {
-        fn poll_write(mut self: Pin<&mut Self>, _: &mut Context<'_>, buf: &[u8])
-            -> Poll<io::Result<usize>>
-        {
+        fn poll_write(
+            mut self: Pin<&mut Self>,
+            _: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<io::Result<usize>> {
             Poll::Ready(io::Write::write(&mut self.inner, buf))
         }
 
-        fn poll_write_vectored(mut self: Pin<&mut Self>, _: &mut Context<'_>, bufs: &[IoSlice<'_>])
-            -> Poll<io::Result<usize>>
-        {
+        fn poll_write_vectored(
+            mut self: Pin<&mut Self>,
+            _: &mut Context<'_>,
+            bufs: &[IoSlice<'_>],
+        ) -> Poll<io::Result<usize>> {
             Poll::Ready(io::Write::write_vectored(&mut self.inner, bufs))
         }
 
@@ -218,7 +220,7 @@
         fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
             self.poll_flush(cx)
         }
-    }
+    };
 }
 
 impl AsyncWrite for Cursor<&mut [u8]> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/fill_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/fill_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/fill_buf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/fill_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,8 @@
 }
 
 impl<'a, R> Future for FillBuf<'a, R>
-    where R: AsyncBufRead + ?Sized + Unpin,
+where
+    R: AsyncBufRead + ?Sized + Unpin,
 {
     type Output = io::Result<&'a [u8]>;
 
@@ -29,7 +30,7 @@
         let reader = this.reader.take().expect("Polled FillBuf after completion");
 
         match Pin::new(&mut *reader).poll_fill_buf(cx) {
-            // With polinius it is possible to remove this inner match and just have the correct
+            // With polonius it is possible to remove this inner match and just have the correct
             // lifetime of the reference inferred based on which branch is taken
             Poll::Ready(Ok(_)) => match Pin::new(reader).poll_fill_buf(cx) {
                 Poll::Ready(Ok(slice)) => Poll::Ready(Ok(slice)),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/flush.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/flush.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/flush.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/flush.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,8 @@
 }
 
 impl<W> Future for Flush<'_, W>
-    where W: AsyncWrite + ?Sized + Unpin,
+where
+    W: AsyncWrite + ?Sized + Unpin,
 {
     type Output = io::Result<()>;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/into_sink.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/into_sink.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/into_sink.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/into_sink.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,10 @@
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncWrite;
 use futures_sink::Sink;
+use pin_project_lite::pin_project;
 use std::io;
 use std::pin::Pin;
-use pin_project::pin_project;
 
 #[derive(Debug)]
 struct Block<Item> {
@@ -11,17 +12,18 @@
     bytes: Item,
 }
 
-/// Sink for the [`into_sink`](super::AsyncWriteExt::into_sink) method.
-#[pin_project]
-#[must_use = "sinks do nothing unless polled"]
-#[derive(Debug)]
-#[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
-pub struct IntoSink<W, Item> {
-    #[pin]
-    writer: W,
-    /// An outstanding block for us to push into the underlying writer, along with an offset of how
-    /// far into this block we have written already.
-    buffer: Option<Block<Item>>,
+pin_project! {
+    /// Sink for the [`into_sink`](super::AsyncWriteExt::into_sink) method.
+    #[must_use = "sinks do nothing unless polled"]
+    #[derive(Debug)]
+    #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
+    pub struct IntoSink<W, Item> {
+        #[pin]
+        writer: W,
+        // An outstanding block for us to push into the underlying writer, along with an offset of how
+        // far into this block we have written already.
+        buffer: Option<Block<Item>>,
+    }
 }
 
 impl<W: AsyncWrite, Item: AsRef<[u8]>> IntoSink<W, Item> {
@@ -34,8 +36,7 @@
     fn poll_flush_buffer(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-    ) -> Poll<Result<(), io::Error>>
-    {
+    ) -> Poll<Result<(), io::Error>> {
         let mut this = self.project();
 
         if let Some(buffer) = this.buffer {
@@ -51,47 +52,29 @@
         *this.buffer = None;
         Poll::Ready(Ok(()))
     }
-
 }
 
 impl<W: AsyncWrite, Item: AsRef<[u8]>> Sink<Item> for IntoSink<W, Item> {
     type Error = io::Error;
 
-    fn poll_ready(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>>
-    {
+    fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.poll_flush_buffer(cx))?;
         Poll::Ready(Ok(()))
     }
 
-    #[allow(clippy::debug_assert_with_mut_call)]
-    fn start_send(
-        self: Pin<&mut Self>,
-        item: Item,
-    ) -> Result<(), Self::Error>
-    {
+    fn start_send(self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
         debug_assert!(self.buffer.is_none());
         *self.project().buffer = Some(Block { offset: 0, bytes: item });
         Ok(())
     }
 
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>>
-    {
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().poll_flush_buffer(cx))?;
         ready!(self.project().writer.poll_flush(cx))?;
         Poll::Ready(Ok(()))
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>>
-    {
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().poll_flush_buffer(cx))?;
         ready!(self.project().writer.poll_close(cx))?;
         Poll::Ready(Ok(()))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/lines.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/lines.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/lines.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/lines.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,29 @@
+use super::read_line::read_line_internal;
+use futures_core::ready;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncBufRead;
+use pin_project_lite::pin_project;
 use std::io;
 use std::mem;
 use std::pin::Pin;
-use super::read_line::read_line_internal;
-use pin_project::pin_project;
-
-/// Stream for the [`lines`](super::AsyncBufReadExt::lines) method.
 
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Lines<R> {
-    #[pin]
-    reader: R,
-    buf: String,
-    bytes: Vec<u8>,
-    read: usize,
+pin_project! {
+    /// Stream for the [`lines`](super::AsyncBufReadExt::lines) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Lines<R> {
+        #[pin]
+        reader: R,
+        buf: String,
+        bytes: Vec<u8>,
+        read: usize,
+    }
 }
 
 impl<R: AsyncBufRead> Lines<R> {
     pub(super) fn new(reader: R) -> Self {
-        Self {
-            reader,
-            buf: String::new(),
-            bytes: Vec::new(),
-            read: 0,
-        }
+        Self { reader, buf: String::new(), bytes: Vec::new(), read: 0 }
     }
 }
 
@@ -38,7 +34,7 @@
         let this = self.project();
         let n = ready!(read_line_internal(this.reader, cx, this.buf, this.bytes, this.read))?;
         if n == 0 && this.buf.is_empty() {
-            return Poll::Ready(None)
+            return Poll::Ready(None);
         }
         if this.buf.ends_with('\n') {
             this.buf.pop();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,38 @@
-//! IO
+//! Asynchronous I/O.
 //!
-//! This module contains a number of functions for working with
-//! `AsyncRead`, `AsyncWrite`, `AsyncSeek`, and `AsyncBufRead` types, including
-//! the `AsyncReadExt`, `AsyncWriteExt`, `AsyncSeekExt`, and `AsyncBufReadExt`
-//! traits which add methods to the `AsyncRead`, `AsyncWrite`, `AsyncSeek`,
-//! and `AsyncBufRead` types.
+//! This module is the asynchronous version of `std::io`. It defines four
+//! traits, [`AsyncRead`], [`AsyncWrite`], [`AsyncSeek`], and [`AsyncBufRead`],
+//! which mirror the `Read`, `Write`, `Seek`, and `BufRead` traits of the
+//! standard library. However, these traits integrate with the asynchronous
+//! task system, so that if an I/O object isn't ready for reading (or writing),
+//! the thread is not blocked, and instead the current task is queued to be
+//! woken when I/O is ready.
 //!
-//! This module is only available when the `io` and `std` features of this
+//! In addition, the [`AsyncReadExt`], [`AsyncWriteExt`], [`AsyncSeekExt`], and
+//! [`AsyncBufReadExt`] extension traits offer a variety of useful combinators
+//! for operating with asynchronous I/O objects, including ways to work with
+//! them using futures, streams and sinks.
+//!
+//! This module is only available when the `std` feature of this
 //! library is activated, and it is activated by default.
 
 #[cfg(feature = "io-compat")]
 #[cfg_attr(docsrs, doc(cfg(feature = "io-compat")))]
 use crate::compat::Compat;
-use std::{ptr, pin::Pin};
-
-pub use futures_io::{
-    AsyncRead, AsyncWrite, AsyncSeek, AsyncBufRead, Error, ErrorKind,
-    IoSlice, IoSliceMut, Result, SeekFrom,
-};
+use crate::future::assert_future;
+use crate::stream::assert_stream;
+use std::{pin::Pin, ptr};
+
+// Re-export some types from `std::io` so that users don't have to deal
+// with conflicts when `use`ing `futures::io` and `std::io`.
+#[doc(no_inline)]
 #[cfg(feature = "read-initializer")]
 #[cfg_attr(docsrs, doc(cfg(feature = "read-initializer")))]
-pub use futures_io::Initializer;
+pub use std::io::Initializer;
+#[doc(no_inline)]
+pub use std::io::{Error, ErrorKind, IoSlice, IoSliceMut, Result, SeekFrom};
+
+pub use futures_io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite};
 
 // used by `BufReader` and `BufWriter`
 // https://github.com/rust-lang/rust/blob/master/src/libstd/sys_common/io.rs#L1
@@ -44,7 +56,7 @@
 pub use self::allow_std::AllowStdIo;
 
 mod buf_reader;
-pub use self::buf_reader::BufReader;
+pub use self::buf_reader::{BufReader, SeeKRelative};
 
 mod buf_writer;
 pub use self::buf_writer::BufWriter;
@@ -114,7 +126,7 @@
 pub use self::sink::{sink, Sink};
 
 mod split;
-pub use self::split::{ReadHalf, WriteHalf, ReuniteError};
+pub use self::split::{ReadHalf, ReuniteError, WriteHalf};
 
 mod take;
 pub use self::take::Take;
@@ -166,7 +178,7 @@
         Self: Sized,
         R: AsyncRead,
     {
-        Chain::new(self, next)
+        assert_read(Chain::new(self, next))
     }
 
     /// Tries to read some bytes directly into the given `buf` in asynchronous
@@ -194,9 +206,10 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Read<'a, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        Read::new(self, buf)
+        assert_future::<Result<usize>, _>(Read::new(self, buf))
     }
 
     /// Creates a future which will read from the `AsyncRead` into `bufs` using vectored
@@ -205,9 +218,10 @@
     /// The returned future will resolve to the number of bytes read once the read
     /// operation is completed.
     fn read_vectored<'a>(&'a mut self, bufs: &'a mut [IoSliceMut<'a>]) -> ReadVectored<'a, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        ReadVectored::new(self, bufs)
+        assert_future::<Result<usize>, _>(ReadVectored::new(self, bufs))
     }
 
     /// Creates a future which will read exactly enough bytes to fill `buf`,
@@ -247,13 +261,11 @@
     /// assert_eq!(result.unwrap_err().kind(), io::ErrorKind::UnexpectedEof);
     /// # });
     /// ```
-    fn read_exact<'a>(
-        &'a mut self,
-        buf: &'a mut [u8],
-    ) -> ReadExact<'a, Self>
-        where Self: Unpin,
+    fn read_exact<'a>(&'a mut self, buf: &'a mut [u8]) -> ReadExact<'a, Self>
+    where
+        Self: Unpin,
     {
-        ReadExact::new(self, buf)
+        assert_future::<Result<()>, _>(ReadExact::new(self, buf))
     }
 
     /// Creates a future which will read all the bytes from this `AsyncRead`.
@@ -275,13 +287,11 @@
     /// assert_eq!(output, vec![1, 2, 3, 4]);
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
-    fn read_to_end<'a>(
-        &'a mut self,
-        buf: &'a mut Vec<u8>,
-    ) -> ReadToEnd<'a, Self>
-        where Self: Unpin,
+    fn read_to_end<'a>(&'a mut self, buf: &'a mut Vec<u8>) -> ReadToEnd<'a, Self>
+    where
+        Self: Unpin,
     {
-        ReadToEnd::new(self, buf)
+        assert_future::<Result<usize>, _>(ReadToEnd::new(self, buf))
     }
 
     /// Creates a future which will read all the bytes from this `AsyncRead`.
@@ -303,13 +313,11 @@
     /// assert_eq!(buffer, String::from("1234"));
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
-    fn read_to_string<'a>(
-        &'a mut self,
-        buf: &'a mut String,
-    ) -> ReadToString<'a, Self>
-        where Self: Unpin,
+    fn read_to_string<'a>(&'a mut self, buf: &'a mut String) -> ReadToString<'a, Self>
+    where
+        Self: Unpin,
     {
-        ReadToString::new(self, buf)
+        assert_future::<Result<usize>, _>(ReadToString::new(self, buf))
     }
 
     /// Helper method for splitting this read/write object into two halves.
@@ -342,9 +350,11 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn split(self) -> (ReadHalf<Self>, WriteHalf<Self>)
-        where Self: AsyncWrite + Sized,
+    where
+        Self: AsyncWrite + Sized,
     {
-        split::split(self)
+        let (r, w) = split::split(self);
+        (assert_read(r), assert_write(w))
     }
 
     /// Creates an AsyncRead adapter which will read at most `limit` bytes
@@ -367,9 +377,10 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn take(self, limit: u64) -> Take<Self>
-        where Self: Sized
+    where
+        Self: Sized,
     {
-        Take::new(self, limit)
+        assert_read(Take::new(self, limit))
     }
 
     /// Wraps an [`AsyncRead`] in a compatibility wrapper that allows it to be
@@ -381,7 +392,8 @@
     #[cfg(feature = "io-compat")]
     #[cfg_attr(docsrs, doc(cfg(feature = "io-compat")))]
     fn compat(self) -> Compat<Self>
-        where Self: Sized + Unpin,
+    where
+        Self: Sized + Unpin,
     {
         Compat::new(self)
     }
@@ -414,16 +426,18 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn flush(&mut self) -> Flush<'_, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        Flush::new(self)
+        assert_future::<Result<()>, _>(Flush::new(self))
     }
 
     /// Creates a future which will entirely close this `AsyncWrite`.
     fn close(&mut self) -> Close<'_, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        Close::new(self)
+        assert_future::<Result<()>, _>(Close::new(self))
     }
 
     /// Creates a future which will write bytes from `buf` into the object.
@@ -431,9 +445,10 @@
     /// The returned future will resolve to the number of bytes written once the write
     /// operation is completed.
     fn write<'a>(&'a mut self, buf: &'a [u8]) -> Write<'a, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        Write::new(self, buf)
+        assert_future::<Result<usize>, _>(Write::new(self, buf))
     }
 
     /// Creates a future which will write bytes from `bufs` into the object using vectored
@@ -442,9 +457,10 @@
     /// The returned future will resolve to the number of bytes written once the write
     /// operation is completed.
     fn write_vectored<'a>(&'a mut self, bufs: &'a [IoSlice<'a>]) -> WriteVectored<'a, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        WriteVectored::new(self, bufs)
+        assert_future::<Result<usize>, _>(WriteVectored::new(self, bufs))
     }
 
     /// Write data into this object.
@@ -468,9 +484,10 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn write_all<'a>(&'a mut self, buf: &'a [u8]) -> WriteAll<'a, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        WriteAll::new(self, buf)
+        assert_future::<Result<()>, _>(WriteAll::new(self, buf))
     }
 
     /// Attempts to write multiple buffers into this writer.
@@ -525,7 +542,7 @@
     where
         Self: Unpin,
     {
-        WriteAllVectored::new(self, bufs)
+        assert_future::<Result<()>, _>(WriteAllVectored::new(self, bufs))
     }
 
     /// Wraps an [`AsyncWrite`] in a compatibility wrapper that allows it to be
@@ -534,7 +551,8 @@
     #[cfg(feature = "io-compat")]
     #[cfg_attr(docsrs, doc(cfg(feature = "io-compat")))]
     fn compat_write(self) -> Compat<Self>
-        where Self: Sized + Unpin,
+    where
+        Self: Sized + Unpin,
     {
         Compat::new(self)
     }
@@ -568,9 +586,10 @@
     #[cfg(feature = "sink")]
     #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
     fn into_sink<Item: AsRef<[u8]>>(self) -> IntoSink<Self, Item>
-        where Self: Sized,
+    where
+        Self: Sized,
     {
-        IntoSink::new(self)
+        crate::sink::assert_sink::<Item, Error, _>(IntoSink::new(self))
     }
 }
 
@@ -584,9 +603,21 @@
     /// In the case of an error the buffer and the object will be discarded, with
     /// the error yielded.
     fn seek(&mut self, pos: SeekFrom) -> Seek<'_, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        Seek::new(self, pos)
+        assert_future::<Result<u64>, _>(Seek::new(self, pos))
+    }
+
+    /// Creates a future which will return the current seek position from the
+    /// start of the stream.
+    ///
+    /// This is equivalent to `self.seek(SeekFrom::Current(0))`.
+    fn stream_position(&mut self) -> Seek<'_, Self>
+    where
+        Self: Unpin,
+    {
+        self.seek(SeekFrom::Current(0))
     }
 }
 
@@ -618,9 +649,10 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn fill_buf(&mut self) -> FillBuf<'_, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        FillBuf::new(self)
+        assert_future::<Result<&[u8]>, _>(FillBuf::new(self))
     }
 
     /// A convenience for calling [`AsyncBufRead::consume`] on [`Unpin`] IO types.
@@ -641,7 +673,8 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn consume_unpin(&mut self, amt: usize)
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
         Pin::new(self).consume(amt)
     }
@@ -687,14 +720,11 @@
     /// assert_eq!(buf, b"");
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
-    fn read_until<'a>(
-        &'a mut self,
-        byte: u8,
-        buf: &'a mut Vec<u8>,
-    ) -> ReadUntil<'a, Self>
-        where Self: Unpin,
+    fn read_until<'a>(&'a mut self, byte: u8, buf: &'a mut Vec<u8>) -> ReadUntil<'a, Self>
+    where
+        Self: Unpin,
     {
-        ReadUntil::new(self, byte, buf)
+        assert_future::<Result<usize>, _>(ReadUntil::new(self, byte, buf))
     }
 
     /// Creates a future which will read all the bytes associated with this I/O
@@ -749,9 +779,10 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn read_line<'a>(&'a mut self, buf: &'a mut String) -> ReadLine<'a, Self>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        ReadLine::new(self, buf)
+        assert_future::<Result<usize>, _>(ReadLine::new(self, buf))
     }
 
     /// Returns a stream over the lines of this reader.
@@ -787,10 +818,28 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     fn lines(self) -> Lines<Self>
-        where Self: Sized,
+    where
+        Self: Sized,
     {
-        Lines::new(self)
+        assert_stream::<Result<String>, _>(Lines::new(self))
     }
 }
 
 impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}
+
+// Just a helper function to ensure the reader we're returning all have the
+// right implementations.
+pub(crate) fn assert_read<R>(reader: R) -> R
+where
+    R: AsyncRead,
+{
+    reader
+}
+// Just a helper function to ensure the writer we're returning all have the
+// right implementations.
+pub(crate) fn assert_write<W>(writer: W) -> W
+where
+    W: AsyncWrite,
+{
+    writer
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_exact.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_exact.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_exact.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_exact.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 use crate::io::AsyncRead;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use std::io;
 use std::mem;
@@ -33,7 +34,7 @@
                 this.buf = rest;
             }
             if n == 0 {
-                return Poll::Ready(Err(io::ErrorKind::UnexpectedEof.into()))
+                return Poll::Ready(Err(io::ErrorKind::UnexpectedEof.into()));
             }
         }
         Poll::Ready(Ok(()))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,12 @@
+use super::read_until::read_until_internal;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncBufRead;
 use std::io;
 use std::mem;
 use std::pin::Pin;
 use std::str;
-use super::read_until::read_until_internal;
 
 /// Future for the [`read_line`](super::AsyncBufReadExt::read_line) method.
 #[derive(Debug)]
@@ -21,12 +22,7 @@
 
 impl<'a, R: AsyncBufRead + ?Sized + Unpin> ReadLine<'a, R> {
     pub(super) fn new(reader: &'a mut R, buf: &'a mut String) -> Self {
-        Self {
-            reader,
-            bytes: mem::replace(buf, String::new()).into_bytes(),
-            buf,
-            read: 0,
-        }
+        Self { reader, bytes: mem::replace(buf, String::new()).into_bytes(), buf, read: 0 }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_to_end.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_to_end.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_to_end.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_to_end.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncRead;
 use std::io;
@@ -19,19 +20,20 @@
 impl<'a, R: AsyncRead + ?Sized + Unpin> ReadToEnd<'a, R> {
     pub(super) fn new(reader: &'a mut R, buf: &'a mut Vec<u8>) -> Self {
         let start_len = buf.len();
-        Self {
-            reader,
-            buf,
-            start_len,
-        }
+        Self { reader, buf, start_len }
     }
 }
 
-struct Guard<'a> { buf: &'a mut Vec<u8>, len: usize }
+struct Guard<'a> {
+    buf: &'a mut Vec<u8>,
+    len: usize,
+}
 
 impl Drop for Guard<'_> {
     fn drop(&mut self) {
-        unsafe { self.buf.set_len(self.len); }
+        unsafe {
+            self.buf.set_len(self.len);
+        }
     }
 }
 
@@ -51,7 +53,6 @@
     start_len: usize,
 ) -> Poll<io::Result<usize>> {
     let mut g = Guard { len: buf.len(), buf };
-    let ret;
     loop {
         if g.len == g.buf.len() {
             unsafe {
@@ -62,24 +63,24 @@
             }
         }
 
-        match ready!(rd.as_mut().poll_read(cx, &mut g.buf[g.len..])) {
-            Ok(0) => {
-                ret = Poll::Ready(Ok(g.len - start_len));
-                break;
-            }
-            Ok(n) => g.len += n,
-            Err(e) => {
-                ret = Poll::Ready(Err(e));
-                break;
+        let buf = &mut g.buf[g.len..];
+        match ready!(rd.as_mut().poll_read(cx, buf)) {
+            Ok(0) => return Poll::Ready(Ok(g.len - start_len)),
+            Ok(n) => {
+                // We can't allow bogus values from read. If it is too large, the returned vec could have its length
+                // set past its capacity, or if it overflows the vec could be shortened which could create an invalid
+                // string if this is called via read_to_string.
+                assert!(n <= buf.len());
+                g.len += n;
             }
+            Err(e) => return Poll::Ready(Err(e)),
         }
     }
-
-    ret
 }
 
 impl<A> Future for ReadToEnd<'_, A>
-    where A: AsyncRead + ?Sized + Unpin,
+where
+    A: AsyncRead + ?Sized + Unpin,
 {
     type Output = io::Result<usize>;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_to_string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_to_string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_to_string.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_to_string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 use super::read_to_end::read_to_end_internal;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncRead;
 use std::pin::Pin;
@@ -21,12 +22,7 @@
 impl<'a, R: AsyncRead + ?Sized + Unpin> ReadToString<'a, R> {
     pub(super) fn new(reader: &'a mut R, buf: &'a mut String) -> Self {
         let start_len = buf.len();
-        Self {
-            reader,
-            bytes: mem::replace(buf, String::new()).into_bytes(),
-            buf,
-            start_len,
-        }
+        Self { reader, bytes: mem::replace(buf, String::new()).into_bytes(), buf, start_len }
     }
 }
 
@@ -40,10 +36,7 @@
     let ret = ready!(read_to_end_internal(reader, cx, bytes, start_len));
     if str::from_utf8(bytes).is_err() {
         Poll::Ready(ret.and_then(|_| {
-            Err(io::Error::new(
-                io::ErrorKind::InvalidData,
-                "stream did not contain valid UTF-8",
-            ))
+            Err(io::Error::new(io::ErrorKind::InvalidData, "stream did not contain valid UTF-8"))
         }))
     } else {
         debug_assert!(buf.is_empty());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_until.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_until.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/read_until.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/read_until.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncBufRead;
 use std::io;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/repeat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/repeat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/repeat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/repeat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "read-initializer")]
 use futures_io::Initializer;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,8 @@
 use crate::lock::BiLock;
+use core::fmt;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::{AsyncRead, AsyncWrite, IoSlice, IoSliceMut};
-use core::fmt;
 use std::io;
 use std::pin::Pin;
 
@@ -17,12 +18,9 @@
     handle: BiLock<T>,
 }
 
-fn lock_and_then<T, U, E, F>(
-    lock: &BiLock<T>,
-    cx: &mut Context<'_>,
-    f: F
-) -> Poll<Result<U, E>>
-    where F: FnOnce(Pin<&mut T>, &mut Context<'_>) -> Poll<Result<U, E>>
+fn lock_and_then<T, U, E, F>(lock: &BiLock<T>, cx: &mut Context<'_>, f: F) -> Poll<Result<U, E>>
+where
+    F: FnOnce(Pin<&mut T>, &mut Context<'_>) -> Poll<Result<U, E>>,
 {
     let mut l = ready!(lock.poll_lock(cx));
     f(l.as_pin_mut(), cx)
@@ -38,9 +36,9 @@
     /// together. Succeeds only if the `ReadHalf<T>` and `WriteHalf<T>` are
     /// a matching pair originating from the same call to `AsyncReadExt::split`.
     pub fn reunite(self, other: WriteHalf<T>) -> Result<T, ReuniteError<T>> {
-        self.handle.reunite(other.handle).map_err(|err| {
-            ReuniteError(ReadHalf { handle: err.0 }, WriteHalf { handle: err.1 })
-        })
+        self.handle
+            .reunite(other.handle)
+            .map_err(|err| ReuniteError(ReadHalf { handle: err.0 }, WriteHalf { handle: err.1 }))
     }
 }
 
@@ -54,29 +52,37 @@
 }
 
 impl<R: AsyncRead> AsyncRead for ReadHalf<R> {
-    fn poll_read(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8])
-        -> Poll<io::Result<usize>>
-    {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut [u8],
+    ) -> Poll<io::Result<usize>> {
         lock_and_then(&self.handle, cx, |l, cx| l.poll_read(cx, buf))
     }
 
-    fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
-        -> Poll<io::Result<usize>>
-    {
+    fn poll_read_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &mut [IoSliceMut<'_>],
+    ) -> Poll<io::Result<usize>> {
         lock_and_then(&self.handle, cx, |l, cx| l.poll_read_vectored(cx, bufs))
     }
 }
 
 impl<W: AsyncWrite> AsyncWrite for WriteHalf<W> {
-    fn poll_write(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8])
-        -> Poll<io::Result<usize>>
-    {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
         lock_and_then(&self.handle, cx, |l, cx| l.poll_write(cx, buf))
     }
 
-    fn poll_write_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &[IoSlice<'_>])
-        -> Poll<io::Result<usize>>
-    {
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
         lock_and_then(&self.handle, cx, |l, cx| l.poll_write_vectored(cx, bufs))
     }
 
@@ -95,9 +101,7 @@
 
 impl<T> fmt::Debug for ReuniteError<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("ReuniteError")
-            .field(&"...")
-            .finish()
+        f.debug_tuple("ReuniteError").field(&"...").finish()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/take.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/take.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/take.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/take.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,26 @@
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "read-initializer")]
 use futures_io::Initializer;
-use futures_io::{AsyncRead, AsyncBufRead};
-use pin_project::pin_project;
-use std::{cmp, io};
+use futures_io::{AsyncBufRead, AsyncRead};
+use pin_project_lite::pin_project;
 use std::pin::Pin;
+use std::{cmp, io};
 
-/// Reader for the [`take`](super::AsyncReadExt::take) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "readers do nothing unless you `.await` or poll them"]
-pub struct Take<R> {
-    #[pin]
-    inner: R,
-    // Add '_' to avoid conflicts with `limit` method.
-    limit_: u64,
+pin_project! {
+    /// Reader for the [`take`](super::AsyncReadExt::take) method.
+    #[derive(Debug)]
+    #[must_use = "readers do nothing unless you `.await` or poll them"]
+    pub struct Take<R> {
+        #[pin]
+        inner: R,
+        limit: u64,
+    }
 }
 
 impl<R: AsyncRead> Take<R> {
     pub(super) fn new(inner: R, limit: u64) -> Self {
-        Self { inner, limit_: limit }
+        Self { inner, limit }
     }
 
     /// Returns the remaining number of bytes that can be
@@ -46,7 +47,7 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     pub fn limit(&self) -> u64 {
-        self.limit_
+        self.limit
     }
 
     /// Sets the number of bytes that can be read before this instance will
@@ -76,7 +77,7 @@
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
     pub fn set_limit(&mut self, limit: u64) {
-        self.limit_ = limit
+        self.limit = limit
     }
 
     delegate_access_inner!(inner, R, ());
@@ -90,13 +91,13 @@
     ) -> Poll<Result<usize, io::Error>> {
         let this = self.project();
 
-        if *this.limit_ == 0 {
+        if *this.limit == 0 {
             return Poll::Ready(Ok(0));
         }
 
-        let max = cmp::min(buf.len() as u64, *this.limit_) as usize;
+        let max = cmp::min(buf.len() as u64, *this.limit) as usize;
         let n = ready!(this.inner.poll_read(cx, &mut buf[..max]))?;
-        *this.limit_ -= n as u64;
+        *this.limit -= n as u64;
         Poll::Ready(Ok(n))
     }
 
@@ -111,12 +112,12 @@
         let this = self.project();
 
         // Don't call into inner reader at all at EOF because it may still block
-        if *this.limit_ == 0 {
+        if *this.limit == 0 {
             return Poll::Ready(Ok(&[]));
         }
 
         let buf = ready!(this.inner.poll_fill_buf(cx)?);
-        let cap = cmp::min(buf.len() as u64, *this.limit_) as usize;
+        let cap = cmp::min(buf.len() as u64, *this.limit) as usize;
         Poll::Ready(Ok(&buf[..cap]))
     }
 
@@ -124,8 +125,8 @@
         let this = self.project();
 
         // Don't let callers reset the limit by passing an overlarge value
-        let amt = cmp::min(amt as u64, *this.limit_) as usize;
-        *this.limit_ -= amt as u64;
+        let amt = cmp::min(amt as u64, *this.limit) as usize;
+        *this.limit -= amt as u64;
         this.inner.consume(amt);
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/window.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/window.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/window.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/window.rs	2021-12-09 12:01:26.000000000 +0000
@@ -30,10 +30,7 @@
     /// Further methods can be called on the returned `Window<T>` to alter the
     /// window into the data provided.
     pub fn new(t: T) -> Self {
-        Self {
-            range: 0..t.as_ref().len(),
-            inner: t,
-        }
+        Self { range: 0..t.as_ref().len(), inner: t }
     }
 
     /// Gets a shared reference to the underlying buffer inside of this
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/write_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/write_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/write_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/write_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncWrite;
 use std::io;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/write_all_vectored.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/write_all_vectored.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/io/write_all_vectored.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/io/write_all_vectored.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,9 @@
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncWrite;
 use futures_io::IoSlice;
 use std::io;
-use std::mem;
 use std::pin::Pin;
 
 /// Future for the
@@ -18,8 +18,9 @@
 impl<W: ?Sized + Unpin> Unpin for WriteAllVectored<'_, W> {}
 
 impl<'a, W: AsyncWrite + ?Sized + Unpin> WriteAllVectored<'a, W> {
-    pub(super) fn new(writer: &'a mut W, bufs: &'a mut [IoSlice<'a>]) -> Self {
-        Self { writer, bufs: IoSlice::advance(bufs, 0) }
+    pub(super) fn new(writer: &'a mut W, mut bufs: &'a mut [IoSlice<'a>]) -> Self {
+        IoSlice::advance_slices(&mut bufs, 0);
+        Self { writer, bufs }
     }
 }
 
@@ -33,7 +34,7 @@
             if n == 0 {
                 return Poll::Ready(Err(io::ErrorKind::WriteZero.into()));
             } else {
-                this.bufs = IoSlice::advance(mem::take(&mut this.bufs), n);
+                IoSlice::advance_slices(&mut this.bufs, n);
             }
         }
 
@@ -55,11 +56,7 @@
     /// Create a new writer that reads from at most `n_bufs` and reads
     /// `per_call` bytes (in total) per call to write.
     fn test_writer(n_bufs: usize, per_call: usize) -> TestWriter {
-        TestWriter {
-            n_bufs,
-            per_call,
-            written: Vec::new(),
-        }
+        TestWriter { n_bufs, per_call, written: Vec::new() }
     }
 
     // TODO: maybe move this the future-test crate?
@@ -109,10 +106,9 @@
             let expected = $expected;
             match $e {
                 Poll::Ready(Ok(ok)) if ok == expected => {}
-                got => panic!(
-                    "unexpected result, got: {:?}, wanted: Ready(Ok({:?}))",
-                    got, expected
-                ),
+                got => {
+                    panic!("unexpected result, got: {:?}, wanted: Ready(Ok({:?}))", got, expected)
+                }
             }
         };
     }
@@ -153,11 +149,7 @@
         assert_poll_ok!(dst.as_mut().poll_write_vectored(&mut cx, bufs), 3);
 
         // Read at most 3 bytes from three buffers.
-        let bufs = &[
-            IoSlice::new(&[3]),
-            IoSlice::new(&[4]),
-            IoSlice::new(&[5, 5]),
-        ];
+        let bufs = &[IoSlice::new(&[3]), IoSlice::new(&[4]), IoSlice::new(&[5, 5])];
         assert_poll_ok!(dst.as_mut().poll_write_vectored(&mut cx, bufs), 3);
 
         assert_eq!(dst.written, &[1, 2, 2, 3, 4, 5]);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,25 @@
 //! Combinators and utilities for working with `Future`s, `Stream`s, `Sink`s,
 //! and the `AsyncRead` and `AsyncWrite` traits.
 
-#![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
 #![cfg_attr(feature = "read-initializer", feature(read_initializer))]
 #![cfg_attr(feature = "write-all-vectored", feature(io_slice_advance))]
-
 #![cfg_attr(not(feature = "std"), no_std)]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
-// It cannot be included in the published code because this lints have false positives in the minimum required version.
-#![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-
-// mem::take requires Rust 1.40, matches! requires Rust 1.42
-// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
-// get's implemented.
-#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
-
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
-
-#![doc(html_root_url = "https://docs.rs/futures-util/0.3.8")]
-
+#![warn(
+    missing_debug_implementations,
+    missing_docs,
+    rust_2018_idioms,
+    single_use_lifetimes,
+    unreachable_pub
+)]
+#![doc(test(
+    no_crate_inject,
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_assignments, unused_variables)
+    )
+))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-#[cfg(all(feature = "cfg-target-has-atomic", not(feature = "unstable")))]
-compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feature as an explicit opt-in to unstable features");
-
 #[cfg(all(feature = "bilock", not(feature = "unstable")))]
 compile_error!("The `bilock` feature requires the `unstable` feature as an explicit opt-in to unstable features");
 
@@ -34,9 +29,6 @@
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
-#[macro_use(ready)]
-extern crate futures_core;
-
 // Macro re-exports
 pub use futures_core::ready;
 pub use pin_utils::pin_mut;
@@ -54,7 +46,7 @@
 pub mod __private {
     pub use crate::*;
     pub use core::{
-        option::Option::{self, Some, None},
+        option::Option::{self, None, Some},
         pin::Pin,
         result::Result::{Err, Ok},
     };
@@ -64,13 +56,6 @@
     }
 }
 
-macro_rules! cfg_target_has_atomic {
-    ($($item:item)*) => {$(
-        #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-        $item
-    )*};
-}
-
 #[cfg(feature = "sink")]
 macro_rules! delegate_sink {
     ($field:ident, $item:ty) => {
@@ -81,10 +66,7 @@
             self.project().$field.poll_ready(cx)
         }
 
-        fn start_send(
-            self: core::pin::Pin<&mut Self>,
-            item: $item,
-        ) -> Result<(), Self::Error> {
+        fn start_send(self: core::pin::Pin<&mut Self>, item: $item) -> Result<(), Self::Error> {
             self.project().$field.start_send(item)
         }
 
@@ -101,7 +83,7 @@
         ) -> core::task::Poll<Result<(), Self::Error>> {
             self.project().$field.poll_close(cx)
         }
-    }
+    };
 }
 
 macro_rules! delegate_future {
@@ -112,7 +94,7 @@
         ) -> core::task::Poll<Self::Output> {
             self.project().$field.poll(cx)
         }
-    }
+    };
 }
 
 macro_rules! delegate_stream {
@@ -126,34 +108,40 @@
         fn size_hint(&self) -> (usize, Option<usize>) {
             self.$field.size_hint()
         }
-    }
+    };
 }
 
 #[cfg(feature = "io")]
 #[cfg(feature = "std")]
 macro_rules! delegate_async_write {
     ($field:ident) => {
-        fn poll_write(self: core::pin::Pin<&mut Self>, cx: &mut core::task::Context<'_>, buf: &[u8])
-            -> core::task::Poll<std::io::Result<usize>>
-        {
+        fn poll_write(
+            self: core::pin::Pin<&mut Self>,
+            cx: &mut core::task::Context<'_>,
+            buf: &[u8],
+        ) -> core::task::Poll<std::io::Result<usize>> {
             self.project().$field.poll_write(cx, buf)
         }
-        fn poll_write_vectored(self: core::pin::Pin<&mut Self>, cx: &mut core::task::Context<'_>, bufs: &[std::io::IoSlice<'_>])
-            -> core::task::Poll<std::io::Result<usize>>
-        {
+        fn poll_write_vectored(
+            self: core::pin::Pin<&mut Self>,
+            cx: &mut core::task::Context<'_>,
+            bufs: &[std::io::IoSlice<'_>],
+        ) -> core::task::Poll<std::io::Result<usize>> {
             self.project().$field.poll_write_vectored(cx, bufs)
         }
-        fn poll_flush(self: core::pin::Pin<&mut Self>, cx: &mut core::task::Context<'_>)
-            -> core::task::Poll<std::io::Result<()>>
-        {
+        fn poll_flush(
+            self: core::pin::Pin<&mut Self>,
+            cx: &mut core::task::Context<'_>,
+        ) -> core::task::Poll<std::io::Result<()>> {
             self.project().$field.poll_flush(cx)
         }
-        fn poll_close(self: core::pin::Pin<&mut Self>, cx: &mut core::task::Context<'_>)
-            -> core::task::Poll<std::io::Result<()>>
-        {
+        fn poll_close(
+            self: core::pin::Pin<&mut Self>,
+            cx: &mut core::task::Context<'_>,
+        ) -> core::task::Poll<std::io::Result<()>> {
             self.project().$field.poll_close(cx)
         }
-    }
+    };
 }
 
 #[cfg(feature = "io")]
@@ -165,18 +153,22 @@
             self.$field.initializer()
         }
 
-        fn poll_read(self: core::pin::Pin<&mut Self>, cx: &mut core::task::Context<'_>, buf: &mut [u8])
-            -> core::task::Poll<std::io::Result<usize>>
-        {
+        fn poll_read(
+            self: core::pin::Pin<&mut Self>,
+            cx: &mut core::task::Context<'_>,
+            buf: &mut [u8],
+        ) -> core::task::Poll<std::io::Result<usize>> {
             self.project().$field.poll_read(cx, buf)
         }
 
-        fn poll_read_vectored(self: core::pin::Pin<&mut Self>, cx: &mut core::task::Context<'_>, bufs: &mut [std::io::IoSliceMut<'_>])
-            -> core::task::Poll<std::io::Result<usize>>
-        {
+        fn poll_read_vectored(
+            self: core::pin::Pin<&mut Self>,
+            cx: &mut core::task::Context<'_>,
+            bufs: &mut [std::io::IoSliceMut<'_>],
+        ) -> core::task::Poll<std::io::Result<usize>> {
             self.project().$field.poll_read_vectored(cx, bufs)
         }
-    }
+    };
 }
 
 #[cfg(feature = "io")]
@@ -193,7 +185,7 @@
         fn consume(self: core::pin::Pin<&mut Self>, amt: usize) {
             self.project().$field.consume(amt)
         }
-    }
+    };
 }
 
 macro_rules! delegate_access_inner {
@@ -289,10 +281,11 @@
         }
     };
     ($(#[$attr:meta])* $name:ident<$($arg:ident),*>($t:ty) : $ftrait:ident $([$($targs:tt)*])* $({$($item:tt)*})* $(where $($bound:tt)*)*) => {
-        #[pin_project::pin_project]
-        #[must_use = "futures/streams/sinks do nothing unless you `.await` or poll them"]
-        $(#[$attr])*
-        pub struct $name< $($arg),* > $(where $($bound)*)* { #[pin] inner:$t }
+        pin_project_lite::pin_project! {
+            #[must_use = "futures/streams/sinks do nothing unless you `.await` or poll them"]
+            $(#[$attr])*
+            pub struct $name< $($arg),* > $(where $($bound)*)* { #[pin] inner: $t }
+        }
 
         impl<$($arg),*> $name< $($arg),* > $(where $($bound)*)* {
             $($($item)*)*
@@ -308,16 +301,19 @@
 }
 
 pub mod future;
-#[doc(hidden)] pub use crate::future::{FutureExt, TryFutureExt};
+#[doc(no_inline)]
+pub use crate::future::{Future, FutureExt, TryFuture, TryFutureExt};
 
 pub mod stream;
-#[doc(hidden)] pub use crate::stream::{StreamExt, TryStreamExt};
+#[doc(no_inline)]
+pub use crate::stream::{Stream, StreamExt, TryStream, TryStreamExt};
 
 #[cfg(feature = "sink")]
 #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
 pub mod sink;
 #[cfg(feature = "sink")]
-#[doc(hidden)] pub use crate::sink::SinkExt;
+#[doc(no_inline)]
+pub use crate::sink::{Sink, SinkExt};
 
 pub mod task;
 
@@ -333,12 +329,18 @@
 pub mod io;
 #[cfg(feature = "io")]
 #[cfg(feature = "std")]
-#[doc(hidden)] pub use crate::io::{AsyncReadExt, AsyncWriteExt, AsyncSeekExt, AsyncBufReadExt};
+#[doc(no_inline)]
+pub use crate::io::{
+    AsyncBufRead, AsyncBufReadExt, AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt, AsyncWrite,
+    AsyncWriteExt,
+};
 
-mod fns;
+#[cfg(feature = "alloc")]
+pub mod lock;
 
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod abortable;
 
-cfg_target_has_atomic! {
-    #[cfg(feature = "alloc")]
-    pub mod lock;
-}
+mod fns;
+mod unfold_state;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/lock/bilock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/lock/bilock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/lock/bilock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/lock/bilock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,16 @@
 //! Futures-powered synchronization primitives.
 
-#[cfg(feature = "bilock")]
-use futures_core::future::Future;
-use futures_core::task::{Context, Poll, Waker};
+use alloc::boxed::Box;
+use alloc::sync::Arc;
 use core::cell::UnsafeCell;
 use core::fmt;
 use core::ops::{Deref, DerefMut};
 use core::pin::Pin;
 use core::sync::atomic::AtomicUsize;
 use core::sync::atomic::Ordering::SeqCst;
-use alloc::boxed::Box;
-use alloc::sync::Arc;
+#[cfg(feature = "bilock")]
+use futures_core::future::Future;
+use futures_core::task::{Context, Poll, Waker};
 
 /// A type of futures-powered synchronization primitive which is a mutex between
 /// two possible owners.
@@ -61,10 +61,7 @@
     /// Similarly, reuniting the lock and extracting the inner value is only
     /// possible when `T` is `Unpin`.
     pub fn new(t: T) -> (Self, Self) {
-        let arc = Arc::new(Inner {
-            state: AtomicUsize::new(0),
-            value: Some(UnsafeCell::new(t)),
-        });
+        let arc = Arc::new(Inner { state: AtomicUsize::new(0), value: Some(UnsafeCell::new(t)) });
 
         (Self { arc: arc.clone() }, Self { arc })
     }
@@ -103,11 +100,11 @@
                     let mut prev = Box::from_raw(n as *mut Waker);
                     *prev = cx.waker().clone();
                     waker = Some(prev);
-                }
+                },
             }
 
             // type ascription for safety's sake!
-            let me: Box<Waker> = waker.take().unwrap_or_else(||Box::new(cx.waker().clone()));
+            let me: Box<Waker> = waker.take().unwrap_or_else(|| Box::new(cx.waker().clone()));
             let me = Box::into_raw(me) as usize;
 
             match self.arc.state.compare_exchange(1, me, SeqCst, SeqCst) {
@@ -145,9 +142,7 @@
     #[cfg(feature = "bilock")]
     #[cfg_attr(docsrs, doc(cfg(feature = "bilock")))]
     pub fn lock(&self) -> BiLockAcquire<'_, T> {
-        BiLockAcquire {
-            bilock: self,
-        }
+        BiLockAcquire { bilock: self }
     }
 
     /// Attempts to put the two "halves" of a `BiLock<T>` back together and
@@ -181,7 +176,7 @@
             // up as its now their turn.
             n => unsafe {
                 Box::from_raw(n as *mut Waker).wake();
-            }
+            },
         }
     }
 }
@@ -205,9 +200,7 @@
 
 impl<T> fmt::Debug for ReuniteError<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("ReuniteError")
-            .field(&"...")
-            .finish()
+        f.debug_tuple("ReuniteError").field(&"...").finish()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/lock/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/lock/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/lock/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/lock/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,18 +3,23 @@
 //! This module is only available when the `std` or `alloc` feature of this
 //! library is activated, and it is activated by default.
 
+#[cfg(not(futures_no_atomic_cas))]
 #[cfg(feature = "std")]
 mod mutex;
+#[cfg(not(futures_no_atomic_cas))]
 #[cfg(feature = "std")]
-pub use self::mutex::{MappedMutexGuard, Mutex, MutexLockFuture, MutexGuard};
+pub use self::mutex::{MappedMutexGuard, Mutex, MutexGuard, MutexLockFuture};
 
+#[cfg(not(futures_no_atomic_cas))]
 #[cfg(any(feature = "bilock", feature = "sink", feature = "io"))]
 #[cfg_attr(docsrs, doc(cfg(feature = "bilock")))]
 #[cfg_attr(not(feature = "bilock"), allow(unreachable_pub))]
 mod bilock;
-#[cfg(feature = "bilock")]
-#[cfg_attr(docsrs, doc(cfg(feature = "bilock")))]
-pub use self::bilock::{BiLock, BiLockAcquire, BiLockGuard, ReuniteError};
+#[cfg(not(futures_no_atomic_cas))]
 #[cfg(any(feature = "sink", feature = "io"))]
 #[cfg(not(feature = "bilock"))]
 pub(crate) use self::bilock::BiLock;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "bilock")]
+#[cfg_attr(docsrs, doc(cfg(feature = "bilock")))]
+pub use self::bilock::{BiLock, BiLockAcquire, BiLockGuard, ReuniteError};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/lock/mutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/lock/mutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/lock/mutex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/lock/mutex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,13 @@
 use futures_core::future::{FusedFuture, Future};
 use futures_core::task::{Context, Poll, Waker};
 use slab::Slab;
-use std::{fmt, mem};
 use std::cell::UnsafeCell;
 use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
 use std::pin::Pin;
-use std::sync::Mutex as StdMutex;
 use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Mutex as StdMutex;
+use std::{fmt, mem};
 
 /// A futures-aware mutex.
 ///
@@ -53,7 +53,7 @@
 impl Waiter {
     fn register(&mut self, waker: &Waker) {
         match self {
-            Self::Waiting(w) if waker.will_wake(w) => {},
+            Self::Waiting(w) if waker.will_wake(w) => {}
             _ => *self = Self::Waiting(waker.clone()),
         }
     }
@@ -61,12 +61,11 @@
     fn wake(&mut self) {
         match mem::replace(self, Self::Woken) {
             Self::Waiting(waker) => waker.wake(),
-            Self::Woken => {},
+            Self::Woken => {}
         }
     }
 }
 
-#[allow(clippy::identity_op)] // https://github.com/rust-lang/rust-clippy/issues/3445
 const IS_LOCKED: usize = 1 << 0;
 const HAS_WAITERS: usize = 1 << 1;
 
@@ -113,10 +112,7 @@
     /// This method returns a future that will resolve once the lock has been
     /// successfully acquired.
     pub fn lock(&self) -> MutexLockFuture<'_, T> {
-        MutexLockFuture {
-            mutex: Some(self),
-            wait_key: WAIT_KEY_NONE,
-        }
+        MutexLockFuture { mutex: Some(self), wait_key: WAIT_KEY_NONE }
     }
 
     /// Returns a mutable reference to the underlying data.
@@ -145,7 +141,7 @@
         if wait_key != WAIT_KEY_NONE {
             let mut waiters = self.waiters.lock().unwrap();
             match waiters.remove(wait_key) {
-                Waiter::Waiting(_) => {},
+                Waiter::Waiting(_) => {}
                 Waiter::Woken => {
                     // We were awoken, but then dropped before we could
                     // wake up to acquire the lock. Wake up another
@@ -191,13 +187,10 @@
         f.debug_struct("MutexLockFuture")
             .field("was_acquired", &self.mutex.is_none())
             .field("mutex", &self.mutex)
-            .field("wait_key", &(
-                    if self.wait_key == WAIT_KEY_NONE {
-                        None
-                    } else {
-                        Some(self.wait_key)
-                    }
-                ))
+            .field(
+                "wait_key",
+                &(if self.wait_key == WAIT_KEY_NONE { None } else { Some(self.wait_key) }),
+            )
             .finish()
     }
 }
@@ -295,10 +288,7 @@
 
 impl<T: ?Sized + fmt::Debug> fmt::Debug for MutexGuard<'_, T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("MutexGuard")
-            .field("value", &&**self)
-            .field("mutex", &self.mutex)
-            .finish()
+        f.debug_struct("MutexGuard").field("value", &&**self).field("mutex", &self.mutex).finish()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/never.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/never.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/never.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/never.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
-//! Definition of the `Never` type,
-//! a stand-in for the `!` type until it becomes stable.
+//! This module contains the `Never` type.
+//!
+//! Values of this type can never be created and will never exist.
 
 /// A type with no possible values.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/buffer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/buffer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/buffer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/buffer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,38 +1,33 @@
-use futures_core::stream::{Stream, FusedStream};
+use alloc::collections::VecDeque;
+use core::pin::Pin;
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 use futures_sink::Sink;
-use pin_project::pin_project;
-use core::pin::Pin;
-use alloc::collections::VecDeque;
+use pin_project_lite::pin_project;
 
-/// Sink for the [`buffer`](super::SinkExt::buffer) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "sinks do nothing unless polled"]
-pub struct Buffer<Si, Item> {
-    #[pin]
-    sink: Si,
-    buf: VecDeque<Item>,
+pin_project! {
+    /// Sink for the [`buffer`](super::SinkExt::buffer) method.
+    #[derive(Debug)]
+    #[must_use = "sinks do nothing unless polled"]
+    pub struct Buffer<Si, Item> {
+        #[pin]
+        sink: Si,
+        buf: VecDeque<Item>,
 
-    // Track capacity separately from the `VecDeque`, which may be rounded up
-    capacity: usize,
+        // Track capacity separately from the `VecDeque`, which may be rounded up
+        capacity: usize,
+    }
 }
 
 impl<Si: Sink<Item>, Item> Buffer<Si, Item> {
     pub(super) fn new(sink: Si, capacity: usize) -> Self {
-        Self {
-            sink,
-            buf: VecDeque::with_capacity(capacity),
-            capacity,
-        }
+        Self { sink, buf: VecDeque::with_capacity(capacity), capacity }
     }
 
     delegate_access_inner!(sink, Si, ());
 
-    fn try_empty_buffer(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Si::Error>> {
+    fn try_empty_buffer(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Si::Error>> {
         let mut this = self.project();
         ready!(this.sink.as_mut().poll_ready(cx))?;
         while let Some(item) = this.buf.pop_front() {
@@ -46,7 +41,10 @@
 }
 
 // Forwarding impl of Stream from the underlying sink
-impl<S, Item> Stream for Buffer<S, Item> where S: Sink<Item> + Stream {
+impl<S, Item> Stream for Buffer<S, Item>
+where
+    S: Sink<Item> + Stream,
+{
     type Item = S::Item;
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<S::Item>> {
@@ -58,7 +56,10 @@
     }
 }
 
-impl<S, Item> FusedStream for Buffer<S, Item> where S: Sink<Item> + FusedStream {
+impl<S, Item> FusedStream for Buffer<S, Item>
+where
+    S: Sink<Item> + FusedStream,
+{
     fn is_terminated(&self) -> bool {
         self.sink.is_terminated()
     }
@@ -67,10 +68,7 @@
 impl<Si: Sink<Item>, Item> Sink<Item> for Buffer<Si, Item> {
     type Error = Si::Error;
 
-    fn poll_ready(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         if self.capacity == 0 {
             return self.project().sink.poll_ready(cx);
         }
@@ -84,10 +82,7 @@
         }
     }
 
-    fn start_send(
-        self: Pin<&mut Self>,
-        item: Item,
-    ) -> Result<(), Self::Error> {
+    fn start_send(self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
         if self.capacity == 0 {
             self.project().sink.start_send(item)
         } else {
@@ -96,21 +91,13 @@
         }
     }
 
-    #[allow(clippy::debug_assert_with_mut_call)]
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().try_empty_buffer(cx))?;
         debug_assert!(self.buf.is_empty());
         self.project().sink.poll_flush(cx)
     }
 
-    #[allow(clippy::debug_assert_with_mut_call)]
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().try_empty_buffer(cx))?;
         debug_assert!(self.buf.is_empty());
         self.project().sink.poll_close(cx)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/close.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/close.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/close.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/close.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,23 +16,17 @@
 
 /// A future that completes when the sink has finished closing.
 ///
-/// The sink itself is returned after closeing is complete.
+/// The sink itself is returned after closing is complete.
 impl<'a, Si: Sink<Item> + Unpin + ?Sized, Item> Close<'a, Si, Item> {
     pub(super) fn new(sink: &'a mut Si) -> Self {
-        Self {
-            sink,
-            _phantom: PhantomData,
-        }
+        Self { sink, _phantom: PhantomData }
     }
 }
 
 impl<Si: Sink<Item> + Unpin + ?Sized, Item> Future for Close<'_, Si, Item> {
     type Output = Result<(), Si::Error>;
 
-    fn poll(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         Pin::new(&mut self.sink).poll_close(cx)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/drain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/drain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/drain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/drain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use super::assert_sink;
 use crate::never::Never;
 use core::marker::PhantomData;
 use core::pin::Pin;
@@ -26,7 +27,7 @@
 /// # Ok::<(), futures::never::Never>(()) }).unwrap();
 /// ```
 pub fn drain<T>() -> Drain<T> {
-    Drain { marker: PhantomData }
+    assert_sink::<T, Never, _>(Drain { marker: PhantomData })
 }
 
 impl<T> Unpin for Drain<T> {}
@@ -34,31 +35,19 @@
 impl<T> Sink<T> for Drain<T> {
     type Error = Never;
 
-    fn poll_ready(
-        self: Pin<&mut Self>,
-        _cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(Ok(()))
     }
 
-    fn start_send(
-        self: Pin<&mut Self>,
-        _item: T,
-    ) -> Result<(), Self::Error> {
+    fn start_send(self: Pin<&mut Self>, _item: T) -> Result<(), Self::Error> {
         Ok(())
     }
 
-    fn poll_flush(
-        self: Pin<&mut Self>,
-        _cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(Ok(()))
     }
 
-    fn poll_close(
-        self: Pin<&mut Self>,
-        _cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(Ok(()))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/err_into.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/err_into.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/err_into.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/err_into.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,34 @@
 use crate::sink::{SinkExt, SinkMapErr};
-use futures_core::stream::{Stream, FusedStream};
-use futures_sink::{Sink};
-use pin_project::pin_project;
-
-/// Sink for the [`sink_err_into`](super::SinkExt::sink_err_into) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "sinks do nothing unless polled"]
-pub struct SinkErrInto<Si: Sink<Item>, Item, E> {
-    #[pin]
-    sink: SinkMapErr<Si, fn(Si::Error) -> E>,
+use futures_core::stream::{FusedStream, Stream};
+use futures_sink::Sink;
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// Sink for the [`sink_err_into`](super::SinkExt::sink_err_into) method.
+    #[derive(Debug)]
+    #[must_use = "sinks do nothing unless polled"]
+    pub struct SinkErrInto<Si: Sink<Item>, Item, E> {
+        #[pin]
+        sink: SinkMapErr<Si, fn(Si::Error) -> E>,
+    }
 }
 
 impl<Si, E, Item> SinkErrInto<Si, Item, E>
-    where Si: Sink<Item>,
-          Si::Error: Into<E>,
+where
+    Si: Sink<Item>,
+    Si::Error: Into<E>,
 {
     pub(super) fn new(sink: Si) -> Self {
-        Self {
-            sink: SinkExt::sink_map_err(sink, Into::into),
-        }
+        Self { sink: SinkExt::sink_map_err(sink, Into::into) }
     }
 
     delegate_access_inner!(sink, Si, (.));
 }
 
 impl<Si, Item, E> Sink<Item> for SinkErrInto<Si, Item, E>
-    where Si: Sink<Item>,
-          Si::Error: Into<E>,
+where
+    Si: Sink<Item>,
+    Si::Error: Into<E>,
 {
     type Error = E;
 
@@ -36,8 +37,9 @@
 
 // Forwarding impl of Stream from the underlying sink
 impl<S, Item, E> Stream for SinkErrInto<S, Item, E>
-    where S: Sink<Item> + Stream,
-          S::Error: Into<E>
+where
+    S: Sink<Item> + Stream,
+    S::Error: Into<E>,
 {
     type Item = S::Item;
 
@@ -45,8 +47,9 @@
 }
 
 impl<S, Item, E> FusedStream for SinkErrInto<S, Item, E>
-    where S: Sink<Item> + FusedStream,
-          S::Error: Into<E>
+where
+    S: Sink<Item> + FusedStream,
+    S::Error: Into<E>,
 {
     fn is_terminated(&self) -> bool {
         self.sink.is_terminated()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/fanout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/fanout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/fanout.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/fanout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,19 +2,20 @@
 use core::pin::Pin;
 use futures_core::task::{Context, Poll};
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Sink that clones incoming items and forwards them to two sinks at the same time.
-///
-/// Backpressure from any downstream sink propagates up, which means that this sink
-/// can only process items as fast as its _slowest_ downstream sink.
-#[pin_project]
-#[must_use = "sinks do nothing unless polled"]
-pub struct Fanout<Si1, Si2> {
-    #[pin]
-    sink1: Si1,
-    #[pin]
-    sink2: Si2
+pin_project! {
+    /// Sink that clones incoming items and forwards them to two sinks at the same time.
+    ///
+    /// Backpressure from any downstream sink propagates up, which means that this sink
+    /// can only process items as fast as its _slowest_ downstream sink.
+    #[must_use = "sinks do nothing unless polled"]
+    pub struct Fanout<Si1, Si2> {
+        #[pin]
+        sink1: Si1,
+        #[pin]
+        sink2: Si2
+    }
 }
 
 impl<Si1, Si2> Fanout<Si1, Si2> {
@@ -49,36 +50,32 @@
 
 impl<Si1: Debug, Si2: Debug> Debug for Fanout<Si1, Si2> {
     fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-        f.debug_struct("Fanout")
-            .field("sink1", &self.sink1)
-            .field("sink2", &self.sink2)
-            .finish()
+        f.debug_struct("Fanout").field("sink1", &self.sink1).field("sink2", &self.sink2).finish()
     }
 }
 
 impl<Si1, Si2, Item> Sink<Item> for Fanout<Si1, Si2>
-    where Si1: Sink<Item>,
-          Item: Clone,
-          Si2: Sink<Item, Error=Si1::Error>
+where
+    Si1: Sink<Item>,
+    Item: Clone,
+    Si2: Sink<Item, Error = Si1::Error>,
 {
     type Error = Si1::Error;
 
-    fn poll_ready(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         let this = self.project();
 
         let sink1_ready = this.sink1.poll_ready(cx)?.is_ready();
         let sink2_ready = this.sink2.poll_ready(cx)?.is_ready();
         let ready = sink1_ready && sink2_ready;
-        if ready { Poll::Ready(Ok(())) } else { Poll::Pending }
+        if ready {
+            Poll::Ready(Ok(()))
+        } else {
+            Poll::Pending
+        }
     }
 
-    fn start_send(
-        self: Pin<&mut Self>,
-        item: Item,
-    ) -> Result<(), Self::Error> {
+    fn start_send(self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
         let this = self.project();
 
         this.sink1.start_send(item.clone())?;
@@ -86,27 +83,29 @@
         Ok(())
     }
 
-    fn poll_flush(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         let this = self.project();
 
         let sink1_ready = this.sink1.poll_flush(cx)?.is_ready();
         let sink2_ready = this.sink2.poll_flush(cx)?.is_ready();
         let ready = sink1_ready && sink2_ready;
-        if ready { Poll::Ready(Ok(())) } else { Poll::Pending }
+        if ready {
+            Poll::Ready(Ok(()))
+        } else {
+            Poll::Pending
+        }
     }
 
-    fn poll_close(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         let this = self.project();
 
         let sink1_ready = this.sink1.poll_close(cx)?.is_ready();
         let sink2_ready = this.sink2.poll_close(cx)?.is_ready();
         let ready = sink1_ready && sink2_ready;
-        if ready { Poll::Ready(Ok(())) } else { Poll::Pending }
+        if ready {
+            Poll::Ready(Ok(()))
+        } else {
+            Poll::Pending
+        }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/feed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/feed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/feed.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/feed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,43 @@
+use core::pin::Pin;
+use futures_core::future::Future;
+use futures_core::ready;
+use futures_core::task::{Context, Poll};
+use futures_sink::Sink;
+
+/// Future for the [`feed`](super::SinkExt::feed) method.
+#[derive(Debug)]
+#[must_use = "futures do nothing unless you `.await` or poll them"]
+pub struct Feed<'a, Si: ?Sized, Item> {
+    sink: &'a mut Si,
+    item: Option<Item>,
+}
+
+// Pinning is never projected to children
+impl<Si: Unpin + ?Sized, Item> Unpin for Feed<'_, Si, Item> {}
+
+impl<'a, Si: Sink<Item> + Unpin + ?Sized, Item> Feed<'a, Si, Item> {
+    pub(super) fn new(sink: &'a mut Si, item: Item) -> Self {
+        Feed { sink, item: Some(item) }
+    }
+
+    pub(super) fn sink_pin_mut(&mut self) -> Pin<&mut Si> {
+        Pin::new(self.sink)
+    }
+
+    pub(super) fn is_item_pending(&self) -> bool {
+        self.item.is_some()
+    }
+}
+
+impl<Si: Sink<Item> + Unpin + ?Sized, Item> Future for Feed<'_, Si, Item> {
+    type Output = Result<(), Si::Error>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.get_mut();
+        let mut sink = Pin::new(&mut this.sink);
+        ready!(sink.as_mut().poll_ready(cx))?;
+        let item = this.item.take().expect("polled Feed after completion");
+        sink.as_mut().start_send(item)?;
+        Poll::Ready(Ok(()))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/flush.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/flush.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/flush.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/flush.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,20 +23,14 @@
 /// all current requests are processed.
 impl<'a, Si: Sink<Item> + Unpin + ?Sized, Item> Flush<'a, Si, Item> {
     pub(super) fn new(sink: &'a mut Si) -> Self {
-        Self {
-            sink,
-            _phantom: PhantomData,
-        }
+        Self { sink, _phantom: PhantomData }
     }
 }
 
 impl<Si: Sink<Item> + Unpin + ?Sized, Item> Future for Flush<'_, Si, Item> {
     type Output = Result<(), Si::Error>;
 
-    fn poll(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         Pin::new(&mut self.sink).poll_flush(cx)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/map_err.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/map_err.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/map_err.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/map_err.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,18 @@
 use core::pin::Pin;
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use futures_sink::{Sink};
-use pin_project::pin_project;
+use futures_sink::Sink;
+use pin_project_lite::pin_project;
 
-/// Sink for the [`sink_map_err`](super::SinkExt::sink_map_err) method.
-#[pin_project]
-#[derive(Debug, Clone)]
-#[must_use = "sinks do nothing unless polled"]
-pub struct SinkMapErr<Si, F> {
-    #[pin]
-    sink: Si,
-    f: Option<F>,
+pin_project! {
+    /// Sink for the [`sink_map_err`](super::SinkExt::sink_map_err) method.
+    #[derive(Debug, Clone)]
+    #[must_use = "sinks do nothing unless polled"]
+    pub struct SinkMapErr<Si, F> {
+        #[pin]
+        sink: Si,
+        f: Option<F>,
+    }
 }
 
 impl<Si, F> SinkMapErr<Si, F> {
@@ -27,36 +28,25 @@
 }
 
 impl<Si, F, E, Item> Sink<Item> for SinkMapErr<Si, F>
-    where Si: Sink<Item>,
-          F: FnOnce(Si::Error) -> E,
+where
+    Si: Sink<Item>,
+    F: FnOnce(Si::Error) -> E,
 {
     type Error = E;
 
-    fn poll_ready(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.as_mut().project().sink.poll_ready(cx).map_err(|e| self.as_mut().take_f()(e))
     }
 
-    fn start_send(
-        mut self: Pin<&mut Self>,
-        item: Item,
-    ) -> Result<(), Self::Error> {
+    fn start_send(mut self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
         self.as_mut().project().sink.start_send(item).map_err(|e| self.as_mut().take_f()(e))
     }
 
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.as_mut().project().sink.poll_flush(cx).map_err(|e| self.as_mut().take_f()(e))
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.as_mut().project().sink.poll_close(cx).map_err(|e| self.as_mut().take_f()(e))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,16 @@
-//! Sinks
+//! Asynchronous sinks.
 //!
-//! This module contains a number of functions for working with `Sink`s,
-//! including the `SinkExt` trait which adds methods to `Sink` types.
+//! This module contains:
 //!
-//! This module is only available when the `sink` feature of this
-//! library is activated, and it is activated by default.
+//! - The [`Sink`] trait, which allows you to asynchronously write data.
+//! - The [`SinkExt`] trait, which provides adapters for chaining and composing
+//!   sinks.
 
+use crate::future::{assert_future, Either};
 use core::pin::Pin;
 use futures_core::future::Future;
 use futures_core::stream::{Stream, TryStream};
 use futures_core::task::{Context, Poll};
-use crate::future::Either;
 
 #[cfg(feature = "compat")]
 use crate::compat::CompatSink;
@@ -26,6 +26,9 @@
 mod fanout;
 pub use self::fanout::Fanout;
 
+mod feed;
+pub use self::feed::Feed;
+
 mod flush;
 pub use self::flush::Flush;
 
@@ -41,6 +44,9 @@
 mod send_all;
 pub use self::send_all::SendAll;
 
+mod unfold;
+pub use self::unfold::{unfold, Unfold};
+
 mod with;
 pub use self::with::With;
 
@@ -69,12 +75,13 @@
     /// Note that this function consumes the given sink, returning a wrapped
     /// version, much like `Iterator::map`.
     fn with<U, Fut, F, E>(self, f: F) -> With<Self, Item, U, Fut, F>
-        where F: FnMut(U) -> Fut,
-              Fut: Future<Output = Result<Item, E>>,
-              E: From<Self::Error>,
-              Self: Sized
+    where
+        F: FnMut(U) -> Fut,
+        Fut: Future<Output = Result<Item, E>>,
+        E: From<Self::Error>,
+        Self: Sized,
     {
-        With::new(self, f)
+        assert_sink::<U, E, _>(With::new(self, f))
     }
 
     /// Composes a function *in front of* the sink.
@@ -110,11 +117,12 @@
     /// # });
     /// ```
     fn with_flat_map<U, St, F>(self, f: F) -> WithFlatMap<Self, Item, U, St, F>
-        where F: FnMut(U) -> St,
-              St: Stream<Item = Result<Item, Self::Error>>,
-              Self: Sized
+    where
+        F: FnMut(U) -> St,
+        St: Stream<Item = Result<Item, Self::Error>>,
+        Self: Sized,
     {
-        WithFlatMap::new(self, f)
+        assert_sink::<U, Self::Error, _>(WithFlatMap::new(self, f))
     }
 
     /*
@@ -133,23 +141,24 @@
 
     /// Transforms the error returned by the sink.
     fn sink_map_err<E, F>(self, f: F) -> SinkMapErr<Self, F>
-        where F: FnOnce(Self::Error) -> E,
-              Self: Sized,
+    where
+        F: FnOnce(Self::Error) -> E,
+        Self: Sized,
     {
-        SinkMapErr::new(self, f)
+        assert_sink::<Item, E, _>(SinkMapErr::new(self, f))
     }
 
     /// Map this sink's error to a different error type using the `Into` trait.
     ///
     /// If wanting to map errors of a `Sink + Stream`, use `.sink_err_into().err_into()`.
     fn sink_err_into<E>(self) -> err_into::SinkErrInto<Self, Item, E>
-        where Self: Sized,
-              Self::Error: Into<E>,
+    where
+        Self: Sized,
+        Self::Error: Into<E>,
     {
-        SinkErrInto::new(self)
+        assert_sink::<Item, E, _>(SinkErrInto::new(self))
     }
 
-
     /// Adds a fixed-size buffer to the current sink.
     ///
     /// The resulting sink will buffer up to `capacity` items when the
@@ -164,16 +173,18 @@
     /// library is activated, and it is activated by default.
     #[cfg(feature = "alloc")]
     fn buffer(self, capacity: usize) -> Buffer<Self, Item>
-        where Self: Sized,
+    where
+        Self: Sized,
     {
-        Buffer::new(self, capacity)
+        assert_sink::<Item, Self::Error, _>(Buffer::new(self, capacity))
     }
 
     /// Close the sink.
     fn close(&mut self) -> Close<'_, Self, Item>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        Close::new(self)
+        assert_future::<Result<(), Self::Error>, _>(Close::new(self))
     }
 
     /// Fanout items to multiple sinks.
@@ -181,11 +192,12 @@
     /// This adapter clones each incoming item and forwards it to both this as well as
     /// the other sink at the same time.
     fn fanout<Si>(self, other: Si) -> Fanout<Self, Si>
-        where Self: Sized,
-              Item: Clone,
-              Si: Sink<Item, Error=Self::Error>
+    where
+        Self: Sized,
+        Item: Clone,
+        Si: Sink<Item, Error = Self::Error>,
     {
-        Fanout::new(self, other)
+        assert_sink::<Item, Self::Error, _>(Fanout::new(self, other))
     }
 
     /// Flush the sink, processing all pending items.
@@ -193,21 +205,36 @@
     /// This adapter is intended to be used when you want to stop sending to the sink
     /// until all current requests are processed.
     fn flush(&mut self) -> Flush<'_, Self, Item>
-        where Self: Unpin,
+    where
+        Self: Unpin,
     {
-        Flush::new(self)
+        assert_future::<Result<(), Self::Error>, _>(Flush::new(self))
     }
 
     /// A future that completes after the given item has been fully processed
     /// into the sink, including flushing.
     ///
     /// Note that, **because of the flushing requirement, it is usually better
-    /// to batch together items to send via `send_all`, rather than flushing
-    /// between each item.**
+    /// to batch together items to send via `feed` or `send_all`,
+    /// rather than flushing between each item.**
     fn send(&mut self, item: Item) -> Send<'_, Self, Item>
-        where Self: Unpin,
+    where
+        Self: Unpin,
+    {
+        assert_future::<Result<(), Self::Error>, _>(Send::new(self, item))
+    }
+
+    /// A future that completes after the given item has been received
+    /// by the sink.
+    ///
+    /// Unlike `send`, the returned future does not flush the sink.
+    /// It is the caller's responsibility to ensure all pending items
+    /// are processed, which can be done via `flush` or `close`.
+    fn feed(&mut self, item: Item) -> Feed<'_, Self, Item>
+    where
+        Self: Unpin,
     {
-        Send::new(self, item)
+        assert_future::<Result<(), Self::Error>, _>(Feed::new(self, item))
     }
 
     /// A future that completes after the given stream has been fully processed
@@ -216,18 +243,20 @@
     /// This future will drive the stream to keep producing items until it is
     /// exhausted, sending each item to the sink. It will complete once both the
     /// stream is exhausted, the sink has received all items, and the sink has
-    /// been flushed. Note that the sink is **not** closed.
+    /// been flushed. Note that the sink is **not** closed. If the stream produces
+    /// an error, that error will be returned by this future without flushing the sink.
     ///
     /// Doing `sink.send_all(stream)` is roughly equivalent to
     /// `stream.forward(sink)`. The returned future will exhaust all items from
     /// `stream` and send them to `self`.
-    fn send_all<'a, St>(
-        &'a mut self,
-        stream: &'a mut St
-    ) -> SendAll<'a, Self, St>
-        where St: TryStream<Ok = Item, Error = Self::Error> + Stream + Unpin + ?Sized,
-              Self: Unpin,
+    fn send_all<'a, St>(&'a mut self, stream: &'a mut St) -> SendAll<'a, Self, St>
+    where
+        St: TryStream<Ok = Item, Error = Self::Error> + Stream + Unpin + ?Sized,
+        // St: Stream<Item = Result<Item, Self::Error>> + Unpin + ?Sized,
+        Self: Unpin,
     {
+        // TODO: type mismatch resolving `<St as Stream>::Item == std::result::Result<Item, <Self as futures_sink::Sink<Item>>::Error>`
+        // assert_future::<Result<(), Self::Error>, _>(SendAll::new(self, stream))
         SendAll::new(self, stream)
     }
 
@@ -237,10 +266,11 @@
     /// This can be used in combination with the `right_sink` method to write `if`
     /// statements that evaluate to different streams in different branches.
     fn left_sink<Si2>(self) -> Either<Self, Si2>
-        where Si2: Sink<Item, Error = Self::Error>,
-              Self: Sized
+    where
+        Si2: Sink<Item, Error = Self::Error>,
+        Self: Sized,
     {
-        Either::Left(self)
+        assert_sink::<Item, Self::Error, _>(Either::Left(self))
     }
 
     /// Wrap this stream in an `Either` stream, making it the right-hand variant
@@ -249,10 +279,11 @@
     /// This can be used in combination with the `left_sink` method to write `if`
     /// statements that evaluate to different streams in different branches.
     fn right_sink<Si1>(self) -> Either<Si1, Self>
-        where Si1: Sink<Item, Error = Self::Error>,
-              Self: Sized
+    where
+        Si1: Sink<Item, Error = Self::Error>,
+        Self: Sized,
     {
-        Either::Right(self)
+        assert_sink::<Item, Self::Error, _>(Either::Right(self))
     }
 
     /// Wraps a [`Sink`] into a sink compatible with libraries using
@@ -260,15 +291,17 @@
     #[cfg(feature = "compat")]
     #[cfg_attr(docsrs, doc(cfg(feature = "compat")))]
     fn compat(self) -> CompatSink<Self, Item>
-        where Self: Sized + Unpin,
+    where
+        Self: Sized + Unpin,
     {
         CompatSink::new(self)
     }
-    
+
     /// A convenience method for calling [`Sink::poll_ready`] on [`Unpin`]
     /// sink types.
     fn poll_ready_unpin(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>>
-        where Self: Unpin
+    where
+        Self: Unpin,
     {
         Pin::new(self).poll_ready(cx)
     }
@@ -276,7 +309,8 @@
     /// A convenience method for calling [`Sink::start_send`] on [`Unpin`]
     /// sink types.
     fn start_send_unpin(&mut self, item: Item) -> Result<(), Self::Error>
-        where Self: Unpin
+    where
+        Self: Unpin,
     {
         Pin::new(self).start_send(item)
     }
@@ -284,7 +318,8 @@
     /// A convenience method for calling [`Sink::poll_flush`] on [`Unpin`]
     /// sink types.
     fn poll_flush_unpin(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>>
-        where Self: Unpin
+    where
+        Self: Unpin,
     {
         Pin::new(self).poll_flush(cx)
     }
@@ -292,8 +327,18 @@
     /// A convenience method for calling [`Sink::poll_close`] on [`Unpin`]
     /// sink types.
     fn poll_close_unpin(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>>
-        where Self: Unpin
+    where
+        Self: Unpin,
     {
         Pin::new(self).poll_close(cx)
     }
 }
+
+// Just a helper function to ensure the sinks we're returning all have the
+// right implementations.
+pub(crate) fn assert_sink<T, E, S>(sink: S) -> S
+where
+    S: Sink<T, Error = E>,
+{
+    sink
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/send_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/send_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/send_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/send_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
-use crate::stream::{StreamExt, TryStreamExt, Fuse};
+use crate::stream::{Fuse, StreamExt, TryStreamExt};
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
-use futures_core::stream::{TryStream, Stream};
+use futures_core::ready;
+use futures_core::stream::{Stream, TryStream};
 use futures_core::task::{Context, Poll};
 use futures_sink::Sink;
 
@@ -39,22 +40,16 @@
 where
     Si: Unpin + ?Sized,
     St: TryStream + Unpin + ?Sized,
-{}
+{
+}
 
 impl<'a, Si, St, Ok, Error> SendAll<'a, Si, St>
 where
     Si: Sink<Ok, Error = Error> + Unpin + ?Sized,
     St: TryStream<Ok = Ok, Error = Error> + Stream + Unpin + ?Sized,
 {
-    pub(super) fn new(
-        sink: &'a mut Si,
-        stream: &'a mut St,
-    ) -> Self {
-        Self {
-            sink,
-            stream: stream.fuse(),
-            buffered: None,
-        }
+    pub(super) fn new(sink: &'a mut Si, stream: &'a mut St) -> Self {
+        Self { sink, stream: stream.fuse(), buffered: None }
     }
 
     fn try_start_send(
@@ -64,9 +59,7 @@
     ) -> Poll<Result<(), Si::Error>> {
         debug_assert!(self.buffered.is_none());
         match Pin::new(&mut self.sink).poll_ready(cx)? {
-            Poll::Ready(()) => {
-                Poll::Ready(Pin::new(&mut self.sink).start_send(item))
-            }
+            Poll::Ready(()) => Poll::Ready(Pin::new(&mut self.sink).start_send(item)),
             Poll::Pending => {
                 self.buffered = Some(item);
                 Poll::Pending
@@ -82,10 +75,7 @@
 {
     type Output = Result<(), Error>;
 
-    fn poll(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = &mut *self;
         // If we've got an item buffered already, we need to write it to the
         // sink before we can do anything else
@@ -95,16 +85,14 @@
 
         loop {
             match this.stream.try_poll_next_unpin(cx)? {
-                Poll::Ready(Some(item)) => {
-                    ready!(this.try_start_send(cx, item))?
-                }
+                Poll::Ready(Some(item)) => ready!(this.try_start_send(cx, item))?,
                 Poll::Ready(None) => {
                     ready!(Pin::new(&mut this.sink).poll_flush(cx))?;
-                    return Poll::Ready(Ok(()))
+                    return Poll::Ready(Ok(()));
                 }
                 Poll::Pending => {
                     ready!(Pin::new(&mut this.sink).poll_flush(cx))?;
-                    return Poll::Pending
+                    return Poll::Pending;
                 }
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/send.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/send.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/send.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/send.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
+use super::Feed;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::task::{Context, Poll};
 use futures_sink::Sink;
 
@@ -7,8 +9,7 @@
 #[derive(Debug)]
 #[must_use = "futures do nothing unless you `.await` or poll them"]
 pub struct Send<'a, Si: ?Sized, Item> {
-    sink: &'a mut Si,
-    item: Option<Item>,
+    feed: Feed<'a, Si, Item>,
 }
 
 // Pinning is never projected to children
@@ -16,35 +17,24 @@
 
 impl<'a, Si: Sink<Item> + Unpin + ?Sized, Item> Send<'a, Si, Item> {
     pub(super) fn new(sink: &'a mut Si, item: Item) -> Self {
-        Self {
-            sink,
-            item: Some(item),
-        }
+        Self { feed: Feed::new(sink, item) }
     }
 }
 
 impl<Si: Sink<Item> + Unpin + ?Sized, Item> Future for Send<'_, Si, Item> {
     type Output = Result<(), Si::Error>;
 
-    fn poll(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = &mut *self;
-        if let Some(item) = this.item.take() {
-            let mut sink = Pin::new(&mut this.sink);
-            match sink.as_mut().poll_ready(cx)? {
-                Poll::Ready(()) => sink.as_mut().start_send(item)?,
-                Poll::Pending => {
-                    this.item = Some(item);
-                    return Poll::Pending;
-                }
-            }
+
+        if this.feed.is_item_pending() {
+            ready!(Pin::new(&mut this.feed).poll(cx))?;
+            debug_assert!(!this.feed.is_item_pending());
         }
 
         // we're done sending the item, but want to block on flushing the
         // sink
-        ready!(Pin::new(&mut this.sink).poll_flush(cx))?;
+        ready!(this.feed.sink_pin_mut().poll_flush(cx))?;
 
         Poll::Ready(Ok(()))
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/unfold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/unfold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/unfold.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/unfold.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,86 @@
+use super::assert_sink;
+use crate::unfold_state::UnfoldState;
+use core::{future::Future, pin::Pin};
+use futures_core::ready;
+use futures_core::task::{Context, Poll};
+use futures_sink::Sink;
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// Sink for the [`unfold`] function.
+    #[derive(Debug)]
+    #[must_use = "sinks do nothing unless polled"]
+    pub struct Unfold<T, F, R> {
+        function: F,
+        #[pin]
+        state: UnfoldState<T, R>,
+    }
+}
+
+/// Create a sink from a function which processes one item at a time.
+///
+/// # Examples
+///
+/// ```
+/// # futures::executor::block_on(async {
+/// use futures::sink::{self, SinkExt};
+///
+/// let unfold = sink::unfold(0, |mut sum, i: i32| {
+///     async move {
+///         sum += i;
+///         eprintln!("{}", i);
+///         Ok::<_, futures::never::Never>(sum)
+///     }
+/// });
+/// futures::pin_mut!(unfold);
+/// unfold.send(5).await?;
+/// # Ok::<(), futures::never::Never>(()) }).unwrap();
+/// ```
+pub fn unfold<T, F, R, Item, E>(init: T, function: F) -> Unfold<T, F, R>
+where
+    F: FnMut(T, Item) -> R,
+    R: Future<Output = Result<T, E>>,
+{
+    assert_sink::<Item, E, _>(Unfold { function, state: UnfoldState::Value { value: init } })
+}
+
+impl<T, F, R, Item, E> Sink<Item> for Unfold<T, F, R>
+where
+    F: FnMut(T, Item) -> R,
+    R: Future<Output = Result<T, E>>,
+{
+    type Error = E;
+
+    fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        self.poll_flush(cx)
+    }
+
+    fn start_send(self: Pin<&mut Self>, item: Item) -> Result<(), Self::Error> {
+        let mut this = self.project();
+        let future = match this.state.as_mut().take_value() {
+            Some(value) => (this.function)(value, item),
+            None => panic!("start_send called without poll_ready being called first"),
+        };
+        this.state.set(UnfoldState::Future { future });
+        Ok(())
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        let mut this = self.project();
+        Poll::Ready(if let Some(future) = this.state.as_mut().project_future() {
+            match ready!(future.poll(cx)) {
+                Ok(state) => {
+                    this.state.set(UnfoldState::Value { value: state });
+                    Ok(())
+                }
+                Err(err) => Err(err),
+            }
+        } else {
+            Ok(())
+        })
+    }
+
+    fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        self.poll_flush(cx)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/with_flat_map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/with_flat_map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/with_flat_map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/with_flat_map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,24 @@
 use core::fmt;
 use core::marker::PhantomData;
 use core::pin::Pin;
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Sink for the [`with_flat_map`](super::SinkExt::with_flat_map) method.
-#[pin_project]
-#[must_use = "sinks do nothing unless polled"]
-pub struct WithFlatMap<Si, Item, U, St, F> {
-    #[pin]
-    sink: Si,
-    f: F,
-    #[pin]
-    stream: Option<St>,
-    buffer: Option<Item>,
-    _marker: PhantomData<fn(U)>,
+pin_project! {
+    /// Sink for the [`with_flat_map`](super::SinkExt::with_flat_map) method.
+    #[must_use = "sinks do nothing unless polled"]
+    pub struct WithFlatMap<Si, Item, U, St, F> {
+        #[pin]
+        sink: Si,
+        f: F,
+        #[pin]
+        stream: Option<St>,
+        buffer: Option<Item>,
+        _marker: PhantomData<fn(U)>,
+    }
 }
 
 impl<Si, Item, U, St, F> fmt::Debug for WithFlatMap<Si, Item, U, St, F>
@@ -41,21 +43,12 @@
     St: Stream<Item = Result<Item, Si::Error>>,
 {
     pub(super) fn new(sink: Si, f: F) -> Self {
-        Self {
-            sink,
-            f,
-            stream: None,
-            buffer: None,
-            _marker: PhantomData,
-        }
+        Self { sink, f, stream: None, buffer: None, _marker: PhantomData }
     }
 
     delegate_access_inner!(sink, Si, ());
 
-    fn try_empty_stream(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Si::Error>> {
+    fn try_empty_stream(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Si::Error>> {
         let mut this = self.project();
 
         if this.buffer.is_some() {
@@ -110,17 +103,11 @@
 {
     type Error = Si::Error;
 
-    fn poll_ready(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.try_empty_stream(cx)
     }
 
-    fn start_send(
-        self: Pin<&mut Self>,
-        item: U,
-    ) -> Result<(), Self::Error> {
+    fn start_send(self: Pin<&mut Self>, item: U) -> Result<(), Self::Error> {
         let mut this = self.project();
 
         assert!(this.stream.is_none());
@@ -128,18 +115,12 @@
         Ok(())
     }
 
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().try_empty_stream(cx)?);
         self.project().sink.poll_flush(cx)
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().try_empty_stream(cx)?);
         self.project().sink.poll_close(cx)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/with.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/with.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/sink/with.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/sink/with.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,21 +2,23 @@
 use core::marker::PhantomData;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Sink for the [`with`](super::SinkExt::with) method.
-#[pin_project]
-#[must_use = "sinks do nothing unless polled"]
-pub struct With<Si, Item, U, Fut, F> {
-    #[pin]
-    sink: Si,
-    f: F,
-    #[pin]
-    state: Option<Fut>,
-    _phantom: PhantomData<fn(U) -> Item>,
+pin_project! {
+    /// Sink for the [`with`](super::SinkExt::with) method.
+    #[must_use = "sinks do nothing unless polled"]
+    pub struct With<Si, Item, U, Fut, F> {
+        #[pin]
+        sink: Si,
+        f: F,
+        #[pin]
+        state: Option<Fut>,
+        _phantom: PhantomData<fn(U) -> Item>,
+    }
 }
 
 impl<Si, Item, U, Fut, F> fmt::Debug for With<Si, Item, U, Fut, F>
@@ -25,27 +27,36 @@
     Fut: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("With")
-            .field("sink", &self.sink)
-            .field("state", &self.state)
-            .finish()
+        f.debug_struct("With").field("sink", &self.sink).field("state", &self.state).finish()
     }
 }
 
 impl<Si, Item, U, Fut, F> With<Si, Item, U, Fut, F>
-where Si: Sink<Item>,
-      F: FnMut(U) -> Fut,
-      Fut: Future,
+where
+    Si: Sink<Item>,
+    F: FnMut(U) -> Fut,
+    Fut: Future,
 {
     pub(super) fn new<E>(sink: Si, f: F) -> Self
-        where
-            Fut: Future<Output = Result<Item, E>>,
-            E: From<Si::Error>,
+    where
+        Fut: Future<Output = Result<Item, E>>,
+        E: From<Si::Error>,
     {
+        Self { state: None, sink, f, _phantom: PhantomData }
+    }
+}
+
+impl<Si, Item, U, Fut, F> Clone for With<Si, Item, U, Fut, F>
+where
+    Si: Clone,
+    F: Clone,
+    Fut: Clone,
+{
+    fn clone(&self) -> Self {
         Self {
-            state: None,
-            sink,
-            f,
+            state: self.state.clone(),
+            sink: self.sink.clone(),
+            f: self.f.clone(),
             _phantom: PhantomData,
         }
     }
@@ -53,9 +64,10 @@
 
 // Forwarding impl of Stream from the underlying sink
 impl<S, Item, U, Fut, F> Stream for With<S, Item, U, Fut, F>
-    where S: Stream + Sink<Item>,
-          F: FnMut(U) -> Fut,
-          Fut: Future
+where
+    S: Stream + Sink<Item>,
+    F: FnMut(U) -> Fut,
+    Fut: Future,
 {
     type Item = S::Item;
 
@@ -63,18 +75,16 @@
 }
 
 impl<Si, Item, U, Fut, F, E> With<Si, Item, U, Fut, F>
-    where Si: Sink<Item>,
-          F: FnMut(U) -> Fut,
-          Fut: Future<Output = Result<Item, E>>,
-          E: From<Si::Error>,
+where
+    Si: Sink<Item>,
+    F: FnMut(U) -> Fut,
+    Fut: Future<Output = Result<Item, E>>,
+    E: From<Si::Error>,
 {
     delegate_access_inner!(sink, Si, ());
 
     /// Completes the processing of previous item if any.
-    fn poll(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), E>> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), E>> {
         let mut this = self.project();
 
         let item = match this.state.as_mut().as_pin_mut() {
@@ -88,26 +98,21 @@
 }
 
 impl<Si, Item, U, Fut, F, E> Sink<U> for With<Si, Item, U, Fut, F>
-    where Si: Sink<Item>,
-          F: FnMut(U) -> Fut,
-          Fut: Future<Output = Result<Item, E>>,
-          E: From<Si::Error>,
+where
+    Si: Sink<Item>,
+    F: FnMut(U) -> Fut,
+    Fut: Future<Output = Result<Item, E>>,
+    E: From<Si::Error>,
 {
     type Error = E;
 
-    fn poll_ready(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().poll(cx))?;
         ready!(self.project().sink.poll_ready(cx)?);
         Poll::Ready(Ok(()))
     }
 
-    fn start_send(
-        self: Pin<&mut Self>,
-        item: U,
-    ) -> Result<(), Self::Error> {
+    fn start_send(self: Pin<&mut Self>, item: U) -> Result<(), Self::Error> {
         let mut this = self.project();
 
         assert!(this.state.is_none());
@@ -115,19 +120,13 @@
         Ok(())
     }
 
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().poll(cx))?;
         ready!(self.project().sink.poll_flush(cx)?);
         Poll::Ready(Ok(()))
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.as_mut().poll(cx))?;
         ready!(self.project().sink.poll_close(cx)?);
         Poll::Ready(Ok(()))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/abortable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/abortable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/abortable.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/abortable.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+use super::assert_stream;
+use crate::stream::{AbortHandle, Abortable};
+use crate::Stream;
+
+/// Creates a new `Abortable` stream and an `AbortHandle` which can be used to stop it.
+///
+/// This function is a convenient (but less flexible) alternative to calling
+/// `AbortHandle::new` and `Abortable::new` manually.
+///
+/// This function is only available when the `std` or `alloc` feature of this
+/// library is activated, and it is activated by default.
+pub fn abortable<St>(stream: St) -> (Abortable<St>, AbortHandle)
+where
+    St: Stream,
+{
+    let (handle, reg) = AbortHandle::new_pair();
+    let abortable = assert_stream::<St::Item, _>(Abortable::new(stream, reg));
+    (abortable, handle)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/empty.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/empty.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/empty.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/empty.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use super::assert_stream;
 use core::marker::PhantomData;
 use core::pin::Pin;
 use futures_core::stream::{FusedStream, Stream};
@@ -7,16 +8,14 @@
 #[derive(Debug)]
 #[must_use = "streams do nothing unless polled"]
 pub struct Empty<T> {
-    _phantom: PhantomData<T>
+    _phantom: PhantomData<T>,
 }
 
 /// Creates a stream which contains no elements.
 ///
 /// The returned stream will always return `Ready(None)` when polled.
 pub fn empty<T>() -> Empty<T> {
-    Empty {
-        _phantom: PhantomData
-    }
+    assert_stream::<T, _>(Empty { _phantom: PhantomData })
 }
 
 impl<T> Unpin for Empty<T> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_ordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_ordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_ordered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_ordered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1,26 @@
 use crate::stream::{FuturesUnordered, StreamExt};
-use futures_core::future::Future;
-use futures_core::stream::Stream;
-use futures_core::{FusedStream, task::{Context, Poll}};
-use pin_project::pin_project;
+use alloc::collections::binary_heap::{BinaryHeap, PeekMut};
 use core::cmp::Ordering;
 use core::fmt::{self, Debug};
 use core::iter::FromIterator;
 use core::pin::Pin;
-use alloc::collections::binary_heap::{BinaryHeap, PeekMut};
-
-#[pin_project]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-#[derive(Debug)]
-struct OrderWrapper<T> {
-    #[pin]
-    data: T, // A future or a future's output
-    index: usize,
+use futures_core::future::Future;
+use futures_core::ready;
+use futures_core::stream::Stream;
+use futures_core::{
+    task::{Context, Poll},
+    FusedStream,
+};
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    #[derive(Debug)]
+    struct OrderWrapper<T> {
+        #[pin]
+        data: T, // A future or a future's output
+        index: usize,
+    }
 }
 
 impl<T> PartialEq for OrderWrapper<T> {
@@ -40,17 +45,14 @@
 }
 
 impl<T> Future for OrderWrapper<T>
-    where T: Future
+where
+    T: Future,
 {
     type Output = OrderWrapper<T::Output>;
 
-    fn poll(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let index = self.index;
-        self.project().data.poll(cx)
-            .map(|output| OrderWrapper { data: output, index })
+        self.project().data.poll(cx).map(|output| OrderWrapper { data: output, index })
     }
 }
 
@@ -134,10 +136,7 @@
     /// must ensure that `FuturesOrdered::poll` is called in order to receive
     /// task notifications.
     pub fn push(&mut self, future: Fut) {
-        let wrapped = OrderWrapper {
-            data: future,
-            index: self.next_incoming_index,
-        };
+        let wrapped = OrderWrapper { data: future, index: self.next_incoming_index };
         self.next_incoming_index += 1;
         self.in_progress_queue.push(wrapped);
     }
@@ -152,10 +151,7 @@
 impl<Fut: Future> Stream for FuturesOrdered<Fut> {
     type Item = Fut::Output;
 
-    fn poll_next(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let this = &mut *self;
 
         // Check to see if we've already received the next value
@@ -199,7 +195,10 @@
         T: IntoIterator<Item = Fut>,
     {
         let acc = Self::new();
-        iter.into_iter().fold(acc, |mut acc, item| { acc.push(item); acc })
+        iter.into_iter().fold(acc, |mut acc, item| {
+            acc.push(item);
+            acc
+        })
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,41 +1,83 @@
-use super::FuturesUnordered;
 use super::task::Task;
+use super::FuturesUnordered;
 use core::marker::PhantomData;
 use core::pin::Pin;
 use core::sync::atomic::Ordering::Relaxed;
 
-#[derive(Debug)]
 /// Mutable iterator over all futures in the unordered set.
+#[derive(Debug)]
 pub struct IterPinMut<'a, Fut> {
     pub(super) task: *const Task<Fut>,
     pub(super) len: usize,
-    pub(super) _marker: PhantomData<&'a mut FuturesUnordered<Fut>>
+    pub(super) _marker: PhantomData<&'a mut FuturesUnordered<Fut>>,
 }
 
-#[derive(Debug)]
 /// Mutable iterator over all futures in the unordered set.
-pub struct IterMut<'a, Fut: Unpin> (pub(super) IterPinMut<'a, Fut>);
-
 #[derive(Debug)]
+pub struct IterMut<'a, Fut: Unpin>(pub(super) IterPinMut<'a, Fut>);
+
 /// Immutable iterator over all futures in the unordered set.
+#[derive(Debug)]
 pub struct IterPinRef<'a, Fut> {
     pub(super) task: *const Task<Fut>,
     pub(super) len: usize,
     pub(super) pending_next_all: *mut Task<Fut>,
-    pub(super) _marker: PhantomData<&'a FuturesUnordered<Fut>>
+    pub(super) _marker: PhantomData<&'a FuturesUnordered<Fut>>,
 }
 
-#[derive(Debug)]
 /// Immutable iterator over all the futures in the unordered set.
-pub struct Iter<'a, Fut: Unpin> (pub(super) IterPinRef<'a, Fut>);
+#[derive(Debug)]
+pub struct Iter<'a, Fut: Unpin>(pub(super) IterPinRef<'a, Fut>);
+
+/// Owned iterator over all futures in the unordered set.
+#[derive(Debug)]
+pub struct IntoIter<Fut: Unpin> {
+    pub(super) len: usize,
+    pub(super) inner: FuturesUnordered<Fut>,
+}
+
+impl<Fut: Unpin> Iterator for IntoIter<Fut> {
+    type Item = Fut;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        // `head_all` can be accessed directly and we don't need to spin on
+        // `Task::next_all` since we have exclusive access to the set.
+        let task = self.inner.head_all.get_mut();
+
+        if (*task).is_null() {
+            return None;
+        }
+
+        unsafe {
+            // Moving out of the future is safe because it is `Unpin`
+            let future = (*(**task).future.get()).take().unwrap();
+
+            // Mutable access to a previously shared `FuturesUnordered` implies
+            // that the other threads already released the object before the
+            // current thread acquired it, so relaxed ordering can be used and
+            // valid `next_all` checks can be skipped.
+            let next = (**task).next_all.load(Relaxed);
+            *task = next;
+            self.len -= 1;
+            Some(future)
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.len, Some(self.len))
+    }
+}
+
+impl<Fut: Unpin> ExactSizeIterator for IntoIter<Fut> {}
 
 impl<'a, Fut> Iterator for IterPinMut<'a, Fut> {
     type Item = Pin<&'a mut Fut>;
 
-    fn next(&mut self) -> Option<Pin<&'a mut Fut>> {
+    fn next(&mut self) -> Option<Self::Item> {
         if self.task.is_null() {
             return None;
         }
+
         unsafe {
             let future = (*(*self.task).future.get()).as_mut().unwrap();
 
@@ -60,7 +102,7 @@
 impl<'a, Fut: Unpin> Iterator for IterMut<'a, Fut> {
     type Item = &'a mut Fut;
 
-    fn next(&mut self) -> Option<&'a mut Fut> {
+    fn next(&mut self) -> Option<Self::Item> {
         self.0.next().map(Pin::get_mut)
     }
 
@@ -74,10 +116,11 @@
 impl<'a, Fut> Iterator for IterPinRef<'a, Fut> {
     type Item = Pin<&'a Fut>;
 
-    fn next(&mut self) -> Option<Pin<&'a Fut>> {
+    fn next(&mut self) -> Option<Self::Item> {
         if self.task.is_null() {
             return None;
         }
+
         unsafe {
             let future = (*(*self.task).future.get()).as_ref().unwrap();
 
@@ -85,10 +128,7 @@
             // `head_all` was initially read for this iterator implies acquire
             // ordering for all previously inserted nodes (and we don't need to
             // read `len_all` again for any other nodes).
-            let next = (*self.task).spin_next_all(
-                self.pending_next_all,
-                Relaxed,
-            );
+            let next = (*self.task).spin_next_all(self.pending_next_all, Relaxed);
             self.task = next;
             self.len -= 1;
             Some(Pin::new_unchecked(future))
@@ -105,7 +145,7 @@
 impl<'a, Fut: Unpin> Iterator for Iter<'a, Fut> {
     type Item = &'a Fut;
 
-    fn next(&mut self) -> Option<&'a Fut> {
+    fn next(&mut self) -> Option<Self::Item> {
         self.0.next().map(Pin::get_ref)
     }
 
@@ -115,3 +155,14 @@
 }
 
 impl<Fut: Unpin> ExactSizeIterator for Iter<'_, Fut> {}
+
+// SAFETY: we do nothing thread-local and there is no interior mutability,
+// so the usual structural `Send`/`Sync` apply.
+unsafe impl<Fut: Send> Send for IterPinRef<'_, Fut> {}
+unsafe impl<Fut: Sync> Sync for IterPinRef<'_, Fut> {}
+
+unsafe impl<Fut: Send> Send for IterPinMut<'_, Fut> {}
+unsafe impl<Fut: Sync> Sync for IterPinMut<'_, Fut> {}
+
+unsafe impl<Fut: Send + Unpin> Send for IntoIter<Fut> {}
+unsafe impl<Fut: Sync + Unpin> Sync for IntoIter<Fut> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,11 +3,8 @@
 //! This module is only available when the `std` or `alloc` feature of this
 //! library is activated, and it is activated by default.
 
-use futures_core::future::Future;
-use futures_core::stream::{FusedStream, Stream};
-use futures_core::task::{Context, Poll};
-use futures_task::{FutureObj, LocalFutureObj, Spawn, LocalSpawn, SpawnError};
 use crate::task::AtomicWaker;
+use alloc::sync::{Arc, Weak};
 use core::cell::UnsafeCell;
 use core::fmt::{self, Debug};
 use core::iter::FromIterator;
@@ -16,36 +13,22 @@
 use core::pin::Pin;
 use core::ptr;
 use core::sync::atomic::Ordering::{AcqRel, Acquire, Relaxed, Release, SeqCst};
-use core::sync::atomic::{AtomicPtr, AtomicBool};
-use alloc::sync::{Arc, Weak};
+use core::sync::atomic::{AtomicBool, AtomicPtr};
+use futures_core::future::Future;
+use futures_core::stream::{FusedStream, Stream};
+use futures_core::task::{Context, Poll};
+use futures_task::{FutureObj, LocalFutureObj, LocalSpawn, Spawn, SpawnError};
 
 mod abort;
 
 mod iter;
-pub use self::iter::{Iter, IterMut, IterPinMut, IterPinRef};
+pub use self::iter::{IntoIter, Iter, IterMut, IterPinMut, IterPinRef};
 
 mod task;
 use self::task::Task;
 
 mod ready_to_run_queue;
-use self::ready_to_run_queue::{ReadyToRunQueue, Dequeue};
-
-/// Constant used for a `FuturesUnordered` to determine how many times it is
-/// allowed to poll underlying futures without yielding.
-///
-/// A single call to `poll_next` may potentially do a lot of work before
-/// yielding. This happens in particular if the underlying futures are awoken
-/// frequently but continue to return `Pending`. This is problematic if other
-/// tasks are waiting on the executor, since they do not get to run. This value
-/// caps the number of calls to `poll` on underlying futures a single call to
-/// `poll_next` is allowed to make.
-///
-/// The value itself is chosen somewhat arbitrarily. It needs to be high enough
-/// that amortize wakeup and scheduling costs, but low enough that we do not
-/// starve other tasks for long.
-///
-/// See also https://github.com/rust-lang/futures-rs/issues/2047.
-const YIELD_EVERY: usize = 32;
+use self::ready_to_run_queue::{Dequeue, ReadyToRunQueue};
 
 /// A set of futures which may complete in any order.
 ///
@@ -79,18 +62,14 @@
 impl<Fut> Unpin for FuturesUnordered<Fut> {}
 
 impl Spawn for FuturesUnordered<FutureObj<'_, ()>> {
-    fn spawn_obj(&self, future_obj: FutureObj<'static, ()>)
-        -> Result<(), SpawnError>
-    {
+    fn spawn_obj(&self, future_obj: FutureObj<'static, ()>) -> Result<(), SpawnError> {
         self.push(future_obj);
         Ok(())
     }
 }
 
 impl LocalSpawn for FuturesUnordered<LocalFutureObj<'_, ()>> {
-    fn spawn_local_obj(&self, future_obj: LocalFutureObj<'static, ()>)
-        -> Result<(), SpawnError>
-    {
+    fn spawn_local_obj(&self, future_obj: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
         self.push(future_obj);
         Ok(())
     }
@@ -118,7 +97,7 @@
 // Each task is wrapped in an `Arc` and thereby atomically reference counted.
 // Also, each task contains an `AtomicBool` which acts as a flag that indicates
 // whether the task is currently inserted in the atomic queue. When a wake-up
-// notifiaction is received, the task will only be inserted into the ready to
+// notification is received, the task will only be inserted into the ready to
 // run queue if it isn't inserted already.
 
 impl<Fut> Default for FuturesUnordered<Fut> {
@@ -207,24 +186,26 @@
     }
 
     /// Returns an iterator that allows inspecting each future in the set.
-    pub fn iter(&self) -> Iter<'_, Fut> where Fut: Unpin {
+    pub fn iter(&self) -> Iter<'_, Fut>
+    where
+        Fut: Unpin,
+    {
         Iter(Pin::new(self).iter_pin_ref())
     }
 
     /// Returns an iterator that allows inspecting each future in the set.
-    fn iter_pin_ref(self: Pin<&Self>) -> IterPinRef<'_, Fut> {
+    pub fn iter_pin_ref(self: Pin<&Self>) -> IterPinRef<'_, Fut> {
         let (task, len) = self.atomic_load_head_and_len_all();
+        let pending_next_all = self.pending_next_all();
 
-        IterPinRef {
-            task,
-            len,
-            pending_next_all: self.pending_next_all(),
-            _marker: PhantomData,
-        }
+        IterPinRef { task, len, pending_next_all, _marker: PhantomData }
     }
 
     /// Returns an iterator that allows modifying each future in the set.
-    pub fn iter_mut(&mut self) -> IterMut<'_, Fut> where Fut: Unpin {
+    pub fn iter_mut(&mut self) -> IterMut<'_, Fut>
+    where
+        Fut: Unpin,
+    {
         IterMut(Pin::new(self).iter_pin_mut())
     }
 
@@ -233,19 +214,9 @@
         // `head_all` can be accessed directly and we don't need to spin on
         // `Task::next_all` since we have exclusive access to the set.
         let task = *self.head_all.get_mut();
-        let len = if task.is_null() {
-            0
-        } else {
-            unsafe {
-                *(*task).len_all.get()
-            }
-        };
+        let len = if task.is_null() { 0 } else { unsafe { *(*task).len_all.get() } };
 
-        IterPinMut {
-            task,
-            len,
-            _marker: PhantomData
-        }
+        IterPinMut { task, len, _marker: PhantomData }
     }
 
     /// Returns the current head node and number of futures in the list of all
@@ -265,7 +236,7 @@
         (task, len)
     }
 
-    /// Releases the task. It destorys the future inside and either drops
+    /// Releases the task. It destroys the future inside and either drops
     /// the `Arc<Task>` or transfers ownership to the ready to run queue.
     /// The task this method is called on must have been unlinked before.
     fn release_task(&mut self, task: Arc<Task<Fut>>) {
@@ -411,9 +382,23 @@
 impl<Fut: Future> Stream for FuturesUnordered<Fut> {
     type Item = Fut::Output;
 
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>)
-        -> Poll<Option<Self::Item>>
-    {
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        // Variable to determine how many times it is allowed to poll underlying
+        // futures without yielding.
+        //
+        // A single call to `poll_next` may potentially do a lot of work before
+        // yielding. This happens in particular if the underlying futures are awoken
+        // frequently but continue to return `Pending`. This is problematic if other
+        // tasks are waiting on the executor, since they do not get to run. This value
+        // caps the number of calls to `poll` on underlying futures a single call to
+        // `poll_next` is allowed to make.
+        //
+        // The value is the length of FuturesUnordered. This ensures that each
+        // future is polled only once at most per iteration.
+        //
+        // See also https://github.com/rust-lang/futures-rs/issues/2047.
+        let yield_every = self.len();
+
         // Keep track of how many child futures we have polled,
         // in case we want to forcibly yield.
         let mut polled = 0;
@@ -469,14 +454,11 @@
 
                     // Double check that the call to `release_task` really
                     // happened. Calling it required the task to be unlinked.
-                    debug_assert_eq!(
-                        task.next_all.load(Relaxed),
-                        self.pending_next_all()
-                    );
+                    debug_assert_eq!(task.next_all.load(Relaxed), self.pending_next_all());
                     unsafe {
                         debug_assert!((*task.prev_all.get()).is_null());
                     }
-                    continue
+                    continue;
                 }
             };
 
@@ -516,10 +498,7 @@
                 }
             }
 
-            let mut bomb = Bomb {
-                task: Some(task),
-                queue: &mut *self,
-            };
+            let mut bomb = Bomb { task: Some(task), queue: &mut *self };
 
             // Poll the underlying future with the appropriate waker
             // implementation. This is where a large bit of the unsafety
@@ -548,18 +527,16 @@
                     let task = bomb.task.take().unwrap();
                     bomb.queue.link(task);
 
-                    if polled == YIELD_EVERY {
+                    if polled == yield_every {
                         // We have polled a large number of futures in a row without yielding.
                         // To ensure we do not starve other tasks waiting on the executor,
                         // we yield here, but immediately wake ourselves up to continue.
                         cx.waker().wake_by_ref();
                         return Poll::Pending;
                     }
-                    continue
-                }
-                Poll::Ready(output) => {
-                    return Poll::Ready(Some(output))
+                    continue;
                 }
+                Poll::Ready(output) => return Poll::Ready(Some(output)),
             }
         }
     }
@@ -576,19 +553,33 @@
     }
 }
 
+impl<Fut> FuturesUnordered<Fut> {
+    /// Clears the set, removing all futures.
+    pub fn clear(&mut self) {
+        self.clear_head_all();
+
+        // we just cleared all the tasks, and we have &mut self, so this is safe.
+        unsafe { self.ready_to_run_queue.clear() };
+
+        self.is_terminated.store(false, Relaxed);
+    }
+
+    fn clear_head_all(&mut self) {
+        while !self.head_all.get_mut().is_null() {
+            let head = *self.head_all.get_mut();
+            let task = unsafe { self.unlink(head) };
+            self.release_task(task);
+        }
+    }
+}
+
 impl<Fut> Drop for FuturesUnordered<Fut> {
     fn drop(&mut self) {
         // When a `FuturesUnordered` is dropped we want to drop all futures
         // associated with it. At the same time though there may be tons of
         // wakers flying around which contain `Task<Fut>` references
         // inside them. We'll let those naturally get deallocated.
-        unsafe {
-            while !self.head_all.get_mut().is_null() {
-                let head = *self.head_all.get_mut();
-                let task = self.unlink(head);
-                self.release_task(task);
-            }
-        }
+        self.clear_head_all();
 
         // Note that at this point we could still have a bunch of tasks in the
         // ready to run queue. None of those tasks, however, have futures
@@ -605,13 +596,48 @@
     }
 }
 
+impl<'a, Fut: Unpin> IntoIterator for &'a FuturesUnordered<Fut> {
+    type Item = &'a Fut;
+    type IntoIter = Iter<'a, Fut>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<'a, Fut: Unpin> IntoIterator for &'a mut FuturesUnordered<Fut> {
+    type Item = &'a mut Fut;
+    type IntoIter = IterMut<'a, Fut>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter_mut()
+    }
+}
+
+impl<Fut: Unpin> IntoIterator for FuturesUnordered<Fut> {
+    type Item = Fut;
+    type IntoIter = IntoIter<Fut>;
+
+    fn into_iter(mut self) -> Self::IntoIter {
+        // `head_all` can be accessed directly and we don't need to spin on
+        // `Task::next_all` since we have exclusive access to the set.
+        let task = *self.head_all.get_mut();
+        let len = if task.is_null() { 0 } else { unsafe { *(*task).len_all.get() } };
+
+        IntoIter { len, inner: self }
+    }
+}
+
 impl<Fut> FromIterator<Fut> for FuturesUnordered<Fut> {
     fn from_iter<I>(iter: I) -> Self
     where
         I: IntoIterator<Item = Fut>,
     {
         let acc = Self::new();
-        iter.into_iter().fold(acc, |acc, item| { acc.push(item); acc })
+        iter.into_iter().fold(acc, |acc, item| {
+            acc.push(item);
+            acc
+        })
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/ready_to_run_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/ready_to_run_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/ready_to_run_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/ready_to_run_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,9 @@
 use crate::task::AtomicWaker;
+use alloc::sync::Arc;
 use core::cell::UnsafeCell;
 use core::ptr;
 use core::sync::atomic::AtomicPtr;
-use core::sync::atomic::Ordering::{Relaxed, Acquire, Release, AcqRel};
-use alloc::sync::Arc;
+use core::sync::atomic::Ordering::{AcqRel, Acquire, Relaxed, Release};
 
 use super::abort::abort;
 use super::task::Task;
@@ -85,25 +85,38 @@
     pub(super) fn stub(&self) -> *const Task<Fut> {
         &*self.stub
     }
+
+    // Clear the queue of tasks.
+    //
+    // Note that each task has a strong reference count associated with it
+    // which is owned by the ready to run queue. This method just pulls out
+    // tasks and drops their refcounts.
+    //
+    // # Safety
+    //
+    // - All tasks **must** have had their futures dropped already (by FuturesUnordered::clear)
+    // - The caller **must** guarantee unique access to `self`
+    pub(crate) unsafe fn clear(&self) {
+        loop {
+            // SAFETY: We have the guarantee of mutual exclusion required by `dequeue`.
+            match self.dequeue() {
+                Dequeue::Empty => break,
+                Dequeue::Inconsistent => abort("inconsistent in drop"),
+                Dequeue::Data(ptr) => drop(Arc::from_raw(ptr)),
+            }
+        }
+    }
 }
 
 impl<Fut> Drop for ReadyToRunQueue<Fut> {
     fn drop(&mut self) {
         // Once we're in the destructor for `Inner<Fut>` we need to clear out
         // the ready to run queue of tasks if there's anything left in there.
-        //
-        // Note that each task has a strong reference count associated with it
-        // which is owned by the ready to run queue. All tasks should have had
-        // their futures dropped already by the `FuturesUnordered` destructor
-        // above, so we're just pulling out tasks and dropping their refcounts.
+
+        // All tasks have had their futures dropped already by the `FuturesUnordered`
+        // destructor above, and we have &mut self, so this is safe.
         unsafe {
-            loop {
-                match self.dequeue() {
-                    Dequeue::Empty => break,
-                    Dequeue::Inconsistent => abort("inconsistent in drop"),
-                    Dequeue::Data(ptr) => drop(Arc::from_raw(ptr)),
-                }
-            }
+            self.clear();
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/task.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/task.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/task.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/futures_unordered/task.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
+use alloc::sync::{Arc, Weak};
 use core::cell::UnsafeCell;
-use core::sync::atomic::{AtomicPtr, AtomicBool};
 use core::sync::atomic::Ordering::{self, SeqCst};
-use alloc::sync::{Arc, Weak};
+use core::sync::atomic::{AtomicBool, AtomicPtr};
 
-use crate::task::{ArcWake, WakerRef, waker_ref};
-use super::ReadyToRunQueue;
 use super::abort::abort;
+use super::ReadyToRunQueue;
+use crate::task::{waker_ref, ArcWake, WakerRef};
 
 pub(super) struct Task<Fut> {
     // The future
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use super::assert_stream;
 use core::pin::Pin;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
@@ -26,15 +27,15 @@
 /// # });
 /// ```
 pub fn iter<I>(i: I) -> Iter<I::IntoIter>
-    where I: IntoIterator,
+where
+    I: IntoIterator,
 {
-    Iter {
-        iter: i.into_iter(),
-    }
+    assert_stream::<I::Item, _>(Iter { iter: i.into_iter() })
 }
 
 impl<I> Stream for Iter<I>
-    where I: Iterator,
+where
+    I: Iterator,
 {
     type Item = I::Item;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,13 @@
-//! Streams
+//! Asynchronous streams.
 //!
-//! This module contains a number of functions for working with `Stream`s,
-//! including the [`StreamExt`] trait and the [`TryStreamExt`] trait which add
-//! methods to `Stream` types
+//! This module contains:
+//!
+//! - The [`Stream`] trait, for objects that can asynchronously produce a
+//!   sequence of values.
+//! - The [`StreamExt`] and [`TryStreamExt`] trait, which provides adapters for
+//!   chaining and composing streams.
+//! - Top-level stream constructors like [`iter`](iter()) which creates a
+//!   stream from an iterator.
 
 #[cfg(feature = "alloc")]
 pub use futures_core::stream::{BoxStream, LocalBoxStream};
@@ -14,8 +19,8 @@
 mod stream;
 pub use self::stream::{
     Chain, Collect, Concat, Cycle, Enumerate, Filter, FilterMap, FlatMap, Flatten, Fold, ForEach,
-    Fuse, Inspect, Map, Next, Peek, Peekable, Scan, SelectNextSome, Skip, SkipWhile, StreamExt,
-    StreamFuture, Take, TakeWhile, TakeUntil, Then, Zip,
+    Fuse, Inspect, Map, Next, NextIf, NextIfEq, Peek, PeekMut, Peekable, Scan, SelectNextSome,
+    Skip, SkipWhile, StreamExt, StreamFuture, Take, TakeUntil, TakeWhile, Then, Unzip, Zip,
 };
 
 #[cfg(feature = "std")]
@@ -31,11 +36,11 @@
 #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
 pub use self::stream::Forward;
 
-#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+#[cfg(not(futures_no_atomic_cas))]
 #[cfg(feature = "alloc")]
 pub use self::stream::{BufferUnordered, Buffered, ForEachConcurrent};
 
-#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+#[cfg(not(futures_no_atomic_cas))]
 #[cfg(feature = "sink")]
 #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
 #[cfg(feature = "alloc")]
@@ -53,10 +58,13 @@
 #[cfg(feature = "std")]
 pub use self::try_stream::IntoAsyncRead;
 
-#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+#[cfg(not(futures_no_atomic_cas))]
 #[cfg(feature = "alloc")]
 pub use self::try_stream::{TryBufferUnordered, TryBuffered, TryForEachConcurrent};
 
+#[cfg(feature = "alloc")]
+pub use self::try_stream::{TryChunks, TryChunksError};
+
 // Primitive streams
 
 mod iter;
@@ -65,6 +73,9 @@
 mod repeat;
 pub use self::repeat::{repeat, Repeat};
 
+mod repeat_with;
+pub use self::repeat_with::{repeat_with, RepeatWith};
+
 mod empty;
 pub use self::empty::{empty, Empty};
 
@@ -77,35 +88,56 @@
 mod poll_fn;
 pub use self::poll_fn::{poll_fn, PollFn};
 
+mod poll_immediate;
+pub use self::poll_immediate::{poll_immediate, PollImmediate};
+
 mod select;
 pub use self::select::{select, Select};
 
+mod select_with_strategy;
+pub use self::select_with_strategy::{select_with_strategy, PollNext, SelectWithStrategy};
+
 mod unfold;
 pub use self::unfold::{unfold, Unfold};
 
-cfg_target_has_atomic! {
-    #[cfg(feature = "alloc")]
-    mod futures_ordered;
-    #[cfg(feature = "alloc")]
-    pub use self::futures_ordered::FuturesOrdered;
-
-    #[cfg(feature = "alloc")]
-    pub mod futures_unordered;
-    #[cfg(feature = "alloc")]
-    #[doc(inline)]
-    pub use self::futures_unordered::FuturesUnordered;
-
-    #[cfg(feature = "alloc")]
-    mod select_all;
-    #[cfg(feature = "alloc")]
-    pub use self::select_all::{select_all, SelectAll};
-}
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod futures_ordered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use self::futures_ordered::FuturesOrdered;
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub mod futures_unordered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+#[doc(inline)]
+pub use self::futures_unordered::FuturesUnordered;
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub mod select_all;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+#[doc(inline)]
+pub use self::select_all::{select_all, SelectAll};
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod abortable;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use crate::abortable::{AbortHandle, AbortRegistration, Abortable, Aborted};
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use abortable::abortable;
 
-// Just a helper function to ensure the futures we're returning all have the
+// Just a helper function to ensure the streams we're returning all have the
 // right implementations.
 pub(crate) fn assert_stream<T, S>(stream: S) -> S
-    where
-        S: Stream<Item = T>,
+where
+    S: Stream<Item = T>,
 {
     stream
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/once.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/once.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/once.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/once.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,10 @@
+use super::assert_stream;
 use core::pin::Pin;
 use futures_core::future::Future;
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 /// Creates a stream of a single element.
 ///
@@ -16,16 +18,17 @@
 /// # });
 /// ```
 pub fn once<Fut: Future>(future: Fut) -> Once<Fut> {
-    Once::new(future)
+    assert_stream::<Fut::Output, _>(Once::new(future))
 }
 
-/// A stream which emits single element and then EOF.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Once<Fut> {
-    #[pin]
-    future: Option<Fut>
+pin_project! {
+    /// A stream which emits single element and then EOF.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Once<Fut> {
+        #[pin]
+        future: Option<Fut>
+    }
 }
 
 impl<Fut> Once<Fut> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/pending.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/pending.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/pending.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/pending.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use super::assert_stream;
 use core::marker;
 use core::pin::Pin;
 use futures_core::stream::{FusedStream, Stream};
@@ -14,7 +15,7 @@
 ///
 /// The returned stream will always return `Pending` when polled.
 pub fn pending<T>() -> Pending<T> {
-    Pending { _data: marker::PhantomData }
+    assert_stream::<T, _>(Pending { _data: marker::PhantomData })
 }
 
 impl<T> Unpin for Pending<T> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/poll_fn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/poll_fn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/poll_fn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/poll_fn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 //! Definition of the `PollFn` combinator
 
+use super::assert_stream;
 use core::fmt;
 use core::pin::Pin;
 use futures_core::stream::Stream;
@@ -41,7 +42,7 @@
 where
     F: FnMut(&mut Context<'_>) -> Poll<Option<T>>,
 {
-    PollFn { f }
+    assert_stream::<T, _>(PollFn { f })
 }
 
 impl<T, F> Stream for PollFn<F>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/poll_immediate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/poll_immediate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/poll_immediate.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/poll_immediate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,80 @@
+use core::pin::Pin;
+use futures_core::task::{Context, Poll};
+use futures_core::Stream;
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// Stream for the [poll_immediate](poll_immediate()) function.
+    ///
+    /// It will never return [Poll::Pending](core::task::Poll::Pending)
+    #[derive(Debug, Clone)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct PollImmediate<S> {
+        #[pin]
+        stream: Option<S>
+    }
+}
+
+impl<T, S> Stream for PollImmediate<S>
+where
+    S: Stream<Item = T>,
+{
+    type Item = Poll<T>;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        let mut this = self.project();
+        let stream = match this.stream.as_mut().as_pin_mut() {
+            // inner is gone, so we can continue to signal that the stream is closed.
+            None => return Poll::Ready(None),
+            Some(inner) => inner,
+        };
+
+        match stream.poll_next(cx) {
+            Poll::Ready(Some(t)) => Poll::Ready(Some(Poll::Ready(t))),
+            Poll::Ready(None) => {
+                this.stream.set(None);
+                Poll::Ready(None)
+            }
+            Poll::Pending => Poll::Ready(Some(Poll::Pending)),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.stream.as_ref().map_or((0, Some(0)), Stream::size_hint)
+    }
+}
+
+impl<S: Stream> super::FusedStream for PollImmediate<S> {
+    fn is_terminated(&self) -> bool {
+        self.stream.is_none()
+    }
+}
+
+/// Creates a new stream that always immediately returns [Poll::Ready](core::task::Poll::Ready) when awaiting it.
+///
+/// This is useful when immediacy is more important than waiting for the next item to be ready.
+///
+/// # Examples
+///
+/// ```
+/// # futures::executor::block_on(async {
+/// use futures::stream::{self, StreamExt};
+/// use futures::task::Poll;
+///
+/// let mut r = stream::poll_immediate(Box::pin(stream::iter(1_u32..3)));
+/// assert_eq!(r.next().await, Some(Poll::Ready(1)));
+/// assert_eq!(r.next().await, Some(Poll::Ready(2)));
+/// assert_eq!(r.next().await, None);
+///
+/// let mut p = stream::poll_immediate(Box::pin(stream::once(async {
+///     futures::pending!();
+///     42_u8
+/// })));
+/// assert_eq!(p.next().await, Some(Poll::Pending));
+/// assert_eq!(p.next().await, Some(Poll::Ready(42)));
+/// assert_eq!(p.next().await, None);
+/// # });
+/// ```
+pub fn poll_immediate<S: Stream>(s: S) -> PollImmediate<S> {
+    super::assert_stream::<Poll<S::Item>, PollImmediate<S>>(PollImmediate { stream: Some(s) })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/repeat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/repeat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/repeat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/repeat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
+use super::assert_stream;
 use core::pin::Pin;
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 
 /// Stream for the [`repeat`] function.
@@ -24,15 +25,17 @@
 /// # });
 /// ```
 pub fn repeat<T>(item: T) -> Repeat<T>
-    where T: Clone
+where
+    T: Clone,
 {
-    Repeat { item }
+    assert_stream::<T, _>(Repeat { item })
 }
 
 impl<T> Unpin for Repeat<T> {}
 
 impl<T> Stream for Repeat<T>
-    where T: Clone
+where
+    T: Clone,
 {
     type Item = T;
 
@@ -46,7 +49,8 @@
 }
 
 impl<T> FusedStream for Repeat<T>
-    where T: Clone,
+where
+    T: Clone,
 {
     fn is_terminated(&self) -> bool {
         false
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/repeat_with.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/repeat_with.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/repeat_with.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/repeat_with.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+use super::assert_stream;
+use core::pin::Pin;
+use futures_core::stream::{FusedStream, Stream};
+use futures_core::task::{Context, Poll};
+
+/// An stream that repeats elements of type `A` endlessly by
+/// applying the provided closure `F: FnMut() -> A`.
+///
+/// This `struct` is created by the [`repeat_with()`] function.
+/// See its documentation for more.
+#[derive(Debug, Clone)]
+#[must_use = "streams do nothing unless polled"]
+pub struct RepeatWith<F> {
+    repeater: F,
+}
+
+impl<A, F: FnMut() -> A> Unpin for RepeatWith<F> {}
+
+impl<A, F: FnMut() -> A> Stream for RepeatWith<F> {
+    type Item = A;
+
+    fn poll_next(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        Poll::Ready(Some((&mut self.repeater)()))
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (usize::max_value(), None)
+    }
+}
+
+impl<A, F: FnMut() -> A> FusedStream for RepeatWith<F> {
+    fn is_terminated(&self) -> bool {
+        false
+    }
+}
+
+/// Creates a new stream that repeats elements of type `A` endlessly by
+/// applying the provided closure, the repeater, `F: FnMut() -> A`.
+///
+/// The `repeat_with()` function calls the repeater over and over again.
+///
+/// Infinite stream like `repeat_with()` are often used with adapters like
+/// [`stream.take()`], in order to make them finite.
+///
+/// If the element type of the stream you need implements [`Clone`], and
+/// it is OK to keep the source element in memory, you should instead use
+/// the [`stream.repeat()`] function.
+///
+/// # Examples
+///
+/// Basic usage:
+///
+/// ```
+/// # futures::executor::block_on(async {
+/// use futures::stream::{self, StreamExt};
+///
+/// // let's assume we have some value of a type that is not `Clone`
+/// // or which don't want to have in memory just yet because it is expensive:
+/// #[derive(PartialEq, Debug)]
+/// struct Expensive;
+///
+/// // a particular value forever:
+/// let mut things = stream::repeat_with(|| Expensive);
+///
+/// assert_eq!(Some(Expensive), things.next().await);
+/// assert_eq!(Some(Expensive), things.next().await);
+/// assert_eq!(Some(Expensive), things.next().await);
+/// # });
+/// ```
+///
+/// Using mutation and going finite:
+///
+/// ```rust
+/// # futures::executor::block_on(async {
+/// use futures::stream::{self, StreamExt};
+///
+/// // From the zeroth to the third power of two:
+/// let mut curr = 1;
+/// let mut pow2 = stream::repeat_with(|| { let tmp = curr; curr *= 2; tmp })
+///                     .take(4);
+///
+/// assert_eq!(Some(1), pow2.next().await);
+/// assert_eq!(Some(2), pow2.next().await);
+/// assert_eq!(Some(4), pow2.next().await);
+/// assert_eq!(Some(8), pow2.next().await);
+///
+/// // ... and now we're done
+/// assert_eq!(None, pow2.next().await);
+/// # });
+/// ```
+pub fn repeat_with<A, F: FnMut() -> A>(repeater: F) -> RepeatWith<F> {
+    assert_stream::<A, _>(RepeatWith { repeater })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/select_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/select_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/select_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/select_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,26 +4,33 @@
 use core::iter::FromIterator;
 use core::pin::Pin;
 
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 
-use crate::stream::{StreamExt, StreamFuture, FuturesUnordered};
+use pin_project_lite::pin_project;
 
-/// An unbounded set of streams
-///
-/// This "combinator" provides the ability to maintain a set of streams
-/// and drive them all to completion.
-///
-/// Streams are pushed into this set and their realized values are
-/// yielded as they become ready. Streams will only be polled when they
-/// generate notifications. This allows to coordinate a large number of streams.
-///
-/// Note that you can create a ready-made `SelectAll` via the
-/// `select_all` function in the `stream` module, or you can start with an
-/// empty set with the `SelectAll::new` constructor.
-#[must_use = "streams do nothing unless polled"]
-pub struct SelectAll<St> {
-    inner: FuturesUnordered<StreamFuture<St>>,
+use super::assert_stream;
+use crate::stream::{futures_unordered, FuturesUnordered, StreamExt, StreamFuture};
+
+pin_project! {
+    /// An unbounded set of streams
+    ///
+    /// This "combinator" provides the ability to maintain a set of streams
+    /// and drive them all to completion.
+    ///
+    /// Streams are pushed into this set and their realized values are
+    /// yielded as they become ready. Streams will only be polled when they
+    /// generate notifications. This allows to coordinate a large number of streams.
+    ///
+    /// Note that you can create a ready-made `SelectAll` via the
+    /// `select_all` function in the `stream` module, or you can start with an
+    /// empty set with the `SelectAll::new` constructor.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct SelectAll<St> {
+        #[pin]
+        inner: FuturesUnordered<StreamFuture<St>>,
+    }
 }
 
 impl<St: Debug> Debug for SelectAll<St> {
@@ -62,6 +69,21 @@
     pub fn push(&mut self, stream: St) {
         self.inner.push(stream.into_future());
     }
+
+    /// Returns an iterator that allows inspecting each stream in the set.
+    pub fn iter(&self) -> Iter<'_, St> {
+        Iter(self.inner.iter())
+    }
+
+    /// Returns an iterator that allows modifying each stream in the set.
+    pub fn iter_mut(&mut self) -> IterMut<'_, St> {
+        IterMut(self.inner.iter_mut())
+    }
+
+    /// Clears the set, removing all streams.
+    pub fn clear(&mut self) {
+        self.inner.clear()
+    }
 }
 
 impl<St: Stream + Unpin> Default for SelectAll<St> {
@@ -73,10 +95,7 @@
 impl<St: Stream + Unpin> Stream for SelectAll<St> {
     type Item = St::Item;
 
-    fn poll_next(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         loop {
             match ready!(self.inner.poll_next_unpin(cx)) {
                 Some((Some(item), remaining)) => {
@@ -109,13 +128,14 @@
 /// streams internally, in the order they become available.
 ///
 /// Note that the returned set can also be used to dynamically push more
-/// futures into the set as they become available.
+/// streams into the set as they become available.
 ///
 /// This function is only available when the `std` or `alloc` feature of this
 /// library is activated, and it is activated by default.
 pub fn select_all<I>(streams: I) -> SelectAll<I::Item>
-    where I: IntoIterator,
-          I::Item: Stream + Unpin
+where
+    I: IntoIterator,
+    I::Item: Stream + Unpin,
 {
     let mut set = SelectAll::new();
 
@@ -123,7 +143,7 @@
         set.push(stream);
     }
 
-    set
+    assert_stream::<<I::Item as Stream>::Item, _>(set)
 }
 
 impl<St: Stream + Unpin> FromIterator<St> for SelectAll<St> {
@@ -139,3 +159,96 @@
         }
     }
 }
+
+impl<St: Stream + Unpin> IntoIterator for SelectAll<St> {
+    type Item = St;
+    type IntoIter = IntoIter<St>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        IntoIter(self.inner.into_iter())
+    }
+}
+
+impl<'a, St: Stream + Unpin> IntoIterator for &'a SelectAll<St> {
+    type Item = &'a St;
+    type IntoIter = Iter<'a, St>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<'a, St: Stream + Unpin> IntoIterator for &'a mut SelectAll<St> {
+    type Item = &'a mut St;
+    type IntoIter = IterMut<'a, St>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter_mut()
+    }
+}
+
+/// Immutable iterator over all streams in the unordered set.
+#[derive(Debug)]
+pub struct Iter<'a, St: Unpin>(futures_unordered::Iter<'a, StreamFuture<St>>);
+
+/// Mutable iterator over all streams in the unordered set.
+#[derive(Debug)]
+pub struct IterMut<'a, St: Unpin>(futures_unordered::IterMut<'a, StreamFuture<St>>);
+
+/// Owned iterator over all streams in the unordered set.
+#[derive(Debug)]
+pub struct IntoIter<St: Unpin>(futures_unordered::IntoIter<StreamFuture<St>>);
+
+impl<'a, St: Stream + Unpin> Iterator for Iter<'a, St> {
+    type Item = &'a St;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let st = self.0.next()?;
+        let next = st.get_ref();
+        // This should always be true because FuturesUnordered removes completed futures.
+        debug_assert!(next.is_some());
+        next
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl<St: Stream + Unpin> ExactSizeIterator for Iter<'_, St> {}
+
+impl<'a, St: Stream + Unpin> Iterator for IterMut<'a, St> {
+    type Item = &'a mut St;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let st = self.0.next()?;
+        let next = st.get_mut();
+        // This should always be true because FuturesUnordered removes completed futures.
+        debug_assert!(next.is_some());
+        next
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl<St: Stream + Unpin> ExactSizeIterator for IterMut<'_, St> {}
+
+impl<St: Stream + Unpin> Iterator for IntoIter<St> {
+    type Item = St;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let st = self.0.next()?;
+        let next = st.into_inner();
+        // This should always be true because FuturesUnordered removes completed futures.
+        debug_assert!(next.is_some());
+        next
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl<St: Stream + Unpin> ExactSizeIterator for IntoIter<St> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/select.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,47 +1,68 @@
-use crate::stream::{StreamExt, Fuse};
+use super::assert_stream;
+use crate::stream::{select_with_strategy, PollNext, SelectWithStrategy};
 use core::pin::Pin;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`select()`] function.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Select<St1, St2> {
-    #[pin]
-    stream1: Fuse<St1>,
-    #[pin]
-    stream2: Fuse<St2>,
-    flag: bool,
+pin_project! {
+    /// Stream for the [`select()`] function.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Select<St1, St2> {
+        #[pin]
+        inner: SelectWithStrategy<St1, St2, fn(&mut PollNext)-> PollNext, PollNext>,
+    }
 }
 
 /// This function will attempt to pull items from both streams. Each
 /// stream will be polled in a round-robin fashion, and whenever a stream is
 /// ready to yield an item that item is yielded.
 ///
-/// After one of the two input stream completes, the remaining one will be
+/// After one of the two input streams completes, the remaining one will be
 /// polled exclusively. The returned stream completes when both input
 /// streams have completed.
 ///
 /// Note that this function consumes both streams and returns a wrapped
 /// version of them.
+///
+/// ## Examples
+///
+/// ```rust
+/// # futures::executor::block_on(async {
+/// use futures::stream::{ repeat, select, StreamExt };
+///
+/// let left = repeat(1);
+/// let right = repeat(2);
+///
+/// let mut out = select(left, right);
+///
+/// for _ in 0..100 {
+///     // We should be alternating.
+///     assert_eq!(1, out.select_next_some().await);
+///     assert_eq!(2, out.select_next_some().await);
+/// }
+/// # });
+/// ```
 pub fn select<St1, St2>(stream1: St1, stream2: St2) -> Select<St1, St2>
-    where St1: Stream,
-          St2: Stream<Item = St1::Item>
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
 {
-    Select {
-        stream1: stream1.fuse(),
-        stream2: stream2.fuse(),
-        flag: false,
+    fn round_robin(last: &mut PollNext) -> PollNext {
+        last.toggle()
     }
+
+    assert_stream::<St1::Item, _>(Select {
+        inner: select_with_strategy(stream1, stream2, round_robin),
+    })
 }
 
 impl<St1, St2> Select<St1, St2> {
     /// Acquires a reference to the underlying streams that this combinator is
     /// pulling from.
     pub fn get_ref(&self) -> (&St1, &St2) {
-        (self.stream1.get_ref(), self.stream2.get_ref())
+        self.inner.get_ref()
     }
 
     /// Acquires a mutable reference to the underlying streams that this
@@ -50,7 +71,7 @@
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_mut(&mut self) -> (&mut St1, &mut St2) {
-        (self.stream1.get_mut(), self.stream2.get_mut())
+        self.inner.get_mut()
     }
 
     /// Acquires a pinned mutable reference to the underlying streams that this
@@ -60,7 +81,7 @@
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut(self: Pin<&mut Self>) -> (Pin<&mut St1>, Pin<&mut St2>) {
         let this = self.project();
-        (this.stream1.get_pin_mut(), this.stream2.get_pin_mut())
+        this.inner.get_pin_mut()
     }
 
     /// Consumes this combinator, returning the underlying streams.
@@ -68,61 +89,29 @@
     /// Note that this may discard intermediate state of this combinator, so
     /// care should be taken to avoid losing resources when this is called.
     pub fn into_inner(self) -> (St1, St2) {
-        (self.stream1.into_inner(), self.stream2.into_inner())
+        self.inner.into_inner()
     }
 }
 
 impl<St1, St2> FusedStream for Select<St1, St2>
-    where St1: Stream,
-          St2: Stream<Item = St1::Item>
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
 {
     fn is_terminated(&self) -> bool {
-        self.stream1.is_terminated() && self.stream2.is_terminated()
+        self.inner.is_terminated()
     }
 }
 
 impl<St1, St2> Stream for Select<St1, St2>
-    where St1: Stream,
-          St2: Stream<Item = St1::Item>
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
 {
     type Item = St1::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<St1::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<St1::Item>> {
         let this = self.project();
-        if !*this.flag {
-            poll_inner(this.flag, this.stream1, this.stream2, cx)
-        } else {
-            poll_inner(this.flag, this.stream2, this.stream1, cx)
-        }
-    }
-}
-
-fn poll_inner<St1, St2>(
-    flag: &mut bool,
-    a: Pin<&mut St1>,
-    b: Pin<&mut St2>,
-    cx: &mut Context<'_>
-) -> Poll<Option<St1::Item>>
-    where St1: Stream, St2: Stream<Item = St1::Item>
-{
-    let a_done = match a.poll_next(cx) {
-        Poll::Ready(Some(item)) => {
-            // give the other stream a chance to go first next time
-            *flag = !*flag;
-            return Poll::Ready(Some(item))
-        },
-        Poll::Ready(None) => true,
-        Poll::Pending => false,
-    };
-
-    match b.poll_next(cx) {
-        Poll::Ready(Some(item)) => {
-            Poll::Ready(Some(item))
-        }
-        Poll::Ready(None) if a_done => Poll::Ready(None),
-        Poll::Ready(None) | Poll::Pending => Poll::Pending,
+        this.inner.poll_next(cx)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/select_with_strategy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/select_with_strategy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/select_with_strategy.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/select_with_strategy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,229 @@
+use super::assert_stream;
+use crate::stream::{Fuse, StreamExt};
+use core::{fmt, pin::Pin};
+use futures_core::stream::{FusedStream, Stream};
+use futures_core::task::{Context, Poll};
+use pin_project_lite::pin_project;
+
+/// Type to tell [`SelectWithStrategy`] which stream to poll next.
+#[derive(Debug, PartialEq, Eq, Copy, Clone, Hash)]
+pub enum PollNext {
+    /// Poll the first stream.
+    Left,
+    /// Poll the second stream.
+    Right,
+}
+
+impl PollNext {
+    /// Toggle the value and return the old one.
+    pub fn toggle(&mut self) -> Self {
+        let old = *self;
+
+        match self {
+            PollNext::Left => *self = PollNext::Right,
+            PollNext::Right => *self = PollNext::Left,
+        }
+
+        old
+    }
+}
+
+impl Default for PollNext {
+    fn default() -> Self {
+        PollNext::Left
+    }
+}
+
+pin_project! {
+    /// Stream for the [`select_with_strategy()`] function. See function docs for details.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct SelectWithStrategy<St1, St2, Clos, State> {
+        #[pin]
+        stream1: Fuse<St1>,
+        #[pin]
+        stream2: Fuse<St2>,
+        state: State,
+        clos: Clos,
+    }
+}
+
+/// This function will attempt to pull items from both streams. You provide a
+/// closure to tell [`SelectWithStrategy`] which stream to poll. The closure can
+/// store state on `SelectWithStrategy` to which it will receive a `&mut` on every
+/// invocation. This allows basing the strategy on prior choices.
+///
+/// After one of the two input streams completes, the remaining one will be
+/// polled exclusively. The returned stream completes when both input
+/// streams have completed.
+///
+/// Note that this function consumes both streams and returns a wrapped
+/// version of them.
+///
+/// ## Examples
+///
+/// ### Priority
+/// This example shows how to always prioritize the left stream.
+///
+/// ```rust
+/// # futures::executor::block_on(async {
+/// use futures::stream::{ repeat, select_with_strategy, PollNext, StreamExt };
+///
+/// let left = repeat(1);
+/// let right = repeat(2);
+///
+/// // We don't need any state, so let's make it an empty tuple.
+/// // We must provide some type here, as there is no way for the compiler
+/// // to infer it. As we don't need to capture variables, we can just
+/// // use a function pointer instead of a closure.
+/// fn prio_left(_: &mut ()) -> PollNext { PollNext::Left }
+///
+/// let mut out = select_with_strategy(left, right, prio_left);
+///
+/// for _ in 0..100 {
+///     // Whenever we poll out, we will alwas get `1`.
+///     assert_eq!(1, out.select_next_some().await);
+/// }
+/// # });
+/// ```
+///
+/// ### Round Robin
+/// This example shows how to select from both streams round robin.
+/// Note: this special case is provided by [`futures-util::stream::select`].
+///
+/// ```rust
+/// # futures::executor::block_on(async {
+/// use futures::stream::{ repeat, select_with_strategy, PollNext, StreamExt };
+///
+/// let left = repeat(1);
+/// let right = repeat(2);
+///
+/// let rrobin = |last: &mut PollNext| last.toggle();
+///
+/// let mut out = select_with_strategy(left, right, rrobin);
+///
+/// for _ in 0..100 {
+///     // We should be alternating now.
+///     assert_eq!(1, out.select_next_some().await);
+///     assert_eq!(2, out.select_next_some().await);
+/// }
+/// # });
+/// ```
+pub fn select_with_strategy<St1, St2, Clos, State>(
+    stream1: St1,
+    stream2: St2,
+    which: Clos,
+) -> SelectWithStrategy<St1, St2, Clos, State>
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
+    Clos: FnMut(&mut State) -> PollNext,
+    State: Default,
+{
+    assert_stream::<St1::Item, _>(SelectWithStrategy {
+        stream1: stream1.fuse(),
+        stream2: stream2.fuse(),
+        state: Default::default(),
+        clos: which,
+    })
+}
+
+impl<St1, St2, Clos, State> SelectWithStrategy<St1, St2, Clos, State> {
+    /// Acquires a reference to the underlying streams that this combinator is
+    /// pulling from.
+    pub fn get_ref(&self) -> (&St1, &St2) {
+        (self.stream1.get_ref(), self.stream2.get_ref())
+    }
+
+    /// Acquires a mutable reference to the underlying streams that this
+    /// combinator is pulling from.
+    ///
+    /// Note that care must be taken to avoid tampering with the state of the
+    /// stream which may otherwise confuse this combinator.
+    pub fn get_mut(&mut self) -> (&mut St1, &mut St2) {
+        (self.stream1.get_mut(), self.stream2.get_mut())
+    }
+
+    /// Acquires a pinned mutable reference to the underlying streams that this
+    /// combinator is pulling from.
+    ///
+    /// Note that care must be taken to avoid tampering with the state of the
+    /// stream which may otherwise confuse this combinator.
+    pub fn get_pin_mut(self: Pin<&mut Self>) -> (Pin<&mut St1>, Pin<&mut St2>) {
+        let this = self.project();
+        (this.stream1.get_pin_mut(), this.stream2.get_pin_mut())
+    }
+
+    /// Consumes this combinator, returning the underlying streams.
+    ///
+    /// Note that this may discard intermediate state of this combinator, so
+    /// care should be taken to avoid losing resources when this is called.
+    pub fn into_inner(self) -> (St1, St2) {
+        (self.stream1.into_inner(), self.stream2.into_inner())
+    }
+}
+
+impl<St1, St2, Clos, State> FusedStream for SelectWithStrategy<St1, St2, Clos, State>
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
+    Clos: FnMut(&mut State) -> PollNext,
+{
+    fn is_terminated(&self) -> bool {
+        self.stream1.is_terminated() && self.stream2.is_terminated()
+    }
+}
+
+impl<St1, St2, Clos, State> Stream for SelectWithStrategy<St1, St2, Clos, State>
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
+    Clos: FnMut(&mut State) -> PollNext,
+{
+    type Item = St1::Item;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<St1::Item>> {
+        let this = self.project();
+
+        match (this.clos)(this.state) {
+            PollNext::Left => poll_inner(this.stream1, this.stream2, cx),
+            PollNext::Right => poll_inner(this.stream2, this.stream1, cx),
+        }
+    }
+}
+
+fn poll_inner<St1, St2>(
+    a: Pin<&mut St1>,
+    b: Pin<&mut St2>,
+    cx: &mut Context<'_>,
+) -> Poll<Option<St1::Item>>
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
+{
+    let a_done = match a.poll_next(cx) {
+        Poll::Ready(Some(item)) => return Poll::Ready(Some(item)),
+        Poll::Ready(None) => true,
+        Poll::Pending => false,
+    };
+
+    match b.poll_next(cx) {
+        Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
+        Poll::Ready(None) if a_done => Poll::Ready(None),
+        Poll::Ready(None) | Poll::Pending => Poll::Pending,
+    }
+}
+
+impl<St1, St2, Clos, State> fmt::Debug for SelectWithStrategy<St1, St2, Clos, State>
+where
+    St1: fmt::Debug,
+    St2: fmt::Debug,
+    State: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SelectWithStrategy")
+            .field("stream1", &self.stream1)
+            .field("stream2", &self.stream2)
+            .field("state", &self.state)
+            .finish()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/all.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,92 @@
+use core::fmt;
+use core::pin::Pin;
+use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
+use futures_core::stream::Stream;
+use futures_core::task::{Context, Poll};
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// Future for the [`all`](super::StreamExt::all) method.
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct All<St, Fut, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        accum: Option<bool>,
+        #[pin]
+        future: Option<Fut>,
+    }
+}
+
+impl<St, Fut, F> fmt::Debug for All<St, Fut, F>
+where
+    St: fmt::Debug,
+    Fut: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("All")
+            .field("stream", &self.stream)
+            .field("accum", &self.accum)
+            .field("future", &self.future)
+            .finish()
+    }
+}
+
+impl<St, Fut, F> All<St, Fut, F>
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = bool>,
+{
+    pub(super) fn new(stream: St, f: F) -> Self {
+        Self { stream, f, accum: Some(true), future: None }
+    }
+}
+
+impl<St, Fut, F> FusedFuture for All<St, Fut, F>
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = bool>,
+{
+    fn is_terminated(&self) -> bool {
+        self.accum.is_none() && self.future.is_none()
+    }
+}
+
+impl<St, Fut, F> Future for All<St, Fut, F>
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = bool>,
+{
+    type Output = bool;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<bool> {
+        let mut this = self.project();
+        Poll::Ready(loop {
+            if let Some(fut) = this.future.as_mut().as_pin_mut() {
+                // we're currently processing a future to produce a new accum value
+                let acc = this.accum.unwrap() && ready!(fut.poll(cx));
+                if !acc {
+                    break false;
+                } // early exit
+                *this.accum = Some(acc);
+                this.future.set(None);
+            } else if this.accum.is_some() {
+                // we're waiting on a new item from the stream
+                match ready!(this.stream.as_mut().poll_next(cx)) {
+                    Some(item) => {
+                        this.future.set(Some((this.f)(item)));
+                    }
+                    None => {
+                        break this.accum.take().unwrap();
+                    }
+                }
+            } else {
+                panic!("All polled after completion")
+            }
+        })
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/any.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/any.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/any.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/any.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,92 @@
+use core::fmt;
+use core::pin::Pin;
+use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
+use futures_core::stream::Stream;
+use futures_core::task::{Context, Poll};
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// Future for the [`any`](super::StreamExt::any) method.
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Any<St, Fut, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        accum: Option<bool>,
+        #[pin]
+        future: Option<Fut>,
+    }
+}
+
+impl<St, Fut, F> fmt::Debug for Any<St, Fut, F>
+where
+    St: fmt::Debug,
+    Fut: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Any")
+            .field("stream", &self.stream)
+            .field("accum", &self.accum)
+            .field("future", &self.future)
+            .finish()
+    }
+}
+
+impl<St, Fut, F> Any<St, Fut, F>
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = bool>,
+{
+    pub(super) fn new(stream: St, f: F) -> Self {
+        Self { stream, f, accum: Some(false), future: None }
+    }
+}
+
+impl<St, Fut, F> FusedFuture for Any<St, Fut, F>
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = bool>,
+{
+    fn is_terminated(&self) -> bool {
+        self.accum.is_none() && self.future.is_none()
+    }
+}
+
+impl<St, Fut, F> Future for Any<St, Fut, F>
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = bool>,
+{
+    type Output = bool;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<bool> {
+        let mut this = self.project();
+        Poll::Ready(loop {
+            if let Some(fut) = this.future.as_mut().as_pin_mut() {
+                // we're currently processing a future to produce a new accum value
+                let acc = this.accum.unwrap() || ready!(fut.poll(cx));
+                if acc {
+                    break true;
+                } // early exit
+                *this.accum = Some(acc);
+                this.future.set(None);
+            } else if this.accum.is_some() {
+                // we're waiting on a new item from the stream
+                match ready!(this.stream.as_mut().poll_next(cx)) {
+                    Some(item) => {
+                        this.future.set(Some((this.f)(item)));
+                    }
+                    None => {
+                        break this.accum.take().unwrap();
+                    }
+                }
+            } else {
+                panic!("Any polled after completion")
+            }
+        })
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/buffered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/buffered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/buffered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/buffered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,27 @@
 use crate::stream::{Fuse, FuturesOrdered, StreamExt};
+use core::fmt;
+use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
-use core::fmt;
-use core::pin::Pin;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`buffered`](super::StreamExt::buffered) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct Buffered<St>
-where
-    St: Stream,
-    St::Item: Future,
-{
-    #[pin]
-    stream: Fuse<St>,
-    in_progress_queue: FuturesOrdered<St::Item>,
-    max: usize,
+pin_project! {
+    /// Stream for the [`buffered`](super::StreamExt::buffered) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Buffered<St>
+    where
+        St: Stream,
+        St::Item: Future,
+    {
+        #[pin]
+        stream: Fuse<St>,
+        in_progress_queue: FuturesOrdered<St::Item>,
+        max: usize,
+    }
 }
 
 impl<St> fmt::Debug for Buffered<St>
@@ -42,11 +44,7 @@
     St::Item: Future,
 {
     pub(super) fn new(stream: St, n: usize) -> Self {
-        Self {
-            stream: super::Fuse::new(stream),
-            in_progress_queue: FuturesOrdered::new(),
-            max: n,
-        }
+        Self { stream: super::Fuse::new(stream), in_progress_queue: FuturesOrdered::new(), max: n }
     }
 
     delegate_access_inner!(stream, St, (.));
@@ -59,10 +57,7 @@
 {
     type Item = <St::Item as Future>::Output;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         // First up, try to spawn off as many futures as possible by filling up
@@ -77,7 +72,7 @@
         // Attempt to pull the next value from the in_progress_queue
         let res = this.in_progress_queue.poll_next_unpin(cx);
         if let Some(val) = ready!(res) {
-            return Poll::Ready(Some(val))
+            return Poll::Ready(Some(val));
         }
 
         // If more values are still coming from the stream, we're not done yet
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/buffer_unordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/buffer_unordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/buffer_unordered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/buffer_unordered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,26 @@
 use crate::stream::{Fuse, FuturesUnordered, StreamExt};
+use core::fmt;
+use core::pin::Pin;
 use futures_core::future::Future;
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
-use core::fmt;
-use core::pin::Pin;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`buffer_unordered`](super::StreamExt::buffer_unordered)
-/// method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct BufferUnordered<St>
-where
-    St: Stream,
-{
-    #[pin]
-    stream: Fuse<St>,
-    in_progress_queue: FuturesUnordered<St::Item>,
-    max: usize,
+pin_project! {
+    /// Stream for the [`buffer_unordered`](super::StreamExt::buffer_unordered)
+    /// method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct BufferUnordered<St>
+    where
+        St: Stream,
+    {
+        #[pin]
+        stream: Fuse<St>,
+        in_progress_queue: FuturesUnordered<St::Item>,
+        max: usize,
+    }
 }
 
 impl<St> fmt::Debug for BufferUnordered<St>
@@ -62,10 +63,7 @@
 {
     type Item = <St::Item as Future>::Output;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         // First up, try to spawn off as many futures as possible by filling up
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/catch_unwind.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/catch_unwind.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/catch_unwind.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/catch_unwind.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,19 @@
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use std::any::Any;
+use std::panic::{catch_unwind, AssertUnwindSafe, UnwindSafe};
 use std::pin::Pin;
-use std::panic::{catch_unwind, UnwindSafe, AssertUnwindSafe};
 
-/// Stream for the [`catch_unwind`](super::StreamExt::catch_unwind) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct CatchUnwind<St> {
-    #[pin]
-    stream: St,
-    caught_unwind: bool,
+pin_project! {
+    /// Stream for the [`catch_unwind`](super::StreamExt::catch_unwind) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct CatchUnwind<St> {
+        #[pin]
+        stream: St,
+        caught_unwind: bool,
+    }
 }
 
 impl<St: Stream + UnwindSafe> CatchUnwind<St> {
@@ -26,25 +27,20 @@
 impl<St: Stream + UnwindSafe> Stream for CatchUnwind<St> {
     type Item = Result<St::Item, Box<dyn Any + Send>>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         if *this.caught_unwind {
             Poll::Ready(None)
         } else {
-            let res = catch_unwind(AssertUnwindSafe(|| {
-                this.stream.as_mut().poll_next(cx)
-            }));
+            let res = catch_unwind(AssertUnwindSafe(|| this.stream.as_mut().poll_next(cx)));
 
             match res {
                 Ok(poll) => poll.map(|opt| opt.map(Ok)),
                 Err(e) => {
                     *this.caught_unwind = true;
                     Poll::Ready(Some(Err(e)))
-                },
+                }
             }
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/chain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/chain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,35 +1,36 @@
 use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`chain`](super::StreamExt::chain) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Chain<St1, St2> {
-    #[pin]
-    first: Option<St1>,
-    #[pin]
-    second: St2,
+pin_project! {
+    /// Stream for the [`chain`](super::StreamExt::chain) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Chain<St1, St2> {
+        #[pin]
+        first: Option<St1>,
+        #[pin]
+        second: St2,
+    }
 }
 
 // All interactions with `Pin<&mut Chain<..>>` happen through these methods
 impl<St1, St2> Chain<St1, St2>
-where St1: Stream,
-      St2: Stream<Item = St1::Item>,
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
 {
     pub(super) fn new(stream1: St1, stream2: St2) -> Self {
-        Self {
-            first: Some(stream1),
-            second: stream2,
-        }
+        Self { first: Some(stream1), second: stream2 }
     }
 }
 
 impl<St1, St2> FusedStream for Chain<St1, St2>
-where St1: Stream,
-      St2: FusedStream<Item=St1::Item>,
+where
+    St1: Stream,
+    St2: FusedStream<Item = St1::Item>,
 {
     fn is_terminated(&self) -> bool {
         self.first.is_none() && self.second.is_terminated()
@@ -37,19 +38,17 @@
 }
 
 impl<St1, St2> Stream for Chain<St1, St2>
-where St1: Stream,
-      St2: Stream<Item=St1::Item>,
+where
+    St1: Stream,
+    St2: Stream<Item = St1::Item>,
 {
     type Item = St1::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
         if let Some(first) = this.first.as_mut().as_pin_mut() {
             if let Some(item) = ready!(first.poll_next(cx)) {
-                return Poll::Ready(Some(item))
+                return Poll::Ready(Some(item));
             }
         }
         this.first.set(None);
@@ -65,7 +64,7 @@
 
             let upper = match (first_upper, second_upper) {
                 (Some(x), Some(y)) => x.checked_add(y),
-                _ => None
+                _ => None,
             };
 
             (lower, upper)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/chunks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/chunks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/chunks.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/chunks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,30 @@
 use crate::stream::Fuse;
-use futures_core::stream::{Stream, FusedStream};
+use alloc::vec::Vec;
+use core::mem;
+use core::pin::Pin;
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
-use core::mem;
-use core::pin::Pin;
-use alloc::vec::Vec;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`chunks`](super::StreamExt::chunks) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Chunks<St: Stream> {
-    #[pin]
-    stream: Fuse<St>,
-    items: Vec<St::Item>,
-    cap: usize, // https://github.com/rust-lang/futures-rs/issues/1475
+pin_project! {
+    /// Stream for the [`chunks`](super::StreamExt::chunks) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Chunks<St: Stream> {
+        #[pin]
+        stream: Fuse<St>,
+        items: Vec<St::Item>,
+        cap: usize, // https://github.com/rust-lang/futures-rs/issues/1475
+    }
 }
 
-impl<St: Stream> Chunks<St> where St: Stream {
+impl<St: Stream> Chunks<St>
+where
+    St: Stream,
+{
     pub(super) fn new(stream: St, capacity: usize) -> Self {
         assert!(capacity > 0);
 
@@ -41,10 +46,7 @@
 impl<St: Stream> Stream for Chunks<St> {
     type Item = Vec<St::Item>;
 
-    fn poll_next(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.as_mut().project();
         loop {
             match ready!(this.stream.as_mut().poll_next(cx)) {
@@ -54,7 +56,7 @@
                 Some(item) => {
                     this.items.push(item);
                     if this.items.len() >= *this.cap {
-                        return Poll::Ready(Some(self.take()))
+                        return Poll::Ready(Some(self.take()));
                     }
                 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/collect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/collect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/collect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/collect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,20 @@
 use core::mem;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`collect`](super::StreamExt::collect) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Collect<St, C> {
-    #[pin]
-    stream: St,
-    collection: C,
+pin_project! {
+    /// Future for the [`collect`](super::StreamExt::collect) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Collect<St, C> {
+        #[pin]
+        stream: St,
+        collection: C,
+    }
 }
 
 impl<St: Stream, C: Default> Collect<St, C> {
@@ -21,16 +23,14 @@
     }
 
     pub(super) fn new(stream: St) -> Self {
-        Self {
-            stream,
-            collection: Default::default(),
-        }
+        Self { stream, collection: Default::default() }
     }
 }
 
 impl<St, C> FusedFuture for Collect<St, C>
-where St: FusedStream,
-      C: Default + Extend<St:: Item>
+where
+    St: FusedStream,
+    C: Default + Extend<St::Item>,
 {
     fn is_terminated(&self) -> bool {
         self.stream.is_terminated()
@@ -38,8 +38,9 @@
 }
 
 impl<St, C> Future for Collect<St, C>
-where St: Stream,
-      C: Default + Extend<St:: Item>
+where
+    St: Stream,
+    C: Default + Extend<St::Item>,
 {
     type Output = C;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/concat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/concat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/concat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/concat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,49 +1,44 @@
 use core::pin::Pin;
-use futures_core::future::{Future, FusedFuture};
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`concat`](super::StreamExt::concat) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Concat<St: Stream> {
-    #[pin]
-    stream: St,
-    accum: Option<St::Item>,
+pin_project! {
+    /// Future for the [`concat`](super::StreamExt::concat) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Concat<St: Stream> {
+        #[pin]
+        stream: St,
+        accum: Option<St::Item>,
+    }
 }
 
 impl<St> Concat<St>
-where St: Stream,
-      St::Item: Extend<<St::Item as IntoIterator>::Item> +
-                IntoIterator + Default,
+where
+    St: Stream,
+    St::Item: Extend<<St::Item as IntoIterator>::Item> + IntoIterator + Default,
 {
     pub(super) fn new(stream: St) -> Self {
-        Self {
-            stream,
-            accum: None,
-        }
+        Self { stream, accum: None }
     }
 }
 
 impl<St> Future for Concat<St>
-where St: Stream,
-      St::Item: Extend<<St::Item as IntoIterator>::Item> +
-                IntoIterator + Default,
+where
+    St: Stream,
+    St::Item: Extend<<St::Item as IntoIterator>::Item> + IntoIterator + Default,
 {
     type Output = St::Item;
 
-    fn poll(
-        self: Pin<&mut Self>, cx: &mut Context<'_>
-    ) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let mut this = self.project();
 
         loop {
             match ready!(this.stream.as_mut().poll_next(cx)) {
-                None => {
-                    return Poll::Ready(this.accum.take().unwrap_or_default())
-                }
+                None => return Poll::Ready(this.accum.take().unwrap_or_default()),
                 Some(e) => {
                     if let Some(a) = this.accum {
                         a.extend(e)
@@ -57,9 +52,9 @@
 }
 
 impl<St> FusedFuture for Concat<St>
-where St: FusedStream,
-      St::Item: Extend<<St::Item as IntoIterator>::Item> +
-                IntoIterator + Default,
+where
+    St: FusedStream,
+    St::Item: Extend<<St::Item as IntoIterator>::Item> + IntoIterator + Default,
 {
     fn is_terminated(&self) -> bool {
         self.accum.is_none() && self.stream.is_terminated()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/cycle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/cycle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/cycle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/cycle.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,19 @@
 use core::pin::Pin;
 use core::usize;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`cycle`](super::StreamExt::cycle) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Cycle<St> {
-    orig: St,
-    #[pin]
-    stream: St,
+pin_project! {
+    /// Stream for the [`cycle`](super::StreamExt::cycle) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Cycle<St> {
+        orig: St,
+        #[pin]
+        stream: St,
+    }
 }
 
 impl<St> Cycle<St>
@@ -19,10 +21,7 @@
     St: Clone + Stream,
 {
     pub(super) fn new(stream: St) -> Self {
-        Self {
-            orig: stream.clone(),
-            stream,
-        }
+        Self { orig: stream.clone(), stream }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/enumerate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/enumerate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/enumerate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/enumerate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,25 @@
 use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`enumerate`](super::StreamExt::enumerate) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Enumerate<St> {
-    #[pin]
-    stream: St,
-    count: usize,
+pin_project! {
+    /// Stream for the [`enumerate`](super::StreamExt::enumerate) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Enumerate<St> {
+        #[pin]
+        stream: St,
+        count: usize,
+    }
 }
 
 impl<St: Stream> Enumerate<St> {
     pub(super) fn new(stream: St) -> Self {
-        Self {
-            stream,
-            count: 0,
-        }
+        Self { stream, count: 0 }
     }
 
     delegate_access_inner!(stream, St, ());
@@ -35,10 +34,7 @@
 impl<St: Stream> Stream for Enumerate<St> {
     type Item = (usize, St::Item);
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let this = self.project();
 
         match ready!(this.stream.poll_next(cx)) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/filter_map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/filter_map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/filter_map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/filter_map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,24 @@
+use crate::fns::FnMut1;
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
-use crate::fns::FnMut1;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`filter_map`](super::StreamExt::filter_map) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct FilterMap<St, Fut, F> {
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    pending: Option<Fut>,
+pin_project! {
+    /// Stream for the [`filter_map`](super::StreamExt::filter_map) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct FilterMap<St, Fut, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        pending: Option<Fut>,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for FilterMap<St, Fut, F>
@@ -33,9 +35,10 @@
 }
 
 impl<St, Fut, F> FilterMap<St, Fut, F>
-    where St: Stream,
-          F: FnMut(St::Item) -> Fut,
-          Fut: Future,
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
         Self { stream, f, pending: None }
@@ -45,9 +48,10 @@
 }
 
 impl<St, Fut, F, T> FusedStream for FilterMap<St, Fut, F>
-    where St: Stream + FusedStream,
-          F: FnMut1<St::Item, Output=Fut>,
-          Fut: Future<Output = Option<T>>,
+where
+    St: Stream + FusedStream,
+    F: FnMut1<St::Item, Output = Fut>,
+    Fut: Future<Output = Option<T>>,
 {
     fn is_terminated(&self) -> bool {
         self.pending.is_none() && self.stream.is_terminated()
@@ -55,16 +59,14 @@
 }
 
 impl<St, Fut, F, T> Stream for FilterMap<St, Fut, F>
-    where St: Stream,
-          F: FnMut1<St::Item, Output=Fut>,
-          Fut: Future<Output = Option<T>>,
+where
+    St: Stream,
+    F: FnMut1<St::Item, Output = Fut>,
+    Fut: Future<Output = Option<T>>,
 {
     type Item = T;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<T>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
         let mut this = self.project();
         Poll::Ready(loop {
             if let Some(p) = this.pending.as_mut().as_pin_mut() {
@@ -98,9 +100,10 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item> Sink<Item> for FilterMap<S, Fut, F>
-    where S: Stream + Sink<Item>,
-          F: FnMut1<S::Item, Output=Fut>,
-          Fut: Future,
+where
+    S: Stream + Sink<Item>,
+    F: FnMut1<S::Item, Output = Fut>,
+    Fut: Future,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/filter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/filter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/filter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/filter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,27 @@
+use crate::fns::FnMut1;
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
-use crate::fns::FnMut1;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`filter`](super::StreamExt::filter) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct Filter<St, Fut, F>
-    where St: Stream,
-{
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    pending_fut: Option<Fut>,
-    pending_item: Option<St::Item>,
+pin_project! {
+    /// Stream for the [`filter`](super::StreamExt::filter) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Filter<St, Fut, F>
+        where St: Stream,
+    {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        pending_fut: Option<Fut>,
+        pending_item: Option<St::Item>,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for Filter<St, Fut, F>
@@ -39,26 +41,23 @@
 
 #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
 impl<St, Fut, F> Filter<St, Fut, F>
-where St: Stream,
-      F: for<'a> FnMut1<&'a St::Item, Output=Fut>,
-      Fut: Future<Output = bool>,
+where
+    St: Stream,
+    F: for<'a> FnMut1<&'a St::Item, Output = Fut>,
+    Fut: Future<Output = bool>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            f,
-            pending_fut: None,
-            pending_item: None,
-        }
+        Self { stream, f, pending_fut: None, pending_item: None }
     }
 
     delegate_access_inner!(stream, St, ());
 }
 
 impl<St, Fut, F> FusedStream for Filter<St, Fut, F>
-    where St: Stream + FusedStream,
-          F: FnMut(&St::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    St: Stream + FusedStream,
+    F: FnMut(&St::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     fn is_terminated(&self) -> bool {
         self.pending_fut.is_none() && self.stream.is_terminated()
@@ -67,16 +66,14 @@
 
 #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
 impl<St, Fut, F> Stream for Filter<St, Fut, F>
-    where St: Stream,
-          F: for<'a> FnMut1<&'a St::Item, Output=Fut>,
-          Fut: Future<Output = bool>,
+where
+    St: Stream,
+    F: for<'a> FnMut1<&'a St::Item, Output = Fut>,
+    Fut: Future<Output = bool>,
 {
     type Item = St::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<St::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<St::Item>> {
         let mut this = self.project();
         Poll::Ready(loop {
             if let Some(fut) = this.pending_fut.as_mut().as_pin_mut() {
@@ -109,9 +106,10 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item> Sink<Item> for Filter<S, Fut, F>
-    where S: Stream + Sink<Item>,
-          F: FnMut(&S::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    S: Stream + Sink<Item>,
+    F: FnMut(&S::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/flatten.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/flatten.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/flatten.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/flatten.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,21 @@
 use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`flatten`](super::StreamExt::flatten) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Flatten<St, U> {
-    #[pin]
-    stream: St,
-    #[pin]
-    next: Option<U>,
+pin_project! {
+    /// Stream for the [`flatten`](super::StreamExt::flatten) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Flatten<St, U> {
+        #[pin]
+        stream: St,
+        #[pin]
+        next: Option<U>,
+    }
 }
 
 impl<St, U> Flatten<St, U> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/fold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/fold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/fold.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/fold.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,22 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`fold`](super::StreamExt::fold) method.
-#[pin_project]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Fold<St, Fut, T, F> {
-    #[pin]
-    stream: St,
-    f: F,
-    accum: Option<T>,
-    #[pin]
-    future: Option<Fut>,
+pin_project! {
+    /// Future for the [`fold`](super::StreamExt::fold) method.
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Fold<St, Fut, T, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        accum: Option<T>,
+        #[pin]
+        future: Option<Fut>,
+    }
 }
 
 impl<St, Fut, T, F> fmt::Debug for Fold<St, Fut, T, F>
@@ -33,24 +35,21 @@
 }
 
 impl<St, Fut, T, F> Fold<St, Fut, T, F>
-where St: Stream,
-      F: FnMut(T, St::Item) -> Fut,
-      Fut: Future<Output = T>,
+where
+    St: Stream,
+    F: FnMut(T, St::Item) -> Fut,
+    Fut: Future<Output = T>,
 {
     pub(super) fn new(stream: St, f: F, t: T) -> Self {
-        Self {
-            stream,
-            f,
-            accum: Some(t),
-            future: None,
-        }
+        Self { stream, f, accum: Some(t), future: None }
     }
 }
 
 impl<St, Fut, T, F> FusedFuture for Fold<St, Fut, T, F>
-    where St: Stream,
-          F: FnMut(T, St::Item) -> Fut,
-          Fut: Future<Output = T>,
+where
+    St: Stream,
+    F: FnMut(T, St::Item) -> Fut,
+    Fut: Future<Output = T>,
 {
     fn is_terminated(&self) -> bool {
         self.accum.is_none() && self.future.is_none()
@@ -58,9 +57,10 @@
 }
 
 impl<St, Fut, T, F> Future for Fold<St, Fut, T, F>
-    where St: Stream,
-          F: FnMut(T, St::Item) -> Fut,
-          Fut: Future<Output = T>,
+where
+    St: Stream,
+    F: FnMut(T, St::Item) -> Fut,
+    Fut: Future<Output = T>,
 {
     type Output = T;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/for_each_concurrent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/for_each_concurrent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/for_each_concurrent.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/for_each_concurrent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,23 @@
 use crate::stream::{FuturesUnordered, StreamExt};
 use core::fmt;
-use core::pin::Pin;
 use core::num::NonZeroUsize;
+use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`for_each_concurrent`](super::StreamExt::for_each_concurrent)
-/// method.
-#[pin_project]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct ForEachConcurrent<St, Fut, F> {
-    #[pin]
-    stream: Option<St>,
-    f: F,
-    futures: FuturesUnordered<Fut>,
-    limit: Option<NonZeroUsize>,
+pin_project! {
+    /// Future for the [`for_each_concurrent`](super::StreamExt::for_each_concurrent)
+    /// method.
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct ForEachConcurrent<St, Fut, F> {
+        #[pin]
+        stream: Option<St>,
+        f: F,
+        futures: FuturesUnordered<Fut>,
+        limit: Option<NonZeroUsize>,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for ForEachConcurrent<St, Fut, F>
@@ -34,9 +35,10 @@
 }
 
 impl<St, Fut, F> ForEachConcurrent<St, Fut, F>
-where St: Stream,
-      F: FnMut(St::Item) -> Fut,
-      Fut: Future<Output = ()>,
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = ()>,
 {
     pub(super) fn new(stream: St, limit: Option<usize>, f: F) -> Self {
         Self {
@@ -50,9 +52,10 @@
 }
 
 impl<St, Fut, F> FusedFuture for ForEachConcurrent<St, Fut, F>
-    where St: Stream,
-          F: FnMut(St::Item) -> Fut,
-          Fut: Future<Output = ()>,
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = ()>,
 {
     fn is_terminated(&self) -> bool {
         self.stream.is_none() && self.futures.is_empty()
@@ -60,9 +63,10 @@
 }
 
 impl<St, Fut, F> Future for ForEachConcurrent<St, Fut, F>
-    where St: Stream,
-          F: FnMut(St::Item) -> Fut,
-          Fut: Future<Output = ()>,
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = ()>,
 {
     type Output = ();
 
@@ -79,7 +83,7 @@
                         Poll::Ready(Some(elem)) => {
                             made_progress_this_iter = true;
                             Some(elem)
-                        },
+                        }
                         Poll::Ready(None) => {
                             stream_completed = true;
                             None
@@ -101,9 +105,9 @@
                 Poll::Ready(Some(())) => made_progress_this_iter = true,
                 Poll::Ready(None) => {
                     if this.stream.is_none() {
-                        return Poll::Ready(())
+                        return Poll::Ready(());
                     }
-                },
+                }
                 Poll::Pending => {}
             }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/for_each.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/for_each.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/for_each.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/for_each.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,21 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`for_each`](super::StreamExt::for_each) method.
-#[pin_project]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct ForEach<St, Fut, F> {
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    future: Option<Fut>,
+pin_project! {
+    /// Future for the [`for_each`](super::StreamExt::for_each) method.
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct ForEach<St, Fut, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        future: Option<Fut>,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for ForEach<St, Fut, F>
@@ -30,23 +32,21 @@
 }
 
 impl<St, Fut, F> ForEach<St, Fut, F>
-where St: Stream,
-      F: FnMut(St::Item) -> Fut,
-      Fut: Future<Output = ()>,
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = ()>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            f,
-            future: None,
-        }
+        Self { stream, f, future: None }
     }
 }
 
 impl<St, Fut, F> FusedFuture for ForEach<St, Fut, F>
-    where St: FusedStream,
-          F: FnMut(St::Item) -> Fut,
-          Fut: Future<Output = ()>,
+where
+    St: FusedStream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = ()>,
 {
     fn is_terminated(&self) -> bool {
         self.future.is_none() && self.stream.is_terminated()
@@ -54,9 +54,10 @@
 }
 
 impl<St, Fut, F> Future for ForEach<St, Fut, F>
-    where St: Stream,
-          F: FnMut(St::Item) -> Fut,
-          Fut: Future<Output = ()>,
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future<Output = ()>,
 {
     type Output = ();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/forward.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/forward.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/forward.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/forward.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,29 @@
 use crate::stream::Fuse;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`forward`](super::StreamExt::forward) method.
-#[pin_project(project = ForwardProj)]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Forward<St, Si, Item> {
-    #[pin]
-    sink: Option<Si>,
-    #[pin]
-    stream: Fuse<St>,
-    buffered_item: Option<Item>,
+pin_project! {
+    /// Future for the [`forward`](super::StreamExt::forward) method.
+    #[project = ForwardProj]
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Forward<St, Si, Item> {
+        #[pin]
+        sink: Option<Si>,
+        #[pin]
+        stream: Fuse<St>,
+        buffered_item: Option<Item>,
+    }
 }
 
 impl<St, Si, Item> Forward<St, Si, Item> {
     pub(crate) fn new(stream: St, sink: Si) -> Self {
-        Self {
-            sink: Some(sink),
-            stream: Fuse::new(stream),
-            buffered_item: None,
-        }
+        Self { sink: Some(sink), stream: Fuse::new(stream), buffered_item: None }
     }
 }
 
@@ -45,10 +44,7 @@
 {
     type Output = Result<(), E>;
 
-    fn poll(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let ForwardProj { mut sink, mut stream, buffered_item } = self.project();
         let mut si = sink.as_mut().as_pin_mut().expect("polled `Forward` after completion");
 
@@ -67,11 +63,11 @@
                 Poll::Ready(None) => {
                     ready!(si.poll_close(cx))?;
                     sink.set(None);
-                    return Poll::Ready(Ok(()))
+                    return Poll::Ready(Ok(()));
                 }
                 Poll::Pending => {
                     ready!(si.poll_flush(cx))?;
-                    return Poll::Pending
+                    return Poll::Pending;
                 }
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/fuse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/fuse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/fuse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/fuse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,20 @@
 use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`fuse`](super::StreamExt::fuse) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Fuse<St> {
-    #[pin]
-    stream: St,
-    done: bool,
+pin_project! {
+    /// Stream for the [`fuse`](super::StreamExt::fuse) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Fuse<St> {
+        #[pin]
+        stream: St,
+        done: bool,
+    }
 }
 
 impl<St> Fuse<St> {
@@ -41,10 +43,7 @@
 impl<S: Stream> Stream for Fuse<S> {
     type Item = S::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<S::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<S::Item>> {
         let this = self.project();
 
         if *this.done {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/into_future.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/into_future.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/into_future.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/into_future.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 use crate::stream::StreamExt;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
 
@@ -78,10 +79,7 @@
 impl<St: Stream + Unpin> Future for StreamFuture<St> {
     type Output = (Option<St::Item>, St);
 
-    fn poll(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let item = {
             let s = self.stream.as_mut().expect("polling StreamFuture twice");
             ready!(s.poll_next_unpin(cx))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,22 @@
 use core::fmt;
 use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 use crate::fns::FnMut1;
 
-/// Stream for the [`map`](super::StreamExt::map) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct Map<St, F> {
-    #[pin]
-    stream: St,
-    f: F,
+pin_project! {
+    /// Stream for the [`map`](super::StreamExt::map) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Map<St, F> {
+        #[pin]
+        stream: St,
+        f: F,
+    }
 }
 
 impl<St, F> fmt::Debug for Map<St, F>
@@ -22,9 +24,7 @@
     St: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Map")
-            .field("stream", &self.stream)
-            .finish()
+        f.debug_struct("Map").field("stream", &self.stream).finish()
     }
 }
 
@@ -37,8 +37,9 @@
 }
 
 impl<St, F> FusedStream for Map<St, F>
-    where St: FusedStream,
-          F: FnMut1<St::Item>,
+where
+    St: FusedStream,
+    F: FnMut1<St::Item>,
 {
     fn is_terminated(&self) -> bool {
         self.stream.is_terminated()
@@ -46,15 +47,13 @@
 }
 
 impl<St, F> Stream for Map<St, F>
-    where St: Stream,
-          F: FnMut1<St::Item>,
+where
+    St: Stream,
+    F: FnMut1<St::Item>,
 {
     type Item = F::Output;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
         let res = ready!(this.stream.as_mut().poll_next(cx));
         Poll::Ready(res.map(|x| this.f.call_mut(x)))
@@ -68,8 +67,9 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<St, F, Item> Sink<Item> for Map<St, F>
-    where St: Stream + Sink<Item>,
-          F: FnMut1<St::Item>,
+where
+    St: Stream + Sink<Item>,
+    F: FnMut1<St::Item>,
 {
     type Error = St::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,8 +4,11 @@
 //! including the `StreamExt` trait which adds methods to `Stream` types.
 
 use crate::future::{assert_future, Either};
+use crate::stream::assert_stream;
 #[cfg(feature = "alloc")]
 use alloc::boxed::Box;
+#[cfg(feature = "alloc")]
+use alloc::vec::Vec;
 use core::pin::Pin;
 #[cfg(feature = "sink")]
 use futures_core::stream::TryStream;
@@ -19,7 +22,7 @@
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
 
-use crate::fns::{InspectFn, inspect_fn};
+use crate::fns::{inspect_fn, InspectFn};
 
 mod chain;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
@@ -29,6 +32,10 @@
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::collect::Collect;
 
+mod unzip;
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::unzip::Unzip;
+
 mod concat;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::concat::Concat;
@@ -63,6 +70,14 @@
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::fold::Fold;
 
+mod any;
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::any::Any;
+
+mod all;
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::all::All;
+
 #[cfg(feature = "sink")]
 mod forward;
 
@@ -116,7 +131,7 @@
 
 mod peek;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-pub use self::peek::{Peek, Peekable};
+pub use self::peek::{NextIf, NextIfEq, Peek, PeekMut, Peekable};
 
 mod skip;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
@@ -162,42 +177,47 @@
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::scan::Scan;
 
-cfg_target_has_atomic! {
-    #[cfg(feature = "alloc")]
-    mod buffer_unordered;
-    #[cfg(feature = "alloc")]
-    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use self::buffer_unordered::BufferUnordered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod buffer_unordered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::buffer_unordered::BufferUnordered;
 
-    #[cfg(feature = "alloc")]
-    mod buffered;
-    #[cfg(feature = "alloc")]
-    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use self::buffered::Buffered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod buffered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::buffered::Buffered;
 
-    #[cfg(feature = "alloc")]
-    mod for_each_concurrent;
-    #[cfg(feature = "alloc")]
-    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use self::for_each_concurrent::ForEachConcurrent;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod for_each_concurrent;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::for_each_concurrent::ForEachConcurrent;
 
-    #[cfg(feature = "sink")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
-    #[cfg(feature = "alloc")]
-    mod split;
-    #[cfg(feature = "sink")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
-    #[cfg(feature = "alloc")]
-    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use self::split::{SplitStream, SplitSink, ReuniteError};
-}
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "sink")]
+#[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
+#[cfg(feature = "alloc")]
+mod split;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "sink")]
+#[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
+#[cfg(feature = "alloc")]
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::split::{ReuniteError, SplitSink, SplitStream};
 
 #[cfg(feature = "std")]
 mod catch_unwind;
 #[cfg(feature = "std")]
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::catch_unwind::CatchUnwind;
-use crate::stream::assert_stream;
 
 impl<T: ?Sized> StreamExt for T where T: Stream {}
 
@@ -477,6 +497,45 @@
         assert_future::<C, _>(Collect::new(self))
     }
 
+    /// Converts a stream of pairs into a future, which
+    /// resolves to pair of containers.
+    ///
+    /// `unzip()` produces a future, which resolves to two
+    /// collections: one from the left elements of the pairs,
+    /// and one from the right elements.
+    ///
+    /// The returned future will be resolved when the stream terminates.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::channel::mpsc;
+    /// use futures::stream::StreamExt;
+    /// use std::thread;
+    ///
+    /// let (tx, rx) = mpsc::unbounded();
+    ///
+    /// thread::spawn(move || {
+    ///     tx.unbounded_send((1, 2)).unwrap();
+    ///     tx.unbounded_send((3, 4)).unwrap();
+    ///     tx.unbounded_send((5, 6)).unwrap();
+    /// });
+    ///
+    /// let (o1, o2): (Vec<_>, Vec<_>) = rx.unzip().await;
+    /// assert_eq!(o1, vec![1, 3, 5]);
+    /// assert_eq!(o2, vec![2, 4, 6]);
+    /// # });
+    /// ```
+    fn unzip<A, B, FromA, FromB>(self) -> Unzip<Self, FromA, FromB>
+    where
+        FromA: Default + Extend<A>,
+        FromB: Default + Extend<B>,
+        Self: Sized + Stream<Item = (A, B)>,
+    {
+        assert_future::<(FromA, FromB), _>(Unzip::new(self))
+    }
+
     /// Concatenate all items of a stream into a single extendable
     /// destination, returning a future representing the end result.
     ///
@@ -576,6 +635,50 @@
         assert_future::<T, _>(Fold::new(self, f, init))
     }
 
+    /// Execute predicate over asynchronous stream, and return `true` if any element in stream satisfied a predicate.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::stream::{self, StreamExt};
+    ///
+    /// let number_stream = stream::iter(0..10);
+    /// let contain_three = number_stream.any(|i| async move { i == 3 });
+    /// assert_eq!(contain_three.await, true);
+    /// # });
+    /// ```
+    fn any<Fut, F>(self, f: F) -> Any<Self, Fut, F>
+    where
+        F: FnMut(Self::Item) -> Fut,
+        Fut: Future<Output = bool>,
+        Self: Sized,
+    {
+        assert_future::<bool, _>(Any::new(self, f))
+    }
+
+    /// Execute predicate over asynchronous stream, and return `true` if all element in stream satisfied a predicate.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::stream::{self, StreamExt};
+    ///
+    /// let number_stream = stream::iter(0..10);
+    /// let less_then_twenty = number_stream.all(|i| async move { i < 20 });
+    /// assert_eq!(less_then_twenty.await, true);
+    /// # });
+    /// ```
+    fn all<Fut, F>(self, f: F) -> All<Self, Fut, F>
+    where
+        F: FnMut(Self::Item) -> Fut,
+        Fut: Future<Output = bool>,
+        Self: Sized,
+    {
+        assert_future::<bool, _>(All::new(self, f))
+    }
+
     /// Flattens a stream of streams into just one continuous stream.
     ///
     /// # Examples
@@ -646,7 +749,7 @@
         U: Stream,
         Self: Sized,
     {
-        FlatMap::new(self, f)
+        assert_stream::<U::Item, _>(FlatMap::new(self, f))
     }
 
     /// Combinator similar to [`StreamExt::fold`] that holds internal state
@@ -679,7 +782,7 @@
         Fut: Future<Output = Option<B>>,
         Self: Sized,
     {
-        Scan::new(self, initial_state, f)
+        assert_stream::<B, _>(Scan::new(self, initial_state, f))
     }
 
     /// Skip elements on this stream while the provided asynchronous predicate
@@ -750,7 +853,7 @@
     /// this stream combinator will always return that the stream is done.
     ///
     /// The stopping future may return any type. Once the stream is stopped
-    /// the result of the stopping future may be aceessed with `TakeUntil::take_result()`.
+    /// the result of the stopping future may be accessed with `TakeUntil::take_result()`.
     /// The stream may also be resumed with `TakeUntil::take_future()`.
     /// See the documentation of [`TakeUntil`] for more information.
     ///
@@ -784,7 +887,7 @@
         Fut: Future,
         Self: Sized,
     {
-        TakeUntil::new(self, fut)
+        assert_stream::<Self::Item, _>(TakeUntil::new(self, fut))
     }
 
     /// Runs this stream to completion, executing the provided asynchronous
@@ -874,7 +977,7 @@
     /// fut.await;
     /// # })
     /// ```
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+    #[cfg(not(futures_no_atomic_cas))]
     #[cfg(feature = "alloc")]
     fn for_each_concurrent<Fut, F>(
         self,
@@ -1097,7 +1200,7 @@
     ///
     /// This method is only available when the `std` or `alloc` feature of this
     /// library is activated, and it is activated by default.
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+    #[cfg(not(futures_no_atomic_cas))]
     #[cfg(feature = "alloc")]
     fn buffered(self, n: usize) -> Buffered<Self>
     where
@@ -1142,7 +1245,7 @@
     /// assert_eq!(buffered.next().await, None);
     /// # Ok::<(), i32>(()) }).unwrap();
     /// ```
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+    #[cfg(not(futures_no_atomic_cas))]
     #[cfg(feature = "alloc")]
     fn buffer_unordered(self, n: usize) -> BufferUnordered<Self>
     where
@@ -1246,7 +1349,7 @@
     where
         Self: Sized,
     {
-        assert_stream::<alloc::vec::Vec<Self::Item>, _>(Chunks::new(self, capacity))
+        assert_stream::<Vec<Self::Item>, _>(Chunks::new(self, capacity))
     }
 
     /// An adaptor for chunking up ready items of the stream inside a vector.
@@ -1269,10 +1372,10 @@
     /// This method will panic if `capacity` is zero.
     #[cfg(feature = "alloc")]
     fn ready_chunks(self, capacity: usize) -> ReadyChunks<Self>
-        where
-            Self: Sized,
+    where
+        Self: Sized,
     {
-        ReadyChunks::new(self, capacity)
+        assert_stream::<Vec<Self::Item>, _>(ReadyChunks::new(self, capacity))
     }
 
     /// A future that completes after the given stream has been fully processed
@@ -1284,14 +1387,18 @@
     /// the sink is closed. Note that neither the original stream nor provided
     /// sink will be output by this future. Pass the sink by `Pin<&mut S>`
     /// (for example, via `forward(&mut sink)` inside an `async` fn/block) in
-    /// order to preserve access to the `Sink`.
+    /// order to preserve access to the `Sink`. If the stream produces an error,
+    /// that error will be returned by this future without flushing/closing the sink.
     #[cfg(feature = "sink")]
     #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
     fn forward<S>(self, sink: S) -> Forward<Self, S>
     where
         S: Sink<Self::Ok, Error = Self::Error>,
         Self: TryStream + Sized,
+        // Self: TryStream + Sized + Stream<Item = Result<<Self as TryStream>::Ok, <Self as TryStream>::Error>>,
     {
+        // TODO: type mismatch resolving `<Self as futures_core::Stream>::Item == std::result::Result<<Self as futures_core::TryStream>::Ok, <Self as futures_core::TryStream>::Error>`
+        // assert_future::<Result<(), Self::Error>, _>(Forward::new(self, sink))
         Forward::new(self, sink)
     }
 
@@ -1306,14 +1413,17 @@
     /// library is activated, and it is activated by default.
     #[cfg(feature = "sink")]
     #[cfg_attr(docsrs, doc(cfg(feature = "sink")))]
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+    #[cfg(not(futures_no_atomic_cas))]
     #[cfg(feature = "alloc")]
     fn split<Item>(self) -> (SplitSink<Self, Item>, SplitStream<Self>)
     where
         Self: Sink<Item> + Sized,
     {
         let (sink, stream) = split::split(self);
-        (sink, assert_stream::<Self::Item, _>(stream))
+        (
+            crate::sink::assert_sink::<Item, Self::Error, _>(sink),
+            assert_stream::<Self::Item, _>(stream),
+        )
     }
 
     /// Do something with each item of this stream, afterwards passing it on.
@@ -1416,6 +1526,6 @@
     where
         Self: Unpin + FusedStream,
     {
-        SelectNextSome::new(self)
+        assert_future::<Self::Item, _>(SelectNextSome::new(self))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/next.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/next.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/next.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/next.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,10 +28,7 @@
 impl<St: ?Sized + Stream + Unpin> Future for Next<'_, St> {
     type Output = Option<St::Item>;
 
-    fn poll(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         self.stream.poll_next_unpin(cx)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/peek.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/peek.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/peek.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/peek.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,38 +1,39 @@
+use crate::fns::FnOnce1;
 use crate::stream::{Fuse, StreamExt};
 use core::fmt;
+use core::marker::PhantomData;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// A `Stream` that implements a `peek` method.
-///
-/// The `peek` method can be used to retrieve a reference
-/// to the next `Stream::Item` if available. A subsequent
-/// call to `poll` will return the owned item.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Peekable<St: Stream> {
-    #[pin]
-    stream: Fuse<St>,
-    peeked: Option<St::Item>,
+pin_project! {
+    /// A `Stream` that implements a `peek` method.
+    ///
+    /// The `peek` method can be used to retrieve a reference
+    /// to the next `Stream::Item` if available. A subsequent
+    /// call to `poll` will return the owned item.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Peekable<St: Stream> {
+        #[pin]
+        stream: Fuse<St>,
+        peeked: Option<St::Item>,
+    }
 }
 
 impl<St: Stream> Peekable<St> {
     pub(super) fn new(stream: St) -> Self {
-        Self {
-            stream: stream.fuse(),
-            peeked: None,
-        }
+        Self { stream: stream.fuse(), peeked: None }
     }
 
     delegate_access_inner!(stream, St, (.));
 
-    /// Produces a `Peek` future which retrieves a reference to the next item
+    /// Produces a future which retrieves a reference to the next item
     /// in the stream, or `None` if the underlying stream terminates.
     pub fn peek(self: Pin<&mut Self>) -> Peek<'_, St> {
         Peek { inner: Some(self) }
@@ -42,15 +43,60 @@
     ///
     /// This method polls the underlying stream and return either a reference
     /// to the next item if the stream is ready or passes through any errors.
-    pub fn poll_peek(
+    pub fn poll_peek(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<&St::Item>> {
+        let mut this = self.project();
+
+        Poll::Ready(loop {
+            if this.peeked.is_some() {
+                break this.peeked.as_ref();
+            } else if let Some(item) = ready!(this.stream.as_mut().poll_next(cx)) {
+                *this.peeked = Some(item);
+            } else {
+                break None;
+            }
+        })
+    }
+
+    /// Produces a future which retrieves a mutable reference to the next item
+    /// in the stream, or `None` if the underlying stream terminates.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::stream::{self, StreamExt};
+    /// use futures::pin_mut;
+    ///
+    /// let stream = stream::iter(vec![1, 2, 3]).peekable();
+    /// pin_mut!(stream);
+    ///
+    /// assert_eq!(stream.as_mut().peek_mut().await, Some(&mut 1));
+    /// assert_eq!(stream.as_mut().next().await, Some(1));
+    ///
+    /// // Peek into the stream and modify the value which will be returned next
+    /// if let Some(p) = stream.as_mut().peek_mut().await {
+    ///     if *p == 2 {
+    ///         *p = 5;
+    ///     }
+    /// }
+    ///
+    /// assert_eq!(stream.collect::<Vec<_>>().await, vec![5, 3]);
+    /// # });
+    /// ```
+    pub fn peek_mut(self: Pin<&mut Self>) -> PeekMut<'_, St> {
+        PeekMut { inner: Some(self) }
+    }
+
+    /// Peek retrieves a mutable reference to the next item in the stream.
+    pub fn poll_peek_mut(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-    ) -> Poll<Option<&St::Item>> {
+    ) -> Poll<Option<&mut St::Item>> {
         let mut this = self.project();
 
         Poll::Ready(loop {
             if this.peeked.is_some() {
-                break this.peeked.as_ref();
+                break this.peeked.as_mut();
             } else if let Some(item) = ready!(this.stream.as_mut().poll_next(cx)) {
                 *this.peeked = Some(item);
             } else {
@@ -58,6 +104,86 @@
             }
         })
     }
+
+    /// Creates a future which will consume and return the next value of this
+    /// stream if a condition is true.
+    ///
+    /// If `func` returns `true` for the next value of this stream, consume and
+    /// return it. Otherwise, return `None`.
+    ///
+    /// # Examples
+    ///
+    /// Consume a number if it's equal to 0.
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::stream::{self, StreamExt};
+    /// use futures::pin_mut;
+    ///
+    /// let stream = stream::iter(0..5).peekable();
+    /// pin_mut!(stream);
+    /// // The first item of the stream is 0; consume it.
+    /// assert_eq!(stream.as_mut().next_if(|&x| x == 0).await, Some(0));
+    /// // The next item returned is now 1, so `consume` will return `false`.
+    /// assert_eq!(stream.as_mut().next_if(|&x| x == 0).await, None);
+    /// // `next_if` saves the value of the next item if it was not equal to `expected`.
+    /// assert_eq!(stream.next().await, Some(1));
+    /// # });
+    /// ```
+    ///
+    /// Consume any number less than 10.
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::stream::{self, StreamExt};
+    /// use futures::pin_mut;
+    ///
+    /// let stream = stream::iter(1..20).peekable();
+    /// pin_mut!(stream);
+    /// // Consume all numbers less than 10
+    /// while stream.as_mut().next_if(|&x| x < 10).await.is_some() {}
+    /// // The next value returned will be 10
+    /// assert_eq!(stream.next().await, Some(10));
+    /// # });
+    /// ```
+    pub fn next_if<F>(self: Pin<&mut Self>, func: F) -> NextIf<'_, St, F>
+    where
+        F: FnOnce(&St::Item) -> bool,
+    {
+        NextIf { inner: Some((self, func)) }
+    }
+
+    /// Creates a future which will consume and return the next item if it is
+    /// equal to `expected`.
+    ///
+    /// # Example
+    ///
+    /// Consume a number if it's equal to 0.
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::stream::{self, StreamExt};
+    /// use futures::pin_mut;
+    ///
+    /// let stream = stream::iter(0..5).peekable();
+    /// pin_mut!(stream);
+    /// // The first item of the stream is 0; consume it.
+    /// assert_eq!(stream.as_mut().next_if_eq(&0).await, Some(0));
+    /// // The next item returned is now 1, so `consume` will return `false`.
+    /// assert_eq!(stream.as_mut().next_if_eq(&0).await, None);
+    /// // `next_if_eq` saves the value of the next item if it was not equal to `expected`.
+    /// assert_eq!(stream.next().await, Some(1));
+    /// # });
+    /// ```
+    pub fn next_if_eq<'a, T>(self: Pin<&'a mut Self>, expected: &'a T) -> NextIfEq<'a, St, T>
+    where
+        T: ?Sized,
+        St::Item: PartialEq<T>,
+    {
+        NextIfEq {
+            inner: NextIf { inner: Some((self, NextIfEqFn { expected, _next: PhantomData })) },
+        }
+    }
 }
 
 impl<St: Stream> FusedStream for Peekable<St> {
@@ -100,11 +226,12 @@
     delegate_sink!(stream, Item);
 }
 
-/// Future for the [`Peekable::peek()`](self::Peekable::peek) function from [`Peekable`]
-#[pin_project]
-#[must_use = "futures do nothing unless polled"]
-pub struct Peek<'a, St: Stream> {
-    inner: Option<Pin<&'a mut Peekable<St>>>,
+pin_project! {
+    /// Future for the [`Peekable::peek`](self::Peekable::peek) method.
+    #[must_use = "futures do nothing unless polled"]
+    pub struct Peek<'a, St: Stream> {
+        inner: Option<Pin<&'a mut Peekable<St>>>,
+    }
 }
 
 impl<St> fmt::Debug for Peek<'_, St>
@@ -113,9 +240,7 @@
     St::Item: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Peek")
-            .field("inner", &self.inner)
-            .finish()
+        f.debug_struct("Peek").field("inner", &self.inner).finish()
     }
 }
 
@@ -130,6 +255,7 @@
     St: Stream,
 {
     type Output = Option<&'a St::Item>;
+
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let inner = self.project().inner;
         if let Some(peekable) = inner {
@@ -141,3 +267,167 @@
         }
     }
 }
+
+pin_project! {
+    /// Future for the [`Peekable::peek_mut`](self::Peekable::peek_mut) method.
+    #[must_use = "futures do nothing unless polled"]
+    pub struct PeekMut<'a, St: Stream> {
+        inner: Option<Pin<&'a mut Peekable<St>>>,
+    }
+}
+
+impl<St> fmt::Debug for PeekMut<'_, St>
+where
+    St: Stream + fmt::Debug,
+    St::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("PeekMut").field("inner", &self.inner).finish()
+    }
+}
+
+impl<St: Stream> FusedFuture for PeekMut<'_, St> {
+    fn is_terminated(&self) -> bool {
+        self.inner.is_none()
+    }
+}
+
+impl<'a, St> Future for PeekMut<'a, St>
+where
+    St: Stream,
+{
+    type Output = Option<&'a mut St::Item>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let inner = self.project().inner;
+        if let Some(peekable) = inner {
+            ready!(peekable.as_mut().poll_peek_mut(cx));
+
+            inner.take().unwrap().poll_peek_mut(cx)
+        } else {
+            panic!("PeekMut polled after completion")
+        }
+    }
+}
+
+pin_project! {
+    /// Future for the [`Peekable::next_if`](self::Peekable::next_if) method.
+    #[must_use = "futures do nothing unless polled"]
+    pub struct NextIf<'a, St: Stream, F> {
+        inner: Option<(Pin<&'a mut Peekable<St>>, F)>,
+    }
+}
+
+impl<St, F> fmt::Debug for NextIf<'_, St, F>
+where
+    St: Stream + fmt::Debug,
+    St::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("NextIf").field("inner", &self.inner.as_ref().map(|(s, _f)| s)).finish()
+    }
+}
+
+#[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
+impl<St, F> FusedFuture for NextIf<'_, St, F>
+where
+    St: Stream,
+    F: for<'a> FnOnce1<&'a St::Item, Output = bool>,
+{
+    fn is_terminated(&self) -> bool {
+        self.inner.is_none()
+    }
+}
+
+#[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
+impl<St, F> Future for NextIf<'_, St, F>
+where
+    St: Stream,
+    F: for<'a> FnOnce1<&'a St::Item, Output = bool>,
+{
+    type Output = Option<St::Item>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let inner = self.project().inner;
+        if let Some((peekable, _)) = inner {
+            let res = ready!(peekable.as_mut().poll_next(cx));
+
+            let (peekable, func) = inner.take().unwrap();
+            match res {
+                Some(ref matched) if func.call_once(matched) => Poll::Ready(res),
+                other => {
+                    let peekable = peekable.project();
+                    // Since we called `self.next()`, we consumed `self.peeked`.
+                    assert!(peekable.peeked.is_none());
+                    *peekable.peeked = other;
+                    Poll::Ready(None)
+                }
+            }
+        } else {
+            panic!("NextIf polled after completion")
+        }
+    }
+}
+
+pin_project! {
+    /// Future for the [`Peekable::next_if_eq`](self::Peekable::next_if_eq) method.
+    #[must_use = "futures do nothing unless polled"]
+    pub struct NextIfEq<'a, St: Stream, T: ?Sized> {
+        #[pin]
+        inner: NextIf<'a, St, NextIfEqFn<'a, T, St::Item>>,
+    }
+}
+
+impl<St, T> fmt::Debug for NextIfEq<'_, St, T>
+where
+    St: Stream + fmt::Debug,
+    St::Item: fmt::Debug,
+    T: ?Sized,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("NextIfEq")
+            .field("inner", &self.inner.inner.as_ref().map(|(s, _f)| s))
+            .finish()
+    }
+}
+
+impl<St, T> FusedFuture for NextIfEq<'_, St, T>
+where
+    St: Stream,
+    T: ?Sized,
+    St::Item: PartialEq<T>,
+{
+    fn is_terminated(&self) -> bool {
+        self.inner.is_terminated()
+    }
+}
+
+impl<St, T> Future for NextIfEq<'_, St, T>
+where
+    St: Stream,
+    T: ?Sized,
+    St::Item: PartialEq<T>,
+{
+    type Output = Option<St::Item>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        self.project().inner.poll(cx)
+    }
+}
+
+struct NextIfEqFn<'a, T: ?Sized, Item> {
+    expected: &'a T,
+    _next: PhantomData<Item>,
+}
+
+impl<T, Item> FnOnce1<&Item> for NextIfEqFn<'_, T, Item>
+where
+    T: ?Sized,
+    Item: PartialEq<T>,
+{
+    type Output = bool;
+
+    fn call_once(self, next: &Item) -> Self::Output {
+        next == self.expected
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/ready_chunks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/ready_chunks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/ready_chunks.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/ready_chunks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,29 @@
 use crate::stream::Fuse;
-use futures_core::stream::{Stream, FusedStream};
+use alloc::vec::Vec;
+use core::mem;
+use core::pin::Pin;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
-use core::mem;
-use core::pin::Pin;
-use alloc::vec::Vec;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`ready_chunks`](super::StreamExt::ready_chunks) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct ReadyChunks<St: Stream> {
-    #[pin]
-    stream: Fuse<St>,
-    items: Vec<St::Item>,
-    cap: usize, // https://github.com/rust-lang/futures-rs/issues/1475
+pin_project! {
+    /// Stream for the [`ready_chunks`](super::StreamExt::ready_chunks) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct ReadyChunks<St: Stream> {
+        #[pin]
+        stream: Fuse<St>,
+        items: Vec<St::Item>,
+        cap: usize, // https://github.com/rust-lang/futures-rs/issues/1475
+    }
 }
 
-impl<St: Stream> ReadyChunks<St> where St: Stream {
+impl<St: Stream> ReadyChunks<St>
+where
+    St: Stream,
+{
     pub(super) fn new(stream: St, capacity: usize) -> Self {
         assert!(capacity > 0);
 
@@ -36,10 +40,7 @@
 impl<St: Stream> Stream for ReadyChunks<St> {
     type Item = Vec<St::Item>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         loop {
@@ -60,7 +61,10 @@
                 Poll::Ready(Some(item)) => {
                     this.items.push(item);
                     if this.items.len() >= *this.cap {
-                        return Poll::Ready(Some(mem::replace(this.items, Vec::with_capacity(*this.cap))))
+                        return Poll::Ready(Some(mem::replace(
+                            this.items,
+                            Vec::with_capacity(*this.cap),
+                        )));
                     }
                 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/scan.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/scan.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/scan.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/scan.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,28 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 struct StateFn<S, F> {
     state: S,
     f: F,
 }
 
-/// Stream for the [`scan`](super::StreamExt::scan) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct Scan<St: Stream, S, Fut, F> {
-    #[pin]
-    stream: St,
-    state_f: Option<StateFn<S, F>>,
-    #[pin]
-    future: Option<Fut>,
+pin_project! {
+    /// Stream for the [`scan`](super::StreamExt::scan) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Scan<St: Stream, S, Fut, F> {
+        #[pin]
+        stream: St,
+        state_f: Option<StateFn<S, F>>,
+        #[pin]
+        future: Option<Fut>,
+    }
 }
 
 impl<St, S, Fut, F> fmt::Debug for Scan<St, S, Fut, F>
@@ -54,14 +56,7 @@
     Fut: Future<Output = Option<B>>,
 {
     pub(super) fn new(stream: St, initial_state: S, f: F) -> Self {
-        Self {
-            stream,
-            state_f: Some(StateFn {
-                state: initial_state,
-                f,
-            }),
-            future: None,
-        }
+        Self { stream, state_f: Some(StateFn { state: initial_state, f }), future: None }
     }
 
     delegate_access_inner!(stream, St, ());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/select_next_some.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/select_next_some.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/select_next_some.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/select_next_some.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
+use crate::stream::StreamExt;
 use core::pin::Pin;
+use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::FusedStream;
-use futures_core::future::{Future, FusedFuture};
 use futures_core::task::{Context, Poll};
-use crate::stream::StreamExt;
 
 /// Future for the [`select_next_some`](super::StreamExt::select_next_some)
 /// method.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/skip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/skip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/skip.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/skip.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,25 @@
 use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`skip`](super::StreamExt::skip) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Skip<St> {
-    #[pin]
-    stream: St,
-    remaining: usize,
+pin_project! {
+    /// Stream for the [`skip`](super::StreamExt::skip) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Skip<St> {
+        #[pin]
+        stream: St,
+        remaining: usize,
+    }
 }
 
 impl<St: Stream> Skip<St> {
     pub(super) fn new(stream: St, n: usize) -> Self {
-        Self {
-            stream,
-            remaining: n,
-        }
+        Self { stream, remaining: n }
     }
 
     delegate_access_inner!(stream, St, ());
@@ -35,10 +34,7 @@
 impl<St: Stream> Stream for Skip<St> {
     type Item = St::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<St::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<St::Item>> {
         let mut this = self.project();
 
         while *this.remaining > 0 {
@@ -55,11 +51,8 @@
     fn size_hint(&self) -> (usize, Option<usize>) {
         let (lower, upper) = self.stream.size_hint();
 
-        let lower = lower.saturating_sub(self.remaining as usize);
-        let upper = match upper {
-            Some(x) => Some(x.saturating_sub(self.remaining as usize)),
-            None => None,
-        };
+        let lower = lower.saturating_sub(self.remaining);
+        let upper = upper.map(|x| x.saturating_sub(self.remaining));
 
         (lower, upper)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/skip_while.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/skip_while.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/skip_while.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/skip_while.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,23 +1,25 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`skip_while`](super::StreamExt::skip_while) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct SkipWhile<St, Fut, F> where St: Stream {
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    pending_fut: Option<Fut>,
-    pending_item: Option<St::Item>,
-    done_skipping: bool,
+pin_project! {
+    /// Stream for the [`skip_while`](super::StreamExt::skip_while) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct SkipWhile<St, Fut, F> where St: Stream {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        pending_fut: Option<Fut>,
+        pending_item: Option<St::Item>,
+        done_skipping: bool,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for SkipWhile<St, Fut, F>
@@ -37,27 +39,23 @@
 }
 
 impl<St, Fut, F> SkipWhile<St, Fut, F>
-    where St: Stream,
-          F: FnMut(&St::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    St: Stream,
+    F: FnMut(&St::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            f,
-            pending_fut: None,
-            pending_item: None,
-            done_skipping: false,
-        }
+        Self { stream, f, pending_fut: None, pending_item: None, done_skipping: false }
     }
 
     delegate_access_inner!(stream, St, ());
 }
 
 impl<St, Fut, F> FusedStream for SkipWhile<St, Fut, F>
-    where St: FusedStream,
-          F: FnMut(&St::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    St: FusedStream,
+    F: FnMut(&St::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     fn is_terminated(&self) -> bool {
         self.pending_item.is_none() && self.stream.is_terminated()
@@ -65,16 +63,14 @@
 }
 
 impl<St, Fut, F> Stream for SkipWhile<St, Fut, F>
-    where St: Stream,
-          F: FnMut(&St::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    St: Stream,
+    F: FnMut(&St::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     type Item = St::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<St::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<St::Item>> {
         let mut this = self.project();
 
         if *this.done_skipping {
@@ -117,9 +113,10 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item> Sink<Item> for SkipWhile<S, Fut, F>
-    where S: Stream + Sink<Item>,
-          F: FnMut(&S::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    S: Stream + Sink<Item>,
+    F: FnMut(&S::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
+use core::fmt;
+use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
 use futures_sink::Sink;
-use core::fmt;
-use core::pin::Pin;
 
 use crate::lock::BiLock;
 
@@ -19,7 +20,8 @@
     /// together. Succeeds only if the `SplitStream<S>` and `SplitSink<S>` are
     /// a matching pair originating from the same call to `StreamExt::split`.
     pub fn reunite<Item>(self, other: SplitSink<S, Item>) -> Result<S, ReuniteError<S, Item>>
-        where S: Sink<Item>,
+    where
+        S: Sink<Item>,
     {
         other.reunite(self)
     }
@@ -35,10 +37,7 @@
 
 #[allow(bad_style)]
 fn SplitSink<S: Sink<Item>, Item>(lock: BiLock<S>) -> SplitSink<S, Item> {
-    SplitSink {
-        lock,
-        slot: None,
-    }
+    SplitSink { lock, slot: None }
 }
 
 /// A `Sink` part of the split pair
@@ -57,14 +56,16 @@
     /// together. Succeeds only if the `SplitStream<S>` and `SplitSink<S>` are
     /// a matching pair originating from the same call to `StreamExt::split`.
     pub fn reunite(self, other: SplitStream<S>) -> Result<S, ReuniteError<S, Item>> {
-        self.lock.reunite(other.0).map_err(|err| {
-            ReuniteError(SplitSink(err.0), SplitStream(err.1))
-        })
+        self.lock.reunite(other.0).map_err(|err| ReuniteError(SplitSink(err.0), SplitStream(err.1)))
     }
 }
 
 impl<S: Sink<Item>, Item> SplitSink<S, Item> {
-    fn poll_flush_slot(mut inner: Pin<&mut S>, slot: &mut Option<Item>, cx: &mut Context<'_>) -> Poll<Result<(), S::Error>> {
+    fn poll_flush_slot(
+        mut inner: Pin<&mut S>,
+        slot: &mut Option<Item>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<(), S::Error>> {
         if slot.is_some() {
             ready!(inner.as_mut().poll_ready(cx))?;
             Poll::Ready(inner.start_send(slot.take().unwrap()))
@@ -73,7 +74,10 @@
         }
     }
 
-    fn poll_lock_and_flush_slot(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), S::Error>> {
+    fn poll_lock_and_flush_slot(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<(), S::Error>> {
         let this = &mut *self;
         let mut inner = ready!(this.lock.poll_lock(cx));
         Self::poll_flush_slot(inner.as_pin_mut(), &mut this.slot, cx)
@@ -126,9 +130,7 @@
 
 impl<T, Item> fmt::Debug for ReuniteError<T, Item> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("ReuniteError")
-            .field(&"...")
-            .finish()
+        f.debug_tuple("ReuniteError").field(&"...").finish()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/take.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/take.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/take.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/take.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,41 +1,38 @@
 use core::cmp;
 use core::pin::Pin;
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`take`](super::StreamExt::take) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Take<St> {
-    #[pin]
-    stream: St,
-    remaining: usize,
+pin_project! {
+    /// Stream for the [`take`](super::StreamExt::take) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Take<St> {
+        #[pin]
+        stream: St,
+        remaining: usize,
+    }
 }
 
 impl<St: Stream> Take<St> {
     pub(super) fn new(stream: St, n: usize) -> Self {
-        Self {
-            stream,
-            remaining: n,
-        }
+        Self { stream, remaining: n }
     }
 
     delegate_access_inner!(stream, St, ());
 }
 
 impl<St> Stream for Take<St>
-    where St: Stream,
+where
+    St: Stream,
 {
     type Item = St::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<St::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<St::Item>> {
         if self.remaining == 0 {
             Poll::Ready(None)
         } else {
@@ -61,7 +58,7 @@
 
         let upper = match upper {
             Some(x) if x < self.remaining as usize => Some(x),
-            _ => Some(self.remaining as usize)
+            _ => Some(self.remaining as usize),
         };
 
         (lower, upper)
@@ -69,7 +66,8 @@
 }
 
 impl<St> FusedStream for Take<St>
-    where St: FusedStream,
+where
+    St: FusedStream,
 {
     fn is_terminated(&self) -> bool {
         self.remaining == 0 || self.stream.is_terminated()
@@ -79,7 +77,8 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Item> Sink<Item> for Take<S>
-    where S: Stream + Sink<Item>,
+where
+    S: Stream + Sink<Item>,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/take_until.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/take_until.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/take_until.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/take_until.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,28 +1,30 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 // FIXME: docs, tests
 
-/// Stream for the [`take_until`](super::StreamExt::take_until) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct TakeUntil<St: Stream, Fut: Future> {
-    #[pin]
-    stream: St,
-    /// Contains the inner Future on start and None once the inner Future is resolved
-    /// or taken out by the user.
-    #[pin]
-    fut: Option<Fut>,
-    /// Contains fut's return value once fut is resolved
-    fut_result: Option<Fut::Output>,
-    /// Whether the future was taken out by the user.
-    free: bool,
+pin_project! {
+    /// Stream for the [`take_until`](super::StreamExt::take_until) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TakeUntil<St: Stream, Fut: Future> {
+        #[pin]
+        stream: St,
+        // Contains the inner Future on start and None once the inner Future is resolved
+        // or taken out by the user.
+        #[pin]
+        fut: Option<Fut>,
+        // Contains fut's return value once fut is resolved
+        fut_result: Option<Fut::Output>,
+        // Whether the future was taken out by the user.
+        free: bool,
+    }
 }
 
 impl<St, Fut> fmt::Debug for TakeUntil<St, Fut>
@@ -32,10 +34,7 @@
     Fut: Future + fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TakeUntil")
-            .field("stream", &self.stream)
-            .field("fut", &self.fut)
-            .finish()
+        f.debug_struct("TakeUntil").field("stream", &self.stream).field("fut", &self.fut).finish()
     }
 }
 
@@ -45,12 +44,7 @@
     Fut: Future,
 {
     pub(super) fn new(stream: St, fut: Fut) -> Self {
-        Self {
-            stream,
-            fut: Some(fut),
-            fut_result: None,
-            free: false,
-        }
+        Self { stream, fut: Some(fut), fut_result: None, free: false }
     }
 
     delegate_access_inner!(stream, St, ());
@@ -73,7 +67,7 @@
     /// This may be used to retrieve arbitrary data from the stopping
     /// future, for example a reason why the stream was stopped.
     ///
-    /// This method will return `None` if the future isn't resovled yet,
+    /// This method will return `None` if the future isn't resolved yet,
     /// or if the result was already taken out.
     ///
     /// # Examples
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/take_while.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/take_while.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/take_while.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/take_while.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,23 +1,25 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
-use futures_core::stream::{Stream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`take_while`](super::StreamExt::take_while) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct TakeWhile<St: Stream, Fut, F> {
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    pending_fut: Option<Fut>,
-    pending_item: Option<St::Item>,
-    done_taking: bool,
+pin_project! {
+    /// Stream for the [`take_while`](super::StreamExt::take_while) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TakeWhile<St: Stream, Fut, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        pending_fut: Option<Fut>,
+        pending_item: Option<St::Item>,
+        done_taking: bool,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for TakeWhile<St, Fut, F>
@@ -37,34 +39,27 @@
 }
 
 impl<St, Fut, F> TakeWhile<St, Fut, F>
-    where St: Stream,
-          F: FnMut(&St::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    St: Stream,
+    F: FnMut(&St::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            f,
-            pending_fut: None,
-            pending_item: None,
-            done_taking: false,
-        }
+        Self { stream, f, pending_fut: None, pending_item: None, done_taking: false }
     }
 
     delegate_access_inner!(stream, St, ());
 }
 
 impl<St, Fut, F> Stream for TakeWhile<St, Fut, F>
-    where St: Stream,
-          F: FnMut(&St::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    St: Stream,
+    F: FnMut(&St::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     type Item = St::Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<St::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<St::Item>> {
         if self.done_taking {
             return Poll::Ready(None);
         }
@@ -107,9 +102,10 @@
 }
 
 impl<St, Fut, F> FusedStream for TakeWhile<St, Fut, F>
-    where St: FusedStream,
-          F: FnMut(&St::Item) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    St: FusedStream,
+    F: FnMut(&St::Item) -> Fut,
+    Fut: Future<Output = bool>,
 {
     fn is_terminated(&self) -> bool {
         self.done_taking || self.pending_item.is_none() && self.stream.is_terminated()
@@ -119,7 +115,8 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item> Sink<Item> for TakeWhile<S, Fut, F>
-    where S: Stream + Sink<Item>,
+where
+    S: Stream + Sink<Item>,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/then.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/then.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/then.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/then.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1,23 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`then`](super::StreamExt::then) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct Then<St, Fut, F> {
-    #[pin]
-    stream: St,
-    #[pin]
-    future: Option<Fut>,
-    f: F,
+pin_project! {
+    /// Stream for the [`then`](super::StreamExt::then) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Then<St, Fut, F> {
+        #[pin]
+        stream: St,
+        #[pin]
+        future: Option<Fut>,
+        f: F,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for Then<St, Fut, F>
@@ -24,32 +26,27 @@
     Fut: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Then")
-            .field("stream", &self.stream)
-            .field("future", &self.future)
-            .finish()
+        f.debug_struct("Then").field("stream", &self.stream).field("future", &self.future).finish()
     }
 }
 
 impl<St, Fut, F> Then<St, Fut, F>
-    where St: Stream,
-          F: FnMut(St::Item) -> Fut,
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            future: None,
-            f,
-        }
+        Self { stream, future: None, f }
     }
 
     delegate_access_inner!(stream, St, ());
 }
 
 impl<St, Fut, F> FusedStream for Then<St, Fut, F>
-    where St: FusedStream,
-          F: FnMut(St::Item) -> Fut,
-          Fut: Future,
+where
+    St: FusedStream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future,
 {
     fn is_terminated(&self) -> bool {
         self.future.is_none() && self.stream.is_terminated()
@@ -57,16 +54,14 @@
 }
 
 impl<St, Fut, F> Stream for Then<St, Fut, F>
-    where St: Stream,
-          F: FnMut(St::Item) -> Fut,
-          Fut: Future,
+where
+    St: Stream,
+    F: FnMut(St::Item) -> Fut,
+    Fut: Future,
 {
     type Item = Fut::Output;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         Poll::Ready(loop {
@@ -97,7 +92,8 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item> Sink<Item> for Then<S, Fut, F>
-    where S: Sink<Item>,
+where
+    S: Sink<Item>,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/unzip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/unzip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/unzip.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/unzip.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,63 @@
+use core::mem;
+use core::pin::Pin;
+use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream};
+use futures_core::task::{Context, Poll};
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// Future for the [`unzip`](super::StreamExt::unzip) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Unzip<St, FromA, FromB> {
+        #[pin]
+        stream: St,
+        left: FromA,
+        right: FromB,
+    }
+}
+
+impl<St: Stream, FromA: Default, FromB: Default> Unzip<St, FromA, FromB> {
+    fn finish(self: Pin<&mut Self>) -> (FromA, FromB) {
+        let this = self.project();
+        (mem::replace(this.left, Default::default()), mem::replace(this.right, Default::default()))
+    }
+
+    pub(super) fn new(stream: St) -> Self {
+        Self { stream, left: Default::default(), right: Default::default() }
+    }
+}
+
+impl<St, A, B, FromA, FromB> FusedFuture for Unzip<St, FromA, FromB>
+where
+    St: FusedStream<Item = (A, B)>,
+    FromA: Default + Extend<A>,
+    FromB: Default + Extend<B>,
+{
+    fn is_terminated(&self) -> bool {
+        self.stream.is_terminated()
+    }
+}
+
+impl<St, A, B, FromA, FromB> Future for Unzip<St, FromA, FromB>
+where
+    St: Stream<Item = (A, B)>,
+    FromA: Default + Extend<A>,
+    FromB: Default + Extend<B>,
+{
+    type Output = (FromA, FromB);
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<(FromA, FromB)> {
+        let mut this = self.as_mut().project();
+        loop {
+            match ready!(this.stream.as_mut().poll_next(cx)) {
+                Some(e) => {
+                    this.left.extend(Some(e.0));
+                    this.right.extend(Some(e.1));
+                }
+                None => return Poll::Ready(self.finish()),
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/zip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/zip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/stream/zip.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/stream/zip.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,31 +1,27 @@
-use crate::stream::{StreamExt, Fuse};
+use crate::stream::{Fuse, StreamExt};
 use core::cmp;
 use core::pin::Pin;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`zip`](super::StreamExt::zip) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Zip<St1: Stream, St2: Stream> {
-    #[pin]
-    stream1: Fuse<St1>,
-    #[pin]
-    stream2: Fuse<St2>,
-    queued1: Option<St1::Item>,
-    queued2: Option<St2::Item>,
+pin_project! {
+    /// Stream for the [`zip`](super::StreamExt::zip) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Zip<St1: Stream, St2: Stream> {
+        #[pin]
+        stream1: Fuse<St1>,
+        #[pin]
+        stream2: Fuse<St2>,
+        queued1: Option<St1::Item>,
+        queued2: Option<St2::Item>,
+    }
 }
 
 impl<St1: Stream, St2: Stream> Zip<St1, St2> {
     pub(super) fn new(stream1: St1, stream2: St2) -> Self {
-        Self {
-            stream1: stream1.fuse(),
-            stream2: stream2.fuse(),
-            queued1: None,
-            queued2: None,
-        }
+        Self { stream1: stream1.fuse(), stream2: stream2.fuse(), queued1: None, queued2: None }
     }
 
     /// Acquires a reference to the underlying streams that this combinator is
@@ -63,7 +59,9 @@
 }
 
 impl<St1, St2> FusedStream for Zip<St1, St2>
-    where St1: Stream, St2: Stream,
+where
+    St1: Stream,
+    St2: Stream,
 {
     fn is_terminated(&self) -> bool {
         self.stream1.is_terminated() && self.stream2.is_terminated()
@@ -71,14 +69,13 @@
 }
 
 impl<St1, St2> Stream for Zip<St1, St2>
-    where St1: Stream, St2: Stream
+where
+    St1: Stream,
+    St2: Stream,
 {
     type Item = (St1::Item, St2::Item);
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         if this.queued1.is_none() {
@@ -123,7 +120,7 @@
             }
             (Some(x), None) => x.checked_add(queued1_len),
             (None, Some(y)) => y.checked_add(queued2_len),
-            (None, None) => None
+            (None, None) => None,
         };
 
         (lower, upper)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/and_then.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/and_then.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/and_then.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/and_then.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1,23 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::TryFuture;
-use futures_core::stream::{Stream, TryStream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`and_then`](super::TryStreamExt::and_then) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct AndThen<St, Fut, F> {
-    #[pin]
-    stream: St,
-    #[pin]
-    future: Option<Fut>,
-    f: F,
+pin_project! {
+    /// Stream for the [`and_then`](super::TryStreamExt::and_then) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct AndThen<St, Fut, F> {
+        #[pin]
+        stream: St,
+        #[pin]
+        future: Option<Fut>,
+        f: F,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for AndThen<St, Fut, F>
@@ -32,9 +34,10 @@
 }
 
 impl<St, Fut, F> AndThen<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(St::Ok) -> Fut,
-          Fut: TryFuture<Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(St::Ok) -> Fut,
+    Fut: TryFuture<Error = St::Error>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
         Self { stream, future: None, f }
@@ -44,16 +47,14 @@
 }
 
 impl<St, Fut, F> Stream for AndThen<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(St::Ok) -> Fut,
-          Fut: TryFuture<Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(St::Ok) -> Fut,
+    Fut: TryFuture<Error = St::Error>,
 {
     type Item = Result<Fut::Ok, St::Error>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         Poll::Ready(loop {
@@ -82,9 +83,10 @@
 }
 
 impl<St, Fut, F> FusedStream for AndThen<St, Fut, F>
-    where St: TryStream + FusedStream,
-          F: FnMut(St::Ok) -> Fut,
-          Fut: TryFuture<Error = St::Error>,
+where
+    St: TryStream + FusedStream,
+    F: FnMut(St::Ok) -> Fut,
+    Fut: TryFuture<Error = St::Error>,
 {
     fn is_terminated(&self) -> bool {
         self.future.is_none() && self.stream.is_terminated()
@@ -94,7 +96,8 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item> Sink<Item> for AndThen<S, Fut, F>
-    where S: Sink<Item>,
+where
+    S: Sink<Item>,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/into_async_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/into_async_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/into_async_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/into_async_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
 use crate::stream::TryStreamExt;
 use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::TryStream;
 use futures_core::task::{Context, Poll};
-use futures_io::{AsyncRead, AsyncWrite, AsyncBufRead};
+use futures_io::{AsyncBufRead, AsyncRead, AsyncWrite};
 use std::cmp;
 use std::io::{Error, Result};
 
@@ -39,10 +40,7 @@
     St::Ok: AsRef<[u8]>,
 {
     pub(super) fn new(stream: St) -> Self {
-        Self {
-            stream,
-            state: ReadState::PendingChunk,
-        }
+        Self { stream, state: ReadState::PendingChunk }
     }
 }
 
@@ -62,9 +60,7 @@
                     let chunk = chunk.as_ref();
                     let len = cmp::min(buf.len(), chunk.len() - *chunk_start);
 
-                    buf[..len].copy_from_slice(
-                        &chunk[*chunk_start..*chunk_start + len],
-                    );
+                    buf[..len].copy_from_slice(&chunk[*chunk_start..*chunk_start + len]);
                     *chunk_start += len;
 
                     if chunk.len() == *chunk_start {
@@ -73,26 +69,21 @@
 
                     return Poll::Ready(Ok(len));
                 }
-                ReadState::PendingChunk => {
-                    match ready!(self.stream.try_poll_next_unpin(cx)) {
-                        Some(Ok(chunk)) => {
-                            if !chunk.as_ref().is_empty() {
-                                self.state = ReadState::Ready {
-                                    chunk,
-                                    chunk_start: 0,
-                                };
-                            }
-                        }
-                        Some(Err(err)) => {
-                            self.state = ReadState::Eof;
-                            return Poll::Ready(Err(err));
-                        }
-                        None => {
-                            self.state = ReadState::Eof;
-                            return Poll::Ready(Ok(0));
+                ReadState::PendingChunk => match ready!(self.stream.try_poll_next_unpin(cx)) {
+                    Some(Ok(chunk)) => {
+                        if !chunk.as_ref().is_empty() {
+                            self.state = ReadState::Ready { chunk, chunk_start: 0 };
                         }
                     }
-                }
+                    Some(Err(err)) => {
+                        self.state = ReadState::Eof;
+                        return Poll::Ready(Err(err));
+                    }
+                    None => {
+                        self.state = ReadState::Eof;
+                        return Poll::Ready(Ok(0));
+                    }
+                },
                 ReadState::Eof => {
                     return Poll::Ready(Ok(0));
                 }
@@ -109,23 +100,17 @@
     fn poll_write(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &[u8]
+        buf: &[u8],
     ) -> Poll<Result<usize>> {
-        Pin::new( &mut self.stream ).poll_write( cx, buf )
+        Pin::new(&mut self.stream).poll_write(cx, buf)
     }
 
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>
-    ) -> Poll<Result<()>> {
-        Pin::new( &mut self.stream ).poll_flush( cx )
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
+        Pin::new(&mut self.stream).poll_flush(cx)
     }
 
-    fn poll_close(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>
-    ) -> Poll<Result<()>> {
-        Pin::new( &mut self.stream ).poll_close( cx )
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
+        Pin::new(&mut self.stream).poll_close(cx)
     }
 }
 
@@ -134,18 +119,12 @@
     St: TryStream<Error = Error> + Unpin,
     St::Ok: AsRef<[u8]>,
 {
-    fn poll_fill_buf(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<&[u8]>> {
+    fn poll_fill_buf(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<&[u8]>> {
         while let ReadState::PendingChunk = self.state {
             match ready!(self.stream.try_poll_next_unpin(cx)) {
                 Some(Ok(chunk)) => {
                     if !chunk.as_ref().is_empty() {
-                        self.state = ReadState::Ready {
-                            chunk,
-                            chunk_start: 0,
-                        };
+                        self.state = ReadState::Ready { chunk, chunk_start: 0 };
                     }
                 }
                 Some(Err(err)) => {
@@ -168,12 +147,11 @@
         Poll::Ready(Ok(&[]))
     }
 
-    fn consume(
-        mut self: Pin<&mut Self>,
-        amount: usize,
-    ) {
-         // https://github.com/rust-lang/futures-rs/pull/1556#discussion_r281644295
-        if amount == 0 { return }
+    fn consume(mut self: Pin<&mut Self>, amount: usize) {
+        // https://github.com/rust-lang/futures-rs/pull/1556#discussion_r281644295
+        if amount == 0 {
+            return;
+        }
         if let ReadState::Ready { chunk, chunk_start } = &mut self.state {
             *chunk_start += amount;
             debug_assert!(*chunk_start <= chunk.as_ref().len());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/into_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/into_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/into_stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/into_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,15 +3,16 @@
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`into_stream`](super::TryStreamExt::into_stream) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct IntoStream<St> {
-    #[pin]
-    stream: St,
+pin_project! {
+    /// Stream for the [`into_stream`](super::TryStreamExt::into_stream) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct IntoStream<St> {
+        #[pin]
+        stream: St,
+    }
 }
 
 impl<St> IntoStream<St> {
@@ -33,10 +34,7 @@
     type Item = Result<St::Ok, St::Error>;
 
     #[inline]
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         self.project().stream.try_poll_next(cx)
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,16 +5,21 @@
 
 #[cfg(feature = "compat")]
 use crate::compat::Compat;
+use crate::fns::{
+    inspect_err_fn, inspect_ok_fn, into_fn, map_err_fn, map_ok_fn, InspectErrFn, InspectOkFn,
+    IntoFn, MapErrFn, MapOkFn,
+};
+use crate::future::assert_future;
+use crate::stream::assert_stream;
+use crate::stream::{Inspect, Map};
+#[cfg(feature = "alloc")]
+use alloc::vec::Vec;
 use core::pin::Pin;
 use futures_core::{
     future::{Future, TryFuture},
     stream::TryStream,
     task::{Context, Poll},
 };
-use crate::fns::{
-    InspectOkFn, inspect_ok_fn, InspectErrFn, inspect_err_fn, MapErrFn, map_err_fn, IntoFn, into_fn, MapOkFn, map_ok_fn,
-};
-use crate::stream::{Map, Inspect};
 
 mod and_then;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
@@ -91,6 +96,12 @@
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::try_concat::TryConcat;
 
+#[cfg(feature = "alloc")]
+mod try_chunks;
+#[cfg(feature = "alloc")]
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::try_chunks::{TryChunks, TryChunksError};
+
 mod try_fold;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::try_fold::TryFold;
@@ -107,25 +118,29 @@
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::try_take_while::TryTakeWhile;
 
-cfg_target_has_atomic! {
-    #[cfg(feature = "alloc")]
-    mod try_buffer_unordered;
-    #[cfg(feature = "alloc")]
-    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use self::try_buffer_unordered::TryBufferUnordered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod try_buffer_unordered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::try_buffer_unordered::TryBufferUnordered;
 
-    #[cfg(feature = "alloc")]
-    mod try_buffered;
-    #[cfg(feature = "alloc")]
-    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use self::try_buffered::TryBuffered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod try_buffered;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::try_buffered::TryBuffered;
 
-    #[cfg(feature = "alloc")]
-    mod try_for_each_concurrent;
-    #[cfg(feature = "alloc")]
-    #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-    pub use self::try_for_each_concurrent::TryForEachConcurrent;
-}
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+mod try_for_each_concurrent;
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
+pub use self::try_for_each_concurrent::TryForEachConcurrent;
 
 #[cfg(feature = "io")]
 #[cfg(feature = "std")]
@@ -135,8 +150,6 @@
 #[cfg(feature = "std")]
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::into_async_read::IntoAsyncRead;
-use crate::future::assert_future;
-use crate::stream::assert_stream;
 
 impl<S: ?Sized + TryStream> TryStreamExt for S {}
 
@@ -471,7 +484,7 @@
         Fut: TryFuture<Ok = bool, Error = Self::Error>,
         Self: Sized,
     {
-        TryTakeWhile::new(self, f)
+        assert_stream::<Result<Self::Ok, Self::Error>, _>(TryTakeWhile::new(self, f))
     }
 
     /// Attempts to run this stream to completion, executing the provided asynchronous
@@ -515,7 +528,7 @@
     /// assert_eq!(Err(oneshot::Canceled), fut.await);
     /// # })
     /// ```
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+    #[cfg(not(futures_no_atomic_cas))]
     #[cfg(feature = "alloc")]
     fn try_for_each_concurrent<Fut, F>(
         self,
@@ -571,6 +584,53 @@
         assert_future::<Result<C, Self::Error>, _>(TryCollect::new(self))
     }
 
+    /// An adaptor for chunking up successful items of the stream inside a vector.
+    ///
+    /// This combinator will attempt to pull successful items from this stream and buffer
+    /// them into a local vector. At most `capacity` items will get buffered
+    /// before they're yielded from the returned stream.
+    ///
+    /// Note that the vectors returned from this iterator may not always have
+    /// `capacity` elements. If the underlying stream ended and only a partial
+    /// vector was created, it'll be returned. Additionally if an error happens
+    /// from the underlying stream then the currently buffered items will be
+    /// yielded.
+    ///
+    /// This method is only available when the `std` or `alloc` feature of this
+    /// library is activated, and it is activated by default.
+    ///
+    /// This function is similar to
+    /// [`StreamExt::chunks`](crate::stream::StreamExt::chunks) but exits
+    /// early if an error occurs.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # futures::executor::block_on(async {
+    /// use futures::stream::{self, TryChunksError, TryStreamExt};
+    ///
+    /// let stream = stream::iter(vec![Ok::<i32, i32>(1), Ok(2), Ok(3), Err(4), Ok(5), Ok(6)]);
+    /// let mut stream = stream.try_chunks(2);
+    ///
+    /// assert_eq!(stream.try_next().await, Ok(Some(vec![1, 2])));
+    /// assert_eq!(stream.try_next().await, Err(TryChunksError(vec![3], 4)));
+    /// assert_eq!(stream.try_next().await, Ok(Some(vec![5, 6])));
+    /// # })
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// This method will panic if `capacity` is zero.
+    #[cfg(feature = "alloc")]
+    fn try_chunks(self, capacity: usize) -> TryChunks<Self>
+    where
+        Self: Sized,
+    {
+        assert_stream::<Result<Vec<Self::Ok>, TryChunksError<Self::Ok, Self::Error>>, _>(
+            TryChunks::new(self, capacity),
+        )
+    }
+
     /// Attempt to filter the values produced by this stream according to the
     /// provided asynchronous closure.
     ///
@@ -836,7 +896,7 @@
     /// assert_eq!(buffered.next().await, Some(Err("error in the stream")));
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+    #[cfg(not(futures_no_atomic_cas))]
     #[cfg(feature = "alloc")]
     fn try_buffer_unordered(self, n: usize) -> TryBufferUnordered<Self>
     where
@@ -912,14 +972,16 @@
     /// assert_eq!(buffered.next().await, Some(Err("error in the stream")));
     /// # Ok::<(), Box<dyn std::error::Error>>(()) }).unwrap();
     /// ```
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+    #[cfg(not(futures_no_atomic_cas))]
     #[cfg(feature = "alloc")]
     fn try_buffered(self, n: usize) -> TryBuffered<Self>
     where
         Self::Ok: TryFuture<Error = Self::Error>,
         Self: Sized,
     {
-        TryBuffered::new(self, n)
+        assert_stream::<Result<<Self::Ok as TryFuture>::Ok, Self::Error>, _>(TryBuffered::new(
+            self, n,
+        ))
     }
 
     // TODO: false positive warning from rustdoc. Verify once #43466 settles
@@ -997,6 +1059,6 @@
         Self: Sized + TryStreamExt<Error = std::io::Error> + Unpin,
         Self::Ok: AsRef<[u8]>,
     {
-        IntoAsyncRead::new(self)
+        crate::io::assert_read(IntoAsyncRead::new(self))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/or_else.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/or_else.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/or_else.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/or_else.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1,23 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::TryFuture;
-use futures_core::stream::{Stream, TryStream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`or_else`](super::TryStreamExt::or_else) method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct OrElse<St, Fut, F> {
-    #[pin]
-    stream: St,
-    #[pin]
-    future: Option<Fut>,
-    f: F,
+pin_project! {
+    /// Stream for the [`or_else`](super::TryStreamExt::or_else) method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct OrElse<St, Fut, F> {
+        #[pin]
+        stream: St,
+        #[pin]
+        future: Option<Fut>,
+        f: F,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for OrElse<St, Fut, F>
@@ -32,9 +34,10 @@
 }
 
 impl<St, Fut, F> OrElse<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(St::Error) -> Fut,
-          Fut: TryFuture<Ok = St::Ok>,
+where
+    St: TryStream,
+    F: FnMut(St::Error) -> Fut,
+    Fut: TryFuture<Ok = St::Ok>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
         Self { stream, future: None, f }
@@ -44,16 +47,14 @@
 }
 
 impl<St, Fut, F> Stream for OrElse<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(St::Error) -> Fut,
-          Fut: TryFuture<Ok = St::Ok>,
+where
+    St: TryStream,
+    F: FnMut(St::Error) -> Fut,
+    Fut: TryFuture<Ok = St::Ok>,
 {
     type Item = Result<St::Ok, Fut::Error>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         Poll::Ready(loop {
@@ -66,7 +67,7 @@
                     Some(Ok(item)) => break Some(Ok(item)),
                     Some(Err(e)) => {
                         this.future.set(Some((this.f)(e)));
-                    },
+                    }
                     None => break None,
                 }
             }
@@ -86,9 +87,10 @@
 }
 
 impl<St, Fut, F> FusedStream for OrElse<St, Fut, F>
-    where St: TryStream + FusedStream,
-          F: FnMut(St::Error) -> Fut,
-          Fut: TryFuture<Ok = St::Ok>,
+where
+    St: TryStream + FusedStream,
+    F: FnMut(St::Error) -> Fut,
+    Fut: TryFuture<Ok = St::Ok>,
 {
     fn is_terminated(&self) -> bool {
         self.future.is_none() && self.stream.is_terminated()
@@ -98,7 +100,8 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item> Sink<Item> for OrElse<S, Fut, F>
-    where S: Sink<Item>,
+where
+    S: Sink<Item>,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_buffered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_buffered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_buffered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_buffered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,27 @@
-use crate::stream::{Fuse, FuturesOrdered, StreamExt, IntoStream};
 use crate::future::{IntoFuture, TryFutureExt};
+use crate::stream::{Fuse, FuturesOrdered, IntoStream, StreamExt};
+use core::pin::Pin;
 use futures_core::future::TryFuture;
 use futures_core::stream::{Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
-use core::pin::Pin;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`try_buffered`](super::TryStreamExt::try_buffered) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct TryBuffered<St>
-where
-    St: TryStream,
-    St::Ok: TryFuture,
-{
-    #[pin]
-    stream: Fuse<IntoStream<St>>,
-    in_progress_queue: FuturesOrdered<IntoFuture<St::Ok>>,
-    max: usize,
+pin_project! {
+    /// Stream for the [`try_buffered`](super::TryStreamExt::try_buffered) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TryBuffered<St>
+    where
+        St: TryStream,
+        St::Ok: TryFuture,
+    {
+        #[pin]
+        stream: Fuse<IntoStream<St>>,
+        in_progress_queue: FuturesOrdered<IntoFuture<St::Ok>>,
+        max: usize,
+    }
 }
 
 impl<St> TryBuffered<St>
@@ -46,10 +47,7 @@
 {
     type Item = Result<<St::Ok as TryFuture>::Ok, St::Error>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         // First up, try to spawn off as many futures as possible by filling up
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_buffer_unordered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_buffer_unordered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_buffer_unordered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_buffer_unordered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,32 @@
-use crate::stream::{Fuse, FuturesUnordered, StreamExt, IntoStream};
 use crate::future::{IntoFuture, TryFutureExt};
+use crate::stream::{Fuse, FuturesUnordered, IntoStream, StreamExt};
+use core::pin::Pin;
 use futures_core::future::TryFuture;
 use futures_core::stream::{Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
-use core::pin::Pin;
+use pin_project_lite::pin_project;
 
-/// Stream for the
-/// [`try_buffer_unordered`](super::TryStreamExt::try_buffer_unordered) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct TryBufferUnordered<St>
-    where St: TryStream
-{
-    #[pin]
-    stream: Fuse<IntoStream<St>>,
-    in_progress_queue: FuturesUnordered<IntoFuture<St::Ok>>,
-    max: usize,
+pin_project! {
+    /// Stream for the
+    /// [`try_buffer_unordered`](super::TryStreamExt::try_buffer_unordered) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TryBufferUnordered<St>
+        where St: TryStream
+    {
+        #[pin]
+        stream: Fuse<IntoStream<St>>,
+        in_progress_queue: FuturesUnordered<IntoFuture<St::Ok>>,
+        max: usize,
+    }
 }
 
 impl<St> TryBufferUnordered<St>
-    where St: TryStream,
-          St::Ok: TryFuture,
+where
+    St: TryStream,
+    St::Ok: TryFuture,
 {
     pub(super) fn new(stream: St, n: usize) -> Self {
         Self {
@@ -38,15 +40,13 @@
 }
 
 impl<St> Stream for TryBufferUnordered<St>
-    where St: TryStream,
-          St::Ok: TryFuture<Error = St::Error>,
+where
+    St: TryStream,
+    St::Ok: TryFuture<Error = St::Error>,
 {
     type Item = Result<<St::Ok as TryFuture>::Ok, St::Error>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         // First up, try to spawn off as many futures as possible by filling up
@@ -76,8 +76,9 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Item, E> Sink<Item> for TryBufferUnordered<S>
-    where S: TryStream + Sink<Item, Error = E>,
-          S::Ok: TryFuture<Error = E>,
+where
+    S: TryStream + Sink<Item, Error = E>,
+    S::Ok: TryFuture<Error = E>,
 {
     type Error = E;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_chunks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_chunks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_chunks.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_chunks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,131 @@
+use crate::stream::{Fuse, IntoStream, StreamExt};
+
+use alloc::vec::Vec;
+use core::pin::Pin;
+use core::{fmt, mem};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream, TryStream};
+use futures_core::task::{Context, Poll};
+#[cfg(feature = "sink")]
+use futures_sink::Sink;
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// Stream for the [`try_chunks`](super::TryStreamExt::try_chunks) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TryChunks<St: TryStream> {
+        #[pin]
+        stream: Fuse<IntoStream<St>>,
+        items: Vec<St::Ok>,
+        cap: usize, // https://github.com/rust-lang/futures-rs/issues/1475
+    }
+}
+
+impl<St: TryStream> TryChunks<St> {
+    pub(super) fn new(stream: St, capacity: usize) -> Self {
+        assert!(capacity > 0);
+
+        Self {
+            stream: IntoStream::new(stream).fuse(),
+            items: Vec::with_capacity(capacity),
+            cap: capacity,
+        }
+    }
+
+    fn take(self: Pin<&mut Self>) -> Vec<St::Ok> {
+        let cap = self.cap;
+        mem::replace(self.project().items, Vec::with_capacity(cap))
+    }
+
+    delegate_access_inner!(stream, St, (. .));
+}
+
+impl<St: TryStream> Stream for TryChunks<St> {
+    #[allow(clippy::type_complexity)]
+    type Item = Result<Vec<St::Ok>, TryChunksError<St::Ok, St::Error>>;
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        let mut this = self.as_mut().project();
+        loop {
+            match ready!(this.stream.as_mut().try_poll_next(cx)) {
+                // Push the item into the buffer and check whether it is full.
+                // If so, replace our buffer with a new and empty one and return
+                // the full one.
+                Some(item) => match item {
+                    Ok(item) => {
+                        this.items.push(item);
+                        if this.items.len() >= *this.cap {
+                            return Poll::Ready(Some(Ok(self.take())));
+                        }
+                    }
+                    Err(e) => {
+                        return Poll::Ready(Some(Err(TryChunksError(self.take(), e))));
+                    }
+                },
+
+                // Since the underlying stream ran out of values, return what we
+                // have buffered, if we have anything.
+                None => {
+                    let last = if this.items.is_empty() {
+                        None
+                    } else {
+                        let full_buf = mem::replace(this.items, Vec::new());
+                        Some(full_buf)
+                    };
+
+                    return Poll::Ready(last.map(Ok));
+                }
+            }
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let chunk_len = if self.items.is_empty() { 0 } else { 1 };
+        let (lower, upper) = self.stream.size_hint();
+        let lower = lower.saturating_add(chunk_len);
+        let upper = match upper {
+            Some(x) => x.checked_add(chunk_len),
+            None => None,
+        };
+        (lower, upper)
+    }
+}
+
+impl<St: TryStream + FusedStream> FusedStream for TryChunks<St> {
+    fn is_terminated(&self) -> bool {
+        self.stream.is_terminated() && self.items.is_empty()
+    }
+}
+
+// Forwarding impl of Sink from the underlying stream
+#[cfg(feature = "sink")]
+impl<S, Item> Sink<Item> for TryChunks<S>
+where
+    S: TryStream + Sink<Item>,
+{
+    type Error = <S as Sink<Item>>::Error;
+
+    delegate_sink!(stream, Item);
+}
+
+/// Error indicating, that while chunk was collected inner stream produced an error.
+///
+/// Contains all items that were collected before an error occurred, and the stream error itself.
+#[derive(PartialEq, Eq)]
+pub struct TryChunksError<T, E>(pub Vec<T>, pub E);
+
+impl<T, E: fmt::Debug> fmt::Debug for TryChunksError<T, E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.1.fmt(f)
+    }
+}
+
+impl<T, E: fmt::Display> fmt::Display for TryChunksError<T, E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.1.fmt(f)
+    }
+}
+
+#[cfg(feature = "std")]
+impl<T, E: fmt::Debug + fmt::Display> std::error::Error for TryChunksError<T, E> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_collect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_collect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_collect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_collect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,25 @@
 use core::mem;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
+use futures_core::ready;
 use futures_core::stream::{FusedStream, TryStream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`try_collect`](super::TryStreamExt::try_collect) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct TryCollect<St, C> {
-    #[pin]
-    stream: St,
-    items: C,
+pin_project! {
+    /// Future for the [`try_collect`](super::TryStreamExt::try_collect) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct TryCollect<St, C> {
+        #[pin]
+        stream: St,
+        items: C,
+    }
 }
 
 impl<St: TryStream, C: Default> TryCollect<St, C> {
     pub(super) fn new(s: St) -> Self {
-        Self {
-            stream: s,
-            items: Default::default(),
-        }
+        Self { stream: s, items: Default::default() }
     }
 }
 
@@ -41,10 +40,7 @@
 {
     type Output = Result<C, St::Error>;
 
-    fn poll(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let mut this = self.project();
         Poll::Ready(Ok(loop {
             match ready!(this.stream.as_mut().try_poll_next(cx)?) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_concat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_concat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_concat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_concat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,19 @@
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::TryStream;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`try_concat`](super::TryStreamExt::try_concat) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct TryConcat<St: TryStream> {
-    #[pin]
-    stream: St,
-    accum: Option<St::Ok>,
+pin_project! {
+    /// Future for the [`try_concat`](super::TryStreamExt::try_concat) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct TryConcat<St: TryStream> {
+        #[pin]
+        stream: St,
+        accum: Option<St::Ok>,
+    }
 }
 
 impl<St> TryConcat<St>
@@ -20,10 +22,7 @@
     St::Ok: Extend<<St::Ok as IntoIterator>::Item> + IntoIterator + Default,
 {
     pub(super) fn new(stream: St) -> Self {
-        Self {
-            stream,
-            accum: None,
-        }
+        Self { stream, accum: None }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_filter_map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_filter_map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_filter_map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_filter_map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,24 @@
 use core::fmt;
 use core::pin::Pin;
-use futures_core::future::{TryFuture};
-use futures_core::stream::{Stream, TryStream, FusedStream};
+use futures_core::future::TryFuture;
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`try_filter_map`](super::TryStreamExt::try_filter_map)
-/// method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct TryFilterMap<St, Fut, F> {
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    pending: Option<Fut>,
+pin_project! {
+    /// Stream for the [`try_filter_map`](super::TryStreamExt::try_filter_map)
+    /// method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TryFilterMap<St, Fut, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        pending: Option<Fut>,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for TryFilterMap<St, Fut, F>
@@ -41,9 +43,10 @@
 }
 
 impl<St, Fut, F, T> FusedStream for TryFilterMap<St, Fut, F>
-    where St: TryStream + FusedStream,
-          Fut: TryFuture<Ok = Option<T>, Error = St::Error>,
-          F: FnMut(St::Ok) -> Fut,
+where
+    St: TryStream + FusedStream,
+    Fut: TryFuture<Ok = Option<T>, Error = St::Error>,
+    F: FnMut(St::Ok) -> Fut,
 {
     fn is_terminated(&self) -> bool {
         self.pending.is_none() && self.stream.is_terminated()
@@ -51,16 +54,14 @@
 }
 
 impl<St, Fut, F, T> Stream for TryFilterMap<St, Fut, F>
-    where St: TryStream,
-          Fut: TryFuture<Ok = Option<T>, Error = St::Error>,
-          F: FnMut(St::Ok) -> Fut,
+where
+    St: TryStream,
+    Fut: TryFuture<Ok = Option<T>, Error = St::Error>,
+    F: FnMut(St::Ok) -> Fut,
 {
     type Item = Result<T, St::Error>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         Poll::Ready(loop {
@@ -96,7 +97,8 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item> Sink<Item> for TryFilterMap<S, Fut, F>
-    where S: Sink<Item>,
+where
+    S: Sink<Item>,
 {
     type Error = S::Error;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_filter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_filter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_filter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_filter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,27 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
-use futures_core::stream::{Stream, TryStream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`try_filter`](super::TryStreamExt::try_filter)
-/// method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct TryFilter<St, Fut, F>
-    where St: TryStream
-{
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    pending_fut: Option<Fut>,
-    pending_item: Option<St::Ok>,
+pin_project! {
+    /// Stream for the [`try_filter`](super::TryStreamExt::try_filter)
+    /// method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TryFilter<St, Fut, F>
+        where St: TryStream
+    {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        pending_fut: Option<Fut>,
+        pending_item: Option<St::Ok>,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for TryFilter<St, Fut, F>
@@ -38,24 +40,21 @@
 }
 
 impl<St, Fut, F> TryFilter<St, Fut, F>
-    where St: TryStream
+where
+    St: TryStream,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            f,
-            pending_fut: None,
-            pending_item: None,
-        }
+        Self { stream, f, pending_fut: None, pending_item: None }
     }
 
     delegate_access_inner!(stream, St, ());
 }
 
 impl<St, Fut, F> FusedStream for TryFilter<St, Fut, F>
-    where St: TryStream + FusedStream,
-          F: FnMut(&St::Ok) -> Fut,
-          Fut: Future<Output = bool>,
+where
+    St: TryStream + FusedStream,
+    F: FnMut(&St::Ok) -> Fut,
+    Fut: Future<Output = bool>,
 {
     fn is_terminated(&self) -> bool {
         self.pending_fut.is_none() && self.stream.is_terminated()
@@ -63,16 +62,14 @@
 }
 
 impl<St, Fut, F> Stream for TryFilter<St, Fut, F>
-    where St: TryStream,
-          Fut: Future<Output = bool>,
-          F: FnMut(&St::Ok) -> Fut,
+where
+    St: TryStream,
+    Fut: Future<Output = bool>,
+    F: FnMut(&St::Ok) -> Fut,
 {
     type Item = Result<St::Ok, St::Error>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         Poll::Ready(loop {
@@ -106,7 +103,8 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item, E> Sink<Item> for TryFilter<S, Fut, F>
-    where S: TryStream + Sink<Item, Error = E>,
+where
+    S: TryStream + Sink<Item, Error = E>,
 {
     type Error = E;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_flatten.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_flatten.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_flatten.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_flatten.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,24 @@
 use core::pin::Pin;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`try_flatten`](super::TryStreamExt::try_flatten) method.
-#[pin_project]
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct TryFlatten<St>
-where
-    St: TryStream,
-{
-    #[pin]
-    stream: St,
-    #[pin]
-    next: Option<St::Ok>,
+pin_project! {
+    /// Stream for the [`try_flatten`](super::TryStreamExt::try_flatten) method.
+    #[derive(Debug)]
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TryFlatten<St>
+    where
+        St: TryStream,
+    {
+        #[pin]
+        stream: St,
+        #[pin]
+        next: Option<St::Ok>,
+    }
 }
 
 impl<St> TryFlatten<St>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_fold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_fold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_fold.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_fold.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,22 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future, TryFuture};
+use futures_core::ready;
 use futures_core::stream::TryStream;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`try_fold`](super::TryStreamExt::try_fold) method.
-#[pin_project]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct TryFold<St, Fut, T, F> {
-    #[pin]
-    stream: St,
-    f: F,
-    accum: Option<T>,
-    #[pin]
-    future: Option<Fut>,
+pin_project! {
+    /// Future for the [`try_fold`](super::TryStreamExt::try_fold) method.
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct TryFold<St, Fut, T, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        accum: Option<T>,
+        #[pin]
+        future: Option<Fut>,
+    }
 }
 
 impl<St, Fut, T, F> fmt::Debug for TryFold<St, Fut, T, F>
@@ -33,24 +35,21 @@
 }
 
 impl<St, Fut, T, F> TryFold<St, Fut, T, F>
-where St: TryStream,
-      F: FnMut(T, St::Ok) -> Fut,
-      Fut: TryFuture<Ok = T, Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(T, St::Ok) -> Fut,
+    Fut: TryFuture<Ok = T, Error = St::Error>,
 {
     pub(super) fn new(stream: St, f: F, t: T) -> Self {
-        Self {
-            stream,
-            f,
-            accum: Some(t),
-            future: None,
-        }
+        Self { stream, f, accum: Some(t), future: None }
     }
 }
 
 impl<St, Fut, T, F> FusedFuture for TryFold<St, Fut, T, F>
-    where St: TryStream,
-          F: FnMut(T, St::Ok) -> Fut,
-          Fut: TryFuture<Ok = T, Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(T, St::Ok) -> Fut,
+    Fut: TryFuture<Ok = T, Error = St::Error>,
 {
     fn is_terminated(&self) -> bool {
         self.accum.is_none() && self.future.is_none()
@@ -58,9 +57,10 @@
 }
 
 impl<St, Fut, T, F> Future for TryFold<St, Fut, T, F>
-    where St: TryStream,
-          F: FnMut(T, St::Ok) -> Fut,
-          Fut: TryFuture<Ok = T, Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(T, St::Ok) -> Fut,
+    Fut: TryFuture<Ok = T, Error = St::Error>,
 {
     type Output = Result<T, St::Error>;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_for_each_concurrent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_for_each_concurrent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_for_each_concurrent.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_for_each_concurrent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,24 +1,25 @@
 use crate::stream::{FuturesUnordered, StreamExt};
 use core::fmt;
 use core::mem;
-use core::pin::Pin;
 use core::num::NonZeroUsize;
+use core::pin::Pin;
 use futures_core::future::{FusedFuture, Future};
 use futures_core::stream::TryStream;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the
-/// [`try_for_each_concurrent`](super::TryStreamExt::try_for_each_concurrent)
-/// method.
-#[pin_project]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct TryForEachConcurrent<St, Fut, F> {
-    #[pin]
-    stream: Option<St>,
-    f: F,
-    futures: FuturesUnordered<Fut>,
-    limit: Option<NonZeroUsize>,
+pin_project! {
+    /// Future for the
+    /// [`try_for_each_concurrent`](super::TryStreamExt::try_for_each_concurrent)
+    /// method.
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct TryForEachConcurrent<St, Fut, F> {
+        #[pin]
+        stream: Option<St>,
+        f: F,
+        futures: FuturesUnordered<Fut>,
+        limit: Option<NonZeroUsize>,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for TryForEachConcurrent<St, Fut, F>
@@ -36,9 +37,10 @@
 }
 
 impl<St, Fut, F> FusedFuture for TryForEachConcurrent<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(St::Ok) -> Fut,
-          Fut: Future<Output = Result<(), St::Error>>,
+where
+    St: TryStream,
+    F: FnMut(St::Ok) -> Fut,
+    Fut: Future<Output = Result<(), St::Error>>,
 {
     fn is_terminated(&self) -> bool {
         self.stream.is_none() && self.futures.is_empty()
@@ -46,9 +48,10 @@
 }
 
 impl<St, Fut, F> TryForEachConcurrent<St, Fut, F>
-where St: TryStream,
-      F: FnMut(St::Ok) -> Fut,
-      Fut: Future<Output = Result<(), St::Error>>,
+where
+    St: TryStream,
+    F: FnMut(St::Ok) -> Fut,
+    Fut: Future<Output = Result<(), St::Error>>,
 {
     pub(super) fn new(stream: St, limit: Option<usize>, f: F) -> Self {
         Self {
@@ -62,9 +65,10 @@
 }
 
 impl<St, Fut, F> Future for TryForEachConcurrent<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(St::Ok) -> Fut,
-          Fut: Future<Output = Result<(), St::Error>>,
+where
+    St: TryStream,
+    F: FnMut(St::Ok) -> Fut,
+    Fut: Future<Output = Result<(), St::Error>>,
 {
     type Output = Result<(), St::Error>;
 
@@ -84,7 +88,7 @@
                     Poll::Ready(Some(Ok(elem))) => {
                         made_progress_this_iter = true;
                         Some(elem)
-                    },
+                    }
                     Poll::Ready(None) => {
                         this.stream.set(None);
                         None
@@ -108,9 +112,9 @@
                 Poll::Ready(Some(Ok(()))) => made_progress_this_iter = true,
                 Poll::Ready(None) => {
                     if this.stream.is_none() {
-                        return Poll::Ready(Ok(()))
+                        return Poll::Ready(Ok(()));
                     }
-                },
+                }
                 Poll::Pending => {}
                 Poll::Ready(Some(Err(e))) => {
                     // Empty the stream and futures so that we know
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_for_each.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_for_each.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_for_each.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_for_each.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,21 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::{Future, TryFuture};
+use futures_core::ready;
 use futures_core::stream::TryStream;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Future for the [`try_for_each`](super::TryStreamExt::try_for_each) method.
-#[pin_project]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct TryForEach<St, Fut, F> {
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    future: Option<Fut>,
+pin_project! {
+    /// Future for the [`try_for_each`](super::TryStreamExt::try_for_each) method.
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct TryForEach<St, Fut, F> {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        future: Option<Fut>,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for TryForEach<St, Fut, F>
@@ -30,23 +32,21 @@
 }
 
 impl<St, Fut, F> TryForEach<St, Fut, F>
-where St: TryStream,
-      F: FnMut(St::Ok) -> Fut,
-      Fut: TryFuture<Ok = (), Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(St::Ok) -> Fut,
+    Fut: TryFuture<Ok = (), Error = St::Error>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            f,
-            future: None,
-        }
+        Self { stream, f, future: None }
     }
 }
 
 impl<St, Fut, F> Future for TryForEach<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(St::Ok) -> Fut,
-          Fut: TryFuture<Ok = (), Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(St::Ok) -> Fut,
+    Fut: TryFuture<Ok = (), Error = St::Error>,
 {
     type Output = Result<(), St::Error>;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_next.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_next.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_next.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_next.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,10 +28,7 @@
 impl<St: ?Sized + TryStream + Unpin> Future for TryNext<'_, St> {
     type Output = Result<Option<St::Ok>, St::Error>;
 
-    fn poll(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         self.stream.try_poll_next_unpin(cx)?.map(Ok)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_skip_while.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_skip_while.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_skip_while.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_skip_while.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,24 +1,26 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::TryFuture;
-use futures_core::stream::{Stream, TryStream, FusedStream};
+use futures_core::ready;
+use futures_core::stream::{FusedStream, Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`try_skip_while`](super::TryStreamExt::try_skip_while)
-/// method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct TrySkipWhile<St, Fut, F> where St: TryStream {
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    pending_fut: Option<Fut>,
-    pending_item: Option<St::Ok>,
-    done_skipping: bool,
+pin_project! {
+    /// Stream for the [`try_skip_while`](super::TryStreamExt::try_skip_while)
+    /// method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TrySkipWhile<St, Fut, F> where St: TryStream {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        pending_fut: Option<Fut>,
+        pending_item: Option<St::Ok>,
+        done_skipping: bool,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for TrySkipWhile<St, Fut, F>
@@ -38,34 +40,27 @@
 }
 
 impl<St, Fut, F> TrySkipWhile<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(&St::Ok) -> Fut,
-          Fut: TryFuture<Ok = bool, Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(&St::Ok) -> Fut,
+    Fut: TryFuture<Ok = bool, Error = St::Error>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            f,
-            pending_fut: None,
-            pending_item: None,
-            done_skipping: false,
-        }
+        Self { stream, f, pending_fut: None, pending_item: None, done_skipping: false }
     }
 
     delegate_access_inner!(stream, St, ());
 }
 
 impl<St, Fut, F> Stream for TrySkipWhile<St, Fut, F>
-    where St: TryStream,
-          F: FnMut(&St::Ok) -> Fut,
-          Fut: TryFuture<Ok = bool, Error = St::Error>,
+where
+    St: TryStream,
+    F: FnMut(&St::Ok) -> Fut,
+    Fut: TryFuture<Ok = bool, Error = St::Error>,
 {
     type Item = Result<St::Ok, St::Error>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         if *this.done_skipping {
@@ -103,9 +98,10 @@
 }
 
 impl<St, Fut, F> FusedStream for TrySkipWhile<St, Fut, F>
-    where St: TryStream + FusedStream,
-          F: FnMut(&St::Ok) -> Fut,
-          Fut: TryFuture<Ok = bool, Error = St::Error>,
+where
+    St: TryStream + FusedStream,
+    F: FnMut(&St::Ok) -> Fut,
+    Fut: TryFuture<Ok = bool, Error = St::Error>,
 {
     fn is_terminated(&self) -> bool {
         self.pending_item.is_none() && self.stream.is_terminated()
@@ -115,7 +111,8 @@
 // Forwarding impl of Sink from the underlying stream
 #[cfg(feature = "sink")]
 impl<S, Fut, F, Item, E> Sink<Item> for TrySkipWhile<S, Fut, F>
-    where S: TryStream + Sink<Item, Error = E>,
+where
+    S: TryStream + Sink<Item, Error = E>,
 {
     type Error = E;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_take_while.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_take_while.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_take_while.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_take_while.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,27 +1,29 @@
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::TryFuture;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream, TryStream};
 use futures_core::task::{Context, Poll};
 #[cfg(feature = "sink")]
 use futures_sink::Sink;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
-/// Stream for the [`try_take_while`](super::TryStreamExt::try_take_while)
-/// method.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct TryTakeWhile<St, Fut, F>
-where
-    St: TryStream,
-{
-    #[pin]
-    stream: St,
-    f: F,
-    #[pin]
-    pending_fut: Option<Fut>,
-    pending_item: Option<St::Ok>,
-    done_taking: bool,
+pin_project! {
+    /// Stream for the [`try_take_while`](super::TryStreamExt::try_take_while)
+    /// method.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TryTakeWhile<St, Fut, F>
+    where
+        St: TryStream,
+    {
+        #[pin]
+        stream: St,
+        f: F,
+        #[pin]
+        pending_fut: Option<Fut>,
+        pending_item: Option<St::Ok>,
+        done_taking: bool,
+    }
 }
 
 impl<St, Fut, F> fmt::Debug for TryTakeWhile<St, Fut, F>
@@ -47,13 +49,7 @@
     Fut: TryFuture<Ok = bool, Error = St::Error>,
 {
     pub(super) fn new(stream: St, f: F) -> Self {
-        Self {
-            stream,
-            f,
-            pending_fut: None,
-            pending_item: None,
-            done_taking: false,
-        }
+        Self { stream, f, pending_fut: None, pending_item: None, done_taking: false }
     }
 
     delegate_access_inner!(stream, St, ());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_unfold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_unfold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_unfold.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/try_stream/try_unfold.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,11 @@
+use super::assert_stream;
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::TryFuture;
+use futures_core::ready;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 /// Creates a `TryStream` from a seed and a closure returning a `TryFuture`.
 ///
@@ -59,21 +61,18 @@
     F: FnMut(T) -> Fut,
     Fut: TryFuture<Ok = Option<(Item, T)>>,
 {
-    TryUnfold {
-        f,
-        state: Some(init),
-        fut: None,
-    }
+    assert_stream::<Result<Item, Fut::Error>, _>(TryUnfold { f, state: Some(init), fut: None })
 }
 
-/// Stream for the [`try_unfold`] function.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct TryUnfold<T, F, Fut> {
-    f: F,
-    state: Option<T>,
-    #[pin]
-    fut: Option<Fut>,
+pin_project! {
+    /// Stream for the [`try_unfold`] function.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct TryUnfold<T, F, Fut> {
+        f: F,
+        state: Option<T>,
+        #[pin]
+        fut: Option<Fut>,
+    }
 }
 
 impl<T, F, Fut> fmt::Debug for TryUnfold<T, F, Fut>
@@ -82,10 +81,7 @@
     Fut: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TryUnfold")
-            .field("state", &self.state)
-            .field("fut", &self.fut)
-            .finish()
+        f.debug_struct("TryUnfold").field("state", &self.state).field("fut", &self.fut).finish()
     }
 }
 
@@ -96,10 +92,7 @@
 {
     type Item = Result<Item, Fut::Error>;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
         if let Some(state) = this.state.take() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/unfold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/unfold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/stream/unfold.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/stream/unfold.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,12 @@
+use super::assert_stream;
+use crate::unfold_state::UnfoldState;
 use core::fmt;
 use core::pin::Pin;
 use futures_core::future::Future;
+use futures_core::ready;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 /// Creates a `Stream` from a seed and a closure returning a `Future`.
 ///
@@ -45,24 +48,21 @@
 /// # });
 /// ```
 pub fn unfold<T, F, Fut, Item>(init: T, f: F) -> Unfold<T, F, Fut>
-    where F: FnMut(T) -> Fut,
-          Fut: Future<Output = Option<(Item, T)>>,
+where
+    F: FnMut(T) -> Fut,
+    Fut: Future<Output = Option<(Item, T)>>,
 {
-    Unfold {
-        f,
-        state: Some(init),
-        fut: None,
-    }
+    assert_stream::<Item, _>(Unfold { f, state: UnfoldState::Value { value: init } })
 }
 
-/// Stream for the [`unfold`] function.
-#[pin_project]
-#[must_use = "streams do nothing unless polled"]
-pub struct Unfold<T, F, Fut> {
-    f: F,
-    state: Option<T>,
-    #[pin]
-    fut: Option<Fut>,
+pin_project! {
+    /// Stream for the [`unfold`] function.
+    #[must_use = "streams do nothing unless polled"]
+    pub struct Unfold<T, F, Fut> {
+        f: F,
+        #[pin]
+        state: UnfoldState<T, Fut>,
+    }
 }
 
 impl<T, F, Fut> fmt::Debug for Unfold<T, F, Fut>
@@ -71,46 +71,48 @@
     Fut: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Unfold")
-            .field("state", &self.state)
-            .field("fut", &self.fut)
-            .finish()
+        f.debug_struct("Unfold").field("state", &self.state).finish()
     }
 }
 
 impl<T, F, Fut, Item> FusedStream for Unfold<T, F, Fut>
-    where F: FnMut(T) -> Fut,
-          Fut: Future<Output = Option<(Item, T)>>,
+where
+    F: FnMut(T) -> Fut,
+    Fut: Future<Output = Option<(Item, T)>>,
 {
     fn is_terminated(&self) -> bool {
-        self.state.is_none() && self.fut.is_none()
+        if let UnfoldState::Empty = self.state {
+            true
+        } else {
+            false
+        }
     }
 }
 
 impl<T, F, Fut, Item> Stream for Unfold<T, F, Fut>
-    where F: FnMut(T) -> Fut,
-          Fut: Future<Output = Option<(Item, T)>>,
+where
+    F: FnMut(T) -> Fut,
+    Fut: Future<Output = Option<(Item, T)>>,
 {
     type Item = Item;
 
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut this = self.project();
 
-        if let Some(state) = this.state.take() {
-            this.fut.set(Some((this.f)(state)));
+        if let Some(state) = this.state.as_mut().take_value() {
+            this.state.set(UnfoldState::Future { future: (this.f)(state) });
         }
 
-        let step = ready!(this.fut.as_mut().as_pin_mut()
-            .expect("Unfold must not be polled after it returned `Poll::Ready(None)`").poll(cx));
-        this.fut.set(None);
+        let step = match this.state.as_mut().project_future() {
+            Some(fut) => ready!(fut.poll(cx)),
+            None => panic!("Unfold must not be polled after it returned `Poll::Ready(None)`"),
+        };
 
         if let Some((item, next_state)) = step {
-            *this.state = Some(next_state);
+            this.state.set(UnfoldState::Value { value: next_state });
             Poll::Ready(Some(item))
         } else {
+            this.state.set(UnfoldState::Empty);
             Poll::Ready(None)
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/task/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/task/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/task/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/task/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,28 +1,38 @@
-//! Task notification
+//! Tools for working with tasks.
+//!
+//! This module contains:
+//!
+//! - [`Spawn`], a trait for spawning new tasks.
+//! - [`Context`], a context of an asynchronous task,
+//!   including a handle for waking up the task.
+//! - [`Waker`], a handle for waking up a task.
+//!
+//! The remaining types and traits in the module are used for implementing
+//! executors or dealing with synchronization issues around task wakeup.
 
-cfg_target_has_atomic! {
-    #[cfg(feature = "alloc")]
-    pub use futures_task::ArcWake;
+#[doc(no_inline)]
+pub use core::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};
 
-    #[cfg(feature = "alloc")]
-    pub use futures_task::waker;
-
-    #[cfg(feature = "alloc")]
-    pub use futures_task::{waker_ref, WakerRef};
-
-    pub use futures_core::task::__internal::AtomicWaker;
-}
-
-mod spawn;
-pub use self::spawn::{SpawnExt, LocalSpawnExt};
-
-pub use futures_core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
-
-pub use futures_task::{
-    Spawn, LocalSpawn, SpawnError,
-    FutureObj, LocalFutureObj, UnsafeFutureObj,
-};
+pub use futures_task::{FutureObj, LocalFutureObj, LocalSpawn, Spawn, SpawnError, UnsafeFutureObj};
 
 pub use futures_task::noop_waker;
 #[cfg(feature = "std")]
 pub use futures_task::noop_waker_ref;
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use futures_task::ArcWake;
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use futures_task::waker;
+
+#[cfg(not(futures_no_atomic_cas))]
+#[cfg(feature = "alloc")]
+pub use futures_task::{waker_ref, WakerRef};
+
+#[cfg(not(futures_no_atomic_cas))]
+pub use futures_core::task::__internal::AtomicWaker;
+
+mod spawn;
+pub use self::spawn::{LocalSpawnExt, SpawnExt};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/unfold_state.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/unfold_state.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/futures-util/src/unfold_state.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/futures-util/src/unfold_state.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,39 @@
+use core::pin::Pin;
+
+use pin_project_lite::pin_project;
+
+pin_project! {
+    /// UnfoldState used for stream and sink unfolds
+    #[project = UnfoldStateProj]
+    #[project_replace = UnfoldStateProjReplace]
+    #[derive(Debug)]
+    pub(crate) enum UnfoldState<T, R> {
+        Value {
+            value: T,
+        },
+        Future {
+            #[pin]
+            future: R,
+        },
+        Empty,
+    }
+}
+
+impl<T, R> UnfoldState<T, R> {
+    pub(crate) fn project_future(self: Pin<&mut Self>) -> Option<Pin<&mut R>> {
+        match self.project() {
+            UnfoldStateProj::Future { future } => Some(future),
+            _ => None,
+        }
+    }
+
+    pub(crate) fn take_value(self: Pin<&mut Self>) -> Option<T> {
+        match &*self {
+            UnfoldState::Value { .. } => match self.project_replace(UnfoldState::Empty) {
+                UnfoldStateProjReplace::Value { value } => Some(value),
+                _ => unreachable!(),
+            },
+            _ => None,
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"aa938a1a7581e59cbb554b44cc2dcf628cc1af9ddee6dccd53f557ed8d62775e","Cargo.toml":"6f83fe34b8c252299c537c8f5cdb22bffb583c5676d5353ad73bef7f4d6958fc","LICENSE":"c09aae9d3c77b531f56351a9947bc7446511d6b025b3255312d3e3442a9a7583","README.md":"aad2a8508f8ae6b009d04d388bffb751875d4cfdcc6f3398212c65cc3c390d03","rustfmt.toml":"13d771354ddee15d5aa5a168fd6965c3c0ee7aa7ce75cdd5e3b82852cdac5123","src/arr.rs":"5fee5550800b890383c1dd80e00a0a568475a8599e7678e143740c941e98099d","src/functional.rs":"2437c360c645d8a9816a3b13531f23b005d1aed3ef7b1d9bcc9b2859b1d56826","src/hex.rs":"438288cf41fad3fd40ce60eb893cd038e9a88e450bab0189fe4dba8ce833a686","src/impl_serde.rs":"2cab2f808ba000c214a3ded9f43b4d5363114fe57c2c7abf545345b8b749f0db","src/impls.rs":"0472fc62d69e3e78b3f31e340cfc038bf12c3d7c4bdcd5fee064e7113d2f171d","src/iter.rs":"156f798c82bc0d5e2c9a0a7777acc156bfdda793b64295ad7495cc5daa5ecb97","src/lib.rs":"d2f4b74c7ac8f9a9d7a782089b95315ec6b1f1571d79a2b16bd76bcff2004bd4","src/sequence.rs":"63813c9e305b6642ac29f0ba3dd70d7db86e27fc58b31e7508c68ea52c060e82","tests/arr.rs":"22d332fcb5e0314980ddc952af0265125cf53bb9cb8b546a9dcaec2e29bfc3b0","tests/generics.rs":"491c9351fd973ff2b7bc72e78d3069cf3ed3fcd2f9180558ab027099605fa147","tests/hex.rs":"fd428c2558da2f1e2cf229af2e40e5b35a2094b3306312ac41943d25a85b7de1","tests/import_name.rs":"c9439c7d7531ce79419b0d413d729ea4321887c091bd9be8b18e6c2413021ed0","tests/iter.rs":"edf27c43ed13bf8cba2cd01de2fd7b6451c1226c8ad8331880996248e7f14d12","tests/mod.rs":"fca2966183ccd1d1681f91a845773911ab61f618bd412470612fac240ecfe0db"},"package":"c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "generic-array"
-version = "0.12.3"
-authors = ["Bartłomiej Kamiński <fizyk20@gmail.com>", "Aaron Trent <novacrazy@gmail.com>"]
-description = "Generic types implementing functionality of arrays"
-documentation = "http://fizyk20.github.io/generic-array/generic_array/"
-readme = "README.md"
-keywords = ["generic", "array"]
-categories = ["data-structures", "no-std"]
-license = "MIT"
-repository = "https://github.com/fizyk20/generic-array.git"
-
-[lib]
-name = "generic_array"
-[dependencies.serde]
-version = "1.0"
-optional = true
-default-features = false
-
-[dependencies.typenum]
-version = "1.10"
-[dev-dependencies.bincode]
-version = "1.0"
-
-[dev-dependencies.serde_json]
-version = "1.0"
-[badges.travis-ci]
-repository = "fizyk20/generic-array"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-* **`0.12.0`**
-    * Allow trailing commas in `arr!` macro.
-    * **BREAKING**: Serialize `GenericArray` using `serde` tuples, instead of variable-length sequences. This may not be compatible with old serialized data.
-
-* **`0.11.0`**
-    * **BREAKING** Redesign `GenericSequence` with an emphasis on use in generic type parameters.
-    * Add `MappedGenericSequence` and `FunctionalSequence`
-        * Implements optimized `map`, `zip` and `fold` for `GenericArray`, `&GenericArray` and `&mut GenericArray`
-    * **BREAKING** Remove `map_ref`, `zip_ref` and `map_slice`
-        * `map_slice` is now equivalent to `GenericArray::from_iter(slice.iter().map(...))`
-* **`0.10.0`**
-    * Add `GenericSequence`, `Lengthen`, `Shorten`, `Split` and `Concat` traits.
-    * Redefine `transmute` to avert errors.
-* **`0.9.0`**
-    * Rewrite construction methods to be well-defined in panic situations, correctly dropping elements.
-    * `NoDrop` crate replaced by `ManuallyDrop` as it became stable in Rust core.
-    * Add optimized `map`/`map_ref` and `zip`/`zip_ref` methods to `GenericArray`
-* **`0.8.0`**
-    * Implement `AsRef`, `AsMut`, `Borrow`, `BorrowMut`, `Hash` for `GenericArray`
-    * Update `serde` to `1.0`
-    * Update `typenum`
-    * Make macro `arr!` non-cloning
-    * Implement `From<[T; N]>` up to `N=32`
-    * Fix #45
-* **`0.7.0`**
-    * Upgrade `serde` to `0.9`
-    * Make `serde` with `no_std`
-    * Implement `PartialOrd`/`Ord` for `GenericArray`
-* **`0.6.0`**
-    * Fixed #30
-    * Implement `Default` for `GenericArray`
-    * Implement `LowerHex` and `UpperHex` for `GenericArray<u8, N>`
-    * Use `precision` formatting field in hex representation
-    * Add `as_slice`, `as_mut_slice`
-    * Remove `GenericArray::new` in favor of `Default` trait
-    * Add `from_slice` and `from_mut_slice`
-    * `no_std` and `core` for crate.
-* **`0.5.0`**
-    * Update `serde`
-    * remove `no_std` feature, fixed #19
-* **`0.4.0`**
-    * Re-export `typenum`
-* **`0.3.0`**
-    * Implement `IntoIter` for `GenericArray`
-    * Add `map` method
-    * Add optional `serde` (de)serialization support feature.
-* **`< 0.3.0`**
-    * Initial implementation in late 2015
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Bartłomiej Kamiński
-
-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.
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-[![Crates.io](https://img.shields.io/crates/v/generic-array.svg)](https://crates.io/crates/generic-array)
-[![Build Status](https://travis-ci.org/fizyk20/generic-array.svg?branch=master)](https://travis-ci.org/fizyk20/generic-array)
-# generic-array
-
-This crate implements generic array types for Rust.
-
-[Documentation](http://fizyk20.github.io/generic-array/generic_array/)
-
-## Usage
-
-The Rust arrays `[T; N]` are problematic in that they can't be used generically with respect to `N`, so for example this won't work:
-
-```rust
-struct Foo<N> {
-	data: [i32; N]
-}
-```
-
-**generic-array** defines a new trait `ArrayLength<T>` and a struct `GenericArray<T, N: ArrayLength<T>>`, which let the above be implemented as:
-
-```rust
-struct Foo<N: ArrayLength<i32>> {
-	data: GenericArray<i32, N>
-}
-```
-
-To actually define a type implementing `ArrayLength`, you can use unsigned integer types defined in [typenum](https://github.com/paholg/typenum) crate - for example, `GenericArray<T, U5>` would work almost like `[T; 5]` :)
-
-In version 0.1.1 an `arr!` macro was introduced, allowing for creation of arrays as shown below:
-
-```rust
-let array = arr![u32; 1, 2, 3];
-assert_eq!(array[2], 3);
-```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-reorder_imports = true
-reorder_imported_names = true
-use_try_shorthand = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/arr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/arr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/arr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/arr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-//! Implementation for `arr!` macro.
-
-use super::ArrayLength;
-use core::ops::Add;
-use typenum::U1;
-
-/// Helper trait for `arr!` macro
-pub trait AddLength<T, N: ArrayLength<T>>: ArrayLength<T> {
-    /// Resulting length
-    type Output: ArrayLength<T>;
-}
-
-impl<T, N1, N2> AddLength<T, N2> for N1
-where
-    N1: ArrayLength<T> + Add<N2>,
-    N2: ArrayLength<T>,
-    <N1 as Add<N2>>::Output: ArrayLength<T>,
-{
-    type Output = <N1 as Add<N2>>::Output;
-}
-
-/// Helper type for `arr!` macro
-pub type Inc<T, U> = <U as AddLength<T, U1>>::Output;
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! arr_impl {
-    ($T:ty; $N:ty, [$($x:expr),*], []) => ({
-        unsafe { $crate::transmute::<_, $crate::GenericArray<$T, $N>>([$($x),*]) }
-    });
-    ($T:ty; $N:ty, [], [$x1:expr]) => (
-        arr_impl!($T; $crate::arr::Inc<$T, $N>, [$x1 as $T], [])
-    );
-    ($T:ty; $N:ty, [], [$x1:expr, $($x:expr),+]) => (
-        arr_impl!($T; $crate::arr::Inc<$T, $N>, [$x1 as $T], [$($x),+])
-    );
-    ($T:ty; $N:ty, [$($y:expr),+], [$x1:expr]) => (
-        arr_impl!($T; $crate::arr::Inc<$T, $N>, [$($y),+, $x1 as $T], [])
-    );
-    ($T:ty; $N:ty, [$($y:expr),+], [$x1:expr, $($x:expr),+]) => (
-        arr_impl!($T; $crate::arr::Inc<$T, $N>, [$($y),+, $x1 as $T], [$($x),+])
-    );
-}
-
-/// Macro allowing for easy generation of Generic Arrays.
-/// Example: `let test = arr![u32; 1, 2, 3];`
-#[macro_export]
-macro_rules! arr {
-    ($T:ty; $(,)*) => ({
-        unsafe { $crate::transmute::<[$T; 0], $crate::GenericArray<$T, $crate::typenum::U0>>([]) }
-    });
-    ($T:ty; $($x:expr),* $(,)*) => (
-        arr_impl!($T; $crate::typenum::U0, [], [$($x),*])
-    );
-    ($($x:expr,)+) => (arr![$($x),*]);
-    () => ("""Macro requires a type, e.g. `let array = arr![u32; 1, 2, 3];`")
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/functional.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/functional.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/functional.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/functional.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-//! Functional programming with generic sequences
-//!
-//! Please see `tests/generics.rs` for examples of how to best use these in your generic functions.
-
-use super::ArrayLength;
-use core::iter::FromIterator;
-use sequence::*;
-
-/// Defines the relationship between one generic sequence and another,
-/// for operations such as `map` and `zip`.
-pub unsafe trait MappedGenericSequence<T, U>: GenericSequence<T>
-where
-    Self::Length: ArrayLength<U>,
-{
-    /// Mapped sequence type
-    type Mapped: GenericSequence<U, Length = Self::Length>;
-}
-
-unsafe impl<'a, T, U, S: MappedGenericSequence<T, U>> MappedGenericSequence<T, U> for &'a S
-where
-    &'a S: GenericSequence<T>,
-    S: GenericSequence<T, Length = <&'a S as GenericSequence<T>>::Length>,
-    <S as GenericSequence<T>>::Length: ArrayLength<U>,
-{
-    type Mapped = <S as MappedGenericSequence<T, U>>::Mapped;
-}
-
-unsafe impl<'a, T, U, S: MappedGenericSequence<T, U>> MappedGenericSequence<T, U> for &'a mut S
-where
-    &'a mut S: GenericSequence<T>,
-    S: GenericSequence<T, Length = <&'a mut S as GenericSequence<T>>::Length>,
-    <S as GenericSequence<T>>::Length: ArrayLength<U>,
-{
-    type Mapped = <S as MappedGenericSequence<T, U>>::Mapped;
-}
-
-/// Accessor type for a mapped generic sequence
-pub type MappedSequence<S, T, U> =
-    <<S as MappedGenericSequence<T, U>>::Mapped as GenericSequence<U>>::Sequence;
-
-/// Defines functional programming methods for generic sequences
-pub unsafe trait FunctionalSequence<T>: GenericSequence<T> {
-    /// Maps a `GenericSequence` to another `GenericSequence`.
-    ///
-    /// If the mapping function panics, any already initialized elements in the new sequence
-    /// will be dropped, AND any unused elements in the source sequence will also be dropped.
-    fn map<U, F>(self, f: F) -> MappedSequence<Self, T, U>
-    where
-        Self: MappedGenericSequence<T, U>,
-        Self::Length: ArrayLength<U>,
-        F: FnMut(Self::Item) -> U,
-    {
-        FromIterator::from_iter(self.into_iter().map(f))
-    }
-
-    /// Combines two `GenericSequence` instances and iterates through both of them,
-    /// initializing a new `GenericSequence` with the result of the zipped mapping function.
-    ///
-    /// If the mapping function panics, any already initialized elements in the new sequence
-    /// will be dropped, AND any unused elements in the source sequences will also be dropped.
-    #[inline]
-    fn zip<B, Rhs, U, F>(self, rhs: Rhs, f: F) -> MappedSequence<Self, T, U>
-    where
-        Self: MappedGenericSequence<T, U>,
-        Rhs: MappedGenericSequence<B, U, Mapped = MappedSequence<Self, T, U>>,
-        Self::Length: ArrayLength<B> + ArrayLength<U>,
-        Rhs: GenericSequence<B, Length = Self::Length>,
-        F: FnMut(Self::Item, Rhs::Item) -> U,
-    {
-        rhs.inverted_zip2(self, f)
-    }
-
-    /// Folds (or reduces) a sequence of data into a single value.
-    ///
-    /// If the fold function panics, any unused elements will be dropped.
-    fn fold<U, F>(self, init: U, f: F) -> U
-    where
-        F: FnMut(U, Self::Item) -> U,
-    {
-        self.into_iter().fold(init, f)
-    }
-}
-
-unsafe impl<'a, T, S: GenericSequence<T>> FunctionalSequence<T> for &'a S
-where
-    &'a S: GenericSequence<T>,
-{
-}
-
-unsafe impl<'a, T, S: GenericSequence<T>> FunctionalSequence<T> for &'a mut S
-where
-    &'a mut S: GenericSequence<T>,
-{
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/hex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/hex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/hex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/hex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-//! Generic array are commonly used as a return value for hash digests, so
-//! it's a good idea to allow to hexlify them easily. This module implements
-//! `std::fmt::LowerHex` and `std::fmt::UpperHex` traits.
-//!
-//! Example:
-//!
-//! ```rust
-//! # #[macro_use]
-//! # extern crate generic_array;
-//! # extern crate typenum;
-//! # fn main() {
-//! let array = arr![u8; 10, 20, 30];
-//! assert_eq!(format!("{:x}", array), "0a141e");
-//! # }
-//! ```
-//!
-
-use {ArrayLength, GenericArray};
-use core::cmp::min;
-use core::fmt;
-use core::ops::Add;
-use core::str;
-use typenum::*;
-
-static LOWER_CHARS: &'static [u8] = b"0123456789abcdef";
-static UPPER_CHARS: &'static [u8] = b"0123456789ABCDEF";
-
-impl<T: ArrayLength<u8>> fmt::LowerHex for GenericArray<u8, T>
-where
-    T: Add<T>,
-    <T as Add<T>>::Output: ArrayLength<u8>,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let max_digits = f.precision().unwrap_or_else(|| self.len() * 2);
-        let max_hex = (max_digits >> 1) + (max_digits & 1);
-
-        if T::to_usize() < 1024 {
-            // For small arrays use a stack allocated
-            // buffer of 2x number of bytes
-            let mut res = GenericArray::<u8, Sum<T, T>>::default();
-
-            for (i, c) in self.iter().take(max_hex).enumerate() {
-                res[i * 2] = LOWER_CHARS[(c >> 4) as usize];
-                res[i * 2 + 1] = LOWER_CHARS[(c & 0xF) as usize];
-            }
-            f.write_str(unsafe { str::from_utf8_unchecked(&res[..max_digits]) })?;
-        } else {
-            // For large array use chunks of up to 1024 bytes (2048 hex chars)
-            let mut buf = [0u8; 2048];
-            let mut digits_left = max_digits;
-
-            for chunk in self[..max_hex].chunks(1024) {
-                for (i, c) in chunk.iter().enumerate() {
-                    buf[i * 2] = LOWER_CHARS[(c >> 4) as usize];
-                    buf[i * 2 + 1] = LOWER_CHARS[(c & 0xF) as usize];
-                }
-                let n = min(chunk.len() * 2, digits_left);
-                f.write_str(unsafe { str::from_utf8_unchecked(&buf[..n]) })?;
-                digits_left -= n;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<T: ArrayLength<u8>> fmt::UpperHex for GenericArray<u8, T>
-where
-    T: Add<T>,
-    <T as Add<T>>::Output: ArrayLength<u8>,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let max_digits = f.precision().unwrap_or_else(|| self.len() * 2);
-        let max_hex = (max_digits >> 1) + (max_digits & 1);
-
-        if T::to_usize() < 1024 {
-            // For small arrays use a stack allocated
-            // buffer of 2x number of bytes
-            let mut res = GenericArray::<u8, Sum<T, T>>::default();
-
-            for (i, c) in self.iter().take(max_hex).enumerate() {
-                res[i * 2] = UPPER_CHARS[(c >> 4) as usize];
-                res[i * 2 + 1] = UPPER_CHARS[(c & 0xF) as usize];
-            }
-            f.write_str(unsafe { str::from_utf8_unchecked(&res[..max_digits]) })?;
-        } else {
-            // For large array use chunks of up to 1024 bytes (2048 hex chars)
-            let mut buf = [0u8; 2048];
-            let mut digits_left = max_digits;
-
-            for chunk in self[..max_hex].chunks(1024) {
-                for (i, c) in chunk.iter().enumerate() {
-                    buf[i * 2] = UPPER_CHARS[(c >> 4) as usize];
-                    buf[i * 2 + 1] = UPPER_CHARS[(c & 0xF) as usize];
-                }
-                let n = min(chunk.len() * 2, digits_left);
-                f.write_str(unsafe { str::from_utf8_unchecked(&buf[..n]) })?;
-                digits_left -= n;
-            }
-        }
-        Ok(())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/impl_serde.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/impl_serde.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/impl_serde.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/impl_serde.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-//! Serde serialization/deserialization implementation
-
-use core::fmt;
-use core::marker::PhantomData;
-use serde::de::{self, SeqAccess, Visitor};
-use serde::{ser::SerializeTuple, Deserialize, Deserializer, Serialize, Serializer};
-use {ArrayLength, GenericArray};
-
-impl<T, N> Serialize for GenericArray<T, N>
-where
-    T: Serialize,
-    N: ArrayLength<T>,
-{
-    #[inline]
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut tup = serializer.serialize_tuple(N::to_usize())?;
-        for el in self {
-            tup.serialize_element(el)?;
-        }
-
-        tup.end()
-    }
-}
-
-struct GAVisitor<T, N> {
-    _t: PhantomData<T>,
-    _n: PhantomData<N>,
-}
-
-impl<'de, T, N> Visitor<'de> for GAVisitor<T, N>
-where
-    T: Deserialize<'de> + Default,
-    N: ArrayLength<T>,
-{
-    type Value = GenericArray<T, N>;
-
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        formatter.write_str("struct GenericArray")
-    }
-
-    fn visit_seq<A>(self, mut seq: A) -> Result<GenericArray<T, N>, A::Error>
-    where
-        A: SeqAccess<'de>,
-    {
-        let mut result = GenericArray::default();
-        for i in 0..N::to_usize() {
-            result[i] = seq
-                .next_element()?
-                .ok_or_else(|| de::Error::invalid_length(i, &self))?;
-        }
-        Ok(result)
-    }
-}
-
-impl<'de, T, N> Deserialize<'de> for GenericArray<T, N>
-where
-    T: Deserialize<'de> + Default,
-    N: ArrayLength<T>,
-{
-    fn deserialize<D>(deserializer: D) -> Result<GenericArray<T, N>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let visitor = GAVisitor {
-            _t: PhantomData,
-            _n: PhantomData,
-        };
-        deserializer.deserialize_tuple(N::to_usize(), visitor)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use bincode;
-    use typenum;
-
-    #[test]
-    fn test_serialize() {
-        let array = GenericArray::<u8, typenum::U2>::default();
-        let serialized = bincode::serialize(&array);
-        assert!(serialized.is_ok());
-    }
-
-    #[test]
-    fn test_deserialize() {
-        let mut array = GenericArray::<u8, typenum::U2>::default();
-        array[0] = 1;
-        array[1] = 2;
-        let serialized = bincode::serialize(&array).unwrap();
-        let deserialized = bincode::deserialize::<GenericArray<u8, typenum::U2>>(&array);
-        assert!(deserialized.is_ok());
-        let array = deserialized.unwrap();
-        assert_eq!(array[0], 1);
-        assert_eq!(array[1], 2);
-    }
-
-    #[test]
-    fn test_serialized_size() {
-        let array = GenericArray::<u8, typenum::U1>::default();
-        let size = bincode::serialized_size(&array).unwrap();
-        assert_eq!(size, 1);
-    }
-
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/impls.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +0,0 @@
-use super::{ArrayLength, GenericArray};
-use core::borrow::{Borrow, BorrowMut};
-use core::cmp::Ordering;
-use core::fmt::{self, Debug};
-use core::hash::{Hash, Hasher};
-use functional::*;
-use sequence::*;
-
-impl<T: Default, N> Default for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    #[inline]
-    fn default() -> Self {
-        Self::generate(|_| T::default())
-    }
-}
-
-impl<T: Clone, N> Clone for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn clone(&self) -> GenericArray<T, N> {
-        self.map(Clone::clone)
-    }
-}
-
-impl<T: Copy, N> Copy for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-    N::ArrayType: Copy,
-{
-}
-
-impl<T: PartialEq, N> PartialEq for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn eq(&self, other: &Self) -> bool {
-        **self == **other
-    }
-}
-impl<T: Eq, N> Eq for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-}
-
-impl<T: PartialOrd, N> PartialOrd for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn partial_cmp(&self, other: &GenericArray<T, N>) -> Option<Ordering> {
-        PartialOrd::partial_cmp(self.as_slice(), other.as_slice())
-    }
-}
-
-impl<T: Ord, N> Ord for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn cmp(&self, other: &GenericArray<T, N>) -> Ordering {
-        Ord::cmp(self.as_slice(), other.as_slice())
-    }
-}
-
-impl<T: Debug, N> Debug for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        self[..].fmt(fmt)
-    }
-}
-
-impl<T, N> Borrow<[T]> for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    #[inline(always)]
-    fn borrow(&self) -> &[T] {
-        &self[..]
-    }
-}
-
-impl<T, N> BorrowMut<[T]> for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    #[inline(always)]
-    fn borrow_mut(&mut self) -> &mut [T] {
-        &mut self[..]
-    }
-}
-
-impl<T, N> AsRef<[T]> for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    #[inline(always)]
-    fn as_ref(&self) -> &[T] {
-        &self[..]
-    }
-}
-
-impl<T, N> AsMut<[T]> for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    #[inline(always)]
-    fn as_mut(&mut self) -> &mut [T] {
-        &mut self[..]
-    }
-}
-
-impl<T: Hash, N> Hash for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        Hash::hash(&self[..], state)
-    }
-}
-
-macro_rules! impl_from {
-    ($($n: expr => $ty: ty),*) => {
-        $(
-            impl<T> From<[T; $n]> for GenericArray<T, $ty> {
-                #[inline(always)]
-                fn from(arr: [T; $n]) -> Self {
-                    unsafe { $crate::transmute(arr) }
-                }
-            }
-
-            impl<T> Into<[T; $n]> for GenericArray<T, $ty> {
-                #[inline(always)]
-                fn into(self) -> [T; $n] {
-                    unsafe { $crate::transmute(self) }
-                }
-            }
-        )*
-
-    }
-}
-
-impl_from! {
-    1  => ::typenum::U1,
-    2  => ::typenum::U2,
-    3  => ::typenum::U3,
-    4  => ::typenum::U4,
-    5  => ::typenum::U5,
-    6  => ::typenum::U6,
-    7  => ::typenum::U7,
-    8  => ::typenum::U8,
-    9  => ::typenum::U9,
-    10 => ::typenum::U10,
-    11 => ::typenum::U11,
-    12 => ::typenum::U12,
-    13 => ::typenum::U13,
-    14 => ::typenum::U14,
-    15 => ::typenum::U15,
-    16 => ::typenum::U16,
-    17 => ::typenum::U17,
-    18 => ::typenum::U18,
-    19 => ::typenum::U19,
-    20 => ::typenum::U20,
-    21 => ::typenum::U21,
-    22 => ::typenum::U22,
-    23 => ::typenum::U23,
-    24 => ::typenum::U24,
-    25 => ::typenum::U25,
-    26 => ::typenum::U26,
-    27 => ::typenum::U27,
-    28 => ::typenum::U28,
-    29 => ::typenum::U29,
-    30 => ::typenum::U30,
-    31 => ::typenum::U31,
-    32 => ::typenum::U32
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/iter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-//! `GenericArray` iterator implementation.
-
-use super::{ArrayLength, GenericArray};
-use core::{cmp, ptr, fmt, mem};
-use core::mem::ManuallyDrop;
-
-/// An iterator that moves out of a `GenericArray`
-pub struct GenericArrayIter<T, N: ArrayLength<T>> {
-    // Invariants: index <= index_back <= N
-    // Only values in array[index..index_back] are alive at any given time.
-    // Values from array[..index] and array[index_back..] are already moved/dropped.
-    array: ManuallyDrop<GenericArray<T, N>>,
-    index: usize,
-    index_back: usize,
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    fn send<I: Send>(_iter: I) {}
-
-    #[test]
-    fn test_send_iter() {
-        send(GenericArray::from([1, 2, 3, 4]).into_iter());
-    }
-}
-
-impl<T, N> GenericArrayIter<T, N>
-where
-    N: ArrayLength<T>,
-{
-    /// Returns the remaining items of this iterator as a slice
-    #[inline]
-    pub fn as_slice(&self) -> &[T] {
-        &self.array.as_slice()[self.index..self.index_back]
-    }
-
-    /// Returns the remaining items of this iterator as a mutable slice
-    #[inline]
-    pub fn as_mut_slice(&mut self) -> &mut [T] {
-        &mut self.array.as_mut_slice()[self.index..self.index_back]
-    }
-}
-
-impl<T, N> IntoIterator for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    type Item = T;
-    type IntoIter = GenericArrayIter<T, N>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        GenericArrayIter {
-            array: ManuallyDrop::new(self),
-            index: 0,
-            index_back: N::to_usize(),
-        }
-    }
-}
-
-// Based on work in rust-lang/rust#49000
-impl<T: fmt::Debug, N> fmt::Debug for GenericArrayIter<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_tuple("GenericArrayIter")
-            .field(&self.as_slice())
-            .finish()
-    }
-}
-
-impl<T, N> Drop for GenericArrayIter<T, N>
-where
-    N: ArrayLength<T>,
-{
-    #[inline]
-    fn drop(&mut self) {
-        // Drop values that are still alive.
-        for p in self.as_mut_slice() {
-            unsafe {
-                ptr::drop_in_place(p);
-            }
-        }
-    }
-}
-
-// Based on work in rust-lang/rust#49000
-impl<T: Clone, N> Clone for GenericArrayIter<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn clone(&self) -> Self {
-        // This places all cloned elements at the start of the new array iterator,
-        // not at their original indices.
-        unsafe {
-            let mut iter = GenericArrayIter {
-                array: ManuallyDrop::new(mem::uninitialized()),
-                index: 0,
-                index_back: 0,
-            };
-
-            for (dst, src) in iter.array.iter_mut().zip(self.as_slice()) {
-                ptr::write(dst, src.clone());
-
-                iter.index_back += 1;
-            }
-
-            iter
-        }
-    }
-}
-
-impl<T, N> Iterator for GenericArrayIter<T, N>
-where
-    N: ArrayLength<T>,
-{
-    type Item = T;
-
-    #[inline]
-    fn next(&mut self) -> Option<T> {
-        if self.index < self.index_back {
-            let p = unsafe { Some(ptr::read(self.array.get_unchecked(self.index))) };
-
-            self.index += 1;
-
-            p
-        } else {
-            None
-        }
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = self.len();
-        (len, Some(len))
-    }
-
-    #[inline]
-    fn count(self) -> usize {
-        self.len()
-    }
-
-    fn nth(&mut self, n: usize) -> Option<T> {
-        // First consume values prior to the nth.
-        let ndrop = cmp::min(n, self.len());
-
-        for p in &mut self.array[self.index..self.index + ndrop] {
-            self.index += 1;
-
-            unsafe {
-                ptr::drop_in_place(p);
-            }
-        }
-
-        self.next()
-    }
-
-    fn last(mut self) -> Option<T> {
-        // Note, everything else will correctly drop first as `self` leaves scope.
-        self.next_back()
-    }
-}
-
-impl<T, N> DoubleEndedIterator for GenericArrayIter<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn next_back(&mut self) -> Option<T> {
-        if self.index < self.index_back {
-            self.index_back -= 1;
-
-            unsafe { Some(ptr::read(self.array.get_unchecked(self.index_back))) }
-        } else {
-            None
-        }
-    }
-}
-
-impl<T, N> ExactSizeIterator for GenericArrayIter<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn len(&self) -> usize {
-        self.index_back - self.index
-    }
-}
-
-// TODO: Implement `FusedIterator` and `TrustedLen` when stabilized
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,632 +0,0 @@
-//! This crate implements a structure that can be used as a generic array type.use
-//! Core Rust array types `[T; N]` can't be used generically with
-//! respect to `N`, so for example this:
-//!
-//! ```{should_fail}
-//! struct Foo<T, N> {
-//!     data: [T; N]
-//! }
-//! ```
-//!
-//! won't work.
-//!
-//! **generic-array** exports a `GenericArray<T,N>` type, which lets
-//! the above be implemented as:
-//!
-//! ```
-//! # use generic_array::{ArrayLength, GenericArray};
-//! struct Foo<T, N: ArrayLength<T>> {
-//!     data: GenericArray<T,N>
-//! }
-//! ```
-//!
-//! The `ArrayLength<T>` trait is implemented by default for
-//! [unsigned integer types](../typenum/uint/index.html) from
-//! [typenum](../typenum/index.html).
-//!
-//! For ease of use, an `arr!` macro is provided - example below:
-//!
-//! ```
-//! # #[macro_use]
-//! # extern crate generic_array;
-//! # extern crate typenum;
-//! # fn main() {
-//! let array = arr![u32; 1, 2, 3];
-//! assert_eq!(array[2], 3);
-//! # }
-//! ```
-
-#![deny(missing_docs)]
-#![no_std]
-
-#[cfg(feature = "serde")]
-extern crate serde;
-
-#[cfg(test)]
-extern crate bincode;
-
-pub extern crate typenum;
-
-mod hex;
-mod impls;
-
-#[cfg(feature = "serde")]
-pub mod impl_serde;
-
-use core::iter::FromIterator;
-use core::marker::PhantomData;
-use core::mem::ManuallyDrop;
-use core::ops::{Deref, DerefMut};
-use core::{mem, ptr, slice};
-use typenum::bit::{B0, B1};
-use typenum::uint::{UInt, UTerm, Unsigned};
-
-#[cfg_attr(test, macro_use)]
-pub mod arr;
-pub mod functional;
-pub mod iter;
-pub mod sequence;
-
-use functional::*;
-pub use iter::GenericArrayIter;
-use sequence::*;
-
-/// Trait making `GenericArray` work, marking types to be used as length of an array
-pub unsafe trait ArrayLength<T>: Unsigned {
-    /// Associated type representing the array type for the number
-    type ArrayType;
-}
-
-unsafe impl<T> ArrayLength<T> for UTerm {
-    #[doc(hidden)]
-    type ArrayType = ();
-}
-
-/// Internal type used to generate a struct of appropriate size
-#[allow(dead_code)]
-#[repr(C)]
-#[doc(hidden)]
-pub struct GenericArrayImplEven<T, U> {
-    parent1: U,
-    parent2: U,
-    _marker: PhantomData<T>,
-}
-
-impl<T: Clone, U: Clone> Clone for GenericArrayImplEven<T, U> {
-    fn clone(&self) -> GenericArrayImplEven<T, U> {
-        GenericArrayImplEven {
-            parent1: self.parent1.clone(),
-            parent2: self.parent2.clone(),
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<T: Copy, U: Copy> Copy for GenericArrayImplEven<T, U> {}
-
-/// Internal type used to generate a struct of appropriate size
-#[allow(dead_code)]
-#[repr(C)]
-#[doc(hidden)]
-pub struct GenericArrayImplOdd<T, U> {
-    parent1: U,
-    parent2: U,
-    data: T,
-}
-
-impl<T: Clone, U: Clone> Clone for GenericArrayImplOdd<T, U> {
-    fn clone(&self) -> GenericArrayImplOdd<T, U> {
-        GenericArrayImplOdd {
-            parent1: self.parent1.clone(),
-            parent2: self.parent2.clone(),
-            data: self.data.clone(),
-        }
-    }
-}
-
-impl<T: Copy, U: Copy> Copy for GenericArrayImplOdd<T, U> {}
-
-unsafe impl<T, N: ArrayLength<T>> ArrayLength<T> for UInt<N, B0> {
-    #[doc(hidden)]
-    type ArrayType = GenericArrayImplEven<T, N::ArrayType>;
-}
-
-unsafe impl<T, N: ArrayLength<T>> ArrayLength<T> for UInt<N, B1> {
-    #[doc(hidden)]
-    type ArrayType = GenericArrayImplOdd<T, N::ArrayType>;
-}
-
-/// Struct representing a generic array - `GenericArray<T, N>` works like [T; N]
-#[allow(dead_code)]
-pub struct GenericArray<T, U: ArrayLength<T>> {
-    data: U::ArrayType,
-}
-
-unsafe impl<T: Send, N: ArrayLength<T>> Send for GenericArray<T, N> {}
-unsafe impl<T: Sync, N: ArrayLength<T>> Sync for GenericArray<T, N> {}
-
-impl<T, N> Deref for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    type Target = [T];
-
-    #[inline(always)]
-    fn deref(&self) -> &[T] {
-        unsafe { slice::from_raw_parts(self as *const Self as *const T, N::to_usize()) }
-    }
-}
-
-impl<T, N> DerefMut for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    #[inline(always)]
-    fn deref_mut(&mut self) -> &mut [T] {
-        unsafe { slice::from_raw_parts_mut(self as *mut Self as *mut T, N::to_usize()) }
-    }
-}
-
-/// Creates an array one element at a time using a mutable iterator
-/// you can write to with `ptr::write`.
-///
-/// Incremenent the position while iterating to mark off created elements,
-/// which will be dropped if `into_inner` is not called.
-#[doc(hidden)]
-pub struct ArrayBuilder<T, N: ArrayLength<T>> {
-    array: ManuallyDrop<GenericArray<T, N>>,
-    position: usize,
-}
-
-impl<T, N: ArrayLength<T>> ArrayBuilder<T, N> {
-    #[doc(hidden)]
-    #[inline]
-    pub unsafe fn new() -> ArrayBuilder<T, N> {
-        ArrayBuilder {
-            array: ManuallyDrop::new(mem::uninitialized()),
-            position: 0,
-        }
-    }
-
-    /// Creates a mutable iterator for writing to the array using `ptr::write`.
-    ///
-    /// Increment the position value given as a mutable reference as you iterate
-    /// to mark how many elements have been created.
-    #[doc(hidden)]
-    #[inline]
-    pub unsafe fn iter_position(&mut self) -> (slice::IterMut<T>, &mut usize) {
-        (self.array.iter_mut(), &mut self.position)
-    }
-
-    /// When done writing (assuming all elements have been written to),
-    /// get the inner array.
-    #[doc(hidden)]
-    #[inline]
-    pub unsafe fn into_inner(self) -> GenericArray<T, N> {
-        let array = ptr::read(&self.array);
-
-        mem::forget(self);
-
-        ManuallyDrop::into_inner(array)
-    }
-}
-
-impl<T, N: ArrayLength<T>> Drop for ArrayBuilder<T, N> {
-    fn drop(&mut self) {
-        for value in &mut self.array[..self.position] {
-            unsafe {
-                ptr::drop_in_place(value);
-            }
-        }
-    }
-}
-
-/// Consumes an array.
-///
-/// Increment the position while iterating and any leftover elements
-/// will be dropped if position does not go to N
-#[doc(hidden)]
-pub struct ArrayConsumer<T, N: ArrayLength<T>> {
-    array: ManuallyDrop<GenericArray<T, N>>,
-    position: usize,
-}
-
-impl<T, N: ArrayLength<T>> ArrayConsumer<T, N> {
-    #[doc(hidden)]
-    #[inline]
-    pub unsafe fn new(array: GenericArray<T, N>) -> ArrayConsumer<T, N> {
-        ArrayConsumer {
-            array: ManuallyDrop::new(array),
-            position: 0,
-        }
-    }
-
-    /// Creates an iterator and mutable reference to the internal position
-    /// to keep track of consumed elements.
-    ///
-    /// Increment the position as you iterate to mark off consumed elements
-    #[doc(hidden)]
-    #[inline]
-    pub unsafe fn iter_position(&mut self) -> (slice::Iter<T>, &mut usize) {
-        (self.array.iter(), &mut self.position)
-    }
-}
-
-impl<T, N: ArrayLength<T>> Drop for ArrayConsumer<T, N> {
-    fn drop(&mut self) {
-        for value in &mut self.array[self.position..N::to_usize()] {
-            unsafe {
-                ptr::drop_in_place(value);
-            }
-        }
-    }
-}
-
-impl<'a, T: 'a, N> IntoIterator for &'a GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    type IntoIter = slice::Iter<'a, T>;
-    type Item = &'a T;
-
-    fn into_iter(self: &'a GenericArray<T, N>) -> Self::IntoIter {
-        self.as_slice().iter()
-    }
-}
-
-impl<'a, T: 'a, N> IntoIterator for &'a mut GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    type IntoIter = slice::IterMut<'a, T>;
-    type Item = &'a mut T;
-
-    fn into_iter(self: &'a mut GenericArray<T, N>) -> Self::IntoIter {
-        self.as_mut_slice().iter_mut()
-    }
-}
-
-impl<T, N> FromIterator<T> for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    fn from_iter<I>(iter: I) -> GenericArray<T, N>
-    where
-        I: IntoIterator<Item = T>,
-    {
-        unsafe {
-            let mut destination = ArrayBuilder::new();
-
-            {
-                let (destination_iter, position) = destination.iter_position();
-
-                for (src, dst) in iter.into_iter().zip(destination_iter) {
-                    ptr::write(dst, src);
-
-                    *position += 1;
-                }
-            }
-
-            if destination.position < N::to_usize() {
-                from_iter_length_fail(destination.position, N::to_usize());
-            }
-
-            destination.into_inner()
-        }
-    }
-}
-
-#[inline(never)]
-#[cold]
-fn from_iter_length_fail(length: usize, expected: usize) -> ! {
-    panic!(
-        "GenericArray::from_iter received {} elements but expected {}",
-        length, expected
-    );
-}
-
-unsafe impl<T, N> GenericSequence<T> for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-    Self: IntoIterator<Item = T>,
-{
-    type Length = N;
-    type Sequence = Self;
-
-    fn generate<F>(mut f: F) -> GenericArray<T, N>
-    where
-        F: FnMut(usize) -> T,
-    {
-        unsafe {
-            let mut destination = ArrayBuilder::new();
-
-            {
-                let (destination_iter, position) = destination.iter_position();
-
-                for (i, dst) in destination_iter.enumerate() {
-                    ptr::write(dst, f(i));
-
-                    *position += 1;
-                }
-            }
-
-            destination.into_inner()
-        }
-    }
-
-    #[doc(hidden)]
-    fn inverted_zip<B, U, F>(
-        self,
-        lhs: GenericArray<B, Self::Length>,
-        mut f: F,
-    ) -> MappedSequence<GenericArray<B, Self::Length>, B, U>
-    where
-        GenericArray<B, Self::Length>:
-            GenericSequence<B, Length = Self::Length> + MappedGenericSequence<B, U>,
-        Self: MappedGenericSequence<T, U>,
-        Self::Length: ArrayLength<B> + ArrayLength<U>,
-        F: FnMut(B, Self::Item) -> U,
-    {
-        unsafe {
-            let mut left = ArrayConsumer::new(lhs);
-            let mut right = ArrayConsumer::new(self);
-
-            let (left_array_iter, left_position) = left.iter_position();
-            let (right_array_iter, right_position) = right.iter_position();
-
-            FromIterator::from_iter(left_array_iter.zip(right_array_iter).map(|(l, r)| {
-                let left_value = ptr::read(l);
-                let right_value = ptr::read(r);
-
-                *left_position += 1;
-                *right_position += 1;
-
-                f(left_value, right_value)
-            }))
-        }
-    }
-
-    #[doc(hidden)]
-    fn inverted_zip2<B, Lhs, U, F>(self, lhs: Lhs, mut f: F) -> MappedSequence<Lhs, B, U>
-    where
-        Lhs: GenericSequence<B, Length = Self::Length> + MappedGenericSequence<B, U>,
-        Self: MappedGenericSequence<T, U>,
-        Self::Length: ArrayLength<B> + ArrayLength<U>,
-        F: FnMut(Lhs::Item, Self::Item) -> U,
-    {
-        unsafe {
-            let mut right = ArrayConsumer::new(self);
-
-            let (right_array_iter, right_position) = right.iter_position();
-
-            FromIterator::from_iter(
-                lhs.into_iter()
-                    .zip(right_array_iter)
-                    .map(|(left_value, r)| {
-                        let right_value = ptr::read(r);
-
-                        *right_position += 1;
-
-                        f(left_value, right_value)
-                    }),
-            )
-        }
-    }
-}
-
-unsafe impl<T, U, N> MappedGenericSequence<T, U> for GenericArray<T, N>
-where
-    N: ArrayLength<T> + ArrayLength<U>,
-    GenericArray<U, N>: GenericSequence<U, Length = N>,
-{
-    type Mapped = GenericArray<U, N>;
-}
-
-unsafe impl<T, N> FunctionalSequence<T> for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-    Self: GenericSequence<T, Item = T, Length = N>,
-{
-    fn map<U, F>(self, mut f: F) -> MappedSequence<Self, T, U>
-    where
-        Self::Length: ArrayLength<U>,
-        Self: MappedGenericSequence<T, U>,
-        F: FnMut(T) -> U,
-    {
-        unsafe {
-            let mut source = ArrayConsumer::new(self);
-
-            let (array_iter, position) = source.iter_position();
-
-            FromIterator::from_iter(array_iter.map(|src| {
-                let value = ptr::read(src);
-
-                *position += 1;
-
-                f(value)
-            }))
-        }
-    }
-
-    #[inline]
-    fn zip<B, Rhs, U, F>(self, rhs: Rhs, f: F) -> MappedSequence<Self, T, U>
-    where
-        Self: MappedGenericSequence<T, U>,
-        Rhs: MappedGenericSequence<B, U, Mapped = MappedSequence<Self, T, U>>,
-        Self::Length: ArrayLength<B> + ArrayLength<U>,
-        Rhs: GenericSequence<B, Length = Self::Length>,
-        F: FnMut(T, Rhs::Item) -> U,
-    {
-        rhs.inverted_zip(self, f)
-    }
-
-    fn fold<U, F>(self, init: U, mut f: F) -> U
-    where
-        F: FnMut(U, T) -> U,
-    {
-        unsafe {
-            let mut source = ArrayConsumer::new(self);
-
-            let (array_iter, position) = source.iter_position();
-
-            array_iter.fold(init, |acc, src| {
-                let value = ptr::read(src);
-
-                *position += 1;
-
-                f(acc, value)
-            })
-        }
-    }
-}
-
-impl<T, N> GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    /// Extracts a slice containing the entire array.
-    #[inline]
-    pub fn as_slice(&self) -> &[T] {
-        self.deref()
-    }
-
-    /// Extracts a mutable slice containing the entire array.
-    #[inline]
-    pub fn as_mut_slice(&mut self) -> &mut [T] {
-        self.deref_mut()
-    }
-
-    /// Converts slice to a generic array reference with inferred length;
-    ///
-    /// Length of the slice must be equal to the length of the array.
-    #[inline]
-    pub fn from_slice(slice: &[T]) -> &GenericArray<T, N> {
-        slice.into()
-    }
-
-    /// Converts mutable slice to a mutable generic array reference
-    ///
-    /// Length of the slice must be equal to the length of the array.
-    #[inline]
-    pub fn from_mut_slice(slice: &mut [T]) -> &mut GenericArray<T, N> {
-        slice.into()
-    }
-}
-
-impl<'a, T, N: ArrayLength<T>> From<&'a [T]> for &'a GenericArray<T, N> {
-    /// Converts slice to a generic array reference with inferred length;
-    ///
-    /// Length of the slice must be equal to the length of the array.
-    #[inline]
-    fn from(slice: &[T]) -> &GenericArray<T, N> {
-        assert_eq!(slice.len(), N::to_usize());
-
-        unsafe { &*(slice.as_ptr() as *const GenericArray<T, N>) }
-    }
-}
-
-impl<'a, T, N: ArrayLength<T>> From<&'a mut [T]> for &'a mut GenericArray<T, N> {
-    /// Converts mutable slice to a mutable generic array reference
-    ///
-    /// Length of the slice must be equal to the length of the array.
-    #[inline]
-    fn from(slice: &mut [T]) -> &mut GenericArray<T, N> {
-        assert_eq!(slice.len(), N::to_usize());
-
-        unsafe { &mut *(slice.as_mut_ptr() as *mut GenericArray<T, N>) }
-    }
-}
-
-impl<T: Clone, N> GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    /// Construct a `GenericArray` from a slice by cloning its content
-    ///
-    /// Length of the slice must be equal to the length of the array
-    #[inline]
-    pub fn clone_from_slice(list: &[T]) -> GenericArray<T, N> {
-        Self::from_exact_iter(list.iter().cloned())
-            .expect("Slice must be the same length as the array")
-    }
-}
-
-impl<T, N> GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-{
-    /// Creates a new `GenericArray` instance from an iterator with a known exact size.
-    ///
-    /// Returns `None` if the size is not equal to the number of elements in the `GenericArray`.
-    pub fn from_exact_iter<I>(iter: I) -> Option<Self>
-    where
-        I: IntoIterator<Item = T>,
-        <I as IntoIterator>::IntoIter: ExactSizeIterator,
-    {
-        let iter = iter.into_iter();
-
-        if iter.len() == N::to_usize() {
-            unsafe {
-                let mut destination = ArrayBuilder::new();
-
-                {
-                    let (destination_iter, position) = destination.iter_position();
-
-                    for (dst, src) in destination_iter.zip(iter.into_iter()) {
-                        ptr::write(dst, src);
-
-                        *position += 1;
-                    }
-                }
-
-                Some(destination.into_inner())
-            }
-        } else {
-            None
-        }
-    }
-}
-
-/// A reimplementation of the `transmute` function, avoiding problems
-/// when the compiler can't prove equal sizes.
-#[inline]
-#[doc(hidden)]
-pub unsafe fn transmute<A, B>(a: A) -> B {
-    let b = ::core::ptr::read(&a as *const A as *const B);
-    ::core::mem::forget(a);
-    b
-}
-
-#[cfg(test)]
-mod test {
-    // Compile with:
-    // cargo rustc --lib --profile test --release --
-    //      -C target-cpu=native -C opt-level=3 --emit asm
-    // and view the assembly to make sure test_assembly generates
-    // SIMD instructions instead of a niave loop.
-
-    #[inline(never)]
-    pub fn black_box<T>(val: T) -> T {
-        use core::{mem, ptr};
-
-        let ret = unsafe { ptr::read_volatile(&val) };
-        mem::forget(val);
-        ret
-    }
-
-    #[test]
-    fn test_assembly() {
-        use functional::*;
-
-        let a = black_box(arr![i32; 1, 3, 5, 7]);
-        let b = black_box(arr![i32; 2, 4, 6, 8]);
-
-        let c = (&a).zip(b, |l, r| l + r);
-
-        let d = a.fold(0, |a, x| a + x);
-
-        assert_eq!(c, arr![i32; 3, 7, 11, 15]);
-
-        assert_eq!(d, 16);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/sequence.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/sequence.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/src/sequence.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/src/sequence.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,320 +0,0 @@
-//! Useful traits for manipulating sequences of data stored in `GenericArray`s
-
-use super::*;
-use core::{mem, ptr};
-use core::ops::{Add, Sub};
-use typenum::operator_aliases::*;
-
-/// Defines some sequence with an associated length and iteration capabilities.
-///
-/// This is useful for passing N-length generic arrays as generics.
-pub unsafe trait GenericSequence<T>: Sized + IntoIterator {
-    /// `GenericArray` associated length
-    type Length: ArrayLength<T>;
-
-    /// Concrete sequence type used in conjuction with reference implementations of `GenericSequence`
-    type Sequence: GenericSequence<T, Length = Self::Length> + FromIterator<T>;
-
-    /// Initializes a new sequence instance using the given function.
-    ///
-    /// If the generator function panics while initializing the sequence,
-    /// any already initialized elements will be dropped.
-    fn generate<F>(f: F) -> Self::Sequence
-    where
-        F: FnMut(usize) -> T;
-
-    #[doc(hidden)]
-    fn inverted_zip<B, U, F>(
-        self,
-        lhs: GenericArray<B, Self::Length>,
-        mut f: F,
-    ) -> MappedSequence<GenericArray<B, Self::Length>, B, U>
-    where
-        GenericArray<B, Self::Length>: GenericSequence<B, Length = Self::Length>
-            + MappedGenericSequence<B, U>,
-        Self: MappedGenericSequence<T, U>,
-        Self::Length: ArrayLength<B> + ArrayLength<U>,
-        F: FnMut(B, Self::Item) -> U,
-    {
-        unsafe {
-            let mut left = ArrayConsumer::new(lhs);
-
-            let (left_array_iter, left_position) = left.iter_position();
-
-            FromIterator::from_iter(
-                left_array_iter
-                    .zip(self.into_iter())
-                    .map(|(l, right_value)| {
-                        let left_value = ptr::read(l);
-
-                        *left_position += 1;
-
-                        f(left_value, right_value)
-                    })
-            )
-        }
-    }
-
-    #[doc(hidden)]
-    fn inverted_zip2<B, Lhs, U, F>(self, lhs: Lhs, mut f: F) -> MappedSequence<Lhs, B, U>
-    where
-        Lhs: GenericSequence<B, Length = Self::Length> + MappedGenericSequence<B, U>,
-        Self: MappedGenericSequence<T, U>,
-        Self::Length: ArrayLength<B> + ArrayLength<U>,
-        F: FnMut(Lhs::Item, Self::Item) -> U,
-    {
-        FromIterator::from_iter(lhs.into_iter().zip(self.into_iter()).map(|(l, r)| f(l, r)))
-    }
-}
-
-/// Accessor for `GenericSequence` item type, which is really `IntoIterator::Item`
-///
-/// For deeply nested generic mapped sequence types, like shown in `tests/generics.rs`,
-/// this can be useful for keeping things organized.
-pub type SequenceItem<T> = <T as IntoIterator>::Item;
-
-unsafe impl<'a, T: 'a, S: GenericSequence<T>> GenericSequence<T> for &'a S
-where
-    &'a S: IntoIterator,
-{
-    type Length = S::Length;
-    type Sequence = S::Sequence;
-
-    #[inline]
-    fn generate<F>(f: F) -> Self::Sequence
-    where
-        F: FnMut(usize) -> T,
-    {
-        S::generate(f)
-    }
-}
-
-unsafe impl<'a, T: 'a, S: GenericSequence<T>> GenericSequence<T> for &'a mut S
-where
-    &'a mut S: IntoIterator,
-{
-    type Length = S::Length;
-    type Sequence = S::Sequence;
-
-    #[inline]
-    fn generate<F>(f: F) -> Self::Sequence
-    where
-        F: FnMut(usize) -> T,
-    {
-        S::generate(f)
-    }
-}
-
-/// Defines any `GenericSequence` which can be lengthened or extended by appending
-/// or prepending an element to it.
-///
-/// Any lengthened sequence can be shortened back to the original using `pop_front` or `pop_back`
-pub unsafe trait Lengthen<T>: Sized + GenericSequence<T> {
-    /// `GenericSequence` that has one more element than `Self`
-    type Longer: Shorten<T, Shorter = Self>;
-
-    /// Returns a new array with the given element appended to the end of it.
-    ///
-    /// Example:
-    ///
-    /// ```ignore
-    /// let a = arr![i32; 1, 2, 3];
-    ///
-    /// let b = a.append(4);
-    ///
-    /// assert_eq!(b, arr![i32; 1, 2, 3, 4]);
-    /// ```
-    fn append(self, last: T) -> Self::Longer;
-
-    /// Returns a new array with the given element prepended to the front of it.
-    ///
-    /// Example:
-    ///
-    /// ```ignore
-    /// let a = arr![i32; 1, 2, 3];
-    ///
-    /// let b = a.prepend(4);
-    ///
-    /// assert_eq!(b, arr![i32; 4, 1, 2, 3]);
-    /// ```
-    fn prepend(self, first: T) -> Self::Longer;
-}
-
-/// Defines a `GenericSequence` which can be shortened by removing the first or last element from it.
-///
-/// Additionally, any shortened sequence can be lengthened by
-/// appending or prepending an element to it.
-pub unsafe trait Shorten<T>: Sized + GenericSequence<T> {
-    /// `GenericSequence` that has one less element than `Self`
-    type Shorter: Lengthen<T, Longer = Self>;
-
-    /// Returns a new array without the last element, and the last element.
-    ///
-    /// Example:
-    ///
-    /// ```ignore
-    /// let a = arr![i32; 1, 2, 3, 4];
-    ///
-    /// let (init, last) = a.pop_back();
-    ///
-    /// assert_eq!(init, arr![i32; 1, 2, 3]);
-    /// assert_eq!(last, 4);
-    /// ```
-    fn pop_back(self) -> (Self::Shorter, T);
-
-    /// Returns a new array without the first element, and the first element.
-    /// Example:
-    ///
-    /// ```ignore
-    /// let a = arr![i32; 1, 2, 3, 4];
-    ///
-    /// let (head, tail) = a.pop_front();
-    ///
-    /// assert_eq!(head, 1);
-    /// assert_eq!(tail, arr![i32; 2, 3, 4]);
-    /// ```
-    fn pop_front(self) -> (T, Self::Shorter);
-}
-
-unsafe impl<T, N: ArrayLength<T>> Lengthen<T> for GenericArray<T, N>
-where
-    N: Add<B1>,
-    Add1<N>: ArrayLength<T>,
-    Add1<N>: Sub<B1, Output = N>,
-    Sub1<Add1<N>>: ArrayLength<T>,
-{
-    type Longer = GenericArray<T, Add1<N>>;
-
-    fn append(self, last: T) -> Self::Longer {
-        let mut longer: Self::Longer = unsafe { mem::uninitialized() };
-
-        unsafe {
-            ptr::write(longer.as_mut_ptr() as *mut _, self);
-            ptr::write(&mut longer[N::to_usize()], last);
-        }
-
-        longer
-    }
-
-    fn prepend(self, first: T) -> Self::Longer {
-        let mut longer: Self::Longer = unsafe { mem::uninitialized() };
-
-        let longer_ptr = longer.as_mut_ptr();
-
-        unsafe {
-            ptr::write(longer_ptr as *mut _, first);
-            ptr::write(longer_ptr.offset(1) as *mut _, self);
-        }
-
-        longer
-    }
-}
-
-unsafe impl<T, N: ArrayLength<T>> Shorten<T> for GenericArray<T, N>
-where
-    N: Sub<B1>,
-    Sub1<N>: ArrayLength<T>,
-    Sub1<N>: Add<B1, Output = N>,
-    Add1<Sub1<N>>: ArrayLength<T>,
-{
-    type Shorter = GenericArray<T, Sub1<N>>;
-
-    fn pop_back(self) -> (Self::Shorter, T) {
-        let init_ptr = self.as_ptr();
-        let last_ptr = unsafe { init_ptr.offset(Sub1::<N>::to_usize() as isize) };
-
-        let init = unsafe { ptr::read(init_ptr as _) };
-        let last = unsafe { ptr::read(last_ptr as _) };
-
-        mem::forget(self);
-
-        (init, last)
-    }
-
-    fn pop_front(self) -> (T, Self::Shorter) {
-        let head_ptr = self.as_ptr();
-        let tail_ptr = unsafe { head_ptr.offset(1) };
-
-        let head = unsafe { ptr::read(head_ptr as _) };
-        let tail = unsafe { ptr::read(tail_ptr as _) };
-
-        mem::forget(self);
-
-        (head, tail)
-    }
-}
-
-/// Defines a `GenericSequence` that can be split into two parts at a given pivot index.
-pub unsafe trait Split<T, K>: GenericSequence<T>
-where
-    K: ArrayLength<T>,
-{
-    /// First part of the resulting split array
-    type First: GenericSequence<T>;
-    /// Second part of the resulting split array
-    type Second: GenericSequence<T>;
-
-    /// Splits an array at the given index, returning the separate parts of the array.
-    fn split(self) -> (Self::First, Self::Second);
-}
-
-unsafe impl<T, N, K> Split<T, K> for GenericArray<T, N>
-where
-    N: ArrayLength<T>,
-    K: ArrayLength<T>,
-    N: Sub<K>,
-    Diff<N, K>: ArrayLength<T>,
-{
-    type First = GenericArray<T, K>;
-    type Second = GenericArray<T, Diff<N, K>>;
-
-    fn split(self) -> (Self::First, Self::Second) {
-        let head_ptr = self.as_ptr();
-        let tail_ptr = unsafe { head_ptr.offset(K::to_usize() as isize) };
-
-        let head = unsafe { ptr::read(head_ptr as _) };
-        let tail = unsafe { ptr::read(tail_ptr as _) };
-
-        mem::forget(self);
-
-        (head, tail)
-    }
-}
-
-/// Defines `GenericSequence`s which can be joined together, forming a larger array.
-pub unsafe trait Concat<T, M>: GenericSequence<T>
-where
-    M: ArrayLength<T>,
-{
-    /// Sequence to be concatenated with `self`
-    type Rest: GenericSequence<T, Length = M>;
-
-    /// Resulting sequence formed by the concatenation.
-    type Output: GenericSequence<T>;
-
-    /// Concatenate, or join, two sequences.
-    fn concat(self, rest: Self::Rest) -> Self::Output;
-}
-
-unsafe impl<T, N, M> Concat<T, M> for GenericArray<T, N>
-where
-    N: ArrayLength<T> + Add<M>,
-    M: ArrayLength<T>,
-    Sum<N, M>: ArrayLength<T>,
-{
-    type Rest = GenericArray<T, M>;
-    type Output = GenericArray<T, Sum<N, M>>;
-
-    fn concat(self, rest: Self::Rest) -> Self::Output {
-        let mut output: Self::Output = unsafe { mem::uninitialized() };
-
-        let output_ptr = output.as_mut_ptr();
-
-        unsafe {
-            ptr::write(output_ptr as *mut _, self);
-            ptr::write(output_ptr.offset(N::to_usize() as isize) as *mut _, rest);
-        }
-
-        output
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/arr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/arr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/arr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/arr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#[macro_use]
-extern crate generic_array;
-extern crate typenum;
-
-#[test]
-fn empty_without_trailing_comma() {
-    let ar = arr![u8; ];
-    assert_eq!(format!("{:x}", ar), "");
-}
-
-#[test]
-fn empty_with_trailing_comma() {
-    let ar = arr![u8; , ];
-    assert_eq!(format!("{:x}", ar), "");
-}
-
-#[test]
-fn without_trailing_comma() {
-    let ar = arr![u8; 10, 20, 30];
-    assert_eq!(format!("{:x}", ar), "0a141e");
-}
-
-#[test]
-fn with_trailing_comma() {
-    let ar = arr![u8; 10, 20, 30, ];
-    assert_eq!(format!("{:x}", ar), "0a141e");
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/generics.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/generics.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/generics.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/generics.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-#![recursion_limit = "128"]
-
-#[macro_use]
-extern crate generic_array;
-
-use generic_array::typenum::consts::U4;
-
-use std::fmt::Debug;
-use std::ops::Add;
-
-use generic_array::{GenericArray, ArrayLength};
-use generic_array::sequence::*;
-use generic_array::functional::*;
-
-/// Example function using generics to pass N-length sequences and map them
-pub fn generic_map<S>(s: S)
-where
-    S: FunctionalSequence<i32>,            // `.map`
-    S::Item: Add<i32, Output = i32>,       // `x + 1`
-    S: MappedGenericSequence<i32, i32>,    // `i32` -> `i32`
-    MappedSequence<S, i32, i32>: Debug,    // println!
-{
-    let a = s.map(|x| x + 1);
-
-    println!("{:?}", a);
-}
-
-/// Complex example function using generics to pass N-length sequences, zip them, and then map that result.
-///
-/// If used with `GenericArray` specifically this isn't necessary
-pub fn generic_sequence_zip_sum<A, B>(a: A, b: B) -> i32
-where
-    A: FunctionalSequence<i32>,                                                                 // `.zip`
-    B: FunctionalSequence<i32, Length = A::Length>,                                             // `.zip`
-    A: MappedGenericSequence<i32, i32>,                                                         // `i32` -> `i32`
-    B: MappedGenericSequence<i32, i32, Mapped = MappedSequence<A, i32, i32>>,                   // `i32` -> `i32`, prove A and B can map to the same output
-    A::Item: Add<B::Item, Output = i32>,                                                        // `l + r`
-    MappedSequence<A, i32, i32>: MappedGenericSequence<i32, i32> + FunctionalSequence<i32>,     // `.map`
-    SequenceItem<MappedSequence<A, i32, i32>>: Add<i32, Output=i32>,                            // `x + 1`
-    MappedSequence<MappedSequence<A, i32, i32>, i32, i32>: Debug,                               // `println!`
-    MappedSequence<MappedSequence<A, i32, i32>, i32, i32>: FunctionalSequence<i32>,             // `.fold`
-    SequenceItem<MappedSequence<MappedSequence<A, i32, i32>, i32, i32>>: Add<i32, Output=i32>   // `x + a`, note the order
-{
-    let c = a.zip(b, |l, r| l + r).map(|x| x + 1);
-
-    println!("{:?}", c);
-
-    c.fold(0, |a, x| x + a)
-}
-
-/// Super-simple fixed-length i32 `GenericArray`s
-pub fn generic_array_plain_zip_sum(a: GenericArray<i32, U4>, b: GenericArray<i32, U4>) -> i32 {
-    a.zip(b, |l, r| l + r).map(|x| x + 1).fold(0, |a, x| x + a)
-}
-
-pub fn generic_array_variable_length_zip_sum<N>(a: GenericArray<i32, N>, b: GenericArray<i32, N>) -> i32
-where
-    N: ArrayLength<i32>,
-{
-    a.zip(b, |l, r| l + r).map(|x| x + 1).fold(0, |a, x| x + a)
-}
-
-pub fn generic_array_same_type_variable_length_zip_sum<T, N>(a: GenericArray<T, N>, b: GenericArray<T, N>) -> i32
-where
-    N: ArrayLength<T> + ArrayLength<<T as Add<T>>::Output>,
-    T: Add<T, Output=i32>,
-{
-    a.zip(b, |l, r| l + r).map(|x| x + 1).fold(0, |a, x| x + a)
-}
-
-/// Complex example using fully generic `GenericArray`s with the same length.
-///
-/// It's mostly just the repeated `Add` traits, which would be present in other systems anyway.
-pub fn generic_array_zip_sum<A, B, N: ArrayLength<A> + ArrayLength<B>>(a: GenericArray<A, N>, b: GenericArray<B, N>) -> i32
-where
-    A: Add<B>,
-    N: ArrayLength<<A as Add<B>>::Output> +
-        ArrayLength<<<A as Add<B>>::Output as Add<i32>>::Output>,
-    <A as Add<B>>::Output: Add<i32>,
-    <<A as Add<B>>::Output as Add<i32>>::Output: Add<i32, Output=i32>,
-{
-    a.zip(b, |l, r| l + r).map(|x| x + 1).fold(0, |a, x| x + a)
-}
-
-#[test]
-fn test_generics() {
-    generic_map(arr![i32; 1, 2, 3, 4]);
-
-    assert_eq!(generic_sequence_zip_sum(arr![i32; 1, 2, 3, 4], arr![i32; 2, 3, 4, 5]), 28);
-
-    assert_eq!(generic_array_plain_zip_sum(arr![i32; 1, 2, 3, 4], arr![i32; 2, 3, 4, 5]), 28);
-
-    assert_eq!(generic_array_variable_length_zip_sum(arr![i32; 1, 2, 3, 4], arr![i32; 2, 3, 4, 5]), 28);
-
-    assert_eq!(generic_array_same_type_variable_length_zip_sum(arr![i32; 1, 2, 3, 4], arr![i32; 2, 3, 4, 5]), 28);
-
-    assert_eq!(generic_array_zip_sum(arr![i32; 1, 2, 3, 4], arr![i32; 2, 3, 4, 5]), 28);
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/hex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/hex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/hex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/hex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-#[macro_use]
-extern crate generic_array;
-extern crate typenum;
-
-use generic_array::GenericArray;
-use std::str::from_utf8;
-use typenum::U2048;
-
-#[test]
-fn short_lower_hex() {
-    let ar = arr![u8; 10, 20, 30];
-    assert_eq!(format!("{:x}", ar), "0a141e");
-}
-
-#[test]
-fn short_upper_hex() {
-    let ar = arr![u8; 30, 20, 10];
-    assert_eq!(format!("{:X}", ar), "1E140A");
-}
-
-#[test]
-fn long_lower_hex() {
-    let ar = GenericArray::<u8, U2048>::default();
-    assert_eq!(format!("{:x}", ar), from_utf8(&[b'0'; 4096]).unwrap());
-}
-
-#[test]
-fn long_lower_hex_truncated() {
-    let ar = GenericArray::<u8, U2048>::default();
-    assert_eq!(format!("{:.3001x}", ar), from_utf8(&[b'0'; 3001]).unwrap());
-}
-
-#[test]
-fn long_upper_hex() {
-    let ar = GenericArray::<u8, U2048>::default();
-    assert_eq!(format!("{:X}", ar), from_utf8(&[b'0'; 4096]).unwrap());
-}
-
-#[test]
-fn long_upper_hex_truncated() {
-    let ar = GenericArray::<u8, U2048>::default();
-    assert_eq!(format!("{:.2777X}", ar), from_utf8(&[b'0'; 2777]).unwrap());
-}
-
-#[test]
-fn truncated_lower_hex() {
-    let ar = arr![u8; 10, 20, 30, 40, 50];
-    assert_eq!(format!("{:.2x}", ar), "0a");
-    assert_eq!(format!("{:.3x}", ar), "0a1");
-    assert_eq!(format!("{:.4x}", ar), "0a14");
-}
-
-#[test]
-fn truncated_upper_hex() {
-    let ar = arr![u8; 30, 20, 10, 17, 0];
-    assert_eq!(format!("{:.4X}", ar), "1E14");
-    assert_eq!(format!("{:.5X}", ar), "1E140");
-    assert_eq!(format!("{:.6X}", ar), "1E140A");
-    assert_eq!(format!("{:.7X}", ar), "1E140A1");
-    assert_eq!(format!("{:.8X}", ar), "1E140A11");
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/import_name.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/import_name.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/import_name.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/import_name.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#[macro_use]
-extern crate generic_array as gen_arr;
-
-use gen_arr::typenum;
-
-#[test]
-fn test_different_crate_name() {
-    let _: gen_arr::GenericArray<u32, typenum::U4> = arr![u32; 0, 1, 2, 3];
-    let _: gen_arr::GenericArray<u32, typenum::U0> = arr![u32;];
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/iter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-#[macro_use]
-extern crate generic_array;
-
-use std::cell::Cell;
-use std::ops::Drop;
-
-use generic_array::GenericArray;
-use generic_array::typenum::consts::U5;
-
-#[test]
-fn test_into_iter_as_slice() {
-    let array = arr![char; 'a', 'b', 'c'];
-    let mut into_iter = array.into_iter();
-    assert_eq!(into_iter.as_slice(), &['a', 'b', 'c']);
-    let _ = into_iter.next().unwrap();
-    assert_eq!(into_iter.as_slice(), &['b', 'c']);
-    let _ = into_iter.next().unwrap();
-    let _ = into_iter.next().unwrap();
-    assert_eq!(into_iter.as_slice(), &[]);
-}
-
-#[test]
-fn test_into_iter_as_mut_slice() {
-    let array = arr![char; 'a', 'b', 'c'];
-    let mut into_iter = array.into_iter();
-    assert_eq!(into_iter.as_slice(), &['a', 'b', 'c']);
-    into_iter.as_mut_slice()[0] = 'x';
-    into_iter.as_mut_slice()[1] = 'y';
-    assert_eq!(into_iter.next().unwrap(), 'x');
-    assert_eq!(into_iter.as_slice(), &['y', 'c']);
-}
-
-#[test]
-fn test_into_iter_debug() {
-    let array = arr![char; 'a', 'b', 'c'];
-    let into_iter = array.into_iter();
-    let debug = format!("{:?}", into_iter);
-    assert_eq!(debug, "GenericArrayIter(['a', 'b', 'c'])");
-}
-
-#[test]
-fn test_into_iter_clone() {
-    fn iter_equal<I: Iterator<Item = i32>>(it: I, slice: &[i32]) {
-        let v: Vec<i32> = it.collect();
-        assert_eq!(&v[..], slice);
-    }
-    let mut it = arr![i32; 1, 2, 3].into_iter();
-    iter_equal(it.clone(), &[1, 2, 3]);
-    assert_eq!(it.next(), Some(1));
-    let mut it = it.rev();
-    iter_equal(it.clone(), &[3, 2]);
-    assert_eq!(it.next(), Some(3));
-    iter_equal(it.clone(), &[2]);
-    assert_eq!(it.next(), Some(2));
-    iter_equal(it.clone(), &[]);
-    assert_eq!(it.next(), None);
-}
-
-#[test]
-fn test_into_iter_nth() {
-    let v = arr![i32; 0, 1, 2, 3, 4];
-    for i in 0..v.len() {
-        assert_eq!(v.clone().into_iter().nth(i).unwrap(), v[i]);
-    }
-    assert_eq!(v.clone().into_iter().nth(v.len()), None);
-
-    let mut iter = v.into_iter();
-    assert_eq!(iter.nth(2).unwrap(), v[2]);
-    assert_eq!(iter.nth(1).unwrap(), v[4]);
-}
-
-#[test]
-fn test_into_iter_last() {
-    let v = arr![i32; 0, 1, 2, 3, 4];
-    assert_eq!(v.into_iter().last().unwrap(), 4);
-    assert_eq!(arr![i32; 0].into_iter().last().unwrap(), 0);
-}
-
-#[test]
-fn test_into_iter_count() {
-    let v = arr![i32; 0, 1, 2, 3, 4];
-    assert_eq!(v.clone().into_iter().count(), 5);
-
-    let mut iter2 = v.into_iter();
-    iter2.next();
-    iter2.next();
-    assert_eq!(iter2.count(), 3);
-}
-
-#[test]
-fn test_into_iter_flat_map() {
-    assert!((0..5).flat_map(|i| arr![i32; 2 * i, 2 * i + 1]).eq(0..10));
-}
-
-#[test]
-fn test_into_iter_drops() {
-    struct R<'a> {
-       i: &'a Cell<usize>,
-    }
-
-    impl<'a> Drop for R<'a> {
-       fn drop(&mut self) {
-            self.i.set(self.i.get() + 1);
-        }
-    }
-
-    fn r(i: &Cell<usize>) -> R {
-        R {
-            i: i
-        }
-    }
-
-    fn v(i: &Cell<usize>) -> GenericArray<R, U5> {
-        arr![R; r(i), r(i), r(i), r(i), r(i)]
-    }
-
-    let i = Cell::new(0);
-    {
-        v(&i).into_iter();
-    }
-    assert_eq!(i.get(), 5);
-
-    let i = Cell::new(0);
-    {
-        let mut iter = v(&i).into_iter();
-        let _x = iter.next();
-        assert_eq!(i.get(), 0);
-        assert_eq!(iter.count(), 4);
-        assert_eq!(i.get(), 4);
-    }
-    assert_eq!(i.get(), 5);
-
-    let i = Cell::new(0);
-    {
-        let mut iter = v(&i).into_iter();
-        let _x = iter.nth(2);
-        assert_eq!(i.get(), 2);
-        let _y = iter.last();
-        assert_eq!(i.get(), 3);
-    }
-    assert_eq!(i.get(), 5);
-
-    let i = Cell::new(0);
-    for (index, _x) in v(&i).into_iter().enumerate() {
-        assert_eq!(i.get(), index);
-    }
-    assert_eq!(i.get(), 5);
-
-    let i = Cell::new(0);
-    for (index, _x) in v(&i).into_iter().rev().enumerate() {
-        assert_eq!(i.get(), index);
-    }
-    assert_eq!(i.get(), 5);
-}
-
-/*
-//TODO: Cover this
-#[allow(dead_code)]
-fn assert_covariance() {
-    fn into_iter<'new>(i: GenericArrayIter<&'static str, U10>) -> GenericArrayIter<&'new str, U10> {
-        i
-    }
-}
-*/
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/generic-array-0.12.3/tests/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/generic-array-0.12.3/tests/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,287 +0,0 @@
-#![recursion_limit = "128"]
-#![no_std]
-#[macro_use]
-extern crate generic_array;
-use core::cell::Cell;
-use core::ops::{Add, Drop};
-use generic_array::GenericArray;
-use generic_array::functional::*;
-use generic_array::sequence::*;
-use generic_array::typenum::{U1, U3, U4, U97};
-
-#[test]
-fn test() {
-    let mut list97 = [0; 97];
-    for i in 0..97 {
-        list97[i] = i as i32;
-    }
-    let l: GenericArray<i32, U97> = GenericArray::clone_from_slice(&list97);
-    assert_eq!(l[0], 0);
-    assert_eq!(l[1], 1);
-    assert_eq!(l[32], 32);
-    assert_eq!(l[56], 56);
-}
-
-#[test]
-fn test_drop() {
-    #[derive(Clone)]
-    struct TestDrop<'a>(&'a Cell<u32>);
-
-    impl<'a> Drop for TestDrop<'a> {
-        fn drop(&mut self) {
-            self.0.set(self.0.get() + 1);
-        }
-    }
-
-    let drop_counter = Cell::new(0);
-    {
-        let _: GenericArray<TestDrop, U3> = arr![TestDrop; TestDrop(&drop_counter),
-                           TestDrop(&drop_counter),
-                           TestDrop(&drop_counter)];
-    }
-    assert_eq!(drop_counter.get(), 3);
-}
-
-#[test]
-fn test_arr() {
-    let test: GenericArray<u32, U3> = arr![u32; 1, 2, 3];
-    assert_eq!(test[1], 2);
-}
-
-#[test]
-fn test_copy() {
-    let test = arr![u32; 1, 2, 3];
-    let test2 = test;
-    // if GenericArray is not copy, this should fail as a use of a moved value
-    assert_eq!(test[1], 2);
-    assert_eq!(test2[0], 1);
-}
-
-#[derive(Debug, PartialEq, Eq)]
-struct NoClone<T>(T);
-
-#[test]
-fn test_from_slice() {
-    let arr = [1, 2, 3, 4];
-    let gen_arr = GenericArray::<_, U3>::from_slice(&arr[..3]);
-    assert_eq!(&arr[..3], gen_arr.as_slice());
-    let arr = [NoClone(1u32), NoClone(2), NoClone(3), NoClone(4)];
-    let gen_arr = GenericArray::<_, U3>::from_slice(&arr[..3]);
-    assert_eq!(&arr[..3], gen_arr.as_slice());
-}
-
-#[test]
-fn test_from_mut_slice() {
-    let mut arr = [1, 2, 3, 4];
-    {
-        let gen_arr = GenericArray::<_, U3>::from_mut_slice(&mut arr[..3]);
-        gen_arr[2] = 10;
-    }
-    assert_eq!(arr, [1, 2, 10, 4]);
-    let mut arr = [NoClone(1u32), NoClone(2), NoClone(3), NoClone(4)];
-    {
-        let gen_arr = GenericArray::<_, U3>::from_mut_slice(&mut arr[..3]);
-        gen_arr[2] = NoClone(10);
-    }
-    assert_eq!(arr, [NoClone(1), NoClone(2), NoClone(10), NoClone(4)]);
-}
-
-#[test]
-fn test_default() {
-    let arr = GenericArray::<u8, U1>::default();
-    assert_eq!(arr[0], 0);
-}
-
-#[test]
-fn test_from() {
-    let data = [(1, 2, 3), (4, 5, 6), (7, 8, 9)];
-    let garray: GenericArray<(usize, usize, usize), U3> = data.into();
-    assert_eq!(&data, garray.as_slice());
-}
-
-#[test]
-fn test_unit_macro() {
-    let arr = arr![f32; 3.14];
-    assert_eq!(arr[0], 3.14);
-}
-
-#[test]
-fn test_empty_macro() {
-    let _arr = arr![f32;];
-}
-
-#[test]
-fn test_cmp() {
-    arr![u8; 0x00].cmp(&arr![u8; 0x00]);
-}
-
-/// This test should cause a helpful compile error if uncommented.
-// #[test]
-// fn test_empty_macro2(){
-//     let arr = arr![];
-// }
-#[cfg(feature = "serde")]
-mod impl_serde {
-    extern crate serde_json;
-
-    use generic_array::GenericArray;
-    use generic_array::typenum::U6;
-
-    #[test]
-    fn test_serde_implementation() {
-        let array: GenericArray<f64, U6> = arr![f64; 0.0, 5.0, 3.0, 7.07192, 76.0, -9.0];
-        let string = serde_json::to_string(&array).unwrap();
-        assert_eq!(string, "[0.0,5.0,3.0,7.07192,76.0,-9.0]");
-
-        let test_array: GenericArray<f64, U6> = serde_json::from_str(&string).unwrap();
-        assert_eq!(test_array, array);
-    }
-}
-
-#[test]
-fn test_map() {
-    let b: GenericArray<i32, U4> = GenericArray::generate(|i| i as i32 * 4).map(|x| x - 3);
-
-    assert_eq!(b, arr![i32; -3, 1, 5, 9]);
-}
-
-#[test]
-fn test_zip() {
-    let a: GenericArray<_, U4> = GenericArray::generate(|i| i + 1);
-    let b: GenericArray<_, U4> = GenericArray::generate(|i| i as i32 * 4);
-
-    // Uses reference and non-reference arguments
-    let c = (&a).zip(b, |r, l| *r as i32 + l);
-
-    assert_eq!(c, arr![i32; 1, 6, 11, 16]);
-}
-
-#[test]
-#[should_panic]
-fn test_from_iter_short() {
-    use core::iter::repeat;
-
-    let a: GenericArray<_, U4> = repeat(11).take(3).collect();
-
-    assert_eq!(a, arr![i32; 11, 11, 11, 0]);
-}
-
-#[test]
-fn test_from_iter() {
-    use core::iter::{once, repeat};
-
-    let a: GenericArray<_, U4> = repeat(11).take(3).chain(once(0)).collect();
-
-    assert_eq!(a, arr![i32; 11, 11, 11, 0]);
-}
-
-#[test]
-fn test_sizes() {
-    #![allow(dead_code)]
-    use core::mem::{size_of, size_of_val};
-
-    #[derive(Debug, Copy, Clone)]
-    #[repr(C)]
-    #[repr(packed)]
-    struct Test {
-        t: u16,
-        s: u32,
-        r: u16,
-        f: u16,
-        o: u32,
-    }
-
-    assert_eq!(size_of::<Test>(), 14);
-
-    assert_eq!(size_of_val(&arr![u8; 1, 2, 3]), size_of::<u8>() * 3);
-    assert_eq!(size_of_val(&arr![u32; 1]), size_of::<u32>() * 1);
-    assert_eq!(size_of_val(&arr![u64; 1, 2, 3, 4]), size_of::<u64>() * 4);
-
-    assert_eq!(size_of::<GenericArray<Test, U97>>(), size_of::<Test>() * 97);
-}
-
-#[test]
-fn test_append() {
-    let a = arr![i32; 1, 2, 3];
-
-    let b = a.append(4);
-
-    assert_eq!(b, arr![i32; 1, 2, 3, 4]);
-}
-
-#[test]
-fn test_prepend() {
-    let a = arr![i32; 1, 2, 3];
-
-    let b = a.prepend(4);
-
-    assert_eq!(b, arr![i32; 4, 1, 2, 3]);
-}
-
-#[test]
-fn test_pop() {
-    let a = arr![i32; 1, 2, 3, 4];
-
-    let (init, last) = a.pop_back();
-
-    assert_eq!(init, arr![i32; 1, 2, 3]);
-    assert_eq!(last, 4);
-
-    let (head, tail) = a.pop_front();
-
-    assert_eq!(head, 1);
-    assert_eq!(tail, arr![i32; 2, 3, 4]);
-}
-
-#[test]
-fn test_split() {
-    let a = arr![i32; 1, 2, 3, 4];
-
-    let (b, c) = a.split();
-
-    assert_eq!(b, arr![i32; 1]);
-    assert_eq!(c, arr![i32; 2, 3, 4]);
-
-    let (e, f) = a.split();
-
-    assert_eq!(e, arr![i32; 1, 2]);
-    assert_eq!(f, arr![i32; 3, 4]);
-}
-
-#[test]
-fn test_concat() {
-    let a = arr![i32; 1, 2];
-    let b = arr![i32; 3, 4];
-
-    let c = a.concat(b);
-
-    assert_eq!(c, arr![i32; 1, 2, 3, 4]);
-
-    let (d, e) = c.split();
-
-    assert_eq!(d, arr![i32; 1]);
-    assert_eq!(e, arr![i32; 2, 3, 4]);
-}
-
-#[test]
-fn test_fold() {
-    let a = arr![i32; 1, 2, 3, 4];
-
-    assert_eq!(10, a.fold(0, |a, x| a + x));
-}
-
-fn sum_generic<S>(s: S) -> i32
-where
-    S: FunctionalSequence<i32>,
-    S::Item: Add<i32, Output = i32>, // `+`
-    i32: Add<S::Item, Output = i32>, // reflexive
-{
-    s.fold(0, |a, x| a + x)
-}
-
-#[test]
-fn test_sum() {
-    let a = sum_generic(arr![i32; 1, 2, 3, 4]);
-
-    assert_eq!(a, 10);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/benches/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/benches/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/benches/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/benches/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,4 @@
 #![feature(test)]
-extern crate getrandom;
 extern crate test;
 
 #[bench]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#![deny(warnings)]
-
-use std::env;
-
-fn main() {
-    let target = env::var("TARGET").expect("TARGET was not set");
-    if target.contains("-uwp-windows-") {
-        // for BCryptGenRandom
-        println!("cargo:rustc-link-lib=bcrypt");
-        // to work around unavailability of `target_vendor` on Rust 1.33
-        println!("cargo:rustc-cfg=getrandom_uwp");
-    } else if target.contains("windows") {
-        // for RtlGenRandom (aka SystemFunction036)
-        println!("cargo:rustc-link-lib=advapi32");
-    } else if target.contains("apple-ios") {
-        // for SecRandomCopyBytes and kSecRandomDefault
-        println!("cargo:rustc-link-lib=framework=Security");
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"eb2a93461fc4d8d63285b28aeaa2150c83fa5aaed0e3781444897fd6cec8cda7","Cargo.toml":"094e204a634c5d94e5fad71f22da3c2bc03474a65e674a2a0363dcc55f339d7a","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"434a2c0978ade0a0c1d24b72a23952243358982b34ebb3a52f9ae41dac18a6ae","benches/mod.rs":"eae05a2128105062d27090af25e5c35ac2cf422115e335582f13c5127c3507b4","build.rs":"9000429ff834eb551f6e3800414cd8d339a6e45ea96c751aa465e204c673357d","src/bsd_arandom.rs":"4f90c31eb72046ad8181c5cee217d38a3c964e601fcf02e57bb97453f4d4023b","src/cloudabi.rs":"cd493b696ab968113d46b3b38cff52ecd89e79228640802ba523452932183d2b","src/dummy.rs":"184e81035f38a5edd3e7f3ed9ea0d3e4dc462ca5d224fad11cb660412dcd9198","src/error.rs":"1673d24e1fae25553c4317a3a093c1f76bee494644b4c8f5b96e56dfbd2dd56e","src/error_impls.rs":"e8a33ce04a71c588d88776dcd895446da9526f3843ae72ed438c65ac386e87da","src/fuchsia.rs":"470d8509deb5b06fa6417f294c0a49e0e35a580249a5d8944c3be5aa746f64ea","src/ios.rs":"e88214b6077eb75e471b388d57f952a9af8f6f0e514df5c6e655d6c22384313d","src/lib.rs":"88ca49c455552efc817adf372966141fd614f250a939d91d47a193bb6153c822","src/linux_android.rs":"b7975157fa1b28f4eb3dabf3ca28e055f974fcc391163cf4c9e5c8123fabc1e1","src/macos.rs":"757ddafd8645ad382fb041f2db3735f4da4ea174f87892411de63a208b3db619","src/openbsd.rs":"c77acddffa3287dc7f82d13a4650a8ac8ef991ee882f71650ebbc76f9df431f6","src/rdrand.rs":"c3435e63b9d54d3423b2d31f7cb605901b795a4e982cd50b2428b1dc6de580b4","src/solaris_illumos.rs":"e3323277622d35d8a544879cabc539f9a684e799007861b824a1cba09285be13","src/use_file.rs":"7aa9391f35fb04a5af4d74aa0a810a6a5962b382e342fc9fa9b922560bddd5f6","src/util.rs":"8b891961a22be402cb967f9df8b46159c0506634b9b537067af96dd2893ebd7d","src/util_libc.rs":"3b2e0cc899501df8bd05c3550aad7fe04b31cbaa1918fa803b3434517f6e5268","src/vxworks.rs":"e5159caf5ae2521c977f5e824e3a580e2440f182deae2433f74e37a8ac01bc8d","src/wasi.rs":"3413e5a391b156f5d05600f4651f7f8eb4df2c8984fca7766ca50c0cfe0b2e9c","src/wasm32_bindgen.rs":"b8a12c8b29eba64d5b8b642d883390bd18e79cfc2e6412f97ba34b2168288604","src/wasm32_stdweb.rs":"274e1a6b12b4812008e1bac36b2468e8b6e02a9d7e95954b860a1a3c64f6f7a8","src/windows.rs":"f568b343e6bfbdc158ebc4728baa1c1c08d55417657b940540d9df279f9536d9","src/windows_uwp.rs":"9d8d98fd55f8b1e0ca5b80da318d1238cd376b552731c8605dc4a30ea2f34874","tests/common.rs":"2be3a0abf4ecd74b1bafee22e032a14582c1cd3da041fa1ed37bbc393dac312e"},"package":"fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"a5ca6f574cdebae19812ab3611fe3792ccf16110182f2197266b3d33463e95bd","Cargo.toml":"0fbc2c0f8dea9ef69c9f134780bd24c44b12993c22508d15046f378a345562b8","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"7ae74633326a22fd6298d7f209fb14884277bd98049795f444945acbb2b0dfbd","benches/mod.rs":"5495735ff210a50cab23c2cc84191ed910af7c30395a3d9d6095b722765b3864","src/bsd_arandom.rs":"d2ee195acd80c7d1364a369ad0d2dad46f5f9f973f9d3960367413fd87acfcd6","src/custom.rs":"f1a8cc64f76ab5d2b410996aaacbfc1aaab65c6a6a59130f9a2bf8957da4c365","src/dragonfly.rs":"28f3f7ac4f093dfb6cd2c8e7e0714f16d0f03f8c658e56caa8fe9bd03b1ff39b","src/error.rs":"500086cc256541ab10b019f34562630a461e2ad4330436a9709ff52d28a0819e","src/error_impls.rs":"9c34832ebb99cd5e31bc5c8ffc5beb5b3fa6f7ff0226aaa1cdf8e10e6d64b324","src/fuchsia.rs":"470d8509deb5b06fa6417f294c0a49e0e35a580249a5d8944c3be5aa746f64ea","src/ios.rs":"cc46ee9c48ab746d2af342a242e383b8de840045d3f52fd77ee337161367a1a1","src/js.rs":"71bca458fd1c1505b5191b7443ef2caa15dd76b37ac1747ee4d9c9a55c850ea0","src/lib.rs":"fc8c7aa3b234c6418595577ca74e7f40c66f6106963065e9e512e297e19b152a","src/linux_android.rs":"39cb80999c8534145240a350976d261b8924436bf9a4563960c7bd8c2c83c773","src/macos.rs":"b692f2fcc2319a5195f47751d5bd7dd87c7c24a61d14fa4e3dbc992ae66212b7","src/openbsd.rs":"066b2dd395c190444a658bb0b52a052eabbd68ea5a534fb729c7e5373abc0a6a","src/rdrand.rs":"79d23183b1905d61bd9df9729dc798505a2ed750d3339e342ab144e1709827e4","src/solaris_illumos.rs":"9c7004446fabe5a7a21c73d5a65d7e2115b5bd1d1dbb735c984cab3dba239785","src/use_file.rs":"c9fe635a83614be6f303e40f98b8e678c36ac6d9724b024430d3ea1ad1510add","src/util.rs":"da6964dc1523f1cb8d26365fa6a8ece46360587e6974931624b271f0c72cda8b","src/util_libc.rs":"d851394bc9c43dc09afde1e03401aa6c207858ec58fdffbc5131911b116418c7","src/vxworks.rs":"a5aa0e40f890e0f35626458bb656a3340b8af3111e4bacd2e12505a8d50a3505","src/wasi.rs":"3413e5a391b156f5d05600f4651f7f8eb4df2c8984fca7766ca50c0cfe0b2e9c","src/windows.rs":"e3c8f033d5d2a6b8abc5c92b005232f5aca8ce941bd94964a0f58f2436af9990","tests/common/mod.rs":"b6beee8f535d2d094a65711fe0af91a6fc220aa09729ed7269fe33cafdc9177f","tests/custom.rs":"9f2c0193193f6bcf641116ca0b3653b33d2015e0e98ce107ee1d1f60c5eeae3a","tests/normal.rs":"9e1c4b1e468a09ed0225370dfb6608f8b8135e0fabb09bbc1a718105164aade6","tests/rdrand.rs":"4474ccebf9d33c89288862a7e367018405968dddc55c7c6f97e21b5fe2264601"},"package":"7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,16 +13,19 @@
 [package]
 edition = "2018"
 name = "getrandom"
-version = "0.1.15"
+version = "0.2.3"
 authors = ["The Rand Project Developers"]
-exclude = ["utils/*", ".*", "appveyor.yml"]
+exclude = [".*"]
 description = "A small cross-platform library for retrieving random data from system source"
 documentation = "https://docs.rs/getrandom"
 categories = ["os", "no-std"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-random/getrandom"
+[package.metadata.docs.rs]
+features = ["std", "custom"]
+rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.cfg-if]
-version = "0.1.2"
+version = "1"
 
 [dependencies.compiler_builtins]
 version = "0.1"
@@ -33,31 +36,25 @@
 optional = true
 package = "rustc-std-workspace-core"
 
-[dependencies.log]
-version = "0.4"
-optional = true
-
 [features]
-dummy = []
-rustc-dep-of-std = ["compiler_builtins", "core"]
+custom = []
+js = ["wasm-bindgen", "js-sys"]
+rdrand = []
+rustc-dep-of-std = ["compiler_builtins", "core", "libc/rustc-dep-of-std", "wasi/rustc-dep-of-std"]
 std = []
-test-in-browser = ["wasm-bindgen"]
+test-in-browser = []
+[target."cfg(all(target_arch = \"wasm32\", target_os = \"unknown\"))".dependencies.js-sys]
+version = "0.3"
+optional = true
+
+[target."cfg(all(target_arch = \"wasm32\", target_os = \"unknown\"))".dependencies.wasm-bindgen]
+version = "0.2.62"
+optional = true
+default-features = false
+[target."cfg(all(target_arch = \"wasm32\", target_os = \"unknown\"))".dev-dependencies.wasm-bindgen-test]
+version = "0.3.18"
 [target."cfg(target_os = \"wasi\")".dependencies.wasi]
-version = "0.9"
+version = "0.10"
 [target."cfg(unix)".dependencies.libc]
 version = "0.2.64"
 default-features = false
-[target.wasm32-unknown-unknown.dependencies.stdweb]
-version = "0.4.18"
-optional = true
-
-[target.wasm32-unknown-unknown.dependencies.wasm-bindgen]
-version = "0.2.29"
-optional = true
-[target.wasm32-unknown-unknown.dev-dependencies.wasm-bindgen-test]
-version = "0.2"
-[badges.appveyor]
-repository = "rust-random/getrandom"
-
-[badges.travis-ci]
-repository = "rust-random/getrandom"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,84 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.3] - 2021-04-10
+### Changed
+- Replace build.rs with link attributes. [#205]
+- Add support for getrandom syscall on DragonFly BSD. [#210]
+- Improve Node.js detection. [#215]
+
+[#205]: https://github.com/rust-random/getrandom/pull/205
+[#210]: https://github.com/rust-random/getrandom/pull/210
+[#215]: https://github.com/rust-random/getrandom/pull/215
+
+## [0.2.2] - 2021-01-19
+### Changed
+- Forward `rustc-dep-of-std` to dependencies. [#198]
+- Highlight feature-dependend functionality in documentation using the `doc_cfg` feature. [#200]
+
+[#198]: https://github.com/rust-random/getrandom/pull/198
+[#200]: https://github.com/rust-random/getrandom/pull/200
+
+## [0.2.1] - 2021-01-03
+### Changed
+- Update `cfg-if` to v1.0. [#166]
+- Update `wasi` to v0.10. [#167]
+
+### Fixed
+- Multithreaded WASM support. [#165]
+
+### Removed
+- Windows XP support. [#177]
+- Direct `stdweb` support. [#178]
+- CloudABI support. [#184]
+
+[#165]: https://github.com/rust-random/getrandom/pull/165
+[#166]: https://github.com/rust-random/getrandom/pull/166
+[#167]: https://github.com/rust-random/getrandom/pull/167
+[#177]: https://github.com/rust-random/getrandom/pull/177
+[#178]: https://github.com/rust-random/getrandom/pull/178
+[#184]: https://github.com/rust-random/getrandom/pull/184
+
+## [0.2.0] - 2020-09-10
+### Features for using getrandom on unsupported targets
+
+The following (off by default) Cargo features have been added:
+- `"rdrand"` - use the RDRAND instruction on `no_std` `x86`/`x86_64` targets [#133]
+- `"js"` - use JavaScript calls on `wasm32-unknown-unknown` [#149]
+  - Replaces the `stdweb` and `wasm-bindgen` features (which are removed)
+- `"custom"` - allows a user to specify a custom implementation [#109]
+
+### Breaking Changes
+- Unsupported targets no longer compile [#107]
+- Change/Add `Error` constants [#120]
+- Only impl `std` traits when the `"std"` Cargo feature is specified [#106]
+- Remove offical support for Hermit, L4Re, and UEFI [#133]
+- Remove optional `"log"` dependancy [#131]
+- Update minimum supported Linux kernel to 2.6.32 [#153]
+- Update MSRV to 1.34 [#159]
+
+[#106]: https://github.com/rust-random/getrandom/pull/106
+[#107]: https://github.com/rust-random/getrandom/pull/107
+[#109]: https://github.com/rust-random/getrandom/pull/109
+[#120]: https://github.com/rust-random/getrandom/pull/120
+[#131]: https://github.com/rust-random/getrandom/pull/131
+[#133]: https://github.com/rust-random/getrandom/pull/133
+[#149]: https://github.com/rust-random/getrandom/pull/149
+[#153]: https://github.com/rust-random/getrandom/pull/153
+[#159]: https://github.com/rust-random/getrandom/pull/159
+
+## [0.1.16] - 2020-12-31
+### Changed
+- Update `cfg-if` to v1.0. [#173]
+- Implement `std::error::Error` for the `Error` type on additional targets. [#169]
+
+### Fixed
+- Multithreaded WASM support. [#171]
+
+[#173]: https://github.com/rust-random/getrandom/pull/173
+[#171]: https://github.com/rust-random/getrandom/pull/171
+[#169]: https://github.com/rust-random/getrandom/pull/169
+
 ## [0.1.15] - 2020-09-10
 ### Changed
 - Added support for Internet Explorer 11 [#139]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,18 @@
 # getrandom
 
-[![Build Status](https://travis-ci.org/rust-random/getrandom.svg?branch=master)](https://travis-ci.org/rust-random/getrandom)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/getrandom?svg=true)](https://ci.appveyor.com/project/rust-random/getrandom)
-[![Crate](https://img.shields.io/crates/v/getrandom.svg)](https://crates.io/crates/getrandom)
-[![Documentation](https://docs.rs/getrandom/badge.svg)](https://docs.rs/getrandom)
-[![Dependency status](https://deps.rs/repo/github/rust-random/getrandom/status.svg)](https://deps.rs/repo/github/rust-random/getrandom)
+[![Build Status]][GitHub Actions] [![Crate]][crates.io] [![Documentation]][docs.rs] [![Dependency Status]][deps.rs] [![Downloads]][crates.io] [![License]][LICENSE-MIT]
+
+[GitHub Actions]: https://github.com/rust-random/getrandom/actions?query=workflow:Tests+branch:master
+[Build Status]: https://github.com/rust-random/getrandom/workflows/Tests/badge.svg?branch=master
+[crates.io]: https://crates.io/crates/getrandom
+[Crate]: https://img.shields.io/crates/v/getrandom
+[docs.rs]: https://docs.rs/getrandom
+[Documentation]: https://docs.rs/getrandom/badge.svg
+[deps.rs]: https://deps.rs/repo/github/rust-random/getrandom
+[Dependency Status]: https://deps.rs/repo/github/rust-random/getrandom/status.svg
+[Downloads]: https://img.shields.io/crates/d/getrandom
+[LICENSE-MIT]: https://raw.githubusercontent.com/rust-random/getrandom/master/LICENSE-MIT
+[License]: https://img.shields.io/crates/l/getrandom
 
 
 A Rust library for retrieving random data from (operating) system source. It is
@@ -24,7 +32,7 @@
 
 ```toml
 [dependencies]
-getrandom = "0.1"
+getrandom = "0.2"
 ```
 
 Then invoke the `getrandom` function:
@@ -37,36 +45,14 @@
 }
 ```
 
-## Features
-
-This library is `no_std` for every supported target. However, getting randomness
-usually requires calling some external system API. This means most platforms
-will require linking against system libraries (i.e. `libc` for Unix,
-`Advapi32.dll` for Windows, Security framework on iOS, etc...).
-
-The `log` library is supported as an optional dependency. If enabled, error
-reporting will be improved on some platforms.
-
-For the `wasm32-unknown-unknown` target, one of the following features should be
-enabled:
-
--   [`wasm-bindgen`](https://crates.io/crates/wasm_bindgen)
--   [`stdweb`](https://crates.io/crates/stdweb)
-
-By default, compiling `getrandom` for an unsupported target will result in
-a compilation error. If you want to build an application which uses `getrandom`
-for such target, you can either:
-- Use [`[replace]`][replace] or [`[patch]`][patch] section in your `Cargo.toml`
-to switch to a custom implementation with a support of your target.
-- Enable the `dummy` feature to have getrandom use an implementation that always
-fails at run-time on unsupported targets.
-
-[replace]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-replace-section
-[patch]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-patch-section
+For more information about supported targets, entropy sources, `no_std` targets,
+crate features, WASM support and Custom RNGs see the
+[`getrandom` documentation](https://docs.rs/getrandom/latest) and
+[`getrandom::Error` documentation](https://docs.rs/getrandom/latest/getrandom/struct.Error.html).
 
 ## Minimum Supported Rust Version
 
-This crate requires Rust 1.32.0 or later.
+This crate requires Rust 1.34.0 or later.
 
 # License
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/bsd_arandom.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/bsd_arandom.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/bsd_arandom.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/bsd_arandom.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,8 +7,7 @@
 // except according to those terms.
 
 //! Implementation for FreeBSD and NetBSD
-use crate::util_libc::sys_fill_exact;
-use crate::Error;
+use crate::{util_libc::sys_fill_exact, Error};
 use core::ptr;
 
 fn kern_arnd(buf: &mut [u8]) -> libc::ssize_t {
@@ -25,7 +24,6 @@
         )
     };
     if ret == -1 {
-        error!("sysctl kern.arandom: syscall failed");
         -1
     } else {
         len as libc::ssize_t
@@ -45,5 +43,10 @@
             return sys_fill_exact(dest, |buf| unsafe { func(buf.as_mut_ptr(), buf.len(), 0) });
         }
     }
-    sys_fill_exact(dest, kern_arnd)
+    // Both FreeBSD and NetBSD will only return up to 256 bytes at a time, and
+    // older NetBSD kernels will fail on longer buffers.
+    for chunk in dest.chunks_mut(256) {
+        sys_fill_exact(chunk, kern_arnd)?
+    }
+    Ok(())
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/cloudabi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/cloudabi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/cloudabi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/cloudabi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Implementation for CloudABI
-use crate::Error;
-use core::num::NonZeroU32;
-
-extern "C" {
-    fn cloudabi_sys_random_get(buf: *mut u8, buf_len: usize) -> u16;
-}
-
-pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
-    let errno = unsafe { cloudabi_sys_random_get(dest.as_mut_ptr(), dest.len()) };
-    if let Some(code) = NonZeroU32::new(errno as u32) {
-        error!("cloudabi_sys_random_get: failed with {}", errno);
-        Err(Error::from(code))
-    } else {
-        Ok(()) // Zero means success for CloudABI
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/custom.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/custom.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/custom.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/custom.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,102 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! An implementation which calls out to an externally defined function.
+use crate::Error;
+use core::num::NonZeroU32;
+
+/// Register a function to be invoked by `getrandom` on unsupported targets.
+///
+/// ## Writing a custom `getrandom` implementation
+///
+/// The function to register must have the same signature as
+/// [`getrandom::getrandom`](crate::getrandom). The function can be defined
+/// wherever you want, either in root crate or a dependant crate.
+///
+/// For example, if we wanted a `failure-getrandom` crate containing an
+/// implementation that always fails, we would first depend on `getrandom`
+/// (for the [`Error`] type) in `failure-getrandom/Cargo.toml`:
+/// ```toml
+/// [dependencies]
+/// getrandom = "0.2"
+/// ```
+/// Note that the crate containing this function does **not** need to enable the
+/// `"custom"` Cargo feature.
+///
+/// Next, in `failure-getrandom/src/lib.rs`, we define our function:
+/// ```rust
+/// use core::num::NonZeroU32;
+/// use getrandom::Error;
+///
+/// // Some application-specific error code
+/// const MY_CUSTOM_ERROR_CODE: u32 = Error::CUSTOM_START + 42;
+/// pub fn always_fail(buf: &mut [u8]) -> Result<(), Error> {
+///     let code = NonZeroU32::new(MY_CUSTOM_ERROR_CODE).unwrap();
+///     Err(Error::from(code))
+/// }
+/// ```
+///
+/// ## Registering a custom `getrandom` implementation
+///
+/// Functions can only be registered in the root binary crate. Attempting to
+/// register a function in a non-root crate will result in a linker error.
+/// This is similar to
+/// [`#[panic_handler]`](https://doc.rust-lang.org/nomicon/panic-handler.html) or
+/// [`#[global_allocator]`](https://doc.rust-lang.org/edition-guide/rust-2018/platform-and-target-support/global-allocators.html),
+/// where helper crates define handlers/allocators but only the binary crate
+/// actually _uses_ the functionality.
+///
+/// To register the function, we first depend on `failure-getrandom` _and_
+/// `getrandom` in `Cargo.toml`:
+/// ```toml
+/// [dependencies]
+/// failure-getrandom = "0.1"
+/// getrandom = { version = "0.2", features = ["custom"] }
+/// ```
+///
+/// Then, we register the function in `src/main.rs`:
+/// ```rust
+/// # mod failure_getrandom { pub fn always_fail(_: &mut [u8]) -> Result<(), getrandom::Error> { unimplemented!() } }
+/// use failure_getrandom::always_fail;
+/// use getrandom::register_custom_getrandom;
+///
+/// register_custom_getrandom!(always_fail);
+/// ```
+///
+/// Now any user of `getrandom` (direct or indirect) on this target will use the
+/// registered function. As noted in the
+/// [top-level documentation](index.html#custom-implementations) this
+/// registration only has an effect on unsupported targets.
+#[macro_export]
+#[cfg_attr(docsrs, doc(cfg(feature = "custom")))]
+macro_rules! register_custom_getrandom {
+    ($path:path) => {
+        // We use an extern "C" function to get the guarantees of a stable ABI.
+        #[no_mangle]
+        extern "C" fn __getrandom_custom(dest: *mut u8, len: usize) -> u32 {
+            let f: fn(&mut [u8]) -> Result<(), ::getrandom::Error> = $path;
+            let slice = unsafe { ::core::slice::from_raw_parts_mut(dest, len) };
+            match f(slice) {
+                Ok(()) => 0,
+                Err(e) => e.code().get(),
+            }
+        }
+    };
+}
+
+#[allow(dead_code)]
+pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
+    extern "C" {
+        fn __getrandom_custom(dest: *mut u8, len: usize) -> u32;
+    }
+    let ret = unsafe { __getrandom_custom(dest.as_mut_ptr(), dest.len()) };
+    match NonZeroU32::new(ret) {
+        None => Ok(()),
+        Some(code) => Err(Error::from(code)),
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/dragonfly.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/dragonfly.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/dragonfly.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/dragonfly.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+// Copyright 2021 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for DragonFly BSD
+use crate::{
+    use_file,
+    util_libc::{sys_fill_exact, Weak},
+    Error,
+};
+
+pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
+    static GETRANDOM: Weak = unsafe { Weak::new("getrandom\0") };
+    type GetRandomFn = unsafe extern "C" fn(*mut u8, libc::size_t, libc::c_uint) -> libc::ssize_t;
+
+    if let Some(fptr) = GETRANDOM.ptr() {
+        let func: GetRandomFn = unsafe { core::mem::transmute(fptr) };
+        return sys_fill_exact(dest, |buf| unsafe { func(buf.as_mut_ptr(), buf.len(), 0) });
+    } else {
+        use_file::getrandom_inner(dest)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/dummy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/dummy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/dummy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/dummy.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A dummy implementation for unsupported targets which always fails
-use crate::{error::UNSUPPORTED, Error};
-
-pub fn getrandom_inner(_: &mut [u8]) -> Result<(), Error> {
-    Err(UNSUPPORTED)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/error_impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/error_impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/error_impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/error_impls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,24 +5,13 @@
 // <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+#![cfg_attr(docsrs, doc(cfg(feature = "std")))]
 extern crate std;
 
-use crate::{error::UNKNOWN_IO_ERROR, Error};
+use crate::Error;
 use core::convert::From;
-use core::num::NonZeroU32;
 use std::io;
 
-impl From<io::Error> for Error {
-    fn from(err: io::Error) -> Self {
-        if let Some(errno) = err.raw_os_error() {
-            if let Some(code) = NonZeroU32::new(errno as u32) {
-                return Error::from(code);
-            }
-        }
-        UNKNOWN_IO_ERROR
-    }
-}
-
 impl From<Error> for io::Error {
     fn from(err: Error) -> Self {
         match err.raw_os_error() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,10 +5,9 @@
 // <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-use core::fmt;
-use core::num::NonZeroU32;
+use core::{fmt, num::NonZeroU32};
 
-/// A small and `no_std` compatible error type.
+/// A small and `no_std` compatible error type
 ///
 /// The [`Error::raw_os_error()`] will indicate if the error is from the OS, and
 /// if so, which error code the OS gave the application. If such an error is
@@ -16,16 +15,44 @@
 ///
 /// Internally this type is a NonZeroU32, with certain values reserved for
 /// certain purposes, see [`Error::INTERNAL_START`] and [`Error::CUSTOM_START`].
+///
+/// *If this crate's `"std"` Cargo feature is enabled*, then:
+/// - [`getrandom::Error`][Error] implements
+///   [`std::error::Error`](https://doc.rust-lang.org/std/error/trait.Error.html)
+/// - [`std::io::Error`](https://doc.rust-lang.org/std/io/struct.Error.html) implements
+///   [`From<getrandom::Error>`](https://doc.rust-lang.org/std/convert/trait.From.html).
 #[derive(Copy, Clone, Eq, PartialEq)]
 pub struct Error(NonZeroU32);
 
+const fn internal_error(n: u16) -> Error {
+    // SAFETY: code > 0 as INTERNAL_START > 0 and adding n won't overflow a u32.
+    let code = Error::INTERNAL_START + (n as u32);
+    Error(unsafe { NonZeroU32::new_unchecked(code) })
+}
+
 impl Error {
-    #[deprecated(since = "0.1.7")]
-    /// Unknown error.
-    pub const UNKNOWN: Error = UNSUPPORTED;
-    #[deprecated(since = "0.1.7")]
-    /// System entropy source is unavailable.
-    pub const UNAVAILABLE: Error = UNSUPPORTED;
+    /// This target/platform is not supported by `getrandom`.
+    pub const UNSUPPORTED: Error = internal_error(0);
+    /// The platform-specific `errno` returned a non-positive value.
+    pub const ERRNO_NOT_POSITIVE: Error = internal_error(1);
+    /// Call to iOS [`SecRandomCopyBytes`](https://developer.apple.com/documentation/security/1399291-secrandomcopybytes) failed.
+    pub const IOS_SEC_RANDOM: Error = internal_error(3);
+    /// Call to Windows [`RtlGenRandom`](https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-rtlgenrandom) failed.
+    pub const WINDOWS_RTL_GEN_RANDOM: Error = internal_error(4);
+    /// RDRAND instruction failed due to a hardware issue.
+    pub const FAILED_RDRAND: Error = internal_error(5);
+    /// RDRAND instruction unsupported on this target.
+    pub const NO_RDRAND: Error = internal_error(6);
+    /// The browser does not have support for `self.crypto`.
+    pub const WEB_CRYPTO: Error = internal_error(7);
+    /// The browser does not have support for `crypto.getRandomValues`.
+    pub const WEB_GET_RANDOM_VALUES: Error = internal_error(8);
+    /// On VxWorks, call to `randSecure` failed (random number generator is not yet initialized).
+    pub const VXWORKS_RAND_SECURE: Error = internal_error(11);
+    /// NodeJS does not have support for the `crypto` module.
+    pub const NODE_CRYPTO: Error = internal_error(12);
+    /// NodeJS does not have support for `crypto.randomFillSync`.
+    pub const NODE_RANDOM_FILL_SYNC: Error = internal_error(13);
 
     /// Codes below this point represent OS Errors (i.e. positive i32 values).
     /// Codes at or above this point, but below [`Error::CUSTOM_START`] are
@@ -38,9 +65,11 @@
 
     /// Extract the raw OS error code (if this error came from the OS)
     ///
-    /// This method is identical to `std::io::Error::raw_os_error()`, except
+    /// This method is identical to [`std::io::Error::raw_os_error()`][1], except
     /// that it works in `no_std` contexts. If this method returns `None`, the
     /// error value can still be formatted via the `Display` implementation.
+    ///
+    /// [1]: https://doc.rust-lang.org/std/io/struct.Error.html#method.raw_os_error
     #[inline]
     pub fn raw_os_error(self) -> Option<i32> {
         if self.0.get() < Self::INTERNAL_START {
@@ -55,7 +84,7 @@
     /// This code can either come from the underlying OS, or be a custom error.
     /// Use [`Error::raw_os_error()`] to disambiguate.
     #[inline]
-    pub fn code(self) -> NonZeroU32 {
+    pub const fn code(self) -> NonZeroU32 {
         self.0
     }
 }
@@ -125,41 +154,19 @@
     }
 }
 
-// TODO: Convert to a function when min_version >= 1.33
-macro_rules! internal_error {
-    ($n:expr) => {
-        Error(unsafe { NonZeroU32::new_unchecked(Error::INTERNAL_START + $n as u16 as u32) })
-    };
-}
-
-/// Internal Error constants
-pub(crate) const UNSUPPORTED: Error = internal_error!(0);
-pub(crate) const ERRNO_NOT_POSITIVE: Error = internal_error!(1);
-pub(crate) const UNKNOWN_IO_ERROR: Error = internal_error!(2);
-pub(crate) const SEC_RANDOM_FAILED: Error = internal_error!(3);
-pub(crate) const RTL_GEN_RANDOM_FAILED: Error = internal_error!(4);
-pub(crate) const FAILED_RDRAND: Error = internal_error!(5);
-pub(crate) const NO_RDRAND: Error = internal_error!(6);
-pub(crate) const BINDGEN_CRYPTO_UNDEF: Error = internal_error!(7);
-pub(crate) const BINDGEN_GRV_UNDEF: Error = internal_error!(8);
-pub(crate) const STDWEB_NO_RNG: Error = internal_error!(9);
-pub(crate) const STDWEB_RNG_FAILED: Error = internal_error!(10);
-pub(crate) const RAND_SECURE_FATAL: Error = internal_error!(11);
-
 fn internal_desc(error: Error) -> Option<&'static str> {
     match error {
-        UNSUPPORTED => Some("getrandom: this target is not supported"),
-        ERRNO_NOT_POSITIVE => Some("errno: did not return a positive value"),
-        UNKNOWN_IO_ERROR => Some("Unknown std::io::Error"),
-        SEC_RANDOM_FAILED => Some("SecRandomCopyBytes: call failed"),
-        RTL_GEN_RANDOM_FAILED => Some("RtlGenRandom: call failed"),
-        FAILED_RDRAND => Some("RDRAND: failed multiple times: CPU issue likely"),
-        NO_RDRAND => Some("RDRAND: instruction not supported"),
-        BINDGEN_CRYPTO_UNDEF => Some("wasm-bindgen: self.crypto is undefined"),
-        BINDGEN_GRV_UNDEF => Some("wasm-bindgen: crypto.getRandomValues is undefined"),
-        STDWEB_NO_RNG => Some("stdweb: no randomness source available"),
-        STDWEB_RNG_FAILED => Some("stdweb: failed to get randomness"),
-        RAND_SECURE_FATAL => Some("randSecure: random number generator module is not initialized"),
+        Error::UNSUPPORTED => Some("getrandom: this target is not supported"),
+        Error::ERRNO_NOT_POSITIVE => Some("errno: did not return a positive value"),
+        Error::IOS_SEC_RANDOM => Some("SecRandomCopyBytes: iOS Security framework failure"),
+        Error::WINDOWS_RTL_GEN_RANDOM => Some("RtlGenRandom: Windows system function failure"),
+        Error::FAILED_RDRAND => Some("RDRAND: failed multiple times: CPU issue likely"),
+        Error::NO_RDRAND => Some("RDRAND: instruction not supported"),
+        Error::WEB_CRYPTO => Some("Web Crypto API is unavailable"),
+        Error::WEB_GET_RANDOM_VALUES => Some("Web API crypto.getRandomValues is unavailable"),
+        Error::VXWORKS_RAND_SECURE => Some("randSecure: VxWorks RNG module is not initialized"),
+        Error::NODE_CRYPTO => Some("Node.js crypto module is unavailable"),
+        Error::NODE_RANDOM_FILL_SYNC => Some("Node.js API crypto.randomFillSync is unavailable"),
         _ => None,
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/ios.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/ios.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/ios.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/ios.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,24 +7,19 @@
 // except according to those terms.
 
 //! Implementation for iOS
-use crate::{error::SEC_RANDOM_FAILED, Error};
-
-// TODO: Make extern once extern_types feature is stabilized. See:
-//   https://github.com/rust-lang/rust/issues/43467
-#[repr(C)]
-struct SecRandom([u8; 0]);
+use crate::Error;
+use core::{ffi::c_void, ptr::null};
 
 #[link(name = "Security", kind = "framework")]
 extern "C" {
-    static kSecRandomDefault: *const SecRandom;
-
-    fn SecRandomCopyBytes(rnd: *const SecRandom, count: usize, bytes: *mut u8) -> i32;
+    fn SecRandomCopyBytes(rnd: *const c_void, count: usize, bytes: *mut u8) -> i32;
 }
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
-    let ret = unsafe { SecRandomCopyBytes(kSecRandomDefault, dest.len(), dest.as_mut_ptr()) };
+    // Apple's documentation guarantees kSecRandomDefault is a synonym for NULL.
+    let ret = unsafe { SecRandomCopyBytes(null(), dest.len(), dest.as_mut_ptr()) };
     if ret == -1 {
-        Err(SEC_RANDOM_FAILED)
+        Err(Error::IOS_SEC_RANDOM)
     } else {
         Ok(())
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/js.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/js.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/js.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/js.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,121 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+use crate::Error;
+
+extern crate std;
+use std::thread_local;
+
+use js_sys::Uint8Array;
+use wasm_bindgen::{prelude::*, JsCast};
+
+// Maximum is 65536 bytes see https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues
+const BROWSER_CRYPTO_BUFFER_SIZE: usize = 256;
+
+enum RngSource {
+    Node(NodeCrypto),
+    Browser(BrowserCrypto, Uint8Array),
+}
+
+// JsValues are always per-thread, so we initialize RngSource for each thread.
+//   See: https://github.com/rustwasm/wasm-bindgen/pull/955
+thread_local!(
+    static RNG_SOURCE: Result<RngSource, Error> = getrandom_init();
+);
+
+pub(crate) fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
+    RNG_SOURCE.with(|result| {
+        let source = result.as_ref().map_err(|&e| e)?;
+
+        match source {
+            RngSource::Node(n) => {
+                if n.random_fill_sync(dest).is_err() {
+                    return Err(Error::NODE_RANDOM_FILL_SYNC);
+                }
+            }
+            RngSource::Browser(crypto, buf) => {
+                // getRandomValues does not work with all types of WASM memory,
+                // so we initially write to browser memory to avoid exceptions.
+                for chunk in dest.chunks_mut(BROWSER_CRYPTO_BUFFER_SIZE) {
+                    // The chunk can be smaller than buf's length, so we call to
+                    // JS to create a smaller view of buf without allocation.
+                    let sub_buf = buf.subarray(0, chunk.len() as u32);
+
+                    if crypto.get_random_values(&sub_buf).is_err() {
+                        return Err(Error::WEB_GET_RANDOM_VALUES);
+                    }
+                    sub_buf.copy_to(chunk);
+                }
+            }
+        };
+        Ok(())
+    })
+}
+
+fn getrandom_init() -> Result<RngSource, Error> {
+    let global: Global = js_sys::global().unchecked_into();
+    if is_node(&global) {
+        let crypto = require("crypto").map_err(|_| Error::NODE_CRYPTO)?;
+        return Ok(RngSource::Node(crypto));
+    }
+
+    // Assume we are in some Web environment (browser or web worker). We get
+    // `self.crypto` (called `msCrypto` on IE), so we can call
+    // `crypto.getRandomValues`. If `crypto` isn't defined, we assume that
+    // we are in an older web browser and the OS RNG isn't available.
+    let crypto = match (global.crypto(), global.ms_crypto()) {
+        (c, _) if c.is_object() => c,
+        (_, c) if c.is_object() => c,
+        _ => return Err(Error::WEB_CRYPTO),
+    };
+
+    let buf = Uint8Array::new_with_length(BROWSER_CRYPTO_BUFFER_SIZE as u32);
+    Ok(RngSource::Browser(crypto, buf))
+}
+
+// Taken from https://www.npmjs.com/package/browser-or-node
+fn is_node(global: &Global) -> bool {
+    let process = global.process();
+    if process.is_object() {
+        let versions = process.versions();
+        if versions.is_object() {
+            return versions.node().is_string();
+        }
+    }
+    false
+}
+
+#[wasm_bindgen]
+extern "C" {
+    type Global; // Return type of js_sys::global()
+
+    // Web Crypto API (https://www.w3.org/TR/WebCryptoAPI/)
+    #[wasm_bindgen(method, getter, js_name = "msCrypto")]
+    fn ms_crypto(this: &Global) -> BrowserCrypto;
+    #[wasm_bindgen(method, getter)]
+    fn crypto(this: &Global) -> BrowserCrypto;
+    type BrowserCrypto;
+    #[wasm_bindgen(method, js_name = getRandomValues, catch)]
+    fn get_random_values(this: &BrowserCrypto, buf: &Uint8Array) -> Result<(), JsValue>;
+
+    // Node JS crypto module (https://nodejs.org/api/crypto.html)
+    #[wasm_bindgen(catch, js_name = "module.require")]
+    fn require(s: &str) -> Result<NodeCrypto, JsValue>;
+    type NodeCrypto;
+    #[wasm_bindgen(method, js_name = randomFillSync, catch)]
+    fn random_fill_sync(this: &NodeCrypto, buf: &mut [u8]) -> Result<(), JsValue>;
+
+    // Node JS process Object (https://nodejs.org/api/process.html)
+    #[wasm_bindgen(method, getter)]
+    fn process(this: &Global) -> Process;
+    type Process;
+    #[wasm_bindgen(method, getter)]
+    fn versions(this: &Process) -> Versions;
+    type Versions;
+    #[wasm_bindgen(method, getter)]
+    fn node(this: &Versions) -> JsValue;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,89 +6,112 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Interface to the random number generator of the operating system.
+//! Interface to the operating system's random number generator.
 //!
-//! # Platform sources
+//! # Supported targets
 //!
-//! | OS               | interface
-//! |------------------|---------------------------------------------------------
-//! | Linux, Android   | [`getrandom`][1] system call if available, otherwise [`/dev/urandom`][2] after successfully polling `/dev/random`
-//! | Windows          | [`RtlGenRandom`][3]
-//! | macOS            | [`getentropy()`][19] if available, otherwise [`/dev/random`][20] (identical to `/dev/urandom`)
-//! | iOS              | [`SecRandomCopyBytes`][4]
-//! | FreeBSD          | [`getrandom()`][21] if available, otherwise [`kern.arandom`][5]
-//! | OpenBSD          | [`getentropy`][6]
-//! | NetBSD           | [`kern.arandom`][7]
-//! | Dragonfly BSD    | [`/dev/random`][8]
-//! | Solaris, illumos | [`getrandom`][9] system call if available, otherwise [`/dev/random`][10]
-//! | Fuchsia OS       | [`cprng_draw`][11]
-//! | Redox            | [`rand:`][12]
-//! | CloudABI         | [`cloudabi_sys_random_get`][13]
-//! | Haiku            | `/dev/random` (identical to `/dev/urandom`)
-//! | L4RE, SGX, UEFI  | [RDRAND][18]
-//! | Hermit           | [RDRAND][18] as [`sys_rand`][22] is currently broken.
-//! | VxWorks          | `randABytes` after checking entropy pool initialization with `randSecure`
-//! | Web browsers     | [`Crypto.getRandomValues`][14] (see [Support for WebAssembly and asm.js][16])
-//! | Node.js          | [`crypto.randomBytes`][15] (see [Support for WebAssembly and asm.js][16])
-//! | WASI             | [`__wasi_random_get`][17]
-//!
-//! Getrandom doesn't have a blanket implementation for all Unix-like operating
-//! systems that reads from `/dev/urandom`. This ensures all supported operating
-//! systems are using the recommended interface and respect maximum buffer
-//! sizes.
+//! | Target            | Target Triple      | Implementation
+//! | ----------------- | ------------------ | --------------
+//! | Linux, Android    | `*‑linux‑*`        | [`getrandom`][1] system call if available, otherwise [`/dev/urandom`][2] after successfully polling `/dev/random` |
+//! | Windows           | `*‑windows‑*`      | [`BCryptGenRandom`][3] |
+//! | macOS             | `*‑apple‑darwin`   | [`getentropy()`][19] if available, otherwise [`/dev/random`][20] (identical to `/dev/urandom`)
+//! | iOS               | `*‑apple‑ios`      | [`SecRandomCopyBytes`][4]
+//! | FreeBSD           | `*‑freebsd`        | [`getrandom()`][21] if available, otherwise [`kern.arandom`][5]
+//! | OpenBSD           | `*‑openbsd`        | [`getentropy`][6]
+//! | NetBSD            | `*‑netbsd`         | [`kern.arandom`][7]
+//! | Dragonfly BSD     | `*‑dragonfly`      | [`getrandom()`][22] if available, otherwise [`/dev/random`][8]
+//! | Solaris, illumos  | `*‑solaris`, `*‑illumos` | [`getrandom()`][9] if available, otherwise [`/dev/random`][10]
+//! | Fuchsia OS        | `*‑fuchsia`        | [`cprng_draw`][11]
+//! | Redox             | `*‑redox`          | [`rand:`][12]
+//! | Haiku             | `*‑haiku`          | `/dev/random` (identical to `/dev/urandom`)
+//! | SGX               | `x86_64‑*‑sgx`     | [RDRAND][18]
+//! | VxWorks           | `*‑wrs‑vxworks‑*`  | `randABytes` after checking entropy pool initialization with `randSecure`
+//! | Emscripten        | `*‑emscripten`     | `/dev/random` (identical to `/dev/urandom`)
+//! | WASI              | `wasm32‑wasi`      | [`random_get`][17]
+//! | Web Browser       | `wasm32‑*‑unknown` | [`Crypto.getRandomValues()`][14], see [WebAssembly support][16]
+//! | Node.js           | `wasm32‑*‑unknown` | [`crypto.randomBytes`][15], see [WebAssembly support][16]
+//!
+//! There is no blanket implementation on `unix` targets that reads from
+//! `/dev/urandom`. This ensures all supported targets are using the recommended
+//! interface and respect maximum buffer sizes.
 //!
-//! ## Unsupported targets
+//! Pull Requests that add support for new targets to `getrandom` are always welcome.
 //!
-//! By default, compiling `getrandom` for an unsupported target will result in
-//! a compilation error. If you want to build an application which uses `getrandom`
-//! for such target, you can either:
-//! - Use [`[replace]`][replace] or [`[patch]`][patch] section in your `Cargo.toml`
-//! to switch to a custom implementation with a support of your target.
-//! - Enable the `dummy` feature to have getrandom use an implementation that always
-//! fails at run-time on unsupported targets.
-//!
-//! [replace]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-replace-section
-//! [patch]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-patch-section
-//!
-//! ## Support for WebAssembly and asm.js
-//!
-//! Getrandom supports all of Rust's current `wasm32` targets, and it works with
-//! both Node.js and web browsers. The three Emscripten targets
-//! `asmjs-unknown-emscripten`, `wasm32-unknown-emscripten`, and
-//! `wasm32-experimental-emscripten` use Emscripten's `/dev/random` emulation.
-//! The WASI target `wasm32-wasi` uses the [`__wasi_random_get`][17] function
-//! defined by the WASI standard.
-//!
-//! Getrandom also supports `wasm32-unknown-unknown` by directly calling
-//! JavaScript methods. Rust currently has two ways to do this: [bindgen] and
-//! [stdweb]. Getrandom supports using either one by enabling the
-//! `wasm-bindgen` or `stdweb` crate features. Note that if both features are
-//! enabled, `wasm-bindgen` will be used. If neither feature is enabled, calls
-//! to `getrandom` will always fail at runtime.
+//! ## Unsupported targets
 //!
-//! [bindgen]: https://github.com/rust-lang/rust-bindgen
-//! [stdweb]: https://github.com/koute/stdweb
+//! By default, `getrandom` will not compile on unsupported targets, but certain
+//! features allow a user to select a "fallback" implementation if no supported
+//! implementation exists.
+//!
+//! All of the below mechanisms only affect unsupported
+//! targets. Supported targets will _always_ use their supported implementations.
+//! This prevents a crate from overriding a secure source of randomness
+//! (either accidentally or intentionally).
+//!
+//! ### RDRAND on x86
+//!
+//! *If the `"rdrand"` Cargo feature is enabled*, `getrandom` will fallback to using
+//! the [`RDRAND`][18] instruction to get randomness on `no_std` `x86`/`x86_64`
+//! targets. This feature has no effect on other CPU architectures.
+//!
+//! ### WebAssembly support
+//!
+//! This crate fully supports the
+//! [`wasm32-wasi`](https://github.com/CraneStation/wasi) and
+//! [`wasm32-unknown-emscripten`](https://www.hellorust.com/setup/emscripten/)
+//! targets. However, the `wasm32-unknown-unknown` target (i.e. the target used
+//! by `wasm-pack`) is not automatically
+//! supported since, from the target name alone, we cannot deduce which
+//! JavaScript interface is in use (or if JavaScript is available at all).
+//!
+//! Instead, *if the `"js"` Cargo feature is enabled*, this crate will assume
+//! that you are building for an environment containing JavaScript, and will
+//! call the appropriate methods. Both web browser (main window and Web Workers)
+//! and Node.js environments are supported, invoking the methods
+//! [described above](#supported-targets) using the
+//! [wasm-bindgen](https://github.com/rust-lang/rust-bindgen) toolchain.
+//!
+//! This feature has no effect on targets other than `wasm32-unknown-unknown`.
+//!
+//! ### Custom implementations
+//!
+//! The [`register_custom_getrandom!`] macro allows a user to mark their own
+//! function as the backing implementation for [`getrandom`]. See the macro's
+//! documentation for more information about writing and registering your own
+//! custom implementations.
+//!
+//! Note that registering a custom implementation only has an effect on targets
+//! that would otherwise not compile. Any supported targets (including those
+//! using `"rdrand"` and `"js"` Cargo features) continue using their normal
+//! implementations even if a function is registered.
+//!
+//! ### Indirect Dependencies
+//!
+//! If `getrandom` is not a direct dependency of your crate, you can still
+//! enable any of the above fallback behaviors by enabling the relevant
+//! feature in your root crate's `Cargo.toml`:
+//! ```toml
+//! [dependencies]
+//! getrandom = { version = "0.2", features = ["js"] }
+//! ```
 //!
 //! ## Early boot
 //!
-//! It is possible that early in the boot process the OS hasn't had enough time
-//! yet to collect entropy to securely seed its RNG, especially on virtual
-//! machines.
+//! Sometimes, early in the boot process, the OS has not collected enough
+//! entropy to securely seed its RNG. This is especially common on virtual
+//! machines, where standard "random" events are hard to come by.
 //!
-//! Some operating systems always block the thread until the RNG is securely
+//! Some operating system interfaces always block until the RNG is securely
 //! seeded. This can take anywhere from a few seconds to more than a minute.
-//! Others make a best effort to use a seed from before the shutdown and don't
-//! document much.
-//!
-//! A few, Linux, NetBSD and Solaris, offer a choice between blocking and
-//! getting an error; in these cases we always choose to block.
+//! A few (Linux, NetBSD and Solaris) offer a choice between blocking and
+//! getting an error; in these cases, we always choose to block.
 //!
-//! On Linux (when the `getrandom` system call is not available) and on NetBSD
-//! reading from `/dev/urandom` never blocks, even when the OS hasn't collected
-//! enough entropy yet. To avoid returning low-entropy bytes, we first read from
+//! On Linux (when the `getrandom` system call is not available), reading from
+//! `/dev/urandom` never blocks, even when the OS hasn't collected enough
+//! entropy yet. To avoid returning low-entropy bytes, we first poll
 //! `/dev/random` and only switch to `/dev/urandom` once this has succeeded.
 //!
-//! # Error handling
+//! ## Error handling
 //!
 //! We always choose failure over returning insecure "random" bytes. In general,
 //! on supported platforms, failure is highly unlikely, though not impossible.
@@ -96,168 +119,110 @@
 //! `getrandom`, hence after the first successful call one can be reasonably
 //! confident that no errors will occur.
 //!
-//! On unsupported platforms, `getrandom` always fails. See the [`Error`] type
-//! for more information on what data is returned on failure.
-//!
 //! [1]: http://man7.org/linux/man-pages/man2/getrandom.2.html
 //! [2]: http://man7.org/linux/man-pages/man4/urandom.4.html
-//! [3]: https://docs.microsoft.com/en-us/windows/desktop/api/ntsecapi/nf-ntsecapi-rtlgenrandom
+//! [3]: https://docs.microsoft.com/en-us/windows/win32/api/bcrypt/nf-bcrypt-bcryptgenrandom
 //! [4]: https://developer.apple.com/documentation/security/1399291-secrandomcopybytes?language=objc
 //! [5]: https://www.freebsd.org/cgi/man.cgi?query=random&sektion=4
 //! [6]: https://man.openbsd.org/getentropy.2
-//! [7]: https://netbsd.gw.com/cgi-bin/man-cgi?sysctl+7+NetBSD-8.0
+//! [7]: https://man.netbsd.org/sysctl.7
 //! [8]: https://leaf.dragonflybsd.org/cgi/web-man?command=random&section=4
 //! [9]: https://docs.oracle.com/cd/E88353_01/html/E37841/getrandom-2.html
 //! [10]: https://docs.oracle.com/cd/E86824_01/html/E54777/random-7d.html
 //! [11]: https://fuchsia.dev/fuchsia-src/zircon/syscalls/cprng_draw
 //! [12]: https://github.com/redox-os/randd/blob/master/src/main.rs
-//! [13]: https://github.com/nuxinl/cloudabi#random_get
 //! [14]: https://www.w3.org/TR/WebCryptoAPI/#Crypto-method-getRandomValues
 //! [15]: https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback
-//! [16]: #support-for-webassembly-and-asmjs
-//! [17]: https://github.com/WebAssembly/WASI/blob/master/design/WASI-core.md#__wasi_random_get
+//! [16]: #webassembly-support
+//! [17]: https://github.com/WebAssembly/WASI/blob/main/phases/snapshot/docs.md#-random_getbuf-pointeru8-buf_len-size---errno
 //! [18]: https://software.intel.com/en-us/articles/intel-digital-random-number-generator-drng-software-implementation-guide
 //! [19]: https://www.unix.com/man-page/mojave/2/getentropy/
 //! [20]: https://www.unix.com/man-page/mojave/4/random/
 //! [21]: https://www.freebsd.org/cgi/man.cgi?query=getrandom&manpath=FreeBSD+12.0-stable
-//! [22]: https://github.com/hermitcore/libhermit-rs/blob/09c38b0371cee6f56a541400ba453e319e43db53/src/syscalls/random.rs#L21
+//! [22]: https://leaf.dragonflybsd.org/cgi/web-man?command=getrandom
 
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
     html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://rust-random.github.io/rand/"
+    html_root_url = "https://docs.rs/getrandom/0.2.3"
 )]
 #![no_std]
-#![cfg_attr(feature = "stdweb", recursion_limit = "128")]
 #![warn(rust_2018_idioms, unused_lifetimes, missing_docs)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 #[macro_use]
 extern crate cfg_if;
 
-cfg_if! {
-    if #[cfg(feature = "log")] {
-        #[allow(unused)]
-        #[macro_use]
-        extern crate log;
-    } else {
-        #[allow(unused)]
-        macro_rules! error {
-            ($($x:tt)*) => {};
-        }
-        #[allow(unused)]
-        macro_rules! warn {
-            ($($x:tt)*) => {};
-        }
-        #[allow(unused)]
-        macro_rules! info {
-            ($($x:tt)*) => {};
-        }
-    }
-}
-
 mod error;
-pub use crate::error::Error;
-
-#[allow(dead_code)]
 mod util;
+// To prevent a breaking change when targets are added, we always export the
+// register_custom_getrandom macro, so old Custom RNG crates continue to build.
+#[cfg(feature = "custom")]
+mod custom;
+#[cfg(feature = "std")]
+mod error_impls;
 
-#[cfg(target_os = "vxworks")]
-#[allow(dead_code)]
-mod util_libc;
-
-cfg_if! {
-    // Unlike the other Unix, Fuchsia and iOS don't use the libc to make any calls.
-    if #[cfg(any(target_os = "android", target_os = "dragonfly", target_os = "emscripten",
-                 target_os = "freebsd", target_os = "haiku",     target_os = "illumos",
-                 target_os = "linux",   target_os = "macos",     target_os = "netbsd",
-                 target_os = "openbsd", target_os = "redox",     target_os = "solaris"))] {
-        #[allow(dead_code)]
-        mod util_libc;
-        // Keep std-only trait definitions for backwards compatibility
-        mod error_impls;
-    } else if #[cfg(feature = "std")] {
-        mod error_impls;
-    }
-}
-
-// These targets read from a file as a fallback method.
-#[cfg(any(
-    target_os = "android",
-    target_os = "linux",
-    target_os = "macos",
-    target_os = "solaris",
-    target_os = "illumos",
-))]
-mod use_file;
+pub use crate::error::Error;
 
 // System-specific implementations.
 //
 // These should all provide getrandom_inner with the same signature as getrandom.
 cfg_if! {
-    if #[cfg(target_os = "android")] {
-        #[path = "linux_android.rs"] mod imp;
-    } else if #[cfg(target_os = "cloudabi")] {
-        #[path = "cloudabi.rs"] mod imp;
-    } else if #[cfg(target_os = "dragonfly")] {
-        #[path = "use_file.rs"] mod imp;
-    } else if #[cfg(target_os = "emscripten")] {
+    if #[cfg(any(target_os = "emscripten", target_os = "haiku",
+                 target_os = "redox"))] {
+        mod util_libc;
         #[path = "use_file.rs"] mod imp;
-    } else if #[cfg(target_os = "freebsd")] {
+    } else if #[cfg(any(target_os = "android", target_os = "linux"))] {
+        mod util_libc;
+        mod use_file;
+        #[path = "linux_android.rs"] mod imp;
+    } else if #[cfg(any(target_os = "illumos", target_os = "solaris"))] {
+        mod util_libc;
+        mod use_file;
+        #[path = "solaris_illumos.rs"] mod imp;
+    } else if #[cfg(any(target_os = "freebsd", target_os = "netbsd"))] {
+        mod util_libc;
         #[path = "bsd_arandom.rs"] mod imp;
+    } else if #[cfg(target_os = "dragonfly")] {
+        mod util_libc;
+        mod use_file;
+        #[path = "dragonfly.rs"] mod imp;
     } else if #[cfg(target_os = "fuchsia")] {
         #[path = "fuchsia.rs"] mod imp;
-    } else if #[cfg(target_os = "haiku")] {
-        #[path = "use_file.rs"] mod imp;
-    } else if #[cfg(target_os = "illumos")] {
-        #[path = "solaris_illumos.rs"] mod imp;
     } else if #[cfg(target_os = "ios")] {
         #[path = "ios.rs"] mod imp;
-    } else if #[cfg(target_os = "linux")] {
-        #[path = "linux_android.rs"] mod imp;
     } else if #[cfg(target_os = "macos")] {
+        mod util_libc;
+        mod use_file;
         #[path = "macos.rs"] mod imp;
-    } else if #[cfg(target_os = "netbsd")] {
-        #[path = "bsd_arandom.rs"] mod imp;
     } else if #[cfg(target_os = "openbsd")] {
+        mod util_libc;
         #[path = "openbsd.rs"] mod imp;
-    } else if #[cfg(target_os = "redox")] {
-        #[path = "use_file.rs"] mod imp;
-    } else if #[cfg(target_os = "solaris")] {
-        #[path = "solaris_illumos.rs"] mod imp;
     } else if #[cfg(target_os = "wasi")] {
         #[path = "wasi.rs"] mod imp;
     } else if #[cfg(target_os = "vxworks")] {
+        mod util_libc;
         #[path = "vxworks.rs"] mod imp;
-    } else if #[cfg(all(windows, getrandom_uwp))] {
-        #[path = "windows_uwp.rs"] mod imp;
     } else if #[cfg(windows)] {
         #[path = "windows.rs"] mod imp;
-    } else if #[cfg(all(target_arch = "x86_64", any(
-                  target_os = "hermit",
-                  target_os = "l4re",
-                  target_os = "uefi",
-                  target_env = "sgx",
-              )))] {
+    } else if #[cfg(all(target_arch = "x86_64", target_env = "sgx"))] {
+        #[path = "rdrand.rs"] mod imp;
+    } else if #[cfg(all(feature = "rdrand",
+                        any(target_arch = "x86_64", target_arch = "x86")))] {
         #[path = "rdrand.rs"] mod imp;
+    } else if #[cfg(all(feature = "js",
+                        target_arch = "wasm32", target_os = "unknown"))] {
+        #[path = "js.rs"] mod imp;
+    } else if #[cfg(feature = "custom")] {
+        use custom as imp;
     } else if #[cfg(all(target_arch = "wasm32", target_os = "unknown"))] {
-        cfg_if! {
-            if #[cfg(feature = "wasm-bindgen")] {
-                #[path = "wasm32_bindgen.rs"] mod imp;
-            } else if #[cfg(feature = "stdweb")] {
-                #[path = "wasm32_stdweb.rs"] mod imp;
-            } else {
-                // Always have an implementation for wasm32-unknown-unknown.
-                // See https://github.com/rust-random/getrandom/issues/87
-                #[path = "dummy.rs"] mod imp;
-            }
-        }
-    } else if #[cfg(feature = "dummy")] {
-        #[path = "dummy.rs"] mod imp;
+        compile_error!("the wasm32-unknown-unknown target is not supported by \
+                        default, you may need to enable the \"js\" feature. \
+                        For more information see: \
+                        https://docs.rs/getrandom/#webassembly-support");
     } else {
-        compile_error!("\
-            target is not supported, for more information see: \
-            https://docs.rs/getrandom/#unsupported-targets\
-        ");
+        compile_error!("target is not supported, for more information see: \
+                        https://docs.rs/getrandom/#unsupported-targets");
     }
 }
 
@@ -274,7 +239,7 @@
 /// In general, `getrandom` will be fast enough for interactive usage, though
 /// significantly slower than a user-space CSPRNG; for the latter consider
 /// [`rand::thread_rng`](https://docs.rs/rand/*/rand/fn.thread_rng.html).
-pub fn getrandom(dest: &mut [u8]) -> Result<(), error::Error> {
+pub fn getrandom(dest: &mut [u8]) -> Result<(), Error> {
     if dest.is_empty() {
         return Ok(());
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/linux_android.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/linux_android.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/linux_android.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/linux_android.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,9 +7,11 @@
 // except according to those terms.
 
 //! Implementation for Linux / Android
-use crate::util::LazyBool;
-use crate::util_libc::{last_os_error, sys_fill_exact};
-use crate::{use_file, Error};
+use crate::{
+    util::LazyBool,
+    util_libc::{last_os_error, sys_fill_exact},
+    {use_file, Error},
+};
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     static HAS_GETRANDOM: LazyBool = LazyBool::new();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/macos.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/macos.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/macos.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/macos.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,8 +7,11 @@
 // except according to those terms.
 
 //! Implementation for macOS
-use crate::util_libc::{last_os_error, Weak};
-use crate::{use_file, Error};
+use crate::{
+    use_file,
+    util_libc::{last_os_error, Weak},
+    Error,
+};
 use core::mem;
 
 type GetEntropyFn = unsafe extern "C" fn(*mut u8, libc::size_t) -> libc::c_int;
@@ -20,9 +23,7 @@
         for chunk in dest.chunks_mut(256) {
             let ret = unsafe { func(chunk.as_mut_ptr(), chunk.len()) };
             if ret != 0 {
-                let err = last_os_error();
-                error!("getentropy syscall failed");
-                return Err(err);
+                return Err(last_os_error());
             }
         }
         Ok(())
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/openbsd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/openbsd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/openbsd.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/openbsd.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,16 +7,13 @@
 // except according to those terms.
 
 //! Implementation for OpenBSD
-use crate::util_libc::last_os_error;
-use crate::Error;
+use crate::{util_libc::last_os_error, Error};
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     for chunk in dest.chunks_mut(256) {
         let ret = unsafe { libc::getentropy(chunk.as_mut_ptr() as *mut libc::c_void, chunk.len()) };
         if ret == -1 {
-            let err = last_os_error();
-            error!("libc::getentropy call failed");
-            return Err(err);
+            return Err(last_os_error());
         }
     }
     Ok(())
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/rdrand.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/rdrand.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/rdrand.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/rdrand.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,24 +7,30 @@
 // except according to those terms.
 
 //! Implementation for SGX using RDRAND instruction
-use crate::error::{FAILED_RDRAND, NO_RDRAND};
-#[cfg(not(target_feature = "rdrand"))]
-use crate::util::LazyBool;
 use crate::Error;
-use core::arch::x86_64::_rdrand64_step;
 use core::mem;
 
+cfg_if! {
+    if #[cfg(target_arch = "x86_64")] {
+        use core::arch::x86_64 as arch;
+        use arch::_rdrand64_step as rdrand_step;
+    } else if #[cfg(target_arch = "x86")] {
+        use core::arch::x86 as arch;
+        use arch::_rdrand32_step as rdrand_step;
+    }
+}
+
 // Recommendation from "Intel® Digital Random Number Generator (DRNG) Software
 // Implementation Guide" - Section 5.2.1 and "Intel® 64 and IA-32 Architectures
 // Software Developer’s Manual" - Volume 1 - Section 7.3.17.1.
 const RETRY_LIMIT: usize = 10;
-const WORD_SIZE: usize = mem::size_of::<u64>();
+const WORD_SIZE: usize = mem::size_of::<usize>();
 
 #[target_feature(enable = "rdrand")]
 unsafe fn rdrand() -> Result<[u8; WORD_SIZE], Error> {
     for _ in 0..RETRY_LIMIT {
         let mut el = mem::zeroed();
-        if _rdrand64_step(&mut el) == 1 {
+        if rdrand_step(&mut el) == 1 {
             // AMD CPUs from families 14h to 16h (pre Ryzen) sometimes fail to
             // set CF on bogus random data, so we check these values explicitly.
             // See https://github.com/systemd/systemd/issues/11810#issuecomment-489727505
@@ -33,11 +39,10 @@
             if el != 0 && el != !0 {
                 return Ok(el.to_ne_bytes());
             }
-            error!("RDRAND returned {:X}, CPU RNG may be broken", el);
             // Keep looping in case this was a false positive.
         }
     }
-    Err(FAILED_RDRAND)
+    Err(Error::FAILED_RDRAND)
 }
 
 // "rdrand" target feature requires "+rdrnd" flag, see https://github.com/rust-lang/rust/issues/49653.
@@ -55,16 +60,18 @@
 // https://github.com/rust-lang-nursery/stdsimd/issues/464
 #[cfg(not(target_feature = "rdrand"))]
 fn is_rdrand_supported() -> bool {
-    use core::arch::x86_64::__cpuid;
-    // SAFETY: All x86_64 CPUs support CPUID leaf 1
+    use crate::util::LazyBool;
+
+    // SAFETY: All Rust x86 targets are new enough to have CPUID, and if CPUID
+    // is supported, CPUID leaf 1 is always supported.
     const FLAG: u32 = 1 << 30;
     static HAS_RDRAND: LazyBool = LazyBool::new();
-    HAS_RDRAND.unsync_init(|| unsafe { (__cpuid(1).ecx & FLAG) != 0 })
+    HAS_RDRAND.unsync_init(|| unsafe { (arch::__cpuid(1).ecx & FLAG) != 0 })
 }
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     if !is_rdrand_supported() {
-        return Err(NO_RDRAND);
+        return Err(Error::NO_RDRAND);
     }
 
     // SAFETY: After this point, rdrand is supported, so calling the rdrand
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/solaris_illumos.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/solaris_illumos.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/solaris_illumos.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/solaris_illumos.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,8 +17,11 @@
 //! To make sure we can compile on both Solaris and its derivatives, as well as
 //! function, we check for the existence of getrandom(2) in libc by calling
 //! libc::dlsym.
-use crate::util_libc::{sys_fill_exact, Weak};
-use crate::{use_file, Error};
+use crate::{
+    use_file,
+    util_libc::{sys_fill_exact, Weak},
+    Error,
+};
 use core::mem;
 
 #[cfg(target_os = "illumos")]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/use_file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/use_file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/use_file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/use_file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,11 +7,15 @@
 // except according to those terms.
 
 //! Implementations that just need to read from a file
-use crate::util::LazyUsize;
-use crate::util_libc::{open_readonly, sys_fill_exact};
-use crate::Error;
-use core::cell::UnsafeCell;
-use core::sync::atomic::{AtomicUsize, Ordering::Relaxed};
+use crate::{
+    util::LazyUsize,
+    util_libc::{open_readonly, sys_fill_exact},
+    Error,
+};
+use core::{
+    cell::UnsafeCell,
+    sync::atomic::{AtomicUsize, Ordering::Relaxed},
+};
 
 #[cfg(target_os = "redox")]
 const FILE_PATH: &str = "rand:\0";
@@ -99,7 +103,7 @@
         // A negative timeout means an infinite timeout.
         let res = unsafe { libc::poll(&mut pfd, 1, -1) };
         if res >= 0 {
-            assert_eq!(res, 1); // We only used one fd, and cannot timeout.
+            debug_assert_eq!(res, 1); // We only used one fd, and cannot timeout.
             return Ok(());
         }
         let err = crate::util_libc::last_os_error();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/util_libc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/util_libc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/util_libc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/util_libc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,11 +5,9 @@
 // <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-use crate::error::ERRNO_NOT_POSITIVE;
-use crate::util::LazyUsize;
-use crate::Error;
-use core::num::NonZeroU32;
-use core::ptr::NonNull;
+#![allow(dead_code)]
+use crate::{util::LazyUsize, Error};
+use core::{num::NonZeroU32, ptr::NonNull};
 
 cfg_if! {
     if #[cfg(any(target_os = "netbsd", target_os = "openbsd", target_os = "android"))] {
@@ -42,7 +40,7 @@
     if errno > 0 {
         Error::from(NonZeroU32::new(errno as u32).unwrap())
     } else {
-        ERRNO_NOT_POSITIVE
+        Error::ERRNO_NOT_POSITIVE
     }
 }
 
@@ -108,14 +106,10 @@
 
 // SAFETY: path must be null terminated, FD must be manually closed.
 pub unsafe fn open_readonly(path: &str) -> Result<libc::c_int, Error> {
-    debug_assert!(path.as_bytes().last() == Some(&0));
+    debug_assert_eq!(path.as_bytes().last(), Some(&0));
     let fd = open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC);
     if fd < 0 {
         return Err(last_os_error());
     }
-    // O_CLOEXEC works on all Unix targets except for older Linux kernels (pre
-    // 2.6.23), so we also use an ioctl to make sure FD_CLOEXEC is set.
-    #[cfg(target_os = "linux")]
-    libc::ioctl(fd, libc::FIOCLEX);
     Ok(fd)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/util.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
 // <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-
+#![allow(dead_code)]
 use core::sync::atomic::{AtomicUsize, Ordering::Relaxed};
 
 // This structure represents a lazily initialized static usize value. Useful
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/vxworks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/vxworks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/vxworks.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/vxworks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,8 +7,7 @@
 // except according to those terms.
 
 //! Implementation for VxWorks
-use crate::error::{Error, RAND_SECURE_FATAL};
-use crate::util_libc::last_os_error;
+use crate::{util_libc::last_os_error, Error};
 use core::sync::atomic::{AtomicBool, Ordering::Relaxed};
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
@@ -16,7 +15,7 @@
     while !RNG_INIT.load(Relaxed) {
         let ret = unsafe { libc::randSecure() };
         if ret < 0 {
-            return Err(RAND_SECURE_FATAL);
+            return Err(Error::VXWORKS_RAND_SECURE);
         } else if ret > 0 {
             RNG_INIT.store(true, Relaxed);
             break;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/wasm32_bindgen.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/wasm32_bindgen.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/wasm32_bindgen.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/wasm32_bindgen.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Implementation for WASM via wasm-bindgen
-extern crate std;
-
-use core::cell::RefCell;
-use core::mem;
-use std::thread_local;
-
-use wasm_bindgen::prelude::*;
-
-use crate::error::{BINDGEN_CRYPTO_UNDEF, BINDGEN_GRV_UNDEF};
-use crate::Error;
-
-#[derive(Clone, Debug)]
-enum RngSource {
-    Node(NodeCrypto),
-    Browser(BrowserCrypto),
-}
-
-// JsValues are always per-thread, so we initialize RngSource for each thread.
-//   See: https://github.com/rustwasm/wasm-bindgen/pull/955
-thread_local!(
-    static RNG_SOURCE: RefCell<Option<RngSource>> = RefCell::new(None);
-);
-
-pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
-    assert_eq!(mem::size_of::<usize>(), 4);
-
-    RNG_SOURCE.with(|f| {
-        let mut source = f.borrow_mut();
-        if source.is_none() {
-            *source = Some(getrandom_init()?);
-        }
-
-        match source.as_ref().unwrap() {
-            RngSource::Node(n) => n.random_fill_sync(dest),
-            RngSource::Browser(n) => {
-                // see https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues
-                //
-                // where it says:
-                //
-                // > A QuotaExceededError DOMException is thrown if the
-                // > requested length is greater than 65536 bytes.
-                for chunk in dest.chunks_mut(65536) {
-                    n.get_random_values(chunk)
-                }
-            }
-        };
-        Ok(())
-    })
-}
-
-fn getrandom_init() -> Result<RngSource, Error> {
-    if let Ok(self_) = Global::get_self() {
-        // If `self` is defined then we're in a browser somehow (main window
-        // or web worker). We get `self.crypto` (called `msCrypto` on IE), so we
-        // can call `crypto.getRandomValues`. If `crypto` isn't defined, we
-        // assume we're in an older web browser and the OS RNG isn't available.
-
-        let crypto: BrowserCrypto = match (self_.crypto(), self_.ms_crypto()) {
-            (crypto, _) if !crypto.is_undefined() => crypto.into(),
-            (_, crypto) if !crypto.is_undefined() => crypto.into(),
-            _ => return Err(BINDGEN_CRYPTO_UNDEF),
-        };
-
-        // Test if `crypto.getRandomValues` is undefined as well
-        if crypto.get_random_values_fn().is_undefined() {
-            return Err(BINDGEN_GRV_UNDEF);
-        }
-
-        return Ok(RngSource::Browser(crypto));
-    }
-
-    return Ok(RngSource::Node(MODULE.require("crypto")));
-}
-
-#[wasm_bindgen]
-extern "C" {
-    type Global;
-    #[wasm_bindgen(getter, catch, static_method_of = Global, js_class = self, js_name = self)]
-    fn get_self() -> Result<Self_, JsValue>;
-
-    type Self_;
-    #[wasm_bindgen(method, getter, js_name = "msCrypto", structural)]
-    fn ms_crypto(me: &Self_) -> JsValue;
-    #[wasm_bindgen(method, getter, structural)]
-    fn crypto(me: &Self_) -> JsValue;
-
-    #[derive(Clone, Debug)]
-    type BrowserCrypto;
-
-    // TODO: these `structural` annotations here ideally wouldn't be here to
-    // avoid a JS shim, but for now with feature detection they're
-    // unavoidable.
-    #[wasm_bindgen(method, js_name = getRandomValues, structural, getter)]
-    fn get_random_values_fn(me: &BrowserCrypto) -> JsValue;
-    #[wasm_bindgen(method, js_name = getRandomValues, structural)]
-    fn get_random_values(me: &BrowserCrypto, buf: &mut [u8]);
-
-    #[derive(Clone, Debug)]
-    type NodeCrypto;
-
-    #[wasm_bindgen(method, js_name = randomFillSync, structural)]
-    fn random_fill_sync(me: &NodeCrypto, buf: &mut [u8]);
-
-    type NodeModule;
-
-    #[wasm_bindgen(js_name = module)]
-    static MODULE: NodeModule;
-
-    #[wasm_bindgen(method)]
-    fn require(this: &NodeModule, s: &str) -> NodeCrypto;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/wasm32_stdweb.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/wasm32_stdweb.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/wasm32_stdweb.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/wasm32_stdweb.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Implementation for WASM via stdweb
-extern crate std;
-
-use core::mem;
-
-use stdweb::js;
-use stdweb::unstable::TryInto;
-use stdweb::web::error::Error as WebError;
-
-use crate::error::{STDWEB_NO_RNG, STDWEB_RNG_FAILED};
-use crate::Error;
-use std::sync::Once;
-
-#[derive(Clone, Copy, Debug)]
-enum RngSource {
-    Browser,
-    Node,
-}
-
-pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
-    assert_eq!(mem::size_of::<usize>(), 4);
-    static ONCE: Once = Once::new();
-    static mut RNG_SOURCE: Result<RngSource, Error> = Ok(RngSource::Node);
-
-    // SAFETY: RNG_SOURCE is only written once, before being read.
-    ONCE.call_once(|| unsafe {
-        RNG_SOURCE = getrandom_init();
-    });
-    getrandom_fill(unsafe { RNG_SOURCE }?, dest)
-}
-
-fn getrandom_init() -> Result<RngSource, Error> {
-    let result = js! {
-        try {
-            if (
-                typeof self === "object" &&
-                typeof self.crypto === "object" &&
-                typeof self.crypto.getRandomValues === "function"
-            ) {
-                return { success: true, ty: 1 };
-            }
-
-            if (typeof require("crypto").randomBytes === "function") {
-                return { success: true, ty: 2 };
-            }
-
-            return { success: false, error: new Error("not supported") };
-        } catch(err) {
-            return { success: false, error: err };
-        }
-    };
-
-    if js! { return @{ result.as_ref() }.success } == true {
-        let ty = js! { return @{ result }.ty };
-
-        if ty == 1 {
-            Ok(RngSource::Browser)
-        } else if ty == 2 {
-            Ok(RngSource::Node)
-        } else {
-            unreachable!()
-        }
-    } else {
-        let _err: WebError = js! { return @{ result }.error }.try_into().unwrap();
-        error!("getrandom unavailable: {}", _err);
-        Err(STDWEB_NO_RNG)
-    }
-}
-
-fn getrandom_fill(source: RngSource, dest: &mut [u8]) -> Result<(), Error> {
-    for chunk in dest.chunks_mut(65536) {
-        let len = chunk.len() as u32;
-        let ptr = chunk.as_mut_ptr() as i32;
-
-        let result = match source {
-            RngSource::Browser => js! {
-                try {
-                    let array = new Uint8Array(@{ len });
-                    self.crypto.getRandomValues(array);
-                    HEAPU8.set(array, @{ ptr });
-
-                    return { success: true };
-                } catch(err) {
-                    return { success: false, error: err };
-                }
-            },
-            RngSource::Node => js! {
-                try {
-                    let bytes = require("crypto").randomBytes(@{ len });
-                    HEAPU8.set(new Uint8Array(bytes), @{ ptr });
-
-                    return { success: true };
-                } catch(err) {
-                    return { success: false, error: err };
-                }
-            },
-        };
-
-        if js! { return @{ result.as_ref() }.success } != true {
-            let _err: WebError = js! { return @{ result }.error }.try_into().unwrap();
-            error!("getrandom failed: {}", _err);
-            return Err(STDWEB_RNG_FAILED);
-        }
-    }
-    Ok(())
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/windows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/windows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/windows.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/windows.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,20 +6,42 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Implementation for Windows
-use crate::{error::RTL_GEN_RANDOM_FAILED, Error};
+use crate::Error;
+use core::{ffi::c_void, num::NonZeroU32, ptr};
 
+const BCRYPT_USE_SYSTEM_PREFERRED_RNG: u32 = 0x00000002;
+
+#[link(name = "bcrypt")]
 extern "system" {
-    #[link_name = "SystemFunction036"]
-    fn RtlGenRandom(RandomBuffer: *mut u8, RandomBufferLength: u32) -> u8;
+    fn BCryptGenRandom(
+        hAlgorithm: *mut c_void,
+        pBuffer: *mut u8,
+        cbBuffer: u32,
+        dwFlags: u32,
+    ) -> u32;
 }
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     // Prevent overflow of u32
     for chunk in dest.chunks_mut(u32::max_value() as usize) {
-        let ret = unsafe { RtlGenRandom(chunk.as_mut_ptr(), chunk.len() as u32) };
-        if ret == 0 {
-            return Err(RTL_GEN_RANDOM_FAILED);
+        let ret = unsafe {
+            BCryptGenRandom(
+                ptr::null_mut(),
+                chunk.as_mut_ptr(),
+                chunk.len() as u32,
+                BCRYPT_USE_SYSTEM_PREFERRED_RNG,
+            )
+        };
+        // NTSTATUS codes use the two highest bits for severity status.
+        if ret >> 30 == 0b11 {
+            // We zeroize the highest bit, so the error code will reside
+            // inside the range designated for OS codes.
+            let code = ret ^ (1 << 31);
+            // SAFETY: the second highest bit is always equal to one,
+            // so it's impossible to get zero. Unfortunately the type
+            // system does not have a way to express this yet.
+            let code = unsafe { NonZeroU32::new_unchecked(code) };
+            return Err(Error::from(code));
         }
     }
     Ok(())
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/windows_uwp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/windows_uwp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/src/windows_uwp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/src/windows_uwp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Implementation for Windows UWP targets. After deprecation of Windows XP
-//! and Vista, this can supersede the `RtlGenRandom`-based implementation.
-use crate::Error;
-use core::{ffi::c_void, num::NonZeroU32, ptr};
-
-const BCRYPT_USE_SYSTEM_PREFERRED_RNG: u32 = 0x00000002;
-
-extern "system" {
-    fn BCryptGenRandom(
-        hAlgorithm: *mut c_void,
-        pBuffer: *mut u8,
-        cbBuffer: u32,
-        dwFlags: u32,
-    ) -> u32;
-}
-
-pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
-    // Prevent overflow of u32
-    for chunk in dest.chunks_mut(u32::max_value() as usize) {
-        let ret = unsafe {
-            BCryptGenRandom(
-                ptr::null_mut(),
-                chunk.as_mut_ptr(),
-                chunk.len() as u32,
-                BCRYPT_USE_SYSTEM_PREFERRED_RNG,
-            )
-        };
-        // NTSTATUS codes use two highest bits for severity status
-        match ret >> 30 {
-            0b01 => {
-                info!("BCryptGenRandom: information code 0x{:08X}", ret);
-            }
-            0b10 => {
-                warn!("BCryptGenRandom: warning code 0x{:08X}", ret);
-            }
-            0b11 => {
-                error!("BCryptGenRandom: failed with 0x{:08X}", ret);
-                // We zeroize the highest bit, so the error code will reside
-                // inside the range of designated for OS codes.
-                let code = ret ^ (1 << 31);
-                // SAFETY: the second highest bit is always equal to one,
-                // so it's impossible to get zero. Unfortunately compiler
-                // is not smart enough to figure out it yet.
-                let code = unsafe { NonZeroU32::new_unchecked(code) };
-                return Err(Error::from(code));
-            }
-            _ => (),
-        }
-    }
-    Ok(())
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/common/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/common/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/common/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/common/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,66 @@
+use super::getrandom_impl;
+
+#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
+use wasm_bindgen_test::wasm_bindgen_test as test;
+
+#[cfg(feature = "test-in-browser")]
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+#[test]
+fn test_zero() {
+    // Test that APIs are happy with zero-length requests
+    getrandom_impl(&mut [0u8; 0]).unwrap();
+}
+
+#[test]
+fn test_diff() {
+    let mut v1 = [0u8; 1000];
+    getrandom_impl(&mut v1).unwrap();
+
+    let mut v2 = [0u8; 1000];
+    getrandom_impl(&mut v2).unwrap();
+
+    let mut n_diff_bits = 0;
+    for i in 0..v1.len() {
+        n_diff_bits += (v1[i] ^ v2[i]).count_ones();
+    }
+
+    // Check at least 1 bit per byte differs. p(failure) < 1e-1000 with random input.
+    assert!(n_diff_bits >= v1.len() as u32);
+}
+
+#[test]
+fn test_huge() {
+    let mut huge = [0u8; 100_000];
+    getrandom_impl(&mut huge).unwrap();
+}
+
+// On WASM, the thread API always fails/panics
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn test_multithreading() {
+    extern crate std;
+    use std::{sync::mpsc::channel, thread, vec};
+
+    let mut txs = vec![];
+    for _ in 0..20 {
+        let (tx, rx) = channel();
+        txs.push(tx);
+
+        thread::spawn(move || {
+            // wait until all the tasks are ready to go.
+            rx.recv().unwrap();
+            let mut v = [0u8; 1000];
+
+            for _ in 0..100 {
+                getrandom_impl(&mut v).unwrap();
+                thread::yield_now();
+            }
+        });
+    }
+
+    // start all the tasks
+    for tx in txs.iter() {
+        tx.send(()).unwrap();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/common.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/common.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-#[cfg(feature = "wasm-bindgen")]
-use wasm_bindgen_test::*;
-
-use getrandom::getrandom;
-
-#[cfg(feature = "test-in-browser")]
-wasm_bindgen_test_configure!(run_in_browser);
-
-#[cfg_attr(feature = "wasm-bindgen", wasm_bindgen_test)]
-#[test]
-fn test_zero() {
-    // Test that APIs are happy with zero-length requests
-    getrandom(&mut [0u8; 0]).unwrap();
-}
-
-#[cfg_attr(feature = "wasm-bindgen", wasm_bindgen_test)]
-#[test]
-fn test_diff() {
-    let mut v1 = [0u8; 1000];
-    getrandom(&mut v1).unwrap();
-
-    let mut v2 = [0u8; 1000];
-    getrandom(&mut v2).unwrap();
-
-    let mut n_diff_bits = 0;
-    for i in 0..v1.len() {
-        n_diff_bits += (v1[i] ^ v2[i]).count_ones();
-    }
-
-    // Check at least 1 bit per byte differs. p(failure) < 1e-1000 with random input.
-    assert!(n_diff_bits >= v1.len() as u32);
-}
-
-#[cfg_attr(feature = "wasm-bindgen", wasm_bindgen_test)]
-#[test]
-fn test_huge() {
-    let mut huge = [0u8; 100_000];
-    getrandom(&mut huge).unwrap();
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-#[test]
-fn test_multithreading() {
-    use std::sync::mpsc::channel;
-    use std::thread;
-
-    let mut txs = vec![];
-    for _ in 0..20 {
-        let (tx, rx) = channel();
-        txs.push(tx);
-
-        thread::spawn(move || {
-            // wait until all the tasks are ready to go.
-            rx.recv().unwrap();
-            let mut v = [0u8; 1000];
-
-            for _ in 0..100 {
-                getrandom(&mut v).unwrap();
-                thread::yield_now();
-            }
-        });
-    }
-
-    // start all the tasks
-    for tx in txs.iter() {
-        tx.send(()).unwrap();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/custom.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/custom.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/custom.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/custom.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,50 @@
+// Test that a custom handler works on wasm32-unknown-unknown
+#![cfg(all(
+    target_arch = "wasm32",
+    target_os = "unknown",
+    feature = "custom",
+    not(feature = "js")
+))]
+
+use wasm_bindgen_test::wasm_bindgen_test as test;
+#[cfg(feature = "test-in-browser")]
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+use core::{
+    num::NonZeroU32,
+    sync::atomic::{AtomicU8, Ordering},
+};
+use getrandom::{getrandom, register_custom_getrandom, Error};
+
+fn len7_err() -> Error {
+    NonZeroU32::new(Error::INTERNAL_START + 7).unwrap().into()
+}
+
+fn super_insecure_rng(buf: &mut [u8]) -> Result<(), Error> {
+    // Length 7 buffers return a custom error
+    if buf.len() == 7 {
+        return Err(len7_err());
+    }
+    // Otherwise, increment an atomic counter
+    static COUNTER: AtomicU8 = AtomicU8::new(0);
+    for b in buf {
+        *b = COUNTER.fetch_add(1, Ordering::Relaxed);
+    }
+    Ok(())
+}
+
+register_custom_getrandom!(super_insecure_rng);
+
+#[test]
+fn custom_rng_output() {
+    let mut buf = [0u8; 4];
+    assert_eq!(getrandom(&mut buf), Ok(()));
+    assert_eq!(buf, [0, 1, 2, 3]);
+    assert_eq!(getrandom(&mut buf), Ok(()));
+    assert_eq!(buf, [4, 5, 6, 7]);
+}
+
+#[test]
+fn rng_err_output() {
+    assert_eq!(getrandom(&mut [0; 7]), Err(len7_err()));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/normal.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/normal.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/normal.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/normal.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+// Don't test on custom wasm32-unknown-unknown
+#![cfg(not(all(
+    target_arch = "wasm32",
+    target_os = "unknown",
+    feature = "custom",
+    not(feature = "js")
+)))]
+
+// Use the normal getrandom implementation on this architecture.
+use getrandom::getrandom as getrandom_impl;
+mod common;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/rdrand.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/rdrand.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/getrandom/tests/rdrand.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/getrandom/tests/rdrand.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+// We only test the RDRAND-based RNG source on supported architectures.
+#![cfg(any(target_arch = "x86_64", target_arch = "x86"))]
+
+// rdrand.rs expects to be part of the getrandom main crate, so we need these
+// additional imports to get rdrand.rs to compile.
+use getrandom::Error;
+#[macro_use]
+extern crate cfg_if;
+#[path = "../src/rdrand.rs"]
+mod rdrand;
+#[path = "../src/util.rs"]
+mod util;
+
+use rdrand::getrandom_inner as getrandom_impl;
+mod common;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/benches/bench.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
     AttributeValue, DebugAbbrev, DebugAddr, DebugAddrBase, DebugAranges, DebugInfo, DebugLine,
     DebugLineOffset, DebugLoc, DebugLocLists, DebugPubNames, DebugPubTypes, DebugRanges,
     DebugRngLists, Encoding, EndianSlice, EntriesTreeNode, Expression, LittleEndian, LocationLists,
-    Operation, RangeLists, Reader, ReaderOffset,
+    Operation, RangeLists, RangeListsOffset, Reader, ReaderOffset,
 };
 use std::env;
 use std::fs::File;
@@ -195,9 +195,12 @@
     let debug_aranges = DebugAranges::new(&debug_aranges, LittleEndian);
 
     b.iter(|| {
-        let mut aranges = debug_aranges.items();
-        while let Some(arange) = aranges.next().expect("Should parse arange OK") {
-            test::black_box(arange);
+        let mut headers = debug_aranges.headers();
+        while let Some(header) = headers.next().expect("Should parse arange header OK") {
+            let mut entries = header.entries();
+            while let Some(arange) = entries.next().expect("Should parse arange entry OK") {
+                test::black_box(arange);
+            }
         }
     });
 }
@@ -381,7 +384,7 @@
             let mut attrs = entry.attrs();
             while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
                 if let gimli::AttributeValue::RangeListsRef(offset) = attr.value() {
-                    offsets.push((offset, unit.encoding(), low_pc));
+                    offsets.push((RangeListsOffset(offset.0), unit.encoding(), low_pc));
                 }
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"a54c50975663c6252b7c125eda19235152070a37f998326f4b271a04f5d3e0f0","CONTRIBUTING.md":"5f513ec06013e4f6f097e9c9492da5a47b9f25c94c6ecadfb655a77405fe912c","Cargo.lock":"cd30e6fca722fc373af7141632e46c3b08ee6d7ab71fab90f762a922de34325f","Cargo.toml":"0a6d80adea2979e14326fd8aab0f36c06857e7d9449bda3f930e9432ddbcda65","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"a01f5693cdea3efedda9972688f5d1ed60e69f64d89a330d88a2aabb7556734f","benches/bench.rs":"83438649d0ce7971a5d8dfba46e1cef059eee6ac6e8c01aff76eef2487d4e50d","examples/dwarf-validate.rs":"8a322dc48a04bff33a759030f399ca9972ddb103e63851cbb9b8c9672095f645","examples/dwarfdump.rs":"3eb6de0979d427ae2cebad38bead8ba27b1dcc178f14f7373347c694bc6bf07c","examples/simple.rs":"cdf882d94aa561887308900ae305f4373bbd5222d846cd55ae96bcda9c139ecc","examples/simple_line.rs":"3bd3c16ed39b8156516d0660761e98b38b0a5d8295246a997aa47e278cf2bf6b","fixtures/self/README.md":"557cd710240a14fdaa5842b216de57f2ed481151b640af09d6877984b3b2389f","fixtures/self/debug_abbrev":"7c0faa940d9c68d196d03ad55a20e5c746040fa428ff323277fa381deff82bba","fixtures/self/debug_aranges":"8c2aeb2335f61d04ecb7b747070d24f83a6517cbee79dc5c96d97fb6c53d6b6d","fixtures/self/debug_info":"42028a5983006e0703f9ca9515cd27d891ae4af70279fae5011d547f581e2661","fixtures/self/debug_inlined":"89d9516f06ff835621936037f5884fc56712bf304c1dcde52251ddd510fe8710","fixtures/self/debug_line":"b29aebcca3b38bb2bb8aa708cbe74a0dce5a3b0c18916b63d6d17282c017bec7","fixtures/self/debug_loc":"8906ccb9c204f233eb74c1d069dee97a19d18c2051f9147795d7b5364a9266aa","fixtures/self/debug_pubnames":"cf58e237f89c68afba724597fa7e260448636b45f2e69dc6f1bfe34006e27c48","fixtures/self/debug_pubtypes":"d43c1bed71c9d14d1683294cdc1833f069cf131d6e95ee808547919b4f352d81","fixtures/self/debug_ranges":"6d765ac18d33accd89186d077eeb505cbdf97d990c9201d63d9463cd7787ce7a","fixtures/self/debug_str":"9ed904b68eee77b8558b80b3b7ca03e8527f6c64483e9d6d845f40270eb21183","fixtures/self/eh_frame":"6dc3d84351cac42cf73d03452fbb532470dd94d08715154c48417e3f62095f17","fixtures/self/eh_frame_hdr":"afba7a0aa233c9a8c81c986495bd2505164844adb93272d6bc0c9e592e684716","rustfmt.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/arch.rs":"8dc707e84d049fea7e0f9689a7346bf5e687536ba1171206411dbabdfb1bdd3a","src/common.rs":"c51b746a4a511726fd98bf30a9383dc42e9810942edd3b725355301897b4c3f0","src/constants.rs":"c61fac31b48cf19173a80447b0ce30f9ad07c308dd2f42402733e47db5feeffa","src/endianity.rs":"1f7e62ae34f540c06bedf1e7948739211556eea7dd83731a5ca52c7d687ed0fc","src/leb128.rs":"9d9e288ff591cf7863b8a595896faeaad8457068781c3091ac6c5dc2f41da692","src/lib.rs":"3b15540871587557d957ce5073d19f3866d37a874fe504779ac8592c888b95c4","src/read/abbrev.rs":"798fb791c130bed5b00a6160a5975feee0f66df627448ea7c822a40f137f7a9f","src/read/addr.rs":"f63f289edf889e87107bb2090fb1c50b48af7015f31b7c39c3d6ea09630a38e9","src/read/aranges.rs":"0ba7d541a3ca3d38d00a2c440b9b4bbfc26bfeeca6599deda13f0478583dc404","src/read/cfi.rs":"bb1497d41a1f17e8369cedc4093aa6351c280fbbae7fc1d8baba6dd9f8d51fa9","src/read/dwarf.rs":"e052498cfa0f4aff7a5dafda0e8d91350980b49e345e5c2bbd1567f8f1b39690","src/read/endian_reader.rs":"3a7fe3b3ae078678a6b13b4b24c3e6b3998cfff135039f1a8219b1003b946841","src/read/endian_slice.rs":"d07d4850d4199ba3a60eba1366dc26565bda804532270f3f5d1e5c2374ce42c5","src/read/line.rs":"848d5db6a8baec6fa227e9c00b1779cd96e9371cb4b3e5e8d935ab05a9eed0b6","src/read/lists.rs":"e473ff419feed9756289e245b7879bd89e7f19098a53162fe6773fac496ae5bc","src/read/loclists.rs":"2a5655c53fb2bf5cfe2df373210217edaa06e4d3addf27df0f724100cbfbe43b","src/read/lookup.rs":"0cf89ba12b9d48b1fe035dd3a497730323acb9427a9457abbc2f7c58c4c71165","src/read/mod.rs":"49138ebd9a01121e13e341b8b18f255b7b7106a3cf4d3ee46aa58452f1004163","src/read/op.rs":"270865aace2324a365dab68c78a624ae46118cac56b1ce009d77c9f7aa8373df","src/read/pubnames.rs":"701c1279aef596ed8eff13f19a5803f9e1070afa20c9bafbf29659d4c294edd4","src/read/pubtypes.rs":"6250112d63120ed283698cb42189b127f624fb453abb1222dfa75fe103ad077e","src/read/reader.rs":"ce3861c10bbd36bb0a38110dccc9e4a9248e3e9c48b27eea3e0e000e85d25770","src/read/rnglists.rs":"054ca7bc75752955a4edc2b5e27781af94ce7791ac273d10a349ca980502f5ba","src/read/str.rs":"7857d4a5fe71ced4984c8e9a0f6e64c21c23e9836703b1b52d5cc674a83b3dfb","src/read/unit.rs":"6477343ec5278df2c7a5dac2da47a5574387bc16d34db02e3ab294d559446175","src/read/value.rs":"2c48e827d5c128d8824b64acea2e50eae5a1176760b9a6144e3fb0373b575505","src/test_util.rs":"291eefa6b51c6d934ba2f4a4c9bc7c403046fc1cccf4d43487820f0154bb89e2","src/write/abbrev.rs":"fa02163389e92e804d139cf84f833ab6af932083f0eb2d74464b4a70bd3237ff","src/write/cfi.rs":"5d36c6978d2bda09921f5b71b764a75a58e819551471fb44db23ce5db7c4a8e3","src/write/dwarf.rs":"8a1a0893e31134ad68993994594f3024ad0c8af7c1188b29e0ffc26b42edef21","src/write/endian_vec.rs":"1d5811986648816a677580b22630f5059757a381487d73e9adbb3008c9ae0c58","src/write/line.rs":"821fa9ac0c3afb27609034156f576301217b5c661c3e03eee09734b50ffc66a0","src/write/loc.rs":"fbe8eb33af5a3ef2d5681b561fe0f93fd5a2385c9ced9746c52a0693bffcd44b","src/write/mod.rs":"d8aa1da854cdee629d470d00d87e00dc6998e4bec1ca951f8d2f277730ab9d69","src/write/op.rs":"4229e471f223bbd705fe047498002f853495bb64cedc4c651a0542062433f635","src/write/range.rs":"9852cd73a05be409b69b9e5e2fcd0f64e585da5feeb2a6bd91a76d6b82a8ad18","src/write/section.rs":"3ce781d5e82ba365ff54fdd36e0ef58c58a2215b09a8861eb0b038efac82b77f","src/write/str.rs":"4850cc2fee55980f9cbb6b4169f9861ab9d05c2b28a85c2b790480b83a66f514","src/write/unit.rs":"fecc7165b64d60856e289dce118d580eb2c2b61b13199083b811b462dcd01d03","src/write/writer.rs":"aa6ebe7f2e695c5345558c73e71e3532ab0b3244fc18684bcd18de44e9ee3570","tests/convert_self.rs":"8fba3599ac892a704cbcd5aed53eaef51b040043da04f85f002c597ee7549046","tests/parse_self.rs":"a7d5b09c0cfb4891de96bc7db38aec14275b4d9b29c9df85b05d267b8d7030d4"},"package":"f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"522f04c0d7987ab1b1ad96147def769bdc49907c0d82bb80343cf9b7e7d19bb2","CONTRIBUTING.md":"5f513ec06013e4f6f097e9c9492da5a47b9f25c94c6ecadfb655a77405fe912c","Cargo.lock":"ec725450161816edf1adbbc383a23ae4c46f87b9cd52c5d8a9578066b63efb75","Cargo.toml":"5a461001955eb6b8c827a96cb70d62f059e43d0333cfde79df9b3a17eba6318b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"a49a4a3eccaf84069f9a450ab4bdf752754bccf771ef172946e27daacec8e532","benches/bench.rs":"ed31db783ea3152a26dbdcd8564eaf71176df4de8245e2a0db14343b0a51bce0","examples/dwarf-validate.rs":"8a322dc48a04bff33a759030f399ca9972ddb103e63851cbb9b8c9672095f645","examples/dwarfdump.rs":"1354874adc517259a540b5b33d64f557ad7752bccd4ce07960b1f269c5b71184","examples/simple.rs":"684dc9785f4aa0714fcb91a3ae1bb7c8612c9b12969be47fe1327447a2101d1c","examples/simple_line.rs":"ec5fa47c1ab019c6cd9d525223f947533f6d65d6add3131a0c40ac18fc1297db","fixtures/self/README.md":"557cd710240a14fdaa5842b216de57f2ed481151b640af09d6877984b3b2389f","fixtures/self/debug_abbrev":"7c0faa940d9c68d196d03ad55a20e5c746040fa428ff323277fa381deff82bba","fixtures/self/debug_aranges":"8c2aeb2335f61d04ecb7b747070d24f83a6517cbee79dc5c96d97fb6c53d6b6d","fixtures/self/debug_info":"42028a5983006e0703f9ca9515cd27d891ae4af70279fae5011d547f581e2661","fixtures/self/debug_inlined":"89d9516f06ff835621936037f5884fc56712bf304c1dcde52251ddd510fe8710","fixtures/self/debug_line":"b29aebcca3b38bb2bb8aa708cbe74a0dce5a3b0c18916b63d6d17282c017bec7","fixtures/self/debug_loc":"8906ccb9c204f233eb74c1d069dee97a19d18c2051f9147795d7b5364a9266aa","fixtures/self/debug_pubnames":"cf58e237f89c68afba724597fa7e260448636b45f2e69dc6f1bfe34006e27c48","fixtures/self/debug_pubtypes":"d43c1bed71c9d14d1683294cdc1833f069cf131d6e95ee808547919b4f352d81","fixtures/self/debug_ranges":"6d765ac18d33accd89186d077eeb505cbdf97d990c9201d63d9463cd7787ce7a","fixtures/self/debug_str":"9ed904b68eee77b8558b80b3b7ca03e8527f6c64483e9d6d845f40270eb21183","fixtures/self/eh_frame":"6dc3d84351cac42cf73d03452fbb532470dd94d08715154c48417e3f62095f17","fixtures/self/eh_frame_hdr":"afba7a0aa233c9a8c81c986495bd2505164844adb93272d6bc0c9e592e684716","rustfmt.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/arch.rs":"8dc707e84d049fea7e0f9689a7346bf5e687536ba1171206411dbabdfb1bdd3a","src/common.rs":"0b244d54459ddbb6fc6c836792bc442a19b37ffe005e48dd595590858e64c477","src/constants.rs":"829768abd8a075394824a2dfb52af8dc28c23680fe8c259d676cabdd84b8b8d3","src/endianity.rs":"1f7e62ae34f540c06bedf1e7948739211556eea7dd83731a5ca52c7d687ed0fc","src/leb128.rs":"9d9e288ff591cf7863b8a595896faeaad8457068781c3091ac6c5dc2f41da692","src/lib.rs":"3b15540871587557d957ce5073d19f3866d37a874fe504779ac8592c888b95c4","src/read/abbrev.rs":"798fb791c130bed5b00a6160a5975feee0f66df627448ea7c822a40f137f7a9f","src/read/addr.rs":"f63f289edf889e87107bb2090fb1c50b48af7015f31b7c39c3d6ea09630a38e9","src/read/aranges.rs":"dee9500e0428bc34fca58b2dda85aef6bf0293785c4077c1a4c144109e9d87c9","src/read/cfi.rs":"252f0e958373f646a4a69b815eff4880e4b57cb780ba8211884ed06020857842","src/read/dwarf.rs":"310f1cf5d666fc83810b8d3164f70a62f9ab54a576f2b8ac94551729a5959ef5","src/read/endian_reader.rs":"320983a859c2bb0dd44a3e6fae55ff0a84dba3fa80c2edbc64aa8135c44eddf0","src/read/endian_slice.rs":"e12a3c38a06996a9839daccd33a87c328570800730a2531643eb77682370ac51","src/read/line.rs":"47ca5ebb8bd19000045954686d3320b838e9404cba917ec60525f11ea0d87095","src/read/lists.rs":"e473ff419feed9756289e245b7879bd89e7f19098a53162fe6773fac496ae5bc","src/read/loclists.rs":"2a5655c53fb2bf5cfe2df373210217edaa06e4d3addf27df0f724100cbfbe43b","src/read/lookup.rs":"0cf89ba12b9d48b1fe035dd3a497730323acb9427a9457abbc2f7c58c4c71165","src/read/mod.rs":"fc10b421103e26b407a32ce245bec9ba84b15ed348a0e4961b08007bde3f2166","src/read/op.rs":"a659b745e3d265ffad149df17264b61a221409cf04d805a246442c994807778e","src/read/pubnames.rs":"701c1279aef596ed8eff13f19a5803f9e1070afa20c9bafbf29659d4c294edd4","src/read/pubtypes.rs":"6250112d63120ed283698cb42189b127f624fb453abb1222dfa75fe103ad077e","src/read/reader.rs":"7feb9c566ed4bf67876fce8c58fd4f8771aac67a41e71335ee8fc57a6410d3d4","src/read/rnglists.rs":"d59c09a4fdd994a35837376cb016715d33304cb4b59532d3af2fddc400ed8bd8","src/read/str.rs":"932971a6f6f3453685dbd33ff3c2d31a10820b989a209bdfeca3e8c5012cc4b8","src/read/unit.rs":"beb19623a027b62c01c46d8e73f3d0aa13060c4660776ecfb5b6ebcae94e0463","src/read/value.rs":"2c48e827d5c128d8824b64acea2e50eae5a1176760b9a6144e3fb0373b575505","src/test_util.rs":"291eefa6b51c6d934ba2f4a4c9bc7c403046fc1cccf4d43487820f0154bb89e2","src/write/abbrev.rs":"fa02163389e92e804d139cf84f833ab6af932083f0eb2d74464b4a70bd3237ff","src/write/cfi.rs":"5d36c6978d2bda09921f5b71b764a75a58e819551471fb44db23ce5db7c4a8e3","src/write/dwarf.rs":"8a1a0893e31134ad68993994594f3024ad0c8af7c1188b29e0ffc26b42edef21","src/write/endian_vec.rs":"1d5811986648816a677580b22630f5059757a381487d73e9adbb3008c9ae0c58","src/write/line.rs":"df7d2082c71b5e523cd52745700aae3dcfa5800f0b280e831ef5d8eb8035d6a7","src/write/loc.rs":"bb5b750c04f6603e18225db72652ea00239234ba674a8a8627c99d4ab07b47a9","src/write/mod.rs":"d8aa1da854cdee629d470d00d87e00dc6998e4bec1ca951f8d2f277730ab9d69","src/write/op.rs":"fb99e95631e24e46eaddef393281ed4f4c56ebc0713a8cbe1683893f7bdde8c6","src/write/range.rs":"5bac01e372c08e3cc19e1e07e40492d8214cdfa8881737920cb792f4aa2ba80b","src/write/section.rs":"3ce781d5e82ba365ff54fdd36e0ef58c58a2215b09a8861eb0b038efac82b77f","src/write/str.rs":"4850cc2fee55980f9cbb6b4169f9861ab9d05c2b28a85c2b790480b83a66f514","src/write/unit.rs":"36547cdfcbe726006a6e8615618908eca17af2ea8ed875fdb71142cf7c13df98","src/write/writer.rs":"aa6ebe7f2e695c5345558c73e71e3532ab0b3244fc18684bcd18de44e9ee3570","tests/convert_self.rs":"8fba3599ac892a704cbcd5aed53eaef51b040043da04f85f002c597ee7549046","tests/parse_self.rs":"f2da1c7daef7139545c9367c2f26199e8b4623b31d4ec6480ddd851e6980f2dc"},"package":"f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,18 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "adler"
-version = "0.2.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.14"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
@@ -29,27 +31,15 @@
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.36"
+version = "0.1.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd0782e0a7da7598164153173e5a5d4d9b1da094473c98dce0ff91406112369"
-
-[[package]]
-name = "const_fn"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2"
+checksum = "fd4ed89e0a5c3e50b15c0045fbe1ff8567b703bc07544faf935ddff0aaa7b65f"
 
 [[package]]
 name = "crc32fast"
@@ -57,16 +47,16 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"
+checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-epoch",
@@ -76,11 +66,11 @@
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
@@ -90,19 +80,18 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.0"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
 dependencies = [
- "cfg-if 1.0.0",
- "const_fn",
+ "cfg-if",
  "crossbeam-utils",
  "lazy_static",
  "memoffset",
@@ -111,23 +100,21 @@
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b2a58563f049aa3bae172bc4120f093b5901161c629f280a1f40ba55317d774"
+checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.0"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
 dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
- "const_fn",
+ "cfg-if",
  "lazy_static",
 ]
 
@@ -145,11 +132,11 @@
 
 [[package]]
 name = "flate2"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee"
+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "crc32fast",
  "libc",
  "miniz_oxide",
@@ -166,7 +153,7 @@
 
 [[package]]
 name = "gimli"
-version = "0.23.0"
+version = "0.25.0"
 dependencies = [
  "compiler_builtins",
  "crossbeam",
@@ -187,24 +174,24 @@
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -218,15 +205,15 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "memmap"
@@ -240,18 +227,18 @@
 
 [[package]]
 name = "memoffset"
-version = "0.5.6"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
  "autocfg",
@@ -269,19 +256,20 @@
 
 [[package]]
 name = "object"
-version = "0.22.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386"
 dependencies = [
  "flate2",
+ "memchr",
  "wasmparser",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
  "autocfg",
  "crossbeam-deque",
@@ -291,9 +279,9 @@
 
 [[package]]
 name = "rayon-core"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -304,21 +292,20 @@
 
 [[package]]
 name = "regex"
-version = "1.4.1"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.20"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "rustc-std-workspace-alloc"
@@ -354,15 +341,6 @@
 ]
 
 [[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
 name = "typed-arena"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,8 +13,7 @@
 [package]
 edition = "2018"
 name = "gimli"
-version = "0.23.0"
-authors = ["Nick Fitzgerald <fitzgen@gmail.com>", "Philip Craig <philipjcraig@gmail.com>"]
+version = "0.25.0"
 exclude = ["/ci/*", "/releases/*", "/.travis.yml"]
 description = "A library for reading and writing the DWARF debugging format."
 documentation = "https://docs.rs/gimli"
@@ -26,6 +25,10 @@
 [profile.bench]
 codegen-units = 1
 debug = true
+split-debuginfo = "packed"
+
+[profile.test]
+split-debuginfo = "packed"
 
 [[example]]
 name = "simple"
@@ -82,7 +85,8 @@
 version = "1"
 
 [dev-dependencies.object]
-version = "0.22"
+version = "0.26"
+features = ["wasm"]
 
 [dev-dependencies.rayon]
 version = "1.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,95 @@
 
 --------------------------------------------------------------------------------
 
+## 0.25.0
+
+Released 2021/07/26.
+
+### Breaking changes
+
+* `read::FrameDescriptionEntry::unwind_info_for_address` now returns a reference
+  instead of cloning.
+  [#557](https://github.com/gimli-rs/gimli/pull/557)
+
+* `read::AttributeValue::RangeListsRef` now contains a `RawRangeListsOffset`
+  to allow handling of GNU split DWARF extensions.
+  Use `read::Dwarf::ranges_offset_from_raw` to handle it.
+  [#568](https://github.com/gimli-rs/gimli/pull/568)
+  [#569](https://github.com/gimli-rs/gimli/pull/569)
+
+* Added `read::Unit::dwo_id`.
+  [#569](https://github.com/gimli-rs/gimli/pull/569)
+
+### Changed
+
+* `.debug_aranges` parsing now accepts version 3.
+  [#560](https://github.com/gimli-rs/gimli/pull/560)
+
+* `read::Dwarf::attr_ranges_offset` and its callers now handle GNU split DWARF extensions.
+  [#568](https://github.com/gimli-rs/gimli/pull/568)
+  [#569](https://github.com/gimli-rs/gimli/pull/569)
+
+### Added
+
+* Added `read::DebugLineStr::new`.
+  [#556](https://github.com/gimli-rs/gimli/pull/556)
+
+* Added `read::UnwindTable::into_current_row`.
+  [#557](https://github.com/gimli-rs/gimli/pull/557)
+
+* Added more `DW_LANG` constants.
+  [#565](https://github.com/gimli-rs/gimli/pull/565)
+
+* dwarfdump: added DWO parent support.
+  [#568](https://github.com/gimli-rs/gimli/pull/568)
+
+* Added `read::Dwarf` methods: `ranges_offset_from_raw`, `raw_ranges`, and `raw_locations`.
+  [#568](https://github.com/gimli-rs/gimli/pull/568)
+  [#569](https://github.com/gimli-rs/gimli/pull/569)
+
+--------------------------------------------------------------------------------
+
+## 0.24.0
+
+Released 2021/05/01.
+
+### Breaking changes
+
+* Minimum Rust version increased to 1.42.0.
+
+* Added `read::Dwarf::debug_aranges`.
+  [#539](https://github.com/gimli-rs/gimli/pull/539)
+
+* Replaced `read::DebugAranges::items` with `read::DebugAranges::headers`.
+  [#539](https://github.com/gimli-rs/gimli/pull/539)
+
+* Added `read::Operation::Wasm*`.
+  [#546](https://github.com/gimli-rs/gimli/pull/546)
+
+* `read::LineRow::line` now returns `Option<NonZeroU64>`.
+  The `read::ColumnType::Column` variant now contains a `NonZeroU64`.
+  [#551](https://github.com/gimli-rs/gimli/pull/551)
+
+* Replaced `read::Dwarf::debug_str_sup` with `read::Dwarf::sup`.
+  Deleted `sup` parameter of `read::Dwarf::load`.
+  Added `read::Dwarf::load_sup`.
+  [#554](https://github.com/gimli-rs/gimli/pull/554)
+
+### Added
+
+* dwarfdump: Supplementary object file support.
+  [#552](https://github.com/gimli-rs/gimli/pull/552)
+
+### Changed
+
+* Support `DW_FORM_addrx*` for `DW_AT_low_pc`/`DW_AT_high_pc` in `read::Dwarf`.
+  [#541](https://github.com/gimli-rs/gimli/pull/541)
+
+* Performance improvement in `EndianReader`.
+  [#549](https://github.com/gimli-rs/gimli/pull/549)
+
+--------------------------------------------------------------------------------
+
 ## 0.23.0
 
 Released 2020/10/27.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/examples/dwarfdump.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/examples/dwarfdump.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/examples/dwarfdump.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/examples/dwarfdump.rs	2021-12-09 12:01:26.000000000 +0000
@@ -177,7 +177,7 @@
                                 relocation.set_addend(addend as i64);
                             }
                             Err(_) => {
-                                println!(
+                                eprintln!(
                                     "Relocation with invalid symbol for section {} at offset 0x{:08x}",
                                     section.name().unwrap(),
                                     offset
@@ -185,10 +185,10 @@
                             }
                         }
                     }
-                    object::RelocationTarget::Section(_section_idx) => {}
+                    _ => {}
                 }
                 if relocations.insert(offset, relocation).is_some() {
-                    println!(
+                    eprintln!(
                         "Multiple relocations for section {} at offset 0x{:08x}",
                         section.name().unwrap(),
                         offset
@@ -196,7 +196,7 @@
                 }
             }
             _ => {
-                println!(
+                eprintln!(
                     "Unsupported relocation for section {} at offset 0x{:08x}",
                     section.name().unwrap(),
                     offset
@@ -349,7 +349,7 @@
 impl<'a, R: Reader> Reader for Relocate<'a, R> {}
 
 #[derive(Default)]
-struct Flags {
+struct Flags<'a> {
     eh_frame: bool,
     goff: bool,
     info: bool,
@@ -358,20 +358,12 @@
     pubtypes: bool,
     aranges: bool,
     dwo: bool,
+    dwo_parent: Option<object::File<'a>>,
+    sup: Option<object::File<'a>>,
     raw: bool,
     match_units: Option<Regex>,
 }
 
-impl Flags {
-    fn section_name(&self, id: gimli::SectionId) -> Option<&'static str> {
-        if self.dwo {
-            id.dwo_name()
-        } else {
-            Some(id.name())
-        }
-    }
-}
-
 fn print_usage(opts: &getopts::Options) -> ! {
     let brief = format!("Usage: {} <options> <file>", env::args().next().unwrap());
     write!(&mut io::stderr(), "{}", opts.usage(&brief)).ok();
@@ -396,6 +388,12 @@
         "dwo",
         "print the .dwo versions of the selected sections",
     );
+    opts.optopt(
+        "",
+        "dwo-parent",
+        "use the specified file as the parent of the dwo (e.g. for .debug_addr)",
+        "library path",
+    );
     opts.optflag("", "raw", "print raw data values");
     opts.optopt(
         "u",
@@ -403,6 +401,7 @@
         "print compilation units whose output matches a regex",
         "REGEX",
     );
+    opts.optopt("", "sup", "path to supplementary object file", "PATH");
 
     let matches = match opts.parse(env::args().skip(1)) {
         Ok(m) => m,
@@ -463,7 +462,7 @@
         match Regex::new(&r) {
             Ok(r) => Some(r),
             Err(e) => {
-                println!("Invalid regular expression {}: {}", r, e);
+                eprintln!("Invalid regular expression {}: {}", r, e);
                 process::exit(1);
             }
         }
@@ -471,6 +470,39 @@
         None
     };
 
+    let arena_mmap = Arena::new();
+    let load_file = |path| {
+        let file = match fs::File::open(&path) {
+            Ok(file) => file,
+            Err(err) => {
+                eprintln!("Failed to open file '{}': {}", path, err);
+                process::exit(1);
+            }
+        };
+        let mmap = match unsafe { memmap::Mmap::map(&file) } {
+            Ok(mmap) => mmap,
+            Err(err) => {
+                eprintln!("Failed to map file '{}': {}", path, err);
+                process::exit(1);
+            }
+        };
+        let mmap_ref = (*arena_mmap.alloc(mmap)).borrow();
+        match object::File::parse(&**mmap_ref) {
+            Ok(file) => Some(file),
+            Err(err) => {
+                eprintln!("Failed to parse file '{}': {}", path, err);
+                process::exit(1);
+            }
+        }
+    };
+
+    flags.sup = matches.opt_str("sup").and_then(load_file);
+    flags.dwo_parent = matches.opt_str("dwo-parent").and_then(load_file);
+    if flags.dwo_parent.is_some() && !flags.dwo {
+        eprintln!("--dwo-parent also requires --dwo");
+        process::exit(1);
+    }
+
     for file_path in &matches.free {
         if matches.free.len() != 1 {
             println!("{}", file_path);
@@ -480,21 +512,21 @@
         let file = match fs::File::open(&file_path) {
             Ok(file) => file,
             Err(err) => {
-                println!("Failed to open file '{}': {}", file_path, err);
+                eprintln!("Failed to open file '{}': {}", file_path, err);
                 continue;
             }
         };
         let file = match unsafe { memmap::Mmap::map(&file) } {
             Ok(mmap) => mmap,
             Err(err) => {
-                println!("Failed to map file '{}': {}", file_path, err);
+                eprintln!("Failed to map file '{}': {}", file_path, err);
                 continue;
             }
         };
         let file = match object::File::parse(&*file) {
             Ok(file) => file,
             Err(err) => {
-                println!("Failed to parse file '{}': {}", file_path, err);
+                eprintln!("Failed to parse file '{}': {}", file_path, err);
                 continue;
             }
         };
@@ -507,52 +539,99 @@
         let ret = dump_file(&file, endian, &flags);
         match ret {
             Ok(_) => (),
-            Err(err) => println!("Failed to dump '{}': {}", file_path, err,),
+            Err(err) => eprintln!("Failed to dump '{}': {}", file_path, err,),
         }
     }
 }
 
+fn load_file_section<'input, 'arena, Endian: gimli::Endianity>(
+    id: gimli::SectionId,
+    file: &object::File<'input>,
+    endian: Endian,
+    is_dwo: bool,
+    arena_data: &'arena Arena<Cow<'input, [u8]>>,
+    arena_relocations: &'arena Arena<RelocationMap>,
+) -> Result<Relocate<'arena, gimli::EndianSlice<'arena, Endian>>> {
+    let mut relocations = RelocationMap::default();
+    let name = if is_dwo {
+        id.dwo_name()
+    } else {
+        Some(id.name())
+    };
+
+    let data = match name.and_then(|name| file.section_by_name(&name)) {
+        Some(ref section) => {
+            // DWO sections never have relocations, so don't bother.
+            if !is_dwo {
+                add_relocations(&mut relocations, file, section);
+            }
+            section.uncompressed_data()?
+        }
+        // Use a non-zero capacity so that `ReaderOffsetId`s are unique.
+        None => Cow::Owned(Vec::with_capacity(1)),
+    };
+    let data_ref = (*arena_data.alloc(data)).borrow();
+    let reader = gimli::EndianSlice::new(data_ref, endian);
+    let section = reader;
+    let relocations = (*arena_relocations.alloc(relocations)).borrow();
+    Ok(Relocate {
+        relocations,
+        section,
+        reader,
+    })
+}
+
 fn dump_file<Endian>(file: &object::File, endian: Endian, flags: &Flags) -> Result<()>
 where
     Endian: gimli::Endianity + Send + Sync,
 {
-    let arena = (Arena::new(), Arena::new());
+    let arena_data = Arena::new();
+    let arena_relocations = Arena::new();
 
     let mut load_section = |id: gimli::SectionId| -> Result<_> {
-        let mut relocations = RelocationMap::default();
-        let name = flags.section_name(id);
-        let data = match name.and_then(|name| file.section_by_name(&name)) {
-            Some(ref section) => {
-                // DWO sections never have relocations, so don't bother.
-                if !flags.dwo {
-                    add_relocations(&mut relocations, file, section);
-                }
-                section.uncompressed_data()?
-            }
-            // Use a non-zero capacity so that `ReaderOffsetId`s are unique.
-            None => Cow::Owned(Vec::with_capacity(1)),
-        };
-        let data_ref = (*arena.0.alloc(data)).borrow();
-        let reader = gimli::EndianSlice::new(data_ref, endian);
-        let section = reader;
-        let relocations = (*arena.1.alloc(relocations)).borrow();
-        Ok(Relocate {
-            relocations,
-            section,
-            reader,
-        })
+        load_file_section(id, file, endian, flags.dwo, &arena_data, &arena_relocations)
     };
-
-    let no_relocations = (*arena.1.alloc(RelocationMap::default())).borrow();
-    let no_reader = Relocate {
-        relocations: no_relocations,
-        section: Default::default(),
-        reader: Default::default(),
-    };
-
-    let mut dwarf = gimli::Dwarf::load(&mut load_section, |_| Ok(no_reader.clone())).unwrap();
+    let mut dwarf = gimli::Dwarf::load(&mut load_section)?;
+    let mut dwo_parent_units = HashMap::new();
     if flags.dwo {
         dwarf.file_type = gimli::DwarfFileType::Dwo;
+
+        if let Some(dwo_parent_file) = flags.dwo_parent.as_ref() {
+            let mut load_dwo_parent_section = |id: gimli::SectionId| -> Result<_> {
+                load_file_section(
+                    id,
+                    dwo_parent_file,
+                    endian,
+                    false,
+                    &arena_data,
+                    &arena_relocations,
+                )
+            };
+            let dwo_parent = gimli::Dwarf::load(&mut load_dwo_parent_section)?;
+            dwarf.debug_addr = dwo_parent.debug_addr.clone();
+            dwarf.ranges = dwo_parent.ranges.clone();
+            dwo_parent_units = match dwo_parent
+                .units()
+                .map(|unit_header| dwo_parent.unit(unit_header))
+                .filter_map(|unit| Ok(unit.dwo_id.map(|dwo_id| (dwo_id, unit))))
+                .collect()
+            {
+                Ok(units) => units,
+                Err(err) => {
+                    eprintln!("Failed to process --dwo-parent units: {}", err);
+                    return Ok(());
+                }
+            }
+        }
+    }
+
+    if let Some(sup_file) = flags.sup.as_ref() {
+        let mut load_sup_section = |id: gimli::SectionId| -> Result<_> {
+            // Note: we really only need the `.debug_str` section,
+            // but for now we load them all.
+            load_file_section(id, sup_file, endian, false, &arena_data, &arena_relocations)
+        };
+        dwarf.load_sup(&mut load_sup_section)?;
     }
 
     let out = io::stdout();
@@ -601,7 +680,7 @@
         )?;
     }
     if flags.info {
-        dump_info(&dwarf, flags)?;
+        dump_info(&dwarf, dwo_parent_units, flags)?;
         dump_types(&mut BufWriter::new(out.lock()), &dwarf, flags)?;
         writeln!(&mut out.lock())?;
     }
@@ -615,7 +694,7 @@
     }
     if flags.aranges {
         let debug_aranges = &gimli::Section::load(&mut load_section).unwrap();
-        dump_aranges(w, debug_aranges, &dwarf.debug_info)?;
+        dump_aranges(w, debug_aranges)?;
     }
     if flags.pubtypes {
         let debug_pubtypes = &gimli::Section::load(&mut load_section).unwrap();
@@ -904,7 +983,11 @@
     }
 }
 
-fn dump_info<R: Reader>(dwarf: &gimli::Dwarf<R>, flags: &Flags) -> Result<()>
+fn dump_info<R: Reader>(
+    dwarf: &gimli::Dwarf<R>,
+    dwo_parent_units: HashMap<gimli::DwoId, gimli::Unit<R>>,
+    flags: &Flags,
+) -> Result<()>
 where
     R::Endian: Send + Sync,
 {
@@ -951,7 +1034,7 @@
             }
         }
 
-        let unit = match dwarf.unit(header) {
+        let mut unit = match dwarf.unit(header) {
             Ok(unit) => unit,
             Err(err) => {
                 writeln_error(buf, dwarf, err.into(), "Failed to parse unit root entry")?;
@@ -959,6 +1042,14 @@
             }
         };
 
+        if flags.dwo {
+            if let Some(dwo_id) = unit.dwo_id {
+                if let Some(parent_unit) = dwo_parent_units.get(&dwo_id) {
+                    unit.copy_relocated_attributes(parent_unit);
+                }
+            }
+        }
+
         let entries_result = dump_entries(buf, unit, dwarf, flags);
         if let Err(err) = entries_result {
             writeln_error(buf, dwarf, err, "Failed to dump entries")?;
@@ -1230,6 +1321,7 @@
             writeln!(w, "<.debug_macro+0x{:08x}>", offset.0)?;
         }
         gimli::AttributeValue::RangeListsRef(offset) => {
+            let offset = dwarf.ranges_offset_from_raw(unit, offset);
             dump_range_list(w, offset, unit, dwarf)?;
         }
         gimli::AttributeValue::DebugRngListsBase(base) => {
@@ -1252,7 +1344,14 @@
             }
         }
         gimli::AttributeValue::DebugStrRefSup(offset) => {
-            writeln!(w, "<.debug_str(sup)+0x{:08x}>", offset.0)?;
+            if let Some(s) = dwarf
+                .sup()
+                .and_then(|sup| sup.debug_str.get_str(offset).ok())
+            {
+                writeln!(w, "{}", s.to_string_lossy()?)?;
+            } else {
+                writeln!(w, "<.debug_str(sup)+0x{:08x}>", offset.0)?;
+            }
         }
         gimli::AttributeValue::DebugStrOffsetsBase(base) => {
             writeln!(w, "<.debug_str_offsets+0x{:08x}>", base.0)?;
@@ -1383,8 +1482,7 @@
     let mut pc = data.0.clone();
     let mut space = false;
     while pc.len() != 0 {
-        let mut op_pc = pc.clone();
-        let dwop = gimli::DwOp(op_pc.read_u8()?);
+        let pc_clone = pc.clone();
         match gimli::Operation::parse(&mut pc, encoding) {
             Ok(op) => {
                 if space {
@@ -1392,7 +1490,7 @@
                 } else {
                     space = true;
                 }
-                dump_op(w, encoding, dwop, op)?;
+                dump_op(w, encoding, pc_clone, op)?;
             }
             Err(gimli::Error::InvalidExpression(op)) => {
                 writeln!(w, "WARNING: unsupported operation 0x{:02x}", op.0)?;
@@ -1418,9 +1516,10 @@
 fn dump_op<R: Reader, W: Write>(
     w: &mut W,
     encoding: gimli::Encoding,
-    dwop: gimli::DwOp,
+    mut pc: R,
     op: gimli::Operation<R>,
 ) -> Result<()> {
+    let dwop = gimli::DwOp(pc.read_u8()?);
     write!(w, "{}", dwop)?;
     match op {
         gimli::Operation::Deref {
@@ -1553,6 +1652,12 @@
         gimli::Operation::Reinterpret { base_type } => {
             write!(w, " type 0x{:08x}", base_type.0)?;
         }
+        gimli::Operation::WasmLocal { index }
+        | gimli::Operation::WasmGlobal { index }
+        | gimli::Operation::WasmStack { index } => {
+            let wasmop = pc.read_u8()?;
+            write!(w, " 0x{:x} 0x{:x}", wasmop, index)?;
+        }
         gimli::Operation::Drop
         | gimli::Operation::Swap
         | gimli::Operation::Rot
@@ -1591,7 +1696,7 @@
     unit: &gimli::Unit<R>,
     dwarf: &gimli::Dwarf<R>,
 ) -> Result<()> {
-    let raw_locations = dwarf.locations.raw_locations(offset, unit.encoding())?;
+    let raw_locations = dwarf.raw_locations(unit, offset)?;
     let raw_locations: Vec<_> = raw_locations.collect()?;
     let mut locations = dwarf.locations(unit, offset)?;
     writeln!(
@@ -1719,7 +1824,7 @@
     unit: &gimli::Unit<R>,
     dwarf: &gimli::Dwarf<R>,
 ) -> Result<()> {
-    let raw_ranges = dwarf.ranges.raw_ranges(offset, unit.encoding())?;
+    let raw_ranges = dwarf.raw_ranges(unit, offset)?;
     let raw_ranges: Vec<_> = raw_ranges.collect()?;
     let mut ranges = dwarf.ranges(unit, offset)?;
     writeln!(
@@ -1985,9 +2090,12 @@
         let mut rows = program.rows();
         let mut file_index = 0;
         while let Some((header, row)) = rows.next_row()? {
-            let line = row.line().unwrap_or(0);
+            let line = match row.line() {
+                Some(line) => line.get(),
+                None => 0,
+            };
             let column = match row.column() {
-                gimli::ColumnType::Column(column) => column,
+                gimli::ColumnType::Column(column) => column.get(),
                 gimli::ColumnType::LeftEdge => 0,
             };
             write!(w, "0x{:08x}  [{:4},{:2}]", row.address(), line, column)?;
@@ -2108,36 +2216,33 @@
 fn dump_aranges<R: Reader, W: Write>(
     w: &mut W,
     debug_aranges: &gimli::DebugAranges<R>,
-    debug_info: &gimli::DebugInfo<R>,
 ) -> Result<()> {
     writeln!(w, "\n.debug_aranges")?;
 
-    let mut cu_die_offset = gimli::DebugInfoOffset(0);
-    let mut prev_cu_offset = None;
-    let mut aranges = debug_aranges.items();
-    while let Some(arange) = aranges.next()? {
-        let cu_offset = arange.debug_info_offset();
-        if Some(cu_offset) != prev_cu_offset {
-            let cu = debug_info.header_from_offset(cu_offset)?;
-            cu_die_offset = gimli::DebugInfoOffset(cu_offset.0 + cu.header_size());
-            prev_cu_offset = Some(cu_offset);
-        }
-        if let Some(segment) = arange.segment() {
-            write!(
-                w,
-                "arange starts at seg,off 0x{:08x},0x{:08x}, ",
-                segment,
-                arange.address()
-            )?;
-        } else {
-            write!(w, "arange starts at 0x{:08x}, ", arange.address())?;
-        }
+    let mut headers = debug_aranges.headers();
+    while let Some(header) = headers.next()? {
         writeln!(
             w,
-            "length of 0x{:08x}, cu_die_offset = 0x{:08x}",
-            arange.length(),
-            cu_die_offset.0
+            "Address Range Header: length = 0x{:08x}, version = 0x{:04x}, cu_offset = 0x{:08x}, addr_size = 0x{:02x}, seg_size = 0x{:02x}",
+            header.length(),
+            header.encoding().version,
+            header.debug_info_offset().0,
+            header.encoding().address_size,
+            header.segment_size(),
         )?;
+        let mut aranges = header.entries();
+        while let Some(arange) = aranges.next()? {
+            let range = arange.range();
+            if let Some(segment) = arange.segment() {
+                writeln!(
+                    w,
+                    "[0x{:016x},  0x{:016x}) segment 0x{:x}",
+                    range.begin, range.end, segment
+                )?;
+            } else {
+                writeln!(w, "[0x{:016x},  0x{:016x})", range.begin, range.end)?;
+            }
+        }
     }
     Ok(())
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/examples/simple_line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/examples/simple_line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/examples/simple_line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/examples/simple_line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -27,12 +27,9 @@
             None => Ok(borrow::Cow::Borrowed(&[][..])),
         }
     };
-    // Load a supplementary section. We don't have a supplementary object file,
-    // so always return an empty slice.
-    let load_section_sup = |_| Ok(borrow::Cow::Borrowed(&[][..]));
 
     // Load all of the sections.
-    let dwarf_cow = gimli::Dwarf::load(&load_section, &load_section_sup)?;
+    let dwarf_cow = gimli::Dwarf::load(&load_section)?;
 
     // Borrow a `Cow<[u8]>` to create an `EndianSlice`.
     let borrow_section: &dyn for<'a> Fn(
@@ -84,10 +81,13 @@
 
                     // Determine line/column. DWARF line/column is never 0, so we use that
                     // but other applications may want to display this differently.
-                    let line = row.line().unwrap_or(0);
+                    let line = match row.line() {
+                        Some(line) => line.get(),
+                        None => 0,
+                    };
                     let column = match row.column() {
                         gimli::ColumnType::LeftEdge => 0,
-                        gimli::ColumnType::Column(x) => x,
+                        gimli::ColumnType::Column(column) => column.get(),
                     };
 
                     println!("{:x} {}:{}:{}", row.address(), path.display(), line, column);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/examples/simple.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/examples/simple.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/examples/simple.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/examples/simple.rs	2021-12-09 12:01:26.000000000 +0000
@@ -27,12 +27,9 @@
             None => Ok(borrow::Cow::Borrowed(&[][..])),
         }
     };
-    // Load a supplementary section. We don't have a supplementary object file,
-    // so always return an empty slice.
-    let load_section_sup = |_| Ok(borrow::Cow::Borrowed(&[][..]));
 
     // Load all of the sections.
-    let dwarf_cow = gimli::Dwarf::load(&load_section, &load_section_sup)?;
+    let dwarf_cow = gimli::Dwarf::load(&load_section)?;
 
     // Borrow a `Cow<[u8]>` to create an `EndianSlice`.
     let borrow_section: &dyn for<'a> Fn(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -30,10 +30,10 @@
 
 ```toml
 [dependencies]
-gimli = "0.23.0"
+gimli = "0.25.0"
 ```
 
-The minimum supported Rust version is 1.38.0.
+The minimum supported Rust version is 1.42.0.
 
 ## Documentation
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/common.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/common.rs	2021-12-09 12:01:26.000000000 +0000
@@ -99,6 +99,10 @@
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct DebugAddrIndex<T = usize>(pub T);
 
+/// An offset into the `.debug_aranges` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugArangesOffset<T = usize>(pub T);
+
 /// An offset into the `.debug_info` section.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
 pub struct DebugInfoOffset<T = usize>(pub T);
@@ -134,6 +138,14 @@
 
 /// An offset into either the `.debug_ranges` section or the `.debug_rnglists` section,
 /// depending on the version of the unit the offset was contained in.
+///
+/// If this is from a DWARF 4 DWO file, then it must additionally be offset by the
+/// value of `DW_AT_GNU_ranges_base`. You can use `Dwarf::ranges_offset_from_raw` to do this.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct RawRangeListsOffset<T = usize>(pub T);
+
+/// An offset into either the `.debug_ranges` section or the `.debug_rnglists` section,
+/// depending on the version of the unit the offset was contained in.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct RangeListsOffset<T = usize>(pub T);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/constants.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/constants.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/constants.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/constants.rs	2021-12-09 12:01:26.000000000 +0000
@@ -822,6 +822,15 @@
     DW_LANG_Fortran08 = 0x0023,
     DW_LANG_RenderScript = 0x0024,
     DW_LANG_BLISS = 0x0025,
+    DW_LANG_Kotlin = 0x0026,
+    DW_LANG_Zig = 0x0027,
+    DW_LANG_Crystal = 0x0028,
+    DW_LANG_C_plus_plus_17 = 0x002a,
+    DW_LANG_C_plus_plus_20 = 0x002b,
+    DW_LANG_C17 = 0x002c,
+    DW_LANG_Fortran18 = 0x002d,
+    DW_LANG_Ada2005 = 0x002e,
+    DW_LANG_Ada2012 = 0x002f,
 
     DW_LANG_lo_user = 0x8000,
     DW_LANG_hi_user = 0xffff,
@@ -1209,7 +1218,7 @@
     DW_OP_convert = 0xa8,
     DW_OP_reinterpret = 0xa9,
 
-// GNU extensions
+    // GNU extensions
     DW_OP_GNU_push_tls_address = 0xe0,
     DW_OP_GNU_implicit_pointer = 0xf2,
     DW_OP_GNU_entry_value = 0xf3,
@@ -1221,6 +1230,9 @@
     DW_OP_GNU_parameter_ref = 0xfa,
     DW_OP_GNU_addr_index = 0xfb,
     DW_OP_GNU_const_index = 0xfc,
+
+    // Wasm extensions
+    DW_OP_WASM_location = 0xed,
 });
 
 dw!(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/aranges.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/aranges.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/aranges.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/aranges.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,94 +1,173 @@
-use core::cmp::Ordering;
-use core::marker::PhantomData;
-
-use crate::common::{DebugInfoOffset, Encoding, SectionId};
+use crate::common::{DebugArangesOffset, DebugInfoOffset, Encoding, SectionId};
 use crate::endianity::Endianity;
-use crate::read::lookup::{DebugLookup, LookupEntryIter, LookupParser};
-use crate::read::{
-    parse_debug_info_offset, EndianSlice, Error, Reader, ReaderOffset, Result, Section,
-};
+use crate::read::{EndianSlice, Error, Range, Reader, ReaderOffset, Result, Section};
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-struct ArangeHeader<T = usize> {
-    encoding: Encoding,
-    length: T,
-    offset: DebugInfoOffset<T>,
-    segment_size: u8,
+/// The `DebugAranges` struct represents the DWARF address range information
+/// found in the `.debug_aranges` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugAranges<R> {
+    section: R,
 }
 
-/// A single parsed arange.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ArangeEntry<T: Copy = usize> {
-    segment: Option<u64>,
-    address: u64,
-    length: u64,
-    unit_header_offset: DebugInfoOffset<T>,
+impl<'input, Endian> DebugAranges<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugAranges` instance from the data in the `.debug_aranges`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_aranges` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugAranges, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_aranges_section = || &buf;
+    /// let debug_aranges =
+    ///     DebugAranges::new(read_debug_aranges_section(), LittleEndian);
+    /// ```
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        DebugAranges {
+            section: EndianSlice::new(section, endian),
+        }
+    }
 }
 
-impl<T: Copy> ArangeEntry<T> {
-    /// Return the segment selector of this arange.
-    #[inline]
-    pub fn segment(&self) -> Option<u64> {
-        self.segment
+impl<R: Reader> DebugAranges<R> {
+    /// Iterate the sets of entries in the `.debug_aranges` section.
+    ///
+    /// Each set of entries belongs to a single unit.
+    pub fn headers(&self) -> ArangeHeaderIter<R> {
+        ArangeHeaderIter {
+            input: self.section.clone(),
+            offset: DebugArangesOffset(R::Offset::from_u8(0)),
+        }
     }
 
-    /// Return the beginning address of this arange.
-    #[inline]
-    pub fn address(&self) -> u64 {
-        self.address
+    /// Get the header at the given offset.
+    pub fn header(&self, offset: DebugArangesOffset<R::Offset>) -> Result<ArangeHeader<R>> {
+        let mut input = self.section.clone();
+        input.skip(offset.0)?;
+        ArangeHeader::parse(&mut input, offset)
     }
+}
 
-    /// Return the length of this arange.
-    #[inline]
-    pub fn length(&self) -> u64 {
-        self.length
+impl<T> DebugAranges<T> {
+    /// Create a `DebugAranges` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugAranges<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugAranges<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.section).into()
     }
+}
 
-    /// Return the offset into the .debug_info section for this arange.
-    #[inline]
-    pub fn debug_info_offset(&self) -> DebugInfoOffset<T> {
-        self.unit_header_offset
+impl<R> Section<R> for DebugAranges<R> {
+    fn id() -> SectionId {
+        SectionId::DebugAranges
     }
-}
 
-impl<T: Copy + Ord> PartialOrd for ArangeEntry<T> {
-    fn partial_cmp(&self, other: &ArangeEntry<T>) -> Option<Ordering> {
-        Some(self.cmp(other))
+    fn reader(&self) -> &R {
+        &self.section
     }
 }
 
-impl<T: Copy + Ord> Ord for ArangeEntry<T> {
-    fn cmp(&self, other: &ArangeEntry<T>) -> Ordering {
-        // The expected comparison, but ignore header.
-        self.segment
-            .cmp(&other.segment)
-            .then(self.address.cmp(&other.address))
-            .then(self.length.cmp(&other.length))
+impl<R> From<R> for DebugAranges<R> {
+    fn from(section: R) -> Self {
+        DebugAranges { section }
     }
 }
 
+/// An iterator over the headers of a `.debug_aranges` section.
 #[derive(Clone, Debug)]
-struct ArangeParser<R: Reader> {
-    // This struct is never instantiated.
-    phantom: PhantomData<R>,
+pub struct ArangeHeaderIter<R: Reader> {
+    input: R,
+    offset: DebugArangesOffset<R::Offset>,
 }
 
-impl<R: Reader> LookupParser<R> for ArangeParser<R> {
-    type Header = ArangeHeader<R::Offset>;
-    type Entry = ArangeEntry<R::Offset>;
-
-    /// Parse an arange set header. Returns a tuple of the aranges to be
-    /// parsed for this set, and the newly created ArangeHeader struct.
-    fn parse_header(input: &mut R) -> Result<(R, Self::Header)> {
+impl<R: Reader> ArangeHeaderIter<R> {
+    /// Advance the iterator to the next header.
+    pub fn next(&mut self) -> Result<Option<ArangeHeader<R>>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        let len = self.input.len();
+        match ArangeHeader::parse(&mut self.input, self.offset) {
+            Ok(header) => {
+                self.offset.0 += len - self.input.len();
+                Ok(Some(header))
+            }
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for ArangeHeaderIter<R> {
+    type Item = ArangeHeader<R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        ArangeHeaderIter::next(self)
+    }
+}
+
+/// A header for a set of entries in the `.debug_arange` section.
+///
+/// These entries all belong to a single unit.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ArangeHeader<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    offset: DebugArangesOffset<Offset>,
+    encoding: Encoding,
+    length: Offset,
+    debug_info_offset: DebugInfoOffset<Offset>,
+    segment_size: u8,
+    entries: R,
+}
+
+impl<R, Offset> ArangeHeader<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    fn parse(input: &mut R, offset: DebugArangesOffset<Offset>) -> Result<Self> {
         let (length, format) = input.read_initial_length()?;
         let mut rest = input.split(length)?;
 
+        // Check the version. The DWARF 5 spec says that this is always 2, but version 3
+        // has been observed in the wild, potentially due to a bug; see
+        // https://github.com/gimli-rs/gimli/issues/559 for more information.
+        // lldb allows versions 2 through 5, possibly by mistake.
         let version = rest.read_u16()?;
-        if version != 2 {
+        if version != 2 && version != 3 {
             return Err(Error::UnknownVersion(u64::from(version)));
         }
 
-        let offset = parse_debug_info_offset(&mut rest, format)?;
+        let debug_info_offset = rest.read_offset(format).map(DebugInfoOffset)?;
         let address_size = rest.read_u8()?;
         let segment_size = rest.read_u8()?;
 
@@ -118,21 +197,120 @@
             address_size,
             // TODO: segment_size
         };
-        Ok((
-            rest,
-            ArangeHeader {
-                encoding,
-                length,
-                offset,
-                segment_size,
-            },
-        ))
+        Ok(ArangeHeader {
+            offset,
+            encoding,
+            length,
+            debug_info_offset,
+            segment_size,
+            entries: rest,
+        })
+    }
+
+    /// Return the offset of this header within the `.debug_aranges` section.
+    #[inline]
+    pub fn offset(&self) -> DebugArangesOffset<Offset> {
+        self.offset
+    }
+
+    /// Return the length of this set of entries, including the header.
+    #[inline]
+    pub fn length(&self) -> Offset {
+        self.length
+    }
+
+    /// Return the encoding parameters for this set of entries.
+    #[inline]
+    pub fn encoding(&self) -> Encoding {
+        self.encoding
     }
 
+    /// Return the segment size for this set of entries.
+    #[inline]
+    pub fn segment_size(&self) -> u8 {
+        self.segment_size
+    }
+
+    /// Return the offset into the .debug_info section for this set of arange entries.
+    #[inline]
+    pub fn debug_info_offset(&self) -> DebugInfoOffset<Offset> {
+        self.debug_info_offset
+    }
+
+    /// Return the arange entries in this set.
+    #[inline]
+    pub fn entries(&self) -> ArangeEntryIter<R> {
+        ArangeEntryIter {
+            input: self.entries.clone(),
+            encoding: self.encoding,
+            segment_size: self.segment_size,
+        }
+    }
+}
+
+/// An iterator over the aranges from a `.debug_aranges` section.
+///
+/// Can be [used with
+/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+#[derive(Debug, Clone)]
+pub struct ArangeEntryIter<R: Reader> {
+    input: R,
+    encoding: Encoding,
+    segment_size: u8,
+}
+
+impl<R: Reader> ArangeEntryIter<R> {
+    /// Advance the iterator and return the next arange.
+    ///
+    /// Returns the newly parsed arange as `Ok(Some(arange))`. Returns `Ok(None)`
+    /// when iteration is complete and all aranges have already been parsed and
+    /// yielded. If an error occurs while parsing the next arange, then this error
+    /// is returned as `Err(e)`, and all subsequent calls return `Ok(None)`.
+    pub fn next(&mut self) -> Result<Option<ArangeEntry>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        match ArangeEntry::parse(&mut self.input, self.encoding, self.segment_size) {
+            Ok(Some(entry)) => Ok(Some(entry)),
+            Ok(None) => {
+                self.input.empty();
+                Ok(None)
+            }
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for ArangeEntryIter<R> {
+    type Item = ArangeEntry;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        ArangeEntryIter::next(self)
+    }
+}
+
+/// A single parsed arange.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct ArangeEntry {
+    segment: Option<u64>,
+    address: u64,
+    length: u64,
+}
+
+impl ArangeEntry {
     /// Parse a single arange. Return `None` for the null arange, `Some` for an actual arange.
-    fn parse_entry(input: &mut R, header: &Self::Header) -> Result<Option<Self::Entry>> {
-        let address_size = header.encoding.address_size;
-        let segment_size = header.segment_size; // May be zero!
+    fn parse<R: Reader>(
+        input: &mut R,
+        encoding: Encoding,
+        segment_size: u8,
+    ) -> Result<Option<Self>> {
+        let address_size = encoding.address_size;
 
         let tuple_length = R::Offset::from_u8(2 * address_size + segment_size);
         if tuple_length > input.len() {
@@ -149,10 +327,10 @@
         let length = input.read_address(address_size)?;
 
         match (segment, address, length) {
-            // There may be multiple sets of tuples, each terminated by a zero tuple.
-            // It's not clear what purpose these zero tuples serve.  For now, we
-            // simply skip them.
-            (0, 0, 0) => Self::parse_entry(input, header),
+            // This is meant to be a null terminator, but in practice it can occur
+            // before the end, possibly due to a linker omitting a function and
+            // leaving an unrelocated entry.
+            (0, 0, 0) => Self::parse(input, encoding, segment_size),
             _ => Ok(Some(ArangeEntry {
                 segment: if segment_size != 0 {
                     Some(segment)
@@ -161,103 +339,35 @@
                 },
                 address,
                 length,
-                unit_header_offset: header.offset,
             })),
         }
     }
-}
 
-/// The `DebugAranges` struct represents the DWARF address range information
-/// found in the `.debug_aranges` section.
-#[derive(Debug, Clone)]
-pub struct DebugAranges<R: Reader>(DebugLookup<R, ArangeParser<R>>);
-
-impl<'input, Endian> DebugAranges<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugAranges` instance from the data in the `.debug_aranges`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_aranges` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugAranges, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_aranges_section = || &buf;
-    /// let debug_aranges =
-    ///     DebugAranges::new(read_debug_aranges_section(), LittleEndian);
-    /// ```
-    pub fn new(debug_aranges_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_aranges_section, endian))
-    }
-}
-
-impl<R: Reader> DebugAranges<R> {
-    /// Iterate the aranges in the `.debug_aranges` section.
-    ///
-    /// ```
-    /// use gimli::{DebugAranges, EndianSlice, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_aranges_section = || &buf;
-    /// let debug_aranges = DebugAranges::new(read_debug_aranges_section(), LittleEndian);
-    ///
-    /// let mut iter = debug_aranges.items();
-    /// while let Some(arange) = iter.next().unwrap() {
-    ///     println!("arange starts at {}, has length {}", arange.address(), arange.length());
-    /// }
-    /// ```
-    pub fn items(&self) -> ArangeEntryIter<R> {
-        ArangeEntryIter(self.0.items())
-    }
-}
-
-impl<R: Reader> Section<R> for DebugAranges<R> {
-    fn id() -> SectionId {
-        SectionId::DebugAranges
-    }
-
-    fn reader(&self) -> &R {
-        self.0.reader()
+    /// Return the segment selector of this arange.
+    #[inline]
+    pub fn segment(&self) -> Option<u64> {
+        self.segment
     }
-}
 
-impl<R: Reader> From<R> for DebugAranges<R> {
-    fn from(debug_aranges_section: R) -> Self {
-        DebugAranges(DebugLookup::from(debug_aranges_section))
+    /// Return the beginning address of this arange.
+    #[inline]
+    pub fn address(&self) -> u64 {
+        self.address
     }
-}
 
-/// An iterator over the aranges from a `.debug_aranges` section.
-///
-/// Can be [used with
-/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-#[derive(Debug, Clone)]
-pub struct ArangeEntryIter<R: Reader>(LookupEntryIter<R, ArangeParser<R>>);
-
-impl<R: Reader> ArangeEntryIter<R> {
-    /// Advance the iterator and return the next arange.
-    ///
-    /// Returns the newly parsed arange as `Ok(Some(arange))`. Returns `Ok(None)`
-    /// when iteration is complete and all aranges have already been parsed and
-    /// yielded. If an error occurs while parsing the next arange, then this error
-    /// is returned as `Err(e)`, and all subsequent calls return `Ok(None)`.
-    pub fn next(&mut self) -> Result<Option<ArangeEntry<R::Offset>>> {
-        self.0.next()
+    /// Return the length of this arange.
+    #[inline]
+    pub fn length(&self) -> u64 {
+        self.length
     }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for ArangeEntryIter<R> {
-    type Item = ArangeEntry<R::Offset>;
-    type Error = Error;
 
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        self.0.next()
+    /// Return the range.
+    #[inline]
+    pub fn range(&self) -> Range {
+        Range {
+            begin: self.address,
+            end: self.address.wrapping_add(self.length),
+        }
     }
 }
 
@@ -266,10 +376,63 @@
     use super::*;
     use crate::common::{DebugInfoOffset, Format};
     use crate::endianity::LittleEndian;
-    use crate::read::lookup::LookupParser;
     use crate::read::EndianSlice;
 
     #[test]
+    fn test_iterate_headers() {
+        #[rustfmt::skip]
+        let buf = [
+            // 32-bit length = 28.
+            0x1c, 0x00, 0x00, 0x00,
+            // Version.
+            0x02, 0x00,
+            // Offset.
+            0x01, 0x02, 0x03, 0x04,
+            // Address size.
+            0x04,
+            // Segment size.
+            0x00,
+            // Dummy padding and arange tuples.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+            // 32-bit length = 36.
+            0x24, 0x00, 0x00, 0x00,
+            // Version.
+            0x02, 0x00,
+            // Offset.
+            0x11, 0x12, 0x13, 0x14,
+            // Address size.
+            0x04,
+            // Segment size.
+            0x00,
+            // Dummy padding and arange tuples.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        ];
+
+        let debug_aranges = DebugAranges::new(&buf, LittleEndian);
+        let mut headers = debug_aranges.headers();
+
+        let header = headers
+            .next()
+            .expect("should parse header ok")
+            .expect("should have a header");
+        assert_eq!(header.offset(), DebugArangesOffset(0));
+        assert_eq!(header.debug_info_offset(), DebugInfoOffset(0x0403_0201));
+
+        let header = headers
+            .next()
+            .expect("should parse header ok")
+            .expect("should have a header");
+        assert_eq!(header.offset(), DebugArangesOffset(0x20));
+        assert_eq!(header.debug_info_offset(), DebugInfoOffset(0x1413_1211));
+    }
+
+    #[test]
     fn test_parse_header_ok() {
         #[rustfmt::skip]
         let buf = [
@@ -303,27 +466,26 @@
 
         let rest = &mut EndianSlice::new(&buf, LittleEndian);
 
-        let (tuples, header) = ArangeParser::parse_header(rest).expect("should parse header ok");
+        let header =
+            ArangeHeader::parse(rest, DebugArangesOffset(0x10)).expect("should parse header ok");
 
         assert_eq!(
             *rest,
             EndianSlice::new(&buf[buf.len() - 16..], LittleEndian)
         );
         assert_eq!(
-            tuples,
-            EndianSlice::new(&buf[buf.len() - 32..buf.len() - 16], LittleEndian)
-        );
-        assert_eq!(
             header,
             ArangeHeader {
+                offset: DebugArangesOffset(0x10),
                 encoding: Encoding {
                     format: Format::Dwarf32,
                     version: 2,
                     address_size: 8,
                 },
                 length: 0x20,
-                offset: DebugInfoOffset(0x0403_0201),
+                debug_info_offset: DebugInfoOffset(0x0403_0201),
                 segment_size: 4,
+                entries: EndianSlice::new(&buf[buf.len() - 32..buf.len() - 16], LittleEndian),
             }
         );
     }
@@ -362,7 +524,8 @@
 
         let rest = &mut EndianSlice::new(&buf, LittleEndian);
 
-        let error = ArangeParser::parse_header(rest).expect_err("should fail to parse header");
+        let error = ArangeHeader::parse(rest, DebugArangesOffset(0x10))
+            .expect_err("should fail to parse header");
         assert_eq!(error, Error::InvalidAddressRange);
     }
 
@@ -401,25 +564,23 @@
 
         let rest = &mut EndianSlice::new(&buf, LittleEndian);
 
-        let error = ArangeParser::parse_header(rest).expect_err("should fail to parse header");
+        let error = ArangeHeader::parse(rest, DebugArangesOffset(0x10))
+            .expect_err("should fail to parse header");
         assert_eq!(error, Error::InvalidAddressRange);
     }
 
     #[test]
     fn test_parse_entry_ok() {
-        let header = ArangeHeader {
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 2,
-                address_size: 4,
-            },
-            length: 0,
-            offset: DebugInfoOffset(0),
-            segment_size: 0,
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 2,
+            address_size: 4,
         };
+        let segment_size = 0;
         let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09];
         let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let entry = ArangeParser::parse_entry(rest, &header).expect("should parse entry ok");
+        let entry =
+            ArangeEntry::parse(rest, encoding, segment_size).expect("should parse entry ok");
         assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
         assert_eq!(
             entry,
@@ -427,23 +588,18 @@
                 segment: None,
                 address: 0x0403_0201,
                 length: 0x0807_0605,
-                unit_header_offset: header.offset,
             })
         );
     }
 
     #[test]
     fn test_parse_entry_segment() {
-        let header = ArangeHeader {
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 2,
-                address_size: 4,
-            },
-            length: 0,
-            offset: DebugInfoOffset(0),
-            segment_size: 8,
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 2,
+            address_size: 4,
         };
+        let segment_size = 8;
         #[rustfmt::skip]
         let buf = [
             // Segment.
@@ -456,7 +612,8 @@
             0x09
         ];
         let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let entry = ArangeParser::parse_entry(rest, &header).expect("should parse entry ok");
+        let entry =
+            ArangeEntry::parse(rest, encoding, segment_size).expect("should parse entry ok");
         assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
         assert_eq!(
             entry,
@@ -464,23 +621,18 @@
                 segment: Some(0x1817_1615_1413_1211),
                 address: 0x0403_0201,
                 length: 0x0807_0605,
-                unit_header_offset: header.offset,
             })
         );
     }
 
     #[test]
     fn test_parse_entry_zero() {
-        let header = ArangeHeader {
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 2,
-                address_size: 4,
-            },
-            length: 0,
-            offset: DebugInfoOffset(0),
-            segment_size: 0,
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 2,
+            address_size: 4,
         };
+        let segment_size = 0;
         #[rustfmt::skip]
         let buf = [
             // Zero tuple.
@@ -493,7 +645,8 @@
             0x09
         ];
         let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let entry = ArangeParser::parse_entry(rest, &header).expect("should parse entry ok");
+        let entry =
+            ArangeEntry::parse(rest, encoding, segment_size).expect("should parse entry ok");
         assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
         assert_eq!(
             entry,
@@ -501,7 +654,6 @@
                 segment: None,
                 address: 0x0403_0201,
                 length: 0x0807_0605,
-                unit_header_offset: header.offset,
             })
         );
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/cfi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/cfi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/cfi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/cfi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -369,14 +369,14 @@
     ///
     /// You must provide a function to get the associated CIE. See
     /// `PartialFrameDescriptionEntry::parse` for more information.
-    pub fn unwind_info_for_address<F>(
+    pub fn unwind_info_for_address<'ctx, F>(
         &self,
         frame: &EhFrame<R>,
         bases: &BaseAddresses,
-        ctx: &mut UninitializedUnwindContext<R>,
+        ctx: &'ctx mut UninitializedUnwindContext<R>,
         address: u64,
         get_cie: F,
-    ) -> Result<UnwindTableRow<R>>
+    ) -> Result<&'ctx UnwindTableRow<R>>
     where
         F: FnMut(
             &EhFrame<R>,
@@ -676,13 +676,13 @@
     /// # }
     /// ```
     #[inline]
-    fn unwind_info_for_address<F>(
+    fn unwind_info_for_address<'ctx, F>(
         &self,
         bases: &BaseAddresses,
-        ctx: &mut UninitializedUnwindContext<R>,
+        ctx: &'ctx mut UninitializedUnwindContext<R>,
         address: u64,
         get_cie: F,
-    ) -> Result<UnwindTableRow<R>>
+    ) -> Result<&'ctx UnwindTableRow<R>>
     where
         F: FnMut(&Self, &BaseAddresses, Self::Offset) -> Result<CommonInformationEntry<R>>,
     {
@@ -1607,12 +1607,12 @@
 
     /// Return the table of unwind information for this FDE.
     #[inline]
-    pub fn rows<'a, Section: UnwindSection<R>>(
+    pub fn rows<'a, 'ctx, Section: UnwindSection<R>>(
         &self,
         section: &'a Section,
         bases: &'a BaseAddresses,
-        ctx: &'a mut UninitializedUnwindContext<R>,
-    ) -> Result<UnwindTable<'a, R>> {
+        ctx: &'ctx mut UninitializedUnwindContext<R>,
+    ) -> Result<UnwindTable<'a, 'ctx, R>> {
         UnwindTable::new(section, bases, ctx, self)
     }
 
@@ -1622,17 +1622,17 @@
     /// context in the form `Ok((unwind_info, context))`. If not found,
     /// `Err(gimli::Error::NoUnwindInfoForAddress)` is returned. If parsing or
     /// CFI evaluation fails, the error is returned.
-    pub fn unwind_info_for_address<Section: UnwindSection<R>>(
+    pub fn unwind_info_for_address<'ctx, Section: UnwindSection<R>>(
         &self,
         section: &Section,
         bases: &BaseAddresses,
-        ctx: &mut UninitializedUnwindContext<R>,
+        ctx: &'ctx mut UninitializedUnwindContext<R>,
         address: u64,
-    ) -> Result<UnwindTableRow<R>> {
+    ) -> Result<&'ctx UnwindTableRow<R>> {
         let mut table = self.rows(section, bases, ctx)?;
         while let Some(row) = table.next_row()? {
             if row.contains(address) {
-                return Ok(row.clone());
+                return Ok(table.ctx.row());
             }
         }
         Err(Error::NoUnwindInfoForAddress)
@@ -2007,29 +2007,30 @@
 /// > recording just the differences starting at the beginning address of each
 /// > subroutine in the program.
 #[derive(Debug)]
-pub struct UnwindTable<'a, R: Reader> {
+pub struct UnwindTable<'a, 'ctx, R: Reader> {
     code_alignment_factor: Wrapping<u64>,
     data_alignment_factor: Wrapping<i64>,
     next_start_address: u64,
     last_end_address: u64,
     returned_last_row: bool,
+    current_row_valid: bool,
     instructions: CallFrameInstructionIter<'a, R>,
-    ctx: &'a mut UnwindContext<R>,
+    ctx: &'ctx mut UnwindContext<R>,
 }
 
 /// # Signal Safe Methods
 ///
 /// These methods are guaranteed not to allocate, acquire locks, or perform any
 /// other signal-unsafe operations.
-impl<'a, R: Reader> UnwindTable<'a, R> {
+impl<'a, 'ctx, R: Reader> UnwindTable<'a, 'ctx, R> {
     /// Construct a new `UnwindTable` for the given
     /// `FrameDescriptionEntry`'s CFI unwinding program.
     pub fn new<Section: UnwindSection<R>>(
         section: &'a Section,
         bases: &'a BaseAddresses,
-        ctx: &'a mut UninitializedUnwindContext<R>,
+        ctx: &'ctx mut UninitializedUnwindContext<R>,
         fde: &FrameDescriptionEntry<R>,
-    ) -> Result<UnwindTable<'a, R>> {
+    ) -> Result<UnwindTable<'a, 'ctx, R>> {
         let ctx = ctx.initialize(section, bases, fde.cie())?;
         Ok(Self::new_for_fde(section, bases, ctx, fde))
     }
@@ -2037,9 +2038,9 @@
     fn new_for_fde<Section: UnwindSection<R>>(
         section: &'a Section,
         bases: &'a BaseAddresses,
-        ctx: &'a mut UnwindContext<R>,
+        ctx: &'ctx mut UnwindContext<R>,
         fde: &FrameDescriptionEntry<R>,
-    ) -> UnwindTable<'a, R> {
+    ) -> UnwindTable<'a, 'ctx, R> {
         assert!(ctx.stack().len() >= 1);
         UnwindTable {
             code_alignment_factor: Wrapping(fde.cie().code_alignment_factor()),
@@ -2047,6 +2048,7 @@
             next_start_address: fde.initial_address(),
             last_end_address: fde.initial_address().wrapping_add(fde.len()),
             returned_last_row: false,
+            current_row_valid: false,
             instructions: fde.instructions(section, bases),
             ctx,
         }
@@ -2055,9 +2057,9 @@
     fn new_for_cie<Section: UnwindSection<R>>(
         section: &'a Section,
         bases: &'a BaseAddresses,
-        ctx: &'a mut UnwindContext<R>,
+        ctx: &'ctx mut UnwindContext<R>,
         cie: &CommonInformationEntry<R>,
-    ) -> UnwindTable<'a, R> {
+    ) -> UnwindTable<'a, 'ctx, R> {
         assert!(ctx.stack().len() >= 1);
         UnwindTable {
             code_alignment_factor: Wrapping(cie.code_alignment_factor()),
@@ -2065,6 +2067,7 @@
             next_start_address: 0,
             last_end_address: 0,
             returned_last_row: false,
+            current_row_valid: false,
             instructions: cie.instructions(section, bases),
             ctx,
         }
@@ -2078,6 +2081,7 @@
     pub fn next_row(&mut self) -> Result<Option<&UnwindTableRow<R>>> {
         assert!(self.ctx.stack().len() >= 1);
         self.ctx.set_start_address(self.next_start_address);
+        self.current_row_valid = false;
 
         loop {
             match self.instructions.next() {
@@ -2092,11 +2096,13 @@
                     row.end_address = self.last_end_address;
 
                     self.returned_last_row = true;
+                    self.current_row_valid = true;
                     return Ok(Some(row));
                 }
 
                 Ok(Some(instruction)) => {
                     if self.evaluate(instruction)? {
+                        self.current_row_valid = true;
                         return Ok(Some(self.ctx.row()));
                     }
                 }
@@ -2104,6 +2110,15 @@
         }
     }
 
+    /// Returns the current row with the lifetime of the context.
+    pub fn into_current_row(self) -> Option<&'ctx UnwindTableRow<R>> {
+        if self.current_row_valid {
+            Some(self.ctx.row())
+        } else {
+            None
+        }
+    }
+
     /// Evaluate one call frame instruction. Return `Ok(true)` if the row is
     /// complete, `Ok(false)` otherwise.
     fn evaluate(&mut self, instruction: CallFrameInstruction<R>) -> Result<bool> {
@@ -5778,7 +5793,7 @@
         let unwind_info = result.unwrap();
 
         assert_eq!(
-            unwind_info,
+            *unwind_info,
             UnwindTableRow {
                 start_address: fde1.initial_address() + 100,
                 end_address: fde1.initial_address() + fde1.len(),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/dwarf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/dwarf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/dwarf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/dwarf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,20 @@
 use alloc::string::String;
+use alloc::sync::Arc;
 
 use crate::common::{
     DebugAddrBase, DebugAddrIndex, DebugInfoOffset, DebugLineStrOffset, DebugLocListsBase,
     DebugLocListsIndex, DebugRngListsBase, DebugRngListsIndex, DebugStrOffset, DebugStrOffsetsBase,
-    DebugStrOffsetsIndex, DebugTypesOffset, DwarfFileType, Encoding, LocationListsOffset,
-    RangeListsOffset, SectionId, UnitSectionOffset,
+    DebugStrOffsetsIndex, DebugTypesOffset, DwarfFileType, DwoId, Encoding, LocationListsOffset,
+    RangeListsOffset, RawRangeListsOffset, SectionId, UnitSectionOffset,
 };
 use crate::constants;
 use crate::read::{
-    Abbreviations, AttributeValue, DebugAbbrev, DebugAddr, DebugInfo, DebugInfoUnitHeadersIter,
-    DebugLine, DebugLineStr, DebugStr, DebugStrOffsets, DebugTypes, DebugTypesUnitHeadersIter,
-    DebuggingInformationEntry, EntriesCursor, EntriesRaw, EntriesTree, Error,
-    IncompleteLineProgram, LocListIter, LocationLists, Range, RangeLists, Reader, ReaderOffset,
-    ReaderOffsetId, Result, RngListIter, Section, UnitHeader, UnitOffset,
+    Abbreviations, AttributeValue, DebugAbbrev, DebugAddr, DebugAranges, DebugInfo,
+    DebugInfoUnitHeadersIter, DebugLine, DebugLineStr, DebugStr, DebugStrOffsets, DebugTypes,
+    DebugTypesUnitHeadersIter, DebuggingInformationEntry, EntriesCursor, EntriesRaw, EntriesTree,
+    Error, IncompleteLineProgram, LocListIter, LocationLists, Range, RangeLists, RawLocListIter,
+    RawRngListIter, Reader, ReaderOffset, ReaderOffsetId, Result, RngListIter, Section, UnitHeader,
+    UnitOffset, UnitType,
 };
 
 /// All of the commonly used DWARF sections, and other common information.
@@ -24,6 +26,9 @@
     /// The `.debug_addr` section.
     pub debug_addr: DebugAddr<R>,
 
+    /// The `.debug_aranges` section.
+    pub debug_aranges: DebugAranges<R>,
+
     /// The `.debug_info` section.
     pub debug_info: DebugInfo<R>,
 
@@ -39,9 +44,6 @@
     /// The `.debug_str_offsets` section.
     pub debug_str_offsets: DebugStrOffsets<R>,
 
-    /// The `.debug_str` section for a supplementary object file.
-    pub debug_str_sup: DebugStr<R>,
-
     /// The `.debug_types` section.
     pub debug_types: DebugTypes<R>,
 
@@ -53,22 +55,26 @@
 
     /// The type of this file.
     pub file_type: DwarfFileType,
+
+    /// The DWARF sections for a supplementary object file.
+    pub sup: Option<Arc<Dwarf<R>>>,
 }
 
 impl<T> Dwarf<T> {
-    /// Try to load the DWARF sections using the given loader functions.
+    /// Try to load the DWARF sections using the given loader function.
     ///
-    /// `section` loads a DWARF section from the main object file.
-    /// `sup` loads a DWARF sections from the supplementary object file.
-    /// These functions should return an empty section if the section does not exist.
+    /// `section` loads a DWARF section from the object file.
+    /// It should return an empty section if the section does not exist.
     ///
-    /// The provided callback functions may either directly return a `Reader` instance
-    /// (such as `EndianSlice`), or they may return some other type and then convert
+    /// `section` may either directly return a `Reader` instance (such as
+    /// `EndianSlice`), or it may return some other type and then convert
     /// that type into a `Reader` using `Dwarf::borrow`.
-    pub fn load<F1, F2, E>(mut section: F1, mut sup: F2) -> core::result::Result<Self, E>
+    ///
+    /// After loading, the user should set the `file_type` field and
+    /// call `load_sup` if required.
+    pub fn load<F, E>(mut section: F) -> core::result::Result<Self, E>
     where
-        F1: FnMut(SectionId) -> core::result::Result<T, E>,
-        F2: FnMut(SectionId) -> core::result::Result<T, E>,
+        F: FnMut(SectionId) -> core::result::Result<T, E>,
     {
         // Section types are inferred.
         let debug_loc = Section::load(&mut section)?;
@@ -78,19 +84,33 @@
         Ok(Dwarf {
             debug_abbrev: Section::load(&mut section)?,
             debug_addr: Section::load(&mut section)?,
+            debug_aranges: Section::load(&mut section)?,
             debug_info: Section::load(&mut section)?,
             debug_line: Section::load(&mut section)?,
             debug_line_str: Section::load(&mut section)?,
             debug_str: Section::load(&mut section)?,
             debug_str_offsets: Section::load(&mut section)?,
-            debug_str_sup: Section::load(&mut sup)?,
             debug_types: Section::load(&mut section)?,
             locations: LocationLists::new(debug_loc, debug_loclists),
             ranges: RangeLists::new(debug_ranges, debug_rnglists),
             file_type: DwarfFileType::Main,
+            sup: None,
         })
     }
 
+    /// Load the DWARF sections from the supplementary object file.
+    ///
+    /// `section` operates the same as for `load`.
+    ///
+    /// Sets `self.sup`, replacing any previous value.
+    pub fn load_sup<F, E>(&mut self, section: F) -> core::result::Result<(), E>
+    where
+        F: FnMut(SectionId) -> core::result::Result<T, E>,
+    {
+        self.sup = Some(Arc::new(Self::load(section)?));
+        Ok(())
+    }
+
     /// Create a `Dwarf` structure that references the data in `self`.
     ///
     /// This is useful when `R` implements `Reader` but `T` does not.
@@ -107,9 +127,10 @@
     /// ```rust,no_run
     /// # fn example() -> Result<(), gimli::Error> {
     /// # let loader = |name| -> Result<_, gimli::Error> { unimplemented!() };
-    /// # let sup_loader = |name| { unimplemented!() };
+    /// # let sup_loader = |name| -> Result<_, gimli::Error> { unimplemented!() };
     /// // Read the DWARF sections into `Vec`s with whatever object loader you're using.
-    /// let owned_dwarf: gimli::Dwarf<Vec<u8>> = gimli::Dwarf::load(loader, sup_loader)?;
+    /// let mut owned_dwarf: gimli::Dwarf<Vec<u8>> = gimli::Dwarf::load(loader)?;
+    /// owned_dwarf.load_sup(sup_loader)?;
     /// // Create references to the DWARF sections.
     /// let dwarf = owned_dwarf.borrow(|section| {
     ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
@@ -124,18 +145,24 @@
         Dwarf {
             debug_abbrev: self.debug_abbrev.borrow(&mut borrow),
             debug_addr: self.debug_addr.borrow(&mut borrow),
+            debug_aranges: self.debug_aranges.borrow(&mut borrow),
             debug_info: self.debug_info.borrow(&mut borrow),
             debug_line: self.debug_line.borrow(&mut borrow),
             debug_line_str: self.debug_line_str.borrow(&mut borrow),
             debug_str: self.debug_str.borrow(&mut borrow),
             debug_str_offsets: self.debug_str_offsets.borrow(&mut borrow),
-            debug_str_sup: self.debug_str_sup.borrow(&mut borrow),
             debug_types: self.debug_types.borrow(&mut borrow),
             locations: self.locations.borrow(&mut borrow),
             ranges: self.ranges.borrow(&mut borrow),
             file_type: self.file_type,
+            sup: self.sup().map(|sup| Arc::new(sup.borrow(borrow))),
         }
     }
+
+    /// Return a reference to the DWARF sections for supplementary object file.
+    pub fn sup(&self) -> Option<&Dwarf<T>> {
+        self.sup.as_ref().map(Arc::as_ref)
+    }
 }
 
 impl<R: Reader> Dwarf<R> {
@@ -211,7 +238,13 @@
         match attr {
             AttributeValue::String(string) => Ok(string),
             AttributeValue::DebugStrRef(offset) => self.debug_str.get_str(offset),
-            AttributeValue::DebugStrRefSup(offset) => self.debug_str_sup.get_str(offset),
+            AttributeValue::DebugStrRefSup(offset) => {
+                if let Some(sup) = self.sup() {
+                    sup.debug_str.get_str(offset)
+                } else {
+                    Err(Error::ExpectedStringAttributeValue)
+                }
+            }
             AttributeValue::DebugLineStrRef(offset) => self.debug_line_str.get_str(offset),
             AttributeValue::DebugStrOffsetsIndex(index) => {
                 let offset = self.debug_str_offsets.get_str_offset(
@@ -248,6 +281,21 @@
         }
     }
 
+    /// Return the range list offset for the given raw offset.
+    ///
+    /// This handles adding `DW_AT_GNU_ranges_base` if required.
+    pub fn ranges_offset_from_raw(
+        &self,
+        unit: &Unit<R>,
+        offset: RawRangeListsOffset<R::Offset>,
+    ) -> RangeListsOffset<R::Offset> {
+        if self.file_type == DwarfFileType::Dwo && unit.header.version() < 5 {
+            RangeListsOffset(offset.0.wrapping_add(unit.rnglists_base.0))
+        } else {
+            RangeListsOffset(offset.0)
+        }
+    }
+
     /// Return the range list offset at the given index.
     pub fn ranges_offset(
         &self,
@@ -273,6 +321,15 @@
         )
     }
 
+    /// Iterate over the `RawRngListEntry`ies starting at the given offset.
+    pub fn raw_ranges(
+        &self,
+        unit: &Unit<R>,
+        offset: RangeListsOffset<R::Offset>,
+    ) -> Result<RawRngListIter<R>> {
+        self.ranges.raw_ranges(offset, unit.encoding())
+    }
+
     /// Try to return an attribute value as a range list offset.
     ///
     /// If the attribute value is one of:
@@ -288,7 +345,9 @@
         attr: AttributeValue<R>,
     ) -> Result<Option<RangeListsOffset<R::Offset>>> {
         match attr {
-            AttributeValue::RangeListsRef(offset) => Ok(Some(offset)),
+            AttributeValue::RangeListsRef(offset) => {
+                Ok(Some(self.ranges_offset_from_raw(unit, offset)))
+            }
             AttributeValue::DebugRngListsIndex(index) => self.ranges_offset(unit, index).map(Some),
             _ => Ok(None),
         }
@@ -329,14 +388,19 @@
         while let Some(attr) = attrs.next()? {
             match attr.name() {
                 constants::DW_AT_low_pc => {
-                    if let AttributeValue::Addr(val) = attr.value() {
-                        low_pc = Some(val);
-                    }
+                    low_pc = Some(
+                        self.attr_address(unit, attr.value())?
+                            .ok_or(Error::UnsupportedAttributeForm)?,
+                    );
                 }
                 constants::DW_AT_high_pc => match attr.value() {
-                    AttributeValue::Addr(val) => high_pc = Some(val),
                     AttributeValue::Udata(val) => size = Some(val),
-                    _ => return Err(Error::UnsupportedAttributeForm),
+                    attr => {
+                        high_pc = Some(
+                            self.attr_address(unit, attr)?
+                                .ok_or(Error::UnsupportedAttributeForm)?,
+                        );
+                    }
                 },
                 constants::DW_AT_ranges => {
                     if let Some(list) = self.attr_ranges(unit, attr.value())? {
@@ -399,6 +463,18 @@
         }
     }
 
+    /// Iterate over the raw `LocationListEntry`s starting at the given offset.
+    pub fn raw_locations(
+        &self,
+        unit: &Unit<R>,
+        offset: LocationListsOffset<R::Offset>,
+    ) -> Result<RawLocListIter<R>> {
+        match self.file_type {
+            DwarfFileType::Main => self.locations.raw_locations(offset, unit.encoding()),
+            DwarfFileType::Dwo => self.locations.raw_locations_dwo(offset, unit.encoding()),
+        }
+    }
+
     /// Try to return an attribute value as a location list offset.
     ///
     /// If the attribute value is one of:
@@ -448,6 +524,7 @@
     pub fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(bool, SectionId, R::Offset)> {
         None.or_else(|| self.debug_abbrev.lookup_offset_id(id))
             .or_else(|| self.debug_addr.lookup_offset_id(id))
+            .or_else(|| self.debug_aranges.lookup_offset_id(id))
             .or_else(|| self.debug_info.lookup_offset_id(id))
             .or_else(|| self.debug_line.lookup_offset_id(id))
             .or_else(|| self.debug_line_str.lookup_offset_id(id))
@@ -458,9 +535,9 @@
             .or_else(|| self.ranges.lookup_offset_id(id))
             .map(|(id, offset)| (false, id, offset))
             .or_else(|| {
-                self.debug_str_sup
-                    .lookup_offset_id(id)
-                    .map(|(id, offset)| (true, id, offset))
+                self.sup()
+                    .and_then(|sup| sup.lookup_offset_id(id))
+                    .map(|(_, id, offset)| (true, id, offset))
             })
     }
 
@@ -525,6 +602,9 @@
 
     /// The line number program of the unit.
     pub line_program: Option<IncompleteLineProgram<R, Offset>>,
+
+    /// The DWO ID of a skeleton unit or split compilation unit.
+    pub dwo_id: Option<DwoId>,
 }
 
 impl<R: Reader> Unit<R> {
@@ -552,11 +632,16 @@
                 dwarf.file_type,
             ),
             line_program: None,
+            dwo_id: match header.type_() {
+                UnitType::Skeleton(dwo_id) | UnitType::SplitCompilation(dwo_id) => Some(dwo_id),
+                _ => None,
+            },
             header,
         };
         let mut name = None;
         let mut comp_dir = None;
         let mut line_program_offset = None;
+        let mut low_pc_attr = None;
 
         {
             let mut cursor = unit.header.entries(&unit.abbreviations);
@@ -572,9 +657,7 @@
                         comp_dir = Some(attr.value());
                     }
                     constants::DW_AT_low_pc => {
-                        if let AttributeValue::Addr(address) = attr.value() {
-                            unit.low_pc = address;
-                        }
+                        low_pc_attr = Some(attr.value());
                     }
                     constants::DW_AT_stmt_list => {
                         if let AttributeValue::DebugLineRef(offset) = attr.value() {
@@ -601,6 +684,13 @@
                             unit.rnglists_base = base;
                         }
                     }
+                    constants::DW_AT_GNU_dwo_id => {
+                        if unit.dwo_id.is_none() {
+                            if let AttributeValue::DwoId(dwo_id) = attr.value() {
+                                unit.dwo_id = Some(dwo_id);
+                            }
+                        }
+                    }
                     _ => {}
                 }
             }
@@ -623,6 +713,11 @@
             )?),
             None => None,
         };
+        if let Some(low_pc_attr) = low_pc_attr {
+            if let Some(addr) = dwarf.attr_address(&unit, low_pc_attr)? {
+                unit.low_pc = addr;
+            }
+        }
         Ok(unit)
     }
 
@@ -789,9 +884,18 @@
     }
 
     #[test]
+    fn test_send() {
+        fn assert_is_send<T: Send>() {}
+        assert_is_send::<Dwarf<EndianSlice<LittleEndian>>>();
+        assert_is_send::<Unit<EndianSlice<LittleEndian>>>();
+    }
+
+    #[test]
     fn test_format_error() {
-        let owned_dwarf =
-            Dwarf::load(|_| -> Result<_> { Ok(vec![1, 2]) }, |_| Ok(vec![1, 2])).unwrap();
+        let mut owned_dwarf = Dwarf::load(|_| -> Result<_> { Ok(vec![1, 2]) }).unwrap();
+        owned_dwarf
+            .load_sup(|_| -> Result<_> { Ok(vec![1, 2]) })
+            .unwrap();
         let dwarf = owned_dwarf.borrow(|section| EndianSlice::new(&section, LittleEndian));
 
         match dwarf.debug_str.get_str(DebugStrOffset(1)) {
@@ -803,7 +907,7 @@
                 );
             }
         }
-        match dwarf.debug_str_sup.get_str(DebugStrOffset(1)) {
+        match dwarf.sup().unwrap().debug_str.get_str(DebugStrOffset(1)) {
             Ok(r) => panic!("Unexpected str {:?}", r),
             Err(e) => {
                 assert_eq!(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/endian_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/endian_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/endian_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/endian_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -469,7 +469,7 @@
     fn read_slice(&mut self, buf: &mut [u8]) -> Result<()> {
         match self.range.read_slice(buf.len()) {
             Some(slice) => {
-                buf.clone_from_slice(slice);
+                buf.copy_from_slice(slice);
                 Ok(())
             }
             None => Err(Error::UnexpectedEof(self.offset_id())),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/endian_slice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/endian_slice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/endian_slice.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/endian_slice.rs	2021-12-09 12:01:26.000000000 +0000
@@ -305,7 +305,7 @@
     #[inline]
     fn read_slice(&mut self, buf: &mut [u8]) -> Result<()> {
         let slice = self.read_slice(buf.len())?;
-        buf.clone_from_slice(slice);
+        buf.copy_from_slice(slice);
         Ok(())
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 use alloc::vec::Vec;
 use core::fmt;
-use core::num::Wrapping;
+use core::num::{NonZeroU64, Wrapping};
 use core::result;
 
 use crate::common::{
@@ -713,13 +713,10 @@
     /// "An unsigned integer indicating a source line number. Lines are numbered
     /// beginning at 1. The compiler may emit the value 0 in cases where an
     /// instruction cannot be attributed to any source line."
+    /// Line number values of 0 are represented as `None`.
     #[inline]
-    pub fn line(&self) -> Option<u64> {
-        if self.line.0 == 0 {
-            None
-        } else {
-            Some(self.line.0)
-        }
+    pub fn line(&self) -> Option<NonZeroU64> {
+        NonZeroU64::new(self.line.0)
     }
 
     /// "An unsigned integer indicating a column number within a source
@@ -727,11 +724,9 @@
     /// indicate that a statement begins at the “left edge� of the line."
     #[inline]
     pub fn column(&self) -> ColumnType {
-        if self.column == 0 {
-            ColumnType::LeftEdge
-        } else {
-            ColumnType::Column(self.column)
-        }
+        NonZeroU64::new(self.column)
+            .map(ColumnType::Column)
+            .unwrap_or(ColumnType::LeftEdge)
     }
 
     /// "A boolean indicating that the current instruction is a recommended
@@ -996,7 +991,7 @@
     /// line.
     LeftEdge,
     /// A column number, whose range begins at 1.
-    Column(u64),
+    Column(NonZeroU64),
 }
 
 /// Deprecated. `LineNumberSequence` has been renamed to `LineSequence`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,7 +17,8 @@
 //! // These closures should return a `Reader` instance (e.g. `EndianSlice`).
 //! let loader = |section: gimli::SectionId| { get_file_section_reader(section.name()) };
 //! let sup_loader = |section: gimli::SectionId| { get_sup_file_section_reader(section.name()) };
-//! let dwarf = gimli::Dwarf::load(loader, sup_loader)?;
+//! let mut dwarf = gimli::Dwarf::load(loader)?;
+//! dwarf.load_sup(sup_loader)?;
 //!
 //! // Iterate over all compilation units.
 //! let mut iter = dwarf.units();
@@ -151,8 +152,10 @@
 //! fn find_sum_of_address_range_lengths(aranges: DebugAranges<EndianSlice<LittleEndian>>)
 //!     -> gimli::Result<u64>
 //! {
-//!     // `DebugAranges::items` returns a `FallibleIterator`!
-//!     aranges.items()
+//!     // `DebugAranges::headers` returns a `FallibleIterator`!
+//!     aranges.headers()
+//!         // `flat_map` is provided by `FallibleIterator`!
+//!         .flat_map(|header| Ok(header.entries()))
 //!         // `map` is provided by `FallibleIterator`!
 //!         .map(|arange| Ok(arange.length()))
 //!         // `fold` is provided by `FallibleIterator`!
@@ -318,6 +321,8 @@
     /// An unrecognized operation was found while parsing a DWARF
     /// expression.
     InvalidExpression(constants::DwOp),
+    /// An unsupported operation was found while evaluating a DWARF expression.
+    UnsupportedEvaluation,
     /// The expression had a piece followed by an expression
     /// terminator without a piece.
     InvalidPiece,
@@ -468,6 +473,7 @@
             Error::NotEnoughStackItems => "Not enough items on stack when evaluating expression",
             Error::TooManyIterations => "Too many iterations to evaluate DWARF expression",
             Error::InvalidExpression(_) => "Invalid opcode in DWARF expression",
+            Error::UnsupportedEvaluation => "Unsupported operation when evaluating expression",
             Error::InvalidPiece => {
                 "DWARF expression has piece followed by non-piece expression at end"
             }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/op.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/op.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/op.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/op.rs	2021-12-09 12:01:26.000000000 +0000
@@ -128,6 +128,7 @@
         value: i64,
     },
     /// Indicate that this piece's location is in the given register.
+    ///
     /// Completes the piece or expression.
     Register {
         /// The register number.
@@ -174,20 +175,23 @@
         /// next byte boundary.
         bit_offset: Option<u64>,
     },
-    /// Represents `DW_OP_implicit_value`.
     /// The object has no location, but has a known constant value.
+    ///
+    /// Represents `DW_OP_implicit_value`.
     /// Completes the piece or expression.
     ImplicitValue {
         /// The implicit value to use.
         data: R,
     },
-    /// Represents `DW_OP_stack_value`.
     /// The object has no location, but its value is at the top of the stack.
+    ///
+    /// Represents `DW_OP_stack_value`.
     /// Completes the piece or expression.
     StackValue,
-    /// Represents `DW_OP_implicit_pointer`. The object is a pointer to
-    /// a value which has no actual location, such as an implicit value or
-    /// a stack value.
+    /// The object is a pointer to a value which has no actual location,
+    /// such as an implicit value or a stack value.
+    ///
+    /// Represents `DW_OP_implicit_pointer`.
     /// Completes the piece or expression.
     ImplicitPointer {
         /// The `.debug_info` offset of the value that this is an implicit pointer into.
@@ -195,61 +199,95 @@
         /// The byte offset into the value that the implicit pointer points to.
         byte_offset: i64,
     },
-    /// Represents `DW_OP_entry_value`. Evaluate an expression at the entry to
-    /// the current subprogram, and push it on the stack.
+    /// Evaluate an expression at the entry to the current subprogram, and push it on the stack.
+    ///
+    /// Represents `DW_OP_entry_value`.
     EntryValue {
         /// The expression to be evaluated.
         expression: R,
     },
-    /// Represents `DW_OP_GNU_parameter_ref`. This represents a parameter that was
-    /// optimized out. The offset points to the definition of the parameter, and is
+    /// This represents a parameter that was optimized out.
+    ///
+    /// The offset points to the definition of the parameter, and is
     /// matched to the `DW_TAG_GNU_call_site_parameter` in the caller that also
     /// points to the same definition of the parameter.
+    ///
+    /// Represents `DW_OP_GNU_parameter_ref`.
     ParameterRef {
         /// The DIE to use.
         offset: UnitOffset<Offset>,
     },
-    /// Represents `DW_OP_addr`.
     /// Relocate the address if needed, and push it on the stack.
+    ///
+    /// Represents `DW_OP_addr`.
     Address {
         /// The offset to add.
         address: u64,
     },
-    /// Represents `DW_OP_addrx`.
     /// Read the address at the given index in `.debug_addr, relocate the address if needed,
     /// and push it on the stack.
+    ///
+    /// Represents `DW_OP_addrx`.
     AddressIndex {
         /// The index of the address in `.debug_addr`.
         index: DebugAddrIndex<Offset>,
     },
-    /// Represents `DW_OP_constx`.
     /// Read the address at the given index in `.debug_addr, and push it on the stack.
     /// Do not relocate the address.
+    ///
+    /// Represents `DW_OP_constx`.
     ConstantIndex {
         /// The index of the address in `.debug_addr`.
         index: DebugAddrIndex<Offset>,
     },
-    /// Represents `DW_OP_const_type`.
     /// Interpret the value bytes as a constant of a given type, and push it on the stack.
+    ///
+    /// Represents `DW_OP_const_type`.
     TypedLiteral {
         /// The DIE of the base type.
         base_type: UnitOffset<Offset>,
         /// The value bytes.
         value: R,
     },
-    /// Represents `DW_OP_convert`.
     /// Pop the top stack entry, convert it to a different type, and push it on the stack.
+    ///
+    /// Represents `DW_OP_convert`.
     Convert {
         /// The DIE of the base type.
         base_type: UnitOffset<Offset>,
     },
-    /// Represents `DW_OP_reinterpret`.
     /// Pop the top stack entry, reinterpret the bits in its value as a different type,
     /// and push it on the stack.
+    ///
+    /// Represents `DW_OP_reinterpret`.
     Reinterpret {
         /// The DIE of the base type.
         base_type: UnitOffset<Offset>,
     },
+    /// The index of a local in the currently executing function.
+    ///
+    /// Represents `DW_OP_WASM_location 0x00`.
+    /// Completes the piece or expression.
+    WasmLocal {
+        /// The index of the local.
+        index: u32,
+    },
+    /// The index of a global.
+    ///
+    /// Represents `DW_OP_WASM_location 0x01` or `DW_OP_WASM_location 0x03`.
+    /// Completes the piece or expression.
+    WasmGlobal {
+        /// The index of the global.
+        index: u32,
+    },
+    /// The index of an item on the operand stack.
+    ///
+    /// Represents `DW_OP_WASM_location 0x02`.
+    /// Completes the piece or expression.
+    WasmStack {
+        /// The index of the stack item. 0 is the bottom of the operand stack.
+        index: u32,
+    },
 }
 
 #[derive(Debug)]
@@ -745,7 +783,25 @@
                     base_type: UnitOffset(base_type),
                 })
             }
-
+            constants::DW_OP_WASM_location => match bytes.read_u8()? {
+                0x0 => {
+                    let index = bytes.read_uleb128_u32()?;
+                    Ok(Operation::WasmLocal { index })
+                }
+                0x1 => {
+                    let index = bytes.read_uleb128_u32()?;
+                    Ok(Operation::WasmGlobal { index })
+                }
+                0x2 => {
+                    let index = bytes.read_uleb128_u32()?;
+                    Ok(Operation::WasmStack { index })
+                }
+                0x3 => {
+                    let index = bytes.read_u32()?;
+                    Ok(Operation::WasmGlobal { index })
+                }
+                _ => Err(Error::InvalidExpression(name)),
+            },
             _ => Err(Error::InvalidExpression(name)),
         }
     }
@@ -1431,6 +1487,11 @@
                     EvaluationResult::RequiresBaseType(base_type),
                 ));
             }
+            Operation::WasmLocal { .. }
+            | Operation::WasmGlobal { .. }
+            | Operation::WasmStack { .. } => {
+                return Err(Error::UnsupportedEvaluation);
+            }
         }
 
         Ok(OperationEvaluationResult::Incomplete)
@@ -2611,6 +2672,33 @@
         )
     }
 
+    #[test]
+    fn test_op_wasm() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_WASM_location.0).D8(0).uleb(1000),
+            &Operation::WasmLocal { index: 1000 },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_WASM_location.0).D8(1).uleb(1000),
+            &Operation::WasmGlobal { index: 1000 },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_WASM_location.0).D8(2).uleb(1000),
+            &Operation::WasmStack { index: 1000 },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_WASM_location.0).D8(3).D32(1000),
+            &Operation::WasmGlobal { index: 1000 },
+            encoding,
+        );
+    }
+
     enum AssemblerEntry {
         Op(constants::DwOp),
         Mark(u8),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 use alloc::borrow::Cow;
+use core::convert::TryInto;
 use core::fmt::Debug;
 use core::hash::Hash;
 use core::ops::{Add, AddAssign, Sub};
@@ -391,6 +392,13 @@
         leb128::read::unsigned(self)
     }
 
+    /// Read an unsigned LEB128 encoded u32.
+    fn read_uleb128_u32(&mut self) -> Result<u32> {
+        leb128::read::unsigned(self)?
+            .try_into()
+            .map_err(|_| Error::BadUnsignedLeb128)
+    }
+
     /// Read an unsigned LEB128 encoded u16.
     fn read_uleb128_u16(&mut self) -> Result<u16> {
         leb128::read::u16(self)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/rnglists.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/rnglists.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/rnglists.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/rnglists.rs	2021-12-09 12:01:26.000000000 +0000
@@ -563,7 +563,7 @@
     }
 }
 
-/// An address range from the `.debug_ranges` or `.debug_rnglists` sections.
+/// An address range from the `.debug_ranges`, `.debug_rnglists`, or `.debug_aranges` sections.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct Range {
     /// The beginning address of the range.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/str.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -205,6 +205,29 @@
     section: R,
 }
 
+impl<'input, Endian> DebugLineStr<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugLineStr` instance from the data in the `.debug_line_str`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_line_str` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugLineStr, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_line_str_section_somehow = || &buf;
+    /// let debug_str = DebugLineStr::new(read_debug_line_str_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(debug_line_str_section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(debug_line_str_section, endian))
+    }
+}
+
 impl<R: Reader> DebugLineStr<R> {
     /// Lookup a string from the `.debug_line_str` section by DebugLineStrOffset.
     pub fn get_str(&self, offset: DebugLineStrOffset<R::Offset>) -> Result<R> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/unit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/unit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/read/unit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/read/unit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
     DebugLineStrOffset, DebugLocListsBase, DebugLocListsIndex, DebugMacinfoOffset,
     DebugMacroOffset, DebugRngListsBase, DebugRngListsIndex, DebugStrOffset, DebugStrOffsetsBase,
     DebugStrOffsetsIndex, DebugTypeSignature, DebugTypesOffset, DwoId, Encoding, Format,
-    LocationListsOffset, RangeListsOffset, SectionId, UnitSectionOffset,
+    LocationListsOffset, RawRangeListsOffset, SectionId, UnitSectionOffset,
 };
 use crate::constants;
 use crate::endianity::Endianity;
@@ -1044,7 +1044,7 @@
     DebugMacroRef(DebugMacroOffset<Offset>),
 
     /// An offset into the `.debug_ranges` section.
-    RangeListsRef(RangeListsOffset<Offset>),
+    RangeListsRef(RawRangeListsOffset<Offset>),
 
     /// An offset to a set of offsets in the `.debug_rnglists` section.
     DebugRngListsBase(DebugRngListsBase<Offset>),
@@ -1286,7 +1286,7 @@
             () => {
                 // DebugRngListsIndex is also an allowed form in DWARF version 5.
                 if let Some(offset) = self.offset_value() {
-                    return AttributeValue::RangeListsRef(RangeListsOffset(offset));
+                    return AttributeValue::RangeListsRef(RawRangeListsOffset(offset));
                 }
             };
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1102,10 +1102,13 @@
                                     }
                                     files[file as usize]
                                 };
-                                program.row().line = from_row.line().unwrap_or(0);
+                                program.row().line = match from_row.line() {
+                                    Some(line) => line.get(),
+                                    None => 0,
+                                };
                                 program.row().column = match from_row.column() {
                                     read::ColumnType::LeftEdge => 0,
-                                    read::ColumnType::Column(val) => val,
+                                    read::ColumnType::Column(val) => val.get(),
                                 };
                                 program.row().discriminator = from_row.discriminator();
                                 program.row().is_statement = from_row.is_stmt();
@@ -1801,7 +1804,7 @@
                             {
                                 let row = rows.next_row().unwrap().unwrap().1;
                                 address = row.address();
-                                line = row.line().unwrap();
+                                line = row.line().unwrap().get();
                             }
                             assert_eq!(address, 0x1000);
                             assert_eq!(line, 0x10000);
@@ -1812,11 +1815,11 @@
                                     address_advance * u64::from(minimum_instruction_length)
                                 );
                                 assert_eq!(
-                                    (row.line().unwrap() as i64) - (line as i64),
+                                    (row.line().unwrap().get() as i64) - (line as i64),
                                     line_advance
                                 );
                                 address = row.address();
-                                line = row.line().unwrap();
+                                line = row.line().unwrap().get();
                             }
                             let row = rows.next_row().unwrap().unwrap().1;
                             assert!(row.end_sequence());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/loc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/loc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/loc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/loc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -517,6 +517,7 @@
                         loclists_base: DebugLocListsBase(0),
                         rnglists_base: DebugRngListsBase(0),
                         line_program: None,
+                        dwo_id: None,
                     };
                     let context = ConvertUnitContext {
                         dwarf: &dwarf,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/op.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/op.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/op.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/op.rs	2021-12-09 12:01:26.000000000 +0000
@@ -240,6 +240,21 @@
         self.operations.push(Operation::ParameterRef(entry));
     }
 
+    /// Add a `DW_OP_WASM_location 0x0` operation to the expression.
+    pub fn op_wasm_local(&mut self, index: u32) {
+        self.operations.push(Operation::WasmLocal(index));
+    }
+
+    /// Add a `DW_OP_WASM_location 0x1` operation to the expression.
+    pub fn op_wasm_global(&mut self, index: u32) {
+        self.operations.push(Operation::WasmGlobal(index));
+    }
+
+    /// Add a `DW_OP_WASM_location 0x2` operation to the expression.
+    pub fn op_wasm_stack(&mut self, index: u32) {
+        self.operations.push(Operation::WasmStack(index));
+    }
+
     pub(crate) fn size(&self, encoding: Encoding, unit_offsets: Option<&UnitOffsets>) -> usize {
         let mut size = 0;
         for operation in &self.operations {
@@ -472,6 +487,18 @@
     ///
     /// Represents `DW_OP_GNU_parameter_ref`.
     ParameterRef(UnitEntryId),
+    /// The index of a local in the currently executing function.
+    ///
+    /// Represents `DW_OP_WASM_location 0x00`.
+    WasmLocal(u32),
+    /// The index of a global.
+    ///
+    /// Represents `DW_OP_WASM_location 0x01`.
+    WasmGlobal(u32),
+    /// The index of an item on the operand stack.
+    ///
+    /// Represents `DW_OP_WASM_location 0x02`.
+    WasmStack(u32),
 }
 
 impl Operation {
@@ -551,6 +578,9 @@
                 bit_offset,
             } => uleb128_size(size_in_bits) + uleb128_size(bit_offset),
             Operation::ParameterRef(_) => 4,
+            Operation::WasmLocal(index)
+            | Operation::WasmGlobal(index)
+            | Operation::WasmStack(index) => 1 + uleb128_size(index.into()),
         }
     }
 
@@ -782,6 +812,18 @@
                 w.write_u8(constants::DW_OP_GNU_parameter_ref.0)?;
                 w.write_udata(entry_offset(entry)?, 4)?;
             }
+            Operation::WasmLocal(index) => {
+                w.write(&[constants::DW_OP_WASM_location.0, 0])?;
+                w.write_uleb128(index.into())?;
+            }
+            Operation::WasmGlobal(index) => {
+                w.write(&[constants::DW_OP_WASM_location.0, 1])?;
+                w.write_uleb128(index.into())?;
+            }
+            Operation::WasmStack(index) => {
+                w.write(&[constants::DW_OP_WASM_location.0, 2])?;
+                w.write_uleb128(index.into())?;
+            }
         }
         Ok(())
     }
@@ -1000,6 +1042,9 @@
                             Operation::Reinterpret(Some(entry))
                         }
                     }
+                    read::Operation::WasmLocal { index } => Operation::WasmLocal(index),
+                    read::Operation::WasmGlobal { index } => Operation::WasmGlobal(index),
+                    read::Operation::WasmStack { index } => Operation::WasmStack(index),
                 };
                 operations.push(operation);
             }
@@ -1449,6 +1494,21 @@
                                     base_type: entry_offset,
                                 },
                             ),
+                            (
+                                &|x| x.op_wasm_local(1000),
+                                Operation::WasmLocal(1000),
+                                read::Operation::WasmLocal { index: 1000 },
+                            ),
+                            (
+                                &|x| x.op_wasm_global(1000),
+                                Operation::WasmGlobal(1000),
+                                read::Operation::WasmGlobal { index: 1000 },
+                            ),
+                            (
+                                &|x| x.op_wasm_stack(1000),
+                                Operation::WasmStack(1000),
+                                read::Operation::WasmStack { index: 1000 },
+                            ),
                         ];
 
                     let mut expression = Expression::new();
@@ -1523,6 +1583,7 @@
                         loclists_base: DebugLocListsBase(0),
                         rnglists_base: DebugRngListsBase(0),
                         line_program: None,
+                        dwo_id: None,
                     };
 
                     let mut entry_ids = HashMap::new();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/range.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/range.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/range.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/range.rs	2021-12-09 12:01:26.000000000 +0000
@@ -384,6 +384,7 @@
                         loclists_base: DebugLocListsBase(0),
                         rnglists_base: DebugRngListsBase(0),
                         line_program: None,
+                        dwo_id: None,
                     };
                     let context = ConvertUnitContext {
                         dwarf: &dwarf,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/unit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/unit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/src/write/unit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/src/write/unit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1827,11 +1827,9 @@
                     let loc_id = context.locations.add(loc_list);
                     AttributeValue::LocationListRef(loc_id)
                 }
-                read::AttributeValue::RangeListsRef(val) => {
-                    let iter = context
-                        .dwarf
-                        .ranges
-                        .raw_ranges(val, context.unit.encoding())?;
+                read::AttributeValue::RangeListsRef(offset) => {
+                    let offset = context.dwarf.ranges_offset_from_raw(context.unit, offset);
+                    let iter = context.dwarf.raw_ranges(context.unit, offset)?;
                     let range_list = RangeList::from(iter, context)?;
                     let range_id = context.ranges.add(range_list);
                     AttributeValue::RangeListRef(range_id)
@@ -2548,6 +2546,7 @@
                             loclists_base: DebugLocListsBase(0),
                             rnglists_base: DebugRngListsBase(0),
                             line_program: None,
+                            dwo_id: None,
                         };
 
                         let mut context = convert::ConvertUnitContext {
@@ -3020,6 +3019,7 @@
                             loclists_base: DebugLocListsBase(0),
                             rnglists_base: DebugRngListsBase(0),
                             line_program: None,
+                            dwo_id: None,
                         };
 
                         let mut context = convert::ConvertUnitContext {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/tests/parse_self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/tests/parse_self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli/tests/parse_self.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli/tests/parse_self.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,8 @@
 use gimli::{
     AttributeValue, DebugAbbrev, DebugAddr, DebugAddrBase, DebugAranges, DebugInfo, DebugLine,
     DebugLoc, DebugLocLists, DebugPubNames, DebugPubTypes, DebugRanges, DebugRngLists, DebugStr,
-    Encoding, EndianSlice, Expression, LittleEndian, LocationLists, Operation, RangeLists, Reader,
+    Encoding, EndianSlice, Expression, LittleEndian, LocationLists, Operation, RangeLists,
+    RangeListsOffset, Reader,
 };
 use std::collections::hash_map::HashMap;
 use std::env;
@@ -274,7 +275,7 @@
                 if let AttributeValue::RangeListsRef(offset) = attr.value() {
                     let mut ranges = rnglists
                         .ranges(
-                            offset,
+                            RangeListsOffset(offset.0),
                             unit.encoding(),
                             low_pc,
                             &debug_addr,
@@ -295,9 +296,12 @@
     let debug_aranges = read_section("debug_aranges");
     let debug_aranges = DebugAranges::new(&debug_aranges, LittleEndian);
 
-    let mut aranges = debug_aranges.items();
-    while let Some(_) = aranges.next().expect("Should parse arange OK") {
-        // Not really anything else we can check right now.
+    let mut headers = debug_aranges.headers();
+    while let Some(header) = headers.next().expect("Should parse arange header OK") {
+        let mut entries = header.entries();
+        while let Some(_) = entries.next().expect("Should parse arange entry OK") {
+            // Not really anything else we can check right now.
+        }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/benches/bench.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,804 +0,0 @@
-#![feature(test)]
-
-extern crate test;
-
-use gimli::{
-    AttributeValue, DebugAbbrev, DebugAddr, DebugAddrBase, DebugAranges, DebugInfo, DebugLine,
-    DebugLineOffset, DebugLoc, DebugLocLists, DebugPubNames, DebugPubTypes, DebugRanges,
-    DebugRngLists, Encoding, EndianSlice, EntriesTreeNode, Expression, LittleEndian, LocationLists,
-    Operation, RangeLists, Reader, ReaderOffset,
-};
-use std::env;
-use std::fs::File;
-use std::io::Read;
-use std::path::PathBuf;
-use std::rc::Rc;
-
-pub fn read_section(section: &str) -> Vec<u8> {
-    let mut path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".into()));
-    path.push("./fixtures/self/");
-    path.push(section);
-
-    assert!(path.is_file());
-    let mut file = File::open(path).unwrap();
-
-    let mut buf = Vec::new();
-    file.read_to_end(&mut buf).unwrap();
-    buf
-}
-
-#[bench]
-fn bench_parsing_debug_abbrev(b: &mut test::Bencher) {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-    let unit = debug_info
-        .units()
-        .next()
-        .expect("Should have at least one compilation unit")
-        .expect("And it should parse OK");
-
-    let debug_abbrev = read_section("debug_abbrev");
-
-    b.iter(|| {
-        let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-        test::black_box(
-            unit.abbreviations(&debug_abbrev)
-                .expect("Should parse abbreviations"),
-        );
-    });
-}
-
-#[inline]
-fn impl_bench_parsing_debug_info<R: Reader>(
-    debug_info: DebugInfo<R>,
-    debug_abbrev: DebugAbbrev<R>,
-) {
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        while let Some((_, entry)) = cursor.next_dfs().expect("Should parse next dfs") {
-            let mut attrs = entry.attrs();
-            loop {
-                match attrs.next() {
-                    Ok(Some(ref attr)) => {
-                        test::black_box(attr);
-                    }
-                    Ok(None) => break,
-                    e @ Err(_) => {
-                        e.expect("Should parse entry's attribute");
-                    }
-                }
-            }
-        }
-    }
-}
-
-#[bench]
-fn bench_parsing_debug_info(b: &mut test::Bencher) {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    b.iter(|| impl_bench_parsing_debug_info(debug_info, debug_abbrev));
-}
-
-#[bench]
-fn bench_parsing_debug_info_with_endian_rc_slice(b: &mut test::Bencher) {
-    let debug_info = read_section("debug_info");
-    let debug_info = Rc::from(&debug_info[..]);
-    let debug_info = gimli::EndianRcSlice::new(debug_info, LittleEndian);
-    let debug_info = DebugInfo::from(debug_info);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = Rc::from(&debug_abbrev[..]);
-    let debug_abbrev = gimli::EndianRcSlice::new(debug_abbrev, LittleEndian);
-    let debug_abbrev = DebugAbbrev::from(debug_abbrev);
-
-    b.iter(|| impl_bench_parsing_debug_info(debug_info.clone(), debug_abbrev.clone()));
-}
-
-#[bench]
-fn bench_parsing_debug_info_tree(b: &mut test::Bencher) {
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_info = read_section("debug_info");
-
-    b.iter(|| {
-        let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-        let mut iter = debug_info.units();
-        while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-            let abbrevs = unit
-                .abbreviations(&debug_abbrev)
-                .expect("Should parse abbreviations");
-
-            let mut tree = unit
-                .entries_tree(&abbrevs, None)
-                .expect("Should have entries tree");
-            let root = tree.root().expect("Should parse root entry");
-            parse_debug_info_tree(root);
-        }
-    });
-}
-
-fn parse_debug_info_tree<R: Reader>(node: EntriesTreeNode<R>) {
-    {
-        let mut attrs = node.entry().attrs();
-        loop {
-            match attrs.next() {
-                Ok(Some(ref attr)) => {
-                    test::black_box(attr);
-                }
-                Ok(None) => break,
-                e @ Err(_) => {
-                    e.expect("Should parse entry's attribute");
-                }
-            }
-        }
-    }
-    let mut children = node.children();
-    while let Some(child) = children.next().expect("Should parse child entry") {
-        parse_debug_info_tree(child);
-    }
-}
-
-#[bench]
-fn bench_parsing_debug_info_raw(b: &mut test::Bencher) {
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_info = read_section("debug_info");
-
-    b.iter(|| {
-        let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-        let mut iter = debug_info.units();
-        while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-            let abbrevs = unit
-                .abbreviations(&debug_abbrev)
-                .expect("Should parse abbreviations");
-
-            let mut raw = unit
-                .entries_raw(&abbrevs, None)
-                .expect("Should have entries");
-            while !raw.is_empty() {
-                if let Some(abbrev) = raw
-                    .read_abbreviation()
-                    .expect("Should parse abbreviation code")
-                {
-                    for spec in abbrev.attributes().iter().cloned() {
-                        match raw.read_attribute(spec) {
-                            Ok(ref attr) => {
-                                test::black_box(attr);
-                            }
-                            e @ Err(_) => {
-                                e.expect("Should parse attribute");
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    });
-}
-
-#[bench]
-fn bench_parsing_debug_aranges(b: &mut test::Bencher) {
-    let debug_aranges = read_section("debug_aranges");
-    let debug_aranges = DebugAranges::new(&debug_aranges, LittleEndian);
-
-    b.iter(|| {
-        let mut aranges = debug_aranges.items();
-        while let Some(arange) = aranges.next().expect("Should parse arange OK") {
-            test::black_box(arange);
-        }
-    });
-}
-
-#[bench]
-fn bench_parsing_debug_pubnames(b: &mut test::Bencher) {
-    let debug_pubnames = read_section("debug_pubnames");
-    let debug_pubnames = DebugPubNames::new(&debug_pubnames, LittleEndian);
-
-    b.iter(|| {
-        let mut pubnames = debug_pubnames.items();
-        while let Some(pubname) = pubnames.next().expect("Should parse pubname OK") {
-            test::black_box(pubname);
-        }
-    });
-}
-
-#[bench]
-fn bench_parsing_debug_pubtypes(b: &mut test::Bencher) {
-    let debug_pubtypes = read_section("debug_pubtypes");
-    let debug_pubtypes = DebugPubTypes::new(&debug_pubtypes, LittleEndian);
-
-    b.iter(|| {
-        let mut pubtypes = debug_pubtypes.items();
-        while let Some(pubtype) = pubtypes.next().expect("Should parse pubtype OK") {
-            test::black_box(pubtype);
-        }
-    });
-}
-
-// We happen to know that there is a line number program and header at
-// offset 0 and that address size is 8 bytes. No need to parse DIEs to grab
-// this info off of the compilation units.
-const OFFSET: DebugLineOffset = DebugLineOffset(0);
-const ADDRESS_SIZE: u8 = 8;
-
-#[bench]
-fn bench_parsing_line_number_program_opcodes(b: &mut test::Bencher) {
-    let debug_line = read_section("debug_line");
-    let debug_line = DebugLine::new(&debug_line, LittleEndian);
-
-    b.iter(|| {
-        let program = debug_line
-            .program(OFFSET, ADDRESS_SIZE, None, None)
-            .expect("Should parse line number program header");
-        let header = program.header();
-
-        let mut instructions = header.instructions();
-        while let Some(instruction) = instructions
-            .next_instruction(header)
-            .expect("Should parse instruction")
-        {
-            test::black_box(instruction);
-        }
-    });
-}
-
-#[bench]
-fn bench_executing_line_number_programs(b: &mut test::Bencher) {
-    let debug_line = read_section("debug_line");
-    let debug_line = DebugLine::new(&debug_line, LittleEndian);
-
-    b.iter(|| {
-        let program = debug_line
-            .program(OFFSET, ADDRESS_SIZE, None, None)
-            .expect("Should parse line number program header");
-
-        let mut rows = program.rows();
-        while let Some(row) = rows
-            .next_row()
-            .expect("Should parse and execute all rows in the line number program")
-        {
-            test::black_box(row);
-        }
-    });
-}
-
-#[bench]
-fn bench_parsing_debug_loc(b: &mut test::Bencher) {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-    let debug_addr_base = DebugAddrBase(0);
-
-    let debug_loc = read_section("debug_loc");
-    let debug_loc = DebugLoc::new(&debug_loc, LittleEndian);
-    let debug_loclists = DebugLocLists::new(&[], LittleEndian);
-    let loclists = LocationLists::new(debug_loc, debug_loclists);
-
-    let mut offsets = Vec::new();
-
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        cursor.next_dfs().expect("Should parse next dfs");
-
-        let mut low_pc = 0;
-
-        {
-            let unit_entry = cursor.current().expect("Should have a root entry");
-            let low_pc_attr = unit_entry
-                .attr_value(gimli::DW_AT_low_pc)
-                .expect("Should parse low_pc");
-            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
-                low_pc = address;
-            }
-        }
-
-        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
-            let entry = cursor.current().expect("Should have a current entry");
-            let mut attrs = entry.attrs();
-            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
-                if let gimli::AttributeValue::LocationListsRef(offset) = attr.value() {
-                    offsets.push((offset, unit.encoding(), low_pc));
-                }
-            }
-        }
-    }
-
-    b.iter(|| {
-        for &(offset, encoding, base_address) in &*offsets {
-            let mut locs = loclists
-                .locations(offset, encoding, base_address, &debug_addr, debug_addr_base)
-                .expect("Should parse locations OK");
-            while let Some(loc) = locs.next().expect("Should parse next location") {
-                test::black_box(loc);
-            }
-        }
-    });
-}
-
-#[bench]
-fn bench_parsing_debug_ranges(b: &mut test::Bencher) {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-    let debug_addr_base = DebugAddrBase(0);
-
-    let debug_ranges = read_section("debug_ranges");
-    let debug_ranges = DebugRanges::new(&debug_ranges, LittleEndian);
-    let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
-    let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
-
-    let mut offsets = Vec::new();
-
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        cursor.next_dfs().expect("Should parse next dfs");
-
-        let mut low_pc = 0;
-
-        {
-            let unit_entry = cursor.current().expect("Should have a root entry");
-            let low_pc_attr = unit_entry
-                .attr_value(gimli::DW_AT_low_pc)
-                .expect("Should parse low_pc");
-            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
-                low_pc = address;
-            }
-        }
-
-        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
-            let entry = cursor.current().expect("Should have a current entry");
-            let mut attrs = entry.attrs();
-            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
-                if let gimli::AttributeValue::RangeListsRef(offset) = attr.value() {
-                    offsets.push((offset, unit.encoding(), low_pc));
-                }
-            }
-        }
-    }
-
-    b.iter(|| {
-        for &(offset, encoding, base_address) in &*offsets {
-            let mut ranges = rnglists
-                .ranges(offset, encoding, base_address, &debug_addr, debug_addr_base)
-                .expect("Should parse ranges OK");
-            while let Some(range) = ranges.next().expect("Should parse next range") {
-                test::black_box(range);
-            }
-        }
-    });
-}
-
-fn debug_info_expressions<R: Reader>(
-    debug_info: &DebugInfo<R>,
-    debug_abbrev: &DebugAbbrev<R>,
-) -> Vec<(Expression<R>, Encoding)> {
-    let mut expressions = Vec::new();
-
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        while let Some((_, entry)) = cursor.next_dfs().expect("Should parse next dfs") {
-            let mut attrs = entry.attrs();
-            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
-                if let AttributeValue::Exprloc(expression) = attr.value() {
-                    expressions.push((expression, unit.encoding()));
-                }
-            }
-        }
-    }
-
-    expressions
-}
-
-#[bench]
-fn bench_parsing_debug_info_expressions(b: &mut test::Bencher) {
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let expressions = debug_info_expressions(&debug_info, &debug_abbrev);
-
-    b.iter(|| {
-        for &(expression, encoding) in &*expressions {
-            let mut pc = expression.0;
-            while !pc.is_empty() {
-                Operation::parse(&mut pc, encoding).expect("Should parse operation");
-            }
-        }
-    });
-}
-
-#[bench]
-fn bench_evaluating_debug_info_expressions(b: &mut test::Bencher) {
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let expressions = debug_info_expressions(&debug_info, &debug_abbrev);
-
-    b.iter(|| {
-        for &(expression, encoding) in &*expressions {
-            let mut eval = expression.evaluation(encoding);
-            eval.set_initial_value(0);
-            let result = eval.evaluate().expect("Should evaluate expression");
-            test::black_box(result);
-        }
-    });
-}
-
-fn debug_loc_expressions<R: Reader>(
-    debug_info: &DebugInfo<R>,
-    debug_abbrev: &DebugAbbrev<R>,
-    debug_addr: &DebugAddr<R>,
-    loclists: &LocationLists<R>,
-) -> Vec<(Expression<R>, Encoding)> {
-    let debug_addr_base = DebugAddrBase(R::Offset::from_u8(0));
-
-    let mut expressions = Vec::new();
-
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        cursor.next_dfs().expect("Should parse next dfs");
-
-        let mut low_pc = 0;
-
-        {
-            let unit_entry = cursor.current().expect("Should have a root entry");
-            let low_pc_attr = unit_entry
-                .attr_value(gimli::DW_AT_low_pc)
-                .expect("Should parse low_pc");
-            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
-                low_pc = address;
-            }
-        }
-
-        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
-            let entry = cursor.current().expect("Should have a current entry");
-            let mut attrs = entry.attrs();
-            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
-                if let gimli::AttributeValue::LocationListsRef(offset) = attr.value() {
-                    let mut locs = loclists
-                        .locations(offset, unit.encoding(), low_pc, debug_addr, debug_addr_base)
-                        .expect("Should parse locations OK");
-                    while let Some(loc) = locs.next().expect("Should parse next location") {
-                        expressions.push((loc.data, unit.encoding()));
-                    }
-                }
-            }
-        }
-    }
-
-    expressions
-}
-
-#[bench]
-fn bench_parsing_debug_loc_expressions(b: &mut test::Bencher) {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-
-    let debug_loc = read_section("debug_loc");
-    let debug_loc = DebugLoc::new(&debug_loc, LittleEndian);
-    let debug_loclists = DebugLocLists::new(&[], LittleEndian);
-    let loclists = LocationLists::new(debug_loc, debug_loclists);
-
-    let expressions = debug_loc_expressions(&debug_info, &debug_abbrev, &debug_addr, &loclists);
-
-    b.iter(|| {
-        for &(expression, encoding) in &*expressions {
-            let mut pc = expression.0;
-            while !pc.is_empty() {
-                Operation::parse(&mut pc, encoding).expect("Should parse operation");
-            }
-        }
-    });
-}
-
-#[bench]
-fn bench_evaluating_debug_loc_expressions(b: &mut test::Bencher) {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-
-    let debug_loc = read_section("debug_loc");
-    let debug_loc = DebugLoc::new(&debug_loc, LittleEndian);
-    let debug_loclists = DebugLocLists::new(&[], LittleEndian);
-    let loclists = LocationLists::new(debug_loc, debug_loclists);
-
-    let expressions = debug_loc_expressions(&debug_info, &debug_abbrev, &debug_addr, &loclists);
-
-    b.iter(|| {
-        for &(expression, encoding) in &*expressions {
-            let mut eval = expression.evaluation(encoding);
-            eval.set_initial_value(0);
-            let result = eval.evaluate().expect("Should evaluate expression");
-            test::black_box(result);
-        }
-    });
-}
-
-// See comment above `test_parse_self_eh_frame`.
-#[cfg(target_pointer_width = "64")]
-mod cfi {
-    use super::*;
-    use fallible_iterator::FallibleIterator;
-
-    use gimli::{
-        BaseAddresses, CieOrFde, EhFrame, FrameDescriptionEntry, LittleEndian,
-        UninitializedUnwindContext, UnwindSection,
-    };
-
-    #[bench]
-    fn iterate_entries_and_do_not_parse_any_fde(b: &mut test::Bencher) {
-        let eh_frame = read_section("eh_frame");
-        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
-
-        let bases = BaseAddresses::default()
-            .set_eh_frame(0)
-            .set_got(0)
-            .set_text(0);
-
-        b.iter(|| {
-            let mut entries = eh_frame.entries(&bases);
-            while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
-                test::black_box(entry);
-            }
-        });
-    }
-
-    #[bench]
-    fn iterate_entries_and_parse_every_fde(b: &mut test::Bencher) {
-        let eh_frame = read_section("eh_frame");
-        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
-
-        let bases = BaseAddresses::default()
-            .set_eh_frame(0)
-            .set_got(0)
-            .set_text(0);
-
-        b.iter(|| {
-            let mut entries = eh_frame.entries(&bases);
-            while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
-                match entry {
-                    CieOrFde::Cie(cie) => {
-                        test::black_box(cie);
-                    }
-                    CieOrFde::Fde(partial) => {
-                        let fde = partial
-                            .parse(EhFrame::cie_from_offset)
-                            .expect("Should be able to get CIE for FED");
-                        test::black_box(fde);
-                    }
-                };
-            }
-        });
-    }
-
-    #[bench]
-    fn iterate_entries_and_parse_every_fde_and_instructions(b: &mut test::Bencher) {
-        let eh_frame = read_section("eh_frame");
-        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
-
-        let bases = BaseAddresses::default()
-            .set_eh_frame(0)
-            .set_got(0)
-            .set_text(0);
-
-        b.iter(|| {
-            let mut entries = eh_frame.entries(&bases);
-            while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
-                match entry {
-                    CieOrFde::Cie(cie) => {
-                        let mut instrs = cie.instructions(&eh_frame, &bases);
-                        while let Some(i) =
-                            instrs.next().expect("Can parse next CFI instruction OK")
-                        {
-                            test::black_box(i);
-                        }
-                    }
-                    CieOrFde::Fde(partial) => {
-                        let fde = partial
-                            .parse(EhFrame::cie_from_offset)
-                            .expect("Should be able to get CIE for FED");
-                        let mut instrs = fde.instructions(&eh_frame, &bases);
-                        while let Some(i) =
-                            instrs.next().expect("Can parse next CFI instruction OK")
-                        {
-                            test::black_box(i);
-                        }
-                    }
-                };
-            }
-        });
-    }
-
-    #[bench]
-    fn iterate_entries_evaluate_every_fde(b: &mut test::Bencher) {
-        let eh_frame = read_section("eh_frame");
-        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
-
-        let bases = BaseAddresses::default()
-            .set_eh_frame(0)
-            .set_got(0)
-            .set_text(0);
-
-        let mut ctx = UninitializedUnwindContext::new();
-
-        b.iter(|| {
-            let mut entries = eh_frame.entries(&bases);
-            while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
-                match entry {
-                    CieOrFde::Cie(_) => {}
-                    CieOrFde::Fde(partial) => {
-                        let fde = partial
-                            .parse(EhFrame::cie_from_offset)
-                            .expect("Should be able to get CIE for FED");
-                        let mut table = fde
-                            .rows(&eh_frame, &bases, &mut ctx)
-                            .expect("Should be able to initialize ctx");
-                        while let Some(row) =
-                            table.next_row().expect("Should get next unwind table row")
-                        {
-                            test::black_box(row);
-                        }
-                    }
-                };
-            }
-        });
-    }
-
-    fn instrs_len<R: Reader>(
-        eh_frame: &EhFrame<R>,
-        bases: &BaseAddresses,
-        fde: &FrameDescriptionEntry<R>,
-    ) -> usize {
-        fde.instructions(eh_frame, bases)
-            .fold(0, |count, _| Ok(count + 1))
-            .expect("fold over instructions OK")
-    }
-
-    fn get_fde_with_longest_cfi_instructions<R: Reader>(
-        eh_frame: &EhFrame<R>,
-        bases: &BaseAddresses,
-    ) -> FrameDescriptionEntry<R> {
-        let mut longest: Option<(usize, FrameDescriptionEntry<_>)> = None;
-
-        let mut entries = eh_frame.entries(bases);
-        while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
-            match entry {
-                CieOrFde::Cie(_) => {}
-                CieOrFde::Fde(partial) => {
-                    let fde = partial
-                        .parse(EhFrame::cie_from_offset)
-                        .expect("Should be able to get CIE for FED");
-
-                    let this_len = instrs_len(eh_frame, bases, &fde);
-
-                    let found_new_longest = match longest {
-                        None => true,
-                        Some((longest_len, ref _fde)) => this_len > longest_len,
-                    };
-
-                    if found_new_longest {
-                        longest = Some((this_len, fde));
-                    }
-                }
-            };
-        }
-
-        longest.expect("At least one FDE in .eh_frame").1
-    }
-
-    #[bench]
-    fn parse_longest_fde_instructions(b: &mut test::Bencher) {
-        let eh_frame = read_section("eh_frame");
-        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
-        let bases = BaseAddresses::default()
-            .set_eh_frame(0)
-            .set_got(0)
-            .set_text(0);
-        let fde = get_fde_with_longest_cfi_instructions(&eh_frame, &bases);
-
-        b.iter(|| {
-            let mut instrs = fde.instructions(&eh_frame, &bases);
-            while let Some(i) = instrs.next().expect("Should parse instruction OK") {
-                test::black_box(i);
-            }
-        });
-    }
-
-    #[bench]
-    fn eval_longest_fde_instructions_new_ctx_everytime(b: &mut test::Bencher) {
-        let eh_frame = read_section("eh_frame");
-        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
-        let bases = BaseAddresses::default()
-            .set_eh_frame(0)
-            .set_got(0)
-            .set_text(0);
-        let fde = get_fde_with_longest_cfi_instructions(&eh_frame, &bases);
-
-        b.iter(|| {
-            let mut ctx = UninitializedUnwindContext::new();
-            let mut table = fde
-                .rows(&eh_frame, &bases, &mut ctx)
-                .expect("Should initialize the ctx OK");
-            while let Some(row) = table.next_row().expect("Should get next unwind table row") {
-                test::black_box(row);
-            }
-        });
-    }
-
-    #[bench]
-    fn eval_longest_fde_instructions_same_ctx(b: &mut test::Bencher) {
-        let eh_frame = read_section("eh_frame");
-        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
-        let bases = BaseAddresses::default()
-            .set_eh_frame(0)
-            .set_got(0)
-            .set_text(0);
-        let fde = get_fde_with_longest_cfi_instructions(&eh_frame, &bases);
-
-        let mut ctx = UninitializedUnwindContext::new();
-
-        b.iter(|| {
-            let mut table = fde
-                .rows(&eh_frame, &bases, &mut ctx)
-                .expect("Should initialize the ctx OK");
-            while let Some(row) = table.next_row().expect("Should get next unwind table row") {
-                test::black_box(row);
-            }
-        });
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"48fe3a7c4c49387dae6e711be8f852eb22622882c9bd1cd923eb29c0a17c6446","CONTRIBUTING.md":"5f513ec06013e4f6f097e9c9492da5a47b9f25c94c6ecadfb655a77405fe912c","Cargo.lock":"fb84201d5d47fddf0c336c92e7ae372eee9c840c8a7f919ba5d53b1b3bae312c","Cargo.toml":"684c1f26fed0991eaa0e3864a046ae047e72e043d63accd345db7f3934157e7e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"f54273cb3a56511f07491c9813a39891fb613e6f775838fbcdce942dbdeedd8f","benches/bench.rs":"83438649d0ce7971a5d8dfba46e1cef059eee6ac6e8c01aff76eef2487d4e50d","examples/dwarf-validate.rs":"9e330340bd0869ba8f4188de5c109dff99dc7d3ed951777ab495f69af58c4b62","examples/dwarfdump.rs":"a499c8fb6463c34ec6a3232a1a50d7ff76e27da71002adc4ea4e3a09843cd79c","examples/simple.rs":"e87e041cdf56ae185b52dc4fa810b65bbc675ec8af0121f472b1fc351c58d321","examples/simple_line.rs":"e10200e3443342933d6df5c6ed3d3f7ac2c630e5d5f3e61d3d84b72df82b374d","fixtures/self/README.md":"557cd710240a14fdaa5842b216de57f2ed481151b640af09d6877984b3b2389f","fixtures/self/debug_abbrev":"7c0faa940d9c68d196d03ad55a20e5c746040fa428ff323277fa381deff82bba","fixtures/self/debug_aranges":"8c2aeb2335f61d04ecb7b747070d24f83a6517cbee79dc5c96d97fb6c53d6b6d","fixtures/self/debug_info":"42028a5983006e0703f9ca9515cd27d891ae4af70279fae5011d547f581e2661","fixtures/self/debug_inlined":"89d9516f06ff835621936037f5884fc56712bf304c1dcde52251ddd510fe8710","fixtures/self/debug_line":"b29aebcca3b38bb2bb8aa708cbe74a0dce5a3b0c18916b63d6d17282c017bec7","fixtures/self/debug_loc":"8906ccb9c204f233eb74c1d069dee97a19d18c2051f9147795d7b5364a9266aa","fixtures/self/debug_pubnames":"cf58e237f89c68afba724597fa7e260448636b45f2e69dc6f1bfe34006e27c48","fixtures/self/debug_pubtypes":"d43c1bed71c9d14d1683294cdc1833f069cf131d6e95ee808547919b4f352d81","fixtures/self/debug_ranges":"6d765ac18d33accd89186d077eeb505cbdf97d990c9201d63d9463cd7787ce7a","fixtures/self/debug_str":"9ed904b68eee77b8558b80b3b7ca03e8527f6c64483e9d6d845f40270eb21183","fixtures/self/eh_frame":"6dc3d84351cac42cf73d03452fbb532470dd94d08715154c48417e3f62095f17","fixtures/self/eh_frame_hdr":"afba7a0aa233c9a8c81c986495bd2505164844adb93272d6bc0c9e592e684716","rustfmt.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/arch.rs":"ea968df96573f7e1d5b9f8e496f665645f8a82ee5607495ecdd1aa44ec7bebc6","src/common.rs":"222e76ada0015e126d79e56a4e470ac5e3b2ae740a2b984746b95721d3445eba","src/constants.rs":"c61fac31b48cf19173a80447b0ce30f9ad07c308dd2f42402733e47db5feeffa","src/endianity.rs":"1f7e62ae34f540c06bedf1e7948739211556eea7dd83731a5ca52c7d687ed0fc","src/leb128.rs":"9d9e288ff591cf7863b8a595896faeaad8457068781c3091ac6c5dc2f41da692","src/lib.rs":"3b15540871587557d957ce5073d19f3866d37a874fe504779ac8592c888b95c4","src/read/abbrev.rs":"798fb791c130bed5b00a6160a5975feee0f66df627448ea7c822a40f137f7a9f","src/read/addr.rs":"f63f289edf889e87107bb2090fb1c50b48af7015f31b7c39c3d6ea09630a38e9","src/read/aranges.rs":"0ba7d541a3ca3d38d00a2c440b9b4bbfc26bfeeca6599deda13f0478583dc404","src/read/cfi.rs":"bb1497d41a1f17e8369cedc4093aa6351c280fbbae7fc1d8baba6dd9f8d51fa9","src/read/dwarf.rs":"1cbbb42c78e8ef3ce752bafbf7e30ef301f9d2ffc89c52a9170d97a0b2bef2c5","src/read/endian_reader.rs":"3a7fe3b3ae078678a6b13b4b24c3e6b3998cfff135039f1a8219b1003b946841","src/read/endian_slice.rs":"d07d4850d4199ba3a60eba1366dc26565bda804532270f3f5d1e5c2374ce42c5","src/read/line.rs":"848d5db6a8baec6fa227e9c00b1779cd96e9371cb4b3e5e8d935ab05a9eed0b6","src/read/loclists.rs":"39485c3a595afdd093c32a8a05b359a0ccb70e30fc3893e2f75c6b0ef6c4d92b","src/read/lookup.rs":"0cf89ba12b9d48b1fe035dd3a497730323acb9427a9457abbc2f7c58c4c71165","src/read/mod.rs":"729f0dfed465e467fdf8982a018e725ac734986f130a6a7c03dabe18ce835dc2","src/read/op.rs":"270865aace2324a365dab68c78a624ae46118cac56b1ce009d77c9f7aa8373df","src/read/pubnames.rs":"701c1279aef596ed8eff13f19a5803f9e1070afa20c9bafbf29659d4c294edd4","src/read/pubtypes.rs":"6250112d63120ed283698cb42189b127f624fb453abb1222dfa75fe103ad077e","src/read/reader.rs":"ce3861c10bbd36bb0a38110dccc9e4a9248e3e9c48b27eea3e0e000e85d25770","src/read/rnglists.rs":"9b62814c18ee63dc163860f2a3f121f259cca61f62697885b607be59e0d2e065","src/read/str.rs":"dcdf5cd9260f0c9cf32aff5a03185f510f513661855d49980276ee0d6876802e","src/read/unit.rs":"a2cfc11658117edb92a39fb2aca82a084c35ffac61c946b30e87560797da5f99","src/read/value.rs":"380b1125f10880fe337a92d26016e0790705d7980e52c790ad1695cb7e92090d","src/test_util.rs":"291eefa6b51c6d934ba2f4a4c9bc7c403046fc1cccf4d43487820f0154bb89e2","src/write/abbrev.rs":"fa02163389e92e804d139cf84f833ab6af932083f0eb2d74464b4a70bd3237ff","src/write/cfi.rs":"5d36c6978d2bda09921f5b71b764a75a58e819551471fb44db23ce5db7c4a8e3","src/write/dwarf.rs":"8a1a0893e31134ad68993994594f3024ad0c8af7c1188b29e0ffc26b42edef21","src/write/endian_vec.rs":"1d5811986648816a677580b22630f5059757a381487d73e9adbb3008c9ae0c58","src/write/line.rs":"821fa9ac0c3afb27609034156f576301217b5c661c3e03eee09734b50ffc66a0","src/write/loc.rs":"d1c8a9068816e09c8a8e0673e4906806e88706f5712892c5990b5c10c09ed84e","src/write/mod.rs":"91aeddaae6557ffc4676d123b22c466832e939f8dd0aefb038b0193417d8c0af","src/write/op.rs":"14ec8145ec6fb0131504af53caeb1b6d2d929edd6baa4718ee7b8dd211533291","src/write/range.rs":"7e4174a8cbf9b3ac2724b0b07ad5e010838b98a848d5f839f4bc8e207c773c4a","src/write/section.rs":"3ce781d5e82ba365ff54fdd36e0ef58c58a2215b09a8861eb0b038efac82b77f","src/write/str.rs":"4850cc2fee55980f9cbb6b4169f9861ab9d05c2b28a85c2b790480b83a66f514","src/write/unit.rs":"db2177fa1f771d797b1beb9e0a076076b81acaed91b523825f91b357aa4384ea","src/write/writer.rs":"aa6ebe7f2e695c5345558c73e71e3532ab0b3244fc18684bcd18de44e9ee3570","tests/convert_self.rs":"8fba3599ac892a704cbcd5aed53eaef51b040043da04f85f002c597ee7549046","tests/parse_self.rs":"a7d5b09c0cfb4891de96bc7db38aec14275b4d9b29c9df85b05d267b8d7030d4"},"package":"aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,405 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "adler32"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "autocfg"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "byteorder"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "compiler_builtins"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "crc32fast"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "either"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "flate2"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gimli"
-version = "0.22.0"
-dependencies = [
- "compiler_builtins 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "object 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-std-workspace-alloc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-std-workspace-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "test-assembler 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "typed-arena 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memchr"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memmap"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "object"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmparser 0.57.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rayon"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rustc-std-workspace-alloc"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rustc-std-workspace-core"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "test-assembler"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "typed-arena"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wasmparser"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-"checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum compiler_builtins 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "7bc4ac2c824d2bfc612cba57708198547e9a26943af0632aff033e0693074d5c"
-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-"checksum crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
-"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
-"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
-"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
-"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
-"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-"checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
-"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
-"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
-"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
-"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
-"checksum object 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
-"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
-"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
-"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
-"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
-"checksum rustc-std-workspace-alloc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff66d57013a5686e1917ed6a025d54dd591fcda71a41fe07edf4d16726aefa86"
-"checksum rustc-std-workspace-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-"checksum test-assembler 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5ccc488d8ed3a4a31f68372ba429642245ddbdf6642054334b7fcc06264cbde9"
-"checksum thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88ddf1ad580c7e3d1efff877d972bcc93f995556b9087a5a259630985c88ceab"
-"checksum typed-arena 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae"
-"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-"checksum wasmparser 0.57.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6"
-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "gimli"
-version = "0.22.0"
-authors = ["Nick Fitzgerald <fitzgen@gmail.com>", "Philip Craig <philipjcraig@gmail.com>"]
-exclude = ["/ci/*", "/releases/*", "/.travis.yml"]
-description = "A library for reading and writing the DWARF debugging format."
-documentation = "https://docs.rs/gimli"
-readme = "./README.md"
-keywords = ["DWARF", "debug", "ELF", "eh_frame"]
-categories = ["development-tools::debugging", "development-tools::profiling", "parser-implementations"]
-license = "Apache-2.0/MIT"
-repository = "https://github.com/gimli-rs/gimli"
-[profile.bench]
-codegen-units = 1
-debug = true
-
-[[example]]
-name = "simple"
-required-features = ["read"]
-
-[[example]]
-name = "simple_line"
-required-features = ["read"]
-
-[[example]]
-name = "dwarfdump"
-required-features = ["read", "std"]
-
-[[example]]
-name = "dwarf-validate"
-required-features = ["read", "std"]
-[dependencies.alloc]
-version = "1.0.0"
-optional = true
-package = "rustc-std-workspace-alloc"
-
-[dependencies.compiler_builtins]
-version = "0.1.2"
-optional = true
-
-[dependencies.core]
-version = "1.0.0"
-optional = true
-package = "rustc-std-workspace-core"
-
-[dependencies.fallible-iterator]
-version = "0.2.0"
-optional = true
-default-features = false
-
-[dependencies.indexmap]
-version = "1.0.2"
-optional = true
-
-[dependencies.stable_deref_trait]
-version = "1.1.0"
-optional = true
-default-features = false
-[dev-dependencies.crossbeam]
-version = "0.7.1"
-
-[dev-dependencies.getopts]
-version = "0.2"
-
-[dev-dependencies.memmap]
-version = "0.7"
-
-[dev-dependencies.num_cpus]
-version = "1"
-
-[dev-dependencies.object]
-version = "0.20"
-
-[dev-dependencies.rayon]
-version = "1.0"
-
-[dev-dependencies.regex]
-version = "1"
-
-[dev-dependencies.test-assembler]
-version = "0.1.3"
-
-[dev-dependencies.typed-arena]
-version = "2"
-
-[features]
-default = ["read", "write", "std", "fallible-iterator", "endian-reader"]
-endian-reader = ["stable_deref_trait"]
-read = []
-rustc-dep-of-std = ["core", "alloc", "compiler_builtins"]
-std = ["fallible-iterator/std", "stable_deref_trait/std"]
-write = ["indexmap"]
-[badges.coveralls]
-repository = "gimli-rs/gimli"
-
-[badges.travis-ci]
-repository = "gimli-rs/gimli"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,658 +0,0 @@
-# `gimli` Change Log
-
---------------------------------------------------------------------------------
-
-## 0.22.0
-
-Released 2020/07/03.
-
-### Breaking changes
-
-* Fixed `UnitHeader::size_of_header` for DWARF 5 units.
-  [#518](https://github.com/gimli-rs/gimli/pull/518)
-
-### Added
-
-* Added fuzz targets in CI.
-  [#512](https://github.com/gimli-rs/gimli/pull/512)
-
-* Added read support for `DW_OP_GNU_addr_index` and `DW_OP_GNU_const_index`.
-  [#516](https://github.com/gimli-rs/gimli/pull/516)
-
-* Added `.dwo` support to dwarfdump.
-  [#516](https://github.com/gimli-rs/gimli/pull/516)
-
-* Added `SectionId::dwo_name` and `Section::dwo_section_name`.
-  [#517](https://github.com/gimli-rs/gimli/pull/517)
-
-### Fixed
-
-* Fixed panic when reading `DW_FORM_indirect` combined with `DW_FORM_implicit_const`.
-  [#502](https://github.com/gimli-rs/gimli/pull/502)
-
-* Fixed panic for `read::Abbreviations::get(0)`.
-  [#505](https://github.com/gimli-rs/gimli/pull/505)
-
-* Fixed arithmetic overflow when reading `.debug_line`.
-  [#508](https://github.com/gimli-rs/gimli/pull/508)
-
-* Fixed arithmetic overflow when reading CFI.
-  [#509](https://github.com/gimli-rs/gimli/pull/509)
-
-* Fixed arithmetic overflow and division by zero when reading `.debug_aranges`.
-  [#510](https://github.com/gimli-rs/gimli/pull/510)
-
-* Don't return error from `read::Unit::new` when `DW_AT_name` or `DW_AT_comp_dir` is missing.
-  [#515](https://github.com/gimli-rs/gimli/pull/515)
-
---------------------------------------------------------------------------------
-
-## 0.21.0
-
-Released 2020/05/12.
-
-### Breaking changes
-
-* Minimum Rust version increased to 1.38.0.
-
-* Replaced `read::Operation::Literal` with `Operation::UnsignedConstant` and `Operation::SignedConstant`.
-  Changed `read::Operation::Bra` and `read::Operation::Skip` to contain the target offset instead of the bytecode.
-  [#479](https://github.com/gimli-rs/gimli/pull/479)
-
-* Changed `write::Expression` to support references. Existing users can convert to use `Expression::raw`.
-  [#479](https://github.com/gimli-rs/gimli/pull/479)
-
-* Replaced `write::AttributeValue::AnyUnitEntryRef` with `DebugInfoRef`.
-  Renamed `write::AttributeValue::ThisUnitEntryRef` to `UnitRef`.
-  [#479](https://github.com/gimli-rs/gimli/pull/479)
-
-* Added more optional features: `endian-reader` and `fallible-iterator`.
-  [#495](https://github.com/gimli-rs/gimli/pull/495)
-  [#498](https://github.com/gimli-rs/gimli/pull/498)
-
-### Added
-
-* Added `read::Expression::operations`
-  [#479](https://github.com/gimli-rs/gimli/pull/479)
-
-### Fixed
-
-* Fixed newlines in `dwarfdump` example.
-  [#470](https://github.com/gimli-rs/gimli/pull/470)
-
-* Ignore zero terminators when reading `.debug_frame` sections.
-  [#486](https://github.com/gimli-rs/gimli/pull/486)
-
-* Increase the number of CFI register rules supported by `read::UnwindContext`.
-  [#487](https://github.com/gimli-rs/gimli/pull/487)
-
-* Fixed version handling and return register encoding when reading `.eh_frame` sections.
-  [#493](https://github.com/gimli-rs/gimli/pull/493)
-
-### Changed
-
-* Added `EhFrame` and `DebugFrame` to `write::Sections`.
-  [#492](https://github.com/gimli-rs/gimli/pull/492)
-
-* Improved performance of `write::LineProgram::generate_row`.
-  [#476](https://github.com/gimli-rs/gimli/pull/476)
-
-* Removed use of the `byteorder`, `arrayvec` and `smallvec` crates.
-  [#494](https://github.com/gimli-rs/gimli/pull/494)
-  [#496](https://github.com/gimli-rs/gimli/pull/496)
-  [#497](https://github.com/gimli-rs/gimli/pull/497)
-
---------------------------------------------------------------------------------
-
-## 0.20.0
-
-Released 2020/01/11.
-
-### Breaking changes
-
-* Changed type of `DwTag`, `DwAt`, and `DwForm` constants.
-  [#451](https://github.com/gimli-rs/gimli/pull/451)
-
-* Added `read/write::AttributeValue::DebugMacroRef`, and returned where
-  required in `read::Attribute::value`. Added `SectionId::DebugMacro`.
-  [#454](https://github.com/gimli-rs/gimli/pull/454)
-
-* Deleted `alloc` feature, and fixed `no-std` builds with stable rust.
-  [#459](https://github.com/gimli-rs/gimli/pull/459)
-
-* Deleted `read::Error::description`, and changed `<read::Error as Display>`
-  to display what was previously the description.
-  [#462](https://github.com/gimli-rs/gimli/pull/462)
-
-### Added
-
-* Added GNU view constants.
-  [#434](https://github.com/gimli-rs/gimli/pull/434)
-
-* Added `read::EntriesRaw` for low level DIE parsing.
-  [#455](https://github.com/gimli-rs/gimli/pull/455)
-
-* Added `examples/simple-line.rs`.
-  [#460](https://github.com/gimli-rs/gimli/pull/460)
-
-### Fixed
-
-* Fixed handling of CFI augmentations without data.
-  [#438](https://github.com/gimli-rs/gimli/pull/438)
-
-* dwarfdump: fix panic for malformed expressions.
-  [#447](https://github.com/gimli-rs/gimli/pull/447)
-
-* dwarfdump: fix handling of Mach-O relocations.
-  [#449](https://github.com/gimli-rs/gimli/pull/449)
-
-### Changed
-
-* Improved abbreviation parsing performance.
-  [#451](https://github.com/gimli-rs/gimli/pull/451)
-
---------------------------------------------------------------------------------
-
-## 0.19.0
-
-Released 2019/07/08.
-
-### Breaking changes
-
-* Small API changes related to `.debug_loc` and `.debug_loclists`:
-  added `read::RawLocListEntry::AddressOrOffsetPair` enum variant,
-  added `write::Sections::debug_loc/debug_loclists` public members,
-  and replaced `write::AttributeValue::LocationListsRef` with `LocationListRef`.
-  [#425](https://github.com/gimli-rs/gimli/pull/425)
-
-### Added
-
-* Added `read::Attribute::exprloc_value` and `read::AttributeValue::exprloc_value`.
-  [#422](https://github.com/gimli-rs/gimli/pull/422)
-
-* Added support for writing `.debug_loc` and `.debug_loclists` sections.
-  [#425](https://github.com/gimli-rs/gimli/pull/425)
-
-* Added `-G` flag to `dwarfdump` example to display global offsets.
-  [#427](https://github.com/gimli-rs/gimli/pull/427)
-
-* Added `examples/simple.rs`.
-  [#429](https://github.com/gimli-rs/gimli/pull/429)
-
-### Fixed
-
-* `write::LineProgram::from` no longer requires `DW_AT_name` or `DW_AT_comp_dir`
-  attributes to be present in the unit DIE.
-  [#430](https://github.com/gimli-rs/gimli/pull/430)
-
---------------------------------------------------------------------------------
-
-## 0.18.0
-
-Released 2019/04/25.
-
-The focus of this release has been on improving support for reading CFI,
-and adding support for writing CFI.
-
-### Breaking changes
-
-* For types which have an `Offset` type parameter, the default `Offset`
-  has changed from `usize` to `R::Offset`.
-  [#392](https://github.com/gimli-rs/gimli/pull/392)
-
-* Added an `Offset` type parameter to the `read::Unit` type to allow variance.
-  [#393](https://github.com/gimli-rs/gimli/pull/393)
-
-* Changed the `UninitializedUnwindContext::initialize` method to borrow `self`,
-  and return `&mut UnwindContext`. Deleted the `InitializedUnwindContext` type.
-  [#395](https://github.com/gimli-rs/gimli/pull/395)
-
-* Deleted the `UnwindSection` type parameters from the `CommonInformationEntry`,
-  `FrameDescriptionEntry`, `UninitializedUnwindContext`,
-  `UnwindContext`, and `UnwindTable` types.
-  [#399](https://github.com/gimli-rs/gimli/pull/399)
-
-* Changed the signature of the `get_cie` callback parameter for various functions.
-  The signature now matches the `UnwindSection::cie_from_offset` method, so
-  that method can be used as the parameter.
-  [#400](https://github.com/gimli-rs/gimli/pull/400)
-
-* Reduced the number of lifetime parameters for the `UnwindTable` type.
-  [#400](https://github.com/gimli-rs/gimli/pull/400)
-
-* Updated `fallible-iterator` to version 0.2.0.
-  [#407](https://github.com/gimli-rs/gimli/pull/407)
-
-* Added a parameter to the `Error::UnexpectedEof` enum variant.
-  [#408](https://github.com/gimli-rs/gimli/pull/408)
-
-### Added
-
-* Update to 2018 edition.
-  [#391](https://github.com/gimli-rs/gimli/pull/391)
-
-* Added the `FrameDescriptionEntry::unwind_info_for_address` method.
-  [#396](https://github.com/gimli-rs/gimli/pull/396)
-
-* Added the `FrameDescriptionEntry::rows` method.
-  [#396](https://github.com/gimli-rs/gimli/pull/396)
-
-* Added the `EhHdrTable::unwind_info_for_address` method.
-  [#400](https://github.com/gimli-rs/gimli/pull/400)
-
-* Added the `EhHdrTable::fde_for_address` method and deprecated the
-  `EhHdrTable::lookup_and_parse` method.
-  [#400](https://github.com/gimli-rs/gimli/pull/400)
-
-* Added the `EhHdrTable::pointer_to_offset` method.
-  [#400](https://github.com/gimli-rs/gimli/pull/400)
-
-* Added the `UnwindSection::fde_for_address` method.
-  [#396](https://github.com/gimli-rs/gimli/pull/396)
-
-* Added the `UnwindSection::fde_from_offset` method.
-  [#400](https://github.com/gimli-rs/gimli/pull/400)
-
-* Added the `UnwindSection::partial_fde_from_offset` method.
-  [#400](https://github.com/gimli-rs/gimli/pull/400)
-
-* Added the `Section::id` method.
-  [#406](https://github.com/gimli-rs/gimli/pull/406)
-
-* Added the `Dwarf::load` method, and corresponding methods for individual sections.
-  [#406](https://github.com/gimli-rs/gimli/pull/406)
-
-* Added the `Dwarf::borrow` method, and corresponding methods for individual sections.
-  [#406](https://github.com/gimli-rs/gimli/pull/406)
-
-* Added the `Dwarf::format_error` method.
-  [#408](https://github.com/gimli-rs/gimli/pull/408)
-
-* Added the `Dwarf::die_ranges` method.
-  [#417](https://github.com/gimli-rs/gimli/pull/417)
-
-* Added the `Dwarf::unit_ranges` method.
-  [#417](https://github.com/gimli-rs/gimli/pull/417)
-
-* Added support for writing `.debug_frame` and `.eh_frame` sections.
-  [#412](https://github.com/gimli-rs/gimli/pull/412)
-  [#419](https://github.com/gimli-rs/gimli/pull/419)
-
-### Fixed
-
-* The `code_alignment_factor` is now used when evaluting CFI instructions
-  that advance the location.
-  [#401](https://github.com/gimli-rs/gimli/pull/401)
-
-* Fixed parsing of pointers encoded with `DW_EH_PE_funcrel`.
-  [#402](https://github.com/gimli-rs/gimli/pull/402)
-
-* Use the FDE address encoding from the augmentation when parsing `DW_CFA_set_loc`.
-  [#403](https://github.com/gimli-rs/gimli/pull/403)
-
-* Fixed setting of `.eh_frame` base addresses in dwarfdump.
-  [#410](https://github.com/gimli-rs/gimli/pull/410)
-
-## 0.17.0
-
-Released 2019/02/21.
-
-The focus of this release has been on improving DWARF 5 support, and
-adding support for writing DWARF.
-
-### Breaking changes
-
-* Changed register values to a `Register` type instead of `u8`/`u64`.
-  [#328](https://github.com/gimli-rs/gimli/pull/328)
-
-* Replaced `BaseAddresses::set_cfi` with `set_eh_frame_hdr` and `set_eh_frame`.
-  Replaced `BaseAddresses::set_data` with `set_got`.
-  You should now use the same `BaseAddresses` value for parsing both
-  `.eh_frame` and `.eh_frame_hdr`.
-  [#351](https://github.com/gimli-rs/gimli/pull/351)
-
-* Renamed many types and functions related to `.debug_line`.
-  Renamed `LineNumberProgram` to `LineProgram`.
-  Renamed `IncompleteLineNumberProgram` to `IncompleteLineProgram`.
-  Renamed `CompleteLineNumberProgram` to `CompleteLineProgram`.
-  Renamed `LineNumberProgramHeader` to `LineProgramHeader`.
-  Renamed `LineNumberRow` to `LineRow`.
-  Renamed `StateMachine` to `LineRows`.
-  Renamed `Opcode` to `LineInstruction`.
-  Renamed `OpcodesIter` to `LineInstructions`.
-  Renamed `LineNumberSequence` to `LineSequence`.
-  [#359](https://github.com/gimli-rs/gimli/pull/359)
-
-* Added `Offset` type parameter to `AttributeValue`, `LineProgram`,
-  `IncompleteLineProgram`, `CompleteLineProgram`, `LineRows`, `LineInstruction`,
-  and `FileEntry`.
-  [#324](https://github.com/gimli-rs/gimli/pull/324)
-
-* Changed `FileEntry::path_name`, `FileEntry::directory`, and
-  `LineProgramHeader::directory` to return an `AttributeValue` instead
-  of a `Reader`.
-  [#366](https://github.com/gimli-rs/gimli/pull/366)
-
-* Renamed `FileEntry::last_modification` to `FileEntry::timestamp`
-  and renamed `FileEntry::length` to `FileEntry::size`.
-  [#366](https://github.com/gimli-rs/gimli/pull/366)
-
-* Added an `Encoding` type. Changed many functions that previously accepted
-  `Format`, version or address size parameters to accept an `Encoding`
-  parameter instead.
-  Notable changes are `LocationLists::locations`, `RangeLists::ranges`,
-  and `Expression::evaluation`.
-  [#364](https://github.com/gimli-rs/gimli/pull/364)
-
-* Changed return type of `LocationLists::new` and `RangeLists::new`.
-  [#370](https://github.com/gimli-rs/gimli/pull/370)
-
-* Added parameters to `LocationsLists::locations` and `RangeLists::ranges`
-  to support `.debug_addr`.
-  [#358](https://github.com/gimli-rs/gimli/pull/358)
-
-* Added more `AttributeValue` variants: `DebugAddrBase`, `DebugAddrIndex`,
-  `DebugLocListsBase`, `DebugLocListsIndex`, `DebugRngListsBase`, `DebugRngListsIndex`,
-  `DebugStrOffsetsBase`, `DebugStrOffsetsIndex`, `DebugLineStrRef`.
-  [#358](https://github.com/gimli-rs/gimli/pull/358)
-
-* Changed `AttributeValue::Data*` attributes to native endian integers instead
-  of byte arrays.
-  [#365](https://github.com/gimli-rs/gimli/pull/365)
-
-* Replaced `EvaluationResult::TextBase` with
-  `EvaluationResult::RequiresRelocatedAddress`. The handling of `TextBase`
-  was incorrect.
-  [#335](https://github.com/gimli-rs/gimli/pull/335)
-
-* Added `EvaluationResult::IndexedAddress` for operations that require an
-  address from `.debug_addr`.
-  [#358](https://github.com/gimli-rs/gimli/pull/358)
-
-* Added `Reader::read_slice`. Added a default implementation of
-  `Reader::read_u8_array` which uses this.
-  [#358](https://github.com/gimli-rs/gimli/pull/358)
-
-### Added
-
-* Added initial support for writing DWARF. This is targeted at supporting
-  line number information only.
-  [#340](https://github.com/gimli-rs/gimli/pull/340)
-  [#344](https://github.com/gimli-rs/gimli/pull/344)
-  [#346](https://github.com/gimli-rs/gimli/pull/346)
-  [#361](https://github.com/gimli-rs/gimli/pull/361)
-  [#362](https://github.com/gimli-rs/gimli/pull/362)
-  [#365](https://github.com/gimli-rs/gimli/pull/365)
-  [#368](https://github.com/gimli-rs/gimli/pull/368)
-  [#382](https://github.com/gimli-rs/gimli/pull/382)
-
-* Added `read` and `write` Cargo features. Both are enabled by default.
-  [#343](https://github.com/gimli-rs/gimli/pull/343)
-
-* Added support for reading DWARF 5 `.debug_line` and `.debug_line_str` sections.
-  [#366](https://github.com/gimli-rs/gimli/pull/366)
-
-* Added support for reading DWARF 5 `.debug_str_offsets` sections, including
-  parsing `DW_FORM_strx*` attributes.
-  [#358](https://github.com/gimli-rs/gimli/pull/358)
-
-* Added support for reading DWARF 5 `.debug_addr` sections, including parsing
-  `DW_FORM_addrx*` attributes and evaluating `DW_OP_addrx` and `DW_OP_constx`
-  operations.
-  [#358](https://github.com/gimli-rs/gimli/pull/358)
-
-* Added support for reading DWARF 5 indexed addresses and offsets in
-  `.debug_loclists` and `.debug_rnglists`, including parsing `DW_FORM_rnglistx`
-  and `DW_FORM_loclistx` attributes.
-  [#358](https://github.com/gimli-rs/gimli/pull/358)
-
-* Added high level `Dwarf` and `Unit` types. Existing code does not need to
-  switch to using these types, but doing so will make DWARF 5 support simpler.
-  [#352](https://github.com/gimli-rs/gimli/pull/352)
-  [#380](https://github.com/gimli-rs/gimli/pull/380)
-  [#381](https://github.com/gimli-rs/gimli/pull/381)
-
-* Added `EhFrame::set_address_size` and `DebugFrame::set_address_size` methods
-  to allow parsing non-native CFI sections. The default address size is still
-  the native size.
-  [#325](https://github.com/gimli-rs/gimli/pull/325)
-
-* Added architecture specific definitions for `Register` values and names.
-  Changed dwarfdump to print them.
-  [#328](https://github.com/gimli-rs/gimli/pull/328)
-
-* Added support for reading relocatable DWARF sections.
-  [#337](https://github.com/gimli-rs/gimli/pull/337)
-
-* Added parsing of `DW_FORM_data16`.
-  [#366](https://github.com/gimli-rs/gimli/pull/366)
-
-### Fixed
-
-* Fixed parsing DWARF 5 ranges with `start == end == 0`.
-  [#323](https://github.com/gimli-rs/gimli/pull/323)
-
-* Changed `LineRows` to be covariant in its `Reader` type parameter.
-  [#324](https://github.com/gimli-rs/gimli/pull/324)
-
-* Fixed handling of empty units in dwarfdump.
-  [#330](https://github.com/gimli-rs/gimli/pull/330)
-
-* Fixed `UnitHeader::length_including_self` for `Dwarf64`.
-  [#342](https://github.com/gimli-rs/gimli/pull/342)
-
-* Fixed parsing of `DW_CFA_set_loc`.
-  [#355](https://github.com/gimli-rs/gimli/pull/355)
-
-* Fixed handling of multiple headers in `.debug_loclists` and `.debug_rnglists`.
-  [#370](https://github.com/gimli-rs/gimli/pull/370)
-
---------------------------------------------------------------------------------
-
-## 0.16.1
-
-Released 2018/08/28.
-
-### Added
-
-* Added `EhFrameHdr::lookup_and_parse`. [#316][]
-* Added support for `DW_CFA_GNU_args_size`. [#319][]
-
-### Fixed
-
-* Implement `Send`/`Sync` for `SubRange`. [#305][]
-* Fixed `alloc` support on nightly. [#306][] [#310][]
-
-[#305]: https://github.com/gimli-rs/gimli/pull/305
-[#306]: https://github.com/gimli-rs/gimli/pull/306
-[#310]: https://github.com/gimli-rs/gimli/pull/310
-[#316]: https://github.com/gimli-rs/gimli/pull/316
-[#319]: https://github.com/gimli-rs/gimli/pull/319
-
---------------------------------------------------------------------------------
-
-## 0.16.0
-
-Released 2018/06/01.
-
-### Added
-
-* Added support for building in `#![no_std]` environments, when the `alloc`
-  crate is available. Disable the "std" feature and enable the "alloc"
-  feature. [#138][] [#271][]
-
-* Added support for DWARF 5 `.debug_rnglists` and `.debug_loclists`
-  sections. [#272][]
-
-* Added support for DWARF 5 `DW_FORM_ref_sup` and `DW_FORM_strp_sup` attribute
-  forms. [#288][]
-
-* Added support for DWARF 5 operations on typed values. [#293][]
-
-* A `dwarf-validate` example program that checks the integrity of the given
-  DWARF and its references between sections. [#290][]
-
-* Added the `EndianReader<T>` type, an easy way to define a custom `Reader`
-  implementation with a reference to a generic buffer of bytes and an associated
-  endianity. [#298][] [#302][]
-
-### Changed
-
-* Various speed improvements for evaluating `.debug_line` line number
-  programs. [#276][]
-
-* The example `dwarfdump` clone is a [whole lot faster
-  now][dwarfdump-faster]. [#282][] [#284][] [#285][]
-
-### Deprecated
-
-* `EndianBuf` has been renamed to `EndianSlice`, use that name instead. [#295][]
-
-### Fixed
-
-* Evaluating the `DW_CFA_restore_state` opcode properly maintains the current
-  location. Previously it would incorrectly restore the old location when
-  popping from evaluation stack. [#274][]
-
-[#271]: https://github.com/gimli-rs/gimli/issues/271
-[#138]: https://github.com/gimli-rs/gimli/issues/138
-[#274]: https://github.com/gimli-rs/gimli/issues/274
-[#272]: https://github.com/gimli-rs/gimli/issues/272
-[#276]: https://github.com/gimli-rs/gimli/issues/276
-[#282]: https://github.com/gimli-rs/gimli/issues/282
-[#285]: https://github.com/gimli-rs/gimli/issues/285
-[#284]: https://github.com/gimli-rs/gimli/issues/284
-[#288]: https://github.com/gimli-rs/gimli/issues/288
-[#290]: https://github.com/gimli-rs/gimli/issues/290
-[#293]: https://github.com/gimli-rs/gimli/issues/293
-[#295]: https://github.com/gimli-rs/gimli/issues/295
-[#298]: https://github.com/gimli-rs/gimli/issues/298
-[#302]: https://github.com/gimli-rs/gimli/issues/302
-[dwarfdump-faster]: https://robert.ocallahan.org/2018/03/speeding-up-dwarfdump-with-rust.html
-
---------------------------------------------------------------------------------
-
-## 0.15.0
-
-Released 2017/12/01.
-
-### Added
-
-* Added the `EndianBuf::to_string()` method. [#233][]
-
-* Added more robust error handling in our example `dwarfdump` clone. [#234][]
-
-* Added `FrameDescriptionEntry::initial_address` method. [#237][]
-
-* Added `FrameDescriptionEntry::len` method. [#237][]
-
-* Added the `FrameDescriptionEntry::entry_len` method. [#241][]
-
-* Added the `CommonInformationEntry::offset` method. [#241][]
-
-* Added the `CommonInformationEntry::entry_len` method. [#241][]
-
-* Added the `CommonInformationEntry::version` method. [#241][]
-
-* Added the `CommonInformationEntry::augmentation` method. [#241][]
-
-* Added the `CommonInformationEntry::code_alignment_factor` method. [#241][]
-
-* Added the `CommonInformationEntry::data_alignment_factor` method. [#241][]
-
-* Added the `CommonInformationEntry::return_address_register` method. [#241][]
-
-* Added support for printing `.eh_frame` sections to our example `dwarfdump`
-  clone. [#241][]
-
-* Added support for parsing the `.eh_frame_hdr` section. On Linux, the
-  `.eh_frame_hdr` section provides a pointer to the already-mapped-in-memory
-  `.eh_frame` data, so that it doesn't need to be duplicated, and a binary
-  search table of its entries for faster unwinding information lookups. [#250][]
-
-* Added support for parsing DWARF 5 compilation unit headers. [#257][]
-
-* Added support for DWARF 5's `DW_FORM_implicit_const`. [#257][]
-
-### Changed
-
-* Unwinding methods now give ownership of the unwinding context back to the
-  caller if errors are encountered, not just on the success path. This allows
-  recovering from errors in signal-safe code, where constructing a new unwinding
-  context is not an option because it requires allocation. This is a **breaking
-  change** affecting `UnwindSection::unwind_info_for_address` and
-  `UninitializedUnwindContext::initialize`. [#241][]
-
-* `CfaRule` and `RegisterRule` now expose their `DW_OP` expressions as
-  `Expression`. This is a minor **breaking change**. [#241][]
-
-* The `Error::UnknownVersion` variant now contains the unknown version
-  number. This is a minor **breaking change**. [#245][]
-
-* `EvaluationResult::RequiresEntryValue` requires an `Expression` instead of a
-  `Reader` now. This is a minor **breaking change**. [#256][]
-
-
-[#233]: https://github.com/gimli-rs/gimli/pull/233
-[#234]: https://github.com/gimli-rs/gimli/pull/234
-[#237]: https://github.com/gimli-rs/gimli/pull/237
-[#241]: https://github.com/gimli-rs/gimli/pull/241
-[#245]: https://github.com/gimli-rs/gimli/pull/245
-[#250]: https://github.com/gimli-rs/gimli/pull/250
-[#256]: https://github.com/gimli-rs/gimli/pull/256
-[#257]: https://github.com/gimli-rs/gimli/pull/257
-
---------------------------------------------------------------------------------
-
-## 0.14.0
-
-Released 2017/08/08.
-
-### Added
-
-* All `pub` types now `derive(Hash)`. [#192][]
-
-* All the constants from DWARF 5 are now defined. [#193][]
-
-* Added support for the `DW_OP_GNU_parameter_ref` GNU extension to parsing and
-  evaluation DWARF opcodes. [#208][]
-
-* Improved LEB128 parsing performance. [#216][]
-
-* Improved `.debug_{aranges,pubnames,pubtypes}` parsing performance. [#218][]
-
-* Added the ability to choose endianity dynamically at run time, rather than
-  only statically at compile time. [#219][]
-
-### Changed
-
-* The biggest change of this release is that `gimli` no longer requires the
-  object file's section be fully loaded into memory. This enables using `gimli`
-  on 32 bit platforms where there often isn't enough contiguous virtual memory
-  address space to load debugging information into. The default behavior is
-  still geared for 64 bit platforms, where address space overfloweth, and you
-  can still load the whole sections of the object file (or the entire object
-  file) into memory. This is abstracted over with the `gimli::Reader`
-  trait. This manifests as small (but many) breaking changes to much of the
-  public API. [#182][]
-
-### Fixed
-
-* The `DW_END_*` constants for defining endianity of a compilation unit were
-  previously incorrect. [#193][]
-
-* The `DW_OP_addr` opcode is relative to the base address of the `.text` section
-  of the binary, but we were incorrectly treating it as an absolute value. [#210][]
-
-[GitHub]: https://github.com/gimli-rs/gimli
-[crates.io]: https://crates.io/crates/gimli
-[contributing]: https://github.com/gimli-rs/gimli/blob/master/CONTRIBUTING.md
-[easy]: https://github.com/gimli-rs/gimli/issues?q=is%3Aopen+is%3Aissue+label%3Aeasy
-[#192]: https://github.com/gimli-rs/gimli/pull/192
-[#193]: https://github.com/gimli-rs/gimli/pull/193
-[#182]: https://github.com/gimli-rs/gimli/issues/182
-[#208]: https://github.com/gimli-rs/gimli/pull/208
-[#210]: https://github.com/gimli-rs/gimli/pull/210
-[#216]: https://github.com/gimli-rs/gimli/pull/216
-[#218]: https://github.com/gimli-rs/gimli/pull/218
-[#219]: https://github.com/gimli-rs/gimli/pull/219
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/CONTRIBUTING.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/CONTRIBUTING.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/CONTRIBUTING.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-# Contributing to `gimli`
-
-Hi! We'd love to have your contributions! If you want help or mentorship, reach
-out to us in a GitHub issue, or ping `fitzgen` in `#rust` on `irc.mozilla.org`.
-
-* [Code of Conduct](#coc)
-* [Filing an Issue](#issues)
-* [Building `gimli`](#building)
-* [Testing `gimli`](#testing)
-  * [Test Coverage](#coverage)
-  * [Using `test-assembler`](#test-assembler)
-  * [Fuzzing](#fuzzing)
-* [Benchmarking](#benchmarking)
-* [Style](#style)
-
-## <a id="coc"></a> Code of Conduct
-
-We abide by the
-[Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html) and ask
-that you do as well.
-
-## <a id="issues"></a> Filing an Issue
-
-Think you've found a bug? File an issue! To help us understand and reproduce the
-issue, provide us with:
-
-* The (preferably minimal) test case
-* Steps to reproduce the issue using the test case
-* The expected result of following those steps
-* The actual result of following those steps
-
-Definitely file an issue if you see an unexpected panic originating from within
-`gimli`! `gimli` should never panic unless it is explicitly documented to panic
-in the specific circumstances provided.
-
-## <a id="building"></a> Building `gimli`
-
-`gimli` should always build on stable `rustc`, but we recommend using
-[`rustup`](https://www.rustup.rs/) so you can switch to nightly `rustc` and run
-benchmarks.
-
-To build `gimli`:
-
-```
-$ cargo build
-```
-
-## <a id="testing"></a> Testing `gimli`
-
-Run the tests with `cargo`:
-
-```
-$ cargo test
-```
-
-### <a id="coverage"></a> Test Coverage
-
-If you have `kcov` installed under linux, then you can generate code coverage
-results using the `coverage` script in the root of the repository, and view them
-at `target/kcov/index.html`. Otherwise you can create a pull request and view
-the coverage results on coveralls.io.
-
-```
-$ ./coverage
-```
-
-The ideal we aim to reach is having our unit tests exercise every branch in
-`gimli`. We allow an exception for branches which propagate errors inside a
-`try!(..)` invocation, but we *do* want to exercise the original error paths.
-
-Pull requests adding new code should ensure that this ideal is met.
-
-At the time of writing we have 94% test coverage according to our coveralls.io
-continuous integration. That number should generally stay the same or go up ;)
-This is a bit subjective, because -.001% is just noise and doesn't matter.
-
-### <a id="test-assembler"></a> Using `test-assembler`
-
-We use the awesome
-[`test-assembler`](https://github.com/luser/rust-test-assembler) crate to
-construct binary test data. It makes building complex test cases readable.
-
-[Here is an example usage in `gimli`](https://github.com/gimli-rs/gimli/blob/156451f3fe6eeb2fa62b84b362c33fcb176e1171/src/loc.rs#L263)
-
-### <a id="fuzzing"></a> Fuzzing
-
-First, install `cargo fuzz`:
-
-```
-$ cargo install cargo-fuzz
-```
-
-Optionally, [set up the corpora for our fuzz targets by following these
-instructions](https://github.com/gimli-rs/gimli-libfuzzer-corpora/blob/master/README.md#using-these-corpora).
-
-Finally, run a fuzz target! In this case, we are running the `eh_frame` fuzz
-target:
-
-```
-$ cargo fuzz run eh_frame
-```
-
-The fuzz target definitions live in `fuzz/fuzz_targets/*`. You can add new ones
-via `cargo fuzz add <my_new_target>`.
-
-## <a id="benchmarking"></a> Benchmarking
-
-The benchmarks require nightly `rustc`, so use `rustup`:
-
-```
-$ rustup run nightly cargo bench
-```
-
-We aim to be the fastest DWARF library. Period.
-
-Please provide before and after benchmark results with your pull requests. You
-may also find [`cargo benchcmp`](https://github.com/BurntSushi/cargo-benchcmp)
-handy for comparing results.
-
-Pull requests adding `#[bench]` micro-benchmarks that exercise a new edge case
-are very welcome!
-
-## <a id="style"></a> Style
-
-We use `rustfmt` to automatically format and style all of our code.
-
-To install `rustfmt`:
-
-```
-$ rustup component add rustfmt-preview
-```
-
-To run `rustfmt` on `gimli`:
-
-```
-$ cargo fmt
-```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/examples/dwarfdump.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/examples/dwarfdump.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/examples/dwarfdump.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/examples/dwarfdump.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2105 +0,0 @@
-// Allow clippy lints when building without clippy.
-#![allow(unknown_lints)]
-
-use fallible_iterator::FallibleIterator;
-use gimli::{CompilationUnitHeader, Section, UnitOffset, UnitSectionOffset, UnwindSection};
-use object::{Object, ObjectSection};
-use regex::bytes::Regex;
-use std::borrow::{Borrow, Cow};
-use std::cmp::min;
-use std::collections::HashMap;
-use std::env;
-use std::fmt::{self, Debug};
-use std::fs;
-use std::io;
-use std::io::{BufWriter, Write};
-use std::iter::Iterator;
-use std::mem;
-use std::process;
-use std::result;
-use std::sync::{Condvar, Mutex};
-use typed_arena::Arena;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Error {
-    GimliError(gimli::Error),
-    ObjectError(object::read::Error),
-    IoError,
-}
-
-impl fmt::Display for Error {
-    #[inline]
-    fn fmt(&self, f: &mut fmt::Formatter) -> ::std::result::Result<(), fmt::Error> {
-        Debug::fmt(self, f)
-    }
-}
-
-fn writeln_error<W: Write, R: Reader>(
-    w: &mut W,
-    dwarf: &gimli::Dwarf<R>,
-    err: Error,
-    msg: &str,
-) -> io::Result<()> {
-    writeln!(
-        w,
-        "{}: {}",
-        msg,
-        match err {
-            Error::GimliError(err) => dwarf.format_error(err),
-            Error::ObjectError(err) =>
-                format!("{}:{:?}", "An object error occurred while reading", err),
-            Error::IoError => "An I/O error occurred while writing.".to_string(),
-        }
-    )
-}
-
-impl From<gimli::Error> for Error {
-    fn from(err: gimli::Error) -> Self {
-        Error::GimliError(err)
-    }
-}
-
-impl From<io::Error> for Error {
-    fn from(_: io::Error) -> Self {
-        Error::IoError
-    }
-}
-
-impl From<object::read::Error> for Error {
-    fn from(err: object::read::Error) -> Self {
-        Error::ObjectError(err)
-    }
-}
-
-pub type Result<T> = result::Result<T, Error>;
-
-fn parallel_output<II, F>(max_workers: usize, iter: II, f: F) -> Result<()>
-where
-    F: Sync + Fn(II::Item, &mut Vec<u8>) -> Result<()>,
-    II: IntoIterator,
-    II::IntoIter: Send,
-{
-    struct ParallelOutputState<I: Iterator> {
-        iterator: I,
-        current_worker: usize,
-        result: Result<()>,
-    }
-
-    let state = Mutex::new(ParallelOutputState {
-        iterator: iter.into_iter().fuse(),
-        current_worker: 0,
-        result: Ok(()),
-    });
-    let workers = min(max_workers, num_cpus::get());
-    let mut condvars = Vec::new();
-    for _ in 0..workers {
-        condvars.push(Condvar::new());
-    }
-    {
-        let state_ref = &state;
-        let f_ref = &f;
-        let condvars_ref = &condvars;
-        crossbeam::scope(|scope| {
-            for i in 0..workers {
-                scope.spawn(move |_| {
-                    let mut v = Vec::new();
-                    let mut lock = state_ref.lock().unwrap();
-                    while lock.current_worker != i {
-                        lock = condvars_ref[i].wait(lock).unwrap();
-                    }
-                    loop {
-                        let item = if lock.result.is_ok() {
-                            lock.iterator.next()
-                        } else {
-                            None
-                        };
-                        lock.current_worker = (i + 1) % workers;
-                        condvars_ref[lock.current_worker].notify_one();
-                        mem::drop(lock);
-
-                        let ret = if let Some(item) = item {
-                            v.clear();
-                            f_ref(item, &mut v)
-                        } else {
-                            return;
-                        };
-
-                        lock = state_ref.lock().unwrap();
-                        while lock.current_worker != i {
-                            lock = condvars_ref[i].wait(lock).unwrap();
-                        }
-                        if lock.result.is_ok() {
-                            let out = io::stdout();
-                            let ret2 = out.lock().write_all(&v);
-                            if ret.is_err() {
-                                lock.result = ret;
-                            } else {
-                                lock.result = ret2.map_err(Error::from);
-                            }
-                        }
-                    }
-                });
-            }
-        })
-        .unwrap();
-    }
-    state.into_inner().unwrap().result
-}
-
-trait Reader: gimli::Reader<Offset = usize> + Send + Sync {}
-
-impl<'input, Endian> Reader for gimli::EndianSlice<'input, Endian> where
-    Endian: gimli::Endianity + Send + Sync
-{
-}
-
-type RelocationMap = HashMap<usize, object::Relocation>;
-
-fn add_relocations(
-    relocations: &mut RelocationMap,
-    file: &object::File,
-    section: &object::Section,
-) {
-    for (offset64, mut relocation) in section.relocations() {
-        let offset = offset64 as usize;
-        if offset as u64 != offset64 {
-            continue;
-        }
-        let offset = offset as usize;
-        match relocation.kind() {
-            object::RelocationKind::Absolute => {
-                match relocation.target() {
-                    object::RelocationTarget::Symbol(symbol_idx) => {
-                        match file.symbol_by_index(symbol_idx) {
-                            Ok(symbol) => {
-                                let addend =
-                                    symbol.address().wrapping_add(relocation.addend() as u64);
-                                relocation.set_addend(addend as i64);
-                            }
-                            Err(_) => {
-                                println!(
-                                    "Relocation with invalid symbol for section {} at offset 0x{:08x}",
-                                    section.name().unwrap(),
-                                    offset
-                                );
-                            }
-                        }
-                    }
-                    object::RelocationTarget::Section(_section_idx) => {}
-                }
-                if relocations.insert(offset, relocation).is_some() {
-                    println!(
-                        "Multiple relocations for section {} at offset 0x{:08x}",
-                        section.name().unwrap(),
-                        offset
-                    );
-                }
-            }
-            _ => {
-                println!(
-                    "Unsupported relocation for section {} at offset 0x{:08x}",
-                    section.name().unwrap(),
-                    offset
-                );
-            }
-        }
-    }
-}
-
-/// Apply relocations to addresses and offsets during parsing,
-/// instead of requiring the data to be fully relocated prior
-/// to parsing.
-///
-/// Pros
-/// - allows readonly buffers, we don't need to implement writing of values back to buffers
-/// - potentially allows us to handle addresses and offsets differently
-/// - potentially allows us to add metadata from the relocation (eg symbol names)
-/// Cons
-/// - maybe incomplete
-#[derive(Debug, Clone)]
-struct Relocate<'a, R: gimli::Reader<Offset = usize>> {
-    relocations: &'a RelocationMap,
-    section: R,
-    reader: R,
-}
-
-impl<'a, R: gimli::Reader<Offset = usize>> Relocate<'a, R> {
-    fn relocate(&self, offset: usize, value: u64) -> u64 {
-        if let Some(relocation) = self.relocations.get(&offset) {
-            match relocation.kind() {
-                object::RelocationKind::Absolute => {
-                    if relocation.has_implicit_addend() {
-                        // Use the explicit addend too, because it may have the symbol value.
-                        return value.wrapping_add(relocation.addend() as u64);
-                    } else {
-                        return relocation.addend() as u64;
-                    }
-                }
-                _ => {}
-            }
-        };
-        value
-    }
-}
-
-impl<'a, R: gimli::Reader<Offset = usize>> gimli::Reader for Relocate<'a, R> {
-    type Endian = R::Endian;
-    type Offset = R::Offset;
-
-    fn read_address(&mut self, address_size: u8) -> gimli::Result<u64> {
-        let offset = self.reader.offset_from(&self.section);
-        let value = self.reader.read_address(address_size)?;
-        Ok(self.relocate(offset, value))
-    }
-
-    fn read_length(&mut self, format: gimli::Format) -> gimli::Result<usize> {
-        let offset = self.reader.offset_from(&self.section);
-        let value = self.reader.read_length(format)?;
-        <usize as gimli::ReaderOffset>::from_u64(self.relocate(offset, value as u64))
-    }
-
-    fn read_offset(&mut self, format: gimli::Format) -> gimli::Result<usize> {
-        let offset = self.reader.offset_from(&self.section);
-        let value = self.reader.read_offset(format)?;
-        <usize as gimli::ReaderOffset>::from_u64(self.relocate(offset, value as u64))
-    }
-
-    fn read_sized_offset(&mut self, size: u8) -> gimli::Result<usize> {
-        let offset = self.reader.offset_from(&self.section);
-        let value = self.reader.read_sized_offset(size)?;
-        <usize as gimli::ReaderOffset>::from_u64(self.relocate(offset, value as u64))
-    }
-
-    #[inline]
-    fn split(&mut self, len: Self::Offset) -> gimli::Result<Self> {
-        let mut other = self.clone();
-        other.reader.truncate(len)?;
-        self.reader.skip(len)?;
-        Ok(other)
-    }
-
-    // All remaining methods simply delegate to `self.reader`.
-
-    #[inline]
-    fn endian(&self) -> Self::Endian {
-        self.reader.endian()
-    }
-
-    #[inline]
-    fn len(&self) -> Self::Offset {
-        self.reader.len()
-    }
-
-    #[inline]
-    fn empty(&mut self) {
-        self.reader.empty()
-    }
-
-    #[inline]
-    fn truncate(&mut self, len: Self::Offset) -> gimli::Result<()> {
-        self.reader.truncate(len)
-    }
-
-    #[inline]
-    fn offset_from(&self, base: &Self) -> Self::Offset {
-        self.reader.offset_from(&base.reader)
-    }
-
-    #[inline]
-    fn offset_id(&self) -> gimli::ReaderOffsetId {
-        self.reader.offset_id()
-    }
-
-    #[inline]
-    fn lookup_offset_id(&self, id: gimli::ReaderOffsetId) -> Option<Self::Offset> {
-        self.reader.lookup_offset_id(id)
-    }
-
-    #[inline]
-    fn find(&self, byte: u8) -> gimli::Result<Self::Offset> {
-        self.reader.find(byte)
-    }
-
-    #[inline]
-    fn skip(&mut self, len: Self::Offset) -> gimli::Result<()> {
-        self.reader.skip(len)
-    }
-
-    #[inline]
-    fn to_slice(&self) -> gimli::Result<Cow<[u8]>> {
-        self.reader.to_slice()
-    }
-
-    #[inline]
-    fn to_string(&self) -> gimli::Result<Cow<str>> {
-        self.reader.to_string()
-    }
-
-    #[inline]
-    fn to_string_lossy(&self) -> gimli::Result<Cow<str>> {
-        self.reader.to_string_lossy()
-    }
-
-    #[inline]
-    fn read_slice(&mut self, buf: &mut [u8]) -> gimli::Result<()> {
-        self.reader.read_slice(buf)
-    }
-}
-
-impl<'a, R: Reader> Reader for Relocate<'a, R> {}
-
-#[derive(Default)]
-struct Flags {
-    eh_frame: bool,
-    goff: bool,
-    info: bool,
-    line: bool,
-    pubnames: bool,
-    pubtypes: bool,
-    aranges: bool,
-    dwo: bool,
-    raw: bool,
-    match_units: Option<Regex>,
-}
-
-impl Flags {
-    fn section_name(&self, id: gimli::SectionId) -> Option<&'static str> {
-        if self.dwo {
-            id.dwo_name()
-        } else {
-            Some(id.name())
-        }
-    }
-}
-
-fn print_usage(opts: &getopts::Options) -> ! {
-    let brief = format!("Usage: {} <options> <file>", env::args().next().unwrap());
-    write!(&mut io::stderr(), "{}", opts.usage(&brief)).ok();
-    process::exit(1);
-}
-
-fn main() {
-    let mut opts = getopts::Options::new();
-    opts.optflag(
-        "",
-        "eh-frame",
-        "print .eh-frame exception handling frame information",
-    );
-    opts.optflag("G", "", "show global die offsets");
-    opts.optflag("i", "", "print .debug_info and .debug_types sections");
-    opts.optflag("l", "", "print .debug_line section");
-    opts.optflag("p", "", "print .debug_pubnames section");
-    opts.optflag("r", "", "print .debug_aranges section");
-    opts.optflag("y", "", "print .debug_pubtypes section");
-    opts.optflag(
-        "",
-        "dwo",
-        "print the .dwo versions of the selected sections",
-    );
-    opts.optflag("", "raw", "print raw data values");
-    opts.optopt(
-        "u",
-        "match-units",
-        "print compilation units whose output matches a regex",
-        "REGEX",
-    );
-
-    let matches = match opts.parse(env::args().skip(1)) {
-        Ok(m) => m,
-        Err(e) => {
-            writeln!(&mut io::stderr(), "{:?}\n", e).ok();
-            print_usage(&opts);
-        }
-    };
-    if matches.free.is_empty() {
-        print_usage(&opts);
-    }
-
-    let mut all = true;
-    let mut flags = Flags::default();
-    if matches.opt_present("eh-frame") {
-        flags.eh_frame = true;
-        all = false;
-    }
-    if matches.opt_present("G") {
-        flags.goff = true;
-    }
-    if matches.opt_present("i") {
-        flags.info = true;
-        all = false;
-    }
-    if matches.opt_present("l") {
-        flags.line = true;
-        all = false;
-    }
-    if matches.opt_present("p") {
-        flags.pubnames = true;
-        all = false;
-    }
-    if matches.opt_present("y") {
-        flags.pubtypes = true;
-        all = false;
-    }
-    if matches.opt_present("r") {
-        flags.aranges = true;
-        all = false;
-    }
-    if matches.opt_present("dwo") {
-        flags.dwo = true;
-    }
-    if matches.opt_present("raw") {
-        flags.raw = true;
-    }
-    if all {
-        // .eh_frame is excluded even when printing all information.
-        // cosmetic flags like -G must be set explicitly too.
-        flags.info = true;
-        flags.line = true;
-        flags.pubnames = true;
-        flags.pubtypes = true;
-        flags.aranges = true;
-    }
-    flags.match_units = if let Some(r) = matches.opt_str("u") {
-        match Regex::new(&r) {
-            Ok(r) => Some(r),
-            Err(e) => {
-                println!("Invalid regular expression {}: {}", r, e);
-                process::exit(1);
-            }
-        }
-    } else {
-        None
-    };
-
-    for file_path in &matches.free {
-        if matches.free.len() != 1 {
-            println!("{}", file_path);
-            println!();
-        }
-
-        let file = match fs::File::open(&file_path) {
-            Ok(file) => file,
-            Err(err) => {
-                println!("Failed to open file '{}': {}", file_path, err);
-                continue;
-            }
-        };
-        let file = match unsafe { memmap::Mmap::map(&file) } {
-            Ok(mmap) => mmap,
-            Err(err) => {
-                println!("Failed to map file '{}': {}", file_path, err);
-                continue;
-            }
-        };
-        let file = match object::File::parse(&*file) {
-            Ok(file) => file,
-            Err(err) => {
-                println!("Failed to parse file '{}': {}", file_path, err);
-                continue;
-            }
-        };
-
-        let endian = if file.is_little_endian() {
-            gimli::RunTimeEndian::Little
-        } else {
-            gimli::RunTimeEndian::Big
-        };
-        let ret = dump_file(&file, endian, &flags);
-        match ret {
-            Ok(_) => (),
-            Err(err) => println!("Failed to dump '{}': {}", file_path, err,),
-        }
-    }
-}
-
-fn dump_file<Endian>(file: &object::File, endian: Endian, flags: &Flags) -> Result<()>
-where
-    Endian: gimli::Endianity + Send + Sync,
-{
-    let arena = (Arena::new(), Arena::new());
-
-    let mut load_section = |id: gimli::SectionId| -> Result<_> {
-        let mut relocations = RelocationMap::default();
-        let name = flags.section_name(id);
-        let data = match name.and_then(|name| file.section_by_name(&name)) {
-            Some(ref section) => {
-                // DWO sections never have relocations, so don't bother.
-                if !flags.dwo {
-                    add_relocations(&mut relocations, file, section);
-                }
-                section.uncompressed_data()?
-            }
-            // Use a non-zero capacity so that `ReaderOffsetId`s are unique.
-            None => Cow::Owned(Vec::with_capacity(1)),
-        };
-        let data_ref = (*arena.0.alloc(data)).borrow();
-        let reader = gimli::EndianSlice::new(data_ref, endian);
-        let section = reader;
-        let relocations = (*arena.1.alloc(relocations)).borrow();
-        Ok(Relocate {
-            relocations,
-            section,
-            reader,
-        })
-    };
-
-    let no_relocations = (*arena.1.alloc(RelocationMap::default())).borrow();
-    let no_reader = Relocate {
-        relocations: no_relocations,
-        section: Default::default(),
-        reader: Default::default(),
-    };
-
-    let dwarf = gimli::Dwarf::load(&mut load_section, |_| Ok(no_reader.clone())).unwrap();
-
-    let out = io::stdout();
-    if flags.eh_frame {
-        // TODO: this might be better based on the file format.
-        let address_size = file
-            .architecture()
-            .address_size()
-            .map(|w| w.bytes())
-            .unwrap_or(mem::size_of::<usize>() as u8);
-
-        fn register_name_none(_: gimli::Register) -> Option<&'static str> {
-            None
-        }
-        let arch_register_name = match file.architecture() {
-            object::Architecture::Arm | object::Architecture::Aarch64 => gimli::Arm::register_name,
-            object::Architecture::I386 => gimli::X86::register_name,
-            object::Architecture::X86_64 => gimli::X86_64::register_name,
-            _ => register_name_none,
-        };
-        let register_name = |register| match arch_register_name(register) {
-            Some(name) => Cow::Borrowed(name),
-            None => Cow::Owned(format!("{}", register.0)),
-        };
-
-        let mut eh_frame = gimli::EhFrame::load(&mut load_section).unwrap();
-        eh_frame.set_address_size(address_size);
-        let mut bases = gimli::BaseAddresses::default();
-        if let Some(section) = file.section_by_name(".eh_frame_hdr") {
-            bases = bases.set_eh_frame_hdr(section.address());
-        }
-        if let Some(section) = file.section_by_name(".eh_frame") {
-            bases = bases.set_eh_frame(section.address());
-        }
-        if let Some(section) = file.section_by_name(".text") {
-            bases = bases.set_text(section.address());
-        }
-        if let Some(section) = file.section_by_name(".got") {
-            bases = bases.set_got(section.address());
-        }
-        dump_eh_frame(
-            &mut BufWriter::new(out.lock()),
-            &eh_frame,
-            &bases,
-            &register_name,
-        )?;
-    }
-    if flags.info {
-        dump_info(&dwarf, flags)?;
-        dump_types(&mut BufWriter::new(out.lock()), &dwarf, flags)?;
-        writeln!(&mut out.lock())?;
-    }
-    let w = &mut BufWriter::new(out.lock());
-    if flags.line {
-        dump_line(w, &dwarf)?;
-    }
-    if flags.pubnames {
-        let debug_pubnames = &gimli::Section::load(&mut load_section).unwrap();
-        dump_pubnames(w, debug_pubnames, &dwarf.debug_info)?;
-    }
-    if flags.aranges {
-        let debug_aranges = &gimli::Section::load(&mut load_section).unwrap();
-        dump_aranges(w, debug_aranges, &dwarf.debug_info)?;
-    }
-    if flags.pubtypes {
-        let debug_pubtypes = &gimli::Section::load(&mut load_section).unwrap();
-        dump_pubtypes(w, debug_pubtypes, &dwarf.debug_info)?;
-    }
-    Ok(())
-}
-
-fn dump_eh_frame<R: Reader, W: Write>(
-    w: &mut W,
-    eh_frame: &gimli::EhFrame<R>,
-    bases: &gimli::BaseAddresses,
-    register_name: &dyn Fn(gimli::Register) -> Cow<'static, str>,
-) -> Result<()> {
-    // TODO: Print "__eh_frame" here on macOS, and more generally use the
-    // section that we're actually looking at, which is what the canonical
-    // dwarfdump does.
-    writeln!(
-        w,
-        "Exception handling frame information for section .eh_frame"
-    )?;
-
-    let mut cies = HashMap::new();
-
-    let mut entries = eh_frame.entries(bases);
-    loop {
-        match entries.next()? {
-            None => return Ok(()),
-            Some(gimli::CieOrFde::Cie(cie)) => {
-                writeln!(w)?;
-                writeln!(w, "{:#010x}: CIE", cie.offset())?;
-                writeln!(w, "        length: {:#010x}", cie.entry_len())?;
-                // TODO: CIE_id
-                writeln!(w, "       version: {:#04x}", cie.version())?;
-                // TODO: augmentation
-                writeln!(w, "    code_align: {}", cie.code_alignment_factor())?;
-                writeln!(w, "    data_align: {}", cie.data_alignment_factor())?;
-                writeln!(w, "   ra_register: {:#x}", cie.return_address_register().0)?;
-                if let Some(encoding) = cie.lsda_encoding() {
-                    writeln!(w, " lsda_encoding: {:#02x}", encoding.0)?;
-                }
-                if let Some((encoding, personality)) = cie.personality_with_encoding() {
-                    write!(w, "   personality: {:#02x} ", encoding.0)?;
-                    dump_pointer(w, personality)?;
-                    writeln!(w)?;
-                }
-                if let Some(encoding) = cie.fde_address_encoding() {
-                    writeln!(w, "  fde_encoding: {:#02x}", encoding.0)?;
-                }
-                dump_cfi_instructions(w, cie.instructions(eh_frame, bases), true, register_name)?;
-                writeln!(w)?;
-            }
-            Some(gimli::CieOrFde::Fde(partial)) => {
-                let mut offset = None;
-                let fde = partial.parse(|_, bases, o| {
-                    offset = Some(o);
-                    cies.entry(o)
-                        .or_insert_with(|| eh_frame.cie_from_offset(bases, o))
-                        .clone()
-                })?;
-
-                writeln!(w)?;
-                writeln!(w, "{:#010x}: FDE", fde.offset())?;
-                writeln!(w, "        length: {:#010x}", fde.entry_len())?;
-                writeln!(w, "   CIE_pointer: {:#010x}", offset.unwrap().0)?;
-                // TODO: symbolicate the start address like the canonical dwarfdump does.
-                writeln!(w, "    start_addr: {:#018x}", fde.initial_address())?;
-                writeln!(
-                    w,
-                    "    range_size: {:#018x} (end_addr = {:#018x})",
-                    fde.len(),
-                    fde.initial_address() + fde.len()
-                )?;
-                if let Some(lsda) = fde.lsda() {
-                    write!(w, "          lsda: ")?;
-                    dump_pointer(w, lsda)?;
-                    writeln!(w)?;
-                }
-                dump_cfi_instructions(w, fde.instructions(eh_frame, bases), false, register_name)?;
-                writeln!(w)?;
-            }
-        }
-    }
-}
-
-fn dump_pointer<W: Write>(w: &mut W, p: gimli::Pointer) -> Result<()> {
-    match p {
-        gimli::Pointer::Direct(p) => {
-            write!(w, "{:#018x}", p)?;
-        }
-        gimli::Pointer::Indirect(p) => {
-            write!(w, "({:#018x})", p)?;
-        }
-    }
-    Ok(())
-}
-
-#[allow(clippy::unneeded_field_pattern)]
-fn dump_cfi_instructions<R: Reader, W: Write>(
-    w: &mut W,
-    mut insns: gimli::CallFrameInstructionIter<R>,
-    is_initial: bool,
-    register_name: &dyn Fn(gimli::Register) -> Cow<'static, str>,
-) -> Result<()> {
-    use gimli::CallFrameInstruction::*;
-
-    // TODO: we need to actually evaluate these instructions as we iterate them
-    // so we can print the initialized state for CIEs, and each unwind row's
-    // registers for FDEs.
-    //
-    // TODO: We should print DWARF expressions for the CFI instructions that
-    // embed DWARF expressions within themselves.
-
-    if !is_initial {
-        writeln!(w, "  Instructions:")?;
-    }
-
-    loop {
-        match insns.next() {
-            Err(e) => {
-                writeln!(w, "Failed to decode CFI instruction: {}", e)?;
-                return Ok(());
-            }
-            Ok(None) => {
-                if is_initial {
-                    writeln!(w, "  Instructions: Init State:")?;
-                }
-                return Ok(());
-            }
-            Ok(Some(op)) => match op {
-                SetLoc { address } => {
-                    writeln!(w, "                DW_CFA_set_loc ({:#x})", address)?;
-                }
-                AdvanceLoc { delta } => {
-                    writeln!(w, "                DW_CFA_advance_loc ({})", delta)?;
-                }
-                DefCfa { register, offset } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_def_cfa ({}, {})",
-                        register_name(register),
-                        offset
-                    )?;
-                }
-                DefCfaSf {
-                    register,
-                    factored_offset,
-                } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_def_cfa_sf ({}, {})",
-                        register_name(register),
-                        factored_offset
-                    )?;
-                }
-                DefCfaRegister { register } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_def_cfa_register ({})",
-                        register_name(register)
-                    )?;
-                }
-                DefCfaOffset { offset } => {
-                    writeln!(w, "                DW_CFA_def_cfa_offset ({})", offset)?;
-                }
-                DefCfaOffsetSf { factored_offset } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_def_cfa_offset_sf ({})",
-                        factored_offset
-                    )?;
-                }
-                DefCfaExpression { expression: _ } => {
-                    writeln!(w, "                DW_CFA_def_cfa_expression (...)")?;
-                }
-                Undefined { register } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_undefined ({})",
-                        register_name(register)
-                    )?;
-                }
-                SameValue { register } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_same_value ({})",
-                        register_name(register)
-                    )?;
-                }
-                Offset {
-                    register,
-                    factored_offset,
-                } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_offset ({}, {})",
-                        register_name(register),
-                        factored_offset
-                    )?;
-                }
-                OffsetExtendedSf {
-                    register,
-                    factored_offset,
-                } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_offset_extended_sf ({}, {})",
-                        register_name(register),
-                        factored_offset
-                    )?;
-                }
-                ValOffset {
-                    register,
-                    factored_offset,
-                } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_val_offset ({}, {})",
-                        register_name(register),
-                        factored_offset
-                    )?;
-                }
-                ValOffsetSf {
-                    register,
-                    factored_offset,
-                } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_val_offset_sf ({}, {})",
-                        register_name(register),
-                        factored_offset
-                    )?;
-                }
-                Register {
-                    dest_register,
-                    src_register,
-                } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_register ({}, {})",
-                        register_name(dest_register),
-                        register_name(src_register)
-                    )?;
-                }
-                Expression {
-                    register,
-                    expression: _,
-                } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_expression ({}, ...)",
-                        register_name(register)
-                    )?;
-                }
-                ValExpression {
-                    register,
-                    expression: _,
-                } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_val_expression ({}, ...)",
-                        register_name(register)
-                    )?;
-                }
-                Restore { register } => {
-                    writeln!(
-                        w,
-                        "                DW_CFA_restore ({})",
-                        register_name(register)
-                    )?;
-                }
-                RememberState => {
-                    writeln!(w, "                DW_CFA_remember_state")?;
-                }
-                RestoreState => {
-                    writeln!(w, "                DW_CFA_restore_state")?;
-                }
-                ArgsSize { size } => {
-                    writeln!(w, "                DW_CFA_GNU_args_size ({})", size)?;
-                }
-                Nop => {
-                    writeln!(w, "                DW_CFA_nop")?;
-                }
-            },
-        }
-    }
-}
-
-fn dump_info<R: Reader>(dwarf: &gimli::Dwarf<R>, flags: &Flags) -> Result<()>
-where
-    R::Endian: Send + Sync,
-{
-    let out = io::stdout();
-    writeln!(&mut BufWriter::new(out.lock()), "\n.debug_info")?;
-
-    let units = match dwarf.units().collect::<Vec<_>>() {
-        Ok(units) => units,
-        Err(err) => {
-            writeln_error(
-                &mut BufWriter::new(out.lock()),
-                dwarf,
-                Error::GimliError(err),
-                "Failed to read unit headers",
-            )?;
-            return Ok(());
-        }
-    };
-    let process_unit = |header: CompilationUnitHeader<R>, buf: &mut Vec<u8>| -> Result<()> {
-        writeln!(
-            buf,
-            "\nUNIT<header overall offset = 0x{:08x}>:",
-            header.offset().0,
-        )?;
-
-        let unit = match dwarf.unit(header) {
-            Ok(unit) => unit,
-            Err(err) => {
-                writeln_error(buf, dwarf, err.into(), "Failed to parse unit root entry")?;
-                return Ok(());
-            }
-        };
-
-        let entries_result = dump_entries(buf, unit, dwarf, flags);
-        if let Err(err) = entries_result {
-            writeln_error(buf, dwarf, err, "Failed to dump entries")?;
-        }
-        if !flags
-            .match_units
-            .as_ref()
-            .map(|r| r.is_match(&buf))
-            .unwrap_or(true)
-        {
-            buf.clear();
-        }
-        Ok(())
-    };
-    // Don't use more than 16 cores even if available. No point in soaking hundreds
-    // of cores if you happen to have them.
-    parallel_output(16, units, process_unit)
-}
-
-fn dump_types<R: Reader, W: Write>(
-    w: &mut W,
-    dwarf: &gimli::Dwarf<R>,
-    flags: &Flags,
-) -> Result<()> {
-    writeln!(w, "\n.debug_types")?;
-
-    let mut iter = dwarf.type_units();
-    while let Some(header) = iter.next()? {
-        writeln!(
-            w,
-            "\nUNIT<header overall offset = 0x{:08x}>:",
-            header.offset().0,
-        )?;
-        write!(w, "  signature        = ")?;
-        dump_type_signature(w, header.type_signature())?;
-        writeln!(w)?;
-        writeln!(w, "  typeoffset       = 0x{:08x}", header.type_offset().0,)?;
-
-        let unit = match dwarf.type_unit(header) {
-            Ok(unit) => unit,
-            Err(err) => {
-                writeln_error(w, dwarf, err.into(), "Failed to parse type unit root entry")?;
-                continue;
-            }
-        };
-        let entries_result = dump_entries(w, unit, dwarf, flags);
-        if let Err(err) = entries_result {
-            writeln_error(w, dwarf, err, "Failed to dump entries")?;
-        }
-    }
-    Ok(())
-}
-
-fn spaces(buf: &mut String, len: usize) -> &str {
-    while buf.len() < len {
-        buf.push(' ');
-    }
-    &buf[..len]
-}
-
-// " GOFF=0x{:08x}" adds exactly 16 spaces.
-const GOFF_SPACES: usize = 16;
-
-fn write_offset<R: Reader, W: Write>(
-    w: &mut W,
-    unit: &gimli::Unit<R>,
-    offset: gimli::UnitOffset<R::Offset>,
-    flags: &Flags,
-) -> Result<()> {
-    write!(w, "<0x{:08x}", offset.0)?;
-    if flags.goff {
-        let goff = match offset.to_unit_section_offset(unit) {
-            UnitSectionOffset::DebugInfoOffset(o) => o.0,
-            UnitSectionOffset::DebugTypesOffset(o) => o.0,
-        };
-        write!(w, " GOFF=0x{:08x}", goff)?;
-    }
-    write!(w, ">")?;
-    Ok(())
-}
-
-fn dump_entries<R: Reader, W: Write>(
-    w: &mut W,
-    unit: gimli::Unit<R>,
-    dwarf: &gimli::Dwarf<R>,
-    flags: &Flags,
-) -> Result<()> {
-    let mut spaces_buf = String::new();
-
-    let mut depth = 0;
-    let mut entries = unit.entries();
-    while let Some((delta_depth, entry)) = entries.next_dfs()? {
-        depth += delta_depth;
-        assert!(depth >= 0);
-        let mut indent = depth as usize * 2 + 2;
-        write!(w, "<{}{}>", if depth < 10 { " " } else { "" }, depth)?;
-        write_offset(w, &unit, entry.offset(), flags)?;
-        writeln!(w, "{}{}", spaces(&mut spaces_buf, indent), entry.tag())?;
-
-        indent += 18;
-        if flags.goff {
-            indent += GOFF_SPACES;
-        }
-
-        let mut attrs = entry.attrs();
-        while let Some(attr) = attrs.next()? {
-            w.write_all(spaces(&mut spaces_buf, indent).as_bytes())?;
-            if let Some(n) = attr.name().static_string() {
-                let right_padding = 27 - std::cmp::min(27, n.len());
-                write!(w, "{}{} ", n, spaces(&mut spaces_buf, right_padding))?;
-            } else {
-                write!(w, "{:27} ", attr.name())?;
-            }
-            if flags.raw {
-                writeln!(w, "{:?}", attr.raw_value())?;
-            } else {
-                match dump_attr_value(w, &attr, &unit, dwarf) {
-                    Ok(_) => (),
-                    Err(err) => writeln_error(w, dwarf, err, "Failed to dump attribute value")?,
-                };
-            }
-        }
-    }
-    Ok(())
-}
-
-fn dump_attr_value<R: Reader, W: Write>(
-    w: &mut W,
-    attr: &gimli::Attribute<R>,
-    unit: &gimli::Unit<R>,
-    dwarf: &gimli::Dwarf<R>,
-) -> Result<()> {
-    let value = attr.value();
-    match value {
-        gimli::AttributeValue::Addr(address) => {
-            writeln!(w, "0x{:08x}", address)?;
-        }
-        gimli::AttributeValue::Block(data) => {
-            for byte in data.to_slice()?.iter() {
-                write!(w, "{:02x}", byte)?;
-            }
-            writeln!(w)?;
-        }
-        gimli::AttributeValue::Data1(_)
-        | gimli::AttributeValue::Data2(_)
-        | gimli::AttributeValue::Data4(_)
-        | gimli::AttributeValue::Data8(_) => {
-            if let (Some(udata), Some(sdata)) = (attr.udata_value(), attr.sdata_value()) {
-                if sdata >= 0 {
-                    writeln!(w, "{}", udata)?;
-                } else {
-                    writeln!(w, "{} ({})", udata, sdata)?;
-                }
-            } else {
-                writeln!(w, "{:?}", value)?;
-            }
-        }
-        gimli::AttributeValue::Sdata(data) => {
-            match attr.name() {
-                gimli::DW_AT_data_member_location => {
-                    writeln!(w, "{}", data)?;
-                }
-                _ => {
-                    if data >= 0 {
-                        writeln!(w, "0x{:08x}", data)?;
-                    } else {
-                        writeln!(w, "0x{:08x} ({})", data, data)?;
-                    }
-                }
-            };
-        }
-        gimli::AttributeValue::Udata(data) => {
-            match attr.name() {
-                gimli::DW_AT_high_pc => {
-                    writeln!(w, "<offset-from-lowpc>{}", data)?;
-                }
-                gimli::DW_AT_data_member_location => {
-                    if let Some(sdata) = attr.sdata_value() {
-                        // This is a DW_FORM_data* value.
-                        // libdwarf-dwarfdump displays this as signed too.
-                        if sdata >= 0 {
-                            writeln!(w, "{}", data)?;
-                        } else {
-                            writeln!(w, "{} ({})", data, sdata)?;
-                        }
-                    } else {
-                        writeln!(w, "{}", data)?;
-                    }
-                }
-                gimli::DW_AT_lower_bound | gimli::DW_AT_upper_bound => {
-                    writeln!(w, "{}", data)?;
-                }
-                _ => {
-                    writeln!(w, "0x{:08x}", data)?;
-                }
-            };
-        }
-        gimli::AttributeValue::Exprloc(ref data) => {
-            if let gimli::AttributeValue::Exprloc(_) = attr.raw_value() {
-                write!(w, "len 0x{:04x}: ", data.0.len())?;
-                for byte in data.0.to_slice()?.iter() {
-                    write!(w, "{:02x}", byte)?;
-                }
-                write!(w, ": ")?;
-            }
-            dump_exprloc(w, unit.encoding(), data)?;
-            writeln!(w)?;
-        }
-        gimli::AttributeValue::Flag(true) => {
-            writeln!(w, "yes")?;
-        }
-        gimli::AttributeValue::Flag(false) => {
-            writeln!(w, "no")?;
-        }
-        gimli::AttributeValue::SecOffset(offset) => {
-            writeln!(w, "0x{:08x}", offset)?;
-        }
-        gimli::AttributeValue::DebugAddrBase(base) => {
-            writeln!(w, "<.debug_addr+0x{:08x}>", base.0)?;
-        }
-        gimli::AttributeValue::DebugAddrIndex(index) => {
-            let address = dwarf.address(unit, index)?;
-            writeln!(w, "0x{:08x}", address)?;
-        }
-        gimli::AttributeValue::UnitRef(offset) => {
-            write!(w, "0x{:08x}", offset.0)?;
-            match offset.to_unit_section_offset(unit) {
-                UnitSectionOffset::DebugInfoOffset(goff) => {
-                    write!(w, "<.debug_info+0x{:08x}>", goff.0)?;
-                }
-                UnitSectionOffset::DebugTypesOffset(goff) => {
-                    write!(w, "<.debug_types+0x{:08x}>", goff.0)?;
-                }
-            }
-            writeln!(w)?;
-        }
-        gimli::AttributeValue::DebugInfoRef(offset) => {
-            writeln!(w, "<.debug_info+0x{:08x}>", offset.0)?;
-        }
-        gimli::AttributeValue::DebugInfoRefSup(offset) => {
-            writeln!(w, "<.debug_info(sup)+0x{:08x}>", offset.0)?;
-        }
-        gimli::AttributeValue::DebugLineRef(offset) => {
-            writeln!(w, "<.debug_line+0x{:08x}>", offset.0)?;
-        }
-        gimli::AttributeValue::LocationListsRef(offset) => {
-            dump_loc_list(w, offset, unit, dwarf)?;
-        }
-        gimli::AttributeValue::DebugLocListsBase(base) => {
-            writeln!(w, "<.debug_loclists+0x{:08x}>", base.0)?;
-        }
-        gimli::AttributeValue::DebugLocListsIndex(index) => {
-            let offset = dwarf.locations_offset(unit, index)?;
-            dump_loc_list(w, offset, unit, dwarf)?;
-        }
-        gimli::AttributeValue::DebugMacinfoRef(offset) => {
-            writeln!(w, "<.debug_macinfo+0x{:08x}>", offset.0)?;
-        }
-        gimli::AttributeValue::DebugMacroRef(offset) => {
-            writeln!(w, "<.debug_macro+0x{:08x}>", offset.0)?;
-        }
-        gimli::AttributeValue::RangeListsRef(offset) => {
-            dump_range_list(w, offset, unit, dwarf)?;
-        }
-        gimli::AttributeValue::DebugRngListsBase(base) => {
-            writeln!(w, "<.debug_rnglists+0x{:08x}>", base.0)?;
-        }
-        gimli::AttributeValue::DebugRngListsIndex(index) => {
-            let offset = dwarf.ranges_offset(unit, index)?;
-            dump_range_list(w, offset, unit, dwarf)?;
-        }
-        gimli::AttributeValue::DebugTypesRef(signature) => {
-            dump_type_signature(w, signature)?;
-            writeln!(w, " <type signature>")?;
-        }
-        gimli::AttributeValue::DebugStrRef(offset) => {
-            if let Ok(s) = dwarf.debug_str.get_str(offset) {
-                writeln!(w, "{}", s.to_string_lossy()?)?;
-            } else {
-                writeln!(w, "<.debug_str+0x{:08x}>", offset.0)?;
-            }
-        }
-        gimli::AttributeValue::DebugStrRefSup(offset) => {
-            writeln!(w, "<.debug_str(sup)+0x{:08x}>", offset.0)?;
-        }
-        gimli::AttributeValue::DebugStrOffsetsBase(base) => {
-            writeln!(w, "<.debug_str_offsets+0x{:08x}>", base.0)?;
-        }
-        gimli::AttributeValue::DebugStrOffsetsIndex(index) => {
-            let offset = dwarf.debug_str_offsets.get_str_offset(
-                unit.encoding().format,
-                unit.str_offsets_base,
-                index,
-            )?;
-            if let Ok(s) = dwarf.debug_str.get_str(offset) {
-                writeln!(w, "{}", s.to_string_lossy()?)?;
-            } else {
-                writeln!(w, "<.debug_str+0x{:08x}>", offset.0)?;
-            }
-        }
-        gimli::AttributeValue::DebugLineStrRef(offset) => {
-            if let Ok(s) = dwarf.debug_line_str.get_str(offset) {
-                writeln!(w, "{}", s.to_string_lossy()?)?;
-            } else {
-                writeln!(w, "<.debug_line_str=0x{:08x}>", offset.0)?;
-            }
-        }
-        gimli::AttributeValue::String(s) => {
-            writeln!(w, "{}", s.to_string_lossy()?)?;
-        }
-        gimli::AttributeValue::Encoding(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::DecimalSign(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::Endianity(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::Accessibility(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::Visibility(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::Virtuality(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::Language(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::AddressClass(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::IdentifierCase(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::CallingConvention(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::Inline(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::Ordering(value) => {
-            writeln!(w, "{}", value)?;
-        }
-        gimli::AttributeValue::FileIndex(value) => {
-            write!(w, "0x{:08x}", value)?;
-            dump_file_index(w, value, unit, dwarf)?;
-            writeln!(w)?;
-        }
-    }
-
-    Ok(())
-}
-
-fn dump_type_signature<W: Write>(w: &mut W, signature: gimli::DebugTypeSignature) -> Result<()> {
-    write!(w, "0x{:016x}", signature.0)?;
-    Ok(())
-}
-
-fn dump_file_index<R: Reader, W: Write>(
-    w: &mut W,
-    file: u64,
-    unit: &gimli::Unit<R>,
-    dwarf: &gimli::Dwarf<R>,
-) -> Result<()> {
-    if file == 0 {
-        return Ok(());
-    }
-    let header = match unit.line_program {
-        Some(ref program) => program.header(),
-        None => return Ok(()),
-    };
-    let file = match header.file(file) {
-        Some(header) => header,
-        None => {
-            writeln!(w, "Unable to get header for file {}", file)?;
-            return Ok(());
-        }
-    };
-    write!(w, " ")?;
-    if let Some(directory) = file.directory(header) {
-        let directory = dwarf.attr_string(unit, directory)?;
-        let directory = directory.to_string_lossy()?;
-        if !directory.starts_with('/') {
-            if let Some(ref comp_dir) = unit.comp_dir {
-                write!(w, "{}/", comp_dir.to_string_lossy()?,)?;
-            }
-        }
-        write!(w, "{}/", directory)?;
-    }
-    write!(
-        w,
-        "{}",
-        dwarf
-            .attr_string(unit, file.path_name())?
-            .to_string_lossy()?
-    )?;
-    Ok(())
-}
-
-fn dump_exprloc<R: Reader, W: Write>(
-    w: &mut W,
-    encoding: gimli::Encoding,
-    data: &gimli::Expression<R>,
-) -> Result<()> {
-    let mut pc = data.0.clone();
-    let mut space = false;
-    while pc.len() != 0 {
-        let mut op_pc = pc.clone();
-        let dwop = gimli::DwOp(op_pc.read_u8()?);
-        match gimli::Operation::parse(&mut pc, encoding) {
-            Ok(op) => {
-                if space {
-                    write!(w, " ")?;
-                } else {
-                    space = true;
-                }
-                dump_op(w, encoding, dwop, op)?;
-            }
-            Err(gimli::Error::InvalidExpression(op)) => {
-                writeln!(w, "WARNING: unsupported operation 0x{:02x}", op.0)?;
-                return Ok(());
-            }
-            Err(gimli::Error::UnsupportedRegister(register)) => {
-                writeln!(w, "WARNING: unsupported register {}", register)?;
-                return Ok(());
-            }
-            Err(gimli::Error::UnexpectedEof(_)) => {
-                writeln!(w, "WARNING: truncated or malformed expression")?;
-                return Ok(());
-            }
-            Err(e) => {
-                writeln!(w, "WARNING: unexpected operation parse error: {}", e)?;
-                return Ok(());
-            }
-        }
-    }
-    Ok(())
-}
-
-fn dump_op<R: Reader, W: Write>(
-    w: &mut W,
-    encoding: gimli::Encoding,
-    dwop: gimli::DwOp,
-    op: gimli::Operation<R>,
-) -> Result<()> {
-    write!(w, "{}", dwop)?;
-    match op {
-        gimli::Operation::Deref {
-            base_type, size, ..
-        } => {
-            if dwop == gimli::DW_OP_deref_size || dwop == gimli::DW_OP_xderef_size {
-                write!(w, " {}", size)?;
-            }
-            if base_type != UnitOffset(0) {
-                write!(w, " type 0x{:08x}", base_type.0)?;
-            }
-        }
-        gimli::Operation::Pick { index } => {
-            if dwop == gimli::DW_OP_pick {
-                write!(w, " {}", index)?;
-            }
-        }
-        gimli::Operation::PlusConstant { value } => {
-            write!(w, " {}", value as i64)?;
-        }
-        gimli::Operation::Bra { target } => {
-            write!(w, " {}", target)?;
-        }
-        gimli::Operation::Skip { target } => {
-            write!(w, " {}", target)?;
-        }
-        gimli::Operation::SignedConstant { value } => match dwop {
-            gimli::DW_OP_const1s
-            | gimli::DW_OP_const2s
-            | gimli::DW_OP_const4s
-            | gimli::DW_OP_const8s
-            | gimli::DW_OP_consts => {
-                write!(w, " {}", value)?;
-            }
-            _ => {}
-        },
-        gimli::Operation::UnsignedConstant { value } => match dwop {
-            gimli::DW_OP_const1u
-            | gimli::DW_OP_const2u
-            | gimli::DW_OP_const4u
-            | gimli::DW_OP_const8u
-            | gimli::DW_OP_constu => {
-                write!(w, " {}", value)?;
-            }
-            _ => {
-                // These have the value encoded in the operation, eg DW_OP_lit0.
-            }
-        },
-        gimli::Operation::Register { register } => {
-            if dwop == gimli::DW_OP_regx {
-                write!(w, " {}", register.0)?;
-            }
-        }
-        gimli::Operation::RegisterOffset {
-            register,
-            offset,
-            base_type,
-        } => {
-            if dwop >= gimli::DW_OP_breg0 && dwop <= gimli::DW_OP_breg31 {
-                write!(w, "{:+}", offset)?;
-            } else {
-                write!(w, " {}", register.0)?;
-                if offset != 0 {
-                    write!(w, "{:+}", offset)?;
-                }
-                if base_type != UnitOffset(0) {
-                    write!(w, " type 0x{:08x}", base_type.0)?;
-                }
-            }
-        }
-        gimli::Operation::FrameOffset { offset } => {
-            write!(w, " {}", offset)?;
-        }
-        gimli::Operation::Call { offset } => match offset {
-            gimli::DieReference::UnitRef(gimli::UnitOffset(offset)) => {
-                write!(w, " 0x{:08x}", offset)?;
-            }
-            gimli::DieReference::DebugInfoRef(gimli::DebugInfoOffset(offset)) => {
-                write!(w, " 0x{:08x}", offset)?;
-            }
-        },
-        gimli::Operation::Piece {
-            size_in_bits,
-            bit_offset: None,
-        } => {
-            write!(w, " {}", size_in_bits / 8)?;
-        }
-        gimli::Operation::Piece {
-            size_in_bits,
-            bit_offset: Some(bit_offset),
-        } => {
-            write!(w, " 0x{:08x} offset 0x{:08x}", size_in_bits, bit_offset)?;
-        }
-        gimli::Operation::ImplicitValue { data } => {
-            let data = data.to_slice()?;
-            write!(w, " 0x{:08x} contents 0x", data.len())?;
-            for byte in data.iter() {
-                write!(w, "{:02x}", byte)?;
-            }
-        }
-        gimli::Operation::ImplicitPointer { value, byte_offset } => {
-            write!(w, " 0x{:08x} {}", value.0, byte_offset)?;
-        }
-        gimli::Operation::EntryValue { expression } => {
-            write!(w, "(")?;
-            dump_exprloc(w, encoding, &gimli::Expression(expression))?;
-            write!(w, ")")?;
-        }
-        gimli::Operation::ParameterRef { offset } => {
-            write!(w, " 0x{:08x}", offset.0)?;
-        }
-        gimli::Operation::Address { address } => {
-            write!(w, " 0x{:08x}", address)?;
-        }
-        gimli::Operation::AddressIndex { index } => {
-            write!(w, " 0x{:08x}", index.0)?;
-        }
-        gimli::Operation::ConstantIndex { index } => {
-            write!(w, " 0x{:08x}", index.0)?;
-        }
-        gimli::Operation::TypedLiteral { base_type, value } => {
-            write!(w, " type 0x{:08x} contents 0x", base_type.0)?;
-            for byte in value.to_slice()?.iter() {
-                write!(w, "{:02x}", byte)?;
-            }
-        }
-        gimli::Operation::Convert { base_type } => {
-            write!(w, " type 0x{:08x}", base_type.0)?;
-        }
-        gimli::Operation::Reinterpret { base_type } => {
-            write!(w, " type 0x{:08x}", base_type.0)?;
-        }
-        gimli::Operation::Drop
-        | gimli::Operation::Swap
-        | gimli::Operation::Rot
-        | gimli::Operation::Abs
-        | gimli::Operation::And
-        | gimli::Operation::Div
-        | gimli::Operation::Minus
-        | gimli::Operation::Mod
-        | gimli::Operation::Mul
-        | gimli::Operation::Neg
-        | gimli::Operation::Not
-        | gimli::Operation::Or
-        | gimli::Operation::Plus
-        | gimli::Operation::Shl
-        | gimli::Operation::Shr
-        | gimli::Operation::Shra
-        | gimli::Operation::Xor
-        | gimli::Operation::Eq
-        | gimli::Operation::Ge
-        | gimli::Operation::Gt
-        | gimli::Operation::Le
-        | gimli::Operation::Lt
-        | gimli::Operation::Ne
-        | gimli::Operation::Nop
-        | gimli::Operation::PushObjectAddress
-        | gimli::Operation::TLS
-        | gimli::Operation::CallFrameCFA
-        | gimli::Operation::StackValue => {}
-    };
-    Ok(())
-}
-
-fn dump_loc_list<R: Reader, W: Write>(
-    w: &mut W,
-    offset: gimli::LocationListsOffset<R::Offset>,
-    unit: &gimli::Unit<R>,
-    dwarf: &gimli::Dwarf<R>,
-) -> Result<()> {
-    let raw_locations = dwarf.locations.raw_locations(offset, unit.encoding())?;
-    let raw_locations: Vec<_> = raw_locations.collect()?;
-    let mut locations = dwarf.locations(unit, offset)?;
-    writeln!(
-        w,
-        "<loclist at {}+0x{:08x} with {} entries>",
-        if unit.encoding().version < 5 {
-            ".debug_loc"
-        } else {
-            ".debug_loclists"
-        },
-        offset.0,
-        raw_locations.len()
-    )?;
-    for (i, raw) in raw_locations.iter().enumerate() {
-        write!(w, "\t\t\t[{:2}]", i)?;
-        match *raw {
-            gimli::RawLocListEntry::BaseAddress { addr } => {
-                writeln!(w, "<new base address 0x{:08x}>", addr)?;
-            }
-            gimli::RawLocListEntry::BaseAddressx { addr } => {
-                let addr_val = dwarf.address(unit, addr)?;
-                writeln!(w, "<new base addressx [{}]0x{:08x}>", addr.0, addr_val)?;
-            }
-            gimli::RawLocListEntry::StartxEndx {
-                begin,
-                end,
-                ref data,
-            } => {
-                let begin_val = dwarf.address(unit, begin)?;
-                let end_val = dwarf.address(unit, end)?;
-                let location = locations.next()?.unwrap();
-                write!(
-                    w,
-                    "<startx-endx \
-                     low-off: [{}]0x{:08x} addr 0x{:08x} \
-                     high-off: [{}]0x{:08x} addr 0x{:08x}>",
-                    begin.0, begin_val, location.range.begin, end.0, end_val, location.range.end
-                )?;
-                dump_exprloc(w, unit.encoding(), data)?;
-                writeln!(w)?;
-            }
-            gimli::RawLocListEntry::StartxLength {
-                begin,
-                length,
-                ref data,
-            } => {
-                let begin_val = dwarf.address(unit, begin)?;
-                let location = locations.next()?.unwrap();
-                write!(
-                    w,
-                    "<start-length \
-                     low-off: [{}]0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin.0, begin_val, location.range.begin, length, location.range.end
-                )?;
-                dump_exprloc(w, unit.encoding(), data)?;
-                writeln!(w)?;
-            }
-            gimli::RawLocListEntry::AddressOrOffsetPair {
-                begin,
-                end,
-                ref data,
-            }
-            | gimli::RawLocListEntry::OffsetPair {
-                begin,
-                end,
-                ref data,
-            } => {
-                let location = locations.next()?.unwrap();
-                write!(
-                    w,
-                    "<offset pair \
-                     low-off: 0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin, location.range.begin, end, location.range.end
-                )?;
-                dump_exprloc(w, unit.encoding(), data)?;
-                writeln!(w)?;
-            }
-            gimli::RawLocListEntry::DefaultLocation { ref data } => {
-                write!(w, "<default location>")?;
-                dump_exprloc(w, unit.encoding(), data)?;
-                writeln!(w)?;
-            }
-            gimli::RawLocListEntry::StartEnd {
-                begin,
-                end,
-                ref data,
-            } => {
-                let location = locations.next()?.unwrap();
-                write!(
-                    w,
-                    "<start-end \
-                     low-off: 0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin, location.range.begin, end, location.range.end
-                )?;
-                dump_exprloc(w, unit.encoding(), data)?;
-                writeln!(w)?;
-            }
-            gimli::RawLocListEntry::StartLength {
-                begin,
-                length,
-                ref data,
-            } => {
-                let location = locations.next()?.unwrap();
-                write!(
-                    w,
-                    "<start-length \
-                     low-off: 0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin, location.range.begin, length, location.range.end
-                )?;
-                dump_exprloc(w, unit.encoding(), data)?;
-                writeln!(w)?;
-            }
-        };
-    }
-    Ok(())
-}
-
-fn dump_range_list<R: Reader, W: Write>(
-    w: &mut W,
-    offset: gimli::RangeListsOffset<R::Offset>,
-    unit: &gimli::Unit<R>,
-    dwarf: &gimli::Dwarf<R>,
-) -> Result<()> {
-    let raw_ranges = dwarf.ranges.raw_ranges(offset, unit.encoding())?;
-    let raw_ranges: Vec<_> = raw_ranges.collect()?;
-    let mut ranges = dwarf.ranges(unit, offset)?;
-    writeln!(
-        w,
-        "<rnglist at {}+0x{:08x} with {} entries>",
-        if unit.encoding().version < 5 {
-            ".debug_ranges"
-        } else {
-            ".debug_rnglists"
-        },
-        offset.0,
-        raw_ranges.len()
-    )?;
-    for (i, raw) in raw_ranges.iter().enumerate() {
-        write!(w, "\t\t\t[{:2}] ", i)?;
-        match *raw {
-            gimli::RawRngListEntry::AddressOrOffsetPair { begin, end } => {
-                let range = ranges.next()?.unwrap();
-                writeln!(
-                    w,
-                    "<address pair \
-                     low-off: 0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin, range.begin, end, range.end
-                )?;
-            }
-            gimli::RawRngListEntry::BaseAddress { addr } => {
-                writeln!(w, "<new base address 0x{:08x}>", addr)?;
-            }
-            gimli::RawRngListEntry::BaseAddressx { addr } => {
-                let addr_val = dwarf.address(unit, addr)?;
-                writeln!(w, "<new base addressx [{}]0x{:08x}>", addr.0, addr_val)?;
-            }
-            gimli::RawRngListEntry::StartxEndx { begin, end } => {
-                let begin_val = dwarf.address(unit, begin)?;
-                let end_val = dwarf.address(unit, end)?;
-                let range = if begin_val == end_val {
-                    gimli::Range {
-                        begin: begin_val,
-                        end: end_val,
-                    }
-                } else {
-                    ranges.next()?.unwrap()
-                };
-                writeln!(
-                    w,
-                    "<startx-endx \
-                     low-off: [{}]0x{:08x} addr 0x{:08x} \
-                     high-off: [{}]0x{:08x} addr 0x{:08x}>",
-                    begin.0, begin_val, range.begin, end.0, end_val, range.end
-                )?;
-            }
-            gimli::RawRngListEntry::StartxLength { begin, length } => {
-                let begin_val = dwarf.address(unit, begin)?;
-                let range = ranges.next()?.unwrap();
-                writeln!(
-                    w,
-                    "<startx-length \
-                     low-off: [{}]0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin.0, begin_val, range.begin, length, range.end
-                )?;
-            }
-            gimli::RawRngListEntry::OffsetPair { begin, end } => {
-                let range = ranges.next()?.unwrap();
-                writeln!(
-                    w,
-                    "<offset pair \
-                     low-off: 0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin, range.begin, end, range.end
-                )?;
-            }
-            gimli::RawRngListEntry::StartEnd { begin, end } => {
-                let range = if begin == end {
-                    gimli::Range { begin, end }
-                } else {
-                    ranges.next()?.unwrap()
-                };
-                writeln!(
-                    w,
-                    "<start-end \
-                     low-off: 0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin, range.begin, end, range.end
-                )?;
-            }
-            gimli::RawRngListEntry::StartLength { begin, length } => {
-                let range = ranges.next()?.unwrap();
-                writeln!(
-                    w,
-                    "<start-length \
-                     low-off: 0x{:08x} addr 0x{:08x} \
-                     high-off: 0x{:08x} addr 0x{:08x}>",
-                    begin, range.begin, length, range.end
-                )?;
-            }
-        };
-    }
-    Ok(())
-}
-
-fn dump_line<R: Reader, W: Write>(w: &mut W, dwarf: &gimli::Dwarf<R>) -> Result<()> {
-    let mut iter = dwarf.units();
-    while let Some(header) = iter.next()? {
-        writeln!(
-            w,
-            "\n.debug_line: line number info for unit at .debug_info offset 0x{:08x}",
-            header.offset().0
-        )?;
-        let unit = match dwarf.unit(header) {
-            Ok(unit) => unit,
-            Err(err) => {
-                writeln_error(
-                    w,
-                    dwarf,
-                    err.into(),
-                    "Failed to parse unit root entry for dump_line",
-                )?;
-                continue;
-            }
-        };
-        match dump_line_program(w, &unit, dwarf) {
-            Ok(_) => (),
-            Err(Error::IoError) => return Err(Error::IoError),
-            Err(err) => writeln_error(w, dwarf, err, "Failed to dump line program")?,
-        }
-    }
-    Ok(())
-}
-
-fn dump_line_program<R: Reader, W: Write>(
-    w: &mut W,
-    unit: &gimli::Unit<R>,
-    dwarf: &gimli::Dwarf<R>,
-) -> Result<()> {
-    if let Some(program) = unit.line_program.clone() {
-        {
-            let header = program.header();
-            writeln!(w)?;
-            writeln!(
-                w,
-                "Offset:                             0x{:x}",
-                header.offset().0
-            )?;
-            writeln!(
-                w,
-                "Length:                             {}",
-                header.unit_length()
-            )?;
-            writeln!(
-                w,
-                "DWARF version:                      {}",
-                header.version()
-            )?;
-            writeln!(
-                w,
-                "Address size:                       {}",
-                header.address_size()
-            )?;
-            writeln!(
-                w,
-                "Prologue length:                    {}",
-                header.header_length()
-            )?;
-            writeln!(
-                w,
-                "Minimum instruction length:         {}",
-                header.minimum_instruction_length()
-            )?;
-            writeln!(
-                w,
-                "Maximum operations per instruction: {}",
-                header.maximum_operations_per_instruction()
-            )?;
-            writeln!(
-                w,
-                "Default is_stmt:                    {}",
-                header.default_is_stmt()
-            )?;
-            writeln!(
-                w,
-                "Line base:                          {}",
-                header.line_base()
-            )?;
-            writeln!(
-                w,
-                "Line range:                         {}",
-                header.line_range()
-            )?;
-            writeln!(
-                w,
-                "Opcode base:                        {}",
-                header.opcode_base()
-            )?;
-
-            writeln!(w)?;
-            writeln!(w, "Opcodes:")?;
-            for (i, length) in header
-                .standard_opcode_lengths()
-                .to_slice()?
-                .iter()
-                .enumerate()
-            {
-                writeln!(w, "  Opcode {} has {} args", i + 1, length)?;
-            }
-
-            let base = if header.version() >= 5 { 0 } else { 1 };
-            writeln!(w)?;
-            writeln!(w, "The Directory Table:")?;
-            for (i, dir) in header.include_directories().iter().enumerate() {
-                writeln!(
-                    w,
-                    "  {} {}",
-                    base + i,
-                    dwarf.attr_string(unit, dir.clone())?.to_string_lossy()?
-                )?;
-            }
-
-            writeln!(w)?;
-            writeln!(w, "The File Name Table")?;
-            write!(w, "  Entry\tDir\tTime\tSize")?;
-            if header.file_has_md5() {
-                write!(w, "\tMD5\t\t\t\t")?;
-            }
-            writeln!(w, "\tName")?;
-            for (i, file) in header.file_names().iter().enumerate() {
-                write!(
-                    w,
-                    "  {}\t{}\t{}\t{}",
-                    base + i,
-                    file.directory_index(),
-                    file.timestamp(),
-                    file.size(),
-                )?;
-                if header.file_has_md5() {
-                    let md5 = file.md5();
-                    write!(w, "\t")?;
-                    for i in 0..16 {
-                        write!(w, "{:02X}", md5[i])?;
-                    }
-                }
-                writeln!(
-                    w,
-                    "\t{}",
-                    dwarf
-                        .attr_string(unit, file.path_name())?
-                        .to_string_lossy()?
-                )?;
-            }
-
-            writeln!(w)?;
-            writeln!(w, "Line Number Instructions:")?;
-            let mut instructions = header.instructions();
-            while let Some(instruction) = instructions.next_instruction(header)? {
-                writeln!(w, "  {}", instruction)?;
-            }
-
-            writeln!(w)?;
-            writeln!(w, "Line Number Rows:")?;
-            writeln!(w, "<pc>        [lno,col]")?;
-        }
-        let mut rows = program.rows();
-        let mut file_index = 0;
-        while let Some((header, row)) = rows.next_row()? {
-            let line = row.line().unwrap_or(0);
-            let column = match row.column() {
-                gimli::ColumnType::Column(column) => column,
-                gimli::ColumnType::LeftEdge => 0,
-            };
-            write!(w, "0x{:08x}  [{:4},{:2}]", row.address(), line, column)?;
-            if row.is_stmt() {
-                write!(w, " NS")?;
-            }
-            if row.basic_block() {
-                write!(w, " BB")?;
-            }
-            if row.end_sequence() {
-                write!(w, " ET")?;
-            }
-            if row.prologue_end() {
-                write!(w, " PE")?;
-            }
-            if row.epilogue_begin() {
-                write!(w, " EB")?;
-            }
-            if row.isa() != 0 {
-                write!(w, " IS={}", row.isa())?;
-            }
-            if row.discriminator() != 0 {
-                write!(w, " DI={}", row.discriminator())?;
-            }
-            if file_index != row.file_index() {
-                file_index = row.file_index();
-                if let Some(file) = row.file(header) {
-                    if let Some(directory) = file.directory(header) {
-                        write!(
-                            w,
-                            " uri: \"{}/{}\"",
-                            dwarf.attr_string(unit, directory)?.to_string_lossy()?,
-                            dwarf
-                                .attr_string(unit, file.path_name())?
-                                .to_string_lossy()?
-                        )?;
-                    } else {
-                        write!(
-                            w,
-                            " uri: \"{}\"",
-                            dwarf
-                                .attr_string(unit, file.path_name())?
-                                .to_string_lossy()?
-                        )?;
-                    }
-                }
-            }
-            writeln!(w)?;
-        }
-    }
-    Ok(())
-}
-
-fn dump_pubnames<R: Reader, W: Write>(
-    w: &mut W,
-    debug_pubnames: &gimli::DebugPubNames<R>,
-    debug_info: &gimli::DebugInfo<R>,
-) -> Result<()> {
-    writeln!(w, "\n.debug_pubnames")?;
-
-    let mut cu_offset;
-    let mut cu_die_offset = gimli::DebugInfoOffset(0);
-    let mut prev_cu_offset = None;
-    let mut pubnames = debug_pubnames.items();
-    while let Some(pubname) = pubnames.next()? {
-        cu_offset = pubname.unit_header_offset();
-        if Some(cu_offset) != prev_cu_offset {
-            let cu = debug_info.header_from_offset(cu_offset)?;
-            cu_die_offset = gimli::DebugInfoOffset(cu_offset.0 + cu.header_size());
-            prev_cu_offset = Some(cu_offset);
-        }
-        let die_in_cu = pubname.die_offset();
-        let die_in_sect = cu_offset.0 + die_in_cu.0;
-        writeln!(w,
-            "global die-in-sect 0x{:08x}, cu-in-sect 0x{:08x}, die-in-cu 0x{:08x}, cu-header-in-sect 0x{:08x} '{}'",
-            die_in_sect,
-            cu_die_offset.0,
-            die_in_cu.0,
-            cu_offset.0,
-            pubname.name().to_string_lossy()?
-        )?;
-    }
-    Ok(())
-}
-
-fn dump_pubtypes<R: Reader, W: Write>(
-    w: &mut W,
-    debug_pubtypes: &gimli::DebugPubTypes<R>,
-    debug_info: &gimli::DebugInfo<R>,
-) -> Result<()> {
-    writeln!(w, "\n.debug_pubtypes")?;
-
-    let mut cu_offset;
-    let mut cu_die_offset = gimli::DebugInfoOffset(0);
-    let mut prev_cu_offset = None;
-    let mut pubtypes = debug_pubtypes.items();
-    while let Some(pubtype) = pubtypes.next()? {
-        cu_offset = pubtype.unit_header_offset();
-        if Some(cu_offset) != prev_cu_offset {
-            let cu = debug_info.header_from_offset(cu_offset)?;
-            cu_die_offset = gimli::DebugInfoOffset(cu_offset.0 + cu.header_size());
-            prev_cu_offset = Some(cu_offset);
-        }
-        let die_in_cu = pubtype.die_offset();
-        let die_in_sect = cu_offset.0 + die_in_cu.0;
-        writeln!(w,
-            "pubtype die-in-sect 0x{:08x}, cu-in-sect 0x{:08x}, die-in-cu 0x{:08x}, cu-header-in-sect 0x{:08x} '{}'",
-            die_in_sect,
-            cu_die_offset.0,
-            die_in_cu.0,
-            cu_offset.0,
-            pubtype.name().to_string_lossy()?
-        )?;
-    }
-    Ok(())
-}
-
-fn dump_aranges<R: Reader, W: Write>(
-    w: &mut W,
-    debug_aranges: &gimli::DebugAranges<R>,
-    debug_info: &gimli::DebugInfo<R>,
-) -> Result<()> {
-    writeln!(w, "\n.debug_aranges")?;
-
-    let mut cu_die_offset = gimli::DebugInfoOffset(0);
-    let mut prev_cu_offset = None;
-    let mut aranges = debug_aranges.items();
-    while let Some(arange) = aranges.next()? {
-        let cu_offset = arange.debug_info_offset();
-        if Some(cu_offset) != prev_cu_offset {
-            let cu = debug_info.header_from_offset(cu_offset)?;
-            cu_die_offset = gimli::DebugInfoOffset(cu_offset.0 + cu.header_size());
-            prev_cu_offset = Some(cu_offset);
-        }
-        if let Some(segment) = arange.segment() {
-            write!(
-                w,
-                "arange starts at seg,off 0x{:08x},0x{:08x}, ",
-                segment,
-                arange.address()
-            )?;
-        } else {
-            write!(w, "arange starts at 0x{:08x}, ", arange.address())?;
-        }
-        writeln!(
-            w,
-            "length of 0x{:08x}, cu_die_offset = 0x{:08x}",
-            arange.length(),
-            cu_die_offset.0
-        )?;
-    }
-    Ok(())
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/examples/dwarf-validate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/examples/dwarf-validate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/examples/dwarf-validate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/examples/dwarf-validate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-// Allow clippy lints when building without clippy.
-#![allow(unknown_lints)]
-
-use gimli::{AttributeValue, CompilationUnitHeader};
-use object::{Object, ObjectSection};
-use rayon::prelude::*;
-use std::borrow::{Borrow, Cow};
-use std::env;
-use std::fs;
-use std::io::{self, BufWriter, Write};
-use std::iter::Iterator;
-use std::path::{Path, PathBuf};
-use std::process;
-use std::sync::Mutex;
-use typed_arena::Arena;
-
-trait Reader: gimli::Reader<Offset = usize> + Send + Sync {
-    type SyncSendEndian: gimli::Endianity + Send + Sync;
-}
-
-impl<'input, Endian> Reader for gimli::EndianSlice<'input, Endian>
-where
-    Endian: gimli::Endianity + Send + Sync,
-{
-    type SyncSendEndian = Endian;
-}
-
-struct ErrorWriter<W: Write + Send> {
-    inner: Mutex<(W, usize)>,
-    path: PathBuf,
-}
-
-impl<W: Write + Send> ErrorWriter<W> {
-    #[allow(clippy::needless_pass_by_value)]
-    fn error(&self, s: String) {
-        let mut lock = self.inner.lock().unwrap();
-        writeln!(&mut lock.0, "DWARF error in {}: {}", self.path.display(), s).unwrap();
-        lock.1 += 1;
-    }
-}
-
-fn main() {
-    let mut w = BufWriter::new(io::stdout());
-    let mut errors = 0;
-    for arg in env::args_os().skip(1) {
-        let path = Path::new(&arg);
-        let file = match fs::File::open(&path) {
-            Ok(file) => file,
-            Err(err) => {
-                eprintln!("Failed to open file '{}': {}", path.display(), err);
-                errors += 1;
-                continue;
-            }
-        };
-        let file = match unsafe { memmap::Mmap::map(&file) } {
-            Ok(mmap) => mmap,
-            Err(err) => {
-                eprintln!("Failed to map file '{}': {}", path.display(), &err);
-                errors += 1;
-                continue;
-            }
-        };
-        let file = match object::File::parse(&*file) {
-            Ok(file) => file,
-            Err(err) => {
-                eprintln!("Failed to parse file '{}': {}", path.display(), err);
-                errors += 1;
-                continue;
-            }
-        };
-
-        let endian = if file.is_little_endian() {
-            gimli::RunTimeEndian::Little
-        } else {
-            gimli::RunTimeEndian::Big
-        };
-        let mut error_writer = ErrorWriter {
-            inner: Mutex::new((&mut w, 0)),
-            path: path.to_owned(),
-        };
-        validate_file(&mut error_writer, &file, endian);
-        errors += error_writer.inner.into_inner().unwrap().1;
-    }
-    // Flush any errors.
-    drop(w);
-    if errors > 0 {
-        process::exit(1);
-    }
-}
-
-fn validate_file<W, Endian>(w: &mut ErrorWriter<W>, file: &object::File, endian: Endian)
-where
-    W: Write + Send,
-    Endian: gimli::Endianity + Send + Sync,
-{
-    let arena = Arena::new();
-
-    fn load_section<'a, 'file, 'input, S, Endian>(
-        arena: &'a Arena<Cow<'file, [u8]>>,
-        file: &'file object::File<'input>,
-        endian: Endian,
-    ) -> S
-    where
-        S: gimli::Section<gimli::EndianSlice<'a, Endian>>,
-        Endian: gimli::Endianity + Send + Sync,
-        'file: 'input,
-        'a: 'file,
-    {
-        let data = match file.section_by_name(S::section_name()) {
-            Some(ref section) => section
-                .uncompressed_data()
-                .unwrap_or(Cow::Borrowed(&[][..])),
-            None => Cow::Borrowed(&[][..]),
-        };
-        let data_ref = (*arena.alloc(data)).borrow();
-        S::from(gimli::EndianSlice::new(data_ref, endian))
-    }
-
-    // Variables representing sections of the file. The type of each is inferred from its use in the
-    // validate_info function below.
-    let debug_abbrev = &load_section(&arena, file, endian);
-    let debug_info = &load_section(&arena, file, endian);
-
-    validate_info(w, debug_info, debug_abbrev);
-}
-
-struct UnitSummary {
-    // True if we successfully parsed all the DIEs and attributes in the compilation unit
-    internally_valid: bool,
-    offset: gimli::DebugInfoOffset,
-    die_offsets: Vec<gimli::UnitOffset>,
-    global_die_references: Vec<(gimli::UnitOffset, gimli::DebugInfoOffset)>,
-}
-
-fn validate_info<W, R>(
-    w: &mut ErrorWriter<W>,
-    debug_info: &gimli::DebugInfo<R>,
-    debug_abbrev: &gimli::DebugAbbrev<R>,
-) where
-    W: Write + Send,
-    R: Reader,
-{
-    let mut units = Vec::new();
-    let mut units_iter = debug_info.units();
-    let mut last_offset = 0;
-    loop {
-        let u = match units_iter.next() {
-            Err(err) => {
-                w.error(format!(
-                    "Can't read unit header at offset {:#x}, stopping reading units: {}",
-                    last_offset, err
-                ));
-                break;
-            }
-            Ok(None) => break,
-            Ok(Some(u)) => u,
-        };
-        last_offset = u.offset().0 + u.length_including_self();
-        units.push(u);
-    }
-    let process_unit = |unit: CompilationUnitHeader<R>| -> UnitSummary {
-        let mut ret = UnitSummary {
-            internally_valid: false,
-            offset: unit.offset(),
-            die_offsets: Vec::new(),
-            global_die_references: Vec::new(),
-        };
-        let abbrevs = match unit.abbreviations(debug_abbrev) {
-            Ok(abbrevs) => abbrevs,
-            Err(err) => {
-                w.error(format!(
-                    "Invalid abbrevs for unit {:#x}: {}",
-                    unit.offset().0,
-                    &err
-                ));
-                return ret;
-            }
-        };
-        let mut entries = unit.entries(&abbrevs);
-        let mut unit_refs = Vec::new();
-        loop {
-            let (_, entry) = match entries.next_dfs() {
-                Err(err) => {
-                    w.error(format!(
-                        "Invalid DIE for unit {:#x}: {}",
-                        unit.offset().0,
-                        &err
-                    ));
-                    return ret;
-                }
-                Ok(None) => break,
-                Ok(Some(entry)) => entry,
-            };
-            ret.die_offsets.push(entry.offset());
-
-            let mut attrs = entry.attrs();
-            loop {
-                let attr = match attrs.next() {
-                    Err(err) => {
-                        w.error(format!(
-                            "Invalid attribute for unit {:#x} at DIE {:#x}: {}",
-                            unit.offset().0,
-                            entry.offset().0,
-                            &err
-                        ));
-                        return ret;
-                    }
-                    Ok(None) => break,
-                    Ok(Some(attr)) => attr,
-                };
-                match attr.value() {
-                    AttributeValue::UnitRef(offset) => {
-                        unit_refs.push((entry.offset(), offset));
-                    }
-                    AttributeValue::DebugInfoRef(offset) => {
-                        ret.global_die_references.push((entry.offset(), offset));
-                    }
-                    _ => (),
-                }
-            }
-        }
-        ret.internally_valid = true;
-        ret.die_offsets.shrink_to_fit();
-        ret.global_die_references.shrink_to_fit();
-
-        // Check intra-unit references
-        for (from, to) in unit_refs {
-            if ret.die_offsets.binary_search(&to).is_err() {
-                w.error(format!(
-                    "Invalid intra-unit reference in unit {:#x} from DIE {:#x} to {:#x}",
-                    unit.offset().0,
-                    from.0,
-                    to.0
-                ));
-            }
-        }
-
-        ret
-    };
-    let processed_units = units.into_par_iter().map(process_unit).collect::<Vec<_>>();
-
-    let check_unit = |summary: &UnitSummary| {
-        if !summary.internally_valid {
-            return;
-        }
-        for &(from, to) in summary.global_die_references.iter() {
-            let u = match processed_units.binary_search_by_key(&to, |v| v.offset) {
-                Ok(i) => &processed_units[i],
-                Err(i) => {
-                    if i > 0 {
-                        &processed_units[i - 1]
-                    } else {
-                        w.error(format!("Invalid cross-unit reference in unit {:#x} from DIE {:#x} to global DIE {:#x}: no unit found",
-                                        summary.offset.0, from.0, to.0));
-                        continue;
-                    }
-                }
-            };
-            if !u.internally_valid {
-                continue;
-            }
-            let to_offset = gimli::UnitOffset(to.0 - u.offset.0);
-            if u.die_offsets.binary_search(&to_offset).is_err() {
-                w.error(format!("Invalid cross-unit reference in unit {:#x} from DIE {:#x} to global DIE {:#x}: unit at {:#x} contains no DIE {:#x}",
-                                summary.offset.0, from.0, to.0, u.offset.0, to_offset.0));
-            }
-        }
-    };
-    processed_units.par_iter().for_each(check_unit);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/examples/simple_line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/examples/simple_line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/examples/simple_line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/examples/simple_line.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-//! A simple example of parsing `.debug_line`.
-
-use object::{Object, ObjectSection};
-use std::{borrow, env, fs, path};
-
-fn main() {
-    for path in env::args().skip(1) {
-        let file = fs::File::open(&path).unwrap();
-        let mmap = unsafe { memmap::Mmap::map(&file).unwrap() };
-        let object = object::File::parse(&*mmap).unwrap();
-        let endian = if object.is_little_endian() {
-            gimli::RunTimeEndian::Little
-        } else {
-            gimli::RunTimeEndian::Big
-        };
-        dump_file(&object, endian).unwrap();
-    }
-}
-
-fn dump_file(object: &object::File, endian: gimli::RunTimeEndian) -> Result<(), gimli::Error> {
-    // Load a section and return as `Cow<[u8]>`.
-    let load_section = |id: gimli::SectionId| -> Result<borrow::Cow<[u8]>, gimli::Error> {
-        match object.section_by_name(id.name()) {
-            Some(ref section) => Ok(section
-                .uncompressed_data()
-                .unwrap_or(borrow::Cow::Borrowed(&[][..]))),
-            None => Ok(borrow::Cow::Borrowed(&[][..])),
-        }
-    };
-    // Load a supplementary section. We don't have a supplementary object file,
-    // so always return an empty slice.
-    let load_section_sup = |_| Ok(borrow::Cow::Borrowed(&[][..]));
-
-    // Load all of the sections.
-    let dwarf_cow = gimli::Dwarf::load(&load_section, &load_section_sup)?;
-
-    // Borrow a `Cow<[u8]>` to create an `EndianSlice`.
-    let borrow_section: &dyn for<'a> Fn(
-        &'a borrow::Cow<[u8]>,
-    ) -> gimli::EndianSlice<'a, gimli::RunTimeEndian> =
-        &|section| gimli::EndianSlice::new(&*section, endian);
-
-    // Create `EndianSlice`s for all of the sections.
-    let dwarf = dwarf_cow.borrow(&borrow_section);
-
-    // Iterate over the compilation units.
-    let mut iter = dwarf.units();
-    while let Some(header) = iter.next()? {
-        println!(
-            "Line number info for unit at <.debug_info+0x{:x}>",
-            header.offset().0
-        );
-        let unit = dwarf.unit(header)?;
-
-        // Get the line program for the compilation unit.
-        if let Some(program) = unit.line_program.clone() {
-            let comp_dir = if let Some(ref dir) = unit.comp_dir {
-                path::PathBuf::from(dir.to_string_lossy().into_owned())
-            } else {
-                path::PathBuf::new()
-            };
-
-            // Iterate over the line program rows.
-            let mut rows = program.rows();
-            while let Some((header, row)) = rows.next_row()? {
-                if row.end_sequence() {
-                    // End of sequence indicates a possible gap in addresses.
-                    println!("{:x} end-sequence", row.address());
-                } else {
-                    // Determine the path. Real applications should cache this for performance.
-                    let mut path = path::PathBuf::new();
-                    if let Some(file) = row.file(header) {
-                        path = comp_dir.clone();
-                        if let Some(dir) = file.directory(header) {
-                            path.push(dwarf.attr_string(&unit, dir)?.to_string_lossy().as_ref());
-                        }
-                        path.push(
-                            dwarf
-                                .attr_string(&unit, file.path_name())?
-                                .to_string_lossy()
-                                .as_ref(),
-                        );
-                    }
-
-                    // Determine line/column. DWARF line/column is never 0, so we use that
-                    // but other applications may want to display this differently.
-                    let line = row.line().unwrap_or(0);
-                    let column = match row.column() {
-                        gimli::ColumnType::LeftEdge => 0,
-                        gimli::ColumnType::Column(x) => x,
-                    };
-
-                    println!("{:x} {}:{}:{}", row.address(), path.display(), line, column);
-                }
-            }
-        }
-    }
-    Ok(())
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/examples/simple.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/examples/simple.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/examples/simple.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/examples/simple.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-//! A simple example of parsing `.debug_info`.
-
-use object::{Object, ObjectSection};
-use std::{borrow, env, fs};
-
-fn main() {
-    for path in env::args().skip(1) {
-        let file = fs::File::open(&path).unwrap();
-        let mmap = unsafe { memmap::Mmap::map(&file).unwrap() };
-        let object = object::File::parse(&*mmap).unwrap();
-        let endian = if object.is_little_endian() {
-            gimli::RunTimeEndian::Little
-        } else {
-            gimli::RunTimeEndian::Big
-        };
-        dump_file(&object, endian).unwrap();
-    }
-}
-
-fn dump_file(object: &object::File, endian: gimli::RunTimeEndian) -> Result<(), gimli::Error> {
-    // Load a section and return as `Cow<[u8]>`.
-    let load_section = |id: gimli::SectionId| -> Result<borrow::Cow<[u8]>, gimli::Error> {
-        match object.section_by_name(id.name()) {
-            Some(ref section) => Ok(section
-                .uncompressed_data()
-                .unwrap_or(borrow::Cow::Borrowed(&[][..]))),
-            None => Ok(borrow::Cow::Borrowed(&[][..])),
-        }
-    };
-    // Load a supplementary section. We don't have a supplementary object file,
-    // so always return an empty slice.
-    let load_section_sup = |_| Ok(borrow::Cow::Borrowed(&[][..]));
-
-    // Load all of the sections.
-    let dwarf_cow = gimli::Dwarf::load(&load_section, &load_section_sup)?;
-
-    // Borrow a `Cow<[u8]>` to create an `EndianSlice`.
-    let borrow_section: &dyn for<'a> Fn(
-        &'a borrow::Cow<[u8]>,
-    ) -> gimli::EndianSlice<'a, gimli::RunTimeEndian> =
-        &|section| gimli::EndianSlice::new(&*section, endian);
-
-    // Create `EndianSlice`s for all of the sections.
-    let dwarf = dwarf_cow.borrow(&borrow_section);
-
-    // Iterate over the compilation units.
-    let mut iter = dwarf.units();
-    while let Some(header) = iter.next()? {
-        println!("Unit at <.debug_info+0x{:x}>", header.offset().0);
-        let unit = dwarf.unit(header)?;
-
-        // Iterate over the Debugging Information Entries (DIEs) in the unit.
-        let mut depth = 0;
-        let mut entries = unit.entries();
-        while let Some((delta_depth, entry)) = entries.next_dfs()? {
-            depth += delta_depth;
-            println!("<{}><{:x}> {}", depth, entry.offset().0, entry.tag());
-
-            // Iterate over the attributes in the DIE.
-            let mut attrs = entry.attrs();
-            while let Some(attr) = attrs.next()? {
-                println!("   {}: {:?}", attr.name(), attr.value());
-            }
-        }
-    }
-    Ok(())
-}
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_abbrev and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_abbrev differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_aranges and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_aranges differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_info and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_info differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_inlined and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_inlined differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_line and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_line differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_loc and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_loc differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_pubnames and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_pubnames differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_pubtypes and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_pubtypes differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_ranges and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_ranges differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_str and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/debug_str differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/eh_frame and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/eh_frame differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/eh_frame_hdr and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/eh_frame_hdr differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/fixtures/self/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-# What are these files?
-
-These files are the DWARF data generated for (an early version of) this
-library. Each file corresponds is a section from the built library's object
-file. By splitting the sections out to their own files, we don't need to worry
-about cross platform and cross object file format issues when running examples.
-
-# Updating and adding new sections
-
-## OSX
-
-Use `otool` to list the sections of a binary:
-
-```
-$ otool -l path/to/binary
-```
-
-You should see output similar to this:
-
-```
-Load command 0
-      cmd LC_SEGMENT_64
-  cmdsize 72
-  segname __PAGEZERO
-   vmaddr 0x0000000000000000
-   vmsize 0x0000000100000000
-  fileoff 0
- filesize 0
-  maxprot 0x00000000
- initprot 0x00000000
-   nsects 0
-    flags 0x0
-Load command 1
-      cmd LC_SEGMENT_64
-  cmdsize 712
-  segname __TEXT
-   vmaddr 0x0000000100000000
-   vmsize 0x00000000001b7000
-  fileoff 0
- filesize 1798144
-  maxprot 0x00000007
- initprot 0x00000005
-   nsects 8
-    flags 0x0
-Section
-  sectname __text
-   segname __TEXT
-      addr 0x0000000100000a50
-      size 0x0000000000170716
-    offset 2640
-     align 2^4 (16)
-    reloff 0
-    nreloc 0
-     flags 0x80000400
- reserved1 0
- reserved2 0
-```
-
-Etc.
-
-Find the `Section` entry of the section you'd like to isolate. For example, if
-you're looking for `eh_frame`, find an entry like this:
-
-```
-Section
-  sectname __eh_frame
-   segname __TEXT
-      addr 0x0000000100192f38
-      size 0x00000000000240c8
-    offset 1650488
-     align 2^3 (8)
-    reloff 0
-    nreloc 0
-     flags 0x00000000
- reserved1 0
- reserved2 0
-```
-
-Then use `dd` to copy `size` bytes starting from `offset`:
-
-```
-$ dd bs=1 skip=1650488 count=$(printf "%d" 0x00000000000240c8) if=path/to/binary of=fixtures/self/eh_frame
-```
-
-Finally, use `otool` and `hexdump` to verify that the isolated section has the
-same data as the section within the binary:
-
-```
-$ otool -s __TEXT __eh_frame path/to/binary | head
-path/to/binary:
-Contents of (__TEXT,__eh_frame) section
-0000000100192f38	14 00 00 00 00 00 00 00 01 7a 52 00 01 78 10 01
-0000000100192f48	10 0c 07 08 90 01 00 00 24 00 00 00 1c 00 00 00
-0000000100192f58	f8 da e6 ff ff ff ff ff 66 00 00 00 00 00 00 00
-0000000100192f68	00 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
-0000000100192f78	1c 00 00 00 00 00 00 00 01 7a 50 4c 52 00 01 78
-0000000100192f88	10 07 9b 9d 40 02 00 10 10 0c 07 08 90 01 00 00
-0000000100192f98	2c 00 00 00 24 00 00 00 20 db e6 ff ff ff ff ff
-0000000100192fa8	8d 00 00 00 00 00 00 00 08 37 e7 fd ff ff ff ff
-
-$ otool -s __TEXT __eh_frame path/to/binary | tail
-00000001001b6f68	9a 0a 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
-00000001001b6f78	06 50 83 07 8c 06 8d 05 8e 04 8f 03 00 00 00 00
-00000001001b6f88	24 00 00 00 7c 0e 00 00 30 a0 fb ff ff ff ff ff
-00000001001b6f98	15 00 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
-00000001001b6fa8	06 00 00 00 00 00 00 00 24 00 00 00 a4 0e 00 00
-00000001001b6fb8	28 a0 fb ff ff ff ff ff 1c 00 00 00 00 00 00 00
-00000001001b6fc8	00 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
-00000001001b6fd8	24 00 00 00 cc 0e 00 00 20 a0 fb ff ff ff ff ff
-00000001001b6fe8	66 01 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
-00000001001b6ff8	06 00 00 00 00 00 00 00
-```
-
-This should be the same, ignoring the leading offsets:
-
-```
-$ hexdump fixtures/self/eh_frame | head
-0000000 14 00 00 00 00 00 00 00 01 7a 52 00 01 78 10 01
-0000010 10 0c 07 08 90 01 00 00 24 00 00 00 1c 00 00 00
-0000020 f8 da e6 ff ff ff ff ff 66 00 00 00 00 00 00 00
-0000030 00 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
-0000040 1c 00 00 00 00 00 00 00 01 7a 50 4c 52 00 01 78
-0000050 10 07 9b 9d 40 02 00 10 10 0c 07 08 90 01 00 00
-0000060 2c 00 00 00 24 00 00 00 20 db e6 ff ff ff ff ff
-0000070 8d 00 00 00 00 00 00 00 08 37 e7 fd ff ff ff ff
-0000080 ff 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
-0000090 24 00 00 00 94 00 00 00 80 db e6 ff ff ff ff ff
-
-$ hexdump fixtures/self/eh_frame | tail
-0024040 06 50 83 07 8c 06 8d 05 8e 04 8f 03 00 00 00 00
-0024050 24 00 00 00 7c 0e 00 00 30 a0 fb ff ff ff ff ff
-0024060 15 00 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
-0024070 06 00 00 00 00 00 00 00 24 00 00 00 a4 0e 00 00
-0024080 28 a0 fb ff ff ff ff ff 1c 00 00 00 00 00 00 00
-0024090 00 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
-00240a0 24 00 00 00 cc 0e 00 00 20 a0 fb ff ff ff ff ff
-00240b0 66 01 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
-00240c0 06 00 00 00 00 00 00 00
-```
-
-## Linux
-
-Something like this:
-
-```
-objcopy --dump-section .eh_frame=fixtures/self/eh_frame path/to/binary
-```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2015 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-# `gimli`
-
-[![](http://meritbadge.herokuapp.com/gimli) ![](https://img.shields.io/crates/d/gimli.svg)](https://crates.io/crates/gimli)
-[![](https://docs.rs/gimli/badge.svg)](https://docs.rs/gimli/)
-[![Build Status](https://github.com/gimli-rs/gimli/workflows/Rust/badge.svg)](https://github.com/gimli-rs/gimli/actions)
-[![Coverage Status](https://coveralls.io/repos/github/gimli-rs/gimli/badge.svg?branch=master)](https://coveralls.io/github/gimli-rs/gimli?branch=master)
-
-`gimli` is a blazing fast library for consuming the
-[DWARF debugging format](http://dwarfstd.org/).
-
-* **Zero copy:** everything is just a reference to the original input buffer. No
-  copies of the input data get made.
-
-* **Lazy:** you can iterate compilation units without parsing their
-  contents. Parse only as many debugging information entry (DIE) trees as you
-  iterate over. `gimli` also uses `DW_AT_sibling` references to avoid parsing a
-  DIE's children to find its next sibling, when possible.
-
-* **Cross-platform:** `gimli` makes no assumptions about what kind of object
-  file you're working with. The flipside to that is that it's up to you to
-  provide an ELF loader on Linux or Mach-O loader on macOS.
-
-  * Unsure which object file parser to use? Try the cross-platform
-  [`object`](https://github.com/gimli-rs/object) crate. See the
-  [`examples/`](./examples) directory for usage with `gimli`.
-
-## Install
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-gimli = "0.22.0"
-```
-
-The minimum supported Rust version is 1.38.0.
-
-## Documentation
-
-* [Documentation on docs.rs](https://docs.rs/gimli/)
-
-* Example programs:
-
-  * [A simple `.debug_info` parser](./examples/simple.rs)
-
-  * [A simple `.debug_line` parser](./examples/simple_line.rs)
-
-  * [A `dwarfdump` clone](./examples/dwarfdump.rs)
-
-  * [An `addr2line` clone](https://github.com/gimli-rs/addr2line)
-
-  * [`ddbug`](https://github.com/philipc/ddbug), a utility giving insight into
-    code generation by making debugging information readable.
-
-  * [`dwprod`](https://github.com/fitzgen/dwprod), a tiny utility to list the
-    compilers used to create each compilation unit within a shared library or
-    executable (via `DW_AT_producer`).
-
-  * [`dwarf-validate`](./examples/dwarf-validate.rs), a program to validate the
-    integrity of some DWARF and its references between sections and compilation
-    units.
-
-## License
-
-Licensed under either of
-
-  * Apache License, Version 2.0 ([`LICENSE-APACHE`](./LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-  * MIT license ([`LICENSE-MIT`](./LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-## Contribution
-
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for hacking.
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
-dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/arch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/arch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/arch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/arch.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,220 +0,0 @@
-use crate::common::Register;
-
-macro_rules! registers {
-    ($struct_name:ident, { $($name:ident = ($val:expr, $disp:expr)),+ $(,)? }) => {
-        #[allow(missing_docs)]
-        impl $struct_name {
-            $(
-                pub const $name: Register = Register($val);
-            )+
-        }
-
-        impl $struct_name {
-            /// The name of a register, or `None` if the register number is unknown.
-            pub fn register_name(register: Register) -> Option<&'static str> {
-                match register {
-                    $(
-                        Self::$name => Some($disp),
-                    )+
-                    _ => return None,
-                }
-            }
-        }
-    };
-}
-
-/// ARM architecture specific definitions.
-///
-/// See [DWARF for the ARM Architecture](http://infocenter.arm.com/help/topic/com.arm.doc.ihi0040b/IHI0040B_aadwarf.pdf).
-#[derive(Debug, Clone, Copy)]
-pub struct Arm;
-
-// TODO: add more registers.
-registers!(Arm, {
-    R0 = (0, "R0"),
-    R1 = (1, "R1"),
-    R2 = (2, "R2"),
-    R3 = (3, "R3"),
-    R4 = (4, "R4"),
-    R5 = (5, "R5"),
-    R6 = (6, "R6"),
-    R7 = (7, "R7"),
-    R8 = (8, "R8"),
-    R9 = (9, "R9"),
-    R10 = (10, "R10"),
-    R11 = (11, "R11"),
-    R12 = (12, "R12"),
-    R13 = (13, "R13"),
-    R14 = (14, "R14"),
-    R15 = (15, "R15"),
-});
-
-/// Intel i386 architecture specific definitions.
-///
-/// See Intel386 psABi version 1.1 at the [X86 psABI wiki](https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI).
-#[derive(Debug, Clone, Copy)]
-pub struct X86;
-
-registers!(X86, {
-    EAX = (0, "eax"),
-    ECX = (1, "ecx"),
-    EDX = (2, "edx"),
-    EBX = (3, "ebx"),
-    ESP = (4, "esp"),
-    EBP = (5, "ebp"),
-    ESI = (6, "esi"),
-    EDI = (7, "edi"),
-
-    // Return Address register. This is stored in `0(%esp, "")` and is not a physical register.
-    RA = (8, "RA"),
-
-    ST0 = (11, "st0"),
-    ST1 = (12, "st1"),
-    ST2 = (13, "st2"),
-    ST3 = (14, "st3"),
-    ST4 = (15, "st4"),
-    ST5 = (16, "st5"),
-    ST6 = (17, "st6"),
-    ST7 = (18, "st7"),
-
-    XMM0 = (21, "xmm0"),
-    XMM1 = (22, "xmm1"),
-    XMM2 = (23, "xmm2"),
-    XMM3 = (24, "xmm3"),
-    XMM4 = (25, "xmm4"),
-    XMM5 = (26, "xmm5"),
-    XMM6 = (27, "xmm6"),
-    XMM7 = (28, "xmm7"),
-
-    MM0 = (29, "mm0"),
-    MM1 = (30, "mm1"),
-    MM2 = (31, "mm2"),
-    MM3 = (32, "mm3"),
-    MM4 = (33, "mm4"),
-    MM5 = (34, "mm5"),
-    MM6 = (35, "mm6"),
-    MM7 = (36, "mm7"),
-
-    MXCSR = (39, "mxcsr"),
-
-    ES = (40, "es"),
-    CS = (41, "cs"),
-    SS = (42, "ss"),
-    DS = (43, "ds"),
-    FS = (44, "fs"),
-    GS = (45, "gs"),
-
-    TR = (48, "tr"),
-    LDTR = (49, "ldtr"),
-
-    FS_BASE = (93, "fs.base"),
-    GS_BASE = (94, "gs.base"),
-});
-
-/// AMD64 architecture specific definitions.
-///
-/// See x86-64 psABI version 1.0 at the [X86 psABI wiki](https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI).
-#[derive(Debug, Clone, Copy)]
-pub struct X86_64;
-
-registers!(X86_64, {
-    RAX = (0, "rax"),
-    RDX = (1, "rdx"),
-    RCX = (2, "rcx"),
-    RBX = (3, "rbx"),
-    RSI = (4, "rsi"),
-    RDI = (5, "rdi"),
-    RBP = (6, "rbp"),
-    RSP = (7, "rsp"),
-
-    R8 = (8, "r8"),
-    R9 = (9, "r9"),
-    R10 = (10, "r10"),
-    R11 = (11, "r11"),
-    R12 = (12, "r12"),
-    R13 = (13, "r13"),
-    R14 = (14, "r14"),
-    R15 = (15, "r15"),
-
-    // Return Address register. This is stored in `0(%rsp, "")` and is not a physical register.
-    RA = (16, "RA"),
-
-    XMM0 = (17, "xmm0"),
-    XMM1 = (18, "xmm1"),
-    XMM2 = (19, "xmm2"),
-    XMM3 = (20, "xmm3"),
-    XMM4 = (21, "xmm4"),
-    XMM5 = (22, "xmm5"),
-    XMM6 = (23, "xmm6"),
-    XMM7 = (24, "xmm7"),
-
-    XMM8 = (25, "xmm8"),
-    XMM9 = (26, "xmm9"),
-    XMM10 = (27, "xmm10"),
-    XMM11 = (28, "xmm11"),
-    XMM12 = (29, "xmm12"),
-    XMM13 = (30, "xmm13"),
-    XMM14 = (31, "xmm14"),
-    XMM15 = (32, "xmm15"),
-
-    ST0 = (33, "st0"),
-    ST1 = (34, "st1"),
-    ST2 = (35, "st2"),
-    ST3 = (36, "st3"),
-    ST4 = (37, "st4"),
-    ST5 = (38, "st5"),
-    ST6 = (39, "st6"),
-    ST7 = (40, "st7"),
-
-    MM0 = (41, "mm0"),
-    MM1 = (42, "mm1"),
-    MM2 = (43, "mm2"),
-    MM3 = (44, "mm3"),
-    MM4 = (45, "mm4"),
-    MM5 = (46, "mm5"),
-    MM6 = (47, "mm6"),
-    MM7 = (48, "mm7"),
-
-    RFLAGS = (49, "rFLAGS"),
-    ES = (50, "es"),
-    CS = (51, "cs"),
-    SS = (52, "ss"),
-    DS = (53, "ds"),
-    FS = (54, "fs"),
-    GS = (55, "gs"),
-
-    FS_BASE = (58, "fs.base"),
-    GS_BASE = (59, "gs.base"),
-
-    TR = (62, "tr"),
-    LDTR = (63, "ldtr"),
-    MXCSR = (64, "mxcsr"),
-    FCW = (65, "fcw"),
-    FSW = (66, "fsw"),
-
-    XMM16 = (67, "xmm16"),
-    XMM17 = (68, "xmm17"),
-    XMM18 = (69, "xmm18"),
-    XMM19 = (70, "xmm19"),
-    XMM20 = (71, "xmm20"),
-    XMM21 = (72, "xmm21"),
-    XMM22 = (73, "xmm22"),
-    XMM23 = (74, "xmm23"),
-    XMM24 = (75, "xmm24"),
-    XMM25 = (76, "xmm25"),
-    XMM26 = (77, "xmm26"),
-    XMM27 = (78, "xmm27"),
-    XMM28 = (79, "xmm28"),
-    XMM29 = (80, "xmm29"),
-    XMM30 = (81, "xmm30"),
-    XMM31 = (82, "xmm31"),
-
-    K0 = (118, "k0"),
-    K1 = (119, "k1"),
-    K2 = (120, "k2"),
-    K3 = (121, "k3"),
-    K4 = (122, "k4"),
-    K5 = (123, "k5"),
-    K6 = (124, "k6"),
-    K7 = (125, "k7"),
-});
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/common.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/common.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,284 +0,0 @@
-/// Whether the format of a compilation unit is 32- or 64-bit.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum Format {
-    /// 64-bit DWARF
-    Dwarf64 = 8,
-    /// 32-bit DWARF
-    Dwarf32 = 4,
-}
-
-impl Format {
-    /// Return the serialized size of an initial length field for the format.
-    #[inline]
-    pub fn initial_length_size(self) -> u8 {
-        match self {
-            Format::Dwarf32 => 4,
-            Format::Dwarf64 => 12,
-        }
-    }
-
-    /// Return the natural word size for the format
-    #[inline]
-    pub fn word_size(self) -> u8 {
-        match self {
-            Format::Dwarf32 => 4,
-            Format::Dwarf64 => 8,
-        }
-    }
-}
-
-/// Encoding parameters that are commonly used for multiple DWARF sections.
-///
-/// This is intended to be small enough to pass by value.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-// `address_size` and `format` are used more often than `version`, so keep
-// them first.
-#[repr(C)]
-pub struct Encoding {
-    /// The size of an address.
-    pub address_size: u8,
-
-    // The size of a segment selector.
-    // TODO: pub segment_size: u8,
-    /// Whether the DWARF format is 32- or 64-bit.
-    pub format: Format,
-
-    /// The DWARF version of the header.
-    pub version: u16,
-}
-
-/// Encoding parameters for a line number program.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LineEncoding {
-    /// The size in bytes of the smallest target machine instruction.
-    pub minimum_instruction_length: u8,
-
-    /// The maximum number of individual operations that may be encoded in an
-    /// instruction.
-    pub maximum_operations_per_instruction: u8,
-
-    /// The initial value of the `is_stmt` register.
-    pub default_is_stmt: bool,
-
-    /// The minimum value which a special opcode can add to the line register.
-    pub line_base: i8,
-
-    /// The range of values which a special opcode can add to the line register.
-    pub line_range: u8,
-}
-
-impl Default for LineEncoding {
-    fn default() -> Self {
-        // Values from LLVM.
-        LineEncoding {
-            minimum_instruction_length: 1,
-            maximum_operations_per_instruction: 1,
-            default_is_stmt: true,
-            line_base: -5,
-            line_range: 14,
-        }
-    }
-}
-
-/// A DWARF register number.
-///
-/// The meaning of this value is ABI dependent. This is generally encoded as
-/// a ULEB128, but supported architectures need 16 bits at most.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct Register(pub u16);
-
-/// An offset into the `.debug_abbrev` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DebugAbbrevOffset<T = usize>(pub T);
-
-/// An offset to a set of entries in the `.debug_addr` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugAddrBase<T = usize>(pub T);
-
-/// An index into a set of addresses in the `.debug_addr` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugAddrIndex<T = usize>(pub T);
-
-/// An offset into the `.debug_info` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
-pub struct DebugInfoOffset<T = usize>(pub T);
-
-/// An offset into the `.debug_line` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugLineOffset<T = usize>(pub T);
-
-/// An offset into the `.debug_line_str` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugLineStrOffset<T = usize>(pub T);
-
-/// An offset into either the `.debug_loc` section or the `.debug_loclists` section,
-/// depending on the version of the unit the offset was contained in.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LocationListsOffset<T = usize>(pub T);
-
-/// An offset to a set of location list offsets in the `.debug_loclists` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugLocListsBase<T = usize>(pub T);
-
-/// An index into a set of location list offsets in the `.debug_loclists` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugLocListsIndex<T = usize>(pub T);
-
-/// An offset into the `.debug_macinfo` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DebugMacinfoOffset<T = usize>(pub T);
-
-/// An offset into the `.debug_macro` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DebugMacroOffset<T = usize>(pub T);
-
-/// An offset into either the `.debug_ranges` section or the `.debug_rnglists` section,
-/// depending on the version of the unit the offset was contained in.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct RangeListsOffset<T = usize>(pub T);
-
-/// An offset to a set of range list offsets in the `.debug_rnglists` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugRngListsBase<T = usize>(pub T);
-
-/// An index into a set of range list offsets in the `.debug_rnglists` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugRngListsIndex<T = usize>(pub T);
-
-/// An offset into the `.debug_str` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugStrOffset<T = usize>(pub T);
-
-/// An offset to a set of entries in the `.debug_str_offsets` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugStrOffsetsBase<T = usize>(pub T);
-
-/// An index into a set of entries in the `.debug_str_offsets` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct DebugStrOffsetsIndex<T = usize>(pub T);
-
-/// An offset into the `.debug_types` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
-pub struct DebugTypesOffset<T = usize>(pub T);
-
-/// A type signature as used in the `.debug_types` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DebugTypeSignature(pub u64);
-
-/// An offset into the `.debug_frame` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DebugFrameOffset<T = usize>(pub T);
-
-impl<T> From<T> for DebugFrameOffset<T> {
-    #[inline]
-    fn from(o: T) -> Self {
-        DebugFrameOffset(o)
-    }
-}
-
-/// An offset into the `.eh_frame` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct EhFrameOffset<T = usize>(pub T);
-
-impl<T> From<T> for EhFrameOffset<T> {
-    #[inline]
-    fn from(o: T) -> Self {
-        EhFrameOffset(o)
-    }
-}
-
-/// An offset into the `.debug_info` or `.debug_types` sections.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
-pub enum UnitSectionOffset<T = usize> {
-    /// An offset into the `.debug_info` section.
-    DebugInfoOffset(DebugInfoOffset<T>),
-    /// An offset into the `.debug_types` section.
-    DebugTypesOffset(DebugTypesOffset<T>),
-}
-
-/// An identifier for a DWARF section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
-pub enum SectionId {
-    /// The `.debug_abbrev` section.
-    DebugAbbrev,
-    /// The `.debug_addr` section.
-    DebugAddr,
-    /// The `.debug_aranges` section.
-    DebugAranges,
-    /// The `.debug_frame` section.
-    DebugFrame,
-    /// The `.eh_frame` section.
-    EhFrame,
-    /// The `.eh_frame_hdr` section.
-    EhFrameHdr,
-    /// The `.debug_info` section.
-    DebugInfo,
-    /// The `.debug_line` section.
-    DebugLine,
-    /// The `.debug_line_str` section.
-    DebugLineStr,
-    /// The `.debug_loc` section.
-    DebugLoc,
-    /// The `.debug_loclists` section.
-    DebugLocLists,
-    /// The `.debug_macinfo` section.
-    DebugMacinfo,
-    /// The `.debug_macro` section.
-    DebugMacro,
-    /// The `.debug_pubnames` section.
-    DebugPubNames,
-    /// The `.debug_pubtypes` section.
-    DebugPubTypes,
-    /// The `.debug_ranges` section.
-    DebugRanges,
-    /// The `.debug_rnglists` section.
-    DebugRngLists,
-    /// The `.debug_str` section.
-    DebugStr,
-    /// The `.debug_str_offsets` section.
-    DebugStrOffsets,
-    /// The `.debug_types` section.
-    DebugTypes,
-}
-
-impl SectionId {
-    /// Returns the ELF section name for this kind.
-    pub fn name(self) -> &'static str {
-        match self {
-            SectionId::DebugAbbrev => ".debug_abbrev",
-            SectionId::DebugAddr => ".debug_addr",
-            SectionId::DebugAranges => ".debug_aranges",
-            SectionId::DebugFrame => ".debug_frame",
-            SectionId::EhFrame => ".eh_frame",
-            SectionId::EhFrameHdr => ".eh_frame_hdr",
-            SectionId::DebugInfo => ".debug_info",
-            SectionId::DebugLine => ".debug_line",
-            SectionId::DebugLineStr => ".debug_line_str",
-            SectionId::DebugLoc => ".debug_loc",
-            SectionId::DebugLocLists => ".debug_loclists",
-            SectionId::DebugMacinfo => ".debug_macinfo",
-            SectionId::DebugMacro => ".debug_macro",
-            SectionId::DebugPubNames => ".debug_pubnames",
-            SectionId::DebugPubTypes => ".debug_pubtypes",
-            SectionId::DebugRanges => ".debug_ranges",
-            SectionId::DebugRngLists => ".debug_rnglists",
-            SectionId::DebugStr => ".debug_str",
-            SectionId::DebugStrOffsets => ".debug_str_offsets",
-            SectionId::DebugTypes => ".debug_types",
-        }
-    }
-
-    /// Returns the ELF section name for this kind, when found in a .dwo file.
-    pub fn dwo_name(self) -> Option<&'static str> {
-        Some(match self {
-            SectionId::DebugAbbrev => ".debug_abbrev.dwo",
-            SectionId::DebugInfo => ".debug_info.dwo",
-            SectionId::DebugLine => ".debug_line.dwo",
-            SectionId::DebugLocLists => ".debug_loclists.dwo",
-            SectionId::DebugMacro => ".debug_macro.dwo",
-            SectionId::DebugStr => ".debug_str.dwo",
-            SectionId::DebugStrOffsets => ".debug_str_offsets.dwo",
-            _ => return None,
-        })
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/constants.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/constants.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/constants.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/constants.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1379 +0,0 @@
-// This file originally from https://github.com/philipc/rust-dwarf/ and
-// distributed under either MIT or Apache 2.0 licenses.
-//
-// Copyright 2016 The rust-dwarf Developers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Constant definitions.
-//!
-//! The DWARF spec's `DW_AT_*` type is represented as `struct DwAt(u16)`,
-//! `DW_FORM_*` as `DwForm(u16)`, etc.
-//!
-//! There are also exported const definitions for each constant.
-
-#![allow(non_upper_case_globals)]
-#![allow(missing_docs)]
-
-use core::fmt;
-
-// The `dw!` macro turns this:
-//
-//     dw!(DwFoo(u32) {
-//         DW_FOO_bar = 0,
-//         DW_FOO_baz = 1,
-//         DW_FOO_bang = 2,
-//     });
-//
-// into this:
-//
-//     #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
-//     pub struct DwFoo(pub u32);
-//
-//     pub const DW_FOO_bar: DwFoo = DwFoo(0);
-//     pub const DW_FOO_baz: DwFoo = DwFoo(1);
-//     pub const DW_FOO_bang: DwFoo = DwFoo(2);
-//
-//     impl DwFoo {
-//         pub fn static_string(&self) -> Option<&'static str> {
-//             ...
-//         }
-//     }
-//
-//     impl fmt::Display for DwFoo {
-//         fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-//             ...
-//         }
-//     }
-macro_rules! dw {
-    ($(#[$meta:meta])* $struct_name:ident($struct_type:ty) { $($name:ident = $val:expr),+ $(,)? }) => {
-        $(#[$meta])*
-        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
-        pub struct $struct_name(pub $struct_type);
-
-        $(
-            pub const $name: $struct_name = $struct_name($val);
-        )+
-
-        impl $struct_name {
-            pub fn static_string(&self) -> Option<&'static str> {
-                Some(match *self {
-                    $(
-                        $name => stringify!($name),
-                    )+
-                    _ => return None,
-                })
-            }
-        }
-
-        impl fmt::Display for $struct_name {
-            fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-                if let Some(s) = self.static_string() {
-                    f.pad(s)
-                } else {
-                    f.pad(&format!("Unknown {}: {}",
-                                   stringify!($struct_name),
-                                   self.0))
-                }
-            }
-        }
-    };
-}
-
-dw!(
-/// The unit type field in a unit header.
-///
-/// See Section 7.5.1, Table 7.2.
-DwUt(u8) {
-    DW_UT_compile = 0x01,
-    DW_UT_type = 0x02,
-    DW_UT_partial = 0x03,
-    DW_UT_skeleton = 0x04,
-    DW_UT_split_compile = 0x05,
-    DW_UT_split_type = 0x06,
-    DW_UT_lo_user = 0x80,
-    DW_UT_hi_user = 0xff,
-});
-
-dw!(
-/// The opcode for a call frame instruction.
-///
-/// Section 7.24:
-/// > Call frame instructions are encoded in one or more bytes. The primary
-/// > opcode is encoded in the high order two bits of the first byte (that is,
-/// > opcode = byte >> 6). An operand or extended opcode may be encoded in the
-/// > low order 6 bits. Additional operands are encoded in subsequent bytes.
-DwCfa(u8) {
-    DW_CFA_advance_loc = 0x01 << 6,
-    DW_CFA_offset = 0x02 << 6,
-    DW_CFA_restore = 0x03 << 6,
-    DW_CFA_nop = 0,
-    DW_CFA_set_loc = 0x01,
-    DW_CFA_advance_loc1 = 0x02,
-    DW_CFA_advance_loc2 = 0x03,
-    DW_CFA_advance_loc4 = 0x04,
-    DW_CFA_offset_extended = 0x05,
-    DW_CFA_restore_extended = 0x06,
-    DW_CFA_undefined = 0x07,
-    DW_CFA_same_value = 0x08,
-    DW_CFA_register = 0x09,
-    DW_CFA_remember_state = 0x0a,
-    DW_CFA_restore_state = 0x0b,
-    DW_CFA_def_cfa = 0x0c,
-    DW_CFA_def_cfa_register = 0x0d,
-    DW_CFA_def_cfa_offset = 0x0e,
-    DW_CFA_def_cfa_expression = 0x0f,
-    DW_CFA_expression = 0x10,
-    DW_CFA_offset_extended_sf = 0x11,
-    DW_CFA_def_cfa_sf = 0x12,
-    DW_CFA_def_cfa_offset_sf = 0x13,
-    DW_CFA_val_offset = 0x14,
-    DW_CFA_val_offset_sf = 0x15,
-    DW_CFA_val_expression = 0x16,
-
-    DW_CFA_lo_user = 0x1c,
-    DW_CFA_hi_user = 0x3f,
-
-    DW_CFA_MIPS_advance_loc8 = 0x1d,
-    DW_CFA_GNU_window_save = 0x2d,
-    DW_CFA_GNU_args_size = 0x2e,
-    DW_CFA_GNU_negative_offset_extended = 0x2f,
-});
-
-dw!(
-/// The child determination encodings for DIE attributes.
-///
-/// See Section 7.5.3, Table 7.4.
-DwChildren(u8) {
-    DW_CHILDREN_no = 0,
-    DW_CHILDREN_yes = 1,
-});
-
-dw!(
-/// The tag encodings for DIE attributes.
-///
-/// See Section 7.5.3, Table 7.3.
-DwTag(u16) {
-    DW_TAG_null = 0x00,
-
-    DW_TAG_array_type = 0x01,
-    DW_TAG_class_type = 0x02,
-    DW_TAG_entry_point = 0x03,
-    DW_TAG_enumeration_type = 0x04,
-    DW_TAG_formal_parameter = 0x05,
-    DW_TAG_imported_declaration = 0x08,
-    DW_TAG_label = 0x0a,
-    DW_TAG_lexical_block = 0x0b,
-    DW_TAG_member = 0x0d,
-    DW_TAG_pointer_type = 0x0f,
-    DW_TAG_reference_type = 0x10,
-    DW_TAG_compile_unit = 0x11,
-    DW_TAG_string_type = 0x12,
-    DW_TAG_structure_type = 0x13,
-    DW_TAG_subroutine_type = 0x15,
-    DW_TAG_typedef = 0x16,
-    DW_TAG_union_type = 0x17,
-    DW_TAG_unspecified_parameters = 0x18,
-    DW_TAG_variant = 0x19,
-    DW_TAG_common_block = 0x1a,
-    DW_TAG_common_inclusion = 0x1b,
-    DW_TAG_inheritance = 0x1c,
-    DW_TAG_inlined_subroutine = 0x1d,
-    DW_TAG_module = 0x1e,
-    DW_TAG_ptr_to_member_type = 0x1f,
-    DW_TAG_set_type = 0x20,
-    DW_TAG_subrange_type = 0x21,
-    DW_TAG_with_stmt = 0x22,
-    DW_TAG_access_declaration = 0x23,
-    DW_TAG_base_type = 0x24,
-    DW_TAG_catch_block = 0x25,
-    DW_TAG_const_type = 0x26,
-    DW_TAG_constant = 0x27,
-    DW_TAG_enumerator = 0x28,
-    DW_TAG_file_type = 0x29,
-    DW_TAG_friend = 0x2a,
-    DW_TAG_namelist = 0x2b,
-    DW_TAG_namelist_item = 0x2c,
-    DW_TAG_packed_type = 0x2d,
-    DW_TAG_subprogram = 0x2e,
-    DW_TAG_template_type_parameter = 0x2f,
-    DW_TAG_template_value_parameter = 0x30,
-    DW_TAG_thrown_type = 0x31,
-    DW_TAG_try_block = 0x32,
-    DW_TAG_variant_part = 0x33,
-    DW_TAG_variable = 0x34,
-    DW_TAG_volatile_type = 0x35,
-
-// DWARF 3.
-    DW_TAG_dwarf_procedure = 0x36,
-    DW_TAG_restrict_type = 0x37,
-    DW_TAG_interface_type = 0x38,
-    DW_TAG_namespace = 0x39,
-    DW_TAG_imported_module = 0x3a,
-    DW_TAG_unspecified_type = 0x3b,
-    DW_TAG_partial_unit = 0x3c,
-    DW_TAG_imported_unit = 0x3d,
-    DW_TAG_condition = 0x3f,
-    DW_TAG_shared_type = 0x40,
-
-// DWARF 4.
-    DW_TAG_type_unit = 0x41,
-    DW_TAG_rvalue_reference_type = 0x42,
-    DW_TAG_template_alias = 0x43,
-
-// DWARF 5.
-    DW_TAG_coarray_type = 0x44,
-    DW_TAG_generic_subrange = 0x45,
-    DW_TAG_dynamic_type = 0x46,
-    DW_TAG_atomic_type = 0x47,
-    DW_TAG_call_site = 0x48,
-    DW_TAG_call_site_parameter = 0x49,
-    DW_TAG_skeleton_unit = 0x4a,
-    DW_TAG_immutable_type = 0x4b,
-
-    DW_TAG_lo_user = 0x4080,
-    DW_TAG_hi_user = 0xffff,
-
-// SGI/MIPS extensions.
-    DW_TAG_MIPS_loop = 0x4081,
-
-// HP extensions.
-    DW_TAG_HP_array_descriptor = 0x4090,
-    DW_TAG_HP_Bliss_field = 0x4091,
-    DW_TAG_HP_Bliss_field_set = 0x4092,
-
-// GNU extensions.
-    DW_TAG_format_label = 0x4101,
-    DW_TAG_function_template = 0x4102,
-    DW_TAG_class_template = 0x4103,
-    DW_TAG_GNU_BINCL = 0x4104,
-    DW_TAG_GNU_EINCL = 0x4105,
-    DW_TAG_GNU_template_template_param = 0x4106,
-    DW_TAG_GNU_template_parameter_pack = 0x4107,
-    DW_TAG_GNU_formal_parameter_pack = 0x4108,
-    DW_TAG_GNU_call_site = 0x4109,
-    DW_TAG_GNU_call_site_parameter = 0x410a,
-
-    DW_TAG_APPLE_property = 0x4200,
-
-// SUN extensions.
-    DW_TAG_SUN_function_template = 0x4201,
-    DW_TAG_SUN_class_template = 0x4202,
-    DW_TAG_SUN_struct_template = 0x4203,
-    DW_TAG_SUN_union_template = 0x4204,
-    DW_TAG_SUN_indirect_inheritance = 0x4205,
-    DW_TAG_SUN_codeflags = 0x4206,
-    DW_TAG_SUN_memop_info = 0x4207,
-    DW_TAG_SUN_omp_child_func = 0x4208,
-    DW_TAG_SUN_rtti_descriptor = 0x4209,
-    DW_TAG_SUN_dtor_info = 0x420a,
-    DW_TAG_SUN_dtor = 0x420b,
-    DW_TAG_SUN_f90_interface = 0x420c,
-    DW_TAG_SUN_fortran_vax_structure = 0x420d,
-
-// ALTIUM extensions.
-    DW_TAG_ALTIUM_circ_type = 0x5101,
-    DW_TAG_ALTIUM_mwa_circ_type = 0x5102,
-    DW_TAG_ALTIUM_rev_carry_type = 0x5103,
-    DW_TAG_ALTIUM_rom = 0x5111,
-
-// Extensions for UPC.
-    DW_TAG_upc_shared_type = 0x8765,
-    DW_TAG_upc_strict_type = 0x8766,
-    DW_TAG_upc_relaxed_type = 0x8767,
-
-// PGI (STMicroelectronics) extensions.
-    DW_TAG_PGI_kanji_type = 0xa000,
-    DW_TAG_PGI_interface_block = 0xa020,
-
-// Borland extensions.
-    DW_TAG_BORLAND_property = 0xb000,
-    DW_TAG_BORLAND_Delphi_string = 0xb001,
-    DW_TAG_BORLAND_Delphi_dynamic_array = 0xb002,
-    DW_TAG_BORLAND_Delphi_set = 0xb003,
-    DW_TAG_BORLAND_Delphi_variant = 0xb004,
-});
-
-dw!(
-/// The attribute encodings for DIE attributes.
-///
-/// See Section 7.5.4, Table 7.5.
-DwAt(u16) {
-    DW_AT_null = 0x00,
-
-    DW_AT_sibling = 0x01,
-    DW_AT_location = 0x02,
-    DW_AT_name = 0x03,
-    DW_AT_ordering = 0x09,
-    DW_AT_byte_size = 0x0b,
-    DW_AT_bit_offset = 0x0c,
-    DW_AT_bit_size = 0x0d,
-    DW_AT_stmt_list = 0x10,
-    DW_AT_low_pc = 0x11,
-    DW_AT_high_pc = 0x12,
-    DW_AT_language = 0x13,
-    DW_AT_discr = 0x15,
-    DW_AT_discr_value = 0x16,
-    DW_AT_visibility = 0x17,
-    DW_AT_import = 0x18,
-    DW_AT_string_length = 0x19,
-    DW_AT_common_reference = 0x1a,
-    DW_AT_comp_dir = 0x1b,
-    DW_AT_const_value = 0x1c,
-    DW_AT_containing_type = 0x1d,
-    DW_AT_default_value = 0x1e,
-    DW_AT_inline = 0x20,
-    DW_AT_is_optional = 0x21,
-    DW_AT_lower_bound = 0x22,
-    DW_AT_producer = 0x25,
-    DW_AT_prototyped = 0x27,
-    DW_AT_return_addr = 0x2a,
-    DW_AT_start_scope = 0x2c,
-    DW_AT_bit_stride = 0x2e,
-    DW_AT_upper_bound = 0x2f,
-    DW_AT_abstract_origin = 0x31,
-    DW_AT_accessibility = 0x32,
-    DW_AT_address_class = 0x33,
-    DW_AT_artificial = 0x34,
-    DW_AT_base_types = 0x35,
-    DW_AT_calling_convention = 0x36,
-    DW_AT_count = 0x37,
-    DW_AT_data_member_location = 0x38,
-    DW_AT_decl_column = 0x39,
-    DW_AT_decl_file = 0x3a,
-    DW_AT_decl_line = 0x3b,
-    DW_AT_declaration = 0x3c,
-    DW_AT_discr_list = 0x3d,
-    DW_AT_encoding = 0x3e,
-    DW_AT_external = 0x3f,
-    DW_AT_frame_base = 0x40,
-    DW_AT_friend = 0x41,
-    DW_AT_identifier_case = 0x42,
-    DW_AT_macro_info = 0x43,
-    DW_AT_namelist_item = 0x44,
-    DW_AT_priority = 0x45,
-    DW_AT_segment = 0x46,
-    DW_AT_specification = 0x47,
-    DW_AT_static_link = 0x48,
-    DW_AT_type = 0x49,
-    DW_AT_use_location = 0x4a,
-    DW_AT_variable_parameter = 0x4b,
-    DW_AT_virtuality = 0x4c,
-    DW_AT_vtable_elem_location = 0x4d,
-
-// DWARF 3.
-    DW_AT_allocated = 0x4e,
-    DW_AT_associated = 0x4f,
-    DW_AT_data_location = 0x50,
-    DW_AT_byte_stride = 0x51,
-    DW_AT_entry_pc = 0x52,
-    DW_AT_use_UTF8 = 0x53,
-    DW_AT_extension = 0x54,
-    DW_AT_ranges = 0x55,
-    DW_AT_trampoline = 0x56,
-    DW_AT_call_column = 0x57,
-    DW_AT_call_file = 0x58,
-    DW_AT_call_line = 0x59,
-    DW_AT_description = 0x5a,
-    DW_AT_binary_scale = 0x5b,
-    DW_AT_decimal_scale = 0x5c,
-    DW_AT_small = 0x5d,
-    DW_AT_decimal_sign = 0x5e,
-    DW_AT_digit_count = 0x5f,
-    DW_AT_picture_string = 0x60,
-    DW_AT_mutable = 0x61,
-    DW_AT_threads_scaled = 0x62,
-    DW_AT_explicit = 0x63,
-    DW_AT_object_pointer = 0x64,
-    DW_AT_endianity = 0x65,
-    DW_AT_elemental = 0x66,
-    DW_AT_pure = 0x67,
-    DW_AT_recursive = 0x68,
-
-// DWARF 4.
-    DW_AT_signature = 0x69,
-    DW_AT_main_subprogram = 0x6a,
-    DW_AT_data_bit_offset = 0x6b,
-    DW_AT_const_expr = 0x6c,
-    DW_AT_enum_class = 0x6d,
-    DW_AT_linkage_name = 0x6e,
-
-// DWARF 5.
-    DW_AT_string_length_bit_size = 0x6f,
-    DW_AT_string_length_byte_size = 0x70,
-    DW_AT_rank = 0x71,
-    DW_AT_str_offsets_base = 0x72,
-    DW_AT_addr_base = 0x73,
-    DW_AT_rnglists_base = 0x74,
-    DW_AT_dwo_name = 0x76,
-    DW_AT_reference = 0x77,
-    DW_AT_rvalue_reference = 0x78,
-    DW_AT_macros = 0x79,
-    DW_AT_call_all_calls = 0x7a,
-    DW_AT_call_all_source_calls = 0x7b,
-    DW_AT_call_all_tail_calls = 0x7c,
-    DW_AT_call_return_pc = 0x7d,
-    DW_AT_call_value = 0x7e,
-    DW_AT_call_origin = 0x7f,
-    DW_AT_call_parameter = 0x80,
-    DW_AT_call_pc = 0x81,
-    DW_AT_call_tail_call = 0x82,
-    DW_AT_call_target = 0x83,
-    DW_AT_call_target_clobbered = 0x84,
-    DW_AT_call_data_location = 0x85,
-    DW_AT_call_data_value = 0x86,
-    DW_AT_noreturn = 0x87,
-    DW_AT_alignment = 0x88,
-    DW_AT_export_symbols = 0x89,
-    DW_AT_deleted = 0x8a,
-    DW_AT_defaulted = 0x8b,
-    DW_AT_loclists_base = 0x8c,
-
-    DW_AT_lo_user = 0x2000,
-    DW_AT_hi_user = 0x3fff,
-
-// SGI/MIPS extensions.
-    DW_AT_MIPS_fde = 0x2001,
-    DW_AT_MIPS_loop_begin = 0x2002,
-    DW_AT_MIPS_tail_loop_begin = 0x2003,
-    DW_AT_MIPS_epilog_begin = 0x2004,
-    DW_AT_MIPS_loop_unroll_factor = 0x2005,
-    DW_AT_MIPS_software_pipeline_depth = 0x2006,
-    DW_AT_MIPS_linkage_name = 0x2007,
-    DW_AT_MIPS_stride = 0x2008,
-    DW_AT_MIPS_abstract_name = 0x2009,
-    DW_AT_MIPS_clone_origin = 0x200a,
-    DW_AT_MIPS_has_inlines = 0x200b,
-    DW_AT_MIPS_stride_byte = 0x200c,
-    DW_AT_MIPS_stride_elem = 0x200d,
-    DW_AT_MIPS_ptr_dopetype = 0x200e,
-    DW_AT_MIPS_allocatable_dopetype = 0x200f,
-    DW_AT_MIPS_assumed_shape_dopetype = 0x2010,
-
-// This one appears to have only been implemented by Open64 for
-// fortran and may conflict with other extensions.
-    DW_AT_MIPS_assumed_size = 0x2011,
-
-// TODO: HP/CPQ extensions.
-// These conflict with the MIPS extensions.
-
-    DW_AT_INTEL_other_endian = 0x2026,
-
-// GNU extensions
-    DW_AT_sf_names = 0x2101,
-    DW_AT_src_info = 0x2102,
-    DW_AT_mac_info = 0x2103,
-    DW_AT_src_coords = 0x2104,
-    DW_AT_body_begin = 0x2105,
-    DW_AT_body_end = 0x2106,
-    DW_AT_GNU_vector = 0x2107,
-    DW_AT_GNU_guarded_by = 0x2108,
-    DW_AT_GNU_pt_guarded_by = 0x2109,
-    DW_AT_GNU_guarded = 0x210a,
-    DW_AT_GNU_pt_guarded = 0x210b,
-    DW_AT_GNU_locks_excluded = 0x210c,
-    DW_AT_GNU_exclusive_locks_required = 0x210d,
-    DW_AT_GNU_shared_locks_required = 0x210e,
-    DW_AT_GNU_odr_signature = 0x210f,
-    DW_AT_GNU_template_name = 0x2110,
-    DW_AT_GNU_call_site_value = 0x2111,
-    DW_AT_GNU_call_site_data_value = 0x2112,
-    DW_AT_GNU_call_site_target = 0x2113,
-    DW_AT_GNU_call_site_target_clobbered = 0x2114,
-    DW_AT_GNU_tail_call = 0x2115,
-    DW_AT_GNU_all_tail_call_sites = 0x2116,
-    DW_AT_GNU_all_call_sites = 0x2117,
-    DW_AT_GNU_all_source_call_sites = 0x2118,
-    DW_AT_GNU_macros = 0x2119,
-
-// Extensions for Fission proposal.
-    DW_AT_GNU_dwo_name = 0x2130,
-    DW_AT_GNU_dwo_id = 0x2131,
-    DW_AT_GNU_ranges_base = 0x2132,
-    DW_AT_GNU_addr_base = 0x2133,
-    DW_AT_GNU_pubnames = 0x2134,
-    DW_AT_GNU_pubtypes = 0x2135,
-    DW_AT_GNU_discriminator = 0x2136,
-    DW_AT_GNU_locviews = 0x2137,
-    DW_AT_GNU_entry_view = 0x2138,
-
-// Conflict with Sun.
-// DW_AT_VMS_rtnbeg_pd_address = 0x2201,
-
-// Sun extensions.
-    DW_AT_SUN_template = 0x2201,
-    DW_AT_SUN_alignment = 0x2202,
-    DW_AT_SUN_vtable = 0x2203,
-    DW_AT_SUN_count_guarantee = 0x2204,
-    DW_AT_SUN_command_line = 0x2205,
-    DW_AT_SUN_vbase = 0x2206,
-    DW_AT_SUN_compile_options = 0x2207,
-    DW_AT_SUN_language = 0x2208,
-    DW_AT_SUN_browser_file = 0x2209,
-    DW_AT_SUN_vtable_abi = 0x2210,
-    DW_AT_SUN_func_offsets = 0x2211,
-    DW_AT_SUN_cf_kind = 0x2212,
-    DW_AT_SUN_vtable_index = 0x2213,
-    DW_AT_SUN_omp_tpriv_addr = 0x2214,
-    DW_AT_SUN_omp_child_func = 0x2215,
-    DW_AT_SUN_func_offset = 0x2216,
-    DW_AT_SUN_memop_type_ref = 0x2217,
-    DW_AT_SUN_profile_id = 0x2218,
-    DW_AT_SUN_memop_signature = 0x2219,
-    DW_AT_SUN_obj_dir = 0x2220,
-    DW_AT_SUN_obj_file = 0x2221,
-    DW_AT_SUN_original_name = 0x2222,
-    DW_AT_SUN_hwcprof_signature = 0x2223,
-    DW_AT_SUN_amd64_parmdump = 0x2224,
-    DW_AT_SUN_part_link_name = 0x2225,
-    DW_AT_SUN_link_name = 0x2226,
-    DW_AT_SUN_pass_with_const = 0x2227,
-    DW_AT_SUN_return_with_const = 0x2228,
-    DW_AT_SUN_import_by_name = 0x2229,
-    DW_AT_SUN_f90_pointer = 0x222a,
-    DW_AT_SUN_pass_by_ref = 0x222b,
-    DW_AT_SUN_f90_allocatable = 0x222c,
-    DW_AT_SUN_f90_assumed_shape_array = 0x222d,
-    DW_AT_SUN_c_vla = 0x222e,
-    DW_AT_SUN_return_value_ptr = 0x2230,
-    DW_AT_SUN_dtor_start = 0x2231,
-    DW_AT_SUN_dtor_length = 0x2232,
-    DW_AT_SUN_dtor_state_initial = 0x2233,
-    DW_AT_SUN_dtor_state_final = 0x2234,
-    DW_AT_SUN_dtor_state_deltas = 0x2235,
-    DW_AT_SUN_import_by_lname = 0x2236,
-    DW_AT_SUN_f90_use_only = 0x2237,
-    DW_AT_SUN_namelist_spec = 0x2238,
-    DW_AT_SUN_is_omp_child_func = 0x2239,
-    DW_AT_SUN_fortran_main_alias = 0x223a,
-    DW_AT_SUN_fortran_based = 0x223b,
-
-    DW_AT_ALTIUM_loclist = 0x2300,
-
-    DW_AT_use_GNAT_descriptive_type = 0x2301,
-    DW_AT_GNAT_descriptive_type = 0x2302,
-    DW_AT_GNU_numerator = 0x2303,
-    DW_AT_GNU_denominator = 0x2304,
-    DW_AT_GNU_bias = 0x2305,
-
-    DW_AT_upc_threads_scaled = 0x3210,
-
-// PGI (STMicroelectronics) extensions.
-    DW_AT_PGI_lbase = 0x3a00,
-    DW_AT_PGI_soffset = 0x3a01,
-    DW_AT_PGI_lstride = 0x3a02,
-
-// Borland extensions.
-    DW_AT_BORLAND_property_read = 0x3b11,
-    DW_AT_BORLAND_property_write = 0x3b12,
-    DW_AT_BORLAND_property_implements = 0x3b13,
-    DW_AT_BORLAND_property_index = 0x3b14,
-    DW_AT_BORLAND_property_default = 0x3b15,
-    DW_AT_BORLAND_Delphi_unit = 0x3b20,
-    DW_AT_BORLAND_Delphi_class = 0x3b21,
-    DW_AT_BORLAND_Delphi_record = 0x3b22,
-    DW_AT_BORLAND_Delphi_metaclass = 0x3b23,
-    DW_AT_BORLAND_Delphi_constructor = 0x3b24,
-    DW_AT_BORLAND_Delphi_destructor = 0x3b25,
-    DW_AT_BORLAND_Delphi_anonymous_method = 0x3b26,
-    DW_AT_BORLAND_Delphi_interface = 0x3b27,
-    DW_AT_BORLAND_Delphi_ABI = 0x3b28,
-    DW_AT_BORLAND_Delphi_return = 0x3b29,
-    DW_AT_BORLAND_Delphi_frameptr = 0x3b30,
-    DW_AT_BORLAND_closure = 0x3b31,
-
-// LLVM project extensions.
-    DW_AT_LLVM_include_path = 0x3e00,
-    DW_AT_LLVM_config_macros = 0x3e01,
-    DW_AT_LLVM_isysroot = 0x3e02,
-
-// Apple extensions.
-    DW_AT_APPLE_optimized = 0x3fe1,
-    DW_AT_APPLE_flags = 0x3fe2,
-    DW_AT_APPLE_isa = 0x3fe3,
-    DW_AT_APPLE_block = 0x3fe4,
-    DW_AT_APPLE_major_runtime_vers = 0x3fe5,
-    DW_AT_APPLE_runtime_class = 0x3fe6,
-    DW_AT_APPLE_omit_frame_ptr = 0x3fe7,
-    DW_AT_APPLE_property_name = 0x3fe8,
-    DW_AT_APPLE_property_getter = 0x3fe9,
-    DW_AT_APPLE_property_setter = 0x3fea,
-    DW_AT_APPLE_property_attribute = 0x3feb,
-    DW_AT_APPLE_objc_complete_type = 0x3fec,
-    DW_AT_APPLE_property = 0x3fed
-});
-
-dw!(
-/// The attribute form encodings for DIE attributes.
-///
-/// See Section 7.5.6, Table 7.6.
-DwForm(u16) {
-    DW_FORM_null = 0x00,
-
-    DW_FORM_addr = 0x01,
-    DW_FORM_block2 = 0x03,
-    DW_FORM_block4 = 0x04,
-    DW_FORM_data2 = 0x05,
-    DW_FORM_data4 = 0x06,
-    DW_FORM_data8 = 0x07,
-    DW_FORM_string = 0x08,
-    DW_FORM_block = 0x09,
-    DW_FORM_block1 = 0x0a,
-    DW_FORM_data1 = 0x0b,
-    DW_FORM_flag = 0x0c,
-    DW_FORM_sdata = 0x0d,
-    DW_FORM_strp = 0x0e,
-    DW_FORM_udata = 0x0f,
-    DW_FORM_ref_addr = 0x10,
-    DW_FORM_ref1 = 0x11,
-    DW_FORM_ref2 = 0x12,
-    DW_FORM_ref4 = 0x13,
-    DW_FORM_ref8 = 0x14,
-    DW_FORM_ref_udata = 0x15,
-    DW_FORM_indirect = 0x16,
-
-// DWARF 4.
-    DW_FORM_sec_offset = 0x17,
-    DW_FORM_exprloc = 0x18,
-    DW_FORM_flag_present = 0x19,
-    DW_FORM_ref_sig8 = 0x20,
-
-// DWARF 5.
-    DW_FORM_strx = 0x1a,
-    DW_FORM_addrx = 0x1b,
-    DW_FORM_ref_sup4 = 0x1c,
-    DW_FORM_strp_sup = 0x1d,
-    DW_FORM_data16 = 0x1e,
-    DW_FORM_line_strp = 0x1f,
-    DW_FORM_implicit_const = 0x21,
-    DW_FORM_loclistx = 0x22,
-    DW_FORM_rnglistx = 0x23,
-    DW_FORM_ref_sup8 = 0x24,
-    DW_FORM_strx1 = 0x25,
-    DW_FORM_strx2 = 0x26,
-    DW_FORM_strx3 = 0x27,
-    DW_FORM_strx4 = 0x28,
-    DW_FORM_addrx1 = 0x29,
-    DW_FORM_addrx2 = 0x2a,
-    DW_FORM_addrx3 = 0x2b,
-    DW_FORM_addrx4 = 0x2c,
-
-// Extensions for Fission proposal
-    DW_FORM_GNU_addr_index = 0x1f01,
-    DW_FORM_GNU_str_index = 0x1f02,
-
-// Alternate debug sections proposal (output of "dwz" tool).
-    DW_FORM_GNU_ref_alt = 0x1f20,
-    DW_FORM_GNU_strp_alt = 0x1f21
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_encoding` attribute.
-///
-/// See Section 7.8, Table 7.11.
-DwAte(u8) {
-    DW_ATE_address = 0x01,
-    DW_ATE_boolean = 0x02,
-    DW_ATE_complex_float = 0x03,
-    DW_ATE_float = 0x04,
-    DW_ATE_signed = 0x05,
-    DW_ATE_signed_char = 0x06,
-    DW_ATE_unsigned = 0x07,
-    DW_ATE_unsigned_char = 0x08,
-
-// DWARF 3.
-    DW_ATE_imaginary_float = 0x09,
-    DW_ATE_packed_decimal = 0x0a,
-    DW_ATE_numeric_string = 0x0b,
-    DW_ATE_edited = 0x0c,
-    DW_ATE_signed_fixed = 0x0d,
-    DW_ATE_unsigned_fixed = 0x0e,
-    DW_ATE_decimal_float = 0x0f ,
-
-// DWARF 4.
-    DW_ATE_UTF = 0x10,
-    DW_ATE_UCS = 0x11,
-    DW_ATE_ASCII = 0x12,
-
-    DW_ATE_lo_user = 0x80,
-    DW_ATE_hi_user = 0xff,
-});
-
-dw!(
-/// The encodings of the constants used in location list entries.
-///
-/// See Section 7.7.3, Table 7.10.
-DwLle(u8) {
-    DW_LLE_end_of_list = 0x00,
-    DW_LLE_base_addressx = 0x01,
-    DW_LLE_startx_endx = 0x02,
-    DW_LLE_startx_length = 0x03,
-    DW_LLE_offset_pair = 0x04,
-    DW_LLE_default_location = 0x05,
-    DW_LLE_base_address = 0x06,
-    DW_LLE_start_end = 0x07,
-    DW_LLE_start_length = 0x08,
-    DW_LLE_GNU_view_pair = 0x09,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_decimal_sign` attribute.
-///
-/// See Section 7.8, Table 7.12.
-DwDs(u8) {
-    DW_DS_unsigned = 0x01,
-    DW_DS_leading_overpunch = 0x02,
-    DW_DS_trailing_overpunch = 0x03,
-    DW_DS_leading_separate = 0x04,
-    DW_DS_trailing_separate = 0x05,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_endianity` attribute.
-///
-/// See Section 7.8, Table 7.13.
-DwEnd(u8) {
-    DW_END_default = 0x00,
-    DW_END_big = 0x01,
-    DW_END_little = 0x02,
-    DW_END_lo_user = 0x40,
-    DW_END_hi_user = 0xff,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_accessibility` attribute.
-///
-/// See Section 7.9, Table 7.14.
-DwAccess(u8) {
-    DW_ACCESS_public = 0x01,
-    DW_ACCESS_protected = 0x02,
-    DW_ACCESS_private = 0x03,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_visibility` attribute.
-///
-/// See Section 7.10, Table 7.15.
-DwVis(u8) {
-    DW_VIS_local = 0x01,
-    DW_VIS_exported = 0x02,
-    DW_VIS_qualified = 0x03,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_virtuality` attribute.
-///
-/// See Section 7.11, Table 7.16.
-DwVirtuality(u8) {
-    DW_VIRTUALITY_none = 0x00,
-    DW_VIRTUALITY_virtual = 0x01,
-    DW_VIRTUALITY_pure_virtual = 0x02,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_language` attribute.
-///
-/// See Section 7.12, Table 7.17.
-DwLang(u16) {
-    DW_LANG_C89 = 0x0001,
-    DW_LANG_C = 0x0002,
-    DW_LANG_Ada83 = 0x0003,
-    DW_LANG_C_plus_plus = 0x0004,
-    DW_LANG_Cobol74 = 0x0005,
-    DW_LANG_Cobol85 = 0x0006,
-    DW_LANG_Fortran77 = 0x0007,
-    DW_LANG_Fortran90 = 0x0008,
-    DW_LANG_Pascal83 = 0x0009,
-    DW_LANG_Modula2 = 0x000a,
-    DW_LANG_Java = 0x000b,
-    DW_LANG_C99 = 0x000c,
-    DW_LANG_Ada95 = 0x000d,
-    DW_LANG_Fortran95 = 0x000e,
-    DW_LANG_PLI = 0x000f,
-    DW_LANG_ObjC = 0x0010,
-    DW_LANG_ObjC_plus_plus = 0x0011,
-    DW_LANG_UPC = 0x0012,
-    DW_LANG_D = 0x0013,
-    DW_LANG_Python = 0x0014,
-    DW_LANG_OpenCL = 0x0015,
-    DW_LANG_Go = 0x0016,
-    DW_LANG_Modula3 = 0x0017,
-    DW_LANG_Haskell = 0x0018,
-    DW_LANG_C_plus_plus_03 = 0x0019,
-    DW_LANG_C_plus_plus_11 = 0x001a,
-    DW_LANG_OCaml = 0x001b,
-    DW_LANG_Rust = 0x001c,
-    DW_LANG_C11 = 0x001d,
-    DW_LANG_Swift = 0x001e,
-    DW_LANG_Julia = 0x001f,
-    DW_LANG_Dylan = 0x0020,
-    DW_LANG_C_plus_plus_14 = 0x0021,
-    DW_LANG_Fortran03 = 0x0022,
-    DW_LANG_Fortran08 = 0x0023,
-    DW_LANG_RenderScript = 0x0024,
-    DW_LANG_BLISS = 0x0025,
-
-    DW_LANG_lo_user = 0x8000,
-    DW_LANG_hi_user = 0xffff,
-
-    DW_LANG_Mips_Assembler = 0x8001,
-    DW_LANG_GOOGLE_RenderScript = 0x8e57,
-    DW_LANG_SUN_Assembler = 0x9001,
-    DW_LANG_ALTIUM_Assembler = 0x9101,
-    DW_LANG_BORLAND_Delphi = 0xb000,
-});
-
-impl DwLang {
-    /// Get the default DW_AT_lower_bound for this language.
-    pub fn default_lower_bound(self) -> Option<usize> {
-        match self {
-            DW_LANG_C89
-            | DW_LANG_C
-            | DW_LANG_C_plus_plus
-            | DW_LANG_Java
-            | DW_LANG_C99
-            | DW_LANG_ObjC
-            | DW_LANG_ObjC_plus_plus
-            | DW_LANG_UPC
-            | DW_LANG_D
-            | DW_LANG_Python
-            | DW_LANG_OpenCL
-            | DW_LANG_Go
-            | DW_LANG_Haskell
-            | DW_LANG_C_plus_plus_03
-            | DW_LANG_C_plus_plus_11
-            | DW_LANG_OCaml
-            | DW_LANG_Rust
-            | DW_LANG_C11
-            | DW_LANG_Swift
-            | DW_LANG_Dylan
-            | DW_LANG_C_plus_plus_14
-            | DW_LANG_RenderScript
-            | DW_LANG_BLISS => Some(0),
-            DW_LANG_Ada83 | DW_LANG_Cobol74 | DW_LANG_Cobol85 | DW_LANG_Fortran77
-            | DW_LANG_Fortran90 | DW_LANG_Pascal83 | DW_LANG_Modula2 | DW_LANG_Ada95
-            | DW_LANG_Fortran95 | DW_LANG_PLI | DW_LANG_Modula3 | DW_LANG_Julia
-            | DW_LANG_Fortran03 | DW_LANG_Fortran08 => Some(1),
-            _ => None,
-        }
-    }
-}
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_address_class` attribute.
-///
-/// There is only one value that is common to all target architectures.
-/// See Section 7.13.
-DwAddr(u64) {
-    DW_ADDR_none = 0x00,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_identifier_case` attribute.
-///
-/// See Section 7.14, Table 7.18.
-DwId(u8) {
-    DW_ID_case_sensitive = 0x00,
-    DW_ID_up_case = 0x01,
-    DW_ID_down_case = 0x02,
-    DW_ID_case_insensitive = 0x03,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_calling_convention` attribute.
-///
-/// See Section 7.15, Table 7.19.
-DwCc(u8) {
-    DW_CC_normal = 0x01,
-    DW_CC_program = 0x02,
-    DW_CC_nocall = 0x03,
-    DW_CC_pass_by_reference = 0x04,
-    DW_CC_pass_by_value = 0x05,
-    DW_CC_lo_user = 0x40,
-    DW_CC_hi_user = 0xff,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_inline` attribute.
-///
-/// See Section 7.16, Table 7.20.
-DwInl(u8) {
-    DW_INL_not_inlined = 0x00,
-    DW_INL_inlined = 0x01,
-    DW_INL_declared_not_inlined = 0x02,
-    DW_INL_declared_inlined = 0x03,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_ordering` attribute.
-///
-/// See Section 7.17, Table 7.17.
-DwOrd(u8) {
-    DW_ORD_row_major = 0x00,
-    DW_ORD_col_major = 0x01,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_discr_list` attribute.
-///
-/// See Section 7.18, Table 7.22.
-DwDsc(u8) {
-    DW_DSC_label = 0x00,
-    DW_DSC_range = 0x01,
-});
-
-dw!(
-/// Name index attribute encodings.
-///
-/// See Section 7.19, Table 7.23.
-DwIdx(u16) {
-    DW_IDX_compile_unit = 1,
-    DW_IDX_type_unit = 2,
-    DW_IDX_die_offset = 3,
-    DW_IDX_parent = 4,
-    DW_IDX_type_hash = 5,
-    DW_IDX_lo_user = 0x2000,
-    DW_IDX_hi_user = 0x3fff,
-});
-
-dw!(
-/// The encodings of the constants used in the `DW_AT_defaulted` attribute.
-///
-/// See Section 7.20, Table 7.24.
-DwDefaulted(u8) {
-    DW_DEFAULTED_no = 0x00,
-    DW_DEFAULTED_in_class = 0x01,
-    DW_DEFAULTED_out_of_class = 0x02,
-});
-
-dw!(
-/// The encodings for the standard opcodes for line number information.
-///
-/// See Section 7.22, Table 7.25.
-DwLns(u8) {
-    DW_LNS_copy = 0x01,
-    DW_LNS_advance_pc = 0x02,
-    DW_LNS_advance_line = 0x03,
-    DW_LNS_set_file = 0x04,
-    DW_LNS_set_column = 0x05,
-    DW_LNS_negate_stmt = 0x06,
-    DW_LNS_set_basic_block = 0x07,
-    DW_LNS_const_add_pc = 0x08,
-    DW_LNS_fixed_advance_pc = 0x09,
-    DW_LNS_set_prologue_end = 0x0a,
-    DW_LNS_set_epilogue_begin = 0x0b,
-    DW_LNS_set_isa = 0x0c,
-});
-
-dw!(
-/// The encodings for the extended opcodes for line number information.
-///
-/// See Section 7.22, Table 7.26.
-DwLne(u8) {
-    DW_LNE_end_sequence = 0x01,
-    DW_LNE_set_address = 0x02,
-    DW_LNE_define_file = 0x03,
-    DW_LNE_set_discriminator = 0x04,
-
-    DW_LNE_lo_user = 0x80,
-    DW_LNE_hi_user = 0xff,
-});
-
-dw!(
-/// The encodings for the line number header entry formats.
-///
-/// See Section 7.22, Table 7.27.
-DwLnct(u16) {
-    DW_LNCT_path = 0x1,
-    DW_LNCT_directory_index = 0x2,
-    DW_LNCT_timestamp = 0x3,
-    DW_LNCT_size = 0x4,
-    DW_LNCT_MD5 = 0x5,
-    DW_LNCT_lo_user = 0x2000,
-    DW_LNCT_hi_user = 0x3fff,
-});
-
-dw!(
-/// The encodings for macro information entry types.
-///
-/// See Section 7.23, Table 7.28.
-DwMacro(u8) {
-    DW_MACRO_define = 0x01,
-    DW_MACRO_undef = 0x02,
-    DW_MACRO_start_file = 0x03,
-    DW_MACRO_end_file = 0x04,
-    DW_MACRO_define_strp = 0x05,
-    DW_MACRO_undef_strp = 0x06,
-    DW_MACRO_import = 0x07,
-    DW_MACRO_define_sup = 0x08,
-    DW_MACRO_undef_sup = 0x09,
-    DW_MACRO_import_sup = 0x0a,
-    DW_MACRO_define_strx = 0x0b,
-    DW_MACRO_undef_strx = 0x0c,
-    DW_MACRO_lo_user = 0xe0,
-    DW_MACRO_hi_user = 0xff,
-});
-
-dw!(
-/// Range list entry encoding values.
-///
-/// See Section 7.25, Table 7.30.
-DwRle(u8) {
-    DW_RLE_end_of_list = 0x00,
-    DW_RLE_base_addressx = 0x01,
-    DW_RLE_startx_endx = 0x02,
-    DW_RLE_startx_length = 0x03,
-    DW_RLE_offset_pair = 0x04,
-    DW_RLE_base_address = 0x05,
-    DW_RLE_start_end = 0x06,
-    DW_RLE_start_length = 0x07,
-});
-
-dw!(
-/// The encodings for DWARF expression operations.
-///
-/// See Section 7.7.1, Table 7.9.
-DwOp(u8) {
-    DW_OP_addr = 0x03,
-    DW_OP_deref = 0x06,
-    DW_OP_const1u = 0x08,
-    DW_OP_const1s = 0x09,
-    DW_OP_const2u = 0x0a,
-    DW_OP_const2s = 0x0b,
-    DW_OP_const4u = 0x0c,
-    DW_OP_const4s = 0x0d,
-    DW_OP_const8u = 0x0e,
-    DW_OP_const8s = 0x0f,
-    DW_OP_constu = 0x10,
-    DW_OP_consts = 0x11,
-    DW_OP_dup = 0x12,
-    DW_OP_drop = 0x13,
-    DW_OP_over = 0x14,
-    DW_OP_pick = 0x15,
-    DW_OP_swap = 0x16,
-    DW_OP_rot = 0x17,
-    DW_OP_xderef = 0x18,
-    DW_OP_abs = 0x19,
-    DW_OP_and = 0x1a,
-    DW_OP_div = 0x1b,
-    DW_OP_minus = 0x1c,
-    DW_OP_mod = 0x1d,
-    DW_OP_mul = 0x1e,
-    DW_OP_neg = 0x1f,
-    DW_OP_not = 0x20,
-    DW_OP_or = 0x21,
-    DW_OP_plus = 0x22,
-    DW_OP_plus_uconst = 0x23,
-    DW_OP_shl = 0x24,
-    DW_OP_shr = 0x25,
-    DW_OP_shra = 0x26,
-    DW_OP_xor = 0x27,
-    DW_OP_bra = 0x28,
-    DW_OP_eq = 0x29,
-    DW_OP_ge = 0x2a,
-    DW_OP_gt = 0x2b,
-    DW_OP_le = 0x2c,
-    DW_OP_lt = 0x2d,
-    DW_OP_ne = 0x2e,
-    DW_OP_skip = 0x2f,
-    DW_OP_lit0 = 0x30,
-    DW_OP_lit1 = 0x31,
-    DW_OP_lit2 = 0x32,
-    DW_OP_lit3 = 0x33,
-    DW_OP_lit4 = 0x34,
-    DW_OP_lit5 = 0x35,
-    DW_OP_lit6 = 0x36,
-    DW_OP_lit7 = 0x37,
-    DW_OP_lit8 = 0x38,
-    DW_OP_lit9 = 0x39,
-    DW_OP_lit10 = 0x3a,
-    DW_OP_lit11 = 0x3b,
-    DW_OP_lit12 = 0x3c,
-    DW_OP_lit13 = 0x3d,
-    DW_OP_lit14 = 0x3e,
-    DW_OP_lit15 = 0x3f,
-    DW_OP_lit16 = 0x40,
-    DW_OP_lit17 = 0x41,
-    DW_OP_lit18 = 0x42,
-    DW_OP_lit19 = 0x43,
-    DW_OP_lit20 = 0x44,
-    DW_OP_lit21 = 0x45,
-    DW_OP_lit22 = 0x46,
-    DW_OP_lit23 = 0x47,
-    DW_OP_lit24 = 0x48,
-    DW_OP_lit25 = 0x49,
-    DW_OP_lit26 = 0x4a,
-    DW_OP_lit27 = 0x4b,
-    DW_OP_lit28 = 0x4c,
-    DW_OP_lit29 = 0x4d,
-    DW_OP_lit30 = 0x4e,
-    DW_OP_lit31 = 0x4f,
-    DW_OP_reg0 = 0x50,
-    DW_OP_reg1 = 0x51,
-    DW_OP_reg2 = 0x52,
-    DW_OP_reg3 = 0x53,
-    DW_OP_reg4 = 0x54,
-    DW_OP_reg5 = 0x55,
-    DW_OP_reg6 = 0x56,
-    DW_OP_reg7 = 0x57,
-    DW_OP_reg8 = 0x58,
-    DW_OP_reg9 = 0x59,
-    DW_OP_reg10 = 0x5a,
-    DW_OP_reg11 = 0x5b,
-    DW_OP_reg12 = 0x5c,
-    DW_OP_reg13 = 0x5d,
-    DW_OP_reg14 = 0x5e,
-    DW_OP_reg15 = 0x5f,
-    DW_OP_reg16 = 0x60,
-    DW_OP_reg17 = 0x61,
-    DW_OP_reg18 = 0x62,
-    DW_OP_reg19 = 0x63,
-    DW_OP_reg20 = 0x64,
-    DW_OP_reg21 = 0x65,
-    DW_OP_reg22 = 0x66,
-    DW_OP_reg23 = 0x67,
-    DW_OP_reg24 = 0x68,
-    DW_OP_reg25 = 0x69,
-    DW_OP_reg26 = 0x6a,
-    DW_OP_reg27 = 0x6b,
-    DW_OP_reg28 = 0x6c,
-    DW_OP_reg29 = 0x6d,
-    DW_OP_reg30 = 0x6e,
-    DW_OP_reg31 = 0x6f,
-    DW_OP_breg0 = 0x70,
-    DW_OP_breg1 = 0x71,
-    DW_OP_breg2 = 0x72,
-    DW_OP_breg3 = 0x73,
-    DW_OP_breg4 = 0x74,
-    DW_OP_breg5 = 0x75,
-    DW_OP_breg6 = 0x76,
-    DW_OP_breg7 = 0x77,
-    DW_OP_breg8 = 0x78,
-    DW_OP_breg9 = 0x79,
-    DW_OP_breg10 = 0x7a,
-    DW_OP_breg11 = 0x7b,
-    DW_OP_breg12 = 0x7c,
-    DW_OP_breg13 = 0x7d,
-    DW_OP_breg14 = 0x7e,
-    DW_OP_breg15 = 0x7f,
-    DW_OP_breg16 = 0x80,
-    DW_OP_breg17 = 0x81,
-    DW_OP_breg18 = 0x82,
-    DW_OP_breg19 = 0x83,
-    DW_OP_breg20 = 0x84,
-    DW_OP_breg21 = 0x85,
-    DW_OP_breg22 = 0x86,
-    DW_OP_breg23 = 0x87,
-    DW_OP_breg24 = 0x88,
-    DW_OP_breg25 = 0x89,
-    DW_OP_breg26 = 0x8a,
-    DW_OP_breg27 = 0x8b,
-    DW_OP_breg28 = 0x8c,
-    DW_OP_breg29 = 0x8d,
-    DW_OP_breg30 = 0x8e,
-    DW_OP_breg31 = 0x8f,
-    DW_OP_regx = 0x90,
-    DW_OP_fbreg = 0x91,
-    DW_OP_bregx = 0x92,
-    DW_OP_piece = 0x93,
-    DW_OP_deref_size = 0x94,
-    DW_OP_xderef_size = 0x95,
-    DW_OP_nop = 0x96,
-    DW_OP_push_object_address = 0x97,
-    DW_OP_call2 = 0x98,
-    DW_OP_call4 = 0x99,
-    DW_OP_call_ref = 0x9a,
-    DW_OP_form_tls_address = 0x9b,
-    DW_OP_call_frame_cfa = 0x9c,
-    DW_OP_bit_piece = 0x9d,
-    DW_OP_implicit_value = 0x9e,
-    DW_OP_stack_value = 0x9f,
-    DW_OP_implicit_pointer = 0xa0,
-    DW_OP_addrx = 0xa1,
-    DW_OP_constx = 0xa2,
-    DW_OP_entry_value = 0xa3,
-    DW_OP_const_type = 0xa4,
-    DW_OP_regval_type = 0xa5,
-    DW_OP_deref_type = 0xa6,
-    DW_OP_xderef_type = 0xa7,
-    DW_OP_convert = 0xa8,
-    DW_OP_reinterpret = 0xa9,
-
-// GNU extensions
-    DW_OP_GNU_push_tls_address = 0xe0,
-    DW_OP_GNU_implicit_pointer = 0xf2,
-    DW_OP_GNU_entry_value = 0xf3,
-    DW_OP_GNU_const_type = 0xf4,
-    DW_OP_GNU_regval_type = 0xf5,
-    DW_OP_GNU_deref_type = 0xf6,
-    DW_OP_GNU_convert = 0xf7,
-    DW_OP_GNU_reinterpret = 0xf9,
-    DW_OP_GNU_parameter_ref = 0xfa,
-    DW_OP_GNU_addr_index = 0xfb,
-    DW_OP_GNU_const_index = 0xfc,
-});
-
-dw!(
-/// Pointer encoding used by `.eh_frame`.
-///
-/// The four lower bits describe the
-/// format of the pointer, the upper four bits describe how the encoding should
-/// be applied.
-///
-/// Defined in http://refspecs.linux-foundation.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/dwarfext.html
-DwEhPe(u8) {
-// Format of pointer encoding.
-
-// "Unsigned value is encoded using the Little Endian Base 128"
-    DW_EH_PE_uleb128 = 0x1,
-// "A 2 bytes unsigned value."
-    DW_EH_PE_udata2 = 0x2,
-// "A 4 bytes unsigned value."
-    DW_EH_PE_udata4 = 0x3,
-// "An 8 bytes unsigned value."
-    DW_EH_PE_udata8 = 0x4,
-// "Signed value is encoded using the Little Endian Base 128"
-    DW_EH_PE_sleb128 = 0x9,
-// "A 2 bytes signed value."
-    DW_EH_PE_sdata2 = 0x0a,
-// "A 4 bytes signed value."
-    DW_EH_PE_sdata4 = 0x0b,
-// "An 8 bytes signed value."
-    DW_EH_PE_sdata8 = 0x0c,
-
-// How the pointer encoding should be applied.
-
-// `DW_EH_PE_pcrel` pointers are relative to their own location.
-    DW_EH_PE_pcrel = 0x10,
-// "Value is relative to the beginning of the .text section."
-    DW_EH_PE_textrel = 0x20,
-// "Value is relative to the beginning of the .got or .eh_frame_hdr section."
-    DW_EH_PE_datarel = 0x30,
-// "Value is relative to the beginning of the function."
-    DW_EH_PE_funcrel = 0x40,
-// "Value is aligned to an address unit sized boundary."
-    DW_EH_PE_aligned = 0x50,
-
-// This bit can be set for any of the above encoding applications. When set,
-// the encoded value is the address of the real pointer result, not the
-// pointer result itself.
-//
-// This isn't defined in the DWARF or the `.eh_frame` standards, but is
-// generated by both GNU/Linux and OSX tooling.
-    DW_EH_PE_indirect = 0x80,
-
-// These constants apply to both the lower and upper bits.
-
-// "The Value is a literal pointer whose size is determined by the
-// architecture."
-    DW_EH_PE_absptr = 0x0,
-// The absence of a pointer and encoding.
-    DW_EH_PE_omit = 0xff,
-});
-
-const DW_EH_PE_FORMAT_MASK: u8 = 0b0000_1111;
-
-// Ignores indirection bit.
-const DW_EH_PE_APPLICATION_MASK: u8 = 0b0111_0000;
-
-impl DwEhPe {
-    /// Get the pointer encoding's format.
-    #[inline]
-    pub fn format(self) -> DwEhPe {
-        DwEhPe(self.0 & DW_EH_PE_FORMAT_MASK)
-    }
-
-    /// Get the pointer encoding's application.
-    #[inline]
-    pub fn application(self) -> DwEhPe {
-        DwEhPe(self.0 & DW_EH_PE_APPLICATION_MASK)
-    }
-
-    /// Is this encoding the absent pointer encoding?
-    #[inline]
-    pub fn is_absent(self) -> bool {
-        self == DW_EH_PE_omit
-    }
-
-    /// Is this coding indirect? If so, its encoded value is the address of the
-    /// real pointer result, not the pointer result itself.
-    #[inline]
-    pub fn is_indirect(self) -> bool {
-        self.0 & DW_EH_PE_indirect.0 != 0
-    }
-
-    /// Is this a known, valid pointer encoding?
-    pub fn is_valid_encoding(self) -> bool {
-        if self.is_absent() {
-            return true;
-        }
-
-        match self.format() {
-            DW_EH_PE_absptr | DW_EH_PE_uleb128 | DW_EH_PE_udata2 | DW_EH_PE_udata4
-            | DW_EH_PE_udata8 | DW_EH_PE_sleb128 | DW_EH_PE_sdata2 | DW_EH_PE_sdata4
-            | DW_EH_PE_sdata8 => {}
-            _ => return false,
-        }
-
-        match self.application() {
-            DW_EH_PE_absptr | DW_EH_PE_pcrel | DW_EH_PE_textrel | DW_EH_PE_datarel
-            | DW_EH_PE_funcrel | DW_EH_PE_aligned => {}
-            _ => return false,
-        }
-
-        true
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_dw_eh_pe_format() {
-        let encoding = DwEhPe(DW_EH_PE_pcrel.0 | DW_EH_PE_uleb128.0);
-        assert_eq!(encoding.format(), DW_EH_PE_uleb128);
-    }
-
-    #[test]
-    fn test_dw_eh_pe_application() {
-        let encoding = DwEhPe(DW_EH_PE_pcrel.0 | DW_EH_PE_uleb128.0);
-        assert_eq!(encoding.application(), DW_EH_PE_pcrel);
-    }
-
-    #[test]
-    fn test_dw_eh_pe_is_absent() {
-        assert_eq!(DW_EH_PE_absptr.is_absent(), false);
-        assert_eq!(DW_EH_PE_omit.is_absent(), true);
-    }
-
-    #[test]
-    fn test_dw_eh_pe_is_valid_encoding_ok() {
-        let encoding = DwEhPe(DW_EH_PE_uleb128.0 | DW_EH_PE_pcrel.0);
-        assert!(encoding.is_valid_encoding());
-        assert!(DW_EH_PE_absptr.is_valid_encoding());
-        assert!(DW_EH_PE_omit.is_valid_encoding());
-    }
-
-    #[test]
-    fn test_dw_eh_pe_is_valid_encoding_bad_format() {
-        let encoding = DwEhPe((DW_EH_PE_sdata8.0 + 1) | DW_EH_PE_pcrel.0);
-        assert_eq!(encoding.is_valid_encoding(), false);
-    }
-
-    #[test]
-    fn test_dw_eh_pe_is_valid_encoding_bad_application() {
-        let encoding = DwEhPe(DW_EH_PE_sdata8.0 | (DW_EH_PE_aligned.0 + 1));
-        assert_eq!(encoding.is_valid_encoding(), false);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/endianity.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/endianity.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/endianity.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/endianity.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,256 +0,0 @@
-//! Types for compile-time and run-time endianity.
-
-use core::convert::TryInto;
-use core::fmt::Debug;
-
-/// A trait describing the endianity of some buffer.
-pub trait Endianity: Debug + Default + Clone + Copy + PartialEq + Eq {
-    /// Return true for big endian byte order.
-    fn is_big_endian(self) -> bool;
-
-    /// Return true for little endian byte order.
-    #[inline]
-    fn is_little_endian(self) -> bool {
-        !self.is_big_endian()
-    }
-
-    /// Reads an unsigned 16 bit integer from `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 2`.
-    #[inline]
-    fn read_u16(self, buf: &[u8]) -> u16 {
-        let bytes: &[u8; 2] = buf[..2].try_into().unwrap();
-        if self.is_big_endian() {
-            u16::from_be_bytes(*bytes)
-        } else {
-            u16::from_le_bytes(*bytes)
-        }
-    }
-
-    /// Reads an unsigned 32 bit integer from `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 4`.
-    #[inline]
-    fn read_u32(self, buf: &[u8]) -> u32 {
-        let bytes: &[u8; 4] = buf[..4].try_into().unwrap();
-        if self.is_big_endian() {
-            u32::from_be_bytes(*bytes)
-        } else {
-            u32::from_le_bytes(*bytes)
-        }
-    }
-
-    /// Reads an unsigned 64 bit integer from `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn read_u64(self, buf: &[u8]) -> u64 {
-        let bytes: &[u8; 8] = buf[..8].try_into().unwrap();
-        if self.is_big_endian() {
-            u64::from_be_bytes(*bytes)
-        } else {
-            u64::from_le_bytes(*bytes)
-        }
-    }
-
-    /// Read an unsigned n-bytes integer u64.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 1` or `buf.len() > 8`.
-    #[inline]
-    fn read_uint(&mut self, buf: &[u8]) -> u64 {
-        let mut tmp = [0; 8];
-        if self.is_big_endian() {
-            tmp[8 - buf.len()..].copy_from_slice(buf);
-        } else {
-            tmp[..buf.len()].copy_from_slice(buf);
-        }
-        self.read_u64(&tmp)
-    }
-
-    /// Reads a signed 16 bit integer from `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 2`.
-    #[inline]
-    fn read_i16(self, buf: &[u8]) -> i16 {
-        self.read_u16(buf) as i16
-    }
-
-    /// Reads a signed 32 bit integer from `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 4`.
-    #[inline]
-    fn read_i32(self, buf: &[u8]) -> i32 {
-        self.read_u32(buf) as i32
-    }
-
-    /// Reads a signed 64 bit integer from `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn read_i64(self, buf: &[u8]) -> i64 {
-        self.read_u64(buf) as i64
-    }
-
-    /// Reads a 32 bit floating point number from `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn read_f32(self, buf: &[u8]) -> f32 {
-        f32::from_bits(self.read_u32(buf))
-    }
-
-    /// Reads a 32 bit floating point number from `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn read_f64(self, buf: &[u8]) -> f64 {
-        f64::from_bits(self.read_u64(buf))
-    }
-
-    /// Writes an unsigned 16 bit integer `n` to `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 2`.
-    #[inline]
-    fn write_u16(self, buf: &mut [u8], n: u16) {
-        let bytes = if self.is_big_endian() {
-            n.to_be_bytes()
-        } else {
-            n.to_le_bytes()
-        };
-        buf[..2].copy_from_slice(&bytes);
-    }
-
-    /// Writes an unsigned 32 bit integer `n` to `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 4`.
-    #[inline]
-    fn write_u32(self, buf: &mut [u8], n: u32) {
-        let bytes = if self.is_big_endian() {
-            n.to_be_bytes()
-        } else {
-            n.to_le_bytes()
-        };
-        buf[..4].copy_from_slice(&bytes);
-    }
-
-    /// Writes an unsigned 64 bit integer `n` to `buf`.
-    ///
-    /// # Panics
-    ///
-    /// Panics when `buf.len() < 8`.
-    #[inline]
-    fn write_u64(self, buf: &mut [u8], n: u64) {
-        let bytes = if self.is_big_endian() {
-            n.to_be_bytes()
-        } else {
-            n.to_le_bytes()
-        };
-        buf[..8].copy_from_slice(&bytes);
-    }
-}
-
-/// Byte order that is selectable at runtime.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum RunTimeEndian {
-    /// Little endian byte order.
-    Little,
-    /// Big endian byte order.
-    Big,
-}
-
-impl Default for RunTimeEndian {
-    #[cfg(target_endian = "little")]
-    #[inline]
-    fn default() -> RunTimeEndian {
-        RunTimeEndian::Little
-    }
-
-    #[cfg(target_endian = "big")]
-    #[inline]
-    fn default() -> RunTimeEndian {
-        RunTimeEndian::Big
-    }
-}
-
-impl Endianity for RunTimeEndian {
-    #[inline]
-    fn is_big_endian(self) -> bool {
-        self != RunTimeEndian::Little
-    }
-}
-
-/// Little endian byte order.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LittleEndian;
-
-impl Default for LittleEndian {
-    #[inline]
-    fn default() -> LittleEndian {
-        LittleEndian
-    }
-}
-
-impl Endianity for LittleEndian {
-    #[inline]
-    fn is_big_endian(self) -> bool {
-        false
-    }
-}
-
-/// Big endian byte order.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct BigEndian;
-
-impl Default for BigEndian {
-    #[inline]
-    fn default() -> BigEndian {
-        BigEndian
-    }
-}
-
-impl Endianity for BigEndian {
-    #[inline]
-    fn is_big_endian(self) -> bool {
-        true
-    }
-}
-
-/// The native endianity for the target platform.
-#[cfg(target_endian = "little")]
-pub type NativeEndian = LittleEndian;
-
-#[cfg(target_endian = "little")]
-#[allow(non_upper_case_globals)]
-#[doc(hidden)]
-pub const NativeEndian: LittleEndian = LittleEndian;
-
-/// The native endianity for the target platform.
-#[cfg(target_endian = "big")]
-pub type NativeEndian = BigEndian;
-
-#[cfg(target_endian = "big")]
-#[allow(non_upper_case_globals)]
-#[doc(hidden)]
-pub const NativeEndian: BigEndian = BigEndian;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/leb128.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/leb128.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/leb128.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/leb128.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,602 +0,0 @@
-//! Read and write DWARF's "Little Endian Base 128" (LEB128) variable length
-//! integer encoding.
-//!
-//! The implementation is a direct translation of the psuedocode in the DWARF 4
-//! standard's appendix C.
-//!
-//! Read and write signed integers:
-//!
-//! ```
-//! # #[cfg(all(feature = "read", feature = "write"))] {
-//! use gimli::{EndianSlice, NativeEndian, leb128};
-//!
-//! let mut buf = [0; 1024];
-//!
-//! // Write to anything that implements `std::io::Write`.
-//! {
-//!     let mut writable = &mut buf[..];
-//!     leb128::write::signed(&mut writable, -12345).expect("Should write number");
-//! }
-//!
-//! // Read from anything that implements `gimli::Reader`.
-//! let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-//! let val = leb128::read::signed(&mut readable).expect("Should read number");
-//! assert_eq!(val, -12345);
-//! # }
-//! ```
-//!
-//! Or read and write unsigned integers:
-//!
-//! ```
-//! # #[cfg(all(feature = "read", feature = "write"))] {
-//! use gimli::{EndianSlice, NativeEndian, leb128};
-//!
-//! let mut buf = [0; 1024];
-//!
-//! {
-//!     let mut writable = &mut buf[..];
-//!     leb128::write::unsigned(&mut writable, 98765).expect("Should write number");
-//! }
-//!
-//! let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-//! let val = leb128::read::unsigned(&mut readable).expect("Should read number");
-//! assert_eq!(val, 98765);
-//! # }
-//! ```
-
-const CONTINUATION_BIT: u8 = 1 << 7;
-#[cfg(feature = "read")]
-const SIGN_BIT: u8 = 1 << 6;
-
-#[inline]
-fn low_bits_of_byte(byte: u8) -> u8 {
-    byte & !CONTINUATION_BIT
-}
-
-#[inline]
-#[allow(dead_code)]
-fn low_bits_of_u64(val: u64) -> u8 {
-    let byte = val & u64::from(core::u8::MAX);
-    low_bits_of_byte(byte as u8)
-}
-
-/// A module for reading signed and unsigned integers that have been LEB128
-/// encoded.
-#[cfg(feature = "read")]
-pub mod read {
-    use super::{low_bits_of_byte, CONTINUATION_BIT, SIGN_BIT};
-    use crate::read::{Error, Reader, Result};
-
-    /// Read an unsigned LEB128 number from the given `Reader` and
-    /// return it or an error if reading failed.
-    pub fn unsigned<R: Reader>(r: &mut R) -> Result<u64> {
-        let mut result = 0;
-        let mut shift = 0;
-
-        loop {
-            let byte = r.read_u8()?;
-            if shift == 63 && byte != 0x00 && byte != 0x01 {
-                return Err(Error::BadUnsignedLeb128);
-            }
-
-            let low_bits = u64::from(low_bits_of_byte(byte));
-            result |= low_bits << shift;
-
-            if byte & CONTINUATION_BIT == 0 {
-                return Ok(result);
-            }
-
-            shift += 7;
-        }
-    }
-
-    /// Read an LEB128 u16 from the given `Reader` and
-    /// return it or an error if reading failed.
-    pub fn u16<R: Reader>(r: &mut R) -> Result<u16> {
-        let byte = r.read_u8()?;
-        let mut result = u16::from(low_bits_of_byte(byte));
-        if byte & CONTINUATION_BIT == 0 {
-            return Ok(result);
-        }
-
-        let byte = r.read_u8()?;
-        result |= u16::from(low_bits_of_byte(byte)) << 7;
-        if byte & CONTINUATION_BIT == 0 {
-            return Ok(result);
-        }
-
-        let byte = r.read_u8()?;
-        if byte > 0x03 {
-            return Err(Error::BadUnsignedLeb128);
-        }
-        result += u16::from(byte) << 14;
-        Ok(result)
-    }
-
-    /// Read a signed LEB128 number from the given `Reader` and
-    /// return it or an error if reading failed.
-    pub fn signed<R: Reader>(r: &mut R) -> Result<i64> {
-        let mut result = 0;
-        let mut shift = 0;
-        let size = 64;
-        let mut byte;
-
-        loop {
-            byte = r.read_u8()?;
-            if shift == 63 && byte != 0x00 && byte != 0x7f {
-                return Err(Error::BadSignedLeb128);
-            }
-
-            let low_bits = i64::from(low_bits_of_byte(byte));
-            result |= low_bits << shift;
-            shift += 7;
-
-            if byte & CONTINUATION_BIT == 0 {
-                break;
-            }
-        }
-
-        if shift < size && (SIGN_BIT & byte) == SIGN_BIT {
-            // Sign extend the result.
-            result |= !0 << shift;
-        }
-
-        Ok(result)
-    }
-}
-
-/// A module for writing integers encoded as LEB128.
-#[cfg(feature = "write")]
-pub mod write {
-    use super::{low_bits_of_u64, CONTINUATION_BIT};
-    use std::io;
-
-    /// Write the given unsigned number using the LEB128 encoding to the given
-    /// `std::io::Write`able. Returns the number of bytes written to `w`, or an
-    /// error if writing failed.
-    pub fn unsigned<W>(w: &mut W, mut val: u64) -> Result<usize, io::Error>
-    where
-        W: io::Write,
-    {
-        let mut bytes_written = 0;
-        loop {
-            let mut byte = low_bits_of_u64(val);
-            val >>= 7;
-            if val != 0 {
-                // More bytes to come, so set the continuation bit.
-                byte |= CONTINUATION_BIT;
-            }
-
-            let buf = [byte];
-            w.write_all(&buf)?;
-            bytes_written += 1;
-
-            if val == 0 {
-                return Ok(bytes_written);
-            }
-        }
-    }
-
-    /// Return the size of the LEB128 encoding of the given unsigned number.
-    pub fn uleb128_size(mut val: u64) -> usize {
-        let mut size = 0;
-        loop {
-            val >>= 7;
-            size += 1;
-            if val == 0 {
-                return size;
-            }
-        }
-    }
-
-    /// Write the given signed number using the LEB128 encoding to the given
-    /// `std::io::Write`able. Returns the number of bytes written to `w`, or an
-    /// error if writing failed.
-    pub fn signed<W>(w: &mut W, mut val: i64) -> Result<usize, io::Error>
-    where
-        W: io::Write,
-    {
-        let mut bytes_written = 0;
-        loop {
-            let mut byte = val as u8;
-            // Keep the sign bit for testing
-            val >>= 6;
-            let done = val == 0 || val == -1;
-            if done {
-                byte &= !CONTINUATION_BIT;
-            } else {
-                // Remove the sign bit
-                val >>= 1;
-                // More bytes to come, so set the continuation bit.
-                byte |= CONTINUATION_BIT;
-            }
-
-            let buf = [byte];
-            w.write_all(&buf)?;
-            bytes_written += 1;
-
-            if done {
-                return Ok(bytes_written);
-            }
-        }
-    }
-
-    /// Return the size of the LEB128 encoding of the given signed number.
-    pub fn sleb128_size(mut val: i64) -> usize {
-        let mut size = 0;
-        loop {
-            val >>= 6;
-            let done = val == 0 || val == -1;
-            val >>= 1;
-            size += 1;
-            if done {
-                return size;
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-#[cfg(all(feature = "read", feature = "write"))]
-mod tests {
-    use super::{low_bits_of_byte, low_bits_of_u64, read, write, CONTINUATION_BIT};
-    use crate::endianity::NativeEndian;
-    use crate::read::{EndianSlice, Error, ReaderOffsetId};
-
-    trait ResultExt {
-        fn map_eof(self, input: &[u8]) -> Self;
-    }
-
-    impl<T> ResultExt for Result<T, Error> {
-        fn map_eof(self, input: &[u8]) -> Self {
-            match self {
-                Err(Error::UnexpectedEof(id)) => {
-                    let id = ReaderOffsetId(id.0 - input.as_ptr() as u64);
-                    Err(Error::UnexpectedEof(id))
-                }
-                r => r,
-            }
-        }
-    }
-
-    #[test]
-    fn test_low_bits_of_byte() {
-        for i in 0..127 {
-            assert_eq!(i, low_bits_of_byte(i));
-            assert_eq!(i, low_bits_of_byte(i | CONTINUATION_BIT));
-        }
-    }
-
-    #[test]
-    fn test_low_bits_of_u64() {
-        for i in 0u64..127 {
-            assert_eq!(i as u8, low_bits_of_u64(1 << 16 | i));
-            assert_eq!(
-                i as u8,
-                low_bits_of_u64(i << 16 | i | (u64::from(CONTINUATION_BIT)))
-            );
-        }
-    }
-
-    // Examples from the DWARF 4 standard, section 7.6, figure 22.
-    #[test]
-    fn test_read_unsigned() {
-        let buf = [2u8];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            2,
-            read::unsigned(&mut readable).expect("Should read number")
-        );
-
-        let buf = [127u8];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            127,
-            read::unsigned(&mut readable).expect("Should read number")
-        );
-
-        let buf = [CONTINUATION_BIT, 1];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            128,
-            read::unsigned(&mut readable).expect("Should read number")
-        );
-
-        let buf = [1u8 | CONTINUATION_BIT, 1];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            129,
-            read::unsigned(&mut readable).expect("Should read number")
-        );
-
-        let buf = [2u8 | CONTINUATION_BIT, 1];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            130,
-            read::unsigned(&mut readable).expect("Should read number")
-        );
-
-        let buf = [57u8 | CONTINUATION_BIT, 100];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            12857,
-            read::unsigned(&mut readable).expect("Should read number")
-        );
-    }
-
-    // Examples from the DWARF 4 standard, section 7.6, figure 23.
-    #[test]
-    fn test_read_signed() {
-        let buf = [2u8];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(2, read::signed(&mut readable).expect("Should read number"));
-
-        let buf = [0x7eu8];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(-2, read::signed(&mut readable).expect("Should read number"));
-
-        let buf = [127u8 | CONTINUATION_BIT, 0];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            127,
-            read::signed(&mut readable).expect("Should read number")
-        );
-
-        let buf = [1u8 | CONTINUATION_BIT, 0x7f];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            -127,
-            read::signed(&mut readable).expect("Should read number")
-        );
-
-        let buf = [CONTINUATION_BIT, 1];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            128,
-            read::signed(&mut readable).expect("Should read number")
-        );
-
-        let buf = [CONTINUATION_BIT, 0x7f];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            -128,
-            read::signed(&mut readable).expect("Should read number")
-        );
-
-        let buf = [1u8 | CONTINUATION_BIT, 1];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            129,
-            read::signed(&mut readable).expect("Should read number")
-        );
-
-        let buf = [0x7fu8 | CONTINUATION_BIT, 0x7e];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            -129,
-            read::signed(&mut readable).expect("Should read number")
-        );
-    }
-
-    #[test]
-    fn test_read_signed_63_bits() {
-        let buf = [
-            CONTINUATION_BIT,
-            CONTINUATION_BIT,
-            CONTINUATION_BIT,
-            CONTINUATION_BIT,
-            CONTINUATION_BIT,
-            CONTINUATION_BIT,
-            CONTINUATION_BIT,
-            CONTINUATION_BIT,
-            0x40,
-        ];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            -0x4000_0000_0000_0000,
-            read::signed(&mut readable).expect("Should read number")
-        );
-    }
-
-    #[test]
-    fn test_read_unsigned_not_enough_data() {
-        let buf = [CONTINUATION_BIT];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            read::unsigned(&mut readable).map_eof(&buf),
-            Err(Error::UnexpectedEof(ReaderOffsetId(1)))
-        );
-    }
-
-    #[test]
-    fn test_read_signed_not_enough_data() {
-        let buf = [CONTINUATION_BIT];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            read::signed(&mut readable).map_eof(&buf),
-            Err(Error::UnexpectedEof(ReaderOffsetId(1)))
-        );
-    }
-
-    #[test]
-    fn test_write_unsigned_not_enough_space() {
-        let mut buf = [0; 1];
-        let mut writable = &mut buf[..];
-        match write::unsigned(&mut writable, 128) {
-            Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::WriteZero),
-            otherwise => panic!("Unexpected: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_write_signed_not_enough_space() {
-        let mut buf = [0; 1];
-        let mut writable = &mut buf[..];
-        match write::signed(&mut writable, 128) {
-            Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::WriteZero),
-            otherwise => panic!("Unexpected: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn dogfood_signed() {
-        fn inner(i: i64) {
-            let mut buf = [0u8; 1024];
-
-            {
-                let mut writable = &mut buf[..];
-                write::signed(&mut writable, i).expect("Should write signed number");
-            }
-
-            let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-            let result = read::signed(&mut readable).expect("Should be able to read it back again");
-            assert_eq!(i, result);
-        }
-        for i in -513..513 {
-            inner(i);
-        }
-        inner(core::i64::MIN);
-    }
-
-    #[test]
-    fn dogfood_unsigned() {
-        for i in 0..1025 {
-            let mut buf = [0u8; 1024];
-
-            {
-                let mut writable = &mut buf[..];
-                write::unsigned(&mut writable, i).expect("Should write signed number");
-            }
-
-            let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-            let result =
-                read::unsigned(&mut readable).expect("Should be able to read it back again");
-            assert_eq!(i, result);
-        }
-    }
-
-    #[test]
-    fn test_read_unsigned_overflow() {
-        let buf = [
-            2u8 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            1,
-        ];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert!(read::unsigned(&mut readable).is_err());
-    }
-
-    #[test]
-    fn test_read_signed_overflow() {
-        let buf = [
-            2u8 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            2 | CONTINUATION_BIT,
-            1,
-        ];
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert!(read::signed(&mut readable).is_err());
-    }
-
-    #[test]
-    fn test_read_multiple() {
-        let buf = [2u8 | CONTINUATION_BIT, 1u8, 1u8];
-
-        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
-        assert_eq!(
-            read::unsigned(&mut readable).expect("Should read first number"),
-            130u64
-        );
-        assert_eq!(
-            read::unsigned(&mut readable).expect("Should read first number"),
-            1u64
-        );
-    }
-
-    #[test]
-    fn test_read_u16() {
-        for (buf, val) in [
-            (&[2][..], 2),
-            (&[0x7f][..], 0x7f),
-            (&[0x80, 1][..], 0x80),
-            (&[0x81, 1][..], 0x81),
-            (&[0x82, 1][..], 0x82),
-            (&[0xff, 0x7f][..], 0x3fff),
-            (&[0x80, 0x80, 1][..], 0x4000),
-            (&[0xff, 0xff, 1][..], 0x7fff),
-            (&[0xff, 0xff, 3][..], 0xffff),
-        ]
-        .iter()
-        {
-            let mut readable = EndianSlice::new(buf, NativeEndian);
-            assert_eq!(*val, read::u16(&mut readable).expect("Should read number"));
-        }
-
-        for buf in [
-            &[0x80][..],
-            &[0x80, 0x80][..],
-            &[0x80, 0x80, 4][..],
-            &[0x80, 0x80, 0x80, 3][..],
-        ]
-        .iter()
-        {
-            let mut readable = EndianSlice::new(buf, NativeEndian);
-            assert!(read::u16(&mut readable).is_err(), "{:?}", buf);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-//! `gimli` is a library for reading and writing the
-//! [DWARF debugging format](http://dwarfstd.org/).
-//!
-//! See the [read](./read/index.html) and [write](./write/index.html) modules
-//! for examples and API documentation.
-//!
-//! ## Cargo Features
-//!
-//! Cargo features that can be enabled with `gimli`:
-//!
-//! * `std`: Enabled by default. Use the `std` library. Disabling this feature
-//! allows using `gimli` in embedded environments that do not have access to
-//! `std`. Note that even when `std` is disabled, `gimli` still requires an
-//! implementation of the `alloc` crate.
-//!
-//! * `read`: Enabled by default. Enables the `read` module. Use of `std` is
-//! optional.
-//!
-//! * `write`: Enabled by default. Enables the `write` module. Always uses
-//! the `std` library.
-#![deny(missing_docs)]
-#![deny(missing_debug_implementations)]
-// Selectively enable rust 2018 warnings
-#![warn(bare_trait_objects)]
-#![warn(unused_extern_crates)]
-#![warn(ellipsis_inclusive_range_patterns)]
-//#![warn(elided_lifetimes_in_paths)]
-#![warn(explicit_outlives_requirements)]
-// Allow clippy warnings when we aren't building with clippy.
-#![allow(unknown_lints)]
-// False positives with `fallible_iterator`.
-#![allow(clippy::should_implement_trait)]
-// Many false positives involving `continue`.
-#![allow(clippy::never_loop)]
-// False positives when block expressions are used inside an assertion.
-#![allow(clippy::panic_params)]
-#![no_std]
-
-#[allow(unused_imports)]
-#[macro_use]
-extern crate alloc;
-
-#[cfg(any(feature = "std", feature = "write"))]
-#[macro_use]
-extern crate std;
-
-#[cfg(feature = "stable_deref_trait")]
-pub use stable_deref_trait::{CloneStableDeref, StableDeref};
-
-mod common;
-pub use crate::common::*;
-
-mod arch;
-pub use crate::arch::*;
-
-pub mod constants;
-// For backwards compat.
-pub use crate::constants::*;
-
-mod endianity;
-pub use crate::endianity::{BigEndian, Endianity, LittleEndian, NativeEndian, RunTimeEndian};
-
-pub mod leb128;
-
-#[cfg(feature = "read")]
-pub mod read;
-// For backwards compat.
-#[cfg(feature = "read")]
-pub use crate::read::*;
-
-#[cfg(feature = "write")]
-pub mod write;
-
-#[cfg(test)]
-mod test_util;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/abbrev.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/abbrev.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/abbrev.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/abbrev.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,965 +0,0 @@
-//! Functions for parsing DWARF debugging abbreviations.
-
-use alloc::collections::btree_map;
-use alloc::vec::Vec;
-use core::convert::TryFrom;
-use core::fmt::{self, Debug};
-use core::iter::FromIterator;
-use core::ops::Deref;
-
-use crate::common::{DebugAbbrevOffset, SectionId};
-use crate::constants;
-use crate::endianity::Endianity;
-use crate::read::{EndianSlice, Error, Reader, Result, Section, UnitHeader};
-
-/// The `DebugAbbrev` struct represents the abbreviations describing
-/// `DebuggingInformationEntry`s' attribute names and forms found in the
-/// `.debug_abbrev` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugAbbrev<R> {
-    debug_abbrev_section: R,
-}
-
-impl<'input, Endian> DebugAbbrev<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugAbbrev` instance from the data in the `.debug_abbrev`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_abbrev` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugAbbrev, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_abbrev_section_somehow = || &buf;
-    /// let debug_abbrev = DebugAbbrev::new(read_debug_abbrev_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(debug_abbrev_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_abbrev_section, endian))
-    }
-}
-
-impl<R: Reader> DebugAbbrev<R> {
-    /// Parse the abbreviations at the given `offset` within this
-    /// `.debug_abbrev` section.
-    ///
-    /// The `offset` should generally be retrieved from a unit header.
-    pub fn abbreviations(
-        &self,
-        debug_abbrev_offset: DebugAbbrevOffset<R::Offset>,
-    ) -> Result<Abbreviations> {
-        let input = &mut self.debug_abbrev_section.clone();
-        input.skip(debug_abbrev_offset.0)?;
-        Abbreviations::parse(input)
-    }
-}
-
-impl<T> DebugAbbrev<T> {
-    /// Create a `DebugAbbrev` section that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::DebugAbbrev<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugAbbrev<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        borrow(&self.debug_abbrev_section).into()
-    }
-}
-
-impl<R> Section<R> for DebugAbbrev<R> {
-    fn id() -> SectionId {
-        SectionId::DebugAbbrev
-    }
-
-    fn reader(&self) -> &R {
-        &self.debug_abbrev_section
-    }
-}
-
-impl<R> From<R> for DebugAbbrev<R> {
-    fn from(debug_abbrev_section: R) -> Self {
-        DebugAbbrev {
-            debug_abbrev_section,
-        }
-    }
-}
-
-/// A set of type abbreviations.
-///
-/// Construct an `Abbreviations` instance with the
-/// [`abbreviations()`](struct.UnitHeader.html#method.abbreviations)
-/// method.
-#[derive(Debug, Default, Clone)]
-pub struct Abbreviations {
-    vec: Vec<Abbreviation>,
-    map: btree_map::BTreeMap<u64, Abbreviation>,
-}
-
-impl Abbreviations {
-    /// Construct a new, empty set of abbreviations.
-    fn empty() -> Abbreviations {
-        Abbreviations {
-            vec: Vec::new(),
-            map: btree_map::BTreeMap::new(),
-        }
-    }
-
-    /// Insert an abbreviation into the set.
-    ///
-    /// Returns `Ok` if it is the first abbreviation in the set with its code,
-    /// `Err` if the code is a duplicate and there already exists an
-    /// abbreviation in the set with the given abbreviation's code.
-    fn insert(&mut self, abbrev: Abbreviation) -> ::core::result::Result<(), ()> {
-        let code_usize = abbrev.code as usize;
-        if code_usize as u64 == abbrev.code {
-            // Optimize for sequential abbreviation codes by storing them
-            // in a Vec, as long as the map doesn't already contain them.
-            // A potential further optimization would be to allow some
-            // holes in the Vec, but there's no need for that yet.
-            if code_usize - 1 < self.vec.len() {
-                return Err(());
-            } else if code_usize - 1 == self.vec.len() {
-                if !self.map.is_empty() && self.map.contains_key(&abbrev.code) {
-                    return Err(());
-                } else {
-                    self.vec.push(abbrev);
-                    return Ok(());
-                }
-            }
-        }
-        match self.map.entry(abbrev.code) {
-            btree_map::Entry::Occupied(_) => Err(()),
-            btree_map::Entry::Vacant(entry) => {
-                entry.insert(abbrev);
-                Ok(())
-            }
-        }
-    }
-
-    /// Get the abbreviation associated with the given code.
-    #[inline]
-    pub fn get(&self, code: u64) -> Option<&Abbreviation> {
-        if let Ok(code) = usize::try_from(code) {
-            let index = code.checked_sub(1)?;
-            if index < self.vec.len() {
-                return Some(&self.vec[index]);
-            }
-        }
-
-        self.map.get(&code)
-    }
-
-    /// Parse a series of abbreviations, terminated by a null abbreviation.
-    fn parse<R: Reader>(input: &mut R) -> Result<Abbreviations> {
-        let mut abbrevs = Abbreviations::empty();
-
-        while let Some(abbrev) = Abbreviation::parse(input)? {
-            if abbrevs.insert(abbrev).is_err() {
-                return Err(Error::DuplicateAbbreviationCode);
-            }
-        }
-
-        Ok(abbrevs)
-    }
-}
-
-/// An abbreviation describes the shape of a `DebuggingInformationEntry`'s type:
-/// its code, tag type, whether it has children, and its set of attributes.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Abbreviation {
-    code: u64,
-    tag: constants::DwTag,
-    has_children: constants::DwChildren,
-    attributes: Attributes,
-}
-
-impl Abbreviation {
-    /// Construct a new `Abbreviation`.
-    ///
-    /// ### Panics
-    ///
-    /// Panics if `code` is `0`.
-    pub(crate) fn new(
-        code: u64,
-        tag: constants::DwTag,
-        has_children: constants::DwChildren,
-        attributes: Attributes,
-    ) -> Abbreviation {
-        assert_ne!(code, 0);
-        Abbreviation {
-            code,
-            tag,
-            has_children,
-            attributes,
-        }
-    }
-
-    /// Get this abbreviation's code.
-    #[inline]
-    pub fn code(&self) -> u64 {
-        self.code
-    }
-
-    /// Get this abbreviation's tag.
-    #[inline]
-    pub fn tag(&self) -> constants::DwTag {
-        self.tag
-    }
-
-    /// Return true if this abbreviation's type has children, false otherwise.
-    #[inline]
-    pub fn has_children(&self) -> bool {
-        self.has_children == constants::DW_CHILDREN_yes
-    }
-
-    /// Get this abbreviation's attributes.
-    #[inline]
-    pub fn attributes(&self) -> &[AttributeSpecification] {
-        &self.attributes[..]
-    }
-
-    /// Parse an abbreviation's tag.
-    fn parse_tag<R: Reader>(input: &mut R) -> Result<constants::DwTag> {
-        let val = input.read_uleb128_u16()?;
-        if val == 0 {
-            Err(Error::AbbreviationTagZero)
-        } else {
-            Ok(constants::DwTag(val))
-        }
-    }
-
-    /// Parse an abbreviation's "does the type have children?" byte.
-    fn parse_has_children<R: Reader>(input: &mut R) -> Result<constants::DwChildren> {
-        let val = input.read_u8()?;
-        let val = constants::DwChildren(val);
-        if val == constants::DW_CHILDREN_no || val == constants::DW_CHILDREN_yes {
-            Ok(val)
-        } else {
-            Err(Error::BadHasChildren)
-        }
-    }
-
-    /// Parse a series of attribute specifications, terminated by a null attribute
-    /// specification.
-    fn parse_attributes<R: Reader>(input: &mut R) -> Result<Attributes> {
-        let mut attrs = Attributes::new();
-
-        while let Some(attr) = AttributeSpecification::parse(input)? {
-            attrs.push(attr);
-        }
-
-        Ok(attrs)
-    }
-
-    /// Parse an abbreviation. Return `None` for the null abbreviation, `Some`
-    /// for an actual abbreviation.
-    fn parse<R: Reader>(input: &mut R) -> Result<Option<Abbreviation>> {
-        let code = input.read_uleb128()?;
-        if code == 0 {
-            return Ok(None);
-        }
-
-        let tag = Self::parse_tag(input)?;
-        let has_children = Self::parse_has_children(input)?;
-        let attributes = Self::parse_attributes(input)?;
-        let abbrev = Abbreviation::new(code, tag, has_children, attributes);
-        Ok(Some(abbrev))
-    }
-}
-
-/// A list of attributes found in an `Abbreviation`
-#[derive(Clone)]
-pub(crate) enum Attributes {
-    Inline {
-        buf: [AttributeSpecification; MAX_ATTRIBUTES_INLINE],
-        len: usize,
-    },
-    Heap(Vec<AttributeSpecification>),
-}
-
-// Length of 5 based on benchmark results for both x86-64 and i686.
-const MAX_ATTRIBUTES_INLINE: usize = 5;
-
-impl Attributes {
-    /// Returns a new empty list of attributes
-    fn new() -> Attributes {
-        let default =
-            AttributeSpecification::new(constants::DW_AT_null, constants::DW_FORM_null, None);
-        Attributes::Inline {
-            buf: [default; 5],
-            len: 0,
-        }
-    }
-
-    /// Pushes a new value onto this list of attributes.
-    fn push(&mut self, attr: AttributeSpecification) {
-        match self {
-            Attributes::Heap(list) => return list.push(attr),
-            Attributes::Inline {
-                buf,
-                len: MAX_ATTRIBUTES_INLINE,
-            } => {
-                let mut list = buf.to_vec();
-                list.push(attr);
-                *self = Attributes::Heap(list);
-            }
-            Attributes::Inline { buf, len } => {
-                buf[*len] = attr;
-                *len += 1;
-            }
-        }
-    }
-}
-
-impl Debug for Attributes {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        (&**self).fmt(f)
-    }
-}
-
-impl PartialEq for Attributes {
-    fn eq(&self, other: &Attributes) -> bool {
-        &**self == &**other
-    }
-}
-
-impl Eq for Attributes {}
-
-impl Deref for Attributes {
-    type Target = [AttributeSpecification];
-    fn deref(&self) -> &[AttributeSpecification] {
-        match self {
-            Attributes::Inline { buf, len } => &buf[..*len],
-            Attributes::Heap(list) => list,
-        }
-    }
-}
-
-impl FromIterator<AttributeSpecification> for Attributes {
-    fn from_iter<I>(iter: I) -> Attributes
-    where
-        I: IntoIterator<Item = AttributeSpecification>,
-    {
-        let mut list = Attributes::new();
-        for item in iter {
-            list.push(item);
-        }
-        return list;
-    }
-}
-
-impl From<Vec<AttributeSpecification>> for Attributes {
-    fn from(list: Vec<AttributeSpecification>) -> Attributes {
-        Attributes::Heap(list)
-    }
-}
-
-/// The description of an attribute in an abbreviated type. It is a pair of name
-/// and form.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct AttributeSpecification {
-    name: constants::DwAt,
-    form: constants::DwForm,
-    implicit_const_value: i64,
-}
-
-impl AttributeSpecification {
-    /// Construct a new `AttributeSpecification` from the given name and form
-    /// and implicit const value.
-    #[inline]
-    pub fn new(
-        name: constants::DwAt,
-        form: constants::DwForm,
-        implicit_const_value: Option<i64>,
-    ) -> AttributeSpecification {
-        debug_assert!(
-            (form == constants::DW_FORM_implicit_const && implicit_const_value.is_some())
-                || (form != constants::DW_FORM_implicit_const && implicit_const_value.is_none())
-        );
-        AttributeSpecification {
-            name,
-            form,
-            implicit_const_value: implicit_const_value.unwrap_or(0),
-        }
-    }
-
-    /// Get the attribute's name.
-    #[inline]
-    pub fn name(&self) -> constants::DwAt {
-        self.name
-    }
-
-    /// Get the attribute's form.
-    #[inline]
-    pub fn form(&self) -> constants::DwForm {
-        self.form
-    }
-
-    /// Get the attribute's implicit const value.
-    #[inline]
-    pub fn implicit_const_value(&self) -> Option<i64> {
-        if self.form == constants::DW_FORM_implicit_const {
-            Some(self.implicit_const_value)
-        } else {
-            None
-        }
-    }
-
-    /// Return the size of the attribute, in bytes.
-    ///
-    /// Note that because some attributes are variably sized, the size cannot
-    /// always be known without parsing, in which case we return `None`.
-    pub fn size<R: Reader>(&self, header: &UnitHeader<R>) -> Option<usize> {
-        match self.form {
-            constants::DW_FORM_addr => Some(header.address_size() as usize),
-
-            constants::DW_FORM_implicit_const => Some(0),
-
-            constants::DW_FORM_flag |
-            constants::DW_FORM_flag_present |
-            constants::DW_FORM_data1 |
-            constants::DW_FORM_ref1 => Some(1),
-
-            constants::DW_FORM_data2 |
-            constants::DW_FORM_ref2 => Some(2),
-
-            constants::DW_FORM_data4 |
-            constants::DW_FORM_ref4 => Some(4),
-
-            constants::DW_FORM_data8 |
-            constants::DW_FORM_ref8 => Some(8),
-
-            constants::DW_FORM_sec_offset |
-            constants::DW_FORM_ref_addr |
-            constants::DW_FORM_ref_sig8 |
-            constants::DW_FORM_strp => Some(header.format().word_size() as usize),
-
-            // Variably sized forms.
-            constants::DW_FORM_block |
-            constants::DW_FORM_block1 |
-            constants::DW_FORM_block2 |
-            constants::DW_FORM_block4 |
-            constants::DW_FORM_exprloc |
-            constants::DW_FORM_ref_udata |
-            constants::DW_FORM_string |
-            constants::DW_FORM_sdata |
-            constants::DW_FORM_udata |
-            constants::DW_FORM_indirect |
-
-            // We don't know the size of unknown forms.
-            _ => None,
-        }
-    }
-
-    /// Parse an attribute's form.
-    fn parse_form<R: Reader>(input: &mut R) -> Result<constants::DwForm> {
-        let val = input.read_uleb128_u16()?;
-        if val == 0 {
-            Err(Error::AttributeFormZero)
-        } else {
-            Ok(constants::DwForm(val))
-        }
-    }
-
-    /// Parse an attribute specification. Returns `None` for the null attribute
-    /// specification, `Some` for an actual attribute specification.
-    fn parse<R: Reader>(input: &mut R) -> Result<Option<AttributeSpecification>> {
-        let name = input.read_uleb128_u16()?;
-        if name == 0 {
-            // Parse the null attribute specification.
-            let form = input.read_uleb128_u16()?;
-            return if form == 0 {
-                Ok(None)
-            } else {
-                Err(Error::ExpectedZero)
-            };
-        }
-
-        let name = constants::DwAt(name);
-        let form = Self::parse_form(input)?;
-        let implicit_const_value = if form == constants::DW_FORM_implicit_const {
-            Some(input.read_sleb128()?)
-        } else {
-            None
-        };
-        let spec = AttributeSpecification::new(name, form, implicit_const_value);
-        Ok(Some(spec))
-    }
-}
-
-#[cfg(test)]
-pub mod tests {
-    use super::*;
-    use crate::constants;
-    use crate::endianity::LittleEndian;
-    use crate::read::{EndianSlice, Error};
-    use crate::test_util::GimliSectionMethods;
-    #[cfg(target_pointer_width = "32")]
-    use core::u32;
-    use test_assembler::Section;
-
-    pub trait AbbrevSectionMethods {
-        fn abbrev(self, code: u64, tag: constants::DwTag, children: constants::DwChildren) -> Self;
-        fn abbrev_null(self) -> Self;
-        fn abbrev_attr(self, name: constants::DwAt, form: constants::DwForm) -> Self;
-        fn abbrev_attr_implicit_const(self, name: constants::DwAt, value: i64) -> Self;
-        fn abbrev_attr_null(self) -> Self;
-    }
-
-    impl AbbrevSectionMethods for Section {
-        fn abbrev(self, code: u64, tag: constants::DwTag, children: constants::DwChildren) -> Self {
-            self.uleb(code).uleb(tag.0.into()).D8(children.0)
-        }
-
-        fn abbrev_null(self) -> Self {
-            self.D8(0)
-        }
-
-        fn abbrev_attr(self, name: constants::DwAt, form: constants::DwForm) -> Self {
-            self.uleb(name.0.into()).uleb(form.0.into())
-        }
-
-        fn abbrev_attr_implicit_const(self, name: constants::DwAt, value: i64) -> Self {
-            self.uleb(name.0.into())
-                .uleb(constants::DW_FORM_implicit_const.0.into())
-                .sleb(value)
-        }
-
-        fn abbrev_attr_null(self) -> Self {
-            self.D8(0).D8(0)
-        }
-    }
-
-    #[test]
-    fn test_debug_abbrev_ok() {
-        let extra_start = [1, 2, 3, 4];
-        let expected_rest = [5, 6, 7, 8];
-        #[rustfmt::skip]
-        let buf = Section::new()
-            .append_bytes(&extra_start)
-            .abbrev(2, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
-                .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_string)
-                .abbrev_attr_null()
-            .abbrev(1, constants::DW_TAG_compile_unit, constants::DW_CHILDREN_yes)
-                .abbrev_attr(constants::DW_AT_producer, constants::DW_FORM_strp)
-                .abbrev_attr(constants::DW_AT_language, constants::DW_FORM_data2)
-                .abbrev_attr_null()
-            .abbrev_null()
-            .append_bytes(&expected_rest)
-            .get_contents()
-            .unwrap();
-
-        let abbrev1 = Abbreviation::new(
-            1,
-            constants::DW_TAG_compile_unit,
-            constants::DW_CHILDREN_yes,
-            vec![
-                AttributeSpecification::new(
-                    constants::DW_AT_producer,
-                    constants::DW_FORM_strp,
-                    None,
-                ),
-                AttributeSpecification::new(
-                    constants::DW_AT_language,
-                    constants::DW_FORM_data2,
-                    None,
-                ),
-            ]
-            .into(),
-        );
-
-        let abbrev2 = Abbreviation::new(
-            2,
-            constants::DW_TAG_subprogram,
-            constants::DW_CHILDREN_no,
-            vec![AttributeSpecification::new(
-                constants::DW_AT_name,
-                constants::DW_FORM_string,
-                None,
-            )]
-            .into(),
-        );
-
-        let debug_abbrev = DebugAbbrev::new(&buf, LittleEndian);
-        let debug_abbrev_offset = DebugAbbrevOffset(extra_start.len());
-        let abbrevs = debug_abbrev
-            .abbreviations(debug_abbrev_offset)
-            .expect("Should parse abbreviations");
-        assert_eq!(abbrevs.get(1), Some(&abbrev1));
-        assert_eq!(abbrevs.get(2), Some(&abbrev2));
-    }
-
-    #[test]
-    fn test_abbreviations_insert() {
-        fn abbrev(code: u16) -> Abbreviation {
-            Abbreviation::new(
-                code.into(),
-                constants::DwTag(code),
-                constants::DW_CHILDREN_no,
-                vec![].into(),
-            )
-        }
-
-        fn assert_abbrev(abbrevs: &Abbreviations, code: u16) {
-            let abbrev = abbrevs.get(code.into()).unwrap();
-            assert_eq!(abbrev.tag(), constants::DwTag(code));
-        }
-
-        // Sequential insert.
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs.insert(abbrev(1)).unwrap();
-        abbrevs.insert(abbrev(2)).unwrap();
-        assert_eq!(abbrevs.vec.len(), 2);
-        assert!(abbrevs.map.is_empty());
-        assert_abbrev(&abbrevs, 1);
-        assert_abbrev(&abbrevs, 2);
-
-        // Out of order insert.
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs.insert(abbrev(2)).unwrap();
-        abbrevs.insert(abbrev(3)).unwrap();
-        assert!(abbrevs.vec.is_empty());
-        assert_abbrev(&abbrevs, 2);
-        assert_abbrev(&abbrevs, 3);
-
-        // Mixed order insert.
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs.insert(abbrev(1)).unwrap();
-        abbrevs.insert(abbrev(3)).unwrap();
-        abbrevs.insert(abbrev(2)).unwrap();
-        assert_eq!(abbrevs.vec.len(), 2);
-        assert_abbrev(&abbrevs, 1);
-        assert_abbrev(&abbrevs, 2);
-        assert_abbrev(&abbrevs, 3);
-
-        // Duplicate code in vec.
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs.insert(abbrev(1)).unwrap();
-        abbrevs.insert(abbrev(2)).unwrap();
-        assert_eq!(abbrevs.insert(abbrev(1)), Err(()));
-        assert_eq!(abbrevs.insert(abbrev(2)), Err(()));
-
-        // Duplicate code in map when adding to map.
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs.insert(abbrev(2)).unwrap();
-        assert_eq!(abbrevs.insert(abbrev(2)), Err(()));
-
-        // Duplicate code in map when adding to vec.
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs.insert(abbrev(2)).unwrap();
-        abbrevs.insert(abbrev(1)).unwrap();
-        assert_eq!(abbrevs.insert(abbrev(2)), Err(()));
-
-        // 32-bit usize conversions.
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs.insert(abbrev(2)).unwrap();
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "32")]
-    fn test_abbreviations_insert_32() {
-        fn abbrev(code: u64) -> Abbreviation {
-            Abbreviation::new(
-                code,
-                constants::DwTag(code as u16),
-                constants::DW_CHILDREN_no,
-                vec![].into(),
-            )
-        }
-
-        fn assert_abbrev(abbrevs: &Abbreviations, code: u64) {
-            let abbrev = abbrevs.get(code).unwrap();
-            assert_eq!(abbrev.tag(), constants::DwTag(code as u16));
-        }
-
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs.insert(abbrev(1)).unwrap();
-
-        let wrap_code = (u32::MAX as u64 + 1) + 1;
-        // `get` should not treat the wrapped code as `1`.
-        assert_eq!(abbrevs.get(wrap_code), None);
-        // `insert` should not treat the wrapped code as `1`.
-        abbrevs.insert(abbrev(wrap_code)).unwrap();
-        assert_abbrev(&abbrevs, 1);
-        assert_abbrev(&abbrevs, wrap_code);
-    }
-
-    #[test]
-    fn test_parse_abbreviations_ok() {
-        let expected_rest = [1, 2, 3, 4];
-        #[rustfmt::skip]
-        let buf = Section::new()
-            .abbrev(2, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
-                .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_string)
-                .abbrev_attr_null()
-            .abbrev(1, constants::DW_TAG_compile_unit, constants::DW_CHILDREN_yes)
-                .abbrev_attr(constants::DW_AT_producer, constants::DW_FORM_strp)
-                .abbrev_attr(constants::DW_AT_language, constants::DW_FORM_data2)
-                .abbrev_attr_null()
-            .abbrev_null()
-            .append_bytes(&expected_rest)
-            .get_contents()
-            .unwrap();
-        let rest = &mut EndianSlice::new(&*buf, LittleEndian);
-
-        let abbrev1 = Abbreviation::new(
-            1,
-            constants::DW_TAG_compile_unit,
-            constants::DW_CHILDREN_yes,
-            vec![
-                AttributeSpecification::new(
-                    constants::DW_AT_producer,
-                    constants::DW_FORM_strp,
-                    None,
-                ),
-                AttributeSpecification::new(
-                    constants::DW_AT_language,
-                    constants::DW_FORM_data2,
-                    None,
-                ),
-            ]
-            .into(),
-        );
-
-        let abbrev2 = Abbreviation::new(
-            2,
-            constants::DW_TAG_subprogram,
-            constants::DW_CHILDREN_no,
-            vec![AttributeSpecification::new(
-                constants::DW_AT_name,
-                constants::DW_FORM_string,
-                None,
-            )]
-            .into(),
-        );
-
-        let abbrevs = Abbreviations::parse(rest).expect("Should parse abbreviations");
-        assert_eq!(abbrevs.get(1), Some(&abbrev1));
-        assert_eq!(abbrevs.get(2), Some(&abbrev2));
-        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_abbreviations_duplicate() {
-        let expected_rest = [1, 2, 3, 4];
-        #[rustfmt::skip]
-        let buf = Section::new()
-            .abbrev(1, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
-                .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_string)
-                .abbrev_attr_null()
-            .abbrev(1, constants::DW_TAG_compile_unit, constants::DW_CHILDREN_yes)
-                .abbrev_attr(constants::DW_AT_producer, constants::DW_FORM_strp)
-                .abbrev_attr(constants::DW_AT_language, constants::DW_FORM_data2)
-                .abbrev_attr_null()
-            .abbrev_null()
-            .append_bytes(&expected_rest)
-            .get_contents()
-            .unwrap();
-        let buf = &mut EndianSlice::new(&*buf, LittleEndian);
-
-        match Abbreviations::parse(buf) {
-            Err(Error::DuplicateAbbreviationCode) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_abbreviation_tag_ok() {
-        let buf = [0x01, 0x02];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let tag = Abbreviation::parse_tag(rest).expect("Should parse tag");
-        assert_eq!(tag, constants::DW_TAG_array_type);
-        assert_eq!(*rest, EndianSlice::new(&buf[1..], LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_abbreviation_tag_zero() {
-        let buf = [0x00];
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-        match Abbreviation::parse_tag(buf) {
-            Err(Error::AbbreviationTagZero) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_abbreviation_has_children() {
-        let buf = [0x00, 0x01, 0x02];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let val = Abbreviation::parse_has_children(rest).expect("Should parse children");
-        assert_eq!(val, constants::DW_CHILDREN_no);
-        let val = Abbreviation::parse_has_children(rest).expect("Should parse children");
-        assert_eq!(val, constants::DW_CHILDREN_yes);
-        match Abbreviation::parse_has_children(rest) {
-            Err(Error::BadHasChildren) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_abbreviation_ok() {
-        let expected_rest = [0x01, 0x02, 0x03, 0x04];
-        let buf = Section::new()
-            .abbrev(1, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
-            .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_string)
-            .abbrev_attr_null()
-            .append_bytes(&expected_rest)
-            .get_contents()
-            .unwrap();
-        let rest = &mut EndianSlice::new(&*buf, LittleEndian);
-
-        let expect = Some(Abbreviation::new(
-            1,
-            constants::DW_TAG_subprogram,
-            constants::DW_CHILDREN_no,
-            vec![AttributeSpecification::new(
-                constants::DW_AT_name,
-                constants::DW_FORM_string,
-                None,
-            )]
-            .into(),
-        ));
-
-        let abbrev = Abbreviation::parse(rest).expect("Should parse abbreviation");
-        assert_eq!(abbrev, expect);
-        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_abbreviation_implicit_const_ok() {
-        let expected_rest = [0x01, 0x02, 0x03, 0x04];
-        let buf = Section::new()
-            .abbrev(1, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
-            .abbrev_attr_implicit_const(constants::DW_AT_name, -42)
-            .abbrev_attr_null()
-            .append_bytes(&expected_rest)
-            .get_contents()
-            .unwrap();
-        let rest = &mut EndianSlice::new(&*buf, LittleEndian);
-
-        let expect = Some(Abbreviation::new(
-            1,
-            constants::DW_TAG_subprogram,
-            constants::DW_CHILDREN_no,
-            vec![AttributeSpecification::new(
-                constants::DW_AT_name,
-                constants::DW_FORM_implicit_const,
-                Some(-42),
-            )]
-            .into(),
-        ));
-
-        let abbrev = Abbreviation::parse(rest).expect("Should parse abbreviation");
-        assert_eq!(abbrev, expect);
-        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_abbreviation_implicit_const_no_const() {
-        let buf = Section::new()
-            .abbrev(1, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
-            .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_implicit_const)
-            .get_contents()
-            .unwrap();
-        let buf = &mut EndianSlice::new(&*buf, LittleEndian);
-
-        match Abbreviation::parse(buf) {
-            Err(Error::UnexpectedEof(_)) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_parse_null_abbreviation_ok() {
-        let expected_rest = [0x01, 0x02, 0x03, 0x04];
-        let buf = Section::new()
-            .abbrev_null()
-            .append_bytes(&expected_rest)
-            .get_contents()
-            .unwrap();
-        let rest = &mut EndianSlice::new(&*buf, LittleEndian);
-
-        let abbrev = Abbreviation::parse(rest).expect("Should parse null abbreviation");
-        assert!(abbrev.is_none());
-        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_attribute_form_ok() {
-        let buf = [0x01, 0x02];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let tag = AttributeSpecification::parse_form(rest).expect("Should parse form");
-        assert_eq!(tag, constants::DW_FORM_addr);
-        assert_eq!(*rest, EndianSlice::new(&buf[1..], LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_attribute_form_zero() {
-        let buf = [0x00];
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-        match AttributeSpecification::parse_form(buf) {
-            Err(Error::AttributeFormZero) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_null_attribute_specification_ok() {
-        let buf = [0x00, 0x00, 0x01];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let attr =
-            AttributeSpecification::parse(rest).expect("Should parse null attribute specification");
-        assert!(attr.is_none());
-        assert_eq!(*rest, EndianSlice::new(&buf[2..], LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_attribute_specifications_name_zero() {
-        let buf = [0x00, 0x01, 0x00, 0x00];
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-        match AttributeSpecification::parse(buf) {
-            Err(Error::ExpectedZero) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_attribute_specifications_form_zero() {
-        let buf = [0x01, 0x00, 0x00, 0x00];
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-        match AttributeSpecification::parse(buf) {
-            Err(Error::AttributeFormZero) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_get_abbrev_zero() {
-        let mut abbrevs = Abbreviations::empty();
-        abbrevs
-            .insert(Abbreviation::new(
-                1,
-                constants::DwTag(1),
-                constants::DW_CHILDREN_no,
-                vec![].into(),
-            ))
-            .unwrap();
-        assert!(abbrevs.get(0).is_none());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/addr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/addr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/addr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/addr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,128 +0,0 @@
-use crate::common::{DebugAddrBase, DebugAddrIndex, SectionId};
-use crate::read::{Reader, ReaderOffset, Result, Section};
-
-/// The raw contents of the `.debug_addr` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugAddr<R> {
-    section: R,
-}
-
-impl<R: Reader> DebugAddr<R> {
-    // TODO: add an iterator over the sets of addresses in the section.
-    // This is not needed for common usage of the section though.
-
-    /// Returns the address at the given `base` and `index`.
-    ///
-    /// A set of addresses in the `.debug_addr` section consists of a header
-    /// followed by a series of addresses.
-    ///
-    /// The `base` must be the `DW_AT_addr_base` value from the compilation unit DIE.
-    /// This is an offset that points to the first address following the header.
-    ///
-    /// The `index` is the value of a `DW_FORM_addrx` attribute.
-    ///
-    /// The `address_size` must be the size of the address for the compilation unit.
-    /// This value must also match the header. However, note that we do not parse the
-    /// header to validate this, since locating the header is unreliable, and the GNU
-    /// extensions do not emit it.
-    pub fn get_address(
-        &self,
-        address_size: u8,
-        base: DebugAddrBase<R::Offset>,
-        index: DebugAddrIndex<R::Offset>,
-    ) -> Result<u64> {
-        let input = &mut self.section.clone();
-        input.skip(base.0)?;
-        input.skip(R::Offset::from_u64(
-            index.0.into_u64() * u64::from(address_size),
-        )?)?;
-        input.read_address(address_size)
-    }
-}
-
-impl<T> DebugAddr<T> {
-    /// Create a `DebugAddr` section that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::DebugAddr<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugAddr<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        borrow(&self.section).into()
-    }
-}
-
-impl<R> Section<R> for DebugAddr<R> {
-    fn id() -> SectionId {
-        SectionId::DebugAddr
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R> From<R> for DebugAddr<R> {
-    fn from(section: R) -> Self {
-        DebugAddr { section }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::read::EndianSlice;
-    use crate::test_util::GimliSectionMethods;
-    use crate::{Format, LittleEndian};
-    use test_assembler::{Endian, Label, LabelMaker, Section};
-
-    #[test]
-    fn test_get_address() {
-        for format in vec![Format::Dwarf32, Format::Dwarf64] {
-            for address_size in vec![4, 8] {
-                let zero = Label::new();
-                let length = Label::new();
-                let start = Label::new();
-                let first = Label::new();
-                let end = Label::new();
-                let mut section = Section::with_endian(Endian::Little)
-                    .mark(&zero)
-                    .initial_length(format, &length, &start)
-                    .D16(5)
-                    .D8(address_size)
-                    .D8(0)
-                    .mark(&first);
-                for i in 0..20 {
-                    section = section.word(address_size, 1000 + i);
-                }
-                section = section.mark(&end);
-                length.set_const((&end - &start) as u64);
-
-                let section = section.get_contents().unwrap();
-                let debug_addr = DebugAddr::from(EndianSlice::new(&section, LittleEndian));
-                let base = DebugAddrBase((&first - &zero) as usize);
-
-                assert_eq!(
-                    debug_addr.get_address(address_size, base, DebugAddrIndex(0)),
-                    Ok(1000)
-                );
-                assert_eq!(
-                    debug_addr.get_address(address_size, base, DebugAddrIndex(19)),
-                    Ok(1019)
-                );
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/aranges.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/aranges.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/aranges.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/aranges.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,508 +0,0 @@
-use core::cmp::Ordering;
-use core::marker::PhantomData;
-
-use crate::common::{DebugInfoOffset, Encoding, SectionId};
-use crate::endianity::Endianity;
-use crate::read::lookup::{DebugLookup, LookupEntryIter, LookupParser};
-use crate::read::{
-    parse_debug_info_offset, EndianSlice, Error, Reader, ReaderOffset, Result, Section,
-};
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-struct ArangeHeader<T = usize> {
-    encoding: Encoding,
-    length: T,
-    offset: DebugInfoOffset<T>,
-    segment_size: u8,
-}
-
-/// A single parsed arange.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ArangeEntry<T: Copy = usize> {
-    segment: Option<u64>,
-    address: u64,
-    length: u64,
-    unit_header_offset: DebugInfoOffset<T>,
-}
-
-impl<T: Copy> ArangeEntry<T> {
-    /// Return the segment selector of this arange.
-    #[inline]
-    pub fn segment(&self) -> Option<u64> {
-        self.segment
-    }
-
-    /// Return the beginning address of this arange.
-    #[inline]
-    pub fn address(&self) -> u64 {
-        self.address
-    }
-
-    /// Return the length of this arange.
-    #[inline]
-    pub fn length(&self) -> u64 {
-        self.length
-    }
-
-    /// Return the offset into the .debug_info section for this arange.
-    #[inline]
-    pub fn debug_info_offset(&self) -> DebugInfoOffset<T> {
-        self.unit_header_offset
-    }
-}
-
-impl<T: Copy + Ord> PartialOrd for ArangeEntry<T> {
-    fn partial_cmp(&self, other: &ArangeEntry<T>) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl<T: Copy + Ord> Ord for ArangeEntry<T> {
-    fn cmp(&self, other: &ArangeEntry<T>) -> Ordering {
-        // The expected comparison, but ignore header.
-        self.segment
-            .cmp(&other.segment)
-            .then(self.address.cmp(&other.address))
-            .then(self.length.cmp(&other.length))
-    }
-}
-
-#[derive(Clone, Debug)]
-struct ArangeParser<R: Reader> {
-    // This struct is never instantiated.
-    phantom: PhantomData<R>,
-}
-
-impl<R: Reader> LookupParser<R> for ArangeParser<R> {
-    type Header = ArangeHeader<R::Offset>;
-    type Entry = ArangeEntry<R::Offset>;
-
-    /// Parse an arange set header. Returns a tuple of the aranges to be
-    /// parsed for this set, and the newly created ArangeHeader struct.
-    fn parse_header(input: &mut R) -> Result<(R, Self::Header)> {
-        let (length, format) = input.read_initial_length()?;
-        let mut rest = input.split(length)?;
-
-        let version = rest.read_u16()?;
-        if version != 2 {
-            return Err(Error::UnknownVersion(u64::from(version)));
-        }
-
-        let offset = parse_debug_info_offset(&mut rest, format)?;
-        let address_size = rest.read_u8()?;
-        let segment_size = rest.read_u8()?;
-
-        // unit_length + version + offset + address_size + segment_size
-        let header_length = format.initial_length_size() + 2 + format.word_size() + 1 + 1;
-
-        // The first tuple following the header in each set begins at an offset that is
-        // a multiple of the size of a single tuple (that is, the size of a segment selector
-        // plus twice the size of an address).
-        let tuple_length = address_size
-            .checked_mul(2)
-            .and_then(|x| x.checked_add(segment_size))
-            .ok_or(Error::InvalidAddressRange)?;
-        if tuple_length == 0 {
-            return Err(Error::InvalidAddressRange)?;
-        }
-        let padding = if header_length % tuple_length == 0 {
-            0
-        } else {
-            tuple_length - header_length % tuple_length
-        };
-        rest.skip(R::Offset::from_u8(padding))?;
-
-        let encoding = Encoding {
-            format,
-            version,
-            address_size,
-            // TODO: segment_size
-        };
-        Ok((
-            rest,
-            ArangeHeader {
-                encoding,
-                length,
-                offset,
-                segment_size,
-            },
-        ))
-    }
-
-    /// Parse a single arange. Return `None` for the null arange, `Some` for an actual arange.
-    fn parse_entry(input: &mut R, header: &Self::Header) -> Result<Option<Self::Entry>> {
-        let address_size = header.encoding.address_size;
-        let segment_size = header.segment_size; // May be zero!
-
-        let tuple_length = R::Offset::from_u8(2 * address_size + segment_size);
-        if tuple_length > input.len() {
-            input.empty();
-            return Ok(None);
-        }
-
-        let segment = if segment_size != 0 {
-            input.read_address(segment_size)?
-        } else {
-            0
-        };
-        let address = input.read_address(address_size)?;
-        let length = input.read_address(address_size)?;
-
-        match (segment, address, length) {
-            // There may be multiple sets of tuples, each terminated by a zero tuple.
-            // It's not clear what purpose these zero tuples serve.  For now, we
-            // simply skip them.
-            (0, 0, 0) => Self::parse_entry(input, header),
-            _ => Ok(Some(ArangeEntry {
-                segment: if segment_size != 0 {
-                    Some(segment)
-                } else {
-                    None
-                },
-                address,
-                length,
-                unit_header_offset: header.offset,
-            })),
-        }
-    }
-}
-
-/// The `DebugAranges` struct represents the DWARF address range information
-/// found in the `.debug_aranges` section.
-#[derive(Debug, Clone)]
-pub struct DebugAranges<R: Reader>(DebugLookup<R, ArangeParser<R>>);
-
-impl<'input, Endian> DebugAranges<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugAranges` instance from the data in the `.debug_aranges`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_aranges` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugAranges, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_aranges_section = || &buf;
-    /// let debug_aranges =
-    ///     DebugAranges::new(read_debug_aranges_section(), LittleEndian);
-    /// ```
-    pub fn new(debug_aranges_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_aranges_section, endian))
-    }
-}
-
-impl<R: Reader> DebugAranges<R> {
-    /// Iterate the aranges in the `.debug_aranges` section.
-    ///
-    /// ```
-    /// use gimli::{DebugAranges, EndianSlice, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_aranges_section = || &buf;
-    /// let debug_aranges = DebugAranges::new(read_debug_aranges_section(), LittleEndian);
-    ///
-    /// let mut iter = debug_aranges.items();
-    /// while let Some(arange) = iter.next().unwrap() {
-    ///     println!("arange starts at {}, has length {}", arange.address(), arange.length());
-    /// }
-    /// ```
-    pub fn items(&self) -> ArangeEntryIter<R> {
-        ArangeEntryIter(self.0.items())
-    }
-}
-
-impl<R: Reader> Section<R> for DebugAranges<R> {
-    fn id() -> SectionId {
-        SectionId::DebugAranges
-    }
-
-    fn reader(&self) -> &R {
-        self.0.reader()
-    }
-}
-
-impl<R: Reader> From<R> for DebugAranges<R> {
-    fn from(debug_aranges_section: R) -> Self {
-        DebugAranges(DebugLookup::from(debug_aranges_section))
-    }
-}
-
-/// An iterator over the aranges from a `.debug_aranges` section.
-///
-/// Can be [used with
-/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-#[derive(Debug, Clone)]
-pub struct ArangeEntryIter<R: Reader>(LookupEntryIter<R, ArangeParser<R>>);
-
-impl<R: Reader> ArangeEntryIter<R> {
-    /// Advance the iterator and return the next arange.
-    ///
-    /// Returns the newly parsed arange as `Ok(Some(arange))`. Returns `Ok(None)`
-    /// when iteration is complete and all aranges have already been parsed and
-    /// yielded. If an error occurs while parsing the next arange, then this error
-    /// is returned as `Err(e)`, and all subsequent calls return `Ok(None)`.
-    pub fn next(&mut self) -> Result<Option<ArangeEntry<R::Offset>>> {
-        self.0.next()
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for ArangeEntryIter<R> {
-    type Item = ArangeEntry<R::Offset>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        self.0.next()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::common::{DebugInfoOffset, Format};
-    use crate::endianity::LittleEndian;
-    use crate::read::lookup::LookupParser;
-    use crate::read::EndianSlice;
-
-    #[test]
-    fn test_parse_header_ok() {
-        #[rustfmt::skip]
-        let buf = [
-            // 32-bit length = 32.
-            0x20, 0x00, 0x00, 0x00,
-            // Version.
-            0x02, 0x00,
-            // Offset.
-            0x01, 0x02, 0x03, 0x04,
-            // Address size.
-            0x08,
-            // Segment size.
-            0x04,
-            // Length to here = 12, tuple length = 20.
-            // Padding to tuple length multiple = 4.
-            0x10, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy arange tuple data.
-            0x20, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy next arange.
-            0x30, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        let (tuples, header) = ArangeParser::parse_header(rest).expect("should parse header ok");
-
-        assert_eq!(
-            *rest,
-            EndianSlice::new(&buf[buf.len() - 16..], LittleEndian)
-        );
-        assert_eq!(
-            tuples,
-            EndianSlice::new(&buf[buf.len() - 32..buf.len() - 16], LittleEndian)
-        );
-        assert_eq!(
-            header,
-            ArangeHeader {
-                encoding: Encoding {
-                    format: Format::Dwarf32,
-                    version: 2,
-                    address_size: 8,
-                },
-                length: 0x20,
-                offset: DebugInfoOffset(0x0403_0201),
-                segment_size: 4,
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_header_overflow_error() {
-        #[rustfmt::skip]
-        let buf = [
-            // 32-bit length = 32.
-            0x20, 0x00, 0x00, 0x00,
-            // Version.
-            0x02, 0x00,
-            // Offset.
-            0x01, 0x02, 0x03, 0x04,
-            // Address size.
-            0xff,
-            // Segment size.
-            0xff,
-            // Length to here = 12, tuple length = 20.
-            // Padding to tuple length multiple = 4.
-            0x10, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy arange tuple data.
-            0x20, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy next arange.
-            0x30, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        let error = ArangeParser::parse_header(rest).expect_err("should fail to parse header");
-        assert_eq!(error, Error::InvalidAddressRange);
-    }
-
-    #[test]
-    fn test_parse_header_div_by_zero_error() {
-        #[rustfmt::skip]
-        let buf = [
-            // 32-bit length = 32.
-            0x20, 0x00, 0x00, 0x00,
-            // Version.
-            0x02, 0x00,
-            // Offset.
-            0x01, 0x02, 0x03, 0x04,
-            // Address size = 0. Could cause a division by zero if we aren't
-            // careful.
-            0x00,
-            // Segment size.
-            0x00,
-            // Length to here = 12, tuple length = 20.
-            // Padding to tuple length multiple = 4.
-            0x10, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy arange tuple data.
-            0x20, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy next arange.
-            0x30, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        let error = ArangeParser::parse_header(rest).expect_err("should fail to parse header");
-        assert_eq!(error, Error::InvalidAddressRange);
-    }
-
-    #[test]
-    fn test_parse_entry_ok() {
-        let header = ArangeHeader {
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 2,
-                address_size: 4,
-            },
-            length: 0,
-            offset: DebugInfoOffset(0),
-            segment_size: 0,
-        };
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let entry = ArangeParser::parse_entry(rest, &header).expect("should parse entry ok");
-        assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
-        assert_eq!(
-            entry,
-            Some(ArangeEntry {
-                segment: None,
-                address: 0x0403_0201,
-                length: 0x0807_0605,
-                unit_header_offset: header.offset,
-            })
-        );
-    }
-
-    #[test]
-    fn test_parse_entry_segment() {
-        let header = ArangeHeader {
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 2,
-                address_size: 4,
-            },
-            length: 0,
-            offset: DebugInfoOffset(0),
-            segment_size: 8,
-        };
-        #[rustfmt::skip]
-        let buf = [
-            // Segment.
-            0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-            // Address.
-            0x01, 0x02, 0x03, 0x04,
-            // Length.
-            0x05, 0x06, 0x07, 0x08,
-            // Next tuple.
-            0x09
-        ];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let entry = ArangeParser::parse_entry(rest, &header).expect("should parse entry ok");
-        assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
-        assert_eq!(
-            entry,
-            Some(ArangeEntry {
-                segment: Some(0x1817_1615_1413_1211),
-                address: 0x0403_0201,
-                length: 0x0807_0605,
-                unit_header_offset: header.offset,
-            })
-        );
-    }
-
-    #[test]
-    fn test_parse_entry_zero() {
-        let header = ArangeHeader {
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 2,
-                address_size: 4,
-            },
-            length: 0,
-            offset: DebugInfoOffset(0),
-            segment_size: 0,
-        };
-        #[rustfmt::skip]
-        let buf = [
-            // Zero tuple.
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // Address.
-            0x01, 0x02, 0x03, 0x04,
-            // Length.
-            0x05, 0x06, 0x07, 0x08,
-            // Next tuple.
-            0x09
-        ];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let entry = ArangeParser::parse_entry(rest, &header).expect("should parse entry ok");
-        assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
-        assert_eq!(
-            entry,
-            Some(ArangeEntry {
-                segment: None,
-                address: 0x0403_0201,
-                length: 0x0807_0605,
-                unit_header_offset: header.offset,
-            })
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/cfi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/cfi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/cfi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/cfi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7304 +0,0 @@
-use alloc::boxed::Box;
-use core::cmp::{Ord, Ordering};
-use core::fmt::{self, Debug};
-use core::iter::FromIterator;
-use core::mem::{self, MaybeUninit};
-use core::num::Wrapping;
-use core::ptr;
-
-use crate::common::{DebugFrameOffset, EhFrameOffset, Encoding, Format, Register, SectionId};
-use crate::constants::{self, DwEhPe};
-use crate::endianity::Endianity;
-use crate::read::{EndianSlice, Error, Expression, Reader, ReaderOffset, Result, Section};
-
-/// `DebugFrame` contains the `.debug_frame` section's frame unwinding
-/// information required to unwind to and recover registers from older frames on
-/// the stack. For example, this is useful for a debugger that wants to print
-/// locals in a backtrace.
-///
-/// Most interesting methods are defined in the
-/// [`UnwindSection`](trait.UnwindSection.html) trait.
-///
-/// ### Differences between `.debug_frame` and `.eh_frame`
-///
-/// While the `.debug_frame` section's information has a lot of overlap with the
-/// `.eh_frame` section's information, the `.eh_frame` information tends to only
-/// encode the subset of information needed for exception handling. Often, only
-/// one of `.eh_frame` or `.debug_frame` will be present in an object file.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct DebugFrame<R: Reader> {
-    section: R,
-    address_size: u8,
-    segment_size: u8,
-}
-
-impl<R: Reader> DebugFrame<R> {
-    /// Set the size of a target address in bytes.
-    ///
-    /// This defaults to the native word size.
-    /// This is only used if the CIE version is less than 4.
-    pub fn set_address_size(&mut self, address_size: u8) {
-        self.address_size = address_size
-    }
-
-    /// Set the size of a segment selector in bytes.
-    ///
-    /// This defaults to 0.
-    /// This is only used if the CIE version is less than 4.
-    pub fn set_segment_size(&mut self, segment_size: u8) {
-        self.segment_size = segment_size
-    }
-}
-
-impl<'input, Endian> DebugFrame<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugFrame` instance from the data in the
-    /// `.debug_frame` section.
-    ///
-    /// It is the caller's responsibility to read the section and present it as
-    /// a `&[u8]` slice. That means using some ELF loader on Linux, a Mach-O
-    /// loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugFrame, NativeEndian};
-    ///
-    /// // Use with `.debug_frame`
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_frame_section_somehow = || &buf;
-    /// let debug_frame = DebugFrame::new(read_debug_frame_section_somehow(), NativeEndian);
-    /// ```
-    pub fn new(section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(section, endian))
-    }
-}
-
-impl<R: Reader> Section<R> for DebugFrame<R> {
-    fn id() -> SectionId {
-        SectionId::DebugFrame
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R: Reader> From<R> for DebugFrame<R> {
-    fn from(section: R) -> Self {
-        // Default to no segments and native word size.
-        DebugFrame {
-            section,
-            address_size: mem::size_of::<usize>() as u8,
-            segment_size: 0,
-        }
-    }
-}
-
-/// `EhFrameHdr` contains the information about the `.eh_frame_hdr` section.
-///
-/// A pointer to the start of the `.eh_frame` data, and optionally, a binary
-/// search table of pointers to the `.eh_frame` records that are found in this section.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct EhFrameHdr<R: Reader>(R);
-
-/// `ParsedEhFrameHdr` contains the parsed information from the `.eh_frame_hdr` section.
-#[derive(Clone, Debug)]
-pub struct ParsedEhFrameHdr<R: Reader> {
-    address_size: u8,
-    section: R,
-
-    eh_frame_ptr: Pointer,
-    fde_count: u64,
-    table_enc: DwEhPe,
-    table: R,
-}
-
-impl<'input, Endian> EhFrameHdr<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Constructs a new `EhFrameHdr` instance from the data in the `.eh_frame_hdr` section.
-    pub fn new(section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(section, endian))
-    }
-}
-
-impl<R: Reader> EhFrameHdr<R> {
-    /// Parses this `EhFrameHdr` to a `ParsedEhFrameHdr`.
-    pub fn parse(&self, bases: &BaseAddresses, address_size: u8) -> Result<ParsedEhFrameHdr<R>> {
-        let mut reader = self.0.clone();
-        let version = reader.read_u8()?;
-        if version != 1 {
-            return Err(Error::UnknownVersion(u64::from(version)));
-        }
-
-        let eh_frame_ptr_enc = parse_pointer_encoding(&mut reader)?;
-        let fde_count_enc = parse_pointer_encoding(&mut reader)?;
-        let table_enc = parse_pointer_encoding(&mut reader)?;
-
-        let parameters = PointerEncodingParameters {
-            bases: &bases.eh_frame_hdr,
-            func_base: None,
-            address_size,
-            section: &self.0,
-        };
-
-        // Omitting this pointer is not valid (defeats the purpose of .eh_frame_hdr entirely)
-        if eh_frame_ptr_enc == constants::DW_EH_PE_omit {
-            return Err(Error::CannotParseOmitPointerEncoding);
-        }
-        let eh_frame_ptr = parse_encoded_pointer(eh_frame_ptr_enc, &parameters, &mut reader)?;
-
-        let fde_count;
-        if fde_count_enc == constants::DW_EH_PE_omit || table_enc == constants::DW_EH_PE_omit {
-            fde_count = 0
-        } else {
-            let ptr = parse_encoded_pointer(fde_count_enc, &parameters, &mut reader)?;
-            fde_count = match ptr {
-                Pointer::Direct(c) => c,
-                Pointer::Indirect(_) => return Err(Error::UnsupportedPointerEncoding),
-            }
-        }
-
-        Ok(ParsedEhFrameHdr {
-            address_size,
-            section: self.0.clone(),
-
-            eh_frame_ptr,
-            fde_count,
-            table_enc,
-            table: reader,
-        })
-    }
-}
-
-impl<R: Reader> Section<R> for EhFrameHdr<R> {
-    fn id() -> SectionId {
-        SectionId::EhFrameHdr
-    }
-
-    fn reader(&self) -> &R {
-        &self.0
-    }
-}
-
-impl<R: Reader> From<R> for EhFrameHdr<R> {
-    fn from(section: R) -> Self {
-        EhFrameHdr(section)
-    }
-}
-
-impl<R: Reader> ParsedEhFrameHdr<R> {
-    /// Returns the address of the binary's `.eh_frame` section.
-    pub fn eh_frame_ptr(&self) -> Pointer {
-        self.eh_frame_ptr
-    }
-
-    /// Retrieves the CFI binary search table, if there is one.
-    pub fn table(&self) -> Option<EhHdrTable<R>> {
-        // There are two big edge cases here:
-        // * You search the table for an invalid address. As this is just a binary
-        //   search table, we always have to return a valid result for that (unless
-        //   you specify an address that is lower than the first address in the
-        //   table). Since this means that you have to recheck that the FDE contains
-        //   your address anyways, we just return the first FDE even when the address
-        //   is too low. After all, we're just doing a normal binary search.
-        // * This falls apart when the table is empty - there is no entry we could
-        //   return. We conclude that an empty table is not really a table at all.
-        if self.fde_count == 0 {
-            None
-        } else {
-            Some(EhHdrTable { hdr: self })
-        }
-    }
-}
-
-/// The CFI binary search table that is an optional part of the `.eh_frame_hdr` section.
-#[derive(Debug, Clone)]
-pub struct EhHdrTable<'a, R: Reader> {
-    hdr: &'a ParsedEhFrameHdr<R>,
-}
-
-impl<'a, R: Reader + 'a> EhHdrTable<'a, R> {
-    /// *Probably* returns a pointer to the FDE for the given address.
-    ///
-    /// This performs a binary search, so if there is no FDE for the given address,
-    /// this function **will** return a pointer to any other FDE that's close by.
-    ///
-    /// To be sure, you **must** call `contains` on the FDE.
-    pub fn lookup(&self, address: u64, bases: &BaseAddresses) -> Result<Pointer> {
-        let size = match self.hdr.table_enc.format() {
-            constants::DW_EH_PE_uleb128 | constants::DW_EH_PE_sleb128 => {
-                return Err(Error::VariableLengthSearchTable);
-            }
-            constants::DW_EH_PE_sdata2 | constants::DW_EH_PE_udata2 => 2,
-            constants::DW_EH_PE_sdata4 | constants::DW_EH_PE_udata4 => 4,
-            constants::DW_EH_PE_sdata8 | constants::DW_EH_PE_udata8 => 8,
-            _ => return Err(Error::UnknownPointerEncoding),
-        };
-
-        let row_size = size * 2;
-
-        let mut len = self.hdr.fde_count;
-
-        let mut reader = self.hdr.table.clone();
-
-        let parameters = PointerEncodingParameters {
-            bases: &bases.eh_frame_hdr,
-            func_base: None,
-            address_size: self.hdr.address_size,
-            section: &self.hdr.section,
-        };
-
-        while len > 1 {
-            let head = reader.split(R::Offset::from_u64((len / 2) * row_size)?)?;
-            let tail = reader.clone();
-
-            let pivot = parse_encoded_pointer(self.hdr.table_enc, &parameters, &mut reader)?;
-            let pivot = match pivot {
-                Pointer::Direct(x) => x,
-                Pointer::Indirect(_) => return Err(Error::UnsupportedPointerEncoding),
-            };
-
-            match pivot.cmp(&address) {
-                Ordering::Equal => {
-                    reader = tail;
-                    break;
-                }
-                Ordering::Less => {
-                    reader = tail;
-                    len = len - (len / 2);
-                }
-                Ordering::Greater => {
-                    reader = head;
-                    len /= 2;
-                }
-            }
-        }
-
-        reader.skip(R::Offset::from_u64(size)?)?;
-
-        parse_encoded_pointer(self.hdr.table_enc, &parameters, &mut reader)
-    }
-
-    /// Convert a `Pointer` to a section offset.
-    ///
-    /// This does not support indirect pointers.
-    pub fn pointer_to_offset(&self, ptr: Pointer) -> Result<EhFrameOffset<R::Offset>> {
-        let ptr = match ptr {
-            Pointer::Direct(x) => x,
-            _ => return Err(Error::UnsupportedPointerEncoding),
-        };
-
-        let eh_frame_ptr = match self.hdr.eh_frame_ptr() {
-            Pointer::Direct(x) => x,
-            _ => return Err(Error::UnsupportedPointerEncoding),
-        };
-
-        // Calculate the offset in the EhFrame section
-        R::Offset::from_u64(ptr - eh_frame_ptr).map(EhFrameOffset)
-    }
-
-    /// Returns a parsed FDE for the given address, or `NoUnwindInfoForAddress`
-    /// if there are none.
-    ///
-    /// You must provide a function to get its associated CIE. See
-    /// `PartialFrameDescriptionEntry::parse` for more information.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # use gimli::{BaseAddresses, EhFrame, ParsedEhFrameHdr, EndianSlice, NativeEndian, Error, UnwindSection};
-    /// # fn foo() -> Result<(), Error> {
-    /// # let eh_frame: EhFrame<EndianSlice<NativeEndian>> = unreachable!();
-    /// # let eh_frame_hdr: ParsedEhFrameHdr<EndianSlice<NativeEndian>> = unimplemented!();
-    /// # let addr = 0;
-    /// # let bases = unimplemented!();
-    /// let table = eh_frame_hdr.table().unwrap();
-    /// let fde = table.fde_for_address(&eh_frame, &bases, addr, EhFrame::cie_from_offset)?;
-    /// # Ok(())
-    /// # }
-    /// ```
-    pub fn fde_for_address<F>(
-        &self,
-        frame: &EhFrame<R>,
-        bases: &BaseAddresses,
-        address: u64,
-        get_cie: F,
-    ) -> Result<FrameDescriptionEntry<R>>
-    where
-        F: FnMut(
-            &EhFrame<R>,
-            &BaseAddresses,
-            EhFrameOffset<R::Offset>,
-        ) -> Result<CommonInformationEntry<R>>,
-    {
-        let fdeptr = self.lookup(address, bases)?;
-        let offset = self.pointer_to_offset(fdeptr)?;
-        let entry = frame.fde_from_offset(bases, offset, get_cie)?;
-        if entry.contains(address) {
-            Ok(entry)
-        } else {
-            Err(Error::NoUnwindInfoForAddress)
-        }
-    }
-
-    #[inline]
-    #[doc(hidden)]
-    #[deprecated(note = "Method renamed to fde_for_address; use that instead.")]
-    pub fn lookup_and_parse<F>(
-        &self,
-        address: u64,
-        bases: &BaseAddresses,
-        frame: EhFrame<R>,
-        get_cie: F,
-    ) -> Result<FrameDescriptionEntry<R>>
-    where
-        F: FnMut(
-            &EhFrame<R>,
-            &BaseAddresses,
-            EhFrameOffset<R::Offset>,
-        ) -> Result<CommonInformationEntry<R>>,
-    {
-        self.fde_for_address(&frame, bases, address, get_cie)
-    }
-
-    /// Returns the frame unwind information for the given address,
-    /// or `NoUnwindInfoForAddress` if there are none.
-    ///
-    /// You must provide a function to get the associated CIE. See
-    /// `PartialFrameDescriptionEntry::parse` for more information.
-    pub fn unwind_info_for_address<F>(
-        &self,
-        frame: &EhFrame<R>,
-        bases: &BaseAddresses,
-        ctx: &mut UninitializedUnwindContext<R>,
-        address: u64,
-        get_cie: F,
-    ) -> Result<UnwindTableRow<R>>
-    where
-        F: FnMut(
-            &EhFrame<R>,
-            &BaseAddresses,
-            EhFrameOffset<R::Offset>,
-        ) -> Result<CommonInformationEntry<R>>,
-    {
-        let fde = self.fde_for_address(frame, bases, address, get_cie)?;
-        fde.unwind_info_for_address(frame, bases, ctx, address)
-    }
-}
-
-/// `EhFrame` contains the frame unwinding information needed during exception
-/// handling found in the `.eh_frame` section.
-///
-/// Most interesting methods are defined in the
-/// [`UnwindSection`](trait.UnwindSection.html) trait.
-///
-/// See
-/// [`DebugFrame`](./struct.DebugFrame.html#differences-between-debug_frame-and-eh_frame)
-/// for some discussion on the differences between `.debug_frame` and
-/// `.eh_frame`.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct EhFrame<R: Reader> {
-    section: R,
-    address_size: u8,
-}
-
-impl<R: Reader> EhFrame<R> {
-    /// Set the size of a target address in bytes.
-    ///
-    /// This defaults to the native word size.
-    pub fn set_address_size(&mut self, address_size: u8) {
-        self.address_size = address_size
-    }
-}
-
-impl<'input, Endian> EhFrame<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `EhFrame` instance from the data in the
-    /// `.debug_frame` section.
-    ///
-    /// It is the caller's responsibility to read the section and present it as
-    /// a `&[u8]` slice. That means using some ELF loader on Linux, a Mach-O
-    /// loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{EhFrame, EndianSlice, NativeEndian};
-    ///
-    /// // Use with `.debug_frame`
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_frame_section_somehow = || &buf;
-    /// let debug_frame = EhFrame::new(read_debug_frame_section_somehow(), NativeEndian);
-    /// ```
-    pub fn new(section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(section, endian))
-    }
-}
-
-impl<R: Reader> Section<R> for EhFrame<R> {
-    fn id() -> SectionId {
-        SectionId::EhFrame
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R: Reader> From<R> for EhFrame<R> {
-    fn from(section: R) -> Self {
-        // Default to native word size.
-        EhFrame {
-            section,
-            address_size: mem::size_of::<usize>() as u8,
-        }
-    }
-}
-
-// This has to be `pub` to silence a warning (that is deny(..)'d by default) in
-// rustc. Eventually, not having this `pub` will become a hard error.
-#[doc(hidden)]
-#[allow(missing_docs)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum CieOffsetEncoding {
-    U32,
-    U64,
-}
-
-/// An offset into an `UnwindSection`.
-//
-// Needed to avoid conflicting implementations of `Into<T>`.
-pub trait UnwindOffset<T = usize>: Copy + Debug + Eq + From<T>
-where
-    T: ReaderOffset,
-{
-    /// Convert an `UnwindOffset<T>` into a `T`.
-    fn into(self) -> T;
-}
-
-impl<T> UnwindOffset<T> for DebugFrameOffset<T>
-where
-    T: ReaderOffset,
-{
-    #[inline]
-    fn into(self) -> T {
-        self.0
-    }
-}
-
-impl<T> UnwindOffset<T> for EhFrameOffset<T>
-where
-    T: ReaderOffset,
-{
-    #[inline]
-    fn into(self) -> T {
-        self.0
-    }
-}
-
-/// This trait completely encapsulates everything that is different between
-/// `.eh_frame` and `.debug_frame`, as well as all the bits that can change
-/// between DWARF versions.
-#[doc(hidden)]
-pub trait _UnwindSectionPrivate<R: Reader> {
-    /// Get the underlying section data.
-    fn section(&self) -> &R;
-
-    /// Returns true if the given length value should be considered an
-    /// end-of-entries sentinel.
-    fn length_value_is_end_of_entries(length: R::Offset) -> bool;
-
-    /// Return true if the given offset if the CIE sentinel, false otherwise.
-    fn is_cie(format: Format, id: u64) -> bool;
-
-    /// Return the CIE offset/ID encoding used by this unwind section with the
-    /// given DWARF format.
-    fn cie_offset_encoding(format: Format) -> CieOffsetEncoding;
-
-    /// For `.eh_frame`, CIE offsets are relative to the current position. For
-    /// `.debug_frame`, they are relative to the start of the section. We always
-    /// internally store them relative to the section, so we handle translating
-    /// `.eh_frame`'s relative offsets in this method. If the offset calculation
-    /// underflows, return `None`.
-    fn resolve_cie_offset(&self, base: R::Offset, offset: R::Offset) -> Option<R::Offset>;
-
-    /// Does this version of this unwind section encode address and segment
-    /// sizes in its CIEs?
-    fn has_address_and_segment_sizes(version: u8) -> bool;
-
-    /// The address size to use if `has_address_and_segment_sizes` returns false.
-    fn address_size(&self) -> u8;
-
-    /// The segment size to use if `has_address_and_segment_sizes` returns false.
-    fn segment_size(&self) -> u8;
-}
-
-/// A section holding unwind information: either `.debug_frame` or
-/// `.eh_frame`. See [`DebugFrame`](./struct.DebugFrame.html) and
-/// [`EhFrame`](./struct.EhFrame.html) respectively.
-pub trait UnwindSection<R: Reader>: Clone + Debug + _UnwindSectionPrivate<R> {
-    /// The offset type associated with this CFI section. Either
-    /// `DebugFrameOffset` or `EhFrameOffset`.
-    type Offset: UnwindOffset<R::Offset>;
-
-    /// Iterate over the `CommonInformationEntry`s and `FrameDescriptionEntry`s
-    /// in this `.debug_frame` section.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    fn entries<'bases>(&self, bases: &'bases BaseAddresses) -> CfiEntriesIter<'bases, Self, R> {
-        CfiEntriesIter {
-            section: self.clone(),
-            bases,
-            input: self.section().clone(),
-        }
-    }
-
-    /// Parse the `CommonInformationEntry` at the given offset.
-    fn cie_from_offset(
-        &self,
-        bases: &BaseAddresses,
-        offset: Self::Offset,
-    ) -> Result<CommonInformationEntry<R>> {
-        let offset = UnwindOffset::into(offset);
-        let input = &mut self.section().clone();
-        input.skip(offset)?;
-        CommonInformationEntry::parse(bases, self, input)
-    }
-
-    /// Parse the `PartialFrameDescriptionEntry` at the given offset.
-    fn partial_fde_from_offset<'bases>(
-        &self,
-        bases: &'bases BaseAddresses,
-        offset: Self::Offset,
-    ) -> Result<PartialFrameDescriptionEntry<'bases, Self, R>> {
-        let offset = UnwindOffset::into(offset);
-        let input = &mut self.section().clone();
-        input.skip(offset)?;
-        PartialFrameDescriptionEntry::parse_partial(self, bases, input)
-    }
-
-    /// Parse the `FrameDescriptionEntry` at the given offset.
-    fn fde_from_offset<F>(
-        &self,
-        bases: &BaseAddresses,
-        offset: Self::Offset,
-        get_cie: F,
-    ) -> Result<FrameDescriptionEntry<R>>
-    where
-        F: FnMut(&Self, &BaseAddresses, Self::Offset) -> Result<CommonInformationEntry<R>>,
-    {
-        let partial = self.partial_fde_from_offset(bases, offset)?;
-        partial.parse(get_cie)
-    }
-
-    /// Find the `FrameDescriptionEntry` for the given address.
-    ///
-    /// If found, the FDE is returned.  If not found,
-    /// `Err(gimli::Error::NoUnwindInfoForAddress)` is returned.
-    /// If parsing fails, the error is returned.
-    ///
-    /// You must provide a function to get its associated CIE. See
-    /// `PartialFrameDescriptionEntry::parse` for more information.
-    ///
-    /// Note: this iterates over all FDEs. If available, it is possible
-    /// to do a binary search with `EhFrameHdr::fde_for_address` instead.
-    fn fde_for_address<F>(
-        &self,
-        bases: &BaseAddresses,
-        address: u64,
-        mut get_cie: F,
-    ) -> Result<FrameDescriptionEntry<R>>
-    where
-        F: FnMut(&Self, &BaseAddresses, Self::Offset) -> Result<CommonInformationEntry<R>>,
-    {
-        let mut entries = self.entries(bases);
-        while let Some(entry) = entries.next()? {
-            match entry {
-                CieOrFde::Cie(_) => {}
-                CieOrFde::Fde(partial) => {
-                    let fde = partial.parse(&mut get_cie)?;
-                    if fde.contains(address) {
-                        return Ok(fde);
-                    }
-                }
-            }
-        }
-        Err(Error::NoUnwindInfoForAddress)
-    }
-
-    /// Find the frame unwind information for the given address.
-    ///
-    /// If found, the unwind information is returned.  If not found,
-    /// `Err(gimli::Error::NoUnwindInfoForAddress)` is returned. If parsing or
-    /// CFI evaluation fails, the error is returned.
-    ///
-    /// ```
-    /// use gimli::{BaseAddresses, EhFrame, EndianSlice, NativeEndian, UninitializedUnwindContext,
-    ///             UnwindSection};
-    ///
-    /// # fn foo() -> gimli::Result<()> {
-    /// # let read_eh_frame_section = || unimplemented!();
-    /// // Get the `.eh_frame` section from the object file. Alternatively,
-    /// // use `EhFrame` with the `.eh_frame` section of the object file.
-    /// let eh_frame = EhFrame::new(read_eh_frame_section(), NativeEndian);
-    ///
-    /// # let get_frame_pc = || unimplemented!();
-    /// // Get the address of the PC for a frame you'd like to unwind.
-    /// let address = get_frame_pc();
-    ///
-    /// // This context is reusable, which cuts down on heap allocations.
-    /// let ctx = UninitializedUnwindContext::new();
-    ///
-    /// // Optionally provide base addresses for any relative pointers. If a
-    /// // base address isn't provided and a pointer is found that is relative to
-    /// // it, we will return an `Err`.
-    /// # let address_of_text_section_in_memory = unimplemented!();
-    /// # let address_of_got_section_in_memory = unimplemented!();
-    /// let bases = BaseAddresses::default()
-    ///     .set_text(address_of_text_section_in_memory)
-    ///     .set_got(address_of_got_section_in_memory);
-    ///
-    /// let unwind_info = eh_frame.unwind_info_for_address(
-    ///     &bases,
-    ///     &mut ctx,
-    ///     address,
-    ///     EhFrame::cie_from_offset,
-    /// )?;
-    ///
-    /// # let do_stuff_with = |_| unimplemented!();
-    /// do_stuff_with(unwind_info);
-    /// # let _ = ctx;
-    /// # unreachable!()
-    /// # }
-    /// ```
-    #[inline]
-    fn unwind_info_for_address<F>(
-        &self,
-        bases: &BaseAddresses,
-        ctx: &mut UninitializedUnwindContext<R>,
-        address: u64,
-        get_cie: F,
-    ) -> Result<UnwindTableRow<R>>
-    where
-        F: FnMut(&Self, &BaseAddresses, Self::Offset) -> Result<CommonInformationEntry<R>>,
-    {
-        let fde = self.fde_for_address(bases, address, get_cie)?;
-        fde.unwind_info_for_address(self, bases, ctx, address)
-    }
-}
-
-impl<R: Reader> _UnwindSectionPrivate<R> for DebugFrame<R> {
-    fn section(&self) -> &R {
-        &self.section
-    }
-
-    fn length_value_is_end_of_entries(_: R::Offset) -> bool {
-        false
-    }
-
-    fn is_cie(format: Format, id: u64) -> bool {
-        match format {
-            Format::Dwarf32 => id == 0xffff_ffff,
-            Format::Dwarf64 => id == 0xffff_ffff_ffff_ffff,
-        }
-    }
-
-    fn cie_offset_encoding(format: Format) -> CieOffsetEncoding {
-        match format {
-            Format::Dwarf32 => CieOffsetEncoding::U32,
-            Format::Dwarf64 => CieOffsetEncoding::U64,
-        }
-    }
-
-    fn resolve_cie_offset(&self, _: R::Offset, offset: R::Offset) -> Option<R::Offset> {
-        Some(offset)
-    }
-
-    fn has_address_and_segment_sizes(version: u8) -> bool {
-        version == 4
-    }
-
-    fn address_size(&self) -> u8 {
-        self.address_size
-    }
-
-    fn segment_size(&self) -> u8 {
-        self.segment_size
-    }
-}
-
-impl<R: Reader> UnwindSection<R> for DebugFrame<R> {
-    type Offset = DebugFrameOffset<R::Offset>;
-}
-
-impl<R: Reader> _UnwindSectionPrivate<R> for EhFrame<R> {
-    fn section(&self) -> &R {
-        &self.section
-    }
-
-    fn length_value_is_end_of_entries(length: R::Offset) -> bool {
-        length.into_u64() == 0
-    }
-
-    fn is_cie(_: Format, id: u64) -> bool {
-        id == 0
-    }
-
-    fn cie_offset_encoding(_format: Format) -> CieOffsetEncoding {
-        // `.eh_frame` offsets are always 4 bytes, regardless of the DWARF
-        // format.
-        CieOffsetEncoding::U32
-    }
-
-    fn resolve_cie_offset(&self, base: R::Offset, offset: R::Offset) -> Option<R::Offset> {
-        base.checked_sub(offset)
-    }
-
-    fn has_address_and_segment_sizes(_version: u8) -> bool {
-        false
-    }
-
-    fn address_size(&self) -> u8 {
-        self.address_size
-    }
-
-    fn segment_size(&self) -> u8 {
-        0
-    }
-}
-
-impl<R: Reader> UnwindSection<R> for EhFrame<R> {
-    type Offset = EhFrameOffset<R::Offset>;
-}
-
-/// Optional base addresses for the relative `DW_EH_PE_*` encoded pointers.
-///
-/// During CIE/FDE parsing, if a relative pointer is encountered for a base
-/// address that is unknown, an Err will be returned.
-///
-/// ```
-/// use gimli::BaseAddresses;
-///
-/// # fn foo() {
-/// # let address_of_eh_frame_hdr_section_in_memory = unimplemented!();
-/// # let address_of_eh_frame_section_in_memory = unimplemented!();
-/// # let address_of_text_section_in_memory = unimplemented!();
-/// # let address_of_got_section_in_memory = unimplemented!();
-/// # let address_of_the_start_of_current_func = unimplemented!();
-/// let bases = BaseAddresses::default()
-///     .set_eh_frame_hdr(address_of_eh_frame_hdr_section_in_memory)
-///     .set_eh_frame(address_of_eh_frame_section_in_memory)
-///     .set_text(address_of_text_section_in_memory)
-///     .set_got(address_of_got_section_in_memory);
-/// # let _ = bases;
-/// # }
-/// ```
-#[derive(Clone, Default, Debug, PartialEq, Eq)]
-pub struct BaseAddresses {
-    /// The base addresses to use for pointers in the `.eh_frame_hdr` section.
-    pub eh_frame_hdr: SectionBaseAddresses,
-
-    /// The base addresses to use for pointers in the `.eh_frame` section.
-    pub eh_frame: SectionBaseAddresses,
-}
-
-/// Optional base addresses for the relative `DW_EH_PE_*` encoded pointers
-/// in a particular section.
-///
-/// See `BaseAddresses` for methods that are helpful in setting these addresses.
-#[derive(Clone, Default, Debug, PartialEq, Eq)]
-pub struct SectionBaseAddresses {
-    /// The address of the section containing the pointer.
-    pub section: Option<u64>,
-
-    /// The base address for text relative pointers.
-    /// This is generally the address of the `.text` section.
-    pub text: Option<u64>,
-
-    /// The base address for data relative pointers.
-    ///
-    /// For pointers in the `.eh_frame_hdr` section, this is the address
-    /// of the `.eh_frame_hdr` section
-    ///
-    /// For pointers in the `.eh_frame` section, this is generally the
-    /// global pointer, such as the address of the `.got` section.
-    pub data: Option<u64>,
-}
-
-impl BaseAddresses {
-    /// Set the `.eh_frame_hdr` section base address.
-    #[inline]
-    pub fn set_eh_frame_hdr(mut self, addr: u64) -> Self {
-        self.eh_frame_hdr.section = Some(addr);
-        self.eh_frame_hdr.data = Some(addr);
-        self
-    }
-
-    /// Set the `.eh_frame` section base address.
-    #[inline]
-    pub fn set_eh_frame(mut self, addr: u64) -> Self {
-        self.eh_frame.section = Some(addr);
-        self
-    }
-
-    /// Set the `.text` section base address.
-    #[inline]
-    pub fn set_text(mut self, addr: u64) -> Self {
-        self.eh_frame_hdr.text = Some(addr);
-        self.eh_frame.text = Some(addr);
-        self
-    }
-
-    /// Set the `.got` section base address.
-    #[inline]
-    pub fn set_got(mut self, addr: u64) -> Self {
-        self.eh_frame.data = Some(addr);
-        self
-    }
-}
-
-/// An iterator over CIE and FDE entries in a `.debug_frame` or `.eh_frame`
-/// section.
-///
-/// Some pointers may be encoded relative to various base addresses. Use the
-/// [`BaseAddresses`](./struct.BaseAddresses.html) parameter to provide them. By
-/// default, none are provided. If a relative pointer is encountered for a base
-/// address that is unknown, an `Err` will be returned and iteration will abort.
-///
-/// Can be [used with
-/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-///
-/// ```
-/// use gimli::{BaseAddresses, EhFrame, EndianSlice, NativeEndian, UnwindSection};
-///
-/// # fn foo() -> gimli::Result<()> {
-/// # let read_eh_frame_somehow = || unimplemented!();
-/// let eh_frame = EhFrame::new(read_eh_frame_somehow(), NativeEndian);
-///
-/// # let address_of_eh_frame_hdr_section_in_memory = unimplemented!();
-/// # let address_of_eh_frame_section_in_memory = unimplemented!();
-/// # let address_of_text_section_in_memory = unimplemented!();
-/// # let address_of_got_section_in_memory = unimplemented!();
-/// # let address_of_the_start_of_current_func = unimplemented!();
-/// // Provide base addresses for relative pointers.
-/// let bases = BaseAddresses::default()
-///     .set_eh_frame_hdr(address_of_eh_frame_hdr_section_in_memory)
-///     .set_eh_frame(address_of_eh_frame_section_in_memory)
-///     .set_text(address_of_text_section_in_memory)
-///     .set_got(address_of_got_section_in_memory);
-///
-/// let mut entries = eh_frame.entries(&bases);
-///
-/// # let do_stuff_with = |_| unimplemented!();
-/// while let Some(entry) = entries.next()? {
-///     do_stuff_with(entry)
-/// }
-/// # unreachable!()
-/// # }
-/// ```
-#[derive(Clone, Debug)]
-pub struct CfiEntriesIter<'bases, Section, R>
-where
-    R: Reader,
-    Section: UnwindSection<R>,
-{
-    section: Section,
-    bases: &'bases BaseAddresses,
-    input: R,
-}
-
-impl<'bases, Section, R> CfiEntriesIter<'bases, Section, R>
-where
-    R: Reader,
-    Section: UnwindSection<R>,
-{
-    /// Advance the iterator to the next entry.
-    pub fn next(&mut self) -> Result<Option<CieOrFde<'bases, Section, R>>> {
-        if self.input.is_empty() {
-            return Ok(None);
-        }
-
-        match parse_cfi_entry(self.bases, &self.section, &mut self.input) {
-            Err(e) => {
-                self.input.empty();
-                Err(e)
-            }
-            Ok(None) => {
-                self.input.empty();
-                Ok(None)
-            }
-            Ok(Some(entry)) => Ok(Some(entry)),
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<'bases, Section, R> fallible_iterator::FallibleIterator for CfiEntriesIter<'bases, Section, R>
-where
-    R: Reader,
-    Section: UnwindSection<R>,
-{
-    type Item = CieOrFde<'bases, Section, R>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        CfiEntriesIter::next(self)
-    }
-}
-
-/// Either a `CommonInformationEntry` (CIE) or a `FrameDescriptionEntry` (FDE).
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum CieOrFde<'bases, Section, R>
-where
-    R: Reader,
-    Section: UnwindSection<R>,
-{
-    /// This CFI entry is a `CommonInformationEntry`.
-    Cie(CommonInformationEntry<R>),
-    /// This CFI entry is a `FrameDescriptionEntry`, however fully parsing it
-    /// requires parsing its CIE first, so it is left in a partially parsed
-    /// state.
-    Fde(PartialFrameDescriptionEntry<'bases, Section, R>),
-}
-
-#[allow(clippy::type_complexity)]
-fn parse_cfi_entry<'bases, Section, R>(
-    bases: &'bases BaseAddresses,
-    section: &Section,
-    input: &mut R,
-) -> Result<Option<CieOrFde<'bases, Section, R>>>
-where
-    R: Reader,
-    Section: UnwindSection<R>,
-{
-    let (offset, length, format) = loop {
-        let offset = input.offset_from(section.section());
-        let (length, format) = input.read_initial_length()?;
-
-        if Section::length_value_is_end_of_entries(length) {
-            return Ok(None);
-        }
-
-        // Hack: skip zero padding inserted by buggy compilers/linkers.
-        // We require that the padding is a multiple of 32-bits, otherwise
-        // there is no reliable way to determine when the padding ends. This
-        // should be okay since CFI entries must be aligned to the address size.
-
-        if length.into_u64() != 0 || format != Format::Dwarf32 {
-            break (offset, length, format);
-        }
-    };
-
-    let mut rest = input.split(length)?;
-    let cie_offset_base = rest.offset_from(section.section());
-    let cie_id_or_offset = match Section::cie_offset_encoding(format) {
-        CieOffsetEncoding::U32 => rest.read_u32().map(u64::from)?,
-        CieOffsetEncoding::U64 => rest.read_u64()?,
-    };
-
-    if Section::is_cie(format, cie_id_or_offset) {
-        let cie = CommonInformationEntry::parse_rest(offset, length, format, bases, section, rest)?;
-        Ok(Some(CieOrFde::Cie(cie)))
-    } else {
-        let cie_offset = R::Offset::from_u64(cie_id_or_offset)?;
-        let cie_offset = match section.resolve_cie_offset(cie_offset_base, cie_offset) {
-            None => return Err(Error::OffsetOutOfBounds),
-            Some(cie_offset) => cie_offset,
-        };
-
-        let fde = PartialFrameDescriptionEntry {
-            offset,
-            length,
-            format,
-            cie_offset: cie_offset.into(),
-            rest,
-            section: section.clone(),
-            bases,
-        };
-
-        Ok(Some(CieOrFde::Fde(fde)))
-    }
-}
-
-/// We support the z-style augmentation [defined by `.eh_frame`][ehframe].
-///
-/// [ehframe]: http://refspecs.linuxfoundation.org/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
-pub struct Augmentation {
-    /// > A 'L' may be present at any position after the first character of the
-    /// > string. This character may only be present if 'z' is the first character
-    /// > of the string. If present, it indicates the presence of one argument in
-    /// > the Augmentation Data of the CIE, and a corresponding argument in the
-    /// > Augmentation Data of the FDE. The argument in the Augmentation Data of
-    /// > the CIE is 1-byte and represents the pointer encoding used for the
-    /// > argument in the Augmentation Data of the FDE, which is the address of a
-    /// > language-specific data area (LSDA). The size of the LSDA pointer is
-    /// > specified by the pointer encoding used.
-    lsda: Option<constants::DwEhPe>,
-
-    /// > A 'P' may be present at any position after the first character of the
-    /// > string. This character may only be present if 'z' is the first character
-    /// > of the string. If present, it indicates the presence of two arguments in
-    /// > the Augmentation Data of the CIE. The first argument is 1-byte and
-    /// > represents the pointer encoding used for the second argument, which is
-    /// > the address of a personality routine handler. The size of the
-    /// > personality routine pointer is specified by the pointer encoding used.
-    personality: Option<(constants::DwEhPe, Pointer)>,
-
-    /// > A 'R' may be present at any position after the first character of the
-    /// > string. This character may only be present if 'z' is the first character
-    /// > of the string. If present, The Augmentation Data shall include a 1 byte
-    /// > argument that represents the pointer encoding for the address pointers
-    /// > used in the FDE.
-    fde_address_encoding: Option<constants::DwEhPe>,
-
-    /// True if this CIE's FDEs are trampolines for signal handlers.
-    is_signal_trampoline: bool,
-}
-
-impl Augmentation {
-    fn parse<Section, R>(
-        augmentation_str: &mut R,
-        bases: &BaseAddresses,
-        address_size: u8,
-        section: &Section,
-        input: &mut R,
-    ) -> Result<Augmentation>
-    where
-        R: Reader,
-        Section: UnwindSection<R>,
-    {
-        debug_assert!(
-            !augmentation_str.is_empty(),
-            "Augmentation::parse should only be called if we have an augmentation"
-        );
-
-        let mut augmentation = Augmentation::default();
-
-        let mut parsed_first = false;
-        let mut data = None;
-
-        while !augmentation_str.is_empty() {
-            let ch = augmentation_str.read_u8()?;
-            match ch {
-                b'z' => {
-                    if parsed_first {
-                        return Err(Error::UnknownAugmentation);
-                    }
-
-                    let augmentation_length = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                    data = Some(input.split(augmentation_length)?);
-                }
-                b'L' => {
-                    let rest = data.as_mut().ok_or(Error::UnknownAugmentation)?;
-                    let encoding = parse_pointer_encoding(rest)?;
-                    augmentation.lsda = Some(encoding);
-                }
-                b'P' => {
-                    let rest = data.as_mut().ok_or(Error::UnknownAugmentation)?;
-                    let encoding = parse_pointer_encoding(rest)?;
-                    let parameters = PointerEncodingParameters {
-                        bases: &bases.eh_frame,
-                        func_base: None,
-                        address_size,
-                        section: section.section(),
-                    };
-
-                    let personality = parse_encoded_pointer(encoding, &parameters, rest)?;
-                    augmentation.personality = Some((encoding, personality));
-                }
-                b'R' => {
-                    let rest = data.as_mut().ok_or(Error::UnknownAugmentation)?;
-                    let encoding = parse_pointer_encoding(rest)?;
-                    augmentation.fde_address_encoding = Some(encoding);
-                }
-                b'S' => augmentation.is_signal_trampoline = true,
-                _ => return Err(Error::UnknownAugmentation),
-            }
-
-            parsed_first = true;
-        }
-
-        Ok(augmentation)
-    }
-}
-
-/// Parsed augmentation data for a `FrameDescriptEntry`.
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-struct AugmentationData {
-    lsda: Option<Pointer>,
-}
-
-impl AugmentationData {
-    fn parse<R: Reader>(
-        augmentation: &Augmentation,
-        encoding_parameters: &PointerEncodingParameters<R>,
-        input: &mut R,
-    ) -> Result<AugmentationData> {
-        // In theory, we should be iterating over the original augmentation
-        // string, interpreting each character, and reading the appropriate bits
-        // out of the augmentation data as we go. However, the only character
-        // that defines augmentation data in the FDE is the 'L' character, so we
-        // can just check for its presence directly.
-
-        let aug_data_len = input.read_uleb128().and_then(R::Offset::from_u64)?;
-        let rest = &mut input.split(aug_data_len)?;
-        let mut augmentation_data = AugmentationData::default();
-        if let Some(encoding) = augmentation.lsda {
-            let lsda = parse_encoded_pointer(encoding, encoding_parameters, rest)?;
-            augmentation_data.lsda = Some(lsda);
-        }
-        Ok(augmentation_data)
-    }
-}
-
-/// > A Common Information Entry holds information that is shared among many
-/// > Frame Description Entries. There is at least one CIE in every non-empty
-/// > `.debug_frame` section.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct CommonInformationEntry<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// The offset of this entry from the start of its containing section.
-    offset: Offset,
-
-    /// > A constant that gives the number of bytes of the CIE structure, not
-    /// > including the length field itself (see Section 7.2.2). The size of the
-    /// > length field plus the value of length must be an integral multiple of
-    /// > the address size.
-    length: Offset,
-
-    format: Format,
-
-    /// > A version number (see Section 7.23). This number is specific to the
-    /// > call frame information and is independent of the DWARF version number.
-    version: u8,
-
-    /// The parsed augmentation, if any.
-    augmentation: Option<Augmentation>,
-
-    /// > The size of a target address in this CIE and any FDEs that use it, in
-    /// > bytes. If a compilation unit exists for this frame, its address size
-    /// > must match the address size here.
-    address_size: u8,
-
-    /// "The size of a segment selector in this CIE and any FDEs that use it, in
-    /// bytes."
-    segment_size: u8,
-
-    /// "A constant that is factored out of all advance location instructions
-    /// (see Section 6.4.2.1)."
-    code_alignment_factor: u64,
-
-    /// > A constant that is factored out of certain offset instructions (see
-    /// > below). The resulting value is (operand * data_alignment_factor).
-    data_alignment_factor: i64,
-
-    /// > An unsigned LEB128 constant that indicates which column in the rule
-    /// > table represents the return address of the function. Note that this
-    /// > column might not correspond to an actual machine register.
-    return_address_register: Register,
-
-    /// > A sequence of rules that are interpreted to create the initial setting
-    /// > of each column in the table.
-    ///
-    /// > The default rule for all columns before interpretation of the initial
-    /// > instructions is the undefined rule. However, an ABI authoring body or a
-    /// > compilation system authoring body may specify an alternate default
-    /// > value for any or all columns.
-    ///
-    /// This is followed by `DW_CFA_nop` padding until the end of `length` bytes
-    /// in the input.
-    initial_instructions: R,
-}
-
-impl<R: Reader> CommonInformationEntry<R> {
-    fn parse<Section: UnwindSection<R>>(
-        bases: &BaseAddresses,
-        section: &Section,
-        input: &mut R,
-    ) -> Result<CommonInformationEntry<R>> {
-        match parse_cfi_entry(bases, section, input)? {
-            Some(CieOrFde::Cie(cie)) => Ok(cie),
-            Some(CieOrFde::Fde(_)) => Err(Error::NotCieId),
-            None => Err(Error::NoEntryAtGivenOffset),
-        }
-    }
-
-    fn parse_rest<Section: UnwindSection<R>>(
-        offset: R::Offset,
-        length: R::Offset,
-        format: Format,
-        bases: &BaseAddresses,
-        section: &Section,
-        mut rest: R,
-    ) -> Result<CommonInformationEntry<R>> {
-        let version = rest.read_u8()?;
-
-        // Version 1 of `.debug_frame` corresponds to DWARF 2, and then for
-        // DWARF 3 and 4, I think they decided to just match the standard's
-        // version.
-        match version {
-            1 | 3 | 4 => (),
-            _ => return Err(Error::UnknownVersion(u64::from(version))),
-        }
-
-        let mut augmentation_string = rest.read_null_terminated_slice()?;
-
-        let (address_size, segment_size) = if Section::has_address_and_segment_sizes(version) {
-            let address_size = rest.read_u8()?;
-            let segment_size = rest.read_u8()?;
-            (address_size, segment_size)
-        } else {
-            (section.address_size(), section.segment_size())
-        };
-
-        let code_alignment_factor = rest.read_uleb128()?;
-        let data_alignment_factor = rest.read_sleb128()?;
-
-        let return_address_register = if version == 1 {
-            Register(rest.read_u8()?.into())
-        } else {
-            rest.read_uleb128().and_then(Register::from_u64)?
-        };
-
-        let augmentation = if augmentation_string.is_empty() {
-            None
-        } else {
-            Some(Augmentation::parse(
-                &mut augmentation_string,
-                bases,
-                address_size,
-                section,
-                &mut rest,
-            )?)
-        };
-
-        let entry = CommonInformationEntry {
-            offset,
-            length,
-            format,
-            version,
-            augmentation,
-            address_size,
-            segment_size,
-            code_alignment_factor,
-            data_alignment_factor,
-            return_address_register,
-            initial_instructions: rest,
-        };
-
-        Ok(entry)
-    }
-}
-
-/// # Signal Safe Methods
-///
-/// These methods are guaranteed not to allocate, acquire locks, or perform any
-/// other signal-unsafe operations.
-impl<R: Reader> CommonInformationEntry<R> {
-    /// Get the offset of this entry from the start of its containing section.
-    pub fn offset(&self) -> R::Offset {
-        self.offset
-    }
-
-    /// Return the encoding parameters for this CIE.
-    pub fn encoding(&self) -> Encoding {
-        Encoding {
-            format: self.format,
-            version: u16::from(self.version),
-            address_size: self.address_size,
-        }
-    }
-
-    /// The size of addresses (in bytes) in this CIE.
-    pub fn address_size(&self) -> u8 {
-        self.address_size
-    }
-
-    /// Iterate over this CIE's initial instructions.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn instructions<'a, Section>(
-        &self,
-        section: &'a Section,
-        bases: &'a BaseAddresses,
-    ) -> CallFrameInstructionIter<'a, R>
-    where
-        Section: UnwindSection<R>,
-    {
-        CallFrameInstructionIter {
-            input: self.initial_instructions.clone(),
-            address_encoding: None,
-            parameters: PointerEncodingParameters {
-                bases: &bases.eh_frame,
-                func_base: None,
-                address_size: self.address_size,
-                section: section.section(),
-            },
-        }
-    }
-
-    /// > A constant that gives the number of bytes of the CIE structure, not
-    /// > including the length field itself (see Section 7.2.2). The size of the
-    /// > length field plus the value of length must be an integral multiple of
-    /// > the address size.
-    pub fn entry_len(&self) -> R::Offset {
-        self.length
-    }
-
-    /// > A version number (see Section 7.23). This number is specific to the
-    /// > call frame information and is independent of the DWARF version number.
-    pub fn version(&self) -> u8 {
-        self.version
-    }
-
-    /// Get the augmentation data, if any exists.
-    ///
-    /// The only augmentation understood by `gimli` is that which is defined by
-    /// `.eh_frame`.
-    pub fn augmentation(&self) -> Option<&Augmentation> {
-        self.augmentation.as_ref()
-    }
-
-    /// True if this CIE's FDEs have a LSDA.
-    pub fn has_lsda(&self) -> bool {
-        self.augmentation.map_or(false, |a| a.lsda.is_some())
-    }
-
-    /// Return the encoding of the LSDA address for this CIE's FDEs.
-    pub fn lsda_encoding(&self) -> Option<constants::DwEhPe> {
-        self.augmentation.and_then(|a| a.lsda)
-    }
-
-    /// Return the encoding and address of the personality routine handler
-    /// for this CIE's FDEs.
-    pub fn personality_with_encoding(&self) -> Option<(constants::DwEhPe, Pointer)> {
-        self.augmentation.as_ref().and_then(|a| a.personality)
-    }
-
-    /// Return the address of the personality routine handler
-    /// for this CIE's FDEs.
-    pub fn personality(&self) -> Option<Pointer> {
-        self.augmentation
-            .as_ref()
-            .and_then(|a| a.personality)
-            .map(|(_, p)| p)
-    }
-
-    /// Return the encoding of the addresses for this CIE's FDEs.
-    pub fn fde_address_encoding(&self) -> Option<constants::DwEhPe> {
-        self.augmentation.and_then(|a| a.fde_address_encoding)
-    }
-
-    /// True if this CIE's FDEs are trampolines for signal handlers.
-    pub fn is_signal_trampoline(&self) -> bool {
-        self.augmentation.map_or(false, |a| a.is_signal_trampoline)
-    }
-
-    /// > A constant that is factored out of all advance location instructions
-    /// > (see Section 6.4.2.1).
-    pub fn code_alignment_factor(&self) -> u64 {
-        self.code_alignment_factor
-    }
-
-    /// > A constant that is factored out of certain offset instructions (see
-    /// > below). The resulting value is (operand * data_alignment_factor).
-    pub fn data_alignment_factor(&self) -> i64 {
-        self.data_alignment_factor
-    }
-
-    /// > An unsigned ... constant that indicates which column in the rule
-    /// > table represents the return address of the function. Note that this
-    /// > column might not correspond to an actual machine register.
-    pub fn return_address_register(&self) -> Register {
-        self.return_address_register
-    }
-}
-
-/// A partially parsed `FrameDescriptionEntry`.
-///
-/// Fully parsing this FDE requires first parsing its CIE.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct PartialFrameDescriptionEntry<'bases, Section, R>
-where
-    R: Reader,
-    Section: UnwindSection<R>,
-{
-    offset: R::Offset,
-    length: R::Offset,
-    format: Format,
-    cie_offset: Section::Offset,
-    rest: R,
-    section: Section,
-    bases: &'bases BaseAddresses,
-}
-
-impl<'bases, Section, R> PartialFrameDescriptionEntry<'bases, Section, R>
-where
-    R: Reader,
-    Section: UnwindSection<R>,
-{
-    fn parse_partial(
-        section: &Section,
-        bases: &'bases BaseAddresses,
-        input: &mut R,
-    ) -> Result<PartialFrameDescriptionEntry<'bases, Section, R>> {
-        match parse_cfi_entry(bases, section, input)? {
-            Some(CieOrFde::Cie(_)) => Err(Error::NotFdePointer),
-            Some(CieOrFde::Fde(partial)) => Ok(partial),
-            None => Err(Error::NoEntryAtGivenOffset),
-        }
-    }
-
-    /// Fully parse this FDE.
-    ///
-    /// You must provide a function get its associated CIE (either by parsing it
-    /// on demand, or looking it up in some table mapping offsets to CIEs that
-    /// you've already parsed, etc.)
-    pub fn parse<F>(&self, get_cie: F) -> Result<FrameDescriptionEntry<R>>
-    where
-        F: FnMut(&Section, &BaseAddresses, Section::Offset) -> Result<CommonInformationEntry<R>>,
-    {
-        FrameDescriptionEntry::parse_rest(
-            self.offset,
-            self.length,
-            self.format,
-            self.cie_offset,
-            self.rest.clone(),
-            &self.section,
-            self.bases,
-            get_cie,
-        )
-    }
-}
-
-/// A `FrameDescriptionEntry` is a set of CFA instructions for an address range.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct FrameDescriptionEntry<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// The start of this entry within its containing section.
-    offset: Offset,
-
-    /// > A constant that gives the number of bytes of the header and
-    /// > instruction stream for this function, not including the length field
-    /// > itself (see Section 7.2.2). The size of the length field plus the value
-    /// > of length must be an integral multiple of the address size.
-    length: Offset,
-
-    format: Format,
-
-    /// "A constant offset into the .debug_frame section that denotes the CIE
-    /// that is associated with this FDE."
-    ///
-    /// This is the CIE at that offset.
-    cie: CommonInformationEntry<R, Offset>,
-
-    /// > The address of the first location associated with this table entry. If
-    /// > the segment_size field of this FDE's CIE is non-zero, the initial
-    /// > location is preceded by a segment selector of the given length.
-    initial_segment: u64,
-    initial_address: u64,
-
-    /// "The number of bytes of program instructions described by this entry."
-    address_range: u64,
-
-    /// The parsed augmentation data, if we have any.
-    augmentation: Option<AugmentationData>,
-
-    /// "A sequence of table defining instructions that are described below."
-    ///
-    /// This is followed by `DW_CFA_nop` padding until `length` bytes of the
-    /// input are consumed.
-    instructions: R,
-}
-
-impl<R: Reader> FrameDescriptionEntry<R> {
-    #[allow(clippy::too_many_arguments)]
-    fn parse_rest<Section, F>(
-        offset: R::Offset,
-        length: R::Offset,
-        format: Format,
-        cie_pointer: Section::Offset,
-        mut rest: R,
-        section: &Section,
-        bases: &BaseAddresses,
-        mut get_cie: F,
-    ) -> Result<FrameDescriptionEntry<R>>
-    where
-        Section: UnwindSection<R>,
-        F: FnMut(&Section, &BaseAddresses, Section::Offset) -> Result<CommonInformationEntry<R>>,
-    {
-        let cie = get_cie(section, bases, cie_pointer)?;
-
-        let initial_segment = if cie.segment_size > 0 {
-            rest.read_address(cie.segment_size)?
-        } else {
-            0
-        };
-
-        let mut parameters = PointerEncodingParameters {
-            bases: &bases.eh_frame,
-            func_base: None,
-            address_size: cie.address_size,
-            section: section.section(),
-        };
-
-        let (initial_address, address_range) = Self::parse_addresses(&mut rest, &cie, &parameters)?;
-        parameters.func_base = Some(initial_address);
-
-        let aug_data = if let Some(ref augmentation) = cie.augmentation {
-            Some(AugmentationData::parse(
-                augmentation,
-                &parameters,
-                &mut rest,
-            )?)
-        } else {
-            None
-        };
-
-        let entry = FrameDescriptionEntry {
-            offset,
-            length,
-            format,
-            cie,
-            initial_segment,
-            initial_address,
-            address_range,
-            augmentation: aug_data,
-            instructions: rest,
-        };
-
-        Ok(entry)
-    }
-
-    fn parse_addresses(
-        input: &mut R,
-        cie: &CommonInformationEntry<R>,
-        parameters: &PointerEncodingParameters<R>,
-    ) -> Result<(u64, u64)> {
-        let encoding = cie.augmentation().and_then(|a| a.fde_address_encoding);
-        if let Some(encoding) = encoding {
-            let initial_address = parse_encoded_pointer(encoding, parameters, input)?;
-
-            // Ignore indirection.
-            let initial_address = initial_address.into();
-
-            // Address ranges cannot be relative to anything, so just grab the
-            // data format bits from the encoding.
-            let address_range = parse_encoded_pointer(encoding.format(), parameters, input)?;
-            Ok((initial_address, address_range.into()))
-        } else {
-            let initial_address = input.read_address(cie.address_size)?;
-            let address_range = input.read_address(cie.address_size)?;
-            Ok((initial_address, address_range))
-        }
-    }
-
-    /// Return the table of unwind information for this FDE.
-    #[inline]
-    pub fn rows<'a, Section: UnwindSection<R>>(
-        &self,
-        section: &'a Section,
-        bases: &'a BaseAddresses,
-        ctx: &'a mut UninitializedUnwindContext<R>,
-    ) -> Result<UnwindTable<'a, R>> {
-        UnwindTable::new(section, bases, ctx, self)
-    }
-
-    /// Find the frame unwind information for the given address.
-    ///
-    /// If found, the unwind information is returned along with the reset
-    /// context in the form `Ok((unwind_info, context))`. If not found,
-    /// `Err(gimli::Error::NoUnwindInfoForAddress)` is returned. If parsing or
-    /// CFI evaluation fails, the error is returned.
-    pub fn unwind_info_for_address<Section: UnwindSection<R>>(
-        &self,
-        section: &Section,
-        bases: &BaseAddresses,
-        ctx: &mut UninitializedUnwindContext<R>,
-        address: u64,
-    ) -> Result<UnwindTableRow<R>> {
-        let mut table = self.rows(section, bases, ctx)?;
-        while let Some(row) = table.next_row()? {
-            if row.contains(address) {
-                return Ok(row.clone());
-            }
-        }
-        Err(Error::NoUnwindInfoForAddress)
-    }
-}
-
-/// # Signal Safe Methods
-///
-/// These methods are guaranteed not to allocate, acquire locks, or perform any
-/// other signal-unsafe operations.
-#[allow(clippy::len_without_is_empty)]
-impl<R: Reader> FrameDescriptionEntry<R> {
-    /// Get the offset of this entry from the start of its containing section.
-    pub fn offset(&self) -> R::Offset {
-        self.offset
-    }
-
-    /// Get a reference to this FDE's CIE.
-    pub fn cie(&self) -> &CommonInformationEntry<R> {
-        &self.cie
-    }
-
-    /// > A constant that gives the number of bytes of the header and
-    /// > instruction stream for this function, not including the length field
-    /// > itself (see Section 7.2.2). The size of the length field plus the value
-    /// > of length must be an integral multiple of the address size.
-    pub fn entry_len(&self) -> R::Offset {
-        self.length
-    }
-
-    /// Iterate over this FDE's instructions.
-    ///
-    /// Will not include the CIE's initial instructions, if you want those do
-    /// `fde.cie().instructions()` first.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn instructions<'a, Section>(
-        &self,
-        section: &'a Section,
-        bases: &'a BaseAddresses,
-    ) -> CallFrameInstructionIter<'a, R>
-    where
-        Section: UnwindSection<R>,
-    {
-        CallFrameInstructionIter {
-            input: self.instructions.clone(),
-            address_encoding: self.cie.augmentation().and_then(|a| a.fde_address_encoding),
-            parameters: PointerEncodingParameters {
-                bases: &bases.eh_frame,
-                func_base: None,
-                address_size: self.cie.address_size,
-                section: section.section(),
-            },
-        }
-    }
-
-    /// The first address for which this entry has unwind information for.
-    pub fn initial_address(&self) -> u64 {
-        self.initial_address
-    }
-
-    /// The number of bytes of instructions that this entry has unwind
-    /// information for.
-    pub fn len(&self) -> u64 {
-        self.address_range
-    }
-
-    /// Return `true` if the given address is within this FDE, `false`
-    /// otherwise.
-    ///
-    /// This is equivalent to `entry.initial_address() <= address <
-    /// entry.initial_address() + entry.len()`.
-    pub fn contains(&self, address: u64) -> bool {
-        let start = self.initial_address();
-        let end = start + self.len();
-        start <= address && address < end
-    }
-
-    /// The address of this FDE's language-specific data area (LSDA), if it has
-    /// any.
-    pub fn lsda(&self) -> Option<Pointer> {
-        self.augmentation.as_ref().and_then(|a| a.lsda)
-    }
-
-    /// Return true if this FDE's function is a trampoline for a signal handler.
-    #[inline]
-    pub fn is_signal_trampoline(&self) -> bool {
-        self.cie().is_signal_trampoline()
-    }
-
-    /// Return the address of the FDE's function's personality routine
-    /// handler. The personality routine does language-specific clean up when
-    /// unwinding the stack frames with the intent to not run them again.
-    #[inline]
-    pub fn personality(&self) -> Option<Pointer> {
-        self.cie().personality()
-    }
-}
-
-/// Common context needed when evaluating the call frame unwinding information.
-///
-/// To avoid re-allocating the context multiple times when evaluating multiple
-/// CFI programs, it can be reused. At first, a context is uninitialized
-/// (`UninitializedUnwindContext`). It can be initialized by providing the
-/// `CommonInformationEntry` for the CFI program about to be evaluated and
-/// calling `UninitializedUnwindContext::initialize`. The result is a `&mut UnwindContext`
-/// which borrows the uninitialized context, and can be used to evaluate and run a
-/// `FrameDescriptionEntry`'s CFI program.
-///
-/// ```
-/// use gimli::{UninitializedUnwindContext, UnwindTable};
-///
-/// # fn foo<'a>(some_fde: gimli::FrameDescriptionEntry<gimli::EndianSlice<'a, gimli::LittleEndian>>)
-/// #            -> gimli::Result<()> {
-/// # let eh_frame: gimli::EhFrame<_> = unreachable!();
-/// # let bases = unimplemented!();
-/// // An uninitialized context.
-/// let mut ctx = UninitializedUnwindContext::new();
-///
-/// // Initialize the context by evaluating the CIE's initial instruction program,
-/// // and generate the unwind table.
-/// let mut table = some_fde.rows(&eh_frame, &bases, &mut ctx)?;
-/// while let Some(row) = table.next_row()? {
-///     // Do stuff with each row...
-/// #   let _ = row;
-/// }
-/// # unreachable!()
-/// # }
-/// ```
-#[derive(Clone, Debug)]
-pub struct UninitializedUnwindContext<R: Reader>(Box<UnwindContext<R>>);
-
-impl<R: Reader> UninitializedUnwindContext<R> {
-    /// Construct a new call frame unwinding context.
-    pub fn new() -> UninitializedUnwindContext<R> {
-        UninitializedUnwindContext(Box::new(UnwindContext::new()))
-    }
-}
-
-impl<R: Reader> Default for UninitializedUnwindContext<R> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// # Signal Safe Methods
-///
-/// These methods are guaranteed not to allocate, acquire locks, or perform any
-/// other signal-unsafe operations.
-impl<R: Reader> UninitializedUnwindContext<R> {
-    /// Run the CIE's initial instructions, creating and return an
-    /// `UnwindContext`.
-    pub fn initialize<Section: UnwindSection<R>>(
-        &mut self,
-        section: &Section,
-        bases: &BaseAddresses,
-        cie: &CommonInformationEntry<R>,
-    ) -> Result<&mut UnwindContext<R>> {
-        if self.0.is_initialized {
-            self.0.reset();
-        }
-
-        let mut table = UnwindTable::new_for_cie(section, bases, &mut self.0, cie);
-        while let Some(_) = table.next_row()? {}
-
-        self.0.save_initial_rules();
-        Ok(&mut self.0)
-    }
-}
-
-const MAX_UNWIND_STACK_DEPTH: usize = 4;
-
-/// An unwinding context.
-#[derive(Clone, Debug, Eq)]
-pub struct UnwindContext<R: Reader> {
-    // Stack of rows. The last row is the row currently being built by the
-    // program. There is always at least one row. The vast majority of CFI
-    // programs will only ever have one row on the stack.
-    stack_storage: [UnwindTableRow<R>; MAX_UNWIND_STACK_DEPTH],
-    stack_len: usize,
-
-    // If we are evaluating an FDE's instructions, then `is_initialized` will be
-    // `true` and `initial_rules` will contain the initial register rules
-    // described by the CIE's initial instructions. These rules are used by
-    // `DW_CFA_restore`. Otherwise, when we are currently evaluating a CIE's
-    // initial instructions, `is_initialized` will be `false` and
-    // `initial_rules` is not to be read from.
-    initial_rules: RegisterRuleMap<R>,
-    is_initialized: bool,
-}
-
-/// # Signal Safe Methods
-///
-/// These methods are guaranteed not to allocate, acquire locks, or perform any
-/// other signal-unsafe operations.
-impl<R: Reader> UnwindContext<R> {
-    fn new() -> UnwindContext<R> {
-        let mut ctx = UnwindContext {
-            stack_storage: Default::default(),
-            stack_len: 0,
-            is_initialized: false,
-            initial_rules: Default::default(),
-        };
-        ctx.reset();
-        ctx
-    }
-
-    fn stack(&self) -> &[UnwindTableRow<R>] {
-        &self.stack_storage[..self.stack_len]
-    }
-
-    fn stack_mut(&mut self) -> &mut [UnwindTableRow<R>] {
-        &mut self.stack_storage[..self.stack_len]
-    }
-
-    fn reset(&mut self) {
-        self.stack_len = 0;
-        let res = self.try_push(UnwindTableRow::default());
-        debug_assert!(res);
-
-        self.initial_rules.clear();
-        self.is_initialized = false;
-
-        self.assert_fully_uninitialized();
-    }
-
-    // Asserts that we are fully uninitialized, ie not initialized *and* not in
-    // the process of initializing.
-    #[inline]
-    fn assert_fully_uninitialized(&self) {
-        assert_eq!(self.is_initialized, false);
-        assert_eq!(self.initial_rules.rules().len(), 0);
-        assert_eq!(self.stack().len(), 1);
-        assert!(self.stack()[0].is_default());
-    }
-
-    fn row(&self) -> &UnwindTableRow<R> {
-        self.stack().last().unwrap()
-    }
-
-    fn row_mut(&mut self) -> &mut UnwindTableRow<R> {
-        self.stack_mut().last_mut().unwrap()
-    }
-
-    fn save_initial_rules(&mut self) {
-        assert_eq!(self.is_initialized, false);
-        let registers = &self.stack_storage[self.stack_len - 1].registers;
-        self.initial_rules.clone_from(&registers);
-        self.is_initialized = true;
-    }
-
-    fn start_address(&self) -> u64 {
-        self.row().start_address
-    }
-
-    fn set_start_address(&mut self, start_address: u64) {
-        let row = self.row_mut();
-        row.start_address = start_address;
-    }
-
-    fn set_register_rule(&mut self, register: Register, rule: RegisterRule<R>) -> Result<()> {
-        let row = self.row_mut();
-        row.registers.set(register, rule)
-    }
-
-    /// Returns `None` if we have not completed evaluation of a CIE's initial
-    /// instructions.
-    fn get_initial_rule(&self, register: Register) -> Option<RegisterRule<R>> {
-        if !self.is_initialized {
-            return None;
-        }
-
-        Some(self.initial_rules.get(register))
-    }
-
-    fn set_cfa(&mut self, cfa: CfaRule<R>) {
-        self.row_mut().cfa = cfa;
-    }
-
-    fn cfa_mut(&mut self) -> &mut CfaRule<R> {
-        &mut self.row_mut().cfa
-    }
-
-    fn push_row(&mut self) -> Result<()> {
-        let new_row = self.row().clone();
-        if self.try_push(new_row) {
-            Ok(())
-        } else {
-            Err(Error::CfiStackFull)
-        }
-    }
-
-    fn try_push(&mut self, row: UnwindTableRow<R>) -> bool {
-        if self.stack_len < self.stack_storage.len() {
-            self.stack_storage[self.stack_len] = row;
-            self.stack_len += 1;
-            true
-        } else {
-            false
-        }
-    }
-
-    fn pop_row(&mut self) {
-        assert!(self.stack().len() > 1);
-        self.stack_len -= 1;
-    }
-}
-
-impl<R: Reader + PartialEq> PartialEq for UnwindContext<R> {
-    fn eq(&self, other: &UnwindContext<R>) -> bool {
-        self.stack() == other.stack()
-            && self.initial_rules == other.initial_rules
-            && self.is_initialized == other.is_initialized
-    }
-}
-
-/// The `UnwindTable` iteratively evaluates a `FrameDescriptionEntry`'s
-/// `CallFrameInstruction` program, yielding the each row one at a time.
-///
-/// > 6.4.1 Structure of Call Frame Information
-/// >
-/// > DWARF supports virtual unwinding by defining an architecture independent
-/// > basis for recording how procedures save and restore registers during their
-/// > lifetimes. This basis must be augmented on some machines with specific
-/// > information that is defined by an architecture specific ABI authoring
-/// > committee, a hardware vendor, or a compiler producer. The body defining a
-/// > specific augmentation is referred to below as the “augmenter.�
-/// >
-/// > Abstractly, this mechanism describes a very large table that has the
-/// > following structure:
-/// >
-/// > <table>
-/// >   <tr>
-/// >     <th>LOC</th><th>CFA</th><th>R0</th><th>R1</th><td>...</td><th>RN</th>
-/// >   </tr>
-/// >   <tr>
-/// >     <th>L0</th> <td></td>   <td></td>  <td></td>  <td></td>   <td></td>
-/// >   </tr>
-/// >   <tr>
-/// >     <th>L1</th> <td></td>   <td></td>  <td></td>  <td></td>   <td></td>
-/// >   </tr>
-/// >   <tr>
-/// >     <td>...</td><td></td>   <td></td>  <td></td>  <td></td>   <td></td>
-/// >   </tr>
-/// >   <tr>
-/// >     <th>LN</th> <td></td>   <td></td>  <td></td>  <td></td>   <td></td>
-/// >   </tr>
-/// > </table>
-/// >
-/// > The first column indicates an address for every location that contains code
-/// > in a program. (In shared objects, this is an object-relative offset.) The
-/// > remaining columns contain virtual unwinding rules that are associated with
-/// > the indicated location.
-/// >
-/// > The CFA column defines the rule which computes the Canonical Frame Address
-/// > value; it may be either a register and a signed offset that are added
-/// > together, or a DWARF expression that is evaluated.
-/// >
-/// > The remaining columns are labeled by register number. This includes some
-/// > registers that have special designation on some architectures such as the PC
-/// > and the stack pointer register. (The actual mapping of registers for a
-/// > particular architecture is defined by the augmenter.) The register columns
-/// > contain rules that describe whether a given register has been saved and the
-/// > rule to find the value for the register in the previous frame.
-/// >
-/// > ...
-/// >
-/// > This table would be extremely large if actually constructed as
-/// > described. Most of the entries at any point in the table are identical to
-/// > the ones above them. The whole table can be represented quite compactly by
-/// > recording just the differences starting at the beginning address of each
-/// > subroutine in the program.
-#[derive(Debug)]
-pub struct UnwindTable<'a, R: Reader> {
-    code_alignment_factor: Wrapping<u64>,
-    data_alignment_factor: Wrapping<i64>,
-    next_start_address: u64,
-    last_end_address: u64,
-    returned_last_row: bool,
-    instructions: CallFrameInstructionIter<'a, R>,
-    ctx: &'a mut UnwindContext<R>,
-}
-
-/// # Signal Safe Methods
-///
-/// These methods are guaranteed not to allocate, acquire locks, or perform any
-/// other signal-unsafe operations.
-impl<'a, R: Reader> UnwindTable<'a, R> {
-    /// Construct a new `UnwindTable` for the given
-    /// `FrameDescriptionEntry`'s CFI unwinding program.
-    pub fn new<Section: UnwindSection<R>>(
-        section: &'a Section,
-        bases: &'a BaseAddresses,
-        ctx: &'a mut UninitializedUnwindContext<R>,
-        fde: &FrameDescriptionEntry<R>,
-    ) -> Result<UnwindTable<'a, R>> {
-        let ctx = ctx.initialize(section, bases, fde.cie())?;
-        Ok(Self::new_for_fde(section, bases, ctx, fde))
-    }
-
-    fn new_for_fde<Section: UnwindSection<R>>(
-        section: &'a Section,
-        bases: &'a BaseAddresses,
-        ctx: &'a mut UnwindContext<R>,
-        fde: &FrameDescriptionEntry<R>,
-    ) -> UnwindTable<'a, R> {
-        assert!(ctx.stack().len() >= 1);
-        UnwindTable {
-            code_alignment_factor: Wrapping(fde.cie().code_alignment_factor()),
-            data_alignment_factor: Wrapping(fde.cie().data_alignment_factor()),
-            next_start_address: fde.initial_address(),
-            last_end_address: fde.initial_address().wrapping_add(fde.len()),
-            returned_last_row: false,
-            instructions: fde.instructions(section, bases),
-            ctx,
-        }
-    }
-
-    fn new_for_cie<Section: UnwindSection<R>>(
-        section: &'a Section,
-        bases: &'a BaseAddresses,
-        ctx: &'a mut UnwindContext<R>,
-        cie: &CommonInformationEntry<R>,
-    ) -> UnwindTable<'a, R> {
-        assert!(ctx.stack().len() >= 1);
-        UnwindTable {
-            code_alignment_factor: Wrapping(cie.code_alignment_factor()),
-            data_alignment_factor: Wrapping(cie.data_alignment_factor()),
-            next_start_address: 0,
-            last_end_address: 0,
-            returned_last_row: false,
-            instructions: cie.instructions(section, bases),
-            ctx,
-        }
-    }
-
-    /// Evaluate call frame instructions until the next row of the table is
-    /// completed, and return it.
-    ///
-    /// Unfortunately, this cannot be used with `FallibleIterator` because of
-    /// the restricted lifetime of the yielded item.
-    pub fn next_row(&mut self) -> Result<Option<&UnwindTableRow<R>>> {
-        assert!(self.ctx.stack().len() >= 1);
-        self.ctx.set_start_address(self.next_start_address);
-
-        loop {
-            match self.instructions.next() {
-                Err(e) => return Err(e),
-
-                Ok(None) => {
-                    if self.returned_last_row {
-                        return Ok(None);
-                    }
-
-                    let row = self.ctx.row_mut();
-                    row.end_address = self.last_end_address;
-
-                    self.returned_last_row = true;
-                    return Ok(Some(row));
-                }
-
-                Ok(Some(instruction)) => {
-                    if self.evaluate(instruction)? {
-                        return Ok(Some(self.ctx.row()));
-                    }
-                }
-            };
-        }
-    }
-
-    /// Evaluate one call frame instruction. Return `Ok(true)` if the row is
-    /// complete, `Ok(false)` otherwise.
-    fn evaluate(&mut self, instruction: CallFrameInstruction<R>) -> Result<bool> {
-        use crate::CallFrameInstruction::*;
-
-        match instruction {
-            // Instructions that complete the current row and advance the
-            // address for the next row.
-            SetLoc { address } => {
-                if address < self.ctx.start_address() {
-                    return Err(Error::InvalidAddressRange);
-                }
-
-                self.next_start_address = address;
-                self.ctx.row_mut().end_address = self.next_start_address;
-                return Ok(true);
-            }
-            AdvanceLoc { delta } => {
-                let delta = Wrapping(u64::from(delta)) * self.code_alignment_factor;
-                self.next_start_address = (Wrapping(self.ctx.start_address()) + delta).0;
-                self.ctx.row_mut().end_address = self.next_start_address;
-                return Ok(true);
-            }
-
-            // Instructions that modify the CFA.
-            DefCfa { register, offset } => {
-                self.ctx.set_cfa(CfaRule::RegisterAndOffset {
-                    register,
-                    offset: offset as i64,
-                });
-            }
-            DefCfaSf {
-                register,
-                factored_offset,
-            } => {
-                let data_align = self.data_alignment_factor;
-                self.ctx.set_cfa(CfaRule::RegisterAndOffset {
-                    register,
-                    offset: (Wrapping(factored_offset) * data_align).0,
-                });
-            }
-            DefCfaRegister { register } => {
-                if let CfaRule::RegisterAndOffset {
-                    register: ref mut reg,
-                    ..
-                } = *self.ctx.cfa_mut()
-                {
-                    *reg = register;
-                } else {
-                    return Err(Error::CfiInstructionInInvalidContext);
-                }
-            }
-            DefCfaOffset { offset } => {
-                if let CfaRule::RegisterAndOffset {
-                    offset: ref mut off,
-                    ..
-                } = *self.ctx.cfa_mut()
-                {
-                    *off = offset as i64;
-                } else {
-                    return Err(Error::CfiInstructionInInvalidContext);
-                }
-            }
-            DefCfaOffsetSf { factored_offset } => {
-                if let CfaRule::RegisterAndOffset {
-                    offset: ref mut off,
-                    ..
-                } = *self.ctx.cfa_mut()
-                {
-                    let data_align = self.data_alignment_factor;
-                    *off = (Wrapping(factored_offset) * data_align).0;
-                } else {
-                    return Err(Error::CfiInstructionInInvalidContext);
-                }
-            }
-            DefCfaExpression { expression } => {
-                self.ctx.set_cfa(CfaRule::Expression(expression));
-            }
-
-            // Instructions that define register rules.
-            Undefined { register } => {
-                self.ctx
-                    .set_register_rule(register, RegisterRule::Undefined)?;
-            }
-            SameValue { register } => {
-                self.ctx
-                    .set_register_rule(register, RegisterRule::SameValue)?;
-            }
-            Offset {
-                register,
-                factored_offset,
-            } => {
-                let offset = Wrapping(factored_offset as i64) * self.data_alignment_factor;
-                self.ctx
-                    .set_register_rule(register, RegisterRule::Offset(offset.0))?;
-            }
-            OffsetExtendedSf {
-                register,
-                factored_offset,
-            } => {
-                let offset = Wrapping(factored_offset) * self.data_alignment_factor;
-                self.ctx
-                    .set_register_rule(register, RegisterRule::Offset(offset.0))?;
-            }
-            ValOffset {
-                register,
-                factored_offset,
-            } => {
-                let offset = Wrapping(factored_offset as i64) * self.data_alignment_factor;
-                self.ctx
-                    .set_register_rule(register, RegisterRule::ValOffset(offset.0))?;
-            }
-            ValOffsetSf {
-                register,
-                factored_offset,
-            } => {
-                let offset = Wrapping(factored_offset) * self.data_alignment_factor;
-                self.ctx
-                    .set_register_rule(register, RegisterRule::ValOffset(offset.0))?;
-            }
-            Register {
-                dest_register,
-                src_register,
-            } => {
-                self.ctx
-                    .set_register_rule(dest_register, RegisterRule::Register(src_register))?;
-            }
-            Expression {
-                register,
-                expression,
-            } => {
-                let expression = RegisterRule::Expression(expression);
-                self.ctx.set_register_rule(register, expression)?;
-            }
-            ValExpression {
-                register,
-                expression,
-            } => {
-                let expression = RegisterRule::ValExpression(expression);
-                self.ctx.set_register_rule(register, expression)?;
-            }
-            Restore { register } => {
-                let initial_rule = if let Some(rule) = self.ctx.get_initial_rule(register) {
-                    rule
-                } else {
-                    // Can't restore the initial rule when we are
-                    // evaluating the initial rules!
-                    return Err(Error::CfiInstructionInInvalidContext);
-                };
-
-                self.ctx.set_register_rule(register, initial_rule)?;
-            }
-
-            // Row push and pop instructions.
-            RememberState => {
-                self.ctx.push_row()?;
-            }
-            RestoreState => {
-                assert!(self.ctx.stack().len() > 0);
-                if self.ctx.stack().len() == 1 {
-                    return Err(Error::PopWithEmptyStack);
-                }
-                // Pop state while preserving current location.
-                let start_address = self.ctx.start_address();
-                self.ctx.pop_row();
-                self.ctx.set_start_address(start_address);
-            }
-
-            // GNU Extension. Save the size somewhere so the unwinder can use
-            // it when restoring IP
-            ArgsSize { size } => {
-                self.ctx.row_mut().saved_args_size = size;
-            }
-
-            // No operation.
-            Nop => {}
-        };
-
-        Ok(false)
-    }
-}
-
-// We tend to have very few register rules: usually only a couple. Even if we
-// have a rule for every register, on x86-64 with SSE and everything we're
-// talking about ~100 rules. So rather than keeping the rules in a hash map, or
-// a vector indexed by register number (which would lead to filling lots of
-// empty entries), we store them as a vec of (register number, register rule)
-// pairs.
-//
-// Additionally, because every register's default rule is implicitly
-// `RegisterRule::Undefined`, we never store a register's rule in this vec if it
-// is undefined and save a little bit more space and do a little fewer
-// comparisons that way.
-//
-// The maximum number of rules preallocated by libunwind is 97 for AArch64, 128
-// for ARM, and even 188 for MIPS. It is extremely unlikely to encounter this
-// many register rules in practice.
-//
-// See:
-// - https://github.com/libunwind/libunwind/blob/11fd461095ea98f4b3e3a361f5a8a558519363fa/include/tdep-x86_64/dwarf-config.h#L36
-// - https://github.com/libunwind/libunwind/blob/11fd461095ea98f4b3e3a361f5a8a558519363fa/include/tdep-aarch64/dwarf-config.h#L32
-// - https://github.com/libunwind/libunwind/blob/11fd461095ea98f4b3e3a361f5a8a558519363fa/include/tdep-arm/dwarf-config.h#L31
-// - https://github.com/libunwind/libunwind/blob/11fd461095ea98f4b3e3a361f5a8a558519363fa/include/tdep-mips/dwarf-config.h#L31
-//
-// TODO: Consider using const generics for the array size.
-struct RegisterRuleMap<R: Reader> {
-    rules_storage: MaybeUninit<[(Register, RegisterRule<R>); MAX_RULES]>,
-    rules_len: usize,
-}
-
-const MAX_RULES: usize = 192;
-
-impl<R: Reader + Debug> Debug for RegisterRuleMap<R> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("RegisterRuleMap")
-            .field("rules", &self.rules())
-            .finish()
-    }
-}
-
-impl<R: Reader> Default for RegisterRuleMap<R> {
-    fn default() -> Self {
-        RegisterRuleMap {
-            rules_storage: MaybeUninit::uninit(),
-            rules_len: 0,
-        }
-    }
-}
-
-impl<R: Reader + Clone> Clone for RegisterRuleMap<R> {
-    fn clone(&self) -> Self {
-        let mut new = RegisterRuleMap::default();
-        for (register, rule) in self.rules() {
-            new.push(register.clone(), rule.clone()).unwrap();
-        }
-        return new;
-    }
-}
-
-impl<R: Reader> Drop for RegisterRuleMap<R> {
-    fn drop(&mut self) {
-        self.clear();
-    }
-}
-
-/// # Signal Safe Methods
-///
-/// These methods are guaranteed not to allocate, acquire locks, or perform any
-/// other signal-unsafe operations.
-impl<R: Reader> RegisterRuleMap<R> {
-    fn is_default(&self) -> bool {
-        self.rules_len == 0
-    }
-
-    fn rules(&self) -> &[(Register, RegisterRule<R>)] {
-        // Note that the unsafety here relies on the mutation of
-        // `self.rules_len` in `self.push` below, which guarantees that once
-        // we've pushed something the `rules_storage` is valid for that many
-        // elements.
-        unsafe {
-            core::slice::from_raw_parts(self.rules_storage.as_ptr() as *const _, self.rules_len)
-        }
-    }
-
-    fn rules_mut(&mut self) -> &mut [(Register, RegisterRule<R>)] {
-        // See the note in `rules` on safety here.
-        unsafe {
-            core::slice::from_raw_parts_mut(
-                self.rules_storage.as_mut_ptr() as *mut _,
-                self.rules_len,
-            )
-        }
-    }
-
-    fn get(&self, register: Register) -> RegisterRule<R> {
-        self.rules()
-            .iter()
-            .find(|rule| rule.0 == register)
-            .map(|r| {
-                debug_assert!(r.1.is_defined());
-                r.1.clone()
-            })
-            .unwrap_or(RegisterRule::Undefined)
-    }
-
-    fn set(&mut self, register: Register, rule: RegisterRule<R>) -> Result<()> {
-        if !rule.is_defined() {
-            let idx = self
-                .rules()
-                .iter()
-                .enumerate()
-                .find(|&(_, r)| r.0 == register)
-                .map(|(i, _)| i);
-            if let Some(idx) = idx {
-                let (a, b) = self.rules_mut().split_at_mut(idx + 1);
-                if b.len() > 0 {
-                    mem::swap(&mut a[a.len() - 1], &mut b[b.len() - 1]);
-                }
-                unsafe {
-                    let ptr = self.rules_storage.as_mut_ptr() as *mut (Register, RegisterRule<R>);
-                    ptr::drop_in_place(ptr.add(self.rules_len - 1));
-                    self.rules_len -= 1;
-                }
-            }
-            return Ok(());
-        }
-
-        for &mut (reg, ref mut old_rule) in self.rules_mut() {
-            debug_assert!(old_rule.is_defined());
-            if reg == register {
-                *old_rule = rule;
-                return Ok(());
-            }
-        }
-
-        self.push(register, rule)
-    }
-
-    fn clear(&mut self) {
-        unsafe {
-            ptr::drop_in_place(self.rules_mut());
-            self.rules_len = 0;
-        }
-    }
-
-    fn iter(&self) -> RegisterRuleIter<R> {
-        RegisterRuleIter(self.rules().iter())
-    }
-
-    fn push(&mut self, register: Register, rule: RegisterRule<R>) -> Result<()> {
-        if self.rules_len >= MAX_RULES {
-            return Err(Error::TooManyRegisterRules);
-        }
-        // The unsafety here comes from working with `MaybeUninit` to initialize
-        // our 192-element array. We're pushing a new element onto that array
-        // here. Just above we did a bounds check to make sure we actually have
-        // space to push something and here we're doing the actual memory write,
-        // along with an increment of `rules_len` which will affect the unsafe
-        // implementations of `rules` and `rules_mut` above.
-        unsafe {
-            let ptr = self.rules_storage.as_mut_ptr() as *mut (Register, RegisterRule<R>);
-            ptr::write(ptr.add(self.rules_len), (register, rule));
-            self.rules_len += 1;
-        }
-        Ok(())
-    }
-}
-
-impl<'a, R> FromIterator<&'a (Register, RegisterRule<R>)> for RegisterRuleMap<R>
-where
-    R: 'a + Reader,
-{
-    fn from_iter<T>(iter: T) -> RegisterRuleMap<R>
-    where
-        T: IntoIterator<Item = &'a (Register, RegisterRule<R>)>,
-    {
-        let iter = iter.into_iter();
-        let mut rules = RegisterRuleMap::default();
-        for &(reg, ref rule) in iter.filter(|r| r.1.is_defined()) {
-            rules.set(reg, rule.clone()).expect(
-                "This is only used in tests, impl isn't exposed publicly.
-                         If you trip this, fix your test",
-            );
-        }
-        rules
-    }
-}
-
-impl<R> PartialEq for RegisterRuleMap<R>
-where
-    R: Reader + PartialEq,
-{
-    fn eq(&self, rhs: &Self) -> bool {
-        for &(reg, ref rule) in self.rules() {
-            debug_assert!(rule.is_defined());
-            if *rule != rhs.get(reg) {
-                return false;
-            }
-        }
-
-        for &(reg, ref rhs_rule) in rhs.rules() {
-            debug_assert!(rhs_rule.is_defined());
-            if *rhs_rule != self.get(reg) {
-                return false;
-            }
-        }
-
-        true
-    }
-}
-
-impl<R> Eq for RegisterRuleMap<R> where R: Reader + Eq {}
-
-/// An unordered iterator for register rules.
-#[derive(Debug, Clone)]
-pub struct RegisterRuleIter<'iter, R>(::core::slice::Iter<'iter, (Register, RegisterRule<R>)>)
-where
-    R: Reader;
-
-impl<'iter, R: Reader> Iterator for RegisterRuleIter<'iter, R> {
-    type Item = &'iter (Register, RegisterRule<R>);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next()
-    }
-}
-
-/// A row in the virtual unwind table that describes how to find the values of
-/// the registers in the *previous* frame for a range of PC addresses.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct UnwindTableRow<R: Reader> {
-    start_address: u64,
-    end_address: u64,
-    saved_args_size: u64,
-    cfa: CfaRule<R>,
-    registers: RegisterRuleMap<R>,
-}
-
-impl<R: Reader> Default for UnwindTableRow<R> {
-    fn default() -> Self {
-        UnwindTableRow {
-            start_address: 0,
-            end_address: 0,
-            saved_args_size: 0,
-            cfa: Default::default(),
-            registers: Default::default(),
-        }
-    }
-}
-
-impl<R: Reader> UnwindTableRow<R> {
-    fn is_default(&self) -> bool {
-        self.start_address == 0
-            && self.end_address == 0
-            && self.cfa.is_default()
-            && self.registers.is_default()
-    }
-
-    /// Get the starting PC address that this row applies to.
-    pub fn start_address(&self) -> u64 {
-        self.start_address
-    }
-
-    /// Get the end PC address where this row's register rules become
-    /// unapplicable.
-    ///
-    /// In other words, this row describes how to recover the last frame's
-    /// registers for all PCs where `row.start_address() <= PC <
-    /// row.end_address()`. This row does NOT describe how to recover registers
-    /// when `PC == row.end_address()`.
-    pub fn end_address(&self) -> u64 {
-        self.end_address
-    }
-
-    /// Return `true` if the given `address` is within this row's address range,
-    /// `false` otherwise.
-    pub fn contains(&self, address: u64) -> bool {
-        self.start_address <= address && address < self.end_address
-    }
-
-    /// Returns the amount of args currently on the stack.
-    ///
-    /// When unwinding, if the personality function requested a change in IP,
-    /// the SP needs to be adjusted by saved_args_size.
-    pub fn saved_args_size(&self) -> u64 {
-        self.saved_args_size
-    }
-
-    /// Get the canonical frame address (CFA) recovery rule for this row.
-    pub fn cfa(&self) -> &CfaRule<R> {
-        &self.cfa
-    }
-
-    /// Get the register recovery rule for the given register number.
-    ///
-    /// The register number mapping is architecture dependent. For example, in
-    /// the x86-64 ABI the register number mapping is defined in Figure 3.36:
-    ///
-    /// > Figure 3.36: DWARF Register Number Mapping
-    /// >
-    /// > <table>
-    /// >   <tr><th>Register Name</th>                    <th>Number</th>  <th>Abbreviation</th></tr>
-    /// >   <tr><td>General Purpose Register RAX</td>     <td>0</td>       <td>%rax</td></tr>
-    /// >   <tr><td>General Purpose Register RDX</td>     <td>1</td>       <td>%rdx</td></tr>
-    /// >   <tr><td>General Purpose Register RCX</td>     <td>2</td>       <td>%rcx</td></tr>
-    /// >   <tr><td>General Purpose Register RBX</td>     <td>3</td>       <td>%rbx</td></tr>
-    /// >   <tr><td>General Purpose Register RSI</td>     <td>4</td>       <td>%rsi</td></tr>
-    /// >   <tr><td>General Purpose Register RDI</td>     <td>5</td>       <td>%rdi</td></tr>
-    /// >   <tr><td>General Purpose Register RBP</td>     <td>6</td>       <td>%rbp</td></tr>
-    /// >   <tr><td>Stack Pointer Register RSP</td>       <td>7</td>       <td>%rsp</td></tr>
-    /// >   <tr><td>Extended Integer Registers 8-15</td>  <td>8-15</td>    <td>%r8-%r15</td></tr>
-    /// >   <tr><td>Return Address RA</td>                <td>16</td>      <td></td></tr>
-    /// >   <tr><td>Vector Registers 0–7</td>             <td>17-24</td>   <td>%xmm0–%xmm7</td></tr>
-    /// >   <tr><td>Extended Vector Registers 8–15</td>   <td>25-32</td>   <td>%xmm8–%xmm15</td></tr>
-    /// >   <tr><td>Floating Point Registers 0–7</td>     <td>33-40</td>   <td>%st0–%st7</td></tr>
-    /// >   <tr><td>MMX Registers 0–7</td>                <td>41-48</td>   <td>%mm0–%mm7</td></tr>
-    /// >   <tr><td>Flag Register</td>                    <td>49</td>      <td>%rFLAGS</td></tr>
-    /// >   <tr><td>Segment Register ES</td>              <td>50</td>      <td>%es</td></tr>
-    /// >   <tr><td>Segment Register CS</td>              <td>51</td>      <td>%cs</td></tr>
-    /// >   <tr><td>Segment Register SS</td>              <td>52</td>      <td>%ss</td></tr>
-    /// >   <tr><td>Segment Register DS</td>              <td>53</td>      <td>%ds</td></tr>
-    /// >   <tr><td>Segment Register FS</td>              <td>54</td>      <td>%fs</td></tr>
-    /// >   <tr><td>Segment Register GS</td>              <td>55</td>      <td>%gs</td></tr>
-    /// >   <tr><td>Reserved</td>                         <td>56-57</td>   <td></td></tr>
-    /// >   <tr><td>FS Base address</td>                  <td>58</td>      <td>%fs.base</td></tr>
-    /// >   <tr><td>GS Base address</td>                  <td>59</td>      <td>%gs.base</td></tr>
-    /// >   <tr><td>Reserved</td>                         <td>60-61</td>   <td></td></tr>
-    /// >   <tr><td>Task Register</td>                    <td>62</td>      <td>%tr</td></tr>
-    /// >   <tr><td>LDT Register</td>                     <td>63</td>      <td>%ldtr</td></tr>
-    /// >   <tr><td>128-bit Media Control and Status</td> <td>64</td>      <td>%mxcsr</td></tr>
-    /// >   <tr><td>x87 Control Word</td>                 <td>65</td>      <td>%fcw</td></tr>
-    /// >   <tr><td>x87 Status Word</td>                  <td>66</td>      <td>%fsw</td></tr>
-    /// >   <tr><td>Upper Vector Registers 16–31</td>     <td>67-82</td>   <td>%xmm16–%xmm31</td></tr>
-    /// >   <tr><td>Reserved</td>                         <td>83-117</td>  <td></td></tr>
-    /// >   <tr><td>Vector Mask Registers 0–7</td>        <td>118-125</td> <td>%k0–%k7</td></tr>
-    /// >   <tr><td>Reserved</td>                         <td>126-129</td> <td></td></tr>
-    /// > </table>
-    pub fn register(&self, register: Register) -> RegisterRule<R> {
-        self.registers.get(register)
-    }
-
-    /// Iterate over all defined register `(number, rule)` pairs.
-    ///
-    /// The rules are not iterated in any guaranteed order. Any register that
-    /// does not make an appearance in the iterator implicitly has the rule
-    /// `RegisterRule::Undefined`.
-    ///
-    /// ```
-    /// # use gimli::{EndianSlice, LittleEndian, UnwindTableRow};
-    /// # fn foo<'input>(unwind_table_row: UnwindTableRow<EndianSlice<'input, LittleEndian>>) {
-    /// for &(register, ref rule) in unwind_table_row.registers() {
-    ///     // ...
-    ///     # drop(register); drop(rule);
-    /// }
-    /// # }
-    /// ```
-    pub fn registers(&self) -> RegisterRuleIter<R> {
-        self.registers.iter()
-    }
-}
-
-/// The canonical frame address (CFA) recovery rules.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum CfaRule<R: Reader> {
-    /// The CFA is given offset from the given register's value.
-    RegisterAndOffset {
-        /// The register containing the base value.
-        register: Register,
-        /// The offset from the register's base value.
-        offset: i64,
-    },
-    /// The CFA is obtained by evaluating this `Reader` as a DWARF expression
-    /// program.
-    Expression(Expression<R>),
-}
-
-impl<R: Reader> Default for CfaRule<R> {
-    fn default() -> Self {
-        CfaRule::RegisterAndOffset {
-            register: Register(0),
-            offset: 0,
-        }
-    }
-}
-
-impl<R: Reader> CfaRule<R> {
-    fn is_default(&self) -> bool {
-        match *self {
-            CfaRule::RegisterAndOffset { register, offset } => {
-                register == Register(0) && offset == 0
-            }
-            _ => false,
-        }
-    }
-}
-
-/// An entry in the abstract CFI table that describes how to find the value of a
-/// register.
-///
-/// "The register columns contain rules that describe whether a given register
-/// has been saved and the rule to find the value for the register in the
-/// previous frame."
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum RegisterRule<R: Reader> {
-    /// > A register that has this rule has no recoverable value in the previous
-    /// > frame. (By convention, it is not preserved by a callee.)
-    Undefined,
-
-    /// > This register has not been modified from the previous frame. (By
-    /// > convention, it is preserved by the callee, but the callee has not
-    /// > modified it.)
-    SameValue,
-
-    /// "The previous value of this register is saved at the address CFA+N where
-    /// CFA is the current CFA value and N is a signed offset."
-    Offset(i64),
-
-    /// "The previous value of this register is the value CFA+N where CFA is the
-    /// current CFA value and N is a signed offset."
-    ValOffset(i64),
-
-    /// "The previous value of this register is stored in another register
-    /// numbered R."
-    Register(Register),
-
-    /// "The previous value of this register is located at the address produced
-    /// by executing the DWARF expression."
-    Expression(Expression<R>),
-
-    /// "The previous value of this register is the value produced by executing
-    /// the DWARF expression."
-    ValExpression(Expression<R>),
-
-    /// "The rule is defined externally to this specification by the augmenter."
-    Architectural,
-}
-
-impl<R: Reader> RegisterRule<R> {
-    fn is_defined(&self) -> bool {
-        match *self {
-            RegisterRule::Undefined => false,
-            _ => true,
-        }
-    }
-}
-
-/// A parsed call frame instruction.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum CallFrameInstruction<R: Reader> {
-    // 6.4.2.1 Row Creation Methods
-    /// > 1. DW_CFA_set_loc
-    /// >
-    /// > The DW_CFA_set_loc instruction takes a single operand that represents
-    /// > a target address. The required action is to create a new table row
-    /// > using the specified address as the location. All other values in the
-    /// > new row are initially identical to the current row. The new location
-    /// > value is always greater than the current one. If the segment_size
-    /// > field of this FDE's CIE is non- zero, the initial location is preceded
-    /// > by a segment selector of the given length.
-    SetLoc {
-        /// The target address.
-        address: u64,
-    },
-
-    /// The `AdvanceLoc` instruction is used for all of `DW_CFA_advance_loc` and
-    /// `DW_CFA_advance_loc{1,2,4}`.
-    ///
-    /// > 2. DW_CFA_advance_loc
-    /// >
-    /// > The DW_CFA_advance instruction takes a single operand (encoded with
-    /// > the opcode) that represents a constant delta. The required action is
-    /// > to create a new table row with a location value that is computed by
-    /// > taking the current entry’s location value and adding the value of
-    /// > delta * code_alignment_factor. All other values in the new row are
-    /// > initially identical to the current row.
-    AdvanceLoc {
-        /// The delta to be added to the current address.
-        delta: u32,
-    },
-
-    // 6.4.2.2 CFA Definition Methods
-    /// > 1. DW_CFA_def_cfa
-    /// >
-    /// > The DW_CFA_def_cfa instruction takes two unsigned LEB128 operands
-    /// > representing a register number and a (non-factored) offset. The
-    /// > required action is to define the current CFA rule to use the provided
-    /// > register and offset.
-    DefCfa {
-        /// The target register's number.
-        register: Register,
-        /// The non-factored offset.
-        offset: u64,
-    },
-
-    /// > 2. DW_CFA_def_cfa_sf
-    /// >
-    /// > The DW_CFA_def_cfa_sf instruction takes two operands: an unsigned
-    /// > LEB128 value representing a register number and a signed LEB128
-    /// > factored offset. This instruction is identical to DW_CFA_def_cfa
-    /// > except that the second operand is signed and factored. The resulting
-    /// > offset is factored_offset * data_alignment_factor.
-    DefCfaSf {
-        /// The target register's number.
-        register: Register,
-        /// The factored offset.
-        factored_offset: i64,
-    },
-
-    /// > 3. DW_CFA_def_cfa_register
-    /// >
-    /// > The DW_CFA_def_cfa_register instruction takes a single unsigned LEB128
-    /// > operand representing a register number. The required action is to
-    /// > define the current CFA rule to use the provided register (but to keep
-    /// > the old offset). This operation is valid only if the current CFA rule
-    /// > is defined to use a register and offset.
-    DefCfaRegister {
-        /// The target register's number.
-        register: Register,
-    },
-
-    /// > 4. DW_CFA_def_cfa_offset
-    /// >
-    /// > The DW_CFA_def_cfa_offset instruction takes a single unsigned LEB128
-    /// > operand representing a (non-factored) offset. The required action is
-    /// > to define the current CFA rule to use the provided offset (but to keep
-    /// > the old register). This operation is valid only if the current CFA
-    /// > rule is defined to use a register and offset.
-    DefCfaOffset {
-        /// The non-factored offset.
-        offset: u64,
-    },
-
-    /// > 5. DW_CFA_def_cfa_offset_sf
-    /// >
-    /// > The DW_CFA_def_cfa_offset_sf instruction takes a signed LEB128 operand
-    /// > representing a factored offset. This instruction is identical to
-    /// > DW_CFA_def_cfa_offset except that the operand is signed and
-    /// > factored. The resulting offset is factored_offset *
-    /// > data_alignment_factor. This operation is valid only if the current CFA
-    /// > rule is defined to use a register and offset.
-    DefCfaOffsetSf {
-        /// The factored offset.
-        factored_offset: i64,
-    },
-
-    /// > 6. DW_CFA_def_cfa_expression
-    /// >
-    /// > The DW_CFA_def_cfa_expression instruction takes a single operand
-    /// > encoded as a DW_FORM_exprloc value representing a DWARF
-    /// > expression. The required action is to establish that expression as the
-    /// > means by which the current CFA is computed.
-    DefCfaExpression {
-        /// The DWARF expression.
-        expression: Expression<R>,
-    },
-
-    // 6.4.2.3 Register Rule Instructions
-    /// > 1. DW_CFA_undefined
-    /// >
-    /// > The DW_CFA_undefined instruction takes a single unsigned LEB128
-    /// > operand that represents a register number. The required action is to
-    /// > set the rule for the specified register to “undefined.�
-    Undefined {
-        /// The target register's number.
-        register: Register,
-    },
-
-    /// > 2. DW_CFA_same_value
-    /// >
-    /// > The DW_CFA_same_value instruction takes a single unsigned LEB128
-    /// > operand that represents a register number. The required action is to
-    /// > set the rule for the specified register to “same value.�
-    SameValue {
-        /// The target register's number.
-        register: Register,
-    },
-
-    /// The `Offset` instruction represents both `DW_CFA_offset` and
-    /// `DW_CFA_offset_extended`.
-    ///
-    /// > 3. DW_CFA_offset
-    /// >
-    /// > The DW_CFA_offset instruction takes two operands: a register number
-    /// > (encoded with the opcode) and an unsigned LEB128 constant representing
-    /// > a factored offset. The required action is to change the rule for the
-    /// > register indicated by the register number to be an offset(N) rule
-    /// > where the value of N is factored offset * data_alignment_factor.
-    Offset {
-        /// The target register's number.
-        register: Register,
-        /// The factored offset.
-        factored_offset: u64,
-    },
-
-    /// > 5. DW_CFA_offset_extended_sf
-    /// >
-    /// > The DW_CFA_offset_extended_sf instruction takes two operands: an
-    /// > unsigned LEB128 value representing a register number and a signed
-    /// > LEB128 factored offset. This instruction is identical to
-    /// > DW_CFA_offset_extended except that the second operand is signed and
-    /// > factored. The resulting offset is factored_offset *
-    /// > data_alignment_factor.
-    OffsetExtendedSf {
-        /// The target register's number.
-        register: Register,
-        /// The factored offset.
-        factored_offset: i64,
-    },
-
-    /// > 6. DW_CFA_val_offset
-    /// >
-    /// > The DW_CFA_val_offset instruction takes two unsigned LEB128 operands
-    /// > representing a register number and a factored offset. The required
-    /// > action is to change the rule for the register indicated by the
-    /// > register number to be a val_offset(N) rule where the value of N is
-    /// > factored_offset * data_alignment_factor.
-    ValOffset {
-        /// The target register's number.
-        register: Register,
-        /// The factored offset.
-        factored_offset: u64,
-    },
-
-    /// > 7. DW_CFA_val_offset_sf
-    /// >
-    /// > The DW_CFA_val_offset_sf instruction takes two operands: an unsigned
-    /// > LEB128 value representing a register number and a signed LEB128
-    /// > factored offset. This instruction is identical to DW_CFA_val_offset
-    /// > except that the second operand is signed and factored. The resulting
-    /// > offset is factored_offset * data_alignment_factor.
-    ValOffsetSf {
-        /// The target register's number.
-        register: Register,
-        /// The factored offset.
-        factored_offset: i64,
-    },
-
-    /// > 8. DW_CFA_register
-    /// >
-    /// > The DW_CFA_register instruction takes two unsigned LEB128 operands
-    /// > representing register numbers. The required action is to set the rule
-    /// > for the first register to be register(R) where R is the second
-    /// > register.
-    Register {
-        /// The number of the register whose rule is being changed.
-        dest_register: Register,
-        /// The number of the register where the other register's value can be
-        /// found.
-        src_register: Register,
-    },
-
-    /// > 9. DW_CFA_expression
-    /// >
-    /// > The DW_CFA_expression instruction takes two operands: an unsigned
-    /// > LEB128 value representing a register number, and a DW_FORM_block value
-    /// > representing a DWARF expression. The required action is to change the
-    /// > rule for the register indicated by the register number to be an
-    /// > expression(E) rule where E is the DWARF expression. That is, the DWARF
-    /// > expression computes the address. The value of the CFA is pushed on the
-    /// > DWARF evaluation stack prior to execution of the DWARF expression.
-    Expression {
-        /// The target register's number.
-        register: Register,
-        /// The DWARF expression.
-        expression: Expression<R>,
-    },
-
-    /// > 10. DW_CFA_val_expression
-    /// >
-    /// > The DW_CFA_val_expression instruction takes two operands: an unsigned
-    /// > LEB128 value representing a register number, and a DW_FORM_block value
-    /// > representing a DWARF expression. The required action is to change the
-    /// > rule for the register indicated by the register number to be a
-    /// > val_expression(E) rule where E is the DWARF expression. That is, the
-    /// > DWARF expression computes the value of the given register. The value
-    /// > of the CFA is pushed on the DWARF evaluation stack prior to execution
-    /// > of the DWARF expression.
-    ValExpression {
-        /// The target register's number.
-        register: Register,
-        /// The DWARF expression.
-        expression: Expression<R>,
-    },
-
-    /// The `Restore` instruction represents both `DW_CFA_restore` and
-    /// `DW_CFA_restore_extended`.
-    ///
-    /// > 11. DW_CFA_restore
-    /// >
-    /// > The DW_CFA_restore instruction takes a single operand (encoded with
-    /// > the opcode) that represents a register number. The required action is
-    /// > to change the rule for the indicated register to the rule assigned it
-    /// > by the initial_instructions in the CIE.
-    Restore {
-        /// The register to be reset.
-        register: Register,
-    },
-
-    // 6.4.2.4 Row State Instructions
-    /// > 1. DW_CFA_remember_state
-    /// >
-    /// > The DW_CFA_remember_state instruction takes no operands. The required
-    /// > action is to push the set of rules for every register onto an implicit
-    /// > stack.
-    RememberState,
-
-    /// > 2. DW_CFA_restore_state
-    /// >
-    /// > The DW_CFA_restore_state instruction takes no operands. The required
-    /// > action is to pop the set of rules off the implicit stack and place
-    /// > them in the current row.
-    RestoreState,
-
-    /// > DW_CFA_GNU_args_size
-    /// >
-    /// > GNU Extension
-    /// >
-    /// > The DW_CFA_GNU_args_size instruction takes an unsigned LEB128 operand
-    /// > representing an argument size. This instruction specifies the total of
-    /// > the size of the arguments which have been pushed onto the stack.
-    ArgsSize {
-        /// The size of the arguments which have been pushed onto the stack
-        size: u64,
-    },
-
-    // 6.4.2.5 Padding Instruction
-    /// > 1. DW_CFA_nop
-    /// >
-    /// > The DW_CFA_nop instruction has no operands and no required actions. It
-    /// > is used as padding to make a CIE or FDE an appropriate size.
-    Nop,
-}
-
-const CFI_INSTRUCTION_HIGH_BITS_MASK: u8 = 0b1100_0000;
-const CFI_INSTRUCTION_LOW_BITS_MASK: u8 = !CFI_INSTRUCTION_HIGH_BITS_MASK;
-
-impl<R: Reader> CallFrameInstruction<R> {
-    fn parse(
-        input: &mut R,
-        address_encoding: Option<DwEhPe>,
-        parameters: &PointerEncodingParameters<R>,
-    ) -> Result<CallFrameInstruction<R>> {
-        let instruction = input.read_u8()?;
-        let high_bits = instruction & CFI_INSTRUCTION_HIGH_BITS_MASK;
-
-        if high_bits == constants::DW_CFA_advance_loc.0 {
-            let delta = instruction & CFI_INSTRUCTION_LOW_BITS_MASK;
-            return Ok(CallFrameInstruction::AdvanceLoc {
-                delta: u32::from(delta),
-            });
-        }
-
-        if high_bits == constants::DW_CFA_offset.0 {
-            let register = Register((instruction & CFI_INSTRUCTION_LOW_BITS_MASK).into());
-            let offset = input.read_uleb128()?;
-            return Ok(CallFrameInstruction::Offset {
-                register,
-                factored_offset: offset,
-            });
-        }
-
-        if high_bits == constants::DW_CFA_restore.0 {
-            let register = Register((instruction & CFI_INSTRUCTION_LOW_BITS_MASK).into());
-            return Ok(CallFrameInstruction::Restore { register });
-        }
-
-        debug_assert_eq!(high_bits, 0);
-        let instruction = constants::DwCfa(instruction);
-
-        match instruction {
-            constants::DW_CFA_nop => Ok(CallFrameInstruction::Nop),
-
-            constants::DW_CFA_set_loc => {
-                let address = if let Some(encoding) = address_encoding {
-                    match parse_encoded_pointer(encoding, parameters, input)? {
-                        Pointer::Direct(x) => x,
-                        _ => return Err(Error::UnsupportedPointerEncoding),
-                    }
-                } else {
-                    input.read_address(parameters.address_size)?
-                };
-                Ok(CallFrameInstruction::SetLoc { address })
-            }
-
-            constants::DW_CFA_advance_loc1 => {
-                let delta = input.read_u8()?;
-                Ok(CallFrameInstruction::AdvanceLoc {
-                    delta: u32::from(delta),
-                })
-            }
-
-            constants::DW_CFA_advance_loc2 => {
-                let delta = input.read_u16()?;
-                Ok(CallFrameInstruction::AdvanceLoc {
-                    delta: u32::from(delta),
-                })
-            }
-
-            constants::DW_CFA_advance_loc4 => {
-                let delta = input.read_u32()?;
-                Ok(CallFrameInstruction::AdvanceLoc { delta })
-            }
-
-            constants::DW_CFA_offset_extended => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                let offset = input.read_uleb128()?;
-                Ok(CallFrameInstruction::Offset {
-                    register,
-                    factored_offset: offset,
-                })
-            }
-
-            constants::DW_CFA_restore_extended => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                Ok(CallFrameInstruction::Restore { register })
-            }
-
-            constants::DW_CFA_undefined => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                Ok(CallFrameInstruction::Undefined { register })
-            }
-
-            constants::DW_CFA_same_value => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                Ok(CallFrameInstruction::SameValue { register })
-            }
-
-            constants::DW_CFA_register => {
-                let dest = input.read_uleb128().and_then(Register::from_u64)?;
-                let src = input.read_uleb128().and_then(Register::from_u64)?;
-                Ok(CallFrameInstruction::Register {
-                    dest_register: dest,
-                    src_register: src,
-                })
-            }
-
-            constants::DW_CFA_remember_state => Ok(CallFrameInstruction::RememberState),
-
-            constants::DW_CFA_restore_state => Ok(CallFrameInstruction::RestoreState),
-
-            constants::DW_CFA_def_cfa => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                let offset = input.read_uleb128()?;
-                Ok(CallFrameInstruction::DefCfa { register, offset })
-            }
-
-            constants::DW_CFA_def_cfa_register => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                Ok(CallFrameInstruction::DefCfaRegister { register })
-            }
-
-            constants::DW_CFA_def_cfa_offset => {
-                let offset = input.read_uleb128()?;
-                Ok(CallFrameInstruction::DefCfaOffset { offset })
-            }
-
-            constants::DW_CFA_def_cfa_expression => {
-                let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                let expression = input.split(len)?;
-                Ok(CallFrameInstruction::DefCfaExpression {
-                    expression: Expression(expression),
-                })
-            }
-
-            constants::DW_CFA_expression => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                let expression = input.split(len)?;
-                Ok(CallFrameInstruction::Expression {
-                    register,
-                    expression: Expression(expression),
-                })
-            }
-
-            constants::DW_CFA_offset_extended_sf => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                let offset = input.read_sleb128()?;
-                Ok(CallFrameInstruction::OffsetExtendedSf {
-                    register,
-                    factored_offset: offset,
-                })
-            }
-
-            constants::DW_CFA_def_cfa_sf => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                let offset = input.read_sleb128()?;
-                Ok(CallFrameInstruction::DefCfaSf {
-                    register,
-                    factored_offset: offset,
-                })
-            }
-
-            constants::DW_CFA_def_cfa_offset_sf => {
-                let offset = input.read_sleb128()?;
-                Ok(CallFrameInstruction::DefCfaOffsetSf {
-                    factored_offset: offset,
-                })
-            }
-
-            constants::DW_CFA_val_offset => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                let offset = input.read_uleb128()?;
-                Ok(CallFrameInstruction::ValOffset {
-                    register,
-                    factored_offset: offset,
-                })
-            }
-
-            constants::DW_CFA_val_offset_sf => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                let offset = input.read_sleb128()?;
-                Ok(CallFrameInstruction::ValOffsetSf {
-                    register,
-                    factored_offset: offset,
-                })
-            }
-
-            constants::DW_CFA_val_expression => {
-                let register = input.read_uleb128().and_then(Register::from_u64)?;
-                let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                let expression = input.split(len)?;
-                Ok(CallFrameInstruction::ValExpression {
-                    register,
-                    expression: Expression(expression),
-                })
-            }
-
-            constants::DW_CFA_GNU_args_size => {
-                let size = input.read_uleb128()?;
-                Ok(CallFrameInstruction::ArgsSize { size })
-            }
-
-            otherwise => Err(Error::UnknownCallFrameInstruction(otherwise)),
-        }
-    }
-}
-
-/// A lazy iterator parsing call frame instructions.
-///
-/// Can be [used with
-/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-#[derive(Clone, Debug)]
-pub struct CallFrameInstructionIter<'a, R: Reader> {
-    input: R,
-    address_encoding: Option<constants::DwEhPe>,
-    parameters: PointerEncodingParameters<'a, R>,
-}
-
-impl<'a, R: Reader> CallFrameInstructionIter<'a, R> {
-    /// Parse the next call frame instruction.
-    pub fn next(&mut self) -> Result<Option<CallFrameInstruction<R>>> {
-        if self.input.is_empty() {
-            return Ok(None);
-        }
-
-        match CallFrameInstruction::parse(&mut self.input, self.address_encoding, &self.parameters)
-        {
-            Ok(instruction) => Ok(Some(instruction)),
-            Err(e) => {
-                self.input.empty();
-                Err(e)
-            }
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<'a, R: Reader> fallible_iterator::FallibleIterator for CallFrameInstructionIter<'a, R> {
-    type Item = CallFrameInstruction<R>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        CallFrameInstructionIter::next(self)
-    }
-}
-
-/// Parse a `DW_EH_PE_*` pointer encoding.
-#[doc(hidden)]
-#[inline]
-fn parse_pointer_encoding<R: Reader>(input: &mut R) -> Result<constants::DwEhPe> {
-    let eh_pe = input.read_u8()?;
-    let eh_pe = constants::DwEhPe(eh_pe);
-
-    if eh_pe.is_valid_encoding() {
-        Ok(eh_pe)
-    } else {
-        Err(Error::UnknownPointerEncoding)
-    }
-}
-
-/// A decoded pointer.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum Pointer {
-    /// This value is the decoded pointer value.
-    Direct(u64),
-
-    /// This value is *not* the pointer value, but points to the address of
-    /// where the real pointer value lives. In other words, deref this pointer
-    /// to get the real pointer value.
-    ///
-    /// Chase this pointer at your own risk: do you trust the DWARF data it came
-    /// from?
-    Indirect(u64),
-}
-
-impl Default for Pointer {
-    #[inline]
-    fn default() -> Self {
-        Pointer::Direct(0)
-    }
-}
-
-impl Into<u64> for Pointer {
-    #[inline]
-    fn into(self) -> u64 {
-        match self {
-            Pointer::Direct(p) | Pointer::Indirect(p) => p,
-        }
-    }
-}
-
-impl Pointer {
-    #[inline]
-    fn new(encoding: constants::DwEhPe, address: u64) -> Pointer {
-        if encoding.is_indirect() {
-            Pointer::Indirect(address)
-        } else {
-            Pointer::Direct(address)
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-struct PointerEncodingParameters<'a, R: Reader> {
-    bases: &'a SectionBaseAddresses,
-    func_base: Option<u64>,
-    address_size: u8,
-    section: &'a R,
-}
-
-fn parse_encoded_pointer<R: Reader>(
-    encoding: constants::DwEhPe,
-    parameters: &PointerEncodingParameters<R>,
-    input: &mut R,
-) -> Result<Pointer> {
-    // TODO: check this once only in parse_pointer_encoding
-    if !encoding.is_valid_encoding() {
-        return Err(Error::UnknownPointerEncoding);
-    }
-
-    if encoding == constants::DW_EH_PE_omit {
-        return Err(Error::CannotParseOmitPointerEncoding);
-    }
-
-    let base = match encoding.application() {
-        constants::DW_EH_PE_absptr => 0,
-        constants::DW_EH_PE_pcrel => {
-            if let Some(section_base) = parameters.bases.section {
-                let offset_from_section = input.offset_from(parameters.section);
-                section_base.wrapping_add(offset_from_section.into_u64())
-            } else {
-                return Err(Error::PcRelativePointerButSectionBaseIsUndefined);
-            }
-        }
-        constants::DW_EH_PE_textrel => {
-            if let Some(text) = parameters.bases.text {
-                text
-            } else {
-                return Err(Error::TextRelativePointerButTextBaseIsUndefined);
-            }
-        }
-        constants::DW_EH_PE_datarel => {
-            if let Some(data) = parameters.bases.data {
-                data
-            } else {
-                return Err(Error::DataRelativePointerButDataBaseIsUndefined);
-            }
-        }
-        constants::DW_EH_PE_funcrel => {
-            if let Some(func) = parameters.func_base {
-                func
-            } else {
-                return Err(Error::FuncRelativePointerInBadContext);
-            }
-        }
-        constants::DW_EH_PE_aligned => return Err(Error::UnsupportedPointerEncoding),
-        _ => unreachable!(),
-    };
-
-    let offset = match encoding.format() {
-        // Unsigned variants.
-        constants::DW_EH_PE_absptr => input.read_address(parameters.address_size),
-        constants::DW_EH_PE_uleb128 => input.read_uleb128(),
-        constants::DW_EH_PE_udata2 => input.read_u16().map(u64::from),
-        constants::DW_EH_PE_udata4 => input.read_u32().map(u64::from),
-        constants::DW_EH_PE_udata8 => input.read_u64(),
-
-        // Signed variants. Here we sign extend the values (happens by
-        // default when casting a signed integer to a larger range integer
-        // in Rust), return them as u64, and rely on wrapping addition to do
-        // the right thing when adding these offsets to their bases.
-        constants::DW_EH_PE_sleb128 => input.read_sleb128().map(|a| a as u64),
-        constants::DW_EH_PE_sdata2 => input.read_i16().map(|a| a as u64),
-        constants::DW_EH_PE_sdata4 => input.read_i32().map(|a| a as u64),
-        constants::DW_EH_PE_sdata8 => input.read_i64().map(|a| a as u64),
-
-        // That was all of the valid encoding formats.
-        _ => unreachable!(),
-    }?;
-
-    Ok(Pointer::new(encoding, base.wrapping_add(offset)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use super::{parse_cfi_entry, AugmentationData, RegisterRuleMap, UnwindContext};
-    use crate::common::Format;
-    use crate::constants;
-    use crate::endianity::{BigEndian, Endianity, LittleEndian, NativeEndian};
-    use crate::read::{
-        EndianSlice, Error, Expression, Pointer, ReaderOffsetId, Result, Section as ReadSection,
-    };
-    use crate::test_util::GimliSectionMethods;
-    use alloc::vec::Vec;
-    use core::marker::PhantomData;
-    use core::mem;
-    use core::u64;
-    use test_assembler::{Endian, Label, LabelMaker, LabelOrNum, Section, ToLabelOrNum};
-
-    // Ensure each test tries to read the same section kind that it wrote.
-    #[derive(Clone, Copy)]
-    struct SectionKind<Section>(PhantomData<Section>);
-
-    impl<T> SectionKind<T> {
-        fn endian<'input, E>(self) -> Endian
-        where
-            E: Endianity,
-            T: UnwindSection<EndianSlice<'input, E>>,
-            T::Offset: UnwindOffset<usize>,
-        {
-            if E::default().is_big_endian() {
-                Endian::Big
-            } else {
-                Endian::Little
-            }
-        }
-
-        fn section<'input, E>(self, contents: &'input [u8]) -> T
-        where
-            E: Endianity,
-            T: UnwindSection<EndianSlice<'input, E>> + ReadSection<EndianSlice<'input, E>>,
-            T::Offset: UnwindOffset<usize>,
-        {
-            EndianSlice::new(contents, E::default()).into()
-        }
-    }
-
-    fn debug_frame_le<'a>() -> SectionKind<DebugFrame<EndianSlice<'a, LittleEndian>>> {
-        SectionKind(PhantomData)
-    }
-
-    fn debug_frame_be<'a>() -> SectionKind<DebugFrame<EndianSlice<'a, BigEndian>>> {
-        SectionKind(PhantomData)
-    }
-
-    fn eh_frame_le<'a>() -> SectionKind<EhFrame<EndianSlice<'a, LittleEndian>>> {
-        SectionKind(PhantomData)
-    }
-
-    fn parse_fde<Section, O, F, R>(
-        section: Section,
-        input: &mut R,
-        get_cie: F,
-    ) -> Result<FrameDescriptionEntry<R>>
-    where
-        R: Reader,
-        Section: UnwindSection<R, Offset = O>,
-        O: UnwindOffset<R::Offset>,
-        F: FnMut(&Section, &BaseAddresses, O) -> Result<CommonInformationEntry<R>>,
-    {
-        let bases = Default::default();
-        match parse_cfi_entry(&bases, &section, input) {
-            Ok(Some(CieOrFde::Fde(partial))) => partial.parse(get_cie),
-            Ok(_) => Err(Error::NoEntryAtGivenOffset),
-            Err(e) => Err(e),
-        }
-    }
-
-    // Mixin methods for `Section` to help define binary test data.
-
-    trait CfiSectionMethods: GimliSectionMethods {
-        fn cie<'aug, 'input, E, T>(
-            self,
-            _kind: SectionKind<T>,
-            augmentation: Option<&'aug str>,
-            cie: &mut CommonInformationEntry<EndianSlice<'input, E>>,
-        ) -> Self
-        where
-            E: Endianity,
-            T: UnwindSection<EndianSlice<'input, E>>,
-            T::Offset: UnwindOffset;
-        fn fde<'a, 'input, E, T, L>(
-            self,
-            _kind: SectionKind<T>,
-            cie_offset: L,
-            fde: &mut FrameDescriptionEntry<EndianSlice<'input, E>>,
-        ) -> Self
-        where
-            E: Endianity,
-            T: UnwindSection<EndianSlice<'input, E>>,
-            T::Offset: UnwindOffset,
-            L: ToLabelOrNum<'a, u64>;
-    }
-
-    impl CfiSectionMethods for Section {
-        fn cie<'aug, 'input, E, T>(
-            self,
-            _kind: SectionKind<T>,
-            augmentation: Option<&'aug str>,
-            cie: &mut CommonInformationEntry<EndianSlice<'input, E>>,
-        ) -> Self
-        where
-            E: Endianity,
-            T: UnwindSection<EndianSlice<'input, E>>,
-            T::Offset: UnwindOffset,
-        {
-            cie.offset = self.size() as _;
-            let length = Label::new();
-            let start = Label::new();
-            let end = Label::new();
-
-            let section = match cie.format {
-                Format::Dwarf32 => self.D32(&length).mark(&start).D32(0xffff_ffff),
-                Format::Dwarf64 => {
-                    let section = self.D32(0xffff_ffff);
-                    section.D64(&length).mark(&start).D64(0xffff_ffff_ffff_ffff)
-                }
-            };
-
-            let mut section = section.D8(cie.version);
-
-            if let Some(augmentation) = augmentation {
-                section = section.append_bytes(augmentation.as_bytes());
-            }
-
-            // Null terminator for augmentation string.
-            let section = section.D8(0);
-
-            let section = if T::has_address_and_segment_sizes(cie.version) {
-                section.D8(cie.address_size).D8(cie.segment_size)
-            } else {
-                section
-            };
-
-            let section = section
-                .uleb(cie.code_alignment_factor)
-                .sleb(cie.data_alignment_factor)
-                .uleb(cie.return_address_register.0.into())
-                .append_bytes(cie.initial_instructions.into())
-                .mark(&end);
-
-            cie.length = (&end - &start) as usize;
-            length.set_const(cie.length as u64);
-
-            section
-        }
-
-        fn fde<'a, 'input, E, T, L>(
-            self,
-            _kind: SectionKind<T>,
-            cie_offset: L,
-            fde: &mut FrameDescriptionEntry<EndianSlice<'input, E>>,
-        ) -> Self
-        where
-            E: Endianity,
-            T: UnwindSection<EndianSlice<'input, E>>,
-            T::Offset: UnwindOffset,
-            L: ToLabelOrNum<'a, u64>,
-        {
-            fde.offset = self.size() as _;
-            let length = Label::new();
-            let start = Label::new();
-            let end = Label::new();
-
-            assert_eq!(fde.format, fde.cie.format);
-
-            let section = match T::cie_offset_encoding(fde.format) {
-                CieOffsetEncoding::U32 => {
-                    let section = self.D32(&length).mark(&start);
-                    match cie_offset.to_labelornum() {
-                        LabelOrNum::Label(ref l) => section.D32(l),
-                        LabelOrNum::Num(o) => section.D32(o as u32),
-                    }
-                }
-                CieOffsetEncoding::U64 => {
-                    let section = self.D32(0xffff_ffff);
-                    section.D64(&length).mark(&start).D64(cie_offset)
-                }
-            };
-
-            let section = match fde.cie.segment_size {
-                0 => section,
-                4 => section.D32(fde.initial_segment as u32),
-                8 => section.D64(fde.initial_segment),
-                x => panic!("Unsupported test segment size: {}", x),
-            };
-
-            let section = match fde.cie.address_size {
-                4 => section
-                    .D32(fde.initial_address() as u32)
-                    .D32(fde.len() as u32),
-                8 => section.D64(fde.initial_address()).D64(fde.len()),
-                x => panic!("Unsupported address size: {}", x),
-            };
-
-            let section = if let Some(ref augmentation) = fde.augmentation {
-                let cie_aug = fde
-                    .cie
-                    .augmentation
-                    .expect("FDE has augmentation, but CIE doesn't");
-
-                if let Some(lsda) = augmentation.lsda {
-                    // We only support writing `DW_EH_PE_absptr` here.
-                    assert_eq!(
-                        cie_aug
-                            .lsda
-                            .expect("FDE has lsda, but CIE doesn't")
-                            .format(),
-                        constants::DW_EH_PE_absptr
-                    );
-
-                    // Augmentation data length
-                    let section = section.uleb(u64::from(fde.cie.address_size));
-                    match fde.cie.address_size {
-                        4 => section.D32({
-                            let x: u64 = lsda.into();
-                            x as u32
-                        }),
-                        8 => section.D64({
-                            let x: u64 = lsda.into();
-                            x
-                        }),
-                        x => panic!("Unsupported address size: {}", x),
-                    }
-                } else {
-                    // Even if we don't have any augmentation data, if there is
-                    // an augmentation defined, we need to put the length in.
-                    section.uleb(0)
-                }
-            } else {
-                section
-            };
-
-            let section = section.append_bytes(fde.instructions.into()).mark(&end);
-
-            fde.length = (&end - &start) as usize;
-            length.set_const(fde.length as u64);
-
-            section
-        }
-    }
-
-    trait ResultExt {
-        fn map_eof(self, input: &[u8]) -> Self;
-    }
-
-    impl<T> ResultExt for Result<T> {
-        fn map_eof(self, input: &[u8]) -> Self {
-            match self {
-                Err(Error::UnexpectedEof(id)) => {
-                    let id = ReaderOffsetId(id.0 - input.as_ptr() as u64);
-                    Err(Error::UnexpectedEof(id))
-                }
-                r => r,
-            }
-        }
-    }
-
-    #[allow(clippy::type_complexity)]
-    #[allow(clippy::needless_pass_by_value)]
-    fn assert_parse_cie<'input, E>(
-        kind: SectionKind<DebugFrame<EndianSlice<'input, E>>>,
-        section: Section,
-        address_size: u8,
-        expected: Result<(
-            EndianSlice<'input, E>,
-            CommonInformationEntry<EndianSlice<'input, E>>,
-        )>,
-    ) where
-        E: Endianity,
-    {
-        let section = section.get_contents().unwrap();
-        let mut debug_frame = kind.section(&section);
-        debug_frame.set_address_size(address_size);
-        let input = &mut EndianSlice::new(&section, E::default());
-        let bases = Default::default();
-        let result = CommonInformationEntry::parse(&bases, &debug_frame, input);
-        let result = result.map(|cie| (*input, cie)).map_eof(&section);
-        assert_eq!(result, expected);
-    }
-
-    #[test]
-    fn test_parse_cie_incomplete_length_32() {
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian()).L16(5);
-        assert_parse_cie(
-            kind,
-            section,
-            8,
-            Err(Error::UnexpectedEof(ReaderOffsetId(0))),
-        );
-    }
-
-    #[test]
-    fn test_parse_cie_incomplete_length_64() {
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .L32(0xffff_ffff)
-            .L32(12345);
-        assert_parse_cie(
-            kind,
-            section,
-            8,
-            Err(Error::UnexpectedEof(ReaderOffsetId(4))),
-        );
-    }
-
-    #[test]
-    fn test_parse_cie_incomplete_id_32() {
-        let kind = debug_frame_be();
-        let section = Section::with_endian(kind.endian())
-            // The length is not large enough to contain the ID.
-            .B32(3)
-            .B32(0xffff_ffff);
-        assert_parse_cie(
-            kind,
-            section,
-            8,
-            Err(Error::UnexpectedEof(ReaderOffsetId(4))),
-        );
-    }
-
-    #[test]
-    fn test_parse_cie_bad_id_32() {
-        let kind = debug_frame_be();
-        let section = Section::with_endian(kind.endian())
-            // Initial length
-            .B32(4)
-            // Not the CIE Id.
-            .B32(0xbad1_bad2);
-        assert_parse_cie(kind, section, 8, Err(Error::NotCieId));
-    }
-
-    #[test]
-    fn test_parse_cie_32_bad_version() {
-        let mut cie = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 99,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 0,
-            code_alignment_factor: 1,
-            data_alignment_factor: 2,
-            return_address_register: Register(3),
-            initial_instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian()).cie(kind, None, &mut cie);
-        assert_parse_cie(kind, section, 4, Err(Error::UnknownVersion(99)));
-    }
-
-    #[test]
-    fn test_parse_cie_unknown_augmentation() {
-        let length = Label::new();
-        let start = Label::new();
-        let end = Label::new();
-
-        let augmentation = Some("replicant");
-        let expected_rest = [1, 2, 3];
-
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian())
-            // Initial length
-            .L32(&length)
-            .mark(&start)
-            // CIE Id
-            .L32(0xffff_ffff)
-            // Version
-            .D8(4)
-            // Augmentation
-            .append_bytes(augmentation.unwrap().as_bytes())
-            // Null terminator
-            .D8(0)
-            // Extra augmented data that we can't understand.
-            .L32(1)
-            .L32(2)
-            .L32(3)
-            .L32(4)
-            .L32(5)
-            .L32(6)
-            .mark(&end)
-            .append_bytes(&expected_rest);
-
-        let expected_length = (&end - &start) as u64;
-        length.set_const(expected_length);
-
-        assert_parse_cie(kind, section, 8, Err(Error::UnknownAugmentation));
-    }
-
-    fn test_parse_cie(format: Format, version: u8, address_size: u8) {
-        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let expected_instrs: Vec<_> = (0..4).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let mut cie = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format,
-            version,
-            augmentation: None,
-            address_size,
-            segment_size: 0,
-            code_alignment_factor: 16,
-            data_alignment_factor: 32,
-            return_address_register: Register(1),
-            initial_instructions: EndianSlice::new(&expected_instrs, LittleEndian),
-        };
-
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .cie(kind, None, &mut cie)
-            .append_bytes(&expected_rest);
-
-        assert_parse_cie(
-            kind,
-            section,
-            address_size,
-            Ok((EndianSlice::new(&expected_rest, LittleEndian), cie)),
-        );
-    }
-
-    #[test]
-    fn test_parse_cie_32_ok() {
-        test_parse_cie(Format::Dwarf32, 1, 4);
-        test_parse_cie(Format::Dwarf32, 1, 8);
-        test_parse_cie(Format::Dwarf32, 4, 4);
-        test_parse_cie(Format::Dwarf32, 4, 8);
-    }
-
-    #[test]
-    fn test_parse_cie_64_ok() {
-        test_parse_cie(Format::Dwarf64, 1, 4);
-        test_parse_cie(Format::Dwarf64, 1, 8);
-        test_parse_cie(Format::Dwarf64, 4, 4);
-        test_parse_cie(Format::Dwarf64, 4, 8);
-    }
-
-    #[test]
-    fn test_parse_cie_length_too_big() {
-        let expected_instrs: Vec<_> = (0..13).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let mut cie = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 0,
-            code_alignment_factor: 0,
-            data_alignment_factor: 0,
-            return_address_register: Register(3),
-            initial_instructions: EndianSlice::new(&expected_instrs, LittleEndian),
-        };
-
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian()).cie(kind, None, &mut cie);
-
-        let mut contents = section.get_contents().unwrap();
-
-        // Overwrite the length to be too big.
-        contents[0] = 0;
-        contents[1] = 0;
-        contents[2] = 0;
-        contents[3] = 255;
-
-        let debug_frame = DebugFrame::new(&contents, LittleEndian);
-        let bases = Default::default();
-        assert_eq!(
-            CommonInformationEntry::parse(
-                &bases,
-                &debug_frame,
-                &mut EndianSlice::new(&contents, LittleEndian)
-            )
-            .map_eof(&contents),
-            Err(Error::UnexpectedEof(ReaderOffsetId(4)))
-        );
-    }
-
-    #[test]
-    fn test_parse_fde_incomplete_length_32() {
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian()).L16(5);
-        let section = section.get_contents().unwrap();
-        let debug_frame = kind.section(&section);
-        let rest = &mut EndianSlice::new(&section, LittleEndian);
-        assert_eq!(
-            parse_fde(debug_frame, rest, UnwindSection::cie_from_offset).map_eof(&section),
-            Err(Error::UnexpectedEof(ReaderOffsetId(0)))
-        );
-    }
-
-    #[test]
-    fn test_parse_fde_incomplete_length_64() {
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .L32(0xffff_ffff)
-            .L32(12345);
-        let section = section.get_contents().unwrap();
-        let debug_frame = kind.section(&section);
-        let rest = &mut EndianSlice::new(&section, LittleEndian);
-        assert_eq!(
-            parse_fde(debug_frame, rest, UnwindSection::cie_from_offset).map_eof(&section),
-            Err(Error::UnexpectedEof(ReaderOffsetId(4)))
-        );
-    }
-
-    #[test]
-    fn test_parse_fde_incomplete_cie_pointer_32() {
-        let kind = debug_frame_be();
-        let section = Section::with_endian(kind.endian())
-            // The length is not large enough to contain the CIE pointer.
-            .B32(3)
-            .B32(1994);
-        let section = section.get_contents().unwrap();
-        let debug_frame = kind.section(&section);
-        let rest = &mut EndianSlice::new(&section, BigEndian);
-        assert_eq!(
-            parse_fde(debug_frame, rest, UnwindSection::cie_from_offset).map_eof(&section),
-            Err(Error::UnexpectedEof(ReaderOffsetId(4)))
-        );
-    }
-
-    #[test]
-    fn test_parse_fde_32_ok() {
-        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let cie_offset = 0xbad0_bad1;
-        let expected_instrs: Vec<_> = (0..7).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let cie = CommonInformationEntry {
-            offset: 0,
-            length: 100,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            // DWARF32 with a 64 bit address size! Holy moly!
-            address_size: 8,
-            segment_size: 0,
-            code_alignment_factor: 3,
-            data_alignment_factor: 2,
-            return_address_register: Register(1),
-            initial_instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_beef,
-            address_range: 39,
-            augmentation: None,
-            instructions: EndianSlice::new(&expected_instrs, LittleEndian),
-        };
-
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .fde(kind, cie_offset, &mut fde)
-            .append_bytes(&expected_rest);
-
-        let section = section.get_contents().unwrap();
-        let debug_frame = kind.section(&section);
-        let rest = &mut EndianSlice::new(&section, LittleEndian);
-
-        let get_cie = |_: &_, _: &_, offset| {
-            assert_eq!(offset, DebugFrameOffset(cie_offset as usize));
-            Ok(cie.clone())
-        };
-
-        assert_eq!(parse_fde(debug_frame, rest, get_cie), Ok(fde));
-        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_fde_32_with_segment_ok() {
-        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let cie_offset = 0xbad0_bad1;
-        let expected_instrs: Vec<_> = (0..92).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let cie = CommonInformationEntry {
-            offset: 0,
-            length: 100,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 4,
-            code_alignment_factor: 3,
-            data_alignment_factor: 2,
-            return_address_register: Register(1),
-            initial_instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0xbadb_ad11,
-            initial_address: 0xfeed_beef,
-            address_range: 999,
-            augmentation: None,
-            instructions: EndianSlice::new(&expected_instrs, LittleEndian),
-        };
-
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .fde(kind, cie_offset, &mut fde)
-            .append_bytes(&expected_rest);
-
-        let section = section.get_contents().unwrap();
-        let debug_frame = kind.section(&section);
-        let rest = &mut EndianSlice::new(&section, LittleEndian);
-
-        let get_cie = |_: &_, _: &_, offset| {
-            assert_eq!(offset, DebugFrameOffset(cie_offset as usize));
-            Ok(cie.clone())
-        };
-
-        assert_eq!(parse_fde(debug_frame, rest, get_cie), Ok(fde));
-        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_fde_64_ok() {
-        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let cie_offset = 0xbad0_bad1;
-        let expected_instrs: Vec<_> = (0..7).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let cie = CommonInformationEntry {
-            offset: 0,
-            length: 100,
-            format: Format::Dwarf64,
-            version: 4,
-            augmentation: None,
-            address_size: 8,
-            segment_size: 0,
-            code_alignment_factor: 3,
-            data_alignment_factor: 2,
-            return_address_register: Register(1),
-            initial_instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf64,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_beef,
-            address_range: 999,
-            augmentation: None,
-            instructions: EndianSlice::new(&expected_instrs, LittleEndian),
-        };
-
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .fde(kind, cie_offset, &mut fde)
-            .append_bytes(&expected_rest);
-
-        let section = section.get_contents().unwrap();
-        let debug_frame = kind.section(&section);
-        let rest = &mut EndianSlice::new(&section, LittleEndian);
-
-        let get_cie = |_: &_, _: &_, offset| {
-            assert_eq!(offset, DebugFrameOffset(cie_offset as usize));
-            Ok(cie.clone())
-        };
-
-        assert_eq!(parse_fde(debug_frame, rest, get_cie), Ok(fde));
-        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_entry_on_cie_32_ok() {
-        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let expected_instrs: Vec<_> = (0..4).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let mut cie = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 0,
-            code_alignment_factor: 16,
-            data_alignment_factor: 32,
-            return_address_register: Register(1),
-            initial_instructions: EndianSlice::new(&expected_instrs, BigEndian),
-        };
-
-        let kind = debug_frame_be();
-        let section = Section::with_endian(kind.endian())
-            .cie(kind, None, &mut cie)
-            .append_bytes(&expected_rest);
-        let section = section.get_contents().unwrap();
-        let debug_frame = kind.section(&section);
-        let rest = &mut EndianSlice::new(&section, BigEndian);
-
-        let bases = Default::default();
-        assert_eq!(
-            parse_cfi_entry(&bases, &debug_frame, rest),
-            Ok(Some(CieOrFde::Cie(cie)))
-        );
-        assert_eq!(*rest, EndianSlice::new(&expected_rest, BigEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_entry_on_fde_32_ok() {
-        let cie_offset = 0x1234_5678;
-        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let expected_instrs: Vec<_> = (0..4).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let cie = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 0,
-            code_alignment_factor: 16,
-            data_alignment_factor: 32,
-            return_address_register: Register(1),
-            initial_instructions: EndianSlice::new(&[], BigEndian),
-        };
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_beef,
-            address_range: 39,
-            augmentation: None,
-            instructions: EndianSlice::new(&expected_instrs, BigEndian),
-        };
-
-        let kind = debug_frame_be();
-        let section = Section::with_endian(kind.endian())
-            .fde(kind, cie_offset, &mut fde)
-            .append_bytes(&expected_rest);
-
-        let section = section.get_contents().unwrap();
-        let debug_frame = kind.section(&section);
-        let rest = &mut EndianSlice::new(&section, BigEndian);
-
-        let bases = Default::default();
-        match parse_cfi_entry(&bases, &debug_frame, rest) {
-            Ok(Some(CieOrFde::Fde(partial))) => {
-                assert_eq!(*rest, EndianSlice::new(&expected_rest, BigEndian));
-
-                assert_eq!(partial.length, fde.length);
-                assert_eq!(partial.format, fde.format);
-                assert_eq!(partial.cie_offset, DebugFrameOffset(cie_offset as usize));
-
-                let get_cie = |_: &_, _: &_, offset| {
-                    assert_eq!(offset, DebugFrameOffset(cie_offset as usize));
-                    Ok(cie.clone())
-                };
-
-                assert_eq!(partial.parse(get_cie), Ok(fde));
-            }
-            otherwise => panic!("Unexpected result: {:#?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_cfi_entries_iter() {
-        let expected_instrs1: Vec<_> = (0..4).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let expected_instrs2: Vec<_> = (0..8).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let expected_instrs3: Vec<_> = (0..12).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let expected_instrs4: Vec<_> = (0..16).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let mut cie1 = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 0,
-            code_alignment_factor: 1,
-            data_alignment_factor: 2,
-            return_address_register: Register(3),
-            initial_instructions: EndianSlice::new(&expected_instrs1, BigEndian),
-        };
-
-        let mut cie2 = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 0,
-            code_alignment_factor: 3,
-            data_alignment_factor: 2,
-            return_address_register: Register(1),
-            initial_instructions: EndianSlice::new(&expected_instrs2, BigEndian),
-        };
-
-        let cie1_location = Label::new();
-        let cie2_location = Label::new();
-
-        // Write the CIEs first so that their length gets set before we clone
-        // them into the FDEs and our equality assertions down the line end up
-        // with all the CIEs always having he correct length.
-        let kind = debug_frame_be();
-        let section = Section::with_endian(kind.endian())
-            .mark(&cie1_location)
-            .cie(kind, None, &mut cie1)
-            .mark(&cie2_location)
-            .cie(kind, None, &mut cie2);
-
-        let mut fde1 = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie1.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_beef,
-            address_range: 39,
-            augmentation: None,
-            instructions: EndianSlice::new(&expected_instrs3, BigEndian),
-        };
-
-        let mut fde2 = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie2.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_face,
-            address_range: 9000,
-            augmentation: None,
-            instructions: EndianSlice::new(&expected_instrs4, BigEndian),
-        };
-
-        let section =
-            section
-                .fde(kind, &cie1_location, &mut fde1)
-                .fde(kind, &cie2_location, &mut fde2);
-
-        section.start().set_const(0);
-
-        let cie1_offset = cie1_location.value().unwrap() as usize;
-        let cie2_offset = cie2_location.value().unwrap() as usize;
-
-        let contents = section.get_contents().unwrap();
-        let debug_frame = kind.section(&contents);
-
-        let bases = Default::default();
-        let mut entries = debug_frame.entries(&bases);
-
-        assert_eq!(entries.next(), Ok(Some(CieOrFde::Cie(cie1.clone()))));
-        assert_eq!(entries.next(), Ok(Some(CieOrFde::Cie(cie2.clone()))));
-
-        match entries.next() {
-            Ok(Some(CieOrFde::Fde(partial))) => {
-                assert_eq!(partial.length, fde1.length);
-                assert_eq!(partial.format, fde1.format);
-                assert_eq!(partial.cie_offset, DebugFrameOffset(cie1_offset));
-
-                let get_cie = |_: &_, _: &_, offset| {
-                    assert_eq!(offset, DebugFrameOffset(cie1_offset));
-                    Ok(cie1.clone())
-                };
-                assert_eq!(partial.parse(get_cie), Ok(fde1));
-            }
-            otherwise => panic!("Unexpected result: {:#?}", otherwise),
-        }
-
-        match entries.next() {
-            Ok(Some(CieOrFde::Fde(partial))) => {
-                assert_eq!(partial.length, fde2.length);
-                assert_eq!(partial.format, fde2.format);
-                assert_eq!(partial.cie_offset, DebugFrameOffset(cie2_offset));
-
-                let get_cie = |_: &_, _: &_, offset| {
-                    assert_eq!(offset, DebugFrameOffset(cie2_offset));
-                    Ok(cie2.clone())
-                };
-                assert_eq!(partial.parse(get_cie), Ok(fde2));
-            }
-            otherwise => panic!("Unexpected result: {:#?}", otherwise),
-        }
-
-        assert_eq!(entries.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_parse_cie_from_offset() {
-        let filler = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let instrs: Vec<_> = (0..5).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let mut cie = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf64,
-            version: 4,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 0,
-            code_alignment_factor: 4,
-            data_alignment_factor: 8,
-            return_address_register: Register(12),
-            initial_instructions: EndianSlice::new(&instrs, LittleEndian),
-        };
-
-        let cie_location = Label::new();
-
-        let kind = debug_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .append_bytes(&filler)
-            .mark(&cie_location)
-            .cie(kind, None, &mut cie)
-            .append_bytes(&filler);
-
-        section.start().set_const(0);
-
-        let cie_offset = DebugFrameOffset(cie_location.value().unwrap() as usize);
-
-        let contents = section.get_contents().unwrap();
-        let debug_frame = kind.section(&contents);
-        let bases = Default::default();
-
-        assert_eq!(debug_frame.cie_from_offset(&bases, cie_offset), Ok(cie));
-    }
-
-    fn parse_cfi_instruction<R: Reader + Default>(
-        input: &mut R,
-        address_size: u8,
-    ) -> Result<CallFrameInstruction<R>> {
-        let parameters = &PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size,
-            section: &R::default(),
-        };
-        CallFrameInstruction::parse(input, None, parameters)
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_advance_loc() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_delta = 42;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_advance_loc.0 | expected_delta)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::AdvanceLoc {
-                delta: u32::from(expected_delta),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_offset() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 3;
-        let expected_offset = 1997;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_offset.0 | expected_reg)
-            .uleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::Offset {
-                register: Register(expected_reg.into()),
-                factored_offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_restore() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 3;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_restore.0 | expected_reg)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::Restore {
-                register: Register(expected_reg.into()),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_nop() {
-        let expected_rest = [1, 2, 3, 4];
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_nop.0)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::Nop)
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_set_loc() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_addr = 0xdead_beef;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_set_loc.0)
-            .L64(expected_addr)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::SetLoc {
-                address: expected_addr,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_set_loc_encoding() {
-        let text_base = 0xfeed_face;
-        let addr_offset = 0xbeef;
-        let expected_addr = text_base + addr_offset;
-        let expected_rest = [1, 2, 3, 4];
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_set_loc.0)
-            .L64(addr_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        let parameters = &PointerEncodingParameters {
-            bases: &BaseAddresses::default().set_text(text_base).eh_frame,
-            func_base: None,
-            address_size: 8,
-            section: &EndianSlice::new(&[], LittleEndian),
-        };
-        assert_eq!(
-            CallFrameInstruction::parse(input, Some(constants::DW_EH_PE_textrel), parameters),
-            Ok(CallFrameInstruction::SetLoc {
-                address: expected_addr,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_advance_loc1() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_delta = 8;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_advance_loc1.0)
-            .D8(expected_delta)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::AdvanceLoc {
-                delta: u32::from(expected_delta),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_advance_loc2() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_delta = 500;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_advance_loc2.0)
-            .L16(expected_delta)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::AdvanceLoc {
-                delta: u32::from(expected_delta),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_advance_loc4() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_delta = 1 << 20;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_advance_loc4.0)
-            .L32(expected_delta)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::AdvanceLoc {
-                delta: expected_delta,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_offset_extended() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 7;
-        let expected_offset = 33;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_offset_extended.0)
-            .uleb(expected_reg.into())
-            .uleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::Offset {
-                register: Register(expected_reg),
-                factored_offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_restore_extended() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 7;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_restore_extended.0)
-            .uleb(expected_reg.into())
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::Restore {
-                register: Register(expected_reg),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_undefined() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 7;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_undefined.0)
-            .uleb(expected_reg.into())
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::Undefined {
-                register: Register(expected_reg),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_same_value() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 7;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_same_value.0)
-            .uleb(expected_reg.into())
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::SameValue {
-                register: Register(expected_reg),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_register() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_dest_reg = 7;
-        let expected_src_reg = 8;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_register.0)
-            .uleb(expected_dest_reg.into())
-            .uleb(expected_src_reg.into())
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::Register {
-                dest_register: Register(expected_dest_reg),
-                src_register: Register(expected_src_reg),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_remember_state() {
-        let expected_rest = [1, 2, 3, 4];
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_remember_state.0)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::RememberState)
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_restore_state() {
-        let expected_rest = [1, 2, 3, 4];
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_restore_state.0)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::RestoreState)
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_def_cfa() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 2;
-        let expected_offset = 0;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_def_cfa.0)
-            .uleb(expected_reg.into())
-            .uleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::DefCfa {
-                register: Register(expected_reg),
-                offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_def_cfa_register() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 2;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_def_cfa_register.0)
-            .uleb(expected_reg.into())
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::DefCfaRegister {
-                register: Register(expected_reg),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_def_cfa_offset() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_offset = 23;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_def_cfa_offset.0)
-            .uleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::DefCfaOffset {
-                offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_def_cfa_expression() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_expr = [10, 9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        let length = Label::new();
-        let start = Label::new();
-        let end = Label::new();
-
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_def_cfa_expression.0)
-            .D8(&length)
-            .mark(&start)
-            .append_bytes(&expected_expr)
-            .mark(&end)
-            .append_bytes(&expected_rest);
-
-        length.set_const((&end - &start) as u64);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::DefCfaExpression {
-                expression: Expression(EndianSlice::new(&expected_expr, LittleEndian)),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_expression() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 99;
-        let expected_expr = [10, 9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        let length = Label::new();
-        let start = Label::new();
-        let end = Label::new();
-
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_expression.0)
-            .uleb(expected_reg.into())
-            .D8(&length)
-            .mark(&start)
-            .append_bytes(&expected_expr)
-            .mark(&end)
-            .append_bytes(&expected_rest);
-
-        length.set_const((&end - &start) as u64);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::Expression {
-                register: Register(expected_reg),
-                expression: Expression(EndianSlice::new(&expected_expr, LittleEndian)),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_offset_extended_sf() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 7;
-        let expected_offset = -33;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_offset_extended_sf.0)
-            .uleb(expected_reg.into())
-            .sleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::OffsetExtendedSf {
-                register: Register(expected_reg),
-                factored_offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_def_cfa_sf() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 2;
-        let expected_offset = -9999;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_def_cfa_sf.0)
-            .uleb(expected_reg.into())
-            .sleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::DefCfaSf {
-                register: Register(expected_reg),
-                factored_offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_def_cfa_offset_sf() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_offset = -123;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_def_cfa_offset_sf.0)
-            .sleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::DefCfaOffsetSf {
-                factored_offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_val_offset() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 50;
-        let expected_offset = 23;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_val_offset.0)
-            .uleb(expected_reg.into())
-            .uleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::ValOffset {
-                register: Register(expected_reg),
-                factored_offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_val_offset_sf() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 50;
-        let expected_offset = -23;
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_val_offset_sf.0)
-            .uleb(expected_reg.into())
-            .sleb(expected_offset)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::ValOffsetSf {
-                register: Register(expected_reg),
-                factored_offset: expected_offset,
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_val_expression() {
-        let expected_rest = [1, 2, 3, 4];
-        let expected_reg = 50;
-        let expected_expr = [2, 2, 1, 1, 5, 5];
-
-        let length = Label::new();
-        let start = Label::new();
-        let end = Label::new();
-
-        let section = Section::with_endian(Endian::Little)
-            .D8(constants::DW_CFA_val_expression.0)
-            .uleb(expected_reg.into())
-            .D8(&length)
-            .mark(&start)
-            .append_bytes(&expected_expr)
-            .mark(&end)
-            .append_bytes(&expected_rest);
-
-        length.set_const((&end - &start) as u64);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Ok(CallFrameInstruction::ValExpression {
-                register: Register(expected_reg),
-                expression: Expression(EndianSlice::new(&expected_expr, LittleEndian)),
-            })
-        );
-        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_cfi_instruction_unknown_instruction() {
-        let expected_rest = [1, 2, 3, 4];
-        let unknown_instr = constants::DwCfa(0b0011_1111);
-        let section = Section::with_endian(Endian::Little)
-            .D8(unknown_instr.0)
-            .append_bytes(&expected_rest);
-        let contents = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&contents, LittleEndian);
-        assert_eq!(
-            parse_cfi_instruction(input, 8),
-            Err(Error::UnknownCallFrameInstruction(unknown_instr))
-        );
-    }
-
-    #[test]
-    fn test_call_frame_instruction_iter_ok() {
-        let expected_reg = 50;
-        let expected_expr = [2, 2, 1, 1, 5, 5];
-        let expected_delta = 230;
-
-        let length = Label::new();
-        let start = Label::new();
-        let end = Label::new();
-
-        let section = Section::with_endian(Endian::Big)
-            .D8(constants::DW_CFA_val_expression.0)
-            .uleb(expected_reg.into())
-            .D8(&length)
-            .mark(&start)
-            .append_bytes(&expected_expr)
-            .mark(&end)
-            .D8(constants::DW_CFA_advance_loc1.0)
-            .D8(expected_delta);
-
-        length.set_const((&end - &start) as u64);
-        let contents = section.get_contents().unwrap();
-        let input = EndianSlice::new(&contents, BigEndian);
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 8,
-            section: &EndianSlice::default(),
-        };
-        let mut iter = CallFrameInstructionIter {
-            input,
-            address_encoding: None,
-            parameters,
-        };
-
-        assert_eq!(
-            iter.next(),
-            Ok(Some(CallFrameInstruction::ValExpression {
-                register: Register(expected_reg),
-                expression: Expression(EndianSlice::new(&expected_expr, BigEndian)),
-            }))
-        );
-
-        assert_eq!(
-            iter.next(),
-            Ok(Some(CallFrameInstruction::AdvanceLoc {
-                delta: u32::from(expected_delta),
-            }))
-        );
-
-        assert_eq!(iter.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_call_frame_instruction_iter_err() {
-        // DW_CFA_advance_loc1 without an operand.
-        let section = Section::with_endian(Endian::Big).D8(constants::DW_CFA_advance_loc1.0);
-
-        let contents = section.get_contents().unwrap();
-        let input = EndianSlice::new(&contents, BigEndian);
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 8,
-            section: &EndianSlice::default(),
-        };
-        let mut iter = CallFrameInstructionIter {
-            input,
-            address_encoding: None,
-            parameters,
-        };
-
-        assert_eq!(
-            iter.next().map_eof(&contents),
-            Err(Error::UnexpectedEof(ReaderOffsetId(1)))
-        );
-        assert_eq!(iter.next(), Ok(None));
-    }
-
-    #[allow(clippy::needless_pass_by_value)]
-    fn assert_eval<'a, I>(
-        mut initial_ctx: UnwindContext<EndianSlice<'a, LittleEndian>>,
-        expected_ctx: UnwindContext<EndianSlice<'a, LittleEndian>>,
-        cie: CommonInformationEntry<EndianSlice<'a, LittleEndian>>,
-        fde: Option<FrameDescriptionEntry<EndianSlice<'a, LittleEndian>>>,
-        instructions: I,
-    ) where
-        I: AsRef<
-            [(
-                Result<bool>,
-                CallFrameInstruction<EndianSlice<'a, LittleEndian>>,
-            )],
-        >,
-    {
-        {
-            let section = &DebugFrame::from(EndianSlice::default());
-            let bases = &BaseAddresses::default();
-            let mut table = match fde {
-                Some(fde) => UnwindTable::new_for_fde(section, bases, &mut initial_ctx, &fde),
-                None => UnwindTable::new_for_cie(section, bases, &mut initial_ctx, &cie),
-            };
-            for &(ref expected_result, ref instruction) in instructions.as_ref() {
-                assert_eq!(*expected_result, table.evaluate(instruction.clone()));
-            }
-        }
-
-        assert_eq!(expected_ctx, initial_ctx);
-    }
-
-    fn make_test_cie<'a>() -> CommonInformationEntry<EndianSlice<'a, LittleEndian>> {
-        CommonInformationEntry {
-            offset: 0,
-            format: Format::Dwarf64,
-            length: 0,
-            return_address_register: Register(0),
-            version: 4,
-            address_size: mem::size_of::<usize>() as u8,
-            initial_instructions: EndianSlice::new(&[], LittleEndian),
-            augmentation: None,
-            segment_size: 0,
-            data_alignment_factor: 2,
-            code_alignment_factor: 3,
-        }
-    }
-
-    #[test]
-    fn test_eval_set_loc() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected.row_mut().end_address = 42;
-        let instructions = [(Ok(true), CallFrameInstruction::SetLoc { address: 42 })];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_set_loc_backwards() {
-        let cie = make_test_cie();
-        let mut ctx = UnwindContext::new();
-        ctx.row_mut().start_address = 999;
-        let expected = ctx.clone();
-        let instructions = [(
-            Err(Error::InvalidAddressRange),
-            CallFrameInstruction::SetLoc { address: 42 },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_advance_loc() {
-        let cie = make_test_cie();
-        let mut ctx = UnwindContext::new();
-        ctx.row_mut().start_address = 3;
-        let mut expected = ctx.clone();
-        expected.row_mut().end_address = 3 + 2 * cie.code_alignment_factor;
-        let instructions = [(Ok(true), CallFrameInstruction::AdvanceLoc { delta: 2 })];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_advance_loc_overflow() {
-        let cie = make_test_cie();
-        let mut ctx = UnwindContext::new();
-        ctx.row_mut().start_address = u64::MAX;
-        let mut expected = ctx.clone();
-        expected.row_mut().end_address = 42 * cie.code_alignment_factor - 1;
-        let instructions = [(Ok(true), CallFrameInstruction::AdvanceLoc { delta: 42 })];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_def_cfa() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected.set_cfa(CfaRule::RegisterAndOffset {
-            register: Register(42),
-            offset: 36,
-        });
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::DefCfa {
-                register: Register(42),
-                offset: 36,
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_def_cfa_sf() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected.set_cfa(CfaRule::RegisterAndOffset {
-            register: Register(42),
-            offset: 36 * cie.data_alignment_factor as i64,
-        });
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::DefCfaSf {
-                register: Register(42),
-                factored_offset: 36,
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_def_cfa_register() {
-        let cie = make_test_cie();
-        let mut ctx = UnwindContext::new();
-        ctx.set_cfa(CfaRule::RegisterAndOffset {
-            register: Register(3),
-            offset: 8,
-        });
-        let mut expected = ctx.clone();
-        expected.set_cfa(CfaRule::RegisterAndOffset {
-            register: Register(42),
-            offset: 8,
-        });
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::DefCfaRegister {
-                register: Register(42),
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_def_cfa_register_invalid_context() {
-        let cie = make_test_cie();
-        let mut ctx = UnwindContext::new();
-        ctx.set_cfa(CfaRule::Expression(Expression(EndianSlice::new(
-            &[],
-            LittleEndian,
-        ))));
-        let expected = ctx.clone();
-        let instructions = [(
-            Err(Error::CfiInstructionInInvalidContext),
-            CallFrameInstruction::DefCfaRegister {
-                register: Register(42),
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_def_cfa_offset() {
-        let cie = make_test_cie();
-        let mut ctx = UnwindContext::new();
-        ctx.set_cfa(CfaRule::RegisterAndOffset {
-            register: Register(3),
-            offset: 8,
-        });
-        let mut expected = ctx.clone();
-        expected.set_cfa(CfaRule::RegisterAndOffset {
-            register: Register(3),
-            offset: 42,
-        });
-        let instructions = [(Ok(false), CallFrameInstruction::DefCfaOffset { offset: 42 })];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_def_cfa_offset_invalid_context() {
-        let cie = make_test_cie();
-        let mut ctx = UnwindContext::new();
-        ctx.set_cfa(CfaRule::Expression(Expression(EndianSlice::new(
-            &[],
-            LittleEndian,
-        ))));
-        let expected = ctx.clone();
-        let instructions = [(
-            Err(Error::CfiInstructionInInvalidContext),
-            CallFrameInstruction::DefCfaOffset { offset: 1993 },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_def_cfa_expression() {
-        let expr = [1, 2, 3, 4];
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected.set_cfa(CfaRule::Expression(Expression(EndianSlice::new(
-            &expr,
-            LittleEndian,
-        ))));
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::DefCfaExpression {
-                expression: Expression(EndianSlice::new(&expr, LittleEndian)),
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_undefined() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected
-            .set_register_rule(Register(5), RegisterRule::Undefined)
-            .unwrap();
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::Undefined {
-                register: Register(5),
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_same_value() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected
-            .set_register_rule(Register(0), RegisterRule::SameValue)
-            .unwrap();
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::SameValue {
-                register: Register(0),
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_offset() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected
-            .set_register_rule(
-                Register(2),
-                RegisterRule::Offset(3 * cie.data_alignment_factor),
-            )
-            .unwrap();
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::Offset {
-                register: Register(2),
-                factored_offset: 3,
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_offset_extended_sf() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected
-            .set_register_rule(
-                Register(4),
-                RegisterRule::Offset(-3 * cie.data_alignment_factor),
-            )
-            .unwrap();
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::OffsetExtendedSf {
-                register: Register(4),
-                factored_offset: -3,
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_val_offset() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected
-            .set_register_rule(
-                Register(5),
-                RegisterRule::ValOffset(7 * cie.data_alignment_factor),
-            )
-            .unwrap();
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::ValOffset {
-                register: Register(5),
-                factored_offset: 7,
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_val_offset_sf() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected
-            .set_register_rule(
-                Register(5),
-                RegisterRule::ValOffset(-7 * cie.data_alignment_factor),
-            )
-            .unwrap();
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::ValOffsetSf {
-                register: Register(5),
-                factored_offset: -7,
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_expression() {
-        let expr = [1, 2, 3, 4];
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected
-            .set_register_rule(
-                Register(9),
-                RegisterRule::Expression(Expression(EndianSlice::new(&expr, LittleEndian))),
-            )
-            .unwrap();
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::Expression {
-                register: Register(9),
-                expression: Expression(EndianSlice::new(&expr, LittleEndian)),
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_val_expression() {
-        let expr = [1, 2, 3, 4];
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected
-            .set_register_rule(
-                Register(9),
-                RegisterRule::ValExpression(Expression(EndianSlice::new(&expr, LittleEndian))),
-            )
-            .unwrap();
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::ValExpression {
-                register: Register(9),
-                expression: Expression(EndianSlice::new(&expr, LittleEndian)),
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_restore() {
-        let cie = make_test_cie();
-        let fde = FrameDescriptionEntry {
-            offset: 0,
-            format: Format::Dwarf64,
-            length: 0,
-            address_range: 0,
-            augmentation: None,
-            initial_address: 0,
-            initial_segment: 0,
-            cie: cie.clone(),
-            instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let mut ctx = UnwindContext::new();
-        ctx.set_register_rule(Register(0), RegisterRule::Offset(1))
-            .unwrap();
-        ctx.save_initial_rules();
-        let expected = ctx.clone();
-        ctx.set_register_rule(Register(0), RegisterRule::Offset(2))
-            .unwrap();
-
-        let instructions = [(
-            Ok(false),
-            CallFrameInstruction::Restore {
-                register: Register(0),
-            },
-        )];
-        assert_eval(ctx, expected, cie, Some(fde), instructions);
-    }
-
-    #[test]
-    fn test_eval_restore_havent_saved_initial_context() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let expected = ctx.clone();
-        let instructions = [(
-            Err(Error::CfiInstructionInInvalidContext),
-            CallFrameInstruction::Restore {
-                register: Register(0),
-            },
-        )];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_remember_state() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let mut expected = ctx.clone();
-        expected.push_row().unwrap();
-        let instructions = [(Ok(false), CallFrameInstruction::RememberState)];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_restore_state() {
-        let cie = make_test_cie();
-
-        let mut ctx = UnwindContext::new();
-        ctx.set_start_address(1);
-        ctx.set_register_rule(Register(0), RegisterRule::SameValue)
-            .unwrap();
-        let mut expected = ctx.clone();
-        ctx.push_row().unwrap();
-        ctx.set_start_address(2);
-        ctx.set_register_rule(Register(0), RegisterRule::Offset(16))
-            .unwrap();
-
-        // Restore state should preserve current location.
-        expected.set_start_address(2);
-
-        let instructions = [
-            // First one pops just fine.
-            (Ok(false), CallFrameInstruction::RestoreState),
-            // Second pop would try to pop out of bounds.
-            (
-                Err(Error::PopWithEmptyStack),
-                CallFrameInstruction::RestoreState,
-            ),
-        ];
-
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_eval_nop() {
-        let cie = make_test_cie();
-        let ctx = UnwindContext::new();
-        let expected = ctx.clone();
-        let instructions = [(Ok(false), CallFrameInstruction::Nop)];
-        assert_eval(ctx, expected, cie, None, instructions);
-    }
-
-    #[test]
-    fn test_unwind_table_next_row() {
-        #[allow(clippy::identity_op)]
-        let initial_instructions = Section::with_endian(Endian::Little)
-            // The CFA is -12 from register 4.
-            .D8(constants::DW_CFA_def_cfa_sf.0)
-            .uleb(4)
-            .sleb(-12)
-            // Register 0 is 8 from the CFA.
-            .D8(constants::DW_CFA_offset.0 | 0)
-            .uleb(8)
-            // Register 3 is 4 from the CFA.
-            .D8(constants::DW_CFA_offset.0 | 3)
-            .uleb(4)
-            .append_repeated(constants::DW_CFA_nop.0, 4);
-        let initial_instructions = initial_instructions.get_contents().unwrap();
-
-        let cie = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 8,
-            segment_size: 0,
-            code_alignment_factor: 1,
-            data_alignment_factor: 1,
-            return_address_register: Register(3),
-            initial_instructions: EndianSlice::new(&initial_instructions, LittleEndian),
-        };
-
-        let instructions = Section::with_endian(Endian::Little)
-            // Initial instructions form a row, advance the address by 1.
-            .D8(constants::DW_CFA_advance_loc1.0)
-            .D8(1)
-            // Register 0 is -16 from the CFA.
-            .D8(constants::DW_CFA_offset_extended_sf.0)
-            .uleb(0)
-            .sleb(-16)
-            // Finish this row, advance the address by 32.
-            .D8(constants::DW_CFA_advance_loc1.0)
-            .D8(32)
-            // Register 3 is -4 from the CFA.
-            .D8(constants::DW_CFA_offset_extended_sf.0)
-            .uleb(3)
-            .sleb(-4)
-            // Finish this row, advance the address by 64.
-            .D8(constants::DW_CFA_advance_loc1.0)
-            .D8(64)
-            // Register 5 is 4 from the CFA.
-            .D8(constants::DW_CFA_offset.0 | 5)
-            .uleb(4)
-            // A bunch of nop padding.
-            .append_repeated(constants::DW_CFA_nop.0, 8);
-        let instructions = instructions.get_contents().unwrap();
-
-        let fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0,
-            address_range: 100,
-            augmentation: None,
-            instructions: EndianSlice::new(&instructions, LittleEndian),
-        };
-
-        let section = &DebugFrame::from(EndianSlice::default());
-        let bases = &BaseAddresses::default();
-        let mut ctx = UninitializedUnwindContext::new();
-        ctx.0.assert_fully_uninitialized();
-
-        let mut table = fde
-            .rows(section, bases, &mut ctx)
-            .expect("Should run initial program OK");
-        assert!(table.ctx.is_initialized);
-        let expected_initial_rules: RegisterRuleMap<_> = [
-            (Register(0), RegisterRule::Offset(8)),
-            (Register(3), RegisterRule::Offset(4)),
-        ]
-        .iter()
-        .collect();
-        assert_eq!(table.ctx.initial_rules, expected_initial_rules);
-
-        {
-            let row = table.next_row().expect("Should evaluate first row OK");
-            let expected = UnwindTableRow {
-                start_address: 0,
-                end_address: 1,
-                saved_args_size: 0,
-                cfa: CfaRule::RegisterAndOffset {
-                    register: Register(4),
-                    offset: -12,
-                },
-                registers: [
-                    (Register(0), RegisterRule::Offset(8)),
-                    (Register(3), RegisterRule::Offset(4)),
-                ]
-                .iter()
-                .collect(),
-            };
-            assert_eq!(Some(&expected), row);
-        }
-
-        {
-            let row = table.next_row().expect("Should evaluate second row OK");
-            let expected = UnwindTableRow {
-                start_address: 1,
-                end_address: 33,
-                saved_args_size: 0,
-                cfa: CfaRule::RegisterAndOffset {
-                    register: Register(4),
-                    offset: -12,
-                },
-                registers: [
-                    (Register(0), RegisterRule::Offset(-16)),
-                    (Register(3), RegisterRule::Offset(4)),
-                ]
-                .iter()
-                .collect(),
-            };
-            assert_eq!(Some(&expected), row);
-        }
-
-        {
-            let row = table.next_row().expect("Should evaluate third row OK");
-            let expected = UnwindTableRow {
-                start_address: 33,
-                end_address: 97,
-                saved_args_size: 0,
-                cfa: CfaRule::RegisterAndOffset {
-                    register: Register(4),
-                    offset: -12,
-                },
-                registers: [
-                    (Register(0), RegisterRule::Offset(-16)),
-                    (Register(3), RegisterRule::Offset(-4)),
-                ]
-                .iter()
-                .collect(),
-            };
-            assert_eq!(Some(&expected), row);
-        }
-
-        {
-            let row = table.next_row().expect("Should evaluate fourth row OK");
-            let expected = UnwindTableRow {
-                start_address: 97,
-                end_address: 100,
-                saved_args_size: 0,
-                cfa: CfaRule::RegisterAndOffset {
-                    register: Register(4),
-                    offset: -12,
-                },
-                registers: [
-                    (Register(0), RegisterRule::Offset(-16)),
-                    (Register(3), RegisterRule::Offset(-4)),
-                    (Register(5), RegisterRule::Offset(4)),
-                ]
-                .iter()
-                .collect(),
-            };
-            assert_eq!(Some(&expected), row);
-        }
-
-        // All done!
-        assert_eq!(Ok(None), table.next_row());
-        assert_eq!(Ok(None), table.next_row());
-    }
-
-    #[test]
-    fn test_unwind_info_for_address_ok() {
-        let instrs1 = Section::with_endian(Endian::Big)
-            // The CFA is -12 from register 4.
-            .D8(constants::DW_CFA_def_cfa_sf.0)
-            .uleb(4)
-            .sleb(-12);
-        let instrs1 = instrs1.get_contents().unwrap();
-
-        let instrs2: Vec<_> = (0..8).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let instrs3 = Section::with_endian(Endian::Big)
-            // Initial instructions form a row, advance the address by 100.
-            .D8(constants::DW_CFA_advance_loc1.0)
-            .D8(100)
-            // Register 0 is -16 from the CFA.
-            .D8(constants::DW_CFA_offset_extended_sf.0)
-            .uleb(0)
-            .sleb(-16);
-        let instrs3 = instrs3.get_contents().unwrap();
-
-        let instrs4: Vec<_> = (0..16).map(|_| constants::DW_CFA_nop.0).collect();
-
-        let mut cie1 = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 8,
-            segment_size: 0,
-            code_alignment_factor: 1,
-            data_alignment_factor: 1,
-            return_address_register: Register(3),
-            initial_instructions: EndianSlice::new(&instrs1, BigEndian),
-        };
-
-        let mut cie2 = CommonInformationEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            version: 4,
-            augmentation: None,
-            address_size: 4,
-            segment_size: 0,
-            code_alignment_factor: 1,
-            data_alignment_factor: 1,
-            return_address_register: Register(1),
-            initial_instructions: EndianSlice::new(&instrs2, BigEndian),
-        };
-
-        let cie1_location = Label::new();
-        let cie2_location = Label::new();
-
-        // Write the CIEs first so that their length gets set before we clone
-        // them into the FDEs and our equality assertions down the line end up
-        // with all the CIEs always having he correct length.
-        let kind = debug_frame_be();
-        let section = Section::with_endian(kind.endian())
-            .mark(&cie1_location)
-            .cie(kind, None, &mut cie1)
-            .mark(&cie2_location)
-            .cie(kind, None, &mut cie2);
-
-        let mut fde1 = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie1.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_beef,
-            address_range: 200,
-            augmentation: None,
-            instructions: EndianSlice::new(&instrs3, BigEndian),
-        };
-
-        let mut fde2 = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie2.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_face,
-            address_range: 9000,
-            augmentation: None,
-            instructions: EndianSlice::new(&instrs4, BigEndian),
-        };
-
-        let section =
-            section
-                .fde(kind, &cie1_location, &mut fde1)
-                .fde(kind, &cie2_location, &mut fde2);
-        section.start().set_const(0);
-
-        let contents = section.get_contents().unwrap();
-        let debug_frame = kind.section(&contents);
-
-        // Get the second row of the unwind table in `instrs3`.
-        let bases = Default::default();
-        let mut ctx = UninitializedUnwindContext::new();
-        let result = debug_frame.unwind_info_for_address(
-            &bases,
-            &mut ctx,
-            0xfeed_beef + 150,
-            DebugFrame::cie_from_offset,
-        );
-        assert!(result.is_ok());
-        let unwind_info = result.unwrap();
-
-        assert_eq!(
-            unwind_info,
-            UnwindTableRow {
-                start_address: fde1.initial_address() + 100,
-                end_address: fde1.initial_address() + fde1.len(),
-                saved_args_size: 0,
-                cfa: CfaRule::RegisterAndOffset {
-                    register: Register(4),
-                    offset: -12,
-                },
-                registers: [(Register(0), RegisterRule::Offset(-16))].iter().collect(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_unwind_info_for_address_not_found() {
-        let debug_frame = DebugFrame::new(&[], NativeEndian);
-        let bases = Default::default();
-        let mut ctx = UninitializedUnwindContext::new();
-        let result = debug_frame.unwind_info_for_address(
-            &bases,
-            &mut ctx,
-            0xbadb_ad99,
-            DebugFrame::cie_from_offset,
-        );
-        assert!(result.is_err());
-        assert_eq!(result.unwrap_err(), Error::NoUnwindInfoForAddress);
-    }
-
-    #[test]
-    fn test_eh_frame_hdr_unknown_version() {
-        let bases = BaseAddresses::default();
-        let buf = &[42];
-        let result = EhFrameHdr::new(buf, NativeEndian).parse(&bases, 8);
-        assert!(result.is_err());
-        assert_eq!(result.unwrap_err(), Error::UnknownVersion(42));
-    }
-
-    #[test]
-    fn test_eh_frame_hdr_omit_ehptr() {
-        let section = Section::with_endian(Endian::Little)
-            .L8(1)
-            .L8(0xff)
-            .L8(0x03)
-            .L8(0x0b)
-            .L32(2)
-            .L32(10)
-            .L32(1)
-            .L32(20)
-            .L32(2)
-            .L32(0);
-        let section = section.get_contents().unwrap();
-        let bases = BaseAddresses::default();
-        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
-        assert!(result.is_err());
-        assert_eq!(result.unwrap_err(), Error::CannotParseOmitPointerEncoding);
-    }
-
-    #[test]
-    fn test_eh_frame_hdr_omit_count() {
-        let section = Section::with_endian(Endian::Little)
-            .L8(1)
-            .L8(0x0b)
-            .L8(0xff)
-            .L8(0x0b)
-            .L32(0x12345);
-        let section = section.get_contents().unwrap();
-        let bases = BaseAddresses::default();
-        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
-        assert!(result.is_ok());
-        let result = result.unwrap();
-        assert_eq!(result.eh_frame_ptr(), Pointer::Direct(0x12345));
-        assert!(result.table().is_none());
-    }
-
-    #[test]
-    fn test_eh_frame_hdr_omit_table() {
-        let section = Section::with_endian(Endian::Little)
-            .L8(1)
-            .L8(0x0b)
-            .L8(0x03)
-            .L8(0xff)
-            .L32(0x12345)
-            .L32(2);
-        let section = section.get_contents().unwrap();
-        let bases = BaseAddresses::default();
-        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
-        assert!(result.is_ok());
-        let result = result.unwrap();
-        assert_eq!(result.eh_frame_ptr(), Pointer::Direct(0x12345));
-        assert!(result.table().is_none());
-    }
-
-    #[test]
-    fn test_eh_frame_hdr_varlen_table() {
-        let section = Section::with_endian(Endian::Little)
-            .L8(1)
-            .L8(0x0b)
-            .L8(0x03)
-            .L8(0x01)
-            .L32(0x12345)
-            .L32(2);
-        let section = section.get_contents().unwrap();
-        let bases = BaseAddresses::default();
-        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
-        assert!(result.is_ok());
-        let result = result.unwrap();
-        assert_eq!(result.eh_frame_ptr(), Pointer::Direct(0x12345));
-        let table = result.table();
-        assert!(table.is_some());
-        let table = table.unwrap();
-        assert_eq!(
-            table.lookup(0, &bases),
-            Err(Error::VariableLengthSearchTable)
-        );
-    }
-
-    #[test]
-    fn test_eh_frame_hdr_indirect_length() {
-        let section = Section::with_endian(Endian::Little)
-            .L8(1)
-            .L8(0x0b)
-            .L8(0x83)
-            .L8(0x0b)
-            .L32(0x12345)
-            .L32(2);
-        let section = section.get_contents().unwrap();
-        let bases = BaseAddresses::default();
-        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
-        assert!(result.is_err());
-        assert_eq!(result.unwrap_err(), Error::UnsupportedPointerEncoding);
-    }
-
-    #[test]
-    fn test_eh_frame_hdr_indirect_ptrs() {
-        let section = Section::with_endian(Endian::Little)
-            .L8(1)
-            .L8(0x8b)
-            .L8(0x03)
-            .L8(0x8b)
-            .L32(0x12345)
-            .L32(2)
-            .L32(10)
-            .L32(1)
-            .L32(20)
-            .L32(2);
-        let section = section.get_contents().unwrap();
-        let bases = BaseAddresses::default();
-        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
-        assert!(result.is_ok());
-        let result = result.unwrap();
-        assert_eq!(result.eh_frame_ptr(), Pointer::Indirect(0x12345));
-        let table = result.table();
-        assert!(table.is_some());
-        let table = table.unwrap();
-        assert_eq!(
-            table.lookup(0, &bases),
-            Err(Error::UnsupportedPointerEncoding)
-        );
-    }
-
-    #[test]
-    fn test_eh_frame_hdr_good() {
-        let section = Section::with_endian(Endian::Little)
-            .L8(1)
-            .L8(0x0b)
-            .L8(0x03)
-            .L8(0x0b)
-            .L32(0x12345)
-            .L32(2)
-            .L32(10)
-            .L32(1)
-            .L32(20)
-            .L32(2);
-        let section = section.get_contents().unwrap();
-        let bases = BaseAddresses::default();
-        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
-        assert!(result.is_ok());
-        let result = result.unwrap();
-        assert_eq!(result.eh_frame_ptr(), Pointer::Direct(0x12345));
-        let table = result.table();
-        assert!(table.is_some());
-        let table = table.unwrap();
-        assert_eq!(table.lookup(0, &bases), Ok(Pointer::Direct(1)));
-        assert_eq!(table.lookup(9, &bases), Ok(Pointer::Direct(1)));
-        assert_eq!(table.lookup(10, &bases), Ok(Pointer::Direct(1)));
-        assert_eq!(table.lookup(11, &bases), Ok(Pointer::Direct(1)));
-        assert_eq!(table.lookup(19, &bases), Ok(Pointer::Direct(1)));
-        assert_eq!(table.lookup(20, &bases), Ok(Pointer::Direct(2)));
-        assert_eq!(table.lookup(21, &bases), Ok(Pointer::Direct(2)));
-        assert_eq!(table.lookup(100_000, &bases), Ok(Pointer::Direct(2)));
-    }
-
-    #[test]
-    fn test_eh_frame_fde_for_address_good() {
-        // First, setup eh_frame
-        // Write the CIE first so that its length gets set before we clone it
-        // into the FDE.
-        let mut cie = make_test_cie();
-        cie.format = Format::Dwarf32;
-        cie.version = 1;
-
-        let start_of_cie = Label::new();
-        let end_of_cie = Label::new();
-
-        let kind = eh_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .append_repeated(0, 16)
-            .mark(&start_of_cie)
-            .cie(kind, None, &mut cie)
-            .mark(&end_of_cie);
-
-        let mut fde1 = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 9,
-            address_range: 4,
-            augmentation: None,
-            instructions: EndianSlice::new(&[], LittleEndian),
-        };
-        let mut fde2 = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 20,
-            address_range: 8,
-            augmentation: None,
-            instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let start_of_fde1 = Label::new();
-        let start_of_fde2 = Label::new();
-
-        let section = section
-            // +4 for the FDE length before the CIE offset.
-            .mark(&start_of_fde1)
-            .fde(kind, (&start_of_fde1 - &start_of_cie + 4) as u64, &mut fde1)
-            .mark(&start_of_fde2)
-            .fde(kind, (&start_of_fde2 - &start_of_cie + 4) as u64, &mut fde2);
-
-        section.start().set_const(0);
-        let section = section.get_contents().unwrap();
-        let section = EndianSlice::new(&section, LittleEndian);
-        let eh_frame = kind.section(&section);
-
-        // Setup eh_frame_hdr
-        let section = Section::with_endian(kind.endian())
-            .L8(1)
-            .L8(0x0b)
-            .L8(0x03)
-            .L8(0x0b)
-            .L32(0x12345)
-            .L32(2)
-            .L32(10)
-            .L32(0x12345 + start_of_fde1.value().unwrap() as u32)
-            .L32(20)
-            .L32(0x12345 + start_of_fde2.value().unwrap() as u32);
-
-        let section = section.get_contents().unwrap();
-        let bases = BaseAddresses::default();
-        let eh_frame_hdr = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
-        assert!(eh_frame_hdr.is_ok());
-        let eh_frame_hdr = eh_frame_hdr.unwrap();
-
-        let table = eh_frame_hdr.table();
-        assert!(table.is_some());
-        let table = table.unwrap();
-
-        let bases = Default::default();
-
-        let f = |_: &_, _: &_, o: EhFrameOffset| {
-            assert_eq!(o, EhFrameOffset(start_of_cie.value().unwrap() as usize));
-            Ok(cie.clone())
-        };
-        assert_eq!(
-            table.fde_for_address(&eh_frame, &bases, 9, f),
-            Ok(fde1.clone())
-        );
-        assert_eq!(
-            table.fde_for_address(&eh_frame, &bases, 10, f),
-            Ok(fde1.clone())
-        );
-        assert_eq!(table.fde_for_address(&eh_frame, &bases, 11, f), Ok(fde1));
-        assert_eq!(
-            table.fde_for_address(&eh_frame, &bases, 19, f),
-            Err(Error::NoUnwindInfoForAddress)
-        );
-        assert_eq!(
-            table.fde_for_address(&eh_frame, &bases, 20, f),
-            Ok(fde2.clone())
-        );
-        assert_eq!(table.fde_for_address(&eh_frame, &bases, 21, f), Ok(fde2));
-        assert_eq!(
-            table.fde_for_address(&eh_frame, &bases, 100_000, f),
-            Err(Error::NoUnwindInfoForAddress)
-        );
-    }
-
-    #[test]
-    fn test_eh_frame_stops_at_zero_length() {
-        let section = Section::with_endian(Endian::Little).L32(0);
-        let section = section.get_contents().unwrap();
-        let rest = &mut EndianSlice::new(&section, LittleEndian);
-        let bases = Default::default();
-
-        assert_eq!(
-            parse_cfi_entry(&bases, &EhFrame::new(&*section, LittleEndian), rest),
-            Ok(None)
-        );
-
-        assert_eq!(
-            EhFrame::new(&section, LittleEndian).cie_from_offset(&bases, EhFrameOffset(0)),
-            Err(Error::NoEntryAtGivenOffset)
-        );
-    }
-
-    fn resolve_cie_offset(buf: &[u8], cie_offset: usize) -> Result<usize> {
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf64,
-            cie: make_test_cie(),
-            initial_segment: 0,
-            initial_address: 0xfeed_beef,
-            address_range: 39,
-            augmentation: None,
-            instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let kind = eh_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .append_bytes(&buf)
-            .fde(kind, cie_offset as u64, &mut fde)
-            .append_bytes(&buf);
-
-        let section = section.get_contents().unwrap();
-        let eh_frame = kind.section(&section);
-        let input = &mut EndianSlice::new(&section[buf.len()..], LittleEndian);
-
-        let bases = Default::default();
-        match parse_cfi_entry(&bases, &eh_frame, input) {
-            Ok(Some(CieOrFde::Fde(partial))) => Ok(partial.cie_offset.0),
-            Err(e) => Err(e),
-            otherwise => panic!("Unexpected result: {:#?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_eh_frame_resolve_cie_offset_ok() {
-        let buf = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let cie_offset = 2;
-        // + 4 for size of length field
-        assert_eq!(
-            resolve_cie_offset(&buf, buf.len() + 4 - cie_offset),
-            Ok(cie_offset)
-        );
-    }
-
-    #[test]
-    fn test_eh_frame_resolve_cie_offset_out_of_bounds() {
-        let buf = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-        assert_eq!(
-            resolve_cie_offset(&buf, buf.len() + 4 + 2),
-            Err(Error::OffsetOutOfBounds)
-        );
-    }
-
-    #[test]
-    fn test_eh_frame_resolve_cie_offset_underflow() {
-        let buf = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-        assert_eq!(
-            resolve_cie_offset(&buf, ::core::usize::MAX),
-            Err(Error::OffsetOutOfBounds)
-        );
-    }
-
-    #[test]
-    fn test_eh_frame_fde_ok() {
-        let mut cie = make_test_cie();
-        cie.format = Format::Dwarf32;
-        cie.version = 1;
-
-        let start_of_cie = Label::new();
-        let end_of_cie = Label::new();
-
-        // Write the CIE first so that its length gets set before we clone it
-        // into the FDE.
-        let kind = eh_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .append_repeated(0, 16)
-            .mark(&start_of_cie)
-            .cie(kind, None, &mut cie)
-            .mark(&end_of_cie);
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_beef,
-            address_range: 999,
-            augmentation: None,
-            instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let section = section
-            // +4 for the FDE length before the CIE offset.
-            .fde(kind, (&end_of_cie - &start_of_cie + 4) as u64, &mut fde);
-
-        section.start().set_const(0);
-        let section = section.get_contents().unwrap();
-        let eh_frame = kind.section(&section);
-        let section = EndianSlice::new(&section, LittleEndian);
-
-        let mut offset = None;
-        match parse_fde(
-            eh_frame,
-            &mut section.range_from(end_of_cie.value().unwrap() as usize..),
-            |_, _, o| {
-                offset = Some(o);
-                assert_eq!(o, EhFrameOffset(start_of_cie.value().unwrap() as usize));
-                Ok(cie.clone())
-            },
-        ) {
-            Ok(actual) => assert_eq!(actual, fde),
-            otherwise => panic!("Unexpected result {:?}", otherwise),
-        }
-        assert!(offset.is_some());
-    }
-
-    #[test]
-    fn test_eh_frame_fde_out_of_bounds() {
-        let mut cie = make_test_cie();
-        cie.version = 1;
-
-        let end_of_cie = Label::new();
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf64,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_beef,
-            address_range: 999,
-            augmentation: None,
-            instructions: EndianSlice::new(&[], LittleEndian),
-        };
-
-        let kind = eh_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .cie(kind, None, &mut cie)
-            .mark(&end_of_cie)
-            .fde(kind, 99_999_999_999_999, &mut fde);
-
-        section.start().set_const(0);
-        let section = section.get_contents().unwrap();
-        let eh_frame = kind.section(&section);
-        let section = EndianSlice::new(&section, LittleEndian);
-
-        let result = parse_fde(
-            eh_frame,
-            &mut section.range_from(end_of_cie.value().unwrap() as usize..),
-            UnwindSection::cie_from_offset,
-        );
-        assert_eq!(result, Err(Error::OffsetOutOfBounds));
-    }
-
-    #[test]
-    fn test_augmentation_parse_not_z_augmentation() {
-        let augmentation = &mut EndianSlice::new(b"wtf", NativeEndian);
-        let bases = Default::default();
-        let address_size = 8;
-        let section = EhFrame::new(&[], NativeEndian);
-        let input = &mut EndianSlice::new(&[], NativeEndian);
-        assert_eq!(
-            Augmentation::parse(augmentation, &bases, address_size, &section, input),
-            Err(Error::UnknownAugmentation)
-        );
-    }
-
-    #[test]
-    fn test_augmentation_parse_just_signal_trampoline() {
-        let aug_str = &mut EndianSlice::new(b"S", LittleEndian);
-        let bases = Default::default();
-        let address_size = 8;
-        let section = EhFrame::new(&[], LittleEndian);
-        let input = &mut EndianSlice::new(&[], LittleEndian);
-
-        let mut augmentation = Augmentation::default();
-        augmentation.is_signal_trampoline = true;
-
-        assert_eq!(
-            Augmentation::parse(aug_str, &bases, address_size, &section, input),
-            Ok(augmentation)
-        );
-    }
-
-    #[test]
-    fn test_augmentation_parse_unknown_part_of_z_augmentation() {
-        // The 'Z' character is not defined by the z-style augmentation.
-        let bases = Default::default();
-        let address_size = 8;
-        let section = Section::with_endian(Endian::Little)
-            .uleb(4)
-            .append_repeated(4, 4)
-            .get_contents()
-            .unwrap();
-        let section = EhFrame::new(&section, LittleEndian);
-        let input = &mut section.section().clone();
-        let augmentation = &mut EndianSlice::new(b"zZ", LittleEndian);
-        assert_eq!(
-            Augmentation::parse(augmentation, &bases, address_size, &section, input),
-            Err(Error::UnknownAugmentation)
-        );
-    }
-
-    #[test]
-    #[allow(non_snake_case)]
-    fn test_augmentation_parse_L() {
-        let bases = Default::default();
-        let address_size = 8;
-        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        let section = Section::with_endian(Endian::Little)
-            .uleb(1)
-            .D8(constants::DW_EH_PE_uleb128.0)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = EhFrame::new(&section, LittleEndian);
-        let input = &mut section.section().clone();
-        let aug_str = &mut EndianSlice::new(b"zL", LittleEndian);
-
-        let mut augmentation = Augmentation::default();
-        augmentation.lsda = Some(constants::DW_EH_PE_uleb128);
-
-        assert_eq!(
-            Augmentation::parse(aug_str, &bases, address_size, &section, input),
-            Ok(augmentation)
-        );
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    #[allow(non_snake_case)]
-    fn test_augmentation_parse_P() {
-        let bases = Default::default();
-        let address_size = 8;
-        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        let section = Section::with_endian(Endian::Little)
-            .uleb(9)
-            .D8(constants::DW_EH_PE_udata8.0)
-            .L64(0xf00d_f00d)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = EhFrame::new(&section, LittleEndian);
-        let input = &mut section.section().clone();
-        let aug_str = &mut EndianSlice::new(b"zP", LittleEndian);
-
-        let mut augmentation = Augmentation::default();
-        augmentation.personality = Some((constants::DW_EH_PE_udata8, Pointer::Direct(0xf00d_f00d)));
-
-        assert_eq!(
-            Augmentation::parse(aug_str, &bases, address_size, &section, input),
-            Ok(augmentation)
-        );
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    #[allow(non_snake_case)]
-    fn test_augmentation_parse_R() {
-        let bases = Default::default();
-        let address_size = 8;
-        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        let section = Section::with_endian(Endian::Little)
-            .uleb(1)
-            .D8(constants::DW_EH_PE_udata4.0)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = EhFrame::new(&section, LittleEndian);
-        let input = &mut section.section().clone();
-        let aug_str = &mut EndianSlice::new(b"zR", LittleEndian);
-
-        let mut augmentation = Augmentation::default();
-        augmentation.fde_address_encoding = Some(constants::DW_EH_PE_udata4);
-
-        assert_eq!(
-            Augmentation::parse(aug_str, &bases, address_size, &section, input),
-            Ok(augmentation)
-        );
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    #[allow(non_snake_case)]
-    fn test_augmentation_parse_S() {
-        let bases = Default::default();
-        let address_size = 8;
-        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        let section = Section::with_endian(Endian::Little)
-            .uleb(0)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = EhFrame::new(&section, LittleEndian);
-        let input = &mut section.section().clone();
-        let aug_str = &mut EndianSlice::new(b"zS", LittleEndian);
-
-        let mut augmentation = Augmentation::default();
-        augmentation.is_signal_trampoline = true;
-
-        assert_eq!(
-            Augmentation::parse(aug_str, &bases, address_size, &section, input),
-            Ok(augmentation)
-        );
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_augmentation_parse_all() {
-        let bases = Default::default();
-        let address_size = 8;
-        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        let section = Section::with_endian(Endian::Little)
-            .uleb(1 + 9 + 1)
-            // L
-            .D8(constants::DW_EH_PE_uleb128.0)
-            // P
-            .D8(constants::DW_EH_PE_udata8.0)
-            .L64(0x1bad_f00d)
-            // R
-            .D8(constants::DW_EH_PE_uleb128.0)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = EhFrame::new(&section, LittleEndian);
-        let input = &mut section.section().clone();
-        let aug_str = &mut EndianSlice::new(b"zLPRS", LittleEndian);
-
-        let augmentation = Augmentation {
-            lsda: Some(constants::DW_EH_PE_uleb128),
-            personality: Some((constants::DW_EH_PE_udata8, Pointer::Direct(0x1bad_f00d))),
-            fde_address_encoding: Some(constants::DW_EH_PE_uleb128),
-            is_signal_trampoline: true,
-        };
-
-        assert_eq!(
-            Augmentation::parse(aug_str, &bases, address_size, &section, input),
-            Ok(augmentation)
-        );
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_eh_frame_fde_no_augmentation() {
-        let instrs = [1, 2, 3, 4];
-        let cie_offset = 1;
-
-        let mut cie = make_test_cie();
-        cie.format = Format::Dwarf32;
-        cie.version = 1;
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_face,
-            address_range: 9000,
-            augmentation: None,
-            instructions: EndianSlice::new(&instrs, LittleEndian),
-        };
-
-        let rest = [1, 2, 3, 4];
-
-        let kind = eh_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .fde(kind, cie_offset, &mut fde)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = kind.section(&section);
-        let input = &mut section.section().clone();
-
-        let result = parse_fde(section, input, |_, _, _| Ok(cie.clone()));
-        assert_eq!(result, Ok(fde));
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_eh_frame_fde_empty_augmentation() {
-        let instrs = [1, 2, 3, 4];
-        let cie_offset = 1;
-
-        let mut cie = make_test_cie();
-        cie.format = Format::Dwarf32;
-        cie.version = 1;
-        cie.augmentation = Some(Augmentation::default());
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_face,
-            address_range: 9000,
-            augmentation: Some(AugmentationData::default()),
-            instructions: EndianSlice::new(&instrs, LittleEndian),
-        };
-
-        let rest = [1, 2, 3, 4];
-
-        let kind = eh_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .fde(kind, cie_offset, &mut fde)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = kind.section(&section);
-        let input = &mut section.section().clone();
-
-        let result = parse_fde(section, input, |_, _, _| Ok(cie.clone()));
-        assert_eq!(result, Ok(fde));
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_eh_frame_fde_lsda_augmentation() {
-        let instrs = [1, 2, 3, 4];
-        let cie_offset = 1;
-
-        let mut cie = make_test_cie();
-        cie.format = Format::Dwarf32;
-        cie.version = 1;
-        cie.augmentation = Some(Augmentation::default());
-        cie.augmentation.as_mut().unwrap().lsda = Some(constants::DW_EH_PE_absptr);
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_face,
-            address_range: 9000,
-            augmentation: Some(AugmentationData {
-                lsda: Some(Pointer::Direct(0x1122_3344)),
-            }),
-            instructions: EndianSlice::new(&instrs, LittleEndian),
-        };
-
-        let rest = [1, 2, 3, 4];
-
-        let kind = eh_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .fde(kind, cie_offset, &mut fde)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = kind.section(&section);
-        let input = &mut section.section().clone();
-
-        let result = parse_fde(section, input, |_, _, _| Ok(cie.clone()));
-        assert_eq!(result, Ok(fde));
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_eh_frame_fde_lsda_function_relative() {
-        let instrs = [1, 2, 3, 4];
-        let cie_offset = 1;
-
-        let mut cie = make_test_cie();
-        cie.format = Format::Dwarf32;
-        cie.version = 1;
-        cie.augmentation = Some(Augmentation::default());
-        cie.augmentation.as_mut().unwrap().lsda = Some(constants::DwEhPe(
-            constants::DW_EH_PE_funcrel.0 | constants::DW_EH_PE_absptr.0,
-        ));
-
-        let mut fde = FrameDescriptionEntry {
-            offset: 0,
-            length: 0,
-            format: Format::Dwarf32,
-            cie: cie.clone(),
-            initial_segment: 0,
-            initial_address: 0xfeed_face,
-            address_range: 9000,
-            augmentation: Some(AugmentationData {
-                lsda: Some(Pointer::Direct(0xbeef)),
-            }),
-            instructions: EndianSlice::new(&instrs, LittleEndian),
-        };
-
-        let rest = [1, 2, 3, 4];
-
-        let kind = eh_frame_le();
-        let section = Section::with_endian(kind.endian())
-            .append_repeated(10, 10)
-            .fde(kind, cie_offset, &mut fde)
-            .append_bytes(&rest)
-            .get_contents()
-            .unwrap();
-        let section = kind.section(&section);
-        let input = &mut section.section().range_from(10..);
-
-        // Adjust the FDE's augmentation to be relative to the function.
-        fde.augmentation.as_mut().unwrap().lsda = Some(Pointer::Direct(0xfeed_face + 0xbeef));
-
-        let result = parse_fde(section, input, |_, _, _| Ok(cie.clone()));
-        assert_eq!(result, Ok(fde));
-        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_eh_frame_cie_personality_function_relative_bad_context() {
-        let instrs = [1, 2, 3, 4];
-
-        let length = Label::new();
-        let start = Label::new();
-        let end = Label::new();
-
-        let aug_len = Label::new();
-        let aug_start = Label::new();
-        let aug_end = Label::new();
-
-        let section = Section::with_endian(Endian::Little)
-            // Length
-            .L32(&length)
-            .mark(&start)
-            // CIE ID
-            .L32(0)
-            // Version
-            .D8(1)
-            // Augmentation
-            .append_bytes(b"zP\0")
-            // Code alignment factor
-            .uleb(1)
-            // Data alignment factor
-            .sleb(1)
-            // Return address register
-            .uleb(1)
-            // Augmentation data length. This is a uleb, be we rely on the value
-            // being less than 2^7 and therefore a valid uleb (can't use Label
-            // with uleb).
-            .D8(&aug_len)
-            .mark(&aug_start)
-            // Augmentation data. Personality encoding and then encoded pointer.
-            .D8(constants::DW_EH_PE_funcrel.0 | constants::DW_EH_PE_uleb128.0)
-            .uleb(1)
-            .mark(&aug_end)
-            // Initial instructions
-            .append_bytes(&instrs)
-            .mark(&end);
-
-        length.set_const((&end - &start) as u64);
-        aug_len.set_const((&aug_end - &aug_start) as u64);
-
-        let section = section.get_contents().unwrap();
-        let section = EhFrame::new(&section, LittleEndian);
-
-        let bases = BaseAddresses::default();
-        let mut iter = section.entries(&bases);
-        assert_eq!(iter.next(), Err(Error::FuncRelativePointerInBadContext));
-    }
-
-    #[test]
-    fn register_rule_map_eq() {
-        // Different order, but still equal.
-        let map1: RegisterRuleMap<EndianSlice<LittleEndian>> = [
-            (Register(0), RegisterRule::SameValue),
-            (Register(3), RegisterRule::Offset(1)),
-        ]
-        .iter()
-        .collect();
-        let map2: RegisterRuleMap<EndianSlice<LittleEndian>> = [
-            (Register(3), RegisterRule::Offset(1)),
-            (Register(0), RegisterRule::SameValue),
-        ]
-        .iter()
-        .collect();
-        assert_eq!(map1, map2);
-        assert_eq!(map2, map1);
-
-        // Not equal.
-        let map3: RegisterRuleMap<EndianSlice<LittleEndian>> = [
-            (Register(0), RegisterRule::SameValue),
-            (Register(2), RegisterRule::Offset(1)),
-        ]
-        .iter()
-        .collect();
-        let map4: RegisterRuleMap<EndianSlice<LittleEndian>> = [
-            (Register(3), RegisterRule::Offset(1)),
-            (Register(0), RegisterRule::SameValue),
-        ]
-        .iter()
-        .collect();
-        assert!(map3 != map4);
-        assert!(map4 != map3);
-
-        // One has undefined explicitly set, other implicitly has undefined.
-        let mut map5 = RegisterRuleMap::<EndianSlice<LittleEndian>>::default();
-        map5.set(Register(0), RegisterRule::SameValue).unwrap();
-        map5.set(Register(0), RegisterRule::Undefined).unwrap();
-        let map6 = RegisterRuleMap::<EndianSlice<LittleEndian>>::default();
-        assert_eq!(map5, map6);
-        assert_eq!(map6, map5);
-    }
-
-    #[test]
-    fn iter_register_rules() {
-        let mut row = UnwindTableRow::<EndianSlice<LittleEndian>>::default();
-        row.registers = [
-            (Register(0), RegisterRule::SameValue),
-            (Register(1), RegisterRule::Offset(1)),
-            (Register(2), RegisterRule::ValOffset(2)),
-        ]
-        .iter()
-        .collect();
-
-        let mut found0 = false;
-        let mut found1 = false;
-        let mut found2 = false;
-
-        for &(register, ref rule) in row.registers() {
-            match register.0 {
-                0 => {
-                    assert_eq!(found0, false);
-                    found0 = true;
-                    assert_eq!(*rule, RegisterRule::SameValue);
-                }
-                1 => {
-                    assert_eq!(found1, false);
-                    found1 = true;
-                    assert_eq!(*rule, RegisterRule::Offset(1));
-                }
-                2 => {
-                    assert_eq!(found2, false);
-                    found2 = true;
-                    assert_eq!(*rule, RegisterRule::ValOffset(2));
-                }
-                x => panic!("Unexpected register rule: ({}, {:?})", x, rule),
-            }
-        }
-
-        assert_eq!(found0, true);
-        assert_eq!(found1, true);
-        assert_eq!(found2, true);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn size_of_unwind_ctx() {
-        use core::mem;
-        let size = mem::size_of::<UnwindContext<EndianSlice<NativeEndian>>>();
-        let max_size = 30968;
-        if size > max_size {
-            assert_eq!(size, max_size);
-        }
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn size_of_register_rule_map() {
-        use core::mem;
-        let size = mem::size_of::<RegisterRuleMap<EndianSlice<NativeEndian>>>();
-        let max_size = 6152;
-        if size > max_size {
-            assert_eq!(size, max_size);
-        }
-    }
-
-    #[test]
-    fn test_parse_pointer_encoding_ok() {
-        use crate::endianity::NativeEndian;
-        let expected =
-            constants::DwEhPe(constants::DW_EH_PE_uleb128.0 | constants::DW_EH_PE_pcrel.0);
-        let input = [expected.0, 1, 2, 3, 4];
-        let input = &mut EndianSlice::new(&input, NativeEndian);
-        assert_eq!(parse_pointer_encoding(input), Ok(expected));
-        assert_eq!(*input, EndianSlice::new(&[1, 2, 3, 4], NativeEndian));
-    }
-
-    #[test]
-    fn test_parse_pointer_encoding_bad_encoding() {
-        use crate::endianity::NativeEndian;
-        let expected =
-            constants::DwEhPe((constants::DW_EH_PE_sdata8.0 + 1) | constants::DW_EH_PE_pcrel.0);
-        let input = [expected.0, 1, 2, 3, 4];
-        let input = &mut EndianSlice::new(&input, NativeEndian);
-        assert_eq!(
-            Err(Error::UnknownPointerEncoding),
-            parse_pointer_encoding(input)
-        );
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_absptr() {
-        let encoding = constants::DW_EH_PE_absptr;
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .L32(0xf00d_f00d)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0xf00d_f00d))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_pcrel() {
-        let encoding = constants::DW_EH_PE_pcrel;
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .append_repeated(0, 0x10)
-            .L32(0x1)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input.range_from(0x10..);
-
-        let parameters = PointerEncodingParameters {
-            bases: &BaseAddresses::default().set_eh_frame(0x100).eh_frame,
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x111))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_pcrel_undefined() {
-        let encoding = constants::DW_EH_PE_pcrel;
-
-        let input = Section::with_endian(Endian::Little).L32(0x1);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Err(Error::PcRelativePointerButSectionBaseIsUndefined)
-        );
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_textrel() {
-        let encoding = constants::DW_EH_PE_textrel;
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .L32(0x1)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &BaseAddresses::default().set_text(0x10).eh_frame,
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x11))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_textrel_undefined() {
-        let encoding = constants::DW_EH_PE_textrel;
-
-        let input = Section::with_endian(Endian::Little).L32(0x1);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Err(Error::TextRelativePointerButTextBaseIsUndefined)
-        );
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_datarel() {
-        let encoding = constants::DW_EH_PE_datarel;
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .L32(0x1)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &BaseAddresses::default().set_got(0x10).eh_frame,
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x11))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_datarel_undefined() {
-        let encoding = constants::DW_EH_PE_datarel;
-
-        let input = Section::with_endian(Endian::Little).L32(0x1);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Err(Error::DataRelativePointerButDataBaseIsUndefined)
-        );
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_funcrel() {
-        let encoding = constants::DW_EH_PE_funcrel;
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .L32(0x1)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: Some(0x10),
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x11))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_funcrel_undefined() {
-        let encoding = constants::DW_EH_PE_funcrel;
-
-        let input = Section::with_endian(Endian::Little).L32(0x1);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Err(Error::FuncRelativePointerInBadContext)
-        );
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_uleb128() {
-        let encoding =
-            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_uleb128.0);
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .uleb(0x12_3456)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x12_3456))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_udata2() {
-        let encoding =
-            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_udata2.0);
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .L16(0x1234)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x1234))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_udata4() {
-        let encoding =
-            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_udata4.0);
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .L32(0x1234_5678)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x1234_5678))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_udata8() {
-        let encoding =
-            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_udata8.0);
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .L64(0x1234_5678_1234_5678)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x1234_5678_1234_5678))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_sleb128() {
-        let encoding =
-            constants::DwEhPe(constants::DW_EH_PE_textrel.0 | constants::DW_EH_PE_sleb128.0);
-        let expected_rest = [1, 2, 3, 4];
-
-        let input = Section::with_endian(Endian::Little)
-            .sleb(-0x1111)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &BaseAddresses::default().set_text(0x1111_1111).eh_frame,
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(0x1111_0000))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_sdata2() {
-        let encoding =
-            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_sdata2.0);
-        let expected_rest = [1, 2, 3, 4];
-        let expected = 0x111 as i16;
-
-        let input = Section::with_endian(Endian::Little)
-            .L16(expected as u16)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(expected as u64))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_sdata4() {
-        let encoding =
-            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_sdata4.0);
-        let expected_rest = [1, 2, 3, 4];
-        let expected = 0x111_1111 as i32;
-
-        let input = Section::with_endian(Endian::Little)
-            .L32(expected as u32)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(expected as u64))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_sdata8() {
-        let encoding =
-            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_sdata8.0);
-        let expected_rest = [1, 2, 3, 4];
-        let expected = -0x11_1111_1222_2222 as i64;
-
-        let input = Section::with_endian(Endian::Little)
-            .L64(expected as u64)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Direct(expected as u64))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_omit() {
-        let encoding = constants::DW_EH_PE_omit;
-
-        let input = Section::with_endian(Endian::Little).L32(0x1);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Err(Error::CannotParseOmitPointerEncoding)
-        );
-        assert_eq!(rest, input);
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_bad_encoding() {
-        let encoding = constants::DwEhPe(constants::DW_EH_PE_sdata8.0 + 1);
-
-        let input = Section::with_endian(Endian::Little).L32(0x1);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Err(Error::UnknownPointerEncoding)
-        );
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_aligned() {
-        // FIXME: support this encoding!
-
-        let encoding = constants::DW_EH_PE_aligned;
-
-        let input = Section::with_endian(Endian::Little).L32(0x1);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Err(Error::UnsupportedPointerEncoding)
-        );
-    }
-
-    #[test]
-    fn test_parse_encoded_pointer_indirect() {
-        let expected_rest = [1, 2, 3, 4];
-        let encoding = constants::DW_EH_PE_indirect;
-
-        let input = Section::with_endian(Endian::Little)
-            .L32(0x1234_5678)
-            .append_bytes(&expected_rest);
-        let input = input.get_contents().unwrap();
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut rest = input;
-
-        let parameters = PointerEncodingParameters {
-            bases: &SectionBaseAddresses::default(),
-            func_base: None,
-            address_size: 4,
-            section: &input,
-        };
-        assert_eq!(
-            parse_encoded_pointer(encoding, &parameters, &mut rest),
-            Ok(Pointer::Indirect(0x1234_5678))
-        );
-        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/dwarf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/dwarf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/dwarf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/dwarf.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,807 +0,0 @@
-use alloc::string::String;
-
-use crate::common::{
-    DebugAddrBase, DebugAddrIndex, DebugInfoOffset, DebugLineStrOffset, DebugLocListsBase,
-    DebugLocListsIndex, DebugRngListsBase, DebugRngListsIndex, DebugStrOffset, DebugStrOffsetsBase,
-    DebugStrOffsetsIndex, DebugTypesOffset, Encoding, LocationListsOffset, RangeListsOffset,
-    SectionId, UnitSectionOffset,
-};
-use crate::constants;
-use crate::read::{
-    Abbreviations, AttributeValue, CompilationUnitHeader, CompilationUnitHeadersIter, DebugAbbrev,
-    DebugAddr, DebugInfo, DebugLine, DebugLineStr, DebugStr, DebugStrOffsets, DebugTypes,
-    DebuggingInformationEntry, EntriesCursor, EntriesRaw, EntriesTree, Error,
-    IncompleteLineProgram, LocListIter, LocationLists, Range, RangeLists, Reader, ReaderOffset,
-    ReaderOffsetId, Result, RngListIter, Section, TypeUnitHeader, TypeUnitHeadersIter, UnitHeader,
-    UnitOffset,
-};
-
-/// All of the commonly used DWARF sections, and other common information.
-#[derive(Debug, Default)]
-pub struct Dwarf<R> {
-    /// The `.debug_abbrev` section.
-    pub debug_abbrev: DebugAbbrev<R>,
-
-    /// The `.debug_addr` section.
-    pub debug_addr: DebugAddr<R>,
-
-    /// The `.debug_info` section.
-    pub debug_info: DebugInfo<R>,
-
-    /// The `.debug_line` section.
-    pub debug_line: DebugLine<R>,
-
-    /// The `.debug_line_str` section.
-    pub debug_line_str: DebugLineStr<R>,
-
-    /// The `.debug_str` section.
-    pub debug_str: DebugStr<R>,
-
-    /// The `.debug_str_offsets` section.
-    pub debug_str_offsets: DebugStrOffsets<R>,
-
-    /// The `.debug_str` section for a supplementary object file.
-    pub debug_str_sup: DebugStr<R>,
-
-    /// The `.debug_types` section.
-    pub debug_types: DebugTypes<R>,
-
-    /// The location lists in the `.debug_loc` and `.debug_loclists` sections.
-    pub locations: LocationLists<R>,
-
-    /// The range lists in the `.debug_ranges` and `.debug_rnglists` sections.
-    pub ranges: RangeLists<R>,
-}
-
-impl<T> Dwarf<T> {
-    /// Try to load the DWARF sections using the given loader functions.
-    ///
-    /// `section` loads a DWARF section from the main object file.
-    /// `sup` loads a DWARF sections from the supplementary object file.
-    /// These functions should return an empty section if the section does not exist.
-    ///
-    /// The provided callback functions may either directly return a `Reader` instance
-    /// (such as `EndianSlice`), or they may return some other type and then convert
-    /// that type into a `Reader` using `Dwarf::borrow`.
-    pub fn load<F1, F2, E>(mut section: F1, mut sup: F2) -> core::result::Result<Self, E>
-    where
-        F1: FnMut(SectionId) -> core::result::Result<T, E>,
-        F2: FnMut(SectionId) -> core::result::Result<T, E>,
-    {
-        // Section types are inferred.
-        let debug_loc = Section::load(&mut section)?;
-        let debug_loclists = Section::load(&mut section)?;
-        let debug_ranges = Section::load(&mut section)?;
-        let debug_rnglists = Section::load(&mut section)?;
-        Ok(Dwarf {
-            debug_abbrev: Section::load(&mut section)?,
-            debug_addr: Section::load(&mut section)?,
-            debug_info: Section::load(&mut section)?,
-            debug_line: Section::load(&mut section)?,
-            debug_line_str: Section::load(&mut section)?,
-            debug_str: Section::load(&mut section)?,
-            debug_str_offsets: Section::load(&mut section)?,
-            debug_str_sup: Section::load(&mut sup)?,
-            debug_types: Section::load(&mut section)?,
-            locations: LocationLists::new(debug_loc, debug_loclists),
-            ranges: RangeLists::new(debug_ranges, debug_rnglists),
-        })
-    }
-
-    /// Create a `Dwarf` structure that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// It can be useful to load DWARF sections into owned data structures,
-    /// such as `Vec`. However, we do not implement the `Reader` trait
-    /// for `Vec`, because it would be very inefficient, but this trait
-    /// is required for all of the methods that parse the DWARF data.
-    /// So we first load the DWARF sections into `Vec`s, and then use
-    /// `borrow` to create `Reader`s that reference the data.
-    ///
-    /// ```rust,no_run
-    /// # fn example() -> Result<(), gimli::Error> {
-    /// # let loader = |name| -> Result<_, gimli::Error> { unimplemented!() };
-    /// # let sup_loader = |name| { unimplemented!() };
-    /// // Read the DWARF sections into `Vec`s with whatever object loader you're using.
-    /// let owned_dwarf: gimli::Dwarf<Vec<u8>> = gimli::Dwarf::load(loader, sup_loader)?;
-    /// // Create references to the DWARF sections.
-    /// let dwarf = owned_dwarf.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// # unreachable!()
-    /// # }
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> Dwarf<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        Dwarf {
-            debug_abbrev: self.debug_abbrev.borrow(&mut borrow),
-            debug_addr: self.debug_addr.borrow(&mut borrow),
-            debug_info: self.debug_info.borrow(&mut borrow),
-            debug_line: self.debug_line.borrow(&mut borrow),
-            debug_line_str: self.debug_line_str.borrow(&mut borrow),
-            debug_str: self.debug_str.borrow(&mut borrow),
-            debug_str_offsets: self.debug_str_offsets.borrow(&mut borrow),
-            debug_str_sup: self.debug_str_sup.borrow(&mut borrow),
-            debug_types: self.debug_types.borrow(&mut borrow),
-            locations: self.locations.borrow(&mut borrow),
-            ranges: self.ranges.borrow(&mut borrow),
-        }
-    }
-}
-
-impl<R: Reader> Dwarf<R> {
-    /// Iterate the compilation- and partial-unit headers in the
-    /// `.debug_info` section.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    #[inline]
-    pub fn units(&self) -> CompilationUnitHeadersIter<R> {
-        self.debug_info.units()
-    }
-
-    /// Construct a new `Unit` from the given compilation unit header.
-    #[inline]
-    pub fn unit(&self, header: CompilationUnitHeader<R>) -> Result<Unit<R>> {
-        Unit::new(self, header)
-    }
-
-    /// Iterate the type-unit headers in the `.debug_types` section.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    #[inline]
-    pub fn type_units(&self) -> TypeUnitHeadersIter<R> {
-        self.debug_types.units()
-    }
-
-    /// Construct a new `Unit` from the given type unit header.
-    #[inline]
-    pub fn type_unit(&self, header: TypeUnitHeader<R>) -> Result<Unit<R>> {
-        Unit::new_type_unit(self, header)
-    }
-
-    /// Parse the abbreviations for a compilation unit.
-    // TODO: provide caching of abbreviations
-    #[inline]
-    pub fn abbreviations(&self, unit: &CompilationUnitHeader<R>) -> Result<Abbreviations> {
-        unit.abbreviations(&self.debug_abbrev)
-    }
-
-    /// Parse the abbreviations for a type unit.
-    // TODO: provide caching of abbreviations
-    #[inline]
-    pub fn type_abbreviations(&self, unit: &TypeUnitHeader<R>) -> Result<Abbreviations> {
-        unit.abbreviations(&self.debug_abbrev)
-    }
-
-    /// Return the string offset at the given index.
-    #[inline]
-    pub fn string_offset(
-        &self,
-        unit: &Unit<R>,
-        index: DebugStrOffsetsIndex<R::Offset>,
-    ) -> Result<DebugStrOffset<R::Offset>> {
-        self.debug_str_offsets
-            .get_str_offset(unit.header.format(), unit.str_offsets_base, index)
-    }
-
-    /// Return the string at the given offset in `.debug_str`.
-    #[inline]
-    pub fn string(&self, offset: DebugStrOffset<R::Offset>) -> Result<R> {
-        self.debug_str.get_str(offset)
-    }
-
-    /// Return the string at the given offset in `.debug_line_str`.
-    #[inline]
-    pub fn line_string(&self, offset: DebugLineStrOffset<R::Offset>) -> Result<R> {
-        self.debug_line_str.get_str(offset)
-    }
-
-    /// Return an attribute value as a string slice.
-    ///
-    /// If the attribute value is one of:
-    ///
-    /// - an inline `DW_FORM_string` string
-    /// - a `DW_FORM_strp` reference to an offset into the `.debug_str` section
-    /// - a `DW_FORM_strp_sup` reference to an offset into a supplementary
-    /// object file
-    /// - a `DW_FORM_line_strp` reference to an offset into the `.debug_line_str`
-    /// section
-    /// - a `DW_FORM_strx` index into the `.debug_str_offsets` entries for the unit
-    ///
-    /// then return the attribute's string value. Returns an error if the attribute
-    /// value does not have a string form, or if a string form has an invalid value.
-    pub fn attr_string(&self, unit: &Unit<R>, attr: AttributeValue<R>) -> Result<R> {
-        match attr {
-            AttributeValue::String(string) => Ok(string),
-            AttributeValue::DebugStrRef(offset) => self.debug_str.get_str(offset),
-            AttributeValue::DebugStrRefSup(offset) => self.debug_str_sup.get_str(offset),
-            AttributeValue::DebugLineStrRef(offset) => self.debug_line_str.get_str(offset),
-            AttributeValue::DebugStrOffsetsIndex(index) => {
-                let offset = self.debug_str_offsets.get_str_offset(
-                    unit.header.format(),
-                    unit.str_offsets_base,
-                    index,
-                )?;
-                self.debug_str.get_str(offset)
-            }
-            _ => Err(Error::ExpectedStringAttributeValue),
-        }
-    }
-
-    /// Return the address at the given index.
-    pub fn address(&self, unit: &Unit<R>, index: DebugAddrIndex<R::Offset>) -> Result<u64> {
-        self.debug_addr
-            .get_address(unit.encoding().address_size, unit.addr_base, index)
-    }
-
-    /// Return the range list offset at the given index.
-    pub fn ranges_offset(
-        &self,
-        unit: &Unit<R>,
-        index: DebugRngListsIndex<R::Offset>,
-    ) -> Result<RangeListsOffset<R::Offset>> {
-        self.ranges
-            .get_offset(unit.encoding(), unit.rnglists_base, index)
-    }
-
-    /// Iterate over the `RangeListEntry`s starting at the given offset.
-    pub fn ranges(
-        &self,
-        unit: &Unit<R>,
-        offset: RangeListsOffset<R::Offset>,
-    ) -> Result<RngListIter<R>> {
-        self.ranges.ranges(
-            offset,
-            unit.encoding(),
-            unit.low_pc,
-            &self.debug_addr,
-            unit.addr_base,
-        )
-    }
-
-    /// Try to return an attribute value as a range list offset.
-    ///
-    /// If the attribute value is one of:
-    ///
-    /// - a `DW_FORM_sec_offset` reference to the `.debug_ranges` or `.debug_rnglists` sections
-    /// - a `DW_FORM_rnglistx` index into the `.debug_rnglists` entries for the unit
-    ///
-    /// then return the range list offset of the range list.
-    /// Returns `None` for other forms.
-    pub fn attr_ranges_offset(
-        &self,
-        unit: &Unit<R>,
-        attr: AttributeValue<R>,
-    ) -> Result<Option<RangeListsOffset<R::Offset>>> {
-        match attr {
-            AttributeValue::RangeListsRef(offset) => Ok(Some(offset)),
-            AttributeValue::DebugRngListsIndex(index) => self.ranges_offset(unit, index).map(Some),
-            _ => Ok(None),
-        }
-    }
-
-    /// Try to return an attribute value as a range list entry iterator.
-    ///
-    /// If the attribute value is one of:
-    ///
-    /// - a `DW_FORM_sec_offset` reference to the `.debug_ranges` or `.debug_rnglists` sections
-    /// - a `DW_FORM_rnglistx` index into the `.debug_rnglists` entries for the unit
-    ///
-    /// then return an iterator over the entries in the range list.
-    /// Returns `None` for other forms.
-    pub fn attr_ranges(
-        &self,
-        unit: &Unit<R>,
-        attr: AttributeValue<R>,
-    ) -> Result<Option<RngListIter<R>>> {
-        match self.attr_ranges_offset(unit, attr)? {
-            Some(offset) => Ok(Some(self.ranges(unit, offset)?)),
-            None => Ok(None),
-        }
-    }
-
-    /// Return an iterator for the address ranges of a `DebuggingInformationEntry`.
-    ///
-    /// This uses `DW_AT_low_pc`, `DW_AT_high_pc` and `DW_AT_ranges`.
-    pub fn die_ranges(
-        &self,
-        unit: &Unit<R>,
-        entry: &DebuggingInformationEntry<R>,
-    ) -> Result<RangeIter<R>> {
-        let mut low_pc = None;
-        let mut high_pc = None;
-        let mut size = None;
-        let mut attrs = entry.attrs();
-        while let Some(attr) = attrs.next()? {
-            match attr.name() {
-                constants::DW_AT_low_pc => {
-                    if let AttributeValue::Addr(val) = attr.value() {
-                        low_pc = Some(val);
-                    }
-                }
-                constants::DW_AT_high_pc => match attr.value() {
-                    AttributeValue::Addr(val) => high_pc = Some(val),
-                    AttributeValue::Udata(val) => size = Some(val),
-                    _ => return Err(Error::UnsupportedAttributeForm),
-                },
-                constants::DW_AT_ranges => {
-                    if let Some(list) = self.attr_ranges(unit, attr.value())? {
-                        return Ok(RangeIter(RangeIterInner::List(list)));
-                    }
-                }
-                _ => {}
-            }
-        }
-        let range = low_pc.and_then(|begin| {
-            let end = size.map(|size| begin + size).or(high_pc);
-            // TODO: perhaps return an error if `end` is `None`
-            end.map(|end| Range { begin, end })
-        });
-        Ok(RangeIter(RangeIterInner::Single(range)))
-    }
-
-    /// Return an iterator for the address ranges of a `Unit`.
-    ///
-    /// This uses `DW_AT_low_pc`, `DW_AT_high_pc` and `DW_AT_ranges` of the
-    /// root `DebuggingInformationEntry`.
-    pub fn unit_ranges(&self, unit: &Unit<R>) -> Result<RangeIter<R>> {
-        let mut cursor = unit.header.entries(&unit.abbreviations);
-        cursor.next_dfs()?;
-        let root = cursor.current().ok_or(Error::MissingUnitDie)?;
-        self.die_ranges(unit, root)
-    }
-
-    /// Return the location list offset at the given index.
-    pub fn locations_offset(
-        &self,
-        unit: &Unit<R>,
-        index: DebugLocListsIndex<R::Offset>,
-    ) -> Result<LocationListsOffset<R::Offset>> {
-        self.locations
-            .get_offset(unit.encoding(), unit.loclists_base, index)
-    }
-
-    /// Iterate over the `LocationListEntry`s starting at the given offset.
-    pub fn locations(
-        &self,
-        unit: &Unit<R>,
-        offset: LocationListsOffset<R::Offset>,
-    ) -> Result<LocListIter<R>> {
-        self.locations.locations(
-            offset,
-            unit.encoding(),
-            unit.low_pc,
-            &self.debug_addr,
-            unit.addr_base,
-        )
-    }
-
-    /// Try to return an attribute value as a location list offset.
-    ///
-    /// If the attribute value is one of:
-    ///
-    /// - a `DW_FORM_sec_offset` reference to the `.debug_loc` or `.debug_loclists` sections
-    /// - a `DW_FORM_loclistx` index into the `.debug_loclists` entries for the unit
-    ///
-    /// then return the location list offset of the location list.
-    /// Returns `None` for other forms.
-    pub fn attr_locations_offset(
-        &self,
-        unit: &Unit<R>,
-        attr: AttributeValue<R>,
-    ) -> Result<Option<LocationListsOffset<R::Offset>>> {
-        match attr {
-            AttributeValue::LocationListsRef(offset) => Ok(Some(offset)),
-            AttributeValue::DebugLocListsIndex(index) => {
-                self.locations_offset(unit, index).map(Some)
-            }
-            _ => Ok(None),
-        }
-    }
-
-    /// Try to return an attribute value as a location list entry iterator.
-    ///
-    /// If the attribute value is one of:
-    ///
-    /// - a `DW_FORM_sec_offset` reference to the `.debug_loc` or `.debug_loclists` sections
-    /// - a `DW_FORM_loclistx` index into the `.debug_loclists` entries for the unit
-    ///
-    /// then return an iterator over the entries in the location list.
-    /// Returns `None` for other forms.
-    pub fn attr_locations(
-        &self,
-        unit: &Unit<R>,
-        attr: AttributeValue<R>,
-    ) -> Result<Option<LocListIter<R>>> {
-        match self.attr_locations_offset(unit, attr)? {
-            Some(offset) => Ok(Some(self.locations(unit, offset)?)),
-            None => Ok(None),
-        }
-    }
-
-    /// Call `Reader::lookup_offset_id` for each section, and return the first match.
-    ///
-    /// The first element of the tuple is `true` for supplementary sections.
-    pub fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(bool, SectionId, R::Offset)> {
-        None.or_else(|| self.debug_abbrev.lookup_offset_id(id))
-            .or_else(|| self.debug_addr.lookup_offset_id(id))
-            .or_else(|| self.debug_info.lookup_offset_id(id))
-            .or_else(|| self.debug_line.lookup_offset_id(id))
-            .or_else(|| self.debug_line_str.lookup_offset_id(id))
-            .or_else(|| self.debug_str.lookup_offset_id(id))
-            .or_else(|| self.debug_str_offsets.lookup_offset_id(id))
-            .or_else(|| self.debug_types.lookup_offset_id(id))
-            .or_else(|| self.locations.lookup_offset_id(id))
-            .or_else(|| self.ranges.lookup_offset_id(id))
-            .map(|(id, offset)| (false, id, offset))
-            .or_else(|| {
-                self.debug_str_sup
-                    .lookup_offset_id(id)
-                    .map(|(id, offset)| (true, id, offset))
-            })
-    }
-
-    /// Returns a string representation of the given error.
-    ///
-    /// This uses information from the DWARF sections to provide more information in some cases.
-    pub fn format_error(&self, err: Error) -> String {
-        #[allow(clippy::single_match)]
-        match err {
-            Error::UnexpectedEof(id) => match self.lookup_offset_id(id) {
-                Some((sup, section, offset)) => {
-                    return format!(
-                        "{} at {}{}+0x{:x}",
-                        err,
-                        section.name(),
-                        if sup { "(sup)" } else { "" },
-                        offset.into_u64(),
-                    );
-                }
-                None => {}
-            },
-            _ => {}
-        }
-        err.description().into()
-    }
-}
-
-/// All of the commonly used information for a unit in the `.debug_info` or `.debug_types`
-/// sections.
-#[derive(Debug)]
-pub struct Unit<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// The section offset of the unit.
-    pub offset: UnitSectionOffset<Offset>,
-
-    /// The header of the unit.
-    pub header: UnitHeader<R, Offset>,
-
-    /// The parsed abbreviations for the unit.
-    pub abbreviations: Abbreviations,
-
-    /// The `DW_AT_name` attribute of the unit.
-    pub name: Option<R>,
-
-    /// The `DW_AT_comp_dir` attribute of the unit.
-    pub comp_dir: Option<R>,
-
-    /// The `DW_AT_low_pc` attribute of the unit. Defaults to 0.
-    pub low_pc: u64,
-
-    /// The `DW_AT_str_offsets_base` attribute of the unit. Defaults to 0.
-    pub str_offsets_base: DebugStrOffsetsBase<Offset>,
-
-    /// The `DW_AT_addr_base` attribute of the unit. Defaults to 0.
-    pub addr_base: DebugAddrBase<Offset>,
-
-    /// The `DW_AT_loclists_base` attribute of the unit. Defaults to 0.
-    pub loclists_base: DebugLocListsBase<Offset>,
-
-    /// The `DW_AT_rnglists_base` attribute of the unit. Defaults to 0.
-    pub rnglists_base: DebugRngListsBase<Offset>,
-
-    /// The line number program of the unit.
-    pub line_program: Option<IncompleteLineProgram<R, Offset>>,
-}
-
-impl<R: Reader> Unit<R> {
-    /// Construct a new `Unit` from the given compilation unit header.
-    #[inline]
-    pub fn new(dwarf: &Dwarf<R>, header: CompilationUnitHeader<R>) -> Result<Self> {
-        Self::new_internal(
-            dwarf,
-            UnitSectionOffset::DebugInfoOffset(header.offset()),
-            header.header(),
-        )
-    }
-
-    /// Construct a new `Unit` from the given type unit header.
-    #[inline]
-    pub fn new_type_unit(dwarf: &Dwarf<R>, header: TypeUnitHeader<R>) -> Result<Self> {
-        Self::new_internal(
-            dwarf,
-            UnitSectionOffset::DebugTypesOffset(header.offset()),
-            header.header(),
-        )
-    }
-
-    fn new_internal(
-        dwarf: &Dwarf<R>,
-        offset: UnitSectionOffset<R::Offset>,
-        header: UnitHeader<R>,
-    ) -> Result<Self> {
-        let abbreviations = header.abbreviations(&dwarf.debug_abbrev)?;
-        let mut unit = Unit {
-            offset,
-            header,
-            abbreviations,
-            name: None,
-            comp_dir: None,
-            low_pc: 0,
-            // Defaults to 0 for GNU extensions.
-            str_offsets_base: DebugStrOffsetsBase(R::Offset::from_u8(0)),
-            addr_base: DebugAddrBase(R::Offset::from_u8(0)),
-            loclists_base: DebugLocListsBase(R::Offset::from_u8(0)),
-            rnglists_base: DebugRngListsBase(R::Offset::from_u8(0)),
-            line_program: None,
-        };
-        let mut name = None;
-        let mut comp_dir = None;
-        let mut line_program_offset = None;
-
-        {
-            let mut cursor = unit.header.entries(&unit.abbreviations);
-            cursor.next_dfs()?;
-            let root = cursor.current().ok_or(Error::MissingUnitDie)?;
-            let mut attrs = root.attrs();
-            while let Some(attr) = attrs.next()? {
-                match attr.name() {
-                    constants::DW_AT_name => {
-                        name = Some(attr.value());
-                    }
-                    constants::DW_AT_comp_dir => {
-                        comp_dir = Some(attr.value());
-                    }
-                    constants::DW_AT_low_pc => {
-                        if let AttributeValue::Addr(address) = attr.value() {
-                            unit.low_pc = address;
-                        }
-                    }
-                    constants::DW_AT_stmt_list => {
-                        if let AttributeValue::DebugLineRef(offset) = attr.value() {
-                            line_program_offset = Some(offset);
-                        }
-                    }
-                    constants::DW_AT_str_offsets_base => {
-                        if let AttributeValue::DebugStrOffsetsBase(base) = attr.value() {
-                            unit.str_offsets_base = base;
-                        }
-                    }
-                    constants::DW_AT_addr_base => {
-                        if let AttributeValue::DebugAddrBase(base) = attr.value() {
-                            unit.addr_base = base;
-                        }
-                    }
-                    constants::DW_AT_loclists_base => {
-                        if let AttributeValue::DebugLocListsBase(base) = attr.value() {
-                            unit.loclists_base = base;
-                        }
-                    }
-                    constants::DW_AT_rnglists_base => {
-                        if let AttributeValue::DebugRngListsBase(base) = attr.value() {
-                            unit.rnglists_base = base;
-                        }
-                    }
-                    _ => {}
-                }
-            }
-        }
-
-        unit.name = match name {
-            Some(val) => dwarf.attr_string(&unit, val).ok(),
-            None => None,
-        };
-        unit.comp_dir = match comp_dir {
-            Some(val) => dwarf.attr_string(&unit, val).ok(),
-            None => None,
-        };
-        unit.line_program = match line_program_offset {
-            Some(offset) => Some(dwarf.debug_line.program(
-                offset,
-                unit.header.address_size(),
-                unit.comp_dir.clone(),
-                unit.name.clone(),
-            )?),
-            None => None,
-        };
-        Ok(unit)
-    }
-
-    /// Return the encoding parameters for this unit.
-    #[inline]
-    pub fn encoding(&self) -> Encoding {
-        self.header.encoding()
-    }
-
-    /// Read the `DebuggingInformationEntry` at the given offset.
-    pub fn entry(&self, offset: UnitOffset<R::Offset>) -> Result<DebuggingInformationEntry<R>> {
-        self.header.entry(&self.abbreviations, offset)
-    }
-
-    /// Navigate this unit's `DebuggingInformationEntry`s.
-    #[inline]
-    pub fn entries(&self) -> EntriesCursor<R> {
-        self.header.entries(&self.abbreviations)
-    }
-
-    /// Navigate this unit's `DebuggingInformationEntry`s
-    /// starting at the given offset.
-    #[inline]
-    pub fn entries_at_offset(&self, offset: UnitOffset<R::Offset>) -> Result<EntriesCursor<R>> {
-        self.header.entries_at_offset(&self.abbreviations, offset)
-    }
-
-    /// Navigate this unit's `DebuggingInformationEntry`s as a tree
-    /// starting at the given offset.
-    #[inline]
-    pub fn entries_tree(&self, offset: Option<UnitOffset<R::Offset>>) -> Result<EntriesTree<R>> {
-        self.header.entries_tree(&self.abbreviations, offset)
-    }
-
-    /// Read the raw data that defines the Debugging Information Entries.
-    #[inline]
-    pub fn entries_raw(&self, offset: Option<UnitOffset<R::Offset>>) -> Result<EntriesRaw<R>> {
-        self.header.entries_raw(&self.abbreviations, offset)
-    }
-}
-
-impl<T: ReaderOffset> UnitSectionOffset<T> {
-    /// Convert an offset to be relative to the start of the given unit,
-    /// instead of relative to the start of the section.
-    /// Returns `None` if the offset is not within the unit entries.
-    pub fn to_unit_offset<R>(&self, unit: &Unit<R>) -> Option<UnitOffset<T>>
-    where
-        R: Reader<Offset = T>,
-    {
-        let (offset, unit_offset) = match (self, unit.offset) {
-            (
-                UnitSectionOffset::DebugInfoOffset(offset),
-                UnitSectionOffset::DebugInfoOffset(unit_offset),
-            ) => (offset.0, unit_offset.0),
-            (
-                UnitSectionOffset::DebugTypesOffset(offset),
-                UnitSectionOffset::DebugTypesOffset(unit_offset),
-            ) => (offset.0, unit_offset.0),
-            _ => return None,
-        };
-        let offset = match offset.checked_sub(unit_offset) {
-            Some(offset) => UnitOffset(offset),
-            None => return None,
-        };
-        if !unit.header.is_valid_offset(offset) {
-            return None;
-        }
-        Some(offset)
-    }
-}
-
-impl<T: ReaderOffset> UnitOffset<T> {
-    /// Convert an offset to be relative to the start of the .debug_info section,
-    /// instead of relative to the start of the given compilation unit.
-    ///
-    /// Does not check that the offset is valid.
-    pub fn to_unit_section_offset<R>(&self, unit: &Unit<R>) -> UnitSectionOffset<T>
-    where
-        R: Reader<Offset = T>,
-    {
-        match unit.offset {
-            UnitSectionOffset::DebugInfoOffset(unit_offset) => {
-                UnitSectionOffset::DebugInfoOffset(DebugInfoOffset(unit_offset.0 + self.0))
-            }
-            UnitSectionOffset::DebugTypesOffset(unit_offset) => {
-                UnitSectionOffset::DebugTypesOffset(DebugTypesOffset(unit_offset.0 + self.0))
-            }
-        }
-    }
-}
-
-/// An iterator for the address ranges of a `DebuggingInformationEntry`.
-///
-/// Returned by `Dwarf::die_ranges` and `Dwarf::unit_ranges`.
-#[derive(Debug)]
-pub struct RangeIter<R: Reader>(RangeIterInner<R>);
-
-#[derive(Debug)]
-enum RangeIterInner<R: Reader> {
-    Single(Option<Range>),
-    List(RngListIter<R>),
-}
-
-impl<R: Reader> Default for RangeIter<R> {
-    fn default() -> Self {
-        RangeIter(RangeIterInner::Single(None))
-    }
-}
-
-impl<R: Reader> RangeIter<R> {
-    /// Advance the iterator to the next range.
-    pub fn next(&mut self) -> Result<Option<Range>> {
-        match self.0 {
-            RangeIterInner::Single(ref mut range) => Ok(range.take()),
-            RangeIterInner::List(ref mut list) => list.next(),
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for RangeIter<R> {
-    type Item = Range;
-    type Error = Error;
-
-    #[inline]
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        RangeIter::next(self)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::read::EndianSlice;
-    use crate::{Endianity, LittleEndian};
-
-    /// Ensure that `Dwarf<R>` is covariant wrt R.
-    #[test]
-    fn test_dwarf_variance() {
-        /// This only needs to compile.
-        fn _f<'a: 'b, 'b, E: Endianity>(x: Dwarf<EndianSlice<'a, E>>) -> Dwarf<EndianSlice<'b, E>> {
-            x
-        }
-    }
-
-    /// Ensure that `Unit<R>` is covariant wrt R.
-    #[test]
-    fn test_dwarf_unit_variance() {
-        /// This only needs to compile.
-        fn _f<'a: 'b, 'b, E: Endianity>(x: Unit<EndianSlice<'a, E>>) -> Unit<EndianSlice<'b, E>> {
-            x
-        }
-    }
-
-    #[test]
-    fn test_format_error() {
-        let owned_dwarf =
-            Dwarf::load(|_| -> Result<_> { Ok(vec![1, 2]) }, |_| Ok(vec![1, 2])).unwrap();
-        let dwarf = owned_dwarf.borrow(|section| EndianSlice::new(&section, LittleEndian));
-
-        match dwarf.debug_str.get_str(DebugStrOffset(1)) {
-            Ok(r) => panic!("Unexpected str {:?}", r),
-            Err(e) => {
-                assert_eq!(
-                    dwarf.format_error(e),
-                    "Hit the end of input before it was expected at .debug_str+0x1"
-                );
-            }
-        }
-        match dwarf.debug_str_sup.get_str(DebugStrOffset(1)) {
-            Ok(r) => panic!("Unexpected str {:?}", r),
-            Err(e) => {
-                assert_eq!(
-                    dwarf.format_error(e),
-                    "Hit the end of input before it was expected at .debug_str(sup)+0x1"
-                );
-            }
-        }
-        assert_eq!(dwarf.format_error(Error::Io), Error::Io.description());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/endian_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/endian_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/endian_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/endian_reader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,639 +0,0 @@
-//! Defining custom `Reader`s quickly.
-
-use alloc::borrow::Cow;
-use alloc::rc::Rc;
-use alloc::string::String;
-use alloc::sync::Arc;
-use core::fmt::Debug;
-use core::ops::{Deref, Index, Range, RangeFrom, RangeTo};
-use core::slice;
-use core::str;
-use stable_deref_trait::CloneStableDeref;
-
-use crate::endianity::Endianity;
-use crate::read::{Error, Reader, ReaderOffsetId, Result};
-
-/// A reference counted, non-thread-safe slice of bytes and associated
-/// endianity.
-///
-/// ```
-/// # #[cfg(feature = "std")] {
-/// use std::rc::Rc;
-///
-/// let buf = Rc::from(&[1, 2, 3, 4][..]);
-/// let reader = gimli::EndianRcSlice::new(buf, gimli::NativeEndian);
-/// # let _ = reader;
-/// # }
-/// ```
-pub type EndianRcSlice<Endian> = EndianReader<Endian, Rc<[u8]>>;
-
-/// An atomically reference counted, thread-safe slice of bytes and associated
-/// endianity.
-///
-/// ```
-/// # #[cfg(feature = "std")] {
-/// use std::sync::Arc;
-///
-/// let buf = Arc::from(&[1, 2, 3, 4][..]);
-/// let reader = gimli::EndianArcSlice::new(buf, gimli::NativeEndian);
-/// # let _ = reader;
-/// # }
-/// ```
-pub type EndianArcSlice<Endian> = EndianReader<Endian, Arc<[u8]>>;
-
-/// An easy way to define a custom `Reader` implementation with a reference to a
-/// generic buffer of bytes and an associated endianity.
-///
-/// Note that the whole original buffer is kept alive in memory even if there is
-/// only one reader that references only a handful of bytes from that original
-/// buffer. That is, `EndianReader` will not do any copying, moving, or
-/// compacting in order to free up unused regions of the original buffer. If you
-/// require this kind of behavior, it is up to you to implement `Reader`
-/// directly by-hand.
-///
-/// # Example
-///
-/// Say you have an `mmap`ed file that you want to serve as a `gimli::Reader`.
-/// You can wrap that `mmap`ed file up in a `MmapFile` type and use
-/// `EndianReader<Rc<MmapFile>>` or `EndianReader<Arc<MmapFile>>` as readers as
-/// long as `MmapFile` dereferences to the underlying `[u8]` data.
-///
-/// ```
-/// use std::io;
-/// use std::ops::Deref;
-/// use std::path::Path;
-/// use std::slice;
-/// use std::sync::Arc;
-///
-/// /// A type that represents an `mmap`ed file.
-/// #[derive(Debug)]
-/// pub struct MmapFile {
-///     ptr: *const u8,
-///     len: usize,
-/// }
-///
-/// impl MmapFile {
-///     pub fn new(path: &Path) -> io::Result<MmapFile> {
-///         // Call `mmap` and check for errors and all that...
-/// #       unimplemented!()
-///     }
-/// }
-///
-/// impl Drop for MmapFile {
-///     fn drop(&mut self) {
-///         // Call `munmap` to clean up after ourselves...
-/// #       unimplemented!()
-///     }
-/// }
-///
-/// // And `MmapFile` can deref to a slice of the `mmap`ed region of memory.
-/// impl Deref for MmapFile {
-///     type Target = [u8];
-///     fn deref(&self) -> &[u8] {
-///         unsafe {
-///             slice::from_raw_parts(self.ptr, self.len)
-///         }
-///     }
-/// }
-///
-/// /// A type that represents a shared `mmap`ed file.
-/// #[derive(Debug, Clone)]
-/// pub struct ArcMmapFile(Arc<MmapFile>);
-///
-/// // And `ArcMmapFile` can deref to a slice of the `mmap`ed region of memory.
-/// impl Deref for ArcMmapFile {
-///     type Target = [u8];
-///     fn deref(&self) -> &[u8] {
-///         &self.0
-///     }
-/// }
-///
-/// // These are both valid for any `Rc` or `Arc`.
-/// unsafe impl gimli::StableDeref for ArcMmapFile {}
-/// unsafe impl gimli::CloneStableDeref for ArcMmapFile {}
-///
-/// /// A `gimli::Reader` that is backed by an `mmap`ed file!
-/// pub type MmapFileReader<Endian> = gimli::EndianReader<Endian, ArcMmapFile>;
-/// # fn test(_: &MmapFileReader<gimli::NativeEndian>) { }
-/// ```
-#[derive(Debug, Clone, Copy, Hash)]
-pub struct EndianReader<Endian, T>
-where
-    Endian: Endianity,
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    range: SubRange<T>,
-    endian: Endian,
-}
-
-impl<Endian, T1, T2> PartialEq<EndianReader<Endian, T2>> for EndianReader<Endian, T1>
-where
-    Endian: Endianity,
-    T1: CloneStableDeref<Target = [u8]> + Debug,
-    T2: CloneStableDeref<Target = [u8]> + Debug,
-{
-    fn eq(&self, rhs: &EndianReader<Endian, T2>) -> bool {
-        self.bytes() == rhs.bytes()
-    }
-}
-
-impl<Endian, T> Eq for EndianReader<Endian, T>
-where
-    Endian: Endianity,
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-}
-
-// This is separated out from `EndianReader` so that we can avoid running afoul
-// of borrowck. We need to `read_slice(&mut self, ...) -> &[u8]` and then call
-// `self.endian.read_whatever` on the result. The problem is that the returned
-// slice keeps the `&mut self` borrow active, so we wouldn't be able to access
-// `self.endian`. Splitting the sub-range out from the endian lets us work
-// around this, making it so that only the `self.range` borrow is held active,
-// not all of `self`.
-//
-// This also serves to encapsulate the unsafe code concerning `CloneStableDeref`.
-// The `bytes` member is held so that the bytes live long enough, and the
-// `CloneStableDeref` ensures these bytes never move.  The `ptr` and `len`
-// members point inside `bytes`, and are updated during read operations.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-struct SubRange<T>
-where
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    bytes: T,
-    ptr: *const u8,
-    len: usize,
-}
-
-unsafe impl<T> Send for SubRange<T> where T: CloneStableDeref<Target = [u8]> + Debug + Send {}
-
-unsafe impl<T> Sync for SubRange<T> where T: CloneStableDeref<Target = [u8]> + Debug + Sync {}
-
-impl<T> SubRange<T>
-where
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    #[inline]
-    fn new(bytes: T) -> Self {
-        let ptr = bytes.as_ptr();
-        let len = bytes.len();
-        SubRange { bytes, ptr, len }
-    }
-
-    #[inline]
-    fn bytes(&self) -> &[u8] {
-        // Safe because `T` implements `CloneStableDeref`, `bytes` can't be modified,
-        // and all operations that modify `ptr` and `len` ensure they stay in range.
-        unsafe { slice::from_raw_parts(self.ptr, self.len) }
-    }
-
-    #[inline]
-    fn len(&self) -> usize {
-        self.len
-    }
-
-    #[inline]
-    fn truncate(&mut self, len: usize) {
-        assert!(len <= self.len);
-        self.len = len;
-    }
-
-    #[inline]
-    fn skip(&mut self, len: usize) {
-        assert!(len <= self.len);
-        self.ptr = unsafe { self.ptr.add(len) };
-        self.len -= len;
-    }
-
-    #[inline]
-    fn read_slice(&mut self, len: usize) -> Option<&[u8]> {
-        if self.len() < len {
-            None
-        } else {
-            // Same as for `bytes()`.
-            let bytes = unsafe { slice::from_raw_parts(self.ptr, len) };
-            self.skip(len);
-            Some(bytes)
-        }
-    }
-}
-
-impl<Endian, T> EndianReader<Endian, T>
-where
-    Endian: Endianity,
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    /// Construct a new `EndianReader` with the given bytes.
-    #[inline]
-    pub fn new(bytes: T, endian: Endian) -> EndianReader<Endian, T> {
-        EndianReader {
-            range: SubRange::new(bytes),
-            endian,
-        }
-    }
-
-    /// Return a reference to the raw bytes underlying this reader.
-    #[inline]
-    pub fn bytes(&self) -> &[u8] {
-        self.range.bytes()
-    }
-}
-
-/// # Range Methods
-///
-/// Unfortunately, `std::ops::Index` *must* return a reference, so we can't
-/// implement `Index<Range<usize>>` to return a new `EndianReader` the way we
-/// would like to. Instead, we abandon fancy indexing operators and have these
-/// plain old methods.
-impl<Endian, T> EndianReader<Endian, T>
-where
-    Endian: Endianity,
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    /// Take the given `start..end` range of the underlying buffer and return a
-    /// new `EndianReader`.
-    ///
-    /// ```
-    /// # #[cfg(feature = "std")] {
-    /// use gimli::{EndianReader, LittleEndian};
-    /// use std::sync::Arc;
-    ///
-    /// let buf = Arc::<[u8]>::from(&[0x01, 0x02, 0x03, 0x04][..]);
-    /// let reader = EndianReader::new(buf.clone(), LittleEndian);
-    /// assert_eq!(reader.range(1..3),
-    ///            EndianReader::new(&buf[1..3], LittleEndian));
-    /// # }
-    /// ```
-    ///
-    /// # Panics
-    ///
-    /// Panics if the range is out of bounds.
-    pub fn range(&self, idx: Range<usize>) -> EndianReader<Endian, T> {
-        let mut r = self.clone();
-        r.range.skip(idx.start);
-        r.range.truncate(idx.len());
-        r
-    }
-
-    /// Take the given `start..` range of the underlying buffer and return a new
-    /// `EndianReader`.
-    ///
-    /// ```
-    /// # #[cfg(feature = "std")] {
-    /// use gimli::{EndianReader, LittleEndian};
-    /// use std::sync::Arc;
-    ///
-    /// let buf = Arc::<[u8]>::from(&[0x01, 0x02, 0x03, 0x04][..]);
-    /// let reader = EndianReader::new(buf.clone(), LittleEndian);
-    /// assert_eq!(reader.range_from(2..),
-    ///            EndianReader::new(&buf[2..], LittleEndian));
-    /// # }
-    /// ```
-    ///
-    /// # Panics
-    ///
-    /// Panics if the range is out of bounds.
-    pub fn range_from(&self, idx: RangeFrom<usize>) -> EndianReader<Endian, T> {
-        let mut r = self.clone();
-        r.range.skip(idx.start);
-        r
-    }
-
-    /// Take the given `..end` range of the underlying buffer and return a new
-    /// `EndianReader`.
-    ///
-    /// ```
-    /// # #[cfg(feature = "std")] {
-    /// use gimli::{EndianReader, LittleEndian};
-    /// use std::sync::Arc;
-    ///
-    /// let buf = Arc::<[u8]>::from(&[0x01, 0x02, 0x03, 0x04][..]);
-    /// let reader = EndianReader::new(buf.clone(), LittleEndian);
-    /// assert_eq!(reader.range_to(..3),
-    ///            EndianReader::new(&buf[..3], LittleEndian));
-    /// # }
-    /// ```
-    ///
-    /// # Panics
-    ///
-    /// Panics if the range is out of bounds.
-    pub fn range_to(&self, idx: RangeTo<usize>) -> EndianReader<Endian, T> {
-        let mut r = self.clone();
-        r.range.truncate(idx.end);
-        r
-    }
-}
-
-impl<Endian, T> Index<usize> for EndianReader<Endian, T>
-where
-    Endian: Endianity,
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    type Output = u8;
-    fn index(&self, idx: usize) -> &Self::Output {
-        &self.bytes()[idx]
-    }
-}
-
-impl<Endian, T> Index<RangeFrom<usize>> for EndianReader<Endian, T>
-where
-    Endian: Endianity,
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    type Output = [u8];
-    fn index(&self, idx: RangeFrom<usize>) -> &Self::Output {
-        &self.bytes()[idx]
-    }
-}
-
-impl<Endian, T> Deref for EndianReader<Endian, T>
-where
-    Endian: Endianity,
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    type Target = [u8];
-    fn deref(&self) -> &Self::Target {
-        self.bytes()
-    }
-}
-
-impl<Endian, T> Reader for EndianReader<Endian, T>
-where
-    Endian: Endianity,
-    T: CloneStableDeref<Target = [u8]> + Debug,
-{
-    type Endian = Endian;
-    type Offset = usize;
-
-    #[inline]
-    fn endian(&self) -> Endian {
-        self.endian
-    }
-
-    #[inline]
-    fn len(&self) -> usize {
-        self.range.len()
-    }
-
-    #[inline]
-    fn empty(&mut self) {
-        self.range.truncate(0);
-    }
-
-    #[inline]
-    fn truncate(&mut self, len: usize) -> Result<()> {
-        if self.len() < len {
-            Err(Error::UnexpectedEof(self.offset_id()))
-        } else {
-            self.range.truncate(len);
-            Ok(())
-        }
-    }
-
-    #[inline]
-    fn offset_from(&self, base: &EndianReader<Endian, T>) -> usize {
-        let base_ptr = base.bytes().as_ptr() as *const u8 as usize;
-        let ptr = self.bytes().as_ptr() as *const u8 as usize;
-        debug_assert!(base_ptr <= ptr);
-        debug_assert!(ptr + self.bytes().len() <= base_ptr + base.bytes().len());
-        ptr - base_ptr
-    }
-
-    #[inline]
-    fn offset_id(&self) -> ReaderOffsetId {
-        ReaderOffsetId(self.bytes().as_ptr() as u64)
-    }
-
-    #[inline]
-    fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<Self::Offset> {
-        let id = id.0;
-        let self_id = self.bytes().as_ptr() as u64;
-        let self_len = self.bytes().len() as u64;
-        if id >= self_id && id <= self_id + self_len {
-            Some((id - self_id) as usize)
-        } else {
-            None
-        }
-    }
-
-    #[inline]
-    fn find(&self, byte: u8) -> Result<usize> {
-        self.bytes()
-            .iter()
-            .position(|x| *x == byte)
-            .ok_or_else(|| Error::UnexpectedEof(self.offset_id()))
-    }
-
-    #[inline]
-    fn skip(&mut self, len: usize) -> Result<()> {
-        if self.len() < len {
-            Err(Error::UnexpectedEof(self.offset_id()))
-        } else {
-            self.range.skip(len);
-            Ok(())
-        }
-    }
-
-    #[inline]
-    fn split(&mut self, len: usize) -> Result<Self> {
-        if self.len() < len {
-            Err(Error::UnexpectedEof(self.offset_id()))
-        } else {
-            let mut r = self.clone();
-            r.range.truncate(len);
-            self.range.skip(len);
-            Ok(r)
-        }
-    }
-
-    #[inline]
-    fn to_slice(&self) -> Result<Cow<[u8]>> {
-        Ok(self.bytes().into())
-    }
-
-    #[inline]
-    fn to_string(&self) -> Result<Cow<str>> {
-        match str::from_utf8(self.bytes()) {
-            Ok(s) => Ok(s.into()),
-            _ => Err(Error::BadUtf8),
-        }
-    }
-
-    #[inline]
-    fn to_string_lossy(&self) -> Result<Cow<str>> {
-        Ok(String::from_utf8_lossy(self.bytes()))
-    }
-
-    #[inline]
-    fn read_slice(&mut self, buf: &mut [u8]) -> Result<()> {
-        match self.range.read_slice(buf.len()) {
-            Some(slice) => {
-                buf.clone_from_slice(slice);
-                Ok(())
-            }
-            None => Err(Error::UnexpectedEof(self.offset_id())),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::endianity::NativeEndian;
-    use crate::read::Reader;
-
-    fn native_reader<T: CloneStableDeref<Target = [u8]> + Debug>(
-        bytes: T,
-    ) -> EndianReader<NativeEndian, T> {
-        EndianReader::new(bytes, NativeEndian)
-    }
-
-    const BUF: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-
-    #[test]
-    fn test_reader_split() {
-        let mut reader = native_reader(BUF);
-        let left = reader.split(3).unwrap();
-        assert_eq!(left, native_reader(&BUF[..3]));
-        assert_eq!(reader, native_reader(&BUF[3..]));
-    }
-
-    #[test]
-    fn test_reader_split_out_of_bounds() {
-        let mut reader = native_reader(BUF);
-        assert!(reader.split(30).is_err());
-    }
-
-    #[test]
-    fn bytes_and_len_and_range_and_eq() {
-        let reader = native_reader(BUF);
-        assert_eq!(reader.len(), BUF.len());
-        assert_eq!(reader.bytes(), BUF);
-        assert_eq!(reader, native_reader(BUF));
-
-        let range = reader.range(2..8);
-        let buf_range = &BUF[2..8];
-        assert_eq!(range.len(), buf_range.len());
-        assert_eq!(range.bytes(), buf_range);
-        assert_ne!(range, native_reader(BUF));
-        assert_eq!(range, native_reader(buf_range));
-
-        let range_from = range.range_from(1..);
-        let buf_range_from = &buf_range[1..];
-        assert_eq!(range_from.len(), buf_range_from.len());
-        assert_eq!(range_from.bytes(), buf_range_from);
-        assert_ne!(range_from, native_reader(BUF));
-        assert_eq!(range_from, native_reader(buf_range_from));
-
-        let range_to = range_from.range_to(..4);
-        let buf_range_to = &buf_range_from[..4];
-        assert_eq!(range_to.len(), buf_range_to.len());
-        assert_eq!(range_to.bytes(), buf_range_to);
-        assert_ne!(range_to, native_reader(BUF));
-        assert_eq!(range_to, native_reader(buf_range_to));
-    }
-
-    #[test]
-    fn find() {
-        let mut reader = native_reader(BUF);
-        reader.skip(2).unwrap();
-        assert_eq!(
-            reader.find(5),
-            Ok(BUF[2..].iter().position(|x| *x == 5).unwrap())
-        );
-    }
-
-    #[test]
-    fn indexing() {
-        let mut reader = native_reader(BUF);
-        reader.skip(2).unwrap();
-        assert_eq!(reader[0], BUF[2]);
-    }
-
-    #[test]
-    #[should_panic]
-    fn indexing_out_of_bounds() {
-        let mut reader = native_reader(BUF);
-        reader.skip(2).unwrap();
-        let _ = reader[900];
-    }
-
-    #[test]
-    fn endian() {
-        let reader = native_reader(BUF);
-        assert_eq!(reader.endian(), NativeEndian);
-    }
-
-    #[test]
-    fn empty() {
-        let mut reader = native_reader(BUF);
-        assert!(!reader.is_empty());
-        reader.empty();
-        assert!(reader.is_empty());
-        assert!(reader.bytes().is_empty());
-    }
-
-    #[test]
-    fn truncate() {
-        let reader = native_reader(BUF);
-        let mut reader = reader.range(2..8);
-        reader.truncate(2).unwrap();
-        assert_eq!(reader.bytes(), &BUF[2..4]);
-    }
-
-    #[test]
-    fn offset_from() {
-        let reader = native_reader(BUF);
-        let sub = reader.range(2..8);
-        assert_eq!(sub.offset_from(&reader), 2);
-    }
-
-    #[test]
-    fn skip() {
-        let mut reader = native_reader(BUF);
-        reader.skip(2).unwrap();
-        assert_eq!(reader.bytes(), &BUF[2..]);
-    }
-
-    #[test]
-    fn to_slice() {
-        assert_eq!(
-            native_reader(BUF).range(2..5).to_slice(),
-            Ok(Cow::from(&BUF[2..5]))
-        );
-    }
-
-    #[test]
-    fn to_string_ok() {
-        let buf = b"hello, world!";
-        let reader = native_reader(&buf[..]);
-        let reader = reader.range_from(7..);
-        assert_eq!(reader.to_string(), Ok(Cow::from("world!")));
-    }
-
-    // The rocket emoji (🚀 = [0xf0, 0x9f, 0x9a, 0x80]) but rotated left by one
-    // to make it invalid UTF-8.
-    const BAD_UTF8: &[u8] = &[0x9f, 0x9a, 0x80, 0xf0];
-
-    #[test]
-    fn to_string_err() {
-        let reader = native_reader(BAD_UTF8);
-        assert!(reader.to_string().is_err());
-    }
-
-    #[test]
-    fn to_string_lossy() {
-        let reader = native_reader(BAD_UTF8);
-        assert_eq!(reader.to_string_lossy(), Ok(Cow::from("����")));
-    }
-
-    #[test]
-    fn read_u8_array() {
-        let mut reader = native_reader(BAD_UTF8);
-        reader.skip(1).unwrap();
-        let arr: [u8; 2] = reader.read_u8_array().unwrap();
-        assert_eq!(arr, &BAD_UTF8[1..3]);
-        assert_eq!(reader.bytes(), &BAD_UTF8[3..]);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/endian_slice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/endian_slice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/endian_slice.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/endian_slice.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,339 +0,0 @@
-//! Working with byte slices that have an associated endianity.
-
-use alloc::borrow::Cow;
-use alloc::string::String;
-use core::ops::{Deref, Index, Range, RangeFrom, RangeTo};
-use core::str;
-
-use crate::endianity::Endianity;
-use crate::read::{Error, Reader, ReaderOffsetId, Result};
-
-/// A `&[u8]` slice with endianity metadata.
-///
-/// This implements the `Reader` trait, which is used for all reading of DWARF sections.
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct EndianSlice<'input, Endian>
-where
-    Endian: Endianity,
-{
-    slice: &'input [u8],
-    endian: Endian,
-}
-
-impl<'input, Endian> EndianSlice<'input, Endian>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `EndianSlice` with the given slice and endianity.
-    #[inline]
-    pub fn new(slice: &'input [u8], endian: Endian) -> EndianSlice<'input, Endian> {
-        EndianSlice { slice, endian }
-    }
-
-    /// Return a reference to the raw slice.
-    #[inline]
-    #[doc(hidden)]
-    #[deprecated(note = "Method renamed to EndianSlice::slice; use that instead.")]
-    pub fn buf(&self) -> &'input [u8] {
-        self.slice
-    }
-
-    /// Return a reference to the raw slice.
-    #[inline]
-    pub fn slice(&self) -> &'input [u8] {
-        self.slice
-    }
-
-    /// Split the slice in two at the given index, resulting in the tuple where
-    /// the first item has range [0, idx), and the second has range [idx,
-    /// len). Panics if the index is out of bounds.
-    #[inline]
-    pub fn split_at(
-        &self,
-        idx: usize,
-    ) -> (EndianSlice<'input, Endian>, EndianSlice<'input, Endian>) {
-        (self.range_to(..idx), self.range_from(idx..))
-    }
-
-    /// Find the first occurence of a byte in the slice, and return its index.
-    #[inline]
-    pub fn find(&self, byte: u8) -> Option<usize> {
-        self.slice.iter().position(|ch| *ch == byte)
-    }
-
-    /// Return the offset of the start of the slice relative to the start
-    /// of the given slice.
-    #[inline]
-    pub fn offset_from(&self, base: EndianSlice<'input, Endian>) -> usize {
-        let base_ptr = base.slice.as_ptr() as *const u8 as usize;
-        let ptr = self.slice.as_ptr() as *const u8 as usize;
-        debug_assert!(base_ptr <= ptr);
-        debug_assert!(ptr + self.slice.len() <= base_ptr + base.slice.len());
-        ptr - base_ptr
-    }
-
-    /// Converts the slice to a string using `str::from_utf8`.
-    ///
-    /// Returns an error if the slice contains invalid characters.
-    #[inline]
-    pub fn to_string(&self) -> Result<&'input str> {
-        str::from_utf8(self.slice).map_err(|_| Error::BadUtf8)
-    }
-
-    /// Converts the slice to a string, including invalid characters,
-    /// using `String::from_utf8_lossy`.
-    #[inline]
-    pub fn to_string_lossy(&self) -> Cow<'input, str> {
-        String::from_utf8_lossy(self.slice)
-    }
-
-    #[inline]
-    fn read_slice(&mut self, len: usize) -> Result<&'input [u8]> {
-        if self.slice.len() < len {
-            Err(Error::UnexpectedEof(self.offset_id()))
-        } else {
-            let val = &self.slice[..len];
-            self.slice = &self.slice[len..];
-            Ok(val)
-        }
-    }
-}
-
-/// # Range Methods
-///
-/// Unfortunately, `std::ops::Index` *must* return a reference, so we can't
-/// implement `Index<Range<usize>>` to return a new `EndianSlice` the way we would
-/// like to. Instead, we abandon fancy indexing operators and have these plain
-/// old methods.
-impl<'input, Endian> EndianSlice<'input, Endian>
-where
-    Endian: Endianity,
-{
-    /// Take the given `start..end` range of the underlying slice and return a
-    /// new `EndianSlice`.
-    ///
-    /// ```
-    /// use gimli::{EndianSlice, LittleEndian};
-    ///
-    /// let slice = &[0x01, 0x02, 0x03, 0x04];
-    /// let endian_slice = EndianSlice::new(slice, LittleEndian);
-    /// assert_eq!(endian_slice.range(1..3),
-    ///            EndianSlice::new(&slice[1..3], LittleEndian));
-    /// ```
-    pub fn range(&self, idx: Range<usize>) -> EndianSlice<'input, Endian> {
-        EndianSlice {
-            slice: &self.slice[idx],
-            endian: self.endian,
-        }
-    }
-
-    /// Take the given `start..` range of the underlying slice and return a new
-    /// `EndianSlice`.
-    ///
-    /// ```
-    /// use gimli::{EndianSlice, LittleEndian};
-    ///
-    /// let slice = &[0x01, 0x02, 0x03, 0x04];
-    /// let endian_slice = EndianSlice::new(slice, LittleEndian);
-    /// assert_eq!(endian_slice.range_from(2..),
-    ///            EndianSlice::new(&slice[2..], LittleEndian));
-    /// ```
-    pub fn range_from(&self, idx: RangeFrom<usize>) -> EndianSlice<'input, Endian> {
-        EndianSlice {
-            slice: &self.slice[idx],
-            endian: self.endian,
-        }
-    }
-
-    /// Take the given `..end` range of the underlying slice and return a new
-    /// `EndianSlice`.
-    ///
-    /// ```
-    /// use gimli::{EndianSlice, LittleEndian};
-    ///
-    /// let slice = &[0x01, 0x02, 0x03, 0x04];
-    /// let endian_slice = EndianSlice::new(slice, LittleEndian);
-    /// assert_eq!(endian_slice.range_to(..3),
-    ///            EndianSlice::new(&slice[..3], LittleEndian));
-    /// ```
-    pub fn range_to(&self, idx: RangeTo<usize>) -> EndianSlice<'input, Endian> {
-        EndianSlice {
-            slice: &self.slice[idx],
-            endian: self.endian,
-        }
-    }
-}
-
-impl<'input, Endian> Index<usize> for EndianSlice<'input, Endian>
-where
-    Endian: Endianity,
-{
-    type Output = u8;
-    fn index(&self, idx: usize) -> &Self::Output {
-        &self.slice[idx]
-    }
-}
-
-impl<'input, Endian> Index<RangeFrom<usize>> for EndianSlice<'input, Endian>
-where
-    Endian: Endianity,
-{
-    type Output = [u8];
-    fn index(&self, idx: RangeFrom<usize>) -> &Self::Output {
-        &self.slice[idx]
-    }
-}
-
-impl<'input, Endian> Deref for EndianSlice<'input, Endian>
-where
-    Endian: Endianity,
-{
-    type Target = [u8];
-    fn deref(&self) -> &Self::Target {
-        self.slice
-    }
-}
-
-impl<'input, Endian> Into<&'input [u8]> for EndianSlice<'input, Endian>
-where
-    Endian: Endianity,
-{
-    fn into(self) -> &'input [u8] {
-        self.slice
-    }
-}
-
-impl<'input, Endian> Reader for EndianSlice<'input, Endian>
-where
-    Endian: Endianity,
-{
-    type Endian = Endian;
-    type Offset = usize;
-
-    #[inline]
-    fn endian(&self) -> Endian {
-        self.endian
-    }
-
-    #[inline]
-    fn len(&self) -> usize {
-        self.slice.len()
-    }
-
-    #[inline]
-    fn is_empty(&self) -> bool {
-        self.slice.is_empty()
-    }
-
-    #[inline]
-    fn empty(&mut self) {
-        self.slice = &[];
-    }
-
-    #[inline]
-    fn truncate(&mut self, len: usize) -> Result<()> {
-        if self.slice.len() < len {
-            Err(Error::UnexpectedEof(self.offset_id()))
-        } else {
-            self.slice = &self.slice[..len];
-            Ok(())
-        }
-    }
-
-    #[inline]
-    fn offset_from(&self, base: &Self) -> usize {
-        self.offset_from(*base)
-    }
-
-    #[inline]
-    fn offset_id(&self) -> ReaderOffsetId {
-        ReaderOffsetId(self.slice.as_ptr() as u64)
-    }
-
-    #[inline]
-    fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<Self::Offset> {
-        let id = id.0;
-        let self_id = self.slice.as_ptr() as u64;
-        let self_len = self.slice.len() as u64;
-        if id >= self_id && id <= self_id + self_len {
-            Some((id - self_id) as usize)
-        } else {
-            None
-        }
-    }
-
-    #[inline]
-    fn find(&self, byte: u8) -> Result<usize> {
-        self.find(byte)
-            .ok_or_else(|| Error::UnexpectedEof(self.offset_id()))
-    }
-
-    #[inline]
-    fn skip(&mut self, len: usize) -> Result<()> {
-        if self.slice.len() < len {
-            Err(Error::UnexpectedEof(self.offset_id()))
-        } else {
-            self.slice = &self.slice[len..];
-            Ok(())
-        }
-    }
-
-    #[inline]
-    fn split(&mut self, len: usize) -> Result<Self> {
-        let slice = self.read_slice(len)?;
-        Ok(EndianSlice::new(slice, self.endian))
-    }
-
-    #[inline]
-    fn to_slice(&self) -> Result<Cow<[u8]>> {
-        Ok(self.slice.into())
-    }
-
-    #[inline]
-    fn to_string(&self) -> Result<Cow<str>> {
-        match str::from_utf8(self.slice) {
-            Ok(s) => Ok(s.into()),
-            _ => Err(Error::BadUtf8),
-        }
-    }
-
-    #[inline]
-    fn to_string_lossy(&self) -> Result<Cow<str>> {
-        Ok(String::from_utf8_lossy(self.slice))
-    }
-
-    #[inline]
-    fn read_slice(&mut self, buf: &mut [u8]) -> Result<()> {
-        let slice = self.read_slice(buf.len())?;
-        buf.clone_from_slice(slice);
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::endianity::NativeEndian;
-
-    #[test]
-    fn test_endian_slice_split_at() {
-        let endian = NativeEndian;
-        let slice = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        let eb = EndianSlice::new(slice, endian);
-        assert_eq!(
-            eb.split_at(3),
-            (
-                EndianSlice::new(&slice[..3], endian),
-                EndianSlice::new(&slice[3..], endian)
-            )
-        );
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_endian_slice_split_at_out_of_bounds() {
-        let slice = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        let eb = EndianSlice::new(slice, NativeEndian);
-        eb.split_at(30);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/line.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3035 +0,0 @@
-use alloc::vec::Vec;
-use core::fmt;
-use core::num::Wrapping;
-use core::result;
-
-use crate::common::{
-    DebugLineOffset, DebugLineStrOffset, DebugStrOffset, DebugStrOffsetsIndex, Encoding, Format,
-    LineEncoding, SectionId,
-};
-use crate::constants;
-use crate::endianity::Endianity;
-use crate::read::{AttributeValue, EndianSlice, Error, Reader, ReaderOffset, Result, Section};
-
-/// The `DebugLine` struct contains the source location to instruction mapping
-/// found in the `.debug_line` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugLine<R> {
-    debug_line_section: R,
-}
-
-impl<'input, Endian> DebugLine<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugLine` instance from the data in the `.debug_line`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_line` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugLine, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_line_section_somehow = || &buf;
-    /// let debug_line = DebugLine::new(read_debug_line_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(debug_line_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_line_section, endian))
-    }
-}
-
-impl<R: Reader> DebugLine<R> {
-    /// Parse the line number program whose header is at the given `offset` in the
-    /// `.debug_line` section.
-    ///
-    /// The `address_size` must match the compilation unit that the lines apply to.
-    /// The `comp_dir` should be from the `DW_AT_comp_dir` attribute of the compilation
-    /// unit. The `comp_name` should be from the `DW_AT_name` attribute of the
-    /// compilation unit.
-    ///
-    /// ```rust,no_run
-    /// use gimli::{DebugLine, DebugLineOffset, IncompleteLineProgram, EndianSlice, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_line_section_somehow = || &buf;
-    /// let debug_line = DebugLine::new(read_debug_line_section_somehow(), LittleEndian);
-    ///
-    /// // In a real example, we'd grab the offset via a compilation unit
-    /// // entry's `DW_AT_stmt_list` attribute, and the address size from that
-    /// // unit directly.
-    /// let offset = DebugLineOffset(0);
-    /// let address_size = 8;
-    ///
-    /// let program = debug_line.program(offset, address_size, None, None)
-    ///     .expect("should have found a header at that offset, and parsed it OK");
-    /// ```
-    pub fn program(
-        &self,
-        offset: DebugLineOffset<R::Offset>,
-        address_size: u8,
-        comp_dir: Option<R>,
-        comp_name: Option<R>,
-    ) -> Result<IncompleteLineProgram<R>> {
-        let input = &mut self.debug_line_section.clone();
-        input.skip(offset.0)?;
-        let header = LineProgramHeader::parse(input, offset, address_size, comp_dir, comp_name)?;
-        let program = IncompleteLineProgram { header };
-        Ok(program)
-    }
-}
-
-impl<T> DebugLine<T> {
-    /// Create a `DebugLine` section that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::DebugLine<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugLine<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        borrow(&self.debug_line_section).into()
-    }
-}
-
-impl<R> Section<R> for DebugLine<R> {
-    fn id() -> SectionId {
-        SectionId::DebugLine
-    }
-
-    fn reader(&self) -> &R {
-        &self.debug_line_section
-    }
-}
-
-impl<R> From<R> for DebugLine<R> {
-    fn from(debug_line_section: R) -> Self {
-        DebugLine { debug_line_section }
-    }
-}
-
-/// Deprecated. `LineNumberProgram` has been renamed to `LineProgram`.
-#[deprecated(note = "LineNumberProgram has been renamed to LineProgram, use that instead.")]
-pub type LineNumberProgram<R, Offset> = dyn LineProgram<R, Offset>;
-
-/// A `LineProgram` provides access to a `LineProgramHeader` and
-/// a way to add files to the files table if necessary. Gimli consumers should
-/// never need to use or see this trait.
-pub trait LineProgram<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Get a reference to the held `LineProgramHeader`.
-    fn header(&self) -> &LineProgramHeader<R, Offset>;
-    /// Add a file to the file table if necessary.
-    fn add_file(&mut self, file: FileEntry<R, Offset>);
-}
-
-impl<R, Offset> LineProgram<R, Offset> for IncompleteLineProgram<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    fn header(&self) -> &LineProgramHeader<R, Offset> {
-        &self.header
-    }
-    fn add_file(&mut self, file: FileEntry<R, Offset>) {
-        self.header.file_names.push(file);
-    }
-}
-
-impl<'program, R, Offset> LineProgram<R, Offset> for &'program CompleteLineProgram<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    fn header(&self) -> &LineProgramHeader<R, Offset> {
-        &self.header
-    }
-    fn add_file(&mut self, _: FileEntry<R, Offset>) {
-        // Nop. Our file table is already complete.
-    }
-}
-
-/// Deprecated. `StateMachine` has been renamed to `LineRows`.
-#[deprecated(note = "StateMachine has been renamed to LineRows, use that instead.")]
-pub type StateMachine<R, Program, Offset> = LineRows<R, Program, Offset>;
-
-/// Executes a `LineProgram` to iterate over the rows in the matrix of line number information.
-///
-/// "The hypothetical machine used by a consumer of the line number information
-/// to expand the byte-coded instruction stream into a matrix of line number
-/// information." -- Section 6.2.1
-#[derive(Debug, Clone)]
-pub struct LineRows<R, Program, Offset = <R as Reader>::Offset>
-where
-    Program: LineProgram<R, Offset>,
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    program: Program,
-    row: LineRow,
-    instructions: LineInstructions<R>,
-}
-
-type OneShotLineRows<R, Offset = <R as Reader>::Offset> =
-    LineRows<R, IncompleteLineProgram<R, Offset>, Offset>;
-
-type ResumedLineRows<'program, R, Offset = <R as Reader>::Offset> =
-    LineRows<R, &'program CompleteLineProgram<R, Offset>, Offset>;
-
-impl<R, Program, Offset> LineRows<R, Program, Offset>
-where
-    Program: LineProgram<R, Offset>,
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    #[allow(clippy::new_ret_no_self)]
-    fn new(program: IncompleteLineProgram<R, Offset>) -> OneShotLineRows<R, Offset> {
-        let row = LineRow::new(program.header());
-        let instructions = LineInstructions {
-            input: program.header().program_buf.clone(),
-        };
-        LineRows {
-            program,
-            row,
-            instructions,
-        }
-    }
-
-    fn resume<'program>(
-        program: &'program CompleteLineProgram<R, Offset>,
-        sequence: &LineSequence<R>,
-    ) -> ResumedLineRows<'program, R, Offset> {
-        let row = LineRow::new(program.header());
-        let instructions = sequence.instructions.clone();
-        LineRows {
-            program,
-            row,
-            instructions,
-        }
-    }
-
-    /// Get a reference to the header for this state machine's line number
-    /// program.
-    #[inline]
-    pub fn header(&self) -> &LineProgramHeader<R, Offset> {
-        self.program.header()
-    }
-
-    /// Parse and execute the next instructions in the line number program until
-    /// another row in the line number matrix is computed.
-    ///
-    /// The freshly computed row is returned as `Ok(Some((header, row)))`.
-    /// If the matrix is complete, and there are no more new rows in the line
-    /// number matrix, then `Ok(None)` is returned. If there was an error parsing
-    /// an instruction, then `Err(e)` is returned.
-    ///
-    /// Unfortunately, the references mean that this cannot be a
-    /// `FallibleIterator`.
-    pub fn next_row(&mut self) -> Result<Option<(&LineProgramHeader<R, Offset>, &LineRow)>> {
-        // Perform any reset that was required after copying the previous row.
-        self.row.reset(self.program.header());
-
-        loop {
-            // Split the borrow here, rather than calling `self.header()`.
-            match self.instructions.next_instruction(self.program.header()) {
-                Err(err) => return Err(err),
-                Ok(None) => return Ok(None),
-                Ok(Some(instruction)) => {
-                    if self.row.execute(instruction, &mut self.program) {
-                        return Ok(Some((self.header(), &self.row)));
-                    }
-                    // Fall through, parse the next instruction, and see if that
-                    // yields a row.
-                }
-            }
-        }
-    }
-}
-
-/// Deprecated. `Opcode` has been renamed to `LineInstruction`.
-#[deprecated(note = "Opcode has been renamed to LineInstruction, use that instead.")]
-pub type Opcode<R> = LineInstruction<R, <R as Reader>::Offset>;
-
-/// A parsed line number program instruction.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum LineInstruction<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// > ### 6.2.5.1 Special Opcodes
-    /// >
-    /// > Each ubyte special opcode has the following effect on the state machine:
-    /// >
-    /// >   1. Add a signed integer to the line register.
-    /// >
-    /// >   2. Modify the operation pointer by incrementing the address and
-    /// >   op_index registers as described below.
-    /// >
-    /// >   3. Append a row to the matrix using the current values of the state
-    /// >   machine registers.
-    /// >
-    /// >   4. Set the basic_block register to “false.�
-    /// >
-    /// >   5. Set the prologue_end register to “false.�
-    /// >
-    /// >   6. Set the epilogue_begin register to “false.�
-    /// >
-    /// >   7. Set the discriminator register to 0.
-    /// >
-    /// > All of the special opcodes do those same seven things; they differ from
-    /// > one another only in what values they add to the line, address and
-    /// > op_index registers.
-    Special(u8),
-
-    /// "[`LineInstruction::Copy`] appends a row to the matrix using the current
-    /// values of the state machine registers. Then it sets the discriminator
-    /// register to 0, and sets the basic_block, prologue_end and epilogue_begin
-    /// registers to “false.�"
-    Copy,
-
-    /// "The DW_LNS_advance_pc opcode takes a single unsigned LEB128 operand as
-    /// the operation advance and modifies the address and op_index registers
-    /// [the same as `LineInstruction::Special`]"
-    AdvancePc(u64),
-
-    /// "The DW_LNS_advance_line opcode takes a single signed LEB128 operand and
-    /// adds that value to the line register of the state machine."
-    AdvanceLine(i64),
-
-    /// "The DW_LNS_set_file opcode takes a single unsigned LEB128 operand and
-    /// stores it in the file register of the state machine."
-    SetFile(u64),
-
-    /// "The DW_LNS_set_column opcode takes a single unsigned LEB128 operand and
-    /// stores it in the column register of the state machine."
-    SetColumn(u64),
-
-    /// "The DW_LNS_negate_stmt opcode takes no operands. It sets the is_stmt
-    /// register of the state machine to the logical negation of its current
-    /// value."
-    NegateStatement,
-
-    /// "The DW_LNS_set_basic_block opcode takes no operands. It sets the
-    /// basic_block register of the state machine to “true.�"
-    SetBasicBlock,
-
-    /// > The DW_LNS_const_add_pc opcode takes no operands. It advances the
-    /// > address and op_index registers by the increments corresponding to
-    /// > special opcode 255.
-    /// >
-    /// > When the line number program needs to advance the address by a small
-    /// > amount, it can use a single special opcode, which occupies a single
-    /// > byte. When it needs to advance the address by up to twice the range of
-    /// > the last special opcode, it can use DW_LNS_const_add_pc followed by a
-    /// > special opcode, for a total of two bytes. Only if it needs to advance
-    /// > the address by more than twice that range will it need to use both
-    /// > DW_LNS_advance_pc and a special opcode, requiring three or more bytes.
-    ConstAddPc,
-
-    /// > The DW_LNS_fixed_advance_pc opcode takes a single uhalf (unencoded)
-    /// > operand and adds it to the address register of the state machine and
-    /// > sets the op_index register to 0. This is the only standard opcode whose
-    /// > operand is not a variable length number. It also does not multiply the
-    /// > operand by the minimum_instruction_length field of the header.
-    FixedAddPc(u16),
-
-    /// "[`LineInstruction::SetPrologueEnd`] sets the prologue_end register to “true�."
-    SetPrologueEnd,
-
-    /// "[`LineInstruction::SetEpilogueBegin`] sets the epilogue_begin register to
-    /// “true�."
-    SetEpilogueBegin,
-
-    /// "The DW_LNS_set_isa opcode takes a single unsigned LEB128 operand and
-    /// stores that value in the isa register of the state machine."
-    SetIsa(u64),
-
-    /// An unknown standard opcode with zero operands.
-    UnknownStandard0(constants::DwLns),
-
-    /// An unknown standard opcode with one operand.
-    UnknownStandard1(constants::DwLns, u64),
-
-    /// An unknown standard opcode with multiple operands.
-    UnknownStandardN(constants::DwLns, R),
-
-    /// > [`LineInstruction::EndSequence`] sets the end_sequence register of the state
-    /// > machine to “true� and appends a row to the matrix using the current
-    /// > values of the state-machine registers. Then it resets the registers to
-    /// > the initial values specified above (see Section 6.2.2). Every line
-    /// > number program sequence must end with a DW_LNE_end_sequence instruction
-    /// > which creates a row whose address is that of the byte after the last
-    /// > target machine instruction of the sequence.
-    EndSequence,
-
-    /// > The DW_LNE_set_address opcode takes a single relocatable address as an
-    /// > operand. The size of the operand is the size of an address on the target
-    /// > machine. It sets the address register to the value given by the
-    /// > relocatable address and sets the op_index register to 0.
-    /// >
-    /// > All of the other line number program opcodes that affect the address
-    /// > register add a delta to it. This instruction stores a relocatable value
-    /// > into it instead.
-    SetAddress(u64),
-
-    /// Defines a new source file in the line number program and appends it to
-    /// the line number program header's list of source files.
-    DefineFile(FileEntry<R, Offset>),
-
-    /// "The DW_LNE_set_discriminator opcode takes a single parameter, an
-    /// unsigned LEB128 integer. It sets the discriminator register to the new
-    /// value."
-    SetDiscriminator(u64),
-
-    /// An unknown extended opcode and the slice of its unparsed operands.
-    UnknownExtended(constants::DwLne, R),
-}
-
-impl<R, Offset> LineInstruction<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    fn parse<'header>(
-        header: &'header LineProgramHeader<R>,
-        input: &mut R,
-    ) -> Result<LineInstruction<R>>
-    where
-        R: 'header,
-    {
-        let opcode = input.read_u8()?;
-        if opcode == 0 {
-            let length = input.read_uleb128().and_then(R::Offset::from_u64)?;
-            let mut instr_rest = input.split(length)?;
-            let opcode = instr_rest.read_u8()?;
-
-            match constants::DwLne(opcode) {
-                constants::DW_LNE_end_sequence => Ok(LineInstruction::EndSequence),
-
-                constants::DW_LNE_set_address => {
-                    let address = instr_rest.read_address(header.address_size())?;
-                    Ok(LineInstruction::SetAddress(address))
-                }
-
-                constants::DW_LNE_define_file => {
-                    if header.version() <= 4 {
-                        let path_name = instr_rest.read_null_terminated_slice()?;
-                        let entry = FileEntry::parse(&mut instr_rest, path_name)?;
-                        Ok(LineInstruction::DefineFile(entry))
-                    } else {
-                        Ok(LineInstruction::UnknownExtended(
-                            constants::DW_LNE_define_file,
-                            instr_rest,
-                        ))
-                    }
-                }
-
-                constants::DW_LNE_set_discriminator => {
-                    let discriminator = instr_rest.read_uleb128()?;
-                    Ok(LineInstruction::SetDiscriminator(discriminator))
-                }
-
-                otherwise => Ok(LineInstruction::UnknownExtended(otherwise, instr_rest)),
-            }
-        } else if opcode >= header.opcode_base {
-            Ok(LineInstruction::Special(opcode))
-        } else {
-            match constants::DwLns(opcode) {
-                constants::DW_LNS_copy => Ok(LineInstruction::Copy),
-
-                constants::DW_LNS_advance_pc => {
-                    let advance = input.read_uleb128()?;
-                    Ok(LineInstruction::AdvancePc(advance))
-                }
-
-                constants::DW_LNS_advance_line => {
-                    let increment = input.read_sleb128()?;
-                    Ok(LineInstruction::AdvanceLine(increment))
-                }
-
-                constants::DW_LNS_set_file => {
-                    let file = input.read_uleb128()?;
-                    Ok(LineInstruction::SetFile(file))
-                }
-
-                constants::DW_LNS_set_column => {
-                    let column = input.read_uleb128()?;
-                    Ok(LineInstruction::SetColumn(column))
-                }
-
-                constants::DW_LNS_negate_stmt => Ok(LineInstruction::NegateStatement),
-
-                constants::DW_LNS_set_basic_block => Ok(LineInstruction::SetBasicBlock),
-
-                constants::DW_LNS_const_add_pc => Ok(LineInstruction::ConstAddPc),
-
-                constants::DW_LNS_fixed_advance_pc => {
-                    let advance = input.read_u16()?;
-                    Ok(LineInstruction::FixedAddPc(advance))
-                }
-
-                constants::DW_LNS_set_prologue_end => Ok(LineInstruction::SetPrologueEnd),
-
-                constants::DW_LNS_set_epilogue_begin => Ok(LineInstruction::SetEpilogueBegin),
-
-                constants::DW_LNS_set_isa => {
-                    let isa = input.read_uleb128()?;
-                    Ok(LineInstruction::SetIsa(isa))
-                }
-
-                otherwise => {
-                    let mut opcode_lengths = header.standard_opcode_lengths().clone();
-                    opcode_lengths.skip(R::Offset::from_u8(opcode - 1))?;
-                    let num_args = opcode_lengths.read_u8()? as usize;
-                    match num_args {
-                        0 => Ok(LineInstruction::UnknownStandard0(otherwise)),
-                        1 => {
-                            let arg = input.read_uleb128()?;
-                            Ok(LineInstruction::UnknownStandard1(otherwise, arg))
-                        }
-                        _ => {
-                            let mut args = input.clone();
-                            for _ in 0..num_args {
-                                input.read_uleb128()?;
-                            }
-                            let len = input.offset_from(&args);
-                            args.truncate(len)?;
-                            Ok(LineInstruction::UnknownStandardN(otherwise, args))
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-impl<R, Offset> fmt::Display for LineInstruction<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> {
-        match *self {
-            LineInstruction::Special(opcode) => write!(f, "Special opcode {}", opcode),
-            LineInstruction::Copy => write!(f, "{}", constants::DW_LNS_copy),
-            LineInstruction::AdvancePc(advance) => {
-                write!(f, "{} by {}", constants::DW_LNS_advance_pc, advance)
-            }
-            LineInstruction::AdvanceLine(increment) => {
-                write!(f, "{} by {}", constants::DW_LNS_advance_line, increment)
-            }
-            LineInstruction::SetFile(file) => {
-                write!(f, "{} to {}", constants::DW_LNS_set_file, file)
-            }
-            LineInstruction::SetColumn(column) => {
-                write!(f, "{} to {}", constants::DW_LNS_set_column, column)
-            }
-            LineInstruction::NegateStatement => write!(f, "{}", constants::DW_LNS_negate_stmt),
-            LineInstruction::SetBasicBlock => write!(f, "{}", constants::DW_LNS_set_basic_block),
-            LineInstruction::ConstAddPc => write!(f, "{}", constants::DW_LNS_const_add_pc),
-            LineInstruction::FixedAddPc(advance) => {
-                write!(f, "{} by {}", constants::DW_LNS_fixed_advance_pc, advance)
-            }
-            LineInstruction::SetPrologueEnd => write!(f, "{}", constants::DW_LNS_set_prologue_end),
-            LineInstruction::SetEpilogueBegin => {
-                write!(f, "{}", constants::DW_LNS_set_epilogue_begin)
-            }
-            LineInstruction::SetIsa(isa) => write!(f, "{} to {}", constants::DW_LNS_set_isa, isa),
-            LineInstruction::UnknownStandard0(opcode) => write!(f, "Unknown {}", opcode),
-            LineInstruction::UnknownStandard1(opcode, arg) => {
-                write!(f, "Unknown {} with operand {}", opcode, arg)
-            }
-            LineInstruction::UnknownStandardN(opcode, ref args) => {
-                write!(f, "Unknown {} with operands {:?}", opcode, args)
-            }
-            LineInstruction::EndSequence => write!(f, "{}", constants::DW_LNE_end_sequence),
-            LineInstruction::SetAddress(address) => {
-                write!(f, "{} to {}", constants::DW_LNE_set_address, address)
-            }
-            LineInstruction::DefineFile(_) => write!(f, "{}", constants::DW_LNE_define_file),
-            LineInstruction::SetDiscriminator(discr) => {
-                write!(f, "{} to {}", constants::DW_LNE_set_discriminator, discr)
-            }
-            LineInstruction::UnknownExtended(opcode, _) => write!(f, "Unknown {}", opcode),
-        }
-    }
-}
-
-/// Deprecated. `OpcodesIter` has been renamed to `LineInstructions`.
-#[deprecated(note = "OpcodesIter has been renamed to LineInstructions, use that instead.")]
-pub type OpcodesIter<R> = LineInstructions<R>;
-
-/// An iterator yielding parsed instructions.
-///
-/// See
-/// [`LineProgramHeader::instructions`](./struct.LineProgramHeader.html#method.instructions)
-/// for more details.
-#[derive(Clone, Debug)]
-pub struct LineInstructions<R: Reader> {
-    input: R,
-}
-
-impl<R: Reader> LineInstructions<R> {
-    fn remove_trailing(&self, other: &LineInstructions<R>) -> Result<LineInstructions<R>> {
-        let offset = other.input.offset_from(&self.input);
-        let mut input = self.input.clone();
-        input.truncate(offset)?;
-        Ok(LineInstructions { input })
-    }
-}
-
-impl<R: Reader> LineInstructions<R> {
-    /// Advance the iterator and return the next instruction.
-    ///
-    /// Returns the newly parsed instruction as `Ok(Some(instruction))`. Returns
-    /// `Ok(None)` when iteration is complete and all instructions have already been
-    /// parsed and yielded. If an error occurs while parsing the next attribute,
-    /// then this error is returned as `Err(e)`, and all subsequent calls return
-    /// `Ok(None)`.
-    ///
-    /// Unfortunately, the `header` parameter means that this cannot be a
-    /// `FallibleIterator`.
-    #[allow(clippy::inline_always)]
-    #[inline(always)]
-    pub fn next_instruction(
-        &mut self,
-        header: &LineProgramHeader<R>,
-    ) -> Result<Option<LineInstruction<R>>> {
-        if self.input.is_empty() {
-            return Ok(None);
-        }
-
-        match LineInstruction::parse(header, &mut self.input) {
-            Ok(instruction) => Ok(Some(instruction)),
-            Err(e) => {
-                self.input.empty();
-                Err(e)
-            }
-        }
-    }
-}
-
-/// Deprecated. `LineNumberRow` has been renamed to `LineRow`.
-#[deprecated(note = "LineNumberRow has been renamed to LineRow, use that instead.")]
-pub type LineNumberRow = LineRow;
-
-/// A row in the line number program's resulting matrix.
-///
-/// Each row is a copy of the registers of the state machine, as defined in section 6.2.2.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct LineRow {
-    address: Wrapping<u64>,
-    op_index: Wrapping<u64>,
-    file: u64,
-    line: Wrapping<u64>,
-    column: u64,
-    is_stmt: bool,
-    basic_block: bool,
-    end_sequence: bool,
-    prologue_end: bool,
-    epilogue_begin: bool,
-    isa: u64,
-    discriminator: u64,
-}
-
-impl LineRow {
-    /// Create a line number row in the initial state for the given program.
-    pub fn new<R: Reader>(header: &LineProgramHeader<R>) -> Self {
-        LineRow {
-            // "At the beginning of each sequence within a line number program, the
-            // state of the registers is:" -- Section 6.2.2
-            address: Wrapping(0),
-            op_index: Wrapping(0),
-            file: 1,
-            line: Wrapping(1),
-            column: 0,
-            // "determined by default_is_stmt in the line number program header"
-            is_stmt: header.line_encoding.default_is_stmt,
-            basic_block: false,
-            end_sequence: false,
-            prologue_end: false,
-            epilogue_begin: false,
-            // "The isa value 0 specifies that the instruction set is the
-            // architecturally determined default instruction set. This may be fixed
-            // by the ABI, or it may be specified by other means, for example, by
-            // the object file description."
-            isa: 0,
-            discriminator: 0,
-        }
-    }
-
-    /// "The program-counter value corresponding to a machine instruction
-    /// generated by the compiler."
-    #[inline]
-    pub fn address(&self) -> u64 {
-        self.address.0
-    }
-
-    /// > An unsigned integer representing the index of an operation within a VLIW
-    /// > instruction. The index of the first operation is 0. For non-VLIW
-    /// > architectures, this register will always be 0.
-    /// >
-    /// > The address and op_index registers, taken together, form an operation
-    /// > pointer that can reference any individual operation with the
-    /// > instruction stream.
-    #[inline]
-    pub fn op_index(&self) -> u64 {
-        self.op_index.0
-    }
-
-    /// "An unsigned integer indicating the identity of the source file
-    /// corresponding to a machine instruction."
-    #[inline]
-    pub fn file_index(&self) -> u64 {
-        self.file
-    }
-
-    /// The source file corresponding to the current machine instruction.
-    #[inline]
-    pub fn file<'header, R: Reader>(
-        &self,
-        header: &'header LineProgramHeader<R>,
-    ) -> Option<&'header FileEntry<R>> {
-        header.file(self.file)
-    }
-
-    /// "An unsigned integer indicating a source line number. Lines are numbered
-    /// beginning at 1. The compiler may emit the value 0 in cases where an
-    /// instruction cannot be attributed to any source line."
-    #[inline]
-    pub fn line(&self) -> Option<u64> {
-        if self.line.0 == 0 {
-            None
-        } else {
-            Some(self.line.0)
-        }
-    }
-
-    /// "An unsigned integer indicating a column number within a source
-    /// line. Columns are numbered beginning at 1. The value 0 is reserved to
-    /// indicate that a statement begins at the “left edge� of the line."
-    #[inline]
-    pub fn column(&self) -> ColumnType {
-        if self.column == 0 {
-            ColumnType::LeftEdge
-        } else {
-            ColumnType::Column(self.column)
-        }
-    }
-
-    /// "A boolean indicating that the current instruction is a recommended
-    /// breakpoint location. A recommended breakpoint location is intended to
-    /// “represent� a line, a statement and/or a semantically distinct subpart
-    /// of a statement."
-    #[inline]
-    pub fn is_stmt(&self) -> bool {
-        self.is_stmt
-    }
-
-    /// "A boolean indicating that the current instruction is the beginning of a
-    /// basic block."
-    #[inline]
-    pub fn basic_block(&self) -> bool {
-        self.basic_block
-    }
-
-    /// "A boolean indicating that the current address is that of the first byte
-    /// after the end of a sequence of target machine instructions. end_sequence
-    /// terminates a sequence of lines; therefore other information in the same
-    /// row is not meaningful."
-    #[inline]
-    pub fn end_sequence(&self) -> bool {
-        self.end_sequence
-    }
-
-    /// "A boolean indicating that the current address is one (of possibly many)
-    /// where execution should be suspended for an entry breakpoint of a
-    /// function."
-    #[inline]
-    pub fn prologue_end(&self) -> bool {
-        self.prologue_end
-    }
-
-    /// "A boolean indicating that the current address is one (of possibly many)
-    /// where execution should be suspended for an exit breakpoint of a
-    /// function."
-    #[inline]
-    pub fn epilogue_begin(&self) -> bool {
-        self.epilogue_begin
-    }
-
-    /// Tag for the current instruction set architecture.
-    ///
-    /// > An unsigned integer whose value encodes the applicable instruction set
-    /// > architecture for the current instruction.
-    /// >
-    /// > The encoding of instruction sets should be shared by all users of a
-    /// > given architecture. It is recommended that this encoding be defined by
-    /// > the ABI authoring committee for each architecture.
-    #[inline]
-    pub fn isa(&self) -> u64 {
-        self.isa
-    }
-
-    /// "An unsigned integer identifying the block to which the current
-    /// instruction belongs. Discriminator values are assigned arbitrarily by
-    /// the DWARF producer and serve to distinguish among multiple blocks that
-    /// may all be associated with the same source file, line, and column. Where
-    /// only one block exists for a given source position, the discriminator
-    /// value should be zero."
-    #[inline]
-    pub fn discriminator(&self) -> u64 {
-        self.discriminator
-    }
-
-    /// Execute the given instruction, and return true if a new row in the
-    /// line number matrix needs to be generated.
-    ///
-    /// Unknown opcodes are treated as no-ops.
-    #[inline]
-    pub fn execute<R, Program>(
-        &mut self,
-        instruction: LineInstruction<R>,
-        program: &mut Program,
-    ) -> bool
-    where
-        Program: LineProgram<R>,
-        R: Reader,
-    {
-        match instruction {
-            LineInstruction::Special(opcode) => {
-                self.exec_special_opcode(opcode, program.header());
-                true
-            }
-
-            LineInstruction::Copy => true,
-
-            LineInstruction::AdvancePc(operation_advance) => {
-                self.apply_operation_advance(operation_advance, program.header());
-                false
-            }
-
-            LineInstruction::AdvanceLine(line_increment) => {
-                self.apply_line_advance(line_increment);
-                false
-            }
-
-            LineInstruction::SetFile(file) => {
-                self.file = file;
-                false
-            }
-
-            LineInstruction::SetColumn(column) => {
-                self.column = column;
-                false
-            }
-
-            LineInstruction::NegateStatement => {
-                self.is_stmt = !self.is_stmt;
-                false
-            }
-
-            LineInstruction::SetBasicBlock => {
-                self.basic_block = true;
-                false
-            }
-
-            LineInstruction::ConstAddPc => {
-                let adjusted = self.adjust_opcode(255, program.header());
-                let operation_advance = adjusted / program.header().line_encoding.line_range;
-                self.apply_operation_advance(u64::from(operation_advance), program.header());
-                false
-            }
-
-            LineInstruction::FixedAddPc(operand) => {
-                self.address += Wrapping(u64::from(operand));
-                self.op_index.0 = 0;
-                false
-            }
-
-            LineInstruction::SetPrologueEnd => {
-                self.prologue_end = true;
-                false
-            }
-
-            LineInstruction::SetEpilogueBegin => {
-                self.epilogue_begin = true;
-                false
-            }
-
-            LineInstruction::SetIsa(isa) => {
-                self.isa = isa;
-                false
-            }
-
-            LineInstruction::EndSequence => {
-                self.end_sequence = true;
-                true
-            }
-
-            LineInstruction::SetAddress(address) => {
-                self.address.0 = address;
-                self.op_index.0 = 0;
-                false
-            }
-
-            LineInstruction::DefineFile(entry) => {
-                program.add_file(entry);
-                false
-            }
-
-            LineInstruction::SetDiscriminator(discriminator) => {
-                self.discriminator = discriminator;
-                false
-            }
-
-            // Compatibility with future opcodes.
-            LineInstruction::UnknownStandard0(_)
-            | LineInstruction::UnknownStandard1(_, _)
-            | LineInstruction::UnknownStandardN(_, _)
-            | LineInstruction::UnknownExtended(_, _) => false,
-        }
-    }
-
-    /// Perform any reset that was required after copying the previous row.
-    #[inline]
-    pub fn reset<R: Reader>(&mut self, header: &LineProgramHeader<R>) {
-        if self.end_sequence {
-            // Previous instruction was EndSequence, so reset everything
-            // as specified in Section 6.2.5.3.
-            *self = Self::new(header);
-        } else {
-            // Previous instruction was one of:
-            // - Special - specified in Section 6.2.5.1, steps 4-7
-            // - Copy - specified in Section 6.2.5.2
-            // The reset behaviour is the same in both cases.
-            self.discriminator = 0;
-            self.basic_block = false;
-            self.prologue_end = false;
-            self.epilogue_begin = false;
-        }
-    }
-
-    /// Step 1 of section 6.2.5.1
-    fn apply_line_advance(&mut self, line_increment: i64) {
-        if line_increment < 0 {
-            let decrement = -line_increment as u64;
-            if decrement <= self.line.0 {
-                self.line.0 -= decrement;
-            } else {
-                self.line.0 = 0;
-            }
-        } else {
-            self.line += Wrapping(line_increment as u64);
-        }
-    }
-
-    /// Step 2 of section 6.2.5.1
-    fn apply_operation_advance<R: Reader>(
-        &mut self,
-        operation_advance: u64,
-        header: &LineProgramHeader<R>,
-    ) {
-        let operation_advance = Wrapping(operation_advance);
-
-        let minimum_instruction_length = u64::from(header.line_encoding.minimum_instruction_length);
-        let minimum_instruction_length = Wrapping(minimum_instruction_length);
-
-        let maximum_operations_per_instruction =
-            u64::from(header.line_encoding.maximum_operations_per_instruction);
-        let maximum_operations_per_instruction = Wrapping(maximum_operations_per_instruction);
-
-        if maximum_operations_per_instruction.0 == 1 {
-            self.address += minimum_instruction_length * operation_advance;
-            self.op_index.0 = 0;
-        } else {
-            let op_index_with_advance = self.op_index + operation_advance;
-            self.address += minimum_instruction_length
-                * (op_index_with_advance / maximum_operations_per_instruction);
-            self.op_index = op_index_with_advance % maximum_operations_per_instruction;
-        }
-    }
-
-    #[inline]
-    fn adjust_opcode<R: Reader>(&self, opcode: u8, header: &LineProgramHeader<R>) -> u8 {
-        opcode - header.opcode_base
-    }
-
-    /// Section 6.2.5.1
-    fn exec_special_opcode<R: Reader>(&mut self, opcode: u8, header: &LineProgramHeader<R>) {
-        let adjusted_opcode = self.adjust_opcode(opcode, header);
-
-        let line_range = header.line_encoding.line_range;
-        let line_advance = adjusted_opcode % line_range;
-        let operation_advance = adjusted_opcode / line_range;
-
-        // Step 1
-        let line_base = i64::from(header.line_encoding.line_base);
-        self.apply_line_advance(line_base + i64::from(line_advance));
-
-        // Step 2
-        self.apply_operation_advance(u64::from(operation_advance), header);
-    }
-}
-
-/// The type of column that a row is referring to.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub enum ColumnType {
-    /// The `LeftEdge` means that the statement begins at the start of the new
-    /// line.
-    LeftEdge,
-    /// A column number, whose range begins at 1.
-    Column(u64),
-}
-
-/// Deprecated. `LineNumberSequence` has been renamed to `LineSequence`.
-#[deprecated(note = "LineNumberSequence has been renamed to LineSequence, use that instead.")]
-pub type LineNumberSequence<R> = LineSequence<R>;
-
-/// A sequence within a line number program.  A sequence, as defined in section
-/// 6.2.5 of the standard, is a linear subset of a line number program within
-/// which addresses are monotonically increasing.
-#[derive(Clone, Debug)]
-pub struct LineSequence<R: Reader> {
-    /// The first address that is covered by this sequence within the line number
-    /// program.
-    pub start: u64,
-    /// The first address that is *not* covered by this sequence within the line
-    /// number program.
-    pub end: u64,
-    instructions: LineInstructions<R>,
-}
-
-/// Deprecated. `LineNumberProgramHeader` has been renamed to `LineProgramHeader`.
-#[deprecated(
-    note = "LineNumberProgramHeader has been renamed to LineProgramHeader, use that instead."
-)]
-pub type LineNumberProgramHeader<R, Offset> = LineProgramHeader<R, Offset>;
-
-/// A header for a line number program in the `.debug_line` section, as defined
-/// in section 6.2.4 of the standard.
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct LineProgramHeader<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    encoding: Encoding,
-    offset: DebugLineOffset<Offset>,
-    unit_length: Offset,
-
-    header_length: Offset,
-
-    line_encoding: LineEncoding,
-
-    /// "The number assigned to the first special opcode."
-    opcode_base: u8,
-
-    /// "This array specifies the number of LEB128 operands for each of the
-    /// standard opcodes. The first element of the array corresponds to the
-    /// opcode whose value is 1, and the last element corresponds to the opcode
-    /// whose value is `opcode_base - 1`."
-    standard_opcode_lengths: R,
-
-    /// "A sequence of directory entry format descriptions."
-    directory_entry_format: Vec<FileEntryFormat>,
-
-    /// > Entries in this sequence describe each path that was searched for
-    /// > included source files in this compilation. (The paths include those
-    /// > directories specified explicitly by the user for the compiler to search
-    /// > and those the compiler searches without explicit direction.) Each path
-    /// > entry is either a full path name or is relative to the current directory
-    /// > of the compilation.
-    /// >
-    /// > The last entry is followed by a single null byte.
-    include_directories: Vec<AttributeValue<R, Offset>>,
-
-    /// "A sequence of file entry format descriptions."
-    file_name_entry_format: Vec<FileEntryFormat>,
-
-    /// "Entries in this sequence describe source files that contribute to the
-    /// line number information for this compilation unit or is used in other
-    /// contexts."
-    file_names: Vec<FileEntry<R, Offset>>,
-
-    /// The encoded line program instructions.
-    program_buf: R,
-
-    /// The current directory of the compilation.
-    comp_dir: Option<R>,
-
-    /// The primary source file.
-    comp_file: Option<FileEntry<R, Offset>>,
-}
-
-impl<R, Offset> LineProgramHeader<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Return the offset of the line number program header in the `.debug_line` section.
-    pub fn offset(&self) -> DebugLineOffset<R::Offset> {
-        self.offset
-    }
-
-    /// Return the length of the line number program and header, not including
-    /// the length of the encoded length itself.
-    pub fn unit_length(&self) -> R::Offset {
-        self.unit_length
-    }
-
-    /// Return the encoding parameters for this header's line program.
-    pub fn encoding(&self) -> Encoding {
-        self.encoding
-    }
-
-    /// Get the version of this header's line program.
-    pub fn version(&self) -> u16 {
-        self.encoding.version
-    }
-
-    /// Get the length of the encoded line number program header, not including
-    /// the length of the encoded length itself.
-    pub fn header_length(&self) -> R::Offset {
-        self.header_length
-    }
-
-    /// Get the size in bytes of a target machine address.
-    pub fn address_size(&self) -> u8 {
-        self.encoding.address_size
-    }
-
-    /// Whether this line program is encoded in 64- or 32-bit DWARF.
-    pub fn format(&self) -> Format {
-        self.encoding.format
-    }
-
-    /// Get the line encoding parameters for this header's line program.
-    pub fn line_encoding(&self) -> LineEncoding {
-        self.line_encoding
-    }
-
-    /// Get the minimum instruction length any instruction in this header's line
-    /// program may have.
-    pub fn minimum_instruction_length(&self) -> u8 {
-        self.line_encoding.minimum_instruction_length
-    }
-
-    /// Get the maximum number of operations each instruction in this header's
-    /// line program may have.
-    pub fn maximum_operations_per_instruction(&self) -> u8 {
-        self.line_encoding.maximum_operations_per_instruction
-    }
-
-    /// Get the default value of the `is_stmt` register for this header's line
-    /// program.
-    pub fn default_is_stmt(&self) -> bool {
-        self.line_encoding.default_is_stmt
-    }
-
-    /// Get the line base for this header's line program.
-    pub fn line_base(&self) -> i8 {
-        self.line_encoding.line_base
-    }
-
-    /// Get the line range for this header's line program.
-    pub fn line_range(&self) -> u8 {
-        self.line_encoding.line_range
-    }
-
-    /// Get opcode base for this header's line program.
-    pub fn opcode_base(&self) -> u8 {
-        self.opcode_base
-    }
-
-    /// An array of `u8` that specifies the number of LEB128 operands for
-    /// each of the standard opcodes.
-    pub fn standard_opcode_lengths(&self) -> &R {
-        &self.standard_opcode_lengths
-    }
-
-    /// Get the format of a directory entry.
-    pub fn directory_entry_format(&self) -> &[FileEntryFormat] {
-        &self.directory_entry_format[..]
-    }
-
-    /// Get the set of include directories for this header's line program.
-    ///
-    /// For DWARF version <= 4, the compilation's current directory is not included
-    /// in the return value, but is implicitly considered to be in the set per spec.
-    pub fn include_directories(&self) -> &[AttributeValue<R, Offset>] {
-        &self.include_directories[..]
-    }
-
-    /// The include directory with the given directory index.
-    ///
-    /// A directory index of 0 corresponds to the compilation unit directory.
-    pub fn directory(&self, directory: u64) -> Option<AttributeValue<R, Offset>> {
-        if self.encoding.version <= 4 {
-            if directory == 0 {
-                self.comp_dir.clone().map(AttributeValue::String)
-            } else {
-                let directory = directory as usize - 1;
-                self.include_directories.get(directory).cloned()
-            }
-        } else {
-            self.include_directories.get(directory as usize).cloned()
-        }
-    }
-
-    /// Get the format of a file name entry.
-    pub fn file_name_entry_format(&self) -> &[FileEntryFormat] {
-        &self.file_name_entry_format[..]
-    }
-
-    /// Return true if the file entries may have valid timestamps.
-    ///
-    /// Only returns false if we definitely know that all timestamp fields
-    /// are invalid.
-    pub fn file_has_timestamp(&self) -> bool {
-        self.encoding.version <= 4
-            || self
-                .file_name_entry_format
-                .iter()
-                .any(|x| x.content_type == constants::DW_LNCT_timestamp)
-    }
-
-    /// Return true if the file entries may have valid sizes.
-    ///
-    /// Only returns false if we definitely know that all size fields
-    /// are invalid.
-    pub fn file_has_size(&self) -> bool {
-        self.encoding.version <= 4
-            || self
-                .file_name_entry_format
-                .iter()
-                .any(|x| x.content_type == constants::DW_LNCT_size)
-    }
-
-    /// Return true if the file name entry format contains an MD5 field.
-    pub fn file_has_md5(&self) -> bool {
-        self.file_name_entry_format
-            .iter()
-            .any(|x| x.content_type == constants::DW_LNCT_MD5)
-    }
-
-    /// Get the list of source files that appear in this header's line program.
-    pub fn file_names(&self) -> &[FileEntry<R, Offset>] {
-        &self.file_names[..]
-    }
-
-    /// The source file with the given file index.
-    ///
-    /// A file index of 0 corresponds to the compilation unit file.
-    /// Note that a file index of 0 is invalid for DWARF version <= 4,
-    /// but we support it anyway.
-    pub fn file(&self, file: u64) -> Option<&FileEntry<R, Offset>> {
-        if self.encoding.version <= 4 {
-            if file == 0 {
-                self.comp_file.as_ref()
-            } else {
-                let file = file as usize - 1;
-                self.file_names.get(file)
-            }
-        } else {
-            self.file_names.get(file as usize)
-        }
-    }
-
-    /// Get the raw, un-parsed `EndianSlice` containing this header's line number
-    /// program.
-    ///
-    /// ```
-    /// # fn foo() {
-    /// use gimli::{LineProgramHeader, EndianSlice, NativeEndian};
-    ///
-    /// fn get_line_number_program_header<'a>() -> LineProgramHeader<EndianSlice<'a, NativeEndian>> {
-    ///     // Get a line number program header from some offset in a
-    ///     // `.debug_line` section...
-    /// #   unimplemented!()
-    /// }
-    ///
-    /// let header = get_line_number_program_header();
-    /// let raw_program = header.raw_program_buf();
-    /// println!("The length of the raw program in bytes is {}", raw_program.len());
-    /// # }
-    /// ```
-    pub fn raw_program_buf(&self) -> R {
-        self.program_buf.clone()
-    }
-
-    /// Iterate over the instructions in this header's line number program, parsing
-    /// them as we go.
-    pub fn instructions(&self) -> LineInstructions<R> {
-        LineInstructions {
-            input: self.program_buf.clone(),
-        }
-    }
-
-    fn parse(
-        input: &mut R,
-        offset: DebugLineOffset<Offset>,
-        mut address_size: u8,
-        mut comp_dir: Option<R>,
-        comp_name: Option<R>,
-    ) -> Result<LineProgramHeader<R, Offset>> {
-        let (unit_length, format) = input.read_initial_length()?;
-        let rest = &mut input.split(unit_length)?;
-
-        let version = rest.read_u16()?;
-        if version < 2 || version > 5 {
-            return Err(Error::UnknownVersion(u64::from(version)));
-        }
-
-        if version >= 5 {
-            address_size = rest.read_u8()?;
-            let segment_selector_size = rest.read_u8()?;
-            if segment_selector_size != 0 {
-                return Err(Error::UnsupportedSegmentSize);
-            }
-        }
-
-        let encoding = Encoding {
-            format,
-            version,
-            address_size,
-        };
-
-        let header_length = rest.read_length(format)?;
-
-        let mut program_buf = rest.clone();
-        program_buf.skip(header_length)?;
-        rest.truncate(header_length)?;
-
-        let minimum_instruction_length = rest.read_u8()?;
-        if minimum_instruction_length == 0 {
-            return Err(Error::MinimumInstructionLengthZero);
-        }
-
-        // This field did not exist before DWARF 4, but is specified to be 1 for
-        // non-VLIW architectures, which makes it a no-op.
-        let maximum_operations_per_instruction = if version >= 4 { rest.read_u8()? } else { 1 };
-        if maximum_operations_per_instruction == 0 {
-            return Err(Error::MaximumOperationsPerInstructionZero);
-        }
-
-        let default_is_stmt = rest.read_u8()? != 0;
-        let line_base = rest.read_i8()?;
-        let line_range = rest.read_u8()?;
-        if line_range == 0 {
-            return Err(Error::LineRangeZero);
-        }
-        let line_encoding = LineEncoding {
-            minimum_instruction_length,
-            maximum_operations_per_instruction,
-            default_is_stmt,
-            line_base,
-            line_range,
-        };
-
-        let opcode_base = rest.read_u8()?;
-        if opcode_base == 0 {
-            return Err(Error::OpcodeBaseZero);
-        }
-
-        let standard_opcode_count = R::Offset::from_u8(opcode_base - 1);
-        let standard_opcode_lengths = rest.split(standard_opcode_count)?;
-
-        let directory_entry_format;
-        let mut include_directories = Vec::new();
-        if version <= 4 {
-            directory_entry_format = Vec::new();
-            loop {
-                let directory = rest.read_null_terminated_slice()?;
-                if directory.is_empty() {
-                    break;
-                }
-                include_directories.push(AttributeValue::String(directory));
-            }
-        } else {
-            comp_dir = None;
-            directory_entry_format = FileEntryFormat::parse(rest)?;
-            let count = rest.read_uleb128()?;
-            for _ in 0..count {
-                include_directories.push(parse_directory_v5(
-                    rest,
-                    encoding,
-                    &directory_entry_format,
-                )?);
-            }
-        }
-
-        let comp_file;
-        let file_name_entry_format;
-        let mut file_names = Vec::new();
-        if version <= 4 {
-            comp_file = comp_name.map(|name| FileEntry {
-                path_name: AttributeValue::String(name),
-                directory_index: 0,
-                timestamp: 0,
-                size: 0,
-                md5: [0; 16],
-            });
-
-            file_name_entry_format = Vec::new();
-            loop {
-                let path_name = rest.read_null_terminated_slice()?;
-                if path_name.is_empty() {
-                    break;
-                }
-                file_names.push(FileEntry::parse(rest, path_name)?);
-            }
-        } else {
-            comp_file = None;
-            file_name_entry_format = FileEntryFormat::parse(rest)?;
-            let count = rest.read_uleb128()?;
-            for _ in 0..count {
-                file_names.push(parse_file_v5(rest, encoding, &file_name_entry_format)?);
-            }
-        }
-
-        let header = LineProgramHeader {
-            encoding,
-            offset,
-            unit_length,
-            header_length,
-            line_encoding,
-            opcode_base,
-            standard_opcode_lengths,
-            directory_entry_format,
-            include_directories,
-            file_name_entry_format,
-            file_names,
-            program_buf,
-            comp_dir,
-            comp_file,
-        };
-        Ok(header)
-    }
-}
-
-/// Deprecated. `IncompleteLineNumberProgram` has been renamed to `IncompleteLineProgram`.
-#[deprecated(
-    note = "IncompleteLineNumberProgram has been renamed to IncompleteLineProgram, use that instead."
-)]
-pub type IncompleteLineNumberProgram<R, Offset> = IncompleteLineProgram<R, Offset>;
-
-/// A line number program that has not been run to completion.
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct IncompleteLineProgram<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    header: LineProgramHeader<R, Offset>,
-}
-
-impl<R, Offset> IncompleteLineProgram<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Retrieve the `LineProgramHeader` for this program.
-    pub fn header(&self) -> &LineProgramHeader<R, Offset> {
-        &self.header
-    }
-
-    /// Construct a new `LineRows` for executing this program to iterate
-    /// over rows in the line information matrix.
-    pub fn rows(self) -> OneShotLineRows<R, Offset> {
-        OneShotLineRows::new(self)
-    }
-
-    /// Execute the line number program, completing the `IncompleteLineProgram`
-    /// into a `CompleteLineProgram` and producing an array of sequences within
-    /// the line number program that can later be used with
-    /// `CompleteLineProgram::resume_from`.
-    ///
-    /// ```
-    /// # fn foo() {
-    /// use gimli::{IncompleteLineProgram, EndianSlice, NativeEndian};
-    ///
-    /// fn get_line_number_program<'a>() -> IncompleteLineProgram<EndianSlice<'a, NativeEndian>> {
-    ///     // Get a line number program from some offset in a
-    ///     // `.debug_line` section...
-    /// #   unimplemented!()
-    /// }
-    ///
-    /// let program = get_line_number_program();
-    /// let (program, sequences) = program.sequences().unwrap();
-    /// println!("There are {} sequences in this line number program", sequences.len());
-    /// # }
-    /// ```
-    #[allow(clippy::type_complexity)]
-    pub fn sequences(self) -> Result<(CompleteLineProgram<R, Offset>, Vec<LineSequence<R>>)> {
-        let mut sequences = Vec::new();
-        let mut rows = self.rows();
-        let mut instructions = rows.instructions.clone();
-        let mut sequence_start_addr = None;
-        loop {
-            let sequence_end_addr;
-            if rows.next_row()?.is_none() {
-                break;
-            }
-
-            let row = &rows.row;
-            if row.end_sequence() {
-                sequence_end_addr = row.address();
-            } else if sequence_start_addr.is_none() {
-                sequence_start_addr = Some(row.address());
-                continue;
-            } else {
-                continue;
-            }
-
-            // We just finished a sequence.
-            sequences.push(LineSequence {
-                // In theory one could have multiple DW_LNE_end_sequence instructions
-                // in a row.
-                start: sequence_start_addr.unwrap_or(0),
-                end: sequence_end_addr,
-                instructions: instructions.remove_trailing(&rows.instructions)?,
-            });
-            sequence_start_addr = None;
-            instructions = rows.instructions.clone();
-        }
-
-        let program = CompleteLineProgram {
-            header: rows.program.header,
-        };
-        Ok((program, sequences))
-    }
-}
-
-/// Deprecated. `CompleteLineNumberProgram` has been renamed to `CompleteLineProgram`.
-#[deprecated(
-    note = "CompleteLineNumberProgram has been renamed to CompleteLineProgram, use that instead."
-)]
-pub type CompleteLineNumberProgram<R, Offset> = CompleteLineProgram<R, Offset>;
-
-/// A line number program that has previously been run to completion.
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct CompleteLineProgram<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    header: LineProgramHeader<R, Offset>,
-}
-
-impl<R, Offset> CompleteLineProgram<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Retrieve the `LineProgramHeader` for this program.
-    pub fn header(&self) -> &LineProgramHeader<R, Offset> {
-        &self.header
-    }
-
-    /// Construct a new `LineRows` for executing the subset of the line
-    /// number program identified by 'sequence' and  generating the line information
-    /// matrix.
-    ///
-    /// ```
-    /// # fn foo() {
-    /// use gimli::{IncompleteLineProgram, EndianSlice, NativeEndian};
-    ///
-    /// fn get_line_number_program<'a>() -> IncompleteLineProgram<EndianSlice<'a, NativeEndian>> {
-    ///     // Get a line number program from some offset in a
-    ///     // `.debug_line` section...
-    /// #   unimplemented!()
-    /// }
-    ///
-    /// let program = get_line_number_program();
-    /// let (program, sequences) = program.sequences().unwrap();
-    /// for sequence in &sequences {
-    ///     let mut sm = program.resume_from(sequence);
-    /// }
-    /// # }
-    /// ```
-    pub fn resume_from<'program>(
-        &'program self,
-        sequence: &LineSequence<R>,
-    ) -> ResumedLineRows<'program, R, Offset> {
-        ResumedLineRows::resume(self, sequence)
-    }
-}
-
-/// An entry in the `LineProgramHeader`'s `file_names` set.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct FileEntry<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    path_name: AttributeValue<R, Offset>,
-    directory_index: u64,
-    timestamp: u64,
-    size: u64,
-    md5: [u8; 16],
-}
-
-impl<R, Offset> FileEntry<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    // version 2-4
-    fn parse(input: &mut R, path_name: R) -> Result<FileEntry<R, Offset>> {
-        let directory_index = input.read_uleb128()?;
-        let timestamp = input.read_uleb128()?;
-        let size = input.read_uleb128()?;
-
-        let entry = FileEntry {
-            path_name: AttributeValue::String(path_name),
-            directory_index,
-            timestamp,
-            size,
-            md5: [0; 16],
-        };
-
-        Ok(entry)
-    }
-
-    /// > A slice containing the full or relative path name of
-    /// > a source file. If the entry contains a file name or a relative path
-    /// > name, the file is located relative to either the compilation directory
-    /// > (as specified by the DW_AT_comp_dir attribute given in the compilation
-    /// > unit) or one of the directories in the include_directories section.
-    pub fn path_name(&self) -> AttributeValue<R, Offset> {
-        self.path_name.clone()
-    }
-
-    /// > An unsigned LEB128 number representing the directory index of the
-    /// > directory in which the file was found.
-    /// >
-    /// > ...
-    /// >
-    /// > The directory index represents an entry in the include_directories
-    /// > section of the line number program header. The index is 0 if the file
-    /// > was found in the current directory of the compilation, 1 if it was found
-    /// > in the first directory in the include_directories section, and so
-    /// > on. The directory index is ignored for file names that represent full
-    /// > path names.
-    pub fn directory_index(&self) -> u64 {
-        self.directory_index
-    }
-
-    /// Get this file's directory.
-    ///
-    /// A directory index of 0 corresponds to the compilation unit directory.
-    pub fn directory(&self, header: &LineProgramHeader<R>) -> Option<AttributeValue<R, Offset>> {
-        header.directory(self.directory_index)
-    }
-
-    /// The implementation-defined time of last modification of the file,
-    /// or 0 if not available.
-    pub fn timestamp(&self) -> u64 {
-        self.timestamp
-    }
-
-    /// "An unsigned LEB128 number representing the time of last modification of
-    /// the file, or 0 if not available."
-    // Terminology changed in DWARF version 5.
-    #[doc(hidden)]
-    pub fn last_modification(&self) -> u64 {
-        self.timestamp
-    }
-
-    /// The size of the file in bytes, or 0 if not available.
-    pub fn size(&self) -> u64 {
-        self.size
-    }
-
-    /// "An unsigned LEB128 number representing the length in bytes of the file,
-    /// or 0 if not available."
-    // Terminology changed in DWARF version 5.
-    #[doc(hidden)]
-    pub fn length(&self) -> u64 {
-        self.size
-    }
-
-    /// A 16-byte MD5 digest of the file contents.
-    ///
-    /// Only valid if `LineProgramHeader::file_has_md5` returns `true`.
-    pub fn md5(&self) -> &[u8; 16] {
-        &self.md5
-    }
-}
-
-/// The format of a component of an include directory or file name entry.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct FileEntryFormat {
-    /// The type of information that is represented by the component.
-    pub content_type: constants::DwLnct,
-
-    /// The encoding form of the component value.
-    pub form: constants::DwForm,
-}
-
-impl FileEntryFormat {
-    fn parse<R: Reader>(input: &mut R) -> Result<Vec<FileEntryFormat>> {
-        let format_count = input.read_u8()? as usize;
-        let mut format = Vec::with_capacity(format_count);
-        let mut path_count = 0;
-        for _ in 0..format_count {
-            let content_type = input.read_uleb128()?;
-            let content_type = if content_type > u64::from(u16::max_value()) {
-                constants::DwLnct(u16::max_value())
-            } else {
-                constants::DwLnct(content_type as u16)
-            };
-            if content_type == constants::DW_LNCT_path {
-                path_count += 1;
-            }
-
-            let form = constants::DwForm(input.read_uleb128_u16()?);
-
-            format.push(FileEntryFormat { content_type, form });
-        }
-        if path_count != 1 {
-            return Err(Error::MissingFileEntryFormatPath);
-        }
-        Ok(format)
-    }
-}
-
-fn parse_directory_v5<R: Reader>(
-    input: &mut R,
-    encoding: Encoding,
-    formats: &[FileEntryFormat],
-) -> Result<AttributeValue<R>> {
-    let mut path_name = None;
-
-    for format in formats {
-        let value = parse_attribute(input, encoding, format.form)?;
-        if format.content_type == constants::DW_LNCT_path {
-            path_name = Some(value);
-        }
-    }
-
-    Ok(path_name.unwrap())
-}
-
-fn parse_file_v5<R: Reader>(
-    input: &mut R,
-    encoding: Encoding,
-    formats: &[FileEntryFormat],
-) -> Result<FileEntry<R>> {
-    let mut path_name = None;
-    let mut directory_index = 0;
-    let mut timestamp = 0;
-    let mut size = 0;
-    let mut md5 = [0; 16];
-
-    for format in formats {
-        let value = parse_attribute(input, encoding, format.form)?;
-        match format.content_type {
-            constants::DW_LNCT_path => path_name = Some(value),
-            constants::DW_LNCT_directory_index => {
-                if let Some(value) = value.udata_value() {
-                    directory_index = value;
-                }
-            }
-            constants::DW_LNCT_timestamp => {
-                if let Some(value) = value.udata_value() {
-                    timestamp = value;
-                }
-            }
-            constants::DW_LNCT_size => {
-                if let Some(value) = value.udata_value() {
-                    size = value;
-                }
-            }
-            constants::DW_LNCT_MD5 => {
-                if let AttributeValue::Block(mut value) = value {
-                    if value.len().into_u64() == 16 {
-                        md5 = value.read_u8_array()?;
-                    }
-                }
-            }
-            // Ignore unknown content types.
-            _ => {}
-        }
-    }
-
-    Ok(FileEntry {
-        path_name: path_name.unwrap(),
-        directory_index,
-        timestamp,
-        size,
-        md5,
-    })
-}
-
-// TODO: this should be shared with unit::parse_attribute(), but that is hard to do.
-fn parse_attribute<R: Reader>(
-    input: &mut R,
-    encoding: Encoding,
-    form: constants::DwForm,
-) -> Result<AttributeValue<R>> {
-    Ok(match form {
-        constants::DW_FORM_block1 => {
-            let len = input.read_u8().map(R::Offset::from_u8)?;
-            let block = input.split(len)?;
-            AttributeValue::Block(block)
-        }
-        constants::DW_FORM_block2 => {
-            let len = input.read_u16().map(R::Offset::from_u16)?;
-            let block = input.split(len)?;
-            AttributeValue::Block(block)
-        }
-        constants::DW_FORM_block4 => {
-            let len = input.read_u32().map(R::Offset::from_u32)?;
-            let block = input.split(len)?;
-            AttributeValue::Block(block)
-        }
-        constants::DW_FORM_block => {
-            let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
-            let block = input.split(len)?;
-            AttributeValue::Block(block)
-        }
-        constants::DW_FORM_data1 => {
-            let data = input.read_u8()?;
-            AttributeValue::Data1(data)
-        }
-        constants::DW_FORM_data2 => {
-            let data = input.read_u16()?;
-            AttributeValue::Data2(data)
-        }
-        constants::DW_FORM_data4 => {
-            let data = input.read_u32()?;
-            AttributeValue::Data4(data)
-        }
-        constants::DW_FORM_data8 => {
-            let data = input.read_u64()?;
-            AttributeValue::Data8(data)
-        }
-        constants::DW_FORM_data16 => {
-            let block = input.split(R::Offset::from_u8(16))?;
-            AttributeValue::Block(block)
-        }
-        constants::DW_FORM_udata => {
-            let data = input.read_uleb128()?;
-            AttributeValue::Udata(data)
-        }
-        constants::DW_FORM_sdata => {
-            let data = input.read_sleb128()?;
-            AttributeValue::Sdata(data)
-        }
-        constants::DW_FORM_flag => {
-            let present = input.read_u8()?;
-            AttributeValue::Flag(present != 0)
-        }
-        constants::DW_FORM_sec_offset => {
-            let offset = input.read_offset(encoding.format)?;
-            AttributeValue::SecOffset(offset)
-        }
-        constants::DW_FORM_string => {
-            let string = input.read_null_terminated_slice()?;
-            AttributeValue::String(string)
-        }
-        constants::DW_FORM_strp => {
-            let offset = input.read_offset(encoding.format)?;
-            AttributeValue::DebugStrRef(DebugStrOffset(offset))
-        }
-        constants::DW_FORM_strp_sup | constants::DW_FORM_GNU_strp_alt => {
-            let offset = input.read_offset(encoding.format)?;
-            AttributeValue::DebugStrRefSup(DebugStrOffset(offset))
-        }
-        constants::DW_FORM_line_strp => {
-            let offset = input.read_offset(encoding.format)?;
-            AttributeValue::DebugLineStrRef(DebugLineStrOffset(offset))
-        }
-        constants::DW_FORM_strx | constants::DW_FORM_GNU_str_index => {
-            let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
-            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-        }
-        constants::DW_FORM_strx1 => {
-            let index = input.read_u8().map(R::Offset::from_u8)?;
-            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-        }
-        constants::DW_FORM_strx2 => {
-            let index = input.read_u16().map(R::Offset::from_u16)?;
-            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-        }
-        constants::DW_FORM_strx3 => {
-            let index = input.read_uint(3).and_then(R::Offset::from_u64)?;
-            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-        }
-        constants::DW_FORM_strx4 => {
-            let index = input.read_u32().map(R::Offset::from_u32)?;
-            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-        }
-        _ => {
-            return Err(Error::UnknownForm);
-        }
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::constants;
-    use crate::endianity::LittleEndian;
-    use crate::read::{EndianSlice, Error};
-    use crate::test_util::GimliSectionMethods;
-    use core::u64;
-    use core::u8;
-    use test_assembler::{Endian, Label, LabelMaker, Section};
-
-    #[test]
-    fn test_parse_debug_line_32_ok() {
-        #[rustfmt::skip]
-        let buf = [
-            // 32-bit length = 62.
-            0x3e, 0x00, 0x00, 0x00,
-            // Version.
-            0x04, 0x00,
-            // Header length = 40.
-            0x28, 0x00, 0x00, 0x00,
-            // Minimum instruction length.
-            0x01,
-            // Maximum operations per byte.
-            0x01,
-            // Default is_stmt.
-            0x01,
-            // Line base.
-            0x00,
-            // Line range.
-            0x01,
-            // Opcode base.
-            0x03,
-            // Standard opcode lengths for opcodes 1 .. opcode base - 1.
-            0x01, 0x02,
-            // Include directories = '/', 'i', 'n', 'c', '\0', '/', 'i', 'n', 'c', '2', '\0', '\0'
-            0x2f, 0x69, 0x6e, 0x63, 0x00, 0x2f, 0x69, 0x6e, 0x63, 0x32, 0x00, 0x00,
-            // File names
-                // foo.rs
-                0x66, 0x6f, 0x6f, 0x2e, 0x72, 0x73, 0x00,
-                0x00,
-                0x00,
-                0x00,
-                // bar.h
-                0x62, 0x61, 0x72, 0x2e, 0x68, 0x00,
-                0x01,
-                0x00,
-                0x00,
-            // End file names.
-            0x00,
-
-            // Dummy line program data.
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy next line program.
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-        let comp_dir = EndianSlice::new(b"/comp_dir", LittleEndian);
-        let comp_name = EndianSlice::new(b"/comp_name", LittleEndian);
-
-        let header =
-            LineProgramHeader::parse(rest, DebugLineOffset(0), 4, Some(comp_dir), Some(comp_name))
-                .expect("should parse header ok");
-
-        assert_eq!(
-            *rest,
-            EndianSlice::new(&buf[buf.len() - 16..], LittleEndian)
-        );
-
-        assert_eq!(header.offset, DebugLineOffset(0));
-        assert_eq!(header.version(), 4);
-        assert_eq!(header.minimum_instruction_length(), 1);
-        assert_eq!(header.maximum_operations_per_instruction(), 1);
-        assert_eq!(header.default_is_stmt(), true);
-        assert_eq!(header.line_base(), 0);
-        assert_eq!(header.line_range(), 1);
-        assert_eq!(header.opcode_base(), 3);
-        assert_eq!(header.directory(0), Some(AttributeValue::String(comp_dir)));
-        assert_eq!(
-            header.file(0).unwrap().path_name,
-            AttributeValue::String(comp_name)
-        );
-
-        let expected_lengths = [1, 2];
-        assert_eq!(header.standard_opcode_lengths().slice(), &expected_lengths);
-
-        let expected_include_directories = [
-            AttributeValue::String(EndianSlice::new(b"/inc", LittleEndian)),
-            AttributeValue::String(EndianSlice::new(b"/inc2", LittleEndian)),
-        ];
-        assert_eq!(header.include_directories(), &expected_include_directories);
-
-        let expected_file_names = [
-            FileEntry {
-                path_name: AttributeValue::String(EndianSlice::new(b"foo.rs", LittleEndian)),
-                directory_index: 0,
-                timestamp: 0,
-                size: 0,
-                md5: [0; 16],
-            },
-            FileEntry {
-                path_name: AttributeValue::String(EndianSlice::new(b"bar.h", LittleEndian)),
-                directory_index: 1,
-                timestamp: 0,
-                size: 0,
-                md5: [0; 16],
-            },
-        ];
-        assert_eq!(&*header.file_names(), &expected_file_names);
-    }
-
-    #[test]
-    fn test_parse_debug_line_header_length_too_short() {
-        #[rustfmt::skip]
-        let buf = [
-            // 32-bit length = 62.
-            0x3e, 0x00, 0x00, 0x00,
-            // Version.
-            0x04, 0x00,
-            // Header length = 20. TOO SHORT!!!
-            0x15, 0x00, 0x00, 0x00,
-            // Minimum instruction length.
-            0x01,
-            // Maximum operations per byte.
-            0x01,
-            // Default is_stmt.
-            0x01,
-            // Line base.
-            0x00,
-            // Line range.
-            0x01,
-            // Opcode base.
-            0x03,
-            // Standard opcode lengths for opcodes 1 .. opcode base - 1.
-            0x01, 0x02,
-            // Include directories = '/', 'i', 'n', 'c', '\0', '/', 'i', 'n', 'c', '2', '\0', '\0'
-            0x2f, 0x69, 0x6e, 0x63, 0x00, 0x2f, 0x69, 0x6e, 0x63, 0x32, 0x00, 0x00,
-            // File names
-                // foo.rs
-                0x66, 0x6f, 0x6f, 0x2e, 0x72, 0x73, 0x00,
-                0x00,
-                0x00,
-                0x00,
-                // bar.h
-                0x62, 0x61, 0x72, 0x2e, 0x68, 0x00,
-                0x01,
-                0x00,
-                0x00,
-            // End file names.
-            0x00,
-
-            // Dummy line program data.
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy next line program.
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match LineProgramHeader::parse(input, DebugLineOffset(0), 4, None, None) {
-            Err(Error::UnexpectedEof(_)) => return,
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_parse_debug_line_unit_length_too_short() {
-        #[rustfmt::skip]
-        let buf = [
-            // 32-bit length = 40. TOO SHORT!!!
-            0x28, 0x00, 0x00, 0x00,
-            // Version.
-            0x04, 0x00,
-            // Header length = 40.
-            0x28, 0x00, 0x00, 0x00,
-            // Minimum instruction length.
-            0x01,
-            // Maximum operations per byte.
-            0x01,
-            // Default is_stmt.
-            0x01,
-            // Line base.
-            0x00,
-            // Line range.
-            0x01,
-            // Opcode base.
-            0x03,
-            // Standard opcode lengths for opcodes 1 .. opcode base - 1.
-            0x01, 0x02,
-            // Include directories = '/', 'i', 'n', 'c', '\0', '/', 'i', 'n', 'c', '2', '\0', '\0'
-            0x2f, 0x69, 0x6e, 0x63, 0x00, 0x2f, 0x69, 0x6e, 0x63, 0x32, 0x00, 0x00,
-            // File names
-                // foo.rs
-                0x66, 0x6f, 0x6f, 0x2e, 0x72, 0x73, 0x00,
-                0x00,
-                0x00,
-                0x00,
-                // bar.h
-                0x62, 0x61, 0x72, 0x2e, 0x68, 0x00,
-                0x01,
-                0x00,
-                0x00,
-            // End file names.
-            0x00,
-
-            // Dummy line program data.
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-
-            // Dummy next line program.
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match LineProgramHeader::parse(input, DebugLineOffset(0), 4, None, None) {
-            Err(Error::UnexpectedEof(_)) => return,
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    const OPCODE_BASE: u8 = 13;
-    const STANDARD_OPCODE_LENGTHS: &[u8] = &[0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1];
-
-    fn make_test_header(
-        buf: EndianSlice<LittleEndian>,
-    ) -> LineProgramHeader<EndianSlice<LittleEndian>> {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 8,
-        };
-        let line_encoding = LineEncoding {
-            line_base: -3,
-            line_range: 12,
-            ..Default::default()
-        };
-        LineProgramHeader {
-            encoding,
-            offset: DebugLineOffset(0),
-            unit_length: 1,
-            header_length: 1,
-            line_encoding,
-            opcode_base: OPCODE_BASE,
-            standard_opcode_lengths: EndianSlice::new(STANDARD_OPCODE_LENGTHS, LittleEndian),
-            file_names: vec![
-                FileEntry {
-                    path_name: AttributeValue::String(EndianSlice::new(b"foo.c", LittleEndian)),
-                    directory_index: 0,
-                    timestamp: 0,
-                    size: 0,
-                    md5: [0; 16],
-                },
-                FileEntry {
-                    path_name: AttributeValue::String(EndianSlice::new(b"bar.rs", LittleEndian)),
-                    directory_index: 0,
-                    timestamp: 0,
-                    size: 0,
-                    md5: [0; 16],
-                },
-            ],
-            include_directories: vec![],
-            directory_entry_format: vec![],
-            file_name_entry_format: vec![],
-            program_buf: buf,
-            comp_dir: None,
-            comp_file: None,
-        }
-    }
-
-    fn make_test_program(
-        buf: EndianSlice<LittleEndian>,
-    ) -> IncompleteLineProgram<EndianSlice<LittleEndian>> {
-        IncompleteLineProgram {
-            header: make_test_header(buf),
-        }
-    }
-
-    #[test]
-    fn test_parse_special_opcodes() {
-        for i in OPCODE_BASE..u8::MAX {
-            let input = [i, 0, 0, 0];
-            let input = EndianSlice::new(&input, LittleEndian);
-            let header = make_test_header(input);
-
-            let mut rest = input;
-            let opcode =
-                LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
-
-            assert_eq!(*rest, *input.range_from(1..));
-            assert_eq!(opcode, LineInstruction::Special(i));
-        }
-    }
-
-    #[test]
-    fn test_parse_standard_opcodes() {
-        fn test<Operands>(
-            raw: constants::DwLns,
-            operands: Operands,
-            expected: LineInstruction<EndianSlice<LittleEndian>>,
-        ) where
-            Operands: AsRef<[u8]>,
-        {
-            let mut input = Vec::new();
-            input.push(raw.0);
-            input.extend_from_slice(operands.as_ref());
-
-            let expected_rest = [0, 1, 2, 3, 4];
-            input.extend_from_slice(&expected_rest);
-
-            let input = EndianSlice::new(&*input, LittleEndian);
-            let header = make_test_header(input);
-
-            let mut rest = input;
-            let opcode =
-                LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
-
-            assert_eq!(opcode, expected);
-            assert_eq!(*rest, expected_rest);
-        }
-
-        test(constants::DW_LNS_copy, [], LineInstruction::Copy);
-        test(
-            constants::DW_LNS_advance_pc,
-            [42],
-            LineInstruction::AdvancePc(42),
-        );
-        test(
-            constants::DW_LNS_advance_line,
-            [9],
-            LineInstruction::AdvanceLine(9),
-        );
-        test(constants::DW_LNS_set_file, [7], LineInstruction::SetFile(7));
-        test(
-            constants::DW_LNS_set_column,
-            [1],
-            LineInstruction::SetColumn(1),
-        );
-        test(
-            constants::DW_LNS_negate_stmt,
-            [],
-            LineInstruction::NegateStatement,
-        );
-        test(
-            constants::DW_LNS_set_basic_block,
-            [],
-            LineInstruction::SetBasicBlock,
-        );
-        test(
-            constants::DW_LNS_const_add_pc,
-            [],
-            LineInstruction::ConstAddPc,
-        );
-        test(
-            constants::DW_LNS_fixed_advance_pc,
-            [42, 0],
-            LineInstruction::FixedAddPc(42),
-        );
-        test(
-            constants::DW_LNS_set_prologue_end,
-            [],
-            LineInstruction::SetPrologueEnd,
-        );
-        test(
-            constants::DW_LNS_set_isa,
-            [57 + 0x80, 100],
-            LineInstruction::SetIsa(12857),
-        );
-    }
-
-    #[test]
-    fn test_parse_unknown_standard_opcode_no_args() {
-        let input = [OPCODE_BASE, 1, 2, 3];
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut standard_opcode_lengths = Vec::new();
-        let mut header = make_test_header(input);
-        standard_opcode_lengths.extend(header.standard_opcode_lengths.slice());
-        standard_opcode_lengths.push(0);
-        header.opcode_base += 1;
-        header.standard_opcode_lengths = EndianSlice::new(&standard_opcode_lengths, LittleEndian);
-
-        let mut rest = input;
-        let opcode =
-            LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
-
-        assert_eq!(
-            opcode,
-            LineInstruction::UnknownStandard0(constants::DwLns(OPCODE_BASE))
-        );
-        assert_eq!(*rest, *input.range_from(1..));
-    }
-
-    #[test]
-    fn test_parse_unknown_standard_opcode_one_arg() {
-        let input = [OPCODE_BASE, 1, 2, 3];
-        let input = EndianSlice::new(&input, LittleEndian);
-        let mut standard_opcode_lengths = Vec::new();
-        let mut header = make_test_header(input);
-        standard_opcode_lengths.extend(header.standard_opcode_lengths.slice());
-        standard_opcode_lengths.push(1);
-        header.opcode_base += 1;
-        header.standard_opcode_lengths = EndianSlice::new(&standard_opcode_lengths, LittleEndian);
-
-        let mut rest = input;
-        let opcode =
-            LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
-
-        assert_eq!(
-            opcode,
-            LineInstruction::UnknownStandard1(constants::DwLns(OPCODE_BASE), 1)
-        );
-        assert_eq!(*rest, *input.range_from(2..));
-    }
-
-    #[test]
-    fn test_parse_unknown_standard_opcode_many_args() {
-        let input = [OPCODE_BASE, 1, 2, 3];
-        let input = EndianSlice::new(&input, LittleEndian);
-        let args = EndianSlice::new(&input[1..], LittleEndian);
-        let mut standard_opcode_lengths = Vec::new();
-        let mut header = make_test_header(input);
-        standard_opcode_lengths.extend(header.standard_opcode_lengths.slice());
-        standard_opcode_lengths.push(3);
-        header.opcode_base += 1;
-        header.standard_opcode_lengths = EndianSlice::new(&standard_opcode_lengths, LittleEndian);
-
-        let mut rest = input;
-        let opcode =
-            LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
-
-        assert_eq!(
-            opcode,
-            LineInstruction::UnknownStandardN(constants::DwLns(OPCODE_BASE), args)
-        );
-        assert_eq!(*rest, []);
-    }
-
-    #[test]
-    fn test_parse_extended_opcodes() {
-        fn test<Operands>(
-            raw: constants::DwLne,
-            operands: Operands,
-            expected: LineInstruction<EndianSlice<LittleEndian>>,
-        ) where
-            Operands: AsRef<[u8]>,
-        {
-            let mut input = Vec::new();
-            input.push(0);
-
-            let operands = operands.as_ref();
-            input.push(1 + operands.len() as u8);
-
-            input.push(raw.0);
-            input.extend_from_slice(operands);
-
-            let expected_rest = [0, 1, 2, 3, 4];
-            input.extend_from_slice(&expected_rest);
-
-            let input = EndianSlice::new(&input, LittleEndian);
-            let header = make_test_header(input);
-
-            let mut rest = input;
-            let opcode =
-                LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
-
-            assert_eq!(opcode, expected);
-            assert_eq!(*rest, expected_rest);
-        }
-
-        test(
-            constants::DW_LNE_end_sequence,
-            [],
-            LineInstruction::EndSequence,
-        );
-        test(
-            constants::DW_LNE_set_address,
-            [1, 2, 3, 4, 5, 6, 7, 8],
-            LineInstruction::SetAddress(578_437_695_752_307_201),
-        );
-        test(
-            constants::DW_LNE_set_discriminator,
-            [42],
-            LineInstruction::SetDiscriminator(42),
-        );
-
-        let mut file = Vec::new();
-        // "foo.c"
-        let path_name = [b'f', b'o', b'o', b'.', b'c', 0];
-        file.extend_from_slice(&path_name);
-        // Directory index.
-        file.push(0);
-        // Last modification of file.
-        file.push(1);
-        // Size of file.
-        file.push(2);
-
-        test(
-            constants::DW_LNE_define_file,
-            file,
-            LineInstruction::DefineFile(FileEntry {
-                path_name: AttributeValue::String(EndianSlice::new(b"foo.c", LittleEndian)),
-                directory_index: 0,
-                timestamp: 1,
-                size: 2,
-                md5: [0; 16],
-            }),
-        );
-
-        // Unknown extended opcode.
-        let operands = [1, 2, 3, 4, 5, 6];
-        let opcode = constants::DwLne(99);
-        test(
-            opcode,
-            operands,
-            LineInstruction::UnknownExtended(opcode, EndianSlice::new(&operands, LittleEndian)),
-        );
-    }
-
-    #[test]
-    fn test_file_entry_directory() {
-        let path_name = [b'f', b'o', b'o', b'.', b'r', b's', 0];
-
-        let mut file = FileEntry {
-            path_name: AttributeValue::String(EndianSlice::new(&path_name, LittleEndian)),
-            directory_index: 1,
-            timestamp: 0,
-            size: 0,
-            md5: [0; 16],
-        };
-
-        let mut header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let dir = AttributeValue::String(EndianSlice::new(b"dir", LittleEndian));
-        header.include_directories.push(dir);
-
-        assert_eq!(file.directory(&header), Some(dir));
-
-        // Now test the compilation's current directory.
-        file.directory_index = 0;
-        assert_eq!(file.directory(&header), None);
-    }
-
-    fn assert_exec_opcode<'input>(
-        header: LineProgramHeader<EndianSlice<'input, LittleEndian>>,
-        mut registers: LineRow,
-        opcode: LineInstruction<EndianSlice<'input, LittleEndian>>,
-        expected_registers: LineRow,
-        expect_new_row: bool,
-    ) {
-        let mut program = IncompleteLineProgram { header };
-        let is_new_row = registers.execute(opcode, &mut program);
-
-        assert_eq!(is_new_row, expect_new_row);
-        assert_eq!(registers, expected_registers);
-    }
-
-    #[test]
-    fn test_exec_special_noop() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::Special(16);
-        let expected_registers = initial_registers;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_special_negative_line_advance() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.line.0 = 10;
-
-        let opcode = LineInstruction::Special(13);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.line.0 -= 3;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_special_positive_line_advance() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let initial_registers = LineRow::new(&header);
-
-        let opcode = LineInstruction::Special(19);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.line.0 += 3;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_special_positive_address_advance() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let initial_registers = LineRow::new(&header);
-
-        let opcode = LineInstruction::Special(52);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.address.0 += 3;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_special_positive_address_and_line_advance() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let initial_registers = LineRow::new(&header);
-
-        let opcode = LineInstruction::Special(55);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.address.0 += 3;
-        expected_registers.line.0 += 3;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_special_positive_address_and_negative_line_advance() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.line.0 = 10;
-
-        let opcode = LineInstruction::Special(49);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.address.0 += 3;
-        expected_registers.line.0 -= 3;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_special_line_underflow() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.line.0 = 2;
-
-        // -3 line advance.
-        let opcode = LineInstruction::Special(13);
-
-        let mut expected_registers = initial_registers;
-        // Clamp at 0. No idea if this is the best way to handle this situation
-        // or not...
-        expected_registers.line.0 = 0;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_copy() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.address.0 = 1337;
-        initial_registers.line.0 = 42;
-
-        let opcode = LineInstruction::Copy;
-
-        let expected_registers = initial_registers;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_advance_pc() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::AdvancePc(42);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.address.0 += 42;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_advance_pc_overflow() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let opcode = LineInstruction::AdvancePc(42);
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.address.0 = u64::MAX;
-
-        let mut expected_registers = initial_registers;
-        expected_registers.address.0 = 41;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_advance_line() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::AdvanceLine(42);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.line.0 += 42;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_advance_line_overflow() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let opcode = LineInstruction::AdvanceLine(42);
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.line.0 = u64::MAX;
-
-        let mut expected_registers = initial_registers;
-        expected_registers.line.0 = 41;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_set_file_in_bounds() {
-        for file_idx in 1..3 {
-            let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-            let initial_registers = LineRow::new(&header);
-            let opcode = LineInstruction::SetFile(file_idx);
-
-            let mut expected_registers = initial_registers;
-            expected_registers.file = file_idx;
-
-            assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-        }
-    }
-
-    #[test]
-    fn test_exec_set_file_out_of_bounds() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::SetFile(100);
-
-        // The spec doesn't say anything about rejecting input programs
-        // that set the file register out of bounds of the actual number
-        // of files that have been defined. Instead, we cross our
-        // fingers and hope that one gets defined before
-        // `LineRow::file` gets called and handle the error at
-        // that time if need be.
-        let mut expected_registers = initial_registers;
-        expected_registers.file = 100;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_file_entry_file_index_out_of_bounds() {
-        // These indices are 1-based, so 0 is invalid. 100 is way more than the
-        // number of files defined in the header.
-        let out_of_bounds_indices = [0, 100];
-
-        for file_idx in &out_of_bounds_indices[..] {
-            let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-            let mut row = LineRow::new(&header);
-
-            row.file = *file_idx;
-
-            assert_eq!(row.file(&header), None);
-        }
-    }
-
-    #[test]
-    fn test_file_entry_file_index_in_bounds() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let mut row = LineRow::new(&header);
-
-        row.file = 2;
-
-        assert_eq!(row.file(&header), Some(&header.file_names()[1]));
-    }
-
-    #[test]
-    fn test_exec_set_column() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::SetColumn(42);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.column = 42;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_negate_statement() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::NegateStatement;
-
-        let mut expected_registers = initial_registers;
-        expected_registers.is_stmt = !initial_registers.is_stmt;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_set_basic_block() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.basic_block = false;
-
-        let opcode = LineInstruction::SetBasicBlock;
-
-        let mut expected_registers = initial_registers;
-        expected_registers.basic_block = true;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_const_add_pc() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::ConstAddPc;
-
-        let mut expected_registers = initial_registers;
-        expected_registers.address.0 += 20;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_fixed_add_pc() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.op_index.0 = 1;
-
-        let opcode = LineInstruction::FixedAddPc(10);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.address.0 += 10;
-        expected_registers.op_index.0 = 0;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_set_prologue_end() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-
-        let mut initial_registers = LineRow::new(&header);
-        initial_registers.prologue_end = false;
-
-        let opcode = LineInstruction::SetPrologueEnd;
-
-        let mut expected_registers = initial_registers;
-        expected_registers.prologue_end = true;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_set_isa() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::SetIsa(1993);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.isa = 1993;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_unknown_standard_0() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::UnknownStandard0(constants::DwLns(111));
-        let expected_registers = initial_registers;
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_unknown_standard_1() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::UnknownStandard1(constants::DwLns(111), 2);
-        let expected_registers = initial_registers;
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_unknown_standard_n() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::UnknownStandardN(
-            constants::DwLns(111),
-            EndianSlice::new(&[2, 2, 2], LittleEndian),
-        );
-        let expected_registers = initial_registers;
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_end_sequence() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::EndSequence;
-
-        let mut expected_registers = initial_registers;
-        expected_registers.end_sequence = true;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
-    }
-
-    #[test]
-    fn test_exec_set_address() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::SetAddress(3030);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.address.0 = 3030;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_define_file() {
-        let mut program = make_test_program(EndianSlice::new(&[], LittleEndian));
-        let mut row = LineRow::new(program.header());
-
-        let file = FileEntry {
-            path_name: AttributeValue::String(EndianSlice::new(b"test.cpp", LittleEndian)),
-            directory_index: 0,
-            timestamp: 0,
-            size: 0,
-            md5: [0; 16],
-        };
-
-        let opcode = LineInstruction::DefineFile(file);
-        let is_new_row = row.execute(opcode, &mut program);
-
-        assert_eq!(is_new_row, false);
-        assert_eq!(Some(&file), program.header().file_names.last());
-    }
-
-    #[test]
-    fn test_exec_set_discriminator() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::SetDiscriminator(9);
-
-        let mut expected_registers = initial_registers;
-        expected_registers.discriminator = 9;
-
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    #[test]
-    fn test_exec_unknown_extended() {
-        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
-        let initial_registers = LineRow::new(&header);
-        let opcode = LineInstruction::UnknownExtended(
-            constants::DwLne(74),
-            EndianSlice::new(&[], LittleEndian),
-        );
-        let expected_registers = initial_registers;
-        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
-    }
-
-    /// Ensure that `LineRows<R,P>` is covariant wrt R.
-    /// This only needs to compile.
-    #[allow(dead_code, unreachable_code, unused_variables)]
-    fn test_line_rows_variance<'a, 'b>(_: &'a [u8], _: &'b [u8])
-    where
-        'a: 'b,
-    {
-        let a: &OneShotLineRows<EndianSlice<'a, LittleEndian>> = unimplemented!();
-        let _: &OneShotLineRows<EndianSlice<'b, LittleEndian>> = a;
-    }
-
-    #[test]
-    fn test_parse_debug_line_v5_ok() {
-        let expected_lengths = &[1, 2];
-        let expected_program = &[0, 1, 2, 3, 4];
-        let expected_rest = &[5, 6, 7, 8, 9];
-        let expected_include_directories = [
-            AttributeValue::String(EndianSlice::new(b"dir1", LittleEndian)),
-            AttributeValue::String(EndianSlice::new(b"dir2", LittleEndian)),
-        ];
-        let expected_file_names = [
-            FileEntry {
-                path_name: AttributeValue::String(EndianSlice::new(b"file1", LittleEndian)),
-                directory_index: 0,
-                timestamp: 0,
-                size: 0,
-                md5: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
-            },
-            FileEntry {
-                path_name: AttributeValue::String(EndianSlice::new(b"file2", LittleEndian)),
-                directory_index: 1,
-                timestamp: 0,
-                size: 0,
-                md5: [
-                    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-                ],
-            },
-        ];
-
-        for format in vec![Format::Dwarf32, Format::Dwarf64] {
-            let length = Label::new();
-            let header_length = Label::new();
-            let start = Label::new();
-            let header_start = Label::new();
-            let end = Label::new();
-            let header_end = Label::new();
-            let section = Section::with_endian(Endian::Little)
-                .initial_length(format, &length, &start)
-                .D16(5)
-                // Address size.
-                .D8(4)
-                // Segment selector size.
-                .D8(0)
-                .word_label(format.word_size(), &header_length)
-                .mark(&header_start)
-                // Minimum instruction length.
-                .D8(1)
-                // Maximum operations per byte.
-                .D8(1)
-                // Default is_stmt.
-                .D8(1)
-                // Line base.
-                .D8(0)
-                // Line range.
-                .D8(1)
-                // Opcode base.
-                .D8(expected_lengths.len() as u8 + 1)
-                // Standard opcode lengths for opcodes 1 .. opcode base - 1.
-                .append_bytes(expected_lengths)
-                // Directory entry format count.
-                .D8(1)
-                .uleb(constants::DW_LNCT_path.0 as u64)
-                .uleb(constants::DW_FORM_string.0 as u64)
-                // Directory count.
-                .D8(2)
-                .append_bytes(b"dir1\0")
-                .append_bytes(b"dir2\0")
-                // File entry format count.
-                .D8(3)
-                .uleb(constants::DW_LNCT_path.0 as u64)
-                .uleb(constants::DW_FORM_string.0 as u64)
-                .uleb(constants::DW_LNCT_directory_index.0 as u64)
-                .uleb(constants::DW_FORM_data1.0 as u64)
-                .uleb(constants::DW_LNCT_MD5.0 as u64)
-                .uleb(constants::DW_FORM_data16.0 as u64)
-                // File count.
-                .D8(2)
-                .append_bytes(b"file1\0")
-                .D8(0)
-                .append_bytes(&expected_file_names[0].md5)
-                .append_bytes(b"file2\0")
-                .D8(1)
-                .append_bytes(&expected_file_names[1].md5)
-                .mark(&header_end)
-                // Dummy line program data.
-                .append_bytes(expected_program)
-                .mark(&end)
-                // Dummy trailing data.
-                .append_bytes(expected_rest);
-            length.set_const((&end - &start) as u64);
-            header_length.set_const((&header_end - &header_start) as u64);
-            let section = section.get_contents().unwrap();
-
-            let input = &mut EndianSlice::new(&section, LittleEndian);
-
-            let header = LineProgramHeader::parse(input, DebugLineOffset(0), 0, None, None)
-                .expect("should parse header ok");
-
-            assert_eq!(header.raw_program_buf().slice(), expected_program);
-            assert_eq!(input.slice(), expected_rest);
-
-            assert_eq!(header.offset, DebugLineOffset(0));
-            assert_eq!(header.version(), 5);
-            assert_eq!(header.address_size(), 4);
-            assert_eq!(header.minimum_instruction_length(), 1);
-            assert_eq!(header.maximum_operations_per_instruction(), 1);
-            assert_eq!(header.default_is_stmt(), true);
-            assert_eq!(header.line_base(), 0);
-            assert_eq!(header.line_range(), 1);
-            assert_eq!(header.opcode_base(), expected_lengths.len() as u8 + 1);
-            assert_eq!(header.standard_opcode_lengths().slice(), expected_lengths);
-            assert_eq!(
-                header.directory_entry_format(),
-                &[FileEntryFormat {
-                    content_type: constants::DW_LNCT_path,
-                    form: constants::DW_FORM_string,
-                }]
-            );
-            assert_eq!(header.include_directories(), expected_include_directories);
-            assert_eq!(header.directory(0), Some(expected_include_directories[0]));
-            assert_eq!(
-                header.file_name_entry_format(),
-                &[
-                    FileEntryFormat {
-                        content_type: constants::DW_LNCT_path,
-                        form: constants::DW_FORM_string,
-                    },
-                    FileEntryFormat {
-                        content_type: constants::DW_LNCT_directory_index,
-                        form: constants::DW_FORM_data1,
-                    },
-                    FileEntryFormat {
-                        content_type: constants::DW_LNCT_MD5,
-                        form: constants::DW_FORM_data16,
-                    }
-                ]
-            );
-            assert_eq!(header.file_names(), expected_file_names);
-            assert_eq!(header.file(0), Some(&expected_file_names[0]));
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/loclists.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/loclists.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/loclists.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/loclists.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1429 +0,0 @@
-use crate::common::{
-    DebugAddrBase, DebugAddrIndex, DebugLocListsBase, DebugLocListsIndex, Encoding, Format,
-    LocationListsOffset, SectionId,
-};
-use crate::constants;
-use crate::endianity::Endianity;
-use crate::read::{
-    DebugAddr, EndianSlice, Error, Expression, Range, RawRange, Reader, ReaderOffset,
-    ReaderOffsetId, Result, Section,
-};
-
-/// The raw contents of the `.debug_loc` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugLoc<R> {
-    pub(crate) section: R,
-}
-
-impl<'input, Endian> DebugLoc<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugLoc` instance from the data in the `.debug_loc`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_loc` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugLoc, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_loc_section_somehow = || &buf;
-    /// let debug_loc = DebugLoc::new(read_debug_loc_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(section, endian))
-    }
-}
-
-impl<R> Section<R> for DebugLoc<R> {
-    fn id() -> SectionId {
-        SectionId::DebugLoc
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R> From<R> for DebugLoc<R> {
-    fn from(section: R) -> Self {
-        DebugLoc { section }
-    }
-}
-
-/// The `DebugLocLists` struct represents the DWARF data
-/// found in the `.debug_loclists` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugLocLists<R> {
-    section: R,
-}
-
-impl<'input, Endian> DebugLocLists<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugLocLists` instance from the data in the `.debug_loclists`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_loclists` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugLocLists, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_loclists_section_somehow = || &buf;
-    /// let debug_loclists = DebugLocLists::new(read_debug_loclists_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(section, endian))
-    }
-}
-
-impl<R> Section<R> for DebugLocLists<R> {
-    fn id() -> SectionId {
-        SectionId::DebugLocLists
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R> From<R> for DebugLocLists<R> {
-    fn from(section: R) -> Self {
-        DebugLocLists { section }
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-struct LocListsHeader {
-    encoding: Encoding,
-    offset_entry_count: u32,
-}
-
-impl Default for LocListsHeader {
-    fn default() -> Self {
-        LocListsHeader {
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 5,
-                address_size: 0,
-            },
-            offset_entry_count: 0,
-        }
-    }
-}
-
-impl LocListsHeader {
-    /// Return the serialized size of the table header.
-    #[allow(dead_code)]
-    #[inline]
-    fn size(self) -> u8 {
-        // initial_length + version + address_size + segment_selector_size + offset_entry_count
-        self.encoding.format.initial_length_size() + 2 + 1 + 1 + 4
-    }
-}
-
-// TODO: add an iterator over headers in the .debug_loclists section
-#[allow(dead_code)]
-fn parse_header<R: Reader>(input: &mut R) -> Result<LocListsHeader> {
-    let (length, format) = input.read_initial_length()?;
-    input.truncate(length)?;
-
-    let version = input.read_u16()?;
-    if version != 5 {
-        return Err(Error::UnknownVersion(u64::from(version)));
-    }
-
-    let address_size = input.read_u8()?;
-    let segment_selector_size = input.read_u8()?;
-    if segment_selector_size != 0 {
-        return Err(Error::UnsupportedSegmentSize);
-    }
-    let offset_entry_count = input.read_u32()?;
-
-    let encoding = Encoding {
-        format,
-        version,
-        address_size,
-    };
-    Ok(LocListsHeader {
-        encoding,
-        offset_entry_count,
-    })
-}
-
-/// The DWARF data found in `.debug_loc` and `.debug_loclists` sections.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct LocationLists<R> {
-    debug_loc: DebugLoc<R>,
-    debug_loclists: DebugLocLists<R>,
-}
-
-impl<R> LocationLists<R> {
-    /// Construct a new `LocationLists` instance from the data in the `.debug_loc` and
-    /// `.debug_loclists` sections.
-    pub fn new(debug_loc: DebugLoc<R>, debug_loclists: DebugLocLists<R>) -> LocationLists<R> {
-        LocationLists {
-            debug_loc,
-            debug_loclists,
-        }
-    }
-}
-
-impl<T> LocationLists<T> {
-    /// Create a `LocationLists` that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::LocationLists<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> LocationLists<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        LocationLists {
-            debug_loc: borrow(&self.debug_loc.section).into(),
-            debug_loclists: borrow(&self.debug_loclists.section).into(),
-        }
-    }
-}
-
-impl<R: Reader> LocationLists<R> {
-    /// Iterate over the `LocationListEntry`s starting at the given offset.
-    ///
-    /// The `unit_encoding` must match the compilation unit that the
-    /// offset was contained in.
-    ///
-    /// The `base_address` should be obtained from the `DW_AT_low_pc` attribute in the
-    /// `DW_TAG_compile_unit` entry for the compilation unit that contains this location
-    /// list.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn locations(
-        &self,
-        offset: LocationListsOffset<R::Offset>,
-        unit_encoding: Encoding,
-        base_address: u64,
-        debug_addr: &DebugAddr<R>,
-        debug_addr_base: DebugAddrBase<R::Offset>,
-    ) -> Result<LocListIter<R>> {
-        Ok(LocListIter::new(
-            self.raw_locations(offset, unit_encoding)?,
-            base_address,
-            debug_addr.clone(),
-            debug_addr_base,
-        ))
-    }
-
-    /// Iterate over the raw `LocationListEntry`s starting at the given offset.
-    ///
-    /// The `unit_encoding` must match the compilation unit that the
-    /// offset was contained in.
-    ///
-    /// This iterator does not perform any processing of the location entries,
-    /// such as handling base addresses.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn raw_locations(
-        &self,
-        offset: LocationListsOffset<R::Offset>,
-        unit_encoding: Encoding,
-    ) -> Result<RawLocListIter<R>> {
-        let mut input = if unit_encoding.version <= 4 {
-            self.debug_loc.section.clone()
-        } else {
-            self.debug_loclists.section.clone()
-        };
-        input.skip(offset.0)?;
-        Ok(RawLocListIter::new(input, unit_encoding))
-    }
-
-    /// Returns the `.debug_loclists` offset at the given `base` and `index`.
-    ///
-    /// The `base` must be the `DW_AT_loclists_base` value from the compilation unit DIE.
-    /// This is an offset that points to the first entry following the header.
-    ///
-    /// The `index` is the value of a `DW_FORM_loclistx` attribute.
-    pub fn get_offset(
-        &self,
-        unit_encoding: Encoding,
-        base: DebugLocListsBase<R::Offset>,
-        index: DebugLocListsIndex<R::Offset>,
-    ) -> Result<LocationListsOffset<R::Offset>> {
-        let format = unit_encoding.format;
-        let input = &mut self.debug_loclists.section.clone();
-        input.skip(base.0)?;
-        input.skip(R::Offset::from_u64(
-            index.0.into_u64() * u64::from(format.word_size()),
-        )?)?;
-        input
-            .read_offset(format)
-            .map(|x| LocationListsOffset(base.0 + x))
-    }
-
-    /// Call `Reader::lookup_offset_id` for each section, and return the first match.
-    pub fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(SectionId, R::Offset)> {
-        self.debug_loc
-            .lookup_offset_id(id)
-            .or_else(|| self.debug_loclists.lookup_offset_id(id))
-    }
-}
-
-/// A raw iterator over a location list.
-///
-/// This iterator does not perform any processing of the location entries,
-/// such as handling base addresses.
-#[derive(Debug)]
-pub struct RawLocListIter<R: Reader> {
-    input: R,
-    encoding: Encoding,
-}
-
-/// A raw entry in .debug_loclists.
-#[derive(Clone, Debug)]
-pub enum RawLocListEntry<R: Reader> {
-    /// A location from DWARF version <= 4.
-    AddressOrOffsetPair {
-        /// Start of range. May be an address or an offset.
-        begin: u64,
-        /// End of range. May be an address or an offset.
-        end: u64,
-        /// expression
-        data: Expression<R>,
-    },
-    /// DW_LLE_base_address
-    BaseAddress {
-        /// base address
-        addr: u64,
-    },
-    /// DW_LLE_base_addressx
-    BaseAddressx {
-        /// base address
-        addr: DebugAddrIndex<R::Offset>,
-    },
-    /// DW_LLE_startx_endx
-    StartxEndx {
-        /// start of range
-        begin: DebugAddrIndex<R::Offset>,
-        /// end of range
-        end: DebugAddrIndex<R::Offset>,
-        /// expression
-        data: Expression<R>,
-    },
-    /// DW_LLE_startx_length
-    StartxLength {
-        /// start of range
-        begin: DebugAddrIndex<R::Offset>,
-        /// length of range
-        length: u64,
-        /// expression
-        data: Expression<R>,
-    },
-    /// DW_LLE_offset_pair
-    OffsetPair {
-        /// start of range
-        begin: u64,
-        /// end of range
-        end: u64,
-        /// expression
-        data: Expression<R>,
-    },
-    /// DW_LLE_default_location
-    DefaultLocation {
-        /// expression
-        data: Expression<R>,
-    },
-    /// DW_LLE_start_end
-    StartEnd {
-        /// start of range
-        begin: u64,
-        /// end of range
-        end: u64,
-        /// expression
-        data: Expression<R>,
-    },
-    /// DW_LLE_start_length
-    StartLength {
-        /// start of range
-        begin: u64,
-        /// length of range
-        length: u64,
-        /// expression
-        data: Expression<R>,
-    },
-}
-
-fn parse_data<R: Reader>(input: &mut R) -> Result<Expression<R>> {
-    let len = R::Offset::from_u64(input.read_uleb128()?)?;
-    Ok(Expression(input.split(len)?))
-}
-
-impl<R: Reader> RawLocListEntry<R> {
-    /// Parse a location list entry from `.debug_loclists`
-    fn parse(input: &mut R, encoding: Encoding) -> Result<Option<Self>> {
-        if encoding.version < 5 {
-            let range = RawRange::parse(input, encoding.address_size)?;
-            return Ok(if range.is_end() {
-                None
-            } else if range.is_base_address(encoding.address_size) {
-                Some(RawLocListEntry::BaseAddress { addr: range.end })
-            } else {
-                let len = R::Offset::from_u16(input.read_u16()?);
-                let data = Expression(input.split(len)?);
-                Some(RawLocListEntry::AddressOrOffsetPair {
-                    begin: range.begin,
-                    end: range.end,
-                    data,
-                })
-            });
-        }
-        Ok(match constants::DwLle(input.read_u8()?) {
-            constants::DW_LLE_end_of_list => None,
-            constants::DW_LLE_base_addressx => Some(RawLocListEntry::BaseAddressx {
-                addr: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
-            }),
-            constants::DW_LLE_startx_endx => Some(RawLocListEntry::StartxEndx {
-                begin: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
-                end: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
-                data: parse_data(input)?,
-            }),
-            constants::DW_LLE_startx_length => Some(RawLocListEntry::StartxLength {
-                begin: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
-                length: input.read_uleb128()?,
-                data: parse_data(input)?,
-            }),
-            constants::DW_LLE_offset_pair => Some(RawLocListEntry::OffsetPair {
-                begin: input.read_uleb128()?,
-                end: input.read_uleb128()?,
-                data: parse_data(input)?,
-            }),
-            constants::DW_LLE_default_location => Some(RawLocListEntry::DefaultLocation {
-                data: parse_data(input)?,
-            }),
-            constants::DW_LLE_base_address => Some(RawLocListEntry::BaseAddress {
-                addr: input.read_address(encoding.address_size)?,
-            }),
-            constants::DW_LLE_start_end => Some(RawLocListEntry::StartEnd {
-                begin: input.read_address(encoding.address_size)?,
-                end: input.read_address(encoding.address_size)?,
-                data: parse_data(input)?,
-            }),
-            constants::DW_LLE_start_length => Some(RawLocListEntry::StartLength {
-                begin: input.read_address(encoding.address_size)?,
-                length: input.read_uleb128()?,
-                data: parse_data(input)?,
-            }),
-            _ => {
-                return Err(Error::InvalidAddressRange);
-            }
-        })
-    }
-}
-
-impl<R: Reader> RawLocListIter<R> {
-    /// Construct a `RawLocListIter`.
-    pub fn new(input: R, encoding: Encoding) -> RawLocListIter<R> {
-        RawLocListIter { input, encoding }
-    }
-
-    /// Advance the iterator to the next location.
-    pub fn next(&mut self) -> Result<Option<RawLocListEntry<R>>> {
-        if self.input.is_empty() {
-            return Ok(None);
-        }
-
-        match RawLocListEntry::parse(&mut self.input, self.encoding) {
-            Ok(entry) => {
-                if entry.is_none() {
-                    self.input.empty();
-                }
-                Ok(entry)
-            }
-            Err(e) => {
-                self.input.empty();
-                Err(e)
-            }
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for RawLocListIter<R> {
-    type Item = RawLocListEntry<R>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        RawLocListIter::next(self)
-    }
-}
-
-/// An iterator over a location list.
-///
-/// This iterator internally handles processing of base address selection entries
-/// and list end entries.  Thus, it only returns location entries that are valid
-/// and already adjusted for the base address.
-#[derive(Debug)]
-pub struct LocListIter<R: Reader> {
-    raw: RawLocListIter<R>,
-    base_address: u64,
-    debug_addr: DebugAddr<R>,
-    debug_addr_base: DebugAddrBase<R::Offset>,
-}
-
-impl<R: Reader> LocListIter<R> {
-    /// Construct a `LocListIter`.
-    fn new(
-        raw: RawLocListIter<R>,
-        base_address: u64,
-        debug_addr: DebugAddr<R>,
-        debug_addr_base: DebugAddrBase<R::Offset>,
-    ) -> LocListIter<R> {
-        LocListIter {
-            raw,
-            base_address,
-            debug_addr,
-            debug_addr_base,
-        }
-    }
-
-    #[inline]
-    fn get_address(&self, index: DebugAddrIndex<R::Offset>) -> Result<u64> {
-        self.debug_addr
-            .get_address(self.raw.encoding.address_size, self.debug_addr_base, index)
-    }
-
-    /// Advance the iterator to the next location.
-    pub fn next(&mut self) -> Result<Option<LocationListEntry<R>>> {
-        loop {
-            let raw_loc = match self.raw.next()? {
-                Some(loc) => loc,
-                None => return Ok(None),
-            };
-
-            let (range, data) = match raw_loc {
-                RawLocListEntry::BaseAddress { addr } => {
-                    self.base_address = addr;
-                    continue;
-                }
-                RawLocListEntry::BaseAddressx { addr } => {
-                    self.base_address = self.get_address(addr)?;
-                    continue;
-                }
-                RawLocListEntry::StartxEndx { begin, end, data } => {
-                    let begin = self.get_address(begin)?;
-                    let end = self.get_address(end)?;
-                    (Range { begin, end }, data)
-                }
-                RawLocListEntry::StartxLength {
-                    begin,
-                    length,
-                    data,
-                } => {
-                    let begin = self.get_address(begin)?;
-                    let end = begin + length;
-                    (Range { begin, end }, data)
-                }
-                RawLocListEntry::DefaultLocation { data } => (
-                    Range {
-                        begin: 0,
-                        end: u64::max_value(),
-                    },
-                    data,
-                ),
-                RawLocListEntry::AddressOrOffsetPair { begin, end, data }
-                | RawLocListEntry::OffsetPair { begin, end, data } => {
-                    let mut range = Range { begin, end };
-                    range.add_base_address(self.base_address, self.raw.encoding.address_size);
-                    (range, data)
-                }
-                RawLocListEntry::StartEnd { begin, end, data } => (Range { begin, end }, data),
-                RawLocListEntry::StartLength {
-                    begin,
-                    length,
-                    data,
-                } => (
-                    Range {
-                        begin,
-                        end: begin + length,
-                    },
-                    data,
-                ),
-            };
-
-            if range.begin > range.end {
-                self.raw.input.empty();
-                return Err(Error::InvalidLocationAddressRange);
-            }
-
-            return Ok(Some(LocationListEntry { range, data }));
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for LocListIter<R> {
-    type Item = LocationListEntry<R>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        LocListIter::next(self)
-    }
-}
-
-/// A location list entry from the `.debug_loc` or `.debug_loclists` sections.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LocationListEntry<R: Reader> {
-    /// The address range that this location is valid for.
-    pub range: Range,
-
-    /// The data containing a single location description.
-    pub data: Expression<R>,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::endianity::LittleEndian;
-    use crate::read::{EndianSlice, Range};
-    use crate::test_util::GimliSectionMethods;
-    use test_assembler::{Endian, Label, LabelMaker, Section};
-
-    #[test]
-    fn test_loclists_32() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 5,
-            address_size: 4,
-        };
-
-        let section = Section::with_endian(Endian::Little)
-            .L32(0x0300_0000)
-            .L32(0x0301_0300)
-            .L32(0x0301_0400)
-            .L32(0x0301_0500);
-        let buf = section.get_contents().unwrap();
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&buf, LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-
-        let start = Label::new();
-        let first = Label::new();
-        let size = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // Header
-            .mark(&start)
-            .L32(&size)
-            .L16(encoding.version)
-            .L8(encoding.address_size)
-            .L8(0)
-            .L32(0)
-            .mark(&first)
-            // OffsetPair
-            .L8(4).uleb(0x10200).uleb(0x10300).uleb(4).L32(2)
-            // A base address selection followed by an OffsetPair.
-            .L8(6).L32(0x0200_0000)
-            .L8(4).uleb(0x10400).uleb(0x10500).uleb(4).L32(3)
-            // An empty OffsetPair followed by a normal OffsetPair.
-            .L8(4).uleb(0x10600).uleb(0x10600).uleb(4).L32(4)
-            .L8(4).uleb(0x10800).uleb(0x10900).uleb(4).L32(5)
-            // A StartEnd
-            .L8(7).L32(0x201_0a00).L32(0x201_0b00).uleb(4).L32(6)
-            // A StartLength
-            .L8(8).L32(0x201_0c00).uleb(0x100).uleb(4).L32(7)
-            // An OffsetPair that starts at 0.
-            .L8(4).uleb(0).uleb(1).uleb(4).L32(8)
-            // An OffsetPair that ends at -1.
-            .L8(6).L32(0)
-            .L8(4).uleb(0).uleb(0xffff_ffff).uleb(4).L32(9)
-            // A DefaultLocation
-            .L8(5).uleb(4).L32(10)
-            // A BaseAddressx + OffsetPair
-            .L8(1).uleb(0)
-            .L8(4).uleb(0x10100).uleb(0x10200).uleb(4).L32(11)
-            // A StartxEndx
-            .L8(2).uleb(1).uleb(2).uleb(4).L32(12)
-            // A StartxLength
-            .L8(3).uleb(3).uleb(0x100).uleb(4).L32(13)
-            // A range end.
-            .L8(0)
-            // Some extra data.
-            .L32(0xffff_ffff);
-        size.set_const((&section.here() - &start - 4) as u64);
-
-        let buf = section.get_contents().unwrap();
-        let debug_loc = DebugLoc::new(&[], LittleEndian);
-        let debug_loclists = DebugLocLists::new(&buf, LittleEndian);
-        let loclists = LocationLists::new(debug_loc, debug_loclists);
-        let offset = LocationListsOffset((&first - &start) as usize);
-        let mut locations = loclists
-            .locations(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
-            .unwrap();
-
-        // A normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0101_0200,
-                    end: 0x0101_0300,
-                },
-                data: Expression(EndianSlice::new(&[2, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A base address selection followed by a normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0400,
-                    end: 0x0201_0500,
-                },
-                data: Expression(EndianSlice::new(&[3, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // An empty location range followed by a normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0600,
-                    end: 0x0201_0600,
-                },
-                data: Expression(EndianSlice::new(&[4, 0, 0, 0], LittleEndian)),
-            }))
-        );
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0800,
-                    end: 0x0201_0900,
-                },
-                data: Expression(EndianSlice::new(&[5, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0a00,
-                    end: 0x0201_0b00,
-                },
-                data: Expression(EndianSlice::new(&[6, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0c00,
-                    end: 0x0201_0d00,
-                },
-                data: Expression(EndianSlice::new(&[7, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location range that starts at 0.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0200_0000,
-                    end: 0x0200_0001,
-                },
-                data: Expression(EndianSlice::new(&[8, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location range that ends at -1.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0000_0000,
-                    end: 0xffff_ffff,
-                },
-                data: Expression(EndianSlice::new(&[9, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A DefaultLocation.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0,
-                    end: u64::max_value(),
-                },
-                data: Expression(EndianSlice::new(&[10, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A BaseAddressx + OffsetPair
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0301_0100,
-                    end: 0x0301_0200,
-                },
-                data: Expression(EndianSlice::new(&[11, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A StartxEndx
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0301_0300,
-                    end: 0x0301_0400,
-                },
-                data: Expression(EndianSlice::new(&[12, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A StartxLength
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0301_0500,
-                    end: 0x0301_0600,
-                },
-                data: Expression(EndianSlice::new(&[13, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location list end.
-        assert_eq!(locations.next(), Ok(None));
-
-        // An offset at the end of buf.
-        let mut locations = loclists
-            .locations(
-                LocationListsOffset(buf.len()),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(locations.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_loclists_64() {
-        let encoding = Encoding {
-            format: Format::Dwarf64,
-            version: 5,
-            address_size: 8,
-        };
-
-        let section = Section::with_endian(Endian::Little)
-            .L64(0x0300_0000)
-            .L64(0x0301_0300)
-            .L64(0x0301_0400)
-            .L64(0x0301_0500);
-        let buf = section.get_contents().unwrap();
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&buf, LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-
-        let start = Label::new();
-        let first = Label::new();
-        let size = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // Header
-            .mark(&start)
-            .L32(0xffff_ffff)
-            .L64(&size)
-            .L16(encoding.version)
-            .L8(encoding.address_size)
-            .L8(0)
-            .L32(0)
-            .mark(&first)
-            // OffsetPair
-            .L8(4).uleb(0x10200).uleb(0x10300).uleb(4).L32(2)
-            // A base address selection followed by an OffsetPair.
-            .L8(6).L64(0x0200_0000)
-            .L8(4).uleb(0x10400).uleb(0x10500).uleb(4).L32(3)
-            // An empty OffsetPair followed by a normal OffsetPair.
-            .L8(4).uleb(0x10600).uleb(0x10600).uleb(4).L32(4)
-            .L8(4).uleb(0x10800).uleb(0x10900).uleb(4).L32(5)
-            // A StartEnd
-            .L8(7).L64(0x201_0a00).L64(0x201_0b00).uleb(4).L32(6)
-            // A StartLength
-            .L8(8).L64(0x201_0c00).uleb(0x100).uleb(4).L32(7)
-            // An OffsetPair that starts at 0.
-            .L8(4).uleb(0).uleb(1).uleb(4).L32(8)
-            // An OffsetPair that ends at -1.
-            .L8(6).L64(0)
-            .L8(4).uleb(0).uleb(0xffff_ffff).uleb(4).L32(9)
-            // A DefaultLocation
-            .L8(5).uleb(4).L32(10)
-            // A BaseAddressx + OffsetPair
-            .L8(1).uleb(0)
-            .L8(4).uleb(0x10100).uleb(0x10200).uleb(4).L32(11)
-            // A StartxEndx
-            .L8(2).uleb(1).uleb(2).uleb(4).L32(12)
-            // A StartxLength
-            .L8(3).uleb(3).uleb(0x100).uleb(4).L32(13)
-            // A range end.
-            .L8(0)
-            // Some extra data.
-            .L32(0xffff_ffff);
-        size.set_const((&section.here() - &start - 12) as u64);
-
-        let buf = section.get_contents().unwrap();
-        let debug_loc = DebugLoc::new(&[], LittleEndian);
-        let debug_loclists = DebugLocLists::new(&buf, LittleEndian);
-        let loclists = LocationLists::new(debug_loc, debug_loclists);
-        let offset = LocationListsOffset((&first - &start) as usize);
-        let mut locations = loclists
-            .locations(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
-            .unwrap();
-
-        // A normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0101_0200,
-                    end: 0x0101_0300,
-                },
-                data: Expression(EndianSlice::new(&[2, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A base address selection followed by a normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0400,
-                    end: 0x0201_0500,
-                },
-                data: Expression(EndianSlice::new(&[3, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // An empty location range followed by a normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0600,
-                    end: 0x0201_0600,
-                },
-                data: Expression(EndianSlice::new(&[4, 0, 0, 0], LittleEndian)),
-            }))
-        );
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0800,
-                    end: 0x0201_0900,
-                },
-                data: Expression(EndianSlice::new(&[5, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0a00,
-                    end: 0x0201_0b00,
-                },
-                data: Expression(EndianSlice::new(&[6, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0c00,
-                    end: 0x0201_0d00,
-                },
-                data: Expression(EndianSlice::new(&[7, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location range that starts at 0.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0200_0000,
-                    end: 0x0200_0001,
-                },
-                data: Expression(EndianSlice::new(&[8, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location range that ends at -1.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0000_0000,
-                    end: 0xffff_ffff,
-                },
-                data: Expression(EndianSlice::new(&[9, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A DefaultLocation.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0,
-                    end: u64::max_value(),
-                },
-                data: Expression(EndianSlice::new(&[10, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A BaseAddressx + OffsetPair
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0301_0100,
-                    end: 0x0301_0200,
-                },
-                data: Expression(EndianSlice::new(&[11, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A StartxEndx
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0301_0300,
-                    end: 0x0301_0400,
-                },
-                data: Expression(EndianSlice::new(&[12, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A StartxLength
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0301_0500,
-                    end: 0x0301_0600,
-                },
-                data: Expression(EndianSlice::new(&[13, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location list end.
-        assert_eq!(locations.next(), Ok(None));
-
-        // An offset at the end of buf.
-        let mut locations = loclists
-            .locations(
-                LocationListsOffset(buf.len()),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(locations.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_location_list_32() {
-        let start = Label::new();
-        let first = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // A location before the offset.
-            .mark(&start)
-            .L32(0x10000).L32(0x10100).L16(4).L32(1)
-            .mark(&first)
-            // A normal location.
-            .L32(0x10200).L32(0x10300).L16(4).L32(2)
-            // A base address selection followed by a normal location.
-            .L32(0xffff_ffff).L32(0x0200_0000)
-            .L32(0x10400).L32(0x10500).L16(4).L32(3)
-            // An empty location range followed by a normal location.
-            .L32(0x10600).L32(0x10600).L16(4).L32(4)
-            .L32(0x10800).L32(0x10900).L16(4).L32(5)
-            // A location range that starts at 0.
-            .L32(0).L32(1).L16(4).L32(6)
-            // A location range that ends at -1.
-            .L32(0xffff_ffff).L32(0x0000_0000)
-            .L32(0).L32(0xffff_ffff).L16(4).L32(7)
-            // A location list end.
-            .L32(0).L32(0)
-            // Some extra data.
-            .L32(0);
-
-        let buf = section.get_contents().unwrap();
-        let debug_loc = DebugLoc::new(&buf, LittleEndian);
-        let debug_loclists = DebugLocLists::new(&[], LittleEndian);
-        let loclists = LocationLists::new(debug_loc, debug_loclists);
-        let offset = LocationListsOffset((&first - &start) as usize);
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut locations = loclists
-            .locations(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
-            .unwrap();
-
-        // A normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0101_0200,
-                    end: 0x0101_0300,
-                },
-                data: Expression(EndianSlice::new(&[2, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A base address selection followed by a normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0400,
-                    end: 0x0201_0500,
-                },
-                data: Expression(EndianSlice::new(&[3, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // An empty location range followed by a normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0600,
-                    end: 0x0201_0600,
-                },
-                data: Expression(EndianSlice::new(&[4, 0, 0, 0], LittleEndian)),
-            }))
-        );
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0800,
-                    end: 0x0201_0900,
-                },
-                data: Expression(EndianSlice::new(&[5, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location range that starts at 0.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0200_0000,
-                    end: 0x0200_0001,
-                },
-                data: Expression(EndianSlice::new(&[6, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location range that ends at -1.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0000_0000,
-                    end: 0xffff_ffff,
-                },
-                data: Expression(EndianSlice::new(&[7, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location list end.
-        assert_eq!(locations.next(), Ok(None));
-
-        // An offset at the end of buf.
-        let mut locations = loclists
-            .locations(
-                LocationListsOffset(buf.len()),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(locations.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_location_list_64() {
-        let start = Label::new();
-        let first = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // A location before the offset.
-            .mark(&start)
-            .L64(0x10000).L64(0x10100).L16(4).L32(1)
-            .mark(&first)
-            // A normal location.
-            .L64(0x10200).L64(0x10300).L16(4).L32(2)
-            // A base address selection followed by a normal location.
-            .L64(0xffff_ffff_ffff_ffff).L64(0x0200_0000)
-            .L64(0x10400).L64(0x10500).L16(4).L32(3)
-            // An empty location range followed by a normal location.
-            .L64(0x10600).L64(0x10600).L16(4).L32(4)
-            .L64(0x10800).L64(0x10900).L16(4).L32(5)
-            // A location range that starts at 0.
-            .L64(0).L64(1).L16(4).L32(6)
-            // A location range that ends at -1.
-            .L64(0xffff_ffff_ffff_ffff).L64(0x0000_0000)
-            .L64(0).L64(0xffff_ffff_ffff_ffff).L16(4).L32(7)
-            // A location list end.
-            .L64(0).L64(0)
-            // Some extra data.
-            .L64(0);
-
-        let buf = section.get_contents().unwrap();
-        let debug_loc = DebugLoc::new(&buf, LittleEndian);
-        let debug_loclists = DebugLocLists::new(&[], LittleEndian);
-        let loclists = LocationLists::new(debug_loc, debug_loclists);
-        let offset = LocationListsOffset((&first - &start) as usize);
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-        let encoding = Encoding {
-            format: Format::Dwarf64,
-            version: 4,
-            address_size: 8,
-        };
-        let mut locations = loclists
-            .locations(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
-            .unwrap();
-
-        // A normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0101_0200,
-                    end: 0x0101_0300,
-                },
-                data: Expression(EndianSlice::new(&[2, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A base address selection followed by a normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0400,
-                    end: 0x0201_0500,
-                },
-                data: Expression(EndianSlice::new(&[3, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // An empty location range followed by a normal location.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0600,
-                    end: 0x0201_0600,
-                },
-                data: Expression(EndianSlice::new(&[4, 0, 0, 0], LittleEndian)),
-            }))
-        );
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0201_0800,
-                    end: 0x0201_0900,
-                },
-                data: Expression(EndianSlice::new(&[5, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location range that starts at 0.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0200_0000,
-                    end: 0x0200_0001,
-                },
-                data: Expression(EndianSlice::new(&[6, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location range that ends at -1.
-        assert_eq!(
-            locations.next(),
-            Ok(Some(LocationListEntry {
-                range: Range {
-                    begin: 0x0,
-                    end: 0xffff_ffff_ffff_ffff,
-                },
-                data: Expression(EndianSlice::new(&[7, 0, 0, 0], LittleEndian)),
-            }))
-        );
-
-        // A location list end.
-        assert_eq!(locations.next(), Ok(None));
-
-        // An offset at the end of buf.
-        let mut locations = loclists
-            .locations(
-                LocationListsOffset(buf.len()),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(locations.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_locations_invalid() {
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // An invalid location range.
-            .L32(0x20000).L32(0x10000).L16(4).L32(1)
-            // An invalid range after wrapping.
-            .L32(0x20000).L32(0xff01_0000).L16(4).L32(2);
-
-        let buf = section.get_contents().unwrap();
-        let debug_loc = DebugLoc::new(&buf, LittleEndian);
-        let debug_loclists = DebugLocLists::new(&[], LittleEndian);
-        let loclists = LocationLists::new(debug_loc, debug_loclists);
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-
-        // An invalid location range.
-        let mut locations = loclists
-            .locations(
-                LocationListsOffset(0x0),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(locations.next(), Err(Error::InvalidLocationAddressRange));
-
-        // An invalid location range after wrapping.
-        let mut locations = loclists
-            .locations(
-                LocationListsOffset(14),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(locations.next(), Err(Error::InvalidLocationAddressRange));
-
-        // An invalid offset.
-        match loclists.locations(
-            LocationListsOffset(buf.len() + 1),
-            encoding,
-            0x0100_0000,
-            debug_addr,
-            debug_addr_base,
-        ) {
-            Err(Error::UnexpectedEof(_)) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_get_offset() {
-        for format in vec![Format::Dwarf32, Format::Dwarf64] {
-            let encoding = Encoding {
-                format,
-                version: 5,
-                address_size: 4,
-            };
-
-            let zero = Label::new();
-            let length = Label::new();
-            let start = Label::new();
-            let first = Label::new();
-            let end = Label::new();
-            let mut section = Section::with_endian(Endian::Little)
-                .mark(&zero)
-                .initial_length(format, &length, &start)
-                .D16(encoding.version)
-                .D8(encoding.address_size)
-                .D8(0)
-                .D32(20)
-                .mark(&first);
-            for i in 0..20 {
-                section = section.word(format.word_size(), 1000 + i);
-            }
-            section = section.mark(&end);
-            length.set_const((&end - &start) as u64);
-            let section = section.get_contents().unwrap();
-
-            let debug_loc = DebugLoc::from(EndianSlice::new(&[], LittleEndian));
-            let debug_loclists = DebugLocLists::from(EndianSlice::new(&section, LittleEndian));
-            let locations = LocationLists::new(debug_loc, debug_loclists);
-
-            let base = DebugLocListsBase((&first - &zero) as usize);
-            assert_eq!(
-                locations.get_offset(encoding, base, DebugLocListsIndex(0)),
-                Ok(LocationListsOffset(base.0 + 1000))
-            );
-            assert_eq!(
-                locations.get_offset(encoding, base, DebugLocListsIndex(19)),
-                Ok(LocationListsOffset(base.0 + 1019))
-            );
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/lookup.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/lookup.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/lookup.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/lookup.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-use core::marker::PhantomData;
-
-use crate::common::{DebugInfoOffset, Format};
-use crate::read::{parse_debug_info_offset, Error, Reader, ReaderOffset, Result, UnitOffset};
-
-// The various "Accelerated Access" sections (DWARF standard v4 Section 6.1) all have
-// similar structures. They consist of a header with metadata and an offset into the
-// .debug_info section for the entire compilation unit, and a series
-// of following entries that list addresses (for .debug_aranges) or names
-// (for .debug_pubnames and .debug_pubtypes) that are covered.
-//
-// Because these three tables all have similar structures, we abstract out some of
-// the parsing mechanics.
-
-pub trait LookupParser<R: Reader> {
-    /// The type of the produced header.
-    type Header;
-    /// The type of the produced entry.
-    type Entry;
-
-    /// Parse a header from `input`. Returns a tuple of `input` sliced to contain just the entries
-    /// corresponding to this header (without the header itself), and the parsed representation of
-    /// the header itself.
-    fn parse_header(input: &mut R) -> Result<(R, Self::Header)>;
-
-    /// Parse a single entry from `input`. Returns either a parsed representation of the entry
-    /// or None if `input` is exhausted.
-    fn parse_entry(input: &mut R, header: &Self::Header) -> Result<Option<Self::Entry>>;
-}
-
-#[derive(Clone, Debug)]
-pub struct DebugLookup<R, Parser>
-where
-    R: Reader,
-    Parser: LookupParser<R>,
-{
-    input_buffer: R,
-    phantom: PhantomData<Parser>,
-}
-
-impl<R, Parser> From<R> for DebugLookup<R, Parser>
-where
-    R: Reader,
-    Parser: LookupParser<R>,
-{
-    fn from(input_buffer: R) -> Self {
-        DebugLookup {
-            input_buffer,
-            phantom: PhantomData,
-        }
-    }
-}
-
-impl<R, Parser> DebugLookup<R, Parser>
-where
-    R: Reader,
-    Parser: LookupParser<R>,
-{
-    pub fn items(&self) -> LookupEntryIter<R, Parser> {
-        LookupEntryIter {
-            current_set: None,
-            remaining_input: self.input_buffer.clone(),
-        }
-    }
-
-    pub fn reader(&self) -> &R {
-        &self.input_buffer
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct LookupEntryIter<R, Parser>
-where
-    R: Reader,
-    Parser: LookupParser<R>,
-{
-    current_set: Option<(R, Parser::Header)>, // Only none at the very beginning and end.
-    remaining_input: R,
-}
-
-impl<R, Parser> LookupEntryIter<R, Parser>
-where
-    R: Reader,
-    Parser: LookupParser<R>,
-{
-    /// Advance the iterator and return the next entry.
-    ///
-    /// Returns the newly parsed entry as `Ok(Some(Parser::Entry))`. Returns
-    /// `Ok(None)` when iteration is complete and all entries have already been
-    /// parsed and yielded. If an error occurs while parsing the next entry,
-    /// then this error is returned as `Err(e)`, and all subsequent calls return
-    /// `Ok(None)`.
-    ///
-    /// Can be [used with `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn next(&mut self) -> Result<Option<Parser::Entry>> {
-        loop {
-            if let Some((ref mut input, ref header)) = self.current_set {
-                if !input.is_empty() {
-                    match Parser::parse_entry(input, header) {
-                        Ok(Some(entry)) => return Ok(Some(entry)),
-                        Ok(None) => {}
-                        Err(e) => {
-                            input.empty();
-                            self.remaining_input.empty();
-                            return Err(e);
-                        }
-                    }
-                }
-            }
-            if self.remaining_input.is_empty() {
-                self.current_set = None;
-                return Ok(None);
-            }
-            match Parser::parse_header(&mut self.remaining_input) {
-                Ok(set) => {
-                    self.current_set = Some(set);
-                }
-                Err(e) => {
-                    self.current_set = None;
-                    self.remaining_input.empty();
-                    return Err(e);
-                }
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct PubStuffHeader<T = usize> {
-    format: Format,
-    length: T,
-    version: u16,
-    unit_offset: DebugInfoOffset<T>,
-    unit_length: T,
-}
-
-pub trait PubStuffEntry<R: Reader> {
-    fn new(
-        die_offset: UnitOffset<R::Offset>,
-        name: R,
-        unit_header_offset: DebugInfoOffset<R::Offset>,
-    ) -> Self;
-}
-
-#[derive(Clone, Debug)]
-pub struct PubStuffParser<R, Entry>
-where
-    R: Reader,
-    Entry: PubStuffEntry<R>,
-{
-    // This struct is never instantiated.
-    phantom: PhantomData<(R, Entry)>,
-}
-
-impl<R, Entry> LookupParser<R> for PubStuffParser<R, Entry>
-where
-    R: Reader,
-    Entry: PubStuffEntry<R>,
-{
-    type Header = PubStuffHeader<R::Offset>;
-    type Entry = Entry;
-
-    /// Parse an pubthings set header. Returns a tuple of the
-    /// pubthings to be parsed for this set, and the newly created PubThingHeader struct.
-    fn parse_header(input: &mut R) -> Result<(R, Self::Header)> {
-        let (length, format) = input.read_initial_length()?;
-        let mut rest = input.split(length)?;
-
-        let version = rest.read_u16()?;
-        if version != 2 {
-            return Err(Error::UnknownVersion(u64::from(version)));
-        }
-
-        let unit_offset = parse_debug_info_offset(&mut rest, format)?;
-        let unit_length = rest.read_length(format)?;
-
-        let header = PubStuffHeader {
-            format,
-            length,
-            version,
-            unit_offset,
-            unit_length,
-        };
-        Ok((rest, header))
-    }
-
-    /// Parse a single pubthing. Return `None` for the null pubthing, `Some` for an actual pubthing.
-    fn parse_entry(input: &mut R, header: &Self::Header) -> Result<Option<Self::Entry>> {
-        let offset = input.read_offset(header.format)?;
-        if offset.into_u64() == 0 {
-            input.empty();
-            Ok(None)
-        } else {
-            let name = input.read_null_terminated_slice()?;
-            Ok(Some(Self::Entry::new(
-                UnitOffset(offset),
-                name,
-                header.unit_offset,
-            )))
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,758 +0,0 @@
-//! Read DWARF debugging information.
-//!
-//! * [Example Usage](#example-usage)
-//! * [API Structure](#api-structure)
-//! * [Using with `FallibleIterator`](#using-with-fallibleiterator)
-//!
-//! ## Example Usage
-//!
-//! Print out all of the functions in the debuggee program:
-//!
-//! ```rust,no_run
-//! # fn example() -> Result<(), gimli::Error> {
-//! # type R = gimli::EndianSlice<'static, gimli::LittleEndian>;
-//! # let get_file_section_reader = |name| -> Result<R, gimli::Error> { unimplemented!() };
-//! # let get_sup_file_section_reader = |name| -> Result<R, gimli::Error> { unimplemented!() };
-//! // Read the DWARF sections with whatever object loader you're using.
-//! // These closures should return a `Reader` instance (e.g. `EndianSlice`).
-//! let loader = |section: gimli::SectionId| { get_file_section_reader(section.name()) };
-//! let sup_loader = |section: gimli::SectionId| { get_sup_file_section_reader(section.name()) };
-//! let dwarf = gimli::Dwarf::load(loader, sup_loader)?;
-//!
-//! // Iterate over all compilation units.
-//! let mut iter = dwarf.units();
-//! while let Some(header) = iter.next()? {
-//!     // Parse the abbreviations and other information for this compilation unit.
-//!     let unit = dwarf.unit(header)?;
-//!
-//!     // Iterate over all of this compilation unit's entries.
-//!     let mut entries = unit.entries();
-//!     while let Some((_, entry)) = entries.next_dfs()? {
-//!         // If we find an entry for a function, print it.
-//!         if entry.tag() == gimli::DW_TAG_subprogram {
-//!             println!("Found a function: {:?}", entry);
-//!         }
-//!     }
-//! }
-//! # unreachable!()
-//! # }
-//! ```
-//!
-//! Full example programs:
-//!
-//!   * [A simple parser](https://github.com/gimli-rs/gimli/blob/master/examples/simple.rs)
-//!
-//!   * [A `dwarfdump`
-//!     clone](https://github.com/gimli-rs/gimli/blob/master/examples/dwarfdump.rs)
-//!
-//!   * [An `addr2line` clone](https://github.com/gimli-rs/addr2line)
-//!
-//!   * [`ddbug`](https://github.com/philipc/ddbug), a utility giving insight into
-//!     code generation by making debugging information readable
-//!
-//!   * [`dwprod`](https://github.com/fitzgen/dwprod), a tiny utility to list the
-//!     compilers used to create each compilation unit within a shared library or
-//!     executable (via `DW_AT_producer`)
-//!
-//!   * [`dwarf-validate`](http://github.com/gimli-rs/gimli/blob/master/examples/dwarf-validate.rs),
-//!     a program to validate the integrity of some DWARF and its references
-//!     between sections and compilation units.
-//!
-//! ## API Structure
-//!
-//! * Basic familiarity with DWARF is assumed.
-//!
-//! * The [`Dwarf`](./struct.Dwarf.html) type contains the commonly used DWARF
-//! sections. It has methods that simplify access to debugging data that spans
-//! multiple sections. Use of this type is optional, but recommended.
-//!
-//! * Each section gets its own type. Consider these types the entry points to
-//! the library:
-//!
-//!   * [`DebugAbbrev`](./struct.DebugAbbrev.html): The `.debug_abbrev` section.
-//!
-//!   * [`DebugAddr`](./struct.DebugAddr.html): The `.debug_addr` section.
-//!
-//!   * [`DebugAranges`](./struct.DebugAranges.html): The `.debug_aranges`
-//!   section.
-//!
-//!   * [`DebugFrame`](./struct.DebugFrame.html): The `.debug_frame` section.
-//!
-//!   * [`DebugInfo`](./struct.DebugInfo.html): The `.debug_info` section.
-//!
-//!   * [`DebugLine`](./struct.DebugLine.html): The `.debug_line` section.
-//!
-//!   * [`DebugLineStr`](./struct.DebugLineStr.html): The `.debug_line_str` section.
-//!
-//!   * [`DebugLoc`](./struct.DebugLoc.html): The `.debug_loc` section.
-//!
-//!   * [`DebugLocLists`](./struct.DebugLocLists.html): The `.debug_loclists` section.
-//!
-//!   * [`DebugPubNames`](./struct.DebugPubNames.html): The `.debug_pubnames`
-//!   section.
-//!
-//!   * [`DebugPubTypes`](./struct.DebugPubTypes.html): The `.debug_pubtypes`
-//!   section.
-//!
-//!   * [`DebugRanges`](./struct.DebugRanges.html): The `.debug_ranges` section.
-//!
-//!   * [`DebugRngLists`](./struct.DebugRngLists.html): The `.debug_rnglists` section.
-//!
-//!   * [`DebugStr`](./struct.DebugStr.html): The `.debug_str` section.
-//!
-//!   * [`DebugStrOffsets`](./struct.DebugStrOffsets.html): The `.debug_str_offsets` section.
-//!
-//!   * [`DebugTypes`](./struct.DebugTypes.html): The `.debug_types` section.
-//!
-//!   * [`EhFrame`](./struct.EhFrame.html): The `.eh_frame` section.
-//!
-//!   * [`EhFrameHdr`](./struct.EhFrameHdr.html): The `.eh_frame_hdr` section.
-//!
-//! * Each section type exposes methods for accessing the debugging data encoded
-//! in that section. For example, the [`DebugInfo`](./struct.DebugInfo.html)
-//! struct has the [`units`](./struct.DebugInfo.html#method.units) method for
-//! iterating over the compilation units defined within it.
-//!
-//! * Offsets into a section are strongly typed: an offset into `.debug_info` is
-//! the [`DebugInfoOffset`](./struct.DebugInfoOffset.html) type. It cannot be
-//! used to index into the [`DebugLine`](./struct.DebugLine.html) type because
-//! `DebugLine` represents the `.debug_line` section. There are similar types
-//! for offsets relative to a compilation unit rather than a section.
-//!
-//! ## Using with `FallibleIterator`
-//!
-//! The standard library's `Iterator` trait and related APIs do not play well
-//! with iterators where the `next` operation is fallible. One can make the
-//! `Iterator`'s associated `Item` type be a `Result<T, E>`, however the
-//! provided methods cannot gracefully handle the case when an `Err` is
-//! returned.
-//!
-//! This situation led to the
-//! [`fallible-iterator`](https://crates.io/crates/fallible-iterator) crate's
-//! existence. You can read more of the rationale for its existence in its
-//! docs. The crate provides the helpers you have come to expect (eg `map`,
-//! `filter`, etc) for iterators that can fail.
-//!
-//! `gimli`'s many lazy parsing iterators are a perfect match for the
-//! `fallible-iterator` crate's `FallibleIterator` trait because parsing is not
-//! done eagerly. Parse errors later in the input might only be discovered after
-//! having iterated through many items.
-//!
-//! To use `gimli` iterators with `FallibleIterator`, import the crate and trait
-//! into your code:
-//!
-//! ```
-//! # #[cfg(feature = "fallible-iterator")]
-//! # fn foo() {
-//! // Use the `FallibleIterator` trait so its methods are in scope!
-//! use fallible_iterator::FallibleIterator;
-//! use gimli::{DebugAranges, EndianSlice, LittleEndian};
-//!
-//! fn find_sum_of_address_range_lengths(aranges: DebugAranges<EndianSlice<LittleEndian>>)
-//!     -> gimli::Result<u64>
-//! {
-//!     // `DebugAranges::items` returns a `FallibleIterator`!
-//!     aranges.items()
-//!         // `map` is provided by `FallibleIterator`!
-//!         .map(|arange| Ok(arange.length()))
-//!         // `fold` is provided by `FallibleIterator`!
-//!         .fold(0, |sum, len| Ok(sum + len))
-//! }
-//! # }
-//! # fn main() {}
-//! ```
-
-use core::fmt::{self, Debug};
-use core::result;
-#[cfg(feature = "std")]
-use std::{error, io};
-
-use crate::common::{Register, SectionId};
-use crate::constants;
-
-mod addr;
-pub use self::addr::*;
-
-mod cfi;
-pub use self::cfi::*;
-
-mod dwarf;
-pub use self::dwarf::*;
-
-mod endian_slice;
-pub use self::endian_slice::*;
-
-#[cfg(feature = "endian-reader")]
-mod endian_reader;
-#[cfg(feature = "endian-reader")]
-pub use self::endian_reader::*;
-
-mod reader;
-pub use self::reader::*;
-
-mod abbrev;
-pub use self::abbrev::*;
-
-mod aranges;
-pub use self::aranges::*;
-
-mod line;
-pub use self::line::*;
-
-mod loclists;
-pub use self::loclists::*;
-
-mod lookup;
-
-mod op;
-pub use self::op::*;
-
-mod pubnames;
-pub use self::pubnames::*;
-
-mod pubtypes;
-pub use self::pubtypes::*;
-
-mod rnglists;
-pub use self::rnglists::*;
-
-mod str;
-pub use self::str::*;
-
-mod unit;
-pub use self::unit::*;
-
-mod value;
-pub use self::value::*;
-
-/// `EndianBuf` has been renamed to `EndianSlice`. For ease of upgrading across
-/// `gimli` versions, we export this type alias.
-#[deprecated(note = "EndianBuf has been renamed to EndianSlice, use that instead.")]
-pub type EndianBuf<'input, Endian> = EndianSlice<'input, Endian>;
-
-/// An error that occurred when parsing.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Error {
-    /// An I/O error occurred while reading.
-    Io,
-    /// Found a PC relative pointer, but the section base is undefined.
-    PcRelativePointerButSectionBaseIsUndefined,
-    /// Found a `.text` relative pointer, but the `.text` base is undefined.
-    TextRelativePointerButTextBaseIsUndefined,
-    /// Found a data relative pointer, but the data base is undefined.
-    DataRelativePointerButDataBaseIsUndefined,
-    /// Found a function relative pointer in a context that does not have a
-    /// function base.
-    FuncRelativePointerInBadContext,
-    /// Cannot parse a pointer with a `DW_EH_PE_omit` encoding.
-    CannotParseOmitPointerEncoding,
-    /// An error parsing an unsigned LEB128 value.
-    BadUnsignedLeb128,
-    /// An error parsing a signed LEB128 value.
-    BadSignedLeb128,
-    /// An abbreviation declared that its tag is zero, but zero is reserved for
-    /// null records.
-    AbbreviationTagZero,
-    /// An attribute specification declared that its form is zero, but zero is
-    /// reserved for null records.
-    AttributeFormZero,
-    /// The abbreviation's has-children byte was not one of
-    /// `DW_CHILDREN_{yes,no}`.
-    BadHasChildren,
-    /// The specified length is impossible.
-    BadLength,
-    /// Found an unknown `DW_FORM_*` type.
-    UnknownForm,
-    /// Expected a zero, found something else.
-    ExpectedZero,
-    /// Found an abbreviation code that has already been used.
-    DuplicateAbbreviationCode,
-    /// Found a duplicate arange.
-    DuplicateArange,
-    /// Found an unknown reserved length value.
-    UnknownReservedLength,
-    /// Found an unknown DWARF version.
-    UnknownVersion(u64),
-    /// Found a record with an unknown abbreviation code.
-    UnknownAbbreviation,
-    /// Hit the end of input before it was expected.
-    UnexpectedEof(ReaderOffsetId),
-    /// Read a null entry before it was expected.
-    UnexpectedNull,
-    /// Found an unknown standard opcode.
-    UnknownStandardOpcode(constants::DwLns),
-    /// Found an unknown extended opcode.
-    UnknownExtendedOpcode(constants::DwLne),
-    /// The specified address size is not supported.
-    UnsupportedAddressSize(u8),
-    /// The specified offset size is not supported.
-    UnsupportedOffsetSize(u8),
-    /// The specified field size is not supported.
-    UnsupportedFieldSize(u8),
-    /// The minimum instruction length must not be zero.
-    MinimumInstructionLengthZero,
-    /// The maximum operations per instruction must not be zero.
-    MaximumOperationsPerInstructionZero,
-    /// The line range must not be zero.
-    LineRangeZero,
-    /// The opcode base must not be zero.
-    OpcodeBaseZero,
-    /// Found an invalid UTF-8 string.
-    BadUtf8,
-    /// Expected to find the CIE ID, but found something else.
-    NotCieId,
-    /// Expected to find a pointer to a CIE, but found the CIE ID instead.
-    NotCiePointer,
-    /// Expected to find a pointer to an FDE, but found a CIE instead.
-    NotFdePointer,
-    /// Invalid branch target for a DW_OP_bra or DW_OP_skip.
-    BadBranchTarget(u64),
-    /// DW_OP_push_object_address used but no address passed in.
-    InvalidPushObjectAddress,
-    /// Not enough items on the stack when evaluating an expression.
-    NotEnoughStackItems,
-    /// Too many iterations to compute the expression.
-    TooManyIterations,
-    /// An unrecognized operation was found while parsing a DWARF
-    /// expression.
-    InvalidExpression(constants::DwOp),
-    /// The expression had a piece followed by an expression
-    /// terminator without a piece.
-    InvalidPiece,
-    /// An expression-terminating operation was followed by something
-    /// other than the end of the expression or a piece operation.
-    InvalidExpressionTerminator(u64),
-    /// Division or modulus by zero when evaluating an expression.
-    DivisionByZero,
-    /// An expression operation used mismatching types.
-    TypeMismatch,
-    /// An expression operation required an integral type but saw a
-    /// floating point type.
-    IntegralTypeRequired,
-    /// An expression operation used types that are not supported.
-    UnsupportedTypeOperation,
-    /// The shift value in an expression must be a non-negative integer.
-    InvalidShiftExpression,
-    /// An unknown DW_CFA_* instruction.
-    UnknownCallFrameInstruction(constants::DwCfa),
-    /// The end of an address range was before the beginning.
-    InvalidAddressRange,
-    /// The end offset of a loc list entry was before the beginning.
-    InvalidLocationAddressRange,
-    /// Encountered a call frame instruction in a context in which it is not
-    /// valid.
-    CfiInstructionInInvalidContext,
-    /// When evaluating call frame instructions, found a `DW_CFA_restore_state`
-    /// stack pop instruction, but the stack was empty, and had nothing to pop.
-    PopWithEmptyStack,
-    /// Do not have unwind info for the given address.
-    NoUnwindInfoForAddress,
-    /// An offset value was larger than the maximum supported value.
-    UnsupportedOffset,
-    /// The given pointer encoding is either unknown or invalid.
-    UnknownPointerEncoding,
-    /// Did not find an entry at the given offset.
-    NoEntryAtGivenOffset,
-    /// The given offset is out of bounds.
-    OffsetOutOfBounds,
-    /// Found an unknown CFI augmentation.
-    UnknownAugmentation,
-    /// We do not support the given pointer encoding yet.
-    UnsupportedPointerEncoding,
-    /// Registers larger than `u16` are not supported.
-    UnsupportedRegister(u64),
-    /// The CFI program defined more register rules than we have storage for.
-    TooManyRegisterRules,
-    /// Attempted to push onto the CFI stack, but it was already at full
-    /// capacity.
-    CfiStackFull,
-    /// The `.eh_frame_hdr` binary search table claims to be variable-length encoded,
-    /// which makes binary search impossible.
-    VariableLengthSearchTable,
-    /// The `DW_UT_*` value for this unit is not supported yet.
-    UnsupportedUnitType,
-    /// Ranges using AddressIndex are not supported yet.
-    UnsupportedAddressIndex,
-    /// Nonzero segment selector sizes aren't supported yet.
-    UnsupportedSegmentSize,
-    /// A compilation unit or type unit is missing its top level DIE.
-    MissingUnitDie,
-    /// A DIE attribute used an unsupported form.
-    UnsupportedAttributeForm,
-    /// Missing DW_LNCT_path in file entry format.
-    MissingFileEntryFormatPath,
-    /// Expected an attribute value to be a string form.
-    ExpectedStringAttributeValue,
-    /// `DW_FORM_implicit_const` used in an invalid context.
-    InvalidImplicitConst,
-}
-
-impl fmt::Display for Error {
-    #[inline]
-    fn fmt(&self, f: &mut fmt::Formatter) -> ::core::result::Result<(), fmt::Error> {
-        write!(f, "{}", self.description())
-    }
-}
-
-impl Error {
-    /// A short description of the error.
-    pub fn description(&self) -> &str {
-        match *self {
-            Error::Io => "An I/O error occurred while reading.",
-            Error::PcRelativePointerButSectionBaseIsUndefined => {
-                "Found a PC relative pointer, but the section base is undefined."
-            }
-            Error::TextRelativePointerButTextBaseIsUndefined => {
-                "Found a `.text` relative pointer, but the `.text` base is undefined."
-            }
-            Error::DataRelativePointerButDataBaseIsUndefined => {
-                "Found a data relative pointer, but the data base is undefined."
-            }
-            Error::FuncRelativePointerInBadContext => {
-                "Found a function relative pointer in a context that does not have a function base."
-            }
-            Error::CannotParseOmitPointerEncoding => {
-                "Cannot parse a pointer with a `DW_EH_PE_omit` encoding."
-            }
-            Error::BadUnsignedLeb128 => "An error parsing an unsigned LEB128 value",
-            Error::BadSignedLeb128 => "An error parsing a signed LEB128 value",
-            Error::AbbreviationTagZero => {
-                "An abbreviation declared that its tag is zero,
-                 but zero is reserved for null records"
-            }
-            Error::AttributeFormZero => {
-                "An attribute specification declared that its form is zero,
-                 but zero is reserved for null records"
-            }
-            Error::BadHasChildren => {
-                "The abbreviation's has-children byte was not one of
-                 `DW_CHILDREN_{yes,no}`"
-            }
-            Error::BadLength => "The specified length is impossible",
-            Error::UnknownForm => "Found an unknown `DW_FORM_*` type",
-            Error::ExpectedZero => "Expected a zero, found something else",
-            Error::DuplicateAbbreviationCode => {
-                "Found an abbreviation code that has already been used"
-            }
-            Error::DuplicateArange => "Found a duplicate arange",
-            Error::UnknownReservedLength => "Found an unknown reserved length value",
-            Error::UnknownVersion(_) => "Found an unknown DWARF version",
-            Error::UnknownAbbreviation => "Found a record with an unknown abbreviation code",
-            Error::UnexpectedEof(_) => "Hit the end of input before it was expected",
-            Error::UnexpectedNull => "Read a null entry before it was expected.",
-            Error::UnknownStandardOpcode(_) => "Found an unknown standard opcode",
-            Error::UnknownExtendedOpcode(_) => "Found an unknown extended opcode",
-            Error::UnsupportedAddressSize(_) => "The specified address size is not supported",
-            Error::UnsupportedOffsetSize(_) => "The specified offset size is not supported",
-            Error::UnsupportedFieldSize(_) => "The specified field size is not supported",
-            Error::MinimumInstructionLengthZero => {
-                "The minimum instruction length must not be zero."
-            }
-            Error::MaximumOperationsPerInstructionZero => {
-                "The maximum operations per instruction must not be zero."
-            }
-            Error::LineRangeZero => "The line range must not be zero.",
-            Error::OpcodeBaseZero => "The opcode base must not be zero.",
-            Error::BadUtf8 => "Found an invalid UTF-8 string.",
-            Error::NotCieId => "Expected to find the CIE ID, but found something else.",
-            Error::NotCiePointer => "Expected to find a CIE pointer, but found the CIE ID instead.",
-            Error::NotFdePointer => {
-                "Expected to find an FDE pointer, but found a CIE pointer instead."
-            }
-            Error::BadBranchTarget(_) => "Invalid branch target in DWARF expression",
-            Error::InvalidPushObjectAddress => {
-                "DW_OP_push_object_address used but no object address given"
-            }
-            Error::NotEnoughStackItems => "Not enough items on stack when evaluating expression",
-            Error::TooManyIterations => "Too many iterations to evaluate DWARF expression",
-            Error::InvalidExpression(_) => "Invalid opcode in DWARF expression",
-            Error::InvalidPiece => {
-                "DWARF expression has piece followed by non-piece expression at end"
-            }
-            Error::InvalidExpressionTerminator(_) => "Expected DW_OP_piece or DW_OP_bit_piece",
-            Error::DivisionByZero => "Division or modulus by zero when evaluating expression",
-            Error::TypeMismatch => "Type mismatch when evaluating expression",
-            Error::IntegralTypeRequired => "Integral type expected when evaluating expression",
-            Error::UnsupportedTypeOperation => {
-                "An expression operation used types that are not supported"
-            }
-            Error::InvalidShiftExpression => {
-                "The shift value in an expression must be a non-negative integer."
-            }
-            Error::UnknownCallFrameInstruction(_) => "An unknown DW_CFA_* instructiion",
-            Error::InvalidAddressRange => {
-                "The end of an address range must not be before the beginning."
-            }
-            Error::InvalidLocationAddressRange => {
-                "The end offset of a location list entry must not be before the beginning."
-            }
-            Error::CfiInstructionInInvalidContext => {
-                "Encountered a call frame instruction in a context in which it is not valid."
-            }
-            Error::PopWithEmptyStack => {
-                "When evaluating call frame instructions, found a `DW_CFA_restore_state` stack pop \
-                 instruction, but the stack was empty, and had nothing to pop."
-            }
-            Error::NoUnwindInfoForAddress => "Do not have unwind info for the given address.",
-            Error::UnsupportedOffset => {
-                "An offset value was larger than the maximum supported value."
-            }
-            Error::UnknownPointerEncoding => {
-                "The given pointer encoding is either unknown or invalid."
-            }
-            Error::NoEntryAtGivenOffset => "Did not find an entry at the given offset.",
-            Error::OffsetOutOfBounds => "The given offset is out of bounds.",
-            Error::UnknownAugmentation => "Found an unknown CFI augmentation.",
-            Error::UnsupportedPointerEncoding => {
-                "We do not support the given pointer encoding yet."
-            }
-            Error::UnsupportedRegister(_) => "Registers larger than `u16` are not supported.",
-            Error::TooManyRegisterRules => {
-                "The CFI program defined more register rules than we have storage for."
-            }
-            Error::CfiStackFull => {
-                "Attempted to push onto the CFI stack, but it was already at full capacity."
-            }
-            Error::VariableLengthSearchTable => {
-                "The `.eh_frame_hdr` binary search table claims to be variable-length encoded, \
-                 which makes binary search impossible."
-            }
-            Error::UnsupportedUnitType => "The `DW_UT_*` value for this unit is not supported yet",
-            Error::UnsupportedAddressIndex => "Ranges involving AddressIndex are not supported yet",
-            Error::UnsupportedSegmentSize => "Nonzero segment size not supported yet",
-            Error::MissingUnitDie => {
-                "A compilation unit or type unit is missing its top level DIE."
-            }
-            Error::UnsupportedAttributeForm => "A DIE attribute used an unsupported form.",
-            Error::MissingFileEntryFormatPath => "Missing DW_LNCT_path in file entry format.",
-            Error::ExpectedStringAttributeValue => {
-                "Expected an attribute value to be a string form."
-            }
-            Error::InvalidImplicitConst => "DW_FORM_implicit_const used in an invalid context.",
-        }
-    }
-}
-
-#[cfg(feature = "std")]
-impl error::Error for Error {}
-
-#[cfg(feature = "std")]
-impl From<io::Error> for Error {
-    fn from(_: io::Error) -> Self {
-        Error::Io
-    }
-}
-
-/// The result of a parse.
-pub type Result<T> = result::Result<T, Error>;
-
-/// A convenience trait for loading DWARF sections from object files.  To be
-/// used like:
-///
-/// ```
-/// use gimli::{DebugInfo, EndianSlice, LittleEndian, Reader, Section};
-///
-/// let buf = [0x00, 0x01, 0x02, 0x03];
-/// let reader = EndianSlice::new(&buf, LittleEndian);
-/// let loader = |name| -> Result<_, ()> { Ok(reader) };
-///
-/// let debug_info: DebugInfo<_> = Section::load(loader).unwrap();
-/// ```
-pub trait Section<R>: From<R> {
-    /// Returns the section id for this type.
-    fn id() -> SectionId;
-
-    /// Returns the ELF section name for this type.
-    fn section_name() -> &'static str {
-        Self::id().name()
-    }
-
-    /// Returns the ELF section name (if any) for this type when used in a dwo
-    /// file.
-    fn dwo_section_name() -> Option<&'static str> {
-        Self::id().dwo_name()
-    }
-
-    /// Try to load the section using the given loader function.
-    fn load<F, E>(f: F) -> core::result::Result<Self, E>
-    where
-        F: FnOnce(SectionId) -> core::result::Result<R, E>,
-    {
-        f(Self::id()).map(From::from)
-    }
-
-    /// Returns the `Reader` for this section.
-    fn reader(&self) -> &R
-    where
-        R: Reader;
-
-    /// Returns the `Reader` for this section.
-    fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(SectionId, R::Offset)>
-    where
-        R: Reader,
-    {
-        self.reader()
-            .lookup_offset_id(id)
-            .map(|offset| (Self::id(), offset))
-    }
-}
-
-impl Register {
-    pub(crate) fn from_u64(x: u64) -> Result<Register> {
-        let y = x as u16;
-        if u64::from(y) == x {
-            Ok(Register(y))
-        } else {
-            Err(Error::UnsupportedRegister(x))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::common::Format;
-    use crate::endianity::LittleEndian;
-    use test_assembler::{Endian, Section};
-
-    #[test]
-    fn test_parse_initial_length_32_ok() {
-        let section = Section::with_endian(Endian::Little).L32(0x7856_3412);
-        let buf = section.get_contents().unwrap();
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        match input.read_initial_length() {
-            Ok((length, format)) => {
-                assert_eq!(input.len(), 0);
-                assert_eq!(format, Format::Dwarf32);
-                assert_eq!(0x7856_3412, length);
-            }
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_parse_initial_length_64_ok() {
-        let section = Section::with_endian(Endian::Little)
-            // Dwarf_64_INITIAL_UNIT_LENGTH
-            .L32(0xffff_ffff)
-            // Actual length
-            .L64(0xffde_bc9a_7856_3412);
-        let buf = section.get_contents().unwrap();
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-
-        #[cfg(target_pointer_width = "64")]
-        match input.read_initial_length() {
-            Ok((length, format)) => {
-                assert_eq!(input.len(), 0);
-                assert_eq!(format, Format::Dwarf64);
-                assert_eq!(0xffde_bc9a_7856_3412, length);
-            }
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-
-        #[cfg(target_pointer_width = "32")]
-        match input.read_initial_length() {
-            Err(Error::UnsupportedOffset) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_initial_length_unknown_reserved_value() {
-        let section = Section::with_endian(Endian::Little).L32(0xffff_fffe);
-        let buf = section.get_contents().unwrap();
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        match input.read_initial_length() {
-            Err(Error::UnknownReservedLength) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_initial_length_incomplete() {
-        let buf = [0xff, 0xff, 0xff]; // Need at least 4 bytes.
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        match input.read_initial_length() {
-            Err(Error::UnexpectedEof(_)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_initial_length_64_incomplete() {
-        let section = Section::with_endian(Endian::Little)
-            // Dwarf_64_INITIAL_UNIT_LENGTH
-            .L32(0xffff_ffff)
-            // Actual length is not long enough.
-            .L32(0x7856_3412);
-        let buf = section.get_contents().unwrap();
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        match input.read_initial_length() {
-            Err(Error::UnexpectedEof(_)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_offset_32() {
-        let section = Section::with_endian(Endian::Little).L32(0x0123_4567);
-        let buf = section.get_contents().unwrap();
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        match input.read_offset(Format::Dwarf32) {
-            Ok(val) => {
-                assert_eq!(input.len(), 0);
-                assert_eq!(val, 0x0123_4567);
-            }
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_offset_64_small() {
-        let section = Section::with_endian(Endian::Little).L64(0x0123_4567);
-        let buf = section.get_contents().unwrap();
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        match input.read_offset(Format::Dwarf64) {
-            Ok(val) => {
-                assert_eq!(input.len(), 0);
-                assert_eq!(val, 0x0123_4567);
-            }
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_offset_64_large() {
-        let section = Section::with_endian(Endian::Little).L64(0x0123_4567_89ab_cdef);
-        let buf = section.get_contents().unwrap();
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        match input.read_offset(Format::Dwarf64) {
-            Ok(val) => {
-                assert_eq!(input.len(), 0);
-                assert_eq!(val, 0x0123_4567_89ab_cdef);
-            }
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "32")]
-    fn test_parse_offset_64_large() {
-        let section = Section::with_endian(Endian::Little).L64(0x0123_4567_89ab_cdef);
-        let buf = section.get_contents().unwrap();
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        match input.read_offset(Format::Dwarf64) {
-            Err(Error::UnsupportedOffset) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/op.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/op.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/op.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/op.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3910 +0,0 @@
-//! Functions for parsing and evaluating DWARF expressions.
-
-use alloc::vec::Vec;
-use core::mem;
-
-use crate::common::{DebugAddrIndex, DebugInfoOffset, Encoding, Register};
-use crate::constants;
-use crate::read::{Error, Reader, ReaderOffset, Result, UnitOffset, Value, ValueType};
-
-/// A reference to a DIE, either relative to the current CU or
-/// relative to the section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum DieReference<T = usize> {
-    /// A CU-relative reference.
-    UnitRef(UnitOffset<T>),
-    /// A section-relative reference.
-    DebugInfoRef(DebugInfoOffset<T>),
-}
-
-/// A single decoded DWARF expression operation.
-///
-/// DWARF expression evaluation is done in two parts: first the raw
-/// bytes of the next part of the expression are decoded; and then the
-/// decoded operation is evaluated.  This approach lets other
-/// consumers inspect the DWARF expression without reimplementing the
-/// decoding operation.
-///
-/// Multiple DWARF opcodes may decode into a single `Operation`.  For
-/// example, both `DW_OP_deref` and `DW_OP_xderef` are represented
-/// using `Operation::Deref`.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Operation<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Dereference the topmost value of the stack.
-    Deref {
-        /// The DIE of the base type or 0 to indicate the generic type
-        base_type: UnitOffset<Offset>,
-        /// The size of the data to dereference.
-        size: u8,
-        /// True if the dereference operation takes an address space
-        /// argument from the stack; false otherwise.
-        space: bool,
-    },
-    /// Drop an item from the stack.
-    Drop,
-    /// Pick an item from the stack and push it on top of the stack.
-    /// This operation handles `DW_OP_pick`, `DW_OP_dup`, and
-    /// `DW_OP_over`.
-    Pick {
-        /// The index, from the top of the stack, of the item to copy.
-        index: u8,
-    },
-    /// Swap the top two stack items.
-    Swap,
-    /// Rotate the top three stack items.
-    Rot,
-    /// Take the absolute value of the top of the stack.
-    Abs,
-    /// Bitwise `and` of the top two values on the stack.
-    And,
-    /// Divide the top two values on the stack.
-    Div,
-    /// Subtract the top two values on the stack.
-    Minus,
-    /// Modulus of the top two values on the stack.
-    Mod,
-    /// Multiply the top two values on the stack.
-    Mul,
-    /// Negate the top of the stack.
-    Neg,
-    /// Bitwise `not` of the top of the stack.
-    Not,
-    /// Bitwise `or` of the top two values on the stack.
-    Or,
-    /// Add the top two values on the stack.
-    Plus,
-    /// Add a constant to the topmost value on the stack.
-    PlusConstant {
-        /// The value to add.
-        value: u64,
-    },
-    /// Logical left shift of the 2nd value on the stack by the number
-    /// of bits given by the topmost value on the stack.
-    Shl,
-    /// Right shift of the 2nd value on the stack by the number of
-    /// bits given by the topmost value on the stack.
-    Shr,
-    /// Arithmetic left shift of the 2nd value on the stack by the
-    /// number of bits given by the topmost value on the stack.
-    Shra,
-    /// Bitwise `xor` of the top two values on the stack.
-    Xor,
-    /// Branch to the target location if the top of stack is nonzero.
-    Bra {
-        /// The relative offset to the target bytecode.
-        target: i16,
-    },
-    /// Compare the top two stack values for equality.
-    Eq,
-    /// Compare the top two stack values using `>=`.
-    Ge,
-    /// Compare the top two stack values using `>`.
-    Gt,
-    /// Compare the top two stack values using `<=`.
-    Le,
-    /// Compare the top two stack values using `<`.
-    Lt,
-    /// Compare the top two stack values using `!=`.
-    Ne,
-    /// Unconditional branch to the target location.
-    Skip {
-        /// The relative offset to the target bytecode.
-        target: i16,
-    },
-    /// Push an unsigned constant value on the stack.  This handles multiple
-    /// DWARF opcodes.
-    UnsignedConstant {
-        /// The value to push.
-        value: u64,
-    },
-    /// Push a signed constant value on the stack.  This handles multiple
-    /// DWARF opcodes.
-    SignedConstant {
-        /// The value to push.
-        value: i64,
-    },
-    /// Indicate that this piece's location is in the given register.
-    /// Completes the piece or expression.
-    Register {
-        /// The register number.
-        register: Register,
-    },
-    /// Find the value of the given register, add the offset, and then
-    /// push the resulting sum on the stack.
-    RegisterOffset {
-        /// The register number.
-        register: Register,
-        /// The offset to add.
-        offset: i64,
-        /// The DIE of the base type or 0 to indicate the generic type
-        base_type: UnitOffset<Offset>,
-    },
-    /// Compute the frame base (using `DW_AT_frame_base`), add the
-    /// given offset, and then push the resulting sum on the stack.
-    FrameOffset {
-        /// The offset to add.
-        offset: i64,
-    },
-    /// No operation.
-    Nop,
-    /// Push the object address on the stack.
-    PushObjectAddress,
-    /// Evaluate a DWARF expression as a subroutine.  The expression
-    /// comes from the `DW_AT_location` attribute of the indicated
-    /// DIE.
-    Call {
-        /// The DIE to use.
-        offset: DieReference<Offset>,
-    },
-    /// Compute the address of a thread-local variable and push it on
-    /// the stack.
-    TLS,
-    /// Compute the call frame CFA and push it on the stack.
-    CallFrameCFA,
-    /// Terminate a piece.
-    Piece {
-        /// The size of this piece in bits.
-        size_in_bits: u64,
-        /// The bit offset of this piece.  If `None`, then this piece
-        /// was specified using `DW_OP_piece` and should start at the
-        /// next byte boundary.
-        bit_offset: Option<u64>,
-    },
-    /// Represents `DW_OP_implicit_value`.
-    /// The object has no location, but has a known constant value.
-    /// Completes the piece or expression.
-    ImplicitValue {
-        /// The implicit value to use.
-        data: R,
-    },
-    /// Represents `DW_OP_stack_value`.
-    /// The object has no location, but its value is at the top of the stack.
-    /// Completes the piece or expression.
-    StackValue,
-    /// Represents `DW_OP_implicit_pointer`. The object is a pointer to
-    /// a value which has no actual location, such as an implicit value or
-    /// a stack value.
-    /// Completes the piece or expression.
-    ImplicitPointer {
-        /// The `.debug_info` offset of the value that this is an implicit pointer into.
-        value: DebugInfoOffset<Offset>,
-        /// The byte offset into the value that the implicit pointer points to.
-        byte_offset: i64,
-    },
-    /// Represents `DW_OP_entry_value`. Evaluate an expression at the entry to
-    /// the current subprogram, and push it on the stack.
-    EntryValue {
-        /// The expression to be evaluated.
-        expression: R,
-    },
-    /// Represents `DW_OP_GNU_parameter_ref`. This represents a parameter that was
-    /// optimized out. The offset points to the definition of the parameter, and is
-    /// matched to the `DW_TAG_GNU_call_site_parameter` in the caller that also
-    /// points to the same definition of the parameter.
-    ParameterRef {
-        /// The DIE to use.
-        offset: UnitOffset<Offset>,
-    },
-    /// Represents `DW_OP_addr`.
-    /// Relocate the address if needed, and push it on the stack.
-    Address {
-        /// The offset to add.
-        address: u64,
-    },
-    /// Represents `DW_OP_addrx`.
-    /// Read the address at the given index in `.debug_addr, relocate the address if needed,
-    /// and push it on the stack.
-    AddressIndex {
-        /// The index of the address in `.debug_addr`.
-        index: DebugAddrIndex<Offset>,
-    },
-    /// Represents `DW_OP_constx`.
-    /// Read the address at the given index in `.debug_addr, and push it on the stack.
-    /// Do not relocate the address.
-    ConstantIndex {
-        /// The index of the address in `.debug_addr`.
-        index: DebugAddrIndex<Offset>,
-    },
-    /// Represents `DW_OP_const_type`.
-    /// Interpret the value bytes as a constant of a given type, and push it on the stack.
-    TypedLiteral {
-        /// The DIE of the base type.
-        base_type: UnitOffset<Offset>,
-        /// The value bytes.
-        value: R,
-    },
-    /// Represents `DW_OP_convert`.
-    /// Pop the top stack entry, convert it to a different type, and push it on the stack.
-    Convert {
-        /// The DIE of the base type.
-        base_type: UnitOffset<Offset>,
-    },
-    /// Represents `DW_OP_reinterpret`.
-    /// Pop the top stack entry, reinterpret the bits in its value as a different type,
-    /// and push it on the stack.
-    Reinterpret {
-        /// The DIE of the base type.
-        base_type: UnitOffset<Offset>,
-    },
-}
-
-#[derive(Debug)]
-enum OperationEvaluationResult<R: Reader> {
-    Piece,
-    Incomplete,
-    Complete { location: Location<R> },
-    Waiting(EvaluationWaiting<R>, EvaluationResult<R>),
-}
-
-/// A single location of a piece of the result of a DWARF expression.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Location<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// The piece is empty.  Ordinarily this means the piece has been
-    /// optimized away.
-    Empty,
-    /// The piece is found in a register.
-    Register {
-        /// The register number.
-        register: Register,
-    },
-    /// The piece is found in memory.
-    Address {
-        /// The address.
-        address: u64,
-    },
-    /// The piece has no location but its value is known.
-    Value {
-        /// The value.
-        value: Value,
-    },
-    /// The piece is represented by some constant bytes.
-    Bytes {
-        /// The value.
-        value: R,
-    },
-    /// The piece is a pointer to a value which has no actual location.
-    ImplicitPointer {
-        /// The `.debug_info` offset of the value that this is an implicit pointer into.
-        value: DebugInfoOffset<Offset>,
-        /// The byte offset into the value that the implicit pointer points to.
-        byte_offset: i64,
-    },
-}
-
-impl<R, Offset> Location<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Return true if the piece is empty.
-    pub fn is_empty(&self) -> bool {
-        match *self {
-            Location::Empty => true,
-            _ => false,
-        }
-    }
-}
-
-/// The description of a single piece of the result of a DWARF
-/// expression.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Piece<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// If given, the size of the piece in bits.  If `None`, there
-    /// must be only one piece whose size is all of the object.
-    pub size_in_bits: Option<u64>,
-    /// If given, the bit offset of the piece within the location.
-    /// If the location is a `Location::Register` or `Location::Value`,
-    /// then this offset is from the least significant bit end of
-    /// the register or value.
-    /// If the location is a `Location::Address` then the offset uses
-    /// the bit numbering and direction conventions of the language
-    /// and target system.
-    ///
-    /// If `None`, the piece starts at the location. If the
-    /// location is a register whose size is larger than the piece,
-    /// then placement within the register is defined by the ABI.
-    pub bit_offset: Option<u64>,
-    /// Where this piece is to be found.
-    pub location: Location<R, Offset>,
-}
-
-// A helper function to handle branch offsets.
-fn compute_pc<R: Reader>(pc: &R, bytecode: &R, offset: i16) -> Result<R> {
-    let pc_offset = pc.offset_from(bytecode);
-    let new_pc_offset = pc_offset.wrapping_add(R::Offset::from_i16(offset));
-    if new_pc_offset > bytecode.len() {
-        Err(Error::BadBranchTarget(new_pc_offset.into_u64()))
-    } else {
-        let mut new_pc = bytecode.clone();
-        new_pc.skip(new_pc_offset)?;
-        Ok(new_pc)
-    }
-}
-
-fn generic_type<O: ReaderOffset>() -> UnitOffset<O> {
-    UnitOffset(O::from_u64(0).unwrap())
-}
-
-impl<R, Offset> Operation<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Parse a single DWARF expression operation.
-    ///
-    /// This is useful when examining a DWARF expression for reasons other
-    /// than direct evaluation.
-    ///
-    /// `bytes` points to a the operation to decode.  It should point into
-    /// the same array as `bytecode`, which should be the entire
-    /// expression.
-    pub fn parse(bytes: &mut R, encoding: Encoding) -> Result<Operation<R, Offset>> {
-        let opcode = bytes.read_u8()?;
-        let name = constants::DwOp(opcode);
-        match name {
-            constants::DW_OP_addr => {
-                let address = bytes.read_address(encoding.address_size)?;
-                Ok(Operation::Address { address })
-            }
-            constants::DW_OP_deref => Ok(Operation::Deref {
-                base_type: generic_type(),
-                size: encoding.address_size,
-                space: false,
-            }),
-            constants::DW_OP_const1u => {
-                let value = bytes.read_u8()?;
-                Ok(Operation::UnsignedConstant {
-                    value: u64::from(value),
-                })
-            }
-            constants::DW_OP_const1s => {
-                let value = bytes.read_i8()?;
-                Ok(Operation::SignedConstant {
-                    value: i64::from(value),
-                })
-            }
-            constants::DW_OP_const2u => {
-                let value = bytes.read_u16()?;
-                Ok(Operation::UnsignedConstant {
-                    value: u64::from(value),
-                })
-            }
-            constants::DW_OP_const2s => {
-                let value = bytes.read_i16()?;
-                Ok(Operation::SignedConstant {
-                    value: i64::from(value),
-                })
-            }
-            constants::DW_OP_const4u => {
-                let value = bytes.read_u32()?;
-                Ok(Operation::UnsignedConstant {
-                    value: u64::from(value),
-                })
-            }
-            constants::DW_OP_const4s => {
-                let value = bytes.read_i32()?;
-                Ok(Operation::SignedConstant {
-                    value: i64::from(value),
-                })
-            }
-            constants::DW_OP_const8u => {
-                let value = bytes.read_u64()?;
-                Ok(Operation::UnsignedConstant { value })
-            }
-            constants::DW_OP_const8s => {
-                let value = bytes.read_i64()?;
-                Ok(Operation::SignedConstant { value })
-            }
-            constants::DW_OP_constu => {
-                let value = bytes.read_uleb128()?;
-                Ok(Operation::UnsignedConstant { value })
-            }
-            constants::DW_OP_consts => {
-                let value = bytes.read_sleb128()?;
-                Ok(Operation::SignedConstant { value })
-            }
-            constants::DW_OP_dup => Ok(Operation::Pick { index: 0 }),
-            constants::DW_OP_drop => Ok(Operation::Drop),
-            constants::DW_OP_over => Ok(Operation::Pick { index: 1 }),
-            constants::DW_OP_pick => {
-                let value = bytes.read_u8()?;
-                Ok(Operation::Pick { index: value })
-            }
-            constants::DW_OP_swap => Ok(Operation::Swap),
-            constants::DW_OP_rot => Ok(Operation::Rot),
-            constants::DW_OP_xderef => Ok(Operation::Deref {
-                base_type: generic_type(),
-                size: encoding.address_size,
-                space: true,
-            }),
-            constants::DW_OP_abs => Ok(Operation::Abs),
-            constants::DW_OP_and => Ok(Operation::And),
-            constants::DW_OP_div => Ok(Operation::Div),
-            constants::DW_OP_minus => Ok(Operation::Minus),
-            constants::DW_OP_mod => Ok(Operation::Mod),
-            constants::DW_OP_mul => Ok(Operation::Mul),
-            constants::DW_OP_neg => Ok(Operation::Neg),
-            constants::DW_OP_not => Ok(Operation::Not),
-            constants::DW_OP_or => Ok(Operation::Or),
-            constants::DW_OP_plus => Ok(Operation::Plus),
-            constants::DW_OP_plus_uconst => {
-                let value = bytes.read_uleb128()?;
-                Ok(Operation::PlusConstant { value })
-            }
-            constants::DW_OP_shl => Ok(Operation::Shl),
-            constants::DW_OP_shr => Ok(Operation::Shr),
-            constants::DW_OP_shra => Ok(Operation::Shra),
-            constants::DW_OP_xor => Ok(Operation::Xor),
-            constants::DW_OP_bra => {
-                let target = bytes.read_i16()?;
-                Ok(Operation::Bra { target })
-            }
-            constants::DW_OP_eq => Ok(Operation::Eq),
-            constants::DW_OP_ge => Ok(Operation::Ge),
-            constants::DW_OP_gt => Ok(Operation::Gt),
-            constants::DW_OP_le => Ok(Operation::Le),
-            constants::DW_OP_lt => Ok(Operation::Lt),
-            constants::DW_OP_ne => Ok(Operation::Ne),
-            constants::DW_OP_skip => {
-                let target = bytes.read_i16()?;
-                Ok(Operation::Skip { target })
-            }
-            constants::DW_OP_lit0
-            | constants::DW_OP_lit1
-            | constants::DW_OP_lit2
-            | constants::DW_OP_lit3
-            | constants::DW_OP_lit4
-            | constants::DW_OP_lit5
-            | constants::DW_OP_lit6
-            | constants::DW_OP_lit7
-            | constants::DW_OP_lit8
-            | constants::DW_OP_lit9
-            | constants::DW_OP_lit10
-            | constants::DW_OP_lit11
-            | constants::DW_OP_lit12
-            | constants::DW_OP_lit13
-            | constants::DW_OP_lit14
-            | constants::DW_OP_lit15
-            | constants::DW_OP_lit16
-            | constants::DW_OP_lit17
-            | constants::DW_OP_lit18
-            | constants::DW_OP_lit19
-            | constants::DW_OP_lit20
-            | constants::DW_OP_lit21
-            | constants::DW_OP_lit22
-            | constants::DW_OP_lit23
-            | constants::DW_OP_lit24
-            | constants::DW_OP_lit25
-            | constants::DW_OP_lit26
-            | constants::DW_OP_lit27
-            | constants::DW_OP_lit28
-            | constants::DW_OP_lit29
-            | constants::DW_OP_lit30
-            | constants::DW_OP_lit31 => Ok(Operation::UnsignedConstant {
-                value: (opcode - constants::DW_OP_lit0.0).into(),
-            }),
-            constants::DW_OP_reg0
-            | constants::DW_OP_reg1
-            | constants::DW_OP_reg2
-            | constants::DW_OP_reg3
-            | constants::DW_OP_reg4
-            | constants::DW_OP_reg5
-            | constants::DW_OP_reg6
-            | constants::DW_OP_reg7
-            | constants::DW_OP_reg8
-            | constants::DW_OP_reg9
-            | constants::DW_OP_reg10
-            | constants::DW_OP_reg11
-            | constants::DW_OP_reg12
-            | constants::DW_OP_reg13
-            | constants::DW_OP_reg14
-            | constants::DW_OP_reg15
-            | constants::DW_OP_reg16
-            | constants::DW_OP_reg17
-            | constants::DW_OP_reg18
-            | constants::DW_OP_reg19
-            | constants::DW_OP_reg20
-            | constants::DW_OP_reg21
-            | constants::DW_OP_reg22
-            | constants::DW_OP_reg23
-            | constants::DW_OP_reg24
-            | constants::DW_OP_reg25
-            | constants::DW_OP_reg26
-            | constants::DW_OP_reg27
-            | constants::DW_OP_reg28
-            | constants::DW_OP_reg29
-            | constants::DW_OP_reg30
-            | constants::DW_OP_reg31 => Ok(Operation::Register {
-                register: Register((opcode - constants::DW_OP_reg0.0).into()),
-            }),
-            constants::DW_OP_breg0
-            | constants::DW_OP_breg1
-            | constants::DW_OP_breg2
-            | constants::DW_OP_breg3
-            | constants::DW_OP_breg4
-            | constants::DW_OP_breg5
-            | constants::DW_OP_breg6
-            | constants::DW_OP_breg7
-            | constants::DW_OP_breg8
-            | constants::DW_OP_breg9
-            | constants::DW_OP_breg10
-            | constants::DW_OP_breg11
-            | constants::DW_OP_breg12
-            | constants::DW_OP_breg13
-            | constants::DW_OP_breg14
-            | constants::DW_OP_breg15
-            | constants::DW_OP_breg16
-            | constants::DW_OP_breg17
-            | constants::DW_OP_breg18
-            | constants::DW_OP_breg19
-            | constants::DW_OP_breg20
-            | constants::DW_OP_breg21
-            | constants::DW_OP_breg22
-            | constants::DW_OP_breg23
-            | constants::DW_OP_breg24
-            | constants::DW_OP_breg25
-            | constants::DW_OP_breg26
-            | constants::DW_OP_breg27
-            | constants::DW_OP_breg28
-            | constants::DW_OP_breg29
-            | constants::DW_OP_breg30
-            | constants::DW_OP_breg31 => {
-                let value = bytes.read_sleb128()?;
-                Ok(Operation::RegisterOffset {
-                    register: Register((opcode - constants::DW_OP_breg0.0).into()),
-                    offset: value,
-                    base_type: generic_type(),
-                })
-            }
-            constants::DW_OP_regx => {
-                let register = bytes.read_uleb128().and_then(Register::from_u64)?;
-                Ok(Operation::Register { register })
-            }
-            constants::DW_OP_fbreg => {
-                let value = bytes.read_sleb128()?;
-                Ok(Operation::FrameOffset { offset: value })
-            }
-            constants::DW_OP_bregx => {
-                let register = bytes.read_uleb128().and_then(Register::from_u64)?;
-                let offset = bytes.read_sleb128()?;
-                Ok(Operation::RegisterOffset {
-                    register,
-                    offset,
-                    base_type: generic_type(),
-                })
-            }
-            constants::DW_OP_piece => {
-                let size = bytes.read_uleb128()?;
-                Ok(Operation::Piece {
-                    size_in_bits: 8 * size,
-                    bit_offset: None,
-                })
-            }
-            constants::DW_OP_deref_size => {
-                let size = bytes.read_u8()?;
-                Ok(Operation::Deref {
-                    base_type: generic_type(),
-                    size,
-                    space: false,
-                })
-            }
-            constants::DW_OP_xderef_size => {
-                let size = bytes.read_u8()?;
-                Ok(Operation::Deref {
-                    base_type: generic_type(),
-                    size,
-                    space: true,
-                })
-            }
-            constants::DW_OP_nop => Ok(Operation::Nop),
-            constants::DW_OP_push_object_address => Ok(Operation::PushObjectAddress),
-            constants::DW_OP_call2 => {
-                let value = bytes.read_u16().map(R::Offset::from_u16)?;
-                Ok(Operation::Call {
-                    offset: DieReference::UnitRef(UnitOffset(value)),
-                })
-            }
-            constants::DW_OP_call4 => {
-                let value = bytes.read_u32().map(R::Offset::from_u32)?;
-                Ok(Operation::Call {
-                    offset: DieReference::UnitRef(UnitOffset(value)),
-                })
-            }
-            constants::DW_OP_call_ref => {
-                let value = bytes.read_offset(encoding.format)?;
-                Ok(Operation::Call {
-                    offset: DieReference::DebugInfoRef(DebugInfoOffset(value)),
-                })
-            }
-            constants::DW_OP_form_tls_address | constants::DW_OP_GNU_push_tls_address => {
-                Ok(Operation::TLS)
-            }
-            constants::DW_OP_call_frame_cfa => Ok(Operation::CallFrameCFA),
-            constants::DW_OP_bit_piece => {
-                let size = bytes.read_uleb128()?;
-                let offset = bytes.read_uleb128()?;
-                Ok(Operation::Piece {
-                    size_in_bits: size,
-                    bit_offset: Some(offset),
-                })
-            }
-            constants::DW_OP_implicit_value => {
-                let len = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                let data = bytes.split(len)?;
-                Ok(Operation::ImplicitValue { data })
-            }
-            constants::DW_OP_stack_value => Ok(Operation::StackValue),
-            constants::DW_OP_implicit_pointer | constants::DW_OP_GNU_implicit_pointer => {
-                let value = bytes.read_offset(encoding.format)?;
-                let byte_offset = bytes.read_sleb128()?;
-                Ok(Operation::ImplicitPointer {
-                    value: DebugInfoOffset(value),
-                    byte_offset,
-                })
-            }
-            constants::DW_OP_addrx | constants::DW_OP_GNU_addr_index => {
-                let index = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                Ok(Operation::AddressIndex {
-                    index: DebugAddrIndex(index),
-                })
-            }
-            constants::DW_OP_constx | constants::DW_OP_GNU_const_index => {
-                let index = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                Ok(Operation::ConstantIndex {
-                    index: DebugAddrIndex(index),
-                })
-            }
-            constants::DW_OP_entry_value | constants::DW_OP_GNU_entry_value => {
-                let len = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                let expression = bytes.split(len)?;
-                Ok(Operation::EntryValue { expression })
-            }
-            constants::DW_OP_GNU_parameter_ref => {
-                let value = bytes.read_u32().map(R::Offset::from_u32)?;
-                Ok(Operation::ParameterRef {
-                    offset: UnitOffset(value),
-                })
-            }
-            constants::DW_OP_const_type | constants::DW_OP_GNU_const_type => {
-                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                let len = bytes.read_u8()?;
-                let value = bytes.split(R::Offset::from_u8(len))?;
-                Ok(Operation::TypedLiteral {
-                    base_type: UnitOffset(base_type),
-                    value,
-                })
-            }
-            constants::DW_OP_regval_type | constants::DW_OP_GNU_regval_type => {
-                let register = bytes.read_uleb128().and_then(Register::from_u64)?;
-                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                Ok(Operation::RegisterOffset {
-                    register,
-                    offset: 0,
-                    base_type: UnitOffset(base_type),
-                })
-            }
-            constants::DW_OP_deref_type | constants::DW_OP_GNU_deref_type => {
-                let size = bytes.read_u8()?;
-                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                Ok(Operation::Deref {
-                    base_type: UnitOffset(base_type),
-                    size,
-                    space: false,
-                })
-            }
-            constants::DW_OP_xderef_type => {
-                let size = bytes.read_u8()?;
-                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                Ok(Operation::Deref {
-                    base_type: UnitOffset(base_type),
-                    size,
-                    space: true,
-                })
-            }
-            constants::DW_OP_convert | constants::DW_OP_GNU_convert => {
-                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                Ok(Operation::Convert {
-                    base_type: UnitOffset(base_type),
-                })
-            }
-            constants::DW_OP_reinterpret | constants::DW_OP_GNU_reinterpret => {
-                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
-                Ok(Operation::Reinterpret {
-                    base_type: UnitOffset(base_type),
-                })
-            }
-
-            _ => Err(Error::InvalidExpression(name)),
-        }
-    }
-}
-
-#[derive(Debug)]
-enum EvaluationState<R: Reader> {
-    Start(Option<u64>),
-    Ready,
-    Error(Error),
-    Complete,
-    Waiting(EvaluationWaiting<R>),
-}
-
-#[derive(Debug)]
-enum EvaluationWaiting<R: Reader> {
-    Memory,
-    Register { offset: i64 },
-    FrameBase { offset: i64 },
-    Tls,
-    Cfa,
-    AtLocation,
-    EntryValue,
-    ParameterRef,
-    RelocatedAddress,
-    IndexedAddress,
-    TypedLiteral { value: R },
-    Convert,
-    Reinterpret,
-}
-
-/// The state of an `Evaluation` after evaluating a DWARF expression.
-/// The evaluation is either `Complete`, or it requires more data
-/// to continue, as described by the variant.
-#[derive(Debug, PartialEq)]
-pub enum EvaluationResult<R: Reader> {
-    /// The `Evaluation` is complete, and `Evaluation::result()` can be called.
-    Complete,
-    /// The `Evaluation` needs a value from memory to proceed further.  Once the
-    /// caller determines what value to provide it should resume the `Evaluation`
-    /// by calling `Evaluation::resume_with_memory`.
-    RequiresMemory {
-        /// The address of the value required.
-        address: u64,
-        /// The size of the value required. This is guaranteed to be at most the
-        /// word size of the target architecture.
-        size: u8,
-        /// If not `None`, a target-specific address space value.
-        space: Option<u64>,
-        /// The DIE of the base type or 0 to indicate the generic type
-        base_type: UnitOffset<R::Offset>,
-    },
-    /// The `Evaluation` needs a value from a register to proceed further.  Once
-    /// the caller determines what value to provide it should resume the
-    /// `Evaluation` by calling `Evaluation::resume_with_register`.
-    RequiresRegister {
-        /// The register number.
-        register: Register,
-        /// The DIE of the base type or 0 to indicate the generic type
-        base_type: UnitOffset<R::Offset>,
-    },
-    /// The `Evaluation` needs the frame base address to proceed further.  Once
-    /// the caller determines what value to provide it should resume the
-    /// `Evaluation` by calling `Evaluation::resume_with_frame_base`.  The frame
-    /// base address is the address produced by the location description in the
-    /// `DW_AT_frame_base` attribute of the current function.
-    RequiresFrameBase,
-    /// The `Evaluation` needs a value from TLS to proceed further.  Once the
-    /// caller determines what value to provide it should resume the
-    /// `Evaluation` by calling `Evaluation::resume_with_tls`.
-    RequiresTls(u64),
-    /// The `Evaluation` needs the CFA to proceed further.  Once the caller
-    /// determines what value to provide it should resume the `Evaluation` by
-    /// calling `Evaluation::resume_with_call_frame_cfa`.
-    RequiresCallFrameCfa,
-    /// The `Evaluation` needs the DWARF expression at the given location to
-    /// proceed further.  Once the caller determines what value to provide it
-    /// should resume the `Evaluation` by calling
-    /// `Evaluation::resume_with_at_location`.
-    RequiresAtLocation(DieReference<R::Offset>),
-    /// The `Evaluation` needs the value produced by evaluating a DWARF
-    /// expression at the entry point of the current subprogram.  Once the
-    /// caller determines what value to provide it should resume the
-    /// `Evaluation` by calling `Evaluation::resume_with_entry_value`.
-    RequiresEntryValue(Expression<R>),
-    /// The `Evaluation` needs the value of the parameter at the given location
-    /// in the current function's caller.  Once the caller determines what value
-    /// to provide it should resume the `Evaluation` by calling
-    /// `Evaluation::resume_with_parameter_ref`.
-    RequiresParameterRef(UnitOffset<R::Offset>),
-    /// The `Evaluation` needs an address to be relocated to proceed further.
-    /// Once the caller determines what value to provide it should resume the
-    /// `Evaluation` by calling `Evaluation::resume_with_relocated_address`.
-    RequiresRelocatedAddress(u64),
-    /// The `Evaluation` needs an address from the `.debug_addr` section.
-    /// This address may also need to be relocated.
-    /// Once the caller determines what value to provide it should resume the
-    /// `Evaluation` by calling `Evaluation::resume_with_indexed_address`.
-    RequiresIndexedAddress {
-        /// The index of the address in the `.debug_addr` section,
-        /// relative to the `DW_AT_addr_base` of the compilation unit.
-        index: DebugAddrIndex<R::Offset>,
-        /// Whether the address also needs to be relocated.
-        relocate: bool,
-    },
-    /// The `Evaluation` needs the `ValueType` for the base type DIE at
-    /// the give unit offset.  Once the caller determines what value to provide it
-    /// should resume the `Evaluation` by calling
-    /// `Evaluation::resume_with_base_type`.
-    RequiresBaseType(UnitOffset<R::Offset>),
-}
-
-/// The bytecode for a DWARF expression or location description.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct Expression<R: Reader>(pub R);
-
-impl<R: Reader> Expression<R> {
-    /// Create an evaluation for this expression.
-    ///
-    /// The `encoding` is determined by the
-    /// [`CompilationUnitHeader`](struct.CompilationUnitHeader.html) or
-    /// [`TypeUnitHeader`](struct.TypeUnitHeader.html) that this expression
-    /// relates to.
-    ///
-    /// # Examples
-    /// ```rust,no_run
-    /// use gimli::Expression;
-    /// # let endian = gimli::LittleEndian;
-    /// # let debug_info = gimli::DebugInfo::from(gimli::EndianSlice::new(&[], endian));
-    /// # let unit = debug_info.units().next().unwrap().unwrap();
-    /// # let bytecode = gimli::EndianSlice::new(&[], endian);
-    /// let expression = gimli::Expression(bytecode);
-    /// let mut eval = expression.evaluation(unit.encoding());
-    /// let mut result = eval.evaluate().unwrap();
-    /// ```
-    #[inline]
-    pub fn evaluation(self, encoding: Encoding) -> Evaluation<R> {
-        Evaluation::new(self.0, encoding)
-    }
-
-    /// Return an iterator for the operations in the expression.
-    pub fn operations(self, encoding: Encoding) -> OperationIter<R> {
-        OperationIter {
-            input: self.0,
-            encoding,
-        }
-    }
-}
-
-/// An iterator for the operations in an expression.
-#[derive(Debug, Clone, Copy)]
-pub struct OperationIter<R: Reader> {
-    input: R,
-    encoding: Encoding,
-}
-
-impl<R: Reader> OperationIter<R> {
-    /// Read the next operation in an expression.
-    pub fn next(&mut self) -> Result<Option<Operation<R>>> {
-        if self.input.is_empty() {
-            return Ok(None);
-        }
-        match Operation::parse(&mut self.input, self.encoding) {
-            Ok(op) => Ok(Some(op)),
-            Err(e) => {
-                self.input.empty();
-                Err(e)
-            }
-        }
-    }
-
-    /// Return the current byte offset of the iterator.
-    pub fn offset_from(&self, expression: &Expression<R>) -> R::Offset {
-        self.input.offset_from(&expression.0)
-    }
-}
-
-/// A DWARF expression evaluator.
-///
-/// # Usage
-/// A DWARF expression may require additional data to produce a final result,
-/// such as the value of a register or a memory location.  Once initial setup
-/// is complete (i.e. `set_initial_value()`, `set_object_address()`) the
-/// consumer calls the `evaluate()` method.  That returns an `EvaluationResult`,
-/// which is either `EvaluationResult::Complete` or a value indicating what
-/// data is needed to resume the `Evaluation`.  The consumer is responsible for
-/// producing that data and resuming the computation with the correct method,
-/// as documented for `EvaluationResult`.  Only once an `EvaluationResult::Complete`
-/// is returned can the consumer call `result()`.
-///
-/// This design allows the consumer of `Evaluation` to decide how and when to
-/// produce the required data and resume the computation.  The `Evaluation` can
-/// be driven synchronously (as shown below) or by some asynchronous mechanism
-/// such as futures.
-///
-/// # Examples
-/// ```rust,no_run
-/// use gimli::{EndianSlice, Evaluation, EvaluationResult, Format, LittleEndian, Value};
-/// # let bytecode = EndianSlice::new(&[], LittleEndian);
-/// # let encoding = unimplemented!();
-/// # let get_register_value = |_, _| Value::Generic(42);
-/// # let get_frame_base = || 0xdeadbeef;
-///
-/// let mut eval = Evaluation::new(bytecode, encoding);
-/// let mut result = eval.evaluate().unwrap();
-/// while result != EvaluationResult::Complete {
-///   match result {
-///     EvaluationResult::RequiresRegister { register, base_type } => {
-///       let value = get_register_value(register, base_type);
-///       result = eval.resume_with_register(value).unwrap();
-///     },
-///     EvaluationResult::RequiresFrameBase => {
-///       let frame_base = get_frame_base();
-///       result = eval.resume_with_frame_base(frame_base).unwrap();
-///     },
-///     _ => unimplemented!(),
-///   };
-/// }
-///
-/// let result = eval.result();
-/// println!("{:?}", result);
-/// ```
-#[derive(Debug)]
-pub struct Evaluation<R: Reader> {
-    bytecode: R,
-    encoding: Encoding,
-    object_address: Option<u64>,
-    max_iterations: Option<u32>,
-    iteration: u32,
-    state: EvaluationState<R>,
-
-    // Stack operations are done on word-sized values.  We do all
-    // operations on 64-bit values, and then mask the results
-    // appropriately when popping.
-    addr_mask: u64,
-
-    // The stack.
-    stack: Vec<Value>,
-
-    // The next operation to decode and evaluate.
-    pc: R,
-
-    // If we see a DW_OP_call* operation, the previous PC and bytecode
-    // is stored here while evaluating the subroutine.
-    expression_stack: Vec<(R, R)>,
-
-    result: Vec<Piece<R>>,
-}
-
-impl<R: Reader> Evaluation<R> {
-    /// Create a new DWARF expression evaluator.
-    ///
-    /// The new evaluator is created without an initial value, without
-    /// an object address, and without a maximum number of iterations.
-    pub fn new(bytecode: R, encoding: Encoding) -> Evaluation<R> {
-        let pc = bytecode.clone();
-        Evaluation {
-            bytecode,
-            encoding,
-            object_address: None,
-            max_iterations: None,
-            iteration: 0,
-            state: EvaluationState::Start(None),
-            addr_mask: if encoding.address_size == 8 {
-                !0u64
-            } else {
-                (1 << (8 * u64::from(encoding.address_size))) - 1
-            },
-            stack: Vec::new(),
-            expression_stack: Vec::new(),
-            pc,
-            result: Vec::new(),
-        }
-    }
-
-    /// Set an initial value to be pushed on the DWARF expression
-    /// evaluator's stack.  This can be used in cases like
-    /// `DW_AT_vtable_elem_location`, which require a value on the
-    /// stack before evaluation commences.  If no initial value is
-    /// set, and the expression uses an opcode requiring the initial
-    /// value, then evaluation will fail with an error.
-    ///
-    /// # Panics
-    /// Panics if `set_initial_value()` has already been called, or if
-    /// `evaluate()` has already been called.
-    pub fn set_initial_value(&mut self, value: u64) {
-        match self.state {
-            EvaluationState::Start(None) => {
-                self.state = EvaluationState::Start(Some(value));
-            }
-            _ => panic!(
-                "`Evaluation::set_initial_value` was called twice, or after evaluation began."
-            ),
-        };
-    }
-
-    /// Set the enclosing object's address, as used by
-    /// `DW_OP_push_object_address`.  If no object address is set, and
-    /// the expression uses an opcode requiring the object address,
-    /// then evaluation will fail with an error.
-    pub fn set_object_address(&mut self, value: u64) {
-        self.object_address = Some(value);
-    }
-
-    /// Set the maximum number of iterations to be allowed by the
-    /// expression evaluator.
-    ///
-    /// An iteration corresponds approximately to the evaluation of a
-    /// single operation in an expression ("approximately" because the
-    /// implementation may allow two such operations in some cases).
-    /// The default is not to have a maximum; once set, it's not
-    /// possible to go back to this default state.  This value can be
-    /// set to avoid denial of service attacks by bad DWARF bytecode.
-    pub fn set_max_iterations(&mut self, value: u32) {
-        self.max_iterations = Some(value);
-    }
-
-    fn pop(&mut self) -> Result<Value> {
-        match self.stack.pop() {
-            Some(value) => Ok(value),
-            None => Err(Error::NotEnoughStackItems),
-        }
-    }
-
-    fn push(&mut self, value: Value) {
-        self.stack.push(value);
-    }
-
-    #[allow(clippy::cyclomatic_complexity)]
-    fn evaluate_one_operation(&mut self) -> Result<OperationEvaluationResult<R>> {
-        let operation = Operation::parse(&mut self.pc, self.encoding)?;
-
-        match operation {
-            Operation::Deref {
-                base_type,
-                size,
-                space,
-            } => {
-                let entry = self.pop()?;
-                let addr = entry.to_u64(self.addr_mask)?;
-                let addr_space = if space {
-                    let entry = self.pop()?;
-                    let value = entry.to_u64(self.addr_mask)?;
-                    Some(value)
-                } else {
-                    None
-                };
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::Memory,
-                    EvaluationResult::RequiresMemory {
-                        address: addr,
-                        size,
-                        space: addr_space,
-                        base_type,
-                    },
-                ));
-            }
-
-            Operation::Drop => {
-                self.pop()?;
-            }
-            Operation::Pick { index } => {
-                let len = self.stack.len();
-                let index = index as usize;
-                if index >= len {
-                    return Err(Error::NotEnoughStackItems);
-                }
-                let value = self.stack[len - index - 1];
-                self.push(value);
-            }
-            Operation::Swap => {
-                let top = self.pop()?;
-                let next = self.pop()?;
-                self.push(top);
-                self.push(next);
-            }
-            Operation::Rot => {
-                let one = self.pop()?;
-                let two = self.pop()?;
-                let three = self.pop()?;
-                self.push(one);
-                self.push(three);
-                self.push(two);
-            }
-
-            Operation::Abs => {
-                let value = self.pop()?;
-                let result = value.abs(self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::And => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.and(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Div => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.div(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Minus => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.sub(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Mod => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.rem(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Mul => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.mul(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Neg => {
-                let v = self.pop()?;
-                let result = v.neg(self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Not => {
-                let value = self.pop()?;
-                let result = value.not(self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Or => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.or(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Plus => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.add(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::PlusConstant { value } => {
-                let lhs = self.pop()?;
-                let rhs = Value::from_u64(lhs.value_type(), value)?;
-                let result = lhs.add(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Shl => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.shl(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Shr => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.shr(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Shra => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.shra(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Xor => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.xor(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-
-            Operation::Bra { target } => {
-                let entry = self.pop()?;
-                let v = entry.to_u64(self.addr_mask)?;
-                if v != 0 {
-                    self.pc = compute_pc(&self.pc, &self.bytecode, target)?;
-                }
-            }
-
-            Operation::Eq => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.eq(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Ge => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.ge(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Gt => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.gt(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Le => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.le(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Lt => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.lt(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-            Operation::Ne => {
-                let rhs = self.pop()?;
-                let lhs = self.pop()?;
-                let result = lhs.ne(rhs, self.addr_mask)?;
-                self.push(result);
-            }
-
-            Operation::Skip { target } => {
-                self.pc = compute_pc(&self.pc, &self.bytecode, target)?;
-            }
-
-            Operation::UnsignedConstant { value } => {
-                self.push(Value::Generic(value));
-            }
-
-            Operation::SignedConstant { value } => {
-                self.push(Value::Generic(value as u64));
-            }
-
-            Operation::RegisterOffset {
-                register,
-                offset,
-                base_type,
-            } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::Register { offset },
-                    EvaluationResult::RequiresRegister {
-                        register,
-                        base_type,
-                    },
-                ));
-            }
-
-            Operation::FrameOffset { offset } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::FrameBase { offset },
-                    EvaluationResult::RequiresFrameBase,
-                ));
-            }
-
-            Operation::Nop => {}
-
-            Operation::PushObjectAddress => {
-                if let Some(value) = self.object_address {
-                    self.push(Value::Generic(value));
-                } else {
-                    return Err(Error::InvalidPushObjectAddress);
-                }
-            }
-
-            Operation::Call { offset } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::AtLocation,
-                    EvaluationResult::RequiresAtLocation(offset),
-                ));
-            }
-
-            Operation::TLS => {
-                let entry = self.pop()?;
-                let index = entry.to_u64(self.addr_mask)?;
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::Tls,
-                    EvaluationResult::RequiresTls(index),
-                ));
-            }
-
-            Operation::CallFrameCFA => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::Cfa,
-                    EvaluationResult::RequiresCallFrameCfa,
-                ));
-            }
-
-            Operation::Register { register } => {
-                let location = Location::Register { register };
-                return Ok(OperationEvaluationResult::Complete { location });
-            }
-
-            Operation::ImplicitValue { ref data } => {
-                let location = Location::Bytes {
-                    value: data.clone(),
-                };
-                return Ok(OperationEvaluationResult::Complete { location });
-            }
-
-            Operation::StackValue => {
-                let value = self.pop()?;
-                let location = Location::Value { value };
-                return Ok(OperationEvaluationResult::Complete { location });
-            }
-
-            Operation::ImplicitPointer { value, byte_offset } => {
-                let location = Location::ImplicitPointer { value, byte_offset };
-                return Ok(OperationEvaluationResult::Complete { location });
-            }
-
-            Operation::EntryValue { ref expression } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::EntryValue,
-                    EvaluationResult::RequiresEntryValue(Expression(expression.clone())),
-                ));
-            }
-
-            Operation::ParameterRef { offset } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::ParameterRef,
-                    EvaluationResult::RequiresParameterRef(offset),
-                ));
-            }
-
-            Operation::Address { address } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::RelocatedAddress,
-                    EvaluationResult::RequiresRelocatedAddress(address),
-                ));
-            }
-
-            Operation::AddressIndex { index } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::IndexedAddress,
-                    EvaluationResult::RequiresIndexedAddress {
-                        index,
-                        relocate: true,
-                    },
-                ));
-            }
-
-            Operation::ConstantIndex { index } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::IndexedAddress,
-                    EvaluationResult::RequiresIndexedAddress {
-                        index,
-                        relocate: false,
-                    },
-                ));
-            }
-
-            Operation::Piece {
-                size_in_bits,
-                bit_offset,
-            } => {
-                let location = if self.stack.is_empty() {
-                    Location::Empty
-                } else {
-                    let entry = self.pop()?;
-                    let address = entry.to_u64(self.addr_mask)?;
-                    Location::Address { address }
-                };
-                self.result.push(Piece {
-                    size_in_bits: Some(size_in_bits),
-                    bit_offset,
-                    location,
-                });
-                return Ok(OperationEvaluationResult::Piece);
-            }
-
-            Operation::TypedLiteral { base_type, value } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::TypedLiteral { value },
-                    EvaluationResult::RequiresBaseType(base_type),
-                ));
-            }
-            Operation::Convert { base_type } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::Convert,
-                    EvaluationResult::RequiresBaseType(base_type),
-                ));
-            }
-            Operation::Reinterpret { base_type } => {
-                return Ok(OperationEvaluationResult::Waiting(
-                    EvaluationWaiting::Reinterpret,
-                    EvaluationResult::RequiresBaseType(base_type),
-                ));
-            }
-        }
-
-        Ok(OperationEvaluationResult::Incomplete)
-    }
-
-    /// Get the result of this `Evaluation`.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` has not been driven to completion.
-    pub fn result(self) -> Vec<Piece<R>> {
-        match self.state {
-            EvaluationState::Complete => self.result,
-            _ => {
-                panic!("Called `Evaluation::result` on an `Evaluation` that has not been completed")
-            }
-        }
-    }
-
-    /// Evaluate a DWARF expression.  This method should only ever be called
-    /// once.  If the returned `EvaluationResult` is not
-    /// `EvaluationResult::Complete`, the caller should provide the required
-    /// value and resume the evaluation by calling the appropriate resume_with
-    /// method on `Evaluation`.
-    pub fn evaluate(&mut self) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Start(initial_value) => {
-                if let Some(value) = initial_value {
-                    self.push(Value::Generic(value));
-                }
-                self.state = EvaluationState::Ready;
-            }
-            EvaluationState::Ready => {}
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Complete => return Ok(EvaluationResult::Complete),
-            EvaluationState::Waiting(_) => panic!(),
-        };
-
-        match self.evaluate_internal() {
-            Ok(r) => Ok(r),
-            Err(e) => {
-                self.state = EvaluationState::Error(e);
-                Err(e)
-            }
-        }
-    }
-
-    /// Resume the `Evaluation` with the provided memory `value`.  This will apply
-    /// the provided memory value to the evaluation and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresMemory`.
-    pub fn resume_with_memory(&mut self, value: Value) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::Memory) => {
-                self.push(value);
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_memory` without a preceding `EvaluationResult::RequiresMemory`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided `register` value.  This will apply
-    /// the provided register value to the evaluation and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresRegister`.
-    pub fn resume_with_register(&mut self, value: Value) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::Register { offset }) => {
-                let offset = Value::from_u64(value.value_type(), offset as u64)?;
-                let value = value.add(offset, self.addr_mask)?;
-                self.push(value);
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_register` without a preceding `EvaluationResult::RequiresRegister`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided `frame_base`.  This will
-    /// apply the provided frame base value to the evaluation and continue
-    /// evaluating opcodes until the evaluation is completed, reaches an error,
-    /// or needs more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresFrameBase`.
-    pub fn resume_with_frame_base(&mut self, frame_base: u64) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::FrameBase { offset }) => {
-                self.push(Value::Generic(frame_base.wrapping_add(offset as u64)));
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_frame_base` without a preceding `EvaluationResult::RequiresFrameBase`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided `value`.  This will apply
-    /// the provided TLS value to the evaluation and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresTls`.
-    pub fn resume_with_tls(&mut self, value: u64) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::Tls) => {
-                self.push(Value::Generic(value));
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_tls` without a preceding `EvaluationResult::RequiresTls`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided `cfa`.  This will
-    /// apply the provided CFA value to the evaluation and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresCallFrameCfa`.
-    pub fn resume_with_call_frame_cfa(&mut self, cfa: u64) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::Cfa) => {
-                self.push(Value::Generic(cfa));
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_call_frame_cfa` without a preceding `EvaluationResult::RequiresCallFrameCfa`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided `bytes`.  This will
-    /// continue processing the evaluation with the new expression provided
-    /// until the evaluation is completed, reaches an error, or needs more
-    /// information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresAtLocation`.
-    pub fn resume_with_at_location(&mut self, mut bytes: R) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::AtLocation) => {
-                if !bytes.is_empty() {
-                    let mut pc = bytes.clone();
-                    mem::swap(&mut pc, &mut self.pc);
-                    mem::swap(&mut bytes, &mut self.bytecode);
-                    self.expression_stack.push((pc, bytes));
-                }
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_at_location` without a precedeing `EvaluationResult::RequiresAtLocation`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided `entry_value`.  This will
-    /// apply the provided entry value to the evaluation and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresEntryValue`.
-    pub fn resume_with_entry_value(&mut self, entry_value: Value) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::EntryValue) => {
-                self.push(entry_value);
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_entry_value` without a preceding `EvaluationResult::RequiresEntryValue`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided `parameter_value`.  This will
-    /// apply the provided parameter value to the evaluation and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresParameterRef`.
-    pub fn resume_with_parameter_ref(
-        &mut self,
-        parameter_value: u64,
-    ) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::ParameterRef) => {
-                self.push(Value::Generic(parameter_value));
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_parameter_ref` without a preceding `EvaluationResult::RequiresParameterRef`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided relocated `address`.  This will use the
-    /// provided relocated address for the operation that required it, and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with
-    /// `EvaluationResult::RequiresRelocatedAddress`.
-    pub fn resume_with_relocated_address(&mut self, address: u64) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::RelocatedAddress) => {
-                self.push(Value::Generic(address));
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_relocated_address` without a preceding `EvaluationResult::RequiresRelocatedAddress`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided indexed `address`.  This will use the
-    /// provided indexed address for the operation that required it, and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with
-    /// `EvaluationResult::RequiresIndexedAddress`.
-    pub fn resume_with_indexed_address(&mut self, address: u64) -> Result<EvaluationResult<R>> {
-        match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::IndexedAddress) => {
-                self.push(Value::Generic(address));
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_indexed_address` without a preceding `EvaluationResult::RequiresIndexedAddress`"
-            ),
-        };
-
-        self.evaluate_internal()
-    }
-
-    /// Resume the `Evaluation` with the provided `base_type`.  This will use the
-    /// provided base type for the operation that required it, and continue evaluating
-    /// opcodes until the evaluation is completed, reaches an error, or needs
-    /// more information again.
-    ///
-    /// # Panics
-    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresBaseType`.
-    pub fn resume_with_base_type(&mut self, base_type: ValueType) -> Result<EvaluationResult<R>> {
-        let value = match self.state {
-            EvaluationState::Error(err) => return Err(err),
-            EvaluationState::Waiting(EvaluationWaiting::TypedLiteral { ref value }) => {
-                Value::parse(base_type, value.clone())?
-            }
-            EvaluationState::Waiting(EvaluationWaiting::Convert) => {
-                let entry = self.pop()?;
-                entry.convert(base_type, self.addr_mask)?
-            }
-            EvaluationState::Waiting(EvaluationWaiting::Reinterpret) => {
-                let entry = self.pop()?;
-                entry.reinterpret(base_type, self.addr_mask)?
-            }
-            _ => panic!(
-                "Called `Evaluation::resume_with_base_type` without a preceding `EvaluationResult::RequiresBaseType`"
-            ),
-        };
-        self.push(value);
-        self.evaluate_internal()
-    }
-
-    fn end_of_expression(&mut self) -> bool {
-        while self.pc.is_empty() {
-            match self.expression_stack.pop() {
-                Some((newpc, newbytes)) => {
-                    self.pc = newpc;
-                    self.bytecode = newbytes;
-                }
-                None => return true,
-            }
-        }
-        false
-    }
-
-    fn evaluate_internal(&mut self) -> Result<EvaluationResult<R>> {
-        while !self.end_of_expression() {
-            self.iteration += 1;
-            if let Some(max_iterations) = self.max_iterations {
-                if self.iteration > max_iterations {
-                    return Err(Error::TooManyIterations);
-                }
-            }
-
-            let op_result = self.evaluate_one_operation()?;
-            match op_result {
-                OperationEvaluationResult::Piece => {}
-                OperationEvaluationResult::Incomplete => {
-                    if self.end_of_expression() && !self.result.is_empty() {
-                        // We saw a piece earlier and then some
-                        // unterminated piece.  It's not clear this is
-                        // well-defined.
-                        return Err(Error::InvalidPiece);
-                    }
-                }
-                OperationEvaluationResult::Complete { location } => {
-                    if self.end_of_expression() {
-                        if !self.result.is_empty() {
-                            // We saw a piece earlier and then some
-                            // unterminated piece.  It's not clear this is
-                            // well-defined.
-                            return Err(Error::InvalidPiece);
-                        }
-                        self.result.push(Piece {
-                            size_in_bits: None,
-                            bit_offset: None,
-                            location,
-                        });
-                    } else {
-                        // If there are more operations, then the next operation must
-                        // be a Piece.
-                        match Operation::parse(&mut self.pc, self.encoding)? {
-                            Operation::Piece {
-                                size_in_bits,
-                                bit_offset,
-                            } => {
-                                self.result.push(Piece {
-                                    size_in_bits: Some(size_in_bits),
-                                    bit_offset,
-                                    location,
-                                });
-                            }
-                            _ => {
-                                let value =
-                                    self.bytecode.len().into_u64() - self.pc.len().into_u64() - 1;
-                                return Err(Error::InvalidExpressionTerminator(value));
-                            }
-                        }
-                    }
-                }
-                OperationEvaluationResult::Waiting(waiting, result) => {
-                    self.state = EvaluationState::Waiting(waiting);
-                    return Ok(result);
-                }
-            };
-        }
-
-        // If no pieces have been seen, use the stack top as the
-        // result.
-        if self.result.is_empty() {
-            let entry = self.pop()?;
-            let addr = entry.to_u64(self.addr_mask)?;
-            self.result.push(Piece {
-                size_in_bits: None,
-                bit_offset: None,
-                location: Location::Address { address: addr },
-            });
-        }
-
-        self.state = EvaluationState::Complete;
-        Ok(EvaluationResult::Complete)
-    }
-}
-
-#[cfg(test)]
-// Tests require leb128::write.
-#[cfg(feature = "write")]
-mod tests {
-    use super::*;
-    use crate::common::Format;
-    use crate::constants;
-    use crate::endianity::LittleEndian;
-    use crate::leb128;
-    use crate::read::{EndianSlice, Error, Result, UnitOffset};
-    use crate::test_util::GimliSectionMethods;
-    use core::usize;
-    use test_assembler::{Endian, Section};
-
-    fn encoding4() -> Encoding {
-        Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        }
-    }
-
-    fn encoding8() -> Encoding {
-        Encoding {
-            format: Format::Dwarf64,
-            version: 4,
-            address_size: 8,
-        }
-    }
-
-    #[test]
-    fn test_compute_pc() {
-        // Contents don't matter for this test, just length.
-        let bytes = [0, 1, 2, 3, 4];
-        let bytecode = &bytes[..];
-        let ebuf = &EndianSlice::new(bytecode, LittleEndian);
-
-        assert_eq!(compute_pc(ebuf, ebuf, 0), Ok(*ebuf));
-        assert_eq!(
-            compute_pc(ebuf, ebuf, -1),
-            Err(Error::BadBranchTarget(usize::MAX as u64))
-        );
-        assert_eq!(compute_pc(ebuf, ebuf, 5), Ok(ebuf.range_from(5..)));
-        assert_eq!(
-            compute_pc(&ebuf.range_from(3..), ebuf, -2),
-            Ok(ebuf.range_from(1..))
-        );
-        assert_eq!(
-            compute_pc(&ebuf.range_from(2..), ebuf, 2),
-            Ok(ebuf.range_from(4..))
-        );
-    }
-
-    fn check_op_parse_simple<'input>(
-        input: &'input [u8],
-        expect: &Operation<EndianSlice<'input, LittleEndian>>,
-        encoding: Encoding,
-    ) {
-        let buf = EndianSlice::new(input, LittleEndian);
-        let mut pc = buf;
-        let value = Operation::parse(&mut pc, encoding);
-        match value {
-            Ok(val) => {
-                assert_eq!(val, *expect);
-                assert_eq!(pc.len(), 0);
-            }
-            _ => panic!("Unexpected result"),
-        }
-    }
-
-    fn check_op_parse_eof(input: &[u8], encoding: Encoding) {
-        let buf = EndianSlice::new(input, LittleEndian);
-        let mut pc = buf;
-        match Operation::parse(&mut pc, encoding) {
-            Err(Error::UnexpectedEof(id)) => {
-                assert!(buf.lookup_offset_id(id).is_some());
-            }
-
-            _ => panic!("Unexpected result"),
-        }
-    }
-
-    fn check_op_parse<F>(
-        input: F,
-        expect: &Operation<EndianSlice<LittleEndian>>,
-        encoding: Encoding,
-    ) where
-        F: Fn(Section) -> Section,
-    {
-        let input = input(Section::with_endian(Endian::Little))
-            .get_contents()
-            .unwrap();
-        for i in 1..input.len() {
-            check_op_parse_eof(&input[..i], encoding);
-        }
-        check_op_parse_simple(&input, expect, encoding);
-    }
-
-    #[test]
-    fn test_op_parse_onebyte() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        // Test all single-byte opcodes.
-        #[rustfmt::skip]
-        let inputs = [
-            (
-                constants::DW_OP_deref,
-                Operation::Deref {
-                    base_type: generic_type(),
-                    size: encoding.address_size,
-                    space: false,
-                },
-            ),
-            (constants::DW_OP_dup, Operation::Pick { index: 0 }),
-            (constants::DW_OP_drop, Operation::Drop),
-            (constants::DW_OP_over, Operation::Pick { index: 1 }),
-            (constants::DW_OP_swap, Operation::Swap),
-            (constants::DW_OP_rot, Operation::Rot),
-            (
-                constants::DW_OP_xderef,
-                Operation::Deref {
-                    base_type: generic_type(),
-                    size: encoding.address_size,
-                    space: true,
-                },
-            ),
-            (constants::DW_OP_abs, Operation::Abs),
-            (constants::DW_OP_and, Operation::And),
-            (constants::DW_OP_div, Operation::Div),
-            (constants::DW_OP_minus, Operation::Minus),
-            (constants::DW_OP_mod, Operation::Mod),
-            (constants::DW_OP_mul, Operation::Mul),
-            (constants::DW_OP_neg, Operation::Neg),
-            (constants::DW_OP_not, Operation::Not),
-            (constants::DW_OP_or, Operation::Or),
-            (constants::DW_OP_plus, Operation::Plus),
-            (constants::DW_OP_shl, Operation::Shl),
-            (constants::DW_OP_shr, Operation::Shr),
-            (constants::DW_OP_shra, Operation::Shra),
-            (constants::DW_OP_xor, Operation::Xor),
-            (constants::DW_OP_eq, Operation::Eq),
-            (constants::DW_OP_ge, Operation::Ge),
-            (constants::DW_OP_gt, Operation::Gt),
-            (constants::DW_OP_le, Operation::Le),
-            (constants::DW_OP_lt, Operation::Lt),
-            (constants::DW_OP_ne, Operation::Ne),
-            (constants::DW_OP_lit0, Operation::UnsignedConstant { value: 0 }),
-            (constants::DW_OP_lit1, Operation::UnsignedConstant { value: 1 }),
-            (constants::DW_OP_lit2, Operation::UnsignedConstant { value: 2 }),
-            (constants::DW_OP_lit3, Operation::UnsignedConstant { value: 3 }),
-            (constants::DW_OP_lit4, Operation::UnsignedConstant { value: 4 }),
-            (constants::DW_OP_lit5, Operation::UnsignedConstant { value: 5 }),
-            (constants::DW_OP_lit6, Operation::UnsignedConstant { value: 6 }),
-            (constants::DW_OP_lit7, Operation::UnsignedConstant { value: 7 }),
-            (constants::DW_OP_lit8, Operation::UnsignedConstant { value: 8 }),
-            (constants::DW_OP_lit9, Operation::UnsignedConstant { value: 9 }),
-            (constants::DW_OP_lit10, Operation::UnsignedConstant { value: 10 }),
-            (constants::DW_OP_lit11, Operation::UnsignedConstant { value: 11 }),
-            (constants::DW_OP_lit12, Operation::UnsignedConstant { value: 12 }),
-            (constants::DW_OP_lit13, Operation::UnsignedConstant { value: 13 }),
-            (constants::DW_OP_lit14, Operation::UnsignedConstant { value: 14 }),
-            (constants::DW_OP_lit15, Operation::UnsignedConstant { value: 15 }),
-            (constants::DW_OP_lit16, Operation::UnsignedConstant { value: 16 }),
-            (constants::DW_OP_lit17, Operation::UnsignedConstant { value: 17 }),
-            (constants::DW_OP_lit18, Operation::UnsignedConstant { value: 18 }),
-            (constants::DW_OP_lit19, Operation::UnsignedConstant { value: 19 }),
-            (constants::DW_OP_lit20, Operation::UnsignedConstant { value: 20 }),
-            (constants::DW_OP_lit21, Operation::UnsignedConstant { value: 21 }),
-            (constants::DW_OP_lit22, Operation::UnsignedConstant { value: 22 }),
-            (constants::DW_OP_lit23, Operation::UnsignedConstant { value: 23 }),
-            (constants::DW_OP_lit24, Operation::UnsignedConstant { value: 24 }),
-            (constants::DW_OP_lit25, Operation::UnsignedConstant { value: 25 }),
-            (constants::DW_OP_lit26, Operation::UnsignedConstant { value: 26 }),
-            (constants::DW_OP_lit27, Operation::UnsignedConstant { value: 27 }),
-            (constants::DW_OP_lit28, Operation::UnsignedConstant { value: 28 }),
-            (constants::DW_OP_lit29, Operation::UnsignedConstant { value: 29 }),
-            (constants::DW_OP_lit30, Operation::UnsignedConstant { value: 30 }),
-            (constants::DW_OP_lit31, Operation::UnsignedConstant { value: 31 }),
-            (constants::DW_OP_reg0, Operation::Register { register: Register(0) }),
-            (constants::DW_OP_reg1, Operation::Register { register: Register(1) }),
-            (constants::DW_OP_reg2, Operation::Register { register: Register(2) }),
-            (constants::DW_OP_reg3, Operation::Register { register: Register(3) }),
-            (constants::DW_OP_reg4, Operation::Register { register: Register(4) }),
-            (constants::DW_OP_reg5, Operation::Register { register: Register(5) }),
-            (constants::DW_OP_reg6, Operation::Register { register: Register(6) }),
-            (constants::DW_OP_reg7, Operation::Register { register: Register(7) }),
-            (constants::DW_OP_reg8, Operation::Register { register: Register(8) }),
-            (constants::DW_OP_reg9, Operation::Register { register: Register(9) }),
-            (constants::DW_OP_reg10, Operation::Register { register: Register(10) }),
-            (constants::DW_OP_reg11, Operation::Register { register: Register(11) }),
-            (constants::DW_OP_reg12, Operation::Register { register: Register(12) }),
-            (constants::DW_OP_reg13, Operation::Register { register: Register(13) }),
-            (constants::DW_OP_reg14, Operation::Register { register: Register(14) }),
-            (constants::DW_OP_reg15, Operation::Register { register: Register(15) }),
-            (constants::DW_OP_reg16, Operation::Register { register: Register(16) }),
-            (constants::DW_OP_reg17, Operation::Register { register: Register(17) }),
-            (constants::DW_OP_reg18, Operation::Register { register: Register(18) }),
-            (constants::DW_OP_reg19, Operation::Register { register: Register(19) }),
-            (constants::DW_OP_reg20, Operation::Register { register: Register(20) }),
-            (constants::DW_OP_reg21, Operation::Register { register: Register(21) }),
-            (constants::DW_OP_reg22, Operation::Register { register: Register(22) }),
-            (constants::DW_OP_reg23, Operation::Register { register: Register(23) }),
-            (constants::DW_OP_reg24, Operation::Register { register: Register(24) }),
-            (constants::DW_OP_reg25, Operation::Register { register: Register(25) }),
-            (constants::DW_OP_reg26, Operation::Register { register: Register(26) }),
-            (constants::DW_OP_reg27, Operation::Register { register: Register(27) }),
-            (constants::DW_OP_reg28, Operation::Register { register: Register(28) }),
-            (constants::DW_OP_reg29, Operation::Register { register: Register(29) }),
-            (constants::DW_OP_reg30, Operation::Register { register: Register(30) }),
-            (constants::DW_OP_reg31, Operation::Register { register: Register(31) }),
-            (constants::DW_OP_nop, Operation::Nop),
-            (constants::DW_OP_push_object_address, Operation::PushObjectAddress),
-            (constants::DW_OP_form_tls_address, Operation::TLS),
-            (constants::DW_OP_GNU_push_tls_address, Operation::TLS),
-            (constants::DW_OP_call_frame_cfa, Operation::CallFrameCFA),
-            (constants::DW_OP_stack_value, Operation::StackValue),
-        ];
-
-        let input = [];
-        check_op_parse_eof(&input[..], encoding);
-
-        for item in inputs.iter() {
-            let (opcode, ref result) = *item;
-            check_op_parse(|s| s.D8(opcode.0), result, encoding);
-        }
-    }
-
-    #[test]
-    fn test_op_parse_twobyte() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        let inputs = [
-            (
-                constants::DW_OP_const1u,
-                23,
-                Operation::UnsignedConstant { value: 23 },
-            ),
-            (
-                constants::DW_OP_const1s,
-                (-23i8) as u8,
-                Operation::SignedConstant { value: -23 },
-            ),
-            (constants::DW_OP_pick, 7, Operation::Pick { index: 7 }),
-            (
-                constants::DW_OP_deref_size,
-                19,
-                Operation::Deref {
-                    base_type: generic_type(),
-                    size: 19,
-                    space: false,
-                },
-            ),
-            (
-                constants::DW_OP_xderef_size,
-                19,
-                Operation::Deref {
-                    base_type: generic_type(),
-                    size: 19,
-                    space: true,
-                },
-            ),
-        ];
-
-        for item in inputs.iter() {
-            let (opcode, arg, ref result) = *item;
-            check_op_parse(|s| s.D8(opcode.0).D8(arg), result, encoding);
-        }
-    }
-
-    #[test]
-    fn test_op_parse_threebyte() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        // While bra and skip are 3-byte opcodes, they aren't tested here,
-        // but rather specially in their own function.
-        let inputs = [
-            (
-                constants::DW_OP_const2u,
-                23,
-                Operation::UnsignedConstant { value: 23 },
-            ),
-            (
-                constants::DW_OP_const2s,
-                (-23i16) as u16,
-                Operation::SignedConstant { value: -23 },
-            ),
-            (
-                constants::DW_OP_call2,
-                1138,
-                Operation::Call {
-                    offset: DieReference::UnitRef(UnitOffset(1138)),
-                },
-            ),
-            (
-                constants::DW_OP_bra,
-                (-23i16) as u16,
-                Operation::Bra { target: -23 },
-            ),
-            (
-                constants::DW_OP_skip,
-                (-23i16) as u16,
-                Operation::Skip { target: -23 },
-            ),
-        ];
-
-        for item in inputs.iter() {
-            let (opcode, arg, ref result) = *item;
-            check_op_parse(|s| s.D8(opcode.0).L16(arg), result, encoding);
-        }
-    }
-
-    #[test]
-    fn test_op_parse_fivebyte() {
-        // There are some tests here that depend on address size.
-        let encoding = encoding4();
-
-        let inputs = [
-            (
-                constants::DW_OP_addr,
-                0x1234_5678,
-                Operation::Address {
-                    address: 0x1234_5678,
-                },
-            ),
-            (
-                constants::DW_OP_const4u,
-                0x1234_5678,
-                Operation::UnsignedConstant { value: 0x1234_5678 },
-            ),
-            (
-                constants::DW_OP_const4s,
-                (-23i32) as u32,
-                Operation::SignedConstant { value: -23 },
-            ),
-            (
-                constants::DW_OP_call4,
-                0x1234_5678,
-                Operation::Call {
-                    offset: DieReference::UnitRef(UnitOffset(0x1234_5678)),
-                },
-            ),
-            (
-                constants::DW_OP_call_ref,
-                0x1234_5678,
-                Operation::Call {
-                    offset: DieReference::DebugInfoRef(DebugInfoOffset(0x1234_5678)),
-                },
-            ),
-        ];
-
-        for item in inputs.iter() {
-            let (op, arg, ref expect) = *item;
-            check_op_parse(|s| s.D8(op.0).L32(arg), expect, encoding);
-        }
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_op_parse_ninebyte() {
-        // There are some tests here that depend on address size.
-        let encoding = encoding8();
-
-        let inputs = [
-            (
-                constants::DW_OP_addr,
-                0x1234_5678_1234_5678,
-                Operation::Address {
-                    address: 0x1234_5678_1234_5678,
-                },
-            ),
-            (
-                constants::DW_OP_const8u,
-                0x1234_5678_1234_5678,
-                Operation::UnsignedConstant {
-                    value: 0x1234_5678_1234_5678,
-                },
-            ),
-            (
-                constants::DW_OP_const8s,
-                (-23i64) as u64,
-                Operation::SignedConstant { value: -23 },
-            ),
-            (
-                constants::DW_OP_call_ref,
-                0x1234_5678_1234_5678,
-                Operation::Call {
-                    offset: DieReference::DebugInfoRef(DebugInfoOffset(0x1234_5678_1234_5678)),
-                },
-            ),
-        ];
-
-        for item in inputs.iter() {
-            let (op, arg, ref expect) = *item;
-            check_op_parse(|s| s.D8(op.0).L64(arg), expect, encoding);
-        }
-    }
-
-    #[test]
-    fn test_op_parse_sleb() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        let values = [
-            -1i64,
-            0,
-            1,
-            0x100,
-            0x1eee_eeee,
-            0x7fff_ffff_ffff_ffff,
-            -0x100,
-            -0x1eee_eeee,
-            -0x7fff_ffff_ffff_ffff,
-        ];
-        for value in values.iter() {
-            let mut inputs = vec![
-                (
-                    constants::DW_OP_consts.0,
-                    Operation::SignedConstant { value: *value },
-                ),
-                (
-                    constants::DW_OP_fbreg.0,
-                    Operation::FrameOffset { offset: *value },
-                ),
-            ];
-
-            for i in 0..32 {
-                inputs.push((
-                    constants::DW_OP_breg0.0 + i,
-                    Operation::RegisterOffset {
-                        register: Register(i.into()),
-                        offset: *value,
-                        base_type: UnitOffset(0),
-                    },
-                ));
-            }
-
-            for item in inputs.iter() {
-                let (op, ref expect) = *item;
-                check_op_parse(|s| s.D8(op).sleb(*value), expect, encoding);
-            }
-        }
-    }
-
-    #[test]
-    fn test_op_parse_uleb() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        let values = [
-            0,
-            1,
-            0x100,
-            (!0u16).into(),
-            0x1eee_eeee,
-            0x7fff_ffff_ffff_ffff,
-            !0u64,
-        ];
-        for value in values.iter() {
-            let mut inputs = vec![
-                (
-                    constants::DW_OP_constu,
-                    Operation::UnsignedConstant { value: *value },
-                ),
-                (
-                    constants::DW_OP_plus_uconst,
-                    Operation::PlusConstant { value: *value },
-                ),
-            ];
-
-            if *value <= (!0u16).into() {
-                inputs.push((
-                    constants::DW_OP_regx,
-                    Operation::Register {
-                        register: Register::from_u64(*value).unwrap(),
-                    },
-                ));
-            }
-
-            if *value <= (!0u32).into() {
-                inputs.extend(&[
-                    (
-                        constants::DW_OP_addrx,
-                        Operation::AddressIndex {
-                            index: DebugAddrIndex(*value as usize),
-                        },
-                    ),
-                    (
-                        constants::DW_OP_constx,
-                        Operation::ConstantIndex {
-                            index: DebugAddrIndex(*value as usize),
-                        },
-                    ),
-                ]);
-            }
-
-            // FIXME
-            if *value < !0u64 / 8 {
-                inputs.push((
-                    constants::DW_OP_piece,
-                    Operation::Piece {
-                        size_in_bits: 8 * value,
-                        bit_offset: None,
-                    },
-                ));
-            }
-
-            for item in inputs.iter() {
-                let (op, ref expect) = *item;
-                let input = Section::with_endian(Endian::Little)
-                    .D8(op.0)
-                    .uleb(*value)
-                    .get_contents()
-                    .unwrap();
-                check_op_parse_simple(&input, expect, encoding);
-            }
-        }
-    }
-
-    #[test]
-    fn test_op_parse_bregx() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        let uvalues = [0, 1, 0x100, !0u16];
-        let svalues = [
-            -1i64,
-            0,
-            1,
-            0x100,
-            0x1eee_eeee,
-            0x7fff_ffff_ffff_ffff,
-            -0x100,
-            -0x1eee_eeee,
-            -0x7fff_ffff_ffff_ffff,
-        ];
-
-        for v1 in uvalues.iter() {
-            for v2 in svalues.iter() {
-                check_op_parse(
-                    |s| s.D8(constants::DW_OP_bregx.0).uleb((*v1).into()).sleb(*v2),
-                    &Operation::RegisterOffset {
-                        register: Register(*v1),
-                        offset: *v2,
-                        base_type: UnitOffset(0),
-                    },
-                    encoding,
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn test_op_parse_bit_piece() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        let values = [0, 1, 0x100, 0x1eee_eeee, 0x7fff_ffff_ffff_ffff, !0u64];
-
-        for v1 in values.iter() {
-            for v2 in values.iter() {
-                let input = Section::with_endian(Endian::Little)
-                    .D8(constants::DW_OP_bit_piece.0)
-                    .uleb(*v1)
-                    .uleb(*v2)
-                    .get_contents()
-                    .unwrap();
-                check_op_parse_simple(
-                    &input,
-                    &Operation::Piece {
-                        size_in_bits: *v1,
-                        bit_offset: Some(*v2),
-                    },
-                    encoding,
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn test_op_parse_implicit_value() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        let data = b"hello";
-
-        check_op_parse(
-            |s| {
-                s.D8(constants::DW_OP_implicit_value.0)
-                    .uleb(data.len() as u64)
-                    .append_bytes(&data[..])
-            },
-            &Operation::ImplicitValue {
-                data: EndianSlice::new(&data[..], LittleEndian),
-            },
-            encoding,
-        );
-    }
-
-    #[test]
-    fn test_op_parse_const_type() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        let data = b"hello";
-
-        check_op_parse(
-            |s| {
-                s.D8(constants::DW_OP_const_type.0)
-                    .uleb(100)
-                    .D8(data.len() as u8)
-                    .append_bytes(&data[..])
-            },
-            &Operation::TypedLiteral {
-                base_type: UnitOffset(100),
-                value: EndianSlice::new(&data[..], LittleEndian),
-            },
-            encoding,
-        );
-        check_op_parse(
-            |s| {
-                s.D8(constants::DW_OP_GNU_const_type.0)
-                    .uleb(100)
-                    .D8(data.len() as u8)
-                    .append_bytes(&data[..])
-            },
-            &Operation::TypedLiteral {
-                base_type: UnitOffset(100),
-                value: EndianSlice::new(&data[..], LittleEndian),
-            },
-            encoding,
-        );
-    }
-
-    #[test]
-    fn test_op_parse_regval_type() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_regval_type.0).uleb(1).uleb(100),
-            &Operation::RegisterOffset {
-                register: Register(1),
-                offset: 0,
-                base_type: UnitOffset(100),
-            },
-            encoding,
-        );
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_GNU_regval_type.0).uleb(1).uleb(100),
-            &Operation::RegisterOffset {
-                register: Register(1),
-                offset: 0,
-                base_type: UnitOffset(100),
-            },
-            encoding,
-        );
-    }
-
-    #[test]
-    fn test_op_parse_deref_type() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_deref_type.0).D8(8).uleb(100),
-            &Operation::Deref {
-                base_type: UnitOffset(100),
-                size: 8,
-                space: false,
-            },
-            encoding,
-        );
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_GNU_deref_type.0).D8(8).uleb(100),
-            &Operation::Deref {
-                base_type: UnitOffset(100),
-                size: 8,
-                space: false,
-            },
-            encoding,
-        );
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_xderef_type.0).D8(8).uleb(100),
-            &Operation::Deref {
-                base_type: UnitOffset(100),
-                size: 8,
-                space: true,
-            },
-            encoding,
-        );
-    }
-
-    #[test]
-    fn test_op_convert() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_convert.0).uleb(100),
-            &Operation::Convert {
-                base_type: UnitOffset(100),
-            },
-            encoding,
-        );
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_GNU_convert.0).uleb(100),
-            &Operation::Convert {
-                base_type: UnitOffset(100),
-            },
-            encoding,
-        );
-    }
-
-    #[test]
-    fn test_op_reinterpret() {
-        // Doesn't matter for this test.
-        let encoding = encoding4();
-
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_reinterpret.0).uleb(100),
-            &Operation::Reinterpret {
-                base_type: UnitOffset(100),
-            },
-            encoding,
-        );
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_GNU_reinterpret.0).uleb(100),
-            &Operation::Reinterpret {
-                base_type: UnitOffset(100),
-            },
-            encoding,
-        );
-    }
-
-    #[test]
-    fn test_op_parse_implicit_pointer() {
-        for op in &[
-            constants::DW_OP_implicit_pointer,
-            constants::DW_OP_GNU_implicit_pointer,
-        ] {
-            check_op_parse(
-                |s| s.D8(op.0).D32(0x1234_5678).sleb(0x123),
-                &Operation::ImplicitPointer {
-                    value: DebugInfoOffset(0x1234_5678),
-                    byte_offset: 0x123,
-                },
-                encoding4(),
-            );
-
-            check_op_parse(
-                |s| s.D8(op.0).D64(0x1234_5678).sleb(0x123),
-                &Operation::ImplicitPointer {
-                    value: DebugInfoOffset(0x1234_5678),
-                    byte_offset: 0x123,
-                },
-                encoding8(),
-            );
-        }
-    }
-
-    #[test]
-    fn test_op_parse_entry_value() {
-        for op in &[
-            constants::DW_OP_entry_value,
-            constants::DW_OP_GNU_entry_value,
-        ] {
-            let data = b"hello";
-            check_op_parse(
-                |s| s.D8(op.0).uleb(data.len() as u64).append_bytes(&data[..]),
-                &Operation::EntryValue {
-                    expression: EndianSlice::new(&data[..], LittleEndian),
-                },
-                encoding4(),
-            );
-        }
-    }
-
-    #[test]
-    fn test_op_parse_gnu_parameter_ref() {
-        check_op_parse(
-            |s| s.D8(constants::DW_OP_GNU_parameter_ref.0).D32(0x1234_5678),
-            &Operation::ParameterRef {
-                offset: UnitOffset(0x1234_5678),
-            },
-            encoding4(),
-        )
-    }
-
-    enum AssemblerEntry {
-        Op(constants::DwOp),
-        Mark(u8),
-        Branch(u8),
-        U8(u8),
-        U16(u16),
-        U32(u32),
-        U64(u64),
-        Uleb(u64),
-        Sleb(u64),
-    }
-
-    fn assemble(entries: &[AssemblerEntry]) -> Vec<u8> {
-        let mut result = Vec::new();
-
-        struct Marker(Option<usize>, Vec<usize>);
-
-        let mut markers = Vec::new();
-        for _ in 0..256 {
-            markers.push(Marker(None, Vec::new()));
-        }
-
-        fn write(stack: &mut Vec<u8>, index: usize, mut num: u64, nbytes: u8) {
-            for i in 0..nbytes as usize {
-                stack[index + i] = (num & 0xff) as u8;
-                num >>= 8;
-            }
-        }
-
-        fn push(stack: &mut Vec<u8>, num: u64, nbytes: u8) {
-            let index = stack.len();
-            for _ in 0..nbytes {
-                stack.push(0);
-            }
-            write(stack, index, num, nbytes);
-        }
-
-        for item in entries {
-            match *item {
-                AssemblerEntry::Op(op) => result.push(op.0),
-                AssemblerEntry::Mark(num) => {
-                    assert!(markers[num as usize].0.is_none());
-                    markers[num as usize].0 = Some(result.len());
-                }
-                AssemblerEntry::Branch(num) => {
-                    markers[num as usize].1.push(result.len());
-                    push(&mut result, 0, 2);
-                }
-                AssemblerEntry::U8(num) => result.push(num),
-                AssemblerEntry::U16(num) => push(&mut result, u64::from(num), 2),
-                AssemblerEntry::U32(num) => push(&mut result, u64::from(num), 4),
-                AssemblerEntry::U64(num) => push(&mut result, num, 8),
-                AssemblerEntry::Uleb(num) => {
-                    leb128::write::unsigned(&mut result, num).unwrap();
-                }
-                AssemblerEntry::Sleb(num) => {
-                    leb128::write::signed(&mut result, num as i64).unwrap();
-                }
-            }
-        }
-
-        // Update all the branches.
-        for marker in markers {
-            if let Some(offset) = marker.0 {
-                for branch_offset in marker.1 {
-                    let delta = offset.wrapping_sub(branch_offset + 2) as u64;
-                    write(&mut result, branch_offset, delta, 2);
-                }
-            }
-        }
-
-        result
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn check_eval_with_args<F>(
-        program: &[AssemblerEntry],
-        expect: Result<&[Piece<EndianSlice<LittleEndian>>]>,
-        encoding: Encoding,
-        object_address: Option<u64>,
-        initial_value: Option<u64>,
-        max_iterations: Option<u32>,
-        f: F,
-    ) where
-        for<'a> F: Fn(
-            &mut Evaluation<EndianSlice<'a, LittleEndian>>,
-            EvaluationResult<EndianSlice<'a, LittleEndian>>,
-        ) -> Result<EvaluationResult<EndianSlice<'a, LittleEndian>>>,
-    {
-        let bytes = assemble(program);
-        let bytes = EndianSlice::new(&bytes, LittleEndian);
-
-        let mut eval = Evaluation::new(bytes, encoding);
-
-        if let Some(val) = object_address {
-            eval.set_object_address(val);
-        }
-        if let Some(val) = initial_value {
-            eval.set_initial_value(val);
-        }
-        if let Some(val) = max_iterations {
-            eval.set_max_iterations(val);
-        }
-
-        let result = match eval.evaluate() {
-            Err(e) => Err(e),
-            Ok(r) => f(&mut eval, r),
-        };
-
-        match (result, expect) {
-            (Ok(EvaluationResult::Complete), Ok(pieces)) => {
-                let vec = eval.result();
-                assert_eq!(vec.len(), pieces.len());
-                for i in 0..pieces.len() {
-                    assert_eq!(vec[i], pieces[i]);
-                }
-            }
-            (Err(f1), Err(f2)) => {
-                assert_eq!(f1, f2);
-            }
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    fn check_eval(
-        program: &[AssemblerEntry],
-        expect: Result<&[Piece<EndianSlice<LittleEndian>>]>,
-        encoding: Encoding,
-    ) {
-        check_eval_with_args(program, expect, encoding, None, None, None, |_, result| {
-            Ok(result)
-        });
-    }
-
-    #[test]
-    fn test_eval_arith() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        // Indices of marks in the assembly.
-        let done = 0;
-        let fail = 1;
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_const1u), U8(23),
-            Op(DW_OP_const1s), U8((-23i8) as u8),
-            Op(DW_OP_plus),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const2u), U16(23),
-            Op(DW_OP_const2s), U16((-23i16) as u16),
-            Op(DW_OP_plus),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const4u), U32(0x1111_2222),
-            Op(DW_OP_const4s), U32((-0x1111_2222i32) as u32),
-            Op(DW_OP_plus),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Plus should overflow.
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_const1u), U8(1),
-            Op(DW_OP_plus),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_plus_uconst), Uleb(1),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Minus should underflow.
-            Op(DW_OP_const1s), U8(0),
-            Op(DW_OP_const1u), U8(1),
-            Op(DW_OP_minus),
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_abs),
-            Op(DW_OP_const1u), U8(1),
-            Op(DW_OP_minus),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const4u), U32(0xf078_fffe),
-            Op(DW_OP_const4u), U32(0x0f87_0001),
-            Op(DW_OP_and),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const4u), U32(0xf078_fffe),
-            Op(DW_OP_const4u), U32(0xf000_00fe),
-            Op(DW_OP_and),
-            Op(DW_OP_const4u), U32(0xf000_00fe),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Division is signed.
-            Op(DW_OP_const1s), U8(0xfe),
-            Op(DW_OP_const1s), U8(2),
-            Op(DW_OP_div),
-            Op(DW_OP_plus_uconst), Uleb(1),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Mod is unsigned.
-            Op(DW_OP_const1s), U8(0xfd),
-            Op(DW_OP_const1s), U8(2),
-            Op(DW_OP_mod),
-            Op(DW_OP_neg),
-            Op(DW_OP_plus_uconst), Uleb(1),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Overflow is defined for multiplication.
-            Op(DW_OP_const4u), U32(0x8000_0001),
-            Op(DW_OP_lit2),
-            Op(DW_OP_mul),
-            Op(DW_OP_lit2),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const4u), U32(0xf0f0_f0f0),
-            Op(DW_OP_const4u), U32(0xf0f0_f0f0),
-            Op(DW_OP_xor),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const4u), U32(0xf0f0_f0f0),
-            Op(DW_OP_const4u), U32(0x0f0f_0f0f),
-            Op(DW_OP_or),
-            Op(DW_OP_not),
-            Op(DW_OP_bra), Branch(fail),
-
-            // In 32 bit mode, values are truncated.
-            Op(DW_OP_const8u), U64(0xffff_ffff_0000_0000),
-            Op(DW_OP_lit2),
-            Op(DW_OP_div),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1u), U8(0xff),
-            Op(DW_OP_lit1),
-            Op(DW_OP_shl),
-            Op(DW_OP_const2u), U16(0x1fe),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1u), U8(0xff),
-            Op(DW_OP_const1u), U8(50),
-            Op(DW_OP_shl),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Absurd shift.
-            Op(DW_OP_const1u), U8(0xff),
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_shl),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_lit1),
-            Op(DW_OP_shr),
-            Op(DW_OP_const4u), U32(0x7fff_ffff),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_const1u), U8(0xff),
-            Op(DW_OP_shr),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_lit1),
-            Op(DW_OP_shra),
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_const1u), U8(0xff),
-            Op(DW_OP_shra),
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Success.
-            Op(DW_OP_lit0),
-            Op(DW_OP_nop),
-            Op(DW_OP_skip), Branch(done),
-
-            Mark(fail),
-            Op(DW_OP_lit1),
-
-            Mark(done),
-            Op(DW_OP_stack_value),
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(0),
-            },
-        }];
-
-        check_eval(&program, Ok(&result), encoding4());
-    }
-
-    #[test]
-    fn test_eval_arith64() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        // Indices of marks in the assembly.
-        let done = 0;
-        let fail = 1;
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_const8u), U64(0x1111_2222_3333_4444),
-            Op(DW_OP_const8s), U64((-0x1111_2222_3333_4444i64) as u64),
-            Op(DW_OP_plus),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_constu), Uleb(0x1111_2222_3333_4444),
-            Op(DW_OP_consts), Sleb((-0x1111_2222_3333_4444i64) as u64),
-            Op(DW_OP_plus),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_lit1),
-            Op(DW_OP_plus_uconst), Uleb(!0u64),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_lit1),
-            Op(DW_OP_neg),
-            Op(DW_OP_not),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const8u), U64(0x8000_0000_0000_0000),
-            Op(DW_OP_const1u), U8(63),
-            Op(DW_OP_shr),
-            Op(DW_OP_lit1),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const8u), U64(0x8000_0000_0000_0000),
-            Op(DW_OP_const1u), U8(62),
-            Op(DW_OP_shra),
-            Op(DW_OP_plus_uconst), Uleb(2),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_lit1),
-            Op(DW_OP_const1u), U8(63),
-            Op(DW_OP_shl),
-            Op(DW_OP_const8u), U64(0x8000_0000_0000_0000),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Success.
-            Op(DW_OP_lit0),
-            Op(DW_OP_nop),
-            Op(DW_OP_skip), Branch(done),
-
-            Mark(fail),
-            Op(DW_OP_lit1),
-
-            Mark(done),
-            Op(DW_OP_stack_value),
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(0),
-            },
-        }];
-
-        check_eval(&program, Ok(&result), encoding8());
-    }
-
-    #[test]
-    fn test_eval_compare() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        // Indices of marks in the assembly.
-        let done = 0;
-        let fail = 1;
-
-        #[rustfmt::skip]
-        let program = [
-            // Comparisons are signed.
-            Op(DW_OP_const1s), U8(1),
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_lt),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_const1s), U8(1),
-            Op(DW_OP_gt),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(1),
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_le),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_const1s), U8(1),
-            Op(DW_OP_ge),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const1s), U8(0xff),
-            Op(DW_OP_const1s), U8(1),
-            Op(DW_OP_eq),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_const4s), U32(1),
-            Op(DW_OP_const1s), U8(1),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Success.
-            Op(DW_OP_lit0),
-            Op(DW_OP_nop),
-            Op(DW_OP_skip), Branch(done),
-
-            Mark(fail),
-            Op(DW_OP_lit1),
-
-            Mark(done),
-            Op(DW_OP_stack_value),
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(0),
-            },
-        }];
-
-        check_eval(&program, Ok(&result), encoding4());
-    }
-
-    #[test]
-    fn test_eval_stack() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_lit17),                // -- 17
-            Op(DW_OP_dup),                  // -- 17 17
-            Op(DW_OP_over),                 // -- 17 17 17
-            Op(DW_OP_minus),                // -- 17 0
-            Op(DW_OP_swap),                 // -- 0 17
-            Op(DW_OP_dup),                  // -- 0 17 17
-            Op(DW_OP_plus_uconst), Uleb(1), // -- 0 17 18
-            Op(DW_OP_rot),                  // -- 18 0 17
-            Op(DW_OP_pick), U8(2),          // -- 18 0 17 18
-            Op(DW_OP_pick), U8(3),          // -- 18 0 17 18 18
-            Op(DW_OP_minus),                // -- 18 0 17 0
-            Op(DW_OP_drop),                 // -- 18 0 17
-            Op(DW_OP_swap),                 // -- 18 17 0
-            Op(DW_OP_drop),                 // -- 18 17
-            Op(DW_OP_minus),                // -- 1
-            Op(DW_OP_stack_value),
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(1),
-            },
-        }];
-
-        check_eval(&program, Ok(&result), encoding4());
-    }
-
-    #[test]
-    fn test_eval_lit_and_reg() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        let mut program = Vec::new();
-        program.push(Op(DW_OP_lit0));
-        for i in 0..32 {
-            program.push(Op(DwOp(DW_OP_lit0.0 + i)));
-            program.push(Op(DwOp(DW_OP_breg0.0 + i)));
-            program.push(Sleb(u64::from(i)));
-            program.push(Op(DW_OP_plus));
-            program.push(Op(DW_OP_plus));
-        }
-
-        program.push(Op(DW_OP_bregx));
-        program.push(Uleb(0x1234));
-        program.push(Sleb(0x1234));
-        program.push(Op(DW_OP_plus));
-
-        program.push(Op(DW_OP_stack_value));
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(496),
-            },
-        }];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding4(),
-            None,
-            None,
-            None,
-            |eval, mut result| {
-                while result != EvaluationResult::Complete {
-                    result = eval.resume_with_register(match result {
-                        EvaluationResult::RequiresRegister {
-                            register,
-                            base_type,
-                        } => {
-                            assert_eq!(base_type, UnitOffset(0));
-                            Value::Generic(u64::from(register.0).wrapping_neg())
-                        }
-                        _ => panic!(),
-                    })?;
-                }
-                Ok(result)
-            },
-        );
-    }
-
-    #[test]
-    fn test_eval_memory() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        // Indices of marks in the assembly.
-        let done = 0;
-        let fail = 1;
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_addr), U32(0x7fff_ffff),
-            Op(DW_OP_deref),
-            Op(DW_OP_const4u), U32(0xffff_fffc),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_addr), U32(0x7fff_ffff),
-            Op(DW_OP_deref_size), U8(2),
-            Op(DW_OP_const4u), U32(0xfffc),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_lit1),
-            Op(DW_OP_addr), U32(0x7fff_ffff),
-            Op(DW_OP_xderef),
-            Op(DW_OP_const4u), U32(0xffff_fffd),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_lit1),
-            Op(DW_OP_addr), U32(0x7fff_ffff),
-            Op(DW_OP_xderef_size), U8(2),
-            Op(DW_OP_const4u), U32(0xfffd),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_lit17),
-            Op(DW_OP_form_tls_address),
-            Op(DW_OP_constu), Uleb(!17),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_lit17),
-            Op(DW_OP_GNU_push_tls_address),
-            Op(DW_OP_constu), Uleb(!17),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_addrx), Uleb(0x10),
-            Op(DW_OP_deref),
-            Op(DW_OP_const4u), U32(0x4040),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            Op(DW_OP_constx), Uleb(17),
-            Op(DW_OP_form_tls_address),
-            Op(DW_OP_constu), Uleb(!27),
-            Op(DW_OP_ne),
-            Op(DW_OP_bra), Branch(fail),
-
-            // Success.
-            Op(DW_OP_lit0),
-            Op(DW_OP_nop),
-            Op(DW_OP_skip), Branch(done),
-
-            Mark(fail),
-            Op(DW_OP_lit1),
-
-            Mark(done),
-            Op(DW_OP_stack_value),
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(0),
-            },
-        }];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding4(),
-            None,
-            None,
-            None,
-            |eval, mut result| {
-                while result != EvaluationResult::Complete {
-                    result = match result {
-                        EvaluationResult::RequiresMemory {
-                            address,
-                            size,
-                            space,
-                            base_type,
-                        } => {
-                            assert_eq!(base_type, UnitOffset(0));
-                            let mut v = address << 2;
-                            if let Some(value) = space {
-                                v += value;
-                            }
-                            v &= (1u64 << (8 * size)) - 1;
-                            eval.resume_with_memory(Value::Generic(v))?
-                        }
-                        EvaluationResult::RequiresTls(slot) => eval.resume_with_tls(!slot)?,
-                        EvaluationResult::RequiresRelocatedAddress(address) => {
-                            eval.resume_with_relocated_address(address)?
-                        }
-                        EvaluationResult::RequiresIndexedAddress { index, relocate } => {
-                            if relocate {
-                                eval.resume_with_indexed_address(0x1000 + index.0 as u64)?
-                            } else {
-                                eval.resume_with_indexed_address(10 + index.0 as u64)?
-                            }
-                        }
-                        _ => panic!(),
-                    };
-                }
-
-                Ok(result)
-            },
-        );
-    }
-
-    #[test]
-    fn test_eval_register() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        for i in 0..32 {
-            #[rustfmt::skip]
-            let program = [
-                Op(DwOp(DW_OP_reg0.0 + i)),
-                // Included only in the "bad" run.
-                Op(DW_OP_lit23),
-            ];
-            let ok_result = [Piece {
-                size_in_bits: None,
-                bit_offset: None,
-                location: Location::Register {
-                    register: Register(i.into()),
-                },
-            }];
-
-            check_eval(&program[..1], Ok(&ok_result), encoding4());
-
-            check_eval(
-                &program,
-                Err(Error::InvalidExpressionTerminator(1)),
-                encoding4(),
-            );
-        }
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_regx), Uleb(0x1234)
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Register {
-                register: Register(0x1234),
-            },
-        }];
-
-        check_eval(&program, Ok(&result), encoding4());
-    }
-
-    #[test]
-    fn test_eval_context() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        // Test `frame_base` and `call_frame_cfa` callbacks.
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_fbreg), Sleb((-8i8) as u64),
-            Op(DW_OP_call_frame_cfa),
-            Op(DW_OP_plus),
-            Op(DW_OP_neg),
-            Op(DW_OP_stack_value)
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(9),
-            },
-        }];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding8(),
-            None,
-            None,
-            None,
-            |eval, result| {
-                match result {
-                    EvaluationResult::RequiresFrameBase => {}
-                    _ => panic!(),
-                };
-                match eval.resume_with_frame_base(0x0123_4567_89ab_cdef)? {
-                    EvaluationResult::RequiresCallFrameCfa => {}
-                    _ => panic!(),
-                };
-                eval.resume_with_call_frame_cfa(0xfedc_ba98_7654_3210)
-            },
-        );
-
-        // Test `evaluate_entry_value` callback.
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_entry_value), Uleb(8), U64(0x1234_5678),
-            Op(DW_OP_stack_value)
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(0x1234_5678),
-            },
-        }];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding8(),
-            None,
-            None,
-            None,
-            |eval, result| {
-                let entry_value = match result {
-                    EvaluationResult::RequiresEntryValue(mut expression) => {
-                        expression.0.read_u64()?
-                    }
-                    _ => panic!(),
-                };
-                eval.resume_with_entry_value(Value::Generic(entry_value))
-            },
-        );
-
-        // Test missing `object_address` field.
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_push_object_address),
-        ];
-
-        check_eval_with_args(
-            &program,
-            Err(Error::InvalidPushObjectAddress),
-            encoding4(),
-            None,
-            None,
-            None,
-            |_, _| panic!(),
-        );
-
-        // Test `object_address` field.
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_push_object_address),
-            Op(DW_OP_stack_value),
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(0xff),
-            },
-        }];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding8(),
-            Some(0xff),
-            None,
-            None,
-            |_, result| Ok(result),
-        );
-
-        // Test `initial_value` field.
-        #[rustfmt::skip]
-        let program = [
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Address {
-                address: 0x1234_5678,
-            },
-        }];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding8(),
-            None,
-            Some(0x1234_5678),
-            None,
-            |_, result| Ok(result),
-        );
-    }
-
-    #[test]
-    fn test_eval_empty_stack() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_stack_value)
-        ];
-
-        check_eval(&program, Err(Error::NotEnoughStackItems), encoding4());
-    }
-
-    #[test]
-    fn test_eval_call() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_lit23),
-            Op(DW_OP_call2), U16(0x7755),
-            Op(DW_OP_call4), U32(0x7755_aaee),
-            Op(DW_OP_call_ref), U32(0x7755_aaee),
-            Op(DW_OP_stack_value)
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(23),
-            },
-        }];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding4(),
-            None,
-            None,
-            None,
-            |eval, result| {
-                let buf = EndianSlice::new(&[], LittleEndian);
-                match result {
-                    EvaluationResult::RequiresAtLocation(_) => {}
-                    _ => panic!(),
-                };
-
-                eval.resume_with_at_location(buf)?;
-
-                match result {
-                    EvaluationResult::RequiresAtLocation(_) => {}
-                    _ => panic!(),
-                };
-
-                eval.resume_with_at_location(buf)?;
-
-                match result {
-                    EvaluationResult::RequiresAtLocation(_) => {}
-                    _ => panic!(),
-                };
-
-                eval.resume_with_at_location(buf)
-            },
-        );
-
-        // DW_OP_lit2 DW_OP_mul
-        const SUBR: &[u8] = &[0x32, 0x1e];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Value {
-                value: Value::Generic(184),
-            },
-        }];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding4(),
-            None,
-            None,
-            None,
-            |eval, result| {
-                let buf = EndianSlice::new(SUBR, LittleEndian);
-                match result {
-                    EvaluationResult::RequiresAtLocation(_) => {}
-                    _ => panic!(),
-                };
-
-                eval.resume_with_at_location(buf)?;
-
-                match result {
-                    EvaluationResult::RequiresAtLocation(_) => {}
-                    _ => panic!(),
-                };
-
-                eval.resume_with_at_location(buf)?;
-
-                match result {
-                    EvaluationResult::RequiresAtLocation(_) => {}
-                    _ => panic!(),
-                };
-
-                eval.resume_with_at_location(buf)
-            },
-        );
-    }
-
-    #[test]
-    fn test_eval_pieces() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        // Example from DWARF 2.6.1.3.
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_reg3),
-            Op(DW_OP_piece), Uleb(4),
-            Op(DW_OP_reg4),
-            Op(DW_OP_piece), Uleb(2),
-        ];
-
-        let result = [
-            Piece {
-                size_in_bits: Some(32),
-                bit_offset: None,
-                location: Location::Register {
-                    register: Register(3),
-                },
-            },
-            Piece {
-                size_in_bits: Some(16),
-                bit_offset: None,
-                location: Location::Register {
-                    register: Register(4),
-                },
-            },
-        ];
-
-        check_eval(&program, Ok(&result), encoding4());
-
-        // Example from DWARF 2.6.1.3 (but hacked since dealing with fbreg
-        // in the tests is a pain).
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_reg0),
-            Op(DW_OP_piece), Uleb(4),
-            Op(DW_OP_piece), Uleb(4),
-            Op(DW_OP_addr), U32(0x7fff_ffff),
-            Op(DW_OP_piece), Uleb(4),
-        ];
-
-        let result = [
-            Piece {
-                size_in_bits: Some(32),
-                bit_offset: None,
-                location: Location::Register {
-                    register: Register(0),
-                },
-            },
-            Piece {
-                size_in_bits: Some(32),
-                bit_offset: None,
-                location: Location::Empty,
-            },
-            Piece {
-                size_in_bits: Some(32),
-                bit_offset: None,
-                location: Location::Address {
-                    address: 0x7fff_ffff,
-                },
-            },
-        ];
-
-        check_eval_with_args(
-            &program,
-            Ok(&result),
-            encoding4(),
-            None,
-            None,
-            None,
-            |eval, mut result| {
-                while result != EvaluationResult::Complete {
-                    result = match result {
-                        EvaluationResult::RequiresRelocatedAddress(address) => {
-                            eval.resume_with_relocated_address(address)?
-                        }
-                        _ => panic!(),
-                    };
-                }
-
-                Ok(result)
-            },
-        );
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_implicit_value), Uleb(5),
-            U8(23), U8(24), U8(25), U8(26), U8(0),
-        ];
-
-        const BYTES: &[u8] = &[23, 24, 25, 26, 0];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Bytes {
-                value: EndianSlice::new(BYTES, LittleEndian),
-            },
-        }];
-
-        check_eval(&program, Ok(&result), encoding4());
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_lit7),
-            Op(DW_OP_stack_value),
-            Op(DW_OP_bit_piece), Uleb(5), Uleb(0),
-            Op(DW_OP_bit_piece), Uleb(3), Uleb(0),
-        ];
-
-        let result = [
-            Piece {
-                size_in_bits: Some(5),
-                bit_offset: Some(0),
-                location: Location::Value {
-                    value: Value::Generic(7),
-                },
-            },
-            Piece {
-                size_in_bits: Some(3),
-                bit_offset: Some(0),
-                location: Location::Empty,
-            },
-        ];
-
-        check_eval(&program, Ok(&result), encoding4());
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_lit7),
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::Address { address: 7 },
-        }];
-
-        check_eval(&program, Ok(&result), encoding4());
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_implicit_pointer), U32(0x1234_5678), Sleb(0x123),
-        ];
-
-        let result = [Piece {
-            size_in_bits: None,
-            bit_offset: None,
-            location: Location::ImplicitPointer {
-                value: DebugInfoOffset(0x1234_5678),
-                byte_offset: 0x123,
-            },
-        }];
-
-        check_eval(&program, Ok(&result), encoding4());
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_reg3),
-            Op(DW_OP_piece), Uleb(4),
-            Op(DW_OP_reg4),
-        ];
-
-        check_eval(&program, Err(Error::InvalidPiece), encoding4());
-
-        #[rustfmt::skip]
-        let program = [
-            Op(DW_OP_reg3),
-            Op(DW_OP_piece), Uleb(4),
-            Op(DW_OP_lit0),
-        ];
-
-        check_eval(&program, Err(Error::InvalidPiece), encoding4());
-    }
-
-    #[test]
-    fn test_eval_max_iterations() {
-        // It's nice if an operation and its arguments can fit on a single
-        // line in the test program.
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        #[rustfmt::skip]
-        let program = [
-            Mark(1),
-            Op(DW_OP_skip), Branch(1),
-        ];
-
-        check_eval_with_args(
-            &program,
-            Err(Error::TooManyIterations),
-            encoding4(),
-            None,
-            None,
-            Some(150),
-            |_, _| panic!(),
-        );
-    }
-
-    #[test]
-    fn test_eval_typed_stack() {
-        use self::AssemblerEntry::*;
-        use crate::constants::*;
-
-        let base_types = [
-            ValueType::Generic,
-            ValueType::U16,
-            ValueType::U32,
-            ValueType::F32,
-        ];
-
-        // TODO: convert, reinterpret
-        #[rustfmt::skip]
-        let tests = [
-            (
-                &[
-                    Op(DW_OP_const_type), Uleb(1), U8(2), U16(0x1234),
-                    Op(DW_OP_stack_value),
-                ][..],
-                Value::U16(0x1234),
-            ),
-            (
-                &[
-                    Op(DW_OP_regval_type), Uleb(0x1234), Uleb(1),
-                    Op(DW_OP_stack_value),
-                ][..],
-                Value::U16(0x2340),
-            ),
-            (
-                &[
-                    Op(DW_OP_addr), U32(0x7fff_ffff),
-                    Op(DW_OP_deref_type), U8(2), Uleb(1),
-                    Op(DW_OP_stack_value),
-                ][..],
-                Value::U16(0xfff0),
-            ),
-            (
-                &[
-                    Op(DW_OP_lit1),
-                    Op(DW_OP_addr), U32(0x7fff_ffff),
-                    Op(DW_OP_xderef_type), U8(2), Uleb(1),
-                    Op(DW_OP_stack_value),
-                ][..],
-                Value::U16(0xfff1),
-            ),
-            (
-                &[
-                    Op(DW_OP_const_type), Uleb(1), U8(2), U16(0x1234),
-                    Op(DW_OP_convert), Uleb(2),
-                    Op(DW_OP_stack_value),
-                ][..],
-                Value::U32(0x1234),
-            ),
-            (
-                &[
-                    Op(DW_OP_const_type), Uleb(2), U8(4), U32(0x3f80_0000),
-                    Op(DW_OP_reinterpret), Uleb(3),
-                    Op(DW_OP_stack_value),
-                ][..],
-                Value::F32(1.0),
-            ),
-        ];
-        for &(program, value) in &tests {
-            let result = [Piece {
-                size_in_bits: None,
-                bit_offset: None,
-                location: Location::Value { value },
-            }];
-
-            check_eval_with_args(
-                program,
-                Ok(&result),
-                encoding4(),
-                None,
-                None,
-                None,
-                |eval, mut result| {
-                    while result != EvaluationResult::Complete {
-                        result = match result {
-                            EvaluationResult::RequiresMemory {
-                                address,
-                                size,
-                                space,
-                                base_type,
-                            } => {
-                                let mut v = address << 4;
-                                if let Some(value) = space {
-                                    v += value;
-                                }
-                                v &= (1u64 << (8 * size)) - 1;
-                                let v = Value::from_u64(base_types[base_type.0], v)?;
-                                eval.resume_with_memory(v)?
-                            }
-                            EvaluationResult::RequiresRegister {
-                                register,
-                                base_type,
-                            } => {
-                                let v = Value::from_u64(
-                                    base_types[base_type.0],
-                                    u64::from(register.0) << 4,
-                                )?;
-                                eval.resume_with_register(v)?
-                            }
-                            EvaluationResult::RequiresBaseType(offset) => {
-                                eval.resume_with_base_type(base_types[offset.0])?
-                            }
-                            EvaluationResult::RequiresRelocatedAddress(address) => {
-                                eval.resume_with_relocated_address(address)?
-                            }
-                            _ => panic!("Unexpected result {:?}", result),
-                        }
-                    }
-                    Ok(result)
-                },
-            );
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/pubnames.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/pubnames.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/pubnames.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/pubnames.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-use crate::common::{DebugInfoOffset, SectionId};
-use crate::endianity::Endianity;
-use crate::read::lookup::{DebugLookup, LookupEntryIter, PubStuffEntry, PubStuffParser};
-use crate::read::{EndianSlice, Reader, Result, Section, UnitOffset};
-
-/// A single parsed pubname.
-#[derive(Debug, Clone)]
-pub struct PubNamesEntry<R: Reader> {
-    unit_header_offset: DebugInfoOffset<R::Offset>,
-    die_offset: UnitOffset<R::Offset>,
-    name: R,
-}
-
-impl<R: Reader> PubNamesEntry<R> {
-    /// Returns the name this entry refers to.
-    pub fn name(&self) -> &R {
-        &self.name
-    }
-
-    /// Returns the offset into the .debug_info section for the header of the compilation unit
-    /// which contains this name.
-    pub fn unit_header_offset(&self) -> DebugInfoOffset<R::Offset> {
-        self.unit_header_offset
-    }
-
-    /// Returns the offset into the compilation unit for the debugging information entry which
-    /// has this name.
-    pub fn die_offset(&self) -> UnitOffset<R::Offset> {
-        self.die_offset
-    }
-}
-
-impl<R: Reader> PubStuffEntry<R> for PubNamesEntry<R> {
-    fn new(
-        die_offset: UnitOffset<R::Offset>,
-        name: R,
-        unit_header_offset: DebugInfoOffset<R::Offset>,
-    ) -> Self {
-        PubNamesEntry {
-            unit_header_offset,
-            die_offset,
-            name,
-        }
-    }
-}
-
-/// The `DebugPubNames` struct represents the DWARF public names information
-/// found in the `.debug_pubnames` section.
-#[derive(Debug, Clone)]
-pub struct DebugPubNames<R: Reader>(DebugLookup<R, PubStuffParser<R, PubNamesEntry<R>>>);
-
-impl<'input, Endian> DebugPubNames<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugPubNames` instance from the data in the `.debug_pubnames`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_pubnames` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugPubNames, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_pubnames_section_somehow = || &buf;
-    /// let debug_pubnames =
-    ///     DebugPubNames::new(read_debug_pubnames_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(debug_pubnames_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_pubnames_section, endian))
-    }
-}
-
-impl<R: Reader> DebugPubNames<R> {
-    /// Iterate the pubnames in the `.debug_pubnames` section.
-    ///
-    /// ```
-    /// use gimli::{DebugPubNames, EndianSlice, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_pubnames_section_somehow = || &buf;
-    /// let debug_pubnames =
-    ///     DebugPubNames::new(read_debug_pubnames_section_somehow(), LittleEndian);
-    ///
-    /// let mut iter = debug_pubnames.items();
-    /// while let Some(pubname) = iter.next().unwrap() {
-    ///   println!("pubname {} found!", pubname.name().to_string_lossy());
-    /// }
-    /// ```
-    pub fn items(&self) -> PubNamesEntryIter<R> {
-        PubNamesEntryIter(self.0.items())
-    }
-}
-
-impl<R: Reader> Section<R> for DebugPubNames<R> {
-    fn id() -> SectionId {
-        SectionId::DebugPubNames
-    }
-
-    fn reader(&self) -> &R {
-        self.0.reader()
-    }
-}
-
-impl<R: Reader> From<R> for DebugPubNames<R> {
-    fn from(debug_pubnames_section: R) -> Self {
-        DebugPubNames(DebugLookup::from(debug_pubnames_section))
-    }
-}
-
-/// An iterator over the pubnames from a `.debug_pubnames` section.
-///
-/// Can be [used with
-/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-#[derive(Debug, Clone)]
-pub struct PubNamesEntryIter<R: Reader>(LookupEntryIter<R, PubStuffParser<R, PubNamesEntry<R>>>);
-
-impl<R: Reader> PubNamesEntryIter<R> {
-    /// Advance the iterator and return the next pubname.
-    ///
-    /// Returns the newly parsed pubname as `Ok(Some(pubname))`. Returns
-    /// `Ok(None)` when iteration is complete and all pubnames have already been
-    /// parsed and yielded. If an error occurs while parsing the next pubname,
-    /// then this error is returned as `Err(e)`, and all subsequent calls return
-    /// `Ok(None)`.
-    pub fn next(&mut self) -> Result<Option<PubNamesEntry<R>>> {
-        self.0.next()
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for PubNamesEntryIter<R> {
-    type Item = PubNamesEntry<R>;
-    type Error = crate::read::Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        self.0.next()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/pubtypes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/pubtypes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/pubtypes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/pubtypes.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-use crate::common::{DebugInfoOffset, SectionId};
-use crate::endianity::Endianity;
-use crate::read::lookup::{DebugLookup, LookupEntryIter, PubStuffEntry, PubStuffParser};
-use crate::read::{EndianSlice, Reader, Result, Section, UnitOffset};
-
-/// A single parsed pubtype.
-#[derive(Debug, Clone)]
-pub struct PubTypesEntry<R: Reader> {
-    unit_header_offset: DebugInfoOffset<R::Offset>,
-    die_offset: UnitOffset<R::Offset>,
-    name: R,
-}
-
-impl<R: Reader> PubTypesEntry<R> {
-    /// Returns the name of the type this entry refers to.
-    pub fn name(&self) -> &R {
-        &self.name
-    }
-
-    /// Returns the offset into the .debug_info section for the header of the compilation unit
-    /// which contains the type with this name.
-    pub fn unit_header_offset(&self) -> DebugInfoOffset<R::Offset> {
-        self.unit_header_offset
-    }
-
-    /// Returns the offset into the compilation unit for the debugging information entry which
-    /// the type with this name.
-    pub fn die_offset(&self) -> UnitOffset<R::Offset> {
-        self.die_offset
-    }
-}
-
-impl<R: Reader> PubStuffEntry<R> for PubTypesEntry<R> {
-    fn new(
-        die_offset: UnitOffset<R::Offset>,
-        name: R,
-        unit_header_offset: DebugInfoOffset<R::Offset>,
-    ) -> Self {
-        PubTypesEntry {
-            unit_header_offset,
-            die_offset,
-            name,
-        }
-    }
-}
-
-/// The `DebugPubTypes` struct represents the DWARF public types information
-/// found in the `.debug_info` section.
-#[derive(Debug, Clone)]
-pub struct DebugPubTypes<R: Reader>(DebugLookup<R, PubStuffParser<R, PubTypesEntry<R>>>);
-
-impl<'input, Endian> DebugPubTypes<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugPubTypes` instance from the data in the `.debug_pubtypes`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_pubtypes` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugPubTypes, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_pubtypes_somehow = || &buf;
-    /// let debug_pubtypes =
-    ///     DebugPubTypes::new(read_debug_pubtypes_somehow(), LittleEndian);
-    /// ```
-    pub fn new(debug_pubtypes_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_pubtypes_section, endian))
-    }
-}
-
-impl<R: Reader> DebugPubTypes<R> {
-    /// Iterate the pubtypes in the `.debug_pubtypes` section.
-    ///
-    /// ```
-    /// use gimli::{DebugPubTypes, EndianSlice, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_pubtypes_section_somehow = || &buf;
-    /// let debug_pubtypes =
-    ///     DebugPubTypes::new(read_debug_pubtypes_section_somehow(), LittleEndian);
-    ///
-    /// let mut iter = debug_pubtypes.items();
-    /// while let Some(pubtype) = iter.next().unwrap() {
-    ///   println!("pubtype {} found!", pubtype.name().to_string_lossy());
-    /// }
-    /// ```
-    pub fn items(&self) -> PubTypesEntryIter<R> {
-        PubTypesEntryIter(self.0.items())
-    }
-}
-
-impl<R: Reader> Section<R> for DebugPubTypes<R> {
-    fn id() -> SectionId {
-        SectionId::DebugPubTypes
-    }
-
-    fn reader(&self) -> &R {
-        self.0.reader()
-    }
-}
-
-impl<R: Reader> From<R> for DebugPubTypes<R> {
-    fn from(debug_pubtypes_section: R) -> Self {
-        DebugPubTypes(DebugLookup::from(debug_pubtypes_section))
-    }
-}
-
-/// An iterator over the pubtypes from a `.debug_pubtypes` section.
-///
-/// Can be [used with
-/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-#[derive(Debug, Clone)]
-pub struct PubTypesEntryIter<R: Reader>(LookupEntryIter<R, PubStuffParser<R, PubTypesEntry<R>>>);
-
-impl<R: Reader> PubTypesEntryIter<R> {
-    /// Advance the iterator and return the next pubtype.
-    ///
-    /// Returns the newly parsed pubtype as `Ok(Some(pubtype))`. Returns
-    /// `Ok(None)` when iteration is complete and all pubtypes have already been
-    /// parsed and yielded. If an error occurs while parsing the next pubtype,
-    /// then this error is returned as `Err(e)`, and all subsequent calls return
-    /// `Ok(None)`.
-    pub fn next(&mut self) -> Result<Option<PubTypesEntry<R>>> {
-        self.0.next()
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for PubTypesEntryIter<R> {
-    type Item = PubTypesEntry<R>;
-    type Error = crate::read::Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        self.0.next()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/reader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,470 +0,0 @@
-use alloc::borrow::Cow;
-use core::fmt::Debug;
-use core::hash::Hash;
-use core::ops::{Add, AddAssign, Sub};
-
-use crate::common::Format;
-use crate::endianity::Endianity;
-use crate::leb128;
-use crate::read::{Error, Result};
-
-/// An identifier for an offset within a section reader.
-///
-/// This is used for error reporting. The meaning of this value is specific to
-/// each reader implementation. The values should be chosen to be unique amongst
-/// all readers. If values are not unique then errors may point to the wrong reader.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct ReaderOffsetId(pub u64);
-
-/// A trait for offsets with a DWARF section.
-///
-/// This allows consumers to choose a size that is appropriate for their address space.
-pub trait ReaderOffset:
-    Debug + Copy + Eq + Ord + Hash + Add<Output = Self> + AddAssign + Sub<Output = Self>
-{
-    /// Convert a u8 to an offset.
-    fn from_u8(offset: u8) -> Self;
-
-    /// Convert a u16 to an offset.
-    fn from_u16(offset: u16) -> Self;
-
-    /// Convert an i16 to an offset.
-    fn from_i16(offset: i16) -> Self;
-
-    /// Convert a u32 to an offset.
-    fn from_u32(offset: u32) -> Self;
-
-    /// Convert a u64 to an offset.
-    ///
-    /// Returns `Error::UnsupportedOffset` if the value is too large.
-    fn from_u64(offset: u64) -> Result<Self>;
-
-    /// Convert an offset to a u64.
-    fn into_u64(self) -> u64;
-
-    /// Wrapping (modular) addition. Computes `self + other`.
-    fn wrapping_add(self, other: Self) -> Self;
-
-    /// Checked subtraction. Computes `self - other`.
-    fn checked_sub(self, other: Self) -> Option<Self>;
-}
-
-impl ReaderOffset for u64 {
-    #[inline]
-    fn from_u8(offset: u8) -> Self {
-        u64::from(offset)
-    }
-
-    #[inline]
-    fn from_u16(offset: u16) -> Self {
-        u64::from(offset)
-    }
-
-    #[inline]
-    fn from_i16(offset: i16) -> Self {
-        offset as u64
-    }
-
-    #[inline]
-    fn from_u32(offset: u32) -> Self {
-        u64::from(offset)
-    }
-
-    #[inline]
-    fn from_u64(offset: u64) -> Result<Self> {
-        Ok(offset)
-    }
-
-    #[inline]
-    fn into_u64(self) -> u64 {
-        self
-    }
-
-    #[inline]
-    fn wrapping_add(self, other: Self) -> Self {
-        self.wrapping_add(other)
-    }
-
-    #[inline]
-    fn checked_sub(self, other: Self) -> Option<Self> {
-        self.checked_sub(other)
-    }
-}
-
-impl ReaderOffset for u32 {
-    #[inline]
-    fn from_u8(offset: u8) -> Self {
-        u32::from(offset)
-    }
-
-    #[inline]
-    fn from_u16(offset: u16) -> Self {
-        u32::from(offset)
-    }
-
-    #[inline]
-    fn from_i16(offset: i16) -> Self {
-        offset as u32
-    }
-
-    #[inline]
-    fn from_u32(offset: u32) -> Self {
-        offset
-    }
-
-    #[inline]
-    fn from_u64(offset64: u64) -> Result<Self> {
-        let offset = offset64 as u32;
-        if u64::from(offset) == offset64 {
-            Ok(offset)
-        } else {
-            Err(Error::UnsupportedOffset)
-        }
-    }
-
-    #[inline]
-    fn into_u64(self) -> u64 {
-        u64::from(self)
-    }
-
-    #[inline]
-    fn wrapping_add(self, other: Self) -> Self {
-        self.wrapping_add(other)
-    }
-
-    #[inline]
-    fn checked_sub(self, other: Self) -> Option<Self> {
-        self.checked_sub(other)
-    }
-}
-
-impl ReaderOffset for usize {
-    #[inline]
-    fn from_u8(offset: u8) -> Self {
-        offset as usize
-    }
-
-    #[inline]
-    fn from_u16(offset: u16) -> Self {
-        offset as usize
-    }
-
-    #[inline]
-    fn from_i16(offset: i16) -> Self {
-        offset as usize
-    }
-
-    #[inline]
-    fn from_u32(offset: u32) -> Self {
-        offset as usize
-    }
-
-    #[inline]
-    fn from_u64(offset64: u64) -> Result<Self> {
-        let offset = offset64 as usize;
-        if offset as u64 == offset64 {
-            Ok(offset)
-        } else {
-            Err(Error::UnsupportedOffset)
-        }
-    }
-
-    #[inline]
-    fn into_u64(self) -> u64 {
-        self as u64
-    }
-
-    #[inline]
-    fn wrapping_add(self, other: Self) -> Self {
-        self.wrapping_add(other)
-    }
-
-    #[inline]
-    fn checked_sub(self, other: Self) -> Option<Self> {
-        self.checked_sub(other)
-    }
-}
-
-/// A trait for reading the data from a DWARF section.
-///
-/// All read operations advance the section offset of the reader
-/// unless specified otherwise.
-///
-/// ## Choosing a `Reader` Implementation
-///
-/// `gimli` comes with a few different `Reader` implementations and lets you
-/// choose the one that is right for your use case. A `Reader` is essentially a
-/// view into the raw bytes that make up some DWARF, but this view might borrow
-/// the underlying data or use reference counting ownership, and it might be
-/// thread safe or not.
-///
-/// | Implementation    | Ownership         | Thread Safe | Notes |
-/// |:------------------|:------------------|:------------|:------|
-/// | [`EndianSlice`](./struct.EndianSlice.html)        | Borrowed          | Yes         | Fastest, but requires that all of your code work with borrows. |
-/// | [`EndianRcSlice`](./struct.EndianRcSlice.html)    | Reference counted | No          | Shared ownership via reference counting, which alleviates the borrow restrictions of `EndianSlice` but imposes reference counting increments and decrements. Cannot be sent across threads, because the reference count is not atomic. |
-/// | [`EndianArcSlice`](./struct.EndianArcSlice.html)  | Reference counted | Yes         | The same as `EndianRcSlice`, but uses atomic reference counting, and therefore reference counting operations are slower but `EndianArcSlice`s may be sent across threads. |
-/// | [`EndianReader<T>`](./struct.EndianReader.html)   | Same as `T`       | Same as `T` | Escape hatch for easily defining your own type of `Reader`. |
-pub trait Reader: Debug + Clone {
-    /// The endianity of bytes that are read.
-    type Endian: Endianity;
-
-    /// The type used for offsets and lengths.
-    type Offset: ReaderOffset;
-
-    /// Return the endianity of bytes that are read.
-    fn endian(&self) -> Self::Endian;
-
-    /// Return the number of bytes remaining.
-    fn len(&self) -> Self::Offset;
-
-    /// Set the number of bytes remaining to zero.
-    fn empty(&mut self);
-
-    /// Set the number of bytes remaining to the specified length.
-    fn truncate(&mut self, len: Self::Offset) -> Result<()>;
-
-    /// Return the offset of this reader's data relative to the start of
-    /// the given base reader's data.
-    ///
-    /// May panic if this reader's data is not contained within the given
-    /// base reader's data.
-    fn offset_from(&self, base: &Self) -> Self::Offset;
-
-    /// Return an identifier for the current reader offset.
-    fn offset_id(&self) -> ReaderOffsetId;
-
-    /// Return the offset corresponding to the given `id` if
-    /// it is associated with this reader.
-    fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<Self::Offset>;
-
-    /// Find the index of the first occurence of the given byte.
-    /// The offset of the reader is not changed.
-    fn find(&self, byte: u8) -> Result<Self::Offset>;
-
-    /// Discard the specified number of bytes.
-    fn skip(&mut self, len: Self::Offset) -> Result<()>;
-
-    /// Split a reader in two.
-    ///
-    /// A new reader is returned that can be used to read the next
-    /// `len` bytes, and `self` is advanced so that it reads the remainder.
-    fn split(&mut self, len: Self::Offset) -> Result<Self>;
-
-    /// Return all remaining data as a clone-on-write slice.
-    ///
-    /// The slice will be borrowed where possible, but some readers may
-    /// always return an owned vector.
-    ///
-    /// Does not advance the reader.
-    fn to_slice(&self) -> Result<Cow<[u8]>>;
-
-    /// Convert all remaining data to a clone-on-write string.
-    ///
-    /// The string will be borrowed where possible, but some readers may
-    /// always return an owned string.
-    ///
-    /// Does not advance the reader.
-    ///
-    /// Returns an error if the data contains invalid characters.
-    fn to_string(&self) -> Result<Cow<str>>;
-
-    /// Convert all remaining data to a clone-on-write string, including invalid characters.
-    ///
-    /// The string will be borrowed where possible, but some readers may
-    /// always return an owned string.
-    ///
-    /// Does not advance the reader.
-    fn to_string_lossy(&self) -> Result<Cow<str>>;
-
-    /// Read exactly `buf.len()` bytes into `buf`.
-    fn read_slice(&mut self, buf: &mut [u8]) -> Result<()>;
-
-    /// Read a u8 array.
-    #[inline]
-    fn read_u8_array<A>(&mut self) -> Result<A>
-    where
-        A: Sized + Default + AsMut<[u8]>,
-    {
-        let mut val = Default::default();
-        self.read_slice(<A as AsMut<[u8]>>::as_mut(&mut val))?;
-        Ok(val)
-    }
-
-    /// Return true if the number of bytes remaining is zero.
-    #[inline]
-    fn is_empty(&self) -> bool {
-        self.len() == Self::Offset::from_u8(0)
-    }
-
-    /// Read a u8.
-    #[inline]
-    fn read_u8(&mut self) -> Result<u8> {
-        let a: [u8; 1] = self.read_u8_array()?;
-        Ok(a[0])
-    }
-
-    /// Read an i8.
-    #[inline]
-    fn read_i8(&mut self) -> Result<i8> {
-        let a: [u8; 1] = self.read_u8_array()?;
-        Ok(a[0] as i8)
-    }
-
-    /// Read a u16.
-    #[inline]
-    fn read_u16(&mut self) -> Result<u16> {
-        let a: [u8; 2] = self.read_u8_array()?;
-        Ok(self.endian().read_u16(&a))
-    }
-
-    /// Read an i16.
-    #[inline]
-    fn read_i16(&mut self) -> Result<i16> {
-        let a: [u8; 2] = self.read_u8_array()?;
-        Ok(self.endian().read_i16(&a))
-    }
-
-    /// Read a u32.
-    #[inline]
-    fn read_u32(&mut self) -> Result<u32> {
-        let a: [u8; 4] = self.read_u8_array()?;
-        Ok(self.endian().read_u32(&a))
-    }
-
-    /// Read an i32.
-    #[inline]
-    fn read_i32(&mut self) -> Result<i32> {
-        let a: [u8; 4] = self.read_u8_array()?;
-        Ok(self.endian().read_i32(&a))
-    }
-
-    /// Read a u64.
-    #[inline]
-    fn read_u64(&mut self) -> Result<u64> {
-        let a: [u8; 8] = self.read_u8_array()?;
-        Ok(self.endian().read_u64(&a))
-    }
-
-    /// Read an i64.
-    #[inline]
-    fn read_i64(&mut self) -> Result<i64> {
-        let a: [u8; 8] = self.read_u8_array()?;
-        Ok(self.endian().read_i64(&a))
-    }
-
-    /// Read a f32.
-    #[inline]
-    fn read_f32(&mut self) -> Result<f32> {
-        let a: [u8; 4] = self.read_u8_array()?;
-        Ok(self.endian().read_f32(&a))
-    }
-
-    /// Read a f64.
-    #[inline]
-    fn read_f64(&mut self) -> Result<f64> {
-        let a: [u8; 8] = self.read_u8_array()?;
-        Ok(self.endian().read_f64(&a))
-    }
-
-    /// Read an unsigned n-bytes integer u64.
-    ///
-    /// # Panics
-    ///
-    /// Panics when nbytes < 1 or nbytes > 8
-    #[inline]
-    fn read_uint(&mut self, n: usize) -> Result<u64> {
-        let mut buf = [0; 8];
-        self.read_slice(&mut buf[..n])?;
-        Ok(self.endian().read_uint(&buf[..n]))
-    }
-
-    /// Read a null-terminated slice, and return it (excluding the null).
-    fn read_null_terminated_slice(&mut self) -> Result<Self> {
-        let idx = self.find(0)?;
-        let val = self.split(idx)?;
-        self.skip(Self::Offset::from_u8(1))?;
-        Ok(val)
-    }
-
-    /// Read an unsigned LEB128 encoded integer.
-    fn read_uleb128(&mut self) -> Result<u64> {
-        leb128::read::unsigned(self)
-    }
-
-    /// Read an unsigned LEB128 encoded u16.
-    fn read_uleb128_u16(&mut self) -> Result<u16> {
-        leb128::read::u16(self)
-    }
-
-    /// Read a signed LEB128 encoded integer.
-    fn read_sleb128(&mut self) -> Result<i64> {
-        leb128::read::signed(self)
-    }
-
-    /// Read an initial length field.
-    ///
-    /// This field is encoded as either a 32-bit length or
-    /// a 64-bit length, and the returned `Format` indicates which.
-    fn read_initial_length(&mut self) -> Result<(Self::Offset, Format)> {
-        const MAX_DWARF_32_UNIT_LENGTH: u32 = 0xffff_fff0;
-        const DWARF_64_INITIAL_UNIT_LENGTH: u32 = 0xffff_ffff;
-
-        let val = self.read_u32()?;
-        if val < MAX_DWARF_32_UNIT_LENGTH {
-            Ok((Self::Offset::from_u32(val), Format::Dwarf32))
-        } else if val == DWARF_64_INITIAL_UNIT_LENGTH {
-            let val = self.read_u64().and_then(Self::Offset::from_u64)?;
-            Ok((val, Format::Dwarf64))
-        } else {
-            Err(Error::UnknownReservedLength)
-        }
-    }
-
-    /// Read an address-sized integer, and return it as a `u64`.
-    fn read_address(&mut self, address_size: u8) -> Result<u64> {
-        match address_size {
-            1 => self.read_u8().map(u64::from),
-            2 => self.read_u16().map(u64::from),
-            4 => self.read_u32().map(u64::from),
-            8 => self.read_u64(),
-            otherwise => Err(Error::UnsupportedAddressSize(otherwise)),
-        }
-    }
-
-    /// Parse a word-sized integer according to the DWARF format.
-    ///
-    /// These are always used to encode section offsets or lengths,
-    /// and so have a type of `Self::Offset`.
-    fn read_word(&mut self, format: Format) -> Result<Self::Offset> {
-        match format {
-            Format::Dwarf32 => self.read_u32().map(Self::Offset::from_u32),
-            Format::Dwarf64 => self.read_u64().and_then(Self::Offset::from_u64),
-        }
-    }
-
-    /// Parse a word-sized section length according to the DWARF format.
-    #[inline]
-    fn read_length(&mut self, format: Format) -> Result<Self::Offset> {
-        self.read_word(format)
-    }
-
-    /// Parse a word-sized section offset according to the DWARF format.
-    #[inline]
-    fn read_offset(&mut self, format: Format) -> Result<Self::Offset> {
-        self.read_word(format)
-    }
-
-    /// Parse a section offset of the given size.
-    ///
-    /// This is used for `DW_FORM_ref_addr` values in DWARF version 2.
-    fn read_sized_offset(&mut self, size: u8) -> Result<Self::Offset> {
-        match size {
-            1 => self.read_u8().map(u64::from),
-            2 => self.read_u16().map(u64::from),
-            4 => self.read_u32().map(u64::from),
-            8 => self.read_u64(),
-            otherwise => Err(Error::UnsupportedOffsetSize(otherwise)),
-        }
-        .and_then(Self::Offset::from_u64)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/rnglists.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/rnglists.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/rnglists.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/rnglists.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1350 +0,0 @@
-use crate::common::{
-    DebugAddrBase, DebugAddrIndex, DebugRngListsBase, DebugRngListsIndex, Encoding, Format,
-    RangeListsOffset, SectionId,
-};
-use crate::constants;
-use crate::endianity::Endianity;
-use crate::read::{
-    DebugAddr, EndianSlice, Error, Reader, ReaderOffset, ReaderOffsetId, Result, Section,
-};
-
-/// The raw contents of the `.debug_ranges` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugRanges<R> {
-    pub(crate) section: R,
-}
-
-impl<'input, Endian> DebugRanges<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugRanges` instance from the data in the `.debug_ranges`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_ranges` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugRanges, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_ranges_section_somehow = || &buf;
-    /// let debug_ranges = DebugRanges::new(read_debug_ranges_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(section, endian))
-    }
-}
-
-impl<R> Section<R> for DebugRanges<R> {
-    fn id() -> SectionId {
-        SectionId::DebugRanges
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R> From<R> for DebugRanges<R> {
-    fn from(section: R) -> Self {
-        DebugRanges { section }
-    }
-}
-
-/// The `DebugRngLists` struct represents the contents of the
-/// `.debug_rnglists` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugRngLists<R> {
-    section: R,
-}
-
-impl<'input, Endian> DebugRngLists<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugRngLists` instance from the data in the
-    /// `.debug_rnglists` section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_rnglists`
-    /// section and present it as a `&[u8]` slice. That means using some ELF
-    /// loader on Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugRngLists, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_rnglists_section_somehow = || &buf;
-    /// let debug_rnglists =
-    ///     DebugRngLists::new(read_debug_rnglists_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(section, endian))
-    }
-}
-
-impl<R> Section<R> for DebugRngLists<R> {
-    fn id() -> SectionId {
-        SectionId::DebugRngLists
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R> From<R> for DebugRngLists<R> {
-    fn from(section: R) -> Self {
-        DebugRngLists { section }
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-struct RngListsHeader {
-    encoding: Encoding,
-    offset_entry_count: u32,
-}
-
-impl Default for RngListsHeader {
-    fn default() -> Self {
-        RngListsHeader {
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 5,
-                address_size: 0,
-            },
-            offset_entry_count: 0,
-        }
-    }
-}
-
-impl RngListsHeader {
-    /// Return the serialized size of the table header.
-    #[allow(dead_code)]
-    #[inline]
-    fn size(self) -> u8 {
-        // initial_length + version + address_size + segment_selector_size + offset_entry_count
-        self.encoding.format.initial_length_size() + 2 + 1 + 1 + 4
-    }
-}
-
-// TODO: add an iterator over headers in the .debug_rnglists section
-#[allow(dead_code)]
-fn parse_header<R: Reader>(input: &mut R) -> Result<RngListsHeader> {
-    let (length, format) = input.read_initial_length()?;
-    input.truncate(length)?;
-
-    let version = input.read_u16()?;
-    if version != 5 {
-        return Err(Error::UnknownVersion(u64::from(version)));
-    }
-
-    let address_size = input.read_u8()?;
-    let segment_selector_size = input.read_u8()?;
-    if segment_selector_size != 0 {
-        return Err(Error::UnsupportedSegmentSize);
-    }
-    let offset_entry_count = input.read_u32()?;
-
-    let encoding = Encoding {
-        format,
-        version,
-        address_size,
-    };
-    Ok(RngListsHeader {
-        encoding,
-        offset_entry_count,
-    })
-}
-
-/// The DWARF data found in `.debug_ranges` and `.debug_rnglists` sections.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct RangeLists<R> {
-    debug_ranges: DebugRanges<R>,
-    debug_rnglists: DebugRngLists<R>,
-}
-
-impl<R> RangeLists<R> {
-    /// Construct a new `RangeLists` instance from the data in the `.debug_ranges` and
-    /// `.debug_rnglists` sections.
-    pub fn new(debug_ranges: DebugRanges<R>, debug_rnglists: DebugRngLists<R>) -> RangeLists<R> {
-        RangeLists {
-            debug_ranges,
-            debug_rnglists,
-        }
-    }
-}
-
-impl<T> RangeLists<T> {
-    /// Create a `RangeLists` that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::RangeLists<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> RangeLists<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        RangeLists {
-            debug_ranges: borrow(&self.debug_ranges.section).into(),
-            debug_rnglists: borrow(&self.debug_rnglists.section).into(),
-        }
-    }
-}
-
-impl<R: Reader> RangeLists<R> {
-    /// Iterate over the `Range` list entries starting at the given offset.
-    ///
-    /// The `unit_version` and `address_size` must match the compilation unit that the
-    /// offset was contained in.
-    ///
-    /// The `base_address` should be obtained from the `DW_AT_low_pc` attribute in the
-    /// `DW_TAG_compile_unit` entry for the compilation unit that contains this range list.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn ranges(
-        &self,
-        offset: RangeListsOffset<R::Offset>,
-        unit_encoding: Encoding,
-        base_address: u64,
-        debug_addr: &DebugAddr<R>,
-        debug_addr_base: DebugAddrBase<R::Offset>,
-    ) -> Result<RngListIter<R>> {
-        Ok(RngListIter::new(
-            self.raw_ranges(offset, unit_encoding)?,
-            base_address,
-            debug_addr.clone(),
-            debug_addr_base,
-        ))
-    }
-
-    /// Iterate over the `RawRngListEntry`ies starting at the given offset.
-    ///
-    /// The `unit_encoding` must match the compilation unit that the
-    /// offset was contained in.
-    ///
-    /// This iterator does not perform any processing of the range entries,
-    /// such as handling base addresses.
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn raw_ranges(
-        &self,
-        offset: RangeListsOffset<R::Offset>,
-        unit_encoding: Encoding,
-    ) -> Result<RawRngListIter<R>> {
-        let mut input = if unit_encoding.version <= 4 {
-            self.debug_ranges.section.clone()
-        } else {
-            self.debug_rnglists.section.clone()
-        };
-        input.skip(offset.0)?;
-        Ok(RawRngListIter::new(input, unit_encoding))
-    }
-
-    /// Returns the `.debug_rnglists` offset at the given `base` and `index`.
-    ///
-    /// The `base` must be the `DW_AT_rnglists_base` value from the compilation unit DIE.
-    /// This is an offset that points to the first entry following the header.
-    ///
-    /// The `index` is the value of a `DW_FORM_rnglistx` attribute.
-    ///
-    /// The `unit_encoding` must match the compilation unit that the
-    /// index was contained in.
-    pub fn get_offset(
-        &self,
-        unit_encoding: Encoding,
-        base: DebugRngListsBase<R::Offset>,
-        index: DebugRngListsIndex<R::Offset>,
-    ) -> Result<RangeListsOffset<R::Offset>> {
-        let format = unit_encoding.format;
-        let input = &mut self.debug_rnglists.section.clone();
-        input.skip(base.0)?;
-        input.skip(R::Offset::from_u64(
-            index.0.into_u64() * u64::from(format.word_size()),
-        )?)?;
-        input
-            .read_offset(format)
-            .map(|x| RangeListsOffset(base.0 + x))
-    }
-
-    /// Call `Reader::lookup_offset_id` for each section, and return the first match.
-    pub fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(SectionId, R::Offset)> {
-        self.debug_ranges
-            .lookup_offset_id(id)
-            .or_else(|| self.debug_rnglists.lookup_offset_id(id))
-    }
-}
-
-/// A raw iterator over an address range list.
-///
-/// This iterator does not perform any processing of the range entries,
-/// such as handling base addresses.
-#[derive(Debug)]
-pub struct RawRngListIter<R: Reader> {
-    input: R,
-    encoding: Encoding,
-}
-
-/// A raw entry in .debug_rnglists
-#[derive(Clone, Debug)]
-pub enum RawRngListEntry<T> {
-    /// A range from DWARF version <= 4.
-    AddressOrOffsetPair {
-        /// Start of range. May be an address or an offset.
-        begin: u64,
-        /// End of range. May be an address or an offset.
-        end: u64,
-    },
-    /// DW_RLE_base_address
-    BaseAddress {
-        /// base address
-        addr: u64,
-    },
-    /// DW_RLE_base_addressx
-    BaseAddressx {
-        /// base address
-        addr: DebugAddrIndex<T>,
-    },
-    /// DW_RLE_startx_endx
-    StartxEndx {
-        /// start of range
-        begin: DebugAddrIndex<T>,
-        /// end of range
-        end: DebugAddrIndex<T>,
-    },
-    /// DW_RLE_startx_length
-    StartxLength {
-        /// start of range
-        begin: DebugAddrIndex<T>,
-        /// length of range
-        length: u64,
-    },
-    /// DW_RLE_offset_pair
-    OffsetPair {
-        /// start of range
-        begin: u64,
-        /// end of range
-        end: u64,
-    },
-    /// DW_RLE_start_end
-    StartEnd {
-        /// start of range
-        begin: u64,
-        /// end of range
-        end: u64,
-    },
-    /// DW_RLE_start_length
-    StartLength {
-        /// start of range
-        begin: u64,
-        /// length of range
-        length: u64,
-    },
-}
-
-impl<T: ReaderOffset> RawRngListEntry<T> {
-    /// Parse a range entry from `.debug_rnglists`
-    fn parse<R: Reader<Offset = T>>(input: &mut R, encoding: Encoding) -> Result<Option<Self>> {
-        if encoding.version < 5 {
-            let range = RawRange::parse(input, encoding.address_size)?;
-            return Ok(if range.is_end() {
-                None
-            } else if range.is_base_address(encoding.address_size) {
-                Some(RawRngListEntry::BaseAddress { addr: range.end })
-            } else {
-                Some(RawRngListEntry::AddressOrOffsetPair {
-                    begin: range.begin,
-                    end: range.end,
-                })
-            });
-        }
-        Ok(match constants::DwRle(input.read_u8()?) {
-            constants::DW_RLE_end_of_list => None,
-            constants::DW_RLE_base_addressx => Some(RawRngListEntry::BaseAddressx {
-                addr: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
-            }),
-            constants::DW_RLE_startx_endx => Some(RawRngListEntry::StartxEndx {
-                begin: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
-                end: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
-            }),
-            constants::DW_RLE_startx_length => Some(RawRngListEntry::StartxLength {
-                begin: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
-                length: input.read_uleb128()?,
-            }),
-            constants::DW_RLE_offset_pair => Some(RawRngListEntry::OffsetPair {
-                begin: input.read_uleb128()?,
-                end: input.read_uleb128()?,
-            }),
-            constants::DW_RLE_base_address => Some(RawRngListEntry::BaseAddress {
-                addr: input.read_address(encoding.address_size)?,
-            }),
-            constants::DW_RLE_start_end => Some(RawRngListEntry::StartEnd {
-                begin: input.read_address(encoding.address_size)?,
-                end: input.read_address(encoding.address_size)?,
-            }),
-            constants::DW_RLE_start_length => Some(RawRngListEntry::StartLength {
-                begin: input.read_address(encoding.address_size)?,
-                length: input.read_uleb128()?,
-            }),
-            _ => {
-                return Err(Error::InvalidAddressRange);
-            }
-        })
-    }
-}
-
-impl<R: Reader> RawRngListIter<R> {
-    /// Construct a `RawRngListIter`.
-    fn new(input: R, encoding: Encoding) -> RawRngListIter<R> {
-        RawRngListIter { input, encoding }
-    }
-
-    /// Advance the iterator to the next range.
-    pub fn next(&mut self) -> Result<Option<RawRngListEntry<R::Offset>>> {
-        if self.input.is_empty() {
-            return Ok(None);
-        }
-
-        match RawRngListEntry::parse(&mut self.input, self.encoding) {
-            Ok(range) => {
-                if range.is_none() {
-                    self.input.empty();
-                }
-                Ok(range)
-            }
-            Err(e) => {
-                self.input.empty();
-                Err(e)
-            }
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for RawRngListIter<R> {
-    type Item = RawRngListEntry<R::Offset>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        RawRngListIter::next(self)
-    }
-}
-
-/// An iterator over an address range list.
-///
-/// This iterator internally handles processing of base addresses and different
-/// entry types.  Thus, it only returns range entries that are valid
-/// and already adjusted for the base address.
-#[derive(Debug)]
-pub struct RngListIter<R: Reader> {
-    raw: RawRngListIter<R>,
-    base_address: u64,
-    debug_addr: DebugAddr<R>,
-    debug_addr_base: DebugAddrBase<R::Offset>,
-}
-
-impl<R: Reader> RngListIter<R> {
-    /// Construct a `RngListIter`.
-    fn new(
-        raw: RawRngListIter<R>,
-        base_address: u64,
-        debug_addr: DebugAddr<R>,
-        debug_addr_base: DebugAddrBase<R::Offset>,
-    ) -> RngListIter<R> {
-        RngListIter {
-            raw,
-            base_address,
-            debug_addr,
-            debug_addr_base,
-        }
-    }
-
-    #[inline]
-    fn get_address(&self, index: DebugAddrIndex<R::Offset>) -> Result<u64> {
-        self.debug_addr
-            .get_address(self.raw.encoding.address_size, self.debug_addr_base, index)
-    }
-
-    /// Advance the iterator to the next range.
-    pub fn next(&mut self) -> Result<Option<Range>> {
-        loop {
-            let raw_range = match self.raw.next()? {
-                Some(range) => range,
-                None => return Ok(None),
-            };
-
-            let range = match raw_range {
-                RawRngListEntry::BaseAddress { addr } => {
-                    self.base_address = addr;
-                    continue;
-                }
-                RawRngListEntry::BaseAddressx { addr } => {
-                    self.base_address = self.get_address(addr)?;
-                    continue;
-                }
-                RawRngListEntry::StartxEndx { begin, end } => {
-                    let begin = self.get_address(begin)?;
-                    let end = self.get_address(end)?;
-                    Range { begin, end }
-                }
-                RawRngListEntry::StartxLength { begin, length } => {
-                    let begin = self.get_address(begin)?;
-                    let end = begin + length;
-                    Range { begin, end }
-                }
-                RawRngListEntry::AddressOrOffsetPair { begin, end }
-                | RawRngListEntry::OffsetPair { begin, end } => {
-                    let mut range = Range { begin, end };
-                    range.add_base_address(self.base_address, self.raw.encoding.address_size);
-                    range
-                }
-                RawRngListEntry::StartEnd { begin, end } => Range { begin, end },
-                RawRngListEntry::StartLength { begin, length } => Range {
-                    begin,
-                    end: begin + length,
-                },
-            };
-
-            if range.begin > range.end {
-                self.raw.input.empty();
-                return Err(Error::InvalidAddressRange);
-            }
-
-            return Ok(Some(range));
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for RngListIter<R> {
-    type Item = Range;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        RngListIter::next(self)
-    }
-}
-
-/// A raw address range from the `.debug_ranges` section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub(crate) struct RawRange {
-    /// The beginning address of the range.
-    pub begin: u64,
-
-    /// The first address past the end of the range.
-    pub end: u64,
-}
-
-impl RawRange {
-    /// Check if this is a range end entry.
-    ///
-    /// This will only occur for raw ranges.
-    #[inline]
-    pub fn is_end(&self) -> bool {
-        self.begin == 0 && self.end == 0
-    }
-
-    /// Check if this is a base address selection entry.
-    ///
-    /// A base address selection entry changes the base address that subsequent
-    /// range entries are relative to.  This will only occur for raw ranges.
-    #[inline]
-    pub fn is_base_address(&self, address_size: u8) -> bool {
-        self.begin == !0 >> (64 - address_size * 8)
-    }
-
-    /// Parse an address range entry from `.debug_ranges` or `.debug_loc`.
-    #[doc(hidden)]
-    #[inline]
-    pub fn parse<R: Reader>(input: &mut R, address_size: u8) -> Result<RawRange> {
-        let begin = input.read_address(address_size)?;
-        let end = input.read_address(address_size)?;
-        let range = RawRange { begin, end };
-        Ok(range)
-    }
-}
-
-/// An address range from the `.debug_ranges` or `.debug_rnglists` sections.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct Range {
-    /// The beginning address of the range.
-    pub begin: u64,
-
-    /// The first address past the end of the range.
-    pub end: u64,
-}
-
-impl Range {
-    /// Add a base address to this range.
-    #[inline]
-    pub(crate) fn add_base_address(&mut self, base_address: u64, address_size: u8) {
-        let mask = !0 >> (64 - address_size * 8);
-        self.begin = base_address.wrapping_add(self.begin) & mask;
-        self.end = base_address.wrapping_add(self.end) & mask;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::endianity::LittleEndian;
-    use crate::test_util::GimliSectionMethods;
-    use test_assembler::{Endian, Label, LabelMaker, Section};
-
-    #[test]
-    fn test_rnglists_32() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 5,
-            address_size: 4,
-        };
-        let section = Section::with_endian(Endian::Little)
-            .L32(0x0300_0000)
-            .L32(0x0301_0300)
-            .L32(0x0301_0400)
-            .L32(0x0301_0500);
-        let buf = section.get_contents().unwrap();
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&buf, LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-
-        let start = Label::new();
-        let first = Label::new();
-        let size = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // Header
-            .mark(&start)
-            .L32(&size)
-            .L16(encoding.version)
-            .L8(encoding.address_size)
-            .L8(0)
-            .L32(0)
-            .mark(&first)
-            // OffsetPair
-            .L8(4).uleb(0x10200).uleb(0x10300)
-            // A base address selection followed by an OffsetPair.
-            .L8(5).L32(0x0200_0000)
-            .L8(4).uleb(0x10400).uleb(0x10500)
-            // An empty OffsetPair followed by a normal OffsetPair.
-            .L8(4).uleb(0x10600).uleb(0x10600)
-            .L8(4).uleb(0x10800).uleb(0x10900)
-            // A StartEnd
-            .L8(6).L32(0x201_0a00).L32(0x201_0b00)
-            // A StartLength
-            .L8(7).L32(0x201_0c00).uleb(0x100)
-            // An OffsetPair that starts at 0.
-            .L8(4).uleb(0).uleb(1)
-            // An OffsetPair that starts and ends at 0.
-            .L8(4).uleb(0).uleb(0)
-            // An OffsetPair that ends at -1.
-            .L8(5).L32(0)
-            .L8(4).uleb(0).uleb(0xffff_ffff)
-            // A BaseAddressx + OffsetPair
-            .L8(1).uleb(0)
-            .L8(4).uleb(0x10100).uleb(0x10200)
-            // A StartxEndx
-            .L8(2).uleb(1).uleb(2)
-            // A StartxLength
-            .L8(3).uleb(3).uleb(0x100)
-            // A range end.
-            .L8(0)
-            // Some extra data.
-            .L32(0xffff_ffff);
-        size.set_const((&section.here() - &start - 4) as u64);
-
-        let buf = section.get_contents().unwrap();
-        let debug_ranges = DebugRanges::new(&[], LittleEndian);
-        let debug_rnglists = DebugRngLists::new(&buf, LittleEndian);
-        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
-        let offset = RangeListsOffset((&first - &start) as usize);
-        let mut ranges = rnglists
-            .ranges(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
-            .unwrap();
-
-        // A normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0101_0200,
-                end: 0x0101_0300,
-            }))
-        );
-
-        // A base address selection followed by a normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0400,
-                end: 0x0201_0500,
-            }))
-        );
-
-        // An empty range followed by a normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0600,
-                end: 0x0201_0600,
-            }))
-        );
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0800,
-                end: 0x0201_0900,
-            }))
-        );
-
-        // A normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0a00,
-                end: 0x0201_0b00,
-            }))
-        );
-
-        // A normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0c00,
-                end: 0x0201_0d00,
-            }))
-        );
-
-        // A range that starts at 0.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0200_0000,
-                end: 0x0200_0001,
-            }))
-        );
-
-        // A range that starts and ends at 0.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0200_0000,
-                end: 0x0200_0000,
-            }))
-        );
-
-        // A range that ends at -1.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0000_0000,
-                end: 0xffff_ffff,
-            }))
-        );
-
-        // A BaseAddressx + OffsetPair
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0301_0100,
-                end: 0x0301_0200,
-            }))
-        );
-
-        // A StartxEndx
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0301_0300,
-                end: 0x0301_0400,
-            }))
-        );
-
-        // A StartxLength
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0301_0500,
-                end: 0x0301_0600,
-            }))
-        );
-
-        // A range end.
-        assert_eq!(ranges.next(), Ok(None));
-
-        // An offset at the end of buf.
-        let mut ranges = rnglists
-            .ranges(
-                RangeListsOffset(buf.len()),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(ranges.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_rnglists_64() {
-        let encoding = Encoding {
-            format: Format::Dwarf64,
-            version: 5,
-            address_size: 8,
-        };
-        let section = Section::with_endian(Endian::Little)
-            .L64(0x0300_0000)
-            .L64(0x0301_0300)
-            .L64(0x0301_0400)
-            .L64(0x0301_0500);
-        let buf = section.get_contents().unwrap();
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&buf, LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-
-        let start = Label::new();
-        let first = Label::new();
-        let size = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // Header
-            .mark(&start)
-            .L32(0xffff_ffff)
-            .L64(&size)
-            .L16(encoding.version)
-            .L8(encoding.address_size)
-            .L8(0)
-            .L32(0)
-            .mark(&first)
-            // OffsetPair
-            .L8(4).uleb(0x10200).uleb(0x10300)
-            // A base address selection followed by an OffsetPair.
-            .L8(5).L64(0x0200_0000)
-            .L8(4).uleb(0x10400).uleb(0x10500)
-            // An empty OffsetPair followed by a normal OffsetPair.
-            .L8(4).uleb(0x10600).uleb(0x10600)
-            .L8(4).uleb(0x10800).uleb(0x10900)
-            // A StartEnd
-            .L8(6).L64(0x201_0a00).L64(0x201_0b00)
-            // A StartLength
-            .L8(7).L64(0x201_0c00).uleb(0x100)
-            // An OffsetPair that starts at 0.
-            .L8(4).uleb(0).uleb(1)
-            // An OffsetPair that starts and ends at 0.
-            .L8(4).uleb(0).uleb(0)
-            // An OffsetPair that ends at -1.
-            .L8(5).L64(0)
-            .L8(4).uleb(0).uleb(0xffff_ffff)
-            // A BaseAddressx + OffsetPair
-            .L8(1).uleb(0)
-            .L8(4).uleb(0x10100).uleb(0x10200)
-            // A StartxEndx
-            .L8(2).uleb(1).uleb(2)
-            // A StartxLength
-            .L8(3).uleb(3).uleb(0x100)
-            // A range end.
-            .L8(0)
-            // Some extra data.
-            .L32(0xffff_ffff);
-        size.set_const((&section.here() - &start - 12) as u64);
-
-        let buf = section.get_contents().unwrap();
-        let debug_ranges = DebugRanges::new(&[], LittleEndian);
-        let debug_rnglists = DebugRngLists::new(&buf, LittleEndian);
-        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
-        let offset = RangeListsOffset((&first - &start) as usize);
-        let mut ranges = rnglists
-            .ranges(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
-            .unwrap();
-
-        // A normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0101_0200,
-                end: 0x0101_0300,
-            }))
-        );
-
-        // A base address selection followed by a normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0400,
-                end: 0x0201_0500,
-            }))
-        );
-
-        // An empty range followed by a normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0600,
-                end: 0x0201_0600,
-            }))
-        );
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0800,
-                end: 0x0201_0900,
-            }))
-        );
-
-        // A normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0a00,
-                end: 0x0201_0b00,
-            }))
-        );
-
-        // A normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0c00,
-                end: 0x0201_0d00,
-            }))
-        );
-
-        // A range that starts at 0.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0200_0000,
-                end: 0x0200_0001,
-            }))
-        );
-
-        // A range that starts and ends at 0.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0200_0000,
-                end: 0x0200_0000,
-            }))
-        );
-
-        // A range that ends at -1.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0000_0000,
-                end: 0xffff_ffff,
-            }))
-        );
-
-        // A BaseAddressx + OffsetPair
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0301_0100,
-                end: 0x0301_0200,
-            }))
-        );
-
-        // A StartxEndx
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0301_0300,
-                end: 0x0301_0400,
-            }))
-        );
-
-        // A StartxLength
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0301_0500,
-                end: 0x0301_0600,
-            }))
-        );
-
-        // A range end.
-        assert_eq!(ranges.next(), Ok(None));
-
-        // An offset at the end of buf.
-        let mut ranges = rnglists
-            .ranges(
-                RangeListsOffset(buf.len()),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(ranges.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_raw_range() {
-        let range = RawRange {
-            begin: 0,
-            end: 0xffff_ffff,
-        };
-        assert!(!range.is_end());
-        assert!(!range.is_base_address(4));
-        assert!(!range.is_base_address(8));
-
-        let range = RawRange { begin: 0, end: 0 };
-        assert!(range.is_end());
-        assert!(!range.is_base_address(4));
-        assert!(!range.is_base_address(8));
-
-        let range = RawRange {
-            begin: 0xffff_ffff,
-            end: 0,
-        };
-        assert!(!range.is_end());
-        assert!(range.is_base_address(4));
-        assert!(!range.is_base_address(8));
-
-        let range = RawRange {
-            begin: 0xffff_ffff_ffff_ffff,
-            end: 0,
-        };
-        assert!(!range.is_end());
-        assert!(!range.is_base_address(4));
-        assert!(range.is_base_address(8));
-    }
-
-    #[test]
-    fn test_ranges_32() {
-        let start = Label::new();
-        let first = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // A range before the offset.
-            .mark(&start)
-            .L32(0x10000).L32(0x10100)
-            .mark(&first)
-            // A normal range.
-            .L32(0x10200).L32(0x10300)
-            // A base address selection followed by a normal range.
-            .L32(0xffff_ffff).L32(0x0200_0000)
-            .L32(0x10400).L32(0x10500)
-            // An empty range followed by a normal range.
-            .L32(0x10600).L32(0x10600)
-            .L32(0x10800).L32(0x10900)
-            // A range that starts at 0.
-            .L32(0).L32(1)
-            // A range that ends at -1.
-            .L32(0xffff_ffff).L32(0x0000_0000)
-            .L32(0).L32(0xffff_ffff)
-            // A range end.
-            .L32(0).L32(0)
-            // Some extra data.
-            .L32(0);
-
-        let buf = section.get_contents().unwrap();
-        let debug_ranges = DebugRanges::new(&buf, LittleEndian);
-        let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
-        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
-        let offset = RangeListsOffset((&first - &start) as usize);
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut ranges = rnglists
-            .ranges(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
-            .unwrap();
-
-        // A normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0101_0200,
-                end: 0x0101_0300,
-            }))
-        );
-
-        // A base address selection followed by a normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0400,
-                end: 0x0201_0500,
-            }))
-        );
-
-        // An empty range followed by a normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0600,
-                end: 0x0201_0600,
-            }))
-        );
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0800,
-                end: 0x0201_0900,
-            }))
-        );
-
-        // A range that starts at 0.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0200_0000,
-                end: 0x0200_0001,
-            }))
-        );
-
-        // A range that ends at -1.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0000_0000,
-                end: 0xffff_ffff,
-            }))
-        );
-
-        // A range end.
-        assert_eq!(ranges.next(), Ok(None));
-
-        // An offset at the end of buf.
-        let mut ranges = rnglists
-            .ranges(
-                RangeListsOffset(buf.len()),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(ranges.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_ranges_64() {
-        let start = Label::new();
-        let first = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // A range before the offset.
-            .mark(&start)
-            .L64(0x10000).L64(0x10100)
-            .mark(&first)
-            // A normal range.
-            .L64(0x10200).L64(0x10300)
-            // A base address selection followed by a normal range.
-            .L64(0xffff_ffff_ffff_ffff).L64(0x0200_0000)
-            .L64(0x10400).L64(0x10500)
-            // An empty range followed by a normal range.
-            .L64(0x10600).L64(0x10600)
-            .L64(0x10800).L64(0x10900)
-            // A range that starts at 0.
-            .L64(0).L64(1)
-            // A range that ends at -1.
-            .L64(0xffff_ffff_ffff_ffff).L64(0x0000_0000)
-            .L64(0).L64(0xffff_ffff_ffff_ffff)
-            // A range end.
-            .L64(0).L64(0)
-            // Some extra data.
-            .L64(0);
-
-        let buf = section.get_contents().unwrap();
-        let debug_ranges = DebugRanges::new(&buf, LittleEndian);
-        let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
-        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
-        let offset = RangeListsOffset((&first - &start) as usize);
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-        let encoding = Encoding {
-            format: Format::Dwarf64,
-            version: 4,
-            address_size: 8,
-        };
-        let mut ranges = rnglists
-            .ranges(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
-            .unwrap();
-
-        // A normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0101_0200,
-                end: 0x0101_0300,
-            }))
-        );
-
-        // A base address selection followed by a normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0400,
-                end: 0x0201_0500,
-            }))
-        );
-
-        // An empty range followed by a normal range.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0600,
-                end: 0x0201_0600,
-            }))
-        );
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0201_0800,
-                end: 0x0201_0900,
-            }))
-        );
-
-        // A range that starts at 0.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0200_0000,
-                end: 0x0200_0001,
-            }))
-        );
-
-        // A range that ends at -1.
-        assert_eq!(
-            ranges.next(),
-            Ok(Some(Range {
-                begin: 0x0,
-                end: 0xffff_ffff_ffff_ffff,
-            }))
-        );
-
-        // A range end.
-        assert_eq!(ranges.next(), Ok(None));
-
-        // An offset at the end of buf.
-        let mut ranges = rnglists
-            .ranges(
-                RangeListsOffset(buf.len()),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(ranges.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_ranges_invalid() {
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            // An invalid range.
-            .L32(0x20000).L32(0x10000)
-            // An invalid range after wrapping.
-            .L32(0x20000).L32(0xff01_0000);
-
-        let buf = section.get_contents().unwrap();
-        let debug_ranges = DebugRanges::new(&buf, LittleEndian);
-        let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
-        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
-        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-        let debug_addr_base = DebugAddrBase(0);
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-
-        // An invalid range.
-        let mut ranges = rnglists
-            .ranges(
-                RangeListsOffset(0x0),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(ranges.next(), Err(Error::InvalidAddressRange));
-
-        // An invalid range after wrapping.
-        let mut ranges = rnglists
-            .ranges(
-                RangeListsOffset(0x8),
-                encoding,
-                0x0100_0000,
-                debug_addr,
-                debug_addr_base,
-            )
-            .unwrap();
-        assert_eq!(ranges.next(), Err(Error::InvalidAddressRange));
-
-        // An invalid offset.
-        match rnglists.ranges(
-            RangeListsOffset(buf.len() + 1),
-            encoding,
-            0x0100_0000,
-            debug_addr,
-            debug_addr_base,
-        ) {
-            Err(Error::UnexpectedEof(_)) => {}
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_get_offset() {
-        for format in vec![Format::Dwarf32, Format::Dwarf64] {
-            let encoding = Encoding {
-                format,
-                version: 5,
-                address_size: 4,
-            };
-
-            let zero = Label::new();
-            let length = Label::new();
-            let start = Label::new();
-            let first = Label::new();
-            let end = Label::new();
-            let mut section = Section::with_endian(Endian::Little)
-                .mark(&zero)
-                .initial_length(format, &length, &start)
-                .D16(encoding.version)
-                .D8(encoding.address_size)
-                .D8(0)
-                .D32(20)
-                .mark(&first);
-            for i in 0..20 {
-                section = section.word(format.word_size(), 1000 + i);
-            }
-            section = section.mark(&end);
-            length.set_const((&end - &start) as u64);
-            let section = section.get_contents().unwrap();
-
-            let debug_ranges = DebugRanges::from(EndianSlice::new(&[], LittleEndian));
-            let debug_rnglists = DebugRngLists::from(EndianSlice::new(&section, LittleEndian));
-            let ranges = RangeLists::new(debug_ranges, debug_rnglists);
-
-            let base = DebugRngListsBase((&first - &zero) as usize);
-            assert_eq!(
-                ranges.get_offset(encoding, base, DebugRngListsIndex(0)),
-                Ok(RangeListsOffset(base.0 + 1000))
-            );
-            assert_eq!(
-                ranges.get_offset(encoding, base, DebugRngListsIndex(19)),
-                Ok(RangeListsOffset(base.0 + 1019))
-            );
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/str.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/str.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,273 +0,0 @@
-use crate::common::{
-    DebugLineStrOffset, DebugStrOffset, DebugStrOffsetsBase, DebugStrOffsetsIndex, SectionId,
-};
-use crate::endianity::Endianity;
-use crate::read::{EndianSlice, Reader, ReaderOffset, Result, Section};
-use crate::Format;
-
-/// The `DebugStr` struct represents the DWARF strings
-/// found in the `.debug_str` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugStr<R> {
-    debug_str_section: R,
-}
-
-impl<'input, Endian> DebugStr<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugStr` instance from the data in the `.debug_str`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_str` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugStr, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_str_section_somehow = || &buf;
-    /// let debug_str = DebugStr::new(read_debug_str_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(debug_str_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_str_section, endian))
-    }
-}
-
-impl<R: Reader> DebugStr<R> {
-    /// Lookup a string from the `.debug_str` section by DebugStrOffset.
-    ///
-    /// ```
-    /// use gimli::{DebugStr, DebugStrOffset, LittleEndian};
-    ///
-    /// # let buf = [0x01, 0x02, 0x00];
-    /// # let offset = DebugStrOffset(0);
-    /// # let read_debug_str_section_somehow = || &buf;
-    /// # let debug_str_offset_somehow = || offset;
-    /// let debug_str = DebugStr::new(read_debug_str_section_somehow(), LittleEndian);
-    /// println!("Found string {:?}", debug_str.get_str(debug_str_offset_somehow()));
-    /// ```
-    pub fn get_str(&self, offset: DebugStrOffset<R::Offset>) -> Result<R> {
-        let input = &mut self.debug_str_section.clone();
-        input.skip(offset.0)?;
-        input.read_null_terminated_slice()
-    }
-}
-
-impl<T> DebugStr<T> {
-    /// Create a `DebugStr` section that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::DebugStr<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugStr<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        borrow(&self.debug_str_section).into()
-    }
-}
-
-impl<R> Section<R> for DebugStr<R> {
-    fn id() -> SectionId {
-        SectionId::DebugStr
-    }
-
-    fn reader(&self) -> &R {
-        &self.debug_str_section
-    }
-}
-
-impl<R> From<R> for DebugStr<R> {
-    fn from(debug_str_section: R) -> Self {
-        DebugStr { debug_str_section }
-    }
-}
-
-/// The raw contents of the `.debug_str_offsets` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugStrOffsets<R> {
-    section: R,
-}
-
-impl<R: Reader> DebugStrOffsets<R> {
-    // TODO: add an iterator over the sets of entries in the section.
-    // This is not needed for common usage of the section though.
-
-    /// Returns the `.debug_str` offset at the given `base` and `index`.
-    ///
-    /// A set of entries in the `.debug_str_offsets` section consists of a header
-    /// followed by a series of string table offsets.
-    ///
-    /// The `base` must be the `DW_AT_str_offsets_base` value from the compilation unit DIE.
-    /// This is an offset that points to the first entry following the header.
-    ///
-    /// The `index` is the value of a `DW_FORM_strx` attribute.
-    ///
-    /// The `format` must be the DWARF format of the compilation unit. This format must
-    /// match the header. However, note that we do not parse the header to validate this,
-    /// since locating the header is unreliable, and the GNU extensions do not emit it.
-    pub fn get_str_offset(
-        &self,
-        format: Format,
-        base: DebugStrOffsetsBase<R::Offset>,
-        index: DebugStrOffsetsIndex<R::Offset>,
-    ) -> Result<DebugStrOffset<R::Offset>> {
-        let input = &mut self.section.clone();
-        input.skip(base.0)?;
-        input.skip(R::Offset::from_u64(
-            index.0.into_u64() * u64::from(format.word_size()),
-        )?)?;
-        input.read_offset(format).map(DebugStrOffset)
-    }
-}
-
-impl<T> DebugStrOffsets<T> {
-    /// Create a `DebugStrOffsets` section that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::DebugStrOffsets<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugStrOffsets<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        borrow(&self.section).into()
-    }
-}
-
-impl<R> Section<R> for DebugStrOffsets<R> {
-    fn id() -> SectionId {
-        SectionId::DebugStrOffsets
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R> From<R> for DebugStrOffsets<R> {
-    fn from(section: R) -> Self {
-        DebugStrOffsets { section }
-    }
-}
-
-/// The `DebugLineStr` struct represents the DWARF strings
-/// found in the `.debug_line_str` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugLineStr<R> {
-    section: R,
-}
-
-impl<R: Reader> DebugLineStr<R> {
-    /// Lookup a string from the `.debug_line_str` section by DebugLineStrOffset.
-    pub fn get_str(&self, offset: DebugLineStrOffset<R::Offset>) -> Result<R> {
-        let input = &mut self.section.clone();
-        input.skip(offset.0)?;
-        input.read_null_terminated_slice()
-    }
-}
-
-impl<T> DebugLineStr<T> {
-    /// Create a `DebugLineStr` section that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::DebugLineStr<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugLineStr<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        borrow(&self.section).into()
-    }
-}
-
-impl<R> Section<R> for DebugLineStr<R> {
-    fn id() -> SectionId {
-        SectionId::DebugLineStr
-    }
-
-    fn reader(&self) -> &R {
-        &self.section
-    }
-}
-
-impl<R> From<R> for DebugLineStr<R> {
-    fn from(section: R) -> Self {
-        DebugLineStr { section }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_util::GimliSectionMethods;
-    use crate::LittleEndian;
-    use test_assembler::{Endian, Label, LabelMaker, Section};
-
-    #[test]
-    fn test_get_str_offset() {
-        for format in vec![Format::Dwarf32, Format::Dwarf64] {
-            let zero = Label::new();
-            let length = Label::new();
-            let start = Label::new();
-            let first = Label::new();
-            let end = Label::new();
-            let mut section = Section::with_endian(Endian::Little)
-                .mark(&zero)
-                .initial_length(format, &length, &start)
-                .D16(5)
-                .D16(0)
-                .mark(&first);
-            for i in 0..20 {
-                section = section.word(format.word_size(), 1000 + i);
-            }
-            section = section.mark(&end);
-            length.set_const((&end - &start) as u64);
-
-            let section = section.get_contents().unwrap();
-            let debug_str_offsets = DebugStrOffsets::from(EndianSlice::new(&section, LittleEndian));
-            let base = DebugStrOffsetsBase((&first - &zero) as usize);
-
-            assert_eq!(
-                debug_str_offsets.get_str_offset(format, base, DebugStrOffsetsIndex(0)),
-                Ok(DebugStrOffset(1000))
-            );
-            assert_eq!(
-                debug_str_offsets.get_str_offset(format, base, DebugStrOffsetsIndex(19)),
-                Ok(DebugStrOffset(1019))
-            );
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/unit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/unit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/unit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/unit.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,6011 +0,0 @@
-//! Functions for parsing DWARF `.debug_info` and `.debug_types` sections.
-
-use core::cell::Cell;
-use core::ops::{Range, RangeFrom, RangeTo};
-use core::{u16, u8};
-
-use crate::common::{
-    DebugAbbrevOffset, DebugAddrBase, DebugAddrIndex, DebugInfoOffset, DebugLineOffset,
-    DebugLineStrOffset, DebugLocListsBase, DebugLocListsIndex, DebugMacinfoOffset,
-    DebugMacroOffset, DebugRngListsBase, DebugRngListsIndex, DebugStrOffset, DebugStrOffsetsBase,
-    DebugStrOffsetsIndex, DebugTypeSignature, DebugTypesOffset, Encoding, Format,
-    LocationListsOffset, RangeListsOffset, SectionId,
-};
-use crate::constants;
-use crate::endianity::Endianity;
-use crate::read::{
-    Abbreviation, Abbreviations, AttributeSpecification, DebugAbbrev, DebugStr, EndianSlice, Error,
-    Expression, Reader, ReaderOffset, Result, Section,
-};
-
-impl<T: ReaderOffset> DebugTypesOffset<T> {
-    /// Convert an offset to be relative to the start of the given unit,
-    /// instead of relative to the start of the .debug_types section.
-    /// Returns `None` if the offset is not within the unit entries.
-    pub fn to_unit_offset<R>(&self, unit: &TypeUnitHeader<R>) -> Option<UnitOffset<T>>
-    where
-        R: Reader<Offset = T>,
-    {
-        let offset = match self.0.checked_sub(unit.offset.0) {
-            Some(offset) => UnitOffset(offset),
-            None => return None,
-        };
-        if !unit.header.is_valid_offset(offset) {
-            return None;
-        }
-        Some(offset)
-    }
-}
-
-impl<T: ReaderOffset> DebugInfoOffset<T> {
-    /// Convert an offset to be relative to the start of the given unit,
-    /// instead of relative to the start of the .debug_info section.
-    /// Returns `None` if the offset is not within this unit entries.
-    pub fn to_unit_offset<R>(&self, unit: &CompilationUnitHeader<R>) -> Option<UnitOffset<T>>
-    where
-        R: Reader<Offset = T>,
-    {
-        let offset = match self.0.checked_sub(unit.offset.0) {
-            Some(offset) => UnitOffset(offset),
-            None => return None,
-        };
-        if !unit.header.is_valid_offset(offset) {
-            return None;
-        }
-        Some(offset)
-    }
-}
-
-/// An offset into the current compilation or type unit.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
-pub struct UnitOffset<T = usize>(pub T);
-
-impl<T: ReaderOffset> UnitOffset<T> {
-    /// Convert an offset to be relative to the start of the .debug_info section,
-    /// instead of relative to the start of the given compilation unit.
-    pub fn to_debug_info_offset<R>(&self, unit: &CompilationUnitHeader<R>) -> DebugInfoOffset<T>
-    where
-        R: Reader<Offset = T>,
-    {
-        DebugInfoOffset(unit.offset.0 + self.0)
-    }
-
-    /// Convert an offset to be relative to the start of the .debug_types section,
-    /// instead of relative to the start of the given type unit.
-    pub fn to_debug_types_offset<R>(&self, unit: &TypeUnitHeader<R>) -> DebugTypesOffset<T>
-    where
-        R: Reader<Offset = T>,
-    {
-        DebugTypesOffset(unit.offset.0 + self.0)
-    }
-}
-
-/// The `DebugInfo` struct represents the DWARF debugging information found in
-/// the `.debug_info` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugInfo<R> {
-    debug_info_section: R,
-}
-
-impl<'input, Endian> DebugInfo<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugInfo` instance from the data in the `.debug_info`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_info` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugInfo, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_info_section_somehow = || &buf;
-    /// let debug_info = DebugInfo::new(read_debug_info_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(debug_info_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_info_section, endian))
-    }
-}
-
-impl<R: Reader> DebugInfo<R> {
-    /// Iterate the compilation- and partial-units in this
-    /// `.debug_info` section.
-    ///
-    /// ```
-    /// use gimli::{DebugInfo, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_info_section_somehow = || &buf;
-    /// let debug_info = DebugInfo::new(read_debug_info_section_somehow(), LittleEndian);
-    ///
-    /// let mut iter = debug_info.units();
-    /// while let Some(unit) = iter.next().unwrap() {
-    ///     println!("unit's length is {}", unit.unit_length());
-    /// }
-    /// ```
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn units(&self) -> CompilationUnitHeadersIter<R> {
-        CompilationUnitHeadersIter {
-            input: self.debug_info_section.clone(),
-            offset: DebugInfoOffset(R::Offset::from_u8(0)),
-        }
-    }
-
-    /// Get the CompilationUnitHeader located at offset from this .debug_info section.
-    ///
-    ///
-    pub fn header_from_offset(
-        &self,
-        offset: DebugInfoOffset<R::Offset>,
-    ) -> Result<CompilationUnitHeader<R>> {
-        let input = &mut self.debug_info_section.clone();
-        input.skip(offset.0)?;
-        CompilationUnitHeader::parse(input, offset)
-    }
-}
-
-impl<T> DebugInfo<T> {
-    /// Create a `DebugInfo` section that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::DebugInfo<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugInfo<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        borrow(&self.debug_info_section).into()
-    }
-}
-
-impl<R> Section<R> for DebugInfo<R> {
-    fn id() -> SectionId {
-        SectionId::DebugInfo
-    }
-
-    fn reader(&self) -> &R {
-        &self.debug_info_section
-    }
-}
-
-impl<R> From<R> for DebugInfo<R> {
-    fn from(debug_info_section: R) -> Self {
-        DebugInfo { debug_info_section }
-    }
-}
-
-/// An iterator over the compilation- and partial-units of a section.
-///
-/// See the [documentation on
-/// `DebugInfo::units`](./struct.DebugInfo.html#method.units) for more detail.
-#[derive(Clone, Debug)]
-pub struct CompilationUnitHeadersIter<R: Reader> {
-    input: R,
-    offset: DebugInfoOffset<R::Offset>,
-}
-
-impl<R: Reader> CompilationUnitHeadersIter<R> {
-    /// Advance the iterator to the next unit header.
-    pub fn next(&mut self) -> Result<Option<CompilationUnitHeader<R>>> {
-        if self.input.is_empty() {
-            Ok(None)
-        } else {
-            let len = self.input.len();
-            match CompilationUnitHeader::parse(&mut self.input, self.offset) {
-                Ok(header) => {
-                    self.offset.0 += len - self.input.len();
-                    Ok(Some(header))
-                }
-                Err(e) => {
-                    self.input.empty();
-                    Err(e)
-                }
-            }
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for CompilationUnitHeadersIter<R> {
-    type Item = CompilationUnitHeader<R>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        CompilationUnitHeadersIter::next(self)
-    }
-}
-
-/// The header of a compilation unit's debugging information.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct CompilationUnitHeader<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    header: UnitHeader<R, Offset>,
-    offset: DebugInfoOffset<Offset>,
-}
-
-impl<R, Offset> CompilationUnitHeader<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Construct a new `CompilationUnitHeader`.
-    pub fn new(header: UnitHeader<R, Offset>, offset: DebugInfoOffset<Offset>) -> Self {
-        CompilationUnitHeader { header, offset }
-    }
-
-    /// Return the `UnitHeader` containing common unit header fields.
-    pub fn header(self) -> UnitHeader<R, Offset> {
-        self.header
-    }
-
-    /// Return the serialized size of the compilation unit header for the given
-    /// DWARF encoding.
-    pub fn size_of_header(encoding: Encoding) -> usize {
-        UnitHeader::<R, _>::size_of_header(encoding)
-    }
-
-    /// Get the offset of this compilation unit within the .debug_info section.
-    pub fn offset(&self) -> DebugInfoOffset<R::Offset> {
-        self.offset
-    }
-
-    /// Get the length of the debugging info for this compilation unit, not
-    /// including the byte length of the encoded length itself.
-    pub fn unit_length(&self) -> R::Offset {
-        self.header.unit_length
-    }
-
-    /// Get the length of the debugging info for this compilation unit,
-    /// including the byte length of the encoded length itself.
-    pub fn length_including_self(&self) -> R::Offset {
-        self.header.length_including_self()
-    }
-
-    /// Return the encoding parameters for this unit.
-    pub fn encoding(&self) -> Encoding {
-        self.header.encoding
-    }
-
-    /// Get the DWARF version of the debugging info for this compilation unit.
-    pub fn version(&self) -> u16 {
-        self.header.version()
-    }
-
-    /// The offset into the `.debug_abbrev` section for this compilation unit's
-    /// debugging information entries' abbreviations.
-    pub fn debug_abbrev_offset(&self) -> DebugAbbrevOffset<R::Offset> {
-        self.header.debug_abbrev_offset
-    }
-
-    /// The size of addresses (in bytes) in this type-unit.
-    pub fn address_size(&self) -> u8 {
-        self.header.address_size()
-    }
-
-    /// Whether this type unit is encoded in 64- or 32-bit DWARF.
-    pub fn format(&self) -> Format {
-        self.header.format()
-    }
-
-    /// The serialized size of the header for this compilation unit.
-    pub fn header_size(&self) -> R::Offset {
-        self.header.header_size()
-    }
-
-    /// Read the `DebuggingInformationEntry` at the given offset.
-    pub fn entry<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: UnitOffset<R::Offset>,
-    ) -> Result<DebuggingInformationEntry<'abbrev, 'me, R>> {
-        self.header.entry(abbreviations, offset)
-    }
-
-    /// Navigate this compilation unit's `DebuggingInformationEntry`s.
-    pub fn entries<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-    ) -> EntriesCursor<'abbrev, 'me, R> {
-        self.header.entries(abbreviations)
-    }
-
-    /// Navigate this compilation unit's `DebuggingInformationEntry`s
-    /// starting at the given offset.
-    pub fn entries_at_offset<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: UnitOffset<R::Offset>,
-    ) -> Result<EntriesCursor<'abbrev, 'me, R>> {
-        self.header.entries_at_offset(abbreviations, offset)
-    }
-
-    /// Navigate this compilation unit's `DebuggingInformationEntry`s as a tree
-    /// starting at the given offset.
-    pub fn entries_tree<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: Option<UnitOffset<R::Offset>>,
-    ) -> Result<EntriesTree<'abbrev, 'me, R>> {
-        self.header.entries_tree(abbreviations, offset)
-    }
-
-    /// Read the raw data that defines the Debugging Information Entries.
-    pub fn entries_raw<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: Option<UnitOffset<R::Offset>>,
-    ) -> Result<EntriesRaw<'abbrev, 'me, R>> {
-        self.header.entries_raw(abbreviations, offset)
-    }
-
-    /// Parse this compilation unit's abbreviations.
-    ///
-    /// ```
-    /// use gimli::DebugAbbrev;
-    /// # use gimli::{DebugInfo, LittleEndian};
-    /// # let info_buf = [
-    /// #     // Comilation unit header
-    /// #
-    /// #     // 32-bit unit length = 25
-    /// #     0x19, 0x00, 0x00, 0x00,
-    /// #     // Version 4
-    /// #     0x04, 0x00,
-    /// #     // debug_abbrev_offset
-    /// #     0x00, 0x00, 0x00, 0x00,
-    /// #     // Address size
-    /// #     0x04,
-    /// #
-    /// #     // DIEs
-    /// #
-    /// #     // Abbreviation code
-    /// #     0x01,
-    /// #     // Attribute of form DW_FORM_string = "foo\0"
-    /// #     0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #       // Children
-    /// #
-    /// #       // Abbreviation code
-    /// #       0x01,
-    /// #       // Attribute of form DW_FORM_string = "foo\0"
-    /// #       0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #         // Children
-    /// #
-    /// #         // Abbreviation code
-    /// #         0x01,
-    /// #         // Attribute of form DW_FORM_string = "foo\0"
-    /// #         0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #           // Children
-    /// #
-    /// #           // End of children
-    /// #           0x00,
-    /// #
-    /// #         // End of children
-    /// #         0x00,
-    /// #
-    /// #       // End of children
-    /// #       0x00,
-    /// # ];
-    /// # let debug_info = DebugInfo::new(&info_buf, LittleEndian);
-    /// #
-    /// # let abbrev_buf = [
-    /// #     // Code
-    /// #     0x01,
-    /// #     // DW_TAG_subprogram
-    /// #     0x2e,
-    /// #     // DW_CHILDREN_yes
-    /// #     0x01,
-    /// #     // Begin attributes
-    /// #       // Attribute name = DW_AT_name
-    /// #       0x03,
-    /// #       // Attribute form = DW_FORM_string
-    /// #       0x08,
-    /// #     // End attributes
-    /// #     0x00,
-    /// #     0x00,
-    /// #     // Null terminator
-    /// #     0x00
-    /// # ];
-    /// #
-    /// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
-    ///
-    /// let unit = get_some_unit();
-    ///
-    /// # let read_debug_abbrev_section_somehow = || &abbrev_buf;
-    /// let debug_abbrev = DebugAbbrev::new(read_debug_abbrev_section_somehow(), LittleEndian);
-    /// let abbrevs_for_unit = unit.abbreviations(&debug_abbrev).unwrap();
-    /// ```
-    pub fn abbreviations(&self, debug_abbrev: &DebugAbbrev<R>) -> Result<Abbreviations> {
-        self.header.abbreviations(debug_abbrev)
-    }
-
-    /// Parse a compilation unit header.
-    fn parse(
-        input: &mut R,
-        offset: DebugInfoOffset<R::Offset>,
-    ) -> Result<CompilationUnitHeader<R>> {
-        let header = parse_unit_header(input)?;
-        Ok(CompilationUnitHeader { header, offset })
-    }
-}
-
-/// Parse the unit type from the compilation unit header.
-fn parse_compilation_unit_type<R: Reader>(input: &mut R) -> Result<constants::DwUt> {
-    let val = input.read_u8()?;
-    Ok(constants::DwUt(val))
-}
-
-/// Parse the `debug_abbrev_offset` in the compilation unit header.
-fn parse_debug_abbrev_offset<R: Reader>(
-    input: &mut R,
-    format: Format,
-) -> Result<DebugAbbrevOffset<R::Offset>> {
-    input.read_offset(format).map(DebugAbbrevOffset)
-}
-
-/// Parse the `debug_info_offset` in the arange header.
-pub(crate) fn parse_debug_info_offset<R: Reader>(
-    input: &mut R,
-    format: Format,
-) -> Result<DebugInfoOffset<R::Offset>> {
-    input.read_offset(format).map(DebugInfoOffset)
-}
-
-/// The common fields for the headers of compilation units and
-/// type units.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct UnitHeader<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    encoding: Encoding,
-    unit_length: Offset,
-    debug_abbrev_offset: DebugAbbrevOffset<Offset>,
-    entries_buf: R,
-}
-
-/// Static methods.
-impl<R, Offset> UnitHeader<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Construct a new `UnitHeader`.
-    pub fn new(
-        encoding: Encoding,
-        unit_length: R::Offset,
-        debug_abbrev_offset: DebugAbbrevOffset<R::Offset>,
-        entries_buf: R,
-    ) -> Self {
-        UnitHeader {
-            encoding,
-            unit_length,
-            debug_abbrev_offset,
-            entries_buf,
-        }
-    }
-
-    /// Return the serialized size of the common unit header for the given
-    /// DWARF format.
-    pub fn size_of_header(encoding: Encoding) -> usize {
-        let unit_length_size = encoding.format.initial_length_size() as usize;
-        let version_size = 2;
-        let debug_abbrev_offset_size = encoding.format.word_size() as usize;
-        let address_size_size = 1;
-        let unit_type_size = if encoding.version == 5 { 1 } else { 0 };
-
-        unit_length_size
-            + version_size
-            + debug_abbrev_offset_size
-            + address_size_size
-            + unit_type_size
-    }
-}
-
-/// Instance methods.
-impl<R, Offset> UnitHeader<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Get the length of the debugging info for this compilation unit, not
-    /// including the byte length of the encoded length itself.
-    pub fn unit_length(&self) -> R::Offset {
-        self.unit_length
-    }
-
-    /// Get the length of the debugging info for this compilation unit,
-    /// including the byte length of the encoded length itself.
-    pub fn length_including_self(&self) -> R::Offset {
-        R::Offset::from_u8(self.format().initial_length_size()) + self.unit_length
-    }
-
-    /// Return the encoding parameters for this unit.
-    pub fn encoding(&self) -> Encoding {
-        self.encoding
-    }
-
-    /// Get the DWARF version of the debugging info for this compilation unit.
-    pub fn version(&self) -> u16 {
-        self.encoding.version
-    }
-
-    /// The offset into the `.debug_abbrev` section for this compilation unit's
-    /// debugging information entries' abbreviations.
-    pub fn debug_abbrev_offset(&self) -> DebugAbbrevOffset<R::Offset> {
-        self.debug_abbrev_offset
-    }
-
-    /// The size of addresses (in bytes) in this compilation unit.
-    pub fn address_size(&self) -> u8 {
-        self.encoding.address_size
-    }
-
-    /// Whether this compilation unit is encoded in 64- or 32-bit DWARF.
-    pub fn format(&self) -> Format {
-        self.encoding.format
-    }
-
-    /// The serialized size of the header for this compilation unit.
-    pub fn header_size(&self) -> R::Offset {
-        self.length_including_self() - self.entries_buf.len()
-    }
-
-    pub(crate) fn is_valid_offset(&self, offset: UnitOffset<R::Offset>) -> bool {
-        let size_of_header = self.header_size();
-        if offset.0 < size_of_header {
-            return false;
-        }
-
-        let relative_to_entries_buf = offset.0 - size_of_header;
-        relative_to_entries_buf < self.entries_buf.len()
-    }
-
-    /// Get the underlying bytes for the supplied range.
-    pub fn range(&self, idx: Range<UnitOffset<R::Offset>>) -> Result<R> {
-        if !self.is_valid_offset(idx.start) {
-            return Err(Error::OffsetOutOfBounds);
-        }
-        if !self.is_valid_offset(idx.end) {
-            return Err(Error::OffsetOutOfBounds);
-        }
-        assert!(idx.start <= idx.end);
-        let size_of_header = self.header_size();
-        let start = idx.start.0 - size_of_header;
-        let end = idx.end.0 - size_of_header;
-        let mut input = self.entries_buf.clone();
-        input.skip(start)?;
-        input.truncate(end - start)?;
-        Ok(input)
-    }
-
-    /// Get the underlying bytes for the supplied range.
-    pub fn range_from(&self, idx: RangeFrom<UnitOffset<R::Offset>>) -> Result<R> {
-        if !self.is_valid_offset(idx.start) {
-            return Err(Error::OffsetOutOfBounds);
-        }
-        let start = idx.start.0 - self.header_size();
-        let mut input = self.entries_buf.clone();
-        input.skip(start)?;
-        Ok(input)
-    }
-
-    /// Get the underlying bytes for the supplied range.
-    pub fn range_to(&self, idx: RangeTo<UnitOffset<R::Offset>>) -> Result<R> {
-        if !self.is_valid_offset(idx.end) {
-            return Err(Error::OffsetOutOfBounds);
-        }
-        let end = idx.end.0 - self.header_size();
-        let mut input = self.entries_buf.clone();
-        input.truncate(end)?;
-        Ok(input)
-    }
-
-    /// Read the `DebuggingInformationEntry` at the given offset.
-    pub fn entry<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: UnitOffset<R::Offset>,
-    ) -> Result<DebuggingInformationEntry<'abbrev, 'me, R>> {
-        let mut input = self.range_from(offset..)?;
-        let entry = DebuggingInformationEntry::parse(&mut input, self, abbreviations)?;
-        entry.ok_or(Error::NoEntryAtGivenOffset)
-    }
-
-    /// Navigate this unit's `DebuggingInformationEntry`s.
-    pub fn entries<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-    ) -> EntriesCursor<'abbrev, 'me, R> {
-        EntriesCursor {
-            unit: self,
-            input: self.entries_buf.clone(),
-            abbreviations,
-            cached_current: None,
-            delta_depth: 0,
-        }
-    }
-
-    /// Navigate this compilation unit's `DebuggingInformationEntry`s
-    /// starting at the given offset.
-    pub fn entries_at_offset<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: UnitOffset<R::Offset>,
-    ) -> Result<EntriesCursor<'abbrev, 'me, R>> {
-        let input = self.range_from(offset..)?;
-        Ok(EntriesCursor {
-            unit: self,
-            input,
-            abbreviations,
-            cached_current: None,
-            delta_depth: 0,
-        })
-    }
-
-    /// Navigate this unit's `DebuggingInformationEntry`s as a tree
-    /// starting at the given offset.
-    pub fn entries_tree<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: Option<UnitOffset<R::Offset>>,
-    ) -> Result<EntriesTree<'abbrev, 'me, R>> {
-        let input = match offset {
-            Some(offset) => self.range_from(offset..)?,
-            None => self.entries_buf.clone(),
-        };
-        Ok(EntriesTree::new(input, self, abbreviations))
-    }
-
-    /// Read the raw data that defines the Debugging Information Entries.
-    pub fn entries_raw<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: Option<UnitOffset<R::Offset>>,
-    ) -> Result<EntriesRaw<'abbrev, 'me, R>> {
-        let input = match offset {
-            Some(offset) => self.range_from(offset..)?,
-            None => self.entries_buf.clone(),
-        };
-        Ok(EntriesRaw {
-            input,
-            unit: self,
-            abbreviations,
-            depth: 0,
-        })
-    }
-
-    /// Parse this unit's abbreviations.
-    pub fn abbreviations(&self, debug_abbrev: &DebugAbbrev<R>) -> Result<Abbreviations> {
-        debug_abbrev.abbreviations(self.debug_abbrev_offset())
-    }
-}
-
-/// Parse a compilation unit header.
-fn parse_unit_header<R: Reader>(input: &mut R) -> Result<UnitHeader<R>> {
-    let (unit_length, format) = input.read_initial_length()?;
-    let mut rest = input.split(unit_length)?;
-
-    let version = rest.read_u16()?;
-    let offset;
-    let address_size;
-    // DWARF 1 was very different, and is obsolete, so isn't supported by this
-    // reader.
-    if 2 <= version && version <= 4 {
-        offset = parse_debug_abbrev_offset(&mut rest, format)?;
-        address_size = rest.read_u8()?;
-    } else if version == 5 {
-        let unit_type = parse_compilation_unit_type(&mut rest)?;
-        if unit_type != constants::DW_UT_compile {
-            return Err(Error::UnsupportedUnitType);
-        }
-        address_size = rest.read_u8()?;
-        offset = parse_debug_abbrev_offset(&mut rest, format)?;
-    } else {
-        return Err(Error::UnknownVersion(u64::from(version)));
-    }
-    let encoding = Encoding {
-        format,
-        version,
-        address_size,
-    };
-
-    Ok(UnitHeader::new(encoding, unit_length, offset, rest))
-}
-
-/// A Debugging Information Entry (DIE).
-///
-/// DIEs have a set of attributes and optionally have children DIEs as well.
-#[derive(Clone, Debug)]
-pub struct DebuggingInformationEntry<'abbrev, 'unit, R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    offset: UnitOffset<Offset>,
-    attrs_slice: R,
-    attrs_len: Cell<Option<Offset>>,
-    abbrev: &'abbrev Abbreviation,
-    unit: &'unit UnitHeader<R, Offset>,
-}
-
-impl<'abbrev, 'unit, R, Offset> DebuggingInformationEntry<'abbrev, 'unit, R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Construct a new `DebuggingInformationEntry`.
-    pub fn new(
-        offset: UnitOffset<Offset>,
-        attrs_slice: R,
-        abbrev: &'abbrev Abbreviation,
-        unit: &'unit UnitHeader<R, Offset>,
-    ) -> Self {
-        DebuggingInformationEntry {
-            offset,
-            attrs_slice,
-            attrs_len: Cell::new(None),
-            abbrev,
-            unit,
-        }
-    }
-
-    /// Get this entry's code.
-    pub fn code(&self) -> u64 {
-        self.abbrev.code()
-    }
-
-    /// Get this entry's offset.
-    pub fn offset(&self) -> UnitOffset<R::Offset> {
-        self.offset
-    }
-
-    /// Get this entry's `DW_TAG_whatever` tag.
-    ///
-    /// ```
-    /// # use gimli::{DebugAbbrev, DebugInfo, LittleEndian};
-    /// # let info_buf = [
-    /// #     // Comilation unit header
-    /// #
-    /// #     // 32-bit unit length = 12
-    /// #     0x0c, 0x00, 0x00, 0x00,
-    /// #     // Version 4
-    /// #     0x04, 0x00,
-    /// #     // debug_abbrev_offset
-    /// #     0x00, 0x00, 0x00, 0x00,
-    /// #     // Address size
-    /// #     0x04,
-    /// #
-    /// #     // DIEs
-    /// #
-    /// #     // Abbreviation code
-    /// #     0x01,
-    /// #     // Attribute of form DW_FORM_string = "foo\0"
-    /// #     0x66, 0x6f, 0x6f, 0x00,
-    /// # ];
-    /// # let debug_info = DebugInfo::new(&info_buf, LittleEndian);
-    /// # let abbrev_buf = [
-    /// #     // Code
-    /// #     0x01,
-    /// #     // DW_TAG_subprogram
-    /// #     0x2e,
-    /// #     // DW_CHILDREN_no
-    /// #     0x00,
-    /// #     // Begin attributes
-    /// #       // Attribute name = DW_AT_name
-    /// #       0x03,
-    /// #       // Attribute form = DW_FORM_string
-    /// #       0x08,
-    /// #     // End attributes
-    /// #     0x00,
-    /// #     0x00,
-    /// #     // Null terminator
-    /// #     0x00
-    /// # ];
-    /// # let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
-    /// # let unit = debug_info.units().next().unwrap().unwrap();
-    /// # let abbrevs = unit.abbreviations(&debug_abbrev).unwrap();
-    /// # let mut cursor = unit.entries(&abbrevs);
-    /// # let (_, entry) = cursor.next_dfs().unwrap().unwrap();
-    /// # let mut get_some_entry = || entry;
-    /// let entry = get_some_entry();
-    ///
-    /// match entry.tag() {
-    ///     gimli::DW_TAG_subprogram =>
-    ///         println!("this entry contains debug info about a function"),
-    ///     gimli::DW_TAG_inlined_subroutine =>
-    ///         println!("this entry contains debug info about a particular instance of inlining"),
-    ///     gimli::DW_TAG_variable =>
-    ///         println!("this entry contains debug info about a local variable"),
-    ///     gimli::DW_TAG_formal_parameter =>
-    ///         println!("this entry contains debug info about a function parameter"),
-    ///     otherwise =>
-    ///         println!("this entry is some other kind of data: {:?}", otherwise),
-    /// };
-    /// ```
-    pub fn tag(&self) -> constants::DwTag {
-        self.abbrev.tag()
-    }
-
-    /// Return true if this entry's type can have children, false otherwise.
-    pub fn has_children(&self) -> bool {
-        self.abbrev.has_children()
-    }
-
-    /// Iterate over this entry's set of attributes.
-    ///
-    /// ```
-    /// use gimli::{DebugAbbrev, DebugInfo, LittleEndian};
-    ///
-    /// // Read the `.debug_info` section.
-    ///
-    /// # let info_buf = [
-    /// #     // Comilation unit header
-    /// #
-    /// #     // 32-bit unit length = 12
-    /// #     0x0c, 0x00, 0x00, 0x00,
-    /// #     // Version 4
-    /// #     0x04, 0x00,
-    /// #     // debug_abbrev_offset
-    /// #     0x00, 0x00, 0x00, 0x00,
-    /// #     // Address size
-    /// #     0x04,
-    /// #
-    /// #     // DIEs
-    /// #
-    /// #     // Abbreviation code
-    /// #     0x01,
-    /// #     // Attribute of form DW_FORM_string = "foo\0"
-    /// #     0x66, 0x6f, 0x6f, 0x00,
-    /// # ];
-    /// # let read_debug_info_section_somehow = || &info_buf;
-    /// let debug_info = DebugInfo::new(read_debug_info_section_somehow(), LittleEndian);
-    ///
-    /// // Get the data about the first compilation unit out of the `.debug_info`.
-    ///
-    /// let unit = debug_info.units().next()
-    ///     .expect("Should have at least one compilation unit")
-    ///     .expect("and it should parse ok");
-    ///
-    /// // Read the `.debug_abbrev` section and parse the
-    /// // abbreviations for our compilation unit.
-    ///
-    /// # let abbrev_buf = [
-    /// #     // Code
-    /// #     0x01,
-    /// #     // DW_TAG_subprogram
-    /// #     0x2e,
-    /// #     // DW_CHILDREN_no
-    /// #     0x00,
-    /// #     // Begin attributes
-    /// #       // Attribute name = DW_AT_name
-    /// #       0x03,
-    /// #       // Attribute form = DW_FORM_string
-    /// #       0x08,
-    /// #     // End attributes
-    /// #     0x00,
-    /// #     0x00,
-    /// #     // Null terminator
-    /// #     0x00
-    /// # ];
-    /// # let read_debug_abbrev_section_somehow = || &abbrev_buf;
-    /// let debug_abbrev = DebugAbbrev::new(read_debug_abbrev_section_somehow(), LittleEndian);
-    /// let abbrevs = unit.abbreviations(&debug_abbrev).unwrap();
-    ///
-    /// // Get the first entry from that compilation unit.
-    ///
-    /// let mut cursor = unit.entries(&abbrevs);
-    /// let (_, entry) = cursor.next_dfs()
-    ///     .expect("Should parse next entry")
-    ///     .expect("Should have at least one entry");
-    ///
-    /// // Finally, print the first entry's attributes.
-    ///
-    /// let mut attrs = entry.attrs();
-    /// while let Some(attr) = attrs.next().unwrap() {
-    ///     println!("Attribute name = {:?}", attr.name());
-    ///     println!("Attribute value = {:?}", attr.value());
-    /// }
-    /// ```
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn attrs<'me>(&'me self) -> AttrsIter<'abbrev, 'me, 'unit, R> {
-        AttrsIter {
-            input: self.attrs_slice.clone(),
-            attributes: self.abbrev.attributes(),
-            entry: self,
-        }
-    }
-
-    /// Find the first attribute in this entry which has the given name,
-    /// and return it. Returns `Ok(None)` if no attribute is found.
-    pub fn attr(&self, name: constants::DwAt) -> Result<Option<Attribute<R>>> {
-        let mut attrs = self.attrs();
-        while let Some(attr) = attrs.next()? {
-            if attr.name() == name {
-                return Ok(Some(attr));
-            }
-        }
-        Ok(None)
-    }
-
-    /// Find the first attribute in this entry which has the given name,
-    /// and return its raw value. Returns `Ok(None)` if no attribute is found.
-    pub fn attr_value_raw(&self, name: constants::DwAt) -> Result<Option<AttributeValue<R>>> {
-        self.attr(name)
-            .map(|attr| attr.map(|attr| attr.raw_value()))
-    }
-
-    /// Find the first attribute in this entry which has the given name,
-    /// and return its normalized value.  Returns `Ok(None)` if no
-    /// attribute is found.
-    pub fn attr_value(&self, name: constants::DwAt) -> Result<Option<AttributeValue<R>>> {
-        self.attr(name).map(|attr| attr.map(|attr| attr.value()))
-    }
-
-    /// Return the input buffer after the last attribute.
-    #[allow(clippy::inline_always)]
-    #[inline(always)]
-    fn after_attrs(&self) -> Result<R> {
-        if let Some(attrs_len) = self.attrs_len.get() {
-            let mut input = self.attrs_slice.clone();
-            input.skip(attrs_len)?;
-            Ok(input)
-        } else {
-            let mut attrs = self.attrs();
-            while let Some(_) = attrs.next()? {}
-            Ok(attrs.input)
-        }
-    }
-
-    /// Use the `DW_AT_sibling` attribute to find the input buffer for the
-    /// next sibling. Returns `None` if the attribute is missing or invalid.
-    fn sibling(&self) -> Option<R> {
-        let attr = self.attr_value(constants::DW_AT_sibling);
-        if let Ok(Some(AttributeValue::UnitRef(offset))) = attr {
-            if offset.0 > self.offset.0 {
-                if let Ok(input) = self.unit.range_from(offset..) {
-                    return Some(input);
-                }
-            }
-        }
-        None
-    }
-
-    /// Parse an entry. Returns `Ok(None)` for null entries.
-    #[allow(clippy::inline_always)]
-    #[inline(always)]
-    fn parse(
-        input: &mut R,
-        unit: &'unit UnitHeader<R>,
-        abbreviations: &'abbrev Abbreviations,
-    ) -> Result<Option<Self>> {
-        let offset = unit.header_size() + input.offset_from(&unit.entries_buf);
-        let code = input.read_uleb128()?;
-        if code == 0 {
-            return Ok(None);
-        };
-        let abbrev = abbreviations.get(code).ok_or(Error::UnknownAbbreviation)?;
-        Ok(Some(DebuggingInformationEntry {
-            offset: UnitOffset(offset),
-            attrs_slice: input.clone(),
-            attrs_len: Cell::new(None),
-            abbrev,
-            unit,
-        }))
-    }
-}
-
-/// The value of an attribute in a `DebuggingInformationEntry`.
-//
-// Set the discriminant size so that all variants use the same alignment
-// for their data.  This gives better code generation in `parse_attribute`.
-#[repr(u64)]
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum AttributeValue<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// "Refers to some location in the address space of the described program."
-    Addr(u64),
-
-    /// A slice of an arbitrary number of bytes.
-    Block(R),
-
-    /// A one byte constant data value. How to interpret the byte depends on context.
-    ///
-    /// From section 7 of the standard: "Depending on context, it may be a
-    /// signed integer, an unsigned integer, a floating-point constant, or
-    /// anything else."
-    Data1(u8),
-
-    /// A two byte constant data value. How to interpret the bytes depends on context.
-    ///
-    /// These bytes have been converted from `R::Endian`. This may need to be reversed
-    /// if this was not required.
-    ///
-    /// From section 7 of the standard: "Depending on context, it may be a
-    /// signed integer, an unsigned integer, a floating-point constant, or
-    /// anything else."
-    Data2(u16),
-
-    /// A four byte constant data value. How to interpret the bytes depends on context.
-    ///
-    /// These bytes have been converted from `R::Endian`. This may need to be reversed
-    /// if this was not required.
-    ///
-    /// From section 7 of the standard: "Depending on context, it may be a
-    /// signed integer, an unsigned integer, a floating-point constant, or
-    /// anything else."
-    Data4(u32),
-
-    /// An eight byte constant data value. How to interpret the bytes depends on context.
-    ///
-    /// These bytes have been converted from `R::Endian`. This may need to be reversed
-    /// if this was not required.
-    ///
-    /// From section 7 of the standard: "Depending on context, it may be a
-    /// signed integer, an unsigned integer, a floating-point constant, or
-    /// anything else."
-    Data8(u64),
-
-    /// A signed integer constant.
-    Sdata(i64),
-
-    /// An unsigned integer constant.
-    Udata(u64),
-
-    /// "The information bytes contain a DWARF expression (see Section 2.5) or
-    /// location description (see Section 2.6)."
-    Exprloc(Expression<R>),
-
-    /// A boolean that indicates presence or absence of the attribute.
-    Flag(bool),
-
-    /// An offset into another section. Which section this is an offset into
-    /// depends on context.
-    SecOffset(Offset),
-
-    /// An offset to a set of addresses in the `.debug_addr` section.
-    DebugAddrBase(DebugAddrBase<Offset>),
-
-    /// An index into a set of addresses in the `.debug_addr` section.
-    DebugAddrIndex(DebugAddrIndex<Offset>),
-
-    /// An offset into the current compilation unit.
-    UnitRef(UnitOffset<Offset>),
-
-    /// An offset into the current `.debug_info` section, but possibly a
-    /// different compilation unit from the current one.
-    DebugInfoRef(DebugInfoOffset<Offset>),
-
-    /// An offset into the `.debug_info` section of the supplementary object file.
-    DebugInfoRefSup(DebugInfoOffset<Offset>),
-
-    /// An offset into the `.debug_line` section.
-    DebugLineRef(DebugLineOffset<Offset>),
-
-    /// An offset into either the `.debug_loc` section or the `.debug_loclists` section.
-    LocationListsRef(LocationListsOffset<Offset>),
-
-    /// An offset to a set of offsets in the `.debug_loclists` section.
-    DebugLocListsBase(DebugLocListsBase<Offset>),
-
-    /// An index into a set of offsets in the `.debug_loclists` section.
-    DebugLocListsIndex(DebugLocListsIndex<Offset>),
-
-    /// An offset into the `.debug_macinfo` section.
-    DebugMacinfoRef(DebugMacinfoOffset<Offset>),
-
-    /// An offset into the `.debug_macro` section.
-    DebugMacroRef(DebugMacroOffset<Offset>),
-
-    /// An offset into the `.debug_ranges` section.
-    RangeListsRef(RangeListsOffset<Offset>),
-
-    /// An offset to a set of offsets in the `.debug_rnglists` section.
-    DebugRngListsBase(DebugRngListsBase<Offset>),
-
-    /// An index into a set of offsets in the `.debug_rnglists` section.
-    DebugRngListsIndex(DebugRngListsIndex<Offset>),
-
-    /// A type signature.
-    DebugTypesRef(DebugTypeSignature),
-
-    /// An offset into the `.debug_str` section.
-    DebugStrRef(DebugStrOffset<Offset>),
-
-    /// An offset into the `.debug_str` section of the supplementary object file.
-    DebugStrRefSup(DebugStrOffset<Offset>),
-
-    /// An offset to a set of entries in the `.debug_str_offsets` section.
-    DebugStrOffsetsBase(DebugStrOffsetsBase<Offset>),
-
-    /// An index into a set of entries in the `.debug_str_offsets` section.
-    DebugStrOffsetsIndex(DebugStrOffsetsIndex<Offset>),
-
-    /// An offset into the `.debug_line_str` section.
-    DebugLineStrRef(DebugLineStrOffset<Offset>),
-
-    /// A slice of bytes representing a string. Does not include a final null byte.
-    /// Not guaranteed to be UTF-8 or anything like that.
-    String(R),
-
-    /// The value of a `DW_AT_encoding` attribute.
-    Encoding(constants::DwAte),
-
-    /// The value of a `DW_AT_decimal_sign` attribute.
-    DecimalSign(constants::DwDs),
-
-    /// The value of a `DW_AT_endianity` attribute.
-    Endianity(constants::DwEnd),
-
-    /// The value of a `DW_AT_accessibility` attribute.
-    Accessibility(constants::DwAccess),
-
-    /// The value of a `DW_AT_visibility` attribute.
-    Visibility(constants::DwVis),
-
-    /// The value of a `DW_AT_virtuality` attribute.
-    Virtuality(constants::DwVirtuality),
-
-    /// The value of a `DW_AT_language` attribute.
-    Language(constants::DwLang),
-
-    /// The value of a `DW_AT_address_class` attribute.
-    AddressClass(constants::DwAddr),
-
-    /// The value of a `DW_AT_identifier_case` attribute.
-    IdentifierCase(constants::DwId),
-
-    /// The value of a `DW_AT_calling_convention` attribute.
-    CallingConvention(constants::DwCc),
-
-    /// The value of a `DW_AT_inline` attribute.
-    Inline(constants::DwInl),
-
-    /// The value of a `DW_AT_ordering` attribute.
-    Ordering(constants::DwOrd),
-
-    /// An index into the filename entries from the line number information
-    /// table for the compilation unit containing this value.
-    FileIndex(u64),
-}
-
-/// An attribute in a `DebuggingInformationEntry`, consisting of a name and
-/// associated value.
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub struct Attribute<R: Reader> {
-    name: constants::DwAt,
-    value: AttributeValue<R>,
-}
-
-impl<R: Reader> Attribute<R> {
-    /// Get this attribute's name.
-    pub fn name(&self) -> constants::DwAt {
-        self.name
-    }
-
-    /// Get this attribute's raw value.
-    pub fn raw_value(&self) -> AttributeValue<R> {
-        self.value.clone()
-    }
-
-    /// Get this attribute's normalized value.
-    ///
-    /// Attribute values can potentially be encoded in multiple equivalent forms,
-    /// and may have special meaning depending on the attribute name.  This method
-    /// converts the attribute value to a normalized form based on the attribute
-    /// name.
-    ///
-    /// See "Table 7.5: Attribute encodings" and "Table 7.6: Attribute form encodings".
-    #[allow(clippy::cyclomatic_complexity)]
-    #[allow(clippy::match_same_arms)]
-    pub fn value(&self) -> AttributeValue<R> {
-        // Table 7.5 shows the possible attribute classes for each name.
-        // Table 7.6 shows the possible attribute classes for each form.
-        // For each attribute name, we need to match on the form, and
-        // convert it to one of the classes that is allowed for both
-        // the name and the form.
-        //
-        // The individual class conversions rarely vary for each name,
-        // so for each class conversion we define a macro that matches
-        // on the allowed forms for that class.
-        //
-        // For some classes, we don't need to do any conversion, so their
-        // macro is empty.  In the future we may want to fill them in to
-        // provide strict checking of the forms for each class.  For now,
-        // they simply provide a way to document the allowed classes for
-        // each name.
-
-        // DW_FORM_addr
-        // DW_FORM_addrx
-        // DW_FORM_addrx1
-        // DW_FORM_addrx2
-        // DW_FORM_addrx3
-        // DW_FORM_addrx4
-        macro_rules! address {
-            () => {};
-        }
-        // DW_FORM_sec_offset
-        macro_rules! addrptr {
-            () => {
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::DebugAddrBase(DebugAddrBase(offset));
-                }
-            };
-        }
-        // DW_FORM_block
-        // DW_FORM_block1
-        // DW_FORM_block2
-        // DW_FORM_block4
-        macro_rules! block {
-            () => {};
-        }
-        // DW_FORM_sdata
-        // DW_FORM_udata
-        // DW_FORM_data1
-        // DW_FORM_data2
-        // DW_FORM_data4
-        // DW_FORM_data8
-        // DW_FORM_data16
-        // DW_FORM_implicit_const
-        macro_rules! constant {
-            ($value:ident, $variant:ident) => {
-                if let Some(value) = self.$value() {
-                    return AttributeValue::$variant(value);
-                }
-            };
-            ($value:ident, $variant:ident, $constant:ident) => {
-                if let Some(value) = self.$value() {
-                    return AttributeValue::$variant(constants::$constant(value));
-                }
-            };
-        }
-        // DW_FORM_exprloc
-        macro_rules! exprloc {
-            () => {
-                if let Some(value) = self.exprloc_value() {
-                    return AttributeValue::Exprloc(value);
-                }
-            };
-        }
-        // DW_FORM_flag
-        // DW_FORM_flag_present
-        macro_rules! flag {
-            () => {};
-        }
-        // DW_FORM_sec_offset
-        macro_rules! lineptr {
-            () => {
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::DebugLineRef(DebugLineOffset(offset));
-                }
-            };
-        }
-        // This also covers `loclist` in DWARF version 5.
-        // DW_FORM_sec_offset
-        // DW_FORM_loclistx
-        macro_rules! loclistptr {
-            () => {
-                // DebugLocListsIndex is also an allowed form in DWARF version 5.
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::LocationListsRef(LocationListsOffset(offset));
-                }
-            };
-        }
-        // DW_FORM_sec_offset
-        macro_rules! loclistsptr {
-            () => {
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::DebugLocListsBase(DebugLocListsBase(offset));
-                }
-            };
-        }
-        // DWARF version <= 4.
-        // DW_FORM_sec_offset
-        macro_rules! macinfoptr {
-            () => {
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::DebugMacinfoRef(DebugMacinfoOffset(offset));
-                }
-            };
-        }
-        // DWARF version >= 5.
-        // DW_FORM_sec_offset
-        macro_rules! macroptr {
-            () => {
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::DebugMacroRef(DebugMacroOffset(offset));
-                }
-            };
-        }
-        // DW_FORM_ref_addr
-        // DW_FORM_ref1
-        // DW_FORM_ref2
-        // DW_FORM_ref4
-        // DW_FORM_ref8
-        // DW_FORM_ref_udata
-        // DW_FORM_ref_sig8
-        // DW_FORM_ref_sup4
-        // DW_FORM_ref_sup8
-        macro_rules! reference {
-            () => {};
-        }
-        // This also covers `rnglist` in DWARF version 5.
-        // DW_FORM_sec_offset
-        // DW_FORM_rnglistx
-        macro_rules! rangelistptr {
-            () => {
-                // DebugRngListsIndex is also an allowed form in DWARF version 5.
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::RangeListsRef(RangeListsOffset(offset));
-                }
-            };
-        }
-        // DW_FORM_sec_offset
-        macro_rules! rnglistsptr {
-            () => {
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::DebugRngListsBase(DebugRngListsBase(offset));
-                }
-            };
-        }
-        // DW_FORM_string
-        // DW_FORM_strp
-        // DW_FORM_strx
-        // DW_FORM_strx1
-        // DW_FORM_strx2
-        // DW_FORM_strx3
-        // DW_FORM_strx4
-        // DW_FORM_strp_sup
-        // DW_FORM_line_strp
-        macro_rules! string {
-            () => {};
-        }
-        // DW_FORM_sec_offset
-        macro_rules! stroffsetsptr {
-            () => {
-                if let Some(offset) = self.offset_value() {
-                    return AttributeValue::DebugStrOffsetsBase(DebugStrOffsetsBase(offset));
-                }
-            };
-        }
-
-        // Perform the allowed class conversions for each attribute name.
-        match self.name {
-            constants::DW_AT_sibling => {
-                reference!();
-            }
-            constants::DW_AT_location => {
-                exprloc!();
-                loclistptr!();
-            }
-            constants::DW_AT_name => {
-                string!();
-            }
-            constants::DW_AT_ordering => {
-                constant!(u8_value, Ordering, DwOrd);
-            }
-            constants::DW_AT_byte_size
-            | constants::DW_AT_bit_offset
-            | constants::DW_AT_bit_size => {
-                constant!(udata_value, Udata);
-                exprloc!();
-                reference!();
-            }
-            constants::DW_AT_stmt_list => {
-                lineptr!();
-            }
-            constants::DW_AT_low_pc => {
-                address!();
-            }
-            constants::DW_AT_high_pc => {
-                address!();
-                constant!(udata_value, Udata);
-            }
-            constants::DW_AT_language => {
-                constant!(u16_value, Language, DwLang);
-            }
-            constants::DW_AT_discr => {
-                reference!();
-            }
-            constants::DW_AT_discr_value => {
-                // constant: depends on type of DW_TAG_variant_part,
-                // so caller must normalize.
-            }
-            constants::DW_AT_visibility => {
-                constant!(u8_value, Visibility, DwVis);
-            }
-            constants::DW_AT_import => {
-                reference!();
-            }
-            constants::DW_AT_string_length => {
-                exprloc!();
-                loclistptr!();
-                reference!();
-            }
-            constants::DW_AT_common_reference => {
-                reference!();
-            }
-            constants::DW_AT_comp_dir => {
-                string!();
-            }
-            constants::DW_AT_const_value => {
-                // TODO: constant: sign depends on DW_AT_type.
-                block!();
-                string!();
-            }
-            constants::DW_AT_containing_type => {
-                reference!();
-            }
-            constants::DW_AT_default_value => {
-                // TODO: constant: sign depends on DW_AT_type.
-                reference!();
-                flag!();
-            }
-            constants::DW_AT_inline => {
-                constant!(u8_value, Inline, DwInl);
-            }
-            constants::DW_AT_is_optional => {
-                flag!();
-            }
-            constants::DW_AT_lower_bound => {
-                // TODO: constant: sign depends on DW_AT_type.
-                exprloc!();
-                reference!();
-            }
-            constants::DW_AT_producer => {
-                string!();
-            }
-            constants::DW_AT_prototyped => {
-                flag!();
-            }
-            constants::DW_AT_return_addr => {
-                exprloc!();
-                loclistptr!();
-            }
-            constants::DW_AT_start_scope => {
-                // TODO: constant
-                rangelistptr!();
-            }
-            constants::DW_AT_bit_stride => {
-                constant!(udata_value, Udata);
-                exprloc!();
-                reference!();
-            }
-            constants::DW_AT_upper_bound => {
-                // TODO: constant: sign depends on DW_AT_type.
-                exprloc!();
-                reference!();
-            }
-            constants::DW_AT_abstract_origin => {
-                reference!();
-            }
-            constants::DW_AT_accessibility => {
-                constant!(u8_value, Accessibility, DwAccess);
-            }
-            constants::DW_AT_address_class => {
-                constant!(udata_value, AddressClass, DwAddr);
-            }
-            constants::DW_AT_artificial => {
-                flag!();
-            }
-            constants::DW_AT_base_types => {
-                reference!();
-            }
-            constants::DW_AT_calling_convention => {
-                constant!(u8_value, CallingConvention, DwCc);
-            }
-            constants::DW_AT_count => {
-                // TODO: constant
-                exprloc!();
-                reference!();
-            }
-            constants::DW_AT_data_member_location => {
-                // Constants must be handled before loclistptr so that DW_FORM_data4/8
-                // are correctly interpreted for DWARF version 4+.
-                constant!(udata_value, Udata);
-                exprloc!();
-                loclistptr!();
-            }
-            constants::DW_AT_decl_column => {
-                constant!(udata_value, Udata);
-            }
-            constants::DW_AT_decl_file => {
-                constant!(udata_value, FileIndex);
-            }
-            constants::DW_AT_decl_line => {
-                constant!(udata_value, Udata);
-            }
-            constants::DW_AT_declaration => {
-                flag!();
-            }
-            constants::DW_AT_discr_list => {
-                block!();
-            }
-            constants::DW_AT_encoding => {
-                constant!(u8_value, Encoding, DwAte);
-            }
-            constants::DW_AT_external => {
-                flag!();
-            }
-            constants::DW_AT_frame_base => {
-                exprloc!();
-                loclistptr!();
-            }
-            constants::DW_AT_friend => {
-                reference!();
-            }
-            constants::DW_AT_identifier_case => {
-                constant!(u8_value, IdentifierCase, DwId);
-            }
-            constants::DW_AT_macro_info => {
-                macinfoptr!();
-            }
-            constants::DW_AT_namelist_item => {
-                reference!();
-            }
-            constants::DW_AT_priority => {
-                reference!();
-            }
-            constants::DW_AT_segment => {
-                exprloc!();
-                loclistptr!();
-            }
-            constants::DW_AT_specification => {
-                reference!();
-            }
-            constants::DW_AT_static_link => {
-                exprloc!();
-                loclistptr!();
-            }
-            constants::DW_AT_type => {
-                reference!();
-            }
-            constants::DW_AT_use_location => {
-                exprloc!();
-                loclistptr!();
-            }
-            constants::DW_AT_variable_parameter => {
-                flag!();
-            }
-            constants::DW_AT_virtuality => {
-                constant!(u8_value, Virtuality, DwVirtuality);
-            }
-            constants::DW_AT_vtable_elem_location => {
-                exprloc!();
-                loclistptr!();
-            }
-            constants::DW_AT_allocated => {
-                // TODO: constant
-                exprloc!();
-                reference!();
-            }
-            constants::DW_AT_associated => {
-                // TODO: constant
-                exprloc!();
-                reference!();
-            }
-            constants::DW_AT_data_location => {
-                exprloc!();
-            }
-            constants::DW_AT_byte_stride => {
-                constant!(udata_value, Udata);
-                exprloc!();
-                reference!();
-            }
-            constants::DW_AT_entry_pc => {
-                // TODO: constant
-                address!();
-            }
-            constants::DW_AT_use_UTF8 => {
-                flag!();
-            }
-            constants::DW_AT_extension => {
-                reference!();
-            }
-            constants::DW_AT_ranges => {
-                rangelistptr!();
-            }
-            constants::DW_AT_trampoline => {
-                address!();
-                flag!();
-                reference!();
-                string!();
-            }
-            constants::DW_AT_call_column => {
-                constant!(udata_value, Udata);
-            }
-            constants::DW_AT_call_file => {
-                constant!(udata_value, FileIndex);
-            }
-            constants::DW_AT_call_line => {
-                constant!(udata_value, Udata);
-            }
-            constants::DW_AT_description => {
-                string!();
-            }
-            constants::DW_AT_binary_scale => {
-                // TODO: constant
-            }
-            constants::DW_AT_decimal_scale => {
-                // TODO: constant
-            }
-            constants::DW_AT_small => {
-                reference!();
-            }
-            constants::DW_AT_decimal_sign => {
-                constant!(u8_value, DecimalSign, DwDs);
-            }
-            constants::DW_AT_digit_count => {
-                // TODO: constant
-            }
-            constants::DW_AT_picture_string => {
-                string!();
-            }
-            constants::DW_AT_mutable => {
-                flag!();
-            }
-            constants::DW_AT_threads_scaled => {
-                flag!();
-            }
-            constants::DW_AT_explicit => {
-                flag!();
-            }
-            constants::DW_AT_object_pointer => {
-                reference!();
-            }
-            constants::DW_AT_endianity => {
-                constant!(u8_value, Endianity, DwEnd);
-            }
-            constants::DW_AT_elemental => {
-                flag!();
-            }
-            constants::DW_AT_pure => {
-                flag!();
-            }
-            constants::DW_AT_recursive => {
-                flag!();
-            }
-            constants::DW_AT_signature => {
-                reference!();
-            }
-            constants::DW_AT_main_subprogram => {
-                flag!();
-            }
-            constants::DW_AT_data_bit_offset => {
-                // TODO: constant
-            }
-            constants::DW_AT_const_expr => {
-                flag!();
-            }
-            constants::DW_AT_enum_class => {
-                flag!();
-            }
-            constants::DW_AT_linkage_name => {
-                string!();
-            }
-            constants::DW_AT_string_length_bit_size => {
-                // TODO: constant
-            }
-            constants::DW_AT_string_length_byte_size => {
-                // TODO: constant
-            }
-            constants::DW_AT_rank => {
-                // TODO: constant
-                exprloc!();
-            }
-            constants::DW_AT_str_offsets_base => {
-                stroffsetsptr!();
-            }
-            constants::DW_AT_addr_base => {
-                addrptr!();
-            }
-            constants::DW_AT_rnglists_base => {
-                rnglistsptr!();
-            }
-            constants::DW_AT_dwo_name => {
-                string!();
-            }
-            constants::DW_AT_reference => {
-                flag!();
-            }
-            constants::DW_AT_rvalue_reference => {
-                flag!();
-            }
-            constants::DW_AT_macros => {
-                macroptr!();
-            }
-            constants::DW_AT_call_all_calls => {
-                flag!();
-            }
-            constants::DW_AT_call_all_source_calls => {
-                flag!();
-            }
-            constants::DW_AT_call_all_tail_calls => {
-                flag!();
-            }
-            constants::DW_AT_call_return_pc => {
-                address!();
-            }
-            constants::DW_AT_call_value => {
-                exprloc!();
-            }
-            constants::DW_AT_call_origin => {
-                exprloc!();
-            }
-            constants::DW_AT_call_parameter => {
-                reference!();
-            }
-            constants::DW_AT_call_pc => {
-                address!();
-            }
-            constants::DW_AT_call_tail_call => {
-                flag!();
-            }
-            constants::DW_AT_call_target => {
-                exprloc!();
-            }
-            constants::DW_AT_call_target_clobbered => {
-                exprloc!();
-            }
-            constants::DW_AT_call_data_location => {
-                exprloc!();
-            }
-            constants::DW_AT_call_data_value => {
-                exprloc!();
-            }
-            constants::DW_AT_noreturn => {
-                flag!();
-            }
-            constants::DW_AT_alignment => {
-                // TODO: constant
-            }
-            constants::DW_AT_export_symbols => {
-                flag!();
-            }
-            constants::DW_AT_deleted => {
-                flag!();
-            }
-            constants::DW_AT_defaulted => {
-                // TODO: constant
-            }
-            constants::DW_AT_loclists_base => {
-                loclistsptr!();
-            }
-            _ => {}
-        }
-        self.value.clone()
-    }
-
-    /// Try to convert this attribute's value to a u8.
-    #[inline]
-    pub fn u8_value(&self) -> Option<u8> {
-        self.value.u8_value()
-    }
-
-    /// Try to convert this attribute's value to a u16.
-    #[inline]
-    pub fn u16_value(&self) -> Option<u16> {
-        self.value.u16_value()
-    }
-
-    /// Try to convert this attribute's value to an unsigned integer.
-    #[inline]
-    pub fn udata_value(&self) -> Option<u64> {
-        self.value.udata_value()
-    }
-
-    /// Try to convert this attribute's value to a signed integer.
-    #[inline]
-    pub fn sdata_value(&self) -> Option<i64> {
-        self.value.sdata_value()
-    }
-
-    /// Try to convert this attribute's value to an offset.
-    #[inline]
-    pub fn offset_value(&self) -> Option<R::Offset> {
-        self.value.offset_value()
-    }
-
-    /// Try to convert this attribute's value to an expression or location buffer.
-    ///
-    /// Expressions and locations may be `DW_FORM_block*` or `DW_FORM_exprloc`.
-    /// The standard doesn't mention `DW_FORM_block*` as a possible form, but
-    /// it is encountered in practice.
-    #[inline]
-    pub fn exprloc_value(&self) -> Option<Expression<R>> {
-        self.value.exprloc_value()
-    }
-
-    /// Try to return this attribute's value as a string slice.
-    ///
-    /// If this attribute's value is either an inline `DW_FORM_string` string,
-    /// or a `DW_FORM_strp` reference to an offset into the `.debug_str`
-    /// section, return the attribute's string value as `Some`. Other attribute
-    /// value forms are returned as `None`.
-    ///
-    /// Warning: this function does not handle all possible string forms.
-    /// Use `Dwarf::attr_string` instead.
-    #[inline]
-    pub fn string_value(&self, debug_str: &DebugStr<R>) -> Option<R> {
-        self.value.string_value(debug_str)
-    }
-
-    /// Try to return this attribute's value as a string slice.
-    ///
-    /// If this attribute's value is either an inline `DW_FORM_string` string,
-    /// or a `DW_FORM_strp` reference to an offset into the `.debug_str`
-    /// section, or a `DW_FORM_strp_sup` reference to an offset into a supplementary
-    /// object file, return the attribute's string value as `Some`. Other attribute
-    /// value forms are returned as `None`.
-    ///
-    /// Warning: this function does not handle all possible string forms.
-    /// Use `Dwarf::attr_string` instead.
-    #[inline]
-    pub fn string_value_sup(
-        &self,
-        debug_str: &DebugStr<R>,
-        debug_str_sup: Option<&DebugStr<R>>,
-    ) -> Option<R> {
-        self.value.string_value_sup(debug_str, debug_str_sup)
-    }
-}
-
-impl<R, Offset> AttributeValue<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Try to convert this attribute's value to a u8.
-    pub fn u8_value(&self) -> Option<u8> {
-        if let Some(value) = self.udata_value() {
-            if value <= u64::from(u8::MAX) {
-                return Some(value as u8);
-            }
-        }
-        None
-    }
-
-    /// Try to convert this attribute's value to a u16.
-    pub fn u16_value(&self) -> Option<u16> {
-        if let Some(value) = self.udata_value() {
-            if value <= u64::from(u16::MAX) {
-                return Some(value as u16);
-            }
-        }
-        None
-    }
-
-    /// Try to convert this attribute's value to an unsigned integer.
-    pub fn udata_value(&self) -> Option<u64> {
-        Some(match *self {
-            AttributeValue::Data1(data) => u64::from(data),
-            AttributeValue::Data2(data) => u64::from(data),
-            AttributeValue::Data4(data) => u64::from(data),
-            AttributeValue::Data8(data) => data,
-            AttributeValue::Udata(data) => data,
-            AttributeValue::Sdata(data) => {
-                if data < 0 {
-                    // Maybe we should emit a warning here
-                    return None;
-                }
-                data as u64
-            }
-            _ => return None,
-        })
-    }
-
-    /// Try to convert this attribute's value to a signed integer.
-    pub fn sdata_value(&self) -> Option<i64> {
-        Some(match *self {
-            AttributeValue::Data1(data) => i64::from(data as i8),
-            AttributeValue::Data2(data) => i64::from(data as i16),
-            AttributeValue::Data4(data) => i64::from(data as i32),
-            AttributeValue::Data8(data) => data as i64,
-            AttributeValue::Sdata(data) => data,
-            AttributeValue::Udata(data) => {
-                if data > i64::max_value() as u64 {
-                    // Maybe we should emit a warning here
-                    return None;
-                }
-                data as i64
-            }
-            _ => return None,
-        })
-    }
-
-    /// Try to convert this attribute's value to an offset.
-    pub fn offset_value(&self) -> Option<R::Offset> {
-        // While offsets will be DW_FORM_data4/8 in DWARF version 2/3,
-        // these have already been converted to `SecOffset.
-        if let AttributeValue::SecOffset(offset) = *self {
-            Some(offset)
-        } else {
-            None
-        }
-    }
-
-    /// Try to convert this attribute's value to an expression or location buffer.
-    ///
-    /// Expressions and locations may be `DW_FORM_block*` or `DW_FORM_exprloc`.
-    /// The standard doesn't mention `DW_FORM_block*` as a possible form, but
-    /// it is encountered in practice.
-    pub fn exprloc_value(&self) -> Option<Expression<R>> {
-        Some(match *self {
-            AttributeValue::Block(ref data) => Expression(data.clone()),
-            AttributeValue::Exprloc(ref data) => data.clone(),
-            _ => return None,
-        })
-    }
-
-    /// Try to return this attribute's value as a string slice.
-    ///
-    /// If this attribute's value is either an inline `DW_FORM_string` string,
-    /// or a `DW_FORM_strp` reference to an offset into the `.debug_str`
-    /// section, return the attribute's string value as `Some`. Other attribute
-    /// value forms are returned as `None`.
-    ///
-    /// Warning: this function does not handle all possible string forms.
-    /// Use `Dwarf::attr_string` instead.
-    pub fn string_value(&self, debug_str: &DebugStr<R>) -> Option<R> {
-        match *self {
-            AttributeValue::String(ref string) => Some(string.clone()),
-            AttributeValue::DebugStrRef(offset) => debug_str.get_str(offset).ok(),
-            _ => None,
-        }
-    }
-
-    /// Try to return this attribute's value as a string slice.
-    ///
-    /// If this attribute's value is either an inline `DW_FORM_string` string,
-    /// or a `DW_FORM_strp` reference to an offset into the `.debug_str`
-    /// section, or a `DW_FORM_strp_sup` reference to an offset into a supplementary
-    /// object file, return the attribute's string value as `Some`. Other attribute
-    /// value forms are returned as `None`.
-    ///
-    /// Warning: this function does not handle all possible string forms.
-    /// Use `Dwarf::attr_string` instead.
-    pub fn string_value_sup(
-        &self,
-        debug_str: &DebugStr<R>,
-        debug_str_sup: Option<&DebugStr<R>>,
-    ) -> Option<R> {
-        match *self {
-            AttributeValue::String(ref string) => Some(string.clone()),
-            AttributeValue::DebugStrRef(offset) => debug_str.get_str(offset).ok(),
-            AttributeValue::DebugStrRefSup(offset) => {
-                debug_str_sup.and_then(|s| s.get_str(offset).ok())
-            }
-            _ => None,
-        }
-    }
-}
-
-fn length_u8_value<R: Reader>(input: &mut R) -> Result<R> {
-    let len = input.read_u8().map(R::Offset::from_u8)?;
-    input.split(len)
-}
-
-fn length_u16_value<R: Reader>(input: &mut R) -> Result<R> {
-    let len = input.read_u16().map(R::Offset::from_u16)?;
-    input.split(len)
-}
-
-fn length_u32_value<R: Reader>(input: &mut R) -> Result<R> {
-    let len = input.read_u32().map(R::Offset::from_u32)?;
-    input.split(len)
-}
-
-fn length_uleb128_value<R: Reader>(input: &mut R) -> Result<R> {
-    let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
-    input.split(len)
-}
-
-// Return true if the given `name` can be a section offset in DWARF version 2/3.
-// This is required to correctly handle relocations.
-fn allow_section_offset(name: constants::DwAt, version: u16) -> bool {
-    match name {
-        constants::DW_AT_location
-        | constants::DW_AT_stmt_list
-        | constants::DW_AT_string_length
-        | constants::DW_AT_return_addr
-        | constants::DW_AT_start_scope
-        | constants::DW_AT_frame_base
-        | constants::DW_AT_macro_info
-        | constants::DW_AT_macros
-        | constants::DW_AT_segment
-        | constants::DW_AT_static_link
-        | constants::DW_AT_use_location
-        | constants::DW_AT_vtable_elem_location
-        | constants::DW_AT_ranges => true,
-        constants::DW_AT_data_member_location => version == 2 || version == 3,
-        _ => false,
-    }
-}
-
-pub(crate) fn parse_attribute<'unit, R: Reader>(
-    input: &mut R,
-    encoding: Encoding,
-    spec: AttributeSpecification,
-) -> Result<Attribute<R>> {
-    let mut form = spec.form();
-    loop {
-        let value = match form {
-            constants::DW_FORM_indirect => {
-                let dynamic_form = input.read_uleb128_u16()?;
-                form = constants::DwForm(dynamic_form);
-                continue;
-            }
-            constants::DW_FORM_addr => {
-                let addr = input.read_address(encoding.address_size)?;
-                AttributeValue::Addr(addr)
-            }
-            constants::DW_FORM_block1 => {
-                let block = length_u8_value(input)?;
-                AttributeValue::Block(block)
-            }
-            constants::DW_FORM_block2 => {
-                let block = length_u16_value(input)?;
-                AttributeValue::Block(block)
-            }
-            constants::DW_FORM_block4 => {
-                let block = length_u32_value(input)?;
-                AttributeValue::Block(block)
-            }
-            constants::DW_FORM_block => {
-                let block = length_uleb128_value(input)?;
-                AttributeValue::Block(block)
-            }
-            constants::DW_FORM_data1 => {
-                let data = input.read_u8()?;
-                AttributeValue::Data1(data)
-            }
-            constants::DW_FORM_data2 => {
-                let data = input.read_u16()?;
-                AttributeValue::Data2(data)
-            }
-            constants::DW_FORM_data4 => {
-                // DWARF version 2/3 may use DW_FORM_data4/8 for section offsets.
-                // Ensure we handle relocations here.
-                if encoding.format == Format::Dwarf32
-                    && allow_section_offset(spec.name(), encoding.version)
-                {
-                    let offset = input.read_offset(Format::Dwarf32)?;
-                    AttributeValue::SecOffset(offset)
-                } else {
-                    let data = input.read_u32()?;
-                    AttributeValue::Data4(data)
-                }
-            }
-            constants::DW_FORM_data8 => {
-                // DWARF version 2/3 may use DW_FORM_data4/8 for section offsets.
-                // Ensure we handle relocations here.
-                if encoding.format == Format::Dwarf64
-                    && allow_section_offset(spec.name(), encoding.version)
-                {
-                    let offset = input.read_offset(Format::Dwarf64)?;
-                    AttributeValue::SecOffset(offset)
-                } else {
-                    let data = input.read_u64()?;
-                    AttributeValue::Data8(data)
-                }
-            }
-            constants::DW_FORM_data16 => {
-                let block = input.split(R::Offset::from_u8(16))?;
-                AttributeValue::Block(block)
-            }
-            constants::DW_FORM_udata => {
-                let data = input.read_uleb128()?;
-                AttributeValue::Udata(data)
-            }
-            constants::DW_FORM_sdata => {
-                let data = input.read_sleb128()?;
-                AttributeValue::Sdata(data)
-            }
-            constants::DW_FORM_exprloc => {
-                let block = length_uleb128_value(input)?;
-                AttributeValue::Exprloc(Expression(block))
-            }
-            constants::DW_FORM_flag => {
-                let present = input.read_u8()?;
-                AttributeValue::Flag(present != 0)
-            }
-            constants::DW_FORM_flag_present => {
-                // FlagPresent is this weird compile time always true thing that
-                // isn't actually present in the serialized DIEs, only in the abbreviation.
-                AttributeValue::Flag(true)
-            }
-            constants::DW_FORM_sec_offset => {
-                let offset = input.read_offset(encoding.format)?;
-                AttributeValue::SecOffset(offset)
-            }
-            constants::DW_FORM_ref1 => {
-                let reference = input.read_u8().map(R::Offset::from_u8)?;
-                AttributeValue::UnitRef(UnitOffset(reference))
-            }
-            constants::DW_FORM_ref2 => {
-                let reference = input.read_u16().map(R::Offset::from_u16)?;
-                AttributeValue::UnitRef(UnitOffset(reference))
-            }
-            constants::DW_FORM_ref4 => {
-                let reference = input.read_u32().map(R::Offset::from_u32)?;
-                AttributeValue::UnitRef(UnitOffset(reference))
-            }
-            constants::DW_FORM_ref8 => {
-                let reference = input.read_u64().and_then(R::Offset::from_u64)?;
-                AttributeValue::UnitRef(UnitOffset(reference))
-            }
-            constants::DW_FORM_ref_udata => {
-                let reference = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                AttributeValue::UnitRef(UnitOffset(reference))
-            }
-            constants::DW_FORM_ref_addr => {
-                // This is an offset, but DWARF version 2 specifies that DW_FORM_ref_addr
-                // has the same size as an address on the target system.  This was changed
-                // in DWARF version 3.
-                let offset = if encoding.version == 2 {
-                    input.read_sized_offset(encoding.address_size)?
-                } else {
-                    input.read_offset(encoding.format)?
-                };
-                AttributeValue::DebugInfoRef(DebugInfoOffset(offset))
-            }
-            constants::DW_FORM_ref_sig8 => {
-                let signature = input.read_u64()?;
-                AttributeValue::DebugTypesRef(DebugTypeSignature(signature))
-            }
-            constants::DW_FORM_ref_sup4 => {
-                let offset = input.read_u32().map(R::Offset::from_u32)?;
-                AttributeValue::DebugInfoRefSup(DebugInfoOffset(offset))
-            }
-            constants::DW_FORM_ref_sup8 => {
-                let offset = input.read_u64().and_then(R::Offset::from_u64)?;
-                AttributeValue::DebugInfoRefSup(DebugInfoOffset(offset))
-            }
-            constants::DW_FORM_GNU_ref_alt => {
-                let offset = input.read_offset(encoding.format)?;
-                AttributeValue::DebugInfoRefSup(DebugInfoOffset(offset))
-            }
-            constants::DW_FORM_string => {
-                let string = input.read_null_terminated_slice()?;
-                AttributeValue::String(string)
-            }
-            constants::DW_FORM_strp => {
-                let offset = input.read_offset(encoding.format)?;
-                AttributeValue::DebugStrRef(DebugStrOffset(offset))
-            }
-            constants::DW_FORM_strp_sup | constants::DW_FORM_GNU_strp_alt => {
-                let offset = input.read_offset(encoding.format)?;
-                AttributeValue::DebugStrRefSup(DebugStrOffset(offset))
-            }
-            constants::DW_FORM_line_strp => {
-                let offset = input.read_offset(encoding.format)?;
-                AttributeValue::DebugLineStrRef(DebugLineStrOffset(offset))
-            }
-            constants::DW_FORM_implicit_const => {
-                let data = spec
-                    .implicit_const_value()
-                    .ok_or(Error::InvalidImplicitConst)?;
-                AttributeValue::Sdata(data)
-            }
-            constants::DW_FORM_strx | constants::DW_FORM_GNU_str_index => {
-                let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-            }
-            constants::DW_FORM_strx1 => {
-                let index = input.read_u8().map(R::Offset::from_u8)?;
-                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-            }
-            constants::DW_FORM_strx2 => {
-                let index = input.read_u16().map(R::Offset::from_u16)?;
-                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-            }
-            constants::DW_FORM_strx3 => {
-                let index = input.read_uint(3).and_then(R::Offset::from_u64)?;
-                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-            }
-            constants::DW_FORM_strx4 => {
-                let index = input.read_u32().map(R::Offset::from_u32)?;
-                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
-            }
-            constants::DW_FORM_addrx | constants::DW_FORM_GNU_addr_index => {
-                let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
-            }
-            constants::DW_FORM_addrx1 => {
-                let index = input.read_u8().map(R::Offset::from_u8)?;
-                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
-            }
-            constants::DW_FORM_addrx2 => {
-                let index = input.read_u16().map(R::Offset::from_u16)?;
-                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
-            }
-            constants::DW_FORM_addrx3 => {
-                let index = input.read_uint(3).and_then(R::Offset::from_u64)?;
-                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
-            }
-            constants::DW_FORM_addrx4 => {
-                let index = input.read_u32().map(R::Offset::from_u32)?;
-                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
-            }
-            constants::DW_FORM_loclistx => {
-                let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                AttributeValue::DebugLocListsIndex(DebugLocListsIndex(index))
-            }
-            constants::DW_FORM_rnglistx => {
-                let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
-                AttributeValue::DebugRngListsIndex(DebugRngListsIndex(index))
-            }
-            _ => {
-                return Err(Error::UnknownForm);
-            }
-        };
-        let attr = Attribute {
-            name: spec.name(),
-            value,
-        };
-        return Ok(attr);
-    }
-}
-
-/// An iterator over a particular entry's attributes.
-///
-/// See [the documentation for
-/// `DebuggingInformationEntry::attrs()`](./struct.DebuggingInformationEntry.html#method.attrs)
-/// for details.
-///
-/// Can be [used with
-/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-#[derive(Clone, Copy, Debug)]
-pub struct AttrsIter<'abbrev, 'entry, 'unit, R: Reader> {
-    input: R,
-    attributes: &'abbrev [AttributeSpecification],
-    entry: &'entry DebuggingInformationEntry<'abbrev, 'unit, R>,
-}
-
-impl<'abbrev, 'entry, 'unit, R: Reader> AttrsIter<'abbrev, 'entry, 'unit, R> {
-    /// Advance the iterator and return the next attribute.
-    ///
-    /// Returns `None` when iteration is finished. If an error
-    /// occurs while parsing the next attribute, then this error
-    /// is returned, and all subsequent calls return `None`.
-    #[allow(clippy::inline_always)]
-    #[inline(always)]
-    pub fn next(&mut self) -> Result<Option<Attribute<R>>> {
-        if self.attributes.is_empty() {
-            // Now that we have parsed all of the attributes, we know where
-            // either (1) this entry's children start, if the abbreviation says
-            // this entry has children; or (2) where this entry's siblings
-            // begin.
-            if let Some(end) = self.entry.attrs_len.get() {
-                debug_assert_eq!(end, self.input.offset_from(&self.entry.attrs_slice));
-            } else {
-                self.entry
-                    .attrs_len
-                    .set(Some(self.input.offset_from(&self.entry.attrs_slice)));
-            }
-
-            return Ok(None);
-        }
-
-        let spec = self.attributes[0];
-        let rest_spec = &self.attributes[1..];
-        match parse_attribute(&mut self.input, self.entry.unit.encoding(), spec) {
-            Ok(attr) => {
-                self.attributes = rest_spec;
-                Ok(Some(attr))
-            }
-            Err(e) => {
-                self.input.empty();
-                Err(e)
-            }
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<'abbrev, 'entry, 'unit, R: Reader> fallible_iterator::FallibleIterator
-    for AttrsIter<'abbrev, 'entry, 'unit, R>
-{
-    type Item = Attribute<R>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        AttrsIter::next(self)
-    }
-}
-
-/// A raw reader of the data that defines the Debugging Information Entries.
-///
-/// `EntriesRaw` provides primitives to read the components of Debugging Information
-/// Entries (DIEs). A DIE consists of an abbreviation code (read with `read_abbreviation`)
-/// followed by a number of attributes (read with `read_attribute`).
-/// The user must provide the control flow to read these correctly.
-/// In particular, all attributes must always be read before reading another
-/// abbreviation code.
-///
-/// `EntriesRaw` lacks some features of `EntriesCursor`, such as the ability to skip
-/// to the next sibling DIE. However, this also allows it to optimize better, since it
-/// does not need to perform the extra bookkeeping required to support these features,
-/// and thus it is suitable for cases where performance is important.
-///
-/// ## Example Usage
-/// ```rust,no_run
-/// # fn example() -> Result<(), gimli::Error> {
-/// # let debug_info = gimli::DebugInfo::new(&[], gimli::LittleEndian);
-/// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
-/// let unit = get_some_unit();
-/// # let debug_abbrev = gimli::DebugAbbrev::new(&[], gimli::LittleEndian);
-/// # let get_abbrevs_for_unit = |_| unit.abbreviations(&debug_abbrev).unwrap();
-/// let abbrevs = get_abbrevs_for_unit(&unit);
-///
-/// let mut entries = unit.entries_raw(&abbrevs, None)?;
-/// while !entries.is_empty() {
-///     let abbrev = if let Some(abbrev) = entries.read_abbreviation()? {
-///         abbrev
-///     } else {
-///         // Null entry with no attributes.
-///         continue
-///     };
-///     match abbrev.tag() {
-///         gimli::DW_TAG_subprogram => {
-///             // Loop over attributes for DIEs we care about.
-///             for spec in abbrev.attributes() {
-///                 let attr = entries.read_attribute(*spec)?;
-///                 match attr.name() {
-///                     // Handle attributes.
-///                     _ => {}
-///                 }
-///             }
-///         }
-///         _ => {
-///             // Skip attributes for DIEs we don't care about.
-///             for spec in abbrev.attributes() {
-///                 entries.read_attribute(*spec)?;
-///             }
-///         }
-///     }
-/// }
-/// # unreachable!()
-/// # }
-/// ```
-#[derive(Clone, Debug)]
-pub struct EntriesRaw<'abbrev, 'unit, R>
-where
-    R: Reader,
-{
-    input: R,
-    unit: &'unit UnitHeader<R>,
-    abbreviations: &'abbrev Abbreviations,
-    depth: isize,
-}
-
-impl<'abbrev, 'unit, R: Reader> EntriesRaw<'abbrev, 'unit, R> {
-    /// Return true if there is no more input.
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.input.is_empty()
-    }
-
-    /// Return the unit offset at which the reader will read next.
-    ///
-    /// If you want the offset of the next entry, then this must be called prior to reading
-    /// the next entry.
-    pub fn next_offset(&self) -> UnitOffset<R::Offset> {
-        UnitOffset(self.unit.header_size() + self.input.offset_from(&self.unit.entries_buf))
-    }
-
-    /// Return the depth of the next entry.
-    ///
-    /// This depth is updated when `read_abbreviation` is called, and is updated
-    /// based on null entries and the `has_children` field in the abbreviation.
-    #[inline]
-    pub fn next_depth(&self) -> isize {
-        self.depth
-    }
-
-    /// Read an abbreviation code and lookup the corresponding `Abbreviation`.
-    ///
-    /// Returns `Ok(None)` for null entries.
-    #[inline]
-    pub fn read_abbreviation(&mut self) -> Result<Option<&'abbrev Abbreviation>> {
-        let code = self.input.read_uleb128()?;
-        if code == 0 {
-            self.depth -= 1;
-            return Ok(None);
-        };
-        let abbrev = self
-            .abbreviations
-            .get(code)
-            .ok_or(Error::UnknownAbbreviation)?;
-        if abbrev.has_children() {
-            self.depth += 1;
-        }
-        Ok(Some(abbrev))
-    }
-
-    /// Read an attribute.
-    #[inline]
-    pub fn read_attribute(&mut self, spec: AttributeSpecification) -> Result<Attribute<R>> {
-        parse_attribute(&mut self.input, self.unit.encoding(), spec)
-    }
-}
-
-/// A cursor into the Debugging Information Entries tree for a compilation unit.
-///
-/// The `EntriesCursor` can traverse the DIE tree in DFS order using `next_dfs()`,
-/// or skip to the next sibling of the entry the cursor is currently pointing to
-/// using `next_sibling()`.
-///
-/// It is also possible to traverse the DIE tree at a lower abstraction level
-/// using `next_entry()`. This method does not skip over null entries, or provide
-/// any indication of the current tree depth. In this case, you must use `current()`
-/// to obtain the current entry, and `current().has_children()` to determine if
-/// the entry following the current entry will be a sibling or child. `current()`
-/// will return `None` if the current entry is a null entry, which signifies the
-/// end of the current tree depth.
-#[derive(Clone, Debug)]
-pub struct EntriesCursor<'abbrev, 'unit, R>
-where
-    R: Reader,
-{
-    input: R,
-    unit: &'unit UnitHeader<R>,
-    abbreviations: &'abbrev Abbreviations,
-    cached_current: Option<DebuggingInformationEntry<'abbrev, 'unit, R>>,
-    delta_depth: isize,
-}
-
-impl<'abbrev, 'unit, R: Reader> EntriesCursor<'abbrev, 'unit, R> {
-    /// Get a reference to the entry that the cursor is currently pointing to.
-    ///
-    /// If the cursor is not pointing at an entry, or if the current entry is a
-    /// null entry, then `None` is returned.
-    #[inline]
-    pub fn current(&self) -> Option<&DebuggingInformationEntry<'abbrev, 'unit, R>> {
-        self.cached_current.as_ref()
-    }
-
-    /// Move the cursor to the next DIE in the tree.
-    ///
-    /// Returns `Some` if there is a next entry, even if this entry is null.
-    /// If there is no next entry, then `None` is returned.
-    pub fn next_entry(&mut self) -> Result<Option<()>> {
-        if let Some(ref current) = self.cached_current {
-            self.input = current.after_attrs()?;
-        }
-
-        if self.input.is_empty() {
-            self.cached_current = None;
-            self.delta_depth = 0;
-            return Ok(None);
-        }
-
-        match DebuggingInformationEntry::parse(&mut self.input, self.unit, self.abbreviations) {
-            Ok(Some(entry)) => {
-                self.delta_depth = entry.has_children() as isize;
-                self.cached_current = Some(entry);
-                Ok(Some(()))
-            }
-            Ok(None) => {
-                self.delta_depth = -1;
-                self.cached_current = None;
-                Ok(Some(()))
-            }
-            Err(e) => {
-                self.input.empty();
-                self.delta_depth = 0;
-                self.cached_current = None;
-                Err(e)
-            }
-        }
-    }
-
-    /// Move the cursor to the next DIE in the tree in DFS order.
-    ///
-    /// Upon successful movement of the cursor, return the delta traversal
-    /// depth and the entry:
-    ///
-    ///   * If we moved down into the previous current entry's children, we get
-    ///     `Some((1, entry))`.
-    ///
-    ///   * If we moved to the previous current entry's sibling, we get
-    ///     `Some((0, entry))`.
-    ///
-    ///   * If the previous entry does not have any siblings and we move up to
-    ///     its parent's next sibling, then we get `Some((-1, entry))`. Note that
-    ///     if the parent doesn't have a next sibling, then it could go up to the
-    ///     parent's parent's next sibling and return `Some((-2, entry))`, etc.
-    ///
-    /// If there is no next entry, then `None` is returned.
-    ///
-    /// Here is an example that finds the first entry in a compilation unit that
-    /// does not have any children.
-    ///
-    /// ```
-    /// # use gimli::{DebugAbbrev, DebugInfo, LittleEndian};
-    /// # let info_buf = [
-    /// #     // Comilation unit header
-    /// #
-    /// #     // 32-bit unit length = 25
-    /// #     0x19, 0x00, 0x00, 0x00,
-    /// #     // Version 4
-    /// #     0x04, 0x00,
-    /// #     // debug_abbrev_offset
-    /// #     0x00, 0x00, 0x00, 0x00,
-    /// #     // Address size
-    /// #     0x04,
-    /// #
-    /// #     // DIEs
-    /// #
-    /// #     // Abbreviation code
-    /// #     0x01,
-    /// #     // Attribute of form DW_FORM_string = "foo\0"
-    /// #     0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #       // Children
-    /// #
-    /// #       // Abbreviation code
-    /// #       0x01,
-    /// #       // Attribute of form DW_FORM_string = "foo\0"
-    /// #       0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #         // Children
-    /// #
-    /// #         // Abbreviation code
-    /// #         0x01,
-    /// #         // Attribute of form DW_FORM_string = "foo\0"
-    /// #         0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #           // Children
-    /// #
-    /// #           // End of children
-    /// #           0x00,
-    /// #
-    /// #         // End of children
-    /// #         0x00,
-    /// #
-    /// #       // End of children
-    /// #       0x00,
-    /// # ];
-    /// # let debug_info = DebugInfo::new(&info_buf, LittleEndian);
-    /// #
-    /// # let abbrev_buf = [
-    /// #     // Code
-    /// #     0x01,
-    /// #     // DW_TAG_subprogram
-    /// #     0x2e,
-    /// #     // DW_CHILDREN_yes
-    /// #     0x01,
-    /// #     // Begin attributes
-    /// #       // Attribute name = DW_AT_name
-    /// #       0x03,
-    /// #       // Attribute form = DW_FORM_string
-    /// #       0x08,
-    /// #     // End attributes
-    /// #     0x00,
-    /// #     0x00,
-    /// #     // Null terminator
-    /// #     0x00
-    /// # ];
-    /// # let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
-    /// #
-    /// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
-    ///
-    /// let unit = get_some_unit();
-    /// # let get_abbrevs_for_unit = |_| unit.abbreviations(&debug_abbrev).unwrap();
-    /// let abbrevs = get_abbrevs_for_unit(&unit);
-    ///
-    /// let mut first_entry_with_no_children = None;
-    /// let mut cursor = unit.entries(&abbrevs);
-    ///
-    /// // Move the cursor to the root.
-    /// assert!(cursor.next_dfs().unwrap().is_some());
-    ///
-    /// // Traverse the DIE tree in depth-first search order.
-    /// let mut depth = 0;
-    /// while let Some((delta_depth, current)) = cursor.next_dfs().expect("Should parse next dfs") {
-    ///     // Update depth value, and break out of the loop when we
-    ///     // return to the original starting position.
-    ///     depth += delta_depth;
-    ///     if depth <= 0 {
-    ///         break;
-    ///     }
-    ///
-    ///     first_entry_with_no_children = Some(current.clone());
-    /// }
-    ///
-    /// println!("The first entry with no children is {:?}",
-    ///          first_entry_with_no_children.unwrap());
-    /// ```
-    #[allow(clippy::type_complexity)]
-    pub fn next_dfs(
-        &mut self,
-    ) -> Result<Option<(isize, &DebuggingInformationEntry<'abbrev, 'unit, R>)>> {
-        let mut delta_depth = self.delta_depth;
-        loop {
-            // The next entry should be the one we want.
-            if self.next_entry()?.is_some() {
-                if let Some(ref entry) = self.cached_current {
-                    return Ok(Some((delta_depth, entry)));
-                }
-
-                // next_entry() read a null entry.
-                delta_depth += self.delta_depth;
-            } else {
-                return Ok(None);
-            }
-        }
-    }
-
-    /// Move the cursor to the next sibling DIE of the current one.
-    ///
-    /// Returns `Ok(Some(entry))` when the cursor has been moved to
-    /// the next sibling, `Ok(None)` when there is no next sibling.
-    ///
-    /// The depth of the cursor is never changed if this method returns `Ok`.
-    /// Once `Ok(None)` is returned, this method will continue to return
-    /// `Ok(None)` until either `next_entry` or `next_dfs` is called.
-    ///
-    /// Here is an example that iterates over all of the direct children of the
-    /// root entry:
-    ///
-    /// ```
-    /// # use gimli::{DebugAbbrev, DebugInfo, LittleEndian};
-    /// # let info_buf = [
-    /// #     // Comilation unit header
-    /// #
-    /// #     // 32-bit unit length = 25
-    /// #     0x19, 0x00, 0x00, 0x00,
-    /// #     // Version 4
-    /// #     0x04, 0x00,
-    /// #     // debug_abbrev_offset
-    /// #     0x00, 0x00, 0x00, 0x00,
-    /// #     // Address size
-    /// #     0x04,
-    /// #
-    /// #     // DIEs
-    /// #
-    /// #     // Abbreviation code
-    /// #     0x01,
-    /// #     // Attribute of form DW_FORM_string = "foo\0"
-    /// #     0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #       // Children
-    /// #
-    /// #       // Abbreviation code
-    /// #       0x01,
-    /// #       // Attribute of form DW_FORM_string = "foo\0"
-    /// #       0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #         // Children
-    /// #
-    /// #         // Abbreviation code
-    /// #         0x01,
-    /// #         // Attribute of form DW_FORM_string = "foo\0"
-    /// #         0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #           // Children
-    /// #
-    /// #           // End of children
-    /// #           0x00,
-    /// #
-    /// #         // End of children
-    /// #         0x00,
-    /// #
-    /// #       // End of children
-    /// #       0x00,
-    /// # ];
-    /// # let debug_info = DebugInfo::new(&info_buf, LittleEndian);
-    /// #
-    /// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
-    ///
-    /// # let abbrev_buf = [
-    /// #     // Code
-    /// #     0x01,
-    /// #     // DW_TAG_subprogram
-    /// #     0x2e,
-    /// #     // DW_CHILDREN_yes
-    /// #     0x01,
-    /// #     // Begin attributes
-    /// #       // Attribute name = DW_AT_name
-    /// #       0x03,
-    /// #       // Attribute form = DW_FORM_string
-    /// #       0x08,
-    /// #     // End attributes
-    /// #     0x00,
-    /// #     0x00,
-    /// #     // Null terminator
-    /// #     0x00
-    /// # ];
-    /// # let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
-    /// #
-    /// let unit = get_some_unit();
-    /// # let get_abbrevs_for_unit = |_| unit.abbreviations(&debug_abbrev).unwrap();
-    /// let abbrevs = get_abbrevs_for_unit(&unit);
-    ///
-    /// let mut cursor = unit.entries(&abbrevs);
-    ///
-    /// // Move the cursor to the root.
-    /// assert!(cursor.next_dfs().unwrap().is_some());
-    ///
-    /// // Move the cursor to the root's first child.
-    /// assert!(cursor.next_dfs().unwrap().is_some());
-    ///
-    /// // Iterate the root's children.
-    /// loop {
-    ///     {
-    ///         let current = cursor.current().expect("Should be at an entry");
-    ///         println!("{:?} is a child of the root", current);
-    ///     }
-    ///
-    ///     if cursor.next_sibling().expect("Should parse next sibling").is_none() {
-    ///         break;
-    ///     }
-    /// }
-    /// ```
-    pub fn next_sibling(
-        &mut self,
-    ) -> Result<Option<&DebuggingInformationEntry<'abbrev, 'unit, R>>> {
-        if self.current().is_none() {
-            // We're already at the null for the end of the sibling list.
-            return Ok(None);
-        }
-
-        // Loop until we find an entry at the current level.
-        let mut depth = 0;
-        loop {
-            // Use is_some() and unwrap() to keep borrow checker happy.
-            if self.current().is_some() && self.current().unwrap().has_children() {
-                if let Some(sibling_input) = self.current().unwrap().sibling() {
-                    // Fast path: this entry has a DW_AT_sibling
-                    // attribute pointing to its sibling, so jump
-                    // to it (which keeps us at the same depth).
-                    self.input = sibling_input;
-                    self.cached_current = None;
-                } else {
-                    // This entry has children, so the next entry is
-                    // down one level.
-                    depth += 1;
-                }
-            }
-
-            if self.next_entry()?.is_none() {
-                // End of input.
-                return Ok(None);
-            }
-
-            if depth == 0 {
-                // Found an entry at the current level.
-                return Ok(self.current());
-            }
-
-            if self.current().is_none() {
-                // A null entry means the end of a child list, so we're
-                // back up a level.
-                depth -= 1;
-            }
-        }
-    }
-}
-
-/// The state information for a tree view of the Debugging Information Entries.
-///
-/// The `EntriesTree` can be used to recursively iterate through the DIE
-/// tree, following the parent/child relationships. The `EntriesTree` contains
-/// shared state for all nodes in the tree, avoiding any duplicate parsing of
-/// entries during the traversal.
-///
-/// ## Example Usage
-/// ```rust,no_run
-/// # fn example() -> Result<(), gimli::Error> {
-/// # let debug_info = gimli::DebugInfo::new(&[], gimli::LittleEndian);
-/// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
-/// let unit = get_some_unit();
-/// # let debug_abbrev = gimli::DebugAbbrev::new(&[], gimli::LittleEndian);
-/// # let get_abbrevs_for_unit = |_| unit.abbreviations(&debug_abbrev).unwrap();
-/// let abbrevs = get_abbrevs_for_unit(&unit);
-///
-/// let mut tree = unit.entries_tree(&abbrevs, None)?;
-/// let root = tree.root()?;
-/// process_tree(root)?;
-/// # unreachable!()
-/// # }
-///
-/// fn process_tree<R>(mut node: gimli::EntriesTreeNode<R>) -> gimli::Result<()>
-///     where R: gimli::Reader
-/// {
-///     {
-///         // Examine the entry attributes.
-///         let mut attrs = node.entry().attrs();
-///         while let Some(attr) = attrs.next()? {
-///         }
-///     }
-///     let mut children = node.children();
-///     while let Some(child) = children.next()? {
-///         // Recursively process a child.
-///         process_tree(child);
-///     }
-///     Ok(())
-/// }
-/// ```
-#[derive(Clone, Debug)]
-pub struct EntriesTree<'abbrev, 'unit, R>
-where
-    R: Reader,
-{
-    root: R,
-    unit: &'unit UnitHeader<R>,
-    abbreviations: &'abbrev Abbreviations,
-    input: R,
-    entry: Option<DebuggingInformationEntry<'abbrev, 'unit, R>>,
-    depth: isize,
-}
-
-impl<'abbrev, 'unit, R: Reader> EntriesTree<'abbrev, 'unit, R> {
-    fn new(root: R, unit: &'unit UnitHeader<R>, abbreviations: &'abbrev Abbreviations) -> Self {
-        let input = root.clone();
-        EntriesTree {
-            root,
-            unit,
-            abbreviations,
-            input,
-            entry: None,
-            depth: 0,
-        }
-    }
-
-    /// Returns the root node of the tree.
-    pub fn root<'me>(&'me mut self) -> Result<EntriesTreeNode<'abbrev, 'unit, 'me, R>> {
-        self.input = self.root.clone();
-        self.entry =
-            DebuggingInformationEntry::parse(&mut self.input, self.unit, self.abbreviations)?;
-        if self.entry.is_none() {
-            return Err(Error::UnexpectedNull);
-        }
-        self.depth = 0;
-        Ok(EntriesTreeNode::new(self, 1))
-    }
-
-    /// Move the cursor to the next entry at the specified depth.
-    ///
-    /// Requires `depth <= self.depth + 1`.
-    ///
-    /// Returns `true` if successful.
-    fn next(&mut self, depth: isize) -> Result<bool> {
-        if self.depth < depth {
-            debug_assert_eq!(self.depth + 1, depth);
-
-            match self.entry {
-                Some(ref entry) => {
-                    if !entry.has_children() {
-                        return Ok(false);
-                    }
-                    self.depth += 1;
-                    self.input = entry.after_attrs()?;
-                }
-                None => return Ok(false),
-            }
-
-            if self.input.is_empty() {
-                self.entry = None;
-                return Ok(false);
-            }
-
-            return match DebuggingInformationEntry::parse(
-                &mut self.input,
-                self.unit,
-                self.abbreviations,
-            ) {
-                Ok(entry) => {
-                    self.entry = entry;
-                    Ok(self.entry.is_some())
-                }
-                Err(e) => {
-                    self.input.empty();
-                    self.entry = None;
-                    Err(e)
-                }
-            };
-        }
-
-        loop {
-            match self.entry {
-                Some(ref entry) => {
-                    if entry.has_children() {
-                        if let Some(sibling_input) = entry.sibling() {
-                            // Fast path: this entry has a DW_AT_sibling
-                            // attribute pointing to its sibling, so jump
-                            // to it (which keeps us at the same depth).
-                            self.input = sibling_input;
-                        } else {
-                            // This entry has children, so the next entry is
-                            // down one level.
-                            self.depth += 1;
-                            self.input = entry.after_attrs()?;
-                        }
-                    } else {
-                        // This entry has no children, so next entry is at same depth.
-                        self.input = entry.after_attrs()?;
-                    }
-                }
-                None => {
-                    // This entry is a null, so next entry is up one level.
-                    self.depth -= 1;
-                }
-            }
-
-            if self.input.is_empty() {
-                self.entry = None;
-                return Ok(false);
-            }
-
-            match DebuggingInformationEntry::parse(&mut self.input, self.unit, self.abbreviations) {
-                Ok(entry) => {
-                    self.entry = entry;
-                    if self.depth == depth {
-                        return Ok(self.entry.is_some());
-                    }
-                }
-                Err(e) => {
-                    self.input.empty();
-                    self.entry = None;
-                    return Err(e);
-                }
-            }
-        }
-    }
-}
-
-/// A node in the Debugging Information Entry tree.
-///
-/// The root node of a tree can be obtained
-/// via [`EntriesTree::root`](./struct.EntriesTree.html#method.root).
-#[derive(Debug)]
-pub struct EntriesTreeNode<'abbrev, 'unit, 'tree, R: Reader> {
-    tree: &'tree mut EntriesTree<'abbrev, 'unit, R>,
-    depth: isize,
-}
-
-impl<'abbrev, 'unit, 'tree, R: Reader> EntriesTreeNode<'abbrev, 'unit, 'tree, R> {
-    fn new(
-        tree: &'tree mut EntriesTree<'abbrev, 'unit, R>,
-        depth: isize,
-    ) -> EntriesTreeNode<'abbrev, 'unit, 'tree, R> {
-        debug_assert!(tree.entry.is_some());
-        EntriesTreeNode { tree, depth }
-    }
-
-    /// Returns the current entry in the tree.
-    pub fn entry(&self) -> &DebuggingInformationEntry<'abbrev, 'unit, R> {
-        // We never create a node without an entry.
-        self.tree.entry.as_ref().unwrap()
-    }
-
-    /// Create an iterator for the children of the current entry.
-    ///
-    /// The current entry can no longer be accessed after creating the
-    /// iterator.
-    pub fn children(self) -> EntriesTreeIter<'abbrev, 'unit, 'tree, R> {
-        EntriesTreeIter::new(self.tree, self.depth)
-    }
-}
-
-/// An iterator that allows traversal of the children of an
-/// `EntriesTreeNode`.
-///
-/// The items returned by this iterator are also `EntriesTreeNode`s,
-/// which allow recursive traversal of grandchildren, etc.
-#[derive(Debug)]
-pub struct EntriesTreeIter<'abbrev, 'unit, 'tree, R: Reader> {
-    tree: &'tree mut EntriesTree<'abbrev, 'unit, R>,
-    depth: isize,
-    empty: bool,
-}
-
-impl<'abbrev, 'unit, 'tree, R: Reader> EntriesTreeIter<'abbrev, 'unit, 'tree, R> {
-    fn new(
-        tree: &'tree mut EntriesTree<'abbrev, 'unit, R>,
-        depth: isize,
-    ) -> EntriesTreeIter<'abbrev, 'unit, 'tree, R> {
-        EntriesTreeIter {
-            tree,
-            depth,
-            empty: false,
-        }
-    }
-
-    /// Returns an `EntriesTreeNode` for the next child entry.
-    ///
-    /// Returns `None` if there are no more children.
-    pub fn next<'me>(&'me mut self) -> Result<Option<EntriesTreeNode<'abbrev, 'unit, 'me, R>>> {
-        if self.empty {
-            Ok(None)
-        } else if self.tree.next(self.depth)? {
-            Ok(Some(EntriesTreeNode::new(self.tree, self.depth + 1)))
-        } else {
-            self.empty = true;
-            Ok(None)
-        }
-    }
-}
-
-/// Parse a type unit header's unique type signature. Callers should handle
-/// unique-ness checking.
-fn parse_type_signature<R: Reader>(input: &mut R) -> Result<DebugTypeSignature> {
-    input.read_u64().map(DebugTypeSignature)
-}
-
-/// Parse a type unit header's type offset.
-fn parse_type_offset<R: Reader>(input: &mut R, format: Format) -> Result<UnitOffset<R::Offset>> {
-    input.read_offset(format).map(UnitOffset)
-}
-
-/// The `DebugTypes` struct represents the DWARF type information
-/// found in the `.debug_types` section.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct DebugTypes<R> {
-    debug_types_section: R,
-}
-
-impl<'input, Endian> DebugTypes<EndianSlice<'input, Endian>>
-where
-    Endian: Endianity,
-{
-    /// Construct a new `DebugTypes` instance from the data in the `.debug_types`
-    /// section.
-    ///
-    /// It is the caller's responsibility to read the `.debug_types` section and
-    /// present it as a `&[u8]` slice. That means using some ELF loader on
-    /// Linux, a Mach-O loader on OSX, etc.
-    ///
-    /// ```
-    /// use gimli::{DebugTypes, LittleEndian};
-    ///
-    /// # let buf = [0x00, 0x01, 0x02, 0x03];
-    /// # let read_debug_types_section_somehow = || &buf;
-    /// let debug_types = DebugTypes::new(read_debug_types_section_somehow(), LittleEndian);
-    /// ```
-    pub fn new(debug_types_section: &'input [u8], endian: Endian) -> Self {
-        Self::from(EndianSlice::new(debug_types_section, endian))
-    }
-}
-
-impl<T> DebugTypes<T> {
-    /// Create a `DebugTypes` section that references the data in `self`.
-    ///
-    /// This is useful when `R` implements `Reader` but `T` does not.
-    ///
-    /// ## Example Usage
-    ///
-    /// ```rust,no_run
-    /// # let load_section = || unimplemented!();
-    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
-    /// let owned_section: gimli::DebugTypes<Vec<u8>> = load_section();
-    /// // Create a reference to the DWARF section.
-    /// let section = owned_section.borrow(|section| {
-    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
-    /// });
-    /// ```
-    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugTypes<R>
-    where
-        F: FnMut(&'a T) -> R,
-    {
-        borrow(&self.debug_types_section).into()
-    }
-}
-
-impl<R> Section<R> for DebugTypes<R> {
-    fn id() -> SectionId {
-        SectionId::DebugTypes
-    }
-
-    fn reader(&self) -> &R {
-        &self.debug_types_section
-    }
-}
-
-impl<R> From<R> for DebugTypes<R> {
-    fn from(debug_types_section: R) -> Self {
-        DebugTypes {
-            debug_types_section,
-        }
-    }
-}
-
-impl<R: Reader> DebugTypes<R> {
-    /// Iterate the type-units in this `.debug_types` section.
-    ///
-    /// ```
-    /// use gimli::{DebugTypes, LittleEndian};
-    ///
-    /// # let buf = [];
-    /// # let read_debug_types_section_somehow = || &buf;
-    /// let debug_types = DebugTypes::new(read_debug_types_section_somehow(), LittleEndian);
-    ///
-    /// let mut iter = debug_types.units();
-    /// while let Some(unit) = iter.next().unwrap() {
-    ///     println!("unit's length is {}", unit.unit_length());
-    /// }
-    /// ```
-    ///
-    /// Can be [used with
-    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
-    pub fn units(&self) -> TypeUnitHeadersIter<R> {
-        TypeUnitHeadersIter {
-            input: self.debug_types_section.clone(),
-            offset: DebugTypesOffset(R::Offset::from_u8(0)),
-        }
-    }
-}
-
-/// An iterator over the type-units of this `.debug_types` section.
-///
-/// See the [documentation on
-/// `DebugTypes::units`](./struct.DebugTypes.html#method.units) for
-/// more detail.
-#[derive(Clone, Debug)]
-pub struct TypeUnitHeadersIter<R: Reader> {
-    input: R,
-    offset: DebugTypesOffset<R::Offset>,
-}
-
-impl<R: Reader> TypeUnitHeadersIter<R> {
-    /// Advance the iterator to the next type unit header.
-    pub fn next(&mut self) -> Result<Option<TypeUnitHeader<R>>> {
-        if self.input.is_empty() {
-            Ok(None)
-        } else {
-            let len = self.input.len();
-            match parse_type_unit_header(&mut self.input, self.offset) {
-                Ok(header) => {
-                    self.offset.0 += len - self.input.len();
-                    Ok(Some(header))
-                }
-                Err(e) => {
-                    self.input.empty();
-                    Err(e)
-                }
-            }
-        }
-    }
-}
-
-#[cfg(feature = "fallible-iterator")]
-impl<R: Reader> fallible_iterator::FallibleIterator for TypeUnitHeadersIter<R> {
-    type Item = TypeUnitHeader<R>;
-    type Error = Error;
-
-    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
-        TypeUnitHeadersIter::next(self)
-    }
-}
-
-/// The header of a type unit's debugging information.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct TypeUnitHeader<R, Offset = <R as Reader>::Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    header: UnitHeader<R, Offset>,
-    offset: DebugTypesOffset<Offset>,
-    type_signature: DebugTypeSignature,
-    type_offset: UnitOffset<Offset>,
-}
-
-impl<R, Offset> TypeUnitHeader<R, Offset>
-where
-    R: Reader<Offset = Offset>,
-    Offset: ReaderOffset,
-{
-    /// Construct a new `TypeUnitHeader`.
-    fn new(
-        header: UnitHeader<R>,
-        offset: DebugTypesOffset<R::Offset>,
-        type_signature: DebugTypeSignature,
-        type_offset: UnitOffset<R::Offset>,
-    ) -> Self {
-        TypeUnitHeader {
-            header,
-            offset,
-            type_signature,
-            type_offset,
-        }
-    }
-
-    /// Return the `UnitHeader` containing common unit fields.
-    pub fn header(self) -> UnitHeader<R, Offset> {
-        self.header
-    }
-
-    /// Return the serialized size of the type-unit header for the given
-    /// DWARF format.
-    pub fn size_of_header(encoding: Encoding) -> usize {
-        let unit_header_size = UnitHeader::<R, _>::size_of_header(encoding);
-        let type_signature_size = 8;
-        let type_offset_size = encoding.format.word_size() as usize;
-        unit_header_size + type_signature_size + type_offset_size
-    }
-
-    /// Get the offset of this compilation unit within the .debug_info section.
-    pub fn offset(&self) -> DebugTypesOffset<R::Offset> {
-        self.offset
-    }
-
-    /// Get the length of the debugging info for this type-unit.
-    pub fn unit_length(&self) -> R::Offset {
-        self.header.unit_length
-    }
-
-    /// Get the length of the debugging info for this type-unit,
-    /// including the byte length of the encoded length itself.
-    pub fn length_including_self(&self) -> R::Offset {
-        self.header.length_including_self()
-    }
-
-    /// Return the encoding parameters for this unit.
-    pub fn encoding(&self) -> Encoding {
-        self.header.encoding
-    }
-
-    /// Get the DWARF version of the debugging info for this type-unit.
-    pub fn version(&self) -> u16 {
-        self.header.version()
-    }
-
-    /// The offset into the `.debug_abbrev` section for this type-unit's
-    /// debugging information entries.
-    pub fn debug_abbrev_offset(&self) -> DebugAbbrevOffset<R::Offset> {
-        self.header.debug_abbrev_offset
-    }
-
-    /// The size of addresses (in bytes) in this type-unit.
-    pub fn address_size(&self) -> u8 {
-        self.header.address_size()
-    }
-
-    /// Whether this type unit is encoded in 64- or 32-bit DWARF.
-    pub fn format(&self) -> Format {
-        self.header.format()
-    }
-
-    /// The serialized size of the header for this type-unit.
-    pub fn header_size(&self) -> R::Offset {
-        self.header.header_size()
-    }
-
-    /// Get the unique type signature for this type unit.
-    pub fn type_signature(&self) -> DebugTypeSignature {
-        self.type_signature
-    }
-
-    /// Get the offset within this type unit where the type is defined.
-    pub fn type_offset(&self) -> UnitOffset<R::Offset> {
-        self.type_offset
-    }
-
-    /// Navigate this type unit's `DebuggingInformationEntry`s.
-    pub fn entries<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-    ) -> EntriesCursor<'abbrev, 'me, R> {
-        self.header.entries(abbreviations)
-    }
-
-    /// Navigate this type unit's `DebuggingInformationEntry`s
-    /// starting at the given offset.
-    pub fn entries_at_offset<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: UnitOffset<R::Offset>,
-    ) -> Result<EntriesCursor<'abbrev, 'me, R>> {
-        self.header.entries_at_offset(abbreviations, offset)
-    }
-
-    /// Navigate this type unit's `DebuggingInformationEntry`s as a tree
-    /// starting at the given offset.
-    pub fn entries_tree<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: Option<UnitOffset<R::Offset>>,
-    ) -> Result<EntriesTree<'abbrev, 'me, R>> {
-        self.header.entries_tree(abbreviations, offset)
-    }
-
-    /// Read the raw data that defines the Debugging Information Entries.
-    pub fn entries_raw<'me, 'abbrev>(
-        &'me self,
-        abbreviations: &'abbrev Abbreviations,
-        offset: Option<UnitOffset<R::Offset>>,
-    ) -> Result<EntriesRaw<'abbrev, 'me, R>> {
-        self.header.entries_raw(abbreviations, offset)
-    }
-
-    /// Parse this type unit's abbreviations.
-    ///
-    /// ```
-    /// use gimli::DebugAbbrev;
-    /// # use gimli::{DebugTypes, LittleEndian};
-    /// # let types_buf = [
-    /// #     // Type unit header
-    /// #
-    /// #     // 32-bit unit length = 37
-    /// #     0x25, 0x00, 0x00, 0x00,
-    /// #     // Version 4
-    /// #     0x04, 0x00,
-    /// #     // debug_abbrev_offset
-    /// #     0x00, 0x00, 0x00, 0x00,
-    /// #     // Address size
-    /// #     0x04,
-    /// #     // Type signature
-    /// #     0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-    /// #     // Type offset
-    /// #     0x01, 0x02, 0x03, 0x04,
-    /// #
-    /// #     // DIEs
-    /// #
-    /// #     // Abbreviation code
-    /// #     0x01,
-    /// #     // Attribute of form DW_FORM_string = "foo\0"
-    /// #     0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #       // Children
-    /// #
-    /// #       // Abbreviation code
-    /// #       0x01,
-    /// #       // Attribute of form DW_FORM_string = "foo\0"
-    /// #       0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #         // Children
-    /// #
-    /// #         // Abbreviation code
-    /// #         0x01,
-    /// #         // Attribute of form DW_FORM_string = "foo\0"
-    /// #         0x66, 0x6f, 0x6f, 0x00,
-    /// #
-    /// #           // Children
-    /// #
-    /// #           // End of children
-    /// #           0x00,
-    /// #
-    /// #         // End of children
-    /// #         0x00,
-    /// #
-    /// #       // End of children
-    /// #       0x00,
-    /// # ];
-    /// # let debug_types = DebugTypes::new(&types_buf, LittleEndian);
-    /// #
-    /// # let abbrev_buf = [
-    /// #     // Code
-    /// #     0x01,
-    /// #     // DW_TAG_subprogram
-    /// #     0x2e,
-    /// #     // DW_CHILDREN_yes
-    /// #     0x01,
-    /// #     // Begin attributes
-    /// #       // Attribute name = DW_AT_name
-    /// #       0x03,
-    /// #       // Attribute form = DW_FORM_string
-    /// #       0x08,
-    /// #     // End attributes
-    /// #     0x00,
-    /// #     0x00,
-    /// #     // Null terminator
-    /// #     0x00
-    /// # ];
-    /// #
-    /// # let get_some_type_unit = || debug_types.units().next().unwrap().unwrap();
-    ///
-    /// let unit = get_some_type_unit();
-    ///
-    /// # let read_debug_abbrev_section_somehow = || &abbrev_buf;
-    /// let debug_abbrev = DebugAbbrev::new(read_debug_abbrev_section_somehow(), LittleEndian);
-    /// let abbrevs_for_unit = unit.abbreviations(&debug_abbrev).unwrap();
-    /// ```
-    pub fn abbreviations(&self, debug_abbrev: &DebugAbbrev<R>) -> Result<Abbreviations> {
-        self.header.abbreviations(debug_abbrev)
-    }
-}
-
-/// Parse a type unit header.
-fn parse_type_unit_header<R: Reader>(
-    input: &mut R,
-    offset: DebugTypesOffset<R::Offset>,
-) -> Result<TypeUnitHeader<R>> {
-    let mut header = parse_unit_header(input)?;
-    let format = header.format();
-    let signature = parse_type_signature(&mut header.entries_buf)?;
-    let type_offset = parse_type_offset(&mut header.entries_buf, format)?;
-    Ok(TypeUnitHeader::new(header, offset, signature, type_offset))
-}
-
-#[cfg(test)]
-// Tests require leb128::write.
-#[cfg(feature = "write")]
-mod tests {
-    use super::*;
-    use crate::constants;
-    use crate::constants::*;
-    use crate::endianity::{Endianity, LittleEndian};
-    use crate::leb128;
-    use crate::read::abbrev::tests::AbbrevSectionMethods;
-    use crate::read::{
-        Abbreviation, AttributeSpecification, DebugAbbrev, EndianSlice, Error, Result,
-    };
-    use crate::test_util::GimliSectionMethods;
-    use alloc::vec::Vec;
-    use core::cell::Cell;
-    use test_assembler::{Endian, Label, LabelMaker, Section};
-
-    // Mixin methods for `Section` to help define binary test data.
-
-    trait UnitSectionMethods {
-        fn comp_unit<'input, E>(
-            self,
-            unit: &mut CompilationUnitHeader<EndianSlice<'input, E>>,
-        ) -> Self
-        where
-            E: Endianity;
-        fn type_unit<'input, E>(self, unit: &mut TypeUnitHeader<EndianSlice<'input, E>>) -> Self
-        where
-            E: Endianity;
-        fn unit<'input, E>(
-            self,
-            unit: &mut UnitHeader<EndianSlice<'input, E>>,
-            extra_header: &[u8],
-        ) -> Self
-        where
-            E: Endianity;
-        fn die<F>(self, code: u64, attr: F) -> Self
-        where
-            F: Fn(Section) -> Section;
-        fn die_null(self) -> Self;
-        fn attr_string(self, s: &str) -> Self;
-        fn attr_ref1(self, o: u8) -> Self;
-        fn offset(self, offset: usize, format: Format) -> Self;
-    }
-
-    impl UnitSectionMethods for Section {
-        fn comp_unit<'input, E>(
-            self,
-            unit: &mut CompilationUnitHeader<EndianSlice<'input, E>>,
-        ) -> Self
-        where
-            E: Endianity,
-        {
-            unit.offset = DebugInfoOffset(self.size() as usize);
-            self.unit(&mut unit.header, &[])
-        }
-
-        fn type_unit<'input, E>(self, unit: &mut TypeUnitHeader<EndianSlice<'input, E>>) -> Self
-        where
-            E: Endianity,
-        {
-            unit.offset = DebugTypesOffset(self.size() as usize);
-            let section = Section::with_endian(Endian::Little)
-                .L64(unit.type_signature.0)
-                .offset(unit.type_offset.0, unit.header.format());
-            let extra_header = section.get_contents().unwrap();
-            self.unit(&mut unit.header, &extra_header)
-        }
-
-        fn unit<'input, E>(
-            self,
-            unit: &mut UnitHeader<EndianSlice<'input, E>>,
-            extra_header: &[u8],
-        ) -> Self
-        where
-            E: Endianity,
-        {
-            let length = Label::new();
-            let start = Label::new();
-            let end = Label::new();
-
-            let section = match unit.format() {
-                Format::Dwarf32 => self.L32(&length),
-                Format::Dwarf64 => self.L32(0xffff_ffff).L64(&length),
-            };
-
-            let section = match unit.version() {
-                2 | 3 | 4 => section
-                    .mark(&start)
-                    .L16(unit.version())
-                    .offset(unit.debug_abbrev_offset.0, unit.format())
-                    .D8(unit.address_size())
-                    .append_bytes(extra_header)
-                    .append_bytes(unit.entries_buf.into())
-                    .mark(&end),
-                5 => section
-                    .mark(&start)
-                    .L16(unit.version())
-                    .D8(constants::DW_UT_compile.0)
-                    .D8(unit.address_size())
-                    .offset(unit.debug_abbrev_offset.0, unit.format())
-                    .append_bytes(extra_header)
-                    .append_bytes(unit.entries_buf.into())
-                    .mark(&end),
-                _ => unreachable!(),
-            };
-
-            unit.unit_length = (&end - &start) as usize;
-            length.set_const(unit.unit_length as u64);
-
-            section
-        }
-
-        fn die<F>(self, code: u64, attr: F) -> Self
-        where
-            F: Fn(Section) -> Section,
-        {
-            let section = self.uleb(code);
-            attr(section)
-        }
-
-        fn die_null(self) -> Self {
-            self.D8(0)
-        }
-
-        fn attr_string(self, attr: &str) -> Self {
-            self.append_bytes(attr.as_bytes()).D8(0)
-        }
-
-        fn attr_ref1(self, attr: u8) -> Self {
-            self.D8(attr)
-        }
-
-        fn offset(self, offset: usize, format: Format) -> Self {
-            match format {
-                Format::Dwarf32 => self.L32(offset as u32),
-                Format::Dwarf64 => self.L64(offset as u64),
-            }
-        }
-    }
-
-    #[test]
-    fn test_parse_debug_abbrev_offset_32() {
-        let section = Section::with_endian(Endian::Little).L32(0x0403_0201);
-        let buf = section.get_contents().unwrap();
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_debug_abbrev_offset(buf, Format::Dwarf32) {
-            Ok(val) => assert_eq!(val, DebugAbbrevOffset(0x0403_0201)),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_debug_abbrev_offset_32_incomplete() {
-        let buf = [0x01, 0x02];
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_debug_abbrev_offset(buf, Format::Dwarf32) {
-            Err(Error::UnexpectedEof(_)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_debug_abbrev_offset_64() {
-        let section = Section::with_endian(Endian::Little).L64(0x0807_0605_0403_0201);
-        let buf = section.get_contents().unwrap();
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_debug_abbrev_offset(buf, Format::Dwarf64) {
-            Ok(val) => assert_eq!(val, DebugAbbrevOffset(0x0807_0605_0403_0201)),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_debug_abbrev_offset_64_incomplete() {
-        let buf = [0x01, 0x02];
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_debug_abbrev_offset(buf, Format::Dwarf64) {
-            Err(Error::UnexpectedEof(_)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_debug_info_offset_32() {
-        let section = Section::with_endian(Endian::Little).L32(0x0403_0201);
-        let buf = section.get_contents().unwrap();
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_debug_info_offset(buf, Format::Dwarf32) {
-            Ok(val) => assert_eq!(val, DebugInfoOffset(0x0403_0201)),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_debug_info_offset_32_incomplete() {
-        let buf = [0x01, 0x02];
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_debug_info_offset(buf, Format::Dwarf32) {
-            Err(Error::UnexpectedEof(_)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_debug_info_offset_64() {
-        let section = Section::with_endian(Endian::Little).L64(0x0807_0605_0403_0201);
-        let buf = section.get_contents().unwrap();
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_debug_info_offset(buf, Format::Dwarf64) {
-            Ok(val) => assert_eq!(val, DebugInfoOffset(0x0807_0605_0403_0201)),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_debug_info_offset_64_incomplete() {
-        let buf = [0x01, 0x02];
-        let buf = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_debug_info_offset(buf, Format::Dwarf64) {
-            Err(Error::UnexpectedEof(_)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_units() {
-        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let mut unit64 = CompilationUnitHeader {
-            header: UnitHeader {
-                encoding: Encoding {
-                    format: Format::Dwarf64,
-                    version: 4,
-                    address_size: 8,
-                },
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
-                entries_buf: EndianSlice::new(expected_rest, LittleEndian),
-            },
-            offset: DebugInfoOffset(0),
-        };
-        let mut unit32 = CompilationUnitHeader {
-            header: UnitHeader {
-                encoding: Encoding {
-                    format: Format::Dwarf32,
-                    version: 4,
-                    address_size: 4,
-                },
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
-                entries_buf: EndianSlice::new(expected_rest, LittleEndian),
-            },
-            offset: DebugInfoOffset(0),
-        };
-        let section = Section::with_endian(Endian::Little)
-            .comp_unit(&mut unit64)
-            .comp_unit(&mut unit32);
-        let buf = section.get_contents().unwrap();
-
-        let debug_info = DebugInfo::new(&buf, LittleEndian);
-        let mut units = debug_info.units();
-
-        assert_eq!(units.next(), Ok(Some(unit64)));
-        assert_eq!(units.next(), Ok(Some(unit32)));
-        assert_eq!(units.next(), Ok(None));
-    }
-
-    #[test]
-    fn test_unit_version_unknown_version() {
-        let buf = [0x02, 0x00, 0x00, 0x00, 0xab, 0xcd];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_unit_header(rest) {
-            Err(Error::UnknownVersion(0xcdab)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-
-        let buf = [0x02, 0x00, 0x00, 0x00, 0x1, 0x0];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_unit_header(rest) {
-            Err(Error::UnknownVersion(1)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_unit_version_incomplete() {
-        let buf = [0x01, 0x00, 0x00, 0x00, 0x04];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_unit_header(rest) {
-            Err(Error::UnexpectedEof(_)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_unit_header_32_ok() {
-        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut expected_unit = UnitHeader {
-            encoding,
-            unit_length: 0,
-            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
-            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
-        };
-        let section = Section::with_endian(Endian::Little)
-            .unit(&mut expected_unit, &[])
-            .append_bytes(expected_rest);
-        let buf = section.get_contents().unwrap();
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        assert_eq!(parse_unit_header(rest), Ok(expected_unit));
-        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_unit_header_64_ok() {
-        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let encoding = Encoding {
-            format: Format::Dwarf64,
-            version: 4,
-            address_size: 8,
-        };
-        let mut expected_unit = UnitHeader {
-            encoding,
-            unit_length: 0,
-            debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
-            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
-        };
-        let section = Section::with_endian(Endian::Little)
-            .unit(&mut expected_unit, &[])
-            .append_bytes(expected_rest);
-        let buf = section.get_contents().unwrap();
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        assert_eq!(parse_unit_header(rest), Ok(expected_unit));
-        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_v5_unit_header_32_ok() {
-        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 5,
-            address_size: 4,
-        };
-        let mut expected_unit = UnitHeader {
-            encoding,
-            unit_length: 0,
-            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
-            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
-        };
-        let section = Section::with_endian(Endian::Little)
-            .unit(&mut expected_unit, &[])
-            .append_bytes(expected_rest);
-        let buf = section.get_contents().unwrap();
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        assert_eq!(parse_unit_header(rest), Ok(expected_unit));
-        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_v5_unit_header_64_ok() {
-        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let encoding = Encoding {
-            format: Format::Dwarf64,
-            version: 5,
-            address_size: 8,
-        };
-        let mut expected_unit = UnitHeader {
-            encoding,
-            unit_length: 0,
-            debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
-            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
-        };
-        let section = Section::with_endian(Endian::Little)
-            .unit(&mut expected_unit, &[])
-            .append_bytes(expected_rest);
-        let buf = section.get_contents().unwrap();
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        assert_eq!(parse_unit_header(rest), Ok(expected_unit));
-        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
-    }
-
-    #[test]
-    fn test_parse_type_offset_32_ok() {
-        let buf = [0x12, 0x34, 0x56, 0x78, 0x00];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_type_offset(rest, Format::Dwarf32) {
-            Ok(offset) => {
-                assert_eq!(rest.len(), 1);
-                assert_eq!(UnitOffset(0x7856_3412), offset);
-            }
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_type_offset_64_ok() {
-        let buf = [0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xff, 0x00];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_type_offset(rest, Format::Dwarf64) {
-            Ok(offset) => {
-                assert_eq!(rest.len(), 1);
-                assert_eq!(UnitOffset(0xffde_bc9a_7856_3412), offset);
-            }
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        }
-    }
-
-    #[test]
-    fn test_parse_type_offset_incomplete() {
-        // Need at least 4 bytes.
-        let buf = [0xff, 0xff, 0xff];
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        match parse_type_offset(rest, Format::Dwarf32) {
-            Err(Error::UnexpectedEof(_)) => assert!(true),
-            otherwise => panic!("Unexpected result: {:?}", otherwise),
-        };
-    }
-
-    #[test]
-    fn test_parse_type_unit_header_32_ok() {
-        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 8,
-        };
-        let mut expected_unit = TypeUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
-                entries_buf: EndianSlice::new(expected_rest, LittleEndian),
-            },
-            offset: DebugTypesOffset(0),
-            type_signature: DebugTypeSignature(0xdead_beef_dead_beef),
-            type_offset: UnitOffset(0x7856_3412),
-        };
-        let section = Section::with_endian(Endian::Little)
-            .type_unit(&mut expected_unit)
-            .append_bytes(expected_rest);
-        let buf = section.get_contents().unwrap();
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        assert_eq!(
-            parse_type_unit_header(rest, DebugTypesOffset(0)),
-            Ok(expected_unit)
-        );
-        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_type_unit_header_64_ok() {
-        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
-        let encoding = Encoding {
-            format: Format::Dwarf64,
-            version: 4,
-            address_size: 8,
-        };
-        let mut expected_unit = TypeUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
-                entries_buf: EndianSlice::new(expected_rest, LittleEndian),
-            },
-            offset: DebugTypesOffset(0),
-            type_signature: DebugTypeSignature(0xdead_beef_dead_beef),
-            type_offset: UnitOffset(0x7856_3412_7856_3412),
-        };
-        let section = Section::with_endian(Endian::Little)
-            .type_unit(&mut expected_unit)
-            .append_bytes(expected_rest);
-        let buf = section.get_contents().unwrap();
-        let rest = &mut EndianSlice::new(&buf, LittleEndian);
-
-        assert_eq!(
-            parse_type_unit_header(rest, DebugTypesOffset(0)),
-            Ok(expected_unit)
-        );
-        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
-    }
-
-    fn section_contents<F>(f: F) -> Vec<u8>
-    where
-        F: Fn(Section) -> Section,
-    {
-        f(Section::with_endian(Endian::Little))
-            .get_contents()
-            .unwrap()
-    }
-
-    #[test]
-    fn test_attribute_value() {
-        let mut unit = test_parse_attribute_unit_default();
-        let endian = unit.entries_buf.endian();
-
-        let block_data = &[1, 2, 3, 4];
-        let buf = section_contents(|s| s.uleb(block_data.len() as u64).append_bytes(block_data));
-        let block = EndianSlice::new(&buf, endian);
-
-        let buf = section_contents(|s| s.L32(0x0102_0304));
-        let data4 = EndianSlice::new(&buf, endian);
-
-        let buf = section_contents(|s| s.L64(0x0102_0304_0506_0708));
-        let data8 = EndianSlice::new(&buf, endian);
-
-        let tests = [
-            (
-                Format::Dwarf32,
-                2,
-                constants::DW_AT_data_member_location,
-                constants::DW_FORM_block,
-                block,
-                AttributeValue::Block(EndianSlice::new(block_data, endian)),
-                AttributeValue::Exprloc(Expression(EndianSlice::new(block_data, endian))),
-            ),
-            (
-                Format::Dwarf32,
-                2,
-                constants::DW_AT_data_member_location,
-                constants::DW_FORM_data4,
-                data4,
-                AttributeValue::SecOffset(0x0102_0304),
-                AttributeValue::LocationListsRef(LocationListsOffset(0x0102_0304)),
-            ),
-            (
-                Format::Dwarf64,
-                2,
-                constants::DW_AT_data_member_location,
-                constants::DW_FORM_data4,
-                data4,
-                AttributeValue::Data4(0x0102_0304),
-                AttributeValue::Udata(0x0102_0304),
-            ),
-            (
-                Format::Dwarf32,
-                4,
-                constants::DW_AT_data_member_location,
-                constants::DW_FORM_data4,
-                data4,
-                AttributeValue::Data4(0x0102_0304),
-                AttributeValue::Udata(0x0102_0304),
-            ),
-            (
-                Format::Dwarf32,
-                2,
-                constants::DW_AT_data_member_location,
-                constants::DW_FORM_data8,
-                data8,
-                AttributeValue::Data8(0x0102_0304_0506_0708),
-                AttributeValue::Udata(0x0102_0304_0506_0708),
-            ),
-            #[cfg(target_pointer_width = "64")]
-            (
-                Format::Dwarf64,
-                2,
-                constants::DW_AT_data_member_location,
-                constants::DW_FORM_data8,
-                data8,
-                AttributeValue::SecOffset(0x0102_0304_0506_0708),
-                AttributeValue::LocationListsRef(LocationListsOffset(0x0102_0304_0506_0708)),
-            ),
-            (
-                Format::Dwarf64,
-                4,
-                constants::DW_AT_data_member_location,
-                constants::DW_FORM_data8,
-                data8,
-                AttributeValue::Data8(0x0102_0304_0506_0708),
-                AttributeValue::Udata(0x0102_0304_0506_0708),
-            ),
-            (
-                Format::Dwarf32,
-                4,
-                constants::DW_AT_location,
-                constants::DW_FORM_data4,
-                data4,
-                AttributeValue::SecOffset(0x0102_0304),
-                AttributeValue::LocationListsRef(LocationListsOffset(0x0102_0304)),
-            ),
-            #[cfg(target_pointer_width = "64")]
-            (
-                Format::Dwarf64,
-                4,
-                constants::DW_AT_location,
-                constants::DW_FORM_data8,
-                data8,
-                AttributeValue::SecOffset(0x0102_0304_0506_0708),
-                AttributeValue::LocationListsRef(LocationListsOffset(0x0102_0304_0506_0708)),
-            ),
-            (
-                Format::Dwarf32,
-                4,
-                constants::DW_AT_str_offsets_base,
-                constants::DW_FORM_sec_offset,
-                data4,
-                AttributeValue::SecOffset(0x0102_0304),
-                AttributeValue::DebugStrOffsetsBase(DebugStrOffsetsBase(0x0102_0304)),
-            ),
-            (
-                Format::Dwarf32,
-                4,
-                constants::DW_AT_stmt_list,
-                constants::DW_FORM_sec_offset,
-                data4,
-                AttributeValue::SecOffset(0x0102_0304),
-                AttributeValue::DebugLineRef(DebugLineOffset(0x0102_0304)),
-            ),
-            (
-                Format::Dwarf32,
-                4,
-                constants::DW_AT_addr_base,
-                constants::DW_FORM_sec_offset,
-                data4,
-                AttributeValue::SecOffset(0x0102_0304),
-                AttributeValue::DebugAddrBase(DebugAddrBase(0x0102_0304)),
-            ),
-            (
-                Format::Dwarf32,
-                4,
-                constants::DW_AT_rnglists_base,
-                constants::DW_FORM_sec_offset,
-                data4,
-                AttributeValue::SecOffset(0x0102_0304),
-                AttributeValue::DebugRngListsBase(DebugRngListsBase(0x0102_0304)),
-            ),
-            (
-                Format::Dwarf32,
-                4,
-                constants::DW_AT_loclists_base,
-                constants::DW_FORM_sec_offset,
-                data4,
-                AttributeValue::SecOffset(0x0102_0304),
-                AttributeValue::DebugLocListsBase(DebugLocListsBase(0x0102_0304)),
-            ),
-        ];
-
-        for test in tests.iter() {
-            let (format, version, name, form, mut input, expect_raw, expect_value) = *test;
-            unit.encoding.format = format;
-            unit.encoding.version = version;
-            let spec = AttributeSpecification::new(name, form, None);
-            let attribute =
-                parse_attribute(&mut input, unit.encoding(), spec).expect("Should parse attribute");
-            assert_eq!(attribute.raw_value(), expect_raw);
-            assert_eq!(attribute.value(), expect_value);
-        }
-    }
-
-    #[test]
-    fn test_attribute_udata_sdata_value() {
-        #[allow(clippy::type_complexity)]
-        let tests: &[(
-            AttributeValue<EndianSlice<LittleEndian>>,
-            Option<u64>,
-            Option<i64>,
-        )] = &[
-            (AttributeValue::Data1(1), Some(1), Some(1)),
-            (
-                AttributeValue::Data1(core::u8::MAX),
-                Some(u64::from(std::u8::MAX)),
-                Some(-1),
-            ),
-            (AttributeValue::Data2(1), Some(1), Some(1)),
-            (
-                AttributeValue::Data2(core::u16::MAX),
-                Some(u64::from(std::u16::MAX)),
-                Some(-1),
-            ),
-            (AttributeValue::Data4(1), Some(1), Some(1)),
-            (
-                AttributeValue::Data4(core::u32::MAX),
-                Some(u64::from(std::u32::MAX)),
-                Some(-1),
-            ),
-            (AttributeValue::Data8(1), Some(1), Some(1)),
-            (
-                AttributeValue::Data8(core::u64::MAX),
-                Some(core::u64::MAX),
-                Some(-1),
-            ),
-            (AttributeValue::Sdata(1), Some(1), Some(1)),
-            (AttributeValue::Sdata(-1), None, Some(-1)),
-            (AttributeValue::Udata(1), Some(1), Some(1)),
-            (AttributeValue::Udata(1u64 << 63), Some(1u64 << 63), None),
-        ];
-        for test in tests.iter() {
-            let (value, expect_udata, expect_sdata) = *test;
-            let attribute = Attribute {
-                name: DW_AT_data_member_location,
-                value,
-            };
-            assert_eq!(attribute.udata_value(), expect_udata);
-            assert_eq!(attribute.sdata_value(), expect_sdata);
-        }
-    }
-
-    fn test_parse_attribute_unit<Endian>(
-        address_size: u8,
-        format: Format,
-        endian: Endian,
-    ) -> UnitHeader<EndianSlice<'static, Endian>>
-    where
-        Endian: Endianity,
-    {
-        let encoding = Encoding {
-            format,
-            version: 4,
-            address_size,
-        };
-        UnitHeader::new(
-            encoding,
-            7,
-            DebugAbbrevOffset(0x0807_0605),
-            EndianSlice::new(&[], endian),
-        )
-    }
-
-    fn test_parse_attribute_unit_default() -> UnitHeader<EndianSlice<'static, LittleEndian>> {
-        test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian)
-    }
-
-    fn test_parse_attribute<'input, Endian>(
-        buf: &'input [u8],
-        len: usize,
-        unit: &UnitHeader<EndianSlice<'input, Endian>>,
-        form: constants::DwForm,
-        value: AttributeValue<EndianSlice<'input, Endian>>,
-    ) where
-        Endian: Endianity,
-    {
-        let spec = AttributeSpecification::new(constants::DW_AT_low_pc, form, None);
-
-        let expect = Attribute {
-            name: constants::DW_AT_low_pc,
-            value,
-        };
-
-        let rest = &mut EndianSlice::new(buf, Endian::default());
-        match parse_attribute(rest, unit.encoding(), spec) {
-            Ok(attr) => {
-                assert_eq!(attr, expect);
-                assert_eq!(*rest, EndianSlice::new(&buf[len..], Endian::default()));
-            }
-            otherwise => {
-                assert!(false, "Unexpected parse result = {:#?}", otherwise);
-            }
-        };
-    }
-
-    #[test]
-    fn test_parse_attribute_addr() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
-        let form = constants::DW_FORM_addr;
-        let value = AttributeValue::Addr(0x0403_0201);
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_addr8() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08];
-        let unit = test_parse_attribute_unit(8, Format::Dwarf32, LittleEndian);
-        let form = constants::DW_FORM_addr;
-        let value = AttributeValue::Addr(0x0807_0605_0403_0201);
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_block1() {
-        // Length of data (3), three bytes of data, two bytes of left over input.
-        let buf = [0x03, 0x09, 0x09, 0x09, 0x00, 0x00];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_block1;
-        let value = AttributeValue::Block(EndianSlice::new(&buf[1..4], LittleEndian));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_block2() {
-        // Two byte length of data (2), two bytes of data, two bytes of left over input.
-        let buf = [0x02, 0x00, 0x09, 0x09, 0x00, 0x00];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_block2;
-        let value = AttributeValue::Block(EndianSlice::new(&buf[2..4], LittleEndian));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_block4() {
-        // Four byte length of data (2), two bytes of data, no left over input.
-        let buf = [0x02, 0x00, 0x00, 0x00, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_block4;
-        let value = AttributeValue::Block(EndianSlice::new(&buf[4..], LittleEndian));
-        test_parse_attribute(&buf, 6, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_block() {
-        // LEB length of data (2, one byte), two bytes of data, no left over input.
-        let buf = [0x02, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_block;
-        let value = AttributeValue::Block(EndianSlice::new(&buf[1..], LittleEndian));
-        test_parse_attribute(&buf, 3, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_data1() {
-        let buf = [0x03];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_data1;
-        let value = AttributeValue::Data1(0x03);
-        test_parse_attribute(&buf, 1, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_data2() {
-        let buf = [0x02, 0x01, 0x0];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_data2;
-        let value = AttributeValue::Data2(0x0102);
-        test_parse_attribute(&buf, 2, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_data4() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_data4;
-        let value = AttributeValue::Data4(0x0403_0201);
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_data8() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_data8;
-        let value = AttributeValue::Data8(0x0807_0605_0403_0201);
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_udata() {
-        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-        let bytes_written = {
-            let mut writable = &mut buf[..];
-            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
-        };
-
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_udata;
-        let value = AttributeValue::Udata(4097);
-        test_parse_attribute(&buf, bytes_written, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_sdata() {
-        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-        let bytes_written = {
-            let mut writable = &mut buf[..];
-            leb128::write::signed(&mut writable, -4097).expect("should write ok")
-        };
-
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_sdata;
-        let value = AttributeValue::Sdata(-4097);
-        test_parse_attribute(&buf, bytes_written, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_exprloc() {
-        // LEB length of data (2, one byte), two bytes of data, one byte left over input.
-        let buf = [0x02, 0x99, 0x99, 0x11];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_exprloc;
-        let value = AttributeValue::Exprloc(Expression(EndianSlice::new(&buf[1..3], LittleEndian)));
-        test_parse_attribute(&buf, 3, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_flag_true() {
-        let buf = [0x42];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_flag;
-        let value = AttributeValue::Flag(true);
-        test_parse_attribute(&buf, 1, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_flag_false() {
-        let buf = [0x00];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_flag;
-        let value = AttributeValue::Flag(false);
-        test_parse_attribute(&buf, 1, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_flag_present() {
-        let buf = [0x01, 0x02, 0x03, 0x04];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_flag_present;
-        let value = AttributeValue::Flag(true);
-        // DW_FORM_flag_present does not consume any bytes of the input stream.
-        test_parse_attribute(&buf, 0, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_sec_offset_32() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
-        let form = constants::DW_FORM_sec_offset;
-        let value = AttributeValue::SecOffset(0x0403_0201);
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_sec_offset_64() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_sec_offset;
-        let value = AttributeValue::SecOffset(0x0807_0605_0403_0201);
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_ref1() {
-        let buf = [0x03];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_ref1;
-        let value = AttributeValue::UnitRef(UnitOffset(3));
-        test_parse_attribute(&buf, 1, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_ref2() {
-        let buf = [0x02, 0x01, 0x0];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_ref2;
-        let value = AttributeValue::UnitRef(UnitOffset(258));
-        test_parse_attribute(&buf, 2, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_ref4() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_ref4;
-        let value = AttributeValue::UnitRef(UnitOffset(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_ref8() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_ref8;
-        let value = AttributeValue::UnitRef(UnitOffset(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_ref_sup4() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_ref_sup4;
-        let value = AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_ref_sup8() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_ref_sup8;
-        let value = AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_refudata() {
-        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-        let bytes_written = {
-            let mut writable = &mut buf[..];
-            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
-        };
-
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_ref_udata;
-        let value = AttributeValue::UnitRef(UnitOffset(4097));
-        test_parse_attribute(&buf, bytes_written, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_refaddr_32() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
-        let form = constants::DW_FORM_ref_addr;
-        let value = AttributeValue::DebugInfoRef(DebugInfoOffset(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_refaddr_64() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_ref_addr;
-        let value = AttributeValue::DebugInfoRef(DebugInfoOffset(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_refaddr_version2() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let mut unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
-        unit.encoding.version = 2;
-        let form = constants::DW_FORM_ref_addr;
-        let value = AttributeValue::DebugInfoRef(DebugInfoOffset(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_refaddr8_version2() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let mut unit = test_parse_attribute_unit(8, Format::Dwarf32, LittleEndian);
-        unit.encoding.version = 2;
-        let form = constants::DW_FORM_ref_addr;
-        let value = AttributeValue::DebugInfoRef(DebugInfoOffset(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_gnu_ref_alt_32() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
-        let form = constants::DW_FORM_GNU_ref_alt;
-        let value = AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_gnu_ref_alt_64() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_GNU_ref_alt;
-        let value = AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_refsig8() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_ref_sig8;
-        let value = AttributeValue::DebugTypesRef(DebugTypeSignature(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_string() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x0, 0x99, 0x99];
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_string;
-        let value = AttributeValue::String(EndianSlice::new(&buf[..5], LittleEndian));
-        test_parse_attribute(&buf, 6, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_strp_32() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
-        let form = constants::DW_FORM_strp;
-        let value = AttributeValue::DebugStrRef(DebugStrOffset(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_strp_64() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_strp;
-        let value = AttributeValue::DebugStrRef(DebugStrOffset(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_strp_sup_32() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
-        let form = constants::DW_FORM_strp_sup;
-        let value = AttributeValue::DebugStrRefSup(DebugStrOffset(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_strp_sup_64() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_strp_sup;
-        let value = AttributeValue::DebugStrRefSup(DebugStrOffset(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_gnu_strp_alt_32() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
-        let form = constants::DW_FORM_GNU_strp_alt;
-        let value = AttributeValue::DebugStrRefSup(DebugStrOffset(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    #[cfg(target_pointer_width = "64")]
-    fn test_parse_attribute_gnu_strp_alt_64() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_GNU_strp_alt;
-        let value = AttributeValue::DebugStrRefSup(DebugStrOffset(0x0807_0605_0403_0201));
-        test_parse_attribute(&buf, 8, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_strx() {
-        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-        let bytes_written = {
-            let mut writable = &mut buf[..];
-            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
-        };
-
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_strx;
-        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(4097));
-        test_parse_attribute(&buf, bytes_written, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_strx1() {
-        let buf = [0x01, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_strx1;
-        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(0x01));
-        test_parse_attribute(&buf, 1, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_strx2() {
-        let buf = [0x01, 0x02, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_strx2;
-        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(0x0201));
-        test_parse_attribute(&buf, 2, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_strx3() {
-        let buf = [0x01, 0x02, 0x03, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_strx3;
-        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(0x03_0201));
-        test_parse_attribute(&buf, 3, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_strx4() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_strx4;
-        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_addrx() {
-        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-        let bytes_written = {
-            let mut writable = &mut buf[..];
-            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
-        };
-
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_addrx;
-        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(4097));
-        test_parse_attribute(&buf, bytes_written, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_addrx1() {
-        let buf = [0x01, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_addrx1;
-        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(0x01));
-        test_parse_attribute(&buf, 1, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_addrx2() {
-        let buf = [0x01, 0x02, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_addrx2;
-        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(0x0201));
-        test_parse_attribute(&buf, 2, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_addrx3() {
-        let buf = [0x01, 0x02, 0x03, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_addrx3;
-        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(0x03_0201));
-        test_parse_attribute(&buf, 3, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_addrx4() {
-        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
-        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
-        let form = constants::DW_FORM_addrx4;
-        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(0x0403_0201));
-        test_parse_attribute(&buf, 4, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_loclistx() {
-        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-        let bytes_written = {
-            let mut writable = &mut buf[..];
-            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
-        };
-
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_loclistx;
-        let value = AttributeValue::DebugLocListsIndex(DebugLocListsIndex(4097));
-        test_parse_attribute(&buf, bytes_written, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_rnglistx() {
-        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-        let bytes_written = {
-            let mut writable = &mut buf[..];
-            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
-        };
-
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_rnglistx;
-        let value = AttributeValue::DebugRngListsIndex(DebugRngListsIndex(4097));
-        test_parse_attribute(&buf, bytes_written, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_indirect() {
-        let mut buf = [0; 100];
-
-        let bytes_written = {
-            let mut writable = &mut buf[..];
-            leb128::write::unsigned(&mut writable, constants::DW_FORM_udata.0.into())
-                .expect("should write udata")
-                + leb128::write::unsigned(&mut writable, 9_999_999).expect("should write value")
-        };
-
-        let unit = test_parse_attribute_unit_default();
-        let form = constants::DW_FORM_indirect;
-        let value = AttributeValue::Udata(9_999_999);
-        test_parse_attribute(&buf, bytes_written, &unit, form, value);
-    }
-
-    #[test]
-    fn test_parse_attribute_indirect_implicit_const() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut buf = [0; 100];
-        let mut writable = &mut buf[..];
-        leb128::write::unsigned(&mut writable, constants::DW_FORM_implicit_const.0.into())
-            .expect("should write implicit_const");
-
-        let input = &mut EndianSlice::new(&buf, LittleEndian);
-        let spec =
-            AttributeSpecification::new(constants::DW_AT_low_pc, constants::DW_FORM_indirect, None);
-        assert_eq!(
-            parse_attribute(input, encoding, spec),
-            Err(Error::InvalidImplicitConst)
-        );
-    }
-
-    #[test]
-    fn test_attrs_iter() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let unit = UnitHeader::new(
-            encoding,
-            7,
-            DebugAbbrevOffset(0x0807_0605),
-            EndianSlice::new(&[], LittleEndian),
-        );
-
-        let abbrev = Abbreviation::new(
-            42,
-            constants::DW_TAG_subprogram,
-            constants::DW_CHILDREN_yes,
-            vec![
-                AttributeSpecification::new(constants::DW_AT_name, constants::DW_FORM_string, None),
-                AttributeSpecification::new(constants::DW_AT_low_pc, constants::DW_FORM_addr, None),
-                AttributeSpecification::new(
-                    constants::DW_AT_high_pc,
-                    constants::DW_FORM_addr,
-                    None,
-                ),
-            ]
-            .into(),
-        );
-
-        // "foo", 42, 1337, 4 dangling bytes of 0xaa where children would be
-        let buf = [
-            0x66, 0x6f, 0x6f, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x39, 0x05, 0x00, 0x00, 0xaa, 0xaa,
-            0xaa, 0xaa,
-        ];
-
-        let entry = DebuggingInformationEntry {
-            offset: UnitOffset(0),
-            attrs_slice: EndianSlice::new(&buf, LittleEndian),
-            attrs_len: Cell::new(None),
-            abbrev: &abbrev,
-            unit: &unit,
-        };
-
-        let mut attrs = AttrsIter {
-            input: EndianSlice::new(&buf, LittleEndian),
-            attributes: abbrev.attributes(),
-            entry: &entry,
-        };
-
-        match attrs.next() {
-            Ok(Some(attr)) => {
-                assert_eq!(
-                    attr,
-                    Attribute {
-                        name: constants::DW_AT_name,
-                        value: AttributeValue::String(EndianSlice::new(b"foo", LittleEndian)),
-                    }
-                );
-            }
-            otherwise => {
-                assert!(false, "Unexpected parse result = {:#?}", otherwise);
-            }
-        }
-
-        assert!(entry.attrs_len.get().is_none());
-
-        match attrs.next() {
-            Ok(Some(attr)) => {
-                assert_eq!(
-                    attr,
-                    Attribute {
-                        name: constants::DW_AT_low_pc,
-                        value: AttributeValue::Addr(0x2a),
-                    }
-                );
-            }
-            otherwise => {
-                assert!(false, "Unexpected parse result = {:#?}", otherwise);
-            }
-        }
-
-        assert!(entry.attrs_len.get().is_none());
-
-        match attrs.next() {
-            Ok(Some(attr)) => {
-                assert_eq!(
-                    attr,
-                    Attribute {
-                        name: constants::DW_AT_high_pc,
-                        value: AttributeValue::Addr(0x539),
-                    }
-                );
-            }
-            otherwise => {
-                assert!(false, "Unexpected parse result = {:#?}", otherwise);
-            }
-        }
-
-        assert!(entry.attrs_len.get().is_none());
-
-        assert!(attrs.next().expect("should parse next").is_none());
-        assert!(entry.attrs_len.get().is_some());
-        assert_eq!(
-            entry.attrs_len.get().expect("should have entry.attrs_len"),
-            buf.len() - 4
-        )
-    }
-
-    #[test]
-    fn test_attrs_iter_incomplete() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let unit = UnitHeader::new(
-            encoding,
-            7,
-            DebugAbbrevOffset(0x0807_0605),
-            EndianSlice::new(&[], LittleEndian),
-        );
-
-        let abbrev = Abbreviation::new(
-            42,
-            constants::DW_TAG_subprogram,
-            constants::DW_CHILDREN_yes,
-            vec![
-                AttributeSpecification::new(constants::DW_AT_name, constants::DW_FORM_string, None),
-                AttributeSpecification::new(constants::DW_AT_low_pc, constants::DW_FORM_addr, None),
-                AttributeSpecification::new(
-                    constants::DW_AT_high_pc,
-                    constants::DW_FORM_addr,
-                    None,
-                ),
-            ]
-            .into(),
-        );
-
-        // "foo"
-        let buf = [0x66, 0x6f, 0x6f, 0x00];
-
-        let entry = DebuggingInformationEntry {
-            offset: UnitOffset(0),
-            attrs_slice: EndianSlice::new(&buf, LittleEndian),
-            attrs_len: Cell::new(None),
-            abbrev: &abbrev,
-            unit: &unit,
-        };
-
-        let mut attrs = AttrsIter {
-            input: EndianSlice::new(&buf, LittleEndian),
-            attributes: abbrev.attributes(),
-            entry: &entry,
-        };
-
-        match attrs.next() {
-            Ok(Some(attr)) => {
-                assert_eq!(
-                    attr,
-                    Attribute {
-                        name: constants::DW_AT_name,
-                        value: AttributeValue::String(EndianSlice::new(b"foo", LittleEndian)),
-                    }
-                );
-            }
-            otherwise => {
-                assert!(false, "Unexpected parse result = {:#?}", otherwise);
-            }
-        }
-
-        assert!(entry.attrs_len.get().is_none());
-
-        // Return error for incomplete attribute.
-        assert!(attrs.next().is_err());
-        assert!(entry.attrs_len.get().is_none());
-
-        // Return error for all subsequent calls.
-        assert!(attrs.next().is_err());
-        assert!(attrs.next().is_err());
-        assert!(attrs.next().is_err());
-        assert!(attrs.next().is_err());
-        assert!(entry.attrs_len.get().is_none());
-    }
-
-    fn assert_entry_name<Endian>(entry: &DebuggingInformationEntry<EndianSlice<Endian>>, name: &str)
-    where
-        Endian: Endianity,
-    {
-        let value = entry
-            .attr_value(constants::DW_AT_name)
-            .expect("Should have parsed the name attribute")
-            .expect("Should have found the name attribute");
-
-        assert_eq!(
-            value,
-            AttributeValue::String(EndianSlice::new(name.as_bytes(), Endian::default()))
-        );
-    }
-
-    fn assert_current_name<Endian>(cursor: &EntriesCursor<EndianSlice<Endian>>, name: &str)
-    where
-        Endian: Endianity,
-    {
-        let entry = cursor.current().expect("Should have an entry result");
-        assert_entry_name(entry, name);
-    }
-
-    fn assert_next_entry<Endian>(cursor: &mut EntriesCursor<EndianSlice<Endian>>, name: &str)
-    where
-        Endian: Endianity,
-    {
-        cursor
-            .next_entry()
-            .expect("Should parse next entry")
-            .expect("Should have an entry");
-        assert_current_name(cursor, name);
-    }
-
-    fn assert_next_entry_null<Endian>(cursor: &mut EntriesCursor<EndianSlice<Endian>>)
-    where
-        Endian: Endianity,
-    {
-        cursor
-            .next_entry()
-            .expect("Should parse next entry")
-            .expect("Should have an entry");
-        assert!(cursor.current().is_none());
-    }
-
-    fn assert_next_dfs<Endian>(
-        cursor: &mut EntriesCursor<EndianSlice<Endian>>,
-        name: &str,
-        depth: isize,
-    ) where
-        Endian: Endianity,
-    {
-        {
-            let (val, entry) = cursor
-                .next_dfs()
-                .expect("Should parse next dfs")
-                .expect("Should not be done with traversal");
-            assert_eq!(val, depth);
-            assert_entry_name(entry, name);
-        }
-        assert_current_name(cursor, name);
-    }
-
-    fn assert_next_sibling<Endian>(cursor: &mut EntriesCursor<EndianSlice<Endian>>, name: &str)
-    where
-        Endian: Endianity,
-    {
-        {
-            let entry = cursor
-                .next_sibling()
-                .expect("Should parse next sibling")
-                .expect("Should not be done with traversal");
-            assert_entry_name(entry, name);
-        }
-        assert_current_name(cursor, name);
-    }
-
-    fn assert_valid_sibling_ptr<Endian>(cursor: &EntriesCursor<EndianSlice<Endian>>)
-    where
-        Endian: Endianity,
-    {
-        let sibling_ptr = cursor
-            .current()
-            .expect("Should have current entry")
-            .attr_value(constants::DW_AT_sibling);
-        match sibling_ptr {
-            Ok(Some(AttributeValue::UnitRef(offset))) => {
-                cursor
-                    .unit
-                    .range_from(offset..)
-                    .expect("Sibling offset should be valid");
-            }
-            _ => panic!("Invalid sibling pointer {:?}", sibling_ptr),
-        }
-    }
-
-    fn entries_cursor_tests_abbrev_buf() -> Vec<u8> {
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .abbrev(1, DW_TAG_subprogram, DW_CHILDREN_yes)
-                .abbrev_attr(DW_AT_name, DW_FORM_string)
-                .abbrev_attr_null()
-            .abbrev_null();
-        section.get_contents().unwrap()
-    }
-
-    fn entries_cursor_tests_debug_info_buf() -> Vec<u8> {
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .die(1, |s| s.attr_string("001"))
-                .die(1, |s| s.attr_string("002"))
-                    .die(1, |s| s.attr_string("003"))
-                        .die_null()
-                    .die_null()
-                .die(1, |s| s.attr_string("004"))
-                    .die(1, |s| s.attr_string("005"))
-                        .die_null()
-                    .die(1, |s| s.attr_string("006"))
-                        .die_null()
-                    .die_null()
-                .die(1, |s| s.attr_string("007"))
-                    .die(1, |s| s.attr_string("008"))
-                        .die(1, |s| s.attr_string("009"))
-                            .die_null()
-                        .die_null()
-                    .die_null()
-                .die(1, |s| s.attr_string("010"))
-                    .die_null()
-                .die_null();
-        let entries_buf = section.get_contents().unwrap();
-
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut unit = CompilationUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0),
-                entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
-            },
-            offset: DebugInfoOffset(0),
-        };
-        let section = Section::with_endian(Endian::Little).comp_unit(&mut unit);
-        section.get_contents().unwrap()
-    }
-
-    #[test]
-    fn test_cursor_next_entry_incomplete() {
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .die(1, |s| s.attr_string("001"))
-                .die(1, |s| s.attr_string("002"))
-                    .die(1, |s| s);
-        let entries_buf = section.get_contents().unwrap();
-
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut unit = CompilationUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0),
-                entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
-            },
-            offset: DebugInfoOffset(0),
-        };
-        let section = Section::with_endian(Endian::Little).comp_unit(&mut unit);
-        let info_buf = &section.get_contents().unwrap();
-        let debug_info = DebugInfo::new(info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
-        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-
-        assert_next_entry(&mut cursor, "001");
-        assert_next_entry(&mut cursor, "002");
-
-        {
-            // Entry code is present, but none of the attributes.
-            cursor
-                .next_entry()
-                .expect("Should parse next entry")
-                .expect("Should have an entry");
-            let entry = cursor.current().expect("Should have an entry result");
-            assert!(entry.attrs().next().is_err());
-        }
-
-        assert!(cursor.next_entry().is_err());
-        assert!(cursor.next_entry().is_err());
-    }
-
-    #[test]
-    fn test_cursor_next_entry() {
-        let info_buf = &entries_cursor_tests_debug_info_buf();
-        let debug_info = DebugInfo::new(info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
-        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-
-        assert_next_entry(&mut cursor, "001");
-        assert_next_entry(&mut cursor, "002");
-        assert_next_entry(&mut cursor, "003");
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry(&mut cursor, "004");
-        assert_next_entry(&mut cursor, "005");
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry(&mut cursor, "006");
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry(&mut cursor, "007");
-        assert_next_entry(&mut cursor, "008");
-        assert_next_entry(&mut cursor, "009");
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry(&mut cursor, "010");
-        assert_next_entry_null(&mut cursor);
-        assert_next_entry_null(&mut cursor);
-
-        assert!(cursor
-            .next_entry()
-            .expect("Should parse next entry")
-            .is_none());
-        assert!(cursor.current().is_none());
-    }
-
-    #[test]
-    fn test_cursor_next_dfs() {
-        let info_buf = &entries_cursor_tests_debug_info_buf();
-        let debug_info = DebugInfo::new(info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
-        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-
-        assert_next_dfs(&mut cursor, "001", 0);
-        assert_next_dfs(&mut cursor, "002", 1);
-        assert_next_dfs(&mut cursor, "003", 1);
-        assert_next_dfs(&mut cursor, "004", -1);
-        assert_next_dfs(&mut cursor, "005", 1);
-        assert_next_dfs(&mut cursor, "006", 0);
-        assert_next_dfs(&mut cursor, "007", -1);
-        assert_next_dfs(&mut cursor, "008", 1);
-        assert_next_dfs(&mut cursor, "009", 1);
-        assert_next_dfs(&mut cursor, "010", -2);
-
-        assert!(cursor.next_dfs().expect("Should parse next dfs").is_none());
-        assert!(cursor.current().is_none());
-    }
-
-    #[test]
-    fn test_cursor_next_sibling_no_sibling_ptr() {
-        let info_buf = &entries_cursor_tests_debug_info_buf();
-        let debug_info = DebugInfo::new(info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
-        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-
-        assert_next_dfs(&mut cursor, "001", 0);
-
-        // Down to the first child of the root entry.
-
-        assert_next_dfs(&mut cursor, "002", 1);
-
-        // Now iterate all children of the root via `next_sibling`.
-
-        assert_next_sibling(&mut cursor, "004");
-        assert_next_sibling(&mut cursor, "007");
-        assert_next_sibling(&mut cursor, "010");
-
-        // There should be no more siblings.
-
-        assert!(cursor
-            .next_sibling()
-            .expect("Should parse next sibling")
-            .is_none());
-        assert!(cursor.current().is_none());
-    }
-
-    #[test]
-    fn test_cursor_next_sibling_continuation() {
-        let info_buf = &entries_cursor_tests_debug_info_buf();
-        let debug_info = DebugInfo::new(info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
-        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-
-        assert_next_dfs(&mut cursor, "001", 0);
-
-        // Down to the first child of the root entry.
-
-        assert_next_dfs(&mut cursor, "002", 1);
-
-        // Get the next sibling, then iterate its children
-
-        assert_next_sibling(&mut cursor, "004");
-        assert_next_dfs(&mut cursor, "005", 1);
-        assert_next_sibling(&mut cursor, "006");
-        assert!(cursor
-            .next_sibling()
-            .expect("Should parse next sibling")
-            .is_none());
-        assert!(cursor
-            .next_sibling()
-            .expect("Should parse next sibling")
-            .is_none());
-        assert!(cursor
-            .next_sibling()
-            .expect("Should parse next sibling")
-            .is_none());
-        assert!(cursor
-            .next_sibling()
-            .expect("Should parse next sibling")
-            .is_none());
-
-        // And we should be able to continue with the children of the root entry.
-
-        assert_next_dfs(&mut cursor, "007", -1);
-        assert_next_sibling(&mut cursor, "010");
-
-        // There should be no more siblings.
-
-        assert!(cursor
-            .next_sibling()
-            .expect("Should parse next sibling")
-            .is_none());
-        assert!(cursor.current().is_none());
-    }
-
-    fn entries_cursor_sibling_abbrev_buf() -> Vec<u8> {
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .abbrev(1, DW_TAG_subprogram, DW_CHILDREN_yes)
-                .abbrev_attr(DW_AT_name, DW_FORM_string)
-                .abbrev_attr(DW_AT_sibling, DW_FORM_ref1)
-                .abbrev_attr_null()
-            .abbrev(2, DW_TAG_subprogram, DW_CHILDREN_yes)
-                .abbrev_attr(DW_AT_name, DW_FORM_string)
-                .abbrev_attr_null()
-                .abbrev_null();
-        section.get_contents().unwrap()
-    }
-
-    fn entries_cursor_sibling_entries_buf(header_size: usize) -> Vec<u8> {
-        let start = Label::new();
-        let sibling004_ref = Label::new();
-        let sibling004 = Label::new();
-        let sibling009_ref = Label::new();
-        let sibling009 = Label::new();
-
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .mark(&start)
-            .die(2, |s| s.attr_string("001"))
-                // Valid sibling attribute.
-                .die(1, |s| s.attr_string("002").D8(&sibling004_ref))
-                    // Invalid code to ensure the sibling attribute was used.
-                    .die(10, |s| s.attr_string("003"))
-                        .die_null()
-                    .die_null()
-                .mark(&sibling004)
-                // Invalid sibling attribute.
-                .die(1, |s| s.attr_string("004").attr_ref1(255))
-                    .die(2, |s| s.attr_string("005"))
-                        .die_null()
-                    .die_null()
-                // Sibling attribute in child only.
-                .die(2, |s| s.attr_string("006"))
-                    // Valid sibling attribute.
-                    .die(1, |s| s.attr_string("007").D8(&sibling009_ref))
-                        // Invalid code to ensure the sibling attribute was used.
-                        .die(10, |s| s.attr_string("008"))
-                            .die_null()
-                        .die_null()
-                    .mark(&sibling009)
-                    .die(2, |s| s.attr_string("009"))
-                        .die_null()
-                    .die_null()
-                // No sibling attribute.
-                .die(2, |s| s.attr_string("010"))
-                    .die(2, |s| s.attr_string("011"))
-                        .die_null()
-                    .die_null()
-                .die_null();
-
-        let offset = header_size as u64 + (&sibling004 - &start) as u64;
-        sibling004_ref.set_const(offset);
-
-        let offset = header_size as u64 + (&sibling009 - &start) as u64;
-        sibling009_ref.set_const(offset);
-
-        section.get_contents().unwrap()
-    }
-
-    fn test_cursor_next_sibling_with_ptr(cursor: &mut EntriesCursor<EndianSlice<LittleEndian>>) {
-        assert_next_dfs(cursor, "001", 0);
-
-        // Down to the first child of the root.
-
-        assert_next_dfs(cursor, "002", 1);
-
-        // Now iterate all children of the root via `next_sibling`.
-
-        assert_valid_sibling_ptr(&cursor);
-        assert_next_sibling(cursor, "004");
-        assert_next_sibling(cursor, "006");
-        assert_next_sibling(cursor, "010");
-
-        // There should be no more siblings.
-
-        assert!(cursor
-            .next_sibling()
-            .expect("Should parse next sibling")
-            .is_none());
-        assert!(cursor.current().is_none());
-    }
-
-    #[test]
-    fn test_debug_info_next_sibling_with_ptr() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let header_size =
-            CompilationUnitHeader::<EndianSlice<LittleEndian>, _>::size_of_header(encoding);
-        let entries_buf = entries_cursor_sibling_entries_buf(header_size);
-
-        let mut unit = CompilationUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0),
-                entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
-            },
-            offset: DebugInfoOffset(0),
-        };
-        let section = Section::with_endian(Endian::Little).comp_unit(&mut unit);
-        let info_buf = section.get_contents().unwrap();
-        let debug_info = DebugInfo::new(&info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrev_buf = entries_cursor_sibling_abbrev_buf();
-        let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        test_cursor_next_sibling_with_ptr(&mut cursor);
-    }
-
-    #[test]
-    fn test_debug_types_next_sibling_with_ptr() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let header_size = TypeUnitHeader::<EndianSlice<LittleEndian>, _>::size_of_header(encoding);
-        let entries_buf = entries_cursor_sibling_entries_buf(header_size);
-
-        let mut unit = TypeUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0),
-                entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
-            },
-            type_signature: DebugTypeSignature(0),
-            type_offset: UnitOffset(0),
-            offset: DebugTypesOffset(0),
-        };
-        let section = Section::with_endian(Endian::Little).type_unit(&mut unit);
-        let info_buf = section.get_contents().unwrap();
-        let debug_types = DebugTypes::new(&info_buf, LittleEndian);
-
-        let unit = debug_types
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrev_buf = entries_cursor_sibling_abbrev_buf();
-        let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        test_cursor_next_sibling_with_ptr(&mut cursor);
-    }
-
-    #[test]
-    fn test_entries_at_offset() {
-        let info_buf = &entries_cursor_tests_debug_info_buf();
-        let debug_info = DebugInfo::new(info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
-        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit
-            .entries_at_offset(&abbrevs, UnitOffset(unit.header_size()))
-            .unwrap();
-        assert_next_entry(&mut cursor, "001");
-
-        let cursor = unit.entries_at_offset(&abbrevs, UnitOffset(0));
-        match cursor {
-            Err(Error::OffsetOutOfBounds) => {}
-            otherwise => {
-                assert!(false, "Unexpected parse result = {:#?}", otherwise);
-            }
-        }
-    }
-
-    fn entries_tree_tests_debug_abbrevs_buf() -> Vec<u8> {
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .abbrev(1, DW_TAG_subprogram, DW_CHILDREN_yes)
-                .abbrev_attr(DW_AT_name, DW_FORM_string)
-                .abbrev_attr_null()
-            .abbrev(2, DW_TAG_subprogram, DW_CHILDREN_no)
-                .abbrev_attr(DW_AT_name, DW_FORM_string)
-                .abbrev_attr_null()
-            .abbrev_null()
-            .get_contents()
-            .unwrap();
-        section
-    }
-
-    fn entries_tree_tests_debug_info_buf(header_size: usize) -> (Vec<u8>, UnitOffset) {
-        let start = Label::new();
-        let entry2 = Label::new();
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .mark(&start)
-            .die(1, |s| s.attr_string("root"))
-                .die(1, |s| s.attr_string("1"))
-                    .die(1, |s| s.attr_string("1a"))
-                        .die_null()
-                    .die(2, |s| s.attr_string("1b"))
-                    .die_null()
-                .mark(&entry2)
-                .die(1, |s| s.attr_string("2"))
-                    .die(1, |s| s.attr_string("2a"))
-                        .die(1, |s| s.attr_string("2a1"))
-                            .die_null()
-                        .die_null()
-                    .die(1, |s| s.attr_string("2b"))
-                        .die(2, |s| s.attr_string("2b1"))
-                        .die_null()
-                    .die_null()
-                .die(1, |s| s.attr_string("3"))
-                    .die(1, |s| s.attr_string("3a"))
-                        .die(2, |s| s.attr_string("3a1"))
-                        .die(2, |s| s.attr_string("3a2"))
-                        .die_null()
-                    .die(2, |s| s.attr_string("3b"))
-                    .die_null()
-                .die(2, |s| s.attr_string("final"))
-                .die_null()
-            .get_contents()
-            .unwrap();
-        let entry2 = UnitOffset(header_size + (&entry2 - &start) as usize);
-        (section, entry2)
-    }
-
-    #[test]
-    fn test_entries_tree() {
-        fn assert_entry<'input, 'abbrev, 'unit, 'tree, Endian>(
-            node: Result<
-                Option<EntriesTreeNode<'abbrev, 'unit, 'tree, EndianSlice<'input, Endian>>>,
-            >,
-            name: &str,
-        ) -> EntriesTreeIter<'abbrev, 'unit, 'tree, EndianSlice<'input, Endian>>
-        where
-            Endian: Endianity,
-        {
-            let node = node
-                .expect("Should parse entry")
-                .expect("Should have entry");
-            assert_entry_name(node.entry(), name);
-            node.children()
-        }
-
-        fn assert_null<E: Endianity>(node: Result<Option<EntriesTreeNode<EndianSlice<E>>>>) {
-            match node {
-                Ok(None) => {}
-                otherwise => {
-                    assert!(false, "Unexpected parse result = {:#?}", otherwise);
-                }
-            }
-        }
-
-        let abbrevs_buf = entries_tree_tests_debug_abbrevs_buf();
-        let debug_abbrev = DebugAbbrev::new(&abbrevs_buf, LittleEndian);
-
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let header_size =
-            CompilationUnitHeader::<EndianSlice<LittleEndian>, _>::size_of_header(encoding);
-        let (entries_buf, entry2) = entries_tree_tests_debug_info_buf(header_size);
-        let mut unit = CompilationUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0),
-                entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
-            },
-            offset: DebugInfoOffset(0),
-        };
-        let info_buf = Section::with_endian(Endian::Little)
-            .comp_unit(&mut unit)
-            .get_contents()
-            .unwrap();
-        let debug_info = DebugInfo::new(&info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("Should parse unit")
-            .expect("and it should be some");
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-        let mut tree = unit
-            .entries_tree(&abbrevs, None)
-            .expect("Should have entries tree");
-
-        // Test we can restart iteration of the tree.
-        {
-            let mut iter = assert_entry(tree.root().map(Some), "root");
-            assert_entry(iter.next(), "1");
-        }
-        {
-            let mut iter = assert_entry(tree.root().map(Some), "root");
-            assert_entry(iter.next(), "1");
-        }
-
-        let mut iter = assert_entry(tree.root().map(Some), "root");
-        {
-            // Test iteration with children.
-            let mut iter = assert_entry(iter.next(), "1");
-            {
-                // Test iteration with children flag, but no children.
-                let mut iter = assert_entry(iter.next(), "1a");
-                assert_null(iter.next());
-                assert_null(iter.next());
-            }
-            {
-                // Test iteration without children flag.
-                let mut iter = assert_entry(iter.next(), "1b");
-                assert_null(iter.next());
-                assert_null(iter.next());
-            }
-            assert_null(iter.next());
-            assert_null(iter.next());
-        }
-        {
-            // Test skipping over children.
-            let mut iter = assert_entry(iter.next(), "2");
-            assert_entry(iter.next(), "2a");
-            assert_entry(iter.next(), "2b");
-            assert_null(iter.next());
-        }
-        {
-            // Test skipping after partial iteration.
-            let mut iter = assert_entry(iter.next(), "3");
-            {
-                let mut iter = assert_entry(iter.next(), "3a");
-                assert_entry(iter.next(), "3a1");
-                // Parent iter should be able to skip over "3a2".
-            }
-            assert_entry(iter.next(), "3b");
-            assert_null(iter.next());
-        }
-        assert_entry(iter.next(), "final");
-        assert_null(iter.next());
-
-        // Test starting at an offset.
-        let mut tree = unit
-            .entries_tree(&abbrevs, Some(entry2))
-            .expect("Should have entries tree");
-        let mut iter = assert_entry(tree.root().map(Some), "2");
-        assert_entry(iter.next(), "2a");
-        assert_entry(iter.next(), "2b");
-        assert_null(iter.next());
-    }
-
-    #[test]
-    fn test_entries_raw() {
-        fn assert_abbrev<'input, 'abbrev, 'unit, Endian>(
-            entries: &mut EntriesRaw<'abbrev, 'unit, EndianSlice<'input, Endian>>,
-            tag: DwTag,
-        ) -> &'abbrev Abbreviation
-        where
-            Endian: Endianity,
-        {
-            let abbrev = entries
-                .read_abbreviation()
-                .expect("Should parse abbrev")
-                .expect("Should have abbrev");
-            assert_eq!(abbrev.tag(), tag);
-            abbrev
-        }
-
-        fn assert_null<'input, 'abbrev, 'unit, Endian>(
-            entries: &mut EntriesRaw<'abbrev, 'unit, EndianSlice<'input, Endian>>,
-        ) where
-            Endian: Endianity,
-        {
-            match entries.read_abbreviation() {
-                Ok(None) => {}
-                otherwise => {
-                    assert!(false, "Unexpected parse result = {:#?}", otherwise);
-                }
-            }
-        }
-
-        fn assert_attr<'input, 'abbrev, 'unit, Endian>(
-            entries: &mut EntriesRaw<'abbrev, 'unit, EndianSlice<'input, Endian>>,
-            spec: Option<AttributeSpecification>,
-            name: DwAt,
-            value: &str,
-        ) where
-            Endian: Endianity,
-        {
-            let spec = spec.expect("Should have attribute specification");
-            let attr = entries
-                .read_attribute(spec)
-                .expect("Should parse attribute");
-            assert_eq!(attr.name(), name);
-            assert_eq!(
-                attr.value(),
-                AttributeValue::String(EndianSlice::new(value.as_bytes(), Endian::default()))
-            );
-        }
-
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .abbrev(1, DW_TAG_subprogram, DW_CHILDREN_yes)
-                .abbrev_attr(DW_AT_name, DW_FORM_string)
-                .abbrev_attr(DW_AT_linkage_name, DW_FORM_string)
-                .abbrev_attr_null()
-            .abbrev(2, DW_TAG_variable, DW_CHILDREN_no)
-                .abbrev_attr(DW_AT_name, DW_FORM_string)
-                .abbrev_attr_null()
-            .abbrev_null();
-        let abbrevs_buf = section.get_contents().unwrap();
-        let debug_abbrev = DebugAbbrev::new(&abbrevs_buf, LittleEndian);
-
-        #[rustfmt::skip]
-        let section = Section::with_endian(Endian::Little)
-            .die(1, |s| s.attr_string("f1").attr_string("l1"))
-                .die(2, |s| s.attr_string("v1"))
-                .die(2, |s| s.attr_string("v2"))
-                .die(1, |s| s.attr_string("f2").attr_string("l2"))
-                    .die_null()
-                .die_null();
-        let entries_buf = section.get_contents().unwrap();
-
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut unit = CompilationUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0),
-                entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
-            },
-            offset: DebugInfoOffset(0),
-        };
-        let section = Section::with_endian(Endian::Little).comp_unit(&mut unit);
-        let info_buf = section.get_contents().unwrap();
-        let debug_info = DebugInfo::new(&info_buf, LittleEndian);
-
-        let unit = debug_info
-            .units()
-            .next()
-            .expect("should have a unit result")
-            .expect("and it should be ok");
-
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut entries = unit
-            .entries_raw(&abbrevs, None)
-            .expect("Should have entries");
-
-        assert_eq!(entries.next_depth(), 0);
-        let abbrev = assert_abbrev(&mut entries, DW_TAG_subprogram);
-        let mut attrs = abbrev.attributes().iter().copied();
-        assert_attr(&mut entries, attrs.next(), DW_AT_name, "f1");
-        assert_attr(&mut entries, attrs.next(), DW_AT_linkage_name, "l1");
-        assert!(attrs.next().is_none());
-
-        assert_eq!(entries.next_depth(), 1);
-        let abbrev = assert_abbrev(&mut entries, DW_TAG_variable);
-        let mut attrs = abbrev.attributes().iter().copied();
-        assert_attr(&mut entries, attrs.next(), DW_AT_name, "v1");
-        assert!(attrs.next().is_none());
-
-        assert_eq!(entries.next_depth(), 1);
-        let abbrev = assert_abbrev(&mut entries, DW_TAG_variable);
-        let mut attrs = abbrev.attributes().iter().copied();
-        assert_attr(&mut entries, attrs.next(), DW_AT_name, "v2");
-        assert!(attrs.next().is_none());
-
-        assert_eq!(entries.next_depth(), 1);
-        let abbrev = assert_abbrev(&mut entries, DW_TAG_subprogram);
-        let mut attrs = abbrev.attributes().iter().copied();
-        assert_attr(&mut entries, attrs.next(), DW_AT_name, "f2");
-        assert_attr(&mut entries, attrs.next(), DW_AT_linkage_name, "l2");
-        assert!(attrs.next().is_none());
-
-        assert_eq!(entries.next_depth(), 2);
-        assert_null(&mut entries);
-
-        assert_eq!(entries.next_depth(), 1);
-        assert_null(&mut entries);
-
-        assert_eq!(entries.next_depth(), 0);
-        assert!(entries.is_empty());
-    }
-
-    #[test]
-    fn test_debug_info_offset() {
-        let padding = &[0; 10];
-        let entries = &[0; 20];
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut unit = CompilationUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0),
-                entries_buf: EndianSlice::new(entries, LittleEndian),
-            },
-            offset: DebugInfoOffset(0),
-        };
-        Section::with_endian(Endian::Little)
-            .append_bytes(padding)
-            .comp_unit(&mut unit);
-        let offset = padding.len();
-        let header_length =
-            CompilationUnitHeader::<EndianSlice<LittleEndian>, _>::size_of_header(encoding);
-        let length = unit.length_including_self();
-        assert_eq!(DebugInfoOffset(0).to_unit_offset(&unit), None);
-        assert_eq!(DebugInfoOffset(offset - 1).to_unit_offset(&unit), None);
-        assert_eq!(DebugInfoOffset(offset).to_unit_offset(&unit), None);
-        assert_eq!(
-            DebugInfoOffset(offset + header_length - 1).to_unit_offset(&unit),
-            None
-        );
-        assert_eq!(
-            DebugInfoOffset(offset + header_length).to_unit_offset(&unit),
-            Some(UnitOffset(header_length))
-        );
-        assert_eq!(
-            DebugInfoOffset(offset + length - 1).to_unit_offset(&unit),
-            Some(UnitOffset(length - 1))
-        );
-        assert_eq!(DebugInfoOffset(offset + length).to_unit_offset(&unit), None);
-        assert_eq!(
-            UnitOffset(header_length).to_debug_info_offset(&unit),
-            DebugInfoOffset(offset + header_length)
-        );
-        assert_eq!(
-            UnitOffset(length - 1).to_debug_info_offset(&unit),
-            DebugInfoOffset(offset + length - 1)
-        );
-    }
-
-    #[test]
-    fn test_debug_types_offset() {
-        let padding = &[0; 10];
-        let entries = &[0; 20];
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut unit = TypeUnitHeader {
-            header: UnitHeader {
-                encoding,
-                unit_length: 0,
-                debug_abbrev_offset: DebugAbbrevOffset(0),
-                entries_buf: EndianSlice::new(entries, LittleEndian),
-            },
-            type_signature: DebugTypeSignature(0),
-            type_offset: UnitOffset(0),
-            offset: DebugTypesOffset(0),
-        };
-        Section::with_endian(Endian::Little)
-            .append_bytes(padding)
-            .type_unit(&mut unit);
-        let offset = padding.len();
-        let header_length =
-            TypeUnitHeader::<EndianSlice<LittleEndian>, _>::size_of_header(encoding);
-        let length = unit.length_including_self();
-        assert_eq!(DebugTypesOffset(0).to_unit_offset(&unit), None);
-        assert_eq!(DebugTypesOffset(offset - 1).to_unit_offset(&unit), None);
-        assert_eq!(DebugTypesOffset(offset).to_unit_offset(&unit), None);
-        assert_eq!(
-            DebugTypesOffset(offset + header_length - 1).to_unit_offset(&unit),
-            None
-        );
-        assert_eq!(
-            DebugTypesOffset(offset + header_length).to_unit_offset(&unit),
-            Some(UnitOffset(header_length))
-        );
-        assert_eq!(
-            DebugTypesOffset(offset + length - 1).to_unit_offset(&unit),
-            Some(UnitOffset(length - 1))
-        );
-        assert_eq!(
-            DebugTypesOffset(offset + length).to_unit_offset(&unit),
-            None
-        );
-        assert_eq!(
-            UnitOffset(header_length).to_debug_types_offset(&unit),
-            DebugTypesOffset(offset + header_length)
-        );
-        assert_eq!(
-            UnitOffset(length - 1).to_debug_types_offset(&unit),
-            DebugTypesOffset(offset + length - 1)
-        );
-    }
-
-    #[test]
-    fn test_length_including_self() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let mut unit = UnitHeader {
-            encoding,
-            unit_length: 0,
-            debug_abbrev_offset: DebugAbbrevOffset(0),
-            entries_buf: EndianSlice::new(&[], LittleEndian),
-        };
-        unit.encoding.format = Format::Dwarf32;
-        assert_eq!(unit.length_including_self(), 4);
-        unit.encoding.format = Format::Dwarf64;
-        assert_eq!(unit.length_including_self(), 12);
-        unit.unit_length = 10;
-        assert_eq!(unit.length_including_self(), 22);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/read/value.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/read/value.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1618 +0,0 @@
-//! Definitions for values used in DWARF expressions.
-
-use core::mem;
-
-use crate::constants;
-use crate::read::{AttributeValue, DebuggingInformationEntry, Error, Reader, Result};
-
-/// Convert a u64 to an i64, with sign extension if required.
-///
-/// This is primarily used when needing to treat `Value::Generic`
-/// as a signed value.
-#[inline]
-fn sign_extend(value: u64, mask: u64) -> i64 {
-    let value = (value & mask) as i64;
-    let sign = ((mask >> 1) + 1) as i64;
-    (value ^ sign).wrapping_sub(sign)
-}
-
-#[inline]
-fn mask_bit_size(addr_mask: u64) -> u32 {
-    64 - addr_mask.leading_zeros()
-}
-
-/// The type of an entry on the DWARF stack.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ValueType {
-    /// The generic type, which is address-sized and of unspecified sign,
-    /// as specified in the DWARF 5 standard, section 2.5.1.
-    /// This type is also used to represent address base types.
-    Generic,
-    /// Signed 8-bit integer type.
-    I8,
-    /// Unsigned 8-bit integer type.
-    U8,
-    /// Signed 16-bit integer type.
-    I16,
-    /// Unsigned 16-bit integer type.
-    U16,
-    /// Signed 32-bit integer type.
-    I32,
-    /// Unsigned 32-bit integer type.
-    U32,
-    /// Signed 64-bit integer type.
-    I64,
-    /// Unsigned 64-bit integer type.
-    U64,
-    /// 32-bit floating point type.
-    F32,
-    /// 64-bit floating point type.
-    F64,
-}
-
-/// The value of an entry on the DWARF stack.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Value {
-    /// A generic value, which is address-sized and of unspecified sign.
-    Generic(u64),
-    /// A signed 8-bit integer value.
-    I8(i8),
-    /// An unsigned 8-bit integer value.
-    U8(u8),
-    /// A signed 16-bit integer value.
-    I16(i16),
-    /// An unsigned 16-bit integer value.
-    U16(u16),
-    /// A signed 32-bit integer value.
-    I32(i32),
-    /// An unsigned 32-bit integer value.
-    U32(u32),
-    /// A signed 64-bit integer value.
-    I64(i64),
-    /// An unsigned 64-bit integer value.
-    U64(u64),
-    /// A 32-bit floating point value.
-    F32(f32),
-    /// A 64-bit floating point value.
-    F64(f64),
-}
-
-impl ValueType {
-    /// The size in bits of a value for this type.
-    pub fn bit_size(self, addr_mask: u64) -> u32 {
-        match self {
-            ValueType::Generic => mask_bit_size(addr_mask),
-            ValueType::I8 | ValueType::U8 => 8,
-            ValueType::I16 | ValueType::U16 => 16,
-            ValueType::I32 | ValueType::U32 | ValueType::F32 => 32,
-            ValueType::I64 | ValueType::U64 | ValueType::F64 => 64,
-        }
-    }
-
-    /// Construct a `ValueType` from the attributes of a base type DIE.
-    pub fn from_encoding(encoding: constants::DwAte, byte_size: u64) -> Option<ValueType> {
-        Some(match (encoding, byte_size) {
-            (constants::DW_ATE_signed, 1) => ValueType::I8,
-            (constants::DW_ATE_signed, 2) => ValueType::I16,
-            (constants::DW_ATE_signed, 4) => ValueType::I32,
-            (constants::DW_ATE_signed, 8) => ValueType::I64,
-            (constants::DW_ATE_unsigned, 1) => ValueType::U8,
-            (constants::DW_ATE_unsigned, 2) => ValueType::U16,
-            (constants::DW_ATE_unsigned, 4) => ValueType::U32,
-            (constants::DW_ATE_unsigned, 8) => ValueType::U64,
-            (constants::DW_ATE_float, 4) => ValueType::F32,
-            (constants::DW_ATE_float, 8) => ValueType::F64,
-            _ => return None,
-        })
-    }
-
-    /// Construct a `ValueType` from a base type DIE.
-    pub fn from_entry<R: Reader>(
-        entry: &DebuggingInformationEntry<R>,
-    ) -> Result<Option<ValueType>> {
-        if entry.tag() != constants::DW_TAG_base_type {
-            return Ok(None);
-        }
-        let mut encoding = None;
-        let mut byte_size = None;
-        let mut endianity = constants::DW_END_default;
-        let mut attrs = entry.attrs();
-        while let Some(attr) = attrs.next()? {
-            match attr.name() {
-                constants::DW_AT_byte_size => byte_size = attr.udata_value(),
-                constants::DW_AT_encoding => {
-                    if let AttributeValue::Encoding(x) = attr.value() {
-                        encoding = Some(x);
-                    }
-                }
-                constants::DW_AT_endianity => {
-                    if let AttributeValue::Endianity(x) = attr.value() {
-                        endianity = x;
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        if endianity != constants::DW_END_default {
-            // TODO: we could check if it matches the reader endianity,
-            // but normally it would use DW_END_default in that case.
-            return Ok(None);
-        }
-
-        if let (Some(encoding), Some(byte_size)) = (encoding, byte_size) {
-            Ok(ValueType::from_encoding(encoding, byte_size))
-        } else {
-            Ok(None)
-        }
-    }
-}
-
-impl Value {
-    /// Return the `ValueType` corresponding to this `Value`.
-    pub fn value_type(&self) -> ValueType {
-        match *self {
-            Value::Generic(_) => ValueType::Generic,
-            Value::I8(_) => ValueType::I8,
-            Value::U8(_) => ValueType::U8,
-            Value::I16(_) => ValueType::I16,
-            Value::U16(_) => ValueType::U16,
-            Value::I32(_) => ValueType::I32,
-            Value::U32(_) => ValueType::U32,
-            Value::I64(_) => ValueType::I64,
-            Value::U64(_) => ValueType::U64,
-            Value::F32(_) => ValueType::F32,
-            Value::F64(_) => ValueType::F64,
-        }
-    }
-
-    /// Read a `Value` with the given `value_type` from a `Reader`.
-    pub fn parse<R: Reader>(value_type: ValueType, mut bytes: R) -> Result<Value> {
-        let value = match value_type {
-            ValueType::I8 => Value::I8(bytes.read_i8()?),
-            ValueType::U8 => Value::U8(bytes.read_u8()?),
-            ValueType::I16 => Value::I16(bytes.read_i16()?),
-            ValueType::U16 => Value::U16(bytes.read_u16()?),
-            ValueType::I32 => Value::I32(bytes.read_i32()?),
-            ValueType::U32 => Value::U32(bytes.read_u32()?),
-            ValueType::I64 => Value::I64(bytes.read_i64()?),
-            ValueType::U64 => Value::U64(bytes.read_u64()?),
-            ValueType::F32 => Value::F32(bytes.read_f32()?),
-            ValueType::F64 => Value::F64(bytes.read_f64()?),
-            _ => return Err(Error::UnsupportedTypeOperation),
-        };
-        Ok(value)
-    }
-
-    /// Convert a `Value` to a `u64`.
-    ///
-    /// The `ValueType` of `self` must be integral.
-    /// Values are sign extended if the source value is signed.
-    pub fn to_u64(self, addr_mask: u64) -> Result<u64> {
-        let value = match self {
-            Value::Generic(value) => value & addr_mask,
-            Value::I8(value) => value as u64,
-            Value::U8(value) => u64::from(value),
-            Value::I16(value) => value as u64,
-            Value::U16(value) => u64::from(value),
-            Value::I32(value) => value as u64,
-            Value::U32(value) => u64::from(value),
-            Value::I64(value) => value as u64,
-            Value::U64(value) => value as u64,
-            _ => return Err(Error::IntegralTypeRequired),
-        };
-        Ok(value)
-    }
-
-    /// Create a `Value` with the given `value_type` from a `u64` value.
-    ///
-    /// The `value_type` may be integral or floating point.
-    /// The result is truncated if the `u64` value does
-    /// not fit the bounds of the `value_type`.
-    pub fn from_u64(value_type: ValueType, value: u64) -> Result<Value> {
-        let value = match value_type {
-            ValueType::Generic => Value::Generic(value),
-            ValueType::I8 => Value::I8(value as i8),
-            ValueType::U8 => Value::U8(value as u8),
-            ValueType::I16 => Value::I16(value as i16),
-            ValueType::U16 => Value::U16(value as u16),
-            ValueType::I32 => Value::I32(value as i32),
-            ValueType::U32 => Value::U32(value as u32),
-            ValueType::I64 => Value::I64(value as i64),
-            ValueType::U64 => Value::U64(value),
-            ValueType::F32 => Value::F32(value as f32),
-            ValueType::F64 => Value::F64(value as f64),
-        };
-        Ok(value)
-    }
-
-    /// Create a `Value` with the given `value_type` from a `f32` value.
-    ///
-    /// The `value_type` may be integral or floating point.
-    /// The result is not defined if the `f32` value does
-    /// not fit the bounds of the `value_type`.
-    fn from_f32(value_type: ValueType, value: f32) -> Result<Value> {
-        let value = match value_type {
-            ValueType::Generic => Value::Generic(value as u64),
-            ValueType::I8 => Value::I8(value as i8),
-            ValueType::U8 => Value::U8(value as u8),
-            ValueType::I16 => Value::I16(value as i16),
-            ValueType::U16 => Value::U16(value as u16),
-            ValueType::I32 => Value::I32(value as i32),
-            ValueType::U32 => Value::U32(value as u32),
-            ValueType::I64 => Value::I64(value as i64),
-            ValueType::U64 => Value::U64(value as u64),
-            ValueType::F32 => Value::F32(value),
-            ValueType::F64 => Value::F64(f64::from(value)),
-        };
-        Ok(value)
-    }
-
-    /// Create a `Value` with the given `value_type` from a `f64` value.
-    ///
-    /// The `value_type` may be integral or floating point.
-    /// The result is not defined if the `f64` value does
-    /// not fit the bounds of the `value_type`.
-    fn from_f64(value_type: ValueType, value: f64) -> Result<Value> {
-        let value = match value_type {
-            ValueType::Generic => Value::Generic(value as u64),
-            ValueType::I8 => Value::I8(value as i8),
-            ValueType::U8 => Value::U8(value as u8),
-            ValueType::I16 => Value::I16(value as i16),
-            ValueType::U16 => Value::U16(value as u16),
-            ValueType::I32 => Value::I32(value as i32),
-            ValueType::U32 => Value::U32(value as u32),
-            ValueType::I64 => Value::I64(value as i64),
-            ValueType::U64 => Value::U64(value as u64),
-            ValueType::F32 => Value::F32(value as f32),
-            ValueType::F64 => Value::F64(value),
-        };
-        Ok(value)
-    }
-
-    /// Convert a `Value` to the given `value_type`.
-    ///
-    /// When converting between integral types, the result is truncated
-    /// if the source value does not fit the bounds of the `value_type`.
-    /// When converting from floating point types, the result is not defined
-    /// if the source value does not fit the bounds of the `value_type`.
-    ///
-    /// This corresponds to the DWARF `DW_OP_convert` operation.
-    pub fn convert(self, value_type: ValueType, addr_mask: u64) -> Result<Value> {
-        match self {
-            Value::F32(value) => Value::from_f32(value_type, value),
-            Value::F64(value) => Value::from_f64(value_type, value),
-            _ => Value::from_u64(value_type, self.to_u64(addr_mask)?),
-        }
-    }
-
-    /// Reinterpret the bits in a `Value` as the given `value_type`.
-    ///
-    /// The source and result value types must have equal sizes.
-    ///
-    /// This corresponds to the DWARF `DW_OP_reinterpret` operation.
-    pub fn reinterpret(self, value_type: ValueType, addr_mask: u64) -> Result<Value> {
-        if self.value_type().bit_size(addr_mask) != value_type.bit_size(addr_mask) {
-            return Err(Error::TypeMismatch);
-        }
-        let bits = match self {
-            Value::Generic(value) => value,
-            Value::I8(value) => value as u64,
-            Value::U8(value) => u64::from(value),
-            Value::I16(value) => value as u64,
-            Value::U16(value) => u64::from(value),
-            Value::I32(value) => value as u64,
-            Value::U32(value) => u64::from(value),
-            Value::I64(value) => value as u64,
-            Value::U64(value) => value,
-            Value::F32(value) => u64::from(unsafe { mem::transmute::<f32, u32>(value) }),
-            Value::F64(value) => unsafe { mem::transmute(value) },
-        };
-        let value = match value_type {
-            ValueType::Generic => Value::Generic(bits),
-            ValueType::I8 => Value::I8(bits as i8),
-            ValueType::U8 => Value::U8(bits as u8),
-            ValueType::I16 => Value::I16(bits as i16),
-            ValueType::U16 => Value::U16(bits as u16),
-            ValueType::I32 => Value::I32(bits as i32),
-            ValueType::U32 => Value::U32(bits as u32),
-            ValueType::I64 => Value::I64(bits as i64),
-            ValueType::U64 => Value::U64(bits),
-            ValueType::F32 => Value::F32(f32::from_bits(bits as u32)),
-            ValueType::F64 => Value::F64(f64::from_bits(bits)),
-        };
-        Ok(value)
-    }
-
-    /// Perform an absolute value operation.
-    ///
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_abs` operation.
-    pub fn abs(self, addr_mask: u64) -> Result<Value> {
-        // wrapping_abs() can be used because DWARF specifies that the result is undefined
-        // for negative minimal values.
-        let value = match self {
-            Value::Generic(value) => {
-                Value::Generic(sign_extend(value, addr_mask).wrapping_abs() as u64)
-            }
-            Value::I8(value) => Value::I8(value.wrapping_abs()),
-            Value::I16(value) => Value::I16(value.wrapping_abs()),
-            Value::I32(value) => Value::I32(value.wrapping_abs()),
-            Value::I64(value) => Value::I64(value.wrapping_abs()),
-            // f32/f64::abs() is not available in libcore
-            Value::F32(value) => Value::F32(if value < 0. { -value } else { value }),
-            Value::F64(value) => Value::F64(if value < 0. { -value } else { value }),
-            Value::U8(_) | Value::U16(_) | Value::U32(_) | Value::U64(_) => self,
-        };
-        Ok(value)
-    }
-
-    /// Perform a negation operation.
-    ///
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_neg` operation.
-    pub fn neg(self, addr_mask: u64) -> Result<Value> {
-        // wrapping_neg() can be used because DWARF specifies that the result is undefined
-        // for negative minimal values.
-        let value = match self {
-            Value::Generic(value) => {
-                Value::Generic(sign_extend(value, addr_mask).wrapping_neg() as u64)
-            }
-            Value::I8(value) => Value::I8(value.wrapping_neg()),
-            Value::I16(value) => Value::I16(value.wrapping_neg()),
-            Value::I32(value) => Value::I32(value.wrapping_neg()),
-            Value::I64(value) => Value::I64(value.wrapping_neg()),
-            Value::F32(value) => Value::F32(-value),
-            Value::F64(value) => Value::F64(-value),
-            // It's unclear if these should implicity convert to a signed value.
-            // For now, we don't support them.
-            Value::U8(_) | Value::U16(_) | Value::U32(_) | Value::U64(_) => {
-                return Err(Error::UnsupportedTypeOperation);
-            }
-        };
-        Ok(value)
-    }
-
-    /// Perform an addition operation.
-    ///
-    /// This operation requires matching types.
-    ///
-    /// This corresponds to the DWARF `DW_OP_plus` operation.
-    pub fn add(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                Value::Generic(v1.wrapping_add(v2) & addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_add(v2)),
-            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_add(v2)),
-            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_add(v2)),
-            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_add(v2)),
-            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_add(v2)),
-            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_add(v2)),
-            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_add(v2)),
-            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_add(v2)),
-            (Value::F32(v1), Value::F32(v2)) => Value::F32(v1 + v2),
-            (Value::F64(v1), Value::F64(v2)) => Value::F64(v1 + v2),
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(value)
-    }
-
-    /// Perform a subtraction operation.
-    ///
-    /// This operation requires matching types.
-    ///
-    /// This corresponds to the DWARF `DW_OP_minus` operation.
-    pub fn sub(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                Value::Generic(v1.wrapping_sub(v2) & addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_sub(v2)),
-            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_sub(v2)),
-            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_sub(v2)),
-            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_sub(v2)),
-            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_sub(v2)),
-            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_sub(v2)),
-            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_sub(v2)),
-            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_sub(v2)),
-            (Value::F32(v1), Value::F32(v2)) => Value::F32(v1 - v2),
-            (Value::F64(v1), Value::F64(v2)) => Value::F64(v1 - v2),
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(value)
-    }
-
-    /// Perform a multiplication operation.
-    ///
-    /// This operation requires matching types.
-    ///
-    /// This corresponds to the DWARF `DW_OP_mul` operation.
-    pub fn mul(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                Value::Generic(v1.wrapping_mul(v2) & addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_mul(v2)),
-            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_mul(v2)),
-            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_mul(v2)),
-            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_mul(v2)),
-            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_mul(v2)),
-            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_mul(v2)),
-            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_mul(v2)),
-            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_mul(v2)),
-            (Value::F32(v1), Value::F32(v2)) => Value::F32(v1 * v2),
-            (Value::F64(v1), Value::F64(v2)) => Value::F64(v1 * v2),
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(value)
-    }
-
-    /// Perform a division operation.
-    ///
-    /// This operation requires matching types.
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_div` operation.
-    pub fn div(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        match rhs {
-            Value::Generic(v2) if sign_extend(v2, addr_mask) == 0 => {
-                return Err(Error::DivisionByZero);
-            }
-            Value::I8(0)
-            | Value::U8(0)
-            | Value::I16(0)
-            | Value::U16(0)
-            | Value::I32(0)
-            | Value::U32(0)
-            | Value::I64(0)
-            | Value::U64(0) => {
-                return Err(Error::DivisionByZero);
-            }
-            _ => {}
-        }
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                // Signed division
-                Value::Generic(
-                    sign_extend(v1, addr_mask).wrapping_div(sign_extend(v2, addr_mask)) as u64,
-                )
-            }
-            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_div(v2)),
-            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_div(v2)),
-            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_div(v2)),
-            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_div(v2)),
-            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_div(v2)),
-            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_div(v2)),
-            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_div(v2)),
-            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_div(v2)),
-            (Value::F32(v1), Value::F32(v2)) => Value::F32(v1 / v2),
-            (Value::F64(v1), Value::F64(v2)) => Value::F64(v1 / v2),
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(value)
-    }
-
-    /// Perform a remainder operation.
-    ///
-    /// This operation requires matching integral types.
-    /// If the value type is `Generic`, then it is interpreted as an unsigned value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_mod` operation.
-    pub fn rem(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        match rhs {
-            Value::Generic(rhs) if (rhs & addr_mask) == 0 => {
-                return Err(Error::DivisionByZero);
-            }
-            Value::I8(0)
-            | Value::U8(0)
-            | Value::I16(0)
-            | Value::U16(0)
-            | Value::I32(0)
-            | Value::U32(0)
-            | Value::I64(0)
-            | Value::U64(0) => {
-                return Err(Error::DivisionByZero);
-            }
-            _ => {}
-        }
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                // Unsigned modulus
-                Value::Generic((v1 & addr_mask).wrapping_rem(v2 & addr_mask))
-            }
-            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_rem(v2)),
-            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_rem(v2)),
-            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_rem(v2)),
-            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_rem(v2)),
-            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_rem(v2)),
-            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_rem(v2)),
-            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_rem(v2)),
-            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_rem(v2)),
-            (Value::F32(_), Value::F32(_)) => return Err(Error::IntegralTypeRequired),
-            (Value::F64(_), Value::F64(_)) => return Err(Error::IntegralTypeRequired),
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(value)
-    }
-
-    /// Perform a bitwise not operation.
-    ///
-    /// This operation requires matching integral types.
-    ///
-    /// This corresponds to the DWARF `DW_OP_not` operation.
-    pub fn not(self, addr_mask: u64) -> Result<Value> {
-        let value_type = self.value_type();
-        let v = self.to_u64(addr_mask)?;
-        Value::from_u64(value_type, !v)
-    }
-
-    /// Perform a bitwise and operation.
-    ///
-    /// This operation requires matching integral types.
-    ///
-    /// This corresponds to the DWARF `DW_OP_and` operation.
-    pub fn and(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value_type = self.value_type();
-        if value_type != rhs.value_type() {
-            return Err(Error::TypeMismatch);
-        }
-        let v1 = self.to_u64(addr_mask)?;
-        let v2 = rhs.to_u64(addr_mask)?;
-        Value::from_u64(value_type, v1 & v2)
-    }
-
-    /// Perform a bitwise or operation.
-    ///
-    /// This operation requires matching integral types.
-    ///
-    /// This corresponds to the DWARF `DW_OP_or` operation.
-    pub fn or(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value_type = self.value_type();
-        if value_type != rhs.value_type() {
-            return Err(Error::TypeMismatch);
-        }
-        let v1 = self.to_u64(addr_mask)?;
-        let v2 = rhs.to_u64(addr_mask)?;
-        Value::from_u64(value_type, v1 | v2)
-    }
-
-    /// Perform a bitwise exclusive-or operation.
-    ///
-    /// This operation requires matching integral types.
-    ///
-    /// This corresponds to the DWARF `DW_OP_xor` operation.
-    pub fn xor(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value_type = self.value_type();
-        if value_type != rhs.value_type() {
-            return Err(Error::TypeMismatch);
-        }
-        let v1 = self.to_u64(addr_mask)?;
-        let v2 = rhs.to_u64(addr_mask)?;
-        Value::from_u64(value_type, v1 ^ v2)
-    }
-
-    /// Convert value to bit length suitable for a shift operation.
-    ///
-    /// If the value is negative then an error is returned.
-    fn shift_length(self) -> Result<u64> {
-        let value = match self {
-            Value::Generic(value) => value,
-            Value::I8(value) if value >= 0 => value as u64,
-            Value::U8(value) => u64::from(value),
-            Value::I16(value) if value >= 0 => value as u64,
-            Value::U16(value) => u64::from(value),
-            Value::I32(value) if value >= 0 => value as u64,
-            Value::U32(value) => u64::from(value),
-            Value::I64(value) if value >= 0 => value as u64,
-            Value::U64(value) => value,
-            _ => return Err(Error::InvalidShiftExpression),
-        };
-        Ok(value)
-    }
-
-    /// Perform a shift left operation.
-    ///
-    /// This operation requires integral types.
-    /// If the shift length exceeds the type size, then 0 is returned.
-    /// If the shift length is negative then an error is returned.
-    ///
-    /// This corresponds to the DWARF `DW_OP_shl` operation.
-    pub fn shl(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let v2 = rhs.shift_length()?;
-        let value = match self {
-            Value::Generic(v1) => Value::Generic(if v2 >= u64::from(mask_bit_size(addr_mask)) {
-                0
-            } else {
-                (v1 & addr_mask) << v2
-            }),
-            Value::I8(v1) => Value::I8(if v2 >= 8 { 0 } else { v1 << v2 }),
-            Value::U8(v1) => Value::U8(if v2 >= 8 { 0 } else { v1 << v2 }),
-            Value::I16(v1) => Value::I16(if v2 >= 16 { 0 } else { v1 << v2 }),
-            Value::U16(v1) => Value::U16(if v2 >= 16 { 0 } else { v1 << v2 }),
-            Value::I32(v1) => Value::I32(if v2 >= 32 { 0 } else { v1 << v2 }),
-            Value::U32(v1) => Value::U32(if v2 >= 32 { 0 } else { v1 << v2 }),
-            Value::I64(v1) => Value::I64(if v2 >= 64 { 0 } else { v1 << v2 }),
-            Value::U64(v1) => Value::U64(if v2 >= 64 { 0 } else { v1 << v2 }),
-            _ => return Err(Error::IntegralTypeRequired),
-        };
-        Ok(value)
-    }
-
-    /// Perform a logical shift right operation.
-    ///
-    /// This operation requires an unsigned integral type for the value.
-    /// If the value type is `Generic`, then it is interpreted as an unsigned value.
-    ///
-    /// This operation requires an integral type for the shift length.
-    /// If the shift length exceeds the type size, then 0 is returned.
-    /// If the shift length is negative then an error is returned.
-    ///
-    /// This corresponds to the DWARF `DW_OP_shr` operation.
-    pub fn shr(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let v2 = rhs.shift_length()?;
-        let value = match self {
-            Value::Generic(v1) => Value::Generic(if v2 >= u64::from(mask_bit_size(addr_mask)) {
-                0
-            } else {
-                (v1 & addr_mask) >> v2
-            }),
-            Value::U8(v1) => Value::U8(if v2 >= 8 { 0 } else { v1 >> v2 }),
-            Value::U16(v1) => Value::U16(if v2 >= 16 { 0 } else { v1 >> v2 }),
-            Value::U32(v1) => Value::U32(if v2 >= 32 { 0 } else { v1 >> v2 }),
-            Value::U64(v1) => Value::U64(if v2 >= 64 { 0 } else { v1 >> v2 }),
-            // It's unclear if signed values should implicity convert to an unsigned value.
-            // For now, we don't support them.
-            Value::I8(_) | Value::I16(_) | Value::I32(_) | Value::I64(_) => {
-                return Err(Error::UnsupportedTypeOperation);
-            }
-            _ => return Err(Error::IntegralTypeRequired),
-        };
-        Ok(value)
-    }
-
-    /// Perform an arithmetic shift right operation.
-    ///
-    /// This operation requires a signed integral type for the value.
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This operation requires an integral type for the shift length.
-    /// If the shift length exceeds the type size, then 0 is returned for positive values,
-    /// and -1 is returned for negative values.
-    /// If the shift length is negative then an error is returned.
-    ///
-    /// This corresponds to the DWARF `DW_OP_shra` operation.
-    pub fn shra(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let v2 = rhs.shift_length()?;
-        let value = match self {
-            Value::Generic(v1) => {
-                let v1 = sign_extend(v1, addr_mask);
-                let value = if v2 >= u64::from(mask_bit_size(addr_mask)) {
-                    if v1 < 0 {
-                        !0
-                    } else {
-                        0
-                    }
-                } else {
-                    (v1 >> v2) as u64
-                };
-                Value::Generic(value)
-            }
-            Value::I8(v1) => Value::I8(if v2 >= 8 {
-                if v1 < 0 {
-                    !0
-                } else {
-                    0
-                }
-            } else {
-                v1 >> v2
-            }),
-            Value::I16(v1) => Value::I16(if v2 >= 16 {
-                if v1 < 0 {
-                    !0
-                } else {
-                    0
-                }
-            } else {
-                v1 >> v2
-            }),
-            Value::I32(v1) => Value::I32(if v2 >= 32 {
-                if v1 < 0 {
-                    !0
-                } else {
-                    0
-                }
-            } else {
-                v1 >> v2
-            }),
-            Value::I64(v1) => Value::I64(if v2 >= 64 {
-                if v1 < 0 {
-                    !0
-                } else {
-                    0
-                }
-            } else {
-                v1 >> v2
-            }),
-            // It's unclear if unsigned values should implicity convert to a signed value.
-            // For now, we don't support them.
-            Value::U8(_) | Value::U16(_) | Value::U32(_) | Value::U64(_) => {
-                return Err(Error::UnsupportedTypeOperation);
-            }
-            _ => return Err(Error::IntegralTypeRequired),
-        };
-        Ok(value)
-    }
-
-    /// Perform the `==` relational operation.
-    ///
-    /// This operation requires matching integral types.
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_eq` operation.
-    pub fn eq(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                sign_extend(v1, addr_mask) == sign_extend(v2, addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => v1 == v2,
-            (Value::U8(v1), Value::U8(v2)) => v1 == v2,
-            (Value::I16(v1), Value::I16(v2)) => v1 == v2,
-            (Value::U16(v1), Value::U16(v2)) => v1 == v2,
-            (Value::I32(v1), Value::I32(v2)) => v1 == v2,
-            (Value::U32(v1), Value::U32(v2)) => v1 == v2,
-            (Value::I64(v1), Value::I64(v2)) => v1 == v2,
-            (Value::U64(v1), Value::U64(v2)) => v1 == v2,
-            (Value::F32(v1), Value::F32(v2)) => v1 == v2,
-            (Value::F64(v1), Value::F64(v2)) => v1 == v2,
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(Value::Generic(value as u64))
-    }
-
-    /// Perform the `>=` relational operation.
-    ///
-    /// This operation requires matching integral types.
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_ge` operation.
-    pub fn ge(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                sign_extend(v1, addr_mask) >= sign_extend(v2, addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => v1 >= v2,
-            (Value::U8(v1), Value::U8(v2)) => v1 >= v2,
-            (Value::I16(v1), Value::I16(v2)) => v1 >= v2,
-            (Value::U16(v1), Value::U16(v2)) => v1 >= v2,
-            (Value::I32(v1), Value::I32(v2)) => v1 >= v2,
-            (Value::U32(v1), Value::U32(v2)) => v1 >= v2,
-            (Value::I64(v1), Value::I64(v2)) => v1 >= v2,
-            (Value::U64(v1), Value::U64(v2)) => v1 >= v2,
-            (Value::F32(v1), Value::F32(v2)) => v1 >= v2,
-            (Value::F64(v1), Value::F64(v2)) => v1 >= v2,
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(Value::Generic(value as u64))
-    }
-
-    /// Perform the `>` relational operation.
-    ///
-    /// This operation requires matching integral types.
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_gt` operation.
-    pub fn gt(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                sign_extend(v1, addr_mask) > sign_extend(v2, addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => v1 > v2,
-            (Value::U8(v1), Value::U8(v2)) => v1 > v2,
-            (Value::I16(v1), Value::I16(v2)) => v1 > v2,
-            (Value::U16(v1), Value::U16(v2)) => v1 > v2,
-            (Value::I32(v1), Value::I32(v2)) => v1 > v2,
-            (Value::U32(v1), Value::U32(v2)) => v1 > v2,
-            (Value::I64(v1), Value::I64(v2)) => v1 > v2,
-            (Value::U64(v1), Value::U64(v2)) => v1 > v2,
-            (Value::F32(v1), Value::F32(v2)) => v1 > v2,
-            (Value::F64(v1), Value::F64(v2)) => v1 > v2,
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(Value::Generic(value as u64))
-    }
-
-    /// Perform the `<= relational operation.
-    ///
-    /// This operation requires matching integral types.
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_le` operation.
-    pub fn le(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                sign_extend(v1, addr_mask) <= sign_extend(v2, addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => v1 <= v2,
-            (Value::U8(v1), Value::U8(v2)) => v1 <= v2,
-            (Value::I16(v1), Value::I16(v2)) => v1 <= v2,
-            (Value::U16(v1), Value::U16(v2)) => v1 <= v2,
-            (Value::I32(v1), Value::I32(v2)) => v1 <= v2,
-            (Value::U32(v1), Value::U32(v2)) => v1 <= v2,
-            (Value::I64(v1), Value::I64(v2)) => v1 <= v2,
-            (Value::U64(v1), Value::U64(v2)) => v1 <= v2,
-            (Value::F32(v1), Value::F32(v2)) => v1 <= v2,
-            (Value::F64(v1), Value::F64(v2)) => v1 <= v2,
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(Value::Generic(value as u64))
-    }
-
-    /// Perform the `< relational operation.
-    ///
-    /// This operation requires matching integral types.
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_lt` operation.
-    pub fn lt(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                sign_extend(v1, addr_mask) < sign_extend(v2, addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => v1 < v2,
-            (Value::U8(v1), Value::U8(v2)) => v1 < v2,
-            (Value::I16(v1), Value::I16(v2)) => v1 < v2,
-            (Value::U16(v1), Value::U16(v2)) => v1 < v2,
-            (Value::I32(v1), Value::I32(v2)) => v1 < v2,
-            (Value::U32(v1), Value::U32(v2)) => v1 < v2,
-            (Value::I64(v1), Value::I64(v2)) => v1 < v2,
-            (Value::U64(v1), Value::U64(v2)) => v1 < v2,
-            (Value::F32(v1), Value::F32(v2)) => v1 < v2,
-            (Value::F64(v1), Value::F64(v2)) => v1 < v2,
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(Value::Generic(value as u64))
-    }
-
-    /// Perform the `!= relational operation.
-    ///
-    /// This operation requires matching integral types.
-    /// If the value type is `Generic`, then it is interpreted as a signed value.
-    ///
-    /// This corresponds to the DWARF `DW_OP_ne` operation.
-    pub fn ne(self, rhs: Value, addr_mask: u64) -> Result<Value> {
-        let value = match (self, rhs) {
-            (Value::Generic(v1), Value::Generic(v2)) => {
-                sign_extend(v1, addr_mask) != sign_extend(v2, addr_mask)
-            }
-            (Value::I8(v1), Value::I8(v2)) => v1 != v2,
-            (Value::U8(v1), Value::U8(v2)) => v1 != v2,
-            (Value::I16(v1), Value::I16(v2)) => v1 != v2,
-            (Value::U16(v1), Value::U16(v2)) => v1 != v2,
-            (Value::I32(v1), Value::I32(v2)) => v1 != v2,
-            (Value::U32(v1), Value::U32(v2)) => v1 != v2,
-            (Value::I64(v1), Value::I64(v2)) => v1 != v2,
-            (Value::U64(v1), Value::U64(v2)) => v1 != v2,
-            (Value::F32(v1), Value::F32(v2)) => v1 != v2,
-            (Value::F64(v1), Value::F64(v2)) => v1 != v2,
-            _ => return Err(Error::TypeMismatch),
-        };
-        Ok(Value::Generic(value as u64))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::common::{DebugAbbrevOffset, Encoding, Format};
-    use crate::endianity::LittleEndian;
-    use crate::read::{
-        Abbreviation, AttributeSpecification, DebuggingInformationEntry, EndianSlice, UnitHeader,
-        UnitOffset,
-    };
-
-    #[test]
-    #[rustfmt::skip]
-    fn valuetype_from_encoding() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 4,
-        };
-        let unit = UnitHeader::new(
-            encoding,
-            7,
-            DebugAbbrevOffset(0),
-            EndianSlice::new(&[], LittleEndian),
-        );
-
-        let abbrev = Abbreviation::new(
-            42,
-            constants::DW_TAG_base_type,
-            constants::DW_CHILDREN_no,
-            vec![
-                AttributeSpecification::new(
-                    constants::DW_AT_byte_size,
-                    constants::DW_FORM_udata,
-                    None,
-                ),
-                AttributeSpecification::new(
-                    constants::DW_AT_encoding,
-                    constants::DW_FORM_udata,
-                    None,
-                ),
-                AttributeSpecification::new(
-                    constants::DW_AT_endianity,
-                    constants::DW_FORM_udata,
-                    None,
-                ),
-            ].into(),
-        );
-
-        for &(attrs, result) in &[
-            ([0x01, constants::DW_ATE_signed.0, constants::DW_END_default.0], ValueType::I8),
-            ([0x02, constants::DW_ATE_signed.0, constants::DW_END_default.0], ValueType::I16),
-            ([0x04, constants::DW_ATE_signed.0, constants::DW_END_default.0], ValueType::I32),
-            ([0x08, constants::DW_ATE_signed.0, constants::DW_END_default.0], ValueType::I64),
-            ([0x01, constants::DW_ATE_unsigned.0, constants::DW_END_default.0], ValueType::U8),
-            ([0x02, constants::DW_ATE_unsigned.0, constants::DW_END_default.0], ValueType::U16),
-            ([0x04, constants::DW_ATE_unsigned.0, constants::DW_END_default.0], ValueType::U32),
-            ([0x08, constants::DW_ATE_unsigned.0, constants::DW_END_default.0], ValueType::U64),
-            ([0x04, constants::DW_ATE_float.0, constants::DW_END_default.0], ValueType::F32),
-            ([0x08, constants::DW_ATE_float.0, constants::DW_END_default.0], ValueType::F64),
-        ] {
-            let entry = DebuggingInformationEntry::new(
-                UnitOffset(0),
-                EndianSlice::new(&attrs, LittleEndian),
-                &abbrev,
-                &unit,
-            );
-            assert_eq!(ValueType::from_entry(&entry), Ok(Some(result)));
-        }
-
-        for attrs in &[
-            [0x03, constants::DW_ATE_signed.0, constants::DW_END_default.0],
-            [0x02, constants::DW_ATE_signed.0, constants::DW_END_big.0],
-        ] {
-            let entry = DebuggingInformationEntry::new(
-                UnitOffset(0),
-                EndianSlice::new(attrs, LittleEndian),
-                &abbrev,
-                &unit,
-            );
-            assert_eq!(ValueType::from_entry(&entry), Ok(None));
-        }
-    }
-
-    #[test]
-    fn value_convert() {
-        let addr_mask = !0 >> 32;
-        for &(v, t, result) in &[
-            (Value::Generic(1), ValueType::I8, Ok(Value::I8(1))),
-            (Value::I8(1), ValueType::U8, Ok(Value::U8(1))),
-            (Value::U8(1), ValueType::I16, Ok(Value::I16(1))),
-            (Value::I16(1), ValueType::U16, Ok(Value::U16(1))),
-            (Value::U16(1), ValueType::I32, Ok(Value::I32(1))),
-            (Value::I32(1), ValueType::U32, Ok(Value::U32(1))),
-            (Value::U32(1), ValueType::F32, Ok(Value::F32(1.))),
-            (Value::F32(1.), ValueType::I64, Ok(Value::I64(1))),
-            (Value::I64(1), ValueType::U64, Ok(Value::U64(1))),
-            (Value::U64(1), ValueType::F64, Ok(Value::F64(1.))),
-            (Value::F64(1.), ValueType::Generic, Ok(Value::Generic(1))),
-        ] {
-            assert_eq!(v.convert(t, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_reinterpret() {
-        let addr_mask = !0 >> 32;
-        for &(v, t, result) in &[
-            // 8-bit
-            (Value::I8(-1), ValueType::U8, Ok(Value::U8(0xff))),
-            (Value::U8(0xff), ValueType::I8, Ok(Value::I8(-1))),
-            // 16-bit
-            (Value::I16(1), ValueType::U16, Ok(Value::U16(1))),
-            (Value::U16(1), ValueType::I16, Ok(Value::I16(1))),
-            // 32-bit
-            (Value::Generic(1), ValueType::I32, Ok(Value::I32(1))),
-            (Value::I32(1), ValueType::U32, Ok(Value::U32(1))),
-            (Value::U32(0x3f80_0000), ValueType::F32, Ok(Value::F32(1.0))),
-            (Value::F32(1.0), ValueType::Generic, Ok(Value::Generic(0x3f80_0000))),
-            // Type mismatches
-            (Value::Generic(1), ValueType::U8, Err(Error::TypeMismatch)),
-            (Value::U8(1), ValueType::U16, Err(Error::TypeMismatch)),
-            (Value::U16(1), ValueType::U32, Err(Error::TypeMismatch)),
-            (Value::U32(1), ValueType::U64, Err(Error::TypeMismatch)),
-            (Value::U64(1), ValueType::Generic, Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v.reinterpret(t, addr_mask), result);
-        }
-
-        let addr_mask = !0;
-        for &(v, t, result) in &[
-            // 64-bit
-            (Value::Generic(1), ValueType::I64, Ok(Value::I64(1))),
-            (Value::I64(1), ValueType::U64, Ok(Value::U64(1))),
-            (Value::U64(0x3ff0_0000_0000_0000), ValueType::F64, Ok(Value::F64(1.0))),
-            (Value::F64(1.0), ValueType::Generic, Ok(Value::Generic(0x3ff0_0000_0000_0000))),
-        ] {
-            assert_eq!(v.reinterpret(t, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_abs() {
-        let addr_mask = 0xffff_ffff;
-        for &(v, result) in &[
-            (Value::Generic(0xffff_ffff), Ok(Value::Generic(1))),
-            (Value::I8(-1), Ok(Value::I8(1))),
-            (Value::U8(1), Ok(Value::U8(1))),
-            (Value::I16(-1), Ok(Value::I16(1))),
-            (Value::U16(1), Ok(Value::U16(1))),
-            (Value::I32(-1), Ok(Value::I32(1))),
-            (Value::U32(1), Ok(Value::U32(1))),
-            (Value::I64(-1), Ok(Value::I64(1))),
-            (Value::U64(1), Ok(Value::U64(1))),
-            (Value::F32(-1.), Ok(Value::F32(1.))),
-            (Value::F64(-1.), Ok(Value::F64(1.))),
-        ] {
-            assert_eq!(v.abs(addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_neg() {
-        let addr_mask = 0xffff_ffff;
-        for &(v, result) in &[
-            (Value::Generic(0xffff_ffff), Ok(Value::Generic(1))),
-            (Value::I8(1), Ok(Value::I8(-1))),
-            (Value::U8(1), Err(Error::UnsupportedTypeOperation)),
-            (Value::I16(1), Ok(Value::I16(-1))),
-            (Value::U16(1), Err(Error::UnsupportedTypeOperation)),
-            (Value::I32(1), Ok(Value::I32(-1))),
-            (Value::U32(1), Err(Error::UnsupportedTypeOperation)),
-            (Value::I64(1), Ok(Value::I64(-1))),
-            (Value::U64(1), Err(Error::UnsupportedTypeOperation)),
-            (Value::F32(1.), Ok(Value::F32(-1.))),
-            (Value::F64(1.), Ok(Value::F64(-1.))),
-        ] {
-            assert_eq!(v.neg(addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_add() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(1), Value::Generic(2), Ok(Value::Generic(3))),
-            (Value::I8(-1), Value::I8(2), Ok(Value::I8(1))),
-            (Value::U8(1), Value::U8(2), Ok(Value::U8(3))),
-            (Value::I16(-1), Value::I16(2), Ok(Value::I16(1))),
-            (Value::U16(1), Value::U16(2), Ok(Value::U16(3))),
-            (Value::I32(-1), Value::I32(2), Ok(Value::I32(1))),
-            (Value::U32(1), Value::U32(2), Ok(Value::U32(3))),
-            (Value::I64(-1), Value::I64(2), Ok(Value::I64(1))),
-            (Value::U64(1), Value::U64(2), Ok(Value::U64(3))),
-            (Value::F32(-1.), Value::F32(2.), Ok(Value::F32(1.))),
-            (Value::F64(-1.), Value::F64(2.), Ok(Value::F64(1.))),
-            (Value::Generic(1), Value::U32(2), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.add(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_sub() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(2), Ok(Value::Generic(1))),
-            (Value::I8(-1), Value::I8(2), Ok(Value::I8(-3))),
-            (Value::U8(3), Value::U8(2), Ok(Value::U8(1))),
-            (Value::I16(-1), Value::I16(2), Ok(Value::I16(-3))),
-            (Value::U16(3), Value::U16(2), Ok(Value::U16(1))),
-            (Value::I32(-1), Value::I32(2), Ok(Value::I32(-3))),
-            (Value::U32(3), Value::U32(2), Ok(Value::U32(1))),
-            (Value::I64(-1), Value::I64(2), Ok(Value::I64(-3))),
-            (Value::U64(3), Value::U64(2), Ok(Value::U64(1))),
-            (Value::F32(-1.), Value::F32(2.), Ok(Value::F32(-3.))),
-            (Value::F64(-1.), Value::F64(2.), Ok(Value::F64(-3.))),
-            (Value::Generic(3), Value::U32(2), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.sub(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_mul() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(2), Value::Generic(3), Ok(Value::Generic(6))),
-            (Value::I8(-2), Value::I8(3), Ok(Value::I8(-6))),
-            (Value::U8(2), Value::U8(3), Ok(Value::U8(6))),
-            (Value::I16(-2), Value::I16(3), Ok(Value::I16(-6))),
-            (Value::U16(2), Value::U16(3), Ok(Value::U16(6))),
-            (Value::I32(-2), Value::I32(3), Ok(Value::I32(-6))),
-            (Value::U32(2), Value::U32(3), Ok(Value::U32(6))),
-            (Value::I64(-2), Value::I64(3), Ok(Value::I64(-6))),
-            (Value::U64(2), Value::U64(3), Ok(Value::U64(6))),
-            (Value::F32(-2.), Value::F32(3.), Ok(Value::F32(-6.))),
-            (Value::F64(-2.), Value::F64(3.), Ok(Value::F64(-6.))),
-            (Value::Generic(2), Value::U32(3), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.mul(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_div() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(6), Value::Generic(3), Ok(Value::Generic(2))),
-            (Value::I8(-6), Value::I8(3), Ok(Value::I8(-2))),
-            (Value::U8(6), Value::U8(3), Ok(Value::U8(2))),
-            (Value::I16(-6), Value::I16(3), Ok(Value::I16(-2))),
-            (Value::U16(6), Value::U16(3), Ok(Value::U16(2))),
-            (Value::I32(-6), Value::I32(3), Ok(Value::I32(-2))),
-            (Value::U32(6), Value::U32(3), Ok(Value::U32(2))),
-            (Value::I64(-6), Value::I64(3), Ok(Value::I64(-2))),
-            (Value::U64(6), Value::U64(3), Ok(Value::U64(2))),
-            (Value::F32(-6.), Value::F32(3.), Ok(Value::F32(-2.))),
-            (Value::F64(-6.), Value::F64(3.), Ok(Value::F64(-2.))),
-            (Value::Generic(6), Value::U32(3), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.div(v2, addr_mask), result);
-        }
-        for &(v1, v2, result) in &[
-            (Value::Generic(6), Value::Generic(0), Err(Error::DivisionByZero)),
-            (Value::I8(-6), Value::I8(0), Err(Error::DivisionByZero)),
-            (Value::U8(6), Value::U8(0), Err(Error::DivisionByZero)),
-            (Value::I16(-6), Value::I16(0), Err(Error::DivisionByZero)),
-            (Value::U16(6), Value::U16(0), Err(Error::DivisionByZero)),
-            (Value::I32(-6), Value::I32(0), Err(Error::DivisionByZero)),
-            (Value::U32(6), Value::U32(0), Err(Error::DivisionByZero)),
-            (Value::I64(-6), Value::I64(0), Err(Error::DivisionByZero)),
-            (Value::U64(6), Value::U64(0), Err(Error::DivisionByZero)),
-            (Value::F32(-6.), Value::F32(0.), Ok(Value::F32(-6. / 0.))),
-            (Value::F64(-6.), Value::F64(0.), Ok(Value::F64(-6. / 0.))),
-        ] {
-            assert_eq!(v1.div(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_rem() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(2), Ok(Value::Generic(1))),
-            (Value::I8(-3), Value::I8(2), Ok(Value::I8(-1))),
-            (Value::U8(3), Value::U8(2), Ok(Value::U8(1))),
-            (Value::I16(-3), Value::I16(2), Ok(Value::I16(-1))),
-            (Value::U16(3), Value::U16(2), Ok(Value::U16(1))),
-            (Value::I32(-3), Value::I32(2), Ok(Value::I32(-1))),
-            (Value::U32(3), Value::U32(2), Ok(Value::U32(1))),
-            (Value::I64(-3), Value::I64(2), Ok(Value::I64(-1))),
-            (Value::U64(3), Value::U64(2), Ok(Value::U64(1))),
-            (Value::F32(-3.), Value::F32(2.), Err(Error::IntegralTypeRequired)),
-            (Value::F64(-3.), Value::F64(2.), Err(Error::IntegralTypeRequired)),
-            (Value::Generic(3), Value::U32(2), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.rem(v2, addr_mask), result);
-        }
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(0), Err(Error::DivisionByZero)),
-            (Value::I8(-3), Value::I8(0), Err(Error::DivisionByZero)),
-            (Value::U8(3), Value::U8(0), Err(Error::DivisionByZero)),
-            (Value::I16(-3), Value::I16(0), Err(Error::DivisionByZero)),
-            (Value::U16(3), Value::U16(0), Err(Error::DivisionByZero)),
-            (Value::I32(-3), Value::I32(0), Err(Error::DivisionByZero)),
-            (Value::U32(3), Value::U32(0), Err(Error::DivisionByZero)),
-            (Value::I64(-3), Value::I64(0), Err(Error::DivisionByZero)),
-            (Value::U64(3), Value::U64(0), Err(Error::DivisionByZero)),
-        ] {
-            assert_eq!(v1.rem(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_not() {
-        let addr_mask = 0xffff_ffff;
-        for &(v, result) in &[
-            (Value::Generic(1), Ok(Value::Generic(!1))),
-            (Value::I8(1), Ok(Value::I8(!1))),
-            (Value::U8(1), Ok(Value::U8(!1))),
-            (Value::I16(1), Ok(Value::I16(!1))),
-            (Value::U16(1), Ok(Value::U16(!1))),
-            (Value::I32(1), Ok(Value::I32(!1))),
-            (Value::U32(1), Ok(Value::U32(!1))),
-            (Value::I64(1), Ok(Value::I64(!1))),
-            (Value::U64(1), Ok(Value::U64(!1))),
-            (Value::F32(1.), Err(Error::IntegralTypeRequired)),
-            (Value::F64(1.), Err(Error::IntegralTypeRequired)),
-        ] {
-            assert_eq!(v.not(addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_and() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(5), Ok(Value::Generic(1))),
-            (Value::I8(3), Value::I8(5), Ok(Value::I8(1))),
-            (Value::U8(3), Value::U8(5), Ok(Value::U8(1))),
-            (Value::I16(3), Value::I16(5), Ok(Value::I16(1))),
-            (Value::U16(3), Value::U16(5), Ok(Value::U16(1))),
-            (Value::I32(3), Value::I32(5), Ok(Value::I32(1))),
-            (Value::U32(3), Value::U32(5), Ok(Value::U32(1))),
-            (Value::I64(3), Value::I64(5), Ok(Value::I64(1))),
-            (Value::U64(3), Value::U64(5), Ok(Value::U64(1))),
-            (Value::F32(3.), Value::F32(5.), Err(Error::IntegralTypeRequired)),
-            (Value::F64(3.), Value::F64(5.), Err(Error::IntegralTypeRequired)),
-            (Value::Generic(3), Value::U32(5), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.and(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_or() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(5), Ok(Value::Generic(7))),
-            (Value::I8(3), Value::I8(5), Ok(Value::I8(7))),
-            (Value::U8(3), Value::U8(5), Ok(Value::U8(7))),
-            (Value::I16(3), Value::I16(5), Ok(Value::I16(7))),
-            (Value::U16(3), Value::U16(5), Ok(Value::U16(7))),
-            (Value::I32(3), Value::I32(5), Ok(Value::I32(7))),
-            (Value::U32(3), Value::U32(5), Ok(Value::U32(7))),
-            (Value::I64(3), Value::I64(5), Ok(Value::I64(7))),
-            (Value::U64(3), Value::U64(5), Ok(Value::U64(7))),
-            (Value::F32(3.), Value::F32(5.), Err(Error::IntegralTypeRequired)),
-            (Value::F64(3.), Value::F64(5.), Err(Error::IntegralTypeRequired)),
-            (Value::Generic(3), Value::U32(5), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.or(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_xor() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(5), Ok(Value::Generic(6))),
-            (Value::I8(3), Value::I8(5), Ok(Value::I8(6))),
-            (Value::U8(3), Value::U8(5), Ok(Value::U8(6))),
-            (Value::I16(3), Value::I16(5), Ok(Value::I16(6))),
-            (Value::U16(3), Value::U16(5), Ok(Value::U16(6))),
-            (Value::I32(3), Value::I32(5), Ok(Value::I32(6))),
-            (Value::U32(3), Value::U32(5), Ok(Value::U32(6))),
-            (Value::I64(3), Value::I64(5), Ok(Value::I64(6))),
-            (Value::U64(3), Value::U64(5), Ok(Value::U64(6))),
-            (Value::F32(3.), Value::F32(5.), Err(Error::IntegralTypeRequired)),
-            (Value::F64(3.), Value::F64(5.), Err(Error::IntegralTypeRequired)),
-            (Value::Generic(3), Value::U32(5), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.xor(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_shl() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            // One of each type
-            (Value::Generic(3), Value::Generic(5), Ok(Value::Generic(96))),
-            (Value::I8(3), Value::U8(5), Ok(Value::I8(96))),
-            (Value::U8(3), Value::I8(5), Ok(Value::U8(96))),
-            (Value::I16(3), Value::U16(5), Ok(Value::I16(96))),
-            (Value::U16(3), Value::I16(5), Ok(Value::U16(96))),
-            (Value::I32(3), Value::U32(5), Ok(Value::I32(96))),
-            (Value::U32(3), Value::I32(5), Ok(Value::U32(96))),
-            (Value::I64(3), Value::U64(5), Ok(Value::I64(96))),
-            (Value::U64(3), Value::I64(5), Ok(Value::U64(96))),
-            (Value::F32(3.), Value::U8(5), Err(Error::IntegralTypeRequired)),
-            (Value::F64(3.), Value::U8(5), Err(Error::IntegralTypeRequired)),
-            // Invalid shifts
-            (Value::U8(3), Value::I8(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(3), Value::I16(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(3), Value::I32(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(3), Value::I64(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(3), Value::F32(5.), Err(Error::InvalidShiftExpression)),
-            (Value::U8(3), Value::F64(5.), Err(Error::InvalidShiftExpression)),
-            // Large shifts
-            (Value::Generic(3), Value::Generic(32), Ok(Value::Generic(0))),
-            (Value::I8(3), Value::U8(8), Ok(Value::I8(0))),
-            (Value::U8(3), Value::I8(9), Ok(Value::U8(0))),
-            (Value::I16(3), Value::U16(17), Ok(Value::I16(0))),
-            (Value::U16(3), Value::I16(16), Ok(Value::U16(0))),
-            (Value::I32(3), Value::U32(32), Ok(Value::I32(0))),
-            (Value::U32(3), Value::I32(33), Ok(Value::U32(0))),
-            (Value::I64(3), Value::U64(65), Ok(Value::I64(0))),
-            (Value::U64(3), Value::I64(64), Ok(Value::U64(0))),
-        ] {
-            assert_eq!(v1.shl(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_shr() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            // One of each type
-            (Value::Generic(96), Value::Generic(5), Ok(Value::Generic(3))),
-            (Value::I8(96), Value::U8(5), Err(Error::UnsupportedTypeOperation)),
-            (Value::U8(96), Value::I8(5), Ok(Value::U8(3))),
-            (Value::I16(96), Value::U16(5), Err(Error::UnsupportedTypeOperation)),
-            (Value::U16(96), Value::I16(5), Ok(Value::U16(3))),
-            (Value::I32(96), Value::U32(5), Err(Error::UnsupportedTypeOperation)),
-            (Value::U32(96), Value::I32(5), Ok(Value::U32(3))),
-            (Value::I64(96), Value::U64(5), Err(Error::UnsupportedTypeOperation)),
-            (Value::U64(96), Value::I64(5), Ok(Value::U64(3))),
-            (Value::F32(96.), Value::U8(5), Err(Error::IntegralTypeRequired)),
-            (Value::F64(96.), Value::U8(5), Err(Error::IntegralTypeRequired)),
-            // Invalid shifts
-            (Value::U8(96), Value::I8(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::I16(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::I32(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::I64(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::F32(5.), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::F64(5.), Err(Error::InvalidShiftExpression)),
-            // Large shifts
-            (Value::Generic(96), Value::Generic(32), Ok(Value::Generic(0))),
-            (Value::U8(96), Value::I8(9), Ok(Value::U8(0))),
-            (Value::U16(96), Value::I16(16), Ok(Value::U16(0))),
-            (Value::U32(96), Value::I32(33), Ok(Value::U32(0))),
-            (Value::U64(96), Value::I64(64), Ok(Value::U64(0))),
-        ] {
-            assert_eq!(v1.shr(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn value_shra() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            // One of each type
-            (Value::Generic(u64::from(-96i32 as u32)), Value::Generic(5), Ok(Value::Generic(-3i64 as u64))),
-            (Value::I8(-96), Value::U8(5), Ok(Value::I8(-3))),
-            (Value::U8(96), Value::I8(5), Err(Error::UnsupportedTypeOperation)),
-            (Value::I16(-96), Value::U16(5), Ok(Value::I16(-3))),
-            (Value::U16(96), Value::I16(5), Err(Error::UnsupportedTypeOperation)),
-            (Value::I32(-96), Value::U32(5), Ok(Value::I32(-3))),
-            (Value::U32(96), Value::I32(5), Err(Error::UnsupportedTypeOperation)),
-            (Value::I64(-96), Value::U64(5), Ok(Value::I64(-3))),
-            (Value::U64(96), Value::I64(5), Err(Error::UnsupportedTypeOperation)),
-            (Value::F32(96.), Value::U8(5), Err(Error::IntegralTypeRequired)),
-            (Value::F64(96.), Value::U8(5), Err(Error::IntegralTypeRequired)),
-            // Invalid shifts
-            (Value::U8(96), Value::I8(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::I16(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::I32(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::I64(-5), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::F32(5.), Err(Error::InvalidShiftExpression)),
-            (Value::U8(96), Value::F64(5.), Err(Error::InvalidShiftExpression)),
-            // Large shifts
-            (Value::Generic(96), Value::Generic(32), Ok(Value::Generic(0))),
-            (Value::I8(96), Value::U8(8), Ok(Value::I8(0))),
-            (Value::I8(-96), Value::U8(8), Ok(Value::I8(-1))),
-            (Value::I16(96), Value::U16(17), Ok(Value::I16(0))),
-            (Value::I16(-96), Value::U16(17), Ok(Value::I16(-1))),
-            (Value::I32(96), Value::U32(32), Ok(Value::I32(0))),
-            (Value::I32(-96), Value::U32(32), Ok(Value::I32(-1))),
-            (Value::I64(96), Value::U64(65), Ok(Value::I64(0))),
-            (Value::I64(-96), Value::U64(65), Ok(Value::I64(-1))),
-        ] {
-            assert_eq!(v1.shra(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    fn value_eq() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(3), Ok(Value::Generic(1))),
-            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(0))),
-            (Value::I8(3), Value::I8(3), Ok(Value::Generic(1))),
-            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(0))),
-            (Value::U8(3), Value::U8(3), Ok(Value::Generic(1))),
-            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(0))),
-            (Value::I16(3), Value::I16(3), Ok(Value::Generic(1))),
-            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(0))),
-            (Value::U16(3), Value::U16(3), Ok(Value::Generic(1))),
-            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(0))),
-            (Value::I32(3), Value::I32(3), Ok(Value::Generic(1))),
-            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(0))),
-            (Value::U32(3), Value::U32(3), Ok(Value::Generic(1))),
-            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(0))),
-            (Value::I64(3), Value::I64(3), Ok(Value::Generic(1))),
-            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(0))),
-            (Value::U64(3), Value::U64(3), Ok(Value::Generic(1))),
-            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(0))),
-            (Value::F32(3.), Value::F32(3.), Ok(Value::Generic(1))),
-            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(0))),
-            (Value::F64(3.), Value::F64(3.), Ok(Value::Generic(1))),
-            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(0))),
-            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.eq(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    fn value_ne() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(3), Ok(Value::Generic(0))),
-            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(1))),
-            (Value::I8(3), Value::I8(3), Ok(Value::Generic(0))),
-            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(1))),
-            (Value::U8(3), Value::U8(3), Ok(Value::Generic(0))),
-            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(1))),
-            (Value::I16(3), Value::I16(3), Ok(Value::Generic(0))),
-            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(1))),
-            (Value::U16(3), Value::U16(3), Ok(Value::Generic(0))),
-            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(1))),
-            (Value::I32(3), Value::I32(3), Ok(Value::Generic(0))),
-            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(1))),
-            (Value::U32(3), Value::U32(3), Ok(Value::Generic(0))),
-            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(1))),
-            (Value::I64(3), Value::I64(3), Ok(Value::Generic(0))),
-            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(1))),
-            (Value::U64(3), Value::U64(3), Ok(Value::Generic(0))),
-            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(1))),
-            (Value::F32(3.), Value::F32(3.), Ok(Value::Generic(0))),
-            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(1))),
-            (Value::F64(3.), Value::F64(3.), Ok(Value::Generic(0))),
-            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(1))),
-            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.ne(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    fn value_ge() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(!3), Ok(Value::Generic(1))),
-            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(0))),
-            (Value::I8(3), Value::I8(!3), Ok(Value::Generic(1))),
-            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(0))),
-            (Value::U8(3), Value::U8(!3), Ok(Value::Generic(0))),
-            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(1))),
-            (Value::I16(3), Value::I16(!3), Ok(Value::Generic(1))),
-            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(0))),
-            (Value::U16(3), Value::U16(!3), Ok(Value::Generic(0))),
-            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(1))),
-            (Value::I32(3), Value::I32(!3), Ok(Value::Generic(1))),
-            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(0))),
-            (Value::U32(3), Value::U32(!3), Ok(Value::Generic(0))),
-            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(1))),
-            (Value::I64(3), Value::I64(!3), Ok(Value::Generic(1))),
-            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(0))),
-            (Value::U64(3), Value::U64(!3), Ok(Value::Generic(0))),
-            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(1))),
-            (Value::F32(3.), Value::F32(-3.), Ok(Value::Generic(1))),
-            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(0))),
-            (Value::F64(3.), Value::F64(-3.), Ok(Value::Generic(1))),
-            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(0))),
-            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.ge(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    fn value_gt() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(!3), Ok(Value::Generic(1))),
-            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(0))),
-            (Value::I8(3), Value::I8(!3), Ok(Value::Generic(1))),
-            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(0))),
-            (Value::U8(3), Value::U8(!3), Ok(Value::Generic(0))),
-            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(1))),
-            (Value::I16(3), Value::I16(!3), Ok(Value::Generic(1))),
-            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(0))),
-            (Value::U16(3), Value::U16(!3), Ok(Value::Generic(0))),
-            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(1))),
-            (Value::I32(3), Value::I32(!3), Ok(Value::Generic(1))),
-            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(0))),
-            (Value::U32(3), Value::U32(!3), Ok(Value::Generic(0))),
-            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(1))),
-            (Value::I64(3), Value::I64(!3), Ok(Value::Generic(1))),
-            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(0))),
-            (Value::U64(3), Value::U64(!3), Ok(Value::Generic(0))),
-            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(1))),
-            (Value::F32(3.), Value::F32(-3.), Ok(Value::Generic(1))),
-            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(0))),
-            (Value::F64(3.), Value::F64(-3.), Ok(Value::Generic(1))),
-            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(0))),
-            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.gt(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    fn value_le() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(!3), Ok(Value::Generic(0))),
-            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(1))),
-            (Value::I8(3), Value::I8(!3), Ok(Value::Generic(0))),
-            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(1))),
-            (Value::U8(3), Value::U8(!3), Ok(Value::Generic(1))),
-            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(0))),
-            (Value::I16(3), Value::I16(!3), Ok(Value::Generic(0))),
-            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(1))),
-            (Value::U16(3), Value::U16(!3), Ok(Value::Generic(1))),
-            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(0))),
-            (Value::I32(3), Value::I32(!3), Ok(Value::Generic(0))),
-            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(1))),
-            (Value::U32(3), Value::U32(!3), Ok(Value::Generic(1))),
-            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(0))),
-            (Value::I64(3), Value::I64(!3), Ok(Value::Generic(0))),
-            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(1))),
-            (Value::U64(3), Value::U64(!3), Ok(Value::Generic(1))),
-            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(0))),
-            (Value::F32(3.), Value::F32(-3.), Ok(Value::Generic(0))),
-            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(1))),
-            (Value::F64(3.), Value::F64(-3.), Ok(Value::Generic(0))),
-            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(1))),
-            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.le(v2, addr_mask), result);
-        }
-    }
-
-    #[test]
-    fn value_lt() {
-        let addr_mask = 0xffff_ffff;
-        for &(v1, v2, result) in &[
-            (Value::Generic(3), Value::Generic(!3), Ok(Value::Generic(0))),
-            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(1))),
-            (Value::I8(3), Value::I8(!3), Ok(Value::Generic(0))),
-            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(1))),
-            (Value::U8(3), Value::U8(!3), Ok(Value::Generic(1))),
-            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(0))),
-            (Value::I16(3), Value::I16(!3), Ok(Value::Generic(0))),
-            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(1))),
-            (Value::U16(3), Value::U16(!3), Ok(Value::Generic(1))),
-            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(0))),
-            (Value::I32(3), Value::I32(!3), Ok(Value::Generic(0))),
-            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(1))),
-            (Value::U32(3), Value::U32(!3), Ok(Value::Generic(1))),
-            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(0))),
-            (Value::I64(3), Value::I64(!3), Ok(Value::Generic(0))),
-            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(1))),
-            (Value::U64(3), Value::U64(!3), Ok(Value::Generic(1))),
-            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(0))),
-            (Value::F32(3.), Value::F32(-3.), Ok(Value::Generic(0))),
-            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(1))),
-            (Value::F64(3.), Value::F64(-3.), Ok(Value::Generic(0))),
-            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(1))),
-            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
-        ] {
-            assert_eq!(v1.lt(v2, addr_mask), result);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/test_util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/test_util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/test_util.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/test_util.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#![allow(missing_docs)]
-
-use crate::Format;
-use test_assembler::{Label, Section};
-
-pub trait GimliSectionMethods {
-    fn sleb(self, val: i64) -> Self;
-    fn uleb(self, val: u64) -> Self;
-    fn initial_length(self, format: Format, length: &Label, start: &Label) -> Self;
-    fn word(self, size: u8, val: u64) -> Self;
-    fn word_label(self, size: u8, val: &Label) -> Self;
-}
-
-impl GimliSectionMethods for Section {
-    fn sleb(mut self, mut val: i64) -> Self {
-        while val & !0x3f != 0 && val | 0x3f != -1 {
-            self = self.D8(val as u8 | 0x80);
-            val >>= 7;
-        }
-        self.D8(val as u8 & 0x7f)
-    }
-
-    fn uleb(mut self, mut val: u64) -> Self {
-        while val & !0x7f != 0 {
-            self = self.D8(val as u8 | 0x80);
-            val >>= 7;
-        }
-        self.D8(val as u8)
-    }
-
-    fn initial_length(self, format: Format, length: &Label, start: &Label) -> Self {
-        match format {
-            Format::Dwarf32 => self.D32(length).mark(start),
-            Format::Dwarf64 => self.D32(0xffff_ffff).D64(length).mark(start),
-        }
-    }
-
-    fn word(self, size: u8, val: u64) -> Self {
-        match size {
-            4 => self.D32(val as u32),
-            8 => self.D64(val),
-            _ => panic!("unsupported word size"),
-        }
-    }
-
-    fn word_label(self, size: u8, val: &Label) -> Self {
-        match size {
-            4 => self.D32(val),
-            8 => self.D64(val),
-            _ => panic!("unsupported word size"),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/abbrev.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/abbrev.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/abbrev.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/abbrev.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-use alloc::vec::Vec;
-use indexmap::IndexSet;
-use std::ops::{Deref, DerefMut};
-
-use crate::common::{DebugAbbrevOffset, SectionId};
-use crate::constants;
-use crate::write::{Result, Section, Writer};
-
-/// A table of abbreviations that will be stored in a `.debug_abbrev` section.
-// Requirements:
-// - values are `Abbreviation`
-// - insertion returns an abbreviation code for use in writing a DIE
-// - inserting a duplicate returns the code of the existing value
-#[derive(Debug, Default)]
-pub(crate) struct AbbreviationTable {
-    abbrevs: IndexSet<Abbreviation>,
-}
-
-impl AbbreviationTable {
-    /// Add an abbreviation to the table and return its code.
-    pub fn add(&mut self, abbrev: Abbreviation) -> u64 {
-        let (code, _) = self.abbrevs.insert_full(abbrev);
-        // Code must be non-zero
-        (code + 1) as u64
-    }
-
-    /// Write the abbreviation table to the `.debug_abbrev` section.
-    pub fn write<W: Writer>(&self, w: &mut DebugAbbrev<W>) -> Result<()> {
-        for (code, abbrev) in self.abbrevs.iter().enumerate() {
-            w.write_uleb128((code + 1) as u64)?;
-            abbrev.write(w)?;
-        }
-        // Null abbreviation code
-        w.write_u8(0)
-    }
-}
-
-/// An abbreviation describes the shape of a `DebuggingInformationEntry`'s type:
-/// its tag type, whether it has children, and its set of attributes.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub(crate) struct Abbreviation {
-    tag: constants::DwTag,
-    has_children: bool,
-    attributes: Vec<AttributeSpecification>,
-}
-
-impl Abbreviation {
-    /// Construct a new `Abbreviation`.
-    #[inline]
-    pub fn new(
-        tag: constants::DwTag,
-        has_children: bool,
-        attributes: Vec<AttributeSpecification>,
-    ) -> Abbreviation {
-        Abbreviation {
-            tag,
-            has_children,
-            attributes,
-        }
-    }
-
-    /// Write the abbreviation to the `.debug_abbrev` section.
-    pub fn write<W: Writer>(&self, w: &mut DebugAbbrev<W>) -> Result<()> {
-        w.write_uleb128(self.tag.0.into())?;
-        w.write_u8(if self.has_children {
-            constants::DW_CHILDREN_yes.0
-        } else {
-            constants::DW_CHILDREN_no.0
-        })?;
-        for attr in &self.attributes {
-            attr.write(w)?;
-        }
-        // Null name and form
-        w.write_u8(0)?;
-        w.write_u8(0)
-    }
-}
-
-/// The description of an attribute in an abbreviated type.
-// TODO: support implicit const
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub(crate) struct AttributeSpecification {
-    name: constants::DwAt,
-    form: constants::DwForm,
-}
-
-impl AttributeSpecification {
-    /// Construct a new `AttributeSpecification`.
-    #[inline]
-    pub fn new(name: constants::DwAt, form: constants::DwForm) -> AttributeSpecification {
-        AttributeSpecification { name, form }
-    }
-
-    /// Write the attribute specification to the `.debug_abbrev` section.
-    #[inline]
-    pub fn write<W: Writer>(&self, w: &mut DebugAbbrev<W>) -> Result<()> {
-        w.write_uleb128(self.name.0.into())?;
-        w.write_uleb128(self.form.0.into())
-    }
-}
-
-define_section!(
-    DebugAbbrev,
-    DebugAbbrevOffset,
-    "A writable `.debug_abbrev` section."
-);
-
-#[cfg(test)]
-#[cfg(feature = "read")]
-mod tests {
-    use super::*;
-    use crate::constants;
-    use crate::read;
-    use crate::write::EndianVec;
-    use crate::LittleEndian;
-
-    #[test]
-    fn test_abbreviation_table() {
-        let mut abbrevs = AbbreviationTable::default();
-        let abbrev1 = Abbreviation::new(
-            constants::DW_TAG_subprogram,
-            false,
-            vec![AttributeSpecification::new(
-                constants::DW_AT_name,
-                constants::DW_FORM_string,
-            )],
-        );
-        let abbrev2 = Abbreviation::new(
-            constants::DW_TAG_compile_unit,
-            true,
-            vec![
-                AttributeSpecification::new(constants::DW_AT_producer, constants::DW_FORM_strp),
-                AttributeSpecification::new(constants::DW_AT_language, constants::DW_FORM_data2),
-            ],
-        );
-        let code1 = abbrevs.add(abbrev1.clone());
-        assert_eq!(code1, 1);
-        let code2 = abbrevs.add(abbrev2.clone());
-        assert_eq!(code2, 2);
-        assert_eq!(abbrevs.add(abbrev1.clone()), code1);
-        assert_eq!(abbrevs.add(abbrev2.clone()), code2);
-
-        let mut debug_abbrev = DebugAbbrev::from(EndianVec::new(LittleEndian));
-        let debug_abbrev_offset = debug_abbrev.offset();
-        assert_eq!(debug_abbrev_offset, DebugAbbrevOffset(0));
-        abbrevs.write(&mut debug_abbrev).unwrap();
-        assert_eq!(debug_abbrev.offset(), DebugAbbrevOffset(17));
-
-        let read_debug_abbrev = read::DebugAbbrev::new(debug_abbrev.slice(), LittleEndian);
-        let read_abbrevs = read_debug_abbrev
-            .abbreviations(debug_abbrev_offset)
-            .unwrap();
-
-        let read_abbrev1 = read_abbrevs.get(code1).unwrap();
-        assert_eq!(abbrev1.tag, read_abbrev1.tag());
-        assert_eq!(abbrev1.has_children, read_abbrev1.has_children());
-        assert_eq!(abbrev1.attributes.len(), read_abbrev1.attributes().len());
-        assert_eq!(
-            abbrev1.attributes[0].name,
-            read_abbrev1.attributes()[0].name()
-        );
-        assert_eq!(
-            abbrev1.attributes[0].form,
-            read_abbrev1.attributes()[0].form()
-        );
-
-        let read_abbrev2 = read_abbrevs.get(code2).unwrap();
-        assert_eq!(abbrev2.tag, read_abbrev2.tag());
-        assert_eq!(abbrev2.has_children, read_abbrev2.has_children());
-        assert_eq!(abbrev2.attributes.len(), read_abbrev2.attributes().len());
-        assert_eq!(
-            abbrev2.attributes[0].name,
-            read_abbrev2.attributes()[0].name()
-        );
-        assert_eq!(
-            abbrev2.attributes[0].form,
-            read_abbrev2.attributes()[0].form()
-        );
-        assert_eq!(
-            abbrev2.attributes[1].name,
-            read_abbrev2.attributes()[1].name()
-        );
-        assert_eq!(
-            abbrev2.attributes[1].form,
-            read_abbrev2.attributes()[1].form()
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/cfi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/cfi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/cfi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/cfi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1012 +0,0 @@
-use alloc::vec::Vec;
-use indexmap::IndexSet;
-use std::ops::{Deref, DerefMut};
-
-use crate::common::{DebugFrameOffset, EhFrameOffset, Encoding, Format, Register, SectionId};
-use crate::constants;
-use crate::write::{Address, BaseId, Error, Expression, Result, Section, Writer};
-
-define_section!(
-    DebugFrame,
-    DebugFrameOffset,
-    "A writable `.debug_frame` section."
-);
-
-define_section!(EhFrame, EhFrameOffset, "A writable `.eh_frame` section.");
-
-define_id!(CieId, "An identifier for a CIE in a `FrameTable`.");
-
-/// A table of frame description entries.
-#[derive(Debug, Default)]
-pub struct FrameTable {
-    /// Base id for CIEs.
-    base_id: BaseId,
-    /// The common information entries.
-    cies: IndexSet<CommonInformationEntry>,
-    /// The frame description entries.
-    fdes: Vec<(CieId, FrameDescriptionEntry)>,
-}
-
-impl FrameTable {
-    /// Add a CIE and return its id.
-    ///
-    /// If the CIE already exists, then return the id of the existing CIE.
-    pub fn add_cie(&mut self, cie: CommonInformationEntry) -> CieId {
-        let (index, _) = self.cies.insert_full(cie);
-        CieId::new(self.base_id, index)
-    }
-
-    /// The number of CIEs.
-    pub fn cie_count(&self) -> usize {
-        self.cies.len()
-    }
-
-    /// Add a FDE.
-    ///
-    /// Does not check for duplicates.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the CIE id is invalid.
-    pub fn add_fde(&mut self, cie: CieId, fde: FrameDescriptionEntry) {
-        debug_assert_eq!(self.base_id, cie.base_id);
-        self.fdes.push((cie, fde));
-    }
-
-    /// The number of FDEs.
-    pub fn fde_count(&self) -> usize {
-        self.fdes.len()
-    }
-
-    /// Write the frame table entries to the given `.debug_frame` section.
-    pub fn write_debug_frame<W: Writer>(&self, w: &mut DebugFrame<W>) -> Result<()> {
-        self.write(&mut w.0, false)
-    }
-
-    /// Write the frame table entries to the given `.eh_frame` section.
-    pub fn write_eh_frame<W: Writer>(&self, w: &mut EhFrame<W>) -> Result<()> {
-        self.write(&mut w.0, true)
-    }
-
-    fn write<W: Writer>(&self, w: &mut W, eh_frame: bool) -> Result<()> {
-        let mut cie_offsets = vec![None; self.cies.len()];
-        for (cie_id, fde) in &self.fdes {
-            let cie_index = cie_id.index;
-            let cie = self.cies.get_index(cie_index).unwrap();
-            let cie_offset = match cie_offsets[cie_index] {
-                Some(offset) => offset,
-                None => {
-                    // Only write CIEs as they are referenced.
-                    let offset = cie.write(w, eh_frame)?;
-                    cie_offsets[cie_index] = Some(offset);
-                    offset
-                }
-            };
-
-            fde.write(w, eh_frame, cie_offset, cie)?;
-        }
-        // TODO: write length 0 terminator for eh_frame?
-        Ok(())
-    }
-}
-
-/// A common information entry. This contains information that is shared between FDEs.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct CommonInformationEntry {
-    encoding: Encoding,
-
-    /// A constant that is factored out of code offsets.
-    ///
-    /// This should be set to the minimum instruction length.
-    /// Writing a code offset that is not a multiple of this factor will generate an error.
-    code_alignment_factor: u8,
-
-    /// A constant that is factored out of data offsets.
-    ///
-    /// This should be set to the minimum data alignment for the frame.
-    /// Writing a data offset that is not a multiple of this factor will generate an error.
-    data_alignment_factor: i8,
-
-    /// The return address register. This might not correspond to an actual machine register.
-    return_address_register: Register,
-
-    /// The address of the personality function and its encoding.
-    pub personality: Option<(constants::DwEhPe, Address)>,
-
-    /// The encoding to use for the LSDA address in FDEs.
-    ///
-    /// If set then all FDEs which use this CIE must have a LSDA address.
-    pub lsda_encoding: Option<constants::DwEhPe>,
-
-    /// The encoding to use for addresses in FDEs.
-    pub fde_address_encoding: constants::DwEhPe,
-
-    /// True for signal trampolines.
-    pub signal_trampoline: bool,
-
-    /// The initial instructions upon entry to this function.
-    instructions: Vec<CallFrameInstruction>,
-}
-
-impl CommonInformationEntry {
-    /// Create a new common information entry.
-    ///
-    /// The encoding version must be a CFI version, not a DWARF version.
-    pub fn new(
-        encoding: Encoding,
-        code_alignment_factor: u8,
-        data_alignment_factor: i8,
-        return_address_register: Register,
-    ) -> Self {
-        CommonInformationEntry {
-            encoding,
-            code_alignment_factor,
-            data_alignment_factor,
-            return_address_register,
-            personality: None,
-            lsda_encoding: None,
-            fde_address_encoding: constants::DW_EH_PE_absptr,
-            signal_trampoline: false,
-            instructions: Vec::new(),
-        }
-    }
-
-    /// Add an initial instruction.
-    pub fn add_instruction(&mut self, instruction: CallFrameInstruction) {
-        self.instructions.push(instruction);
-    }
-
-    fn has_augmentation(&self) -> bool {
-        self.personality.is_some()
-            || self.lsda_encoding.is_some()
-            || self.signal_trampoline
-            || self.fde_address_encoding != constants::DW_EH_PE_absptr
-    }
-
-    /// Returns the section offset of the CIE.
-    fn write<W: Writer>(&self, w: &mut W, eh_frame: bool) -> Result<usize> {
-        let encoding = self.encoding;
-        let offset = w.len();
-
-        let length_offset = w.write_initial_length(encoding.format)?;
-        let length_base = w.len();
-
-        if eh_frame {
-            w.write_u32(0)?;
-        } else {
-            match encoding.format {
-                Format::Dwarf32 => w.write_u32(0xffff_ffff)?,
-                Format::Dwarf64 => w.write_u64(0xffff_ffff_ffff_ffff)?,
-            }
-        }
-
-        if eh_frame {
-            if encoding.version != 1 {
-                return Err(Error::UnsupportedVersion(encoding.version));
-            };
-        } else {
-            match encoding.version {
-                1 | 3 | 4 => {}
-                _ => return Err(Error::UnsupportedVersion(encoding.version)),
-            };
-        }
-        w.write_u8(encoding.version as u8)?;
-
-        let augmentation = self.has_augmentation();
-        if augmentation {
-            w.write_u8(b'z')?;
-            if self.lsda_encoding.is_some() {
-                w.write_u8(b'L')?;
-            }
-            if self.personality.is_some() {
-                w.write_u8(b'P')?;
-            }
-            if self.fde_address_encoding != constants::DW_EH_PE_absptr {
-                w.write_u8(b'R')?;
-            }
-            if self.signal_trampoline {
-                w.write_u8(b'S')?;
-            }
-        }
-        w.write_u8(0)?;
-
-        if encoding.version >= 4 {
-            w.write_u8(encoding.address_size)?;
-            // TODO: segment_selector_size
-            w.write_u8(0)?;
-        }
-
-        w.write_uleb128(self.code_alignment_factor.into())?;
-        w.write_sleb128(self.data_alignment_factor.into())?;
-
-        if !eh_frame && encoding.version == 1 {
-            let register = self.return_address_register.0 as u8;
-            if u16::from(register) != self.return_address_register.0 {
-                return Err(Error::ValueTooLarge);
-            }
-            w.write_u8(register)?;
-        } else {
-            w.write_uleb128(self.return_address_register.0.into())?;
-        }
-
-        if augmentation {
-            let augmentation_length_offset = w.len();
-            w.write_u8(0)?;
-            let augmentation_length_base = w.len();
-
-            if let Some(eh_pe) = self.lsda_encoding {
-                w.write_u8(eh_pe.0)?;
-            }
-            if let Some((eh_pe, address)) = self.personality {
-                w.write_u8(eh_pe.0)?;
-                w.write_eh_pointer(address, constants::DW_EH_PE_absptr, encoding.address_size)?;
-            }
-            if self.fde_address_encoding != constants::DW_EH_PE_absptr {
-                w.write_u8(self.fde_address_encoding.0)?;
-            }
-
-            let augmentation_length = (w.len() - augmentation_length_base) as u64;
-            debug_assert!(augmentation_length < 0x80);
-            w.write_udata_at(augmentation_length_offset, augmentation_length, 1)?;
-        }
-
-        for instruction in &self.instructions {
-            instruction.write(w, encoding, self)?;
-        }
-
-        write_nop(
-            w,
-            encoding.format.word_size() as usize + w.len() - length_base,
-            encoding.address_size,
-        )?;
-
-        let length = (w.len() - length_base) as u64;
-        w.write_initial_length_at(length_offset, length, encoding.format)?;
-
-        Ok(offset)
-    }
-}
-
-/// A frame description entry. There should be one FDE per function.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct FrameDescriptionEntry {
-    /// The initial address of the function.
-    address: Address,
-
-    /// The length in bytes of the function.
-    length: u32,
-
-    /// The address of the LSDA.
-    pub lsda: Option<Address>,
-
-    /// The instructions for this function, ordered by offset.
-    instructions: Vec<(u32, CallFrameInstruction)>,
-}
-
-impl FrameDescriptionEntry {
-    /// Create a new frame description entry for a function.
-    pub fn new(address: Address, length: u32) -> Self {
-        FrameDescriptionEntry {
-            address,
-            length,
-            lsda: None,
-            instructions: Vec::new(),
-        }
-    }
-
-    /// Add an instruction.
-    ///
-    /// Instructions must be added in increasing order of offset, or writing will fail.
-    pub fn add_instruction(&mut self, offset: u32, instruction: CallFrameInstruction) {
-        debug_assert!(self.instructions.last().map(|x| x.0).unwrap_or(0) <= offset);
-        self.instructions.push((offset, instruction));
-    }
-
-    fn write<W: Writer>(
-        &self,
-        w: &mut W,
-        eh_frame: bool,
-        cie_offset: usize,
-        cie: &CommonInformationEntry,
-    ) -> Result<()> {
-        let encoding = cie.encoding;
-        let length_offset = w.write_initial_length(encoding.format)?;
-        let length_base = w.len();
-
-        if eh_frame {
-            // .eh_frame uses a relative offset which doesn't need relocation.
-            w.write_udata((w.len() - cie_offset) as u64, 4)?;
-        } else {
-            w.write_offset(
-                cie_offset,
-                SectionId::DebugFrame,
-                encoding.format.word_size(),
-            )?;
-        }
-
-        if cie.fde_address_encoding != constants::DW_EH_PE_absptr {
-            w.write_eh_pointer(
-                self.address,
-                cie.fde_address_encoding,
-                encoding.address_size,
-            )?;
-            w.write_eh_pointer_data(
-                self.length.into(),
-                cie.fde_address_encoding.format(),
-                encoding.address_size,
-            )?;
-        } else {
-            w.write_address(self.address, encoding.address_size)?;
-            w.write_udata(self.length.into(), encoding.address_size)?;
-        }
-
-        if cie.has_augmentation() {
-            let mut augmentation_length = 0u64;
-            if self.lsda.is_some() {
-                augmentation_length += u64::from(encoding.address_size);
-            }
-            w.write_uleb128(augmentation_length)?;
-
-            debug_assert_eq!(self.lsda.is_some(), cie.lsda_encoding.is_some());
-            if let (Some(lsda), Some(lsda_encoding)) = (self.lsda, cie.lsda_encoding) {
-                w.write_eh_pointer(lsda, lsda_encoding, encoding.address_size)?;
-            }
-        }
-
-        let mut prev_offset = 0;
-        for (offset, instruction) in &self.instructions {
-            write_advance_loc(w, cie.code_alignment_factor, prev_offset, *offset)?;
-            prev_offset = *offset;
-            instruction.write(w, encoding, cie)?;
-        }
-
-        write_nop(
-            w,
-            encoding.format.word_size() as usize + w.len() - length_base,
-            encoding.address_size,
-        )?;
-
-        let length = (w.len() - length_base) as u64;
-        w.write_initial_length_at(length_offset, length, encoding.format)?;
-
-        Ok(())
-    }
-}
-
-/// An instruction in a frame description entry.
-///
-/// This may be a CFA definition, a register rule, or some other directive.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum CallFrameInstruction {
-    /// Define the CFA rule to use the provided register and offset.
-    Cfa(Register, i32),
-    /// Update the CFA rule to use the provided register. The offset is unchanged.
-    CfaRegister(Register),
-    /// Update the CFA rule to use the provided offset. The register is unchanged.
-    CfaOffset(i32),
-    /// Define the CFA rule to use the provided expression.
-    CfaExpression(Expression),
-
-    /// Restore the initial rule for the register.
-    Restore(Register),
-    /// The previous value of the register is not recoverable.
-    Undefined(Register),
-    /// The register has not been modified.
-    SameValue(Register),
-    /// The previous value of the register is saved at address CFA + offset.
-    Offset(Register, i32),
-    /// The previous value of the register is CFA + offset.
-    ValOffset(Register, i32),
-    /// The previous value of the register is stored in another register.
-    Register(Register, Register),
-    /// The previous value of the register is saved at address given by the expression.
-    Expression(Register, Expression),
-    /// The previous value of the register is given by the expression.
-    ValExpression(Register, Expression),
-
-    /// Push all register rules onto a stack.
-    RememberState,
-    /// Pop all register rules off the stack.
-    RestoreState,
-    /// The size of the arguments that have been pushed onto the stack.
-    ArgsSize(u32),
-}
-
-impl CallFrameInstruction {
-    fn write<W: Writer>(
-        &self,
-        w: &mut W,
-        encoding: Encoding,
-        cie: &CommonInformationEntry,
-    ) -> Result<()> {
-        match *self {
-            CallFrameInstruction::Cfa(register, offset) => {
-                if offset < 0 {
-                    let offset = factored_data_offset(offset, cie.data_alignment_factor)?;
-                    w.write_u8(constants::DW_CFA_def_cfa_sf.0)?;
-                    w.write_uleb128(register.0.into())?;
-                    w.write_sleb128(offset.into())?;
-                } else {
-                    // Unfactored offset.
-                    w.write_u8(constants::DW_CFA_def_cfa.0)?;
-                    w.write_uleb128(register.0.into())?;
-                    w.write_uleb128(offset as u64)?;
-                }
-            }
-            CallFrameInstruction::CfaRegister(register) => {
-                w.write_u8(constants::DW_CFA_def_cfa_register.0)?;
-                w.write_uleb128(register.0.into())?;
-            }
-            CallFrameInstruction::CfaOffset(offset) => {
-                if offset < 0 {
-                    let offset = factored_data_offset(offset, cie.data_alignment_factor)?;
-                    w.write_u8(constants::DW_CFA_def_cfa_offset_sf.0)?;
-                    w.write_sleb128(offset.into())?;
-                } else {
-                    // Unfactored offset.
-                    w.write_u8(constants::DW_CFA_def_cfa_offset.0)?;
-                    w.write_uleb128(offset as u64)?;
-                }
-            }
-            CallFrameInstruction::CfaExpression(ref expression) => {
-                w.write_u8(constants::DW_CFA_def_cfa_expression.0)?;
-                w.write_uleb128(expression.size(encoding, None) as u64)?;
-                expression.write(w, None, encoding, None)?;
-            }
-            CallFrameInstruction::Restore(register) => {
-                if register.0 < 0x40 {
-                    w.write_u8(constants::DW_CFA_restore.0 | register.0 as u8)?;
-                } else {
-                    w.write_u8(constants::DW_CFA_restore_extended.0)?;
-                    w.write_uleb128(register.0.into())?;
-                }
-            }
-            CallFrameInstruction::Undefined(register) => {
-                w.write_u8(constants::DW_CFA_undefined.0)?;
-                w.write_uleb128(register.0.into())?;
-            }
-            CallFrameInstruction::SameValue(register) => {
-                w.write_u8(constants::DW_CFA_same_value.0)?;
-                w.write_uleb128(register.0.into())?;
-            }
-            CallFrameInstruction::Offset(register, offset) => {
-                let offset = factored_data_offset(offset, cie.data_alignment_factor)?;
-                if offset < 0 {
-                    w.write_u8(constants::DW_CFA_offset_extended_sf.0)?;
-                    w.write_uleb128(register.0.into())?;
-                    w.write_sleb128(offset.into())?;
-                } else if register.0 < 0x40 {
-                    w.write_u8(constants::DW_CFA_offset.0 | register.0 as u8)?;
-                    w.write_uleb128(offset as u64)?;
-                } else {
-                    w.write_u8(constants::DW_CFA_offset_extended.0)?;
-                    w.write_uleb128(register.0.into())?;
-                    w.write_uleb128(offset as u64)?;
-                }
-            }
-            CallFrameInstruction::ValOffset(register, offset) => {
-                let offset = factored_data_offset(offset, cie.data_alignment_factor)?;
-                if offset < 0 {
-                    w.write_u8(constants::DW_CFA_val_offset_sf.0)?;
-                    w.write_uleb128(register.0.into())?;
-                    w.write_sleb128(offset.into())?;
-                } else {
-                    w.write_u8(constants::DW_CFA_val_offset.0)?;
-                    w.write_uleb128(register.0.into())?;
-                    w.write_uleb128(offset as u64)?;
-                }
-            }
-            CallFrameInstruction::Register(register1, register2) => {
-                w.write_u8(constants::DW_CFA_register.0)?;
-                w.write_uleb128(register1.0.into())?;
-                w.write_uleb128(register2.0.into())?;
-            }
-            CallFrameInstruction::Expression(register, ref expression) => {
-                w.write_u8(constants::DW_CFA_expression.0)?;
-                w.write_uleb128(register.0.into())?;
-                w.write_uleb128(expression.size(encoding, None) as u64)?;
-                expression.write(w, None, encoding, None)?;
-            }
-            CallFrameInstruction::ValExpression(register, ref expression) => {
-                w.write_u8(constants::DW_CFA_val_expression.0)?;
-                w.write_uleb128(register.0.into())?;
-                w.write_uleb128(expression.size(encoding, None) as u64)?;
-                expression.write(w, None, encoding, None)?;
-            }
-            CallFrameInstruction::RememberState => {
-                w.write_u8(constants::DW_CFA_remember_state.0)?;
-            }
-            CallFrameInstruction::RestoreState => {
-                w.write_u8(constants::DW_CFA_restore_state.0)?;
-            }
-            CallFrameInstruction::ArgsSize(size) => {
-                w.write_u8(constants::DW_CFA_GNU_args_size.0)?;
-                w.write_uleb128(size.into())?;
-            }
-        }
-        Ok(())
-    }
-}
-
-fn write_advance_loc<W: Writer>(
-    w: &mut W,
-    code_alignment_factor: u8,
-    prev_offset: u32,
-    offset: u32,
-) -> Result<()> {
-    if offset == prev_offset {
-        return Ok(());
-    }
-    let delta = factored_code_delta(prev_offset, offset, code_alignment_factor)?;
-    if delta < 0x40 {
-        w.write_u8(constants::DW_CFA_advance_loc.0 | delta as u8)?;
-    } else if delta < 0x100 {
-        w.write_u8(constants::DW_CFA_advance_loc1.0)?;
-        w.write_u8(delta as u8)?;
-    } else if delta < 0x10000 {
-        w.write_u8(constants::DW_CFA_advance_loc2.0)?;
-        w.write_u16(delta as u16)?;
-    } else {
-        w.write_u8(constants::DW_CFA_advance_loc4.0)?;
-        w.write_u32(delta)?;
-    }
-    Ok(())
-}
-
-fn write_nop<W: Writer>(w: &mut W, len: usize, align: u8) -> Result<()> {
-    debug_assert_eq!(align & (align - 1), 0);
-    let tail_len = (!len + 1) & (align as usize - 1);
-    for _ in 0..tail_len {
-        w.write_u8(constants::DW_CFA_nop.0)?;
-    }
-    Ok(())
-}
-
-fn factored_code_delta(prev_offset: u32, offset: u32, factor: u8) -> Result<u32> {
-    if offset < prev_offset {
-        return Err(Error::InvalidFrameCodeOffset(offset));
-    }
-    let delta = offset - prev_offset;
-    let factor = u32::from(factor);
-    let factored_delta = delta / factor;
-    if delta != factored_delta * factor {
-        return Err(Error::InvalidFrameCodeOffset(offset));
-    }
-    Ok(factored_delta)
-}
-
-fn factored_data_offset(offset: i32, factor: i8) -> Result<i32> {
-    let factor = i32::from(factor);
-    let factored_offset = offset / factor;
-    if offset != factored_offset * factor {
-        return Err(Error::InvalidFrameDataOffset(offset));
-    }
-    Ok(factored_offset)
-}
-
-#[cfg(feature = "read")]
-pub(crate) mod convert {
-    use super::*;
-    use crate::read::{self, Reader};
-    use crate::write::{ConvertError, ConvertResult};
-    use std::collections::{hash_map, HashMap};
-
-    impl FrameTable {
-        /// Create a frame table by reading the data in the given section.
-        ///
-        /// `convert_address` is a function to convert read addresses into the `Address`
-        /// type. For non-relocatable addresses, this function may simply return
-        /// `Address::Constant(address)`. For relocatable addresses, it is the caller's
-        /// responsibility to determine the symbol and addend corresponding to the address
-        /// and return `Address::Symbol { symbol, addend }`.
-        pub fn from<R, Section>(
-            frame: &Section,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-        ) -> ConvertResult<FrameTable>
-        where
-            R: Reader<Offset = usize>,
-            Section: read::UnwindSection<R>,
-            Section::Offset: read::UnwindOffset<usize>,
-        {
-            let bases = read::BaseAddresses::default().set_eh_frame(0);
-
-            let mut frame_table = FrameTable::default();
-
-            let mut cie_ids = HashMap::new();
-            let mut entries = frame.entries(&bases);
-            while let Some(entry) = entries.next()? {
-                let partial = match entry {
-                    read::CieOrFde::Cie(_) => continue,
-                    read::CieOrFde::Fde(partial) => partial,
-                };
-
-                // TODO: is it worth caching the parsed CIEs? It would be better if FDEs only
-                // stored a reference.
-                let from_fde = partial.parse(Section::cie_from_offset)?;
-                let from_cie = from_fde.cie();
-                let cie_id = match cie_ids.entry(from_cie.offset()) {
-                    hash_map::Entry::Occupied(o) => *o.get(),
-                    hash_map::Entry::Vacant(e) => {
-                        let cie =
-                            CommonInformationEntry::from(from_cie, frame, &bases, convert_address)?;
-                        let cie_id = frame_table.add_cie(cie);
-                        e.insert(cie_id);
-                        cie_id
-                    }
-                };
-                let fde = FrameDescriptionEntry::from(&from_fde, frame, &bases, convert_address)?;
-                frame_table.add_fde(cie_id, fde);
-            }
-
-            Ok(frame_table)
-        }
-    }
-
-    impl CommonInformationEntry {
-        fn from<R, Section>(
-            from_cie: &read::CommonInformationEntry<R>,
-            frame: &Section,
-            bases: &read::BaseAddresses,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-        ) -> ConvertResult<CommonInformationEntry>
-        where
-            R: Reader<Offset = usize>,
-            Section: read::UnwindSection<R>,
-            Section::Offset: read::UnwindOffset<usize>,
-        {
-            let mut cie = CommonInformationEntry::new(
-                from_cie.encoding(),
-                from_cie.code_alignment_factor() as u8,
-                from_cie.data_alignment_factor() as i8,
-                from_cie.return_address_register(),
-            );
-
-            cie.personality = match from_cie.personality_with_encoding() {
-                // We treat these the same because the encoding already determines
-                // whether it is indirect.
-                Some((eh_pe, read::Pointer::Direct(p)))
-                | Some((eh_pe, read::Pointer::Indirect(p))) => {
-                    let address = convert_address(p).ok_or(ConvertError::InvalidAddress)?;
-                    Some((eh_pe, address))
-                }
-                _ => None,
-            };
-            cie.lsda_encoding = from_cie.lsda_encoding();
-            cie.fde_address_encoding = from_cie
-                .fde_address_encoding()
-                .unwrap_or(constants::DW_EH_PE_absptr);
-            cie.signal_trampoline = from_cie.is_signal_trampoline();
-
-            let mut offset = 0;
-            let mut from_instructions = from_cie.instructions(frame, bases);
-            while let Some(from_instruction) = from_instructions.next()? {
-                if let Some(instruction) = CallFrameInstruction::from(
-                    from_instruction,
-                    from_cie,
-                    convert_address,
-                    &mut offset,
-                )? {
-                    cie.instructions.push(instruction);
-                }
-            }
-            Ok(cie)
-        }
-    }
-
-    impl FrameDescriptionEntry {
-        fn from<R, Section>(
-            from_fde: &read::FrameDescriptionEntry<R>,
-            frame: &Section,
-            bases: &read::BaseAddresses,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-        ) -> ConvertResult<FrameDescriptionEntry>
-        where
-            R: Reader<Offset = usize>,
-            Section: read::UnwindSection<R>,
-            Section::Offset: read::UnwindOffset<usize>,
-        {
-            let address =
-                convert_address(from_fde.initial_address()).ok_or(ConvertError::InvalidAddress)?;
-            let length = from_fde.len() as u32;
-            let mut fde = FrameDescriptionEntry::new(address, length);
-
-            match from_fde.lsda() {
-                // We treat these the same because the encoding already determines
-                // whether it is indirect.
-                Some(read::Pointer::Direct(p)) | Some(read::Pointer::Indirect(p)) => {
-                    let address = convert_address(p).ok_or(ConvertError::InvalidAddress)?;
-                    fde.lsda = Some(address);
-                }
-                None => {}
-            }
-
-            let from_cie = from_fde.cie();
-            let mut offset = 0;
-            let mut from_instructions = from_fde.instructions(frame, bases);
-            while let Some(from_instruction) = from_instructions.next()? {
-                if let Some(instruction) = CallFrameInstruction::from(
-                    from_instruction,
-                    from_cie,
-                    convert_address,
-                    &mut offset,
-                )? {
-                    fde.instructions.push((offset, instruction));
-                }
-            }
-
-            Ok(fde)
-        }
-    }
-
-    impl CallFrameInstruction {
-        fn from<R: Reader<Offset = usize>>(
-            from_instruction: read::CallFrameInstruction<R>,
-            from_cie: &read::CommonInformationEntry<R>,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-            offset: &mut u32,
-        ) -> ConvertResult<Option<CallFrameInstruction>> {
-            let convert_expression =
-                |x| Expression::from(x, from_cie.encoding(), None, None, None, convert_address);
-            // TODO: validate integer type conversions
-            Ok(Some(match from_instruction {
-                read::CallFrameInstruction::SetLoc { .. } => {
-                    return Err(ConvertError::UnsupportedCfiInstruction);
-                }
-                read::CallFrameInstruction::AdvanceLoc { delta } => {
-                    *offset += delta * from_cie.code_alignment_factor() as u32;
-                    return Ok(None);
-                }
-                read::CallFrameInstruction::DefCfa { register, offset } => {
-                    CallFrameInstruction::Cfa(register, offset as i32)
-                }
-                read::CallFrameInstruction::DefCfaSf {
-                    register,
-                    factored_offset,
-                } => {
-                    let offset = factored_offset * from_cie.data_alignment_factor();
-                    CallFrameInstruction::Cfa(register, offset as i32)
-                }
-                read::CallFrameInstruction::DefCfaRegister { register } => {
-                    CallFrameInstruction::CfaRegister(register)
-                }
-
-                read::CallFrameInstruction::DefCfaOffset { offset } => {
-                    CallFrameInstruction::CfaOffset(offset as i32)
-                }
-                read::CallFrameInstruction::DefCfaOffsetSf { factored_offset } => {
-                    let offset = factored_offset * from_cie.data_alignment_factor();
-                    CallFrameInstruction::CfaOffset(offset as i32)
-                }
-                read::CallFrameInstruction::DefCfaExpression { expression } => {
-                    CallFrameInstruction::CfaExpression(convert_expression(expression)?)
-                }
-                read::CallFrameInstruction::Undefined { register } => {
-                    CallFrameInstruction::Undefined(register)
-                }
-                read::CallFrameInstruction::SameValue { register } => {
-                    CallFrameInstruction::SameValue(register)
-                }
-                read::CallFrameInstruction::Offset {
-                    register,
-                    factored_offset,
-                } => {
-                    let offset = factored_offset as i64 * from_cie.data_alignment_factor();
-                    CallFrameInstruction::Offset(register, offset as i32)
-                }
-                read::CallFrameInstruction::OffsetExtendedSf {
-                    register,
-                    factored_offset,
-                } => {
-                    let offset = factored_offset * from_cie.data_alignment_factor();
-                    CallFrameInstruction::Offset(register, offset as i32)
-                }
-                read::CallFrameInstruction::ValOffset {
-                    register,
-                    factored_offset,
-                } => {
-                    let offset = factored_offset as i64 * from_cie.data_alignment_factor();
-                    CallFrameInstruction::ValOffset(register, offset as i32)
-                }
-                read::CallFrameInstruction::ValOffsetSf {
-                    register,
-                    factored_offset,
-                } => {
-                    let offset = factored_offset * from_cie.data_alignment_factor();
-                    CallFrameInstruction::ValOffset(register, offset as i32)
-                }
-                read::CallFrameInstruction::Register {
-                    dest_register,
-                    src_register,
-                } => CallFrameInstruction::Register(dest_register, src_register),
-                read::CallFrameInstruction::Expression {
-                    register,
-                    expression,
-                } => CallFrameInstruction::Expression(register, convert_expression(expression)?),
-                read::CallFrameInstruction::ValExpression {
-                    register,
-                    expression,
-                } => CallFrameInstruction::ValExpression(register, convert_expression(expression)?),
-                read::CallFrameInstruction::Restore { register } => {
-                    CallFrameInstruction::Restore(register)
-                }
-                read::CallFrameInstruction::RememberState => CallFrameInstruction::RememberState,
-                read::CallFrameInstruction::RestoreState => CallFrameInstruction::RestoreState,
-                read::CallFrameInstruction::ArgsSize { size } => {
-                    CallFrameInstruction::ArgsSize(size as u32)
-                }
-                read::CallFrameInstruction::Nop => return Ok(None),
-            }))
-        }
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "read")]
-mod tests {
-    use super::*;
-    use crate::arch::X86_64;
-    use crate::read;
-    use crate::write::EndianVec;
-    use crate::LittleEndian;
-
-    #[test]
-    fn test_frame_table() {
-        for &version in &[1, 3, 4] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-                    let mut frames = FrameTable::default();
-
-                    let cie1 = CommonInformationEntry::new(encoding, 1, 8, X86_64::RA);
-                    let cie1_id = frames.add_cie(cie1.clone());
-                    assert_eq!(cie1_id, frames.add_cie(cie1.clone()));
-
-                    let mut cie2 = CommonInformationEntry::new(encoding, 1, 8, X86_64::RA);
-                    cie2.lsda_encoding = Some(constants::DW_EH_PE_absptr);
-                    cie2.personality =
-                        Some((constants::DW_EH_PE_absptr, Address::Constant(0x1234)));
-                    cie2.signal_trampoline = true;
-                    let cie2_id = frames.add_cie(cie2.clone());
-                    assert_ne!(cie1_id, cie2_id);
-                    assert_eq!(cie2_id, frames.add_cie(cie2.clone()));
-
-                    let fde1 = FrameDescriptionEntry::new(Address::Constant(0x1000), 0x10);
-                    frames.add_fde(cie1_id, fde1.clone());
-
-                    let fde2 = FrameDescriptionEntry::new(Address::Constant(0x2000), 0x20);
-                    frames.add_fde(cie1_id, fde2.clone());
-
-                    let mut fde3 = FrameDescriptionEntry::new(Address::Constant(0x3000), 0x30);
-                    fde3.lsda = Some(Address::Constant(0x3300));
-                    frames.add_fde(cie2_id, fde3.clone());
-
-                    let mut fde4 = FrameDescriptionEntry::new(Address::Constant(0x4000), 0x40);
-                    fde4.lsda = Some(Address::Constant(0x4400));
-                    frames.add_fde(cie2_id, fde4.clone());
-
-                    // Test writing `.debug_frame`.
-                    let mut debug_frame = DebugFrame::from(EndianVec::new(LittleEndian));
-                    frames.write_debug_frame(&mut debug_frame).unwrap();
-
-                    let mut read_debug_frame =
-                        read::DebugFrame::new(debug_frame.slice(), LittleEndian);
-                    read_debug_frame.set_address_size(address_size);
-                    let convert_frames = FrameTable::from(&read_debug_frame, &|address| {
-                        Some(Address::Constant(address))
-                    })
-                    .unwrap();
-                    assert_eq!(frames.cies, convert_frames.cies);
-                    assert_eq!(frames.fdes.len(), convert_frames.fdes.len());
-                    for (a, b) in frames.fdes.iter().zip(convert_frames.fdes.iter()) {
-                        assert_eq!(a.1, b.1);
-                    }
-
-                    if version == 1 {
-                        // Test writing `.eh_frame`.
-                        let mut eh_frame = EhFrame::from(EndianVec::new(LittleEndian));
-                        frames.write_eh_frame(&mut eh_frame).unwrap();
-
-                        let mut read_eh_frame = read::EhFrame::new(eh_frame.slice(), LittleEndian);
-                        read_eh_frame.set_address_size(address_size);
-                        let convert_frames = FrameTable::from(&read_eh_frame, &|address| {
-                            Some(Address::Constant(address))
-                        })
-                        .unwrap();
-                        assert_eq!(frames.cies, convert_frames.cies);
-                        assert_eq!(frames.fdes.len(), convert_frames.fdes.len());
-                        for (a, b) in frames.fdes.iter().zip(convert_frames.fdes.iter()) {
-                            assert_eq!(a.1, b.1);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_frame_instruction() {
-        let mut expression = Expression::new();
-        expression.op_constu(0);
-
-        let cie_instructions = [
-            CallFrameInstruction::Cfa(X86_64::RSP, 8),
-            CallFrameInstruction::Offset(X86_64::RA, -8),
-        ];
-
-        let fde_instructions = [
-            (0, CallFrameInstruction::Cfa(X86_64::RSP, 0)),
-            (0, CallFrameInstruction::Cfa(X86_64::RSP, -8)),
-            (2, CallFrameInstruction::CfaRegister(X86_64::RBP)),
-            (4, CallFrameInstruction::CfaOffset(8)),
-            (4, CallFrameInstruction::CfaOffset(0)),
-            (4, CallFrameInstruction::CfaOffset(-8)),
-            (6, CallFrameInstruction::CfaExpression(expression.clone())),
-            (8, CallFrameInstruction::Restore(Register(1))),
-            (8, CallFrameInstruction::Restore(Register(101))),
-            (10, CallFrameInstruction::Undefined(Register(2))),
-            (12, CallFrameInstruction::SameValue(Register(3))),
-            (14, CallFrameInstruction::Offset(Register(4), 16)),
-            (14, CallFrameInstruction::Offset(Register(104), 16)),
-            (16, CallFrameInstruction::ValOffset(Register(5), -24)),
-            (16, CallFrameInstruction::ValOffset(Register(5), 24)),
-            (18, CallFrameInstruction::Register(Register(6), Register(7))),
-            (
-                20,
-                CallFrameInstruction::Expression(Register(8), expression.clone()),
-            ),
-            (
-                22,
-                CallFrameInstruction::ValExpression(Register(9), expression.clone()),
-            ),
-            (24 + 0x80, CallFrameInstruction::RememberState),
-            (26 + 0x280, CallFrameInstruction::RestoreState),
-            (28 + 0x20280, CallFrameInstruction::ArgsSize(23)),
-        ];
-
-        for &version in &[1, 3, 4] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-                    let mut frames = FrameTable::default();
-
-                    let mut cie = CommonInformationEntry::new(encoding, 2, 8, X86_64::RA);
-                    for i in &cie_instructions {
-                        cie.add_instruction(i.clone());
-                    }
-                    let cie_id = frames.add_cie(cie);
-
-                    let mut fde = FrameDescriptionEntry::new(Address::Constant(0x1000), 0x10);
-                    for (o, i) in &fde_instructions {
-                        fde.add_instruction(*o, i.clone());
-                    }
-                    frames.add_fde(cie_id, fde);
-
-                    let mut debug_frame = DebugFrame::from(EndianVec::new(LittleEndian));
-                    frames.write_debug_frame(&mut debug_frame).unwrap();
-
-                    let mut read_debug_frame =
-                        read::DebugFrame::new(debug_frame.slice(), LittleEndian);
-                    read_debug_frame.set_address_size(address_size);
-                    let frames = FrameTable::from(&read_debug_frame, &|address| {
-                        Some(Address::Constant(address))
-                    })
-                    .unwrap();
-
-                    assert_eq!(
-                        &frames.cies.get_index(0).unwrap().instructions,
-                        &cie_instructions
-                    );
-                    assert_eq!(&frames.fdes[0].1.instructions, &fde_instructions);
-                }
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/dwarf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/dwarf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/dwarf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/dwarf.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-use alloc::vec::Vec;
-
-use crate::common::Encoding;
-use crate::write::{
-    AbbreviationTable, LineProgram, LineStringTable, Result, Sections, StringTable, Unit,
-    UnitTable, Writer,
-};
-
-/// Writable DWARF information for more than one unit.
-#[derive(Debug, Default)]
-pub struct Dwarf {
-    /// A table of units. These are primarily stored in the `.debug_info` section,
-    /// but they also contain information that is stored in other sections.
-    pub units: UnitTable,
-
-    /// Extra line number programs that are not associated with a unit.
-    ///
-    /// These should only be used when generating DWARF5 line-only debug
-    /// information.
-    pub line_programs: Vec<LineProgram>,
-
-    /// A table of strings that will be stored in the `.debug_line_str` section.
-    pub line_strings: LineStringTable,
-
-    /// A table of strings that will be stored in the `.debug_str` section.
-    pub strings: StringTable,
-}
-
-impl Dwarf {
-    /// Create a new `Dwarf` instance.
-    #[inline]
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Write the DWARF information to the given sections.
-    pub fn write<W: Writer>(&mut self, sections: &mut Sections<W>) -> Result<()> {
-        let line_strings = self.line_strings.write(&mut sections.debug_line_str)?;
-        let strings = self.strings.write(&mut sections.debug_str)?;
-        self.units.write(sections, &line_strings, &strings)?;
-        for line_program in &self.line_programs {
-            line_program.write(
-                &mut sections.debug_line,
-                line_program.encoding(),
-                &line_strings,
-                &strings,
-            )?;
-        }
-        Ok(())
-    }
-}
-
-/// Writable DWARF information for a single unit.
-#[derive(Debug)]
-pub struct DwarfUnit {
-    /// A unit. This is primarily stored in the `.debug_info` section,
-    /// but also contains information that is stored in other sections.
-    pub unit: Unit,
-
-    /// A table of strings that will be stored in the `.debug_line_str` section.
-    pub line_strings: LineStringTable,
-
-    /// A table of strings that will be stored in the `.debug_str` section.
-    pub strings: StringTable,
-}
-
-impl DwarfUnit {
-    /// Create a new `DwarfUnit`.
-    ///
-    /// Note: you should set `self.unit.line_program` after creation.
-    /// This cannot be done earlier because it may need to reference
-    /// `self.line_strings`.
-    pub fn new(encoding: Encoding) -> Self {
-        let unit = Unit::new(encoding, LineProgram::none());
-        DwarfUnit {
-            unit,
-            line_strings: LineStringTable::default(),
-            strings: StringTable::default(),
-        }
-    }
-
-    /// Write the DWARf information to the given sections.
-    pub fn write<W: Writer>(&mut self, sections: &mut Sections<W>) -> Result<()> {
-        let line_strings = self.line_strings.write(&mut sections.debug_line_str)?;
-        let strings = self.strings.write(&mut sections.debug_str)?;
-
-        let abbrev_offset = sections.debug_abbrev.offset();
-        let mut abbrevs = AbbreviationTable::default();
-
-        self.unit.write(
-            sections,
-            abbrev_offset,
-            &mut abbrevs,
-            &line_strings,
-            &strings,
-        )?;
-        // None should exist because we didn't give out any UnitId.
-        assert!(sections.debug_info_refs.is_empty());
-        assert!(sections.debug_loc_refs.is_empty());
-        assert!(sections.debug_loclists_refs.is_empty());
-
-        abbrevs.write(&mut sections.debug_abbrev)?;
-        Ok(())
-    }
-}
-
-#[cfg(feature = "read")]
-pub(crate) mod convert {
-    use super::*;
-    use crate::read::{self, Reader};
-    use crate::write::{Address, ConvertResult};
-
-    impl Dwarf {
-        /// Create a `write::Dwarf` by converting a `read::Dwarf`.
-        ///
-        /// `convert_address` is a function to convert read addresses into the `Address`
-        /// type. For non-relocatable addresses, this function may simply return
-        /// `Address::Constant(address)`. For relocatable addresses, it is the caller's
-        /// responsibility to determine the symbol and addend corresponding to the address
-        /// and return `Address::Symbol { symbol, addend }`.
-        pub fn from<R: Reader<Offset = usize>>(
-            dwarf: &read::Dwarf<R>,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-        ) -> ConvertResult<Dwarf> {
-            let mut line_strings = LineStringTable::default();
-            let mut strings = StringTable::default();
-            let units = UnitTable::from(dwarf, &mut line_strings, &mut strings, convert_address)?;
-            // TODO: convert the line programs that were not referenced by a unit.
-            let line_programs = Vec::new();
-            Ok(Dwarf {
-                units,
-                line_programs,
-                line_strings,
-                strings,
-            })
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/endian_vec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/endian_vec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/endian_vec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/endian_vec.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-use alloc::vec::Vec;
-use std::mem;
-
-use crate::endianity::Endianity;
-use crate::write::{Error, Result, Writer};
-
-/// A `Vec<u8>` with endianity metadata.
-///
-/// This implements the `Writer` trait, which is used for all writing of DWARF sections.
-#[derive(Debug, Clone)]
-pub struct EndianVec<Endian>
-where
-    Endian: Endianity,
-{
-    vec: Vec<u8>,
-    endian: Endian,
-}
-
-impl<Endian> EndianVec<Endian>
-where
-    Endian: Endianity,
-{
-    /// Construct an empty `EndianVec` with the given endianity.
-    pub fn new(endian: Endian) -> EndianVec<Endian> {
-        EndianVec {
-            vec: Vec::new(),
-            endian,
-        }
-    }
-
-    /// Return a reference to the raw slice.
-    pub fn slice(&self) -> &[u8] {
-        &self.vec
-    }
-
-    /// Convert into a `Vec<u8>`.
-    pub fn into_vec(self) -> Vec<u8> {
-        self.vec
-    }
-
-    /// Take any written data out of the `EndianVec`, leaving an empty `Vec` in its place.
-    pub fn take(&mut self) -> Vec<u8> {
-        let mut vec = Vec::new();
-        mem::swap(&mut self.vec, &mut vec);
-        vec
-    }
-}
-
-impl<Endian> Writer for EndianVec<Endian>
-where
-    Endian: Endianity,
-{
-    type Endian = Endian;
-
-    #[inline]
-    fn endian(&self) -> Self::Endian {
-        self.endian
-    }
-
-    #[inline]
-    fn len(&self) -> usize {
-        self.vec.len()
-    }
-
-    fn write(&mut self, bytes: &[u8]) -> Result<()> {
-        self.vec.extend(bytes);
-        Ok(())
-    }
-
-    fn write_at(&mut self, offset: usize, bytes: &[u8]) -> Result<()> {
-        if offset > self.vec.len() {
-            return Err(Error::OffsetOutOfBounds);
-        }
-        let to = &mut self.vec[offset..];
-        if bytes.len() > to.len() {
-            return Err(Error::LengthOutOfBounds);
-        }
-        let to = &mut to[..bytes.len()];
-        to.copy_from_slice(bytes);
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::LittleEndian;
-
-    #[test]
-    fn test_endian_vec() {
-        let mut w = EndianVec::new(LittleEndian);
-        assert_eq!(w.endian(), LittleEndian);
-        assert_eq!(w.len(), 0);
-
-        w.write(&[1, 2]).unwrap();
-        assert_eq!(w.slice(), &[1, 2]);
-        assert_eq!(w.len(), 2);
-
-        w.write(&[3, 4, 5]).unwrap();
-        assert_eq!(w.slice(), &[1, 2, 3, 4, 5]);
-        assert_eq!(w.len(), 5);
-
-        w.write_at(0, &[6, 7]).unwrap();
-        assert_eq!(w.slice(), &[6, 7, 3, 4, 5]);
-        assert_eq!(w.len(), 5);
-
-        w.write_at(3, &[8, 9]).unwrap();
-        assert_eq!(w.slice(), &[6, 7, 3, 8, 9]);
-        assert_eq!(w.len(), 5);
-
-        assert_eq!(w.write_at(4, &[6, 7]), Err(Error::LengthOutOfBounds));
-        assert_eq!(w.write_at(5, &[6, 7]), Err(Error::LengthOutOfBounds));
-        assert_eq!(w.write_at(6, &[6, 7]), Err(Error::OffsetOutOfBounds));
-
-        assert_eq!(w.into_vec(), vec![6, 7, 3, 8, 9]);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/line.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1957 +0,0 @@
-use alloc::vec::Vec;
-use indexmap::{IndexMap, IndexSet};
-use std::ops::{Deref, DerefMut};
-
-use crate::common::{DebugLineOffset, Encoding, Format, LineEncoding, SectionId};
-use crate::constants;
-use crate::leb128;
-use crate::write::{
-    Address, DebugLineStrOffsets, DebugStrOffsets, Error, LineStringId, LineStringTable, Result,
-    Section, StringId, Writer,
-};
-
-/// The number assigned to the first special opcode.
-//
-// We output all instructions for all DWARF versions, since readers
-// should be able to ignore instructions they don't support.
-const OPCODE_BASE: u8 = 13;
-
-/// A line number program.
-#[derive(Debug, Clone)]
-pub struct LineProgram {
-    /// True if this line program was created with `LineProgram::none()`.
-    none: bool,
-    encoding: Encoding,
-    line_encoding: LineEncoding,
-
-    /// A list of source directory path names.
-    ///
-    /// If a path is relative, then the directory is located relative to the working
-    /// directory of the compilation unit.
-    ///
-    /// The first entry is for the working directory of the compilation unit.
-    directories: IndexSet<LineString>,
-
-    /// A list of source file entries.
-    ///
-    /// Each entry has a path name and a directory.
-    ///
-    /// If a path is a relative, then the file is located relative to the
-    /// directory. Otherwise the directory is meaningless.
-    ///
-    /// Does not include comp_file, even for version >= 5.
-    files: IndexMap<(LineString, DirectoryId), FileInfo>,
-
-    /// The primary source file of the compilation unit.
-    /// This is required for version >= 5, but we never reference it elsewhere
-    /// because DWARF defines DW_AT_decl_file=0 to mean not specified.
-    comp_file: (LineString, FileInfo),
-
-    /// True if the file entries may have valid timestamps.
-    ///
-    /// Entries may still have a timestamp of 0 even if this is set.
-    /// For version <= 4, this is ignored.
-    /// For version 5, this controls whether to emit `DW_LNCT_timestamp`.
-    pub file_has_timestamp: bool,
-
-    /// True if the file entries may have valid sizes.
-    ///
-    /// Entries may still have a size of 0 even if this is set.
-    /// For version <= 4, this is ignored.
-    /// For version 5, this controls whether to emit `DW_LNCT_size`.
-    pub file_has_size: bool,
-
-    /// True if the file entries have valid MD5 checksums.
-    ///
-    /// For version <= 4, this is ignored.
-    /// For version 5, this controls whether to emit `DW_LNCT_MD5`.
-    pub file_has_md5: bool,
-
-    prev_row: LineRow,
-    row: LineRow,
-    // TODO: this probably should be either rows or sequences instead
-    instructions: Vec<LineInstruction>,
-    in_sequence: bool,
-}
-
-impl LineProgram {
-    /// Create a new `LineProgram`.
-    ///
-    /// `comp_dir` defines the working directory of the compilation unit,
-    /// and must be the same as the `DW_AT_comp_dir` attribute
-    /// of the compilation unit DIE.
-    ///
-    /// `comp_file` and `comp_file_info` define the primary source file
-    /// of the compilation unit and must be the same as the `DW_AT_name`
-    /// attribute of the compilation unit DIE.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `line_encoding.line_base` > 0.
-    ///
-    /// Panics if `line_encoding.line_base` + `line_encoding.line_range` <= 0.
-    ///
-    /// Panics if `comp_dir` is empty or contains a null byte.
-    ///
-    /// Panics if `comp_file` is empty or contains a null byte.
-    #[allow(clippy::too_many_arguments)]
-    #[allow(clippy::new_ret_no_self)]
-    pub fn new(
-        encoding: Encoding,
-        line_encoding: LineEncoding,
-        comp_dir: LineString,
-        comp_file: LineString,
-        comp_file_info: Option<FileInfo>,
-    ) -> LineProgram {
-        // We require a special opcode for a line advance of 0.
-        // See the debug_asserts in generate_row().
-        assert!(line_encoding.line_base <= 0);
-        assert!(line_encoding.line_base + line_encoding.line_range as i8 > 0);
-        let mut program = LineProgram {
-            none: false,
-            encoding,
-            line_encoding,
-            directories: IndexSet::new(),
-            files: IndexMap::new(),
-            comp_file: (comp_file, comp_file_info.unwrap_or_default()),
-            prev_row: LineRow::initial_state(line_encoding),
-            row: LineRow::initial_state(line_encoding),
-            instructions: Vec::new(),
-            in_sequence: false,
-            file_has_timestamp: false,
-            file_has_size: false,
-            file_has_md5: false,
-        };
-        // For all DWARF versions, directory index 0 is comp_dir.
-        // For version <= 4, the entry is implicit. We still add
-        // it here so that we use it, but we don't emit it.
-        program.add_directory(comp_dir);
-        program
-    }
-
-    /// Create a new `LineProgram` with no fields set.
-    ///
-    /// This can be used when the `LineProgram` will not be used.
-    ///
-    /// You should not attempt to add files or line instructions to
-    /// this line program, or write it to the `.debug_line` section.
-    pub fn none() -> Self {
-        let line_encoding = LineEncoding::default();
-        LineProgram {
-            none: true,
-            encoding: Encoding {
-                format: Format::Dwarf32,
-                version: 2,
-                address_size: 0,
-            },
-            line_encoding,
-            directories: IndexSet::new(),
-            files: IndexMap::new(),
-            comp_file: (LineString::String(Vec::new()), FileInfo::default()),
-            prev_row: LineRow::initial_state(line_encoding),
-            row: LineRow::initial_state(line_encoding),
-            instructions: Vec::new(),
-            in_sequence: false,
-            file_has_timestamp: false,
-            file_has_size: false,
-            file_has_md5: false,
-        }
-    }
-
-    /// Return true if this line program was created with `LineProgram::none()`.
-    #[inline]
-    pub fn is_none(&self) -> bool {
-        self.none
-    }
-
-    /// Return the encoding parameters for this line program.
-    #[inline]
-    pub fn encoding(&self) -> Encoding {
-        self.encoding
-    }
-
-    /// Return the DWARF version for this line program.
-    #[inline]
-    pub fn version(&self) -> u16 {
-        self.encoding.version
-    }
-
-    /// Return the address size in bytes for this line program.
-    #[inline]
-    pub fn address_size(&self) -> u8 {
-        self.encoding.address_size
-    }
-
-    /// Return the DWARF format for this line program.
-    #[inline]
-    pub fn format(&self) -> Format {
-        self.encoding.format
-    }
-
-    /// Return the id for the working directory of the compilation unit.
-    #[inline]
-    pub fn default_directory(&self) -> DirectoryId {
-        DirectoryId(0)
-    }
-
-    /// Add a directory entry and return its id.
-    ///
-    /// If the directory already exists, then return the id of the existing entry.
-    ///
-    /// If the path is relative, then the directory is located relative to the working
-    /// directory of the compilation unit.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `directory` is empty or contains a null byte.
-    pub fn add_directory(&mut self, directory: LineString) -> DirectoryId {
-        if let LineString::String(ref val) = directory {
-            // For DWARF version <= 4, directories must not be empty.
-            // The first directory isn't emitted so skip the check for it.
-            if self.encoding.version <= 4 && !self.directories.is_empty() {
-                assert!(!val.is_empty());
-            }
-            assert!(!val.contains(&0));
-        }
-        let (index, _) = self.directories.insert_full(directory);
-        DirectoryId(index)
-    }
-
-    /// Get a reference to a directory entry.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `id` is invalid.
-    pub fn get_directory(&self, id: DirectoryId) -> &LineString {
-        self.directories.get_index(id.0).unwrap()
-    }
-
-    /// Add a file entry and return its id.
-    ///
-    /// If the file already exists, then return the id of the existing entry.
-    ///
-    /// If the file path is relative, then the file is located relative
-    /// to the directory. Otherwise the directory is meaningless, but it
-    /// is still used as a key for file entries.
-    ///
-    /// If `info` is `None`, then new entries are assigned
-    /// default information, and existing entries are unmodified.
-    ///
-    /// If `info` is not `None`, then it is always assigned to the
-    /// entry, even if the entry already exists.
-    ///
-    /// # Panics
-    ///
-    /// Panics if 'file' is empty or contains a null byte.
-    pub fn add_file(
-        &mut self,
-        file: LineString,
-        directory: DirectoryId,
-        info: Option<FileInfo>,
-    ) -> FileId {
-        if let LineString::String(ref val) = file {
-            assert!(!val.is_empty());
-            assert!(!val.contains(&0));
-        }
-
-        let key = (file, directory);
-        let index = if let Some(info) = info {
-            let (index, _) = self.files.insert_full(key, info);
-            index
-        } else {
-            let entry = self.files.entry(key);
-            let index = entry.index();
-            entry.or_insert(FileInfo::default());
-            index
-        };
-        FileId::new(index)
-    }
-
-    /// Get a reference to a file entry.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `id` is invalid.
-    pub fn get_file(&self, id: FileId) -> (&LineString, DirectoryId) {
-        match id.index() {
-            None => (&self.comp_file.0, DirectoryId(0)),
-            Some(index) => self
-                .files
-                .get_index(index)
-                .map(|entry| (&(entry.0).0, (entry.0).1))
-                .unwrap(),
-        }
-    }
-
-    /// Get a reference to the info for a file entry.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `id` is invalid.
-    pub fn get_file_info(&self, id: FileId) -> &FileInfo {
-        match id.index() {
-            None => &self.comp_file.1,
-            Some(index) => self.files.get_index(index).map(|entry| entry.1).unwrap(),
-        }
-    }
-
-    /// Get a mutable reference to the info for a file entry.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `id` is invalid.
-    pub fn get_file_info_mut(&mut self, id: FileId) -> &mut FileInfo {
-        match id.index() {
-            None => &mut self.comp_file.1,
-            Some(index) => self
-                .files
-                .get_index_mut(index)
-                .map(|entry| entry.1)
-                .unwrap(),
-        }
-    }
-
-    /// Begin a new sequence and set its base address.
-    ///
-    /// # Panics
-    ///
-    /// Panics if a sequence has already begun.
-    pub fn begin_sequence(&mut self, address: Option<Address>) {
-        assert!(!self.in_sequence);
-        self.in_sequence = true;
-        if let Some(address) = address {
-            self.instructions.push(LineInstruction::SetAddress(address));
-        }
-    }
-
-    /// End the sequence, and reset the row to its default values.
-    ///
-    /// Only the `address_offset` and op_index` fields of the current row are used.
-    ///
-    /// # Panics
-    ///
-    /// Panics if a sequence has not begun.
-    pub fn end_sequence(&mut self, address_offset: u64) {
-        assert!(self.in_sequence);
-        self.in_sequence = false;
-        self.row.address_offset = address_offset;
-        let op_advance = self.op_advance();
-        if op_advance != 0 {
-            self.instructions
-                .push(LineInstruction::AdvancePc(op_advance));
-        }
-        self.instructions.push(LineInstruction::EndSequence);
-        self.prev_row = LineRow::initial_state(self.line_encoding);
-        self.row = LineRow::initial_state(self.line_encoding);
-    }
-
-    /// Return true if a sequence has begun.
-    #[inline]
-    pub fn in_sequence(&self) -> bool {
-        self.in_sequence
-    }
-
-    /// Returns a reference to the data for the current row.
-    #[inline]
-    pub fn row(&mut self) -> &mut LineRow {
-        &mut self.row
-    }
-
-    /// Generates the line number information instructions for the current row.
-    ///
-    /// After the instructions are generated, it sets `discriminator` to 0, and sets
-    /// `basic_block`, `prologue_end`, and `epilogue_begin` to false.
-    ///
-    /// # Panics
-    ///
-    /// Panics if a sequence has not begun.
-    /// Panics if the address_offset decreases.
-    pub fn generate_row(&mut self) {
-        assert!(self.in_sequence);
-
-        // Output fields that are reset on every row.
-        if self.row.discriminator != 0 {
-            self.instructions
-                .push(LineInstruction::SetDiscriminator(self.row.discriminator));
-            self.row.discriminator = 0;
-        }
-        if self.row.basic_block {
-            self.instructions.push(LineInstruction::SetBasicBlock);
-            self.row.basic_block = false;
-        }
-        if self.row.prologue_end {
-            self.instructions.push(LineInstruction::SetPrologueEnd);
-            self.row.prologue_end = false;
-        }
-        if self.row.epilogue_begin {
-            self.instructions.push(LineInstruction::SetEpilogueBegin);
-            self.row.epilogue_begin = false;
-        }
-
-        // Output fields that are not reset on every row.
-        if self.row.is_statement != self.prev_row.is_statement {
-            self.instructions.push(LineInstruction::NegateStatement);
-        }
-        if self.row.file != self.prev_row.file {
-            self.instructions
-                .push(LineInstruction::SetFile(self.row.file));
-        }
-        if self.row.column != self.prev_row.column {
-            self.instructions
-                .push(LineInstruction::SetColumn(self.row.column));
-        }
-        if self.row.isa != self.prev_row.isa {
-            self.instructions
-                .push(LineInstruction::SetIsa(self.row.isa));
-        }
-
-        // Advance the line, address, and operation index.
-        let line_base = i64::from(self.line_encoding.line_base) as u64;
-        let line_range = u64::from(self.line_encoding.line_range);
-        let line_advance = self.row.line as i64 - self.prev_row.line as i64;
-        let op_advance = self.op_advance();
-
-        // Default to special advances of 0.
-        let special_base = u64::from(OPCODE_BASE);
-        // TODO: handle lack of special opcodes for 0 line advance
-        debug_assert!(self.line_encoding.line_base <= 0);
-        debug_assert!(self.line_encoding.line_base + self.line_encoding.line_range as i8 >= 0);
-        let special_default = special_base.wrapping_sub(line_base);
-        let mut special = special_default;
-        let mut use_special = false;
-
-        if line_advance != 0 {
-            let special_line = (line_advance as u64).wrapping_sub(line_base);
-            if special_line < line_range {
-                special = special_base + special_line;
-                use_special = true;
-            } else {
-                self.instructions
-                    .push(LineInstruction::AdvanceLine(line_advance));
-            }
-        }
-
-        if op_advance != 0 {
-            // Using ConstAddPc can save a byte.
-            let (special_op_advance, const_add_pc) = if special + op_advance * line_range <= 255 {
-                (op_advance, false)
-            } else {
-                let op_range = (255 - special_base) / line_range;
-                (op_advance - op_range, true)
-            };
-
-            let special_op = special_op_advance * line_range;
-            if special + special_op <= 255 {
-                special += special_op;
-                use_special = true;
-                if const_add_pc {
-                    self.instructions.push(LineInstruction::ConstAddPc);
-                }
-            } else {
-                self.instructions
-                    .push(LineInstruction::AdvancePc(op_advance));
-            }
-        }
-
-        if use_special && special != special_default {
-            debug_assert!(special >= special_base);
-            debug_assert!(special <= 255);
-            self.instructions
-                .push(LineInstruction::Special(special as u8));
-        } else {
-            self.instructions.push(LineInstruction::Copy);
-        }
-
-        self.prev_row = self.row;
-    }
-
-    fn op_advance(&self) -> u64 {
-        debug_assert!(self.row.address_offset >= self.prev_row.address_offset);
-        let mut address_advance = self.row.address_offset - self.prev_row.address_offset;
-        if self.line_encoding.minimum_instruction_length != 1 {
-            debug_assert_eq!(
-                self.row.address_offset % u64::from(self.line_encoding.minimum_instruction_length),
-                0
-            );
-            address_advance /= u64::from(self.line_encoding.minimum_instruction_length);
-        }
-        address_advance * u64::from(self.line_encoding.maximum_operations_per_instruction)
-            + self.row.op_index
-            - self.prev_row.op_index
-    }
-
-    /// Returns true if the line number program has no instructions.
-    ///
-    /// Does not check the file or directory entries.
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.instructions.is_empty()
-    }
-
-    /// Write the line number program to the given section.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `self.is_none()`.
-    pub fn write<W: Writer>(
-        &self,
-        w: &mut DebugLine<W>,
-        encoding: Encoding,
-        debug_line_str_offsets: &DebugLineStrOffsets,
-        debug_str_offsets: &DebugStrOffsets,
-    ) -> Result<DebugLineOffset> {
-        assert!(!self.is_none());
-
-        if encoding.version < self.version()
-            || encoding.format != self.format()
-            || encoding.address_size != self.address_size()
-        {
-            return Err(Error::IncompatibleLineProgramEncoding);
-        }
-
-        let offset = w.offset();
-
-        let length_offset = w.write_initial_length(self.format())?;
-        let length_base = w.len();
-
-        if self.version() < 2 || self.version() > 5 {
-            return Err(Error::UnsupportedVersion(self.version()));
-        }
-        w.write_u16(self.version())?;
-
-        if self.version() >= 5 {
-            w.write_u8(self.address_size())?;
-            // Segment selector size.
-            w.write_u8(0)?;
-        }
-
-        let header_length_offset = w.len();
-        w.write_udata(0, self.format().word_size())?;
-        let header_length_base = w.len();
-
-        w.write_u8(self.line_encoding.minimum_instruction_length)?;
-        if self.version() >= 4 {
-            w.write_u8(self.line_encoding.maximum_operations_per_instruction)?;
-        } else if self.line_encoding.maximum_operations_per_instruction != 1 {
-            return Err(Error::NeedVersion(4));
-        };
-        w.write_u8(if self.line_encoding.default_is_stmt {
-            1
-        } else {
-            0
-        })?;
-        w.write_u8(self.line_encoding.line_base as u8)?;
-        w.write_u8(self.line_encoding.line_range)?;
-        w.write_u8(OPCODE_BASE)?;
-        w.write(&[0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1])?;
-
-        if self.version() <= 4 {
-            // The first directory is stored as DW_AT_comp_dir.
-            for dir in self.directories.iter().skip(1) {
-                dir.write(
-                    w,
-                    constants::DW_FORM_string,
-                    self.encoding,
-                    debug_line_str_offsets,
-                    debug_str_offsets,
-                )?;
-            }
-            w.write_u8(0)?;
-
-            for ((file, dir), info) in self.files.iter() {
-                file.write(
-                    w,
-                    constants::DW_FORM_string,
-                    self.encoding,
-                    debug_line_str_offsets,
-                    debug_str_offsets,
-                )?;
-                w.write_uleb128(dir.0 as u64)?;
-                w.write_uleb128(info.timestamp)?;
-                w.write_uleb128(info.size)?;
-            }
-            w.write_u8(0)?;
-        } else {
-            // Directory entry formats (only ever 1).
-            w.write_u8(1)?;
-            w.write_uleb128(u64::from(constants::DW_LNCT_path.0))?;
-            let dir_form = self.directories.get_index(0).unwrap().form();
-            w.write_uleb128(dir_form.0.into())?;
-
-            // Directory entries.
-            w.write_uleb128(self.directories.len() as u64)?;
-            for dir in self.directories.iter() {
-                dir.write(
-                    w,
-                    dir_form,
-                    self.encoding,
-                    debug_line_str_offsets,
-                    debug_str_offsets,
-                )?;
-            }
-
-            // File name entry formats.
-            let count = 2
-                + if self.file_has_timestamp { 1 } else { 0 }
-                + if self.file_has_size { 1 } else { 0 }
-                + if self.file_has_md5 { 1 } else { 0 };
-            w.write_u8(count)?;
-            w.write_uleb128(u64::from(constants::DW_LNCT_path.0))?;
-            let file_form = self.comp_file.0.form();
-            w.write_uleb128(file_form.0.into())?;
-            w.write_uleb128(u64::from(constants::DW_LNCT_directory_index.0))?;
-            w.write_uleb128(constants::DW_FORM_udata.0.into())?;
-            if self.file_has_timestamp {
-                w.write_uleb128(u64::from(constants::DW_LNCT_timestamp.0))?;
-                w.write_uleb128(constants::DW_FORM_udata.0.into())?;
-            }
-            if self.file_has_size {
-                w.write_uleb128(u64::from(constants::DW_LNCT_size.0))?;
-                w.write_uleb128(constants::DW_FORM_udata.0.into())?;
-            }
-            if self.file_has_md5 {
-                w.write_uleb128(u64::from(constants::DW_LNCT_MD5.0))?;
-                w.write_uleb128(constants::DW_FORM_data16.0.into())?;
-            }
-
-            // File name entries.
-            w.write_uleb128(self.files.len() as u64 + 1)?;
-            let mut write_file = |file: &LineString, dir: DirectoryId, info: &FileInfo| {
-                file.write(
-                    w,
-                    file_form,
-                    self.encoding,
-                    debug_line_str_offsets,
-                    debug_str_offsets,
-                )?;
-                w.write_uleb128(dir.0 as u64)?;
-                if self.file_has_timestamp {
-                    w.write_uleb128(info.timestamp)?;
-                }
-                if self.file_has_size {
-                    w.write_uleb128(info.size)?;
-                }
-                if self.file_has_md5 {
-                    w.write(&info.md5)?;
-                }
-                Ok(())
-            };
-            write_file(&self.comp_file.0, DirectoryId(0), &self.comp_file.1)?;
-            for ((file, dir), info) in self.files.iter() {
-                write_file(file, *dir, info)?;
-            }
-        }
-
-        let header_length = (w.len() - header_length_base) as u64;
-        w.write_udata_at(
-            header_length_offset,
-            header_length,
-            self.format().word_size(),
-        )?;
-
-        for instruction in &self.instructions {
-            instruction.write(w, self.address_size())?;
-        }
-
-        let length = (w.len() - length_base) as u64;
-        w.write_initial_length_at(length_offset, length, self.format())?;
-
-        Ok(offset)
-    }
-}
-
-/// A row in the line number table that corresponds to a machine instruction.
-#[derive(Debug, Clone, Copy)]
-pub struct LineRow {
-    /// The offset of the instruction from the start address of the sequence.
-    pub address_offset: u64,
-    /// The index of an operation within a VLIW instruction.
-    ///
-    /// The index of the first operation is 0.
-    /// Set to 0 for non-VLIW instructions.
-    pub op_index: u64,
-
-    /// The source file corresponding to the instruction.
-    pub file: FileId,
-    /// The line number within the source file.
-    ///
-    /// Lines are numbered beginning at 1. Set to 0 if there is no source line.
-    pub line: u64,
-    /// The column number within the source line.
-    ///
-    /// Columns are numbered beginning at 1. Set to 0 for the "left edge" of the line.
-    pub column: u64,
-    /// An additional discriminator used to distinguish between source locations.
-    /// This value is assigned arbitrarily by the DWARF producer.
-    pub discriminator: u64,
-
-    /// Set to true if the instruction is a recommended breakpoint for a statement.
-    pub is_statement: bool,
-    /// Set to true if the instruction is the beginning of a basic block.
-    pub basic_block: bool,
-    /// Set to true if the instruction is a recommended breakpoint at the entry of a
-    /// function.
-    pub prologue_end: bool,
-    /// Set to true if the instruction is a recommended breakpoint prior to the exit of
-    /// a function.
-    pub epilogue_begin: bool,
-
-    /// The instruction set architecture of the instruction.
-    ///
-    /// Set to 0 for the default ISA. Other values are defined by the architecture ABI.
-    pub isa: u64,
-}
-
-impl LineRow {
-    /// Return the initial state as specified in the DWARF standard.
-    fn initial_state(line_encoding: LineEncoding) -> Self {
-        LineRow {
-            address_offset: 0,
-            op_index: 0,
-
-            file: FileId::initial_state(),
-            line: 1,
-            column: 0,
-            discriminator: 0,
-
-            is_statement: line_encoding.default_is_stmt,
-            basic_block: false,
-            prologue_end: false,
-            epilogue_begin: false,
-
-            isa: 0,
-        }
-    }
-}
-
-/// An instruction in a line number program.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum LineInstruction {
-    // Special opcodes
-    Special(u8),
-
-    // Standard opcodes
-    Copy,
-    AdvancePc(u64),
-    AdvanceLine(i64),
-    SetFile(FileId),
-    SetColumn(u64),
-    NegateStatement,
-    SetBasicBlock,
-    ConstAddPc,
-    // DW_LNS_fixed_advance_pc is not supported.
-    SetPrologueEnd,
-    SetEpilogueBegin,
-    SetIsa(u64),
-
-    // Extended opcodes
-    EndSequence,
-    // TODO: this doubles the size of this enum.
-    SetAddress(Address),
-    // DW_LNE_define_file is not supported.
-    SetDiscriminator(u64),
-}
-
-impl LineInstruction {
-    /// Write the line number instruction to the given section.
-    fn write<W: Writer>(self, w: &mut DebugLine<W>, address_size: u8) -> Result<()> {
-        use self::LineInstruction::*;
-        match self {
-            Special(val) => w.write_u8(val)?,
-            Copy => w.write_u8(constants::DW_LNS_copy.0)?,
-            AdvancePc(val) => {
-                w.write_u8(constants::DW_LNS_advance_pc.0)?;
-                w.write_uleb128(val)?;
-            }
-            AdvanceLine(val) => {
-                w.write_u8(constants::DW_LNS_advance_line.0)?;
-                w.write_sleb128(val)?;
-            }
-            SetFile(val) => {
-                w.write_u8(constants::DW_LNS_set_file.0)?;
-                w.write_uleb128(val.raw())?;
-            }
-            SetColumn(val) => {
-                w.write_u8(constants::DW_LNS_set_column.0)?;
-                w.write_uleb128(val)?;
-            }
-            NegateStatement => w.write_u8(constants::DW_LNS_negate_stmt.0)?,
-            SetBasicBlock => w.write_u8(constants::DW_LNS_set_basic_block.0)?,
-            ConstAddPc => w.write_u8(constants::DW_LNS_const_add_pc.0)?,
-            SetPrologueEnd => w.write_u8(constants::DW_LNS_set_prologue_end.0)?,
-            SetEpilogueBegin => w.write_u8(constants::DW_LNS_set_epilogue_begin.0)?,
-            SetIsa(val) => {
-                w.write_u8(constants::DW_LNS_set_isa.0)?;
-                w.write_uleb128(val)?;
-            }
-            EndSequence => {
-                w.write_u8(0)?;
-                w.write_uleb128(1)?;
-                w.write_u8(constants::DW_LNE_end_sequence.0)?;
-            }
-            SetAddress(address) => {
-                w.write_u8(0)?;
-                w.write_uleb128(1 + u64::from(address_size))?;
-                w.write_u8(constants::DW_LNE_set_address.0)?;
-                w.write_address(address, address_size)?;
-            }
-            SetDiscriminator(val) => {
-                let mut bytes = [0u8; 10];
-                // bytes is long enough so this will never fail.
-                let len = leb128::write::unsigned(&mut { &mut bytes[..] }, val).unwrap();
-                w.write_u8(0)?;
-                w.write_uleb128(1 + len as u64)?;
-                w.write_u8(constants::DW_LNE_set_discriminator.0)?;
-                w.write(&bytes[..len])?;
-            }
-        }
-        Ok(())
-    }
-}
-
-/// A string value for use in defining paths in line number programs.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum LineString {
-    /// A slice of bytes representing a string. Must not include null bytes.
-    /// Not guaranteed to be UTF-8 or anything like that.
-    String(Vec<u8>),
-
-    /// A reference to a string in the `.debug_str` section.
-    StringRef(StringId),
-
-    /// A reference to a string in the `.debug_line_str` section.
-    LineStringRef(LineStringId),
-}
-
-impl LineString {
-    /// Create a `LineString` using the normal form for the given encoding.
-    pub fn new<T>(val: T, encoding: Encoding, line_strings: &mut LineStringTable) -> Self
-    where
-        T: Into<Vec<u8>>,
-    {
-        let val = val.into();
-        if encoding.version <= 4 {
-            LineString::String(val)
-        } else {
-            LineString::LineStringRef(line_strings.add(val))
-        }
-    }
-
-    fn form(&self) -> constants::DwForm {
-        match *self {
-            LineString::String(..) => constants::DW_FORM_string,
-            LineString::StringRef(..) => constants::DW_FORM_strp,
-            LineString::LineStringRef(..) => constants::DW_FORM_line_strp,
-        }
-    }
-
-    fn write<W: Writer>(
-        &self,
-        w: &mut DebugLine<W>,
-        form: constants::DwForm,
-        encoding: Encoding,
-        debug_line_str_offsets: &DebugLineStrOffsets,
-        debug_str_offsets: &DebugStrOffsets,
-    ) -> Result<()> {
-        if form != self.form() {
-            return Err(Error::LineStringFormMismatch);
-        }
-
-        match *self {
-            LineString::String(ref val) => {
-                if encoding.version <= 4 {
-                    debug_assert!(!val.is_empty());
-                }
-                w.write(val)?;
-                w.write_u8(0)?;
-            }
-            LineString::StringRef(val) => {
-                if encoding.version < 5 {
-                    return Err(Error::NeedVersion(5));
-                }
-                w.write_offset(
-                    debug_str_offsets.get(val).0,
-                    SectionId::DebugStr,
-                    encoding.format.word_size(),
-                )?;
-            }
-            LineString::LineStringRef(val) => {
-                if encoding.version < 5 {
-                    return Err(Error::NeedVersion(5));
-                }
-                w.write_offset(
-                    debug_line_str_offsets.get(val).0,
-                    SectionId::DebugLineStr,
-                    encoding.format.word_size(),
-                )?;
-            }
-        }
-        Ok(())
-    }
-}
-
-/// An identifier for a directory in a `LineProgram`.
-///
-/// Defaults to the working directory of the compilation unit.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DirectoryId(usize);
-
-// Force FileId access via the methods.
-mod id {
-    /// An identifier for a file in a `LineProgram`.
-    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-    pub struct FileId(usize);
-
-    impl FileId {
-        /// Create a FileId given an index into `LineProgram::files`.
-        pub(crate) fn new(index: usize) -> Self {
-            FileId(index + 1)
-        }
-
-        /// The index of the file in `LineProgram::files`.
-        pub(super) fn index(self) -> Option<usize> {
-            if self.0 == 0 {
-                None
-            } else {
-                Some(self.0 - 1)
-            }
-        }
-
-        /// The initial state of the file register.
-        pub(super) fn initial_state() -> Self {
-            FileId(1)
-        }
-
-        /// The raw value used when writing.
-        pub(crate) fn raw(self) -> u64 {
-            self.0 as u64
-        }
-
-        /// The id for file index 0 in DWARF version 5.
-        /// Only used when converting.
-        // Used for tests only.
-        #[allow(unused)]
-        pub(super) fn zero() -> Self {
-            FileId(0)
-        }
-    }
-}
-pub use self::id::*;
-
-/// Extra information for file in a `LineProgram`.
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
-pub struct FileInfo {
-    /// The implementation defined timestamp of the last modification of the file,
-    /// or 0 if not available.
-    pub timestamp: u64,
-
-    /// The size of the file in bytes, or 0 if not available.
-    pub size: u64,
-
-    /// A 16-byte MD5 digest of the file contents.
-    ///
-    /// Only used if version >= 5 and `LineProgram::file_has_md5` is `true`.
-    pub md5: [u8; 16],
-}
-
-define_section!(
-    DebugLine,
-    DebugLineOffset,
-    "A writable `.debug_line` section."
-);
-
-#[cfg(feature = "read")]
-mod convert {
-    use super::*;
-    use crate::read::{self, Reader};
-    use crate::write::{self, ConvertError, ConvertResult};
-
-    impl LineProgram {
-        /// Create a line number program by reading the data from the given program.
-        ///
-        /// Return the program and a mapping from file index to `FileId`.
-        pub fn from<R: Reader<Offset = usize>>(
-            mut from_program: read::IncompleteLineProgram<R>,
-            dwarf: &read::Dwarf<R>,
-            line_strings: &mut write::LineStringTable,
-            strings: &mut write::StringTable,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-        ) -> ConvertResult<(LineProgram, Vec<FileId>)> {
-            // Create mappings in case the source has duplicate files or directories.
-            let mut dirs = Vec::new();
-            let mut files = Vec::new();
-
-            let mut program = {
-                let from_header = from_program.header();
-                let encoding = from_header.encoding();
-
-                let comp_dir = match from_header.directory(0) {
-                    Some(comp_dir) => LineString::from(comp_dir, dwarf, line_strings, strings)?,
-                    None => LineString::new(&[][..], encoding, line_strings),
-                };
-
-                let (comp_name, comp_file_info) = match from_header.file(0) {
-                    Some(comp_file) => {
-                        if comp_file.directory_index() != 0 {
-                            return Err(ConvertError::InvalidDirectoryIndex);
-                        }
-                        (
-                            LineString::from(comp_file.path_name(), dwarf, line_strings, strings)?,
-                            Some(FileInfo {
-                                timestamp: comp_file.timestamp(),
-                                size: comp_file.size(),
-                                md5: *comp_file.md5(),
-                            }),
-                        )
-                    }
-                    None => (LineString::new(&[][..], encoding, line_strings), None),
-                };
-
-                if from_header.line_base() > 0 {
-                    return Err(ConvertError::InvalidLineBase);
-                }
-                let mut program = LineProgram::new(
-                    encoding,
-                    from_header.line_encoding(),
-                    comp_dir,
-                    comp_name,
-                    comp_file_info,
-                );
-
-                let file_skip;
-                if from_header.version() <= 4 {
-                    // The first directory is implicit.
-                    dirs.push(DirectoryId(0));
-                    // A file index of 0 is invalid for version <= 4, but putting
-                    // something there makes the indexing easier.
-                    file_skip = 0;
-                    files.push(FileId::zero());
-                } else {
-                    // We don't add the first file to `files`, but still allow
-                    // it to be referenced from converted instructions.
-                    file_skip = 1;
-                    files.push(FileId::zero());
-                }
-
-                for from_dir in from_header.include_directories() {
-                    let from_dir =
-                        LineString::from(from_dir.clone(), dwarf, line_strings, strings)?;
-                    dirs.push(program.add_directory(from_dir));
-                }
-
-                program.file_has_timestamp = from_header.file_has_timestamp();
-                program.file_has_size = from_header.file_has_size();
-                program.file_has_md5 = from_header.file_has_md5();
-                for from_file in from_header.file_names().iter().skip(file_skip) {
-                    let from_name =
-                        LineString::from(from_file.path_name(), dwarf, line_strings, strings)?;
-                    let from_dir = from_file.directory_index();
-                    if from_dir >= dirs.len() as u64 {
-                        return Err(ConvertError::InvalidDirectoryIndex);
-                    }
-                    let from_dir = dirs[from_dir as usize];
-                    let from_info = Some(FileInfo {
-                        timestamp: from_file.timestamp(),
-                        size: from_file.size(),
-                        md5: *from_file.md5(),
-                    });
-                    files.push(program.add_file(from_name, from_dir, from_info));
-                }
-
-                program
-            };
-
-            // We can't use the `from_program.rows()` because that wouldn't let
-            // us preserve address relocations.
-            let mut from_row = read::LineRow::new(from_program.header());
-            let mut instructions = from_program.header().instructions();
-            let mut address = None;
-            while let Some(instruction) = instructions.next_instruction(from_program.header())? {
-                match instruction {
-                    read::LineInstruction::SetAddress(val) => {
-                        if program.in_sequence() {
-                            return Err(ConvertError::UnsupportedLineInstruction);
-                        }
-                        match convert_address(val) {
-                            Some(val) => address = Some(val),
-                            None => return Err(ConvertError::InvalidAddress),
-                        }
-                        from_row.execute(read::LineInstruction::SetAddress(0), &mut from_program);
-                    }
-                    read::LineInstruction::DefineFile(_) => {
-                        return Err(ConvertError::UnsupportedLineInstruction);
-                    }
-                    _ => {
-                        if from_row.execute(instruction, &mut from_program) {
-                            if !program.in_sequence() {
-                                program.begin_sequence(address);
-                                address = None;
-                            }
-                            if from_row.end_sequence() {
-                                program.end_sequence(from_row.address());
-                            } else {
-                                program.row().address_offset = from_row.address();
-                                program.row().op_index = from_row.op_index();
-                                program.row().file = {
-                                    let file = from_row.file_index();
-                                    if file >= files.len() as u64 {
-                                        return Err(ConvertError::InvalidFileIndex);
-                                    }
-                                    if file == 0 && program.version() <= 4 {
-                                        return Err(ConvertError::InvalidFileIndex);
-                                    }
-                                    files[file as usize]
-                                };
-                                program.row().line = from_row.line().unwrap_or(0);
-                                program.row().column = match from_row.column() {
-                                    read::ColumnType::LeftEdge => 0,
-                                    read::ColumnType::Column(val) => val,
-                                };
-                                program.row().discriminator = from_row.discriminator();
-                                program.row().is_statement = from_row.is_stmt();
-                                program.row().basic_block = from_row.basic_block();
-                                program.row().prologue_end = from_row.prologue_end();
-                                program.row().epilogue_begin = from_row.epilogue_begin();
-                                program.row().isa = from_row.isa();
-                                program.generate_row();
-                            }
-                            from_row.reset(from_program.header());
-                        }
-                    }
-                };
-            }
-            Ok((program, files))
-        }
-    }
-
-    impl LineString {
-        fn from<R: Reader<Offset = usize>>(
-            from_attr: read::AttributeValue<R>,
-            dwarf: &read::Dwarf<R>,
-            line_strings: &mut write::LineStringTable,
-            strings: &mut write::StringTable,
-        ) -> ConvertResult<LineString> {
-            Ok(match from_attr {
-                read::AttributeValue::String(r) => LineString::String(r.to_slice()?.to_vec()),
-                read::AttributeValue::DebugStrRef(offset) => {
-                    let r = dwarf.debug_str.get_str(offset)?;
-                    let id = strings.add(r.to_slice()?);
-                    LineString::StringRef(id)
-                }
-                read::AttributeValue::DebugLineStrRef(offset) => {
-                    let r = dwarf.debug_line_str.get_str(offset)?;
-                    let id = line_strings.add(r.to_slice()?);
-                    LineString::LineStringRef(id)
-                }
-                _ => return Err(ConvertError::UnsupportedLineStringForm),
-            })
-        }
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "read")]
-mod tests {
-    use super::*;
-    use crate::read;
-    use crate::write::{DebugLineStr, DebugStr, EndianVec, StringTable};
-    use crate::LittleEndian;
-
-    #[test]
-    fn test_line_program_table() {
-        let dir1 = LineString::String(b"dir1".to_vec());
-        let file1 = LineString::String(b"file1".to_vec());
-        let dir2 = LineString::String(b"dir2".to_vec());
-        let file2 = LineString::String(b"file2".to_vec());
-
-        let mut programs = Vec::new();
-        for &version in &[2, 3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-                    let mut program = LineProgram::new(
-                        encoding,
-                        LineEncoding::default(),
-                        dir1.clone(),
-                        file1.clone(),
-                        None,
-                    );
-
-                    {
-                        assert_eq!(&dir1, program.get_directory(program.default_directory()));
-                        program.file_has_timestamp = true;
-                        program.file_has_size = true;
-                        if encoding.version >= 5 {
-                            program.file_has_md5 = true;
-                        }
-
-                        let dir_id = program.add_directory(dir2.clone());
-                        assert_eq!(&dir2, program.get_directory(dir_id));
-                        assert_eq!(dir_id, program.add_directory(dir2.clone()));
-
-                        let file_info = FileInfo {
-                            timestamp: 1,
-                            size: 2,
-                            md5: if encoding.version >= 5 {
-                                [3; 16]
-                            } else {
-                                [0; 16]
-                            },
-                        };
-                        let file_id = program.add_file(file2.clone(), dir_id, Some(file_info));
-                        assert_eq!((&file2, dir_id), program.get_file(file_id));
-                        assert_eq!(file_info, *program.get_file_info(file_id));
-
-                        program.get_file_info_mut(file_id).size = 3;
-                        assert_ne!(file_info, *program.get_file_info(file_id));
-                        assert_eq!(file_id, program.add_file(file2.clone(), dir_id, None));
-                        assert_ne!(file_info, *program.get_file_info(file_id));
-                        assert_eq!(
-                            file_id,
-                            program.add_file(file2.clone(), dir_id, Some(file_info))
-                        );
-                        assert_eq!(file_info, *program.get_file_info(file_id));
-
-                        programs.push((program, file_id, encoding));
-                    }
-                }
-            }
-        }
-
-        let debug_line_str_offsets = DebugLineStrOffsets::none();
-        let debug_str_offsets = DebugStrOffsets::none();
-        let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
-        let mut debug_line_offsets = Vec::new();
-        for (program, _, encoding) in &programs {
-            debug_line_offsets.push(
-                program
-                    .write(
-                        &mut debug_line,
-                        *encoding,
-                        &debug_line_str_offsets,
-                        &debug_str_offsets,
-                    )
-                    .unwrap(),
-            );
-        }
-
-        let read_debug_line = read::DebugLine::new(debug_line.slice(), LittleEndian);
-
-        let convert_address = &|address| Some(Address::Constant(address));
-        for ((program, file_id, encoding), offset) in programs.iter().zip(debug_line_offsets.iter())
-        {
-            let read_program = read_debug_line
-                .program(
-                    *offset,
-                    encoding.address_size,
-                    Some(read::EndianSlice::new(b"dir1", LittleEndian)),
-                    Some(read::EndianSlice::new(b"file1", LittleEndian)),
-                )
-                .unwrap();
-
-            let dwarf = read::Dwarf::default();
-            let mut convert_line_strings = LineStringTable::default();
-            let mut convert_strings = StringTable::default();
-            let (convert_program, convert_files) = LineProgram::from(
-                read_program,
-                &dwarf,
-                &mut convert_line_strings,
-                &mut convert_strings,
-                convert_address,
-            )
-            .unwrap();
-            assert_eq!(convert_program.version(), program.version());
-            assert_eq!(convert_program.address_size(), program.address_size());
-            assert_eq!(convert_program.format(), program.format());
-
-            let convert_file_id = convert_files[file_id.raw() as usize];
-            let (file, dir) = program.get_file(*file_id);
-            let (convert_file, convert_dir) = convert_program.get_file(convert_file_id);
-            assert_eq!(file, convert_file);
-            assert_eq!(
-                program.get_directory(dir),
-                convert_program.get_directory(convert_dir)
-            );
-            assert_eq!(
-                program.get_file_info(*file_id),
-                convert_program.get_file_info(convert_file_id)
-            );
-        }
-    }
-
-    #[test]
-    fn test_line_row() {
-        let dir1 = &b"dir1"[..];
-        let file1 = &b"file1"[..];
-        let file2 = &b"file2"[..];
-        let convert_address = &|address| Some(Address::Constant(address));
-
-        let debug_line_str_offsets = DebugLineStrOffsets::none();
-        let debug_str_offsets = DebugStrOffsets::none();
-
-        for &version in &[2, 3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-                    let line_base = -5;
-                    let line_range = 14;
-                    let neg_line_base = (-line_base) as u8;
-                    let mut program = LineProgram::new(
-                        encoding,
-                        LineEncoding {
-                            line_base,
-                            line_range,
-                            ..Default::default()
-                        },
-                        LineString::String(dir1.to_vec()),
-                        LineString::String(file1.to_vec()),
-                        None,
-                    );
-                    let dir_id = program.default_directory();
-                    program.add_file(LineString::String(file1.to_vec()), dir_id, None);
-                    let file_id =
-                        program.add_file(LineString::String(file2.to_vec()), dir_id, None);
-
-                    // Test sequences.
-                    {
-                        let mut program = program.clone();
-                        let address = Address::Constant(0x12);
-                        program.begin_sequence(Some(address));
-                        assert_eq!(
-                            program.instructions,
-                            vec![LineInstruction::SetAddress(address)]
-                        );
-                    }
-
-                    {
-                        let mut program = program.clone();
-                        program.begin_sequence(None);
-                        assert_eq!(program.instructions, Vec::new());
-                    }
-
-                    {
-                        let mut program = program.clone();
-                        program.begin_sequence(None);
-                        program.end_sequence(0x1234);
-                        assert_eq!(
-                            program.instructions,
-                            vec![
-                                LineInstruction::AdvancePc(0x1234),
-                                LineInstruction::EndSequence
-                            ]
-                        );
-                    }
-
-                    // Create a base program.
-                    program.begin_sequence(None);
-                    program.row.line = 0x1000;
-                    program.generate_row();
-                    let base_row = program.row;
-                    let base_instructions = program.instructions.clone();
-
-                    // Create test cases.
-                    let mut tests = Vec::new();
-
-                    let row = base_row;
-                    tests.push((row, vec![LineInstruction::Copy]));
-
-                    let mut row = base_row;
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((row, vec![LineInstruction::Special(OPCODE_BASE)]));
-
-                    let mut row = base_row;
-                    row.line += u64::from(line_range) - 1;
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![LineInstruction::Special(OPCODE_BASE + line_range - 1)],
-                    ));
-
-                    let mut row = base_row;
-                    row.line += u64::from(line_range);
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![
-                            LineInstruction::AdvanceLine(i64::from(line_range - neg_line_base)),
-                            LineInstruction::Copy,
-                        ],
-                    ));
-
-                    let mut row = base_row;
-                    row.address_offset = 1;
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![LineInstruction::Special(OPCODE_BASE + line_range)],
-                    ));
-
-                    let op_range = (255 - OPCODE_BASE) / line_range;
-                    let mut row = base_row;
-                    row.address_offset = u64::from(op_range);
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![LineInstruction::Special(
-                            OPCODE_BASE + op_range * line_range,
-                        )],
-                    ));
-
-                    let mut row = base_row;
-                    row.address_offset = u64::from(op_range);
-                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range);
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((row, vec![LineInstruction::Special(255)]));
-
-                    let mut row = base_row;
-                    row.address_offset = u64::from(op_range);
-                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range) + 1;
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![LineInstruction::ConstAddPc, LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.address_offset = u64::from(op_range);
-                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range) + 2;
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![
-                            LineInstruction::ConstAddPc,
-                            LineInstruction::Special(OPCODE_BASE + 6),
-                        ],
-                    ));
-
-                    let mut row = base_row;
-                    row.address_offset = u64::from(op_range) * 2;
-                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range);
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![LineInstruction::ConstAddPc, LineInstruction::Special(255)],
-                    ));
-
-                    let mut row = base_row;
-                    row.address_offset = u64::from(op_range) * 2;
-                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range) + 1;
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![
-                            LineInstruction::AdvancePc(row.address_offset),
-                            LineInstruction::Copy,
-                        ],
-                    ));
-
-                    let mut row = base_row;
-                    row.address_offset = u64::from(op_range) * 2;
-                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range) + 2;
-                    row.line -= u64::from(neg_line_base);
-                    tests.push((
-                        row,
-                        vec![
-                            LineInstruction::AdvancePc(row.address_offset),
-                            LineInstruction::Special(OPCODE_BASE + 6),
-                        ],
-                    ));
-
-                    let mut row = base_row;
-                    row.address_offset = 0x1234;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::AdvancePc(0x1234), LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.line += 0x1234;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::AdvanceLine(0x1234), LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.file = file_id;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::SetFile(file_id), LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.column = 0x1234;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::SetColumn(0x1234), LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.discriminator = 0x1234;
-                    tests.push((
-                        row,
-                        vec![
-                            LineInstruction::SetDiscriminator(0x1234),
-                            LineInstruction::Copy,
-                        ],
-                    ));
-
-                    let mut row = base_row;
-                    row.is_statement = !row.is_statement;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::NegateStatement, LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.basic_block = true;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::SetBasicBlock, LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.prologue_end = true;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::SetPrologueEnd, LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.epilogue_begin = true;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::SetEpilogueBegin, LineInstruction::Copy],
-                    ));
-
-                    let mut row = base_row;
-                    row.isa = 0x1234;
-                    tests.push((
-                        row,
-                        vec![LineInstruction::SetIsa(0x1234), LineInstruction::Copy],
-                    ));
-
-                    for test in tests {
-                        // Test generate_row().
-                        let mut program = program.clone();
-                        program.row = test.0;
-                        program.generate_row();
-                        assert_eq!(
-                            &program.instructions[base_instructions.len()..],
-                            &test.1[..]
-                        );
-
-                        // Test LineProgram::from().
-                        let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
-                        let debug_line_offset = program
-                            .write(
-                                &mut debug_line,
-                                encoding,
-                                &debug_line_str_offsets,
-                                &debug_str_offsets,
-                            )
-                            .unwrap();
-
-                        let read_debug_line =
-                            read::DebugLine::new(debug_line.slice(), LittleEndian);
-                        let read_program = read_debug_line
-                            .program(
-                                debug_line_offset,
-                                address_size,
-                                Some(read::EndianSlice::new(dir1, LittleEndian)),
-                                Some(read::EndianSlice::new(file1, LittleEndian)),
-                            )
-                            .unwrap();
-
-                        let dwarf = read::Dwarf::default();
-                        let mut convert_line_strings = LineStringTable::default();
-                        let mut convert_strings = StringTable::default();
-                        let (convert_program, _convert_files) = LineProgram::from(
-                            read_program,
-                            &dwarf,
-                            &mut convert_line_strings,
-                            &mut convert_strings,
-                            convert_address,
-                        )
-                        .unwrap();
-                        assert_eq!(
-                            &convert_program.instructions[base_instructions.len()..],
-                            &test.1[..]
-                        );
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_line_instruction() {
-        let dir1 = &b"dir1"[..];
-        let file1 = &b"file1"[..];
-
-        let debug_line_str_offsets = DebugLineStrOffsets::none();
-        let debug_str_offsets = DebugStrOffsets::none();
-
-        for &version in &[2, 3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-                    let mut program = LineProgram::new(
-                        encoding,
-                        LineEncoding::default(),
-                        LineString::String(dir1.to_vec()),
-                        LineString::String(file1.to_vec()),
-                        None,
-                    );
-                    let dir_id = program.default_directory();
-                    let file_id =
-                        program.add_file(LineString::String(file1.to_vec()), dir_id, None);
-
-                    for &(ref inst, ref expect_inst) in &[
-                        (
-                            LineInstruction::Special(OPCODE_BASE),
-                            read::LineInstruction::Special(OPCODE_BASE),
-                        ),
-                        (
-                            LineInstruction::Special(255),
-                            read::LineInstruction::Special(255),
-                        ),
-                        (LineInstruction::Copy, read::LineInstruction::Copy),
-                        (
-                            LineInstruction::AdvancePc(0x12),
-                            read::LineInstruction::AdvancePc(0x12),
-                        ),
-                        (
-                            LineInstruction::AdvanceLine(0x12),
-                            read::LineInstruction::AdvanceLine(0x12),
-                        ),
-                        (
-                            LineInstruction::SetFile(file_id),
-                            read::LineInstruction::SetFile(file_id.raw()),
-                        ),
-                        (
-                            LineInstruction::SetColumn(0x12),
-                            read::LineInstruction::SetColumn(0x12),
-                        ),
-                        (
-                            LineInstruction::NegateStatement,
-                            read::LineInstruction::NegateStatement,
-                        ),
-                        (
-                            LineInstruction::SetBasicBlock,
-                            read::LineInstruction::SetBasicBlock,
-                        ),
-                        (
-                            LineInstruction::ConstAddPc,
-                            read::LineInstruction::ConstAddPc,
-                        ),
-                        (
-                            LineInstruction::SetPrologueEnd,
-                            read::LineInstruction::SetPrologueEnd,
-                        ),
-                        (
-                            LineInstruction::SetEpilogueBegin,
-                            read::LineInstruction::SetEpilogueBegin,
-                        ),
-                        (
-                            LineInstruction::SetIsa(0x12),
-                            read::LineInstruction::SetIsa(0x12),
-                        ),
-                        (
-                            LineInstruction::EndSequence,
-                            read::LineInstruction::EndSequence,
-                        ),
-                        (
-                            LineInstruction::SetAddress(Address::Constant(0x12)),
-                            read::LineInstruction::SetAddress(0x12),
-                        ),
-                        (
-                            LineInstruction::SetDiscriminator(0x12),
-                            read::LineInstruction::SetDiscriminator(0x12),
-                        ),
-                    ][..]
-                    {
-                        let mut program = program.clone();
-                        program.instructions.push(*inst);
-
-                        let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
-                        let debug_line_offset = program
-                            .write(
-                                &mut debug_line,
-                                encoding,
-                                &debug_line_str_offsets,
-                                &debug_str_offsets,
-                            )
-                            .unwrap();
-
-                        let read_debug_line =
-                            read::DebugLine::new(debug_line.slice(), LittleEndian);
-                        let read_program = read_debug_line
-                            .program(
-                                debug_line_offset,
-                                address_size,
-                                Some(read::EndianSlice::new(dir1, LittleEndian)),
-                                Some(read::EndianSlice::new(file1, LittleEndian)),
-                            )
-                            .unwrap();
-                        let read_header = read_program.header();
-                        let mut read_insts = read_header.instructions();
-                        assert_eq!(
-                            *expect_inst,
-                            read_insts.next_instruction(read_header).unwrap().unwrap()
-                        );
-                        assert_eq!(None, read_insts.next_instruction(read_header).unwrap());
-                    }
-                }
-            }
-        }
-    }
-
-    // Test that the address/line advance is correct. We don't test for optimality.
-    #[test]
-    #[allow(clippy::useless_vec)]
-    fn test_advance() {
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 8,
-        };
-
-        let dir1 = &b"dir1"[..];
-        let file1 = &b"file1"[..];
-
-        let addresses = 0..50;
-        let lines = -10..25i64;
-
-        let debug_line_str_offsets = DebugLineStrOffsets::none();
-        let debug_str_offsets = DebugStrOffsets::none();
-
-        for minimum_instruction_length in vec![1, 4] {
-            for maximum_operations_per_instruction in vec![1, 3] {
-                for line_base in vec![-5, 0] {
-                    for line_range in vec![10, 20] {
-                        let line_encoding = LineEncoding {
-                            minimum_instruction_length,
-                            maximum_operations_per_instruction,
-                            line_base,
-                            line_range,
-                            default_is_stmt: true,
-                        };
-                        let mut program = LineProgram::new(
-                            encoding,
-                            line_encoding,
-                            LineString::String(dir1.to_vec()),
-                            LineString::String(file1.to_vec()),
-                            None,
-                        );
-                        for address_advance in addresses.clone() {
-                            program.begin_sequence(Some(Address::Constant(0x1000)));
-                            program.row().line = 0x10000;
-                            program.generate_row();
-                            for line_advance in lines.clone() {
-                                {
-                                    let row = program.row();
-                                    row.address_offset +=
-                                        address_advance * u64::from(minimum_instruction_length);
-                                    row.line = row.line.wrapping_add(line_advance as u64);
-                                }
-                                program.generate_row();
-                            }
-                            let address_offset = program.row().address_offset
-                                + u64::from(minimum_instruction_length);
-                            program.end_sequence(address_offset);
-                        }
-
-                        let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
-                        let debug_line_offset = program
-                            .write(
-                                &mut debug_line,
-                                encoding,
-                                &debug_line_str_offsets,
-                                &debug_str_offsets,
-                            )
-                            .unwrap();
-
-                        let read_debug_line =
-                            read::DebugLine::new(debug_line.slice(), LittleEndian);
-                        let read_program = read_debug_line
-                            .program(
-                                debug_line_offset,
-                                8,
-                                Some(read::EndianSlice::new(dir1, LittleEndian)),
-                                Some(read::EndianSlice::new(file1, LittleEndian)),
-                            )
-                            .unwrap();
-
-                        let mut rows = read_program.rows();
-                        for address_advance in addresses.clone() {
-                            let mut address;
-                            let mut line;
-                            {
-                                let row = rows.next_row().unwrap().unwrap().1;
-                                address = row.address();
-                                line = row.line().unwrap();
-                            }
-                            assert_eq!(address, 0x1000);
-                            assert_eq!(line, 0x10000);
-                            for line_advance in lines.clone() {
-                                let row = rows.next_row().unwrap().unwrap().1;
-                                assert_eq!(
-                                    row.address() - address,
-                                    address_advance * u64::from(minimum_instruction_length)
-                                );
-                                assert_eq!(
-                                    (row.line().unwrap() as i64) - (line as i64),
-                                    line_advance
-                                );
-                                address = row.address();
-                                line = row.line().unwrap();
-                            }
-                            let row = rows.next_row().unwrap().unwrap().1;
-                            assert!(row.end_sequence());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_line_string() {
-        let version = 5;
-
-        let file = b"file1";
-
-        let mut strings = StringTable::default();
-        let string_id = strings.add("file2");
-        let mut debug_str = DebugStr::from(EndianVec::new(LittleEndian));
-        let debug_str_offsets = strings.write(&mut debug_str).unwrap();
-
-        let mut line_strings = LineStringTable::default();
-        let line_string_id = line_strings.add("file3");
-        let mut debug_line_str = DebugLineStr::from(EndianVec::new(LittleEndian));
-        let debug_line_str_offsets = line_strings.write(&mut debug_line_str).unwrap();
-
-        for &address_size in &[4, 8] {
-            for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                let encoding = Encoding {
-                    format,
-                    version,
-                    address_size,
-                };
-
-                for (file, expect_file) in vec![
-                    (
-                        LineString::String(file.to_vec()),
-                        read::AttributeValue::String(read::EndianSlice::new(file, LittleEndian)),
-                    ),
-                    (
-                        LineString::StringRef(string_id),
-                        read::AttributeValue::DebugStrRef(debug_str_offsets.get(string_id)),
-                    ),
-                    (
-                        LineString::LineStringRef(line_string_id),
-                        read::AttributeValue::DebugLineStrRef(
-                            debug_line_str_offsets.get(line_string_id),
-                        ),
-                    ),
-                ] {
-                    let program = LineProgram::new(
-                        encoding,
-                        LineEncoding::default(),
-                        LineString::String(b"dir".to_vec()),
-                        file,
-                        None,
-                    );
-
-                    let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
-                    let debug_line_offset = program
-                        .write(
-                            &mut debug_line,
-                            encoding,
-                            &debug_line_str_offsets,
-                            &debug_str_offsets,
-                        )
-                        .unwrap();
-
-                    let read_debug_line = read::DebugLine::new(debug_line.slice(), LittleEndian);
-                    let read_program = read_debug_line
-                        .program(debug_line_offset, address_size, None, None)
-                        .unwrap();
-                    let read_header = read_program.header();
-                    assert_eq!(read_header.file(0).unwrap().path_name(), expect_file);
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_missing_comp_dir() {
-        let debug_line_str_offsets = DebugLineStrOffsets::none();
-        let debug_str_offsets = DebugStrOffsets::none();
-
-        for &version in &[2, 3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-                    let program = LineProgram::new(
-                        encoding,
-                        LineEncoding::default(),
-                        LineString::String(Vec::new()),
-                        LineString::String(Vec::new()),
-                        None,
-                    );
-
-                    let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
-                    let debug_line_offset = program
-                        .write(
-                            &mut debug_line,
-                            encoding,
-                            &debug_line_str_offsets,
-                            &debug_str_offsets,
-                        )
-                        .unwrap();
-
-                    let read_debug_line = read::DebugLine::new(debug_line.slice(), LittleEndian);
-                    let read_program = read_debug_line
-                        .program(
-                            debug_line_offset,
-                            address_size,
-                            // Testing missing comp_dir/comp_name.
-                            None,
-                            None,
-                        )
-                        .unwrap();
-
-                    let dwarf = read::Dwarf::default();
-                    let mut convert_line_strings = LineStringTable::default();
-                    let mut convert_strings = StringTable::default();
-                    let convert_address = &|address| Some(Address::Constant(address));
-                    LineProgram::from(
-                        read_program,
-                        &dwarf,
-                        &mut convert_line_strings,
-                        &mut convert_strings,
-                        convert_address,
-                    )
-                    .unwrap();
-                }
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/loc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/loc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/loc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/loc.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,547 +0,0 @@
-use alloc::vec::Vec;
-use indexmap::IndexSet;
-use std::ops::{Deref, DerefMut};
-
-use crate::common::{Encoding, LocationListsOffset, SectionId};
-use crate::write::{
-    Address, BaseId, DebugInfoReference, Error, Expression, Result, Section, Sections, UnitOffsets,
-    Writer,
-};
-
-define_section!(
-    DebugLoc,
-    LocationListsOffset,
-    "A writable `.debug_loc` section."
-);
-define_section!(
-    DebugLocLists,
-    LocationListsOffset,
-    "A writable `.debug_loclists` section."
-);
-
-define_offsets!(
-    LocationListOffsets: LocationListId => LocationListsOffset,
-    "The section offsets of a series of location lists within the `.debug_loc` or `.debug_loclists` sections."
-);
-
-define_id!(
-    LocationListId,
-    "An identifier for a location list in a `LocationListTable`."
-);
-
-/// A table of location lists that will be stored in a `.debug_loc` or `.debug_loclists` section.
-#[derive(Debug, Default)]
-pub struct LocationListTable {
-    base_id: BaseId,
-    locations: IndexSet<LocationList>,
-}
-
-impl LocationListTable {
-    /// Add a location list to the table.
-    pub fn add(&mut self, loc_list: LocationList) -> LocationListId {
-        let (index, _) = self.locations.insert_full(loc_list);
-        LocationListId::new(self.base_id, index)
-    }
-
-    /// Write the location list table to the appropriate section for the given DWARF version.
-    pub(crate) fn write<W: Writer>(
-        &self,
-        sections: &mut Sections<W>,
-        encoding: Encoding,
-        unit_offsets: Option<&UnitOffsets>,
-    ) -> Result<LocationListOffsets> {
-        if self.locations.is_empty() {
-            return Ok(LocationListOffsets::none());
-        }
-
-        match encoding.version {
-            2..=4 => self.write_loc(
-                &mut sections.debug_loc,
-                &mut sections.debug_loc_refs,
-                encoding,
-                unit_offsets,
-            ),
-            5 => self.write_loclists(
-                &mut sections.debug_loclists,
-                &mut sections.debug_loclists_refs,
-                encoding,
-                unit_offsets,
-            ),
-            _ => Err(Error::UnsupportedVersion(encoding.version)),
-        }
-    }
-
-    /// Write the location list table to the `.debug_loc` section.
-    fn write_loc<W: Writer>(
-        &self,
-        w: &mut DebugLoc<W>,
-        refs: &mut Vec<DebugInfoReference>,
-        encoding: Encoding,
-        unit_offsets: Option<&UnitOffsets>,
-    ) -> Result<LocationListOffsets> {
-        let address_size = encoding.address_size;
-        let mut offsets = Vec::new();
-        for loc_list in self.locations.iter() {
-            offsets.push(w.offset());
-            for loc in &loc_list.0 {
-                // Note that we must ensure none of the ranges have both begin == 0 and end == 0.
-                // We do this by ensuring that begin != end, which is a bit more restrictive
-                // than required, but still seems reasonable.
-                match *loc {
-                    Location::BaseAddress { address } => {
-                        let marker = !0 >> (64 - address_size * 8);
-                        w.write_udata(marker, address_size)?;
-                        w.write_address(address, address_size)?;
-                    }
-                    Location::OffsetPair {
-                        begin,
-                        end,
-                        ref data,
-                    } => {
-                        if begin == end {
-                            return Err(Error::InvalidRange);
-                        }
-                        w.write_udata(begin, address_size)?;
-                        w.write_udata(end, address_size)?;
-                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
-                    }
-                    Location::StartEnd {
-                        begin,
-                        end,
-                        ref data,
-                    } => {
-                        if begin == end {
-                            return Err(Error::InvalidRange);
-                        }
-                        w.write_address(begin, address_size)?;
-                        w.write_address(end, address_size)?;
-                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
-                    }
-                    Location::StartLength {
-                        begin,
-                        length,
-                        ref data,
-                    } => {
-                        let end = match begin {
-                            Address::Constant(begin) => Address::Constant(begin + length),
-                            Address::Symbol { symbol, addend } => Address::Symbol {
-                                symbol,
-                                addend: addend + length as i64,
-                            },
-                        };
-                        if begin == end {
-                            return Err(Error::InvalidRange);
-                        }
-                        w.write_address(begin, address_size)?;
-                        w.write_address(end, address_size)?;
-                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
-                    }
-                    Location::DefaultLocation { .. } => {
-                        return Err(Error::InvalidRange);
-                    }
-                }
-            }
-            w.write_udata(0, address_size)?;
-            w.write_udata(0, address_size)?;
-        }
-        Ok(LocationListOffsets {
-            base_id: self.base_id,
-            offsets,
-        })
-    }
-
-    /// Write the location list table to the `.debug_loclists` section.
-    fn write_loclists<W: Writer>(
-        &self,
-        w: &mut DebugLocLists<W>,
-        refs: &mut Vec<DebugInfoReference>,
-        encoding: Encoding,
-        unit_offsets: Option<&UnitOffsets>,
-    ) -> Result<LocationListOffsets> {
-        let mut offsets = Vec::new();
-
-        if encoding.version != 5 {
-            return Err(Error::NeedVersion(5));
-        }
-
-        let length_offset = w.write_initial_length(encoding.format)?;
-        let length_base = w.len();
-
-        w.write_u16(encoding.version)?;
-        w.write_u8(encoding.address_size)?;
-        w.write_u8(0)?; // segment_selector_size
-        w.write_u32(0)?; // offset_entry_count (when set to zero DW_FORM_rnglistx can't be used, see section 7.28)
-                         // FIXME implement DW_FORM_rnglistx writing and implement the offset entry list
-
-        for loc_list in self.locations.iter() {
-            offsets.push(w.offset());
-            for loc in &loc_list.0 {
-                match *loc {
-                    Location::BaseAddress { address } => {
-                        w.write_u8(crate::constants::DW_LLE_base_address.0)?;
-                        w.write_address(address, encoding.address_size)?;
-                    }
-                    Location::OffsetPair {
-                        begin,
-                        end,
-                        ref data,
-                    } => {
-                        w.write_u8(crate::constants::DW_LLE_offset_pair.0)?;
-                        w.write_uleb128(begin)?;
-                        w.write_uleb128(end)?;
-                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
-                    }
-                    Location::StartEnd {
-                        begin,
-                        end,
-                        ref data,
-                    } => {
-                        w.write_u8(crate::constants::DW_LLE_start_end.0)?;
-                        w.write_address(begin, encoding.address_size)?;
-                        w.write_address(end, encoding.address_size)?;
-                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
-                    }
-                    Location::StartLength {
-                        begin,
-                        length,
-                        ref data,
-                    } => {
-                        w.write_u8(crate::constants::DW_LLE_start_length.0)?;
-                        w.write_address(begin, encoding.address_size)?;
-                        w.write_uleb128(length)?;
-                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
-                    }
-                    Location::DefaultLocation { ref data } => {
-                        w.write_u8(crate::constants::DW_LLE_default_location.0)?;
-                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
-                    }
-                }
-            }
-
-            w.write_u8(crate::constants::DW_LLE_end_of_list.0)?;
-        }
-
-        let length = (w.len() - length_base) as u64;
-        w.write_initial_length_at(length_offset, length, encoding.format)?;
-
-        Ok(LocationListOffsets {
-            base_id: self.base_id,
-            offsets,
-        })
-    }
-}
-
-/// A locations list that will be stored in a `.debug_loc` or `.debug_loclists` section.
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub struct LocationList(pub Vec<Location>);
-
-/// A single location.
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub enum Location {
-    /// DW_LLE_base_address
-    BaseAddress {
-        /// Base address.
-        address: Address,
-    },
-    /// DW_LLE_offset_pair
-    OffsetPair {
-        /// Start of range relative to base address.
-        begin: u64,
-        /// End of range relative to base address.
-        end: u64,
-        /// Location description.
-        data: Expression,
-    },
-    /// DW_LLE_start_end
-    StartEnd {
-        /// Start of range.
-        begin: Address,
-        /// End of range.
-        end: Address,
-        /// Location description.
-        data: Expression,
-    },
-    /// DW_LLE_start_length
-    StartLength {
-        /// Start of range.
-        begin: Address,
-        /// Length of range.
-        length: u64,
-        /// Location description.
-        data: Expression,
-    },
-    /// DW_LLE_default_location
-    DefaultLocation {
-        /// Location description.
-        data: Expression,
-    },
-}
-
-fn write_expression<W: Writer>(
-    w: &mut W,
-    refs: &mut Vec<DebugInfoReference>,
-    encoding: Encoding,
-    unit_offsets: Option<&UnitOffsets>,
-    val: &Expression,
-) -> Result<()> {
-    let size = val.size(encoding, unit_offsets) as u64;
-    if encoding.version <= 4 {
-        w.write_udata(size, 2)?;
-    } else {
-        w.write_uleb128(size)?;
-    }
-    val.write(w, Some(refs), encoding, unit_offsets)?;
-    Ok(())
-}
-
-#[cfg(feature = "read")]
-mod convert {
-    use super::*;
-
-    use crate::read::{self, Reader};
-    use crate::write::{ConvertError, ConvertResult, ConvertUnitContext};
-
-    impl LocationList {
-        /// Create a location list by reading the data from the give location list iter.
-        pub(crate) fn from<R: Reader<Offset = usize>>(
-            mut from: read::RawLocListIter<R>,
-            context: &ConvertUnitContext<R>,
-        ) -> ConvertResult<Self> {
-            let mut have_base_address = context.base_address != Address::Constant(0);
-            let convert_address =
-                |x| (context.convert_address)(x).ok_or(ConvertError::InvalidAddress);
-            let convert_expression = |x| {
-                Expression::from(
-                    x,
-                    context.unit.encoding(),
-                    Some(context.dwarf),
-                    Some(context.unit),
-                    Some(context.entry_ids),
-                    context.convert_address,
-                )
-            };
-            let mut loc_list = Vec::new();
-            while let Some(from_loc) = from.next()? {
-                let loc = match from_loc {
-                    read::RawLocListEntry::AddressOrOffsetPair { begin, end, data } => {
-                        // These were parsed as addresses, even if they are offsets.
-                        let begin = convert_address(begin)?;
-                        let end = convert_address(end)?;
-                        let data = convert_expression(data)?;
-                        match (begin, end) {
-                            (Address::Constant(begin_offset), Address::Constant(end_offset)) => {
-                                if have_base_address {
-                                    Location::OffsetPair {
-                                        begin: begin_offset,
-                                        end: end_offset,
-                                        data,
-                                    }
-                                } else {
-                                    Location::StartEnd { begin, end, data }
-                                }
-                            }
-                            _ => {
-                                if have_base_address {
-                                    // At least one of begin/end is an address, but we also have
-                                    // a base address. Adding addresses is undefined.
-                                    return Err(ConvertError::InvalidRangeRelativeAddress);
-                                }
-                                Location::StartEnd { begin, end, data }
-                            }
-                        }
-                    }
-                    read::RawLocListEntry::BaseAddress { addr } => {
-                        have_base_address = true;
-                        let address = convert_address(addr)?;
-                        Location::BaseAddress { address }
-                    }
-                    read::RawLocListEntry::BaseAddressx { addr } => {
-                        have_base_address = true;
-                        let address = convert_address(context.dwarf.address(context.unit, addr)?)?;
-                        Location::BaseAddress { address }
-                    }
-                    read::RawLocListEntry::StartxEndx { begin, end, data } => {
-                        let begin = convert_address(context.dwarf.address(context.unit, begin)?)?;
-                        let end = convert_address(context.dwarf.address(context.unit, end)?)?;
-                        let data = convert_expression(data)?;
-                        Location::StartEnd { begin, end, data }
-                    }
-                    read::RawLocListEntry::StartxLength {
-                        begin,
-                        length,
-                        data,
-                    } => {
-                        let begin = convert_address(context.dwarf.address(context.unit, begin)?)?;
-                        let data = convert_expression(data)?;
-                        Location::StartLength {
-                            begin,
-                            length,
-                            data,
-                        }
-                    }
-                    read::RawLocListEntry::OffsetPair { begin, end, data } => {
-                        let data = convert_expression(data)?;
-                        Location::OffsetPair { begin, end, data }
-                    }
-                    read::RawLocListEntry::StartEnd { begin, end, data } => {
-                        let begin = convert_address(begin)?;
-                        let end = convert_address(end)?;
-                        let data = convert_expression(data)?;
-                        Location::StartEnd { begin, end, data }
-                    }
-                    read::RawLocListEntry::StartLength {
-                        begin,
-                        length,
-                        data,
-                    } => {
-                        let begin = convert_address(begin)?;
-                        let data = convert_expression(data)?;
-                        Location::StartLength {
-                            begin,
-                            length,
-                            data,
-                        }
-                    }
-                    read::RawLocListEntry::DefaultLocation { data } => {
-                        let data = convert_expression(data)?;
-                        Location::DefaultLocation { data }
-                    }
-                };
-                // In some cases, existing data may contain begin == end, filtering
-                // these out.
-                match loc {
-                    Location::StartLength { length, .. } if length == 0 => continue,
-                    Location::StartEnd { begin, end, .. } if begin == end => continue,
-                    Location::OffsetPair { begin, end, .. } if begin == end => continue,
-                    _ => (),
-                }
-                loc_list.push(loc);
-            }
-            Ok(LocationList(loc_list))
-        }
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "read")]
-mod tests {
-    use super::*;
-    use crate::common::{
-        DebugAbbrevOffset, DebugAddrBase, DebugInfoOffset, DebugLocListsBase, DebugRngListsBase,
-        DebugStrOffsetsBase, Format, UnitSectionOffset,
-    };
-    use crate::read;
-    use crate::write::{
-        ConvertUnitContext, EndianVec, LineStringTable, RangeListTable, StringTable,
-    };
-    use crate::LittleEndian;
-    use std::collections::HashMap;
-
-    #[test]
-    fn test_loc_list() {
-        let mut line_strings = LineStringTable::default();
-        let mut strings = StringTable::default();
-        let mut expression = Expression::new();
-        expression.op_constu(0);
-
-        for &version in &[2, 3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-
-                    let mut loc_list = LocationList(vec![
-                        Location::StartLength {
-                            begin: Address::Constant(6666),
-                            length: 7777,
-                            data: expression.clone(),
-                        },
-                        Location::StartEnd {
-                            begin: Address::Constant(4444),
-                            end: Address::Constant(5555),
-                            data: expression.clone(),
-                        },
-                        Location::BaseAddress {
-                            address: Address::Constant(1111),
-                        },
-                        Location::OffsetPair {
-                            begin: 2222,
-                            end: 3333,
-                            data: expression.clone(),
-                        },
-                    ]);
-                    if version >= 5 {
-                        loc_list.0.push(Location::DefaultLocation {
-                            data: expression.clone(),
-                        });
-                    }
-
-                    let mut locations = LocationListTable::default();
-                    let loc_list_id = locations.add(loc_list.clone());
-
-                    let mut sections = Sections::new(EndianVec::new(LittleEndian));
-                    let loc_list_offsets = locations.write(&mut sections, encoding, None).unwrap();
-                    assert!(sections.debug_loc_refs.is_empty());
-                    assert!(sections.debug_loclists_refs.is_empty());
-
-                    let read_debug_loc =
-                        read::DebugLoc::new(sections.debug_loc.slice(), LittleEndian);
-                    let read_debug_loclists =
-                        read::DebugLocLists::new(sections.debug_loclists.slice(), LittleEndian);
-                    let read_loc = read::LocationLists::new(read_debug_loc, read_debug_loclists);
-                    let offset = loc_list_offsets.get(loc_list_id);
-                    let read_loc_list = read_loc.raw_locations(offset, encoding).unwrap();
-
-                    let dwarf = read::Dwarf {
-                        locations: read_loc,
-                        ..Default::default()
-                    };
-                    let unit = read::Unit {
-                        offset: UnitSectionOffset::DebugInfoOffset(DebugInfoOffset(0)),
-                        header: read::UnitHeader::new(
-                            encoding,
-                            0,
-                            DebugAbbrevOffset(0),
-                            read::EndianSlice::default(),
-                        ),
-                        abbreviations: read::Abbreviations::default(),
-                        name: None,
-                        comp_dir: None,
-                        low_pc: 0,
-                        str_offsets_base: DebugStrOffsetsBase(0),
-                        addr_base: DebugAddrBase(0),
-                        loclists_base: DebugLocListsBase(0),
-                        rnglists_base: DebugRngListsBase(0),
-                        line_program: None,
-                    };
-                    let context = ConvertUnitContext {
-                        dwarf: &dwarf,
-                        unit: &unit,
-                        line_strings: &mut line_strings,
-                        strings: &mut strings,
-                        ranges: &mut RangeListTable::default(),
-                        locations: &mut locations,
-                        convert_address: &|address| Some(Address::Constant(address)),
-                        base_address: Address::Constant(0),
-                        line_program_offset: None,
-                        line_program_files: Vec::new(),
-                        entry_ids: &HashMap::new(),
-                    };
-                    let convert_loc_list = LocationList::from(read_loc_list, &context).unwrap();
-
-                    if version <= 4 {
-                        loc_list.0[0] = Location::StartEnd {
-                            begin: Address::Constant(6666),
-                            end: Address::Constant(6666 + 7777),
-                            data: expression.clone(),
-                        };
-                    }
-                    assert_eq!(loc_list, convert_loc_list);
-                }
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,422 +0,0 @@
-//! Write DWARF debugging information.
-//!
-//! ## API Structure
-//!
-//! This module works by building up a representation of the debugging information
-//! in memory, and then writing it all at once. It supports two major use cases:
-//!
-//! * Use the [`DwarfUnit`](./struct.DwarfUnit.html) type when writing DWARF
-//! for a single compilation unit.
-//!
-//! * Use the [`Dwarf`](./struct.Dwarf.html) type when writing DWARF for multiple
-//! compilation units.
-//!
-//! The module also supports reading in DWARF debugging information and writing it out
-//! again, possibly after modifying it. Create a [`read::Dwarf`](../read/struct.Dwarf.html)
-//! instance, and then use [`Dwarf::from`](./struct.Dwarf.html#method.from) to convert
-//! it to a writable instance.
-//!
-//! ## Example Usage
-//!
-//! Write a compilation unit containing only the top level DIE.
-//!
-//! ```rust
-//! use gimli::write::{
-//!     Address, AttributeValue, DwarfUnit, EndianVec, Error, Range, RangeList, Sections,
-//! };
-//!
-//! fn example() -> Result<(), Error> {
-//!     // Choose the encoding parameters.
-//!     let encoding = gimli::Encoding {
-//!         format: gimli::Format::Dwarf32,
-//!         version: 5,
-//!         address_size: 8,
-//!     };
-//!     // Create a container for a single compilation unit.
-//!     let mut dwarf = DwarfUnit::new(encoding);
-//!     // Set a range attribute on the root DIE.
-//!     let range_list = RangeList(vec![Range::StartLength {
-//!         begin: Address::Constant(0x100),
-//!         length: 42,
-//!     }]);
-//!     let range_list_id = dwarf.unit.ranges.add(range_list);
-//!     let root = dwarf.unit.root();
-//!     dwarf.unit.get_mut(root).set(
-//!         gimli::DW_AT_ranges,
-//!         AttributeValue::RangeListRef(range_list_id),
-//!     );
-//!     // Create a `Vec` for each DWARF section.
-//!     let mut sections = Sections::new(EndianVec::new(gimli::LittleEndian));
-//!     // Finally, write the DWARF data to the sections.
-//!     dwarf.write(&mut sections)?;
-//!     sections.for_each(|id, data| {
-//!         // Here you can add the data to the output object file.
-//!         Ok(())
-//!     })
-//! }
-//! # fn main() {
-//! #     example().unwrap();
-//! # }
-
-use std::error;
-use std::fmt;
-use std::result;
-
-use crate::constants;
-
-mod endian_vec;
-pub use self::endian_vec::*;
-
-mod writer;
-pub use self::writer::*;
-
-#[macro_use]
-mod section;
-pub use self::section::*;
-
-macro_rules! define_id {
-    ($name:ident, $docs:expr) => {
-        #[doc=$docs]
-        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-        pub struct $name {
-            base_id: BaseId,
-            index: usize,
-        }
-
-        impl $name {
-            #[inline]
-            fn new(base_id: BaseId, index: usize) -> Self {
-                $name { base_id, index }
-            }
-        }
-    };
-}
-
-macro_rules! define_offsets {
-    ($offsets:ident: $id:ident => $offset:ident, $off_doc:expr) => {
-        #[doc=$off_doc]
-        #[derive(Debug)]
-        pub struct $offsets {
-            base_id: BaseId,
-            // We know ids start at 0.
-            offsets: Vec<$offset>,
-        }
-
-        impl $offsets {
-            /// Return an empty list of offsets.
-            #[inline]
-            pub fn none() -> Self {
-                $offsets {
-                    base_id: BaseId::default(),
-                    offsets: Vec::new(),
-                }
-            }
-
-            /// Get the offset
-            ///
-            /// # Panics
-            ///
-            /// Panics if `id` is invalid.
-            #[inline]
-            pub fn get(&self, id: $id) -> $offset {
-                debug_assert_eq!(self.base_id, id.base_id);
-                self.offsets[id.index]
-            }
-
-            /// Return the number of offsets.
-            #[inline]
-            pub fn count(&self) -> usize {
-                self.offsets.len()
-            }
-        }
-    };
-}
-
-mod abbrev;
-pub use self::abbrev::*;
-
-mod cfi;
-pub use self::cfi::*;
-
-mod dwarf;
-pub use self::dwarf::*;
-
-mod line;
-pub use self::line::*;
-
-mod loc;
-pub use self::loc::*;
-
-mod op;
-pub use self::op::*;
-
-mod range;
-pub use self::range::*;
-
-mod str;
-pub use self::str::*;
-
-mod unit;
-pub use self::unit::*;
-
-/// An error that occurred when writing.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Error {
-    /// The given offset is out of bounds.
-    OffsetOutOfBounds,
-    /// The given length is out of bounds.
-    LengthOutOfBounds,
-    /// The attribute value is an invalid for writing.
-    InvalidAttributeValue,
-    /// The value is too large for the encoding form.
-    ValueTooLarge,
-    /// Unsupported word size.
-    UnsupportedWordSize(u8),
-    /// Unsupported DWARF version.
-    UnsupportedVersion(u16),
-    /// The unit length is too large for the requested DWARF format.
-    InitialLengthOverflow,
-    /// The address is invalid.
-    InvalidAddress,
-    /// The reference is invalid.
-    InvalidReference,
-    /// A requested feature requires a different DWARF version.
-    NeedVersion(u16),
-    /// Strings in line number program have mismatched forms.
-    LineStringFormMismatch,
-    /// The range is empty or otherwise invalid.
-    InvalidRange,
-    /// The line number program encoding is incompatible with the unit encoding.
-    IncompatibleLineProgramEncoding,
-    /// Could not encode code offset for a frame instruction.
-    InvalidFrameCodeOffset(u32),
-    /// Could not encode data offset for a frame instruction.
-    InvalidFrameDataOffset(i32),
-    /// Unsupported eh_frame pointer encoding.
-    UnsupportedPointerEncoding(constants::DwEhPe),
-    /// Unsupported reference in CFI expression.
-    UnsupportedCfiExpressionReference,
-    /// Unsupported forward reference in expression.
-    UnsupportedExpressionForwardReference,
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> {
-        match *self {
-            Error::OffsetOutOfBounds => write!(f, "The given offset is out of bounds."),
-            Error::LengthOutOfBounds => write!(f, "The given length is out of bounds."),
-            Error::InvalidAttributeValue => {
-                write!(f, "The attribute value is an invalid for writing.")
-            }
-            Error::ValueTooLarge => write!(f, "The value is too large for the encoding form."),
-            Error::UnsupportedWordSize(size) => write!(f, "Unsupported word size: {}", size),
-            Error::UnsupportedVersion(version) => {
-                write!(f, "Unsupported DWARF version: {}", version)
-            }
-            Error::InitialLengthOverflow => write!(
-                f,
-                "The unit length is too large for the requested DWARF format."
-            ),
-            Error::InvalidAddress => write!(f, "The address is invalid."),
-            Error::InvalidReference => write!(f, "The reference is invalid."),
-            Error::NeedVersion(version) => write!(
-                f,
-                "A requested feature requires a DWARF version {}.",
-                version
-            ),
-            Error::LineStringFormMismatch => {
-                write!(f, "Strings in line number program have mismatched forms.")
-            }
-            Error::InvalidRange => write!(f, "The range is empty or otherwise invalid."),
-            Error::IncompatibleLineProgramEncoding => write!(
-                f,
-                "The line number program encoding is incompatible with the unit encoding."
-            ),
-            Error::InvalidFrameCodeOffset(offset) => write!(
-                f,
-                "Could not encode code offset ({}) for a frame instruction.",
-                offset,
-            ),
-            Error::InvalidFrameDataOffset(offset) => write!(
-                f,
-                "Could not encode data offset ({}) for a frame instruction.",
-                offset,
-            ),
-            Error::UnsupportedPointerEncoding(eh_pe) => {
-                write!(f, "Unsupported eh_frame pointer encoding ({}).", eh_pe)
-            }
-            Error::UnsupportedCfiExpressionReference => {
-                write!(f, "Unsupported reference in CFI expression.")
-            }
-            Error::UnsupportedExpressionForwardReference => {
-                write!(f, "Unsupported forward reference in expression.")
-            }
-        }
-    }
-}
-
-impl error::Error for Error {}
-
-/// The result of a write.
-pub type Result<T> = result::Result<T, Error>;
-
-/// An address.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum Address {
-    /// A fixed address that does not require relocation.
-    Constant(u64),
-    /// An address that is relative to a symbol which may be relocated.
-    Symbol {
-        /// The symbol that the address is relative to.
-        ///
-        /// The meaning of this value is decided by the writer, but
-        /// will typically be an index into a symbol table.
-        symbol: usize,
-        /// The offset of the address relative to the symbol.
-        ///
-        /// This will typically be used as the addend in a relocation.
-        addend: i64,
-    },
-}
-
-/// A reference to a `.debug_info` entry.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum Reference {
-    /// An external symbol.
-    ///
-    /// The meaning of this value is decided by the writer, but
-    /// will typically be an index into a symbol table.
-    Symbol(usize),
-    /// An entry in the same section.
-    ///
-    /// This only supports references in units that are emitted together.
-    Entry(UnitId, UnitEntryId),
-}
-
-// This type is only used in debug assertions.
-#[cfg(not(debug_assertions))]
-type BaseId = ();
-
-#[cfg(debug_assertions)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-struct BaseId(usize);
-
-#[cfg(debug_assertions)]
-impl Default for BaseId {
-    fn default() -> Self {
-        use std::sync::atomic;
-        static BASE_ID: atomic::AtomicUsize = atomic::AtomicUsize::new(0);
-        BaseId(BASE_ID.fetch_add(1, atomic::Ordering::Relaxed))
-    }
-}
-
-#[cfg(feature = "read")]
-mod convert {
-    use super::*;
-    use crate::read;
-
-    pub(crate) use super::unit::convert::*;
-
-    /// An error that occurred when converting a read value into a write value.
-    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-    pub enum ConvertError {
-        /// An error occurred when reading.
-        Read(read::Error),
-        /// Writing of this attribute value is not implemented yet.
-        UnsupportedAttributeValue,
-        /// This attribute value is an invalid name/form combination.
-        InvalidAttributeValue,
-        /// A `.debug_info` reference does not refer to a valid entry.
-        InvalidDebugInfoOffset,
-        /// An address could not be converted.
-        InvalidAddress,
-        /// Writing this line number instruction is not implemented yet.
-        UnsupportedLineInstruction,
-        /// Writing this form of line string is not implemented yet.
-        UnsupportedLineStringForm,
-        /// A `.debug_line` file index is invalid.
-        InvalidFileIndex,
-        /// A `.debug_line` directory index is invalid.
-        InvalidDirectoryIndex,
-        /// A `.debug_line` line base is invalid.
-        InvalidLineBase,
-        /// A `.debug_line` reference is invalid.
-        InvalidLineRef,
-        /// A `.debug_info` unit entry reference is invalid.
-        InvalidUnitRef,
-        /// A `.debug_info` reference is invalid.
-        InvalidDebugInfoRef,
-        /// Invalid relative address in a range list.
-        InvalidRangeRelativeAddress,
-        /// Writing this CFI instruction is not implemented yet.
-        UnsupportedCfiInstruction,
-        /// Writing indirect pointers is not implemented yet.
-        UnsupportedIndirectAddress,
-        /// Writing this expression operation is not implemented yet.
-        UnsupportedOperation,
-        /// Operation branch target is invalid.
-        InvalidBranchTarget,
-    }
-
-    impl fmt::Display for ConvertError {
-        fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> {
-            use self::ConvertError::*;
-            match *self {
-                Read(ref e) => e.fmt(f),
-                UnsupportedAttributeValue => {
-                    write!(f, "Writing of this attribute value is not implemented yet.")
-                }
-                InvalidAttributeValue => write!(
-                    f,
-                    "This attribute value is an invalid name/form combination."
-                ),
-                InvalidDebugInfoOffset => write!(
-                    f,
-                    "A `.debug_info` reference does not refer to a valid entry."
-                ),
-                InvalidAddress => write!(f, "An address could not be converted."),
-                UnsupportedLineInstruction => write!(
-                    f,
-                    "Writing this line number instruction is not implemented yet."
-                ),
-                UnsupportedLineStringForm => write!(
-                    f,
-                    "Writing this form of line string is not implemented yet."
-                ),
-                InvalidFileIndex => write!(f, "A `.debug_line` file index is invalid."),
-                InvalidDirectoryIndex => write!(f, "A `.debug_line` directory index is invalid."),
-                InvalidLineBase => write!(f, "A `.debug_line` line base is invalid."),
-                InvalidLineRef => write!(f, "A `.debug_line` reference is invalid."),
-                InvalidUnitRef => write!(f, "A `.debug_info` unit entry reference is invalid."),
-                InvalidDebugInfoRef => write!(f, "A `.debug_info` reference is invalid."),
-                InvalidRangeRelativeAddress => {
-                    write!(f, "Invalid relative address in a range list.")
-                }
-                UnsupportedCfiInstruction => {
-                    write!(f, "Writing this CFI instruction is not implemented yet.")
-                }
-                UnsupportedIndirectAddress => {
-                    write!(f, "Writing indirect pointers is not implemented yet.")
-                }
-                UnsupportedOperation => write!(
-                    f,
-                    "Writing this expression operation is not implemented yet."
-                ),
-                InvalidBranchTarget => write!(f, "Operation branch target is invalid."),
-            }
-        }
-    }
-
-    impl error::Error for ConvertError {}
-
-    impl From<read::Error> for ConvertError {
-        fn from(e: read::Error) -> Self {
-            ConvertError::Read(e)
-        }
-    }
-
-    /// The result of a conversion.
-    pub type ConvertResult<T> = result::Result<T, ConvertError>;
-}
-#[cfg(feature = "read")]
-pub use self::convert::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/op.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/op.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/op.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/op.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1558 +0,0 @@
-use alloc::boxed::Box;
-use alloc::vec::Vec;
-
-use crate::common::{Encoding, Register};
-use crate::constants::{self, DwOp};
-use crate::leb128::write::{sleb128_size, uleb128_size};
-use crate::write::{
-    Address, DebugInfoReference, Error, Reference, Result, UnitEntryId, UnitOffsets, Writer,
-};
-
-/// The bytecode for a DWARF expression or location description.
-#[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
-pub struct Expression {
-    operations: Vec<Operation>,
-}
-
-impl Expression {
-    /// Create an empty expression.
-    #[inline]
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Create an expression from raw bytecode.
-    ///
-    /// This does not support operations that require references, such as `DW_OP_addr`.
-    #[inline]
-    pub fn raw(bytecode: Vec<u8>) -> Self {
-        Expression {
-            operations: vec![Operation::Raw(bytecode)],
-        }
-    }
-
-    /// Add an operation to the expression.
-    ///
-    /// This should only be used for operations that have no explicit operands.
-    pub fn op(&mut self, opcode: DwOp) {
-        self.operations.push(Operation::Simple(opcode));
-    }
-
-    /// Add a `DW_OP_addr` operation to the expression.
-    pub fn op_addr(&mut self, address: Address) {
-        self.operations.push(Operation::Address(address));
-    }
-
-    /// Add a `DW_OP_constu` operation to the expression.
-    ///
-    /// This may be emitted as a smaller equivalent operation.
-    pub fn op_constu(&mut self, value: u64) {
-        self.operations.push(Operation::UnsignedConstant(value));
-    }
-
-    /// Add a `DW_OP_consts` operation to the expression.
-    ///
-    /// This may be emitted as a smaller equivalent operation.
-    pub fn op_consts(&mut self, value: i64) {
-        self.operations.push(Operation::SignedConstant(value));
-    }
-
-    /// Add a `DW_OP_const_type` or `DW_OP_GNU_const_type` operation to the expression.
-    pub fn op_const_type(&mut self, base: UnitEntryId, value: Box<[u8]>) {
-        self.operations.push(Operation::ConstantType(base, value));
-    }
-
-    /// Add a `DW_OP_fbreg` operation to the expression.
-    pub fn op_fbreg(&mut self, offset: i64) {
-        self.operations.push(Operation::FrameOffset(offset));
-    }
-
-    /// Add a `DW_OP_bregx` operation to the expression.
-    ///
-    /// This may be emitted as a smaller equivalent operation.
-    pub fn op_breg(&mut self, register: Register, offset: i64) {
-        self.operations
-            .push(Operation::RegisterOffset(register, offset));
-    }
-
-    /// Add a `DW_OP_regval_type` or `DW_OP_GNU_regval_type` operation to the expression.
-    ///
-    /// This may be emitted as a smaller equivalent operation.
-    pub fn op_regval_type(&mut self, register: Register, base: UnitEntryId) {
-        self.operations
-            .push(Operation::RegisterType(register, base));
-    }
-
-    /// Add a `DW_OP_pick` operation to the expression.
-    ///
-    /// This may be emitted as a `DW_OP_dup` or `DW_OP_over` operation.
-    pub fn op_pick(&mut self, index: u8) {
-        self.operations.push(Operation::Pick(index));
-    }
-
-    /// Add a `DW_OP_deref` operation to the expression.
-    pub fn op_deref(&mut self) {
-        self.operations.push(Operation::Deref { space: false });
-    }
-
-    /// Add a `DW_OP_xderef` operation to the expression.
-    pub fn op_xderef(&mut self) {
-        self.operations.push(Operation::Deref { space: true });
-    }
-
-    /// Add a `DW_OP_deref_size` operation to the expression.
-    pub fn op_deref_size(&mut self, size: u8) {
-        self.operations
-            .push(Operation::DerefSize { size, space: false });
-    }
-
-    /// Add a `DW_OP_xderef_size` operation to the expression.
-    pub fn op_xderef_size(&mut self, size: u8) {
-        self.operations
-            .push(Operation::DerefSize { size, space: true });
-    }
-
-    /// Add a `DW_OP_deref_type` or `DW_OP_GNU_deref_type` operation to the expression.
-    pub fn op_deref_type(&mut self, size: u8, base: UnitEntryId) {
-        self.operations.push(Operation::DerefType {
-            size,
-            base,
-            space: false,
-        });
-    }
-
-    /// Add a `DW_OP_xderef_type` operation to the expression.
-    pub fn op_xderef_type(&mut self, size: u8, base: UnitEntryId) {
-        self.operations.push(Operation::DerefType {
-            size,
-            base,
-            space: true,
-        });
-    }
-
-    /// Add a `DW_OP_plus_uconst` operation to the expression.
-    pub fn op_plus_uconst(&mut self, value: u64) {
-        self.operations.push(Operation::PlusConstant(value));
-    }
-
-    /// Add a `DW_OP_skip` operation to the expression.
-    ///
-    /// Returns the index of the operation. The caller must call `set_target` with
-    /// this index to set the target of the branch.
-    pub fn op_skip(&mut self) -> usize {
-        let index = self.next_index();
-        self.operations.push(Operation::Skip(!0));
-        index
-    }
-
-    /// Add a `DW_OP_bra` operation to the expression.
-    ///
-    /// Returns the index of the operation. The caller must call `set_target` with
-    /// this index to set the target of the branch.
-    pub fn op_bra(&mut self) -> usize {
-        let index = self.next_index();
-        self.operations.push(Operation::Branch(!0));
-        index
-    }
-
-    /// Return the index that will be assigned to the next operation.
-    ///
-    /// This can be passed to `set_target`.
-    #[inline]
-    pub fn next_index(&self) -> usize {
-        self.operations.len()
-    }
-
-    /// Set the target of a `DW_OP_skip` or `DW_OP_bra` operation .
-    pub fn set_target(&mut self, operation: usize, new_target: usize) {
-        debug_assert!(new_target <= self.next_index());
-        debug_assert_ne!(operation, new_target);
-        match self.operations[operation] {
-            Operation::Skip(ref mut target) | Operation::Branch(ref mut target) => {
-                *target = new_target;
-            }
-            _ => unimplemented!(),
-        }
-    }
-
-    /// Add a `DW_OP_call4` operation to the expression.
-    pub fn op_call(&mut self, entry: UnitEntryId) {
-        self.operations.push(Operation::Call(entry));
-    }
-
-    /// Add a `DW_OP_call_ref` operation to the expression.
-    pub fn op_call_ref(&mut self, entry: Reference) {
-        self.operations.push(Operation::CallRef(entry));
-    }
-
-    /// Add a `DW_OP_convert` or `DW_OP_GNU_convert` operation to the expression.
-    ///
-    /// `base` is the DIE of the base type, or `None` for the generic type.
-    pub fn op_convert(&mut self, base: Option<UnitEntryId>) {
-        self.operations.push(Operation::Convert(base));
-    }
-
-    /// Add a `DW_OP_reinterpret` or `DW_OP_GNU_reinterpret` operation to the expression.
-    ///
-    /// `base` is the DIE of the base type, or `None` for the generic type.
-    pub fn op_reinterpret(&mut self, base: Option<UnitEntryId>) {
-        self.operations.push(Operation::Reinterpret(base));
-    }
-
-    /// Add a `DW_OP_entry_value` or `DW_OP_GNU_entry_value` operation to the expression.
-    pub fn op_entry_value(&mut self, expression: Expression) {
-        self.operations.push(Operation::EntryValue(expression));
-    }
-
-    /// Add a `DW_OP_regx` operation to the expression.
-    ///
-    /// This may be emitted as a smaller equivalent operation.
-    pub fn op_reg(&mut self, register: Register) {
-        self.operations.push(Operation::Register(register));
-    }
-
-    /// Add a `DW_OP_implicit_value` operation to the expression.
-    pub fn op_implicit_value(&mut self, data: Box<[u8]>) {
-        self.operations.push(Operation::ImplicitValue(data));
-    }
-
-    /// Add a `DW_OP_implicit_pointer` or `DW_OP_GNU_implicit_pointer` operation to the expression.
-    pub fn op_implicit_pointer(&mut self, entry: Reference, byte_offset: i64) {
-        self.operations
-            .push(Operation::ImplicitPointer { entry, byte_offset });
-    }
-
-    /// Add a `DW_OP_piece` operation to the expression.
-    pub fn op_piece(&mut self, size_in_bytes: u64) {
-        self.operations.push(Operation::Piece { size_in_bytes });
-    }
-
-    /// Add a `DW_OP_bit_piece` operation to the expression.
-    pub fn op_bit_piece(&mut self, size_in_bits: u64, bit_offset: u64) {
-        self.operations.push(Operation::BitPiece {
-            size_in_bits,
-            bit_offset,
-        });
-    }
-
-    /// Add a `DW_OP_GNU_parameter_ref` operation to the expression.
-    pub fn op_gnu_parameter_ref(&mut self, entry: UnitEntryId) {
-        self.operations.push(Operation::ParameterRef(entry));
-    }
-
-    pub(crate) fn size(&self, encoding: Encoding, unit_offsets: Option<&UnitOffsets>) -> usize {
-        let mut size = 0;
-        for operation in &self.operations {
-            size += operation.size(encoding, unit_offsets);
-        }
-        size
-    }
-
-    pub(crate) fn write<W: Writer>(
-        &self,
-        w: &mut W,
-        mut refs: Option<&mut Vec<DebugInfoReference>>,
-        encoding: Encoding,
-        unit_offsets: Option<&UnitOffsets>,
-    ) -> Result<()> {
-        // TODO: only calculate offsets if needed?
-        let mut offsets = Vec::with_capacity(self.operations.len());
-        let mut offset = w.len();
-        for operation in &self.operations {
-            offsets.push(offset);
-            offset += operation.size(encoding, unit_offsets);
-        }
-        offsets.push(offset);
-        for (operation, offset) in self.operations.iter().zip(offsets.iter().copied()) {
-            let refs = match refs {
-                Some(ref mut refs) => Some(&mut **refs),
-                None => None,
-            };
-            debug_assert_eq!(w.len(), offset);
-            operation.write(w, refs, encoding, unit_offsets, &offsets)?;
-        }
-        Ok(())
-    }
-}
-
-/// A single DWARF operation.
-//
-// This type is intentionally not public so that we can change the
-// representation of expressions as needed.
-//
-// Variants are listed in the order they appear in Section 2.5.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-enum Operation {
-    /// Raw bytecode.
-    ///
-    /// Does not support references.
-    Raw(Vec<u8>),
-    /// An operation that has no explicit operands.
-    ///
-    /// Represents:
-    /// - `DW_OP_drop`, `DW_OP_swap`, `DW_OP_rot`
-    /// - `DW_OP_push_object_address`, `DW_OP_form_tls_address`, `DW_OP_call_frame_cfa`
-    /// - `DW_OP_abs`, `DW_OP_and`, `DW_OP_div`, `DW_OP_minus`, `DW_OP_mod`, `DW_OP_mul`,
-    ///   `DW_OP_neg`, `DW_OP_not`, `DW_OP_or`, `DW_OP_plus`, `DW_OP_shl`, `DW_OP_shr`,
-    ///   `DW_OP_shra`, `DW_OP_xor`
-    /// - `DW_OP_le`, `DW_OP_ge`, `DW_OP_eq`, `DW_OP_lt`, `DW_OP_gt`, `DW_OP_ne`
-    /// - `DW_OP_nop`
-    /// - `DW_OP_stack_value`
-    Simple(DwOp),
-    /// Relocate the address if needed, and push it on the stack.
-    ///
-    /// Represents `DW_OP_addr`.
-    Address(Address),
-    /// Push an unsigned constant value on the stack.
-    ///
-    /// Represents `DW_OP_constu`.
-    UnsignedConstant(u64),
-    /// Push a signed constant value on the stack.
-    ///
-    /// Represents `DW_OP_consts`.
-    SignedConstant(i64),
-    /* TODO: requires .debug_addr write support
-    /// Read the address at the given index in `.debug_addr, relocate the address if needed,
-    /// and push it on the stack.
-    ///
-    /// Represents `DW_OP_addrx`.
-    AddressIndex(DebugAddrIndex<Offset>),
-    /// Read the address at the given index in `.debug_addr, and push it on the stack.
-    /// Do not relocate the address.
-    ///
-    /// Represents `DW_OP_constx`.
-    ConstantIndex(DebugAddrIndex<Offset>),
-    */
-    /// Interpret the value bytes as a constant of a given type, and push it on the stack.
-    ///
-    /// Represents `DW_OP_const_type`.
-    ConstantType(UnitEntryId, Box<[u8]>),
-    /// Compute the frame base (using `DW_AT_frame_base`), add the
-    /// given offset, and then push the resulting sum on the stack.
-    ///
-    /// Represents `DW_OP_fbreg`.
-    FrameOffset(i64),
-    /// Find the contents of the given register, add the offset, and then
-    /// push the resulting sum on the stack.
-    ///
-    /// Represents `DW_OP_bregx`.
-    RegisterOffset(Register, i64),
-    /// Interpret the contents of the given register as a value of the given type,
-    /// and push it on the stack.
-    ///
-    /// Represents `DW_OP_regval_type`.
-    RegisterType(Register, UnitEntryId),
-    /// Copy the item at a stack index and push it on top of the stack.
-    ///
-    /// Represents `DW_OP_pick`, `DW_OP_dup`, and `DW_OP_over`.
-    Pick(u8),
-    /// Pop the topmost value of the stack, dereference it, and push the
-    /// resulting value.
-    ///
-    /// Represents `DW_OP_deref` and `DW_OP_xderef`.
-    Deref {
-        /// True if the dereference operation takes an address space
-        /// argument from the stack; false otherwise.
-        space: bool,
-    },
-    /// Pop the topmost value of the stack, dereference it to obtain a value
-    /// of the given size, and push the resulting value.
-    ///
-    /// Represents `DW_OP_deref_size` and `DW_OP_xderef_size`.
-    DerefSize {
-        /// True if the dereference operation takes an address space
-        /// argument from the stack; false otherwise.
-        space: bool,
-        /// The size of the data to dereference.
-        size: u8,
-    },
-    /// Pop the topmost value of the stack, dereference it to obtain a value
-    /// of the given type, and push the resulting value.
-    ///
-    /// Represents `DW_OP_deref_type` and `DW_OP_xderef_type`.
-    DerefType {
-        /// True if the dereference operation takes an address space
-        /// argument from the stack; false otherwise.
-        space: bool,
-        /// The size of the data to dereference.
-        size: u8,
-        /// The DIE of the base type, or `None` for the generic type.
-        base: UnitEntryId,
-    },
-    /// Add an unsigned constant to the topmost value on the stack.
-    ///
-    /// Represents `DW_OP_plus_uconst`.
-    PlusConstant(u64),
-    /// Unconditional branch to the target location.
-    ///
-    /// The value is the index within the expression of the operation to branch to.
-    /// This will be converted to a relative offset when writing.
-    ///
-    /// Represents `DW_OP_skip`.
-    Skip(usize),
-    /// Branch to the target location if the top of stack is nonzero.
-    ///
-    /// The value is the index within the expression of the operation to branch to.
-    /// This will be converted to a relative offset when writing.
-    ///
-    /// Represents `DW_OP_bra`.
-    Branch(usize),
-    /// Evaluate a DWARF expression as a subroutine.
-    ///
-    /// The expression comes from the `DW_AT_location` attribute of the indicated DIE.
-    ///
-    /// Represents `DW_OP_call4`.
-    Call(UnitEntryId),
-    /// Evaluate an external DWARF expression as a subroutine.
-    ///
-    /// The expression comes from the `DW_AT_location` attribute of the indicated DIE,
-    /// which may be in another compilation unit or shared object.
-    ///
-    /// Represents `DW_OP_call_ref`.
-    CallRef(Reference),
-    /// Pop the top stack entry, convert it to a different type, and push it on the stack.
-    ///
-    /// Represents `DW_OP_convert`.
-    Convert(Option<UnitEntryId>),
-    /// Pop the top stack entry, reinterpret the bits in its value as a different type,
-    /// and push it on the stack.
-    ///
-    /// Represents `DW_OP_reinterpret`.
-    Reinterpret(Option<UnitEntryId>),
-    /// Evaluate an expression at the entry to the current subprogram, and push it on the stack.
-    ///
-    /// Represents `DW_OP_entry_value`.
-    EntryValue(Expression),
-    // FIXME: EntryRegister
-    /// Indicate that this piece's location is in the given register.
-    ///
-    /// Completes the piece or expression.
-    ///
-    /// Represents `DW_OP_regx`.
-    Register(Register),
-    /// The object has no location, but has a known constant value.
-    ///
-    /// Completes the piece or expression.
-    ///
-    /// Represents `DW_OP_implicit_value`.
-    ImplicitValue(Box<[u8]>),
-    /// The object is a pointer to a value which has no actual location, such as
-    /// an implicit value or a stack value.
-    ///
-    /// Completes the piece or expression.
-    ///
-    /// Represents `DW_OP_implicit_pointer`.
-    ImplicitPointer {
-        /// The DIE of the value that this is an implicit pointer into.
-        entry: Reference,
-        /// The byte offset into the value that the implicit pointer points to.
-        byte_offset: i64,
-    },
-    /// Terminate a piece.
-    ///
-    /// Represents `DW_OP_piece`.
-    Piece {
-        /// The size of this piece in bytes.
-        size_in_bytes: u64,
-    },
-    /// Terminate a piece with a size in bits.
-    ///
-    /// Represents `DW_OP_bit_piece`.
-    BitPiece {
-        /// The size of this piece in bits.
-        size_in_bits: u64,
-        /// The bit offset of this piece.
-        bit_offset: u64,
-    },
-    /// This represents a parameter that was optimized out.
-    ///
-    /// The entry is the definition of the parameter, and is matched to
-    /// the `DW_TAG_GNU_call_site_parameter` in the caller that also
-    /// points to the same definition of the parameter.
-    ///
-    /// Represents `DW_OP_GNU_parameter_ref`.
-    ParameterRef(UnitEntryId),
-}
-
-impl Operation {
-    fn size(&self, encoding: Encoding, unit_offsets: Option<&UnitOffsets>) -> usize {
-        let base_size = |base| {
-            // Errors are handled during writes.
-            match unit_offsets {
-                Some(offsets) => uleb128_size(offsets.unit_offset(base)),
-                None => 0,
-            }
-        };
-        1 + match *self {
-            Operation::Raw(ref bytecode) => return bytecode.len(),
-            Operation::Simple(_) => 0,
-            Operation::Address(_) => encoding.address_size as usize,
-            Operation::UnsignedConstant(value) => {
-                if value < 32 {
-                    0
-                } else {
-                    uleb128_size(value)
-                }
-            }
-            Operation::SignedConstant(value) => sleb128_size(value),
-            Operation::ConstantType(base, ref value) => base_size(base) + 1 + value.len(),
-            Operation::FrameOffset(offset) => sleb128_size(offset),
-            Operation::RegisterOffset(register, offset) => {
-                if register.0 < 32 {
-                    sleb128_size(offset)
-                } else {
-                    uleb128_size(register.0.into()) + sleb128_size(offset)
-                }
-            }
-            Operation::RegisterType(register, base) => {
-                uleb128_size(register.0.into()) + base_size(base)
-            }
-            Operation::Pick(index) => {
-                if index > 1 {
-                    1
-                } else {
-                    0
-                }
-            }
-            Operation::Deref { .. } => 0,
-            Operation::DerefSize { .. } => 1,
-            Operation::DerefType { base, .. } => 1 + base_size(base),
-            Operation::PlusConstant(value) => uleb128_size(value),
-            Operation::Skip(_) => 2,
-            Operation::Branch(_) => 2,
-            Operation::Call(_) => 4,
-            Operation::CallRef(_) => encoding.format.word_size() as usize,
-            Operation::Convert(base) => match base {
-                Some(base) => base_size(base),
-                None => 1,
-            },
-            Operation::Reinterpret(base) => match base {
-                Some(base) => base_size(base),
-                None => 1,
-            },
-            Operation::EntryValue(ref expression) => {
-                let length = expression.size(encoding, unit_offsets);
-                uleb128_size(length as u64) + length
-            }
-            Operation::Register(register) => {
-                if register.0 < 32 {
-                    0
-                } else {
-                    uleb128_size(register.0.into())
-                }
-            }
-            Operation::ImplicitValue(ref data) => uleb128_size(data.len() as u64) + data.len(),
-            Operation::ImplicitPointer { byte_offset, .. } => {
-                encoding.format.word_size() as usize + sleb128_size(byte_offset)
-            }
-            Operation::Piece { size_in_bytes } => uleb128_size(size_in_bytes),
-            Operation::BitPiece {
-                size_in_bits,
-                bit_offset,
-            } => uleb128_size(size_in_bits) + uleb128_size(bit_offset),
-            Operation::ParameterRef(_) => 4,
-        }
-    }
-
-    pub(crate) fn write<W: Writer>(
-        &self,
-        w: &mut W,
-        refs: Option<&mut Vec<DebugInfoReference>>,
-        encoding: Encoding,
-        unit_offsets: Option<&UnitOffsets>,
-        offsets: &[usize],
-    ) -> Result<()> {
-        let entry_offset = |entry| match unit_offsets {
-            Some(offsets) => {
-                let offset = offsets.unit_offset(entry);
-                if offset == 0 {
-                    Err(Error::UnsupportedExpressionForwardReference)
-                } else {
-                    Ok(offset)
-                }
-            }
-            None => Err(Error::UnsupportedCfiExpressionReference),
-        };
-        match *self {
-            Operation::Raw(ref bytecode) => w.write(bytecode)?,
-            Operation::Simple(opcode) => w.write_u8(opcode.0)?,
-            Operation::Address(address) => {
-                w.write_u8(constants::DW_OP_addr.0)?;
-                w.write_address(address, encoding.address_size)?;
-            }
-            Operation::UnsignedConstant(value) => {
-                if value < 32 {
-                    w.write_u8(constants::DW_OP_lit0.0 + value as u8)?;
-                } else {
-                    w.write_u8(constants::DW_OP_constu.0)?;
-                    w.write_uleb128(value)?;
-                }
-            }
-            Operation::SignedConstant(value) => {
-                w.write_u8(constants::DW_OP_consts.0)?;
-                w.write_sleb128(value)?;
-            }
-            Operation::ConstantType(base, ref value) => {
-                if encoding.version >= 5 {
-                    w.write_u8(constants::DW_OP_const_type.0)?;
-                } else {
-                    w.write_u8(constants::DW_OP_GNU_const_type.0)?;
-                }
-                w.write_uleb128(entry_offset(base)?)?;
-                w.write_udata(value.len() as u64, 1)?;
-                w.write(&value)?;
-            }
-            Operation::FrameOffset(offset) => {
-                w.write_u8(constants::DW_OP_fbreg.0)?;
-                w.write_sleb128(offset)?;
-            }
-            Operation::RegisterOffset(register, offset) => {
-                if register.0 < 32 {
-                    w.write_u8(constants::DW_OP_breg0.0 + register.0 as u8)?;
-                } else {
-                    w.write_u8(constants::DW_OP_bregx.0)?;
-                    w.write_uleb128(register.0.into())?;
-                }
-                w.write_sleb128(offset)?;
-            }
-            Operation::RegisterType(register, base) => {
-                if encoding.version >= 5 {
-                    w.write_u8(constants::DW_OP_regval_type.0)?;
-                } else {
-                    w.write_u8(constants::DW_OP_GNU_regval_type.0)?;
-                }
-                w.write_uleb128(register.0.into())?;
-                w.write_uleb128(entry_offset(base)?)?;
-            }
-            Operation::Pick(index) => match index {
-                0 => w.write_u8(constants::DW_OP_dup.0)?,
-                1 => w.write_u8(constants::DW_OP_over.0)?,
-                _ => {
-                    w.write_u8(constants::DW_OP_pick.0)?;
-                    w.write_u8(index)?;
-                }
-            },
-            Operation::Deref { space } => {
-                if space {
-                    w.write_u8(constants::DW_OP_xderef.0)?;
-                } else {
-                    w.write_u8(constants::DW_OP_deref.0)?;
-                }
-            }
-            Operation::DerefSize { space, size } => {
-                if space {
-                    w.write_u8(constants::DW_OP_xderef_size.0)?;
-                } else {
-                    w.write_u8(constants::DW_OP_deref_size.0)?;
-                }
-                w.write_u8(size)?;
-            }
-            Operation::DerefType { space, size, base } => {
-                if space {
-                    w.write_u8(constants::DW_OP_xderef_type.0)?;
-                } else {
-                    if encoding.version >= 5 {
-                        w.write_u8(constants::DW_OP_deref_type.0)?;
-                    } else {
-                        w.write_u8(constants::DW_OP_GNU_deref_type.0)?;
-                    }
-                }
-                w.write_u8(size)?;
-                w.write_uleb128(entry_offset(base)?)?;
-            }
-            Operation::PlusConstant(value) => {
-                w.write_u8(constants::DW_OP_plus_uconst.0)?;
-                w.write_uleb128(value)?;
-            }
-            Operation::Skip(target) => {
-                w.write_u8(constants::DW_OP_skip.0)?;
-                let offset = offsets[target] as i64 - (w.len() as i64 + 2);
-                w.write_sdata(offset, 2)?;
-            }
-            Operation::Branch(target) => {
-                w.write_u8(constants::DW_OP_bra.0)?;
-                let offset = offsets[target] as i64 - (w.len() as i64 + 2);
-                w.write_sdata(offset, 2)?;
-            }
-            Operation::Call(entry) => {
-                w.write_u8(constants::DW_OP_call4.0)?;
-                // TODO: this probably won't work in practice, because we may
-                // only know the offsets of base type DIEs at this point.
-                w.write_udata(entry_offset(entry)?, 4)?;
-            }
-            Operation::CallRef(entry) => {
-                w.write_u8(constants::DW_OP_call_ref.0)?;
-                let size = encoding.format.word_size();
-                match entry {
-                    Reference::Symbol(symbol) => w.write_reference(symbol, size)?,
-                    Reference::Entry(unit, entry) => {
-                        let refs = refs.ok_or(Error::InvalidReference)?;
-                        refs.push(DebugInfoReference {
-                            offset: w.len(),
-                            unit,
-                            entry,
-                            size,
-                        });
-                        w.write_udata(0, size)?;
-                    }
-                }
-            }
-            Operation::Convert(base) => {
-                if encoding.version >= 5 {
-                    w.write_u8(constants::DW_OP_convert.0)?;
-                } else {
-                    w.write_u8(constants::DW_OP_GNU_convert.0)?;
-                }
-                match base {
-                    Some(base) => w.write_uleb128(entry_offset(base)?)?,
-                    None => w.write_u8(0)?,
-                }
-            }
-            Operation::Reinterpret(base) => {
-                if encoding.version >= 5 {
-                    w.write_u8(constants::DW_OP_reinterpret.0)?;
-                } else {
-                    w.write_u8(constants::DW_OP_GNU_reinterpret.0)?;
-                }
-                match base {
-                    Some(base) => w.write_uleb128(entry_offset(base)?)?,
-                    None => w.write_u8(0)?,
-                }
-            }
-            Operation::EntryValue(ref expression) => {
-                if encoding.version >= 5 {
-                    w.write_u8(constants::DW_OP_entry_value.0)?;
-                } else {
-                    w.write_u8(constants::DW_OP_GNU_entry_value.0)?;
-                }
-                let length = expression.size(encoding, unit_offsets);
-                w.write_uleb128(length as u64)?;
-                expression.write(w, refs, encoding, unit_offsets)?;
-            }
-            Operation::Register(register) => {
-                if register.0 < 32 {
-                    w.write_u8(constants::DW_OP_reg0.0 + register.0 as u8)?;
-                } else {
-                    w.write_u8(constants::DW_OP_regx.0)?;
-                    w.write_uleb128(register.0.into())?;
-                }
-            }
-            Operation::ImplicitValue(ref data) => {
-                w.write_u8(constants::DW_OP_implicit_value.0)?;
-                w.write_uleb128(data.len() as u64)?;
-                w.write(&data)?;
-            }
-            Operation::ImplicitPointer { entry, byte_offset } => {
-                if encoding.version >= 5 {
-                    w.write_u8(constants::DW_OP_implicit_pointer.0)?;
-                } else {
-                    w.write_u8(constants::DW_OP_GNU_implicit_pointer.0)?;
-                }
-                let size = encoding.format.word_size();
-                match entry {
-                    Reference::Symbol(symbol) => {
-                        w.write_reference(symbol, size)?;
-                    }
-                    Reference::Entry(unit, entry) => {
-                        let refs = refs.ok_or(Error::InvalidReference)?;
-                        refs.push(DebugInfoReference {
-                            offset: w.len(),
-                            unit,
-                            entry,
-                            size,
-                        });
-                        w.write_udata(0, size)?;
-                    }
-                }
-                w.write_sleb128(byte_offset)?;
-            }
-            Operation::Piece { size_in_bytes } => {
-                w.write_u8(constants::DW_OP_piece.0)?;
-                w.write_uleb128(size_in_bytes)?;
-            }
-            Operation::BitPiece {
-                size_in_bits,
-                bit_offset,
-            } => {
-                w.write_u8(constants::DW_OP_bit_piece.0)?;
-                w.write_uleb128(size_in_bits)?;
-                w.write_uleb128(bit_offset)?;
-            }
-            Operation::ParameterRef(entry) => {
-                w.write_u8(constants::DW_OP_GNU_parameter_ref.0)?;
-                w.write_udata(entry_offset(entry)?, 4)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-#[cfg(feature = "read")]
-pub(crate) mod convert {
-    use super::*;
-    use crate::common::UnitSectionOffset;
-    use crate::read::{self, Reader};
-    use crate::write::{ConvertError, ConvertResult, UnitEntryId, UnitId};
-    use std::collections::HashMap;
-
-    impl Expression {
-        /// Create an expression from the input expression.
-        pub fn from<R: Reader<Offset = usize>>(
-            from_expression: read::Expression<R>,
-            encoding: Encoding,
-            dwarf: Option<&read::Dwarf<R>>,
-            unit: Option<&read::Unit<R>>,
-            entry_ids: Option<&HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>>,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-        ) -> ConvertResult<Expression> {
-            let convert_unit_offset = |offset: read::UnitOffset| -> ConvertResult<_> {
-                let entry_ids = entry_ids.ok_or(ConvertError::UnsupportedOperation)?;
-                let unit = unit.ok_or(ConvertError::UnsupportedOperation)?;
-                let id = entry_ids
-                    .get(&offset.to_unit_section_offset(unit))
-                    .ok_or(ConvertError::InvalidUnitRef)?;
-                Ok(id.1)
-            };
-            let convert_debug_info_offset = |offset| -> ConvertResult<_> {
-                // TODO: support relocations
-                let entry_ids = entry_ids.ok_or(ConvertError::UnsupportedOperation)?;
-                let id = entry_ids
-                    .get(&UnitSectionOffset::DebugInfoOffset(offset))
-                    .ok_or(ConvertError::InvalidDebugInfoRef)?;
-                Ok(Reference::Entry(id.0, id.1))
-            };
-
-            // Calculate offsets for use in branch/skip operations.
-            let mut offsets = Vec::new();
-            let mut offset = 0;
-            let mut from_operations = from_expression.clone().operations(encoding);
-            while let Some(_) = from_operations.next()? {
-                offsets.push(offset);
-                offset = from_operations.offset_from(&from_expression);
-            }
-            offsets.push(from_expression.0.len());
-
-            let mut from_operations = from_expression.clone().operations(encoding);
-            let mut operations = Vec::new();
-            while let Some(from_operation) = from_operations.next()? {
-                let operation = match from_operation {
-                    read::Operation::Deref {
-                        base_type,
-                        size,
-                        space,
-                    } => {
-                        if base_type.0 != 0 {
-                            let base = convert_unit_offset(base_type)?;
-                            Operation::DerefType { space, size, base }
-                        } else if size != encoding.address_size {
-                            Operation::DerefSize { space, size }
-                        } else {
-                            Operation::Deref { space }
-                        }
-                    }
-                    read::Operation::Drop => Operation::Simple(constants::DW_OP_drop),
-                    read::Operation::Pick { index } => Operation::Pick(index),
-                    read::Operation::Swap => Operation::Simple(constants::DW_OP_swap),
-                    read::Operation::Rot => Operation::Simple(constants::DW_OP_rot),
-                    read::Operation::Abs => Operation::Simple(constants::DW_OP_abs),
-                    read::Operation::And => Operation::Simple(constants::DW_OP_and),
-                    read::Operation::Div => Operation::Simple(constants::DW_OP_div),
-                    read::Operation::Minus => Operation::Simple(constants::DW_OP_minus),
-                    read::Operation::Mod => Operation::Simple(constants::DW_OP_mod),
-                    read::Operation::Mul => Operation::Simple(constants::DW_OP_mul),
-                    read::Operation::Neg => Operation::Simple(constants::DW_OP_neg),
-                    read::Operation::Not => Operation::Simple(constants::DW_OP_not),
-                    read::Operation::Or => Operation::Simple(constants::DW_OP_or),
-                    read::Operation::Plus => Operation::Simple(constants::DW_OP_plus),
-                    read::Operation::PlusConstant { value } => Operation::PlusConstant(value),
-                    read::Operation::Shl => Operation::Simple(constants::DW_OP_shl),
-                    read::Operation::Shr => Operation::Simple(constants::DW_OP_shr),
-                    read::Operation::Shra => Operation::Simple(constants::DW_OP_shra),
-                    read::Operation::Xor => Operation::Simple(constants::DW_OP_xor),
-                    read::Operation::Eq => Operation::Simple(constants::DW_OP_eq),
-                    read::Operation::Ge => Operation::Simple(constants::DW_OP_ge),
-                    read::Operation::Gt => Operation::Simple(constants::DW_OP_gt),
-                    read::Operation::Le => Operation::Simple(constants::DW_OP_le),
-                    read::Operation::Lt => Operation::Simple(constants::DW_OP_lt),
-                    read::Operation::Ne => Operation::Simple(constants::DW_OP_ne),
-                    read::Operation::Bra { target } => {
-                        let offset = from_operations
-                            .offset_from(&from_expression)
-                            .wrapping_add(i64::from(target) as usize);
-                        let index = offsets
-                            .binary_search(&offset)
-                            .map_err(|_| ConvertError::InvalidBranchTarget)?;
-                        Operation::Branch(index)
-                    }
-                    read::Operation::Skip { target } => {
-                        let offset = from_operations
-                            .offset_from(&from_expression)
-                            .wrapping_add(i64::from(target) as usize);
-                        let index = offsets
-                            .binary_search(&offset)
-                            .map_err(|_| ConvertError::InvalidBranchTarget)?;
-                        Operation::Skip(index)
-                    }
-                    read::Operation::UnsignedConstant { value } => {
-                        Operation::UnsignedConstant(value)
-                    }
-                    read::Operation::SignedConstant { value } => Operation::SignedConstant(value),
-                    read::Operation::Register { register } => Operation::Register(register),
-                    read::Operation::RegisterOffset {
-                        register,
-                        offset,
-                        base_type,
-                    } => {
-                        if base_type.0 != 0 {
-                            Operation::RegisterType(register, convert_unit_offset(base_type)?)
-                        } else {
-                            Operation::RegisterOffset(register, offset)
-                        }
-                    }
-                    read::Operation::FrameOffset { offset } => Operation::FrameOffset(offset),
-                    read::Operation::Nop => Operation::Simple(constants::DW_OP_nop),
-                    read::Operation::PushObjectAddress => {
-                        Operation::Simple(constants::DW_OP_push_object_address)
-                    }
-                    read::Operation::Call { offset } => match offset {
-                        read::DieReference::UnitRef(offset) => {
-                            Operation::Call(convert_unit_offset(offset)?)
-                        }
-                        read::DieReference::DebugInfoRef(offset) => {
-                            Operation::CallRef(convert_debug_info_offset(offset)?)
-                        }
-                    },
-                    read::Operation::TLS => Operation::Simple(constants::DW_OP_form_tls_address),
-                    read::Operation::CallFrameCFA => {
-                        Operation::Simple(constants::DW_OP_call_frame_cfa)
-                    }
-                    read::Operation::Piece {
-                        size_in_bits,
-                        bit_offset: None,
-                    } => Operation::Piece {
-                        size_in_bytes: size_in_bits / 8,
-                    },
-                    read::Operation::Piece {
-                        size_in_bits,
-                        bit_offset: Some(bit_offset),
-                    } => Operation::BitPiece {
-                        size_in_bits,
-                        bit_offset,
-                    },
-                    read::Operation::ImplicitValue { data } => {
-                        Operation::ImplicitValue(data.to_slice()?.into_owned().into())
-                    }
-                    read::Operation::StackValue => Operation::Simple(constants::DW_OP_stack_value),
-                    read::Operation::ImplicitPointer { value, byte_offset } => {
-                        let entry = convert_debug_info_offset(value)?;
-                        Operation::ImplicitPointer { entry, byte_offset }
-                    }
-                    read::Operation::EntryValue { expression } => {
-                        let expression = Expression::from(
-                            read::Expression(expression),
-                            encoding,
-                            dwarf,
-                            unit,
-                            entry_ids,
-                            convert_address,
-                        )?;
-                        Operation::EntryValue(expression)
-                    }
-                    read::Operation::ParameterRef { offset } => {
-                        let entry = convert_unit_offset(offset)?;
-                        Operation::ParameterRef(entry)
-                    }
-                    read::Operation::Address { address } => {
-                        let address =
-                            convert_address(address).ok_or(ConvertError::InvalidAddress)?;
-                        Operation::Address(address)
-                    }
-                    read::Operation::AddressIndex { index } => {
-                        let dwarf = dwarf.ok_or(ConvertError::UnsupportedOperation)?;
-                        let unit = unit.ok_or(ConvertError::UnsupportedOperation)?;
-                        let val = dwarf.address(unit, index)?;
-                        let address = convert_address(val).ok_or(ConvertError::InvalidAddress)?;
-                        Operation::Address(address)
-                    }
-                    read::Operation::ConstantIndex { index } => {
-                        let dwarf = dwarf.ok_or(ConvertError::UnsupportedOperation)?;
-                        let unit = unit.ok_or(ConvertError::UnsupportedOperation)?;
-                        let val = dwarf.address(unit, index)?;
-                        Operation::UnsignedConstant(val)
-                    }
-                    read::Operation::TypedLiteral { base_type, value } => {
-                        let entry = convert_unit_offset(base_type)?;
-                        Operation::ConstantType(entry, value.to_slice()?.into_owned().into())
-                    }
-                    read::Operation::Convert { base_type } => {
-                        if base_type.0 == 0 {
-                            Operation::Convert(None)
-                        } else {
-                            let entry = convert_unit_offset(base_type)?;
-                            Operation::Convert(Some(entry))
-                        }
-                    }
-                    read::Operation::Reinterpret { base_type } => {
-                        if base_type.0 == 0 {
-                            Operation::Reinterpret(None)
-                        } else {
-                            let entry = convert_unit_offset(base_type)?;
-                            Operation::Reinterpret(Some(entry))
-                        }
-                    }
-                };
-                operations.push(operation);
-            }
-            Ok(Expression { operations })
-        }
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "read")]
-mod tests {
-    use super::*;
-    use crate::common::{
-        DebugAbbrevOffset, DebugAddrBase, DebugInfoOffset, DebugLocListsBase, DebugRngListsBase,
-        DebugStrOffsetsBase, Format, SectionId, UnitSectionOffset,
-    };
-    use crate::read;
-    use crate::write::{
-        DebugLineStrOffsets, DebugStrOffsets, EndianVec, LineProgram, Sections, Unit, UnitTable,
-    };
-    use crate::LittleEndian;
-    use std::collections::HashMap;
-
-    #[test]
-    fn test_operation() {
-        for &version in &[3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-
-                    let mut units = UnitTable::default();
-                    let unit_id = units.add(Unit::new(encoding, LineProgram::none()));
-                    let unit = units.get_mut(unit_id);
-                    let entry_id = unit.add(unit.root(), constants::DW_TAG_base_type);
-                    let reference = Reference::Entry(unit_id, entry_id);
-
-                    let mut sections = Sections::new(EndianVec::new(LittleEndian));
-                    let debug_line_str_offsets = DebugLineStrOffsets::none();
-                    let debug_str_offsets = DebugStrOffsets::none();
-                    let debug_info_offsets = units
-                        .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
-                        .unwrap();
-                    let unit_offsets = debug_info_offsets.unit_offsets(unit_id);
-                    let debug_info_offset = unit_offsets.debug_info_offset(entry_id);
-                    let entry_offset =
-                        read::UnitOffset(unit_offsets.unit_offset(entry_id) as usize);
-
-                    let mut reg_expression = Expression::new();
-                    reg_expression.op_reg(Register(23));
-
-                    let operations: &[(&dyn Fn(&mut Expression), Operation, read::Operation<_>)] =
-                        &[
-                            (
-                                &|x| x.op_deref(),
-                                Operation::Deref { space: false },
-                                read::Operation::Deref {
-                                    base_type: read::UnitOffset(0),
-                                    size: address_size,
-                                    space: false,
-                                },
-                            ),
-                            (
-                                &|x| x.op_xderef(),
-                                Operation::Deref { space: true },
-                                read::Operation::Deref {
-                                    base_type: read::UnitOffset(0),
-                                    size: address_size,
-                                    space: true,
-                                },
-                            ),
-                            (
-                                &|x| x.op_deref_size(2),
-                                Operation::DerefSize {
-                                    space: false,
-                                    size: 2,
-                                },
-                                read::Operation::Deref {
-                                    base_type: read::UnitOffset(0),
-                                    size: 2,
-                                    space: false,
-                                },
-                            ),
-                            (
-                                &|x| x.op_xderef_size(2),
-                                Operation::DerefSize {
-                                    space: true,
-                                    size: 2,
-                                },
-                                read::Operation::Deref {
-                                    base_type: read::UnitOffset(0),
-                                    size: 2,
-                                    space: true,
-                                },
-                            ),
-                            (
-                                &|x| x.op_deref_type(2, entry_id),
-                                Operation::DerefType {
-                                    space: false,
-                                    size: 2,
-                                    base: entry_id,
-                                },
-                                read::Operation::Deref {
-                                    base_type: entry_offset,
-                                    size: 2,
-                                    space: false,
-                                },
-                            ),
-                            (
-                                &|x| x.op_xderef_type(2, entry_id),
-                                Operation::DerefType {
-                                    space: true,
-                                    size: 2,
-                                    base: entry_id,
-                                },
-                                read::Operation::Deref {
-                                    base_type: entry_offset,
-                                    size: 2,
-                                    space: true,
-                                },
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_drop),
-                                Operation::Simple(constants::DW_OP_drop),
-                                read::Operation::Drop,
-                            ),
-                            (
-                                &|x| x.op_pick(0),
-                                Operation::Pick(0),
-                                read::Operation::Pick { index: 0 },
-                            ),
-                            (
-                                &|x| x.op_pick(1),
-                                Operation::Pick(1),
-                                read::Operation::Pick { index: 1 },
-                            ),
-                            (
-                                &|x| x.op_pick(2),
-                                Operation::Pick(2),
-                                read::Operation::Pick { index: 2 },
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_swap),
-                                Operation::Simple(constants::DW_OP_swap),
-                                read::Operation::Swap,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_rot),
-                                Operation::Simple(constants::DW_OP_rot),
-                                read::Operation::Rot,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_abs),
-                                Operation::Simple(constants::DW_OP_abs),
-                                read::Operation::Abs,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_and),
-                                Operation::Simple(constants::DW_OP_and),
-                                read::Operation::And,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_div),
-                                Operation::Simple(constants::DW_OP_div),
-                                read::Operation::Div,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_minus),
-                                Operation::Simple(constants::DW_OP_minus),
-                                read::Operation::Minus,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_mod),
-                                Operation::Simple(constants::DW_OP_mod),
-                                read::Operation::Mod,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_mul),
-                                Operation::Simple(constants::DW_OP_mul),
-                                read::Operation::Mul,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_neg),
-                                Operation::Simple(constants::DW_OP_neg),
-                                read::Operation::Neg,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_not),
-                                Operation::Simple(constants::DW_OP_not),
-                                read::Operation::Not,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_or),
-                                Operation::Simple(constants::DW_OP_or),
-                                read::Operation::Or,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_plus),
-                                Operation::Simple(constants::DW_OP_plus),
-                                read::Operation::Plus,
-                            ),
-                            (
-                                &|x| x.op_plus_uconst(23),
-                                Operation::PlusConstant(23),
-                                read::Operation::PlusConstant { value: 23 },
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_shl),
-                                Operation::Simple(constants::DW_OP_shl),
-                                read::Operation::Shl,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_shr),
-                                Operation::Simple(constants::DW_OP_shr),
-                                read::Operation::Shr,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_shra),
-                                Operation::Simple(constants::DW_OP_shra),
-                                read::Operation::Shra,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_xor),
-                                Operation::Simple(constants::DW_OP_xor),
-                                read::Operation::Xor,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_eq),
-                                Operation::Simple(constants::DW_OP_eq),
-                                read::Operation::Eq,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_ge),
-                                Operation::Simple(constants::DW_OP_ge),
-                                read::Operation::Ge,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_gt),
-                                Operation::Simple(constants::DW_OP_gt),
-                                read::Operation::Gt,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_le),
-                                Operation::Simple(constants::DW_OP_le),
-                                read::Operation::Le,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_lt),
-                                Operation::Simple(constants::DW_OP_lt),
-                                read::Operation::Lt,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_ne),
-                                Operation::Simple(constants::DW_OP_ne),
-                                read::Operation::Ne,
-                            ),
-                            (
-                                &|x| x.op_constu(23),
-                                Operation::UnsignedConstant(23),
-                                read::Operation::UnsignedConstant { value: 23 },
-                            ),
-                            (
-                                &|x| x.op_consts(-23),
-                                Operation::SignedConstant(-23),
-                                read::Operation::SignedConstant { value: -23 },
-                            ),
-                            (
-                                &|x| x.op_reg(Register(23)),
-                                Operation::Register(Register(23)),
-                                read::Operation::Register {
-                                    register: Register(23),
-                                },
-                            ),
-                            (
-                                &|x| x.op_reg(Register(123)),
-                                Operation::Register(Register(123)),
-                                read::Operation::Register {
-                                    register: Register(123),
-                                },
-                            ),
-                            (
-                                &|x| x.op_breg(Register(23), 34),
-                                Operation::RegisterOffset(Register(23), 34),
-                                read::Operation::RegisterOffset {
-                                    register: Register(23),
-                                    offset: 34,
-                                    base_type: read::UnitOffset(0),
-                                },
-                            ),
-                            (
-                                &|x| x.op_breg(Register(123), 34),
-                                Operation::RegisterOffset(Register(123), 34),
-                                read::Operation::RegisterOffset {
-                                    register: Register(123),
-                                    offset: 34,
-                                    base_type: read::UnitOffset(0),
-                                },
-                            ),
-                            (
-                                &|x| x.op_regval_type(Register(23), entry_id),
-                                Operation::RegisterType(Register(23), entry_id),
-                                read::Operation::RegisterOffset {
-                                    register: Register(23),
-                                    offset: 0,
-                                    base_type: entry_offset,
-                                },
-                            ),
-                            (
-                                &|x| x.op_fbreg(34),
-                                Operation::FrameOffset(34),
-                                read::Operation::FrameOffset { offset: 34 },
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_nop),
-                                Operation::Simple(constants::DW_OP_nop),
-                                read::Operation::Nop,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_push_object_address),
-                                Operation::Simple(constants::DW_OP_push_object_address),
-                                read::Operation::PushObjectAddress,
-                            ),
-                            (
-                                &|x| x.op_call(entry_id),
-                                Operation::Call(entry_id),
-                                read::Operation::Call {
-                                    offset: read::DieReference::UnitRef(entry_offset),
-                                },
-                            ),
-                            (
-                                &|x| x.op_call_ref(reference),
-                                Operation::CallRef(reference),
-                                read::Operation::Call {
-                                    offset: read::DieReference::DebugInfoRef(debug_info_offset),
-                                },
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_form_tls_address),
-                                Operation::Simple(constants::DW_OP_form_tls_address),
-                                read::Operation::TLS,
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_call_frame_cfa),
-                                Operation::Simple(constants::DW_OP_call_frame_cfa),
-                                read::Operation::CallFrameCFA,
-                            ),
-                            (
-                                &|x| x.op_piece(23),
-                                Operation::Piece { size_in_bytes: 23 },
-                                read::Operation::Piece {
-                                    size_in_bits: 23 * 8,
-                                    bit_offset: None,
-                                },
-                            ),
-                            (
-                                &|x| x.op_bit_piece(23, 34),
-                                Operation::BitPiece {
-                                    size_in_bits: 23,
-                                    bit_offset: 34,
-                                },
-                                read::Operation::Piece {
-                                    size_in_bits: 23,
-                                    bit_offset: Some(34),
-                                },
-                            ),
-                            (
-                                &|x| x.op_implicit_value(vec![23].into()),
-                                Operation::ImplicitValue(vec![23].into()),
-                                read::Operation::ImplicitValue {
-                                    data: read::EndianSlice::new(&[23], LittleEndian),
-                                },
-                            ),
-                            (
-                                &|x| x.op(constants::DW_OP_stack_value),
-                                Operation::Simple(constants::DW_OP_stack_value),
-                                read::Operation::StackValue,
-                            ),
-                            (
-                                &|x| x.op_implicit_pointer(reference, 23),
-                                Operation::ImplicitPointer {
-                                    entry: reference,
-                                    byte_offset: 23,
-                                },
-                                read::Operation::ImplicitPointer {
-                                    value: debug_info_offset,
-                                    byte_offset: 23,
-                                },
-                            ),
-                            (
-                                &|x| x.op_entry_value(reg_expression.clone()),
-                                Operation::EntryValue(reg_expression.clone()),
-                                read::Operation::EntryValue {
-                                    expression: read::EndianSlice::new(
-                                        &[constants::DW_OP_reg23.0],
-                                        LittleEndian,
-                                    ),
-                                },
-                            ),
-                            (
-                                &|x| x.op_gnu_parameter_ref(entry_id),
-                                Operation::ParameterRef(entry_id),
-                                read::Operation::ParameterRef {
-                                    offset: entry_offset,
-                                },
-                            ),
-                            (
-                                &|x| x.op_addr(Address::Constant(23)),
-                                Operation::Address(Address::Constant(23)),
-                                read::Operation::Address { address: 23 },
-                            ),
-                            (
-                                &|x| x.op_const_type(entry_id, vec![23].into()),
-                                Operation::ConstantType(entry_id, vec![23].into()),
-                                read::Operation::TypedLiteral {
-                                    base_type: entry_offset,
-                                    value: read::EndianSlice::new(&[23], LittleEndian),
-                                },
-                            ),
-                            (
-                                &|x| x.op_convert(None),
-                                Operation::Convert(None),
-                                read::Operation::Convert {
-                                    base_type: read::UnitOffset(0),
-                                },
-                            ),
-                            (
-                                &|x| x.op_convert(Some(entry_id)),
-                                Operation::Convert(Some(entry_id)),
-                                read::Operation::Convert {
-                                    base_type: entry_offset,
-                                },
-                            ),
-                            (
-                                &|x| x.op_reinterpret(None),
-                                Operation::Reinterpret(None),
-                                read::Operation::Reinterpret {
-                                    base_type: read::UnitOffset(0),
-                                },
-                            ),
-                            (
-                                &|x| x.op_reinterpret(Some(entry_id)),
-                                Operation::Reinterpret(Some(entry_id)),
-                                read::Operation::Reinterpret {
-                                    base_type: entry_offset,
-                                },
-                            ),
-                        ];
-
-                    let mut expression = Expression::new();
-                    let start_index = expression.next_index();
-                    for (f, o, _) in operations {
-                        f(&mut expression);
-                        assert_eq!(expression.operations.last(), Some(o));
-                    }
-
-                    let bra_index = expression.op_bra();
-                    let skip_index = expression.op_skip();
-                    expression.op(constants::DW_OP_nop);
-                    let end_index = expression.next_index();
-                    expression.set_target(bra_index, start_index);
-                    expression.set_target(skip_index, end_index);
-
-                    let mut w = EndianVec::new(LittleEndian);
-                    let mut refs = Vec::new();
-                    expression
-                        .write(&mut w, Some(&mut refs), encoding, Some(&unit_offsets))
-                        .unwrap();
-                    for r in &refs {
-                        assert_eq!(r.unit, unit_id);
-                        assert_eq!(r.entry, entry_id);
-                        w.write_offset_at(
-                            r.offset,
-                            debug_info_offset.0,
-                            SectionId::DebugInfo,
-                            r.size,
-                        )
-                        .unwrap();
-                    }
-
-                    let read_expression =
-                        read::Expression(read::EndianSlice::new(w.slice(), LittleEndian));
-                    let mut read_operations = read_expression.operations(encoding);
-                    for (_, _, operation) in operations {
-                        assert_eq!(read_operations.next(), Ok(Some(*operation)));
-                    }
-
-                    // 4 = DW_OP_skip + i16 + DW_OP_nop
-                    assert_eq!(
-                        read_operations.next(),
-                        Ok(Some(read::Operation::Bra {
-                            target: -(w.len() as i16) + 4
-                        }))
-                    );
-                    // 1 = DW_OP_nop
-                    assert_eq!(
-                        read_operations.next(),
-                        Ok(Some(read::Operation::Skip { target: 1 }))
-                    );
-                    assert_eq!(read_operations.next(), Ok(Some(read::Operation::Nop)));
-                    assert_eq!(read_operations.next(), Ok(None));
-
-                    // Fake the unit.
-                    let unit = read::Unit {
-                        offset: UnitSectionOffset::DebugInfoOffset(DebugInfoOffset(0)),
-                        header: read::UnitHeader::new(
-                            encoding,
-                            0,
-                            DebugAbbrevOffset(0),
-                            read::EndianSlice::new(&[], LittleEndian),
-                        ),
-                        abbreviations: read::Abbreviations::default(),
-                        name: None,
-                        comp_dir: None,
-                        low_pc: 0,
-                        str_offsets_base: DebugStrOffsetsBase(0),
-                        addr_base: DebugAddrBase(0),
-                        loclists_base: DebugLocListsBase(0),
-                        rnglists_base: DebugRngListsBase(0),
-                        line_program: None,
-                    };
-
-                    let mut entry_ids = HashMap::new();
-                    entry_ids.insert(
-                        UnitSectionOffset::DebugInfoOffset(debug_info_offset),
-                        (unit_id, entry_id),
-                    );
-                    let convert_expression = Expression::from(
-                        read_expression,
-                        encoding,
-                        None, /* dwarf */
-                        Some(&unit),
-                        Some(&entry_ids),
-                        &|address| Some(Address::Constant(address)),
-                    )
-                    .unwrap();
-                    let mut convert_operations = convert_expression.operations.iter();
-                    for (_, operation, _) in operations {
-                        assert_eq!(convert_operations.next(), Some(operation));
-                    }
-                    assert_eq!(
-                        convert_operations.next(),
-                        Some(&Operation::Branch(start_index))
-                    );
-                    assert_eq!(convert_operations.next(), Some(&Operation::Skip(end_index)));
-                    assert_eq!(
-                        convert_operations.next(),
-                        Some(&Operation::Simple(constants::DW_OP_nop))
-                    );
-                }
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/range.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/range.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/range.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/range.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,413 +0,0 @@
-use alloc::vec::Vec;
-use indexmap::IndexSet;
-use std::ops::{Deref, DerefMut};
-
-use crate::common::{Encoding, RangeListsOffset, SectionId};
-use crate::write::{Address, BaseId, Error, Result, Section, Sections, Writer};
-
-define_section!(
-    DebugRanges,
-    RangeListsOffset,
-    "A writable `.debug_ranges` section."
-);
-define_section!(
-    DebugRngLists,
-    RangeListsOffset,
-    "A writable `.debug_rnglists` section."
-);
-
-define_offsets!(
-    RangeListOffsets: RangeListId => RangeListsOffset,
-    "The section offsets of a series of range lists within the `.debug_ranges` or `.debug_rnglists` sections."
-);
-
-define_id!(
-    RangeListId,
-    "An identifier for a range list in a `RangeListTable`."
-);
-
-/// A table of range lists that will be stored in a `.debug_ranges` or `.debug_rnglists` section.
-#[derive(Debug, Default)]
-pub struct RangeListTable {
-    base_id: BaseId,
-    ranges: IndexSet<RangeList>,
-}
-
-impl RangeListTable {
-    /// Add a range list to the table.
-    pub fn add(&mut self, range_list: RangeList) -> RangeListId {
-        let (index, _) = self.ranges.insert_full(range_list);
-        RangeListId::new(self.base_id, index)
-    }
-
-    /// Write the range list table to the appropriate section for the given DWARF version.
-    pub(crate) fn write<W: Writer>(
-        &self,
-        sections: &mut Sections<W>,
-        encoding: Encoding,
-    ) -> Result<RangeListOffsets> {
-        if self.ranges.is_empty() {
-            return Ok(RangeListOffsets::none());
-        }
-
-        match encoding.version {
-            2..=4 => self.write_ranges(&mut sections.debug_ranges, encoding.address_size),
-            5 => self.write_rnglists(&mut sections.debug_rnglists, encoding),
-            _ => Err(Error::UnsupportedVersion(encoding.version)),
-        }
-    }
-
-    /// Write the range list table to the `.debug_ranges` section.
-    fn write_ranges<W: Writer>(
-        &self,
-        w: &mut DebugRanges<W>,
-        address_size: u8,
-    ) -> Result<RangeListOffsets> {
-        let mut offsets = Vec::new();
-        for range_list in self.ranges.iter() {
-            offsets.push(w.offset());
-            for range in &range_list.0 {
-                // Note that we must ensure none of the ranges have both begin == 0 and end == 0.
-                // We do this by ensuring that begin != end, which is a bit more restrictive
-                // than required, but still seems reasonable.
-                match *range {
-                    Range::BaseAddress { address } => {
-                        let marker = !0 >> (64 - address_size * 8);
-                        w.write_udata(marker, address_size)?;
-                        w.write_address(address, address_size)?;
-                    }
-                    Range::OffsetPair { begin, end } => {
-                        if begin == end {
-                            return Err(Error::InvalidRange);
-                        }
-                        w.write_udata(begin, address_size)?;
-                        w.write_udata(end, address_size)?;
-                    }
-                    Range::StartEnd { begin, end } => {
-                        if begin == end {
-                            return Err(Error::InvalidRange);
-                        }
-                        w.write_address(begin, address_size)?;
-                        w.write_address(end, address_size)?;
-                    }
-                    Range::StartLength { begin, length } => {
-                        let end = match begin {
-                            Address::Constant(begin) => Address::Constant(begin + length),
-                            Address::Symbol { symbol, addend } => Address::Symbol {
-                                symbol,
-                                addend: addend + length as i64,
-                            },
-                        };
-                        if begin == end {
-                            return Err(Error::InvalidRange);
-                        }
-                        w.write_address(begin, address_size)?;
-                        w.write_address(end, address_size)?;
-                    }
-                }
-            }
-            w.write_udata(0, address_size)?;
-            w.write_udata(0, address_size)?;
-        }
-        Ok(RangeListOffsets {
-            base_id: self.base_id,
-            offsets,
-        })
-    }
-
-    /// Write the range list table to the `.debug_rnglists` section.
-    fn write_rnglists<W: Writer>(
-        &self,
-        w: &mut DebugRngLists<W>,
-        encoding: Encoding,
-    ) -> Result<RangeListOffsets> {
-        let mut offsets = Vec::new();
-
-        if encoding.version != 5 {
-            return Err(Error::NeedVersion(5));
-        }
-
-        let length_offset = w.write_initial_length(encoding.format)?;
-        let length_base = w.len();
-
-        w.write_u16(encoding.version)?;
-        w.write_u8(encoding.address_size)?;
-        w.write_u8(0)?; // segment_selector_size
-        w.write_u32(0)?; // offset_entry_count (when set to zero DW_FORM_rnglistx can't be used, see section 7.28)
-                         // FIXME implement DW_FORM_rnglistx writing and implement the offset entry list
-
-        for range_list in self.ranges.iter() {
-            offsets.push(w.offset());
-            for range in &range_list.0 {
-                match *range {
-                    Range::BaseAddress { address } => {
-                        w.write_u8(crate::constants::DW_RLE_base_address.0)?;
-                        w.write_address(address, encoding.address_size)?;
-                    }
-                    Range::OffsetPair { begin, end } => {
-                        w.write_u8(crate::constants::DW_RLE_offset_pair.0)?;
-                        w.write_uleb128(begin)?;
-                        w.write_uleb128(end)?;
-                    }
-                    Range::StartEnd { begin, end } => {
-                        w.write_u8(crate::constants::DW_RLE_start_end.0)?;
-                        w.write_address(begin, encoding.address_size)?;
-                        w.write_address(end, encoding.address_size)?;
-                    }
-                    Range::StartLength { begin, length } => {
-                        w.write_u8(crate::constants::DW_RLE_start_length.0)?;
-                        w.write_address(begin, encoding.address_size)?;
-                        w.write_uleb128(length)?;
-                    }
-                }
-            }
-
-            w.write_u8(crate::constants::DW_RLE_end_of_list.0)?;
-        }
-
-        let length = (w.len() - length_base) as u64;
-        w.write_initial_length_at(length_offset, length, encoding.format)?;
-
-        Ok(RangeListOffsets {
-            base_id: self.base_id,
-            offsets,
-        })
-    }
-}
-
-/// A range list that will be stored in a `.debug_ranges` or `.debug_rnglists` section.
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub struct RangeList(pub Vec<Range>);
-
-/// A single range.
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub enum Range {
-    /// DW_RLE_base_address
-    BaseAddress {
-        /// Base address.
-        address: Address,
-    },
-    /// DW_RLE_offset_pair
-    OffsetPair {
-        /// Start of range relative to base address.
-        begin: u64,
-        /// End of range relative to base address.
-        end: u64,
-    },
-    /// DW_RLE_start_end
-    StartEnd {
-        /// Start of range.
-        begin: Address,
-        /// End of range.
-        end: Address,
-    },
-    /// DW_RLE_start_length
-    StartLength {
-        /// Start of range.
-        begin: Address,
-        /// Length of range.
-        length: u64,
-    },
-}
-
-#[cfg(feature = "read")]
-mod convert {
-    use super::*;
-
-    use crate::read::{self, Reader};
-    use crate::write::{ConvertError, ConvertResult, ConvertUnitContext};
-
-    impl RangeList {
-        /// Create a range list by reading the data from the give range list iter.
-        pub(crate) fn from<R: Reader<Offset = usize>>(
-            mut from: read::RawRngListIter<R>,
-            context: &ConvertUnitContext<R>,
-        ) -> ConvertResult<Self> {
-            let mut have_base_address = context.base_address != Address::Constant(0);
-            let convert_address =
-                |x| (context.convert_address)(x).ok_or(ConvertError::InvalidAddress);
-            let mut ranges = Vec::new();
-            while let Some(from_range) = from.next()? {
-                let range = match from_range {
-                    read::RawRngListEntry::AddressOrOffsetPair { begin, end } => {
-                        // These were parsed as addresses, even if they are offsets.
-                        let begin = convert_address(begin)?;
-                        let end = convert_address(end)?;
-                        match (begin, end) {
-                            (Address::Constant(begin_offset), Address::Constant(end_offset)) => {
-                                if have_base_address {
-                                    Range::OffsetPair {
-                                        begin: begin_offset,
-                                        end: end_offset,
-                                    }
-                                } else {
-                                    Range::StartEnd { begin, end }
-                                }
-                            }
-                            _ => {
-                                if have_base_address {
-                                    // At least one of begin/end is an address, but we also have
-                                    // a base address. Adding addresses is undefined.
-                                    return Err(ConvertError::InvalidRangeRelativeAddress);
-                                }
-                                Range::StartEnd { begin, end }
-                            }
-                        }
-                    }
-                    read::RawRngListEntry::BaseAddress { addr } => {
-                        have_base_address = true;
-                        let address = convert_address(addr)?;
-                        Range::BaseAddress { address }
-                    }
-                    read::RawRngListEntry::BaseAddressx { addr } => {
-                        have_base_address = true;
-                        let address = convert_address(context.dwarf.address(context.unit, addr)?)?;
-                        Range::BaseAddress { address }
-                    }
-                    read::RawRngListEntry::StartxEndx { begin, end } => {
-                        let begin = convert_address(context.dwarf.address(context.unit, begin)?)?;
-                        let end = convert_address(context.dwarf.address(context.unit, end)?)?;
-                        Range::StartEnd { begin, end }
-                    }
-                    read::RawRngListEntry::StartxLength { begin, length } => {
-                        let begin = convert_address(context.dwarf.address(context.unit, begin)?)?;
-                        Range::StartLength { begin, length }
-                    }
-                    read::RawRngListEntry::OffsetPair { begin, end } => {
-                        Range::OffsetPair { begin, end }
-                    }
-                    read::RawRngListEntry::StartEnd { begin, end } => {
-                        let begin = convert_address(begin)?;
-                        let end = convert_address(end)?;
-                        Range::StartEnd { begin, end }
-                    }
-                    read::RawRngListEntry::StartLength { begin, length } => {
-                        let begin = convert_address(begin)?;
-                        Range::StartLength { begin, length }
-                    }
-                };
-                // Filtering empty ranges out.
-                match range {
-                    Range::StartLength { length, .. } if length == 0 => continue,
-                    Range::StartEnd { begin, end, .. } if begin == end => continue,
-                    Range::OffsetPair { begin, end, .. } if begin == end => continue,
-                    _ => (),
-                }
-                ranges.push(range);
-            }
-            Ok(RangeList(ranges))
-        }
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "read")]
-mod tests {
-    use super::*;
-    use crate::common::{
-        DebugAbbrevOffset, DebugAddrBase, DebugInfoOffset, DebugLocListsBase, DebugRngListsBase,
-        DebugStrOffsetsBase, Format, UnitSectionOffset,
-    };
-    use crate::read;
-    use crate::write::{
-        ConvertUnitContext, EndianVec, LineStringTable, LocationListTable, Range, RangeListTable,
-        StringTable,
-    };
-    use crate::LittleEndian;
-    use std::collections::HashMap;
-
-    #[test]
-    fn test_range() {
-        let mut line_strings = LineStringTable::default();
-        let mut strings = StringTable::default();
-
-        for &version in &[2, 3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-
-                    let mut range_list = RangeList(vec![
-                        Range::StartLength {
-                            begin: Address::Constant(6666),
-                            length: 7777,
-                        },
-                        Range::StartEnd {
-                            begin: Address::Constant(4444),
-                            end: Address::Constant(5555),
-                        },
-                        Range::BaseAddress {
-                            address: Address::Constant(1111),
-                        },
-                        Range::OffsetPair {
-                            begin: 2222,
-                            end: 3333,
-                        },
-                    ]);
-
-                    let mut ranges = RangeListTable::default();
-                    let range_list_id = ranges.add(range_list.clone());
-
-                    let mut sections = Sections::new(EndianVec::new(LittleEndian));
-                    let range_list_offsets = ranges.write(&mut sections, encoding).unwrap();
-
-                    let read_debug_ranges =
-                        read::DebugRanges::new(sections.debug_ranges.slice(), LittleEndian);
-                    let read_debug_rnglists =
-                        read::DebugRngLists::new(sections.debug_rnglists.slice(), LittleEndian);
-                    let read_ranges = read::RangeLists::new(read_debug_ranges, read_debug_rnglists);
-                    let offset = range_list_offsets.get(range_list_id);
-                    let read_range_list = read_ranges.raw_ranges(offset, encoding).unwrap();
-
-                    let dwarf = read::Dwarf {
-                        ranges: read_ranges,
-                        ..Default::default()
-                    };
-                    let unit = read::Unit {
-                        offset: UnitSectionOffset::DebugInfoOffset(DebugInfoOffset(0)),
-                        header: read::UnitHeader::new(
-                            encoding,
-                            0,
-                            DebugAbbrevOffset(0),
-                            read::EndianSlice::default(),
-                        ),
-                        abbreviations: read::Abbreviations::default(),
-                        name: None,
-                        comp_dir: None,
-                        low_pc: 0,
-                        str_offsets_base: DebugStrOffsetsBase(0),
-                        addr_base: DebugAddrBase(0),
-                        loclists_base: DebugLocListsBase(0),
-                        rnglists_base: DebugRngListsBase(0),
-                        line_program: None,
-                    };
-                    let context = ConvertUnitContext {
-                        dwarf: &dwarf,
-                        unit: &unit,
-                        line_strings: &mut line_strings,
-                        strings: &mut strings,
-                        ranges: &mut ranges,
-                        locations: &mut LocationListTable::default(),
-                        convert_address: &|address| Some(Address::Constant(address)),
-                        base_address: Address::Constant(0),
-                        line_program_offset: None,
-                        line_program_files: Vec::new(),
-                        entry_ids: &HashMap::new(),
-                    };
-                    let convert_range_list = RangeList::from(read_range_list, &context).unwrap();
-
-                    if version <= 4 {
-                        range_list.0[0] = Range::StartEnd {
-                            begin: Address::Constant(6666),
-                            end: Address::Constant(6666 + 7777),
-                        };
-                    }
-                    assert_eq!(range_list, convert_range_list);
-                }
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-use std::ops::DerefMut;
-use std::result;
-use std::vec::Vec;
-
-use crate::common::SectionId;
-use crate::write::{
-    DebugAbbrev, DebugFrame, DebugInfo, DebugInfoReference, DebugLine, DebugLineStr, DebugLoc,
-    DebugLocLists, DebugRanges, DebugRngLists, DebugStr, EhFrame, Writer,
-};
-
-macro_rules! define_section {
-    ($name:ident, $offset:ident, $docs:expr) => {
-        #[doc=$docs]
-        #[derive(Debug, Default)]
-        pub struct $name<W: Writer>(pub W);
-
-        impl<W: Writer> $name<W> {
-            /// Return the offset of the next write.
-            pub fn offset(&self) -> $offset {
-                $offset(self.len())
-            }
-        }
-
-        impl<W: Writer> From<W> for $name<W> {
-            #[inline]
-            fn from(w: W) -> Self {
-                $name(w)
-            }
-        }
-
-        impl<W: Writer> Deref for $name<W> {
-            type Target = W;
-
-            #[inline]
-            fn deref(&self) -> &W {
-                &self.0
-            }
-        }
-
-        impl<W: Writer> DerefMut for $name<W> {
-            #[inline]
-            fn deref_mut(&mut self) -> &mut W {
-                &mut self.0
-            }
-        }
-
-        impl<W: Writer> Section<W> for $name<W> {
-            #[inline]
-            fn id(&self) -> SectionId {
-                SectionId::$name
-            }
-        }
-    };
-}
-
-/// Functionality common to all writable DWARF sections.
-pub trait Section<W: Writer>: DerefMut<Target = W> {
-    /// Returns the DWARF section kind for this type.
-    fn id(&self) -> SectionId;
-
-    /// Returns the ELF section name for this type.
-    fn name(&self) -> &'static str {
-        self.id().name()
-    }
-}
-
-/// All of the writable DWARF sections.
-#[derive(Debug, Default)]
-pub struct Sections<W: Writer> {
-    /// The `.debug_abbrev` section.
-    pub debug_abbrev: DebugAbbrev<W>,
-    /// The `.debug_info` section.
-    pub debug_info: DebugInfo<W>,
-    /// The `.debug_line` section.
-    pub debug_line: DebugLine<W>,
-    /// The `.debug_line_str` section.
-    pub debug_line_str: DebugLineStr<W>,
-    /// The `.debug_ranges` section.
-    pub debug_ranges: DebugRanges<W>,
-    /// The `.debug_rnglists` section.
-    pub debug_rnglists: DebugRngLists<W>,
-    /// The `.debug_loc` section.
-    pub debug_loc: DebugLoc<W>,
-    /// The `.debug_loclists` section.
-    pub debug_loclists: DebugLocLists<W>,
-    /// The `.debug_str` section.
-    pub debug_str: DebugStr<W>,
-    /// The `.debug_frame` section.
-    pub debug_frame: DebugFrame<W>,
-    /// The `.eh_frame` section.
-    pub eh_frame: EhFrame<W>,
-    /// Unresolved references in the `.debug_info` section.
-    pub(crate) debug_info_refs: Vec<DebugInfoReference>,
-    /// Unresolved references in the `.debug_loc` section.
-    pub(crate) debug_loc_refs: Vec<DebugInfoReference>,
-    /// Unresolved references in the `.debug_loclists` section.
-    pub(crate) debug_loclists_refs: Vec<DebugInfoReference>,
-}
-
-impl<W: Writer + Clone> Sections<W> {
-    /// Create a new `Sections` using clones of the given `section`.
-    pub fn new(section: W) -> Self {
-        Sections {
-            debug_abbrev: DebugAbbrev(section.clone()),
-            debug_info: DebugInfo(section.clone()),
-            debug_line: DebugLine(section.clone()),
-            debug_line_str: DebugLineStr(section.clone()),
-            debug_ranges: DebugRanges(section.clone()),
-            debug_rnglists: DebugRngLists(section.clone()),
-            debug_loc: DebugLoc(section.clone()),
-            debug_loclists: DebugLocLists(section.clone()),
-            debug_str: DebugStr(section.clone()),
-            debug_frame: DebugFrame(section.clone()),
-            eh_frame: EhFrame(section.clone()),
-            debug_info_refs: Vec::new(),
-            debug_loc_refs: Vec::new(),
-            debug_loclists_refs: Vec::new(),
-        }
-    }
-}
-
-impl<W: Writer> Sections<W> {
-    /// For each section, call `f` once with a shared reference.
-    pub fn for_each<F, E>(&self, mut f: F) -> result::Result<(), E>
-    where
-        F: FnMut(SectionId, &W) -> result::Result<(), E>,
-    {
-        macro_rules! f {
-            ($s:expr) => {
-                f($s.id(), &$s)
-            };
-        }
-        // Ordered so that earlier sections do not reference later sections.
-        f!(self.debug_abbrev)?;
-        f!(self.debug_str)?;
-        f!(self.debug_line_str)?;
-        f!(self.debug_line)?;
-        f!(self.debug_ranges)?;
-        f!(self.debug_rnglists)?;
-        f!(self.debug_loc)?;
-        f!(self.debug_loclists)?;
-        f!(self.debug_info)?;
-        f!(self.debug_frame)?;
-        f!(self.eh_frame)?;
-        Ok(())
-    }
-
-    /// For each section, call `f` once with a mutable reference.
-    pub fn for_each_mut<F, E>(&mut self, mut f: F) -> result::Result<(), E>
-    where
-        F: FnMut(SectionId, &mut W) -> result::Result<(), E>,
-    {
-        macro_rules! f {
-            ($s:expr) => {
-                f($s.id(), &mut $s)
-            };
-        }
-        // Ordered so that earlier sections do not reference later sections.
-        f!(self.debug_abbrev)?;
-        f!(self.debug_str)?;
-        f!(self.debug_line_str)?;
-        f!(self.debug_line)?;
-        f!(self.debug_ranges)?;
-        f!(self.debug_rnglists)?;
-        f!(self.debug_loc)?;
-        f!(self.debug_loclists)?;
-        f!(self.debug_info)?;
-        f!(self.debug_frame)?;
-        f!(self.eh_frame)?;
-        Ok(())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/str.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/str.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-use alloc::vec::Vec;
-use indexmap::IndexSet;
-use std::ops::{Deref, DerefMut};
-
-use crate::common::{DebugLineStrOffset, DebugStrOffset, SectionId};
-use crate::write::{BaseId, Result, Section, Writer};
-
-// Requirements:
-// - values are `[u8]`, null bytes are not allowed
-// - insertion returns a fixed id
-// - inserting a duplicate returns the id of the existing value
-// - able to convert an id to a section offset
-// Optional?
-// - able to get an existing value given an id
-//
-// Limitations of current implementation (using IndexSet):
-// - inserting requires either an allocation for duplicates,
-//   or a double lookup for non-duplicates
-// - doesn't preserve offsets when updating an existing `.debug_str` section
-//
-// Possible changes:
-// - calculate offsets as we add values, and use that as the id.
-//   This would avoid the need for DebugStrOffsets but would make it
-//   hard to implement `get`.
-macro_rules! define_string_table {
-    ($name:ident, $id:ident, $section:ident, $offsets:ident, $docs:expr) => {
-        #[doc=$docs]
-        #[derive(Debug, Default)]
-        pub struct $name {
-            base_id: BaseId,
-            strings: IndexSet<Vec<u8>>,
-        }
-
-        impl $name {
-            /// Add a string to the string table and return its id.
-            ///
-            /// If the string already exists, then return the id of the existing string.
-            ///
-            /// # Panics
-            ///
-            /// Panics if `bytes` contains a null byte.
-            pub fn add<T>(&mut self, bytes: T) -> $id
-            where
-                T: Into<Vec<u8>>,
-            {
-                let bytes = bytes.into();
-                assert!(!bytes.contains(&0));
-                let (index, _) = self.strings.insert_full(bytes);
-                $id::new(self.base_id, index)
-            }
-
-            /// Return the number of strings in the table.
-            #[inline]
-            pub fn count(&self) -> usize {
-                self.strings.len()
-            }
-
-            /// Get a reference to a string in the table.
-            ///
-            /// # Panics
-            ///
-            /// Panics if `id` is invalid.
-            pub fn get(&self, id: $id) -> &[u8] {
-                debug_assert_eq!(self.base_id, id.base_id);
-                self.strings.get_index(id.index).map(Vec::as_slice).unwrap()
-            }
-
-            /// Write the string table to the `.debug_str` section.
-            ///
-            /// Returns the offsets at which the strings are written.
-            pub fn write<W: Writer>(&self, w: &mut $section<W>) -> Result<$offsets> {
-                let mut offsets = Vec::new();
-                for bytes in self.strings.iter() {
-                    offsets.push(w.offset());
-                    w.write(bytes)?;
-                    w.write_u8(0)?;
-                }
-
-                Ok($offsets {
-                    base_id: self.base_id,
-                    offsets,
-                })
-            }
-        }
-    };
-}
-
-define_id!(StringId, "An identifier for a string in a `StringTable`.");
-
-define_string_table!(
-    StringTable,
-    StringId,
-    DebugStr,
-    DebugStrOffsets,
-    "A table of strings that will be stored in a `.debug_str` section."
-);
-
-define_section!(DebugStr, DebugStrOffset, "A writable `.debug_str` section.");
-
-define_offsets!(
-    DebugStrOffsets: StringId => DebugStrOffset,
-    "The section offsets of all strings within a `.debug_str` section."
-);
-
-define_id!(
-    LineStringId,
-    "An identifier for a string in a `LineStringTable`."
-);
-
-define_string_table!(
-    LineStringTable,
-    LineStringId,
-    DebugLineStr,
-    DebugLineStrOffsets,
-    "A table of strings that will be stored in a `.debug_line_str` section."
-);
-
-define_section!(
-    DebugLineStr,
-    DebugLineStrOffset,
-    "A writable `.debug_line_str` section."
-);
-
-define_offsets!(
-    DebugLineStrOffsets: LineStringId => DebugLineStrOffset,
-    "The section offsets of all strings within a `.debug_line_str` section."
-);
-
-#[cfg(test)]
-#[cfg(feature = "read")]
-mod tests {
-    use super::*;
-    use crate::read;
-    use crate::write::EndianVec;
-    use crate::LittleEndian;
-
-    #[test]
-    fn test_string_table() {
-        let mut strings = StringTable::default();
-        assert_eq!(strings.count(), 0);
-        let id1 = strings.add(&b"one"[..]);
-        let id2 = strings.add(&b"two"[..]);
-        assert_eq!(strings.add(&b"one"[..]), id1);
-        assert_eq!(strings.add(&b"two"[..]), id2);
-        assert_eq!(strings.get(id1), &b"one"[..]);
-        assert_eq!(strings.get(id2), &b"two"[..]);
-        assert_eq!(strings.count(), 2);
-
-        let mut debug_str = DebugStr::from(EndianVec::new(LittleEndian));
-        let offsets = strings.write(&mut debug_str).unwrap();
-        assert_eq!(debug_str.slice(), b"one\0two\0");
-        assert_eq!(offsets.get(id1), DebugStrOffset(0));
-        assert_eq!(offsets.get(id2), DebugStrOffset(4));
-        assert_eq!(offsets.count(), 2);
-    }
-
-    #[test]
-    fn test_string_table_read() {
-        let mut strings = StringTable::default();
-        let id1 = strings.add(&b"one"[..]);
-        let id2 = strings.add(&b"two"[..]);
-
-        let mut debug_str = DebugStr::from(EndianVec::new(LittleEndian));
-        let offsets = strings.write(&mut debug_str).unwrap();
-
-        let read_debug_str = read::DebugStr::new(debug_str.slice(), LittleEndian);
-        let str1 = read_debug_str.get_str(offsets.get(id1)).unwrap();
-        let str2 = read_debug_str.get_str(offsets.get(id2)).unwrap();
-        assert_eq!(str1.slice(), &b"one"[..]);
-        assert_eq!(str2.slice(), &b"two"[..]);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/unit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/unit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/unit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/unit.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3073 +0,0 @@
-use alloc::vec::Vec;
-use std::ops::{Deref, DerefMut};
-use std::{slice, usize};
-
-use crate::common::{
-    DebugAbbrevOffset, DebugInfoOffset, DebugLineOffset, DebugMacinfoOffset, DebugMacroOffset,
-    DebugStrOffset, DebugTypeSignature, Encoding, Format, SectionId,
-};
-use crate::constants;
-use crate::leb128::write::{sleb128_size, uleb128_size};
-use crate::write::{
-    Abbreviation, AbbreviationTable, Address, AttributeSpecification, BaseId, DebugLineStrOffsets,
-    DebugStrOffsets, Error, Expression, FileId, LineProgram, LineStringId, LocationListId,
-    LocationListOffsets, LocationListTable, RangeListId, RangeListOffsets, RangeListTable,
-    Reference, Result, Section, Sections, StringId, Writer,
-};
-
-define_id!(UnitId, "An identifier for a unit in a `UnitTable`.");
-
-define_id!(UnitEntryId, "An identifier for an entry in a `Unit`.");
-
-/// A table of units that will be stored in the `.debug_info` section.
-#[derive(Debug, Default)]
-pub struct UnitTable {
-    base_id: BaseId,
-    units: Vec<Unit>,
-}
-
-impl UnitTable {
-    /// Create a new unit and add it to the table.
-    ///
-    /// `address_size` must be in bytes.
-    ///
-    /// Returns the `UnitId` of the new unit.
-    #[inline]
-    pub fn add(&mut self, unit: Unit) -> UnitId {
-        let id = UnitId::new(self.base_id, self.units.len());
-        self.units.push(unit);
-        id
-    }
-
-    /// Return the number of units.
-    #[inline]
-    pub fn count(&self) -> usize {
-        self.units.len()
-    }
-
-    /// Return the id of a unit.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `index >= self.count()`.
-    #[inline]
-    pub fn id(&self, index: usize) -> UnitId {
-        assert!(index < self.count());
-        UnitId::new(self.base_id, index)
-    }
-
-    /// Get a reference to a unit.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `id` is invalid.
-    #[inline]
-    pub fn get(&self, id: UnitId) -> &Unit {
-        debug_assert_eq!(self.base_id, id.base_id);
-        &self.units[id.index]
-    }
-
-    /// Get a mutable reference to a unit.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `id` is invalid.
-    #[inline]
-    pub fn get_mut(&mut self, id: UnitId) -> &mut Unit {
-        debug_assert_eq!(self.base_id, id.base_id);
-        &mut self.units[id.index]
-    }
-
-    /// Write the units to the given sections.
-    ///
-    /// `strings` must contain the `.debug_str` offsets of the corresponding
-    /// `StringTable`.
-    pub fn write<W: Writer>(
-        &mut self,
-        sections: &mut Sections<W>,
-        line_strings: &DebugLineStrOffsets,
-        strings: &DebugStrOffsets,
-    ) -> Result<DebugInfoOffsets> {
-        let mut offsets = DebugInfoOffsets {
-            base_id: self.base_id,
-            units: Vec::new(),
-        };
-        for unit in &mut self.units {
-            // TODO: maybe share abbreviation tables
-            let abbrev_offset = sections.debug_abbrev.offset();
-            let mut abbrevs = AbbreviationTable::default();
-
-            offsets.units.push(unit.write(
-                sections,
-                abbrev_offset,
-                &mut abbrevs,
-                line_strings,
-                strings,
-            )?);
-
-            abbrevs.write(&mut sections.debug_abbrev)?;
-        }
-
-        write_section_refs(
-            &mut sections.debug_info_refs,
-            &mut sections.debug_info.0,
-            &offsets,
-        )?;
-        write_section_refs(
-            &mut sections.debug_loc_refs,
-            &mut sections.debug_loc.0,
-            &offsets,
-        )?;
-        write_section_refs(
-            &mut sections.debug_loclists_refs,
-            &mut sections.debug_loclists.0,
-            &offsets,
-        )?;
-
-        Ok(offsets)
-    }
-}
-
-fn write_section_refs<W: Writer>(
-    references: &mut Vec<DebugInfoReference>,
-    w: &mut W,
-    offsets: &DebugInfoOffsets,
-) -> Result<()> {
-    for r in references.drain(..) {
-        let entry_offset = offsets.entry(r.unit, r.entry).0;
-        debug_assert_ne!(entry_offset, 0);
-        w.write_offset_at(r.offset, entry_offset, SectionId::DebugInfo, r.size)?;
-    }
-    Ok(())
-}
-
-/// A unit's debugging information.
-#[derive(Debug)]
-pub struct Unit {
-    base_id: BaseId,
-    /// The encoding parameters for this unit.
-    encoding: Encoding,
-    /// The line number program for this unit.
-    pub line_program: LineProgram,
-    /// A table of range lists used by this unit.
-    pub ranges: RangeListTable,
-    /// A table of location lists used by this unit.
-    pub locations: LocationListTable,
-    /// All entries in this unit. The order is unrelated to the tree order.
-    // Requirements:
-    // - entries form a tree
-    // - entries can be added in any order
-    // - entries have a fixed id
-    // - able to quickly lookup an entry from its id
-    // Limitations of current implemention:
-    // - mutable iteration of children is messy due to borrow checker
-    entries: Vec<DebuggingInformationEntry>,
-    /// The index of the root entry in entries.
-    root: UnitEntryId,
-}
-
-impl Unit {
-    /// Create a new `Unit`.
-    pub fn new(encoding: Encoding, line_program: LineProgram) -> Self {
-        let base_id = BaseId::default();
-        let ranges = RangeListTable::default();
-        let locations = LocationListTable::default();
-        let mut entries = Vec::new();
-        let root = DebuggingInformationEntry::new(
-            base_id,
-            &mut entries,
-            None,
-            constants::DW_TAG_compile_unit,
-        );
-        Unit {
-            base_id,
-            encoding,
-            line_program,
-            ranges,
-            locations,
-            entries,
-            root,
-        }
-    }
-
-    /// Return the encoding parameters for this unit.
-    #[inline]
-    pub fn encoding(&self) -> Encoding {
-        self.encoding
-    }
-
-    /// Return the DWARF version for this unit.
-    #[inline]
-    pub fn version(&self) -> u16 {
-        self.encoding.version
-    }
-
-    /// Return the address size in bytes for this unit.
-    #[inline]
-    pub fn address_size(&self) -> u8 {
-        self.encoding.address_size
-    }
-
-    /// Return the DWARF format for this unit.
-    #[inline]
-    pub fn format(&self) -> Format {
-        self.encoding.format
-    }
-
-    /// Return the number of `DebuggingInformationEntry`s created for this unit.
-    ///
-    /// This includes entries that no longer have a parent.
-    #[inline]
-    pub fn count(&self) -> usize {
-        self.entries.len()
-    }
-
-    /// Return the id of the root entry.
-    #[inline]
-    pub fn root(&self) -> UnitEntryId {
-        self.root
-    }
-
-    /// Add a new `DebuggingInformationEntry` to this unit and return its id.
-    ///
-    /// The `parent` must be within the same unit.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `parent` is invalid.
-    #[inline]
-    pub fn add(&mut self, parent: UnitEntryId, tag: constants::DwTag) -> UnitEntryId {
-        debug_assert_eq!(self.base_id, parent.base_id);
-        DebuggingInformationEntry::new(self.base_id, &mut self.entries, Some(parent), tag)
-    }
-
-    /// Get a reference to an entry.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `id` is invalid.
-    #[inline]
-    pub fn get(&self, id: UnitEntryId) -> &DebuggingInformationEntry {
-        debug_assert_eq!(self.base_id, id.base_id);
-        &self.entries[id.index]
-    }
-
-    /// Get a mutable reference to an entry.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `id` is invalid.
-    #[inline]
-    pub fn get_mut(&mut self, id: UnitEntryId) -> &mut DebuggingInformationEntry {
-        debug_assert_eq!(self.base_id, id.base_id);
-        &mut self.entries[id.index]
-    }
-
-    /// Return true if `self.line_program` is used by a DIE.
-    fn line_program_in_use(&self) -> bool {
-        if self.line_program.is_none() {
-            return false;
-        }
-        if !self.line_program.is_empty() {
-            return true;
-        }
-
-        for entry in &self.entries {
-            for attr in &entry.attrs {
-                if let AttributeValue::FileIndex(Some(_)) = attr.value {
-                    return true;
-                }
-            }
-        }
-
-        false
-    }
-
-    /// Write the unit to the given sections.
-    pub(crate) fn write<W: Writer>(
-        &mut self,
-        sections: &mut Sections<W>,
-        abbrev_offset: DebugAbbrevOffset,
-        abbrevs: &mut AbbreviationTable,
-        line_strings: &DebugLineStrOffsets,
-        strings: &DebugStrOffsets,
-    ) -> Result<UnitOffsets> {
-        let line_program = if self.line_program_in_use() {
-            self.entries[self.root.index]
-                .set(constants::DW_AT_stmt_list, AttributeValue::LineProgramRef);
-            Some(self.line_program.write(
-                &mut sections.debug_line,
-                self.encoding,
-                line_strings,
-                strings,
-            )?)
-        } else {
-            self.entries[self.root.index].delete(constants::DW_AT_stmt_list);
-            None
-        };
-
-        // TODO: use .debug_types for type units in DWARF v4.
-        let w = &mut sections.debug_info;
-
-        let mut offsets = UnitOffsets {
-            base_id: self.base_id,
-            unit: w.offset(),
-            // Entries can be written in any order, so create the complete vec now.
-            entries: vec![EntryOffset::none(); self.entries.len()],
-        };
-
-        let length_offset = w.write_initial_length(self.format())?;
-        let length_base = w.len();
-
-        w.write_u16(self.version())?;
-        if 2 <= self.version() && self.version() <= 4 {
-            w.write_offset(
-                abbrev_offset.0,
-                SectionId::DebugAbbrev,
-                self.format().word_size(),
-            )?;
-            w.write_u8(self.address_size())?;
-        } else if self.version() == 5 {
-            w.write_u8(constants::DW_UT_compile.0)?;
-            w.write_u8(self.address_size())?;
-            w.write_offset(
-                abbrev_offset.0,
-                SectionId::DebugAbbrev,
-                self.format().word_size(),
-            )?;
-        } else {
-            return Err(Error::UnsupportedVersion(self.version()));
-        }
-
-        // Calculate all DIE offsets, so that we are able to output references to them.
-        // However, references to base types in expressions use ULEB128, so base types
-        // must be moved to the front before we can calculate offsets.
-        self.reorder_base_types();
-        let mut offset = w.len();
-        self.entries[self.root.index].calculate_offsets(
-            self,
-            &mut offset,
-            &mut offsets,
-            abbrevs,
-        )?;
-
-        let range_lists = self.ranges.write(sections, self.encoding)?;
-        // Location lists can't be written until we have DIE offsets.
-        let loc_lists = self
-            .locations
-            .write(sections, self.encoding, Some(&offsets))?;
-
-        let w = &mut sections.debug_info;
-        let mut unit_refs = Vec::new();
-        self.entries[self.root.index].write(
-            w,
-            &mut sections.debug_info_refs,
-            &mut unit_refs,
-            self,
-            &mut offsets,
-            abbrevs,
-            line_program,
-            line_strings,
-            strings,
-            &range_lists,
-            &loc_lists,
-        )?;
-
-        let length = (w.len() - length_base) as u64;
-        w.write_initial_length_at(length_offset, length, self.format())?;
-
-        for (offset, entry) in unit_refs {
-            // This does not need relocation.
-            w.write_udata_at(
-                offset.0,
-                offsets.unit_offset(entry),
-                self.format().word_size(),
-            )?;
-        }
-
-        Ok(offsets)
-    }
-
-    /// Reorder base types to come first so that typed stack operations
-    /// can get their offset.
-    fn reorder_base_types(&mut self) {
-        let root = &self.entries[self.root.index];
-        let mut root_children = Vec::with_capacity(root.children.len());
-        for entry in &root.children {
-            if self.entries[entry.index].tag == constants::DW_TAG_base_type {
-                root_children.push(*entry);
-            }
-        }
-        for entry in &root.children {
-            if self.entries[entry.index].tag != constants::DW_TAG_base_type {
-                root_children.push(*entry);
-            }
-        }
-        self.entries[self.root.index].children = root_children;
-    }
-}
-
-/// A Debugging Information Entry (DIE).
-///
-/// DIEs have a set of attributes and optionally have children DIEs as well.
-///
-/// DIEs form a tree without any cycles. This is enforced by specifying the
-/// parent when creating a DIE, and disallowing changes of parent.
-#[derive(Debug)]
-pub struct DebuggingInformationEntry {
-    id: UnitEntryId,
-    parent: Option<UnitEntryId>,
-    tag: constants::DwTag,
-    /// Whether to emit `DW_AT_sibling`.
-    sibling: bool,
-    attrs: Vec<Attribute>,
-    children: Vec<UnitEntryId>,
-}
-
-impl DebuggingInformationEntry {
-    /// Create a new `DebuggingInformationEntry`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `parent` is invalid.
-    #[allow(clippy::new_ret_no_self)]
-    fn new(
-        base_id: BaseId,
-        entries: &mut Vec<DebuggingInformationEntry>,
-        parent: Option<UnitEntryId>,
-        tag: constants::DwTag,
-    ) -> UnitEntryId {
-        let id = UnitEntryId::new(base_id, entries.len());
-        entries.push(DebuggingInformationEntry {
-            id,
-            parent,
-            tag,
-            sibling: false,
-            attrs: Vec::new(),
-            children: Vec::new(),
-        });
-        if let Some(parent) = parent {
-            debug_assert_eq!(base_id, parent.base_id);
-            assert_ne!(parent, id);
-            entries[parent.index].children.push(id);
-        }
-        id
-    }
-
-    /// Return the id of this entry.
-    #[inline]
-    pub fn id(&self) -> UnitEntryId {
-        self.id
-    }
-
-    /// Return the parent of this entry.
-    #[inline]
-    pub fn parent(&self) -> Option<UnitEntryId> {
-        self.parent
-    }
-
-    /// Return the tag of this entry.
-    #[inline]
-    pub fn tag(&self) -> constants::DwTag {
-        self.tag
-    }
-
-    /// Return `true` if a `DW_AT_sibling` attribute will be emitted.
-    #[inline]
-    pub fn sibling(&self) -> bool {
-        self.sibling
-    }
-
-    /// Set whether a `DW_AT_sibling` attribute will be emitted.
-    ///
-    /// The attribute will only be emitted if the DIE has children.
-    #[inline]
-    pub fn set_sibling(&mut self, sibling: bool) {
-        self.sibling = sibling;
-    }
-
-    /// Iterate over the attributes of this entry.
-    #[inline]
-    pub fn attrs(&self) -> slice::Iter<Attribute> {
-        self.attrs.iter()
-    }
-
-    /// Iterate over the attributes of this entry for modification.
-    #[inline]
-    pub fn attrs_mut(&mut self) -> slice::IterMut<Attribute> {
-        self.attrs.iter_mut()
-    }
-
-    /// Get an attribute.
-    pub fn get(&self, name: constants::DwAt) -> Option<&AttributeValue> {
-        self.attrs
-            .iter()
-            .find(|attr| attr.name == name)
-            .map(|attr| &attr.value)
-    }
-
-    /// Get an attribute for modification.
-    pub fn get_mut(&mut self, name: constants::DwAt) -> Option<&mut AttributeValue> {
-        self.attrs
-            .iter_mut()
-            .find(|attr| attr.name == name)
-            .map(|attr| &mut attr.value)
-    }
-
-    /// Set an attribute.
-    ///
-    /// Replaces any existing attribute with the same name.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `name` is `DW_AT_sibling`. Use `set_sibling` instead.
-    pub fn set(&mut self, name: constants::DwAt, value: AttributeValue) {
-        assert_ne!(name, constants::DW_AT_sibling);
-        if let Some(attr) = self.attrs.iter_mut().find(|attr| attr.name == name) {
-            attr.value = value;
-            return;
-        }
-        self.attrs.push(Attribute { name, value });
-    }
-
-    /// Delete an attribute.
-    ///
-    /// Replaces any existing attribute with the same name.
-    pub fn delete(&mut self, name: constants::DwAt) {
-        self.attrs.retain(|x| x.name != name);
-    }
-
-    /// Iterate over the children of this entry.
-    ///
-    /// Note: use `Unit::add` to add a new child to this entry.
-    #[inline]
-    pub fn children(&self) -> slice::Iter<UnitEntryId> {
-        self.children.iter()
-    }
-
-    /// Return the type abbreviation for this DIE.
-    fn abbreviation(&self, encoding: Encoding) -> Result<Abbreviation> {
-        let mut attrs = Vec::new();
-
-        if self.sibling && !self.children.is_empty() {
-            let form = match encoding.format {
-                Format::Dwarf32 => constants::DW_FORM_ref4,
-                Format::Dwarf64 => constants::DW_FORM_ref8,
-            };
-            attrs.push(AttributeSpecification::new(constants::DW_AT_sibling, form));
-        }
-
-        for attr in &self.attrs {
-            attrs.push(attr.specification(encoding)?);
-        }
-
-        Ok(Abbreviation::new(
-            self.tag,
-            !self.children.is_empty(),
-            attrs,
-        ))
-    }
-
-    fn calculate_offsets(
-        &self,
-        unit: &Unit,
-        offset: &mut usize,
-        offsets: &mut UnitOffsets,
-        abbrevs: &mut AbbreviationTable,
-    ) -> Result<()> {
-        offsets.entries[self.id.index].offset = DebugInfoOffset(*offset);
-        offsets.entries[self.id.index].abbrev = abbrevs.add(self.abbreviation(unit.encoding())?);
-        *offset += self.size(unit, offsets);
-        if !self.children.is_empty() {
-            for child in &self.children {
-                unit.entries[child.index].calculate_offsets(unit, offset, offsets, abbrevs)?;
-            }
-            // Null child
-            *offset += 1;
-        }
-        Ok(())
-    }
-
-    fn size(&self, unit: &Unit, offsets: &UnitOffsets) -> usize {
-        let mut size = uleb128_size(offsets.abbrev(self.id));
-        if self.sibling && !self.children.is_empty() {
-            size += unit.format().word_size() as usize;
-        }
-        for attr in &self.attrs {
-            size += attr.value.size(unit, offsets);
-        }
-        size
-    }
-
-    /// Write the entry to the given sections.
-    #[allow(clippy::too_many_arguments)]
-    fn write<W: Writer>(
-        &self,
-        w: &mut DebugInfo<W>,
-        debug_info_refs: &mut Vec<DebugInfoReference>,
-        unit_refs: &mut Vec<(DebugInfoOffset, UnitEntryId)>,
-        unit: &Unit,
-        offsets: &mut UnitOffsets,
-        abbrevs: &mut AbbreviationTable,
-        line_program: Option<DebugLineOffset>,
-        line_strings: &DebugLineStrOffsets,
-        strings: &DebugStrOffsets,
-        range_lists: &RangeListOffsets,
-        loc_lists: &LocationListOffsets,
-    ) -> Result<()> {
-        debug_assert_eq!(offsets.debug_info_offset(self.id), w.offset());
-        w.write_uleb128(offsets.abbrev(self.id))?;
-
-        let sibling_offset = if self.sibling && !self.children.is_empty() {
-            let offset = w.offset();
-            w.write_udata(0, unit.format().word_size())?;
-            Some(offset)
-        } else {
-            None
-        };
-
-        for attr in &self.attrs {
-            attr.value.write(
-                w,
-                debug_info_refs,
-                unit_refs,
-                unit,
-                offsets,
-                line_program,
-                line_strings,
-                strings,
-                range_lists,
-                loc_lists,
-            )?;
-        }
-
-        if !self.children.is_empty() {
-            for child in &self.children {
-                unit.entries[child.index].write(
-                    w,
-                    debug_info_refs,
-                    unit_refs,
-                    unit,
-                    offsets,
-                    abbrevs,
-                    line_program,
-                    line_strings,
-                    strings,
-                    range_lists,
-                    loc_lists,
-                )?;
-            }
-            // Null child
-            w.write_u8(0)?;
-        }
-
-        if let Some(offset) = sibling_offset {
-            let next_offset = (w.offset().0 - offsets.unit.0) as u64;
-            // This does not need relocation.
-            w.write_udata_at(offset.0, next_offset, unit.format().word_size())?;
-        }
-        Ok(())
-    }
-}
-
-/// An attribute in a `DebuggingInformationEntry`, consisting of a name and
-/// associated value.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Attribute {
-    name: constants::DwAt,
-    value: AttributeValue,
-}
-
-impl Attribute {
-    /// Get the name of this attribute.
-    #[inline]
-    pub fn name(&self) -> constants::DwAt {
-        self.name
-    }
-
-    /// Get the value of this attribute.
-    #[inline]
-    pub fn get(&self) -> &AttributeValue {
-        &self.value
-    }
-
-    /// Set the value of this attribute.
-    #[inline]
-    pub fn set(&mut self, value: AttributeValue) {
-        self.value = value;
-    }
-
-    /// Return the type specification for this attribute.
-    fn specification(&self, encoding: Encoding) -> Result<AttributeSpecification> {
-        Ok(AttributeSpecification::new(
-            self.name,
-            self.value.form(encoding)?,
-        ))
-    }
-}
-
-/// The value of an attribute in a `DebuggingInformationEntry`.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum AttributeValue {
-    /// "Refers to some location in the address space of the described program."
-    Address(Address),
-
-    /// A slice of an arbitrary number of bytes.
-    Block(Vec<u8>),
-
-    /// A one byte constant data value. How to interpret the byte depends on context.
-    ///
-    /// From section 7 of the standard: "Depending on context, it may be a
-    /// signed integer, an unsigned integer, a floating-point constant, or
-    /// anything else."
-    Data1(u8),
-
-    /// A two byte constant data value. How to interpret the bytes depends on context.
-    ///
-    /// This value will be converted to the target endian before writing.
-    ///
-    /// From section 7 of the standard: "Depending on context, it may be a
-    /// signed integer, an unsigned integer, a floating-point constant, or
-    /// anything else."
-    Data2(u16),
-
-    /// A four byte constant data value. How to interpret the bytes depends on context.
-    ///
-    /// This value will be converted to the target endian before writing.
-    ///
-    /// From section 7 of the standard: "Depending on context, it may be a
-    /// signed integer, an unsigned integer, a floating-point constant, or
-    /// anything else."
-    Data4(u32),
-
-    /// An eight byte constant data value. How to interpret the bytes depends on context.
-    ///
-    /// This value will be converted to the target endian before writing.
-    ///
-    /// From section 7 of the standard: "Depending on context, it may be a
-    /// signed integer, an unsigned integer, a floating-point constant, or
-    /// anything else."
-    Data8(u64),
-
-    /// A signed integer constant.
-    Sdata(i64),
-
-    /// An unsigned integer constant.
-    Udata(u64),
-
-    /// "The information bytes contain a DWARF expression (see Section 2.5) or
-    /// location description (see Section 2.6)."
-    Exprloc(Expression),
-
-    /// A boolean that indicates presence or absence of the attribute.
-    Flag(bool),
-
-    /// An attribute that is always present.
-    FlagPresent,
-
-    /// A reference to a `DebuggingInformationEntry` in this unit.
-    UnitRef(UnitEntryId),
-
-    /// A reference to a `DebuggingInformationEntry` in a potentially different unit.
-    DebugInfoRef(Reference),
-
-    /// An offset into the `.debug_info` section of the supplementary object file.
-    ///
-    /// The API does not currently assist with generating this offset.
-    /// This variant will be removed from the API once support for writing
-    /// supplementary object files is implemented.
-    DebugInfoRefSup(DebugInfoOffset),
-
-    /// A reference to a line number program.
-    LineProgramRef,
-
-    /// A reference to a location list.
-    LocationListRef(LocationListId),
-
-    /// An offset into the `.debug_macinfo` section.
-    ///
-    /// The API does not currently assist with generating this offset.
-    /// This variant will be removed from the API once support for writing
-    /// `.debug_macinfo` sections is implemented.
-    DebugMacinfoRef(DebugMacinfoOffset),
-
-    /// An offset into the `.debug_macro` section.
-    ///
-    /// The API does not currently assist with generating this offset.
-    /// This variant will be removed from the API once support for writing
-    /// `.debug_macro` sections is implemented.
-    DebugMacroRef(DebugMacroOffset),
-
-    /// A reference to a range list.
-    RangeListRef(RangeListId),
-
-    /// A type signature.
-    ///
-    /// The API does not currently assist with generating this signature.
-    /// This variant will be removed from the API once support for writing
-    /// `.debug_types` sections is implemented.
-    DebugTypesRef(DebugTypeSignature),
-
-    /// A reference to a string in the `.debug_str` section.
-    StringRef(StringId),
-
-    /// An offset into the `.debug_str` section of the supplementary object file.
-    ///
-    /// The API does not currently assist with generating this offset.
-    /// This variant will be removed from the API once support for writing
-    /// supplementary object files is implemented.
-    DebugStrRefSup(DebugStrOffset),
-
-    /// A reference to a string in the `.debug_line_str` section.
-    LineStringRef(LineStringId),
-
-    /// A slice of bytes representing a string. Must not include null bytes.
-    /// Not guaranteed to be UTF-8 or anything like that.
-    String(Vec<u8>),
-
-    /// The value of a `DW_AT_encoding` attribute.
-    Encoding(constants::DwAte),
-
-    /// The value of a `DW_AT_decimal_sign` attribute.
-    DecimalSign(constants::DwDs),
-
-    /// The value of a `DW_AT_endianity` attribute.
-    Endianity(constants::DwEnd),
-
-    /// The value of a `DW_AT_accessibility` attribute.
-    Accessibility(constants::DwAccess),
-
-    /// The value of a `DW_AT_visibility` attribute.
-    Visibility(constants::DwVis),
-
-    /// The value of a `DW_AT_virtuality` attribute.
-    Virtuality(constants::DwVirtuality),
-
-    /// The value of a `DW_AT_language` attribute.
-    Language(constants::DwLang),
-
-    /// The value of a `DW_AT_address_class` attribute.
-    AddressClass(constants::DwAddr),
-
-    /// The value of a `DW_AT_identifier_case` attribute.
-    IdentifierCase(constants::DwId),
-
-    /// The value of a `DW_AT_calling_convention` attribute.
-    CallingConvention(constants::DwCc),
-
-    /// The value of a `DW_AT_inline` attribute.
-    Inline(constants::DwInl),
-
-    /// The value of a `DW_AT_ordering` attribute.
-    Ordering(constants::DwOrd),
-
-    /// An index into the filename entries from the line number information
-    /// table for the unit containing this value.
-    FileIndex(Option<FileId>),
-}
-
-impl AttributeValue {
-    /// Return the form that will be used to encode this value.
-    pub fn form(&self, encoding: Encoding) -> Result<constants::DwForm> {
-        // TODO: missing forms:
-        // - DW_FORM_indirect
-        // - DW_FORM_implicit_const
-        // - FW_FORM_block1/block2/block4
-        // - DW_FORM_str/strx1/strx2/strx3/strx4
-        // - DW_FORM_addrx/addrx1/addrx2/addrx3/addrx4
-        // - DW_FORM_data16
-        // - DW_FORM_line_strp
-        // - DW_FORM_loclistx
-        // - DW_FORM_rnglistx
-        let form = match *self {
-            AttributeValue::Address(_) => constants::DW_FORM_addr,
-            AttributeValue::Block(_) => constants::DW_FORM_block,
-            AttributeValue::Data1(_) => constants::DW_FORM_data1,
-            AttributeValue::Data2(_) => constants::DW_FORM_data2,
-            AttributeValue::Data4(_) => constants::DW_FORM_data4,
-            AttributeValue::Data8(_) => constants::DW_FORM_data8,
-            AttributeValue::Exprloc(_) => constants::DW_FORM_exprloc,
-            AttributeValue::Flag(_) => constants::DW_FORM_flag,
-            AttributeValue::FlagPresent => constants::DW_FORM_flag_present,
-            AttributeValue::UnitRef(_) => {
-                // Using a fixed size format lets us write a placeholder before we know
-                // the value.
-                match encoding.format {
-                    Format::Dwarf32 => constants::DW_FORM_ref4,
-                    Format::Dwarf64 => constants::DW_FORM_ref8,
-                }
-            }
-            AttributeValue::DebugInfoRef(_) => constants::DW_FORM_ref_addr,
-            AttributeValue::DebugInfoRefSup(_) => {
-                // TODO: should this depend on the size of supplementary section?
-                match encoding.format {
-                    Format::Dwarf32 => constants::DW_FORM_ref_sup4,
-                    Format::Dwarf64 => constants::DW_FORM_ref_sup8,
-                }
-            }
-            AttributeValue::LineProgramRef
-            | AttributeValue::LocationListRef(_)
-            | AttributeValue::DebugMacinfoRef(_)
-            | AttributeValue::DebugMacroRef(_)
-            | AttributeValue::RangeListRef(_) => {
-                if encoding.version == 2 || encoding.version == 3 {
-                    match encoding.format {
-                        Format::Dwarf32 => constants::DW_FORM_data4,
-                        Format::Dwarf64 => constants::DW_FORM_data8,
-                    }
-                } else {
-                    constants::DW_FORM_sec_offset
-                }
-            }
-            AttributeValue::DebugTypesRef(_) => constants::DW_FORM_ref_sig8,
-            AttributeValue::StringRef(_) => constants::DW_FORM_strp,
-            AttributeValue::DebugStrRefSup(_) => constants::DW_FORM_strp_sup,
-            AttributeValue::LineStringRef(_) => constants::DW_FORM_line_strp,
-            AttributeValue::String(_) => constants::DW_FORM_string,
-            AttributeValue::Encoding(_)
-            | AttributeValue::DecimalSign(_)
-            | AttributeValue::Endianity(_)
-            | AttributeValue::Accessibility(_)
-            | AttributeValue::Visibility(_)
-            | AttributeValue::Virtuality(_)
-            | AttributeValue::Language(_)
-            | AttributeValue::AddressClass(_)
-            | AttributeValue::IdentifierCase(_)
-            | AttributeValue::CallingConvention(_)
-            | AttributeValue::Inline(_)
-            | AttributeValue::Ordering(_)
-            | AttributeValue::FileIndex(_)
-            | AttributeValue::Udata(_) => constants::DW_FORM_udata,
-            AttributeValue::Sdata(_) => constants::DW_FORM_sdata,
-        };
-        Ok(form)
-    }
-
-    fn size(&self, unit: &Unit, offsets: &UnitOffsets) -> usize {
-        macro_rules! debug_assert_form {
-            ($form:expr) => {
-                debug_assert_eq!(self.form(unit.encoding()).unwrap(), $form)
-            };
-        }
-        match *self {
-            AttributeValue::Address(_) => {
-                debug_assert_form!(constants::DW_FORM_addr);
-                unit.address_size() as usize
-            }
-            AttributeValue::Block(ref val) => {
-                debug_assert_form!(constants::DW_FORM_block);
-                uleb128_size(val.len() as u64) + val.len()
-            }
-            AttributeValue::Data1(_) => {
-                debug_assert_form!(constants::DW_FORM_data1);
-                1
-            }
-            AttributeValue::Data2(_) => {
-                debug_assert_form!(constants::DW_FORM_data2);
-                2
-            }
-            AttributeValue::Data4(_) => {
-                debug_assert_form!(constants::DW_FORM_data4);
-                4
-            }
-            AttributeValue::Data8(_) => {
-                debug_assert_form!(constants::DW_FORM_data8);
-                8
-            }
-            AttributeValue::Sdata(val) => {
-                debug_assert_form!(constants::DW_FORM_sdata);
-                sleb128_size(val)
-            }
-            AttributeValue::Udata(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val)
-            }
-            AttributeValue::Exprloc(ref val) => {
-                debug_assert_form!(constants::DW_FORM_exprloc);
-                let size = val.size(unit.encoding(), Some(offsets));
-                uleb128_size(size as u64) + size
-            }
-            AttributeValue::Flag(_) => {
-                debug_assert_form!(constants::DW_FORM_flag);
-                1
-            }
-            AttributeValue::FlagPresent => {
-                debug_assert_form!(constants::DW_FORM_flag_present);
-                0
-            }
-            AttributeValue::UnitRef(_) => {
-                match unit.format() {
-                    Format::Dwarf32 => debug_assert_form!(constants::DW_FORM_ref4),
-                    Format::Dwarf64 => debug_assert_form!(constants::DW_FORM_ref8),
-                }
-                unit.format().word_size() as usize
-            }
-            AttributeValue::DebugInfoRef(_) => {
-                debug_assert_form!(constants::DW_FORM_ref_addr);
-                if unit.version() == 2 {
-                    unit.address_size() as usize
-                } else {
-                    unit.format().word_size() as usize
-                }
-            }
-            AttributeValue::DebugInfoRefSup(_) => {
-                match unit.format() {
-                    Format::Dwarf32 => debug_assert_form!(constants::DW_FORM_ref_sup4),
-                    Format::Dwarf64 => debug_assert_form!(constants::DW_FORM_ref_sup8),
-                }
-                unit.format().word_size() as usize
-            }
-            AttributeValue::LineProgramRef => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                unit.format().word_size() as usize
-            }
-            AttributeValue::LocationListRef(_) => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                unit.format().word_size() as usize
-            }
-            AttributeValue::DebugMacinfoRef(_) => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                unit.format().word_size() as usize
-            }
-            AttributeValue::DebugMacroRef(_) => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                unit.format().word_size() as usize
-            }
-            AttributeValue::RangeListRef(_) => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                unit.format().word_size() as usize
-            }
-            AttributeValue::DebugTypesRef(_) => {
-                debug_assert_form!(constants::DW_FORM_ref_sig8);
-                8
-            }
-            AttributeValue::StringRef(_) => {
-                debug_assert_form!(constants::DW_FORM_strp);
-                unit.format().word_size() as usize
-            }
-            AttributeValue::DebugStrRefSup(_) => {
-                debug_assert_form!(constants::DW_FORM_strp_sup);
-                unit.format().word_size() as usize
-            }
-            AttributeValue::LineStringRef(_) => {
-                debug_assert_form!(constants::DW_FORM_line_strp);
-                unit.format().word_size() as usize
-            }
-            AttributeValue::String(ref val) => {
-                debug_assert_form!(constants::DW_FORM_string);
-                val.len() + 1
-            }
-            AttributeValue::Encoding(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::DecimalSign(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::Endianity(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::Accessibility(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::Visibility(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::Virtuality(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::Language(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::AddressClass(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::IdentifierCase(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::CallingConvention(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::Inline(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::Ordering(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.0 as u64)
-            }
-            AttributeValue::FileIndex(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                uleb128_size(val.map(FileId::raw).unwrap_or(0))
-            }
-        }
-    }
-
-    /// Write the attribute value to the given sections.
-    #[allow(clippy::cyclomatic_complexity, clippy::too_many_arguments)]
-    fn write<W: Writer>(
-        &self,
-        w: &mut DebugInfo<W>,
-        debug_info_refs: &mut Vec<DebugInfoReference>,
-        unit_refs: &mut Vec<(DebugInfoOffset, UnitEntryId)>,
-        unit: &Unit,
-        offsets: &UnitOffsets,
-        line_program: Option<DebugLineOffset>,
-        line_strings: &DebugLineStrOffsets,
-        strings: &DebugStrOffsets,
-        range_lists: &RangeListOffsets,
-        loc_lists: &LocationListOffsets,
-    ) -> Result<()> {
-        macro_rules! debug_assert_form {
-            ($form:expr) => {
-                debug_assert_eq!(self.form(unit.encoding()).unwrap(), $form)
-            };
-        }
-        match *self {
-            AttributeValue::Address(val) => {
-                debug_assert_form!(constants::DW_FORM_addr);
-                w.write_address(val, unit.address_size())?;
-            }
-            AttributeValue::Block(ref val) => {
-                debug_assert_form!(constants::DW_FORM_block);
-                w.write_uleb128(val.len() as u64)?;
-                w.write(&val)?;
-            }
-            AttributeValue::Data1(val) => {
-                debug_assert_form!(constants::DW_FORM_data1);
-                w.write_u8(val)?;
-            }
-            AttributeValue::Data2(val) => {
-                debug_assert_form!(constants::DW_FORM_data2);
-                w.write_u16(val)?;
-            }
-            AttributeValue::Data4(val) => {
-                debug_assert_form!(constants::DW_FORM_data4);
-                w.write_u32(val)?;
-            }
-            AttributeValue::Data8(val) => {
-                debug_assert_form!(constants::DW_FORM_data8);
-                w.write_u64(val)?;
-            }
-            AttributeValue::Sdata(val) => {
-                debug_assert_form!(constants::DW_FORM_sdata);
-                w.write_sleb128(val)?;
-            }
-            AttributeValue::Udata(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(val)?;
-            }
-            AttributeValue::Exprloc(ref val) => {
-                debug_assert_form!(constants::DW_FORM_exprloc);
-                w.write_uleb128(val.size(unit.encoding(), Some(offsets)) as u64)?;
-                val.write(
-                    &mut w.0,
-                    Some(debug_info_refs),
-                    unit.encoding(),
-                    Some(offsets),
-                )?;
-            }
-            AttributeValue::Flag(val) => {
-                debug_assert_form!(constants::DW_FORM_flag);
-                w.write_u8(val as u8)?;
-            }
-            AttributeValue::FlagPresent => {
-                debug_assert_form!(constants::DW_FORM_flag_present);
-            }
-            AttributeValue::UnitRef(id) => {
-                match unit.format() {
-                    Format::Dwarf32 => debug_assert_form!(constants::DW_FORM_ref4),
-                    Format::Dwarf64 => debug_assert_form!(constants::DW_FORM_ref8),
-                }
-                unit_refs.push((w.offset(), id));
-                w.write_udata(0, unit.format().word_size())?;
-            }
-            AttributeValue::DebugInfoRef(reference) => {
-                debug_assert_form!(constants::DW_FORM_ref_addr);
-                let size = if unit.version() == 2 {
-                    unit.address_size()
-                } else {
-                    unit.format().word_size()
-                };
-                match reference {
-                    Reference::Symbol(symbol) => w.write_reference(symbol, size)?,
-                    Reference::Entry(unit, entry) => {
-                        debug_info_refs.push(DebugInfoReference {
-                            offset: w.len(),
-                            unit,
-                            entry,
-                            size,
-                        });
-                        w.write_udata(0, size)?;
-                    }
-                }
-            }
-            AttributeValue::DebugInfoRefSup(val) => {
-                match unit.format() {
-                    Format::Dwarf32 => debug_assert_form!(constants::DW_FORM_ref_sup4),
-                    Format::Dwarf64 => debug_assert_form!(constants::DW_FORM_ref_sup8),
-                }
-                w.write_udata(val.0 as u64, unit.format().word_size())?;
-            }
-            AttributeValue::LineProgramRef => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                match line_program {
-                    Some(line_program) => {
-                        w.write_offset(
-                            line_program.0,
-                            SectionId::DebugLine,
-                            unit.format().word_size(),
-                        )?;
-                    }
-                    None => return Err(Error::InvalidAttributeValue),
-                }
-            }
-            AttributeValue::LocationListRef(val) => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                let section = if unit.version() <= 4 {
-                    SectionId::DebugLoc
-                } else {
-                    SectionId::DebugLocLists
-                };
-                w.write_offset(loc_lists.get(val).0, section, unit.format().word_size())?;
-            }
-            AttributeValue::DebugMacinfoRef(val) => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                w.write_offset(val.0, SectionId::DebugMacinfo, unit.format().word_size())?;
-            }
-            AttributeValue::DebugMacroRef(val) => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                w.write_offset(val.0, SectionId::DebugMacro, unit.format().word_size())?;
-            }
-            AttributeValue::RangeListRef(val) => {
-                if unit.version() >= 4 {
-                    debug_assert_form!(constants::DW_FORM_sec_offset);
-                }
-                let section = if unit.version() <= 4 {
-                    SectionId::DebugRanges
-                } else {
-                    SectionId::DebugRngLists
-                };
-                w.write_offset(range_lists.get(val).0, section, unit.format().word_size())?;
-            }
-            AttributeValue::DebugTypesRef(val) => {
-                debug_assert_form!(constants::DW_FORM_ref_sig8);
-                w.write_u64(val.0)?;
-            }
-            AttributeValue::StringRef(val) => {
-                debug_assert_form!(constants::DW_FORM_strp);
-                w.write_offset(
-                    strings.get(val).0,
-                    SectionId::DebugStr,
-                    unit.format().word_size(),
-                )?;
-            }
-            AttributeValue::DebugStrRefSup(val) => {
-                debug_assert_form!(constants::DW_FORM_strp_sup);
-                w.write_udata(val.0 as u64, unit.format().word_size())?;
-            }
-            AttributeValue::LineStringRef(val) => {
-                debug_assert_form!(constants::DW_FORM_line_strp);
-                w.write_offset(
-                    line_strings.get(val).0,
-                    SectionId::DebugLineStr,
-                    unit.format().word_size(),
-                )?;
-            }
-            AttributeValue::String(ref val) => {
-                debug_assert_form!(constants::DW_FORM_string);
-                w.write(&val)?;
-                w.write_u8(0)?;
-            }
-            AttributeValue::Encoding(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::DecimalSign(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::Endianity(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::Accessibility(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::Visibility(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::Virtuality(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::Language(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::AddressClass(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(val.0)?;
-            }
-            AttributeValue::IdentifierCase(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::CallingConvention(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::Inline(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::Ordering(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(u64::from(val.0))?;
-            }
-            AttributeValue::FileIndex(val) => {
-                debug_assert_form!(constants::DW_FORM_udata);
-                w.write_uleb128(val.map(FileId::raw).unwrap_or(0))?;
-            }
-        }
-        Ok(())
-    }
-}
-
-define_section!(
-    DebugInfo,
-    DebugInfoOffset,
-    "A writable `.debug_info` section."
-);
-
-/// The section offsets of all elements within a `.debug_info` section.
-#[derive(Debug, Default)]
-pub struct DebugInfoOffsets {
-    base_id: BaseId,
-    units: Vec<UnitOffsets>,
-}
-
-impl DebugInfoOffsets {
-    #[cfg(test)]
-    pub(crate) fn unit_offsets(&self, unit: UnitId) -> &UnitOffsets {
-        debug_assert_eq!(self.base_id, unit.base_id);
-        &self.units[unit.index]
-    }
-
-    /// Get the `.debug_info` section offset for the given unit.
-    #[inline]
-    pub fn unit(&self, unit: UnitId) -> DebugInfoOffset {
-        debug_assert_eq!(self.base_id, unit.base_id);
-        self.units[unit.index].unit
-    }
-
-    /// Get the `.debug_info` section offset for the given entry.
-    #[inline]
-    pub fn entry(&self, unit: UnitId, entry: UnitEntryId) -> DebugInfoOffset {
-        debug_assert_eq!(self.base_id, unit.base_id);
-        self.units[unit.index].debug_info_offset(entry)
-    }
-}
-
-/// The section offsets of all elements of a unit within a `.debug_info` section.
-#[derive(Debug)]
-pub(crate) struct UnitOffsets {
-    base_id: BaseId,
-    unit: DebugInfoOffset,
-    entries: Vec<EntryOffset>,
-}
-
-impl UnitOffsets {
-    #[cfg(test)]
-    fn none() -> Self {
-        UnitOffsets {
-            base_id: BaseId::default(),
-            unit: DebugInfoOffset(0),
-            entries: Vec::new(),
-        }
-    }
-
-    /// Get the .debug_info offset for the given entry.
-    #[inline]
-    pub(crate) fn debug_info_offset(&self, entry: UnitEntryId) -> DebugInfoOffset {
-        debug_assert_eq!(self.base_id, entry.base_id);
-        let offset = self.entries[entry.index].offset;
-        debug_assert_ne!(offset.0, 0);
-        offset
-    }
-
-    /// Get the unit offset for the given entry.
-    #[inline]
-    pub(crate) fn unit_offset(&self, entry: UnitEntryId) -> u64 {
-        let offset = self.debug_info_offset(entry);
-        (offset.0 - self.unit.0) as u64
-    }
-
-    /// Get the abbreviation code for the given entry.
-    #[inline]
-    pub(crate) fn abbrev(&self, entry: UnitEntryId) -> u64 {
-        debug_assert_eq!(self.base_id, entry.base_id);
-        self.entries[entry.index].abbrev
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct EntryOffset {
-    offset: DebugInfoOffset,
-    abbrev: u64,
-}
-
-impl EntryOffset {
-    fn none() -> Self {
-        EntryOffset {
-            offset: DebugInfoOffset(0),
-            abbrev: 0,
-        }
-    }
-}
-
-/// A reference to a `.debug_info` entry that has yet to be resolved.
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct DebugInfoReference {
-    /// The offset within the section of the reference.
-    pub offset: usize,
-    /// The size of the reference.
-    pub size: u8,
-    /// The unit containing the entry.
-    pub unit: UnitId,
-    /// The entry being referenced.
-    pub entry: UnitEntryId,
-}
-
-#[cfg(feature = "read")]
-pub(crate) mod convert {
-    use super::*;
-    use crate::common::UnitSectionOffset;
-    use crate::read::{self, Reader};
-    use crate::write::{self, ConvertError, ConvertResult, LocationList, RangeList};
-    use std::collections::HashMap;
-
-    pub(crate) struct ConvertUnit<R: Reader<Offset = usize>> {
-        from_unit: read::Unit<R>,
-        base_id: BaseId,
-        encoding: Encoding,
-        entries: Vec<DebuggingInformationEntry>,
-        entry_offsets: Vec<read::UnitOffset>,
-        root: UnitEntryId,
-    }
-
-    pub(crate) struct ConvertUnitContext<'a, R: Reader<Offset = usize>> {
-        pub dwarf: &'a read::Dwarf<R>,
-        pub unit: &'a read::Unit<R>,
-        pub line_strings: &'a mut write::LineStringTable,
-        pub strings: &'a mut write::StringTable,
-        pub ranges: &'a mut write::RangeListTable,
-        pub locations: &'a mut write::LocationListTable,
-        pub convert_address: &'a dyn Fn(u64) -> Option<Address>,
-        pub base_address: Address,
-        pub line_program_offset: Option<DebugLineOffset>,
-        pub line_program_files: Vec<FileId>,
-        pub entry_ids: &'a HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>,
-    }
-
-    impl UnitTable {
-        /// Create a unit table by reading the data in the given sections.
-        ///
-        /// This also updates the given tables with the values that are referenced from
-        /// attributes in this section.
-        ///
-        /// `convert_address` is a function to convert read addresses into the `Address`
-        /// type. For non-relocatable addresses, this function may simply return
-        /// `Address::Constant(address)`. For relocatable addresses, it is the caller's
-        /// responsibility to determine the symbol and addend corresponding to the address
-        /// and return `Address::Symbol { symbol, addend }`.
-        pub fn from<R: Reader<Offset = usize>>(
-            dwarf: &read::Dwarf<R>,
-            line_strings: &mut write::LineStringTable,
-            strings: &mut write::StringTable,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-        ) -> ConvertResult<UnitTable> {
-            let base_id = BaseId::default();
-            let mut unit_entries = Vec::new();
-            let mut entry_ids = HashMap::new();
-
-            let mut from_units = dwarf.units();
-            while let Some(from_unit) = from_units.next()? {
-                let unit_id = UnitId::new(base_id, unit_entries.len());
-                unit_entries.push(Unit::convert_entries(
-                    from_unit,
-                    unit_id,
-                    &mut entry_ids,
-                    dwarf,
-                )?);
-            }
-
-            // Attributes must be converted in a separate pass so that we can handle
-            // references to other compilation units.
-            let mut units = Vec::new();
-            for unit_entries in unit_entries.drain(..) {
-                units.push(Unit::convert_attributes(
-                    unit_entries,
-                    &entry_ids,
-                    dwarf,
-                    line_strings,
-                    strings,
-                    convert_address,
-                )?);
-            }
-
-            Ok(UnitTable { base_id, units })
-        }
-    }
-
-    impl Unit {
-        /// Create a unit by reading the data in the input sections.
-        ///
-        /// Does not add entry attributes.
-        #[allow(clippy::too_many_arguments)]
-        pub(crate) fn convert_entries<R: Reader<Offset = usize>>(
-            from_header: read::CompilationUnitHeader<R>,
-            unit_id: UnitId,
-            entry_ids: &mut HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>,
-            dwarf: &read::Dwarf<R>,
-        ) -> ConvertResult<ConvertUnit<R>> {
-            let base_id = BaseId::default();
-
-            let from_unit = dwarf.unit(from_header)?;
-            let encoding = from_unit.encoding();
-
-            let mut entries = Vec::new();
-            let mut entry_offsets = Vec::new();
-
-            let mut from_tree = from_unit.entries_tree(None)?;
-            let from_root = from_tree.root()?;
-            let root = DebuggingInformationEntry::convert_entry(
-                from_root,
-                &from_unit,
-                base_id,
-                &mut entries,
-                &mut entry_offsets,
-                entry_ids,
-                None,
-                unit_id,
-            )?;
-
-            Ok(ConvertUnit {
-                from_unit,
-                base_id,
-                encoding,
-                entries,
-                entry_offsets,
-                root,
-            })
-        }
-
-        /// Create entry attributes by reading the data in the input sections.
-        fn convert_attributes<R: Reader<Offset = usize>>(
-            unit: ConvertUnit<R>,
-            entry_ids: &HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>,
-            dwarf: &read::Dwarf<R>,
-            line_strings: &mut write::LineStringTable,
-            strings: &mut write::StringTable,
-            convert_address: &dyn Fn(u64) -> Option<Address>,
-        ) -> ConvertResult<Unit> {
-            let from_unit = unit.from_unit;
-            let base_address =
-                convert_address(from_unit.low_pc).ok_or(ConvertError::InvalidAddress)?;
-
-            let (line_program_offset, line_program, line_program_files) =
-                match from_unit.line_program {
-                    Some(ref from_program) => {
-                        let from_program = from_program.clone();
-                        let line_program_offset = from_program.header().offset();
-                        let (line_program, line_program_files) = LineProgram::from(
-                            from_program,
-                            dwarf,
-                            line_strings,
-                            strings,
-                            convert_address,
-                        )?;
-                        (Some(line_program_offset), line_program, line_program_files)
-                    }
-                    None => (None, LineProgram::none(), Vec::new()),
-                };
-
-            let mut ranges = RangeListTable::default();
-            let mut locations = LocationListTable::default();
-
-            let mut context = ConvertUnitContext {
-                entry_ids,
-                dwarf,
-                unit: &from_unit,
-                line_strings,
-                strings,
-                ranges: &mut ranges,
-                locations: &mut locations,
-                convert_address,
-                base_address,
-                line_program_offset,
-                line_program_files,
-            };
-
-            let mut entries = unit.entries;
-            for entry in &mut entries {
-                entry.convert_attributes(&mut context, &unit.entry_offsets)?;
-            }
-
-            Ok(Unit {
-                base_id: unit.base_id,
-                encoding: unit.encoding,
-                line_program,
-                ranges,
-                locations,
-                entries,
-                root: unit.root,
-            })
-        }
-    }
-
-    impl DebuggingInformationEntry {
-        /// Create an entry by reading the data in the input sections.
-        ///
-        /// Does not add the entry attributes.
-        fn convert_entry<R: Reader<Offset = usize>>(
-            from: read::EntriesTreeNode<R>,
-            from_unit: &read::Unit<R>,
-            base_id: BaseId,
-            entries: &mut Vec<DebuggingInformationEntry>,
-            entry_offsets: &mut Vec<read::UnitOffset>,
-            entry_ids: &mut HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>,
-            parent: Option<UnitEntryId>,
-            unit_id: UnitId,
-        ) -> ConvertResult<UnitEntryId> {
-            let from_entry = from.entry();
-            let id = DebuggingInformationEntry::new(base_id, entries, parent, from_entry.tag());
-            let offset = from_entry.offset();
-            entry_offsets.push(offset);
-            entry_ids.insert(offset.to_unit_section_offset(from_unit), (unit_id, id));
-
-            let mut from_children = from.children();
-            while let Some(from_child) = from_children.next()? {
-                DebuggingInformationEntry::convert_entry(
-                    from_child,
-                    from_unit,
-                    base_id,
-                    entries,
-                    entry_offsets,
-                    entry_ids,
-                    Some(id),
-                    unit_id,
-                )?;
-            }
-            Ok(id)
-        }
-
-        /// Create an entry's attributes by reading the data in the input sections.
-        fn convert_attributes<R: Reader<Offset = usize>>(
-            &mut self,
-            context: &mut ConvertUnitContext<R>,
-            entry_offsets: &[read::UnitOffset],
-        ) -> ConvertResult<()> {
-            let offset = entry_offsets[self.id.index];
-            let from = context.unit.entry(offset)?;
-            let mut from_attrs = from.attrs();
-            while let Some(from_attr) = from_attrs.next()? {
-                if from_attr.name() == constants::DW_AT_sibling {
-                    // This may point to a null entry, so we have to treat it differently.
-                    self.set_sibling(true);
-                } else if let Some(attr) = Attribute::from(context, &from_attr)? {
-                    self.set(attr.name, attr.value);
-                }
-            }
-            Ok(())
-        }
-    }
-
-    impl Attribute {
-        /// Create an attribute by reading the data in the given sections.
-        pub(crate) fn from<R: Reader<Offset = usize>>(
-            context: &mut ConvertUnitContext<R>,
-            from: &read::Attribute<R>,
-        ) -> ConvertResult<Option<Attribute>> {
-            let value = AttributeValue::from(context, from.value())?;
-            Ok(value.map(|value| Attribute {
-                name: from.name(),
-                value,
-            }))
-        }
-    }
-
-    impl AttributeValue {
-        /// Create an attribute value by reading the data in the given sections.
-        pub(crate) fn from<R: Reader<Offset = usize>>(
-            context: &mut ConvertUnitContext<R>,
-            from: read::AttributeValue<R>,
-        ) -> ConvertResult<Option<AttributeValue>> {
-            let to = match from {
-                read::AttributeValue::Addr(val) => match (context.convert_address)(val) {
-                    Some(val) => AttributeValue::Address(val),
-                    None => return Err(ConvertError::InvalidAddress),
-                },
-                read::AttributeValue::Block(r) => AttributeValue::Block(r.to_slice()?.into()),
-                read::AttributeValue::Data1(val) => AttributeValue::Data1(val),
-                read::AttributeValue::Data2(val) => AttributeValue::Data2(val),
-                read::AttributeValue::Data4(val) => AttributeValue::Data4(val),
-                read::AttributeValue::Data8(val) => AttributeValue::Data8(val),
-                read::AttributeValue::Sdata(val) => AttributeValue::Sdata(val),
-                read::AttributeValue::Udata(val) => AttributeValue::Udata(val),
-                read::AttributeValue::Exprloc(expression) => {
-                    let expression = Expression::from(
-                        expression,
-                        context.unit.encoding(),
-                        Some(context.dwarf),
-                        Some(context.unit),
-                        Some(context.entry_ids),
-                        context.convert_address,
-                    )?;
-                    AttributeValue::Exprloc(expression)
-                }
-                // TODO: it would be nice to preserve the flag form.
-                read::AttributeValue::Flag(val) => AttributeValue::Flag(val),
-                read::AttributeValue::DebugAddrBase(_base) => {
-                    // We convert all address indices to addresses,
-                    // so this is unneeded.
-                    return Ok(None);
-                }
-                read::AttributeValue::DebugAddrIndex(index) => {
-                    let val = context.dwarf.address(context.unit, index)?;
-                    match (context.convert_address)(val) {
-                        Some(val) => AttributeValue::Address(val),
-                        None => return Err(ConvertError::InvalidAddress),
-                    }
-                }
-                read::AttributeValue::UnitRef(val) => {
-                    if !context.unit.header.is_valid_offset(val) {
-                        return Err(ConvertError::InvalidUnitRef);
-                    }
-                    let id = context
-                        .entry_ids
-                        .get(&val.to_unit_section_offset(context.unit))
-                        .ok_or(ConvertError::InvalidUnitRef)?;
-                    AttributeValue::UnitRef(id.1)
-                }
-                read::AttributeValue::DebugInfoRef(val) => {
-                    // TODO: support relocation of this value
-                    let id = context
-                        .entry_ids
-                        .get(&UnitSectionOffset::DebugInfoOffset(val))
-                        .ok_or(ConvertError::InvalidDebugInfoRef)?;
-                    AttributeValue::DebugInfoRef(Reference::Entry(id.0, id.1))
-                }
-                read::AttributeValue::DebugInfoRefSup(val) => AttributeValue::DebugInfoRefSup(val),
-                read::AttributeValue::DebugLineRef(val) => {
-                    // There should only be the line program in the CU DIE which we've already
-                    // converted, so check if it matches that.
-                    if Some(val) == context.line_program_offset {
-                        AttributeValue::LineProgramRef
-                    } else {
-                        return Err(ConvertError::InvalidLineRef);
-                    }
-                }
-                read::AttributeValue::DebugMacinfoRef(val) => AttributeValue::DebugMacinfoRef(val),
-                read::AttributeValue::DebugMacroRef(val) => AttributeValue::DebugMacroRef(val),
-                read::AttributeValue::LocationListsRef(val) => {
-                    let iter = context
-                        .dwarf
-                        .locations
-                        .raw_locations(val, context.unit.encoding())?;
-                    let loc_list = LocationList::from(iter, context)?;
-                    let loc_id = context.locations.add(loc_list);
-                    AttributeValue::LocationListRef(loc_id)
-                }
-                read::AttributeValue::DebugLocListsBase(_base) => {
-                    // We convert all location list indices to offsets,
-                    // so this is unneeded.
-                    return Ok(None);
-                }
-                read::AttributeValue::DebugLocListsIndex(index) => {
-                    let offset = context.dwarf.locations_offset(context.unit, index)?;
-                    let iter = context
-                        .dwarf
-                        .locations
-                        .raw_locations(offset, context.unit.encoding())?;
-                    let loc_list = LocationList::from(iter, context)?;
-                    let loc_id = context.locations.add(loc_list);
-                    AttributeValue::LocationListRef(loc_id)
-                }
-                read::AttributeValue::RangeListsRef(val) => {
-                    let iter = context
-                        .dwarf
-                        .ranges
-                        .raw_ranges(val, context.unit.encoding())?;
-                    let range_list = RangeList::from(iter, context)?;
-                    let range_id = context.ranges.add(range_list);
-                    AttributeValue::RangeListRef(range_id)
-                }
-                read::AttributeValue::DebugRngListsBase(_base) => {
-                    // We convert all range list indices to offsets,
-                    // so this is unneeded.
-                    return Ok(None);
-                }
-                read::AttributeValue::DebugRngListsIndex(index) => {
-                    let offset = context.dwarf.ranges_offset(context.unit, index)?;
-                    let iter = context
-                        .dwarf
-                        .ranges
-                        .raw_ranges(offset, context.unit.encoding())?;
-                    let range_list = RangeList::from(iter, context)?;
-                    let range_id = context.ranges.add(range_list);
-                    AttributeValue::RangeListRef(range_id)
-                }
-                read::AttributeValue::DebugTypesRef(val) => AttributeValue::DebugTypesRef(val),
-                read::AttributeValue::DebugStrRef(offset) => {
-                    let r = context.dwarf.string(offset)?;
-                    let id = context.strings.add(r.to_slice()?);
-                    AttributeValue::StringRef(id)
-                }
-                read::AttributeValue::DebugStrRefSup(val) => AttributeValue::DebugStrRefSup(val),
-                read::AttributeValue::DebugStrOffsetsBase(_base) => {
-                    // We convert all string offsets to `.debug_str` references,
-                    // so this is unneeded.
-                    return Ok(None);
-                }
-                read::AttributeValue::DebugStrOffsetsIndex(index) => {
-                    let offset = context.dwarf.string_offset(context.unit, index)?;
-                    let r = context.dwarf.string(offset)?;
-                    let id = context.strings.add(r.to_slice()?);
-                    AttributeValue::StringRef(id)
-                }
-                read::AttributeValue::DebugLineStrRef(offset) => {
-                    let r = context.dwarf.line_string(offset)?;
-                    let id = context.line_strings.add(r.to_slice()?);
-                    AttributeValue::LineStringRef(id)
-                }
-                read::AttributeValue::String(r) => AttributeValue::String(r.to_slice()?.into()),
-                read::AttributeValue::Encoding(val) => AttributeValue::Encoding(val),
-                read::AttributeValue::DecimalSign(val) => AttributeValue::DecimalSign(val),
-                read::AttributeValue::Endianity(val) => AttributeValue::Endianity(val),
-                read::AttributeValue::Accessibility(val) => AttributeValue::Accessibility(val),
-                read::AttributeValue::Visibility(val) => AttributeValue::Visibility(val),
-                read::AttributeValue::Virtuality(val) => AttributeValue::Virtuality(val),
-                read::AttributeValue::Language(val) => AttributeValue::Language(val),
-                read::AttributeValue::AddressClass(val) => AttributeValue::AddressClass(val),
-                read::AttributeValue::IdentifierCase(val) => AttributeValue::IdentifierCase(val),
-                read::AttributeValue::CallingConvention(val) => {
-                    AttributeValue::CallingConvention(val)
-                }
-                read::AttributeValue::Inline(val) => AttributeValue::Inline(val),
-                read::AttributeValue::Ordering(val) => AttributeValue::Ordering(val),
-                read::AttributeValue::FileIndex(val) => {
-                    if val == 0 {
-                        // 0 means not specified, even for version 5.
-                        AttributeValue::FileIndex(None)
-                    } else {
-                        match context.line_program_files.get(val as usize) {
-                            Some(id) => AttributeValue::FileIndex(Some(*id)),
-                            None => return Err(ConvertError::InvalidFileIndex),
-                        }
-                    }
-                }
-                // Should always be a more specific section reference.
-                read::AttributeValue::SecOffset(_) => {
-                    return Err(ConvertError::InvalidAttributeValue);
-                }
-            };
-            Ok(Some(to))
-        }
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "read")]
-mod tests {
-    use super::*;
-    use crate::common::{
-        DebugAddrBase, DebugLocListsBase, DebugRngListsBase, DebugStrOffsetsBase, LineEncoding,
-        UnitSectionOffset,
-    };
-    use crate::constants;
-    use crate::read;
-    use crate::write::{
-        DebugLine, DebugLineStr, DebugStr, EndianVec, LineString, LineStringTable, Location,
-        LocationList, LocationListTable, Range, RangeList, RangeListOffsets, RangeListTable,
-        StringTable,
-    };
-    use crate::LittleEndian;
-    use std::collections::HashMap;
-    use std::mem;
-
-    #[test]
-    #[allow(clippy::cyclomatic_complexity)]
-    fn test_unit_table() {
-        let mut strings = StringTable::default();
-
-        let mut units = UnitTable::default();
-        let unit_id1 = units.add(Unit::new(
-            Encoding {
-                version: 4,
-                address_size: 8,
-                format: Format::Dwarf32,
-            },
-            LineProgram::none(),
-        ));
-        let unit2 = units.add(Unit::new(
-            Encoding {
-                version: 2,
-                address_size: 4,
-                format: Format::Dwarf64,
-            },
-            LineProgram::none(),
-        ));
-        let unit3 = units.add(Unit::new(
-            Encoding {
-                version: 5,
-                address_size: 4,
-                format: Format::Dwarf32,
-            },
-            LineProgram::none(),
-        ));
-        assert_eq!(units.count(), 3);
-        {
-            let unit1 = units.get_mut(unit_id1);
-            assert_eq!(unit1.version(), 4);
-            assert_eq!(unit1.address_size(), 8);
-            assert_eq!(unit1.format(), Format::Dwarf32);
-            assert_eq!(unit1.count(), 1);
-
-            let root_id = unit1.root();
-            assert_eq!(root_id, UnitEntryId::new(unit1.base_id, 0));
-            {
-                let root = unit1.get_mut(root_id);
-                assert_eq!(root.id(), root_id);
-                assert!(root.parent().is_none());
-                assert_eq!(root.tag(), constants::DW_TAG_compile_unit);
-
-                // Test get/get_mut
-                assert!(root.get(constants::DW_AT_producer).is_none());
-                assert!(root.get_mut(constants::DW_AT_producer).is_none());
-                let mut producer = AttributeValue::String(b"root"[..].into());
-                root.set(constants::DW_AT_producer, producer.clone());
-                assert_eq!(root.get(constants::DW_AT_producer), Some(&producer));
-                assert_eq!(root.get_mut(constants::DW_AT_producer), Some(&mut producer));
-
-                // Test attrs
-                let mut attrs = root.attrs();
-                let attr = attrs.next().unwrap();
-                assert_eq!(attr.name(), constants::DW_AT_producer);
-                assert_eq!(attr.get(), &producer);
-                assert!(attrs.next().is_none());
-            }
-
-            let child1 = unit1.add(root_id, constants::DW_TAG_subprogram);
-            assert_eq!(child1, UnitEntryId::new(unit1.base_id, 1));
-            {
-                let child1 = unit1.get_mut(child1);
-                assert_eq!(child1.parent(), Some(root_id));
-
-                let tmp = AttributeValue::String(b"tmp"[..].into());
-                child1.set(constants::DW_AT_name, tmp.clone());
-                assert_eq!(child1.get(constants::DW_AT_name), Some(&tmp));
-
-                // Test attrs_mut
-                let name = AttributeValue::StringRef(strings.add(&b"child1"[..]));
-                {
-                    let attr = child1.attrs_mut().next().unwrap();
-                    assert_eq!(attr.name(), constants::DW_AT_name);
-                    attr.set(name.clone());
-                }
-                assert_eq!(child1.get(constants::DW_AT_name), Some(&name));
-            }
-
-            let child2 = unit1.add(root_id, constants::DW_TAG_subprogram);
-            assert_eq!(child2, UnitEntryId::new(unit1.base_id, 2));
-            {
-                let child2 = unit1.get_mut(child2);
-                assert_eq!(child2.parent(), Some(root_id));
-
-                let tmp = AttributeValue::String(b"tmp"[..].into());
-                child2.set(constants::DW_AT_name, tmp.clone());
-                assert_eq!(child2.get(constants::DW_AT_name), Some(&tmp));
-
-                // Test replace
-                let name = AttributeValue::StringRef(strings.add(&b"child2"[..]));
-                child2.set(constants::DW_AT_name, name.clone());
-                assert_eq!(child2.get(constants::DW_AT_name), Some(&name));
-            }
-
-            {
-                let root = unit1.get(root_id);
-                assert_eq!(
-                    root.children().cloned().collect::<Vec<_>>(),
-                    vec![child1, child2]
-                );
-            }
-        }
-        {
-            let unit2 = units.get(unit2);
-            assert_eq!(unit2.version(), 2);
-            assert_eq!(unit2.address_size(), 4);
-            assert_eq!(unit2.format(), Format::Dwarf64);
-            assert_eq!(unit2.count(), 1);
-
-            let root = unit2.root();
-            assert_eq!(root, UnitEntryId::new(unit2.base_id, 0));
-            let root = unit2.get(root);
-            assert_eq!(root.id(), UnitEntryId::new(unit2.base_id, 0));
-            assert!(root.parent().is_none());
-            assert_eq!(root.tag(), constants::DW_TAG_compile_unit);
-        }
-
-        let mut sections = Sections::new(EndianVec::new(LittleEndian));
-        let debug_line_str_offsets = DebugLineStrOffsets::none();
-        let debug_str_offsets = strings.write(&mut sections.debug_str).unwrap();
-        units
-            .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
-            .unwrap();
-
-        println!("{:?}", sections.debug_str);
-        println!("{:?}", sections.debug_info);
-        println!("{:?}", sections.debug_abbrev);
-
-        let dwarf = read::Dwarf {
-            debug_abbrev: read::DebugAbbrev::new(sections.debug_abbrev.slice(), LittleEndian),
-            debug_info: read::DebugInfo::new(sections.debug_info.slice(), LittleEndian),
-            debug_str: read::DebugStr::new(sections.debug_str.slice(), LittleEndian),
-            ..Default::default()
-        };
-        let mut read_units = dwarf.units();
-
-        {
-            let read_unit1 = read_units.next().unwrap().unwrap();
-            let unit1 = units.get(unit_id1);
-            assert_eq!(unit1.version(), read_unit1.version());
-            assert_eq!(unit1.address_size(), read_unit1.address_size());
-            assert_eq!(unit1.format(), read_unit1.format());
-
-            let read_unit1 = dwarf.unit(read_unit1).unwrap();
-            let mut read_entries = read_unit1.entries();
-
-            let root = unit1.get(unit1.root());
-            {
-                let (depth, read_root) = read_entries.next_dfs().unwrap().unwrap();
-                assert_eq!(depth, 0);
-                assert_eq!(root.tag(), read_root.tag());
-                assert!(read_root.has_children());
-
-                let producer = match root.get(constants::DW_AT_producer).unwrap() {
-                    AttributeValue::String(ref producer) => &**producer,
-                    otherwise => panic!("unexpected {:?}", otherwise),
-                };
-                assert_eq!(producer, b"root");
-                let read_producer = read_root
-                    .attr_value(constants::DW_AT_producer)
-                    .unwrap()
-                    .unwrap();
-                assert_eq!(
-                    dwarf
-                        .attr_string(&read_unit1, read_producer)
-                        .unwrap()
-                        .slice(),
-                    producer
-                );
-            }
-
-            let mut children = root.children().cloned();
-
-            {
-                let child = children.next().unwrap();
-                assert_eq!(child, UnitEntryId::new(unit1.base_id, 1));
-                let child = unit1.get(child);
-                let (depth, read_child) = read_entries.next_dfs().unwrap().unwrap();
-                assert_eq!(depth, 1);
-                assert_eq!(child.tag(), read_child.tag());
-                assert!(!read_child.has_children());
-
-                let name = match child.get(constants::DW_AT_name).unwrap() {
-                    AttributeValue::StringRef(name) => *name,
-                    otherwise => panic!("unexpected {:?}", otherwise),
-                };
-                let name = strings.get(name);
-                assert_eq!(name, b"child1");
-                let read_name = read_child
-                    .attr_value(constants::DW_AT_name)
-                    .unwrap()
-                    .unwrap();
-                assert_eq!(
-                    dwarf.attr_string(&read_unit1, read_name).unwrap().slice(),
-                    name
-                );
-            }
-
-            {
-                let child = children.next().unwrap();
-                assert_eq!(child, UnitEntryId::new(unit1.base_id, 2));
-                let child = unit1.get(child);
-                let (depth, read_child) = read_entries.next_dfs().unwrap().unwrap();
-                assert_eq!(depth, 0);
-                assert_eq!(child.tag(), read_child.tag());
-                assert!(!read_child.has_children());
-
-                let name = match child.get(constants::DW_AT_name).unwrap() {
-                    AttributeValue::StringRef(name) => *name,
-                    otherwise => panic!("unexpected {:?}", otherwise),
-                };
-                let name = strings.get(name);
-                assert_eq!(name, b"child2");
-                let read_name = read_child
-                    .attr_value(constants::DW_AT_name)
-                    .unwrap()
-                    .unwrap();
-                assert_eq!(
-                    dwarf.attr_string(&read_unit1, read_name).unwrap().slice(),
-                    name
-                );
-            }
-
-            assert!(read_entries.next_dfs().unwrap().is_none());
-        }
-
-        {
-            let read_unit2 = read_units.next().unwrap().unwrap();
-            let unit2 = units.get(unit2);
-            assert_eq!(unit2.version(), read_unit2.version());
-            assert_eq!(unit2.address_size(), read_unit2.address_size());
-            assert_eq!(unit2.format(), read_unit2.format());
-
-            let abbrevs = dwarf.abbreviations(&read_unit2).unwrap();
-            let mut read_entries = read_unit2.entries(&abbrevs);
-
-            {
-                let root = unit2.get(unit2.root());
-                let (depth, read_root) = read_entries.next_dfs().unwrap().unwrap();
-                assert_eq!(depth, 0);
-                assert_eq!(root.tag(), read_root.tag());
-                assert!(!read_root.has_children());
-            }
-
-            assert!(read_entries.next_dfs().unwrap().is_none());
-        }
-
-        {
-            let read_unit3 = read_units.next().unwrap().unwrap();
-            let unit3 = units.get(unit3);
-            assert_eq!(unit3.version(), read_unit3.version());
-            assert_eq!(unit3.address_size(), read_unit3.address_size());
-            assert_eq!(unit3.format(), read_unit3.format());
-
-            let abbrevs = dwarf.abbreviations(&read_unit3).unwrap();
-            let mut read_entries = read_unit3.entries(&abbrevs);
-
-            {
-                let root = unit3.get(unit3.root());
-                let (depth, read_root) = read_entries.next_dfs().unwrap().unwrap();
-                assert_eq!(depth, 0);
-                assert_eq!(root.tag(), read_root.tag());
-                assert!(!read_root.has_children());
-            }
-
-            assert!(read_entries.next_dfs().unwrap().is_none());
-        }
-
-        assert!(read_units.next().unwrap().is_none());
-
-        let mut convert_line_strings = LineStringTable::default();
-        let mut convert_strings = StringTable::default();
-        let convert_units = UnitTable::from(
-            &dwarf,
-            &mut convert_line_strings,
-            &mut convert_strings,
-            &|address| Some(Address::Constant(address)),
-        )
-        .unwrap();
-        assert_eq!(convert_units.count(), units.count());
-
-        for i in 0..convert_units.count() {
-            let unit_id = units.id(i);
-            let unit = units.get(unit_id);
-            let convert_unit_id = convert_units.id(i);
-            let convert_unit = convert_units.get(convert_unit_id);
-            assert_eq!(convert_unit.version(), unit.version());
-            assert_eq!(convert_unit.address_size(), unit.address_size());
-            assert_eq!(convert_unit.format(), unit.format());
-            assert_eq!(convert_unit.count(), unit.count());
-
-            let root = unit.get(unit.root());
-            let convert_root = convert_unit.get(convert_unit.root());
-            assert_eq!(convert_root.tag(), root.tag());
-            for (convert_attr, attr) in convert_root.attrs().zip(root.attrs()) {
-                assert_eq!(convert_attr, attr);
-            }
-        }
-    }
-
-    #[test]
-    fn test_attribute_value() {
-        // Create a string table and a string with a non-zero id/offset.
-        let mut strings = StringTable::default();
-        strings.add("string one");
-        let string_id = strings.add("string two");
-        let mut debug_str = DebugStr::from(EndianVec::new(LittleEndian));
-        let debug_str_offsets = strings.write(&mut debug_str).unwrap();
-        let read_debug_str = read::DebugStr::new(debug_str.slice(), LittleEndian);
-
-        let mut line_strings = LineStringTable::default();
-        line_strings.add("line string one");
-        let line_string_id = line_strings.add("line string two");
-        let mut debug_line_str = DebugLineStr::from(EndianVec::new(LittleEndian));
-        let debug_line_str_offsets = line_strings.write(&mut debug_line_str).unwrap();
-        let read_debug_line_str =
-            read::DebugLineStr::from(read::EndianSlice::new(debug_line_str.slice(), LittleEndian));
-
-        let data = vec![1, 2, 3, 4];
-        let read_data = read::EndianSlice::new(&[1, 2, 3, 4], LittleEndian);
-
-        let mut expression = Expression::new();
-        expression.op_constu(57);
-        let read_expression = read::Expression(read::EndianSlice::new(
-            &[constants::DW_OP_constu.0, 57],
-            LittleEndian,
-        ));
-
-        let mut ranges = RangeListTable::default();
-        let range_id = ranges.add(RangeList(vec![Range::StartEnd {
-            begin: Address::Constant(0x1234),
-            end: Address::Constant(0x2345),
-        }]));
-
-        let mut locations = LocationListTable::default();
-        let loc_id = locations.add(LocationList(vec![Location::StartEnd {
-            begin: Address::Constant(0x1234),
-            end: Address::Constant(0x2345),
-            data: expression.clone(),
-        }]));
-
-        for &version in &[2, 3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-
-                    let mut sections = Sections::new(EndianVec::new(LittleEndian));
-                    let range_list_offsets = ranges.write(&mut sections, encoding).unwrap();
-                    let loc_list_offsets = locations.write(&mut sections, encoding, None).unwrap();
-
-                    let read_debug_ranges =
-                        read::DebugRanges::new(sections.debug_ranges.slice(), LittleEndian);
-                    let read_debug_rnglists =
-                        read::DebugRngLists::new(sections.debug_rnglists.slice(), LittleEndian);
-
-                    let read_debug_loc =
-                        read::DebugLoc::new(sections.debug_loc.slice(), LittleEndian);
-                    let read_debug_loclists =
-                        read::DebugLocLists::new(sections.debug_loclists.slice(), LittleEndian);
-
-                    let mut units = UnitTable::default();
-                    let unit = units.add(Unit::new(encoding, LineProgram::none()));
-                    let unit = units.get(unit);
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-                    let from_unit = read::UnitHeader::new(
-                        encoding,
-                        0,
-                        DebugAbbrevOffset(0),
-                        read::EndianSlice::new(&[], LittleEndian),
-                    );
-
-                    for &(ref name, ref value, ref expect_value) in &[
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Address(Address::Constant(0x1234)),
-                            read::AttributeValue::Addr(0x1234),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Block(data.clone()),
-                            read::AttributeValue::Block(read_data),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Data1(0x12),
-                            read::AttributeValue::Data1(0x12),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Data2(0x1234),
-                            read::AttributeValue::Data2(0x1234),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Data4(0x1234),
-                            read::AttributeValue::Data4(0x1234),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Data8(0x1234),
-                            read::AttributeValue::Data8(0x1234),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Sdata(0x1234),
-                            read::AttributeValue::Sdata(0x1234),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Udata(0x1234),
-                            read::AttributeValue::Udata(0x1234),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Exprloc(expression.clone()),
-                            read::AttributeValue::Exprloc(read_expression),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::Flag(false),
-                            read::AttributeValue::Flag(false),
-                        ),
-                        /*
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::FlagPresent,
-                            read::AttributeValue::Flag(true),
-                        ),
-                        */
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x1234)),
-                            read::AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x1234)),
-                        ),
-                        (
-                            constants::DW_AT_location,
-                            AttributeValue::LocationListRef(loc_id),
-                            read::AttributeValue::SecOffset(loc_list_offsets.get(loc_id).0),
-                        ),
-                        (
-                            constants::DW_AT_macro_info,
-                            AttributeValue::DebugMacinfoRef(DebugMacinfoOffset(0x1234)),
-                            read::AttributeValue::SecOffset(0x1234),
-                        ),
-                        (
-                            constants::DW_AT_macros,
-                            AttributeValue::DebugMacroRef(DebugMacroOffset(0x1234)),
-                            read::AttributeValue::SecOffset(0x1234),
-                        ),
-                        (
-                            constants::DW_AT_ranges,
-                            AttributeValue::RangeListRef(range_id),
-                            read::AttributeValue::SecOffset(range_list_offsets.get(range_id).0),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::DebugTypesRef(DebugTypeSignature(0x1234)),
-                            read::AttributeValue::DebugTypesRef(DebugTypeSignature(0x1234)),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::StringRef(string_id),
-                            read::AttributeValue::DebugStrRef(debug_str_offsets.get(string_id)),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::DebugStrRefSup(DebugStrOffset(0x1234)),
-                            read::AttributeValue::DebugStrRefSup(DebugStrOffset(0x1234)),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::LineStringRef(line_string_id),
-                            read::AttributeValue::DebugLineStrRef(
-                                debug_line_str_offsets.get(line_string_id),
-                            ),
-                        ),
-                        (
-                            constants::DW_AT_name,
-                            AttributeValue::String(data.clone()),
-                            read::AttributeValue::String(read_data),
-                        ),
-                        (
-                            constants::DW_AT_encoding,
-                            AttributeValue::Encoding(constants::DwAte(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_decimal_sign,
-                            AttributeValue::DecimalSign(constants::DwDs(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_endianity,
-                            AttributeValue::Endianity(constants::DwEnd(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_accessibility,
-                            AttributeValue::Accessibility(constants::DwAccess(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_visibility,
-                            AttributeValue::Visibility(constants::DwVis(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_virtuality,
-                            AttributeValue::Virtuality(constants::DwVirtuality(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_language,
-                            AttributeValue::Language(constants::DwLang(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_address_class,
-                            AttributeValue::AddressClass(constants::DwAddr(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_identifier_case,
-                            AttributeValue::IdentifierCase(constants::DwId(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_calling_convention,
-                            AttributeValue::CallingConvention(constants::DwCc(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_ordering,
-                            AttributeValue::Ordering(constants::DwOrd(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                        (
-                            constants::DW_AT_inline,
-                            AttributeValue::Inline(constants::DwInl(0x12)),
-                            read::AttributeValue::Udata(0x12),
-                        ),
-                    ][..]
-                    {
-                        let form = value.form(encoding).unwrap();
-                        let attr = Attribute {
-                            name: *name,
-                            value: value.clone(),
-                        };
-
-                        let offsets = UnitOffsets::none();
-                        let line_program_offset = None;
-                        let mut debug_info_refs = Vec::new();
-                        let mut unit_refs = Vec::new();
-                        let mut debug_info = DebugInfo::from(EndianVec::new(LittleEndian));
-                        attr.value
-                            .write(
-                                &mut debug_info,
-                                &mut debug_info_refs,
-                                &mut unit_refs,
-                                &unit,
-                                &offsets,
-                                line_program_offset,
-                                &debug_line_str_offsets,
-                                &debug_str_offsets,
-                                &range_list_offsets,
-                                &loc_list_offsets,
-                            )
-                            .unwrap();
-
-                        let spec = read::AttributeSpecification::new(*name, form, None);
-                        let mut r = read::EndianSlice::new(debug_info.slice(), LittleEndian);
-                        let read_attr = read::parse_attribute(&mut r, encoding, spec).unwrap();
-                        let read_value = &read_attr.raw_value();
-                        // read::AttributeValue is invariant in the lifetime of R.
-                        // The lifetimes here are all okay, so transmute it.
-                        let read_value = unsafe {
-                            mem::transmute::<
-                                &read::AttributeValue<read::EndianSlice<LittleEndian>>,
-                                &read::AttributeValue<read::EndianSlice<LittleEndian>>,
-                            >(read_value)
-                        };
-                        assert_eq!(read_value, expect_value);
-
-                        let dwarf = read::Dwarf {
-                            debug_str: read_debug_str.clone(),
-                            debug_line_str: read_debug_line_str.clone(),
-                            ranges: read::RangeLists::new(read_debug_ranges, read_debug_rnglists),
-                            locations: read::LocationLists::new(
-                                read_debug_loc,
-                                read_debug_loclists,
-                            ),
-                            ..Default::default()
-                        };
-
-                        let unit = read::Unit {
-                            offset: UnitSectionOffset::DebugInfoOffset(DebugInfoOffset(0)),
-                            header: from_unit,
-                            abbreviations: read::Abbreviations::default(),
-                            name: None,
-                            comp_dir: None,
-                            low_pc: 0,
-                            str_offsets_base: DebugStrOffsetsBase(0),
-                            addr_base: DebugAddrBase(0),
-                            loclists_base: DebugLocListsBase(0),
-                            rnglists_base: DebugRngListsBase(0),
-                            line_program: None,
-                        };
-
-                        let mut context = convert::ConvertUnitContext {
-                            dwarf: &dwarf,
-                            unit: &unit,
-                            line_strings: &mut line_strings,
-                            strings: &mut strings,
-                            ranges: &mut ranges,
-                            locations: &mut locations,
-                            convert_address: &|address| Some(Address::Constant(address)),
-                            base_address: Address::Constant(0),
-                            line_program_offset: None,
-                            line_program_files: Vec::new(),
-                            entry_ids: &HashMap::new(),
-                        };
-
-                        let convert_attr =
-                            Attribute::from(&mut context, &read_attr).unwrap().unwrap();
-                        assert_eq!(convert_attr, attr);
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    #[allow(clippy::cyclomatic_complexity)]
-    fn test_unit_ref() {
-        let mut units = UnitTable::default();
-        let unit_id1 = units.add(Unit::new(
-            Encoding {
-                version: 4,
-                address_size: 8,
-                format: Format::Dwarf32,
-            },
-            LineProgram::none(),
-        ));
-        assert_eq!(unit_id1, units.id(0));
-        let unit_id2 = units.add(Unit::new(
-            Encoding {
-                version: 2,
-                address_size: 4,
-                format: Format::Dwarf64,
-            },
-            LineProgram::none(),
-        ));
-        assert_eq!(unit_id2, units.id(1));
-        let unit1_child1 = UnitEntryId::new(units.get(unit_id1).base_id, 1);
-        let unit1_child2 = UnitEntryId::new(units.get(unit_id1).base_id, 2);
-        let unit2_child1 = UnitEntryId::new(units.get(unit_id2).base_id, 1);
-        let unit2_child2 = UnitEntryId::new(units.get(unit_id2).base_id, 2);
-        {
-            let unit1 = units.get_mut(unit_id1);
-            let root = unit1.root();
-            let child_id1 = unit1.add(root, constants::DW_TAG_subprogram);
-            assert_eq!(child_id1, unit1_child1);
-            let child_id2 = unit1.add(root, constants::DW_TAG_subprogram);
-            assert_eq!(child_id2, unit1_child2);
-            {
-                let child1 = unit1.get_mut(child_id1);
-                child1.set(constants::DW_AT_type, AttributeValue::UnitRef(child_id2));
-            }
-            {
-                let child2 = unit1.get_mut(child_id2);
-                child2.set(
-                    constants::DW_AT_type,
-                    AttributeValue::DebugInfoRef(Reference::Entry(unit_id2, unit2_child1)),
-                );
-            }
-        }
-        {
-            let unit2 = units.get_mut(unit_id2);
-            let root = unit2.root();
-            let child_id1 = unit2.add(root, constants::DW_TAG_subprogram);
-            assert_eq!(child_id1, unit2_child1);
-            let child_id2 = unit2.add(root, constants::DW_TAG_subprogram);
-            assert_eq!(child_id2, unit2_child2);
-            {
-                let child1 = unit2.get_mut(child_id1);
-                child1.set(constants::DW_AT_type, AttributeValue::UnitRef(child_id2));
-            }
-            {
-                let child2 = unit2.get_mut(child_id2);
-                child2.set(
-                    constants::DW_AT_type,
-                    AttributeValue::DebugInfoRef(Reference::Entry(unit_id1, unit1_child1)),
-                );
-            }
-        }
-
-        let debug_line_str_offsets = DebugLineStrOffsets::none();
-        let debug_str_offsets = DebugStrOffsets::none();
-        let mut sections = Sections::new(EndianVec::new(LittleEndian));
-        let debug_info_offsets = units
-            .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
-            .unwrap();
-
-        println!("{:?}", sections.debug_info);
-        println!("{:?}", sections.debug_abbrev);
-
-        let dwarf = read::Dwarf {
-            debug_abbrev: read::DebugAbbrev::new(sections.debug_abbrev.slice(), LittleEndian),
-            debug_info: read::DebugInfo::new(sections.debug_info.slice(), LittleEndian),
-            ..Default::default()
-        };
-
-        let mut read_units = dwarf.units();
-        {
-            let read_unit1 = read_units.next().unwrap().unwrap();
-            assert_eq!(read_unit1.offset(), debug_info_offsets.unit(unit_id1));
-
-            let abbrevs = dwarf.abbreviations(&read_unit1).unwrap();
-            let mut read_entries = read_unit1.entries(&abbrevs);
-            {
-                let (_, _read_root) = read_entries.next_dfs().unwrap().unwrap();
-            }
-            {
-                let (_, read_child1) = read_entries.next_dfs().unwrap().unwrap();
-                let offset = debug_info_offsets
-                    .entry(unit_id1, unit1_child2)
-                    .to_unit_offset(&read_unit1)
-                    .unwrap();
-                assert_eq!(
-                    read_child1.attr_value(constants::DW_AT_type).unwrap(),
-                    Some(read::AttributeValue::UnitRef(offset))
-                );
-            }
-            {
-                let (_, read_child2) = read_entries.next_dfs().unwrap().unwrap();
-                let offset = debug_info_offsets.entry(unit_id2, unit2_child1);
-                assert_eq!(
-                    read_child2.attr_value(constants::DW_AT_type).unwrap(),
-                    Some(read::AttributeValue::DebugInfoRef(offset))
-                );
-            }
-        }
-        {
-            let read_unit2 = read_units.next().unwrap().unwrap();
-            assert_eq!(read_unit2.offset(), debug_info_offsets.unit(unit_id2));
-
-            let abbrevs = dwarf.abbreviations(&read_unit2).unwrap();
-            let mut read_entries = read_unit2.entries(&abbrevs);
-            {
-                let (_, _read_root) = read_entries.next_dfs().unwrap().unwrap();
-            }
-            {
-                let (_, read_child1) = read_entries.next_dfs().unwrap().unwrap();
-                let offset = debug_info_offsets
-                    .entry(unit_id2, unit2_child2)
-                    .to_unit_offset(&read_unit2)
-                    .unwrap();
-                assert_eq!(
-                    read_child1.attr_value(constants::DW_AT_type).unwrap(),
-                    Some(read::AttributeValue::UnitRef(offset))
-                );
-            }
-            {
-                let (_, read_child2) = read_entries.next_dfs().unwrap().unwrap();
-                let offset = debug_info_offsets.entry(unit_id1, unit1_child1);
-                assert_eq!(
-                    read_child2.attr_value(constants::DW_AT_type).unwrap(),
-                    Some(read::AttributeValue::DebugInfoRef(offset))
-                );
-            }
-        }
-
-        let mut convert_line_strings = LineStringTable::default();
-        let mut convert_strings = StringTable::default();
-        let convert_units = UnitTable::from(
-            &dwarf,
-            &mut convert_line_strings,
-            &mut convert_strings,
-            &|address| Some(Address::Constant(address)),
-        )
-        .unwrap();
-        assert_eq!(convert_units.count(), units.count());
-
-        for i in 0..convert_units.count() {
-            let unit = units.get(units.id(i));
-            let convert_unit = convert_units.get(convert_units.id(i));
-            assert_eq!(convert_unit.version(), unit.version());
-            assert_eq!(convert_unit.address_size(), unit.address_size());
-            assert_eq!(convert_unit.format(), unit.format());
-            assert_eq!(convert_unit.count(), unit.count());
-
-            let root = unit.get(unit.root());
-            let convert_root = convert_unit.get(convert_unit.root());
-            assert_eq!(convert_root.tag(), root.tag());
-            for (convert_attr, attr) in convert_root.attrs().zip(root.attrs()) {
-                assert_eq!(convert_attr, attr);
-            }
-
-            let child1 = unit.get(UnitEntryId::new(unit.base_id, 1));
-            let convert_child1 = convert_unit.get(UnitEntryId::new(convert_unit.base_id, 1));
-            assert_eq!(convert_child1.tag(), child1.tag());
-            for (convert_attr, attr) in convert_child1.attrs().zip(child1.attrs()) {
-                assert_eq!(convert_attr.name, attr.name);
-                match (convert_attr.value.clone(), attr.value.clone()) {
-                    (
-                        AttributeValue::DebugInfoRef(Reference::Entry(convert_unit, convert_entry)),
-                        AttributeValue::DebugInfoRef(Reference::Entry(unit, entry)),
-                    ) => {
-                        assert_eq!(convert_unit.index, unit.index);
-                        assert_eq!(convert_entry.index, entry.index);
-                    }
-                    (AttributeValue::UnitRef(convert_id), AttributeValue::UnitRef(id)) => {
-                        assert_eq!(convert_id.index, id.index);
-                    }
-                    (convert_value, value) => assert_eq!(convert_value, value),
-                }
-            }
-
-            let child2 = unit.get(UnitEntryId::new(unit.base_id, 2));
-            let convert_child2 = convert_unit.get(UnitEntryId::new(convert_unit.base_id, 2));
-            assert_eq!(convert_child2.tag(), child2.tag());
-            for (convert_attr, attr) in convert_child2.attrs().zip(child2.attrs()) {
-                assert_eq!(convert_attr.name, attr.name);
-                match (convert_attr.value.clone(), attr.value.clone()) {
-                    (
-                        AttributeValue::DebugInfoRef(Reference::Entry(convert_unit, convert_entry)),
-                        AttributeValue::DebugInfoRef(Reference::Entry(unit, entry)),
-                    ) => {
-                        assert_eq!(convert_unit.index, unit.index);
-                        assert_eq!(convert_entry.index, entry.index);
-                    }
-                    (AttributeValue::UnitRef(convert_id), AttributeValue::UnitRef(id)) => {
-                        assert_eq!(convert_id.index, id.index);
-                    }
-                    (convert_value, value) => assert_eq!(convert_value, value),
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_sibling() {
-        fn add_child(
-            unit: &mut Unit,
-            parent: UnitEntryId,
-            tag: constants::DwTag,
-            name: &str,
-        ) -> UnitEntryId {
-            let id = unit.add(parent, tag);
-            let child = unit.get_mut(id);
-            child.set(constants::DW_AT_name, AttributeValue::String(name.into()));
-            child.set_sibling(true);
-            id
-        }
-
-        fn add_children(units: &mut UnitTable, unit_id: UnitId) {
-            let unit = units.get_mut(unit_id);
-            let root = unit.root();
-            let child1 = add_child(unit, root, constants::DW_TAG_subprogram, "child1");
-            add_child(unit, child1, constants::DW_TAG_variable, "grandchild1");
-            add_child(unit, root, constants::DW_TAG_subprogram, "child2");
-            add_child(unit, root, constants::DW_TAG_subprogram, "child3");
-        }
-
-        fn next_child<R: read::Reader<Offset = usize>>(
-            entries: &mut read::EntriesCursor<R>,
-        ) -> (read::UnitOffset, Option<read::UnitOffset>) {
-            let (_, entry) = entries.next_dfs().unwrap().unwrap();
-            let offset = entry.offset();
-            let sibling =
-                entry
-                    .attr_value(constants::DW_AT_sibling)
-                    .unwrap()
-                    .map(|attr| match attr {
-                        read::AttributeValue::UnitRef(offset) => offset,
-                        _ => panic!("bad sibling value"),
-                    });
-            (offset, sibling)
-        }
-
-        fn check_sibling<R: read::Reader<Offset = usize>>(
-            unit: &read::CompilationUnitHeader<R>,
-            debug_abbrev: &read::DebugAbbrev<R>,
-        ) {
-            let abbrevs = unit.abbreviations(debug_abbrev).unwrap();
-            let mut entries = unit.entries(&abbrevs);
-            // root
-            entries.next_dfs().unwrap().unwrap();
-            // child1
-            let (_, sibling1) = next_child(&mut entries);
-            // grandchild1
-            entries.next_dfs().unwrap().unwrap();
-            // child2
-            let (offset2, sibling2) = next_child(&mut entries);
-            // child3
-            let (_, _) = next_child(&mut entries);
-            assert_eq!(sibling1, Some(offset2));
-            assert_eq!(sibling2, None);
-        }
-
-        let encoding = Encoding {
-            format: Format::Dwarf32,
-            version: 4,
-            address_size: 8,
-        };
-        let mut units = UnitTable::default();
-        let unit_id1 = units.add(Unit::new(encoding, LineProgram::none()));
-        add_children(&mut units, unit_id1);
-        let unit_id2 = units.add(Unit::new(encoding, LineProgram::none()));
-        add_children(&mut units, unit_id2);
-
-        let debug_line_str_offsets = DebugLineStrOffsets::none();
-        let debug_str_offsets = DebugStrOffsets::none();
-        let mut sections = Sections::new(EndianVec::new(LittleEndian));
-        units
-            .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
-            .unwrap();
-
-        println!("{:?}", sections.debug_info);
-        println!("{:?}", sections.debug_abbrev);
-
-        let read_debug_info = read::DebugInfo::new(sections.debug_info.slice(), LittleEndian);
-        let read_debug_abbrev = read::DebugAbbrev::new(sections.debug_abbrev.slice(), LittleEndian);
-        let mut read_units = read_debug_info.units();
-        check_sibling(&read_units.next().unwrap().unwrap(), &read_debug_abbrev);
-        check_sibling(&read_units.next().unwrap().unwrap(), &read_debug_abbrev);
-    }
-
-    #[test]
-    fn test_line_ref() {
-        for &version in &[2, 3, 4, 5] {
-            for &address_size in &[4, 8] {
-                for &format in &[Format::Dwarf32, Format::Dwarf64] {
-                    let encoding = Encoding {
-                        format,
-                        version,
-                        address_size,
-                    };
-
-                    // The line program we'll be referencing.
-                    let mut line_program = LineProgram::new(
-                        encoding,
-                        LineEncoding::default(),
-                        LineString::String(b"comp_dir".to_vec()),
-                        LineString::String(b"comp_name".to_vec()),
-                        None,
-                    );
-                    let dir = line_program.default_directory();
-                    let file1 =
-                        line_program.add_file(LineString::String(b"file1".to_vec()), dir, None);
-                    let file2 =
-                        line_program.add_file(LineString::String(b"file2".to_vec()), dir, None);
-
-                    // Write, read, and convert the line program, so that we have the info
-                    // required to convert the attributes.
-                    let line_strings = DebugLineStrOffsets::none();
-                    let strings = DebugStrOffsets::none();
-                    let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
-                    let line_program_offset = line_program
-                        .write(&mut debug_line, encoding, &line_strings, &strings)
-                        .unwrap();
-                    let read_debug_line = read::DebugLine::new(debug_line.slice(), LittleEndian);
-                    let read_line_program = read_debug_line
-                        .program(
-                            line_program_offset,
-                            address_size,
-                            Some(read::EndianSlice::new(b"comp_dir", LittleEndian)),
-                            Some(read::EndianSlice::new(b"comp_name", LittleEndian)),
-                        )
-                        .unwrap();
-                    let dwarf = read::Dwarf::default();
-                    let mut convert_line_strings = LineStringTable::default();
-                    let mut convert_strings = StringTable::default();
-                    let (_, line_program_files) = LineProgram::from(
-                        read_line_program,
-                        &dwarf,
-                        &mut convert_line_strings,
-                        &mut convert_strings,
-                        &|address| Some(Address::Constant(address)),
-                    )
-                    .unwrap();
-
-                    // Fake the unit.
-                    let mut units = UnitTable::default();
-                    let unit = units.add(Unit::new(encoding, LineProgram::none()));
-                    let unit = units.get(unit);
-                    let from_unit = read::UnitHeader::new(
-                        encoding,
-                        0,
-                        DebugAbbrevOffset(0),
-                        read::EndianSlice::new(&[], LittleEndian),
-                    );
-
-                    for &(ref name, ref value, ref expect_value) in &[
-                        (
-                            constants::DW_AT_stmt_list,
-                            AttributeValue::LineProgramRef,
-                            read::AttributeValue::SecOffset(line_program_offset.0),
-                        ),
-                        (
-                            constants::DW_AT_decl_file,
-                            AttributeValue::FileIndex(Some(file1)),
-                            read::AttributeValue::Udata(file1.raw()),
-                        ),
-                        (
-                            constants::DW_AT_decl_file,
-                            AttributeValue::FileIndex(Some(file2)),
-                            read::AttributeValue::Udata(file2.raw()),
-                        ),
-                    ][..]
-                    {
-                        let mut ranges = RangeListTable::default();
-                        let mut locations = LocationListTable::default();
-                        let mut strings = StringTable::default();
-                        let mut line_strings = LineStringTable::default();
-
-                        let form = value.form(encoding).unwrap();
-                        let attr = Attribute {
-                            name: *name,
-                            value: value.clone(),
-                        };
-
-                        let mut debug_info_refs = Vec::new();
-                        let mut unit_refs = Vec::new();
-                        let mut debug_info = DebugInfo::from(EndianVec::new(LittleEndian));
-                        let offsets = UnitOffsets::none();
-                        let debug_line_str_offsets = DebugLineStrOffsets::none();
-                        let debug_str_offsets = DebugStrOffsets::none();
-                        let range_list_offsets = RangeListOffsets::none();
-                        let loc_list_offsets = LocationListOffsets::none();
-                        attr.value
-                            .write(
-                                &mut debug_info,
-                                &mut debug_info_refs,
-                                &mut unit_refs,
-                                &unit,
-                                &offsets,
-                                Some(line_program_offset),
-                                &debug_line_str_offsets,
-                                &debug_str_offsets,
-                                &range_list_offsets,
-                                &loc_list_offsets,
-                            )
-                            .unwrap();
-
-                        let spec = read::AttributeSpecification::new(*name, form, None);
-                        let mut r = read::EndianSlice::new(debug_info.slice(), LittleEndian);
-                        let read_attr = read::parse_attribute(&mut r, encoding, spec).unwrap();
-                        let read_value = &read_attr.raw_value();
-                        // read::AttributeValue is invariant in the lifetime of R.
-                        // The lifetimes here are all okay, so transmute it.
-                        let read_value = unsafe {
-                            mem::transmute::<
-                                &read::AttributeValue<read::EndianSlice<LittleEndian>>,
-                                &read::AttributeValue<read::EndianSlice<LittleEndian>>,
-                            >(read_value)
-                        };
-                        assert_eq!(read_value, expect_value);
-
-                        let unit = read::Unit {
-                            offset: UnitSectionOffset::DebugInfoOffset(DebugInfoOffset(0)),
-                            header: from_unit,
-                            abbreviations: read::Abbreviations::default(),
-                            name: None,
-                            comp_dir: None,
-                            low_pc: 0,
-                            str_offsets_base: DebugStrOffsetsBase(0),
-                            addr_base: DebugAddrBase(0),
-                            loclists_base: DebugLocListsBase(0),
-                            rnglists_base: DebugRngListsBase(0),
-                            line_program: None,
-                        };
-
-                        let mut context = convert::ConvertUnitContext {
-                            dwarf: &dwarf,
-                            unit: &unit,
-                            line_strings: &mut line_strings,
-                            strings: &mut strings,
-                            ranges: &mut ranges,
-                            locations: &mut locations,
-                            convert_address: &|address| Some(Address::Constant(address)),
-                            base_address: Address::Constant(0),
-                            line_program_offset: Some(line_program_offset),
-                            line_program_files: line_program_files.clone(),
-                            entry_ids: &HashMap::new(),
-                        };
-
-                        let convert_attr =
-                            Attribute::from(&mut context, &read_attr).unwrap().unwrap();
-                        assert_eq!(convert_attr, attr);
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_line_program_used() {
-        for used in vec![false, true] {
-            let encoding = Encoding {
-                format: Format::Dwarf32,
-                version: 5,
-                address_size: 8,
-            };
-
-            let line_program = LineProgram::new(
-                encoding,
-                LineEncoding::default(),
-                LineString::String(b"comp_dir".to_vec()),
-                LineString::String(b"comp_name".to_vec()),
-                None,
-            );
-
-            let mut unit = Unit::new(encoding, line_program);
-            let file_id = if used { Some(FileId::new(0)) } else { None };
-            let root = unit.root();
-            unit.get_mut(root).set(
-                constants::DW_AT_decl_file,
-                AttributeValue::FileIndex(file_id),
-            );
-
-            let mut units = UnitTable::default();
-            units.add(unit);
-
-            let debug_line_str_offsets = DebugLineStrOffsets::none();
-            let debug_str_offsets = DebugStrOffsets::none();
-            let mut sections = Sections::new(EndianVec::new(LittleEndian));
-            units
-                .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
-                .unwrap();
-            assert_eq!(!used, sections.debug_line.slice().is_empty());
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/src/write/writer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/src/write/writer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,497 +0,0 @@
-use crate::common::{Format, SectionId};
-use crate::constants;
-use crate::endianity::Endianity;
-use crate::leb128;
-use crate::write::{Address, Error, Result};
-
-/// A trait for writing the data to a DWARF section.
-///
-/// All write operations append to the section unless otherwise specified.
-#[allow(clippy::len_without_is_empty)]
-pub trait Writer {
-    /// The endianity of bytes that are written.
-    type Endian: Endianity;
-
-    /// Return the endianity of bytes that are written.
-    fn endian(&self) -> Self::Endian;
-
-    /// Return the current section length.
-    ///
-    /// This may be used as an offset for future `write_at` calls.
-    fn len(&self) -> usize;
-
-    /// Write a slice.
-    fn write(&mut self, bytes: &[u8]) -> Result<()>;
-
-    /// Write a slice at a given offset.
-    ///
-    /// The write must not extend past the current section length.
-    fn write_at(&mut self, offset: usize, bytes: &[u8]) -> Result<()>;
-
-    /// Write an address.
-    ///
-    /// If the writer supports relocations, then it must provide its own implementation
-    /// of this method.
-    // TODO: use write_reference instead?
-    fn write_address(&mut self, address: Address, size: u8) -> Result<()> {
-        match address {
-            Address::Constant(val) => self.write_udata(val, size),
-            Address::Symbol { .. } => Err(Error::InvalidAddress),
-        }
-    }
-
-    /// Write an address with a `.eh_frame` pointer encoding.
-    ///
-    /// The given size is only used for `DW_EH_PE_absptr` formats.
-    ///
-    /// If the writer supports relocations, then it must provide its own implementation
-    /// of this method.
-    fn write_eh_pointer(
-        &mut self,
-        address: Address,
-        eh_pe: constants::DwEhPe,
-        size: u8,
-    ) -> Result<()> {
-        match address {
-            Address::Constant(val) => {
-                // Indirect doesn't matter here.
-                let val = match eh_pe.application() {
-                    constants::DW_EH_PE_absptr => val,
-                    constants::DW_EH_PE_pcrel => {
-                        // TODO: better handling of sign
-                        let offset = self.len() as u64;
-                        offset.wrapping_sub(val)
-                    }
-                    _ => {
-                        return Err(Error::UnsupportedPointerEncoding(eh_pe));
-                    }
-                };
-                self.write_eh_pointer_data(val, eh_pe.format(), size)
-            }
-            Address::Symbol { .. } => Err(Error::InvalidAddress),
-        }
-    }
-
-    /// Write a value with a `.eh_frame` pointer format.
-    ///
-    /// The given size is only used for `DW_EH_PE_absptr` formats.
-    ///
-    /// This must not be used directly for values that may require relocation.
-    fn write_eh_pointer_data(
-        &mut self,
-        val: u64,
-        format: constants::DwEhPe,
-        size: u8,
-    ) -> Result<()> {
-        match format {
-            constants::DW_EH_PE_absptr => self.write_udata(val, size),
-            constants::DW_EH_PE_uleb128 => self.write_uleb128(val),
-            constants::DW_EH_PE_udata2 => self.write_udata(val, 2),
-            constants::DW_EH_PE_udata4 => self.write_udata(val, 4),
-            constants::DW_EH_PE_udata8 => self.write_udata(val, 8),
-            constants::DW_EH_PE_sleb128 => self.write_sleb128(val as i64),
-            constants::DW_EH_PE_sdata2 => self.write_sdata(val as i64, 2),
-            constants::DW_EH_PE_sdata4 => self.write_sdata(val as i64, 4),
-            constants::DW_EH_PE_sdata8 => self.write_sdata(val as i64, 8),
-            _ => {
-                return Err(Error::UnsupportedPointerEncoding(format));
-            }
-        }
-    }
-
-    /// Write an offset that is relative to the start of the given section.
-    ///
-    /// If the writer supports relocations, then it must provide its own implementation
-    /// of this method.
-    fn write_offset(&mut self, val: usize, _section: SectionId, size: u8) -> Result<()> {
-        self.write_udata(val as u64, size)
-    }
-
-    /// Write an offset that is relative to the start of the given section.
-    ///
-    /// If the writer supports relocations, then it must provide its own implementation
-    /// of this method.
-    fn write_offset_at(
-        &mut self,
-        offset: usize,
-        val: usize,
-        _section: SectionId,
-        size: u8,
-    ) -> Result<()> {
-        self.write_udata_at(offset, val as u64, size)
-    }
-
-    /// Write a reference to a symbol.
-    ///
-    /// If the writer supports symbols, then it must provide its own implementation
-    /// of this method.
-    fn write_reference(&mut self, _symbol: usize, _size: u8) -> Result<()> {
-        Err(Error::InvalidReference)
-    }
-
-    /// Write a u8.
-    fn write_u8(&mut self, val: u8) -> Result<()> {
-        let bytes = [val];
-        self.write(&bytes)
-    }
-
-    /// Write a u16.
-    fn write_u16(&mut self, val: u16) -> Result<()> {
-        let mut bytes = [0; 2];
-        self.endian().write_u16(&mut bytes, val);
-        self.write(&bytes)
-    }
-
-    /// Write a u32.
-    fn write_u32(&mut self, val: u32) -> Result<()> {
-        let mut bytes = [0; 4];
-        self.endian().write_u32(&mut bytes, val);
-        self.write(&bytes)
-    }
-
-    /// Write a u64.
-    fn write_u64(&mut self, val: u64) -> Result<()> {
-        let mut bytes = [0; 8];
-        self.endian().write_u64(&mut bytes, val);
-        self.write(&bytes)
-    }
-
-    /// Write a u8 at the given offset.
-    fn write_u8_at(&mut self, offset: usize, val: u8) -> Result<()> {
-        let bytes = [val];
-        self.write_at(offset, &bytes)
-    }
-
-    /// Write a u16 at the given offset.
-    fn write_u16_at(&mut self, offset: usize, val: u16) -> Result<()> {
-        let mut bytes = [0; 2];
-        self.endian().write_u16(&mut bytes, val);
-        self.write_at(offset, &bytes)
-    }
-
-    /// Write a u32 at the given offset.
-    fn write_u32_at(&mut self, offset: usize, val: u32) -> Result<()> {
-        let mut bytes = [0; 4];
-        self.endian().write_u32(&mut bytes, val);
-        self.write_at(offset, &bytes)
-    }
-
-    /// Write a u64 at the given offset.
-    fn write_u64_at(&mut self, offset: usize, val: u64) -> Result<()> {
-        let mut bytes = [0; 8];
-        self.endian().write_u64(&mut bytes, val);
-        self.write_at(offset, &bytes)
-    }
-
-    /// Write unsigned data of the given size.
-    ///
-    /// Returns an error if the value is too large for the size.
-    /// This must not be used directly for values that may require relocation.
-    fn write_udata(&mut self, val: u64, size: u8) -> Result<()> {
-        match size {
-            1 => {
-                let write_val = val as u8;
-                if val != u64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u8(write_val)
-            }
-            2 => {
-                let write_val = val as u16;
-                if val != u64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u16(write_val)
-            }
-            4 => {
-                let write_val = val as u32;
-                if val != u64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u32(write_val)
-            }
-            8 => self.write_u64(val),
-            otherwise => Err(Error::UnsupportedWordSize(otherwise)),
-        }
-    }
-
-    /// Write signed data of the given size.
-    ///
-    /// Returns an error if the value is too large for the size.
-    /// This must not be used directly for values that may require relocation.
-    fn write_sdata(&mut self, val: i64, size: u8) -> Result<()> {
-        match size {
-            1 => {
-                let write_val = val as i8;
-                if val != i64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u8(write_val as u8)
-            }
-            2 => {
-                let write_val = val as i16;
-                if val != i64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u16(write_val as u16)
-            }
-            4 => {
-                let write_val = val as i32;
-                if val != i64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u32(write_val as u32)
-            }
-            8 => self.write_u64(val as u64),
-            otherwise => Err(Error::UnsupportedWordSize(otherwise)),
-        }
-    }
-
-    /// Write a word of the given size at the given offset.
-    ///
-    /// Returns an error if the value is too large for the size.
-    /// This must not be used directly for values that may require relocation.
-    fn write_udata_at(&mut self, offset: usize, val: u64, size: u8) -> Result<()> {
-        match size {
-            1 => {
-                let write_val = val as u8;
-                if val != u64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u8_at(offset, write_val)
-            }
-            2 => {
-                let write_val = val as u16;
-                if val != u64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u16_at(offset, write_val)
-            }
-            4 => {
-                let write_val = val as u32;
-                if val != u64::from(write_val) {
-                    return Err(Error::ValueTooLarge);
-                }
-                self.write_u32_at(offset, write_val)
-            }
-            8 => self.write_u64_at(offset, val),
-            otherwise => Err(Error::UnsupportedWordSize(otherwise)),
-        }
-    }
-
-    /// Write an unsigned LEB128 encoded integer.
-    fn write_uleb128(&mut self, val: u64) -> Result<()> {
-        let mut bytes = [0u8; 10];
-        // bytes is long enough so this will never fail.
-        let len = leb128::write::unsigned(&mut { &mut bytes[..] }, val).unwrap();
-        self.write(&bytes[..len])
-    }
-
-    /// Read an unsigned LEB128 encoded integer.
-    fn write_sleb128(&mut self, val: i64) -> Result<()> {
-        let mut bytes = [0u8; 10];
-        // bytes is long enough so this will never fail.
-        let len = leb128::write::signed(&mut { &mut bytes[..] }, val).unwrap();
-        self.write(&bytes[..len])
-    }
-
-    /// Write an initial length according to the given DWARF format.
-    ///
-    /// This will only write a length of zero, since the length isn't
-    /// known yet, and a subsequent call to `write_initial_length_at`
-    /// will write the actual length.
-    fn write_initial_length(&mut self, format: Format) -> Result<InitialLengthOffset> {
-        if format == Format::Dwarf64 {
-            self.write_u32(0xffff_ffff)?;
-        }
-        let offset = InitialLengthOffset(self.len());
-        self.write_udata(0, format.word_size())?;
-        Ok(offset)
-    }
-
-    /// Write an initial length at the given offset according to the given DWARF format.
-    ///
-    /// `write_initial_length` must have previously returned the offset.
-    fn write_initial_length_at(
-        &mut self,
-        offset: InitialLengthOffset,
-        length: u64,
-        format: Format,
-    ) -> Result<()> {
-        self.write_udata_at(offset.0, length, format.word_size())
-    }
-}
-
-/// The offset at which an initial length should be written.
-#[derive(Debug, Clone, Copy)]
-pub struct InitialLengthOffset(usize);
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::write;
-    use crate::{BigEndian, LittleEndian};
-    use std::{i64, u64};
-
-    #[test]
-    #[allow(clippy::cyclomatic_complexity)]
-    fn test_writer() {
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_address(Address::Constant(0x1122_3344), 4).unwrap();
-        assert_eq!(w.slice(), &[0x44, 0x33, 0x22, 0x11]);
-        assert_eq!(
-            w.write_address(
-                Address::Symbol {
-                    symbol: 0,
-                    addend: 0
-                },
-                4
-            ),
-            Err(Error::InvalidAddress)
-        );
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_offset(0x1122_3344, SectionId::DebugInfo, 4)
-            .unwrap();
-        assert_eq!(w.slice(), &[0x44, 0x33, 0x22, 0x11]);
-        w.write_offset_at(1, 0x5566, SectionId::DebugInfo, 2)
-            .unwrap();
-        assert_eq!(w.slice(), &[0x44, 0x66, 0x55, 0x11]);
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_u8(0x11).unwrap();
-        w.write_u16(0x2233).unwrap();
-        w.write_u32(0x4455_6677).unwrap();
-        w.write_u64(0x8081_8283_8485_8687).unwrap();
-        #[rustfmt::skip]
-        assert_eq!(w.slice(), &[
-            0x11,
-            0x33, 0x22,
-            0x77, 0x66, 0x55, 0x44,
-            0x87, 0x86, 0x85, 0x84, 0x83, 0x82, 0x81, 0x80,
-        ]);
-        w.write_u8_at(14, 0x11).unwrap();
-        w.write_u16_at(12, 0x2233).unwrap();
-        w.write_u32_at(8, 0x4455_6677).unwrap();
-        w.write_u64_at(0, 0x8081_8283_8485_8687).unwrap();
-        #[rustfmt::skip]
-        assert_eq!(w.slice(), &[
-            0x87, 0x86, 0x85, 0x84, 0x83, 0x82, 0x81, 0x80,
-            0x77, 0x66, 0x55, 0x44,
-            0x33, 0x22,
-            0x11,
-        ]);
-
-        let mut w = write::EndianVec::new(BigEndian);
-        w.write_u8(0x11).unwrap();
-        w.write_u16(0x2233).unwrap();
-        w.write_u32(0x4455_6677).unwrap();
-        w.write_u64(0x8081_8283_8485_8687).unwrap();
-        #[rustfmt::skip]
-        assert_eq!(w.slice(), &[
-            0x11,
-            0x22, 0x33,
-            0x44, 0x55, 0x66, 0x77,
-            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-        ]);
-        w.write_u8_at(14, 0x11).unwrap();
-        w.write_u16_at(12, 0x2233).unwrap();
-        w.write_u32_at(8, 0x4455_6677).unwrap();
-        w.write_u64_at(0, 0x8081_8283_8485_8687).unwrap();
-        #[rustfmt::skip]
-        assert_eq!(w.slice(), &[
-            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-            0x44, 0x55, 0x66, 0x77,
-            0x22, 0x33,
-            0x11,
-        ]);
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_udata(0x11, 1).unwrap();
-        w.write_udata(0x2233, 2).unwrap();
-        w.write_udata(0x4455_6677, 4).unwrap();
-        w.write_udata(0x8081_8283_8485_8687, 8).unwrap();
-        #[rustfmt::skip]
-        assert_eq!(w.slice(), &[
-            0x11,
-            0x33, 0x22,
-            0x77, 0x66, 0x55, 0x44,
-            0x87, 0x86, 0x85, 0x84, 0x83, 0x82, 0x81, 0x80,
-        ]);
-        assert_eq!(w.write_udata(0x100, 1), Err(Error::ValueTooLarge));
-        assert_eq!(w.write_udata(0x1_0000, 2), Err(Error::ValueTooLarge));
-        assert_eq!(w.write_udata(0x1_0000_0000, 4), Err(Error::ValueTooLarge));
-        assert_eq!(w.write_udata(0x00, 3), Err(Error::UnsupportedWordSize(3)));
-        w.write_udata_at(14, 0x11, 1).unwrap();
-        w.write_udata_at(12, 0x2233, 2).unwrap();
-        w.write_udata_at(8, 0x4455_6677, 4).unwrap();
-        w.write_udata_at(0, 0x8081_8283_8485_8687, 8).unwrap();
-        #[rustfmt::skip]
-        assert_eq!(w.slice(), &[
-            0x87, 0x86, 0x85, 0x84, 0x83, 0x82, 0x81, 0x80,
-            0x77, 0x66, 0x55, 0x44,
-            0x33, 0x22,
-            0x11,
-        ]);
-        assert_eq!(w.write_udata_at(0, 0x100, 1), Err(Error::ValueTooLarge));
-        assert_eq!(w.write_udata_at(0, 0x1_0000, 2), Err(Error::ValueTooLarge));
-        assert_eq!(
-            w.write_udata_at(0, 0x1_0000_0000, 4),
-            Err(Error::ValueTooLarge)
-        );
-        assert_eq!(
-            w.write_udata_at(0, 0x00, 3),
-            Err(Error::UnsupportedWordSize(3))
-        );
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_uleb128(0).unwrap();
-        assert_eq!(w.slice(), &[0]);
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_uleb128(u64::MAX).unwrap();
-        assert_eq!(
-            w.slice(),
-            &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 1]
-        );
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_sleb128(0).unwrap();
-        assert_eq!(w.slice(), &[0]);
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_sleb128(i64::MAX).unwrap();
-        assert_eq!(
-            w.slice(),
-            &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0]
-        );
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        w.write_sleb128(i64::MIN).unwrap();
-        assert_eq!(
-            w.slice(),
-            &[0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7f]
-        );
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        let offset = w.write_initial_length(Format::Dwarf32).unwrap();
-        assert_eq!(w.slice(), &[0, 0, 0, 0]);
-        w.write_initial_length_at(offset, 0x1122_3344, Format::Dwarf32)
-            .unwrap();
-        assert_eq!(w.slice(), &[0x44, 0x33, 0x22, 0x11]);
-        assert_eq!(
-            w.write_initial_length_at(offset, 0x1_0000_0000, Format::Dwarf32),
-            Err(Error::ValueTooLarge)
-        );
-
-        let mut w = write::EndianVec::new(LittleEndian);
-        let offset = w.write_initial_length(Format::Dwarf64).unwrap();
-        assert_eq!(w.slice(), &[0xff, 0xff, 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0]);
-        w.write_initial_length_at(offset, 0x1122_3344_5566_7788, Format::Dwarf64)
-            .unwrap();
-        assert_eq!(
-            w.slice(),
-            &[0xff, 0xff, 0xff, 0xff, 0x88, 0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11]
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/tests/convert_self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/tests/convert_self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/tests/convert_self.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/tests/convert_self.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-#![cfg(all(feature = "read", feature = "write"))]
-
-use std::env;
-use std::fs::File;
-use std::io::Read;
-use std::path::PathBuf;
-
-use gimli::read;
-use gimli::write::{self, Address, EndianVec};
-use gimli::LittleEndian;
-
-fn read_section(section: &str) -> Vec<u8> {
-    let mut path = PathBuf::new();
-    if let Ok(dir) = env::var("CARGO_MANIFEST_DIR") {
-        path.push(dir);
-    }
-    path.push("fixtures/self");
-    path.push(section);
-
-    println!("Reading section \"{}\" at path {:?}", section, path);
-    assert!(path.is_file());
-    let mut file = File::open(path).unwrap();
-
-    let mut buf = Vec::new();
-    file.read_to_end(&mut buf).unwrap();
-    buf
-}
-
-#[test]
-fn test_convert_debug_info() {
-    // Convert existing sections
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = read::DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_info = read_section("debug_info");
-    let debug_info = read::DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_line = read_section("debug_line");
-    let debug_line = read::DebugLine::new(&debug_line, LittleEndian);
-
-    let debug_str = read_section("debug_str");
-    let debug_str = read::DebugStr::new(&debug_str, LittleEndian);
-
-    let debug_ranges = read_section("debug_ranges");
-    let debug_ranges = read::DebugRanges::new(&debug_ranges, LittleEndian);
-
-    let debug_rnglists = read::DebugRngLists::new(&[], LittleEndian);
-
-    let ranges = gimli::RangeLists::new(debug_ranges, debug_rnglists);
-
-    let debug_loc = read_section("debug_loc");
-    let debug_loc = read::DebugLoc::new(&debug_loc, LittleEndian);
-
-    let debug_loclists = read::DebugLocLists::new(&[], LittleEndian);
-
-    let locations = gimli::LocationLists::new(debug_loc, debug_loclists);
-
-    let dwarf = read::Dwarf {
-        debug_abbrev,
-        debug_info,
-        debug_line,
-        debug_str,
-        ranges,
-        locations,
-        ..Default::default()
-    };
-
-    let mut dwarf = write::Dwarf::from(&dwarf, &|address| Some(Address::Constant(address)))
-        .expect("Should convert DWARF information");
-
-    assert_eq!(dwarf.units.count(), 23);
-    let entries: usize = (0..dwarf.units.count())
-        .map(|i| dwarf.units.get(dwarf.units.id(i)).count())
-        .sum();
-    assert_eq!(entries, 29_560);
-    assert_eq!(dwarf.line_strings.count(), 0);
-    assert_eq!(dwarf.strings.count(), 3921);
-
-    // Write to new sections
-    let mut write_sections = write::Sections::new(EndianVec::new(LittleEndian));
-    dwarf
-        .write(&mut write_sections)
-        .expect("Should write DWARF information");
-    let debug_info_data = write_sections.debug_info.slice();
-    let debug_abbrev_data = write_sections.debug_abbrev.slice();
-    let debug_line_data = write_sections.debug_line.slice();
-    let debug_ranges_data = write_sections.debug_ranges.slice();
-    let debug_loc_data = write_sections.debug_loc.slice();
-    let debug_str_data = write_sections.debug_str.slice();
-    assert_eq!(debug_info_data.len(), 394_930);
-    assert_eq!(debug_abbrev_data.len(), 9701);
-    assert_eq!(debug_line_data.len(), 105_797);
-    assert_eq!(debug_ranges_data.len(), 155_712);
-    assert_eq!(debug_loc_data.len(), 245_168);
-    assert_eq!(debug_str_data.len(), 144_731);
-
-    // Convert new sections
-    let debug_abbrev = read::DebugAbbrev::new(debug_abbrev_data, LittleEndian);
-    let debug_info = read::DebugInfo::new(debug_info_data, LittleEndian);
-    let debug_line = read::DebugLine::new(debug_line_data, LittleEndian);
-    let debug_str = read::DebugStr::new(debug_str_data, LittleEndian);
-    let debug_ranges = read::DebugRanges::new(debug_ranges_data, LittleEndian);
-    let debug_rnglists = read::DebugRngLists::new(&[], LittleEndian);
-    let debug_loc = read::DebugLoc::new(debug_loc_data, LittleEndian);
-    let debug_loclists = read::DebugLocLists::new(&[], LittleEndian);
-
-    let ranges = gimli::RangeLists::new(debug_ranges, debug_rnglists);
-    let locations = gimli::LocationLists::new(debug_loc, debug_loclists);
-
-    let dwarf = read::Dwarf {
-        debug_abbrev,
-        debug_info,
-        debug_line,
-        debug_str,
-        ranges,
-        locations,
-        ..Default::default()
-    };
-
-    let dwarf = write::Dwarf::from(&dwarf, &|address| Some(Address::Constant(address)))
-        .expect("Should convert DWARF information");
-
-    assert_eq!(dwarf.units.count(), 23);
-    let entries: usize = (0..dwarf.units.count())
-        .map(|i| dwarf.units.get(dwarf.units.id(i)).count())
-        .sum();
-    assert_eq!(entries, 29_560);
-    assert_eq!(dwarf.strings.count(), 3921);
-}
-
-#[test]
-fn test_convert_eh_frame() {
-    // Convert existing section
-    let eh_frame = read_section("eh_frame");
-    let mut eh_frame = read::EhFrame::new(&eh_frame, LittleEndian);
-    // The `.eh_frame` fixture data was created on a 64-bit machine.
-    eh_frame.set_address_size(8);
-    let frames = write::FrameTable::from(&eh_frame, &|address| Some(Address::Constant(address)))
-        .expect("Should convert eh_frame information");
-    assert_eq!(frames.cie_count(), 2);
-    assert_eq!(frames.fde_count(), 3482);
-
-    // Write to new section
-    let mut write_eh_frame = write::EhFrame(EndianVec::new(LittleEndian));
-    frames
-        .write_eh_frame(&mut write_eh_frame)
-        .expect("Should write eh_frame information");
-    let eh_frame = write_eh_frame.slice();
-    assert_eq!(eh_frame.len(), 147152);
-
-    // Convert new section
-    let mut eh_frame = read::EhFrame::new(&eh_frame, LittleEndian);
-    eh_frame.set_address_size(8);
-    let frames = write::FrameTable::from(&eh_frame, &|address| Some(Address::Constant(address)))
-        .expect("Should convert eh_frame information");
-    assert_eq!(frames.cie_count(), 2);
-    assert_eq!(frames.fde_count(), 3482);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/tests/parse_self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/tests/parse_self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.22.0/tests/parse_self.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.22.0/tests/parse_self.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,427 +0,0 @@
-#![cfg(all(feature = "read", feature = "std", feature = "endian-reader"))]
-
-use gimli::{
-    AttributeValue, DebugAbbrev, DebugAddr, DebugAddrBase, DebugAranges, DebugInfo, DebugLine,
-    DebugLoc, DebugLocLists, DebugPubNames, DebugPubTypes, DebugRanges, DebugRngLists, DebugStr,
-    Encoding, EndianSlice, Expression, LittleEndian, LocationLists, Operation, RangeLists, Reader,
-};
-use std::collections::hash_map::HashMap;
-use std::env;
-use std::fs::File;
-use std::io::Read;
-use std::path::PathBuf;
-use std::rc::Rc;
-
-fn read_section(section: &str) -> Vec<u8> {
-    let mut path = PathBuf::new();
-    if let Ok(dir) = env::var("CARGO_MANIFEST_DIR") {
-        path.push(dir);
-    }
-    path.push("fixtures/self");
-    path.push(section);
-
-    println!("Reading section \"{}\" at path {:?}", section, path);
-    assert!(path.is_file());
-    let mut file = File::open(path).unwrap();
-
-    let mut buf = Vec::new();
-    file.read_to_end(&mut buf).unwrap();
-    buf
-}
-
-fn parse_expression<R: Reader>(expr: Expression<R>, encoding: Encoding) {
-    let mut pc = expr.0.clone();
-    while !pc.is_empty() {
-        Operation::parse(&mut pc, encoding).expect("Should parse operation");
-    }
-
-    // Also attempt to evaluate some of it.
-    let mut eval = expr.evaluation(encoding);
-    eval.set_initial_value(0);
-    eval.evaluate().expect("Should evaluate expression");
-}
-
-fn impl_parse_self_debug_info<R: gimli::Reader>(
-    debug_info: &DebugInfo<R>,
-    debug_abbrev: &DebugAbbrev<R>,
-) {
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-
-        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
-            let entry = cursor.current().expect("Should have a current entry");
-
-            let mut attrs = entry.attrs();
-            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
-                if let AttributeValue::Exprloc(expression) = attr.value() {
-                    parse_expression(expression, unit.encoding());
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn test_parse_self_debug_info() {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    impl_parse_self_debug_info(&debug_info, &debug_abbrev);
-}
-
-#[test]
-fn test_parse_self_debug_info_with_endian_rc_slice() {
-    let debug_info = read_section("debug_info");
-    let debug_info = Rc::from(&debug_info[..]);
-    let debug_info = gimli::EndianRcSlice::new(debug_info, LittleEndian);
-    let debug_info = DebugInfo::from(debug_info);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = Rc::from(&debug_abbrev[..]);
-    let debug_abbrev = gimli::EndianRcSlice::new(debug_abbrev, LittleEndian);
-    let debug_abbrev = DebugAbbrev::from(debug_abbrev);
-
-    impl_parse_self_debug_info(&debug_info, &debug_abbrev);
-}
-
-#[test]
-fn test_parse_self_debug_line() {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_line = read_section("debug_line");
-    let debug_line = DebugLine::new(&debug_line, LittleEndian);
-
-    let debug_str = read_section("debug_str");
-    let debug_str = DebugStr::new(&debug_str, LittleEndian);
-
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        cursor.next_dfs().expect("Should parse next dfs");
-
-        let unit_entry = cursor.current().expect("Should have a root entry");
-
-        let comp_dir = unit_entry
-            .attr_value(gimli::DW_AT_comp_dir)
-            .expect("Should parse comp_dir attribute")
-            .and_then(|val| val.string_value(&debug_str));
-        let comp_name = unit_entry
-            .attr_value(gimli::DW_AT_name)
-            .expect("Should parse name attribute")
-            .and_then(|val| val.string_value(&debug_str));
-
-        if let Some(AttributeValue::DebugLineRef(offset)) = unit_entry
-            .attr_value(gimli::DW_AT_stmt_list)
-            .expect("Should parse stmt_list")
-        {
-            let program = debug_line
-                .program(offset, unit.address_size(), comp_dir, comp_name)
-                .expect("should parse line number program header");
-
-            let mut results = Vec::new();
-            let mut rows = program.rows();
-            while let Some((_, row)) = rows
-                .next_row()
-                .expect("Should parse and execute all rows in the line number program")
-            {
-                results.push(*row);
-            }
-            results.reverse();
-
-            let program = debug_line
-                .program(offset, unit.address_size(), comp_dir, comp_name)
-                .expect("should parse line number program header");
-            let (program, sequences) = program
-                .sequences()
-                .expect("should parse and execute the entire line number program");
-            assert!(!sequences.is_empty()); // Should be at least one sequence.
-            for sequence in sequences {
-                let mut rows = program.resume_from(&sequence);
-                while let Some((_, row)) = rows
-                    .next_row()
-                    .expect("Should parse and execute all rows after resuming")
-                {
-                    let other_row = results.pop().unwrap();
-                    assert!(row.address() >= sequence.start);
-                    assert!(row.address() <= sequence.end);
-                    assert_eq!(row.address(), other_row.address());
-                    assert_eq!(row.line(), other_row.line());
-                }
-            }
-            assert!(results.is_empty());
-        }
-    }
-}
-
-#[test]
-fn test_parse_self_debug_loc() {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-    let debug_addr_base = DebugAddrBase(0);
-
-    let debug_loc = read_section("debug_loc");
-    let debug_loc = DebugLoc::new(&debug_loc, LittleEndian);
-    let debug_loclists = DebugLocLists::new(&[], LittleEndian);
-    let loclists = LocationLists::new(debug_loc, debug_loclists);
-
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        cursor.next_dfs().expect("Should parse next dfs");
-
-        let mut low_pc = 0;
-
-        {
-            let unit_entry = cursor.current().expect("Should have a root entry");
-            let low_pc_attr = unit_entry
-                .attr_value(gimli::DW_AT_low_pc)
-                .expect("Should parse low_pc");
-            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
-                low_pc = address;
-            }
-        }
-
-        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
-            let entry = cursor.current().expect("Should have a current entry");
-            let mut attrs = entry.attrs();
-            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
-                if let AttributeValue::LocationListsRef(offset) = attr.value() {
-                    let mut locs = loclists
-                        .locations(
-                            offset,
-                            unit.encoding(),
-                            low_pc,
-                            &debug_addr,
-                            debug_addr_base,
-                        )
-                        .expect("Should parse locations OK");
-                    while let Some(loc) = locs.next().expect("Should parse next location") {
-                        assert!(loc.range.begin <= loc.range.end);
-                        parse_expression(loc.data, unit.encoding());
-                    }
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn test_parse_self_debug_ranges() {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
-    let debug_addr_base = DebugAddrBase(0);
-
-    let debug_ranges = read_section("debug_ranges");
-    let debug_ranges = DebugRanges::new(&debug_ranges, LittleEndian);
-    let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
-    let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
-
-    let mut iter = debug_info.units();
-    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
-        let abbrevs = unit
-            .abbreviations(&debug_abbrev)
-            .expect("Should parse abbreviations");
-
-        let mut cursor = unit.entries(&abbrevs);
-        cursor.next_dfs().expect("Should parse next dfs");
-
-        let mut low_pc = 0;
-
-        {
-            let unit_entry = cursor.current().expect("Should have a root entry");
-            let low_pc_attr = unit_entry
-                .attr_value(gimli::DW_AT_low_pc)
-                .expect("Should parse low_pc");
-            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
-                low_pc = address;
-            }
-        }
-
-        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
-            let entry = cursor.current().expect("Should have a current entry");
-            let mut attrs = entry.attrs();
-            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
-                if let AttributeValue::RangeListsRef(offset) = attr.value() {
-                    let mut ranges = rnglists
-                        .ranges(
-                            offset,
-                            unit.encoding(),
-                            low_pc,
-                            &debug_addr,
-                            debug_addr_base,
-                        )
-                        .expect("Should parse ranges OK");
-                    while let Some(range) = ranges.next().expect("Should parse next range") {
-                        assert!(range.begin <= range.end);
-                    }
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn test_parse_self_debug_aranges() {
-    let debug_aranges = read_section("debug_aranges");
-    let debug_aranges = DebugAranges::new(&debug_aranges, LittleEndian);
-
-    let mut aranges = debug_aranges.items();
-    while let Some(_) = aranges.next().expect("Should parse arange OK") {
-        // Not really anything else we can check right now.
-    }
-}
-
-#[test]
-fn test_parse_self_debug_pubnames() {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_pubnames = read_section("debug_pubnames");
-    let debug_pubnames = DebugPubNames::new(&debug_pubnames, LittleEndian);
-
-    let mut units = HashMap::new();
-    let mut abbrevs = HashMap::new();
-    let mut pubnames = debug_pubnames.items();
-    while let Some(entry) = pubnames.next().expect("Should parse pubname OK") {
-        let unit_offset = entry.unit_header_offset();
-        let unit = units.entry(unit_offset).or_insert_with(|| {
-            debug_info
-                .header_from_offset(unit_offset)
-                .expect("Should parse unit header OK")
-        });
-        let abbrev_offset = unit.debug_abbrev_offset();
-        let abbrevs = abbrevs.entry(abbrev_offset).or_insert_with(|| {
-            debug_abbrev
-                .abbreviations(abbrev_offset)
-                .expect("Should parse abbreviations OK")
-        });
-        let mut cursor = unit
-            .entries_at_offset(abbrevs, entry.die_offset())
-            .expect("DIE offset should be valid");
-        assert!(cursor.next_dfs().expect("Should parse DIE").is_some());
-    }
-}
-
-#[test]
-fn test_parse_self_debug_pubtypes() {
-    let debug_info = read_section("debug_info");
-    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
-
-    let debug_abbrev = read_section("debug_abbrev");
-    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
-
-    let debug_pubtypes = read_section("debug_pubtypes");
-    let debug_pubtypes = DebugPubTypes::new(&debug_pubtypes, LittleEndian);
-
-    let mut units = HashMap::new();
-    let mut abbrevs = HashMap::new();
-    let mut pubtypes = debug_pubtypes.items();
-    while let Some(entry) = pubtypes.next().expect("Should parse pubtype OK") {
-        let unit_offset = entry.unit_header_offset();
-        let unit = units.entry(unit_offset).or_insert_with(|| {
-            debug_info
-                .header_from_offset(unit_offset)
-                .expect("Should parse unit header OK")
-        });
-        let abbrev_offset = unit.debug_abbrev_offset();
-        let abbrevs = abbrevs.entry(abbrev_offset).or_insert_with(|| {
-            debug_abbrev
-                .abbreviations(abbrev_offset)
-                .expect("Should parse abbreviations OK")
-        });
-        let mut cursor = unit
-            .entries_at_offset(abbrevs, entry.die_offset())
-            .expect("DIE offset should be valid");
-        assert!(cursor.next_dfs().expect("Should parse DIE").is_some());
-    }
-}
-
-#[test]
-fn test_parse_self_eh_frame() {
-    use gimli::{BaseAddresses, CieOrFde, EhFrame, UnwindSection};
-
-    let eh_frame = read_section("eh_frame");
-    let mut eh_frame = EhFrame::new(&eh_frame, LittleEndian);
-    // The `.eh_frame` fixture data was created on a 64-bit machine.
-    eh_frame.set_address_size(8);
-
-    let bases = BaseAddresses::default()
-        .set_eh_frame(0)
-        .set_text(0)
-        .set_got(0);
-    let mut entries = eh_frame.entries(&bases);
-    while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
-        match entry {
-            CieOrFde::Cie(cie) => {
-                let mut instrs = cie.instructions(&eh_frame, &bases);
-                while let Some(_) = instrs.next().expect("Can parse next CFI instruction OK") {
-                    // TODO FITZGEN
-                }
-            }
-            CieOrFde::Fde(partial) => {
-                let fde = partial
-                    .parse(UnwindSection::cie_from_offset)
-                    .expect("Should be able to get CIE for FDE");
-
-                let mut instrs = fde.instructions(&eh_frame, &bases);
-                while let Some(_) = instrs.next().expect("Can parse next CFI instruction OK") {
-                    // TODO FITZGEN
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn test_parse_self_eh_frame_hdr() {
-    use gimli::{BaseAddresses, EhFrameHdr};
-
-    let eh_frame_hdr = read_section("eh_frame_hdr");
-    let eh_frame_hdr = EhFrameHdr::new(&eh_frame_hdr, LittleEndian);
-
-    let bases = BaseAddresses::default()
-        .set_eh_frame(0)
-        .set_eh_frame_hdr(0)
-        .set_text(0)
-        .set_got(0);
-
-    // `.eh_frame_hdr` was generated on a 64 bit machine.
-    let address_size = 8;
-
-    let _parsed_header = eh_frame_hdr
-        .parse(&bases, address_size)
-        .expect("we can parse the `.eh_frame_hdr` section OK");
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/benches/bench.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/benches/bench.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,807 @@
+#![feature(test)]
+
+extern crate test;
+
+use gimli::{
+    AttributeValue, DebugAbbrev, DebugAddr, DebugAddrBase, DebugAranges, DebugInfo, DebugLine,
+    DebugLineOffset, DebugLoc, DebugLocLists, DebugPubNames, DebugPubTypes, DebugRanges,
+    DebugRngLists, Encoding, EndianSlice, EntriesTreeNode, Expression, LittleEndian, LocationLists,
+    Operation, RangeLists, Reader, ReaderOffset,
+};
+use std::env;
+use std::fs::File;
+use std::io::Read;
+use std::path::PathBuf;
+use std::rc::Rc;
+
+pub fn read_section(section: &str) -> Vec<u8> {
+    let mut path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".into()));
+    path.push("./fixtures/self/");
+    path.push(section);
+
+    assert!(path.is_file());
+    let mut file = File::open(path).unwrap();
+
+    let mut buf = Vec::new();
+    file.read_to_end(&mut buf).unwrap();
+    buf
+}
+
+#[bench]
+fn bench_parsing_debug_abbrev(b: &mut test::Bencher) {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+    let unit = debug_info
+        .units()
+        .next()
+        .expect("Should have at least one compilation unit")
+        .expect("And it should parse OK");
+
+    let debug_abbrev = read_section("debug_abbrev");
+
+    b.iter(|| {
+        let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+        test::black_box(
+            unit.abbreviations(&debug_abbrev)
+                .expect("Should parse abbreviations"),
+        );
+    });
+}
+
+#[inline]
+fn impl_bench_parsing_debug_info<R: Reader>(
+    debug_info: DebugInfo<R>,
+    debug_abbrev: DebugAbbrev<R>,
+) {
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        while let Some((_, entry)) = cursor.next_dfs().expect("Should parse next dfs") {
+            let mut attrs = entry.attrs();
+            loop {
+                match attrs.next() {
+                    Ok(Some(ref attr)) => {
+                        test::black_box(attr);
+                    }
+                    Ok(None) => break,
+                    e @ Err(_) => {
+                        e.expect("Should parse entry's attribute");
+                    }
+                }
+            }
+        }
+    }
+}
+
+#[bench]
+fn bench_parsing_debug_info(b: &mut test::Bencher) {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    b.iter(|| impl_bench_parsing_debug_info(debug_info, debug_abbrev));
+}
+
+#[bench]
+fn bench_parsing_debug_info_with_endian_rc_slice(b: &mut test::Bencher) {
+    let debug_info = read_section("debug_info");
+    let debug_info = Rc::from(&debug_info[..]);
+    let debug_info = gimli::EndianRcSlice::new(debug_info, LittleEndian);
+    let debug_info = DebugInfo::from(debug_info);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = Rc::from(&debug_abbrev[..]);
+    let debug_abbrev = gimli::EndianRcSlice::new(debug_abbrev, LittleEndian);
+    let debug_abbrev = DebugAbbrev::from(debug_abbrev);
+
+    b.iter(|| impl_bench_parsing_debug_info(debug_info.clone(), debug_abbrev.clone()));
+}
+
+#[bench]
+fn bench_parsing_debug_info_tree(b: &mut test::Bencher) {
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_info = read_section("debug_info");
+
+    b.iter(|| {
+        let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+        let mut iter = debug_info.units();
+        while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+            let abbrevs = unit
+                .abbreviations(&debug_abbrev)
+                .expect("Should parse abbreviations");
+
+            let mut tree = unit
+                .entries_tree(&abbrevs, None)
+                .expect("Should have entries tree");
+            let root = tree.root().expect("Should parse root entry");
+            parse_debug_info_tree(root);
+        }
+    });
+}
+
+fn parse_debug_info_tree<R: Reader>(node: EntriesTreeNode<R>) {
+    {
+        let mut attrs = node.entry().attrs();
+        loop {
+            match attrs.next() {
+                Ok(Some(ref attr)) => {
+                    test::black_box(attr);
+                }
+                Ok(None) => break,
+                e @ Err(_) => {
+                    e.expect("Should parse entry's attribute");
+                }
+            }
+        }
+    }
+    let mut children = node.children();
+    while let Some(child) = children.next().expect("Should parse child entry") {
+        parse_debug_info_tree(child);
+    }
+}
+
+#[bench]
+fn bench_parsing_debug_info_raw(b: &mut test::Bencher) {
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_info = read_section("debug_info");
+
+    b.iter(|| {
+        let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+        let mut iter = debug_info.units();
+        while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+            let abbrevs = unit
+                .abbreviations(&debug_abbrev)
+                .expect("Should parse abbreviations");
+
+            let mut raw = unit
+                .entries_raw(&abbrevs, None)
+                .expect("Should have entries");
+            while !raw.is_empty() {
+                if let Some(abbrev) = raw
+                    .read_abbreviation()
+                    .expect("Should parse abbreviation code")
+                {
+                    for spec in abbrev.attributes().iter().cloned() {
+                        match raw.read_attribute(spec) {
+                            Ok(ref attr) => {
+                                test::black_box(attr);
+                            }
+                            e @ Err(_) => {
+                                e.expect("Should parse attribute");
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    });
+}
+
+#[bench]
+fn bench_parsing_debug_aranges(b: &mut test::Bencher) {
+    let debug_aranges = read_section("debug_aranges");
+    let debug_aranges = DebugAranges::new(&debug_aranges, LittleEndian);
+
+    b.iter(|| {
+        let mut headers = debug_aranges.headers();
+        while let Some(header) = headers.next().expect("Should parse arange header OK") {
+            let mut entries = header.entries();
+            while let Some(arange) = entries.next().expect("Should parse arange entry OK") {
+                test::black_box(arange);
+            }
+        }
+    });
+}
+
+#[bench]
+fn bench_parsing_debug_pubnames(b: &mut test::Bencher) {
+    let debug_pubnames = read_section("debug_pubnames");
+    let debug_pubnames = DebugPubNames::new(&debug_pubnames, LittleEndian);
+
+    b.iter(|| {
+        let mut pubnames = debug_pubnames.items();
+        while let Some(pubname) = pubnames.next().expect("Should parse pubname OK") {
+            test::black_box(pubname);
+        }
+    });
+}
+
+#[bench]
+fn bench_parsing_debug_pubtypes(b: &mut test::Bencher) {
+    let debug_pubtypes = read_section("debug_pubtypes");
+    let debug_pubtypes = DebugPubTypes::new(&debug_pubtypes, LittleEndian);
+
+    b.iter(|| {
+        let mut pubtypes = debug_pubtypes.items();
+        while let Some(pubtype) = pubtypes.next().expect("Should parse pubtype OK") {
+            test::black_box(pubtype);
+        }
+    });
+}
+
+// We happen to know that there is a line number program and header at
+// offset 0 and that address size is 8 bytes. No need to parse DIEs to grab
+// this info off of the compilation units.
+const OFFSET: DebugLineOffset = DebugLineOffset(0);
+const ADDRESS_SIZE: u8 = 8;
+
+#[bench]
+fn bench_parsing_line_number_program_opcodes(b: &mut test::Bencher) {
+    let debug_line = read_section("debug_line");
+    let debug_line = DebugLine::new(&debug_line, LittleEndian);
+
+    b.iter(|| {
+        let program = debug_line
+            .program(OFFSET, ADDRESS_SIZE, None, None)
+            .expect("Should parse line number program header");
+        let header = program.header();
+
+        let mut instructions = header.instructions();
+        while let Some(instruction) = instructions
+            .next_instruction(header)
+            .expect("Should parse instruction")
+        {
+            test::black_box(instruction);
+        }
+    });
+}
+
+#[bench]
+fn bench_executing_line_number_programs(b: &mut test::Bencher) {
+    let debug_line = read_section("debug_line");
+    let debug_line = DebugLine::new(&debug_line, LittleEndian);
+
+    b.iter(|| {
+        let program = debug_line
+            .program(OFFSET, ADDRESS_SIZE, None, None)
+            .expect("Should parse line number program header");
+
+        let mut rows = program.rows();
+        while let Some(row) = rows
+            .next_row()
+            .expect("Should parse and execute all rows in the line number program")
+        {
+            test::black_box(row);
+        }
+    });
+}
+
+#[bench]
+fn bench_parsing_debug_loc(b: &mut test::Bencher) {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+    let debug_addr_base = DebugAddrBase(0);
+
+    let debug_loc = read_section("debug_loc");
+    let debug_loc = DebugLoc::new(&debug_loc, LittleEndian);
+    let debug_loclists = DebugLocLists::new(&[], LittleEndian);
+    let loclists = LocationLists::new(debug_loc, debug_loclists);
+
+    let mut offsets = Vec::new();
+
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        cursor.next_dfs().expect("Should parse next dfs");
+
+        let mut low_pc = 0;
+
+        {
+            let unit_entry = cursor.current().expect("Should have a root entry");
+            let low_pc_attr = unit_entry
+                .attr_value(gimli::DW_AT_low_pc)
+                .expect("Should parse low_pc");
+            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
+                low_pc = address;
+            }
+        }
+
+        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
+            let entry = cursor.current().expect("Should have a current entry");
+            let mut attrs = entry.attrs();
+            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
+                if let gimli::AttributeValue::LocationListsRef(offset) = attr.value() {
+                    offsets.push((offset, unit.encoding(), low_pc));
+                }
+            }
+        }
+    }
+
+    b.iter(|| {
+        for &(offset, encoding, base_address) in &*offsets {
+            let mut locs = loclists
+                .locations(offset, encoding, base_address, &debug_addr, debug_addr_base)
+                .expect("Should parse locations OK");
+            while let Some(loc) = locs.next().expect("Should parse next location") {
+                test::black_box(loc);
+            }
+        }
+    });
+}
+
+#[bench]
+fn bench_parsing_debug_ranges(b: &mut test::Bencher) {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+    let debug_addr_base = DebugAddrBase(0);
+
+    let debug_ranges = read_section("debug_ranges");
+    let debug_ranges = DebugRanges::new(&debug_ranges, LittleEndian);
+    let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
+    let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
+
+    let mut offsets = Vec::new();
+
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        cursor.next_dfs().expect("Should parse next dfs");
+
+        let mut low_pc = 0;
+
+        {
+            let unit_entry = cursor.current().expect("Should have a root entry");
+            let low_pc_attr = unit_entry
+                .attr_value(gimli::DW_AT_low_pc)
+                .expect("Should parse low_pc");
+            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
+                low_pc = address;
+            }
+        }
+
+        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
+            let entry = cursor.current().expect("Should have a current entry");
+            let mut attrs = entry.attrs();
+            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
+                if let gimli::AttributeValue::RangeListsRef(offset) = attr.value() {
+                    offsets.push((offset, unit.encoding(), low_pc));
+                }
+            }
+        }
+    }
+
+    b.iter(|| {
+        for &(offset, encoding, base_address) in &*offsets {
+            let mut ranges = rnglists
+                .ranges(offset, encoding, base_address, &debug_addr, debug_addr_base)
+                .expect("Should parse ranges OK");
+            while let Some(range) = ranges.next().expect("Should parse next range") {
+                test::black_box(range);
+            }
+        }
+    });
+}
+
+fn debug_info_expressions<R: Reader>(
+    debug_info: &DebugInfo<R>,
+    debug_abbrev: &DebugAbbrev<R>,
+) -> Vec<(Expression<R>, Encoding)> {
+    let mut expressions = Vec::new();
+
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        while let Some((_, entry)) = cursor.next_dfs().expect("Should parse next dfs") {
+            let mut attrs = entry.attrs();
+            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
+                if let AttributeValue::Exprloc(expression) = attr.value() {
+                    expressions.push((expression, unit.encoding()));
+                }
+            }
+        }
+    }
+
+    expressions
+}
+
+#[bench]
+fn bench_parsing_debug_info_expressions(b: &mut test::Bencher) {
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let expressions = debug_info_expressions(&debug_info, &debug_abbrev);
+
+    b.iter(|| {
+        for &(expression, encoding) in &*expressions {
+            let mut pc = expression.0;
+            while !pc.is_empty() {
+                Operation::parse(&mut pc, encoding).expect("Should parse operation");
+            }
+        }
+    });
+}
+
+#[bench]
+fn bench_evaluating_debug_info_expressions(b: &mut test::Bencher) {
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let expressions = debug_info_expressions(&debug_info, &debug_abbrev);
+
+    b.iter(|| {
+        for &(expression, encoding) in &*expressions {
+            let mut eval = expression.evaluation(encoding);
+            eval.set_initial_value(0);
+            let result = eval.evaluate().expect("Should evaluate expression");
+            test::black_box(result);
+        }
+    });
+}
+
+fn debug_loc_expressions<R: Reader>(
+    debug_info: &DebugInfo<R>,
+    debug_abbrev: &DebugAbbrev<R>,
+    debug_addr: &DebugAddr<R>,
+    loclists: &LocationLists<R>,
+) -> Vec<(Expression<R>, Encoding)> {
+    let debug_addr_base = DebugAddrBase(R::Offset::from_u8(0));
+
+    let mut expressions = Vec::new();
+
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        cursor.next_dfs().expect("Should parse next dfs");
+
+        let mut low_pc = 0;
+
+        {
+            let unit_entry = cursor.current().expect("Should have a root entry");
+            let low_pc_attr = unit_entry
+                .attr_value(gimli::DW_AT_low_pc)
+                .expect("Should parse low_pc");
+            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
+                low_pc = address;
+            }
+        }
+
+        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
+            let entry = cursor.current().expect("Should have a current entry");
+            let mut attrs = entry.attrs();
+            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
+                if let gimli::AttributeValue::LocationListsRef(offset) = attr.value() {
+                    let mut locs = loclists
+                        .locations(offset, unit.encoding(), low_pc, debug_addr, debug_addr_base)
+                        .expect("Should parse locations OK");
+                    while let Some(loc) = locs.next().expect("Should parse next location") {
+                        expressions.push((loc.data, unit.encoding()));
+                    }
+                }
+            }
+        }
+    }
+
+    expressions
+}
+
+#[bench]
+fn bench_parsing_debug_loc_expressions(b: &mut test::Bencher) {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+
+    let debug_loc = read_section("debug_loc");
+    let debug_loc = DebugLoc::new(&debug_loc, LittleEndian);
+    let debug_loclists = DebugLocLists::new(&[], LittleEndian);
+    let loclists = LocationLists::new(debug_loc, debug_loclists);
+
+    let expressions = debug_loc_expressions(&debug_info, &debug_abbrev, &debug_addr, &loclists);
+
+    b.iter(|| {
+        for &(expression, encoding) in &*expressions {
+            let mut pc = expression.0;
+            while !pc.is_empty() {
+                Operation::parse(&mut pc, encoding).expect("Should parse operation");
+            }
+        }
+    });
+}
+
+#[bench]
+fn bench_evaluating_debug_loc_expressions(b: &mut test::Bencher) {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+
+    let debug_loc = read_section("debug_loc");
+    let debug_loc = DebugLoc::new(&debug_loc, LittleEndian);
+    let debug_loclists = DebugLocLists::new(&[], LittleEndian);
+    let loclists = LocationLists::new(debug_loc, debug_loclists);
+
+    let expressions = debug_loc_expressions(&debug_info, &debug_abbrev, &debug_addr, &loclists);
+
+    b.iter(|| {
+        for &(expression, encoding) in &*expressions {
+            let mut eval = expression.evaluation(encoding);
+            eval.set_initial_value(0);
+            let result = eval.evaluate().expect("Should evaluate expression");
+            test::black_box(result);
+        }
+    });
+}
+
+// See comment above `test_parse_self_eh_frame`.
+#[cfg(target_pointer_width = "64")]
+mod cfi {
+    use super::*;
+    use fallible_iterator::FallibleIterator;
+
+    use gimli::{
+        BaseAddresses, CieOrFde, EhFrame, FrameDescriptionEntry, LittleEndian,
+        UninitializedUnwindContext, UnwindSection,
+    };
+
+    #[bench]
+    fn iterate_entries_and_do_not_parse_any_fde(b: &mut test::Bencher) {
+        let eh_frame = read_section("eh_frame");
+        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
+
+        let bases = BaseAddresses::default()
+            .set_eh_frame(0)
+            .set_got(0)
+            .set_text(0);
+
+        b.iter(|| {
+            let mut entries = eh_frame.entries(&bases);
+            while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
+                test::black_box(entry);
+            }
+        });
+    }
+
+    #[bench]
+    fn iterate_entries_and_parse_every_fde(b: &mut test::Bencher) {
+        let eh_frame = read_section("eh_frame");
+        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
+
+        let bases = BaseAddresses::default()
+            .set_eh_frame(0)
+            .set_got(0)
+            .set_text(0);
+
+        b.iter(|| {
+            let mut entries = eh_frame.entries(&bases);
+            while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
+                match entry {
+                    CieOrFde::Cie(cie) => {
+                        test::black_box(cie);
+                    }
+                    CieOrFde::Fde(partial) => {
+                        let fde = partial
+                            .parse(EhFrame::cie_from_offset)
+                            .expect("Should be able to get CIE for FED");
+                        test::black_box(fde);
+                    }
+                };
+            }
+        });
+    }
+
+    #[bench]
+    fn iterate_entries_and_parse_every_fde_and_instructions(b: &mut test::Bencher) {
+        let eh_frame = read_section("eh_frame");
+        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
+
+        let bases = BaseAddresses::default()
+            .set_eh_frame(0)
+            .set_got(0)
+            .set_text(0);
+
+        b.iter(|| {
+            let mut entries = eh_frame.entries(&bases);
+            while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
+                match entry {
+                    CieOrFde::Cie(cie) => {
+                        let mut instrs = cie.instructions(&eh_frame, &bases);
+                        while let Some(i) =
+                            instrs.next().expect("Can parse next CFI instruction OK")
+                        {
+                            test::black_box(i);
+                        }
+                    }
+                    CieOrFde::Fde(partial) => {
+                        let fde = partial
+                            .parse(EhFrame::cie_from_offset)
+                            .expect("Should be able to get CIE for FED");
+                        let mut instrs = fde.instructions(&eh_frame, &bases);
+                        while let Some(i) =
+                            instrs.next().expect("Can parse next CFI instruction OK")
+                        {
+                            test::black_box(i);
+                        }
+                    }
+                };
+            }
+        });
+    }
+
+    #[bench]
+    fn iterate_entries_evaluate_every_fde(b: &mut test::Bencher) {
+        let eh_frame = read_section("eh_frame");
+        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
+
+        let bases = BaseAddresses::default()
+            .set_eh_frame(0)
+            .set_got(0)
+            .set_text(0);
+
+        let mut ctx = UninitializedUnwindContext::new();
+
+        b.iter(|| {
+            let mut entries = eh_frame.entries(&bases);
+            while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
+                match entry {
+                    CieOrFde::Cie(_) => {}
+                    CieOrFde::Fde(partial) => {
+                        let fde = partial
+                            .parse(EhFrame::cie_from_offset)
+                            .expect("Should be able to get CIE for FED");
+                        let mut table = fde
+                            .rows(&eh_frame, &bases, &mut ctx)
+                            .expect("Should be able to initialize ctx");
+                        while let Some(row) =
+                            table.next_row().expect("Should get next unwind table row")
+                        {
+                            test::black_box(row);
+                        }
+                    }
+                };
+            }
+        });
+    }
+
+    fn instrs_len<R: Reader>(
+        eh_frame: &EhFrame<R>,
+        bases: &BaseAddresses,
+        fde: &FrameDescriptionEntry<R>,
+    ) -> usize {
+        fde.instructions(eh_frame, bases)
+            .fold(0, |count, _| Ok(count + 1))
+            .expect("fold over instructions OK")
+    }
+
+    fn get_fde_with_longest_cfi_instructions<R: Reader>(
+        eh_frame: &EhFrame<R>,
+        bases: &BaseAddresses,
+    ) -> FrameDescriptionEntry<R> {
+        let mut longest: Option<(usize, FrameDescriptionEntry<_>)> = None;
+
+        let mut entries = eh_frame.entries(bases);
+        while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
+            match entry {
+                CieOrFde::Cie(_) => {}
+                CieOrFde::Fde(partial) => {
+                    let fde = partial
+                        .parse(EhFrame::cie_from_offset)
+                        .expect("Should be able to get CIE for FED");
+
+                    let this_len = instrs_len(eh_frame, bases, &fde);
+
+                    let found_new_longest = match longest {
+                        None => true,
+                        Some((longest_len, ref _fde)) => this_len > longest_len,
+                    };
+
+                    if found_new_longest {
+                        longest = Some((this_len, fde));
+                    }
+                }
+            };
+        }
+
+        longest.expect("At least one FDE in .eh_frame").1
+    }
+
+    #[bench]
+    fn parse_longest_fde_instructions(b: &mut test::Bencher) {
+        let eh_frame = read_section("eh_frame");
+        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
+        let bases = BaseAddresses::default()
+            .set_eh_frame(0)
+            .set_got(0)
+            .set_text(0);
+        let fde = get_fde_with_longest_cfi_instructions(&eh_frame, &bases);
+
+        b.iter(|| {
+            let mut instrs = fde.instructions(&eh_frame, &bases);
+            while let Some(i) = instrs.next().expect("Should parse instruction OK") {
+                test::black_box(i);
+            }
+        });
+    }
+
+    #[bench]
+    fn eval_longest_fde_instructions_new_ctx_everytime(b: &mut test::Bencher) {
+        let eh_frame = read_section("eh_frame");
+        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
+        let bases = BaseAddresses::default()
+            .set_eh_frame(0)
+            .set_got(0)
+            .set_text(0);
+        let fde = get_fde_with_longest_cfi_instructions(&eh_frame, &bases);
+
+        b.iter(|| {
+            let mut ctx = UninitializedUnwindContext::new();
+            let mut table = fde
+                .rows(&eh_frame, &bases, &mut ctx)
+                .expect("Should initialize the ctx OK");
+            while let Some(row) = table.next_row().expect("Should get next unwind table row") {
+                test::black_box(row);
+            }
+        });
+    }
+
+    #[bench]
+    fn eval_longest_fde_instructions_same_ctx(b: &mut test::Bencher) {
+        let eh_frame = read_section("eh_frame");
+        let eh_frame = EhFrame::new(&eh_frame, LittleEndian);
+        let bases = BaseAddresses::default()
+            .set_eh_frame(0)
+            .set_got(0)
+            .set_text(0);
+        let fde = get_fde_with_longest_cfi_instructions(&eh_frame, &bases);
+
+        let mut ctx = UninitializedUnwindContext::new();
+
+        b.iter(|| {
+            let mut table = fde
+                .rows(&eh_frame, &bases, &mut ctx)
+                .expect("Should initialize the ctx OK");
+            while let Some(row) = table.next_row().expect("Should get next unwind table row") {
+                test::black_box(row);
+            }
+        });
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"652588813e730c9ed6d976325198d82d7eda1eeafb40f27fdaebede81c7f1c6a","CONTRIBUTING.md":"5f513ec06013e4f6f097e9c9492da5a47b9f25c94c6ecadfb655a77405fe912c","Cargo.lock":"bd6d1a5d02c85b20f94aae86ed727866fb7250208a966b52f98b26b555e40ba7","Cargo.toml":"3701928b90ddb697f36366f2a979413e8323f1156c065183d882a92cf29de104","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"904717d81d8a011de8d01f4fdadb098363e09932169e71a318d939ffd8007460","benches/bench.rs":"8a3b3aaf8ea4e4173102b946f56b37643219d1909b2eb7e1a1bd52f600f83760","examples/dwarf-validate.rs":"8a322dc48a04bff33a759030f399ca9972ddb103e63851cbb9b8c9672095f645","examples/dwarfdump.rs":"d9ca108406fa95a1a14871ece90f9efb66b8100ad3cc92320da1c9e3de8272af","examples/simple.rs":"684dc9785f4aa0714fcb91a3ae1bb7c8612c9b12969be47fe1327447a2101d1c","examples/simple_line.rs":"ec5fa47c1ab019c6cd9d525223f947533f6d65d6add3131a0c40ac18fc1297db","fixtures/self/README.md":"557cd710240a14fdaa5842b216de57f2ed481151b640af09d6877984b3b2389f","fixtures/self/debug_abbrev":"7c0faa940d9c68d196d03ad55a20e5c746040fa428ff323277fa381deff82bba","fixtures/self/debug_aranges":"8c2aeb2335f61d04ecb7b747070d24f83a6517cbee79dc5c96d97fb6c53d6b6d","fixtures/self/debug_info":"42028a5983006e0703f9ca9515cd27d891ae4af70279fae5011d547f581e2661","fixtures/self/debug_inlined":"89d9516f06ff835621936037f5884fc56712bf304c1dcde52251ddd510fe8710","fixtures/self/debug_line":"b29aebcca3b38bb2bb8aa708cbe74a0dce5a3b0c18916b63d6d17282c017bec7","fixtures/self/debug_loc":"8906ccb9c204f233eb74c1d069dee97a19d18c2051f9147795d7b5364a9266aa","fixtures/self/debug_pubnames":"cf58e237f89c68afba724597fa7e260448636b45f2e69dc6f1bfe34006e27c48","fixtures/self/debug_pubtypes":"d43c1bed71c9d14d1683294cdc1833f069cf131d6e95ee808547919b4f352d81","fixtures/self/debug_ranges":"6d765ac18d33accd89186d077eeb505cbdf97d990c9201d63d9463cd7787ce7a","fixtures/self/debug_str":"9ed904b68eee77b8558b80b3b7ca03e8527f6c64483e9d6d845f40270eb21183","fixtures/self/eh_frame":"6dc3d84351cac42cf73d03452fbb532470dd94d08715154c48417e3f62095f17","fixtures/self/eh_frame_hdr":"afba7a0aa233c9a8c81c986495bd2505164844adb93272d6bc0c9e592e684716","rustfmt.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/arch.rs":"8dc707e84d049fea7e0f9689a7346bf5e687536ba1171206411dbabdfb1bdd3a","src/common.rs":"0a786fb4cbad1a342ad65cdf6435206f89737a863569dede8354ca7867092cb3","src/constants.rs":"f83483141e1c7205da646364491d2dbb3d3370398a0ba8651346a92867da833c","src/endianity.rs":"1f7e62ae34f540c06bedf1e7948739211556eea7dd83731a5ca52c7d687ed0fc","src/leb128.rs":"9d9e288ff591cf7863b8a595896faeaad8457068781c3091ac6c5dc2f41da692","src/lib.rs":"3b15540871587557d957ce5073d19f3866d37a874fe504779ac8592c888b95c4","src/read/abbrev.rs":"798fb791c130bed5b00a6160a5975feee0f66df627448ea7c822a40f137f7a9f","src/read/addr.rs":"f63f289edf889e87107bb2090fb1c50b48af7015f31b7c39c3d6ea09630a38e9","src/read/aranges.rs":"acd2b608dea436ed67c00895deaf9ad58eb9aaefd08d7e78908fb9bacb314f80","src/read/cfi.rs":"bb1497d41a1f17e8369cedc4093aa6351c280fbbae7fc1d8baba6dd9f8d51fa9","src/read/dwarf.rs":"f539641ed2ad387868fda4cb5bddf55a370560296bba1b4d045a32f46007dd62","src/read/endian_reader.rs":"320983a859c2bb0dd44a3e6fae55ff0a84dba3fa80c2edbc64aa8135c44eddf0","src/read/endian_slice.rs":"e12a3c38a06996a9839daccd33a87c328570800730a2531643eb77682370ac51","src/read/line.rs":"47ca5ebb8bd19000045954686d3320b838e9404cba917ec60525f11ea0d87095","src/read/lists.rs":"e473ff419feed9756289e245b7879bd89e7f19098a53162fe6773fac496ae5bc","src/read/loclists.rs":"2a5655c53fb2bf5cfe2df373210217edaa06e4d3addf27df0f724100cbfbe43b","src/read/lookup.rs":"0cf89ba12b9d48b1fe035dd3a497730323acb9427a9457abbc2f7c58c4c71165","src/read/mod.rs":"fc10b421103e26b407a32ce245bec9ba84b15ed348a0e4961b08007bde3f2166","src/read/op.rs":"a659b745e3d265ffad149df17264b61a221409cf04d805a246442c994807778e","src/read/pubnames.rs":"701c1279aef596ed8eff13f19a5803f9e1070afa20c9bafbf29659d4c294edd4","src/read/pubtypes.rs":"6250112d63120ed283698cb42189b127f624fb453abb1222dfa75fe103ad077e","src/read/reader.rs":"7feb9c566ed4bf67876fce8c58fd4f8771aac67a41e71335ee8fc57a6410d3d4","src/read/rnglists.rs":"d59c09a4fdd994a35837376cb016715d33304cb4b59532d3af2fddc400ed8bd8","src/read/str.rs":"7857d4a5fe71ced4984c8e9a0f6e64c21c23e9836703b1b52d5cc674a83b3dfb","src/read/unit.rs":"6477343ec5278df2c7a5dac2da47a5574387bc16d34db02e3ab294d559446175","src/read/value.rs":"2c48e827d5c128d8824b64acea2e50eae5a1176760b9a6144e3fb0373b575505","src/test_util.rs":"291eefa6b51c6d934ba2f4a4c9bc7c403046fc1cccf4d43487820f0154bb89e2","src/write/abbrev.rs":"fa02163389e92e804d139cf84f833ab6af932083f0eb2d74464b4a70bd3237ff","src/write/cfi.rs":"5d36c6978d2bda09921f5b71b764a75a58e819551471fb44db23ce5db7c4a8e3","src/write/dwarf.rs":"8a1a0893e31134ad68993994594f3024ad0c8af7c1188b29e0ffc26b42edef21","src/write/endian_vec.rs":"1d5811986648816a677580b22630f5059757a381487d73e9adbb3008c9ae0c58","src/write/line.rs":"df7d2082c71b5e523cd52745700aae3dcfa5800f0b280e831ef5d8eb8035d6a7","src/write/loc.rs":"fbe8eb33af5a3ef2d5681b561fe0f93fd5a2385c9ced9746c52a0693bffcd44b","src/write/mod.rs":"d8aa1da854cdee629d470d00d87e00dc6998e4bec1ca951f8d2f277730ab9d69","src/write/op.rs":"783592ab7b37220de6f2f65141eae97e894ad827cc3fc92910e759c047d9ef24","src/write/range.rs":"9852cd73a05be409b69b9e5e2fcd0f64e585da5feeb2a6bd91a76d6b82a8ad18","src/write/section.rs":"3ce781d5e82ba365ff54fdd36e0ef58c58a2215b09a8861eb0b038efac82b77f","src/write/str.rs":"4850cc2fee55980f9cbb6b4169f9861ab9d05c2b28a85c2b790480b83a66f514","src/write/unit.rs":"fecc7165b64d60856e289dce118d580eb2c2b61b13199083b811b462dcd01d03","src/write/writer.rs":"aa6ebe7f2e695c5345558c73e71e3532ab0b3244fc18684bcd18de44e9ee3570","tests/convert_self.rs":"8fba3599ac892a704cbcd5aed53eaef51b040043da04f85f002c597ee7549046","tests/parse_self.rs":"1b9d406209fb7616664cf8beb4ecd9dea858bd0b51012e1b0a4e80b7a36a6f8c"},"package":"0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,379 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "byteorder"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "compiler_builtins"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68448b4c6cee41f17bef42cbdad2fde55d05b91a6116c3a517e5389fb742758d"
+
+[[package]]
+name = "crc32fast"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"
+dependencies = [
+ "cfg-if",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "lazy_static",
+]
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "fallible-iterator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+
+[[package]]
+name = "flate2"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
+dependencies = [
+ "cfg-if",
+ "crc32fast",
+ "libc",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "gimli"
+version = "0.24.0"
+dependencies = [
+ "compiler_builtins",
+ "crossbeam",
+ "fallible-iterator",
+ "getopts",
+ "indexmap",
+ "memmap",
+ "num_cpus",
+ "object",
+ "rayon",
+ "regex",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+ "stable_deref_trait",
+ "test-assembler",
+ "typed-arena",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
+
+[[package]]
+name = "memchr"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+
+[[package]]
+name = "memmap"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+dependencies = [
+ "adler",
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
+dependencies = [
+ "flate2",
+ "wasmparser",
+]
+
+[[package]]
+name = "rayon"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
+]
+
+[[package]]
+name = "regex"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
+[[package]]
+name = "rustc-std-workspace-alloc"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff66d57013a5686e1917ed6a025d54dd591fcda71a41fe07edf4d16726aefa86"
+
+[[package]]
+name = "rustc-std-workspace-core"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c"
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "test-assembler"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ccc488d8ed3a4a31f68372ba429642245ddbdf6642054334b7fcc06264cbde9"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "typed-arena"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "wasmparser"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,111 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "gimli"
+version = "0.24.0"
+authors = ["Nick Fitzgerald <fitzgen@gmail.com>", "Philip Craig <philipjcraig@gmail.com>"]
+exclude = ["/ci/*", "/releases/*", "/.travis.yml"]
+description = "A library for reading and writing the DWARF debugging format."
+documentation = "https://docs.rs/gimli"
+readme = "./README.md"
+keywords = ["DWARF", "debug", "ELF", "eh_frame"]
+categories = ["development-tools::debugging", "development-tools::profiling", "parser-implementations"]
+license = "Apache-2.0/MIT"
+repository = "https://github.com/gimli-rs/gimli"
+[profile.bench]
+codegen-units = 1
+debug = true
+
+[[example]]
+name = "simple"
+required-features = ["read"]
+
+[[example]]
+name = "simple_line"
+required-features = ["read"]
+
+[[example]]
+name = "dwarfdump"
+required-features = ["read", "std"]
+
+[[example]]
+name = "dwarf-validate"
+required-features = ["read", "std"]
+[dependencies.alloc]
+version = "1.0.0"
+optional = true
+package = "rustc-std-workspace-alloc"
+
+[dependencies.compiler_builtins]
+version = "0.1.2"
+optional = true
+
+[dependencies.core]
+version = "1.0.0"
+optional = true
+package = "rustc-std-workspace-core"
+
+[dependencies.fallible-iterator]
+version = "0.2.0"
+optional = true
+default-features = false
+
+[dependencies.indexmap]
+version = "1.0.2"
+optional = true
+
+[dependencies.stable_deref_trait]
+version = "1.1.0"
+optional = true
+default-features = false
+[dev-dependencies.crossbeam]
+version = "0.8"
+
+[dev-dependencies.getopts]
+version = "0.2"
+
+[dev-dependencies.memmap]
+version = "0.7"
+
+[dev-dependencies.num_cpus]
+version = "1"
+
+[dev-dependencies.object]
+version = "0.24"
+features = ["wasm"]
+
+[dev-dependencies.rayon]
+version = "1.0"
+
+[dev-dependencies.regex]
+version = "1"
+
+[dev-dependencies.test-assembler]
+version = "0.1.3"
+
+[dev-dependencies.typed-arena]
+version = "2"
+
+[features]
+default = ["read", "write", "std", "fallible-iterator", "endian-reader"]
+endian-reader = ["stable_deref_trait"]
+read = []
+rustc-dep-of-std = ["core", "alloc", "compiler_builtins"]
+std = ["fallible-iterator/std", "stable_deref_trait/std"]
+write = ["indexmap"]
+[badges.coveralls]
+repository = "gimli-rs/gimli"
+
+[badges.travis-ci]
+repository = "gimli-rs/gimli"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,735 @@
+# `gimli` Change Log
+
+--------------------------------------------------------------------------------
+
+## 0.24.0
+
+Released 2021/05/01.
+
+### Breaking changes
+
+* Minimum Rust version increased to 1.42.0.
+
+* Added `read::Dwarf::debug_aranges`.
+  [#539](https://github.com/gimli-rs/gimli/pull/539)
+
+* Replaced `read::DebugAranges::items` with `read::DebugAranges::headers`.
+  [#539](https://github.com/gimli-rs/gimli/pull/539)
+
+* Added `read::Operation::Wasm*`.
+  [#546](https://github.com/gimli-rs/gimli/pull/546)
+
+* `read::LineRow::line` now returns `Option<NonZeroU64>`.
+  The `read::ColumnType::Column` variant now contains a `NonZeroU64`.
+  [#551](https://github.com/gimli-rs/gimli/pull/551)
+
+* Replaced `read::Dwarf::debug_str_sup` with `read::Dwarf::sup`.
+  Deleted `sup` parameter of `read::Dwarf::load`.
+  Added `read::Dwarf::load_sup`.
+  [#554](https://github.com/gimli-rs/gimli/pull/554)
+
+### Added
+
+* dwarfdump: Supplementary object file support.
+  [#552](https://github.com/gimli-rs/gimli/pull/552)
+
+### Changed
+
+* Support `DW_FORM_addrx*` for `DW_AT_low_pc`/`DW_AT_high_pc` in `read::Dwarf`.
+  [#541](https://github.com/gimli-rs/gimli/pull/541)
+
+* Performance improvement in `EndianReader`.
+  [#549](https://github.com/gimli-rs/gimli/pull/549)
+
+--------------------------------------------------------------------------------
+
+## 0.23.0
+
+Released 2020/10/27.
+
+### Breaking changes
+
+* Added more variants to `read::UnitType`.
+  Added `read::AttributeValue::DwoId`
+  [#521](https://github.com/gimli-rs/gimli/pull/521)
+
+* Replaced `CompilationUnitHeader` and `TypeUnitHeader` with `UnitHeader`.
+  Replaced `CompilationUnitHeadersIter` with `DebugInfoUnitHeadersIter`.
+  Replaced `TypeUnitHeadersIter` with `DebugTypesUnitHeadersIter`.
+  [#523](https://github.com/gimli-rs/gimli/pull/523)
+
+
+### Added
+
+* Added read support for split DWARF.
+  [#527](https://github.com/gimli-rs/gimli/pull/527)
+  [#529](https://github.com/gimli-rs/gimli/pull/529)
+
+* Added `read::Dwarf::attr_address`.
+  [#524](https://github.com/gimli-rs/gimli/pull/524)
+
+* Added read support for `DW_AT_GNU_addr_base` and `DW_AT_GNU_ranges_base`.
+  [#525](https://github.com/gimli-rs/gimli/pull/525)
+
+* dwarfdump: Display index values for attributes.
+  [#526](https://github.com/gimli-rs/gimli/pull/526)
+
+* Added `name_to_register`.
+  [#532](https://github.com/gimli-rs/gimli/pull/532)
+
+--------------------------------------------------------------------------------
+
+## 0.22.0
+
+Released 2020/07/03.
+
+### Breaking changes
+
+* Fixed `UnitHeader::size_of_header` for DWARF 5 units.
+  [#518](https://github.com/gimli-rs/gimli/pull/518)
+
+### Added
+
+* Added fuzz targets in CI.
+  [#512](https://github.com/gimli-rs/gimli/pull/512)
+
+* Added read support for `DW_OP_GNU_addr_index` and `DW_OP_GNU_const_index`.
+  [#516](https://github.com/gimli-rs/gimli/pull/516)
+
+* Added `.dwo` support to dwarfdump.
+  [#516](https://github.com/gimli-rs/gimli/pull/516)
+
+* Added `SectionId::dwo_name` and `Section::dwo_section_name`.
+  [#517](https://github.com/gimli-rs/gimli/pull/517)
+
+### Fixed
+
+* Fixed panic when reading `DW_FORM_indirect` combined with `DW_FORM_implicit_const`.
+  [#502](https://github.com/gimli-rs/gimli/pull/502)
+
+* Fixed panic for `read::Abbreviations::get(0)`.
+  [#505](https://github.com/gimli-rs/gimli/pull/505)
+
+* Fixed arithmetic overflow when reading `.debug_line`.
+  [#508](https://github.com/gimli-rs/gimli/pull/508)
+
+* Fixed arithmetic overflow when reading CFI.
+  [#509](https://github.com/gimli-rs/gimli/pull/509)
+
+* Fixed arithmetic overflow and division by zero when reading `.debug_aranges`.
+  [#510](https://github.com/gimli-rs/gimli/pull/510)
+
+* Don't return error from `read::Unit::new` when `DW_AT_name` or `DW_AT_comp_dir` is missing.
+  [#515](https://github.com/gimli-rs/gimli/pull/515)
+
+--------------------------------------------------------------------------------
+
+## 0.21.0
+
+Released 2020/05/12.
+
+### Breaking changes
+
+* Minimum Rust version increased to 1.38.0.
+
+* Replaced `read::Operation::Literal` with `Operation::UnsignedConstant` and `Operation::SignedConstant`.
+  Changed `read::Operation::Bra` and `read::Operation::Skip` to contain the target offset instead of the bytecode.
+  [#479](https://github.com/gimli-rs/gimli/pull/479)
+
+* Changed `write::Expression` to support references. Existing users can convert to use `Expression::raw`.
+  [#479](https://github.com/gimli-rs/gimli/pull/479)
+
+* Replaced `write::AttributeValue::AnyUnitEntryRef` with `DebugInfoRef`.
+  Renamed `write::AttributeValue::ThisUnitEntryRef` to `UnitRef`.
+  [#479](https://github.com/gimli-rs/gimli/pull/479)
+
+* Added more optional features: `endian-reader` and `fallible-iterator`.
+  [#495](https://github.com/gimli-rs/gimli/pull/495)
+  [#498](https://github.com/gimli-rs/gimli/pull/498)
+
+### Added
+
+* Added `read::Expression::operations`
+  [#479](https://github.com/gimli-rs/gimli/pull/479)
+
+### Fixed
+
+* Fixed newlines in `dwarfdump` example.
+  [#470](https://github.com/gimli-rs/gimli/pull/470)
+
+* Ignore zero terminators when reading `.debug_frame` sections.
+  [#486](https://github.com/gimli-rs/gimli/pull/486)
+
+* Increase the number of CFI register rules supported by `read::UnwindContext`.
+  [#487](https://github.com/gimli-rs/gimli/pull/487)
+
+* Fixed version handling and return register encoding when reading `.eh_frame` sections.
+  [#493](https://github.com/gimli-rs/gimli/pull/493)
+
+### Changed
+
+* Added `EhFrame` and `DebugFrame` to `write::Sections`.
+  [#492](https://github.com/gimli-rs/gimli/pull/492)
+
+* Improved performance of `write::LineProgram::generate_row`.
+  [#476](https://github.com/gimli-rs/gimli/pull/476)
+
+* Removed use of the `byteorder`, `arrayvec` and `smallvec` crates.
+  [#494](https://github.com/gimli-rs/gimli/pull/494)
+  [#496](https://github.com/gimli-rs/gimli/pull/496)
+  [#497](https://github.com/gimli-rs/gimli/pull/497)
+
+--------------------------------------------------------------------------------
+
+## 0.20.0
+
+Released 2020/01/11.
+
+### Breaking changes
+
+* Changed type of `DwTag`, `DwAt`, and `DwForm` constants.
+  [#451](https://github.com/gimli-rs/gimli/pull/451)
+
+* Added `read/write::AttributeValue::DebugMacroRef`, and returned where
+  required in `read::Attribute::value`. Added `SectionId::DebugMacro`.
+  [#454](https://github.com/gimli-rs/gimli/pull/454)
+
+* Deleted `alloc` feature, and fixed `no-std` builds with stable rust.
+  [#459](https://github.com/gimli-rs/gimli/pull/459)
+
+* Deleted `read::Error::description`, and changed `<read::Error as Display>`
+  to display what was previously the description.
+  [#462](https://github.com/gimli-rs/gimli/pull/462)
+
+### Added
+
+* Added GNU view constants.
+  [#434](https://github.com/gimli-rs/gimli/pull/434)
+
+* Added `read::EntriesRaw` for low level DIE parsing.
+  [#455](https://github.com/gimli-rs/gimli/pull/455)
+
+* Added `examples/simple-line.rs`.
+  [#460](https://github.com/gimli-rs/gimli/pull/460)
+
+### Fixed
+
+* Fixed handling of CFI augmentations without data.
+  [#438](https://github.com/gimli-rs/gimli/pull/438)
+
+* dwarfdump: fix panic for malformed expressions.
+  [#447](https://github.com/gimli-rs/gimli/pull/447)
+
+* dwarfdump: fix handling of Mach-O relocations.
+  [#449](https://github.com/gimli-rs/gimli/pull/449)
+
+### Changed
+
+* Improved abbreviation parsing performance.
+  [#451](https://github.com/gimli-rs/gimli/pull/451)
+
+--------------------------------------------------------------------------------
+
+## 0.19.0
+
+Released 2019/07/08.
+
+### Breaking changes
+
+* Small API changes related to `.debug_loc` and `.debug_loclists`:
+  added `read::RawLocListEntry::AddressOrOffsetPair` enum variant,
+  added `write::Sections::debug_loc/debug_loclists` public members,
+  and replaced `write::AttributeValue::LocationListsRef` with `LocationListRef`.
+  [#425](https://github.com/gimli-rs/gimli/pull/425)
+
+### Added
+
+* Added `read::Attribute::exprloc_value` and `read::AttributeValue::exprloc_value`.
+  [#422](https://github.com/gimli-rs/gimli/pull/422)
+
+* Added support for writing `.debug_loc` and `.debug_loclists` sections.
+  [#425](https://github.com/gimli-rs/gimli/pull/425)
+
+* Added `-G` flag to `dwarfdump` example to display global offsets.
+  [#427](https://github.com/gimli-rs/gimli/pull/427)
+
+* Added `examples/simple.rs`.
+  [#429](https://github.com/gimli-rs/gimli/pull/429)
+
+### Fixed
+
+* `write::LineProgram::from` no longer requires `DW_AT_name` or `DW_AT_comp_dir`
+  attributes to be present in the unit DIE.
+  [#430](https://github.com/gimli-rs/gimli/pull/430)
+
+--------------------------------------------------------------------------------
+
+## 0.18.0
+
+Released 2019/04/25.
+
+The focus of this release has been on improving support for reading CFI,
+and adding support for writing CFI.
+
+### Breaking changes
+
+* For types which have an `Offset` type parameter, the default `Offset`
+  has changed from `usize` to `R::Offset`.
+  [#392](https://github.com/gimli-rs/gimli/pull/392)
+
+* Added an `Offset` type parameter to the `read::Unit` type to allow variance.
+  [#393](https://github.com/gimli-rs/gimli/pull/393)
+
+* Changed the `UninitializedUnwindContext::initialize` method to borrow `self`,
+  and return `&mut UnwindContext`. Deleted the `InitializedUnwindContext` type.
+  [#395](https://github.com/gimli-rs/gimli/pull/395)
+
+* Deleted the `UnwindSection` type parameters from the `CommonInformationEntry`,
+  `FrameDescriptionEntry`, `UninitializedUnwindContext`,
+  `UnwindContext`, and `UnwindTable` types.
+  [#399](https://github.com/gimli-rs/gimli/pull/399)
+
+* Changed the signature of the `get_cie` callback parameter for various functions.
+  The signature now matches the `UnwindSection::cie_from_offset` method, so
+  that method can be used as the parameter.
+  [#400](https://github.com/gimli-rs/gimli/pull/400)
+
+* Reduced the number of lifetime parameters for the `UnwindTable` type.
+  [#400](https://github.com/gimli-rs/gimli/pull/400)
+
+* Updated `fallible-iterator` to version 0.2.0.
+  [#407](https://github.com/gimli-rs/gimli/pull/407)
+
+* Added a parameter to the `Error::UnexpectedEof` enum variant.
+  [#408](https://github.com/gimli-rs/gimli/pull/408)
+
+### Added
+
+* Update to 2018 edition.
+  [#391](https://github.com/gimli-rs/gimli/pull/391)
+
+* Added the `FrameDescriptionEntry::unwind_info_for_address` method.
+  [#396](https://github.com/gimli-rs/gimli/pull/396)
+
+* Added the `FrameDescriptionEntry::rows` method.
+  [#396](https://github.com/gimli-rs/gimli/pull/396)
+
+* Added the `EhHdrTable::unwind_info_for_address` method.
+  [#400](https://github.com/gimli-rs/gimli/pull/400)
+
+* Added the `EhHdrTable::fde_for_address` method and deprecated the
+  `EhHdrTable::lookup_and_parse` method.
+  [#400](https://github.com/gimli-rs/gimli/pull/400)
+
+* Added the `EhHdrTable::pointer_to_offset` method.
+  [#400](https://github.com/gimli-rs/gimli/pull/400)
+
+* Added the `UnwindSection::fde_for_address` method.
+  [#396](https://github.com/gimli-rs/gimli/pull/396)
+
+* Added the `UnwindSection::fde_from_offset` method.
+  [#400](https://github.com/gimli-rs/gimli/pull/400)
+
+* Added the `UnwindSection::partial_fde_from_offset` method.
+  [#400](https://github.com/gimli-rs/gimli/pull/400)
+
+* Added the `Section::id` method.
+  [#406](https://github.com/gimli-rs/gimli/pull/406)
+
+* Added the `Dwarf::load` method, and corresponding methods for individual sections.
+  [#406](https://github.com/gimli-rs/gimli/pull/406)
+
+* Added the `Dwarf::borrow` method, and corresponding methods for individual sections.
+  [#406](https://github.com/gimli-rs/gimli/pull/406)
+
+* Added the `Dwarf::format_error` method.
+  [#408](https://github.com/gimli-rs/gimli/pull/408)
+
+* Added the `Dwarf::die_ranges` method.
+  [#417](https://github.com/gimli-rs/gimli/pull/417)
+
+* Added the `Dwarf::unit_ranges` method.
+  [#417](https://github.com/gimli-rs/gimli/pull/417)
+
+* Added support for writing `.debug_frame` and `.eh_frame` sections.
+  [#412](https://github.com/gimli-rs/gimli/pull/412)
+  [#419](https://github.com/gimli-rs/gimli/pull/419)
+
+### Fixed
+
+* The `code_alignment_factor` is now used when evaluting CFI instructions
+  that advance the location.
+  [#401](https://github.com/gimli-rs/gimli/pull/401)
+
+* Fixed parsing of pointers encoded with `DW_EH_PE_funcrel`.
+  [#402](https://github.com/gimli-rs/gimli/pull/402)
+
+* Use the FDE address encoding from the augmentation when parsing `DW_CFA_set_loc`.
+  [#403](https://github.com/gimli-rs/gimli/pull/403)
+
+* Fixed setting of `.eh_frame` base addresses in dwarfdump.
+  [#410](https://github.com/gimli-rs/gimli/pull/410)
+
+## 0.17.0
+
+Released 2019/02/21.
+
+The focus of this release has been on improving DWARF 5 support, and
+adding support for writing DWARF.
+
+### Breaking changes
+
+* Changed register values to a `Register` type instead of `u8`/`u64`.
+  [#328](https://github.com/gimli-rs/gimli/pull/328)
+
+* Replaced `BaseAddresses::set_cfi` with `set_eh_frame_hdr` and `set_eh_frame`.
+  Replaced `BaseAddresses::set_data` with `set_got`.
+  You should now use the same `BaseAddresses` value for parsing both
+  `.eh_frame` and `.eh_frame_hdr`.
+  [#351](https://github.com/gimli-rs/gimli/pull/351)
+
+* Renamed many types and functions related to `.debug_line`.
+  Renamed `LineNumberProgram` to `LineProgram`.
+  Renamed `IncompleteLineNumberProgram` to `IncompleteLineProgram`.
+  Renamed `CompleteLineNumberProgram` to `CompleteLineProgram`.
+  Renamed `LineNumberProgramHeader` to `LineProgramHeader`.
+  Renamed `LineNumberRow` to `LineRow`.
+  Renamed `StateMachine` to `LineRows`.
+  Renamed `Opcode` to `LineInstruction`.
+  Renamed `OpcodesIter` to `LineInstructions`.
+  Renamed `LineNumberSequence` to `LineSequence`.
+  [#359](https://github.com/gimli-rs/gimli/pull/359)
+
+* Added `Offset` type parameter to `AttributeValue`, `LineProgram`,
+  `IncompleteLineProgram`, `CompleteLineProgram`, `LineRows`, `LineInstruction`,
+  and `FileEntry`.
+  [#324](https://github.com/gimli-rs/gimli/pull/324)
+
+* Changed `FileEntry::path_name`, `FileEntry::directory`, and
+  `LineProgramHeader::directory` to return an `AttributeValue` instead
+  of a `Reader`.
+  [#366](https://github.com/gimli-rs/gimli/pull/366)
+
+* Renamed `FileEntry::last_modification` to `FileEntry::timestamp`
+  and renamed `FileEntry::length` to `FileEntry::size`.
+  [#366](https://github.com/gimli-rs/gimli/pull/366)
+
+* Added an `Encoding` type. Changed many functions that previously accepted
+  `Format`, version or address size parameters to accept an `Encoding`
+  parameter instead.
+  Notable changes are `LocationLists::locations`, `RangeLists::ranges`,
+  and `Expression::evaluation`.
+  [#364](https://github.com/gimli-rs/gimli/pull/364)
+
+* Changed return type of `LocationLists::new` and `RangeLists::new`.
+  [#370](https://github.com/gimli-rs/gimli/pull/370)
+
+* Added parameters to `LocationsLists::locations` and `RangeLists::ranges`
+  to support `.debug_addr`.
+  [#358](https://github.com/gimli-rs/gimli/pull/358)
+
+* Added more `AttributeValue` variants: `DebugAddrBase`, `DebugAddrIndex`,
+  `DebugLocListsBase`, `DebugLocListsIndex`, `DebugRngListsBase`, `DebugRngListsIndex`,
+  `DebugStrOffsetsBase`, `DebugStrOffsetsIndex`, `DebugLineStrRef`.
+  [#358](https://github.com/gimli-rs/gimli/pull/358)
+
+* Changed `AttributeValue::Data*` attributes to native endian integers instead
+  of byte arrays.
+  [#365](https://github.com/gimli-rs/gimli/pull/365)
+
+* Replaced `EvaluationResult::TextBase` with
+  `EvaluationResult::RequiresRelocatedAddress`. The handling of `TextBase`
+  was incorrect.
+  [#335](https://github.com/gimli-rs/gimli/pull/335)
+
+* Added `EvaluationResult::IndexedAddress` for operations that require an
+  address from `.debug_addr`.
+  [#358](https://github.com/gimli-rs/gimli/pull/358)
+
+* Added `Reader::read_slice`. Added a default implementation of
+  `Reader::read_u8_array` which uses this.
+  [#358](https://github.com/gimli-rs/gimli/pull/358)
+
+### Added
+
+* Added initial support for writing DWARF. This is targeted at supporting
+  line number information only.
+  [#340](https://github.com/gimli-rs/gimli/pull/340)
+  [#344](https://github.com/gimli-rs/gimli/pull/344)
+  [#346](https://github.com/gimli-rs/gimli/pull/346)
+  [#361](https://github.com/gimli-rs/gimli/pull/361)
+  [#362](https://github.com/gimli-rs/gimli/pull/362)
+  [#365](https://github.com/gimli-rs/gimli/pull/365)
+  [#368](https://github.com/gimli-rs/gimli/pull/368)
+  [#382](https://github.com/gimli-rs/gimli/pull/382)
+
+* Added `read` and `write` Cargo features. Both are enabled by default.
+  [#343](https://github.com/gimli-rs/gimli/pull/343)
+
+* Added support for reading DWARF 5 `.debug_line` and `.debug_line_str` sections.
+  [#366](https://github.com/gimli-rs/gimli/pull/366)
+
+* Added support for reading DWARF 5 `.debug_str_offsets` sections, including
+  parsing `DW_FORM_strx*` attributes.
+  [#358](https://github.com/gimli-rs/gimli/pull/358)
+
+* Added support for reading DWARF 5 `.debug_addr` sections, including parsing
+  `DW_FORM_addrx*` attributes and evaluating `DW_OP_addrx` and `DW_OP_constx`
+  operations.
+  [#358](https://github.com/gimli-rs/gimli/pull/358)
+
+* Added support for reading DWARF 5 indexed addresses and offsets in
+  `.debug_loclists` and `.debug_rnglists`, including parsing `DW_FORM_rnglistx`
+  and `DW_FORM_loclistx` attributes.
+  [#358](https://github.com/gimli-rs/gimli/pull/358)
+
+* Added high level `Dwarf` and `Unit` types. Existing code does not need to
+  switch to using these types, but doing so will make DWARF 5 support simpler.
+  [#352](https://github.com/gimli-rs/gimli/pull/352)
+  [#380](https://github.com/gimli-rs/gimli/pull/380)
+  [#381](https://github.com/gimli-rs/gimli/pull/381)
+
+* Added `EhFrame::set_address_size` and `DebugFrame::set_address_size` methods
+  to allow parsing non-native CFI sections. The default address size is still
+  the native size.
+  [#325](https://github.com/gimli-rs/gimli/pull/325)
+
+* Added architecture specific definitions for `Register` values and names.
+  Changed dwarfdump to print them.
+  [#328](https://github.com/gimli-rs/gimli/pull/328)
+
+* Added support for reading relocatable DWARF sections.
+  [#337](https://github.com/gimli-rs/gimli/pull/337)
+
+* Added parsing of `DW_FORM_data16`.
+  [#366](https://github.com/gimli-rs/gimli/pull/366)
+
+### Fixed
+
+* Fixed parsing DWARF 5 ranges with `start == end == 0`.
+  [#323](https://github.com/gimli-rs/gimli/pull/323)
+
+* Changed `LineRows` to be covariant in its `Reader` type parameter.
+  [#324](https://github.com/gimli-rs/gimli/pull/324)
+
+* Fixed handling of empty units in dwarfdump.
+  [#330](https://github.com/gimli-rs/gimli/pull/330)
+
+* Fixed `UnitHeader::length_including_self` for `Dwarf64`.
+  [#342](https://github.com/gimli-rs/gimli/pull/342)
+
+* Fixed parsing of `DW_CFA_set_loc`.
+  [#355](https://github.com/gimli-rs/gimli/pull/355)
+
+* Fixed handling of multiple headers in `.debug_loclists` and `.debug_rnglists`.
+  [#370](https://github.com/gimli-rs/gimli/pull/370)
+
+--------------------------------------------------------------------------------
+
+## 0.16.1
+
+Released 2018/08/28.
+
+### Added
+
+* Added `EhFrameHdr::lookup_and_parse`. [#316][]
+* Added support for `DW_CFA_GNU_args_size`. [#319][]
+
+### Fixed
+
+* Implement `Send`/`Sync` for `SubRange`. [#305][]
+* Fixed `alloc` support on nightly. [#306][] [#310][]
+
+[#305]: https://github.com/gimli-rs/gimli/pull/305
+[#306]: https://github.com/gimli-rs/gimli/pull/306
+[#310]: https://github.com/gimli-rs/gimli/pull/310
+[#316]: https://github.com/gimli-rs/gimli/pull/316
+[#319]: https://github.com/gimli-rs/gimli/pull/319
+
+--------------------------------------------------------------------------------
+
+## 0.16.0
+
+Released 2018/06/01.
+
+### Added
+
+* Added support for building in `#![no_std]` environments, when the `alloc`
+  crate is available. Disable the "std" feature and enable the "alloc"
+  feature. [#138][] [#271][]
+
+* Added support for DWARF 5 `.debug_rnglists` and `.debug_loclists`
+  sections. [#272][]
+
+* Added support for DWARF 5 `DW_FORM_ref_sup` and `DW_FORM_strp_sup` attribute
+  forms. [#288][]
+
+* Added support for DWARF 5 operations on typed values. [#293][]
+
+* A `dwarf-validate` example program that checks the integrity of the given
+  DWARF and its references between sections. [#290][]
+
+* Added the `EndianReader<T>` type, an easy way to define a custom `Reader`
+  implementation with a reference to a generic buffer of bytes and an associated
+  endianity. [#298][] [#302][]
+
+### Changed
+
+* Various speed improvements for evaluating `.debug_line` line number
+  programs. [#276][]
+
+* The example `dwarfdump` clone is a [whole lot faster
+  now][dwarfdump-faster]. [#282][] [#284][] [#285][]
+
+### Deprecated
+
+* `EndianBuf` has been renamed to `EndianSlice`, use that name instead. [#295][]
+
+### Fixed
+
+* Evaluating the `DW_CFA_restore_state` opcode properly maintains the current
+  location. Previously it would incorrectly restore the old location when
+  popping from evaluation stack. [#274][]
+
+[#271]: https://github.com/gimli-rs/gimli/issues/271
+[#138]: https://github.com/gimli-rs/gimli/issues/138
+[#274]: https://github.com/gimli-rs/gimli/issues/274
+[#272]: https://github.com/gimli-rs/gimli/issues/272
+[#276]: https://github.com/gimli-rs/gimli/issues/276
+[#282]: https://github.com/gimli-rs/gimli/issues/282
+[#285]: https://github.com/gimli-rs/gimli/issues/285
+[#284]: https://github.com/gimli-rs/gimli/issues/284
+[#288]: https://github.com/gimli-rs/gimli/issues/288
+[#290]: https://github.com/gimli-rs/gimli/issues/290
+[#293]: https://github.com/gimli-rs/gimli/issues/293
+[#295]: https://github.com/gimli-rs/gimli/issues/295
+[#298]: https://github.com/gimli-rs/gimli/issues/298
+[#302]: https://github.com/gimli-rs/gimli/issues/302
+[dwarfdump-faster]: https://robert.ocallahan.org/2018/03/speeding-up-dwarfdump-with-rust.html
+
+--------------------------------------------------------------------------------
+
+## 0.15.0
+
+Released 2017/12/01.
+
+### Added
+
+* Added the `EndianBuf::to_string()` method. [#233][]
+
+* Added more robust error handling in our example `dwarfdump` clone. [#234][]
+
+* Added `FrameDescriptionEntry::initial_address` method. [#237][]
+
+* Added `FrameDescriptionEntry::len` method. [#237][]
+
+* Added the `FrameDescriptionEntry::entry_len` method. [#241][]
+
+* Added the `CommonInformationEntry::offset` method. [#241][]
+
+* Added the `CommonInformationEntry::entry_len` method. [#241][]
+
+* Added the `CommonInformationEntry::version` method. [#241][]
+
+* Added the `CommonInformationEntry::augmentation` method. [#241][]
+
+* Added the `CommonInformationEntry::code_alignment_factor` method. [#241][]
+
+* Added the `CommonInformationEntry::data_alignment_factor` method. [#241][]
+
+* Added the `CommonInformationEntry::return_address_register` method. [#241][]
+
+* Added support for printing `.eh_frame` sections to our example `dwarfdump`
+  clone. [#241][]
+
+* Added support for parsing the `.eh_frame_hdr` section. On Linux, the
+  `.eh_frame_hdr` section provides a pointer to the already-mapped-in-memory
+  `.eh_frame` data, so that it doesn't need to be duplicated, and a binary
+  search table of its entries for faster unwinding information lookups. [#250][]
+
+* Added support for parsing DWARF 5 compilation unit headers. [#257][]
+
+* Added support for DWARF 5's `DW_FORM_implicit_const`. [#257][]
+
+### Changed
+
+* Unwinding methods now give ownership of the unwinding context back to the
+  caller if errors are encountered, not just on the success path. This allows
+  recovering from errors in signal-safe code, where constructing a new unwinding
+  context is not an option because it requires allocation. This is a **breaking
+  change** affecting `UnwindSection::unwind_info_for_address` and
+  `UninitializedUnwindContext::initialize`. [#241][]
+
+* `CfaRule` and `RegisterRule` now expose their `DW_OP` expressions as
+  `Expression`. This is a minor **breaking change**. [#241][]
+
+* The `Error::UnknownVersion` variant now contains the unknown version
+  number. This is a minor **breaking change**. [#245][]
+
+* `EvaluationResult::RequiresEntryValue` requires an `Expression` instead of a
+  `Reader` now. This is a minor **breaking change**. [#256][]
+
+
+[#233]: https://github.com/gimli-rs/gimli/pull/233
+[#234]: https://github.com/gimli-rs/gimli/pull/234
+[#237]: https://github.com/gimli-rs/gimli/pull/237
+[#241]: https://github.com/gimli-rs/gimli/pull/241
+[#245]: https://github.com/gimli-rs/gimli/pull/245
+[#250]: https://github.com/gimli-rs/gimli/pull/250
+[#256]: https://github.com/gimli-rs/gimli/pull/256
+[#257]: https://github.com/gimli-rs/gimli/pull/257
+
+--------------------------------------------------------------------------------
+
+## 0.14.0
+
+Released 2017/08/08.
+
+### Added
+
+* All `pub` types now `derive(Hash)`. [#192][]
+
+* All the constants from DWARF 5 are now defined. [#193][]
+
+* Added support for the `DW_OP_GNU_parameter_ref` GNU extension to parsing and
+  evaluation DWARF opcodes. [#208][]
+
+* Improved LEB128 parsing performance. [#216][]
+
+* Improved `.debug_{aranges,pubnames,pubtypes}` parsing performance. [#218][]
+
+* Added the ability to choose endianity dynamically at run time, rather than
+  only statically at compile time. [#219][]
+
+### Changed
+
+* The biggest change of this release is that `gimli` no longer requires the
+  object file's section be fully loaded into memory. This enables using `gimli`
+  on 32 bit platforms where there often isn't enough contiguous virtual memory
+  address space to load debugging information into. The default behavior is
+  still geared for 64 bit platforms, where address space overfloweth, and you
+  can still load the whole sections of the object file (or the entire object
+  file) into memory. This is abstracted over with the `gimli::Reader`
+  trait. This manifests as small (but many) breaking changes to much of the
+  public API. [#182][]
+
+### Fixed
+
+* The `DW_END_*` constants for defining endianity of a compilation unit were
+  previously incorrect. [#193][]
+
+* The `DW_OP_addr` opcode is relative to the base address of the `.text` section
+  of the binary, but we were incorrectly treating it as an absolute value. [#210][]
+
+[GitHub]: https://github.com/gimli-rs/gimli
+[crates.io]: https://crates.io/crates/gimli
+[contributing]: https://github.com/gimli-rs/gimli/blob/master/CONTRIBUTING.md
+[easy]: https://github.com/gimli-rs/gimli/issues?q=is%3Aopen+is%3Aissue+label%3Aeasy
+[#192]: https://github.com/gimli-rs/gimli/pull/192
+[#193]: https://github.com/gimli-rs/gimli/pull/193
+[#182]: https://github.com/gimli-rs/gimli/issues/182
+[#208]: https://github.com/gimli-rs/gimli/pull/208
+[#210]: https://github.com/gimli-rs/gimli/pull/210
+[#216]: https://github.com/gimli-rs/gimli/pull/216
+[#218]: https://github.com/gimli-rs/gimli/pull/218
+[#219]: https://github.com/gimli-rs/gimli/pull/219
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/CONTRIBUTING.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/CONTRIBUTING.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/CONTRIBUTING.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,137 @@
+# Contributing to `gimli`
+
+Hi! We'd love to have your contributions! If you want help or mentorship, reach
+out to us in a GitHub issue, or ping `fitzgen` in `#rust` on `irc.mozilla.org`.
+
+* [Code of Conduct](#coc)
+* [Filing an Issue](#issues)
+* [Building `gimli`](#building)
+* [Testing `gimli`](#testing)
+  * [Test Coverage](#coverage)
+  * [Using `test-assembler`](#test-assembler)
+  * [Fuzzing](#fuzzing)
+* [Benchmarking](#benchmarking)
+* [Style](#style)
+
+## <a id="coc"></a> Code of Conduct
+
+We abide by the
+[Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html) and ask
+that you do as well.
+
+## <a id="issues"></a> Filing an Issue
+
+Think you've found a bug? File an issue! To help us understand and reproduce the
+issue, provide us with:
+
+* The (preferably minimal) test case
+* Steps to reproduce the issue using the test case
+* The expected result of following those steps
+* The actual result of following those steps
+
+Definitely file an issue if you see an unexpected panic originating from within
+`gimli`! `gimli` should never panic unless it is explicitly documented to panic
+in the specific circumstances provided.
+
+## <a id="building"></a> Building `gimli`
+
+`gimli` should always build on stable `rustc`, but we recommend using
+[`rustup`](https://www.rustup.rs/) so you can switch to nightly `rustc` and run
+benchmarks.
+
+To build `gimli`:
+
+```
+$ cargo build
+```
+
+## <a id="testing"></a> Testing `gimli`
+
+Run the tests with `cargo`:
+
+```
+$ cargo test
+```
+
+### <a id="coverage"></a> Test Coverage
+
+If you have `kcov` installed under linux, then you can generate code coverage
+results using the `coverage` script in the root of the repository, and view them
+at `target/kcov/index.html`. Otherwise you can create a pull request and view
+the coverage results on coveralls.io.
+
+```
+$ ./coverage
+```
+
+The ideal we aim to reach is having our unit tests exercise every branch in
+`gimli`. We allow an exception for branches which propagate errors inside a
+`try!(..)` invocation, but we *do* want to exercise the original error paths.
+
+Pull requests adding new code should ensure that this ideal is met.
+
+At the time of writing we have 94% test coverage according to our coveralls.io
+continuous integration. That number should generally stay the same or go up ;)
+This is a bit subjective, because -.001% is just noise and doesn't matter.
+
+### <a id="test-assembler"></a> Using `test-assembler`
+
+We use the awesome
+[`test-assembler`](https://github.com/luser/rust-test-assembler) crate to
+construct binary test data. It makes building complex test cases readable.
+
+[Here is an example usage in `gimli`](https://github.com/gimli-rs/gimli/blob/156451f3fe6eeb2fa62b84b362c33fcb176e1171/src/loc.rs#L263)
+
+### <a id="fuzzing"></a> Fuzzing
+
+First, install `cargo fuzz`:
+
+```
+$ cargo install cargo-fuzz
+```
+
+Optionally, [set up the corpora for our fuzz targets by following these
+instructions](https://github.com/gimli-rs/gimli-libfuzzer-corpora/blob/master/README.md#using-these-corpora).
+
+Finally, run a fuzz target! In this case, we are running the `eh_frame` fuzz
+target:
+
+```
+$ cargo fuzz run eh_frame
+```
+
+The fuzz target definitions live in `fuzz/fuzz_targets/*`. You can add new ones
+via `cargo fuzz add <my_new_target>`.
+
+## <a id="benchmarking"></a> Benchmarking
+
+The benchmarks require nightly `rustc`, so use `rustup`:
+
+```
+$ rustup run nightly cargo bench
+```
+
+We aim to be the fastest DWARF library. Period.
+
+Please provide before and after benchmark results with your pull requests. You
+may also find [`cargo benchcmp`](https://github.com/BurntSushi/cargo-benchcmp)
+handy for comparing results.
+
+Pull requests adding `#[bench]` micro-benchmarks that exercise a new edge case
+are very welcome!
+
+## <a id="style"></a> Style
+
+We use `rustfmt` to automatically format and style all of our code.
+
+To install `rustfmt`:
+
+```
+$ rustup component add rustfmt-preview
+```
+
+To run `rustfmt` on `gimli`:
+
+```
+$ cargo fmt
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/examples/dwarfdump.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/examples/dwarfdump.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/examples/dwarfdump.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/examples/dwarfdump.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2202 @@
+// Allow clippy lints when building without clippy.
+#![allow(unknown_lints)]
+
+use fallible_iterator::FallibleIterator;
+use gimli::{Section, UnitHeader, UnitOffset, UnitSectionOffset, UnitType, UnwindSection};
+use object::{Object, ObjectSection, ObjectSymbol};
+use regex::bytes::Regex;
+use std::borrow::{Borrow, Cow};
+use std::cmp::min;
+use std::collections::HashMap;
+use std::env;
+use std::fmt::{self, Debug};
+use std::fs;
+use std::io;
+use std::io::{BufWriter, Write};
+use std::iter::Iterator;
+use std::mem;
+use std::process;
+use std::result;
+use std::sync::{Condvar, Mutex};
+use typed_arena::Arena;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Error {
+    GimliError(gimli::Error),
+    ObjectError(object::read::Error),
+    IoError,
+}
+
+impl fmt::Display for Error {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> ::std::result::Result<(), fmt::Error> {
+        Debug::fmt(self, f)
+    }
+}
+
+fn writeln_error<W: Write, R: Reader>(
+    w: &mut W,
+    dwarf: &gimli::Dwarf<R>,
+    err: Error,
+    msg: &str,
+) -> io::Result<()> {
+    writeln!(
+        w,
+        "{}: {}",
+        msg,
+        match err {
+            Error::GimliError(err) => dwarf.format_error(err),
+            Error::ObjectError(err) =>
+                format!("{}:{:?}", "An object error occurred while reading", err),
+            Error::IoError => "An I/O error occurred while writing.".to_string(),
+        }
+    )
+}
+
+impl From<gimli::Error> for Error {
+    fn from(err: gimli::Error) -> Self {
+        Error::GimliError(err)
+    }
+}
+
+impl From<io::Error> for Error {
+    fn from(_: io::Error) -> Self {
+        Error::IoError
+    }
+}
+
+impl From<object::read::Error> for Error {
+    fn from(err: object::read::Error) -> Self {
+        Error::ObjectError(err)
+    }
+}
+
+pub type Result<T> = result::Result<T, Error>;
+
+fn parallel_output<II, F>(max_workers: usize, iter: II, f: F) -> Result<()>
+where
+    F: Sync + Fn(II::Item, &mut Vec<u8>) -> Result<()>,
+    II: IntoIterator,
+    II::IntoIter: Send,
+{
+    struct ParallelOutputState<I: Iterator> {
+        iterator: I,
+        current_worker: usize,
+        result: Result<()>,
+    }
+
+    let state = Mutex::new(ParallelOutputState {
+        iterator: iter.into_iter().fuse(),
+        current_worker: 0,
+        result: Ok(()),
+    });
+    let workers = min(max_workers, num_cpus::get());
+    let mut condvars = Vec::new();
+    for _ in 0..workers {
+        condvars.push(Condvar::new());
+    }
+    {
+        let state_ref = &state;
+        let f_ref = &f;
+        let condvars_ref = &condvars;
+        crossbeam::scope(|scope| {
+            for i in 0..workers {
+                scope.spawn(move |_| {
+                    let mut v = Vec::new();
+                    let mut lock = state_ref.lock().unwrap();
+                    while lock.current_worker != i {
+                        lock = condvars_ref[i].wait(lock).unwrap();
+                    }
+                    loop {
+                        let item = if lock.result.is_ok() {
+                            lock.iterator.next()
+                        } else {
+                            None
+                        };
+                        lock.current_worker = (i + 1) % workers;
+                        condvars_ref[lock.current_worker].notify_one();
+                        mem::drop(lock);
+
+                        let ret = if let Some(item) = item {
+                            v.clear();
+                            f_ref(item, &mut v)
+                        } else {
+                            return;
+                        };
+
+                        lock = state_ref.lock().unwrap();
+                        while lock.current_worker != i {
+                            lock = condvars_ref[i].wait(lock).unwrap();
+                        }
+                        if lock.result.is_ok() {
+                            let out = io::stdout();
+                            let ret2 = out.lock().write_all(&v);
+                            if ret.is_err() {
+                                lock.result = ret;
+                            } else {
+                                lock.result = ret2.map_err(Error::from);
+                            }
+                        }
+                    }
+                });
+            }
+        })
+        .unwrap();
+    }
+    state.into_inner().unwrap().result
+}
+
+trait Reader: gimli::Reader<Offset = usize> + Send + Sync {}
+
+impl<'input, Endian> Reader for gimli::EndianSlice<'input, Endian> where
+    Endian: gimli::Endianity + Send + Sync
+{
+}
+
+type RelocationMap = HashMap<usize, object::Relocation>;
+
+fn add_relocations(
+    relocations: &mut RelocationMap,
+    file: &object::File,
+    section: &object::Section,
+) {
+    for (offset64, mut relocation) in section.relocations() {
+        let offset = offset64 as usize;
+        if offset as u64 != offset64 {
+            continue;
+        }
+        let offset = offset as usize;
+        match relocation.kind() {
+            object::RelocationKind::Absolute => {
+                match relocation.target() {
+                    object::RelocationTarget::Symbol(symbol_idx) => {
+                        match file.symbol_by_index(symbol_idx) {
+                            Ok(symbol) => {
+                                let addend =
+                                    symbol.address().wrapping_add(relocation.addend() as u64);
+                                relocation.set_addend(addend as i64);
+                            }
+                            Err(_) => {
+                                eprintln!(
+                                    "Relocation with invalid symbol for section {} at offset 0x{:08x}",
+                                    section.name().unwrap(),
+                                    offset
+                                );
+                            }
+                        }
+                    }
+                    object::RelocationTarget::Section(_) | object::RelocationTarget::Absolute => {}
+                }
+                if relocations.insert(offset, relocation).is_some() {
+                    eprintln!(
+                        "Multiple relocations for section {} at offset 0x{:08x}",
+                        section.name().unwrap(),
+                        offset
+                    );
+                }
+            }
+            _ => {
+                eprintln!(
+                    "Unsupported relocation for section {} at offset 0x{:08x}",
+                    section.name().unwrap(),
+                    offset
+                );
+            }
+        }
+    }
+}
+
+/// Apply relocations to addresses and offsets during parsing,
+/// instead of requiring the data to be fully relocated prior
+/// to parsing.
+///
+/// Pros
+/// - allows readonly buffers, we don't need to implement writing of values back to buffers
+/// - potentially allows us to handle addresses and offsets differently
+/// - potentially allows us to add metadata from the relocation (eg symbol names)
+/// Cons
+/// - maybe incomplete
+#[derive(Debug, Clone)]
+struct Relocate<'a, R: gimli::Reader<Offset = usize>> {
+    relocations: &'a RelocationMap,
+    section: R,
+    reader: R,
+}
+
+impl<'a, R: gimli::Reader<Offset = usize>> Relocate<'a, R> {
+    fn relocate(&self, offset: usize, value: u64) -> u64 {
+        if let Some(relocation) = self.relocations.get(&offset) {
+            match relocation.kind() {
+                object::RelocationKind::Absolute => {
+                    if relocation.has_implicit_addend() {
+                        // Use the explicit addend too, because it may have the symbol value.
+                        return value.wrapping_add(relocation.addend() as u64);
+                    } else {
+                        return relocation.addend() as u64;
+                    }
+                }
+                _ => {}
+            }
+        };
+        value
+    }
+}
+
+impl<'a, R: gimli::Reader<Offset = usize>> gimli::Reader for Relocate<'a, R> {
+    type Endian = R::Endian;
+    type Offset = R::Offset;
+
+    fn read_address(&mut self, address_size: u8) -> gimli::Result<u64> {
+        let offset = self.reader.offset_from(&self.section);
+        let value = self.reader.read_address(address_size)?;
+        Ok(self.relocate(offset, value))
+    }
+
+    fn read_length(&mut self, format: gimli::Format) -> gimli::Result<usize> {
+        let offset = self.reader.offset_from(&self.section);
+        let value = self.reader.read_length(format)?;
+        <usize as gimli::ReaderOffset>::from_u64(self.relocate(offset, value as u64))
+    }
+
+    fn read_offset(&mut self, format: gimli::Format) -> gimli::Result<usize> {
+        let offset = self.reader.offset_from(&self.section);
+        let value = self.reader.read_offset(format)?;
+        <usize as gimli::ReaderOffset>::from_u64(self.relocate(offset, value as u64))
+    }
+
+    fn read_sized_offset(&mut self, size: u8) -> gimli::Result<usize> {
+        let offset = self.reader.offset_from(&self.section);
+        let value = self.reader.read_sized_offset(size)?;
+        <usize as gimli::ReaderOffset>::from_u64(self.relocate(offset, value as u64))
+    }
+
+    #[inline]
+    fn split(&mut self, len: Self::Offset) -> gimli::Result<Self> {
+        let mut other = self.clone();
+        other.reader.truncate(len)?;
+        self.reader.skip(len)?;
+        Ok(other)
+    }
+
+    // All remaining methods simply delegate to `self.reader`.
+
+    #[inline]
+    fn endian(&self) -> Self::Endian {
+        self.reader.endian()
+    }
+
+    #[inline]
+    fn len(&self) -> Self::Offset {
+        self.reader.len()
+    }
+
+    #[inline]
+    fn empty(&mut self) {
+        self.reader.empty()
+    }
+
+    #[inline]
+    fn truncate(&mut self, len: Self::Offset) -> gimli::Result<()> {
+        self.reader.truncate(len)
+    }
+
+    #[inline]
+    fn offset_from(&self, base: &Self) -> Self::Offset {
+        self.reader.offset_from(&base.reader)
+    }
+
+    #[inline]
+    fn offset_id(&self) -> gimli::ReaderOffsetId {
+        self.reader.offset_id()
+    }
+
+    #[inline]
+    fn lookup_offset_id(&self, id: gimli::ReaderOffsetId) -> Option<Self::Offset> {
+        self.reader.lookup_offset_id(id)
+    }
+
+    #[inline]
+    fn find(&self, byte: u8) -> gimli::Result<Self::Offset> {
+        self.reader.find(byte)
+    }
+
+    #[inline]
+    fn skip(&mut self, len: Self::Offset) -> gimli::Result<()> {
+        self.reader.skip(len)
+    }
+
+    #[inline]
+    fn to_slice(&self) -> gimli::Result<Cow<[u8]>> {
+        self.reader.to_slice()
+    }
+
+    #[inline]
+    fn to_string(&self) -> gimli::Result<Cow<str>> {
+        self.reader.to_string()
+    }
+
+    #[inline]
+    fn to_string_lossy(&self) -> gimli::Result<Cow<str>> {
+        self.reader.to_string_lossy()
+    }
+
+    #[inline]
+    fn read_slice(&mut self, buf: &mut [u8]) -> gimli::Result<()> {
+        self.reader.read_slice(buf)
+    }
+}
+
+impl<'a, R: Reader> Reader for Relocate<'a, R> {}
+
+#[derive(Default)]
+struct Flags {
+    eh_frame: bool,
+    goff: bool,
+    info: bool,
+    line: bool,
+    pubnames: bool,
+    pubtypes: bool,
+    aranges: bool,
+    dwo: bool,
+    raw: bool,
+    match_units: Option<Regex>,
+}
+
+impl Flags {
+    fn section_name(&self, id: gimli::SectionId) -> Option<&'static str> {
+        if self.dwo {
+            id.dwo_name()
+        } else {
+            Some(id.name())
+        }
+    }
+}
+
+fn print_usage(opts: &getopts::Options) -> ! {
+    let brief = format!("Usage: {} <options> <file>", env::args().next().unwrap());
+    write!(&mut io::stderr(), "{}", opts.usage(&brief)).ok();
+    process::exit(1);
+}
+
+fn main() {
+    let mut opts = getopts::Options::new();
+    opts.optflag(
+        "",
+        "eh-frame",
+        "print .eh-frame exception handling frame information",
+    );
+    opts.optflag("G", "", "show global die offsets");
+    opts.optflag("i", "", "print .debug_info and .debug_types sections");
+    opts.optflag("l", "", "print .debug_line section");
+    opts.optflag("p", "", "print .debug_pubnames section");
+    opts.optflag("r", "", "print .debug_aranges section");
+    opts.optflag("y", "", "print .debug_pubtypes section");
+    opts.optflag(
+        "",
+        "dwo",
+        "print the .dwo versions of the selected sections",
+    );
+    opts.optflag("", "raw", "print raw data values");
+    opts.optopt(
+        "u",
+        "match-units",
+        "print compilation units whose output matches a regex",
+        "REGEX",
+    );
+    opts.optopt("", "sup", "path to supplementary object file", "PATH");
+
+    let matches = match opts.parse(env::args().skip(1)) {
+        Ok(m) => m,
+        Err(e) => {
+            writeln!(&mut io::stderr(), "{:?}\n", e).ok();
+            print_usage(&opts);
+        }
+    };
+    if matches.free.is_empty() {
+        print_usage(&opts);
+    }
+
+    let mut all = true;
+    let mut flags = Flags::default();
+    if matches.opt_present("eh-frame") {
+        flags.eh_frame = true;
+        all = false;
+    }
+    if matches.opt_present("G") {
+        flags.goff = true;
+    }
+    if matches.opt_present("i") {
+        flags.info = true;
+        all = false;
+    }
+    if matches.opt_present("l") {
+        flags.line = true;
+        all = false;
+    }
+    if matches.opt_present("p") {
+        flags.pubnames = true;
+        all = false;
+    }
+    if matches.opt_present("y") {
+        flags.pubtypes = true;
+        all = false;
+    }
+    if matches.opt_present("r") {
+        flags.aranges = true;
+        all = false;
+    }
+    if matches.opt_present("dwo") {
+        flags.dwo = true;
+    }
+    if matches.opt_present("raw") {
+        flags.raw = true;
+    }
+    if all {
+        // .eh_frame is excluded even when printing all information.
+        // cosmetic flags like -G must be set explicitly too.
+        flags.info = true;
+        flags.line = true;
+        flags.pubnames = true;
+        flags.pubtypes = true;
+        flags.aranges = true;
+    }
+    flags.match_units = if let Some(r) = matches.opt_str("u") {
+        match Regex::new(&r) {
+            Ok(r) => Some(r),
+            Err(e) => {
+                eprintln!("Invalid regular expression {}: {}", r, e);
+                process::exit(1);
+            }
+        }
+    } else {
+        None
+    };
+
+    let sup_mmap;
+    let sup_file = if let Some(sup_path) = matches.opt_str("sup") {
+        let file = match fs::File::open(&sup_path) {
+            Ok(file) => file,
+            Err(err) => {
+                eprintln!("Failed to open file '{}': {}", sup_path, err);
+                process::exit(1);
+            }
+        };
+        sup_mmap = match unsafe { memmap::Mmap::map(&file) } {
+            Ok(mmap) => mmap,
+            Err(err) => {
+                eprintln!("Failed to map file '{}': {}", sup_path, err);
+                process::exit(1);
+            }
+        };
+        match object::File::parse(&*sup_mmap) {
+            Ok(file) => Some(file),
+            Err(err) => {
+                eprintln!("Failed to parse file '{}': {}", sup_path, err);
+                process::exit(1);
+            }
+        }
+    } else {
+        None
+    };
+
+    for file_path in &matches.free {
+        if matches.free.len() != 1 {
+            println!("{}", file_path);
+            println!();
+        }
+
+        let file = match fs::File::open(&file_path) {
+            Ok(file) => file,
+            Err(err) => {
+                eprintln!("Failed to open file '{}': {}", file_path, err);
+                continue;
+            }
+        };
+        let file = match unsafe { memmap::Mmap::map(&file) } {
+            Ok(mmap) => mmap,
+            Err(err) => {
+                eprintln!("Failed to map file '{}': {}", file_path, err);
+                continue;
+            }
+        };
+        let file = match object::File::parse(&*file) {
+            Ok(file) => file,
+            Err(err) => {
+                eprintln!("Failed to parse file '{}': {}", file_path, err);
+                continue;
+            }
+        };
+
+        let endian = if file.is_little_endian() {
+            gimli::RunTimeEndian::Little
+        } else {
+            gimli::RunTimeEndian::Big
+        };
+        let ret = dump_file(&file, sup_file.as_ref(), endian, &flags);
+        match ret {
+            Ok(_) => (),
+            Err(err) => eprintln!("Failed to dump '{}': {}", file_path, err,),
+        }
+    }
+}
+
+fn load_file_section<'input, 'arena, Endian: gimli::Endianity>(
+    id: gimli::SectionId,
+    file: &object::File<'input>,
+    endian: Endian,
+    flags: &Flags,
+    arena_data: &'arena Arena<Cow<'input, [u8]>>,
+    arena_relocations: &'arena Arena<RelocationMap>,
+) -> Result<Relocate<'arena, gimli::EndianSlice<'arena, Endian>>> {
+    let mut relocations = RelocationMap::default();
+    let name = flags.section_name(id);
+    let data = match name.and_then(|name| file.section_by_name(&name)) {
+        Some(ref section) => {
+            // DWO sections never have relocations, so don't bother.
+            if !flags.dwo {
+                add_relocations(&mut relocations, file, section);
+            }
+            section.uncompressed_data()?
+        }
+        // Use a non-zero capacity so that `ReaderOffsetId`s are unique.
+        None => Cow::Owned(Vec::with_capacity(1)),
+    };
+    let data_ref = (*arena_data.alloc(data)).borrow();
+    let reader = gimli::EndianSlice::new(data_ref, endian);
+    let section = reader;
+    let relocations = (*arena_relocations.alloc(relocations)).borrow();
+    Ok(Relocate {
+        relocations,
+        section,
+        reader,
+    })
+}
+
+fn dump_file<Endian>(
+    file: &object::File,
+    sup_file: Option<&object::File>,
+    endian: Endian,
+    flags: &Flags,
+) -> Result<()>
+where
+    Endian: gimli::Endianity + Send + Sync,
+{
+    let arena_data = Arena::new();
+    let arena_relocations = Arena::new();
+
+    let mut load_section = |id: gimli::SectionId| -> Result<_> {
+        load_file_section(id, file, endian, flags, &arena_data, &arena_relocations)
+    };
+    let mut dwarf = gimli::Dwarf::load(&mut load_section)?;
+    if flags.dwo {
+        dwarf.file_type = gimli::DwarfFileType::Dwo;
+    }
+
+    if let Some(sup_file) = sup_file {
+        let mut load_sup_section = |id: gimli::SectionId| -> Result<_> {
+            // Note: we really only need the `.debug_str` section,
+            // but for now we load them all.
+            load_file_section(id, sup_file, endian, flags, &arena_data, &arena_relocations)
+        };
+        dwarf.load_sup(&mut load_sup_section)?;
+    }
+
+    let out = io::stdout();
+    if flags.eh_frame {
+        // TODO: this might be better based on the file format.
+        let address_size = file
+            .architecture()
+            .address_size()
+            .map(|w| w.bytes())
+            .unwrap_or(mem::size_of::<usize>() as u8);
+
+        fn register_name_none(_: gimli::Register) -> Option<&'static str> {
+            None
+        }
+        let arch_register_name = match file.architecture() {
+            object::Architecture::Arm | object::Architecture::Aarch64 => gimli::Arm::register_name,
+            object::Architecture::I386 => gimli::X86::register_name,
+            object::Architecture::X86_64 => gimli::X86_64::register_name,
+            _ => register_name_none,
+        };
+        let register_name = |register| match arch_register_name(register) {
+            Some(name) => Cow::Borrowed(name),
+            None => Cow::Owned(format!("{}", register.0)),
+        };
+
+        let mut eh_frame = gimli::EhFrame::load(&mut load_section).unwrap();
+        eh_frame.set_address_size(address_size);
+        let mut bases = gimli::BaseAddresses::default();
+        if let Some(section) = file.section_by_name(".eh_frame_hdr") {
+            bases = bases.set_eh_frame_hdr(section.address());
+        }
+        if let Some(section) = file.section_by_name(".eh_frame") {
+            bases = bases.set_eh_frame(section.address());
+        }
+        if let Some(section) = file.section_by_name(".text") {
+            bases = bases.set_text(section.address());
+        }
+        if let Some(section) = file.section_by_name(".got") {
+            bases = bases.set_got(section.address());
+        }
+        dump_eh_frame(
+            &mut BufWriter::new(out.lock()),
+            &eh_frame,
+            &bases,
+            &register_name,
+        )?;
+    }
+    if flags.info {
+        dump_info(&dwarf, flags)?;
+        dump_types(&mut BufWriter::new(out.lock()), &dwarf, flags)?;
+        writeln!(&mut out.lock())?;
+    }
+    let w = &mut BufWriter::new(out.lock());
+    if flags.line {
+        dump_line(w, &dwarf)?;
+    }
+    if flags.pubnames {
+        let debug_pubnames = &gimli::Section::load(&mut load_section).unwrap();
+        dump_pubnames(w, debug_pubnames, &dwarf.debug_info)?;
+    }
+    if flags.aranges {
+        let debug_aranges = &gimli::Section::load(&mut load_section).unwrap();
+        dump_aranges(w, debug_aranges)?;
+    }
+    if flags.pubtypes {
+        let debug_pubtypes = &gimli::Section::load(&mut load_section).unwrap();
+        dump_pubtypes(w, debug_pubtypes, &dwarf.debug_info)?;
+    }
+    Ok(())
+}
+
+fn dump_eh_frame<R: Reader, W: Write>(
+    w: &mut W,
+    eh_frame: &gimli::EhFrame<R>,
+    bases: &gimli::BaseAddresses,
+    register_name: &dyn Fn(gimli::Register) -> Cow<'static, str>,
+) -> Result<()> {
+    // TODO: Print "__eh_frame" here on macOS, and more generally use the
+    // section that we're actually looking at, which is what the canonical
+    // dwarfdump does.
+    writeln!(
+        w,
+        "Exception handling frame information for section .eh_frame"
+    )?;
+
+    let mut cies = HashMap::new();
+
+    let mut entries = eh_frame.entries(bases);
+    loop {
+        match entries.next()? {
+            None => return Ok(()),
+            Some(gimli::CieOrFde::Cie(cie)) => {
+                writeln!(w)?;
+                writeln!(w, "{:#010x}: CIE", cie.offset())?;
+                writeln!(w, "        length: {:#010x}", cie.entry_len())?;
+                // TODO: CIE_id
+                writeln!(w, "       version: {:#04x}", cie.version())?;
+                // TODO: augmentation
+                writeln!(w, "    code_align: {}", cie.code_alignment_factor())?;
+                writeln!(w, "    data_align: {}", cie.data_alignment_factor())?;
+                writeln!(w, "   ra_register: {:#x}", cie.return_address_register().0)?;
+                if let Some(encoding) = cie.lsda_encoding() {
+                    writeln!(w, " lsda_encoding: {:#02x}", encoding.0)?;
+                }
+                if let Some((encoding, personality)) = cie.personality_with_encoding() {
+                    write!(w, "   personality: {:#02x} ", encoding.0)?;
+                    dump_pointer(w, personality)?;
+                    writeln!(w)?;
+                }
+                if let Some(encoding) = cie.fde_address_encoding() {
+                    writeln!(w, "  fde_encoding: {:#02x}", encoding.0)?;
+                }
+                dump_cfi_instructions(w, cie.instructions(eh_frame, bases), true, register_name)?;
+                writeln!(w)?;
+            }
+            Some(gimli::CieOrFde::Fde(partial)) => {
+                let mut offset = None;
+                let fde = partial.parse(|_, bases, o| {
+                    offset = Some(o);
+                    cies.entry(o)
+                        .or_insert_with(|| eh_frame.cie_from_offset(bases, o))
+                        .clone()
+                })?;
+
+                writeln!(w)?;
+                writeln!(w, "{:#010x}: FDE", fde.offset())?;
+                writeln!(w, "        length: {:#010x}", fde.entry_len())?;
+                writeln!(w, "   CIE_pointer: {:#010x}", offset.unwrap().0)?;
+                // TODO: symbolicate the start address like the canonical dwarfdump does.
+                writeln!(w, "    start_addr: {:#018x}", fde.initial_address())?;
+                writeln!(
+                    w,
+                    "    range_size: {:#018x} (end_addr = {:#018x})",
+                    fde.len(),
+                    fde.initial_address() + fde.len()
+                )?;
+                if let Some(lsda) = fde.lsda() {
+                    write!(w, "          lsda: ")?;
+                    dump_pointer(w, lsda)?;
+                    writeln!(w)?;
+                }
+                dump_cfi_instructions(w, fde.instructions(eh_frame, bases), false, register_name)?;
+                writeln!(w)?;
+            }
+        }
+    }
+}
+
+fn dump_pointer<W: Write>(w: &mut W, p: gimli::Pointer) -> Result<()> {
+    match p {
+        gimli::Pointer::Direct(p) => {
+            write!(w, "{:#018x}", p)?;
+        }
+        gimli::Pointer::Indirect(p) => {
+            write!(w, "({:#018x})", p)?;
+        }
+    }
+    Ok(())
+}
+
+#[allow(clippy::unneeded_field_pattern)]
+fn dump_cfi_instructions<R: Reader, W: Write>(
+    w: &mut W,
+    mut insns: gimli::CallFrameInstructionIter<R>,
+    is_initial: bool,
+    register_name: &dyn Fn(gimli::Register) -> Cow<'static, str>,
+) -> Result<()> {
+    use gimli::CallFrameInstruction::*;
+
+    // TODO: we need to actually evaluate these instructions as we iterate them
+    // so we can print the initialized state for CIEs, and each unwind row's
+    // registers for FDEs.
+    //
+    // TODO: We should print DWARF expressions for the CFI instructions that
+    // embed DWARF expressions within themselves.
+
+    if !is_initial {
+        writeln!(w, "  Instructions:")?;
+    }
+
+    loop {
+        match insns.next() {
+            Err(e) => {
+                writeln!(w, "Failed to decode CFI instruction: {}", e)?;
+                return Ok(());
+            }
+            Ok(None) => {
+                if is_initial {
+                    writeln!(w, "  Instructions: Init State:")?;
+                }
+                return Ok(());
+            }
+            Ok(Some(op)) => match op {
+                SetLoc { address } => {
+                    writeln!(w, "                DW_CFA_set_loc ({:#x})", address)?;
+                }
+                AdvanceLoc { delta } => {
+                    writeln!(w, "                DW_CFA_advance_loc ({})", delta)?;
+                }
+                DefCfa { register, offset } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_def_cfa ({}, {})",
+                        register_name(register),
+                        offset
+                    )?;
+                }
+                DefCfaSf {
+                    register,
+                    factored_offset,
+                } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_def_cfa_sf ({}, {})",
+                        register_name(register),
+                        factored_offset
+                    )?;
+                }
+                DefCfaRegister { register } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_def_cfa_register ({})",
+                        register_name(register)
+                    )?;
+                }
+                DefCfaOffset { offset } => {
+                    writeln!(w, "                DW_CFA_def_cfa_offset ({})", offset)?;
+                }
+                DefCfaOffsetSf { factored_offset } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_def_cfa_offset_sf ({})",
+                        factored_offset
+                    )?;
+                }
+                DefCfaExpression { expression: _ } => {
+                    writeln!(w, "                DW_CFA_def_cfa_expression (...)")?;
+                }
+                Undefined { register } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_undefined ({})",
+                        register_name(register)
+                    )?;
+                }
+                SameValue { register } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_same_value ({})",
+                        register_name(register)
+                    )?;
+                }
+                Offset {
+                    register,
+                    factored_offset,
+                } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_offset ({}, {})",
+                        register_name(register),
+                        factored_offset
+                    )?;
+                }
+                OffsetExtendedSf {
+                    register,
+                    factored_offset,
+                } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_offset_extended_sf ({}, {})",
+                        register_name(register),
+                        factored_offset
+                    )?;
+                }
+                ValOffset {
+                    register,
+                    factored_offset,
+                } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_val_offset ({}, {})",
+                        register_name(register),
+                        factored_offset
+                    )?;
+                }
+                ValOffsetSf {
+                    register,
+                    factored_offset,
+                } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_val_offset_sf ({}, {})",
+                        register_name(register),
+                        factored_offset
+                    )?;
+                }
+                Register {
+                    dest_register,
+                    src_register,
+                } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_register ({}, {})",
+                        register_name(dest_register),
+                        register_name(src_register)
+                    )?;
+                }
+                Expression {
+                    register,
+                    expression: _,
+                } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_expression ({}, ...)",
+                        register_name(register)
+                    )?;
+                }
+                ValExpression {
+                    register,
+                    expression: _,
+                } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_val_expression ({}, ...)",
+                        register_name(register)
+                    )?;
+                }
+                Restore { register } => {
+                    writeln!(
+                        w,
+                        "                DW_CFA_restore ({})",
+                        register_name(register)
+                    )?;
+                }
+                RememberState => {
+                    writeln!(w, "                DW_CFA_remember_state")?;
+                }
+                RestoreState => {
+                    writeln!(w, "                DW_CFA_restore_state")?;
+                }
+                ArgsSize { size } => {
+                    writeln!(w, "                DW_CFA_GNU_args_size ({})", size)?;
+                }
+                Nop => {
+                    writeln!(w, "                DW_CFA_nop")?;
+                }
+            },
+        }
+    }
+}
+
+fn dump_info<R: Reader>(dwarf: &gimli::Dwarf<R>, flags: &Flags) -> Result<()>
+where
+    R::Endian: Send + Sync,
+{
+    let out = io::stdout();
+    writeln!(&mut BufWriter::new(out.lock()), "\n.debug_info")?;
+
+    let units = match dwarf.units().collect::<Vec<_>>() {
+        Ok(units) => units,
+        Err(err) => {
+            writeln_error(
+                &mut BufWriter::new(out.lock()),
+                dwarf,
+                Error::GimliError(err),
+                "Failed to read unit headers",
+            )?;
+            return Ok(());
+        }
+    };
+    let process_unit = |header: UnitHeader<R>, buf: &mut Vec<u8>| -> Result<()> {
+        writeln!(
+            buf,
+            "\nUNIT<header overall offset = 0x{:08x}>:",
+            header.offset().as_debug_info_offset().unwrap().0,
+        )?;
+
+        match header.type_() {
+            UnitType::Compilation | UnitType::Partial => (),
+            UnitType::Type {
+                type_signature,
+                type_offset,
+            }
+            | UnitType::SplitType {
+                type_signature,
+                type_offset,
+            } => {
+                write!(buf, "  signature        = ")?;
+                dump_type_signature(buf, type_signature)?;
+                writeln!(buf)?;
+                writeln!(buf, "  typeoffset       = 0x{:08x}", type_offset.0,)?;
+            }
+            UnitType::Skeleton(dwo_id) | UnitType::SplitCompilation(dwo_id) => {
+                write!(buf, "  dwo_id           = ")?;
+                writeln!(buf, "0x{:016x}", dwo_id.0)?;
+            }
+        }
+
+        let unit = match dwarf.unit(header) {
+            Ok(unit) => unit,
+            Err(err) => {
+                writeln_error(buf, dwarf, err.into(), "Failed to parse unit root entry")?;
+                return Ok(());
+            }
+        };
+
+        let entries_result = dump_entries(buf, unit, dwarf, flags);
+        if let Err(err) = entries_result {
+            writeln_error(buf, dwarf, err, "Failed to dump entries")?;
+        }
+        if !flags
+            .match_units
+            .as_ref()
+            .map(|r| r.is_match(&buf))
+            .unwrap_or(true)
+        {
+            buf.clear();
+        }
+        Ok(())
+    };
+    // Don't use more than 16 cores even if available. No point in soaking hundreds
+    // of cores if you happen to have them.
+    parallel_output(16, units, process_unit)
+}
+
+fn dump_types<R: Reader, W: Write>(
+    w: &mut W,
+    dwarf: &gimli::Dwarf<R>,
+    flags: &Flags,
+) -> Result<()> {
+    writeln!(w, "\n.debug_types")?;
+
+    let mut iter = dwarf.type_units();
+    while let Some(header) = iter.next()? {
+        writeln!(
+            w,
+            "\nUNIT<header overall offset = 0x{:08x}>:",
+            header.offset().as_debug_types_offset().unwrap().0,
+        )?;
+        write!(w, "  signature        = ")?;
+        let (type_signature, type_offset) = match header.type_() {
+            UnitType::Type {
+                type_signature,
+                type_offset,
+            } => (type_signature, type_offset),
+            _ => unreachable!(), // No other units allowed in .debug_types.
+        };
+        dump_type_signature(w, type_signature)?;
+        writeln!(w)?;
+        writeln!(w, "  typeoffset       = 0x{:08x}", type_offset.0,)?;
+
+        let unit = match dwarf.unit(header) {
+            Ok(unit) => unit,
+            Err(err) => {
+                writeln_error(w, dwarf, err.into(), "Failed to parse type unit root entry")?;
+                continue;
+            }
+        };
+        let entries_result = dump_entries(w, unit, dwarf, flags);
+        if let Err(err) = entries_result {
+            writeln_error(w, dwarf, err, "Failed to dump entries")?;
+        }
+    }
+    Ok(())
+}
+
+fn spaces(buf: &mut String, len: usize) -> &str {
+    while buf.len() < len {
+        buf.push(' ');
+    }
+    &buf[..len]
+}
+
+// " GOFF=0x{:08x}" adds exactly 16 spaces.
+const GOFF_SPACES: usize = 16;
+
+fn write_offset<R: Reader, W: Write>(
+    w: &mut W,
+    unit: &gimli::Unit<R>,
+    offset: gimli::UnitOffset<R::Offset>,
+    flags: &Flags,
+) -> Result<()> {
+    write!(w, "<0x{:08x}", offset.0)?;
+    if flags.goff {
+        let goff = match offset.to_unit_section_offset(unit) {
+            UnitSectionOffset::DebugInfoOffset(o) => o.0,
+            UnitSectionOffset::DebugTypesOffset(o) => o.0,
+        };
+        write!(w, " GOFF=0x{:08x}", goff)?;
+    }
+    write!(w, ">")?;
+    Ok(())
+}
+
+fn dump_entries<R: Reader, W: Write>(
+    w: &mut W,
+    unit: gimli::Unit<R>,
+    dwarf: &gimli::Dwarf<R>,
+    flags: &Flags,
+) -> Result<()> {
+    let mut spaces_buf = String::new();
+
+    let mut depth = 0;
+    let mut entries = unit.entries();
+    while let Some((delta_depth, entry)) = entries.next_dfs()? {
+        depth += delta_depth;
+        assert!(depth >= 0);
+        let mut indent = depth as usize * 2 + 2;
+        write!(w, "<{}{}>", if depth < 10 { " " } else { "" }, depth)?;
+        write_offset(w, &unit, entry.offset(), flags)?;
+        writeln!(w, "{}{}", spaces(&mut spaces_buf, indent), entry.tag())?;
+
+        indent += 18;
+        if flags.goff {
+            indent += GOFF_SPACES;
+        }
+
+        let mut attrs = entry.attrs();
+        while let Some(attr) = attrs.next()? {
+            w.write_all(spaces(&mut spaces_buf, indent).as_bytes())?;
+            if let Some(n) = attr.name().static_string() {
+                let right_padding = 27 - std::cmp::min(27, n.len());
+                write!(w, "{}{} ", n, spaces(&mut spaces_buf, right_padding))?;
+            } else {
+                write!(w, "{:27} ", attr.name())?;
+            }
+            if flags.raw {
+                writeln!(w, "{:?}", attr.raw_value())?;
+            } else {
+                match dump_attr_value(w, &attr, &unit, dwarf) {
+                    Ok(_) => (),
+                    Err(err) => writeln_error(w, dwarf, err, "Failed to dump attribute value")?,
+                };
+            }
+        }
+    }
+    Ok(())
+}
+
+fn dump_attr_value<R: Reader, W: Write>(
+    w: &mut W,
+    attr: &gimli::Attribute<R>,
+    unit: &gimli::Unit<R>,
+    dwarf: &gimli::Dwarf<R>,
+) -> Result<()> {
+    let value = attr.value();
+    match value {
+        gimli::AttributeValue::Addr(address) => {
+            writeln!(w, "0x{:08x}", address)?;
+        }
+        gimli::AttributeValue::Block(data) => {
+            for byte in data.to_slice()?.iter() {
+                write!(w, "{:02x}", byte)?;
+            }
+            writeln!(w)?;
+        }
+        gimli::AttributeValue::Data1(_)
+        | gimli::AttributeValue::Data2(_)
+        | gimli::AttributeValue::Data4(_)
+        | gimli::AttributeValue::Data8(_) => {
+            if let (Some(udata), Some(sdata)) = (attr.udata_value(), attr.sdata_value()) {
+                if sdata >= 0 {
+                    writeln!(w, "{}", udata)?;
+                } else {
+                    writeln!(w, "{} ({})", udata, sdata)?;
+                }
+            } else {
+                writeln!(w, "{:?}", value)?;
+            }
+        }
+        gimli::AttributeValue::Sdata(data) => {
+            match attr.name() {
+                gimli::DW_AT_data_member_location => {
+                    writeln!(w, "{}", data)?;
+                }
+                _ => {
+                    if data >= 0 {
+                        writeln!(w, "0x{:08x}", data)?;
+                    } else {
+                        writeln!(w, "0x{:08x} ({})", data, data)?;
+                    }
+                }
+            };
+        }
+        gimli::AttributeValue::Udata(data) => {
+            match attr.name() {
+                gimli::DW_AT_high_pc => {
+                    writeln!(w, "<offset-from-lowpc>{}", data)?;
+                }
+                gimli::DW_AT_data_member_location => {
+                    if let Some(sdata) = attr.sdata_value() {
+                        // This is a DW_FORM_data* value.
+                        // libdwarf-dwarfdump displays this as signed too.
+                        if sdata >= 0 {
+                            writeln!(w, "{}", data)?;
+                        } else {
+                            writeln!(w, "{} ({})", data, sdata)?;
+                        }
+                    } else {
+                        writeln!(w, "{}", data)?;
+                    }
+                }
+                gimli::DW_AT_lower_bound | gimli::DW_AT_upper_bound => {
+                    writeln!(w, "{}", data)?;
+                }
+                _ => {
+                    writeln!(w, "0x{:08x}", data)?;
+                }
+            };
+        }
+        gimli::AttributeValue::Exprloc(ref data) => {
+            if let gimli::AttributeValue::Exprloc(_) = attr.raw_value() {
+                write!(w, "len 0x{:04x}: ", data.0.len())?;
+                for byte in data.0.to_slice()?.iter() {
+                    write!(w, "{:02x}", byte)?;
+                }
+                write!(w, ": ")?;
+            }
+            dump_exprloc(w, unit.encoding(), data)?;
+            writeln!(w)?;
+        }
+        gimli::AttributeValue::Flag(true) => {
+            writeln!(w, "yes")?;
+        }
+        gimli::AttributeValue::Flag(false) => {
+            writeln!(w, "no")?;
+        }
+        gimli::AttributeValue::SecOffset(offset) => {
+            writeln!(w, "0x{:08x}", offset)?;
+        }
+        gimli::AttributeValue::DebugAddrBase(base) => {
+            writeln!(w, "<.debug_addr+0x{:08x}>", base.0)?;
+        }
+        gimli::AttributeValue::DebugAddrIndex(index) => {
+            write!(w, "(indirect address, index {:#x}): ", index.0)?;
+            let address = dwarf.address(unit, index)?;
+            writeln!(w, "0x{:08x}", address)?;
+        }
+        gimli::AttributeValue::UnitRef(offset) => {
+            write!(w, "0x{:08x}", offset.0)?;
+            match offset.to_unit_section_offset(unit) {
+                UnitSectionOffset::DebugInfoOffset(goff) => {
+                    write!(w, "<.debug_info+0x{:08x}>", goff.0)?;
+                }
+                UnitSectionOffset::DebugTypesOffset(goff) => {
+                    write!(w, "<.debug_types+0x{:08x}>", goff.0)?;
+                }
+            }
+            writeln!(w)?;
+        }
+        gimli::AttributeValue::DebugInfoRef(offset) => {
+            writeln!(w, "<.debug_info+0x{:08x}>", offset.0)?;
+        }
+        gimli::AttributeValue::DebugInfoRefSup(offset) => {
+            writeln!(w, "<.debug_info(sup)+0x{:08x}>", offset.0)?;
+        }
+        gimli::AttributeValue::DebugLineRef(offset) => {
+            writeln!(w, "<.debug_line+0x{:08x}>", offset.0)?;
+        }
+        gimli::AttributeValue::LocationListsRef(offset) => {
+            dump_loc_list(w, offset, unit, dwarf)?;
+        }
+        gimli::AttributeValue::DebugLocListsBase(base) => {
+            writeln!(w, "<.debug_loclists+0x{:08x}>", base.0)?;
+        }
+        gimli::AttributeValue::DebugLocListsIndex(index) => {
+            write!(w, "(indirect location list, index {:#x}): ", index.0)?;
+            let offset = dwarf.locations_offset(unit, index)?;
+            dump_loc_list(w, offset, unit, dwarf)?;
+        }
+        gimli::AttributeValue::DebugMacinfoRef(offset) => {
+            writeln!(w, "<.debug_macinfo+0x{:08x}>", offset.0)?;
+        }
+        gimli::AttributeValue::DebugMacroRef(offset) => {
+            writeln!(w, "<.debug_macro+0x{:08x}>", offset.0)?;
+        }
+        gimli::AttributeValue::RangeListsRef(offset) => {
+            dump_range_list(w, offset, unit, dwarf)?;
+        }
+        gimli::AttributeValue::DebugRngListsBase(base) => {
+            writeln!(w, "<.debug_rnglists+0x{:08x}>", base.0)?;
+        }
+        gimli::AttributeValue::DebugRngListsIndex(index) => {
+            write!(w, "(indirect range list, index {:#x}): ", index.0)?;
+            let offset = dwarf.ranges_offset(unit, index)?;
+            dump_range_list(w, offset, unit, dwarf)?;
+        }
+        gimli::AttributeValue::DebugTypesRef(signature) => {
+            dump_type_signature(w, signature)?;
+            writeln!(w, " <type signature>")?;
+        }
+        gimli::AttributeValue::DebugStrRef(offset) => {
+            if let Ok(s) = dwarf.debug_str.get_str(offset) {
+                writeln!(w, "{}", s.to_string_lossy()?)?;
+            } else {
+                writeln!(w, "<.debug_str+0x{:08x}>", offset.0)?;
+            }
+        }
+        gimli::AttributeValue::DebugStrRefSup(offset) => {
+            if let Some(s) = dwarf
+                .sup()
+                .and_then(|sup| sup.debug_str.get_str(offset).ok())
+            {
+                writeln!(w, "{}", s.to_string_lossy()?)?;
+            } else {
+                writeln!(w, "<.debug_str(sup)+0x{:08x}>", offset.0)?;
+            }
+        }
+        gimli::AttributeValue::DebugStrOffsetsBase(base) => {
+            writeln!(w, "<.debug_str_offsets+0x{:08x}>", base.0)?;
+        }
+        gimli::AttributeValue::DebugStrOffsetsIndex(index) => {
+            write!(w, "(indirect string, index {:#x}): ", index.0)?;
+            let offset = dwarf.debug_str_offsets.get_str_offset(
+                unit.encoding().format,
+                unit.str_offsets_base,
+                index,
+            )?;
+            if let Ok(s) = dwarf.debug_str.get_str(offset) {
+                writeln!(w, "{}", s.to_string_lossy()?)?;
+            } else {
+                writeln!(w, "<.debug_str+0x{:08x}>", offset.0)?;
+            }
+        }
+        gimli::AttributeValue::DebugLineStrRef(offset) => {
+            if let Ok(s) = dwarf.debug_line_str.get_str(offset) {
+                writeln!(w, "{}", s.to_string_lossy()?)?;
+            } else {
+                writeln!(w, "<.debug_line_str=0x{:08x}>", offset.0)?;
+            }
+        }
+        gimli::AttributeValue::String(s) => {
+            writeln!(w, "{}", s.to_string_lossy()?)?;
+        }
+        gimli::AttributeValue::Encoding(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::DecimalSign(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::Endianity(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::Accessibility(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::Visibility(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::Virtuality(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::Language(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::AddressClass(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::IdentifierCase(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::CallingConvention(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::Inline(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::Ordering(value) => {
+            writeln!(w, "{}", value)?;
+        }
+        gimli::AttributeValue::FileIndex(value) => {
+            write!(w, "0x{:08x}", value)?;
+            dump_file_index(w, value, unit, dwarf)?;
+            writeln!(w)?;
+        }
+        gimli::AttributeValue::DwoId(value) => {
+            writeln!(w, "0x{:016x}", value.0)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn dump_type_signature<W: Write>(w: &mut W, signature: gimli::DebugTypeSignature) -> Result<()> {
+    write!(w, "0x{:016x}", signature.0)?;
+    Ok(())
+}
+
+fn dump_file_index<R: Reader, W: Write>(
+    w: &mut W,
+    file: u64,
+    unit: &gimli::Unit<R>,
+    dwarf: &gimli::Dwarf<R>,
+) -> Result<()> {
+    if file == 0 {
+        return Ok(());
+    }
+    let header = match unit.line_program {
+        Some(ref program) => program.header(),
+        None => return Ok(()),
+    };
+    let file = match header.file(file) {
+        Some(header) => header,
+        None => {
+            writeln!(w, "Unable to get header for file {}", file)?;
+            return Ok(());
+        }
+    };
+    write!(w, " ")?;
+    if let Some(directory) = file.directory(header) {
+        let directory = dwarf.attr_string(unit, directory)?;
+        let directory = directory.to_string_lossy()?;
+        if !directory.starts_with('/') {
+            if let Some(ref comp_dir) = unit.comp_dir {
+                write!(w, "{}/", comp_dir.to_string_lossy()?,)?;
+            }
+        }
+        write!(w, "{}/", directory)?;
+    }
+    write!(
+        w,
+        "{}",
+        dwarf
+            .attr_string(unit, file.path_name())?
+            .to_string_lossy()?
+    )?;
+    Ok(())
+}
+
+fn dump_exprloc<R: Reader, W: Write>(
+    w: &mut W,
+    encoding: gimli::Encoding,
+    data: &gimli::Expression<R>,
+) -> Result<()> {
+    let mut pc = data.0.clone();
+    let mut space = false;
+    while pc.len() != 0 {
+        let pc_clone = pc.clone();
+        match gimli::Operation::parse(&mut pc, encoding) {
+            Ok(op) => {
+                if space {
+                    write!(w, " ")?;
+                } else {
+                    space = true;
+                }
+                dump_op(w, encoding, pc_clone, op)?;
+            }
+            Err(gimli::Error::InvalidExpression(op)) => {
+                writeln!(w, "WARNING: unsupported operation 0x{:02x}", op.0)?;
+                return Ok(());
+            }
+            Err(gimli::Error::UnsupportedRegister(register)) => {
+                writeln!(w, "WARNING: unsupported register {}", register)?;
+                return Ok(());
+            }
+            Err(gimli::Error::UnexpectedEof(_)) => {
+                writeln!(w, "WARNING: truncated or malformed expression")?;
+                return Ok(());
+            }
+            Err(e) => {
+                writeln!(w, "WARNING: unexpected operation parse error: {}", e)?;
+                return Ok(());
+            }
+        }
+    }
+    Ok(())
+}
+
+fn dump_op<R: Reader, W: Write>(
+    w: &mut W,
+    encoding: gimli::Encoding,
+    mut pc: R,
+    op: gimli::Operation<R>,
+) -> Result<()> {
+    let dwop = gimli::DwOp(pc.read_u8()?);
+    write!(w, "{}", dwop)?;
+    match op {
+        gimli::Operation::Deref {
+            base_type, size, ..
+        } => {
+            if dwop == gimli::DW_OP_deref_size || dwop == gimli::DW_OP_xderef_size {
+                write!(w, " {}", size)?;
+            }
+            if base_type != UnitOffset(0) {
+                write!(w, " type 0x{:08x}", base_type.0)?;
+            }
+        }
+        gimli::Operation::Pick { index } => {
+            if dwop == gimli::DW_OP_pick {
+                write!(w, " {}", index)?;
+            }
+        }
+        gimli::Operation::PlusConstant { value } => {
+            write!(w, " {}", value as i64)?;
+        }
+        gimli::Operation::Bra { target } => {
+            write!(w, " {}", target)?;
+        }
+        gimli::Operation::Skip { target } => {
+            write!(w, " {}", target)?;
+        }
+        gimli::Operation::SignedConstant { value } => match dwop {
+            gimli::DW_OP_const1s
+            | gimli::DW_OP_const2s
+            | gimli::DW_OP_const4s
+            | gimli::DW_OP_const8s
+            | gimli::DW_OP_consts => {
+                write!(w, " {}", value)?;
+            }
+            _ => {}
+        },
+        gimli::Operation::UnsignedConstant { value } => match dwop {
+            gimli::DW_OP_const1u
+            | gimli::DW_OP_const2u
+            | gimli::DW_OP_const4u
+            | gimli::DW_OP_const8u
+            | gimli::DW_OP_constu => {
+                write!(w, " {}", value)?;
+            }
+            _ => {
+                // These have the value encoded in the operation, eg DW_OP_lit0.
+            }
+        },
+        gimli::Operation::Register { register } => {
+            if dwop == gimli::DW_OP_regx {
+                write!(w, " {}", register.0)?;
+            }
+        }
+        gimli::Operation::RegisterOffset {
+            register,
+            offset,
+            base_type,
+        } => {
+            if dwop >= gimli::DW_OP_breg0 && dwop <= gimli::DW_OP_breg31 {
+                write!(w, "{:+}", offset)?;
+            } else {
+                write!(w, " {}", register.0)?;
+                if offset != 0 {
+                    write!(w, "{:+}", offset)?;
+                }
+                if base_type != UnitOffset(0) {
+                    write!(w, " type 0x{:08x}", base_type.0)?;
+                }
+            }
+        }
+        gimli::Operation::FrameOffset { offset } => {
+            write!(w, " {}", offset)?;
+        }
+        gimli::Operation::Call { offset } => match offset {
+            gimli::DieReference::UnitRef(gimli::UnitOffset(offset)) => {
+                write!(w, " 0x{:08x}", offset)?;
+            }
+            gimli::DieReference::DebugInfoRef(gimli::DebugInfoOffset(offset)) => {
+                write!(w, " 0x{:08x}", offset)?;
+            }
+        },
+        gimli::Operation::Piece {
+            size_in_bits,
+            bit_offset: None,
+        } => {
+            write!(w, " {}", size_in_bits / 8)?;
+        }
+        gimli::Operation::Piece {
+            size_in_bits,
+            bit_offset: Some(bit_offset),
+        } => {
+            write!(w, " 0x{:08x} offset 0x{:08x}", size_in_bits, bit_offset)?;
+        }
+        gimli::Operation::ImplicitValue { data } => {
+            let data = data.to_slice()?;
+            write!(w, " 0x{:08x} contents 0x", data.len())?;
+            for byte in data.iter() {
+                write!(w, "{:02x}", byte)?;
+            }
+        }
+        gimli::Operation::ImplicitPointer { value, byte_offset } => {
+            write!(w, " 0x{:08x} {}", value.0, byte_offset)?;
+        }
+        gimli::Operation::EntryValue { expression } => {
+            write!(w, "(")?;
+            dump_exprloc(w, encoding, &gimli::Expression(expression))?;
+            write!(w, ")")?;
+        }
+        gimli::Operation::ParameterRef { offset } => {
+            write!(w, " 0x{:08x}", offset.0)?;
+        }
+        gimli::Operation::Address { address } => {
+            write!(w, " 0x{:08x}", address)?;
+        }
+        gimli::Operation::AddressIndex { index } => {
+            write!(w, " 0x{:08x}", index.0)?;
+        }
+        gimli::Operation::ConstantIndex { index } => {
+            write!(w, " 0x{:08x}", index.0)?;
+        }
+        gimli::Operation::TypedLiteral { base_type, value } => {
+            write!(w, " type 0x{:08x} contents 0x", base_type.0)?;
+            for byte in value.to_slice()?.iter() {
+                write!(w, "{:02x}", byte)?;
+            }
+        }
+        gimli::Operation::Convert { base_type } => {
+            write!(w, " type 0x{:08x}", base_type.0)?;
+        }
+        gimli::Operation::Reinterpret { base_type } => {
+            write!(w, " type 0x{:08x}", base_type.0)?;
+        }
+        gimli::Operation::WasmLocal { index }
+        | gimli::Operation::WasmGlobal { index }
+        | gimli::Operation::WasmStack { index } => {
+            let wasmop = pc.read_u8()?;
+            write!(w, " 0x{:x} 0x{:x}", wasmop, index)?;
+        }
+        gimli::Operation::Drop
+        | gimli::Operation::Swap
+        | gimli::Operation::Rot
+        | gimli::Operation::Abs
+        | gimli::Operation::And
+        | gimli::Operation::Div
+        | gimli::Operation::Minus
+        | gimli::Operation::Mod
+        | gimli::Operation::Mul
+        | gimli::Operation::Neg
+        | gimli::Operation::Not
+        | gimli::Operation::Or
+        | gimli::Operation::Plus
+        | gimli::Operation::Shl
+        | gimli::Operation::Shr
+        | gimli::Operation::Shra
+        | gimli::Operation::Xor
+        | gimli::Operation::Eq
+        | gimli::Operation::Ge
+        | gimli::Operation::Gt
+        | gimli::Operation::Le
+        | gimli::Operation::Lt
+        | gimli::Operation::Ne
+        | gimli::Operation::Nop
+        | gimli::Operation::PushObjectAddress
+        | gimli::Operation::TLS
+        | gimli::Operation::CallFrameCFA
+        | gimli::Operation::StackValue => {}
+    };
+    Ok(())
+}
+
+fn dump_loc_list<R: Reader, W: Write>(
+    w: &mut W,
+    offset: gimli::LocationListsOffset<R::Offset>,
+    unit: &gimli::Unit<R>,
+    dwarf: &gimli::Dwarf<R>,
+) -> Result<()> {
+    let raw_locations = dwarf.locations.raw_locations(offset, unit.encoding())?;
+    let raw_locations: Vec<_> = raw_locations.collect()?;
+    let mut locations = dwarf.locations(unit, offset)?;
+    writeln!(
+        w,
+        "<loclist at {}+0x{:08x} with {} entries>",
+        if unit.encoding().version < 5 {
+            ".debug_loc"
+        } else {
+            ".debug_loclists"
+        },
+        offset.0,
+        raw_locations.len()
+    )?;
+    for (i, raw) in raw_locations.iter().enumerate() {
+        write!(w, "\t\t\t[{:2}]", i)?;
+        match *raw {
+            gimli::RawLocListEntry::BaseAddress { addr } => {
+                writeln!(w, "<new base address 0x{:08x}>", addr)?;
+            }
+            gimli::RawLocListEntry::BaseAddressx { addr } => {
+                let addr_val = dwarf.address(unit, addr)?;
+                writeln!(w, "<new base addressx [{}]0x{:08x}>", addr.0, addr_val)?;
+            }
+            gimli::RawLocListEntry::StartxEndx {
+                begin,
+                end,
+                ref data,
+            } => {
+                let begin_val = dwarf.address(unit, begin)?;
+                let end_val = dwarf.address(unit, end)?;
+                let location = locations.next()?.unwrap();
+                write!(
+                    w,
+                    "<startx-endx \
+                     low-off: [{}]0x{:08x} addr 0x{:08x} \
+                     high-off: [{}]0x{:08x} addr 0x{:08x}>",
+                    begin.0, begin_val, location.range.begin, end.0, end_val, location.range.end
+                )?;
+                dump_exprloc(w, unit.encoding(), data)?;
+                writeln!(w)?;
+            }
+            gimli::RawLocListEntry::StartxLength {
+                begin,
+                length,
+                ref data,
+            } => {
+                let begin_val = dwarf.address(unit, begin)?;
+                let location = locations.next()?.unwrap();
+                write!(
+                    w,
+                    "<start-length \
+                     low-off: [{}]0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin.0, begin_val, location.range.begin, length, location.range.end
+                )?;
+                dump_exprloc(w, unit.encoding(), data)?;
+                writeln!(w)?;
+            }
+            gimli::RawLocListEntry::AddressOrOffsetPair {
+                begin,
+                end,
+                ref data,
+            }
+            | gimli::RawLocListEntry::OffsetPair {
+                begin,
+                end,
+                ref data,
+            } => {
+                let location = locations.next()?.unwrap();
+                write!(
+                    w,
+                    "<offset pair \
+                     low-off: 0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin, location.range.begin, end, location.range.end
+                )?;
+                dump_exprloc(w, unit.encoding(), data)?;
+                writeln!(w)?;
+            }
+            gimli::RawLocListEntry::DefaultLocation { ref data } => {
+                write!(w, "<default location>")?;
+                dump_exprloc(w, unit.encoding(), data)?;
+                writeln!(w)?;
+            }
+            gimli::RawLocListEntry::StartEnd {
+                begin,
+                end,
+                ref data,
+            } => {
+                let location = locations.next()?.unwrap();
+                write!(
+                    w,
+                    "<start-end \
+                     low-off: 0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin, location.range.begin, end, location.range.end
+                )?;
+                dump_exprloc(w, unit.encoding(), data)?;
+                writeln!(w)?;
+            }
+            gimli::RawLocListEntry::StartLength {
+                begin,
+                length,
+                ref data,
+            } => {
+                let location = locations.next()?.unwrap();
+                write!(
+                    w,
+                    "<start-length \
+                     low-off: 0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin, location.range.begin, length, location.range.end
+                )?;
+                dump_exprloc(w, unit.encoding(), data)?;
+                writeln!(w)?;
+            }
+        };
+    }
+    Ok(())
+}
+
+fn dump_range_list<R: Reader, W: Write>(
+    w: &mut W,
+    offset: gimli::RangeListsOffset<R::Offset>,
+    unit: &gimli::Unit<R>,
+    dwarf: &gimli::Dwarf<R>,
+) -> Result<()> {
+    let raw_ranges = dwarf.ranges.raw_ranges(offset, unit.encoding())?;
+    let raw_ranges: Vec<_> = raw_ranges.collect()?;
+    let mut ranges = dwarf.ranges(unit, offset)?;
+    writeln!(
+        w,
+        "<rnglist at {}+0x{:08x} with {} entries>",
+        if unit.encoding().version < 5 {
+            ".debug_ranges"
+        } else {
+            ".debug_rnglists"
+        },
+        offset.0,
+        raw_ranges.len()
+    )?;
+    for (i, raw) in raw_ranges.iter().enumerate() {
+        write!(w, "\t\t\t[{:2}] ", i)?;
+        match *raw {
+            gimli::RawRngListEntry::AddressOrOffsetPair { begin, end } => {
+                let range = ranges.next()?.unwrap();
+                writeln!(
+                    w,
+                    "<address pair \
+                     low-off: 0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin, range.begin, end, range.end
+                )?;
+            }
+            gimli::RawRngListEntry::BaseAddress { addr } => {
+                writeln!(w, "<new base address 0x{:08x}>", addr)?;
+            }
+            gimli::RawRngListEntry::BaseAddressx { addr } => {
+                let addr_val = dwarf.address(unit, addr)?;
+                writeln!(w, "<new base addressx [{}]0x{:08x}>", addr.0, addr_val)?;
+            }
+            gimli::RawRngListEntry::StartxEndx { begin, end } => {
+                let begin_val = dwarf.address(unit, begin)?;
+                let end_val = dwarf.address(unit, end)?;
+                let range = if begin_val == end_val {
+                    gimli::Range {
+                        begin: begin_val,
+                        end: end_val,
+                    }
+                } else {
+                    ranges.next()?.unwrap()
+                };
+                writeln!(
+                    w,
+                    "<startx-endx \
+                     low-off: [{}]0x{:08x} addr 0x{:08x} \
+                     high-off: [{}]0x{:08x} addr 0x{:08x}>",
+                    begin.0, begin_val, range.begin, end.0, end_val, range.end
+                )?;
+            }
+            gimli::RawRngListEntry::StartxLength { begin, length } => {
+                let begin_val = dwarf.address(unit, begin)?;
+                let range = ranges.next()?.unwrap();
+                writeln!(
+                    w,
+                    "<startx-length \
+                     low-off: [{}]0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin.0, begin_val, range.begin, length, range.end
+                )?;
+            }
+            gimli::RawRngListEntry::OffsetPair { begin, end } => {
+                let range = ranges.next()?.unwrap();
+                writeln!(
+                    w,
+                    "<offset pair \
+                     low-off: 0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin, range.begin, end, range.end
+                )?;
+            }
+            gimli::RawRngListEntry::StartEnd { begin, end } => {
+                let range = if begin == end {
+                    gimli::Range { begin, end }
+                } else {
+                    ranges.next()?.unwrap()
+                };
+                writeln!(
+                    w,
+                    "<start-end \
+                     low-off: 0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin, range.begin, end, range.end
+                )?;
+            }
+            gimli::RawRngListEntry::StartLength { begin, length } => {
+                let range = ranges.next()?.unwrap();
+                writeln!(
+                    w,
+                    "<start-length \
+                     low-off: 0x{:08x} addr 0x{:08x} \
+                     high-off: 0x{:08x} addr 0x{:08x}>",
+                    begin, range.begin, length, range.end
+                )?;
+            }
+        };
+    }
+    Ok(())
+}
+
+fn dump_line<R: Reader, W: Write>(w: &mut W, dwarf: &gimli::Dwarf<R>) -> Result<()> {
+    let mut iter = dwarf.units();
+    while let Some(header) = iter.next()? {
+        writeln!(
+            w,
+            "\n.debug_line: line number info for unit at .debug_info offset 0x{:08x}",
+            header.offset().as_debug_info_offset().unwrap().0
+        )?;
+        let unit = match dwarf.unit(header) {
+            Ok(unit) => unit,
+            Err(err) => {
+                writeln_error(
+                    w,
+                    dwarf,
+                    err.into(),
+                    "Failed to parse unit root entry for dump_line",
+                )?;
+                continue;
+            }
+        };
+        match dump_line_program(w, &unit, dwarf) {
+            Ok(_) => (),
+            Err(Error::IoError) => return Err(Error::IoError),
+            Err(err) => writeln_error(w, dwarf, err, "Failed to dump line program")?,
+        }
+    }
+    Ok(())
+}
+
+fn dump_line_program<R: Reader, W: Write>(
+    w: &mut W,
+    unit: &gimli::Unit<R>,
+    dwarf: &gimli::Dwarf<R>,
+) -> Result<()> {
+    if let Some(program) = unit.line_program.clone() {
+        {
+            let header = program.header();
+            writeln!(w)?;
+            writeln!(
+                w,
+                "Offset:                             0x{:x}",
+                header.offset().0
+            )?;
+            writeln!(
+                w,
+                "Length:                             {}",
+                header.unit_length()
+            )?;
+            writeln!(
+                w,
+                "DWARF version:                      {}",
+                header.version()
+            )?;
+            writeln!(
+                w,
+                "Address size:                       {}",
+                header.address_size()
+            )?;
+            writeln!(
+                w,
+                "Prologue length:                    {}",
+                header.header_length()
+            )?;
+            writeln!(
+                w,
+                "Minimum instruction length:         {}",
+                header.minimum_instruction_length()
+            )?;
+            writeln!(
+                w,
+                "Maximum operations per instruction: {}",
+                header.maximum_operations_per_instruction()
+            )?;
+            writeln!(
+                w,
+                "Default is_stmt:                    {}",
+                header.default_is_stmt()
+            )?;
+            writeln!(
+                w,
+                "Line base:                          {}",
+                header.line_base()
+            )?;
+            writeln!(
+                w,
+                "Line range:                         {}",
+                header.line_range()
+            )?;
+            writeln!(
+                w,
+                "Opcode base:                        {}",
+                header.opcode_base()
+            )?;
+
+            writeln!(w)?;
+            writeln!(w, "Opcodes:")?;
+            for (i, length) in header
+                .standard_opcode_lengths()
+                .to_slice()?
+                .iter()
+                .enumerate()
+            {
+                writeln!(w, "  Opcode {} has {} args", i + 1, length)?;
+            }
+
+            let base = if header.version() >= 5 { 0 } else { 1 };
+            writeln!(w)?;
+            writeln!(w, "The Directory Table:")?;
+            for (i, dir) in header.include_directories().iter().enumerate() {
+                writeln!(
+                    w,
+                    "  {} {}",
+                    base + i,
+                    dwarf.attr_string(unit, dir.clone())?.to_string_lossy()?
+                )?;
+            }
+
+            writeln!(w)?;
+            writeln!(w, "The File Name Table")?;
+            write!(w, "  Entry\tDir\tTime\tSize")?;
+            if header.file_has_md5() {
+                write!(w, "\tMD5\t\t\t\t")?;
+            }
+            writeln!(w, "\tName")?;
+            for (i, file) in header.file_names().iter().enumerate() {
+                write!(
+                    w,
+                    "  {}\t{}\t{}\t{}",
+                    base + i,
+                    file.directory_index(),
+                    file.timestamp(),
+                    file.size(),
+                )?;
+                if header.file_has_md5() {
+                    let md5 = file.md5();
+                    write!(w, "\t")?;
+                    for i in 0..16 {
+                        write!(w, "{:02X}", md5[i])?;
+                    }
+                }
+                writeln!(
+                    w,
+                    "\t{}",
+                    dwarf
+                        .attr_string(unit, file.path_name())?
+                        .to_string_lossy()?
+                )?;
+            }
+
+            writeln!(w)?;
+            writeln!(w, "Line Number Instructions:")?;
+            let mut instructions = header.instructions();
+            while let Some(instruction) = instructions.next_instruction(header)? {
+                writeln!(w, "  {}", instruction)?;
+            }
+
+            writeln!(w)?;
+            writeln!(w, "Line Number Rows:")?;
+            writeln!(w, "<pc>        [lno,col]")?;
+        }
+        let mut rows = program.rows();
+        let mut file_index = 0;
+        while let Some((header, row)) = rows.next_row()? {
+            let line = match row.line() {
+                Some(line) => line.get(),
+                None => 0,
+            };
+            let column = match row.column() {
+                gimli::ColumnType::Column(column) => column.get(),
+                gimli::ColumnType::LeftEdge => 0,
+            };
+            write!(w, "0x{:08x}  [{:4},{:2}]", row.address(), line, column)?;
+            if row.is_stmt() {
+                write!(w, " NS")?;
+            }
+            if row.basic_block() {
+                write!(w, " BB")?;
+            }
+            if row.end_sequence() {
+                write!(w, " ET")?;
+            }
+            if row.prologue_end() {
+                write!(w, " PE")?;
+            }
+            if row.epilogue_begin() {
+                write!(w, " EB")?;
+            }
+            if row.isa() != 0 {
+                write!(w, " IS={}", row.isa())?;
+            }
+            if row.discriminator() != 0 {
+                write!(w, " DI={}", row.discriminator())?;
+            }
+            if file_index != row.file_index() {
+                file_index = row.file_index();
+                if let Some(file) = row.file(header) {
+                    if let Some(directory) = file.directory(header) {
+                        write!(
+                            w,
+                            " uri: \"{}/{}\"",
+                            dwarf.attr_string(unit, directory)?.to_string_lossy()?,
+                            dwarf
+                                .attr_string(unit, file.path_name())?
+                                .to_string_lossy()?
+                        )?;
+                    } else {
+                        write!(
+                            w,
+                            " uri: \"{}\"",
+                            dwarf
+                                .attr_string(unit, file.path_name())?
+                                .to_string_lossy()?
+                        )?;
+                    }
+                }
+            }
+            writeln!(w)?;
+        }
+    }
+    Ok(())
+}
+
+fn dump_pubnames<R: Reader, W: Write>(
+    w: &mut W,
+    debug_pubnames: &gimli::DebugPubNames<R>,
+    debug_info: &gimli::DebugInfo<R>,
+) -> Result<()> {
+    writeln!(w, "\n.debug_pubnames")?;
+
+    let mut cu_offset;
+    let mut cu_die_offset = gimli::DebugInfoOffset(0);
+    let mut prev_cu_offset = None;
+    let mut pubnames = debug_pubnames.items();
+    while let Some(pubname) = pubnames.next()? {
+        cu_offset = pubname.unit_header_offset();
+        if Some(cu_offset) != prev_cu_offset {
+            let cu = debug_info.header_from_offset(cu_offset)?;
+            cu_die_offset = gimli::DebugInfoOffset(cu_offset.0 + cu.header_size());
+            prev_cu_offset = Some(cu_offset);
+        }
+        let die_in_cu = pubname.die_offset();
+        let die_in_sect = cu_offset.0 + die_in_cu.0;
+        writeln!(w,
+            "global die-in-sect 0x{:08x}, cu-in-sect 0x{:08x}, die-in-cu 0x{:08x}, cu-header-in-sect 0x{:08x} '{}'",
+            die_in_sect,
+            cu_die_offset.0,
+            die_in_cu.0,
+            cu_offset.0,
+            pubname.name().to_string_lossy()?
+        )?;
+    }
+    Ok(())
+}
+
+fn dump_pubtypes<R: Reader, W: Write>(
+    w: &mut W,
+    debug_pubtypes: &gimli::DebugPubTypes<R>,
+    debug_info: &gimli::DebugInfo<R>,
+) -> Result<()> {
+    writeln!(w, "\n.debug_pubtypes")?;
+
+    let mut cu_offset;
+    let mut cu_die_offset = gimli::DebugInfoOffset(0);
+    let mut prev_cu_offset = None;
+    let mut pubtypes = debug_pubtypes.items();
+    while let Some(pubtype) = pubtypes.next()? {
+        cu_offset = pubtype.unit_header_offset();
+        if Some(cu_offset) != prev_cu_offset {
+            let cu = debug_info.header_from_offset(cu_offset)?;
+            cu_die_offset = gimli::DebugInfoOffset(cu_offset.0 + cu.header_size());
+            prev_cu_offset = Some(cu_offset);
+        }
+        let die_in_cu = pubtype.die_offset();
+        let die_in_sect = cu_offset.0 + die_in_cu.0;
+        writeln!(w,
+            "pubtype die-in-sect 0x{:08x}, cu-in-sect 0x{:08x}, die-in-cu 0x{:08x}, cu-header-in-sect 0x{:08x} '{}'",
+            die_in_sect,
+            cu_die_offset.0,
+            die_in_cu.0,
+            cu_offset.0,
+            pubtype.name().to_string_lossy()?
+        )?;
+    }
+    Ok(())
+}
+
+fn dump_aranges<R: Reader, W: Write>(
+    w: &mut W,
+    debug_aranges: &gimli::DebugAranges<R>,
+) -> Result<()> {
+    writeln!(w, "\n.debug_aranges")?;
+
+    let mut headers = debug_aranges.headers();
+    while let Some(header) = headers.next()? {
+        writeln!(
+            w,
+            "Address Range Header: length = 0x{:08x}, version = 0x{:04x}, cu_offset = 0x{:08x}, addr_size = 0x{:02x}, seg_size = 0x{:02x}",
+            header.length(),
+            header.encoding().version,
+            header.debug_info_offset().0,
+            header.encoding().address_size,
+            header.segment_size(),
+        )?;
+        let mut aranges = header.entries();
+        while let Some(arange) = aranges.next()? {
+            let range = arange.range();
+            if let Some(segment) = arange.segment() {
+                writeln!(
+                    w,
+                    "[0x{:016x},  0x{:016x}) segment 0x{:x}",
+                    range.begin, range.end, segment
+                )?;
+            } else {
+                writeln!(w, "[0x{:016x},  0x{:016x})", range.begin, range.end)?;
+            }
+        }
+    }
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/examples/dwarf-validate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/examples/dwarf-validate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/examples/dwarf-validate.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/examples/dwarf-validate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,267 @@
+// Allow clippy lints when building without clippy.
+#![allow(unknown_lints)]
+
+use gimli::{AttributeValue, UnitHeader};
+use object::{Object, ObjectSection};
+use rayon::prelude::*;
+use std::borrow::{Borrow, Cow};
+use std::env;
+use std::fs;
+use std::io::{self, BufWriter, Write};
+use std::iter::Iterator;
+use std::path::{Path, PathBuf};
+use std::process;
+use std::sync::Mutex;
+use typed_arena::Arena;
+
+trait Reader: gimli::Reader<Offset = usize> + Send + Sync {
+    type SyncSendEndian: gimli::Endianity + Send + Sync;
+}
+
+impl<'input, Endian> Reader for gimli::EndianSlice<'input, Endian>
+where
+    Endian: gimli::Endianity + Send + Sync,
+{
+    type SyncSendEndian = Endian;
+}
+
+struct ErrorWriter<W: Write + Send> {
+    inner: Mutex<(W, usize)>,
+    path: PathBuf,
+}
+
+impl<W: Write + Send> ErrorWriter<W> {
+    #[allow(clippy::needless_pass_by_value)]
+    fn error(&self, s: String) {
+        let mut lock = self.inner.lock().unwrap();
+        writeln!(&mut lock.0, "DWARF error in {}: {}", self.path.display(), s).unwrap();
+        lock.1 += 1;
+    }
+}
+
+fn main() {
+    let mut w = BufWriter::new(io::stdout());
+    let mut errors = 0;
+    for arg in env::args_os().skip(1) {
+        let path = Path::new(&arg);
+        let file = match fs::File::open(&path) {
+            Ok(file) => file,
+            Err(err) => {
+                eprintln!("Failed to open file '{}': {}", path.display(), err);
+                errors += 1;
+                continue;
+            }
+        };
+        let file = match unsafe { memmap::Mmap::map(&file) } {
+            Ok(mmap) => mmap,
+            Err(err) => {
+                eprintln!("Failed to map file '{}': {}", path.display(), &err);
+                errors += 1;
+                continue;
+            }
+        };
+        let file = match object::File::parse(&*file) {
+            Ok(file) => file,
+            Err(err) => {
+                eprintln!("Failed to parse file '{}': {}", path.display(), err);
+                errors += 1;
+                continue;
+            }
+        };
+
+        let endian = if file.is_little_endian() {
+            gimli::RunTimeEndian::Little
+        } else {
+            gimli::RunTimeEndian::Big
+        };
+        let mut error_writer = ErrorWriter {
+            inner: Mutex::new((&mut w, 0)),
+            path: path.to_owned(),
+        };
+        validate_file(&mut error_writer, &file, endian);
+        errors += error_writer.inner.into_inner().unwrap().1;
+    }
+    // Flush any errors.
+    drop(w);
+    if errors > 0 {
+        process::exit(1);
+    }
+}
+
+fn validate_file<W, Endian>(w: &mut ErrorWriter<W>, file: &object::File, endian: Endian)
+where
+    W: Write + Send,
+    Endian: gimli::Endianity + Send + Sync,
+{
+    let arena = Arena::new();
+
+    fn load_section<'a, 'file, 'input, S, Endian>(
+        arena: &'a Arena<Cow<'file, [u8]>>,
+        file: &'file object::File<'input>,
+        endian: Endian,
+    ) -> S
+    where
+        S: gimli::Section<gimli::EndianSlice<'a, Endian>>,
+        Endian: gimli::Endianity + Send + Sync,
+        'file: 'input,
+        'a: 'file,
+    {
+        let data = match file.section_by_name(S::section_name()) {
+            Some(ref section) => section
+                .uncompressed_data()
+                .unwrap_or(Cow::Borrowed(&[][..])),
+            None => Cow::Borrowed(&[][..]),
+        };
+        let data_ref = (*arena.alloc(data)).borrow();
+        S::from(gimli::EndianSlice::new(data_ref, endian))
+    }
+
+    // Variables representing sections of the file. The type of each is inferred from its use in the
+    // validate_info function below.
+    let debug_abbrev = &load_section(&arena, file, endian);
+    let debug_info = &load_section(&arena, file, endian);
+
+    validate_info(w, debug_info, debug_abbrev);
+}
+
+struct UnitSummary {
+    // True if we successfully parsed all the DIEs and attributes in the compilation unit
+    internally_valid: bool,
+    offset: gimli::DebugInfoOffset,
+    die_offsets: Vec<gimli::UnitOffset>,
+    global_die_references: Vec<(gimli::UnitOffset, gimli::DebugInfoOffset)>,
+}
+
+fn validate_info<W, R>(
+    w: &mut ErrorWriter<W>,
+    debug_info: &gimli::DebugInfo<R>,
+    debug_abbrev: &gimli::DebugAbbrev<R>,
+) where
+    W: Write + Send,
+    R: Reader,
+{
+    let mut units = Vec::new();
+    let mut units_iter = debug_info.units();
+    let mut last_offset = 0;
+    loop {
+        let u = match units_iter.next() {
+            Err(err) => {
+                w.error(format!(
+                    "Can't read unit header at offset {:#x}, stopping reading units: {}",
+                    last_offset, err
+                ));
+                break;
+            }
+            Ok(None) => break,
+            Ok(Some(u)) => u,
+        };
+        last_offset = u.offset().as_debug_info_offset().unwrap().0 + u.length_including_self();
+        units.push(u);
+    }
+    let process_unit = |unit: UnitHeader<R>| -> UnitSummary {
+        let unit_offset = unit.offset().as_debug_info_offset().unwrap();
+        let mut ret = UnitSummary {
+            internally_valid: false,
+            offset: unit_offset,
+            die_offsets: Vec::new(),
+            global_die_references: Vec::new(),
+        };
+        let abbrevs = match unit.abbreviations(debug_abbrev) {
+            Ok(abbrevs) => abbrevs,
+            Err(err) => {
+                w.error(format!(
+                    "Invalid abbrevs for unit {:#x}: {}",
+                    unit_offset.0, &err
+                ));
+                return ret;
+            }
+        };
+        let mut entries = unit.entries(&abbrevs);
+        let mut unit_refs = Vec::new();
+        loop {
+            let (_, entry) = match entries.next_dfs() {
+                Err(err) => {
+                    w.error(format!(
+                        "Invalid DIE for unit {:#x}: {}",
+                        unit_offset.0, &err
+                    ));
+                    return ret;
+                }
+                Ok(None) => break,
+                Ok(Some(entry)) => entry,
+            };
+            ret.die_offsets.push(entry.offset());
+
+            let mut attrs = entry.attrs();
+            loop {
+                let attr = match attrs.next() {
+                    Err(err) => {
+                        w.error(format!(
+                            "Invalid attribute for unit {:#x} at DIE {:#x}: {}",
+                            unit_offset.0,
+                            entry.offset().0,
+                            &err
+                        ));
+                        return ret;
+                    }
+                    Ok(None) => break,
+                    Ok(Some(attr)) => attr,
+                };
+                match attr.value() {
+                    AttributeValue::UnitRef(offset) => {
+                        unit_refs.push((entry.offset(), offset));
+                    }
+                    AttributeValue::DebugInfoRef(offset) => {
+                        ret.global_die_references.push((entry.offset(), offset));
+                    }
+                    _ => (),
+                }
+            }
+        }
+        ret.internally_valid = true;
+        ret.die_offsets.shrink_to_fit();
+        ret.global_die_references.shrink_to_fit();
+
+        // Check intra-unit references
+        for (from, to) in unit_refs {
+            if ret.die_offsets.binary_search(&to).is_err() {
+                w.error(format!(
+                    "Invalid intra-unit reference in unit {:#x} from DIE {:#x} to {:#x}",
+                    unit_offset.0, from.0, to.0
+                ));
+            }
+        }
+
+        ret
+    };
+    let processed_units = units.into_par_iter().map(process_unit).collect::<Vec<_>>();
+
+    let check_unit = |summary: &UnitSummary| {
+        if !summary.internally_valid {
+            return;
+        }
+        for &(from, to) in summary.global_die_references.iter() {
+            let u = match processed_units.binary_search_by_key(&to, |v| v.offset) {
+                Ok(i) => &processed_units[i],
+                Err(i) => {
+                    if i > 0 {
+                        &processed_units[i - 1]
+                    } else {
+                        w.error(format!("Invalid cross-unit reference in unit {:#x} from DIE {:#x} to global DIE {:#x}: no unit found",
+                                        summary.offset.0, from.0, to.0));
+                        continue;
+                    }
+                }
+            };
+            if !u.internally_valid {
+                continue;
+            }
+            let to_offset = gimli::UnitOffset(to.0 - u.offset.0);
+            if u.die_offsets.binary_search(&to_offset).is_err() {
+                w.error(format!("Invalid cross-unit reference in unit {:#x} from DIE {:#x} to global DIE {:#x}: unit at {:#x} contains no DIE {:#x}",
+                                summary.offset.0, from.0, to.0, u.offset.0, to_offset.0));
+            }
+        }
+    };
+    processed_units.par_iter().for_each(check_unit);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/examples/simple_line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/examples/simple_line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/examples/simple_line.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/examples/simple_line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,99 @@
+//! A simple example of parsing `.debug_line`.
+
+use object::{Object, ObjectSection};
+use std::{borrow, env, fs, path};
+
+fn main() {
+    for path in env::args().skip(1) {
+        let file = fs::File::open(&path).unwrap();
+        let mmap = unsafe { memmap::Mmap::map(&file).unwrap() };
+        let object = object::File::parse(&*mmap).unwrap();
+        let endian = if object.is_little_endian() {
+            gimli::RunTimeEndian::Little
+        } else {
+            gimli::RunTimeEndian::Big
+        };
+        dump_file(&object, endian).unwrap();
+    }
+}
+
+fn dump_file(object: &object::File, endian: gimli::RunTimeEndian) -> Result<(), gimli::Error> {
+    // Load a section and return as `Cow<[u8]>`.
+    let load_section = |id: gimli::SectionId| -> Result<borrow::Cow<[u8]>, gimli::Error> {
+        match object.section_by_name(id.name()) {
+            Some(ref section) => Ok(section
+                .uncompressed_data()
+                .unwrap_or(borrow::Cow::Borrowed(&[][..]))),
+            None => Ok(borrow::Cow::Borrowed(&[][..])),
+        }
+    };
+
+    // Load all of the sections.
+    let dwarf_cow = gimli::Dwarf::load(&load_section)?;
+
+    // Borrow a `Cow<[u8]>` to create an `EndianSlice`.
+    let borrow_section: &dyn for<'a> Fn(
+        &'a borrow::Cow<[u8]>,
+    ) -> gimli::EndianSlice<'a, gimli::RunTimeEndian> =
+        &|section| gimli::EndianSlice::new(&*section, endian);
+
+    // Create `EndianSlice`s for all of the sections.
+    let dwarf = dwarf_cow.borrow(&borrow_section);
+
+    // Iterate over the compilation units.
+    let mut iter = dwarf.units();
+    while let Some(header) = iter.next()? {
+        println!(
+            "Line number info for unit at <.debug_info+0x{:x}>",
+            header.offset().as_debug_info_offset().unwrap().0
+        );
+        let unit = dwarf.unit(header)?;
+
+        // Get the line program for the compilation unit.
+        if let Some(program) = unit.line_program.clone() {
+            let comp_dir = if let Some(ref dir) = unit.comp_dir {
+                path::PathBuf::from(dir.to_string_lossy().into_owned())
+            } else {
+                path::PathBuf::new()
+            };
+
+            // Iterate over the line program rows.
+            let mut rows = program.rows();
+            while let Some((header, row)) = rows.next_row()? {
+                if row.end_sequence() {
+                    // End of sequence indicates a possible gap in addresses.
+                    println!("{:x} end-sequence", row.address());
+                } else {
+                    // Determine the path. Real applications should cache this for performance.
+                    let mut path = path::PathBuf::new();
+                    if let Some(file) = row.file(header) {
+                        path = comp_dir.clone();
+                        if let Some(dir) = file.directory(header) {
+                            path.push(dwarf.attr_string(&unit, dir)?.to_string_lossy().as_ref());
+                        }
+                        path.push(
+                            dwarf
+                                .attr_string(&unit, file.path_name())?
+                                .to_string_lossy()
+                                .as_ref(),
+                        );
+                    }
+
+                    // Determine line/column. DWARF line/column is never 0, so we use that
+                    // but other applications may want to display this differently.
+                    let line = match row.line() {
+                        Some(line) => line.get(),
+                        None => 0,
+                    };
+                    let column = match row.column() {
+                        gimli::ColumnType::LeftEdge => 0,
+                        gimli::ColumnType::Column(column) => column.get(),
+                    };
+
+                    println!("{:x} {}:{}:{}", row.address(), path.display(), line, column);
+                }
+            }
+        }
+    }
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/examples/simple.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/examples/simple.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/examples/simple.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/examples/simple.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,67 @@
+//! A simple example of parsing `.debug_info`.
+
+use object::{Object, ObjectSection};
+use std::{borrow, env, fs};
+
+fn main() {
+    for path in env::args().skip(1) {
+        let file = fs::File::open(&path).unwrap();
+        let mmap = unsafe { memmap::Mmap::map(&file).unwrap() };
+        let object = object::File::parse(&*mmap).unwrap();
+        let endian = if object.is_little_endian() {
+            gimli::RunTimeEndian::Little
+        } else {
+            gimli::RunTimeEndian::Big
+        };
+        dump_file(&object, endian).unwrap();
+    }
+}
+
+fn dump_file(object: &object::File, endian: gimli::RunTimeEndian) -> Result<(), gimli::Error> {
+    // Load a section and return as `Cow<[u8]>`.
+    let load_section = |id: gimli::SectionId| -> Result<borrow::Cow<[u8]>, gimli::Error> {
+        match object.section_by_name(id.name()) {
+            Some(ref section) => Ok(section
+                .uncompressed_data()
+                .unwrap_or(borrow::Cow::Borrowed(&[][..]))),
+            None => Ok(borrow::Cow::Borrowed(&[][..])),
+        }
+    };
+
+    // Load all of the sections.
+    let dwarf_cow = gimli::Dwarf::load(&load_section)?;
+
+    // Borrow a `Cow<[u8]>` to create an `EndianSlice`.
+    let borrow_section: &dyn for<'a> Fn(
+        &'a borrow::Cow<[u8]>,
+    ) -> gimli::EndianSlice<'a, gimli::RunTimeEndian> =
+        &|section| gimli::EndianSlice::new(&*section, endian);
+
+    // Create `EndianSlice`s for all of the sections.
+    let dwarf = dwarf_cow.borrow(&borrow_section);
+
+    // Iterate over the compilation units.
+    let mut iter = dwarf.units();
+    while let Some(header) = iter.next()? {
+        println!(
+            "Unit at <.debug_info+0x{:x}>",
+            header.offset().as_debug_info_offset().unwrap().0
+        );
+        let unit = dwarf.unit(header)?;
+
+        // Iterate over the Debugging Information Entries (DIEs) in the unit.
+        let mut depth = 0;
+        let mut entries = unit.entries();
+        while let Some((delta_depth, entry)) = entries.next_dfs()? {
+            depth += delta_depth;
+            println!("<{}><{:x}> {}", depth, entry.offset().0, entry.tag());
+
+            // Iterate over the attributes in the DIE.
+            let mut attrs = entry.attrs();
+            while let Some(attr) = attrs.next()? {
+                println!("   {}: {:?}", attr.name(), attr.value());
+            }
+        }
+    }
+    Ok(())
+}
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_abbrev and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_abbrev differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_aranges and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_aranges differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_info and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_info differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_inlined and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_inlined differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_line and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_line differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_loc and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_loc differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_pubnames and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_pubnames differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_pubtypes and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_pubtypes differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_ranges and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_ranges differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_str and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/debug_str differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/eh_frame and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/eh_frame differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/eh_frame_hdr and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/eh_frame_hdr differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/fixtures/self/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,147 @@
+# What are these files?
+
+These files are the DWARF data generated for (an early version of) this
+library. Each file corresponds is a section from the built library's object
+file. By splitting the sections out to their own files, we don't need to worry
+about cross platform and cross object file format issues when running examples.
+
+# Updating and adding new sections
+
+## OSX
+
+Use `otool` to list the sections of a binary:
+
+```
+$ otool -l path/to/binary
+```
+
+You should see output similar to this:
+
+```
+Load command 0
+      cmd LC_SEGMENT_64
+  cmdsize 72
+  segname __PAGEZERO
+   vmaddr 0x0000000000000000
+   vmsize 0x0000000100000000
+  fileoff 0
+ filesize 0
+  maxprot 0x00000000
+ initprot 0x00000000
+   nsects 0
+    flags 0x0
+Load command 1
+      cmd LC_SEGMENT_64
+  cmdsize 712
+  segname __TEXT
+   vmaddr 0x0000000100000000
+   vmsize 0x00000000001b7000
+  fileoff 0
+ filesize 1798144
+  maxprot 0x00000007
+ initprot 0x00000005
+   nsects 8
+    flags 0x0
+Section
+  sectname __text
+   segname __TEXT
+      addr 0x0000000100000a50
+      size 0x0000000000170716
+    offset 2640
+     align 2^4 (16)
+    reloff 0
+    nreloc 0
+     flags 0x80000400
+ reserved1 0
+ reserved2 0
+```
+
+Etc.
+
+Find the `Section` entry of the section you'd like to isolate. For example, if
+you're looking for `eh_frame`, find an entry like this:
+
+```
+Section
+  sectname __eh_frame
+   segname __TEXT
+      addr 0x0000000100192f38
+      size 0x00000000000240c8
+    offset 1650488
+     align 2^3 (8)
+    reloff 0
+    nreloc 0
+     flags 0x00000000
+ reserved1 0
+ reserved2 0
+```
+
+Then use `dd` to copy `size` bytes starting from `offset`:
+
+```
+$ dd bs=1 skip=1650488 count=$(printf "%d" 0x00000000000240c8) if=path/to/binary of=fixtures/self/eh_frame
+```
+
+Finally, use `otool` and `hexdump` to verify that the isolated section has the
+same data as the section within the binary:
+
+```
+$ otool -s __TEXT __eh_frame path/to/binary | head
+path/to/binary:
+Contents of (__TEXT,__eh_frame) section
+0000000100192f38	14 00 00 00 00 00 00 00 01 7a 52 00 01 78 10 01
+0000000100192f48	10 0c 07 08 90 01 00 00 24 00 00 00 1c 00 00 00
+0000000100192f58	f8 da e6 ff ff ff ff ff 66 00 00 00 00 00 00 00
+0000000100192f68	00 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
+0000000100192f78	1c 00 00 00 00 00 00 00 01 7a 50 4c 52 00 01 78
+0000000100192f88	10 07 9b 9d 40 02 00 10 10 0c 07 08 90 01 00 00
+0000000100192f98	2c 00 00 00 24 00 00 00 20 db e6 ff ff ff ff ff
+0000000100192fa8	8d 00 00 00 00 00 00 00 08 37 e7 fd ff ff ff ff
+
+$ otool -s __TEXT __eh_frame path/to/binary | tail
+00000001001b6f68	9a 0a 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
+00000001001b6f78	06 50 83 07 8c 06 8d 05 8e 04 8f 03 00 00 00 00
+00000001001b6f88	24 00 00 00 7c 0e 00 00 30 a0 fb ff ff ff ff ff
+00000001001b6f98	15 00 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
+00000001001b6fa8	06 00 00 00 00 00 00 00 24 00 00 00 a4 0e 00 00
+00000001001b6fb8	28 a0 fb ff ff ff ff ff 1c 00 00 00 00 00 00 00
+00000001001b6fc8	00 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
+00000001001b6fd8	24 00 00 00 cc 0e 00 00 20 a0 fb ff ff ff ff ff
+00000001001b6fe8	66 01 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
+00000001001b6ff8	06 00 00 00 00 00 00 00
+```
+
+This should be the same, ignoring the leading offsets:
+
+```
+$ hexdump fixtures/self/eh_frame | head
+0000000 14 00 00 00 00 00 00 00 01 7a 52 00 01 78 10 01
+0000010 10 0c 07 08 90 01 00 00 24 00 00 00 1c 00 00 00
+0000020 f8 da e6 ff ff ff ff ff 66 00 00 00 00 00 00 00
+0000030 00 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
+0000040 1c 00 00 00 00 00 00 00 01 7a 50 4c 52 00 01 78
+0000050 10 07 9b 9d 40 02 00 10 10 0c 07 08 90 01 00 00
+0000060 2c 00 00 00 24 00 00 00 20 db e6 ff ff ff ff ff
+0000070 8d 00 00 00 00 00 00 00 08 37 e7 fd ff ff ff ff
+0000080 ff 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
+0000090 24 00 00 00 94 00 00 00 80 db e6 ff ff ff ff ff
+
+$ hexdump fixtures/self/eh_frame | tail
+0024040 06 50 83 07 8c 06 8d 05 8e 04 8f 03 00 00 00 00
+0024050 24 00 00 00 7c 0e 00 00 30 a0 fb ff ff ff ff ff
+0024060 15 00 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
+0024070 06 00 00 00 00 00 00 00 24 00 00 00 a4 0e 00 00
+0024080 28 a0 fb ff ff ff ff ff 1c 00 00 00 00 00 00 00
+0024090 00 41 0e 10 86 02 43 0d 06 00 00 00 00 00 00 00
+00240a0 24 00 00 00 cc 0e 00 00 20 a0 fb ff ff ff ff ff
+00240b0 66 01 00 00 00 00 00 00 00 41 0e 10 86 02 43 0d
+00240c0 06 00 00 00 00 00 00 00
+```
+
+## Linux
+
+Something like this:
+
+```
+objcopy --dump-section .eh_frame=fixtures/self/eh_frame path/to/binary
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2015 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,78 @@
+# `gimli`
+
+[![](http://meritbadge.herokuapp.com/gimli) ![](https://img.shields.io/crates/d/gimli.svg)](https://crates.io/crates/gimli)
+[![](https://docs.rs/gimli/badge.svg)](https://docs.rs/gimli/)
+[![Build Status](https://github.com/gimli-rs/gimli/workflows/Rust/badge.svg)](https://github.com/gimli-rs/gimli/actions)
+[![Coverage Status](https://coveralls.io/repos/github/gimli-rs/gimli/badge.svg?branch=master)](https://coveralls.io/github/gimli-rs/gimli?branch=master)
+
+`gimli` is a blazing fast library for consuming the
+[DWARF debugging format](http://dwarfstd.org/).
+
+* **Zero copy:** everything is just a reference to the original input buffer. No
+  copies of the input data get made.
+
+* **Lazy:** you can iterate compilation units without parsing their
+  contents. Parse only as many debugging information entry (DIE) trees as you
+  iterate over. `gimli` also uses `DW_AT_sibling` references to avoid parsing a
+  DIE's children to find its next sibling, when possible.
+
+* **Cross-platform:** `gimli` makes no assumptions about what kind of object
+  file you're working with. The flipside to that is that it's up to you to
+  provide an ELF loader on Linux or Mach-O loader on macOS.
+
+  * Unsure which object file parser to use? Try the cross-platform
+  [`object`](https://github.com/gimli-rs/object) crate. See the
+  [`examples/`](./examples) directory for usage with `gimli`.
+
+## Install
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+gimli = "0.24.0"
+```
+
+The minimum supported Rust version is 1.42.0.
+
+## Documentation
+
+* [Documentation on docs.rs](https://docs.rs/gimli/)
+
+* Example programs:
+
+  * [A simple `.debug_info` parser](./examples/simple.rs)
+
+  * [A simple `.debug_line` parser](./examples/simple_line.rs)
+
+  * [A `dwarfdump` clone](./examples/dwarfdump.rs)
+
+  * [An `addr2line` clone](https://github.com/gimli-rs/addr2line)
+
+  * [`ddbug`](https://github.com/philipc/ddbug), a utility giving insight into
+    code generation by making debugging information readable.
+
+  * [`dwprod`](https://github.com/fitzgen/dwprod), a tiny utility to list the
+    compilers used to create each compilation unit within a shared library or
+    executable (via `DW_AT_producer`).
+
+  * [`dwarf-validate`](./examples/dwarf-validate.rs), a program to validate the
+    integrity of some DWARF and its references between sections and compilation
+    units.
+
+## License
+
+Licensed under either of
+
+  * Apache License, Version 2.0 ([`LICENSE-APACHE`](./LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+  * MIT license ([`LICENSE-MIT`](./LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+## Contribution
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for hacking.
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/arch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/arch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/arch.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/arch.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,230 @@
+use crate::common::Register;
+
+macro_rules! registers {
+    ($struct_name:ident, { $($name:ident = ($val:expr, $disp:expr)),+ $(,)? }) => {
+        #[allow(missing_docs)]
+        impl $struct_name {
+            $(
+                pub const $name: Register = Register($val);
+            )+
+        }
+
+        impl $struct_name {
+            /// The name of a register, or `None` if the register number is unknown.
+            pub fn register_name(register: Register) -> Option<&'static str> {
+                match register {
+                    $(
+                        Self::$name => Some($disp),
+                    )+
+                    _ => return None,
+                }
+            }
+
+	    /// Converts a register name into a register number.
+	    pub fn name_to_register(value: &str) -> Option<Register> {
+		match value {
+                    $(
+                        $disp => Some(Self::$name),
+                    )+
+                    _ => return None,
+		}
+	    }
+        }
+    };
+}
+
+/// ARM architecture specific definitions.
+///
+/// See [DWARF for the ARM Architecture](http://infocenter.arm.com/help/topic/com.arm.doc.ihi0040b/IHI0040B_aadwarf.pdf).
+#[derive(Debug, Clone, Copy)]
+pub struct Arm;
+
+// TODO: add more registers.
+registers!(Arm, {
+    R0 = (0, "R0"),
+    R1 = (1, "R1"),
+    R2 = (2, "R2"),
+    R3 = (3, "R3"),
+    R4 = (4, "R4"),
+    R5 = (5, "R5"),
+    R6 = (6, "R6"),
+    R7 = (7, "R7"),
+    R8 = (8, "R8"),
+    R9 = (9, "R9"),
+    R10 = (10, "R10"),
+    R11 = (11, "R11"),
+    R12 = (12, "R12"),
+    R13 = (13, "R13"),
+    R14 = (14, "R14"),
+    R15 = (15, "R15"),
+});
+
+/// Intel i386 architecture specific definitions.
+///
+/// See Intel386 psABi version 1.1 at the [X86 psABI wiki](https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI).
+#[derive(Debug, Clone, Copy)]
+pub struct X86;
+
+registers!(X86, {
+    EAX = (0, "eax"),
+    ECX = (1, "ecx"),
+    EDX = (2, "edx"),
+    EBX = (3, "ebx"),
+    ESP = (4, "esp"),
+    EBP = (5, "ebp"),
+    ESI = (6, "esi"),
+    EDI = (7, "edi"),
+
+    // Return Address register. This is stored in `0(%esp, "")` and is not a physical register.
+    RA = (8, "RA"),
+
+    ST0 = (11, "st0"),
+    ST1 = (12, "st1"),
+    ST2 = (13, "st2"),
+    ST3 = (14, "st3"),
+    ST4 = (15, "st4"),
+    ST5 = (16, "st5"),
+    ST6 = (17, "st6"),
+    ST7 = (18, "st7"),
+
+    XMM0 = (21, "xmm0"),
+    XMM1 = (22, "xmm1"),
+    XMM2 = (23, "xmm2"),
+    XMM3 = (24, "xmm3"),
+    XMM4 = (25, "xmm4"),
+    XMM5 = (26, "xmm5"),
+    XMM6 = (27, "xmm6"),
+    XMM7 = (28, "xmm7"),
+
+    MM0 = (29, "mm0"),
+    MM1 = (30, "mm1"),
+    MM2 = (31, "mm2"),
+    MM3 = (32, "mm3"),
+    MM4 = (33, "mm4"),
+    MM5 = (34, "mm5"),
+    MM6 = (35, "mm6"),
+    MM7 = (36, "mm7"),
+
+    MXCSR = (39, "mxcsr"),
+
+    ES = (40, "es"),
+    CS = (41, "cs"),
+    SS = (42, "ss"),
+    DS = (43, "ds"),
+    FS = (44, "fs"),
+    GS = (45, "gs"),
+
+    TR = (48, "tr"),
+    LDTR = (49, "ldtr"),
+
+    FS_BASE = (93, "fs.base"),
+    GS_BASE = (94, "gs.base"),
+});
+
+/// AMD64 architecture specific definitions.
+///
+/// See x86-64 psABI version 1.0 at the [X86 psABI wiki](https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI).
+#[derive(Debug, Clone, Copy)]
+pub struct X86_64;
+
+registers!(X86_64, {
+    RAX = (0, "rax"),
+    RDX = (1, "rdx"),
+    RCX = (2, "rcx"),
+    RBX = (3, "rbx"),
+    RSI = (4, "rsi"),
+    RDI = (5, "rdi"),
+    RBP = (6, "rbp"),
+    RSP = (7, "rsp"),
+
+    R8 = (8, "r8"),
+    R9 = (9, "r9"),
+    R10 = (10, "r10"),
+    R11 = (11, "r11"),
+    R12 = (12, "r12"),
+    R13 = (13, "r13"),
+    R14 = (14, "r14"),
+    R15 = (15, "r15"),
+
+    // Return Address register. This is stored in `0(%rsp, "")` and is not a physical register.
+    RA = (16, "RA"),
+
+    XMM0 = (17, "xmm0"),
+    XMM1 = (18, "xmm1"),
+    XMM2 = (19, "xmm2"),
+    XMM3 = (20, "xmm3"),
+    XMM4 = (21, "xmm4"),
+    XMM5 = (22, "xmm5"),
+    XMM6 = (23, "xmm6"),
+    XMM7 = (24, "xmm7"),
+
+    XMM8 = (25, "xmm8"),
+    XMM9 = (26, "xmm9"),
+    XMM10 = (27, "xmm10"),
+    XMM11 = (28, "xmm11"),
+    XMM12 = (29, "xmm12"),
+    XMM13 = (30, "xmm13"),
+    XMM14 = (31, "xmm14"),
+    XMM15 = (32, "xmm15"),
+
+    ST0 = (33, "st0"),
+    ST1 = (34, "st1"),
+    ST2 = (35, "st2"),
+    ST3 = (36, "st3"),
+    ST4 = (37, "st4"),
+    ST5 = (38, "st5"),
+    ST6 = (39, "st6"),
+    ST7 = (40, "st7"),
+
+    MM0 = (41, "mm0"),
+    MM1 = (42, "mm1"),
+    MM2 = (43, "mm2"),
+    MM3 = (44, "mm3"),
+    MM4 = (45, "mm4"),
+    MM5 = (46, "mm5"),
+    MM6 = (47, "mm6"),
+    MM7 = (48, "mm7"),
+
+    RFLAGS = (49, "rFLAGS"),
+    ES = (50, "es"),
+    CS = (51, "cs"),
+    SS = (52, "ss"),
+    DS = (53, "ds"),
+    FS = (54, "fs"),
+    GS = (55, "gs"),
+
+    FS_BASE = (58, "fs.base"),
+    GS_BASE = (59, "gs.base"),
+
+    TR = (62, "tr"),
+    LDTR = (63, "ldtr"),
+    MXCSR = (64, "mxcsr"),
+    FCW = (65, "fcw"),
+    FSW = (66, "fsw"),
+
+    XMM16 = (67, "xmm16"),
+    XMM17 = (68, "xmm17"),
+    XMM18 = (69, "xmm18"),
+    XMM19 = (70, "xmm19"),
+    XMM20 = (71, "xmm20"),
+    XMM21 = (72, "xmm21"),
+    XMM22 = (73, "xmm22"),
+    XMM23 = (74, "xmm23"),
+    XMM24 = (75, "xmm24"),
+    XMM25 = (76, "xmm25"),
+    XMM26 = (77, "xmm26"),
+    XMM27 = (78, "xmm27"),
+    XMM28 = (79, "xmm28"),
+    XMM29 = (80, "xmm29"),
+    XMM30 = (81, "xmm30"),
+    XMM31 = (82, "xmm31"),
+
+    K0 = (118, "k0"),
+    K1 = (119, "k1"),
+    K2 = (120, "k2"),
+    K3 = (121, "k3"),
+    K4 = (122, "k4"),
+    K5 = (123, "k5"),
+    K6 = (124, "k6"),
+    K7 = (125, "k7"),
+});
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/common.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/common.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,346 @@
+/// Whether the format of a compilation unit is 32- or 64-bit.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Format {
+    /// 64-bit DWARF
+    Dwarf64 = 8,
+    /// 32-bit DWARF
+    Dwarf32 = 4,
+}
+
+impl Format {
+    /// Return the serialized size of an initial length field for the format.
+    #[inline]
+    pub fn initial_length_size(self) -> u8 {
+        match self {
+            Format::Dwarf32 => 4,
+            Format::Dwarf64 => 12,
+        }
+    }
+
+    /// Return the natural word size for the format
+    #[inline]
+    pub fn word_size(self) -> u8 {
+        match self {
+            Format::Dwarf32 => 4,
+            Format::Dwarf64 => 8,
+        }
+    }
+}
+
+/// Encoding parameters that are commonly used for multiple DWARF sections.
+///
+/// This is intended to be small enough to pass by value.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+// `address_size` and `format` are used more often than `version`, so keep
+// them first.
+#[repr(C)]
+pub struct Encoding {
+    /// The size of an address.
+    pub address_size: u8,
+
+    // The size of a segment selector.
+    // TODO: pub segment_size: u8,
+    /// Whether the DWARF format is 32- or 64-bit.
+    pub format: Format,
+
+    /// The DWARF version of the header.
+    pub version: u16,
+}
+
+/// Encoding parameters for a line number program.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct LineEncoding {
+    /// The size in bytes of the smallest target machine instruction.
+    pub minimum_instruction_length: u8,
+
+    /// The maximum number of individual operations that may be encoded in an
+    /// instruction.
+    pub maximum_operations_per_instruction: u8,
+
+    /// The initial value of the `is_stmt` register.
+    pub default_is_stmt: bool,
+
+    /// The minimum value which a special opcode can add to the line register.
+    pub line_base: i8,
+
+    /// The range of values which a special opcode can add to the line register.
+    pub line_range: u8,
+}
+
+impl Default for LineEncoding {
+    fn default() -> Self {
+        // Values from LLVM.
+        LineEncoding {
+            minimum_instruction_length: 1,
+            maximum_operations_per_instruction: 1,
+            default_is_stmt: true,
+            line_base: -5,
+            line_range: 14,
+        }
+    }
+}
+
+/// A DWARF register number.
+///
+/// The meaning of this value is ABI dependent. This is generally encoded as
+/// a ULEB128, but supported architectures need 16 bits at most.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct Register(pub u16);
+
+/// An offset into the `.debug_abbrev` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct DebugAbbrevOffset<T = usize>(pub T);
+
+/// An offset to a set of entries in the `.debug_addr` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugAddrBase<T = usize>(pub T);
+
+/// An index into a set of addresses in the `.debug_addr` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugAddrIndex<T = usize>(pub T);
+
+/// An offset into the `.debug_aranges` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugArangesOffset<T = usize>(pub T);
+
+/// An offset into the `.debug_info` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
+pub struct DebugInfoOffset<T = usize>(pub T);
+
+/// An offset into the `.debug_line` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugLineOffset<T = usize>(pub T);
+
+/// An offset into the `.debug_line_str` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugLineStrOffset<T = usize>(pub T);
+
+/// An offset into either the `.debug_loc` section or the `.debug_loclists` section,
+/// depending on the version of the unit the offset was contained in.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct LocationListsOffset<T = usize>(pub T);
+
+/// An offset to a set of location list offsets in the `.debug_loclists` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugLocListsBase<T = usize>(pub T);
+
+/// An index into a set of location list offsets in the `.debug_loclists` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugLocListsIndex<T = usize>(pub T);
+
+/// An offset into the `.debug_macinfo` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct DebugMacinfoOffset<T = usize>(pub T);
+
+/// An offset into the `.debug_macro` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct DebugMacroOffset<T = usize>(pub T);
+
+/// An offset into either the `.debug_ranges` section or the `.debug_rnglists` section,
+/// depending on the version of the unit the offset was contained in.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct RangeListsOffset<T = usize>(pub T);
+
+/// An offset to a set of range list offsets in the `.debug_rnglists` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugRngListsBase<T = usize>(pub T);
+
+/// An index into a set of range list offsets in the `.debug_rnglists` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugRngListsIndex<T = usize>(pub T);
+
+/// An offset into the `.debug_str` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugStrOffset<T = usize>(pub T);
+
+/// An offset to a set of entries in the `.debug_str_offsets` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugStrOffsetsBase<T = usize>(pub T);
+
+/// An index into a set of entries in the `.debug_str_offsets` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct DebugStrOffsetsIndex<T = usize>(pub T);
+
+/// An offset into the `.debug_types` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
+pub struct DebugTypesOffset<T = usize>(pub T);
+
+/// A type signature as used in the `.debug_types` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct DebugTypeSignature(pub u64);
+
+/// An offset into the `.debug_frame` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct DebugFrameOffset<T = usize>(pub T);
+
+impl<T> From<T> for DebugFrameOffset<T> {
+    #[inline]
+    fn from(o: T) -> Self {
+        DebugFrameOffset(o)
+    }
+}
+
+/// An offset into the `.eh_frame` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct EhFrameOffset<T = usize>(pub T);
+
+impl<T> From<T> for EhFrameOffset<T> {
+    #[inline]
+    fn from(o: T) -> Self {
+        EhFrameOffset(o)
+    }
+}
+
+/// An offset into the `.debug_info` or `.debug_types` sections.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
+pub enum UnitSectionOffset<T = usize> {
+    /// An offset into the `.debug_info` section.
+    DebugInfoOffset(DebugInfoOffset<T>),
+    /// An offset into the `.debug_types` section.
+    DebugTypesOffset(DebugTypesOffset<T>),
+}
+
+impl<T> From<DebugInfoOffset<T>> for UnitSectionOffset<T> {
+    fn from(offset: DebugInfoOffset<T>) -> Self {
+        UnitSectionOffset::DebugInfoOffset(offset)
+    }
+}
+
+impl<T> From<DebugTypesOffset<T>> for UnitSectionOffset<T> {
+    fn from(offset: DebugTypesOffset<T>) -> Self {
+        UnitSectionOffset::DebugTypesOffset(offset)
+    }
+}
+
+impl<T> UnitSectionOffset<T>
+where
+    T: Clone,
+{
+    /// Returns the `DebugInfoOffset` inside, or `None` otherwise.
+    pub fn as_debug_info_offset(&self) -> Option<DebugInfoOffset<T>> {
+        match self {
+            UnitSectionOffset::DebugInfoOffset(offset) => Some(offset.clone()),
+            UnitSectionOffset::DebugTypesOffset(_) => None,
+        }
+    }
+    /// Returns the `DebugTypesOffset` inside, or `None` otherwise.
+    pub fn as_debug_types_offset(&self) -> Option<DebugTypesOffset<T>> {
+        match self {
+            UnitSectionOffset::DebugInfoOffset(_) => None,
+            UnitSectionOffset::DebugTypesOffset(offset) => Some(offset.clone()),
+        }
+    }
+}
+
+/// An identifier for a DWARF section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
+pub enum SectionId {
+    /// The `.debug_abbrev` section.
+    DebugAbbrev,
+    /// The `.debug_addr` section.
+    DebugAddr,
+    /// The `.debug_aranges` section.
+    DebugAranges,
+    /// The `.debug_frame` section.
+    DebugFrame,
+    /// The `.eh_frame` section.
+    EhFrame,
+    /// The `.eh_frame_hdr` section.
+    EhFrameHdr,
+    /// The `.debug_info` section.
+    DebugInfo,
+    /// The `.debug_line` section.
+    DebugLine,
+    /// The `.debug_line_str` section.
+    DebugLineStr,
+    /// The `.debug_loc` section.
+    DebugLoc,
+    /// The `.debug_loclists` section.
+    DebugLocLists,
+    /// The `.debug_macinfo` section.
+    DebugMacinfo,
+    /// The `.debug_macro` section.
+    DebugMacro,
+    /// The `.debug_pubnames` section.
+    DebugPubNames,
+    /// The `.debug_pubtypes` section.
+    DebugPubTypes,
+    /// The `.debug_ranges` section.
+    DebugRanges,
+    /// The `.debug_rnglists` section.
+    DebugRngLists,
+    /// The `.debug_str` section.
+    DebugStr,
+    /// The `.debug_str_offsets` section.
+    DebugStrOffsets,
+    /// The `.debug_types` section.
+    DebugTypes,
+}
+
+impl SectionId {
+    /// Returns the ELF section name for this kind.
+    pub fn name(self) -> &'static str {
+        match self {
+            SectionId::DebugAbbrev => ".debug_abbrev",
+            SectionId::DebugAddr => ".debug_addr",
+            SectionId::DebugAranges => ".debug_aranges",
+            SectionId::DebugFrame => ".debug_frame",
+            SectionId::EhFrame => ".eh_frame",
+            SectionId::EhFrameHdr => ".eh_frame_hdr",
+            SectionId::DebugInfo => ".debug_info",
+            SectionId::DebugLine => ".debug_line",
+            SectionId::DebugLineStr => ".debug_line_str",
+            SectionId::DebugLoc => ".debug_loc",
+            SectionId::DebugLocLists => ".debug_loclists",
+            SectionId::DebugMacinfo => ".debug_macinfo",
+            SectionId::DebugMacro => ".debug_macro",
+            SectionId::DebugPubNames => ".debug_pubnames",
+            SectionId::DebugPubTypes => ".debug_pubtypes",
+            SectionId::DebugRanges => ".debug_ranges",
+            SectionId::DebugRngLists => ".debug_rnglists",
+            SectionId::DebugStr => ".debug_str",
+            SectionId::DebugStrOffsets => ".debug_str_offsets",
+            SectionId::DebugTypes => ".debug_types",
+        }
+    }
+
+    /// Returns the ELF section name for this kind, when found in a .dwo file.
+    pub fn dwo_name(self) -> Option<&'static str> {
+        Some(match self {
+            SectionId::DebugAbbrev => ".debug_abbrev.dwo",
+            SectionId::DebugInfo => ".debug_info.dwo",
+            SectionId::DebugLine => ".debug_line.dwo",
+            // The debug_loc section can be present in the dwo when using the
+            // GNU split-dwarf extension to DWARF4.
+            SectionId::DebugLoc => ".debug_loc.dwo",
+            SectionId::DebugLocLists => ".debug_loclists.dwo",
+            SectionId::DebugMacro => ".debug_macro.dwo",
+            SectionId::DebugRngLists => ".debug_rnglists.dwo",
+            SectionId::DebugStr => ".debug_str.dwo",
+            SectionId::DebugStrOffsets => ".debug_str_offsets.dwo",
+            _ => return None,
+        })
+    }
+}
+
+/// An optionally-provided implementation-defined compilation unit ID to enable
+/// split DWARF and linking a split compilation unit back together.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct DwoId(pub u64);
+
+/// The "type" of file with DWARF debugging information. This determines, among other things,
+/// which files DWARF sections should be loaded from.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum DwarfFileType {
+    /// A normal executable or object file.
+    Main,
+    /// A .dwo split DWARF file.
+    Dwo,
+    // TODO: Supplementary files, .dwps?
+}
+
+impl Default for DwarfFileType {
+    fn default() -> Self {
+        DwarfFileType::Main
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/constants.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/constants.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/constants.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/constants.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1382 @@
+// This file originally from https://github.com/philipc/rust-dwarf/ and
+// distributed under either MIT or Apache 2.0 licenses.
+//
+// Copyright 2016 The rust-dwarf Developers
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Constant definitions.
+//!
+//! The DWARF spec's `DW_AT_*` type is represented as `struct DwAt(u16)`,
+//! `DW_FORM_*` as `DwForm(u16)`, etc.
+//!
+//! There are also exported const definitions for each constant.
+
+#![allow(non_upper_case_globals)]
+#![allow(missing_docs)]
+
+use core::fmt;
+
+// The `dw!` macro turns this:
+//
+//     dw!(DwFoo(u32) {
+//         DW_FOO_bar = 0,
+//         DW_FOO_baz = 1,
+//         DW_FOO_bang = 2,
+//     });
+//
+// into this:
+//
+//     #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+//     pub struct DwFoo(pub u32);
+//
+//     pub const DW_FOO_bar: DwFoo = DwFoo(0);
+//     pub const DW_FOO_baz: DwFoo = DwFoo(1);
+//     pub const DW_FOO_bang: DwFoo = DwFoo(2);
+//
+//     impl DwFoo {
+//         pub fn static_string(&self) -> Option<&'static str> {
+//             ...
+//         }
+//     }
+//
+//     impl fmt::Display for DwFoo {
+//         fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+//             ...
+//         }
+//     }
+macro_rules! dw {
+    ($(#[$meta:meta])* $struct_name:ident($struct_type:ty) { $($name:ident = $val:expr),+ $(,)? }) => {
+        $(#[$meta])*
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+        pub struct $struct_name(pub $struct_type);
+
+        $(
+            pub const $name: $struct_name = $struct_name($val);
+        )+
+
+        impl $struct_name {
+            pub fn static_string(&self) -> Option<&'static str> {
+                Some(match *self {
+                    $(
+                        $name => stringify!($name),
+                    )+
+                    _ => return None,
+                })
+            }
+        }
+
+        impl fmt::Display for $struct_name {
+            fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+                if let Some(s) = self.static_string() {
+                    f.pad(s)
+                } else {
+                    f.pad(&format!("Unknown {}: {}",
+                                   stringify!($struct_name),
+                                   self.0))
+                }
+            }
+        }
+    };
+}
+
+dw!(
+/// The unit type field in a unit header.
+///
+/// See Section 7.5.1, Table 7.2.
+DwUt(u8) {
+    DW_UT_compile = 0x01,
+    DW_UT_type = 0x02,
+    DW_UT_partial = 0x03,
+    DW_UT_skeleton = 0x04,
+    DW_UT_split_compile = 0x05,
+    DW_UT_split_type = 0x06,
+    DW_UT_lo_user = 0x80,
+    DW_UT_hi_user = 0xff,
+});
+
+dw!(
+/// The opcode for a call frame instruction.
+///
+/// Section 7.24:
+/// > Call frame instructions are encoded in one or more bytes. The primary
+/// > opcode is encoded in the high order two bits of the first byte (that is,
+/// > opcode = byte >> 6). An operand or extended opcode may be encoded in the
+/// > low order 6 bits. Additional operands are encoded in subsequent bytes.
+DwCfa(u8) {
+    DW_CFA_advance_loc = 0x01 << 6,
+    DW_CFA_offset = 0x02 << 6,
+    DW_CFA_restore = 0x03 << 6,
+    DW_CFA_nop = 0,
+    DW_CFA_set_loc = 0x01,
+    DW_CFA_advance_loc1 = 0x02,
+    DW_CFA_advance_loc2 = 0x03,
+    DW_CFA_advance_loc4 = 0x04,
+    DW_CFA_offset_extended = 0x05,
+    DW_CFA_restore_extended = 0x06,
+    DW_CFA_undefined = 0x07,
+    DW_CFA_same_value = 0x08,
+    DW_CFA_register = 0x09,
+    DW_CFA_remember_state = 0x0a,
+    DW_CFA_restore_state = 0x0b,
+    DW_CFA_def_cfa = 0x0c,
+    DW_CFA_def_cfa_register = 0x0d,
+    DW_CFA_def_cfa_offset = 0x0e,
+    DW_CFA_def_cfa_expression = 0x0f,
+    DW_CFA_expression = 0x10,
+    DW_CFA_offset_extended_sf = 0x11,
+    DW_CFA_def_cfa_sf = 0x12,
+    DW_CFA_def_cfa_offset_sf = 0x13,
+    DW_CFA_val_offset = 0x14,
+    DW_CFA_val_offset_sf = 0x15,
+    DW_CFA_val_expression = 0x16,
+
+    DW_CFA_lo_user = 0x1c,
+    DW_CFA_hi_user = 0x3f,
+
+    DW_CFA_MIPS_advance_loc8 = 0x1d,
+    DW_CFA_GNU_window_save = 0x2d,
+    DW_CFA_GNU_args_size = 0x2e,
+    DW_CFA_GNU_negative_offset_extended = 0x2f,
+});
+
+dw!(
+/// The child determination encodings for DIE attributes.
+///
+/// See Section 7.5.3, Table 7.4.
+DwChildren(u8) {
+    DW_CHILDREN_no = 0,
+    DW_CHILDREN_yes = 1,
+});
+
+dw!(
+/// The tag encodings for DIE attributes.
+///
+/// See Section 7.5.3, Table 7.3.
+DwTag(u16) {
+    DW_TAG_null = 0x00,
+
+    DW_TAG_array_type = 0x01,
+    DW_TAG_class_type = 0x02,
+    DW_TAG_entry_point = 0x03,
+    DW_TAG_enumeration_type = 0x04,
+    DW_TAG_formal_parameter = 0x05,
+    DW_TAG_imported_declaration = 0x08,
+    DW_TAG_label = 0x0a,
+    DW_TAG_lexical_block = 0x0b,
+    DW_TAG_member = 0x0d,
+    DW_TAG_pointer_type = 0x0f,
+    DW_TAG_reference_type = 0x10,
+    DW_TAG_compile_unit = 0x11,
+    DW_TAG_string_type = 0x12,
+    DW_TAG_structure_type = 0x13,
+    DW_TAG_subroutine_type = 0x15,
+    DW_TAG_typedef = 0x16,
+    DW_TAG_union_type = 0x17,
+    DW_TAG_unspecified_parameters = 0x18,
+    DW_TAG_variant = 0x19,
+    DW_TAG_common_block = 0x1a,
+    DW_TAG_common_inclusion = 0x1b,
+    DW_TAG_inheritance = 0x1c,
+    DW_TAG_inlined_subroutine = 0x1d,
+    DW_TAG_module = 0x1e,
+    DW_TAG_ptr_to_member_type = 0x1f,
+    DW_TAG_set_type = 0x20,
+    DW_TAG_subrange_type = 0x21,
+    DW_TAG_with_stmt = 0x22,
+    DW_TAG_access_declaration = 0x23,
+    DW_TAG_base_type = 0x24,
+    DW_TAG_catch_block = 0x25,
+    DW_TAG_const_type = 0x26,
+    DW_TAG_constant = 0x27,
+    DW_TAG_enumerator = 0x28,
+    DW_TAG_file_type = 0x29,
+    DW_TAG_friend = 0x2a,
+    DW_TAG_namelist = 0x2b,
+    DW_TAG_namelist_item = 0x2c,
+    DW_TAG_packed_type = 0x2d,
+    DW_TAG_subprogram = 0x2e,
+    DW_TAG_template_type_parameter = 0x2f,
+    DW_TAG_template_value_parameter = 0x30,
+    DW_TAG_thrown_type = 0x31,
+    DW_TAG_try_block = 0x32,
+    DW_TAG_variant_part = 0x33,
+    DW_TAG_variable = 0x34,
+    DW_TAG_volatile_type = 0x35,
+
+// DWARF 3.
+    DW_TAG_dwarf_procedure = 0x36,
+    DW_TAG_restrict_type = 0x37,
+    DW_TAG_interface_type = 0x38,
+    DW_TAG_namespace = 0x39,
+    DW_TAG_imported_module = 0x3a,
+    DW_TAG_unspecified_type = 0x3b,
+    DW_TAG_partial_unit = 0x3c,
+    DW_TAG_imported_unit = 0x3d,
+    DW_TAG_condition = 0x3f,
+    DW_TAG_shared_type = 0x40,
+
+// DWARF 4.
+    DW_TAG_type_unit = 0x41,
+    DW_TAG_rvalue_reference_type = 0x42,
+    DW_TAG_template_alias = 0x43,
+
+// DWARF 5.
+    DW_TAG_coarray_type = 0x44,
+    DW_TAG_generic_subrange = 0x45,
+    DW_TAG_dynamic_type = 0x46,
+    DW_TAG_atomic_type = 0x47,
+    DW_TAG_call_site = 0x48,
+    DW_TAG_call_site_parameter = 0x49,
+    DW_TAG_skeleton_unit = 0x4a,
+    DW_TAG_immutable_type = 0x4b,
+
+    DW_TAG_lo_user = 0x4080,
+    DW_TAG_hi_user = 0xffff,
+
+// SGI/MIPS extensions.
+    DW_TAG_MIPS_loop = 0x4081,
+
+// HP extensions.
+    DW_TAG_HP_array_descriptor = 0x4090,
+    DW_TAG_HP_Bliss_field = 0x4091,
+    DW_TAG_HP_Bliss_field_set = 0x4092,
+
+// GNU extensions.
+    DW_TAG_format_label = 0x4101,
+    DW_TAG_function_template = 0x4102,
+    DW_TAG_class_template = 0x4103,
+    DW_TAG_GNU_BINCL = 0x4104,
+    DW_TAG_GNU_EINCL = 0x4105,
+    DW_TAG_GNU_template_template_param = 0x4106,
+    DW_TAG_GNU_template_parameter_pack = 0x4107,
+    DW_TAG_GNU_formal_parameter_pack = 0x4108,
+    DW_TAG_GNU_call_site = 0x4109,
+    DW_TAG_GNU_call_site_parameter = 0x410a,
+
+    DW_TAG_APPLE_property = 0x4200,
+
+// SUN extensions.
+    DW_TAG_SUN_function_template = 0x4201,
+    DW_TAG_SUN_class_template = 0x4202,
+    DW_TAG_SUN_struct_template = 0x4203,
+    DW_TAG_SUN_union_template = 0x4204,
+    DW_TAG_SUN_indirect_inheritance = 0x4205,
+    DW_TAG_SUN_codeflags = 0x4206,
+    DW_TAG_SUN_memop_info = 0x4207,
+    DW_TAG_SUN_omp_child_func = 0x4208,
+    DW_TAG_SUN_rtti_descriptor = 0x4209,
+    DW_TAG_SUN_dtor_info = 0x420a,
+    DW_TAG_SUN_dtor = 0x420b,
+    DW_TAG_SUN_f90_interface = 0x420c,
+    DW_TAG_SUN_fortran_vax_structure = 0x420d,
+
+// ALTIUM extensions.
+    DW_TAG_ALTIUM_circ_type = 0x5101,
+    DW_TAG_ALTIUM_mwa_circ_type = 0x5102,
+    DW_TAG_ALTIUM_rev_carry_type = 0x5103,
+    DW_TAG_ALTIUM_rom = 0x5111,
+
+// Extensions for UPC.
+    DW_TAG_upc_shared_type = 0x8765,
+    DW_TAG_upc_strict_type = 0x8766,
+    DW_TAG_upc_relaxed_type = 0x8767,
+
+// PGI (STMicroelectronics) extensions.
+    DW_TAG_PGI_kanji_type = 0xa000,
+    DW_TAG_PGI_interface_block = 0xa020,
+
+// Borland extensions.
+    DW_TAG_BORLAND_property = 0xb000,
+    DW_TAG_BORLAND_Delphi_string = 0xb001,
+    DW_TAG_BORLAND_Delphi_dynamic_array = 0xb002,
+    DW_TAG_BORLAND_Delphi_set = 0xb003,
+    DW_TAG_BORLAND_Delphi_variant = 0xb004,
+});
+
+dw!(
+/// The attribute encodings for DIE attributes.
+///
+/// See Section 7.5.4, Table 7.5.
+DwAt(u16) {
+    DW_AT_null = 0x00,
+
+    DW_AT_sibling = 0x01,
+    DW_AT_location = 0x02,
+    DW_AT_name = 0x03,
+    DW_AT_ordering = 0x09,
+    DW_AT_byte_size = 0x0b,
+    DW_AT_bit_offset = 0x0c,
+    DW_AT_bit_size = 0x0d,
+    DW_AT_stmt_list = 0x10,
+    DW_AT_low_pc = 0x11,
+    DW_AT_high_pc = 0x12,
+    DW_AT_language = 0x13,
+    DW_AT_discr = 0x15,
+    DW_AT_discr_value = 0x16,
+    DW_AT_visibility = 0x17,
+    DW_AT_import = 0x18,
+    DW_AT_string_length = 0x19,
+    DW_AT_common_reference = 0x1a,
+    DW_AT_comp_dir = 0x1b,
+    DW_AT_const_value = 0x1c,
+    DW_AT_containing_type = 0x1d,
+    DW_AT_default_value = 0x1e,
+    DW_AT_inline = 0x20,
+    DW_AT_is_optional = 0x21,
+    DW_AT_lower_bound = 0x22,
+    DW_AT_producer = 0x25,
+    DW_AT_prototyped = 0x27,
+    DW_AT_return_addr = 0x2a,
+    DW_AT_start_scope = 0x2c,
+    DW_AT_bit_stride = 0x2e,
+    DW_AT_upper_bound = 0x2f,
+    DW_AT_abstract_origin = 0x31,
+    DW_AT_accessibility = 0x32,
+    DW_AT_address_class = 0x33,
+    DW_AT_artificial = 0x34,
+    DW_AT_base_types = 0x35,
+    DW_AT_calling_convention = 0x36,
+    DW_AT_count = 0x37,
+    DW_AT_data_member_location = 0x38,
+    DW_AT_decl_column = 0x39,
+    DW_AT_decl_file = 0x3a,
+    DW_AT_decl_line = 0x3b,
+    DW_AT_declaration = 0x3c,
+    DW_AT_discr_list = 0x3d,
+    DW_AT_encoding = 0x3e,
+    DW_AT_external = 0x3f,
+    DW_AT_frame_base = 0x40,
+    DW_AT_friend = 0x41,
+    DW_AT_identifier_case = 0x42,
+    DW_AT_macro_info = 0x43,
+    DW_AT_namelist_item = 0x44,
+    DW_AT_priority = 0x45,
+    DW_AT_segment = 0x46,
+    DW_AT_specification = 0x47,
+    DW_AT_static_link = 0x48,
+    DW_AT_type = 0x49,
+    DW_AT_use_location = 0x4a,
+    DW_AT_variable_parameter = 0x4b,
+    DW_AT_virtuality = 0x4c,
+    DW_AT_vtable_elem_location = 0x4d,
+
+// DWARF 3.
+    DW_AT_allocated = 0x4e,
+    DW_AT_associated = 0x4f,
+    DW_AT_data_location = 0x50,
+    DW_AT_byte_stride = 0x51,
+    DW_AT_entry_pc = 0x52,
+    DW_AT_use_UTF8 = 0x53,
+    DW_AT_extension = 0x54,
+    DW_AT_ranges = 0x55,
+    DW_AT_trampoline = 0x56,
+    DW_AT_call_column = 0x57,
+    DW_AT_call_file = 0x58,
+    DW_AT_call_line = 0x59,
+    DW_AT_description = 0x5a,
+    DW_AT_binary_scale = 0x5b,
+    DW_AT_decimal_scale = 0x5c,
+    DW_AT_small = 0x5d,
+    DW_AT_decimal_sign = 0x5e,
+    DW_AT_digit_count = 0x5f,
+    DW_AT_picture_string = 0x60,
+    DW_AT_mutable = 0x61,
+    DW_AT_threads_scaled = 0x62,
+    DW_AT_explicit = 0x63,
+    DW_AT_object_pointer = 0x64,
+    DW_AT_endianity = 0x65,
+    DW_AT_elemental = 0x66,
+    DW_AT_pure = 0x67,
+    DW_AT_recursive = 0x68,
+
+// DWARF 4.
+    DW_AT_signature = 0x69,
+    DW_AT_main_subprogram = 0x6a,
+    DW_AT_data_bit_offset = 0x6b,
+    DW_AT_const_expr = 0x6c,
+    DW_AT_enum_class = 0x6d,
+    DW_AT_linkage_name = 0x6e,
+
+// DWARF 5.
+    DW_AT_string_length_bit_size = 0x6f,
+    DW_AT_string_length_byte_size = 0x70,
+    DW_AT_rank = 0x71,
+    DW_AT_str_offsets_base = 0x72,
+    DW_AT_addr_base = 0x73,
+    DW_AT_rnglists_base = 0x74,
+    DW_AT_dwo_name = 0x76,
+    DW_AT_reference = 0x77,
+    DW_AT_rvalue_reference = 0x78,
+    DW_AT_macros = 0x79,
+    DW_AT_call_all_calls = 0x7a,
+    DW_AT_call_all_source_calls = 0x7b,
+    DW_AT_call_all_tail_calls = 0x7c,
+    DW_AT_call_return_pc = 0x7d,
+    DW_AT_call_value = 0x7e,
+    DW_AT_call_origin = 0x7f,
+    DW_AT_call_parameter = 0x80,
+    DW_AT_call_pc = 0x81,
+    DW_AT_call_tail_call = 0x82,
+    DW_AT_call_target = 0x83,
+    DW_AT_call_target_clobbered = 0x84,
+    DW_AT_call_data_location = 0x85,
+    DW_AT_call_data_value = 0x86,
+    DW_AT_noreturn = 0x87,
+    DW_AT_alignment = 0x88,
+    DW_AT_export_symbols = 0x89,
+    DW_AT_deleted = 0x8a,
+    DW_AT_defaulted = 0x8b,
+    DW_AT_loclists_base = 0x8c,
+
+    DW_AT_lo_user = 0x2000,
+    DW_AT_hi_user = 0x3fff,
+
+// SGI/MIPS extensions.
+    DW_AT_MIPS_fde = 0x2001,
+    DW_AT_MIPS_loop_begin = 0x2002,
+    DW_AT_MIPS_tail_loop_begin = 0x2003,
+    DW_AT_MIPS_epilog_begin = 0x2004,
+    DW_AT_MIPS_loop_unroll_factor = 0x2005,
+    DW_AT_MIPS_software_pipeline_depth = 0x2006,
+    DW_AT_MIPS_linkage_name = 0x2007,
+    DW_AT_MIPS_stride = 0x2008,
+    DW_AT_MIPS_abstract_name = 0x2009,
+    DW_AT_MIPS_clone_origin = 0x200a,
+    DW_AT_MIPS_has_inlines = 0x200b,
+    DW_AT_MIPS_stride_byte = 0x200c,
+    DW_AT_MIPS_stride_elem = 0x200d,
+    DW_AT_MIPS_ptr_dopetype = 0x200e,
+    DW_AT_MIPS_allocatable_dopetype = 0x200f,
+    DW_AT_MIPS_assumed_shape_dopetype = 0x2010,
+
+// This one appears to have only been implemented by Open64 for
+// fortran and may conflict with other extensions.
+    DW_AT_MIPS_assumed_size = 0x2011,
+
+// TODO: HP/CPQ extensions.
+// These conflict with the MIPS extensions.
+
+    DW_AT_INTEL_other_endian = 0x2026,
+
+// GNU extensions
+    DW_AT_sf_names = 0x2101,
+    DW_AT_src_info = 0x2102,
+    DW_AT_mac_info = 0x2103,
+    DW_AT_src_coords = 0x2104,
+    DW_AT_body_begin = 0x2105,
+    DW_AT_body_end = 0x2106,
+    DW_AT_GNU_vector = 0x2107,
+    DW_AT_GNU_guarded_by = 0x2108,
+    DW_AT_GNU_pt_guarded_by = 0x2109,
+    DW_AT_GNU_guarded = 0x210a,
+    DW_AT_GNU_pt_guarded = 0x210b,
+    DW_AT_GNU_locks_excluded = 0x210c,
+    DW_AT_GNU_exclusive_locks_required = 0x210d,
+    DW_AT_GNU_shared_locks_required = 0x210e,
+    DW_AT_GNU_odr_signature = 0x210f,
+    DW_AT_GNU_template_name = 0x2110,
+    DW_AT_GNU_call_site_value = 0x2111,
+    DW_AT_GNU_call_site_data_value = 0x2112,
+    DW_AT_GNU_call_site_target = 0x2113,
+    DW_AT_GNU_call_site_target_clobbered = 0x2114,
+    DW_AT_GNU_tail_call = 0x2115,
+    DW_AT_GNU_all_tail_call_sites = 0x2116,
+    DW_AT_GNU_all_call_sites = 0x2117,
+    DW_AT_GNU_all_source_call_sites = 0x2118,
+    DW_AT_GNU_macros = 0x2119,
+
+// Extensions for Fission proposal.
+    DW_AT_GNU_dwo_name = 0x2130,
+    DW_AT_GNU_dwo_id = 0x2131,
+    DW_AT_GNU_ranges_base = 0x2132,
+    DW_AT_GNU_addr_base = 0x2133,
+    DW_AT_GNU_pubnames = 0x2134,
+    DW_AT_GNU_pubtypes = 0x2135,
+    DW_AT_GNU_discriminator = 0x2136,
+    DW_AT_GNU_locviews = 0x2137,
+    DW_AT_GNU_entry_view = 0x2138,
+
+// Conflict with Sun.
+// DW_AT_VMS_rtnbeg_pd_address = 0x2201,
+
+// Sun extensions.
+    DW_AT_SUN_template = 0x2201,
+    DW_AT_SUN_alignment = 0x2202,
+    DW_AT_SUN_vtable = 0x2203,
+    DW_AT_SUN_count_guarantee = 0x2204,
+    DW_AT_SUN_command_line = 0x2205,
+    DW_AT_SUN_vbase = 0x2206,
+    DW_AT_SUN_compile_options = 0x2207,
+    DW_AT_SUN_language = 0x2208,
+    DW_AT_SUN_browser_file = 0x2209,
+    DW_AT_SUN_vtable_abi = 0x2210,
+    DW_AT_SUN_func_offsets = 0x2211,
+    DW_AT_SUN_cf_kind = 0x2212,
+    DW_AT_SUN_vtable_index = 0x2213,
+    DW_AT_SUN_omp_tpriv_addr = 0x2214,
+    DW_AT_SUN_omp_child_func = 0x2215,
+    DW_AT_SUN_func_offset = 0x2216,
+    DW_AT_SUN_memop_type_ref = 0x2217,
+    DW_AT_SUN_profile_id = 0x2218,
+    DW_AT_SUN_memop_signature = 0x2219,
+    DW_AT_SUN_obj_dir = 0x2220,
+    DW_AT_SUN_obj_file = 0x2221,
+    DW_AT_SUN_original_name = 0x2222,
+    DW_AT_SUN_hwcprof_signature = 0x2223,
+    DW_AT_SUN_amd64_parmdump = 0x2224,
+    DW_AT_SUN_part_link_name = 0x2225,
+    DW_AT_SUN_link_name = 0x2226,
+    DW_AT_SUN_pass_with_const = 0x2227,
+    DW_AT_SUN_return_with_const = 0x2228,
+    DW_AT_SUN_import_by_name = 0x2229,
+    DW_AT_SUN_f90_pointer = 0x222a,
+    DW_AT_SUN_pass_by_ref = 0x222b,
+    DW_AT_SUN_f90_allocatable = 0x222c,
+    DW_AT_SUN_f90_assumed_shape_array = 0x222d,
+    DW_AT_SUN_c_vla = 0x222e,
+    DW_AT_SUN_return_value_ptr = 0x2230,
+    DW_AT_SUN_dtor_start = 0x2231,
+    DW_AT_SUN_dtor_length = 0x2232,
+    DW_AT_SUN_dtor_state_initial = 0x2233,
+    DW_AT_SUN_dtor_state_final = 0x2234,
+    DW_AT_SUN_dtor_state_deltas = 0x2235,
+    DW_AT_SUN_import_by_lname = 0x2236,
+    DW_AT_SUN_f90_use_only = 0x2237,
+    DW_AT_SUN_namelist_spec = 0x2238,
+    DW_AT_SUN_is_omp_child_func = 0x2239,
+    DW_AT_SUN_fortran_main_alias = 0x223a,
+    DW_AT_SUN_fortran_based = 0x223b,
+
+    DW_AT_ALTIUM_loclist = 0x2300,
+
+    DW_AT_use_GNAT_descriptive_type = 0x2301,
+    DW_AT_GNAT_descriptive_type = 0x2302,
+    DW_AT_GNU_numerator = 0x2303,
+    DW_AT_GNU_denominator = 0x2304,
+    DW_AT_GNU_bias = 0x2305,
+
+    DW_AT_upc_threads_scaled = 0x3210,
+
+// PGI (STMicroelectronics) extensions.
+    DW_AT_PGI_lbase = 0x3a00,
+    DW_AT_PGI_soffset = 0x3a01,
+    DW_AT_PGI_lstride = 0x3a02,
+
+// Borland extensions.
+    DW_AT_BORLAND_property_read = 0x3b11,
+    DW_AT_BORLAND_property_write = 0x3b12,
+    DW_AT_BORLAND_property_implements = 0x3b13,
+    DW_AT_BORLAND_property_index = 0x3b14,
+    DW_AT_BORLAND_property_default = 0x3b15,
+    DW_AT_BORLAND_Delphi_unit = 0x3b20,
+    DW_AT_BORLAND_Delphi_class = 0x3b21,
+    DW_AT_BORLAND_Delphi_record = 0x3b22,
+    DW_AT_BORLAND_Delphi_metaclass = 0x3b23,
+    DW_AT_BORLAND_Delphi_constructor = 0x3b24,
+    DW_AT_BORLAND_Delphi_destructor = 0x3b25,
+    DW_AT_BORLAND_Delphi_anonymous_method = 0x3b26,
+    DW_AT_BORLAND_Delphi_interface = 0x3b27,
+    DW_AT_BORLAND_Delphi_ABI = 0x3b28,
+    DW_AT_BORLAND_Delphi_return = 0x3b29,
+    DW_AT_BORLAND_Delphi_frameptr = 0x3b30,
+    DW_AT_BORLAND_closure = 0x3b31,
+
+// LLVM project extensions.
+    DW_AT_LLVM_include_path = 0x3e00,
+    DW_AT_LLVM_config_macros = 0x3e01,
+    DW_AT_LLVM_isysroot = 0x3e02,
+
+// Apple extensions.
+    DW_AT_APPLE_optimized = 0x3fe1,
+    DW_AT_APPLE_flags = 0x3fe2,
+    DW_AT_APPLE_isa = 0x3fe3,
+    DW_AT_APPLE_block = 0x3fe4,
+    DW_AT_APPLE_major_runtime_vers = 0x3fe5,
+    DW_AT_APPLE_runtime_class = 0x3fe6,
+    DW_AT_APPLE_omit_frame_ptr = 0x3fe7,
+    DW_AT_APPLE_property_name = 0x3fe8,
+    DW_AT_APPLE_property_getter = 0x3fe9,
+    DW_AT_APPLE_property_setter = 0x3fea,
+    DW_AT_APPLE_property_attribute = 0x3feb,
+    DW_AT_APPLE_objc_complete_type = 0x3fec,
+    DW_AT_APPLE_property = 0x3fed
+});
+
+dw!(
+/// The attribute form encodings for DIE attributes.
+///
+/// See Section 7.5.6, Table 7.6.
+DwForm(u16) {
+    DW_FORM_null = 0x00,
+
+    DW_FORM_addr = 0x01,
+    DW_FORM_block2 = 0x03,
+    DW_FORM_block4 = 0x04,
+    DW_FORM_data2 = 0x05,
+    DW_FORM_data4 = 0x06,
+    DW_FORM_data8 = 0x07,
+    DW_FORM_string = 0x08,
+    DW_FORM_block = 0x09,
+    DW_FORM_block1 = 0x0a,
+    DW_FORM_data1 = 0x0b,
+    DW_FORM_flag = 0x0c,
+    DW_FORM_sdata = 0x0d,
+    DW_FORM_strp = 0x0e,
+    DW_FORM_udata = 0x0f,
+    DW_FORM_ref_addr = 0x10,
+    DW_FORM_ref1 = 0x11,
+    DW_FORM_ref2 = 0x12,
+    DW_FORM_ref4 = 0x13,
+    DW_FORM_ref8 = 0x14,
+    DW_FORM_ref_udata = 0x15,
+    DW_FORM_indirect = 0x16,
+
+// DWARF 4.
+    DW_FORM_sec_offset = 0x17,
+    DW_FORM_exprloc = 0x18,
+    DW_FORM_flag_present = 0x19,
+    DW_FORM_ref_sig8 = 0x20,
+
+// DWARF 5.
+    DW_FORM_strx = 0x1a,
+    DW_FORM_addrx = 0x1b,
+    DW_FORM_ref_sup4 = 0x1c,
+    DW_FORM_strp_sup = 0x1d,
+    DW_FORM_data16 = 0x1e,
+    DW_FORM_line_strp = 0x1f,
+    DW_FORM_implicit_const = 0x21,
+    DW_FORM_loclistx = 0x22,
+    DW_FORM_rnglistx = 0x23,
+    DW_FORM_ref_sup8 = 0x24,
+    DW_FORM_strx1 = 0x25,
+    DW_FORM_strx2 = 0x26,
+    DW_FORM_strx3 = 0x27,
+    DW_FORM_strx4 = 0x28,
+    DW_FORM_addrx1 = 0x29,
+    DW_FORM_addrx2 = 0x2a,
+    DW_FORM_addrx3 = 0x2b,
+    DW_FORM_addrx4 = 0x2c,
+
+// Extensions for Fission proposal
+    DW_FORM_GNU_addr_index = 0x1f01,
+    DW_FORM_GNU_str_index = 0x1f02,
+
+// Alternate debug sections proposal (output of "dwz" tool).
+    DW_FORM_GNU_ref_alt = 0x1f20,
+    DW_FORM_GNU_strp_alt = 0x1f21
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_encoding` attribute.
+///
+/// See Section 7.8, Table 7.11.
+DwAte(u8) {
+    DW_ATE_address = 0x01,
+    DW_ATE_boolean = 0x02,
+    DW_ATE_complex_float = 0x03,
+    DW_ATE_float = 0x04,
+    DW_ATE_signed = 0x05,
+    DW_ATE_signed_char = 0x06,
+    DW_ATE_unsigned = 0x07,
+    DW_ATE_unsigned_char = 0x08,
+
+// DWARF 3.
+    DW_ATE_imaginary_float = 0x09,
+    DW_ATE_packed_decimal = 0x0a,
+    DW_ATE_numeric_string = 0x0b,
+    DW_ATE_edited = 0x0c,
+    DW_ATE_signed_fixed = 0x0d,
+    DW_ATE_unsigned_fixed = 0x0e,
+    DW_ATE_decimal_float = 0x0f ,
+
+// DWARF 4.
+    DW_ATE_UTF = 0x10,
+    DW_ATE_UCS = 0x11,
+    DW_ATE_ASCII = 0x12,
+
+    DW_ATE_lo_user = 0x80,
+    DW_ATE_hi_user = 0xff,
+});
+
+dw!(
+/// The encodings of the constants used in location list entries.
+///
+/// See Section 7.7.3, Table 7.10.
+DwLle(u8) {
+    DW_LLE_end_of_list = 0x00,
+    DW_LLE_base_addressx = 0x01,
+    DW_LLE_startx_endx = 0x02,
+    DW_LLE_startx_length = 0x03,
+    DW_LLE_offset_pair = 0x04,
+    DW_LLE_default_location = 0x05,
+    DW_LLE_base_address = 0x06,
+    DW_LLE_start_end = 0x07,
+    DW_LLE_start_length = 0x08,
+    DW_LLE_GNU_view_pair = 0x09,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_decimal_sign` attribute.
+///
+/// See Section 7.8, Table 7.12.
+DwDs(u8) {
+    DW_DS_unsigned = 0x01,
+    DW_DS_leading_overpunch = 0x02,
+    DW_DS_trailing_overpunch = 0x03,
+    DW_DS_leading_separate = 0x04,
+    DW_DS_trailing_separate = 0x05,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_endianity` attribute.
+///
+/// See Section 7.8, Table 7.13.
+DwEnd(u8) {
+    DW_END_default = 0x00,
+    DW_END_big = 0x01,
+    DW_END_little = 0x02,
+    DW_END_lo_user = 0x40,
+    DW_END_hi_user = 0xff,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_accessibility` attribute.
+///
+/// See Section 7.9, Table 7.14.
+DwAccess(u8) {
+    DW_ACCESS_public = 0x01,
+    DW_ACCESS_protected = 0x02,
+    DW_ACCESS_private = 0x03,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_visibility` attribute.
+///
+/// See Section 7.10, Table 7.15.
+DwVis(u8) {
+    DW_VIS_local = 0x01,
+    DW_VIS_exported = 0x02,
+    DW_VIS_qualified = 0x03,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_virtuality` attribute.
+///
+/// See Section 7.11, Table 7.16.
+DwVirtuality(u8) {
+    DW_VIRTUALITY_none = 0x00,
+    DW_VIRTUALITY_virtual = 0x01,
+    DW_VIRTUALITY_pure_virtual = 0x02,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_language` attribute.
+///
+/// See Section 7.12, Table 7.17.
+DwLang(u16) {
+    DW_LANG_C89 = 0x0001,
+    DW_LANG_C = 0x0002,
+    DW_LANG_Ada83 = 0x0003,
+    DW_LANG_C_plus_plus = 0x0004,
+    DW_LANG_Cobol74 = 0x0005,
+    DW_LANG_Cobol85 = 0x0006,
+    DW_LANG_Fortran77 = 0x0007,
+    DW_LANG_Fortran90 = 0x0008,
+    DW_LANG_Pascal83 = 0x0009,
+    DW_LANG_Modula2 = 0x000a,
+    DW_LANG_Java = 0x000b,
+    DW_LANG_C99 = 0x000c,
+    DW_LANG_Ada95 = 0x000d,
+    DW_LANG_Fortran95 = 0x000e,
+    DW_LANG_PLI = 0x000f,
+    DW_LANG_ObjC = 0x0010,
+    DW_LANG_ObjC_plus_plus = 0x0011,
+    DW_LANG_UPC = 0x0012,
+    DW_LANG_D = 0x0013,
+    DW_LANG_Python = 0x0014,
+    DW_LANG_OpenCL = 0x0015,
+    DW_LANG_Go = 0x0016,
+    DW_LANG_Modula3 = 0x0017,
+    DW_LANG_Haskell = 0x0018,
+    DW_LANG_C_plus_plus_03 = 0x0019,
+    DW_LANG_C_plus_plus_11 = 0x001a,
+    DW_LANG_OCaml = 0x001b,
+    DW_LANG_Rust = 0x001c,
+    DW_LANG_C11 = 0x001d,
+    DW_LANG_Swift = 0x001e,
+    DW_LANG_Julia = 0x001f,
+    DW_LANG_Dylan = 0x0020,
+    DW_LANG_C_plus_plus_14 = 0x0021,
+    DW_LANG_Fortran03 = 0x0022,
+    DW_LANG_Fortran08 = 0x0023,
+    DW_LANG_RenderScript = 0x0024,
+    DW_LANG_BLISS = 0x0025,
+
+    DW_LANG_lo_user = 0x8000,
+    DW_LANG_hi_user = 0xffff,
+
+    DW_LANG_Mips_Assembler = 0x8001,
+    DW_LANG_GOOGLE_RenderScript = 0x8e57,
+    DW_LANG_SUN_Assembler = 0x9001,
+    DW_LANG_ALTIUM_Assembler = 0x9101,
+    DW_LANG_BORLAND_Delphi = 0xb000,
+});
+
+impl DwLang {
+    /// Get the default DW_AT_lower_bound for this language.
+    pub fn default_lower_bound(self) -> Option<usize> {
+        match self {
+            DW_LANG_C89
+            | DW_LANG_C
+            | DW_LANG_C_plus_plus
+            | DW_LANG_Java
+            | DW_LANG_C99
+            | DW_LANG_ObjC
+            | DW_LANG_ObjC_plus_plus
+            | DW_LANG_UPC
+            | DW_LANG_D
+            | DW_LANG_Python
+            | DW_LANG_OpenCL
+            | DW_LANG_Go
+            | DW_LANG_Haskell
+            | DW_LANG_C_plus_plus_03
+            | DW_LANG_C_plus_plus_11
+            | DW_LANG_OCaml
+            | DW_LANG_Rust
+            | DW_LANG_C11
+            | DW_LANG_Swift
+            | DW_LANG_Dylan
+            | DW_LANG_C_plus_plus_14
+            | DW_LANG_RenderScript
+            | DW_LANG_BLISS => Some(0),
+            DW_LANG_Ada83 | DW_LANG_Cobol74 | DW_LANG_Cobol85 | DW_LANG_Fortran77
+            | DW_LANG_Fortran90 | DW_LANG_Pascal83 | DW_LANG_Modula2 | DW_LANG_Ada95
+            | DW_LANG_Fortran95 | DW_LANG_PLI | DW_LANG_Modula3 | DW_LANG_Julia
+            | DW_LANG_Fortran03 | DW_LANG_Fortran08 => Some(1),
+            _ => None,
+        }
+    }
+}
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_address_class` attribute.
+///
+/// There is only one value that is common to all target architectures.
+/// See Section 7.13.
+DwAddr(u64) {
+    DW_ADDR_none = 0x00,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_identifier_case` attribute.
+///
+/// See Section 7.14, Table 7.18.
+DwId(u8) {
+    DW_ID_case_sensitive = 0x00,
+    DW_ID_up_case = 0x01,
+    DW_ID_down_case = 0x02,
+    DW_ID_case_insensitive = 0x03,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_calling_convention` attribute.
+///
+/// See Section 7.15, Table 7.19.
+DwCc(u8) {
+    DW_CC_normal = 0x01,
+    DW_CC_program = 0x02,
+    DW_CC_nocall = 0x03,
+    DW_CC_pass_by_reference = 0x04,
+    DW_CC_pass_by_value = 0x05,
+    DW_CC_lo_user = 0x40,
+    DW_CC_hi_user = 0xff,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_inline` attribute.
+///
+/// See Section 7.16, Table 7.20.
+DwInl(u8) {
+    DW_INL_not_inlined = 0x00,
+    DW_INL_inlined = 0x01,
+    DW_INL_declared_not_inlined = 0x02,
+    DW_INL_declared_inlined = 0x03,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_ordering` attribute.
+///
+/// See Section 7.17, Table 7.17.
+DwOrd(u8) {
+    DW_ORD_row_major = 0x00,
+    DW_ORD_col_major = 0x01,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_discr_list` attribute.
+///
+/// See Section 7.18, Table 7.22.
+DwDsc(u8) {
+    DW_DSC_label = 0x00,
+    DW_DSC_range = 0x01,
+});
+
+dw!(
+/// Name index attribute encodings.
+///
+/// See Section 7.19, Table 7.23.
+DwIdx(u16) {
+    DW_IDX_compile_unit = 1,
+    DW_IDX_type_unit = 2,
+    DW_IDX_die_offset = 3,
+    DW_IDX_parent = 4,
+    DW_IDX_type_hash = 5,
+    DW_IDX_lo_user = 0x2000,
+    DW_IDX_hi_user = 0x3fff,
+});
+
+dw!(
+/// The encodings of the constants used in the `DW_AT_defaulted` attribute.
+///
+/// See Section 7.20, Table 7.24.
+DwDefaulted(u8) {
+    DW_DEFAULTED_no = 0x00,
+    DW_DEFAULTED_in_class = 0x01,
+    DW_DEFAULTED_out_of_class = 0x02,
+});
+
+dw!(
+/// The encodings for the standard opcodes for line number information.
+///
+/// See Section 7.22, Table 7.25.
+DwLns(u8) {
+    DW_LNS_copy = 0x01,
+    DW_LNS_advance_pc = 0x02,
+    DW_LNS_advance_line = 0x03,
+    DW_LNS_set_file = 0x04,
+    DW_LNS_set_column = 0x05,
+    DW_LNS_negate_stmt = 0x06,
+    DW_LNS_set_basic_block = 0x07,
+    DW_LNS_const_add_pc = 0x08,
+    DW_LNS_fixed_advance_pc = 0x09,
+    DW_LNS_set_prologue_end = 0x0a,
+    DW_LNS_set_epilogue_begin = 0x0b,
+    DW_LNS_set_isa = 0x0c,
+});
+
+dw!(
+/// The encodings for the extended opcodes for line number information.
+///
+/// See Section 7.22, Table 7.26.
+DwLne(u8) {
+    DW_LNE_end_sequence = 0x01,
+    DW_LNE_set_address = 0x02,
+    DW_LNE_define_file = 0x03,
+    DW_LNE_set_discriminator = 0x04,
+
+    DW_LNE_lo_user = 0x80,
+    DW_LNE_hi_user = 0xff,
+});
+
+dw!(
+/// The encodings for the line number header entry formats.
+///
+/// See Section 7.22, Table 7.27.
+DwLnct(u16) {
+    DW_LNCT_path = 0x1,
+    DW_LNCT_directory_index = 0x2,
+    DW_LNCT_timestamp = 0x3,
+    DW_LNCT_size = 0x4,
+    DW_LNCT_MD5 = 0x5,
+    DW_LNCT_lo_user = 0x2000,
+    DW_LNCT_hi_user = 0x3fff,
+});
+
+dw!(
+/// The encodings for macro information entry types.
+///
+/// See Section 7.23, Table 7.28.
+DwMacro(u8) {
+    DW_MACRO_define = 0x01,
+    DW_MACRO_undef = 0x02,
+    DW_MACRO_start_file = 0x03,
+    DW_MACRO_end_file = 0x04,
+    DW_MACRO_define_strp = 0x05,
+    DW_MACRO_undef_strp = 0x06,
+    DW_MACRO_import = 0x07,
+    DW_MACRO_define_sup = 0x08,
+    DW_MACRO_undef_sup = 0x09,
+    DW_MACRO_import_sup = 0x0a,
+    DW_MACRO_define_strx = 0x0b,
+    DW_MACRO_undef_strx = 0x0c,
+    DW_MACRO_lo_user = 0xe0,
+    DW_MACRO_hi_user = 0xff,
+});
+
+dw!(
+/// Range list entry encoding values.
+///
+/// See Section 7.25, Table 7.30.
+DwRle(u8) {
+    DW_RLE_end_of_list = 0x00,
+    DW_RLE_base_addressx = 0x01,
+    DW_RLE_startx_endx = 0x02,
+    DW_RLE_startx_length = 0x03,
+    DW_RLE_offset_pair = 0x04,
+    DW_RLE_base_address = 0x05,
+    DW_RLE_start_end = 0x06,
+    DW_RLE_start_length = 0x07,
+});
+
+dw!(
+/// The encodings for DWARF expression operations.
+///
+/// See Section 7.7.1, Table 7.9.
+DwOp(u8) {
+    DW_OP_addr = 0x03,
+    DW_OP_deref = 0x06,
+    DW_OP_const1u = 0x08,
+    DW_OP_const1s = 0x09,
+    DW_OP_const2u = 0x0a,
+    DW_OP_const2s = 0x0b,
+    DW_OP_const4u = 0x0c,
+    DW_OP_const4s = 0x0d,
+    DW_OP_const8u = 0x0e,
+    DW_OP_const8s = 0x0f,
+    DW_OP_constu = 0x10,
+    DW_OP_consts = 0x11,
+    DW_OP_dup = 0x12,
+    DW_OP_drop = 0x13,
+    DW_OP_over = 0x14,
+    DW_OP_pick = 0x15,
+    DW_OP_swap = 0x16,
+    DW_OP_rot = 0x17,
+    DW_OP_xderef = 0x18,
+    DW_OP_abs = 0x19,
+    DW_OP_and = 0x1a,
+    DW_OP_div = 0x1b,
+    DW_OP_minus = 0x1c,
+    DW_OP_mod = 0x1d,
+    DW_OP_mul = 0x1e,
+    DW_OP_neg = 0x1f,
+    DW_OP_not = 0x20,
+    DW_OP_or = 0x21,
+    DW_OP_plus = 0x22,
+    DW_OP_plus_uconst = 0x23,
+    DW_OP_shl = 0x24,
+    DW_OP_shr = 0x25,
+    DW_OP_shra = 0x26,
+    DW_OP_xor = 0x27,
+    DW_OP_bra = 0x28,
+    DW_OP_eq = 0x29,
+    DW_OP_ge = 0x2a,
+    DW_OP_gt = 0x2b,
+    DW_OP_le = 0x2c,
+    DW_OP_lt = 0x2d,
+    DW_OP_ne = 0x2e,
+    DW_OP_skip = 0x2f,
+    DW_OP_lit0 = 0x30,
+    DW_OP_lit1 = 0x31,
+    DW_OP_lit2 = 0x32,
+    DW_OP_lit3 = 0x33,
+    DW_OP_lit4 = 0x34,
+    DW_OP_lit5 = 0x35,
+    DW_OP_lit6 = 0x36,
+    DW_OP_lit7 = 0x37,
+    DW_OP_lit8 = 0x38,
+    DW_OP_lit9 = 0x39,
+    DW_OP_lit10 = 0x3a,
+    DW_OP_lit11 = 0x3b,
+    DW_OP_lit12 = 0x3c,
+    DW_OP_lit13 = 0x3d,
+    DW_OP_lit14 = 0x3e,
+    DW_OP_lit15 = 0x3f,
+    DW_OP_lit16 = 0x40,
+    DW_OP_lit17 = 0x41,
+    DW_OP_lit18 = 0x42,
+    DW_OP_lit19 = 0x43,
+    DW_OP_lit20 = 0x44,
+    DW_OP_lit21 = 0x45,
+    DW_OP_lit22 = 0x46,
+    DW_OP_lit23 = 0x47,
+    DW_OP_lit24 = 0x48,
+    DW_OP_lit25 = 0x49,
+    DW_OP_lit26 = 0x4a,
+    DW_OP_lit27 = 0x4b,
+    DW_OP_lit28 = 0x4c,
+    DW_OP_lit29 = 0x4d,
+    DW_OP_lit30 = 0x4e,
+    DW_OP_lit31 = 0x4f,
+    DW_OP_reg0 = 0x50,
+    DW_OP_reg1 = 0x51,
+    DW_OP_reg2 = 0x52,
+    DW_OP_reg3 = 0x53,
+    DW_OP_reg4 = 0x54,
+    DW_OP_reg5 = 0x55,
+    DW_OP_reg6 = 0x56,
+    DW_OP_reg7 = 0x57,
+    DW_OP_reg8 = 0x58,
+    DW_OP_reg9 = 0x59,
+    DW_OP_reg10 = 0x5a,
+    DW_OP_reg11 = 0x5b,
+    DW_OP_reg12 = 0x5c,
+    DW_OP_reg13 = 0x5d,
+    DW_OP_reg14 = 0x5e,
+    DW_OP_reg15 = 0x5f,
+    DW_OP_reg16 = 0x60,
+    DW_OP_reg17 = 0x61,
+    DW_OP_reg18 = 0x62,
+    DW_OP_reg19 = 0x63,
+    DW_OP_reg20 = 0x64,
+    DW_OP_reg21 = 0x65,
+    DW_OP_reg22 = 0x66,
+    DW_OP_reg23 = 0x67,
+    DW_OP_reg24 = 0x68,
+    DW_OP_reg25 = 0x69,
+    DW_OP_reg26 = 0x6a,
+    DW_OP_reg27 = 0x6b,
+    DW_OP_reg28 = 0x6c,
+    DW_OP_reg29 = 0x6d,
+    DW_OP_reg30 = 0x6e,
+    DW_OP_reg31 = 0x6f,
+    DW_OP_breg0 = 0x70,
+    DW_OP_breg1 = 0x71,
+    DW_OP_breg2 = 0x72,
+    DW_OP_breg3 = 0x73,
+    DW_OP_breg4 = 0x74,
+    DW_OP_breg5 = 0x75,
+    DW_OP_breg6 = 0x76,
+    DW_OP_breg7 = 0x77,
+    DW_OP_breg8 = 0x78,
+    DW_OP_breg9 = 0x79,
+    DW_OP_breg10 = 0x7a,
+    DW_OP_breg11 = 0x7b,
+    DW_OP_breg12 = 0x7c,
+    DW_OP_breg13 = 0x7d,
+    DW_OP_breg14 = 0x7e,
+    DW_OP_breg15 = 0x7f,
+    DW_OP_breg16 = 0x80,
+    DW_OP_breg17 = 0x81,
+    DW_OP_breg18 = 0x82,
+    DW_OP_breg19 = 0x83,
+    DW_OP_breg20 = 0x84,
+    DW_OP_breg21 = 0x85,
+    DW_OP_breg22 = 0x86,
+    DW_OP_breg23 = 0x87,
+    DW_OP_breg24 = 0x88,
+    DW_OP_breg25 = 0x89,
+    DW_OP_breg26 = 0x8a,
+    DW_OP_breg27 = 0x8b,
+    DW_OP_breg28 = 0x8c,
+    DW_OP_breg29 = 0x8d,
+    DW_OP_breg30 = 0x8e,
+    DW_OP_breg31 = 0x8f,
+    DW_OP_regx = 0x90,
+    DW_OP_fbreg = 0x91,
+    DW_OP_bregx = 0x92,
+    DW_OP_piece = 0x93,
+    DW_OP_deref_size = 0x94,
+    DW_OP_xderef_size = 0x95,
+    DW_OP_nop = 0x96,
+    DW_OP_push_object_address = 0x97,
+    DW_OP_call2 = 0x98,
+    DW_OP_call4 = 0x99,
+    DW_OP_call_ref = 0x9a,
+    DW_OP_form_tls_address = 0x9b,
+    DW_OP_call_frame_cfa = 0x9c,
+    DW_OP_bit_piece = 0x9d,
+    DW_OP_implicit_value = 0x9e,
+    DW_OP_stack_value = 0x9f,
+    DW_OP_implicit_pointer = 0xa0,
+    DW_OP_addrx = 0xa1,
+    DW_OP_constx = 0xa2,
+    DW_OP_entry_value = 0xa3,
+    DW_OP_const_type = 0xa4,
+    DW_OP_regval_type = 0xa5,
+    DW_OP_deref_type = 0xa6,
+    DW_OP_xderef_type = 0xa7,
+    DW_OP_convert = 0xa8,
+    DW_OP_reinterpret = 0xa9,
+
+    // GNU extensions
+    DW_OP_GNU_push_tls_address = 0xe0,
+    DW_OP_GNU_implicit_pointer = 0xf2,
+    DW_OP_GNU_entry_value = 0xf3,
+    DW_OP_GNU_const_type = 0xf4,
+    DW_OP_GNU_regval_type = 0xf5,
+    DW_OP_GNU_deref_type = 0xf6,
+    DW_OP_GNU_convert = 0xf7,
+    DW_OP_GNU_reinterpret = 0xf9,
+    DW_OP_GNU_parameter_ref = 0xfa,
+    DW_OP_GNU_addr_index = 0xfb,
+    DW_OP_GNU_const_index = 0xfc,
+
+    // Wasm extensions
+    DW_OP_WASM_location = 0xed,
+});
+
+dw!(
+/// Pointer encoding used by `.eh_frame`.
+///
+/// The four lower bits describe the
+/// format of the pointer, the upper four bits describe how the encoding should
+/// be applied.
+///
+/// Defined in http://refspecs.linux-foundation.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/dwarfext.html
+DwEhPe(u8) {
+// Format of pointer encoding.
+
+// "Unsigned value is encoded using the Little Endian Base 128"
+    DW_EH_PE_uleb128 = 0x1,
+// "A 2 bytes unsigned value."
+    DW_EH_PE_udata2 = 0x2,
+// "A 4 bytes unsigned value."
+    DW_EH_PE_udata4 = 0x3,
+// "An 8 bytes unsigned value."
+    DW_EH_PE_udata8 = 0x4,
+// "Signed value is encoded using the Little Endian Base 128"
+    DW_EH_PE_sleb128 = 0x9,
+// "A 2 bytes signed value."
+    DW_EH_PE_sdata2 = 0x0a,
+// "A 4 bytes signed value."
+    DW_EH_PE_sdata4 = 0x0b,
+// "An 8 bytes signed value."
+    DW_EH_PE_sdata8 = 0x0c,
+
+// How the pointer encoding should be applied.
+
+// `DW_EH_PE_pcrel` pointers are relative to their own location.
+    DW_EH_PE_pcrel = 0x10,
+// "Value is relative to the beginning of the .text section."
+    DW_EH_PE_textrel = 0x20,
+// "Value is relative to the beginning of the .got or .eh_frame_hdr section."
+    DW_EH_PE_datarel = 0x30,
+// "Value is relative to the beginning of the function."
+    DW_EH_PE_funcrel = 0x40,
+// "Value is aligned to an address unit sized boundary."
+    DW_EH_PE_aligned = 0x50,
+
+// This bit can be set for any of the above encoding applications. When set,
+// the encoded value is the address of the real pointer result, not the
+// pointer result itself.
+//
+// This isn't defined in the DWARF or the `.eh_frame` standards, but is
+// generated by both GNU/Linux and OSX tooling.
+    DW_EH_PE_indirect = 0x80,
+
+// These constants apply to both the lower and upper bits.
+
+// "The Value is a literal pointer whose size is determined by the
+// architecture."
+    DW_EH_PE_absptr = 0x0,
+// The absence of a pointer and encoding.
+    DW_EH_PE_omit = 0xff,
+});
+
+const DW_EH_PE_FORMAT_MASK: u8 = 0b0000_1111;
+
+// Ignores indirection bit.
+const DW_EH_PE_APPLICATION_MASK: u8 = 0b0111_0000;
+
+impl DwEhPe {
+    /// Get the pointer encoding's format.
+    #[inline]
+    pub fn format(self) -> DwEhPe {
+        DwEhPe(self.0 & DW_EH_PE_FORMAT_MASK)
+    }
+
+    /// Get the pointer encoding's application.
+    #[inline]
+    pub fn application(self) -> DwEhPe {
+        DwEhPe(self.0 & DW_EH_PE_APPLICATION_MASK)
+    }
+
+    /// Is this encoding the absent pointer encoding?
+    #[inline]
+    pub fn is_absent(self) -> bool {
+        self == DW_EH_PE_omit
+    }
+
+    /// Is this coding indirect? If so, its encoded value is the address of the
+    /// real pointer result, not the pointer result itself.
+    #[inline]
+    pub fn is_indirect(self) -> bool {
+        self.0 & DW_EH_PE_indirect.0 != 0
+    }
+
+    /// Is this a known, valid pointer encoding?
+    pub fn is_valid_encoding(self) -> bool {
+        if self.is_absent() {
+            return true;
+        }
+
+        match self.format() {
+            DW_EH_PE_absptr | DW_EH_PE_uleb128 | DW_EH_PE_udata2 | DW_EH_PE_udata4
+            | DW_EH_PE_udata8 | DW_EH_PE_sleb128 | DW_EH_PE_sdata2 | DW_EH_PE_sdata4
+            | DW_EH_PE_sdata8 => {}
+            _ => return false,
+        }
+
+        match self.application() {
+            DW_EH_PE_absptr | DW_EH_PE_pcrel | DW_EH_PE_textrel | DW_EH_PE_datarel
+            | DW_EH_PE_funcrel | DW_EH_PE_aligned => {}
+            _ => return false,
+        }
+
+        true
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_dw_eh_pe_format() {
+        let encoding = DwEhPe(DW_EH_PE_pcrel.0 | DW_EH_PE_uleb128.0);
+        assert_eq!(encoding.format(), DW_EH_PE_uleb128);
+    }
+
+    #[test]
+    fn test_dw_eh_pe_application() {
+        let encoding = DwEhPe(DW_EH_PE_pcrel.0 | DW_EH_PE_uleb128.0);
+        assert_eq!(encoding.application(), DW_EH_PE_pcrel);
+    }
+
+    #[test]
+    fn test_dw_eh_pe_is_absent() {
+        assert_eq!(DW_EH_PE_absptr.is_absent(), false);
+        assert_eq!(DW_EH_PE_omit.is_absent(), true);
+    }
+
+    #[test]
+    fn test_dw_eh_pe_is_valid_encoding_ok() {
+        let encoding = DwEhPe(DW_EH_PE_uleb128.0 | DW_EH_PE_pcrel.0);
+        assert!(encoding.is_valid_encoding());
+        assert!(DW_EH_PE_absptr.is_valid_encoding());
+        assert!(DW_EH_PE_omit.is_valid_encoding());
+    }
+
+    #[test]
+    fn test_dw_eh_pe_is_valid_encoding_bad_format() {
+        let encoding = DwEhPe((DW_EH_PE_sdata8.0 + 1) | DW_EH_PE_pcrel.0);
+        assert_eq!(encoding.is_valid_encoding(), false);
+    }
+
+    #[test]
+    fn test_dw_eh_pe_is_valid_encoding_bad_application() {
+        let encoding = DwEhPe(DW_EH_PE_sdata8.0 | (DW_EH_PE_aligned.0 + 1));
+        assert_eq!(encoding.is_valid_encoding(), false);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/endianity.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/endianity.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/endianity.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/endianity.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,256 @@
+//! Types for compile-time and run-time endianity.
+
+use core::convert::TryInto;
+use core::fmt::Debug;
+
+/// A trait describing the endianity of some buffer.
+pub trait Endianity: Debug + Default + Clone + Copy + PartialEq + Eq {
+    /// Return true for big endian byte order.
+    fn is_big_endian(self) -> bool;
+
+    /// Return true for little endian byte order.
+    #[inline]
+    fn is_little_endian(self) -> bool {
+        !self.is_big_endian()
+    }
+
+    /// Reads an unsigned 16 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 2`.
+    #[inline]
+    fn read_u16(self, buf: &[u8]) -> u16 {
+        let bytes: &[u8; 2] = buf[..2].try_into().unwrap();
+        if self.is_big_endian() {
+            u16::from_be_bytes(*bytes)
+        } else {
+            u16::from_le_bytes(*bytes)
+        }
+    }
+
+    /// Reads an unsigned 32 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    #[inline]
+    fn read_u32(self, buf: &[u8]) -> u32 {
+        let bytes: &[u8; 4] = buf[..4].try_into().unwrap();
+        if self.is_big_endian() {
+            u32::from_be_bytes(*bytes)
+        } else {
+            u32::from_le_bytes(*bytes)
+        }
+    }
+
+    /// Reads an unsigned 64 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    #[inline]
+    fn read_u64(self, buf: &[u8]) -> u64 {
+        let bytes: &[u8; 8] = buf[..8].try_into().unwrap();
+        if self.is_big_endian() {
+            u64::from_be_bytes(*bytes)
+        } else {
+            u64::from_le_bytes(*bytes)
+        }
+    }
+
+    /// Read an unsigned n-bytes integer u64.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 1` or `buf.len() > 8`.
+    #[inline]
+    fn read_uint(&mut self, buf: &[u8]) -> u64 {
+        let mut tmp = [0; 8];
+        if self.is_big_endian() {
+            tmp[8 - buf.len()..].copy_from_slice(buf);
+        } else {
+            tmp[..buf.len()].copy_from_slice(buf);
+        }
+        self.read_u64(&tmp)
+    }
+
+    /// Reads a signed 16 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 2`.
+    #[inline]
+    fn read_i16(self, buf: &[u8]) -> i16 {
+        self.read_u16(buf) as i16
+    }
+
+    /// Reads a signed 32 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    #[inline]
+    fn read_i32(self, buf: &[u8]) -> i32 {
+        self.read_u32(buf) as i32
+    }
+
+    /// Reads a signed 64 bit integer from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    #[inline]
+    fn read_i64(self, buf: &[u8]) -> i64 {
+        self.read_u64(buf) as i64
+    }
+
+    /// Reads a 32 bit floating point number from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    #[inline]
+    fn read_f32(self, buf: &[u8]) -> f32 {
+        f32::from_bits(self.read_u32(buf))
+    }
+
+    /// Reads a 32 bit floating point number from `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    #[inline]
+    fn read_f64(self, buf: &[u8]) -> f64 {
+        f64::from_bits(self.read_u64(buf))
+    }
+
+    /// Writes an unsigned 16 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 2`.
+    #[inline]
+    fn write_u16(self, buf: &mut [u8], n: u16) {
+        let bytes = if self.is_big_endian() {
+            n.to_be_bytes()
+        } else {
+            n.to_le_bytes()
+        };
+        buf[..2].copy_from_slice(&bytes);
+    }
+
+    /// Writes an unsigned 32 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 4`.
+    #[inline]
+    fn write_u32(self, buf: &mut [u8], n: u32) {
+        let bytes = if self.is_big_endian() {
+            n.to_be_bytes()
+        } else {
+            n.to_le_bytes()
+        };
+        buf[..4].copy_from_slice(&bytes);
+    }
+
+    /// Writes an unsigned 64 bit integer `n` to `buf`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `buf.len() < 8`.
+    #[inline]
+    fn write_u64(self, buf: &mut [u8], n: u64) {
+        let bytes = if self.is_big_endian() {
+            n.to_be_bytes()
+        } else {
+            n.to_le_bytes()
+        };
+        buf[..8].copy_from_slice(&bytes);
+    }
+}
+
+/// Byte order that is selectable at runtime.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum RunTimeEndian {
+    /// Little endian byte order.
+    Little,
+    /// Big endian byte order.
+    Big,
+}
+
+impl Default for RunTimeEndian {
+    #[cfg(target_endian = "little")]
+    #[inline]
+    fn default() -> RunTimeEndian {
+        RunTimeEndian::Little
+    }
+
+    #[cfg(target_endian = "big")]
+    #[inline]
+    fn default() -> RunTimeEndian {
+        RunTimeEndian::Big
+    }
+}
+
+impl Endianity for RunTimeEndian {
+    #[inline]
+    fn is_big_endian(self) -> bool {
+        self != RunTimeEndian::Little
+    }
+}
+
+/// Little endian byte order.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct LittleEndian;
+
+impl Default for LittleEndian {
+    #[inline]
+    fn default() -> LittleEndian {
+        LittleEndian
+    }
+}
+
+impl Endianity for LittleEndian {
+    #[inline]
+    fn is_big_endian(self) -> bool {
+        false
+    }
+}
+
+/// Big endian byte order.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct BigEndian;
+
+impl Default for BigEndian {
+    #[inline]
+    fn default() -> BigEndian {
+        BigEndian
+    }
+}
+
+impl Endianity for BigEndian {
+    #[inline]
+    fn is_big_endian(self) -> bool {
+        true
+    }
+}
+
+/// The native endianity for the target platform.
+#[cfg(target_endian = "little")]
+pub type NativeEndian = LittleEndian;
+
+#[cfg(target_endian = "little")]
+#[allow(non_upper_case_globals)]
+#[doc(hidden)]
+pub const NativeEndian: LittleEndian = LittleEndian;
+
+/// The native endianity for the target platform.
+#[cfg(target_endian = "big")]
+pub type NativeEndian = BigEndian;
+
+#[cfg(target_endian = "big")]
+#[allow(non_upper_case_globals)]
+#[doc(hidden)]
+pub const NativeEndian: BigEndian = BigEndian;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/leb128.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/leb128.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/leb128.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/leb128.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,602 @@
+//! Read and write DWARF's "Little Endian Base 128" (LEB128) variable length
+//! integer encoding.
+//!
+//! The implementation is a direct translation of the psuedocode in the DWARF 4
+//! standard's appendix C.
+//!
+//! Read and write signed integers:
+//!
+//! ```
+//! # #[cfg(all(feature = "read", feature = "write"))] {
+//! use gimli::{EndianSlice, NativeEndian, leb128};
+//!
+//! let mut buf = [0; 1024];
+//!
+//! // Write to anything that implements `std::io::Write`.
+//! {
+//!     let mut writable = &mut buf[..];
+//!     leb128::write::signed(&mut writable, -12345).expect("Should write number");
+//! }
+//!
+//! // Read from anything that implements `gimli::Reader`.
+//! let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+//! let val = leb128::read::signed(&mut readable).expect("Should read number");
+//! assert_eq!(val, -12345);
+//! # }
+//! ```
+//!
+//! Or read and write unsigned integers:
+//!
+//! ```
+//! # #[cfg(all(feature = "read", feature = "write"))] {
+//! use gimli::{EndianSlice, NativeEndian, leb128};
+//!
+//! let mut buf = [0; 1024];
+//!
+//! {
+//!     let mut writable = &mut buf[..];
+//!     leb128::write::unsigned(&mut writable, 98765).expect("Should write number");
+//! }
+//!
+//! let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+//! let val = leb128::read::unsigned(&mut readable).expect("Should read number");
+//! assert_eq!(val, 98765);
+//! # }
+//! ```
+
+const CONTINUATION_BIT: u8 = 1 << 7;
+#[cfg(feature = "read")]
+const SIGN_BIT: u8 = 1 << 6;
+
+#[inline]
+fn low_bits_of_byte(byte: u8) -> u8 {
+    byte & !CONTINUATION_BIT
+}
+
+#[inline]
+#[allow(dead_code)]
+fn low_bits_of_u64(val: u64) -> u8 {
+    let byte = val & u64::from(core::u8::MAX);
+    low_bits_of_byte(byte as u8)
+}
+
+/// A module for reading signed and unsigned integers that have been LEB128
+/// encoded.
+#[cfg(feature = "read")]
+pub mod read {
+    use super::{low_bits_of_byte, CONTINUATION_BIT, SIGN_BIT};
+    use crate::read::{Error, Reader, Result};
+
+    /// Read an unsigned LEB128 number from the given `Reader` and
+    /// return it or an error if reading failed.
+    pub fn unsigned<R: Reader>(r: &mut R) -> Result<u64> {
+        let mut result = 0;
+        let mut shift = 0;
+
+        loop {
+            let byte = r.read_u8()?;
+            if shift == 63 && byte != 0x00 && byte != 0x01 {
+                return Err(Error::BadUnsignedLeb128);
+            }
+
+            let low_bits = u64::from(low_bits_of_byte(byte));
+            result |= low_bits << shift;
+
+            if byte & CONTINUATION_BIT == 0 {
+                return Ok(result);
+            }
+
+            shift += 7;
+        }
+    }
+
+    /// Read an LEB128 u16 from the given `Reader` and
+    /// return it or an error if reading failed.
+    pub fn u16<R: Reader>(r: &mut R) -> Result<u16> {
+        let byte = r.read_u8()?;
+        let mut result = u16::from(low_bits_of_byte(byte));
+        if byte & CONTINUATION_BIT == 0 {
+            return Ok(result);
+        }
+
+        let byte = r.read_u8()?;
+        result |= u16::from(low_bits_of_byte(byte)) << 7;
+        if byte & CONTINUATION_BIT == 0 {
+            return Ok(result);
+        }
+
+        let byte = r.read_u8()?;
+        if byte > 0x03 {
+            return Err(Error::BadUnsignedLeb128);
+        }
+        result += u16::from(byte) << 14;
+        Ok(result)
+    }
+
+    /// Read a signed LEB128 number from the given `Reader` and
+    /// return it or an error if reading failed.
+    pub fn signed<R: Reader>(r: &mut R) -> Result<i64> {
+        let mut result = 0;
+        let mut shift = 0;
+        let size = 64;
+        let mut byte;
+
+        loop {
+            byte = r.read_u8()?;
+            if shift == 63 && byte != 0x00 && byte != 0x7f {
+                return Err(Error::BadSignedLeb128);
+            }
+
+            let low_bits = i64::from(low_bits_of_byte(byte));
+            result |= low_bits << shift;
+            shift += 7;
+
+            if byte & CONTINUATION_BIT == 0 {
+                break;
+            }
+        }
+
+        if shift < size && (SIGN_BIT & byte) == SIGN_BIT {
+            // Sign extend the result.
+            result |= !0 << shift;
+        }
+
+        Ok(result)
+    }
+}
+
+/// A module for writing integers encoded as LEB128.
+#[cfg(feature = "write")]
+pub mod write {
+    use super::{low_bits_of_u64, CONTINUATION_BIT};
+    use std::io;
+
+    /// Write the given unsigned number using the LEB128 encoding to the given
+    /// `std::io::Write`able. Returns the number of bytes written to `w`, or an
+    /// error if writing failed.
+    pub fn unsigned<W>(w: &mut W, mut val: u64) -> Result<usize, io::Error>
+    where
+        W: io::Write,
+    {
+        let mut bytes_written = 0;
+        loop {
+            let mut byte = low_bits_of_u64(val);
+            val >>= 7;
+            if val != 0 {
+                // More bytes to come, so set the continuation bit.
+                byte |= CONTINUATION_BIT;
+            }
+
+            let buf = [byte];
+            w.write_all(&buf)?;
+            bytes_written += 1;
+
+            if val == 0 {
+                return Ok(bytes_written);
+            }
+        }
+    }
+
+    /// Return the size of the LEB128 encoding of the given unsigned number.
+    pub fn uleb128_size(mut val: u64) -> usize {
+        let mut size = 0;
+        loop {
+            val >>= 7;
+            size += 1;
+            if val == 0 {
+                return size;
+            }
+        }
+    }
+
+    /// Write the given signed number using the LEB128 encoding to the given
+    /// `std::io::Write`able. Returns the number of bytes written to `w`, or an
+    /// error if writing failed.
+    pub fn signed<W>(w: &mut W, mut val: i64) -> Result<usize, io::Error>
+    where
+        W: io::Write,
+    {
+        let mut bytes_written = 0;
+        loop {
+            let mut byte = val as u8;
+            // Keep the sign bit for testing
+            val >>= 6;
+            let done = val == 0 || val == -1;
+            if done {
+                byte &= !CONTINUATION_BIT;
+            } else {
+                // Remove the sign bit
+                val >>= 1;
+                // More bytes to come, so set the continuation bit.
+                byte |= CONTINUATION_BIT;
+            }
+
+            let buf = [byte];
+            w.write_all(&buf)?;
+            bytes_written += 1;
+
+            if done {
+                return Ok(bytes_written);
+            }
+        }
+    }
+
+    /// Return the size of the LEB128 encoding of the given signed number.
+    pub fn sleb128_size(mut val: i64) -> usize {
+        let mut size = 0;
+        loop {
+            val >>= 6;
+            let done = val == 0 || val == -1;
+            val >>= 1;
+            size += 1;
+            if done {
+                return size;
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+#[cfg(all(feature = "read", feature = "write"))]
+mod tests {
+    use super::{low_bits_of_byte, low_bits_of_u64, read, write, CONTINUATION_BIT};
+    use crate::endianity::NativeEndian;
+    use crate::read::{EndianSlice, Error, ReaderOffsetId};
+
+    trait ResultExt {
+        fn map_eof(self, input: &[u8]) -> Self;
+    }
+
+    impl<T> ResultExt for Result<T, Error> {
+        fn map_eof(self, input: &[u8]) -> Self {
+            match self {
+                Err(Error::UnexpectedEof(id)) => {
+                    let id = ReaderOffsetId(id.0 - input.as_ptr() as u64);
+                    Err(Error::UnexpectedEof(id))
+                }
+                r => r,
+            }
+        }
+    }
+
+    #[test]
+    fn test_low_bits_of_byte() {
+        for i in 0..127 {
+            assert_eq!(i, low_bits_of_byte(i));
+            assert_eq!(i, low_bits_of_byte(i | CONTINUATION_BIT));
+        }
+    }
+
+    #[test]
+    fn test_low_bits_of_u64() {
+        for i in 0u64..127 {
+            assert_eq!(i as u8, low_bits_of_u64(1 << 16 | i));
+            assert_eq!(
+                i as u8,
+                low_bits_of_u64(i << 16 | i | (u64::from(CONTINUATION_BIT)))
+            );
+        }
+    }
+
+    // Examples from the DWARF 4 standard, section 7.6, figure 22.
+    #[test]
+    fn test_read_unsigned() {
+        let buf = [2u8];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            2,
+            read::unsigned(&mut readable).expect("Should read number")
+        );
+
+        let buf = [127u8];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            127,
+            read::unsigned(&mut readable).expect("Should read number")
+        );
+
+        let buf = [CONTINUATION_BIT, 1];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            128,
+            read::unsigned(&mut readable).expect("Should read number")
+        );
+
+        let buf = [1u8 | CONTINUATION_BIT, 1];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            129,
+            read::unsigned(&mut readable).expect("Should read number")
+        );
+
+        let buf = [2u8 | CONTINUATION_BIT, 1];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            130,
+            read::unsigned(&mut readable).expect("Should read number")
+        );
+
+        let buf = [57u8 | CONTINUATION_BIT, 100];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            12857,
+            read::unsigned(&mut readable).expect("Should read number")
+        );
+    }
+
+    // Examples from the DWARF 4 standard, section 7.6, figure 23.
+    #[test]
+    fn test_read_signed() {
+        let buf = [2u8];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(2, read::signed(&mut readable).expect("Should read number"));
+
+        let buf = [0x7eu8];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(-2, read::signed(&mut readable).expect("Should read number"));
+
+        let buf = [127u8 | CONTINUATION_BIT, 0];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            127,
+            read::signed(&mut readable).expect("Should read number")
+        );
+
+        let buf = [1u8 | CONTINUATION_BIT, 0x7f];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            -127,
+            read::signed(&mut readable).expect("Should read number")
+        );
+
+        let buf = [CONTINUATION_BIT, 1];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            128,
+            read::signed(&mut readable).expect("Should read number")
+        );
+
+        let buf = [CONTINUATION_BIT, 0x7f];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            -128,
+            read::signed(&mut readable).expect("Should read number")
+        );
+
+        let buf = [1u8 | CONTINUATION_BIT, 1];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            129,
+            read::signed(&mut readable).expect("Should read number")
+        );
+
+        let buf = [0x7fu8 | CONTINUATION_BIT, 0x7e];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            -129,
+            read::signed(&mut readable).expect("Should read number")
+        );
+    }
+
+    #[test]
+    fn test_read_signed_63_bits() {
+        let buf = [
+            CONTINUATION_BIT,
+            CONTINUATION_BIT,
+            CONTINUATION_BIT,
+            CONTINUATION_BIT,
+            CONTINUATION_BIT,
+            CONTINUATION_BIT,
+            CONTINUATION_BIT,
+            CONTINUATION_BIT,
+            0x40,
+        ];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            -0x4000_0000_0000_0000,
+            read::signed(&mut readable).expect("Should read number")
+        );
+    }
+
+    #[test]
+    fn test_read_unsigned_not_enough_data() {
+        let buf = [CONTINUATION_BIT];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            read::unsigned(&mut readable).map_eof(&buf),
+            Err(Error::UnexpectedEof(ReaderOffsetId(1)))
+        );
+    }
+
+    #[test]
+    fn test_read_signed_not_enough_data() {
+        let buf = [CONTINUATION_BIT];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            read::signed(&mut readable).map_eof(&buf),
+            Err(Error::UnexpectedEof(ReaderOffsetId(1)))
+        );
+    }
+
+    #[test]
+    fn test_write_unsigned_not_enough_space() {
+        let mut buf = [0; 1];
+        let mut writable = &mut buf[..];
+        match write::unsigned(&mut writable, 128) {
+            Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::WriteZero),
+            otherwise => panic!("Unexpected: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_write_signed_not_enough_space() {
+        let mut buf = [0; 1];
+        let mut writable = &mut buf[..];
+        match write::signed(&mut writable, 128) {
+            Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::WriteZero),
+            otherwise => panic!("Unexpected: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn dogfood_signed() {
+        fn inner(i: i64) {
+            let mut buf = [0u8; 1024];
+
+            {
+                let mut writable = &mut buf[..];
+                write::signed(&mut writable, i).expect("Should write signed number");
+            }
+
+            let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+            let result = read::signed(&mut readable).expect("Should be able to read it back again");
+            assert_eq!(i, result);
+        }
+        for i in -513..513 {
+            inner(i);
+        }
+        inner(core::i64::MIN);
+    }
+
+    #[test]
+    fn dogfood_unsigned() {
+        for i in 0..1025 {
+            let mut buf = [0u8; 1024];
+
+            {
+                let mut writable = &mut buf[..];
+                write::unsigned(&mut writable, i).expect("Should write signed number");
+            }
+
+            let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+            let result =
+                read::unsigned(&mut readable).expect("Should be able to read it back again");
+            assert_eq!(i, result);
+        }
+    }
+
+    #[test]
+    fn test_read_unsigned_overflow() {
+        let buf = [
+            2u8 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            1,
+        ];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert!(read::unsigned(&mut readable).is_err());
+    }
+
+    #[test]
+    fn test_read_signed_overflow() {
+        let buf = [
+            2u8 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            2 | CONTINUATION_BIT,
+            1,
+        ];
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert!(read::signed(&mut readable).is_err());
+    }
+
+    #[test]
+    fn test_read_multiple() {
+        let buf = [2u8 | CONTINUATION_BIT, 1u8, 1u8];
+
+        let mut readable = EndianSlice::new(&buf[..], NativeEndian);
+        assert_eq!(
+            read::unsigned(&mut readable).expect("Should read first number"),
+            130u64
+        );
+        assert_eq!(
+            read::unsigned(&mut readable).expect("Should read first number"),
+            1u64
+        );
+    }
+
+    #[test]
+    fn test_read_u16() {
+        for (buf, val) in [
+            (&[2][..], 2),
+            (&[0x7f][..], 0x7f),
+            (&[0x80, 1][..], 0x80),
+            (&[0x81, 1][..], 0x81),
+            (&[0x82, 1][..], 0x82),
+            (&[0xff, 0x7f][..], 0x3fff),
+            (&[0x80, 0x80, 1][..], 0x4000),
+            (&[0xff, 0xff, 1][..], 0x7fff),
+            (&[0xff, 0xff, 3][..], 0xffff),
+        ]
+        .iter()
+        {
+            let mut readable = EndianSlice::new(buf, NativeEndian);
+            assert_eq!(*val, read::u16(&mut readable).expect("Should read number"));
+        }
+
+        for buf in [
+            &[0x80][..],
+            &[0x80, 0x80][..],
+            &[0x80, 0x80, 4][..],
+            &[0x80, 0x80, 0x80, 3][..],
+        ]
+        .iter()
+        {
+            let mut readable = EndianSlice::new(buf, NativeEndian);
+            assert!(read::u16(&mut readable).is_err(), "{:?}", buf);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,75 @@
+//! `gimli` is a library for reading and writing the
+//! [DWARF debugging format](http://dwarfstd.org/).
+//!
+//! See the [read](./read/index.html) and [write](./write/index.html) modules
+//! for examples and API documentation.
+//!
+//! ## Cargo Features
+//!
+//! Cargo features that can be enabled with `gimli`:
+//!
+//! * `std`: Enabled by default. Use the `std` library. Disabling this feature
+//! allows using `gimli` in embedded environments that do not have access to
+//! `std`. Note that even when `std` is disabled, `gimli` still requires an
+//! implementation of the `alloc` crate.
+//!
+//! * `read`: Enabled by default. Enables the `read` module. Use of `std` is
+//! optional.
+//!
+//! * `write`: Enabled by default. Enables the `write` module. Always uses
+//! the `std` library.
+#![deny(missing_docs)]
+#![deny(missing_debug_implementations)]
+// Selectively enable rust 2018 warnings
+#![warn(bare_trait_objects)]
+#![warn(unused_extern_crates)]
+#![warn(ellipsis_inclusive_range_patterns)]
+//#![warn(elided_lifetimes_in_paths)]
+#![warn(explicit_outlives_requirements)]
+// Allow clippy warnings when we aren't building with clippy.
+#![allow(unknown_lints)]
+// False positives with `fallible_iterator`.
+#![allow(clippy::should_implement_trait)]
+// Many false positives involving `continue`.
+#![allow(clippy::never_loop)]
+// False positives when block expressions are used inside an assertion.
+#![allow(clippy::panic_params)]
+#![no_std]
+
+#[allow(unused_imports)]
+#[macro_use]
+extern crate alloc;
+
+#[cfg(any(feature = "std", feature = "write"))]
+#[macro_use]
+extern crate std;
+
+#[cfg(feature = "stable_deref_trait")]
+pub use stable_deref_trait::{CloneStableDeref, StableDeref};
+
+mod common;
+pub use crate::common::*;
+
+mod arch;
+pub use crate::arch::*;
+
+pub mod constants;
+// For backwards compat.
+pub use crate::constants::*;
+
+mod endianity;
+pub use crate::endianity::{BigEndian, Endianity, LittleEndian, NativeEndian, RunTimeEndian};
+
+pub mod leb128;
+
+#[cfg(feature = "read")]
+pub mod read;
+// For backwards compat.
+#[cfg(feature = "read")]
+pub use crate::read::*;
+
+#[cfg(feature = "write")]
+pub mod write;
+
+#[cfg(test)]
+mod test_util;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/abbrev.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/abbrev.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/abbrev.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/abbrev.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,965 @@
+//! Functions for parsing DWARF debugging abbreviations.
+
+use alloc::collections::btree_map;
+use alloc::vec::Vec;
+use core::convert::TryFrom;
+use core::fmt::{self, Debug};
+use core::iter::FromIterator;
+use core::ops::Deref;
+
+use crate::common::{DebugAbbrevOffset, SectionId};
+use crate::constants;
+use crate::endianity::Endianity;
+use crate::read::{EndianSlice, Error, Reader, Result, Section, UnitHeader};
+
+/// The `DebugAbbrev` struct represents the abbreviations describing
+/// `DebuggingInformationEntry`s' attribute names and forms found in the
+/// `.debug_abbrev` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugAbbrev<R> {
+    debug_abbrev_section: R,
+}
+
+impl<'input, Endian> DebugAbbrev<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugAbbrev` instance from the data in the `.debug_abbrev`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_abbrev` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugAbbrev, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_abbrev_section_somehow = || &buf;
+    /// let debug_abbrev = DebugAbbrev::new(read_debug_abbrev_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(debug_abbrev_section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(debug_abbrev_section, endian))
+    }
+}
+
+impl<R: Reader> DebugAbbrev<R> {
+    /// Parse the abbreviations at the given `offset` within this
+    /// `.debug_abbrev` section.
+    ///
+    /// The `offset` should generally be retrieved from a unit header.
+    pub fn abbreviations(
+        &self,
+        debug_abbrev_offset: DebugAbbrevOffset<R::Offset>,
+    ) -> Result<Abbreviations> {
+        let input = &mut self.debug_abbrev_section.clone();
+        input.skip(debug_abbrev_offset.0)?;
+        Abbreviations::parse(input)
+    }
+}
+
+impl<T> DebugAbbrev<T> {
+    /// Create a `DebugAbbrev` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugAbbrev<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugAbbrev<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.debug_abbrev_section).into()
+    }
+}
+
+impl<R> Section<R> for DebugAbbrev<R> {
+    fn id() -> SectionId {
+        SectionId::DebugAbbrev
+    }
+
+    fn reader(&self) -> &R {
+        &self.debug_abbrev_section
+    }
+}
+
+impl<R> From<R> for DebugAbbrev<R> {
+    fn from(debug_abbrev_section: R) -> Self {
+        DebugAbbrev {
+            debug_abbrev_section,
+        }
+    }
+}
+
+/// A set of type abbreviations.
+///
+/// Construct an `Abbreviations` instance with the
+/// [`abbreviations()`](struct.UnitHeader.html#method.abbreviations)
+/// method.
+#[derive(Debug, Default, Clone)]
+pub struct Abbreviations {
+    vec: Vec<Abbreviation>,
+    map: btree_map::BTreeMap<u64, Abbreviation>,
+}
+
+impl Abbreviations {
+    /// Construct a new, empty set of abbreviations.
+    fn empty() -> Abbreviations {
+        Abbreviations {
+            vec: Vec::new(),
+            map: btree_map::BTreeMap::new(),
+        }
+    }
+
+    /// Insert an abbreviation into the set.
+    ///
+    /// Returns `Ok` if it is the first abbreviation in the set with its code,
+    /// `Err` if the code is a duplicate and there already exists an
+    /// abbreviation in the set with the given abbreviation's code.
+    fn insert(&mut self, abbrev: Abbreviation) -> ::core::result::Result<(), ()> {
+        let code_usize = abbrev.code as usize;
+        if code_usize as u64 == abbrev.code {
+            // Optimize for sequential abbreviation codes by storing them
+            // in a Vec, as long as the map doesn't already contain them.
+            // A potential further optimization would be to allow some
+            // holes in the Vec, but there's no need for that yet.
+            if code_usize - 1 < self.vec.len() {
+                return Err(());
+            } else if code_usize - 1 == self.vec.len() {
+                if !self.map.is_empty() && self.map.contains_key(&abbrev.code) {
+                    return Err(());
+                } else {
+                    self.vec.push(abbrev);
+                    return Ok(());
+                }
+            }
+        }
+        match self.map.entry(abbrev.code) {
+            btree_map::Entry::Occupied(_) => Err(()),
+            btree_map::Entry::Vacant(entry) => {
+                entry.insert(abbrev);
+                Ok(())
+            }
+        }
+    }
+
+    /// Get the abbreviation associated with the given code.
+    #[inline]
+    pub fn get(&self, code: u64) -> Option<&Abbreviation> {
+        if let Ok(code) = usize::try_from(code) {
+            let index = code.checked_sub(1)?;
+            if index < self.vec.len() {
+                return Some(&self.vec[index]);
+            }
+        }
+
+        self.map.get(&code)
+    }
+
+    /// Parse a series of abbreviations, terminated by a null abbreviation.
+    fn parse<R: Reader>(input: &mut R) -> Result<Abbreviations> {
+        let mut abbrevs = Abbreviations::empty();
+
+        while let Some(abbrev) = Abbreviation::parse(input)? {
+            if abbrevs.insert(abbrev).is_err() {
+                return Err(Error::DuplicateAbbreviationCode);
+            }
+        }
+
+        Ok(abbrevs)
+    }
+}
+
+/// An abbreviation describes the shape of a `DebuggingInformationEntry`'s type:
+/// its code, tag type, whether it has children, and its set of attributes.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Abbreviation {
+    code: u64,
+    tag: constants::DwTag,
+    has_children: constants::DwChildren,
+    attributes: Attributes,
+}
+
+impl Abbreviation {
+    /// Construct a new `Abbreviation`.
+    ///
+    /// ### Panics
+    ///
+    /// Panics if `code` is `0`.
+    pub(crate) fn new(
+        code: u64,
+        tag: constants::DwTag,
+        has_children: constants::DwChildren,
+        attributes: Attributes,
+    ) -> Abbreviation {
+        assert_ne!(code, 0);
+        Abbreviation {
+            code,
+            tag,
+            has_children,
+            attributes,
+        }
+    }
+
+    /// Get this abbreviation's code.
+    #[inline]
+    pub fn code(&self) -> u64 {
+        self.code
+    }
+
+    /// Get this abbreviation's tag.
+    #[inline]
+    pub fn tag(&self) -> constants::DwTag {
+        self.tag
+    }
+
+    /// Return true if this abbreviation's type has children, false otherwise.
+    #[inline]
+    pub fn has_children(&self) -> bool {
+        self.has_children == constants::DW_CHILDREN_yes
+    }
+
+    /// Get this abbreviation's attributes.
+    #[inline]
+    pub fn attributes(&self) -> &[AttributeSpecification] {
+        &self.attributes[..]
+    }
+
+    /// Parse an abbreviation's tag.
+    fn parse_tag<R: Reader>(input: &mut R) -> Result<constants::DwTag> {
+        let val = input.read_uleb128_u16()?;
+        if val == 0 {
+            Err(Error::AbbreviationTagZero)
+        } else {
+            Ok(constants::DwTag(val))
+        }
+    }
+
+    /// Parse an abbreviation's "does the type have children?" byte.
+    fn parse_has_children<R: Reader>(input: &mut R) -> Result<constants::DwChildren> {
+        let val = input.read_u8()?;
+        let val = constants::DwChildren(val);
+        if val == constants::DW_CHILDREN_no || val == constants::DW_CHILDREN_yes {
+            Ok(val)
+        } else {
+            Err(Error::BadHasChildren)
+        }
+    }
+
+    /// Parse a series of attribute specifications, terminated by a null attribute
+    /// specification.
+    fn parse_attributes<R: Reader>(input: &mut R) -> Result<Attributes> {
+        let mut attrs = Attributes::new();
+
+        while let Some(attr) = AttributeSpecification::parse(input)? {
+            attrs.push(attr);
+        }
+
+        Ok(attrs)
+    }
+
+    /// Parse an abbreviation. Return `None` for the null abbreviation, `Some`
+    /// for an actual abbreviation.
+    fn parse<R: Reader>(input: &mut R) -> Result<Option<Abbreviation>> {
+        let code = input.read_uleb128()?;
+        if code == 0 {
+            return Ok(None);
+        }
+
+        let tag = Self::parse_tag(input)?;
+        let has_children = Self::parse_has_children(input)?;
+        let attributes = Self::parse_attributes(input)?;
+        let abbrev = Abbreviation::new(code, tag, has_children, attributes);
+        Ok(Some(abbrev))
+    }
+}
+
+/// A list of attributes found in an `Abbreviation`
+#[derive(Clone)]
+pub(crate) enum Attributes {
+    Inline {
+        buf: [AttributeSpecification; MAX_ATTRIBUTES_INLINE],
+        len: usize,
+    },
+    Heap(Vec<AttributeSpecification>),
+}
+
+// Length of 5 based on benchmark results for both x86-64 and i686.
+const MAX_ATTRIBUTES_INLINE: usize = 5;
+
+impl Attributes {
+    /// Returns a new empty list of attributes
+    fn new() -> Attributes {
+        let default =
+            AttributeSpecification::new(constants::DW_AT_null, constants::DW_FORM_null, None);
+        Attributes::Inline {
+            buf: [default; 5],
+            len: 0,
+        }
+    }
+
+    /// Pushes a new value onto this list of attributes.
+    fn push(&mut self, attr: AttributeSpecification) {
+        match self {
+            Attributes::Heap(list) => return list.push(attr),
+            Attributes::Inline {
+                buf,
+                len: MAX_ATTRIBUTES_INLINE,
+            } => {
+                let mut list = buf.to_vec();
+                list.push(attr);
+                *self = Attributes::Heap(list);
+            }
+            Attributes::Inline { buf, len } => {
+                buf[*len] = attr;
+                *len += 1;
+            }
+        }
+    }
+}
+
+impl Debug for Attributes {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (&**self).fmt(f)
+    }
+}
+
+impl PartialEq for Attributes {
+    fn eq(&self, other: &Attributes) -> bool {
+        &**self == &**other
+    }
+}
+
+impl Eq for Attributes {}
+
+impl Deref for Attributes {
+    type Target = [AttributeSpecification];
+    fn deref(&self) -> &[AttributeSpecification] {
+        match self {
+            Attributes::Inline { buf, len } => &buf[..*len],
+            Attributes::Heap(list) => list,
+        }
+    }
+}
+
+impl FromIterator<AttributeSpecification> for Attributes {
+    fn from_iter<I>(iter: I) -> Attributes
+    where
+        I: IntoIterator<Item = AttributeSpecification>,
+    {
+        let mut list = Attributes::new();
+        for item in iter {
+            list.push(item);
+        }
+        return list;
+    }
+}
+
+impl From<Vec<AttributeSpecification>> for Attributes {
+    fn from(list: Vec<AttributeSpecification>) -> Attributes {
+        Attributes::Heap(list)
+    }
+}
+
+/// The description of an attribute in an abbreviated type. It is a pair of name
+/// and form.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct AttributeSpecification {
+    name: constants::DwAt,
+    form: constants::DwForm,
+    implicit_const_value: i64,
+}
+
+impl AttributeSpecification {
+    /// Construct a new `AttributeSpecification` from the given name and form
+    /// and implicit const value.
+    #[inline]
+    pub fn new(
+        name: constants::DwAt,
+        form: constants::DwForm,
+        implicit_const_value: Option<i64>,
+    ) -> AttributeSpecification {
+        debug_assert!(
+            (form == constants::DW_FORM_implicit_const && implicit_const_value.is_some())
+                || (form != constants::DW_FORM_implicit_const && implicit_const_value.is_none())
+        );
+        AttributeSpecification {
+            name,
+            form,
+            implicit_const_value: implicit_const_value.unwrap_or(0),
+        }
+    }
+
+    /// Get the attribute's name.
+    #[inline]
+    pub fn name(&self) -> constants::DwAt {
+        self.name
+    }
+
+    /// Get the attribute's form.
+    #[inline]
+    pub fn form(&self) -> constants::DwForm {
+        self.form
+    }
+
+    /// Get the attribute's implicit const value.
+    #[inline]
+    pub fn implicit_const_value(&self) -> Option<i64> {
+        if self.form == constants::DW_FORM_implicit_const {
+            Some(self.implicit_const_value)
+        } else {
+            None
+        }
+    }
+
+    /// Return the size of the attribute, in bytes.
+    ///
+    /// Note that because some attributes are variably sized, the size cannot
+    /// always be known without parsing, in which case we return `None`.
+    pub fn size<R: Reader>(&self, header: &UnitHeader<R>) -> Option<usize> {
+        match self.form {
+            constants::DW_FORM_addr => Some(header.address_size() as usize),
+
+            constants::DW_FORM_implicit_const => Some(0),
+
+            constants::DW_FORM_flag |
+            constants::DW_FORM_flag_present |
+            constants::DW_FORM_data1 |
+            constants::DW_FORM_ref1 => Some(1),
+
+            constants::DW_FORM_data2 |
+            constants::DW_FORM_ref2 => Some(2),
+
+            constants::DW_FORM_data4 |
+            constants::DW_FORM_ref4 => Some(4),
+
+            constants::DW_FORM_data8 |
+            constants::DW_FORM_ref8 => Some(8),
+
+            constants::DW_FORM_sec_offset |
+            constants::DW_FORM_ref_addr |
+            constants::DW_FORM_ref_sig8 |
+            constants::DW_FORM_strp => Some(header.format().word_size() as usize),
+
+            // Variably sized forms.
+            constants::DW_FORM_block |
+            constants::DW_FORM_block1 |
+            constants::DW_FORM_block2 |
+            constants::DW_FORM_block4 |
+            constants::DW_FORM_exprloc |
+            constants::DW_FORM_ref_udata |
+            constants::DW_FORM_string |
+            constants::DW_FORM_sdata |
+            constants::DW_FORM_udata |
+            constants::DW_FORM_indirect |
+
+            // We don't know the size of unknown forms.
+            _ => None,
+        }
+    }
+
+    /// Parse an attribute's form.
+    fn parse_form<R: Reader>(input: &mut R) -> Result<constants::DwForm> {
+        let val = input.read_uleb128_u16()?;
+        if val == 0 {
+            Err(Error::AttributeFormZero)
+        } else {
+            Ok(constants::DwForm(val))
+        }
+    }
+
+    /// Parse an attribute specification. Returns `None` for the null attribute
+    /// specification, `Some` for an actual attribute specification.
+    fn parse<R: Reader>(input: &mut R) -> Result<Option<AttributeSpecification>> {
+        let name = input.read_uleb128_u16()?;
+        if name == 0 {
+            // Parse the null attribute specification.
+            let form = input.read_uleb128_u16()?;
+            return if form == 0 {
+                Ok(None)
+            } else {
+                Err(Error::ExpectedZero)
+            };
+        }
+
+        let name = constants::DwAt(name);
+        let form = Self::parse_form(input)?;
+        let implicit_const_value = if form == constants::DW_FORM_implicit_const {
+            Some(input.read_sleb128()?)
+        } else {
+            None
+        };
+        let spec = AttributeSpecification::new(name, form, implicit_const_value);
+        Ok(Some(spec))
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+    use crate::constants;
+    use crate::endianity::LittleEndian;
+    use crate::read::{EndianSlice, Error};
+    use crate::test_util::GimliSectionMethods;
+    #[cfg(target_pointer_width = "32")]
+    use core::u32;
+    use test_assembler::Section;
+
+    pub trait AbbrevSectionMethods {
+        fn abbrev(self, code: u64, tag: constants::DwTag, children: constants::DwChildren) -> Self;
+        fn abbrev_null(self) -> Self;
+        fn abbrev_attr(self, name: constants::DwAt, form: constants::DwForm) -> Self;
+        fn abbrev_attr_implicit_const(self, name: constants::DwAt, value: i64) -> Self;
+        fn abbrev_attr_null(self) -> Self;
+    }
+
+    impl AbbrevSectionMethods for Section {
+        fn abbrev(self, code: u64, tag: constants::DwTag, children: constants::DwChildren) -> Self {
+            self.uleb(code).uleb(tag.0.into()).D8(children.0)
+        }
+
+        fn abbrev_null(self) -> Self {
+            self.D8(0)
+        }
+
+        fn abbrev_attr(self, name: constants::DwAt, form: constants::DwForm) -> Self {
+            self.uleb(name.0.into()).uleb(form.0.into())
+        }
+
+        fn abbrev_attr_implicit_const(self, name: constants::DwAt, value: i64) -> Self {
+            self.uleb(name.0.into())
+                .uleb(constants::DW_FORM_implicit_const.0.into())
+                .sleb(value)
+        }
+
+        fn abbrev_attr_null(self) -> Self {
+            self.D8(0).D8(0)
+        }
+    }
+
+    #[test]
+    fn test_debug_abbrev_ok() {
+        let extra_start = [1, 2, 3, 4];
+        let expected_rest = [5, 6, 7, 8];
+        #[rustfmt::skip]
+        let buf = Section::new()
+            .append_bytes(&extra_start)
+            .abbrev(2, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
+                .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_string)
+                .abbrev_attr_null()
+            .abbrev(1, constants::DW_TAG_compile_unit, constants::DW_CHILDREN_yes)
+                .abbrev_attr(constants::DW_AT_producer, constants::DW_FORM_strp)
+                .abbrev_attr(constants::DW_AT_language, constants::DW_FORM_data2)
+                .abbrev_attr_null()
+            .abbrev_null()
+            .append_bytes(&expected_rest)
+            .get_contents()
+            .unwrap();
+
+        let abbrev1 = Abbreviation::new(
+            1,
+            constants::DW_TAG_compile_unit,
+            constants::DW_CHILDREN_yes,
+            vec![
+                AttributeSpecification::new(
+                    constants::DW_AT_producer,
+                    constants::DW_FORM_strp,
+                    None,
+                ),
+                AttributeSpecification::new(
+                    constants::DW_AT_language,
+                    constants::DW_FORM_data2,
+                    None,
+                ),
+            ]
+            .into(),
+        );
+
+        let abbrev2 = Abbreviation::new(
+            2,
+            constants::DW_TAG_subprogram,
+            constants::DW_CHILDREN_no,
+            vec![AttributeSpecification::new(
+                constants::DW_AT_name,
+                constants::DW_FORM_string,
+                None,
+            )]
+            .into(),
+        );
+
+        let debug_abbrev = DebugAbbrev::new(&buf, LittleEndian);
+        let debug_abbrev_offset = DebugAbbrevOffset(extra_start.len());
+        let abbrevs = debug_abbrev
+            .abbreviations(debug_abbrev_offset)
+            .expect("Should parse abbreviations");
+        assert_eq!(abbrevs.get(1), Some(&abbrev1));
+        assert_eq!(abbrevs.get(2), Some(&abbrev2));
+    }
+
+    #[test]
+    fn test_abbreviations_insert() {
+        fn abbrev(code: u16) -> Abbreviation {
+            Abbreviation::new(
+                code.into(),
+                constants::DwTag(code),
+                constants::DW_CHILDREN_no,
+                vec![].into(),
+            )
+        }
+
+        fn assert_abbrev(abbrevs: &Abbreviations, code: u16) {
+            let abbrev = abbrevs.get(code.into()).unwrap();
+            assert_eq!(abbrev.tag(), constants::DwTag(code));
+        }
+
+        // Sequential insert.
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs.insert(abbrev(1)).unwrap();
+        abbrevs.insert(abbrev(2)).unwrap();
+        assert_eq!(abbrevs.vec.len(), 2);
+        assert!(abbrevs.map.is_empty());
+        assert_abbrev(&abbrevs, 1);
+        assert_abbrev(&abbrevs, 2);
+
+        // Out of order insert.
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs.insert(abbrev(2)).unwrap();
+        abbrevs.insert(abbrev(3)).unwrap();
+        assert!(abbrevs.vec.is_empty());
+        assert_abbrev(&abbrevs, 2);
+        assert_abbrev(&abbrevs, 3);
+
+        // Mixed order insert.
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs.insert(abbrev(1)).unwrap();
+        abbrevs.insert(abbrev(3)).unwrap();
+        abbrevs.insert(abbrev(2)).unwrap();
+        assert_eq!(abbrevs.vec.len(), 2);
+        assert_abbrev(&abbrevs, 1);
+        assert_abbrev(&abbrevs, 2);
+        assert_abbrev(&abbrevs, 3);
+
+        // Duplicate code in vec.
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs.insert(abbrev(1)).unwrap();
+        abbrevs.insert(abbrev(2)).unwrap();
+        assert_eq!(abbrevs.insert(abbrev(1)), Err(()));
+        assert_eq!(abbrevs.insert(abbrev(2)), Err(()));
+
+        // Duplicate code in map when adding to map.
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs.insert(abbrev(2)).unwrap();
+        assert_eq!(abbrevs.insert(abbrev(2)), Err(()));
+
+        // Duplicate code in map when adding to vec.
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs.insert(abbrev(2)).unwrap();
+        abbrevs.insert(abbrev(1)).unwrap();
+        assert_eq!(abbrevs.insert(abbrev(2)), Err(()));
+
+        // 32-bit usize conversions.
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs.insert(abbrev(2)).unwrap();
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "32")]
+    fn test_abbreviations_insert_32() {
+        fn abbrev(code: u64) -> Abbreviation {
+            Abbreviation::new(
+                code,
+                constants::DwTag(code as u16),
+                constants::DW_CHILDREN_no,
+                vec![].into(),
+            )
+        }
+
+        fn assert_abbrev(abbrevs: &Abbreviations, code: u64) {
+            let abbrev = abbrevs.get(code).unwrap();
+            assert_eq!(abbrev.tag(), constants::DwTag(code as u16));
+        }
+
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs.insert(abbrev(1)).unwrap();
+
+        let wrap_code = (u32::MAX as u64 + 1) + 1;
+        // `get` should not treat the wrapped code as `1`.
+        assert_eq!(abbrevs.get(wrap_code), None);
+        // `insert` should not treat the wrapped code as `1`.
+        abbrevs.insert(abbrev(wrap_code)).unwrap();
+        assert_abbrev(&abbrevs, 1);
+        assert_abbrev(&abbrevs, wrap_code);
+    }
+
+    #[test]
+    fn test_parse_abbreviations_ok() {
+        let expected_rest = [1, 2, 3, 4];
+        #[rustfmt::skip]
+        let buf = Section::new()
+            .abbrev(2, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
+                .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_string)
+                .abbrev_attr_null()
+            .abbrev(1, constants::DW_TAG_compile_unit, constants::DW_CHILDREN_yes)
+                .abbrev_attr(constants::DW_AT_producer, constants::DW_FORM_strp)
+                .abbrev_attr(constants::DW_AT_language, constants::DW_FORM_data2)
+                .abbrev_attr_null()
+            .abbrev_null()
+            .append_bytes(&expected_rest)
+            .get_contents()
+            .unwrap();
+        let rest = &mut EndianSlice::new(&*buf, LittleEndian);
+
+        let abbrev1 = Abbreviation::new(
+            1,
+            constants::DW_TAG_compile_unit,
+            constants::DW_CHILDREN_yes,
+            vec![
+                AttributeSpecification::new(
+                    constants::DW_AT_producer,
+                    constants::DW_FORM_strp,
+                    None,
+                ),
+                AttributeSpecification::new(
+                    constants::DW_AT_language,
+                    constants::DW_FORM_data2,
+                    None,
+                ),
+            ]
+            .into(),
+        );
+
+        let abbrev2 = Abbreviation::new(
+            2,
+            constants::DW_TAG_subprogram,
+            constants::DW_CHILDREN_no,
+            vec![AttributeSpecification::new(
+                constants::DW_AT_name,
+                constants::DW_FORM_string,
+                None,
+            )]
+            .into(),
+        );
+
+        let abbrevs = Abbreviations::parse(rest).expect("Should parse abbreviations");
+        assert_eq!(abbrevs.get(1), Some(&abbrev1));
+        assert_eq!(abbrevs.get(2), Some(&abbrev2));
+        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_abbreviations_duplicate() {
+        let expected_rest = [1, 2, 3, 4];
+        #[rustfmt::skip]
+        let buf = Section::new()
+            .abbrev(1, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
+                .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_string)
+                .abbrev_attr_null()
+            .abbrev(1, constants::DW_TAG_compile_unit, constants::DW_CHILDREN_yes)
+                .abbrev_attr(constants::DW_AT_producer, constants::DW_FORM_strp)
+                .abbrev_attr(constants::DW_AT_language, constants::DW_FORM_data2)
+                .abbrev_attr_null()
+            .abbrev_null()
+            .append_bytes(&expected_rest)
+            .get_contents()
+            .unwrap();
+        let buf = &mut EndianSlice::new(&*buf, LittleEndian);
+
+        match Abbreviations::parse(buf) {
+            Err(Error::DuplicateAbbreviationCode) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_abbreviation_tag_ok() {
+        let buf = [0x01, 0x02];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+        let tag = Abbreviation::parse_tag(rest).expect("Should parse tag");
+        assert_eq!(tag, constants::DW_TAG_array_type);
+        assert_eq!(*rest, EndianSlice::new(&buf[1..], LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_abbreviation_tag_zero() {
+        let buf = [0x00];
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+        match Abbreviation::parse_tag(buf) {
+            Err(Error::AbbreviationTagZero) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_abbreviation_has_children() {
+        let buf = [0x00, 0x01, 0x02];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+        let val = Abbreviation::parse_has_children(rest).expect("Should parse children");
+        assert_eq!(val, constants::DW_CHILDREN_no);
+        let val = Abbreviation::parse_has_children(rest).expect("Should parse children");
+        assert_eq!(val, constants::DW_CHILDREN_yes);
+        match Abbreviation::parse_has_children(rest) {
+            Err(Error::BadHasChildren) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_abbreviation_ok() {
+        let expected_rest = [0x01, 0x02, 0x03, 0x04];
+        let buf = Section::new()
+            .abbrev(1, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
+            .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_string)
+            .abbrev_attr_null()
+            .append_bytes(&expected_rest)
+            .get_contents()
+            .unwrap();
+        let rest = &mut EndianSlice::new(&*buf, LittleEndian);
+
+        let expect = Some(Abbreviation::new(
+            1,
+            constants::DW_TAG_subprogram,
+            constants::DW_CHILDREN_no,
+            vec![AttributeSpecification::new(
+                constants::DW_AT_name,
+                constants::DW_FORM_string,
+                None,
+            )]
+            .into(),
+        ));
+
+        let abbrev = Abbreviation::parse(rest).expect("Should parse abbreviation");
+        assert_eq!(abbrev, expect);
+        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_abbreviation_implicit_const_ok() {
+        let expected_rest = [0x01, 0x02, 0x03, 0x04];
+        let buf = Section::new()
+            .abbrev(1, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
+            .abbrev_attr_implicit_const(constants::DW_AT_name, -42)
+            .abbrev_attr_null()
+            .append_bytes(&expected_rest)
+            .get_contents()
+            .unwrap();
+        let rest = &mut EndianSlice::new(&*buf, LittleEndian);
+
+        let expect = Some(Abbreviation::new(
+            1,
+            constants::DW_TAG_subprogram,
+            constants::DW_CHILDREN_no,
+            vec![AttributeSpecification::new(
+                constants::DW_AT_name,
+                constants::DW_FORM_implicit_const,
+                Some(-42),
+            )]
+            .into(),
+        ));
+
+        let abbrev = Abbreviation::parse(rest).expect("Should parse abbreviation");
+        assert_eq!(abbrev, expect);
+        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_abbreviation_implicit_const_no_const() {
+        let buf = Section::new()
+            .abbrev(1, constants::DW_TAG_subprogram, constants::DW_CHILDREN_no)
+            .abbrev_attr(constants::DW_AT_name, constants::DW_FORM_implicit_const)
+            .get_contents()
+            .unwrap();
+        let buf = &mut EndianSlice::new(&*buf, LittleEndian);
+
+        match Abbreviation::parse(buf) {
+            Err(Error::UnexpectedEof(_)) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_parse_null_abbreviation_ok() {
+        let expected_rest = [0x01, 0x02, 0x03, 0x04];
+        let buf = Section::new()
+            .abbrev_null()
+            .append_bytes(&expected_rest)
+            .get_contents()
+            .unwrap();
+        let rest = &mut EndianSlice::new(&*buf, LittleEndian);
+
+        let abbrev = Abbreviation::parse(rest).expect("Should parse null abbreviation");
+        assert!(abbrev.is_none());
+        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_attribute_form_ok() {
+        let buf = [0x01, 0x02];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+        let tag = AttributeSpecification::parse_form(rest).expect("Should parse form");
+        assert_eq!(tag, constants::DW_FORM_addr);
+        assert_eq!(*rest, EndianSlice::new(&buf[1..], LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_attribute_form_zero() {
+        let buf = [0x00];
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+        match AttributeSpecification::parse_form(buf) {
+            Err(Error::AttributeFormZero) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_null_attribute_specification_ok() {
+        let buf = [0x00, 0x00, 0x01];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+        let attr =
+            AttributeSpecification::parse(rest).expect("Should parse null attribute specification");
+        assert!(attr.is_none());
+        assert_eq!(*rest, EndianSlice::new(&buf[2..], LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_attribute_specifications_name_zero() {
+        let buf = [0x00, 0x01, 0x00, 0x00];
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+        match AttributeSpecification::parse(buf) {
+            Err(Error::ExpectedZero) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_attribute_specifications_form_zero() {
+        let buf = [0x01, 0x00, 0x00, 0x00];
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+        match AttributeSpecification::parse(buf) {
+            Err(Error::AttributeFormZero) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_get_abbrev_zero() {
+        let mut abbrevs = Abbreviations::empty();
+        abbrevs
+            .insert(Abbreviation::new(
+                1,
+                constants::DwTag(1),
+                constants::DW_CHILDREN_no,
+                vec![].into(),
+            ))
+            .unwrap();
+        assert!(abbrevs.get(0).is_none());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/addr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/addr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/addr.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/addr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,128 @@
+use crate::common::{DebugAddrBase, DebugAddrIndex, SectionId};
+use crate::read::{Reader, ReaderOffset, Result, Section};
+
+/// The raw contents of the `.debug_addr` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugAddr<R> {
+    section: R,
+}
+
+impl<R: Reader> DebugAddr<R> {
+    // TODO: add an iterator over the sets of addresses in the section.
+    // This is not needed for common usage of the section though.
+
+    /// Returns the address at the given `base` and `index`.
+    ///
+    /// A set of addresses in the `.debug_addr` section consists of a header
+    /// followed by a series of addresses.
+    ///
+    /// The `base` must be the `DW_AT_addr_base` value from the compilation unit DIE.
+    /// This is an offset that points to the first address following the header.
+    ///
+    /// The `index` is the value of a `DW_FORM_addrx` attribute.
+    ///
+    /// The `address_size` must be the size of the address for the compilation unit.
+    /// This value must also match the header. However, note that we do not parse the
+    /// header to validate this, since locating the header is unreliable, and the GNU
+    /// extensions do not emit it.
+    pub fn get_address(
+        &self,
+        address_size: u8,
+        base: DebugAddrBase<R::Offset>,
+        index: DebugAddrIndex<R::Offset>,
+    ) -> Result<u64> {
+        let input = &mut self.section.clone();
+        input.skip(base.0)?;
+        input.skip(R::Offset::from_u64(
+            index.0.into_u64() * u64::from(address_size),
+        )?)?;
+        input.read_address(address_size)
+    }
+}
+
+impl<T> DebugAddr<T> {
+    /// Create a `DebugAddr` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugAddr<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugAddr<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.section).into()
+    }
+}
+
+impl<R> Section<R> for DebugAddr<R> {
+    fn id() -> SectionId {
+        SectionId::DebugAddr
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R> From<R> for DebugAddr<R> {
+    fn from(section: R) -> Self {
+        DebugAddr { section }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::read::EndianSlice;
+    use crate::test_util::GimliSectionMethods;
+    use crate::{Format, LittleEndian};
+    use test_assembler::{Endian, Label, LabelMaker, Section};
+
+    #[test]
+    fn test_get_address() {
+        for format in vec![Format::Dwarf32, Format::Dwarf64] {
+            for address_size in vec![4, 8] {
+                let zero = Label::new();
+                let length = Label::new();
+                let start = Label::new();
+                let first = Label::new();
+                let end = Label::new();
+                let mut section = Section::with_endian(Endian::Little)
+                    .mark(&zero)
+                    .initial_length(format, &length, &start)
+                    .D16(5)
+                    .D8(address_size)
+                    .D8(0)
+                    .mark(&first);
+                for i in 0..20 {
+                    section = section.word(address_size, 1000 + i);
+                }
+                section = section.mark(&end);
+                length.set_const((&end - &start) as u64);
+
+                let section = section.get_contents().unwrap();
+                let debug_addr = DebugAddr::from(EndianSlice::new(&section, LittleEndian));
+                let base = DebugAddrBase((&first - &zero) as usize);
+
+                assert_eq!(
+                    debug_addr.get_address(address_size, base, DebugAddrIndex(0)),
+                    Ok(1000)
+                );
+                assert_eq!(
+                    debug_addr.get_address(address_size, base, DebugAddrIndex(19)),
+                    Ok(1019)
+                );
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/aranges.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/aranges.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/aranges.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/aranges.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,656 @@
+use crate::common::{DebugArangesOffset, DebugInfoOffset, Encoding, SectionId};
+use crate::endianity::Endianity;
+use crate::read::{EndianSlice, Error, Range, Reader, ReaderOffset, Result, Section};
+
+/// The `DebugAranges` struct represents the DWARF address range information
+/// found in the `.debug_aranges` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugAranges<R> {
+    section: R,
+}
+
+impl<'input, Endian> DebugAranges<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugAranges` instance from the data in the `.debug_aranges`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_aranges` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugAranges, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_aranges_section = || &buf;
+    /// let debug_aranges =
+    ///     DebugAranges::new(read_debug_aranges_section(), LittleEndian);
+    /// ```
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        DebugAranges {
+            section: EndianSlice::new(section, endian),
+        }
+    }
+}
+
+impl<R: Reader> DebugAranges<R> {
+    /// Iterate the sets of entries in the `.debug_aranges` section.
+    ///
+    /// Each set of entries belongs to a single unit.
+    pub fn headers(&self) -> ArangeHeaderIter<R> {
+        ArangeHeaderIter {
+            input: self.section.clone(),
+            offset: DebugArangesOffset(R::Offset::from_u8(0)),
+        }
+    }
+
+    /// Get the header at the given offset.
+    pub fn header(&self, offset: DebugArangesOffset<R::Offset>) -> Result<ArangeHeader<R>> {
+        let mut input = self.section.clone();
+        input.skip(offset.0)?;
+        ArangeHeader::parse(&mut input, offset)
+    }
+}
+
+impl<T> DebugAranges<T> {
+    /// Create a `DebugAranges` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugAranges<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugAranges<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.section).into()
+    }
+}
+
+impl<R> Section<R> for DebugAranges<R> {
+    fn id() -> SectionId {
+        SectionId::DebugAranges
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R> From<R> for DebugAranges<R> {
+    fn from(section: R) -> Self {
+        DebugAranges { section }
+    }
+}
+
+/// An iterator over the headers of a `.debug_aranges` section.
+#[derive(Clone, Debug)]
+pub struct ArangeHeaderIter<R: Reader> {
+    input: R,
+    offset: DebugArangesOffset<R::Offset>,
+}
+
+impl<R: Reader> ArangeHeaderIter<R> {
+    /// Advance the iterator to the next header.
+    pub fn next(&mut self) -> Result<Option<ArangeHeader<R>>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        let len = self.input.len();
+        match ArangeHeader::parse(&mut self.input, self.offset) {
+            Ok(header) => {
+                self.offset.0 += len - self.input.len();
+                Ok(Some(header))
+            }
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for ArangeHeaderIter<R> {
+    type Item = ArangeHeader<R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        ArangeHeaderIter::next(self)
+    }
+}
+
+/// A header for a set of entries in the `.debug_arange` section.
+///
+/// These entries all belong to a single unit.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ArangeHeader<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    offset: DebugArangesOffset<Offset>,
+    encoding: Encoding,
+    length: Offset,
+    debug_info_offset: DebugInfoOffset<Offset>,
+    segment_size: u8,
+    entries: R,
+}
+
+impl<R, Offset> ArangeHeader<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    fn parse(input: &mut R, offset: DebugArangesOffset<Offset>) -> Result<Self> {
+        let (length, format) = input.read_initial_length()?;
+        let mut rest = input.split(length)?;
+
+        let version = rest.read_u16()?;
+        if version != 2 {
+            return Err(Error::UnknownVersion(u64::from(version)));
+        }
+
+        let debug_info_offset = rest.read_offset(format).map(DebugInfoOffset)?;
+        let address_size = rest.read_u8()?;
+        let segment_size = rest.read_u8()?;
+
+        // unit_length + version + offset + address_size + segment_size
+        let header_length = format.initial_length_size() + 2 + format.word_size() + 1 + 1;
+
+        // The first tuple following the header in each set begins at an offset that is
+        // a multiple of the size of a single tuple (that is, the size of a segment selector
+        // plus twice the size of an address).
+        let tuple_length = address_size
+            .checked_mul(2)
+            .and_then(|x| x.checked_add(segment_size))
+            .ok_or(Error::InvalidAddressRange)?;
+        if tuple_length == 0 {
+            return Err(Error::InvalidAddressRange)?;
+        }
+        let padding = if header_length % tuple_length == 0 {
+            0
+        } else {
+            tuple_length - header_length % tuple_length
+        };
+        rest.skip(R::Offset::from_u8(padding))?;
+
+        let encoding = Encoding {
+            format,
+            version,
+            address_size,
+            // TODO: segment_size
+        };
+        Ok(ArangeHeader {
+            offset,
+            encoding,
+            length,
+            debug_info_offset,
+            segment_size,
+            entries: rest,
+        })
+    }
+
+    /// Return the offset of this header within the `.debug_aranges` section.
+    #[inline]
+    pub fn offset(&self) -> DebugArangesOffset<Offset> {
+        self.offset
+    }
+
+    /// Return the length of this set of entries, including the header.
+    #[inline]
+    pub fn length(&self) -> Offset {
+        self.length
+    }
+
+    /// Return the encoding parameters for this set of entries.
+    #[inline]
+    pub fn encoding(&self) -> Encoding {
+        self.encoding
+    }
+
+    /// Return the segment size for this set of entries.
+    #[inline]
+    pub fn segment_size(&self) -> u8 {
+        self.segment_size
+    }
+
+    /// Return the offset into the .debug_info section for this set of arange entries.
+    #[inline]
+    pub fn debug_info_offset(&self) -> DebugInfoOffset<Offset> {
+        self.debug_info_offset
+    }
+
+    /// Return the arange entries in this set.
+    #[inline]
+    pub fn entries(&self) -> ArangeEntryIter<R> {
+        ArangeEntryIter {
+            input: self.entries.clone(),
+            encoding: self.encoding,
+            segment_size: self.segment_size,
+        }
+    }
+}
+
+/// An iterator over the aranges from a `.debug_aranges` section.
+///
+/// Can be [used with
+/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+#[derive(Debug, Clone)]
+pub struct ArangeEntryIter<R: Reader> {
+    input: R,
+    encoding: Encoding,
+    segment_size: u8,
+}
+
+impl<R: Reader> ArangeEntryIter<R> {
+    /// Advance the iterator and return the next arange.
+    ///
+    /// Returns the newly parsed arange as `Ok(Some(arange))`. Returns `Ok(None)`
+    /// when iteration is complete and all aranges have already been parsed and
+    /// yielded. If an error occurs while parsing the next arange, then this error
+    /// is returned as `Err(e)`, and all subsequent calls return `Ok(None)`.
+    pub fn next(&mut self) -> Result<Option<ArangeEntry>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        match ArangeEntry::parse(&mut self.input, self.encoding, self.segment_size) {
+            Ok(Some(entry)) => Ok(Some(entry)),
+            Ok(None) => {
+                self.input.empty();
+                Ok(None)
+            }
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for ArangeEntryIter<R> {
+    type Item = ArangeEntry;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        ArangeEntryIter::next(self)
+    }
+}
+
+/// A single parsed arange.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct ArangeEntry {
+    segment: Option<u64>,
+    address: u64,
+    length: u64,
+}
+
+impl ArangeEntry {
+    /// Parse a single arange. Return `None` for the null arange, `Some` for an actual arange.
+    fn parse<R: Reader>(
+        input: &mut R,
+        encoding: Encoding,
+        segment_size: u8,
+    ) -> Result<Option<Self>> {
+        let address_size = encoding.address_size;
+
+        let tuple_length = R::Offset::from_u8(2 * address_size + segment_size);
+        if tuple_length > input.len() {
+            input.empty();
+            return Ok(None);
+        }
+
+        let segment = if segment_size != 0 {
+            input.read_address(segment_size)?
+        } else {
+            0
+        };
+        let address = input.read_address(address_size)?;
+        let length = input.read_address(address_size)?;
+
+        match (segment, address, length) {
+            // This is meant to be a null terminator, but in practice it can occur
+            // before the end, possibly due to a linker omitting a function and
+            // leaving an unrelocated entry.
+            (0, 0, 0) => Self::parse(input, encoding, segment_size),
+            _ => Ok(Some(ArangeEntry {
+                segment: if segment_size != 0 {
+                    Some(segment)
+                } else {
+                    None
+                },
+                address,
+                length,
+            })),
+        }
+    }
+
+    /// Return the segment selector of this arange.
+    #[inline]
+    pub fn segment(&self) -> Option<u64> {
+        self.segment
+    }
+
+    /// Return the beginning address of this arange.
+    #[inline]
+    pub fn address(&self) -> u64 {
+        self.address
+    }
+
+    /// Return the length of this arange.
+    #[inline]
+    pub fn length(&self) -> u64 {
+        self.length
+    }
+
+    /// Return the range.
+    #[inline]
+    pub fn range(&self) -> Range {
+        Range {
+            begin: self.address,
+            end: self.address.wrapping_add(self.length),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::common::{DebugInfoOffset, Format};
+    use crate::endianity::LittleEndian;
+    use crate::read::EndianSlice;
+
+    #[test]
+    fn test_iterate_headers() {
+        #[rustfmt::skip]
+        let buf = [
+            // 32-bit length = 28.
+            0x1c, 0x00, 0x00, 0x00,
+            // Version.
+            0x02, 0x00,
+            // Offset.
+            0x01, 0x02, 0x03, 0x04,
+            // Address size.
+            0x04,
+            // Segment size.
+            0x00,
+            // Dummy padding and arange tuples.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+            // 32-bit length = 36.
+            0x24, 0x00, 0x00, 0x00,
+            // Version.
+            0x02, 0x00,
+            // Offset.
+            0x11, 0x12, 0x13, 0x14,
+            // Address size.
+            0x04,
+            // Segment size.
+            0x00,
+            // Dummy padding and arange tuples.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        ];
+
+        let debug_aranges = DebugAranges::new(&buf, LittleEndian);
+        let mut headers = debug_aranges.headers();
+
+        let header = headers
+            .next()
+            .expect("should parse header ok")
+            .expect("should have a header");
+        assert_eq!(header.offset(), DebugArangesOffset(0));
+        assert_eq!(header.debug_info_offset(), DebugInfoOffset(0x0403_0201));
+
+        let header = headers
+            .next()
+            .expect("should parse header ok")
+            .expect("should have a header");
+        assert_eq!(header.offset(), DebugArangesOffset(0x20));
+        assert_eq!(header.debug_info_offset(), DebugInfoOffset(0x1413_1211));
+    }
+
+    #[test]
+    fn test_parse_header_ok() {
+        #[rustfmt::skip]
+        let buf = [
+            // 32-bit length = 32.
+            0x20, 0x00, 0x00, 0x00,
+            // Version.
+            0x02, 0x00,
+            // Offset.
+            0x01, 0x02, 0x03, 0x04,
+            // Address size.
+            0x08,
+            // Segment size.
+            0x04,
+            // Length to here = 12, tuple length = 20.
+            // Padding to tuple length multiple = 4.
+            0x10, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy arange tuple data.
+            0x20, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy next arange.
+            0x30, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+        ];
+
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        let header =
+            ArangeHeader::parse(rest, DebugArangesOffset(0x10)).expect("should parse header ok");
+
+        assert_eq!(
+            *rest,
+            EndianSlice::new(&buf[buf.len() - 16..], LittleEndian)
+        );
+        assert_eq!(
+            header,
+            ArangeHeader {
+                offset: DebugArangesOffset(0x10),
+                encoding: Encoding {
+                    format: Format::Dwarf32,
+                    version: 2,
+                    address_size: 8,
+                },
+                length: 0x20,
+                debug_info_offset: DebugInfoOffset(0x0403_0201),
+                segment_size: 4,
+                entries: EndianSlice::new(&buf[buf.len() - 32..buf.len() - 16], LittleEndian),
+            }
+        );
+    }
+
+    #[test]
+    fn test_parse_header_overflow_error() {
+        #[rustfmt::skip]
+        let buf = [
+            // 32-bit length = 32.
+            0x20, 0x00, 0x00, 0x00,
+            // Version.
+            0x02, 0x00,
+            // Offset.
+            0x01, 0x02, 0x03, 0x04,
+            // Address size.
+            0xff,
+            // Segment size.
+            0xff,
+            // Length to here = 12, tuple length = 20.
+            // Padding to tuple length multiple = 4.
+            0x10, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy arange tuple data.
+            0x20, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy next arange.
+            0x30, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+        ];
+
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        let error = ArangeHeader::parse(rest, DebugArangesOffset(0x10))
+            .expect_err("should fail to parse header");
+        assert_eq!(error, Error::InvalidAddressRange);
+    }
+
+    #[test]
+    fn test_parse_header_div_by_zero_error() {
+        #[rustfmt::skip]
+        let buf = [
+            // 32-bit length = 32.
+            0x20, 0x00, 0x00, 0x00,
+            // Version.
+            0x02, 0x00,
+            // Offset.
+            0x01, 0x02, 0x03, 0x04,
+            // Address size = 0. Could cause a division by zero if we aren't
+            // careful.
+            0x00,
+            // Segment size.
+            0x00,
+            // Length to here = 12, tuple length = 20.
+            // Padding to tuple length multiple = 4.
+            0x10, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy arange tuple data.
+            0x20, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy next arange.
+            0x30, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+        ];
+
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        let error = ArangeHeader::parse(rest, DebugArangesOffset(0x10))
+            .expect_err("should fail to parse header");
+        assert_eq!(error, Error::InvalidAddressRange);
+    }
+
+    #[test]
+    fn test_parse_entry_ok() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 2,
+            address_size: 4,
+        };
+        let segment_size = 0;
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+        let entry =
+            ArangeEntry::parse(rest, encoding, segment_size).expect("should parse entry ok");
+        assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
+        assert_eq!(
+            entry,
+            Some(ArangeEntry {
+                segment: None,
+                address: 0x0403_0201,
+                length: 0x0807_0605,
+            })
+        );
+    }
+
+    #[test]
+    fn test_parse_entry_segment() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 2,
+            address_size: 4,
+        };
+        let segment_size = 8;
+        #[rustfmt::skip]
+        let buf = [
+            // Segment.
+            0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+            // Address.
+            0x01, 0x02, 0x03, 0x04,
+            // Length.
+            0x05, 0x06, 0x07, 0x08,
+            // Next tuple.
+            0x09
+        ];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+        let entry =
+            ArangeEntry::parse(rest, encoding, segment_size).expect("should parse entry ok");
+        assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
+        assert_eq!(
+            entry,
+            Some(ArangeEntry {
+                segment: Some(0x1817_1615_1413_1211),
+                address: 0x0403_0201,
+                length: 0x0807_0605,
+            })
+        );
+    }
+
+    #[test]
+    fn test_parse_entry_zero() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 2,
+            address_size: 4,
+        };
+        let segment_size = 0;
+        #[rustfmt::skip]
+        let buf = [
+            // Zero tuple.
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Address.
+            0x01, 0x02, 0x03, 0x04,
+            // Length.
+            0x05, 0x06, 0x07, 0x08,
+            // Next tuple.
+            0x09
+        ];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+        let entry =
+            ArangeEntry::parse(rest, encoding, segment_size).expect("should parse entry ok");
+        assert_eq!(*rest, EndianSlice::new(&buf[buf.len() - 1..], LittleEndian));
+        assert_eq!(
+            entry,
+            Some(ArangeEntry {
+                segment: None,
+                address: 0x0403_0201,
+                length: 0x0807_0605,
+            })
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/cfi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/cfi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/cfi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/cfi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7304 @@
+use alloc::boxed::Box;
+use core::cmp::{Ord, Ordering};
+use core::fmt::{self, Debug};
+use core::iter::FromIterator;
+use core::mem::{self, MaybeUninit};
+use core::num::Wrapping;
+use core::ptr;
+
+use crate::common::{DebugFrameOffset, EhFrameOffset, Encoding, Format, Register, SectionId};
+use crate::constants::{self, DwEhPe};
+use crate::endianity::Endianity;
+use crate::read::{EndianSlice, Error, Expression, Reader, ReaderOffset, Result, Section};
+
+/// `DebugFrame` contains the `.debug_frame` section's frame unwinding
+/// information required to unwind to and recover registers from older frames on
+/// the stack. For example, this is useful for a debugger that wants to print
+/// locals in a backtrace.
+///
+/// Most interesting methods are defined in the
+/// [`UnwindSection`](trait.UnwindSection.html) trait.
+///
+/// ### Differences between `.debug_frame` and `.eh_frame`
+///
+/// While the `.debug_frame` section's information has a lot of overlap with the
+/// `.eh_frame` section's information, the `.eh_frame` information tends to only
+/// encode the subset of information needed for exception handling. Often, only
+/// one of `.eh_frame` or `.debug_frame` will be present in an object file.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct DebugFrame<R: Reader> {
+    section: R,
+    address_size: u8,
+    segment_size: u8,
+}
+
+impl<R: Reader> DebugFrame<R> {
+    /// Set the size of a target address in bytes.
+    ///
+    /// This defaults to the native word size.
+    /// This is only used if the CIE version is less than 4.
+    pub fn set_address_size(&mut self, address_size: u8) {
+        self.address_size = address_size
+    }
+
+    /// Set the size of a segment selector in bytes.
+    ///
+    /// This defaults to 0.
+    /// This is only used if the CIE version is less than 4.
+    pub fn set_segment_size(&mut self, segment_size: u8) {
+        self.segment_size = segment_size
+    }
+}
+
+impl<'input, Endian> DebugFrame<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugFrame` instance from the data in the
+    /// `.debug_frame` section.
+    ///
+    /// It is the caller's responsibility to read the section and present it as
+    /// a `&[u8]` slice. That means using some ELF loader on Linux, a Mach-O
+    /// loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugFrame, NativeEndian};
+    ///
+    /// // Use with `.debug_frame`
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_frame_section_somehow = || &buf;
+    /// let debug_frame = DebugFrame::new(read_debug_frame_section_somehow(), NativeEndian);
+    /// ```
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(section, endian))
+    }
+}
+
+impl<R: Reader> Section<R> for DebugFrame<R> {
+    fn id() -> SectionId {
+        SectionId::DebugFrame
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R: Reader> From<R> for DebugFrame<R> {
+    fn from(section: R) -> Self {
+        // Default to no segments and native word size.
+        DebugFrame {
+            section,
+            address_size: mem::size_of::<usize>() as u8,
+            segment_size: 0,
+        }
+    }
+}
+
+/// `EhFrameHdr` contains the information about the `.eh_frame_hdr` section.
+///
+/// A pointer to the start of the `.eh_frame` data, and optionally, a binary
+/// search table of pointers to the `.eh_frame` records that are found in this section.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct EhFrameHdr<R: Reader>(R);
+
+/// `ParsedEhFrameHdr` contains the parsed information from the `.eh_frame_hdr` section.
+#[derive(Clone, Debug)]
+pub struct ParsedEhFrameHdr<R: Reader> {
+    address_size: u8,
+    section: R,
+
+    eh_frame_ptr: Pointer,
+    fde_count: u64,
+    table_enc: DwEhPe,
+    table: R,
+}
+
+impl<'input, Endian> EhFrameHdr<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Constructs a new `EhFrameHdr` instance from the data in the `.eh_frame_hdr` section.
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(section, endian))
+    }
+}
+
+impl<R: Reader> EhFrameHdr<R> {
+    /// Parses this `EhFrameHdr` to a `ParsedEhFrameHdr`.
+    pub fn parse(&self, bases: &BaseAddresses, address_size: u8) -> Result<ParsedEhFrameHdr<R>> {
+        let mut reader = self.0.clone();
+        let version = reader.read_u8()?;
+        if version != 1 {
+            return Err(Error::UnknownVersion(u64::from(version)));
+        }
+
+        let eh_frame_ptr_enc = parse_pointer_encoding(&mut reader)?;
+        let fde_count_enc = parse_pointer_encoding(&mut reader)?;
+        let table_enc = parse_pointer_encoding(&mut reader)?;
+
+        let parameters = PointerEncodingParameters {
+            bases: &bases.eh_frame_hdr,
+            func_base: None,
+            address_size,
+            section: &self.0,
+        };
+
+        // Omitting this pointer is not valid (defeats the purpose of .eh_frame_hdr entirely)
+        if eh_frame_ptr_enc == constants::DW_EH_PE_omit {
+            return Err(Error::CannotParseOmitPointerEncoding);
+        }
+        let eh_frame_ptr = parse_encoded_pointer(eh_frame_ptr_enc, &parameters, &mut reader)?;
+
+        let fde_count;
+        if fde_count_enc == constants::DW_EH_PE_omit || table_enc == constants::DW_EH_PE_omit {
+            fde_count = 0
+        } else {
+            let ptr = parse_encoded_pointer(fde_count_enc, &parameters, &mut reader)?;
+            fde_count = match ptr {
+                Pointer::Direct(c) => c,
+                Pointer::Indirect(_) => return Err(Error::UnsupportedPointerEncoding),
+            }
+        }
+
+        Ok(ParsedEhFrameHdr {
+            address_size,
+            section: self.0.clone(),
+
+            eh_frame_ptr,
+            fde_count,
+            table_enc,
+            table: reader,
+        })
+    }
+}
+
+impl<R: Reader> Section<R> for EhFrameHdr<R> {
+    fn id() -> SectionId {
+        SectionId::EhFrameHdr
+    }
+
+    fn reader(&self) -> &R {
+        &self.0
+    }
+}
+
+impl<R: Reader> From<R> for EhFrameHdr<R> {
+    fn from(section: R) -> Self {
+        EhFrameHdr(section)
+    }
+}
+
+impl<R: Reader> ParsedEhFrameHdr<R> {
+    /// Returns the address of the binary's `.eh_frame` section.
+    pub fn eh_frame_ptr(&self) -> Pointer {
+        self.eh_frame_ptr
+    }
+
+    /// Retrieves the CFI binary search table, if there is one.
+    pub fn table(&self) -> Option<EhHdrTable<R>> {
+        // There are two big edge cases here:
+        // * You search the table for an invalid address. As this is just a binary
+        //   search table, we always have to return a valid result for that (unless
+        //   you specify an address that is lower than the first address in the
+        //   table). Since this means that you have to recheck that the FDE contains
+        //   your address anyways, we just return the first FDE even when the address
+        //   is too low. After all, we're just doing a normal binary search.
+        // * This falls apart when the table is empty - there is no entry we could
+        //   return. We conclude that an empty table is not really a table at all.
+        if self.fde_count == 0 {
+            None
+        } else {
+            Some(EhHdrTable { hdr: self })
+        }
+    }
+}
+
+/// The CFI binary search table that is an optional part of the `.eh_frame_hdr` section.
+#[derive(Debug, Clone)]
+pub struct EhHdrTable<'a, R: Reader> {
+    hdr: &'a ParsedEhFrameHdr<R>,
+}
+
+impl<'a, R: Reader + 'a> EhHdrTable<'a, R> {
+    /// *Probably* returns a pointer to the FDE for the given address.
+    ///
+    /// This performs a binary search, so if there is no FDE for the given address,
+    /// this function **will** return a pointer to any other FDE that's close by.
+    ///
+    /// To be sure, you **must** call `contains` on the FDE.
+    pub fn lookup(&self, address: u64, bases: &BaseAddresses) -> Result<Pointer> {
+        let size = match self.hdr.table_enc.format() {
+            constants::DW_EH_PE_uleb128 | constants::DW_EH_PE_sleb128 => {
+                return Err(Error::VariableLengthSearchTable);
+            }
+            constants::DW_EH_PE_sdata2 | constants::DW_EH_PE_udata2 => 2,
+            constants::DW_EH_PE_sdata4 | constants::DW_EH_PE_udata4 => 4,
+            constants::DW_EH_PE_sdata8 | constants::DW_EH_PE_udata8 => 8,
+            _ => return Err(Error::UnknownPointerEncoding),
+        };
+
+        let row_size = size * 2;
+
+        let mut len = self.hdr.fde_count;
+
+        let mut reader = self.hdr.table.clone();
+
+        let parameters = PointerEncodingParameters {
+            bases: &bases.eh_frame_hdr,
+            func_base: None,
+            address_size: self.hdr.address_size,
+            section: &self.hdr.section,
+        };
+
+        while len > 1 {
+            let head = reader.split(R::Offset::from_u64((len / 2) * row_size)?)?;
+            let tail = reader.clone();
+
+            let pivot = parse_encoded_pointer(self.hdr.table_enc, &parameters, &mut reader)?;
+            let pivot = match pivot {
+                Pointer::Direct(x) => x,
+                Pointer::Indirect(_) => return Err(Error::UnsupportedPointerEncoding),
+            };
+
+            match pivot.cmp(&address) {
+                Ordering::Equal => {
+                    reader = tail;
+                    break;
+                }
+                Ordering::Less => {
+                    reader = tail;
+                    len = len - (len / 2);
+                }
+                Ordering::Greater => {
+                    reader = head;
+                    len /= 2;
+                }
+            }
+        }
+
+        reader.skip(R::Offset::from_u64(size)?)?;
+
+        parse_encoded_pointer(self.hdr.table_enc, &parameters, &mut reader)
+    }
+
+    /// Convert a `Pointer` to a section offset.
+    ///
+    /// This does not support indirect pointers.
+    pub fn pointer_to_offset(&self, ptr: Pointer) -> Result<EhFrameOffset<R::Offset>> {
+        let ptr = match ptr {
+            Pointer::Direct(x) => x,
+            _ => return Err(Error::UnsupportedPointerEncoding),
+        };
+
+        let eh_frame_ptr = match self.hdr.eh_frame_ptr() {
+            Pointer::Direct(x) => x,
+            _ => return Err(Error::UnsupportedPointerEncoding),
+        };
+
+        // Calculate the offset in the EhFrame section
+        R::Offset::from_u64(ptr - eh_frame_ptr).map(EhFrameOffset)
+    }
+
+    /// Returns a parsed FDE for the given address, or `NoUnwindInfoForAddress`
+    /// if there are none.
+    ///
+    /// You must provide a function to get its associated CIE. See
+    /// `PartialFrameDescriptionEntry::parse` for more information.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use gimli::{BaseAddresses, EhFrame, ParsedEhFrameHdr, EndianSlice, NativeEndian, Error, UnwindSection};
+    /// # fn foo() -> Result<(), Error> {
+    /// # let eh_frame: EhFrame<EndianSlice<NativeEndian>> = unreachable!();
+    /// # let eh_frame_hdr: ParsedEhFrameHdr<EndianSlice<NativeEndian>> = unimplemented!();
+    /// # let addr = 0;
+    /// # let bases = unimplemented!();
+    /// let table = eh_frame_hdr.table().unwrap();
+    /// let fde = table.fde_for_address(&eh_frame, &bases, addr, EhFrame::cie_from_offset)?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn fde_for_address<F>(
+        &self,
+        frame: &EhFrame<R>,
+        bases: &BaseAddresses,
+        address: u64,
+        get_cie: F,
+    ) -> Result<FrameDescriptionEntry<R>>
+    where
+        F: FnMut(
+            &EhFrame<R>,
+            &BaseAddresses,
+            EhFrameOffset<R::Offset>,
+        ) -> Result<CommonInformationEntry<R>>,
+    {
+        let fdeptr = self.lookup(address, bases)?;
+        let offset = self.pointer_to_offset(fdeptr)?;
+        let entry = frame.fde_from_offset(bases, offset, get_cie)?;
+        if entry.contains(address) {
+            Ok(entry)
+        } else {
+            Err(Error::NoUnwindInfoForAddress)
+        }
+    }
+
+    #[inline]
+    #[doc(hidden)]
+    #[deprecated(note = "Method renamed to fde_for_address; use that instead.")]
+    pub fn lookup_and_parse<F>(
+        &self,
+        address: u64,
+        bases: &BaseAddresses,
+        frame: EhFrame<R>,
+        get_cie: F,
+    ) -> Result<FrameDescriptionEntry<R>>
+    where
+        F: FnMut(
+            &EhFrame<R>,
+            &BaseAddresses,
+            EhFrameOffset<R::Offset>,
+        ) -> Result<CommonInformationEntry<R>>,
+    {
+        self.fde_for_address(&frame, bases, address, get_cie)
+    }
+
+    /// Returns the frame unwind information for the given address,
+    /// or `NoUnwindInfoForAddress` if there are none.
+    ///
+    /// You must provide a function to get the associated CIE. See
+    /// `PartialFrameDescriptionEntry::parse` for more information.
+    pub fn unwind_info_for_address<F>(
+        &self,
+        frame: &EhFrame<R>,
+        bases: &BaseAddresses,
+        ctx: &mut UninitializedUnwindContext<R>,
+        address: u64,
+        get_cie: F,
+    ) -> Result<UnwindTableRow<R>>
+    where
+        F: FnMut(
+            &EhFrame<R>,
+            &BaseAddresses,
+            EhFrameOffset<R::Offset>,
+        ) -> Result<CommonInformationEntry<R>>,
+    {
+        let fde = self.fde_for_address(frame, bases, address, get_cie)?;
+        fde.unwind_info_for_address(frame, bases, ctx, address)
+    }
+}
+
+/// `EhFrame` contains the frame unwinding information needed during exception
+/// handling found in the `.eh_frame` section.
+///
+/// Most interesting methods are defined in the
+/// [`UnwindSection`](trait.UnwindSection.html) trait.
+///
+/// See
+/// [`DebugFrame`](./struct.DebugFrame.html#differences-between-debug_frame-and-eh_frame)
+/// for some discussion on the differences between `.debug_frame` and
+/// `.eh_frame`.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct EhFrame<R: Reader> {
+    section: R,
+    address_size: u8,
+}
+
+impl<R: Reader> EhFrame<R> {
+    /// Set the size of a target address in bytes.
+    ///
+    /// This defaults to the native word size.
+    pub fn set_address_size(&mut self, address_size: u8) {
+        self.address_size = address_size
+    }
+}
+
+impl<'input, Endian> EhFrame<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `EhFrame` instance from the data in the
+    /// `.debug_frame` section.
+    ///
+    /// It is the caller's responsibility to read the section and present it as
+    /// a `&[u8]` slice. That means using some ELF loader on Linux, a Mach-O
+    /// loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{EhFrame, EndianSlice, NativeEndian};
+    ///
+    /// // Use with `.debug_frame`
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_frame_section_somehow = || &buf;
+    /// let debug_frame = EhFrame::new(read_debug_frame_section_somehow(), NativeEndian);
+    /// ```
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(section, endian))
+    }
+}
+
+impl<R: Reader> Section<R> for EhFrame<R> {
+    fn id() -> SectionId {
+        SectionId::EhFrame
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R: Reader> From<R> for EhFrame<R> {
+    fn from(section: R) -> Self {
+        // Default to native word size.
+        EhFrame {
+            section,
+            address_size: mem::size_of::<usize>() as u8,
+        }
+    }
+}
+
+// This has to be `pub` to silence a warning (that is deny(..)'d by default) in
+// rustc. Eventually, not having this `pub` will become a hard error.
+#[doc(hidden)]
+#[allow(missing_docs)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum CieOffsetEncoding {
+    U32,
+    U64,
+}
+
+/// An offset into an `UnwindSection`.
+//
+// Needed to avoid conflicting implementations of `Into<T>`.
+pub trait UnwindOffset<T = usize>: Copy + Debug + Eq + From<T>
+where
+    T: ReaderOffset,
+{
+    /// Convert an `UnwindOffset<T>` into a `T`.
+    fn into(self) -> T;
+}
+
+impl<T> UnwindOffset<T> for DebugFrameOffset<T>
+where
+    T: ReaderOffset,
+{
+    #[inline]
+    fn into(self) -> T {
+        self.0
+    }
+}
+
+impl<T> UnwindOffset<T> for EhFrameOffset<T>
+where
+    T: ReaderOffset,
+{
+    #[inline]
+    fn into(self) -> T {
+        self.0
+    }
+}
+
+/// This trait completely encapsulates everything that is different between
+/// `.eh_frame` and `.debug_frame`, as well as all the bits that can change
+/// between DWARF versions.
+#[doc(hidden)]
+pub trait _UnwindSectionPrivate<R: Reader> {
+    /// Get the underlying section data.
+    fn section(&self) -> &R;
+
+    /// Returns true if the given length value should be considered an
+    /// end-of-entries sentinel.
+    fn length_value_is_end_of_entries(length: R::Offset) -> bool;
+
+    /// Return true if the given offset if the CIE sentinel, false otherwise.
+    fn is_cie(format: Format, id: u64) -> bool;
+
+    /// Return the CIE offset/ID encoding used by this unwind section with the
+    /// given DWARF format.
+    fn cie_offset_encoding(format: Format) -> CieOffsetEncoding;
+
+    /// For `.eh_frame`, CIE offsets are relative to the current position. For
+    /// `.debug_frame`, they are relative to the start of the section. We always
+    /// internally store them relative to the section, so we handle translating
+    /// `.eh_frame`'s relative offsets in this method. If the offset calculation
+    /// underflows, return `None`.
+    fn resolve_cie_offset(&self, base: R::Offset, offset: R::Offset) -> Option<R::Offset>;
+
+    /// Does this version of this unwind section encode address and segment
+    /// sizes in its CIEs?
+    fn has_address_and_segment_sizes(version: u8) -> bool;
+
+    /// The address size to use if `has_address_and_segment_sizes` returns false.
+    fn address_size(&self) -> u8;
+
+    /// The segment size to use if `has_address_and_segment_sizes` returns false.
+    fn segment_size(&self) -> u8;
+}
+
+/// A section holding unwind information: either `.debug_frame` or
+/// `.eh_frame`. See [`DebugFrame`](./struct.DebugFrame.html) and
+/// [`EhFrame`](./struct.EhFrame.html) respectively.
+pub trait UnwindSection<R: Reader>: Clone + Debug + _UnwindSectionPrivate<R> {
+    /// The offset type associated with this CFI section. Either
+    /// `DebugFrameOffset` or `EhFrameOffset`.
+    type Offset: UnwindOffset<R::Offset>;
+
+    /// Iterate over the `CommonInformationEntry`s and `FrameDescriptionEntry`s
+    /// in this `.debug_frame` section.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    fn entries<'bases>(&self, bases: &'bases BaseAddresses) -> CfiEntriesIter<'bases, Self, R> {
+        CfiEntriesIter {
+            section: self.clone(),
+            bases,
+            input: self.section().clone(),
+        }
+    }
+
+    /// Parse the `CommonInformationEntry` at the given offset.
+    fn cie_from_offset(
+        &self,
+        bases: &BaseAddresses,
+        offset: Self::Offset,
+    ) -> Result<CommonInformationEntry<R>> {
+        let offset = UnwindOffset::into(offset);
+        let input = &mut self.section().clone();
+        input.skip(offset)?;
+        CommonInformationEntry::parse(bases, self, input)
+    }
+
+    /// Parse the `PartialFrameDescriptionEntry` at the given offset.
+    fn partial_fde_from_offset<'bases>(
+        &self,
+        bases: &'bases BaseAddresses,
+        offset: Self::Offset,
+    ) -> Result<PartialFrameDescriptionEntry<'bases, Self, R>> {
+        let offset = UnwindOffset::into(offset);
+        let input = &mut self.section().clone();
+        input.skip(offset)?;
+        PartialFrameDescriptionEntry::parse_partial(self, bases, input)
+    }
+
+    /// Parse the `FrameDescriptionEntry` at the given offset.
+    fn fde_from_offset<F>(
+        &self,
+        bases: &BaseAddresses,
+        offset: Self::Offset,
+        get_cie: F,
+    ) -> Result<FrameDescriptionEntry<R>>
+    where
+        F: FnMut(&Self, &BaseAddresses, Self::Offset) -> Result<CommonInformationEntry<R>>,
+    {
+        let partial = self.partial_fde_from_offset(bases, offset)?;
+        partial.parse(get_cie)
+    }
+
+    /// Find the `FrameDescriptionEntry` for the given address.
+    ///
+    /// If found, the FDE is returned.  If not found,
+    /// `Err(gimli::Error::NoUnwindInfoForAddress)` is returned.
+    /// If parsing fails, the error is returned.
+    ///
+    /// You must provide a function to get its associated CIE. See
+    /// `PartialFrameDescriptionEntry::parse` for more information.
+    ///
+    /// Note: this iterates over all FDEs. If available, it is possible
+    /// to do a binary search with `EhFrameHdr::fde_for_address` instead.
+    fn fde_for_address<F>(
+        &self,
+        bases: &BaseAddresses,
+        address: u64,
+        mut get_cie: F,
+    ) -> Result<FrameDescriptionEntry<R>>
+    where
+        F: FnMut(&Self, &BaseAddresses, Self::Offset) -> Result<CommonInformationEntry<R>>,
+    {
+        let mut entries = self.entries(bases);
+        while let Some(entry) = entries.next()? {
+            match entry {
+                CieOrFde::Cie(_) => {}
+                CieOrFde::Fde(partial) => {
+                    let fde = partial.parse(&mut get_cie)?;
+                    if fde.contains(address) {
+                        return Ok(fde);
+                    }
+                }
+            }
+        }
+        Err(Error::NoUnwindInfoForAddress)
+    }
+
+    /// Find the frame unwind information for the given address.
+    ///
+    /// If found, the unwind information is returned.  If not found,
+    /// `Err(gimli::Error::NoUnwindInfoForAddress)` is returned. If parsing or
+    /// CFI evaluation fails, the error is returned.
+    ///
+    /// ```
+    /// use gimli::{BaseAddresses, EhFrame, EndianSlice, NativeEndian, UninitializedUnwindContext,
+    ///             UnwindSection};
+    ///
+    /// # fn foo() -> gimli::Result<()> {
+    /// # let read_eh_frame_section = || unimplemented!();
+    /// // Get the `.eh_frame` section from the object file. Alternatively,
+    /// // use `EhFrame` with the `.eh_frame` section of the object file.
+    /// let eh_frame = EhFrame::new(read_eh_frame_section(), NativeEndian);
+    ///
+    /// # let get_frame_pc = || unimplemented!();
+    /// // Get the address of the PC for a frame you'd like to unwind.
+    /// let address = get_frame_pc();
+    ///
+    /// // This context is reusable, which cuts down on heap allocations.
+    /// let ctx = UninitializedUnwindContext::new();
+    ///
+    /// // Optionally provide base addresses for any relative pointers. If a
+    /// // base address isn't provided and a pointer is found that is relative to
+    /// // it, we will return an `Err`.
+    /// # let address_of_text_section_in_memory = unimplemented!();
+    /// # let address_of_got_section_in_memory = unimplemented!();
+    /// let bases = BaseAddresses::default()
+    ///     .set_text(address_of_text_section_in_memory)
+    ///     .set_got(address_of_got_section_in_memory);
+    ///
+    /// let unwind_info = eh_frame.unwind_info_for_address(
+    ///     &bases,
+    ///     &mut ctx,
+    ///     address,
+    ///     EhFrame::cie_from_offset,
+    /// )?;
+    ///
+    /// # let do_stuff_with = |_| unimplemented!();
+    /// do_stuff_with(unwind_info);
+    /// # let _ = ctx;
+    /// # unreachable!()
+    /// # }
+    /// ```
+    #[inline]
+    fn unwind_info_for_address<F>(
+        &self,
+        bases: &BaseAddresses,
+        ctx: &mut UninitializedUnwindContext<R>,
+        address: u64,
+        get_cie: F,
+    ) -> Result<UnwindTableRow<R>>
+    where
+        F: FnMut(&Self, &BaseAddresses, Self::Offset) -> Result<CommonInformationEntry<R>>,
+    {
+        let fde = self.fde_for_address(bases, address, get_cie)?;
+        fde.unwind_info_for_address(self, bases, ctx, address)
+    }
+}
+
+impl<R: Reader> _UnwindSectionPrivate<R> for DebugFrame<R> {
+    fn section(&self) -> &R {
+        &self.section
+    }
+
+    fn length_value_is_end_of_entries(_: R::Offset) -> bool {
+        false
+    }
+
+    fn is_cie(format: Format, id: u64) -> bool {
+        match format {
+            Format::Dwarf32 => id == 0xffff_ffff,
+            Format::Dwarf64 => id == 0xffff_ffff_ffff_ffff,
+        }
+    }
+
+    fn cie_offset_encoding(format: Format) -> CieOffsetEncoding {
+        match format {
+            Format::Dwarf32 => CieOffsetEncoding::U32,
+            Format::Dwarf64 => CieOffsetEncoding::U64,
+        }
+    }
+
+    fn resolve_cie_offset(&self, _: R::Offset, offset: R::Offset) -> Option<R::Offset> {
+        Some(offset)
+    }
+
+    fn has_address_and_segment_sizes(version: u8) -> bool {
+        version == 4
+    }
+
+    fn address_size(&self) -> u8 {
+        self.address_size
+    }
+
+    fn segment_size(&self) -> u8 {
+        self.segment_size
+    }
+}
+
+impl<R: Reader> UnwindSection<R> for DebugFrame<R> {
+    type Offset = DebugFrameOffset<R::Offset>;
+}
+
+impl<R: Reader> _UnwindSectionPrivate<R> for EhFrame<R> {
+    fn section(&self) -> &R {
+        &self.section
+    }
+
+    fn length_value_is_end_of_entries(length: R::Offset) -> bool {
+        length.into_u64() == 0
+    }
+
+    fn is_cie(_: Format, id: u64) -> bool {
+        id == 0
+    }
+
+    fn cie_offset_encoding(_format: Format) -> CieOffsetEncoding {
+        // `.eh_frame` offsets are always 4 bytes, regardless of the DWARF
+        // format.
+        CieOffsetEncoding::U32
+    }
+
+    fn resolve_cie_offset(&self, base: R::Offset, offset: R::Offset) -> Option<R::Offset> {
+        base.checked_sub(offset)
+    }
+
+    fn has_address_and_segment_sizes(_version: u8) -> bool {
+        false
+    }
+
+    fn address_size(&self) -> u8 {
+        self.address_size
+    }
+
+    fn segment_size(&self) -> u8 {
+        0
+    }
+}
+
+impl<R: Reader> UnwindSection<R> for EhFrame<R> {
+    type Offset = EhFrameOffset<R::Offset>;
+}
+
+/// Optional base addresses for the relative `DW_EH_PE_*` encoded pointers.
+///
+/// During CIE/FDE parsing, if a relative pointer is encountered for a base
+/// address that is unknown, an Err will be returned.
+///
+/// ```
+/// use gimli::BaseAddresses;
+///
+/// # fn foo() {
+/// # let address_of_eh_frame_hdr_section_in_memory = unimplemented!();
+/// # let address_of_eh_frame_section_in_memory = unimplemented!();
+/// # let address_of_text_section_in_memory = unimplemented!();
+/// # let address_of_got_section_in_memory = unimplemented!();
+/// # let address_of_the_start_of_current_func = unimplemented!();
+/// let bases = BaseAddresses::default()
+///     .set_eh_frame_hdr(address_of_eh_frame_hdr_section_in_memory)
+///     .set_eh_frame(address_of_eh_frame_section_in_memory)
+///     .set_text(address_of_text_section_in_memory)
+///     .set_got(address_of_got_section_in_memory);
+/// # let _ = bases;
+/// # }
+/// ```
+#[derive(Clone, Default, Debug, PartialEq, Eq)]
+pub struct BaseAddresses {
+    /// The base addresses to use for pointers in the `.eh_frame_hdr` section.
+    pub eh_frame_hdr: SectionBaseAddresses,
+
+    /// The base addresses to use for pointers in the `.eh_frame` section.
+    pub eh_frame: SectionBaseAddresses,
+}
+
+/// Optional base addresses for the relative `DW_EH_PE_*` encoded pointers
+/// in a particular section.
+///
+/// See `BaseAddresses` for methods that are helpful in setting these addresses.
+#[derive(Clone, Default, Debug, PartialEq, Eq)]
+pub struct SectionBaseAddresses {
+    /// The address of the section containing the pointer.
+    pub section: Option<u64>,
+
+    /// The base address for text relative pointers.
+    /// This is generally the address of the `.text` section.
+    pub text: Option<u64>,
+
+    /// The base address for data relative pointers.
+    ///
+    /// For pointers in the `.eh_frame_hdr` section, this is the address
+    /// of the `.eh_frame_hdr` section
+    ///
+    /// For pointers in the `.eh_frame` section, this is generally the
+    /// global pointer, such as the address of the `.got` section.
+    pub data: Option<u64>,
+}
+
+impl BaseAddresses {
+    /// Set the `.eh_frame_hdr` section base address.
+    #[inline]
+    pub fn set_eh_frame_hdr(mut self, addr: u64) -> Self {
+        self.eh_frame_hdr.section = Some(addr);
+        self.eh_frame_hdr.data = Some(addr);
+        self
+    }
+
+    /// Set the `.eh_frame` section base address.
+    #[inline]
+    pub fn set_eh_frame(mut self, addr: u64) -> Self {
+        self.eh_frame.section = Some(addr);
+        self
+    }
+
+    /// Set the `.text` section base address.
+    #[inline]
+    pub fn set_text(mut self, addr: u64) -> Self {
+        self.eh_frame_hdr.text = Some(addr);
+        self.eh_frame.text = Some(addr);
+        self
+    }
+
+    /// Set the `.got` section base address.
+    #[inline]
+    pub fn set_got(mut self, addr: u64) -> Self {
+        self.eh_frame.data = Some(addr);
+        self
+    }
+}
+
+/// An iterator over CIE and FDE entries in a `.debug_frame` or `.eh_frame`
+/// section.
+///
+/// Some pointers may be encoded relative to various base addresses. Use the
+/// [`BaseAddresses`](./struct.BaseAddresses.html) parameter to provide them. By
+/// default, none are provided. If a relative pointer is encountered for a base
+/// address that is unknown, an `Err` will be returned and iteration will abort.
+///
+/// Can be [used with
+/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+///
+/// ```
+/// use gimli::{BaseAddresses, EhFrame, EndianSlice, NativeEndian, UnwindSection};
+///
+/// # fn foo() -> gimli::Result<()> {
+/// # let read_eh_frame_somehow = || unimplemented!();
+/// let eh_frame = EhFrame::new(read_eh_frame_somehow(), NativeEndian);
+///
+/// # let address_of_eh_frame_hdr_section_in_memory = unimplemented!();
+/// # let address_of_eh_frame_section_in_memory = unimplemented!();
+/// # let address_of_text_section_in_memory = unimplemented!();
+/// # let address_of_got_section_in_memory = unimplemented!();
+/// # let address_of_the_start_of_current_func = unimplemented!();
+/// // Provide base addresses for relative pointers.
+/// let bases = BaseAddresses::default()
+///     .set_eh_frame_hdr(address_of_eh_frame_hdr_section_in_memory)
+///     .set_eh_frame(address_of_eh_frame_section_in_memory)
+///     .set_text(address_of_text_section_in_memory)
+///     .set_got(address_of_got_section_in_memory);
+///
+/// let mut entries = eh_frame.entries(&bases);
+///
+/// # let do_stuff_with = |_| unimplemented!();
+/// while let Some(entry) = entries.next()? {
+///     do_stuff_with(entry)
+/// }
+/// # unreachable!()
+/// # }
+/// ```
+#[derive(Clone, Debug)]
+pub struct CfiEntriesIter<'bases, Section, R>
+where
+    R: Reader,
+    Section: UnwindSection<R>,
+{
+    section: Section,
+    bases: &'bases BaseAddresses,
+    input: R,
+}
+
+impl<'bases, Section, R> CfiEntriesIter<'bases, Section, R>
+where
+    R: Reader,
+    Section: UnwindSection<R>,
+{
+    /// Advance the iterator to the next entry.
+    pub fn next(&mut self) -> Result<Option<CieOrFde<'bases, Section, R>>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        match parse_cfi_entry(self.bases, &self.section, &mut self.input) {
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+            Ok(None) => {
+                self.input.empty();
+                Ok(None)
+            }
+            Ok(Some(entry)) => Ok(Some(entry)),
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<'bases, Section, R> fallible_iterator::FallibleIterator for CfiEntriesIter<'bases, Section, R>
+where
+    R: Reader,
+    Section: UnwindSection<R>,
+{
+    type Item = CieOrFde<'bases, Section, R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        CfiEntriesIter::next(self)
+    }
+}
+
+/// Either a `CommonInformationEntry` (CIE) or a `FrameDescriptionEntry` (FDE).
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum CieOrFde<'bases, Section, R>
+where
+    R: Reader,
+    Section: UnwindSection<R>,
+{
+    /// This CFI entry is a `CommonInformationEntry`.
+    Cie(CommonInformationEntry<R>),
+    /// This CFI entry is a `FrameDescriptionEntry`, however fully parsing it
+    /// requires parsing its CIE first, so it is left in a partially parsed
+    /// state.
+    Fde(PartialFrameDescriptionEntry<'bases, Section, R>),
+}
+
+#[allow(clippy::type_complexity)]
+fn parse_cfi_entry<'bases, Section, R>(
+    bases: &'bases BaseAddresses,
+    section: &Section,
+    input: &mut R,
+) -> Result<Option<CieOrFde<'bases, Section, R>>>
+where
+    R: Reader,
+    Section: UnwindSection<R>,
+{
+    let (offset, length, format) = loop {
+        let offset = input.offset_from(section.section());
+        let (length, format) = input.read_initial_length()?;
+
+        if Section::length_value_is_end_of_entries(length) {
+            return Ok(None);
+        }
+
+        // Hack: skip zero padding inserted by buggy compilers/linkers.
+        // We require that the padding is a multiple of 32-bits, otherwise
+        // there is no reliable way to determine when the padding ends. This
+        // should be okay since CFI entries must be aligned to the address size.
+
+        if length.into_u64() != 0 || format != Format::Dwarf32 {
+            break (offset, length, format);
+        }
+    };
+
+    let mut rest = input.split(length)?;
+    let cie_offset_base = rest.offset_from(section.section());
+    let cie_id_or_offset = match Section::cie_offset_encoding(format) {
+        CieOffsetEncoding::U32 => rest.read_u32().map(u64::from)?,
+        CieOffsetEncoding::U64 => rest.read_u64()?,
+    };
+
+    if Section::is_cie(format, cie_id_or_offset) {
+        let cie = CommonInformationEntry::parse_rest(offset, length, format, bases, section, rest)?;
+        Ok(Some(CieOrFde::Cie(cie)))
+    } else {
+        let cie_offset = R::Offset::from_u64(cie_id_or_offset)?;
+        let cie_offset = match section.resolve_cie_offset(cie_offset_base, cie_offset) {
+            None => return Err(Error::OffsetOutOfBounds),
+            Some(cie_offset) => cie_offset,
+        };
+
+        let fde = PartialFrameDescriptionEntry {
+            offset,
+            length,
+            format,
+            cie_offset: cie_offset.into(),
+            rest,
+            section: section.clone(),
+            bases,
+        };
+
+        Ok(Some(CieOrFde::Fde(fde)))
+    }
+}
+
+/// We support the z-style augmentation [defined by `.eh_frame`][ehframe].
+///
+/// [ehframe]: http://refspecs.linuxfoundation.org/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
+pub struct Augmentation {
+    /// > A 'L' may be present at any position after the first character of the
+    /// > string. This character may only be present if 'z' is the first character
+    /// > of the string. If present, it indicates the presence of one argument in
+    /// > the Augmentation Data of the CIE, and a corresponding argument in the
+    /// > Augmentation Data of the FDE. The argument in the Augmentation Data of
+    /// > the CIE is 1-byte and represents the pointer encoding used for the
+    /// > argument in the Augmentation Data of the FDE, which is the address of a
+    /// > language-specific data area (LSDA). The size of the LSDA pointer is
+    /// > specified by the pointer encoding used.
+    lsda: Option<constants::DwEhPe>,
+
+    /// > A 'P' may be present at any position after the first character of the
+    /// > string. This character may only be present if 'z' is the first character
+    /// > of the string. If present, it indicates the presence of two arguments in
+    /// > the Augmentation Data of the CIE. The first argument is 1-byte and
+    /// > represents the pointer encoding used for the second argument, which is
+    /// > the address of a personality routine handler. The size of the
+    /// > personality routine pointer is specified by the pointer encoding used.
+    personality: Option<(constants::DwEhPe, Pointer)>,
+
+    /// > A 'R' may be present at any position after the first character of the
+    /// > string. This character may only be present if 'z' is the first character
+    /// > of the string. If present, The Augmentation Data shall include a 1 byte
+    /// > argument that represents the pointer encoding for the address pointers
+    /// > used in the FDE.
+    fde_address_encoding: Option<constants::DwEhPe>,
+
+    /// True if this CIE's FDEs are trampolines for signal handlers.
+    is_signal_trampoline: bool,
+}
+
+impl Augmentation {
+    fn parse<Section, R>(
+        augmentation_str: &mut R,
+        bases: &BaseAddresses,
+        address_size: u8,
+        section: &Section,
+        input: &mut R,
+    ) -> Result<Augmentation>
+    where
+        R: Reader,
+        Section: UnwindSection<R>,
+    {
+        debug_assert!(
+            !augmentation_str.is_empty(),
+            "Augmentation::parse should only be called if we have an augmentation"
+        );
+
+        let mut augmentation = Augmentation::default();
+
+        let mut parsed_first = false;
+        let mut data = None;
+
+        while !augmentation_str.is_empty() {
+            let ch = augmentation_str.read_u8()?;
+            match ch {
+                b'z' => {
+                    if parsed_first {
+                        return Err(Error::UnknownAugmentation);
+                    }
+
+                    let augmentation_length = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                    data = Some(input.split(augmentation_length)?);
+                }
+                b'L' => {
+                    let rest = data.as_mut().ok_or(Error::UnknownAugmentation)?;
+                    let encoding = parse_pointer_encoding(rest)?;
+                    augmentation.lsda = Some(encoding);
+                }
+                b'P' => {
+                    let rest = data.as_mut().ok_or(Error::UnknownAugmentation)?;
+                    let encoding = parse_pointer_encoding(rest)?;
+                    let parameters = PointerEncodingParameters {
+                        bases: &bases.eh_frame,
+                        func_base: None,
+                        address_size,
+                        section: section.section(),
+                    };
+
+                    let personality = parse_encoded_pointer(encoding, &parameters, rest)?;
+                    augmentation.personality = Some((encoding, personality));
+                }
+                b'R' => {
+                    let rest = data.as_mut().ok_or(Error::UnknownAugmentation)?;
+                    let encoding = parse_pointer_encoding(rest)?;
+                    augmentation.fde_address_encoding = Some(encoding);
+                }
+                b'S' => augmentation.is_signal_trampoline = true,
+                _ => return Err(Error::UnknownAugmentation),
+            }
+
+            parsed_first = true;
+        }
+
+        Ok(augmentation)
+    }
+}
+
+/// Parsed augmentation data for a `FrameDescriptEntry`.
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+struct AugmentationData {
+    lsda: Option<Pointer>,
+}
+
+impl AugmentationData {
+    fn parse<R: Reader>(
+        augmentation: &Augmentation,
+        encoding_parameters: &PointerEncodingParameters<R>,
+        input: &mut R,
+    ) -> Result<AugmentationData> {
+        // In theory, we should be iterating over the original augmentation
+        // string, interpreting each character, and reading the appropriate bits
+        // out of the augmentation data as we go. However, the only character
+        // that defines augmentation data in the FDE is the 'L' character, so we
+        // can just check for its presence directly.
+
+        let aug_data_len = input.read_uleb128().and_then(R::Offset::from_u64)?;
+        let rest = &mut input.split(aug_data_len)?;
+        let mut augmentation_data = AugmentationData::default();
+        if let Some(encoding) = augmentation.lsda {
+            let lsda = parse_encoded_pointer(encoding, encoding_parameters, rest)?;
+            augmentation_data.lsda = Some(lsda);
+        }
+        Ok(augmentation_data)
+    }
+}
+
+/// > A Common Information Entry holds information that is shared among many
+/// > Frame Description Entries. There is at least one CIE in every non-empty
+/// > `.debug_frame` section.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct CommonInformationEntry<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// The offset of this entry from the start of its containing section.
+    offset: Offset,
+
+    /// > A constant that gives the number of bytes of the CIE structure, not
+    /// > including the length field itself (see Section 7.2.2). The size of the
+    /// > length field plus the value of length must be an integral multiple of
+    /// > the address size.
+    length: Offset,
+
+    format: Format,
+
+    /// > A version number (see Section 7.23). This number is specific to the
+    /// > call frame information and is independent of the DWARF version number.
+    version: u8,
+
+    /// The parsed augmentation, if any.
+    augmentation: Option<Augmentation>,
+
+    /// > The size of a target address in this CIE and any FDEs that use it, in
+    /// > bytes. If a compilation unit exists for this frame, its address size
+    /// > must match the address size here.
+    address_size: u8,
+
+    /// "The size of a segment selector in this CIE and any FDEs that use it, in
+    /// bytes."
+    segment_size: u8,
+
+    /// "A constant that is factored out of all advance location instructions
+    /// (see Section 6.4.2.1)."
+    code_alignment_factor: u64,
+
+    /// > A constant that is factored out of certain offset instructions (see
+    /// > below). The resulting value is (operand * data_alignment_factor).
+    data_alignment_factor: i64,
+
+    /// > An unsigned LEB128 constant that indicates which column in the rule
+    /// > table represents the return address of the function. Note that this
+    /// > column might not correspond to an actual machine register.
+    return_address_register: Register,
+
+    /// > A sequence of rules that are interpreted to create the initial setting
+    /// > of each column in the table.
+    ///
+    /// > The default rule for all columns before interpretation of the initial
+    /// > instructions is the undefined rule. However, an ABI authoring body or a
+    /// > compilation system authoring body may specify an alternate default
+    /// > value for any or all columns.
+    ///
+    /// This is followed by `DW_CFA_nop` padding until the end of `length` bytes
+    /// in the input.
+    initial_instructions: R,
+}
+
+impl<R: Reader> CommonInformationEntry<R> {
+    fn parse<Section: UnwindSection<R>>(
+        bases: &BaseAddresses,
+        section: &Section,
+        input: &mut R,
+    ) -> Result<CommonInformationEntry<R>> {
+        match parse_cfi_entry(bases, section, input)? {
+            Some(CieOrFde::Cie(cie)) => Ok(cie),
+            Some(CieOrFde::Fde(_)) => Err(Error::NotCieId),
+            None => Err(Error::NoEntryAtGivenOffset),
+        }
+    }
+
+    fn parse_rest<Section: UnwindSection<R>>(
+        offset: R::Offset,
+        length: R::Offset,
+        format: Format,
+        bases: &BaseAddresses,
+        section: &Section,
+        mut rest: R,
+    ) -> Result<CommonInformationEntry<R>> {
+        let version = rest.read_u8()?;
+
+        // Version 1 of `.debug_frame` corresponds to DWARF 2, and then for
+        // DWARF 3 and 4, I think they decided to just match the standard's
+        // version.
+        match version {
+            1 | 3 | 4 => (),
+            _ => return Err(Error::UnknownVersion(u64::from(version))),
+        }
+
+        let mut augmentation_string = rest.read_null_terminated_slice()?;
+
+        let (address_size, segment_size) = if Section::has_address_and_segment_sizes(version) {
+            let address_size = rest.read_u8()?;
+            let segment_size = rest.read_u8()?;
+            (address_size, segment_size)
+        } else {
+            (section.address_size(), section.segment_size())
+        };
+
+        let code_alignment_factor = rest.read_uleb128()?;
+        let data_alignment_factor = rest.read_sleb128()?;
+
+        let return_address_register = if version == 1 {
+            Register(rest.read_u8()?.into())
+        } else {
+            rest.read_uleb128().and_then(Register::from_u64)?
+        };
+
+        let augmentation = if augmentation_string.is_empty() {
+            None
+        } else {
+            Some(Augmentation::parse(
+                &mut augmentation_string,
+                bases,
+                address_size,
+                section,
+                &mut rest,
+            )?)
+        };
+
+        let entry = CommonInformationEntry {
+            offset,
+            length,
+            format,
+            version,
+            augmentation,
+            address_size,
+            segment_size,
+            code_alignment_factor,
+            data_alignment_factor,
+            return_address_register,
+            initial_instructions: rest,
+        };
+
+        Ok(entry)
+    }
+}
+
+/// # Signal Safe Methods
+///
+/// These methods are guaranteed not to allocate, acquire locks, or perform any
+/// other signal-unsafe operations.
+impl<R: Reader> CommonInformationEntry<R> {
+    /// Get the offset of this entry from the start of its containing section.
+    pub fn offset(&self) -> R::Offset {
+        self.offset
+    }
+
+    /// Return the encoding parameters for this CIE.
+    pub fn encoding(&self) -> Encoding {
+        Encoding {
+            format: self.format,
+            version: u16::from(self.version),
+            address_size: self.address_size,
+        }
+    }
+
+    /// The size of addresses (in bytes) in this CIE.
+    pub fn address_size(&self) -> u8 {
+        self.address_size
+    }
+
+    /// Iterate over this CIE's initial instructions.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn instructions<'a, Section>(
+        &self,
+        section: &'a Section,
+        bases: &'a BaseAddresses,
+    ) -> CallFrameInstructionIter<'a, R>
+    where
+        Section: UnwindSection<R>,
+    {
+        CallFrameInstructionIter {
+            input: self.initial_instructions.clone(),
+            address_encoding: None,
+            parameters: PointerEncodingParameters {
+                bases: &bases.eh_frame,
+                func_base: None,
+                address_size: self.address_size,
+                section: section.section(),
+            },
+        }
+    }
+
+    /// > A constant that gives the number of bytes of the CIE structure, not
+    /// > including the length field itself (see Section 7.2.2). The size of the
+    /// > length field plus the value of length must be an integral multiple of
+    /// > the address size.
+    pub fn entry_len(&self) -> R::Offset {
+        self.length
+    }
+
+    /// > A version number (see Section 7.23). This number is specific to the
+    /// > call frame information and is independent of the DWARF version number.
+    pub fn version(&self) -> u8 {
+        self.version
+    }
+
+    /// Get the augmentation data, if any exists.
+    ///
+    /// The only augmentation understood by `gimli` is that which is defined by
+    /// `.eh_frame`.
+    pub fn augmentation(&self) -> Option<&Augmentation> {
+        self.augmentation.as_ref()
+    }
+
+    /// True if this CIE's FDEs have a LSDA.
+    pub fn has_lsda(&self) -> bool {
+        self.augmentation.map_or(false, |a| a.lsda.is_some())
+    }
+
+    /// Return the encoding of the LSDA address for this CIE's FDEs.
+    pub fn lsda_encoding(&self) -> Option<constants::DwEhPe> {
+        self.augmentation.and_then(|a| a.lsda)
+    }
+
+    /// Return the encoding and address of the personality routine handler
+    /// for this CIE's FDEs.
+    pub fn personality_with_encoding(&self) -> Option<(constants::DwEhPe, Pointer)> {
+        self.augmentation.as_ref().and_then(|a| a.personality)
+    }
+
+    /// Return the address of the personality routine handler
+    /// for this CIE's FDEs.
+    pub fn personality(&self) -> Option<Pointer> {
+        self.augmentation
+            .as_ref()
+            .and_then(|a| a.personality)
+            .map(|(_, p)| p)
+    }
+
+    /// Return the encoding of the addresses for this CIE's FDEs.
+    pub fn fde_address_encoding(&self) -> Option<constants::DwEhPe> {
+        self.augmentation.and_then(|a| a.fde_address_encoding)
+    }
+
+    /// True if this CIE's FDEs are trampolines for signal handlers.
+    pub fn is_signal_trampoline(&self) -> bool {
+        self.augmentation.map_or(false, |a| a.is_signal_trampoline)
+    }
+
+    /// > A constant that is factored out of all advance location instructions
+    /// > (see Section 6.4.2.1).
+    pub fn code_alignment_factor(&self) -> u64 {
+        self.code_alignment_factor
+    }
+
+    /// > A constant that is factored out of certain offset instructions (see
+    /// > below). The resulting value is (operand * data_alignment_factor).
+    pub fn data_alignment_factor(&self) -> i64 {
+        self.data_alignment_factor
+    }
+
+    /// > An unsigned ... constant that indicates which column in the rule
+    /// > table represents the return address of the function. Note that this
+    /// > column might not correspond to an actual machine register.
+    pub fn return_address_register(&self) -> Register {
+        self.return_address_register
+    }
+}
+
+/// A partially parsed `FrameDescriptionEntry`.
+///
+/// Fully parsing this FDE requires first parsing its CIE.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PartialFrameDescriptionEntry<'bases, Section, R>
+where
+    R: Reader,
+    Section: UnwindSection<R>,
+{
+    offset: R::Offset,
+    length: R::Offset,
+    format: Format,
+    cie_offset: Section::Offset,
+    rest: R,
+    section: Section,
+    bases: &'bases BaseAddresses,
+}
+
+impl<'bases, Section, R> PartialFrameDescriptionEntry<'bases, Section, R>
+where
+    R: Reader,
+    Section: UnwindSection<R>,
+{
+    fn parse_partial(
+        section: &Section,
+        bases: &'bases BaseAddresses,
+        input: &mut R,
+    ) -> Result<PartialFrameDescriptionEntry<'bases, Section, R>> {
+        match parse_cfi_entry(bases, section, input)? {
+            Some(CieOrFde::Cie(_)) => Err(Error::NotFdePointer),
+            Some(CieOrFde::Fde(partial)) => Ok(partial),
+            None => Err(Error::NoEntryAtGivenOffset),
+        }
+    }
+
+    /// Fully parse this FDE.
+    ///
+    /// You must provide a function get its associated CIE (either by parsing it
+    /// on demand, or looking it up in some table mapping offsets to CIEs that
+    /// you've already parsed, etc.)
+    pub fn parse<F>(&self, get_cie: F) -> Result<FrameDescriptionEntry<R>>
+    where
+        F: FnMut(&Section, &BaseAddresses, Section::Offset) -> Result<CommonInformationEntry<R>>,
+    {
+        FrameDescriptionEntry::parse_rest(
+            self.offset,
+            self.length,
+            self.format,
+            self.cie_offset,
+            self.rest.clone(),
+            &self.section,
+            self.bases,
+            get_cie,
+        )
+    }
+}
+
+/// A `FrameDescriptionEntry` is a set of CFA instructions for an address range.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct FrameDescriptionEntry<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// The start of this entry within its containing section.
+    offset: Offset,
+
+    /// > A constant that gives the number of bytes of the header and
+    /// > instruction stream for this function, not including the length field
+    /// > itself (see Section 7.2.2). The size of the length field plus the value
+    /// > of length must be an integral multiple of the address size.
+    length: Offset,
+
+    format: Format,
+
+    /// "A constant offset into the .debug_frame section that denotes the CIE
+    /// that is associated with this FDE."
+    ///
+    /// This is the CIE at that offset.
+    cie: CommonInformationEntry<R, Offset>,
+
+    /// > The address of the first location associated with this table entry. If
+    /// > the segment_size field of this FDE's CIE is non-zero, the initial
+    /// > location is preceded by a segment selector of the given length.
+    initial_segment: u64,
+    initial_address: u64,
+
+    /// "The number of bytes of program instructions described by this entry."
+    address_range: u64,
+
+    /// The parsed augmentation data, if we have any.
+    augmentation: Option<AugmentationData>,
+
+    /// "A sequence of table defining instructions that are described below."
+    ///
+    /// This is followed by `DW_CFA_nop` padding until `length` bytes of the
+    /// input are consumed.
+    instructions: R,
+}
+
+impl<R: Reader> FrameDescriptionEntry<R> {
+    #[allow(clippy::too_many_arguments)]
+    fn parse_rest<Section, F>(
+        offset: R::Offset,
+        length: R::Offset,
+        format: Format,
+        cie_pointer: Section::Offset,
+        mut rest: R,
+        section: &Section,
+        bases: &BaseAddresses,
+        mut get_cie: F,
+    ) -> Result<FrameDescriptionEntry<R>>
+    where
+        Section: UnwindSection<R>,
+        F: FnMut(&Section, &BaseAddresses, Section::Offset) -> Result<CommonInformationEntry<R>>,
+    {
+        let cie = get_cie(section, bases, cie_pointer)?;
+
+        let initial_segment = if cie.segment_size > 0 {
+            rest.read_address(cie.segment_size)?
+        } else {
+            0
+        };
+
+        let mut parameters = PointerEncodingParameters {
+            bases: &bases.eh_frame,
+            func_base: None,
+            address_size: cie.address_size,
+            section: section.section(),
+        };
+
+        let (initial_address, address_range) = Self::parse_addresses(&mut rest, &cie, &parameters)?;
+        parameters.func_base = Some(initial_address);
+
+        let aug_data = if let Some(ref augmentation) = cie.augmentation {
+            Some(AugmentationData::parse(
+                augmentation,
+                &parameters,
+                &mut rest,
+            )?)
+        } else {
+            None
+        };
+
+        let entry = FrameDescriptionEntry {
+            offset,
+            length,
+            format,
+            cie,
+            initial_segment,
+            initial_address,
+            address_range,
+            augmentation: aug_data,
+            instructions: rest,
+        };
+
+        Ok(entry)
+    }
+
+    fn parse_addresses(
+        input: &mut R,
+        cie: &CommonInformationEntry<R>,
+        parameters: &PointerEncodingParameters<R>,
+    ) -> Result<(u64, u64)> {
+        let encoding = cie.augmentation().and_then(|a| a.fde_address_encoding);
+        if let Some(encoding) = encoding {
+            let initial_address = parse_encoded_pointer(encoding, parameters, input)?;
+
+            // Ignore indirection.
+            let initial_address = initial_address.into();
+
+            // Address ranges cannot be relative to anything, so just grab the
+            // data format bits from the encoding.
+            let address_range = parse_encoded_pointer(encoding.format(), parameters, input)?;
+            Ok((initial_address, address_range.into()))
+        } else {
+            let initial_address = input.read_address(cie.address_size)?;
+            let address_range = input.read_address(cie.address_size)?;
+            Ok((initial_address, address_range))
+        }
+    }
+
+    /// Return the table of unwind information for this FDE.
+    #[inline]
+    pub fn rows<'a, Section: UnwindSection<R>>(
+        &self,
+        section: &'a Section,
+        bases: &'a BaseAddresses,
+        ctx: &'a mut UninitializedUnwindContext<R>,
+    ) -> Result<UnwindTable<'a, R>> {
+        UnwindTable::new(section, bases, ctx, self)
+    }
+
+    /// Find the frame unwind information for the given address.
+    ///
+    /// If found, the unwind information is returned along with the reset
+    /// context in the form `Ok((unwind_info, context))`. If not found,
+    /// `Err(gimli::Error::NoUnwindInfoForAddress)` is returned. If parsing or
+    /// CFI evaluation fails, the error is returned.
+    pub fn unwind_info_for_address<Section: UnwindSection<R>>(
+        &self,
+        section: &Section,
+        bases: &BaseAddresses,
+        ctx: &mut UninitializedUnwindContext<R>,
+        address: u64,
+    ) -> Result<UnwindTableRow<R>> {
+        let mut table = self.rows(section, bases, ctx)?;
+        while let Some(row) = table.next_row()? {
+            if row.contains(address) {
+                return Ok(row.clone());
+            }
+        }
+        Err(Error::NoUnwindInfoForAddress)
+    }
+}
+
+/// # Signal Safe Methods
+///
+/// These methods are guaranteed not to allocate, acquire locks, or perform any
+/// other signal-unsafe operations.
+#[allow(clippy::len_without_is_empty)]
+impl<R: Reader> FrameDescriptionEntry<R> {
+    /// Get the offset of this entry from the start of its containing section.
+    pub fn offset(&self) -> R::Offset {
+        self.offset
+    }
+
+    /// Get a reference to this FDE's CIE.
+    pub fn cie(&self) -> &CommonInformationEntry<R> {
+        &self.cie
+    }
+
+    /// > A constant that gives the number of bytes of the header and
+    /// > instruction stream for this function, not including the length field
+    /// > itself (see Section 7.2.2). The size of the length field plus the value
+    /// > of length must be an integral multiple of the address size.
+    pub fn entry_len(&self) -> R::Offset {
+        self.length
+    }
+
+    /// Iterate over this FDE's instructions.
+    ///
+    /// Will not include the CIE's initial instructions, if you want those do
+    /// `fde.cie().instructions()` first.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn instructions<'a, Section>(
+        &self,
+        section: &'a Section,
+        bases: &'a BaseAddresses,
+    ) -> CallFrameInstructionIter<'a, R>
+    where
+        Section: UnwindSection<R>,
+    {
+        CallFrameInstructionIter {
+            input: self.instructions.clone(),
+            address_encoding: self.cie.augmentation().and_then(|a| a.fde_address_encoding),
+            parameters: PointerEncodingParameters {
+                bases: &bases.eh_frame,
+                func_base: None,
+                address_size: self.cie.address_size,
+                section: section.section(),
+            },
+        }
+    }
+
+    /// The first address for which this entry has unwind information for.
+    pub fn initial_address(&self) -> u64 {
+        self.initial_address
+    }
+
+    /// The number of bytes of instructions that this entry has unwind
+    /// information for.
+    pub fn len(&self) -> u64 {
+        self.address_range
+    }
+
+    /// Return `true` if the given address is within this FDE, `false`
+    /// otherwise.
+    ///
+    /// This is equivalent to `entry.initial_address() <= address <
+    /// entry.initial_address() + entry.len()`.
+    pub fn contains(&self, address: u64) -> bool {
+        let start = self.initial_address();
+        let end = start + self.len();
+        start <= address && address < end
+    }
+
+    /// The address of this FDE's language-specific data area (LSDA), if it has
+    /// any.
+    pub fn lsda(&self) -> Option<Pointer> {
+        self.augmentation.as_ref().and_then(|a| a.lsda)
+    }
+
+    /// Return true if this FDE's function is a trampoline for a signal handler.
+    #[inline]
+    pub fn is_signal_trampoline(&self) -> bool {
+        self.cie().is_signal_trampoline()
+    }
+
+    /// Return the address of the FDE's function's personality routine
+    /// handler. The personality routine does language-specific clean up when
+    /// unwinding the stack frames with the intent to not run them again.
+    #[inline]
+    pub fn personality(&self) -> Option<Pointer> {
+        self.cie().personality()
+    }
+}
+
+/// Common context needed when evaluating the call frame unwinding information.
+///
+/// To avoid re-allocating the context multiple times when evaluating multiple
+/// CFI programs, it can be reused. At first, a context is uninitialized
+/// (`UninitializedUnwindContext`). It can be initialized by providing the
+/// `CommonInformationEntry` for the CFI program about to be evaluated and
+/// calling `UninitializedUnwindContext::initialize`. The result is a `&mut UnwindContext`
+/// which borrows the uninitialized context, and can be used to evaluate and run a
+/// `FrameDescriptionEntry`'s CFI program.
+///
+/// ```
+/// use gimli::{UninitializedUnwindContext, UnwindTable};
+///
+/// # fn foo<'a>(some_fde: gimli::FrameDescriptionEntry<gimli::EndianSlice<'a, gimli::LittleEndian>>)
+/// #            -> gimli::Result<()> {
+/// # let eh_frame: gimli::EhFrame<_> = unreachable!();
+/// # let bases = unimplemented!();
+/// // An uninitialized context.
+/// let mut ctx = UninitializedUnwindContext::new();
+///
+/// // Initialize the context by evaluating the CIE's initial instruction program,
+/// // and generate the unwind table.
+/// let mut table = some_fde.rows(&eh_frame, &bases, &mut ctx)?;
+/// while let Some(row) = table.next_row()? {
+///     // Do stuff with each row...
+/// #   let _ = row;
+/// }
+/// # unreachable!()
+/// # }
+/// ```
+#[derive(Clone, Debug)]
+pub struct UninitializedUnwindContext<R: Reader>(Box<UnwindContext<R>>);
+
+impl<R: Reader> UninitializedUnwindContext<R> {
+    /// Construct a new call frame unwinding context.
+    pub fn new() -> UninitializedUnwindContext<R> {
+        UninitializedUnwindContext(Box::new(UnwindContext::new()))
+    }
+}
+
+impl<R: Reader> Default for UninitializedUnwindContext<R> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// # Signal Safe Methods
+///
+/// These methods are guaranteed not to allocate, acquire locks, or perform any
+/// other signal-unsafe operations.
+impl<R: Reader> UninitializedUnwindContext<R> {
+    /// Run the CIE's initial instructions, creating and return an
+    /// `UnwindContext`.
+    pub fn initialize<Section: UnwindSection<R>>(
+        &mut self,
+        section: &Section,
+        bases: &BaseAddresses,
+        cie: &CommonInformationEntry<R>,
+    ) -> Result<&mut UnwindContext<R>> {
+        if self.0.is_initialized {
+            self.0.reset();
+        }
+
+        let mut table = UnwindTable::new_for_cie(section, bases, &mut self.0, cie);
+        while let Some(_) = table.next_row()? {}
+
+        self.0.save_initial_rules();
+        Ok(&mut self.0)
+    }
+}
+
+const MAX_UNWIND_STACK_DEPTH: usize = 4;
+
+/// An unwinding context.
+#[derive(Clone, Debug, Eq)]
+pub struct UnwindContext<R: Reader> {
+    // Stack of rows. The last row is the row currently being built by the
+    // program. There is always at least one row. The vast majority of CFI
+    // programs will only ever have one row on the stack.
+    stack_storage: [UnwindTableRow<R>; MAX_UNWIND_STACK_DEPTH],
+    stack_len: usize,
+
+    // If we are evaluating an FDE's instructions, then `is_initialized` will be
+    // `true` and `initial_rules` will contain the initial register rules
+    // described by the CIE's initial instructions. These rules are used by
+    // `DW_CFA_restore`. Otherwise, when we are currently evaluating a CIE's
+    // initial instructions, `is_initialized` will be `false` and
+    // `initial_rules` is not to be read from.
+    initial_rules: RegisterRuleMap<R>,
+    is_initialized: bool,
+}
+
+/// # Signal Safe Methods
+///
+/// These methods are guaranteed not to allocate, acquire locks, or perform any
+/// other signal-unsafe operations.
+impl<R: Reader> UnwindContext<R> {
+    fn new() -> UnwindContext<R> {
+        let mut ctx = UnwindContext {
+            stack_storage: Default::default(),
+            stack_len: 0,
+            is_initialized: false,
+            initial_rules: Default::default(),
+        };
+        ctx.reset();
+        ctx
+    }
+
+    fn stack(&self) -> &[UnwindTableRow<R>] {
+        &self.stack_storage[..self.stack_len]
+    }
+
+    fn stack_mut(&mut self) -> &mut [UnwindTableRow<R>] {
+        &mut self.stack_storage[..self.stack_len]
+    }
+
+    fn reset(&mut self) {
+        self.stack_len = 0;
+        let res = self.try_push(UnwindTableRow::default());
+        debug_assert!(res);
+
+        self.initial_rules.clear();
+        self.is_initialized = false;
+
+        self.assert_fully_uninitialized();
+    }
+
+    // Asserts that we are fully uninitialized, ie not initialized *and* not in
+    // the process of initializing.
+    #[inline]
+    fn assert_fully_uninitialized(&self) {
+        assert_eq!(self.is_initialized, false);
+        assert_eq!(self.initial_rules.rules().len(), 0);
+        assert_eq!(self.stack().len(), 1);
+        assert!(self.stack()[0].is_default());
+    }
+
+    fn row(&self) -> &UnwindTableRow<R> {
+        self.stack().last().unwrap()
+    }
+
+    fn row_mut(&mut self) -> &mut UnwindTableRow<R> {
+        self.stack_mut().last_mut().unwrap()
+    }
+
+    fn save_initial_rules(&mut self) {
+        assert_eq!(self.is_initialized, false);
+        let registers = &self.stack_storage[self.stack_len - 1].registers;
+        self.initial_rules.clone_from(&registers);
+        self.is_initialized = true;
+    }
+
+    fn start_address(&self) -> u64 {
+        self.row().start_address
+    }
+
+    fn set_start_address(&mut self, start_address: u64) {
+        let row = self.row_mut();
+        row.start_address = start_address;
+    }
+
+    fn set_register_rule(&mut self, register: Register, rule: RegisterRule<R>) -> Result<()> {
+        let row = self.row_mut();
+        row.registers.set(register, rule)
+    }
+
+    /// Returns `None` if we have not completed evaluation of a CIE's initial
+    /// instructions.
+    fn get_initial_rule(&self, register: Register) -> Option<RegisterRule<R>> {
+        if !self.is_initialized {
+            return None;
+        }
+
+        Some(self.initial_rules.get(register))
+    }
+
+    fn set_cfa(&mut self, cfa: CfaRule<R>) {
+        self.row_mut().cfa = cfa;
+    }
+
+    fn cfa_mut(&mut self) -> &mut CfaRule<R> {
+        &mut self.row_mut().cfa
+    }
+
+    fn push_row(&mut self) -> Result<()> {
+        let new_row = self.row().clone();
+        if self.try_push(new_row) {
+            Ok(())
+        } else {
+            Err(Error::CfiStackFull)
+        }
+    }
+
+    fn try_push(&mut self, row: UnwindTableRow<R>) -> bool {
+        if self.stack_len < self.stack_storage.len() {
+            self.stack_storage[self.stack_len] = row;
+            self.stack_len += 1;
+            true
+        } else {
+            false
+        }
+    }
+
+    fn pop_row(&mut self) {
+        assert!(self.stack().len() > 1);
+        self.stack_len -= 1;
+    }
+}
+
+impl<R: Reader + PartialEq> PartialEq for UnwindContext<R> {
+    fn eq(&self, other: &UnwindContext<R>) -> bool {
+        self.stack() == other.stack()
+            && self.initial_rules == other.initial_rules
+            && self.is_initialized == other.is_initialized
+    }
+}
+
+/// The `UnwindTable` iteratively evaluates a `FrameDescriptionEntry`'s
+/// `CallFrameInstruction` program, yielding the each row one at a time.
+///
+/// > 6.4.1 Structure of Call Frame Information
+/// >
+/// > DWARF supports virtual unwinding by defining an architecture independent
+/// > basis for recording how procedures save and restore registers during their
+/// > lifetimes. This basis must be augmented on some machines with specific
+/// > information that is defined by an architecture specific ABI authoring
+/// > committee, a hardware vendor, or a compiler producer. The body defining a
+/// > specific augmentation is referred to below as the “augmenter.�
+/// >
+/// > Abstractly, this mechanism describes a very large table that has the
+/// > following structure:
+/// >
+/// > <table>
+/// >   <tr>
+/// >     <th>LOC</th><th>CFA</th><th>R0</th><th>R1</th><td>...</td><th>RN</th>
+/// >   </tr>
+/// >   <tr>
+/// >     <th>L0</th> <td></td>   <td></td>  <td></td>  <td></td>   <td></td>
+/// >   </tr>
+/// >   <tr>
+/// >     <th>L1</th> <td></td>   <td></td>  <td></td>  <td></td>   <td></td>
+/// >   </tr>
+/// >   <tr>
+/// >     <td>...</td><td></td>   <td></td>  <td></td>  <td></td>   <td></td>
+/// >   </tr>
+/// >   <tr>
+/// >     <th>LN</th> <td></td>   <td></td>  <td></td>  <td></td>   <td></td>
+/// >   </tr>
+/// > </table>
+/// >
+/// > The first column indicates an address for every location that contains code
+/// > in a program. (In shared objects, this is an object-relative offset.) The
+/// > remaining columns contain virtual unwinding rules that are associated with
+/// > the indicated location.
+/// >
+/// > The CFA column defines the rule which computes the Canonical Frame Address
+/// > value; it may be either a register and a signed offset that are added
+/// > together, or a DWARF expression that is evaluated.
+/// >
+/// > The remaining columns are labeled by register number. This includes some
+/// > registers that have special designation on some architectures such as the PC
+/// > and the stack pointer register. (The actual mapping of registers for a
+/// > particular architecture is defined by the augmenter.) The register columns
+/// > contain rules that describe whether a given register has been saved and the
+/// > rule to find the value for the register in the previous frame.
+/// >
+/// > ...
+/// >
+/// > This table would be extremely large if actually constructed as
+/// > described. Most of the entries at any point in the table are identical to
+/// > the ones above them. The whole table can be represented quite compactly by
+/// > recording just the differences starting at the beginning address of each
+/// > subroutine in the program.
+#[derive(Debug)]
+pub struct UnwindTable<'a, R: Reader> {
+    code_alignment_factor: Wrapping<u64>,
+    data_alignment_factor: Wrapping<i64>,
+    next_start_address: u64,
+    last_end_address: u64,
+    returned_last_row: bool,
+    instructions: CallFrameInstructionIter<'a, R>,
+    ctx: &'a mut UnwindContext<R>,
+}
+
+/// # Signal Safe Methods
+///
+/// These methods are guaranteed not to allocate, acquire locks, or perform any
+/// other signal-unsafe operations.
+impl<'a, R: Reader> UnwindTable<'a, R> {
+    /// Construct a new `UnwindTable` for the given
+    /// `FrameDescriptionEntry`'s CFI unwinding program.
+    pub fn new<Section: UnwindSection<R>>(
+        section: &'a Section,
+        bases: &'a BaseAddresses,
+        ctx: &'a mut UninitializedUnwindContext<R>,
+        fde: &FrameDescriptionEntry<R>,
+    ) -> Result<UnwindTable<'a, R>> {
+        let ctx = ctx.initialize(section, bases, fde.cie())?;
+        Ok(Self::new_for_fde(section, bases, ctx, fde))
+    }
+
+    fn new_for_fde<Section: UnwindSection<R>>(
+        section: &'a Section,
+        bases: &'a BaseAddresses,
+        ctx: &'a mut UnwindContext<R>,
+        fde: &FrameDescriptionEntry<R>,
+    ) -> UnwindTable<'a, R> {
+        assert!(ctx.stack().len() >= 1);
+        UnwindTable {
+            code_alignment_factor: Wrapping(fde.cie().code_alignment_factor()),
+            data_alignment_factor: Wrapping(fde.cie().data_alignment_factor()),
+            next_start_address: fde.initial_address(),
+            last_end_address: fde.initial_address().wrapping_add(fde.len()),
+            returned_last_row: false,
+            instructions: fde.instructions(section, bases),
+            ctx,
+        }
+    }
+
+    fn new_for_cie<Section: UnwindSection<R>>(
+        section: &'a Section,
+        bases: &'a BaseAddresses,
+        ctx: &'a mut UnwindContext<R>,
+        cie: &CommonInformationEntry<R>,
+    ) -> UnwindTable<'a, R> {
+        assert!(ctx.stack().len() >= 1);
+        UnwindTable {
+            code_alignment_factor: Wrapping(cie.code_alignment_factor()),
+            data_alignment_factor: Wrapping(cie.data_alignment_factor()),
+            next_start_address: 0,
+            last_end_address: 0,
+            returned_last_row: false,
+            instructions: cie.instructions(section, bases),
+            ctx,
+        }
+    }
+
+    /// Evaluate call frame instructions until the next row of the table is
+    /// completed, and return it.
+    ///
+    /// Unfortunately, this cannot be used with `FallibleIterator` because of
+    /// the restricted lifetime of the yielded item.
+    pub fn next_row(&mut self) -> Result<Option<&UnwindTableRow<R>>> {
+        assert!(self.ctx.stack().len() >= 1);
+        self.ctx.set_start_address(self.next_start_address);
+
+        loop {
+            match self.instructions.next() {
+                Err(e) => return Err(e),
+
+                Ok(None) => {
+                    if self.returned_last_row {
+                        return Ok(None);
+                    }
+
+                    let row = self.ctx.row_mut();
+                    row.end_address = self.last_end_address;
+
+                    self.returned_last_row = true;
+                    return Ok(Some(row));
+                }
+
+                Ok(Some(instruction)) => {
+                    if self.evaluate(instruction)? {
+                        return Ok(Some(self.ctx.row()));
+                    }
+                }
+            };
+        }
+    }
+
+    /// Evaluate one call frame instruction. Return `Ok(true)` if the row is
+    /// complete, `Ok(false)` otherwise.
+    fn evaluate(&mut self, instruction: CallFrameInstruction<R>) -> Result<bool> {
+        use crate::CallFrameInstruction::*;
+
+        match instruction {
+            // Instructions that complete the current row and advance the
+            // address for the next row.
+            SetLoc { address } => {
+                if address < self.ctx.start_address() {
+                    return Err(Error::InvalidAddressRange);
+                }
+
+                self.next_start_address = address;
+                self.ctx.row_mut().end_address = self.next_start_address;
+                return Ok(true);
+            }
+            AdvanceLoc { delta } => {
+                let delta = Wrapping(u64::from(delta)) * self.code_alignment_factor;
+                self.next_start_address = (Wrapping(self.ctx.start_address()) + delta).0;
+                self.ctx.row_mut().end_address = self.next_start_address;
+                return Ok(true);
+            }
+
+            // Instructions that modify the CFA.
+            DefCfa { register, offset } => {
+                self.ctx.set_cfa(CfaRule::RegisterAndOffset {
+                    register,
+                    offset: offset as i64,
+                });
+            }
+            DefCfaSf {
+                register,
+                factored_offset,
+            } => {
+                let data_align = self.data_alignment_factor;
+                self.ctx.set_cfa(CfaRule::RegisterAndOffset {
+                    register,
+                    offset: (Wrapping(factored_offset) * data_align).0,
+                });
+            }
+            DefCfaRegister { register } => {
+                if let CfaRule::RegisterAndOffset {
+                    register: ref mut reg,
+                    ..
+                } = *self.ctx.cfa_mut()
+                {
+                    *reg = register;
+                } else {
+                    return Err(Error::CfiInstructionInInvalidContext);
+                }
+            }
+            DefCfaOffset { offset } => {
+                if let CfaRule::RegisterAndOffset {
+                    offset: ref mut off,
+                    ..
+                } = *self.ctx.cfa_mut()
+                {
+                    *off = offset as i64;
+                } else {
+                    return Err(Error::CfiInstructionInInvalidContext);
+                }
+            }
+            DefCfaOffsetSf { factored_offset } => {
+                if let CfaRule::RegisterAndOffset {
+                    offset: ref mut off,
+                    ..
+                } = *self.ctx.cfa_mut()
+                {
+                    let data_align = self.data_alignment_factor;
+                    *off = (Wrapping(factored_offset) * data_align).0;
+                } else {
+                    return Err(Error::CfiInstructionInInvalidContext);
+                }
+            }
+            DefCfaExpression { expression } => {
+                self.ctx.set_cfa(CfaRule::Expression(expression));
+            }
+
+            // Instructions that define register rules.
+            Undefined { register } => {
+                self.ctx
+                    .set_register_rule(register, RegisterRule::Undefined)?;
+            }
+            SameValue { register } => {
+                self.ctx
+                    .set_register_rule(register, RegisterRule::SameValue)?;
+            }
+            Offset {
+                register,
+                factored_offset,
+            } => {
+                let offset = Wrapping(factored_offset as i64) * self.data_alignment_factor;
+                self.ctx
+                    .set_register_rule(register, RegisterRule::Offset(offset.0))?;
+            }
+            OffsetExtendedSf {
+                register,
+                factored_offset,
+            } => {
+                let offset = Wrapping(factored_offset) * self.data_alignment_factor;
+                self.ctx
+                    .set_register_rule(register, RegisterRule::Offset(offset.0))?;
+            }
+            ValOffset {
+                register,
+                factored_offset,
+            } => {
+                let offset = Wrapping(factored_offset as i64) * self.data_alignment_factor;
+                self.ctx
+                    .set_register_rule(register, RegisterRule::ValOffset(offset.0))?;
+            }
+            ValOffsetSf {
+                register,
+                factored_offset,
+            } => {
+                let offset = Wrapping(factored_offset) * self.data_alignment_factor;
+                self.ctx
+                    .set_register_rule(register, RegisterRule::ValOffset(offset.0))?;
+            }
+            Register {
+                dest_register,
+                src_register,
+            } => {
+                self.ctx
+                    .set_register_rule(dest_register, RegisterRule::Register(src_register))?;
+            }
+            Expression {
+                register,
+                expression,
+            } => {
+                let expression = RegisterRule::Expression(expression);
+                self.ctx.set_register_rule(register, expression)?;
+            }
+            ValExpression {
+                register,
+                expression,
+            } => {
+                let expression = RegisterRule::ValExpression(expression);
+                self.ctx.set_register_rule(register, expression)?;
+            }
+            Restore { register } => {
+                let initial_rule = if let Some(rule) = self.ctx.get_initial_rule(register) {
+                    rule
+                } else {
+                    // Can't restore the initial rule when we are
+                    // evaluating the initial rules!
+                    return Err(Error::CfiInstructionInInvalidContext);
+                };
+
+                self.ctx.set_register_rule(register, initial_rule)?;
+            }
+
+            // Row push and pop instructions.
+            RememberState => {
+                self.ctx.push_row()?;
+            }
+            RestoreState => {
+                assert!(self.ctx.stack().len() > 0);
+                if self.ctx.stack().len() == 1 {
+                    return Err(Error::PopWithEmptyStack);
+                }
+                // Pop state while preserving current location.
+                let start_address = self.ctx.start_address();
+                self.ctx.pop_row();
+                self.ctx.set_start_address(start_address);
+            }
+
+            // GNU Extension. Save the size somewhere so the unwinder can use
+            // it when restoring IP
+            ArgsSize { size } => {
+                self.ctx.row_mut().saved_args_size = size;
+            }
+
+            // No operation.
+            Nop => {}
+        };
+
+        Ok(false)
+    }
+}
+
+// We tend to have very few register rules: usually only a couple. Even if we
+// have a rule for every register, on x86-64 with SSE and everything we're
+// talking about ~100 rules. So rather than keeping the rules in a hash map, or
+// a vector indexed by register number (which would lead to filling lots of
+// empty entries), we store them as a vec of (register number, register rule)
+// pairs.
+//
+// Additionally, because every register's default rule is implicitly
+// `RegisterRule::Undefined`, we never store a register's rule in this vec if it
+// is undefined and save a little bit more space and do a little fewer
+// comparisons that way.
+//
+// The maximum number of rules preallocated by libunwind is 97 for AArch64, 128
+// for ARM, and even 188 for MIPS. It is extremely unlikely to encounter this
+// many register rules in practice.
+//
+// See:
+// - https://github.com/libunwind/libunwind/blob/11fd461095ea98f4b3e3a361f5a8a558519363fa/include/tdep-x86_64/dwarf-config.h#L36
+// - https://github.com/libunwind/libunwind/blob/11fd461095ea98f4b3e3a361f5a8a558519363fa/include/tdep-aarch64/dwarf-config.h#L32
+// - https://github.com/libunwind/libunwind/blob/11fd461095ea98f4b3e3a361f5a8a558519363fa/include/tdep-arm/dwarf-config.h#L31
+// - https://github.com/libunwind/libunwind/blob/11fd461095ea98f4b3e3a361f5a8a558519363fa/include/tdep-mips/dwarf-config.h#L31
+//
+// TODO: Consider using const generics for the array size.
+struct RegisterRuleMap<R: Reader> {
+    rules_storage: MaybeUninit<[(Register, RegisterRule<R>); MAX_RULES]>,
+    rules_len: usize,
+}
+
+const MAX_RULES: usize = 192;
+
+impl<R: Reader + Debug> Debug for RegisterRuleMap<R> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("RegisterRuleMap")
+            .field("rules", &self.rules())
+            .finish()
+    }
+}
+
+impl<R: Reader> Default for RegisterRuleMap<R> {
+    fn default() -> Self {
+        RegisterRuleMap {
+            rules_storage: MaybeUninit::uninit(),
+            rules_len: 0,
+        }
+    }
+}
+
+impl<R: Reader + Clone> Clone for RegisterRuleMap<R> {
+    fn clone(&self) -> Self {
+        let mut new = RegisterRuleMap::default();
+        for (register, rule) in self.rules() {
+            new.push(register.clone(), rule.clone()).unwrap();
+        }
+        return new;
+    }
+}
+
+impl<R: Reader> Drop for RegisterRuleMap<R> {
+    fn drop(&mut self) {
+        self.clear();
+    }
+}
+
+/// # Signal Safe Methods
+///
+/// These methods are guaranteed not to allocate, acquire locks, or perform any
+/// other signal-unsafe operations.
+impl<R: Reader> RegisterRuleMap<R> {
+    fn is_default(&self) -> bool {
+        self.rules_len == 0
+    }
+
+    fn rules(&self) -> &[(Register, RegisterRule<R>)] {
+        // Note that the unsafety here relies on the mutation of
+        // `self.rules_len` in `self.push` below, which guarantees that once
+        // we've pushed something the `rules_storage` is valid for that many
+        // elements.
+        unsafe {
+            core::slice::from_raw_parts(self.rules_storage.as_ptr() as *const _, self.rules_len)
+        }
+    }
+
+    fn rules_mut(&mut self) -> &mut [(Register, RegisterRule<R>)] {
+        // See the note in `rules` on safety here.
+        unsafe {
+            core::slice::from_raw_parts_mut(
+                self.rules_storage.as_mut_ptr() as *mut _,
+                self.rules_len,
+            )
+        }
+    }
+
+    fn get(&self, register: Register) -> RegisterRule<R> {
+        self.rules()
+            .iter()
+            .find(|rule| rule.0 == register)
+            .map(|r| {
+                debug_assert!(r.1.is_defined());
+                r.1.clone()
+            })
+            .unwrap_or(RegisterRule::Undefined)
+    }
+
+    fn set(&mut self, register: Register, rule: RegisterRule<R>) -> Result<()> {
+        if !rule.is_defined() {
+            let idx = self
+                .rules()
+                .iter()
+                .enumerate()
+                .find(|&(_, r)| r.0 == register)
+                .map(|(i, _)| i);
+            if let Some(idx) = idx {
+                let (a, b) = self.rules_mut().split_at_mut(idx + 1);
+                if b.len() > 0 {
+                    mem::swap(&mut a[a.len() - 1], &mut b[b.len() - 1]);
+                }
+                unsafe {
+                    let ptr = self.rules_storage.as_mut_ptr() as *mut (Register, RegisterRule<R>);
+                    ptr::drop_in_place(ptr.add(self.rules_len - 1));
+                    self.rules_len -= 1;
+                }
+            }
+            return Ok(());
+        }
+
+        for &mut (reg, ref mut old_rule) in self.rules_mut() {
+            debug_assert!(old_rule.is_defined());
+            if reg == register {
+                *old_rule = rule;
+                return Ok(());
+            }
+        }
+
+        self.push(register, rule)
+    }
+
+    fn clear(&mut self) {
+        unsafe {
+            ptr::drop_in_place(self.rules_mut());
+            self.rules_len = 0;
+        }
+    }
+
+    fn iter(&self) -> RegisterRuleIter<R> {
+        RegisterRuleIter(self.rules().iter())
+    }
+
+    fn push(&mut self, register: Register, rule: RegisterRule<R>) -> Result<()> {
+        if self.rules_len >= MAX_RULES {
+            return Err(Error::TooManyRegisterRules);
+        }
+        // The unsafety here comes from working with `MaybeUninit` to initialize
+        // our 192-element array. We're pushing a new element onto that array
+        // here. Just above we did a bounds check to make sure we actually have
+        // space to push something and here we're doing the actual memory write,
+        // along with an increment of `rules_len` which will affect the unsafe
+        // implementations of `rules` and `rules_mut` above.
+        unsafe {
+            let ptr = self.rules_storage.as_mut_ptr() as *mut (Register, RegisterRule<R>);
+            ptr::write(ptr.add(self.rules_len), (register, rule));
+            self.rules_len += 1;
+        }
+        Ok(())
+    }
+}
+
+impl<'a, R> FromIterator<&'a (Register, RegisterRule<R>)> for RegisterRuleMap<R>
+where
+    R: 'a + Reader,
+{
+    fn from_iter<T>(iter: T) -> RegisterRuleMap<R>
+    where
+        T: IntoIterator<Item = &'a (Register, RegisterRule<R>)>,
+    {
+        let iter = iter.into_iter();
+        let mut rules = RegisterRuleMap::default();
+        for &(reg, ref rule) in iter.filter(|r| r.1.is_defined()) {
+            rules.set(reg, rule.clone()).expect(
+                "This is only used in tests, impl isn't exposed publicly.
+                         If you trip this, fix your test",
+            );
+        }
+        rules
+    }
+}
+
+impl<R> PartialEq for RegisterRuleMap<R>
+where
+    R: Reader + PartialEq,
+{
+    fn eq(&self, rhs: &Self) -> bool {
+        for &(reg, ref rule) in self.rules() {
+            debug_assert!(rule.is_defined());
+            if *rule != rhs.get(reg) {
+                return false;
+            }
+        }
+
+        for &(reg, ref rhs_rule) in rhs.rules() {
+            debug_assert!(rhs_rule.is_defined());
+            if *rhs_rule != self.get(reg) {
+                return false;
+            }
+        }
+
+        true
+    }
+}
+
+impl<R> Eq for RegisterRuleMap<R> where R: Reader + Eq {}
+
+/// An unordered iterator for register rules.
+#[derive(Debug, Clone)]
+pub struct RegisterRuleIter<'iter, R>(::core::slice::Iter<'iter, (Register, RegisterRule<R>)>)
+where
+    R: Reader;
+
+impl<'iter, R: Reader> Iterator for RegisterRuleIter<'iter, R> {
+    type Item = &'iter (Register, RegisterRule<R>);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next()
+    }
+}
+
+/// A row in the virtual unwind table that describes how to find the values of
+/// the registers in the *previous* frame for a range of PC addresses.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct UnwindTableRow<R: Reader> {
+    start_address: u64,
+    end_address: u64,
+    saved_args_size: u64,
+    cfa: CfaRule<R>,
+    registers: RegisterRuleMap<R>,
+}
+
+impl<R: Reader> Default for UnwindTableRow<R> {
+    fn default() -> Self {
+        UnwindTableRow {
+            start_address: 0,
+            end_address: 0,
+            saved_args_size: 0,
+            cfa: Default::default(),
+            registers: Default::default(),
+        }
+    }
+}
+
+impl<R: Reader> UnwindTableRow<R> {
+    fn is_default(&self) -> bool {
+        self.start_address == 0
+            && self.end_address == 0
+            && self.cfa.is_default()
+            && self.registers.is_default()
+    }
+
+    /// Get the starting PC address that this row applies to.
+    pub fn start_address(&self) -> u64 {
+        self.start_address
+    }
+
+    /// Get the end PC address where this row's register rules become
+    /// unapplicable.
+    ///
+    /// In other words, this row describes how to recover the last frame's
+    /// registers for all PCs where `row.start_address() <= PC <
+    /// row.end_address()`. This row does NOT describe how to recover registers
+    /// when `PC == row.end_address()`.
+    pub fn end_address(&self) -> u64 {
+        self.end_address
+    }
+
+    /// Return `true` if the given `address` is within this row's address range,
+    /// `false` otherwise.
+    pub fn contains(&self, address: u64) -> bool {
+        self.start_address <= address && address < self.end_address
+    }
+
+    /// Returns the amount of args currently on the stack.
+    ///
+    /// When unwinding, if the personality function requested a change in IP,
+    /// the SP needs to be adjusted by saved_args_size.
+    pub fn saved_args_size(&self) -> u64 {
+        self.saved_args_size
+    }
+
+    /// Get the canonical frame address (CFA) recovery rule for this row.
+    pub fn cfa(&self) -> &CfaRule<R> {
+        &self.cfa
+    }
+
+    /// Get the register recovery rule for the given register number.
+    ///
+    /// The register number mapping is architecture dependent. For example, in
+    /// the x86-64 ABI the register number mapping is defined in Figure 3.36:
+    ///
+    /// > Figure 3.36: DWARF Register Number Mapping
+    /// >
+    /// > <table>
+    /// >   <tr><th>Register Name</th>                    <th>Number</th>  <th>Abbreviation</th></tr>
+    /// >   <tr><td>General Purpose Register RAX</td>     <td>0</td>       <td>%rax</td></tr>
+    /// >   <tr><td>General Purpose Register RDX</td>     <td>1</td>       <td>%rdx</td></tr>
+    /// >   <tr><td>General Purpose Register RCX</td>     <td>2</td>       <td>%rcx</td></tr>
+    /// >   <tr><td>General Purpose Register RBX</td>     <td>3</td>       <td>%rbx</td></tr>
+    /// >   <tr><td>General Purpose Register RSI</td>     <td>4</td>       <td>%rsi</td></tr>
+    /// >   <tr><td>General Purpose Register RDI</td>     <td>5</td>       <td>%rdi</td></tr>
+    /// >   <tr><td>General Purpose Register RBP</td>     <td>6</td>       <td>%rbp</td></tr>
+    /// >   <tr><td>Stack Pointer Register RSP</td>       <td>7</td>       <td>%rsp</td></tr>
+    /// >   <tr><td>Extended Integer Registers 8-15</td>  <td>8-15</td>    <td>%r8-%r15</td></tr>
+    /// >   <tr><td>Return Address RA</td>                <td>16</td>      <td></td></tr>
+    /// >   <tr><td>Vector Registers 0–7</td>             <td>17-24</td>   <td>%xmm0–%xmm7</td></tr>
+    /// >   <tr><td>Extended Vector Registers 8–15</td>   <td>25-32</td>   <td>%xmm8–%xmm15</td></tr>
+    /// >   <tr><td>Floating Point Registers 0–7</td>     <td>33-40</td>   <td>%st0–%st7</td></tr>
+    /// >   <tr><td>MMX Registers 0–7</td>                <td>41-48</td>   <td>%mm0–%mm7</td></tr>
+    /// >   <tr><td>Flag Register</td>                    <td>49</td>      <td>%rFLAGS</td></tr>
+    /// >   <tr><td>Segment Register ES</td>              <td>50</td>      <td>%es</td></tr>
+    /// >   <tr><td>Segment Register CS</td>              <td>51</td>      <td>%cs</td></tr>
+    /// >   <tr><td>Segment Register SS</td>              <td>52</td>      <td>%ss</td></tr>
+    /// >   <tr><td>Segment Register DS</td>              <td>53</td>      <td>%ds</td></tr>
+    /// >   <tr><td>Segment Register FS</td>              <td>54</td>      <td>%fs</td></tr>
+    /// >   <tr><td>Segment Register GS</td>              <td>55</td>      <td>%gs</td></tr>
+    /// >   <tr><td>Reserved</td>                         <td>56-57</td>   <td></td></tr>
+    /// >   <tr><td>FS Base address</td>                  <td>58</td>      <td>%fs.base</td></tr>
+    /// >   <tr><td>GS Base address</td>                  <td>59</td>      <td>%gs.base</td></tr>
+    /// >   <tr><td>Reserved</td>                         <td>60-61</td>   <td></td></tr>
+    /// >   <tr><td>Task Register</td>                    <td>62</td>      <td>%tr</td></tr>
+    /// >   <tr><td>LDT Register</td>                     <td>63</td>      <td>%ldtr</td></tr>
+    /// >   <tr><td>128-bit Media Control and Status</td> <td>64</td>      <td>%mxcsr</td></tr>
+    /// >   <tr><td>x87 Control Word</td>                 <td>65</td>      <td>%fcw</td></tr>
+    /// >   <tr><td>x87 Status Word</td>                  <td>66</td>      <td>%fsw</td></tr>
+    /// >   <tr><td>Upper Vector Registers 16–31</td>     <td>67-82</td>   <td>%xmm16–%xmm31</td></tr>
+    /// >   <tr><td>Reserved</td>                         <td>83-117</td>  <td></td></tr>
+    /// >   <tr><td>Vector Mask Registers 0–7</td>        <td>118-125</td> <td>%k0–%k7</td></tr>
+    /// >   <tr><td>Reserved</td>                         <td>126-129</td> <td></td></tr>
+    /// > </table>
+    pub fn register(&self, register: Register) -> RegisterRule<R> {
+        self.registers.get(register)
+    }
+
+    /// Iterate over all defined register `(number, rule)` pairs.
+    ///
+    /// The rules are not iterated in any guaranteed order. Any register that
+    /// does not make an appearance in the iterator implicitly has the rule
+    /// `RegisterRule::Undefined`.
+    ///
+    /// ```
+    /// # use gimli::{EndianSlice, LittleEndian, UnwindTableRow};
+    /// # fn foo<'input>(unwind_table_row: UnwindTableRow<EndianSlice<'input, LittleEndian>>) {
+    /// for &(register, ref rule) in unwind_table_row.registers() {
+    ///     // ...
+    ///     # drop(register); drop(rule);
+    /// }
+    /// # }
+    /// ```
+    pub fn registers(&self) -> RegisterRuleIter<R> {
+        self.registers.iter()
+    }
+}
+
+/// The canonical frame address (CFA) recovery rules.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum CfaRule<R: Reader> {
+    /// The CFA is given offset from the given register's value.
+    RegisterAndOffset {
+        /// The register containing the base value.
+        register: Register,
+        /// The offset from the register's base value.
+        offset: i64,
+    },
+    /// The CFA is obtained by evaluating this `Reader` as a DWARF expression
+    /// program.
+    Expression(Expression<R>),
+}
+
+impl<R: Reader> Default for CfaRule<R> {
+    fn default() -> Self {
+        CfaRule::RegisterAndOffset {
+            register: Register(0),
+            offset: 0,
+        }
+    }
+}
+
+impl<R: Reader> CfaRule<R> {
+    fn is_default(&self) -> bool {
+        match *self {
+            CfaRule::RegisterAndOffset { register, offset } => {
+                register == Register(0) && offset == 0
+            }
+            _ => false,
+        }
+    }
+}
+
+/// An entry in the abstract CFI table that describes how to find the value of a
+/// register.
+///
+/// "The register columns contain rules that describe whether a given register
+/// has been saved and the rule to find the value for the register in the
+/// previous frame."
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum RegisterRule<R: Reader> {
+    /// > A register that has this rule has no recoverable value in the previous
+    /// > frame. (By convention, it is not preserved by a callee.)
+    Undefined,
+
+    /// > This register has not been modified from the previous frame. (By
+    /// > convention, it is preserved by the callee, but the callee has not
+    /// > modified it.)
+    SameValue,
+
+    /// "The previous value of this register is saved at the address CFA+N where
+    /// CFA is the current CFA value and N is a signed offset."
+    Offset(i64),
+
+    /// "The previous value of this register is the value CFA+N where CFA is the
+    /// current CFA value and N is a signed offset."
+    ValOffset(i64),
+
+    /// "The previous value of this register is stored in another register
+    /// numbered R."
+    Register(Register),
+
+    /// "The previous value of this register is located at the address produced
+    /// by executing the DWARF expression."
+    Expression(Expression<R>),
+
+    /// "The previous value of this register is the value produced by executing
+    /// the DWARF expression."
+    ValExpression(Expression<R>),
+
+    /// "The rule is defined externally to this specification by the augmenter."
+    Architectural,
+}
+
+impl<R: Reader> RegisterRule<R> {
+    fn is_defined(&self) -> bool {
+        match *self {
+            RegisterRule::Undefined => false,
+            _ => true,
+        }
+    }
+}
+
+/// A parsed call frame instruction.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum CallFrameInstruction<R: Reader> {
+    // 6.4.2.1 Row Creation Methods
+    /// > 1. DW_CFA_set_loc
+    /// >
+    /// > The DW_CFA_set_loc instruction takes a single operand that represents
+    /// > a target address. The required action is to create a new table row
+    /// > using the specified address as the location. All other values in the
+    /// > new row are initially identical to the current row. The new location
+    /// > value is always greater than the current one. If the segment_size
+    /// > field of this FDE's CIE is non- zero, the initial location is preceded
+    /// > by a segment selector of the given length.
+    SetLoc {
+        /// The target address.
+        address: u64,
+    },
+
+    /// The `AdvanceLoc` instruction is used for all of `DW_CFA_advance_loc` and
+    /// `DW_CFA_advance_loc{1,2,4}`.
+    ///
+    /// > 2. DW_CFA_advance_loc
+    /// >
+    /// > The DW_CFA_advance instruction takes a single operand (encoded with
+    /// > the opcode) that represents a constant delta. The required action is
+    /// > to create a new table row with a location value that is computed by
+    /// > taking the current entry’s location value and adding the value of
+    /// > delta * code_alignment_factor. All other values in the new row are
+    /// > initially identical to the current row.
+    AdvanceLoc {
+        /// The delta to be added to the current address.
+        delta: u32,
+    },
+
+    // 6.4.2.2 CFA Definition Methods
+    /// > 1. DW_CFA_def_cfa
+    /// >
+    /// > The DW_CFA_def_cfa instruction takes two unsigned LEB128 operands
+    /// > representing a register number and a (non-factored) offset. The
+    /// > required action is to define the current CFA rule to use the provided
+    /// > register and offset.
+    DefCfa {
+        /// The target register's number.
+        register: Register,
+        /// The non-factored offset.
+        offset: u64,
+    },
+
+    /// > 2. DW_CFA_def_cfa_sf
+    /// >
+    /// > The DW_CFA_def_cfa_sf instruction takes two operands: an unsigned
+    /// > LEB128 value representing a register number and a signed LEB128
+    /// > factored offset. This instruction is identical to DW_CFA_def_cfa
+    /// > except that the second operand is signed and factored. The resulting
+    /// > offset is factored_offset * data_alignment_factor.
+    DefCfaSf {
+        /// The target register's number.
+        register: Register,
+        /// The factored offset.
+        factored_offset: i64,
+    },
+
+    /// > 3. DW_CFA_def_cfa_register
+    /// >
+    /// > The DW_CFA_def_cfa_register instruction takes a single unsigned LEB128
+    /// > operand representing a register number. The required action is to
+    /// > define the current CFA rule to use the provided register (but to keep
+    /// > the old offset). This operation is valid only if the current CFA rule
+    /// > is defined to use a register and offset.
+    DefCfaRegister {
+        /// The target register's number.
+        register: Register,
+    },
+
+    /// > 4. DW_CFA_def_cfa_offset
+    /// >
+    /// > The DW_CFA_def_cfa_offset instruction takes a single unsigned LEB128
+    /// > operand representing a (non-factored) offset. The required action is
+    /// > to define the current CFA rule to use the provided offset (but to keep
+    /// > the old register). This operation is valid only if the current CFA
+    /// > rule is defined to use a register and offset.
+    DefCfaOffset {
+        /// The non-factored offset.
+        offset: u64,
+    },
+
+    /// > 5. DW_CFA_def_cfa_offset_sf
+    /// >
+    /// > The DW_CFA_def_cfa_offset_sf instruction takes a signed LEB128 operand
+    /// > representing a factored offset. This instruction is identical to
+    /// > DW_CFA_def_cfa_offset except that the operand is signed and
+    /// > factored. The resulting offset is factored_offset *
+    /// > data_alignment_factor. This operation is valid only if the current CFA
+    /// > rule is defined to use a register and offset.
+    DefCfaOffsetSf {
+        /// The factored offset.
+        factored_offset: i64,
+    },
+
+    /// > 6. DW_CFA_def_cfa_expression
+    /// >
+    /// > The DW_CFA_def_cfa_expression instruction takes a single operand
+    /// > encoded as a DW_FORM_exprloc value representing a DWARF
+    /// > expression. The required action is to establish that expression as the
+    /// > means by which the current CFA is computed.
+    DefCfaExpression {
+        /// The DWARF expression.
+        expression: Expression<R>,
+    },
+
+    // 6.4.2.3 Register Rule Instructions
+    /// > 1. DW_CFA_undefined
+    /// >
+    /// > The DW_CFA_undefined instruction takes a single unsigned LEB128
+    /// > operand that represents a register number. The required action is to
+    /// > set the rule for the specified register to “undefined.�
+    Undefined {
+        /// The target register's number.
+        register: Register,
+    },
+
+    /// > 2. DW_CFA_same_value
+    /// >
+    /// > The DW_CFA_same_value instruction takes a single unsigned LEB128
+    /// > operand that represents a register number. The required action is to
+    /// > set the rule for the specified register to “same value.�
+    SameValue {
+        /// The target register's number.
+        register: Register,
+    },
+
+    /// The `Offset` instruction represents both `DW_CFA_offset` and
+    /// `DW_CFA_offset_extended`.
+    ///
+    /// > 3. DW_CFA_offset
+    /// >
+    /// > The DW_CFA_offset instruction takes two operands: a register number
+    /// > (encoded with the opcode) and an unsigned LEB128 constant representing
+    /// > a factored offset. The required action is to change the rule for the
+    /// > register indicated by the register number to be an offset(N) rule
+    /// > where the value of N is factored offset * data_alignment_factor.
+    Offset {
+        /// The target register's number.
+        register: Register,
+        /// The factored offset.
+        factored_offset: u64,
+    },
+
+    /// > 5. DW_CFA_offset_extended_sf
+    /// >
+    /// > The DW_CFA_offset_extended_sf instruction takes two operands: an
+    /// > unsigned LEB128 value representing a register number and a signed
+    /// > LEB128 factored offset. This instruction is identical to
+    /// > DW_CFA_offset_extended except that the second operand is signed and
+    /// > factored. The resulting offset is factored_offset *
+    /// > data_alignment_factor.
+    OffsetExtendedSf {
+        /// The target register's number.
+        register: Register,
+        /// The factored offset.
+        factored_offset: i64,
+    },
+
+    /// > 6. DW_CFA_val_offset
+    /// >
+    /// > The DW_CFA_val_offset instruction takes two unsigned LEB128 operands
+    /// > representing a register number and a factored offset. The required
+    /// > action is to change the rule for the register indicated by the
+    /// > register number to be a val_offset(N) rule where the value of N is
+    /// > factored_offset * data_alignment_factor.
+    ValOffset {
+        /// The target register's number.
+        register: Register,
+        /// The factored offset.
+        factored_offset: u64,
+    },
+
+    /// > 7. DW_CFA_val_offset_sf
+    /// >
+    /// > The DW_CFA_val_offset_sf instruction takes two operands: an unsigned
+    /// > LEB128 value representing a register number and a signed LEB128
+    /// > factored offset. This instruction is identical to DW_CFA_val_offset
+    /// > except that the second operand is signed and factored. The resulting
+    /// > offset is factored_offset * data_alignment_factor.
+    ValOffsetSf {
+        /// The target register's number.
+        register: Register,
+        /// The factored offset.
+        factored_offset: i64,
+    },
+
+    /// > 8. DW_CFA_register
+    /// >
+    /// > The DW_CFA_register instruction takes two unsigned LEB128 operands
+    /// > representing register numbers. The required action is to set the rule
+    /// > for the first register to be register(R) where R is the second
+    /// > register.
+    Register {
+        /// The number of the register whose rule is being changed.
+        dest_register: Register,
+        /// The number of the register where the other register's value can be
+        /// found.
+        src_register: Register,
+    },
+
+    /// > 9. DW_CFA_expression
+    /// >
+    /// > The DW_CFA_expression instruction takes two operands: an unsigned
+    /// > LEB128 value representing a register number, and a DW_FORM_block value
+    /// > representing a DWARF expression. The required action is to change the
+    /// > rule for the register indicated by the register number to be an
+    /// > expression(E) rule where E is the DWARF expression. That is, the DWARF
+    /// > expression computes the address. The value of the CFA is pushed on the
+    /// > DWARF evaluation stack prior to execution of the DWARF expression.
+    Expression {
+        /// The target register's number.
+        register: Register,
+        /// The DWARF expression.
+        expression: Expression<R>,
+    },
+
+    /// > 10. DW_CFA_val_expression
+    /// >
+    /// > The DW_CFA_val_expression instruction takes two operands: an unsigned
+    /// > LEB128 value representing a register number, and a DW_FORM_block value
+    /// > representing a DWARF expression. The required action is to change the
+    /// > rule for the register indicated by the register number to be a
+    /// > val_expression(E) rule where E is the DWARF expression. That is, the
+    /// > DWARF expression computes the value of the given register. The value
+    /// > of the CFA is pushed on the DWARF evaluation stack prior to execution
+    /// > of the DWARF expression.
+    ValExpression {
+        /// The target register's number.
+        register: Register,
+        /// The DWARF expression.
+        expression: Expression<R>,
+    },
+
+    /// The `Restore` instruction represents both `DW_CFA_restore` and
+    /// `DW_CFA_restore_extended`.
+    ///
+    /// > 11. DW_CFA_restore
+    /// >
+    /// > The DW_CFA_restore instruction takes a single operand (encoded with
+    /// > the opcode) that represents a register number. The required action is
+    /// > to change the rule for the indicated register to the rule assigned it
+    /// > by the initial_instructions in the CIE.
+    Restore {
+        /// The register to be reset.
+        register: Register,
+    },
+
+    // 6.4.2.4 Row State Instructions
+    /// > 1. DW_CFA_remember_state
+    /// >
+    /// > The DW_CFA_remember_state instruction takes no operands. The required
+    /// > action is to push the set of rules for every register onto an implicit
+    /// > stack.
+    RememberState,
+
+    /// > 2. DW_CFA_restore_state
+    /// >
+    /// > The DW_CFA_restore_state instruction takes no operands. The required
+    /// > action is to pop the set of rules off the implicit stack and place
+    /// > them in the current row.
+    RestoreState,
+
+    /// > DW_CFA_GNU_args_size
+    /// >
+    /// > GNU Extension
+    /// >
+    /// > The DW_CFA_GNU_args_size instruction takes an unsigned LEB128 operand
+    /// > representing an argument size. This instruction specifies the total of
+    /// > the size of the arguments which have been pushed onto the stack.
+    ArgsSize {
+        /// The size of the arguments which have been pushed onto the stack
+        size: u64,
+    },
+
+    // 6.4.2.5 Padding Instruction
+    /// > 1. DW_CFA_nop
+    /// >
+    /// > The DW_CFA_nop instruction has no operands and no required actions. It
+    /// > is used as padding to make a CIE or FDE an appropriate size.
+    Nop,
+}
+
+const CFI_INSTRUCTION_HIGH_BITS_MASK: u8 = 0b1100_0000;
+const CFI_INSTRUCTION_LOW_BITS_MASK: u8 = !CFI_INSTRUCTION_HIGH_BITS_MASK;
+
+impl<R: Reader> CallFrameInstruction<R> {
+    fn parse(
+        input: &mut R,
+        address_encoding: Option<DwEhPe>,
+        parameters: &PointerEncodingParameters<R>,
+    ) -> Result<CallFrameInstruction<R>> {
+        let instruction = input.read_u8()?;
+        let high_bits = instruction & CFI_INSTRUCTION_HIGH_BITS_MASK;
+
+        if high_bits == constants::DW_CFA_advance_loc.0 {
+            let delta = instruction & CFI_INSTRUCTION_LOW_BITS_MASK;
+            return Ok(CallFrameInstruction::AdvanceLoc {
+                delta: u32::from(delta),
+            });
+        }
+
+        if high_bits == constants::DW_CFA_offset.0 {
+            let register = Register((instruction & CFI_INSTRUCTION_LOW_BITS_MASK).into());
+            let offset = input.read_uleb128()?;
+            return Ok(CallFrameInstruction::Offset {
+                register,
+                factored_offset: offset,
+            });
+        }
+
+        if high_bits == constants::DW_CFA_restore.0 {
+            let register = Register((instruction & CFI_INSTRUCTION_LOW_BITS_MASK).into());
+            return Ok(CallFrameInstruction::Restore { register });
+        }
+
+        debug_assert_eq!(high_bits, 0);
+        let instruction = constants::DwCfa(instruction);
+
+        match instruction {
+            constants::DW_CFA_nop => Ok(CallFrameInstruction::Nop),
+
+            constants::DW_CFA_set_loc => {
+                let address = if let Some(encoding) = address_encoding {
+                    match parse_encoded_pointer(encoding, parameters, input)? {
+                        Pointer::Direct(x) => x,
+                        _ => return Err(Error::UnsupportedPointerEncoding),
+                    }
+                } else {
+                    input.read_address(parameters.address_size)?
+                };
+                Ok(CallFrameInstruction::SetLoc { address })
+            }
+
+            constants::DW_CFA_advance_loc1 => {
+                let delta = input.read_u8()?;
+                Ok(CallFrameInstruction::AdvanceLoc {
+                    delta: u32::from(delta),
+                })
+            }
+
+            constants::DW_CFA_advance_loc2 => {
+                let delta = input.read_u16()?;
+                Ok(CallFrameInstruction::AdvanceLoc {
+                    delta: u32::from(delta),
+                })
+            }
+
+            constants::DW_CFA_advance_loc4 => {
+                let delta = input.read_u32()?;
+                Ok(CallFrameInstruction::AdvanceLoc { delta })
+            }
+
+            constants::DW_CFA_offset_extended => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                let offset = input.read_uleb128()?;
+                Ok(CallFrameInstruction::Offset {
+                    register,
+                    factored_offset: offset,
+                })
+            }
+
+            constants::DW_CFA_restore_extended => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                Ok(CallFrameInstruction::Restore { register })
+            }
+
+            constants::DW_CFA_undefined => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                Ok(CallFrameInstruction::Undefined { register })
+            }
+
+            constants::DW_CFA_same_value => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                Ok(CallFrameInstruction::SameValue { register })
+            }
+
+            constants::DW_CFA_register => {
+                let dest = input.read_uleb128().and_then(Register::from_u64)?;
+                let src = input.read_uleb128().and_then(Register::from_u64)?;
+                Ok(CallFrameInstruction::Register {
+                    dest_register: dest,
+                    src_register: src,
+                })
+            }
+
+            constants::DW_CFA_remember_state => Ok(CallFrameInstruction::RememberState),
+
+            constants::DW_CFA_restore_state => Ok(CallFrameInstruction::RestoreState),
+
+            constants::DW_CFA_def_cfa => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                let offset = input.read_uleb128()?;
+                Ok(CallFrameInstruction::DefCfa { register, offset })
+            }
+
+            constants::DW_CFA_def_cfa_register => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                Ok(CallFrameInstruction::DefCfaRegister { register })
+            }
+
+            constants::DW_CFA_def_cfa_offset => {
+                let offset = input.read_uleb128()?;
+                Ok(CallFrameInstruction::DefCfaOffset { offset })
+            }
+
+            constants::DW_CFA_def_cfa_expression => {
+                let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                let expression = input.split(len)?;
+                Ok(CallFrameInstruction::DefCfaExpression {
+                    expression: Expression(expression),
+                })
+            }
+
+            constants::DW_CFA_expression => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                let expression = input.split(len)?;
+                Ok(CallFrameInstruction::Expression {
+                    register,
+                    expression: Expression(expression),
+                })
+            }
+
+            constants::DW_CFA_offset_extended_sf => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                let offset = input.read_sleb128()?;
+                Ok(CallFrameInstruction::OffsetExtendedSf {
+                    register,
+                    factored_offset: offset,
+                })
+            }
+
+            constants::DW_CFA_def_cfa_sf => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                let offset = input.read_sleb128()?;
+                Ok(CallFrameInstruction::DefCfaSf {
+                    register,
+                    factored_offset: offset,
+                })
+            }
+
+            constants::DW_CFA_def_cfa_offset_sf => {
+                let offset = input.read_sleb128()?;
+                Ok(CallFrameInstruction::DefCfaOffsetSf {
+                    factored_offset: offset,
+                })
+            }
+
+            constants::DW_CFA_val_offset => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                let offset = input.read_uleb128()?;
+                Ok(CallFrameInstruction::ValOffset {
+                    register,
+                    factored_offset: offset,
+                })
+            }
+
+            constants::DW_CFA_val_offset_sf => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                let offset = input.read_sleb128()?;
+                Ok(CallFrameInstruction::ValOffsetSf {
+                    register,
+                    factored_offset: offset,
+                })
+            }
+
+            constants::DW_CFA_val_expression => {
+                let register = input.read_uleb128().and_then(Register::from_u64)?;
+                let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                let expression = input.split(len)?;
+                Ok(CallFrameInstruction::ValExpression {
+                    register,
+                    expression: Expression(expression),
+                })
+            }
+
+            constants::DW_CFA_GNU_args_size => {
+                let size = input.read_uleb128()?;
+                Ok(CallFrameInstruction::ArgsSize { size })
+            }
+
+            otherwise => Err(Error::UnknownCallFrameInstruction(otherwise)),
+        }
+    }
+}
+
+/// A lazy iterator parsing call frame instructions.
+///
+/// Can be [used with
+/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+#[derive(Clone, Debug)]
+pub struct CallFrameInstructionIter<'a, R: Reader> {
+    input: R,
+    address_encoding: Option<constants::DwEhPe>,
+    parameters: PointerEncodingParameters<'a, R>,
+}
+
+impl<'a, R: Reader> CallFrameInstructionIter<'a, R> {
+    /// Parse the next call frame instruction.
+    pub fn next(&mut self) -> Result<Option<CallFrameInstruction<R>>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        match CallFrameInstruction::parse(&mut self.input, self.address_encoding, &self.parameters)
+        {
+            Ok(instruction) => Ok(Some(instruction)),
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<'a, R: Reader> fallible_iterator::FallibleIterator for CallFrameInstructionIter<'a, R> {
+    type Item = CallFrameInstruction<R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        CallFrameInstructionIter::next(self)
+    }
+}
+
+/// Parse a `DW_EH_PE_*` pointer encoding.
+#[doc(hidden)]
+#[inline]
+fn parse_pointer_encoding<R: Reader>(input: &mut R) -> Result<constants::DwEhPe> {
+    let eh_pe = input.read_u8()?;
+    let eh_pe = constants::DwEhPe(eh_pe);
+
+    if eh_pe.is_valid_encoding() {
+        Ok(eh_pe)
+    } else {
+        Err(Error::UnknownPointerEncoding)
+    }
+}
+
+/// A decoded pointer.
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum Pointer {
+    /// This value is the decoded pointer value.
+    Direct(u64),
+
+    /// This value is *not* the pointer value, but points to the address of
+    /// where the real pointer value lives. In other words, deref this pointer
+    /// to get the real pointer value.
+    ///
+    /// Chase this pointer at your own risk: do you trust the DWARF data it came
+    /// from?
+    Indirect(u64),
+}
+
+impl Default for Pointer {
+    #[inline]
+    fn default() -> Self {
+        Pointer::Direct(0)
+    }
+}
+
+impl Into<u64> for Pointer {
+    #[inline]
+    fn into(self) -> u64 {
+        match self {
+            Pointer::Direct(p) | Pointer::Indirect(p) => p,
+        }
+    }
+}
+
+impl Pointer {
+    #[inline]
+    fn new(encoding: constants::DwEhPe, address: u64) -> Pointer {
+        if encoding.is_indirect() {
+            Pointer::Indirect(address)
+        } else {
+            Pointer::Direct(address)
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+struct PointerEncodingParameters<'a, R: Reader> {
+    bases: &'a SectionBaseAddresses,
+    func_base: Option<u64>,
+    address_size: u8,
+    section: &'a R,
+}
+
+fn parse_encoded_pointer<R: Reader>(
+    encoding: constants::DwEhPe,
+    parameters: &PointerEncodingParameters<R>,
+    input: &mut R,
+) -> Result<Pointer> {
+    // TODO: check this once only in parse_pointer_encoding
+    if !encoding.is_valid_encoding() {
+        return Err(Error::UnknownPointerEncoding);
+    }
+
+    if encoding == constants::DW_EH_PE_omit {
+        return Err(Error::CannotParseOmitPointerEncoding);
+    }
+
+    let base = match encoding.application() {
+        constants::DW_EH_PE_absptr => 0,
+        constants::DW_EH_PE_pcrel => {
+            if let Some(section_base) = parameters.bases.section {
+                let offset_from_section = input.offset_from(parameters.section);
+                section_base.wrapping_add(offset_from_section.into_u64())
+            } else {
+                return Err(Error::PcRelativePointerButSectionBaseIsUndefined);
+            }
+        }
+        constants::DW_EH_PE_textrel => {
+            if let Some(text) = parameters.bases.text {
+                text
+            } else {
+                return Err(Error::TextRelativePointerButTextBaseIsUndefined);
+            }
+        }
+        constants::DW_EH_PE_datarel => {
+            if let Some(data) = parameters.bases.data {
+                data
+            } else {
+                return Err(Error::DataRelativePointerButDataBaseIsUndefined);
+            }
+        }
+        constants::DW_EH_PE_funcrel => {
+            if let Some(func) = parameters.func_base {
+                func
+            } else {
+                return Err(Error::FuncRelativePointerInBadContext);
+            }
+        }
+        constants::DW_EH_PE_aligned => return Err(Error::UnsupportedPointerEncoding),
+        _ => unreachable!(),
+    };
+
+    let offset = match encoding.format() {
+        // Unsigned variants.
+        constants::DW_EH_PE_absptr => input.read_address(parameters.address_size),
+        constants::DW_EH_PE_uleb128 => input.read_uleb128(),
+        constants::DW_EH_PE_udata2 => input.read_u16().map(u64::from),
+        constants::DW_EH_PE_udata4 => input.read_u32().map(u64::from),
+        constants::DW_EH_PE_udata8 => input.read_u64(),
+
+        // Signed variants. Here we sign extend the values (happens by
+        // default when casting a signed integer to a larger range integer
+        // in Rust), return them as u64, and rely on wrapping addition to do
+        // the right thing when adding these offsets to their bases.
+        constants::DW_EH_PE_sleb128 => input.read_sleb128().map(|a| a as u64),
+        constants::DW_EH_PE_sdata2 => input.read_i16().map(|a| a as u64),
+        constants::DW_EH_PE_sdata4 => input.read_i32().map(|a| a as u64),
+        constants::DW_EH_PE_sdata8 => input.read_i64().map(|a| a as u64),
+
+        // That was all of the valid encoding formats.
+        _ => unreachable!(),
+    }?;
+
+    Ok(Pointer::new(encoding, base.wrapping_add(offset)))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use super::{parse_cfi_entry, AugmentationData, RegisterRuleMap, UnwindContext};
+    use crate::common::Format;
+    use crate::constants;
+    use crate::endianity::{BigEndian, Endianity, LittleEndian, NativeEndian};
+    use crate::read::{
+        EndianSlice, Error, Expression, Pointer, ReaderOffsetId, Result, Section as ReadSection,
+    };
+    use crate::test_util::GimliSectionMethods;
+    use alloc::vec::Vec;
+    use core::marker::PhantomData;
+    use core::mem;
+    use core::u64;
+    use test_assembler::{Endian, Label, LabelMaker, LabelOrNum, Section, ToLabelOrNum};
+
+    // Ensure each test tries to read the same section kind that it wrote.
+    #[derive(Clone, Copy)]
+    struct SectionKind<Section>(PhantomData<Section>);
+
+    impl<T> SectionKind<T> {
+        fn endian<'input, E>(self) -> Endian
+        where
+            E: Endianity,
+            T: UnwindSection<EndianSlice<'input, E>>,
+            T::Offset: UnwindOffset<usize>,
+        {
+            if E::default().is_big_endian() {
+                Endian::Big
+            } else {
+                Endian::Little
+            }
+        }
+
+        fn section<'input, E>(self, contents: &'input [u8]) -> T
+        where
+            E: Endianity,
+            T: UnwindSection<EndianSlice<'input, E>> + ReadSection<EndianSlice<'input, E>>,
+            T::Offset: UnwindOffset<usize>,
+        {
+            EndianSlice::new(contents, E::default()).into()
+        }
+    }
+
+    fn debug_frame_le<'a>() -> SectionKind<DebugFrame<EndianSlice<'a, LittleEndian>>> {
+        SectionKind(PhantomData)
+    }
+
+    fn debug_frame_be<'a>() -> SectionKind<DebugFrame<EndianSlice<'a, BigEndian>>> {
+        SectionKind(PhantomData)
+    }
+
+    fn eh_frame_le<'a>() -> SectionKind<EhFrame<EndianSlice<'a, LittleEndian>>> {
+        SectionKind(PhantomData)
+    }
+
+    fn parse_fde<Section, O, F, R>(
+        section: Section,
+        input: &mut R,
+        get_cie: F,
+    ) -> Result<FrameDescriptionEntry<R>>
+    where
+        R: Reader,
+        Section: UnwindSection<R, Offset = O>,
+        O: UnwindOffset<R::Offset>,
+        F: FnMut(&Section, &BaseAddresses, O) -> Result<CommonInformationEntry<R>>,
+    {
+        let bases = Default::default();
+        match parse_cfi_entry(&bases, &section, input) {
+            Ok(Some(CieOrFde::Fde(partial))) => partial.parse(get_cie),
+            Ok(_) => Err(Error::NoEntryAtGivenOffset),
+            Err(e) => Err(e),
+        }
+    }
+
+    // Mixin methods for `Section` to help define binary test data.
+
+    trait CfiSectionMethods: GimliSectionMethods {
+        fn cie<'aug, 'input, E, T>(
+            self,
+            _kind: SectionKind<T>,
+            augmentation: Option<&'aug str>,
+            cie: &mut CommonInformationEntry<EndianSlice<'input, E>>,
+        ) -> Self
+        where
+            E: Endianity,
+            T: UnwindSection<EndianSlice<'input, E>>,
+            T::Offset: UnwindOffset;
+        fn fde<'a, 'input, E, T, L>(
+            self,
+            _kind: SectionKind<T>,
+            cie_offset: L,
+            fde: &mut FrameDescriptionEntry<EndianSlice<'input, E>>,
+        ) -> Self
+        where
+            E: Endianity,
+            T: UnwindSection<EndianSlice<'input, E>>,
+            T::Offset: UnwindOffset,
+            L: ToLabelOrNum<'a, u64>;
+    }
+
+    impl CfiSectionMethods for Section {
+        fn cie<'aug, 'input, E, T>(
+            self,
+            _kind: SectionKind<T>,
+            augmentation: Option<&'aug str>,
+            cie: &mut CommonInformationEntry<EndianSlice<'input, E>>,
+        ) -> Self
+        where
+            E: Endianity,
+            T: UnwindSection<EndianSlice<'input, E>>,
+            T::Offset: UnwindOffset,
+        {
+            cie.offset = self.size() as _;
+            let length = Label::new();
+            let start = Label::new();
+            let end = Label::new();
+
+            let section = match cie.format {
+                Format::Dwarf32 => self.D32(&length).mark(&start).D32(0xffff_ffff),
+                Format::Dwarf64 => {
+                    let section = self.D32(0xffff_ffff);
+                    section.D64(&length).mark(&start).D64(0xffff_ffff_ffff_ffff)
+                }
+            };
+
+            let mut section = section.D8(cie.version);
+
+            if let Some(augmentation) = augmentation {
+                section = section.append_bytes(augmentation.as_bytes());
+            }
+
+            // Null terminator for augmentation string.
+            let section = section.D8(0);
+
+            let section = if T::has_address_and_segment_sizes(cie.version) {
+                section.D8(cie.address_size).D8(cie.segment_size)
+            } else {
+                section
+            };
+
+            let section = section
+                .uleb(cie.code_alignment_factor)
+                .sleb(cie.data_alignment_factor)
+                .uleb(cie.return_address_register.0.into())
+                .append_bytes(cie.initial_instructions.into())
+                .mark(&end);
+
+            cie.length = (&end - &start) as usize;
+            length.set_const(cie.length as u64);
+
+            section
+        }
+
+        fn fde<'a, 'input, E, T, L>(
+            self,
+            _kind: SectionKind<T>,
+            cie_offset: L,
+            fde: &mut FrameDescriptionEntry<EndianSlice<'input, E>>,
+        ) -> Self
+        where
+            E: Endianity,
+            T: UnwindSection<EndianSlice<'input, E>>,
+            T::Offset: UnwindOffset,
+            L: ToLabelOrNum<'a, u64>,
+        {
+            fde.offset = self.size() as _;
+            let length = Label::new();
+            let start = Label::new();
+            let end = Label::new();
+
+            assert_eq!(fde.format, fde.cie.format);
+
+            let section = match T::cie_offset_encoding(fde.format) {
+                CieOffsetEncoding::U32 => {
+                    let section = self.D32(&length).mark(&start);
+                    match cie_offset.to_labelornum() {
+                        LabelOrNum::Label(ref l) => section.D32(l),
+                        LabelOrNum::Num(o) => section.D32(o as u32),
+                    }
+                }
+                CieOffsetEncoding::U64 => {
+                    let section = self.D32(0xffff_ffff);
+                    section.D64(&length).mark(&start).D64(cie_offset)
+                }
+            };
+
+            let section = match fde.cie.segment_size {
+                0 => section,
+                4 => section.D32(fde.initial_segment as u32),
+                8 => section.D64(fde.initial_segment),
+                x => panic!("Unsupported test segment size: {}", x),
+            };
+
+            let section = match fde.cie.address_size {
+                4 => section
+                    .D32(fde.initial_address() as u32)
+                    .D32(fde.len() as u32),
+                8 => section.D64(fde.initial_address()).D64(fde.len()),
+                x => panic!("Unsupported address size: {}", x),
+            };
+
+            let section = if let Some(ref augmentation) = fde.augmentation {
+                let cie_aug = fde
+                    .cie
+                    .augmentation
+                    .expect("FDE has augmentation, but CIE doesn't");
+
+                if let Some(lsda) = augmentation.lsda {
+                    // We only support writing `DW_EH_PE_absptr` here.
+                    assert_eq!(
+                        cie_aug
+                            .lsda
+                            .expect("FDE has lsda, but CIE doesn't")
+                            .format(),
+                        constants::DW_EH_PE_absptr
+                    );
+
+                    // Augmentation data length
+                    let section = section.uleb(u64::from(fde.cie.address_size));
+                    match fde.cie.address_size {
+                        4 => section.D32({
+                            let x: u64 = lsda.into();
+                            x as u32
+                        }),
+                        8 => section.D64({
+                            let x: u64 = lsda.into();
+                            x
+                        }),
+                        x => panic!("Unsupported address size: {}", x),
+                    }
+                } else {
+                    // Even if we don't have any augmentation data, if there is
+                    // an augmentation defined, we need to put the length in.
+                    section.uleb(0)
+                }
+            } else {
+                section
+            };
+
+            let section = section.append_bytes(fde.instructions.into()).mark(&end);
+
+            fde.length = (&end - &start) as usize;
+            length.set_const(fde.length as u64);
+
+            section
+        }
+    }
+
+    trait ResultExt {
+        fn map_eof(self, input: &[u8]) -> Self;
+    }
+
+    impl<T> ResultExt for Result<T> {
+        fn map_eof(self, input: &[u8]) -> Self {
+            match self {
+                Err(Error::UnexpectedEof(id)) => {
+                    let id = ReaderOffsetId(id.0 - input.as_ptr() as u64);
+                    Err(Error::UnexpectedEof(id))
+                }
+                r => r,
+            }
+        }
+    }
+
+    #[allow(clippy::type_complexity)]
+    #[allow(clippy::needless_pass_by_value)]
+    fn assert_parse_cie<'input, E>(
+        kind: SectionKind<DebugFrame<EndianSlice<'input, E>>>,
+        section: Section,
+        address_size: u8,
+        expected: Result<(
+            EndianSlice<'input, E>,
+            CommonInformationEntry<EndianSlice<'input, E>>,
+        )>,
+    ) where
+        E: Endianity,
+    {
+        let section = section.get_contents().unwrap();
+        let mut debug_frame = kind.section(&section);
+        debug_frame.set_address_size(address_size);
+        let input = &mut EndianSlice::new(&section, E::default());
+        let bases = Default::default();
+        let result = CommonInformationEntry::parse(&bases, &debug_frame, input);
+        let result = result.map(|cie| (*input, cie)).map_eof(&section);
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_parse_cie_incomplete_length_32() {
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian()).L16(5);
+        assert_parse_cie(
+            kind,
+            section,
+            8,
+            Err(Error::UnexpectedEof(ReaderOffsetId(0))),
+        );
+    }
+
+    #[test]
+    fn test_parse_cie_incomplete_length_64() {
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .L32(0xffff_ffff)
+            .L32(12345);
+        assert_parse_cie(
+            kind,
+            section,
+            8,
+            Err(Error::UnexpectedEof(ReaderOffsetId(4))),
+        );
+    }
+
+    #[test]
+    fn test_parse_cie_incomplete_id_32() {
+        let kind = debug_frame_be();
+        let section = Section::with_endian(kind.endian())
+            // The length is not large enough to contain the ID.
+            .B32(3)
+            .B32(0xffff_ffff);
+        assert_parse_cie(
+            kind,
+            section,
+            8,
+            Err(Error::UnexpectedEof(ReaderOffsetId(4))),
+        );
+    }
+
+    #[test]
+    fn test_parse_cie_bad_id_32() {
+        let kind = debug_frame_be();
+        let section = Section::with_endian(kind.endian())
+            // Initial length
+            .B32(4)
+            // Not the CIE Id.
+            .B32(0xbad1_bad2);
+        assert_parse_cie(kind, section, 8, Err(Error::NotCieId));
+    }
+
+    #[test]
+    fn test_parse_cie_32_bad_version() {
+        let mut cie = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 99,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 0,
+            code_alignment_factor: 1,
+            data_alignment_factor: 2,
+            return_address_register: Register(3),
+            initial_instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian()).cie(kind, None, &mut cie);
+        assert_parse_cie(kind, section, 4, Err(Error::UnknownVersion(99)));
+    }
+
+    #[test]
+    fn test_parse_cie_unknown_augmentation() {
+        let length = Label::new();
+        let start = Label::new();
+        let end = Label::new();
+
+        let augmentation = Some("replicant");
+        let expected_rest = [1, 2, 3];
+
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian())
+            // Initial length
+            .L32(&length)
+            .mark(&start)
+            // CIE Id
+            .L32(0xffff_ffff)
+            // Version
+            .D8(4)
+            // Augmentation
+            .append_bytes(augmentation.unwrap().as_bytes())
+            // Null terminator
+            .D8(0)
+            // Extra augmented data that we can't understand.
+            .L32(1)
+            .L32(2)
+            .L32(3)
+            .L32(4)
+            .L32(5)
+            .L32(6)
+            .mark(&end)
+            .append_bytes(&expected_rest);
+
+        let expected_length = (&end - &start) as u64;
+        length.set_const(expected_length);
+
+        assert_parse_cie(kind, section, 8, Err(Error::UnknownAugmentation));
+    }
+
+    fn test_parse_cie(format: Format, version: u8, address_size: u8) {
+        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let expected_instrs: Vec<_> = (0..4).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let mut cie = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format,
+            version,
+            augmentation: None,
+            address_size,
+            segment_size: 0,
+            code_alignment_factor: 16,
+            data_alignment_factor: 32,
+            return_address_register: Register(1),
+            initial_instructions: EndianSlice::new(&expected_instrs, LittleEndian),
+        };
+
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .cie(kind, None, &mut cie)
+            .append_bytes(&expected_rest);
+
+        assert_parse_cie(
+            kind,
+            section,
+            address_size,
+            Ok((EndianSlice::new(&expected_rest, LittleEndian), cie)),
+        );
+    }
+
+    #[test]
+    fn test_parse_cie_32_ok() {
+        test_parse_cie(Format::Dwarf32, 1, 4);
+        test_parse_cie(Format::Dwarf32, 1, 8);
+        test_parse_cie(Format::Dwarf32, 4, 4);
+        test_parse_cie(Format::Dwarf32, 4, 8);
+    }
+
+    #[test]
+    fn test_parse_cie_64_ok() {
+        test_parse_cie(Format::Dwarf64, 1, 4);
+        test_parse_cie(Format::Dwarf64, 1, 8);
+        test_parse_cie(Format::Dwarf64, 4, 4);
+        test_parse_cie(Format::Dwarf64, 4, 8);
+    }
+
+    #[test]
+    fn test_parse_cie_length_too_big() {
+        let expected_instrs: Vec<_> = (0..13).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let mut cie = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 0,
+            code_alignment_factor: 0,
+            data_alignment_factor: 0,
+            return_address_register: Register(3),
+            initial_instructions: EndianSlice::new(&expected_instrs, LittleEndian),
+        };
+
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian()).cie(kind, None, &mut cie);
+
+        let mut contents = section.get_contents().unwrap();
+
+        // Overwrite the length to be too big.
+        contents[0] = 0;
+        contents[1] = 0;
+        contents[2] = 0;
+        contents[3] = 255;
+
+        let debug_frame = DebugFrame::new(&contents, LittleEndian);
+        let bases = Default::default();
+        assert_eq!(
+            CommonInformationEntry::parse(
+                &bases,
+                &debug_frame,
+                &mut EndianSlice::new(&contents, LittleEndian)
+            )
+            .map_eof(&contents),
+            Err(Error::UnexpectedEof(ReaderOffsetId(4)))
+        );
+    }
+
+    #[test]
+    fn test_parse_fde_incomplete_length_32() {
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian()).L16(5);
+        let section = section.get_contents().unwrap();
+        let debug_frame = kind.section(&section);
+        let rest = &mut EndianSlice::new(&section, LittleEndian);
+        assert_eq!(
+            parse_fde(debug_frame, rest, UnwindSection::cie_from_offset).map_eof(&section),
+            Err(Error::UnexpectedEof(ReaderOffsetId(0)))
+        );
+    }
+
+    #[test]
+    fn test_parse_fde_incomplete_length_64() {
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .L32(0xffff_ffff)
+            .L32(12345);
+        let section = section.get_contents().unwrap();
+        let debug_frame = kind.section(&section);
+        let rest = &mut EndianSlice::new(&section, LittleEndian);
+        assert_eq!(
+            parse_fde(debug_frame, rest, UnwindSection::cie_from_offset).map_eof(&section),
+            Err(Error::UnexpectedEof(ReaderOffsetId(4)))
+        );
+    }
+
+    #[test]
+    fn test_parse_fde_incomplete_cie_pointer_32() {
+        let kind = debug_frame_be();
+        let section = Section::with_endian(kind.endian())
+            // The length is not large enough to contain the CIE pointer.
+            .B32(3)
+            .B32(1994);
+        let section = section.get_contents().unwrap();
+        let debug_frame = kind.section(&section);
+        let rest = &mut EndianSlice::new(&section, BigEndian);
+        assert_eq!(
+            parse_fde(debug_frame, rest, UnwindSection::cie_from_offset).map_eof(&section),
+            Err(Error::UnexpectedEof(ReaderOffsetId(4)))
+        );
+    }
+
+    #[test]
+    fn test_parse_fde_32_ok() {
+        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let cie_offset = 0xbad0_bad1;
+        let expected_instrs: Vec<_> = (0..7).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let cie = CommonInformationEntry {
+            offset: 0,
+            length: 100,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            // DWARF32 with a 64 bit address size! Holy moly!
+            address_size: 8,
+            segment_size: 0,
+            code_alignment_factor: 3,
+            data_alignment_factor: 2,
+            return_address_register: Register(1),
+            initial_instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_beef,
+            address_range: 39,
+            augmentation: None,
+            instructions: EndianSlice::new(&expected_instrs, LittleEndian),
+        };
+
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .fde(kind, cie_offset, &mut fde)
+            .append_bytes(&expected_rest);
+
+        let section = section.get_contents().unwrap();
+        let debug_frame = kind.section(&section);
+        let rest = &mut EndianSlice::new(&section, LittleEndian);
+
+        let get_cie = |_: &_, _: &_, offset| {
+            assert_eq!(offset, DebugFrameOffset(cie_offset as usize));
+            Ok(cie.clone())
+        };
+
+        assert_eq!(parse_fde(debug_frame, rest, get_cie), Ok(fde));
+        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_fde_32_with_segment_ok() {
+        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let cie_offset = 0xbad0_bad1;
+        let expected_instrs: Vec<_> = (0..92).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let cie = CommonInformationEntry {
+            offset: 0,
+            length: 100,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 4,
+            code_alignment_factor: 3,
+            data_alignment_factor: 2,
+            return_address_register: Register(1),
+            initial_instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0xbadb_ad11,
+            initial_address: 0xfeed_beef,
+            address_range: 999,
+            augmentation: None,
+            instructions: EndianSlice::new(&expected_instrs, LittleEndian),
+        };
+
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .fde(kind, cie_offset, &mut fde)
+            .append_bytes(&expected_rest);
+
+        let section = section.get_contents().unwrap();
+        let debug_frame = kind.section(&section);
+        let rest = &mut EndianSlice::new(&section, LittleEndian);
+
+        let get_cie = |_: &_, _: &_, offset| {
+            assert_eq!(offset, DebugFrameOffset(cie_offset as usize));
+            Ok(cie.clone())
+        };
+
+        assert_eq!(parse_fde(debug_frame, rest, get_cie), Ok(fde));
+        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_fde_64_ok() {
+        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let cie_offset = 0xbad0_bad1;
+        let expected_instrs: Vec<_> = (0..7).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let cie = CommonInformationEntry {
+            offset: 0,
+            length: 100,
+            format: Format::Dwarf64,
+            version: 4,
+            augmentation: None,
+            address_size: 8,
+            segment_size: 0,
+            code_alignment_factor: 3,
+            data_alignment_factor: 2,
+            return_address_register: Register(1),
+            initial_instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf64,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_beef,
+            address_range: 999,
+            augmentation: None,
+            instructions: EndianSlice::new(&expected_instrs, LittleEndian),
+        };
+
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .fde(kind, cie_offset, &mut fde)
+            .append_bytes(&expected_rest);
+
+        let section = section.get_contents().unwrap();
+        let debug_frame = kind.section(&section);
+        let rest = &mut EndianSlice::new(&section, LittleEndian);
+
+        let get_cie = |_: &_, _: &_, offset| {
+            assert_eq!(offset, DebugFrameOffset(cie_offset as usize));
+            Ok(cie.clone())
+        };
+
+        assert_eq!(parse_fde(debug_frame, rest, get_cie), Ok(fde));
+        assert_eq!(*rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_entry_on_cie_32_ok() {
+        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let expected_instrs: Vec<_> = (0..4).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let mut cie = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 0,
+            code_alignment_factor: 16,
+            data_alignment_factor: 32,
+            return_address_register: Register(1),
+            initial_instructions: EndianSlice::new(&expected_instrs, BigEndian),
+        };
+
+        let kind = debug_frame_be();
+        let section = Section::with_endian(kind.endian())
+            .cie(kind, None, &mut cie)
+            .append_bytes(&expected_rest);
+        let section = section.get_contents().unwrap();
+        let debug_frame = kind.section(&section);
+        let rest = &mut EndianSlice::new(&section, BigEndian);
+
+        let bases = Default::default();
+        assert_eq!(
+            parse_cfi_entry(&bases, &debug_frame, rest),
+            Ok(Some(CieOrFde::Cie(cie)))
+        );
+        assert_eq!(*rest, EndianSlice::new(&expected_rest, BigEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_entry_on_fde_32_ok() {
+        let cie_offset = 0x1234_5678;
+        let expected_rest = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let expected_instrs: Vec<_> = (0..4).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let cie = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 0,
+            code_alignment_factor: 16,
+            data_alignment_factor: 32,
+            return_address_register: Register(1),
+            initial_instructions: EndianSlice::new(&[], BigEndian),
+        };
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_beef,
+            address_range: 39,
+            augmentation: None,
+            instructions: EndianSlice::new(&expected_instrs, BigEndian),
+        };
+
+        let kind = debug_frame_be();
+        let section = Section::with_endian(kind.endian())
+            .fde(kind, cie_offset, &mut fde)
+            .append_bytes(&expected_rest);
+
+        let section = section.get_contents().unwrap();
+        let debug_frame = kind.section(&section);
+        let rest = &mut EndianSlice::new(&section, BigEndian);
+
+        let bases = Default::default();
+        match parse_cfi_entry(&bases, &debug_frame, rest) {
+            Ok(Some(CieOrFde::Fde(partial))) => {
+                assert_eq!(*rest, EndianSlice::new(&expected_rest, BigEndian));
+
+                assert_eq!(partial.length, fde.length);
+                assert_eq!(partial.format, fde.format);
+                assert_eq!(partial.cie_offset, DebugFrameOffset(cie_offset as usize));
+
+                let get_cie = |_: &_, _: &_, offset| {
+                    assert_eq!(offset, DebugFrameOffset(cie_offset as usize));
+                    Ok(cie.clone())
+                };
+
+                assert_eq!(partial.parse(get_cie), Ok(fde));
+            }
+            otherwise => panic!("Unexpected result: {:#?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_cfi_entries_iter() {
+        let expected_instrs1: Vec<_> = (0..4).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let expected_instrs2: Vec<_> = (0..8).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let expected_instrs3: Vec<_> = (0..12).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let expected_instrs4: Vec<_> = (0..16).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let mut cie1 = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 0,
+            code_alignment_factor: 1,
+            data_alignment_factor: 2,
+            return_address_register: Register(3),
+            initial_instructions: EndianSlice::new(&expected_instrs1, BigEndian),
+        };
+
+        let mut cie2 = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 0,
+            code_alignment_factor: 3,
+            data_alignment_factor: 2,
+            return_address_register: Register(1),
+            initial_instructions: EndianSlice::new(&expected_instrs2, BigEndian),
+        };
+
+        let cie1_location = Label::new();
+        let cie2_location = Label::new();
+
+        // Write the CIEs first so that their length gets set before we clone
+        // them into the FDEs and our equality assertions down the line end up
+        // with all the CIEs always having he correct length.
+        let kind = debug_frame_be();
+        let section = Section::with_endian(kind.endian())
+            .mark(&cie1_location)
+            .cie(kind, None, &mut cie1)
+            .mark(&cie2_location)
+            .cie(kind, None, &mut cie2);
+
+        let mut fde1 = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie1.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_beef,
+            address_range: 39,
+            augmentation: None,
+            instructions: EndianSlice::new(&expected_instrs3, BigEndian),
+        };
+
+        let mut fde2 = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie2.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_face,
+            address_range: 9000,
+            augmentation: None,
+            instructions: EndianSlice::new(&expected_instrs4, BigEndian),
+        };
+
+        let section =
+            section
+                .fde(kind, &cie1_location, &mut fde1)
+                .fde(kind, &cie2_location, &mut fde2);
+
+        section.start().set_const(0);
+
+        let cie1_offset = cie1_location.value().unwrap() as usize;
+        let cie2_offset = cie2_location.value().unwrap() as usize;
+
+        let contents = section.get_contents().unwrap();
+        let debug_frame = kind.section(&contents);
+
+        let bases = Default::default();
+        let mut entries = debug_frame.entries(&bases);
+
+        assert_eq!(entries.next(), Ok(Some(CieOrFde::Cie(cie1.clone()))));
+        assert_eq!(entries.next(), Ok(Some(CieOrFde::Cie(cie2.clone()))));
+
+        match entries.next() {
+            Ok(Some(CieOrFde::Fde(partial))) => {
+                assert_eq!(partial.length, fde1.length);
+                assert_eq!(partial.format, fde1.format);
+                assert_eq!(partial.cie_offset, DebugFrameOffset(cie1_offset));
+
+                let get_cie = |_: &_, _: &_, offset| {
+                    assert_eq!(offset, DebugFrameOffset(cie1_offset));
+                    Ok(cie1.clone())
+                };
+                assert_eq!(partial.parse(get_cie), Ok(fde1));
+            }
+            otherwise => panic!("Unexpected result: {:#?}", otherwise),
+        }
+
+        match entries.next() {
+            Ok(Some(CieOrFde::Fde(partial))) => {
+                assert_eq!(partial.length, fde2.length);
+                assert_eq!(partial.format, fde2.format);
+                assert_eq!(partial.cie_offset, DebugFrameOffset(cie2_offset));
+
+                let get_cie = |_: &_, _: &_, offset| {
+                    assert_eq!(offset, DebugFrameOffset(cie2_offset));
+                    Ok(cie2.clone())
+                };
+                assert_eq!(partial.parse(get_cie), Ok(fde2));
+            }
+            otherwise => panic!("Unexpected result: {:#?}", otherwise),
+        }
+
+        assert_eq!(entries.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_parse_cie_from_offset() {
+        let filler = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let instrs: Vec<_> = (0..5).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let mut cie = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf64,
+            version: 4,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 0,
+            code_alignment_factor: 4,
+            data_alignment_factor: 8,
+            return_address_register: Register(12),
+            initial_instructions: EndianSlice::new(&instrs, LittleEndian),
+        };
+
+        let cie_location = Label::new();
+
+        let kind = debug_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .append_bytes(&filler)
+            .mark(&cie_location)
+            .cie(kind, None, &mut cie)
+            .append_bytes(&filler);
+
+        section.start().set_const(0);
+
+        let cie_offset = DebugFrameOffset(cie_location.value().unwrap() as usize);
+
+        let contents = section.get_contents().unwrap();
+        let debug_frame = kind.section(&contents);
+        let bases = Default::default();
+
+        assert_eq!(debug_frame.cie_from_offset(&bases, cie_offset), Ok(cie));
+    }
+
+    fn parse_cfi_instruction<R: Reader + Default>(
+        input: &mut R,
+        address_size: u8,
+    ) -> Result<CallFrameInstruction<R>> {
+        let parameters = &PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size,
+            section: &R::default(),
+        };
+        CallFrameInstruction::parse(input, None, parameters)
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_advance_loc() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_delta = 42;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_advance_loc.0 | expected_delta)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::AdvanceLoc {
+                delta: u32::from(expected_delta),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_offset() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 3;
+        let expected_offset = 1997;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_offset.0 | expected_reg)
+            .uleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::Offset {
+                register: Register(expected_reg.into()),
+                factored_offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_restore() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 3;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_restore.0 | expected_reg)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::Restore {
+                register: Register(expected_reg.into()),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_nop() {
+        let expected_rest = [1, 2, 3, 4];
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_nop.0)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::Nop)
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_set_loc() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_addr = 0xdead_beef;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_set_loc.0)
+            .L64(expected_addr)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::SetLoc {
+                address: expected_addr,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_set_loc_encoding() {
+        let text_base = 0xfeed_face;
+        let addr_offset = 0xbeef;
+        let expected_addr = text_base + addr_offset;
+        let expected_rest = [1, 2, 3, 4];
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_set_loc.0)
+            .L64(addr_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        let parameters = &PointerEncodingParameters {
+            bases: &BaseAddresses::default().set_text(text_base).eh_frame,
+            func_base: None,
+            address_size: 8,
+            section: &EndianSlice::new(&[], LittleEndian),
+        };
+        assert_eq!(
+            CallFrameInstruction::parse(input, Some(constants::DW_EH_PE_textrel), parameters),
+            Ok(CallFrameInstruction::SetLoc {
+                address: expected_addr,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_advance_loc1() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_delta = 8;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_advance_loc1.0)
+            .D8(expected_delta)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::AdvanceLoc {
+                delta: u32::from(expected_delta),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_advance_loc2() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_delta = 500;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_advance_loc2.0)
+            .L16(expected_delta)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::AdvanceLoc {
+                delta: u32::from(expected_delta),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_advance_loc4() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_delta = 1 << 20;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_advance_loc4.0)
+            .L32(expected_delta)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::AdvanceLoc {
+                delta: expected_delta,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_offset_extended() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 7;
+        let expected_offset = 33;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_offset_extended.0)
+            .uleb(expected_reg.into())
+            .uleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::Offset {
+                register: Register(expected_reg),
+                factored_offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_restore_extended() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 7;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_restore_extended.0)
+            .uleb(expected_reg.into())
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::Restore {
+                register: Register(expected_reg),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_undefined() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 7;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_undefined.0)
+            .uleb(expected_reg.into())
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::Undefined {
+                register: Register(expected_reg),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_same_value() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 7;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_same_value.0)
+            .uleb(expected_reg.into())
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::SameValue {
+                register: Register(expected_reg),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_register() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_dest_reg = 7;
+        let expected_src_reg = 8;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_register.0)
+            .uleb(expected_dest_reg.into())
+            .uleb(expected_src_reg.into())
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::Register {
+                dest_register: Register(expected_dest_reg),
+                src_register: Register(expected_src_reg),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_remember_state() {
+        let expected_rest = [1, 2, 3, 4];
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_remember_state.0)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::RememberState)
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_restore_state() {
+        let expected_rest = [1, 2, 3, 4];
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_restore_state.0)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::RestoreState)
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_def_cfa() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 2;
+        let expected_offset = 0;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_def_cfa.0)
+            .uleb(expected_reg.into())
+            .uleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::DefCfa {
+                register: Register(expected_reg),
+                offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_def_cfa_register() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 2;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_def_cfa_register.0)
+            .uleb(expected_reg.into())
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::DefCfaRegister {
+                register: Register(expected_reg),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_def_cfa_offset() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_offset = 23;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_def_cfa_offset.0)
+            .uleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::DefCfaOffset {
+                offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_def_cfa_expression() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_expr = [10, 9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+        let length = Label::new();
+        let start = Label::new();
+        let end = Label::new();
+
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_def_cfa_expression.0)
+            .D8(&length)
+            .mark(&start)
+            .append_bytes(&expected_expr)
+            .mark(&end)
+            .append_bytes(&expected_rest);
+
+        length.set_const((&end - &start) as u64);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::DefCfaExpression {
+                expression: Expression(EndianSlice::new(&expected_expr, LittleEndian)),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_expression() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 99;
+        let expected_expr = [10, 9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+        let length = Label::new();
+        let start = Label::new();
+        let end = Label::new();
+
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_expression.0)
+            .uleb(expected_reg.into())
+            .D8(&length)
+            .mark(&start)
+            .append_bytes(&expected_expr)
+            .mark(&end)
+            .append_bytes(&expected_rest);
+
+        length.set_const((&end - &start) as u64);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::Expression {
+                register: Register(expected_reg),
+                expression: Expression(EndianSlice::new(&expected_expr, LittleEndian)),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_offset_extended_sf() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 7;
+        let expected_offset = -33;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_offset_extended_sf.0)
+            .uleb(expected_reg.into())
+            .sleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::OffsetExtendedSf {
+                register: Register(expected_reg),
+                factored_offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_def_cfa_sf() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 2;
+        let expected_offset = -9999;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_def_cfa_sf.0)
+            .uleb(expected_reg.into())
+            .sleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::DefCfaSf {
+                register: Register(expected_reg),
+                factored_offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_def_cfa_offset_sf() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_offset = -123;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_def_cfa_offset_sf.0)
+            .sleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::DefCfaOffsetSf {
+                factored_offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_val_offset() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 50;
+        let expected_offset = 23;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_val_offset.0)
+            .uleb(expected_reg.into())
+            .uleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::ValOffset {
+                register: Register(expected_reg),
+                factored_offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_val_offset_sf() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 50;
+        let expected_offset = -23;
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_val_offset_sf.0)
+            .uleb(expected_reg.into())
+            .sleb(expected_offset)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::ValOffsetSf {
+                register: Register(expected_reg),
+                factored_offset: expected_offset,
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_val_expression() {
+        let expected_rest = [1, 2, 3, 4];
+        let expected_reg = 50;
+        let expected_expr = [2, 2, 1, 1, 5, 5];
+
+        let length = Label::new();
+        let start = Label::new();
+        let end = Label::new();
+
+        let section = Section::with_endian(Endian::Little)
+            .D8(constants::DW_CFA_val_expression.0)
+            .uleb(expected_reg.into())
+            .D8(&length)
+            .mark(&start)
+            .append_bytes(&expected_expr)
+            .mark(&end)
+            .append_bytes(&expected_rest);
+
+        length.set_const((&end - &start) as u64);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Ok(CallFrameInstruction::ValExpression {
+                register: Register(expected_reg),
+                expression: Expression(EndianSlice::new(&expected_expr, LittleEndian)),
+            })
+        );
+        assert_eq!(*input, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_cfi_instruction_unknown_instruction() {
+        let expected_rest = [1, 2, 3, 4];
+        let unknown_instr = constants::DwCfa(0b0011_1111);
+        let section = Section::with_endian(Endian::Little)
+            .D8(unknown_instr.0)
+            .append_bytes(&expected_rest);
+        let contents = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&contents, LittleEndian);
+        assert_eq!(
+            parse_cfi_instruction(input, 8),
+            Err(Error::UnknownCallFrameInstruction(unknown_instr))
+        );
+    }
+
+    #[test]
+    fn test_call_frame_instruction_iter_ok() {
+        let expected_reg = 50;
+        let expected_expr = [2, 2, 1, 1, 5, 5];
+        let expected_delta = 230;
+
+        let length = Label::new();
+        let start = Label::new();
+        let end = Label::new();
+
+        let section = Section::with_endian(Endian::Big)
+            .D8(constants::DW_CFA_val_expression.0)
+            .uleb(expected_reg.into())
+            .D8(&length)
+            .mark(&start)
+            .append_bytes(&expected_expr)
+            .mark(&end)
+            .D8(constants::DW_CFA_advance_loc1.0)
+            .D8(expected_delta);
+
+        length.set_const((&end - &start) as u64);
+        let contents = section.get_contents().unwrap();
+        let input = EndianSlice::new(&contents, BigEndian);
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 8,
+            section: &EndianSlice::default(),
+        };
+        let mut iter = CallFrameInstructionIter {
+            input,
+            address_encoding: None,
+            parameters,
+        };
+
+        assert_eq!(
+            iter.next(),
+            Ok(Some(CallFrameInstruction::ValExpression {
+                register: Register(expected_reg),
+                expression: Expression(EndianSlice::new(&expected_expr, BigEndian)),
+            }))
+        );
+
+        assert_eq!(
+            iter.next(),
+            Ok(Some(CallFrameInstruction::AdvanceLoc {
+                delta: u32::from(expected_delta),
+            }))
+        );
+
+        assert_eq!(iter.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_call_frame_instruction_iter_err() {
+        // DW_CFA_advance_loc1 without an operand.
+        let section = Section::with_endian(Endian::Big).D8(constants::DW_CFA_advance_loc1.0);
+
+        let contents = section.get_contents().unwrap();
+        let input = EndianSlice::new(&contents, BigEndian);
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 8,
+            section: &EndianSlice::default(),
+        };
+        let mut iter = CallFrameInstructionIter {
+            input,
+            address_encoding: None,
+            parameters,
+        };
+
+        assert_eq!(
+            iter.next().map_eof(&contents),
+            Err(Error::UnexpectedEof(ReaderOffsetId(1)))
+        );
+        assert_eq!(iter.next(), Ok(None));
+    }
+
+    #[allow(clippy::needless_pass_by_value)]
+    fn assert_eval<'a, I>(
+        mut initial_ctx: UnwindContext<EndianSlice<'a, LittleEndian>>,
+        expected_ctx: UnwindContext<EndianSlice<'a, LittleEndian>>,
+        cie: CommonInformationEntry<EndianSlice<'a, LittleEndian>>,
+        fde: Option<FrameDescriptionEntry<EndianSlice<'a, LittleEndian>>>,
+        instructions: I,
+    ) where
+        I: AsRef<
+            [(
+                Result<bool>,
+                CallFrameInstruction<EndianSlice<'a, LittleEndian>>,
+            )],
+        >,
+    {
+        {
+            let section = &DebugFrame::from(EndianSlice::default());
+            let bases = &BaseAddresses::default();
+            let mut table = match fde {
+                Some(fde) => UnwindTable::new_for_fde(section, bases, &mut initial_ctx, &fde),
+                None => UnwindTable::new_for_cie(section, bases, &mut initial_ctx, &cie),
+            };
+            for &(ref expected_result, ref instruction) in instructions.as_ref() {
+                assert_eq!(*expected_result, table.evaluate(instruction.clone()));
+            }
+        }
+
+        assert_eq!(expected_ctx, initial_ctx);
+    }
+
+    fn make_test_cie<'a>() -> CommonInformationEntry<EndianSlice<'a, LittleEndian>> {
+        CommonInformationEntry {
+            offset: 0,
+            format: Format::Dwarf64,
+            length: 0,
+            return_address_register: Register(0),
+            version: 4,
+            address_size: mem::size_of::<usize>() as u8,
+            initial_instructions: EndianSlice::new(&[], LittleEndian),
+            augmentation: None,
+            segment_size: 0,
+            data_alignment_factor: 2,
+            code_alignment_factor: 3,
+        }
+    }
+
+    #[test]
+    fn test_eval_set_loc() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected.row_mut().end_address = 42;
+        let instructions = [(Ok(true), CallFrameInstruction::SetLoc { address: 42 })];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_set_loc_backwards() {
+        let cie = make_test_cie();
+        let mut ctx = UnwindContext::new();
+        ctx.row_mut().start_address = 999;
+        let expected = ctx.clone();
+        let instructions = [(
+            Err(Error::InvalidAddressRange),
+            CallFrameInstruction::SetLoc { address: 42 },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_advance_loc() {
+        let cie = make_test_cie();
+        let mut ctx = UnwindContext::new();
+        ctx.row_mut().start_address = 3;
+        let mut expected = ctx.clone();
+        expected.row_mut().end_address = 3 + 2 * cie.code_alignment_factor;
+        let instructions = [(Ok(true), CallFrameInstruction::AdvanceLoc { delta: 2 })];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_advance_loc_overflow() {
+        let cie = make_test_cie();
+        let mut ctx = UnwindContext::new();
+        ctx.row_mut().start_address = u64::MAX;
+        let mut expected = ctx.clone();
+        expected.row_mut().end_address = 42 * cie.code_alignment_factor - 1;
+        let instructions = [(Ok(true), CallFrameInstruction::AdvanceLoc { delta: 42 })];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_def_cfa() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected.set_cfa(CfaRule::RegisterAndOffset {
+            register: Register(42),
+            offset: 36,
+        });
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::DefCfa {
+                register: Register(42),
+                offset: 36,
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_def_cfa_sf() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected.set_cfa(CfaRule::RegisterAndOffset {
+            register: Register(42),
+            offset: 36 * cie.data_alignment_factor as i64,
+        });
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::DefCfaSf {
+                register: Register(42),
+                factored_offset: 36,
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_def_cfa_register() {
+        let cie = make_test_cie();
+        let mut ctx = UnwindContext::new();
+        ctx.set_cfa(CfaRule::RegisterAndOffset {
+            register: Register(3),
+            offset: 8,
+        });
+        let mut expected = ctx.clone();
+        expected.set_cfa(CfaRule::RegisterAndOffset {
+            register: Register(42),
+            offset: 8,
+        });
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::DefCfaRegister {
+                register: Register(42),
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_def_cfa_register_invalid_context() {
+        let cie = make_test_cie();
+        let mut ctx = UnwindContext::new();
+        ctx.set_cfa(CfaRule::Expression(Expression(EndianSlice::new(
+            &[],
+            LittleEndian,
+        ))));
+        let expected = ctx.clone();
+        let instructions = [(
+            Err(Error::CfiInstructionInInvalidContext),
+            CallFrameInstruction::DefCfaRegister {
+                register: Register(42),
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_def_cfa_offset() {
+        let cie = make_test_cie();
+        let mut ctx = UnwindContext::new();
+        ctx.set_cfa(CfaRule::RegisterAndOffset {
+            register: Register(3),
+            offset: 8,
+        });
+        let mut expected = ctx.clone();
+        expected.set_cfa(CfaRule::RegisterAndOffset {
+            register: Register(3),
+            offset: 42,
+        });
+        let instructions = [(Ok(false), CallFrameInstruction::DefCfaOffset { offset: 42 })];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_def_cfa_offset_invalid_context() {
+        let cie = make_test_cie();
+        let mut ctx = UnwindContext::new();
+        ctx.set_cfa(CfaRule::Expression(Expression(EndianSlice::new(
+            &[],
+            LittleEndian,
+        ))));
+        let expected = ctx.clone();
+        let instructions = [(
+            Err(Error::CfiInstructionInInvalidContext),
+            CallFrameInstruction::DefCfaOffset { offset: 1993 },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_def_cfa_expression() {
+        let expr = [1, 2, 3, 4];
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected.set_cfa(CfaRule::Expression(Expression(EndianSlice::new(
+            &expr,
+            LittleEndian,
+        ))));
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::DefCfaExpression {
+                expression: Expression(EndianSlice::new(&expr, LittleEndian)),
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_undefined() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected
+            .set_register_rule(Register(5), RegisterRule::Undefined)
+            .unwrap();
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::Undefined {
+                register: Register(5),
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_same_value() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected
+            .set_register_rule(Register(0), RegisterRule::SameValue)
+            .unwrap();
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::SameValue {
+                register: Register(0),
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_offset() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected
+            .set_register_rule(
+                Register(2),
+                RegisterRule::Offset(3 * cie.data_alignment_factor),
+            )
+            .unwrap();
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::Offset {
+                register: Register(2),
+                factored_offset: 3,
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_offset_extended_sf() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected
+            .set_register_rule(
+                Register(4),
+                RegisterRule::Offset(-3 * cie.data_alignment_factor),
+            )
+            .unwrap();
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::OffsetExtendedSf {
+                register: Register(4),
+                factored_offset: -3,
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_val_offset() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected
+            .set_register_rule(
+                Register(5),
+                RegisterRule::ValOffset(7 * cie.data_alignment_factor),
+            )
+            .unwrap();
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::ValOffset {
+                register: Register(5),
+                factored_offset: 7,
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_val_offset_sf() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected
+            .set_register_rule(
+                Register(5),
+                RegisterRule::ValOffset(-7 * cie.data_alignment_factor),
+            )
+            .unwrap();
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::ValOffsetSf {
+                register: Register(5),
+                factored_offset: -7,
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_expression() {
+        let expr = [1, 2, 3, 4];
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected
+            .set_register_rule(
+                Register(9),
+                RegisterRule::Expression(Expression(EndianSlice::new(&expr, LittleEndian))),
+            )
+            .unwrap();
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::Expression {
+                register: Register(9),
+                expression: Expression(EndianSlice::new(&expr, LittleEndian)),
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_val_expression() {
+        let expr = [1, 2, 3, 4];
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected
+            .set_register_rule(
+                Register(9),
+                RegisterRule::ValExpression(Expression(EndianSlice::new(&expr, LittleEndian))),
+            )
+            .unwrap();
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::ValExpression {
+                register: Register(9),
+                expression: Expression(EndianSlice::new(&expr, LittleEndian)),
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_restore() {
+        let cie = make_test_cie();
+        let fde = FrameDescriptionEntry {
+            offset: 0,
+            format: Format::Dwarf64,
+            length: 0,
+            address_range: 0,
+            augmentation: None,
+            initial_address: 0,
+            initial_segment: 0,
+            cie: cie.clone(),
+            instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let mut ctx = UnwindContext::new();
+        ctx.set_register_rule(Register(0), RegisterRule::Offset(1))
+            .unwrap();
+        ctx.save_initial_rules();
+        let expected = ctx.clone();
+        ctx.set_register_rule(Register(0), RegisterRule::Offset(2))
+            .unwrap();
+
+        let instructions = [(
+            Ok(false),
+            CallFrameInstruction::Restore {
+                register: Register(0),
+            },
+        )];
+        assert_eval(ctx, expected, cie, Some(fde), instructions);
+    }
+
+    #[test]
+    fn test_eval_restore_havent_saved_initial_context() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let expected = ctx.clone();
+        let instructions = [(
+            Err(Error::CfiInstructionInInvalidContext),
+            CallFrameInstruction::Restore {
+                register: Register(0),
+            },
+        )];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_remember_state() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let mut expected = ctx.clone();
+        expected.push_row().unwrap();
+        let instructions = [(Ok(false), CallFrameInstruction::RememberState)];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_restore_state() {
+        let cie = make_test_cie();
+
+        let mut ctx = UnwindContext::new();
+        ctx.set_start_address(1);
+        ctx.set_register_rule(Register(0), RegisterRule::SameValue)
+            .unwrap();
+        let mut expected = ctx.clone();
+        ctx.push_row().unwrap();
+        ctx.set_start_address(2);
+        ctx.set_register_rule(Register(0), RegisterRule::Offset(16))
+            .unwrap();
+
+        // Restore state should preserve current location.
+        expected.set_start_address(2);
+
+        let instructions = [
+            // First one pops just fine.
+            (Ok(false), CallFrameInstruction::RestoreState),
+            // Second pop would try to pop out of bounds.
+            (
+                Err(Error::PopWithEmptyStack),
+                CallFrameInstruction::RestoreState,
+            ),
+        ];
+
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_eval_nop() {
+        let cie = make_test_cie();
+        let ctx = UnwindContext::new();
+        let expected = ctx.clone();
+        let instructions = [(Ok(false), CallFrameInstruction::Nop)];
+        assert_eval(ctx, expected, cie, None, instructions);
+    }
+
+    #[test]
+    fn test_unwind_table_next_row() {
+        #[allow(clippy::identity_op)]
+        let initial_instructions = Section::with_endian(Endian::Little)
+            // The CFA is -12 from register 4.
+            .D8(constants::DW_CFA_def_cfa_sf.0)
+            .uleb(4)
+            .sleb(-12)
+            // Register 0 is 8 from the CFA.
+            .D8(constants::DW_CFA_offset.0 | 0)
+            .uleb(8)
+            // Register 3 is 4 from the CFA.
+            .D8(constants::DW_CFA_offset.0 | 3)
+            .uleb(4)
+            .append_repeated(constants::DW_CFA_nop.0, 4);
+        let initial_instructions = initial_instructions.get_contents().unwrap();
+
+        let cie = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 8,
+            segment_size: 0,
+            code_alignment_factor: 1,
+            data_alignment_factor: 1,
+            return_address_register: Register(3),
+            initial_instructions: EndianSlice::new(&initial_instructions, LittleEndian),
+        };
+
+        let instructions = Section::with_endian(Endian::Little)
+            // Initial instructions form a row, advance the address by 1.
+            .D8(constants::DW_CFA_advance_loc1.0)
+            .D8(1)
+            // Register 0 is -16 from the CFA.
+            .D8(constants::DW_CFA_offset_extended_sf.0)
+            .uleb(0)
+            .sleb(-16)
+            // Finish this row, advance the address by 32.
+            .D8(constants::DW_CFA_advance_loc1.0)
+            .D8(32)
+            // Register 3 is -4 from the CFA.
+            .D8(constants::DW_CFA_offset_extended_sf.0)
+            .uleb(3)
+            .sleb(-4)
+            // Finish this row, advance the address by 64.
+            .D8(constants::DW_CFA_advance_loc1.0)
+            .D8(64)
+            // Register 5 is 4 from the CFA.
+            .D8(constants::DW_CFA_offset.0 | 5)
+            .uleb(4)
+            // A bunch of nop padding.
+            .append_repeated(constants::DW_CFA_nop.0, 8);
+        let instructions = instructions.get_contents().unwrap();
+
+        let fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0,
+            address_range: 100,
+            augmentation: None,
+            instructions: EndianSlice::new(&instructions, LittleEndian),
+        };
+
+        let section = &DebugFrame::from(EndianSlice::default());
+        let bases = &BaseAddresses::default();
+        let mut ctx = UninitializedUnwindContext::new();
+        ctx.0.assert_fully_uninitialized();
+
+        let mut table = fde
+            .rows(section, bases, &mut ctx)
+            .expect("Should run initial program OK");
+        assert!(table.ctx.is_initialized);
+        let expected_initial_rules: RegisterRuleMap<_> = [
+            (Register(0), RegisterRule::Offset(8)),
+            (Register(3), RegisterRule::Offset(4)),
+        ]
+        .iter()
+        .collect();
+        assert_eq!(table.ctx.initial_rules, expected_initial_rules);
+
+        {
+            let row = table.next_row().expect("Should evaluate first row OK");
+            let expected = UnwindTableRow {
+                start_address: 0,
+                end_address: 1,
+                saved_args_size: 0,
+                cfa: CfaRule::RegisterAndOffset {
+                    register: Register(4),
+                    offset: -12,
+                },
+                registers: [
+                    (Register(0), RegisterRule::Offset(8)),
+                    (Register(3), RegisterRule::Offset(4)),
+                ]
+                .iter()
+                .collect(),
+            };
+            assert_eq!(Some(&expected), row);
+        }
+
+        {
+            let row = table.next_row().expect("Should evaluate second row OK");
+            let expected = UnwindTableRow {
+                start_address: 1,
+                end_address: 33,
+                saved_args_size: 0,
+                cfa: CfaRule::RegisterAndOffset {
+                    register: Register(4),
+                    offset: -12,
+                },
+                registers: [
+                    (Register(0), RegisterRule::Offset(-16)),
+                    (Register(3), RegisterRule::Offset(4)),
+                ]
+                .iter()
+                .collect(),
+            };
+            assert_eq!(Some(&expected), row);
+        }
+
+        {
+            let row = table.next_row().expect("Should evaluate third row OK");
+            let expected = UnwindTableRow {
+                start_address: 33,
+                end_address: 97,
+                saved_args_size: 0,
+                cfa: CfaRule::RegisterAndOffset {
+                    register: Register(4),
+                    offset: -12,
+                },
+                registers: [
+                    (Register(0), RegisterRule::Offset(-16)),
+                    (Register(3), RegisterRule::Offset(-4)),
+                ]
+                .iter()
+                .collect(),
+            };
+            assert_eq!(Some(&expected), row);
+        }
+
+        {
+            let row = table.next_row().expect("Should evaluate fourth row OK");
+            let expected = UnwindTableRow {
+                start_address: 97,
+                end_address: 100,
+                saved_args_size: 0,
+                cfa: CfaRule::RegisterAndOffset {
+                    register: Register(4),
+                    offset: -12,
+                },
+                registers: [
+                    (Register(0), RegisterRule::Offset(-16)),
+                    (Register(3), RegisterRule::Offset(-4)),
+                    (Register(5), RegisterRule::Offset(4)),
+                ]
+                .iter()
+                .collect(),
+            };
+            assert_eq!(Some(&expected), row);
+        }
+
+        // All done!
+        assert_eq!(Ok(None), table.next_row());
+        assert_eq!(Ok(None), table.next_row());
+    }
+
+    #[test]
+    fn test_unwind_info_for_address_ok() {
+        let instrs1 = Section::with_endian(Endian::Big)
+            // The CFA is -12 from register 4.
+            .D8(constants::DW_CFA_def_cfa_sf.0)
+            .uleb(4)
+            .sleb(-12);
+        let instrs1 = instrs1.get_contents().unwrap();
+
+        let instrs2: Vec<_> = (0..8).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let instrs3 = Section::with_endian(Endian::Big)
+            // Initial instructions form a row, advance the address by 100.
+            .D8(constants::DW_CFA_advance_loc1.0)
+            .D8(100)
+            // Register 0 is -16 from the CFA.
+            .D8(constants::DW_CFA_offset_extended_sf.0)
+            .uleb(0)
+            .sleb(-16);
+        let instrs3 = instrs3.get_contents().unwrap();
+
+        let instrs4: Vec<_> = (0..16).map(|_| constants::DW_CFA_nop.0).collect();
+
+        let mut cie1 = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 8,
+            segment_size: 0,
+            code_alignment_factor: 1,
+            data_alignment_factor: 1,
+            return_address_register: Register(3),
+            initial_instructions: EndianSlice::new(&instrs1, BigEndian),
+        };
+
+        let mut cie2 = CommonInformationEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            version: 4,
+            augmentation: None,
+            address_size: 4,
+            segment_size: 0,
+            code_alignment_factor: 1,
+            data_alignment_factor: 1,
+            return_address_register: Register(1),
+            initial_instructions: EndianSlice::new(&instrs2, BigEndian),
+        };
+
+        let cie1_location = Label::new();
+        let cie2_location = Label::new();
+
+        // Write the CIEs first so that their length gets set before we clone
+        // them into the FDEs and our equality assertions down the line end up
+        // with all the CIEs always having he correct length.
+        let kind = debug_frame_be();
+        let section = Section::with_endian(kind.endian())
+            .mark(&cie1_location)
+            .cie(kind, None, &mut cie1)
+            .mark(&cie2_location)
+            .cie(kind, None, &mut cie2);
+
+        let mut fde1 = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie1.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_beef,
+            address_range: 200,
+            augmentation: None,
+            instructions: EndianSlice::new(&instrs3, BigEndian),
+        };
+
+        let mut fde2 = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie2.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_face,
+            address_range: 9000,
+            augmentation: None,
+            instructions: EndianSlice::new(&instrs4, BigEndian),
+        };
+
+        let section =
+            section
+                .fde(kind, &cie1_location, &mut fde1)
+                .fde(kind, &cie2_location, &mut fde2);
+        section.start().set_const(0);
+
+        let contents = section.get_contents().unwrap();
+        let debug_frame = kind.section(&contents);
+
+        // Get the second row of the unwind table in `instrs3`.
+        let bases = Default::default();
+        let mut ctx = UninitializedUnwindContext::new();
+        let result = debug_frame.unwind_info_for_address(
+            &bases,
+            &mut ctx,
+            0xfeed_beef + 150,
+            DebugFrame::cie_from_offset,
+        );
+        assert!(result.is_ok());
+        let unwind_info = result.unwrap();
+
+        assert_eq!(
+            unwind_info,
+            UnwindTableRow {
+                start_address: fde1.initial_address() + 100,
+                end_address: fde1.initial_address() + fde1.len(),
+                saved_args_size: 0,
+                cfa: CfaRule::RegisterAndOffset {
+                    register: Register(4),
+                    offset: -12,
+                },
+                registers: [(Register(0), RegisterRule::Offset(-16))].iter().collect(),
+            }
+        );
+    }
+
+    #[test]
+    fn test_unwind_info_for_address_not_found() {
+        let debug_frame = DebugFrame::new(&[], NativeEndian);
+        let bases = Default::default();
+        let mut ctx = UninitializedUnwindContext::new();
+        let result = debug_frame.unwind_info_for_address(
+            &bases,
+            &mut ctx,
+            0xbadb_ad99,
+            DebugFrame::cie_from_offset,
+        );
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), Error::NoUnwindInfoForAddress);
+    }
+
+    #[test]
+    fn test_eh_frame_hdr_unknown_version() {
+        let bases = BaseAddresses::default();
+        let buf = &[42];
+        let result = EhFrameHdr::new(buf, NativeEndian).parse(&bases, 8);
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), Error::UnknownVersion(42));
+    }
+
+    #[test]
+    fn test_eh_frame_hdr_omit_ehptr() {
+        let section = Section::with_endian(Endian::Little)
+            .L8(1)
+            .L8(0xff)
+            .L8(0x03)
+            .L8(0x0b)
+            .L32(2)
+            .L32(10)
+            .L32(1)
+            .L32(20)
+            .L32(2)
+            .L32(0);
+        let section = section.get_contents().unwrap();
+        let bases = BaseAddresses::default();
+        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), Error::CannotParseOmitPointerEncoding);
+    }
+
+    #[test]
+    fn test_eh_frame_hdr_omit_count() {
+        let section = Section::with_endian(Endian::Little)
+            .L8(1)
+            .L8(0x0b)
+            .L8(0xff)
+            .L8(0x0b)
+            .L32(0x12345);
+        let section = section.get_contents().unwrap();
+        let bases = BaseAddresses::default();
+        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
+        assert!(result.is_ok());
+        let result = result.unwrap();
+        assert_eq!(result.eh_frame_ptr(), Pointer::Direct(0x12345));
+        assert!(result.table().is_none());
+    }
+
+    #[test]
+    fn test_eh_frame_hdr_omit_table() {
+        let section = Section::with_endian(Endian::Little)
+            .L8(1)
+            .L8(0x0b)
+            .L8(0x03)
+            .L8(0xff)
+            .L32(0x12345)
+            .L32(2);
+        let section = section.get_contents().unwrap();
+        let bases = BaseAddresses::default();
+        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
+        assert!(result.is_ok());
+        let result = result.unwrap();
+        assert_eq!(result.eh_frame_ptr(), Pointer::Direct(0x12345));
+        assert!(result.table().is_none());
+    }
+
+    #[test]
+    fn test_eh_frame_hdr_varlen_table() {
+        let section = Section::with_endian(Endian::Little)
+            .L8(1)
+            .L8(0x0b)
+            .L8(0x03)
+            .L8(0x01)
+            .L32(0x12345)
+            .L32(2);
+        let section = section.get_contents().unwrap();
+        let bases = BaseAddresses::default();
+        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
+        assert!(result.is_ok());
+        let result = result.unwrap();
+        assert_eq!(result.eh_frame_ptr(), Pointer::Direct(0x12345));
+        let table = result.table();
+        assert!(table.is_some());
+        let table = table.unwrap();
+        assert_eq!(
+            table.lookup(0, &bases),
+            Err(Error::VariableLengthSearchTable)
+        );
+    }
+
+    #[test]
+    fn test_eh_frame_hdr_indirect_length() {
+        let section = Section::with_endian(Endian::Little)
+            .L8(1)
+            .L8(0x0b)
+            .L8(0x83)
+            .L8(0x0b)
+            .L32(0x12345)
+            .L32(2);
+        let section = section.get_contents().unwrap();
+        let bases = BaseAddresses::default();
+        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), Error::UnsupportedPointerEncoding);
+    }
+
+    #[test]
+    fn test_eh_frame_hdr_indirect_ptrs() {
+        let section = Section::with_endian(Endian::Little)
+            .L8(1)
+            .L8(0x8b)
+            .L8(0x03)
+            .L8(0x8b)
+            .L32(0x12345)
+            .L32(2)
+            .L32(10)
+            .L32(1)
+            .L32(20)
+            .L32(2);
+        let section = section.get_contents().unwrap();
+        let bases = BaseAddresses::default();
+        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
+        assert!(result.is_ok());
+        let result = result.unwrap();
+        assert_eq!(result.eh_frame_ptr(), Pointer::Indirect(0x12345));
+        let table = result.table();
+        assert!(table.is_some());
+        let table = table.unwrap();
+        assert_eq!(
+            table.lookup(0, &bases),
+            Err(Error::UnsupportedPointerEncoding)
+        );
+    }
+
+    #[test]
+    fn test_eh_frame_hdr_good() {
+        let section = Section::with_endian(Endian::Little)
+            .L8(1)
+            .L8(0x0b)
+            .L8(0x03)
+            .L8(0x0b)
+            .L32(0x12345)
+            .L32(2)
+            .L32(10)
+            .L32(1)
+            .L32(20)
+            .L32(2);
+        let section = section.get_contents().unwrap();
+        let bases = BaseAddresses::default();
+        let result = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
+        assert!(result.is_ok());
+        let result = result.unwrap();
+        assert_eq!(result.eh_frame_ptr(), Pointer::Direct(0x12345));
+        let table = result.table();
+        assert!(table.is_some());
+        let table = table.unwrap();
+        assert_eq!(table.lookup(0, &bases), Ok(Pointer::Direct(1)));
+        assert_eq!(table.lookup(9, &bases), Ok(Pointer::Direct(1)));
+        assert_eq!(table.lookup(10, &bases), Ok(Pointer::Direct(1)));
+        assert_eq!(table.lookup(11, &bases), Ok(Pointer::Direct(1)));
+        assert_eq!(table.lookup(19, &bases), Ok(Pointer::Direct(1)));
+        assert_eq!(table.lookup(20, &bases), Ok(Pointer::Direct(2)));
+        assert_eq!(table.lookup(21, &bases), Ok(Pointer::Direct(2)));
+        assert_eq!(table.lookup(100_000, &bases), Ok(Pointer::Direct(2)));
+    }
+
+    #[test]
+    fn test_eh_frame_fde_for_address_good() {
+        // First, setup eh_frame
+        // Write the CIE first so that its length gets set before we clone it
+        // into the FDE.
+        let mut cie = make_test_cie();
+        cie.format = Format::Dwarf32;
+        cie.version = 1;
+
+        let start_of_cie = Label::new();
+        let end_of_cie = Label::new();
+
+        let kind = eh_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .append_repeated(0, 16)
+            .mark(&start_of_cie)
+            .cie(kind, None, &mut cie)
+            .mark(&end_of_cie);
+
+        let mut fde1 = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 9,
+            address_range: 4,
+            augmentation: None,
+            instructions: EndianSlice::new(&[], LittleEndian),
+        };
+        let mut fde2 = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 20,
+            address_range: 8,
+            augmentation: None,
+            instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let start_of_fde1 = Label::new();
+        let start_of_fde2 = Label::new();
+
+        let section = section
+            // +4 for the FDE length before the CIE offset.
+            .mark(&start_of_fde1)
+            .fde(kind, (&start_of_fde1 - &start_of_cie + 4) as u64, &mut fde1)
+            .mark(&start_of_fde2)
+            .fde(kind, (&start_of_fde2 - &start_of_cie + 4) as u64, &mut fde2);
+
+        section.start().set_const(0);
+        let section = section.get_contents().unwrap();
+        let section = EndianSlice::new(&section, LittleEndian);
+        let eh_frame = kind.section(&section);
+
+        // Setup eh_frame_hdr
+        let section = Section::with_endian(kind.endian())
+            .L8(1)
+            .L8(0x0b)
+            .L8(0x03)
+            .L8(0x0b)
+            .L32(0x12345)
+            .L32(2)
+            .L32(10)
+            .L32(0x12345 + start_of_fde1.value().unwrap() as u32)
+            .L32(20)
+            .L32(0x12345 + start_of_fde2.value().unwrap() as u32);
+
+        let section = section.get_contents().unwrap();
+        let bases = BaseAddresses::default();
+        let eh_frame_hdr = EhFrameHdr::new(&section, LittleEndian).parse(&bases, 8);
+        assert!(eh_frame_hdr.is_ok());
+        let eh_frame_hdr = eh_frame_hdr.unwrap();
+
+        let table = eh_frame_hdr.table();
+        assert!(table.is_some());
+        let table = table.unwrap();
+
+        let bases = Default::default();
+
+        let f = |_: &_, _: &_, o: EhFrameOffset| {
+            assert_eq!(o, EhFrameOffset(start_of_cie.value().unwrap() as usize));
+            Ok(cie.clone())
+        };
+        assert_eq!(
+            table.fde_for_address(&eh_frame, &bases, 9, f),
+            Ok(fde1.clone())
+        );
+        assert_eq!(
+            table.fde_for_address(&eh_frame, &bases, 10, f),
+            Ok(fde1.clone())
+        );
+        assert_eq!(table.fde_for_address(&eh_frame, &bases, 11, f), Ok(fde1));
+        assert_eq!(
+            table.fde_for_address(&eh_frame, &bases, 19, f),
+            Err(Error::NoUnwindInfoForAddress)
+        );
+        assert_eq!(
+            table.fde_for_address(&eh_frame, &bases, 20, f),
+            Ok(fde2.clone())
+        );
+        assert_eq!(table.fde_for_address(&eh_frame, &bases, 21, f), Ok(fde2));
+        assert_eq!(
+            table.fde_for_address(&eh_frame, &bases, 100_000, f),
+            Err(Error::NoUnwindInfoForAddress)
+        );
+    }
+
+    #[test]
+    fn test_eh_frame_stops_at_zero_length() {
+        let section = Section::with_endian(Endian::Little).L32(0);
+        let section = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&section, LittleEndian);
+        let bases = Default::default();
+
+        assert_eq!(
+            parse_cfi_entry(&bases, &EhFrame::new(&*section, LittleEndian), rest),
+            Ok(None)
+        );
+
+        assert_eq!(
+            EhFrame::new(&section, LittleEndian).cie_from_offset(&bases, EhFrameOffset(0)),
+            Err(Error::NoEntryAtGivenOffset)
+        );
+    }
+
+    fn resolve_cie_offset(buf: &[u8], cie_offset: usize) -> Result<usize> {
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf64,
+            cie: make_test_cie(),
+            initial_segment: 0,
+            initial_address: 0xfeed_beef,
+            address_range: 39,
+            augmentation: None,
+            instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let kind = eh_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .append_bytes(&buf)
+            .fde(kind, cie_offset as u64, &mut fde)
+            .append_bytes(&buf);
+
+        let section = section.get_contents().unwrap();
+        let eh_frame = kind.section(&section);
+        let input = &mut EndianSlice::new(&section[buf.len()..], LittleEndian);
+
+        let bases = Default::default();
+        match parse_cfi_entry(&bases, &eh_frame, input) {
+            Ok(Some(CieOrFde::Fde(partial))) => Ok(partial.cie_offset.0),
+            Err(e) => Err(e),
+            otherwise => panic!("Unexpected result: {:#?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_eh_frame_resolve_cie_offset_ok() {
+        let buf = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let cie_offset = 2;
+        // + 4 for size of length field
+        assert_eq!(
+            resolve_cie_offset(&buf, buf.len() + 4 - cie_offset),
+            Ok(cie_offset)
+        );
+    }
+
+    #[test]
+    fn test_eh_frame_resolve_cie_offset_out_of_bounds() {
+        let buf = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+        assert_eq!(
+            resolve_cie_offset(&buf, buf.len() + 4 + 2),
+            Err(Error::OffsetOutOfBounds)
+        );
+    }
+
+    #[test]
+    fn test_eh_frame_resolve_cie_offset_underflow() {
+        let buf = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+        assert_eq!(
+            resolve_cie_offset(&buf, ::core::usize::MAX),
+            Err(Error::OffsetOutOfBounds)
+        );
+    }
+
+    #[test]
+    fn test_eh_frame_fde_ok() {
+        let mut cie = make_test_cie();
+        cie.format = Format::Dwarf32;
+        cie.version = 1;
+
+        let start_of_cie = Label::new();
+        let end_of_cie = Label::new();
+
+        // Write the CIE first so that its length gets set before we clone it
+        // into the FDE.
+        let kind = eh_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .append_repeated(0, 16)
+            .mark(&start_of_cie)
+            .cie(kind, None, &mut cie)
+            .mark(&end_of_cie);
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_beef,
+            address_range: 999,
+            augmentation: None,
+            instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let section = section
+            // +4 for the FDE length before the CIE offset.
+            .fde(kind, (&end_of_cie - &start_of_cie + 4) as u64, &mut fde);
+
+        section.start().set_const(0);
+        let section = section.get_contents().unwrap();
+        let eh_frame = kind.section(&section);
+        let section = EndianSlice::new(&section, LittleEndian);
+
+        let mut offset = None;
+        match parse_fde(
+            eh_frame,
+            &mut section.range_from(end_of_cie.value().unwrap() as usize..),
+            |_, _, o| {
+                offset = Some(o);
+                assert_eq!(o, EhFrameOffset(start_of_cie.value().unwrap() as usize));
+                Ok(cie.clone())
+            },
+        ) {
+            Ok(actual) => assert_eq!(actual, fde),
+            otherwise => panic!("Unexpected result {:?}", otherwise),
+        }
+        assert!(offset.is_some());
+    }
+
+    #[test]
+    fn test_eh_frame_fde_out_of_bounds() {
+        let mut cie = make_test_cie();
+        cie.version = 1;
+
+        let end_of_cie = Label::new();
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf64,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_beef,
+            address_range: 999,
+            augmentation: None,
+            instructions: EndianSlice::new(&[], LittleEndian),
+        };
+
+        let kind = eh_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .cie(kind, None, &mut cie)
+            .mark(&end_of_cie)
+            .fde(kind, 99_999_999_999_999, &mut fde);
+
+        section.start().set_const(0);
+        let section = section.get_contents().unwrap();
+        let eh_frame = kind.section(&section);
+        let section = EndianSlice::new(&section, LittleEndian);
+
+        let result = parse_fde(
+            eh_frame,
+            &mut section.range_from(end_of_cie.value().unwrap() as usize..),
+            UnwindSection::cie_from_offset,
+        );
+        assert_eq!(result, Err(Error::OffsetOutOfBounds));
+    }
+
+    #[test]
+    fn test_augmentation_parse_not_z_augmentation() {
+        let augmentation = &mut EndianSlice::new(b"wtf", NativeEndian);
+        let bases = Default::default();
+        let address_size = 8;
+        let section = EhFrame::new(&[], NativeEndian);
+        let input = &mut EndianSlice::new(&[], NativeEndian);
+        assert_eq!(
+            Augmentation::parse(augmentation, &bases, address_size, &section, input),
+            Err(Error::UnknownAugmentation)
+        );
+    }
+
+    #[test]
+    fn test_augmentation_parse_just_signal_trampoline() {
+        let aug_str = &mut EndianSlice::new(b"S", LittleEndian);
+        let bases = Default::default();
+        let address_size = 8;
+        let section = EhFrame::new(&[], LittleEndian);
+        let input = &mut EndianSlice::new(&[], LittleEndian);
+
+        let mut augmentation = Augmentation::default();
+        augmentation.is_signal_trampoline = true;
+
+        assert_eq!(
+            Augmentation::parse(aug_str, &bases, address_size, &section, input),
+            Ok(augmentation)
+        );
+    }
+
+    #[test]
+    fn test_augmentation_parse_unknown_part_of_z_augmentation() {
+        // The 'Z' character is not defined by the z-style augmentation.
+        let bases = Default::default();
+        let address_size = 8;
+        let section = Section::with_endian(Endian::Little)
+            .uleb(4)
+            .append_repeated(4, 4)
+            .get_contents()
+            .unwrap();
+        let section = EhFrame::new(&section, LittleEndian);
+        let input = &mut section.section().clone();
+        let augmentation = &mut EndianSlice::new(b"zZ", LittleEndian);
+        assert_eq!(
+            Augmentation::parse(augmentation, &bases, address_size, &section, input),
+            Err(Error::UnknownAugmentation)
+        );
+    }
+
+    #[test]
+    #[allow(non_snake_case)]
+    fn test_augmentation_parse_L() {
+        let bases = Default::default();
+        let address_size = 8;
+        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+        let section = Section::with_endian(Endian::Little)
+            .uleb(1)
+            .D8(constants::DW_EH_PE_uleb128.0)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = EhFrame::new(&section, LittleEndian);
+        let input = &mut section.section().clone();
+        let aug_str = &mut EndianSlice::new(b"zL", LittleEndian);
+
+        let mut augmentation = Augmentation::default();
+        augmentation.lsda = Some(constants::DW_EH_PE_uleb128);
+
+        assert_eq!(
+            Augmentation::parse(aug_str, &bases, address_size, &section, input),
+            Ok(augmentation)
+        );
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    #[allow(non_snake_case)]
+    fn test_augmentation_parse_P() {
+        let bases = Default::default();
+        let address_size = 8;
+        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+        let section = Section::with_endian(Endian::Little)
+            .uleb(9)
+            .D8(constants::DW_EH_PE_udata8.0)
+            .L64(0xf00d_f00d)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = EhFrame::new(&section, LittleEndian);
+        let input = &mut section.section().clone();
+        let aug_str = &mut EndianSlice::new(b"zP", LittleEndian);
+
+        let mut augmentation = Augmentation::default();
+        augmentation.personality = Some((constants::DW_EH_PE_udata8, Pointer::Direct(0xf00d_f00d)));
+
+        assert_eq!(
+            Augmentation::parse(aug_str, &bases, address_size, &section, input),
+            Ok(augmentation)
+        );
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    #[allow(non_snake_case)]
+    fn test_augmentation_parse_R() {
+        let bases = Default::default();
+        let address_size = 8;
+        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+        let section = Section::with_endian(Endian::Little)
+            .uleb(1)
+            .D8(constants::DW_EH_PE_udata4.0)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = EhFrame::new(&section, LittleEndian);
+        let input = &mut section.section().clone();
+        let aug_str = &mut EndianSlice::new(b"zR", LittleEndian);
+
+        let mut augmentation = Augmentation::default();
+        augmentation.fde_address_encoding = Some(constants::DW_EH_PE_udata4);
+
+        assert_eq!(
+            Augmentation::parse(aug_str, &bases, address_size, &section, input),
+            Ok(augmentation)
+        );
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    #[allow(non_snake_case)]
+    fn test_augmentation_parse_S() {
+        let bases = Default::default();
+        let address_size = 8;
+        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+        let section = Section::with_endian(Endian::Little)
+            .uleb(0)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = EhFrame::new(&section, LittleEndian);
+        let input = &mut section.section().clone();
+        let aug_str = &mut EndianSlice::new(b"zS", LittleEndian);
+
+        let mut augmentation = Augmentation::default();
+        augmentation.is_signal_trampoline = true;
+
+        assert_eq!(
+            Augmentation::parse(aug_str, &bases, address_size, &section, input),
+            Ok(augmentation)
+        );
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_augmentation_parse_all() {
+        let bases = Default::default();
+        let address_size = 8;
+        let rest = [9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+        let section = Section::with_endian(Endian::Little)
+            .uleb(1 + 9 + 1)
+            // L
+            .D8(constants::DW_EH_PE_uleb128.0)
+            // P
+            .D8(constants::DW_EH_PE_udata8.0)
+            .L64(0x1bad_f00d)
+            // R
+            .D8(constants::DW_EH_PE_uleb128.0)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = EhFrame::new(&section, LittleEndian);
+        let input = &mut section.section().clone();
+        let aug_str = &mut EndianSlice::new(b"zLPRS", LittleEndian);
+
+        let augmentation = Augmentation {
+            lsda: Some(constants::DW_EH_PE_uleb128),
+            personality: Some((constants::DW_EH_PE_udata8, Pointer::Direct(0x1bad_f00d))),
+            fde_address_encoding: Some(constants::DW_EH_PE_uleb128),
+            is_signal_trampoline: true,
+        };
+
+        assert_eq!(
+            Augmentation::parse(aug_str, &bases, address_size, &section, input),
+            Ok(augmentation)
+        );
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_eh_frame_fde_no_augmentation() {
+        let instrs = [1, 2, 3, 4];
+        let cie_offset = 1;
+
+        let mut cie = make_test_cie();
+        cie.format = Format::Dwarf32;
+        cie.version = 1;
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_face,
+            address_range: 9000,
+            augmentation: None,
+            instructions: EndianSlice::new(&instrs, LittleEndian),
+        };
+
+        let rest = [1, 2, 3, 4];
+
+        let kind = eh_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .fde(kind, cie_offset, &mut fde)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = kind.section(&section);
+        let input = &mut section.section().clone();
+
+        let result = parse_fde(section, input, |_, _, _| Ok(cie.clone()));
+        assert_eq!(result, Ok(fde));
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_eh_frame_fde_empty_augmentation() {
+        let instrs = [1, 2, 3, 4];
+        let cie_offset = 1;
+
+        let mut cie = make_test_cie();
+        cie.format = Format::Dwarf32;
+        cie.version = 1;
+        cie.augmentation = Some(Augmentation::default());
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_face,
+            address_range: 9000,
+            augmentation: Some(AugmentationData::default()),
+            instructions: EndianSlice::new(&instrs, LittleEndian),
+        };
+
+        let rest = [1, 2, 3, 4];
+
+        let kind = eh_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .fde(kind, cie_offset, &mut fde)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = kind.section(&section);
+        let input = &mut section.section().clone();
+
+        let result = parse_fde(section, input, |_, _, _| Ok(cie.clone()));
+        assert_eq!(result, Ok(fde));
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_eh_frame_fde_lsda_augmentation() {
+        let instrs = [1, 2, 3, 4];
+        let cie_offset = 1;
+
+        let mut cie = make_test_cie();
+        cie.format = Format::Dwarf32;
+        cie.version = 1;
+        cie.augmentation = Some(Augmentation::default());
+        cie.augmentation.as_mut().unwrap().lsda = Some(constants::DW_EH_PE_absptr);
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_face,
+            address_range: 9000,
+            augmentation: Some(AugmentationData {
+                lsda: Some(Pointer::Direct(0x1122_3344)),
+            }),
+            instructions: EndianSlice::new(&instrs, LittleEndian),
+        };
+
+        let rest = [1, 2, 3, 4];
+
+        let kind = eh_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .fde(kind, cie_offset, &mut fde)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = kind.section(&section);
+        let input = &mut section.section().clone();
+
+        let result = parse_fde(section, input, |_, _, _| Ok(cie.clone()));
+        assert_eq!(result, Ok(fde));
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_eh_frame_fde_lsda_function_relative() {
+        let instrs = [1, 2, 3, 4];
+        let cie_offset = 1;
+
+        let mut cie = make_test_cie();
+        cie.format = Format::Dwarf32;
+        cie.version = 1;
+        cie.augmentation = Some(Augmentation::default());
+        cie.augmentation.as_mut().unwrap().lsda = Some(constants::DwEhPe(
+            constants::DW_EH_PE_funcrel.0 | constants::DW_EH_PE_absptr.0,
+        ));
+
+        let mut fde = FrameDescriptionEntry {
+            offset: 0,
+            length: 0,
+            format: Format::Dwarf32,
+            cie: cie.clone(),
+            initial_segment: 0,
+            initial_address: 0xfeed_face,
+            address_range: 9000,
+            augmentation: Some(AugmentationData {
+                lsda: Some(Pointer::Direct(0xbeef)),
+            }),
+            instructions: EndianSlice::new(&instrs, LittleEndian),
+        };
+
+        let rest = [1, 2, 3, 4];
+
+        let kind = eh_frame_le();
+        let section = Section::with_endian(kind.endian())
+            .append_repeated(10, 10)
+            .fde(kind, cie_offset, &mut fde)
+            .append_bytes(&rest)
+            .get_contents()
+            .unwrap();
+        let section = kind.section(&section);
+        let input = &mut section.section().range_from(10..);
+
+        // Adjust the FDE's augmentation to be relative to the function.
+        fde.augmentation.as_mut().unwrap().lsda = Some(Pointer::Direct(0xfeed_face + 0xbeef));
+
+        let result = parse_fde(section, input, |_, _, _| Ok(cie.clone()));
+        assert_eq!(result, Ok(fde));
+        assert_eq!(*input, EndianSlice::new(&rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_eh_frame_cie_personality_function_relative_bad_context() {
+        let instrs = [1, 2, 3, 4];
+
+        let length = Label::new();
+        let start = Label::new();
+        let end = Label::new();
+
+        let aug_len = Label::new();
+        let aug_start = Label::new();
+        let aug_end = Label::new();
+
+        let section = Section::with_endian(Endian::Little)
+            // Length
+            .L32(&length)
+            .mark(&start)
+            // CIE ID
+            .L32(0)
+            // Version
+            .D8(1)
+            // Augmentation
+            .append_bytes(b"zP\0")
+            // Code alignment factor
+            .uleb(1)
+            // Data alignment factor
+            .sleb(1)
+            // Return address register
+            .uleb(1)
+            // Augmentation data length. This is a uleb, be we rely on the value
+            // being less than 2^7 and therefore a valid uleb (can't use Label
+            // with uleb).
+            .D8(&aug_len)
+            .mark(&aug_start)
+            // Augmentation data. Personality encoding and then encoded pointer.
+            .D8(constants::DW_EH_PE_funcrel.0 | constants::DW_EH_PE_uleb128.0)
+            .uleb(1)
+            .mark(&aug_end)
+            // Initial instructions
+            .append_bytes(&instrs)
+            .mark(&end);
+
+        length.set_const((&end - &start) as u64);
+        aug_len.set_const((&aug_end - &aug_start) as u64);
+
+        let section = section.get_contents().unwrap();
+        let section = EhFrame::new(&section, LittleEndian);
+
+        let bases = BaseAddresses::default();
+        let mut iter = section.entries(&bases);
+        assert_eq!(iter.next(), Err(Error::FuncRelativePointerInBadContext));
+    }
+
+    #[test]
+    fn register_rule_map_eq() {
+        // Different order, but still equal.
+        let map1: RegisterRuleMap<EndianSlice<LittleEndian>> = [
+            (Register(0), RegisterRule::SameValue),
+            (Register(3), RegisterRule::Offset(1)),
+        ]
+        .iter()
+        .collect();
+        let map2: RegisterRuleMap<EndianSlice<LittleEndian>> = [
+            (Register(3), RegisterRule::Offset(1)),
+            (Register(0), RegisterRule::SameValue),
+        ]
+        .iter()
+        .collect();
+        assert_eq!(map1, map2);
+        assert_eq!(map2, map1);
+
+        // Not equal.
+        let map3: RegisterRuleMap<EndianSlice<LittleEndian>> = [
+            (Register(0), RegisterRule::SameValue),
+            (Register(2), RegisterRule::Offset(1)),
+        ]
+        .iter()
+        .collect();
+        let map4: RegisterRuleMap<EndianSlice<LittleEndian>> = [
+            (Register(3), RegisterRule::Offset(1)),
+            (Register(0), RegisterRule::SameValue),
+        ]
+        .iter()
+        .collect();
+        assert!(map3 != map4);
+        assert!(map4 != map3);
+
+        // One has undefined explicitly set, other implicitly has undefined.
+        let mut map5 = RegisterRuleMap::<EndianSlice<LittleEndian>>::default();
+        map5.set(Register(0), RegisterRule::SameValue).unwrap();
+        map5.set(Register(0), RegisterRule::Undefined).unwrap();
+        let map6 = RegisterRuleMap::<EndianSlice<LittleEndian>>::default();
+        assert_eq!(map5, map6);
+        assert_eq!(map6, map5);
+    }
+
+    #[test]
+    fn iter_register_rules() {
+        let mut row = UnwindTableRow::<EndianSlice<LittleEndian>>::default();
+        row.registers = [
+            (Register(0), RegisterRule::SameValue),
+            (Register(1), RegisterRule::Offset(1)),
+            (Register(2), RegisterRule::ValOffset(2)),
+        ]
+        .iter()
+        .collect();
+
+        let mut found0 = false;
+        let mut found1 = false;
+        let mut found2 = false;
+
+        for &(register, ref rule) in row.registers() {
+            match register.0 {
+                0 => {
+                    assert_eq!(found0, false);
+                    found0 = true;
+                    assert_eq!(*rule, RegisterRule::SameValue);
+                }
+                1 => {
+                    assert_eq!(found1, false);
+                    found1 = true;
+                    assert_eq!(*rule, RegisterRule::Offset(1));
+                }
+                2 => {
+                    assert_eq!(found2, false);
+                    found2 = true;
+                    assert_eq!(*rule, RegisterRule::ValOffset(2));
+                }
+                x => panic!("Unexpected register rule: ({}, {:?})", x, rule),
+            }
+        }
+
+        assert_eq!(found0, true);
+        assert_eq!(found1, true);
+        assert_eq!(found2, true);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn size_of_unwind_ctx() {
+        use core::mem;
+        let size = mem::size_of::<UnwindContext<EndianSlice<NativeEndian>>>();
+        let max_size = 30968;
+        if size > max_size {
+            assert_eq!(size, max_size);
+        }
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn size_of_register_rule_map() {
+        use core::mem;
+        let size = mem::size_of::<RegisterRuleMap<EndianSlice<NativeEndian>>>();
+        let max_size = 6152;
+        if size > max_size {
+            assert_eq!(size, max_size);
+        }
+    }
+
+    #[test]
+    fn test_parse_pointer_encoding_ok() {
+        use crate::endianity::NativeEndian;
+        let expected =
+            constants::DwEhPe(constants::DW_EH_PE_uleb128.0 | constants::DW_EH_PE_pcrel.0);
+        let input = [expected.0, 1, 2, 3, 4];
+        let input = &mut EndianSlice::new(&input, NativeEndian);
+        assert_eq!(parse_pointer_encoding(input), Ok(expected));
+        assert_eq!(*input, EndianSlice::new(&[1, 2, 3, 4], NativeEndian));
+    }
+
+    #[test]
+    fn test_parse_pointer_encoding_bad_encoding() {
+        use crate::endianity::NativeEndian;
+        let expected =
+            constants::DwEhPe((constants::DW_EH_PE_sdata8.0 + 1) | constants::DW_EH_PE_pcrel.0);
+        let input = [expected.0, 1, 2, 3, 4];
+        let input = &mut EndianSlice::new(&input, NativeEndian);
+        assert_eq!(
+            Err(Error::UnknownPointerEncoding),
+            parse_pointer_encoding(input)
+        );
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_absptr() {
+        let encoding = constants::DW_EH_PE_absptr;
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .L32(0xf00d_f00d)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0xf00d_f00d))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_pcrel() {
+        let encoding = constants::DW_EH_PE_pcrel;
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .append_repeated(0, 0x10)
+            .L32(0x1)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input.range_from(0x10..);
+
+        let parameters = PointerEncodingParameters {
+            bases: &BaseAddresses::default().set_eh_frame(0x100).eh_frame,
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x111))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_pcrel_undefined() {
+        let encoding = constants::DW_EH_PE_pcrel;
+
+        let input = Section::with_endian(Endian::Little).L32(0x1);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Err(Error::PcRelativePointerButSectionBaseIsUndefined)
+        );
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_textrel() {
+        let encoding = constants::DW_EH_PE_textrel;
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .L32(0x1)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &BaseAddresses::default().set_text(0x10).eh_frame,
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x11))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_textrel_undefined() {
+        let encoding = constants::DW_EH_PE_textrel;
+
+        let input = Section::with_endian(Endian::Little).L32(0x1);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Err(Error::TextRelativePointerButTextBaseIsUndefined)
+        );
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_datarel() {
+        let encoding = constants::DW_EH_PE_datarel;
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .L32(0x1)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &BaseAddresses::default().set_got(0x10).eh_frame,
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x11))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_datarel_undefined() {
+        let encoding = constants::DW_EH_PE_datarel;
+
+        let input = Section::with_endian(Endian::Little).L32(0x1);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Err(Error::DataRelativePointerButDataBaseIsUndefined)
+        );
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_funcrel() {
+        let encoding = constants::DW_EH_PE_funcrel;
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .L32(0x1)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: Some(0x10),
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x11))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_funcrel_undefined() {
+        let encoding = constants::DW_EH_PE_funcrel;
+
+        let input = Section::with_endian(Endian::Little).L32(0x1);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Err(Error::FuncRelativePointerInBadContext)
+        );
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_uleb128() {
+        let encoding =
+            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_uleb128.0);
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .uleb(0x12_3456)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x12_3456))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_udata2() {
+        let encoding =
+            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_udata2.0);
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .L16(0x1234)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x1234))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_udata4() {
+        let encoding =
+            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_udata4.0);
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .L32(0x1234_5678)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x1234_5678))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_udata8() {
+        let encoding =
+            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_udata8.0);
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .L64(0x1234_5678_1234_5678)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x1234_5678_1234_5678))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_sleb128() {
+        let encoding =
+            constants::DwEhPe(constants::DW_EH_PE_textrel.0 | constants::DW_EH_PE_sleb128.0);
+        let expected_rest = [1, 2, 3, 4];
+
+        let input = Section::with_endian(Endian::Little)
+            .sleb(-0x1111)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &BaseAddresses::default().set_text(0x1111_1111).eh_frame,
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(0x1111_0000))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_sdata2() {
+        let encoding =
+            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_sdata2.0);
+        let expected_rest = [1, 2, 3, 4];
+        let expected = 0x111 as i16;
+
+        let input = Section::with_endian(Endian::Little)
+            .L16(expected as u16)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(expected as u64))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_sdata4() {
+        let encoding =
+            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_sdata4.0);
+        let expected_rest = [1, 2, 3, 4];
+        let expected = 0x111_1111 as i32;
+
+        let input = Section::with_endian(Endian::Little)
+            .L32(expected as u32)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(expected as u64))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_sdata8() {
+        let encoding =
+            constants::DwEhPe(constants::DW_EH_PE_absptr.0 | constants::DW_EH_PE_sdata8.0);
+        let expected_rest = [1, 2, 3, 4];
+        let expected = -0x11_1111_1222_2222 as i64;
+
+        let input = Section::with_endian(Endian::Little)
+            .L64(expected as u64)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Direct(expected as u64))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_omit() {
+        let encoding = constants::DW_EH_PE_omit;
+
+        let input = Section::with_endian(Endian::Little).L32(0x1);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Err(Error::CannotParseOmitPointerEncoding)
+        );
+        assert_eq!(rest, input);
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_bad_encoding() {
+        let encoding = constants::DwEhPe(constants::DW_EH_PE_sdata8.0 + 1);
+
+        let input = Section::with_endian(Endian::Little).L32(0x1);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Err(Error::UnknownPointerEncoding)
+        );
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_aligned() {
+        // FIXME: support this encoding!
+
+        let encoding = constants::DW_EH_PE_aligned;
+
+        let input = Section::with_endian(Endian::Little).L32(0x1);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Err(Error::UnsupportedPointerEncoding)
+        );
+    }
+
+    #[test]
+    fn test_parse_encoded_pointer_indirect() {
+        let expected_rest = [1, 2, 3, 4];
+        let encoding = constants::DW_EH_PE_indirect;
+
+        let input = Section::with_endian(Endian::Little)
+            .L32(0x1234_5678)
+            .append_bytes(&expected_rest);
+        let input = input.get_contents().unwrap();
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut rest = input;
+
+        let parameters = PointerEncodingParameters {
+            bases: &SectionBaseAddresses::default(),
+            func_base: None,
+            address_size: 4,
+            section: &input,
+        };
+        assert_eq!(
+            parse_encoded_pointer(encoding, &parameters, &mut rest),
+            Ok(Pointer::Indirect(0x1234_5678))
+        );
+        assert_eq!(rest, EndianSlice::new(&expected_rest, LittleEndian));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/dwarf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/dwarf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/dwarf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/dwarf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,861 @@
+use alloc::string::String;
+use alloc::sync::Arc;
+
+use crate::common::{
+    DebugAddrBase, DebugAddrIndex, DebugInfoOffset, DebugLineStrOffset, DebugLocListsBase,
+    DebugLocListsIndex, DebugRngListsBase, DebugRngListsIndex, DebugStrOffset, DebugStrOffsetsBase,
+    DebugStrOffsetsIndex, DebugTypesOffset, DwarfFileType, Encoding, LocationListsOffset,
+    RangeListsOffset, SectionId, UnitSectionOffset,
+};
+use crate::constants;
+use crate::read::{
+    Abbreviations, AttributeValue, DebugAbbrev, DebugAddr, DebugAranges, DebugInfo,
+    DebugInfoUnitHeadersIter, DebugLine, DebugLineStr, DebugStr, DebugStrOffsets, DebugTypes,
+    DebugTypesUnitHeadersIter, DebuggingInformationEntry, EntriesCursor, EntriesRaw, EntriesTree,
+    Error, IncompleteLineProgram, LocListIter, LocationLists, Range, RangeLists, Reader,
+    ReaderOffset, ReaderOffsetId, Result, RngListIter, Section, UnitHeader, UnitOffset,
+};
+
+/// All of the commonly used DWARF sections, and other common information.
+#[derive(Debug, Default)]
+pub struct Dwarf<R> {
+    /// The `.debug_abbrev` section.
+    pub debug_abbrev: DebugAbbrev<R>,
+
+    /// The `.debug_addr` section.
+    pub debug_addr: DebugAddr<R>,
+
+    /// The `.debug_aranges` section.
+    pub debug_aranges: DebugAranges<R>,
+
+    /// The `.debug_info` section.
+    pub debug_info: DebugInfo<R>,
+
+    /// The `.debug_line` section.
+    pub debug_line: DebugLine<R>,
+
+    /// The `.debug_line_str` section.
+    pub debug_line_str: DebugLineStr<R>,
+
+    /// The `.debug_str` section.
+    pub debug_str: DebugStr<R>,
+
+    /// The `.debug_str_offsets` section.
+    pub debug_str_offsets: DebugStrOffsets<R>,
+
+    /// The `.debug_types` section.
+    pub debug_types: DebugTypes<R>,
+
+    /// The location lists in the `.debug_loc` and `.debug_loclists` sections.
+    pub locations: LocationLists<R>,
+
+    /// The range lists in the `.debug_ranges` and `.debug_rnglists` sections.
+    pub ranges: RangeLists<R>,
+
+    /// The type of this file.
+    pub file_type: DwarfFileType,
+
+    /// The DWARF sections for a supplementary object file.
+    pub sup: Option<Arc<Dwarf<R>>>,
+}
+
+impl<T> Dwarf<T> {
+    /// Try to load the DWARF sections using the given loader function.
+    ///
+    /// `section` loads a DWARF section from the object file.
+    /// It should return an empty section if the section does not exist.
+    ///
+    /// `section` may either directly return a `Reader` instance (such as
+    /// `EndianSlice`), or it may return some other type and then convert
+    /// that type into a `Reader` using `Dwarf::borrow`.
+    ///
+    /// After loading, the user should set the `file_type` field and
+    /// call `load_sup` if required.
+    pub fn load<F, E>(mut section: F) -> core::result::Result<Self, E>
+    where
+        F: FnMut(SectionId) -> core::result::Result<T, E>,
+    {
+        // Section types are inferred.
+        let debug_loc = Section::load(&mut section)?;
+        let debug_loclists = Section::load(&mut section)?;
+        let debug_ranges = Section::load(&mut section)?;
+        let debug_rnglists = Section::load(&mut section)?;
+        Ok(Dwarf {
+            debug_abbrev: Section::load(&mut section)?,
+            debug_addr: Section::load(&mut section)?,
+            debug_aranges: Section::load(&mut section)?,
+            debug_info: Section::load(&mut section)?,
+            debug_line: Section::load(&mut section)?,
+            debug_line_str: Section::load(&mut section)?,
+            debug_str: Section::load(&mut section)?,
+            debug_str_offsets: Section::load(&mut section)?,
+            debug_types: Section::load(&mut section)?,
+            locations: LocationLists::new(debug_loc, debug_loclists),
+            ranges: RangeLists::new(debug_ranges, debug_rnglists),
+            file_type: DwarfFileType::Main,
+            sup: None,
+        })
+    }
+
+    /// Load the DWARF sections from the supplementary object file.
+    ///
+    /// `section` operates the same as for `load`.
+    ///
+    /// Sets `self.sup`, replacing any previous value.
+    pub fn load_sup<F, E>(&mut self, section: F) -> core::result::Result<(), E>
+    where
+        F: FnMut(SectionId) -> core::result::Result<T, E>,
+    {
+        self.sup = Some(Arc::new(Self::load(section)?));
+        Ok(())
+    }
+
+    /// Create a `Dwarf` structure that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// It can be useful to load DWARF sections into owned data structures,
+    /// such as `Vec`. However, we do not implement the `Reader` trait
+    /// for `Vec`, because it would be very inefficient, but this trait
+    /// is required for all of the methods that parse the DWARF data.
+    /// So we first load the DWARF sections into `Vec`s, and then use
+    /// `borrow` to create `Reader`s that reference the data.
+    ///
+    /// ```rust,no_run
+    /// # fn example() -> Result<(), gimli::Error> {
+    /// # let loader = |name| -> Result<_, gimli::Error> { unimplemented!() };
+    /// # let sup_loader = |name| -> Result<_, gimli::Error> { unimplemented!() };
+    /// // Read the DWARF sections into `Vec`s with whatever object loader you're using.
+    /// let mut owned_dwarf: gimli::Dwarf<Vec<u8>> = gimli::Dwarf::load(loader)?;
+    /// owned_dwarf.load_sup(sup_loader)?;
+    /// // Create references to the DWARF sections.
+    /// let dwarf = owned_dwarf.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// # unreachable!()
+    /// # }
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> Dwarf<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        Dwarf {
+            debug_abbrev: self.debug_abbrev.borrow(&mut borrow),
+            debug_addr: self.debug_addr.borrow(&mut borrow),
+            debug_aranges: self.debug_aranges.borrow(&mut borrow),
+            debug_info: self.debug_info.borrow(&mut borrow),
+            debug_line: self.debug_line.borrow(&mut borrow),
+            debug_line_str: self.debug_line_str.borrow(&mut borrow),
+            debug_str: self.debug_str.borrow(&mut borrow),
+            debug_str_offsets: self.debug_str_offsets.borrow(&mut borrow),
+            debug_types: self.debug_types.borrow(&mut borrow),
+            locations: self.locations.borrow(&mut borrow),
+            ranges: self.ranges.borrow(&mut borrow),
+            file_type: self.file_type,
+            sup: self.sup().map(|sup| Arc::new(sup.borrow(borrow))),
+        }
+    }
+
+    /// Return a reference to the DWARF sections for supplementary object file.
+    pub fn sup(&self) -> Option<&Dwarf<T>> {
+        self.sup.as_ref().map(Arc::as_ref)
+    }
+}
+
+impl<R: Reader> Dwarf<R> {
+    /// Iterate the unit headers in the `.debug_info` section.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    #[inline]
+    pub fn units(&self) -> DebugInfoUnitHeadersIter<R> {
+        self.debug_info.units()
+    }
+
+    /// Construct a new `Unit` from the given unit header.
+    #[inline]
+    pub fn unit(&self, header: UnitHeader<R>) -> Result<Unit<R>> {
+        Unit::new(self, header)
+    }
+
+    /// Iterate the type-unit headers in the `.debug_types` section.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    #[inline]
+    pub fn type_units(&self) -> DebugTypesUnitHeadersIter<R> {
+        self.debug_types.units()
+    }
+
+    /// Parse the abbreviations for a compilation unit.
+    // TODO: provide caching of abbreviations
+    #[inline]
+    pub fn abbreviations(&self, unit: &UnitHeader<R>) -> Result<Abbreviations> {
+        unit.abbreviations(&self.debug_abbrev)
+    }
+
+    /// Return the string offset at the given index.
+    #[inline]
+    pub fn string_offset(
+        &self,
+        unit: &Unit<R>,
+        index: DebugStrOffsetsIndex<R::Offset>,
+    ) -> Result<DebugStrOffset<R::Offset>> {
+        self.debug_str_offsets
+            .get_str_offset(unit.header.format(), unit.str_offsets_base, index)
+    }
+
+    /// Return the string at the given offset in `.debug_str`.
+    #[inline]
+    pub fn string(&self, offset: DebugStrOffset<R::Offset>) -> Result<R> {
+        self.debug_str.get_str(offset)
+    }
+
+    /// Return the string at the given offset in `.debug_line_str`.
+    #[inline]
+    pub fn line_string(&self, offset: DebugLineStrOffset<R::Offset>) -> Result<R> {
+        self.debug_line_str.get_str(offset)
+    }
+
+    /// Return an attribute value as a string slice.
+    ///
+    /// If the attribute value is one of:
+    ///
+    /// - an inline `DW_FORM_string` string
+    /// - a `DW_FORM_strp` reference to an offset into the `.debug_str` section
+    /// - a `DW_FORM_strp_sup` reference to an offset into a supplementary
+    /// object file
+    /// - a `DW_FORM_line_strp` reference to an offset into the `.debug_line_str`
+    /// section
+    /// - a `DW_FORM_strx` index into the `.debug_str_offsets` entries for the unit
+    ///
+    /// then return the attribute's string value. Returns an error if the attribute
+    /// value does not have a string form, or if a string form has an invalid value.
+    pub fn attr_string(&self, unit: &Unit<R>, attr: AttributeValue<R>) -> Result<R> {
+        match attr {
+            AttributeValue::String(string) => Ok(string),
+            AttributeValue::DebugStrRef(offset) => self.debug_str.get_str(offset),
+            AttributeValue::DebugStrRefSup(offset) => {
+                if let Some(sup) = self.sup() {
+                    sup.debug_str.get_str(offset)
+                } else {
+                    Err(Error::ExpectedStringAttributeValue)
+                }
+            }
+            AttributeValue::DebugLineStrRef(offset) => self.debug_line_str.get_str(offset),
+            AttributeValue::DebugStrOffsetsIndex(index) => {
+                let offset = self.debug_str_offsets.get_str_offset(
+                    unit.header.format(),
+                    unit.str_offsets_base,
+                    index,
+                )?;
+                self.debug_str.get_str(offset)
+            }
+            _ => Err(Error::ExpectedStringAttributeValue),
+        }
+    }
+
+    /// Return the address at the given index.
+    pub fn address(&self, unit: &Unit<R>, index: DebugAddrIndex<R::Offset>) -> Result<u64> {
+        self.debug_addr
+            .get_address(unit.encoding().address_size, unit.addr_base, index)
+    }
+
+    /// Try to return an attribute value as an address.
+    ///
+    /// If the attribute value is one of:
+    ///
+    /// - a `DW_FORM_addr`
+    /// - a `DW_FORM_addrx` index into the `.debug_addr` entries for the unit
+    ///
+    /// then return the address.
+    /// Returns `None` for other forms.
+    pub fn attr_address(&self, unit: &Unit<R>, attr: AttributeValue<R>) -> Result<Option<u64>> {
+        match attr {
+            AttributeValue::Addr(addr) => Ok(Some(addr)),
+            AttributeValue::DebugAddrIndex(index) => self.address(unit, index).map(Some),
+            _ => Ok(None),
+        }
+    }
+
+    /// Return the range list offset at the given index.
+    pub fn ranges_offset(
+        &self,
+        unit: &Unit<R>,
+        index: DebugRngListsIndex<R::Offset>,
+    ) -> Result<RangeListsOffset<R::Offset>> {
+        self.ranges
+            .get_offset(unit.encoding(), unit.rnglists_base, index)
+    }
+
+    /// Iterate over the `RangeListEntry`s starting at the given offset.
+    pub fn ranges(
+        &self,
+        unit: &Unit<R>,
+        offset: RangeListsOffset<R::Offset>,
+    ) -> Result<RngListIter<R>> {
+        self.ranges.ranges(
+            offset,
+            unit.encoding(),
+            unit.low_pc,
+            &self.debug_addr,
+            unit.addr_base,
+        )
+    }
+
+    /// Try to return an attribute value as a range list offset.
+    ///
+    /// If the attribute value is one of:
+    ///
+    /// - a `DW_FORM_sec_offset` reference to the `.debug_ranges` or `.debug_rnglists` sections
+    /// - a `DW_FORM_rnglistx` index into the `.debug_rnglists` entries for the unit
+    ///
+    /// then return the range list offset of the range list.
+    /// Returns `None` for other forms.
+    pub fn attr_ranges_offset(
+        &self,
+        unit: &Unit<R>,
+        attr: AttributeValue<R>,
+    ) -> Result<Option<RangeListsOffset<R::Offset>>> {
+        match attr {
+            AttributeValue::RangeListsRef(offset) => Ok(Some(offset)),
+            AttributeValue::DebugRngListsIndex(index) => self.ranges_offset(unit, index).map(Some),
+            _ => Ok(None),
+        }
+    }
+
+    /// Try to return an attribute value as a range list entry iterator.
+    ///
+    /// If the attribute value is one of:
+    ///
+    /// - a `DW_FORM_sec_offset` reference to the `.debug_ranges` or `.debug_rnglists` sections
+    /// - a `DW_FORM_rnglistx` index into the `.debug_rnglists` entries for the unit
+    ///
+    /// then return an iterator over the entries in the range list.
+    /// Returns `None` for other forms.
+    pub fn attr_ranges(
+        &self,
+        unit: &Unit<R>,
+        attr: AttributeValue<R>,
+    ) -> Result<Option<RngListIter<R>>> {
+        match self.attr_ranges_offset(unit, attr)? {
+            Some(offset) => Ok(Some(self.ranges(unit, offset)?)),
+            None => Ok(None),
+        }
+    }
+
+    /// Return an iterator for the address ranges of a `DebuggingInformationEntry`.
+    ///
+    /// This uses `DW_AT_low_pc`, `DW_AT_high_pc` and `DW_AT_ranges`.
+    pub fn die_ranges(
+        &self,
+        unit: &Unit<R>,
+        entry: &DebuggingInformationEntry<R>,
+    ) -> Result<RangeIter<R>> {
+        let mut low_pc = None;
+        let mut high_pc = None;
+        let mut size = None;
+        let mut attrs = entry.attrs();
+        while let Some(attr) = attrs.next()? {
+            match attr.name() {
+                constants::DW_AT_low_pc => {
+                    low_pc = Some(
+                        self.attr_address(unit, attr.value())?
+                            .ok_or(Error::UnsupportedAttributeForm)?,
+                    );
+                }
+                constants::DW_AT_high_pc => match attr.value() {
+                    AttributeValue::Udata(val) => size = Some(val),
+                    attr => {
+                        high_pc = Some(
+                            self.attr_address(unit, attr)?
+                                .ok_or(Error::UnsupportedAttributeForm)?,
+                        );
+                    }
+                },
+                constants::DW_AT_ranges => {
+                    if let Some(list) = self.attr_ranges(unit, attr.value())? {
+                        return Ok(RangeIter(RangeIterInner::List(list)));
+                    }
+                }
+                _ => {}
+            }
+        }
+        let range = low_pc.and_then(|begin| {
+            let end = size.map(|size| begin + size).or(high_pc);
+            // TODO: perhaps return an error if `end` is `None`
+            end.map(|end| Range { begin, end })
+        });
+        Ok(RangeIter(RangeIterInner::Single(range)))
+    }
+
+    /// Return an iterator for the address ranges of a `Unit`.
+    ///
+    /// This uses `DW_AT_low_pc`, `DW_AT_high_pc` and `DW_AT_ranges` of the
+    /// root `DebuggingInformationEntry`.
+    pub fn unit_ranges(&self, unit: &Unit<R>) -> Result<RangeIter<R>> {
+        let mut cursor = unit.header.entries(&unit.abbreviations);
+        cursor.next_dfs()?;
+        let root = cursor.current().ok_or(Error::MissingUnitDie)?;
+        self.die_ranges(unit, root)
+    }
+
+    /// Return the location list offset at the given index.
+    pub fn locations_offset(
+        &self,
+        unit: &Unit<R>,
+        index: DebugLocListsIndex<R::Offset>,
+    ) -> Result<LocationListsOffset<R::Offset>> {
+        self.locations
+            .get_offset(unit.encoding(), unit.loclists_base, index)
+    }
+
+    /// Iterate over the `LocationListEntry`s starting at the given offset.
+    pub fn locations(
+        &self,
+        unit: &Unit<R>,
+        offset: LocationListsOffset<R::Offset>,
+    ) -> Result<LocListIter<R>> {
+        match self.file_type {
+            DwarfFileType::Main => self.locations.locations(
+                offset,
+                unit.encoding(),
+                unit.low_pc,
+                &self.debug_addr,
+                unit.addr_base,
+            ),
+            DwarfFileType::Dwo => self.locations.locations_dwo(
+                offset,
+                unit.encoding(),
+                unit.low_pc,
+                &self.debug_addr,
+                unit.addr_base,
+            ),
+        }
+    }
+
+    /// Try to return an attribute value as a location list offset.
+    ///
+    /// If the attribute value is one of:
+    ///
+    /// - a `DW_FORM_sec_offset` reference to the `.debug_loc` or `.debug_loclists` sections
+    /// - a `DW_FORM_loclistx` index into the `.debug_loclists` entries for the unit
+    ///
+    /// then return the location list offset of the location list.
+    /// Returns `None` for other forms.
+    pub fn attr_locations_offset(
+        &self,
+        unit: &Unit<R>,
+        attr: AttributeValue<R>,
+    ) -> Result<Option<LocationListsOffset<R::Offset>>> {
+        match attr {
+            AttributeValue::LocationListsRef(offset) => Ok(Some(offset)),
+            AttributeValue::DebugLocListsIndex(index) => {
+                self.locations_offset(unit, index).map(Some)
+            }
+            _ => Ok(None),
+        }
+    }
+
+    /// Try to return an attribute value as a location list entry iterator.
+    ///
+    /// If the attribute value is one of:
+    ///
+    /// - a `DW_FORM_sec_offset` reference to the `.debug_loc` or `.debug_loclists` sections
+    /// - a `DW_FORM_loclistx` index into the `.debug_loclists` entries for the unit
+    ///
+    /// then return an iterator over the entries in the location list.
+    /// Returns `None` for other forms.
+    pub fn attr_locations(
+        &self,
+        unit: &Unit<R>,
+        attr: AttributeValue<R>,
+    ) -> Result<Option<LocListIter<R>>> {
+        match self.attr_locations_offset(unit, attr)? {
+            Some(offset) => Ok(Some(self.locations(unit, offset)?)),
+            None => Ok(None),
+        }
+    }
+
+    /// Call `Reader::lookup_offset_id` for each section, and return the first match.
+    ///
+    /// The first element of the tuple is `true` for supplementary sections.
+    pub fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(bool, SectionId, R::Offset)> {
+        None.or_else(|| self.debug_abbrev.lookup_offset_id(id))
+            .or_else(|| self.debug_addr.lookup_offset_id(id))
+            .or_else(|| self.debug_aranges.lookup_offset_id(id))
+            .or_else(|| self.debug_info.lookup_offset_id(id))
+            .or_else(|| self.debug_line.lookup_offset_id(id))
+            .or_else(|| self.debug_line_str.lookup_offset_id(id))
+            .or_else(|| self.debug_str.lookup_offset_id(id))
+            .or_else(|| self.debug_str_offsets.lookup_offset_id(id))
+            .or_else(|| self.debug_types.lookup_offset_id(id))
+            .or_else(|| self.locations.lookup_offset_id(id))
+            .or_else(|| self.ranges.lookup_offset_id(id))
+            .map(|(id, offset)| (false, id, offset))
+            .or_else(|| {
+                self.sup()
+                    .and_then(|sup| sup.lookup_offset_id(id))
+                    .map(|(_, id, offset)| (true, id, offset))
+            })
+    }
+
+    /// Returns a string representation of the given error.
+    ///
+    /// This uses information from the DWARF sections to provide more information in some cases.
+    pub fn format_error(&self, err: Error) -> String {
+        #[allow(clippy::single_match)]
+        match err {
+            Error::UnexpectedEof(id) => match self.lookup_offset_id(id) {
+                Some((sup, section, offset)) => {
+                    return format!(
+                        "{} at {}{}+0x{:x}",
+                        err,
+                        section.name(),
+                        if sup { "(sup)" } else { "" },
+                        offset.into_u64(),
+                    );
+                }
+                None => {}
+            },
+            _ => {}
+        }
+        err.description().into()
+    }
+}
+
+/// All of the commonly used information for a unit in the `.debug_info` or `.debug_types`
+/// sections.
+#[derive(Debug)]
+pub struct Unit<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// The header of the unit.
+    pub header: UnitHeader<R, Offset>,
+
+    /// The parsed abbreviations for the unit.
+    pub abbreviations: Abbreviations,
+
+    /// The `DW_AT_name` attribute of the unit.
+    pub name: Option<R>,
+
+    /// The `DW_AT_comp_dir` attribute of the unit.
+    pub comp_dir: Option<R>,
+
+    /// The `DW_AT_low_pc` attribute of the unit. Defaults to 0.
+    pub low_pc: u64,
+
+    /// The `DW_AT_str_offsets_base` attribute of the unit. Defaults to 0.
+    pub str_offsets_base: DebugStrOffsetsBase<Offset>,
+
+    /// The `DW_AT_addr_base` attribute of the unit. Defaults to 0.
+    pub addr_base: DebugAddrBase<Offset>,
+
+    /// The `DW_AT_loclists_base` attribute of the unit. Defaults to 0.
+    pub loclists_base: DebugLocListsBase<Offset>,
+
+    /// The `DW_AT_rnglists_base` attribute of the unit. Defaults to 0.
+    pub rnglists_base: DebugRngListsBase<Offset>,
+
+    /// The line number program of the unit.
+    pub line_program: Option<IncompleteLineProgram<R, Offset>>,
+}
+
+impl<R: Reader> Unit<R> {
+    /// Construct a new `Unit` from the given unit header.
+    #[inline]
+    pub fn new(dwarf: &Dwarf<R>, header: UnitHeader<R>) -> Result<Self> {
+        let abbreviations = header.abbreviations(&dwarf.debug_abbrev)?;
+        let mut unit = Unit {
+            abbreviations,
+            name: None,
+            comp_dir: None,
+            low_pc: 0,
+            str_offsets_base: DebugStrOffsetsBase::default_for_encoding_and_file(
+                header.encoding(),
+                dwarf.file_type,
+            ),
+            // NB: Because the .debug_addr section never lives in a .dwo, we can assume its base is always 0 or provided.
+            addr_base: DebugAddrBase(R::Offset::from_u8(0)),
+            loclists_base: DebugLocListsBase::default_for_encoding_and_file(
+                header.encoding(),
+                dwarf.file_type,
+            ),
+            rnglists_base: DebugRngListsBase::default_for_encoding_and_file(
+                header.encoding(),
+                dwarf.file_type,
+            ),
+            line_program: None,
+            header,
+        };
+        let mut name = None;
+        let mut comp_dir = None;
+        let mut line_program_offset = None;
+        let mut low_pc_attr = None;
+
+        {
+            let mut cursor = unit.header.entries(&unit.abbreviations);
+            cursor.next_dfs()?;
+            let root = cursor.current().ok_or(Error::MissingUnitDie)?;
+            let mut attrs = root.attrs();
+            while let Some(attr) = attrs.next()? {
+                match attr.name() {
+                    constants::DW_AT_name => {
+                        name = Some(attr.value());
+                    }
+                    constants::DW_AT_comp_dir => {
+                        comp_dir = Some(attr.value());
+                    }
+                    constants::DW_AT_low_pc => {
+                        low_pc_attr = Some(attr.value());
+                    }
+                    constants::DW_AT_stmt_list => {
+                        if let AttributeValue::DebugLineRef(offset) = attr.value() {
+                            line_program_offset = Some(offset);
+                        }
+                    }
+                    constants::DW_AT_str_offsets_base => {
+                        if let AttributeValue::DebugStrOffsetsBase(base) = attr.value() {
+                            unit.str_offsets_base = base;
+                        }
+                    }
+                    constants::DW_AT_addr_base | constants::DW_AT_GNU_addr_base => {
+                        if let AttributeValue::DebugAddrBase(base) = attr.value() {
+                            unit.addr_base = base;
+                        }
+                    }
+                    constants::DW_AT_loclists_base => {
+                        if let AttributeValue::DebugLocListsBase(base) = attr.value() {
+                            unit.loclists_base = base;
+                        }
+                    }
+                    constants::DW_AT_rnglists_base | constants::DW_AT_GNU_ranges_base => {
+                        if let AttributeValue::DebugRngListsBase(base) = attr.value() {
+                            unit.rnglists_base = base;
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+
+        unit.name = match name {
+            Some(val) => dwarf.attr_string(&unit, val).ok(),
+            None => None,
+        };
+        unit.comp_dir = match comp_dir {
+            Some(val) => dwarf.attr_string(&unit, val).ok(),
+            None => None,
+        };
+        unit.line_program = match line_program_offset {
+            Some(offset) => Some(dwarf.debug_line.program(
+                offset,
+                unit.header.address_size(),
+                unit.comp_dir.clone(),
+                unit.name.clone(),
+            )?),
+            None => None,
+        };
+        if let Some(low_pc_attr) = low_pc_attr {
+            if let Some(addr) = dwarf.attr_address(&unit, low_pc_attr)? {
+                unit.low_pc = addr;
+            }
+        }
+        Ok(unit)
+    }
+
+    /// Return the encoding parameters for this unit.
+    #[inline]
+    pub fn encoding(&self) -> Encoding {
+        self.header.encoding()
+    }
+
+    /// Read the `DebuggingInformationEntry` at the given offset.
+    pub fn entry(&self, offset: UnitOffset<R::Offset>) -> Result<DebuggingInformationEntry<R>> {
+        self.header.entry(&self.abbreviations, offset)
+    }
+
+    /// Navigate this unit's `DebuggingInformationEntry`s.
+    #[inline]
+    pub fn entries(&self) -> EntriesCursor<R> {
+        self.header.entries(&self.abbreviations)
+    }
+
+    /// Navigate this unit's `DebuggingInformationEntry`s
+    /// starting at the given offset.
+    #[inline]
+    pub fn entries_at_offset(&self, offset: UnitOffset<R::Offset>) -> Result<EntriesCursor<R>> {
+        self.header.entries_at_offset(&self.abbreviations, offset)
+    }
+
+    /// Navigate this unit's `DebuggingInformationEntry`s as a tree
+    /// starting at the given offset.
+    #[inline]
+    pub fn entries_tree(&self, offset: Option<UnitOffset<R::Offset>>) -> Result<EntriesTree<R>> {
+        self.header.entries_tree(&self.abbreviations, offset)
+    }
+
+    /// Read the raw data that defines the Debugging Information Entries.
+    #[inline]
+    pub fn entries_raw(&self, offset: Option<UnitOffset<R::Offset>>) -> Result<EntriesRaw<R>> {
+        self.header.entries_raw(&self.abbreviations, offset)
+    }
+
+    /// Copy attributes that are subject to relocation from another unit. This is intended
+    /// to be used to copy attributes from a skeleton compilation unit to the corresponding
+    /// split compilation unit.
+    pub fn copy_relocated_attributes(&mut self, other: &Unit<R>) {
+        self.low_pc = other.low_pc;
+        self.addr_base = other.addr_base;
+        if self.header.version() < 5 {
+            self.rnglists_base = other.rnglists_base;
+        }
+    }
+}
+
+impl<T: ReaderOffset> UnitSectionOffset<T> {
+    /// Convert an offset to be relative to the start of the given unit,
+    /// instead of relative to the start of the section.
+    /// Returns `None` if the offset is not within the unit entries.
+    pub fn to_unit_offset<R>(&self, unit: &Unit<R>) -> Option<UnitOffset<T>>
+    where
+        R: Reader<Offset = T>,
+    {
+        let (offset, unit_offset) = match (self, unit.header.offset()) {
+            (
+                UnitSectionOffset::DebugInfoOffset(offset),
+                UnitSectionOffset::DebugInfoOffset(unit_offset),
+            ) => (offset.0, unit_offset.0),
+            (
+                UnitSectionOffset::DebugTypesOffset(offset),
+                UnitSectionOffset::DebugTypesOffset(unit_offset),
+            ) => (offset.0, unit_offset.0),
+            _ => return None,
+        };
+        let offset = match offset.checked_sub(unit_offset) {
+            Some(offset) => UnitOffset(offset),
+            None => return None,
+        };
+        if !unit.header.is_valid_offset(offset) {
+            return None;
+        }
+        Some(offset)
+    }
+}
+
+impl<T: ReaderOffset> UnitOffset<T> {
+    /// Convert an offset to be relative to the start of the .debug_info section,
+    /// instead of relative to the start of the given compilation unit.
+    ///
+    /// Does not check that the offset is valid.
+    pub fn to_unit_section_offset<R>(&self, unit: &Unit<R>) -> UnitSectionOffset<T>
+    where
+        R: Reader<Offset = T>,
+    {
+        match unit.header.offset() {
+            UnitSectionOffset::DebugInfoOffset(unit_offset) => {
+                DebugInfoOffset(unit_offset.0 + self.0).into()
+            }
+            UnitSectionOffset::DebugTypesOffset(unit_offset) => {
+                DebugTypesOffset(unit_offset.0 + self.0).into()
+            }
+        }
+    }
+}
+
+/// An iterator for the address ranges of a `DebuggingInformationEntry`.
+///
+/// Returned by `Dwarf::die_ranges` and `Dwarf::unit_ranges`.
+#[derive(Debug)]
+pub struct RangeIter<R: Reader>(RangeIterInner<R>);
+
+#[derive(Debug)]
+enum RangeIterInner<R: Reader> {
+    Single(Option<Range>),
+    List(RngListIter<R>),
+}
+
+impl<R: Reader> Default for RangeIter<R> {
+    fn default() -> Self {
+        RangeIter(RangeIterInner::Single(None))
+    }
+}
+
+impl<R: Reader> RangeIter<R> {
+    /// Advance the iterator to the next range.
+    pub fn next(&mut self) -> Result<Option<Range>> {
+        match self.0 {
+            RangeIterInner::Single(ref mut range) => Ok(range.take()),
+            RangeIterInner::List(ref mut list) => list.next(),
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for RangeIter<R> {
+    type Item = Range;
+    type Error = Error;
+
+    #[inline]
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        RangeIter::next(self)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::read::EndianSlice;
+    use crate::{Endianity, LittleEndian};
+
+    /// Ensure that `Dwarf<R>` is covariant wrt R.
+    #[test]
+    fn test_dwarf_variance() {
+        /// This only needs to compile.
+        fn _f<'a: 'b, 'b, E: Endianity>(x: Dwarf<EndianSlice<'a, E>>) -> Dwarf<EndianSlice<'b, E>> {
+            x
+        }
+    }
+
+    /// Ensure that `Unit<R>` is covariant wrt R.
+    #[test]
+    fn test_dwarf_unit_variance() {
+        /// This only needs to compile.
+        fn _f<'a: 'b, 'b, E: Endianity>(x: Unit<EndianSlice<'a, E>>) -> Unit<EndianSlice<'b, E>> {
+            x
+        }
+    }
+
+    #[test]
+    fn test_format_error() {
+        let mut owned_dwarf = Dwarf::load(|_| -> Result<_> { Ok(vec![1, 2]) }).unwrap();
+        owned_dwarf
+            .load_sup(|_| -> Result<_> { Ok(vec![1, 2]) })
+            .unwrap();
+        let dwarf = owned_dwarf.borrow(|section| EndianSlice::new(&section, LittleEndian));
+
+        match dwarf.debug_str.get_str(DebugStrOffset(1)) {
+            Ok(r) => panic!("Unexpected str {:?}", r),
+            Err(e) => {
+                assert_eq!(
+                    dwarf.format_error(e),
+                    "Hit the end of input before it was expected at .debug_str+0x1"
+                );
+            }
+        }
+        match dwarf.sup().unwrap().debug_str.get_str(DebugStrOffset(1)) {
+            Ok(r) => panic!("Unexpected str {:?}", r),
+            Err(e) => {
+                assert_eq!(
+                    dwarf.format_error(e),
+                    "Hit the end of input before it was expected at .debug_str(sup)+0x1"
+                );
+            }
+        }
+        assert_eq!(dwarf.format_error(Error::Io), Error::Io.description());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/endian_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/endian_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/endian_reader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/endian_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,639 @@
+//! Defining custom `Reader`s quickly.
+
+use alloc::borrow::Cow;
+use alloc::rc::Rc;
+use alloc::string::String;
+use alloc::sync::Arc;
+use core::fmt::Debug;
+use core::ops::{Deref, Index, Range, RangeFrom, RangeTo};
+use core::slice;
+use core::str;
+use stable_deref_trait::CloneStableDeref;
+
+use crate::endianity::Endianity;
+use crate::read::{Error, Reader, ReaderOffsetId, Result};
+
+/// A reference counted, non-thread-safe slice of bytes and associated
+/// endianity.
+///
+/// ```
+/// # #[cfg(feature = "std")] {
+/// use std::rc::Rc;
+///
+/// let buf = Rc::from(&[1, 2, 3, 4][..]);
+/// let reader = gimli::EndianRcSlice::new(buf, gimli::NativeEndian);
+/// # let _ = reader;
+/// # }
+/// ```
+pub type EndianRcSlice<Endian> = EndianReader<Endian, Rc<[u8]>>;
+
+/// An atomically reference counted, thread-safe slice of bytes and associated
+/// endianity.
+///
+/// ```
+/// # #[cfg(feature = "std")] {
+/// use std::sync::Arc;
+///
+/// let buf = Arc::from(&[1, 2, 3, 4][..]);
+/// let reader = gimli::EndianArcSlice::new(buf, gimli::NativeEndian);
+/// # let _ = reader;
+/// # }
+/// ```
+pub type EndianArcSlice<Endian> = EndianReader<Endian, Arc<[u8]>>;
+
+/// An easy way to define a custom `Reader` implementation with a reference to a
+/// generic buffer of bytes and an associated endianity.
+///
+/// Note that the whole original buffer is kept alive in memory even if there is
+/// only one reader that references only a handful of bytes from that original
+/// buffer. That is, `EndianReader` will not do any copying, moving, or
+/// compacting in order to free up unused regions of the original buffer. If you
+/// require this kind of behavior, it is up to you to implement `Reader`
+/// directly by-hand.
+///
+/// # Example
+///
+/// Say you have an `mmap`ed file that you want to serve as a `gimli::Reader`.
+/// You can wrap that `mmap`ed file up in a `MmapFile` type and use
+/// `EndianReader<Rc<MmapFile>>` or `EndianReader<Arc<MmapFile>>` as readers as
+/// long as `MmapFile` dereferences to the underlying `[u8]` data.
+///
+/// ```
+/// use std::io;
+/// use std::ops::Deref;
+/// use std::path::Path;
+/// use std::slice;
+/// use std::sync::Arc;
+///
+/// /// A type that represents an `mmap`ed file.
+/// #[derive(Debug)]
+/// pub struct MmapFile {
+///     ptr: *const u8,
+///     len: usize,
+/// }
+///
+/// impl MmapFile {
+///     pub fn new(path: &Path) -> io::Result<MmapFile> {
+///         // Call `mmap` and check for errors and all that...
+/// #       unimplemented!()
+///     }
+/// }
+///
+/// impl Drop for MmapFile {
+///     fn drop(&mut self) {
+///         // Call `munmap` to clean up after ourselves...
+/// #       unimplemented!()
+///     }
+/// }
+///
+/// // And `MmapFile` can deref to a slice of the `mmap`ed region of memory.
+/// impl Deref for MmapFile {
+///     type Target = [u8];
+///     fn deref(&self) -> &[u8] {
+///         unsafe {
+///             slice::from_raw_parts(self.ptr, self.len)
+///         }
+///     }
+/// }
+///
+/// /// A type that represents a shared `mmap`ed file.
+/// #[derive(Debug, Clone)]
+/// pub struct ArcMmapFile(Arc<MmapFile>);
+///
+/// // And `ArcMmapFile` can deref to a slice of the `mmap`ed region of memory.
+/// impl Deref for ArcMmapFile {
+///     type Target = [u8];
+///     fn deref(&self) -> &[u8] {
+///         &self.0
+///     }
+/// }
+///
+/// // These are both valid for any `Rc` or `Arc`.
+/// unsafe impl gimli::StableDeref for ArcMmapFile {}
+/// unsafe impl gimli::CloneStableDeref for ArcMmapFile {}
+///
+/// /// A `gimli::Reader` that is backed by an `mmap`ed file!
+/// pub type MmapFileReader<Endian> = gimli::EndianReader<Endian, ArcMmapFile>;
+/// # fn test(_: &MmapFileReader<gimli::NativeEndian>) { }
+/// ```
+#[derive(Debug, Clone, Copy, Hash)]
+pub struct EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    range: SubRange<T>,
+    endian: Endian,
+}
+
+impl<Endian, T1, T2> PartialEq<EndianReader<Endian, T2>> for EndianReader<Endian, T1>
+where
+    Endian: Endianity,
+    T1: CloneStableDeref<Target = [u8]> + Debug,
+    T2: CloneStableDeref<Target = [u8]> + Debug,
+{
+    fn eq(&self, rhs: &EndianReader<Endian, T2>) -> bool {
+        self.bytes() == rhs.bytes()
+    }
+}
+
+impl<Endian, T> Eq for EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+}
+
+// This is separated out from `EndianReader` so that we can avoid running afoul
+// of borrowck. We need to `read_slice(&mut self, ...) -> &[u8]` and then call
+// `self.endian.read_whatever` on the result. The problem is that the returned
+// slice keeps the `&mut self` borrow active, so we wouldn't be able to access
+// `self.endian`. Splitting the sub-range out from the endian lets us work
+// around this, making it so that only the `self.range` borrow is held active,
+// not all of `self`.
+//
+// This also serves to encapsulate the unsafe code concerning `CloneStableDeref`.
+// The `bytes` member is held so that the bytes live long enough, and the
+// `CloneStableDeref` ensures these bytes never move.  The `ptr` and `len`
+// members point inside `bytes`, and are updated during read operations.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+struct SubRange<T>
+where
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    bytes: T,
+    ptr: *const u8,
+    len: usize,
+}
+
+unsafe impl<T> Send for SubRange<T> where T: CloneStableDeref<Target = [u8]> + Debug + Send {}
+
+unsafe impl<T> Sync for SubRange<T> where T: CloneStableDeref<Target = [u8]> + Debug + Sync {}
+
+impl<T> SubRange<T>
+where
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    #[inline]
+    fn new(bytes: T) -> Self {
+        let ptr = bytes.as_ptr();
+        let len = bytes.len();
+        SubRange { bytes, ptr, len }
+    }
+
+    #[inline]
+    fn bytes(&self) -> &[u8] {
+        // Safe because `T` implements `CloneStableDeref`, `bytes` can't be modified,
+        // and all operations that modify `ptr` and `len` ensure they stay in range.
+        unsafe { slice::from_raw_parts(self.ptr, self.len) }
+    }
+
+    #[inline]
+    fn len(&self) -> usize {
+        self.len
+    }
+
+    #[inline]
+    fn truncate(&mut self, len: usize) {
+        assert!(len <= self.len);
+        self.len = len;
+    }
+
+    #[inline]
+    fn skip(&mut self, len: usize) {
+        assert!(len <= self.len);
+        self.ptr = unsafe { self.ptr.add(len) };
+        self.len -= len;
+    }
+
+    #[inline]
+    fn read_slice(&mut self, len: usize) -> Option<&[u8]> {
+        if self.len() < len {
+            None
+        } else {
+            // Same as for `bytes()`.
+            let bytes = unsafe { slice::from_raw_parts(self.ptr, len) };
+            self.skip(len);
+            Some(bytes)
+        }
+    }
+}
+
+impl<Endian, T> EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    /// Construct a new `EndianReader` with the given bytes.
+    #[inline]
+    pub fn new(bytes: T, endian: Endian) -> EndianReader<Endian, T> {
+        EndianReader {
+            range: SubRange::new(bytes),
+            endian,
+        }
+    }
+
+    /// Return a reference to the raw bytes underlying this reader.
+    #[inline]
+    pub fn bytes(&self) -> &[u8] {
+        self.range.bytes()
+    }
+}
+
+/// # Range Methods
+///
+/// Unfortunately, `std::ops::Index` *must* return a reference, so we can't
+/// implement `Index<Range<usize>>` to return a new `EndianReader` the way we
+/// would like to. Instead, we abandon fancy indexing operators and have these
+/// plain old methods.
+impl<Endian, T> EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    /// Take the given `start..end` range of the underlying buffer and return a
+    /// new `EndianReader`.
+    ///
+    /// ```
+    /// # #[cfg(feature = "std")] {
+    /// use gimli::{EndianReader, LittleEndian};
+    /// use std::sync::Arc;
+    ///
+    /// let buf = Arc::<[u8]>::from(&[0x01, 0x02, 0x03, 0x04][..]);
+    /// let reader = EndianReader::new(buf.clone(), LittleEndian);
+    /// assert_eq!(reader.range(1..3),
+    ///            EndianReader::new(&buf[1..3], LittleEndian));
+    /// # }
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// Panics if the range is out of bounds.
+    pub fn range(&self, idx: Range<usize>) -> EndianReader<Endian, T> {
+        let mut r = self.clone();
+        r.range.skip(idx.start);
+        r.range.truncate(idx.len());
+        r
+    }
+
+    /// Take the given `start..` range of the underlying buffer and return a new
+    /// `EndianReader`.
+    ///
+    /// ```
+    /// # #[cfg(feature = "std")] {
+    /// use gimli::{EndianReader, LittleEndian};
+    /// use std::sync::Arc;
+    ///
+    /// let buf = Arc::<[u8]>::from(&[0x01, 0x02, 0x03, 0x04][..]);
+    /// let reader = EndianReader::new(buf.clone(), LittleEndian);
+    /// assert_eq!(reader.range_from(2..),
+    ///            EndianReader::new(&buf[2..], LittleEndian));
+    /// # }
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// Panics if the range is out of bounds.
+    pub fn range_from(&self, idx: RangeFrom<usize>) -> EndianReader<Endian, T> {
+        let mut r = self.clone();
+        r.range.skip(idx.start);
+        r
+    }
+
+    /// Take the given `..end` range of the underlying buffer and return a new
+    /// `EndianReader`.
+    ///
+    /// ```
+    /// # #[cfg(feature = "std")] {
+    /// use gimli::{EndianReader, LittleEndian};
+    /// use std::sync::Arc;
+    ///
+    /// let buf = Arc::<[u8]>::from(&[0x01, 0x02, 0x03, 0x04][..]);
+    /// let reader = EndianReader::new(buf.clone(), LittleEndian);
+    /// assert_eq!(reader.range_to(..3),
+    ///            EndianReader::new(&buf[..3], LittleEndian));
+    /// # }
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// Panics if the range is out of bounds.
+    pub fn range_to(&self, idx: RangeTo<usize>) -> EndianReader<Endian, T> {
+        let mut r = self.clone();
+        r.range.truncate(idx.end);
+        r
+    }
+}
+
+impl<Endian, T> Index<usize> for EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    type Output = u8;
+    fn index(&self, idx: usize) -> &Self::Output {
+        &self.bytes()[idx]
+    }
+}
+
+impl<Endian, T> Index<RangeFrom<usize>> for EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    type Output = [u8];
+    fn index(&self, idx: RangeFrom<usize>) -> &Self::Output {
+        &self.bytes()[idx]
+    }
+}
+
+impl<Endian, T> Deref for EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    type Target = [u8];
+    fn deref(&self) -> &Self::Target {
+        self.bytes()
+    }
+}
+
+impl<Endian, T> Reader for EndianReader<Endian, T>
+where
+    Endian: Endianity,
+    T: CloneStableDeref<Target = [u8]> + Debug,
+{
+    type Endian = Endian;
+    type Offset = usize;
+
+    #[inline]
+    fn endian(&self) -> Endian {
+        self.endian
+    }
+
+    #[inline]
+    fn len(&self) -> usize {
+        self.range.len()
+    }
+
+    #[inline]
+    fn empty(&mut self) {
+        self.range.truncate(0);
+    }
+
+    #[inline]
+    fn truncate(&mut self, len: usize) -> Result<()> {
+        if self.len() < len {
+            Err(Error::UnexpectedEof(self.offset_id()))
+        } else {
+            self.range.truncate(len);
+            Ok(())
+        }
+    }
+
+    #[inline]
+    fn offset_from(&self, base: &EndianReader<Endian, T>) -> usize {
+        let base_ptr = base.bytes().as_ptr() as *const u8 as usize;
+        let ptr = self.bytes().as_ptr() as *const u8 as usize;
+        debug_assert!(base_ptr <= ptr);
+        debug_assert!(ptr + self.bytes().len() <= base_ptr + base.bytes().len());
+        ptr - base_ptr
+    }
+
+    #[inline]
+    fn offset_id(&self) -> ReaderOffsetId {
+        ReaderOffsetId(self.bytes().as_ptr() as u64)
+    }
+
+    #[inline]
+    fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<Self::Offset> {
+        let id = id.0;
+        let self_id = self.bytes().as_ptr() as u64;
+        let self_len = self.bytes().len() as u64;
+        if id >= self_id && id <= self_id + self_len {
+            Some((id - self_id) as usize)
+        } else {
+            None
+        }
+    }
+
+    #[inline]
+    fn find(&self, byte: u8) -> Result<usize> {
+        self.bytes()
+            .iter()
+            .position(|x| *x == byte)
+            .ok_or_else(|| Error::UnexpectedEof(self.offset_id()))
+    }
+
+    #[inline]
+    fn skip(&mut self, len: usize) -> Result<()> {
+        if self.len() < len {
+            Err(Error::UnexpectedEof(self.offset_id()))
+        } else {
+            self.range.skip(len);
+            Ok(())
+        }
+    }
+
+    #[inline]
+    fn split(&mut self, len: usize) -> Result<Self> {
+        if self.len() < len {
+            Err(Error::UnexpectedEof(self.offset_id()))
+        } else {
+            let mut r = self.clone();
+            r.range.truncate(len);
+            self.range.skip(len);
+            Ok(r)
+        }
+    }
+
+    #[inline]
+    fn to_slice(&self) -> Result<Cow<[u8]>> {
+        Ok(self.bytes().into())
+    }
+
+    #[inline]
+    fn to_string(&self) -> Result<Cow<str>> {
+        match str::from_utf8(self.bytes()) {
+            Ok(s) => Ok(s.into()),
+            _ => Err(Error::BadUtf8),
+        }
+    }
+
+    #[inline]
+    fn to_string_lossy(&self) -> Result<Cow<str>> {
+        Ok(String::from_utf8_lossy(self.bytes()))
+    }
+
+    #[inline]
+    fn read_slice(&mut self, buf: &mut [u8]) -> Result<()> {
+        match self.range.read_slice(buf.len()) {
+            Some(slice) => {
+                buf.copy_from_slice(slice);
+                Ok(())
+            }
+            None => Err(Error::UnexpectedEof(self.offset_id())),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::endianity::NativeEndian;
+    use crate::read::Reader;
+
+    fn native_reader<T: CloneStableDeref<Target = [u8]> + Debug>(
+        bytes: T,
+    ) -> EndianReader<NativeEndian, T> {
+        EndianReader::new(bytes, NativeEndian)
+    }
+
+    const BUF: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+
+    #[test]
+    fn test_reader_split() {
+        let mut reader = native_reader(BUF);
+        let left = reader.split(3).unwrap();
+        assert_eq!(left, native_reader(&BUF[..3]));
+        assert_eq!(reader, native_reader(&BUF[3..]));
+    }
+
+    #[test]
+    fn test_reader_split_out_of_bounds() {
+        let mut reader = native_reader(BUF);
+        assert!(reader.split(30).is_err());
+    }
+
+    #[test]
+    fn bytes_and_len_and_range_and_eq() {
+        let reader = native_reader(BUF);
+        assert_eq!(reader.len(), BUF.len());
+        assert_eq!(reader.bytes(), BUF);
+        assert_eq!(reader, native_reader(BUF));
+
+        let range = reader.range(2..8);
+        let buf_range = &BUF[2..8];
+        assert_eq!(range.len(), buf_range.len());
+        assert_eq!(range.bytes(), buf_range);
+        assert_ne!(range, native_reader(BUF));
+        assert_eq!(range, native_reader(buf_range));
+
+        let range_from = range.range_from(1..);
+        let buf_range_from = &buf_range[1..];
+        assert_eq!(range_from.len(), buf_range_from.len());
+        assert_eq!(range_from.bytes(), buf_range_from);
+        assert_ne!(range_from, native_reader(BUF));
+        assert_eq!(range_from, native_reader(buf_range_from));
+
+        let range_to = range_from.range_to(..4);
+        let buf_range_to = &buf_range_from[..4];
+        assert_eq!(range_to.len(), buf_range_to.len());
+        assert_eq!(range_to.bytes(), buf_range_to);
+        assert_ne!(range_to, native_reader(BUF));
+        assert_eq!(range_to, native_reader(buf_range_to));
+    }
+
+    #[test]
+    fn find() {
+        let mut reader = native_reader(BUF);
+        reader.skip(2).unwrap();
+        assert_eq!(
+            reader.find(5),
+            Ok(BUF[2..].iter().position(|x| *x == 5).unwrap())
+        );
+    }
+
+    #[test]
+    fn indexing() {
+        let mut reader = native_reader(BUF);
+        reader.skip(2).unwrap();
+        assert_eq!(reader[0], BUF[2]);
+    }
+
+    #[test]
+    #[should_panic]
+    fn indexing_out_of_bounds() {
+        let mut reader = native_reader(BUF);
+        reader.skip(2).unwrap();
+        let _ = reader[900];
+    }
+
+    #[test]
+    fn endian() {
+        let reader = native_reader(BUF);
+        assert_eq!(reader.endian(), NativeEndian);
+    }
+
+    #[test]
+    fn empty() {
+        let mut reader = native_reader(BUF);
+        assert!(!reader.is_empty());
+        reader.empty();
+        assert!(reader.is_empty());
+        assert!(reader.bytes().is_empty());
+    }
+
+    #[test]
+    fn truncate() {
+        let reader = native_reader(BUF);
+        let mut reader = reader.range(2..8);
+        reader.truncate(2).unwrap();
+        assert_eq!(reader.bytes(), &BUF[2..4]);
+    }
+
+    #[test]
+    fn offset_from() {
+        let reader = native_reader(BUF);
+        let sub = reader.range(2..8);
+        assert_eq!(sub.offset_from(&reader), 2);
+    }
+
+    #[test]
+    fn skip() {
+        let mut reader = native_reader(BUF);
+        reader.skip(2).unwrap();
+        assert_eq!(reader.bytes(), &BUF[2..]);
+    }
+
+    #[test]
+    fn to_slice() {
+        assert_eq!(
+            native_reader(BUF).range(2..5).to_slice(),
+            Ok(Cow::from(&BUF[2..5]))
+        );
+    }
+
+    #[test]
+    fn to_string_ok() {
+        let buf = b"hello, world!";
+        let reader = native_reader(&buf[..]);
+        let reader = reader.range_from(7..);
+        assert_eq!(reader.to_string(), Ok(Cow::from("world!")));
+    }
+
+    // The rocket emoji (🚀 = [0xf0, 0x9f, 0x9a, 0x80]) but rotated left by one
+    // to make it invalid UTF-8.
+    const BAD_UTF8: &[u8] = &[0x9f, 0x9a, 0x80, 0xf0];
+
+    #[test]
+    fn to_string_err() {
+        let reader = native_reader(BAD_UTF8);
+        assert!(reader.to_string().is_err());
+    }
+
+    #[test]
+    fn to_string_lossy() {
+        let reader = native_reader(BAD_UTF8);
+        assert_eq!(reader.to_string_lossy(), Ok(Cow::from("����")));
+    }
+
+    #[test]
+    fn read_u8_array() {
+        let mut reader = native_reader(BAD_UTF8);
+        reader.skip(1).unwrap();
+        let arr: [u8; 2] = reader.read_u8_array().unwrap();
+        assert_eq!(arr, &BAD_UTF8[1..3]);
+        assert_eq!(reader.bytes(), &BAD_UTF8[3..]);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/endian_slice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/endian_slice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/endian_slice.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/endian_slice.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,339 @@
+//! Working with byte slices that have an associated endianity.
+
+use alloc::borrow::Cow;
+use alloc::string::String;
+use core::ops::{Deref, Index, Range, RangeFrom, RangeTo};
+use core::str;
+
+use crate::endianity::Endianity;
+use crate::read::{Error, Reader, ReaderOffsetId, Result};
+
+/// A `&[u8]` slice with endianity metadata.
+///
+/// This implements the `Reader` trait, which is used for all reading of DWARF sections.
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct EndianSlice<'input, Endian>
+where
+    Endian: Endianity,
+{
+    slice: &'input [u8],
+    endian: Endian,
+}
+
+impl<'input, Endian> EndianSlice<'input, Endian>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `EndianSlice` with the given slice and endianity.
+    #[inline]
+    pub fn new(slice: &'input [u8], endian: Endian) -> EndianSlice<'input, Endian> {
+        EndianSlice { slice, endian }
+    }
+
+    /// Return a reference to the raw slice.
+    #[inline]
+    #[doc(hidden)]
+    #[deprecated(note = "Method renamed to EndianSlice::slice; use that instead.")]
+    pub fn buf(&self) -> &'input [u8] {
+        self.slice
+    }
+
+    /// Return a reference to the raw slice.
+    #[inline]
+    pub fn slice(&self) -> &'input [u8] {
+        self.slice
+    }
+
+    /// Split the slice in two at the given index, resulting in the tuple where
+    /// the first item has range [0, idx), and the second has range [idx,
+    /// len). Panics if the index is out of bounds.
+    #[inline]
+    pub fn split_at(
+        &self,
+        idx: usize,
+    ) -> (EndianSlice<'input, Endian>, EndianSlice<'input, Endian>) {
+        (self.range_to(..idx), self.range_from(idx..))
+    }
+
+    /// Find the first occurence of a byte in the slice, and return its index.
+    #[inline]
+    pub fn find(&self, byte: u8) -> Option<usize> {
+        self.slice.iter().position(|ch| *ch == byte)
+    }
+
+    /// Return the offset of the start of the slice relative to the start
+    /// of the given slice.
+    #[inline]
+    pub fn offset_from(&self, base: EndianSlice<'input, Endian>) -> usize {
+        let base_ptr = base.slice.as_ptr() as *const u8 as usize;
+        let ptr = self.slice.as_ptr() as *const u8 as usize;
+        debug_assert!(base_ptr <= ptr);
+        debug_assert!(ptr + self.slice.len() <= base_ptr + base.slice.len());
+        ptr - base_ptr
+    }
+
+    /// Converts the slice to a string using `str::from_utf8`.
+    ///
+    /// Returns an error if the slice contains invalid characters.
+    #[inline]
+    pub fn to_string(&self) -> Result<&'input str> {
+        str::from_utf8(self.slice).map_err(|_| Error::BadUtf8)
+    }
+
+    /// Converts the slice to a string, including invalid characters,
+    /// using `String::from_utf8_lossy`.
+    #[inline]
+    pub fn to_string_lossy(&self) -> Cow<'input, str> {
+        String::from_utf8_lossy(self.slice)
+    }
+
+    #[inline]
+    fn read_slice(&mut self, len: usize) -> Result<&'input [u8]> {
+        if self.slice.len() < len {
+            Err(Error::UnexpectedEof(self.offset_id()))
+        } else {
+            let val = &self.slice[..len];
+            self.slice = &self.slice[len..];
+            Ok(val)
+        }
+    }
+}
+
+/// # Range Methods
+///
+/// Unfortunately, `std::ops::Index` *must* return a reference, so we can't
+/// implement `Index<Range<usize>>` to return a new `EndianSlice` the way we would
+/// like to. Instead, we abandon fancy indexing operators and have these plain
+/// old methods.
+impl<'input, Endian> EndianSlice<'input, Endian>
+where
+    Endian: Endianity,
+{
+    /// Take the given `start..end` range of the underlying slice and return a
+    /// new `EndianSlice`.
+    ///
+    /// ```
+    /// use gimli::{EndianSlice, LittleEndian};
+    ///
+    /// let slice = &[0x01, 0x02, 0x03, 0x04];
+    /// let endian_slice = EndianSlice::new(slice, LittleEndian);
+    /// assert_eq!(endian_slice.range(1..3),
+    ///            EndianSlice::new(&slice[1..3], LittleEndian));
+    /// ```
+    pub fn range(&self, idx: Range<usize>) -> EndianSlice<'input, Endian> {
+        EndianSlice {
+            slice: &self.slice[idx],
+            endian: self.endian,
+        }
+    }
+
+    /// Take the given `start..` range of the underlying slice and return a new
+    /// `EndianSlice`.
+    ///
+    /// ```
+    /// use gimli::{EndianSlice, LittleEndian};
+    ///
+    /// let slice = &[0x01, 0x02, 0x03, 0x04];
+    /// let endian_slice = EndianSlice::new(slice, LittleEndian);
+    /// assert_eq!(endian_slice.range_from(2..),
+    ///            EndianSlice::new(&slice[2..], LittleEndian));
+    /// ```
+    pub fn range_from(&self, idx: RangeFrom<usize>) -> EndianSlice<'input, Endian> {
+        EndianSlice {
+            slice: &self.slice[idx],
+            endian: self.endian,
+        }
+    }
+
+    /// Take the given `..end` range of the underlying slice and return a new
+    /// `EndianSlice`.
+    ///
+    /// ```
+    /// use gimli::{EndianSlice, LittleEndian};
+    ///
+    /// let slice = &[0x01, 0x02, 0x03, 0x04];
+    /// let endian_slice = EndianSlice::new(slice, LittleEndian);
+    /// assert_eq!(endian_slice.range_to(..3),
+    ///            EndianSlice::new(&slice[..3], LittleEndian));
+    /// ```
+    pub fn range_to(&self, idx: RangeTo<usize>) -> EndianSlice<'input, Endian> {
+        EndianSlice {
+            slice: &self.slice[idx],
+            endian: self.endian,
+        }
+    }
+}
+
+impl<'input, Endian> Index<usize> for EndianSlice<'input, Endian>
+where
+    Endian: Endianity,
+{
+    type Output = u8;
+    fn index(&self, idx: usize) -> &Self::Output {
+        &self.slice[idx]
+    }
+}
+
+impl<'input, Endian> Index<RangeFrom<usize>> for EndianSlice<'input, Endian>
+where
+    Endian: Endianity,
+{
+    type Output = [u8];
+    fn index(&self, idx: RangeFrom<usize>) -> &Self::Output {
+        &self.slice[idx]
+    }
+}
+
+impl<'input, Endian> Deref for EndianSlice<'input, Endian>
+where
+    Endian: Endianity,
+{
+    type Target = [u8];
+    fn deref(&self) -> &Self::Target {
+        self.slice
+    }
+}
+
+impl<'input, Endian> Into<&'input [u8]> for EndianSlice<'input, Endian>
+where
+    Endian: Endianity,
+{
+    fn into(self) -> &'input [u8] {
+        self.slice
+    }
+}
+
+impl<'input, Endian> Reader for EndianSlice<'input, Endian>
+where
+    Endian: Endianity,
+{
+    type Endian = Endian;
+    type Offset = usize;
+
+    #[inline]
+    fn endian(&self) -> Endian {
+        self.endian
+    }
+
+    #[inline]
+    fn len(&self) -> usize {
+        self.slice.len()
+    }
+
+    #[inline]
+    fn is_empty(&self) -> bool {
+        self.slice.is_empty()
+    }
+
+    #[inline]
+    fn empty(&mut self) {
+        self.slice = &[];
+    }
+
+    #[inline]
+    fn truncate(&mut self, len: usize) -> Result<()> {
+        if self.slice.len() < len {
+            Err(Error::UnexpectedEof(self.offset_id()))
+        } else {
+            self.slice = &self.slice[..len];
+            Ok(())
+        }
+    }
+
+    #[inline]
+    fn offset_from(&self, base: &Self) -> usize {
+        self.offset_from(*base)
+    }
+
+    #[inline]
+    fn offset_id(&self) -> ReaderOffsetId {
+        ReaderOffsetId(self.slice.as_ptr() as u64)
+    }
+
+    #[inline]
+    fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<Self::Offset> {
+        let id = id.0;
+        let self_id = self.slice.as_ptr() as u64;
+        let self_len = self.slice.len() as u64;
+        if id >= self_id && id <= self_id + self_len {
+            Some((id - self_id) as usize)
+        } else {
+            None
+        }
+    }
+
+    #[inline]
+    fn find(&self, byte: u8) -> Result<usize> {
+        self.find(byte)
+            .ok_or_else(|| Error::UnexpectedEof(self.offset_id()))
+    }
+
+    #[inline]
+    fn skip(&mut self, len: usize) -> Result<()> {
+        if self.slice.len() < len {
+            Err(Error::UnexpectedEof(self.offset_id()))
+        } else {
+            self.slice = &self.slice[len..];
+            Ok(())
+        }
+    }
+
+    #[inline]
+    fn split(&mut self, len: usize) -> Result<Self> {
+        let slice = self.read_slice(len)?;
+        Ok(EndianSlice::new(slice, self.endian))
+    }
+
+    #[inline]
+    fn to_slice(&self) -> Result<Cow<[u8]>> {
+        Ok(self.slice.into())
+    }
+
+    #[inline]
+    fn to_string(&self) -> Result<Cow<str>> {
+        match str::from_utf8(self.slice) {
+            Ok(s) => Ok(s.into()),
+            _ => Err(Error::BadUtf8),
+        }
+    }
+
+    #[inline]
+    fn to_string_lossy(&self) -> Result<Cow<str>> {
+        Ok(String::from_utf8_lossy(self.slice))
+    }
+
+    #[inline]
+    fn read_slice(&mut self, buf: &mut [u8]) -> Result<()> {
+        let slice = self.read_slice(buf.len())?;
+        buf.copy_from_slice(slice);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::endianity::NativeEndian;
+
+    #[test]
+    fn test_endian_slice_split_at() {
+        let endian = NativeEndian;
+        let slice = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+        let eb = EndianSlice::new(slice, endian);
+        assert_eq!(
+            eb.split_at(3),
+            (
+                EndianSlice::new(&slice[..3], endian),
+                EndianSlice::new(&slice[3..], endian)
+            )
+        );
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_endian_slice_split_at_out_of_bounds() {
+        let slice = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+        let eb = EndianSlice::new(slice, NativeEndian);
+        eb.split_at(30);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/line.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3030 @@
+use alloc::vec::Vec;
+use core::fmt;
+use core::num::{NonZeroU64, Wrapping};
+use core::result;
+
+use crate::common::{
+    DebugLineOffset, DebugLineStrOffset, DebugStrOffset, DebugStrOffsetsIndex, Encoding, Format,
+    LineEncoding, SectionId,
+};
+use crate::constants;
+use crate::endianity::Endianity;
+use crate::read::{AttributeValue, EndianSlice, Error, Reader, ReaderOffset, Result, Section};
+
+/// The `DebugLine` struct contains the source location to instruction mapping
+/// found in the `.debug_line` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugLine<R> {
+    debug_line_section: R,
+}
+
+impl<'input, Endian> DebugLine<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugLine` instance from the data in the `.debug_line`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_line` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugLine, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_line_section_somehow = || &buf;
+    /// let debug_line = DebugLine::new(read_debug_line_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(debug_line_section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(debug_line_section, endian))
+    }
+}
+
+impl<R: Reader> DebugLine<R> {
+    /// Parse the line number program whose header is at the given `offset` in the
+    /// `.debug_line` section.
+    ///
+    /// The `address_size` must match the compilation unit that the lines apply to.
+    /// The `comp_dir` should be from the `DW_AT_comp_dir` attribute of the compilation
+    /// unit. The `comp_name` should be from the `DW_AT_name` attribute of the
+    /// compilation unit.
+    ///
+    /// ```rust,no_run
+    /// use gimli::{DebugLine, DebugLineOffset, IncompleteLineProgram, EndianSlice, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_line_section_somehow = || &buf;
+    /// let debug_line = DebugLine::new(read_debug_line_section_somehow(), LittleEndian);
+    ///
+    /// // In a real example, we'd grab the offset via a compilation unit
+    /// // entry's `DW_AT_stmt_list` attribute, and the address size from that
+    /// // unit directly.
+    /// let offset = DebugLineOffset(0);
+    /// let address_size = 8;
+    ///
+    /// let program = debug_line.program(offset, address_size, None, None)
+    ///     .expect("should have found a header at that offset, and parsed it OK");
+    /// ```
+    pub fn program(
+        &self,
+        offset: DebugLineOffset<R::Offset>,
+        address_size: u8,
+        comp_dir: Option<R>,
+        comp_name: Option<R>,
+    ) -> Result<IncompleteLineProgram<R>> {
+        let input = &mut self.debug_line_section.clone();
+        input.skip(offset.0)?;
+        let header = LineProgramHeader::parse(input, offset, address_size, comp_dir, comp_name)?;
+        let program = IncompleteLineProgram { header };
+        Ok(program)
+    }
+}
+
+impl<T> DebugLine<T> {
+    /// Create a `DebugLine` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugLine<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugLine<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.debug_line_section).into()
+    }
+}
+
+impl<R> Section<R> for DebugLine<R> {
+    fn id() -> SectionId {
+        SectionId::DebugLine
+    }
+
+    fn reader(&self) -> &R {
+        &self.debug_line_section
+    }
+}
+
+impl<R> From<R> for DebugLine<R> {
+    fn from(debug_line_section: R) -> Self {
+        DebugLine { debug_line_section }
+    }
+}
+
+/// Deprecated. `LineNumberProgram` has been renamed to `LineProgram`.
+#[deprecated(note = "LineNumberProgram has been renamed to LineProgram, use that instead.")]
+pub type LineNumberProgram<R, Offset> = dyn LineProgram<R, Offset>;
+
+/// A `LineProgram` provides access to a `LineProgramHeader` and
+/// a way to add files to the files table if necessary. Gimli consumers should
+/// never need to use or see this trait.
+pub trait LineProgram<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Get a reference to the held `LineProgramHeader`.
+    fn header(&self) -> &LineProgramHeader<R, Offset>;
+    /// Add a file to the file table if necessary.
+    fn add_file(&mut self, file: FileEntry<R, Offset>);
+}
+
+impl<R, Offset> LineProgram<R, Offset> for IncompleteLineProgram<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    fn header(&self) -> &LineProgramHeader<R, Offset> {
+        &self.header
+    }
+    fn add_file(&mut self, file: FileEntry<R, Offset>) {
+        self.header.file_names.push(file);
+    }
+}
+
+impl<'program, R, Offset> LineProgram<R, Offset> for &'program CompleteLineProgram<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    fn header(&self) -> &LineProgramHeader<R, Offset> {
+        &self.header
+    }
+    fn add_file(&mut self, _: FileEntry<R, Offset>) {
+        // Nop. Our file table is already complete.
+    }
+}
+
+/// Deprecated. `StateMachine` has been renamed to `LineRows`.
+#[deprecated(note = "StateMachine has been renamed to LineRows, use that instead.")]
+pub type StateMachine<R, Program, Offset> = LineRows<R, Program, Offset>;
+
+/// Executes a `LineProgram` to iterate over the rows in the matrix of line number information.
+///
+/// "The hypothetical machine used by a consumer of the line number information
+/// to expand the byte-coded instruction stream into a matrix of line number
+/// information." -- Section 6.2.1
+#[derive(Debug, Clone)]
+pub struct LineRows<R, Program, Offset = <R as Reader>::Offset>
+where
+    Program: LineProgram<R, Offset>,
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    program: Program,
+    row: LineRow,
+    instructions: LineInstructions<R>,
+}
+
+type OneShotLineRows<R, Offset = <R as Reader>::Offset> =
+    LineRows<R, IncompleteLineProgram<R, Offset>, Offset>;
+
+type ResumedLineRows<'program, R, Offset = <R as Reader>::Offset> =
+    LineRows<R, &'program CompleteLineProgram<R, Offset>, Offset>;
+
+impl<R, Program, Offset> LineRows<R, Program, Offset>
+where
+    Program: LineProgram<R, Offset>,
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    #[allow(clippy::new_ret_no_self)]
+    fn new(program: IncompleteLineProgram<R, Offset>) -> OneShotLineRows<R, Offset> {
+        let row = LineRow::new(program.header());
+        let instructions = LineInstructions {
+            input: program.header().program_buf.clone(),
+        };
+        LineRows {
+            program,
+            row,
+            instructions,
+        }
+    }
+
+    fn resume<'program>(
+        program: &'program CompleteLineProgram<R, Offset>,
+        sequence: &LineSequence<R>,
+    ) -> ResumedLineRows<'program, R, Offset> {
+        let row = LineRow::new(program.header());
+        let instructions = sequence.instructions.clone();
+        LineRows {
+            program,
+            row,
+            instructions,
+        }
+    }
+
+    /// Get a reference to the header for this state machine's line number
+    /// program.
+    #[inline]
+    pub fn header(&self) -> &LineProgramHeader<R, Offset> {
+        self.program.header()
+    }
+
+    /// Parse and execute the next instructions in the line number program until
+    /// another row in the line number matrix is computed.
+    ///
+    /// The freshly computed row is returned as `Ok(Some((header, row)))`.
+    /// If the matrix is complete, and there are no more new rows in the line
+    /// number matrix, then `Ok(None)` is returned. If there was an error parsing
+    /// an instruction, then `Err(e)` is returned.
+    ///
+    /// Unfortunately, the references mean that this cannot be a
+    /// `FallibleIterator`.
+    pub fn next_row(&mut self) -> Result<Option<(&LineProgramHeader<R, Offset>, &LineRow)>> {
+        // Perform any reset that was required after copying the previous row.
+        self.row.reset(self.program.header());
+
+        loop {
+            // Split the borrow here, rather than calling `self.header()`.
+            match self.instructions.next_instruction(self.program.header()) {
+                Err(err) => return Err(err),
+                Ok(None) => return Ok(None),
+                Ok(Some(instruction)) => {
+                    if self.row.execute(instruction, &mut self.program) {
+                        return Ok(Some((self.header(), &self.row)));
+                    }
+                    // Fall through, parse the next instruction, and see if that
+                    // yields a row.
+                }
+            }
+        }
+    }
+}
+
+/// Deprecated. `Opcode` has been renamed to `LineInstruction`.
+#[deprecated(note = "Opcode has been renamed to LineInstruction, use that instead.")]
+pub type Opcode<R> = LineInstruction<R, <R as Reader>::Offset>;
+
+/// A parsed line number program instruction.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum LineInstruction<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// > ### 6.2.5.1 Special Opcodes
+    /// >
+    /// > Each ubyte special opcode has the following effect on the state machine:
+    /// >
+    /// >   1. Add a signed integer to the line register.
+    /// >
+    /// >   2. Modify the operation pointer by incrementing the address and
+    /// >   op_index registers as described below.
+    /// >
+    /// >   3. Append a row to the matrix using the current values of the state
+    /// >   machine registers.
+    /// >
+    /// >   4. Set the basic_block register to “false.�
+    /// >
+    /// >   5. Set the prologue_end register to “false.�
+    /// >
+    /// >   6. Set the epilogue_begin register to “false.�
+    /// >
+    /// >   7. Set the discriminator register to 0.
+    /// >
+    /// > All of the special opcodes do those same seven things; they differ from
+    /// > one another only in what values they add to the line, address and
+    /// > op_index registers.
+    Special(u8),
+
+    /// "[`LineInstruction::Copy`] appends a row to the matrix using the current
+    /// values of the state machine registers. Then it sets the discriminator
+    /// register to 0, and sets the basic_block, prologue_end and epilogue_begin
+    /// registers to “false.�"
+    Copy,
+
+    /// "The DW_LNS_advance_pc opcode takes a single unsigned LEB128 operand as
+    /// the operation advance and modifies the address and op_index registers
+    /// [the same as `LineInstruction::Special`]"
+    AdvancePc(u64),
+
+    /// "The DW_LNS_advance_line opcode takes a single signed LEB128 operand and
+    /// adds that value to the line register of the state machine."
+    AdvanceLine(i64),
+
+    /// "The DW_LNS_set_file opcode takes a single unsigned LEB128 operand and
+    /// stores it in the file register of the state machine."
+    SetFile(u64),
+
+    /// "The DW_LNS_set_column opcode takes a single unsigned LEB128 operand and
+    /// stores it in the column register of the state machine."
+    SetColumn(u64),
+
+    /// "The DW_LNS_negate_stmt opcode takes no operands. It sets the is_stmt
+    /// register of the state machine to the logical negation of its current
+    /// value."
+    NegateStatement,
+
+    /// "The DW_LNS_set_basic_block opcode takes no operands. It sets the
+    /// basic_block register of the state machine to “true.�"
+    SetBasicBlock,
+
+    /// > The DW_LNS_const_add_pc opcode takes no operands. It advances the
+    /// > address and op_index registers by the increments corresponding to
+    /// > special opcode 255.
+    /// >
+    /// > When the line number program needs to advance the address by a small
+    /// > amount, it can use a single special opcode, which occupies a single
+    /// > byte. When it needs to advance the address by up to twice the range of
+    /// > the last special opcode, it can use DW_LNS_const_add_pc followed by a
+    /// > special opcode, for a total of two bytes. Only if it needs to advance
+    /// > the address by more than twice that range will it need to use both
+    /// > DW_LNS_advance_pc and a special opcode, requiring three or more bytes.
+    ConstAddPc,
+
+    /// > The DW_LNS_fixed_advance_pc opcode takes a single uhalf (unencoded)
+    /// > operand and adds it to the address register of the state machine and
+    /// > sets the op_index register to 0. This is the only standard opcode whose
+    /// > operand is not a variable length number. It also does not multiply the
+    /// > operand by the minimum_instruction_length field of the header.
+    FixedAddPc(u16),
+
+    /// "[`LineInstruction::SetPrologueEnd`] sets the prologue_end register to “true�."
+    SetPrologueEnd,
+
+    /// "[`LineInstruction::SetEpilogueBegin`] sets the epilogue_begin register to
+    /// “true�."
+    SetEpilogueBegin,
+
+    /// "The DW_LNS_set_isa opcode takes a single unsigned LEB128 operand and
+    /// stores that value in the isa register of the state machine."
+    SetIsa(u64),
+
+    /// An unknown standard opcode with zero operands.
+    UnknownStandard0(constants::DwLns),
+
+    /// An unknown standard opcode with one operand.
+    UnknownStandard1(constants::DwLns, u64),
+
+    /// An unknown standard opcode with multiple operands.
+    UnknownStandardN(constants::DwLns, R),
+
+    /// > [`LineInstruction::EndSequence`] sets the end_sequence register of the state
+    /// > machine to “true� and appends a row to the matrix using the current
+    /// > values of the state-machine registers. Then it resets the registers to
+    /// > the initial values specified above (see Section 6.2.2). Every line
+    /// > number program sequence must end with a DW_LNE_end_sequence instruction
+    /// > which creates a row whose address is that of the byte after the last
+    /// > target machine instruction of the sequence.
+    EndSequence,
+
+    /// > The DW_LNE_set_address opcode takes a single relocatable address as an
+    /// > operand. The size of the operand is the size of an address on the target
+    /// > machine. It sets the address register to the value given by the
+    /// > relocatable address and sets the op_index register to 0.
+    /// >
+    /// > All of the other line number program opcodes that affect the address
+    /// > register add a delta to it. This instruction stores a relocatable value
+    /// > into it instead.
+    SetAddress(u64),
+
+    /// Defines a new source file in the line number program and appends it to
+    /// the line number program header's list of source files.
+    DefineFile(FileEntry<R, Offset>),
+
+    /// "The DW_LNE_set_discriminator opcode takes a single parameter, an
+    /// unsigned LEB128 integer. It sets the discriminator register to the new
+    /// value."
+    SetDiscriminator(u64),
+
+    /// An unknown extended opcode and the slice of its unparsed operands.
+    UnknownExtended(constants::DwLne, R),
+}
+
+impl<R, Offset> LineInstruction<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    fn parse<'header>(
+        header: &'header LineProgramHeader<R>,
+        input: &mut R,
+    ) -> Result<LineInstruction<R>>
+    where
+        R: 'header,
+    {
+        let opcode = input.read_u8()?;
+        if opcode == 0 {
+            let length = input.read_uleb128().and_then(R::Offset::from_u64)?;
+            let mut instr_rest = input.split(length)?;
+            let opcode = instr_rest.read_u8()?;
+
+            match constants::DwLne(opcode) {
+                constants::DW_LNE_end_sequence => Ok(LineInstruction::EndSequence),
+
+                constants::DW_LNE_set_address => {
+                    let address = instr_rest.read_address(header.address_size())?;
+                    Ok(LineInstruction::SetAddress(address))
+                }
+
+                constants::DW_LNE_define_file => {
+                    if header.version() <= 4 {
+                        let path_name = instr_rest.read_null_terminated_slice()?;
+                        let entry = FileEntry::parse(&mut instr_rest, path_name)?;
+                        Ok(LineInstruction::DefineFile(entry))
+                    } else {
+                        Ok(LineInstruction::UnknownExtended(
+                            constants::DW_LNE_define_file,
+                            instr_rest,
+                        ))
+                    }
+                }
+
+                constants::DW_LNE_set_discriminator => {
+                    let discriminator = instr_rest.read_uleb128()?;
+                    Ok(LineInstruction::SetDiscriminator(discriminator))
+                }
+
+                otherwise => Ok(LineInstruction::UnknownExtended(otherwise, instr_rest)),
+            }
+        } else if opcode >= header.opcode_base {
+            Ok(LineInstruction::Special(opcode))
+        } else {
+            match constants::DwLns(opcode) {
+                constants::DW_LNS_copy => Ok(LineInstruction::Copy),
+
+                constants::DW_LNS_advance_pc => {
+                    let advance = input.read_uleb128()?;
+                    Ok(LineInstruction::AdvancePc(advance))
+                }
+
+                constants::DW_LNS_advance_line => {
+                    let increment = input.read_sleb128()?;
+                    Ok(LineInstruction::AdvanceLine(increment))
+                }
+
+                constants::DW_LNS_set_file => {
+                    let file = input.read_uleb128()?;
+                    Ok(LineInstruction::SetFile(file))
+                }
+
+                constants::DW_LNS_set_column => {
+                    let column = input.read_uleb128()?;
+                    Ok(LineInstruction::SetColumn(column))
+                }
+
+                constants::DW_LNS_negate_stmt => Ok(LineInstruction::NegateStatement),
+
+                constants::DW_LNS_set_basic_block => Ok(LineInstruction::SetBasicBlock),
+
+                constants::DW_LNS_const_add_pc => Ok(LineInstruction::ConstAddPc),
+
+                constants::DW_LNS_fixed_advance_pc => {
+                    let advance = input.read_u16()?;
+                    Ok(LineInstruction::FixedAddPc(advance))
+                }
+
+                constants::DW_LNS_set_prologue_end => Ok(LineInstruction::SetPrologueEnd),
+
+                constants::DW_LNS_set_epilogue_begin => Ok(LineInstruction::SetEpilogueBegin),
+
+                constants::DW_LNS_set_isa => {
+                    let isa = input.read_uleb128()?;
+                    Ok(LineInstruction::SetIsa(isa))
+                }
+
+                otherwise => {
+                    let mut opcode_lengths = header.standard_opcode_lengths().clone();
+                    opcode_lengths.skip(R::Offset::from_u8(opcode - 1))?;
+                    let num_args = opcode_lengths.read_u8()? as usize;
+                    match num_args {
+                        0 => Ok(LineInstruction::UnknownStandard0(otherwise)),
+                        1 => {
+                            let arg = input.read_uleb128()?;
+                            Ok(LineInstruction::UnknownStandard1(otherwise, arg))
+                        }
+                        _ => {
+                            let mut args = input.clone();
+                            for _ in 0..num_args {
+                                input.read_uleb128()?;
+                            }
+                            let len = input.offset_from(&args);
+                            args.truncate(len)?;
+                            Ok(LineInstruction::UnknownStandardN(otherwise, args))
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+impl<R, Offset> fmt::Display for LineInstruction<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> {
+        match *self {
+            LineInstruction::Special(opcode) => write!(f, "Special opcode {}", opcode),
+            LineInstruction::Copy => write!(f, "{}", constants::DW_LNS_copy),
+            LineInstruction::AdvancePc(advance) => {
+                write!(f, "{} by {}", constants::DW_LNS_advance_pc, advance)
+            }
+            LineInstruction::AdvanceLine(increment) => {
+                write!(f, "{} by {}", constants::DW_LNS_advance_line, increment)
+            }
+            LineInstruction::SetFile(file) => {
+                write!(f, "{} to {}", constants::DW_LNS_set_file, file)
+            }
+            LineInstruction::SetColumn(column) => {
+                write!(f, "{} to {}", constants::DW_LNS_set_column, column)
+            }
+            LineInstruction::NegateStatement => write!(f, "{}", constants::DW_LNS_negate_stmt),
+            LineInstruction::SetBasicBlock => write!(f, "{}", constants::DW_LNS_set_basic_block),
+            LineInstruction::ConstAddPc => write!(f, "{}", constants::DW_LNS_const_add_pc),
+            LineInstruction::FixedAddPc(advance) => {
+                write!(f, "{} by {}", constants::DW_LNS_fixed_advance_pc, advance)
+            }
+            LineInstruction::SetPrologueEnd => write!(f, "{}", constants::DW_LNS_set_prologue_end),
+            LineInstruction::SetEpilogueBegin => {
+                write!(f, "{}", constants::DW_LNS_set_epilogue_begin)
+            }
+            LineInstruction::SetIsa(isa) => write!(f, "{} to {}", constants::DW_LNS_set_isa, isa),
+            LineInstruction::UnknownStandard0(opcode) => write!(f, "Unknown {}", opcode),
+            LineInstruction::UnknownStandard1(opcode, arg) => {
+                write!(f, "Unknown {} with operand {}", opcode, arg)
+            }
+            LineInstruction::UnknownStandardN(opcode, ref args) => {
+                write!(f, "Unknown {} with operands {:?}", opcode, args)
+            }
+            LineInstruction::EndSequence => write!(f, "{}", constants::DW_LNE_end_sequence),
+            LineInstruction::SetAddress(address) => {
+                write!(f, "{} to {}", constants::DW_LNE_set_address, address)
+            }
+            LineInstruction::DefineFile(_) => write!(f, "{}", constants::DW_LNE_define_file),
+            LineInstruction::SetDiscriminator(discr) => {
+                write!(f, "{} to {}", constants::DW_LNE_set_discriminator, discr)
+            }
+            LineInstruction::UnknownExtended(opcode, _) => write!(f, "Unknown {}", opcode),
+        }
+    }
+}
+
+/// Deprecated. `OpcodesIter` has been renamed to `LineInstructions`.
+#[deprecated(note = "OpcodesIter has been renamed to LineInstructions, use that instead.")]
+pub type OpcodesIter<R> = LineInstructions<R>;
+
+/// An iterator yielding parsed instructions.
+///
+/// See
+/// [`LineProgramHeader::instructions`](./struct.LineProgramHeader.html#method.instructions)
+/// for more details.
+#[derive(Clone, Debug)]
+pub struct LineInstructions<R: Reader> {
+    input: R,
+}
+
+impl<R: Reader> LineInstructions<R> {
+    fn remove_trailing(&self, other: &LineInstructions<R>) -> Result<LineInstructions<R>> {
+        let offset = other.input.offset_from(&self.input);
+        let mut input = self.input.clone();
+        input.truncate(offset)?;
+        Ok(LineInstructions { input })
+    }
+}
+
+impl<R: Reader> LineInstructions<R> {
+    /// Advance the iterator and return the next instruction.
+    ///
+    /// Returns the newly parsed instruction as `Ok(Some(instruction))`. Returns
+    /// `Ok(None)` when iteration is complete and all instructions have already been
+    /// parsed and yielded. If an error occurs while parsing the next attribute,
+    /// then this error is returned as `Err(e)`, and all subsequent calls return
+    /// `Ok(None)`.
+    ///
+    /// Unfortunately, the `header` parameter means that this cannot be a
+    /// `FallibleIterator`.
+    #[allow(clippy::inline_always)]
+    #[inline(always)]
+    pub fn next_instruction(
+        &mut self,
+        header: &LineProgramHeader<R>,
+    ) -> Result<Option<LineInstruction<R>>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        match LineInstruction::parse(header, &mut self.input) {
+            Ok(instruction) => Ok(Some(instruction)),
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+/// Deprecated. `LineNumberRow` has been renamed to `LineRow`.
+#[deprecated(note = "LineNumberRow has been renamed to LineRow, use that instead.")]
+pub type LineNumberRow = LineRow;
+
+/// A row in the line number program's resulting matrix.
+///
+/// Each row is a copy of the registers of the state machine, as defined in section 6.2.2.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct LineRow {
+    address: Wrapping<u64>,
+    op_index: Wrapping<u64>,
+    file: u64,
+    line: Wrapping<u64>,
+    column: u64,
+    is_stmt: bool,
+    basic_block: bool,
+    end_sequence: bool,
+    prologue_end: bool,
+    epilogue_begin: bool,
+    isa: u64,
+    discriminator: u64,
+}
+
+impl LineRow {
+    /// Create a line number row in the initial state for the given program.
+    pub fn new<R: Reader>(header: &LineProgramHeader<R>) -> Self {
+        LineRow {
+            // "At the beginning of each sequence within a line number program, the
+            // state of the registers is:" -- Section 6.2.2
+            address: Wrapping(0),
+            op_index: Wrapping(0),
+            file: 1,
+            line: Wrapping(1),
+            column: 0,
+            // "determined by default_is_stmt in the line number program header"
+            is_stmt: header.line_encoding.default_is_stmt,
+            basic_block: false,
+            end_sequence: false,
+            prologue_end: false,
+            epilogue_begin: false,
+            // "The isa value 0 specifies that the instruction set is the
+            // architecturally determined default instruction set. This may be fixed
+            // by the ABI, or it may be specified by other means, for example, by
+            // the object file description."
+            isa: 0,
+            discriminator: 0,
+        }
+    }
+
+    /// "The program-counter value corresponding to a machine instruction
+    /// generated by the compiler."
+    #[inline]
+    pub fn address(&self) -> u64 {
+        self.address.0
+    }
+
+    /// > An unsigned integer representing the index of an operation within a VLIW
+    /// > instruction. The index of the first operation is 0. For non-VLIW
+    /// > architectures, this register will always be 0.
+    /// >
+    /// > The address and op_index registers, taken together, form an operation
+    /// > pointer that can reference any individual operation with the
+    /// > instruction stream.
+    #[inline]
+    pub fn op_index(&self) -> u64 {
+        self.op_index.0
+    }
+
+    /// "An unsigned integer indicating the identity of the source file
+    /// corresponding to a machine instruction."
+    #[inline]
+    pub fn file_index(&self) -> u64 {
+        self.file
+    }
+
+    /// The source file corresponding to the current machine instruction.
+    #[inline]
+    pub fn file<'header, R: Reader>(
+        &self,
+        header: &'header LineProgramHeader<R>,
+    ) -> Option<&'header FileEntry<R>> {
+        header.file(self.file)
+    }
+
+    /// "An unsigned integer indicating a source line number. Lines are numbered
+    /// beginning at 1. The compiler may emit the value 0 in cases where an
+    /// instruction cannot be attributed to any source line."
+    /// Line number values of 0 are represented as `None`.
+    #[inline]
+    pub fn line(&self) -> Option<NonZeroU64> {
+        NonZeroU64::new(self.line.0)
+    }
+
+    /// "An unsigned integer indicating a column number within a source
+    /// line. Columns are numbered beginning at 1. The value 0 is reserved to
+    /// indicate that a statement begins at the “left edge� of the line."
+    #[inline]
+    pub fn column(&self) -> ColumnType {
+        NonZeroU64::new(self.column)
+            .map(ColumnType::Column)
+            .unwrap_or(ColumnType::LeftEdge)
+    }
+
+    /// "A boolean indicating that the current instruction is a recommended
+    /// breakpoint location. A recommended breakpoint location is intended to
+    /// “represent� a line, a statement and/or a semantically distinct subpart
+    /// of a statement."
+    #[inline]
+    pub fn is_stmt(&self) -> bool {
+        self.is_stmt
+    }
+
+    /// "A boolean indicating that the current instruction is the beginning of a
+    /// basic block."
+    #[inline]
+    pub fn basic_block(&self) -> bool {
+        self.basic_block
+    }
+
+    /// "A boolean indicating that the current address is that of the first byte
+    /// after the end of a sequence of target machine instructions. end_sequence
+    /// terminates a sequence of lines; therefore other information in the same
+    /// row is not meaningful."
+    #[inline]
+    pub fn end_sequence(&self) -> bool {
+        self.end_sequence
+    }
+
+    /// "A boolean indicating that the current address is one (of possibly many)
+    /// where execution should be suspended for an entry breakpoint of a
+    /// function."
+    #[inline]
+    pub fn prologue_end(&self) -> bool {
+        self.prologue_end
+    }
+
+    /// "A boolean indicating that the current address is one (of possibly many)
+    /// where execution should be suspended for an exit breakpoint of a
+    /// function."
+    #[inline]
+    pub fn epilogue_begin(&self) -> bool {
+        self.epilogue_begin
+    }
+
+    /// Tag for the current instruction set architecture.
+    ///
+    /// > An unsigned integer whose value encodes the applicable instruction set
+    /// > architecture for the current instruction.
+    /// >
+    /// > The encoding of instruction sets should be shared by all users of a
+    /// > given architecture. It is recommended that this encoding be defined by
+    /// > the ABI authoring committee for each architecture.
+    #[inline]
+    pub fn isa(&self) -> u64 {
+        self.isa
+    }
+
+    /// "An unsigned integer identifying the block to which the current
+    /// instruction belongs. Discriminator values are assigned arbitrarily by
+    /// the DWARF producer and serve to distinguish among multiple blocks that
+    /// may all be associated with the same source file, line, and column. Where
+    /// only one block exists for a given source position, the discriminator
+    /// value should be zero."
+    #[inline]
+    pub fn discriminator(&self) -> u64 {
+        self.discriminator
+    }
+
+    /// Execute the given instruction, and return true if a new row in the
+    /// line number matrix needs to be generated.
+    ///
+    /// Unknown opcodes are treated as no-ops.
+    #[inline]
+    pub fn execute<R, Program>(
+        &mut self,
+        instruction: LineInstruction<R>,
+        program: &mut Program,
+    ) -> bool
+    where
+        Program: LineProgram<R>,
+        R: Reader,
+    {
+        match instruction {
+            LineInstruction::Special(opcode) => {
+                self.exec_special_opcode(opcode, program.header());
+                true
+            }
+
+            LineInstruction::Copy => true,
+
+            LineInstruction::AdvancePc(operation_advance) => {
+                self.apply_operation_advance(operation_advance, program.header());
+                false
+            }
+
+            LineInstruction::AdvanceLine(line_increment) => {
+                self.apply_line_advance(line_increment);
+                false
+            }
+
+            LineInstruction::SetFile(file) => {
+                self.file = file;
+                false
+            }
+
+            LineInstruction::SetColumn(column) => {
+                self.column = column;
+                false
+            }
+
+            LineInstruction::NegateStatement => {
+                self.is_stmt = !self.is_stmt;
+                false
+            }
+
+            LineInstruction::SetBasicBlock => {
+                self.basic_block = true;
+                false
+            }
+
+            LineInstruction::ConstAddPc => {
+                let adjusted = self.adjust_opcode(255, program.header());
+                let operation_advance = adjusted / program.header().line_encoding.line_range;
+                self.apply_operation_advance(u64::from(operation_advance), program.header());
+                false
+            }
+
+            LineInstruction::FixedAddPc(operand) => {
+                self.address += Wrapping(u64::from(operand));
+                self.op_index.0 = 0;
+                false
+            }
+
+            LineInstruction::SetPrologueEnd => {
+                self.prologue_end = true;
+                false
+            }
+
+            LineInstruction::SetEpilogueBegin => {
+                self.epilogue_begin = true;
+                false
+            }
+
+            LineInstruction::SetIsa(isa) => {
+                self.isa = isa;
+                false
+            }
+
+            LineInstruction::EndSequence => {
+                self.end_sequence = true;
+                true
+            }
+
+            LineInstruction::SetAddress(address) => {
+                self.address.0 = address;
+                self.op_index.0 = 0;
+                false
+            }
+
+            LineInstruction::DefineFile(entry) => {
+                program.add_file(entry);
+                false
+            }
+
+            LineInstruction::SetDiscriminator(discriminator) => {
+                self.discriminator = discriminator;
+                false
+            }
+
+            // Compatibility with future opcodes.
+            LineInstruction::UnknownStandard0(_)
+            | LineInstruction::UnknownStandard1(_, _)
+            | LineInstruction::UnknownStandardN(_, _)
+            | LineInstruction::UnknownExtended(_, _) => false,
+        }
+    }
+
+    /// Perform any reset that was required after copying the previous row.
+    #[inline]
+    pub fn reset<R: Reader>(&mut self, header: &LineProgramHeader<R>) {
+        if self.end_sequence {
+            // Previous instruction was EndSequence, so reset everything
+            // as specified in Section 6.2.5.3.
+            *self = Self::new(header);
+        } else {
+            // Previous instruction was one of:
+            // - Special - specified in Section 6.2.5.1, steps 4-7
+            // - Copy - specified in Section 6.2.5.2
+            // The reset behaviour is the same in both cases.
+            self.discriminator = 0;
+            self.basic_block = false;
+            self.prologue_end = false;
+            self.epilogue_begin = false;
+        }
+    }
+
+    /// Step 1 of section 6.2.5.1
+    fn apply_line_advance(&mut self, line_increment: i64) {
+        if line_increment < 0 {
+            let decrement = -line_increment as u64;
+            if decrement <= self.line.0 {
+                self.line.0 -= decrement;
+            } else {
+                self.line.0 = 0;
+            }
+        } else {
+            self.line += Wrapping(line_increment as u64);
+        }
+    }
+
+    /// Step 2 of section 6.2.5.1
+    fn apply_operation_advance<R: Reader>(
+        &mut self,
+        operation_advance: u64,
+        header: &LineProgramHeader<R>,
+    ) {
+        let operation_advance = Wrapping(operation_advance);
+
+        let minimum_instruction_length = u64::from(header.line_encoding.minimum_instruction_length);
+        let minimum_instruction_length = Wrapping(minimum_instruction_length);
+
+        let maximum_operations_per_instruction =
+            u64::from(header.line_encoding.maximum_operations_per_instruction);
+        let maximum_operations_per_instruction = Wrapping(maximum_operations_per_instruction);
+
+        if maximum_operations_per_instruction.0 == 1 {
+            self.address += minimum_instruction_length * operation_advance;
+            self.op_index.0 = 0;
+        } else {
+            let op_index_with_advance = self.op_index + operation_advance;
+            self.address += minimum_instruction_length
+                * (op_index_with_advance / maximum_operations_per_instruction);
+            self.op_index = op_index_with_advance % maximum_operations_per_instruction;
+        }
+    }
+
+    #[inline]
+    fn adjust_opcode<R: Reader>(&self, opcode: u8, header: &LineProgramHeader<R>) -> u8 {
+        opcode - header.opcode_base
+    }
+
+    /// Section 6.2.5.1
+    fn exec_special_opcode<R: Reader>(&mut self, opcode: u8, header: &LineProgramHeader<R>) {
+        let adjusted_opcode = self.adjust_opcode(opcode, header);
+
+        let line_range = header.line_encoding.line_range;
+        let line_advance = adjusted_opcode % line_range;
+        let operation_advance = adjusted_opcode / line_range;
+
+        // Step 1
+        let line_base = i64::from(header.line_encoding.line_base);
+        self.apply_line_advance(line_base + i64::from(line_advance));
+
+        // Step 2
+        self.apply_operation_advance(u64::from(operation_advance), header);
+    }
+}
+
+/// The type of column that a row is referring to.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum ColumnType {
+    /// The `LeftEdge` means that the statement begins at the start of the new
+    /// line.
+    LeftEdge,
+    /// A column number, whose range begins at 1.
+    Column(NonZeroU64),
+}
+
+/// Deprecated. `LineNumberSequence` has been renamed to `LineSequence`.
+#[deprecated(note = "LineNumberSequence has been renamed to LineSequence, use that instead.")]
+pub type LineNumberSequence<R> = LineSequence<R>;
+
+/// A sequence within a line number program.  A sequence, as defined in section
+/// 6.2.5 of the standard, is a linear subset of a line number program within
+/// which addresses are monotonically increasing.
+#[derive(Clone, Debug)]
+pub struct LineSequence<R: Reader> {
+    /// The first address that is covered by this sequence within the line number
+    /// program.
+    pub start: u64,
+    /// The first address that is *not* covered by this sequence within the line
+    /// number program.
+    pub end: u64,
+    instructions: LineInstructions<R>,
+}
+
+/// Deprecated. `LineNumberProgramHeader` has been renamed to `LineProgramHeader`.
+#[deprecated(
+    note = "LineNumberProgramHeader has been renamed to LineProgramHeader, use that instead."
+)]
+pub type LineNumberProgramHeader<R, Offset> = LineProgramHeader<R, Offset>;
+
+/// A header for a line number program in the `.debug_line` section, as defined
+/// in section 6.2.4 of the standard.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct LineProgramHeader<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    encoding: Encoding,
+    offset: DebugLineOffset<Offset>,
+    unit_length: Offset,
+
+    header_length: Offset,
+
+    line_encoding: LineEncoding,
+
+    /// "The number assigned to the first special opcode."
+    opcode_base: u8,
+
+    /// "This array specifies the number of LEB128 operands for each of the
+    /// standard opcodes. The first element of the array corresponds to the
+    /// opcode whose value is 1, and the last element corresponds to the opcode
+    /// whose value is `opcode_base - 1`."
+    standard_opcode_lengths: R,
+
+    /// "A sequence of directory entry format descriptions."
+    directory_entry_format: Vec<FileEntryFormat>,
+
+    /// > Entries in this sequence describe each path that was searched for
+    /// > included source files in this compilation. (The paths include those
+    /// > directories specified explicitly by the user for the compiler to search
+    /// > and those the compiler searches without explicit direction.) Each path
+    /// > entry is either a full path name or is relative to the current directory
+    /// > of the compilation.
+    /// >
+    /// > The last entry is followed by a single null byte.
+    include_directories: Vec<AttributeValue<R, Offset>>,
+
+    /// "A sequence of file entry format descriptions."
+    file_name_entry_format: Vec<FileEntryFormat>,
+
+    /// "Entries in this sequence describe source files that contribute to the
+    /// line number information for this compilation unit or is used in other
+    /// contexts."
+    file_names: Vec<FileEntry<R, Offset>>,
+
+    /// The encoded line program instructions.
+    program_buf: R,
+
+    /// The current directory of the compilation.
+    comp_dir: Option<R>,
+
+    /// The primary source file.
+    comp_file: Option<FileEntry<R, Offset>>,
+}
+
+impl<R, Offset> LineProgramHeader<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Return the offset of the line number program header in the `.debug_line` section.
+    pub fn offset(&self) -> DebugLineOffset<R::Offset> {
+        self.offset
+    }
+
+    /// Return the length of the line number program and header, not including
+    /// the length of the encoded length itself.
+    pub fn unit_length(&self) -> R::Offset {
+        self.unit_length
+    }
+
+    /// Return the encoding parameters for this header's line program.
+    pub fn encoding(&self) -> Encoding {
+        self.encoding
+    }
+
+    /// Get the version of this header's line program.
+    pub fn version(&self) -> u16 {
+        self.encoding.version
+    }
+
+    /// Get the length of the encoded line number program header, not including
+    /// the length of the encoded length itself.
+    pub fn header_length(&self) -> R::Offset {
+        self.header_length
+    }
+
+    /// Get the size in bytes of a target machine address.
+    pub fn address_size(&self) -> u8 {
+        self.encoding.address_size
+    }
+
+    /// Whether this line program is encoded in 64- or 32-bit DWARF.
+    pub fn format(&self) -> Format {
+        self.encoding.format
+    }
+
+    /// Get the line encoding parameters for this header's line program.
+    pub fn line_encoding(&self) -> LineEncoding {
+        self.line_encoding
+    }
+
+    /// Get the minimum instruction length any instruction in this header's line
+    /// program may have.
+    pub fn minimum_instruction_length(&self) -> u8 {
+        self.line_encoding.minimum_instruction_length
+    }
+
+    /// Get the maximum number of operations each instruction in this header's
+    /// line program may have.
+    pub fn maximum_operations_per_instruction(&self) -> u8 {
+        self.line_encoding.maximum_operations_per_instruction
+    }
+
+    /// Get the default value of the `is_stmt` register for this header's line
+    /// program.
+    pub fn default_is_stmt(&self) -> bool {
+        self.line_encoding.default_is_stmt
+    }
+
+    /// Get the line base for this header's line program.
+    pub fn line_base(&self) -> i8 {
+        self.line_encoding.line_base
+    }
+
+    /// Get the line range for this header's line program.
+    pub fn line_range(&self) -> u8 {
+        self.line_encoding.line_range
+    }
+
+    /// Get opcode base for this header's line program.
+    pub fn opcode_base(&self) -> u8 {
+        self.opcode_base
+    }
+
+    /// An array of `u8` that specifies the number of LEB128 operands for
+    /// each of the standard opcodes.
+    pub fn standard_opcode_lengths(&self) -> &R {
+        &self.standard_opcode_lengths
+    }
+
+    /// Get the format of a directory entry.
+    pub fn directory_entry_format(&self) -> &[FileEntryFormat] {
+        &self.directory_entry_format[..]
+    }
+
+    /// Get the set of include directories for this header's line program.
+    ///
+    /// For DWARF version <= 4, the compilation's current directory is not included
+    /// in the return value, but is implicitly considered to be in the set per spec.
+    pub fn include_directories(&self) -> &[AttributeValue<R, Offset>] {
+        &self.include_directories[..]
+    }
+
+    /// The include directory with the given directory index.
+    ///
+    /// A directory index of 0 corresponds to the compilation unit directory.
+    pub fn directory(&self, directory: u64) -> Option<AttributeValue<R, Offset>> {
+        if self.encoding.version <= 4 {
+            if directory == 0 {
+                self.comp_dir.clone().map(AttributeValue::String)
+            } else {
+                let directory = directory as usize - 1;
+                self.include_directories.get(directory).cloned()
+            }
+        } else {
+            self.include_directories.get(directory as usize).cloned()
+        }
+    }
+
+    /// Get the format of a file name entry.
+    pub fn file_name_entry_format(&self) -> &[FileEntryFormat] {
+        &self.file_name_entry_format[..]
+    }
+
+    /// Return true if the file entries may have valid timestamps.
+    ///
+    /// Only returns false if we definitely know that all timestamp fields
+    /// are invalid.
+    pub fn file_has_timestamp(&self) -> bool {
+        self.encoding.version <= 4
+            || self
+                .file_name_entry_format
+                .iter()
+                .any(|x| x.content_type == constants::DW_LNCT_timestamp)
+    }
+
+    /// Return true if the file entries may have valid sizes.
+    ///
+    /// Only returns false if we definitely know that all size fields
+    /// are invalid.
+    pub fn file_has_size(&self) -> bool {
+        self.encoding.version <= 4
+            || self
+                .file_name_entry_format
+                .iter()
+                .any(|x| x.content_type == constants::DW_LNCT_size)
+    }
+
+    /// Return true if the file name entry format contains an MD5 field.
+    pub fn file_has_md5(&self) -> bool {
+        self.file_name_entry_format
+            .iter()
+            .any(|x| x.content_type == constants::DW_LNCT_MD5)
+    }
+
+    /// Get the list of source files that appear in this header's line program.
+    pub fn file_names(&self) -> &[FileEntry<R, Offset>] {
+        &self.file_names[..]
+    }
+
+    /// The source file with the given file index.
+    ///
+    /// A file index of 0 corresponds to the compilation unit file.
+    /// Note that a file index of 0 is invalid for DWARF version <= 4,
+    /// but we support it anyway.
+    pub fn file(&self, file: u64) -> Option<&FileEntry<R, Offset>> {
+        if self.encoding.version <= 4 {
+            if file == 0 {
+                self.comp_file.as_ref()
+            } else {
+                let file = file as usize - 1;
+                self.file_names.get(file)
+            }
+        } else {
+            self.file_names.get(file as usize)
+        }
+    }
+
+    /// Get the raw, un-parsed `EndianSlice` containing this header's line number
+    /// program.
+    ///
+    /// ```
+    /// # fn foo() {
+    /// use gimli::{LineProgramHeader, EndianSlice, NativeEndian};
+    ///
+    /// fn get_line_number_program_header<'a>() -> LineProgramHeader<EndianSlice<'a, NativeEndian>> {
+    ///     // Get a line number program header from some offset in a
+    ///     // `.debug_line` section...
+    /// #   unimplemented!()
+    /// }
+    ///
+    /// let header = get_line_number_program_header();
+    /// let raw_program = header.raw_program_buf();
+    /// println!("The length of the raw program in bytes is {}", raw_program.len());
+    /// # }
+    /// ```
+    pub fn raw_program_buf(&self) -> R {
+        self.program_buf.clone()
+    }
+
+    /// Iterate over the instructions in this header's line number program, parsing
+    /// them as we go.
+    pub fn instructions(&self) -> LineInstructions<R> {
+        LineInstructions {
+            input: self.program_buf.clone(),
+        }
+    }
+
+    fn parse(
+        input: &mut R,
+        offset: DebugLineOffset<Offset>,
+        mut address_size: u8,
+        mut comp_dir: Option<R>,
+        comp_name: Option<R>,
+    ) -> Result<LineProgramHeader<R, Offset>> {
+        let (unit_length, format) = input.read_initial_length()?;
+        let rest = &mut input.split(unit_length)?;
+
+        let version = rest.read_u16()?;
+        if version < 2 || version > 5 {
+            return Err(Error::UnknownVersion(u64::from(version)));
+        }
+
+        if version >= 5 {
+            address_size = rest.read_u8()?;
+            let segment_selector_size = rest.read_u8()?;
+            if segment_selector_size != 0 {
+                return Err(Error::UnsupportedSegmentSize);
+            }
+        }
+
+        let encoding = Encoding {
+            format,
+            version,
+            address_size,
+        };
+
+        let header_length = rest.read_length(format)?;
+
+        let mut program_buf = rest.clone();
+        program_buf.skip(header_length)?;
+        rest.truncate(header_length)?;
+
+        let minimum_instruction_length = rest.read_u8()?;
+        if minimum_instruction_length == 0 {
+            return Err(Error::MinimumInstructionLengthZero);
+        }
+
+        // This field did not exist before DWARF 4, but is specified to be 1 for
+        // non-VLIW architectures, which makes it a no-op.
+        let maximum_operations_per_instruction = if version >= 4 { rest.read_u8()? } else { 1 };
+        if maximum_operations_per_instruction == 0 {
+            return Err(Error::MaximumOperationsPerInstructionZero);
+        }
+
+        let default_is_stmt = rest.read_u8()? != 0;
+        let line_base = rest.read_i8()?;
+        let line_range = rest.read_u8()?;
+        if line_range == 0 {
+            return Err(Error::LineRangeZero);
+        }
+        let line_encoding = LineEncoding {
+            minimum_instruction_length,
+            maximum_operations_per_instruction,
+            default_is_stmt,
+            line_base,
+            line_range,
+        };
+
+        let opcode_base = rest.read_u8()?;
+        if opcode_base == 0 {
+            return Err(Error::OpcodeBaseZero);
+        }
+
+        let standard_opcode_count = R::Offset::from_u8(opcode_base - 1);
+        let standard_opcode_lengths = rest.split(standard_opcode_count)?;
+
+        let directory_entry_format;
+        let mut include_directories = Vec::new();
+        if version <= 4 {
+            directory_entry_format = Vec::new();
+            loop {
+                let directory = rest.read_null_terminated_slice()?;
+                if directory.is_empty() {
+                    break;
+                }
+                include_directories.push(AttributeValue::String(directory));
+            }
+        } else {
+            comp_dir = None;
+            directory_entry_format = FileEntryFormat::parse(rest)?;
+            let count = rest.read_uleb128()?;
+            for _ in 0..count {
+                include_directories.push(parse_directory_v5(
+                    rest,
+                    encoding,
+                    &directory_entry_format,
+                )?);
+            }
+        }
+
+        let comp_file;
+        let file_name_entry_format;
+        let mut file_names = Vec::new();
+        if version <= 4 {
+            comp_file = comp_name.map(|name| FileEntry {
+                path_name: AttributeValue::String(name),
+                directory_index: 0,
+                timestamp: 0,
+                size: 0,
+                md5: [0; 16],
+            });
+
+            file_name_entry_format = Vec::new();
+            loop {
+                let path_name = rest.read_null_terminated_slice()?;
+                if path_name.is_empty() {
+                    break;
+                }
+                file_names.push(FileEntry::parse(rest, path_name)?);
+            }
+        } else {
+            comp_file = None;
+            file_name_entry_format = FileEntryFormat::parse(rest)?;
+            let count = rest.read_uleb128()?;
+            for _ in 0..count {
+                file_names.push(parse_file_v5(rest, encoding, &file_name_entry_format)?);
+            }
+        }
+
+        let header = LineProgramHeader {
+            encoding,
+            offset,
+            unit_length,
+            header_length,
+            line_encoding,
+            opcode_base,
+            standard_opcode_lengths,
+            directory_entry_format,
+            include_directories,
+            file_name_entry_format,
+            file_names,
+            program_buf,
+            comp_dir,
+            comp_file,
+        };
+        Ok(header)
+    }
+}
+
+/// Deprecated. `IncompleteLineNumberProgram` has been renamed to `IncompleteLineProgram`.
+#[deprecated(
+    note = "IncompleteLineNumberProgram has been renamed to IncompleteLineProgram, use that instead."
+)]
+pub type IncompleteLineNumberProgram<R, Offset> = IncompleteLineProgram<R, Offset>;
+
+/// A line number program that has not been run to completion.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct IncompleteLineProgram<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    header: LineProgramHeader<R, Offset>,
+}
+
+impl<R, Offset> IncompleteLineProgram<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Retrieve the `LineProgramHeader` for this program.
+    pub fn header(&self) -> &LineProgramHeader<R, Offset> {
+        &self.header
+    }
+
+    /// Construct a new `LineRows` for executing this program to iterate
+    /// over rows in the line information matrix.
+    pub fn rows(self) -> OneShotLineRows<R, Offset> {
+        OneShotLineRows::new(self)
+    }
+
+    /// Execute the line number program, completing the `IncompleteLineProgram`
+    /// into a `CompleteLineProgram` and producing an array of sequences within
+    /// the line number program that can later be used with
+    /// `CompleteLineProgram::resume_from`.
+    ///
+    /// ```
+    /// # fn foo() {
+    /// use gimli::{IncompleteLineProgram, EndianSlice, NativeEndian};
+    ///
+    /// fn get_line_number_program<'a>() -> IncompleteLineProgram<EndianSlice<'a, NativeEndian>> {
+    ///     // Get a line number program from some offset in a
+    ///     // `.debug_line` section...
+    /// #   unimplemented!()
+    /// }
+    ///
+    /// let program = get_line_number_program();
+    /// let (program, sequences) = program.sequences().unwrap();
+    /// println!("There are {} sequences in this line number program", sequences.len());
+    /// # }
+    /// ```
+    #[allow(clippy::type_complexity)]
+    pub fn sequences(self) -> Result<(CompleteLineProgram<R, Offset>, Vec<LineSequence<R>>)> {
+        let mut sequences = Vec::new();
+        let mut rows = self.rows();
+        let mut instructions = rows.instructions.clone();
+        let mut sequence_start_addr = None;
+        loop {
+            let sequence_end_addr;
+            if rows.next_row()?.is_none() {
+                break;
+            }
+
+            let row = &rows.row;
+            if row.end_sequence() {
+                sequence_end_addr = row.address();
+            } else if sequence_start_addr.is_none() {
+                sequence_start_addr = Some(row.address());
+                continue;
+            } else {
+                continue;
+            }
+
+            // We just finished a sequence.
+            sequences.push(LineSequence {
+                // In theory one could have multiple DW_LNE_end_sequence instructions
+                // in a row.
+                start: sequence_start_addr.unwrap_or(0),
+                end: sequence_end_addr,
+                instructions: instructions.remove_trailing(&rows.instructions)?,
+            });
+            sequence_start_addr = None;
+            instructions = rows.instructions.clone();
+        }
+
+        let program = CompleteLineProgram {
+            header: rows.program.header,
+        };
+        Ok((program, sequences))
+    }
+}
+
+/// Deprecated. `CompleteLineNumberProgram` has been renamed to `CompleteLineProgram`.
+#[deprecated(
+    note = "CompleteLineNumberProgram has been renamed to CompleteLineProgram, use that instead."
+)]
+pub type CompleteLineNumberProgram<R, Offset> = CompleteLineProgram<R, Offset>;
+
+/// A line number program that has previously been run to completion.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct CompleteLineProgram<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    header: LineProgramHeader<R, Offset>,
+}
+
+impl<R, Offset> CompleteLineProgram<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Retrieve the `LineProgramHeader` for this program.
+    pub fn header(&self) -> &LineProgramHeader<R, Offset> {
+        &self.header
+    }
+
+    /// Construct a new `LineRows` for executing the subset of the line
+    /// number program identified by 'sequence' and  generating the line information
+    /// matrix.
+    ///
+    /// ```
+    /// # fn foo() {
+    /// use gimli::{IncompleteLineProgram, EndianSlice, NativeEndian};
+    ///
+    /// fn get_line_number_program<'a>() -> IncompleteLineProgram<EndianSlice<'a, NativeEndian>> {
+    ///     // Get a line number program from some offset in a
+    ///     // `.debug_line` section...
+    /// #   unimplemented!()
+    /// }
+    ///
+    /// let program = get_line_number_program();
+    /// let (program, sequences) = program.sequences().unwrap();
+    /// for sequence in &sequences {
+    ///     let mut sm = program.resume_from(sequence);
+    /// }
+    /// # }
+    /// ```
+    pub fn resume_from<'program>(
+        &'program self,
+        sequence: &LineSequence<R>,
+    ) -> ResumedLineRows<'program, R, Offset> {
+        ResumedLineRows::resume(self, sequence)
+    }
+}
+
+/// An entry in the `LineProgramHeader`'s `file_names` set.
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct FileEntry<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    path_name: AttributeValue<R, Offset>,
+    directory_index: u64,
+    timestamp: u64,
+    size: u64,
+    md5: [u8; 16],
+}
+
+impl<R, Offset> FileEntry<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    // version 2-4
+    fn parse(input: &mut R, path_name: R) -> Result<FileEntry<R, Offset>> {
+        let directory_index = input.read_uleb128()?;
+        let timestamp = input.read_uleb128()?;
+        let size = input.read_uleb128()?;
+
+        let entry = FileEntry {
+            path_name: AttributeValue::String(path_name),
+            directory_index,
+            timestamp,
+            size,
+            md5: [0; 16],
+        };
+
+        Ok(entry)
+    }
+
+    /// > A slice containing the full or relative path name of
+    /// > a source file. If the entry contains a file name or a relative path
+    /// > name, the file is located relative to either the compilation directory
+    /// > (as specified by the DW_AT_comp_dir attribute given in the compilation
+    /// > unit) or one of the directories in the include_directories section.
+    pub fn path_name(&self) -> AttributeValue<R, Offset> {
+        self.path_name.clone()
+    }
+
+    /// > An unsigned LEB128 number representing the directory index of the
+    /// > directory in which the file was found.
+    /// >
+    /// > ...
+    /// >
+    /// > The directory index represents an entry in the include_directories
+    /// > section of the line number program header. The index is 0 if the file
+    /// > was found in the current directory of the compilation, 1 if it was found
+    /// > in the first directory in the include_directories section, and so
+    /// > on. The directory index is ignored for file names that represent full
+    /// > path names.
+    pub fn directory_index(&self) -> u64 {
+        self.directory_index
+    }
+
+    /// Get this file's directory.
+    ///
+    /// A directory index of 0 corresponds to the compilation unit directory.
+    pub fn directory(&self, header: &LineProgramHeader<R>) -> Option<AttributeValue<R, Offset>> {
+        header.directory(self.directory_index)
+    }
+
+    /// The implementation-defined time of last modification of the file,
+    /// or 0 if not available.
+    pub fn timestamp(&self) -> u64 {
+        self.timestamp
+    }
+
+    /// "An unsigned LEB128 number representing the time of last modification of
+    /// the file, or 0 if not available."
+    // Terminology changed in DWARF version 5.
+    #[doc(hidden)]
+    pub fn last_modification(&self) -> u64 {
+        self.timestamp
+    }
+
+    /// The size of the file in bytes, or 0 if not available.
+    pub fn size(&self) -> u64 {
+        self.size
+    }
+
+    /// "An unsigned LEB128 number representing the length in bytes of the file,
+    /// or 0 if not available."
+    // Terminology changed in DWARF version 5.
+    #[doc(hidden)]
+    pub fn length(&self) -> u64 {
+        self.size
+    }
+
+    /// A 16-byte MD5 digest of the file contents.
+    ///
+    /// Only valid if `LineProgramHeader::file_has_md5` returns `true`.
+    pub fn md5(&self) -> &[u8; 16] {
+        &self.md5
+    }
+}
+
+/// The format of a component of an include directory or file name entry.
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct FileEntryFormat {
+    /// The type of information that is represented by the component.
+    pub content_type: constants::DwLnct,
+
+    /// The encoding form of the component value.
+    pub form: constants::DwForm,
+}
+
+impl FileEntryFormat {
+    fn parse<R: Reader>(input: &mut R) -> Result<Vec<FileEntryFormat>> {
+        let format_count = input.read_u8()? as usize;
+        let mut format = Vec::with_capacity(format_count);
+        let mut path_count = 0;
+        for _ in 0..format_count {
+            let content_type = input.read_uleb128()?;
+            let content_type = if content_type > u64::from(u16::max_value()) {
+                constants::DwLnct(u16::max_value())
+            } else {
+                constants::DwLnct(content_type as u16)
+            };
+            if content_type == constants::DW_LNCT_path {
+                path_count += 1;
+            }
+
+            let form = constants::DwForm(input.read_uleb128_u16()?);
+
+            format.push(FileEntryFormat { content_type, form });
+        }
+        if path_count != 1 {
+            return Err(Error::MissingFileEntryFormatPath);
+        }
+        Ok(format)
+    }
+}
+
+fn parse_directory_v5<R: Reader>(
+    input: &mut R,
+    encoding: Encoding,
+    formats: &[FileEntryFormat],
+) -> Result<AttributeValue<R>> {
+    let mut path_name = None;
+
+    for format in formats {
+        let value = parse_attribute(input, encoding, format.form)?;
+        if format.content_type == constants::DW_LNCT_path {
+            path_name = Some(value);
+        }
+    }
+
+    Ok(path_name.unwrap())
+}
+
+fn parse_file_v5<R: Reader>(
+    input: &mut R,
+    encoding: Encoding,
+    formats: &[FileEntryFormat],
+) -> Result<FileEntry<R>> {
+    let mut path_name = None;
+    let mut directory_index = 0;
+    let mut timestamp = 0;
+    let mut size = 0;
+    let mut md5 = [0; 16];
+
+    for format in formats {
+        let value = parse_attribute(input, encoding, format.form)?;
+        match format.content_type {
+            constants::DW_LNCT_path => path_name = Some(value),
+            constants::DW_LNCT_directory_index => {
+                if let Some(value) = value.udata_value() {
+                    directory_index = value;
+                }
+            }
+            constants::DW_LNCT_timestamp => {
+                if let Some(value) = value.udata_value() {
+                    timestamp = value;
+                }
+            }
+            constants::DW_LNCT_size => {
+                if let Some(value) = value.udata_value() {
+                    size = value;
+                }
+            }
+            constants::DW_LNCT_MD5 => {
+                if let AttributeValue::Block(mut value) = value {
+                    if value.len().into_u64() == 16 {
+                        md5 = value.read_u8_array()?;
+                    }
+                }
+            }
+            // Ignore unknown content types.
+            _ => {}
+        }
+    }
+
+    Ok(FileEntry {
+        path_name: path_name.unwrap(),
+        directory_index,
+        timestamp,
+        size,
+        md5,
+    })
+}
+
+// TODO: this should be shared with unit::parse_attribute(), but that is hard to do.
+fn parse_attribute<R: Reader>(
+    input: &mut R,
+    encoding: Encoding,
+    form: constants::DwForm,
+) -> Result<AttributeValue<R>> {
+    Ok(match form {
+        constants::DW_FORM_block1 => {
+            let len = input.read_u8().map(R::Offset::from_u8)?;
+            let block = input.split(len)?;
+            AttributeValue::Block(block)
+        }
+        constants::DW_FORM_block2 => {
+            let len = input.read_u16().map(R::Offset::from_u16)?;
+            let block = input.split(len)?;
+            AttributeValue::Block(block)
+        }
+        constants::DW_FORM_block4 => {
+            let len = input.read_u32().map(R::Offset::from_u32)?;
+            let block = input.split(len)?;
+            AttributeValue::Block(block)
+        }
+        constants::DW_FORM_block => {
+            let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
+            let block = input.split(len)?;
+            AttributeValue::Block(block)
+        }
+        constants::DW_FORM_data1 => {
+            let data = input.read_u8()?;
+            AttributeValue::Data1(data)
+        }
+        constants::DW_FORM_data2 => {
+            let data = input.read_u16()?;
+            AttributeValue::Data2(data)
+        }
+        constants::DW_FORM_data4 => {
+            let data = input.read_u32()?;
+            AttributeValue::Data4(data)
+        }
+        constants::DW_FORM_data8 => {
+            let data = input.read_u64()?;
+            AttributeValue::Data8(data)
+        }
+        constants::DW_FORM_data16 => {
+            let block = input.split(R::Offset::from_u8(16))?;
+            AttributeValue::Block(block)
+        }
+        constants::DW_FORM_udata => {
+            let data = input.read_uleb128()?;
+            AttributeValue::Udata(data)
+        }
+        constants::DW_FORM_sdata => {
+            let data = input.read_sleb128()?;
+            AttributeValue::Sdata(data)
+        }
+        constants::DW_FORM_flag => {
+            let present = input.read_u8()?;
+            AttributeValue::Flag(present != 0)
+        }
+        constants::DW_FORM_sec_offset => {
+            let offset = input.read_offset(encoding.format)?;
+            AttributeValue::SecOffset(offset)
+        }
+        constants::DW_FORM_string => {
+            let string = input.read_null_terminated_slice()?;
+            AttributeValue::String(string)
+        }
+        constants::DW_FORM_strp => {
+            let offset = input.read_offset(encoding.format)?;
+            AttributeValue::DebugStrRef(DebugStrOffset(offset))
+        }
+        constants::DW_FORM_strp_sup | constants::DW_FORM_GNU_strp_alt => {
+            let offset = input.read_offset(encoding.format)?;
+            AttributeValue::DebugStrRefSup(DebugStrOffset(offset))
+        }
+        constants::DW_FORM_line_strp => {
+            let offset = input.read_offset(encoding.format)?;
+            AttributeValue::DebugLineStrRef(DebugLineStrOffset(offset))
+        }
+        constants::DW_FORM_strx | constants::DW_FORM_GNU_str_index => {
+            let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
+            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+        }
+        constants::DW_FORM_strx1 => {
+            let index = input.read_u8().map(R::Offset::from_u8)?;
+            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+        }
+        constants::DW_FORM_strx2 => {
+            let index = input.read_u16().map(R::Offset::from_u16)?;
+            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+        }
+        constants::DW_FORM_strx3 => {
+            let index = input.read_uint(3).and_then(R::Offset::from_u64)?;
+            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+        }
+        constants::DW_FORM_strx4 => {
+            let index = input.read_u32().map(R::Offset::from_u32)?;
+            AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+        }
+        _ => {
+            return Err(Error::UnknownForm);
+        }
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::constants;
+    use crate::endianity::LittleEndian;
+    use crate::read::{EndianSlice, Error};
+    use crate::test_util::GimliSectionMethods;
+    use core::u64;
+    use core::u8;
+    use test_assembler::{Endian, Label, LabelMaker, Section};
+
+    #[test]
+    fn test_parse_debug_line_32_ok() {
+        #[rustfmt::skip]
+        let buf = [
+            // 32-bit length = 62.
+            0x3e, 0x00, 0x00, 0x00,
+            // Version.
+            0x04, 0x00,
+            // Header length = 40.
+            0x28, 0x00, 0x00, 0x00,
+            // Minimum instruction length.
+            0x01,
+            // Maximum operations per byte.
+            0x01,
+            // Default is_stmt.
+            0x01,
+            // Line base.
+            0x00,
+            // Line range.
+            0x01,
+            // Opcode base.
+            0x03,
+            // Standard opcode lengths for opcodes 1 .. opcode base - 1.
+            0x01, 0x02,
+            // Include directories = '/', 'i', 'n', 'c', '\0', '/', 'i', 'n', 'c', '2', '\0', '\0'
+            0x2f, 0x69, 0x6e, 0x63, 0x00, 0x2f, 0x69, 0x6e, 0x63, 0x32, 0x00, 0x00,
+            // File names
+                // foo.rs
+                0x66, 0x6f, 0x6f, 0x2e, 0x72, 0x73, 0x00,
+                0x00,
+                0x00,
+                0x00,
+                // bar.h
+                0x62, 0x61, 0x72, 0x2e, 0x68, 0x00,
+                0x01,
+                0x00,
+                0x00,
+            // End file names.
+            0x00,
+
+            // Dummy line program data.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy next line program.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+        ];
+
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+        let comp_dir = EndianSlice::new(b"/comp_dir", LittleEndian);
+        let comp_name = EndianSlice::new(b"/comp_name", LittleEndian);
+
+        let header =
+            LineProgramHeader::parse(rest, DebugLineOffset(0), 4, Some(comp_dir), Some(comp_name))
+                .expect("should parse header ok");
+
+        assert_eq!(
+            *rest,
+            EndianSlice::new(&buf[buf.len() - 16..], LittleEndian)
+        );
+
+        assert_eq!(header.offset, DebugLineOffset(0));
+        assert_eq!(header.version(), 4);
+        assert_eq!(header.minimum_instruction_length(), 1);
+        assert_eq!(header.maximum_operations_per_instruction(), 1);
+        assert_eq!(header.default_is_stmt(), true);
+        assert_eq!(header.line_base(), 0);
+        assert_eq!(header.line_range(), 1);
+        assert_eq!(header.opcode_base(), 3);
+        assert_eq!(header.directory(0), Some(AttributeValue::String(comp_dir)));
+        assert_eq!(
+            header.file(0).unwrap().path_name,
+            AttributeValue::String(comp_name)
+        );
+
+        let expected_lengths = [1, 2];
+        assert_eq!(header.standard_opcode_lengths().slice(), &expected_lengths);
+
+        let expected_include_directories = [
+            AttributeValue::String(EndianSlice::new(b"/inc", LittleEndian)),
+            AttributeValue::String(EndianSlice::new(b"/inc2", LittleEndian)),
+        ];
+        assert_eq!(header.include_directories(), &expected_include_directories);
+
+        let expected_file_names = [
+            FileEntry {
+                path_name: AttributeValue::String(EndianSlice::new(b"foo.rs", LittleEndian)),
+                directory_index: 0,
+                timestamp: 0,
+                size: 0,
+                md5: [0; 16],
+            },
+            FileEntry {
+                path_name: AttributeValue::String(EndianSlice::new(b"bar.h", LittleEndian)),
+                directory_index: 1,
+                timestamp: 0,
+                size: 0,
+                md5: [0; 16],
+            },
+        ];
+        assert_eq!(&*header.file_names(), &expected_file_names);
+    }
+
+    #[test]
+    fn test_parse_debug_line_header_length_too_short() {
+        #[rustfmt::skip]
+        let buf = [
+            // 32-bit length = 62.
+            0x3e, 0x00, 0x00, 0x00,
+            // Version.
+            0x04, 0x00,
+            // Header length = 20. TOO SHORT!!!
+            0x15, 0x00, 0x00, 0x00,
+            // Minimum instruction length.
+            0x01,
+            // Maximum operations per byte.
+            0x01,
+            // Default is_stmt.
+            0x01,
+            // Line base.
+            0x00,
+            // Line range.
+            0x01,
+            // Opcode base.
+            0x03,
+            // Standard opcode lengths for opcodes 1 .. opcode base - 1.
+            0x01, 0x02,
+            // Include directories = '/', 'i', 'n', 'c', '\0', '/', 'i', 'n', 'c', '2', '\0', '\0'
+            0x2f, 0x69, 0x6e, 0x63, 0x00, 0x2f, 0x69, 0x6e, 0x63, 0x32, 0x00, 0x00,
+            // File names
+                // foo.rs
+                0x66, 0x6f, 0x6f, 0x2e, 0x72, 0x73, 0x00,
+                0x00,
+                0x00,
+                0x00,
+                // bar.h
+                0x62, 0x61, 0x72, 0x2e, 0x68, 0x00,
+                0x01,
+                0x00,
+                0x00,
+            // End file names.
+            0x00,
+
+            // Dummy line program data.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy next line program.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+        ];
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match LineProgramHeader::parse(input, DebugLineOffset(0), 4, None, None) {
+            Err(Error::UnexpectedEof(_)) => return,
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_parse_debug_line_unit_length_too_short() {
+        #[rustfmt::skip]
+        let buf = [
+            // 32-bit length = 40. TOO SHORT!!!
+            0x28, 0x00, 0x00, 0x00,
+            // Version.
+            0x04, 0x00,
+            // Header length = 40.
+            0x28, 0x00, 0x00, 0x00,
+            // Minimum instruction length.
+            0x01,
+            // Maximum operations per byte.
+            0x01,
+            // Default is_stmt.
+            0x01,
+            // Line base.
+            0x00,
+            // Line range.
+            0x01,
+            // Opcode base.
+            0x03,
+            // Standard opcode lengths for opcodes 1 .. opcode base - 1.
+            0x01, 0x02,
+            // Include directories = '/', 'i', 'n', 'c', '\0', '/', 'i', 'n', 'c', '2', '\0', '\0'
+            0x2f, 0x69, 0x6e, 0x63, 0x00, 0x2f, 0x69, 0x6e, 0x63, 0x32, 0x00, 0x00,
+            // File names
+                // foo.rs
+                0x66, 0x6f, 0x6f, 0x2e, 0x72, 0x73, 0x00,
+                0x00,
+                0x00,
+                0x00,
+                // bar.h
+                0x62, 0x61, 0x72, 0x2e, 0x68, 0x00,
+                0x01,
+                0x00,
+                0x00,
+            // End file names.
+            0x00,
+
+            // Dummy line program data.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+
+            // Dummy next line program.
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+        ];
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match LineProgramHeader::parse(input, DebugLineOffset(0), 4, None, None) {
+            Err(Error::UnexpectedEof(_)) => return,
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    const OPCODE_BASE: u8 = 13;
+    const STANDARD_OPCODE_LENGTHS: &[u8] = &[0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1];
+
+    fn make_test_header(
+        buf: EndianSlice<LittleEndian>,
+    ) -> LineProgramHeader<EndianSlice<LittleEndian>> {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 8,
+        };
+        let line_encoding = LineEncoding {
+            line_base: -3,
+            line_range: 12,
+            ..Default::default()
+        };
+        LineProgramHeader {
+            encoding,
+            offset: DebugLineOffset(0),
+            unit_length: 1,
+            header_length: 1,
+            line_encoding,
+            opcode_base: OPCODE_BASE,
+            standard_opcode_lengths: EndianSlice::new(STANDARD_OPCODE_LENGTHS, LittleEndian),
+            file_names: vec![
+                FileEntry {
+                    path_name: AttributeValue::String(EndianSlice::new(b"foo.c", LittleEndian)),
+                    directory_index: 0,
+                    timestamp: 0,
+                    size: 0,
+                    md5: [0; 16],
+                },
+                FileEntry {
+                    path_name: AttributeValue::String(EndianSlice::new(b"bar.rs", LittleEndian)),
+                    directory_index: 0,
+                    timestamp: 0,
+                    size: 0,
+                    md5: [0; 16],
+                },
+            ],
+            include_directories: vec![],
+            directory_entry_format: vec![],
+            file_name_entry_format: vec![],
+            program_buf: buf,
+            comp_dir: None,
+            comp_file: None,
+        }
+    }
+
+    fn make_test_program(
+        buf: EndianSlice<LittleEndian>,
+    ) -> IncompleteLineProgram<EndianSlice<LittleEndian>> {
+        IncompleteLineProgram {
+            header: make_test_header(buf),
+        }
+    }
+
+    #[test]
+    fn test_parse_special_opcodes() {
+        for i in OPCODE_BASE..u8::MAX {
+            let input = [i, 0, 0, 0];
+            let input = EndianSlice::new(&input, LittleEndian);
+            let header = make_test_header(input);
+
+            let mut rest = input;
+            let opcode =
+                LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
+
+            assert_eq!(*rest, *input.range_from(1..));
+            assert_eq!(opcode, LineInstruction::Special(i));
+        }
+    }
+
+    #[test]
+    fn test_parse_standard_opcodes() {
+        fn test<Operands>(
+            raw: constants::DwLns,
+            operands: Operands,
+            expected: LineInstruction<EndianSlice<LittleEndian>>,
+        ) where
+            Operands: AsRef<[u8]>,
+        {
+            let mut input = Vec::new();
+            input.push(raw.0);
+            input.extend_from_slice(operands.as_ref());
+
+            let expected_rest = [0, 1, 2, 3, 4];
+            input.extend_from_slice(&expected_rest);
+
+            let input = EndianSlice::new(&*input, LittleEndian);
+            let header = make_test_header(input);
+
+            let mut rest = input;
+            let opcode =
+                LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
+
+            assert_eq!(opcode, expected);
+            assert_eq!(*rest, expected_rest);
+        }
+
+        test(constants::DW_LNS_copy, [], LineInstruction::Copy);
+        test(
+            constants::DW_LNS_advance_pc,
+            [42],
+            LineInstruction::AdvancePc(42),
+        );
+        test(
+            constants::DW_LNS_advance_line,
+            [9],
+            LineInstruction::AdvanceLine(9),
+        );
+        test(constants::DW_LNS_set_file, [7], LineInstruction::SetFile(7));
+        test(
+            constants::DW_LNS_set_column,
+            [1],
+            LineInstruction::SetColumn(1),
+        );
+        test(
+            constants::DW_LNS_negate_stmt,
+            [],
+            LineInstruction::NegateStatement,
+        );
+        test(
+            constants::DW_LNS_set_basic_block,
+            [],
+            LineInstruction::SetBasicBlock,
+        );
+        test(
+            constants::DW_LNS_const_add_pc,
+            [],
+            LineInstruction::ConstAddPc,
+        );
+        test(
+            constants::DW_LNS_fixed_advance_pc,
+            [42, 0],
+            LineInstruction::FixedAddPc(42),
+        );
+        test(
+            constants::DW_LNS_set_prologue_end,
+            [],
+            LineInstruction::SetPrologueEnd,
+        );
+        test(
+            constants::DW_LNS_set_isa,
+            [57 + 0x80, 100],
+            LineInstruction::SetIsa(12857),
+        );
+    }
+
+    #[test]
+    fn test_parse_unknown_standard_opcode_no_args() {
+        let input = [OPCODE_BASE, 1, 2, 3];
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut standard_opcode_lengths = Vec::new();
+        let mut header = make_test_header(input);
+        standard_opcode_lengths.extend(header.standard_opcode_lengths.slice());
+        standard_opcode_lengths.push(0);
+        header.opcode_base += 1;
+        header.standard_opcode_lengths = EndianSlice::new(&standard_opcode_lengths, LittleEndian);
+
+        let mut rest = input;
+        let opcode =
+            LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
+
+        assert_eq!(
+            opcode,
+            LineInstruction::UnknownStandard0(constants::DwLns(OPCODE_BASE))
+        );
+        assert_eq!(*rest, *input.range_from(1..));
+    }
+
+    #[test]
+    fn test_parse_unknown_standard_opcode_one_arg() {
+        let input = [OPCODE_BASE, 1, 2, 3];
+        let input = EndianSlice::new(&input, LittleEndian);
+        let mut standard_opcode_lengths = Vec::new();
+        let mut header = make_test_header(input);
+        standard_opcode_lengths.extend(header.standard_opcode_lengths.slice());
+        standard_opcode_lengths.push(1);
+        header.opcode_base += 1;
+        header.standard_opcode_lengths = EndianSlice::new(&standard_opcode_lengths, LittleEndian);
+
+        let mut rest = input;
+        let opcode =
+            LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
+
+        assert_eq!(
+            opcode,
+            LineInstruction::UnknownStandard1(constants::DwLns(OPCODE_BASE), 1)
+        );
+        assert_eq!(*rest, *input.range_from(2..));
+    }
+
+    #[test]
+    fn test_parse_unknown_standard_opcode_many_args() {
+        let input = [OPCODE_BASE, 1, 2, 3];
+        let input = EndianSlice::new(&input, LittleEndian);
+        let args = EndianSlice::new(&input[1..], LittleEndian);
+        let mut standard_opcode_lengths = Vec::new();
+        let mut header = make_test_header(input);
+        standard_opcode_lengths.extend(header.standard_opcode_lengths.slice());
+        standard_opcode_lengths.push(3);
+        header.opcode_base += 1;
+        header.standard_opcode_lengths = EndianSlice::new(&standard_opcode_lengths, LittleEndian);
+
+        let mut rest = input;
+        let opcode =
+            LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
+
+        assert_eq!(
+            opcode,
+            LineInstruction::UnknownStandardN(constants::DwLns(OPCODE_BASE), args)
+        );
+        assert_eq!(*rest, []);
+    }
+
+    #[test]
+    fn test_parse_extended_opcodes() {
+        fn test<Operands>(
+            raw: constants::DwLne,
+            operands: Operands,
+            expected: LineInstruction<EndianSlice<LittleEndian>>,
+        ) where
+            Operands: AsRef<[u8]>,
+        {
+            let mut input = Vec::new();
+            input.push(0);
+
+            let operands = operands.as_ref();
+            input.push(1 + operands.len() as u8);
+
+            input.push(raw.0);
+            input.extend_from_slice(operands);
+
+            let expected_rest = [0, 1, 2, 3, 4];
+            input.extend_from_slice(&expected_rest);
+
+            let input = EndianSlice::new(&input, LittleEndian);
+            let header = make_test_header(input);
+
+            let mut rest = input;
+            let opcode =
+                LineInstruction::parse(&header, &mut rest).expect("Should parse the opcode OK");
+
+            assert_eq!(opcode, expected);
+            assert_eq!(*rest, expected_rest);
+        }
+
+        test(
+            constants::DW_LNE_end_sequence,
+            [],
+            LineInstruction::EndSequence,
+        );
+        test(
+            constants::DW_LNE_set_address,
+            [1, 2, 3, 4, 5, 6, 7, 8],
+            LineInstruction::SetAddress(578_437_695_752_307_201),
+        );
+        test(
+            constants::DW_LNE_set_discriminator,
+            [42],
+            LineInstruction::SetDiscriminator(42),
+        );
+
+        let mut file = Vec::new();
+        // "foo.c"
+        let path_name = [b'f', b'o', b'o', b'.', b'c', 0];
+        file.extend_from_slice(&path_name);
+        // Directory index.
+        file.push(0);
+        // Last modification of file.
+        file.push(1);
+        // Size of file.
+        file.push(2);
+
+        test(
+            constants::DW_LNE_define_file,
+            file,
+            LineInstruction::DefineFile(FileEntry {
+                path_name: AttributeValue::String(EndianSlice::new(b"foo.c", LittleEndian)),
+                directory_index: 0,
+                timestamp: 1,
+                size: 2,
+                md5: [0; 16],
+            }),
+        );
+
+        // Unknown extended opcode.
+        let operands = [1, 2, 3, 4, 5, 6];
+        let opcode = constants::DwLne(99);
+        test(
+            opcode,
+            operands,
+            LineInstruction::UnknownExtended(opcode, EndianSlice::new(&operands, LittleEndian)),
+        );
+    }
+
+    #[test]
+    fn test_file_entry_directory() {
+        let path_name = [b'f', b'o', b'o', b'.', b'r', b's', 0];
+
+        let mut file = FileEntry {
+            path_name: AttributeValue::String(EndianSlice::new(&path_name, LittleEndian)),
+            directory_index: 1,
+            timestamp: 0,
+            size: 0,
+            md5: [0; 16],
+        };
+
+        let mut header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let dir = AttributeValue::String(EndianSlice::new(b"dir", LittleEndian));
+        header.include_directories.push(dir);
+
+        assert_eq!(file.directory(&header), Some(dir));
+
+        // Now test the compilation's current directory.
+        file.directory_index = 0;
+        assert_eq!(file.directory(&header), None);
+    }
+
+    fn assert_exec_opcode<'input>(
+        header: LineProgramHeader<EndianSlice<'input, LittleEndian>>,
+        mut registers: LineRow,
+        opcode: LineInstruction<EndianSlice<'input, LittleEndian>>,
+        expected_registers: LineRow,
+        expect_new_row: bool,
+    ) {
+        let mut program = IncompleteLineProgram { header };
+        let is_new_row = registers.execute(opcode, &mut program);
+
+        assert_eq!(is_new_row, expect_new_row);
+        assert_eq!(registers, expected_registers);
+    }
+
+    #[test]
+    fn test_exec_special_noop() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::Special(16);
+        let expected_registers = initial_registers;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_special_negative_line_advance() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.line.0 = 10;
+
+        let opcode = LineInstruction::Special(13);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.line.0 -= 3;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_special_positive_line_advance() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let initial_registers = LineRow::new(&header);
+
+        let opcode = LineInstruction::Special(19);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.line.0 += 3;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_special_positive_address_advance() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let initial_registers = LineRow::new(&header);
+
+        let opcode = LineInstruction::Special(52);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.address.0 += 3;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_special_positive_address_and_line_advance() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let initial_registers = LineRow::new(&header);
+
+        let opcode = LineInstruction::Special(55);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.address.0 += 3;
+        expected_registers.line.0 += 3;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_special_positive_address_and_negative_line_advance() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.line.0 = 10;
+
+        let opcode = LineInstruction::Special(49);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.address.0 += 3;
+        expected_registers.line.0 -= 3;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_special_line_underflow() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.line.0 = 2;
+
+        // -3 line advance.
+        let opcode = LineInstruction::Special(13);
+
+        let mut expected_registers = initial_registers;
+        // Clamp at 0. No idea if this is the best way to handle this situation
+        // or not...
+        expected_registers.line.0 = 0;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_copy() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.address.0 = 1337;
+        initial_registers.line.0 = 42;
+
+        let opcode = LineInstruction::Copy;
+
+        let expected_registers = initial_registers;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_advance_pc() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::AdvancePc(42);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.address.0 += 42;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_advance_pc_overflow() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let opcode = LineInstruction::AdvancePc(42);
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.address.0 = u64::MAX;
+
+        let mut expected_registers = initial_registers;
+        expected_registers.address.0 = 41;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_advance_line() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::AdvanceLine(42);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.line.0 += 42;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_advance_line_overflow() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let opcode = LineInstruction::AdvanceLine(42);
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.line.0 = u64::MAX;
+
+        let mut expected_registers = initial_registers;
+        expected_registers.line.0 = 41;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_set_file_in_bounds() {
+        for file_idx in 1..3 {
+            let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+            let initial_registers = LineRow::new(&header);
+            let opcode = LineInstruction::SetFile(file_idx);
+
+            let mut expected_registers = initial_registers;
+            expected_registers.file = file_idx;
+
+            assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+        }
+    }
+
+    #[test]
+    fn test_exec_set_file_out_of_bounds() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::SetFile(100);
+
+        // The spec doesn't say anything about rejecting input programs
+        // that set the file register out of bounds of the actual number
+        // of files that have been defined. Instead, we cross our
+        // fingers and hope that one gets defined before
+        // `LineRow::file` gets called and handle the error at
+        // that time if need be.
+        let mut expected_registers = initial_registers;
+        expected_registers.file = 100;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_file_entry_file_index_out_of_bounds() {
+        // These indices are 1-based, so 0 is invalid. 100 is way more than the
+        // number of files defined in the header.
+        let out_of_bounds_indices = [0, 100];
+
+        for file_idx in &out_of_bounds_indices[..] {
+            let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+            let mut row = LineRow::new(&header);
+
+            row.file = *file_idx;
+
+            assert_eq!(row.file(&header), None);
+        }
+    }
+
+    #[test]
+    fn test_file_entry_file_index_in_bounds() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let mut row = LineRow::new(&header);
+
+        row.file = 2;
+
+        assert_eq!(row.file(&header), Some(&header.file_names()[1]));
+    }
+
+    #[test]
+    fn test_exec_set_column() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::SetColumn(42);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.column = 42;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_negate_statement() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::NegateStatement;
+
+        let mut expected_registers = initial_registers;
+        expected_registers.is_stmt = !initial_registers.is_stmt;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_set_basic_block() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.basic_block = false;
+
+        let opcode = LineInstruction::SetBasicBlock;
+
+        let mut expected_registers = initial_registers;
+        expected_registers.basic_block = true;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_const_add_pc() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::ConstAddPc;
+
+        let mut expected_registers = initial_registers;
+        expected_registers.address.0 += 20;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_fixed_add_pc() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.op_index.0 = 1;
+
+        let opcode = LineInstruction::FixedAddPc(10);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.address.0 += 10;
+        expected_registers.op_index.0 = 0;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_set_prologue_end() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+
+        let mut initial_registers = LineRow::new(&header);
+        initial_registers.prologue_end = false;
+
+        let opcode = LineInstruction::SetPrologueEnd;
+
+        let mut expected_registers = initial_registers;
+        expected_registers.prologue_end = true;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_set_isa() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::SetIsa(1993);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.isa = 1993;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_unknown_standard_0() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::UnknownStandard0(constants::DwLns(111));
+        let expected_registers = initial_registers;
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_unknown_standard_1() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::UnknownStandard1(constants::DwLns(111), 2);
+        let expected_registers = initial_registers;
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_unknown_standard_n() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::UnknownStandardN(
+            constants::DwLns(111),
+            EndianSlice::new(&[2, 2, 2], LittleEndian),
+        );
+        let expected_registers = initial_registers;
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_end_sequence() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::EndSequence;
+
+        let mut expected_registers = initial_registers;
+        expected_registers.end_sequence = true;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, true);
+    }
+
+    #[test]
+    fn test_exec_set_address() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::SetAddress(3030);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.address.0 = 3030;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_define_file() {
+        let mut program = make_test_program(EndianSlice::new(&[], LittleEndian));
+        let mut row = LineRow::new(program.header());
+
+        let file = FileEntry {
+            path_name: AttributeValue::String(EndianSlice::new(b"test.cpp", LittleEndian)),
+            directory_index: 0,
+            timestamp: 0,
+            size: 0,
+            md5: [0; 16],
+        };
+
+        let opcode = LineInstruction::DefineFile(file);
+        let is_new_row = row.execute(opcode, &mut program);
+
+        assert_eq!(is_new_row, false);
+        assert_eq!(Some(&file), program.header().file_names.last());
+    }
+
+    #[test]
+    fn test_exec_set_discriminator() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::SetDiscriminator(9);
+
+        let mut expected_registers = initial_registers;
+        expected_registers.discriminator = 9;
+
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    #[test]
+    fn test_exec_unknown_extended() {
+        let header = make_test_header(EndianSlice::new(&[], LittleEndian));
+        let initial_registers = LineRow::new(&header);
+        let opcode = LineInstruction::UnknownExtended(
+            constants::DwLne(74),
+            EndianSlice::new(&[], LittleEndian),
+        );
+        let expected_registers = initial_registers;
+        assert_exec_opcode(header, initial_registers, opcode, expected_registers, false);
+    }
+
+    /// Ensure that `LineRows<R,P>` is covariant wrt R.
+    /// This only needs to compile.
+    #[allow(dead_code, unreachable_code, unused_variables)]
+    fn test_line_rows_variance<'a, 'b>(_: &'a [u8], _: &'b [u8])
+    where
+        'a: 'b,
+    {
+        let a: &OneShotLineRows<EndianSlice<'a, LittleEndian>> = unimplemented!();
+        let _: &OneShotLineRows<EndianSlice<'b, LittleEndian>> = a;
+    }
+
+    #[test]
+    fn test_parse_debug_line_v5_ok() {
+        let expected_lengths = &[1, 2];
+        let expected_program = &[0, 1, 2, 3, 4];
+        let expected_rest = &[5, 6, 7, 8, 9];
+        let expected_include_directories = [
+            AttributeValue::String(EndianSlice::new(b"dir1", LittleEndian)),
+            AttributeValue::String(EndianSlice::new(b"dir2", LittleEndian)),
+        ];
+        let expected_file_names = [
+            FileEntry {
+                path_name: AttributeValue::String(EndianSlice::new(b"file1", LittleEndian)),
+                directory_index: 0,
+                timestamp: 0,
+                size: 0,
+                md5: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+            },
+            FileEntry {
+                path_name: AttributeValue::String(EndianSlice::new(b"file2", LittleEndian)),
+                directory_index: 1,
+                timestamp: 0,
+                size: 0,
+                md5: [
+                    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+                ],
+            },
+        ];
+
+        for format in vec![Format::Dwarf32, Format::Dwarf64] {
+            let length = Label::new();
+            let header_length = Label::new();
+            let start = Label::new();
+            let header_start = Label::new();
+            let end = Label::new();
+            let header_end = Label::new();
+            let section = Section::with_endian(Endian::Little)
+                .initial_length(format, &length, &start)
+                .D16(5)
+                // Address size.
+                .D8(4)
+                // Segment selector size.
+                .D8(0)
+                .word_label(format.word_size(), &header_length)
+                .mark(&header_start)
+                // Minimum instruction length.
+                .D8(1)
+                // Maximum operations per byte.
+                .D8(1)
+                // Default is_stmt.
+                .D8(1)
+                // Line base.
+                .D8(0)
+                // Line range.
+                .D8(1)
+                // Opcode base.
+                .D8(expected_lengths.len() as u8 + 1)
+                // Standard opcode lengths for opcodes 1 .. opcode base - 1.
+                .append_bytes(expected_lengths)
+                // Directory entry format count.
+                .D8(1)
+                .uleb(constants::DW_LNCT_path.0 as u64)
+                .uleb(constants::DW_FORM_string.0 as u64)
+                // Directory count.
+                .D8(2)
+                .append_bytes(b"dir1\0")
+                .append_bytes(b"dir2\0")
+                // File entry format count.
+                .D8(3)
+                .uleb(constants::DW_LNCT_path.0 as u64)
+                .uleb(constants::DW_FORM_string.0 as u64)
+                .uleb(constants::DW_LNCT_directory_index.0 as u64)
+                .uleb(constants::DW_FORM_data1.0 as u64)
+                .uleb(constants::DW_LNCT_MD5.0 as u64)
+                .uleb(constants::DW_FORM_data16.0 as u64)
+                // File count.
+                .D8(2)
+                .append_bytes(b"file1\0")
+                .D8(0)
+                .append_bytes(&expected_file_names[0].md5)
+                .append_bytes(b"file2\0")
+                .D8(1)
+                .append_bytes(&expected_file_names[1].md5)
+                .mark(&header_end)
+                // Dummy line program data.
+                .append_bytes(expected_program)
+                .mark(&end)
+                // Dummy trailing data.
+                .append_bytes(expected_rest);
+            length.set_const((&end - &start) as u64);
+            header_length.set_const((&header_end - &header_start) as u64);
+            let section = section.get_contents().unwrap();
+
+            let input = &mut EndianSlice::new(&section, LittleEndian);
+
+            let header = LineProgramHeader::parse(input, DebugLineOffset(0), 0, None, None)
+                .expect("should parse header ok");
+
+            assert_eq!(header.raw_program_buf().slice(), expected_program);
+            assert_eq!(input.slice(), expected_rest);
+
+            assert_eq!(header.offset, DebugLineOffset(0));
+            assert_eq!(header.version(), 5);
+            assert_eq!(header.address_size(), 4);
+            assert_eq!(header.minimum_instruction_length(), 1);
+            assert_eq!(header.maximum_operations_per_instruction(), 1);
+            assert_eq!(header.default_is_stmt(), true);
+            assert_eq!(header.line_base(), 0);
+            assert_eq!(header.line_range(), 1);
+            assert_eq!(header.opcode_base(), expected_lengths.len() as u8 + 1);
+            assert_eq!(header.standard_opcode_lengths().slice(), expected_lengths);
+            assert_eq!(
+                header.directory_entry_format(),
+                &[FileEntryFormat {
+                    content_type: constants::DW_LNCT_path,
+                    form: constants::DW_FORM_string,
+                }]
+            );
+            assert_eq!(header.include_directories(), expected_include_directories);
+            assert_eq!(header.directory(0), Some(expected_include_directories[0]));
+            assert_eq!(
+                header.file_name_entry_format(),
+                &[
+                    FileEntryFormat {
+                        content_type: constants::DW_LNCT_path,
+                        form: constants::DW_FORM_string,
+                    },
+                    FileEntryFormat {
+                        content_type: constants::DW_LNCT_directory_index,
+                        form: constants::DW_FORM_data1,
+                    },
+                    FileEntryFormat {
+                        content_type: constants::DW_LNCT_MD5,
+                        form: constants::DW_FORM_data16,
+                    }
+                ]
+            );
+            assert_eq!(header.file_names(), expected_file_names);
+            assert_eq!(header.file(0), Some(&expected_file_names[0]));
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/lists.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/lists.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/lists.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/lists.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,67 @@
+use crate::common::{Encoding, Format};
+use crate::read::{Error, Reader, Result};
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct ListsHeader {
+    encoding: Encoding,
+    offset_entry_count: u32,
+}
+
+impl Default for ListsHeader {
+    fn default() -> Self {
+        ListsHeader {
+            encoding: Encoding {
+                format: Format::Dwarf32,
+                version: 5,
+                address_size: 0,
+            },
+            offset_entry_count: 0,
+        }
+    }
+}
+
+impl ListsHeader {
+    /// Return the serialized size of the table header.
+    #[allow(dead_code)]
+    #[inline]
+    fn size(self) -> u8 {
+        // initial_length + version + address_size + segment_selector_size + offset_entry_count
+        ListsHeader::size_for_encoding(self.encoding)
+    }
+
+    /// Return the serialized size of the table header.
+    #[inline]
+    pub(crate) fn size_for_encoding(encoding: Encoding) -> u8 {
+        // initial_length + version + address_size + segment_selector_size + offset_entry_count
+        encoding.format.initial_length_size() + 2 + 1 + 1 + 4
+    }
+}
+
+// TODO: add an iterator over headers in the appropriate sections section
+#[allow(dead_code)]
+fn parse_header<R: Reader>(input: &mut R) -> Result<ListsHeader> {
+    let (length, format) = input.read_initial_length()?;
+    input.truncate(length)?;
+
+    let version = input.read_u16()?;
+    if version != 5 {
+        return Err(Error::UnknownVersion(u64::from(version)));
+    }
+
+    let address_size = input.read_u8()?;
+    let segment_selector_size = input.read_u8()?;
+    if segment_selector_size != 0 {
+        return Err(Error::UnsupportedSegmentSize);
+    }
+    let offset_entry_count = input.read_u32()?;
+
+    let encoding = Encoding {
+        format,
+        version,
+        address_size,
+    };
+    Ok(ListsHeader {
+        encoding,
+        offset_entry_count,
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/loclists.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/loclists.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/loclists.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/loclists.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1514 @@
+use crate::common::{
+    DebugAddrBase, DebugAddrIndex, DebugLocListsBase, DebugLocListsIndex, DwarfFileType, Encoding,
+    LocationListsOffset, SectionId,
+};
+use crate::constants;
+use crate::endianity::Endianity;
+use crate::read::{
+    lists::ListsHeader, DebugAddr, EndianSlice, Error, Expression, Range, RawRange, Reader,
+    ReaderOffset, ReaderOffsetId, Result, Section,
+};
+
+/// The raw contents of the `.debug_loc` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugLoc<R> {
+    pub(crate) section: R,
+}
+
+impl<'input, Endian> DebugLoc<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugLoc` instance from the data in the `.debug_loc`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_loc` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugLoc, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_loc_section_somehow = || &buf;
+    /// let debug_loc = DebugLoc::new(read_debug_loc_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(section, endian))
+    }
+}
+
+impl<R> Section<R> for DebugLoc<R> {
+    fn id() -> SectionId {
+        SectionId::DebugLoc
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R> From<R> for DebugLoc<R> {
+    fn from(section: R) -> Self {
+        DebugLoc { section }
+    }
+}
+
+/// The `DebugLocLists` struct represents the DWARF data
+/// found in the `.debug_loclists` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugLocLists<R> {
+    section: R,
+}
+
+impl<'input, Endian> DebugLocLists<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugLocLists` instance from the data in the `.debug_loclists`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_loclists` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugLocLists, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_loclists_section_somehow = || &buf;
+    /// let debug_loclists = DebugLocLists::new(read_debug_loclists_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(section, endian))
+    }
+}
+
+impl<R> Section<R> for DebugLocLists<R> {
+    fn id() -> SectionId {
+        SectionId::DebugLocLists
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R> From<R> for DebugLocLists<R> {
+    fn from(section: R) -> Self {
+        DebugLocLists { section }
+    }
+}
+
+pub(crate) type LocListsHeader = ListsHeader;
+
+impl<Offset> DebugLocListsBase<Offset>
+where
+    Offset: ReaderOffset,
+{
+    /// Returns a `DebugLocListsBase` with the default value of DW_AT_loclists_base
+    /// for the given `Encoding` and `DwarfFileType`.
+    pub fn default_for_encoding_and_file(
+        encoding: Encoding,
+        file_type: DwarfFileType,
+    ) -> DebugLocListsBase<Offset> {
+        if encoding.version >= 5 && file_type == DwarfFileType::Dwo {
+            // In .dwo files, the compiler omits the DW_AT_loclists_base attribute (because there is
+            // only a single unit in the file) but we must skip past the header, which the attribute
+            // would normally do for us.
+            DebugLocListsBase(Offset::from_u8(LocListsHeader::size_for_encoding(encoding)))
+        } else {
+            DebugLocListsBase(Offset::from_u8(0))
+        }
+    }
+}
+
+/// The DWARF data found in `.debug_loc` and `.debug_loclists` sections.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct LocationLists<R> {
+    debug_loc: DebugLoc<R>,
+    debug_loclists: DebugLocLists<R>,
+}
+
+impl<R> LocationLists<R> {
+    /// Construct a new `LocationLists` instance from the data in the `.debug_loc` and
+    /// `.debug_loclists` sections.
+    pub fn new(debug_loc: DebugLoc<R>, debug_loclists: DebugLocLists<R>) -> LocationLists<R> {
+        LocationLists {
+            debug_loc,
+            debug_loclists,
+        }
+    }
+}
+
+impl<T> LocationLists<T> {
+    /// Create a `LocationLists` that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::LocationLists<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> LocationLists<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        LocationLists {
+            debug_loc: borrow(&self.debug_loc.section).into(),
+            debug_loclists: borrow(&self.debug_loclists.section).into(),
+        }
+    }
+}
+
+impl<R: Reader> LocationLists<R> {
+    /// Iterate over the `LocationListEntry`s starting at the given offset.
+    ///
+    /// The `unit_encoding` must match the compilation unit that the
+    /// offset was contained in.
+    ///
+    /// The `base_address` should be obtained from the `DW_AT_low_pc` attribute in the
+    /// `DW_TAG_compile_unit` entry for the compilation unit that contains this location
+    /// list.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn locations(
+        &self,
+        offset: LocationListsOffset<R::Offset>,
+        unit_encoding: Encoding,
+        base_address: u64,
+        debug_addr: &DebugAddr<R>,
+        debug_addr_base: DebugAddrBase<R::Offset>,
+    ) -> Result<LocListIter<R>> {
+        Ok(LocListIter::new(
+            self.raw_locations(offset, unit_encoding)?,
+            base_address,
+            debug_addr.clone(),
+            debug_addr_base,
+        ))
+    }
+
+    /// Similar to `locations`, but with special handling for .dwo files.
+    /// This should only been used when this `LocationLists` was loaded from a
+    /// .dwo file.
+    pub fn locations_dwo(
+        &self,
+        offset: LocationListsOffset<R::Offset>,
+        unit_encoding: Encoding,
+        base_address: u64,
+        debug_addr: &DebugAddr<R>,
+        debug_addr_base: DebugAddrBase<R::Offset>,
+    ) -> Result<LocListIter<R>> {
+        Ok(LocListIter::new(
+            self.raw_locations_dwo(offset, unit_encoding)?,
+            base_address,
+            debug_addr.clone(),
+            debug_addr_base,
+        ))
+    }
+
+    /// Iterate over the raw `LocationListEntry`s starting at the given offset.
+    ///
+    /// The `unit_encoding` must match the compilation unit that the
+    /// offset was contained in.
+    ///
+    /// This iterator does not perform any processing of the location entries,
+    /// such as handling base addresses.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn raw_locations(
+        &self,
+        offset: LocationListsOffset<R::Offset>,
+        unit_encoding: Encoding,
+    ) -> Result<RawLocListIter<R>> {
+        let (mut input, format) = if unit_encoding.version <= 4 {
+            (self.debug_loc.section.clone(), LocListsFormat::Bare)
+        } else {
+            (self.debug_loclists.section.clone(), LocListsFormat::LLE)
+        };
+        input.skip(offset.0)?;
+        Ok(RawLocListIter::new(input, unit_encoding, format))
+    }
+
+    /// Similar to `raw_locations`, but with special handling for .dwo files.
+    /// This should only been used when this `LocationLists` was loaded from a
+    /// .dwo file.
+    pub fn raw_locations_dwo(
+        &self,
+        offset: LocationListsOffset<R::Offset>,
+        unit_encoding: Encoding,
+    ) -> Result<RawLocListIter<R>> {
+        let mut input = if unit_encoding.version <= 4 {
+            // In the GNU split dwarf extension the locations are present in the
+            // .debug_loc section but are encoded with the DW_LLE values used
+            // for the DWARF 5 .debug_loclists section.
+            self.debug_loc.section.clone()
+        } else {
+            self.debug_loclists.section.clone()
+        };
+        input.skip(offset.0)?;
+        Ok(RawLocListIter::new(
+            input,
+            unit_encoding,
+            LocListsFormat::LLE,
+        ))
+    }
+
+    /// Returns the `.debug_loclists` offset at the given `base` and `index`.
+    ///
+    /// The `base` must be the `DW_AT_loclists_base` value from the compilation unit DIE.
+    /// This is an offset that points to the first entry following the header.
+    ///
+    /// The `index` is the value of a `DW_FORM_loclistx` attribute.
+    pub fn get_offset(
+        &self,
+        unit_encoding: Encoding,
+        base: DebugLocListsBase<R::Offset>,
+        index: DebugLocListsIndex<R::Offset>,
+    ) -> Result<LocationListsOffset<R::Offset>> {
+        let format = unit_encoding.format;
+        let input = &mut self.debug_loclists.section.clone();
+        input.skip(base.0)?;
+        input.skip(R::Offset::from_u64(
+            index.0.into_u64() * u64::from(format.word_size()),
+        )?)?;
+        input
+            .read_offset(format)
+            .map(|x| LocationListsOffset(base.0 + x))
+    }
+
+    /// Call `Reader::lookup_offset_id` for each section, and return the first match.
+    pub fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(SectionId, R::Offset)> {
+        self.debug_loc
+            .lookup_offset_id(id)
+            .or_else(|| self.debug_loclists.lookup_offset_id(id))
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum LocListsFormat {
+    /// The bare location list format used before DWARF 5.
+    Bare,
+    /// The DW_LLE encoded range list format used in DWARF 5 and the non-standard GNU
+    /// split dwarf extension.
+    LLE,
+}
+
+/// A raw iterator over a location list.
+///
+/// This iterator does not perform any processing of the location entries,
+/// such as handling base addresses.
+#[derive(Debug)]
+pub struct RawLocListIter<R: Reader> {
+    input: R,
+    encoding: Encoding,
+    format: LocListsFormat,
+}
+
+/// A raw entry in .debug_loclists.
+#[derive(Clone, Debug)]
+pub enum RawLocListEntry<R: Reader> {
+    /// A location from DWARF version <= 4.
+    AddressOrOffsetPair {
+        /// Start of range. May be an address or an offset.
+        begin: u64,
+        /// End of range. May be an address or an offset.
+        end: u64,
+        /// expression
+        data: Expression<R>,
+    },
+    /// DW_LLE_base_address
+    BaseAddress {
+        /// base address
+        addr: u64,
+    },
+    /// DW_LLE_base_addressx
+    BaseAddressx {
+        /// base address
+        addr: DebugAddrIndex<R::Offset>,
+    },
+    /// DW_LLE_startx_endx
+    StartxEndx {
+        /// start of range
+        begin: DebugAddrIndex<R::Offset>,
+        /// end of range
+        end: DebugAddrIndex<R::Offset>,
+        /// expression
+        data: Expression<R>,
+    },
+    /// DW_LLE_startx_length
+    StartxLength {
+        /// start of range
+        begin: DebugAddrIndex<R::Offset>,
+        /// length of range
+        length: u64,
+        /// expression
+        data: Expression<R>,
+    },
+    /// DW_LLE_offset_pair
+    OffsetPair {
+        /// start of range
+        begin: u64,
+        /// end of range
+        end: u64,
+        /// expression
+        data: Expression<R>,
+    },
+    /// DW_LLE_default_location
+    DefaultLocation {
+        /// expression
+        data: Expression<R>,
+    },
+    /// DW_LLE_start_end
+    StartEnd {
+        /// start of range
+        begin: u64,
+        /// end of range
+        end: u64,
+        /// expression
+        data: Expression<R>,
+    },
+    /// DW_LLE_start_length
+    StartLength {
+        /// start of range
+        begin: u64,
+        /// length of range
+        length: u64,
+        /// expression
+        data: Expression<R>,
+    },
+}
+
+fn parse_data<R: Reader>(input: &mut R, encoding: Encoding) -> Result<Expression<R>> {
+    if encoding.version >= 5 {
+        let len = R::Offset::from_u64(input.read_uleb128()?)?;
+        Ok(Expression(input.split(len)?))
+    } else {
+        // In the GNU split-dwarf extension this is a fixed 2 byte value.
+        let len = R::Offset::from_u16(input.read_u16()?);
+        Ok(Expression(input.split(len)?))
+    }
+}
+
+impl<R: Reader> RawLocListEntry<R> {
+    /// Parse a location list entry from `.debug_loclists`
+    fn parse(input: &mut R, encoding: Encoding, format: LocListsFormat) -> Result<Option<Self>> {
+        match format {
+            LocListsFormat::Bare => {
+                let range = RawRange::parse(input, encoding.address_size)?;
+                return Ok(if range.is_end() {
+                    None
+                } else if range.is_base_address(encoding.address_size) {
+                    Some(RawLocListEntry::BaseAddress { addr: range.end })
+                } else {
+                    let len = R::Offset::from_u16(input.read_u16()?);
+                    let data = Expression(input.split(len)?);
+                    Some(RawLocListEntry::AddressOrOffsetPair {
+                        begin: range.begin,
+                        end: range.end,
+                        data,
+                    })
+                });
+            }
+            LocListsFormat::LLE => Ok(match constants::DwLle(input.read_u8()?) {
+                constants::DW_LLE_end_of_list => None,
+                constants::DW_LLE_base_addressx => Some(RawLocListEntry::BaseAddressx {
+                    addr: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
+                }),
+                constants::DW_LLE_startx_endx => Some(RawLocListEntry::StartxEndx {
+                    begin: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
+                    end: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
+                    data: parse_data(input, encoding)?,
+                }),
+                constants::DW_LLE_startx_length => Some(RawLocListEntry::StartxLength {
+                    begin: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
+                    length: if encoding.version >= 5 {
+                        input.read_uleb128()?
+                    } else {
+                        // In the GNU split-dwarf extension this is a fixed 4 byte value.
+                        input.read_u32()? as u64
+                    },
+                    data: parse_data(input, encoding)?,
+                }),
+                constants::DW_LLE_offset_pair => Some(RawLocListEntry::OffsetPair {
+                    begin: input.read_uleb128()?,
+                    end: input.read_uleb128()?,
+                    data: parse_data(input, encoding)?,
+                }),
+                constants::DW_LLE_default_location => Some(RawLocListEntry::DefaultLocation {
+                    data: parse_data(input, encoding)?,
+                }),
+                constants::DW_LLE_base_address => Some(RawLocListEntry::BaseAddress {
+                    addr: input.read_address(encoding.address_size)?,
+                }),
+                constants::DW_LLE_start_end => Some(RawLocListEntry::StartEnd {
+                    begin: input.read_address(encoding.address_size)?,
+                    end: input.read_address(encoding.address_size)?,
+                    data: parse_data(input, encoding)?,
+                }),
+                constants::DW_LLE_start_length => Some(RawLocListEntry::StartLength {
+                    begin: input.read_address(encoding.address_size)?,
+                    length: input.read_uleb128()?,
+                    data: parse_data(input, encoding)?,
+                }),
+                _ => {
+                    return Err(Error::InvalidAddressRange);
+                }
+            }),
+        }
+    }
+}
+
+impl<R: Reader> RawLocListIter<R> {
+    /// Construct a `RawLocListIter`.
+    fn new(input: R, encoding: Encoding, format: LocListsFormat) -> RawLocListIter<R> {
+        RawLocListIter {
+            input,
+            encoding,
+            format,
+        }
+    }
+
+    /// Advance the iterator to the next location.
+    pub fn next(&mut self) -> Result<Option<RawLocListEntry<R>>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        match RawLocListEntry::parse(&mut self.input, self.encoding, self.format) {
+            Ok(entry) => {
+                if entry.is_none() {
+                    self.input.empty();
+                }
+                Ok(entry)
+            }
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for RawLocListIter<R> {
+    type Item = RawLocListEntry<R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        RawLocListIter::next(self)
+    }
+}
+
+/// An iterator over a location list.
+///
+/// This iterator internally handles processing of base address selection entries
+/// and list end entries.  Thus, it only returns location entries that are valid
+/// and already adjusted for the base address.
+#[derive(Debug)]
+pub struct LocListIter<R: Reader> {
+    raw: RawLocListIter<R>,
+    base_address: u64,
+    debug_addr: DebugAddr<R>,
+    debug_addr_base: DebugAddrBase<R::Offset>,
+}
+
+impl<R: Reader> LocListIter<R> {
+    /// Construct a `LocListIter`.
+    fn new(
+        raw: RawLocListIter<R>,
+        base_address: u64,
+        debug_addr: DebugAddr<R>,
+        debug_addr_base: DebugAddrBase<R::Offset>,
+    ) -> LocListIter<R> {
+        LocListIter {
+            raw,
+            base_address,
+            debug_addr,
+            debug_addr_base,
+        }
+    }
+
+    #[inline]
+    fn get_address(&self, index: DebugAddrIndex<R::Offset>) -> Result<u64> {
+        self.debug_addr
+            .get_address(self.raw.encoding.address_size, self.debug_addr_base, index)
+    }
+
+    /// Advance the iterator to the next location.
+    pub fn next(&mut self) -> Result<Option<LocationListEntry<R>>> {
+        loop {
+            let raw_loc = match self.raw.next()? {
+                Some(loc) => loc,
+                None => return Ok(None),
+            };
+
+            let (range, data) = match raw_loc {
+                RawLocListEntry::BaseAddress { addr } => {
+                    self.base_address = addr;
+                    continue;
+                }
+                RawLocListEntry::BaseAddressx { addr } => {
+                    self.base_address = self.get_address(addr)?;
+                    continue;
+                }
+                RawLocListEntry::StartxEndx { begin, end, data } => {
+                    let begin = self.get_address(begin)?;
+                    let end = self.get_address(end)?;
+                    (Range { begin, end }, data)
+                }
+                RawLocListEntry::StartxLength {
+                    begin,
+                    length,
+                    data,
+                } => {
+                    let begin = self.get_address(begin)?;
+                    let end = begin + length;
+                    (Range { begin, end }, data)
+                }
+                RawLocListEntry::DefaultLocation { data } => (
+                    Range {
+                        begin: 0,
+                        end: u64::max_value(),
+                    },
+                    data,
+                ),
+                RawLocListEntry::AddressOrOffsetPair { begin, end, data }
+                | RawLocListEntry::OffsetPair { begin, end, data } => {
+                    let mut range = Range { begin, end };
+                    range.add_base_address(self.base_address, self.raw.encoding.address_size);
+                    (range, data)
+                }
+                RawLocListEntry::StartEnd { begin, end, data } => (Range { begin, end }, data),
+                RawLocListEntry::StartLength {
+                    begin,
+                    length,
+                    data,
+                } => (
+                    Range {
+                        begin,
+                        end: begin + length,
+                    },
+                    data,
+                ),
+            };
+
+            if range.begin > range.end {
+                self.raw.input.empty();
+                return Err(Error::InvalidLocationAddressRange);
+            }
+
+            return Ok(Some(LocationListEntry { range, data }));
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for LocListIter<R> {
+    type Item = LocationListEntry<R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        LocListIter::next(self)
+    }
+}
+
+/// A location list entry from the `.debug_loc` or `.debug_loclists` sections.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct LocationListEntry<R: Reader> {
+    /// The address range that this location is valid for.
+    pub range: Range,
+
+    /// The data containing a single location description.
+    pub data: Expression<R>,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::common::Format;
+    use crate::endianity::LittleEndian;
+    use crate::read::{EndianSlice, Range};
+    use crate::test_util::GimliSectionMethods;
+    use test_assembler::{Endian, Label, LabelMaker, Section};
+
+    #[test]
+    fn test_loclists_32() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 5,
+            address_size: 4,
+        };
+
+        let section = Section::with_endian(Endian::Little)
+            .L32(0x0300_0000)
+            .L32(0x0301_0300)
+            .L32(0x0301_0400)
+            .L32(0x0301_0500);
+        let buf = section.get_contents().unwrap();
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&buf, LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+
+        let start = Label::new();
+        let first = Label::new();
+        let size = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // Header
+            .mark(&start)
+            .L32(&size)
+            .L16(encoding.version)
+            .L8(encoding.address_size)
+            .L8(0)
+            .L32(0)
+            .mark(&first)
+            // OffsetPair
+            .L8(4).uleb(0x10200).uleb(0x10300).uleb(4).L32(2)
+            // A base address selection followed by an OffsetPair.
+            .L8(6).L32(0x0200_0000)
+            .L8(4).uleb(0x10400).uleb(0x10500).uleb(4).L32(3)
+            // An empty OffsetPair followed by a normal OffsetPair.
+            .L8(4).uleb(0x10600).uleb(0x10600).uleb(4).L32(4)
+            .L8(4).uleb(0x10800).uleb(0x10900).uleb(4).L32(5)
+            // A StartEnd
+            .L8(7).L32(0x201_0a00).L32(0x201_0b00).uleb(4).L32(6)
+            // A StartLength
+            .L8(8).L32(0x201_0c00).uleb(0x100).uleb(4).L32(7)
+            // An OffsetPair that starts at 0.
+            .L8(4).uleb(0).uleb(1).uleb(4).L32(8)
+            // An OffsetPair that ends at -1.
+            .L8(6).L32(0)
+            .L8(4).uleb(0).uleb(0xffff_ffff).uleb(4).L32(9)
+            // A DefaultLocation
+            .L8(5).uleb(4).L32(10)
+            // A BaseAddressx + OffsetPair
+            .L8(1).uleb(0)
+            .L8(4).uleb(0x10100).uleb(0x10200).uleb(4).L32(11)
+            // A StartxEndx
+            .L8(2).uleb(1).uleb(2).uleb(4).L32(12)
+            // A StartxLength
+            .L8(3).uleb(3).uleb(0x100).uleb(4).L32(13)
+            // A range end.
+            .L8(0)
+            // Some extra data.
+            .L32(0xffff_ffff);
+        size.set_const((&section.here() - &start - 4) as u64);
+
+        let buf = section.get_contents().unwrap();
+        let debug_loc = DebugLoc::new(&[], LittleEndian);
+        let debug_loclists = DebugLocLists::new(&buf, LittleEndian);
+        let loclists = LocationLists::new(debug_loc, debug_loclists);
+        let offset = LocationListsOffset((&first - &start) as usize);
+        let mut locations = loclists
+            .locations(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
+            .unwrap();
+
+        // A normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0101_0200,
+                    end: 0x0101_0300,
+                },
+                data: Expression(EndianSlice::new(&[2, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A base address selection followed by a normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0400,
+                    end: 0x0201_0500,
+                },
+                data: Expression(EndianSlice::new(&[3, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // An empty location range followed by a normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0600,
+                    end: 0x0201_0600,
+                },
+                data: Expression(EndianSlice::new(&[4, 0, 0, 0], LittleEndian)),
+            }))
+        );
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0800,
+                    end: 0x0201_0900,
+                },
+                data: Expression(EndianSlice::new(&[5, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0a00,
+                    end: 0x0201_0b00,
+                },
+                data: Expression(EndianSlice::new(&[6, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0c00,
+                    end: 0x0201_0d00,
+                },
+                data: Expression(EndianSlice::new(&[7, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location range that starts at 0.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0200_0000,
+                    end: 0x0200_0001,
+                },
+                data: Expression(EndianSlice::new(&[8, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location range that ends at -1.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0000_0000,
+                    end: 0xffff_ffff,
+                },
+                data: Expression(EndianSlice::new(&[9, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A DefaultLocation.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0,
+                    end: u64::max_value(),
+                },
+                data: Expression(EndianSlice::new(&[10, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A BaseAddressx + OffsetPair
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0301_0100,
+                    end: 0x0301_0200,
+                },
+                data: Expression(EndianSlice::new(&[11, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A StartxEndx
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0301_0300,
+                    end: 0x0301_0400,
+                },
+                data: Expression(EndianSlice::new(&[12, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A StartxLength
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0301_0500,
+                    end: 0x0301_0600,
+                },
+                data: Expression(EndianSlice::new(&[13, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location list end.
+        assert_eq!(locations.next(), Ok(None));
+
+        // An offset at the end of buf.
+        let mut locations = loclists
+            .locations(
+                LocationListsOffset(buf.len()),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(locations.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_loclists_64() {
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 5,
+            address_size: 8,
+        };
+
+        let section = Section::with_endian(Endian::Little)
+            .L64(0x0300_0000)
+            .L64(0x0301_0300)
+            .L64(0x0301_0400)
+            .L64(0x0301_0500);
+        let buf = section.get_contents().unwrap();
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&buf, LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+
+        let start = Label::new();
+        let first = Label::new();
+        let size = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // Header
+            .mark(&start)
+            .L32(0xffff_ffff)
+            .L64(&size)
+            .L16(encoding.version)
+            .L8(encoding.address_size)
+            .L8(0)
+            .L32(0)
+            .mark(&first)
+            // OffsetPair
+            .L8(4).uleb(0x10200).uleb(0x10300).uleb(4).L32(2)
+            // A base address selection followed by an OffsetPair.
+            .L8(6).L64(0x0200_0000)
+            .L8(4).uleb(0x10400).uleb(0x10500).uleb(4).L32(3)
+            // An empty OffsetPair followed by a normal OffsetPair.
+            .L8(4).uleb(0x10600).uleb(0x10600).uleb(4).L32(4)
+            .L8(4).uleb(0x10800).uleb(0x10900).uleb(4).L32(5)
+            // A StartEnd
+            .L8(7).L64(0x201_0a00).L64(0x201_0b00).uleb(4).L32(6)
+            // A StartLength
+            .L8(8).L64(0x201_0c00).uleb(0x100).uleb(4).L32(7)
+            // An OffsetPair that starts at 0.
+            .L8(4).uleb(0).uleb(1).uleb(4).L32(8)
+            // An OffsetPair that ends at -1.
+            .L8(6).L64(0)
+            .L8(4).uleb(0).uleb(0xffff_ffff).uleb(4).L32(9)
+            // A DefaultLocation
+            .L8(5).uleb(4).L32(10)
+            // A BaseAddressx + OffsetPair
+            .L8(1).uleb(0)
+            .L8(4).uleb(0x10100).uleb(0x10200).uleb(4).L32(11)
+            // A StartxEndx
+            .L8(2).uleb(1).uleb(2).uleb(4).L32(12)
+            // A StartxLength
+            .L8(3).uleb(3).uleb(0x100).uleb(4).L32(13)
+            // A range end.
+            .L8(0)
+            // Some extra data.
+            .L32(0xffff_ffff);
+        size.set_const((&section.here() - &start - 12) as u64);
+
+        let buf = section.get_contents().unwrap();
+        let debug_loc = DebugLoc::new(&[], LittleEndian);
+        let debug_loclists = DebugLocLists::new(&buf, LittleEndian);
+        let loclists = LocationLists::new(debug_loc, debug_loclists);
+        let offset = LocationListsOffset((&first - &start) as usize);
+        let mut locations = loclists
+            .locations(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
+            .unwrap();
+
+        // A normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0101_0200,
+                    end: 0x0101_0300,
+                },
+                data: Expression(EndianSlice::new(&[2, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A base address selection followed by a normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0400,
+                    end: 0x0201_0500,
+                },
+                data: Expression(EndianSlice::new(&[3, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // An empty location range followed by a normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0600,
+                    end: 0x0201_0600,
+                },
+                data: Expression(EndianSlice::new(&[4, 0, 0, 0], LittleEndian)),
+            }))
+        );
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0800,
+                    end: 0x0201_0900,
+                },
+                data: Expression(EndianSlice::new(&[5, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0a00,
+                    end: 0x0201_0b00,
+                },
+                data: Expression(EndianSlice::new(&[6, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0c00,
+                    end: 0x0201_0d00,
+                },
+                data: Expression(EndianSlice::new(&[7, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location range that starts at 0.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0200_0000,
+                    end: 0x0200_0001,
+                },
+                data: Expression(EndianSlice::new(&[8, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location range that ends at -1.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0000_0000,
+                    end: 0xffff_ffff,
+                },
+                data: Expression(EndianSlice::new(&[9, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A DefaultLocation.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0,
+                    end: u64::max_value(),
+                },
+                data: Expression(EndianSlice::new(&[10, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A BaseAddressx + OffsetPair
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0301_0100,
+                    end: 0x0301_0200,
+                },
+                data: Expression(EndianSlice::new(&[11, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A StartxEndx
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0301_0300,
+                    end: 0x0301_0400,
+                },
+                data: Expression(EndianSlice::new(&[12, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A StartxLength
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0301_0500,
+                    end: 0x0301_0600,
+                },
+                data: Expression(EndianSlice::new(&[13, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location list end.
+        assert_eq!(locations.next(), Ok(None));
+
+        // An offset at the end of buf.
+        let mut locations = loclists
+            .locations(
+                LocationListsOffset(buf.len()),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(locations.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_location_list_32() {
+        let start = Label::new();
+        let first = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // A location before the offset.
+            .mark(&start)
+            .L32(0x10000).L32(0x10100).L16(4).L32(1)
+            .mark(&first)
+            // A normal location.
+            .L32(0x10200).L32(0x10300).L16(4).L32(2)
+            // A base address selection followed by a normal location.
+            .L32(0xffff_ffff).L32(0x0200_0000)
+            .L32(0x10400).L32(0x10500).L16(4).L32(3)
+            // An empty location range followed by a normal location.
+            .L32(0x10600).L32(0x10600).L16(4).L32(4)
+            .L32(0x10800).L32(0x10900).L16(4).L32(5)
+            // A location range that starts at 0.
+            .L32(0).L32(1).L16(4).L32(6)
+            // A location range that ends at -1.
+            .L32(0xffff_ffff).L32(0x0000_0000)
+            .L32(0).L32(0xffff_ffff).L16(4).L32(7)
+            // A location list end.
+            .L32(0).L32(0)
+            // Some extra data.
+            .L32(0);
+
+        let buf = section.get_contents().unwrap();
+        let debug_loc = DebugLoc::new(&buf, LittleEndian);
+        let debug_loclists = DebugLocLists::new(&[], LittleEndian);
+        let loclists = LocationLists::new(debug_loc, debug_loclists);
+        let offset = LocationListsOffset((&first - &start) as usize);
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut locations = loclists
+            .locations(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
+            .unwrap();
+
+        // A normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0101_0200,
+                    end: 0x0101_0300,
+                },
+                data: Expression(EndianSlice::new(&[2, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A base address selection followed by a normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0400,
+                    end: 0x0201_0500,
+                },
+                data: Expression(EndianSlice::new(&[3, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // An empty location range followed by a normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0600,
+                    end: 0x0201_0600,
+                },
+                data: Expression(EndianSlice::new(&[4, 0, 0, 0], LittleEndian)),
+            }))
+        );
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0800,
+                    end: 0x0201_0900,
+                },
+                data: Expression(EndianSlice::new(&[5, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location range that starts at 0.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0200_0000,
+                    end: 0x0200_0001,
+                },
+                data: Expression(EndianSlice::new(&[6, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location range that ends at -1.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0000_0000,
+                    end: 0xffff_ffff,
+                },
+                data: Expression(EndianSlice::new(&[7, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location list end.
+        assert_eq!(locations.next(), Ok(None));
+
+        // An offset at the end of buf.
+        let mut locations = loclists
+            .locations(
+                LocationListsOffset(buf.len()),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(locations.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_location_list_64() {
+        let start = Label::new();
+        let first = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // A location before the offset.
+            .mark(&start)
+            .L64(0x10000).L64(0x10100).L16(4).L32(1)
+            .mark(&first)
+            // A normal location.
+            .L64(0x10200).L64(0x10300).L16(4).L32(2)
+            // A base address selection followed by a normal location.
+            .L64(0xffff_ffff_ffff_ffff).L64(0x0200_0000)
+            .L64(0x10400).L64(0x10500).L16(4).L32(3)
+            // An empty location range followed by a normal location.
+            .L64(0x10600).L64(0x10600).L16(4).L32(4)
+            .L64(0x10800).L64(0x10900).L16(4).L32(5)
+            // A location range that starts at 0.
+            .L64(0).L64(1).L16(4).L32(6)
+            // A location range that ends at -1.
+            .L64(0xffff_ffff_ffff_ffff).L64(0x0000_0000)
+            .L64(0).L64(0xffff_ffff_ffff_ffff).L16(4).L32(7)
+            // A location list end.
+            .L64(0).L64(0)
+            // Some extra data.
+            .L64(0);
+
+        let buf = section.get_contents().unwrap();
+        let debug_loc = DebugLoc::new(&buf, LittleEndian);
+        let debug_loclists = DebugLocLists::new(&[], LittleEndian);
+        let loclists = LocationLists::new(debug_loc, debug_loclists);
+        let offset = LocationListsOffset((&first - &start) as usize);
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 4,
+            address_size: 8,
+        };
+        let mut locations = loclists
+            .locations(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
+            .unwrap();
+
+        // A normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0101_0200,
+                    end: 0x0101_0300,
+                },
+                data: Expression(EndianSlice::new(&[2, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A base address selection followed by a normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0400,
+                    end: 0x0201_0500,
+                },
+                data: Expression(EndianSlice::new(&[3, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // An empty location range followed by a normal location.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0600,
+                    end: 0x0201_0600,
+                },
+                data: Expression(EndianSlice::new(&[4, 0, 0, 0], LittleEndian)),
+            }))
+        );
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0201_0800,
+                    end: 0x0201_0900,
+                },
+                data: Expression(EndianSlice::new(&[5, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location range that starts at 0.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0200_0000,
+                    end: 0x0200_0001,
+                },
+                data: Expression(EndianSlice::new(&[6, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location range that ends at -1.
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0,
+                    end: 0xffff_ffff_ffff_ffff,
+                },
+                data: Expression(EndianSlice::new(&[7, 0, 0, 0], LittleEndian)),
+            }))
+        );
+
+        // A location list end.
+        assert_eq!(locations.next(), Ok(None));
+
+        // An offset at the end of buf.
+        let mut locations = loclists
+            .locations(
+                LocationListsOffset(buf.len()),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(locations.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_locations_invalid() {
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // An invalid location range.
+            .L32(0x20000).L32(0x10000).L16(4).L32(1)
+            // An invalid range after wrapping.
+            .L32(0x20000).L32(0xff01_0000).L16(4).L32(2);
+
+        let buf = section.get_contents().unwrap();
+        let debug_loc = DebugLoc::new(&buf, LittleEndian);
+        let debug_loclists = DebugLocLists::new(&[], LittleEndian);
+        let loclists = LocationLists::new(debug_loc, debug_loclists);
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+
+        // An invalid location range.
+        let mut locations = loclists
+            .locations(
+                LocationListsOffset(0x0),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(locations.next(), Err(Error::InvalidLocationAddressRange));
+
+        // An invalid location range after wrapping.
+        let mut locations = loclists
+            .locations(
+                LocationListsOffset(14),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(locations.next(), Err(Error::InvalidLocationAddressRange));
+
+        // An invalid offset.
+        match loclists.locations(
+            LocationListsOffset(buf.len() + 1),
+            encoding,
+            0x0100_0000,
+            debug_addr,
+            debug_addr_base,
+        ) {
+            Err(Error::UnexpectedEof(_)) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_get_offset() {
+        for format in vec![Format::Dwarf32, Format::Dwarf64] {
+            let encoding = Encoding {
+                format,
+                version: 5,
+                address_size: 4,
+            };
+
+            let zero = Label::new();
+            let length = Label::new();
+            let start = Label::new();
+            let first = Label::new();
+            let end = Label::new();
+            let mut section = Section::with_endian(Endian::Little)
+                .mark(&zero)
+                .initial_length(format, &length, &start)
+                .D16(encoding.version)
+                .D8(encoding.address_size)
+                .D8(0)
+                .D32(20)
+                .mark(&first);
+            for i in 0..20 {
+                section = section.word(format.word_size(), 1000 + i);
+            }
+            section = section.mark(&end);
+            length.set_const((&end - &start) as u64);
+            let section = section.get_contents().unwrap();
+
+            let debug_loc = DebugLoc::from(EndianSlice::new(&[], LittleEndian));
+            let debug_loclists = DebugLocLists::from(EndianSlice::new(&section, LittleEndian));
+            let locations = LocationLists::new(debug_loc, debug_loclists);
+
+            let base = DebugLocListsBase((&first - &zero) as usize);
+            assert_eq!(
+                locations.get_offset(encoding, base, DebugLocListsIndex(0)),
+                Ok(LocationListsOffset(base.0 + 1000))
+            );
+            assert_eq!(
+                locations.get_offset(encoding, base, DebugLocListsIndex(19)),
+                Ok(LocationListsOffset(base.0 + 1019))
+            );
+        }
+    }
+
+    #[test]
+    fn test_loclists_gnu_v4_split_dwarf() {
+        #[rustfmt::skip]
+        let buf = [
+            0x03, // DW_LLE_startx_length
+            0x00, // ULEB encoded b7
+            0x08, 0x00, 0x00, 0x00, // Fixed 4 byte length of 8
+            0x03, 0x00, // Fixed two byte length of the location
+            0x11, 0x00, // DW_OP_constu 0
+            0x9f, // DW_OP_stack_value
+            // Padding data
+            //0x99, 0x99, 0x99, 0x99
+        ];
+        let data_buf = [0x11, 0x00, 0x9f];
+        let expected_data = EndianSlice::new(&data_buf, LittleEndian);
+        let debug_loc = DebugLoc::new(&buf, LittleEndian);
+        let debug_loclists = DebugLocLists::new(&[], LittleEndian);
+        let loclists = LocationLists::new(debug_loc, debug_loclists);
+        let debug_addr =
+            &DebugAddr::from(EndianSlice::new(&[0x01, 0x02, 0x03, 0x04], LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+
+        // An invalid location range.
+        let mut locations = loclists
+            .locations_dwo(
+                LocationListsOffset(0x0),
+                encoding,
+                0,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(
+            locations.next(),
+            Ok(Some(LocationListEntry {
+                range: Range {
+                    begin: 0x0403_0201,
+                    end: 0x0403_0209
+                },
+                data: Expression(expected_data),
+            }))
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/lookup.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/lookup.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/lookup.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/lookup.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,202 @@
+use core::marker::PhantomData;
+
+use crate::common::{DebugInfoOffset, Format};
+use crate::read::{parse_debug_info_offset, Error, Reader, ReaderOffset, Result, UnitOffset};
+
+// The various "Accelerated Access" sections (DWARF standard v4 Section 6.1) all have
+// similar structures. They consist of a header with metadata and an offset into the
+// .debug_info section for the entire compilation unit, and a series
+// of following entries that list addresses (for .debug_aranges) or names
+// (for .debug_pubnames and .debug_pubtypes) that are covered.
+//
+// Because these three tables all have similar structures, we abstract out some of
+// the parsing mechanics.
+
+pub trait LookupParser<R: Reader> {
+    /// The type of the produced header.
+    type Header;
+    /// The type of the produced entry.
+    type Entry;
+
+    /// Parse a header from `input`. Returns a tuple of `input` sliced to contain just the entries
+    /// corresponding to this header (without the header itself), and the parsed representation of
+    /// the header itself.
+    fn parse_header(input: &mut R) -> Result<(R, Self::Header)>;
+
+    /// Parse a single entry from `input`. Returns either a parsed representation of the entry
+    /// or None if `input` is exhausted.
+    fn parse_entry(input: &mut R, header: &Self::Header) -> Result<Option<Self::Entry>>;
+}
+
+#[derive(Clone, Debug)]
+pub struct DebugLookup<R, Parser>
+where
+    R: Reader,
+    Parser: LookupParser<R>,
+{
+    input_buffer: R,
+    phantom: PhantomData<Parser>,
+}
+
+impl<R, Parser> From<R> for DebugLookup<R, Parser>
+where
+    R: Reader,
+    Parser: LookupParser<R>,
+{
+    fn from(input_buffer: R) -> Self {
+        DebugLookup {
+            input_buffer,
+            phantom: PhantomData,
+        }
+    }
+}
+
+impl<R, Parser> DebugLookup<R, Parser>
+where
+    R: Reader,
+    Parser: LookupParser<R>,
+{
+    pub fn items(&self) -> LookupEntryIter<R, Parser> {
+        LookupEntryIter {
+            current_set: None,
+            remaining_input: self.input_buffer.clone(),
+        }
+    }
+
+    pub fn reader(&self) -> &R {
+        &self.input_buffer
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct LookupEntryIter<R, Parser>
+where
+    R: Reader,
+    Parser: LookupParser<R>,
+{
+    current_set: Option<(R, Parser::Header)>, // Only none at the very beginning and end.
+    remaining_input: R,
+}
+
+impl<R, Parser> LookupEntryIter<R, Parser>
+where
+    R: Reader,
+    Parser: LookupParser<R>,
+{
+    /// Advance the iterator and return the next entry.
+    ///
+    /// Returns the newly parsed entry as `Ok(Some(Parser::Entry))`. Returns
+    /// `Ok(None)` when iteration is complete and all entries have already been
+    /// parsed and yielded. If an error occurs while parsing the next entry,
+    /// then this error is returned as `Err(e)`, and all subsequent calls return
+    /// `Ok(None)`.
+    ///
+    /// Can be [used with `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn next(&mut self) -> Result<Option<Parser::Entry>> {
+        loop {
+            if let Some((ref mut input, ref header)) = self.current_set {
+                if !input.is_empty() {
+                    match Parser::parse_entry(input, header) {
+                        Ok(Some(entry)) => return Ok(Some(entry)),
+                        Ok(None) => {}
+                        Err(e) => {
+                            input.empty();
+                            self.remaining_input.empty();
+                            return Err(e);
+                        }
+                    }
+                }
+            }
+            if self.remaining_input.is_empty() {
+                self.current_set = None;
+                return Ok(None);
+            }
+            match Parser::parse_header(&mut self.remaining_input) {
+                Ok(set) => {
+                    self.current_set = Some(set);
+                }
+                Err(e) => {
+                    self.current_set = None;
+                    self.remaining_input.empty();
+                    return Err(e);
+                }
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct PubStuffHeader<T = usize> {
+    format: Format,
+    length: T,
+    version: u16,
+    unit_offset: DebugInfoOffset<T>,
+    unit_length: T,
+}
+
+pub trait PubStuffEntry<R: Reader> {
+    fn new(
+        die_offset: UnitOffset<R::Offset>,
+        name: R,
+        unit_header_offset: DebugInfoOffset<R::Offset>,
+    ) -> Self;
+}
+
+#[derive(Clone, Debug)]
+pub struct PubStuffParser<R, Entry>
+where
+    R: Reader,
+    Entry: PubStuffEntry<R>,
+{
+    // This struct is never instantiated.
+    phantom: PhantomData<(R, Entry)>,
+}
+
+impl<R, Entry> LookupParser<R> for PubStuffParser<R, Entry>
+where
+    R: Reader,
+    Entry: PubStuffEntry<R>,
+{
+    type Header = PubStuffHeader<R::Offset>;
+    type Entry = Entry;
+
+    /// Parse an pubthings set header. Returns a tuple of the
+    /// pubthings to be parsed for this set, and the newly created PubThingHeader struct.
+    fn parse_header(input: &mut R) -> Result<(R, Self::Header)> {
+        let (length, format) = input.read_initial_length()?;
+        let mut rest = input.split(length)?;
+
+        let version = rest.read_u16()?;
+        if version != 2 {
+            return Err(Error::UnknownVersion(u64::from(version)));
+        }
+
+        let unit_offset = parse_debug_info_offset(&mut rest, format)?;
+        let unit_length = rest.read_length(format)?;
+
+        let header = PubStuffHeader {
+            format,
+            length,
+            version,
+            unit_offset,
+            unit_length,
+        };
+        Ok((rest, header))
+    }
+
+    /// Parse a single pubthing. Return `None` for the null pubthing, `Some` for an actual pubthing.
+    fn parse_entry(input: &mut R, header: &Self::Header) -> Result<Option<Self::Entry>> {
+        let offset = input.read_offset(header.format)?;
+        if offset.into_u64() == 0 {
+            input.empty();
+            Ok(None)
+        } else {
+            let name = input.read_null_terminated_slice()?;
+            Ok(Some(Self::Entry::new(
+                UnitOffset(offset),
+                name,
+                header.unit_offset,
+            )))
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,766 @@
+//! Read DWARF debugging information.
+//!
+//! * [Example Usage](#example-usage)
+//! * [API Structure](#api-structure)
+//! * [Using with `FallibleIterator`](#using-with-fallibleiterator)
+//!
+//! ## Example Usage
+//!
+//! Print out all of the functions in the debuggee program:
+//!
+//! ```rust,no_run
+//! # fn example() -> Result<(), gimli::Error> {
+//! # type R = gimli::EndianSlice<'static, gimli::LittleEndian>;
+//! # let get_file_section_reader = |name| -> Result<R, gimli::Error> { unimplemented!() };
+//! # let get_sup_file_section_reader = |name| -> Result<R, gimli::Error> { unimplemented!() };
+//! // Read the DWARF sections with whatever object loader you're using.
+//! // These closures should return a `Reader` instance (e.g. `EndianSlice`).
+//! let loader = |section: gimli::SectionId| { get_file_section_reader(section.name()) };
+//! let sup_loader = |section: gimli::SectionId| { get_sup_file_section_reader(section.name()) };
+//! let mut dwarf = gimli::Dwarf::load(loader)?;
+//! dwarf.load_sup(sup_loader)?;
+//!
+//! // Iterate over all compilation units.
+//! let mut iter = dwarf.units();
+//! while let Some(header) = iter.next()? {
+//!     // Parse the abbreviations and other information for this compilation unit.
+//!     let unit = dwarf.unit(header)?;
+//!
+//!     // Iterate over all of this compilation unit's entries.
+//!     let mut entries = unit.entries();
+//!     while let Some((_, entry)) = entries.next_dfs()? {
+//!         // If we find an entry for a function, print it.
+//!         if entry.tag() == gimli::DW_TAG_subprogram {
+//!             println!("Found a function: {:?}", entry);
+//!         }
+//!     }
+//! }
+//! # unreachable!()
+//! # }
+//! ```
+//!
+//! Full example programs:
+//!
+//!   * [A simple parser](https://github.com/gimli-rs/gimli/blob/master/examples/simple.rs)
+//!
+//!   * [A `dwarfdump`
+//!     clone](https://github.com/gimli-rs/gimli/blob/master/examples/dwarfdump.rs)
+//!
+//!   * [An `addr2line` clone](https://github.com/gimli-rs/addr2line)
+//!
+//!   * [`ddbug`](https://github.com/philipc/ddbug), a utility giving insight into
+//!     code generation by making debugging information readable
+//!
+//!   * [`dwprod`](https://github.com/fitzgen/dwprod), a tiny utility to list the
+//!     compilers used to create each compilation unit within a shared library or
+//!     executable (via `DW_AT_producer`)
+//!
+//!   * [`dwarf-validate`](http://github.com/gimli-rs/gimli/blob/master/examples/dwarf-validate.rs),
+//!     a program to validate the integrity of some DWARF and its references
+//!     between sections and compilation units.
+//!
+//! ## API Structure
+//!
+//! * Basic familiarity with DWARF is assumed.
+//!
+//! * The [`Dwarf`](./struct.Dwarf.html) type contains the commonly used DWARF
+//! sections. It has methods that simplify access to debugging data that spans
+//! multiple sections. Use of this type is optional, but recommended.
+//!
+//! * Each section gets its own type. Consider these types the entry points to
+//! the library:
+//!
+//!   * [`DebugAbbrev`](./struct.DebugAbbrev.html): The `.debug_abbrev` section.
+//!
+//!   * [`DebugAddr`](./struct.DebugAddr.html): The `.debug_addr` section.
+//!
+//!   * [`DebugAranges`](./struct.DebugAranges.html): The `.debug_aranges`
+//!   section.
+//!
+//!   * [`DebugFrame`](./struct.DebugFrame.html): The `.debug_frame` section.
+//!
+//!   * [`DebugInfo`](./struct.DebugInfo.html): The `.debug_info` section.
+//!
+//!   * [`DebugLine`](./struct.DebugLine.html): The `.debug_line` section.
+//!
+//!   * [`DebugLineStr`](./struct.DebugLineStr.html): The `.debug_line_str` section.
+//!
+//!   * [`DebugLoc`](./struct.DebugLoc.html): The `.debug_loc` section.
+//!
+//!   * [`DebugLocLists`](./struct.DebugLocLists.html): The `.debug_loclists` section.
+//!
+//!   * [`DebugPubNames`](./struct.DebugPubNames.html): The `.debug_pubnames`
+//!   section.
+//!
+//!   * [`DebugPubTypes`](./struct.DebugPubTypes.html): The `.debug_pubtypes`
+//!   section.
+//!
+//!   * [`DebugRanges`](./struct.DebugRanges.html): The `.debug_ranges` section.
+//!
+//!   * [`DebugRngLists`](./struct.DebugRngLists.html): The `.debug_rnglists` section.
+//!
+//!   * [`DebugStr`](./struct.DebugStr.html): The `.debug_str` section.
+//!
+//!   * [`DebugStrOffsets`](./struct.DebugStrOffsets.html): The `.debug_str_offsets` section.
+//!
+//!   * [`DebugTypes`](./struct.DebugTypes.html): The `.debug_types` section.
+//!
+//!   * [`EhFrame`](./struct.EhFrame.html): The `.eh_frame` section.
+//!
+//!   * [`EhFrameHdr`](./struct.EhFrameHdr.html): The `.eh_frame_hdr` section.
+//!
+//! * Each section type exposes methods for accessing the debugging data encoded
+//! in that section. For example, the [`DebugInfo`](./struct.DebugInfo.html)
+//! struct has the [`units`](./struct.DebugInfo.html#method.units) method for
+//! iterating over the compilation units defined within it.
+//!
+//! * Offsets into a section are strongly typed: an offset into `.debug_info` is
+//! the [`DebugInfoOffset`](./struct.DebugInfoOffset.html) type. It cannot be
+//! used to index into the [`DebugLine`](./struct.DebugLine.html) type because
+//! `DebugLine` represents the `.debug_line` section. There are similar types
+//! for offsets relative to a compilation unit rather than a section.
+//!
+//! ## Using with `FallibleIterator`
+//!
+//! The standard library's `Iterator` trait and related APIs do not play well
+//! with iterators where the `next` operation is fallible. One can make the
+//! `Iterator`'s associated `Item` type be a `Result<T, E>`, however the
+//! provided methods cannot gracefully handle the case when an `Err` is
+//! returned.
+//!
+//! This situation led to the
+//! [`fallible-iterator`](https://crates.io/crates/fallible-iterator) crate's
+//! existence. You can read more of the rationale for its existence in its
+//! docs. The crate provides the helpers you have come to expect (eg `map`,
+//! `filter`, etc) for iterators that can fail.
+//!
+//! `gimli`'s many lazy parsing iterators are a perfect match for the
+//! `fallible-iterator` crate's `FallibleIterator` trait because parsing is not
+//! done eagerly. Parse errors later in the input might only be discovered after
+//! having iterated through many items.
+//!
+//! To use `gimli` iterators with `FallibleIterator`, import the crate and trait
+//! into your code:
+//!
+//! ```
+//! # #[cfg(feature = "fallible-iterator")]
+//! # fn foo() {
+//! // Use the `FallibleIterator` trait so its methods are in scope!
+//! use fallible_iterator::FallibleIterator;
+//! use gimli::{DebugAranges, EndianSlice, LittleEndian};
+//!
+//! fn find_sum_of_address_range_lengths(aranges: DebugAranges<EndianSlice<LittleEndian>>)
+//!     -> gimli::Result<u64>
+//! {
+//!     // `DebugAranges::headers` returns a `FallibleIterator`!
+//!     aranges.headers()
+//!         // `flat_map` is provided by `FallibleIterator`!
+//!         .flat_map(|header| Ok(header.entries()))
+//!         // `map` is provided by `FallibleIterator`!
+//!         .map(|arange| Ok(arange.length()))
+//!         // `fold` is provided by `FallibleIterator`!
+//!         .fold(0, |sum, len| Ok(sum + len))
+//! }
+//! # }
+//! # fn main() {}
+//! ```
+
+use core::fmt::{self, Debug};
+use core::result;
+#[cfg(feature = "std")]
+use std::{error, io};
+
+use crate::common::{Register, SectionId};
+use crate::constants;
+
+mod addr;
+pub use self::addr::*;
+
+mod cfi;
+pub use self::cfi::*;
+
+mod dwarf;
+pub use self::dwarf::*;
+
+mod endian_slice;
+pub use self::endian_slice::*;
+
+#[cfg(feature = "endian-reader")]
+mod endian_reader;
+#[cfg(feature = "endian-reader")]
+pub use self::endian_reader::*;
+
+mod reader;
+pub use self::reader::*;
+
+mod abbrev;
+pub use self::abbrev::*;
+
+mod aranges;
+pub use self::aranges::*;
+
+mod line;
+pub use self::line::*;
+
+mod lists;
+
+mod loclists;
+pub use self::loclists::*;
+
+mod lookup;
+
+mod op;
+pub use self::op::*;
+
+mod pubnames;
+pub use self::pubnames::*;
+
+mod pubtypes;
+pub use self::pubtypes::*;
+
+mod rnglists;
+pub use self::rnglists::*;
+
+mod str;
+pub use self::str::*;
+
+mod unit;
+pub use self::unit::*;
+
+mod value;
+pub use self::value::*;
+
+/// `EndianBuf` has been renamed to `EndianSlice`. For ease of upgrading across
+/// `gimli` versions, we export this type alias.
+#[deprecated(note = "EndianBuf has been renamed to EndianSlice, use that instead.")]
+pub type EndianBuf<'input, Endian> = EndianSlice<'input, Endian>;
+
+/// An error that occurred when parsing.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Error {
+    /// An I/O error occurred while reading.
+    Io,
+    /// Found a PC relative pointer, but the section base is undefined.
+    PcRelativePointerButSectionBaseIsUndefined,
+    /// Found a `.text` relative pointer, but the `.text` base is undefined.
+    TextRelativePointerButTextBaseIsUndefined,
+    /// Found a data relative pointer, but the data base is undefined.
+    DataRelativePointerButDataBaseIsUndefined,
+    /// Found a function relative pointer in a context that does not have a
+    /// function base.
+    FuncRelativePointerInBadContext,
+    /// Cannot parse a pointer with a `DW_EH_PE_omit` encoding.
+    CannotParseOmitPointerEncoding,
+    /// An error parsing an unsigned LEB128 value.
+    BadUnsignedLeb128,
+    /// An error parsing a signed LEB128 value.
+    BadSignedLeb128,
+    /// An abbreviation declared that its tag is zero, but zero is reserved for
+    /// null records.
+    AbbreviationTagZero,
+    /// An attribute specification declared that its form is zero, but zero is
+    /// reserved for null records.
+    AttributeFormZero,
+    /// The abbreviation's has-children byte was not one of
+    /// `DW_CHILDREN_{yes,no}`.
+    BadHasChildren,
+    /// The specified length is impossible.
+    BadLength,
+    /// Found an unknown `DW_FORM_*` type.
+    UnknownForm,
+    /// Expected a zero, found something else.
+    ExpectedZero,
+    /// Found an abbreviation code that has already been used.
+    DuplicateAbbreviationCode,
+    /// Found a duplicate arange.
+    DuplicateArange,
+    /// Found an unknown reserved length value.
+    UnknownReservedLength,
+    /// Found an unknown DWARF version.
+    UnknownVersion(u64),
+    /// Found a record with an unknown abbreviation code.
+    UnknownAbbreviation,
+    /// Hit the end of input before it was expected.
+    UnexpectedEof(ReaderOffsetId),
+    /// Read a null entry before it was expected.
+    UnexpectedNull,
+    /// Found an unknown standard opcode.
+    UnknownStandardOpcode(constants::DwLns),
+    /// Found an unknown extended opcode.
+    UnknownExtendedOpcode(constants::DwLne),
+    /// The specified address size is not supported.
+    UnsupportedAddressSize(u8),
+    /// The specified offset size is not supported.
+    UnsupportedOffsetSize(u8),
+    /// The specified field size is not supported.
+    UnsupportedFieldSize(u8),
+    /// The minimum instruction length must not be zero.
+    MinimumInstructionLengthZero,
+    /// The maximum operations per instruction must not be zero.
+    MaximumOperationsPerInstructionZero,
+    /// The line range must not be zero.
+    LineRangeZero,
+    /// The opcode base must not be zero.
+    OpcodeBaseZero,
+    /// Found an invalid UTF-8 string.
+    BadUtf8,
+    /// Expected to find the CIE ID, but found something else.
+    NotCieId,
+    /// Expected to find a pointer to a CIE, but found the CIE ID instead.
+    NotCiePointer,
+    /// Expected to find a pointer to an FDE, but found a CIE instead.
+    NotFdePointer,
+    /// Invalid branch target for a DW_OP_bra or DW_OP_skip.
+    BadBranchTarget(u64),
+    /// DW_OP_push_object_address used but no address passed in.
+    InvalidPushObjectAddress,
+    /// Not enough items on the stack when evaluating an expression.
+    NotEnoughStackItems,
+    /// Too many iterations to compute the expression.
+    TooManyIterations,
+    /// An unrecognized operation was found while parsing a DWARF
+    /// expression.
+    InvalidExpression(constants::DwOp),
+    /// An unsupported operation was found while evaluating a DWARF expression.
+    UnsupportedEvaluation,
+    /// The expression had a piece followed by an expression
+    /// terminator without a piece.
+    InvalidPiece,
+    /// An expression-terminating operation was followed by something
+    /// other than the end of the expression or a piece operation.
+    InvalidExpressionTerminator(u64),
+    /// Division or modulus by zero when evaluating an expression.
+    DivisionByZero,
+    /// An expression operation used mismatching types.
+    TypeMismatch,
+    /// An expression operation required an integral type but saw a
+    /// floating point type.
+    IntegralTypeRequired,
+    /// An expression operation used types that are not supported.
+    UnsupportedTypeOperation,
+    /// The shift value in an expression must be a non-negative integer.
+    InvalidShiftExpression,
+    /// An unknown DW_CFA_* instruction.
+    UnknownCallFrameInstruction(constants::DwCfa),
+    /// The end of an address range was before the beginning.
+    InvalidAddressRange,
+    /// The end offset of a loc list entry was before the beginning.
+    InvalidLocationAddressRange,
+    /// Encountered a call frame instruction in a context in which it is not
+    /// valid.
+    CfiInstructionInInvalidContext,
+    /// When evaluating call frame instructions, found a `DW_CFA_restore_state`
+    /// stack pop instruction, but the stack was empty, and had nothing to pop.
+    PopWithEmptyStack,
+    /// Do not have unwind info for the given address.
+    NoUnwindInfoForAddress,
+    /// An offset value was larger than the maximum supported value.
+    UnsupportedOffset,
+    /// The given pointer encoding is either unknown or invalid.
+    UnknownPointerEncoding,
+    /// Did not find an entry at the given offset.
+    NoEntryAtGivenOffset,
+    /// The given offset is out of bounds.
+    OffsetOutOfBounds,
+    /// Found an unknown CFI augmentation.
+    UnknownAugmentation,
+    /// We do not support the given pointer encoding yet.
+    UnsupportedPointerEncoding,
+    /// Registers larger than `u16` are not supported.
+    UnsupportedRegister(u64),
+    /// The CFI program defined more register rules than we have storage for.
+    TooManyRegisterRules,
+    /// Attempted to push onto the CFI stack, but it was already at full
+    /// capacity.
+    CfiStackFull,
+    /// The `.eh_frame_hdr` binary search table claims to be variable-length encoded,
+    /// which makes binary search impossible.
+    VariableLengthSearchTable,
+    /// The `DW_UT_*` value for this unit is not supported yet.
+    UnsupportedUnitType,
+    /// Ranges using AddressIndex are not supported yet.
+    UnsupportedAddressIndex,
+    /// Nonzero segment selector sizes aren't supported yet.
+    UnsupportedSegmentSize,
+    /// A compilation unit or type unit is missing its top level DIE.
+    MissingUnitDie,
+    /// A DIE attribute used an unsupported form.
+    UnsupportedAttributeForm,
+    /// Missing DW_LNCT_path in file entry format.
+    MissingFileEntryFormatPath,
+    /// Expected an attribute value to be a string form.
+    ExpectedStringAttributeValue,
+    /// `DW_FORM_implicit_const` used in an invalid context.
+    InvalidImplicitConst,
+}
+
+impl fmt::Display for Error {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> ::core::result::Result<(), fmt::Error> {
+        write!(f, "{}", self.description())
+    }
+}
+
+impl Error {
+    /// A short description of the error.
+    pub fn description(&self) -> &str {
+        match *self {
+            Error::Io => "An I/O error occurred while reading.",
+            Error::PcRelativePointerButSectionBaseIsUndefined => {
+                "Found a PC relative pointer, but the section base is undefined."
+            }
+            Error::TextRelativePointerButTextBaseIsUndefined => {
+                "Found a `.text` relative pointer, but the `.text` base is undefined."
+            }
+            Error::DataRelativePointerButDataBaseIsUndefined => {
+                "Found a data relative pointer, but the data base is undefined."
+            }
+            Error::FuncRelativePointerInBadContext => {
+                "Found a function relative pointer in a context that does not have a function base."
+            }
+            Error::CannotParseOmitPointerEncoding => {
+                "Cannot parse a pointer with a `DW_EH_PE_omit` encoding."
+            }
+            Error::BadUnsignedLeb128 => "An error parsing an unsigned LEB128 value",
+            Error::BadSignedLeb128 => "An error parsing a signed LEB128 value",
+            Error::AbbreviationTagZero => {
+                "An abbreviation declared that its tag is zero,
+                 but zero is reserved for null records"
+            }
+            Error::AttributeFormZero => {
+                "An attribute specification declared that its form is zero,
+                 but zero is reserved for null records"
+            }
+            Error::BadHasChildren => {
+                "The abbreviation's has-children byte was not one of
+                 `DW_CHILDREN_{yes,no}`"
+            }
+            Error::BadLength => "The specified length is impossible",
+            Error::UnknownForm => "Found an unknown `DW_FORM_*` type",
+            Error::ExpectedZero => "Expected a zero, found something else",
+            Error::DuplicateAbbreviationCode => {
+                "Found an abbreviation code that has already been used"
+            }
+            Error::DuplicateArange => "Found a duplicate arange",
+            Error::UnknownReservedLength => "Found an unknown reserved length value",
+            Error::UnknownVersion(_) => "Found an unknown DWARF version",
+            Error::UnknownAbbreviation => "Found a record with an unknown abbreviation code",
+            Error::UnexpectedEof(_) => "Hit the end of input before it was expected",
+            Error::UnexpectedNull => "Read a null entry before it was expected.",
+            Error::UnknownStandardOpcode(_) => "Found an unknown standard opcode",
+            Error::UnknownExtendedOpcode(_) => "Found an unknown extended opcode",
+            Error::UnsupportedAddressSize(_) => "The specified address size is not supported",
+            Error::UnsupportedOffsetSize(_) => "The specified offset size is not supported",
+            Error::UnsupportedFieldSize(_) => "The specified field size is not supported",
+            Error::MinimumInstructionLengthZero => {
+                "The minimum instruction length must not be zero."
+            }
+            Error::MaximumOperationsPerInstructionZero => {
+                "The maximum operations per instruction must not be zero."
+            }
+            Error::LineRangeZero => "The line range must not be zero.",
+            Error::OpcodeBaseZero => "The opcode base must not be zero.",
+            Error::BadUtf8 => "Found an invalid UTF-8 string.",
+            Error::NotCieId => "Expected to find the CIE ID, but found something else.",
+            Error::NotCiePointer => "Expected to find a CIE pointer, but found the CIE ID instead.",
+            Error::NotFdePointer => {
+                "Expected to find an FDE pointer, but found a CIE pointer instead."
+            }
+            Error::BadBranchTarget(_) => "Invalid branch target in DWARF expression",
+            Error::InvalidPushObjectAddress => {
+                "DW_OP_push_object_address used but no object address given"
+            }
+            Error::NotEnoughStackItems => "Not enough items on stack when evaluating expression",
+            Error::TooManyIterations => "Too many iterations to evaluate DWARF expression",
+            Error::InvalidExpression(_) => "Invalid opcode in DWARF expression",
+            Error::UnsupportedEvaluation => "Unsupported operation when evaluating expression",
+            Error::InvalidPiece => {
+                "DWARF expression has piece followed by non-piece expression at end"
+            }
+            Error::InvalidExpressionTerminator(_) => "Expected DW_OP_piece or DW_OP_bit_piece",
+            Error::DivisionByZero => "Division or modulus by zero when evaluating expression",
+            Error::TypeMismatch => "Type mismatch when evaluating expression",
+            Error::IntegralTypeRequired => "Integral type expected when evaluating expression",
+            Error::UnsupportedTypeOperation => {
+                "An expression operation used types that are not supported"
+            }
+            Error::InvalidShiftExpression => {
+                "The shift value in an expression must be a non-negative integer."
+            }
+            Error::UnknownCallFrameInstruction(_) => "An unknown DW_CFA_* instructiion",
+            Error::InvalidAddressRange => {
+                "The end of an address range must not be before the beginning."
+            }
+            Error::InvalidLocationAddressRange => {
+                "The end offset of a location list entry must not be before the beginning."
+            }
+            Error::CfiInstructionInInvalidContext => {
+                "Encountered a call frame instruction in a context in which it is not valid."
+            }
+            Error::PopWithEmptyStack => {
+                "When evaluating call frame instructions, found a `DW_CFA_restore_state` stack pop \
+                 instruction, but the stack was empty, and had nothing to pop."
+            }
+            Error::NoUnwindInfoForAddress => "Do not have unwind info for the given address.",
+            Error::UnsupportedOffset => {
+                "An offset value was larger than the maximum supported value."
+            }
+            Error::UnknownPointerEncoding => {
+                "The given pointer encoding is either unknown or invalid."
+            }
+            Error::NoEntryAtGivenOffset => "Did not find an entry at the given offset.",
+            Error::OffsetOutOfBounds => "The given offset is out of bounds.",
+            Error::UnknownAugmentation => "Found an unknown CFI augmentation.",
+            Error::UnsupportedPointerEncoding => {
+                "We do not support the given pointer encoding yet."
+            }
+            Error::UnsupportedRegister(_) => "Registers larger than `u16` are not supported.",
+            Error::TooManyRegisterRules => {
+                "The CFI program defined more register rules than we have storage for."
+            }
+            Error::CfiStackFull => {
+                "Attempted to push onto the CFI stack, but it was already at full capacity."
+            }
+            Error::VariableLengthSearchTable => {
+                "The `.eh_frame_hdr` binary search table claims to be variable-length encoded, \
+                 which makes binary search impossible."
+            }
+            Error::UnsupportedUnitType => "The `DW_UT_*` value for this unit is not supported yet",
+            Error::UnsupportedAddressIndex => "Ranges involving AddressIndex are not supported yet",
+            Error::UnsupportedSegmentSize => "Nonzero segment size not supported yet",
+            Error::MissingUnitDie => {
+                "A compilation unit or type unit is missing its top level DIE."
+            }
+            Error::UnsupportedAttributeForm => "A DIE attribute used an unsupported form.",
+            Error::MissingFileEntryFormatPath => "Missing DW_LNCT_path in file entry format.",
+            Error::ExpectedStringAttributeValue => {
+                "Expected an attribute value to be a string form."
+            }
+            Error::InvalidImplicitConst => "DW_FORM_implicit_const used in an invalid context.",
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl error::Error for Error {}
+
+#[cfg(feature = "std")]
+impl From<io::Error> for Error {
+    fn from(_: io::Error) -> Self {
+        Error::Io
+    }
+}
+
+/// The result of a parse.
+pub type Result<T> = result::Result<T, Error>;
+
+/// A convenience trait for loading DWARF sections from object files.  To be
+/// used like:
+///
+/// ```
+/// use gimli::{DebugInfo, EndianSlice, LittleEndian, Reader, Section};
+///
+/// let buf = [0x00, 0x01, 0x02, 0x03];
+/// let reader = EndianSlice::new(&buf, LittleEndian);
+/// let loader = |name| -> Result<_, ()> { Ok(reader) };
+///
+/// let debug_info: DebugInfo<_> = Section::load(loader).unwrap();
+/// ```
+pub trait Section<R>: From<R> {
+    /// Returns the section id for this type.
+    fn id() -> SectionId;
+
+    /// Returns the ELF section name for this type.
+    fn section_name() -> &'static str {
+        Self::id().name()
+    }
+
+    /// Returns the ELF section name (if any) for this type when used in a dwo
+    /// file.
+    fn dwo_section_name() -> Option<&'static str> {
+        Self::id().dwo_name()
+    }
+
+    /// Try to load the section using the given loader function.
+    fn load<F, E>(f: F) -> core::result::Result<Self, E>
+    where
+        F: FnOnce(SectionId) -> core::result::Result<R, E>,
+    {
+        f(Self::id()).map(From::from)
+    }
+
+    /// Returns the `Reader` for this section.
+    fn reader(&self) -> &R
+    where
+        R: Reader;
+
+    /// Returns the `Reader` for this section.
+    fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(SectionId, R::Offset)>
+    where
+        R: Reader,
+    {
+        self.reader()
+            .lookup_offset_id(id)
+            .map(|offset| (Self::id(), offset))
+    }
+}
+
+impl Register {
+    pub(crate) fn from_u64(x: u64) -> Result<Register> {
+        let y = x as u16;
+        if u64::from(y) == x {
+            Ok(Register(y))
+        } else {
+            Err(Error::UnsupportedRegister(x))
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::common::Format;
+    use crate::endianity::LittleEndian;
+    use test_assembler::{Endian, Section};
+
+    #[test]
+    fn test_parse_initial_length_32_ok() {
+        let section = Section::with_endian(Endian::Little).L32(0x7856_3412);
+        let buf = section.get_contents().unwrap();
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        match input.read_initial_length() {
+            Ok((length, format)) => {
+                assert_eq!(input.len(), 0);
+                assert_eq!(format, Format::Dwarf32);
+                assert_eq!(0x7856_3412, length);
+            }
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_parse_initial_length_64_ok() {
+        let section = Section::with_endian(Endian::Little)
+            // Dwarf_64_INITIAL_UNIT_LENGTH
+            .L32(0xffff_ffff)
+            // Actual length
+            .L64(0xffde_bc9a_7856_3412);
+        let buf = section.get_contents().unwrap();
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+
+        #[cfg(target_pointer_width = "64")]
+        match input.read_initial_length() {
+            Ok((length, format)) => {
+                assert_eq!(input.len(), 0);
+                assert_eq!(format, Format::Dwarf64);
+                assert_eq!(0xffde_bc9a_7856_3412, length);
+            }
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+
+        #[cfg(target_pointer_width = "32")]
+        match input.read_initial_length() {
+            Err(Error::UnsupportedOffset) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_initial_length_unknown_reserved_value() {
+        let section = Section::with_endian(Endian::Little).L32(0xffff_fffe);
+        let buf = section.get_contents().unwrap();
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        match input.read_initial_length() {
+            Err(Error::UnknownReservedLength) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_initial_length_incomplete() {
+        let buf = [0xff, 0xff, 0xff]; // Need at least 4 bytes.
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        match input.read_initial_length() {
+            Err(Error::UnexpectedEof(_)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_initial_length_64_incomplete() {
+        let section = Section::with_endian(Endian::Little)
+            // Dwarf_64_INITIAL_UNIT_LENGTH
+            .L32(0xffff_ffff)
+            // Actual length is not long enough.
+            .L32(0x7856_3412);
+        let buf = section.get_contents().unwrap();
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        match input.read_initial_length() {
+            Err(Error::UnexpectedEof(_)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_offset_32() {
+        let section = Section::with_endian(Endian::Little).L32(0x0123_4567);
+        let buf = section.get_contents().unwrap();
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        match input.read_offset(Format::Dwarf32) {
+            Ok(val) => {
+                assert_eq!(input.len(), 0);
+                assert_eq!(val, 0x0123_4567);
+            }
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_offset_64_small() {
+        let section = Section::with_endian(Endian::Little).L64(0x0123_4567);
+        let buf = section.get_contents().unwrap();
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        match input.read_offset(Format::Dwarf64) {
+            Ok(val) => {
+                assert_eq!(input.len(), 0);
+                assert_eq!(val, 0x0123_4567);
+            }
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_offset_64_large() {
+        let section = Section::with_endian(Endian::Little).L64(0x0123_4567_89ab_cdef);
+        let buf = section.get_contents().unwrap();
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        match input.read_offset(Format::Dwarf64) {
+            Ok(val) => {
+                assert_eq!(input.len(), 0);
+                assert_eq!(val, 0x0123_4567_89ab_cdef);
+            }
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "32")]
+    fn test_parse_offset_64_large() {
+        let section = Section::with_endian(Endian::Little).L64(0x0123_4567_89ab_cdef);
+        let buf = section.get_contents().unwrap();
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        match input.read_offset(Format::Dwarf64) {
+            Err(Error::UnsupportedOffset) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/op.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/op.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/op.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/op.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3998 @@
+//! Functions for parsing and evaluating DWARF expressions.
+
+use alloc::vec::Vec;
+use core::mem;
+
+use crate::common::{DebugAddrIndex, DebugInfoOffset, Encoding, Register};
+use crate::constants;
+use crate::read::{Error, Reader, ReaderOffset, Result, UnitOffset, Value, ValueType};
+
+/// A reference to a DIE, either relative to the current CU or
+/// relative to the section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum DieReference<T = usize> {
+    /// A CU-relative reference.
+    UnitRef(UnitOffset<T>),
+    /// A section-relative reference.
+    DebugInfoRef(DebugInfoOffset<T>),
+}
+
+/// A single decoded DWARF expression operation.
+///
+/// DWARF expression evaluation is done in two parts: first the raw
+/// bytes of the next part of the expression are decoded; and then the
+/// decoded operation is evaluated.  This approach lets other
+/// consumers inspect the DWARF expression without reimplementing the
+/// decoding operation.
+///
+/// Multiple DWARF opcodes may decode into a single `Operation`.  For
+/// example, both `DW_OP_deref` and `DW_OP_xderef` are represented
+/// using `Operation::Deref`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Operation<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Dereference the topmost value of the stack.
+    Deref {
+        /// The DIE of the base type or 0 to indicate the generic type
+        base_type: UnitOffset<Offset>,
+        /// The size of the data to dereference.
+        size: u8,
+        /// True if the dereference operation takes an address space
+        /// argument from the stack; false otherwise.
+        space: bool,
+    },
+    /// Drop an item from the stack.
+    Drop,
+    /// Pick an item from the stack and push it on top of the stack.
+    /// This operation handles `DW_OP_pick`, `DW_OP_dup`, and
+    /// `DW_OP_over`.
+    Pick {
+        /// The index, from the top of the stack, of the item to copy.
+        index: u8,
+    },
+    /// Swap the top two stack items.
+    Swap,
+    /// Rotate the top three stack items.
+    Rot,
+    /// Take the absolute value of the top of the stack.
+    Abs,
+    /// Bitwise `and` of the top two values on the stack.
+    And,
+    /// Divide the top two values on the stack.
+    Div,
+    /// Subtract the top two values on the stack.
+    Minus,
+    /// Modulus of the top two values on the stack.
+    Mod,
+    /// Multiply the top two values on the stack.
+    Mul,
+    /// Negate the top of the stack.
+    Neg,
+    /// Bitwise `not` of the top of the stack.
+    Not,
+    /// Bitwise `or` of the top two values on the stack.
+    Or,
+    /// Add the top two values on the stack.
+    Plus,
+    /// Add a constant to the topmost value on the stack.
+    PlusConstant {
+        /// The value to add.
+        value: u64,
+    },
+    /// Logical left shift of the 2nd value on the stack by the number
+    /// of bits given by the topmost value on the stack.
+    Shl,
+    /// Right shift of the 2nd value on the stack by the number of
+    /// bits given by the topmost value on the stack.
+    Shr,
+    /// Arithmetic left shift of the 2nd value on the stack by the
+    /// number of bits given by the topmost value on the stack.
+    Shra,
+    /// Bitwise `xor` of the top two values on the stack.
+    Xor,
+    /// Branch to the target location if the top of stack is nonzero.
+    Bra {
+        /// The relative offset to the target bytecode.
+        target: i16,
+    },
+    /// Compare the top two stack values for equality.
+    Eq,
+    /// Compare the top two stack values using `>=`.
+    Ge,
+    /// Compare the top two stack values using `>`.
+    Gt,
+    /// Compare the top two stack values using `<=`.
+    Le,
+    /// Compare the top two stack values using `<`.
+    Lt,
+    /// Compare the top two stack values using `!=`.
+    Ne,
+    /// Unconditional branch to the target location.
+    Skip {
+        /// The relative offset to the target bytecode.
+        target: i16,
+    },
+    /// Push an unsigned constant value on the stack.  This handles multiple
+    /// DWARF opcodes.
+    UnsignedConstant {
+        /// The value to push.
+        value: u64,
+    },
+    /// Push a signed constant value on the stack.  This handles multiple
+    /// DWARF opcodes.
+    SignedConstant {
+        /// The value to push.
+        value: i64,
+    },
+    /// Indicate that this piece's location is in the given register.
+    ///
+    /// Completes the piece or expression.
+    Register {
+        /// The register number.
+        register: Register,
+    },
+    /// Find the value of the given register, add the offset, and then
+    /// push the resulting sum on the stack.
+    RegisterOffset {
+        /// The register number.
+        register: Register,
+        /// The offset to add.
+        offset: i64,
+        /// The DIE of the base type or 0 to indicate the generic type
+        base_type: UnitOffset<Offset>,
+    },
+    /// Compute the frame base (using `DW_AT_frame_base`), add the
+    /// given offset, and then push the resulting sum on the stack.
+    FrameOffset {
+        /// The offset to add.
+        offset: i64,
+    },
+    /// No operation.
+    Nop,
+    /// Push the object address on the stack.
+    PushObjectAddress,
+    /// Evaluate a DWARF expression as a subroutine.  The expression
+    /// comes from the `DW_AT_location` attribute of the indicated
+    /// DIE.
+    Call {
+        /// The DIE to use.
+        offset: DieReference<Offset>,
+    },
+    /// Compute the address of a thread-local variable and push it on
+    /// the stack.
+    TLS,
+    /// Compute the call frame CFA and push it on the stack.
+    CallFrameCFA,
+    /// Terminate a piece.
+    Piece {
+        /// The size of this piece in bits.
+        size_in_bits: u64,
+        /// The bit offset of this piece.  If `None`, then this piece
+        /// was specified using `DW_OP_piece` and should start at the
+        /// next byte boundary.
+        bit_offset: Option<u64>,
+    },
+    /// The object has no location, but has a known constant value.
+    ///
+    /// Represents `DW_OP_implicit_value`.
+    /// Completes the piece or expression.
+    ImplicitValue {
+        /// The implicit value to use.
+        data: R,
+    },
+    /// The object has no location, but its value is at the top of the stack.
+    ///
+    /// Represents `DW_OP_stack_value`.
+    /// Completes the piece or expression.
+    StackValue,
+    /// The object is a pointer to a value which has no actual location,
+    /// such as an implicit value or a stack value.
+    ///
+    /// Represents `DW_OP_implicit_pointer`.
+    /// Completes the piece or expression.
+    ImplicitPointer {
+        /// The `.debug_info` offset of the value that this is an implicit pointer into.
+        value: DebugInfoOffset<Offset>,
+        /// The byte offset into the value that the implicit pointer points to.
+        byte_offset: i64,
+    },
+    /// Evaluate an expression at the entry to the current subprogram, and push it on the stack.
+    ///
+    /// Represents `DW_OP_entry_value`.
+    EntryValue {
+        /// The expression to be evaluated.
+        expression: R,
+    },
+    /// This represents a parameter that was optimized out.
+    ///
+    /// The offset points to the definition of the parameter, and is
+    /// matched to the `DW_TAG_GNU_call_site_parameter` in the caller that also
+    /// points to the same definition of the parameter.
+    ///
+    /// Represents `DW_OP_GNU_parameter_ref`.
+    ParameterRef {
+        /// The DIE to use.
+        offset: UnitOffset<Offset>,
+    },
+    /// Relocate the address if needed, and push it on the stack.
+    ///
+    /// Represents `DW_OP_addr`.
+    Address {
+        /// The offset to add.
+        address: u64,
+    },
+    /// Read the address at the given index in `.debug_addr, relocate the address if needed,
+    /// and push it on the stack.
+    ///
+    /// Represents `DW_OP_addrx`.
+    AddressIndex {
+        /// The index of the address in `.debug_addr`.
+        index: DebugAddrIndex<Offset>,
+    },
+    /// Read the address at the given index in `.debug_addr, and push it on the stack.
+    /// Do not relocate the address.
+    ///
+    /// Represents `DW_OP_constx`.
+    ConstantIndex {
+        /// The index of the address in `.debug_addr`.
+        index: DebugAddrIndex<Offset>,
+    },
+    /// Interpret the value bytes as a constant of a given type, and push it on the stack.
+    ///
+    /// Represents `DW_OP_const_type`.
+    TypedLiteral {
+        /// The DIE of the base type.
+        base_type: UnitOffset<Offset>,
+        /// The value bytes.
+        value: R,
+    },
+    /// Pop the top stack entry, convert it to a different type, and push it on the stack.
+    ///
+    /// Represents `DW_OP_convert`.
+    Convert {
+        /// The DIE of the base type.
+        base_type: UnitOffset<Offset>,
+    },
+    /// Pop the top stack entry, reinterpret the bits in its value as a different type,
+    /// and push it on the stack.
+    ///
+    /// Represents `DW_OP_reinterpret`.
+    Reinterpret {
+        /// The DIE of the base type.
+        base_type: UnitOffset<Offset>,
+    },
+    /// The index of a local in the currently executing function.
+    ///
+    /// Represents `DW_OP_WASM_location 0x00`.
+    /// Completes the piece or expression.
+    WasmLocal {
+        /// The index of the local.
+        index: u32,
+    },
+    /// The index of a global.
+    ///
+    /// Represents `DW_OP_WASM_location 0x01` or `DW_OP_WASM_location 0x03`.
+    /// Completes the piece or expression.
+    WasmGlobal {
+        /// The index of the global.
+        index: u32,
+    },
+    /// The index of an item on the operand stack.
+    ///
+    /// Represents `DW_OP_WASM_location 0x02`.
+    /// Completes the piece or expression.
+    WasmStack {
+        /// The index of the stack item. 0 is the bottom of the operand stack.
+        index: u32,
+    },
+}
+
+#[derive(Debug)]
+enum OperationEvaluationResult<R: Reader> {
+    Piece,
+    Incomplete,
+    Complete { location: Location<R> },
+    Waiting(EvaluationWaiting<R>, EvaluationResult<R>),
+}
+
+/// A single location of a piece of the result of a DWARF expression.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Location<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// The piece is empty.  Ordinarily this means the piece has been
+    /// optimized away.
+    Empty,
+    /// The piece is found in a register.
+    Register {
+        /// The register number.
+        register: Register,
+    },
+    /// The piece is found in memory.
+    Address {
+        /// The address.
+        address: u64,
+    },
+    /// The piece has no location but its value is known.
+    Value {
+        /// The value.
+        value: Value,
+    },
+    /// The piece is represented by some constant bytes.
+    Bytes {
+        /// The value.
+        value: R,
+    },
+    /// The piece is a pointer to a value which has no actual location.
+    ImplicitPointer {
+        /// The `.debug_info` offset of the value that this is an implicit pointer into.
+        value: DebugInfoOffset<Offset>,
+        /// The byte offset into the value that the implicit pointer points to.
+        byte_offset: i64,
+    },
+}
+
+impl<R, Offset> Location<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Return true if the piece is empty.
+    pub fn is_empty(&self) -> bool {
+        match *self {
+            Location::Empty => true,
+            _ => false,
+        }
+    }
+}
+
+/// The description of a single piece of the result of a DWARF
+/// expression.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Piece<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// If given, the size of the piece in bits.  If `None`, there
+    /// must be only one piece whose size is all of the object.
+    pub size_in_bits: Option<u64>,
+    /// If given, the bit offset of the piece within the location.
+    /// If the location is a `Location::Register` or `Location::Value`,
+    /// then this offset is from the least significant bit end of
+    /// the register or value.
+    /// If the location is a `Location::Address` then the offset uses
+    /// the bit numbering and direction conventions of the language
+    /// and target system.
+    ///
+    /// If `None`, the piece starts at the location. If the
+    /// location is a register whose size is larger than the piece,
+    /// then placement within the register is defined by the ABI.
+    pub bit_offset: Option<u64>,
+    /// Where this piece is to be found.
+    pub location: Location<R, Offset>,
+}
+
+// A helper function to handle branch offsets.
+fn compute_pc<R: Reader>(pc: &R, bytecode: &R, offset: i16) -> Result<R> {
+    let pc_offset = pc.offset_from(bytecode);
+    let new_pc_offset = pc_offset.wrapping_add(R::Offset::from_i16(offset));
+    if new_pc_offset > bytecode.len() {
+        Err(Error::BadBranchTarget(new_pc_offset.into_u64()))
+    } else {
+        let mut new_pc = bytecode.clone();
+        new_pc.skip(new_pc_offset)?;
+        Ok(new_pc)
+    }
+}
+
+fn generic_type<O: ReaderOffset>() -> UnitOffset<O> {
+    UnitOffset(O::from_u64(0).unwrap())
+}
+
+impl<R, Offset> Operation<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Parse a single DWARF expression operation.
+    ///
+    /// This is useful when examining a DWARF expression for reasons other
+    /// than direct evaluation.
+    ///
+    /// `bytes` points to a the operation to decode.  It should point into
+    /// the same array as `bytecode`, which should be the entire
+    /// expression.
+    pub fn parse(bytes: &mut R, encoding: Encoding) -> Result<Operation<R, Offset>> {
+        let opcode = bytes.read_u8()?;
+        let name = constants::DwOp(opcode);
+        match name {
+            constants::DW_OP_addr => {
+                let address = bytes.read_address(encoding.address_size)?;
+                Ok(Operation::Address { address })
+            }
+            constants::DW_OP_deref => Ok(Operation::Deref {
+                base_type: generic_type(),
+                size: encoding.address_size,
+                space: false,
+            }),
+            constants::DW_OP_const1u => {
+                let value = bytes.read_u8()?;
+                Ok(Operation::UnsignedConstant {
+                    value: u64::from(value),
+                })
+            }
+            constants::DW_OP_const1s => {
+                let value = bytes.read_i8()?;
+                Ok(Operation::SignedConstant {
+                    value: i64::from(value),
+                })
+            }
+            constants::DW_OP_const2u => {
+                let value = bytes.read_u16()?;
+                Ok(Operation::UnsignedConstant {
+                    value: u64::from(value),
+                })
+            }
+            constants::DW_OP_const2s => {
+                let value = bytes.read_i16()?;
+                Ok(Operation::SignedConstant {
+                    value: i64::from(value),
+                })
+            }
+            constants::DW_OP_const4u => {
+                let value = bytes.read_u32()?;
+                Ok(Operation::UnsignedConstant {
+                    value: u64::from(value),
+                })
+            }
+            constants::DW_OP_const4s => {
+                let value = bytes.read_i32()?;
+                Ok(Operation::SignedConstant {
+                    value: i64::from(value),
+                })
+            }
+            constants::DW_OP_const8u => {
+                let value = bytes.read_u64()?;
+                Ok(Operation::UnsignedConstant { value })
+            }
+            constants::DW_OP_const8s => {
+                let value = bytes.read_i64()?;
+                Ok(Operation::SignedConstant { value })
+            }
+            constants::DW_OP_constu => {
+                let value = bytes.read_uleb128()?;
+                Ok(Operation::UnsignedConstant { value })
+            }
+            constants::DW_OP_consts => {
+                let value = bytes.read_sleb128()?;
+                Ok(Operation::SignedConstant { value })
+            }
+            constants::DW_OP_dup => Ok(Operation::Pick { index: 0 }),
+            constants::DW_OP_drop => Ok(Operation::Drop),
+            constants::DW_OP_over => Ok(Operation::Pick { index: 1 }),
+            constants::DW_OP_pick => {
+                let value = bytes.read_u8()?;
+                Ok(Operation::Pick { index: value })
+            }
+            constants::DW_OP_swap => Ok(Operation::Swap),
+            constants::DW_OP_rot => Ok(Operation::Rot),
+            constants::DW_OP_xderef => Ok(Operation::Deref {
+                base_type: generic_type(),
+                size: encoding.address_size,
+                space: true,
+            }),
+            constants::DW_OP_abs => Ok(Operation::Abs),
+            constants::DW_OP_and => Ok(Operation::And),
+            constants::DW_OP_div => Ok(Operation::Div),
+            constants::DW_OP_minus => Ok(Operation::Minus),
+            constants::DW_OP_mod => Ok(Operation::Mod),
+            constants::DW_OP_mul => Ok(Operation::Mul),
+            constants::DW_OP_neg => Ok(Operation::Neg),
+            constants::DW_OP_not => Ok(Operation::Not),
+            constants::DW_OP_or => Ok(Operation::Or),
+            constants::DW_OP_plus => Ok(Operation::Plus),
+            constants::DW_OP_plus_uconst => {
+                let value = bytes.read_uleb128()?;
+                Ok(Operation::PlusConstant { value })
+            }
+            constants::DW_OP_shl => Ok(Operation::Shl),
+            constants::DW_OP_shr => Ok(Operation::Shr),
+            constants::DW_OP_shra => Ok(Operation::Shra),
+            constants::DW_OP_xor => Ok(Operation::Xor),
+            constants::DW_OP_bra => {
+                let target = bytes.read_i16()?;
+                Ok(Operation::Bra { target })
+            }
+            constants::DW_OP_eq => Ok(Operation::Eq),
+            constants::DW_OP_ge => Ok(Operation::Ge),
+            constants::DW_OP_gt => Ok(Operation::Gt),
+            constants::DW_OP_le => Ok(Operation::Le),
+            constants::DW_OP_lt => Ok(Operation::Lt),
+            constants::DW_OP_ne => Ok(Operation::Ne),
+            constants::DW_OP_skip => {
+                let target = bytes.read_i16()?;
+                Ok(Operation::Skip { target })
+            }
+            constants::DW_OP_lit0
+            | constants::DW_OP_lit1
+            | constants::DW_OP_lit2
+            | constants::DW_OP_lit3
+            | constants::DW_OP_lit4
+            | constants::DW_OP_lit5
+            | constants::DW_OP_lit6
+            | constants::DW_OP_lit7
+            | constants::DW_OP_lit8
+            | constants::DW_OP_lit9
+            | constants::DW_OP_lit10
+            | constants::DW_OP_lit11
+            | constants::DW_OP_lit12
+            | constants::DW_OP_lit13
+            | constants::DW_OP_lit14
+            | constants::DW_OP_lit15
+            | constants::DW_OP_lit16
+            | constants::DW_OP_lit17
+            | constants::DW_OP_lit18
+            | constants::DW_OP_lit19
+            | constants::DW_OP_lit20
+            | constants::DW_OP_lit21
+            | constants::DW_OP_lit22
+            | constants::DW_OP_lit23
+            | constants::DW_OP_lit24
+            | constants::DW_OP_lit25
+            | constants::DW_OP_lit26
+            | constants::DW_OP_lit27
+            | constants::DW_OP_lit28
+            | constants::DW_OP_lit29
+            | constants::DW_OP_lit30
+            | constants::DW_OP_lit31 => Ok(Operation::UnsignedConstant {
+                value: (opcode - constants::DW_OP_lit0.0).into(),
+            }),
+            constants::DW_OP_reg0
+            | constants::DW_OP_reg1
+            | constants::DW_OP_reg2
+            | constants::DW_OP_reg3
+            | constants::DW_OP_reg4
+            | constants::DW_OP_reg5
+            | constants::DW_OP_reg6
+            | constants::DW_OP_reg7
+            | constants::DW_OP_reg8
+            | constants::DW_OP_reg9
+            | constants::DW_OP_reg10
+            | constants::DW_OP_reg11
+            | constants::DW_OP_reg12
+            | constants::DW_OP_reg13
+            | constants::DW_OP_reg14
+            | constants::DW_OP_reg15
+            | constants::DW_OP_reg16
+            | constants::DW_OP_reg17
+            | constants::DW_OP_reg18
+            | constants::DW_OP_reg19
+            | constants::DW_OP_reg20
+            | constants::DW_OP_reg21
+            | constants::DW_OP_reg22
+            | constants::DW_OP_reg23
+            | constants::DW_OP_reg24
+            | constants::DW_OP_reg25
+            | constants::DW_OP_reg26
+            | constants::DW_OP_reg27
+            | constants::DW_OP_reg28
+            | constants::DW_OP_reg29
+            | constants::DW_OP_reg30
+            | constants::DW_OP_reg31 => Ok(Operation::Register {
+                register: Register((opcode - constants::DW_OP_reg0.0).into()),
+            }),
+            constants::DW_OP_breg0
+            | constants::DW_OP_breg1
+            | constants::DW_OP_breg2
+            | constants::DW_OP_breg3
+            | constants::DW_OP_breg4
+            | constants::DW_OP_breg5
+            | constants::DW_OP_breg6
+            | constants::DW_OP_breg7
+            | constants::DW_OP_breg8
+            | constants::DW_OP_breg9
+            | constants::DW_OP_breg10
+            | constants::DW_OP_breg11
+            | constants::DW_OP_breg12
+            | constants::DW_OP_breg13
+            | constants::DW_OP_breg14
+            | constants::DW_OP_breg15
+            | constants::DW_OP_breg16
+            | constants::DW_OP_breg17
+            | constants::DW_OP_breg18
+            | constants::DW_OP_breg19
+            | constants::DW_OP_breg20
+            | constants::DW_OP_breg21
+            | constants::DW_OP_breg22
+            | constants::DW_OP_breg23
+            | constants::DW_OP_breg24
+            | constants::DW_OP_breg25
+            | constants::DW_OP_breg26
+            | constants::DW_OP_breg27
+            | constants::DW_OP_breg28
+            | constants::DW_OP_breg29
+            | constants::DW_OP_breg30
+            | constants::DW_OP_breg31 => {
+                let value = bytes.read_sleb128()?;
+                Ok(Operation::RegisterOffset {
+                    register: Register((opcode - constants::DW_OP_breg0.0).into()),
+                    offset: value,
+                    base_type: generic_type(),
+                })
+            }
+            constants::DW_OP_regx => {
+                let register = bytes.read_uleb128().and_then(Register::from_u64)?;
+                Ok(Operation::Register { register })
+            }
+            constants::DW_OP_fbreg => {
+                let value = bytes.read_sleb128()?;
+                Ok(Operation::FrameOffset { offset: value })
+            }
+            constants::DW_OP_bregx => {
+                let register = bytes.read_uleb128().and_then(Register::from_u64)?;
+                let offset = bytes.read_sleb128()?;
+                Ok(Operation::RegisterOffset {
+                    register,
+                    offset,
+                    base_type: generic_type(),
+                })
+            }
+            constants::DW_OP_piece => {
+                let size = bytes.read_uleb128()?;
+                Ok(Operation::Piece {
+                    size_in_bits: 8 * size,
+                    bit_offset: None,
+                })
+            }
+            constants::DW_OP_deref_size => {
+                let size = bytes.read_u8()?;
+                Ok(Operation::Deref {
+                    base_type: generic_type(),
+                    size,
+                    space: false,
+                })
+            }
+            constants::DW_OP_xderef_size => {
+                let size = bytes.read_u8()?;
+                Ok(Operation::Deref {
+                    base_type: generic_type(),
+                    size,
+                    space: true,
+                })
+            }
+            constants::DW_OP_nop => Ok(Operation::Nop),
+            constants::DW_OP_push_object_address => Ok(Operation::PushObjectAddress),
+            constants::DW_OP_call2 => {
+                let value = bytes.read_u16().map(R::Offset::from_u16)?;
+                Ok(Operation::Call {
+                    offset: DieReference::UnitRef(UnitOffset(value)),
+                })
+            }
+            constants::DW_OP_call4 => {
+                let value = bytes.read_u32().map(R::Offset::from_u32)?;
+                Ok(Operation::Call {
+                    offset: DieReference::UnitRef(UnitOffset(value)),
+                })
+            }
+            constants::DW_OP_call_ref => {
+                let value = bytes.read_offset(encoding.format)?;
+                Ok(Operation::Call {
+                    offset: DieReference::DebugInfoRef(DebugInfoOffset(value)),
+                })
+            }
+            constants::DW_OP_form_tls_address | constants::DW_OP_GNU_push_tls_address => {
+                Ok(Operation::TLS)
+            }
+            constants::DW_OP_call_frame_cfa => Ok(Operation::CallFrameCFA),
+            constants::DW_OP_bit_piece => {
+                let size = bytes.read_uleb128()?;
+                let offset = bytes.read_uleb128()?;
+                Ok(Operation::Piece {
+                    size_in_bits: size,
+                    bit_offset: Some(offset),
+                })
+            }
+            constants::DW_OP_implicit_value => {
+                let len = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                let data = bytes.split(len)?;
+                Ok(Operation::ImplicitValue { data })
+            }
+            constants::DW_OP_stack_value => Ok(Operation::StackValue),
+            constants::DW_OP_implicit_pointer | constants::DW_OP_GNU_implicit_pointer => {
+                let value = bytes.read_offset(encoding.format)?;
+                let byte_offset = bytes.read_sleb128()?;
+                Ok(Operation::ImplicitPointer {
+                    value: DebugInfoOffset(value),
+                    byte_offset,
+                })
+            }
+            constants::DW_OP_addrx | constants::DW_OP_GNU_addr_index => {
+                let index = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                Ok(Operation::AddressIndex {
+                    index: DebugAddrIndex(index),
+                })
+            }
+            constants::DW_OP_constx | constants::DW_OP_GNU_const_index => {
+                let index = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                Ok(Operation::ConstantIndex {
+                    index: DebugAddrIndex(index),
+                })
+            }
+            constants::DW_OP_entry_value | constants::DW_OP_GNU_entry_value => {
+                let len = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                let expression = bytes.split(len)?;
+                Ok(Operation::EntryValue { expression })
+            }
+            constants::DW_OP_GNU_parameter_ref => {
+                let value = bytes.read_u32().map(R::Offset::from_u32)?;
+                Ok(Operation::ParameterRef {
+                    offset: UnitOffset(value),
+                })
+            }
+            constants::DW_OP_const_type | constants::DW_OP_GNU_const_type => {
+                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                let len = bytes.read_u8()?;
+                let value = bytes.split(R::Offset::from_u8(len))?;
+                Ok(Operation::TypedLiteral {
+                    base_type: UnitOffset(base_type),
+                    value,
+                })
+            }
+            constants::DW_OP_regval_type | constants::DW_OP_GNU_regval_type => {
+                let register = bytes.read_uleb128().and_then(Register::from_u64)?;
+                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                Ok(Operation::RegisterOffset {
+                    register,
+                    offset: 0,
+                    base_type: UnitOffset(base_type),
+                })
+            }
+            constants::DW_OP_deref_type | constants::DW_OP_GNU_deref_type => {
+                let size = bytes.read_u8()?;
+                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                Ok(Operation::Deref {
+                    base_type: UnitOffset(base_type),
+                    size,
+                    space: false,
+                })
+            }
+            constants::DW_OP_xderef_type => {
+                let size = bytes.read_u8()?;
+                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                Ok(Operation::Deref {
+                    base_type: UnitOffset(base_type),
+                    size,
+                    space: true,
+                })
+            }
+            constants::DW_OP_convert | constants::DW_OP_GNU_convert => {
+                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                Ok(Operation::Convert {
+                    base_type: UnitOffset(base_type),
+                })
+            }
+            constants::DW_OP_reinterpret | constants::DW_OP_GNU_reinterpret => {
+                let base_type = bytes.read_uleb128().and_then(R::Offset::from_u64)?;
+                Ok(Operation::Reinterpret {
+                    base_type: UnitOffset(base_type),
+                })
+            }
+            constants::DW_OP_WASM_location => match bytes.read_u8()? {
+                0x0 => {
+                    let index = bytes.read_uleb128_u32()?;
+                    Ok(Operation::WasmLocal { index })
+                }
+                0x1 => {
+                    let index = bytes.read_uleb128_u32()?;
+                    Ok(Operation::WasmGlobal { index })
+                }
+                0x2 => {
+                    let index = bytes.read_uleb128_u32()?;
+                    Ok(Operation::WasmStack { index })
+                }
+                0x3 => {
+                    let index = bytes.read_u32()?;
+                    Ok(Operation::WasmGlobal { index })
+                }
+                _ => Err(Error::InvalidExpression(name)),
+            },
+            _ => Err(Error::InvalidExpression(name)),
+        }
+    }
+}
+
+#[derive(Debug)]
+enum EvaluationState<R: Reader> {
+    Start(Option<u64>),
+    Ready,
+    Error(Error),
+    Complete,
+    Waiting(EvaluationWaiting<R>),
+}
+
+#[derive(Debug)]
+enum EvaluationWaiting<R: Reader> {
+    Memory,
+    Register { offset: i64 },
+    FrameBase { offset: i64 },
+    Tls,
+    Cfa,
+    AtLocation,
+    EntryValue,
+    ParameterRef,
+    RelocatedAddress,
+    IndexedAddress,
+    TypedLiteral { value: R },
+    Convert,
+    Reinterpret,
+}
+
+/// The state of an `Evaluation` after evaluating a DWARF expression.
+/// The evaluation is either `Complete`, or it requires more data
+/// to continue, as described by the variant.
+#[derive(Debug, PartialEq)]
+pub enum EvaluationResult<R: Reader> {
+    /// The `Evaluation` is complete, and `Evaluation::result()` can be called.
+    Complete,
+    /// The `Evaluation` needs a value from memory to proceed further.  Once the
+    /// caller determines what value to provide it should resume the `Evaluation`
+    /// by calling `Evaluation::resume_with_memory`.
+    RequiresMemory {
+        /// The address of the value required.
+        address: u64,
+        /// The size of the value required. This is guaranteed to be at most the
+        /// word size of the target architecture.
+        size: u8,
+        /// If not `None`, a target-specific address space value.
+        space: Option<u64>,
+        /// The DIE of the base type or 0 to indicate the generic type
+        base_type: UnitOffset<R::Offset>,
+    },
+    /// The `Evaluation` needs a value from a register to proceed further.  Once
+    /// the caller determines what value to provide it should resume the
+    /// `Evaluation` by calling `Evaluation::resume_with_register`.
+    RequiresRegister {
+        /// The register number.
+        register: Register,
+        /// The DIE of the base type or 0 to indicate the generic type
+        base_type: UnitOffset<R::Offset>,
+    },
+    /// The `Evaluation` needs the frame base address to proceed further.  Once
+    /// the caller determines what value to provide it should resume the
+    /// `Evaluation` by calling `Evaluation::resume_with_frame_base`.  The frame
+    /// base address is the address produced by the location description in the
+    /// `DW_AT_frame_base` attribute of the current function.
+    RequiresFrameBase,
+    /// The `Evaluation` needs a value from TLS to proceed further.  Once the
+    /// caller determines what value to provide it should resume the
+    /// `Evaluation` by calling `Evaluation::resume_with_tls`.
+    RequiresTls(u64),
+    /// The `Evaluation` needs the CFA to proceed further.  Once the caller
+    /// determines what value to provide it should resume the `Evaluation` by
+    /// calling `Evaluation::resume_with_call_frame_cfa`.
+    RequiresCallFrameCfa,
+    /// The `Evaluation` needs the DWARF expression at the given location to
+    /// proceed further.  Once the caller determines what value to provide it
+    /// should resume the `Evaluation` by calling
+    /// `Evaluation::resume_with_at_location`.
+    RequiresAtLocation(DieReference<R::Offset>),
+    /// The `Evaluation` needs the value produced by evaluating a DWARF
+    /// expression at the entry point of the current subprogram.  Once the
+    /// caller determines what value to provide it should resume the
+    /// `Evaluation` by calling `Evaluation::resume_with_entry_value`.
+    RequiresEntryValue(Expression<R>),
+    /// The `Evaluation` needs the value of the parameter at the given location
+    /// in the current function's caller.  Once the caller determines what value
+    /// to provide it should resume the `Evaluation` by calling
+    /// `Evaluation::resume_with_parameter_ref`.
+    RequiresParameterRef(UnitOffset<R::Offset>),
+    /// The `Evaluation` needs an address to be relocated to proceed further.
+    /// Once the caller determines what value to provide it should resume the
+    /// `Evaluation` by calling `Evaluation::resume_with_relocated_address`.
+    RequiresRelocatedAddress(u64),
+    /// The `Evaluation` needs an address from the `.debug_addr` section.
+    /// This address may also need to be relocated.
+    /// Once the caller determines what value to provide it should resume the
+    /// `Evaluation` by calling `Evaluation::resume_with_indexed_address`.
+    RequiresIndexedAddress {
+        /// The index of the address in the `.debug_addr` section,
+        /// relative to the `DW_AT_addr_base` of the compilation unit.
+        index: DebugAddrIndex<R::Offset>,
+        /// Whether the address also needs to be relocated.
+        relocate: bool,
+    },
+    /// The `Evaluation` needs the `ValueType` for the base type DIE at
+    /// the give unit offset.  Once the caller determines what value to provide it
+    /// should resume the `Evaluation` by calling
+    /// `Evaluation::resume_with_base_type`.
+    RequiresBaseType(UnitOffset<R::Offset>),
+}
+
+/// The bytecode for a DWARF expression or location description.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct Expression<R: Reader>(pub R);
+
+impl<R: Reader> Expression<R> {
+    /// Create an evaluation for this expression.
+    ///
+    /// The `encoding` is determined by the
+    /// [`CompilationUnitHeader`](struct.CompilationUnitHeader.html) or
+    /// [`TypeUnitHeader`](struct.TypeUnitHeader.html) that this expression
+    /// relates to.
+    ///
+    /// # Examples
+    /// ```rust,no_run
+    /// use gimli::Expression;
+    /// # let endian = gimli::LittleEndian;
+    /// # let debug_info = gimli::DebugInfo::from(gimli::EndianSlice::new(&[], endian));
+    /// # let unit = debug_info.units().next().unwrap().unwrap();
+    /// # let bytecode = gimli::EndianSlice::new(&[], endian);
+    /// let expression = gimli::Expression(bytecode);
+    /// let mut eval = expression.evaluation(unit.encoding());
+    /// let mut result = eval.evaluate().unwrap();
+    /// ```
+    #[inline]
+    pub fn evaluation(self, encoding: Encoding) -> Evaluation<R> {
+        Evaluation::new(self.0, encoding)
+    }
+
+    /// Return an iterator for the operations in the expression.
+    pub fn operations(self, encoding: Encoding) -> OperationIter<R> {
+        OperationIter {
+            input: self.0,
+            encoding,
+        }
+    }
+}
+
+/// An iterator for the operations in an expression.
+#[derive(Debug, Clone, Copy)]
+pub struct OperationIter<R: Reader> {
+    input: R,
+    encoding: Encoding,
+}
+
+impl<R: Reader> OperationIter<R> {
+    /// Read the next operation in an expression.
+    pub fn next(&mut self) -> Result<Option<Operation<R>>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+        match Operation::parse(&mut self.input, self.encoding) {
+            Ok(op) => Ok(Some(op)),
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+
+    /// Return the current byte offset of the iterator.
+    pub fn offset_from(&self, expression: &Expression<R>) -> R::Offset {
+        self.input.offset_from(&expression.0)
+    }
+}
+
+/// A DWARF expression evaluator.
+///
+/// # Usage
+/// A DWARF expression may require additional data to produce a final result,
+/// such as the value of a register or a memory location.  Once initial setup
+/// is complete (i.e. `set_initial_value()`, `set_object_address()`) the
+/// consumer calls the `evaluate()` method.  That returns an `EvaluationResult`,
+/// which is either `EvaluationResult::Complete` or a value indicating what
+/// data is needed to resume the `Evaluation`.  The consumer is responsible for
+/// producing that data and resuming the computation with the correct method,
+/// as documented for `EvaluationResult`.  Only once an `EvaluationResult::Complete`
+/// is returned can the consumer call `result()`.
+///
+/// This design allows the consumer of `Evaluation` to decide how and when to
+/// produce the required data and resume the computation.  The `Evaluation` can
+/// be driven synchronously (as shown below) or by some asynchronous mechanism
+/// such as futures.
+///
+/// # Examples
+/// ```rust,no_run
+/// use gimli::{EndianSlice, Evaluation, EvaluationResult, Format, LittleEndian, Value};
+/// # let bytecode = EndianSlice::new(&[], LittleEndian);
+/// # let encoding = unimplemented!();
+/// # let get_register_value = |_, _| Value::Generic(42);
+/// # let get_frame_base = || 0xdeadbeef;
+///
+/// let mut eval = Evaluation::new(bytecode, encoding);
+/// let mut result = eval.evaluate().unwrap();
+/// while result != EvaluationResult::Complete {
+///   match result {
+///     EvaluationResult::RequiresRegister { register, base_type } => {
+///       let value = get_register_value(register, base_type);
+///       result = eval.resume_with_register(value).unwrap();
+///     },
+///     EvaluationResult::RequiresFrameBase => {
+///       let frame_base = get_frame_base();
+///       result = eval.resume_with_frame_base(frame_base).unwrap();
+///     },
+///     _ => unimplemented!(),
+///   };
+/// }
+///
+/// let result = eval.result();
+/// println!("{:?}", result);
+/// ```
+#[derive(Debug)]
+pub struct Evaluation<R: Reader> {
+    bytecode: R,
+    encoding: Encoding,
+    object_address: Option<u64>,
+    max_iterations: Option<u32>,
+    iteration: u32,
+    state: EvaluationState<R>,
+
+    // Stack operations are done on word-sized values.  We do all
+    // operations on 64-bit values, and then mask the results
+    // appropriately when popping.
+    addr_mask: u64,
+
+    // The stack.
+    stack: Vec<Value>,
+
+    // The next operation to decode and evaluate.
+    pc: R,
+
+    // If we see a DW_OP_call* operation, the previous PC and bytecode
+    // is stored here while evaluating the subroutine.
+    expression_stack: Vec<(R, R)>,
+
+    result: Vec<Piece<R>>,
+}
+
+impl<R: Reader> Evaluation<R> {
+    /// Create a new DWARF expression evaluator.
+    ///
+    /// The new evaluator is created without an initial value, without
+    /// an object address, and without a maximum number of iterations.
+    pub fn new(bytecode: R, encoding: Encoding) -> Evaluation<R> {
+        let pc = bytecode.clone();
+        Evaluation {
+            bytecode,
+            encoding,
+            object_address: None,
+            max_iterations: None,
+            iteration: 0,
+            state: EvaluationState::Start(None),
+            addr_mask: if encoding.address_size == 8 {
+                !0u64
+            } else {
+                (1 << (8 * u64::from(encoding.address_size))) - 1
+            },
+            stack: Vec::new(),
+            expression_stack: Vec::new(),
+            pc,
+            result: Vec::new(),
+        }
+    }
+
+    /// Set an initial value to be pushed on the DWARF expression
+    /// evaluator's stack.  This can be used in cases like
+    /// `DW_AT_vtable_elem_location`, which require a value on the
+    /// stack before evaluation commences.  If no initial value is
+    /// set, and the expression uses an opcode requiring the initial
+    /// value, then evaluation will fail with an error.
+    ///
+    /// # Panics
+    /// Panics if `set_initial_value()` has already been called, or if
+    /// `evaluate()` has already been called.
+    pub fn set_initial_value(&mut self, value: u64) {
+        match self.state {
+            EvaluationState::Start(None) => {
+                self.state = EvaluationState::Start(Some(value));
+            }
+            _ => panic!(
+                "`Evaluation::set_initial_value` was called twice, or after evaluation began."
+            ),
+        };
+    }
+
+    /// Set the enclosing object's address, as used by
+    /// `DW_OP_push_object_address`.  If no object address is set, and
+    /// the expression uses an opcode requiring the object address,
+    /// then evaluation will fail with an error.
+    pub fn set_object_address(&mut self, value: u64) {
+        self.object_address = Some(value);
+    }
+
+    /// Set the maximum number of iterations to be allowed by the
+    /// expression evaluator.
+    ///
+    /// An iteration corresponds approximately to the evaluation of a
+    /// single operation in an expression ("approximately" because the
+    /// implementation may allow two such operations in some cases).
+    /// The default is not to have a maximum; once set, it's not
+    /// possible to go back to this default state.  This value can be
+    /// set to avoid denial of service attacks by bad DWARF bytecode.
+    pub fn set_max_iterations(&mut self, value: u32) {
+        self.max_iterations = Some(value);
+    }
+
+    fn pop(&mut self) -> Result<Value> {
+        match self.stack.pop() {
+            Some(value) => Ok(value),
+            None => Err(Error::NotEnoughStackItems),
+        }
+    }
+
+    fn push(&mut self, value: Value) {
+        self.stack.push(value);
+    }
+
+    #[allow(clippy::cyclomatic_complexity)]
+    fn evaluate_one_operation(&mut self) -> Result<OperationEvaluationResult<R>> {
+        let operation = Operation::parse(&mut self.pc, self.encoding)?;
+
+        match operation {
+            Operation::Deref {
+                base_type,
+                size,
+                space,
+            } => {
+                let entry = self.pop()?;
+                let addr = entry.to_u64(self.addr_mask)?;
+                let addr_space = if space {
+                    let entry = self.pop()?;
+                    let value = entry.to_u64(self.addr_mask)?;
+                    Some(value)
+                } else {
+                    None
+                };
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::Memory,
+                    EvaluationResult::RequiresMemory {
+                        address: addr,
+                        size,
+                        space: addr_space,
+                        base_type,
+                    },
+                ));
+            }
+
+            Operation::Drop => {
+                self.pop()?;
+            }
+            Operation::Pick { index } => {
+                let len = self.stack.len();
+                let index = index as usize;
+                if index >= len {
+                    return Err(Error::NotEnoughStackItems);
+                }
+                let value = self.stack[len - index - 1];
+                self.push(value);
+            }
+            Operation::Swap => {
+                let top = self.pop()?;
+                let next = self.pop()?;
+                self.push(top);
+                self.push(next);
+            }
+            Operation::Rot => {
+                let one = self.pop()?;
+                let two = self.pop()?;
+                let three = self.pop()?;
+                self.push(one);
+                self.push(three);
+                self.push(two);
+            }
+
+            Operation::Abs => {
+                let value = self.pop()?;
+                let result = value.abs(self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::And => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.and(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Div => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.div(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Minus => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.sub(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Mod => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.rem(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Mul => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.mul(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Neg => {
+                let v = self.pop()?;
+                let result = v.neg(self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Not => {
+                let value = self.pop()?;
+                let result = value.not(self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Or => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.or(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Plus => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.add(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::PlusConstant { value } => {
+                let lhs = self.pop()?;
+                let rhs = Value::from_u64(lhs.value_type(), value)?;
+                let result = lhs.add(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Shl => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.shl(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Shr => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.shr(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Shra => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.shra(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Xor => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.xor(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+
+            Operation::Bra { target } => {
+                let entry = self.pop()?;
+                let v = entry.to_u64(self.addr_mask)?;
+                if v != 0 {
+                    self.pc = compute_pc(&self.pc, &self.bytecode, target)?;
+                }
+            }
+
+            Operation::Eq => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.eq(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Ge => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.ge(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Gt => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.gt(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Le => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.le(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Lt => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.lt(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+            Operation::Ne => {
+                let rhs = self.pop()?;
+                let lhs = self.pop()?;
+                let result = lhs.ne(rhs, self.addr_mask)?;
+                self.push(result);
+            }
+
+            Operation::Skip { target } => {
+                self.pc = compute_pc(&self.pc, &self.bytecode, target)?;
+            }
+
+            Operation::UnsignedConstant { value } => {
+                self.push(Value::Generic(value));
+            }
+
+            Operation::SignedConstant { value } => {
+                self.push(Value::Generic(value as u64));
+            }
+
+            Operation::RegisterOffset {
+                register,
+                offset,
+                base_type,
+            } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::Register { offset },
+                    EvaluationResult::RequiresRegister {
+                        register,
+                        base_type,
+                    },
+                ));
+            }
+
+            Operation::FrameOffset { offset } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::FrameBase { offset },
+                    EvaluationResult::RequiresFrameBase,
+                ));
+            }
+
+            Operation::Nop => {}
+
+            Operation::PushObjectAddress => {
+                if let Some(value) = self.object_address {
+                    self.push(Value::Generic(value));
+                } else {
+                    return Err(Error::InvalidPushObjectAddress);
+                }
+            }
+
+            Operation::Call { offset } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::AtLocation,
+                    EvaluationResult::RequiresAtLocation(offset),
+                ));
+            }
+
+            Operation::TLS => {
+                let entry = self.pop()?;
+                let index = entry.to_u64(self.addr_mask)?;
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::Tls,
+                    EvaluationResult::RequiresTls(index),
+                ));
+            }
+
+            Operation::CallFrameCFA => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::Cfa,
+                    EvaluationResult::RequiresCallFrameCfa,
+                ));
+            }
+
+            Operation::Register { register } => {
+                let location = Location::Register { register };
+                return Ok(OperationEvaluationResult::Complete { location });
+            }
+
+            Operation::ImplicitValue { ref data } => {
+                let location = Location::Bytes {
+                    value: data.clone(),
+                };
+                return Ok(OperationEvaluationResult::Complete { location });
+            }
+
+            Operation::StackValue => {
+                let value = self.pop()?;
+                let location = Location::Value { value };
+                return Ok(OperationEvaluationResult::Complete { location });
+            }
+
+            Operation::ImplicitPointer { value, byte_offset } => {
+                let location = Location::ImplicitPointer { value, byte_offset };
+                return Ok(OperationEvaluationResult::Complete { location });
+            }
+
+            Operation::EntryValue { ref expression } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::EntryValue,
+                    EvaluationResult::RequiresEntryValue(Expression(expression.clone())),
+                ));
+            }
+
+            Operation::ParameterRef { offset } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::ParameterRef,
+                    EvaluationResult::RequiresParameterRef(offset),
+                ));
+            }
+
+            Operation::Address { address } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::RelocatedAddress,
+                    EvaluationResult::RequiresRelocatedAddress(address),
+                ));
+            }
+
+            Operation::AddressIndex { index } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::IndexedAddress,
+                    EvaluationResult::RequiresIndexedAddress {
+                        index,
+                        relocate: true,
+                    },
+                ));
+            }
+
+            Operation::ConstantIndex { index } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::IndexedAddress,
+                    EvaluationResult::RequiresIndexedAddress {
+                        index,
+                        relocate: false,
+                    },
+                ));
+            }
+
+            Operation::Piece {
+                size_in_bits,
+                bit_offset,
+            } => {
+                let location = if self.stack.is_empty() {
+                    Location::Empty
+                } else {
+                    let entry = self.pop()?;
+                    let address = entry.to_u64(self.addr_mask)?;
+                    Location::Address { address }
+                };
+                self.result.push(Piece {
+                    size_in_bits: Some(size_in_bits),
+                    bit_offset,
+                    location,
+                });
+                return Ok(OperationEvaluationResult::Piece);
+            }
+
+            Operation::TypedLiteral { base_type, value } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::TypedLiteral { value },
+                    EvaluationResult::RequiresBaseType(base_type),
+                ));
+            }
+            Operation::Convert { base_type } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::Convert,
+                    EvaluationResult::RequiresBaseType(base_type),
+                ));
+            }
+            Operation::Reinterpret { base_type } => {
+                return Ok(OperationEvaluationResult::Waiting(
+                    EvaluationWaiting::Reinterpret,
+                    EvaluationResult::RequiresBaseType(base_type),
+                ));
+            }
+            Operation::WasmLocal { .. }
+            | Operation::WasmGlobal { .. }
+            | Operation::WasmStack { .. } => {
+                return Err(Error::UnsupportedEvaluation);
+            }
+        }
+
+        Ok(OperationEvaluationResult::Incomplete)
+    }
+
+    /// Get the result of this `Evaluation`.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` has not been driven to completion.
+    pub fn result(self) -> Vec<Piece<R>> {
+        match self.state {
+            EvaluationState::Complete => self.result,
+            _ => {
+                panic!("Called `Evaluation::result` on an `Evaluation` that has not been completed")
+            }
+        }
+    }
+
+    /// Evaluate a DWARF expression.  This method should only ever be called
+    /// once.  If the returned `EvaluationResult` is not
+    /// `EvaluationResult::Complete`, the caller should provide the required
+    /// value and resume the evaluation by calling the appropriate resume_with
+    /// method on `Evaluation`.
+    pub fn evaluate(&mut self) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Start(initial_value) => {
+                if let Some(value) = initial_value {
+                    self.push(Value::Generic(value));
+                }
+                self.state = EvaluationState::Ready;
+            }
+            EvaluationState::Ready => {}
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Complete => return Ok(EvaluationResult::Complete),
+            EvaluationState::Waiting(_) => panic!(),
+        };
+
+        match self.evaluate_internal() {
+            Ok(r) => Ok(r),
+            Err(e) => {
+                self.state = EvaluationState::Error(e);
+                Err(e)
+            }
+        }
+    }
+
+    /// Resume the `Evaluation` with the provided memory `value`.  This will apply
+    /// the provided memory value to the evaluation and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresMemory`.
+    pub fn resume_with_memory(&mut self, value: Value) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::Memory) => {
+                self.push(value);
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_memory` without a preceding `EvaluationResult::RequiresMemory`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided `register` value.  This will apply
+    /// the provided register value to the evaluation and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresRegister`.
+    pub fn resume_with_register(&mut self, value: Value) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::Register { offset }) => {
+                let offset = Value::from_u64(value.value_type(), offset as u64)?;
+                let value = value.add(offset, self.addr_mask)?;
+                self.push(value);
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_register` without a preceding `EvaluationResult::RequiresRegister`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided `frame_base`.  This will
+    /// apply the provided frame base value to the evaluation and continue
+    /// evaluating opcodes until the evaluation is completed, reaches an error,
+    /// or needs more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresFrameBase`.
+    pub fn resume_with_frame_base(&mut self, frame_base: u64) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::FrameBase { offset }) => {
+                self.push(Value::Generic(frame_base.wrapping_add(offset as u64)));
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_frame_base` without a preceding `EvaluationResult::RequiresFrameBase`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided `value`.  This will apply
+    /// the provided TLS value to the evaluation and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresTls`.
+    pub fn resume_with_tls(&mut self, value: u64) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::Tls) => {
+                self.push(Value::Generic(value));
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_tls` without a preceding `EvaluationResult::RequiresTls`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided `cfa`.  This will
+    /// apply the provided CFA value to the evaluation and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresCallFrameCfa`.
+    pub fn resume_with_call_frame_cfa(&mut self, cfa: u64) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::Cfa) => {
+                self.push(Value::Generic(cfa));
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_call_frame_cfa` without a preceding `EvaluationResult::RequiresCallFrameCfa`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided `bytes`.  This will
+    /// continue processing the evaluation with the new expression provided
+    /// until the evaluation is completed, reaches an error, or needs more
+    /// information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresAtLocation`.
+    pub fn resume_with_at_location(&mut self, mut bytes: R) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::AtLocation) => {
+                if !bytes.is_empty() {
+                    let mut pc = bytes.clone();
+                    mem::swap(&mut pc, &mut self.pc);
+                    mem::swap(&mut bytes, &mut self.bytecode);
+                    self.expression_stack.push((pc, bytes));
+                }
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_at_location` without a precedeing `EvaluationResult::RequiresAtLocation`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided `entry_value`.  This will
+    /// apply the provided entry value to the evaluation and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresEntryValue`.
+    pub fn resume_with_entry_value(&mut self, entry_value: Value) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::EntryValue) => {
+                self.push(entry_value);
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_entry_value` without a preceding `EvaluationResult::RequiresEntryValue`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided `parameter_value`.  This will
+    /// apply the provided parameter value to the evaluation and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresParameterRef`.
+    pub fn resume_with_parameter_ref(
+        &mut self,
+        parameter_value: u64,
+    ) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::ParameterRef) => {
+                self.push(Value::Generic(parameter_value));
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_parameter_ref` without a preceding `EvaluationResult::RequiresParameterRef`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided relocated `address`.  This will use the
+    /// provided relocated address for the operation that required it, and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with
+    /// `EvaluationResult::RequiresRelocatedAddress`.
+    pub fn resume_with_relocated_address(&mut self, address: u64) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::RelocatedAddress) => {
+                self.push(Value::Generic(address));
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_relocated_address` without a preceding `EvaluationResult::RequiresRelocatedAddress`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided indexed `address`.  This will use the
+    /// provided indexed address for the operation that required it, and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with
+    /// `EvaluationResult::RequiresIndexedAddress`.
+    pub fn resume_with_indexed_address(&mut self, address: u64) -> Result<EvaluationResult<R>> {
+        match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::IndexedAddress) => {
+                self.push(Value::Generic(address));
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_indexed_address` without a preceding `EvaluationResult::RequiresIndexedAddress`"
+            ),
+        };
+
+        self.evaluate_internal()
+    }
+
+    /// Resume the `Evaluation` with the provided `base_type`.  This will use the
+    /// provided base type for the operation that required it, and continue evaluating
+    /// opcodes until the evaluation is completed, reaches an error, or needs
+    /// more information again.
+    ///
+    /// # Panics
+    /// Panics if this `Evaluation` did not previously stop with `EvaluationResult::RequiresBaseType`.
+    pub fn resume_with_base_type(&mut self, base_type: ValueType) -> Result<EvaluationResult<R>> {
+        let value = match self.state {
+            EvaluationState::Error(err) => return Err(err),
+            EvaluationState::Waiting(EvaluationWaiting::TypedLiteral { ref value }) => {
+                Value::parse(base_type, value.clone())?
+            }
+            EvaluationState::Waiting(EvaluationWaiting::Convert) => {
+                let entry = self.pop()?;
+                entry.convert(base_type, self.addr_mask)?
+            }
+            EvaluationState::Waiting(EvaluationWaiting::Reinterpret) => {
+                let entry = self.pop()?;
+                entry.reinterpret(base_type, self.addr_mask)?
+            }
+            _ => panic!(
+                "Called `Evaluation::resume_with_base_type` without a preceding `EvaluationResult::RequiresBaseType`"
+            ),
+        };
+        self.push(value);
+        self.evaluate_internal()
+    }
+
+    fn end_of_expression(&mut self) -> bool {
+        while self.pc.is_empty() {
+            match self.expression_stack.pop() {
+                Some((newpc, newbytes)) => {
+                    self.pc = newpc;
+                    self.bytecode = newbytes;
+                }
+                None => return true,
+            }
+        }
+        false
+    }
+
+    fn evaluate_internal(&mut self) -> Result<EvaluationResult<R>> {
+        while !self.end_of_expression() {
+            self.iteration += 1;
+            if let Some(max_iterations) = self.max_iterations {
+                if self.iteration > max_iterations {
+                    return Err(Error::TooManyIterations);
+                }
+            }
+
+            let op_result = self.evaluate_one_operation()?;
+            match op_result {
+                OperationEvaluationResult::Piece => {}
+                OperationEvaluationResult::Incomplete => {
+                    if self.end_of_expression() && !self.result.is_empty() {
+                        // We saw a piece earlier and then some
+                        // unterminated piece.  It's not clear this is
+                        // well-defined.
+                        return Err(Error::InvalidPiece);
+                    }
+                }
+                OperationEvaluationResult::Complete { location } => {
+                    if self.end_of_expression() {
+                        if !self.result.is_empty() {
+                            // We saw a piece earlier and then some
+                            // unterminated piece.  It's not clear this is
+                            // well-defined.
+                            return Err(Error::InvalidPiece);
+                        }
+                        self.result.push(Piece {
+                            size_in_bits: None,
+                            bit_offset: None,
+                            location,
+                        });
+                    } else {
+                        // If there are more operations, then the next operation must
+                        // be a Piece.
+                        match Operation::parse(&mut self.pc, self.encoding)? {
+                            Operation::Piece {
+                                size_in_bits,
+                                bit_offset,
+                            } => {
+                                self.result.push(Piece {
+                                    size_in_bits: Some(size_in_bits),
+                                    bit_offset,
+                                    location,
+                                });
+                            }
+                            _ => {
+                                let value =
+                                    self.bytecode.len().into_u64() - self.pc.len().into_u64() - 1;
+                                return Err(Error::InvalidExpressionTerminator(value));
+                            }
+                        }
+                    }
+                }
+                OperationEvaluationResult::Waiting(waiting, result) => {
+                    self.state = EvaluationState::Waiting(waiting);
+                    return Ok(result);
+                }
+            };
+        }
+
+        // If no pieces have been seen, use the stack top as the
+        // result.
+        if self.result.is_empty() {
+            let entry = self.pop()?;
+            let addr = entry.to_u64(self.addr_mask)?;
+            self.result.push(Piece {
+                size_in_bits: None,
+                bit_offset: None,
+                location: Location::Address { address: addr },
+            });
+        }
+
+        self.state = EvaluationState::Complete;
+        Ok(EvaluationResult::Complete)
+    }
+}
+
+#[cfg(test)]
+// Tests require leb128::write.
+#[cfg(feature = "write")]
+mod tests {
+    use super::*;
+    use crate::common::Format;
+    use crate::constants;
+    use crate::endianity::LittleEndian;
+    use crate::leb128;
+    use crate::read::{EndianSlice, Error, Result, UnitOffset};
+    use crate::test_util::GimliSectionMethods;
+    use core::usize;
+    use test_assembler::{Endian, Section};
+
+    fn encoding4() -> Encoding {
+        Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        }
+    }
+
+    fn encoding8() -> Encoding {
+        Encoding {
+            format: Format::Dwarf64,
+            version: 4,
+            address_size: 8,
+        }
+    }
+
+    #[test]
+    fn test_compute_pc() {
+        // Contents don't matter for this test, just length.
+        let bytes = [0, 1, 2, 3, 4];
+        let bytecode = &bytes[..];
+        let ebuf = &EndianSlice::new(bytecode, LittleEndian);
+
+        assert_eq!(compute_pc(ebuf, ebuf, 0), Ok(*ebuf));
+        assert_eq!(
+            compute_pc(ebuf, ebuf, -1),
+            Err(Error::BadBranchTarget(usize::MAX as u64))
+        );
+        assert_eq!(compute_pc(ebuf, ebuf, 5), Ok(ebuf.range_from(5..)));
+        assert_eq!(
+            compute_pc(&ebuf.range_from(3..), ebuf, -2),
+            Ok(ebuf.range_from(1..))
+        );
+        assert_eq!(
+            compute_pc(&ebuf.range_from(2..), ebuf, 2),
+            Ok(ebuf.range_from(4..))
+        );
+    }
+
+    fn check_op_parse_simple<'input>(
+        input: &'input [u8],
+        expect: &Operation<EndianSlice<'input, LittleEndian>>,
+        encoding: Encoding,
+    ) {
+        let buf = EndianSlice::new(input, LittleEndian);
+        let mut pc = buf;
+        let value = Operation::parse(&mut pc, encoding);
+        match value {
+            Ok(val) => {
+                assert_eq!(val, *expect);
+                assert_eq!(pc.len(), 0);
+            }
+            _ => panic!("Unexpected result"),
+        }
+    }
+
+    fn check_op_parse_eof(input: &[u8], encoding: Encoding) {
+        let buf = EndianSlice::new(input, LittleEndian);
+        let mut pc = buf;
+        match Operation::parse(&mut pc, encoding) {
+            Err(Error::UnexpectedEof(id)) => {
+                assert!(buf.lookup_offset_id(id).is_some());
+            }
+
+            _ => panic!("Unexpected result"),
+        }
+    }
+
+    fn check_op_parse<F>(
+        input: F,
+        expect: &Operation<EndianSlice<LittleEndian>>,
+        encoding: Encoding,
+    ) where
+        F: Fn(Section) -> Section,
+    {
+        let input = input(Section::with_endian(Endian::Little))
+            .get_contents()
+            .unwrap();
+        for i in 1..input.len() {
+            check_op_parse_eof(&input[..i], encoding);
+        }
+        check_op_parse_simple(&input, expect, encoding);
+    }
+
+    #[test]
+    fn test_op_parse_onebyte() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        // Test all single-byte opcodes.
+        #[rustfmt::skip]
+        let inputs = [
+            (
+                constants::DW_OP_deref,
+                Operation::Deref {
+                    base_type: generic_type(),
+                    size: encoding.address_size,
+                    space: false,
+                },
+            ),
+            (constants::DW_OP_dup, Operation::Pick { index: 0 }),
+            (constants::DW_OP_drop, Operation::Drop),
+            (constants::DW_OP_over, Operation::Pick { index: 1 }),
+            (constants::DW_OP_swap, Operation::Swap),
+            (constants::DW_OP_rot, Operation::Rot),
+            (
+                constants::DW_OP_xderef,
+                Operation::Deref {
+                    base_type: generic_type(),
+                    size: encoding.address_size,
+                    space: true,
+                },
+            ),
+            (constants::DW_OP_abs, Operation::Abs),
+            (constants::DW_OP_and, Operation::And),
+            (constants::DW_OP_div, Operation::Div),
+            (constants::DW_OP_minus, Operation::Minus),
+            (constants::DW_OP_mod, Operation::Mod),
+            (constants::DW_OP_mul, Operation::Mul),
+            (constants::DW_OP_neg, Operation::Neg),
+            (constants::DW_OP_not, Operation::Not),
+            (constants::DW_OP_or, Operation::Or),
+            (constants::DW_OP_plus, Operation::Plus),
+            (constants::DW_OP_shl, Operation::Shl),
+            (constants::DW_OP_shr, Operation::Shr),
+            (constants::DW_OP_shra, Operation::Shra),
+            (constants::DW_OP_xor, Operation::Xor),
+            (constants::DW_OP_eq, Operation::Eq),
+            (constants::DW_OP_ge, Operation::Ge),
+            (constants::DW_OP_gt, Operation::Gt),
+            (constants::DW_OP_le, Operation::Le),
+            (constants::DW_OP_lt, Operation::Lt),
+            (constants::DW_OP_ne, Operation::Ne),
+            (constants::DW_OP_lit0, Operation::UnsignedConstant { value: 0 }),
+            (constants::DW_OP_lit1, Operation::UnsignedConstant { value: 1 }),
+            (constants::DW_OP_lit2, Operation::UnsignedConstant { value: 2 }),
+            (constants::DW_OP_lit3, Operation::UnsignedConstant { value: 3 }),
+            (constants::DW_OP_lit4, Operation::UnsignedConstant { value: 4 }),
+            (constants::DW_OP_lit5, Operation::UnsignedConstant { value: 5 }),
+            (constants::DW_OP_lit6, Operation::UnsignedConstant { value: 6 }),
+            (constants::DW_OP_lit7, Operation::UnsignedConstant { value: 7 }),
+            (constants::DW_OP_lit8, Operation::UnsignedConstant { value: 8 }),
+            (constants::DW_OP_lit9, Operation::UnsignedConstant { value: 9 }),
+            (constants::DW_OP_lit10, Operation::UnsignedConstant { value: 10 }),
+            (constants::DW_OP_lit11, Operation::UnsignedConstant { value: 11 }),
+            (constants::DW_OP_lit12, Operation::UnsignedConstant { value: 12 }),
+            (constants::DW_OP_lit13, Operation::UnsignedConstant { value: 13 }),
+            (constants::DW_OP_lit14, Operation::UnsignedConstant { value: 14 }),
+            (constants::DW_OP_lit15, Operation::UnsignedConstant { value: 15 }),
+            (constants::DW_OP_lit16, Operation::UnsignedConstant { value: 16 }),
+            (constants::DW_OP_lit17, Operation::UnsignedConstant { value: 17 }),
+            (constants::DW_OP_lit18, Operation::UnsignedConstant { value: 18 }),
+            (constants::DW_OP_lit19, Operation::UnsignedConstant { value: 19 }),
+            (constants::DW_OP_lit20, Operation::UnsignedConstant { value: 20 }),
+            (constants::DW_OP_lit21, Operation::UnsignedConstant { value: 21 }),
+            (constants::DW_OP_lit22, Operation::UnsignedConstant { value: 22 }),
+            (constants::DW_OP_lit23, Operation::UnsignedConstant { value: 23 }),
+            (constants::DW_OP_lit24, Operation::UnsignedConstant { value: 24 }),
+            (constants::DW_OP_lit25, Operation::UnsignedConstant { value: 25 }),
+            (constants::DW_OP_lit26, Operation::UnsignedConstant { value: 26 }),
+            (constants::DW_OP_lit27, Operation::UnsignedConstant { value: 27 }),
+            (constants::DW_OP_lit28, Operation::UnsignedConstant { value: 28 }),
+            (constants::DW_OP_lit29, Operation::UnsignedConstant { value: 29 }),
+            (constants::DW_OP_lit30, Operation::UnsignedConstant { value: 30 }),
+            (constants::DW_OP_lit31, Operation::UnsignedConstant { value: 31 }),
+            (constants::DW_OP_reg0, Operation::Register { register: Register(0) }),
+            (constants::DW_OP_reg1, Operation::Register { register: Register(1) }),
+            (constants::DW_OP_reg2, Operation::Register { register: Register(2) }),
+            (constants::DW_OP_reg3, Operation::Register { register: Register(3) }),
+            (constants::DW_OP_reg4, Operation::Register { register: Register(4) }),
+            (constants::DW_OP_reg5, Operation::Register { register: Register(5) }),
+            (constants::DW_OP_reg6, Operation::Register { register: Register(6) }),
+            (constants::DW_OP_reg7, Operation::Register { register: Register(7) }),
+            (constants::DW_OP_reg8, Operation::Register { register: Register(8) }),
+            (constants::DW_OP_reg9, Operation::Register { register: Register(9) }),
+            (constants::DW_OP_reg10, Operation::Register { register: Register(10) }),
+            (constants::DW_OP_reg11, Operation::Register { register: Register(11) }),
+            (constants::DW_OP_reg12, Operation::Register { register: Register(12) }),
+            (constants::DW_OP_reg13, Operation::Register { register: Register(13) }),
+            (constants::DW_OP_reg14, Operation::Register { register: Register(14) }),
+            (constants::DW_OP_reg15, Operation::Register { register: Register(15) }),
+            (constants::DW_OP_reg16, Operation::Register { register: Register(16) }),
+            (constants::DW_OP_reg17, Operation::Register { register: Register(17) }),
+            (constants::DW_OP_reg18, Operation::Register { register: Register(18) }),
+            (constants::DW_OP_reg19, Operation::Register { register: Register(19) }),
+            (constants::DW_OP_reg20, Operation::Register { register: Register(20) }),
+            (constants::DW_OP_reg21, Operation::Register { register: Register(21) }),
+            (constants::DW_OP_reg22, Operation::Register { register: Register(22) }),
+            (constants::DW_OP_reg23, Operation::Register { register: Register(23) }),
+            (constants::DW_OP_reg24, Operation::Register { register: Register(24) }),
+            (constants::DW_OP_reg25, Operation::Register { register: Register(25) }),
+            (constants::DW_OP_reg26, Operation::Register { register: Register(26) }),
+            (constants::DW_OP_reg27, Operation::Register { register: Register(27) }),
+            (constants::DW_OP_reg28, Operation::Register { register: Register(28) }),
+            (constants::DW_OP_reg29, Operation::Register { register: Register(29) }),
+            (constants::DW_OP_reg30, Operation::Register { register: Register(30) }),
+            (constants::DW_OP_reg31, Operation::Register { register: Register(31) }),
+            (constants::DW_OP_nop, Operation::Nop),
+            (constants::DW_OP_push_object_address, Operation::PushObjectAddress),
+            (constants::DW_OP_form_tls_address, Operation::TLS),
+            (constants::DW_OP_GNU_push_tls_address, Operation::TLS),
+            (constants::DW_OP_call_frame_cfa, Operation::CallFrameCFA),
+            (constants::DW_OP_stack_value, Operation::StackValue),
+        ];
+
+        let input = [];
+        check_op_parse_eof(&input[..], encoding);
+
+        for item in inputs.iter() {
+            let (opcode, ref result) = *item;
+            check_op_parse(|s| s.D8(opcode.0), result, encoding);
+        }
+    }
+
+    #[test]
+    fn test_op_parse_twobyte() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        let inputs = [
+            (
+                constants::DW_OP_const1u,
+                23,
+                Operation::UnsignedConstant { value: 23 },
+            ),
+            (
+                constants::DW_OP_const1s,
+                (-23i8) as u8,
+                Operation::SignedConstant { value: -23 },
+            ),
+            (constants::DW_OP_pick, 7, Operation::Pick { index: 7 }),
+            (
+                constants::DW_OP_deref_size,
+                19,
+                Operation::Deref {
+                    base_type: generic_type(),
+                    size: 19,
+                    space: false,
+                },
+            ),
+            (
+                constants::DW_OP_xderef_size,
+                19,
+                Operation::Deref {
+                    base_type: generic_type(),
+                    size: 19,
+                    space: true,
+                },
+            ),
+        ];
+
+        for item in inputs.iter() {
+            let (opcode, arg, ref result) = *item;
+            check_op_parse(|s| s.D8(opcode.0).D8(arg), result, encoding);
+        }
+    }
+
+    #[test]
+    fn test_op_parse_threebyte() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        // While bra and skip are 3-byte opcodes, they aren't tested here,
+        // but rather specially in their own function.
+        let inputs = [
+            (
+                constants::DW_OP_const2u,
+                23,
+                Operation::UnsignedConstant { value: 23 },
+            ),
+            (
+                constants::DW_OP_const2s,
+                (-23i16) as u16,
+                Operation::SignedConstant { value: -23 },
+            ),
+            (
+                constants::DW_OP_call2,
+                1138,
+                Operation::Call {
+                    offset: DieReference::UnitRef(UnitOffset(1138)),
+                },
+            ),
+            (
+                constants::DW_OP_bra,
+                (-23i16) as u16,
+                Operation::Bra { target: -23 },
+            ),
+            (
+                constants::DW_OP_skip,
+                (-23i16) as u16,
+                Operation::Skip { target: -23 },
+            ),
+        ];
+
+        for item in inputs.iter() {
+            let (opcode, arg, ref result) = *item;
+            check_op_parse(|s| s.D8(opcode.0).L16(arg), result, encoding);
+        }
+    }
+
+    #[test]
+    fn test_op_parse_fivebyte() {
+        // There are some tests here that depend on address size.
+        let encoding = encoding4();
+
+        let inputs = [
+            (
+                constants::DW_OP_addr,
+                0x1234_5678,
+                Operation::Address {
+                    address: 0x1234_5678,
+                },
+            ),
+            (
+                constants::DW_OP_const4u,
+                0x1234_5678,
+                Operation::UnsignedConstant { value: 0x1234_5678 },
+            ),
+            (
+                constants::DW_OP_const4s,
+                (-23i32) as u32,
+                Operation::SignedConstant { value: -23 },
+            ),
+            (
+                constants::DW_OP_call4,
+                0x1234_5678,
+                Operation::Call {
+                    offset: DieReference::UnitRef(UnitOffset(0x1234_5678)),
+                },
+            ),
+            (
+                constants::DW_OP_call_ref,
+                0x1234_5678,
+                Operation::Call {
+                    offset: DieReference::DebugInfoRef(DebugInfoOffset(0x1234_5678)),
+                },
+            ),
+        ];
+
+        for item in inputs.iter() {
+            let (op, arg, ref expect) = *item;
+            check_op_parse(|s| s.D8(op.0).L32(arg), expect, encoding);
+        }
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_op_parse_ninebyte() {
+        // There are some tests here that depend on address size.
+        let encoding = encoding8();
+
+        let inputs = [
+            (
+                constants::DW_OP_addr,
+                0x1234_5678_1234_5678,
+                Operation::Address {
+                    address: 0x1234_5678_1234_5678,
+                },
+            ),
+            (
+                constants::DW_OP_const8u,
+                0x1234_5678_1234_5678,
+                Operation::UnsignedConstant {
+                    value: 0x1234_5678_1234_5678,
+                },
+            ),
+            (
+                constants::DW_OP_const8s,
+                (-23i64) as u64,
+                Operation::SignedConstant { value: -23 },
+            ),
+            (
+                constants::DW_OP_call_ref,
+                0x1234_5678_1234_5678,
+                Operation::Call {
+                    offset: DieReference::DebugInfoRef(DebugInfoOffset(0x1234_5678_1234_5678)),
+                },
+            ),
+        ];
+
+        for item in inputs.iter() {
+            let (op, arg, ref expect) = *item;
+            check_op_parse(|s| s.D8(op.0).L64(arg), expect, encoding);
+        }
+    }
+
+    #[test]
+    fn test_op_parse_sleb() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        let values = [
+            -1i64,
+            0,
+            1,
+            0x100,
+            0x1eee_eeee,
+            0x7fff_ffff_ffff_ffff,
+            -0x100,
+            -0x1eee_eeee,
+            -0x7fff_ffff_ffff_ffff,
+        ];
+        for value in values.iter() {
+            let mut inputs = vec![
+                (
+                    constants::DW_OP_consts.0,
+                    Operation::SignedConstant { value: *value },
+                ),
+                (
+                    constants::DW_OP_fbreg.0,
+                    Operation::FrameOffset { offset: *value },
+                ),
+            ];
+
+            for i in 0..32 {
+                inputs.push((
+                    constants::DW_OP_breg0.0 + i,
+                    Operation::RegisterOffset {
+                        register: Register(i.into()),
+                        offset: *value,
+                        base_type: UnitOffset(0),
+                    },
+                ));
+            }
+
+            for item in inputs.iter() {
+                let (op, ref expect) = *item;
+                check_op_parse(|s| s.D8(op).sleb(*value), expect, encoding);
+            }
+        }
+    }
+
+    #[test]
+    fn test_op_parse_uleb() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        let values = [
+            0,
+            1,
+            0x100,
+            (!0u16).into(),
+            0x1eee_eeee,
+            0x7fff_ffff_ffff_ffff,
+            !0u64,
+        ];
+        for value in values.iter() {
+            let mut inputs = vec![
+                (
+                    constants::DW_OP_constu,
+                    Operation::UnsignedConstant { value: *value },
+                ),
+                (
+                    constants::DW_OP_plus_uconst,
+                    Operation::PlusConstant { value: *value },
+                ),
+            ];
+
+            if *value <= (!0u16).into() {
+                inputs.push((
+                    constants::DW_OP_regx,
+                    Operation::Register {
+                        register: Register::from_u64(*value).unwrap(),
+                    },
+                ));
+            }
+
+            if *value <= (!0u32).into() {
+                inputs.extend(&[
+                    (
+                        constants::DW_OP_addrx,
+                        Operation::AddressIndex {
+                            index: DebugAddrIndex(*value as usize),
+                        },
+                    ),
+                    (
+                        constants::DW_OP_constx,
+                        Operation::ConstantIndex {
+                            index: DebugAddrIndex(*value as usize),
+                        },
+                    ),
+                ]);
+            }
+
+            // FIXME
+            if *value < !0u64 / 8 {
+                inputs.push((
+                    constants::DW_OP_piece,
+                    Operation::Piece {
+                        size_in_bits: 8 * value,
+                        bit_offset: None,
+                    },
+                ));
+            }
+
+            for item in inputs.iter() {
+                let (op, ref expect) = *item;
+                let input = Section::with_endian(Endian::Little)
+                    .D8(op.0)
+                    .uleb(*value)
+                    .get_contents()
+                    .unwrap();
+                check_op_parse_simple(&input, expect, encoding);
+            }
+        }
+    }
+
+    #[test]
+    fn test_op_parse_bregx() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        let uvalues = [0, 1, 0x100, !0u16];
+        let svalues = [
+            -1i64,
+            0,
+            1,
+            0x100,
+            0x1eee_eeee,
+            0x7fff_ffff_ffff_ffff,
+            -0x100,
+            -0x1eee_eeee,
+            -0x7fff_ffff_ffff_ffff,
+        ];
+
+        for v1 in uvalues.iter() {
+            for v2 in svalues.iter() {
+                check_op_parse(
+                    |s| s.D8(constants::DW_OP_bregx.0).uleb((*v1).into()).sleb(*v2),
+                    &Operation::RegisterOffset {
+                        register: Register(*v1),
+                        offset: *v2,
+                        base_type: UnitOffset(0),
+                    },
+                    encoding,
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn test_op_parse_bit_piece() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        let values = [0, 1, 0x100, 0x1eee_eeee, 0x7fff_ffff_ffff_ffff, !0u64];
+
+        for v1 in values.iter() {
+            for v2 in values.iter() {
+                let input = Section::with_endian(Endian::Little)
+                    .D8(constants::DW_OP_bit_piece.0)
+                    .uleb(*v1)
+                    .uleb(*v2)
+                    .get_contents()
+                    .unwrap();
+                check_op_parse_simple(
+                    &input,
+                    &Operation::Piece {
+                        size_in_bits: *v1,
+                        bit_offset: Some(*v2),
+                    },
+                    encoding,
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn test_op_parse_implicit_value() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        let data = b"hello";
+
+        check_op_parse(
+            |s| {
+                s.D8(constants::DW_OP_implicit_value.0)
+                    .uleb(data.len() as u64)
+                    .append_bytes(&data[..])
+            },
+            &Operation::ImplicitValue {
+                data: EndianSlice::new(&data[..], LittleEndian),
+            },
+            encoding,
+        );
+    }
+
+    #[test]
+    fn test_op_parse_const_type() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        let data = b"hello";
+
+        check_op_parse(
+            |s| {
+                s.D8(constants::DW_OP_const_type.0)
+                    .uleb(100)
+                    .D8(data.len() as u8)
+                    .append_bytes(&data[..])
+            },
+            &Operation::TypedLiteral {
+                base_type: UnitOffset(100),
+                value: EndianSlice::new(&data[..], LittleEndian),
+            },
+            encoding,
+        );
+        check_op_parse(
+            |s| {
+                s.D8(constants::DW_OP_GNU_const_type.0)
+                    .uleb(100)
+                    .D8(data.len() as u8)
+                    .append_bytes(&data[..])
+            },
+            &Operation::TypedLiteral {
+                base_type: UnitOffset(100),
+                value: EndianSlice::new(&data[..], LittleEndian),
+            },
+            encoding,
+        );
+    }
+
+    #[test]
+    fn test_op_parse_regval_type() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_regval_type.0).uleb(1).uleb(100),
+            &Operation::RegisterOffset {
+                register: Register(1),
+                offset: 0,
+                base_type: UnitOffset(100),
+            },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_GNU_regval_type.0).uleb(1).uleb(100),
+            &Operation::RegisterOffset {
+                register: Register(1),
+                offset: 0,
+                base_type: UnitOffset(100),
+            },
+            encoding,
+        );
+    }
+
+    #[test]
+    fn test_op_parse_deref_type() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_deref_type.0).D8(8).uleb(100),
+            &Operation::Deref {
+                base_type: UnitOffset(100),
+                size: 8,
+                space: false,
+            },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_GNU_deref_type.0).D8(8).uleb(100),
+            &Operation::Deref {
+                base_type: UnitOffset(100),
+                size: 8,
+                space: false,
+            },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_xderef_type.0).D8(8).uleb(100),
+            &Operation::Deref {
+                base_type: UnitOffset(100),
+                size: 8,
+                space: true,
+            },
+            encoding,
+        );
+    }
+
+    #[test]
+    fn test_op_convert() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_convert.0).uleb(100),
+            &Operation::Convert {
+                base_type: UnitOffset(100),
+            },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_GNU_convert.0).uleb(100),
+            &Operation::Convert {
+                base_type: UnitOffset(100),
+            },
+            encoding,
+        );
+    }
+
+    #[test]
+    fn test_op_reinterpret() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_reinterpret.0).uleb(100),
+            &Operation::Reinterpret {
+                base_type: UnitOffset(100),
+            },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_GNU_reinterpret.0).uleb(100),
+            &Operation::Reinterpret {
+                base_type: UnitOffset(100),
+            },
+            encoding,
+        );
+    }
+
+    #[test]
+    fn test_op_parse_implicit_pointer() {
+        for op in &[
+            constants::DW_OP_implicit_pointer,
+            constants::DW_OP_GNU_implicit_pointer,
+        ] {
+            check_op_parse(
+                |s| s.D8(op.0).D32(0x1234_5678).sleb(0x123),
+                &Operation::ImplicitPointer {
+                    value: DebugInfoOffset(0x1234_5678),
+                    byte_offset: 0x123,
+                },
+                encoding4(),
+            );
+
+            check_op_parse(
+                |s| s.D8(op.0).D64(0x1234_5678).sleb(0x123),
+                &Operation::ImplicitPointer {
+                    value: DebugInfoOffset(0x1234_5678),
+                    byte_offset: 0x123,
+                },
+                encoding8(),
+            );
+        }
+    }
+
+    #[test]
+    fn test_op_parse_entry_value() {
+        for op in &[
+            constants::DW_OP_entry_value,
+            constants::DW_OP_GNU_entry_value,
+        ] {
+            let data = b"hello";
+            check_op_parse(
+                |s| s.D8(op.0).uleb(data.len() as u64).append_bytes(&data[..]),
+                &Operation::EntryValue {
+                    expression: EndianSlice::new(&data[..], LittleEndian),
+                },
+                encoding4(),
+            );
+        }
+    }
+
+    #[test]
+    fn test_op_parse_gnu_parameter_ref() {
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_GNU_parameter_ref.0).D32(0x1234_5678),
+            &Operation::ParameterRef {
+                offset: UnitOffset(0x1234_5678),
+            },
+            encoding4(),
+        )
+    }
+
+    #[test]
+    fn test_op_wasm() {
+        // Doesn't matter for this test.
+        let encoding = encoding4();
+
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_WASM_location.0).D8(0).uleb(1000),
+            &Operation::WasmLocal { index: 1000 },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_WASM_location.0).D8(1).uleb(1000),
+            &Operation::WasmGlobal { index: 1000 },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_WASM_location.0).D8(2).uleb(1000),
+            &Operation::WasmStack { index: 1000 },
+            encoding,
+        );
+        check_op_parse(
+            |s| s.D8(constants::DW_OP_WASM_location.0).D8(3).D32(1000),
+            &Operation::WasmGlobal { index: 1000 },
+            encoding,
+        );
+    }
+
+    enum AssemblerEntry {
+        Op(constants::DwOp),
+        Mark(u8),
+        Branch(u8),
+        U8(u8),
+        U16(u16),
+        U32(u32),
+        U64(u64),
+        Uleb(u64),
+        Sleb(u64),
+    }
+
+    fn assemble(entries: &[AssemblerEntry]) -> Vec<u8> {
+        let mut result = Vec::new();
+
+        struct Marker(Option<usize>, Vec<usize>);
+
+        let mut markers = Vec::new();
+        for _ in 0..256 {
+            markers.push(Marker(None, Vec::new()));
+        }
+
+        fn write(stack: &mut Vec<u8>, index: usize, mut num: u64, nbytes: u8) {
+            for i in 0..nbytes as usize {
+                stack[index + i] = (num & 0xff) as u8;
+                num >>= 8;
+            }
+        }
+
+        fn push(stack: &mut Vec<u8>, num: u64, nbytes: u8) {
+            let index = stack.len();
+            for _ in 0..nbytes {
+                stack.push(0);
+            }
+            write(stack, index, num, nbytes);
+        }
+
+        for item in entries {
+            match *item {
+                AssemblerEntry::Op(op) => result.push(op.0),
+                AssemblerEntry::Mark(num) => {
+                    assert!(markers[num as usize].0.is_none());
+                    markers[num as usize].0 = Some(result.len());
+                }
+                AssemblerEntry::Branch(num) => {
+                    markers[num as usize].1.push(result.len());
+                    push(&mut result, 0, 2);
+                }
+                AssemblerEntry::U8(num) => result.push(num),
+                AssemblerEntry::U16(num) => push(&mut result, u64::from(num), 2),
+                AssemblerEntry::U32(num) => push(&mut result, u64::from(num), 4),
+                AssemblerEntry::U64(num) => push(&mut result, num, 8),
+                AssemblerEntry::Uleb(num) => {
+                    leb128::write::unsigned(&mut result, num).unwrap();
+                }
+                AssemblerEntry::Sleb(num) => {
+                    leb128::write::signed(&mut result, num as i64).unwrap();
+                }
+            }
+        }
+
+        // Update all the branches.
+        for marker in markers {
+            if let Some(offset) = marker.0 {
+                for branch_offset in marker.1 {
+                    let delta = offset.wrapping_sub(branch_offset + 2) as u64;
+                    write(&mut result, branch_offset, delta, 2);
+                }
+            }
+        }
+
+        result
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn check_eval_with_args<F>(
+        program: &[AssemblerEntry],
+        expect: Result<&[Piece<EndianSlice<LittleEndian>>]>,
+        encoding: Encoding,
+        object_address: Option<u64>,
+        initial_value: Option<u64>,
+        max_iterations: Option<u32>,
+        f: F,
+    ) where
+        for<'a> F: Fn(
+            &mut Evaluation<EndianSlice<'a, LittleEndian>>,
+            EvaluationResult<EndianSlice<'a, LittleEndian>>,
+        ) -> Result<EvaluationResult<EndianSlice<'a, LittleEndian>>>,
+    {
+        let bytes = assemble(program);
+        let bytes = EndianSlice::new(&bytes, LittleEndian);
+
+        let mut eval = Evaluation::new(bytes, encoding);
+
+        if let Some(val) = object_address {
+            eval.set_object_address(val);
+        }
+        if let Some(val) = initial_value {
+            eval.set_initial_value(val);
+        }
+        if let Some(val) = max_iterations {
+            eval.set_max_iterations(val);
+        }
+
+        let result = match eval.evaluate() {
+            Err(e) => Err(e),
+            Ok(r) => f(&mut eval, r),
+        };
+
+        match (result, expect) {
+            (Ok(EvaluationResult::Complete), Ok(pieces)) => {
+                let vec = eval.result();
+                assert_eq!(vec.len(), pieces.len());
+                for i in 0..pieces.len() {
+                    assert_eq!(vec[i], pieces[i]);
+                }
+            }
+            (Err(f1), Err(f2)) => {
+                assert_eq!(f1, f2);
+            }
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    fn check_eval(
+        program: &[AssemblerEntry],
+        expect: Result<&[Piece<EndianSlice<LittleEndian>>]>,
+        encoding: Encoding,
+    ) {
+        check_eval_with_args(program, expect, encoding, None, None, None, |_, result| {
+            Ok(result)
+        });
+    }
+
+    #[test]
+    fn test_eval_arith() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        // Indices of marks in the assembly.
+        let done = 0;
+        let fail = 1;
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_const1u), U8(23),
+            Op(DW_OP_const1s), U8((-23i8) as u8),
+            Op(DW_OP_plus),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const2u), U16(23),
+            Op(DW_OP_const2s), U16((-23i16) as u16),
+            Op(DW_OP_plus),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const4u), U32(0x1111_2222),
+            Op(DW_OP_const4s), U32((-0x1111_2222i32) as u32),
+            Op(DW_OP_plus),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Plus should overflow.
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_const1u), U8(1),
+            Op(DW_OP_plus),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_plus_uconst), Uleb(1),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Minus should underflow.
+            Op(DW_OP_const1s), U8(0),
+            Op(DW_OP_const1u), U8(1),
+            Op(DW_OP_minus),
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_abs),
+            Op(DW_OP_const1u), U8(1),
+            Op(DW_OP_minus),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const4u), U32(0xf078_fffe),
+            Op(DW_OP_const4u), U32(0x0f87_0001),
+            Op(DW_OP_and),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const4u), U32(0xf078_fffe),
+            Op(DW_OP_const4u), U32(0xf000_00fe),
+            Op(DW_OP_and),
+            Op(DW_OP_const4u), U32(0xf000_00fe),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Division is signed.
+            Op(DW_OP_const1s), U8(0xfe),
+            Op(DW_OP_const1s), U8(2),
+            Op(DW_OP_div),
+            Op(DW_OP_plus_uconst), Uleb(1),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Mod is unsigned.
+            Op(DW_OP_const1s), U8(0xfd),
+            Op(DW_OP_const1s), U8(2),
+            Op(DW_OP_mod),
+            Op(DW_OP_neg),
+            Op(DW_OP_plus_uconst), Uleb(1),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Overflow is defined for multiplication.
+            Op(DW_OP_const4u), U32(0x8000_0001),
+            Op(DW_OP_lit2),
+            Op(DW_OP_mul),
+            Op(DW_OP_lit2),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const4u), U32(0xf0f0_f0f0),
+            Op(DW_OP_const4u), U32(0xf0f0_f0f0),
+            Op(DW_OP_xor),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const4u), U32(0xf0f0_f0f0),
+            Op(DW_OP_const4u), U32(0x0f0f_0f0f),
+            Op(DW_OP_or),
+            Op(DW_OP_not),
+            Op(DW_OP_bra), Branch(fail),
+
+            // In 32 bit mode, values are truncated.
+            Op(DW_OP_const8u), U64(0xffff_ffff_0000_0000),
+            Op(DW_OP_lit2),
+            Op(DW_OP_div),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1u), U8(0xff),
+            Op(DW_OP_lit1),
+            Op(DW_OP_shl),
+            Op(DW_OP_const2u), U16(0x1fe),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1u), U8(0xff),
+            Op(DW_OP_const1u), U8(50),
+            Op(DW_OP_shl),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Absurd shift.
+            Op(DW_OP_const1u), U8(0xff),
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_shl),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_lit1),
+            Op(DW_OP_shr),
+            Op(DW_OP_const4u), U32(0x7fff_ffff),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_const1u), U8(0xff),
+            Op(DW_OP_shr),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_lit1),
+            Op(DW_OP_shra),
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_const1u), U8(0xff),
+            Op(DW_OP_shra),
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Success.
+            Op(DW_OP_lit0),
+            Op(DW_OP_nop),
+            Op(DW_OP_skip), Branch(done),
+
+            Mark(fail),
+            Op(DW_OP_lit1),
+
+            Mark(done),
+            Op(DW_OP_stack_value),
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(0),
+            },
+        }];
+
+        check_eval(&program, Ok(&result), encoding4());
+    }
+
+    #[test]
+    fn test_eval_arith64() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        // Indices of marks in the assembly.
+        let done = 0;
+        let fail = 1;
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_const8u), U64(0x1111_2222_3333_4444),
+            Op(DW_OP_const8s), U64((-0x1111_2222_3333_4444i64) as u64),
+            Op(DW_OP_plus),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_constu), Uleb(0x1111_2222_3333_4444),
+            Op(DW_OP_consts), Sleb((-0x1111_2222_3333_4444i64) as u64),
+            Op(DW_OP_plus),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_lit1),
+            Op(DW_OP_plus_uconst), Uleb(!0u64),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_lit1),
+            Op(DW_OP_neg),
+            Op(DW_OP_not),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const8u), U64(0x8000_0000_0000_0000),
+            Op(DW_OP_const1u), U8(63),
+            Op(DW_OP_shr),
+            Op(DW_OP_lit1),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const8u), U64(0x8000_0000_0000_0000),
+            Op(DW_OP_const1u), U8(62),
+            Op(DW_OP_shra),
+            Op(DW_OP_plus_uconst), Uleb(2),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_lit1),
+            Op(DW_OP_const1u), U8(63),
+            Op(DW_OP_shl),
+            Op(DW_OP_const8u), U64(0x8000_0000_0000_0000),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Success.
+            Op(DW_OP_lit0),
+            Op(DW_OP_nop),
+            Op(DW_OP_skip), Branch(done),
+
+            Mark(fail),
+            Op(DW_OP_lit1),
+
+            Mark(done),
+            Op(DW_OP_stack_value),
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(0),
+            },
+        }];
+
+        check_eval(&program, Ok(&result), encoding8());
+    }
+
+    #[test]
+    fn test_eval_compare() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        // Indices of marks in the assembly.
+        let done = 0;
+        let fail = 1;
+
+        #[rustfmt::skip]
+        let program = [
+            // Comparisons are signed.
+            Op(DW_OP_const1s), U8(1),
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_lt),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_const1s), U8(1),
+            Op(DW_OP_gt),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(1),
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_le),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_const1s), U8(1),
+            Op(DW_OP_ge),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const1s), U8(0xff),
+            Op(DW_OP_const1s), U8(1),
+            Op(DW_OP_eq),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_const4s), U32(1),
+            Op(DW_OP_const1s), U8(1),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Success.
+            Op(DW_OP_lit0),
+            Op(DW_OP_nop),
+            Op(DW_OP_skip), Branch(done),
+
+            Mark(fail),
+            Op(DW_OP_lit1),
+
+            Mark(done),
+            Op(DW_OP_stack_value),
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(0),
+            },
+        }];
+
+        check_eval(&program, Ok(&result), encoding4());
+    }
+
+    #[test]
+    fn test_eval_stack() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_lit17),                // -- 17
+            Op(DW_OP_dup),                  // -- 17 17
+            Op(DW_OP_over),                 // -- 17 17 17
+            Op(DW_OP_minus),                // -- 17 0
+            Op(DW_OP_swap),                 // -- 0 17
+            Op(DW_OP_dup),                  // -- 0 17 17
+            Op(DW_OP_plus_uconst), Uleb(1), // -- 0 17 18
+            Op(DW_OP_rot),                  // -- 18 0 17
+            Op(DW_OP_pick), U8(2),          // -- 18 0 17 18
+            Op(DW_OP_pick), U8(3),          // -- 18 0 17 18 18
+            Op(DW_OP_minus),                // -- 18 0 17 0
+            Op(DW_OP_drop),                 // -- 18 0 17
+            Op(DW_OP_swap),                 // -- 18 17 0
+            Op(DW_OP_drop),                 // -- 18 17
+            Op(DW_OP_minus),                // -- 1
+            Op(DW_OP_stack_value),
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(1),
+            },
+        }];
+
+        check_eval(&program, Ok(&result), encoding4());
+    }
+
+    #[test]
+    fn test_eval_lit_and_reg() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        let mut program = Vec::new();
+        program.push(Op(DW_OP_lit0));
+        for i in 0..32 {
+            program.push(Op(DwOp(DW_OP_lit0.0 + i)));
+            program.push(Op(DwOp(DW_OP_breg0.0 + i)));
+            program.push(Sleb(u64::from(i)));
+            program.push(Op(DW_OP_plus));
+            program.push(Op(DW_OP_plus));
+        }
+
+        program.push(Op(DW_OP_bregx));
+        program.push(Uleb(0x1234));
+        program.push(Sleb(0x1234));
+        program.push(Op(DW_OP_plus));
+
+        program.push(Op(DW_OP_stack_value));
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(496),
+            },
+        }];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding4(),
+            None,
+            None,
+            None,
+            |eval, mut result| {
+                while result != EvaluationResult::Complete {
+                    result = eval.resume_with_register(match result {
+                        EvaluationResult::RequiresRegister {
+                            register,
+                            base_type,
+                        } => {
+                            assert_eq!(base_type, UnitOffset(0));
+                            Value::Generic(u64::from(register.0).wrapping_neg())
+                        }
+                        _ => panic!(),
+                    })?;
+                }
+                Ok(result)
+            },
+        );
+    }
+
+    #[test]
+    fn test_eval_memory() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        // Indices of marks in the assembly.
+        let done = 0;
+        let fail = 1;
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_addr), U32(0x7fff_ffff),
+            Op(DW_OP_deref),
+            Op(DW_OP_const4u), U32(0xffff_fffc),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_addr), U32(0x7fff_ffff),
+            Op(DW_OP_deref_size), U8(2),
+            Op(DW_OP_const4u), U32(0xfffc),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_lit1),
+            Op(DW_OP_addr), U32(0x7fff_ffff),
+            Op(DW_OP_xderef),
+            Op(DW_OP_const4u), U32(0xffff_fffd),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_lit1),
+            Op(DW_OP_addr), U32(0x7fff_ffff),
+            Op(DW_OP_xderef_size), U8(2),
+            Op(DW_OP_const4u), U32(0xfffd),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_lit17),
+            Op(DW_OP_form_tls_address),
+            Op(DW_OP_constu), Uleb(!17),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_lit17),
+            Op(DW_OP_GNU_push_tls_address),
+            Op(DW_OP_constu), Uleb(!17),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_addrx), Uleb(0x10),
+            Op(DW_OP_deref),
+            Op(DW_OP_const4u), U32(0x4040),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            Op(DW_OP_constx), Uleb(17),
+            Op(DW_OP_form_tls_address),
+            Op(DW_OP_constu), Uleb(!27),
+            Op(DW_OP_ne),
+            Op(DW_OP_bra), Branch(fail),
+
+            // Success.
+            Op(DW_OP_lit0),
+            Op(DW_OP_nop),
+            Op(DW_OP_skip), Branch(done),
+
+            Mark(fail),
+            Op(DW_OP_lit1),
+
+            Mark(done),
+            Op(DW_OP_stack_value),
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(0),
+            },
+        }];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding4(),
+            None,
+            None,
+            None,
+            |eval, mut result| {
+                while result != EvaluationResult::Complete {
+                    result = match result {
+                        EvaluationResult::RequiresMemory {
+                            address,
+                            size,
+                            space,
+                            base_type,
+                        } => {
+                            assert_eq!(base_type, UnitOffset(0));
+                            let mut v = address << 2;
+                            if let Some(value) = space {
+                                v += value;
+                            }
+                            v &= (1u64 << (8 * size)) - 1;
+                            eval.resume_with_memory(Value::Generic(v))?
+                        }
+                        EvaluationResult::RequiresTls(slot) => eval.resume_with_tls(!slot)?,
+                        EvaluationResult::RequiresRelocatedAddress(address) => {
+                            eval.resume_with_relocated_address(address)?
+                        }
+                        EvaluationResult::RequiresIndexedAddress { index, relocate } => {
+                            if relocate {
+                                eval.resume_with_indexed_address(0x1000 + index.0 as u64)?
+                            } else {
+                                eval.resume_with_indexed_address(10 + index.0 as u64)?
+                            }
+                        }
+                        _ => panic!(),
+                    };
+                }
+
+                Ok(result)
+            },
+        );
+    }
+
+    #[test]
+    fn test_eval_register() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        for i in 0..32 {
+            #[rustfmt::skip]
+            let program = [
+                Op(DwOp(DW_OP_reg0.0 + i)),
+                // Included only in the "bad" run.
+                Op(DW_OP_lit23),
+            ];
+            let ok_result = [Piece {
+                size_in_bits: None,
+                bit_offset: None,
+                location: Location::Register {
+                    register: Register(i.into()),
+                },
+            }];
+
+            check_eval(&program[..1], Ok(&ok_result), encoding4());
+
+            check_eval(
+                &program,
+                Err(Error::InvalidExpressionTerminator(1)),
+                encoding4(),
+            );
+        }
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_regx), Uleb(0x1234)
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Register {
+                register: Register(0x1234),
+            },
+        }];
+
+        check_eval(&program, Ok(&result), encoding4());
+    }
+
+    #[test]
+    fn test_eval_context() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        // Test `frame_base` and `call_frame_cfa` callbacks.
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_fbreg), Sleb((-8i8) as u64),
+            Op(DW_OP_call_frame_cfa),
+            Op(DW_OP_plus),
+            Op(DW_OP_neg),
+            Op(DW_OP_stack_value)
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(9),
+            },
+        }];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding8(),
+            None,
+            None,
+            None,
+            |eval, result| {
+                match result {
+                    EvaluationResult::RequiresFrameBase => {}
+                    _ => panic!(),
+                };
+                match eval.resume_with_frame_base(0x0123_4567_89ab_cdef)? {
+                    EvaluationResult::RequiresCallFrameCfa => {}
+                    _ => panic!(),
+                };
+                eval.resume_with_call_frame_cfa(0xfedc_ba98_7654_3210)
+            },
+        );
+
+        // Test `evaluate_entry_value` callback.
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_entry_value), Uleb(8), U64(0x1234_5678),
+            Op(DW_OP_stack_value)
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(0x1234_5678),
+            },
+        }];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding8(),
+            None,
+            None,
+            None,
+            |eval, result| {
+                let entry_value = match result {
+                    EvaluationResult::RequiresEntryValue(mut expression) => {
+                        expression.0.read_u64()?
+                    }
+                    _ => panic!(),
+                };
+                eval.resume_with_entry_value(Value::Generic(entry_value))
+            },
+        );
+
+        // Test missing `object_address` field.
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_push_object_address),
+        ];
+
+        check_eval_with_args(
+            &program,
+            Err(Error::InvalidPushObjectAddress),
+            encoding4(),
+            None,
+            None,
+            None,
+            |_, _| panic!(),
+        );
+
+        // Test `object_address` field.
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_push_object_address),
+            Op(DW_OP_stack_value),
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(0xff),
+            },
+        }];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding8(),
+            Some(0xff),
+            None,
+            None,
+            |_, result| Ok(result),
+        );
+
+        // Test `initial_value` field.
+        #[rustfmt::skip]
+        let program = [
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Address {
+                address: 0x1234_5678,
+            },
+        }];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding8(),
+            None,
+            Some(0x1234_5678),
+            None,
+            |_, result| Ok(result),
+        );
+    }
+
+    #[test]
+    fn test_eval_empty_stack() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_stack_value)
+        ];
+
+        check_eval(&program, Err(Error::NotEnoughStackItems), encoding4());
+    }
+
+    #[test]
+    fn test_eval_call() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_lit23),
+            Op(DW_OP_call2), U16(0x7755),
+            Op(DW_OP_call4), U32(0x7755_aaee),
+            Op(DW_OP_call_ref), U32(0x7755_aaee),
+            Op(DW_OP_stack_value)
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(23),
+            },
+        }];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding4(),
+            None,
+            None,
+            None,
+            |eval, result| {
+                let buf = EndianSlice::new(&[], LittleEndian);
+                match result {
+                    EvaluationResult::RequiresAtLocation(_) => {}
+                    _ => panic!(),
+                };
+
+                eval.resume_with_at_location(buf)?;
+
+                match result {
+                    EvaluationResult::RequiresAtLocation(_) => {}
+                    _ => panic!(),
+                };
+
+                eval.resume_with_at_location(buf)?;
+
+                match result {
+                    EvaluationResult::RequiresAtLocation(_) => {}
+                    _ => panic!(),
+                };
+
+                eval.resume_with_at_location(buf)
+            },
+        );
+
+        // DW_OP_lit2 DW_OP_mul
+        const SUBR: &[u8] = &[0x32, 0x1e];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Value {
+                value: Value::Generic(184),
+            },
+        }];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding4(),
+            None,
+            None,
+            None,
+            |eval, result| {
+                let buf = EndianSlice::new(SUBR, LittleEndian);
+                match result {
+                    EvaluationResult::RequiresAtLocation(_) => {}
+                    _ => panic!(),
+                };
+
+                eval.resume_with_at_location(buf)?;
+
+                match result {
+                    EvaluationResult::RequiresAtLocation(_) => {}
+                    _ => panic!(),
+                };
+
+                eval.resume_with_at_location(buf)?;
+
+                match result {
+                    EvaluationResult::RequiresAtLocation(_) => {}
+                    _ => panic!(),
+                };
+
+                eval.resume_with_at_location(buf)
+            },
+        );
+    }
+
+    #[test]
+    fn test_eval_pieces() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        // Example from DWARF 2.6.1.3.
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_reg3),
+            Op(DW_OP_piece), Uleb(4),
+            Op(DW_OP_reg4),
+            Op(DW_OP_piece), Uleb(2),
+        ];
+
+        let result = [
+            Piece {
+                size_in_bits: Some(32),
+                bit_offset: None,
+                location: Location::Register {
+                    register: Register(3),
+                },
+            },
+            Piece {
+                size_in_bits: Some(16),
+                bit_offset: None,
+                location: Location::Register {
+                    register: Register(4),
+                },
+            },
+        ];
+
+        check_eval(&program, Ok(&result), encoding4());
+
+        // Example from DWARF 2.6.1.3 (but hacked since dealing with fbreg
+        // in the tests is a pain).
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_reg0),
+            Op(DW_OP_piece), Uleb(4),
+            Op(DW_OP_piece), Uleb(4),
+            Op(DW_OP_addr), U32(0x7fff_ffff),
+            Op(DW_OP_piece), Uleb(4),
+        ];
+
+        let result = [
+            Piece {
+                size_in_bits: Some(32),
+                bit_offset: None,
+                location: Location::Register {
+                    register: Register(0),
+                },
+            },
+            Piece {
+                size_in_bits: Some(32),
+                bit_offset: None,
+                location: Location::Empty,
+            },
+            Piece {
+                size_in_bits: Some(32),
+                bit_offset: None,
+                location: Location::Address {
+                    address: 0x7fff_ffff,
+                },
+            },
+        ];
+
+        check_eval_with_args(
+            &program,
+            Ok(&result),
+            encoding4(),
+            None,
+            None,
+            None,
+            |eval, mut result| {
+                while result != EvaluationResult::Complete {
+                    result = match result {
+                        EvaluationResult::RequiresRelocatedAddress(address) => {
+                            eval.resume_with_relocated_address(address)?
+                        }
+                        _ => panic!(),
+                    };
+                }
+
+                Ok(result)
+            },
+        );
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_implicit_value), Uleb(5),
+            U8(23), U8(24), U8(25), U8(26), U8(0),
+        ];
+
+        const BYTES: &[u8] = &[23, 24, 25, 26, 0];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Bytes {
+                value: EndianSlice::new(BYTES, LittleEndian),
+            },
+        }];
+
+        check_eval(&program, Ok(&result), encoding4());
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_lit7),
+            Op(DW_OP_stack_value),
+            Op(DW_OP_bit_piece), Uleb(5), Uleb(0),
+            Op(DW_OP_bit_piece), Uleb(3), Uleb(0),
+        ];
+
+        let result = [
+            Piece {
+                size_in_bits: Some(5),
+                bit_offset: Some(0),
+                location: Location::Value {
+                    value: Value::Generic(7),
+                },
+            },
+            Piece {
+                size_in_bits: Some(3),
+                bit_offset: Some(0),
+                location: Location::Empty,
+            },
+        ];
+
+        check_eval(&program, Ok(&result), encoding4());
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_lit7),
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::Address { address: 7 },
+        }];
+
+        check_eval(&program, Ok(&result), encoding4());
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_implicit_pointer), U32(0x1234_5678), Sleb(0x123),
+        ];
+
+        let result = [Piece {
+            size_in_bits: None,
+            bit_offset: None,
+            location: Location::ImplicitPointer {
+                value: DebugInfoOffset(0x1234_5678),
+                byte_offset: 0x123,
+            },
+        }];
+
+        check_eval(&program, Ok(&result), encoding4());
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_reg3),
+            Op(DW_OP_piece), Uleb(4),
+            Op(DW_OP_reg4),
+        ];
+
+        check_eval(&program, Err(Error::InvalidPiece), encoding4());
+
+        #[rustfmt::skip]
+        let program = [
+            Op(DW_OP_reg3),
+            Op(DW_OP_piece), Uleb(4),
+            Op(DW_OP_lit0),
+        ];
+
+        check_eval(&program, Err(Error::InvalidPiece), encoding4());
+    }
+
+    #[test]
+    fn test_eval_max_iterations() {
+        // It's nice if an operation and its arguments can fit on a single
+        // line in the test program.
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        #[rustfmt::skip]
+        let program = [
+            Mark(1),
+            Op(DW_OP_skip), Branch(1),
+        ];
+
+        check_eval_with_args(
+            &program,
+            Err(Error::TooManyIterations),
+            encoding4(),
+            None,
+            None,
+            Some(150),
+            |_, _| panic!(),
+        );
+    }
+
+    #[test]
+    fn test_eval_typed_stack() {
+        use self::AssemblerEntry::*;
+        use crate::constants::*;
+
+        let base_types = [
+            ValueType::Generic,
+            ValueType::U16,
+            ValueType::U32,
+            ValueType::F32,
+        ];
+
+        // TODO: convert, reinterpret
+        #[rustfmt::skip]
+        let tests = [
+            (
+                &[
+                    Op(DW_OP_const_type), Uleb(1), U8(2), U16(0x1234),
+                    Op(DW_OP_stack_value),
+                ][..],
+                Value::U16(0x1234),
+            ),
+            (
+                &[
+                    Op(DW_OP_regval_type), Uleb(0x1234), Uleb(1),
+                    Op(DW_OP_stack_value),
+                ][..],
+                Value::U16(0x2340),
+            ),
+            (
+                &[
+                    Op(DW_OP_addr), U32(0x7fff_ffff),
+                    Op(DW_OP_deref_type), U8(2), Uleb(1),
+                    Op(DW_OP_stack_value),
+                ][..],
+                Value::U16(0xfff0),
+            ),
+            (
+                &[
+                    Op(DW_OP_lit1),
+                    Op(DW_OP_addr), U32(0x7fff_ffff),
+                    Op(DW_OP_xderef_type), U8(2), Uleb(1),
+                    Op(DW_OP_stack_value),
+                ][..],
+                Value::U16(0xfff1),
+            ),
+            (
+                &[
+                    Op(DW_OP_const_type), Uleb(1), U8(2), U16(0x1234),
+                    Op(DW_OP_convert), Uleb(2),
+                    Op(DW_OP_stack_value),
+                ][..],
+                Value::U32(0x1234),
+            ),
+            (
+                &[
+                    Op(DW_OP_const_type), Uleb(2), U8(4), U32(0x3f80_0000),
+                    Op(DW_OP_reinterpret), Uleb(3),
+                    Op(DW_OP_stack_value),
+                ][..],
+                Value::F32(1.0),
+            ),
+        ];
+        for &(program, value) in &tests {
+            let result = [Piece {
+                size_in_bits: None,
+                bit_offset: None,
+                location: Location::Value { value },
+            }];
+
+            check_eval_with_args(
+                program,
+                Ok(&result),
+                encoding4(),
+                None,
+                None,
+                None,
+                |eval, mut result| {
+                    while result != EvaluationResult::Complete {
+                        result = match result {
+                            EvaluationResult::RequiresMemory {
+                                address,
+                                size,
+                                space,
+                                base_type,
+                            } => {
+                                let mut v = address << 4;
+                                if let Some(value) = space {
+                                    v += value;
+                                }
+                                v &= (1u64 << (8 * size)) - 1;
+                                let v = Value::from_u64(base_types[base_type.0], v)?;
+                                eval.resume_with_memory(v)?
+                            }
+                            EvaluationResult::RequiresRegister {
+                                register,
+                                base_type,
+                            } => {
+                                let v = Value::from_u64(
+                                    base_types[base_type.0],
+                                    u64::from(register.0) << 4,
+                                )?;
+                                eval.resume_with_register(v)?
+                            }
+                            EvaluationResult::RequiresBaseType(offset) => {
+                                eval.resume_with_base_type(base_types[offset.0])?
+                            }
+                            EvaluationResult::RequiresRelocatedAddress(address) => {
+                                eval.resume_with_relocated_address(address)?
+                            }
+                            _ => panic!("Unexpected result {:?}", result),
+                        }
+                    }
+                    Ok(result)
+                },
+            );
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/pubnames.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/pubnames.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/pubnames.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/pubnames.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,141 @@
+use crate::common::{DebugInfoOffset, SectionId};
+use crate::endianity::Endianity;
+use crate::read::lookup::{DebugLookup, LookupEntryIter, PubStuffEntry, PubStuffParser};
+use crate::read::{EndianSlice, Reader, Result, Section, UnitOffset};
+
+/// A single parsed pubname.
+#[derive(Debug, Clone)]
+pub struct PubNamesEntry<R: Reader> {
+    unit_header_offset: DebugInfoOffset<R::Offset>,
+    die_offset: UnitOffset<R::Offset>,
+    name: R,
+}
+
+impl<R: Reader> PubNamesEntry<R> {
+    /// Returns the name this entry refers to.
+    pub fn name(&self) -> &R {
+        &self.name
+    }
+
+    /// Returns the offset into the .debug_info section for the header of the compilation unit
+    /// which contains this name.
+    pub fn unit_header_offset(&self) -> DebugInfoOffset<R::Offset> {
+        self.unit_header_offset
+    }
+
+    /// Returns the offset into the compilation unit for the debugging information entry which
+    /// has this name.
+    pub fn die_offset(&self) -> UnitOffset<R::Offset> {
+        self.die_offset
+    }
+}
+
+impl<R: Reader> PubStuffEntry<R> for PubNamesEntry<R> {
+    fn new(
+        die_offset: UnitOffset<R::Offset>,
+        name: R,
+        unit_header_offset: DebugInfoOffset<R::Offset>,
+    ) -> Self {
+        PubNamesEntry {
+            unit_header_offset,
+            die_offset,
+            name,
+        }
+    }
+}
+
+/// The `DebugPubNames` struct represents the DWARF public names information
+/// found in the `.debug_pubnames` section.
+#[derive(Debug, Clone)]
+pub struct DebugPubNames<R: Reader>(DebugLookup<R, PubStuffParser<R, PubNamesEntry<R>>>);
+
+impl<'input, Endian> DebugPubNames<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugPubNames` instance from the data in the `.debug_pubnames`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_pubnames` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugPubNames, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_pubnames_section_somehow = || &buf;
+    /// let debug_pubnames =
+    ///     DebugPubNames::new(read_debug_pubnames_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(debug_pubnames_section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(debug_pubnames_section, endian))
+    }
+}
+
+impl<R: Reader> DebugPubNames<R> {
+    /// Iterate the pubnames in the `.debug_pubnames` section.
+    ///
+    /// ```
+    /// use gimli::{DebugPubNames, EndianSlice, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_pubnames_section_somehow = || &buf;
+    /// let debug_pubnames =
+    ///     DebugPubNames::new(read_debug_pubnames_section_somehow(), LittleEndian);
+    ///
+    /// let mut iter = debug_pubnames.items();
+    /// while let Some(pubname) = iter.next().unwrap() {
+    ///   println!("pubname {} found!", pubname.name().to_string_lossy());
+    /// }
+    /// ```
+    pub fn items(&self) -> PubNamesEntryIter<R> {
+        PubNamesEntryIter(self.0.items())
+    }
+}
+
+impl<R: Reader> Section<R> for DebugPubNames<R> {
+    fn id() -> SectionId {
+        SectionId::DebugPubNames
+    }
+
+    fn reader(&self) -> &R {
+        self.0.reader()
+    }
+}
+
+impl<R: Reader> From<R> for DebugPubNames<R> {
+    fn from(debug_pubnames_section: R) -> Self {
+        DebugPubNames(DebugLookup::from(debug_pubnames_section))
+    }
+}
+
+/// An iterator over the pubnames from a `.debug_pubnames` section.
+///
+/// Can be [used with
+/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+#[derive(Debug, Clone)]
+pub struct PubNamesEntryIter<R: Reader>(LookupEntryIter<R, PubStuffParser<R, PubNamesEntry<R>>>);
+
+impl<R: Reader> PubNamesEntryIter<R> {
+    /// Advance the iterator and return the next pubname.
+    ///
+    /// Returns the newly parsed pubname as `Ok(Some(pubname))`. Returns
+    /// `Ok(None)` when iteration is complete and all pubnames have already been
+    /// parsed and yielded. If an error occurs while parsing the next pubname,
+    /// then this error is returned as `Err(e)`, and all subsequent calls return
+    /// `Ok(None)`.
+    pub fn next(&mut self) -> Result<Option<PubNamesEntry<R>>> {
+        self.0.next()
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for PubNamesEntryIter<R> {
+    type Item = PubNamesEntry<R>;
+    type Error = crate::read::Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        self.0.next()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/pubtypes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/pubtypes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/pubtypes.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/pubtypes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,141 @@
+use crate::common::{DebugInfoOffset, SectionId};
+use crate::endianity::Endianity;
+use crate::read::lookup::{DebugLookup, LookupEntryIter, PubStuffEntry, PubStuffParser};
+use crate::read::{EndianSlice, Reader, Result, Section, UnitOffset};
+
+/// A single parsed pubtype.
+#[derive(Debug, Clone)]
+pub struct PubTypesEntry<R: Reader> {
+    unit_header_offset: DebugInfoOffset<R::Offset>,
+    die_offset: UnitOffset<R::Offset>,
+    name: R,
+}
+
+impl<R: Reader> PubTypesEntry<R> {
+    /// Returns the name of the type this entry refers to.
+    pub fn name(&self) -> &R {
+        &self.name
+    }
+
+    /// Returns the offset into the .debug_info section for the header of the compilation unit
+    /// which contains the type with this name.
+    pub fn unit_header_offset(&self) -> DebugInfoOffset<R::Offset> {
+        self.unit_header_offset
+    }
+
+    /// Returns the offset into the compilation unit for the debugging information entry which
+    /// the type with this name.
+    pub fn die_offset(&self) -> UnitOffset<R::Offset> {
+        self.die_offset
+    }
+}
+
+impl<R: Reader> PubStuffEntry<R> for PubTypesEntry<R> {
+    fn new(
+        die_offset: UnitOffset<R::Offset>,
+        name: R,
+        unit_header_offset: DebugInfoOffset<R::Offset>,
+    ) -> Self {
+        PubTypesEntry {
+            unit_header_offset,
+            die_offset,
+            name,
+        }
+    }
+}
+
+/// The `DebugPubTypes` struct represents the DWARF public types information
+/// found in the `.debug_info` section.
+#[derive(Debug, Clone)]
+pub struct DebugPubTypes<R: Reader>(DebugLookup<R, PubStuffParser<R, PubTypesEntry<R>>>);
+
+impl<'input, Endian> DebugPubTypes<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugPubTypes` instance from the data in the `.debug_pubtypes`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_pubtypes` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugPubTypes, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_pubtypes_somehow = || &buf;
+    /// let debug_pubtypes =
+    ///     DebugPubTypes::new(read_debug_pubtypes_somehow(), LittleEndian);
+    /// ```
+    pub fn new(debug_pubtypes_section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(debug_pubtypes_section, endian))
+    }
+}
+
+impl<R: Reader> DebugPubTypes<R> {
+    /// Iterate the pubtypes in the `.debug_pubtypes` section.
+    ///
+    /// ```
+    /// use gimli::{DebugPubTypes, EndianSlice, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_pubtypes_section_somehow = || &buf;
+    /// let debug_pubtypes =
+    ///     DebugPubTypes::new(read_debug_pubtypes_section_somehow(), LittleEndian);
+    ///
+    /// let mut iter = debug_pubtypes.items();
+    /// while let Some(pubtype) = iter.next().unwrap() {
+    ///   println!("pubtype {} found!", pubtype.name().to_string_lossy());
+    /// }
+    /// ```
+    pub fn items(&self) -> PubTypesEntryIter<R> {
+        PubTypesEntryIter(self.0.items())
+    }
+}
+
+impl<R: Reader> Section<R> for DebugPubTypes<R> {
+    fn id() -> SectionId {
+        SectionId::DebugPubTypes
+    }
+
+    fn reader(&self) -> &R {
+        self.0.reader()
+    }
+}
+
+impl<R: Reader> From<R> for DebugPubTypes<R> {
+    fn from(debug_pubtypes_section: R) -> Self {
+        DebugPubTypes(DebugLookup::from(debug_pubtypes_section))
+    }
+}
+
+/// An iterator over the pubtypes from a `.debug_pubtypes` section.
+///
+/// Can be [used with
+/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+#[derive(Debug, Clone)]
+pub struct PubTypesEntryIter<R: Reader>(LookupEntryIter<R, PubStuffParser<R, PubTypesEntry<R>>>);
+
+impl<R: Reader> PubTypesEntryIter<R> {
+    /// Advance the iterator and return the next pubtype.
+    ///
+    /// Returns the newly parsed pubtype as `Ok(Some(pubtype))`. Returns
+    /// `Ok(None)` when iteration is complete and all pubtypes have already been
+    /// parsed and yielded. If an error occurs while parsing the next pubtype,
+    /// then this error is returned as `Err(e)`, and all subsequent calls return
+    /// `Ok(None)`.
+    pub fn next(&mut self) -> Result<Option<PubTypesEntry<R>>> {
+        self.0.next()
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for PubTypesEntryIter<R> {
+    type Item = PubTypesEntry<R>;
+    type Error = crate::read::Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        self.0.next()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/reader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,478 @@
+use alloc::borrow::Cow;
+use core::convert::TryInto;
+use core::fmt::Debug;
+use core::hash::Hash;
+use core::ops::{Add, AddAssign, Sub};
+
+use crate::common::Format;
+use crate::endianity::Endianity;
+use crate::leb128;
+use crate::read::{Error, Result};
+
+/// An identifier for an offset within a section reader.
+///
+/// This is used for error reporting. The meaning of this value is specific to
+/// each reader implementation. The values should be chosen to be unique amongst
+/// all readers. If values are not unique then errors may point to the wrong reader.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct ReaderOffsetId(pub u64);
+
+/// A trait for offsets with a DWARF section.
+///
+/// This allows consumers to choose a size that is appropriate for their address space.
+pub trait ReaderOffset:
+    Debug + Copy + Eq + Ord + Hash + Add<Output = Self> + AddAssign + Sub<Output = Self>
+{
+    /// Convert a u8 to an offset.
+    fn from_u8(offset: u8) -> Self;
+
+    /// Convert a u16 to an offset.
+    fn from_u16(offset: u16) -> Self;
+
+    /// Convert an i16 to an offset.
+    fn from_i16(offset: i16) -> Self;
+
+    /// Convert a u32 to an offset.
+    fn from_u32(offset: u32) -> Self;
+
+    /// Convert a u64 to an offset.
+    ///
+    /// Returns `Error::UnsupportedOffset` if the value is too large.
+    fn from_u64(offset: u64) -> Result<Self>;
+
+    /// Convert an offset to a u64.
+    fn into_u64(self) -> u64;
+
+    /// Wrapping (modular) addition. Computes `self + other`.
+    fn wrapping_add(self, other: Self) -> Self;
+
+    /// Checked subtraction. Computes `self - other`.
+    fn checked_sub(self, other: Self) -> Option<Self>;
+}
+
+impl ReaderOffset for u64 {
+    #[inline]
+    fn from_u8(offset: u8) -> Self {
+        u64::from(offset)
+    }
+
+    #[inline]
+    fn from_u16(offset: u16) -> Self {
+        u64::from(offset)
+    }
+
+    #[inline]
+    fn from_i16(offset: i16) -> Self {
+        offset as u64
+    }
+
+    #[inline]
+    fn from_u32(offset: u32) -> Self {
+        u64::from(offset)
+    }
+
+    #[inline]
+    fn from_u64(offset: u64) -> Result<Self> {
+        Ok(offset)
+    }
+
+    #[inline]
+    fn into_u64(self) -> u64 {
+        self
+    }
+
+    #[inline]
+    fn wrapping_add(self, other: Self) -> Self {
+        self.wrapping_add(other)
+    }
+
+    #[inline]
+    fn checked_sub(self, other: Self) -> Option<Self> {
+        self.checked_sub(other)
+    }
+}
+
+impl ReaderOffset for u32 {
+    #[inline]
+    fn from_u8(offset: u8) -> Self {
+        u32::from(offset)
+    }
+
+    #[inline]
+    fn from_u16(offset: u16) -> Self {
+        u32::from(offset)
+    }
+
+    #[inline]
+    fn from_i16(offset: i16) -> Self {
+        offset as u32
+    }
+
+    #[inline]
+    fn from_u32(offset: u32) -> Self {
+        offset
+    }
+
+    #[inline]
+    fn from_u64(offset64: u64) -> Result<Self> {
+        let offset = offset64 as u32;
+        if u64::from(offset) == offset64 {
+            Ok(offset)
+        } else {
+            Err(Error::UnsupportedOffset)
+        }
+    }
+
+    #[inline]
+    fn into_u64(self) -> u64 {
+        u64::from(self)
+    }
+
+    #[inline]
+    fn wrapping_add(self, other: Self) -> Self {
+        self.wrapping_add(other)
+    }
+
+    #[inline]
+    fn checked_sub(self, other: Self) -> Option<Self> {
+        self.checked_sub(other)
+    }
+}
+
+impl ReaderOffset for usize {
+    #[inline]
+    fn from_u8(offset: u8) -> Self {
+        offset as usize
+    }
+
+    #[inline]
+    fn from_u16(offset: u16) -> Self {
+        offset as usize
+    }
+
+    #[inline]
+    fn from_i16(offset: i16) -> Self {
+        offset as usize
+    }
+
+    #[inline]
+    fn from_u32(offset: u32) -> Self {
+        offset as usize
+    }
+
+    #[inline]
+    fn from_u64(offset64: u64) -> Result<Self> {
+        let offset = offset64 as usize;
+        if offset as u64 == offset64 {
+            Ok(offset)
+        } else {
+            Err(Error::UnsupportedOffset)
+        }
+    }
+
+    #[inline]
+    fn into_u64(self) -> u64 {
+        self as u64
+    }
+
+    #[inline]
+    fn wrapping_add(self, other: Self) -> Self {
+        self.wrapping_add(other)
+    }
+
+    #[inline]
+    fn checked_sub(self, other: Self) -> Option<Self> {
+        self.checked_sub(other)
+    }
+}
+
+/// A trait for reading the data from a DWARF section.
+///
+/// All read operations advance the section offset of the reader
+/// unless specified otherwise.
+///
+/// ## Choosing a `Reader` Implementation
+///
+/// `gimli` comes with a few different `Reader` implementations and lets you
+/// choose the one that is right for your use case. A `Reader` is essentially a
+/// view into the raw bytes that make up some DWARF, but this view might borrow
+/// the underlying data or use reference counting ownership, and it might be
+/// thread safe or not.
+///
+/// | Implementation    | Ownership         | Thread Safe | Notes |
+/// |:------------------|:------------------|:------------|:------|
+/// | [`EndianSlice`](./struct.EndianSlice.html)        | Borrowed          | Yes         | Fastest, but requires that all of your code work with borrows. |
+/// | [`EndianRcSlice`](./struct.EndianRcSlice.html)    | Reference counted | No          | Shared ownership via reference counting, which alleviates the borrow restrictions of `EndianSlice` but imposes reference counting increments and decrements. Cannot be sent across threads, because the reference count is not atomic. |
+/// | [`EndianArcSlice`](./struct.EndianArcSlice.html)  | Reference counted | Yes         | The same as `EndianRcSlice`, but uses atomic reference counting, and therefore reference counting operations are slower but `EndianArcSlice`s may be sent across threads. |
+/// | [`EndianReader<T>`](./struct.EndianReader.html)   | Same as `T`       | Same as `T` | Escape hatch for easily defining your own type of `Reader`. |
+pub trait Reader: Debug + Clone {
+    /// The endianity of bytes that are read.
+    type Endian: Endianity;
+
+    /// The type used for offsets and lengths.
+    type Offset: ReaderOffset;
+
+    /// Return the endianity of bytes that are read.
+    fn endian(&self) -> Self::Endian;
+
+    /// Return the number of bytes remaining.
+    fn len(&self) -> Self::Offset;
+
+    /// Set the number of bytes remaining to zero.
+    fn empty(&mut self);
+
+    /// Set the number of bytes remaining to the specified length.
+    fn truncate(&mut self, len: Self::Offset) -> Result<()>;
+
+    /// Return the offset of this reader's data relative to the start of
+    /// the given base reader's data.
+    ///
+    /// May panic if this reader's data is not contained within the given
+    /// base reader's data.
+    fn offset_from(&self, base: &Self) -> Self::Offset;
+
+    /// Return an identifier for the current reader offset.
+    fn offset_id(&self) -> ReaderOffsetId;
+
+    /// Return the offset corresponding to the given `id` if
+    /// it is associated with this reader.
+    fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<Self::Offset>;
+
+    /// Find the index of the first occurence of the given byte.
+    /// The offset of the reader is not changed.
+    fn find(&self, byte: u8) -> Result<Self::Offset>;
+
+    /// Discard the specified number of bytes.
+    fn skip(&mut self, len: Self::Offset) -> Result<()>;
+
+    /// Split a reader in two.
+    ///
+    /// A new reader is returned that can be used to read the next
+    /// `len` bytes, and `self` is advanced so that it reads the remainder.
+    fn split(&mut self, len: Self::Offset) -> Result<Self>;
+
+    /// Return all remaining data as a clone-on-write slice.
+    ///
+    /// The slice will be borrowed where possible, but some readers may
+    /// always return an owned vector.
+    ///
+    /// Does not advance the reader.
+    fn to_slice(&self) -> Result<Cow<[u8]>>;
+
+    /// Convert all remaining data to a clone-on-write string.
+    ///
+    /// The string will be borrowed where possible, but some readers may
+    /// always return an owned string.
+    ///
+    /// Does not advance the reader.
+    ///
+    /// Returns an error if the data contains invalid characters.
+    fn to_string(&self) -> Result<Cow<str>>;
+
+    /// Convert all remaining data to a clone-on-write string, including invalid characters.
+    ///
+    /// The string will be borrowed where possible, but some readers may
+    /// always return an owned string.
+    ///
+    /// Does not advance the reader.
+    fn to_string_lossy(&self) -> Result<Cow<str>>;
+
+    /// Read exactly `buf.len()` bytes into `buf`.
+    fn read_slice(&mut self, buf: &mut [u8]) -> Result<()>;
+
+    /// Read a u8 array.
+    #[inline]
+    fn read_u8_array<A>(&mut self) -> Result<A>
+    where
+        A: Sized + Default + AsMut<[u8]>,
+    {
+        let mut val = Default::default();
+        self.read_slice(<A as AsMut<[u8]>>::as_mut(&mut val))?;
+        Ok(val)
+    }
+
+    /// Return true if the number of bytes remaining is zero.
+    #[inline]
+    fn is_empty(&self) -> bool {
+        self.len() == Self::Offset::from_u8(0)
+    }
+
+    /// Read a u8.
+    #[inline]
+    fn read_u8(&mut self) -> Result<u8> {
+        let a: [u8; 1] = self.read_u8_array()?;
+        Ok(a[0])
+    }
+
+    /// Read an i8.
+    #[inline]
+    fn read_i8(&mut self) -> Result<i8> {
+        let a: [u8; 1] = self.read_u8_array()?;
+        Ok(a[0] as i8)
+    }
+
+    /// Read a u16.
+    #[inline]
+    fn read_u16(&mut self) -> Result<u16> {
+        let a: [u8; 2] = self.read_u8_array()?;
+        Ok(self.endian().read_u16(&a))
+    }
+
+    /// Read an i16.
+    #[inline]
+    fn read_i16(&mut self) -> Result<i16> {
+        let a: [u8; 2] = self.read_u8_array()?;
+        Ok(self.endian().read_i16(&a))
+    }
+
+    /// Read a u32.
+    #[inline]
+    fn read_u32(&mut self) -> Result<u32> {
+        let a: [u8; 4] = self.read_u8_array()?;
+        Ok(self.endian().read_u32(&a))
+    }
+
+    /// Read an i32.
+    #[inline]
+    fn read_i32(&mut self) -> Result<i32> {
+        let a: [u8; 4] = self.read_u8_array()?;
+        Ok(self.endian().read_i32(&a))
+    }
+
+    /// Read a u64.
+    #[inline]
+    fn read_u64(&mut self) -> Result<u64> {
+        let a: [u8; 8] = self.read_u8_array()?;
+        Ok(self.endian().read_u64(&a))
+    }
+
+    /// Read an i64.
+    #[inline]
+    fn read_i64(&mut self) -> Result<i64> {
+        let a: [u8; 8] = self.read_u8_array()?;
+        Ok(self.endian().read_i64(&a))
+    }
+
+    /// Read a f32.
+    #[inline]
+    fn read_f32(&mut self) -> Result<f32> {
+        let a: [u8; 4] = self.read_u8_array()?;
+        Ok(self.endian().read_f32(&a))
+    }
+
+    /// Read a f64.
+    #[inline]
+    fn read_f64(&mut self) -> Result<f64> {
+        let a: [u8; 8] = self.read_u8_array()?;
+        Ok(self.endian().read_f64(&a))
+    }
+
+    /// Read an unsigned n-bytes integer u64.
+    ///
+    /// # Panics
+    ///
+    /// Panics when nbytes < 1 or nbytes > 8
+    #[inline]
+    fn read_uint(&mut self, n: usize) -> Result<u64> {
+        let mut buf = [0; 8];
+        self.read_slice(&mut buf[..n])?;
+        Ok(self.endian().read_uint(&buf[..n]))
+    }
+
+    /// Read a null-terminated slice, and return it (excluding the null).
+    fn read_null_terminated_slice(&mut self) -> Result<Self> {
+        let idx = self.find(0)?;
+        let val = self.split(idx)?;
+        self.skip(Self::Offset::from_u8(1))?;
+        Ok(val)
+    }
+
+    /// Read an unsigned LEB128 encoded integer.
+    fn read_uleb128(&mut self) -> Result<u64> {
+        leb128::read::unsigned(self)
+    }
+
+    /// Read an unsigned LEB128 encoded u32.
+    fn read_uleb128_u32(&mut self) -> Result<u32> {
+        leb128::read::unsigned(self)?
+            .try_into()
+            .map_err(|_| Error::BadUnsignedLeb128)
+    }
+
+    /// Read an unsigned LEB128 encoded u16.
+    fn read_uleb128_u16(&mut self) -> Result<u16> {
+        leb128::read::u16(self)
+    }
+
+    /// Read a signed LEB128 encoded integer.
+    fn read_sleb128(&mut self) -> Result<i64> {
+        leb128::read::signed(self)
+    }
+
+    /// Read an initial length field.
+    ///
+    /// This field is encoded as either a 32-bit length or
+    /// a 64-bit length, and the returned `Format` indicates which.
+    fn read_initial_length(&mut self) -> Result<(Self::Offset, Format)> {
+        const MAX_DWARF_32_UNIT_LENGTH: u32 = 0xffff_fff0;
+        const DWARF_64_INITIAL_UNIT_LENGTH: u32 = 0xffff_ffff;
+
+        let val = self.read_u32()?;
+        if val < MAX_DWARF_32_UNIT_LENGTH {
+            Ok((Self::Offset::from_u32(val), Format::Dwarf32))
+        } else if val == DWARF_64_INITIAL_UNIT_LENGTH {
+            let val = self.read_u64().and_then(Self::Offset::from_u64)?;
+            Ok((val, Format::Dwarf64))
+        } else {
+            Err(Error::UnknownReservedLength)
+        }
+    }
+
+    /// Read an address-sized integer, and return it as a `u64`.
+    fn read_address(&mut self, address_size: u8) -> Result<u64> {
+        match address_size {
+            1 => self.read_u8().map(u64::from),
+            2 => self.read_u16().map(u64::from),
+            4 => self.read_u32().map(u64::from),
+            8 => self.read_u64(),
+            otherwise => Err(Error::UnsupportedAddressSize(otherwise)),
+        }
+    }
+
+    /// Parse a word-sized integer according to the DWARF format.
+    ///
+    /// These are always used to encode section offsets or lengths,
+    /// and so have a type of `Self::Offset`.
+    fn read_word(&mut self, format: Format) -> Result<Self::Offset> {
+        match format {
+            Format::Dwarf32 => self.read_u32().map(Self::Offset::from_u32),
+            Format::Dwarf64 => self.read_u64().and_then(Self::Offset::from_u64),
+        }
+    }
+
+    /// Parse a word-sized section length according to the DWARF format.
+    #[inline]
+    fn read_length(&mut self, format: Format) -> Result<Self::Offset> {
+        self.read_word(format)
+    }
+
+    /// Parse a word-sized section offset according to the DWARF format.
+    #[inline]
+    fn read_offset(&mut self, format: Format) -> Result<Self::Offset> {
+        self.read_word(format)
+    }
+
+    /// Parse a section offset of the given size.
+    ///
+    /// This is used for `DW_FORM_ref_addr` values in DWARF version 2.
+    fn read_sized_offset(&mut self, size: u8) -> Result<Self::Offset> {
+        match size {
+            1 => self.read_u8().map(u64::from),
+            2 => self.read_u16().map(u64::from),
+            4 => self.read_u32().map(u64::from),
+            8 => self.read_u64(),
+            otherwise => Err(Error::UnsupportedOffsetSize(otherwise)),
+        }
+        .and_then(Self::Offset::from_u64)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/rnglists.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/rnglists.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/rnglists.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/rnglists.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1337 @@
+use crate::common::{
+    DebugAddrBase, DebugAddrIndex, DebugRngListsBase, DebugRngListsIndex, DwarfFileType, Encoding,
+    RangeListsOffset, SectionId,
+};
+use crate::constants;
+use crate::endianity::Endianity;
+use crate::read::{
+    lists::ListsHeader, DebugAddr, EndianSlice, Error, Reader, ReaderOffset, ReaderOffsetId,
+    Result, Section,
+};
+
+/// The raw contents of the `.debug_ranges` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugRanges<R> {
+    pub(crate) section: R,
+}
+
+impl<'input, Endian> DebugRanges<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugRanges` instance from the data in the `.debug_ranges`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_ranges` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugRanges, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_ranges_section_somehow = || &buf;
+    /// let debug_ranges = DebugRanges::new(read_debug_ranges_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(section, endian))
+    }
+}
+
+impl<R> Section<R> for DebugRanges<R> {
+    fn id() -> SectionId {
+        SectionId::DebugRanges
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R> From<R> for DebugRanges<R> {
+    fn from(section: R) -> Self {
+        DebugRanges { section }
+    }
+}
+
+/// The `DebugRngLists` struct represents the contents of the
+/// `.debug_rnglists` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugRngLists<R> {
+    section: R,
+}
+
+impl<'input, Endian> DebugRngLists<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugRngLists` instance from the data in the
+    /// `.debug_rnglists` section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_rnglists`
+    /// section and present it as a `&[u8]` slice. That means using some ELF
+    /// loader on Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugRngLists, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_rnglists_section_somehow = || &buf;
+    /// let debug_rnglists =
+    ///     DebugRngLists::new(read_debug_rnglists_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(section, endian))
+    }
+}
+
+impl<R> Section<R> for DebugRngLists<R> {
+    fn id() -> SectionId {
+        SectionId::DebugRngLists
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R> From<R> for DebugRngLists<R> {
+    fn from(section: R) -> Self {
+        DebugRngLists { section }
+    }
+}
+
+#[allow(unused)]
+pub(crate) type RngListsHeader = ListsHeader;
+
+impl<Offset> DebugRngListsBase<Offset>
+where
+    Offset: ReaderOffset,
+{
+    /// Returns a `DebugRngListsBase` with the default value of DW_AT_rnglists_base
+    /// for the given `Encoding` and `DwarfFileType`.
+    pub fn default_for_encoding_and_file(
+        encoding: Encoding,
+        file_type: DwarfFileType,
+    ) -> DebugRngListsBase<Offset> {
+        if encoding.version >= 5 && file_type == DwarfFileType::Dwo {
+            // In .dwo files, the compiler omits the DW_AT_rnglists_base attribute (because there is
+            // only a single unit in the file) but we must skip past the header, which the attribute
+            // would normally do for us.
+            DebugRngListsBase(Offset::from_u8(RngListsHeader::size_for_encoding(encoding)))
+        } else {
+            DebugRngListsBase(Offset::from_u8(0))
+        }
+    }
+}
+
+/// The DWARF data found in `.debug_ranges` and `.debug_rnglists` sections.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct RangeLists<R> {
+    debug_ranges: DebugRanges<R>,
+    debug_rnglists: DebugRngLists<R>,
+}
+
+impl<R> RangeLists<R> {
+    /// Construct a new `RangeLists` instance from the data in the `.debug_ranges` and
+    /// `.debug_rnglists` sections.
+    pub fn new(debug_ranges: DebugRanges<R>, debug_rnglists: DebugRngLists<R>) -> RangeLists<R> {
+        RangeLists {
+            debug_ranges,
+            debug_rnglists,
+        }
+    }
+}
+
+impl<T> RangeLists<T> {
+    /// Create a `RangeLists` that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::RangeLists<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> RangeLists<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        RangeLists {
+            debug_ranges: borrow(&self.debug_ranges.section).into(),
+            debug_rnglists: borrow(&self.debug_rnglists.section).into(),
+        }
+    }
+}
+
+impl<R: Reader> RangeLists<R> {
+    /// Iterate over the `Range` list entries starting at the given offset.
+    ///
+    /// The `unit_version` and `address_size` must match the compilation unit that the
+    /// offset was contained in.
+    ///
+    /// The `base_address` should be obtained from the `DW_AT_low_pc` attribute in the
+    /// `DW_TAG_compile_unit` entry for the compilation unit that contains this range list.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn ranges(
+        &self,
+        offset: RangeListsOffset<R::Offset>,
+        unit_encoding: Encoding,
+        base_address: u64,
+        debug_addr: &DebugAddr<R>,
+        debug_addr_base: DebugAddrBase<R::Offset>,
+    ) -> Result<RngListIter<R>> {
+        Ok(RngListIter::new(
+            self.raw_ranges(offset, unit_encoding)?,
+            base_address,
+            debug_addr.clone(),
+            debug_addr_base,
+        ))
+    }
+
+    /// Iterate over the `RawRngListEntry`ies starting at the given offset.
+    ///
+    /// The `unit_encoding` must match the compilation unit that the
+    /// offset was contained in.
+    ///
+    /// This iterator does not perform any processing of the range entries,
+    /// such as handling base addresses.
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn raw_ranges(
+        &self,
+        offset: RangeListsOffset<R::Offset>,
+        unit_encoding: Encoding,
+    ) -> Result<RawRngListIter<R>> {
+        let (mut input, format) = if unit_encoding.version <= 4 {
+            (self.debug_ranges.section.clone(), RangeListsFormat::Bare)
+        } else {
+            (self.debug_rnglists.section.clone(), RangeListsFormat::RLE)
+        };
+        input.skip(offset.0)?;
+        Ok(RawRngListIter::new(input, unit_encoding, format))
+    }
+
+    /// Returns the `.debug_rnglists` offset at the given `base` and `index`.
+    ///
+    /// The `base` must be the `DW_AT_rnglists_base` value from the compilation unit DIE.
+    /// This is an offset that points to the first entry following the header.
+    ///
+    /// The `index` is the value of a `DW_FORM_rnglistx` attribute.
+    ///
+    /// The `unit_encoding` must match the compilation unit that the
+    /// index was contained in.
+    pub fn get_offset(
+        &self,
+        unit_encoding: Encoding,
+        base: DebugRngListsBase<R::Offset>,
+        index: DebugRngListsIndex<R::Offset>,
+    ) -> Result<RangeListsOffset<R::Offset>> {
+        let format = unit_encoding.format;
+        let input = &mut self.debug_rnglists.section.clone();
+        input.skip(base.0)?;
+        input.skip(R::Offset::from_u64(
+            index.0.into_u64() * u64::from(format.word_size()),
+        )?)?;
+        input
+            .read_offset(format)
+            .map(|x| RangeListsOffset(base.0 + x))
+    }
+
+    /// Call `Reader::lookup_offset_id` for each section, and return the first match.
+    pub fn lookup_offset_id(&self, id: ReaderOffsetId) -> Option<(SectionId, R::Offset)> {
+        self.debug_ranges
+            .lookup_offset_id(id)
+            .or_else(|| self.debug_rnglists.lookup_offset_id(id))
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum RangeListsFormat {
+    /// The bare range list format used before DWARF 5.
+    Bare,
+    /// The DW_RLE encoded range list format used in DWARF 5.
+    RLE,
+}
+
+/// A raw iterator over an address range list.
+///
+/// This iterator does not perform any processing of the range entries,
+/// such as handling base addresses.
+#[derive(Debug)]
+pub struct RawRngListIter<R: Reader> {
+    input: R,
+    encoding: Encoding,
+    format: RangeListsFormat,
+}
+
+/// A raw entry in .debug_rnglists
+#[derive(Clone, Debug)]
+pub enum RawRngListEntry<T> {
+    /// A range from DWARF version <= 4.
+    AddressOrOffsetPair {
+        /// Start of range. May be an address or an offset.
+        begin: u64,
+        /// End of range. May be an address or an offset.
+        end: u64,
+    },
+    /// DW_RLE_base_address
+    BaseAddress {
+        /// base address
+        addr: u64,
+    },
+    /// DW_RLE_base_addressx
+    BaseAddressx {
+        /// base address
+        addr: DebugAddrIndex<T>,
+    },
+    /// DW_RLE_startx_endx
+    StartxEndx {
+        /// start of range
+        begin: DebugAddrIndex<T>,
+        /// end of range
+        end: DebugAddrIndex<T>,
+    },
+    /// DW_RLE_startx_length
+    StartxLength {
+        /// start of range
+        begin: DebugAddrIndex<T>,
+        /// length of range
+        length: u64,
+    },
+    /// DW_RLE_offset_pair
+    OffsetPair {
+        /// start of range
+        begin: u64,
+        /// end of range
+        end: u64,
+    },
+    /// DW_RLE_start_end
+    StartEnd {
+        /// start of range
+        begin: u64,
+        /// end of range
+        end: u64,
+    },
+    /// DW_RLE_start_length
+    StartLength {
+        /// start of range
+        begin: u64,
+        /// length of range
+        length: u64,
+    },
+}
+
+impl<T: ReaderOffset> RawRngListEntry<T> {
+    /// Parse a range entry from `.debug_rnglists`
+    fn parse<R: Reader<Offset = T>>(
+        input: &mut R,
+        encoding: Encoding,
+        format: RangeListsFormat,
+    ) -> Result<Option<Self>> {
+        match format {
+            RangeListsFormat::Bare => {
+                let range = RawRange::parse(input, encoding.address_size)?;
+                return Ok(if range.is_end() {
+                    None
+                } else if range.is_base_address(encoding.address_size) {
+                    Some(RawRngListEntry::BaseAddress { addr: range.end })
+                } else {
+                    Some(RawRngListEntry::AddressOrOffsetPair {
+                        begin: range.begin,
+                        end: range.end,
+                    })
+                });
+            }
+            RangeListsFormat::RLE => Ok(match constants::DwRle(input.read_u8()?) {
+                constants::DW_RLE_end_of_list => None,
+                constants::DW_RLE_base_addressx => Some(RawRngListEntry::BaseAddressx {
+                    addr: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
+                }),
+                constants::DW_RLE_startx_endx => Some(RawRngListEntry::StartxEndx {
+                    begin: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
+                    end: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
+                }),
+                constants::DW_RLE_startx_length => Some(RawRngListEntry::StartxLength {
+                    begin: DebugAddrIndex(input.read_uleb128().and_then(R::Offset::from_u64)?),
+                    length: input.read_uleb128()?,
+                }),
+                constants::DW_RLE_offset_pair => Some(RawRngListEntry::OffsetPair {
+                    begin: input.read_uleb128()?,
+                    end: input.read_uleb128()?,
+                }),
+                constants::DW_RLE_base_address => Some(RawRngListEntry::BaseAddress {
+                    addr: input.read_address(encoding.address_size)?,
+                }),
+                constants::DW_RLE_start_end => Some(RawRngListEntry::StartEnd {
+                    begin: input.read_address(encoding.address_size)?,
+                    end: input.read_address(encoding.address_size)?,
+                }),
+                constants::DW_RLE_start_length => Some(RawRngListEntry::StartLength {
+                    begin: input.read_address(encoding.address_size)?,
+                    length: input.read_uleb128()?,
+                }),
+                _ => {
+                    return Err(Error::InvalidAddressRange);
+                }
+            }),
+        }
+    }
+}
+
+impl<R: Reader> RawRngListIter<R> {
+    /// Construct a `RawRngListIter`.
+    fn new(input: R, encoding: Encoding, format: RangeListsFormat) -> RawRngListIter<R> {
+        RawRngListIter {
+            input,
+            encoding,
+            format,
+        }
+    }
+
+    /// Advance the iterator to the next range.
+    pub fn next(&mut self) -> Result<Option<RawRngListEntry<R::Offset>>> {
+        if self.input.is_empty() {
+            return Ok(None);
+        }
+
+        match RawRngListEntry::parse(&mut self.input, self.encoding, self.format) {
+            Ok(range) => {
+                if range.is_none() {
+                    self.input.empty();
+                }
+                Ok(range)
+            }
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for RawRngListIter<R> {
+    type Item = RawRngListEntry<R::Offset>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        RawRngListIter::next(self)
+    }
+}
+
+/// An iterator over an address range list.
+///
+/// This iterator internally handles processing of base addresses and different
+/// entry types.  Thus, it only returns range entries that are valid
+/// and already adjusted for the base address.
+#[derive(Debug)]
+pub struct RngListIter<R: Reader> {
+    raw: RawRngListIter<R>,
+    base_address: u64,
+    debug_addr: DebugAddr<R>,
+    debug_addr_base: DebugAddrBase<R::Offset>,
+}
+
+impl<R: Reader> RngListIter<R> {
+    /// Construct a `RngListIter`.
+    fn new(
+        raw: RawRngListIter<R>,
+        base_address: u64,
+        debug_addr: DebugAddr<R>,
+        debug_addr_base: DebugAddrBase<R::Offset>,
+    ) -> RngListIter<R> {
+        RngListIter {
+            raw,
+            base_address,
+            debug_addr,
+            debug_addr_base,
+        }
+    }
+
+    #[inline]
+    fn get_address(&self, index: DebugAddrIndex<R::Offset>) -> Result<u64> {
+        self.debug_addr
+            .get_address(self.raw.encoding.address_size, self.debug_addr_base, index)
+    }
+
+    /// Advance the iterator to the next range.
+    pub fn next(&mut self) -> Result<Option<Range>> {
+        loop {
+            let raw_range = match self.raw.next()? {
+                Some(range) => range,
+                None => return Ok(None),
+            };
+
+            let range = match raw_range {
+                RawRngListEntry::BaseAddress { addr } => {
+                    self.base_address = addr;
+                    continue;
+                }
+                RawRngListEntry::BaseAddressx { addr } => {
+                    self.base_address = self.get_address(addr)?;
+                    continue;
+                }
+                RawRngListEntry::StartxEndx { begin, end } => {
+                    let begin = self.get_address(begin)?;
+                    let end = self.get_address(end)?;
+                    Range { begin, end }
+                }
+                RawRngListEntry::StartxLength { begin, length } => {
+                    let begin = self.get_address(begin)?;
+                    let end = begin + length;
+                    Range { begin, end }
+                }
+                RawRngListEntry::AddressOrOffsetPair { begin, end }
+                | RawRngListEntry::OffsetPair { begin, end } => {
+                    let mut range = Range { begin, end };
+                    range.add_base_address(self.base_address, self.raw.encoding.address_size);
+                    range
+                }
+                RawRngListEntry::StartEnd { begin, end } => Range { begin, end },
+                RawRngListEntry::StartLength { begin, length } => Range {
+                    begin,
+                    end: begin + length,
+                },
+            };
+
+            if range.begin > range.end {
+                self.raw.input.empty();
+                return Err(Error::InvalidAddressRange);
+            }
+
+            return Ok(Some(range));
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for RngListIter<R> {
+    type Item = Range;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        RngListIter::next(self)
+    }
+}
+
+/// A raw address range from the `.debug_ranges` section.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub(crate) struct RawRange {
+    /// The beginning address of the range.
+    pub begin: u64,
+
+    /// The first address past the end of the range.
+    pub end: u64,
+}
+
+impl RawRange {
+    /// Check if this is a range end entry.
+    ///
+    /// This will only occur for raw ranges.
+    #[inline]
+    pub fn is_end(&self) -> bool {
+        self.begin == 0 && self.end == 0
+    }
+
+    /// Check if this is a base address selection entry.
+    ///
+    /// A base address selection entry changes the base address that subsequent
+    /// range entries are relative to.  This will only occur for raw ranges.
+    #[inline]
+    pub fn is_base_address(&self, address_size: u8) -> bool {
+        self.begin == !0 >> (64 - address_size * 8)
+    }
+
+    /// Parse an address range entry from `.debug_ranges` or `.debug_loc`.
+    #[doc(hidden)]
+    #[inline]
+    pub fn parse<R: Reader>(input: &mut R, address_size: u8) -> Result<RawRange> {
+        let begin = input.read_address(address_size)?;
+        let end = input.read_address(address_size)?;
+        let range = RawRange { begin, end };
+        Ok(range)
+    }
+}
+
+/// An address range from the `.debug_ranges`, `.debug_rnglists`, or `.debug_aranges` sections.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct Range {
+    /// The beginning address of the range.
+    pub begin: u64,
+
+    /// The first address past the end of the range.
+    pub end: u64,
+}
+
+impl Range {
+    /// Add a base address to this range.
+    #[inline]
+    pub(crate) fn add_base_address(&mut self, base_address: u64, address_size: u8) {
+        let mask = !0 >> (64 - address_size * 8);
+        self.begin = base_address.wrapping_add(self.begin) & mask;
+        self.end = base_address.wrapping_add(self.end) & mask;
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::common::Format;
+    use crate::endianity::LittleEndian;
+    use crate::test_util::GimliSectionMethods;
+    use test_assembler::{Endian, Label, LabelMaker, Section};
+
+    #[test]
+    fn test_rnglists_32() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 5,
+            address_size: 4,
+        };
+        let section = Section::with_endian(Endian::Little)
+            .L32(0x0300_0000)
+            .L32(0x0301_0300)
+            .L32(0x0301_0400)
+            .L32(0x0301_0500);
+        let buf = section.get_contents().unwrap();
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&buf, LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+
+        let start = Label::new();
+        let first = Label::new();
+        let size = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // Header
+            .mark(&start)
+            .L32(&size)
+            .L16(encoding.version)
+            .L8(encoding.address_size)
+            .L8(0)
+            .L32(0)
+            .mark(&first)
+            // OffsetPair
+            .L8(4).uleb(0x10200).uleb(0x10300)
+            // A base address selection followed by an OffsetPair.
+            .L8(5).L32(0x0200_0000)
+            .L8(4).uleb(0x10400).uleb(0x10500)
+            // An empty OffsetPair followed by a normal OffsetPair.
+            .L8(4).uleb(0x10600).uleb(0x10600)
+            .L8(4).uleb(0x10800).uleb(0x10900)
+            // A StartEnd
+            .L8(6).L32(0x201_0a00).L32(0x201_0b00)
+            // A StartLength
+            .L8(7).L32(0x201_0c00).uleb(0x100)
+            // An OffsetPair that starts at 0.
+            .L8(4).uleb(0).uleb(1)
+            // An OffsetPair that starts and ends at 0.
+            .L8(4).uleb(0).uleb(0)
+            // An OffsetPair that ends at -1.
+            .L8(5).L32(0)
+            .L8(4).uleb(0).uleb(0xffff_ffff)
+            // A BaseAddressx + OffsetPair
+            .L8(1).uleb(0)
+            .L8(4).uleb(0x10100).uleb(0x10200)
+            // A StartxEndx
+            .L8(2).uleb(1).uleb(2)
+            // A StartxLength
+            .L8(3).uleb(3).uleb(0x100)
+            // A range end.
+            .L8(0)
+            // Some extra data.
+            .L32(0xffff_ffff);
+        size.set_const((&section.here() - &start - 4) as u64);
+
+        let buf = section.get_contents().unwrap();
+        let debug_ranges = DebugRanges::new(&[], LittleEndian);
+        let debug_rnglists = DebugRngLists::new(&buf, LittleEndian);
+        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
+        let offset = RangeListsOffset((&first - &start) as usize);
+        let mut ranges = rnglists
+            .ranges(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
+            .unwrap();
+
+        // A normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0101_0200,
+                end: 0x0101_0300,
+            }))
+        );
+
+        // A base address selection followed by a normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0400,
+                end: 0x0201_0500,
+            }))
+        );
+
+        // An empty range followed by a normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0600,
+                end: 0x0201_0600,
+            }))
+        );
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0800,
+                end: 0x0201_0900,
+            }))
+        );
+
+        // A normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0a00,
+                end: 0x0201_0b00,
+            }))
+        );
+
+        // A normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0c00,
+                end: 0x0201_0d00,
+            }))
+        );
+
+        // A range that starts at 0.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0200_0000,
+                end: 0x0200_0001,
+            }))
+        );
+
+        // A range that starts and ends at 0.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0200_0000,
+                end: 0x0200_0000,
+            }))
+        );
+
+        // A range that ends at -1.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0000_0000,
+                end: 0xffff_ffff,
+            }))
+        );
+
+        // A BaseAddressx + OffsetPair
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0301_0100,
+                end: 0x0301_0200,
+            }))
+        );
+
+        // A StartxEndx
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0301_0300,
+                end: 0x0301_0400,
+            }))
+        );
+
+        // A StartxLength
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0301_0500,
+                end: 0x0301_0600,
+            }))
+        );
+
+        // A range end.
+        assert_eq!(ranges.next(), Ok(None));
+
+        // An offset at the end of buf.
+        let mut ranges = rnglists
+            .ranges(
+                RangeListsOffset(buf.len()),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(ranges.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_rnglists_64() {
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 5,
+            address_size: 8,
+        };
+        let section = Section::with_endian(Endian::Little)
+            .L64(0x0300_0000)
+            .L64(0x0301_0300)
+            .L64(0x0301_0400)
+            .L64(0x0301_0500);
+        let buf = section.get_contents().unwrap();
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&buf, LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+
+        let start = Label::new();
+        let first = Label::new();
+        let size = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // Header
+            .mark(&start)
+            .L32(0xffff_ffff)
+            .L64(&size)
+            .L16(encoding.version)
+            .L8(encoding.address_size)
+            .L8(0)
+            .L32(0)
+            .mark(&first)
+            // OffsetPair
+            .L8(4).uleb(0x10200).uleb(0x10300)
+            // A base address selection followed by an OffsetPair.
+            .L8(5).L64(0x0200_0000)
+            .L8(4).uleb(0x10400).uleb(0x10500)
+            // An empty OffsetPair followed by a normal OffsetPair.
+            .L8(4).uleb(0x10600).uleb(0x10600)
+            .L8(4).uleb(0x10800).uleb(0x10900)
+            // A StartEnd
+            .L8(6).L64(0x201_0a00).L64(0x201_0b00)
+            // A StartLength
+            .L8(7).L64(0x201_0c00).uleb(0x100)
+            // An OffsetPair that starts at 0.
+            .L8(4).uleb(0).uleb(1)
+            // An OffsetPair that starts and ends at 0.
+            .L8(4).uleb(0).uleb(0)
+            // An OffsetPair that ends at -1.
+            .L8(5).L64(0)
+            .L8(4).uleb(0).uleb(0xffff_ffff)
+            // A BaseAddressx + OffsetPair
+            .L8(1).uleb(0)
+            .L8(4).uleb(0x10100).uleb(0x10200)
+            // A StartxEndx
+            .L8(2).uleb(1).uleb(2)
+            // A StartxLength
+            .L8(3).uleb(3).uleb(0x100)
+            // A range end.
+            .L8(0)
+            // Some extra data.
+            .L32(0xffff_ffff);
+        size.set_const((&section.here() - &start - 12) as u64);
+
+        let buf = section.get_contents().unwrap();
+        let debug_ranges = DebugRanges::new(&[], LittleEndian);
+        let debug_rnglists = DebugRngLists::new(&buf, LittleEndian);
+        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
+        let offset = RangeListsOffset((&first - &start) as usize);
+        let mut ranges = rnglists
+            .ranges(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
+            .unwrap();
+
+        // A normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0101_0200,
+                end: 0x0101_0300,
+            }))
+        );
+
+        // A base address selection followed by a normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0400,
+                end: 0x0201_0500,
+            }))
+        );
+
+        // An empty range followed by a normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0600,
+                end: 0x0201_0600,
+            }))
+        );
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0800,
+                end: 0x0201_0900,
+            }))
+        );
+
+        // A normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0a00,
+                end: 0x0201_0b00,
+            }))
+        );
+
+        // A normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0c00,
+                end: 0x0201_0d00,
+            }))
+        );
+
+        // A range that starts at 0.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0200_0000,
+                end: 0x0200_0001,
+            }))
+        );
+
+        // A range that starts and ends at 0.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0200_0000,
+                end: 0x0200_0000,
+            }))
+        );
+
+        // A range that ends at -1.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0000_0000,
+                end: 0xffff_ffff,
+            }))
+        );
+
+        // A BaseAddressx + OffsetPair
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0301_0100,
+                end: 0x0301_0200,
+            }))
+        );
+
+        // A StartxEndx
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0301_0300,
+                end: 0x0301_0400,
+            }))
+        );
+
+        // A StartxLength
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0301_0500,
+                end: 0x0301_0600,
+            }))
+        );
+
+        // A range end.
+        assert_eq!(ranges.next(), Ok(None));
+
+        // An offset at the end of buf.
+        let mut ranges = rnglists
+            .ranges(
+                RangeListsOffset(buf.len()),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(ranges.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_raw_range() {
+        let range = RawRange {
+            begin: 0,
+            end: 0xffff_ffff,
+        };
+        assert!(!range.is_end());
+        assert!(!range.is_base_address(4));
+        assert!(!range.is_base_address(8));
+
+        let range = RawRange { begin: 0, end: 0 };
+        assert!(range.is_end());
+        assert!(!range.is_base_address(4));
+        assert!(!range.is_base_address(8));
+
+        let range = RawRange {
+            begin: 0xffff_ffff,
+            end: 0,
+        };
+        assert!(!range.is_end());
+        assert!(range.is_base_address(4));
+        assert!(!range.is_base_address(8));
+
+        let range = RawRange {
+            begin: 0xffff_ffff_ffff_ffff,
+            end: 0,
+        };
+        assert!(!range.is_end());
+        assert!(!range.is_base_address(4));
+        assert!(range.is_base_address(8));
+    }
+
+    #[test]
+    fn test_ranges_32() {
+        let start = Label::new();
+        let first = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // A range before the offset.
+            .mark(&start)
+            .L32(0x10000).L32(0x10100)
+            .mark(&first)
+            // A normal range.
+            .L32(0x10200).L32(0x10300)
+            // A base address selection followed by a normal range.
+            .L32(0xffff_ffff).L32(0x0200_0000)
+            .L32(0x10400).L32(0x10500)
+            // An empty range followed by a normal range.
+            .L32(0x10600).L32(0x10600)
+            .L32(0x10800).L32(0x10900)
+            // A range that starts at 0.
+            .L32(0).L32(1)
+            // A range that ends at -1.
+            .L32(0xffff_ffff).L32(0x0000_0000)
+            .L32(0).L32(0xffff_ffff)
+            // A range end.
+            .L32(0).L32(0)
+            // Some extra data.
+            .L32(0);
+
+        let buf = section.get_contents().unwrap();
+        let debug_ranges = DebugRanges::new(&buf, LittleEndian);
+        let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
+        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
+        let offset = RangeListsOffset((&first - &start) as usize);
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut ranges = rnglists
+            .ranges(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
+            .unwrap();
+
+        // A normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0101_0200,
+                end: 0x0101_0300,
+            }))
+        );
+
+        // A base address selection followed by a normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0400,
+                end: 0x0201_0500,
+            }))
+        );
+
+        // An empty range followed by a normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0600,
+                end: 0x0201_0600,
+            }))
+        );
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0800,
+                end: 0x0201_0900,
+            }))
+        );
+
+        // A range that starts at 0.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0200_0000,
+                end: 0x0200_0001,
+            }))
+        );
+
+        // A range that ends at -1.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0000_0000,
+                end: 0xffff_ffff,
+            }))
+        );
+
+        // A range end.
+        assert_eq!(ranges.next(), Ok(None));
+
+        // An offset at the end of buf.
+        let mut ranges = rnglists
+            .ranges(
+                RangeListsOffset(buf.len()),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(ranges.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_ranges_64() {
+        let start = Label::new();
+        let first = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // A range before the offset.
+            .mark(&start)
+            .L64(0x10000).L64(0x10100)
+            .mark(&first)
+            // A normal range.
+            .L64(0x10200).L64(0x10300)
+            // A base address selection followed by a normal range.
+            .L64(0xffff_ffff_ffff_ffff).L64(0x0200_0000)
+            .L64(0x10400).L64(0x10500)
+            // An empty range followed by a normal range.
+            .L64(0x10600).L64(0x10600)
+            .L64(0x10800).L64(0x10900)
+            // A range that starts at 0.
+            .L64(0).L64(1)
+            // A range that ends at -1.
+            .L64(0xffff_ffff_ffff_ffff).L64(0x0000_0000)
+            .L64(0).L64(0xffff_ffff_ffff_ffff)
+            // A range end.
+            .L64(0).L64(0)
+            // Some extra data.
+            .L64(0);
+
+        let buf = section.get_contents().unwrap();
+        let debug_ranges = DebugRanges::new(&buf, LittleEndian);
+        let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
+        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
+        let offset = RangeListsOffset((&first - &start) as usize);
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 4,
+            address_size: 8,
+        };
+        let mut ranges = rnglists
+            .ranges(offset, encoding, 0x0100_0000, debug_addr, debug_addr_base)
+            .unwrap();
+
+        // A normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0101_0200,
+                end: 0x0101_0300,
+            }))
+        );
+
+        // A base address selection followed by a normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0400,
+                end: 0x0201_0500,
+            }))
+        );
+
+        // An empty range followed by a normal range.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0600,
+                end: 0x0201_0600,
+            }))
+        );
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0201_0800,
+                end: 0x0201_0900,
+            }))
+        );
+
+        // A range that starts at 0.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0200_0000,
+                end: 0x0200_0001,
+            }))
+        );
+
+        // A range that ends at -1.
+        assert_eq!(
+            ranges.next(),
+            Ok(Some(Range {
+                begin: 0x0,
+                end: 0xffff_ffff_ffff_ffff,
+            }))
+        );
+
+        // A range end.
+        assert_eq!(ranges.next(), Ok(None));
+
+        // An offset at the end of buf.
+        let mut ranges = rnglists
+            .ranges(
+                RangeListsOffset(buf.len()),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(ranges.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_ranges_invalid() {
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            // An invalid range.
+            .L32(0x20000).L32(0x10000)
+            // An invalid range after wrapping.
+            .L32(0x20000).L32(0xff01_0000);
+
+        let buf = section.get_contents().unwrap();
+        let debug_ranges = DebugRanges::new(&buf, LittleEndian);
+        let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
+        let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
+        let debug_addr = &DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+        let debug_addr_base = DebugAddrBase(0);
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+
+        // An invalid range.
+        let mut ranges = rnglists
+            .ranges(
+                RangeListsOffset(0x0),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(ranges.next(), Err(Error::InvalidAddressRange));
+
+        // An invalid range after wrapping.
+        let mut ranges = rnglists
+            .ranges(
+                RangeListsOffset(0x8),
+                encoding,
+                0x0100_0000,
+                debug_addr,
+                debug_addr_base,
+            )
+            .unwrap();
+        assert_eq!(ranges.next(), Err(Error::InvalidAddressRange));
+
+        // An invalid offset.
+        match rnglists.ranges(
+            RangeListsOffset(buf.len() + 1),
+            encoding,
+            0x0100_0000,
+            debug_addr,
+            debug_addr_base,
+        ) {
+            Err(Error::UnexpectedEof(_)) => {}
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_get_offset() {
+        for format in vec![Format::Dwarf32, Format::Dwarf64] {
+            let encoding = Encoding {
+                format,
+                version: 5,
+                address_size: 4,
+            };
+
+            let zero = Label::new();
+            let length = Label::new();
+            let start = Label::new();
+            let first = Label::new();
+            let end = Label::new();
+            let mut section = Section::with_endian(Endian::Little)
+                .mark(&zero)
+                .initial_length(format, &length, &start)
+                .D16(encoding.version)
+                .D8(encoding.address_size)
+                .D8(0)
+                .D32(20)
+                .mark(&first);
+            for i in 0..20 {
+                section = section.word(format.word_size(), 1000 + i);
+            }
+            section = section.mark(&end);
+            length.set_const((&end - &start) as u64);
+            let section = section.get_contents().unwrap();
+
+            let debug_ranges = DebugRanges::from(EndianSlice::new(&[], LittleEndian));
+            let debug_rnglists = DebugRngLists::from(EndianSlice::new(&section, LittleEndian));
+            let ranges = RangeLists::new(debug_ranges, debug_rnglists);
+
+            let base = DebugRngListsBase((&first - &zero) as usize);
+            assert_eq!(
+                ranges.get_offset(encoding, base, DebugRngListsIndex(0)),
+                Ok(RangeListsOffset(base.0 + 1000))
+            );
+            assert_eq!(
+                ranges.get_offset(encoding, base, DebugRngListsIndex(19)),
+                Ok(RangeListsOffset(base.0 + 1019))
+            );
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/str.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,298 @@
+use crate::common::{
+    DebugLineStrOffset, DebugStrOffset, DebugStrOffsetsBase, DebugStrOffsetsIndex, DwarfFileType,
+    Encoding, SectionId,
+};
+use crate::endianity::Endianity;
+use crate::read::{EndianSlice, Reader, ReaderOffset, Result, Section};
+use crate::Format;
+
+/// The `DebugStr` struct represents the DWARF strings
+/// found in the `.debug_str` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugStr<R> {
+    debug_str_section: R,
+}
+
+impl<'input, Endian> DebugStr<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugStr` instance from the data in the `.debug_str`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_str` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugStr, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_str_section_somehow = || &buf;
+    /// let debug_str = DebugStr::new(read_debug_str_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(debug_str_section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(debug_str_section, endian))
+    }
+}
+
+impl<R: Reader> DebugStr<R> {
+    /// Lookup a string from the `.debug_str` section by DebugStrOffset.
+    ///
+    /// ```
+    /// use gimli::{DebugStr, DebugStrOffset, LittleEndian};
+    ///
+    /// # let buf = [0x01, 0x02, 0x00];
+    /// # let offset = DebugStrOffset(0);
+    /// # let read_debug_str_section_somehow = || &buf;
+    /// # let debug_str_offset_somehow = || offset;
+    /// let debug_str = DebugStr::new(read_debug_str_section_somehow(), LittleEndian);
+    /// println!("Found string {:?}", debug_str.get_str(debug_str_offset_somehow()));
+    /// ```
+    pub fn get_str(&self, offset: DebugStrOffset<R::Offset>) -> Result<R> {
+        let input = &mut self.debug_str_section.clone();
+        input.skip(offset.0)?;
+        input.read_null_terminated_slice()
+    }
+}
+
+impl<T> DebugStr<T> {
+    /// Create a `DebugStr` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugStr<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugStr<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.debug_str_section).into()
+    }
+}
+
+impl<R> Section<R> for DebugStr<R> {
+    fn id() -> SectionId {
+        SectionId::DebugStr
+    }
+
+    fn reader(&self) -> &R {
+        &self.debug_str_section
+    }
+}
+
+impl<R> From<R> for DebugStr<R> {
+    fn from(debug_str_section: R) -> Self {
+        DebugStr { debug_str_section }
+    }
+}
+
+/// The raw contents of the `.debug_str_offsets` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugStrOffsets<R> {
+    section: R,
+}
+
+impl<R: Reader> DebugStrOffsets<R> {
+    // TODO: add an iterator over the sets of entries in the section.
+    // This is not needed for common usage of the section though.
+
+    /// Returns the `.debug_str` offset at the given `base` and `index`.
+    ///
+    /// A set of entries in the `.debug_str_offsets` section consists of a header
+    /// followed by a series of string table offsets.
+    ///
+    /// The `base` must be the `DW_AT_str_offsets_base` value from the compilation unit DIE.
+    /// This is an offset that points to the first entry following the header.
+    ///
+    /// The `index` is the value of a `DW_FORM_strx` attribute.
+    ///
+    /// The `format` must be the DWARF format of the compilation unit. This format must
+    /// match the header. However, note that we do not parse the header to validate this,
+    /// since locating the header is unreliable, and the GNU extensions do not emit it.
+    pub fn get_str_offset(
+        &self,
+        format: Format,
+        base: DebugStrOffsetsBase<R::Offset>,
+        index: DebugStrOffsetsIndex<R::Offset>,
+    ) -> Result<DebugStrOffset<R::Offset>> {
+        let input = &mut self.section.clone();
+        input.skip(base.0)?;
+        input.skip(R::Offset::from_u64(
+            index.0.into_u64() * u64::from(format.word_size()),
+        )?)?;
+        input.read_offset(format).map(DebugStrOffset)
+    }
+}
+
+impl<T> DebugStrOffsets<T> {
+    /// Create a `DebugStrOffsets` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugStrOffsets<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugStrOffsets<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.section).into()
+    }
+}
+
+impl<R> Section<R> for DebugStrOffsets<R> {
+    fn id() -> SectionId {
+        SectionId::DebugStrOffsets
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R> From<R> for DebugStrOffsets<R> {
+    fn from(section: R) -> Self {
+        DebugStrOffsets { section }
+    }
+}
+
+impl<Offset> DebugStrOffsetsBase<Offset>
+where
+    Offset: ReaderOffset,
+{
+    /// Returns a `DebugStrOffsetsBase` with the default value of DW_AT_str_offsets_base
+    /// for the given `Encoding` and `DwarfFileType`.
+    pub fn default_for_encoding_and_file(
+        encoding: Encoding,
+        file_type: DwarfFileType,
+    ) -> DebugStrOffsetsBase<Offset> {
+        if encoding.version >= 5 && file_type == DwarfFileType::Dwo {
+            // In .dwo files, the compiler omits the DW_AT_str_offsets_base attribute (because there is
+            // only a single unit in the file) but we must skip past the header, which the attribute
+            // would normally do for us.
+            // initial_length_size + version + 2 bytes of padding.
+            DebugStrOffsetsBase(Offset::from_u8(
+                encoding.format.initial_length_size() + 2 + 2,
+            ))
+        } else {
+            DebugStrOffsetsBase(Offset::from_u8(0))
+        }
+    }
+}
+
+/// The `DebugLineStr` struct represents the DWARF strings
+/// found in the `.debug_line_str` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugLineStr<R> {
+    section: R,
+}
+
+impl<R: Reader> DebugLineStr<R> {
+    /// Lookup a string from the `.debug_line_str` section by DebugLineStrOffset.
+    pub fn get_str(&self, offset: DebugLineStrOffset<R::Offset>) -> Result<R> {
+        let input = &mut self.section.clone();
+        input.skip(offset.0)?;
+        input.read_null_terminated_slice()
+    }
+}
+
+impl<T> DebugLineStr<T> {
+    /// Create a `DebugLineStr` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugLineStr<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugLineStr<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.section).into()
+    }
+}
+
+impl<R> Section<R> for DebugLineStr<R> {
+    fn id() -> SectionId {
+        SectionId::DebugLineStr
+    }
+
+    fn reader(&self) -> &R {
+        &self.section
+    }
+}
+
+impl<R> From<R> for DebugLineStr<R> {
+    fn from(section: R) -> Self {
+        DebugLineStr { section }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::test_util::GimliSectionMethods;
+    use crate::LittleEndian;
+    use test_assembler::{Endian, Label, LabelMaker, Section};
+
+    #[test]
+    fn test_get_str_offset() {
+        for format in vec![Format::Dwarf32, Format::Dwarf64] {
+            let zero = Label::new();
+            let length = Label::new();
+            let start = Label::new();
+            let first = Label::new();
+            let end = Label::new();
+            let mut section = Section::with_endian(Endian::Little)
+                .mark(&zero)
+                .initial_length(format, &length, &start)
+                .D16(5)
+                .D16(0)
+                .mark(&first);
+            for i in 0..20 {
+                section = section.word(format.word_size(), 1000 + i);
+            }
+            section = section.mark(&end);
+            length.set_const((&end - &start) as u64);
+
+            let section = section.get_contents().unwrap();
+            let debug_str_offsets = DebugStrOffsets::from(EndianSlice::new(&section, LittleEndian));
+            let base = DebugStrOffsetsBase((&first - &zero) as usize);
+
+            assert_eq!(
+                debug_str_offsets.get_str_offset(format, base, DebugStrOffsetsIndex(0)),
+                Ok(DebugStrOffset(1000))
+            );
+            assert_eq!(
+                debug_str_offsets.get_str_offset(format, base, DebugStrOffsetsIndex(19)),
+                Ok(DebugStrOffset(1019))
+            );
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/unit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/unit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/unit.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/unit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6074 @@
+//! Functions for parsing DWARF `.debug_info` and `.debug_types` sections.
+
+use core::cell::Cell;
+use core::ops::{Range, RangeFrom, RangeTo};
+use core::{u16, u8};
+
+use crate::common::{
+    DebugAbbrevOffset, DebugAddrBase, DebugAddrIndex, DebugInfoOffset, DebugLineOffset,
+    DebugLineStrOffset, DebugLocListsBase, DebugLocListsIndex, DebugMacinfoOffset,
+    DebugMacroOffset, DebugRngListsBase, DebugRngListsIndex, DebugStrOffset, DebugStrOffsetsBase,
+    DebugStrOffsetsIndex, DebugTypeSignature, DebugTypesOffset, DwoId, Encoding, Format,
+    LocationListsOffset, RangeListsOffset, SectionId, UnitSectionOffset,
+};
+use crate::constants;
+use crate::endianity::Endianity;
+use crate::read::{
+    Abbreviation, Abbreviations, AttributeSpecification, DebugAbbrev, DebugStr, EndianSlice, Error,
+    Expression, Reader, ReaderOffset, Result, Section,
+};
+
+impl<T: ReaderOffset> DebugTypesOffset<T> {
+    /// Convert an offset to be relative to the start of the given unit,
+    /// instead of relative to the start of the .debug_types section.
+    /// Returns `None` if the offset is not within the unit entries.
+    pub fn to_unit_offset<R>(&self, unit: &UnitHeader<R>) -> Option<UnitOffset<T>>
+    where
+        R: Reader<Offset = T>,
+    {
+        let unit_offset = unit.offset().as_debug_types_offset()?;
+        let offset = UnitOffset(self.0.checked_sub(unit_offset.0)?);
+        if !unit.is_valid_offset(offset) {
+            return None;
+        }
+        Some(offset)
+    }
+}
+
+impl<T: ReaderOffset> DebugInfoOffset<T> {
+    /// Convert an offset to be relative to the start of the given unit,
+    /// instead of relative to the start of the .debug_info section.
+    /// Returns `None` if the offset is not within this unit entries.
+    pub fn to_unit_offset<R>(&self, unit: &UnitHeader<R>) -> Option<UnitOffset<T>>
+    where
+        R: Reader<Offset = T>,
+    {
+        let unit_offset = unit.offset().as_debug_info_offset()?;
+        let offset = UnitOffset(self.0.checked_sub(unit_offset.0)?);
+        if !unit.is_valid_offset(offset) {
+            return None;
+        }
+        Some(offset)
+    }
+}
+
+/// An offset into the current compilation or type unit.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
+pub struct UnitOffset<T = usize>(pub T);
+
+impl<T: ReaderOffset> UnitOffset<T> {
+    /// Convert an offset to be relative to the start of the .debug_info section,
+    /// instead of relative to the start of the given unit. Returns None if the
+    /// provided unit lives in the .debug_types section.
+    pub fn to_debug_info_offset<R>(&self, unit: &UnitHeader<R>) -> Option<DebugInfoOffset<T>>
+    where
+        R: Reader<Offset = T>,
+    {
+        let unit_offset = unit.offset().as_debug_info_offset()?;
+        Some(DebugInfoOffset(unit_offset.0 + self.0))
+    }
+
+    /// Convert an offset to be relative to the start of the .debug_types section,
+    /// instead of relative to the start of the given unit. Returns None if the
+    /// provided unit lives in the .debug_info section.
+    pub fn to_debug_types_offset<R>(&self, unit: &UnitHeader<R>) -> Option<DebugTypesOffset<T>>
+    where
+        R: Reader<Offset = T>,
+    {
+        let unit_offset = unit.offset().as_debug_types_offset()?;
+        Some(DebugTypesOffset(unit_offset.0 + self.0))
+    }
+}
+
+/// The `DebugInfo` struct represents the DWARF debugging information found in
+/// the `.debug_info` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugInfo<R> {
+    debug_info_section: R,
+}
+
+impl<'input, Endian> DebugInfo<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugInfo` instance from the data in the `.debug_info`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_info` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugInfo, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_info_section_somehow = || &buf;
+    /// let debug_info = DebugInfo::new(read_debug_info_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(debug_info_section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(debug_info_section, endian))
+    }
+}
+
+impl<R: Reader> DebugInfo<R> {
+    /// Iterate the units in this `.debug_info` section.
+    ///
+    /// ```
+    /// use gimli::{DebugInfo, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_info_section_somehow = || &buf;
+    /// let debug_info = DebugInfo::new(read_debug_info_section_somehow(), LittleEndian);
+    ///
+    /// let mut iter = debug_info.units();
+    /// while let Some(unit) = iter.next().unwrap() {
+    ///     println!("unit's length is {}", unit.unit_length());
+    /// }
+    /// ```
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn units(&self) -> DebugInfoUnitHeadersIter<R> {
+        DebugInfoUnitHeadersIter {
+            input: self.debug_info_section.clone(),
+            offset: DebugInfoOffset(R::Offset::from_u8(0)),
+        }
+    }
+
+    /// Get the UnitHeader located at offset from this .debug_info section.
+    ///
+    ///
+    pub fn header_from_offset(&self, offset: DebugInfoOffset<R::Offset>) -> Result<UnitHeader<R>> {
+        let input = &mut self.debug_info_section.clone();
+        input.skip(offset.0)?;
+        parse_unit_header(input, offset.into())
+    }
+}
+
+impl<T> DebugInfo<T> {
+    /// Create a `DebugInfo` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugInfo<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugInfo<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.debug_info_section).into()
+    }
+}
+
+impl<R> Section<R> for DebugInfo<R> {
+    fn id() -> SectionId {
+        SectionId::DebugInfo
+    }
+
+    fn reader(&self) -> &R {
+        &self.debug_info_section
+    }
+}
+
+impl<R> From<R> for DebugInfo<R> {
+    fn from(debug_info_section: R) -> Self {
+        DebugInfo { debug_info_section }
+    }
+}
+
+/// An iterator over the units of a .debug_info section.
+///
+/// See the [documentation on
+/// `DebugInfo::units`](./struct.DebugInfo.html#method.units) for more detail.
+#[derive(Clone, Debug)]
+pub struct DebugInfoUnitHeadersIter<R: Reader> {
+    input: R,
+    offset: DebugInfoOffset<R::Offset>,
+}
+
+impl<R: Reader> DebugInfoUnitHeadersIter<R> {
+    /// Advance the iterator to the next unit header.
+    pub fn next(&mut self) -> Result<Option<UnitHeader<R>>> {
+        if self.input.is_empty() {
+            Ok(None)
+        } else {
+            let len = self.input.len();
+            match parse_unit_header(&mut self.input, self.offset.into()) {
+                Ok(header) => {
+                    self.offset.0 += len - self.input.len();
+                    Ok(Some(header))
+                }
+                Err(e) => {
+                    self.input.empty();
+                    Err(e)
+                }
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for DebugInfoUnitHeadersIter<R> {
+    type Item = UnitHeader<R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        DebugInfoUnitHeadersIter::next(self)
+    }
+}
+
+/// Parse the unit type from the unit header.
+fn parse_unit_type<R: Reader>(input: &mut R) -> Result<constants::DwUt> {
+    let val = input.read_u8()?;
+    Ok(constants::DwUt(val))
+}
+
+/// Parse the `debug_abbrev_offset` in the compilation unit header.
+fn parse_debug_abbrev_offset<R: Reader>(
+    input: &mut R,
+    format: Format,
+) -> Result<DebugAbbrevOffset<R::Offset>> {
+    input.read_offset(format).map(DebugAbbrevOffset)
+}
+
+/// Parse the `debug_info_offset` in the arange header.
+pub(crate) fn parse_debug_info_offset<R: Reader>(
+    input: &mut R,
+    format: Format,
+) -> Result<DebugInfoOffset<R::Offset>> {
+    input.read_offset(format).map(DebugInfoOffset)
+}
+
+/// This enum specifies the type of the unit and any type
+/// specific data carried in the header (e.g. the type
+/// signature/type offset of a type unit).
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum UnitType<Offset>
+where
+    Offset: ReaderOffset,
+{
+    /// In DWARF5, a unit with type `DW_UT_compile`. In previous DWARF versions,
+    /// any unit appearing in the .debug_info section.
+    Compilation,
+    /// In DWARF5, a unit with type `DW_UT_type`. In DWARF4, any unit appearing
+    /// in the .debug_types section.
+    Type {
+        /// The unique type signature for this type unit.
+        type_signature: DebugTypeSignature,
+        /// The offset within this type unit where the type is defined.
+        type_offset: UnitOffset<Offset>,
+    },
+    /// A unit with type `DW_UT_partial`. The root DIE of this unit should be a
+    /// `DW_TAG_partial_unit`.
+    Partial,
+    /// A unit with type `DW_UT_skeleton`. The enclosed dwo_id can be used to
+    /// link this with the corresponding `SplitCompilation` unit in a dwo file.
+    /// NB: The non-standard GNU split DWARF extension to DWARF 4 will instead
+    /// be a `Compilation` unit with the dwo_id present as an attribute on the
+    /// root DIE.
+    Skeleton(DwoId),
+    /// A unit with type `DW_UT_split_compile`. The enclosed dwo_id can be used to
+    /// link this with the corresponding `Skeleton` unit in the original binary.
+    /// NB: The non-standard GNU split DWARF extension to DWARF 4 will instead
+    /// be a `Compilation` unit with the dwo_id present as an attribute on the
+    /// root DIE.
+    SplitCompilation(DwoId),
+    /// A unit with type `DW_UT_split_type`. A split type unit is identical to a
+    /// conventional type unit except for the section in which it appears.
+    SplitType {
+        /// The unique type signature for this type unit.
+        type_signature: DebugTypeSignature,
+        /// The offset within this type unit where the type is defined.
+        type_offset: UnitOffset<Offset>,
+    },
+}
+
+impl<Offset> UnitType<Offset>
+where
+    Offset: ReaderOffset,
+{
+    // TODO: This will be used by the DWARF writing code once it
+    // supports unit types other than simple compilation units.
+    #[allow(unused)]
+    pub(crate) fn dw_ut(&self) -> constants::DwUt {
+        match self {
+            UnitType::Compilation => constants::DW_UT_compile,
+            UnitType::Type { .. } => constants::DW_UT_type,
+            UnitType::Partial => constants::DW_UT_partial,
+            UnitType::Skeleton(_) => constants::DW_UT_skeleton,
+            UnitType::SplitCompilation(_) => constants::DW_UT_split_compile,
+            UnitType::SplitType { .. } => constants::DW_UT_split_type,
+        }
+    }
+}
+
+/// The common fields for the headers of compilation units and
+/// type units.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct UnitHeader<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    encoding: Encoding,
+    unit_length: Offset,
+    unit_type: UnitType<Offset>,
+    debug_abbrev_offset: DebugAbbrevOffset<Offset>,
+    unit_offset: UnitSectionOffset<Offset>,
+    entries_buf: R,
+}
+
+/// Static methods.
+impl<R, Offset> UnitHeader<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Construct a new `UnitHeader`.
+    pub fn new(
+        encoding: Encoding,
+        unit_length: Offset,
+        unit_type: UnitType<Offset>,
+        debug_abbrev_offset: DebugAbbrevOffset<Offset>,
+        unit_offset: UnitSectionOffset<Offset>,
+        entries_buf: R,
+    ) -> Self {
+        UnitHeader {
+            encoding,
+            unit_length,
+            unit_type,
+            debug_abbrev_offset,
+            unit_offset,
+            entries_buf,
+        }
+    }
+}
+
+/// Instance methods.
+impl<R, Offset> UnitHeader<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Get the offset of this unit within its section.
+    pub fn offset(&self) -> UnitSectionOffset<Offset> {
+        self.unit_offset
+    }
+
+    /// Return the serialized size of the common unit header for the given
+    /// DWARF format.
+    pub fn size_of_header(&self) -> usize {
+        let unit_length_size = self.encoding.format.initial_length_size() as usize;
+        let version_size = 2;
+        let debug_abbrev_offset_size = self.encoding.format.word_size() as usize;
+        let address_size_size = 1;
+        let unit_type_size = if self.encoding.version == 5 { 1 } else { 0 };
+        let type_specific_size = match self.unit_type {
+            UnitType::Compilation | UnitType::Partial => 0,
+            UnitType::Type { .. } | UnitType::SplitType { .. } => {
+                let type_signature_size = 8;
+                let type_offset_size = self.encoding.format.word_size() as usize;
+                type_signature_size + type_offset_size
+            }
+            UnitType::Skeleton(_) | UnitType::SplitCompilation(_) => 8,
+        };
+
+        unit_length_size
+            + version_size
+            + debug_abbrev_offset_size
+            + address_size_size
+            + unit_type_size
+            + type_specific_size
+    }
+
+    /// Get the length of the debugging info for this compilation unit, not
+    /// including the byte length of the encoded length itself.
+    pub fn unit_length(&self) -> Offset {
+        self.unit_length
+    }
+
+    /// Get the length of the debugging info for this compilation unit,
+    /// including the byte length of the encoded length itself.
+    pub fn length_including_self(&self) -> Offset {
+        Offset::from_u8(self.format().initial_length_size()) + self.unit_length
+    }
+
+    /// Return the encoding parameters for this unit.
+    pub fn encoding(&self) -> Encoding {
+        self.encoding
+    }
+
+    /// Get the DWARF version of the debugging info for this compilation unit.
+    pub fn version(&self) -> u16 {
+        self.encoding.version
+    }
+
+    /// Get the UnitType of this unit.
+    pub fn type_(&self) -> UnitType<Offset> {
+        self.unit_type
+    }
+
+    /// The offset into the `.debug_abbrev` section for this compilation unit's
+    /// debugging information entries' abbreviations.
+    pub fn debug_abbrev_offset(&self) -> DebugAbbrevOffset<Offset> {
+        self.debug_abbrev_offset
+    }
+
+    /// The size of addresses (in bytes) in this compilation unit.
+    pub fn address_size(&self) -> u8 {
+        self.encoding.address_size
+    }
+
+    /// Whether this compilation unit is encoded in 64- or 32-bit DWARF.
+    pub fn format(&self) -> Format {
+        self.encoding.format
+    }
+
+    /// The serialized size of the header for this compilation unit.
+    pub fn header_size(&self) -> Offset {
+        self.length_including_self() - self.entries_buf.len()
+    }
+
+    pub(crate) fn is_valid_offset(&self, offset: UnitOffset<Offset>) -> bool {
+        let size_of_header = self.header_size();
+        if offset.0 < size_of_header {
+            return false;
+        }
+
+        let relative_to_entries_buf = offset.0 - size_of_header;
+        relative_to_entries_buf < self.entries_buf.len()
+    }
+
+    /// Get the underlying bytes for the supplied range.
+    pub fn range(&self, idx: Range<UnitOffset<Offset>>) -> Result<R> {
+        if !self.is_valid_offset(idx.start) {
+            return Err(Error::OffsetOutOfBounds);
+        }
+        if !self.is_valid_offset(idx.end) {
+            return Err(Error::OffsetOutOfBounds);
+        }
+        assert!(idx.start <= idx.end);
+        let size_of_header = self.header_size();
+        let start = idx.start.0 - size_of_header;
+        let end = idx.end.0 - size_of_header;
+        let mut input = self.entries_buf.clone();
+        input.skip(start)?;
+        input.truncate(end - start)?;
+        Ok(input)
+    }
+
+    /// Get the underlying bytes for the supplied range.
+    pub fn range_from(&self, idx: RangeFrom<UnitOffset<Offset>>) -> Result<R> {
+        if !self.is_valid_offset(idx.start) {
+            return Err(Error::OffsetOutOfBounds);
+        }
+        let start = idx.start.0 - self.header_size();
+        let mut input = self.entries_buf.clone();
+        input.skip(start)?;
+        Ok(input)
+    }
+
+    /// Get the underlying bytes for the supplied range.
+    pub fn range_to(&self, idx: RangeTo<UnitOffset<Offset>>) -> Result<R> {
+        if !self.is_valid_offset(idx.end) {
+            return Err(Error::OffsetOutOfBounds);
+        }
+        let end = idx.end.0 - self.header_size();
+        let mut input = self.entries_buf.clone();
+        input.truncate(end)?;
+        Ok(input)
+    }
+
+    /// Read the `DebuggingInformationEntry` at the given offset.
+    pub fn entry<'me, 'abbrev>(
+        &'me self,
+        abbreviations: &'abbrev Abbreviations,
+        offset: UnitOffset<Offset>,
+    ) -> Result<DebuggingInformationEntry<'abbrev, 'me, R>> {
+        let mut input = self.range_from(offset..)?;
+        let entry = DebuggingInformationEntry::parse(&mut input, self, abbreviations)?;
+        entry.ok_or(Error::NoEntryAtGivenOffset)
+    }
+
+    /// Navigate this unit's `DebuggingInformationEntry`s.
+    pub fn entries<'me, 'abbrev>(
+        &'me self,
+        abbreviations: &'abbrev Abbreviations,
+    ) -> EntriesCursor<'abbrev, 'me, R> {
+        EntriesCursor {
+            unit: self,
+            input: self.entries_buf.clone(),
+            abbreviations,
+            cached_current: None,
+            delta_depth: 0,
+        }
+    }
+
+    /// Navigate this compilation unit's `DebuggingInformationEntry`s
+    /// starting at the given offset.
+    pub fn entries_at_offset<'me, 'abbrev>(
+        &'me self,
+        abbreviations: &'abbrev Abbreviations,
+        offset: UnitOffset<Offset>,
+    ) -> Result<EntriesCursor<'abbrev, 'me, R>> {
+        let input = self.range_from(offset..)?;
+        Ok(EntriesCursor {
+            unit: self,
+            input,
+            abbreviations,
+            cached_current: None,
+            delta_depth: 0,
+        })
+    }
+
+    /// Navigate this unit's `DebuggingInformationEntry`s as a tree
+    /// starting at the given offset.
+    pub fn entries_tree<'me, 'abbrev>(
+        &'me self,
+        abbreviations: &'abbrev Abbreviations,
+        offset: Option<UnitOffset<Offset>>,
+    ) -> Result<EntriesTree<'abbrev, 'me, R>> {
+        let input = match offset {
+            Some(offset) => self.range_from(offset..)?,
+            None => self.entries_buf.clone(),
+        };
+        Ok(EntriesTree::new(input, self, abbreviations))
+    }
+
+    /// Read the raw data that defines the Debugging Information Entries.
+    pub fn entries_raw<'me, 'abbrev>(
+        &'me self,
+        abbreviations: &'abbrev Abbreviations,
+        offset: Option<UnitOffset<Offset>>,
+    ) -> Result<EntriesRaw<'abbrev, 'me, R>> {
+        let input = match offset {
+            Some(offset) => self.range_from(offset..)?,
+            None => self.entries_buf.clone(),
+        };
+        Ok(EntriesRaw {
+            input,
+            unit: self,
+            abbreviations,
+            depth: 0,
+        })
+    }
+
+    /// Parse this unit's abbreviations.
+    pub fn abbreviations(&self, debug_abbrev: &DebugAbbrev<R>) -> Result<Abbreviations> {
+        debug_abbrev.abbreviations(self.debug_abbrev_offset())
+    }
+}
+
+/// Parse a unit header.
+fn parse_unit_header<R, Offset>(
+    input: &mut R,
+    unit_offset: UnitSectionOffset<Offset>,
+) -> Result<UnitHeader<R>>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    let (unit_length, format) = input.read_initial_length()?;
+    let mut rest = input.split(unit_length)?;
+
+    let version = rest.read_u16()?;
+    let abbrev_offset;
+    let address_size;
+    let unit_type;
+    // DWARF 1 was very different, and is obsolete, so isn't supported by this
+    // reader.
+    if 2 <= version && version <= 4 {
+        abbrev_offset = parse_debug_abbrev_offset(&mut rest, format)?;
+        address_size = rest.read_u8()?;
+        // Before DWARF5, all units in the .debug_info section are compilation
+        // units, and all units in the .debug_types section are type units.
+        unit_type = match unit_offset {
+            UnitSectionOffset::DebugInfoOffset(_) => constants::DW_UT_compile,
+            UnitSectionOffset::DebugTypesOffset(_) => constants::DW_UT_type,
+        };
+    } else if version == 5 {
+        unit_type = parse_unit_type(&mut rest)?;
+        address_size = rest.read_u8()?;
+        abbrev_offset = parse_debug_abbrev_offset(&mut rest, format)?;
+    } else {
+        return Err(Error::UnknownVersion(u64::from(version)));
+    }
+    let encoding = Encoding {
+        format,
+        version,
+        address_size,
+    };
+
+    // Parse any data specific to this type of unit.
+    let unit_type = match unit_type {
+        constants::DW_UT_compile => UnitType::Compilation,
+        constants::DW_UT_type => {
+            let type_signature = parse_type_signature(&mut rest)?;
+            let type_offset = parse_type_offset(&mut rest, format)?;
+            UnitType::Type {
+                type_signature,
+                type_offset,
+            }
+        }
+        constants::DW_UT_partial => UnitType::Partial,
+        constants::DW_UT_skeleton => {
+            let dwo_id = parse_dwo_id(&mut rest)?;
+            UnitType::Skeleton(dwo_id)
+        }
+        constants::DW_UT_split_compile => {
+            let dwo_id = parse_dwo_id(&mut rest)?;
+            UnitType::SplitCompilation(dwo_id)
+        }
+        constants::DW_UT_split_type => {
+            let type_signature = parse_type_signature(&mut rest)?;
+            let type_offset = parse_type_offset(&mut rest, format)?;
+            UnitType::SplitType {
+                type_signature,
+                type_offset,
+            }
+        }
+        _ => return Err(Error::UnsupportedUnitType),
+    };
+
+    Ok(UnitHeader::new(
+        encoding,
+        unit_length,
+        unit_type,
+        abbrev_offset,
+        unit_offset,
+        rest,
+    ))
+}
+
+/// Parse a dwo_id from a header
+fn parse_dwo_id<R: Reader>(input: &mut R) -> Result<DwoId> {
+    Ok(DwoId(input.read_u64()?))
+}
+
+/// A Debugging Information Entry (DIE).
+///
+/// DIEs have a set of attributes and optionally have children DIEs as well.
+#[derive(Clone, Debug)]
+pub struct DebuggingInformationEntry<'abbrev, 'unit, R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    offset: UnitOffset<Offset>,
+    attrs_slice: R,
+    attrs_len: Cell<Option<Offset>>,
+    abbrev: &'abbrev Abbreviation,
+    unit: &'unit UnitHeader<R, Offset>,
+}
+
+impl<'abbrev, 'unit, R, Offset> DebuggingInformationEntry<'abbrev, 'unit, R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Construct a new `DebuggingInformationEntry`.
+    pub fn new(
+        offset: UnitOffset<Offset>,
+        attrs_slice: R,
+        abbrev: &'abbrev Abbreviation,
+        unit: &'unit UnitHeader<R, Offset>,
+    ) -> Self {
+        DebuggingInformationEntry {
+            offset,
+            attrs_slice,
+            attrs_len: Cell::new(None),
+            abbrev,
+            unit,
+        }
+    }
+
+    /// Get this entry's code.
+    pub fn code(&self) -> u64 {
+        self.abbrev.code()
+    }
+
+    /// Get this entry's offset.
+    pub fn offset(&self) -> UnitOffset<Offset> {
+        self.offset
+    }
+
+    /// Get this entry's `DW_TAG_whatever` tag.
+    ///
+    /// ```
+    /// # use gimli::{DebugAbbrev, DebugInfo, LittleEndian};
+    /// # let info_buf = [
+    /// #     // Comilation unit header
+    /// #
+    /// #     // 32-bit unit length = 12
+    /// #     0x0c, 0x00, 0x00, 0x00,
+    /// #     // Version 4
+    /// #     0x04, 0x00,
+    /// #     // debug_abbrev_offset
+    /// #     0x00, 0x00, 0x00, 0x00,
+    /// #     // Address size
+    /// #     0x04,
+    /// #
+    /// #     // DIEs
+    /// #
+    /// #     // Abbreviation code
+    /// #     0x01,
+    /// #     // Attribute of form DW_FORM_string = "foo\0"
+    /// #     0x66, 0x6f, 0x6f, 0x00,
+    /// # ];
+    /// # let debug_info = DebugInfo::new(&info_buf, LittleEndian);
+    /// # let abbrev_buf = [
+    /// #     // Code
+    /// #     0x01,
+    /// #     // DW_TAG_subprogram
+    /// #     0x2e,
+    /// #     // DW_CHILDREN_no
+    /// #     0x00,
+    /// #     // Begin attributes
+    /// #       // Attribute name = DW_AT_name
+    /// #       0x03,
+    /// #       // Attribute form = DW_FORM_string
+    /// #       0x08,
+    /// #     // End attributes
+    /// #     0x00,
+    /// #     0x00,
+    /// #     // Null terminator
+    /// #     0x00
+    /// # ];
+    /// # let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
+    /// # let unit = debug_info.units().next().unwrap().unwrap();
+    /// # let abbrevs = unit.abbreviations(&debug_abbrev).unwrap();
+    /// # let mut cursor = unit.entries(&abbrevs);
+    /// # let (_, entry) = cursor.next_dfs().unwrap().unwrap();
+    /// # let mut get_some_entry = || entry;
+    /// let entry = get_some_entry();
+    ///
+    /// match entry.tag() {
+    ///     gimli::DW_TAG_subprogram =>
+    ///         println!("this entry contains debug info about a function"),
+    ///     gimli::DW_TAG_inlined_subroutine =>
+    ///         println!("this entry contains debug info about a particular instance of inlining"),
+    ///     gimli::DW_TAG_variable =>
+    ///         println!("this entry contains debug info about a local variable"),
+    ///     gimli::DW_TAG_formal_parameter =>
+    ///         println!("this entry contains debug info about a function parameter"),
+    ///     otherwise =>
+    ///         println!("this entry is some other kind of data: {:?}", otherwise),
+    /// };
+    /// ```
+    pub fn tag(&self) -> constants::DwTag {
+        self.abbrev.tag()
+    }
+
+    /// Return true if this entry's type can have children, false otherwise.
+    pub fn has_children(&self) -> bool {
+        self.abbrev.has_children()
+    }
+
+    /// Iterate over this entry's set of attributes.
+    ///
+    /// ```
+    /// use gimli::{DebugAbbrev, DebugInfo, LittleEndian};
+    ///
+    /// // Read the `.debug_info` section.
+    ///
+    /// # let info_buf = [
+    /// #     // Comilation unit header
+    /// #
+    /// #     // 32-bit unit length = 12
+    /// #     0x0c, 0x00, 0x00, 0x00,
+    /// #     // Version 4
+    /// #     0x04, 0x00,
+    /// #     // debug_abbrev_offset
+    /// #     0x00, 0x00, 0x00, 0x00,
+    /// #     // Address size
+    /// #     0x04,
+    /// #
+    /// #     // DIEs
+    /// #
+    /// #     // Abbreviation code
+    /// #     0x01,
+    /// #     // Attribute of form DW_FORM_string = "foo\0"
+    /// #     0x66, 0x6f, 0x6f, 0x00,
+    /// # ];
+    /// # let read_debug_info_section_somehow = || &info_buf;
+    /// let debug_info = DebugInfo::new(read_debug_info_section_somehow(), LittleEndian);
+    ///
+    /// // Get the data about the first compilation unit out of the `.debug_info`.
+    ///
+    /// let unit = debug_info.units().next()
+    ///     .expect("Should have at least one compilation unit")
+    ///     .expect("and it should parse ok");
+    ///
+    /// // Read the `.debug_abbrev` section and parse the
+    /// // abbreviations for our compilation unit.
+    ///
+    /// # let abbrev_buf = [
+    /// #     // Code
+    /// #     0x01,
+    /// #     // DW_TAG_subprogram
+    /// #     0x2e,
+    /// #     // DW_CHILDREN_no
+    /// #     0x00,
+    /// #     // Begin attributes
+    /// #       // Attribute name = DW_AT_name
+    /// #       0x03,
+    /// #       // Attribute form = DW_FORM_string
+    /// #       0x08,
+    /// #     // End attributes
+    /// #     0x00,
+    /// #     0x00,
+    /// #     // Null terminator
+    /// #     0x00
+    /// # ];
+    /// # let read_debug_abbrev_section_somehow = || &abbrev_buf;
+    /// let debug_abbrev = DebugAbbrev::new(read_debug_abbrev_section_somehow(), LittleEndian);
+    /// let abbrevs = unit.abbreviations(&debug_abbrev).unwrap();
+    ///
+    /// // Get the first entry from that compilation unit.
+    ///
+    /// let mut cursor = unit.entries(&abbrevs);
+    /// let (_, entry) = cursor.next_dfs()
+    ///     .expect("Should parse next entry")
+    ///     .expect("Should have at least one entry");
+    ///
+    /// // Finally, print the first entry's attributes.
+    ///
+    /// let mut attrs = entry.attrs();
+    /// while let Some(attr) = attrs.next().unwrap() {
+    ///     println!("Attribute name = {:?}", attr.name());
+    ///     println!("Attribute value = {:?}", attr.value());
+    /// }
+    /// ```
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn attrs<'me>(&'me self) -> AttrsIter<'abbrev, 'me, 'unit, R> {
+        AttrsIter {
+            input: self.attrs_slice.clone(),
+            attributes: self.abbrev.attributes(),
+            entry: self,
+        }
+    }
+
+    /// Find the first attribute in this entry which has the given name,
+    /// and return it. Returns `Ok(None)` if no attribute is found.
+    pub fn attr(&self, name: constants::DwAt) -> Result<Option<Attribute<R>>> {
+        let mut attrs = self.attrs();
+        while let Some(attr) = attrs.next()? {
+            if attr.name() == name {
+                return Ok(Some(attr));
+            }
+        }
+        Ok(None)
+    }
+
+    /// Find the first attribute in this entry which has the given name,
+    /// and return its raw value. Returns `Ok(None)` if no attribute is found.
+    pub fn attr_value_raw(&self, name: constants::DwAt) -> Result<Option<AttributeValue<R>>> {
+        self.attr(name)
+            .map(|attr| attr.map(|attr| attr.raw_value()))
+    }
+
+    /// Find the first attribute in this entry which has the given name,
+    /// and return its normalized value.  Returns `Ok(None)` if no
+    /// attribute is found.
+    pub fn attr_value(&self, name: constants::DwAt) -> Result<Option<AttributeValue<R>>> {
+        self.attr(name).map(|attr| attr.map(|attr| attr.value()))
+    }
+
+    /// Return the input buffer after the last attribute.
+    #[allow(clippy::inline_always)]
+    #[inline(always)]
+    fn after_attrs(&self) -> Result<R> {
+        if let Some(attrs_len) = self.attrs_len.get() {
+            let mut input = self.attrs_slice.clone();
+            input.skip(attrs_len)?;
+            Ok(input)
+        } else {
+            let mut attrs = self.attrs();
+            while let Some(_) = attrs.next()? {}
+            Ok(attrs.input)
+        }
+    }
+
+    /// Use the `DW_AT_sibling` attribute to find the input buffer for the
+    /// next sibling. Returns `None` if the attribute is missing or invalid.
+    fn sibling(&self) -> Option<R> {
+        let attr = self.attr_value(constants::DW_AT_sibling);
+        if let Ok(Some(AttributeValue::UnitRef(offset))) = attr {
+            if offset.0 > self.offset.0 {
+                if let Ok(input) = self.unit.range_from(offset..) {
+                    return Some(input);
+                }
+            }
+        }
+        None
+    }
+
+    /// Parse an entry. Returns `Ok(None)` for null entries.
+    #[allow(clippy::inline_always)]
+    #[inline(always)]
+    fn parse(
+        input: &mut R,
+        unit: &'unit UnitHeader<R>,
+        abbreviations: &'abbrev Abbreviations,
+    ) -> Result<Option<Self>> {
+        let offset = unit.header_size() + input.offset_from(&unit.entries_buf);
+        let code = input.read_uleb128()?;
+        if code == 0 {
+            return Ok(None);
+        };
+        let abbrev = abbreviations.get(code).ok_or(Error::UnknownAbbreviation)?;
+        Ok(Some(DebuggingInformationEntry {
+            offset: UnitOffset(offset),
+            attrs_slice: input.clone(),
+            attrs_len: Cell::new(None),
+            abbrev,
+            unit,
+        }))
+    }
+}
+
+/// The value of an attribute in a `DebuggingInformationEntry`.
+//
+// Set the discriminant size so that all variants use the same alignment
+// for their data.  This gives better code generation in `parse_attribute`.
+#[repr(u64)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum AttributeValue<R, Offset = <R as Reader>::Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// "Refers to some location in the address space of the described program."
+    Addr(u64),
+
+    /// A slice of an arbitrary number of bytes.
+    Block(R),
+
+    /// A one byte constant data value. How to interpret the byte depends on context.
+    ///
+    /// From section 7 of the standard: "Depending on context, it may be a
+    /// signed integer, an unsigned integer, a floating-point constant, or
+    /// anything else."
+    Data1(u8),
+
+    /// A two byte constant data value. How to interpret the bytes depends on context.
+    ///
+    /// These bytes have been converted from `R::Endian`. This may need to be reversed
+    /// if this was not required.
+    ///
+    /// From section 7 of the standard: "Depending on context, it may be a
+    /// signed integer, an unsigned integer, a floating-point constant, or
+    /// anything else."
+    Data2(u16),
+
+    /// A four byte constant data value. How to interpret the bytes depends on context.
+    ///
+    /// These bytes have been converted from `R::Endian`. This may need to be reversed
+    /// if this was not required.
+    ///
+    /// From section 7 of the standard: "Depending on context, it may be a
+    /// signed integer, an unsigned integer, a floating-point constant, or
+    /// anything else."
+    Data4(u32),
+
+    /// An eight byte constant data value. How to interpret the bytes depends on context.
+    ///
+    /// These bytes have been converted from `R::Endian`. This may need to be reversed
+    /// if this was not required.
+    ///
+    /// From section 7 of the standard: "Depending on context, it may be a
+    /// signed integer, an unsigned integer, a floating-point constant, or
+    /// anything else."
+    Data8(u64),
+
+    /// A signed integer constant.
+    Sdata(i64),
+
+    /// An unsigned integer constant.
+    Udata(u64),
+
+    /// "The information bytes contain a DWARF expression (see Section 2.5) or
+    /// location description (see Section 2.6)."
+    Exprloc(Expression<R>),
+
+    /// A boolean that indicates presence or absence of the attribute.
+    Flag(bool),
+
+    /// An offset into another section. Which section this is an offset into
+    /// depends on context.
+    SecOffset(Offset),
+
+    /// An offset to a set of addresses in the `.debug_addr` section.
+    DebugAddrBase(DebugAddrBase<Offset>),
+
+    /// An index into a set of addresses in the `.debug_addr` section.
+    DebugAddrIndex(DebugAddrIndex<Offset>),
+
+    /// An offset into the current compilation unit.
+    UnitRef(UnitOffset<Offset>),
+
+    /// An offset into the current `.debug_info` section, but possibly a
+    /// different compilation unit from the current one.
+    DebugInfoRef(DebugInfoOffset<Offset>),
+
+    /// An offset into the `.debug_info` section of the supplementary object file.
+    DebugInfoRefSup(DebugInfoOffset<Offset>),
+
+    /// An offset into the `.debug_line` section.
+    DebugLineRef(DebugLineOffset<Offset>),
+
+    /// An offset into either the `.debug_loc` section or the `.debug_loclists` section.
+    LocationListsRef(LocationListsOffset<Offset>),
+
+    /// An offset to a set of offsets in the `.debug_loclists` section.
+    DebugLocListsBase(DebugLocListsBase<Offset>),
+
+    /// An index into a set of offsets in the `.debug_loclists` section.
+    DebugLocListsIndex(DebugLocListsIndex<Offset>),
+
+    /// An offset into the `.debug_macinfo` section.
+    DebugMacinfoRef(DebugMacinfoOffset<Offset>),
+
+    /// An offset into the `.debug_macro` section.
+    DebugMacroRef(DebugMacroOffset<Offset>),
+
+    /// An offset into the `.debug_ranges` section.
+    RangeListsRef(RangeListsOffset<Offset>),
+
+    /// An offset to a set of offsets in the `.debug_rnglists` section.
+    DebugRngListsBase(DebugRngListsBase<Offset>),
+
+    /// An index into a set of offsets in the `.debug_rnglists` section.
+    DebugRngListsIndex(DebugRngListsIndex<Offset>),
+
+    /// A type signature.
+    DebugTypesRef(DebugTypeSignature),
+
+    /// An offset into the `.debug_str` section.
+    DebugStrRef(DebugStrOffset<Offset>),
+
+    /// An offset into the `.debug_str` section of the supplementary object file.
+    DebugStrRefSup(DebugStrOffset<Offset>),
+
+    /// An offset to a set of entries in the `.debug_str_offsets` section.
+    DebugStrOffsetsBase(DebugStrOffsetsBase<Offset>),
+
+    /// An index into a set of entries in the `.debug_str_offsets` section.
+    DebugStrOffsetsIndex(DebugStrOffsetsIndex<Offset>),
+
+    /// An offset into the `.debug_line_str` section.
+    DebugLineStrRef(DebugLineStrOffset<Offset>),
+
+    /// A slice of bytes representing a string. Does not include a final null byte.
+    /// Not guaranteed to be UTF-8 or anything like that.
+    String(R),
+
+    /// The value of a `DW_AT_encoding` attribute.
+    Encoding(constants::DwAte),
+
+    /// The value of a `DW_AT_decimal_sign` attribute.
+    DecimalSign(constants::DwDs),
+
+    /// The value of a `DW_AT_endianity` attribute.
+    Endianity(constants::DwEnd),
+
+    /// The value of a `DW_AT_accessibility` attribute.
+    Accessibility(constants::DwAccess),
+
+    /// The value of a `DW_AT_visibility` attribute.
+    Visibility(constants::DwVis),
+
+    /// The value of a `DW_AT_virtuality` attribute.
+    Virtuality(constants::DwVirtuality),
+
+    /// The value of a `DW_AT_language` attribute.
+    Language(constants::DwLang),
+
+    /// The value of a `DW_AT_address_class` attribute.
+    AddressClass(constants::DwAddr),
+
+    /// The value of a `DW_AT_identifier_case` attribute.
+    IdentifierCase(constants::DwId),
+
+    /// The value of a `DW_AT_calling_convention` attribute.
+    CallingConvention(constants::DwCc),
+
+    /// The value of a `DW_AT_inline` attribute.
+    Inline(constants::DwInl),
+
+    /// The value of a `DW_AT_ordering` attribute.
+    Ordering(constants::DwOrd),
+
+    /// An index into the filename entries from the line number information
+    /// table for the compilation unit containing this value.
+    FileIndex(u64),
+
+    /// An implementation-defined identifier uniquely identifying a compilation
+    /// unit.
+    DwoId(DwoId),
+}
+
+/// An attribute in a `DebuggingInformationEntry`, consisting of a name and
+/// associated value.
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+pub struct Attribute<R: Reader> {
+    name: constants::DwAt,
+    value: AttributeValue<R>,
+}
+
+impl<R: Reader> Attribute<R> {
+    /// Get this attribute's name.
+    pub fn name(&self) -> constants::DwAt {
+        self.name
+    }
+
+    /// Get this attribute's raw value.
+    pub fn raw_value(&self) -> AttributeValue<R> {
+        self.value.clone()
+    }
+
+    /// Get this attribute's normalized value.
+    ///
+    /// Attribute values can potentially be encoded in multiple equivalent forms,
+    /// and may have special meaning depending on the attribute name.  This method
+    /// converts the attribute value to a normalized form based on the attribute
+    /// name.
+    ///
+    /// See "Table 7.5: Attribute encodings" and "Table 7.6: Attribute form encodings".
+    #[allow(clippy::cyclomatic_complexity)]
+    #[allow(clippy::match_same_arms)]
+    pub fn value(&self) -> AttributeValue<R> {
+        // Table 7.5 shows the possible attribute classes for each name.
+        // Table 7.6 shows the possible attribute classes for each form.
+        // For each attribute name, we need to match on the form, and
+        // convert it to one of the classes that is allowed for both
+        // the name and the form.
+        //
+        // The individual class conversions rarely vary for each name,
+        // so for each class conversion we define a macro that matches
+        // on the allowed forms for that class.
+        //
+        // For some classes, we don't need to do any conversion, so their
+        // macro is empty.  In the future we may want to fill them in to
+        // provide strict checking of the forms for each class.  For now,
+        // they simply provide a way to document the allowed classes for
+        // each name.
+
+        // DW_FORM_addr
+        // DW_FORM_addrx
+        // DW_FORM_addrx1
+        // DW_FORM_addrx2
+        // DW_FORM_addrx3
+        // DW_FORM_addrx4
+        macro_rules! address {
+            () => {};
+        }
+        // DW_FORM_sec_offset
+        macro_rules! addrptr {
+            () => {
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::DebugAddrBase(DebugAddrBase(offset));
+                }
+            };
+        }
+        // DW_FORM_block
+        // DW_FORM_block1
+        // DW_FORM_block2
+        // DW_FORM_block4
+        macro_rules! block {
+            () => {};
+        }
+        // DW_FORM_sdata
+        // DW_FORM_udata
+        // DW_FORM_data1
+        // DW_FORM_data2
+        // DW_FORM_data4
+        // DW_FORM_data8
+        // DW_FORM_data16
+        // DW_FORM_implicit_const
+        macro_rules! constant {
+            ($value:ident, $variant:ident) => {
+                if let Some(value) = self.$value() {
+                    return AttributeValue::$variant(value);
+                }
+            };
+            ($value:ident, $variant:ident, $constant:ident) => {
+                if let Some(value) = self.$value() {
+                    return AttributeValue::$variant(constants::$constant(value));
+                }
+            };
+        }
+        // DW_FORM_exprloc
+        macro_rules! exprloc {
+            () => {
+                if let Some(value) = self.exprloc_value() {
+                    return AttributeValue::Exprloc(value);
+                }
+            };
+        }
+        // DW_FORM_flag
+        // DW_FORM_flag_present
+        macro_rules! flag {
+            () => {};
+        }
+        // DW_FORM_sec_offset
+        macro_rules! lineptr {
+            () => {
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::DebugLineRef(DebugLineOffset(offset));
+                }
+            };
+        }
+        // This also covers `loclist` in DWARF version 5.
+        // DW_FORM_sec_offset
+        // DW_FORM_loclistx
+        macro_rules! loclistptr {
+            () => {
+                // DebugLocListsIndex is also an allowed form in DWARF version 5.
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::LocationListsRef(LocationListsOffset(offset));
+                }
+            };
+        }
+        // DW_FORM_sec_offset
+        macro_rules! loclistsptr {
+            () => {
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::DebugLocListsBase(DebugLocListsBase(offset));
+                }
+            };
+        }
+        // DWARF version <= 4.
+        // DW_FORM_sec_offset
+        macro_rules! macinfoptr {
+            () => {
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::DebugMacinfoRef(DebugMacinfoOffset(offset));
+                }
+            };
+        }
+        // DWARF version >= 5.
+        // DW_FORM_sec_offset
+        macro_rules! macroptr {
+            () => {
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::DebugMacroRef(DebugMacroOffset(offset));
+                }
+            };
+        }
+        // DW_FORM_ref_addr
+        // DW_FORM_ref1
+        // DW_FORM_ref2
+        // DW_FORM_ref4
+        // DW_FORM_ref8
+        // DW_FORM_ref_udata
+        // DW_FORM_ref_sig8
+        // DW_FORM_ref_sup4
+        // DW_FORM_ref_sup8
+        macro_rules! reference {
+            () => {};
+        }
+        // This also covers `rnglist` in DWARF version 5.
+        // DW_FORM_sec_offset
+        // DW_FORM_rnglistx
+        macro_rules! rangelistptr {
+            () => {
+                // DebugRngListsIndex is also an allowed form in DWARF version 5.
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::RangeListsRef(RangeListsOffset(offset));
+                }
+            };
+        }
+        // DW_FORM_sec_offset
+        macro_rules! rnglistsptr {
+            () => {
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::DebugRngListsBase(DebugRngListsBase(offset));
+                }
+            };
+        }
+        // DW_FORM_string
+        // DW_FORM_strp
+        // DW_FORM_strx
+        // DW_FORM_strx1
+        // DW_FORM_strx2
+        // DW_FORM_strx3
+        // DW_FORM_strx4
+        // DW_FORM_strp_sup
+        // DW_FORM_line_strp
+        macro_rules! string {
+            () => {};
+        }
+        // DW_FORM_sec_offset
+        macro_rules! stroffsetsptr {
+            () => {
+                if let Some(offset) = self.offset_value() {
+                    return AttributeValue::DebugStrOffsetsBase(DebugStrOffsetsBase(offset));
+                }
+            };
+        }
+        // This isn't a separate form but it's useful to distinguish it from a generic udata.
+        macro_rules! dwoid {
+            () => {
+                if let Some(value) = self.udata_value() {
+                    return AttributeValue::DwoId(DwoId(value));
+                }
+            };
+        }
+
+        // Perform the allowed class conversions for each attribute name.
+        match self.name {
+            constants::DW_AT_sibling => {
+                reference!();
+            }
+            constants::DW_AT_location => {
+                exprloc!();
+                loclistptr!();
+            }
+            constants::DW_AT_name => {
+                string!();
+            }
+            constants::DW_AT_ordering => {
+                constant!(u8_value, Ordering, DwOrd);
+            }
+            constants::DW_AT_byte_size
+            | constants::DW_AT_bit_offset
+            | constants::DW_AT_bit_size => {
+                constant!(udata_value, Udata);
+                exprloc!();
+                reference!();
+            }
+            constants::DW_AT_stmt_list => {
+                lineptr!();
+            }
+            constants::DW_AT_low_pc => {
+                address!();
+            }
+            constants::DW_AT_high_pc => {
+                address!();
+                constant!(udata_value, Udata);
+            }
+            constants::DW_AT_language => {
+                constant!(u16_value, Language, DwLang);
+            }
+            constants::DW_AT_discr => {
+                reference!();
+            }
+            constants::DW_AT_discr_value => {
+                // constant: depends on type of DW_TAG_variant_part,
+                // so caller must normalize.
+            }
+            constants::DW_AT_visibility => {
+                constant!(u8_value, Visibility, DwVis);
+            }
+            constants::DW_AT_import => {
+                reference!();
+            }
+            constants::DW_AT_string_length => {
+                exprloc!();
+                loclistptr!();
+                reference!();
+            }
+            constants::DW_AT_common_reference => {
+                reference!();
+            }
+            constants::DW_AT_comp_dir => {
+                string!();
+            }
+            constants::DW_AT_const_value => {
+                // TODO: constant: sign depends on DW_AT_type.
+                block!();
+                string!();
+            }
+            constants::DW_AT_containing_type => {
+                reference!();
+            }
+            constants::DW_AT_default_value => {
+                // TODO: constant: sign depends on DW_AT_type.
+                reference!();
+                flag!();
+            }
+            constants::DW_AT_inline => {
+                constant!(u8_value, Inline, DwInl);
+            }
+            constants::DW_AT_is_optional => {
+                flag!();
+            }
+            constants::DW_AT_lower_bound => {
+                // TODO: constant: sign depends on DW_AT_type.
+                exprloc!();
+                reference!();
+            }
+            constants::DW_AT_producer => {
+                string!();
+            }
+            constants::DW_AT_prototyped => {
+                flag!();
+            }
+            constants::DW_AT_return_addr => {
+                exprloc!();
+                loclistptr!();
+            }
+            constants::DW_AT_start_scope => {
+                // TODO: constant
+                rangelistptr!();
+            }
+            constants::DW_AT_bit_stride => {
+                constant!(udata_value, Udata);
+                exprloc!();
+                reference!();
+            }
+            constants::DW_AT_upper_bound => {
+                // TODO: constant: sign depends on DW_AT_type.
+                exprloc!();
+                reference!();
+            }
+            constants::DW_AT_abstract_origin => {
+                reference!();
+            }
+            constants::DW_AT_accessibility => {
+                constant!(u8_value, Accessibility, DwAccess);
+            }
+            constants::DW_AT_address_class => {
+                constant!(udata_value, AddressClass, DwAddr);
+            }
+            constants::DW_AT_artificial => {
+                flag!();
+            }
+            constants::DW_AT_base_types => {
+                reference!();
+            }
+            constants::DW_AT_calling_convention => {
+                constant!(u8_value, CallingConvention, DwCc);
+            }
+            constants::DW_AT_count => {
+                // TODO: constant
+                exprloc!();
+                reference!();
+            }
+            constants::DW_AT_data_member_location => {
+                // Constants must be handled before loclistptr so that DW_FORM_data4/8
+                // are correctly interpreted for DWARF version 4+.
+                constant!(udata_value, Udata);
+                exprloc!();
+                loclistptr!();
+            }
+            constants::DW_AT_decl_column => {
+                constant!(udata_value, Udata);
+            }
+            constants::DW_AT_decl_file => {
+                constant!(udata_value, FileIndex);
+            }
+            constants::DW_AT_decl_line => {
+                constant!(udata_value, Udata);
+            }
+            constants::DW_AT_declaration => {
+                flag!();
+            }
+            constants::DW_AT_discr_list => {
+                block!();
+            }
+            constants::DW_AT_encoding => {
+                constant!(u8_value, Encoding, DwAte);
+            }
+            constants::DW_AT_external => {
+                flag!();
+            }
+            constants::DW_AT_frame_base => {
+                exprloc!();
+                loclistptr!();
+            }
+            constants::DW_AT_friend => {
+                reference!();
+            }
+            constants::DW_AT_identifier_case => {
+                constant!(u8_value, IdentifierCase, DwId);
+            }
+            constants::DW_AT_macro_info => {
+                macinfoptr!();
+            }
+            constants::DW_AT_namelist_item => {
+                reference!();
+            }
+            constants::DW_AT_priority => {
+                reference!();
+            }
+            constants::DW_AT_segment => {
+                exprloc!();
+                loclistptr!();
+            }
+            constants::DW_AT_specification => {
+                reference!();
+            }
+            constants::DW_AT_static_link => {
+                exprloc!();
+                loclistptr!();
+            }
+            constants::DW_AT_type => {
+                reference!();
+            }
+            constants::DW_AT_use_location => {
+                exprloc!();
+                loclistptr!();
+            }
+            constants::DW_AT_variable_parameter => {
+                flag!();
+            }
+            constants::DW_AT_virtuality => {
+                constant!(u8_value, Virtuality, DwVirtuality);
+            }
+            constants::DW_AT_vtable_elem_location => {
+                exprloc!();
+                loclistptr!();
+            }
+            constants::DW_AT_allocated => {
+                // TODO: constant
+                exprloc!();
+                reference!();
+            }
+            constants::DW_AT_associated => {
+                // TODO: constant
+                exprloc!();
+                reference!();
+            }
+            constants::DW_AT_data_location => {
+                exprloc!();
+            }
+            constants::DW_AT_byte_stride => {
+                constant!(udata_value, Udata);
+                exprloc!();
+                reference!();
+            }
+            constants::DW_AT_entry_pc => {
+                // TODO: constant
+                address!();
+            }
+            constants::DW_AT_use_UTF8 => {
+                flag!();
+            }
+            constants::DW_AT_extension => {
+                reference!();
+            }
+            constants::DW_AT_ranges => {
+                rangelistptr!();
+            }
+            constants::DW_AT_trampoline => {
+                address!();
+                flag!();
+                reference!();
+                string!();
+            }
+            constants::DW_AT_call_column => {
+                constant!(udata_value, Udata);
+            }
+            constants::DW_AT_call_file => {
+                constant!(udata_value, FileIndex);
+            }
+            constants::DW_AT_call_line => {
+                constant!(udata_value, Udata);
+            }
+            constants::DW_AT_description => {
+                string!();
+            }
+            constants::DW_AT_binary_scale => {
+                // TODO: constant
+            }
+            constants::DW_AT_decimal_scale => {
+                // TODO: constant
+            }
+            constants::DW_AT_small => {
+                reference!();
+            }
+            constants::DW_AT_decimal_sign => {
+                constant!(u8_value, DecimalSign, DwDs);
+            }
+            constants::DW_AT_digit_count => {
+                // TODO: constant
+            }
+            constants::DW_AT_picture_string => {
+                string!();
+            }
+            constants::DW_AT_mutable => {
+                flag!();
+            }
+            constants::DW_AT_threads_scaled => {
+                flag!();
+            }
+            constants::DW_AT_explicit => {
+                flag!();
+            }
+            constants::DW_AT_object_pointer => {
+                reference!();
+            }
+            constants::DW_AT_endianity => {
+                constant!(u8_value, Endianity, DwEnd);
+            }
+            constants::DW_AT_elemental => {
+                flag!();
+            }
+            constants::DW_AT_pure => {
+                flag!();
+            }
+            constants::DW_AT_recursive => {
+                flag!();
+            }
+            constants::DW_AT_signature => {
+                reference!();
+            }
+            constants::DW_AT_main_subprogram => {
+                flag!();
+            }
+            constants::DW_AT_data_bit_offset => {
+                // TODO: constant
+            }
+            constants::DW_AT_const_expr => {
+                flag!();
+            }
+            constants::DW_AT_enum_class => {
+                flag!();
+            }
+            constants::DW_AT_linkage_name => {
+                string!();
+            }
+            constants::DW_AT_string_length_bit_size => {
+                // TODO: constant
+            }
+            constants::DW_AT_string_length_byte_size => {
+                // TODO: constant
+            }
+            constants::DW_AT_rank => {
+                // TODO: constant
+                exprloc!();
+            }
+            constants::DW_AT_str_offsets_base => {
+                stroffsetsptr!();
+            }
+            constants::DW_AT_addr_base | constants::DW_AT_GNU_addr_base => {
+                addrptr!();
+            }
+            constants::DW_AT_rnglists_base | constants::DW_AT_GNU_ranges_base => {
+                rnglistsptr!();
+            }
+            constants::DW_AT_dwo_name => {
+                string!();
+            }
+            constants::DW_AT_reference => {
+                flag!();
+            }
+            constants::DW_AT_rvalue_reference => {
+                flag!();
+            }
+            constants::DW_AT_macros => {
+                macroptr!();
+            }
+            constants::DW_AT_call_all_calls => {
+                flag!();
+            }
+            constants::DW_AT_call_all_source_calls => {
+                flag!();
+            }
+            constants::DW_AT_call_all_tail_calls => {
+                flag!();
+            }
+            constants::DW_AT_call_return_pc => {
+                address!();
+            }
+            constants::DW_AT_call_value => {
+                exprloc!();
+            }
+            constants::DW_AT_call_origin => {
+                exprloc!();
+            }
+            constants::DW_AT_call_parameter => {
+                reference!();
+            }
+            constants::DW_AT_call_pc => {
+                address!();
+            }
+            constants::DW_AT_call_tail_call => {
+                flag!();
+            }
+            constants::DW_AT_call_target => {
+                exprloc!();
+            }
+            constants::DW_AT_call_target_clobbered => {
+                exprloc!();
+            }
+            constants::DW_AT_call_data_location => {
+                exprloc!();
+            }
+            constants::DW_AT_call_data_value => {
+                exprloc!();
+            }
+            constants::DW_AT_noreturn => {
+                flag!();
+            }
+            constants::DW_AT_alignment => {
+                // TODO: constant
+            }
+            constants::DW_AT_export_symbols => {
+                flag!();
+            }
+            constants::DW_AT_deleted => {
+                flag!();
+            }
+            constants::DW_AT_defaulted => {
+                // TODO: constant
+            }
+            constants::DW_AT_loclists_base => {
+                loclistsptr!();
+            }
+            constants::DW_AT_GNU_dwo_id => {
+                dwoid!();
+            }
+            _ => {}
+        }
+        self.value.clone()
+    }
+
+    /// Try to convert this attribute's value to a u8.
+    #[inline]
+    pub fn u8_value(&self) -> Option<u8> {
+        self.value.u8_value()
+    }
+
+    /// Try to convert this attribute's value to a u16.
+    #[inline]
+    pub fn u16_value(&self) -> Option<u16> {
+        self.value.u16_value()
+    }
+
+    /// Try to convert this attribute's value to an unsigned integer.
+    #[inline]
+    pub fn udata_value(&self) -> Option<u64> {
+        self.value.udata_value()
+    }
+
+    /// Try to convert this attribute's value to a signed integer.
+    #[inline]
+    pub fn sdata_value(&self) -> Option<i64> {
+        self.value.sdata_value()
+    }
+
+    /// Try to convert this attribute's value to an offset.
+    #[inline]
+    pub fn offset_value(&self) -> Option<R::Offset> {
+        self.value.offset_value()
+    }
+
+    /// Try to convert this attribute's value to an expression or location buffer.
+    ///
+    /// Expressions and locations may be `DW_FORM_block*` or `DW_FORM_exprloc`.
+    /// The standard doesn't mention `DW_FORM_block*` as a possible form, but
+    /// it is encountered in practice.
+    #[inline]
+    pub fn exprloc_value(&self) -> Option<Expression<R>> {
+        self.value.exprloc_value()
+    }
+
+    /// Try to return this attribute's value as a string slice.
+    ///
+    /// If this attribute's value is either an inline `DW_FORM_string` string,
+    /// or a `DW_FORM_strp` reference to an offset into the `.debug_str`
+    /// section, return the attribute's string value as `Some`. Other attribute
+    /// value forms are returned as `None`.
+    ///
+    /// Warning: this function does not handle all possible string forms.
+    /// Use `Dwarf::attr_string` instead.
+    #[inline]
+    pub fn string_value(&self, debug_str: &DebugStr<R>) -> Option<R> {
+        self.value.string_value(debug_str)
+    }
+
+    /// Try to return this attribute's value as a string slice.
+    ///
+    /// If this attribute's value is either an inline `DW_FORM_string` string,
+    /// or a `DW_FORM_strp` reference to an offset into the `.debug_str`
+    /// section, or a `DW_FORM_strp_sup` reference to an offset into a supplementary
+    /// object file, return the attribute's string value as `Some`. Other attribute
+    /// value forms are returned as `None`.
+    ///
+    /// Warning: this function does not handle all possible string forms.
+    /// Use `Dwarf::attr_string` instead.
+    #[inline]
+    pub fn string_value_sup(
+        &self,
+        debug_str: &DebugStr<R>,
+        debug_str_sup: Option<&DebugStr<R>>,
+    ) -> Option<R> {
+        self.value.string_value_sup(debug_str, debug_str_sup)
+    }
+}
+
+impl<R, Offset> AttributeValue<R, Offset>
+where
+    R: Reader<Offset = Offset>,
+    Offset: ReaderOffset,
+{
+    /// Try to convert this attribute's value to a u8.
+    pub fn u8_value(&self) -> Option<u8> {
+        if let Some(value) = self.udata_value() {
+            if value <= u64::from(u8::MAX) {
+                return Some(value as u8);
+            }
+        }
+        None
+    }
+
+    /// Try to convert this attribute's value to a u16.
+    pub fn u16_value(&self) -> Option<u16> {
+        if let Some(value) = self.udata_value() {
+            if value <= u64::from(u16::MAX) {
+                return Some(value as u16);
+            }
+        }
+        None
+    }
+
+    /// Try to convert this attribute's value to an unsigned integer.
+    pub fn udata_value(&self) -> Option<u64> {
+        Some(match *self {
+            AttributeValue::Data1(data) => u64::from(data),
+            AttributeValue::Data2(data) => u64::from(data),
+            AttributeValue::Data4(data) => u64::from(data),
+            AttributeValue::Data8(data) => data,
+            AttributeValue::Udata(data) => data,
+            AttributeValue::Sdata(data) => {
+                if data < 0 {
+                    // Maybe we should emit a warning here
+                    return None;
+                }
+                data as u64
+            }
+            _ => return None,
+        })
+    }
+
+    /// Try to convert this attribute's value to a signed integer.
+    pub fn sdata_value(&self) -> Option<i64> {
+        Some(match *self {
+            AttributeValue::Data1(data) => i64::from(data as i8),
+            AttributeValue::Data2(data) => i64::from(data as i16),
+            AttributeValue::Data4(data) => i64::from(data as i32),
+            AttributeValue::Data8(data) => data as i64,
+            AttributeValue::Sdata(data) => data,
+            AttributeValue::Udata(data) => {
+                if data > i64::max_value() as u64 {
+                    // Maybe we should emit a warning here
+                    return None;
+                }
+                data as i64
+            }
+            _ => return None,
+        })
+    }
+
+    /// Try to convert this attribute's value to an offset.
+    pub fn offset_value(&self) -> Option<R::Offset> {
+        // While offsets will be DW_FORM_data4/8 in DWARF version 2/3,
+        // these have already been converted to `SecOffset.
+        if let AttributeValue::SecOffset(offset) = *self {
+            Some(offset)
+        } else {
+            None
+        }
+    }
+
+    /// Try to convert this attribute's value to an expression or location buffer.
+    ///
+    /// Expressions and locations may be `DW_FORM_block*` or `DW_FORM_exprloc`.
+    /// The standard doesn't mention `DW_FORM_block*` as a possible form, but
+    /// it is encountered in practice.
+    pub fn exprloc_value(&self) -> Option<Expression<R>> {
+        Some(match *self {
+            AttributeValue::Block(ref data) => Expression(data.clone()),
+            AttributeValue::Exprloc(ref data) => data.clone(),
+            _ => return None,
+        })
+    }
+
+    /// Try to return this attribute's value as a string slice.
+    ///
+    /// If this attribute's value is either an inline `DW_FORM_string` string,
+    /// or a `DW_FORM_strp` reference to an offset into the `.debug_str`
+    /// section, return the attribute's string value as `Some`. Other attribute
+    /// value forms are returned as `None`.
+    ///
+    /// Warning: this function does not handle all possible string forms.
+    /// Use `Dwarf::attr_string` instead.
+    pub fn string_value(&self, debug_str: &DebugStr<R>) -> Option<R> {
+        match *self {
+            AttributeValue::String(ref string) => Some(string.clone()),
+            AttributeValue::DebugStrRef(offset) => debug_str.get_str(offset).ok(),
+            _ => None,
+        }
+    }
+
+    /// Try to return this attribute's value as a string slice.
+    ///
+    /// If this attribute's value is either an inline `DW_FORM_string` string,
+    /// or a `DW_FORM_strp` reference to an offset into the `.debug_str`
+    /// section, or a `DW_FORM_strp_sup` reference to an offset into a supplementary
+    /// object file, return the attribute's string value as `Some`. Other attribute
+    /// value forms are returned as `None`.
+    ///
+    /// Warning: this function does not handle all possible string forms.
+    /// Use `Dwarf::attr_string` instead.
+    pub fn string_value_sup(
+        &self,
+        debug_str: &DebugStr<R>,
+        debug_str_sup: Option<&DebugStr<R>>,
+    ) -> Option<R> {
+        match *self {
+            AttributeValue::String(ref string) => Some(string.clone()),
+            AttributeValue::DebugStrRef(offset) => debug_str.get_str(offset).ok(),
+            AttributeValue::DebugStrRefSup(offset) => {
+                debug_str_sup.and_then(|s| s.get_str(offset).ok())
+            }
+            _ => None,
+        }
+    }
+}
+
+fn length_u8_value<R: Reader>(input: &mut R) -> Result<R> {
+    let len = input.read_u8().map(R::Offset::from_u8)?;
+    input.split(len)
+}
+
+fn length_u16_value<R: Reader>(input: &mut R) -> Result<R> {
+    let len = input.read_u16().map(R::Offset::from_u16)?;
+    input.split(len)
+}
+
+fn length_u32_value<R: Reader>(input: &mut R) -> Result<R> {
+    let len = input.read_u32().map(R::Offset::from_u32)?;
+    input.split(len)
+}
+
+fn length_uleb128_value<R: Reader>(input: &mut R) -> Result<R> {
+    let len = input.read_uleb128().and_then(R::Offset::from_u64)?;
+    input.split(len)
+}
+
+// Return true if the given `name` can be a section offset in DWARF version 2/3.
+// This is required to correctly handle relocations.
+fn allow_section_offset(name: constants::DwAt, version: u16) -> bool {
+    match name {
+        constants::DW_AT_location
+        | constants::DW_AT_stmt_list
+        | constants::DW_AT_string_length
+        | constants::DW_AT_return_addr
+        | constants::DW_AT_start_scope
+        | constants::DW_AT_frame_base
+        | constants::DW_AT_macro_info
+        | constants::DW_AT_macros
+        | constants::DW_AT_segment
+        | constants::DW_AT_static_link
+        | constants::DW_AT_use_location
+        | constants::DW_AT_vtable_elem_location
+        | constants::DW_AT_ranges => true,
+        constants::DW_AT_data_member_location => version == 2 || version == 3,
+        _ => false,
+    }
+}
+
+pub(crate) fn parse_attribute<'unit, R: Reader>(
+    input: &mut R,
+    encoding: Encoding,
+    spec: AttributeSpecification,
+) -> Result<Attribute<R>> {
+    let mut form = spec.form();
+    loop {
+        let value = match form {
+            constants::DW_FORM_indirect => {
+                let dynamic_form = input.read_uleb128_u16()?;
+                form = constants::DwForm(dynamic_form);
+                continue;
+            }
+            constants::DW_FORM_addr => {
+                let addr = input.read_address(encoding.address_size)?;
+                AttributeValue::Addr(addr)
+            }
+            constants::DW_FORM_block1 => {
+                let block = length_u8_value(input)?;
+                AttributeValue::Block(block)
+            }
+            constants::DW_FORM_block2 => {
+                let block = length_u16_value(input)?;
+                AttributeValue::Block(block)
+            }
+            constants::DW_FORM_block4 => {
+                let block = length_u32_value(input)?;
+                AttributeValue::Block(block)
+            }
+            constants::DW_FORM_block => {
+                let block = length_uleb128_value(input)?;
+                AttributeValue::Block(block)
+            }
+            constants::DW_FORM_data1 => {
+                let data = input.read_u8()?;
+                AttributeValue::Data1(data)
+            }
+            constants::DW_FORM_data2 => {
+                let data = input.read_u16()?;
+                AttributeValue::Data2(data)
+            }
+            constants::DW_FORM_data4 => {
+                // DWARF version 2/3 may use DW_FORM_data4/8 for section offsets.
+                // Ensure we handle relocations here.
+                if encoding.format == Format::Dwarf32
+                    && allow_section_offset(spec.name(), encoding.version)
+                {
+                    let offset = input.read_offset(Format::Dwarf32)?;
+                    AttributeValue::SecOffset(offset)
+                } else {
+                    let data = input.read_u32()?;
+                    AttributeValue::Data4(data)
+                }
+            }
+            constants::DW_FORM_data8 => {
+                // DWARF version 2/3 may use DW_FORM_data4/8 for section offsets.
+                // Ensure we handle relocations here.
+                if encoding.format == Format::Dwarf64
+                    && allow_section_offset(spec.name(), encoding.version)
+                {
+                    let offset = input.read_offset(Format::Dwarf64)?;
+                    AttributeValue::SecOffset(offset)
+                } else {
+                    let data = input.read_u64()?;
+                    AttributeValue::Data8(data)
+                }
+            }
+            constants::DW_FORM_data16 => {
+                let block = input.split(R::Offset::from_u8(16))?;
+                AttributeValue::Block(block)
+            }
+            constants::DW_FORM_udata => {
+                let data = input.read_uleb128()?;
+                AttributeValue::Udata(data)
+            }
+            constants::DW_FORM_sdata => {
+                let data = input.read_sleb128()?;
+                AttributeValue::Sdata(data)
+            }
+            constants::DW_FORM_exprloc => {
+                let block = length_uleb128_value(input)?;
+                AttributeValue::Exprloc(Expression(block))
+            }
+            constants::DW_FORM_flag => {
+                let present = input.read_u8()?;
+                AttributeValue::Flag(present != 0)
+            }
+            constants::DW_FORM_flag_present => {
+                // FlagPresent is this weird compile time always true thing that
+                // isn't actually present in the serialized DIEs, only in the abbreviation.
+                AttributeValue::Flag(true)
+            }
+            constants::DW_FORM_sec_offset => {
+                let offset = input.read_offset(encoding.format)?;
+                AttributeValue::SecOffset(offset)
+            }
+            constants::DW_FORM_ref1 => {
+                let reference = input.read_u8().map(R::Offset::from_u8)?;
+                AttributeValue::UnitRef(UnitOffset(reference))
+            }
+            constants::DW_FORM_ref2 => {
+                let reference = input.read_u16().map(R::Offset::from_u16)?;
+                AttributeValue::UnitRef(UnitOffset(reference))
+            }
+            constants::DW_FORM_ref4 => {
+                let reference = input.read_u32().map(R::Offset::from_u32)?;
+                AttributeValue::UnitRef(UnitOffset(reference))
+            }
+            constants::DW_FORM_ref8 => {
+                let reference = input.read_u64().and_then(R::Offset::from_u64)?;
+                AttributeValue::UnitRef(UnitOffset(reference))
+            }
+            constants::DW_FORM_ref_udata => {
+                let reference = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                AttributeValue::UnitRef(UnitOffset(reference))
+            }
+            constants::DW_FORM_ref_addr => {
+                // This is an offset, but DWARF version 2 specifies that DW_FORM_ref_addr
+                // has the same size as an address on the target system.  This was changed
+                // in DWARF version 3.
+                let offset = if encoding.version == 2 {
+                    input.read_sized_offset(encoding.address_size)?
+                } else {
+                    input.read_offset(encoding.format)?
+                };
+                AttributeValue::DebugInfoRef(DebugInfoOffset(offset))
+            }
+            constants::DW_FORM_ref_sig8 => {
+                let signature = input.read_u64()?;
+                AttributeValue::DebugTypesRef(DebugTypeSignature(signature))
+            }
+            constants::DW_FORM_ref_sup4 => {
+                let offset = input.read_u32().map(R::Offset::from_u32)?;
+                AttributeValue::DebugInfoRefSup(DebugInfoOffset(offset))
+            }
+            constants::DW_FORM_ref_sup8 => {
+                let offset = input.read_u64().and_then(R::Offset::from_u64)?;
+                AttributeValue::DebugInfoRefSup(DebugInfoOffset(offset))
+            }
+            constants::DW_FORM_GNU_ref_alt => {
+                let offset = input.read_offset(encoding.format)?;
+                AttributeValue::DebugInfoRefSup(DebugInfoOffset(offset))
+            }
+            constants::DW_FORM_string => {
+                let string = input.read_null_terminated_slice()?;
+                AttributeValue::String(string)
+            }
+            constants::DW_FORM_strp => {
+                let offset = input.read_offset(encoding.format)?;
+                AttributeValue::DebugStrRef(DebugStrOffset(offset))
+            }
+            constants::DW_FORM_strp_sup | constants::DW_FORM_GNU_strp_alt => {
+                let offset = input.read_offset(encoding.format)?;
+                AttributeValue::DebugStrRefSup(DebugStrOffset(offset))
+            }
+            constants::DW_FORM_line_strp => {
+                let offset = input.read_offset(encoding.format)?;
+                AttributeValue::DebugLineStrRef(DebugLineStrOffset(offset))
+            }
+            constants::DW_FORM_implicit_const => {
+                let data = spec
+                    .implicit_const_value()
+                    .ok_or(Error::InvalidImplicitConst)?;
+                AttributeValue::Sdata(data)
+            }
+            constants::DW_FORM_strx | constants::DW_FORM_GNU_str_index => {
+                let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+            }
+            constants::DW_FORM_strx1 => {
+                let index = input.read_u8().map(R::Offset::from_u8)?;
+                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+            }
+            constants::DW_FORM_strx2 => {
+                let index = input.read_u16().map(R::Offset::from_u16)?;
+                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+            }
+            constants::DW_FORM_strx3 => {
+                let index = input.read_uint(3).and_then(R::Offset::from_u64)?;
+                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+            }
+            constants::DW_FORM_strx4 => {
+                let index = input.read_u32().map(R::Offset::from_u32)?;
+                AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(index))
+            }
+            constants::DW_FORM_addrx | constants::DW_FORM_GNU_addr_index => {
+                let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
+            }
+            constants::DW_FORM_addrx1 => {
+                let index = input.read_u8().map(R::Offset::from_u8)?;
+                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
+            }
+            constants::DW_FORM_addrx2 => {
+                let index = input.read_u16().map(R::Offset::from_u16)?;
+                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
+            }
+            constants::DW_FORM_addrx3 => {
+                let index = input.read_uint(3).and_then(R::Offset::from_u64)?;
+                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
+            }
+            constants::DW_FORM_addrx4 => {
+                let index = input.read_u32().map(R::Offset::from_u32)?;
+                AttributeValue::DebugAddrIndex(DebugAddrIndex(index))
+            }
+            constants::DW_FORM_loclistx => {
+                let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                AttributeValue::DebugLocListsIndex(DebugLocListsIndex(index))
+            }
+            constants::DW_FORM_rnglistx => {
+                let index = input.read_uleb128().and_then(R::Offset::from_u64)?;
+                AttributeValue::DebugRngListsIndex(DebugRngListsIndex(index))
+            }
+            _ => {
+                return Err(Error::UnknownForm);
+            }
+        };
+        let attr = Attribute {
+            name: spec.name(),
+            value,
+        };
+        return Ok(attr);
+    }
+}
+
+/// An iterator over a particular entry's attributes.
+///
+/// See [the documentation for
+/// `DebuggingInformationEntry::attrs()`](./struct.DebuggingInformationEntry.html#method.attrs)
+/// for details.
+///
+/// Can be [used with
+/// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+#[derive(Clone, Copy, Debug)]
+pub struct AttrsIter<'abbrev, 'entry, 'unit, R: Reader> {
+    input: R,
+    attributes: &'abbrev [AttributeSpecification],
+    entry: &'entry DebuggingInformationEntry<'abbrev, 'unit, R>,
+}
+
+impl<'abbrev, 'entry, 'unit, R: Reader> AttrsIter<'abbrev, 'entry, 'unit, R> {
+    /// Advance the iterator and return the next attribute.
+    ///
+    /// Returns `None` when iteration is finished. If an error
+    /// occurs while parsing the next attribute, then this error
+    /// is returned, and all subsequent calls return `None`.
+    #[allow(clippy::inline_always)]
+    #[inline(always)]
+    pub fn next(&mut self) -> Result<Option<Attribute<R>>> {
+        if self.attributes.is_empty() {
+            // Now that we have parsed all of the attributes, we know where
+            // either (1) this entry's children start, if the abbreviation says
+            // this entry has children; or (2) where this entry's siblings
+            // begin.
+            if let Some(end) = self.entry.attrs_len.get() {
+                debug_assert_eq!(end, self.input.offset_from(&self.entry.attrs_slice));
+            } else {
+                self.entry
+                    .attrs_len
+                    .set(Some(self.input.offset_from(&self.entry.attrs_slice)));
+            }
+
+            return Ok(None);
+        }
+
+        let spec = self.attributes[0];
+        let rest_spec = &self.attributes[1..];
+        match parse_attribute(&mut self.input, self.entry.unit.encoding(), spec) {
+            Ok(attr) => {
+                self.attributes = rest_spec;
+                Ok(Some(attr))
+            }
+            Err(e) => {
+                self.input.empty();
+                Err(e)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<'abbrev, 'entry, 'unit, R: Reader> fallible_iterator::FallibleIterator
+    for AttrsIter<'abbrev, 'entry, 'unit, R>
+{
+    type Item = Attribute<R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        AttrsIter::next(self)
+    }
+}
+
+/// A raw reader of the data that defines the Debugging Information Entries.
+///
+/// `EntriesRaw` provides primitives to read the components of Debugging Information
+/// Entries (DIEs). A DIE consists of an abbreviation code (read with `read_abbreviation`)
+/// followed by a number of attributes (read with `read_attribute`).
+/// The user must provide the control flow to read these correctly.
+/// In particular, all attributes must always be read before reading another
+/// abbreviation code.
+///
+/// `EntriesRaw` lacks some features of `EntriesCursor`, such as the ability to skip
+/// to the next sibling DIE. However, this also allows it to optimize better, since it
+/// does not need to perform the extra bookkeeping required to support these features,
+/// and thus it is suitable for cases where performance is important.
+///
+/// ## Example Usage
+/// ```rust,no_run
+/// # fn example() -> Result<(), gimli::Error> {
+/// # let debug_info = gimli::DebugInfo::new(&[], gimli::LittleEndian);
+/// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
+/// let unit = get_some_unit();
+/// # let debug_abbrev = gimli::DebugAbbrev::new(&[], gimli::LittleEndian);
+/// # let get_abbrevs_for_unit = |_| unit.abbreviations(&debug_abbrev).unwrap();
+/// let abbrevs = get_abbrevs_for_unit(&unit);
+///
+/// let mut entries = unit.entries_raw(&abbrevs, None)?;
+/// while !entries.is_empty() {
+///     let abbrev = if let Some(abbrev) = entries.read_abbreviation()? {
+///         abbrev
+///     } else {
+///         // Null entry with no attributes.
+///         continue
+///     };
+///     match abbrev.tag() {
+///         gimli::DW_TAG_subprogram => {
+///             // Loop over attributes for DIEs we care about.
+///             for spec in abbrev.attributes() {
+///                 let attr = entries.read_attribute(*spec)?;
+///                 match attr.name() {
+///                     // Handle attributes.
+///                     _ => {}
+///                 }
+///             }
+///         }
+///         _ => {
+///             // Skip attributes for DIEs we don't care about.
+///             for spec in abbrev.attributes() {
+///                 entries.read_attribute(*spec)?;
+///             }
+///         }
+///     }
+/// }
+/// # unreachable!()
+/// # }
+/// ```
+#[derive(Clone, Debug)]
+pub struct EntriesRaw<'abbrev, 'unit, R>
+where
+    R: Reader,
+{
+    input: R,
+    unit: &'unit UnitHeader<R>,
+    abbreviations: &'abbrev Abbreviations,
+    depth: isize,
+}
+
+impl<'abbrev, 'unit, R: Reader> EntriesRaw<'abbrev, 'unit, R> {
+    /// Return true if there is no more input.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.input.is_empty()
+    }
+
+    /// Return the unit offset at which the reader will read next.
+    ///
+    /// If you want the offset of the next entry, then this must be called prior to reading
+    /// the next entry.
+    pub fn next_offset(&self) -> UnitOffset<R::Offset> {
+        UnitOffset(self.unit.header_size() + self.input.offset_from(&self.unit.entries_buf))
+    }
+
+    /// Return the depth of the next entry.
+    ///
+    /// This depth is updated when `read_abbreviation` is called, and is updated
+    /// based on null entries and the `has_children` field in the abbreviation.
+    #[inline]
+    pub fn next_depth(&self) -> isize {
+        self.depth
+    }
+
+    /// Read an abbreviation code and lookup the corresponding `Abbreviation`.
+    ///
+    /// Returns `Ok(None)` for null entries.
+    #[inline]
+    pub fn read_abbreviation(&mut self) -> Result<Option<&'abbrev Abbreviation>> {
+        let code = self.input.read_uleb128()?;
+        if code == 0 {
+            self.depth -= 1;
+            return Ok(None);
+        };
+        let abbrev = self
+            .abbreviations
+            .get(code)
+            .ok_or(Error::UnknownAbbreviation)?;
+        if abbrev.has_children() {
+            self.depth += 1;
+        }
+        Ok(Some(abbrev))
+    }
+
+    /// Read an attribute.
+    #[inline]
+    pub fn read_attribute(&mut self, spec: AttributeSpecification) -> Result<Attribute<R>> {
+        parse_attribute(&mut self.input, self.unit.encoding(), spec)
+    }
+}
+
+/// A cursor into the Debugging Information Entries tree for a compilation unit.
+///
+/// The `EntriesCursor` can traverse the DIE tree in DFS order using `next_dfs()`,
+/// or skip to the next sibling of the entry the cursor is currently pointing to
+/// using `next_sibling()`.
+///
+/// It is also possible to traverse the DIE tree at a lower abstraction level
+/// using `next_entry()`. This method does not skip over null entries, or provide
+/// any indication of the current tree depth. In this case, you must use `current()`
+/// to obtain the current entry, and `current().has_children()` to determine if
+/// the entry following the current entry will be a sibling or child. `current()`
+/// will return `None` if the current entry is a null entry, which signifies the
+/// end of the current tree depth.
+#[derive(Clone, Debug)]
+pub struct EntriesCursor<'abbrev, 'unit, R>
+where
+    R: Reader,
+{
+    input: R,
+    unit: &'unit UnitHeader<R>,
+    abbreviations: &'abbrev Abbreviations,
+    cached_current: Option<DebuggingInformationEntry<'abbrev, 'unit, R>>,
+    delta_depth: isize,
+}
+
+impl<'abbrev, 'unit, R: Reader> EntriesCursor<'abbrev, 'unit, R> {
+    /// Get a reference to the entry that the cursor is currently pointing to.
+    ///
+    /// If the cursor is not pointing at an entry, or if the current entry is a
+    /// null entry, then `None` is returned.
+    #[inline]
+    pub fn current(&self) -> Option<&DebuggingInformationEntry<'abbrev, 'unit, R>> {
+        self.cached_current.as_ref()
+    }
+
+    /// Move the cursor to the next DIE in the tree.
+    ///
+    /// Returns `Some` if there is a next entry, even if this entry is null.
+    /// If there is no next entry, then `None` is returned.
+    pub fn next_entry(&mut self) -> Result<Option<()>> {
+        if let Some(ref current) = self.cached_current {
+            self.input = current.after_attrs()?;
+        }
+
+        if self.input.is_empty() {
+            self.cached_current = None;
+            self.delta_depth = 0;
+            return Ok(None);
+        }
+
+        match DebuggingInformationEntry::parse(&mut self.input, self.unit, self.abbreviations) {
+            Ok(Some(entry)) => {
+                self.delta_depth = entry.has_children() as isize;
+                self.cached_current = Some(entry);
+                Ok(Some(()))
+            }
+            Ok(None) => {
+                self.delta_depth = -1;
+                self.cached_current = None;
+                Ok(Some(()))
+            }
+            Err(e) => {
+                self.input.empty();
+                self.delta_depth = 0;
+                self.cached_current = None;
+                Err(e)
+            }
+        }
+    }
+
+    /// Move the cursor to the next DIE in the tree in DFS order.
+    ///
+    /// Upon successful movement of the cursor, return the delta traversal
+    /// depth and the entry:
+    ///
+    ///   * If we moved down into the previous current entry's children, we get
+    ///     `Some((1, entry))`.
+    ///
+    ///   * If we moved to the previous current entry's sibling, we get
+    ///     `Some((0, entry))`.
+    ///
+    ///   * If the previous entry does not have any siblings and we move up to
+    ///     its parent's next sibling, then we get `Some((-1, entry))`. Note that
+    ///     if the parent doesn't have a next sibling, then it could go up to the
+    ///     parent's parent's next sibling and return `Some((-2, entry))`, etc.
+    ///
+    /// If there is no next entry, then `None` is returned.
+    ///
+    /// Here is an example that finds the first entry in a compilation unit that
+    /// does not have any children.
+    ///
+    /// ```
+    /// # use gimli::{DebugAbbrev, DebugInfo, LittleEndian};
+    /// # let info_buf = [
+    /// #     // Comilation unit header
+    /// #
+    /// #     // 32-bit unit length = 25
+    /// #     0x19, 0x00, 0x00, 0x00,
+    /// #     // Version 4
+    /// #     0x04, 0x00,
+    /// #     // debug_abbrev_offset
+    /// #     0x00, 0x00, 0x00, 0x00,
+    /// #     // Address size
+    /// #     0x04,
+    /// #
+    /// #     // DIEs
+    /// #
+    /// #     // Abbreviation code
+    /// #     0x01,
+    /// #     // Attribute of form DW_FORM_string = "foo\0"
+    /// #     0x66, 0x6f, 0x6f, 0x00,
+    /// #
+    /// #       // Children
+    /// #
+    /// #       // Abbreviation code
+    /// #       0x01,
+    /// #       // Attribute of form DW_FORM_string = "foo\0"
+    /// #       0x66, 0x6f, 0x6f, 0x00,
+    /// #
+    /// #         // Children
+    /// #
+    /// #         // Abbreviation code
+    /// #         0x01,
+    /// #         // Attribute of form DW_FORM_string = "foo\0"
+    /// #         0x66, 0x6f, 0x6f, 0x00,
+    /// #
+    /// #           // Children
+    /// #
+    /// #           // End of children
+    /// #           0x00,
+    /// #
+    /// #         // End of children
+    /// #         0x00,
+    /// #
+    /// #       // End of children
+    /// #       0x00,
+    /// # ];
+    /// # let debug_info = DebugInfo::new(&info_buf, LittleEndian);
+    /// #
+    /// # let abbrev_buf = [
+    /// #     // Code
+    /// #     0x01,
+    /// #     // DW_TAG_subprogram
+    /// #     0x2e,
+    /// #     // DW_CHILDREN_yes
+    /// #     0x01,
+    /// #     // Begin attributes
+    /// #       // Attribute name = DW_AT_name
+    /// #       0x03,
+    /// #       // Attribute form = DW_FORM_string
+    /// #       0x08,
+    /// #     // End attributes
+    /// #     0x00,
+    /// #     0x00,
+    /// #     // Null terminator
+    /// #     0x00
+    /// # ];
+    /// # let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
+    /// #
+    /// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
+    ///
+    /// let unit = get_some_unit();
+    /// # let get_abbrevs_for_unit = |_| unit.abbreviations(&debug_abbrev).unwrap();
+    /// let abbrevs = get_abbrevs_for_unit(&unit);
+    ///
+    /// let mut first_entry_with_no_children = None;
+    /// let mut cursor = unit.entries(&abbrevs);
+    ///
+    /// // Move the cursor to the root.
+    /// assert!(cursor.next_dfs().unwrap().is_some());
+    ///
+    /// // Traverse the DIE tree in depth-first search order.
+    /// let mut depth = 0;
+    /// while let Some((delta_depth, current)) = cursor.next_dfs().expect("Should parse next dfs") {
+    ///     // Update depth value, and break out of the loop when we
+    ///     // return to the original starting position.
+    ///     depth += delta_depth;
+    ///     if depth <= 0 {
+    ///         break;
+    ///     }
+    ///
+    ///     first_entry_with_no_children = Some(current.clone());
+    /// }
+    ///
+    /// println!("The first entry with no children is {:?}",
+    ///          first_entry_with_no_children.unwrap());
+    /// ```
+    #[allow(clippy::type_complexity)]
+    pub fn next_dfs(
+        &mut self,
+    ) -> Result<Option<(isize, &DebuggingInformationEntry<'abbrev, 'unit, R>)>> {
+        let mut delta_depth = self.delta_depth;
+        loop {
+            // The next entry should be the one we want.
+            if self.next_entry()?.is_some() {
+                if let Some(ref entry) = self.cached_current {
+                    return Ok(Some((delta_depth, entry)));
+                }
+
+                // next_entry() read a null entry.
+                delta_depth += self.delta_depth;
+            } else {
+                return Ok(None);
+            }
+        }
+    }
+
+    /// Move the cursor to the next sibling DIE of the current one.
+    ///
+    /// Returns `Ok(Some(entry))` when the cursor has been moved to
+    /// the next sibling, `Ok(None)` when there is no next sibling.
+    ///
+    /// The depth of the cursor is never changed if this method returns `Ok`.
+    /// Once `Ok(None)` is returned, this method will continue to return
+    /// `Ok(None)` until either `next_entry` or `next_dfs` is called.
+    ///
+    /// Here is an example that iterates over all of the direct children of the
+    /// root entry:
+    ///
+    /// ```
+    /// # use gimli::{DebugAbbrev, DebugInfo, LittleEndian};
+    /// # let info_buf = [
+    /// #     // Comilation unit header
+    /// #
+    /// #     // 32-bit unit length = 25
+    /// #     0x19, 0x00, 0x00, 0x00,
+    /// #     // Version 4
+    /// #     0x04, 0x00,
+    /// #     // debug_abbrev_offset
+    /// #     0x00, 0x00, 0x00, 0x00,
+    /// #     // Address size
+    /// #     0x04,
+    /// #
+    /// #     // DIEs
+    /// #
+    /// #     // Abbreviation code
+    /// #     0x01,
+    /// #     // Attribute of form DW_FORM_string = "foo\0"
+    /// #     0x66, 0x6f, 0x6f, 0x00,
+    /// #
+    /// #       // Children
+    /// #
+    /// #       // Abbreviation code
+    /// #       0x01,
+    /// #       // Attribute of form DW_FORM_string = "foo\0"
+    /// #       0x66, 0x6f, 0x6f, 0x00,
+    /// #
+    /// #         // Children
+    /// #
+    /// #         // Abbreviation code
+    /// #         0x01,
+    /// #         // Attribute of form DW_FORM_string = "foo\0"
+    /// #         0x66, 0x6f, 0x6f, 0x00,
+    /// #
+    /// #           // Children
+    /// #
+    /// #           // End of children
+    /// #           0x00,
+    /// #
+    /// #         // End of children
+    /// #         0x00,
+    /// #
+    /// #       // End of children
+    /// #       0x00,
+    /// # ];
+    /// # let debug_info = DebugInfo::new(&info_buf, LittleEndian);
+    /// #
+    /// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
+    ///
+    /// # let abbrev_buf = [
+    /// #     // Code
+    /// #     0x01,
+    /// #     // DW_TAG_subprogram
+    /// #     0x2e,
+    /// #     // DW_CHILDREN_yes
+    /// #     0x01,
+    /// #     // Begin attributes
+    /// #       // Attribute name = DW_AT_name
+    /// #       0x03,
+    /// #       // Attribute form = DW_FORM_string
+    /// #       0x08,
+    /// #     // End attributes
+    /// #     0x00,
+    /// #     0x00,
+    /// #     // Null terminator
+    /// #     0x00
+    /// # ];
+    /// # let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
+    /// #
+    /// let unit = get_some_unit();
+    /// # let get_abbrevs_for_unit = |_| unit.abbreviations(&debug_abbrev).unwrap();
+    /// let abbrevs = get_abbrevs_for_unit(&unit);
+    ///
+    /// let mut cursor = unit.entries(&abbrevs);
+    ///
+    /// // Move the cursor to the root.
+    /// assert!(cursor.next_dfs().unwrap().is_some());
+    ///
+    /// // Move the cursor to the root's first child.
+    /// assert!(cursor.next_dfs().unwrap().is_some());
+    ///
+    /// // Iterate the root's children.
+    /// loop {
+    ///     {
+    ///         let current = cursor.current().expect("Should be at an entry");
+    ///         println!("{:?} is a child of the root", current);
+    ///     }
+    ///
+    ///     if cursor.next_sibling().expect("Should parse next sibling").is_none() {
+    ///         break;
+    ///     }
+    /// }
+    /// ```
+    pub fn next_sibling(
+        &mut self,
+    ) -> Result<Option<&DebuggingInformationEntry<'abbrev, 'unit, R>>> {
+        if self.current().is_none() {
+            // We're already at the null for the end of the sibling list.
+            return Ok(None);
+        }
+
+        // Loop until we find an entry at the current level.
+        let mut depth = 0;
+        loop {
+            // Use is_some() and unwrap() to keep borrow checker happy.
+            if self.current().is_some() && self.current().unwrap().has_children() {
+                if let Some(sibling_input) = self.current().unwrap().sibling() {
+                    // Fast path: this entry has a DW_AT_sibling
+                    // attribute pointing to its sibling, so jump
+                    // to it (which keeps us at the same depth).
+                    self.input = sibling_input;
+                    self.cached_current = None;
+                } else {
+                    // This entry has children, so the next entry is
+                    // down one level.
+                    depth += 1;
+                }
+            }
+
+            if self.next_entry()?.is_none() {
+                // End of input.
+                return Ok(None);
+            }
+
+            if depth == 0 {
+                // Found an entry at the current level.
+                return Ok(self.current());
+            }
+
+            if self.current().is_none() {
+                // A null entry means the end of a child list, so we're
+                // back up a level.
+                depth -= 1;
+            }
+        }
+    }
+}
+
+/// The state information for a tree view of the Debugging Information Entries.
+///
+/// The `EntriesTree` can be used to recursively iterate through the DIE
+/// tree, following the parent/child relationships. The `EntriesTree` contains
+/// shared state for all nodes in the tree, avoiding any duplicate parsing of
+/// entries during the traversal.
+///
+/// ## Example Usage
+/// ```rust,no_run
+/// # fn example() -> Result<(), gimli::Error> {
+/// # let debug_info = gimli::DebugInfo::new(&[], gimli::LittleEndian);
+/// # let get_some_unit = || debug_info.units().next().unwrap().unwrap();
+/// let unit = get_some_unit();
+/// # let debug_abbrev = gimli::DebugAbbrev::new(&[], gimli::LittleEndian);
+/// # let get_abbrevs_for_unit = |_| unit.abbreviations(&debug_abbrev).unwrap();
+/// let abbrevs = get_abbrevs_for_unit(&unit);
+///
+/// let mut tree = unit.entries_tree(&abbrevs, None)?;
+/// let root = tree.root()?;
+/// process_tree(root)?;
+/// # unreachable!()
+/// # }
+///
+/// fn process_tree<R>(mut node: gimli::EntriesTreeNode<R>) -> gimli::Result<()>
+///     where R: gimli::Reader
+/// {
+///     {
+///         // Examine the entry attributes.
+///         let mut attrs = node.entry().attrs();
+///         while let Some(attr) = attrs.next()? {
+///         }
+///     }
+///     let mut children = node.children();
+///     while let Some(child) = children.next()? {
+///         // Recursively process a child.
+///         process_tree(child);
+///     }
+///     Ok(())
+/// }
+/// ```
+#[derive(Clone, Debug)]
+pub struct EntriesTree<'abbrev, 'unit, R>
+where
+    R: Reader,
+{
+    root: R,
+    unit: &'unit UnitHeader<R>,
+    abbreviations: &'abbrev Abbreviations,
+    input: R,
+    entry: Option<DebuggingInformationEntry<'abbrev, 'unit, R>>,
+    depth: isize,
+}
+
+impl<'abbrev, 'unit, R: Reader> EntriesTree<'abbrev, 'unit, R> {
+    fn new(root: R, unit: &'unit UnitHeader<R>, abbreviations: &'abbrev Abbreviations) -> Self {
+        let input = root.clone();
+        EntriesTree {
+            root,
+            unit,
+            abbreviations,
+            input,
+            entry: None,
+            depth: 0,
+        }
+    }
+
+    /// Returns the root node of the tree.
+    pub fn root<'me>(&'me mut self) -> Result<EntriesTreeNode<'abbrev, 'unit, 'me, R>> {
+        self.input = self.root.clone();
+        self.entry =
+            DebuggingInformationEntry::parse(&mut self.input, self.unit, self.abbreviations)?;
+        if self.entry.is_none() {
+            return Err(Error::UnexpectedNull);
+        }
+        self.depth = 0;
+        Ok(EntriesTreeNode::new(self, 1))
+    }
+
+    /// Move the cursor to the next entry at the specified depth.
+    ///
+    /// Requires `depth <= self.depth + 1`.
+    ///
+    /// Returns `true` if successful.
+    fn next(&mut self, depth: isize) -> Result<bool> {
+        if self.depth < depth {
+            debug_assert_eq!(self.depth + 1, depth);
+
+            match self.entry {
+                Some(ref entry) => {
+                    if !entry.has_children() {
+                        return Ok(false);
+                    }
+                    self.depth += 1;
+                    self.input = entry.after_attrs()?;
+                }
+                None => return Ok(false),
+            }
+
+            if self.input.is_empty() {
+                self.entry = None;
+                return Ok(false);
+            }
+
+            return match DebuggingInformationEntry::parse(
+                &mut self.input,
+                self.unit,
+                self.abbreviations,
+            ) {
+                Ok(entry) => {
+                    self.entry = entry;
+                    Ok(self.entry.is_some())
+                }
+                Err(e) => {
+                    self.input.empty();
+                    self.entry = None;
+                    Err(e)
+                }
+            };
+        }
+
+        loop {
+            match self.entry {
+                Some(ref entry) => {
+                    if entry.has_children() {
+                        if let Some(sibling_input) = entry.sibling() {
+                            // Fast path: this entry has a DW_AT_sibling
+                            // attribute pointing to its sibling, so jump
+                            // to it (which keeps us at the same depth).
+                            self.input = sibling_input;
+                        } else {
+                            // This entry has children, so the next entry is
+                            // down one level.
+                            self.depth += 1;
+                            self.input = entry.after_attrs()?;
+                        }
+                    } else {
+                        // This entry has no children, so next entry is at same depth.
+                        self.input = entry.after_attrs()?;
+                    }
+                }
+                None => {
+                    // This entry is a null, so next entry is up one level.
+                    self.depth -= 1;
+                }
+            }
+
+            if self.input.is_empty() {
+                self.entry = None;
+                return Ok(false);
+            }
+
+            match DebuggingInformationEntry::parse(&mut self.input, self.unit, self.abbreviations) {
+                Ok(entry) => {
+                    self.entry = entry;
+                    if self.depth == depth {
+                        return Ok(self.entry.is_some());
+                    }
+                }
+                Err(e) => {
+                    self.input.empty();
+                    self.entry = None;
+                    return Err(e);
+                }
+            }
+        }
+    }
+}
+
+/// A node in the Debugging Information Entry tree.
+///
+/// The root node of a tree can be obtained
+/// via [`EntriesTree::root`](./struct.EntriesTree.html#method.root).
+#[derive(Debug)]
+pub struct EntriesTreeNode<'abbrev, 'unit, 'tree, R: Reader> {
+    tree: &'tree mut EntriesTree<'abbrev, 'unit, R>,
+    depth: isize,
+}
+
+impl<'abbrev, 'unit, 'tree, R: Reader> EntriesTreeNode<'abbrev, 'unit, 'tree, R> {
+    fn new(
+        tree: &'tree mut EntriesTree<'abbrev, 'unit, R>,
+        depth: isize,
+    ) -> EntriesTreeNode<'abbrev, 'unit, 'tree, R> {
+        debug_assert!(tree.entry.is_some());
+        EntriesTreeNode { tree, depth }
+    }
+
+    /// Returns the current entry in the tree.
+    pub fn entry(&self) -> &DebuggingInformationEntry<'abbrev, 'unit, R> {
+        // We never create a node without an entry.
+        self.tree.entry.as_ref().unwrap()
+    }
+
+    /// Create an iterator for the children of the current entry.
+    ///
+    /// The current entry can no longer be accessed after creating the
+    /// iterator.
+    pub fn children(self) -> EntriesTreeIter<'abbrev, 'unit, 'tree, R> {
+        EntriesTreeIter::new(self.tree, self.depth)
+    }
+}
+
+/// An iterator that allows traversal of the children of an
+/// `EntriesTreeNode`.
+///
+/// The items returned by this iterator are also `EntriesTreeNode`s,
+/// which allow recursive traversal of grandchildren, etc.
+#[derive(Debug)]
+pub struct EntriesTreeIter<'abbrev, 'unit, 'tree, R: Reader> {
+    tree: &'tree mut EntriesTree<'abbrev, 'unit, R>,
+    depth: isize,
+    empty: bool,
+}
+
+impl<'abbrev, 'unit, 'tree, R: Reader> EntriesTreeIter<'abbrev, 'unit, 'tree, R> {
+    fn new(
+        tree: &'tree mut EntriesTree<'abbrev, 'unit, R>,
+        depth: isize,
+    ) -> EntriesTreeIter<'abbrev, 'unit, 'tree, R> {
+        EntriesTreeIter {
+            tree,
+            depth,
+            empty: false,
+        }
+    }
+
+    /// Returns an `EntriesTreeNode` for the next child entry.
+    ///
+    /// Returns `None` if there are no more children.
+    pub fn next<'me>(&'me mut self) -> Result<Option<EntriesTreeNode<'abbrev, 'unit, 'me, R>>> {
+        if self.empty {
+            Ok(None)
+        } else if self.tree.next(self.depth)? {
+            Ok(Some(EntriesTreeNode::new(self.tree, self.depth + 1)))
+        } else {
+            self.empty = true;
+            Ok(None)
+        }
+    }
+}
+
+/// Parse a type unit header's unique type signature. Callers should handle
+/// unique-ness checking.
+fn parse_type_signature<R: Reader>(input: &mut R) -> Result<DebugTypeSignature> {
+    input.read_u64().map(DebugTypeSignature)
+}
+
+/// Parse a type unit header's type offset.
+fn parse_type_offset<R: Reader>(input: &mut R, format: Format) -> Result<UnitOffset<R::Offset>> {
+    input.read_offset(format).map(UnitOffset)
+}
+
+/// The `DebugTypes` struct represents the DWARF type information
+/// found in the `.debug_types` section.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct DebugTypes<R> {
+    debug_types_section: R,
+}
+
+impl<'input, Endian> DebugTypes<EndianSlice<'input, Endian>>
+where
+    Endian: Endianity,
+{
+    /// Construct a new `DebugTypes` instance from the data in the `.debug_types`
+    /// section.
+    ///
+    /// It is the caller's responsibility to read the `.debug_types` section and
+    /// present it as a `&[u8]` slice. That means using some ELF loader on
+    /// Linux, a Mach-O loader on OSX, etc.
+    ///
+    /// ```
+    /// use gimli::{DebugTypes, LittleEndian};
+    ///
+    /// # let buf = [0x00, 0x01, 0x02, 0x03];
+    /// # let read_debug_types_section_somehow = || &buf;
+    /// let debug_types = DebugTypes::new(read_debug_types_section_somehow(), LittleEndian);
+    /// ```
+    pub fn new(debug_types_section: &'input [u8], endian: Endian) -> Self {
+        Self::from(EndianSlice::new(debug_types_section, endian))
+    }
+}
+
+impl<T> DebugTypes<T> {
+    /// Create a `DebugTypes` section that references the data in `self`.
+    ///
+    /// This is useful when `R` implements `Reader` but `T` does not.
+    ///
+    /// ## Example Usage
+    ///
+    /// ```rust,no_run
+    /// # let load_section = || unimplemented!();
+    /// // Read the DWARF section into a `Vec` with whatever object loader you're using.
+    /// let owned_section: gimli::DebugTypes<Vec<u8>> = load_section();
+    /// // Create a reference to the DWARF section.
+    /// let section = owned_section.borrow(|section| {
+    ///     gimli::EndianSlice::new(&section, gimli::LittleEndian)
+    /// });
+    /// ```
+    pub fn borrow<'a, F, R>(&'a self, mut borrow: F) -> DebugTypes<R>
+    where
+        F: FnMut(&'a T) -> R,
+    {
+        borrow(&self.debug_types_section).into()
+    }
+}
+
+impl<R> Section<R> for DebugTypes<R> {
+    fn id() -> SectionId {
+        SectionId::DebugTypes
+    }
+
+    fn reader(&self) -> &R {
+        &self.debug_types_section
+    }
+}
+
+impl<R> From<R> for DebugTypes<R> {
+    fn from(debug_types_section: R) -> Self {
+        DebugTypes {
+            debug_types_section,
+        }
+    }
+}
+
+impl<R: Reader> DebugTypes<R> {
+    /// Iterate the type-units in this `.debug_types` section.
+    ///
+    /// ```
+    /// use gimli::{DebugTypes, LittleEndian};
+    ///
+    /// # let buf = [];
+    /// # let read_debug_types_section_somehow = || &buf;
+    /// let debug_types = DebugTypes::new(read_debug_types_section_somehow(), LittleEndian);
+    ///
+    /// let mut iter = debug_types.units();
+    /// while let Some(unit) = iter.next().unwrap() {
+    ///     println!("unit's length is {}", unit.unit_length());
+    /// }
+    /// ```
+    ///
+    /// Can be [used with
+    /// `FallibleIterator`](./index.html#using-with-fallibleiterator).
+    pub fn units(&self) -> DebugTypesUnitHeadersIter<R> {
+        DebugTypesUnitHeadersIter {
+            input: self.debug_types_section.clone(),
+            offset: DebugTypesOffset(R::Offset::from_u8(0)),
+        }
+    }
+}
+
+/// An iterator over the type-units of this `.debug_types` section.
+///
+/// See the [documentation on
+/// `DebugTypes::units`](./struct.DebugTypes.html#method.units) for
+/// more detail.
+#[derive(Clone, Debug)]
+pub struct DebugTypesUnitHeadersIter<R: Reader> {
+    input: R,
+    offset: DebugTypesOffset<R::Offset>,
+}
+
+impl<R: Reader> DebugTypesUnitHeadersIter<R> {
+    /// Advance the iterator to the next type unit header.
+    pub fn next(&mut self) -> Result<Option<UnitHeader<R>>> {
+        if self.input.is_empty() {
+            Ok(None)
+        } else {
+            let len = self.input.len();
+            match parse_unit_header(&mut self.input, self.offset.into()) {
+                Ok(header) => {
+                    self.offset.0 += len - self.input.len();
+                    Ok(Some(header))
+                }
+                Err(e) => {
+                    self.input.empty();
+                    Err(e)
+                }
+            }
+        }
+    }
+}
+
+#[cfg(feature = "fallible-iterator")]
+impl<R: Reader> fallible_iterator::FallibleIterator for DebugTypesUnitHeadersIter<R> {
+    type Item = UnitHeader<R>;
+    type Error = Error;
+
+    fn next(&mut self) -> ::core::result::Result<Option<Self::Item>, Self::Error> {
+        DebugTypesUnitHeadersIter::next(self)
+    }
+}
+
+#[cfg(test)]
+// Tests require leb128::write.
+#[cfg(feature = "write")]
+mod tests {
+    use super::*;
+    use crate::constants;
+    use crate::constants::*;
+    use crate::endianity::{Endianity, LittleEndian};
+    use crate::leb128;
+    use crate::read::abbrev::tests::AbbrevSectionMethods;
+    use crate::read::{
+        Abbreviation, AttributeSpecification, DebugAbbrev, EndianSlice, Error, Result,
+    };
+    use crate::test_util::GimliSectionMethods;
+    use alloc::vec::Vec;
+    use core::cell::Cell;
+    use test_assembler::{Endian, Label, LabelMaker, Section};
+
+    // Mixin methods for `Section` to help define binary test data.
+
+    trait UnitSectionMethods {
+        fn unit<'input, E>(self, unit: &mut UnitHeader<EndianSlice<'input, E>>) -> Self
+        where
+            E: Endianity;
+        fn die<F>(self, code: u64, attr: F) -> Self
+        where
+            F: Fn(Section) -> Section;
+        fn die_null(self) -> Self;
+        fn attr_string(self, s: &str) -> Self;
+        fn attr_ref1(self, o: u8) -> Self;
+        fn offset(self, offset: usize, format: Format) -> Self;
+    }
+
+    impl UnitSectionMethods for Section {
+        fn unit<'input, E>(self, unit: &mut UnitHeader<EndianSlice<'input, E>>) -> Self
+        where
+            E: Endianity,
+        {
+            let size = self.size();
+            let length = Label::new();
+            let start = Label::new();
+            let end = Label::new();
+
+            let section = match unit.format() {
+                Format::Dwarf32 => self.L32(&length),
+                Format::Dwarf64 => self.L32(0xffff_ffff).L64(&length),
+            };
+
+            let section = match unit.version() {
+                2 | 3 | 4 => section
+                    .mark(&start)
+                    .L16(unit.version())
+                    .offset(unit.debug_abbrev_offset.0, unit.format())
+                    .D8(unit.address_size()),
+                5 => section
+                    .mark(&start)
+                    .L16(unit.version())
+                    .D8(unit.type_().dw_ut().0)
+                    .D8(unit.address_size())
+                    .offset(unit.debug_abbrev_offset.0, unit.format()),
+                _ => unreachable!(),
+            };
+
+            let section = match unit.type_() {
+                UnitType::Compilation | UnitType::Partial => {
+                    unit.unit_offset = DebugInfoOffset(size as usize).into();
+                    section
+                }
+                UnitType::Type {
+                    type_signature,
+                    type_offset,
+                }
+                | UnitType::SplitType {
+                    type_signature,
+                    type_offset,
+                } => {
+                    if unit.version() == 5 {
+                        unit.unit_offset = DebugInfoOffset(size as usize).into();
+                    } else {
+                        unit.unit_offset = DebugTypesOffset(size as usize).into();
+                    }
+                    section
+                        .L64(type_signature.0)
+                        .offset(type_offset.0, unit.format())
+                }
+                UnitType::Skeleton(dwo_id) | UnitType::SplitCompilation(dwo_id) => {
+                    unit.unit_offset = DebugInfoOffset(size as usize).into();
+                    section.L64(dwo_id.0)
+                }
+            };
+
+            let section = section.append_bytes(unit.entries_buf.into()).mark(&end);
+
+            unit.unit_length = (&end - &start) as usize;
+            length.set_const(unit.unit_length as u64);
+
+            section
+        }
+
+        fn die<F>(self, code: u64, attr: F) -> Self
+        where
+            F: Fn(Section) -> Section,
+        {
+            let section = self.uleb(code);
+            attr(section)
+        }
+
+        fn die_null(self) -> Self {
+            self.D8(0)
+        }
+
+        fn attr_string(self, attr: &str) -> Self {
+            self.append_bytes(attr.as_bytes()).D8(0)
+        }
+
+        fn attr_ref1(self, attr: u8) -> Self {
+            self.D8(attr)
+        }
+
+        fn offset(self, offset: usize, format: Format) -> Self {
+            match format {
+                Format::Dwarf32 => self.L32(offset as u32),
+                Format::Dwarf64 => self.L64(offset as u64),
+            }
+        }
+    }
+
+    /// Ensure that `UnitHeader<R>` is covariant wrt R.
+    #[test]
+    fn test_unit_header_variance() {
+        /// This only needs to compile.
+        fn _f<'a: 'b, 'b, E: Endianity>(
+            x: UnitHeader<EndianSlice<'a, E>>,
+        ) -> UnitHeader<EndianSlice<'b, E>> {
+            x
+        }
+    }
+
+    #[test]
+    fn test_parse_debug_abbrev_offset_32() {
+        let section = Section::with_endian(Endian::Little).L32(0x0403_0201);
+        let buf = section.get_contents().unwrap();
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_debug_abbrev_offset(buf, Format::Dwarf32) {
+            Ok(val) => assert_eq!(val, DebugAbbrevOffset(0x0403_0201)),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_debug_abbrev_offset_32_incomplete() {
+        let buf = [0x01, 0x02];
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_debug_abbrev_offset(buf, Format::Dwarf32) {
+            Err(Error::UnexpectedEof(_)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_debug_abbrev_offset_64() {
+        let section = Section::with_endian(Endian::Little).L64(0x0807_0605_0403_0201);
+        let buf = section.get_contents().unwrap();
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_debug_abbrev_offset(buf, Format::Dwarf64) {
+            Ok(val) => assert_eq!(val, DebugAbbrevOffset(0x0807_0605_0403_0201)),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_debug_abbrev_offset_64_incomplete() {
+        let buf = [0x01, 0x02];
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_debug_abbrev_offset(buf, Format::Dwarf64) {
+            Err(Error::UnexpectedEof(_)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_debug_info_offset_32() {
+        let section = Section::with_endian(Endian::Little).L32(0x0403_0201);
+        let buf = section.get_contents().unwrap();
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_debug_info_offset(buf, Format::Dwarf32) {
+            Ok(val) => assert_eq!(val, DebugInfoOffset(0x0403_0201)),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_debug_info_offset_32_incomplete() {
+        let buf = [0x01, 0x02];
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_debug_info_offset(buf, Format::Dwarf32) {
+            Err(Error::UnexpectedEof(_)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_debug_info_offset_64() {
+        let section = Section::with_endian(Endian::Little).L64(0x0807_0605_0403_0201);
+        let buf = section.get_contents().unwrap();
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_debug_info_offset(buf, Format::Dwarf64) {
+            Ok(val) => assert_eq!(val, DebugInfoOffset(0x0807_0605_0403_0201)),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_debug_info_offset_64_incomplete() {
+        let buf = [0x01, 0x02];
+        let buf = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_debug_info_offset(buf, Format::Dwarf64) {
+            Err(Error::UnexpectedEof(_)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_units() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let mut unit64 = UnitHeader {
+            encoding: Encoding {
+                format: Format::Dwarf64,
+                version: 4,
+                address_size: 8,
+            },
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let mut unit32 = UnitHeader {
+            encoding: Encoding {
+                format: Format::Dwarf32,
+                version: 4,
+                address_size: 4,
+            },
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut unit64)
+            .unit(&mut unit32);
+        let buf = section.get_contents().unwrap();
+
+        let debug_info = DebugInfo::new(&buf, LittleEndian);
+        let mut units = debug_info.units();
+
+        assert_eq!(units.next(), Ok(Some(unit64)));
+        assert_eq!(units.next(), Ok(Some(unit32)));
+        assert_eq!(units.next(), Ok(None));
+    }
+
+    #[test]
+    fn test_unit_version_unknown_version() {
+        let buf = [0x02, 0x00, 0x00, 0x00, 0xab, 0xcd];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_unit_header(rest, DebugInfoOffset(0).into()) {
+            Err(Error::UnknownVersion(0xcdab)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+
+        let buf = [0x02, 0x00, 0x00, 0x00, 0x1, 0x0];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_unit_header(rest, DebugInfoOffset(0).into()) {
+            Err(Error::UnknownVersion(1)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_unit_version_incomplete() {
+        let buf = [0x01, 0x00, 0x00, 0x00, 0x04];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_unit_header(rest, DebugInfoOffset(0).into()) {
+            Err(Error::UnexpectedEof(_)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_unit_header_32_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_unit_header_64_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 4,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_v5_unit_header_32_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 5,
+            address_size: 4,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_v5_unit_header_64_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 5,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_v5_partial_unit_header_32_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 5,
+            address_size: 4,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Partial,
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_v5_partial_unit_header_64_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 5,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Partial,
+            debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_v5_skeleton_unit_header_32_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 5,
+            address_size: 4,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Skeleton(DwoId(0x0706_5040_0302_1000)),
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_v5_skeleton_unit_header_64_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 5,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Skeleton(DwoId(0x0706_5040_0302_1000)),
+            debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_v5_split_compilation_unit_header_32_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 5,
+            address_size: 4,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::SplitCompilation(DwoId(0x0706_5040_0302_1000)),
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_v5_split_compilation_unit_header_64_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 5,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::SplitCompilation(DwoId(0x0706_5040_0302_1000)),
+            debug_abbrev_offset: DebugAbbrevOffset(0x0102_0304_0506_0708),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_type_offset_32_ok() {
+        let buf = [0x12, 0x34, 0x56, 0x78, 0x00];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_type_offset(rest, Format::Dwarf32) {
+            Ok(offset) => {
+                assert_eq!(rest.len(), 1);
+                assert_eq!(UnitOffset(0x7856_3412), offset);
+            }
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_type_offset_64_ok() {
+        let buf = [0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xff, 0x00];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_type_offset(rest, Format::Dwarf64) {
+            Ok(offset) => {
+                assert_eq!(rest.len(), 1);
+                assert_eq!(UnitOffset(0xffde_bc9a_7856_3412), offset);
+            }
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        }
+    }
+
+    #[test]
+    fn test_parse_type_offset_incomplete() {
+        // Need at least 4 bytes.
+        let buf = [0xff, 0xff, 0xff];
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        match parse_type_offset(rest, Format::Dwarf32) {
+            Err(Error::UnexpectedEof(_)) => assert!(true),
+            otherwise => panic!("Unexpected result: {:?}", otherwise),
+        };
+    }
+
+    #[test]
+    fn test_parse_type_unit_header_32_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Type {
+                type_signature: DebugTypeSignature(0xdead_beef_dead_beef),
+                type_offset: UnitOffset(0x7856_3412),
+            },
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugTypesOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugTypesOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_type_unit_header_64_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 4,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Type {
+                type_signature: DebugTypeSignature(0xdead_beef_dead_beef),
+                type_offset: UnitOffset(0x7856_3412_7856_3412),
+            },
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugTypesOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugTypesOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_v5_type_unit_header_32_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 5,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Type {
+                type_signature: DebugTypeSignature(0xdead_beef_dead_beef),
+                type_offset: UnitOffset(0x7856_3412),
+            },
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_v5_type_unit_header_64_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 5,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Type {
+                type_signature: DebugTypeSignature(0xdead_beef_dead_beef),
+                type_offset: UnitOffset(0x7856_3412_7856_3412),
+            },
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    fn test_parse_v5_split_type_unit_header_32_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 5,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::SplitType {
+                type_signature: DebugTypeSignature(0xdead_beef_dead_beef),
+                type_offset: UnitOffset(0x7856_3412),
+            },
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_v5_split_type_unit_header_64_ok() {
+        let expected_rest = &[1, 2, 3, 4, 5, 6, 7, 8, 9];
+        let encoding = Encoding {
+            format: Format::Dwarf64,
+            version: 5,
+            address_size: 8,
+        };
+        let mut expected_unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::SplitType {
+                type_signature: DebugTypeSignature(0xdead_beef_dead_beef),
+                type_offset: UnitOffset(0x7856_3412_7856_3412),
+            },
+            debug_abbrev_offset: DebugAbbrevOffset(0x0807_0605),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(expected_rest, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little)
+            .unit(&mut expected_unit)
+            .append_bytes(expected_rest);
+        let buf = section.get_contents().unwrap();
+        let rest = &mut EndianSlice::new(&buf, LittleEndian);
+
+        assert_eq!(
+            parse_unit_header(rest, DebugInfoOffset(0).into()),
+            Ok(expected_unit)
+        );
+        assert_eq!(*rest, EndianSlice::new(expected_rest, LittleEndian));
+    }
+
+    fn section_contents<F>(f: F) -> Vec<u8>
+    where
+        F: Fn(Section) -> Section,
+    {
+        f(Section::with_endian(Endian::Little))
+            .get_contents()
+            .unwrap()
+    }
+
+    #[test]
+    fn test_attribute_value() {
+        let mut unit = test_parse_attribute_unit_default();
+        let endian = unit.entries_buf.endian();
+
+        let block_data = &[1, 2, 3, 4];
+        let buf = section_contents(|s| s.uleb(block_data.len() as u64).append_bytes(block_data));
+        let block = EndianSlice::new(&buf, endian);
+
+        let buf = section_contents(|s| s.L32(0x0102_0304));
+        let data4 = EndianSlice::new(&buf, endian);
+
+        let buf = section_contents(|s| s.L64(0x0102_0304_0506_0708));
+        let data8 = EndianSlice::new(&buf, endian);
+
+        let tests = [
+            (
+                Format::Dwarf32,
+                2,
+                constants::DW_AT_data_member_location,
+                constants::DW_FORM_block,
+                block,
+                AttributeValue::Block(EndianSlice::new(block_data, endian)),
+                AttributeValue::Exprloc(Expression(EndianSlice::new(block_data, endian))),
+            ),
+            (
+                Format::Dwarf32,
+                2,
+                constants::DW_AT_data_member_location,
+                constants::DW_FORM_data4,
+                data4,
+                AttributeValue::SecOffset(0x0102_0304),
+                AttributeValue::LocationListsRef(LocationListsOffset(0x0102_0304)),
+            ),
+            (
+                Format::Dwarf64,
+                2,
+                constants::DW_AT_data_member_location,
+                constants::DW_FORM_data4,
+                data4,
+                AttributeValue::Data4(0x0102_0304),
+                AttributeValue::Udata(0x0102_0304),
+            ),
+            (
+                Format::Dwarf32,
+                4,
+                constants::DW_AT_data_member_location,
+                constants::DW_FORM_data4,
+                data4,
+                AttributeValue::Data4(0x0102_0304),
+                AttributeValue::Udata(0x0102_0304),
+            ),
+            (
+                Format::Dwarf32,
+                2,
+                constants::DW_AT_data_member_location,
+                constants::DW_FORM_data8,
+                data8,
+                AttributeValue::Data8(0x0102_0304_0506_0708),
+                AttributeValue::Udata(0x0102_0304_0506_0708),
+            ),
+            #[cfg(target_pointer_width = "64")]
+            (
+                Format::Dwarf64,
+                2,
+                constants::DW_AT_data_member_location,
+                constants::DW_FORM_data8,
+                data8,
+                AttributeValue::SecOffset(0x0102_0304_0506_0708),
+                AttributeValue::LocationListsRef(LocationListsOffset(0x0102_0304_0506_0708)),
+            ),
+            (
+                Format::Dwarf64,
+                4,
+                constants::DW_AT_data_member_location,
+                constants::DW_FORM_data8,
+                data8,
+                AttributeValue::Data8(0x0102_0304_0506_0708),
+                AttributeValue::Udata(0x0102_0304_0506_0708),
+            ),
+            (
+                Format::Dwarf32,
+                4,
+                constants::DW_AT_location,
+                constants::DW_FORM_data4,
+                data4,
+                AttributeValue::SecOffset(0x0102_0304),
+                AttributeValue::LocationListsRef(LocationListsOffset(0x0102_0304)),
+            ),
+            #[cfg(target_pointer_width = "64")]
+            (
+                Format::Dwarf64,
+                4,
+                constants::DW_AT_location,
+                constants::DW_FORM_data8,
+                data8,
+                AttributeValue::SecOffset(0x0102_0304_0506_0708),
+                AttributeValue::LocationListsRef(LocationListsOffset(0x0102_0304_0506_0708)),
+            ),
+            (
+                Format::Dwarf32,
+                4,
+                constants::DW_AT_str_offsets_base,
+                constants::DW_FORM_sec_offset,
+                data4,
+                AttributeValue::SecOffset(0x0102_0304),
+                AttributeValue::DebugStrOffsetsBase(DebugStrOffsetsBase(0x0102_0304)),
+            ),
+            (
+                Format::Dwarf32,
+                4,
+                constants::DW_AT_stmt_list,
+                constants::DW_FORM_sec_offset,
+                data4,
+                AttributeValue::SecOffset(0x0102_0304),
+                AttributeValue::DebugLineRef(DebugLineOffset(0x0102_0304)),
+            ),
+            (
+                Format::Dwarf32,
+                4,
+                constants::DW_AT_addr_base,
+                constants::DW_FORM_sec_offset,
+                data4,
+                AttributeValue::SecOffset(0x0102_0304),
+                AttributeValue::DebugAddrBase(DebugAddrBase(0x0102_0304)),
+            ),
+            (
+                Format::Dwarf32,
+                4,
+                constants::DW_AT_rnglists_base,
+                constants::DW_FORM_sec_offset,
+                data4,
+                AttributeValue::SecOffset(0x0102_0304),
+                AttributeValue::DebugRngListsBase(DebugRngListsBase(0x0102_0304)),
+            ),
+            (
+                Format::Dwarf32,
+                4,
+                constants::DW_AT_loclists_base,
+                constants::DW_FORM_sec_offset,
+                data4,
+                AttributeValue::SecOffset(0x0102_0304),
+                AttributeValue::DebugLocListsBase(DebugLocListsBase(0x0102_0304)),
+            ),
+        ];
+
+        for test in tests.iter() {
+            let (format, version, name, form, mut input, expect_raw, expect_value) = *test;
+            unit.encoding.format = format;
+            unit.encoding.version = version;
+            let spec = AttributeSpecification::new(name, form, None);
+            let attribute =
+                parse_attribute(&mut input, unit.encoding(), spec).expect("Should parse attribute");
+            assert_eq!(attribute.raw_value(), expect_raw);
+            assert_eq!(attribute.value(), expect_value);
+        }
+    }
+
+    #[test]
+    fn test_attribute_udata_sdata_value() {
+        #[allow(clippy::type_complexity)]
+        let tests: &[(
+            AttributeValue<EndianSlice<LittleEndian>>,
+            Option<u64>,
+            Option<i64>,
+        )] = &[
+            (AttributeValue::Data1(1), Some(1), Some(1)),
+            (
+                AttributeValue::Data1(core::u8::MAX),
+                Some(u64::from(std::u8::MAX)),
+                Some(-1),
+            ),
+            (AttributeValue::Data2(1), Some(1), Some(1)),
+            (
+                AttributeValue::Data2(core::u16::MAX),
+                Some(u64::from(std::u16::MAX)),
+                Some(-1),
+            ),
+            (AttributeValue::Data4(1), Some(1), Some(1)),
+            (
+                AttributeValue::Data4(core::u32::MAX),
+                Some(u64::from(std::u32::MAX)),
+                Some(-1),
+            ),
+            (AttributeValue::Data8(1), Some(1), Some(1)),
+            (
+                AttributeValue::Data8(core::u64::MAX),
+                Some(core::u64::MAX),
+                Some(-1),
+            ),
+            (AttributeValue::Sdata(1), Some(1), Some(1)),
+            (AttributeValue::Sdata(-1), None, Some(-1)),
+            (AttributeValue::Udata(1), Some(1), Some(1)),
+            (AttributeValue::Udata(1u64 << 63), Some(1u64 << 63), None),
+        ];
+        for test in tests.iter() {
+            let (value, expect_udata, expect_sdata) = *test;
+            let attribute = Attribute {
+                name: DW_AT_data_member_location,
+                value,
+            };
+            assert_eq!(attribute.udata_value(), expect_udata);
+            assert_eq!(attribute.sdata_value(), expect_sdata);
+        }
+    }
+
+    fn test_parse_attribute_unit<Endian>(
+        address_size: u8,
+        format: Format,
+        endian: Endian,
+    ) -> UnitHeader<EndianSlice<'static, Endian>>
+    where
+        Endian: Endianity,
+    {
+        let encoding = Encoding {
+            format,
+            version: 4,
+            address_size,
+        };
+        UnitHeader::new(
+            encoding,
+            7,
+            UnitType::Compilation,
+            DebugAbbrevOffset(0x0807_0605),
+            DebugInfoOffset(0).into(),
+            EndianSlice::new(&[], endian),
+        )
+    }
+
+    fn test_parse_attribute_unit_default() -> UnitHeader<EndianSlice<'static, LittleEndian>> {
+        test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian)
+    }
+
+    fn test_parse_attribute<'input, Endian>(
+        buf: &'input [u8],
+        len: usize,
+        unit: &UnitHeader<EndianSlice<'input, Endian>>,
+        form: constants::DwForm,
+        value: AttributeValue<EndianSlice<'input, Endian>>,
+    ) where
+        Endian: Endianity,
+    {
+        let spec = AttributeSpecification::new(constants::DW_AT_low_pc, form, None);
+
+        let expect = Attribute {
+            name: constants::DW_AT_low_pc,
+            value,
+        };
+
+        let rest = &mut EndianSlice::new(buf, Endian::default());
+        match parse_attribute(rest, unit.encoding(), spec) {
+            Ok(attr) => {
+                assert_eq!(attr, expect);
+                assert_eq!(*rest, EndianSlice::new(&buf[len..], Endian::default()));
+            }
+            otherwise => {
+                assert!(false, "Unexpected parse result = {:#?}", otherwise);
+            }
+        };
+    }
+
+    #[test]
+    fn test_parse_attribute_addr() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
+        let form = constants::DW_FORM_addr;
+        let value = AttributeValue::Addr(0x0403_0201);
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_addr8() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08];
+        let unit = test_parse_attribute_unit(8, Format::Dwarf32, LittleEndian);
+        let form = constants::DW_FORM_addr;
+        let value = AttributeValue::Addr(0x0807_0605_0403_0201);
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_block1() {
+        // Length of data (3), three bytes of data, two bytes of left over input.
+        let buf = [0x03, 0x09, 0x09, 0x09, 0x00, 0x00];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_block1;
+        let value = AttributeValue::Block(EndianSlice::new(&buf[1..4], LittleEndian));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_block2() {
+        // Two byte length of data (2), two bytes of data, two bytes of left over input.
+        let buf = [0x02, 0x00, 0x09, 0x09, 0x00, 0x00];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_block2;
+        let value = AttributeValue::Block(EndianSlice::new(&buf[2..4], LittleEndian));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_block4() {
+        // Four byte length of data (2), two bytes of data, no left over input.
+        let buf = [0x02, 0x00, 0x00, 0x00, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_block4;
+        let value = AttributeValue::Block(EndianSlice::new(&buf[4..], LittleEndian));
+        test_parse_attribute(&buf, 6, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_block() {
+        // LEB length of data (2, one byte), two bytes of data, no left over input.
+        let buf = [0x02, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_block;
+        let value = AttributeValue::Block(EndianSlice::new(&buf[1..], LittleEndian));
+        test_parse_attribute(&buf, 3, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_data1() {
+        let buf = [0x03];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_data1;
+        let value = AttributeValue::Data1(0x03);
+        test_parse_attribute(&buf, 1, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_data2() {
+        let buf = [0x02, 0x01, 0x0];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_data2;
+        let value = AttributeValue::Data2(0x0102);
+        test_parse_attribute(&buf, 2, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_data4() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_data4;
+        let value = AttributeValue::Data4(0x0403_0201);
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_data8() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_data8;
+        let value = AttributeValue::Data8(0x0807_0605_0403_0201);
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_udata() {
+        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let bytes_written = {
+            let mut writable = &mut buf[..];
+            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
+        };
+
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_udata;
+        let value = AttributeValue::Udata(4097);
+        test_parse_attribute(&buf, bytes_written, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_sdata() {
+        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let bytes_written = {
+            let mut writable = &mut buf[..];
+            leb128::write::signed(&mut writable, -4097).expect("should write ok")
+        };
+
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_sdata;
+        let value = AttributeValue::Sdata(-4097);
+        test_parse_attribute(&buf, bytes_written, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_exprloc() {
+        // LEB length of data (2, one byte), two bytes of data, one byte left over input.
+        let buf = [0x02, 0x99, 0x99, 0x11];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_exprloc;
+        let value = AttributeValue::Exprloc(Expression(EndianSlice::new(&buf[1..3], LittleEndian)));
+        test_parse_attribute(&buf, 3, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_flag_true() {
+        let buf = [0x42];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_flag;
+        let value = AttributeValue::Flag(true);
+        test_parse_attribute(&buf, 1, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_flag_false() {
+        let buf = [0x00];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_flag;
+        let value = AttributeValue::Flag(false);
+        test_parse_attribute(&buf, 1, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_flag_present() {
+        let buf = [0x01, 0x02, 0x03, 0x04];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_flag_present;
+        let value = AttributeValue::Flag(true);
+        // DW_FORM_flag_present does not consume any bytes of the input stream.
+        test_parse_attribute(&buf, 0, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_sec_offset_32() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
+        let form = constants::DW_FORM_sec_offset;
+        let value = AttributeValue::SecOffset(0x0403_0201);
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_sec_offset_64() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_sec_offset;
+        let value = AttributeValue::SecOffset(0x0807_0605_0403_0201);
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_ref1() {
+        let buf = [0x03];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_ref1;
+        let value = AttributeValue::UnitRef(UnitOffset(3));
+        test_parse_attribute(&buf, 1, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_ref2() {
+        let buf = [0x02, 0x01, 0x0];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_ref2;
+        let value = AttributeValue::UnitRef(UnitOffset(258));
+        test_parse_attribute(&buf, 2, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_ref4() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_ref4;
+        let value = AttributeValue::UnitRef(UnitOffset(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_ref8() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_ref8;
+        let value = AttributeValue::UnitRef(UnitOffset(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_ref_sup4() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_ref_sup4;
+        let value = AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_ref_sup8() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_ref_sup8;
+        let value = AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_refudata() {
+        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let bytes_written = {
+            let mut writable = &mut buf[..];
+            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
+        };
+
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_ref_udata;
+        let value = AttributeValue::UnitRef(UnitOffset(4097));
+        test_parse_attribute(&buf, bytes_written, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_refaddr_32() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
+        let form = constants::DW_FORM_ref_addr;
+        let value = AttributeValue::DebugInfoRef(DebugInfoOffset(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_refaddr_64() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_ref_addr;
+        let value = AttributeValue::DebugInfoRef(DebugInfoOffset(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_refaddr_version2() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let mut unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
+        unit.encoding.version = 2;
+        let form = constants::DW_FORM_ref_addr;
+        let value = AttributeValue::DebugInfoRef(DebugInfoOffset(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_refaddr8_version2() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let mut unit = test_parse_attribute_unit(8, Format::Dwarf32, LittleEndian);
+        unit.encoding.version = 2;
+        let form = constants::DW_FORM_ref_addr;
+        let value = AttributeValue::DebugInfoRef(DebugInfoOffset(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_gnu_ref_alt_32() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
+        let form = constants::DW_FORM_GNU_ref_alt;
+        let value = AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_gnu_ref_alt_64() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_GNU_ref_alt;
+        let value = AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_refsig8() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_ref_sig8;
+        let value = AttributeValue::DebugTypesRef(DebugTypeSignature(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_string() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x0, 0x99, 0x99];
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_string;
+        let value = AttributeValue::String(EndianSlice::new(&buf[..5], LittleEndian));
+        test_parse_attribute(&buf, 6, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_strp_32() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
+        let form = constants::DW_FORM_strp;
+        let value = AttributeValue::DebugStrRef(DebugStrOffset(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_strp_64() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_strp;
+        let value = AttributeValue::DebugStrRef(DebugStrOffset(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_strp_sup_32() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
+        let form = constants::DW_FORM_strp_sup;
+        let value = AttributeValue::DebugStrRefSup(DebugStrOffset(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_strp_sup_64() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_strp_sup;
+        let value = AttributeValue::DebugStrRefSup(DebugStrOffset(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_gnu_strp_alt_32() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf32, LittleEndian);
+        let form = constants::DW_FORM_GNU_strp_alt;
+        let value = AttributeValue::DebugStrRefSup(DebugStrOffset(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_parse_attribute_gnu_strp_alt_64() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_GNU_strp_alt;
+        let value = AttributeValue::DebugStrRefSup(DebugStrOffset(0x0807_0605_0403_0201));
+        test_parse_attribute(&buf, 8, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_strx() {
+        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let bytes_written = {
+            let mut writable = &mut buf[..];
+            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
+        };
+
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_strx;
+        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(4097));
+        test_parse_attribute(&buf, bytes_written, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_strx1() {
+        let buf = [0x01, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_strx1;
+        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(0x01));
+        test_parse_attribute(&buf, 1, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_strx2() {
+        let buf = [0x01, 0x02, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_strx2;
+        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(0x0201));
+        test_parse_attribute(&buf, 2, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_strx3() {
+        let buf = [0x01, 0x02, 0x03, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_strx3;
+        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(0x03_0201));
+        test_parse_attribute(&buf, 3, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_strx4() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_strx4;
+        let value = AttributeValue::DebugStrOffsetsIndex(DebugStrOffsetsIndex(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_addrx() {
+        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let bytes_written = {
+            let mut writable = &mut buf[..];
+            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
+        };
+
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_addrx;
+        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(4097));
+        test_parse_attribute(&buf, bytes_written, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_addrx1() {
+        let buf = [0x01, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_addrx1;
+        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(0x01));
+        test_parse_attribute(&buf, 1, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_addrx2() {
+        let buf = [0x01, 0x02, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_addrx2;
+        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(0x0201));
+        test_parse_attribute(&buf, 2, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_addrx3() {
+        let buf = [0x01, 0x02, 0x03, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_addrx3;
+        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(0x03_0201));
+        test_parse_attribute(&buf, 3, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_addrx4() {
+        let buf = [0x01, 0x02, 0x03, 0x04, 0x99, 0x99];
+        let unit = test_parse_attribute_unit(4, Format::Dwarf64, LittleEndian);
+        let form = constants::DW_FORM_addrx4;
+        let value = AttributeValue::DebugAddrIndex(DebugAddrIndex(0x0403_0201));
+        test_parse_attribute(&buf, 4, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_loclistx() {
+        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let bytes_written = {
+            let mut writable = &mut buf[..];
+            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
+        };
+
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_loclistx;
+        let value = AttributeValue::DebugLocListsIndex(DebugLocListsIndex(4097));
+        test_parse_attribute(&buf, bytes_written, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_rnglistx() {
+        let mut buf = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let bytes_written = {
+            let mut writable = &mut buf[..];
+            leb128::write::unsigned(&mut writable, 4097).expect("should write ok")
+        };
+
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_rnglistx;
+        let value = AttributeValue::DebugRngListsIndex(DebugRngListsIndex(4097));
+        test_parse_attribute(&buf, bytes_written, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_indirect() {
+        let mut buf = [0; 100];
+
+        let bytes_written = {
+            let mut writable = &mut buf[..];
+            leb128::write::unsigned(&mut writable, constants::DW_FORM_udata.0.into())
+                .expect("should write udata")
+                + leb128::write::unsigned(&mut writable, 9_999_999).expect("should write value")
+        };
+
+        let unit = test_parse_attribute_unit_default();
+        let form = constants::DW_FORM_indirect;
+        let value = AttributeValue::Udata(9_999_999);
+        test_parse_attribute(&buf, bytes_written, &unit, form, value);
+    }
+
+    #[test]
+    fn test_parse_attribute_indirect_implicit_const() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut buf = [0; 100];
+        let mut writable = &mut buf[..];
+        leb128::write::unsigned(&mut writable, constants::DW_FORM_implicit_const.0.into())
+            .expect("should write implicit_const");
+
+        let input = &mut EndianSlice::new(&buf, LittleEndian);
+        let spec =
+            AttributeSpecification::new(constants::DW_AT_low_pc, constants::DW_FORM_indirect, None);
+        assert_eq!(
+            parse_attribute(input, encoding, spec),
+            Err(Error::InvalidImplicitConst)
+        );
+    }
+
+    #[test]
+    fn test_attrs_iter() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let unit = UnitHeader::new(
+            encoding,
+            7,
+            UnitType::Compilation,
+            DebugAbbrevOffset(0x0807_0605),
+            DebugInfoOffset(0).into(),
+            EndianSlice::new(&[], LittleEndian),
+        );
+
+        let abbrev = Abbreviation::new(
+            42,
+            constants::DW_TAG_subprogram,
+            constants::DW_CHILDREN_yes,
+            vec![
+                AttributeSpecification::new(constants::DW_AT_name, constants::DW_FORM_string, None),
+                AttributeSpecification::new(constants::DW_AT_low_pc, constants::DW_FORM_addr, None),
+                AttributeSpecification::new(
+                    constants::DW_AT_high_pc,
+                    constants::DW_FORM_addr,
+                    None,
+                ),
+            ]
+            .into(),
+        );
+
+        // "foo", 42, 1337, 4 dangling bytes of 0xaa where children would be
+        let buf = [
+            0x66, 0x6f, 0x6f, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x39, 0x05, 0x00, 0x00, 0xaa, 0xaa,
+            0xaa, 0xaa,
+        ];
+
+        let entry = DebuggingInformationEntry {
+            offset: UnitOffset(0),
+            attrs_slice: EndianSlice::new(&buf, LittleEndian),
+            attrs_len: Cell::new(None),
+            abbrev: &abbrev,
+            unit: &unit,
+        };
+
+        let mut attrs = AttrsIter {
+            input: EndianSlice::new(&buf, LittleEndian),
+            attributes: abbrev.attributes(),
+            entry: &entry,
+        };
+
+        match attrs.next() {
+            Ok(Some(attr)) => {
+                assert_eq!(
+                    attr,
+                    Attribute {
+                        name: constants::DW_AT_name,
+                        value: AttributeValue::String(EndianSlice::new(b"foo", LittleEndian)),
+                    }
+                );
+            }
+            otherwise => {
+                assert!(false, "Unexpected parse result = {:#?}", otherwise);
+            }
+        }
+
+        assert!(entry.attrs_len.get().is_none());
+
+        match attrs.next() {
+            Ok(Some(attr)) => {
+                assert_eq!(
+                    attr,
+                    Attribute {
+                        name: constants::DW_AT_low_pc,
+                        value: AttributeValue::Addr(0x2a),
+                    }
+                );
+            }
+            otherwise => {
+                assert!(false, "Unexpected parse result = {:#?}", otherwise);
+            }
+        }
+
+        assert!(entry.attrs_len.get().is_none());
+
+        match attrs.next() {
+            Ok(Some(attr)) => {
+                assert_eq!(
+                    attr,
+                    Attribute {
+                        name: constants::DW_AT_high_pc,
+                        value: AttributeValue::Addr(0x539),
+                    }
+                );
+            }
+            otherwise => {
+                assert!(false, "Unexpected parse result = {:#?}", otherwise);
+            }
+        }
+
+        assert!(entry.attrs_len.get().is_none());
+
+        assert!(attrs.next().expect("should parse next").is_none());
+        assert!(entry.attrs_len.get().is_some());
+        assert_eq!(
+            entry.attrs_len.get().expect("should have entry.attrs_len"),
+            buf.len() - 4
+        )
+    }
+
+    #[test]
+    fn test_attrs_iter_incomplete() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let unit = UnitHeader::new(
+            encoding,
+            7,
+            UnitType::Compilation,
+            DebugAbbrevOffset(0x0807_0605),
+            DebugInfoOffset(0).into(),
+            EndianSlice::new(&[], LittleEndian),
+        );
+
+        let abbrev = Abbreviation::new(
+            42,
+            constants::DW_TAG_subprogram,
+            constants::DW_CHILDREN_yes,
+            vec![
+                AttributeSpecification::new(constants::DW_AT_name, constants::DW_FORM_string, None),
+                AttributeSpecification::new(constants::DW_AT_low_pc, constants::DW_FORM_addr, None),
+                AttributeSpecification::new(
+                    constants::DW_AT_high_pc,
+                    constants::DW_FORM_addr,
+                    None,
+                ),
+            ]
+            .into(),
+        );
+
+        // "foo"
+        let buf = [0x66, 0x6f, 0x6f, 0x00];
+
+        let entry = DebuggingInformationEntry {
+            offset: UnitOffset(0),
+            attrs_slice: EndianSlice::new(&buf, LittleEndian),
+            attrs_len: Cell::new(None),
+            abbrev: &abbrev,
+            unit: &unit,
+        };
+
+        let mut attrs = AttrsIter {
+            input: EndianSlice::new(&buf, LittleEndian),
+            attributes: abbrev.attributes(),
+            entry: &entry,
+        };
+
+        match attrs.next() {
+            Ok(Some(attr)) => {
+                assert_eq!(
+                    attr,
+                    Attribute {
+                        name: constants::DW_AT_name,
+                        value: AttributeValue::String(EndianSlice::new(b"foo", LittleEndian)),
+                    }
+                );
+            }
+            otherwise => {
+                assert!(false, "Unexpected parse result = {:#?}", otherwise);
+            }
+        }
+
+        assert!(entry.attrs_len.get().is_none());
+
+        // Return error for incomplete attribute.
+        assert!(attrs.next().is_err());
+        assert!(entry.attrs_len.get().is_none());
+
+        // Return error for all subsequent calls.
+        assert!(attrs.next().is_err());
+        assert!(attrs.next().is_err());
+        assert!(attrs.next().is_err());
+        assert!(attrs.next().is_err());
+        assert!(entry.attrs_len.get().is_none());
+    }
+
+    fn assert_entry_name<Endian>(entry: &DebuggingInformationEntry<EndianSlice<Endian>>, name: &str)
+    where
+        Endian: Endianity,
+    {
+        let value = entry
+            .attr_value(constants::DW_AT_name)
+            .expect("Should have parsed the name attribute")
+            .expect("Should have found the name attribute");
+
+        assert_eq!(
+            value,
+            AttributeValue::String(EndianSlice::new(name.as_bytes(), Endian::default()))
+        );
+    }
+
+    fn assert_current_name<Endian>(cursor: &EntriesCursor<EndianSlice<Endian>>, name: &str)
+    where
+        Endian: Endianity,
+    {
+        let entry = cursor.current().expect("Should have an entry result");
+        assert_entry_name(entry, name);
+    }
+
+    fn assert_next_entry<Endian>(cursor: &mut EntriesCursor<EndianSlice<Endian>>, name: &str)
+    where
+        Endian: Endianity,
+    {
+        cursor
+            .next_entry()
+            .expect("Should parse next entry")
+            .expect("Should have an entry");
+        assert_current_name(cursor, name);
+    }
+
+    fn assert_next_entry_null<Endian>(cursor: &mut EntriesCursor<EndianSlice<Endian>>)
+    where
+        Endian: Endianity,
+    {
+        cursor
+            .next_entry()
+            .expect("Should parse next entry")
+            .expect("Should have an entry");
+        assert!(cursor.current().is_none());
+    }
+
+    fn assert_next_dfs<Endian>(
+        cursor: &mut EntriesCursor<EndianSlice<Endian>>,
+        name: &str,
+        depth: isize,
+    ) where
+        Endian: Endianity,
+    {
+        {
+            let (val, entry) = cursor
+                .next_dfs()
+                .expect("Should parse next dfs")
+                .expect("Should not be done with traversal");
+            assert_eq!(val, depth);
+            assert_entry_name(entry, name);
+        }
+        assert_current_name(cursor, name);
+    }
+
+    fn assert_next_sibling<Endian>(cursor: &mut EntriesCursor<EndianSlice<Endian>>, name: &str)
+    where
+        Endian: Endianity,
+    {
+        {
+            let entry = cursor
+                .next_sibling()
+                .expect("Should parse next sibling")
+                .expect("Should not be done with traversal");
+            assert_entry_name(entry, name);
+        }
+        assert_current_name(cursor, name);
+    }
+
+    fn assert_valid_sibling_ptr<Endian>(cursor: &EntriesCursor<EndianSlice<Endian>>)
+    where
+        Endian: Endianity,
+    {
+        let sibling_ptr = cursor
+            .current()
+            .expect("Should have current entry")
+            .attr_value(constants::DW_AT_sibling);
+        match sibling_ptr {
+            Ok(Some(AttributeValue::UnitRef(offset))) => {
+                cursor
+                    .unit
+                    .range_from(offset..)
+                    .expect("Sibling offset should be valid");
+            }
+            _ => panic!("Invalid sibling pointer {:?}", sibling_ptr),
+        }
+    }
+
+    fn entries_cursor_tests_abbrev_buf() -> Vec<u8> {
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .abbrev(1, DW_TAG_subprogram, DW_CHILDREN_yes)
+                .abbrev_attr(DW_AT_name, DW_FORM_string)
+                .abbrev_attr_null()
+            .abbrev_null();
+        section.get_contents().unwrap()
+    }
+
+    fn entries_cursor_tests_debug_info_buf() -> Vec<u8> {
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .die(1, |s| s.attr_string("001"))
+                .die(1, |s| s.attr_string("002"))
+                    .die(1, |s| s.attr_string("003"))
+                        .die_null()
+                    .die_null()
+                .die(1, |s| s.attr_string("004"))
+                    .die(1, |s| s.attr_string("005"))
+                        .die_null()
+                    .die(1, |s| s.attr_string("006"))
+                        .die_null()
+                    .die_null()
+                .die(1, |s| s.attr_string("007"))
+                    .die(1, |s| s.attr_string("008"))
+                        .die(1, |s| s.attr_string("009"))
+                            .die_null()
+                        .die_null()
+                    .die_null()
+                .die(1, |s| s.attr_string("010"))
+                    .die_null()
+                .die_null();
+        let entries_buf = section.get_contents().unwrap();
+
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little).unit(&mut unit);
+        section.get_contents().unwrap()
+    }
+
+    #[test]
+    fn test_cursor_next_entry_incomplete() {
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .die(1, |s| s.attr_string("001"))
+                .die(1, |s| s.attr_string("002"))
+                    .die(1, |s| s);
+        let entries_buf = section.get_contents().unwrap();
+
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little).unit(&mut unit);
+        let info_buf = &section.get_contents().unwrap();
+        let debug_info = DebugInfo::new(info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
+        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+
+        assert_next_entry(&mut cursor, "001");
+        assert_next_entry(&mut cursor, "002");
+
+        {
+            // Entry code is present, but none of the attributes.
+            cursor
+                .next_entry()
+                .expect("Should parse next entry")
+                .expect("Should have an entry");
+            let entry = cursor.current().expect("Should have an entry result");
+            assert!(entry.attrs().next().is_err());
+        }
+
+        assert!(cursor.next_entry().is_err());
+        assert!(cursor.next_entry().is_err());
+    }
+
+    #[test]
+    fn test_cursor_next_entry() {
+        let info_buf = &entries_cursor_tests_debug_info_buf();
+        let debug_info = DebugInfo::new(info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
+        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+
+        assert_next_entry(&mut cursor, "001");
+        assert_next_entry(&mut cursor, "002");
+        assert_next_entry(&mut cursor, "003");
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry(&mut cursor, "004");
+        assert_next_entry(&mut cursor, "005");
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry(&mut cursor, "006");
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry(&mut cursor, "007");
+        assert_next_entry(&mut cursor, "008");
+        assert_next_entry(&mut cursor, "009");
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry(&mut cursor, "010");
+        assert_next_entry_null(&mut cursor);
+        assert_next_entry_null(&mut cursor);
+
+        assert!(cursor
+            .next_entry()
+            .expect("Should parse next entry")
+            .is_none());
+        assert!(cursor.current().is_none());
+    }
+
+    #[test]
+    fn test_cursor_next_dfs() {
+        let info_buf = &entries_cursor_tests_debug_info_buf();
+        let debug_info = DebugInfo::new(info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
+        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+
+        assert_next_dfs(&mut cursor, "001", 0);
+        assert_next_dfs(&mut cursor, "002", 1);
+        assert_next_dfs(&mut cursor, "003", 1);
+        assert_next_dfs(&mut cursor, "004", -1);
+        assert_next_dfs(&mut cursor, "005", 1);
+        assert_next_dfs(&mut cursor, "006", 0);
+        assert_next_dfs(&mut cursor, "007", -1);
+        assert_next_dfs(&mut cursor, "008", 1);
+        assert_next_dfs(&mut cursor, "009", 1);
+        assert_next_dfs(&mut cursor, "010", -2);
+
+        assert!(cursor.next_dfs().expect("Should parse next dfs").is_none());
+        assert!(cursor.current().is_none());
+    }
+
+    #[test]
+    fn test_cursor_next_sibling_no_sibling_ptr() {
+        let info_buf = &entries_cursor_tests_debug_info_buf();
+        let debug_info = DebugInfo::new(info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
+        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+
+        assert_next_dfs(&mut cursor, "001", 0);
+
+        // Down to the first child of the root entry.
+
+        assert_next_dfs(&mut cursor, "002", 1);
+
+        // Now iterate all children of the root via `next_sibling`.
+
+        assert_next_sibling(&mut cursor, "004");
+        assert_next_sibling(&mut cursor, "007");
+        assert_next_sibling(&mut cursor, "010");
+
+        // There should be no more siblings.
+
+        assert!(cursor
+            .next_sibling()
+            .expect("Should parse next sibling")
+            .is_none());
+        assert!(cursor.current().is_none());
+    }
+
+    #[test]
+    fn test_cursor_next_sibling_continuation() {
+        let info_buf = &entries_cursor_tests_debug_info_buf();
+        let debug_info = DebugInfo::new(info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
+        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+
+        assert_next_dfs(&mut cursor, "001", 0);
+
+        // Down to the first child of the root entry.
+
+        assert_next_dfs(&mut cursor, "002", 1);
+
+        // Get the next sibling, then iterate its children
+
+        assert_next_sibling(&mut cursor, "004");
+        assert_next_dfs(&mut cursor, "005", 1);
+        assert_next_sibling(&mut cursor, "006");
+        assert!(cursor
+            .next_sibling()
+            .expect("Should parse next sibling")
+            .is_none());
+        assert!(cursor
+            .next_sibling()
+            .expect("Should parse next sibling")
+            .is_none());
+        assert!(cursor
+            .next_sibling()
+            .expect("Should parse next sibling")
+            .is_none());
+        assert!(cursor
+            .next_sibling()
+            .expect("Should parse next sibling")
+            .is_none());
+
+        // And we should be able to continue with the children of the root entry.
+
+        assert_next_dfs(&mut cursor, "007", -1);
+        assert_next_sibling(&mut cursor, "010");
+
+        // There should be no more siblings.
+
+        assert!(cursor
+            .next_sibling()
+            .expect("Should parse next sibling")
+            .is_none());
+        assert!(cursor.current().is_none());
+    }
+
+    fn entries_cursor_sibling_abbrev_buf() -> Vec<u8> {
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .abbrev(1, DW_TAG_subprogram, DW_CHILDREN_yes)
+                .abbrev_attr(DW_AT_name, DW_FORM_string)
+                .abbrev_attr(DW_AT_sibling, DW_FORM_ref1)
+                .abbrev_attr_null()
+            .abbrev(2, DW_TAG_subprogram, DW_CHILDREN_yes)
+                .abbrev_attr(DW_AT_name, DW_FORM_string)
+                .abbrev_attr_null()
+                .abbrev_null();
+        section.get_contents().unwrap()
+    }
+
+    fn entries_cursor_sibling_entries_buf(header_size: usize) -> Vec<u8> {
+        let start = Label::new();
+        let sibling004_ref = Label::new();
+        let sibling004 = Label::new();
+        let sibling009_ref = Label::new();
+        let sibling009 = Label::new();
+
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .mark(&start)
+            .die(2, |s| s.attr_string("001"))
+                // Valid sibling attribute.
+                .die(1, |s| s.attr_string("002").D8(&sibling004_ref))
+                    // Invalid code to ensure the sibling attribute was used.
+                    .die(10, |s| s.attr_string("003"))
+                        .die_null()
+                    .die_null()
+                .mark(&sibling004)
+                // Invalid sibling attribute.
+                .die(1, |s| s.attr_string("004").attr_ref1(255))
+                    .die(2, |s| s.attr_string("005"))
+                        .die_null()
+                    .die_null()
+                // Sibling attribute in child only.
+                .die(2, |s| s.attr_string("006"))
+                    // Valid sibling attribute.
+                    .die(1, |s| s.attr_string("007").D8(&sibling009_ref))
+                        // Invalid code to ensure the sibling attribute was used.
+                        .die(10, |s| s.attr_string("008"))
+                            .die_null()
+                        .die_null()
+                    .mark(&sibling009)
+                    .die(2, |s| s.attr_string("009"))
+                        .die_null()
+                    .die_null()
+                // No sibling attribute.
+                .die(2, |s| s.attr_string("010"))
+                    .die(2, |s| s.attr_string("011"))
+                        .die_null()
+                    .die_null()
+                .die_null();
+
+        let offset = header_size as u64 + (&sibling004 - &start) as u64;
+        sibling004_ref.set_const(offset);
+
+        let offset = header_size as u64 + (&sibling009 - &start) as u64;
+        sibling009_ref.set_const(offset);
+
+        section.get_contents().unwrap()
+    }
+
+    fn test_cursor_next_sibling_with_ptr(cursor: &mut EntriesCursor<EndianSlice<LittleEndian>>) {
+        assert_next_dfs(cursor, "001", 0);
+
+        // Down to the first child of the root.
+
+        assert_next_dfs(cursor, "002", 1);
+
+        // Now iterate all children of the root via `next_sibling`.
+
+        assert_valid_sibling_ptr(&cursor);
+        assert_next_sibling(cursor, "004");
+        assert_next_sibling(cursor, "006");
+        assert_next_sibling(cursor, "010");
+
+        // There should be no more siblings.
+
+        assert!(cursor
+            .next_sibling()
+            .expect("Should parse next sibling")
+            .is_none());
+        assert!(cursor.current().is_none());
+    }
+
+    #[test]
+    fn test_debug_info_next_sibling_with_ptr() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(&[], LittleEndian),
+        };
+        let header_size = unit.size_of_header();
+        let entries_buf = entries_cursor_sibling_entries_buf(header_size);
+        unit.entries_buf = EndianSlice::new(&entries_buf, LittleEndian);
+        let section = Section::with_endian(Endian::Little).unit(&mut unit);
+        let info_buf = section.get_contents().unwrap();
+        let debug_info = DebugInfo::new(&info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrev_buf = entries_cursor_sibling_abbrev_buf();
+        let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        test_cursor_next_sibling_with_ptr(&mut cursor);
+    }
+
+    #[test]
+    fn test_debug_types_next_sibling_with_ptr() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Type {
+                type_signature: DebugTypeSignature(0),
+                type_offset: UnitOffset(0),
+            },
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugTypesOffset(0).into(),
+            entries_buf: EndianSlice::new(&[], LittleEndian),
+        };
+        let header_size = unit.size_of_header();
+        let entries_buf = entries_cursor_sibling_entries_buf(header_size);
+        unit.entries_buf = EndianSlice::new(&entries_buf, LittleEndian);
+        let section = Section::with_endian(Endian::Little).unit(&mut unit);
+        let info_buf = section.get_contents().unwrap();
+        let debug_types = DebugTypes::new(&info_buf, LittleEndian);
+
+        let unit = debug_types
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrev_buf = entries_cursor_sibling_abbrev_buf();
+        let debug_abbrev = DebugAbbrev::new(&abbrev_buf, LittleEndian);
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        test_cursor_next_sibling_with_ptr(&mut cursor);
+    }
+
+    #[test]
+    fn test_entries_at_offset() {
+        let info_buf = &entries_cursor_tests_debug_info_buf();
+        let debug_info = DebugInfo::new(info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrevs_buf = &entries_cursor_tests_abbrev_buf();
+        let debug_abbrev = DebugAbbrev::new(abbrevs_buf, LittleEndian);
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit
+            .entries_at_offset(&abbrevs, UnitOffset(unit.header_size()))
+            .unwrap();
+        assert_next_entry(&mut cursor, "001");
+
+        let cursor = unit.entries_at_offset(&abbrevs, UnitOffset(0));
+        match cursor {
+            Err(Error::OffsetOutOfBounds) => {}
+            otherwise => {
+                assert!(false, "Unexpected parse result = {:#?}", otherwise);
+            }
+        }
+    }
+
+    fn entries_tree_tests_debug_abbrevs_buf() -> Vec<u8> {
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .abbrev(1, DW_TAG_subprogram, DW_CHILDREN_yes)
+                .abbrev_attr(DW_AT_name, DW_FORM_string)
+                .abbrev_attr_null()
+            .abbrev(2, DW_TAG_subprogram, DW_CHILDREN_no)
+                .abbrev_attr(DW_AT_name, DW_FORM_string)
+                .abbrev_attr_null()
+            .abbrev_null()
+            .get_contents()
+            .unwrap();
+        section
+    }
+
+    fn entries_tree_tests_debug_info_buf(header_size: usize) -> (Vec<u8>, UnitOffset) {
+        let start = Label::new();
+        let entry2 = Label::new();
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .mark(&start)
+            .die(1, |s| s.attr_string("root"))
+                .die(1, |s| s.attr_string("1"))
+                    .die(1, |s| s.attr_string("1a"))
+                        .die_null()
+                    .die(2, |s| s.attr_string("1b"))
+                    .die_null()
+                .mark(&entry2)
+                .die(1, |s| s.attr_string("2"))
+                    .die(1, |s| s.attr_string("2a"))
+                        .die(1, |s| s.attr_string("2a1"))
+                            .die_null()
+                        .die_null()
+                    .die(1, |s| s.attr_string("2b"))
+                        .die(2, |s| s.attr_string("2b1"))
+                        .die_null()
+                    .die_null()
+                .die(1, |s| s.attr_string("3"))
+                    .die(1, |s| s.attr_string("3a"))
+                        .die(2, |s| s.attr_string("3a1"))
+                        .die(2, |s| s.attr_string("3a2"))
+                        .die_null()
+                    .die(2, |s| s.attr_string("3b"))
+                    .die_null()
+                .die(2, |s| s.attr_string("final"))
+                .die_null()
+            .get_contents()
+            .unwrap();
+        let entry2 = UnitOffset(header_size + (&entry2 - &start) as usize);
+        (section, entry2)
+    }
+
+    #[test]
+    fn test_entries_tree() {
+        fn assert_entry<'input, 'abbrev, 'unit, 'tree, Endian>(
+            node: Result<
+                Option<EntriesTreeNode<'abbrev, 'unit, 'tree, EndianSlice<'input, Endian>>>,
+            >,
+            name: &str,
+        ) -> EntriesTreeIter<'abbrev, 'unit, 'tree, EndianSlice<'input, Endian>>
+        where
+            Endian: Endianity,
+        {
+            let node = node
+                .expect("Should parse entry")
+                .expect("Should have entry");
+            assert_entry_name(node.entry(), name);
+            node.children()
+        }
+
+        fn assert_null<E: Endianity>(node: Result<Option<EntriesTreeNode<EndianSlice<E>>>>) {
+            match node {
+                Ok(None) => {}
+                otherwise => {
+                    assert!(false, "Unexpected parse result = {:#?}", otherwise);
+                }
+            }
+        }
+
+        let abbrevs_buf = entries_tree_tests_debug_abbrevs_buf();
+        let debug_abbrev = DebugAbbrev::new(&abbrevs_buf, LittleEndian);
+
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(&[], LittleEndian),
+        };
+        let header_size = unit.size_of_header();
+        let (entries_buf, entry2) = entries_tree_tests_debug_info_buf(header_size);
+        unit.entries_buf = EndianSlice::new(&entries_buf, LittleEndian);
+        let info_buf = Section::with_endian(Endian::Little)
+            .unit(&mut unit)
+            .get_contents()
+            .unwrap();
+        let debug_info = DebugInfo::new(&info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("Should parse unit")
+            .expect("and it should be some");
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+        let mut tree = unit
+            .entries_tree(&abbrevs, None)
+            .expect("Should have entries tree");
+
+        // Test we can restart iteration of the tree.
+        {
+            let mut iter = assert_entry(tree.root().map(Some), "root");
+            assert_entry(iter.next(), "1");
+        }
+        {
+            let mut iter = assert_entry(tree.root().map(Some), "root");
+            assert_entry(iter.next(), "1");
+        }
+
+        let mut iter = assert_entry(tree.root().map(Some), "root");
+        {
+            // Test iteration with children.
+            let mut iter = assert_entry(iter.next(), "1");
+            {
+                // Test iteration with children flag, but no children.
+                let mut iter = assert_entry(iter.next(), "1a");
+                assert_null(iter.next());
+                assert_null(iter.next());
+            }
+            {
+                // Test iteration without children flag.
+                let mut iter = assert_entry(iter.next(), "1b");
+                assert_null(iter.next());
+                assert_null(iter.next());
+            }
+            assert_null(iter.next());
+            assert_null(iter.next());
+        }
+        {
+            // Test skipping over children.
+            let mut iter = assert_entry(iter.next(), "2");
+            assert_entry(iter.next(), "2a");
+            assert_entry(iter.next(), "2b");
+            assert_null(iter.next());
+        }
+        {
+            // Test skipping after partial iteration.
+            let mut iter = assert_entry(iter.next(), "3");
+            {
+                let mut iter = assert_entry(iter.next(), "3a");
+                assert_entry(iter.next(), "3a1");
+                // Parent iter should be able to skip over "3a2".
+            }
+            assert_entry(iter.next(), "3b");
+            assert_null(iter.next());
+        }
+        assert_entry(iter.next(), "final");
+        assert_null(iter.next());
+
+        // Test starting at an offset.
+        let mut tree = unit
+            .entries_tree(&abbrevs, Some(entry2))
+            .expect("Should have entries tree");
+        let mut iter = assert_entry(tree.root().map(Some), "2");
+        assert_entry(iter.next(), "2a");
+        assert_entry(iter.next(), "2b");
+        assert_null(iter.next());
+    }
+
+    #[test]
+    fn test_entries_raw() {
+        fn assert_abbrev<'input, 'abbrev, 'unit, Endian>(
+            entries: &mut EntriesRaw<'abbrev, 'unit, EndianSlice<'input, Endian>>,
+            tag: DwTag,
+        ) -> &'abbrev Abbreviation
+        where
+            Endian: Endianity,
+        {
+            let abbrev = entries
+                .read_abbreviation()
+                .expect("Should parse abbrev")
+                .expect("Should have abbrev");
+            assert_eq!(abbrev.tag(), tag);
+            abbrev
+        }
+
+        fn assert_null<'input, 'abbrev, 'unit, Endian>(
+            entries: &mut EntriesRaw<'abbrev, 'unit, EndianSlice<'input, Endian>>,
+        ) where
+            Endian: Endianity,
+        {
+            match entries.read_abbreviation() {
+                Ok(None) => {}
+                otherwise => {
+                    assert!(false, "Unexpected parse result = {:#?}", otherwise);
+                }
+            }
+        }
+
+        fn assert_attr<'input, 'abbrev, 'unit, Endian>(
+            entries: &mut EntriesRaw<'abbrev, 'unit, EndianSlice<'input, Endian>>,
+            spec: Option<AttributeSpecification>,
+            name: DwAt,
+            value: &str,
+        ) where
+            Endian: Endianity,
+        {
+            let spec = spec.expect("Should have attribute specification");
+            let attr = entries
+                .read_attribute(spec)
+                .expect("Should parse attribute");
+            assert_eq!(attr.name(), name);
+            assert_eq!(
+                attr.value(),
+                AttributeValue::String(EndianSlice::new(value.as_bytes(), Endian::default()))
+            );
+        }
+
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .abbrev(1, DW_TAG_subprogram, DW_CHILDREN_yes)
+                .abbrev_attr(DW_AT_name, DW_FORM_string)
+                .abbrev_attr(DW_AT_linkage_name, DW_FORM_string)
+                .abbrev_attr_null()
+            .abbrev(2, DW_TAG_variable, DW_CHILDREN_no)
+                .abbrev_attr(DW_AT_name, DW_FORM_string)
+                .abbrev_attr_null()
+            .abbrev_null();
+        let abbrevs_buf = section.get_contents().unwrap();
+        let debug_abbrev = DebugAbbrev::new(&abbrevs_buf, LittleEndian);
+
+        #[rustfmt::skip]
+        let section = Section::with_endian(Endian::Little)
+            .die(1, |s| s.attr_string("f1").attr_string("l1"))
+                .die(2, |s| s.attr_string("v1"))
+                .die(2, |s| s.attr_string("v2"))
+                .die(1, |s| s.attr_string("f2").attr_string("l2"))
+                    .die_null()
+                .die_null();
+        let entries_buf = section.get_contents().unwrap();
+
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(&entries_buf, LittleEndian),
+        };
+        let section = Section::with_endian(Endian::Little).unit(&mut unit);
+        let info_buf = section.get_contents().unwrap();
+        let debug_info = DebugInfo::new(&info_buf, LittleEndian);
+
+        let unit = debug_info
+            .units()
+            .next()
+            .expect("should have a unit result")
+            .expect("and it should be ok");
+
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut entries = unit
+            .entries_raw(&abbrevs, None)
+            .expect("Should have entries");
+
+        assert_eq!(entries.next_depth(), 0);
+        let abbrev = assert_abbrev(&mut entries, DW_TAG_subprogram);
+        let mut attrs = abbrev.attributes().iter().copied();
+        assert_attr(&mut entries, attrs.next(), DW_AT_name, "f1");
+        assert_attr(&mut entries, attrs.next(), DW_AT_linkage_name, "l1");
+        assert!(attrs.next().is_none());
+
+        assert_eq!(entries.next_depth(), 1);
+        let abbrev = assert_abbrev(&mut entries, DW_TAG_variable);
+        let mut attrs = abbrev.attributes().iter().copied();
+        assert_attr(&mut entries, attrs.next(), DW_AT_name, "v1");
+        assert!(attrs.next().is_none());
+
+        assert_eq!(entries.next_depth(), 1);
+        let abbrev = assert_abbrev(&mut entries, DW_TAG_variable);
+        let mut attrs = abbrev.attributes().iter().copied();
+        assert_attr(&mut entries, attrs.next(), DW_AT_name, "v2");
+        assert!(attrs.next().is_none());
+
+        assert_eq!(entries.next_depth(), 1);
+        let abbrev = assert_abbrev(&mut entries, DW_TAG_subprogram);
+        let mut attrs = abbrev.attributes().iter().copied();
+        assert_attr(&mut entries, attrs.next(), DW_AT_name, "f2");
+        assert_attr(&mut entries, attrs.next(), DW_AT_linkage_name, "l2");
+        assert!(attrs.next().is_none());
+
+        assert_eq!(entries.next_depth(), 2);
+        assert_null(&mut entries);
+
+        assert_eq!(entries.next_depth(), 1);
+        assert_null(&mut entries);
+
+        assert_eq!(entries.next_depth(), 0);
+        assert!(entries.is_empty());
+    }
+
+    #[test]
+    fn test_debug_info_offset() {
+        let padding = &[0; 10];
+        let entries = &[0; 20];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(entries, LittleEndian),
+        };
+        Section::with_endian(Endian::Little)
+            .append_bytes(padding)
+            .unit(&mut unit);
+        let offset = padding.len();
+        let header_length = unit.size_of_header();
+        let length = unit.length_including_self();
+        assert_eq!(DebugInfoOffset(0).to_unit_offset(&unit), None);
+        assert_eq!(DebugInfoOffset(offset - 1).to_unit_offset(&unit), None);
+        assert_eq!(DebugInfoOffset(offset).to_unit_offset(&unit), None);
+        assert_eq!(
+            DebugInfoOffset(offset + header_length - 1).to_unit_offset(&unit),
+            None
+        );
+        assert_eq!(
+            DebugInfoOffset(offset + header_length).to_unit_offset(&unit),
+            Some(UnitOffset(header_length))
+        );
+        assert_eq!(
+            DebugInfoOffset(offset + length - 1).to_unit_offset(&unit),
+            Some(UnitOffset(length - 1))
+        );
+        assert_eq!(DebugInfoOffset(offset + length).to_unit_offset(&unit), None);
+        assert_eq!(
+            UnitOffset(header_length).to_debug_info_offset(&unit),
+            Some(DebugInfoOffset(offset + header_length))
+        );
+        assert_eq!(
+            UnitOffset(length - 1).to_debug_info_offset(&unit),
+            Some(DebugInfoOffset(offset + length - 1))
+        );
+    }
+
+    #[test]
+    fn test_debug_types_offset() {
+        let padding = &[0; 10];
+        let entries = &[0; 20];
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Type {
+                type_signature: DebugTypeSignature(0),
+                type_offset: UnitOffset(0),
+            },
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugTypesOffset(0).into(),
+            entries_buf: EndianSlice::new(entries, LittleEndian),
+        };
+        Section::with_endian(Endian::Little)
+            .append_bytes(padding)
+            .unit(&mut unit);
+        let offset = padding.len();
+        let header_length = unit.size_of_header();
+        let length = unit.length_including_self();
+        assert_eq!(DebugTypesOffset(0).to_unit_offset(&unit), None);
+        assert_eq!(DebugTypesOffset(offset - 1).to_unit_offset(&unit), None);
+        assert_eq!(DebugTypesOffset(offset).to_unit_offset(&unit), None);
+        assert_eq!(
+            DebugTypesOffset(offset + header_length - 1).to_unit_offset(&unit),
+            None
+        );
+        assert_eq!(
+            DebugTypesOffset(offset + header_length).to_unit_offset(&unit),
+            Some(UnitOffset(header_length))
+        );
+        assert_eq!(
+            DebugTypesOffset(offset + length - 1).to_unit_offset(&unit),
+            Some(UnitOffset(length - 1))
+        );
+        assert_eq!(
+            DebugTypesOffset(offset + length).to_unit_offset(&unit),
+            None
+        );
+        assert_eq!(
+            UnitOffset(header_length).to_debug_types_offset(&unit),
+            Some(DebugTypesOffset(offset + header_length))
+        );
+        assert_eq!(
+            UnitOffset(length - 1).to_debug_types_offset(&unit),
+            Some(DebugTypesOffset(offset + length - 1))
+        );
+    }
+
+    #[test]
+    fn test_length_including_self() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let mut unit = UnitHeader {
+            encoding,
+            unit_length: 0,
+            unit_type: UnitType::Compilation,
+            debug_abbrev_offset: DebugAbbrevOffset(0),
+            unit_offset: DebugInfoOffset(0).into(),
+            entries_buf: EndianSlice::new(&[], LittleEndian),
+        };
+        unit.encoding.format = Format::Dwarf32;
+        assert_eq!(unit.length_including_self(), 4);
+        unit.encoding.format = Format::Dwarf64;
+        assert_eq!(unit.length_including_self(), 12);
+        unit.unit_length = 10;
+        assert_eq!(unit.length_including_self(), 22);
+    }
+
+    #[test]
+    fn test_parse_type_unit_abbrevs() {
+        let types_buf = [
+            // Type unit header
+            0x25, 0x00, 0x00, 0x00, // 32-bit unit length = 37
+            0x04, 0x00, // Version 4
+            0x00, 0x00, 0x00, 0x00, // debug_abbrev_offset
+            0x04, // Address size
+            0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // Type signature
+            0x01, 0x02, 0x03, 0x04, // Type offset
+            // DIEs
+            // Abbreviation code
+            0x01, // Attribute of form DW_FORM_string = "foo\0"
+            0x66, 0x6f, 0x6f, 0x00, // Children
+            // Abbreviation code
+            0x01, // Attribute of form DW_FORM_string = "foo\0"
+            0x66, 0x6f, 0x6f, 0x00, // Children
+            // Abbreviation code
+            0x01, // Attribute of form DW_FORM_string = "foo\0"
+            0x66, 0x6f, 0x6f, 0x00, // Children
+            0x00, // End of children
+            0x00, // End of children
+            0x00, // End of children
+        ];
+        let debug_types = DebugTypes::new(&types_buf, LittleEndian);
+
+        let abbrev_buf = [
+            // Code
+            0x01, // DW_TAG_subprogram
+            0x2e, // DW_CHILDREN_yes
+            0x01, // Begin attributes
+            0x03, // Attribute name = DW_AT_name
+            0x08, // Attribute form = DW_FORM_string
+            0x00, 0x00, // End attributes
+            0x00, // Null terminator
+        ];
+
+        let get_some_type_unit = || debug_types.units().next().unwrap().unwrap();
+
+        let unit = get_some_type_unit();
+
+        let read_debug_abbrev_section_somehow = || &abbrev_buf;
+        let debug_abbrev = DebugAbbrev::new(read_debug_abbrev_section_somehow(), LittleEndian);
+        let _abbrevs_for_unit = unit.abbreviations(&debug_abbrev).unwrap();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/read/value.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/read/value.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1620 @@
+//! Definitions for values used in DWARF expressions.
+
+use core::mem;
+
+use crate::constants;
+use crate::read::{AttributeValue, DebuggingInformationEntry, Error, Reader, Result};
+
+/// Convert a u64 to an i64, with sign extension if required.
+///
+/// This is primarily used when needing to treat `Value::Generic`
+/// as a signed value.
+#[inline]
+fn sign_extend(value: u64, mask: u64) -> i64 {
+    let value = (value & mask) as i64;
+    let sign = ((mask >> 1) + 1) as i64;
+    (value ^ sign).wrapping_sub(sign)
+}
+
+#[inline]
+fn mask_bit_size(addr_mask: u64) -> u32 {
+    64 - addr_mask.leading_zeros()
+}
+
+/// The type of an entry on the DWARF stack.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ValueType {
+    /// The generic type, which is address-sized and of unspecified sign,
+    /// as specified in the DWARF 5 standard, section 2.5.1.
+    /// This type is also used to represent address base types.
+    Generic,
+    /// Signed 8-bit integer type.
+    I8,
+    /// Unsigned 8-bit integer type.
+    U8,
+    /// Signed 16-bit integer type.
+    I16,
+    /// Unsigned 16-bit integer type.
+    U16,
+    /// Signed 32-bit integer type.
+    I32,
+    /// Unsigned 32-bit integer type.
+    U32,
+    /// Signed 64-bit integer type.
+    I64,
+    /// Unsigned 64-bit integer type.
+    U64,
+    /// 32-bit floating point type.
+    F32,
+    /// 64-bit floating point type.
+    F64,
+}
+
+/// The value of an entry on the DWARF stack.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Value {
+    /// A generic value, which is address-sized and of unspecified sign.
+    Generic(u64),
+    /// A signed 8-bit integer value.
+    I8(i8),
+    /// An unsigned 8-bit integer value.
+    U8(u8),
+    /// A signed 16-bit integer value.
+    I16(i16),
+    /// An unsigned 16-bit integer value.
+    U16(u16),
+    /// A signed 32-bit integer value.
+    I32(i32),
+    /// An unsigned 32-bit integer value.
+    U32(u32),
+    /// A signed 64-bit integer value.
+    I64(i64),
+    /// An unsigned 64-bit integer value.
+    U64(u64),
+    /// A 32-bit floating point value.
+    F32(f32),
+    /// A 64-bit floating point value.
+    F64(f64),
+}
+
+impl ValueType {
+    /// The size in bits of a value for this type.
+    pub fn bit_size(self, addr_mask: u64) -> u32 {
+        match self {
+            ValueType::Generic => mask_bit_size(addr_mask),
+            ValueType::I8 | ValueType::U8 => 8,
+            ValueType::I16 | ValueType::U16 => 16,
+            ValueType::I32 | ValueType::U32 | ValueType::F32 => 32,
+            ValueType::I64 | ValueType::U64 | ValueType::F64 => 64,
+        }
+    }
+
+    /// Construct a `ValueType` from the attributes of a base type DIE.
+    pub fn from_encoding(encoding: constants::DwAte, byte_size: u64) -> Option<ValueType> {
+        Some(match (encoding, byte_size) {
+            (constants::DW_ATE_signed, 1) => ValueType::I8,
+            (constants::DW_ATE_signed, 2) => ValueType::I16,
+            (constants::DW_ATE_signed, 4) => ValueType::I32,
+            (constants::DW_ATE_signed, 8) => ValueType::I64,
+            (constants::DW_ATE_unsigned, 1) => ValueType::U8,
+            (constants::DW_ATE_unsigned, 2) => ValueType::U16,
+            (constants::DW_ATE_unsigned, 4) => ValueType::U32,
+            (constants::DW_ATE_unsigned, 8) => ValueType::U64,
+            (constants::DW_ATE_float, 4) => ValueType::F32,
+            (constants::DW_ATE_float, 8) => ValueType::F64,
+            _ => return None,
+        })
+    }
+
+    /// Construct a `ValueType` from a base type DIE.
+    pub fn from_entry<R: Reader>(
+        entry: &DebuggingInformationEntry<R>,
+    ) -> Result<Option<ValueType>> {
+        if entry.tag() != constants::DW_TAG_base_type {
+            return Ok(None);
+        }
+        let mut encoding = None;
+        let mut byte_size = None;
+        let mut endianity = constants::DW_END_default;
+        let mut attrs = entry.attrs();
+        while let Some(attr) = attrs.next()? {
+            match attr.name() {
+                constants::DW_AT_byte_size => byte_size = attr.udata_value(),
+                constants::DW_AT_encoding => {
+                    if let AttributeValue::Encoding(x) = attr.value() {
+                        encoding = Some(x);
+                    }
+                }
+                constants::DW_AT_endianity => {
+                    if let AttributeValue::Endianity(x) = attr.value() {
+                        endianity = x;
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        if endianity != constants::DW_END_default {
+            // TODO: we could check if it matches the reader endianity,
+            // but normally it would use DW_END_default in that case.
+            return Ok(None);
+        }
+
+        if let (Some(encoding), Some(byte_size)) = (encoding, byte_size) {
+            Ok(ValueType::from_encoding(encoding, byte_size))
+        } else {
+            Ok(None)
+        }
+    }
+}
+
+impl Value {
+    /// Return the `ValueType` corresponding to this `Value`.
+    pub fn value_type(&self) -> ValueType {
+        match *self {
+            Value::Generic(_) => ValueType::Generic,
+            Value::I8(_) => ValueType::I8,
+            Value::U8(_) => ValueType::U8,
+            Value::I16(_) => ValueType::I16,
+            Value::U16(_) => ValueType::U16,
+            Value::I32(_) => ValueType::I32,
+            Value::U32(_) => ValueType::U32,
+            Value::I64(_) => ValueType::I64,
+            Value::U64(_) => ValueType::U64,
+            Value::F32(_) => ValueType::F32,
+            Value::F64(_) => ValueType::F64,
+        }
+    }
+
+    /// Read a `Value` with the given `value_type` from a `Reader`.
+    pub fn parse<R: Reader>(value_type: ValueType, mut bytes: R) -> Result<Value> {
+        let value = match value_type {
+            ValueType::I8 => Value::I8(bytes.read_i8()?),
+            ValueType::U8 => Value::U8(bytes.read_u8()?),
+            ValueType::I16 => Value::I16(bytes.read_i16()?),
+            ValueType::U16 => Value::U16(bytes.read_u16()?),
+            ValueType::I32 => Value::I32(bytes.read_i32()?),
+            ValueType::U32 => Value::U32(bytes.read_u32()?),
+            ValueType::I64 => Value::I64(bytes.read_i64()?),
+            ValueType::U64 => Value::U64(bytes.read_u64()?),
+            ValueType::F32 => Value::F32(bytes.read_f32()?),
+            ValueType::F64 => Value::F64(bytes.read_f64()?),
+            _ => return Err(Error::UnsupportedTypeOperation),
+        };
+        Ok(value)
+    }
+
+    /// Convert a `Value` to a `u64`.
+    ///
+    /// The `ValueType` of `self` must be integral.
+    /// Values are sign extended if the source value is signed.
+    pub fn to_u64(self, addr_mask: u64) -> Result<u64> {
+        let value = match self {
+            Value::Generic(value) => value & addr_mask,
+            Value::I8(value) => value as u64,
+            Value::U8(value) => u64::from(value),
+            Value::I16(value) => value as u64,
+            Value::U16(value) => u64::from(value),
+            Value::I32(value) => value as u64,
+            Value::U32(value) => u64::from(value),
+            Value::I64(value) => value as u64,
+            Value::U64(value) => value as u64,
+            _ => return Err(Error::IntegralTypeRequired),
+        };
+        Ok(value)
+    }
+
+    /// Create a `Value` with the given `value_type` from a `u64` value.
+    ///
+    /// The `value_type` may be integral or floating point.
+    /// The result is truncated if the `u64` value does
+    /// not fit the bounds of the `value_type`.
+    pub fn from_u64(value_type: ValueType, value: u64) -> Result<Value> {
+        let value = match value_type {
+            ValueType::Generic => Value::Generic(value),
+            ValueType::I8 => Value::I8(value as i8),
+            ValueType::U8 => Value::U8(value as u8),
+            ValueType::I16 => Value::I16(value as i16),
+            ValueType::U16 => Value::U16(value as u16),
+            ValueType::I32 => Value::I32(value as i32),
+            ValueType::U32 => Value::U32(value as u32),
+            ValueType::I64 => Value::I64(value as i64),
+            ValueType::U64 => Value::U64(value),
+            ValueType::F32 => Value::F32(value as f32),
+            ValueType::F64 => Value::F64(value as f64),
+        };
+        Ok(value)
+    }
+
+    /// Create a `Value` with the given `value_type` from a `f32` value.
+    ///
+    /// The `value_type` may be integral or floating point.
+    /// The result is not defined if the `f32` value does
+    /// not fit the bounds of the `value_type`.
+    fn from_f32(value_type: ValueType, value: f32) -> Result<Value> {
+        let value = match value_type {
+            ValueType::Generic => Value::Generic(value as u64),
+            ValueType::I8 => Value::I8(value as i8),
+            ValueType::U8 => Value::U8(value as u8),
+            ValueType::I16 => Value::I16(value as i16),
+            ValueType::U16 => Value::U16(value as u16),
+            ValueType::I32 => Value::I32(value as i32),
+            ValueType::U32 => Value::U32(value as u32),
+            ValueType::I64 => Value::I64(value as i64),
+            ValueType::U64 => Value::U64(value as u64),
+            ValueType::F32 => Value::F32(value),
+            ValueType::F64 => Value::F64(f64::from(value)),
+        };
+        Ok(value)
+    }
+
+    /// Create a `Value` with the given `value_type` from a `f64` value.
+    ///
+    /// The `value_type` may be integral or floating point.
+    /// The result is not defined if the `f64` value does
+    /// not fit the bounds of the `value_type`.
+    fn from_f64(value_type: ValueType, value: f64) -> Result<Value> {
+        let value = match value_type {
+            ValueType::Generic => Value::Generic(value as u64),
+            ValueType::I8 => Value::I8(value as i8),
+            ValueType::U8 => Value::U8(value as u8),
+            ValueType::I16 => Value::I16(value as i16),
+            ValueType::U16 => Value::U16(value as u16),
+            ValueType::I32 => Value::I32(value as i32),
+            ValueType::U32 => Value::U32(value as u32),
+            ValueType::I64 => Value::I64(value as i64),
+            ValueType::U64 => Value::U64(value as u64),
+            ValueType::F32 => Value::F32(value as f32),
+            ValueType::F64 => Value::F64(value),
+        };
+        Ok(value)
+    }
+
+    /// Convert a `Value` to the given `value_type`.
+    ///
+    /// When converting between integral types, the result is truncated
+    /// if the source value does not fit the bounds of the `value_type`.
+    /// When converting from floating point types, the result is not defined
+    /// if the source value does not fit the bounds of the `value_type`.
+    ///
+    /// This corresponds to the DWARF `DW_OP_convert` operation.
+    pub fn convert(self, value_type: ValueType, addr_mask: u64) -> Result<Value> {
+        match self {
+            Value::F32(value) => Value::from_f32(value_type, value),
+            Value::F64(value) => Value::from_f64(value_type, value),
+            _ => Value::from_u64(value_type, self.to_u64(addr_mask)?),
+        }
+    }
+
+    /// Reinterpret the bits in a `Value` as the given `value_type`.
+    ///
+    /// The source and result value types must have equal sizes.
+    ///
+    /// This corresponds to the DWARF `DW_OP_reinterpret` operation.
+    pub fn reinterpret(self, value_type: ValueType, addr_mask: u64) -> Result<Value> {
+        if self.value_type().bit_size(addr_mask) != value_type.bit_size(addr_mask) {
+            return Err(Error::TypeMismatch);
+        }
+        let bits = match self {
+            Value::Generic(value) => value,
+            Value::I8(value) => value as u64,
+            Value::U8(value) => u64::from(value),
+            Value::I16(value) => value as u64,
+            Value::U16(value) => u64::from(value),
+            Value::I32(value) => value as u64,
+            Value::U32(value) => u64::from(value),
+            Value::I64(value) => value as u64,
+            Value::U64(value) => value,
+            Value::F32(value) => u64::from(unsafe { mem::transmute::<f32, u32>(value) }),
+            Value::F64(value) => unsafe { mem::transmute(value) },
+        };
+        let value = match value_type {
+            ValueType::Generic => Value::Generic(bits),
+            ValueType::I8 => Value::I8(bits as i8),
+            ValueType::U8 => Value::U8(bits as u8),
+            ValueType::I16 => Value::I16(bits as i16),
+            ValueType::U16 => Value::U16(bits as u16),
+            ValueType::I32 => Value::I32(bits as i32),
+            ValueType::U32 => Value::U32(bits as u32),
+            ValueType::I64 => Value::I64(bits as i64),
+            ValueType::U64 => Value::U64(bits),
+            ValueType::F32 => Value::F32(f32::from_bits(bits as u32)),
+            ValueType::F64 => Value::F64(f64::from_bits(bits)),
+        };
+        Ok(value)
+    }
+
+    /// Perform an absolute value operation.
+    ///
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_abs` operation.
+    pub fn abs(self, addr_mask: u64) -> Result<Value> {
+        // wrapping_abs() can be used because DWARF specifies that the result is undefined
+        // for negative minimal values.
+        let value = match self {
+            Value::Generic(value) => {
+                Value::Generic(sign_extend(value, addr_mask).wrapping_abs() as u64)
+            }
+            Value::I8(value) => Value::I8(value.wrapping_abs()),
+            Value::I16(value) => Value::I16(value.wrapping_abs()),
+            Value::I32(value) => Value::I32(value.wrapping_abs()),
+            Value::I64(value) => Value::I64(value.wrapping_abs()),
+            // f32/f64::abs() is not available in libcore
+            Value::F32(value) => Value::F32(if value < 0. { -value } else { value }),
+            Value::F64(value) => Value::F64(if value < 0. { -value } else { value }),
+            Value::U8(_) | Value::U16(_) | Value::U32(_) | Value::U64(_) => self,
+        };
+        Ok(value)
+    }
+
+    /// Perform a negation operation.
+    ///
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_neg` operation.
+    pub fn neg(self, addr_mask: u64) -> Result<Value> {
+        // wrapping_neg() can be used because DWARF specifies that the result is undefined
+        // for negative minimal values.
+        let value = match self {
+            Value::Generic(value) => {
+                Value::Generic(sign_extend(value, addr_mask).wrapping_neg() as u64)
+            }
+            Value::I8(value) => Value::I8(value.wrapping_neg()),
+            Value::I16(value) => Value::I16(value.wrapping_neg()),
+            Value::I32(value) => Value::I32(value.wrapping_neg()),
+            Value::I64(value) => Value::I64(value.wrapping_neg()),
+            Value::F32(value) => Value::F32(-value),
+            Value::F64(value) => Value::F64(-value),
+            // It's unclear if these should implicity convert to a signed value.
+            // For now, we don't support them.
+            Value::U8(_) | Value::U16(_) | Value::U32(_) | Value::U64(_) => {
+                return Err(Error::UnsupportedTypeOperation);
+            }
+        };
+        Ok(value)
+    }
+
+    /// Perform an addition operation.
+    ///
+    /// This operation requires matching types.
+    ///
+    /// This corresponds to the DWARF `DW_OP_plus` operation.
+    pub fn add(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                Value::Generic(v1.wrapping_add(v2) & addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_add(v2)),
+            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_add(v2)),
+            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_add(v2)),
+            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_add(v2)),
+            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_add(v2)),
+            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_add(v2)),
+            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_add(v2)),
+            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_add(v2)),
+            (Value::F32(v1), Value::F32(v2)) => Value::F32(v1 + v2),
+            (Value::F64(v1), Value::F64(v2)) => Value::F64(v1 + v2),
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(value)
+    }
+
+    /// Perform a subtraction operation.
+    ///
+    /// This operation requires matching types.
+    ///
+    /// This corresponds to the DWARF `DW_OP_minus` operation.
+    pub fn sub(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                Value::Generic(v1.wrapping_sub(v2) & addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_sub(v2)),
+            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_sub(v2)),
+            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_sub(v2)),
+            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_sub(v2)),
+            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_sub(v2)),
+            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_sub(v2)),
+            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_sub(v2)),
+            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_sub(v2)),
+            (Value::F32(v1), Value::F32(v2)) => Value::F32(v1 - v2),
+            (Value::F64(v1), Value::F64(v2)) => Value::F64(v1 - v2),
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(value)
+    }
+
+    /// Perform a multiplication operation.
+    ///
+    /// This operation requires matching types.
+    ///
+    /// This corresponds to the DWARF `DW_OP_mul` operation.
+    pub fn mul(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                Value::Generic(v1.wrapping_mul(v2) & addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_mul(v2)),
+            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_mul(v2)),
+            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_mul(v2)),
+            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_mul(v2)),
+            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_mul(v2)),
+            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_mul(v2)),
+            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_mul(v2)),
+            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_mul(v2)),
+            (Value::F32(v1), Value::F32(v2)) => Value::F32(v1 * v2),
+            (Value::F64(v1), Value::F64(v2)) => Value::F64(v1 * v2),
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(value)
+    }
+
+    /// Perform a division operation.
+    ///
+    /// This operation requires matching types.
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_div` operation.
+    pub fn div(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        match rhs {
+            Value::Generic(v2) if sign_extend(v2, addr_mask) == 0 => {
+                return Err(Error::DivisionByZero);
+            }
+            Value::I8(0)
+            | Value::U8(0)
+            | Value::I16(0)
+            | Value::U16(0)
+            | Value::I32(0)
+            | Value::U32(0)
+            | Value::I64(0)
+            | Value::U64(0) => {
+                return Err(Error::DivisionByZero);
+            }
+            _ => {}
+        }
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                // Signed division
+                Value::Generic(
+                    sign_extend(v1, addr_mask).wrapping_div(sign_extend(v2, addr_mask)) as u64,
+                )
+            }
+            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_div(v2)),
+            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_div(v2)),
+            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_div(v2)),
+            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_div(v2)),
+            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_div(v2)),
+            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_div(v2)),
+            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_div(v2)),
+            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_div(v2)),
+            (Value::F32(v1), Value::F32(v2)) => Value::F32(v1 / v2),
+            (Value::F64(v1), Value::F64(v2)) => Value::F64(v1 / v2),
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(value)
+    }
+
+    /// Perform a remainder operation.
+    ///
+    /// This operation requires matching integral types.
+    /// If the value type is `Generic`, then it is interpreted as an unsigned value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_mod` operation.
+    pub fn rem(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        match rhs {
+            Value::Generic(rhs) if (rhs & addr_mask) == 0 => {
+                return Err(Error::DivisionByZero);
+            }
+            Value::I8(0)
+            | Value::U8(0)
+            | Value::I16(0)
+            | Value::U16(0)
+            | Value::I32(0)
+            | Value::U32(0)
+            | Value::I64(0)
+            | Value::U64(0) => {
+                return Err(Error::DivisionByZero);
+            }
+            _ => {}
+        }
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                // Unsigned modulus
+                Value::Generic((v1 & addr_mask).wrapping_rem(v2 & addr_mask))
+            }
+            (Value::I8(v1), Value::I8(v2)) => Value::I8(v1.wrapping_rem(v2)),
+            (Value::U8(v1), Value::U8(v2)) => Value::U8(v1.wrapping_rem(v2)),
+            (Value::I16(v1), Value::I16(v2)) => Value::I16(v1.wrapping_rem(v2)),
+            (Value::U16(v1), Value::U16(v2)) => Value::U16(v1.wrapping_rem(v2)),
+            (Value::I32(v1), Value::I32(v2)) => Value::I32(v1.wrapping_rem(v2)),
+            (Value::U32(v1), Value::U32(v2)) => Value::U32(v1.wrapping_rem(v2)),
+            (Value::I64(v1), Value::I64(v2)) => Value::I64(v1.wrapping_rem(v2)),
+            (Value::U64(v1), Value::U64(v2)) => Value::U64(v1.wrapping_rem(v2)),
+            (Value::F32(_), Value::F32(_)) => return Err(Error::IntegralTypeRequired),
+            (Value::F64(_), Value::F64(_)) => return Err(Error::IntegralTypeRequired),
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(value)
+    }
+
+    /// Perform a bitwise not operation.
+    ///
+    /// This operation requires matching integral types.
+    ///
+    /// This corresponds to the DWARF `DW_OP_not` operation.
+    pub fn not(self, addr_mask: u64) -> Result<Value> {
+        let value_type = self.value_type();
+        let v = self.to_u64(addr_mask)?;
+        Value::from_u64(value_type, !v)
+    }
+
+    /// Perform a bitwise and operation.
+    ///
+    /// This operation requires matching integral types.
+    ///
+    /// This corresponds to the DWARF `DW_OP_and` operation.
+    pub fn and(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value_type = self.value_type();
+        if value_type != rhs.value_type() {
+            return Err(Error::TypeMismatch);
+        }
+        let v1 = self.to_u64(addr_mask)?;
+        let v2 = rhs.to_u64(addr_mask)?;
+        Value::from_u64(value_type, v1 & v2)
+    }
+
+    /// Perform a bitwise or operation.
+    ///
+    /// This operation requires matching integral types.
+    ///
+    /// This corresponds to the DWARF `DW_OP_or` operation.
+    pub fn or(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value_type = self.value_type();
+        if value_type != rhs.value_type() {
+            return Err(Error::TypeMismatch);
+        }
+        let v1 = self.to_u64(addr_mask)?;
+        let v2 = rhs.to_u64(addr_mask)?;
+        Value::from_u64(value_type, v1 | v2)
+    }
+
+    /// Perform a bitwise exclusive-or operation.
+    ///
+    /// This operation requires matching integral types.
+    ///
+    /// This corresponds to the DWARF `DW_OP_xor` operation.
+    pub fn xor(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value_type = self.value_type();
+        if value_type != rhs.value_type() {
+            return Err(Error::TypeMismatch);
+        }
+        let v1 = self.to_u64(addr_mask)?;
+        let v2 = rhs.to_u64(addr_mask)?;
+        Value::from_u64(value_type, v1 ^ v2)
+    }
+
+    /// Convert value to bit length suitable for a shift operation.
+    ///
+    /// If the value is negative then an error is returned.
+    fn shift_length(self) -> Result<u64> {
+        let value = match self {
+            Value::Generic(value) => value,
+            Value::I8(value) if value >= 0 => value as u64,
+            Value::U8(value) => u64::from(value),
+            Value::I16(value) if value >= 0 => value as u64,
+            Value::U16(value) => u64::from(value),
+            Value::I32(value) if value >= 0 => value as u64,
+            Value::U32(value) => u64::from(value),
+            Value::I64(value) if value >= 0 => value as u64,
+            Value::U64(value) => value,
+            _ => return Err(Error::InvalidShiftExpression),
+        };
+        Ok(value)
+    }
+
+    /// Perform a shift left operation.
+    ///
+    /// This operation requires integral types.
+    /// If the shift length exceeds the type size, then 0 is returned.
+    /// If the shift length is negative then an error is returned.
+    ///
+    /// This corresponds to the DWARF `DW_OP_shl` operation.
+    pub fn shl(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let v2 = rhs.shift_length()?;
+        let value = match self {
+            Value::Generic(v1) => Value::Generic(if v2 >= u64::from(mask_bit_size(addr_mask)) {
+                0
+            } else {
+                (v1 & addr_mask) << v2
+            }),
+            Value::I8(v1) => Value::I8(if v2 >= 8 { 0 } else { v1 << v2 }),
+            Value::U8(v1) => Value::U8(if v2 >= 8 { 0 } else { v1 << v2 }),
+            Value::I16(v1) => Value::I16(if v2 >= 16 { 0 } else { v1 << v2 }),
+            Value::U16(v1) => Value::U16(if v2 >= 16 { 0 } else { v1 << v2 }),
+            Value::I32(v1) => Value::I32(if v2 >= 32 { 0 } else { v1 << v2 }),
+            Value::U32(v1) => Value::U32(if v2 >= 32 { 0 } else { v1 << v2 }),
+            Value::I64(v1) => Value::I64(if v2 >= 64 { 0 } else { v1 << v2 }),
+            Value::U64(v1) => Value::U64(if v2 >= 64 { 0 } else { v1 << v2 }),
+            _ => return Err(Error::IntegralTypeRequired),
+        };
+        Ok(value)
+    }
+
+    /// Perform a logical shift right operation.
+    ///
+    /// This operation requires an unsigned integral type for the value.
+    /// If the value type is `Generic`, then it is interpreted as an unsigned value.
+    ///
+    /// This operation requires an integral type for the shift length.
+    /// If the shift length exceeds the type size, then 0 is returned.
+    /// If the shift length is negative then an error is returned.
+    ///
+    /// This corresponds to the DWARF `DW_OP_shr` operation.
+    pub fn shr(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let v2 = rhs.shift_length()?;
+        let value = match self {
+            Value::Generic(v1) => Value::Generic(if v2 >= u64::from(mask_bit_size(addr_mask)) {
+                0
+            } else {
+                (v1 & addr_mask) >> v2
+            }),
+            Value::U8(v1) => Value::U8(if v2 >= 8 { 0 } else { v1 >> v2 }),
+            Value::U16(v1) => Value::U16(if v2 >= 16 { 0 } else { v1 >> v2 }),
+            Value::U32(v1) => Value::U32(if v2 >= 32 { 0 } else { v1 >> v2 }),
+            Value::U64(v1) => Value::U64(if v2 >= 64 { 0 } else { v1 >> v2 }),
+            // It's unclear if signed values should implicity convert to an unsigned value.
+            // For now, we don't support them.
+            Value::I8(_) | Value::I16(_) | Value::I32(_) | Value::I64(_) => {
+                return Err(Error::UnsupportedTypeOperation);
+            }
+            _ => return Err(Error::IntegralTypeRequired),
+        };
+        Ok(value)
+    }
+
+    /// Perform an arithmetic shift right operation.
+    ///
+    /// This operation requires a signed integral type for the value.
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This operation requires an integral type for the shift length.
+    /// If the shift length exceeds the type size, then 0 is returned for positive values,
+    /// and -1 is returned for negative values.
+    /// If the shift length is negative then an error is returned.
+    ///
+    /// This corresponds to the DWARF `DW_OP_shra` operation.
+    pub fn shra(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let v2 = rhs.shift_length()?;
+        let value = match self {
+            Value::Generic(v1) => {
+                let v1 = sign_extend(v1, addr_mask);
+                let value = if v2 >= u64::from(mask_bit_size(addr_mask)) {
+                    if v1 < 0 {
+                        !0
+                    } else {
+                        0
+                    }
+                } else {
+                    (v1 >> v2) as u64
+                };
+                Value::Generic(value)
+            }
+            Value::I8(v1) => Value::I8(if v2 >= 8 {
+                if v1 < 0 {
+                    !0
+                } else {
+                    0
+                }
+            } else {
+                v1 >> v2
+            }),
+            Value::I16(v1) => Value::I16(if v2 >= 16 {
+                if v1 < 0 {
+                    !0
+                } else {
+                    0
+                }
+            } else {
+                v1 >> v2
+            }),
+            Value::I32(v1) => Value::I32(if v2 >= 32 {
+                if v1 < 0 {
+                    !0
+                } else {
+                    0
+                }
+            } else {
+                v1 >> v2
+            }),
+            Value::I64(v1) => Value::I64(if v2 >= 64 {
+                if v1 < 0 {
+                    !0
+                } else {
+                    0
+                }
+            } else {
+                v1 >> v2
+            }),
+            // It's unclear if unsigned values should implicity convert to a signed value.
+            // For now, we don't support them.
+            Value::U8(_) | Value::U16(_) | Value::U32(_) | Value::U64(_) => {
+                return Err(Error::UnsupportedTypeOperation);
+            }
+            _ => return Err(Error::IntegralTypeRequired),
+        };
+        Ok(value)
+    }
+
+    /// Perform the `==` relational operation.
+    ///
+    /// This operation requires matching integral types.
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_eq` operation.
+    pub fn eq(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                sign_extend(v1, addr_mask) == sign_extend(v2, addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => v1 == v2,
+            (Value::U8(v1), Value::U8(v2)) => v1 == v2,
+            (Value::I16(v1), Value::I16(v2)) => v1 == v2,
+            (Value::U16(v1), Value::U16(v2)) => v1 == v2,
+            (Value::I32(v1), Value::I32(v2)) => v1 == v2,
+            (Value::U32(v1), Value::U32(v2)) => v1 == v2,
+            (Value::I64(v1), Value::I64(v2)) => v1 == v2,
+            (Value::U64(v1), Value::U64(v2)) => v1 == v2,
+            (Value::F32(v1), Value::F32(v2)) => v1 == v2,
+            (Value::F64(v1), Value::F64(v2)) => v1 == v2,
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(Value::Generic(value as u64))
+    }
+
+    /// Perform the `>=` relational operation.
+    ///
+    /// This operation requires matching integral types.
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_ge` operation.
+    pub fn ge(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                sign_extend(v1, addr_mask) >= sign_extend(v2, addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => v1 >= v2,
+            (Value::U8(v1), Value::U8(v2)) => v1 >= v2,
+            (Value::I16(v1), Value::I16(v2)) => v1 >= v2,
+            (Value::U16(v1), Value::U16(v2)) => v1 >= v2,
+            (Value::I32(v1), Value::I32(v2)) => v1 >= v2,
+            (Value::U32(v1), Value::U32(v2)) => v1 >= v2,
+            (Value::I64(v1), Value::I64(v2)) => v1 >= v2,
+            (Value::U64(v1), Value::U64(v2)) => v1 >= v2,
+            (Value::F32(v1), Value::F32(v2)) => v1 >= v2,
+            (Value::F64(v1), Value::F64(v2)) => v1 >= v2,
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(Value::Generic(value as u64))
+    }
+
+    /// Perform the `>` relational operation.
+    ///
+    /// This operation requires matching integral types.
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_gt` operation.
+    pub fn gt(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                sign_extend(v1, addr_mask) > sign_extend(v2, addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => v1 > v2,
+            (Value::U8(v1), Value::U8(v2)) => v1 > v2,
+            (Value::I16(v1), Value::I16(v2)) => v1 > v2,
+            (Value::U16(v1), Value::U16(v2)) => v1 > v2,
+            (Value::I32(v1), Value::I32(v2)) => v1 > v2,
+            (Value::U32(v1), Value::U32(v2)) => v1 > v2,
+            (Value::I64(v1), Value::I64(v2)) => v1 > v2,
+            (Value::U64(v1), Value::U64(v2)) => v1 > v2,
+            (Value::F32(v1), Value::F32(v2)) => v1 > v2,
+            (Value::F64(v1), Value::F64(v2)) => v1 > v2,
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(Value::Generic(value as u64))
+    }
+
+    /// Perform the `<= relational operation.
+    ///
+    /// This operation requires matching integral types.
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_le` operation.
+    pub fn le(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                sign_extend(v1, addr_mask) <= sign_extend(v2, addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => v1 <= v2,
+            (Value::U8(v1), Value::U8(v2)) => v1 <= v2,
+            (Value::I16(v1), Value::I16(v2)) => v1 <= v2,
+            (Value::U16(v1), Value::U16(v2)) => v1 <= v2,
+            (Value::I32(v1), Value::I32(v2)) => v1 <= v2,
+            (Value::U32(v1), Value::U32(v2)) => v1 <= v2,
+            (Value::I64(v1), Value::I64(v2)) => v1 <= v2,
+            (Value::U64(v1), Value::U64(v2)) => v1 <= v2,
+            (Value::F32(v1), Value::F32(v2)) => v1 <= v2,
+            (Value::F64(v1), Value::F64(v2)) => v1 <= v2,
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(Value::Generic(value as u64))
+    }
+
+    /// Perform the `< relational operation.
+    ///
+    /// This operation requires matching integral types.
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_lt` operation.
+    pub fn lt(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                sign_extend(v1, addr_mask) < sign_extend(v2, addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => v1 < v2,
+            (Value::U8(v1), Value::U8(v2)) => v1 < v2,
+            (Value::I16(v1), Value::I16(v2)) => v1 < v2,
+            (Value::U16(v1), Value::U16(v2)) => v1 < v2,
+            (Value::I32(v1), Value::I32(v2)) => v1 < v2,
+            (Value::U32(v1), Value::U32(v2)) => v1 < v2,
+            (Value::I64(v1), Value::I64(v2)) => v1 < v2,
+            (Value::U64(v1), Value::U64(v2)) => v1 < v2,
+            (Value::F32(v1), Value::F32(v2)) => v1 < v2,
+            (Value::F64(v1), Value::F64(v2)) => v1 < v2,
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(Value::Generic(value as u64))
+    }
+
+    /// Perform the `!= relational operation.
+    ///
+    /// This operation requires matching integral types.
+    /// If the value type is `Generic`, then it is interpreted as a signed value.
+    ///
+    /// This corresponds to the DWARF `DW_OP_ne` operation.
+    pub fn ne(self, rhs: Value, addr_mask: u64) -> Result<Value> {
+        let value = match (self, rhs) {
+            (Value::Generic(v1), Value::Generic(v2)) => {
+                sign_extend(v1, addr_mask) != sign_extend(v2, addr_mask)
+            }
+            (Value::I8(v1), Value::I8(v2)) => v1 != v2,
+            (Value::U8(v1), Value::U8(v2)) => v1 != v2,
+            (Value::I16(v1), Value::I16(v2)) => v1 != v2,
+            (Value::U16(v1), Value::U16(v2)) => v1 != v2,
+            (Value::I32(v1), Value::I32(v2)) => v1 != v2,
+            (Value::U32(v1), Value::U32(v2)) => v1 != v2,
+            (Value::I64(v1), Value::I64(v2)) => v1 != v2,
+            (Value::U64(v1), Value::U64(v2)) => v1 != v2,
+            (Value::F32(v1), Value::F32(v2)) => v1 != v2,
+            (Value::F64(v1), Value::F64(v2)) => v1 != v2,
+            _ => return Err(Error::TypeMismatch),
+        };
+        Ok(Value::Generic(value as u64))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::common::{DebugAbbrevOffset, DebugInfoOffset, Encoding, Format};
+    use crate::endianity::LittleEndian;
+    use crate::read::{
+        Abbreviation, AttributeSpecification, DebuggingInformationEntry, EndianSlice, UnitHeader,
+        UnitOffset, UnitType,
+    };
+
+    #[test]
+    #[rustfmt::skip]
+    fn valuetype_from_encoding() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 4,
+        };
+        let unit = UnitHeader::new(
+            encoding,
+            7,
+            UnitType::Compilation,
+            DebugAbbrevOffset(0),
+            DebugInfoOffset(0).into(),
+            EndianSlice::new(&[], LittleEndian),
+        );
+
+        let abbrev = Abbreviation::new(
+            42,
+            constants::DW_TAG_base_type,
+            constants::DW_CHILDREN_no,
+            vec![
+                AttributeSpecification::new(
+                    constants::DW_AT_byte_size,
+                    constants::DW_FORM_udata,
+                    None,
+                ),
+                AttributeSpecification::new(
+                    constants::DW_AT_encoding,
+                    constants::DW_FORM_udata,
+                    None,
+                ),
+                AttributeSpecification::new(
+                    constants::DW_AT_endianity,
+                    constants::DW_FORM_udata,
+                    None,
+                ),
+            ].into(),
+        );
+
+        for &(attrs, result) in &[
+            ([0x01, constants::DW_ATE_signed.0, constants::DW_END_default.0], ValueType::I8),
+            ([0x02, constants::DW_ATE_signed.0, constants::DW_END_default.0], ValueType::I16),
+            ([0x04, constants::DW_ATE_signed.0, constants::DW_END_default.0], ValueType::I32),
+            ([0x08, constants::DW_ATE_signed.0, constants::DW_END_default.0], ValueType::I64),
+            ([0x01, constants::DW_ATE_unsigned.0, constants::DW_END_default.0], ValueType::U8),
+            ([0x02, constants::DW_ATE_unsigned.0, constants::DW_END_default.0], ValueType::U16),
+            ([0x04, constants::DW_ATE_unsigned.0, constants::DW_END_default.0], ValueType::U32),
+            ([0x08, constants::DW_ATE_unsigned.0, constants::DW_END_default.0], ValueType::U64),
+            ([0x04, constants::DW_ATE_float.0, constants::DW_END_default.0], ValueType::F32),
+            ([0x08, constants::DW_ATE_float.0, constants::DW_END_default.0], ValueType::F64),
+        ] {
+            let entry = DebuggingInformationEntry::new(
+                UnitOffset(0),
+                EndianSlice::new(&attrs, LittleEndian),
+                &abbrev,
+                &unit,
+            );
+            assert_eq!(ValueType::from_entry(&entry), Ok(Some(result)));
+        }
+
+        for attrs in &[
+            [0x03, constants::DW_ATE_signed.0, constants::DW_END_default.0],
+            [0x02, constants::DW_ATE_signed.0, constants::DW_END_big.0],
+        ] {
+            let entry = DebuggingInformationEntry::new(
+                UnitOffset(0),
+                EndianSlice::new(attrs, LittleEndian),
+                &abbrev,
+                &unit,
+            );
+            assert_eq!(ValueType::from_entry(&entry), Ok(None));
+        }
+    }
+
+    #[test]
+    fn value_convert() {
+        let addr_mask = !0 >> 32;
+        for &(v, t, result) in &[
+            (Value::Generic(1), ValueType::I8, Ok(Value::I8(1))),
+            (Value::I8(1), ValueType::U8, Ok(Value::U8(1))),
+            (Value::U8(1), ValueType::I16, Ok(Value::I16(1))),
+            (Value::I16(1), ValueType::U16, Ok(Value::U16(1))),
+            (Value::U16(1), ValueType::I32, Ok(Value::I32(1))),
+            (Value::I32(1), ValueType::U32, Ok(Value::U32(1))),
+            (Value::U32(1), ValueType::F32, Ok(Value::F32(1.))),
+            (Value::F32(1.), ValueType::I64, Ok(Value::I64(1))),
+            (Value::I64(1), ValueType::U64, Ok(Value::U64(1))),
+            (Value::U64(1), ValueType::F64, Ok(Value::F64(1.))),
+            (Value::F64(1.), ValueType::Generic, Ok(Value::Generic(1))),
+        ] {
+            assert_eq!(v.convert(t, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_reinterpret() {
+        let addr_mask = !0 >> 32;
+        for &(v, t, result) in &[
+            // 8-bit
+            (Value::I8(-1), ValueType::U8, Ok(Value::U8(0xff))),
+            (Value::U8(0xff), ValueType::I8, Ok(Value::I8(-1))),
+            // 16-bit
+            (Value::I16(1), ValueType::U16, Ok(Value::U16(1))),
+            (Value::U16(1), ValueType::I16, Ok(Value::I16(1))),
+            // 32-bit
+            (Value::Generic(1), ValueType::I32, Ok(Value::I32(1))),
+            (Value::I32(1), ValueType::U32, Ok(Value::U32(1))),
+            (Value::U32(0x3f80_0000), ValueType::F32, Ok(Value::F32(1.0))),
+            (Value::F32(1.0), ValueType::Generic, Ok(Value::Generic(0x3f80_0000))),
+            // Type mismatches
+            (Value::Generic(1), ValueType::U8, Err(Error::TypeMismatch)),
+            (Value::U8(1), ValueType::U16, Err(Error::TypeMismatch)),
+            (Value::U16(1), ValueType::U32, Err(Error::TypeMismatch)),
+            (Value::U32(1), ValueType::U64, Err(Error::TypeMismatch)),
+            (Value::U64(1), ValueType::Generic, Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v.reinterpret(t, addr_mask), result);
+        }
+
+        let addr_mask = !0;
+        for &(v, t, result) in &[
+            // 64-bit
+            (Value::Generic(1), ValueType::I64, Ok(Value::I64(1))),
+            (Value::I64(1), ValueType::U64, Ok(Value::U64(1))),
+            (Value::U64(0x3ff0_0000_0000_0000), ValueType::F64, Ok(Value::F64(1.0))),
+            (Value::F64(1.0), ValueType::Generic, Ok(Value::Generic(0x3ff0_0000_0000_0000))),
+        ] {
+            assert_eq!(v.reinterpret(t, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_abs() {
+        let addr_mask = 0xffff_ffff;
+        for &(v, result) in &[
+            (Value::Generic(0xffff_ffff), Ok(Value::Generic(1))),
+            (Value::I8(-1), Ok(Value::I8(1))),
+            (Value::U8(1), Ok(Value::U8(1))),
+            (Value::I16(-1), Ok(Value::I16(1))),
+            (Value::U16(1), Ok(Value::U16(1))),
+            (Value::I32(-1), Ok(Value::I32(1))),
+            (Value::U32(1), Ok(Value::U32(1))),
+            (Value::I64(-1), Ok(Value::I64(1))),
+            (Value::U64(1), Ok(Value::U64(1))),
+            (Value::F32(-1.), Ok(Value::F32(1.))),
+            (Value::F64(-1.), Ok(Value::F64(1.))),
+        ] {
+            assert_eq!(v.abs(addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_neg() {
+        let addr_mask = 0xffff_ffff;
+        for &(v, result) in &[
+            (Value::Generic(0xffff_ffff), Ok(Value::Generic(1))),
+            (Value::I8(1), Ok(Value::I8(-1))),
+            (Value::U8(1), Err(Error::UnsupportedTypeOperation)),
+            (Value::I16(1), Ok(Value::I16(-1))),
+            (Value::U16(1), Err(Error::UnsupportedTypeOperation)),
+            (Value::I32(1), Ok(Value::I32(-1))),
+            (Value::U32(1), Err(Error::UnsupportedTypeOperation)),
+            (Value::I64(1), Ok(Value::I64(-1))),
+            (Value::U64(1), Err(Error::UnsupportedTypeOperation)),
+            (Value::F32(1.), Ok(Value::F32(-1.))),
+            (Value::F64(1.), Ok(Value::F64(-1.))),
+        ] {
+            assert_eq!(v.neg(addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_add() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(1), Value::Generic(2), Ok(Value::Generic(3))),
+            (Value::I8(-1), Value::I8(2), Ok(Value::I8(1))),
+            (Value::U8(1), Value::U8(2), Ok(Value::U8(3))),
+            (Value::I16(-1), Value::I16(2), Ok(Value::I16(1))),
+            (Value::U16(1), Value::U16(2), Ok(Value::U16(3))),
+            (Value::I32(-1), Value::I32(2), Ok(Value::I32(1))),
+            (Value::U32(1), Value::U32(2), Ok(Value::U32(3))),
+            (Value::I64(-1), Value::I64(2), Ok(Value::I64(1))),
+            (Value::U64(1), Value::U64(2), Ok(Value::U64(3))),
+            (Value::F32(-1.), Value::F32(2.), Ok(Value::F32(1.))),
+            (Value::F64(-1.), Value::F64(2.), Ok(Value::F64(1.))),
+            (Value::Generic(1), Value::U32(2), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.add(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_sub() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(2), Ok(Value::Generic(1))),
+            (Value::I8(-1), Value::I8(2), Ok(Value::I8(-3))),
+            (Value::U8(3), Value::U8(2), Ok(Value::U8(1))),
+            (Value::I16(-1), Value::I16(2), Ok(Value::I16(-3))),
+            (Value::U16(3), Value::U16(2), Ok(Value::U16(1))),
+            (Value::I32(-1), Value::I32(2), Ok(Value::I32(-3))),
+            (Value::U32(3), Value::U32(2), Ok(Value::U32(1))),
+            (Value::I64(-1), Value::I64(2), Ok(Value::I64(-3))),
+            (Value::U64(3), Value::U64(2), Ok(Value::U64(1))),
+            (Value::F32(-1.), Value::F32(2.), Ok(Value::F32(-3.))),
+            (Value::F64(-1.), Value::F64(2.), Ok(Value::F64(-3.))),
+            (Value::Generic(3), Value::U32(2), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.sub(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_mul() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(2), Value::Generic(3), Ok(Value::Generic(6))),
+            (Value::I8(-2), Value::I8(3), Ok(Value::I8(-6))),
+            (Value::U8(2), Value::U8(3), Ok(Value::U8(6))),
+            (Value::I16(-2), Value::I16(3), Ok(Value::I16(-6))),
+            (Value::U16(2), Value::U16(3), Ok(Value::U16(6))),
+            (Value::I32(-2), Value::I32(3), Ok(Value::I32(-6))),
+            (Value::U32(2), Value::U32(3), Ok(Value::U32(6))),
+            (Value::I64(-2), Value::I64(3), Ok(Value::I64(-6))),
+            (Value::U64(2), Value::U64(3), Ok(Value::U64(6))),
+            (Value::F32(-2.), Value::F32(3.), Ok(Value::F32(-6.))),
+            (Value::F64(-2.), Value::F64(3.), Ok(Value::F64(-6.))),
+            (Value::Generic(2), Value::U32(3), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.mul(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_div() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(6), Value::Generic(3), Ok(Value::Generic(2))),
+            (Value::I8(-6), Value::I8(3), Ok(Value::I8(-2))),
+            (Value::U8(6), Value::U8(3), Ok(Value::U8(2))),
+            (Value::I16(-6), Value::I16(3), Ok(Value::I16(-2))),
+            (Value::U16(6), Value::U16(3), Ok(Value::U16(2))),
+            (Value::I32(-6), Value::I32(3), Ok(Value::I32(-2))),
+            (Value::U32(6), Value::U32(3), Ok(Value::U32(2))),
+            (Value::I64(-6), Value::I64(3), Ok(Value::I64(-2))),
+            (Value::U64(6), Value::U64(3), Ok(Value::U64(2))),
+            (Value::F32(-6.), Value::F32(3.), Ok(Value::F32(-2.))),
+            (Value::F64(-6.), Value::F64(3.), Ok(Value::F64(-2.))),
+            (Value::Generic(6), Value::U32(3), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.div(v2, addr_mask), result);
+        }
+        for &(v1, v2, result) in &[
+            (Value::Generic(6), Value::Generic(0), Err(Error::DivisionByZero)),
+            (Value::I8(-6), Value::I8(0), Err(Error::DivisionByZero)),
+            (Value::U8(6), Value::U8(0), Err(Error::DivisionByZero)),
+            (Value::I16(-6), Value::I16(0), Err(Error::DivisionByZero)),
+            (Value::U16(6), Value::U16(0), Err(Error::DivisionByZero)),
+            (Value::I32(-6), Value::I32(0), Err(Error::DivisionByZero)),
+            (Value::U32(6), Value::U32(0), Err(Error::DivisionByZero)),
+            (Value::I64(-6), Value::I64(0), Err(Error::DivisionByZero)),
+            (Value::U64(6), Value::U64(0), Err(Error::DivisionByZero)),
+            (Value::F32(-6.), Value::F32(0.), Ok(Value::F32(-6. / 0.))),
+            (Value::F64(-6.), Value::F64(0.), Ok(Value::F64(-6. / 0.))),
+        ] {
+            assert_eq!(v1.div(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_rem() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(2), Ok(Value::Generic(1))),
+            (Value::I8(-3), Value::I8(2), Ok(Value::I8(-1))),
+            (Value::U8(3), Value::U8(2), Ok(Value::U8(1))),
+            (Value::I16(-3), Value::I16(2), Ok(Value::I16(-1))),
+            (Value::U16(3), Value::U16(2), Ok(Value::U16(1))),
+            (Value::I32(-3), Value::I32(2), Ok(Value::I32(-1))),
+            (Value::U32(3), Value::U32(2), Ok(Value::U32(1))),
+            (Value::I64(-3), Value::I64(2), Ok(Value::I64(-1))),
+            (Value::U64(3), Value::U64(2), Ok(Value::U64(1))),
+            (Value::F32(-3.), Value::F32(2.), Err(Error::IntegralTypeRequired)),
+            (Value::F64(-3.), Value::F64(2.), Err(Error::IntegralTypeRequired)),
+            (Value::Generic(3), Value::U32(2), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.rem(v2, addr_mask), result);
+        }
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(0), Err(Error::DivisionByZero)),
+            (Value::I8(-3), Value::I8(0), Err(Error::DivisionByZero)),
+            (Value::U8(3), Value::U8(0), Err(Error::DivisionByZero)),
+            (Value::I16(-3), Value::I16(0), Err(Error::DivisionByZero)),
+            (Value::U16(3), Value::U16(0), Err(Error::DivisionByZero)),
+            (Value::I32(-3), Value::I32(0), Err(Error::DivisionByZero)),
+            (Value::U32(3), Value::U32(0), Err(Error::DivisionByZero)),
+            (Value::I64(-3), Value::I64(0), Err(Error::DivisionByZero)),
+            (Value::U64(3), Value::U64(0), Err(Error::DivisionByZero)),
+        ] {
+            assert_eq!(v1.rem(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_not() {
+        let addr_mask = 0xffff_ffff;
+        for &(v, result) in &[
+            (Value::Generic(1), Ok(Value::Generic(!1))),
+            (Value::I8(1), Ok(Value::I8(!1))),
+            (Value::U8(1), Ok(Value::U8(!1))),
+            (Value::I16(1), Ok(Value::I16(!1))),
+            (Value::U16(1), Ok(Value::U16(!1))),
+            (Value::I32(1), Ok(Value::I32(!1))),
+            (Value::U32(1), Ok(Value::U32(!1))),
+            (Value::I64(1), Ok(Value::I64(!1))),
+            (Value::U64(1), Ok(Value::U64(!1))),
+            (Value::F32(1.), Err(Error::IntegralTypeRequired)),
+            (Value::F64(1.), Err(Error::IntegralTypeRequired)),
+        ] {
+            assert_eq!(v.not(addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_and() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(5), Ok(Value::Generic(1))),
+            (Value::I8(3), Value::I8(5), Ok(Value::I8(1))),
+            (Value::U8(3), Value::U8(5), Ok(Value::U8(1))),
+            (Value::I16(3), Value::I16(5), Ok(Value::I16(1))),
+            (Value::U16(3), Value::U16(5), Ok(Value::U16(1))),
+            (Value::I32(3), Value::I32(5), Ok(Value::I32(1))),
+            (Value::U32(3), Value::U32(5), Ok(Value::U32(1))),
+            (Value::I64(3), Value::I64(5), Ok(Value::I64(1))),
+            (Value::U64(3), Value::U64(5), Ok(Value::U64(1))),
+            (Value::F32(3.), Value::F32(5.), Err(Error::IntegralTypeRequired)),
+            (Value::F64(3.), Value::F64(5.), Err(Error::IntegralTypeRequired)),
+            (Value::Generic(3), Value::U32(5), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.and(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_or() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(5), Ok(Value::Generic(7))),
+            (Value::I8(3), Value::I8(5), Ok(Value::I8(7))),
+            (Value::U8(3), Value::U8(5), Ok(Value::U8(7))),
+            (Value::I16(3), Value::I16(5), Ok(Value::I16(7))),
+            (Value::U16(3), Value::U16(5), Ok(Value::U16(7))),
+            (Value::I32(3), Value::I32(5), Ok(Value::I32(7))),
+            (Value::U32(3), Value::U32(5), Ok(Value::U32(7))),
+            (Value::I64(3), Value::I64(5), Ok(Value::I64(7))),
+            (Value::U64(3), Value::U64(5), Ok(Value::U64(7))),
+            (Value::F32(3.), Value::F32(5.), Err(Error::IntegralTypeRequired)),
+            (Value::F64(3.), Value::F64(5.), Err(Error::IntegralTypeRequired)),
+            (Value::Generic(3), Value::U32(5), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.or(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_xor() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(5), Ok(Value::Generic(6))),
+            (Value::I8(3), Value::I8(5), Ok(Value::I8(6))),
+            (Value::U8(3), Value::U8(5), Ok(Value::U8(6))),
+            (Value::I16(3), Value::I16(5), Ok(Value::I16(6))),
+            (Value::U16(3), Value::U16(5), Ok(Value::U16(6))),
+            (Value::I32(3), Value::I32(5), Ok(Value::I32(6))),
+            (Value::U32(3), Value::U32(5), Ok(Value::U32(6))),
+            (Value::I64(3), Value::I64(5), Ok(Value::I64(6))),
+            (Value::U64(3), Value::U64(5), Ok(Value::U64(6))),
+            (Value::F32(3.), Value::F32(5.), Err(Error::IntegralTypeRequired)),
+            (Value::F64(3.), Value::F64(5.), Err(Error::IntegralTypeRequired)),
+            (Value::Generic(3), Value::U32(5), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.xor(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_shl() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            // One of each type
+            (Value::Generic(3), Value::Generic(5), Ok(Value::Generic(96))),
+            (Value::I8(3), Value::U8(5), Ok(Value::I8(96))),
+            (Value::U8(3), Value::I8(5), Ok(Value::U8(96))),
+            (Value::I16(3), Value::U16(5), Ok(Value::I16(96))),
+            (Value::U16(3), Value::I16(5), Ok(Value::U16(96))),
+            (Value::I32(3), Value::U32(5), Ok(Value::I32(96))),
+            (Value::U32(3), Value::I32(5), Ok(Value::U32(96))),
+            (Value::I64(3), Value::U64(5), Ok(Value::I64(96))),
+            (Value::U64(3), Value::I64(5), Ok(Value::U64(96))),
+            (Value::F32(3.), Value::U8(5), Err(Error::IntegralTypeRequired)),
+            (Value::F64(3.), Value::U8(5), Err(Error::IntegralTypeRequired)),
+            // Invalid shifts
+            (Value::U8(3), Value::I8(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(3), Value::I16(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(3), Value::I32(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(3), Value::I64(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(3), Value::F32(5.), Err(Error::InvalidShiftExpression)),
+            (Value::U8(3), Value::F64(5.), Err(Error::InvalidShiftExpression)),
+            // Large shifts
+            (Value::Generic(3), Value::Generic(32), Ok(Value::Generic(0))),
+            (Value::I8(3), Value::U8(8), Ok(Value::I8(0))),
+            (Value::U8(3), Value::I8(9), Ok(Value::U8(0))),
+            (Value::I16(3), Value::U16(17), Ok(Value::I16(0))),
+            (Value::U16(3), Value::I16(16), Ok(Value::U16(0))),
+            (Value::I32(3), Value::U32(32), Ok(Value::I32(0))),
+            (Value::U32(3), Value::I32(33), Ok(Value::U32(0))),
+            (Value::I64(3), Value::U64(65), Ok(Value::I64(0))),
+            (Value::U64(3), Value::I64(64), Ok(Value::U64(0))),
+        ] {
+            assert_eq!(v1.shl(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_shr() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            // One of each type
+            (Value::Generic(96), Value::Generic(5), Ok(Value::Generic(3))),
+            (Value::I8(96), Value::U8(5), Err(Error::UnsupportedTypeOperation)),
+            (Value::U8(96), Value::I8(5), Ok(Value::U8(3))),
+            (Value::I16(96), Value::U16(5), Err(Error::UnsupportedTypeOperation)),
+            (Value::U16(96), Value::I16(5), Ok(Value::U16(3))),
+            (Value::I32(96), Value::U32(5), Err(Error::UnsupportedTypeOperation)),
+            (Value::U32(96), Value::I32(5), Ok(Value::U32(3))),
+            (Value::I64(96), Value::U64(5), Err(Error::UnsupportedTypeOperation)),
+            (Value::U64(96), Value::I64(5), Ok(Value::U64(3))),
+            (Value::F32(96.), Value::U8(5), Err(Error::IntegralTypeRequired)),
+            (Value::F64(96.), Value::U8(5), Err(Error::IntegralTypeRequired)),
+            // Invalid shifts
+            (Value::U8(96), Value::I8(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::I16(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::I32(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::I64(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::F32(5.), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::F64(5.), Err(Error::InvalidShiftExpression)),
+            // Large shifts
+            (Value::Generic(96), Value::Generic(32), Ok(Value::Generic(0))),
+            (Value::U8(96), Value::I8(9), Ok(Value::U8(0))),
+            (Value::U16(96), Value::I16(16), Ok(Value::U16(0))),
+            (Value::U32(96), Value::I32(33), Ok(Value::U32(0))),
+            (Value::U64(96), Value::I64(64), Ok(Value::U64(0))),
+        ] {
+            assert_eq!(v1.shr(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    #[rustfmt::skip]
+    fn value_shra() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            // One of each type
+            (Value::Generic(u64::from(-96i32 as u32)), Value::Generic(5), Ok(Value::Generic(-3i64 as u64))),
+            (Value::I8(-96), Value::U8(5), Ok(Value::I8(-3))),
+            (Value::U8(96), Value::I8(5), Err(Error::UnsupportedTypeOperation)),
+            (Value::I16(-96), Value::U16(5), Ok(Value::I16(-3))),
+            (Value::U16(96), Value::I16(5), Err(Error::UnsupportedTypeOperation)),
+            (Value::I32(-96), Value::U32(5), Ok(Value::I32(-3))),
+            (Value::U32(96), Value::I32(5), Err(Error::UnsupportedTypeOperation)),
+            (Value::I64(-96), Value::U64(5), Ok(Value::I64(-3))),
+            (Value::U64(96), Value::I64(5), Err(Error::UnsupportedTypeOperation)),
+            (Value::F32(96.), Value::U8(5), Err(Error::IntegralTypeRequired)),
+            (Value::F64(96.), Value::U8(5), Err(Error::IntegralTypeRequired)),
+            // Invalid shifts
+            (Value::U8(96), Value::I8(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::I16(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::I32(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::I64(-5), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::F32(5.), Err(Error::InvalidShiftExpression)),
+            (Value::U8(96), Value::F64(5.), Err(Error::InvalidShiftExpression)),
+            // Large shifts
+            (Value::Generic(96), Value::Generic(32), Ok(Value::Generic(0))),
+            (Value::I8(96), Value::U8(8), Ok(Value::I8(0))),
+            (Value::I8(-96), Value::U8(8), Ok(Value::I8(-1))),
+            (Value::I16(96), Value::U16(17), Ok(Value::I16(0))),
+            (Value::I16(-96), Value::U16(17), Ok(Value::I16(-1))),
+            (Value::I32(96), Value::U32(32), Ok(Value::I32(0))),
+            (Value::I32(-96), Value::U32(32), Ok(Value::I32(-1))),
+            (Value::I64(96), Value::U64(65), Ok(Value::I64(0))),
+            (Value::I64(-96), Value::U64(65), Ok(Value::I64(-1))),
+        ] {
+            assert_eq!(v1.shra(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    fn value_eq() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(3), Ok(Value::Generic(1))),
+            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(0))),
+            (Value::I8(3), Value::I8(3), Ok(Value::Generic(1))),
+            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(0))),
+            (Value::U8(3), Value::U8(3), Ok(Value::Generic(1))),
+            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(0))),
+            (Value::I16(3), Value::I16(3), Ok(Value::Generic(1))),
+            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(0))),
+            (Value::U16(3), Value::U16(3), Ok(Value::Generic(1))),
+            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(0))),
+            (Value::I32(3), Value::I32(3), Ok(Value::Generic(1))),
+            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(0))),
+            (Value::U32(3), Value::U32(3), Ok(Value::Generic(1))),
+            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(0))),
+            (Value::I64(3), Value::I64(3), Ok(Value::Generic(1))),
+            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(0))),
+            (Value::U64(3), Value::U64(3), Ok(Value::Generic(1))),
+            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(0))),
+            (Value::F32(3.), Value::F32(3.), Ok(Value::Generic(1))),
+            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(0))),
+            (Value::F64(3.), Value::F64(3.), Ok(Value::Generic(1))),
+            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(0))),
+            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.eq(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    fn value_ne() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(3), Ok(Value::Generic(0))),
+            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(1))),
+            (Value::I8(3), Value::I8(3), Ok(Value::Generic(0))),
+            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(1))),
+            (Value::U8(3), Value::U8(3), Ok(Value::Generic(0))),
+            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(1))),
+            (Value::I16(3), Value::I16(3), Ok(Value::Generic(0))),
+            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(1))),
+            (Value::U16(3), Value::U16(3), Ok(Value::Generic(0))),
+            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(1))),
+            (Value::I32(3), Value::I32(3), Ok(Value::Generic(0))),
+            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(1))),
+            (Value::U32(3), Value::U32(3), Ok(Value::Generic(0))),
+            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(1))),
+            (Value::I64(3), Value::I64(3), Ok(Value::Generic(0))),
+            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(1))),
+            (Value::U64(3), Value::U64(3), Ok(Value::Generic(0))),
+            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(1))),
+            (Value::F32(3.), Value::F32(3.), Ok(Value::Generic(0))),
+            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(1))),
+            (Value::F64(3.), Value::F64(3.), Ok(Value::Generic(0))),
+            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(1))),
+            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.ne(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    fn value_ge() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(!3), Ok(Value::Generic(1))),
+            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(0))),
+            (Value::I8(3), Value::I8(!3), Ok(Value::Generic(1))),
+            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(0))),
+            (Value::U8(3), Value::U8(!3), Ok(Value::Generic(0))),
+            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(1))),
+            (Value::I16(3), Value::I16(!3), Ok(Value::Generic(1))),
+            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(0))),
+            (Value::U16(3), Value::U16(!3), Ok(Value::Generic(0))),
+            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(1))),
+            (Value::I32(3), Value::I32(!3), Ok(Value::Generic(1))),
+            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(0))),
+            (Value::U32(3), Value::U32(!3), Ok(Value::Generic(0))),
+            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(1))),
+            (Value::I64(3), Value::I64(!3), Ok(Value::Generic(1))),
+            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(0))),
+            (Value::U64(3), Value::U64(!3), Ok(Value::Generic(0))),
+            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(1))),
+            (Value::F32(3.), Value::F32(-3.), Ok(Value::Generic(1))),
+            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(0))),
+            (Value::F64(3.), Value::F64(-3.), Ok(Value::Generic(1))),
+            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(0))),
+            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.ge(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    fn value_gt() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(!3), Ok(Value::Generic(1))),
+            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(0))),
+            (Value::I8(3), Value::I8(!3), Ok(Value::Generic(1))),
+            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(0))),
+            (Value::U8(3), Value::U8(!3), Ok(Value::Generic(0))),
+            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(1))),
+            (Value::I16(3), Value::I16(!3), Ok(Value::Generic(1))),
+            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(0))),
+            (Value::U16(3), Value::U16(!3), Ok(Value::Generic(0))),
+            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(1))),
+            (Value::I32(3), Value::I32(!3), Ok(Value::Generic(1))),
+            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(0))),
+            (Value::U32(3), Value::U32(!3), Ok(Value::Generic(0))),
+            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(1))),
+            (Value::I64(3), Value::I64(!3), Ok(Value::Generic(1))),
+            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(0))),
+            (Value::U64(3), Value::U64(!3), Ok(Value::Generic(0))),
+            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(1))),
+            (Value::F32(3.), Value::F32(-3.), Ok(Value::Generic(1))),
+            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(0))),
+            (Value::F64(3.), Value::F64(-3.), Ok(Value::Generic(1))),
+            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(0))),
+            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.gt(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    fn value_le() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(!3), Ok(Value::Generic(0))),
+            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(1))),
+            (Value::I8(3), Value::I8(!3), Ok(Value::Generic(0))),
+            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(1))),
+            (Value::U8(3), Value::U8(!3), Ok(Value::Generic(1))),
+            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(0))),
+            (Value::I16(3), Value::I16(!3), Ok(Value::Generic(0))),
+            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(1))),
+            (Value::U16(3), Value::U16(!3), Ok(Value::Generic(1))),
+            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(0))),
+            (Value::I32(3), Value::I32(!3), Ok(Value::Generic(0))),
+            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(1))),
+            (Value::U32(3), Value::U32(!3), Ok(Value::Generic(1))),
+            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(0))),
+            (Value::I64(3), Value::I64(!3), Ok(Value::Generic(0))),
+            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(1))),
+            (Value::U64(3), Value::U64(!3), Ok(Value::Generic(1))),
+            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(0))),
+            (Value::F32(3.), Value::F32(-3.), Ok(Value::Generic(0))),
+            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(1))),
+            (Value::F64(3.), Value::F64(-3.), Ok(Value::Generic(0))),
+            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(1))),
+            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.le(v2, addr_mask), result);
+        }
+    }
+
+    #[test]
+    fn value_lt() {
+        let addr_mask = 0xffff_ffff;
+        for &(v1, v2, result) in &[
+            (Value::Generic(3), Value::Generic(!3), Ok(Value::Generic(0))),
+            (Value::Generic(!3), Value::Generic(3), Ok(Value::Generic(1))),
+            (Value::I8(3), Value::I8(!3), Ok(Value::Generic(0))),
+            (Value::I8(!3), Value::I8(3), Ok(Value::Generic(1))),
+            (Value::U8(3), Value::U8(!3), Ok(Value::Generic(1))),
+            (Value::U8(!3), Value::U8(3), Ok(Value::Generic(0))),
+            (Value::I16(3), Value::I16(!3), Ok(Value::Generic(0))),
+            (Value::I16(!3), Value::I16(3), Ok(Value::Generic(1))),
+            (Value::U16(3), Value::U16(!3), Ok(Value::Generic(1))),
+            (Value::U16(!3), Value::U16(3), Ok(Value::Generic(0))),
+            (Value::I32(3), Value::I32(!3), Ok(Value::Generic(0))),
+            (Value::I32(!3), Value::I32(3), Ok(Value::Generic(1))),
+            (Value::U32(3), Value::U32(!3), Ok(Value::Generic(1))),
+            (Value::U32(!3), Value::U32(3), Ok(Value::Generic(0))),
+            (Value::I64(3), Value::I64(!3), Ok(Value::Generic(0))),
+            (Value::I64(!3), Value::I64(3), Ok(Value::Generic(1))),
+            (Value::U64(3), Value::U64(!3), Ok(Value::Generic(1))),
+            (Value::U64(!3), Value::U64(3), Ok(Value::Generic(0))),
+            (Value::F32(3.), Value::F32(-3.), Ok(Value::Generic(0))),
+            (Value::F32(-3.), Value::F32(3.), Ok(Value::Generic(1))),
+            (Value::F64(3.), Value::F64(-3.), Ok(Value::Generic(0))),
+            (Value::F64(-3.), Value::F64(3.), Ok(Value::Generic(1))),
+            (Value::Generic(3), Value::U32(3), Err(Error::TypeMismatch)),
+        ] {
+            assert_eq!(v1.lt(v2, addr_mask), result);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/test_util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/test_util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/test_util.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/test_util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+#![allow(missing_docs)]
+
+use crate::Format;
+use test_assembler::{Label, Section};
+
+pub trait GimliSectionMethods {
+    fn sleb(self, val: i64) -> Self;
+    fn uleb(self, val: u64) -> Self;
+    fn initial_length(self, format: Format, length: &Label, start: &Label) -> Self;
+    fn word(self, size: u8, val: u64) -> Self;
+    fn word_label(self, size: u8, val: &Label) -> Self;
+}
+
+impl GimliSectionMethods for Section {
+    fn sleb(mut self, mut val: i64) -> Self {
+        while val & !0x3f != 0 && val | 0x3f != -1 {
+            self = self.D8(val as u8 | 0x80);
+            val >>= 7;
+        }
+        self.D8(val as u8 & 0x7f)
+    }
+
+    fn uleb(mut self, mut val: u64) -> Self {
+        while val & !0x7f != 0 {
+            self = self.D8(val as u8 | 0x80);
+            val >>= 7;
+        }
+        self.D8(val as u8)
+    }
+
+    fn initial_length(self, format: Format, length: &Label, start: &Label) -> Self {
+        match format {
+            Format::Dwarf32 => self.D32(length).mark(start),
+            Format::Dwarf64 => self.D32(0xffff_ffff).D64(length).mark(start),
+        }
+    }
+
+    fn word(self, size: u8, val: u64) -> Self {
+        match size {
+            4 => self.D32(val as u32),
+            8 => self.D64(val),
+            _ => panic!("unsupported word size"),
+        }
+    }
+
+    fn word_label(self, size: u8, val: &Label) -> Self {
+        match size {
+            4 => self.D32(val),
+            8 => self.D64(val),
+            _ => panic!("unsupported word size"),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/abbrev.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/abbrev.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/abbrev.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/abbrev.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,188 @@
+use alloc::vec::Vec;
+use indexmap::IndexSet;
+use std::ops::{Deref, DerefMut};
+
+use crate::common::{DebugAbbrevOffset, SectionId};
+use crate::constants;
+use crate::write::{Result, Section, Writer};
+
+/// A table of abbreviations that will be stored in a `.debug_abbrev` section.
+// Requirements:
+// - values are `Abbreviation`
+// - insertion returns an abbreviation code for use in writing a DIE
+// - inserting a duplicate returns the code of the existing value
+#[derive(Debug, Default)]
+pub(crate) struct AbbreviationTable {
+    abbrevs: IndexSet<Abbreviation>,
+}
+
+impl AbbreviationTable {
+    /// Add an abbreviation to the table and return its code.
+    pub fn add(&mut self, abbrev: Abbreviation) -> u64 {
+        let (code, _) = self.abbrevs.insert_full(abbrev);
+        // Code must be non-zero
+        (code + 1) as u64
+    }
+
+    /// Write the abbreviation table to the `.debug_abbrev` section.
+    pub fn write<W: Writer>(&self, w: &mut DebugAbbrev<W>) -> Result<()> {
+        for (code, abbrev) in self.abbrevs.iter().enumerate() {
+            w.write_uleb128((code + 1) as u64)?;
+            abbrev.write(w)?;
+        }
+        // Null abbreviation code
+        w.write_u8(0)
+    }
+}
+
+/// An abbreviation describes the shape of a `DebuggingInformationEntry`'s type:
+/// its tag type, whether it has children, and its set of attributes.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub(crate) struct Abbreviation {
+    tag: constants::DwTag,
+    has_children: bool,
+    attributes: Vec<AttributeSpecification>,
+}
+
+impl Abbreviation {
+    /// Construct a new `Abbreviation`.
+    #[inline]
+    pub fn new(
+        tag: constants::DwTag,
+        has_children: bool,
+        attributes: Vec<AttributeSpecification>,
+    ) -> Abbreviation {
+        Abbreviation {
+            tag,
+            has_children,
+            attributes,
+        }
+    }
+
+    /// Write the abbreviation to the `.debug_abbrev` section.
+    pub fn write<W: Writer>(&self, w: &mut DebugAbbrev<W>) -> Result<()> {
+        w.write_uleb128(self.tag.0.into())?;
+        w.write_u8(if self.has_children {
+            constants::DW_CHILDREN_yes.0
+        } else {
+            constants::DW_CHILDREN_no.0
+        })?;
+        for attr in &self.attributes {
+            attr.write(w)?;
+        }
+        // Null name and form
+        w.write_u8(0)?;
+        w.write_u8(0)
+    }
+}
+
+/// The description of an attribute in an abbreviated type.
+// TODO: support implicit const
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub(crate) struct AttributeSpecification {
+    name: constants::DwAt,
+    form: constants::DwForm,
+}
+
+impl AttributeSpecification {
+    /// Construct a new `AttributeSpecification`.
+    #[inline]
+    pub fn new(name: constants::DwAt, form: constants::DwForm) -> AttributeSpecification {
+        AttributeSpecification { name, form }
+    }
+
+    /// Write the attribute specification to the `.debug_abbrev` section.
+    #[inline]
+    pub fn write<W: Writer>(&self, w: &mut DebugAbbrev<W>) -> Result<()> {
+        w.write_uleb128(self.name.0.into())?;
+        w.write_uleb128(self.form.0.into())
+    }
+}
+
+define_section!(
+    DebugAbbrev,
+    DebugAbbrevOffset,
+    "A writable `.debug_abbrev` section."
+);
+
+#[cfg(test)]
+#[cfg(feature = "read")]
+mod tests {
+    use super::*;
+    use crate::constants;
+    use crate::read;
+    use crate::write::EndianVec;
+    use crate::LittleEndian;
+
+    #[test]
+    fn test_abbreviation_table() {
+        let mut abbrevs = AbbreviationTable::default();
+        let abbrev1 = Abbreviation::new(
+            constants::DW_TAG_subprogram,
+            false,
+            vec![AttributeSpecification::new(
+                constants::DW_AT_name,
+                constants::DW_FORM_string,
+            )],
+        );
+        let abbrev2 = Abbreviation::new(
+            constants::DW_TAG_compile_unit,
+            true,
+            vec![
+                AttributeSpecification::new(constants::DW_AT_producer, constants::DW_FORM_strp),
+                AttributeSpecification::new(constants::DW_AT_language, constants::DW_FORM_data2),
+            ],
+        );
+        let code1 = abbrevs.add(abbrev1.clone());
+        assert_eq!(code1, 1);
+        let code2 = abbrevs.add(abbrev2.clone());
+        assert_eq!(code2, 2);
+        assert_eq!(abbrevs.add(abbrev1.clone()), code1);
+        assert_eq!(abbrevs.add(abbrev2.clone()), code2);
+
+        let mut debug_abbrev = DebugAbbrev::from(EndianVec::new(LittleEndian));
+        let debug_abbrev_offset = debug_abbrev.offset();
+        assert_eq!(debug_abbrev_offset, DebugAbbrevOffset(0));
+        abbrevs.write(&mut debug_abbrev).unwrap();
+        assert_eq!(debug_abbrev.offset(), DebugAbbrevOffset(17));
+
+        let read_debug_abbrev = read::DebugAbbrev::new(debug_abbrev.slice(), LittleEndian);
+        let read_abbrevs = read_debug_abbrev
+            .abbreviations(debug_abbrev_offset)
+            .unwrap();
+
+        let read_abbrev1 = read_abbrevs.get(code1).unwrap();
+        assert_eq!(abbrev1.tag, read_abbrev1.tag());
+        assert_eq!(abbrev1.has_children, read_abbrev1.has_children());
+        assert_eq!(abbrev1.attributes.len(), read_abbrev1.attributes().len());
+        assert_eq!(
+            abbrev1.attributes[0].name,
+            read_abbrev1.attributes()[0].name()
+        );
+        assert_eq!(
+            abbrev1.attributes[0].form,
+            read_abbrev1.attributes()[0].form()
+        );
+
+        let read_abbrev2 = read_abbrevs.get(code2).unwrap();
+        assert_eq!(abbrev2.tag, read_abbrev2.tag());
+        assert_eq!(abbrev2.has_children, read_abbrev2.has_children());
+        assert_eq!(abbrev2.attributes.len(), read_abbrev2.attributes().len());
+        assert_eq!(
+            abbrev2.attributes[0].name,
+            read_abbrev2.attributes()[0].name()
+        );
+        assert_eq!(
+            abbrev2.attributes[0].form,
+            read_abbrev2.attributes()[0].form()
+        );
+        assert_eq!(
+            abbrev2.attributes[1].name,
+            read_abbrev2.attributes()[1].name()
+        );
+        assert_eq!(
+            abbrev2.attributes[1].form,
+            read_abbrev2.attributes()[1].form()
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/cfi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/cfi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/cfi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/cfi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1012 @@
+use alloc::vec::Vec;
+use indexmap::IndexSet;
+use std::ops::{Deref, DerefMut};
+
+use crate::common::{DebugFrameOffset, EhFrameOffset, Encoding, Format, Register, SectionId};
+use crate::constants;
+use crate::write::{Address, BaseId, Error, Expression, Result, Section, Writer};
+
+define_section!(
+    DebugFrame,
+    DebugFrameOffset,
+    "A writable `.debug_frame` section."
+);
+
+define_section!(EhFrame, EhFrameOffset, "A writable `.eh_frame` section.");
+
+define_id!(CieId, "An identifier for a CIE in a `FrameTable`.");
+
+/// A table of frame description entries.
+#[derive(Debug, Default)]
+pub struct FrameTable {
+    /// Base id for CIEs.
+    base_id: BaseId,
+    /// The common information entries.
+    cies: IndexSet<CommonInformationEntry>,
+    /// The frame description entries.
+    fdes: Vec<(CieId, FrameDescriptionEntry)>,
+}
+
+impl FrameTable {
+    /// Add a CIE and return its id.
+    ///
+    /// If the CIE already exists, then return the id of the existing CIE.
+    pub fn add_cie(&mut self, cie: CommonInformationEntry) -> CieId {
+        let (index, _) = self.cies.insert_full(cie);
+        CieId::new(self.base_id, index)
+    }
+
+    /// The number of CIEs.
+    pub fn cie_count(&self) -> usize {
+        self.cies.len()
+    }
+
+    /// Add a FDE.
+    ///
+    /// Does not check for duplicates.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the CIE id is invalid.
+    pub fn add_fde(&mut self, cie: CieId, fde: FrameDescriptionEntry) {
+        debug_assert_eq!(self.base_id, cie.base_id);
+        self.fdes.push((cie, fde));
+    }
+
+    /// The number of FDEs.
+    pub fn fde_count(&self) -> usize {
+        self.fdes.len()
+    }
+
+    /// Write the frame table entries to the given `.debug_frame` section.
+    pub fn write_debug_frame<W: Writer>(&self, w: &mut DebugFrame<W>) -> Result<()> {
+        self.write(&mut w.0, false)
+    }
+
+    /// Write the frame table entries to the given `.eh_frame` section.
+    pub fn write_eh_frame<W: Writer>(&self, w: &mut EhFrame<W>) -> Result<()> {
+        self.write(&mut w.0, true)
+    }
+
+    fn write<W: Writer>(&self, w: &mut W, eh_frame: bool) -> Result<()> {
+        let mut cie_offsets = vec![None; self.cies.len()];
+        for (cie_id, fde) in &self.fdes {
+            let cie_index = cie_id.index;
+            let cie = self.cies.get_index(cie_index).unwrap();
+            let cie_offset = match cie_offsets[cie_index] {
+                Some(offset) => offset,
+                None => {
+                    // Only write CIEs as they are referenced.
+                    let offset = cie.write(w, eh_frame)?;
+                    cie_offsets[cie_index] = Some(offset);
+                    offset
+                }
+            };
+
+            fde.write(w, eh_frame, cie_offset, cie)?;
+        }
+        // TODO: write length 0 terminator for eh_frame?
+        Ok(())
+    }
+}
+
+/// A common information entry. This contains information that is shared between FDEs.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct CommonInformationEntry {
+    encoding: Encoding,
+
+    /// A constant that is factored out of code offsets.
+    ///
+    /// This should be set to the minimum instruction length.
+    /// Writing a code offset that is not a multiple of this factor will generate an error.
+    code_alignment_factor: u8,
+
+    /// A constant that is factored out of data offsets.
+    ///
+    /// This should be set to the minimum data alignment for the frame.
+    /// Writing a data offset that is not a multiple of this factor will generate an error.
+    data_alignment_factor: i8,
+
+    /// The return address register. This might not correspond to an actual machine register.
+    return_address_register: Register,
+
+    /// The address of the personality function and its encoding.
+    pub personality: Option<(constants::DwEhPe, Address)>,
+
+    /// The encoding to use for the LSDA address in FDEs.
+    ///
+    /// If set then all FDEs which use this CIE must have a LSDA address.
+    pub lsda_encoding: Option<constants::DwEhPe>,
+
+    /// The encoding to use for addresses in FDEs.
+    pub fde_address_encoding: constants::DwEhPe,
+
+    /// True for signal trampolines.
+    pub signal_trampoline: bool,
+
+    /// The initial instructions upon entry to this function.
+    instructions: Vec<CallFrameInstruction>,
+}
+
+impl CommonInformationEntry {
+    /// Create a new common information entry.
+    ///
+    /// The encoding version must be a CFI version, not a DWARF version.
+    pub fn new(
+        encoding: Encoding,
+        code_alignment_factor: u8,
+        data_alignment_factor: i8,
+        return_address_register: Register,
+    ) -> Self {
+        CommonInformationEntry {
+            encoding,
+            code_alignment_factor,
+            data_alignment_factor,
+            return_address_register,
+            personality: None,
+            lsda_encoding: None,
+            fde_address_encoding: constants::DW_EH_PE_absptr,
+            signal_trampoline: false,
+            instructions: Vec::new(),
+        }
+    }
+
+    /// Add an initial instruction.
+    pub fn add_instruction(&mut self, instruction: CallFrameInstruction) {
+        self.instructions.push(instruction);
+    }
+
+    fn has_augmentation(&self) -> bool {
+        self.personality.is_some()
+            || self.lsda_encoding.is_some()
+            || self.signal_trampoline
+            || self.fde_address_encoding != constants::DW_EH_PE_absptr
+    }
+
+    /// Returns the section offset of the CIE.
+    fn write<W: Writer>(&self, w: &mut W, eh_frame: bool) -> Result<usize> {
+        let encoding = self.encoding;
+        let offset = w.len();
+
+        let length_offset = w.write_initial_length(encoding.format)?;
+        let length_base = w.len();
+
+        if eh_frame {
+            w.write_u32(0)?;
+        } else {
+            match encoding.format {
+                Format::Dwarf32 => w.write_u32(0xffff_ffff)?,
+                Format::Dwarf64 => w.write_u64(0xffff_ffff_ffff_ffff)?,
+            }
+        }
+
+        if eh_frame {
+            if encoding.version != 1 {
+                return Err(Error::UnsupportedVersion(encoding.version));
+            };
+        } else {
+            match encoding.version {
+                1 | 3 | 4 => {}
+                _ => return Err(Error::UnsupportedVersion(encoding.version)),
+            };
+        }
+        w.write_u8(encoding.version as u8)?;
+
+        let augmentation = self.has_augmentation();
+        if augmentation {
+            w.write_u8(b'z')?;
+            if self.lsda_encoding.is_some() {
+                w.write_u8(b'L')?;
+            }
+            if self.personality.is_some() {
+                w.write_u8(b'P')?;
+            }
+            if self.fde_address_encoding != constants::DW_EH_PE_absptr {
+                w.write_u8(b'R')?;
+            }
+            if self.signal_trampoline {
+                w.write_u8(b'S')?;
+            }
+        }
+        w.write_u8(0)?;
+
+        if encoding.version >= 4 {
+            w.write_u8(encoding.address_size)?;
+            // TODO: segment_selector_size
+            w.write_u8(0)?;
+        }
+
+        w.write_uleb128(self.code_alignment_factor.into())?;
+        w.write_sleb128(self.data_alignment_factor.into())?;
+
+        if !eh_frame && encoding.version == 1 {
+            let register = self.return_address_register.0 as u8;
+            if u16::from(register) != self.return_address_register.0 {
+                return Err(Error::ValueTooLarge);
+            }
+            w.write_u8(register)?;
+        } else {
+            w.write_uleb128(self.return_address_register.0.into())?;
+        }
+
+        if augmentation {
+            let augmentation_length_offset = w.len();
+            w.write_u8(0)?;
+            let augmentation_length_base = w.len();
+
+            if let Some(eh_pe) = self.lsda_encoding {
+                w.write_u8(eh_pe.0)?;
+            }
+            if let Some((eh_pe, address)) = self.personality {
+                w.write_u8(eh_pe.0)?;
+                w.write_eh_pointer(address, constants::DW_EH_PE_absptr, encoding.address_size)?;
+            }
+            if self.fde_address_encoding != constants::DW_EH_PE_absptr {
+                w.write_u8(self.fde_address_encoding.0)?;
+            }
+
+            let augmentation_length = (w.len() - augmentation_length_base) as u64;
+            debug_assert!(augmentation_length < 0x80);
+            w.write_udata_at(augmentation_length_offset, augmentation_length, 1)?;
+        }
+
+        for instruction in &self.instructions {
+            instruction.write(w, encoding, self)?;
+        }
+
+        write_nop(
+            w,
+            encoding.format.word_size() as usize + w.len() - length_base,
+            encoding.address_size,
+        )?;
+
+        let length = (w.len() - length_base) as u64;
+        w.write_initial_length_at(length_offset, length, encoding.format)?;
+
+        Ok(offset)
+    }
+}
+
+/// A frame description entry. There should be one FDE per function.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct FrameDescriptionEntry {
+    /// The initial address of the function.
+    address: Address,
+
+    /// The length in bytes of the function.
+    length: u32,
+
+    /// The address of the LSDA.
+    pub lsda: Option<Address>,
+
+    /// The instructions for this function, ordered by offset.
+    instructions: Vec<(u32, CallFrameInstruction)>,
+}
+
+impl FrameDescriptionEntry {
+    /// Create a new frame description entry for a function.
+    pub fn new(address: Address, length: u32) -> Self {
+        FrameDescriptionEntry {
+            address,
+            length,
+            lsda: None,
+            instructions: Vec::new(),
+        }
+    }
+
+    /// Add an instruction.
+    ///
+    /// Instructions must be added in increasing order of offset, or writing will fail.
+    pub fn add_instruction(&mut self, offset: u32, instruction: CallFrameInstruction) {
+        debug_assert!(self.instructions.last().map(|x| x.0).unwrap_or(0) <= offset);
+        self.instructions.push((offset, instruction));
+    }
+
+    fn write<W: Writer>(
+        &self,
+        w: &mut W,
+        eh_frame: bool,
+        cie_offset: usize,
+        cie: &CommonInformationEntry,
+    ) -> Result<()> {
+        let encoding = cie.encoding;
+        let length_offset = w.write_initial_length(encoding.format)?;
+        let length_base = w.len();
+
+        if eh_frame {
+            // .eh_frame uses a relative offset which doesn't need relocation.
+            w.write_udata((w.len() - cie_offset) as u64, 4)?;
+        } else {
+            w.write_offset(
+                cie_offset,
+                SectionId::DebugFrame,
+                encoding.format.word_size(),
+            )?;
+        }
+
+        if cie.fde_address_encoding != constants::DW_EH_PE_absptr {
+            w.write_eh_pointer(
+                self.address,
+                cie.fde_address_encoding,
+                encoding.address_size,
+            )?;
+            w.write_eh_pointer_data(
+                self.length.into(),
+                cie.fde_address_encoding.format(),
+                encoding.address_size,
+            )?;
+        } else {
+            w.write_address(self.address, encoding.address_size)?;
+            w.write_udata(self.length.into(), encoding.address_size)?;
+        }
+
+        if cie.has_augmentation() {
+            let mut augmentation_length = 0u64;
+            if self.lsda.is_some() {
+                augmentation_length += u64::from(encoding.address_size);
+            }
+            w.write_uleb128(augmentation_length)?;
+
+            debug_assert_eq!(self.lsda.is_some(), cie.lsda_encoding.is_some());
+            if let (Some(lsda), Some(lsda_encoding)) = (self.lsda, cie.lsda_encoding) {
+                w.write_eh_pointer(lsda, lsda_encoding, encoding.address_size)?;
+            }
+        }
+
+        let mut prev_offset = 0;
+        for (offset, instruction) in &self.instructions {
+            write_advance_loc(w, cie.code_alignment_factor, prev_offset, *offset)?;
+            prev_offset = *offset;
+            instruction.write(w, encoding, cie)?;
+        }
+
+        write_nop(
+            w,
+            encoding.format.word_size() as usize + w.len() - length_base,
+            encoding.address_size,
+        )?;
+
+        let length = (w.len() - length_base) as u64;
+        w.write_initial_length_at(length_offset, length, encoding.format)?;
+
+        Ok(())
+    }
+}
+
+/// An instruction in a frame description entry.
+///
+/// This may be a CFA definition, a register rule, or some other directive.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum CallFrameInstruction {
+    /// Define the CFA rule to use the provided register and offset.
+    Cfa(Register, i32),
+    /// Update the CFA rule to use the provided register. The offset is unchanged.
+    CfaRegister(Register),
+    /// Update the CFA rule to use the provided offset. The register is unchanged.
+    CfaOffset(i32),
+    /// Define the CFA rule to use the provided expression.
+    CfaExpression(Expression),
+
+    /// Restore the initial rule for the register.
+    Restore(Register),
+    /// The previous value of the register is not recoverable.
+    Undefined(Register),
+    /// The register has not been modified.
+    SameValue(Register),
+    /// The previous value of the register is saved at address CFA + offset.
+    Offset(Register, i32),
+    /// The previous value of the register is CFA + offset.
+    ValOffset(Register, i32),
+    /// The previous value of the register is stored in another register.
+    Register(Register, Register),
+    /// The previous value of the register is saved at address given by the expression.
+    Expression(Register, Expression),
+    /// The previous value of the register is given by the expression.
+    ValExpression(Register, Expression),
+
+    /// Push all register rules onto a stack.
+    RememberState,
+    /// Pop all register rules off the stack.
+    RestoreState,
+    /// The size of the arguments that have been pushed onto the stack.
+    ArgsSize(u32),
+}
+
+impl CallFrameInstruction {
+    fn write<W: Writer>(
+        &self,
+        w: &mut W,
+        encoding: Encoding,
+        cie: &CommonInformationEntry,
+    ) -> Result<()> {
+        match *self {
+            CallFrameInstruction::Cfa(register, offset) => {
+                if offset < 0 {
+                    let offset = factored_data_offset(offset, cie.data_alignment_factor)?;
+                    w.write_u8(constants::DW_CFA_def_cfa_sf.0)?;
+                    w.write_uleb128(register.0.into())?;
+                    w.write_sleb128(offset.into())?;
+                } else {
+                    // Unfactored offset.
+                    w.write_u8(constants::DW_CFA_def_cfa.0)?;
+                    w.write_uleb128(register.0.into())?;
+                    w.write_uleb128(offset as u64)?;
+                }
+            }
+            CallFrameInstruction::CfaRegister(register) => {
+                w.write_u8(constants::DW_CFA_def_cfa_register.0)?;
+                w.write_uleb128(register.0.into())?;
+            }
+            CallFrameInstruction::CfaOffset(offset) => {
+                if offset < 0 {
+                    let offset = factored_data_offset(offset, cie.data_alignment_factor)?;
+                    w.write_u8(constants::DW_CFA_def_cfa_offset_sf.0)?;
+                    w.write_sleb128(offset.into())?;
+                } else {
+                    // Unfactored offset.
+                    w.write_u8(constants::DW_CFA_def_cfa_offset.0)?;
+                    w.write_uleb128(offset as u64)?;
+                }
+            }
+            CallFrameInstruction::CfaExpression(ref expression) => {
+                w.write_u8(constants::DW_CFA_def_cfa_expression.0)?;
+                w.write_uleb128(expression.size(encoding, None) as u64)?;
+                expression.write(w, None, encoding, None)?;
+            }
+            CallFrameInstruction::Restore(register) => {
+                if register.0 < 0x40 {
+                    w.write_u8(constants::DW_CFA_restore.0 | register.0 as u8)?;
+                } else {
+                    w.write_u8(constants::DW_CFA_restore_extended.0)?;
+                    w.write_uleb128(register.0.into())?;
+                }
+            }
+            CallFrameInstruction::Undefined(register) => {
+                w.write_u8(constants::DW_CFA_undefined.0)?;
+                w.write_uleb128(register.0.into())?;
+            }
+            CallFrameInstruction::SameValue(register) => {
+                w.write_u8(constants::DW_CFA_same_value.0)?;
+                w.write_uleb128(register.0.into())?;
+            }
+            CallFrameInstruction::Offset(register, offset) => {
+                let offset = factored_data_offset(offset, cie.data_alignment_factor)?;
+                if offset < 0 {
+                    w.write_u8(constants::DW_CFA_offset_extended_sf.0)?;
+                    w.write_uleb128(register.0.into())?;
+                    w.write_sleb128(offset.into())?;
+                } else if register.0 < 0x40 {
+                    w.write_u8(constants::DW_CFA_offset.0 | register.0 as u8)?;
+                    w.write_uleb128(offset as u64)?;
+                } else {
+                    w.write_u8(constants::DW_CFA_offset_extended.0)?;
+                    w.write_uleb128(register.0.into())?;
+                    w.write_uleb128(offset as u64)?;
+                }
+            }
+            CallFrameInstruction::ValOffset(register, offset) => {
+                let offset = factored_data_offset(offset, cie.data_alignment_factor)?;
+                if offset < 0 {
+                    w.write_u8(constants::DW_CFA_val_offset_sf.0)?;
+                    w.write_uleb128(register.0.into())?;
+                    w.write_sleb128(offset.into())?;
+                } else {
+                    w.write_u8(constants::DW_CFA_val_offset.0)?;
+                    w.write_uleb128(register.0.into())?;
+                    w.write_uleb128(offset as u64)?;
+                }
+            }
+            CallFrameInstruction::Register(register1, register2) => {
+                w.write_u8(constants::DW_CFA_register.0)?;
+                w.write_uleb128(register1.0.into())?;
+                w.write_uleb128(register2.0.into())?;
+            }
+            CallFrameInstruction::Expression(register, ref expression) => {
+                w.write_u8(constants::DW_CFA_expression.0)?;
+                w.write_uleb128(register.0.into())?;
+                w.write_uleb128(expression.size(encoding, None) as u64)?;
+                expression.write(w, None, encoding, None)?;
+            }
+            CallFrameInstruction::ValExpression(register, ref expression) => {
+                w.write_u8(constants::DW_CFA_val_expression.0)?;
+                w.write_uleb128(register.0.into())?;
+                w.write_uleb128(expression.size(encoding, None) as u64)?;
+                expression.write(w, None, encoding, None)?;
+            }
+            CallFrameInstruction::RememberState => {
+                w.write_u8(constants::DW_CFA_remember_state.0)?;
+            }
+            CallFrameInstruction::RestoreState => {
+                w.write_u8(constants::DW_CFA_restore_state.0)?;
+            }
+            CallFrameInstruction::ArgsSize(size) => {
+                w.write_u8(constants::DW_CFA_GNU_args_size.0)?;
+                w.write_uleb128(size.into())?;
+            }
+        }
+        Ok(())
+    }
+}
+
+fn write_advance_loc<W: Writer>(
+    w: &mut W,
+    code_alignment_factor: u8,
+    prev_offset: u32,
+    offset: u32,
+) -> Result<()> {
+    if offset == prev_offset {
+        return Ok(());
+    }
+    let delta = factored_code_delta(prev_offset, offset, code_alignment_factor)?;
+    if delta < 0x40 {
+        w.write_u8(constants::DW_CFA_advance_loc.0 | delta as u8)?;
+    } else if delta < 0x100 {
+        w.write_u8(constants::DW_CFA_advance_loc1.0)?;
+        w.write_u8(delta as u8)?;
+    } else if delta < 0x10000 {
+        w.write_u8(constants::DW_CFA_advance_loc2.0)?;
+        w.write_u16(delta as u16)?;
+    } else {
+        w.write_u8(constants::DW_CFA_advance_loc4.0)?;
+        w.write_u32(delta)?;
+    }
+    Ok(())
+}
+
+fn write_nop<W: Writer>(w: &mut W, len: usize, align: u8) -> Result<()> {
+    debug_assert_eq!(align & (align - 1), 0);
+    let tail_len = (!len + 1) & (align as usize - 1);
+    for _ in 0..tail_len {
+        w.write_u8(constants::DW_CFA_nop.0)?;
+    }
+    Ok(())
+}
+
+fn factored_code_delta(prev_offset: u32, offset: u32, factor: u8) -> Result<u32> {
+    if offset < prev_offset {
+        return Err(Error::InvalidFrameCodeOffset(offset));
+    }
+    let delta = offset - prev_offset;
+    let factor = u32::from(factor);
+    let factored_delta = delta / factor;
+    if delta != factored_delta * factor {
+        return Err(Error::InvalidFrameCodeOffset(offset));
+    }
+    Ok(factored_delta)
+}
+
+fn factored_data_offset(offset: i32, factor: i8) -> Result<i32> {
+    let factor = i32::from(factor);
+    let factored_offset = offset / factor;
+    if offset != factored_offset * factor {
+        return Err(Error::InvalidFrameDataOffset(offset));
+    }
+    Ok(factored_offset)
+}
+
+#[cfg(feature = "read")]
+pub(crate) mod convert {
+    use super::*;
+    use crate::read::{self, Reader};
+    use crate::write::{ConvertError, ConvertResult};
+    use std::collections::{hash_map, HashMap};
+
+    impl FrameTable {
+        /// Create a frame table by reading the data in the given section.
+        ///
+        /// `convert_address` is a function to convert read addresses into the `Address`
+        /// type. For non-relocatable addresses, this function may simply return
+        /// `Address::Constant(address)`. For relocatable addresses, it is the caller's
+        /// responsibility to determine the symbol and addend corresponding to the address
+        /// and return `Address::Symbol { symbol, addend }`.
+        pub fn from<R, Section>(
+            frame: &Section,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+        ) -> ConvertResult<FrameTable>
+        where
+            R: Reader<Offset = usize>,
+            Section: read::UnwindSection<R>,
+            Section::Offset: read::UnwindOffset<usize>,
+        {
+            let bases = read::BaseAddresses::default().set_eh_frame(0);
+
+            let mut frame_table = FrameTable::default();
+
+            let mut cie_ids = HashMap::new();
+            let mut entries = frame.entries(&bases);
+            while let Some(entry) = entries.next()? {
+                let partial = match entry {
+                    read::CieOrFde::Cie(_) => continue,
+                    read::CieOrFde::Fde(partial) => partial,
+                };
+
+                // TODO: is it worth caching the parsed CIEs? It would be better if FDEs only
+                // stored a reference.
+                let from_fde = partial.parse(Section::cie_from_offset)?;
+                let from_cie = from_fde.cie();
+                let cie_id = match cie_ids.entry(from_cie.offset()) {
+                    hash_map::Entry::Occupied(o) => *o.get(),
+                    hash_map::Entry::Vacant(e) => {
+                        let cie =
+                            CommonInformationEntry::from(from_cie, frame, &bases, convert_address)?;
+                        let cie_id = frame_table.add_cie(cie);
+                        e.insert(cie_id);
+                        cie_id
+                    }
+                };
+                let fde = FrameDescriptionEntry::from(&from_fde, frame, &bases, convert_address)?;
+                frame_table.add_fde(cie_id, fde);
+            }
+
+            Ok(frame_table)
+        }
+    }
+
+    impl CommonInformationEntry {
+        fn from<R, Section>(
+            from_cie: &read::CommonInformationEntry<R>,
+            frame: &Section,
+            bases: &read::BaseAddresses,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+        ) -> ConvertResult<CommonInformationEntry>
+        where
+            R: Reader<Offset = usize>,
+            Section: read::UnwindSection<R>,
+            Section::Offset: read::UnwindOffset<usize>,
+        {
+            let mut cie = CommonInformationEntry::new(
+                from_cie.encoding(),
+                from_cie.code_alignment_factor() as u8,
+                from_cie.data_alignment_factor() as i8,
+                from_cie.return_address_register(),
+            );
+
+            cie.personality = match from_cie.personality_with_encoding() {
+                // We treat these the same because the encoding already determines
+                // whether it is indirect.
+                Some((eh_pe, read::Pointer::Direct(p)))
+                | Some((eh_pe, read::Pointer::Indirect(p))) => {
+                    let address = convert_address(p).ok_or(ConvertError::InvalidAddress)?;
+                    Some((eh_pe, address))
+                }
+                _ => None,
+            };
+            cie.lsda_encoding = from_cie.lsda_encoding();
+            cie.fde_address_encoding = from_cie
+                .fde_address_encoding()
+                .unwrap_or(constants::DW_EH_PE_absptr);
+            cie.signal_trampoline = from_cie.is_signal_trampoline();
+
+            let mut offset = 0;
+            let mut from_instructions = from_cie.instructions(frame, bases);
+            while let Some(from_instruction) = from_instructions.next()? {
+                if let Some(instruction) = CallFrameInstruction::from(
+                    from_instruction,
+                    from_cie,
+                    convert_address,
+                    &mut offset,
+                )? {
+                    cie.instructions.push(instruction);
+                }
+            }
+            Ok(cie)
+        }
+    }
+
+    impl FrameDescriptionEntry {
+        fn from<R, Section>(
+            from_fde: &read::FrameDescriptionEntry<R>,
+            frame: &Section,
+            bases: &read::BaseAddresses,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+        ) -> ConvertResult<FrameDescriptionEntry>
+        where
+            R: Reader<Offset = usize>,
+            Section: read::UnwindSection<R>,
+            Section::Offset: read::UnwindOffset<usize>,
+        {
+            let address =
+                convert_address(from_fde.initial_address()).ok_or(ConvertError::InvalidAddress)?;
+            let length = from_fde.len() as u32;
+            let mut fde = FrameDescriptionEntry::new(address, length);
+
+            match from_fde.lsda() {
+                // We treat these the same because the encoding already determines
+                // whether it is indirect.
+                Some(read::Pointer::Direct(p)) | Some(read::Pointer::Indirect(p)) => {
+                    let address = convert_address(p).ok_or(ConvertError::InvalidAddress)?;
+                    fde.lsda = Some(address);
+                }
+                None => {}
+            }
+
+            let from_cie = from_fde.cie();
+            let mut offset = 0;
+            let mut from_instructions = from_fde.instructions(frame, bases);
+            while let Some(from_instruction) = from_instructions.next()? {
+                if let Some(instruction) = CallFrameInstruction::from(
+                    from_instruction,
+                    from_cie,
+                    convert_address,
+                    &mut offset,
+                )? {
+                    fde.instructions.push((offset, instruction));
+                }
+            }
+
+            Ok(fde)
+        }
+    }
+
+    impl CallFrameInstruction {
+        fn from<R: Reader<Offset = usize>>(
+            from_instruction: read::CallFrameInstruction<R>,
+            from_cie: &read::CommonInformationEntry<R>,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+            offset: &mut u32,
+        ) -> ConvertResult<Option<CallFrameInstruction>> {
+            let convert_expression =
+                |x| Expression::from(x, from_cie.encoding(), None, None, None, convert_address);
+            // TODO: validate integer type conversions
+            Ok(Some(match from_instruction {
+                read::CallFrameInstruction::SetLoc { .. } => {
+                    return Err(ConvertError::UnsupportedCfiInstruction);
+                }
+                read::CallFrameInstruction::AdvanceLoc { delta } => {
+                    *offset += delta * from_cie.code_alignment_factor() as u32;
+                    return Ok(None);
+                }
+                read::CallFrameInstruction::DefCfa { register, offset } => {
+                    CallFrameInstruction::Cfa(register, offset as i32)
+                }
+                read::CallFrameInstruction::DefCfaSf {
+                    register,
+                    factored_offset,
+                } => {
+                    let offset = factored_offset * from_cie.data_alignment_factor();
+                    CallFrameInstruction::Cfa(register, offset as i32)
+                }
+                read::CallFrameInstruction::DefCfaRegister { register } => {
+                    CallFrameInstruction::CfaRegister(register)
+                }
+
+                read::CallFrameInstruction::DefCfaOffset { offset } => {
+                    CallFrameInstruction::CfaOffset(offset as i32)
+                }
+                read::CallFrameInstruction::DefCfaOffsetSf { factored_offset } => {
+                    let offset = factored_offset * from_cie.data_alignment_factor();
+                    CallFrameInstruction::CfaOffset(offset as i32)
+                }
+                read::CallFrameInstruction::DefCfaExpression { expression } => {
+                    CallFrameInstruction::CfaExpression(convert_expression(expression)?)
+                }
+                read::CallFrameInstruction::Undefined { register } => {
+                    CallFrameInstruction::Undefined(register)
+                }
+                read::CallFrameInstruction::SameValue { register } => {
+                    CallFrameInstruction::SameValue(register)
+                }
+                read::CallFrameInstruction::Offset {
+                    register,
+                    factored_offset,
+                } => {
+                    let offset = factored_offset as i64 * from_cie.data_alignment_factor();
+                    CallFrameInstruction::Offset(register, offset as i32)
+                }
+                read::CallFrameInstruction::OffsetExtendedSf {
+                    register,
+                    factored_offset,
+                } => {
+                    let offset = factored_offset * from_cie.data_alignment_factor();
+                    CallFrameInstruction::Offset(register, offset as i32)
+                }
+                read::CallFrameInstruction::ValOffset {
+                    register,
+                    factored_offset,
+                } => {
+                    let offset = factored_offset as i64 * from_cie.data_alignment_factor();
+                    CallFrameInstruction::ValOffset(register, offset as i32)
+                }
+                read::CallFrameInstruction::ValOffsetSf {
+                    register,
+                    factored_offset,
+                } => {
+                    let offset = factored_offset * from_cie.data_alignment_factor();
+                    CallFrameInstruction::ValOffset(register, offset as i32)
+                }
+                read::CallFrameInstruction::Register {
+                    dest_register,
+                    src_register,
+                } => CallFrameInstruction::Register(dest_register, src_register),
+                read::CallFrameInstruction::Expression {
+                    register,
+                    expression,
+                } => CallFrameInstruction::Expression(register, convert_expression(expression)?),
+                read::CallFrameInstruction::ValExpression {
+                    register,
+                    expression,
+                } => CallFrameInstruction::ValExpression(register, convert_expression(expression)?),
+                read::CallFrameInstruction::Restore { register } => {
+                    CallFrameInstruction::Restore(register)
+                }
+                read::CallFrameInstruction::RememberState => CallFrameInstruction::RememberState,
+                read::CallFrameInstruction::RestoreState => CallFrameInstruction::RestoreState,
+                read::CallFrameInstruction::ArgsSize { size } => {
+                    CallFrameInstruction::ArgsSize(size as u32)
+                }
+                read::CallFrameInstruction::Nop => return Ok(None),
+            }))
+        }
+    }
+}
+
+#[cfg(test)]
+#[cfg(feature = "read")]
+mod tests {
+    use super::*;
+    use crate::arch::X86_64;
+    use crate::read;
+    use crate::write::EndianVec;
+    use crate::LittleEndian;
+
+    #[test]
+    fn test_frame_table() {
+        for &version in &[1, 3, 4] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+                    let mut frames = FrameTable::default();
+
+                    let cie1 = CommonInformationEntry::new(encoding, 1, 8, X86_64::RA);
+                    let cie1_id = frames.add_cie(cie1.clone());
+                    assert_eq!(cie1_id, frames.add_cie(cie1.clone()));
+
+                    let mut cie2 = CommonInformationEntry::new(encoding, 1, 8, X86_64::RA);
+                    cie2.lsda_encoding = Some(constants::DW_EH_PE_absptr);
+                    cie2.personality =
+                        Some((constants::DW_EH_PE_absptr, Address::Constant(0x1234)));
+                    cie2.signal_trampoline = true;
+                    let cie2_id = frames.add_cie(cie2.clone());
+                    assert_ne!(cie1_id, cie2_id);
+                    assert_eq!(cie2_id, frames.add_cie(cie2.clone()));
+
+                    let fde1 = FrameDescriptionEntry::new(Address::Constant(0x1000), 0x10);
+                    frames.add_fde(cie1_id, fde1.clone());
+
+                    let fde2 = FrameDescriptionEntry::new(Address::Constant(0x2000), 0x20);
+                    frames.add_fde(cie1_id, fde2.clone());
+
+                    let mut fde3 = FrameDescriptionEntry::new(Address::Constant(0x3000), 0x30);
+                    fde3.lsda = Some(Address::Constant(0x3300));
+                    frames.add_fde(cie2_id, fde3.clone());
+
+                    let mut fde4 = FrameDescriptionEntry::new(Address::Constant(0x4000), 0x40);
+                    fde4.lsda = Some(Address::Constant(0x4400));
+                    frames.add_fde(cie2_id, fde4.clone());
+
+                    // Test writing `.debug_frame`.
+                    let mut debug_frame = DebugFrame::from(EndianVec::new(LittleEndian));
+                    frames.write_debug_frame(&mut debug_frame).unwrap();
+
+                    let mut read_debug_frame =
+                        read::DebugFrame::new(debug_frame.slice(), LittleEndian);
+                    read_debug_frame.set_address_size(address_size);
+                    let convert_frames = FrameTable::from(&read_debug_frame, &|address| {
+                        Some(Address::Constant(address))
+                    })
+                    .unwrap();
+                    assert_eq!(frames.cies, convert_frames.cies);
+                    assert_eq!(frames.fdes.len(), convert_frames.fdes.len());
+                    for (a, b) in frames.fdes.iter().zip(convert_frames.fdes.iter()) {
+                        assert_eq!(a.1, b.1);
+                    }
+
+                    if version == 1 {
+                        // Test writing `.eh_frame`.
+                        let mut eh_frame = EhFrame::from(EndianVec::new(LittleEndian));
+                        frames.write_eh_frame(&mut eh_frame).unwrap();
+
+                        let mut read_eh_frame = read::EhFrame::new(eh_frame.slice(), LittleEndian);
+                        read_eh_frame.set_address_size(address_size);
+                        let convert_frames = FrameTable::from(&read_eh_frame, &|address| {
+                            Some(Address::Constant(address))
+                        })
+                        .unwrap();
+                        assert_eq!(frames.cies, convert_frames.cies);
+                        assert_eq!(frames.fdes.len(), convert_frames.fdes.len());
+                        for (a, b) in frames.fdes.iter().zip(convert_frames.fdes.iter()) {
+                            assert_eq!(a.1, b.1);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_frame_instruction() {
+        let mut expression = Expression::new();
+        expression.op_constu(0);
+
+        let cie_instructions = [
+            CallFrameInstruction::Cfa(X86_64::RSP, 8),
+            CallFrameInstruction::Offset(X86_64::RA, -8),
+        ];
+
+        let fde_instructions = [
+            (0, CallFrameInstruction::Cfa(X86_64::RSP, 0)),
+            (0, CallFrameInstruction::Cfa(X86_64::RSP, -8)),
+            (2, CallFrameInstruction::CfaRegister(X86_64::RBP)),
+            (4, CallFrameInstruction::CfaOffset(8)),
+            (4, CallFrameInstruction::CfaOffset(0)),
+            (4, CallFrameInstruction::CfaOffset(-8)),
+            (6, CallFrameInstruction::CfaExpression(expression.clone())),
+            (8, CallFrameInstruction::Restore(Register(1))),
+            (8, CallFrameInstruction::Restore(Register(101))),
+            (10, CallFrameInstruction::Undefined(Register(2))),
+            (12, CallFrameInstruction::SameValue(Register(3))),
+            (14, CallFrameInstruction::Offset(Register(4), 16)),
+            (14, CallFrameInstruction::Offset(Register(104), 16)),
+            (16, CallFrameInstruction::ValOffset(Register(5), -24)),
+            (16, CallFrameInstruction::ValOffset(Register(5), 24)),
+            (18, CallFrameInstruction::Register(Register(6), Register(7))),
+            (
+                20,
+                CallFrameInstruction::Expression(Register(8), expression.clone()),
+            ),
+            (
+                22,
+                CallFrameInstruction::ValExpression(Register(9), expression.clone()),
+            ),
+            (24 + 0x80, CallFrameInstruction::RememberState),
+            (26 + 0x280, CallFrameInstruction::RestoreState),
+            (28 + 0x20280, CallFrameInstruction::ArgsSize(23)),
+        ];
+
+        for &version in &[1, 3, 4] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+                    let mut frames = FrameTable::default();
+
+                    let mut cie = CommonInformationEntry::new(encoding, 2, 8, X86_64::RA);
+                    for i in &cie_instructions {
+                        cie.add_instruction(i.clone());
+                    }
+                    let cie_id = frames.add_cie(cie);
+
+                    let mut fde = FrameDescriptionEntry::new(Address::Constant(0x1000), 0x10);
+                    for (o, i) in &fde_instructions {
+                        fde.add_instruction(*o, i.clone());
+                    }
+                    frames.add_fde(cie_id, fde);
+
+                    let mut debug_frame = DebugFrame::from(EndianVec::new(LittleEndian));
+                    frames.write_debug_frame(&mut debug_frame).unwrap();
+
+                    let mut read_debug_frame =
+                        read::DebugFrame::new(debug_frame.slice(), LittleEndian);
+                    read_debug_frame.set_address_size(address_size);
+                    let frames = FrameTable::from(&read_debug_frame, &|address| {
+                        Some(Address::Constant(address))
+                    })
+                    .unwrap();
+
+                    assert_eq!(
+                        &frames.cies.get_index(0).unwrap().instructions,
+                        &cie_instructions
+                    );
+                    assert_eq!(&frames.fdes[0].1.instructions, &fde_instructions);
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/dwarf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/dwarf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/dwarf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/dwarf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,138 @@
+use alloc::vec::Vec;
+
+use crate::common::Encoding;
+use crate::write::{
+    AbbreviationTable, LineProgram, LineStringTable, Result, Sections, StringTable, Unit,
+    UnitTable, Writer,
+};
+
+/// Writable DWARF information for more than one unit.
+#[derive(Debug, Default)]
+pub struct Dwarf {
+    /// A table of units. These are primarily stored in the `.debug_info` section,
+    /// but they also contain information that is stored in other sections.
+    pub units: UnitTable,
+
+    /// Extra line number programs that are not associated with a unit.
+    ///
+    /// These should only be used when generating DWARF5 line-only debug
+    /// information.
+    pub line_programs: Vec<LineProgram>,
+
+    /// A table of strings that will be stored in the `.debug_line_str` section.
+    pub line_strings: LineStringTable,
+
+    /// A table of strings that will be stored in the `.debug_str` section.
+    pub strings: StringTable,
+}
+
+impl Dwarf {
+    /// Create a new `Dwarf` instance.
+    #[inline]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Write the DWARF information to the given sections.
+    pub fn write<W: Writer>(&mut self, sections: &mut Sections<W>) -> Result<()> {
+        let line_strings = self.line_strings.write(&mut sections.debug_line_str)?;
+        let strings = self.strings.write(&mut sections.debug_str)?;
+        self.units.write(sections, &line_strings, &strings)?;
+        for line_program in &self.line_programs {
+            line_program.write(
+                &mut sections.debug_line,
+                line_program.encoding(),
+                &line_strings,
+                &strings,
+            )?;
+        }
+        Ok(())
+    }
+}
+
+/// Writable DWARF information for a single unit.
+#[derive(Debug)]
+pub struct DwarfUnit {
+    /// A unit. This is primarily stored in the `.debug_info` section,
+    /// but also contains information that is stored in other sections.
+    pub unit: Unit,
+
+    /// A table of strings that will be stored in the `.debug_line_str` section.
+    pub line_strings: LineStringTable,
+
+    /// A table of strings that will be stored in the `.debug_str` section.
+    pub strings: StringTable,
+}
+
+impl DwarfUnit {
+    /// Create a new `DwarfUnit`.
+    ///
+    /// Note: you should set `self.unit.line_program` after creation.
+    /// This cannot be done earlier because it may need to reference
+    /// `self.line_strings`.
+    pub fn new(encoding: Encoding) -> Self {
+        let unit = Unit::new(encoding, LineProgram::none());
+        DwarfUnit {
+            unit,
+            line_strings: LineStringTable::default(),
+            strings: StringTable::default(),
+        }
+    }
+
+    /// Write the DWARf information to the given sections.
+    pub fn write<W: Writer>(&mut self, sections: &mut Sections<W>) -> Result<()> {
+        let line_strings = self.line_strings.write(&mut sections.debug_line_str)?;
+        let strings = self.strings.write(&mut sections.debug_str)?;
+
+        let abbrev_offset = sections.debug_abbrev.offset();
+        let mut abbrevs = AbbreviationTable::default();
+
+        self.unit.write(
+            sections,
+            abbrev_offset,
+            &mut abbrevs,
+            &line_strings,
+            &strings,
+        )?;
+        // None should exist because we didn't give out any UnitId.
+        assert!(sections.debug_info_refs.is_empty());
+        assert!(sections.debug_loc_refs.is_empty());
+        assert!(sections.debug_loclists_refs.is_empty());
+
+        abbrevs.write(&mut sections.debug_abbrev)?;
+        Ok(())
+    }
+}
+
+#[cfg(feature = "read")]
+pub(crate) mod convert {
+    use super::*;
+    use crate::read::{self, Reader};
+    use crate::write::{Address, ConvertResult};
+
+    impl Dwarf {
+        /// Create a `write::Dwarf` by converting a `read::Dwarf`.
+        ///
+        /// `convert_address` is a function to convert read addresses into the `Address`
+        /// type. For non-relocatable addresses, this function may simply return
+        /// `Address::Constant(address)`. For relocatable addresses, it is the caller's
+        /// responsibility to determine the symbol and addend corresponding to the address
+        /// and return `Address::Symbol { symbol, addend }`.
+        pub fn from<R: Reader<Offset = usize>>(
+            dwarf: &read::Dwarf<R>,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+        ) -> ConvertResult<Dwarf> {
+            let mut line_strings = LineStringTable::default();
+            let mut strings = StringTable::default();
+            let units = UnitTable::from(dwarf, &mut line_strings, &mut strings, convert_address)?;
+            // TODO: convert the line programs that were not referenced by a unit.
+            let line_programs = Vec::new();
+            Ok(Dwarf {
+                units,
+                line_programs,
+                line_strings,
+                strings,
+            })
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/endian_vec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/endian_vec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/endian_vec.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/endian_vec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,117 @@
+use alloc::vec::Vec;
+use std::mem;
+
+use crate::endianity::Endianity;
+use crate::write::{Error, Result, Writer};
+
+/// A `Vec<u8>` with endianity metadata.
+///
+/// This implements the `Writer` trait, which is used for all writing of DWARF sections.
+#[derive(Debug, Clone)]
+pub struct EndianVec<Endian>
+where
+    Endian: Endianity,
+{
+    vec: Vec<u8>,
+    endian: Endian,
+}
+
+impl<Endian> EndianVec<Endian>
+where
+    Endian: Endianity,
+{
+    /// Construct an empty `EndianVec` with the given endianity.
+    pub fn new(endian: Endian) -> EndianVec<Endian> {
+        EndianVec {
+            vec: Vec::new(),
+            endian,
+        }
+    }
+
+    /// Return a reference to the raw slice.
+    pub fn slice(&self) -> &[u8] {
+        &self.vec
+    }
+
+    /// Convert into a `Vec<u8>`.
+    pub fn into_vec(self) -> Vec<u8> {
+        self.vec
+    }
+
+    /// Take any written data out of the `EndianVec`, leaving an empty `Vec` in its place.
+    pub fn take(&mut self) -> Vec<u8> {
+        let mut vec = Vec::new();
+        mem::swap(&mut self.vec, &mut vec);
+        vec
+    }
+}
+
+impl<Endian> Writer for EndianVec<Endian>
+where
+    Endian: Endianity,
+{
+    type Endian = Endian;
+
+    #[inline]
+    fn endian(&self) -> Self::Endian {
+        self.endian
+    }
+
+    #[inline]
+    fn len(&self) -> usize {
+        self.vec.len()
+    }
+
+    fn write(&mut self, bytes: &[u8]) -> Result<()> {
+        self.vec.extend(bytes);
+        Ok(())
+    }
+
+    fn write_at(&mut self, offset: usize, bytes: &[u8]) -> Result<()> {
+        if offset > self.vec.len() {
+            return Err(Error::OffsetOutOfBounds);
+        }
+        let to = &mut self.vec[offset..];
+        if bytes.len() > to.len() {
+            return Err(Error::LengthOutOfBounds);
+        }
+        let to = &mut to[..bytes.len()];
+        to.copy_from_slice(bytes);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::LittleEndian;
+
+    #[test]
+    fn test_endian_vec() {
+        let mut w = EndianVec::new(LittleEndian);
+        assert_eq!(w.endian(), LittleEndian);
+        assert_eq!(w.len(), 0);
+
+        w.write(&[1, 2]).unwrap();
+        assert_eq!(w.slice(), &[1, 2]);
+        assert_eq!(w.len(), 2);
+
+        w.write(&[3, 4, 5]).unwrap();
+        assert_eq!(w.slice(), &[1, 2, 3, 4, 5]);
+        assert_eq!(w.len(), 5);
+
+        w.write_at(0, &[6, 7]).unwrap();
+        assert_eq!(w.slice(), &[6, 7, 3, 4, 5]);
+        assert_eq!(w.len(), 5);
+
+        w.write_at(3, &[8, 9]).unwrap();
+        assert_eq!(w.slice(), &[6, 7, 3, 8, 9]);
+        assert_eq!(w.len(), 5);
+
+        assert_eq!(w.write_at(4, &[6, 7]), Err(Error::LengthOutOfBounds));
+        assert_eq!(w.write_at(5, &[6, 7]), Err(Error::LengthOutOfBounds));
+        assert_eq!(w.write_at(6, &[6, 7]), Err(Error::OffsetOutOfBounds));
+
+        assert_eq!(w.into_vec(), vec![6, 7, 3, 8, 9]);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/line.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1960 @@
+use alloc::vec::Vec;
+use indexmap::{IndexMap, IndexSet};
+use std::ops::{Deref, DerefMut};
+
+use crate::common::{DebugLineOffset, Encoding, Format, LineEncoding, SectionId};
+use crate::constants;
+use crate::leb128;
+use crate::write::{
+    Address, DebugLineStrOffsets, DebugStrOffsets, Error, LineStringId, LineStringTable, Result,
+    Section, StringId, Writer,
+};
+
+/// The number assigned to the first special opcode.
+//
+// We output all instructions for all DWARF versions, since readers
+// should be able to ignore instructions they don't support.
+const OPCODE_BASE: u8 = 13;
+
+/// A line number program.
+#[derive(Debug, Clone)]
+pub struct LineProgram {
+    /// True if this line program was created with `LineProgram::none()`.
+    none: bool,
+    encoding: Encoding,
+    line_encoding: LineEncoding,
+
+    /// A list of source directory path names.
+    ///
+    /// If a path is relative, then the directory is located relative to the working
+    /// directory of the compilation unit.
+    ///
+    /// The first entry is for the working directory of the compilation unit.
+    directories: IndexSet<LineString>,
+
+    /// A list of source file entries.
+    ///
+    /// Each entry has a path name and a directory.
+    ///
+    /// If a path is a relative, then the file is located relative to the
+    /// directory. Otherwise the directory is meaningless.
+    ///
+    /// Does not include comp_file, even for version >= 5.
+    files: IndexMap<(LineString, DirectoryId), FileInfo>,
+
+    /// The primary source file of the compilation unit.
+    /// This is required for version >= 5, but we never reference it elsewhere
+    /// because DWARF defines DW_AT_decl_file=0 to mean not specified.
+    comp_file: (LineString, FileInfo),
+
+    /// True if the file entries may have valid timestamps.
+    ///
+    /// Entries may still have a timestamp of 0 even if this is set.
+    /// For version <= 4, this is ignored.
+    /// For version 5, this controls whether to emit `DW_LNCT_timestamp`.
+    pub file_has_timestamp: bool,
+
+    /// True if the file entries may have valid sizes.
+    ///
+    /// Entries may still have a size of 0 even if this is set.
+    /// For version <= 4, this is ignored.
+    /// For version 5, this controls whether to emit `DW_LNCT_size`.
+    pub file_has_size: bool,
+
+    /// True if the file entries have valid MD5 checksums.
+    ///
+    /// For version <= 4, this is ignored.
+    /// For version 5, this controls whether to emit `DW_LNCT_MD5`.
+    pub file_has_md5: bool,
+
+    prev_row: LineRow,
+    row: LineRow,
+    // TODO: this probably should be either rows or sequences instead
+    instructions: Vec<LineInstruction>,
+    in_sequence: bool,
+}
+
+impl LineProgram {
+    /// Create a new `LineProgram`.
+    ///
+    /// `comp_dir` defines the working directory of the compilation unit,
+    /// and must be the same as the `DW_AT_comp_dir` attribute
+    /// of the compilation unit DIE.
+    ///
+    /// `comp_file` and `comp_file_info` define the primary source file
+    /// of the compilation unit and must be the same as the `DW_AT_name`
+    /// attribute of the compilation unit DIE.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `line_encoding.line_base` > 0.
+    ///
+    /// Panics if `line_encoding.line_base` + `line_encoding.line_range` <= 0.
+    ///
+    /// Panics if `comp_dir` is empty or contains a null byte.
+    ///
+    /// Panics if `comp_file` is empty or contains a null byte.
+    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new(
+        encoding: Encoding,
+        line_encoding: LineEncoding,
+        comp_dir: LineString,
+        comp_file: LineString,
+        comp_file_info: Option<FileInfo>,
+    ) -> LineProgram {
+        // We require a special opcode for a line advance of 0.
+        // See the debug_asserts in generate_row().
+        assert!(line_encoding.line_base <= 0);
+        assert!(line_encoding.line_base + line_encoding.line_range as i8 > 0);
+        let mut program = LineProgram {
+            none: false,
+            encoding,
+            line_encoding,
+            directories: IndexSet::new(),
+            files: IndexMap::new(),
+            comp_file: (comp_file, comp_file_info.unwrap_or_default()),
+            prev_row: LineRow::initial_state(line_encoding),
+            row: LineRow::initial_state(line_encoding),
+            instructions: Vec::new(),
+            in_sequence: false,
+            file_has_timestamp: false,
+            file_has_size: false,
+            file_has_md5: false,
+        };
+        // For all DWARF versions, directory index 0 is comp_dir.
+        // For version <= 4, the entry is implicit. We still add
+        // it here so that we use it, but we don't emit it.
+        program.add_directory(comp_dir);
+        program
+    }
+
+    /// Create a new `LineProgram` with no fields set.
+    ///
+    /// This can be used when the `LineProgram` will not be used.
+    ///
+    /// You should not attempt to add files or line instructions to
+    /// this line program, or write it to the `.debug_line` section.
+    pub fn none() -> Self {
+        let line_encoding = LineEncoding::default();
+        LineProgram {
+            none: true,
+            encoding: Encoding {
+                format: Format::Dwarf32,
+                version: 2,
+                address_size: 0,
+            },
+            line_encoding,
+            directories: IndexSet::new(),
+            files: IndexMap::new(),
+            comp_file: (LineString::String(Vec::new()), FileInfo::default()),
+            prev_row: LineRow::initial_state(line_encoding),
+            row: LineRow::initial_state(line_encoding),
+            instructions: Vec::new(),
+            in_sequence: false,
+            file_has_timestamp: false,
+            file_has_size: false,
+            file_has_md5: false,
+        }
+    }
+
+    /// Return true if this line program was created with `LineProgram::none()`.
+    #[inline]
+    pub fn is_none(&self) -> bool {
+        self.none
+    }
+
+    /// Return the encoding parameters for this line program.
+    #[inline]
+    pub fn encoding(&self) -> Encoding {
+        self.encoding
+    }
+
+    /// Return the DWARF version for this line program.
+    #[inline]
+    pub fn version(&self) -> u16 {
+        self.encoding.version
+    }
+
+    /// Return the address size in bytes for this line program.
+    #[inline]
+    pub fn address_size(&self) -> u8 {
+        self.encoding.address_size
+    }
+
+    /// Return the DWARF format for this line program.
+    #[inline]
+    pub fn format(&self) -> Format {
+        self.encoding.format
+    }
+
+    /// Return the id for the working directory of the compilation unit.
+    #[inline]
+    pub fn default_directory(&self) -> DirectoryId {
+        DirectoryId(0)
+    }
+
+    /// Add a directory entry and return its id.
+    ///
+    /// If the directory already exists, then return the id of the existing entry.
+    ///
+    /// If the path is relative, then the directory is located relative to the working
+    /// directory of the compilation unit.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `directory` is empty or contains a null byte.
+    pub fn add_directory(&mut self, directory: LineString) -> DirectoryId {
+        if let LineString::String(ref val) = directory {
+            // For DWARF version <= 4, directories must not be empty.
+            // The first directory isn't emitted so skip the check for it.
+            if self.encoding.version <= 4 && !self.directories.is_empty() {
+                assert!(!val.is_empty());
+            }
+            assert!(!val.contains(&0));
+        }
+        let (index, _) = self.directories.insert_full(directory);
+        DirectoryId(index)
+    }
+
+    /// Get a reference to a directory entry.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `id` is invalid.
+    pub fn get_directory(&self, id: DirectoryId) -> &LineString {
+        self.directories.get_index(id.0).unwrap()
+    }
+
+    /// Add a file entry and return its id.
+    ///
+    /// If the file already exists, then return the id of the existing entry.
+    ///
+    /// If the file path is relative, then the file is located relative
+    /// to the directory. Otherwise the directory is meaningless, but it
+    /// is still used as a key for file entries.
+    ///
+    /// If `info` is `None`, then new entries are assigned
+    /// default information, and existing entries are unmodified.
+    ///
+    /// If `info` is not `None`, then it is always assigned to the
+    /// entry, even if the entry already exists.
+    ///
+    /// # Panics
+    ///
+    /// Panics if 'file' is empty or contains a null byte.
+    pub fn add_file(
+        &mut self,
+        file: LineString,
+        directory: DirectoryId,
+        info: Option<FileInfo>,
+    ) -> FileId {
+        if let LineString::String(ref val) = file {
+            assert!(!val.is_empty());
+            assert!(!val.contains(&0));
+        }
+
+        let key = (file, directory);
+        let index = if let Some(info) = info {
+            let (index, _) = self.files.insert_full(key, info);
+            index
+        } else {
+            let entry = self.files.entry(key);
+            let index = entry.index();
+            entry.or_insert(FileInfo::default());
+            index
+        };
+        FileId::new(index)
+    }
+
+    /// Get a reference to a file entry.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `id` is invalid.
+    pub fn get_file(&self, id: FileId) -> (&LineString, DirectoryId) {
+        match id.index() {
+            None => (&self.comp_file.0, DirectoryId(0)),
+            Some(index) => self
+                .files
+                .get_index(index)
+                .map(|entry| (&(entry.0).0, (entry.0).1))
+                .unwrap(),
+        }
+    }
+
+    /// Get a reference to the info for a file entry.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `id` is invalid.
+    pub fn get_file_info(&self, id: FileId) -> &FileInfo {
+        match id.index() {
+            None => &self.comp_file.1,
+            Some(index) => self.files.get_index(index).map(|entry| entry.1).unwrap(),
+        }
+    }
+
+    /// Get a mutable reference to the info for a file entry.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `id` is invalid.
+    pub fn get_file_info_mut(&mut self, id: FileId) -> &mut FileInfo {
+        match id.index() {
+            None => &mut self.comp_file.1,
+            Some(index) => self
+                .files
+                .get_index_mut(index)
+                .map(|entry| entry.1)
+                .unwrap(),
+        }
+    }
+
+    /// Begin a new sequence and set its base address.
+    ///
+    /// # Panics
+    ///
+    /// Panics if a sequence has already begun.
+    pub fn begin_sequence(&mut self, address: Option<Address>) {
+        assert!(!self.in_sequence);
+        self.in_sequence = true;
+        if let Some(address) = address {
+            self.instructions.push(LineInstruction::SetAddress(address));
+        }
+    }
+
+    /// End the sequence, and reset the row to its default values.
+    ///
+    /// Only the `address_offset` and op_index` fields of the current row are used.
+    ///
+    /// # Panics
+    ///
+    /// Panics if a sequence has not begun.
+    pub fn end_sequence(&mut self, address_offset: u64) {
+        assert!(self.in_sequence);
+        self.in_sequence = false;
+        self.row.address_offset = address_offset;
+        let op_advance = self.op_advance();
+        if op_advance != 0 {
+            self.instructions
+                .push(LineInstruction::AdvancePc(op_advance));
+        }
+        self.instructions.push(LineInstruction::EndSequence);
+        self.prev_row = LineRow::initial_state(self.line_encoding);
+        self.row = LineRow::initial_state(self.line_encoding);
+    }
+
+    /// Return true if a sequence has begun.
+    #[inline]
+    pub fn in_sequence(&self) -> bool {
+        self.in_sequence
+    }
+
+    /// Returns a reference to the data for the current row.
+    #[inline]
+    pub fn row(&mut self) -> &mut LineRow {
+        &mut self.row
+    }
+
+    /// Generates the line number information instructions for the current row.
+    ///
+    /// After the instructions are generated, it sets `discriminator` to 0, and sets
+    /// `basic_block`, `prologue_end`, and `epilogue_begin` to false.
+    ///
+    /// # Panics
+    ///
+    /// Panics if a sequence has not begun.
+    /// Panics if the address_offset decreases.
+    pub fn generate_row(&mut self) {
+        assert!(self.in_sequence);
+
+        // Output fields that are reset on every row.
+        if self.row.discriminator != 0 {
+            self.instructions
+                .push(LineInstruction::SetDiscriminator(self.row.discriminator));
+            self.row.discriminator = 0;
+        }
+        if self.row.basic_block {
+            self.instructions.push(LineInstruction::SetBasicBlock);
+            self.row.basic_block = false;
+        }
+        if self.row.prologue_end {
+            self.instructions.push(LineInstruction::SetPrologueEnd);
+            self.row.prologue_end = false;
+        }
+        if self.row.epilogue_begin {
+            self.instructions.push(LineInstruction::SetEpilogueBegin);
+            self.row.epilogue_begin = false;
+        }
+
+        // Output fields that are not reset on every row.
+        if self.row.is_statement != self.prev_row.is_statement {
+            self.instructions.push(LineInstruction::NegateStatement);
+        }
+        if self.row.file != self.prev_row.file {
+            self.instructions
+                .push(LineInstruction::SetFile(self.row.file));
+        }
+        if self.row.column != self.prev_row.column {
+            self.instructions
+                .push(LineInstruction::SetColumn(self.row.column));
+        }
+        if self.row.isa != self.prev_row.isa {
+            self.instructions
+                .push(LineInstruction::SetIsa(self.row.isa));
+        }
+
+        // Advance the line, address, and operation index.
+        let line_base = i64::from(self.line_encoding.line_base) as u64;
+        let line_range = u64::from(self.line_encoding.line_range);
+        let line_advance = self.row.line as i64 - self.prev_row.line as i64;
+        let op_advance = self.op_advance();
+
+        // Default to special advances of 0.
+        let special_base = u64::from(OPCODE_BASE);
+        // TODO: handle lack of special opcodes for 0 line advance
+        debug_assert!(self.line_encoding.line_base <= 0);
+        debug_assert!(self.line_encoding.line_base + self.line_encoding.line_range as i8 >= 0);
+        let special_default = special_base.wrapping_sub(line_base);
+        let mut special = special_default;
+        let mut use_special = false;
+
+        if line_advance != 0 {
+            let special_line = (line_advance as u64).wrapping_sub(line_base);
+            if special_line < line_range {
+                special = special_base + special_line;
+                use_special = true;
+            } else {
+                self.instructions
+                    .push(LineInstruction::AdvanceLine(line_advance));
+            }
+        }
+
+        if op_advance != 0 {
+            // Using ConstAddPc can save a byte.
+            let (special_op_advance, const_add_pc) = if special + op_advance * line_range <= 255 {
+                (op_advance, false)
+            } else {
+                let op_range = (255 - special_base) / line_range;
+                (op_advance - op_range, true)
+            };
+
+            let special_op = special_op_advance * line_range;
+            if special + special_op <= 255 {
+                special += special_op;
+                use_special = true;
+                if const_add_pc {
+                    self.instructions.push(LineInstruction::ConstAddPc);
+                }
+            } else {
+                self.instructions
+                    .push(LineInstruction::AdvancePc(op_advance));
+            }
+        }
+
+        if use_special && special != special_default {
+            debug_assert!(special >= special_base);
+            debug_assert!(special <= 255);
+            self.instructions
+                .push(LineInstruction::Special(special as u8));
+        } else {
+            self.instructions.push(LineInstruction::Copy);
+        }
+
+        self.prev_row = self.row;
+    }
+
+    fn op_advance(&self) -> u64 {
+        debug_assert!(self.row.address_offset >= self.prev_row.address_offset);
+        let mut address_advance = self.row.address_offset - self.prev_row.address_offset;
+        if self.line_encoding.minimum_instruction_length != 1 {
+            debug_assert_eq!(
+                self.row.address_offset % u64::from(self.line_encoding.minimum_instruction_length),
+                0
+            );
+            address_advance /= u64::from(self.line_encoding.minimum_instruction_length);
+        }
+        address_advance * u64::from(self.line_encoding.maximum_operations_per_instruction)
+            + self.row.op_index
+            - self.prev_row.op_index
+    }
+
+    /// Returns true if the line number program has no instructions.
+    ///
+    /// Does not check the file or directory entries.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.instructions.is_empty()
+    }
+
+    /// Write the line number program to the given section.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `self.is_none()`.
+    pub fn write<W: Writer>(
+        &self,
+        w: &mut DebugLine<W>,
+        encoding: Encoding,
+        debug_line_str_offsets: &DebugLineStrOffsets,
+        debug_str_offsets: &DebugStrOffsets,
+    ) -> Result<DebugLineOffset> {
+        assert!(!self.is_none());
+
+        if encoding.version < self.version()
+            || encoding.format != self.format()
+            || encoding.address_size != self.address_size()
+        {
+            return Err(Error::IncompatibleLineProgramEncoding);
+        }
+
+        let offset = w.offset();
+
+        let length_offset = w.write_initial_length(self.format())?;
+        let length_base = w.len();
+
+        if self.version() < 2 || self.version() > 5 {
+            return Err(Error::UnsupportedVersion(self.version()));
+        }
+        w.write_u16(self.version())?;
+
+        if self.version() >= 5 {
+            w.write_u8(self.address_size())?;
+            // Segment selector size.
+            w.write_u8(0)?;
+        }
+
+        let header_length_offset = w.len();
+        w.write_udata(0, self.format().word_size())?;
+        let header_length_base = w.len();
+
+        w.write_u8(self.line_encoding.minimum_instruction_length)?;
+        if self.version() >= 4 {
+            w.write_u8(self.line_encoding.maximum_operations_per_instruction)?;
+        } else if self.line_encoding.maximum_operations_per_instruction != 1 {
+            return Err(Error::NeedVersion(4));
+        };
+        w.write_u8(if self.line_encoding.default_is_stmt {
+            1
+        } else {
+            0
+        })?;
+        w.write_u8(self.line_encoding.line_base as u8)?;
+        w.write_u8(self.line_encoding.line_range)?;
+        w.write_u8(OPCODE_BASE)?;
+        w.write(&[0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1])?;
+
+        if self.version() <= 4 {
+            // The first directory is stored as DW_AT_comp_dir.
+            for dir in self.directories.iter().skip(1) {
+                dir.write(
+                    w,
+                    constants::DW_FORM_string,
+                    self.encoding,
+                    debug_line_str_offsets,
+                    debug_str_offsets,
+                )?;
+            }
+            w.write_u8(0)?;
+
+            for ((file, dir), info) in self.files.iter() {
+                file.write(
+                    w,
+                    constants::DW_FORM_string,
+                    self.encoding,
+                    debug_line_str_offsets,
+                    debug_str_offsets,
+                )?;
+                w.write_uleb128(dir.0 as u64)?;
+                w.write_uleb128(info.timestamp)?;
+                w.write_uleb128(info.size)?;
+            }
+            w.write_u8(0)?;
+        } else {
+            // Directory entry formats (only ever 1).
+            w.write_u8(1)?;
+            w.write_uleb128(u64::from(constants::DW_LNCT_path.0))?;
+            let dir_form = self.directories.get_index(0).unwrap().form();
+            w.write_uleb128(dir_form.0.into())?;
+
+            // Directory entries.
+            w.write_uleb128(self.directories.len() as u64)?;
+            for dir in self.directories.iter() {
+                dir.write(
+                    w,
+                    dir_form,
+                    self.encoding,
+                    debug_line_str_offsets,
+                    debug_str_offsets,
+                )?;
+            }
+
+            // File name entry formats.
+            let count = 2
+                + if self.file_has_timestamp { 1 } else { 0 }
+                + if self.file_has_size { 1 } else { 0 }
+                + if self.file_has_md5 { 1 } else { 0 };
+            w.write_u8(count)?;
+            w.write_uleb128(u64::from(constants::DW_LNCT_path.0))?;
+            let file_form = self.comp_file.0.form();
+            w.write_uleb128(file_form.0.into())?;
+            w.write_uleb128(u64::from(constants::DW_LNCT_directory_index.0))?;
+            w.write_uleb128(constants::DW_FORM_udata.0.into())?;
+            if self.file_has_timestamp {
+                w.write_uleb128(u64::from(constants::DW_LNCT_timestamp.0))?;
+                w.write_uleb128(constants::DW_FORM_udata.0.into())?;
+            }
+            if self.file_has_size {
+                w.write_uleb128(u64::from(constants::DW_LNCT_size.0))?;
+                w.write_uleb128(constants::DW_FORM_udata.0.into())?;
+            }
+            if self.file_has_md5 {
+                w.write_uleb128(u64::from(constants::DW_LNCT_MD5.0))?;
+                w.write_uleb128(constants::DW_FORM_data16.0.into())?;
+            }
+
+            // File name entries.
+            w.write_uleb128(self.files.len() as u64 + 1)?;
+            let mut write_file = |file: &LineString, dir: DirectoryId, info: &FileInfo| {
+                file.write(
+                    w,
+                    file_form,
+                    self.encoding,
+                    debug_line_str_offsets,
+                    debug_str_offsets,
+                )?;
+                w.write_uleb128(dir.0 as u64)?;
+                if self.file_has_timestamp {
+                    w.write_uleb128(info.timestamp)?;
+                }
+                if self.file_has_size {
+                    w.write_uleb128(info.size)?;
+                }
+                if self.file_has_md5 {
+                    w.write(&info.md5)?;
+                }
+                Ok(())
+            };
+            write_file(&self.comp_file.0, DirectoryId(0), &self.comp_file.1)?;
+            for ((file, dir), info) in self.files.iter() {
+                write_file(file, *dir, info)?;
+            }
+        }
+
+        let header_length = (w.len() - header_length_base) as u64;
+        w.write_udata_at(
+            header_length_offset,
+            header_length,
+            self.format().word_size(),
+        )?;
+
+        for instruction in &self.instructions {
+            instruction.write(w, self.address_size())?;
+        }
+
+        let length = (w.len() - length_base) as u64;
+        w.write_initial_length_at(length_offset, length, self.format())?;
+
+        Ok(offset)
+    }
+}
+
+/// A row in the line number table that corresponds to a machine instruction.
+#[derive(Debug, Clone, Copy)]
+pub struct LineRow {
+    /// The offset of the instruction from the start address of the sequence.
+    pub address_offset: u64,
+    /// The index of an operation within a VLIW instruction.
+    ///
+    /// The index of the first operation is 0.
+    /// Set to 0 for non-VLIW instructions.
+    pub op_index: u64,
+
+    /// The source file corresponding to the instruction.
+    pub file: FileId,
+    /// The line number within the source file.
+    ///
+    /// Lines are numbered beginning at 1. Set to 0 if there is no source line.
+    pub line: u64,
+    /// The column number within the source line.
+    ///
+    /// Columns are numbered beginning at 1. Set to 0 for the "left edge" of the line.
+    pub column: u64,
+    /// An additional discriminator used to distinguish between source locations.
+    /// This value is assigned arbitrarily by the DWARF producer.
+    pub discriminator: u64,
+
+    /// Set to true if the instruction is a recommended breakpoint for a statement.
+    pub is_statement: bool,
+    /// Set to true if the instruction is the beginning of a basic block.
+    pub basic_block: bool,
+    /// Set to true if the instruction is a recommended breakpoint at the entry of a
+    /// function.
+    pub prologue_end: bool,
+    /// Set to true if the instruction is a recommended breakpoint prior to the exit of
+    /// a function.
+    pub epilogue_begin: bool,
+
+    /// The instruction set architecture of the instruction.
+    ///
+    /// Set to 0 for the default ISA. Other values are defined by the architecture ABI.
+    pub isa: u64,
+}
+
+impl LineRow {
+    /// Return the initial state as specified in the DWARF standard.
+    fn initial_state(line_encoding: LineEncoding) -> Self {
+        LineRow {
+            address_offset: 0,
+            op_index: 0,
+
+            file: FileId::initial_state(),
+            line: 1,
+            column: 0,
+            discriminator: 0,
+
+            is_statement: line_encoding.default_is_stmt,
+            basic_block: false,
+            prologue_end: false,
+            epilogue_begin: false,
+
+            isa: 0,
+        }
+    }
+}
+
+/// An instruction in a line number program.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum LineInstruction {
+    // Special opcodes
+    Special(u8),
+
+    // Standard opcodes
+    Copy,
+    AdvancePc(u64),
+    AdvanceLine(i64),
+    SetFile(FileId),
+    SetColumn(u64),
+    NegateStatement,
+    SetBasicBlock,
+    ConstAddPc,
+    // DW_LNS_fixed_advance_pc is not supported.
+    SetPrologueEnd,
+    SetEpilogueBegin,
+    SetIsa(u64),
+
+    // Extended opcodes
+    EndSequence,
+    // TODO: this doubles the size of this enum.
+    SetAddress(Address),
+    // DW_LNE_define_file is not supported.
+    SetDiscriminator(u64),
+}
+
+impl LineInstruction {
+    /// Write the line number instruction to the given section.
+    fn write<W: Writer>(self, w: &mut DebugLine<W>, address_size: u8) -> Result<()> {
+        use self::LineInstruction::*;
+        match self {
+            Special(val) => w.write_u8(val)?,
+            Copy => w.write_u8(constants::DW_LNS_copy.0)?,
+            AdvancePc(val) => {
+                w.write_u8(constants::DW_LNS_advance_pc.0)?;
+                w.write_uleb128(val)?;
+            }
+            AdvanceLine(val) => {
+                w.write_u8(constants::DW_LNS_advance_line.0)?;
+                w.write_sleb128(val)?;
+            }
+            SetFile(val) => {
+                w.write_u8(constants::DW_LNS_set_file.0)?;
+                w.write_uleb128(val.raw())?;
+            }
+            SetColumn(val) => {
+                w.write_u8(constants::DW_LNS_set_column.0)?;
+                w.write_uleb128(val)?;
+            }
+            NegateStatement => w.write_u8(constants::DW_LNS_negate_stmt.0)?,
+            SetBasicBlock => w.write_u8(constants::DW_LNS_set_basic_block.0)?,
+            ConstAddPc => w.write_u8(constants::DW_LNS_const_add_pc.0)?,
+            SetPrologueEnd => w.write_u8(constants::DW_LNS_set_prologue_end.0)?,
+            SetEpilogueBegin => w.write_u8(constants::DW_LNS_set_epilogue_begin.0)?,
+            SetIsa(val) => {
+                w.write_u8(constants::DW_LNS_set_isa.0)?;
+                w.write_uleb128(val)?;
+            }
+            EndSequence => {
+                w.write_u8(0)?;
+                w.write_uleb128(1)?;
+                w.write_u8(constants::DW_LNE_end_sequence.0)?;
+            }
+            SetAddress(address) => {
+                w.write_u8(0)?;
+                w.write_uleb128(1 + u64::from(address_size))?;
+                w.write_u8(constants::DW_LNE_set_address.0)?;
+                w.write_address(address, address_size)?;
+            }
+            SetDiscriminator(val) => {
+                let mut bytes = [0u8; 10];
+                // bytes is long enough so this will never fail.
+                let len = leb128::write::unsigned(&mut { &mut bytes[..] }, val).unwrap();
+                w.write_u8(0)?;
+                w.write_uleb128(1 + len as u64)?;
+                w.write_u8(constants::DW_LNE_set_discriminator.0)?;
+                w.write(&bytes[..len])?;
+            }
+        }
+        Ok(())
+    }
+}
+
+/// A string value for use in defining paths in line number programs.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum LineString {
+    /// A slice of bytes representing a string. Must not include null bytes.
+    /// Not guaranteed to be UTF-8 or anything like that.
+    String(Vec<u8>),
+
+    /// A reference to a string in the `.debug_str` section.
+    StringRef(StringId),
+
+    /// A reference to a string in the `.debug_line_str` section.
+    LineStringRef(LineStringId),
+}
+
+impl LineString {
+    /// Create a `LineString` using the normal form for the given encoding.
+    pub fn new<T>(val: T, encoding: Encoding, line_strings: &mut LineStringTable) -> Self
+    where
+        T: Into<Vec<u8>>,
+    {
+        let val = val.into();
+        if encoding.version <= 4 {
+            LineString::String(val)
+        } else {
+            LineString::LineStringRef(line_strings.add(val))
+        }
+    }
+
+    fn form(&self) -> constants::DwForm {
+        match *self {
+            LineString::String(..) => constants::DW_FORM_string,
+            LineString::StringRef(..) => constants::DW_FORM_strp,
+            LineString::LineStringRef(..) => constants::DW_FORM_line_strp,
+        }
+    }
+
+    fn write<W: Writer>(
+        &self,
+        w: &mut DebugLine<W>,
+        form: constants::DwForm,
+        encoding: Encoding,
+        debug_line_str_offsets: &DebugLineStrOffsets,
+        debug_str_offsets: &DebugStrOffsets,
+    ) -> Result<()> {
+        if form != self.form() {
+            return Err(Error::LineStringFormMismatch);
+        }
+
+        match *self {
+            LineString::String(ref val) => {
+                if encoding.version <= 4 {
+                    debug_assert!(!val.is_empty());
+                }
+                w.write(val)?;
+                w.write_u8(0)?;
+            }
+            LineString::StringRef(val) => {
+                if encoding.version < 5 {
+                    return Err(Error::NeedVersion(5));
+                }
+                w.write_offset(
+                    debug_str_offsets.get(val).0,
+                    SectionId::DebugStr,
+                    encoding.format.word_size(),
+                )?;
+            }
+            LineString::LineStringRef(val) => {
+                if encoding.version < 5 {
+                    return Err(Error::NeedVersion(5));
+                }
+                w.write_offset(
+                    debug_line_str_offsets.get(val).0,
+                    SectionId::DebugLineStr,
+                    encoding.format.word_size(),
+                )?;
+            }
+        }
+        Ok(())
+    }
+}
+
+/// An identifier for a directory in a `LineProgram`.
+///
+/// Defaults to the working directory of the compilation unit.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct DirectoryId(usize);
+
+// Force FileId access via the methods.
+mod id {
+    /// An identifier for a file in a `LineProgram`.
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+    pub struct FileId(usize);
+
+    impl FileId {
+        /// Create a FileId given an index into `LineProgram::files`.
+        pub(crate) fn new(index: usize) -> Self {
+            FileId(index + 1)
+        }
+
+        /// The index of the file in `LineProgram::files`.
+        pub(super) fn index(self) -> Option<usize> {
+            if self.0 == 0 {
+                None
+            } else {
+                Some(self.0 - 1)
+            }
+        }
+
+        /// The initial state of the file register.
+        pub(super) fn initial_state() -> Self {
+            FileId(1)
+        }
+
+        /// The raw value used when writing.
+        pub(crate) fn raw(self) -> u64 {
+            self.0 as u64
+        }
+
+        /// The id for file index 0 in DWARF version 5.
+        /// Only used when converting.
+        // Used for tests only.
+        #[allow(unused)]
+        pub(super) fn zero() -> Self {
+            FileId(0)
+        }
+    }
+}
+pub use self::id::*;
+
+/// Extra information for file in a `LineProgram`.
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+pub struct FileInfo {
+    /// The implementation defined timestamp of the last modification of the file,
+    /// or 0 if not available.
+    pub timestamp: u64,
+
+    /// The size of the file in bytes, or 0 if not available.
+    pub size: u64,
+
+    /// A 16-byte MD5 digest of the file contents.
+    ///
+    /// Only used if version >= 5 and `LineProgram::file_has_md5` is `true`.
+    pub md5: [u8; 16],
+}
+
+define_section!(
+    DebugLine,
+    DebugLineOffset,
+    "A writable `.debug_line` section."
+);
+
+#[cfg(feature = "read")]
+mod convert {
+    use super::*;
+    use crate::read::{self, Reader};
+    use crate::write::{self, ConvertError, ConvertResult};
+
+    impl LineProgram {
+        /// Create a line number program by reading the data from the given program.
+        ///
+        /// Return the program and a mapping from file index to `FileId`.
+        pub fn from<R: Reader<Offset = usize>>(
+            mut from_program: read::IncompleteLineProgram<R>,
+            dwarf: &read::Dwarf<R>,
+            line_strings: &mut write::LineStringTable,
+            strings: &mut write::StringTable,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+        ) -> ConvertResult<(LineProgram, Vec<FileId>)> {
+            // Create mappings in case the source has duplicate files or directories.
+            let mut dirs = Vec::new();
+            let mut files = Vec::new();
+
+            let mut program = {
+                let from_header = from_program.header();
+                let encoding = from_header.encoding();
+
+                let comp_dir = match from_header.directory(0) {
+                    Some(comp_dir) => LineString::from(comp_dir, dwarf, line_strings, strings)?,
+                    None => LineString::new(&[][..], encoding, line_strings),
+                };
+
+                let (comp_name, comp_file_info) = match from_header.file(0) {
+                    Some(comp_file) => {
+                        if comp_file.directory_index() != 0 {
+                            return Err(ConvertError::InvalidDirectoryIndex);
+                        }
+                        (
+                            LineString::from(comp_file.path_name(), dwarf, line_strings, strings)?,
+                            Some(FileInfo {
+                                timestamp: comp_file.timestamp(),
+                                size: comp_file.size(),
+                                md5: *comp_file.md5(),
+                            }),
+                        )
+                    }
+                    None => (LineString::new(&[][..], encoding, line_strings), None),
+                };
+
+                if from_header.line_base() > 0 {
+                    return Err(ConvertError::InvalidLineBase);
+                }
+                let mut program = LineProgram::new(
+                    encoding,
+                    from_header.line_encoding(),
+                    comp_dir,
+                    comp_name,
+                    comp_file_info,
+                );
+
+                let file_skip;
+                if from_header.version() <= 4 {
+                    // The first directory is implicit.
+                    dirs.push(DirectoryId(0));
+                    // A file index of 0 is invalid for version <= 4, but putting
+                    // something there makes the indexing easier.
+                    file_skip = 0;
+                    files.push(FileId::zero());
+                } else {
+                    // We don't add the first file to `files`, but still allow
+                    // it to be referenced from converted instructions.
+                    file_skip = 1;
+                    files.push(FileId::zero());
+                }
+
+                for from_dir in from_header.include_directories() {
+                    let from_dir =
+                        LineString::from(from_dir.clone(), dwarf, line_strings, strings)?;
+                    dirs.push(program.add_directory(from_dir));
+                }
+
+                program.file_has_timestamp = from_header.file_has_timestamp();
+                program.file_has_size = from_header.file_has_size();
+                program.file_has_md5 = from_header.file_has_md5();
+                for from_file in from_header.file_names().iter().skip(file_skip) {
+                    let from_name =
+                        LineString::from(from_file.path_name(), dwarf, line_strings, strings)?;
+                    let from_dir = from_file.directory_index();
+                    if from_dir >= dirs.len() as u64 {
+                        return Err(ConvertError::InvalidDirectoryIndex);
+                    }
+                    let from_dir = dirs[from_dir as usize];
+                    let from_info = Some(FileInfo {
+                        timestamp: from_file.timestamp(),
+                        size: from_file.size(),
+                        md5: *from_file.md5(),
+                    });
+                    files.push(program.add_file(from_name, from_dir, from_info));
+                }
+
+                program
+            };
+
+            // We can't use the `from_program.rows()` because that wouldn't let
+            // us preserve address relocations.
+            let mut from_row = read::LineRow::new(from_program.header());
+            let mut instructions = from_program.header().instructions();
+            let mut address = None;
+            while let Some(instruction) = instructions.next_instruction(from_program.header())? {
+                match instruction {
+                    read::LineInstruction::SetAddress(val) => {
+                        if program.in_sequence() {
+                            return Err(ConvertError::UnsupportedLineInstruction);
+                        }
+                        match convert_address(val) {
+                            Some(val) => address = Some(val),
+                            None => return Err(ConvertError::InvalidAddress),
+                        }
+                        from_row.execute(read::LineInstruction::SetAddress(0), &mut from_program);
+                    }
+                    read::LineInstruction::DefineFile(_) => {
+                        return Err(ConvertError::UnsupportedLineInstruction);
+                    }
+                    _ => {
+                        if from_row.execute(instruction, &mut from_program) {
+                            if !program.in_sequence() {
+                                program.begin_sequence(address);
+                                address = None;
+                            }
+                            if from_row.end_sequence() {
+                                program.end_sequence(from_row.address());
+                            } else {
+                                program.row().address_offset = from_row.address();
+                                program.row().op_index = from_row.op_index();
+                                program.row().file = {
+                                    let file = from_row.file_index();
+                                    if file >= files.len() as u64 {
+                                        return Err(ConvertError::InvalidFileIndex);
+                                    }
+                                    if file == 0 && program.version() <= 4 {
+                                        return Err(ConvertError::InvalidFileIndex);
+                                    }
+                                    files[file as usize]
+                                };
+                                program.row().line = match from_row.line() {
+                                    Some(line) => line.get(),
+                                    None => 0,
+                                };
+                                program.row().column = match from_row.column() {
+                                    read::ColumnType::LeftEdge => 0,
+                                    read::ColumnType::Column(val) => val.get(),
+                                };
+                                program.row().discriminator = from_row.discriminator();
+                                program.row().is_statement = from_row.is_stmt();
+                                program.row().basic_block = from_row.basic_block();
+                                program.row().prologue_end = from_row.prologue_end();
+                                program.row().epilogue_begin = from_row.epilogue_begin();
+                                program.row().isa = from_row.isa();
+                                program.generate_row();
+                            }
+                            from_row.reset(from_program.header());
+                        }
+                    }
+                };
+            }
+            Ok((program, files))
+        }
+    }
+
+    impl LineString {
+        fn from<R: Reader<Offset = usize>>(
+            from_attr: read::AttributeValue<R>,
+            dwarf: &read::Dwarf<R>,
+            line_strings: &mut write::LineStringTable,
+            strings: &mut write::StringTable,
+        ) -> ConvertResult<LineString> {
+            Ok(match from_attr {
+                read::AttributeValue::String(r) => LineString::String(r.to_slice()?.to_vec()),
+                read::AttributeValue::DebugStrRef(offset) => {
+                    let r = dwarf.debug_str.get_str(offset)?;
+                    let id = strings.add(r.to_slice()?);
+                    LineString::StringRef(id)
+                }
+                read::AttributeValue::DebugLineStrRef(offset) => {
+                    let r = dwarf.debug_line_str.get_str(offset)?;
+                    let id = line_strings.add(r.to_slice()?);
+                    LineString::LineStringRef(id)
+                }
+                _ => return Err(ConvertError::UnsupportedLineStringForm),
+            })
+        }
+    }
+}
+
+#[cfg(test)]
+#[cfg(feature = "read")]
+mod tests {
+    use super::*;
+    use crate::read;
+    use crate::write::{DebugLineStr, DebugStr, EndianVec, StringTable};
+    use crate::LittleEndian;
+
+    #[test]
+    fn test_line_program_table() {
+        let dir1 = LineString::String(b"dir1".to_vec());
+        let file1 = LineString::String(b"file1".to_vec());
+        let dir2 = LineString::String(b"dir2".to_vec());
+        let file2 = LineString::String(b"file2".to_vec());
+
+        let mut programs = Vec::new();
+        for &version in &[2, 3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+                    let mut program = LineProgram::new(
+                        encoding,
+                        LineEncoding::default(),
+                        dir1.clone(),
+                        file1.clone(),
+                        None,
+                    );
+
+                    {
+                        assert_eq!(&dir1, program.get_directory(program.default_directory()));
+                        program.file_has_timestamp = true;
+                        program.file_has_size = true;
+                        if encoding.version >= 5 {
+                            program.file_has_md5 = true;
+                        }
+
+                        let dir_id = program.add_directory(dir2.clone());
+                        assert_eq!(&dir2, program.get_directory(dir_id));
+                        assert_eq!(dir_id, program.add_directory(dir2.clone()));
+
+                        let file_info = FileInfo {
+                            timestamp: 1,
+                            size: 2,
+                            md5: if encoding.version >= 5 {
+                                [3; 16]
+                            } else {
+                                [0; 16]
+                            },
+                        };
+                        let file_id = program.add_file(file2.clone(), dir_id, Some(file_info));
+                        assert_eq!((&file2, dir_id), program.get_file(file_id));
+                        assert_eq!(file_info, *program.get_file_info(file_id));
+
+                        program.get_file_info_mut(file_id).size = 3;
+                        assert_ne!(file_info, *program.get_file_info(file_id));
+                        assert_eq!(file_id, program.add_file(file2.clone(), dir_id, None));
+                        assert_ne!(file_info, *program.get_file_info(file_id));
+                        assert_eq!(
+                            file_id,
+                            program.add_file(file2.clone(), dir_id, Some(file_info))
+                        );
+                        assert_eq!(file_info, *program.get_file_info(file_id));
+
+                        programs.push((program, file_id, encoding));
+                    }
+                }
+            }
+        }
+
+        let debug_line_str_offsets = DebugLineStrOffsets::none();
+        let debug_str_offsets = DebugStrOffsets::none();
+        let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
+        let mut debug_line_offsets = Vec::new();
+        for (program, _, encoding) in &programs {
+            debug_line_offsets.push(
+                program
+                    .write(
+                        &mut debug_line,
+                        *encoding,
+                        &debug_line_str_offsets,
+                        &debug_str_offsets,
+                    )
+                    .unwrap(),
+            );
+        }
+
+        let read_debug_line = read::DebugLine::new(debug_line.slice(), LittleEndian);
+
+        let convert_address = &|address| Some(Address::Constant(address));
+        for ((program, file_id, encoding), offset) in programs.iter().zip(debug_line_offsets.iter())
+        {
+            let read_program = read_debug_line
+                .program(
+                    *offset,
+                    encoding.address_size,
+                    Some(read::EndianSlice::new(b"dir1", LittleEndian)),
+                    Some(read::EndianSlice::new(b"file1", LittleEndian)),
+                )
+                .unwrap();
+
+            let dwarf = read::Dwarf::default();
+            let mut convert_line_strings = LineStringTable::default();
+            let mut convert_strings = StringTable::default();
+            let (convert_program, convert_files) = LineProgram::from(
+                read_program,
+                &dwarf,
+                &mut convert_line_strings,
+                &mut convert_strings,
+                convert_address,
+            )
+            .unwrap();
+            assert_eq!(convert_program.version(), program.version());
+            assert_eq!(convert_program.address_size(), program.address_size());
+            assert_eq!(convert_program.format(), program.format());
+
+            let convert_file_id = convert_files[file_id.raw() as usize];
+            let (file, dir) = program.get_file(*file_id);
+            let (convert_file, convert_dir) = convert_program.get_file(convert_file_id);
+            assert_eq!(file, convert_file);
+            assert_eq!(
+                program.get_directory(dir),
+                convert_program.get_directory(convert_dir)
+            );
+            assert_eq!(
+                program.get_file_info(*file_id),
+                convert_program.get_file_info(convert_file_id)
+            );
+        }
+    }
+
+    #[test]
+    fn test_line_row() {
+        let dir1 = &b"dir1"[..];
+        let file1 = &b"file1"[..];
+        let file2 = &b"file2"[..];
+        let convert_address = &|address| Some(Address::Constant(address));
+
+        let debug_line_str_offsets = DebugLineStrOffsets::none();
+        let debug_str_offsets = DebugStrOffsets::none();
+
+        for &version in &[2, 3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+                    let line_base = -5;
+                    let line_range = 14;
+                    let neg_line_base = (-line_base) as u8;
+                    let mut program = LineProgram::new(
+                        encoding,
+                        LineEncoding {
+                            line_base,
+                            line_range,
+                            ..Default::default()
+                        },
+                        LineString::String(dir1.to_vec()),
+                        LineString::String(file1.to_vec()),
+                        None,
+                    );
+                    let dir_id = program.default_directory();
+                    program.add_file(LineString::String(file1.to_vec()), dir_id, None);
+                    let file_id =
+                        program.add_file(LineString::String(file2.to_vec()), dir_id, None);
+
+                    // Test sequences.
+                    {
+                        let mut program = program.clone();
+                        let address = Address::Constant(0x12);
+                        program.begin_sequence(Some(address));
+                        assert_eq!(
+                            program.instructions,
+                            vec![LineInstruction::SetAddress(address)]
+                        );
+                    }
+
+                    {
+                        let mut program = program.clone();
+                        program.begin_sequence(None);
+                        assert_eq!(program.instructions, Vec::new());
+                    }
+
+                    {
+                        let mut program = program.clone();
+                        program.begin_sequence(None);
+                        program.end_sequence(0x1234);
+                        assert_eq!(
+                            program.instructions,
+                            vec![
+                                LineInstruction::AdvancePc(0x1234),
+                                LineInstruction::EndSequence
+                            ]
+                        );
+                    }
+
+                    // Create a base program.
+                    program.begin_sequence(None);
+                    program.row.line = 0x1000;
+                    program.generate_row();
+                    let base_row = program.row;
+                    let base_instructions = program.instructions.clone();
+
+                    // Create test cases.
+                    let mut tests = Vec::new();
+
+                    let row = base_row;
+                    tests.push((row, vec![LineInstruction::Copy]));
+
+                    let mut row = base_row;
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((row, vec![LineInstruction::Special(OPCODE_BASE)]));
+
+                    let mut row = base_row;
+                    row.line += u64::from(line_range) - 1;
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![LineInstruction::Special(OPCODE_BASE + line_range - 1)],
+                    ));
+
+                    let mut row = base_row;
+                    row.line += u64::from(line_range);
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![
+                            LineInstruction::AdvanceLine(i64::from(line_range - neg_line_base)),
+                            LineInstruction::Copy,
+                        ],
+                    ));
+
+                    let mut row = base_row;
+                    row.address_offset = 1;
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![LineInstruction::Special(OPCODE_BASE + line_range)],
+                    ));
+
+                    let op_range = (255 - OPCODE_BASE) / line_range;
+                    let mut row = base_row;
+                    row.address_offset = u64::from(op_range);
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![LineInstruction::Special(
+                            OPCODE_BASE + op_range * line_range,
+                        )],
+                    ));
+
+                    let mut row = base_row;
+                    row.address_offset = u64::from(op_range);
+                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range);
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((row, vec![LineInstruction::Special(255)]));
+
+                    let mut row = base_row;
+                    row.address_offset = u64::from(op_range);
+                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range) + 1;
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![LineInstruction::ConstAddPc, LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.address_offset = u64::from(op_range);
+                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range) + 2;
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![
+                            LineInstruction::ConstAddPc,
+                            LineInstruction::Special(OPCODE_BASE + 6),
+                        ],
+                    ));
+
+                    let mut row = base_row;
+                    row.address_offset = u64::from(op_range) * 2;
+                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range);
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![LineInstruction::ConstAddPc, LineInstruction::Special(255)],
+                    ));
+
+                    let mut row = base_row;
+                    row.address_offset = u64::from(op_range) * 2;
+                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range) + 1;
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![
+                            LineInstruction::AdvancePc(row.address_offset),
+                            LineInstruction::Copy,
+                        ],
+                    ));
+
+                    let mut row = base_row;
+                    row.address_offset = u64::from(op_range) * 2;
+                    row.line += u64::from(255 - OPCODE_BASE - op_range * line_range) + 2;
+                    row.line -= u64::from(neg_line_base);
+                    tests.push((
+                        row,
+                        vec![
+                            LineInstruction::AdvancePc(row.address_offset),
+                            LineInstruction::Special(OPCODE_BASE + 6),
+                        ],
+                    ));
+
+                    let mut row = base_row;
+                    row.address_offset = 0x1234;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::AdvancePc(0x1234), LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.line += 0x1234;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::AdvanceLine(0x1234), LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.file = file_id;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::SetFile(file_id), LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.column = 0x1234;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::SetColumn(0x1234), LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.discriminator = 0x1234;
+                    tests.push((
+                        row,
+                        vec![
+                            LineInstruction::SetDiscriminator(0x1234),
+                            LineInstruction::Copy,
+                        ],
+                    ));
+
+                    let mut row = base_row;
+                    row.is_statement = !row.is_statement;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::NegateStatement, LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.basic_block = true;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::SetBasicBlock, LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.prologue_end = true;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::SetPrologueEnd, LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.epilogue_begin = true;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::SetEpilogueBegin, LineInstruction::Copy],
+                    ));
+
+                    let mut row = base_row;
+                    row.isa = 0x1234;
+                    tests.push((
+                        row,
+                        vec![LineInstruction::SetIsa(0x1234), LineInstruction::Copy],
+                    ));
+
+                    for test in tests {
+                        // Test generate_row().
+                        let mut program = program.clone();
+                        program.row = test.0;
+                        program.generate_row();
+                        assert_eq!(
+                            &program.instructions[base_instructions.len()..],
+                            &test.1[..]
+                        );
+
+                        // Test LineProgram::from().
+                        let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
+                        let debug_line_offset = program
+                            .write(
+                                &mut debug_line,
+                                encoding,
+                                &debug_line_str_offsets,
+                                &debug_str_offsets,
+                            )
+                            .unwrap();
+
+                        let read_debug_line =
+                            read::DebugLine::new(debug_line.slice(), LittleEndian);
+                        let read_program = read_debug_line
+                            .program(
+                                debug_line_offset,
+                                address_size,
+                                Some(read::EndianSlice::new(dir1, LittleEndian)),
+                                Some(read::EndianSlice::new(file1, LittleEndian)),
+                            )
+                            .unwrap();
+
+                        let dwarf = read::Dwarf::default();
+                        let mut convert_line_strings = LineStringTable::default();
+                        let mut convert_strings = StringTable::default();
+                        let (convert_program, _convert_files) = LineProgram::from(
+                            read_program,
+                            &dwarf,
+                            &mut convert_line_strings,
+                            &mut convert_strings,
+                            convert_address,
+                        )
+                        .unwrap();
+                        assert_eq!(
+                            &convert_program.instructions[base_instructions.len()..],
+                            &test.1[..]
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_line_instruction() {
+        let dir1 = &b"dir1"[..];
+        let file1 = &b"file1"[..];
+
+        let debug_line_str_offsets = DebugLineStrOffsets::none();
+        let debug_str_offsets = DebugStrOffsets::none();
+
+        for &version in &[2, 3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+                    let mut program = LineProgram::new(
+                        encoding,
+                        LineEncoding::default(),
+                        LineString::String(dir1.to_vec()),
+                        LineString::String(file1.to_vec()),
+                        None,
+                    );
+                    let dir_id = program.default_directory();
+                    let file_id =
+                        program.add_file(LineString::String(file1.to_vec()), dir_id, None);
+
+                    for &(ref inst, ref expect_inst) in &[
+                        (
+                            LineInstruction::Special(OPCODE_BASE),
+                            read::LineInstruction::Special(OPCODE_BASE),
+                        ),
+                        (
+                            LineInstruction::Special(255),
+                            read::LineInstruction::Special(255),
+                        ),
+                        (LineInstruction::Copy, read::LineInstruction::Copy),
+                        (
+                            LineInstruction::AdvancePc(0x12),
+                            read::LineInstruction::AdvancePc(0x12),
+                        ),
+                        (
+                            LineInstruction::AdvanceLine(0x12),
+                            read::LineInstruction::AdvanceLine(0x12),
+                        ),
+                        (
+                            LineInstruction::SetFile(file_id),
+                            read::LineInstruction::SetFile(file_id.raw()),
+                        ),
+                        (
+                            LineInstruction::SetColumn(0x12),
+                            read::LineInstruction::SetColumn(0x12),
+                        ),
+                        (
+                            LineInstruction::NegateStatement,
+                            read::LineInstruction::NegateStatement,
+                        ),
+                        (
+                            LineInstruction::SetBasicBlock,
+                            read::LineInstruction::SetBasicBlock,
+                        ),
+                        (
+                            LineInstruction::ConstAddPc,
+                            read::LineInstruction::ConstAddPc,
+                        ),
+                        (
+                            LineInstruction::SetPrologueEnd,
+                            read::LineInstruction::SetPrologueEnd,
+                        ),
+                        (
+                            LineInstruction::SetEpilogueBegin,
+                            read::LineInstruction::SetEpilogueBegin,
+                        ),
+                        (
+                            LineInstruction::SetIsa(0x12),
+                            read::LineInstruction::SetIsa(0x12),
+                        ),
+                        (
+                            LineInstruction::EndSequence,
+                            read::LineInstruction::EndSequence,
+                        ),
+                        (
+                            LineInstruction::SetAddress(Address::Constant(0x12)),
+                            read::LineInstruction::SetAddress(0x12),
+                        ),
+                        (
+                            LineInstruction::SetDiscriminator(0x12),
+                            read::LineInstruction::SetDiscriminator(0x12),
+                        ),
+                    ][..]
+                    {
+                        let mut program = program.clone();
+                        program.instructions.push(*inst);
+
+                        let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
+                        let debug_line_offset = program
+                            .write(
+                                &mut debug_line,
+                                encoding,
+                                &debug_line_str_offsets,
+                                &debug_str_offsets,
+                            )
+                            .unwrap();
+
+                        let read_debug_line =
+                            read::DebugLine::new(debug_line.slice(), LittleEndian);
+                        let read_program = read_debug_line
+                            .program(
+                                debug_line_offset,
+                                address_size,
+                                Some(read::EndianSlice::new(dir1, LittleEndian)),
+                                Some(read::EndianSlice::new(file1, LittleEndian)),
+                            )
+                            .unwrap();
+                        let read_header = read_program.header();
+                        let mut read_insts = read_header.instructions();
+                        assert_eq!(
+                            *expect_inst,
+                            read_insts.next_instruction(read_header).unwrap().unwrap()
+                        );
+                        assert_eq!(None, read_insts.next_instruction(read_header).unwrap());
+                    }
+                }
+            }
+        }
+    }
+
+    // Test that the address/line advance is correct. We don't test for optimality.
+    #[test]
+    #[allow(clippy::useless_vec)]
+    fn test_advance() {
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 8,
+        };
+
+        let dir1 = &b"dir1"[..];
+        let file1 = &b"file1"[..];
+
+        let addresses = 0..50;
+        let lines = -10..25i64;
+
+        let debug_line_str_offsets = DebugLineStrOffsets::none();
+        let debug_str_offsets = DebugStrOffsets::none();
+
+        for minimum_instruction_length in vec![1, 4] {
+            for maximum_operations_per_instruction in vec![1, 3] {
+                for line_base in vec![-5, 0] {
+                    for line_range in vec![10, 20] {
+                        let line_encoding = LineEncoding {
+                            minimum_instruction_length,
+                            maximum_operations_per_instruction,
+                            line_base,
+                            line_range,
+                            default_is_stmt: true,
+                        };
+                        let mut program = LineProgram::new(
+                            encoding,
+                            line_encoding,
+                            LineString::String(dir1.to_vec()),
+                            LineString::String(file1.to_vec()),
+                            None,
+                        );
+                        for address_advance in addresses.clone() {
+                            program.begin_sequence(Some(Address::Constant(0x1000)));
+                            program.row().line = 0x10000;
+                            program.generate_row();
+                            for line_advance in lines.clone() {
+                                {
+                                    let row = program.row();
+                                    row.address_offset +=
+                                        address_advance * u64::from(minimum_instruction_length);
+                                    row.line = row.line.wrapping_add(line_advance as u64);
+                                }
+                                program.generate_row();
+                            }
+                            let address_offset = program.row().address_offset
+                                + u64::from(minimum_instruction_length);
+                            program.end_sequence(address_offset);
+                        }
+
+                        let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
+                        let debug_line_offset = program
+                            .write(
+                                &mut debug_line,
+                                encoding,
+                                &debug_line_str_offsets,
+                                &debug_str_offsets,
+                            )
+                            .unwrap();
+
+                        let read_debug_line =
+                            read::DebugLine::new(debug_line.slice(), LittleEndian);
+                        let read_program = read_debug_line
+                            .program(
+                                debug_line_offset,
+                                8,
+                                Some(read::EndianSlice::new(dir1, LittleEndian)),
+                                Some(read::EndianSlice::new(file1, LittleEndian)),
+                            )
+                            .unwrap();
+
+                        let mut rows = read_program.rows();
+                        for address_advance in addresses.clone() {
+                            let mut address;
+                            let mut line;
+                            {
+                                let row = rows.next_row().unwrap().unwrap().1;
+                                address = row.address();
+                                line = row.line().unwrap().get();
+                            }
+                            assert_eq!(address, 0x1000);
+                            assert_eq!(line, 0x10000);
+                            for line_advance in lines.clone() {
+                                let row = rows.next_row().unwrap().unwrap().1;
+                                assert_eq!(
+                                    row.address() - address,
+                                    address_advance * u64::from(minimum_instruction_length)
+                                );
+                                assert_eq!(
+                                    (row.line().unwrap().get() as i64) - (line as i64),
+                                    line_advance
+                                );
+                                address = row.address();
+                                line = row.line().unwrap().get();
+                            }
+                            let row = rows.next_row().unwrap().unwrap().1;
+                            assert!(row.end_sequence());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_line_string() {
+        let version = 5;
+
+        let file = b"file1";
+
+        let mut strings = StringTable::default();
+        let string_id = strings.add("file2");
+        let mut debug_str = DebugStr::from(EndianVec::new(LittleEndian));
+        let debug_str_offsets = strings.write(&mut debug_str).unwrap();
+
+        let mut line_strings = LineStringTable::default();
+        let line_string_id = line_strings.add("file3");
+        let mut debug_line_str = DebugLineStr::from(EndianVec::new(LittleEndian));
+        let debug_line_str_offsets = line_strings.write(&mut debug_line_str).unwrap();
+
+        for &address_size in &[4, 8] {
+            for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                let encoding = Encoding {
+                    format,
+                    version,
+                    address_size,
+                };
+
+                for (file, expect_file) in vec![
+                    (
+                        LineString::String(file.to_vec()),
+                        read::AttributeValue::String(read::EndianSlice::new(file, LittleEndian)),
+                    ),
+                    (
+                        LineString::StringRef(string_id),
+                        read::AttributeValue::DebugStrRef(debug_str_offsets.get(string_id)),
+                    ),
+                    (
+                        LineString::LineStringRef(line_string_id),
+                        read::AttributeValue::DebugLineStrRef(
+                            debug_line_str_offsets.get(line_string_id),
+                        ),
+                    ),
+                ] {
+                    let program = LineProgram::new(
+                        encoding,
+                        LineEncoding::default(),
+                        LineString::String(b"dir".to_vec()),
+                        file,
+                        None,
+                    );
+
+                    let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
+                    let debug_line_offset = program
+                        .write(
+                            &mut debug_line,
+                            encoding,
+                            &debug_line_str_offsets,
+                            &debug_str_offsets,
+                        )
+                        .unwrap();
+
+                    let read_debug_line = read::DebugLine::new(debug_line.slice(), LittleEndian);
+                    let read_program = read_debug_line
+                        .program(debug_line_offset, address_size, None, None)
+                        .unwrap();
+                    let read_header = read_program.header();
+                    assert_eq!(read_header.file(0).unwrap().path_name(), expect_file);
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_missing_comp_dir() {
+        let debug_line_str_offsets = DebugLineStrOffsets::none();
+        let debug_str_offsets = DebugStrOffsets::none();
+
+        for &version in &[2, 3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+                    let program = LineProgram::new(
+                        encoding,
+                        LineEncoding::default(),
+                        LineString::String(Vec::new()),
+                        LineString::String(Vec::new()),
+                        None,
+                    );
+
+                    let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
+                    let debug_line_offset = program
+                        .write(
+                            &mut debug_line,
+                            encoding,
+                            &debug_line_str_offsets,
+                            &debug_str_offsets,
+                        )
+                        .unwrap();
+
+                    let read_debug_line = read::DebugLine::new(debug_line.slice(), LittleEndian);
+                    let read_program = read_debug_line
+                        .program(
+                            debug_line_offset,
+                            address_size,
+                            // Testing missing comp_dir/comp_name.
+                            None,
+                            None,
+                        )
+                        .unwrap();
+
+                    let dwarf = read::Dwarf::default();
+                    let mut convert_line_strings = LineStringTable::default();
+                    let mut convert_strings = StringTable::default();
+                    let convert_address = &|address| Some(Address::Constant(address));
+                    LineProgram::from(
+                        read_program,
+                        &dwarf,
+                        &mut convert_line_strings,
+                        &mut convert_strings,
+                        convert_address,
+                    )
+                    .unwrap();
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/loc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/loc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/loc.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/loc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,548 @@
+use alloc::vec::Vec;
+use indexmap::IndexSet;
+use std::ops::{Deref, DerefMut};
+
+use crate::common::{Encoding, LocationListsOffset, SectionId};
+use crate::write::{
+    Address, BaseId, DebugInfoReference, Error, Expression, Result, Section, Sections, UnitOffsets,
+    Writer,
+};
+
+define_section!(
+    DebugLoc,
+    LocationListsOffset,
+    "A writable `.debug_loc` section."
+);
+define_section!(
+    DebugLocLists,
+    LocationListsOffset,
+    "A writable `.debug_loclists` section."
+);
+
+define_offsets!(
+    LocationListOffsets: LocationListId => LocationListsOffset,
+    "The section offsets of a series of location lists within the `.debug_loc` or `.debug_loclists` sections."
+);
+
+define_id!(
+    LocationListId,
+    "An identifier for a location list in a `LocationListTable`."
+);
+
+/// A table of location lists that will be stored in a `.debug_loc` or `.debug_loclists` section.
+#[derive(Debug, Default)]
+pub struct LocationListTable {
+    base_id: BaseId,
+    locations: IndexSet<LocationList>,
+}
+
+impl LocationListTable {
+    /// Add a location list to the table.
+    pub fn add(&mut self, loc_list: LocationList) -> LocationListId {
+        let (index, _) = self.locations.insert_full(loc_list);
+        LocationListId::new(self.base_id, index)
+    }
+
+    /// Write the location list table to the appropriate section for the given DWARF version.
+    pub(crate) fn write<W: Writer>(
+        &self,
+        sections: &mut Sections<W>,
+        encoding: Encoding,
+        unit_offsets: Option<&UnitOffsets>,
+    ) -> Result<LocationListOffsets> {
+        if self.locations.is_empty() {
+            return Ok(LocationListOffsets::none());
+        }
+
+        match encoding.version {
+            2..=4 => self.write_loc(
+                &mut sections.debug_loc,
+                &mut sections.debug_loc_refs,
+                encoding,
+                unit_offsets,
+            ),
+            5 => self.write_loclists(
+                &mut sections.debug_loclists,
+                &mut sections.debug_loclists_refs,
+                encoding,
+                unit_offsets,
+            ),
+            _ => Err(Error::UnsupportedVersion(encoding.version)),
+        }
+    }
+
+    /// Write the location list table to the `.debug_loc` section.
+    fn write_loc<W: Writer>(
+        &self,
+        w: &mut DebugLoc<W>,
+        refs: &mut Vec<DebugInfoReference>,
+        encoding: Encoding,
+        unit_offsets: Option<&UnitOffsets>,
+    ) -> Result<LocationListOffsets> {
+        let address_size = encoding.address_size;
+        let mut offsets = Vec::new();
+        for loc_list in self.locations.iter() {
+            offsets.push(w.offset());
+            for loc in &loc_list.0 {
+                // Note that we must ensure none of the ranges have both begin == 0 and end == 0.
+                // We do this by ensuring that begin != end, which is a bit more restrictive
+                // than required, but still seems reasonable.
+                match *loc {
+                    Location::BaseAddress { address } => {
+                        let marker = !0 >> (64 - address_size * 8);
+                        w.write_udata(marker, address_size)?;
+                        w.write_address(address, address_size)?;
+                    }
+                    Location::OffsetPair {
+                        begin,
+                        end,
+                        ref data,
+                    } => {
+                        if begin == end {
+                            return Err(Error::InvalidRange);
+                        }
+                        w.write_udata(begin, address_size)?;
+                        w.write_udata(end, address_size)?;
+                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
+                    }
+                    Location::StartEnd {
+                        begin,
+                        end,
+                        ref data,
+                    } => {
+                        if begin == end {
+                            return Err(Error::InvalidRange);
+                        }
+                        w.write_address(begin, address_size)?;
+                        w.write_address(end, address_size)?;
+                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
+                    }
+                    Location::StartLength {
+                        begin,
+                        length,
+                        ref data,
+                    } => {
+                        let end = match begin {
+                            Address::Constant(begin) => Address::Constant(begin + length),
+                            Address::Symbol { symbol, addend } => Address::Symbol {
+                                symbol,
+                                addend: addend + length as i64,
+                            },
+                        };
+                        if begin == end {
+                            return Err(Error::InvalidRange);
+                        }
+                        w.write_address(begin, address_size)?;
+                        w.write_address(end, address_size)?;
+                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
+                    }
+                    Location::DefaultLocation { .. } => {
+                        return Err(Error::InvalidRange);
+                    }
+                }
+            }
+            w.write_udata(0, address_size)?;
+            w.write_udata(0, address_size)?;
+        }
+        Ok(LocationListOffsets {
+            base_id: self.base_id,
+            offsets,
+        })
+    }
+
+    /// Write the location list table to the `.debug_loclists` section.
+    fn write_loclists<W: Writer>(
+        &self,
+        w: &mut DebugLocLists<W>,
+        refs: &mut Vec<DebugInfoReference>,
+        encoding: Encoding,
+        unit_offsets: Option<&UnitOffsets>,
+    ) -> Result<LocationListOffsets> {
+        let mut offsets = Vec::new();
+
+        if encoding.version != 5 {
+            return Err(Error::NeedVersion(5));
+        }
+
+        let length_offset = w.write_initial_length(encoding.format)?;
+        let length_base = w.len();
+
+        w.write_u16(encoding.version)?;
+        w.write_u8(encoding.address_size)?;
+        w.write_u8(0)?; // segment_selector_size
+        w.write_u32(0)?; // offset_entry_count (when set to zero DW_FORM_rnglistx can't be used, see section 7.28)
+                         // FIXME implement DW_FORM_rnglistx writing and implement the offset entry list
+
+        for loc_list in self.locations.iter() {
+            offsets.push(w.offset());
+            for loc in &loc_list.0 {
+                match *loc {
+                    Location::BaseAddress { address } => {
+                        w.write_u8(crate::constants::DW_LLE_base_address.0)?;
+                        w.write_address(address, encoding.address_size)?;
+                    }
+                    Location::OffsetPair {
+                        begin,
+                        end,
+                        ref data,
+                    } => {
+                        w.write_u8(crate::constants::DW_LLE_offset_pair.0)?;
+                        w.write_uleb128(begin)?;
+                        w.write_uleb128(end)?;
+                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
+                    }
+                    Location::StartEnd {
+                        begin,
+                        end,
+                        ref data,
+                    } => {
+                        w.write_u8(crate::constants::DW_LLE_start_end.0)?;
+                        w.write_address(begin, encoding.address_size)?;
+                        w.write_address(end, encoding.address_size)?;
+                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
+                    }
+                    Location::StartLength {
+                        begin,
+                        length,
+                        ref data,
+                    } => {
+                        w.write_u8(crate::constants::DW_LLE_start_length.0)?;
+                        w.write_address(begin, encoding.address_size)?;
+                        w.write_uleb128(length)?;
+                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
+                    }
+                    Location::DefaultLocation { ref data } => {
+                        w.write_u8(crate::constants::DW_LLE_default_location.0)?;
+                        write_expression(&mut w.0, refs, encoding, unit_offsets, data)?;
+                    }
+                }
+            }
+
+            w.write_u8(crate::constants::DW_LLE_end_of_list.0)?;
+        }
+
+        let length = (w.len() - length_base) as u64;
+        w.write_initial_length_at(length_offset, length, encoding.format)?;
+
+        Ok(LocationListOffsets {
+            base_id: self.base_id,
+            offsets,
+        })
+    }
+}
+
+/// A locations list that will be stored in a `.debug_loc` or `.debug_loclists` section.
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+pub struct LocationList(pub Vec<Location>);
+
+/// A single location.
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+pub enum Location {
+    /// DW_LLE_base_address
+    BaseAddress {
+        /// Base address.
+        address: Address,
+    },
+    /// DW_LLE_offset_pair
+    OffsetPair {
+        /// Start of range relative to base address.
+        begin: u64,
+        /// End of range relative to base address.
+        end: u64,
+        /// Location description.
+        data: Expression,
+    },
+    /// DW_LLE_start_end
+    StartEnd {
+        /// Start of range.
+        begin: Address,
+        /// End of range.
+        end: Address,
+        /// Location description.
+        data: Expression,
+    },
+    /// DW_LLE_start_length
+    StartLength {
+        /// Start of range.
+        begin: Address,
+        /// Length of range.
+        length: u64,
+        /// Location description.
+        data: Expression,
+    },
+    /// DW_LLE_default_location
+    DefaultLocation {
+        /// Location description.
+        data: Expression,
+    },
+}
+
+fn write_expression<W: Writer>(
+    w: &mut W,
+    refs: &mut Vec<DebugInfoReference>,
+    encoding: Encoding,
+    unit_offsets: Option<&UnitOffsets>,
+    val: &Expression,
+) -> Result<()> {
+    let size = val.size(encoding, unit_offsets) as u64;
+    if encoding.version <= 4 {
+        w.write_udata(size, 2)?;
+    } else {
+        w.write_uleb128(size)?;
+    }
+    val.write(w, Some(refs), encoding, unit_offsets)?;
+    Ok(())
+}
+
+#[cfg(feature = "read")]
+mod convert {
+    use super::*;
+
+    use crate::read::{self, Reader};
+    use crate::write::{ConvertError, ConvertResult, ConvertUnitContext};
+
+    impl LocationList {
+        /// Create a location list by reading the data from the give location list iter.
+        pub(crate) fn from<R: Reader<Offset = usize>>(
+            mut from: read::RawLocListIter<R>,
+            context: &ConvertUnitContext<R>,
+        ) -> ConvertResult<Self> {
+            let mut have_base_address = context.base_address != Address::Constant(0);
+            let convert_address =
+                |x| (context.convert_address)(x).ok_or(ConvertError::InvalidAddress);
+            let convert_expression = |x| {
+                Expression::from(
+                    x,
+                    context.unit.encoding(),
+                    Some(context.dwarf),
+                    Some(context.unit),
+                    Some(context.entry_ids),
+                    context.convert_address,
+                )
+            };
+            let mut loc_list = Vec::new();
+            while let Some(from_loc) = from.next()? {
+                let loc = match from_loc {
+                    read::RawLocListEntry::AddressOrOffsetPair { begin, end, data } => {
+                        // These were parsed as addresses, even if they are offsets.
+                        let begin = convert_address(begin)?;
+                        let end = convert_address(end)?;
+                        let data = convert_expression(data)?;
+                        match (begin, end) {
+                            (Address::Constant(begin_offset), Address::Constant(end_offset)) => {
+                                if have_base_address {
+                                    Location::OffsetPair {
+                                        begin: begin_offset,
+                                        end: end_offset,
+                                        data,
+                                    }
+                                } else {
+                                    Location::StartEnd { begin, end, data }
+                                }
+                            }
+                            _ => {
+                                if have_base_address {
+                                    // At least one of begin/end is an address, but we also have
+                                    // a base address. Adding addresses is undefined.
+                                    return Err(ConvertError::InvalidRangeRelativeAddress);
+                                }
+                                Location::StartEnd { begin, end, data }
+                            }
+                        }
+                    }
+                    read::RawLocListEntry::BaseAddress { addr } => {
+                        have_base_address = true;
+                        let address = convert_address(addr)?;
+                        Location::BaseAddress { address }
+                    }
+                    read::RawLocListEntry::BaseAddressx { addr } => {
+                        have_base_address = true;
+                        let address = convert_address(context.dwarf.address(context.unit, addr)?)?;
+                        Location::BaseAddress { address }
+                    }
+                    read::RawLocListEntry::StartxEndx { begin, end, data } => {
+                        let begin = convert_address(context.dwarf.address(context.unit, begin)?)?;
+                        let end = convert_address(context.dwarf.address(context.unit, end)?)?;
+                        let data = convert_expression(data)?;
+                        Location::StartEnd { begin, end, data }
+                    }
+                    read::RawLocListEntry::StartxLength {
+                        begin,
+                        length,
+                        data,
+                    } => {
+                        let begin = convert_address(context.dwarf.address(context.unit, begin)?)?;
+                        let data = convert_expression(data)?;
+                        Location::StartLength {
+                            begin,
+                            length,
+                            data,
+                        }
+                    }
+                    read::RawLocListEntry::OffsetPair { begin, end, data } => {
+                        let data = convert_expression(data)?;
+                        Location::OffsetPair { begin, end, data }
+                    }
+                    read::RawLocListEntry::StartEnd { begin, end, data } => {
+                        let begin = convert_address(begin)?;
+                        let end = convert_address(end)?;
+                        let data = convert_expression(data)?;
+                        Location::StartEnd { begin, end, data }
+                    }
+                    read::RawLocListEntry::StartLength {
+                        begin,
+                        length,
+                        data,
+                    } => {
+                        let begin = convert_address(begin)?;
+                        let data = convert_expression(data)?;
+                        Location::StartLength {
+                            begin,
+                            length,
+                            data,
+                        }
+                    }
+                    read::RawLocListEntry::DefaultLocation { data } => {
+                        let data = convert_expression(data)?;
+                        Location::DefaultLocation { data }
+                    }
+                };
+                // In some cases, existing data may contain begin == end, filtering
+                // these out.
+                match loc {
+                    Location::StartLength { length, .. } if length == 0 => continue,
+                    Location::StartEnd { begin, end, .. } if begin == end => continue,
+                    Location::OffsetPair { begin, end, .. } if begin == end => continue,
+                    _ => (),
+                }
+                loc_list.push(loc);
+            }
+            Ok(LocationList(loc_list))
+        }
+    }
+}
+
+#[cfg(test)]
+#[cfg(feature = "read")]
+mod tests {
+    use super::*;
+    use crate::common::{
+        DebugAbbrevOffset, DebugAddrBase, DebugInfoOffset, DebugLocListsBase, DebugRngListsBase,
+        DebugStrOffsetsBase, Format,
+    };
+    use crate::read;
+    use crate::write::{
+        ConvertUnitContext, EndianVec, LineStringTable, RangeListTable, StringTable,
+    };
+    use crate::LittleEndian;
+    use std::collections::HashMap;
+
+    #[test]
+    fn test_loc_list() {
+        let mut line_strings = LineStringTable::default();
+        let mut strings = StringTable::default();
+        let mut expression = Expression::new();
+        expression.op_constu(0);
+
+        for &version in &[2, 3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+
+                    let mut loc_list = LocationList(vec![
+                        Location::StartLength {
+                            begin: Address::Constant(6666),
+                            length: 7777,
+                            data: expression.clone(),
+                        },
+                        Location::StartEnd {
+                            begin: Address::Constant(4444),
+                            end: Address::Constant(5555),
+                            data: expression.clone(),
+                        },
+                        Location::BaseAddress {
+                            address: Address::Constant(1111),
+                        },
+                        Location::OffsetPair {
+                            begin: 2222,
+                            end: 3333,
+                            data: expression.clone(),
+                        },
+                    ]);
+                    if version >= 5 {
+                        loc_list.0.push(Location::DefaultLocation {
+                            data: expression.clone(),
+                        });
+                    }
+
+                    let mut locations = LocationListTable::default();
+                    let loc_list_id = locations.add(loc_list.clone());
+
+                    let mut sections = Sections::new(EndianVec::new(LittleEndian));
+                    let loc_list_offsets = locations.write(&mut sections, encoding, None).unwrap();
+                    assert!(sections.debug_loc_refs.is_empty());
+                    assert!(sections.debug_loclists_refs.is_empty());
+
+                    let read_debug_loc =
+                        read::DebugLoc::new(sections.debug_loc.slice(), LittleEndian);
+                    let read_debug_loclists =
+                        read::DebugLocLists::new(sections.debug_loclists.slice(), LittleEndian);
+                    let read_loc = read::LocationLists::new(read_debug_loc, read_debug_loclists);
+                    let offset = loc_list_offsets.get(loc_list_id);
+                    let read_loc_list = read_loc.raw_locations(offset, encoding).unwrap();
+
+                    let dwarf = read::Dwarf {
+                        locations: read_loc,
+                        ..Default::default()
+                    };
+                    let unit = read::Unit {
+                        header: read::UnitHeader::new(
+                            encoding,
+                            0,
+                            read::UnitType::Compilation,
+                            DebugAbbrevOffset(0),
+                            DebugInfoOffset(0).into(),
+                            read::EndianSlice::default(),
+                        ),
+                        abbreviations: read::Abbreviations::default(),
+                        name: None,
+                        comp_dir: None,
+                        low_pc: 0,
+                        str_offsets_base: DebugStrOffsetsBase(0),
+                        addr_base: DebugAddrBase(0),
+                        loclists_base: DebugLocListsBase(0),
+                        rnglists_base: DebugRngListsBase(0),
+                        line_program: None,
+                    };
+                    let context = ConvertUnitContext {
+                        dwarf: &dwarf,
+                        unit: &unit,
+                        line_strings: &mut line_strings,
+                        strings: &mut strings,
+                        ranges: &mut RangeListTable::default(),
+                        locations: &mut locations,
+                        convert_address: &|address| Some(Address::Constant(address)),
+                        base_address: Address::Constant(0),
+                        line_program_offset: None,
+                        line_program_files: Vec::new(),
+                        entry_ids: &HashMap::new(),
+                    };
+                    let convert_loc_list = LocationList::from(read_loc_list, &context).unwrap();
+
+                    if version <= 4 {
+                        loc_list.0[0] = Location::StartEnd {
+                            begin: Address::Constant(6666),
+                            end: Address::Constant(6666 + 7777),
+                            data: expression.clone(),
+                        };
+                    }
+                    assert_eq!(loc_list, convert_loc_list);
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,425 @@
+//! Write DWARF debugging information.
+//!
+//! ## API Structure
+//!
+//! This module works by building up a representation of the debugging information
+//! in memory, and then writing it all at once. It supports two major use cases:
+//!
+//! * Use the [`DwarfUnit`](./struct.DwarfUnit.html) type when writing DWARF
+//! for a single compilation unit.
+//!
+//! * Use the [`Dwarf`](./struct.Dwarf.html) type when writing DWARF for multiple
+//! compilation units.
+//!
+//! The module also supports reading in DWARF debugging information and writing it out
+//! again, possibly after modifying it. Create a [`read::Dwarf`](../read/struct.Dwarf.html)
+//! instance, and then use [`Dwarf::from`](./struct.Dwarf.html#method.from) to convert
+//! it to a writable instance.
+//!
+//! ## Example Usage
+//!
+//! Write a compilation unit containing only the top level DIE.
+//!
+//! ```rust
+//! use gimli::write::{
+//!     Address, AttributeValue, DwarfUnit, EndianVec, Error, Range, RangeList, Sections,
+//! };
+//!
+//! fn example() -> Result<(), Error> {
+//!     // Choose the encoding parameters.
+//!     let encoding = gimli::Encoding {
+//!         format: gimli::Format::Dwarf32,
+//!         version: 5,
+//!         address_size: 8,
+//!     };
+//!     // Create a container for a single compilation unit.
+//!     let mut dwarf = DwarfUnit::new(encoding);
+//!     // Set a range attribute on the root DIE.
+//!     let range_list = RangeList(vec![Range::StartLength {
+//!         begin: Address::Constant(0x100),
+//!         length: 42,
+//!     }]);
+//!     let range_list_id = dwarf.unit.ranges.add(range_list);
+//!     let root = dwarf.unit.root();
+//!     dwarf.unit.get_mut(root).set(
+//!         gimli::DW_AT_ranges,
+//!         AttributeValue::RangeListRef(range_list_id),
+//!     );
+//!     // Create a `Vec` for each DWARF section.
+//!     let mut sections = Sections::new(EndianVec::new(gimli::LittleEndian));
+//!     // Finally, write the DWARF data to the sections.
+//!     dwarf.write(&mut sections)?;
+//!     sections.for_each(|id, data| {
+//!         // Here you can add the data to the output object file.
+//!         Ok(())
+//!     })
+//! }
+//! # fn main() {
+//! #     example().unwrap();
+//! # }
+
+use std::error;
+use std::fmt;
+use std::result;
+
+use crate::constants;
+
+mod endian_vec;
+pub use self::endian_vec::*;
+
+mod writer;
+pub use self::writer::*;
+
+#[macro_use]
+mod section;
+pub use self::section::*;
+
+macro_rules! define_id {
+    ($name:ident, $docs:expr) => {
+        #[doc=$docs]
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+        pub struct $name {
+            base_id: BaseId,
+            index: usize,
+        }
+
+        impl $name {
+            #[inline]
+            fn new(base_id: BaseId, index: usize) -> Self {
+                $name { base_id, index }
+            }
+        }
+    };
+}
+
+macro_rules! define_offsets {
+    ($offsets:ident: $id:ident => $offset:ident, $off_doc:expr) => {
+        #[doc=$off_doc]
+        #[derive(Debug)]
+        pub struct $offsets {
+            base_id: BaseId,
+            // We know ids start at 0.
+            offsets: Vec<$offset>,
+        }
+
+        impl $offsets {
+            /// Return an empty list of offsets.
+            #[inline]
+            pub fn none() -> Self {
+                $offsets {
+                    base_id: BaseId::default(),
+                    offsets: Vec::new(),
+                }
+            }
+
+            /// Get the offset
+            ///
+            /// # Panics
+            ///
+            /// Panics if `id` is invalid.
+            #[inline]
+            pub fn get(&self, id: $id) -> $offset {
+                debug_assert_eq!(self.base_id, id.base_id);
+                self.offsets[id.index]
+            }
+
+            /// Return the number of offsets.
+            #[inline]
+            pub fn count(&self) -> usize {
+                self.offsets.len()
+            }
+        }
+    };
+}
+
+mod abbrev;
+pub use self::abbrev::*;
+
+mod cfi;
+pub use self::cfi::*;
+
+mod dwarf;
+pub use self::dwarf::*;
+
+mod line;
+pub use self::line::*;
+
+mod loc;
+pub use self::loc::*;
+
+mod op;
+pub use self::op::*;
+
+mod range;
+pub use self::range::*;
+
+mod str;
+pub use self::str::*;
+
+mod unit;
+pub use self::unit::*;
+
+/// An error that occurred when writing.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Error {
+    /// The given offset is out of bounds.
+    OffsetOutOfBounds,
+    /// The given length is out of bounds.
+    LengthOutOfBounds,
+    /// The attribute value is an invalid for writing.
+    InvalidAttributeValue,
+    /// The value is too large for the encoding form.
+    ValueTooLarge,
+    /// Unsupported word size.
+    UnsupportedWordSize(u8),
+    /// Unsupported DWARF version.
+    UnsupportedVersion(u16),
+    /// The unit length is too large for the requested DWARF format.
+    InitialLengthOverflow,
+    /// The address is invalid.
+    InvalidAddress,
+    /// The reference is invalid.
+    InvalidReference,
+    /// A requested feature requires a different DWARF version.
+    NeedVersion(u16),
+    /// Strings in line number program have mismatched forms.
+    LineStringFormMismatch,
+    /// The range is empty or otherwise invalid.
+    InvalidRange,
+    /// The line number program encoding is incompatible with the unit encoding.
+    IncompatibleLineProgramEncoding,
+    /// Could not encode code offset for a frame instruction.
+    InvalidFrameCodeOffset(u32),
+    /// Could not encode data offset for a frame instruction.
+    InvalidFrameDataOffset(i32),
+    /// Unsupported eh_frame pointer encoding.
+    UnsupportedPointerEncoding(constants::DwEhPe),
+    /// Unsupported reference in CFI expression.
+    UnsupportedCfiExpressionReference,
+    /// Unsupported forward reference in expression.
+    UnsupportedExpressionForwardReference,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> {
+        match *self {
+            Error::OffsetOutOfBounds => write!(f, "The given offset is out of bounds."),
+            Error::LengthOutOfBounds => write!(f, "The given length is out of bounds."),
+            Error::InvalidAttributeValue => {
+                write!(f, "The attribute value is an invalid for writing.")
+            }
+            Error::ValueTooLarge => write!(f, "The value is too large for the encoding form."),
+            Error::UnsupportedWordSize(size) => write!(f, "Unsupported word size: {}", size),
+            Error::UnsupportedVersion(version) => {
+                write!(f, "Unsupported DWARF version: {}", version)
+            }
+            Error::InitialLengthOverflow => write!(
+                f,
+                "The unit length is too large for the requested DWARF format."
+            ),
+            Error::InvalidAddress => write!(f, "The address is invalid."),
+            Error::InvalidReference => write!(f, "The reference is invalid."),
+            Error::NeedVersion(version) => write!(
+                f,
+                "A requested feature requires a DWARF version {}.",
+                version
+            ),
+            Error::LineStringFormMismatch => {
+                write!(f, "Strings in line number program have mismatched forms.")
+            }
+            Error::InvalidRange => write!(f, "The range is empty or otherwise invalid."),
+            Error::IncompatibleLineProgramEncoding => write!(
+                f,
+                "The line number program encoding is incompatible with the unit encoding."
+            ),
+            Error::InvalidFrameCodeOffset(offset) => write!(
+                f,
+                "Could not encode code offset ({}) for a frame instruction.",
+                offset,
+            ),
+            Error::InvalidFrameDataOffset(offset) => write!(
+                f,
+                "Could not encode data offset ({}) for a frame instruction.",
+                offset,
+            ),
+            Error::UnsupportedPointerEncoding(eh_pe) => {
+                write!(f, "Unsupported eh_frame pointer encoding ({}).", eh_pe)
+            }
+            Error::UnsupportedCfiExpressionReference => {
+                write!(f, "Unsupported reference in CFI expression.")
+            }
+            Error::UnsupportedExpressionForwardReference => {
+                write!(f, "Unsupported forward reference in expression.")
+            }
+        }
+    }
+}
+
+impl error::Error for Error {}
+
+/// The result of a write.
+pub type Result<T> = result::Result<T, Error>;
+
+/// An address.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Address {
+    /// A fixed address that does not require relocation.
+    Constant(u64),
+    /// An address that is relative to a symbol which may be relocated.
+    Symbol {
+        /// The symbol that the address is relative to.
+        ///
+        /// The meaning of this value is decided by the writer, but
+        /// will typically be an index into a symbol table.
+        symbol: usize,
+        /// The offset of the address relative to the symbol.
+        ///
+        /// This will typically be used as the addend in a relocation.
+        addend: i64,
+    },
+}
+
+/// A reference to a `.debug_info` entry.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Reference {
+    /// An external symbol.
+    ///
+    /// The meaning of this value is decided by the writer, but
+    /// will typically be an index into a symbol table.
+    Symbol(usize),
+    /// An entry in the same section.
+    ///
+    /// This only supports references in units that are emitted together.
+    Entry(UnitId, UnitEntryId),
+}
+
+// This type is only used in debug assertions.
+#[cfg(not(debug_assertions))]
+type BaseId = ();
+
+#[cfg(debug_assertions)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+struct BaseId(usize);
+
+#[cfg(debug_assertions)]
+impl Default for BaseId {
+    fn default() -> Self {
+        use std::sync::atomic;
+        static BASE_ID: atomic::AtomicUsize = atomic::AtomicUsize::new(0);
+        BaseId(BASE_ID.fetch_add(1, atomic::Ordering::Relaxed))
+    }
+}
+
+#[cfg(feature = "read")]
+mod convert {
+    use super::*;
+    use crate::read;
+
+    pub(crate) use super::unit::convert::*;
+
+    /// An error that occurred when converting a read value into a write value.
+    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    pub enum ConvertError {
+        /// An error occurred when reading.
+        Read(read::Error),
+        /// Writing of this attribute value is not implemented yet.
+        UnsupportedAttributeValue,
+        /// This attribute value is an invalid name/form combination.
+        InvalidAttributeValue,
+        /// A `.debug_info` reference does not refer to a valid entry.
+        InvalidDebugInfoOffset,
+        /// An address could not be converted.
+        InvalidAddress,
+        /// Writing this line number instruction is not implemented yet.
+        UnsupportedLineInstruction,
+        /// Writing this form of line string is not implemented yet.
+        UnsupportedLineStringForm,
+        /// A `.debug_line` file index is invalid.
+        InvalidFileIndex,
+        /// A `.debug_line` directory index is invalid.
+        InvalidDirectoryIndex,
+        /// A `.debug_line` line base is invalid.
+        InvalidLineBase,
+        /// A `.debug_line` reference is invalid.
+        InvalidLineRef,
+        /// A `.debug_info` unit entry reference is invalid.
+        InvalidUnitRef,
+        /// A `.debug_info` reference is invalid.
+        InvalidDebugInfoRef,
+        /// Invalid relative address in a range list.
+        InvalidRangeRelativeAddress,
+        /// Writing this CFI instruction is not implemented yet.
+        UnsupportedCfiInstruction,
+        /// Writing indirect pointers is not implemented yet.
+        UnsupportedIndirectAddress,
+        /// Writing this expression operation is not implemented yet.
+        UnsupportedOperation,
+        /// Operation branch target is invalid.
+        InvalidBranchTarget,
+        /// Writing this unit type is not supported yet.
+        UnsupportedUnitType,
+    }
+
+    impl fmt::Display for ConvertError {
+        fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> {
+            use self::ConvertError::*;
+            match *self {
+                Read(ref e) => e.fmt(f),
+                UnsupportedAttributeValue => {
+                    write!(f, "Writing of this attribute value is not implemented yet.")
+                }
+                InvalidAttributeValue => write!(
+                    f,
+                    "This attribute value is an invalid name/form combination."
+                ),
+                InvalidDebugInfoOffset => write!(
+                    f,
+                    "A `.debug_info` reference does not refer to a valid entry."
+                ),
+                InvalidAddress => write!(f, "An address could not be converted."),
+                UnsupportedLineInstruction => write!(
+                    f,
+                    "Writing this line number instruction is not implemented yet."
+                ),
+                UnsupportedLineStringForm => write!(
+                    f,
+                    "Writing this form of line string is not implemented yet."
+                ),
+                InvalidFileIndex => write!(f, "A `.debug_line` file index is invalid."),
+                InvalidDirectoryIndex => write!(f, "A `.debug_line` directory index is invalid."),
+                InvalidLineBase => write!(f, "A `.debug_line` line base is invalid."),
+                InvalidLineRef => write!(f, "A `.debug_line` reference is invalid."),
+                InvalidUnitRef => write!(f, "A `.debug_info` unit entry reference is invalid."),
+                InvalidDebugInfoRef => write!(f, "A `.debug_info` reference is invalid."),
+                InvalidRangeRelativeAddress => {
+                    write!(f, "Invalid relative address in a range list.")
+                }
+                UnsupportedCfiInstruction => {
+                    write!(f, "Writing this CFI instruction is not implemented yet.")
+                }
+                UnsupportedIndirectAddress => {
+                    write!(f, "Writing indirect pointers is not implemented yet.")
+                }
+                UnsupportedOperation => write!(
+                    f,
+                    "Writing this expression operation is not implemented yet."
+                ),
+                InvalidBranchTarget => write!(f, "Operation branch target is invalid."),
+                UnsupportedUnitType => write!(f, "Writing this unit type is not supported yet."),
+            }
+        }
+    }
+
+    impl error::Error for ConvertError {}
+
+    impl From<read::Error> for ConvertError {
+        fn from(e: read::Error) -> Self {
+            ConvertError::Read(e)
+        }
+    }
+
+    /// The result of a conversion.
+    pub type ConvertResult<T> = result::Result<T, ConvertError>;
+}
+#[cfg(feature = "read")]
+pub use self::convert::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/op.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/op.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/op.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/op.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1616 @@
+use alloc::boxed::Box;
+use alloc::vec::Vec;
+
+use crate::common::{Encoding, Register};
+use crate::constants::{self, DwOp};
+use crate::leb128::write::{sleb128_size, uleb128_size};
+use crate::write::{
+    Address, DebugInfoReference, Error, Reference, Result, UnitEntryId, UnitOffsets, Writer,
+};
+
+/// The bytecode for a DWARF expression or location description.
+#[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
+pub struct Expression {
+    operations: Vec<Operation>,
+}
+
+impl Expression {
+    /// Create an empty expression.
+    #[inline]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Create an expression from raw bytecode.
+    ///
+    /// This does not support operations that require references, such as `DW_OP_addr`.
+    #[inline]
+    pub fn raw(bytecode: Vec<u8>) -> Self {
+        Expression {
+            operations: vec![Operation::Raw(bytecode)],
+        }
+    }
+
+    /// Add an operation to the expression.
+    ///
+    /// This should only be used for operations that have no explicit operands.
+    pub fn op(&mut self, opcode: DwOp) {
+        self.operations.push(Operation::Simple(opcode));
+    }
+
+    /// Add a `DW_OP_addr` operation to the expression.
+    pub fn op_addr(&mut self, address: Address) {
+        self.operations.push(Operation::Address(address));
+    }
+
+    /// Add a `DW_OP_constu` operation to the expression.
+    ///
+    /// This may be emitted as a smaller equivalent operation.
+    pub fn op_constu(&mut self, value: u64) {
+        self.operations.push(Operation::UnsignedConstant(value));
+    }
+
+    /// Add a `DW_OP_consts` operation to the expression.
+    ///
+    /// This may be emitted as a smaller equivalent operation.
+    pub fn op_consts(&mut self, value: i64) {
+        self.operations.push(Operation::SignedConstant(value));
+    }
+
+    /// Add a `DW_OP_const_type` or `DW_OP_GNU_const_type` operation to the expression.
+    pub fn op_const_type(&mut self, base: UnitEntryId, value: Box<[u8]>) {
+        self.operations.push(Operation::ConstantType(base, value));
+    }
+
+    /// Add a `DW_OP_fbreg` operation to the expression.
+    pub fn op_fbreg(&mut self, offset: i64) {
+        self.operations.push(Operation::FrameOffset(offset));
+    }
+
+    /// Add a `DW_OP_bregx` operation to the expression.
+    ///
+    /// This may be emitted as a smaller equivalent operation.
+    pub fn op_breg(&mut self, register: Register, offset: i64) {
+        self.operations
+            .push(Operation::RegisterOffset(register, offset));
+    }
+
+    /// Add a `DW_OP_regval_type` or `DW_OP_GNU_regval_type` operation to the expression.
+    ///
+    /// This may be emitted as a smaller equivalent operation.
+    pub fn op_regval_type(&mut self, register: Register, base: UnitEntryId) {
+        self.operations
+            .push(Operation::RegisterType(register, base));
+    }
+
+    /// Add a `DW_OP_pick` operation to the expression.
+    ///
+    /// This may be emitted as a `DW_OP_dup` or `DW_OP_over` operation.
+    pub fn op_pick(&mut self, index: u8) {
+        self.operations.push(Operation::Pick(index));
+    }
+
+    /// Add a `DW_OP_deref` operation to the expression.
+    pub fn op_deref(&mut self) {
+        self.operations.push(Operation::Deref { space: false });
+    }
+
+    /// Add a `DW_OP_xderef` operation to the expression.
+    pub fn op_xderef(&mut self) {
+        self.operations.push(Operation::Deref { space: true });
+    }
+
+    /// Add a `DW_OP_deref_size` operation to the expression.
+    pub fn op_deref_size(&mut self, size: u8) {
+        self.operations
+            .push(Operation::DerefSize { size, space: false });
+    }
+
+    /// Add a `DW_OP_xderef_size` operation to the expression.
+    pub fn op_xderef_size(&mut self, size: u8) {
+        self.operations
+            .push(Operation::DerefSize { size, space: true });
+    }
+
+    /// Add a `DW_OP_deref_type` or `DW_OP_GNU_deref_type` operation to the expression.
+    pub fn op_deref_type(&mut self, size: u8, base: UnitEntryId) {
+        self.operations.push(Operation::DerefType {
+            size,
+            base,
+            space: false,
+        });
+    }
+
+    /// Add a `DW_OP_xderef_type` operation to the expression.
+    pub fn op_xderef_type(&mut self, size: u8, base: UnitEntryId) {
+        self.operations.push(Operation::DerefType {
+            size,
+            base,
+            space: true,
+        });
+    }
+
+    /// Add a `DW_OP_plus_uconst` operation to the expression.
+    pub fn op_plus_uconst(&mut self, value: u64) {
+        self.operations.push(Operation::PlusConstant(value));
+    }
+
+    /// Add a `DW_OP_skip` operation to the expression.
+    ///
+    /// Returns the index of the operation. The caller must call `set_target` with
+    /// this index to set the target of the branch.
+    pub fn op_skip(&mut self) -> usize {
+        let index = self.next_index();
+        self.operations.push(Operation::Skip(!0));
+        index
+    }
+
+    /// Add a `DW_OP_bra` operation to the expression.
+    ///
+    /// Returns the index of the operation. The caller must call `set_target` with
+    /// this index to set the target of the branch.
+    pub fn op_bra(&mut self) -> usize {
+        let index = self.next_index();
+        self.operations.push(Operation::Branch(!0));
+        index
+    }
+
+    /// Return the index that will be assigned to the next operation.
+    ///
+    /// This can be passed to `set_target`.
+    #[inline]
+    pub fn next_index(&self) -> usize {
+        self.operations.len()
+    }
+
+    /// Set the target of a `DW_OP_skip` or `DW_OP_bra` operation .
+    pub fn set_target(&mut self, operation: usize, new_target: usize) {
+        debug_assert!(new_target <= self.next_index());
+        debug_assert_ne!(operation, new_target);
+        match self.operations[operation] {
+            Operation::Skip(ref mut target) | Operation::Branch(ref mut target) => {
+                *target = new_target;
+            }
+            _ => unimplemented!(),
+        }
+    }
+
+    /// Add a `DW_OP_call4` operation to the expression.
+    pub fn op_call(&mut self, entry: UnitEntryId) {
+        self.operations.push(Operation::Call(entry));
+    }
+
+    /// Add a `DW_OP_call_ref` operation to the expression.
+    pub fn op_call_ref(&mut self, entry: Reference) {
+        self.operations.push(Operation::CallRef(entry));
+    }
+
+    /// Add a `DW_OP_convert` or `DW_OP_GNU_convert` operation to the expression.
+    ///
+    /// `base` is the DIE of the base type, or `None` for the generic type.
+    pub fn op_convert(&mut self, base: Option<UnitEntryId>) {
+        self.operations.push(Operation::Convert(base));
+    }
+
+    /// Add a `DW_OP_reinterpret` or `DW_OP_GNU_reinterpret` operation to the expression.
+    ///
+    /// `base` is the DIE of the base type, or `None` for the generic type.
+    pub fn op_reinterpret(&mut self, base: Option<UnitEntryId>) {
+        self.operations.push(Operation::Reinterpret(base));
+    }
+
+    /// Add a `DW_OP_entry_value` or `DW_OP_GNU_entry_value` operation to the expression.
+    pub fn op_entry_value(&mut self, expression: Expression) {
+        self.operations.push(Operation::EntryValue(expression));
+    }
+
+    /// Add a `DW_OP_regx` operation to the expression.
+    ///
+    /// This may be emitted as a smaller equivalent operation.
+    pub fn op_reg(&mut self, register: Register) {
+        self.operations.push(Operation::Register(register));
+    }
+
+    /// Add a `DW_OP_implicit_value` operation to the expression.
+    pub fn op_implicit_value(&mut self, data: Box<[u8]>) {
+        self.operations.push(Operation::ImplicitValue(data));
+    }
+
+    /// Add a `DW_OP_implicit_pointer` or `DW_OP_GNU_implicit_pointer` operation to the expression.
+    pub fn op_implicit_pointer(&mut self, entry: Reference, byte_offset: i64) {
+        self.operations
+            .push(Operation::ImplicitPointer { entry, byte_offset });
+    }
+
+    /// Add a `DW_OP_piece` operation to the expression.
+    pub fn op_piece(&mut self, size_in_bytes: u64) {
+        self.operations.push(Operation::Piece { size_in_bytes });
+    }
+
+    /// Add a `DW_OP_bit_piece` operation to the expression.
+    pub fn op_bit_piece(&mut self, size_in_bits: u64, bit_offset: u64) {
+        self.operations.push(Operation::BitPiece {
+            size_in_bits,
+            bit_offset,
+        });
+    }
+
+    /// Add a `DW_OP_GNU_parameter_ref` operation to the expression.
+    pub fn op_gnu_parameter_ref(&mut self, entry: UnitEntryId) {
+        self.operations.push(Operation::ParameterRef(entry));
+    }
+
+    /// Add a `DW_OP_WASM_location 0x0` operation to the expression.
+    pub fn op_wasm_local(&mut self, index: u32) {
+        self.operations.push(Operation::WasmLocal(index));
+    }
+
+    /// Add a `DW_OP_WASM_location 0x1` operation to the expression.
+    pub fn op_wasm_global(&mut self, index: u32) {
+        self.operations.push(Operation::WasmGlobal(index));
+    }
+
+    /// Add a `DW_OP_WASM_location 0x2` operation to the expression.
+    pub fn op_wasm_stack(&mut self, index: u32) {
+        self.operations.push(Operation::WasmStack(index));
+    }
+
+    pub(crate) fn size(&self, encoding: Encoding, unit_offsets: Option<&UnitOffsets>) -> usize {
+        let mut size = 0;
+        for operation in &self.operations {
+            size += operation.size(encoding, unit_offsets);
+        }
+        size
+    }
+
+    pub(crate) fn write<W: Writer>(
+        &self,
+        w: &mut W,
+        mut refs: Option<&mut Vec<DebugInfoReference>>,
+        encoding: Encoding,
+        unit_offsets: Option<&UnitOffsets>,
+    ) -> Result<()> {
+        // TODO: only calculate offsets if needed?
+        let mut offsets = Vec::with_capacity(self.operations.len());
+        let mut offset = w.len();
+        for operation in &self.operations {
+            offsets.push(offset);
+            offset += operation.size(encoding, unit_offsets);
+        }
+        offsets.push(offset);
+        for (operation, offset) in self.operations.iter().zip(offsets.iter().copied()) {
+            let refs = match refs {
+                Some(ref mut refs) => Some(&mut **refs),
+                None => None,
+            };
+            debug_assert_eq!(w.len(), offset);
+            operation.write(w, refs, encoding, unit_offsets, &offsets)?;
+        }
+        Ok(())
+    }
+}
+
+/// A single DWARF operation.
+//
+// This type is intentionally not public so that we can change the
+// representation of expressions as needed.
+//
+// Variants are listed in the order they appear in Section 2.5.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+enum Operation {
+    /// Raw bytecode.
+    ///
+    /// Does not support references.
+    Raw(Vec<u8>),
+    /// An operation that has no explicit operands.
+    ///
+    /// Represents:
+    /// - `DW_OP_drop`, `DW_OP_swap`, `DW_OP_rot`
+    /// - `DW_OP_push_object_address`, `DW_OP_form_tls_address`, `DW_OP_call_frame_cfa`
+    /// - `DW_OP_abs`, `DW_OP_and`, `DW_OP_div`, `DW_OP_minus`, `DW_OP_mod`, `DW_OP_mul`,
+    ///   `DW_OP_neg`, `DW_OP_not`, `DW_OP_or`, `DW_OP_plus`, `DW_OP_shl`, `DW_OP_shr`,
+    ///   `DW_OP_shra`, `DW_OP_xor`
+    /// - `DW_OP_le`, `DW_OP_ge`, `DW_OP_eq`, `DW_OP_lt`, `DW_OP_gt`, `DW_OP_ne`
+    /// - `DW_OP_nop`
+    /// - `DW_OP_stack_value`
+    Simple(DwOp),
+    /// Relocate the address if needed, and push it on the stack.
+    ///
+    /// Represents `DW_OP_addr`.
+    Address(Address),
+    /// Push an unsigned constant value on the stack.
+    ///
+    /// Represents `DW_OP_constu`.
+    UnsignedConstant(u64),
+    /// Push a signed constant value on the stack.
+    ///
+    /// Represents `DW_OP_consts`.
+    SignedConstant(i64),
+    /* TODO: requires .debug_addr write support
+    /// Read the address at the given index in `.debug_addr, relocate the address if needed,
+    /// and push it on the stack.
+    ///
+    /// Represents `DW_OP_addrx`.
+    AddressIndex(DebugAddrIndex<Offset>),
+    /// Read the address at the given index in `.debug_addr, and push it on the stack.
+    /// Do not relocate the address.
+    ///
+    /// Represents `DW_OP_constx`.
+    ConstantIndex(DebugAddrIndex<Offset>),
+    */
+    /// Interpret the value bytes as a constant of a given type, and push it on the stack.
+    ///
+    /// Represents `DW_OP_const_type`.
+    ConstantType(UnitEntryId, Box<[u8]>),
+    /// Compute the frame base (using `DW_AT_frame_base`), add the
+    /// given offset, and then push the resulting sum on the stack.
+    ///
+    /// Represents `DW_OP_fbreg`.
+    FrameOffset(i64),
+    /// Find the contents of the given register, add the offset, and then
+    /// push the resulting sum on the stack.
+    ///
+    /// Represents `DW_OP_bregx`.
+    RegisterOffset(Register, i64),
+    /// Interpret the contents of the given register as a value of the given type,
+    /// and push it on the stack.
+    ///
+    /// Represents `DW_OP_regval_type`.
+    RegisterType(Register, UnitEntryId),
+    /// Copy the item at a stack index and push it on top of the stack.
+    ///
+    /// Represents `DW_OP_pick`, `DW_OP_dup`, and `DW_OP_over`.
+    Pick(u8),
+    /// Pop the topmost value of the stack, dereference it, and push the
+    /// resulting value.
+    ///
+    /// Represents `DW_OP_deref` and `DW_OP_xderef`.
+    Deref {
+        /// True if the dereference operation takes an address space
+        /// argument from the stack; false otherwise.
+        space: bool,
+    },
+    /// Pop the topmost value of the stack, dereference it to obtain a value
+    /// of the given size, and push the resulting value.
+    ///
+    /// Represents `DW_OP_deref_size` and `DW_OP_xderef_size`.
+    DerefSize {
+        /// True if the dereference operation takes an address space
+        /// argument from the stack; false otherwise.
+        space: bool,
+        /// The size of the data to dereference.
+        size: u8,
+    },
+    /// Pop the topmost value of the stack, dereference it to obtain a value
+    /// of the given type, and push the resulting value.
+    ///
+    /// Represents `DW_OP_deref_type` and `DW_OP_xderef_type`.
+    DerefType {
+        /// True if the dereference operation takes an address space
+        /// argument from the stack; false otherwise.
+        space: bool,
+        /// The size of the data to dereference.
+        size: u8,
+        /// The DIE of the base type, or `None` for the generic type.
+        base: UnitEntryId,
+    },
+    /// Add an unsigned constant to the topmost value on the stack.
+    ///
+    /// Represents `DW_OP_plus_uconst`.
+    PlusConstant(u64),
+    /// Unconditional branch to the target location.
+    ///
+    /// The value is the index within the expression of the operation to branch to.
+    /// This will be converted to a relative offset when writing.
+    ///
+    /// Represents `DW_OP_skip`.
+    Skip(usize),
+    /// Branch to the target location if the top of stack is nonzero.
+    ///
+    /// The value is the index within the expression of the operation to branch to.
+    /// This will be converted to a relative offset when writing.
+    ///
+    /// Represents `DW_OP_bra`.
+    Branch(usize),
+    /// Evaluate a DWARF expression as a subroutine.
+    ///
+    /// The expression comes from the `DW_AT_location` attribute of the indicated DIE.
+    ///
+    /// Represents `DW_OP_call4`.
+    Call(UnitEntryId),
+    /// Evaluate an external DWARF expression as a subroutine.
+    ///
+    /// The expression comes from the `DW_AT_location` attribute of the indicated DIE,
+    /// which may be in another compilation unit or shared object.
+    ///
+    /// Represents `DW_OP_call_ref`.
+    CallRef(Reference),
+    /// Pop the top stack entry, convert it to a different type, and push it on the stack.
+    ///
+    /// Represents `DW_OP_convert`.
+    Convert(Option<UnitEntryId>),
+    /// Pop the top stack entry, reinterpret the bits in its value as a different type,
+    /// and push it on the stack.
+    ///
+    /// Represents `DW_OP_reinterpret`.
+    Reinterpret(Option<UnitEntryId>),
+    /// Evaluate an expression at the entry to the current subprogram, and push it on the stack.
+    ///
+    /// Represents `DW_OP_entry_value`.
+    EntryValue(Expression),
+    // FIXME: EntryRegister
+    /// Indicate that this piece's location is in the given register.
+    ///
+    /// Completes the piece or expression.
+    ///
+    /// Represents `DW_OP_regx`.
+    Register(Register),
+    /// The object has no location, but has a known constant value.
+    ///
+    /// Completes the piece or expression.
+    ///
+    /// Represents `DW_OP_implicit_value`.
+    ImplicitValue(Box<[u8]>),
+    /// The object is a pointer to a value which has no actual location, such as
+    /// an implicit value or a stack value.
+    ///
+    /// Completes the piece or expression.
+    ///
+    /// Represents `DW_OP_implicit_pointer`.
+    ImplicitPointer {
+        /// The DIE of the value that this is an implicit pointer into.
+        entry: Reference,
+        /// The byte offset into the value that the implicit pointer points to.
+        byte_offset: i64,
+    },
+    /// Terminate a piece.
+    ///
+    /// Represents `DW_OP_piece`.
+    Piece {
+        /// The size of this piece in bytes.
+        size_in_bytes: u64,
+    },
+    /// Terminate a piece with a size in bits.
+    ///
+    /// Represents `DW_OP_bit_piece`.
+    BitPiece {
+        /// The size of this piece in bits.
+        size_in_bits: u64,
+        /// The bit offset of this piece.
+        bit_offset: u64,
+    },
+    /// This represents a parameter that was optimized out.
+    ///
+    /// The entry is the definition of the parameter, and is matched to
+    /// the `DW_TAG_GNU_call_site_parameter` in the caller that also
+    /// points to the same definition of the parameter.
+    ///
+    /// Represents `DW_OP_GNU_parameter_ref`.
+    ParameterRef(UnitEntryId),
+    /// The index of a local in the currently executing function.
+    ///
+    /// Represents `DW_OP_WASM_location 0x00`.
+    WasmLocal(u32),
+    /// The index of a global.
+    ///
+    /// Represents `DW_OP_WASM_location 0x01`.
+    WasmGlobal(u32),
+    /// The index of an item on the operand stack.
+    ///
+    /// Represents `DW_OP_WASM_location 0x02`.
+    WasmStack(u32),
+}
+
+impl Operation {
+    fn size(&self, encoding: Encoding, unit_offsets: Option<&UnitOffsets>) -> usize {
+        let base_size = |base| {
+            // Errors are handled during writes.
+            match unit_offsets {
+                Some(offsets) => uleb128_size(offsets.unit_offset(base)),
+                None => 0,
+            }
+        };
+        1 + match *self {
+            Operation::Raw(ref bytecode) => return bytecode.len(),
+            Operation::Simple(_) => 0,
+            Operation::Address(_) => encoding.address_size as usize,
+            Operation::UnsignedConstant(value) => {
+                if value < 32 {
+                    0
+                } else {
+                    uleb128_size(value)
+                }
+            }
+            Operation::SignedConstant(value) => sleb128_size(value),
+            Operation::ConstantType(base, ref value) => base_size(base) + 1 + value.len(),
+            Operation::FrameOffset(offset) => sleb128_size(offset),
+            Operation::RegisterOffset(register, offset) => {
+                if register.0 < 32 {
+                    sleb128_size(offset)
+                } else {
+                    uleb128_size(register.0.into()) + sleb128_size(offset)
+                }
+            }
+            Operation::RegisterType(register, base) => {
+                uleb128_size(register.0.into()) + base_size(base)
+            }
+            Operation::Pick(index) => {
+                if index > 1 {
+                    1
+                } else {
+                    0
+                }
+            }
+            Operation::Deref { .. } => 0,
+            Operation::DerefSize { .. } => 1,
+            Operation::DerefType { base, .. } => 1 + base_size(base),
+            Operation::PlusConstant(value) => uleb128_size(value),
+            Operation::Skip(_) => 2,
+            Operation::Branch(_) => 2,
+            Operation::Call(_) => 4,
+            Operation::CallRef(_) => encoding.format.word_size() as usize,
+            Operation::Convert(base) => match base {
+                Some(base) => base_size(base),
+                None => 1,
+            },
+            Operation::Reinterpret(base) => match base {
+                Some(base) => base_size(base),
+                None => 1,
+            },
+            Operation::EntryValue(ref expression) => {
+                let length = expression.size(encoding, unit_offsets);
+                uleb128_size(length as u64) + length
+            }
+            Operation::Register(register) => {
+                if register.0 < 32 {
+                    0
+                } else {
+                    uleb128_size(register.0.into())
+                }
+            }
+            Operation::ImplicitValue(ref data) => uleb128_size(data.len() as u64) + data.len(),
+            Operation::ImplicitPointer { byte_offset, .. } => {
+                encoding.format.word_size() as usize + sleb128_size(byte_offset)
+            }
+            Operation::Piece { size_in_bytes } => uleb128_size(size_in_bytes),
+            Operation::BitPiece {
+                size_in_bits,
+                bit_offset,
+            } => uleb128_size(size_in_bits) + uleb128_size(bit_offset),
+            Operation::ParameterRef(_) => 4,
+            Operation::WasmLocal(index)
+            | Operation::WasmGlobal(index)
+            | Operation::WasmStack(index) => 1 + uleb128_size(index.into()),
+        }
+    }
+
+    pub(crate) fn write<W: Writer>(
+        &self,
+        w: &mut W,
+        refs: Option<&mut Vec<DebugInfoReference>>,
+        encoding: Encoding,
+        unit_offsets: Option<&UnitOffsets>,
+        offsets: &[usize],
+    ) -> Result<()> {
+        let entry_offset = |entry| match unit_offsets {
+            Some(offsets) => {
+                let offset = offsets.unit_offset(entry);
+                if offset == 0 {
+                    Err(Error::UnsupportedExpressionForwardReference)
+                } else {
+                    Ok(offset)
+                }
+            }
+            None => Err(Error::UnsupportedCfiExpressionReference),
+        };
+        match *self {
+            Operation::Raw(ref bytecode) => w.write(bytecode)?,
+            Operation::Simple(opcode) => w.write_u8(opcode.0)?,
+            Operation::Address(address) => {
+                w.write_u8(constants::DW_OP_addr.0)?;
+                w.write_address(address, encoding.address_size)?;
+            }
+            Operation::UnsignedConstant(value) => {
+                if value < 32 {
+                    w.write_u8(constants::DW_OP_lit0.0 + value as u8)?;
+                } else {
+                    w.write_u8(constants::DW_OP_constu.0)?;
+                    w.write_uleb128(value)?;
+                }
+            }
+            Operation::SignedConstant(value) => {
+                w.write_u8(constants::DW_OP_consts.0)?;
+                w.write_sleb128(value)?;
+            }
+            Operation::ConstantType(base, ref value) => {
+                if encoding.version >= 5 {
+                    w.write_u8(constants::DW_OP_const_type.0)?;
+                } else {
+                    w.write_u8(constants::DW_OP_GNU_const_type.0)?;
+                }
+                w.write_uleb128(entry_offset(base)?)?;
+                w.write_udata(value.len() as u64, 1)?;
+                w.write(&value)?;
+            }
+            Operation::FrameOffset(offset) => {
+                w.write_u8(constants::DW_OP_fbreg.0)?;
+                w.write_sleb128(offset)?;
+            }
+            Operation::RegisterOffset(register, offset) => {
+                if register.0 < 32 {
+                    w.write_u8(constants::DW_OP_breg0.0 + register.0 as u8)?;
+                } else {
+                    w.write_u8(constants::DW_OP_bregx.0)?;
+                    w.write_uleb128(register.0.into())?;
+                }
+                w.write_sleb128(offset)?;
+            }
+            Operation::RegisterType(register, base) => {
+                if encoding.version >= 5 {
+                    w.write_u8(constants::DW_OP_regval_type.0)?;
+                } else {
+                    w.write_u8(constants::DW_OP_GNU_regval_type.0)?;
+                }
+                w.write_uleb128(register.0.into())?;
+                w.write_uleb128(entry_offset(base)?)?;
+            }
+            Operation::Pick(index) => match index {
+                0 => w.write_u8(constants::DW_OP_dup.0)?,
+                1 => w.write_u8(constants::DW_OP_over.0)?,
+                _ => {
+                    w.write_u8(constants::DW_OP_pick.0)?;
+                    w.write_u8(index)?;
+                }
+            },
+            Operation::Deref { space } => {
+                if space {
+                    w.write_u8(constants::DW_OP_xderef.0)?;
+                } else {
+                    w.write_u8(constants::DW_OP_deref.0)?;
+                }
+            }
+            Operation::DerefSize { space, size } => {
+                if space {
+                    w.write_u8(constants::DW_OP_xderef_size.0)?;
+                } else {
+                    w.write_u8(constants::DW_OP_deref_size.0)?;
+                }
+                w.write_u8(size)?;
+            }
+            Operation::DerefType { space, size, base } => {
+                if space {
+                    w.write_u8(constants::DW_OP_xderef_type.0)?;
+                } else {
+                    if encoding.version >= 5 {
+                        w.write_u8(constants::DW_OP_deref_type.0)?;
+                    } else {
+                        w.write_u8(constants::DW_OP_GNU_deref_type.0)?;
+                    }
+                }
+                w.write_u8(size)?;
+                w.write_uleb128(entry_offset(base)?)?;
+            }
+            Operation::PlusConstant(value) => {
+                w.write_u8(constants::DW_OP_plus_uconst.0)?;
+                w.write_uleb128(value)?;
+            }
+            Operation::Skip(target) => {
+                w.write_u8(constants::DW_OP_skip.0)?;
+                let offset = offsets[target] as i64 - (w.len() as i64 + 2);
+                w.write_sdata(offset, 2)?;
+            }
+            Operation::Branch(target) => {
+                w.write_u8(constants::DW_OP_bra.0)?;
+                let offset = offsets[target] as i64 - (w.len() as i64 + 2);
+                w.write_sdata(offset, 2)?;
+            }
+            Operation::Call(entry) => {
+                w.write_u8(constants::DW_OP_call4.0)?;
+                // TODO: this probably won't work in practice, because we may
+                // only know the offsets of base type DIEs at this point.
+                w.write_udata(entry_offset(entry)?, 4)?;
+            }
+            Operation::CallRef(entry) => {
+                w.write_u8(constants::DW_OP_call_ref.0)?;
+                let size = encoding.format.word_size();
+                match entry {
+                    Reference::Symbol(symbol) => w.write_reference(symbol, size)?,
+                    Reference::Entry(unit, entry) => {
+                        let refs = refs.ok_or(Error::InvalidReference)?;
+                        refs.push(DebugInfoReference {
+                            offset: w.len(),
+                            unit,
+                            entry,
+                            size,
+                        });
+                        w.write_udata(0, size)?;
+                    }
+                }
+            }
+            Operation::Convert(base) => {
+                if encoding.version >= 5 {
+                    w.write_u8(constants::DW_OP_convert.0)?;
+                } else {
+                    w.write_u8(constants::DW_OP_GNU_convert.0)?;
+                }
+                match base {
+                    Some(base) => w.write_uleb128(entry_offset(base)?)?,
+                    None => w.write_u8(0)?,
+                }
+            }
+            Operation::Reinterpret(base) => {
+                if encoding.version >= 5 {
+                    w.write_u8(constants::DW_OP_reinterpret.0)?;
+                } else {
+                    w.write_u8(constants::DW_OP_GNU_reinterpret.0)?;
+                }
+                match base {
+                    Some(base) => w.write_uleb128(entry_offset(base)?)?,
+                    None => w.write_u8(0)?,
+                }
+            }
+            Operation::EntryValue(ref expression) => {
+                if encoding.version >= 5 {
+                    w.write_u8(constants::DW_OP_entry_value.0)?;
+                } else {
+                    w.write_u8(constants::DW_OP_GNU_entry_value.0)?;
+                }
+                let length = expression.size(encoding, unit_offsets);
+                w.write_uleb128(length as u64)?;
+                expression.write(w, refs, encoding, unit_offsets)?;
+            }
+            Operation::Register(register) => {
+                if register.0 < 32 {
+                    w.write_u8(constants::DW_OP_reg0.0 + register.0 as u8)?;
+                } else {
+                    w.write_u8(constants::DW_OP_regx.0)?;
+                    w.write_uleb128(register.0.into())?;
+                }
+            }
+            Operation::ImplicitValue(ref data) => {
+                w.write_u8(constants::DW_OP_implicit_value.0)?;
+                w.write_uleb128(data.len() as u64)?;
+                w.write(&data)?;
+            }
+            Operation::ImplicitPointer { entry, byte_offset } => {
+                if encoding.version >= 5 {
+                    w.write_u8(constants::DW_OP_implicit_pointer.0)?;
+                } else {
+                    w.write_u8(constants::DW_OP_GNU_implicit_pointer.0)?;
+                }
+                let size = encoding.format.word_size();
+                match entry {
+                    Reference::Symbol(symbol) => {
+                        w.write_reference(symbol, size)?;
+                    }
+                    Reference::Entry(unit, entry) => {
+                        let refs = refs.ok_or(Error::InvalidReference)?;
+                        refs.push(DebugInfoReference {
+                            offset: w.len(),
+                            unit,
+                            entry,
+                            size,
+                        });
+                        w.write_udata(0, size)?;
+                    }
+                }
+                w.write_sleb128(byte_offset)?;
+            }
+            Operation::Piece { size_in_bytes } => {
+                w.write_u8(constants::DW_OP_piece.0)?;
+                w.write_uleb128(size_in_bytes)?;
+            }
+            Operation::BitPiece {
+                size_in_bits,
+                bit_offset,
+            } => {
+                w.write_u8(constants::DW_OP_bit_piece.0)?;
+                w.write_uleb128(size_in_bits)?;
+                w.write_uleb128(bit_offset)?;
+            }
+            Operation::ParameterRef(entry) => {
+                w.write_u8(constants::DW_OP_GNU_parameter_ref.0)?;
+                w.write_udata(entry_offset(entry)?, 4)?;
+            }
+            Operation::WasmLocal(index) => {
+                w.write(&[constants::DW_OP_WASM_location.0, 0])?;
+                w.write_uleb128(index.into())?;
+            }
+            Operation::WasmGlobal(index) => {
+                w.write(&[constants::DW_OP_WASM_location.0, 1])?;
+                w.write_uleb128(index.into())?;
+            }
+            Operation::WasmStack(index) => {
+                w.write(&[constants::DW_OP_WASM_location.0, 2])?;
+                w.write_uleb128(index.into())?;
+            }
+        }
+        Ok(())
+    }
+}
+
+#[cfg(feature = "read")]
+pub(crate) mod convert {
+    use super::*;
+    use crate::common::UnitSectionOffset;
+    use crate::read::{self, Reader};
+    use crate::write::{ConvertError, ConvertResult, UnitEntryId, UnitId};
+    use std::collections::HashMap;
+
+    impl Expression {
+        /// Create an expression from the input expression.
+        pub fn from<R: Reader<Offset = usize>>(
+            from_expression: read::Expression<R>,
+            encoding: Encoding,
+            dwarf: Option<&read::Dwarf<R>>,
+            unit: Option<&read::Unit<R>>,
+            entry_ids: Option<&HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>>,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+        ) -> ConvertResult<Expression> {
+            let convert_unit_offset = |offset: read::UnitOffset| -> ConvertResult<_> {
+                let entry_ids = entry_ids.ok_or(ConvertError::UnsupportedOperation)?;
+                let unit = unit.ok_or(ConvertError::UnsupportedOperation)?;
+                let id = entry_ids
+                    .get(&offset.to_unit_section_offset(unit))
+                    .ok_or(ConvertError::InvalidUnitRef)?;
+                Ok(id.1)
+            };
+            let convert_debug_info_offset = |offset| -> ConvertResult<_> {
+                // TODO: support relocations
+                let entry_ids = entry_ids.ok_or(ConvertError::UnsupportedOperation)?;
+                let id = entry_ids
+                    .get(&UnitSectionOffset::DebugInfoOffset(offset))
+                    .ok_or(ConvertError::InvalidDebugInfoRef)?;
+                Ok(Reference::Entry(id.0, id.1))
+            };
+
+            // Calculate offsets for use in branch/skip operations.
+            let mut offsets = Vec::new();
+            let mut offset = 0;
+            let mut from_operations = from_expression.clone().operations(encoding);
+            while let Some(_) = from_operations.next()? {
+                offsets.push(offset);
+                offset = from_operations.offset_from(&from_expression);
+            }
+            offsets.push(from_expression.0.len());
+
+            let mut from_operations = from_expression.clone().operations(encoding);
+            let mut operations = Vec::new();
+            while let Some(from_operation) = from_operations.next()? {
+                let operation = match from_operation {
+                    read::Operation::Deref {
+                        base_type,
+                        size,
+                        space,
+                    } => {
+                        if base_type.0 != 0 {
+                            let base = convert_unit_offset(base_type)?;
+                            Operation::DerefType { space, size, base }
+                        } else if size != encoding.address_size {
+                            Operation::DerefSize { space, size }
+                        } else {
+                            Operation::Deref { space }
+                        }
+                    }
+                    read::Operation::Drop => Operation::Simple(constants::DW_OP_drop),
+                    read::Operation::Pick { index } => Operation::Pick(index),
+                    read::Operation::Swap => Operation::Simple(constants::DW_OP_swap),
+                    read::Operation::Rot => Operation::Simple(constants::DW_OP_rot),
+                    read::Operation::Abs => Operation::Simple(constants::DW_OP_abs),
+                    read::Operation::And => Operation::Simple(constants::DW_OP_and),
+                    read::Operation::Div => Operation::Simple(constants::DW_OP_div),
+                    read::Operation::Minus => Operation::Simple(constants::DW_OP_minus),
+                    read::Operation::Mod => Operation::Simple(constants::DW_OP_mod),
+                    read::Operation::Mul => Operation::Simple(constants::DW_OP_mul),
+                    read::Operation::Neg => Operation::Simple(constants::DW_OP_neg),
+                    read::Operation::Not => Operation::Simple(constants::DW_OP_not),
+                    read::Operation::Or => Operation::Simple(constants::DW_OP_or),
+                    read::Operation::Plus => Operation::Simple(constants::DW_OP_plus),
+                    read::Operation::PlusConstant { value } => Operation::PlusConstant(value),
+                    read::Operation::Shl => Operation::Simple(constants::DW_OP_shl),
+                    read::Operation::Shr => Operation::Simple(constants::DW_OP_shr),
+                    read::Operation::Shra => Operation::Simple(constants::DW_OP_shra),
+                    read::Operation::Xor => Operation::Simple(constants::DW_OP_xor),
+                    read::Operation::Eq => Operation::Simple(constants::DW_OP_eq),
+                    read::Operation::Ge => Operation::Simple(constants::DW_OP_ge),
+                    read::Operation::Gt => Operation::Simple(constants::DW_OP_gt),
+                    read::Operation::Le => Operation::Simple(constants::DW_OP_le),
+                    read::Operation::Lt => Operation::Simple(constants::DW_OP_lt),
+                    read::Operation::Ne => Operation::Simple(constants::DW_OP_ne),
+                    read::Operation::Bra { target } => {
+                        let offset = from_operations
+                            .offset_from(&from_expression)
+                            .wrapping_add(i64::from(target) as usize);
+                        let index = offsets
+                            .binary_search(&offset)
+                            .map_err(|_| ConvertError::InvalidBranchTarget)?;
+                        Operation::Branch(index)
+                    }
+                    read::Operation::Skip { target } => {
+                        let offset = from_operations
+                            .offset_from(&from_expression)
+                            .wrapping_add(i64::from(target) as usize);
+                        let index = offsets
+                            .binary_search(&offset)
+                            .map_err(|_| ConvertError::InvalidBranchTarget)?;
+                        Operation::Skip(index)
+                    }
+                    read::Operation::UnsignedConstant { value } => {
+                        Operation::UnsignedConstant(value)
+                    }
+                    read::Operation::SignedConstant { value } => Operation::SignedConstant(value),
+                    read::Operation::Register { register } => Operation::Register(register),
+                    read::Operation::RegisterOffset {
+                        register,
+                        offset,
+                        base_type,
+                    } => {
+                        if base_type.0 != 0 {
+                            Operation::RegisterType(register, convert_unit_offset(base_type)?)
+                        } else {
+                            Operation::RegisterOffset(register, offset)
+                        }
+                    }
+                    read::Operation::FrameOffset { offset } => Operation::FrameOffset(offset),
+                    read::Operation::Nop => Operation::Simple(constants::DW_OP_nop),
+                    read::Operation::PushObjectAddress => {
+                        Operation::Simple(constants::DW_OP_push_object_address)
+                    }
+                    read::Operation::Call { offset } => match offset {
+                        read::DieReference::UnitRef(offset) => {
+                            Operation::Call(convert_unit_offset(offset)?)
+                        }
+                        read::DieReference::DebugInfoRef(offset) => {
+                            Operation::CallRef(convert_debug_info_offset(offset)?)
+                        }
+                    },
+                    read::Operation::TLS => Operation::Simple(constants::DW_OP_form_tls_address),
+                    read::Operation::CallFrameCFA => {
+                        Operation::Simple(constants::DW_OP_call_frame_cfa)
+                    }
+                    read::Operation::Piece {
+                        size_in_bits,
+                        bit_offset: None,
+                    } => Operation::Piece {
+                        size_in_bytes: size_in_bits / 8,
+                    },
+                    read::Operation::Piece {
+                        size_in_bits,
+                        bit_offset: Some(bit_offset),
+                    } => Operation::BitPiece {
+                        size_in_bits,
+                        bit_offset,
+                    },
+                    read::Operation::ImplicitValue { data } => {
+                        Operation::ImplicitValue(data.to_slice()?.into_owned().into())
+                    }
+                    read::Operation::StackValue => Operation::Simple(constants::DW_OP_stack_value),
+                    read::Operation::ImplicitPointer { value, byte_offset } => {
+                        let entry = convert_debug_info_offset(value)?;
+                        Operation::ImplicitPointer { entry, byte_offset }
+                    }
+                    read::Operation::EntryValue { expression } => {
+                        let expression = Expression::from(
+                            read::Expression(expression),
+                            encoding,
+                            dwarf,
+                            unit,
+                            entry_ids,
+                            convert_address,
+                        )?;
+                        Operation::EntryValue(expression)
+                    }
+                    read::Operation::ParameterRef { offset } => {
+                        let entry = convert_unit_offset(offset)?;
+                        Operation::ParameterRef(entry)
+                    }
+                    read::Operation::Address { address } => {
+                        let address =
+                            convert_address(address).ok_or(ConvertError::InvalidAddress)?;
+                        Operation::Address(address)
+                    }
+                    read::Operation::AddressIndex { index } => {
+                        let dwarf = dwarf.ok_or(ConvertError::UnsupportedOperation)?;
+                        let unit = unit.ok_or(ConvertError::UnsupportedOperation)?;
+                        let val = dwarf.address(unit, index)?;
+                        let address = convert_address(val).ok_or(ConvertError::InvalidAddress)?;
+                        Operation::Address(address)
+                    }
+                    read::Operation::ConstantIndex { index } => {
+                        let dwarf = dwarf.ok_or(ConvertError::UnsupportedOperation)?;
+                        let unit = unit.ok_or(ConvertError::UnsupportedOperation)?;
+                        let val = dwarf.address(unit, index)?;
+                        Operation::UnsignedConstant(val)
+                    }
+                    read::Operation::TypedLiteral { base_type, value } => {
+                        let entry = convert_unit_offset(base_type)?;
+                        Operation::ConstantType(entry, value.to_slice()?.into_owned().into())
+                    }
+                    read::Operation::Convert { base_type } => {
+                        if base_type.0 == 0 {
+                            Operation::Convert(None)
+                        } else {
+                            let entry = convert_unit_offset(base_type)?;
+                            Operation::Convert(Some(entry))
+                        }
+                    }
+                    read::Operation::Reinterpret { base_type } => {
+                        if base_type.0 == 0 {
+                            Operation::Reinterpret(None)
+                        } else {
+                            let entry = convert_unit_offset(base_type)?;
+                            Operation::Reinterpret(Some(entry))
+                        }
+                    }
+                    read::Operation::WasmLocal { index } => Operation::WasmLocal(index),
+                    read::Operation::WasmGlobal { index } => Operation::WasmGlobal(index),
+                    read::Operation::WasmStack { index } => Operation::WasmStack(index),
+                };
+                operations.push(operation);
+            }
+            Ok(Expression { operations })
+        }
+    }
+}
+
+#[cfg(test)]
+#[cfg(feature = "read")]
+mod tests {
+    use super::*;
+    use crate::common::{
+        DebugAbbrevOffset, DebugAddrBase, DebugInfoOffset, DebugLocListsBase, DebugRngListsBase,
+        DebugStrOffsetsBase, Format, SectionId,
+    };
+    use crate::read;
+    use crate::write::{
+        DebugLineStrOffsets, DebugStrOffsets, EndianVec, LineProgram, Sections, Unit, UnitTable,
+    };
+    use crate::LittleEndian;
+    use std::collections::HashMap;
+
+    #[test]
+    fn test_operation() {
+        for &version in &[3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+
+                    let mut units = UnitTable::default();
+                    let unit_id = units.add(Unit::new(encoding, LineProgram::none()));
+                    let unit = units.get_mut(unit_id);
+                    let entry_id = unit.add(unit.root(), constants::DW_TAG_base_type);
+                    let reference = Reference::Entry(unit_id, entry_id);
+
+                    let mut sections = Sections::new(EndianVec::new(LittleEndian));
+                    let debug_line_str_offsets = DebugLineStrOffsets::none();
+                    let debug_str_offsets = DebugStrOffsets::none();
+                    let debug_info_offsets = units
+                        .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
+                        .unwrap();
+                    let unit_offsets = debug_info_offsets.unit_offsets(unit_id);
+                    let debug_info_offset = unit_offsets.debug_info_offset(entry_id);
+                    let entry_offset =
+                        read::UnitOffset(unit_offsets.unit_offset(entry_id) as usize);
+
+                    let mut reg_expression = Expression::new();
+                    reg_expression.op_reg(Register(23));
+
+                    let operations: &[(&dyn Fn(&mut Expression), Operation, read::Operation<_>)] =
+                        &[
+                            (
+                                &|x| x.op_deref(),
+                                Operation::Deref { space: false },
+                                read::Operation::Deref {
+                                    base_type: read::UnitOffset(0),
+                                    size: address_size,
+                                    space: false,
+                                },
+                            ),
+                            (
+                                &|x| x.op_xderef(),
+                                Operation::Deref { space: true },
+                                read::Operation::Deref {
+                                    base_type: read::UnitOffset(0),
+                                    size: address_size,
+                                    space: true,
+                                },
+                            ),
+                            (
+                                &|x| x.op_deref_size(2),
+                                Operation::DerefSize {
+                                    space: false,
+                                    size: 2,
+                                },
+                                read::Operation::Deref {
+                                    base_type: read::UnitOffset(0),
+                                    size: 2,
+                                    space: false,
+                                },
+                            ),
+                            (
+                                &|x| x.op_xderef_size(2),
+                                Operation::DerefSize {
+                                    space: true,
+                                    size: 2,
+                                },
+                                read::Operation::Deref {
+                                    base_type: read::UnitOffset(0),
+                                    size: 2,
+                                    space: true,
+                                },
+                            ),
+                            (
+                                &|x| x.op_deref_type(2, entry_id),
+                                Operation::DerefType {
+                                    space: false,
+                                    size: 2,
+                                    base: entry_id,
+                                },
+                                read::Operation::Deref {
+                                    base_type: entry_offset,
+                                    size: 2,
+                                    space: false,
+                                },
+                            ),
+                            (
+                                &|x| x.op_xderef_type(2, entry_id),
+                                Operation::DerefType {
+                                    space: true,
+                                    size: 2,
+                                    base: entry_id,
+                                },
+                                read::Operation::Deref {
+                                    base_type: entry_offset,
+                                    size: 2,
+                                    space: true,
+                                },
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_drop),
+                                Operation::Simple(constants::DW_OP_drop),
+                                read::Operation::Drop,
+                            ),
+                            (
+                                &|x| x.op_pick(0),
+                                Operation::Pick(0),
+                                read::Operation::Pick { index: 0 },
+                            ),
+                            (
+                                &|x| x.op_pick(1),
+                                Operation::Pick(1),
+                                read::Operation::Pick { index: 1 },
+                            ),
+                            (
+                                &|x| x.op_pick(2),
+                                Operation::Pick(2),
+                                read::Operation::Pick { index: 2 },
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_swap),
+                                Operation::Simple(constants::DW_OP_swap),
+                                read::Operation::Swap,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_rot),
+                                Operation::Simple(constants::DW_OP_rot),
+                                read::Operation::Rot,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_abs),
+                                Operation::Simple(constants::DW_OP_abs),
+                                read::Operation::Abs,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_and),
+                                Operation::Simple(constants::DW_OP_and),
+                                read::Operation::And,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_div),
+                                Operation::Simple(constants::DW_OP_div),
+                                read::Operation::Div,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_minus),
+                                Operation::Simple(constants::DW_OP_minus),
+                                read::Operation::Minus,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_mod),
+                                Operation::Simple(constants::DW_OP_mod),
+                                read::Operation::Mod,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_mul),
+                                Operation::Simple(constants::DW_OP_mul),
+                                read::Operation::Mul,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_neg),
+                                Operation::Simple(constants::DW_OP_neg),
+                                read::Operation::Neg,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_not),
+                                Operation::Simple(constants::DW_OP_not),
+                                read::Operation::Not,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_or),
+                                Operation::Simple(constants::DW_OP_or),
+                                read::Operation::Or,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_plus),
+                                Operation::Simple(constants::DW_OP_plus),
+                                read::Operation::Plus,
+                            ),
+                            (
+                                &|x| x.op_plus_uconst(23),
+                                Operation::PlusConstant(23),
+                                read::Operation::PlusConstant { value: 23 },
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_shl),
+                                Operation::Simple(constants::DW_OP_shl),
+                                read::Operation::Shl,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_shr),
+                                Operation::Simple(constants::DW_OP_shr),
+                                read::Operation::Shr,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_shra),
+                                Operation::Simple(constants::DW_OP_shra),
+                                read::Operation::Shra,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_xor),
+                                Operation::Simple(constants::DW_OP_xor),
+                                read::Operation::Xor,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_eq),
+                                Operation::Simple(constants::DW_OP_eq),
+                                read::Operation::Eq,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_ge),
+                                Operation::Simple(constants::DW_OP_ge),
+                                read::Operation::Ge,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_gt),
+                                Operation::Simple(constants::DW_OP_gt),
+                                read::Operation::Gt,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_le),
+                                Operation::Simple(constants::DW_OP_le),
+                                read::Operation::Le,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_lt),
+                                Operation::Simple(constants::DW_OP_lt),
+                                read::Operation::Lt,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_ne),
+                                Operation::Simple(constants::DW_OP_ne),
+                                read::Operation::Ne,
+                            ),
+                            (
+                                &|x| x.op_constu(23),
+                                Operation::UnsignedConstant(23),
+                                read::Operation::UnsignedConstant { value: 23 },
+                            ),
+                            (
+                                &|x| x.op_consts(-23),
+                                Operation::SignedConstant(-23),
+                                read::Operation::SignedConstant { value: -23 },
+                            ),
+                            (
+                                &|x| x.op_reg(Register(23)),
+                                Operation::Register(Register(23)),
+                                read::Operation::Register {
+                                    register: Register(23),
+                                },
+                            ),
+                            (
+                                &|x| x.op_reg(Register(123)),
+                                Operation::Register(Register(123)),
+                                read::Operation::Register {
+                                    register: Register(123),
+                                },
+                            ),
+                            (
+                                &|x| x.op_breg(Register(23), 34),
+                                Operation::RegisterOffset(Register(23), 34),
+                                read::Operation::RegisterOffset {
+                                    register: Register(23),
+                                    offset: 34,
+                                    base_type: read::UnitOffset(0),
+                                },
+                            ),
+                            (
+                                &|x| x.op_breg(Register(123), 34),
+                                Operation::RegisterOffset(Register(123), 34),
+                                read::Operation::RegisterOffset {
+                                    register: Register(123),
+                                    offset: 34,
+                                    base_type: read::UnitOffset(0),
+                                },
+                            ),
+                            (
+                                &|x| x.op_regval_type(Register(23), entry_id),
+                                Operation::RegisterType(Register(23), entry_id),
+                                read::Operation::RegisterOffset {
+                                    register: Register(23),
+                                    offset: 0,
+                                    base_type: entry_offset,
+                                },
+                            ),
+                            (
+                                &|x| x.op_fbreg(34),
+                                Operation::FrameOffset(34),
+                                read::Operation::FrameOffset { offset: 34 },
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_nop),
+                                Operation::Simple(constants::DW_OP_nop),
+                                read::Operation::Nop,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_push_object_address),
+                                Operation::Simple(constants::DW_OP_push_object_address),
+                                read::Operation::PushObjectAddress,
+                            ),
+                            (
+                                &|x| x.op_call(entry_id),
+                                Operation::Call(entry_id),
+                                read::Operation::Call {
+                                    offset: read::DieReference::UnitRef(entry_offset),
+                                },
+                            ),
+                            (
+                                &|x| x.op_call_ref(reference),
+                                Operation::CallRef(reference),
+                                read::Operation::Call {
+                                    offset: read::DieReference::DebugInfoRef(debug_info_offset),
+                                },
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_form_tls_address),
+                                Operation::Simple(constants::DW_OP_form_tls_address),
+                                read::Operation::TLS,
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_call_frame_cfa),
+                                Operation::Simple(constants::DW_OP_call_frame_cfa),
+                                read::Operation::CallFrameCFA,
+                            ),
+                            (
+                                &|x| x.op_piece(23),
+                                Operation::Piece { size_in_bytes: 23 },
+                                read::Operation::Piece {
+                                    size_in_bits: 23 * 8,
+                                    bit_offset: None,
+                                },
+                            ),
+                            (
+                                &|x| x.op_bit_piece(23, 34),
+                                Operation::BitPiece {
+                                    size_in_bits: 23,
+                                    bit_offset: 34,
+                                },
+                                read::Operation::Piece {
+                                    size_in_bits: 23,
+                                    bit_offset: Some(34),
+                                },
+                            ),
+                            (
+                                &|x| x.op_implicit_value(vec![23].into()),
+                                Operation::ImplicitValue(vec![23].into()),
+                                read::Operation::ImplicitValue {
+                                    data: read::EndianSlice::new(&[23], LittleEndian),
+                                },
+                            ),
+                            (
+                                &|x| x.op(constants::DW_OP_stack_value),
+                                Operation::Simple(constants::DW_OP_stack_value),
+                                read::Operation::StackValue,
+                            ),
+                            (
+                                &|x| x.op_implicit_pointer(reference, 23),
+                                Operation::ImplicitPointer {
+                                    entry: reference,
+                                    byte_offset: 23,
+                                },
+                                read::Operation::ImplicitPointer {
+                                    value: debug_info_offset,
+                                    byte_offset: 23,
+                                },
+                            ),
+                            (
+                                &|x| x.op_entry_value(reg_expression.clone()),
+                                Operation::EntryValue(reg_expression.clone()),
+                                read::Operation::EntryValue {
+                                    expression: read::EndianSlice::new(
+                                        &[constants::DW_OP_reg23.0],
+                                        LittleEndian,
+                                    ),
+                                },
+                            ),
+                            (
+                                &|x| x.op_gnu_parameter_ref(entry_id),
+                                Operation::ParameterRef(entry_id),
+                                read::Operation::ParameterRef {
+                                    offset: entry_offset,
+                                },
+                            ),
+                            (
+                                &|x| x.op_addr(Address::Constant(23)),
+                                Operation::Address(Address::Constant(23)),
+                                read::Operation::Address { address: 23 },
+                            ),
+                            (
+                                &|x| x.op_const_type(entry_id, vec![23].into()),
+                                Operation::ConstantType(entry_id, vec![23].into()),
+                                read::Operation::TypedLiteral {
+                                    base_type: entry_offset,
+                                    value: read::EndianSlice::new(&[23], LittleEndian),
+                                },
+                            ),
+                            (
+                                &|x| x.op_convert(None),
+                                Operation::Convert(None),
+                                read::Operation::Convert {
+                                    base_type: read::UnitOffset(0),
+                                },
+                            ),
+                            (
+                                &|x| x.op_convert(Some(entry_id)),
+                                Operation::Convert(Some(entry_id)),
+                                read::Operation::Convert {
+                                    base_type: entry_offset,
+                                },
+                            ),
+                            (
+                                &|x| x.op_reinterpret(None),
+                                Operation::Reinterpret(None),
+                                read::Operation::Reinterpret {
+                                    base_type: read::UnitOffset(0),
+                                },
+                            ),
+                            (
+                                &|x| x.op_reinterpret(Some(entry_id)),
+                                Operation::Reinterpret(Some(entry_id)),
+                                read::Operation::Reinterpret {
+                                    base_type: entry_offset,
+                                },
+                            ),
+                            (
+                                &|x| x.op_wasm_local(1000),
+                                Operation::WasmLocal(1000),
+                                read::Operation::WasmLocal { index: 1000 },
+                            ),
+                            (
+                                &|x| x.op_wasm_global(1000),
+                                Operation::WasmGlobal(1000),
+                                read::Operation::WasmGlobal { index: 1000 },
+                            ),
+                            (
+                                &|x| x.op_wasm_stack(1000),
+                                Operation::WasmStack(1000),
+                                read::Operation::WasmStack { index: 1000 },
+                            ),
+                        ];
+
+                    let mut expression = Expression::new();
+                    let start_index = expression.next_index();
+                    for (f, o, _) in operations {
+                        f(&mut expression);
+                        assert_eq!(expression.operations.last(), Some(o));
+                    }
+
+                    let bra_index = expression.op_bra();
+                    let skip_index = expression.op_skip();
+                    expression.op(constants::DW_OP_nop);
+                    let end_index = expression.next_index();
+                    expression.set_target(bra_index, start_index);
+                    expression.set_target(skip_index, end_index);
+
+                    let mut w = EndianVec::new(LittleEndian);
+                    let mut refs = Vec::new();
+                    expression
+                        .write(&mut w, Some(&mut refs), encoding, Some(&unit_offsets))
+                        .unwrap();
+                    for r in &refs {
+                        assert_eq!(r.unit, unit_id);
+                        assert_eq!(r.entry, entry_id);
+                        w.write_offset_at(
+                            r.offset,
+                            debug_info_offset.0,
+                            SectionId::DebugInfo,
+                            r.size,
+                        )
+                        .unwrap();
+                    }
+
+                    let read_expression =
+                        read::Expression(read::EndianSlice::new(w.slice(), LittleEndian));
+                    let mut read_operations = read_expression.operations(encoding);
+                    for (_, _, operation) in operations {
+                        assert_eq!(read_operations.next(), Ok(Some(*operation)));
+                    }
+
+                    // 4 = DW_OP_skip + i16 + DW_OP_nop
+                    assert_eq!(
+                        read_operations.next(),
+                        Ok(Some(read::Operation::Bra {
+                            target: -(w.len() as i16) + 4
+                        }))
+                    );
+                    // 1 = DW_OP_nop
+                    assert_eq!(
+                        read_operations.next(),
+                        Ok(Some(read::Operation::Skip { target: 1 }))
+                    );
+                    assert_eq!(read_operations.next(), Ok(Some(read::Operation::Nop)));
+                    assert_eq!(read_operations.next(), Ok(None));
+
+                    // Fake the unit.
+                    let unit = read::Unit {
+                        header: read::UnitHeader::new(
+                            encoding,
+                            0,
+                            read::UnitType::Compilation,
+                            DebugAbbrevOffset(0),
+                            DebugInfoOffset(0).into(),
+                            read::EndianSlice::new(&[], LittleEndian),
+                        ),
+                        abbreviations: read::Abbreviations::default(),
+                        name: None,
+                        comp_dir: None,
+                        low_pc: 0,
+                        str_offsets_base: DebugStrOffsetsBase(0),
+                        addr_base: DebugAddrBase(0),
+                        loclists_base: DebugLocListsBase(0),
+                        rnglists_base: DebugRngListsBase(0),
+                        line_program: None,
+                    };
+
+                    let mut entry_ids = HashMap::new();
+                    entry_ids.insert(debug_info_offset.into(), (unit_id, entry_id));
+                    let convert_expression = Expression::from(
+                        read_expression,
+                        encoding,
+                        None, /* dwarf */
+                        Some(&unit),
+                        Some(&entry_ids),
+                        &|address| Some(Address::Constant(address)),
+                    )
+                    .unwrap();
+                    let mut convert_operations = convert_expression.operations.iter();
+                    for (_, operation, _) in operations {
+                        assert_eq!(convert_operations.next(), Some(operation));
+                    }
+                    assert_eq!(
+                        convert_operations.next(),
+                        Some(&Operation::Branch(start_index))
+                    );
+                    assert_eq!(convert_operations.next(), Some(&Operation::Skip(end_index)));
+                    assert_eq!(
+                        convert_operations.next(),
+                        Some(&Operation::Simple(constants::DW_OP_nop))
+                    );
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/range.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/range.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/range.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/range.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,414 @@
+use alloc::vec::Vec;
+use indexmap::IndexSet;
+use std::ops::{Deref, DerefMut};
+
+use crate::common::{Encoding, RangeListsOffset, SectionId};
+use crate::write::{Address, BaseId, Error, Result, Section, Sections, Writer};
+
+define_section!(
+    DebugRanges,
+    RangeListsOffset,
+    "A writable `.debug_ranges` section."
+);
+define_section!(
+    DebugRngLists,
+    RangeListsOffset,
+    "A writable `.debug_rnglists` section."
+);
+
+define_offsets!(
+    RangeListOffsets: RangeListId => RangeListsOffset,
+    "The section offsets of a series of range lists within the `.debug_ranges` or `.debug_rnglists` sections."
+);
+
+define_id!(
+    RangeListId,
+    "An identifier for a range list in a `RangeListTable`."
+);
+
+/// A table of range lists that will be stored in a `.debug_ranges` or `.debug_rnglists` section.
+#[derive(Debug, Default)]
+pub struct RangeListTable {
+    base_id: BaseId,
+    ranges: IndexSet<RangeList>,
+}
+
+impl RangeListTable {
+    /// Add a range list to the table.
+    pub fn add(&mut self, range_list: RangeList) -> RangeListId {
+        let (index, _) = self.ranges.insert_full(range_list);
+        RangeListId::new(self.base_id, index)
+    }
+
+    /// Write the range list table to the appropriate section for the given DWARF version.
+    pub(crate) fn write<W: Writer>(
+        &self,
+        sections: &mut Sections<W>,
+        encoding: Encoding,
+    ) -> Result<RangeListOffsets> {
+        if self.ranges.is_empty() {
+            return Ok(RangeListOffsets::none());
+        }
+
+        match encoding.version {
+            2..=4 => self.write_ranges(&mut sections.debug_ranges, encoding.address_size),
+            5 => self.write_rnglists(&mut sections.debug_rnglists, encoding),
+            _ => Err(Error::UnsupportedVersion(encoding.version)),
+        }
+    }
+
+    /// Write the range list table to the `.debug_ranges` section.
+    fn write_ranges<W: Writer>(
+        &self,
+        w: &mut DebugRanges<W>,
+        address_size: u8,
+    ) -> Result<RangeListOffsets> {
+        let mut offsets = Vec::new();
+        for range_list in self.ranges.iter() {
+            offsets.push(w.offset());
+            for range in &range_list.0 {
+                // Note that we must ensure none of the ranges have both begin == 0 and end == 0.
+                // We do this by ensuring that begin != end, which is a bit more restrictive
+                // than required, but still seems reasonable.
+                match *range {
+                    Range::BaseAddress { address } => {
+                        let marker = !0 >> (64 - address_size * 8);
+                        w.write_udata(marker, address_size)?;
+                        w.write_address(address, address_size)?;
+                    }
+                    Range::OffsetPair { begin, end } => {
+                        if begin == end {
+                            return Err(Error::InvalidRange);
+                        }
+                        w.write_udata(begin, address_size)?;
+                        w.write_udata(end, address_size)?;
+                    }
+                    Range::StartEnd { begin, end } => {
+                        if begin == end {
+                            return Err(Error::InvalidRange);
+                        }
+                        w.write_address(begin, address_size)?;
+                        w.write_address(end, address_size)?;
+                    }
+                    Range::StartLength { begin, length } => {
+                        let end = match begin {
+                            Address::Constant(begin) => Address::Constant(begin + length),
+                            Address::Symbol { symbol, addend } => Address::Symbol {
+                                symbol,
+                                addend: addend + length as i64,
+                            },
+                        };
+                        if begin == end {
+                            return Err(Error::InvalidRange);
+                        }
+                        w.write_address(begin, address_size)?;
+                        w.write_address(end, address_size)?;
+                    }
+                }
+            }
+            w.write_udata(0, address_size)?;
+            w.write_udata(0, address_size)?;
+        }
+        Ok(RangeListOffsets {
+            base_id: self.base_id,
+            offsets,
+        })
+    }
+
+    /// Write the range list table to the `.debug_rnglists` section.
+    fn write_rnglists<W: Writer>(
+        &self,
+        w: &mut DebugRngLists<W>,
+        encoding: Encoding,
+    ) -> Result<RangeListOffsets> {
+        let mut offsets = Vec::new();
+
+        if encoding.version != 5 {
+            return Err(Error::NeedVersion(5));
+        }
+
+        let length_offset = w.write_initial_length(encoding.format)?;
+        let length_base = w.len();
+
+        w.write_u16(encoding.version)?;
+        w.write_u8(encoding.address_size)?;
+        w.write_u8(0)?; // segment_selector_size
+        w.write_u32(0)?; // offset_entry_count (when set to zero DW_FORM_rnglistx can't be used, see section 7.28)
+                         // FIXME implement DW_FORM_rnglistx writing and implement the offset entry list
+
+        for range_list in self.ranges.iter() {
+            offsets.push(w.offset());
+            for range in &range_list.0 {
+                match *range {
+                    Range::BaseAddress { address } => {
+                        w.write_u8(crate::constants::DW_RLE_base_address.0)?;
+                        w.write_address(address, encoding.address_size)?;
+                    }
+                    Range::OffsetPair { begin, end } => {
+                        w.write_u8(crate::constants::DW_RLE_offset_pair.0)?;
+                        w.write_uleb128(begin)?;
+                        w.write_uleb128(end)?;
+                    }
+                    Range::StartEnd { begin, end } => {
+                        w.write_u8(crate::constants::DW_RLE_start_end.0)?;
+                        w.write_address(begin, encoding.address_size)?;
+                        w.write_address(end, encoding.address_size)?;
+                    }
+                    Range::StartLength { begin, length } => {
+                        w.write_u8(crate::constants::DW_RLE_start_length.0)?;
+                        w.write_address(begin, encoding.address_size)?;
+                        w.write_uleb128(length)?;
+                    }
+                }
+            }
+
+            w.write_u8(crate::constants::DW_RLE_end_of_list.0)?;
+        }
+
+        let length = (w.len() - length_base) as u64;
+        w.write_initial_length_at(length_offset, length, encoding.format)?;
+
+        Ok(RangeListOffsets {
+            base_id: self.base_id,
+            offsets,
+        })
+    }
+}
+
+/// A range list that will be stored in a `.debug_ranges` or `.debug_rnglists` section.
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+pub struct RangeList(pub Vec<Range>);
+
+/// A single range.
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+pub enum Range {
+    /// DW_RLE_base_address
+    BaseAddress {
+        /// Base address.
+        address: Address,
+    },
+    /// DW_RLE_offset_pair
+    OffsetPair {
+        /// Start of range relative to base address.
+        begin: u64,
+        /// End of range relative to base address.
+        end: u64,
+    },
+    /// DW_RLE_start_end
+    StartEnd {
+        /// Start of range.
+        begin: Address,
+        /// End of range.
+        end: Address,
+    },
+    /// DW_RLE_start_length
+    StartLength {
+        /// Start of range.
+        begin: Address,
+        /// Length of range.
+        length: u64,
+    },
+}
+
+#[cfg(feature = "read")]
+mod convert {
+    use super::*;
+
+    use crate::read::{self, Reader};
+    use crate::write::{ConvertError, ConvertResult, ConvertUnitContext};
+
+    impl RangeList {
+        /// Create a range list by reading the data from the give range list iter.
+        pub(crate) fn from<R: Reader<Offset = usize>>(
+            mut from: read::RawRngListIter<R>,
+            context: &ConvertUnitContext<R>,
+        ) -> ConvertResult<Self> {
+            let mut have_base_address = context.base_address != Address::Constant(0);
+            let convert_address =
+                |x| (context.convert_address)(x).ok_or(ConvertError::InvalidAddress);
+            let mut ranges = Vec::new();
+            while let Some(from_range) = from.next()? {
+                let range = match from_range {
+                    read::RawRngListEntry::AddressOrOffsetPair { begin, end } => {
+                        // These were parsed as addresses, even if they are offsets.
+                        let begin = convert_address(begin)?;
+                        let end = convert_address(end)?;
+                        match (begin, end) {
+                            (Address::Constant(begin_offset), Address::Constant(end_offset)) => {
+                                if have_base_address {
+                                    Range::OffsetPair {
+                                        begin: begin_offset,
+                                        end: end_offset,
+                                    }
+                                } else {
+                                    Range::StartEnd { begin, end }
+                                }
+                            }
+                            _ => {
+                                if have_base_address {
+                                    // At least one of begin/end is an address, but we also have
+                                    // a base address. Adding addresses is undefined.
+                                    return Err(ConvertError::InvalidRangeRelativeAddress);
+                                }
+                                Range::StartEnd { begin, end }
+                            }
+                        }
+                    }
+                    read::RawRngListEntry::BaseAddress { addr } => {
+                        have_base_address = true;
+                        let address = convert_address(addr)?;
+                        Range::BaseAddress { address }
+                    }
+                    read::RawRngListEntry::BaseAddressx { addr } => {
+                        have_base_address = true;
+                        let address = convert_address(context.dwarf.address(context.unit, addr)?)?;
+                        Range::BaseAddress { address }
+                    }
+                    read::RawRngListEntry::StartxEndx { begin, end } => {
+                        let begin = convert_address(context.dwarf.address(context.unit, begin)?)?;
+                        let end = convert_address(context.dwarf.address(context.unit, end)?)?;
+                        Range::StartEnd { begin, end }
+                    }
+                    read::RawRngListEntry::StartxLength { begin, length } => {
+                        let begin = convert_address(context.dwarf.address(context.unit, begin)?)?;
+                        Range::StartLength { begin, length }
+                    }
+                    read::RawRngListEntry::OffsetPair { begin, end } => {
+                        Range::OffsetPair { begin, end }
+                    }
+                    read::RawRngListEntry::StartEnd { begin, end } => {
+                        let begin = convert_address(begin)?;
+                        let end = convert_address(end)?;
+                        Range::StartEnd { begin, end }
+                    }
+                    read::RawRngListEntry::StartLength { begin, length } => {
+                        let begin = convert_address(begin)?;
+                        Range::StartLength { begin, length }
+                    }
+                };
+                // Filtering empty ranges out.
+                match range {
+                    Range::StartLength { length, .. } if length == 0 => continue,
+                    Range::StartEnd { begin, end, .. } if begin == end => continue,
+                    Range::OffsetPair { begin, end, .. } if begin == end => continue,
+                    _ => (),
+                }
+                ranges.push(range);
+            }
+            Ok(RangeList(ranges))
+        }
+    }
+}
+
+#[cfg(test)]
+#[cfg(feature = "read")]
+mod tests {
+    use super::*;
+    use crate::common::{
+        DebugAbbrevOffset, DebugAddrBase, DebugInfoOffset, DebugLocListsBase, DebugRngListsBase,
+        DebugStrOffsetsBase, Format,
+    };
+    use crate::read;
+    use crate::write::{
+        ConvertUnitContext, EndianVec, LineStringTable, LocationListTable, Range, RangeListTable,
+        StringTable,
+    };
+    use crate::LittleEndian;
+    use std::collections::HashMap;
+
+    #[test]
+    fn test_range() {
+        let mut line_strings = LineStringTable::default();
+        let mut strings = StringTable::default();
+
+        for &version in &[2, 3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+
+                    let mut range_list = RangeList(vec![
+                        Range::StartLength {
+                            begin: Address::Constant(6666),
+                            length: 7777,
+                        },
+                        Range::StartEnd {
+                            begin: Address::Constant(4444),
+                            end: Address::Constant(5555),
+                        },
+                        Range::BaseAddress {
+                            address: Address::Constant(1111),
+                        },
+                        Range::OffsetPair {
+                            begin: 2222,
+                            end: 3333,
+                        },
+                    ]);
+
+                    let mut ranges = RangeListTable::default();
+                    let range_list_id = ranges.add(range_list.clone());
+
+                    let mut sections = Sections::new(EndianVec::new(LittleEndian));
+                    let range_list_offsets = ranges.write(&mut sections, encoding).unwrap();
+
+                    let read_debug_ranges =
+                        read::DebugRanges::new(sections.debug_ranges.slice(), LittleEndian);
+                    let read_debug_rnglists =
+                        read::DebugRngLists::new(sections.debug_rnglists.slice(), LittleEndian);
+                    let read_ranges = read::RangeLists::new(read_debug_ranges, read_debug_rnglists);
+                    let offset = range_list_offsets.get(range_list_id);
+                    let read_range_list = read_ranges.raw_ranges(offset, encoding).unwrap();
+
+                    let dwarf = read::Dwarf {
+                        ranges: read_ranges,
+                        ..Default::default()
+                    };
+                    let unit = read::Unit {
+                        header: read::UnitHeader::new(
+                            encoding,
+                            0,
+                            read::UnitType::Compilation,
+                            DebugAbbrevOffset(0),
+                            DebugInfoOffset(0).into(),
+                            read::EndianSlice::default(),
+                        ),
+                        abbreviations: read::Abbreviations::default(),
+                        name: None,
+                        comp_dir: None,
+                        low_pc: 0,
+                        str_offsets_base: DebugStrOffsetsBase(0),
+                        addr_base: DebugAddrBase(0),
+                        loclists_base: DebugLocListsBase(0),
+                        rnglists_base: DebugRngListsBase(0),
+                        line_program: None,
+                    };
+                    let context = ConvertUnitContext {
+                        dwarf: &dwarf,
+                        unit: &unit,
+                        line_strings: &mut line_strings,
+                        strings: &mut strings,
+                        ranges: &mut ranges,
+                        locations: &mut LocationListTable::default(),
+                        convert_address: &|address| Some(Address::Constant(address)),
+                        base_address: Address::Constant(0),
+                        line_program_offset: None,
+                        line_program_files: Vec::new(),
+                        entry_ids: &HashMap::new(),
+                    };
+                    let convert_range_list = RangeList::from(read_range_list, &context).unwrap();
+
+                    if version <= 4 {
+                        range_list.0[0] = Range::StartEnd {
+                            begin: Address::Constant(6666),
+                            end: Address::Constant(6666 + 7777),
+                        };
+                    }
+                    assert_eq!(range_list, convert_range_list);
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/section.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,172 @@
+use std::ops::DerefMut;
+use std::result;
+use std::vec::Vec;
+
+use crate::common::SectionId;
+use crate::write::{
+    DebugAbbrev, DebugFrame, DebugInfo, DebugInfoReference, DebugLine, DebugLineStr, DebugLoc,
+    DebugLocLists, DebugRanges, DebugRngLists, DebugStr, EhFrame, Writer,
+};
+
+macro_rules! define_section {
+    ($name:ident, $offset:ident, $docs:expr) => {
+        #[doc=$docs]
+        #[derive(Debug, Default)]
+        pub struct $name<W: Writer>(pub W);
+
+        impl<W: Writer> $name<W> {
+            /// Return the offset of the next write.
+            pub fn offset(&self) -> $offset {
+                $offset(self.len())
+            }
+        }
+
+        impl<W: Writer> From<W> for $name<W> {
+            #[inline]
+            fn from(w: W) -> Self {
+                $name(w)
+            }
+        }
+
+        impl<W: Writer> Deref for $name<W> {
+            type Target = W;
+
+            #[inline]
+            fn deref(&self) -> &W {
+                &self.0
+            }
+        }
+
+        impl<W: Writer> DerefMut for $name<W> {
+            #[inline]
+            fn deref_mut(&mut self) -> &mut W {
+                &mut self.0
+            }
+        }
+
+        impl<W: Writer> Section<W> for $name<W> {
+            #[inline]
+            fn id(&self) -> SectionId {
+                SectionId::$name
+            }
+        }
+    };
+}
+
+/// Functionality common to all writable DWARF sections.
+pub trait Section<W: Writer>: DerefMut<Target = W> {
+    /// Returns the DWARF section kind for this type.
+    fn id(&self) -> SectionId;
+
+    /// Returns the ELF section name for this type.
+    fn name(&self) -> &'static str {
+        self.id().name()
+    }
+}
+
+/// All of the writable DWARF sections.
+#[derive(Debug, Default)]
+pub struct Sections<W: Writer> {
+    /// The `.debug_abbrev` section.
+    pub debug_abbrev: DebugAbbrev<W>,
+    /// The `.debug_info` section.
+    pub debug_info: DebugInfo<W>,
+    /// The `.debug_line` section.
+    pub debug_line: DebugLine<W>,
+    /// The `.debug_line_str` section.
+    pub debug_line_str: DebugLineStr<W>,
+    /// The `.debug_ranges` section.
+    pub debug_ranges: DebugRanges<W>,
+    /// The `.debug_rnglists` section.
+    pub debug_rnglists: DebugRngLists<W>,
+    /// The `.debug_loc` section.
+    pub debug_loc: DebugLoc<W>,
+    /// The `.debug_loclists` section.
+    pub debug_loclists: DebugLocLists<W>,
+    /// The `.debug_str` section.
+    pub debug_str: DebugStr<W>,
+    /// The `.debug_frame` section.
+    pub debug_frame: DebugFrame<W>,
+    /// The `.eh_frame` section.
+    pub eh_frame: EhFrame<W>,
+    /// Unresolved references in the `.debug_info` section.
+    pub(crate) debug_info_refs: Vec<DebugInfoReference>,
+    /// Unresolved references in the `.debug_loc` section.
+    pub(crate) debug_loc_refs: Vec<DebugInfoReference>,
+    /// Unresolved references in the `.debug_loclists` section.
+    pub(crate) debug_loclists_refs: Vec<DebugInfoReference>,
+}
+
+impl<W: Writer + Clone> Sections<W> {
+    /// Create a new `Sections` using clones of the given `section`.
+    pub fn new(section: W) -> Self {
+        Sections {
+            debug_abbrev: DebugAbbrev(section.clone()),
+            debug_info: DebugInfo(section.clone()),
+            debug_line: DebugLine(section.clone()),
+            debug_line_str: DebugLineStr(section.clone()),
+            debug_ranges: DebugRanges(section.clone()),
+            debug_rnglists: DebugRngLists(section.clone()),
+            debug_loc: DebugLoc(section.clone()),
+            debug_loclists: DebugLocLists(section.clone()),
+            debug_str: DebugStr(section.clone()),
+            debug_frame: DebugFrame(section.clone()),
+            eh_frame: EhFrame(section.clone()),
+            debug_info_refs: Vec::new(),
+            debug_loc_refs: Vec::new(),
+            debug_loclists_refs: Vec::new(),
+        }
+    }
+}
+
+impl<W: Writer> Sections<W> {
+    /// For each section, call `f` once with a shared reference.
+    pub fn for_each<F, E>(&self, mut f: F) -> result::Result<(), E>
+    where
+        F: FnMut(SectionId, &W) -> result::Result<(), E>,
+    {
+        macro_rules! f {
+            ($s:expr) => {
+                f($s.id(), &$s)
+            };
+        }
+        // Ordered so that earlier sections do not reference later sections.
+        f!(self.debug_abbrev)?;
+        f!(self.debug_str)?;
+        f!(self.debug_line_str)?;
+        f!(self.debug_line)?;
+        f!(self.debug_ranges)?;
+        f!(self.debug_rnglists)?;
+        f!(self.debug_loc)?;
+        f!(self.debug_loclists)?;
+        f!(self.debug_info)?;
+        f!(self.debug_frame)?;
+        f!(self.eh_frame)?;
+        Ok(())
+    }
+
+    /// For each section, call `f` once with a mutable reference.
+    pub fn for_each_mut<F, E>(&mut self, mut f: F) -> result::Result<(), E>
+    where
+        F: FnMut(SectionId, &mut W) -> result::Result<(), E>,
+    {
+        macro_rules! f {
+            ($s:expr) => {
+                f($s.id(), &mut $s)
+            };
+        }
+        // Ordered so that earlier sections do not reference later sections.
+        f!(self.debug_abbrev)?;
+        f!(self.debug_str)?;
+        f!(self.debug_line_str)?;
+        f!(self.debug_line)?;
+        f!(self.debug_ranges)?;
+        f!(self.debug_rnglists)?;
+        f!(self.debug_loc)?;
+        f!(self.debug_loclists)?;
+        f!(self.debug_info)?;
+        f!(self.debug_frame)?;
+        f!(self.eh_frame)?;
+        Ok(())
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/str.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,172 @@
+use alloc::vec::Vec;
+use indexmap::IndexSet;
+use std::ops::{Deref, DerefMut};
+
+use crate::common::{DebugLineStrOffset, DebugStrOffset, SectionId};
+use crate::write::{BaseId, Result, Section, Writer};
+
+// Requirements:
+// - values are `[u8]`, null bytes are not allowed
+// - insertion returns a fixed id
+// - inserting a duplicate returns the id of the existing value
+// - able to convert an id to a section offset
+// Optional?
+// - able to get an existing value given an id
+//
+// Limitations of current implementation (using IndexSet):
+// - inserting requires either an allocation for duplicates,
+//   or a double lookup for non-duplicates
+// - doesn't preserve offsets when updating an existing `.debug_str` section
+//
+// Possible changes:
+// - calculate offsets as we add values, and use that as the id.
+//   This would avoid the need for DebugStrOffsets but would make it
+//   hard to implement `get`.
+macro_rules! define_string_table {
+    ($name:ident, $id:ident, $section:ident, $offsets:ident, $docs:expr) => {
+        #[doc=$docs]
+        #[derive(Debug, Default)]
+        pub struct $name {
+            base_id: BaseId,
+            strings: IndexSet<Vec<u8>>,
+        }
+
+        impl $name {
+            /// Add a string to the string table and return its id.
+            ///
+            /// If the string already exists, then return the id of the existing string.
+            ///
+            /// # Panics
+            ///
+            /// Panics if `bytes` contains a null byte.
+            pub fn add<T>(&mut self, bytes: T) -> $id
+            where
+                T: Into<Vec<u8>>,
+            {
+                let bytes = bytes.into();
+                assert!(!bytes.contains(&0));
+                let (index, _) = self.strings.insert_full(bytes);
+                $id::new(self.base_id, index)
+            }
+
+            /// Return the number of strings in the table.
+            #[inline]
+            pub fn count(&self) -> usize {
+                self.strings.len()
+            }
+
+            /// Get a reference to a string in the table.
+            ///
+            /// # Panics
+            ///
+            /// Panics if `id` is invalid.
+            pub fn get(&self, id: $id) -> &[u8] {
+                debug_assert_eq!(self.base_id, id.base_id);
+                self.strings.get_index(id.index).map(Vec::as_slice).unwrap()
+            }
+
+            /// Write the string table to the `.debug_str` section.
+            ///
+            /// Returns the offsets at which the strings are written.
+            pub fn write<W: Writer>(&self, w: &mut $section<W>) -> Result<$offsets> {
+                let mut offsets = Vec::new();
+                for bytes in self.strings.iter() {
+                    offsets.push(w.offset());
+                    w.write(bytes)?;
+                    w.write_u8(0)?;
+                }
+
+                Ok($offsets {
+                    base_id: self.base_id,
+                    offsets,
+                })
+            }
+        }
+    };
+}
+
+define_id!(StringId, "An identifier for a string in a `StringTable`.");
+
+define_string_table!(
+    StringTable,
+    StringId,
+    DebugStr,
+    DebugStrOffsets,
+    "A table of strings that will be stored in a `.debug_str` section."
+);
+
+define_section!(DebugStr, DebugStrOffset, "A writable `.debug_str` section.");
+
+define_offsets!(
+    DebugStrOffsets: StringId => DebugStrOffset,
+    "The section offsets of all strings within a `.debug_str` section."
+);
+
+define_id!(
+    LineStringId,
+    "An identifier for a string in a `LineStringTable`."
+);
+
+define_string_table!(
+    LineStringTable,
+    LineStringId,
+    DebugLineStr,
+    DebugLineStrOffsets,
+    "A table of strings that will be stored in a `.debug_line_str` section."
+);
+
+define_section!(
+    DebugLineStr,
+    DebugLineStrOffset,
+    "A writable `.debug_line_str` section."
+);
+
+define_offsets!(
+    DebugLineStrOffsets: LineStringId => DebugLineStrOffset,
+    "The section offsets of all strings within a `.debug_line_str` section."
+);
+
+#[cfg(test)]
+#[cfg(feature = "read")]
+mod tests {
+    use super::*;
+    use crate::read;
+    use crate::write::EndianVec;
+    use crate::LittleEndian;
+
+    #[test]
+    fn test_string_table() {
+        let mut strings = StringTable::default();
+        assert_eq!(strings.count(), 0);
+        let id1 = strings.add(&b"one"[..]);
+        let id2 = strings.add(&b"two"[..]);
+        assert_eq!(strings.add(&b"one"[..]), id1);
+        assert_eq!(strings.add(&b"two"[..]), id2);
+        assert_eq!(strings.get(id1), &b"one"[..]);
+        assert_eq!(strings.get(id2), &b"two"[..]);
+        assert_eq!(strings.count(), 2);
+
+        let mut debug_str = DebugStr::from(EndianVec::new(LittleEndian));
+        let offsets = strings.write(&mut debug_str).unwrap();
+        assert_eq!(debug_str.slice(), b"one\0two\0");
+        assert_eq!(offsets.get(id1), DebugStrOffset(0));
+        assert_eq!(offsets.get(id2), DebugStrOffset(4));
+        assert_eq!(offsets.count(), 2);
+    }
+
+    #[test]
+    fn test_string_table_read() {
+        let mut strings = StringTable::default();
+        let id1 = strings.add(&b"one"[..]);
+        let id2 = strings.add(&b"two"[..]);
+
+        let mut debug_str = DebugStr::from(EndianVec::new(LittleEndian));
+        let offsets = strings.write(&mut debug_str).unwrap();
+
+        let read_debug_str = read::DebugStr::new(debug_str.slice(), LittleEndian);
+        let str1 = read_debug_str.get_str(offsets.get(id1)).unwrap();
+        let str2 = read_debug_str.get_str(offsets.get(id2)).unwrap();
+        assert_eq!(str1.slice(), &b"one"[..]);
+        assert_eq!(str2.slice(), &b"two"[..]);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/unit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/unit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/unit.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/unit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3085 @@
+use alloc::vec::Vec;
+use std::ops::{Deref, DerefMut};
+use std::{slice, usize};
+
+use crate::common::{
+    DebugAbbrevOffset, DebugInfoOffset, DebugLineOffset, DebugMacinfoOffset, DebugMacroOffset,
+    DebugStrOffset, DebugTypeSignature, DwoId, Encoding, Format, SectionId,
+};
+use crate::constants;
+use crate::leb128::write::{sleb128_size, uleb128_size};
+use crate::write::{
+    Abbreviation, AbbreviationTable, Address, AttributeSpecification, BaseId, DebugLineStrOffsets,
+    DebugStrOffsets, Error, Expression, FileId, LineProgram, LineStringId, LocationListId,
+    LocationListOffsets, LocationListTable, RangeListId, RangeListOffsets, RangeListTable,
+    Reference, Result, Section, Sections, StringId, Writer,
+};
+
+define_id!(UnitId, "An identifier for a unit in a `UnitTable`.");
+
+define_id!(UnitEntryId, "An identifier for an entry in a `Unit`.");
+
+/// A table of units that will be stored in the `.debug_info` section.
+#[derive(Debug, Default)]
+pub struct UnitTable {
+    base_id: BaseId,
+    units: Vec<Unit>,
+}
+
+impl UnitTable {
+    /// Create a new unit and add it to the table.
+    ///
+    /// `address_size` must be in bytes.
+    ///
+    /// Returns the `UnitId` of the new unit.
+    #[inline]
+    pub fn add(&mut self, unit: Unit) -> UnitId {
+        let id = UnitId::new(self.base_id, self.units.len());
+        self.units.push(unit);
+        id
+    }
+
+    /// Return the number of units.
+    #[inline]
+    pub fn count(&self) -> usize {
+        self.units.len()
+    }
+
+    /// Return the id of a unit.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `index >= self.count()`.
+    #[inline]
+    pub fn id(&self, index: usize) -> UnitId {
+        assert!(index < self.count());
+        UnitId::new(self.base_id, index)
+    }
+
+    /// Get a reference to a unit.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `id` is invalid.
+    #[inline]
+    pub fn get(&self, id: UnitId) -> &Unit {
+        debug_assert_eq!(self.base_id, id.base_id);
+        &self.units[id.index]
+    }
+
+    /// Get a mutable reference to a unit.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `id` is invalid.
+    #[inline]
+    pub fn get_mut(&mut self, id: UnitId) -> &mut Unit {
+        debug_assert_eq!(self.base_id, id.base_id);
+        &mut self.units[id.index]
+    }
+
+    /// Write the units to the given sections.
+    ///
+    /// `strings` must contain the `.debug_str` offsets of the corresponding
+    /// `StringTable`.
+    pub fn write<W: Writer>(
+        &mut self,
+        sections: &mut Sections<W>,
+        line_strings: &DebugLineStrOffsets,
+        strings: &DebugStrOffsets,
+    ) -> Result<DebugInfoOffsets> {
+        let mut offsets = DebugInfoOffsets {
+            base_id: self.base_id,
+            units: Vec::new(),
+        };
+        for unit in &mut self.units {
+            // TODO: maybe share abbreviation tables
+            let abbrev_offset = sections.debug_abbrev.offset();
+            let mut abbrevs = AbbreviationTable::default();
+
+            offsets.units.push(unit.write(
+                sections,
+                abbrev_offset,
+                &mut abbrevs,
+                line_strings,
+                strings,
+            )?);
+
+            abbrevs.write(&mut sections.debug_abbrev)?;
+        }
+
+        write_section_refs(
+            &mut sections.debug_info_refs,
+            &mut sections.debug_info.0,
+            &offsets,
+        )?;
+        write_section_refs(
+            &mut sections.debug_loc_refs,
+            &mut sections.debug_loc.0,
+            &offsets,
+        )?;
+        write_section_refs(
+            &mut sections.debug_loclists_refs,
+            &mut sections.debug_loclists.0,
+            &offsets,
+        )?;
+
+        Ok(offsets)
+    }
+}
+
+fn write_section_refs<W: Writer>(
+    references: &mut Vec<DebugInfoReference>,
+    w: &mut W,
+    offsets: &DebugInfoOffsets,
+) -> Result<()> {
+    for r in references.drain(..) {
+        let entry_offset = offsets.entry(r.unit, r.entry).0;
+        debug_assert_ne!(entry_offset, 0);
+        w.write_offset_at(r.offset, entry_offset, SectionId::DebugInfo, r.size)?;
+    }
+    Ok(())
+}
+
+/// A unit's debugging information.
+#[derive(Debug)]
+pub struct Unit {
+    base_id: BaseId,
+    /// The encoding parameters for this unit.
+    encoding: Encoding,
+    /// The line number program for this unit.
+    pub line_program: LineProgram,
+    /// A table of range lists used by this unit.
+    pub ranges: RangeListTable,
+    /// A table of location lists used by this unit.
+    pub locations: LocationListTable,
+    /// All entries in this unit. The order is unrelated to the tree order.
+    // Requirements:
+    // - entries form a tree
+    // - entries can be added in any order
+    // - entries have a fixed id
+    // - able to quickly lookup an entry from its id
+    // Limitations of current implemention:
+    // - mutable iteration of children is messy due to borrow checker
+    entries: Vec<DebuggingInformationEntry>,
+    /// The index of the root entry in entries.
+    root: UnitEntryId,
+}
+
+impl Unit {
+    /// Create a new `Unit`.
+    pub fn new(encoding: Encoding, line_program: LineProgram) -> Self {
+        let base_id = BaseId::default();
+        let ranges = RangeListTable::default();
+        let locations = LocationListTable::default();
+        let mut entries = Vec::new();
+        let root = DebuggingInformationEntry::new(
+            base_id,
+            &mut entries,
+            None,
+            constants::DW_TAG_compile_unit,
+        );
+        Unit {
+            base_id,
+            encoding,
+            line_program,
+            ranges,
+            locations,
+            entries,
+            root,
+        }
+    }
+
+    /// Return the encoding parameters for this unit.
+    #[inline]
+    pub fn encoding(&self) -> Encoding {
+        self.encoding
+    }
+
+    /// Return the DWARF version for this unit.
+    #[inline]
+    pub fn version(&self) -> u16 {
+        self.encoding.version
+    }
+
+    /// Return the address size in bytes for this unit.
+    #[inline]
+    pub fn address_size(&self) -> u8 {
+        self.encoding.address_size
+    }
+
+    /// Return the DWARF format for this unit.
+    #[inline]
+    pub fn format(&self) -> Format {
+        self.encoding.format
+    }
+
+    /// Return the number of `DebuggingInformationEntry`s created for this unit.
+    ///
+    /// This includes entries that no longer have a parent.
+    #[inline]
+    pub fn count(&self) -> usize {
+        self.entries.len()
+    }
+
+    /// Return the id of the root entry.
+    #[inline]
+    pub fn root(&self) -> UnitEntryId {
+        self.root
+    }
+
+    /// Add a new `DebuggingInformationEntry` to this unit and return its id.
+    ///
+    /// The `parent` must be within the same unit.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `parent` is invalid.
+    #[inline]
+    pub fn add(&mut self, parent: UnitEntryId, tag: constants::DwTag) -> UnitEntryId {
+        debug_assert_eq!(self.base_id, parent.base_id);
+        DebuggingInformationEntry::new(self.base_id, &mut self.entries, Some(parent), tag)
+    }
+
+    /// Get a reference to an entry.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `id` is invalid.
+    #[inline]
+    pub fn get(&self, id: UnitEntryId) -> &DebuggingInformationEntry {
+        debug_assert_eq!(self.base_id, id.base_id);
+        &self.entries[id.index]
+    }
+
+    /// Get a mutable reference to an entry.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `id` is invalid.
+    #[inline]
+    pub fn get_mut(&mut self, id: UnitEntryId) -> &mut DebuggingInformationEntry {
+        debug_assert_eq!(self.base_id, id.base_id);
+        &mut self.entries[id.index]
+    }
+
+    /// Return true if `self.line_program` is used by a DIE.
+    fn line_program_in_use(&self) -> bool {
+        if self.line_program.is_none() {
+            return false;
+        }
+        if !self.line_program.is_empty() {
+            return true;
+        }
+
+        for entry in &self.entries {
+            for attr in &entry.attrs {
+                if let AttributeValue::FileIndex(Some(_)) = attr.value {
+                    return true;
+                }
+            }
+        }
+
+        false
+    }
+
+    /// Write the unit to the given sections.
+    pub(crate) fn write<W: Writer>(
+        &mut self,
+        sections: &mut Sections<W>,
+        abbrev_offset: DebugAbbrevOffset,
+        abbrevs: &mut AbbreviationTable,
+        line_strings: &DebugLineStrOffsets,
+        strings: &DebugStrOffsets,
+    ) -> Result<UnitOffsets> {
+        let line_program = if self.line_program_in_use() {
+            self.entries[self.root.index]
+                .set(constants::DW_AT_stmt_list, AttributeValue::LineProgramRef);
+            Some(self.line_program.write(
+                &mut sections.debug_line,
+                self.encoding,
+                line_strings,
+                strings,
+            )?)
+        } else {
+            self.entries[self.root.index].delete(constants::DW_AT_stmt_list);
+            None
+        };
+
+        // TODO: use .debug_types for type units in DWARF v4.
+        let w = &mut sections.debug_info;
+
+        let mut offsets = UnitOffsets {
+            base_id: self.base_id,
+            unit: w.offset(),
+            // Entries can be written in any order, so create the complete vec now.
+            entries: vec![EntryOffset::none(); self.entries.len()],
+        };
+
+        let length_offset = w.write_initial_length(self.format())?;
+        let length_base = w.len();
+
+        w.write_u16(self.version())?;
+        if 2 <= self.version() && self.version() <= 4 {
+            w.write_offset(
+                abbrev_offset.0,
+                SectionId::DebugAbbrev,
+                self.format().word_size(),
+            )?;
+            w.write_u8(self.address_size())?;
+        } else if self.version() == 5 {
+            w.write_u8(constants::DW_UT_compile.0)?;
+            w.write_u8(self.address_size())?;
+            w.write_offset(
+                abbrev_offset.0,
+                SectionId::DebugAbbrev,
+                self.format().word_size(),
+            )?;
+        } else {
+            return Err(Error::UnsupportedVersion(self.version()));
+        }
+
+        // Calculate all DIE offsets, so that we are able to output references to them.
+        // However, references to base types in expressions use ULEB128, so base types
+        // must be moved to the front before we can calculate offsets.
+        self.reorder_base_types();
+        let mut offset = w.len();
+        self.entries[self.root.index].calculate_offsets(
+            self,
+            &mut offset,
+            &mut offsets,
+            abbrevs,
+        )?;
+
+        let range_lists = self.ranges.write(sections, self.encoding)?;
+        // Location lists can't be written until we have DIE offsets.
+        let loc_lists = self
+            .locations
+            .write(sections, self.encoding, Some(&offsets))?;
+
+        let w = &mut sections.debug_info;
+        let mut unit_refs = Vec::new();
+        self.entries[self.root.index].write(
+            w,
+            &mut sections.debug_info_refs,
+            &mut unit_refs,
+            self,
+            &mut offsets,
+            abbrevs,
+            line_program,
+            line_strings,
+            strings,
+            &range_lists,
+            &loc_lists,
+        )?;
+
+        let length = (w.len() - length_base) as u64;
+        w.write_initial_length_at(length_offset, length, self.format())?;
+
+        for (offset, entry) in unit_refs {
+            // This does not need relocation.
+            w.write_udata_at(
+                offset.0,
+                offsets.unit_offset(entry),
+                self.format().word_size(),
+            )?;
+        }
+
+        Ok(offsets)
+    }
+
+    /// Reorder base types to come first so that typed stack operations
+    /// can get their offset.
+    fn reorder_base_types(&mut self) {
+        let root = &self.entries[self.root.index];
+        let mut root_children = Vec::with_capacity(root.children.len());
+        for entry in &root.children {
+            if self.entries[entry.index].tag == constants::DW_TAG_base_type {
+                root_children.push(*entry);
+            }
+        }
+        for entry in &root.children {
+            if self.entries[entry.index].tag != constants::DW_TAG_base_type {
+                root_children.push(*entry);
+            }
+        }
+        self.entries[self.root.index].children = root_children;
+    }
+}
+
+/// A Debugging Information Entry (DIE).
+///
+/// DIEs have a set of attributes and optionally have children DIEs as well.
+///
+/// DIEs form a tree without any cycles. This is enforced by specifying the
+/// parent when creating a DIE, and disallowing changes of parent.
+#[derive(Debug)]
+pub struct DebuggingInformationEntry {
+    id: UnitEntryId,
+    parent: Option<UnitEntryId>,
+    tag: constants::DwTag,
+    /// Whether to emit `DW_AT_sibling`.
+    sibling: bool,
+    attrs: Vec<Attribute>,
+    children: Vec<UnitEntryId>,
+}
+
+impl DebuggingInformationEntry {
+    /// Create a new `DebuggingInformationEntry`.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `parent` is invalid.
+    #[allow(clippy::new_ret_no_self)]
+    fn new(
+        base_id: BaseId,
+        entries: &mut Vec<DebuggingInformationEntry>,
+        parent: Option<UnitEntryId>,
+        tag: constants::DwTag,
+    ) -> UnitEntryId {
+        let id = UnitEntryId::new(base_id, entries.len());
+        entries.push(DebuggingInformationEntry {
+            id,
+            parent,
+            tag,
+            sibling: false,
+            attrs: Vec::new(),
+            children: Vec::new(),
+        });
+        if let Some(parent) = parent {
+            debug_assert_eq!(base_id, parent.base_id);
+            assert_ne!(parent, id);
+            entries[parent.index].children.push(id);
+        }
+        id
+    }
+
+    /// Return the id of this entry.
+    #[inline]
+    pub fn id(&self) -> UnitEntryId {
+        self.id
+    }
+
+    /// Return the parent of this entry.
+    #[inline]
+    pub fn parent(&self) -> Option<UnitEntryId> {
+        self.parent
+    }
+
+    /// Return the tag of this entry.
+    #[inline]
+    pub fn tag(&self) -> constants::DwTag {
+        self.tag
+    }
+
+    /// Return `true` if a `DW_AT_sibling` attribute will be emitted.
+    #[inline]
+    pub fn sibling(&self) -> bool {
+        self.sibling
+    }
+
+    /// Set whether a `DW_AT_sibling` attribute will be emitted.
+    ///
+    /// The attribute will only be emitted if the DIE has children.
+    #[inline]
+    pub fn set_sibling(&mut self, sibling: bool) {
+        self.sibling = sibling;
+    }
+
+    /// Iterate over the attributes of this entry.
+    #[inline]
+    pub fn attrs(&self) -> slice::Iter<Attribute> {
+        self.attrs.iter()
+    }
+
+    /// Iterate over the attributes of this entry for modification.
+    #[inline]
+    pub fn attrs_mut(&mut self) -> slice::IterMut<Attribute> {
+        self.attrs.iter_mut()
+    }
+
+    /// Get an attribute.
+    pub fn get(&self, name: constants::DwAt) -> Option<&AttributeValue> {
+        self.attrs
+            .iter()
+            .find(|attr| attr.name == name)
+            .map(|attr| &attr.value)
+    }
+
+    /// Get an attribute for modification.
+    pub fn get_mut(&mut self, name: constants::DwAt) -> Option<&mut AttributeValue> {
+        self.attrs
+            .iter_mut()
+            .find(|attr| attr.name == name)
+            .map(|attr| &mut attr.value)
+    }
+
+    /// Set an attribute.
+    ///
+    /// Replaces any existing attribute with the same name.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `name` is `DW_AT_sibling`. Use `set_sibling` instead.
+    pub fn set(&mut self, name: constants::DwAt, value: AttributeValue) {
+        assert_ne!(name, constants::DW_AT_sibling);
+        if let Some(attr) = self.attrs.iter_mut().find(|attr| attr.name == name) {
+            attr.value = value;
+            return;
+        }
+        self.attrs.push(Attribute { name, value });
+    }
+
+    /// Delete an attribute.
+    ///
+    /// Replaces any existing attribute with the same name.
+    pub fn delete(&mut self, name: constants::DwAt) {
+        self.attrs.retain(|x| x.name != name);
+    }
+
+    /// Iterate over the children of this entry.
+    ///
+    /// Note: use `Unit::add` to add a new child to this entry.
+    #[inline]
+    pub fn children(&self) -> slice::Iter<UnitEntryId> {
+        self.children.iter()
+    }
+
+    /// Return the type abbreviation for this DIE.
+    fn abbreviation(&self, encoding: Encoding) -> Result<Abbreviation> {
+        let mut attrs = Vec::new();
+
+        if self.sibling && !self.children.is_empty() {
+            let form = match encoding.format {
+                Format::Dwarf32 => constants::DW_FORM_ref4,
+                Format::Dwarf64 => constants::DW_FORM_ref8,
+            };
+            attrs.push(AttributeSpecification::new(constants::DW_AT_sibling, form));
+        }
+
+        for attr in &self.attrs {
+            attrs.push(attr.specification(encoding)?);
+        }
+
+        Ok(Abbreviation::new(
+            self.tag,
+            !self.children.is_empty(),
+            attrs,
+        ))
+    }
+
+    fn calculate_offsets(
+        &self,
+        unit: &Unit,
+        offset: &mut usize,
+        offsets: &mut UnitOffsets,
+        abbrevs: &mut AbbreviationTable,
+    ) -> Result<()> {
+        offsets.entries[self.id.index].offset = DebugInfoOffset(*offset);
+        offsets.entries[self.id.index].abbrev = abbrevs.add(self.abbreviation(unit.encoding())?);
+        *offset += self.size(unit, offsets);
+        if !self.children.is_empty() {
+            for child in &self.children {
+                unit.entries[child.index].calculate_offsets(unit, offset, offsets, abbrevs)?;
+            }
+            // Null child
+            *offset += 1;
+        }
+        Ok(())
+    }
+
+    fn size(&self, unit: &Unit, offsets: &UnitOffsets) -> usize {
+        let mut size = uleb128_size(offsets.abbrev(self.id));
+        if self.sibling && !self.children.is_empty() {
+            size += unit.format().word_size() as usize;
+        }
+        for attr in &self.attrs {
+            size += attr.value.size(unit, offsets);
+        }
+        size
+    }
+
+    /// Write the entry to the given sections.
+    #[allow(clippy::too_many_arguments)]
+    fn write<W: Writer>(
+        &self,
+        w: &mut DebugInfo<W>,
+        debug_info_refs: &mut Vec<DebugInfoReference>,
+        unit_refs: &mut Vec<(DebugInfoOffset, UnitEntryId)>,
+        unit: &Unit,
+        offsets: &mut UnitOffsets,
+        abbrevs: &mut AbbreviationTable,
+        line_program: Option<DebugLineOffset>,
+        line_strings: &DebugLineStrOffsets,
+        strings: &DebugStrOffsets,
+        range_lists: &RangeListOffsets,
+        loc_lists: &LocationListOffsets,
+    ) -> Result<()> {
+        debug_assert_eq!(offsets.debug_info_offset(self.id), w.offset());
+        w.write_uleb128(offsets.abbrev(self.id))?;
+
+        let sibling_offset = if self.sibling && !self.children.is_empty() {
+            let offset = w.offset();
+            w.write_udata(0, unit.format().word_size())?;
+            Some(offset)
+        } else {
+            None
+        };
+
+        for attr in &self.attrs {
+            attr.value.write(
+                w,
+                debug_info_refs,
+                unit_refs,
+                unit,
+                offsets,
+                line_program,
+                line_strings,
+                strings,
+                range_lists,
+                loc_lists,
+            )?;
+        }
+
+        if !self.children.is_empty() {
+            for child in &self.children {
+                unit.entries[child.index].write(
+                    w,
+                    debug_info_refs,
+                    unit_refs,
+                    unit,
+                    offsets,
+                    abbrevs,
+                    line_program,
+                    line_strings,
+                    strings,
+                    range_lists,
+                    loc_lists,
+                )?;
+            }
+            // Null child
+            w.write_u8(0)?;
+        }
+
+        if let Some(offset) = sibling_offset {
+            let next_offset = (w.offset().0 - offsets.unit.0) as u64;
+            // This does not need relocation.
+            w.write_udata_at(offset.0, next_offset, unit.format().word_size())?;
+        }
+        Ok(())
+    }
+}
+
+/// An attribute in a `DebuggingInformationEntry`, consisting of a name and
+/// associated value.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Attribute {
+    name: constants::DwAt,
+    value: AttributeValue,
+}
+
+impl Attribute {
+    /// Get the name of this attribute.
+    #[inline]
+    pub fn name(&self) -> constants::DwAt {
+        self.name
+    }
+
+    /// Get the value of this attribute.
+    #[inline]
+    pub fn get(&self) -> &AttributeValue {
+        &self.value
+    }
+
+    /// Set the value of this attribute.
+    #[inline]
+    pub fn set(&mut self, value: AttributeValue) {
+        self.value = value;
+    }
+
+    /// Return the type specification for this attribute.
+    fn specification(&self, encoding: Encoding) -> Result<AttributeSpecification> {
+        Ok(AttributeSpecification::new(
+            self.name,
+            self.value.form(encoding)?,
+        ))
+    }
+}
+
+/// The value of an attribute in a `DebuggingInformationEntry`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum AttributeValue {
+    /// "Refers to some location in the address space of the described program."
+    Address(Address),
+
+    /// A slice of an arbitrary number of bytes.
+    Block(Vec<u8>),
+
+    /// A one byte constant data value. How to interpret the byte depends on context.
+    ///
+    /// From section 7 of the standard: "Depending on context, it may be a
+    /// signed integer, an unsigned integer, a floating-point constant, or
+    /// anything else."
+    Data1(u8),
+
+    /// A two byte constant data value. How to interpret the bytes depends on context.
+    ///
+    /// This value will be converted to the target endian before writing.
+    ///
+    /// From section 7 of the standard: "Depending on context, it may be a
+    /// signed integer, an unsigned integer, a floating-point constant, or
+    /// anything else."
+    Data2(u16),
+
+    /// A four byte constant data value. How to interpret the bytes depends on context.
+    ///
+    /// This value will be converted to the target endian before writing.
+    ///
+    /// From section 7 of the standard: "Depending on context, it may be a
+    /// signed integer, an unsigned integer, a floating-point constant, or
+    /// anything else."
+    Data4(u32),
+
+    /// An eight byte constant data value. How to interpret the bytes depends on context.
+    ///
+    /// This value will be converted to the target endian before writing.
+    ///
+    /// From section 7 of the standard: "Depending on context, it may be a
+    /// signed integer, an unsigned integer, a floating-point constant, or
+    /// anything else."
+    Data8(u64),
+
+    /// A signed integer constant.
+    Sdata(i64),
+
+    /// An unsigned integer constant.
+    Udata(u64),
+
+    /// "The information bytes contain a DWARF expression (see Section 2.5) or
+    /// location description (see Section 2.6)."
+    Exprloc(Expression),
+
+    /// A boolean that indicates presence or absence of the attribute.
+    Flag(bool),
+
+    /// An attribute that is always present.
+    FlagPresent,
+
+    /// A reference to a `DebuggingInformationEntry` in this unit.
+    UnitRef(UnitEntryId),
+
+    /// A reference to a `DebuggingInformationEntry` in a potentially different unit.
+    DebugInfoRef(Reference),
+
+    /// An offset into the `.debug_info` section of the supplementary object file.
+    ///
+    /// The API does not currently assist with generating this offset.
+    /// This variant will be removed from the API once support for writing
+    /// supplementary object files is implemented.
+    DebugInfoRefSup(DebugInfoOffset),
+
+    /// A reference to a line number program.
+    LineProgramRef,
+
+    /// A reference to a location list.
+    LocationListRef(LocationListId),
+
+    /// An offset into the `.debug_macinfo` section.
+    ///
+    /// The API does not currently assist with generating this offset.
+    /// This variant will be removed from the API once support for writing
+    /// `.debug_macinfo` sections is implemented.
+    DebugMacinfoRef(DebugMacinfoOffset),
+
+    /// An offset into the `.debug_macro` section.
+    ///
+    /// The API does not currently assist with generating this offset.
+    /// This variant will be removed from the API once support for writing
+    /// `.debug_macro` sections is implemented.
+    DebugMacroRef(DebugMacroOffset),
+
+    /// A reference to a range list.
+    RangeListRef(RangeListId),
+
+    /// A type signature.
+    ///
+    /// The API does not currently assist with generating this signature.
+    /// This variant will be removed from the API once support for writing
+    /// `.debug_types` sections is implemented.
+    DebugTypesRef(DebugTypeSignature),
+
+    /// A reference to a string in the `.debug_str` section.
+    StringRef(StringId),
+
+    /// An offset into the `.debug_str` section of the supplementary object file.
+    ///
+    /// The API does not currently assist with generating this offset.
+    /// This variant will be removed from the API once support for writing
+    /// supplementary object files is implemented.
+    DebugStrRefSup(DebugStrOffset),
+
+    /// A reference to a string in the `.debug_line_str` section.
+    LineStringRef(LineStringId),
+
+    /// A slice of bytes representing a string. Must not include null bytes.
+    /// Not guaranteed to be UTF-8 or anything like that.
+    String(Vec<u8>),
+
+    /// The value of a `DW_AT_encoding` attribute.
+    Encoding(constants::DwAte),
+
+    /// The value of a `DW_AT_decimal_sign` attribute.
+    DecimalSign(constants::DwDs),
+
+    /// The value of a `DW_AT_endianity` attribute.
+    Endianity(constants::DwEnd),
+
+    /// The value of a `DW_AT_accessibility` attribute.
+    Accessibility(constants::DwAccess),
+
+    /// The value of a `DW_AT_visibility` attribute.
+    Visibility(constants::DwVis),
+
+    /// The value of a `DW_AT_virtuality` attribute.
+    Virtuality(constants::DwVirtuality),
+
+    /// The value of a `DW_AT_language` attribute.
+    Language(constants::DwLang),
+
+    /// The value of a `DW_AT_address_class` attribute.
+    AddressClass(constants::DwAddr),
+
+    /// The value of a `DW_AT_identifier_case` attribute.
+    IdentifierCase(constants::DwId),
+
+    /// The value of a `DW_AT_calling_convention` attribute.
+    CallingConvention(constants::DwCc),
+
+    /// The value of a `DW_AT_inline` attribute.
+    Inline(constants::DwInl),
+
+    /// The value of a `DW_AT_ordering` attribute.
+    Ordering(constants::DwOrd),
+
+    /// An index into the filename entries from the line number information
+    /// table for the unit containing this value.
+    FileIndex(Option<FileId>),
+}
+
+impl AttributeValue {
+    /// Return the form that will be used to encode this value.
+    pub fn form(&self, encoding: Encoding) -> Result<constants::DwForm> {
+        // TODO: missing forms:
+        // - DW_FORM_indirect
+        // - DW_FORM_implicit_const
+        // - FW_FORM_block1/block2/block4
+        // - DW_FORM_str/strx1/strx2/strx3/strx4
+        // - DW_FORM_addrx/addrx1/addrx2/addrx3/addrx4
+        // - DW_FORM_data16
+        // - DW_FORM_line_strp
+        // - DW_FORM_loclistx
+        // - DW_FORM_rnglistx
+        let form = match *self {
+            AttributeValue::Address(_) => constants::DW_FORM_addr,
+            AttributeValue::Block(_) => constants::DW_FORM_block,
+            AttributeValue::Data1(_) => constants::DW_FORM_data1,
+            AttributeValue::Data2(_) => constants::DW_FORM_data2,
+            AttributeValue::Data4(_) => constants::DW_FORM_data4,
+            AttributeValue::Data8(_) => constants::DW_FORM_data8,
+            AttributeValue::Exprloc(_) => constants::DW_FORM_exprloc,
+            AttributeValue::Flag(_) => constants::DW_FORM_flag,
+            AttributeValue::FlagPresent => constants::DW_FORM_flag_present,
+            AttributeValue::UnitRef(_) => {
+                // Using a fixed size format lets us write a placeholder before we know
+                // the value.
+                match encoding.format {
+                    Format::Dwarf32 => constants::DW_FORM_ref4,
+                    Format::Dwarf64 => constants::DW_FORM_ref8,
+                }
+            }
+            AttributeValue::DebugInfoRef(_) => constants::DW_FORM_ref_addr,
+            AttributeValue::DebugInfoRefSup(_) => {
+                // TODO: should this depend on the size of supplementary section?
+                match encoding.format {
+                    Format::Dwarf32 => constants::DW_FORM_ref_sup4,
+                    Format::Dwarf64 => constants::DW_FORM_ref_sup8,
+                }
+            }
+            AttributeValue::LineProgramRef
+            | AttributeValue::LocationListRef(_)
+            | AttributeValue::DebugMacinfoRef(_)
+            | AttributeValue::DebugMacroRef(_)
+            | AttributeValue::RangeListRef(_) => {
+                if encoding.version == 2 || encoding.version == 3 {
+                    match encoding.format {
+                        Format::Dwarf32 => constants::DW_FORM_data4,
+                        Format::Dwarf64 => constants::DW_FORM_data8,
+                    }
+                } else {
+                    constants::DW_FORM_sec_offset
+                }
+            }
+            AttributeValue::DebugTypesRef(_) => constants::DW_FORM_ref_sig8,
+            AttributeValue::StringRef(_) => constants::DW_FORM_strp,
+            AttributeValue::DebugStrRefSup(_) => constants::DW_FORM_strp_sup,
+            AttributeValue::LineStringRef(_) => constants::DW_FORM_line_strp,
+            AttributeValue::String(_) => constants::DW_FORM_string,
+            AttributeValue::Encoding(_)
+            | AttributeValue::DecimalSign(_)
+            | AttributeValue::Endianity(_)
+            | AttributeValue::Accessibility(_)
+            | AttributeValue::Visibility(_)
+            | AttributeValue::Virtuality(_)
+            | AttributeValue::Language(_)
+            | AttributeValue::AddressClass(_)
+            | AttributeValue::IdentifierCase(_)
+            | AttributeValue::CallingConvention(_)
+            | AttributeValue::Inline(_)
+            | AttributeValue::Ordering(_)
+            | AttributeValue::FileIndex(_)
+            | AttributeValue::Udata(_) => constants::DW_FORM_udata,
+            AttributeValue::Sdata(_) => constants::DW_FORM_sdata,
+        };
+        Ok(form)
+    }
+
+    fn size(&self, unit: &Unit, offsets: &UnitOffsets) -> usize {
+        macro_rules! debug_assert_form {
+            ($form:expr) => {
+                debug_assert_eq!(self.form(unit.encoding()).unwrap(), $form)
+            };
+        }
+        match *self {
+            AttributeValue::Address(_) => {
+                debug_assert_form!(constants::DW_FORM_addr);
+                unit.address_size() as usize
+            }
+            AttributeValue::Block(ref val) => {
+                debug_assert_form!(constants::DW_FORM_block);
+                uleb128_size(val.len() as u64) + val.len()
+            }
+            AttributeValue::Data1(_) => {
+                debug_assert_form!(constants::DW_FORM_data1);
+                1
+            }
+            AttributeValue::Data2(_) => {
+                debug_assert_form!(constants::DW_FORM_data2);
+                2
+            }
+            AttributeValue::Data4(_) => {
+                debug_assert_form!(constants::DW_FORM_data4);
+                4
+            }
+            AttributeValue::Data8(_) => {
+                debug_assert_form!(constants::DW_FORM_data8);
+                8
+            }
+            AttributeValue::Sdata(val) => {
+                debug_assert_form!(constants::DW_FORM_sdata);
+                sleb128_size(val)
+            }
+            AttributeValue::Udata(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val)
+            }
+            AttributeValue::Exprloc(ref val) => {
+                debug_assert_form!(constants::DW_FORM_exprloc);
+                let size = val.size(unit.encoding(), Some(offsets));
+                uleb128_size(size as u64) + size
+            }
+            AttributeValue::Flag(_) => {
+                debug_assert_form!(constants::DW_FORM_flag);
+                1
+            }
+            AttributeValue::FlagPresent => {
+                debug_assert_form!(constants::DW_FORM_flag_present);
+                0
+            }
+            AttributeValue::UnitRef(_) => {
+                match unit.format() {
+                    Format::Dwarf32 => debug_assert_form!(constants::DW_FORM_ref4),
+                    Format::Dwarf64 => debug_assert_form!(constants::DW_FORM_ref8),
+                }
+                unit.format().word_size() as usize
+            }
+            AttributeValue::DebugInfoRef(_) => {
+                debug_assert_form!(constants::DW_FORM_ref_addr);
+                if unit.version() == 2 {
+                    unit.address_size() as usize
+                } else {
+                    unit.format().word_size() as usize
+                }
+            }
+            AttributeValue::DebugInfoRefSup(_) => {
+                match unit.format() {
+                    Format::Dwarf32 => debug_assert_form!(constants::DW_FORM_ref_sup4),
+                    Format::Dwarf64 => debug_assert_form!(constants::DW_FORM_ref_sup8),
+                }
+                unit.format().word_size() as usize
+            }
+            AttributeValue::LineProgramRef => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                unit.format().word_size() as usize
+            }
+            AttributeValue::LocationListRef(_) => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                unit.format().word_size() as usize
+            }
+            AttributeValue::DebugMacinfoRef(_) => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                unit.format().word_size() as usize
+            }
+            AttributeValue::DebugMacroRef(_) => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                unit.format().word_size() as usize
+            }
+            AttributeValue::RangeListRef(_) => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                unit.format().word_size() as usize
+            }
+            AttributeValue::DebugTypesRef(_) => {
+                debug_assert_form!(constants::DW_FORM_ref_sig8);
+                8
+            }
+            AttributeValue::StringRef(_) => {
+                debug_assert_form!(constants::DW_FORM_strp);
+                unit.format().word_size() as usize
+            }
+            AttributeValue::DebugStrRefSup(_) => {
+                debug_assert_form!(constants::DW_FORM_strp_sup);
+                unit.format().word_size() as usize
+            }
+            AttributeValue::LineStringRef(_) => {
+                debug_assert_form!(constants::DW_FORM_line_strp);
+                unit.format().word_size() as usize
+            }
+            AttributeValue::String(ref val) => {
+                debug_assert_form!(constants::DW_FORM_string);
+                val.len() + 1
+            }
+            AttributeValue::Encoding(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::DecimalSign(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::Endianity(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::Accessibility(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::Visibility(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::Virtuality(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::Language(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::AddressClass(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::IdentifierCase(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::CallingConvention(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::Inline(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::Ordering(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.0 as u64)
+            }
+            AttributeValue::FileIndex(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                uleb128_size(val.map(FileId::raw).unwrap_or(0))
+            }
+        }
+    }
+
+    /// Write the attribute value to the given sections.
+    #[allow(clippy::cyclomatic_complexity, clippy::too_many_arguments)]
+    fn write<W: Writer>(
+        &self,
+        w: &mut DebugInfo<W>,
+        debug_info_refs: &mut Vec<DebugInfoReference>,
+        unit_refs: &mut Vec<(DebugInfoOffset, UnitEntryId)>,
+        unit: &Unit,
+        offsets: &UnitOffsets,
+        line_program: Option<DebugLineOffset>,
+        line_strings: &DebugLineStrOffsets,
+        strings: &DebugStrOffsets,
+        range_lists: &RangeListOffsets,
+        loc_lists: &LocationListOffsets,
+    ) -> Result<()> {
+        macro_rules! debug_assert_form {
+            ($form:expr) => {
+                debug_assert_eq!(self.form(unit.encoding()).unwrap(), $form)
+            };
+        }
+        match *self {
+            AttributeValue::Address(val) => {
+                debug_assert_form!(constants::DW_FORM_addr);
+                w.write_address(val, unit.address_size())?;
+            }
+            AttributeValue::Block(ref val) => {
+                debug_assert_form!(constants::DW_FORM_block);
+                w.write_uleb128(val.len() as u64)?;
+                w.write(&val)?;
+            }
+            AttributeValue::Data1(val) => {
+                debug_assert_form!(constants::DW_FORM_data1);
+                w.write_u8(val)?;
+            }
+            AttributeValue::Data2(val) => {
+                debug_assert_form!(constants::DW_FORM_data2);
+                w.write_u16(val)?;
+            }
+            AttributeValue::Data4(val) => {
+                debug_assert_form!(constants::DW_FORM_data4);
+                w.write_u32(val)?;
+            }
+            AttributeValue::Data8(val) => {
+                debug_assert_form!(constants::DW_FORM_data8);
+                w.write_u64(val)?;
+            }
+            AttributeValue::Sdata(val) => {
+                debug_assert_form!(constants::DW_FORM_sdata);
+                w.write_sleb128(val)?;
+            }
+            AttributeValue::Udata(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(val)?;
+            }
+            AttributeValue::Exprloc(ref val) => {
+                debug_assert_form!(constants::DW_FORM_exprloc);
+                w.write_uleb128(val.size(unit.encoding(), Some(offsets)) as u64)?;
+                val.write(
+                    &mut w.0,
+                    Some(debug_info_refs),
+                    unit.encoding(),
+                    Some(offsets),
+                )?;
+            }
+            AttributeValue::Flag(val) => {
+                debug_assert_form!(constants::DW_FORM_flag);
+                w.write_u8(val as u8)?;
+            }
+            AttributeValue::FlagPresent => {
+                debug_assert_form!(constants::DW_FORM_flag_present);
+            }
+            AttributeValue::UnitRef(id) => {
+                match unit.format() {
+                    Format::Dwarf32 => debug_assert_form!(constants::DW_FORM_ref4),
+                    Format::Dwarf64 => debug_assert_form!(constants::DW_FORM_ref8),
+                }
+                unit_refs.push((w.offset(), id));
+                w.write_udata(0, unit.format().word_size())?;
+            }
+            AttributeValue::DebugInfoRef(reference) => {
+                debug_assert_form!(constants::DW_FORM_ref_addr);
+                let size = if unit.version() == 2 {
+                    unit.address_size()
+                } else {
+                    unit.format().word_size()
+                };
+                match reference {
+                    Reference::Symbol(symbol) => w.write_reference(symbol, size)?,
+                    Reference::Entry(unit, entry) => {
+                        debug_info_refs.push(DebugInfoReference {
+                            offset: w.len(),
+                            unit,
+                            entry,
+                            size,
+                        });
+                        w.write_udata(0, size)?;
+                    }
+                }
+            }
+            AttributeValue::DebugInfoRefSup(val) => {
+                match unit.format() {
+                    Format::Dwarf32 => debug_assert_form!(constants::DW_FORM_ref_sup4),
+                    Format::Dwarf64 => debug_assert_form!(constants::DW_FORM_ref_sup8),
+                }
+                w.write_udata(val.0 as u64, unit.format().word_size())?;
+            }
+            AttributeValue::LineProgramRef => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                match line_program {
+                    Some(line_program) => {
+                        w.write_offset(
+                            line_program.0,
+                            SectionId::DebugLine,
+                            unit.format().word_size(),
+                        )?;
+                    }
+                    None => return Err(Error::InvalidAttributeValue),
+                }
+            }
+            AttributeValue::LocationListRef(val) => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                let section = if unit.version() <= 4 {
+                    SectionId::DebugLoc
+                } else {
+                    SectionId::DebugLocLists
+                };
+                w.write_offset(loc_lists.get(val).0, section, unit.format().word_size())?;
+            }
+            AttributeValue::DebugMacinfoRef(val) => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                w.write_offset(val.0, SectionId::DebugMacinfo, unit.format().word_size())?;
+            }
+            AttributeValue::DebugMacroRef(val) => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                w.write_offset(val.0, SectionId::DebugMacro, unit.format().word_size())?;
+            }
+            AttributeValue::RangeListRef(val) => {
+                if unit.version() >= 4 {
+                    debug_assert_form!(constants::DW_FORM_sec_offset);
+                }
+                let section = if unit.version() <= 4 {
+                    SectionId::DebugRanges
+                } else {
+                    SectionId::DebugRngLists
+                };
+                w.write_offset(range_lists.get(val).0, section, unit.format().word_size())?;
+            }
+            AttributeValue::DebugTypesRef(val) => {
+                debug_assert_form!(constants::DW_FORM_ref_sig8);
+                w.write_u64(val.0)?;
+            }
+            AttributeValue::StringRef(val) => {
+                debug_assert_form!(constants::DW_FORM_strp);
+                w.write_offset(
+                    strings.get(val).0,
+                    SectionId::DebugStr,
+                    unit.format().word_size(),
+                )?;
+            }
+            AttributeValue::DebugStrRefSup(val) => {
+                debug_assert_form!(constants::DW_FORM_strp_sup);
+                w.write_udata(val.0 as u64, unit.format().word_size())?;
+            }
+            AttributeValue::LineStringRef(val) => {
+                debug_assert_form!(constants::DW_FORM_line_strp);
+                w.write_offset(
+                    line_strings.get(val).0,
+                    SectionId::DebugLineStr,
+                    unit.format().word_size(),
+                )?;
+            }
+            AttributeValue::String(ref val) => {
+                debug_assert_form!(constants::DW_FORM_string);
+                w.write(&val)?;
+                w.write_u8(0)?;
+            }
+            AttributeValue::Encoding(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::DecimalSign(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::Endianity(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::Accessibility(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::Visibility(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::Virtuality(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::Language(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::AddressClass(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(val.0)?;
+            }
+            AttributeValue::IdentifierCase(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::CallingConvention(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::Inline(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::Ordering(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(u64::from(val.0))?;
+            }
+            AttributeValue::FileIndex(val) => {
+                debug_assert_form!(constants::DW_FORM_udata);
+                w.write_uleb128(val.map(FileId::raw).unwrap_or(0))?;
+            }
+        }
+        Ok(())
+    }
+}
+
+define_section!(
+    DebugInfo,
+    DebugInfoOffset,
+    "A writable `.debug_info` section."
+);
+
+/// The section offsets of all elements within a `.debug_info` section.
+#[derive(Debug, Default)]
+pub struct DebugInfoOffsets {
+    base_id: BaseId,
+    units: Vec<UnitOffsets>,
+}
+
+impl DebugInfoOffsets {
+    #[cfg(test)]
+    pub(crate) fn unit_offsets(&self, unit: UnitId) -> &UnitOffsets {
+        debug_assert_eq!(self.base_id, unit.base_id);
+        &self.units[unit.index]
+    }
+
+    /// Get the `.debug_info` section offset for the given unit.
+    #[inline]
+    pub fn unit(&self, unit: UnitId) -> DebugInfoOffset {
+        debug_assert_eq!(self.base_id, unit.base_id);
+        self.units[unit.index].unit
+    }
+
+    /// Get the `.debug_info` section offset for the given entry.
+    #[inline]
+    pub fn entry(&self, unit: UnitId, entry: UnitEntryId) -> DebugInfoOffset {
+        debug_assert_eq!(self.base_id, unit.base_id);
+        self.units[unit.index].debug_info_offset(entry)
+    }
+}
+
+/// The section offsets of all elements of a unit within a `.debug_info` section.
+#[derive(Debug)]
+pub(crate) struct UnitOffsets {
+    base_id: BaseId,
+    unit: DebugInfoOffset,
+    entries: Vec<EntryOffset>,
+}
+
+impl UnitOffsets {
+    #[cfg(test)]
+    fn none() -> Self {
+        UnitOffsets {
+            base_id: BaseId::default(),
+            unit: DebugInfoOffset(0),
+            entries: Vec::new(),
+        }
+    }
+
+    /// Get the .debug_info offset for the given entry.
+    #[inline]
+    pub(crate) fn debug_info_offset(&self, entry: UnitEntryId) -> DebugInfoOffset {
+        debug_assert_eq!(self.base_id, entry.base_id);
+        let offset = self.entries[entry.index].offset;
+        debug_assert_ne!(offset.0, 0);
+        offset
+    }
+
+    /// Get the unit offset for the given entry.
+    #[inline]
+    pub(crate) fn unit_offset(&self, entry: UnitEntryId) -> u64 {
+        let offset = self.debug_info_offset(entry);
+        (offset.0 - self.unit.0) as u64
+    }
+
+    /// Get the abbreviation code for the given entry.
+    #[inline]
+    pub(crate) fn abbrev(&self, entry: UnitEntryId) -> u64 {
+        debug_assert_eq!(self.base_id, entry.base_id);
+        self.entries[entry.index].abbrev
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct EntryOffset {
+    offset: DebugInfoOffset,
+    abbrev: u64,
+}
+
+impl EntryOffset {
+    fn none() -> Self {
+        EntryOffset {
+            offset: DebugInfoOffset(0),
+            abbrev: 0,
+        }
+    }
+}
+
+/// A reference to a `.debug_info` entry that has yet to be resolved.
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct DebugInfoReference {
+    /// The offset within the section of the reference.
+    pub offset: usize,
+    /// The size of the reference.
+    pub size: u8,
+    /// The unit containing the entry.
+    pub unit: UnitId,
+    /// The entry being referenced.
+    pub entry: UnitEntryId,
+}
+
+#[cfg(feature = "read")]
+pub(crate) mod convert {
+    use super::*;
+    use crate::common::UnitSectionOffset;
+    use crate::read::{self, Reader};
+    use crate::write::{self, ConvertError, ConvertResult, LocationList, RangeList};
+    use std::collections::HashMap;
+
+    pub(crate) struct ConvertUnit<R: Reader<Offset = usize>> {
+        from_unit: read::Unit<R>,
+        base_id: BaseId,
+        encoding: Encoding,
+        entries: Vec<DebuggingInformationEntry>,
+        entry_offsets: Vec<read::UnitOffset>,
+        root: UnitEntryId,
+    }
+
+    pub(crate) struct ConvertUnitContext<'a, R: Reader<Offset = usize>> {
+        pub dwarf: &'a read::Dwarf<R>,
+        pub unit: &'a read::Unit<R>,
+        pub line_strings: &'a mut write::LineStringTable,
+        pub strings: &'a mut write::StringTable,
+        pub ranges: &'a mut write::RangeListTable,
+        pub locations: &'a mut write::LocationListTable,
+        pub convert_address: &'a dyn Fn(u64) -> Option<Address>,
+        pub base_address: Address,
+        pub line_program_offset: Option<DebugLineOffset>,
+        pub line_program_files: Vec<FileId>,
+        pub entry_ids: &'a HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>,
+    }
+
+    impl UnitTable {
+        /// Create a unit table by reading the data in the given sections.
+        ///
+        /// This also updates the given tables with the values that are referenced from
+        /// attributes in this section.
+        ///
+        /// `convert_address` is a function to convert read addresses into the `Address`
+        /// type. For non-relocatable addresses, this function may simply return
+        /// `Address::Constant(address)`. For relocatable addresses, it is the caller's
+        /// responsibility to determine the symbol and addend corresponding to the address
+        /// and return `Address::Symbol { symbol, addend }`.
+        pub fn from<R: Reader<Offset = usize>>(
+            dwarf: &read::Dwarf<R>,
+            line_strings: &mut write::LineStringTable,
+            strings: &mut write::StringTable,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+        ) -> ConvertResult<UnitTable> {
+            let base_id = BaseId::default();
+            let mut unit_entries = Vec::new();
+            let mut entry_ids = HashMap::new();
+
+            let mut from_units = dwarf.units();
+            while let Some(from_unit) = from_units.next()? {
+                let unit_id = UnitId::new(base_id, unit_entries.len());
+                unit_entries.push(Unit::convert_entries(
+                    from_unit,
+                    unit_id,
+                    &mut entry_ids,
+                    dwarf,
+                )?);
+            }
+
+            // Attributes must be converted in a separate pass so that we can handle
+            // references to other compilation units.
+            let mut units = Vec::new();
+            for unit_entries in unit_entries.drain(..) {
+                units.push(Unit::convert_attributes(
+                    unit_entries,
+                    &entry_ids,
+                    dwarf,
+                    line_strings,
+                    strings,
+                    convert_address,
+                )?);
+            }
+
+            Ok(UnitTable { base_id, units })
+        }
+    }
+
+    impl Unit {
+        /// Create a unit by reading the data in the input sections.
+        ///
+        /// Does not add entry attributes.
+        #[allow(clippy::too_many_arguments)]
+        pub(crate) fn convert_entries<R: Reader<Offset = usize>>(
+            from_header: read::UnitHeader<R>,
+            unit_id: UnitId,
+            entry_ids: &mut HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>,
+            dwarf: &read::Dwarf<R>,
+        ) -> ConvertResult<ConvertUnit<R>> {
+            match from_header.type_() {
+                read::UnitType::Compilation => (),
+                _ => return Err(ConvertError::UnsupportedUnitType),
+            }
+            let base_id = BaseId::default();
+
+            let from_unit = dwarf.unit(from_header)?;
+            let encoding = from_unit.encoding();
+
+            let mut entries = Vec::new();
+            let mut entry_offsets = Vec::new();
+
+            let mut from_tree = from_unit.entries_tree(None)?;
+            let from_root = from_tree.root()?;
+            let root = DebuggingInformationEntry::convert_entry(
+                from_root,
+                &from_unit,
+                base_id,
+                &mut entries,
+                &mut entry_offsets,
+                entry_ids,
+                None,
+                unit_id,
+            )?;
+
+            Ok(ConvertUnit {
+                from_unit,
+                base_id,
+                encoding,
+                entries,
+                entry_offsets,
+                root,
+            })
+        }
+
+        /// Create entry attributes by reading the data in the input sections.
+        fn convert_attributes<R: Reader<Offset = usize>>(
+            unit: ConvertUnit<R>,
+            entry_ids: &HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>,
+            dwarf: &read::Dwarf<R>,
+            line_strings: &mut write::LineStringTable,
+            strings: &mut write::StringTable,
+            convert_address: &dyn Fn(u64) -> Option<Address>,
+        ) -> ConvertResult<Unit> {
+            let from_unit = unit.from_unit;
+            let base_address =
+                convert_address(from_unit.low_pc).ok_or(ConvertError::InvalidAddress)?;
+
+            let (line_program_offset, line_program, line_program_files) =
+                match from_unit.line_program {
+                    Some(ref from_program) => {
+                        let from_program = from_program.clone();
+                        let line_program_offset = from_program.header().offset();
+                        let (line_program, line_program_files) = LineProgram::from(
+                            from_program,
+                            dwarf,
+                            line_strings,
+                            strings,
+                            convert_address,
+                        )?;
+                        (Some(line_program_offset), line_program, line_program_files)
+                    }
+                    None => (None, LineProgram::none(), Vec::new()),
+                };
+
+            let mut ranges = RangeListTable::default();
+            let mut locations = LocationListTable::default();
+
+            let mut context = ConvertUnitContext {
+                entry_ids,
+                dwarf,
+                unit: &from_unit,
+                line_strings,
+                strings,
+                ranges: &mut ranges,
+                locations: &mut locations,
+                convert_address,
+                base_address,
+                line_program_offset,
+                line_program_files,
+            };
+
+            let mut entries = unit.entries;
+            for entry in &mut entries {
+                entry.convert_attributes(&mut context, &unit.entry_offsets)?;
+            }
+
+            Ok(Unit {
+                base_id: unit.base_id,
+                encoding: unit.encoding,
+                line_program,
+                ranges,
+                locations,
+                entries,
+                root: unit.root,
+            })
+        }
+    }
+
+    impl DebuggingInformationEntry {
+        /// Create an entry by reading the data in the input sections.
+        ///
+        /// Does not add the entry attributes.
+        fn convert_entry<R: Reader<Offset = usize>>(
+            from: read::EntriesTreeNode<R>,
+            from_unit: &read::Unit<R>,
+            base_id: BaseId,
+            entries: &mut Vec<DebuggingInformationEntry>,
+            entry_offsets: &mut Vec<read::UnitOffset>,
+            entry_ids: &mut HashMap<UnitSectionOffset, (UnitId, UnitEntryId)>,
+            parent: Option<UnitEntryId>,
+            unit_id: UnitId,
+        ) -> ConvertResult<UnitEntryId> {
+            let from_entry = from.entry();
+            let id = DebuggingInformationEntry::new(base_id, entries, parent, from_entry.tag());
+            let offset = from_entry.offset();
+            entry_offsets.push(offset);
+            entry_ids.insert(offset.to_unit_section_offset(from_unit), (unit_id, id));
+
+            let mut from_children = from.children();
+            while let Some(from_child) = from_children.next()? {
+                DebuggingInformationEntry::convert_entry(
+                    from_child,
+                    from_unit,
+                    base_id,
+                    entries,
+                    entry_offsets,
+                    entry_ids,
+                    Some(id),
+                    unit_id,
+                )?;
+            }
+            Ok(id)
+        }
+
+        /// Create an entry's attributes by reading the data in the input sections.
+        fn convert_attributes<R: Reader<Offset = usize>>(
+            &mut self,
+            context: &mut ConvertUnitContext<R>,
+            entry_offsets: &[read::UnitOffset],
+        ) -> ConvertResult<()> {
+            let offset = entry_offsets[self.id.index];
+            let from = context.unit.entry(offset)?;
+            let mut from_attrs = from.attrs();
+            while let Some(from_attr) = from_attrs.next()? {
+                if from_attr.name() == constants::DW_AT_sibling {
+                    // This may point to a null entry, so we have to treat it differently.
+                    self.set_sibling(true);
+                } else if let Some(attr) = Attribute::from(context, &from_attr)? {
+                    self.set(attr.name, attr.value);
+                }
+            }
+            Ok(())
+        }
+    }
+
+    impl Attribute {
+        /// Create an attribute by reading the data in the given sections.
+        pub(crate) fn from<R: Reader<Offset = usize>>(
+            context: &mut ConvertUnitContext<R>,
+            from: &read::Attribute<R>,
+        ) -> ConvertResult<Option<Attribute>> {
+            let value = AttributeValue::from(context, from.value())?;
+            Ok(value.map(|value| Attribute {
+                name: from.name(),
+                value,
+            }))
+        }
+    }
+
+    impl AttributeValue {
+        /// Create an attribute value by reading the data in the given sections.
+        pub(crate) fn from<R: Reader<Offset = usize>>(
+            context: &mut ConvertUnitContext<R>,
+            from: read::AttributeValue<R>,
+        ) -> ConvertResult<Option<AttributeValue>> {
+            let to = match from {
+                read::AttributeValue::Addr(val) => match (context.convert_address)(val) {
+                    Some(val) => AttributeValue::Address(val),
+                    None => return Err(ConvertError::InvalidAddress),
+                },
+                read::AttributeValue::Block(r) => AttributeValue::Block(r.to_slice()?.into()),
+                read::AttributeValue::Data1(val) => AttributeValue::Data1(val),
+                read::AttributeValue::Data2(val) => AttributeValue::Data2(val),
+                read::AttributeValue::Data4(val) => AttributeValue::Data4(val),
+                read::AttributeValue::Data8(val) => AttributeValue::Data8(val),
+                read::AttributeValue::Sdata(val) => AttributeValue::Sdata(val),
+                read::AttributeValue::Udata(val) => AttributeValue::Udata(val),
+                read::AttributeValue::Exprloc(expression) => {
+                    let expression = Expression::from(
+                        expression,
+                        context.unit.encoding(),
+                        Some(context.dwarf),
+                        Some(context.unit),
+                        Some(context.entry_ids),
+                        context.convert_address,
+                    )?;
+                    AttributeValue::Exprloc(expression)
+                }
+                // TODO: it would be nice to preserve the flag form.
+                read::AttributeValue::Flag(val) => AttributeValue::Flag(val),
+                read::AttributeValue::DebugAddrBase(_base) => {
+                    // We convert all address indices to addresses,
+                    // so this is unneeded.
+                    return Ok(None);
+                }
+                read::AttributeValue::DebugAddrIndex(index) => {
+                    let val = context.dwarf.address(context.unit, index)?;
+                    match (context.convert_address)(val) {
+                        Some(val) => AttributeValue::Address(val),
+                        None => return Err(ConvertError::InvalidAddress),
+                    }
+                }
+                read::AttributeValue::UnitRef(val) => {
+                    if !context.unit.header.is_valid_offset(val) {
+                        return Err(ConvertError::InvalidUnitRef);
+                    }
+                    let id = context
+                        .entry_ids
+                        .get(&val.to_unit_section_offset(context.unit))
+                        .ok_or(ConvertError::InvalidUnitRef)?;
+                    AttributeValue::UnitRef(id.1)
+                }
+                read::AttributeValue::DebugInfoRef(val) => {
+                    // TODO: support relocation of this value
+                    let id = context
+                        .entry_ids
+                        .get(&UnitSectionOffset::DebugInfoOffset(val))
+                        .ok_or(ConvertError::InvalidDebugInfoRef)?;
+                    AttributeValue::DebugInfoRef(Reference::Entry(id.0, id.1))
+                }
+                read::AttributeValue::DebugInfoRefSup(val) => AttributeValue::DebugInfoRefSup(val),
+                read::AttributeValue::DebugLineRef(val) => {
+                    // There should only be the line program in the CU DIE which we've already
+                    // converted, so check if it matches that.
+                    if Some(val) == context.line_program_offset {
+                        AttributeValue::LineProgramRef
+                    } else {
+                        return Err(ConvertError::InvalidLineRef);
+                    }
+                }
+                read::AttributeValue::DebugMacinfoRef(val) => AttributeValue::DebugMacinfoRef(val),
+                read::AttributeValue::DebugMacroRef(val) => AttributeValue::DebugMacroRef(val),
+                read::AttributeValue::LocationListsRef(val) => {
+                    let iter = context
+                        .dwarf
+                        .locations
+                        .raw_locations(val, context.unit.encoding())?;
+                    let loc_list = LocationList::from(iter, context)?;
+                    let loc_id = context.locations.add(loc_list);
+                    AttributeValue::LocationListRef(loc_id)
+                }
+                read::AttributeValue::DebugLocListsBase(_base) => {
+                    // We convert all location list indices to offsets,
+                    // so this is unneeded.
+                    return Ok(None);
+                }
+                read::AttributeValue::DebugLocListsIndex(index) => {
+                    let offset = context.dwarf.locations_offset(context.unit, index)?;
+                    let iter = context
+                        .dwarf
+                        .locations
+                        .raw_locations(offset, context.unit.encoding())?;
+                    let loc_list = LocationList::from(iter, context)?;
+                    let loc_id = context.locations.add(loc_list);
+                    AttributeValue::LocationListRef(loc_id)
+                }
+                read::AttributeValue::RangeListsRef(val) => {
+                    let iter = context
+                        .dwarf
+                        .ranges
+                        .raw_ranges(val, context.unit.encoding())?;
+                    let range_list = RangeList::from(iter, context)?;
+                    let range_id = context.ranges.add(range_list);
+                    AttributeValue::RangeListRef(range_id)
+                }
+                read::AttributeValue::DebugRngListsBase(_base) => {
+                    // We convert all range list indices to offsets,
+                    // so this is unneeded.
+                    return Ok(None);
+                }
+                read::AttributeValue::DebugRngListsIndex(index) => {
+                    let offset = context.dwarf.ranges_offset(context.unit, index)?;
+                    let iter = context
+                        .dwarf
+                        .ranges
+                        .raw_ranges(offset, context.unit.encoding())?;
+                    let range_list = RangeList::from(iter, context)?;
+                    let range_id = context.ranges.add(range_list);
+                    AttributeValue::RangeListRef(range_id)
+                }
+                read::AttributeValue::DebugTypesRef(val) => AttributeValue::DebugTypesRef(val),
+                read::AttributeValue::DebugStrRef(offset) => {
+                    let r = context.dwarf.string(offset)?;
+                    let id = context.strings.add(r.to_slice()?);
+                    AttributeValue::StringRef(id)
+                }
+                read::AttributeValue::DebugStrRefSup(val) => AttributeValue::DebugStrRefSup(val),
+                read::AttributeValue::DebugStrOffsetsBase(_base) => {
+                    // We convert all string offsets to `.debug_str` references,
+                    // so this is unneeded.
+                    return Ok(None);
+                }
+                read::AttributeValue::DebugStrOffsetsIndex(index) => {
+                    let offset = context.dwarf.string_offset(context.unit, index)?;
+                    let r = context.dwarf.string(offset)?;
+                    let id = context.strings.add(r.to_slice()?);
+                    AttributeValue::StringRef(id)
+                }
+                read::AttributeValue::DebugLineStrRef(offset) => {
+                    let r = context.dwarf.line_string(offset)?;
+                    let id = context.line_strings.add(r.to_slice()?);
+                    AttributeValue::LineStringRef(id)
+                }
+                read::AttributeValue::String(r) => AttributeValue::String(r.to_slice()?.into()),
+                read::AttributeValue::Encoding(val) => AttributeValue::Encoding(val),
+                read::AttributeValue::DecimalSign(val) => AttributeValue::DecimalSign(val),
+                read::AttributeValue::Endianity(val) => AttributeValue::Endianity(val),
+                read::AttributeValue::Accessibility(val) => AttributeValue::Accessibility(val),
+                read::AttributeValue::Visibility(val) => AttributeValue::Visibility(val),
+                read::AttributeValue::Virtuality(val) => AttributeValue::Virtuality(val),
+                read::AttributeValue::Language(val) => AttributeValue::Language(val),
+                read::AttributeValue::AddressClass(val) => AttributeValue::AddressClass(val),
+                read::AttributeValue::IdentifierCase(val) => AttributeValue::IdentifierCase(val),
+                read::AttributeValue::CallingConvention(val) => {
+                    AttributeValue::CallingConvention(val)
+                }
+                read::AttributeValue::Inline(val) => AttributeValue::Inline(val),
+                read::AttributeValue::Ordering(val) => AttributeValue::Ordering(val),
+                read::AttributeValue::FileIndex(val) => {
+                    if val == 0 {
+                        // 0 means not specified, even for version 5.
+                        AttributeValue::FileIndex(None)
+                    } else {
+                        match context.line_program_files.get(val as usize) {
+                            Some(id) => AttributeValue::FileIndex(Some(*id)),
+                            None => return Err(ConvertError::InvalidFileIndex),
+                        }
+                    }
+                }
+                // Should always be a more specific section reference.
+                read::AttributeValue::SecOffset(_) => {
+                    return Err(ConvertError::InvalidAttributeValue);
+                }
+                read::AttributeValue::DwoId(DwoId(val)) => AttributeValue::Udata(val),
+            };
+            Ok(Some(to))
+        }
+    }
+}
+
+#[cfg(test)]
+#[cfg(feature = "read")]
+mod tests {
+    use super::*;
+    use crate::common::{
+        DebugAddrBase, DebugLocListsBase, DebugRngListsBase, DebugStrOffsetsBase, LineEncoding,
+    };
+    use crate::constants;
+    use crate::read;
+    use crate::write::{
+        DebugLine, DebugLineStr, DebugStr, EndianVec, LineString, LineStringTable, Location,
+        LocationList, LocationListTable, Range, RangeList, RangeListOffsets, RangeListTable,
+        StringTable,
+    };
+    use crate::LittleEndian;
+    use std::collections::HashMap;
+    use std::mem;
+
+    #[test]
+    #[allow(clippy::cyclomatic_complexity)]
+    fn test_unit_table() {
+        let mut strings = StringTable::default();
+
+        let mut units = UnitTable::default();
+        let unit_id1 = units.add(Unit::new(
+            Encoding {
+                version: 4,
+                address_size: 8,
+                format: Format::Dwarf32,
+            },
+            LineProgram::none(),
+        ));
+        let unit2 = units.add(Unit::new(
+            Encoding {
+                version: 2,
+                address_size: 4,
+                format: Format::Dwarf64,
+            },
+            LineProgram::none(),
+        ));
+        let unit3 = units.add(Unit::new(
+            Encoding {
+                version: 5,
+                address_size: 4,
+                format: Format::Dwarf32,
+            },
+            LineProgram::none(),
+        ));
+        assert_eq!(units.count(), 3);
+        {
+            let unit1 = units.get_mut(unit_id1);
+            assert_eq!(unit1.version(), 4);
+            assert_eq!(unit1.address_size(), 8);
+            assert_eq!(unit1.format(), Format::Dwarf32);
+            assert_eq!(unit1.count(), 1);
+
+            let root_id = unit1.root();
+            assert_eq!(root_id, UnitEntryId::new(unit1.base_id, 0));
+            {
+                let root = unit1.get_mut(root_id);
+                assert_eq!(root.id(), root_id);
+                assert!(root.parent().is_none());
+                assert_eq!(root.tag(), constants::DW_TAG_compile_unit);
+
+                // Test get/get_mut
+                assert!(root.get(constants::DW_AT_producer).is_none());
+                assert!(root.get_mut(constants::DW_AT_producer).is_none());
+                let mut producer = AttributeValue::String(b"root"[..].into());
+                root.set(constants::DW_AT_producer, producer.clone());
+                assert_eq!(root.get(constants::DW_AT_producer), Some(&producer));
+                assert_eq!(root.get_mut(constants::DW_AT_producer), Some(&mut producer));
+
+                // Test attrs
+                let mut attrs = root.attrs();
+                let attr = attrs.next().unwrap();
+                assert_eq!(attr.name(), constants::DW_AT_producer);
+                assert_eq!(attr.get(), &producer);
+                assert!(attrs.next().is_none());
+            }
+
+            let child1 = unit1.add(root_id, constants::DW_TAG_subprogram);
+            assert_eq!(child1, UnitEntryId::new(unit1.base_id, 1));
+            {
+                let child1 = unit1.get_mut(child1);
+                assert_eq!(child1.parent(), Some(root_id));
+
+                let tmp = AttributeValue::String(b"tmp"[..].into());
+                child1.set(constants::DW_AT_name, tmp.clone());
+                assert_eq!(child1.get(constants::DW_AT_name), Some(&tmp));
+
+                // Test attrs_mut
+                let name = AttributeValue::StringRef(strings.add(&b"child1"[..]));
+                {
+                    let attr = child1.attrs_mut().next().unwrap();
+                    assert_eq!(attr.name(), constants::DW_AT_name);
+                    attr.set(name.clone());
+                }
+                assert_eq!(child1.get(constants::DW_AT_name), Some(&name));
+            }
+
+            let child2 = unit1.add(root_id, constants::DW_TAG_subprogram);
+            assert_eq!(child2, UnitEntryId::new(unit1.base_id, 2));
+            {
+                let child2 = unit1.get_mut(child2);
+                assert_eq!(child2.parent(), Some(root_id));
+
+                let tmp = AttributeValue::String(b"tmp"[..].into());
+                child2.set(constants::DW_AT_name, tmp.clone());
+                assert_eq!(child2.get(constants::DW_AT_name), Some(&tmp));
+
+                // Test replace
+                let name = AttributeValue::StringRef(strings.add(&b"child2"[..]));
+                child2.set(constants::DW_AT_name, name.clone());
+                assert_eq!(child2.get(constants::DW_AT_name), Some(&name));
+            }
+
+            {
+                let root = unit1.get(root_id);
+                assert_eq!(
+                    root.children().cloned().collect::<Vec<_>>(),
+                    vec![child1, child2]
+                );
+            }
+        }
+        {
+            let unit2 = units.get(unit2);
+            assert_eq!(unit2.version(), 2);
+            assert_eq!(unit2.address_size(), 4);
+            assert_eq!(unit2.format(), Format::Dwarf64);
+            assert_eq!(unit2.count(), 1);
+
+            let root = unit2.root();
+            assert_eq!(root, UnitEntryId::new(unit2.base_id, 0));
+            let root = unit2.get(root);
+            assert_eq!(root.id(), UnitEntryId::new(unit2.base_id, 0));
+            assert!(root.parent().is_none());
+            assert_eq!(root.tag(), constants::DW_TAG_compile_unit);
+        }
+
+        let mut sections = Sections::new(EndianVec::new(LittleEndian));
+        let debug_line_str_offsets = DebugLineStrOffsets::none();
+        let debug_str_offsets = strings.write(&mut sections.debug_str).unwrap();
+        units
+            .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
+            .unwrap();
+
+        println!("{:?}", sections.debug_str);
+        println!("{:?}", sections.debug_info);
+        println!("{:?}", sections.debug_abbrev);
+
+        let dwarf = read::Dwarf {
+            debug_abbrev: read::DebugAbbrev::new(sections.debug_abbrev.slice(), LittleEndian),
+            debug_info: read::DebugInfo::new(sections.debug_info.slice(), LittleEndian),
+            debug_str: read::DebugStr::new(sections.debug_str.slice(), LittleEndian),
+            ..Default::default()
+        };
+        let mut read_units = dwarf.units();
+
+        {
+            let read_unit1 = read_units.next().unwrap().unwrap();
+            let unit1 = units.get(unit_id1);
+            assert_eq!(unit1.version(), read_unit1.version());
+            assert_eq!(unit1.address_size(), read_unit1.address_size());
+            assert_eq!(unit1.format(), read_unit1.format());
+
+            let read_unit1 = dwarf.unit(read_unit1).unwrap();
+            let mut read_entries = read_unit1.entries();
+
+            let root = unit1.get(unit1.root());
+            {
+                let (depth, read_root) = read_entries.next_dfs().unwrap().unwrap();
+                assert_eq!(depth, 0);
+                assert_eq!(root.tag(), read_root.tag());
+                assert!(read_root.has_children());
+
+                let producer = match root.get(constants::DW_AT_producer).unwrap() {
+                    AttributeValue::String(ref producer) => &**producer,
+                    otherwise => panic!("unexpected {:?}", otherwise),
+                };
+                assert_eq!(producer, b"root");
+                let read_producer = read_root
+                    .attr_value(constants::DW_AT_producer)
+                    .unwrap()
+                    .unwrap();
+                assert_eq!(
+                    dwarf
+                        .attr_string(&read_unit1, read_producer)
+                        .unwrap()
+                        .slice(),
+                    producer
+                );
+            }
+
+            let mut children = root.children().cloned();
+
+            {
+                let child = children.next().unwrap();
+                assert_eq!(child, UnitEntryId::new(unit1.base_id, 1));
+                let child = unit1.get(child);
+                let (depth, read_child) = read_entries.next_dfs().unwrap().unwrap();
+                assert_eq!(depth, 1);
+                assert_eq!(child.tag(), read_child.tag());
+                assert!(!read_child.has_children());
+
+                let name = match child.get(constants::DW_AT_name).unwrap() {
+                    AttributeValue::StringRef(name) => *name,
+                    otherwise => panic!("unexpected {:?}", otherwise),
+                };
+                let name = strings.get(name);
+                assert_eq!(name, b"child1");
+                let read_name = read_child
+                    .attr_value(constants::DW_AT_name)
+                    .unwrap()
+                    .unwrap();
+                assert_eq!(
+                    dwarf.attr_string(&read_unit1, read_name).unwrap().slice(),
+                    name
+                );
+            }
+
+            {
+                let child = children.next().unwrap();
+                assert_eq!(child, UnitEntryId::new(unit1.base_id, 2));
+                let child = unit1.get(child);
+                let (depth, read_child) = read_entries.next_dfs().unwrap().unwrap();
+                assert_eq!(depth, 0);
+                assert_eq!(child.tag(), read_child.tag());
+                assert!(!read_child.has_children());
+
+                let name = match child.get(constants::DW_AT_name).unwrap() {
+                    AttributeValue::StringRef(name) => *name,
+                    otherwise => panic!("unexpected {:?}", otherwise),
+                };
+                let name = strings.get(name);
+                assert_eq!(name, b"child2");
+                let read_name = read_child
+                    .attr_value(constants::DW_AT_name)
+                    .unwrap()
+                    .unwrap();
+                assert_eq!(
+                    dwarf.attr_string(&read_unit1, read_name).unwrap().slice(),
+                    name
+                );
+            }
+
+            assert!(read_entries.next_dfs().unwrap().is_none());
+        }
+
+        {
+            let read_unit2 = read_units.next().unwrap().unwrap();
+            let unit2 = units.get(unit2);
+            assert_eq!(unit2.version(), read_unit2.version());
+            assert_eq!(unit2.address_size(), read_unit2.address_size());
+            assert_eq!(unit2.format(), read_unit2.format());
+
+            let abbrevs = dwarf.abbreviations(&read_unit2).unwrap();
+            let mut read_entries = read_unit2.entries(&abbrevs);
+
+            {
+                let root = unit2.get(unit2.root());
+                let (depth, read_root) = read_entries.next_dfs().unwrap().unwrap();
+                assert_eq!(depth, 0);
+                assert_eq!(root.tag(), read_root.tag());
+                assert!(!read_root.has_children());
+            }
+
+            assert!(read_entries.next_dfs().unwrap().is_none());
+        }
+
+        {
+            let read_unit3 = read_units.next().unwrap().unwrap();
+            let unit3 = units.get(unit3);
+            assert_eq!(unit3.version(), read_unit3.version());
+            assert_eq!(unit3.address_size(), read_unit3.address_size());
+            assert_eq!(unit3.format(), read_unit3.format());
+
+            let abbrevs = dwarf.abbreviations(&read_unit3).unwrap();
+            let mut read_entries = read_unit3.entries(&abbrevs);
+
+            {
+                let root = unit3.get(unit3.root());
+                let (depth, read_root) = read_entries.next_dfs().unwrap().unwrap();
+                assert_eq!(depth, 0);
+                assert_eq!(root.tag(), read_root.tag());
+                assert!(!read_root.has_children());
+            }
+
+            assert!(read_entries.next_dfs().unwrap().is_none());
+        }
+
+        assert!(read_units.next().unwrap().is_none());
+
+        let mut convert_line_strings = LineStringTable::default();
+        let mut convert_strings = StringTable::default();
+        let convert_units = UnitTable::from(
+            &dwarf,
+            &mut convert_line_strings,
+            &mut convert_strings,
+            &|address| Some(Address::Constant(address)),
+        )
+        .unwrap();
+        assert_eq!(convert_units.count(), units.count());
+
+        for i in 0..convert_units.count() {
+            let unit_id = units.id(i);
+            let unit = units.get(unit_id);
+            let convert_unit_id = convert_units.id(i);
+            let convert_unit = convert_units.get(convert_unit_id);
+            assert_eq!(convert_unit.version(), unit.version());
+            assert_eq!(convert_unit.address_size(), unit.address_size());
+            assert_eq!(convert_unit.format(), unit.format());
+            assert_eq!(convert_unit.count(), unit.count());
+
+            let root = unit.get(unit.root());
+            let convert_root = convert_unit.get(convert_unit.root());
+            assert_eq!(convert_root.tag(), root.tag());
+            for (convert_attr, attr) in convert_root.attrs().zip(root.attrs()) {
+                assert_eq!(convert_attr, attr);
+            }
+        }
+    }
+
+    #[test]
+    fn test_attribute_value() {
+        // Create a string table and a string with a non-zero id/offset.
+        let mut strings = StringTable::default();
+        strings.add("string one");
+        let string_id = strings.add("string two");
+        let mut debug_str = DebugStr::from(EndianVec::new(LittleEndian));
+        let debug_str_offsets = strings.write(&mut debug_str).unwrap();
+        let read_debug_str = read::DebugStr::new(debug_str.slice(), LittleEndian);
+
+        let mut line_strings = LineStringTable::default();
+        line_strings.add("line string one");
+        let line_string_id = line_strings.add("line string two");
+        let mut debug_line_str = DebugLineStr::from(EndianVec::new(LittleEndian));
+        let debug_line_str_offsets = line_strings.write(&mut debug_line_str).unwrap();
+        let read_debug_line_str =
+            read::DebugLineStr::from(read::EndianSlice::new(debug_line_str.slice(), LittleEndian));
+
+        let data = vec![1, 2, 3, 4];
+        let read_data = read::EndianSlice::new(&[1, 2, 3, 4], LittleEndian);
+
+        let mut expression = Expression::new();
+        expression.op_constu(57);
+        let read_expression = read::Expression(read::EndianSlice::new(
+            &[constants::DW_OP_constu.0, 57],
+            LittleEndian,
+        ));
+
+        let mut ranges = RangeListTable::default();
+        let range_id = ranges.add(RangeList(vec![Range::StartEnd {
+            begin: Address::Constant(0x1234),
+            end: Address::Constant(0x2345),
+        }]));
+
+        let mut locations = LocationListTable::default();
+        let loc_id = locations.add(LocationList(vec![Location::StartEnd {
+            begin: Address::Constant(0x1234),
+            end: Address::Constant(0x2345),
+            data: expression.clone(),
+        }]));
+
+        for &version in &[2, 3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+
+                    let mut sections = Sections::new(EndianVec::new(LittleEndian));
+                    let range_list_offsets = ranges.write(&mut sections, encoding).unwrap();
+                    let loc_list_offsets = locations.write(&mut sections, encoding, None).unwrap();
+
+                    let read_debug_ranges =
+                        read::DebugRanges::new(sections.debug_ranges.slice(), LittleEndian);
+                    let read_debug_rnglists =
+                        read::DebugRngLists::new(sections.debug_rnglists.slice(), LittleEndian);
+
+                    let read_debug_loc =
+                        read::DebugLoc::new(sections.debug_loc.slice(), LittleEndian);
+                    let read_debug_loclists =
+                        read::DebugLocLists::new(sections.debug_loclists.slice(), LittleEndian);
+
+                    let mut units = UnitTable::default();
+                    let unit = units.add(Unit::new(encoding, LineProgram::none()));
+                    let unit = units.get(unit);
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+                    let from_unit = read::UnitHeader::new(
+                        encoding,
+                        0,
+                        read::UnitType::Compilation,
+                        DebugAbbrevOffset(0),
+                        DebugInfoOffset(0).into(),
+                        read::EndianSlice::new(&[], LittleEndian),
+                    );
+
+                    for &(ref name, ref value, ref expect_value) in &[
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Address(Address::Constant(0x1234)),
+                            read::AttributeValue::Addr(0x1234),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Block(data.clone()),
+                            read::AttributeValue::Block(read_data),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Data1(0x12),
+                            read::AttributeValue::Data1(0x12),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Data2(0x1234),
+                            read::AttributeValue::Data2(0x1234),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Data4(0x1234),
+                            read::AttributeValue::Data4(0x1234),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Data8(0x1234),
+                            read::AttributeValue::Data8(0x1234),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Sdata(0x1234),
+                            read::AttributeValue::Sdata(0x1234),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Udata(0x1234),
+                            read::AttributeValue::Udata(0x1234),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Exprloc(expression.clone()),
+                            read::AttributeValue::Exprloc(read_expression),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::Flag(false),
+                            read::AttributeValue::Flag(false),
+                        ),
+                        /*
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::FlagPresent,
+                            read::AttributeValue::Flag(true),
+                        ),
+                        */
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x1234)),
+                            read::AttributeValue::DebugInfoRefSup(DebugInfoOffset(0x1234)),
+                        ),
+                        (
+                            constants::DW_AT_location,
+                            AttributeValue::LocationListRef(loc_id),
+                            read::AttributeValue::SecOffset(loc_list_offsets.get(loc_id).0),
+                        ),
+                        (
+                            constants::DW_AT_macro_info,
+                            AttributeValue::DebugMacinfoRef(DebugMacinfoOffset(0x1234)),
+                            read::AttributeValue::SecOffset(0x1234),
+                        ),
+                        (
+                            constants::DW_AT_macros,
+                            AttributeValue::DebugMacroRef(DebugMacroOffset(0x1234)),
+                            read::AttributeValue::SecOffset(0x1234),
+                        ),
+                        (
+                            constants::DW_AT_ranges,
+                            AttributeValue::RangeListRef(range_id),
+                            read::AttributeValue::SecOffset(range_list_offsets.get(range_id).0),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::DebugTypesRef(DebugTypeSignature(0x1234)),
+                            read::AttributeValue::DebugTypesRef(DebugTypeSignature(0x1234)),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::StringRef(string_id),
+                            read::AttributeValue::DebugStrRef(debug_str_offsets.get(string_id)),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::DebugStrRefSup(DebugStrOffset(0x1234)),
+                            read::AttributeValue::DebugStrRefSup(DebugStrOffset(0x1234)),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::LineStringRef(line_string_id),
+                            read::AttributeValue::DebugLineStrRef(
+                                debug_line_str_offsets.get(line_string_id),
+                            ),
+                        ),
+                        (
+                            constants::DW_AT_name,
+                            AttributeValue::String(data.clone()),
+                            read::AttributeValue::String(read_data),
+                        ),
+                        (
+                            constants::DW_AT_encoding,
+                            AttributeValue::Encoding(constants::DwAte(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_decimal_sign,
+                            AttributeValue::DecimalSign(constants::DwDs(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_endianity,
+                            AttributeValue::Endianity(constants::DwEnd(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_accessibility,
+                            AttributeValue::Accessibility(constants::DwAccess(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_visibility,
+                            AttributeValue::Visibility(constants::DwVis(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_virtuality,
+                            AttributeValue::Virtuality(constants::DwVirtuality(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_language,
+                            AttributeValue::Language(constants::DwLang(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_address_class,
+                            AttributeValue::AddressClass(constants::DwAddr(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_identifier_case,
+                            AttributeValue::IdentifierCase(constants::DwId(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_calling_convention,
+                            AttributeValue::CallingConvention(constants::DwCc(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_ordering,
+                            AttributeValue::Ordering(constants::DwOrd(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                        (
+                            constants::DW_AT_inline,
+                            AttributeValue::Inline(constants::DwInl(0x12)),
+                            read::AttributeValue::Udata(0x12),
+                        ),
+                    ][..]
+                    {
+                        let form = value.form(encoding).unwrap();
+                        let attr = Attribute {
+                            name: *name,
+                            value: value.clone(),
+                        };
+
+                        let offsets = UnitOffsets::none();
+                        let line_program_offset = None;
+                        let mut debug_info_refs = Vec::new();
+                        let mut unit_refs = Vec::new();
+                        let mut debug_info = DebugInfo::from(EndianVec::new(LittleEndian));
+                        attr.value
+                            .write(
+                                &mut debug_info,
+                                &mut debug_info_refs,
+                                &mut unit_refs,
+                                &unit,
+                                &offsets,
+                                line_program_offset,
+                                &debug_line_str_offsets,
+                                &debug_str_offsets,
+                                &range_list_offsets,
+                                &loc_list_offsets,
+                            )
+                            .unwrap();
+
+                        let spec = read::AttributeSpecification::new(*name, form, None);
+                        let mut r = read::EndianSlice::new(debug_info.slice(), LittleEndian);
+                        let read_attr = read::parse_attribute(&mut r, encoding, spec).unwrap();
+                        let read_value = &read_attr.raw_value();
+                        // read::AttributeValue is invariant in the lifetime of R.
+                        // The lifetimes here are all okay, so transmute it.
+                        let read_value = unsafe {
+                            mem::transmute::<
+                                &read::AttributeValue<read::EndianSlice<LittleEndian>>,
+                                &read::AttributeValue<read::EndianSlice<LittleEndian>>,
+                            >(read_value)
+                        };
+                        assert_eq!(read_value, expect_value);
+
+                        let dwarf = read::Dwarf {
+                            debug_str: read_debug_str.clone(),
+                            debug_line_str: read_debug_line_str.clone(),
+                            ranges: read::RangeLists::new(read_debug_ranges, read_debug_rnglists),
+                            locations: read::LocationLists::new(
+                                read_debug_loc,
+                                read_debug_loclists,
+                            ),
+                            ..Default::default()
+                        };
+
+                        let unit = read::Unit {
+                            header: from_unit,
+                            abbreviations: read::Abbreviations::default(),
+                            name: None,
+                            comp_dir: None,
+                            low_pc: 0,
+                            str_offsets_base: DebugStrOffsetsBase(0),
+                            addr_base: DebugAddrBase(0),
+                            loclists_base: DebugLocListsBase(0),
+                            rnglists_base: DebugRngListsBase(0),
+                            line_program: None,
+                        };
+
+                        let mut context = convert::ConvertUnitContext {
+                            dwarf: &dwarf,
+                            unit: &unit,
+                            line_strings: &mut line_strings,
+                            strings: &mut strings,
+                            ranges: &mut ranges,
+                            locations: &mut locations,
+                            convert_address: &|address| Some(Address::Constant(address)),
+                            base_address: Address::Constant(0),
+                            line_program_offset: None,
+                            line_program_files: Vec::new(),
+                            entry_ids: &HashMap::new(),
+                        };
+
+                        let convert_attr =
+                            Attribute::from(&mut context, &read_attr).unwrap().unwrap();
+                        assert_eq!(convert_attr, attr);
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    #[allow(clippy::cyclomatic_complexity)]
+    fn test_unit_ref() {
+        let mut units = UnitTable::default();
+        let unit_id1 = units.add(Unit::new(
+            Encoding {
+                version: 4,
+                address_size: 8,
+                format: Format::Dwarf32,
+            },
+            LineProgram::none(),
+        ));
+        assert_eq!(unit_id1, units.id(0));
+        let unit_id2 = units.add(Unit::new(
+            Encoding {
+                version: 2,
+                address_size: 4,
+                format: Format::Dwarf64,
+            },
+            LineProgram::none(),
+        ));
+        assert_eq!(unit_id2, units.id(1));
+        let unit1_child1 = UnitEntryId::new(units.get(unit_id1).base_id, 1);
+        let unit1_child2 = UnitEntryId::new(units.get(unit_id1).base_id, 2);
+        let unit2_child1 = UnitEntryId::new(units.get(unit_id2).base_id, 1);
+        let unit2_child2 = UnitEntryId::new(units.get(unit_id2).base_id, 2);
+        {
+            let unit1 = units.get_mut(unit_id1);
+            let root = unit1.root();
+            let child_id1 = unit1.add(root, constants::DW_TAG_subprogram);
+            assert_eq!(child_id1, unit1_child1);
+            let child_id2 = unit1.add(root, constants::DW_TAG_subprogram);
+            assert_eq!(child_id2, unit1_child2);
+            {
+                let child1 = unit1.get_mut(child_id1);
+                child1.set(constants::DW_AT_type, AttributeValue::UnitRef(child_id2));
+            }
+            {
+                let child2 = unit1.get_mut(child_id2);
+                child2.set(
+                    constants::DW_AT_type,
+                    AttributeValue::DebugInfoRef(Reference::Entry(unit_id2, unit2_child1)),
+                );
+            }
+        }
+        {
+            let unit2 = units.get_mut(unit_id2);
+            let root = unit2.root();
+            let child_id1 = unit2.add(root, constants::DW_TAG_subprogram);
+            assert_eq!(child_id1, unit2_child1);
+            let child_id2 = unit2.add(root, constants::DW_TAG_subprogram);
+            assert_eq!(child_id2, unit2_child2);
+            {
+                let child1 = unit2.get_mut(child_id1);
+                child1.set(constants::DW_AT_type, AttributeValue::UnitRef(child_id2));
+            }
+            {
+                let child2 = unit2.get_mut(child_id2);
+                child2.set(
+                    constants::DW_AT_type,
+                    AttributeValue::DebugInfoRef(Reference::Entry(unit_id1, unit1_child1)),
+                );
+            }
+        }
+
+        let debug_line_str_offsets = DebugLineStrOffsets::none();
+        let debug_str_offsets = DebugStrOffsets::none();
+        let mut sections = Sections::new(EndianVec::new(LittleEndian));
+        let debug_info_offsets = units
+            .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
+            .unwrap();
+
+        println!("{:?}", sections.debug_info);
+        println!("{:?}", sections.debug_abbrev);
+
+        let dwarf = read::Dwarf {
+            debug_abbrev: read::DebugAbbrev::new(sections.debug_abbrev.slice(), LittleEndian),
+            debug_info: read::DebugInfo::new(sections.debug_info.slice(), LittleEndian),
+            ..Default::default()
+        };
+
+        let mut read_units = dwarf.units();
+        {
+            let read_unit1 = read_units.next().unwrap().unwrap();
+            assert_eq!(
+                read_unit1.offset(),
+                debug_info_offsets.unit(unit_id1).into()
+            );
+
+            let abbrevs = dwarf.abbreviations(&read_unit1).unwrap();
+            let mut read_entries = read_unit1.entries(&abbrevs);
+            {
+                let (_, _read_root) = read_entries.next_dfs().unwrap().unwrap();
+            }
+            {
+                let (_, read_child1) = read_entries.next_dfs().unwrap().unwrap();
+                let offset = debug_info_offsets
+                    .entry(unit_id1, unit1_child2)
+                    .to_unit_offset(&read_unit1)
+                    .unwrap();
+                assert_eq!(
+                    read_child1.attr_value(constants::DW_AT_type).unwrap(),
+                    Some(read::AttributeValue::UnitRef(offset))
+                );
+            }
+            {
+                let (_, read_child2) = read_entries.next_dfs().unwrap().unwrap();
+                let offset = debug_info_offsets.entry(unit_id2, unit2_child1);
+                assert_eq!(
+                    read_child2.attr_value(constants::DW_AT_type).unwrap(),
+                    Some(read::AttributeValue::DebugInfoRef(offset))
+                );
+            }
+        }
+        {
+            let read_unit2 = read_units.next().unwrap().unwrap();
+            assert_eq!(
+                read_unit2.offset(),
+                debug_info_offsets.unit(unit_id2).into()
+            );
+
+            let abbrevs = dwarf.abbreviations(&read_unit2).unwrap();
+            let mut read_entries = read_unit2.entries(&abbrevs);
+            {
+                let (_, _read_root) = read_entries.next_dfs().unwrap().unwrap();
+            }
+            {
+                let (_, read_child1) = read_entries.next_dfs().unwrap().unwrap();
+                let offset = debug_info_offsets
+                    .entry(unit_id2, unit2_child2)
+                    .to_unit_offset(&read_unit2)
+                    .unwrap();
+                assert_eq!(
+                    read_child1.attr_value(constants::DW_AT_type).unwrap(),
+                    Some(read::AttributeValue::UnitRef(offset))
+                );
+            }
+            {
+                let (_, read_child2) = read_entries.next_dfs().unwrap().unwrap();
+                let offset = debug_info_offsets.entry(unit_id1, unit1_child1);
+                assert_eq!(
+                    read_child2.attr_value(constants::DW_AT_type).unwrap(),
+                    Some(read::AttributeValue::DebugInfoRef(offset))
+                );
+            }
+        }
+
+        let mut convert_line_strings = LineStringTable::default();
+        let mut convert_strings = StringTable::default();
+        let convert_units = UnitTable::from(
+            &dwarf,
+            &mut convert_line_strings,
+            &mut convert_strings,
+            &|address| Some(Address::Constant(address)),
+        )
+        .unwrap();
+        assert_eq!(convert_units.count(), units.count());
+
+        for i in 0..convert_units.count() {
+            let unit = units.get(units.id(i));
+            let convert_unit = convert_units.get(convert_units.id(i));
+            assert_eq!(convert_unit.version(), unit.version());
+            assert_eq!(convert_unit.address_size(), unit.address_size());
+            assert_eq!(convert_unit.format(), unit.format());
+            assert_eq!(convert_unit.count(), unit.count());
+
+            let root = unit.get(unit.root());
+            let convert_root = convert_unit.get(convert_unit.root());
+            assert_eq!(convert_root.tag(), root.tag());
+            for (convert_attr, attr) in convert_root.attrs().zip(root.attrs()) {
+                assert_eq!(convert_attr, attr);
+            }
+
+            let child1 = unit.get(UnitEntryId::new(unit.base_id, 1));
+            let convert_child1 = convert_unit.get(UnitEntryId::new(convert_unit.base_id, 1));
+            assert_eq!(convert_child1.tag(), child1.tag());
+            for (convert_attr, attr) in convert_child1.attrs().zip(child1.attrs()) {
+                assert_eq!(convert_attr.name, attr.name);
+                match (convert_attr.value.clone(), attr.value.clone()) {
+                    (
+                        AttributeValue::DebugInfoRef(Reference::Entry(convert_unit, convert_entry)),
+                        AttributeValue::DebugInfoRef(Reference::Entry(unit, entry)),
+                    ) => {
+                        assert_eq!(convert_unit.index, unit.index);
+                        assert_eq!(convert_entry.index, entry.index);
+                    }
+                    (AttributeValue::UnitRef(convert_id), AttributeValue::UnitRef(id)) => {
+                        assert_eq!(convert_id.index, id.index);
+                    }
+                    (convert_value, value) => assert_eq!(convert_value, value),
+                }
+            }
+
+            let child2 = unit.get(UnitEntryId::new(unit.base_id, 2));
+            let convert_child2 = convert_unit.get(UnitEntryId::new(convert_unit.base_id, 2));
+            assert_eq!(convert_child2.tag(), child2.tag());
+            for (convert_attr, attr) in convert_child2.attrs().zip(child2.attrs()) {
+                assert_eq!(convert_attr.name, attr.name);
+                match (convert_attr.value.clone(), attr.value.clone()) {
+                    (
+                        AttributeValue::DebugInfoRef(Reference::Entry(convert_unit, convert_entry)),
+                        AttributeValue::DebugInfoRef(Reference::Entry(unit, entry)),
+                    ) => {
+                        assert_eq!(convert_unit.index, unit.index);
+                        assert_eq!(convert_entry.index, entry.index);
+                    }
+                    (AttributeValue::UnitRef(convert_id), AttributeValue::UnitRef(id)) => {
+                        assert_eq!(convert_id.index, id.index);
+                    }
+                    (convert_value, value) => assert_eq!(convert_value, value),
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_sibling() {
+        fn add_child(
+            unit: &mut Unit,
+            parent: UnitEntryId,
+            tag: constants::DwTag,
+            name: &str,
+        ) -> UnitEntryId {
+            let id = unit.add(parent, tag);
+            let child = unit.get_mut(id);
+            child.set(constants::DW_AT_name, AttributeValue::String(name.into()));
+            child.set_sibling(true);
+            id
+        }
+
+        fn add_children(units: &mut UnitTable, unit_id: UnitId) {
+            let unit = units.get_mut(unit_id);
+            let root = unit.root();
+            let child1 = add_child(unit, root, constants::DW_TAG_subprogram, "child1");
+            add_child(unit, child1, constants::DW_TAG_variable, "grandchild1");
+            add_child(unit, root, constants::DW_TAG_subprogram, "child2");
+            add_child(unit, root, constants::DW_TAG_subprogram, "child3");
+        }
+
+        fn next_child<R: read::Reader<Offset = usize>>(
+            entries: &mut read::EntriesCursor<R>,
+        ) -> (read::UnitOffset, Option<read::UnitOffset>) {
+            let (_, entry) = entries.next_dfs().unwrap().unwrap();
+            let offset = entry.offset();
+            let sibling =
+                entry
+                    .attr_value(constants::DW_AT_sibling)
+                    .unwrap()
+                    .map(|attr| match attr {
+                        read::AttributeValue::UnitRef(offset) => offset,
+                        _ => panic!("bad sibling value"),
+                    });
+            (offset, sibling)
+        }
+
+        fn check_sibling<R: read::Reader<Offset = usize>>(
+            unit: &read::UnitHeader<R>,
+            debug_abbrev: &read::DebugAbbrev<R>,
+        ) {
+            let abbrevs = unit.abbreviations(debug_abbrev).unwrap();
+            let mut entries = unit.entries(&abbrevs);
+            // root
+            entries.next_dfs().unwrap().unwrap();
+            // child1
+            let (_, sibling1) = next_child(&mut entries);
+            // grandchild1
+            entries.next_dfs().unwrap().unwrap();
+            // child2
+            let (offset2, sibling2) = next_child(&mut entries);
+            // child3
+            let (_, _) = next_child(&mut entries);
+            assert_eq!(sibling1, Some(offset2));
+            assert_eq!(sibling2, None);
+        }
+
+        let encoding = Encoding {
+            format: Format::Dwarf32,
+            version: 4,
+            address_size: 8,
+        };
+        let mut units = UnitTable::default();
+        let unit_id1 = units.add(Unit::new(encoding, LineProgram::none()));
+        add_children(&mut units, unit_id1);
+        let unit_id2 = units.add(Unit::new(encoding, LineProgram::none()));
+        add_children(&mut units, unit_id2);
+
+        let debug_line_str_offsets = DebugLineStrOffsets::none();
+        let debug_str_offsets = DebugStrOffsets::none();
+        let mut sections = Sections::new(EndianVec::new(LittleEndian));
+        units
+            .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
+            .unwrap();
+
+        println!("{:?}", sections.debug_info);
+        println!("{:?}", sections.debug_abbrev);
+
+        let read_debug_info = read::DebugInfo::new(sections.debug_info.slice(), LittleEndian);
+        let read_debug_abbrev = read::DebugAbbrev::new(sections.debug_abbrev.slice(), LittleEndian);
+        let mut read_units = read_debug_info.units();
+        check_sibling(&read_units.next().unwrap().unwrap(), &read_debug_abbrev);
+        check_sibling(&read_units.next().unwrap().unwrap(), &read_debug_abbrev);
+    }
+
+    #[test]
+    fn test_line_ref() {
+        for &version in &[2, 3, 4, 5] {
+            for &address_size in &[4, 8] {
+                for &format in &[Format::Dwarf32, Format::Dwarf64] {
+                    let encoding = Encoding {
+                        format,
+                        version,
+                        address_size,
+                    };
+
+                    // The line program we'll be referencing.
+                    let mut line_program = LineProgram::new(
+                        encoding,
+                        LineEncoding::default(),
+                        LineString::String(b"comp_dir".to_vec()),
+                        LineString::String(b"comp_name".to_vec()),
+                        None,
+                    );
+                    let dir = line_program.default_directory();
+                    let file1 =
+                        line_program.add_file(LineString::String(b"file1".to_vec()), dir, None);
+                    let file2 =
+                        line_program.add_file(LineString::String(b"file2".to_vec()), dir, None);
+
+                    // Write, read, and convert the line program, so that we have the info
+                    // required to convert the attributes.
+                    let line_strings = DebugLineStrOffsets::none();
+                    let strings = DebugStrOffsets::none();
+                    let mut debug_line = DebugLine::from(EndianVec::new(LittleEndian));
+                    let line_program_offset = line_program
+                        .write(&mut debug_line, encoding, &line_strings, &strings)
+                        .unwrap();
+                    let read_debug_line = read::DebugLine::new(debug_line.slice(), LittleEndian);
+                    let read_line_program = read_debug_line
+                        .program(
+                            line_program_offset,
+                            address_size,
+                            Some(read::EndianSlice::new(b"comp_dir", LittleEndian)),
+                            Some(read::EndianSlice::new(b"comp_name", LittleEndian)),
+                        )
+                        .unwrap();
+                    let dwarf = read::Dwarf::default();
+                    let mut convert_line_strings = LineStringTable::default();
+                    let mut convert_strings = StringTable::default();
+                    let (_, line_program_files) = LineProgram::from(
+                        read_line_program,
+                        &dwarf,
+                        &mut convert_line_strings,
+                        &mut convert_strings,
+                        &|address| Some(Address::Constant(address)),
+                    )
+                    .unwrap();
+
+                    // Fake the unit.
+                    let mut units = UnitTable::default();
+                    let unit = units.add(Unit::new(encoding, LineProgram::none()));
+                    let unit = units.get(unit);
+                    let from_unit = read::UnitHeader::new(
+                        encoding,
+                        0,
+                        read::UnitType::Compilation,
+                        DebugAbbrevOffset(0),
+                        DebugInfoOffset(0).into(),
+                        read::EndianSlice::new(&[], LittleEndian),
+                    );
+
+                    for &(ref name, ref value, ref expect_value) in &[
+                        (
+                            constants::DW_AT_stmt_list,
+                            AttributeValue::LineProgramRef,
+                            read::AttributeValue::SecOffset(line_program_offset.0),
+                        ),
+                        (
+                            constants::DW_AT_decl_file,
+                            AttributeValue::FileIndex(Some(file1)),
+                            read::AttributeValue::Udata(file1.raw()),
+                        ),
+                        (
+                            constants::DW_AT_decl_file,
+                            AttributeValue::FileIndex(Some(file2)),
+                            read::AttributeValue::Udata(file2.raw()),
+                        ),
+                    ][..]
+                    {
+                        let mut ranges = RangeListTable::default();
+                        let mut locations = LocationListTable::default();
+                        let mut strings = StringTable::default();
+                        let mut line_strings = LineStringTable::default();
+
+                        let form = value.form(encoding).unwrap();
+                        let attr = Attribute {
+                            name: *name,
+                            value: value.clone(),
+                        };
+
+                        let mut debug_info_refs = Vec::new();
+                        let mut unit_refs = Vec::new();
+                        let mut debug_info = DebugInfo::from(EndianVec::new(LittleEndian));
+                        let offsets = UnitOffsets::none();
+                        let debug_line_str_offsets = DebugLineStrOffsets::none();
+                        let debug_str_offsets = DebugStrOffsets::none();
+                        let range_list_offsets = RangeListOffsets::none();
+                        let loc_list_offsets = LocationListOffsets::none();
+                        attr.value
+                            .write(
+                                &mut debug_info,
+                                &mut debug_info_refs,
+                                &mut unit_refs,
+                                &unit,
+                                &offsets,
+                                Some(line_program_offset),
+                                &debug_line_str_offsets,
+                                &debug_str_offsets,
+                                &range_list_offsets,
+                                &loc_list_offsets,
+                            )
+                            .unwrap();
+
+                        let spec = read::AttributeSpecification::new(*name, form, None);
+                        let mut r = read::EndianSlice::new(debug_info.slice(), LittleEndian);
+                        let read_attr = read::parse_attribute(&mut r, encoding, spec).unwrap();
+                        let read_value = &read_attr.raw_value();
+                        // read::AttributeValue is invariant in the lifetime of R.
+                        // The lifetimes here are all okay, so transmute it.
+                        let read_value = unsafe {
+                            mem::transmute::<
+                                &read::AttributeValue<read::EndianSlice<LittleEndian>>,
+                                &read::AttributeValue<read::EndianSlice<LittleEndian>>,
+                            >(read_value)
+                        };
+                        assert_eq!(read_value, expect_value);
+
+                        let unit = read::Unit {
+                            header: from_unit,
+                            abbreviations: read::Abbreviations::default(),
+                            name: None,
+                            comp_dir: None,
+                            low_pc: 0,
+                            str_offsets_base: DebugStrOffsetsBase(0),
+                            addr_base: DebugAddrBase(0),
+                            loclists_base: DebugLocListsBase(0),
+                            rnglists_base: DebugRngListsBase(0),
+                            line_program: None,
+                        };
+
+                        let mut context = convert::ConvertUnitContext {
+                            dwarf: &dwarf,
+                            unit: &unit,
+                            line_strings: &mut line_strings,
+                            strings: &mut strings,
+                            ranges: &mut ranges,
+                            locations: &mut locations,
+                            convert_address: &|address| Some(Address::Constant(address)),
+                            base_address: Address::Constant(0),
+                            line_program_offset: Some(line_program_offset),
+                            line_program_files: line_program_files.clone(),
+                            entry_ids: &HashMap::new(),
+                        };
+
+                        let convert_attr =
+                            Attribute::from(&mut context, &read_attr).unwrap().unwrap();
+                        assert_eq!(convert_attr, attr);
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_line_program_used() {
+        for used in vec![false, true] {
+            let encoding = Encoding {
+                format: Format::Dwarf32,
+                version: 5,
+                address_size: 8,
+            };
+
+            let line_program = LineProgram::new(
+                encoding,
+                LineEncoding::default(),
+                LineString::String(b"comp_dir".to_vec()),
+                LineString::String(b"comp_name".to_vec()),
+                None,
+            );
+
+            let mut unit = Unit::new(encoding, line_program);
+            let file_id = if used { Some(FileId::new(0)) } else { None };
+            let root = unit.root();
+            unit.get_mut(root).set(
+                constants::DW_AT_decl_file,
+                AttributeValue::FileIndex(file_id),
+            );
+
+            let mut units = UnitTable::default();
+            units.add(unit);
+
+            let debug_line_str_offsets = DebugLineStrOffsets::none();
+            let debug_str_offsets = DebugStrOffsets::none();
+            let mut sections = Sections::new(EndianVec::new(LittleEndian));
+            units
+                .write(&mut sections, &debug_line_str_offsets, &debug_str_offsets)
+                .unwrap();
+            assert_eq!(!used, sections.debug_line.slice().is_empty());
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/src/write/writer.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/src/write/writer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,497 @@
+use crate::common::{Format, SectionId};
+use crate::constants;
+use crate::endianity::Endianity;
+use crate::leb128;
+use crate::write::{Address, Error, Result};
+
+/// A trait for writing the data to a DWARF section.
+///
+/// All write operations append to the section unless otherwise specified.
+#[allow(clippy::len_without_is_empty)]
+pub trait Writer {
+    /// The endianity of bytes that are written.
+    type Endian: Endianity;
+
+    /// Return the endianity of bytes that are written.
+    fn endian(&self) -> Self::Endian;
+
+    /// Return the current section length.
+    ///
+    /// This may be used as an offset for future `write_at` calls.
+    fn len(&self) -> usize;
+
+    /// Write a slice.
+    fn write(&mut self, bytes: &[u8]) -> Result<()>;
+
+    /// Write a slice at a given offset.
+    ///
+    /// The write must not extend past the current section length.
+    fn write_at(&mut self, offset: usize, bytes: &[u8]) -> Result<()>;
+
+    /// Write an address.
+    ///
+    /// If the writer supports relocations, then it must provide its own implementation
+    /// of this method.
+    // TODO: use write_reference instead?
+    fn write_address(&mut self, address: Address, size: u8) -> Result<()> {
+        match address {
+            Address::Constant(val) => self.write_udata(val, size),
+            Address::Symbol { .. } => Err(Error::InvalidAddress),
+        }
+    }
+
+    /// Write an address with a `.eh_frame` pointer encoding.
+    ///
+    /// The given size is only used for `DW_EH_PE_absptr` formats.
+    ///
+    /// If the writer supports relocations, then it must provide its own implementation
+    /// of this method.
+    fn write_eh_pointer(
+        &mut self,
+        address: Address,
+        eh_pe: constants::DwEhPe,
+        size: u8,
+    ) -> Result<()> {
+        match address {
+            Address::Constant(val) => {
+                // Indirect doesn't matter here.
+                let val = match eh_pe.application() {
+                    constants::DW_EH_PE_absptr => val,
+                    constants::DW_EH_PE_pcrel => {
+                        // TODO: better handling of sign
+                        let offset = self.len() as u64;
+                        offset.wrapping_sub(val)
+                    }
+                    _ => {
+                        return Err(Error::UnsupportedPointerEncoding(eh_pe));
+                    }
+                };
+                self.write_eh_pointer_data(val, eh_pe.format(), size)
+            }
+            Address::Symbol { .. } => Err(Error::InvalidAddress),
+        }
+    }
+
+    /// Write a value with a `.eh_frame` pointer format.
+    ///
+    /// The given size is only used for `DW_EH_PE_absptr` formats.
+    ///
+    /// This must not be used directly for values that may require relocation.
+    fn write_eh_pointer_data(
+        &mut self,
+        val: u64,
+        format: constants::DwEhPe,
+        size: u8,
+    ) -> Result<()> {
+        match format {
+            constants::DW_EH_PE_absptr => self.write_udata(val, size),
+            constants::DW_EH_PE_uleb128 => self.write_uleb128(val),
+            constants::DW_EH_PE_udata2 => self.write_udata(val, 2),
+            constants::DW_EH_PE_udata4 => self.write_udata(val, 4),
+            constants::DW_EH_PE_udata8 => self.write_udata(val, 8),
+            constants::DW_EH_PE_sleb128 => self.write_sleb128(val as i64),
+            constants::DW_EH_PE_sdata2 => self.write_sdata(val as i64, 2),
+            constants::DW_EH_PE_sdata4 => self.write_sdata(val as i64, 4),
+            constants::DW_EH_PE_sdata8 => self.write_sdata(val as i64, 8),
+            _ => {
+                return Err(Error::UnsupportedPointerEncoding(format));
+            }
+        }
+    }
+
+    /// Write an offset that is relative to the start of the given section.
+    ///
+    /// If the writer supports relocations, then it must provide its own implementation
+    /// of this method.
+    fn write_offset(&mut self, val: usize, _section: SectionId, size: u8) -> Result<()> {
+        self.write_udata(val as u64, size)
+    }
+
+    /// Write an offset that is relative to the start of the given section.
+    ///
+    /// If the writer supports relocations, then it must provide its own implementation
+    /// of this method.
+    fn write_offset_at(
+        &mut self,
+        offset: usize,
+        val: usize,
+        _section: SectionId,
+        size: u8,
+    ) -> Result<()> {
+        self.write_udata_at(offset, val as u64, size)
+    }
+
+    /// Write a reference to a symbol.
+    ///
+    /// If the writer supports symbols, then it must provide its own implementation
+    /// of this method.
+    fn write_reference(&mut self, _symbol: usize, _size: u8) -> Result<()> {
+        Err(Error::InvalidReference)
+    }
+
+    /// Write a u8.
+    fn write_u8(&mut self, val: u8) -> Result<()> {
+        let bytes = [val];
+        self.write(&bytes)
+    }
+
+    /// Write a u16.
+    fn write_u16(&mut self, val: u16) -> Result<()> {
+        let mut bytes = [0; 2];
+        self.endian().write_u16(&mut bytes, val);
+        self.write(&bytes)
+    }
+
+    /// Write a u32.
+    fn write_u32(&mut self, val: u32) -> Result<()> {
+        let mut bytes = [0; 4];
+        self.endian().write_u32(&mut bytes, val);
+        self.write(&bytes)
+    }
+
+    /// Write a u64.
+    fn write_u64(&mut self, val: u64) -> Result<()> {
+        let mut bytes = [0; 8];
+        self.endian().write_u64(&mut bytes, val);
+        self.write(&bytes)
+    }
+
+    /// Write a u8 at the given offset.
+    fn write_u8_at(&mut self, offset: usize, val: u8) -> Result<()> {
+        let bytes = [val];
+        self.write_at(offset, &bytes)
+    }
+
+    /// Write a u16 at the given offset.
+    fn write_u16_at(&mut self, offset: usize, val: u16) -> Result<()> {
+        let mut bytes = [0; 2];
+        self.endian().write_u16(&mut bytes, val);
+        self.write_at(offset, &bytes)
+    }
+
+    /// Write a u32 at the given offset.
+    fn write_u32_at(&mut self, offset: usize, val: u32) -> Result<()> {
+        let mut bytes = [0; 4];
+        self.endian().write_u32(&mut bytes, val);
+        self.write_at(offset, &bytes)
+    }
+
+    /// Write a u64 at the given offset.
+    fn write_u64_at(&mut self, offset: usize, val: u64) -> Result<()> {
+        let mut bytes = [0; 8];
+        self.endian().write_u64(&mut bytes, val);
+        self.write_at(offset, &bytes)
+    }
+
+    /// Write unsigned data of the given size.
+    ///
+    /// Returns an error if the value is too large for the size.
+    /// This must not be used directly for values that may require relocation.
+    fn write_udata(&mut self, val: u64, size: u8) -> Result<()> {
+        match size {
+            1 => {
+                let write_val = val as u8;
+                if val != u64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u8(write_val)
+            }
+            2 => {
+                let write_val = val as u16;
+                if val != u64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u16(write_val)
+            }
+            4 => {
+                let write_val = val as u32;
+                if val != u64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u32(write_val)
+            }
+            8 => self.write_u64(val),
+            otherwise => Err(Error::UnsupportedWordSize(otherwise)),
+        }
+    }
+
+    /// Write signed data of the given size.
+    ///
+    /// Returns an error if the value is too large for the size.
+    /// This must not be used directly for values that may require relocation.
+    fn write_sdata(&mut self, val: i64, size: u8) -> Result<()> {
+        match size {
+            1 => {
+                let write_val = val as i8;
+                if val != i64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u8(write_val as u8)
+            }
+            2 => {
+                let write_val = val as i16;
+                if val != i64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u16(write_val as u16)
+            }
+            4 => {
+                let write_val = val as i32;
+                if val != i64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u32(write_val as u32)
+            }
+            8 => self.write_u64(val as u64),
+            otherwise => Err(Error::UnsupportedWordSize(otherwise)),
+        }
+    }
+
+    /// Write a word of the given size at the given offset.
+    ///
+    /// Returns an error if the value is too large for the size.
+    /// This must not be used directly for values that may require relocation.
+    fn write_udata_at(&mut self, offset: usize, val: u64, size: u8) -> Result<()> {
+        match size {
+            1 => {
+                let write_val = val as u8;
+                if val != u64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u8_at(offset, write_val)
+            }
+            2 => {
+                let write_val = val as u16;
+                if val != u64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u16_at(offset, write_val)
+            }
+            4 => {
+                let write_val = val as u32;
+                if val != u64::from(write_val) {
+                    return Err(Error::ValueTooLarge);
+                }
+                self.write_u32_at(offset, write_val)
+            }
+            8 => self.write_u64_at(offset, val),
+            otherwise => Err(Error::UnsupportedWordSize(otherwise)),
+        }
+    }
+
+    /// Write an unsigned LEB128 encoded integer.
+    fn write_uleb128(&mut self, val: u64) -> Result<()> {
+        let mut bytes = [0u8; 10];
+        // bytes is long enough so this will never fail.
+        let len = leb128::write::unsigned(&mut { &mut bytes[..] }, val).unwrap();
+        self.write(&bytes[..len])
+    }
+
+    /// Read an unsigned LEB128 encoded integer.
+    fn write_sleb128(&mut self, val: i64) -> Result<()> {
+        let mut bytes = [0u8; 10];
+        // bytes is long enough so this will never fail.
+        let len = leb128::write::signed(&mut { &mut bytes[..] }, val).unwrap();
+        self.write(&bytes[..len])
+    }
+
+    /// Write an initial length according to the given DWARF format.
+    ///
+    /// This will only write a length of zero, since the length isn't
+    /// known yet, and a subsequent call to `write_initial_length_at`
+    /// will write the actual length.
+    fn write_initial_length(&mut self, format: Format) -> Result<InitialLengthOffset> {
+        if format == Format::Dwarf64 {
+            self.write_u32(0xffff_ffff)?;
+        }
+        let offset = InitialLengthOffset(self.len());
+        self.write_udata(0, format.word_size())?;
+        Ok(offset)
+    }
+
+    /// Write an initial length at the given offset according to the given DWARF format.
+    ///
+    /// `write_initial_length` must have previously returned the offset.
+    fn write_initial_length_at(
+        &mut self,
+        offset: InitialLengthOffset,
+        length: u64,
+        format: Format,
+    ) -> Result<()> {
+        self.write_udata_at(offset.0, length, format.word_size())
+    }
+}
+
+/// The offset at which an initial length should be written.
+#[derive(Debug, Clone, Copy)]
+pub struct InitialLengthOffset(usize);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::write;
+    use crate::{BigEndian, LittleEndian};
+    use std::{i64, u64};
+
+    #[test]
+    #[allow(clippy::cyclomatic_complexity)]
+    fn test_writer() {
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_address(Address::Constant(0x1122_3344), 4).unwrap();
+        assert_eq!(w.slice(), &[0x44, 0x33, 0x22, 0x11]);
+        assert_eq!(
+            w.write_address(
+                Address::Symbol {
+                    symbol: 0,
+                    addend: 0
+                },
+                4
+            ),
+            Err(Error::InvalidAddress)
+        );
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_offset(0x1122_3344, SectionId::DebugInfo, 4)
+            .unwrap();
+        assert_eq!(w.slice(), &[0x44, 0x33, 0x22, 0x11]);
+        w.write_offset_at(1, 0x5566, SectionId::DebugInfo, 2)
+            .unwrap();
+        assert_eq!(w.slice(), &[0x44, 0x66, 0x55, 0x11]);
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_u8(0x11).unwrap();
+        w.write_u16(0x2233).unwrap();
+        w.write_u32(0x4455_6677).unwrap();
+        w.write_u64(0x8081_8283_8485_8687).unwrap();
+        #[rustfmt::skip]
+        assert_eq!(w.slice(), &[
+            0x11,
+            0x33, 0x22,
+            0x77, 0x66, 0x55, 0x44,
+            0x87, 0x86, 0x85, 0x84, 0x83, 0x82, 0x81, 0x80,
+        ]);
+        w.write_u8_at(14, 0x11).unwrap();
+        w.write_u16_at(12, 0x2233).unwrap();
+        w.write_u32_at(8, 0x4455_6677).unwrap();
+        w.write_u64_at(0, 0x8081_8283_8485_8687).unwrap();
+        #[rustfmt::skip]
+        assert_eq!(w.slice(), &[
+            0x87, 0x86, 0x85, 0x84, 0x83, 0x82, 0x81, 0x80,
+            0x77, 0x66, 0x55, 0x44,
+            0x33, 0x22,
+            0x11,
+        ]);
+
+        let mut w = write::EndianVec::new(BigEndian);
+        w.write_u8(0x11).unwrap();
+        w.write_u16(0x2233).unwrap();
+        w.write_u32(0x4455_6677).unwrap();
+        w.write_u64(0x8081_8283_8485_8687).unwrap();
+        #[rustfmt::skip]
+        assert_eq!(w.slice(), &[
+            0x11,
+            0x22, 0x33,
+            0x44, 0x55, 0x66, 0x77,
+            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+        ]);
+        w.write_u8_at(14, 0x11).unwrap();
+        w.write_u16_at(12, 0x2233).unwrap();
+        w.write_u32_at(8, 0x4455_6677).unwrap();
+        w.write_u64_at(0, 0x8081_8283_8485_8687).unwrap();
+        #[rustfmt::skip]
+        assert_eq!(w.slice(), &[
+            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+            0x44, 0x55, 0x66, 0x77,
+            0x22, 0x33,
+            0x11,
+        ]);
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_udata(0x11, 1).unwrap();
+        w.write_udata(0x2233, 2).unwrap();
+        w.write_udata(0x4455_6677, 4).unwrap();
+        w.write_udata(0x8081_8283_8485_8687, 8).unwrap();
+        #[rustfmt::skip]
+        assert_eq!(w.slice(), &[
+            0x11,
+            0x33, 0x22,
+            0x77, 0x66, 0x55, 0x44,
+            0x87, 0x86, 0x85, 0x84, 0x83, 0x82, 0x81, 0x80,
+        ]);
+        assert_eq!(w.write_udata(0x100, 1), Err(Error::ValueTooLarge));
+        assert_eq!(w.write_udata(0x1_0000, 2), Err(Error::ValueTooLarge));
+        assert_eq!(w.write_udata(0x1_0000_0000, 4), Err(Error::ValueTooLarge));
+        assert_eq!(w.write_udata(0x00, 3), Err(Error::UnsupportedWordSize(3)));
+        w.write_udata_at(14, 0x11, 1).unwrap();
+        w.write_udata_at(12, 0x2233, 2).unwrap();
+        w.write_udata_at(8, 0x4455_6677, 4).unwrap();
+        w.write_udata_at(0, 0x8081_8283_8485_8687, 8).unwrap();
+        #[rustfmt::skip]
+        assert_eq!(w.slice(), &[
+            0x87, 0x86, 0x85, 0x84, 0x83, 0x82, 0x81, 0x80,
+            0x77, 0x66, 0x55, 0x44,
+            0x33, 0x22,
+            0x11,
+        ]);
+        assert_eq!(w.write_udata_at(0, 0x100, 1), Err(Error::ValueTooLarge));
+        assert_eq!(w.write_udata_at(0, 0x1_0000, 2), Err(Error::ValueTooLarge));
+        assert_eq!(
+            w.write_udata_at(0, 0x1_0000_0000, 4),
+            Err(Error::ValueTooLarge)
+        );
+        assert_eq!(
+            w.write_udata_at(0, 0x00, 3),
+            Err(Error::UnsupportedWordSize(3))
+        );
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_uleb128(0).unwrap();
+        assert_eq!(w.slice(), &[0]);
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_uleb128(u64::MAX).unwrap();
+        assert_eq!(
+            w.slice(),
+            &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 1]
+        );
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_sleb128(0).unwrap();
+        assert_eq!(w.slice(), &[0]);
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_sleb128(i64::MAX).unwrap();
+        assert_eq!(
+            w.slice(),
+            &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0]
+        );
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        w.write_sleb128(i64::MIN).unwrap();
+        assert_eq!(
+            w.slice(),
+            &[0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7f]
+        );
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        let offset = w.write_initial_length(Format::Dwarf32).unwrap();
+        assert_eq!(w.slice(), &[0, 0, 0, 0]);
+        w.write_initial_length_at(offset, 0x1122_3344, Format::Dwarf32)
+            .unwrap();
+        assert_eq!(w.slice(), &[0x44, 0x33, 0x22, 0x11]);
+        assert_eq!(
+            w.write_initial_length_at(offset, 0x1_0000_0000, Format::Dwarf32),
+            Err(Error::ValueTooLarge)
+        );
+
+        let mut w = write::EndianVec::new(LittleEndian);
+        let offset = w.write_initial_length(Format::Dwarf64).unwrap();
+        assert_eq!(w.slice(), &[0xff, 0xff, 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0]);
+        w.write_initial_length_at(offset, 0x1122_3344_5566_7788, Format::Dwarf64)
+            .unwrap();
+        assert_eq!(
+            w.slice(),
+            &[0xff, 0xff, 0xff, 0xff, 0x88, 0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11]
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/tests/convert_self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/tests/convert_self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/tests/convert_self.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/tests/convert_self.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,158 @@
+#![cfg(all(feature = "read", feature = "write"))]
+
+use std::env;
+use std::fs::File;
+use std::io::Read;
+use std::path::PathBuf;
+
+use gimli::read;
+use gimli::write::{self, Address, EndianVec};
+use gimli::LittleEndian;
+
+fn read_section(section: &str) -> Vec<u8> {
+    let mut path = PathBuf::new();
+    if let Ok(dir) = env::var("CARGO_MANIFEST_DIR") {
+        path.push(dir);
+    }
+    path.push("fixtures/self");
+    path.push(section);
+
+    println!("Reading section \"{}\" at path {:?}", section, path);
+    assert!(path.is_file());
+    let mut file = File::open(path).unwrap();
+
+    let mut buf = Vec::new();
+    file.read_to_end(&mut buf).unwrap();
+    buf
+}
+
+#[test]
+fn test_convert_debug_info() {
+    // Convert existing sections
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = read::DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_info = read_section("debug_info");
+    let debug_info = read::DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_line = read_section("debug_line");
+    let debug_line = read::DebugLine::new(&debug_line, LittleEndian);
+
+    let debug_str = read_section("debug_str");
+    let debug_str = read::DebugStr::new(&debug_str, LittleEndian);
+
+    let debug_ranges = read_section("debug_ranges");
+    let debug_ranges = read::DebugRanges::new(&debug_ranges, LittleEndian);
+
+    let debug_rnglists = read::DebugRngLists::new(&[], LittleEndian);
+
+    let ranges = gimli::RangeLists::new(debug_ranges, debug_rnglists);
+
+    let debug_loc = read_section("debug_loc");
+    let debug_loc = read::DebugLoc::new(&debug_loc, LittleEndian);
+
+    let debug_loclists = read::DebugLocLists::new(&[], LittleEndian);
+
+    let locations = gimli::LocationLists::new(debug_loc, debug_loclists);
+
+    let dwarf = read::Dwarf {
+        debug_abbrev,
+        debug_info,
+        debug_line,
+        debug_str,
+        ranges,
+        locations,
+        ..Default::default()
+    };
+
+    let mut dwarf = write::Dwarf::from(&dwarf, &|address| Some(Address::Constant(address)))
+        .expect("Should convert DWARF information");
+
+    assert_eq!(dwarf.units.count(), 23);
+    let entries: usize = (0..dwarf.units.count())
+        .map(|i| dwarf.units.get(dwarf.units.id(i)).count())
+        .sum();
+    assert_eq!(entries, 29_560);
+    assert_eq!(dwarf.line_strings.count(), 0);
+    assert_eq!(dwarf.strings.count(), 3921);
+
+    // Write to new sections
+    let mut write_sections = write::Sections::new(EndianVec::new(LittleEndian));
+    dwarf
+        .write(&mut write_sections)
+        .expect("Should write DWARF information");
+    let debug_info_data = write_sections.debug_info.slice();
+    let debug_abbrev_data = write_sections.debug_abbrev.slice();
+    let debug_line_data = write_sections.debug_line.slice();
+    let debug_ranges_data = write_sections.debug_ranges.slice();
+    let debug_loc_data = write_sections.debug_loc.slice();
+    let debug_str_data = write_sections.debug_str.slice();
+    assert_eq!(debug_info_data.len(), 394_930);
+    assert_eq!(debug_abbrev_data.len(), 9701);
+    assert_eq!(debug_line_data.len(), 105_797);
+    assert_eq!(debug_ranges_data.len(), 155_712);
+    assert_eq!(debug_loc_data.len(), 245_168);
+    assert_eq!(debug_str_data.len(), 144_731);
+
+    // Convert new sections
+    let debug_abbrev = read::DebugAbbrev::new(debug_abbrev_data, LittleEndian);
+    let debug_info = read::DebugInfo::new(debug_info_data, LittleEndian);
+    let debug_line = read::DebugLine::new(debug_line_data, LittleEndian);
+    let debug_str = read::DebugStr::new(debug_str_data, LittleEndian);
+    let debug_ranges = read::DebugRanges::new(debug_ranges_data, LittleEndian);
+    let debug_rnglists = read::DebugRngLists::new(&[], LittleEndian);
+    let debug_loc = read::DebugLoc::new(debug_loc_data, LittleEndian);
+    let debug_loclists = read::DebugLocLists::new(&[], LittleEndian);
+
+    let ranges = gimli::RangeLists::new(debug_ranges, debug_rnglists);
+    let locations = gimli::LocationLists::new(debug_loc, debug_loclists);
+
+    let dwarf = read::Dwarf {
+        debug_abbrev,
+        debug_info,
+        debug_line,
+        debug_str,
+        ranges,
+        locations,
+        ..Default::default()
+    };
+
+    let dwarf = write::Dwarf::from(&dwarf, &|address| Some(Address::Constant(address)))
+        .expect("Should convert DWARF information");
+
+    assert_eq!(dwarf.units.count(), 23);
+    let entries: usize = (0..dwarf.units.count())
+        .map(|i| dwarf.units.get(dwarf.units.id(i)).count())
+        .sum();
+    assert_eq!(entries, 29_560);
+    assert_eq!(dwarf.strings.count(), 3921);
+}
+
+#[test]
+fn test_convert_eh_frame() {
+    // Convert existing section
+    let eh_frame = read_section("eh_frame");
+    let mut eh_frame = read::EhFrame::new(&eh_frame, LittleEndian);
+    // The `.eh_frame` fixture data was created on a 64-bit machine.
+    eh_frame.set_address_size(8);
+    let frames = write::FrameTable::from(&eh_frame, &|address| Some(Address::Constant(address)))
+        .expect("Should convert eh_frame information");
+    assert_eq!(frames.cie_count(), 2);
+    assert_eq!(frames.fde_count(), 3482);
+
+    // Write to new section
+    let mut write_eh_frame = write::EhFrame(EndianVec::new(LittleEndian));
+    frames
+        .write_eh_frame(&mut write_eh_frame)
+        .expect("Should write eh_frame information");
+    let eh_frame = write_eh_frame.slice();
+    assert_eq!(eh_frame.len(), 147152);
+
+    // Convert new section
+    let mut eh_frame = read::EhFrame::new(&eh_frame, LittleEndian);
+    eh_frame.set_address_size(8);
+    let frames = write::FrameTable::from(&eh_frame, &|address| Some(Address::Constant(address)))
+        .expect("Should convert eh_frame information");
+    assert_eq!(frames.cie_count(), 2);
+    assert_eq!(frames.fde_count(), 3482);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/tests/parse_self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/tests/parse_self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/gimli-0.24.0/tests/parse_self.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/gimli-0.24.0/tests/parse_self.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,430 @@
+#![cfg(all(feature = "read", feature = "std", feature = "endian-reader"))]
+
+use gimli::{
+    AttributeValue, DebugAbbrev, DebugAddr, DebugAddrBase, DebugAranges, DebugInfo, DebugLine,
+    DebugLoc, DebugLocLists, DebugPubNames, DebugPubTypes, DebugRanges, DebugRngLists, DebugStr,
+    Encoding, EndianSlice, Expression, LittleEndian, LocationLists, Operation, RangeLists, Reader,
+};
+use std::collections::hash_map::HashMap;
+use std::env;
+use std::fs::File;
+use std::io::Read;
+use std::path::PathBuf;
+use std::rc::Rc;
+
+fn read_section(section: &str) -> Vec<u8> {
+    let mut path = PathBuf::new();
+    if let Ok(dir) = env::var("CARGO_MANIFEST_DIR") {
+        path.push(dir);
+    }
+    path.push("fixtures/self");
+    path.push(section);
+
+    println!("Reading section \"{}\" at path {:?}", section, path);
+    assert!(path.is_file());
+    let mut file = File::open(path).unwrap();
+
+    let mut buf = Vec::new();
+    file.read_to_end(&mut buf).unwrap();
+    buf
+}
+
+fn parse_expression<R: Reader>(expr: Expression<R>, encoding: Encoding) {
+    let mut pc = expr.0.clone();
+    while !pc.is_empty() {
+        Operation::parse(&mut pc, encoding).expect("Should parse operation");
+    }
+
+    // Also attempt to evaluate some of it.
+    let mut eval = expr.evaluation(encoding);
+    eval.set_initial_value(0);
+    eval.evaluate().expect("Should evaluate expression");
+}
+
+fn impl_parse_self_debug_info<R: gimli::Reader>(
+    debug_info: &DebugInfo<R>,
+    debug_abbrev: &DebugAbbrev<R>,
+) {
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+
+        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
+            let entry = cursor.current().expect("Should have a current entry");
+
+            let mut attrs = entry.attrs();
+            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
+                if let AttributeValue::Exprloc(expression) = attr.value() {
+                    parse_expression(expression, unit.encoding());
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn test_parse_self_debug_info() {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    impl_parse_self_debug_info(&debug_info, &debug_abbrev);
+}
+
+#[test]
+fn test_parse_self_debug_info_with_endian_rc_slice() {
+    let debug_info = read_section("debug_info");
+    let debug_info = Rc::from(&debug_info[..]);
+    let debug_info = gimli::EndianRcSlice::new(debug_info, LittleEndian);
+    let debug_info = DebugInfo::from(debug_info);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = Rc::from(&debug_abbrev[..]);
+    let debug_abbrev = gimli::EndianRcSlice::new(debug_abbrev, LittleEndian);
+    let debug_abbrev = DebugAbbrev::from(debug_abbrev);
+
+    impl_parse_self_debug_info(&debug_info, &debug_abbrev);
+}
+
+#[test]
+fn test_parse_self_debug_line() {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_line = read_section("debug_line");
+    let debug_line = DebugLine::new(&debug_line, LittleEndian);
+
+    let debug_str = read_section("debug_str");
+    let debug_str = DebugStr::new(&debug_str, LittleEndian);
+
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        cursor.next_dfs().expect("Should parse next dfs");
+
+        let unit_entry = cursor.current().expect("Should have a root entry");
+
+        let comp_dir = unit_entry
+            .attr_value(gimli::DW_AT_comp_dir)
+            .expect("Should parse comp_dir attribute")
+            .and_then(|val| val.string_value(&debug_str));
+        let comp_name = unit_entry
+            .attr_value(gimli::DW_AT_name)
+            .expect("Should parse name attribute")
+            .and_then(|val| val.string_value(&debug_str));
+
+        if let Some(AttributeValue::DebugLineRef(offset)) = unit_entry
+            .attr_value(gimli::DW_AT_stmt_list)
+            .expect("Should parse stmt_list")
+        {
+            let program = debug_line
+                .program(offset, unit.address_size(), comp_dir, comp_name)
+                .expect("should parse line number program header");
+
+            let mut results = Vec::new();
+            let mut rows = program.rows();
+            while let Some((_, row)) = rows
+                .next_row()
+                .expect("Should parse and execute all rows in the line number program")
+            {
+                results.push(*row);
+            }
+            results.reverse();
+
+            let program = debug_line
+                .program(offset, unit.address_size(), comp_dir, comp_name)
+                .expect("should parse line number program header");
+            let (program, sequences) = program
+                .sequences()
+                .expect("should parse and execute the entire line number program");
+            assert!(!sequences.is_empty()); // Should be at least one sequence.
+            for sequence in sequences {
+                let mut rows = program.resume_from(&sequence);
+                while let Some((_, row)) = rows
+                    .next_row()
+                    .expect("Should parse and execute all rows after resuming")
+                {
+                    let other_row = results.pop().unwrap();
+                    assert!(row.address() >= sequence.start);
+                    assert!(row.address() <= sequence.end);
+                    assert_eq!(row.address(), other_row.address());
+                    assert_eq!(row.line(), other_row.line());
+                }
+            }
+            assert!(results.is_empty());
+        }
+    }
+}
+
+#[test]
+fn test_parse_self_debug_loc() {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+    let debug_addr_base = DebugAddrBase(0);
+
+    let debug_loc = read_section("debug_loc");
+    let debug_loc = DebugLoc::new(&debug_loc, LittleEndian);
+    let debug_loclists = DebugLocLists::new(&[], LittleEndian);
+    let loclists = LocationLists::new(debug_loc, debug_loclists);
+
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        cursor.next_dfs().expect("Should parse next dfs");
+
+        let mut low_pc = 0;
+
+        {
+            let unit_entry = cursor.current().expect("Should have a root entry");
+            let low_pc_attr = unit_entry
+                .attr_value(gimli::DW_AT_low_pc)
+                .expect("Should parse low_pc");
+            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
+                low_pc = address;
+            }
+        }
+
+        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
+            let entry = cursor.current().expect("Should have a current entry");
+            let mut attrs = entry.attrs();
+            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
+                if let AttributeValue::LocationListsRef(offset) = attr.value() {
+                    let mut locs = loclists
+                        .locations(
+                            offset,
+                            unit.encoding(),
+                            low_pc,
+                            &debug_addr,
+                            debug_addr_base,
+                        )
+                        .expect("Should parse locations OK");
+                    while let Some(loc) = locs.next().expect("Should parse next location") {
+                        assert!(loc.range.begin <= loc.range.end);
+                        parse_expression(loc.data, unit.encoding());
+                    }
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn test_parse_self_debug_ranges() {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_addr = DebugAddr::from(EndianSlice::new(&[], LittleEndian));
+    let debug_addr_base = DebugAddrBase(0);
+
+    let debug_ranges = read_section("debug_ranges");
+    let debug_ranges = DebugRanges::new(&debug_ranges, LittleEndian);
+    let debug_rnglists = DebugRngLists::new(&[], LittleEndian);
+    let rnglists = RangeLists::new(debug_ranges, debug_rnglists);
+
+    let mut iter = debug_info.units();
+    while let Some(unit) = iter.next().expect("Should parse compilation unit") {
+        let abbrevs = unit
+            .abbreviations(&debug_abbrev)
+            .expect("Should parse abbreviations");
+
+        let mut cursor = unit.entries(&abbrevs);
+        cursor.next_dfs().expect("Should parse next dfs");
+
+        let mut low_pc = 0;
+
+        {
+            let unit_entry = cursor.current().expect("Should have a root entry");
+            let low_pc_attr = unit_entry
+                .attr_value(gimli::DW_AT_low_pc)
+                .expect("Should parse low_pc");
+            if let Some(gimli::AttributeValue::Addr(address)) = low_pc_attr {
+                low_pc = address;
+            }
+        }
+
+        while cursor.next_dfs().expect("Should parse next dfs").is_some() {
+            let entry = cursor.current().expect("Should have a current entry");
+            let mut attrs = entry.attrs();
+            while let Some(attr) = attrs.next().expect("Should parse entry's attribute") {
+                if let AttributeValue::RangeListsRef(offset) = attr.value() {
+                    let mut ranges = rnglists
+                        .ranges(
+                            offset,
+                            unit.encoding(),
+                            low_pc,
+                            &debug_addr,
+                            debug_addr_base,
+                        )
+                        .expect("Should parse ranges OK");
+                    while let Some(range) = ranges.next().expect("Should parse next range") {
+                        assert!(range.begin <= range.end);
+                    }
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn test_parse_self_debug_aranges() {
+    let debug_aranges = read_section("debug_aranges");
+    let debug_aranges = DebugAranges::new(&debug_aranges, LittleEndian);
+
+    let mut headers = debug_aranges.headers();
+    while let Some(header) = headers.next().expect("Should parse arange header OK") {
+        let mut entries = header.entries();
+        while let Some(_) = entries.next().expect("Should parse arange entry OK") {
+            // Not really anything else we can check right now.
+        }
+    }
+}
+
+#[test]
+fn test_parse_self_debug_pubnames() {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_pubnames = read_section("debug_pubnames");
+    let debug_pubnames = DebugPubNames::new(&debug_pubnames, LittleEndian);
+
+    let mut units = HashMap::new();
+    let mut abbrevs = HashMap::new();
+    let mut pubnames = debug_pubnames.items();
+    while let Some(entry) = pubnames.next().expect("Should parse pubname OK") {
+        let unit_offset = entry.unit_header_offset();
+        let unit = units.entry(unit_offset).or_insert_with(|| {
+            debug_info
+                .header_from_offset(unit_offset)
+                .expect("Should parse unit header OK")
+        });
+        let abbrev_offset = unit.debug_abbrev_offset();
+        let abbrevs = abbrevs.entry(abbrev_offset).or_insert_with(|| {
+            debug_abbrev
+                .abbreviations(abbrev_offset)
+                .expect("Should parse abbreviations OK")
+        });
+        let mut cursor = unit
+            .entries_at_offset(abbrevs, entry.die_offset())
+            .expect("DIE offset should be valid");
+        assert!(cursor.next_dfs().expect("Should parse DIE").is_some());
+    }
+}
+
+#[test]
+fn test_parse_self_debug_pubtypes() {
+    let debug_info = read_section("debug_info");
+    let debug_info = DebugInfo::new(&debug_info, LittleEndian);
+
+    let debug_abbrev = read_section("debug_abbrev");
+    let debug_abbrev = DebugAbbrev::new(&debug_abbrev, LittleEndian);
+
+    let debug_pubtypes = read_section("debug_pubtypes");
+    let debug_pubtypes = DebugPubTypes::new(&debug_pubtypes, LittleEndian);
+
+    let mut units = HashMap::new();
+    let mut abbrevs = HashMap::new();
+    let mut pubtypes = debug_pubtypes.items();
+    while let Some(entry) = pubtypes.next().expect("Should parse pubtype OK") {
+        let unit_offset = entry.unit_header_offset();
+        let unit = units.entry(unit_offset).or_insert_with(|| {
+            debug_info
+                .header_from_offset(unit_offset)
+                .expect("Should parse unit header OK")
+        });
+        let abbrev_offset = unit.debug_abbrev_offset();
+        let abbrevs = abbrevs.entry(abbrev_offset).or_insert_with(|| {
+            debug_abbrev
+                .abbreviations(abbrev_offset)
+                .expect("Should parse abbreviations OK")
+        });
+        let mut cursor = unit
+            .entries_at_offset(abbrevs, entry.die_offset())
+            .expect("DIE offset should be valid");
+        assert!(cursor.next_dfs().expect("Should parse DIE").is_some());
+    }
+}
+
+#[test]
+fn test_parse_self_eh_frame() {
+    use gimli::{BaseAddresses, CieOrFde, EhFrame, UnwindSection};
+
+    let eh_frame = read_section("eh_frame");
+    let mut eh_frame = EhFrame::new(&eh_frame, LittleEndian);
+    // The `.eh_frame` fixture data was created on a 64-bit machine.
+    eh_frame.set_address_size(8);
+
+    let bases = BaseAddresses::default()
+        .set_eh_frame(0)
+        .set_text(0)
+        .set_got(0);
+    let mut entries = eh_frame.entries(&bases);
+    while let Some(entry) = entries.next().expect("Should parse CFI entry OK") {
+        match entry {
+            CieOrFde::Cie(cie) => {
+                let mut instrs = cie.instructions(&eh_frame, &bases);
+                while let Some(_) = instrs.next().expect("Can parse next CFI instruction OK") {
+                    // TODO FITZGEN
+                }
+            }
+            CieOrFde::Fde(partial) => {
+                let fde = partial
+                    .parse(UnwindSection::cie_from_offset)
+                    .expect("Should be able to get CIE for FDE");
+
+                let mut instrs = fde.instructions(&eh_frame, &bases);
+                while let Some(_) = instrs.next().expect("Can parse next CFI instruction OK") {
+                    // TODO FITZGEN
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn test_parse_self_eh_frame_hdr() {
+    use gimli::{BaseAddresses, EhFrameHdr};
+
+    let eh_frame_hdr = read_section("eh_frame_hdr");
+    let eh_frame_hdr = EhFrameHdr::new(&eh_frame_hdr, LittleEndian);
+
+    let bases = BaseAddresses::default()
+        .set_eh_frame(0)
+        .set_eh_frame_hdr(0)
+        .set_text(0)
+        .set_got(0);
+
+    // `.eh_frame_hdr` was generated on a 64 bit machine.
+    let address_size = 8;
+
+    let _parsed_header = eh_frame_hdr
+        .parse(&bases, address_size)
+        .expect("we can parse the `.eh_frame_hdr` section OK");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"a1fd2890b64fd6c1b6a7e5b18265e9534ee47191c910f69e1f100a9c8af1c3b6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"4b22450aac7688553179f479ad3577006d2d8a0e3e74ac2b9b2030a3eb72147b","src/lib.rs":"731115c0fe1c0aa265944833d88c203fea076e8a996c67d367168b02ad52d90a","tests/glob-std.rs":"b0a0aa11d7b8cc2cc0216fb117a543d6e584eec8b51173994dfd19761ab00a62"},"package":"9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "glob"
-version = "0.3.0"
-authors = ["The Rust Project Developers"]
-description = "Support for matching file paths against Unix shell style patterns.\n"
-homepage = "https://github.com/rust-lang/glob"
-documentation = "https://docs.rs/glob/0.3.0"
-categories = ["filesystem"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/rust-lang/glob"
-[dev-dependencies.tempdir]
-version = "0.3"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2014 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-glob
-====
-
-Support for matching file paths against Unix shell style patterns.
-
-[![Build Status](https://travis-ci.org/rust-lang-nursery/glob.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/glob)
-
-[Documentation](https://doc.rust-lang.org/glob)
-
-## Usage
-
-To use `glob`, add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-glob = "0.3.0"
-```
-
-And add this to your crate root:
-
-```rust
-extern crate glob;
-```
-
-## Examples
-
-Print all jpg files in /media/ and all of its subdirectories.
-
-```rust
-use glob::glob;
-
-for entry in glob("/media/**/*.jpg").expect("Failed to read glob pattern") {
-    match entry {
-        Ok(path) => println!("{:?}", path.display()),
-        Err(e) => println!("{:?}", e),
-    }
-}
-```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1411 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Support for matching file paths against Unix shell style patterns.
-//!
-//! The `glob` and `glob_with` functions allow querying the filesystem for all
-//! files that match a particular pattern (similar to the libc `glob` function).
-//! The methods on the `Pattern` type provide functionality for checking if
-//! individual paths match a particular pattern (similar to the libc `fnmatch`
-//! function).
-//!
-//! For consistency across platforms, and for Windows support, this module
-//! is implemented entirely in Rust rather than deferring to the libc
-//! `glob`/`fnmatch` functions.
-//!
-//! # Examples
-//!
-//! To print all jpg files in `/media/` and all of its subdirectories.
-//!
-//! ```rust,no_run
-//! use glob::glob;
-//!
-//! for entry in glob("/media/**/*.jpg").expect("Failed to read glob pattern") {
-//!     match entry {
-//!         Ok(path) => println!("{:?}", path.display()),
-//!         Err(e) => println!("{:?}", e),
-//!     }
-//! }
-//! ```
-//!
-//! To print all files containing the letter "a", case insensitive, in a `local`
-//! directory relative to the current working directory. This ignores errors
-//! instead of printing them.
-//!
-//! ```rust,no_run
-//! use glob::glob_with;
-//! use glob::MatchOptions;
-//!
-//! let options = MatchOptions {
-//!     case_sensitive: false,
-//!     require_literal_separator: false,
-//!     require_literal_leading_dot: false,
-//! };
-//! for entry in glob_with("local/*a*", options).unwrap() {
-//!     if let Ok(path) = entry {
-//!         println!("{:?}", path.display())
-//!     }
-//! }
-//! ```
-
-#![doc(
-    html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
-    html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://docs.rs/glob/0.3.0"
-)]
-#![deny(missing_docs)]
-#![cfg_attr(all(test, windows), feature(std_misc))]
-
-use std::cmp;
-use std::error::Error;
-use std::fmt;
-use std::fs;
-use std::io;
-use std::path::{self, Component, Path, PathBuf};
-use std::str::FromStr;
-
-use CharSpecifier::{CharRange, SingleChar};
-use MatchResult::{EntirePatternDoesntMatch, Match, SubPatternDoesntMatch};
-use PatternToken::AnyExcept;
-use PatternToken::{AnyChar, AnyRecursiveSequence, AnySequence, AnyWithin, Char};
-
-/// An iterator that yields `Path`s from the filesystem that match a particular
-/// pattern.
-///
-/// Note that it yields `GlobResult` in order to report any `IoErrors` that may
-/// arise during iteration. If a directory matches but is unreadable,
-/// thereby preventing its contents from being checked for matches, a
-/// `GlobError` is returned to express this.
-///
-/// See the `glob` function for more details.
-pub struct Paths {
-    dir_patterns: Vec<Pattern>,
-    require_dir: bool,
-    options: MatchOptions,
-    todo: Vec<Result<(PathBuf, usize), GlobError>>,
-    scope: Option<PathBuf>,
-}
-
-/// Return an iterator that produces all the `Path`s that match the given
-/// pattern using default match options, which may be absolute or relative to
-/// the current working directory.
-///
-/// This may return an error if the pattern is invalid.
-///
-/// This method uses the default match options and is equivalent to calling
-/// `glob_with(pattern, MatchOptions::new())`. Use `glob_with` directly if you
-/// want to use non-default match options.
-///
-/// When iterating, each result is a `GlobResult` which expresses the
-/// possibility that there was an `IoError` when attempting to read the contents
-/// of the matched path.  In other words, each item returned by the iterator
-/// will either be an `Ok(Path)` if the path matched, or an `Err(GlobError)` if
-/// the path (partially) matched _but_ its contents could not be read in order
-/// to determine if its contents matched.
-///
-/// See the `Paths` documentation for more information.
-///
-/// # Examples
-///
-/// Consider a directory `/media/pictures` containing only the files
-/// `kittens.jpg`, `puppies.jpg` and `hamsters.gif`:
-///
-/// ```rust,no_run
-/// use glob::glob;
-///
-/// for entry in glob("/media/pictures/*.jpg").unwrap() {
-///     match entry {
-///         Ok(path) => println!("{:?}", path.display()),
-///
-///         // if the path matched but was unreadable,
-///         // thereby preventing its contents from matching
-///         Err(e) => println!("{:?}", e),
-///     }
-/// }
-/// ```
-///
-/// The above code will print:
-///
-/// ```ignore
-/// /media/pictures/kittens.jpg
-/// /media/pictures/puppies.jpg
-/// ```
-///
-/// If you want to ignore unreadable paths, you can use something like
-/// `filter_map`:
-///
-/// ```rust
-/// use glob::glob;
-/// use std::result::Result;
-///
-/// for path in glob("/media/pictures/*.jpg").unwrap().filter_map(Result::ok) {
-///     println!("{}", path.display());
-/// }
-/// ```
-/// Paths are yielded in alphabetical order.
-pub fn glob(pattern: &str) -> Result<Paths, PatternError> {
-    glob_with(pattern, MatchOptions::new())
-}
-
-/// Return an iterator that produces all the `Path`s that match the given
-/// pattern using the specified match options, which may be absolute or relative
-/// to the current working directory.
-///
-/// This may return an error if the pattern is invalid.
-///
-/// This function accepts Unix shell style patterns as described by
-/// `Pattern::new(..)`.  The options given are passed through unchanged to
-/// `Pattern::matches_with(..)` with the exception that
-/// `require_literal_separator` is always set to `true` regardless of the value
-/// passed to this function.
-///
-/// Paths are yielded in alphabetical order.
-pub fn glob_with(pattern: &str, options: MatchOptions) -> Result<Paths, PatternError> {
-    #[cfg(windows)]
-    fn check_windows_verbatim(p: &Path) -> bool {
-        use std::path::Prefix;
-        match p.components().next() {
-            Some(Component::Prefix(ref p)) => p.kind().is_verbatim(),
-            _ => false,
-        }
-    }
-    #[cfg(not(windows))]
-    fn check_windows_verbatim(_: &Path) -> bool {
-        false
-    }
-
-    #[cfg(windows)]
-    fn to_scope(p: &Path) -> PathBuf {
-        // FIXME handle volume relative paths here
-        p.to_path_buf()
-    }
-    #[cfg(not(windows))]
-    fn to_scope(p: &Path) -> PathBuf {
-        p.to_path_buf()
-    }
-
-    // make sure that the pattern is valid first, else early return with error
-    if let Err(err) = Pattern::new(pattern) {
-        return Err(err);
-    }
-
-    let mut components = Path::new(pattern).components().peekable();
-    loop {
-        match components.peek() {
-            Some(&Component::Prefix(..)) | Some(&Component::RootDir) => {
-                components.next();
-            }
-            _ => break,
-        }
-    }
-    let rest = components.map(|s| s.as_os_str()).collect::<PathBuf>();
-    let normalized_pattern = Path::new(pattern).iter().collect::<PathBuf>();
-    let root_len = normalized_pattern.to_str().unwrap().len() - rest.to_str().unwrap().len();
-    let root = if root_len > 0 {
-        Some(Path::new(&pattern[..root_len]))
-    } else {
-        None
-    };
-
-    if root_len > 0 && check_windows_verbatim(root.unwrap()) {
-        // FIXME: How do we want to handle verbatim paths? I'm inclined to
-        // return nothing, since we can't very well find all UNC shares with a
-        // 1-letter server name.
-        return Ok(Paths {
-            dir_patterns: Vec::new(),
-            require_dir: false,
-            options,
-            todo: Vec::new(),
-            scope: None,
-        });
-    }
-
-    let scope = root.map_or_else(|| PathBuf::from("."), to_scope);
-
-    let mut dir_patterns = Vec::new();
-    let components =
-        pattern[cmp::min(root_len, pattern.len())..].split_terminator(path::is_separator);
-
-    for component in components {
-        dir_patterns.push(Pattern::new(component)?);
-    }
-
-    if root_len == pattern.len() {
-        dir_patterns.push(Pattern {
-            original: "".to_string(),
-            tokens: Vec::new(),
-            is_recursive: false,
-        });
-    }
-
-    let last_is_separator = pattern.chars().next_back().map(path::is_separator);
-    let require_dir = last_is_separator == Some(true);
-    let todo = Vec::new();
-
-    Ok(Paths {
-        dir_patterns,
-        require_dir,
-        options,
-        todo,
-        scope: Some(scope),
-    })
-}
-
-/// A glob iteration error.
-///
-/// This is typically returned when a particular path cannot be read
-/// to determine if its contents match the glob pattern. This is possible
-/// if the program lacks the appropriate permissions, for example.
-#[derive(Debug)]
-pub struct GlobError {
-    path: PathBuf,
-    error: io::Error,
-}
-
-impl GlobError {
-    /// The Path that the error corresponds to.
-    pub fn path(&self) -> &Path {
-        &self.path
-    }
-
-    /// The error in question.
-    pub fn error(&self) -> &io::Error {
-        &self.error
-    }
-
-    /// Consumes self, returning the _raw_ underlying `io::Error`
-    pub fn into_error(self) -> io::Error {
-        self.error
-    }
-}
-
-impl Error for GlobError {
-    fn description(&self) -> &str {
-        self.error.description()
-    }
-
-    fn cause(&self) -> Option<&Error> {
-        Some(&self.error)
-    }
-}
-
-impl fmt::Display for GlobError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "attempting to read `{}` resulted in an error: {}",
-            self.path.display(),
-            self.error
-        )
-    }
-}
-
-fn is_dir(p: &Path) -> bool {
-    fs::metadata(p).map(|m| m.is_dir()).unwrap_or(false)
-}
-
-/// An alias for a glob iteration result.
-///
-/// This represents either a matched path or a glob iteration error,
-/// such as failing to read a particular directory's contents.
-pub type GlobResult = Result<PathBuf, GlobError>;
-
-impl Iterator for Paths {
-    type Item = GlobResult;
-
-    fn next(&mut self) -> Option<GlobResult> {
-        // the todo buffer hasn't been initialized yet, so it's done at this
-        // point rather than in glob() so that the errors are unified that is,
-        // failing to fill the buffer is an iteration error construction of the
-        // iterator (i.e. glob()) only fails if it fails to compile the Pattern
-        if let Some(scope) = self.scope.take() {
-            if !self.dir_patterns.is_empty() {
-                // Shouldn't happen, but we're using -1 as a special index.
-                assert!(self.dir_patterns.len() < !0 as usize);
-
-                fill_todo(&mut self.todo, &self.dir_patterns, 0, &scope, self.options);
-            }
-        }
-
-        loop {
-            if self.dir_patterns.is_empty() || self.todo.is_empty() {
-                return None;
-            }
-
-            let (path, mut idx) = match self.todo.pop().unwrap() {
-                Ok(pair) => pair,
-                Err(e) => return Some(Err(e)),
-            };
-
-            // idx -1: was already checked by fill_todo, maybe path was '.' or
-            // '..' that we can't match here because of normalization.
-            if idx == !0 as usize {
-                if self.require_dir && !is_dir(&path) {
-                    continue;
-                }
-                return Some(Ok(path));
-            }
-
-            if self.dir_patterns[idx].is_recursive {
-                let mut next = idx;
-
-                // collapse consecutive recursive patterns
-                while (next + 1) < self.dir_patterns.len()
-                    && self.dir_patterns[next + 1].is_recursive
-                {
-                    next += 1;
-                }
-
-                if is_dir(&path) {
-                    // the path is a directory, so it's a match
-
-                    // push this directory's contents
-                    fill_todo(
-                        &mut self.todo,
-                        &self.dir_patterns,
-                        next,
-                        &path,
-                        self.options,
-                    );
-
-                    if next == self.dir_patterns.len() - 1 {
-                        // pattern ends in recursive pattern, so return this
-                        // directory as a result
-                        return Some(Ok(path));
-                    } else {
-                        // advanced to the next pattern for this path
-                        idx = next + 1;
-                    }
-                } else if next == self.dir_patterns.len() - 1 {
-                    // not a directory and it's the last pattern, meaning no
-                    // match
-                    continue;
-                } else {
-                    // advanced to the next pattern for this path
-                    idx = next + 1;
-                }
-            }
-
-            // not recursive, so match normally
-            if self.dir_patterns[idx].matches_with(
-                {
-                    match path.file_name().and_then(|s| s.to_str()) {
-                        // FIXME (#9639): How do we handle non-utf8 filenames?
-                        // Ignore them for now; ideally we'd still match them
-                        // against a *
-                        None => continue,
-                        Some(x) => x,
-                    }
-                },
-                self.options,
-            ) {
-                if idx == self.dir_patterns.len() - 1 {
-                    // it is not possible for a pattern to match a directory
-                    // *AND* its children so we don't need to check the
-                    // children
-
-                    if !self.require_dir || is_dir(&path) {
-                        return Some(Ok(path));
-                    }
-                } else {
-                    fill_todo(
-                        &mut self.todo,
-                        &self.dir_patterns,
-                        idx + 1,
-                        &path,
-                        self.options,
-                    );
-                }
-            }
-        }
-    }
-}
-
-/// A pattern parsing error.
-#[derive(Debug)]
-#[allow(missing_copy_implementations)]
-pub struct PatternError {
-    /// The approximate character index of where the error occurred.
-    pub pos: usize,
-
-    /// A message describing the error.
-    pub msg: &'static str,
-}
-
-impl Error for PatternError {
-    fn description(&self) -> &str {
-        self.msg
-    }
-}
-
-impl fmt::Display for PatternError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "Pattern syntax error near position {}: {}",
-            self.pos, self.msg
-        )
-    }
-}
-
-/// A compiled Unix shell style pattern.
-///
-/// - `?` matches any single character.
-///
-/// - `*` matches any (possibly empty) sequence of characters.
-///
-/// - `**` matches the current directory and arbitrary subdirectories. This
-///   sequence **must** form a single path component, so both `**a` and `b**`
-///   are invalid and will result in an error.  A sequence of more than two
-///   consecutive `*` characters is also invalid.
-///
-/// - `[...]` matches any character inside the brackets.  Character sequences
-///   can also specify ranges of characters, as ordered by Unicode, so e.g.
-///   `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
-///   bracket is invalid.
-///
-/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
-///   **not** in the brackets.
-///
-/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
-///   (e.g. `[?]`).  When a `]` occurs immediately following `[` or `[!` then it
-///   is interpreted as being part of, rather then ending, the character set, so
-///   `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively.  The `-`
-///   character can be specified inside a character sequence pattern by placing
-///   it at the start or the end, e.g. `[abc-]`.
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug)]
-pub struct Pattern {
-    original: String,
-    tokens: Vec<PatternToken>,
-    is_recursive: bool,
-}
-
-/// Show the original glob pattern.
-impl fmt::Display for Pattern {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.original.fmt(f)
-    }
-}
-
-impl FromStr for Pattern {
-    type Err = PatternError;
-
-    fn from_str(s: &str) -> Result<Self, PatternError> {
-        Self::new(s)
-    }
-}
-
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
-enum PatternToken {
-    Char(char),
-    AnyChar,
-    AnySequence,
-    AnyRecursiveSequence,
-    AnyWithin(Vec<CharSpecifier>),
-    AnyExcept(Vec<CharSpecifier>),
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
-enum CharSpecifier {
-    SingleChar(char),
-    CharRange(char, char),
-}
-
-#[derive(Copy, Clone, PartialEq)]
-enum MatchResult {
-    Match,
-    SubPatternDoesntMatch,
-    EntirePatternDoesntMatch,
-}
-
-const ERROR_WILDCARDS: &str = "wildcards are either regular `*` or recursive `**`";
-const ERROR_RECURSIVE_WILDCARDS: &str = "recursive wildcards must form a single path \
-                                         component";
-const ERROR_INVALID_RANGE: &str = "invalid range pattern";
-
-impl Pattern {
-    /// This function compiles Unix shell style patterns.
-    ///
-    /// An invalid glob pattern will yield a `PatternError`.
-    pub fn new(pattern: &str) -> Result<Self, PatternError> {
-        let chars = pattern.chars().collect::<Vec<_>>();
-        let mut tokens = Vec::new();
-        let mut is_recursive = false;
-        let mut i = 0;
-
-        while i < chars.len() {
-            match chars[i] {
-                '?' => {
-                    tokens.push(AnyChar);
-                    i += 1;
-                }
-                '*' => {
-                    let old = i;
-
-                    while i < chars.len() && chars[i] == '*' {
-                        i += 1;
-                    }
-
-                    let count = i - old;
-
-                    if count > 2 {
-                        return Err(PatternError {
-                            pos: old + 2,
-                            msg: ERROR_WILDCARDS,
-                        });
-                    } else if count == 2 {
-                        // ** can only be an entire path component
-                        // i.e. a/**/b is valid, but a**/b or a/**b is not
-                        // invalid matches are treated literally
-                        let is_valid = if i == 2 || path::is_separator(chars[i - count - 1]) {
-                            // it ends in a '/'
-                            if i < chars.len() && path::is_separator(chars[i]) {
-                                i += 1;
-                                true
-                            // or the pattern ends here
-                            // this enables the existing globbing mechanism
-                            } else if i == chars.len() {
-                                true
-                            // `**` ends in non-separator
-                            } else {
-                                return Err(PatternError {
-                                    pos: i,
-                                    msg: ERROR_RECURSIVE_WILDCARDS,
-                                });
-                            }
-                        // `**` begins with non-separator
-                        } else {
-                            return Err(PatternError {
-                                pos: old - 1,
-                                msg: ERROR_RECURSIVE_WILDCARDS,
-                            });
-                        };
-
-                        let tokens_len = tokens.len();
-
-                        if is_valid {
-                            // collapse consecutive AnyRecursiveSequence to a
-                            // single one
-                            if !(tokens_len > 1 && tokens[tokens_len - 1] == AnyRecursiveSequence) {
-                                is_recursive = true;
-                                tokens.push(AnyRecursiveSequence);
-                            }
-                        }
-                    } else {
-                        tokens.push(AnySequence);
-                    }
-                }
-                '[' => {
-                    if i + 4 <= chars.len() && chars[i + 1] == '!' {
-                        match chars[i + 3..].iter().position(|x| *x == ']') {
-                            None => (),
-                            Some(j) => {
-                                let chars = &chars[i + 2..i + 3 + j];
-                                let cs = parse_char_specifiers(chars);
-                                tokens.push(AnyExcept(cs));
-                                i += j + 4;
-                                continue;
-                            }
-                        }
-                    } else if i + 3 <= chars.len() && chars[i + 1] != '!' {
-                        match chars[i + 2..].iter().position(|x| *x == ']') {
-                            None => (),
-                            Some(j) => {
-                                let cs = parse_char_specifiers(&chars[i + 1..i + 2 + j]);
-                                tokens.push(AnyWithin(cs));
-                                i += j + 3;
-                                continue;
-                            }
-                        }
-                    }
-
-                    // if we get here then this is not a valid range pattern
-                    return Err(PatternError {
-                        pos: i,
-                        msg: ERROR_INVALID_RANGE,
-                    });
-                }
-                c => {
-                    tokens.push(Char(c));
-                    i += 1;
-                }
-            }
-        }
-
-        Ok(Self {
-            tokens,
-            original: pattern.to_string(),
-            is_recursive,
-        })
-    }
-
-    /// Escape metacharacters within the given string by surrounding them in
-    /// brackets. The resulting string will, when compiled into a `Pattern`,
-    /// match the input string and nothing else.
-    pub fn escape(s: &str) -> String {
-        let mut escaped = String::new();
-        for c in s.chars() {
-            match c {
-                // note that ! does not need escaping because it is only special
-                // inside brackets
-                '?' | '*' | '[' | ']' => {
-                    escaped.push('[');
-                    escaped.push(c);
-                    escaped.push(']');
-                }
-                c => {
-                    escaped.push(c);
-                }
-            }
-        }
-        escaped
-    }
-
-    /// Return if the given `str` matches this `Pattern` using the default
-    /// match options (i.e. `MatchOptions::new()`).
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use glob::Pattern;
-    ///
-    /// assert!(Pattern::new("c?t").unwrap().matches("cat"));
-    /// assert!(Pattern::new("k[!e]tteh").unwrap().matches("kitteh"));
-    /// assert!(Pattern::new("d*g").unwrap().matches("doog"));
-    /// ```
-    pub fn matches(&self, str: &str) -> bool {
-        self.matches_with(str, MatchOptions::new())
-    }
-
-    /// Return if the given `Path`, when converted to a `str`, matches this
-    /// `Pattern` using the default match options (i.e. `MatchOptions::new()`).
-    pub fn matches_path(&self, path: &Path) -> bool {
-        // FIXME (#9639): This needs to handle non-utf8 paths
-        path.to_str().map_or(false, |s| self.matches(s))
-    }
-
-    /// Return if the given `str` matches this `Pattern` using the specified
-    /// match options.
-    pub fn matches_with(&self, str: &str, options: MatchOptions) -> bool {
-        self.matches_from(true, str.chars(), 0, options) == Match
-    }
-
-    /// Return if the given `Path`, when converted to a `str`, matches this
-    /// `Pattern` using the specified match options.
-    pub fn matches_path_with(&self, path: &Path, options: MatchOptions) -> bool {
-        // FIXME (#9639): This needs to handle non-utf8 paths
-        path.to_str()
-            .map_or(false, |s| self.matches_with(s, options))
-    }
-
-    /// Access the original glob pattern.
-    pub fn as_str(&self) -> &str {
-        &self.original
-    }
-
-    fn matches_from(
-        &self,
-        mut follows_separator: bool,
-        mut file: std::str::Chars,
-        i: usize,
-        options: MatchOptions,
-    ) -> MatchResult {
-        for (ti, token) in self.tokens[i..].iter().enumerate() {
-            match *token {
-                AnySequence | AnyRecursiveSequence => {
-                    // ** must be at the start.
-                    debug_assert!(match *token {
-                        AnyRecursiveSequence => follows_separator,
-                        _ => true,
-                    });
-
-                    // Empty match
-                    match self.matches_from(follows_separator, file.clone(), i + ti + 1, options) {
-                        SubPatternDoesntMatch => (), // keep trying
-                        m => return m,
-                    };
-
-                    while let Some(c) = file.next() {
-                        if follows_separator && options.require_literal_leading_dot && c == '.' {
-                            return SubPatternDoesntMatch;
-                        }
-                        follows_separator = path::is_separator(c);
-                        match *token {
-                            AnyRecursiveSequence if !follows_separator => continue,
-                            AnySequence
-                                if options.require_literal_separator && follows_separator =>
-                            {
-                                return SubPatternDoesntMatch
-                            }
-                            _ => (),
-                        }
-                        match self.matches_from(
-                            follows_separator,
-                            file.clone(),
-                            i + ti + 1,
-                            options,
-                        ) {
-                            SubPatternDoesntMatch => (), // keep trying
-                            m => return m,
-                        }
-                    }
-                }
-                _ => {
-                    let c = match file.next() {
-                        Some(c) => c,
-                        None => return EntirePatternDoesntMatch,
-                    };
-
-                    let is_sep = path::is_separator(c);
-
-                    if !match *token {
-                        AnyChar | AnyWithin(..) | AnyExcept(..)
-                            if (options.require_literal_separator && is_sep)
-                                || (follows_separator
-                                    && options.require_literal_leading_dot
-                                    && c == '.') =>
-                        {
-                            false
-                        }
-                        AnyChar => true,
-                        AnyWithin(ref specifiers) => in_char_specifiers(&specifiers, c, options),
-                        AnyExcept(ref specifiers) => !in_char_specifiers(&specifiers, c, options),
-                        Char(c2) => chars_eq(c, c2, options.case_sensitive),
-                        AnySequence | AnyRecursiveSequence => unreachable!(),
-                    } {
-                        return SubPatternDoesntMatch;
-                    }
-                    follows_separator = is_sep;
-                }
-            }
-        }
-
-        // Iter is fused.
-        if file.next().is_none() {
-            Match
-        } else {
-            SubPatternDoesntMatch
-        }
-    }
-}
-
-// Fills `todo` with paths under `path` to be matched by `patterns[idx]`,
-// special-casing patterns to match `.` and `..`, and avoiding `readdir()`
-// calls when there are no metacharacters in the pattern.
-fn fill_todo(
-    todo: &mut Vec<Result<(PathBuf, usize), GlobError>>,
-    patterns: &[Pattern],
-    idx: usize,
-    path: &Path,
-    options: MatchOptions,
-) {
-    // convert a pattern that's just many Char(_) to a string
-    fn pattern_as_str(pattern: &Pattern) -> Option<String> {
-        let mut s = String::new();
-        for token in &pattern.tokens {
-            match *token {
-                Char(c) => s.push(c),
-                _ => return None,
-            }
-        }
-
-        Some(s)
-    }
-
-    let add = |todo: &mut Vec<_>, next_path: PathBuf| {
-        if idx + 1 == patterns.len() {
-            // We know it's good, so don't make the iterator match this path
-            // against the pattern again. In particular, it can't match
-            // . or .. globs since these never show up as path components.
-            todo.push(Ok((next_path, !0 as usize)));
-        } else {
-            fill_todo(todo, patterns, idx + 1, &next_path, options);
-        }
-    };
-
-    let pattern = &patterns[idx];
-    let is_dir = is_dir(path);
-    let curdir = path == Path::new(".");
-    match pattern_as_str(pattern) {
-        Some(s) => {
-            // This pattern component doesn't have any metacharacters, so we
-            // don't need to read the current directory to know where to
-            // continue. So instead of passing control back to the iterator,
-            // we can just check for that one entry and potentially recurse
-            // right away.
-            let special = "." == s || ".." == s;
-            let next_path = if curdir {
-                PathBuf::from(s)
-            } else {
-                path.join(&s)
-            };
-            if (special && is_dir) || (!special && fs::metadata(&next_path).is_ok()) {
-                add(todo, next_path);
-            }
-        }
-        None if is_dir => {
-            let dirs = fs::read_dir(path).and_then(|d| {
-                d.map(|e| {
-                    e.map(|e| {
-                        if curdir {
-                            PathBuf::from(e.path().file_name().unwrap())
-                        } else {
-                            e.path()
-                        }
-                    })
-                })
-                .collect::<Result<Vec<_>, _>>()
-            });
-            match dirs {
-                Ok(mut children) => {
-                    children.sort_by(|p1, p2| p2.file_name().cmp(&p1.file_name()));
-                    todo.extend(children.into_iter().map(|x| Ok((x, idx))));
-
-                    // Matching the special directory entries . and .. that
-                    // refer to the current and parent directory respectively
-                    // requires that the pattern has a leading dot, even if the
-                    // `MatchOptions` field `require_literal_leading_dot` is not
-                    // set.
-                    if !pattern.tokens.is_empty() && pattern.tokens[0] == Char('.') {
-                        for &special in &[".", ".."] {
-                            if pattern.matches_with(special, options) {
-                                add(todo, path.join(special));
-                            }
-                        }
-                    }
-                }
-                Err(e) => {
-                    todo.push(Err(GlobError {
-                        path: path.to_path_buf(),
-                        error: e,
-                    }));
-                }
-            }
-        }
-        None => {
-            // not a directory, nothing more to find
-        }
-    }
-}
-
-fn parse_char_specifiers(s: &[char]) -> Vec<CharSpecifier> {
-    let mut cs = Vec::new();
-    let mut i = 0;
-    while i < s.len() {
-        if i + 3 <= s.len() && s[i + 1] == '-' {
-            cs.push(CharRange(s[i], s[i + 2]));
-            i += 3;
-        } else {
-            cs.push(SingleChar(s[i]));
-            i += 1;
-        }
-    }
-    cs
-}
-
-fn in_char_specifiers(specifiers: &[CharSpecifier], c: char, options: MatchOptions) -> bool {
-    for &specifier in specifiers.iter() {
-        match specifier {
-            SingleChar(sc) => {
-                if chars_eq(c, sc, options.case_sensitive) {
-                    return true;
-                }
-            }
-            CharRange(start, end) => {
-                // FIXME: work with non-ascii chars properly (issue #1347)
-                if !options.case_sensitive && c.is_ascii() && start.is_ascii() && end.is_ascii() {
-                    let start = start.to_ascii_lowercase();
-                    let end = end.to_ascii_lowercase();
-
-                    let start_up = start.to_uppercase().next().unwrap();
-                    let end_up = end.to_uppercase().next().unwrap();
-
-                    // only allow case insensitive matching when
-                    // both start and end are within a-z or A-Z
-                    if start != start_up && end != end_up {
-                        let c = c.to_ascii_lowercase();
-                        if c >= start && c <= end {
-                            return true;
-                        }
-                    }
-                }
-
-                if c >= start && c <= end {
-                    return true;
-                }
-            }
-        }
-    }
-
-    false
-}
-
-/// A helper function to determine if two chars are (possibly case-insensitively) equal.
-fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool {
-    if cfg!(windows) && path::is_separator(a) && path::is_separator(b) {
-        true
-    } else if !case_sensitive && a.is_ascii() && b.is_ascii() {
-        // FIXME: work with non-ascii chars properly (issue #9084)
-        a.to_ascii_lowercase() == b.to_ascii_lowercase()
-    } else {
-        a == b
-    }
-}
-
-/// Configuration options to modify the behaviour of `Pattern::matches_with(..)`.
-#[allow(missing_copy_implementations)]
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub struct MatchOptions {
-    /// Whether or not patterns should be matched in a case-sensitive manner.
-    /// This currently only considers upper/lower case relationships between
-    /// ASCII characters, but in future this might be extended to work with
-    /// Unicode.
-    pub case_sensitive: bool,
-
-    /// Whether or not path-component separator characters (e.g. `/` on
-    /// Posix) must be matched by a literal `/`, rather than by `*` or `?` or
-    /// `[...]`.
-    pub require_literal_separator: bool,
-
-    /// Whether or not paths that contain components that start with a `.`
-    /// will require that `.` appears literally in the pattern; `*`, `?`, `**`,
-    /// or `[...]` will not match. This is useful because such files are
-    /// conventionally considered hidden on Unix systems and it might be
-    /// desirable to skip them when listing files.
-    pub require_literal_leading_dot: bool,
-}
-
-impl MatchOptions {
-    /// Constructs a new `MatchOptions` with default field values. This is used
-    /// when calling functions that do not take an explicit `MatchOptions`
-    /// parameter.
-    ///
-    /// This function always returns this value:
-    ///
-    /// ```rust,ignore
-    /// MatchOptions {
-    ///     case_sensitive: true,
-    ///     require_literal_separator: false,
-    ///     require_literal_leading_dot: false
-    /// }
-    /// ```
-    pub fn new() -> Self {
-        Self {
-            case_sensitive: true,
-            require_literal_separator: false,
-            require_literal_leading_dot: false,
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::{glob, MatchOptions, Pattern};
-    use std::path::Path;
-
-    #[test]
-    fn test_pattern_from_str() {
-        assert!("a*b".parse::<Pattern>().unwrap().matches("a_b"));
-        assert!("a/**b".parse::<Pattern>().unwrap_err().pos == 4);
-    }
-
-    #[test]
-    fn test_wildcard_errors() {
-        assert!(Pattern::new("a/**b").unwrap_err().pos == 4);
-        assert!(Pattern::new("a/bc**").unwrap_err().pos == 3);
-        assert!(Pattern::new("a/*****").unwrap_err().pos == 4);
-        assert!(Pattern::new("a/b**c**d").unwrap_err().pos == 2);
-        assert!(Pattern::new("a**b").unwrap_err().pos == 0);
-    }
-
-    #[test]
-    fn test_unclosed_bracket_errors() {
-        assert!(Pattern::new("abc[def").unwrap_err().pos == 3);
-        assert!(Pattern::new("abc[!def").unwrap_err().pos == 3);
-        assert!(Pattern::new("abc[").unwrap_err().pos == 3);
-        assert!(Pattern::new("abc[!").unwrap_err().pos == 3);
-        assert!(Pattern::new("abc[d").unwrap_err().pos == 3);
-        assert!(Pattern::new("abc[!d").unwrap_err().pos == 3);
-        assert!(Pattern::new("abc[]").unwrap_err().pos == 3);
-        assert!(Pattern::new("abc[!]").unwrap_err().pos == 3);
-    }
-
-    #[test]
-    fn test_glob_errors() {
-        assert!(glob("a/**b").err().unwrap().pos == 4);
-        assert!(glob("abc[def").err().unwrap().pos == 3);
-    }
-
-    // this test assumes that there is a /root directory and that
-    // the user running this test is not root or otherwise doesn't
-    // have permission to read its contents
-    #[cfg(all(unix, not(target_os = "macos")))]
-    #[test]
-    fn test_iteration_errors() {
-        use std::io;
-        let mut iter = glob("/root/*").unwrap();
-
-        // GlobErrors shouldn't halt iteration
-        let next = iter.next();
-        assert!(next.is_some());
-
-        let err = next.unwrap();
-        assert!(err.is_err());
-
-        let err = err.err().unwrap();
-        assert!(err.path() == Path::new("/root"));
-        assert!(err.error().kind() == io::ErrorKind::PermissionDenied);
-    }
-
-    #[test]
-    fn test_absolute_pattern() {
-        assert!(glob("/").unwrap().next().is_some());
-        assert!(glob("//").unwrap().next().is_some());
-
-        // assume that the filesystem is not empty!
-        assert!(glob("/*").unwrap().next().is_some());
-
-        #[cfg(not(windows))]
-        fn win() {}
-
-        #[cfg(windows)]
-        fn win() {
-            use std::env::current_dir;
-            use std::ffi::AsOsStr;
-
-            // check windows absolute paths with host/device components
-            let root_with_device = current_dir()
-                .ok()
-                .and_then(|p| p.prefix().map(|p| p.join("*")))
-                .unwrap();
-            // FIXME (#9639): This needs to handle non-utf8 paths
-            assert!(glob(root_with_device.as_os_str().to_str().unwrap())
-                .unwrap()
-                .next()
-                .is_some());
-        }
-        win()
-    }
-
-    #[test]
-    fn test_wildcards() {
-        assert!(Pattern::new("a*b").unwrap().matches("a_b"));
-        assert!(Pattern::new("a*b*c").unwrap().matches("abc"));
-        assert!(!Pattern::new("a*b*c").unwrap().matches("abcd"));
-        assert!(Pattern::new("a*b*c").unwrap().matches("a_b_c"));
-        assert!(Pattern::new("a*b*c").unwrap().matches("a___b___c"));
-        assert!(Pattern::new("abc*abc*abc")
-            .unwrap()
-            .matches("abcabcabcabcabcabcabc"));
-        assert!(!Pattern::new("abc*abc*abc")
-            .unwrap()
-            .matches("abcabcabcabcabcabcabca"));
-        assert!(Pattern::new("a*a*a*a*a*a*a*a*a")
-            .unwrap()
-            .matches("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
-        assert!(Pattern::new("a*b[xyz]c*d").unwrap().matches("abxcdbxcddd"));
-    }
-
-    #[test]
-    fn test_recursive_wildcards() {
-        let pat = Pattern::new("some/**/needle.txt").unwrap();
-        assert!(pat.matches("some/needle.txt"));
-        assert!(pat.matches("some/one/needle.txt"));
-        assert!(pat.matches("some/one/two/needle.txt"));
-        assert!(pat.matches("some/other/needle.txt"));
-        assert!(!pat.matches("some/other/notthis.txt"));
-
-        // a single ** should be valid, for globs
-        // Should accept anything
-        let pat = Pattern::new("**").unwrap();
-        assert!(pat.is_recursive);
-        assert!(pat.matches("abcde"));
-        assert!(pat.matches(""));
-        assert!(pat.matches(".asdf"));
-        assert!(pat.matches("/x/.asdf"));
-
-        // collapse consecutive wildcards
-        let pat = Pattern::new("some/**/**/needle.txt").unwrap();
-        assert!(pat.matches("some/needle.txt"));
-        assert!(pat.matches("some/one/needle.txt"));
-        assert!(pat.matches("some/one/two/needle.txt"));
-        assert!(pat.matches("some/other/needle.txt"));
-        assert!(!pat.matches("some/other/notthis.txt"));
-
-        // ** can begin the pattern
-        let pat = Pattern::new("**/test").unwrap();
-        assert!(pat.matches("one/two/test"));
-        assert!(pat.matches("one/test"));
-        assert!(pat.matches("test"));
-
-        // /** can begin the pattern
-        let pat = Pattern::new("/**/test").unwrap();
-        assert!(pat.matches("/one/two/test"));
-        assert!(pat.matches("/one/test"));
-        assert!(pat.matches("/test"));
-        assert!(!pat.matches("/one/notthis"));
-        assert!(!pat.matches("/notthis"));
-
-        // Only start sub-patterns on start of path segment.
-        let pat = Pattern::new("**/.*").unwrap();
-        assert!(pat.matches(".abc"));
-        assert!(pat.matches("abc/.abc"));
-        assert!(!pat.matches("ab.c"));
-        assert!(!pat.matches("abc/ab.c"));
-    }
-
-    #[test]
-    fn test_lots_of_files() {
-        // this is a good test because it touches lots of differently named files
-        glob("/*/*/*/*").unwrap().skip(10000).next();
-    }
-
-    #[test]
-    fn test_range_pattern() {
-        let pat = Pattern::new("a[0-9]b").unwrap();
-        for i in 0..10 {
-            assert!(pat.matches(&format!("a{}b", i)));
-        }
-        assert!(!pat.matches("a_b"));
-
-        let pat = Pattern::new("a[!0-9]b").unwrap();
-        for i in 0..10 {
-            assert!(!pat.matches(&format!("a{}b", i)));
-        }
-        assert!(pat.matches("a_b"));
-
-        let pats = ["[a-z123]", "[1a-z23]", "[123a-z]"];
-        for &p in pats.iter() {
-            let pat = Pattern::new(p).unwrap();
-            for c in "abcdefghijklmnopqrstuvwxyz".chars() {
-                assert!(pat.matches(&c.to_string()));
-            }
-            for c in "ABCDEFGHIJKLMNOPQRSTUVWXYZ".chars() {
-                let options = MatchOptions {
-                    case_sensitive: false,
-                    ..MatchOptions::new()
-                };
-                assert!(pat.matches_with(&c.to_string(), options));
-            }
-            assert!(pat.matches("1"));
-            assert!(pat.matches("2"));
-            assert!(pat.matches("3"));
-        }
-
-        let pats = ["[abc-]", "[-abc]", "[a-c-]"];
-        for &p in pats.iter() {
-            let pat = Pattern::new(p).unwrap();
-            assert!(pat.matches("a"));
-            assert!(pat.matches("b"));
-            assert!(pat.matches("c"));
-            assert!(pat.matches("-"));
-            assert!(!pat.matches("d"));
-        }
-
-        let pat = Pattern::new("[2-1]").unwrap();
-        assert!(!pat.matches("1"));
-        assert!(!pat.matches("2"));
-
-        assert!(Pattern::new("[-]").unwrap().matches("-"));
-        assert!(!Pattern::new("[!-]").unwrap().matches("-"));
-    }
-
-    #[test]
-    fn test_pattern_matches() {
-        let txt_pat = Pattern::new("*hello.txt").unwrap();
-        assert!(txt_pat.matches("hello.txt"));
-        assert!(txt_pat.matches("gareth_says_hello.txt"));
-        assert!(txt_pat.matches("some/path/to/hello.txt"));
-        assert!(txt_pat.matches("some\\path\\to\\hello.txt"));
-        assert!(txt_pat.matches("/an/absolute/path/to/hello.txt"));
-        assert!(!txt_pat.matches("hello.txt-and-then-some"));
-        assert!(!txt_pat.matches("goodbye.txt"));
-
-        let dir_pat = Pattern::new("*some/path/to/hello.txt").unwrap();
-        assert!(dir_pat.matches("some/path/to/hello.txt"));
-        assert!(dir_pat.matches("a/bigger/some/path/to/hello.txt"));
-        assert!(!dir_pat.matches("some/path/to/hello.txt-and-then-some"));
-        assert!(!dir_pat.matches("some/other/path/to/hello.txt"));
-    }
-
-    #[test]
-    fn test_pattern_escape() {
-        let s = "_[_]_?_*_!_";
-        assert_eq!(Pattern::escape(s), "_[[]_[]]_[?]_[*]_!_".to_string());
-        assert!(Pattern::new(&Pattern::escape(s)).unwrap().matches(s));
-    }
-
-    #[test]
-    fn test_pattern_matches_case_insensitive() {
-        let pat = Pattern::new("aBcDeFg").unwrap();
-        let options = MatchOptions {
-            case_sensitive: false,
-            require_literal_separator: false,
-            require_literal_leading_dot: false,
-        };
-
-        assert!(pat.matches_with("aBcDeFg", options));
-        assert!(pat.matches_with("abcdefg", options));
-        assert!(pat.matches_with("ABCDEFG", options));
-        assert!(pat.matches_with("AbCdEfG", options));
-    }
-
-    #[test]
-    fn test_pattern_matches_case_insensitive_range() {
-        let pat_within = Pattern::new("[a]").unwrap();
-        let pat_except = Pattern::new("[!a]").unwrap();
-
-        let options_case_insensitive = MatchOptions {
-            case_sensitive: false,
-            require_literal_separator: false,
-            require_literal_leading_dot: false,
-        };
-        let options_case_sensitive = MatchOptions {
-            case_sensitive: true,
-            require_literal_separator: false,
-            require_literal_leading_dot: false,
-        };
-
-        assert!(pat_within.matches_with("a", options_case_insensitive));
-        assert!(pat_within.matches_with("A", options_case_insensitive));
-        assert!(!pat_within.matches_with("A", options_case_sensitive));
-
-        assert!(!pat_except.matches_with("a", options_case_insensitive));
-        assert!(!pat_except.matches_with("A", options_case_insensitive));
-        assert!(pat_except.matches_with("A", options_case_sensitive));
-    }
-
-    #[test]
-    fn test_pattern_matches_require_literal_separator() {
-        let options_require_literal = MatchOptions {
-            case_sensitive: true,
-            require_literal_separator: true,
-            require_literal_leading_dot: false,
-        };
-        let options_not_require_literal = MatchOptions {
-            case_sensitive: true,
-            require_literal_separator: false,
-            require_literal_leading_dot: false,
-        };
-
-        assert!(Pattern::new("abc/def")
-            .unwrap()
-            .matches_with("abc/def", options_require_literal));
-        assert!(!Pattern::new("abc?def")
-            .unwrap()
-            .matches_with("abc/def", options_require_literal));
-        assert!(!Pattern::new("abc*def")
-            .unwrap()
-            .matches_with("abc/def", options_require_literal));
-        assert!(!Pattern::new("abc[/]def")
-            .unwrap()
-            .matches_with("abc/def", options_require_literal));
-
-        assert!(Pattern::new("abc/def")
-            .unwrap()
-            .matches_with("abc/def", options_not_require_literal));
-        assert!(Pattern::new("abc?def")
-            .unwrap()
-            .matches_with("abc/def", options_not_require_literal));
-        assert!(Pattern::new("abc*def")
-            .unwrap()
-            .matches_with("abc/def", options_not_require_literal));
-        assert!(Pattern::new("abc[/]def")
-            .unwrap()
-            .matches_with("abc/def", options_not_require_literal));
-    }
-
-    #[test]
-    fn test_pattern_matches_require_literal_leading_dot() {
-        let options_require_literal_leading_dot = MatchOptions {
-            case_sensitive: true,
-            require_literal_separator: false,
-            require_literal_leading_dot: true,
-        };
-        let options_not_require_literal_leading_dot = MatchOptions {
-            case_sensitive: true,
-            require_literal_separator: false,
-            require_literal_leading_dot: false,
-        };
-
-        let f = |options| {
-            Pattern::new("*.txt")
-                .unwrap()
-                .matches_with(".hello.txt", options)
-        };
-        assert!(f(options_not_require_literal_leading_dot));
-        assert!(!f(options_require_literal_leading_dot));
-
-        let f = |options| {
-            Pattern::new(".*.*")
-                .unwrap()
-                .matches_with(".hello.txt", options)
-        };
-        assert!(f(options_not_require_literal_leading_dot));
-        assert!(f(options_require_literal_leading_dot));
-
-        let f = |options| {
-            Pattern::new("aaa/bbb/*")
-                .unwrap()
-                .matches_with("aaa/bbb/.ccc", options)
-        };
-        assert!(f(options_not_require_literal_leading_dot));
-        assert!(!f(options_require_literal_leading_dot));
-
-        let f = |options| {
-            Pattern::new("aaa/bbb/*")
-                .unwrap()
-                .matches_with("aaa/bbb/c.c.c.", options)
-        };
-        assert!(f(options_not_require_literal_leading_dot));
-        assert!(f(options_require_literal_leading_dot));
-
-        let f = |options| {
-            Pattern::new("aaa/bbb/.*")
-                .unwrap()
-                .matches_with("aaa/bbb/.ccc", options)
-        };
-        assert!(f(options_not_require_literal_leading_dot));
-        assert!(f(options_require_literal_leading_dot));
-
-        let f = |options| {
-            Pattern::new("aaa/?bbb")
-                .unwrap()
-                .matches_with("aaa/.bbb", options)
-        };
-        assert!(f(options_not_require_literal_leading_dot));
-        assert!(!f(options_require_literal_leading_dot));
-
-        let f = |options| {
-            Pattern::new("aaa/[.]bbb")
-                .unwrap()
-                .matches_with("aaa/.bbb", options)
-        };
-        assert!(f(options_not_require_literal_leading_dot));
-        assert!(!f(options_require_literal_leading_dot));
-
-        let f = |options| Pattern::new("**/*").unwrap().matches_with(".bbb", options);
-        assert!(f(options_not_require_literal_leading_dot));
-        assert!(!f(options_require_literal_leading_dot));
-    }
-
-    #[test]
-    fn test_matches_path() {
-        // on windows, (Path::new("a/b").as_str().unwrap() == "a\\b"), so this
-        // tests that / and \ are considered equivalent on windows
-        assert!(Pattern::new("a/b").unwrap().matches_path(&Path::new("a/b")));
-    }
-
-    #[test]
-    fn test_path_join() {
-        let pattern = Path::new("one").join(&Path::new("**/*.rs"));
-        assert!(Pattern::new(pattern.to_str().unwrap()).is_ok());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/tests/glob-std.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/tests/glob-std.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/glob/tests/glob-std.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/glob/tests/glob-std.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,377 +0,0 @@
-// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-windows TempDir may cause IoError on windows: #10462
-
-#![cfg_attr(test, deny(warnings))]
-
-extern crate glob;
-extern crate tempdir;
-
-use glob::glob;
-use std::env;
-use std::fs;
-use std::path::PathBuf;
-use tempdir::TempDir;
-
-#[test]
-fn main() {
-    fn mk_file(path: &str, directory: bool) {
-        if directory {
-            fs::create_dir(path).unwrap();
-        } else {
-            fs::File::create(path).unwrap();
-        }
-    }
-
-    fn glob_vec(pattern: &str) -> Vec<PathBuf> {
-        glob(pattern).unwrap().map(|r| r.unwrap()).collect()
-    }
-
-    let root = TempDir::new("glob-tests");
-    let root = root.ok().expect("Should have created a temp directory");
-    assert!(env::set_current_dir(root.path()).is_ok());
-
-    mk_file("aaa", true);
-    mk_file("aaa/apple", true);
-    mk_file("aaa/orange", true);
-    mk_file("aaa/tomato", true);
-    mk_file("aaa/tomato/tomato.txt", false);
-    mk_file("aaa/tomato/tomoto.txt", false);
-    mk_file("bbb", true);
-    mk_file("bbb/specials", true);
-    mk_file("bbb/specials/!", false);
-
-    // windows does not allow `*` or `?` characters to exist in filenames
-    if env::consts::FAMILY != "windows" {
-        mk_file("bbb/specials/*", false);
-        mk_file("bbb/specials/?", false);
-    }
-
-    mk_file("bbb/specials/[", false);
-    mk_file("bbb/specials/]", false);
-    mk_file("ccc", true);
-    mk_file("xyz", true);
-    mk_file("xyz/x", false);
-    mk_file("xyz/y", false);
-    mk_file("xyz/z", false);
-
-    mk_file("r", true);
-    mk_file("r/current_dir.md", false);
-    mk_file("r/one", true);
-    mk_file("r/one/a.md", false);
-    mk_file("r/one/another", true);
-    mk_file("r/one/another/a.md", false);
-    mk_file("r/one/another/deep", true);
-    mk_file("r/one/another/deep/spelunking.md", false);
-    mk_file("r/another", true);
-    mk_file("r/another/a.md", false);
-    mk_file("r/two", true);
-    mk_file("r/two/b.md", false);
-    mk_file("r/three", true);
-    mk_file("r/three/c.md", false);
-
-    // all recursive entities
-    assert_eq!(
-        glob_vec("r/**"),
-        vec!(
-            PathBuf::from("r/another"),
-            PathBuf::from("r/one"),
-            PathBuf::from("r/one/another"),
-            PathBuf::from("r/one/another/deep"),
-            PathBuf::from("r/three"),
-            PathBuf::from("r/two")
-        )
-    );
-
-    // collapse consecutive recursive patterns
-    assert_eq!(
-        glob_vec("r/**/**"),
-        vec!(
-            PathBuf::from("r/another"),
-            PathBuf::from("r/one"),
-            PathBuf::from("r/one/another"),
-            PathBuf::from("r/one/another/deep"),
-            PathBuf::from("r/three"),
-            PathBuf::from("r/two")
-        )
-    );
-
-    assert_eq!(
-        glob_vec("r/**/*"),
-        vec!(
-            PathBuf::from("r/another"),
-            PathBuf::from("r/another/a.md"),
-            PathBuf::from("r/current_dir.md"),
-            PathBuf::from("r/one"),
-            PathBuf::from("r/one/a.md"),
-            PathBuf::from("r/one/another"),
-            PathBuf::from("r/one/another/a.md"),
-            PathBuf::from("r/one/another/deep"),
-            PathBuf::from("r/one/another/deep/spelunking.md"),
-            PathBuf::from("r/three"),
-            PathBuf::from("r/three/c.md"),
-            PathBuf::from("r/two"),
-            PathBuf::from("r/two/b.md")
-        )
-    );
-
-    // followed by a wildcard
-    assert_eq!(
-        glob_vec("r/**/*.md"),
-        vec!(
-            PathBuf::from("r/another/a.md"),
-            PathBuf::from("r/current_dir.md"),
-            PathBuf::from("r/one/a.md"),
-            PathBuf::from("r/one/another/a.md"),
-            PathBuf::from("r/one/another/deep/spelunking.md"),
-            PathBuf::from("r/three/c.md"),
-            PathBuf::from("r/two/b.md")
-        )
-    );
-
-    // followed by a precise pattern
-    assert_eq!(
-        glob_vec("r/one/**/a.md"),
-        vec!(
-            PathBuf::from("r/one/a.md"),
-            PathBuf::from("r/one/another/a.md")
-        )
-    );
-
-    // followed by another recursive pattern
-    // collapses consecutive recursives into one
-    assert_eq!(
-        glob_vec("r/one/**/**/a.md"),
-        vec!(
-            PathBuf::from("r/one/a.md"),
-            PathBuf::from("r/one/another/a.md")
-        )
-    );
-
-    // followed by two precise patterns
-    assert_eq!(
-        glob_vec("r/**/another/a.md"),
-        vec!(
-            PathBuf::from("r/another/a.md"),
-            PathBuf::from("r/one/another/a.md")
-        )
-    );
-
-    assert_eq!(glob_vec(""), Vec::<PathBuf>::new());
-    assert_eq!(glob_vec("."), vec!(PathBuf::from(".")));
-    assert_eq!(glob_vec(".."), vec!(PathBuf::from("..")));
-
-    assert_eq!(glob_vec("aaa"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("aaa/"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("a"), Vec::<PathBuf>::new());
-    assert_eq!(glob_vec("aa"), Vec::<PathBuf>::new());
-    assert_eq!(glob_vec("aaaa"), Vec::<PathBuf>::new());
-
-    assert_eq!(glob_vec("aaa/apple"), vec!(PathBuf::from("aaa/apple")));
-    assert_eq!(glob_vec("aaa/apple/nope"), Vec::<PathBuf>::new());
-
-    // windows should support both / and \ as directory separators
-    if env::consts::FAMILY == "windows" {
-        assert_eq!(glob_vec("aaa\\apple"), vec!(PathBuf::from("aaa/apple")));
-    }
-
-    assert_eq!(
-        glob_vec("???/"),
-        vec!(
-            PathBuf::from("aaa"),
-            PathBuf::from("bbb"),
-            PathBuf::from("ccc"),
-            PathBuf::from("xyz")
-        )
-    );
-
-    assert_eq!(
-        glob_vec("aaa/tomato/tom?to.txt"),
-        vec!(
-            PathBuf::from("aaa/tomato/tomato.txt"),
-            PathBuf::from("aaa/tomato/tomoto.txt")
-        )
-    );
-
-    assert_eq!(
-        glob_vec("xyz/?"),
-        vec!(
-            PathBuf::from("xyz/x"),
-            PathBuf::from("xyz/y"),
-            PathBuf::from("xyz/z")
-        )
-    );
-
-    assert_eq!(glob_vec("a*"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("*a*"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("a*a"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("aaa*"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("*aaa"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("*aaa*"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("*a*a*a*"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("aaa*/"), vec!(PathBuf::from("aaa")));
-
-    assert_eq!(
-        glob_vec("aaa/*"),
-        vec!(
-            PathBuf::from("aaa/apple"),
-            PathBuf::from("aaa/orange"),
-            PathBuf::from("aaa/tomato")
-        )
-    );
-
-    assert_eq!(
-        glob_vec("aaa/*a*"),
-        vec!(
-            PathBuf::from("aaa/apple"),
-            PathBuf::from("aaa/orange"),
-            PathBuf::from("aaa/tomato")
-        )
-    );
-
-    assert_eq!(
-        glob_vec("*/*/*.txt"),
-        vec!(
-            PathBuf::from("aaa/tomato/tomato.txt"),
-            PathBuf::from("aaa/tomato/tomoto.txt")
-        )
-    );
-
-    assert_eq!(
-        glob_vec("*/*/t[aob]m?to[.]t[!y]t"),
-        vec!(
-            PathBuf::from("aaa/tomato/tomato.txt"),
-            PathBuf::from("aaa/tomato/tomoto.txt")
-        )
-    );
-
-    assert_eq!(glob_vec("./aaa"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("./*"), glob_vec("*"));
-    assert_eq!(glob_vec("*/..").pop().unwrap(), PathBuf::from("xyz/.."));
-    assert_eq!(glob_vec("aaa/../bbb"), vec!(PathBuf::from("aaa/../bbb")));
-    assert_eq!(glob_vec("nonexistent/../bbb"), Vec::<PathBuf>::new());
-    assert_eq!(glob_vec("aaa/tomato/tomato.txt/.."), Vec::<PathBuf>::new());
-
-    assert_eq!(glob_vec("aaa/tomato/tomato.txt/"), Vec::<PathBuf>::new());
-
-    assert_eq!(glob_vec("aa[a]"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("aa[abc]"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("a[bca]a"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("aa[b]"), Vec::<PathBuf>::new());
-    assert_eq!(glob_vec("aa[xyz]"), Vec::<PathBuf>::new());
-    assert_eq!(glob_vec("aa[]]"), Vec::<PathBuf>::new());
-
-    assert_eq!(glob_vec("aa[!b]"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("aa[!bcd]"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("a[!bcd]a"), vec!(PathBuf::from("aaa")));
-    assert_eq!(glob_vec("aa[!a]"), Vec::<PathBuf>::new());
-    assert_eq!(glob_vec("aa[!abc]"), Vec::<PathBuf>::new());
-
-    assert_eq!(
-        glob_vec("bbb/specials/[[]"),
-        vec!(PathBuf::from("bbb/specials/["))
-    );
-    assert_eq!(
-        glob_vec("bbb/specials/!"),
-        vec!(PathBuf::from("bbb/specials/!"))
-    );
-    assert_eq!(
-        glob_vec("bbb/specials/[]]"),
-        vec!(PathBuf::from("bbb/specials/]"))
-    );
-
-    if env::consts::FAMILY != "windows" {
-        assert_eq!(
-            glob_vec("bbb/specials/[*]"),
-            vec!(PathBuf::from("bbb/specials/*"))
-        );
-        assert_eq!(
-            glob_vec("bbb/specials/[?]"),
-            vec!(PathBuf::from("bbb/specials/?"))
-        );
-    }
-
-    if env::consts::FAMILY == "windows" {
-        assert_eq!(
-            glob_vec("bbb/specials/[![]"),
-            vec!(
-                PathBuf::from("bbb/specials/!"),
-                PathBuf::from("bbb/specials/]")
-            )
-        );
-
-        assert_eq!(
-            glob_vec("bbb/specials/[!]]"),
-            vec!(
-                PathBuf::from("bbb/specials/!"),
-                PathBuf::from("bbb/specials/[")
-            )
-        );
-
-        assert_eq!(
-            glob_vec("bbb/specials/[!!]"),
-            vec!(
-                PathBuf::from("bbb/specials/["),
-                PathBuf::from("bbb/specials/]")
-            )
-        );
-    } else {
-        assert_eq!(
-            glob_vec("bbb/specials/[![]"),
-            vec!(
-                PathBuf::from("bbb/specials/!"),
-                PathBuf::from("bbb/specials/*"),
-                PathBuf::from("bbb/specials/?"),
-                PathBuf::from("bbb/specials/]")
-            )
-        );
-
-        assert_eq!(
-            glob_vec("bbb/specials/[!]]"),
-            vec!(
-                PathBuf::from("bbb/specials/!"),
-                PathBuf::from("bbb/specials/*"),
-                PathBuf::from("bbb/specials/?"),
-                PathBuf::from("bbb/specials/[")
-            )
-        );
-
-        assert_eq!(
-            glob_vec("bbb/specials/[!!]"),
-            vec!(
-                PathBuf::from("bbb/specials/*"),
-                PathBuf::from("bbb/specials/?"),
-                PathBuf::from("bbb/specials/["),
-                PathBuf::from("bbb/specials/]")
-            )
-        );
-
-        assert_eq!(
-            glob_vec("bbb/specials/[!*]"),
-            vec!(
-                PathBuf::from("bbb/specials/!"),
-                PathBuf::from("bbb/specials/?"),
-                PathBuf::from("bbb/specials/["),
-                PathBuf::from("bbb/specials/]")
-            )
-        );
-
-        assert_eq!(
-            glob_vec("bbb/specials/[!?]"),
-            vec!(
-                PathBuf::from("bbb/specials/!"),
-                PathBuf::from("bbb/specials/*"),
-                PathBuf::from("bbb/specials/["),
-                PathBuf::from("bbb/specials/]")
-            )
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"8f6e178bbd656dcaaf6b46c7504a19329683f57710ddb660fa63a7808cf1a300","Cargo.toml":"e3e68f73bd83c95becaf166433f1b4b291e78ffdc34cda6ccd1b18afc8c0a086","LICENSE":"036bf6b6d6fd6dd1abda2ff6cdb672a63bdf32c468048720072910f2268a965f","README.md":"1183034ed26b83e7a90418d94cdf547c00cb25262d3ab0f617d9d48d05fcc970","etc/crt1.rs":"50667c3066e00f92e038bfa4fe6968f49a31d7c6986e19c7c9e695ad9b836f74","etc/crt132.rs":"e69920ceeab57958a1890979158b57fc43f33c5a135b5798d43664c989c8c686","etc/crt1a.rs":"d158350f72aaf4fecd8501735d2f33a1a226e99bf370c794b90f7e9882c8ca64","src/archive/mod.rs":"98010c5219d5236642c10c3d02b582d022161df3d1cad7cb2dcddc4833bff02d","src/elf/compression_header.rs":"2eb5fdda9177c1c897310d86714967de019b39c6e23b1f3a890dd3a659be0acc","src/elf/constants_header.rs":"cdd0eea9f4617f86f14b57dccf5124ae62376df6efe2bf617f95e4b24c176d1d","src/elf/constants_relocation.rs":"a010071cd2a25ab71e0c7181eb1d9f417daa2d1ec25a09c74bd12ad944892225","src/elf/dynamic.rs":"3e219d6dbb06848b3b2434a87947ff1e6f076181e111f46a5b5c931fb7911b76","src/elf/gnu_hash.rs":"78448d3f43e8bfa9f7245822dd11c9cb07d93eaff783803057d0d58f9459c7ab","src/elf/header.rs":"833b788de75ff1208e61921d68ef1ebd312889392be16945ca6cc05215de5101","src/elf/mod.rs":"fa180bb72d51dfec4d24d46892e55a71b4dda1bc9cc785f993ff81921ee1afa5","src/elf/note.rs":"5dee1981a07d27dbaa9f5ecd801471ab4a2d979c535eb600840310ccc1970c14","src/elf/program_header.rs":"bdd0bed87a501632a7154c87592c4e8aeeb21c63c628266d5a56d44bc7d0e34c","src/elf/reloc.rs":"21a62befca789545d8b28c1e62c9900c25c90ef7015b5af0f0d7f97e03765743","src/elf/section_header.rs":"5f833c9b7caa9ee5a804d29d7e6483e7ce89c992d85befeb4cd91a875d7288ee","src/elf/sym.rs":"0d22f98836be123f65a5431ac1c0292f5527d93bbfb247d6cedfe8858d5ddb18","src/error.rs":"8b165408f86eb88d0d3f5764d2bb3cbe947c3b9dbfd90dec4af5d849e4f6fb53","src/lib.rs":"7a910d4e057bfb73620f6b6d43bc7a798060be7eda9200cbd4ff5119a614306d","src/mach/bind_opcodes.rs":"1dcacfb853d05c2c7e6dbb4509ee705a8ea645db0d334991a2293fef92eee851","src/mach/constants.rs":"2c5491d16820774fd6ffb803ba2ca3980d0f92385ed9637dc09ddaed3db6dbf8","src/mach/exports.rs":"85ca2951e71acd7f866c546d0372a4f31724b23608eb36769d010c53d166e466","src/mach/fat.rs":"a3dba2fe677abac912fdcd2b2a05386cc6272a463e340f26f59a2481122b9447","src/mach/header.rs":"ae15265e9f1a92eb9ba04333e5bb309f276e1300b87f43386f7829e820318938","src/mach/imports.rs":"b31580907f6668bfcfa7b93bee6e5fd411ba0de87dd6e51ff71d8ecd698ee1c3","src/mach/load_command.rs":"6b372f70346887a1ef5c15d9a1459587fb21137b7423879648829ceda609fdcb","src/mach/mod.rs":"cc6ef8860922ef9209325cb46b242181161196cbda79c1977ff51a3d462b3d56","src/mach/relocation.rs":"11b0b76ed7d997c87e396100515f931fe84473c228bed0e980fbab311530070a","src/mach/segment.rs":"b4b268af55c480be7d71539be76f5a5f596624ffcd8e5ef67faab00e760584a2","src/mach/symbols.rs":"08279209de4a8faa553be36880c06c241a0252ad2c36fef9002fbe734f63ea5d","src/pe/characteristic.rs":"6f810a6e5646b922cf7e3ca6d314677a4e1e1ad5695278c2b1b527a05f4299f3","src/pe/data_directories.rs":"d2e3c242155a65a175b26ff5eaf9d37da13c0f32a9240c86986ee46014277edb","src/pe/debug.rs":"60ca79a261018c08cf8d591cc96f7bc86796ec897d9ff9eda8226f08fb4370b5","src/pe/exception.rs":"8a6df093df08aa13c30122436e42c5434d5da691956c6c2372a30adfc0089b5c","src/pe/export.rs":"a76869cd8ea29af7eb99eff3b30515a532ac359ea437673e60db0eeee77c4604","src/pe/header.rs":"015033515c6e0bdebe0270bc493b4f59f2f629e9203dd764f304db1fb5e69d11","src/pe/import.rs":"e2263fe614242feb18d0e34a0f4db11e96dbf96a8558ba39c351e4fba75a8a1d","src/pe/mod.rs":"bcc52551a901730da90e3b68db0c4fba81e067ccba0ac02dc806ce46d282fae5","src/pe/optional_header.rs":"f3fb9aec04fccde3b765ec3d54cb27bfe636efceb94ddbe34e88098e28f56b55","src/pe/relocation.rs":"c479b80bb1d6910f2168505dda4f2d8925b7edc34bed4e25d069546f88f52bb3","src/pe/section_table.rs":"d7144c7be3242d7aa653d22dca1cf15f7110f79a946a15cbe6ecf531e0cacb19","src/pe/symbol.rs":"145bbda536293bc5e809068d4175c9eb7ba8bbe2942c0b5fa7c6ed62cb2c10d3","src/pe/utils.rs":"c44ae85e3828584187f1f2ab5a59d1b8fca2425604a104198d5a94b550cfee24","src/strtab.rs":"fa1e67a0a67fe07773f558b3b5faaabcc004ecbb4862302e983a14ce31e0f9bd","tests/archive.rs":"6d011cac702e2718da84f762645a78410a2d131122bf00837d8b1e1b3c5ce1f9","tests/bins/elf/gnu_hash/README.md":"1d98f6c0e03e063edf206f4f3059c4ebec68ade4b87fac1b2f33fac3470c5f0a","tests/bins/elf/gnu_hash/hello.so":"3e532c4148aad235b575400f00b09b9a95bc32cb6f5f8bf88fe316922603edf7","tests/bins/elf/gnu_hash/hello32.so":"6638a3830e138a959647acf6af05c3b5894feb7ce3e61174a428c3944fedb773","tests/bins/elf/gnu_hash/helloworld.c":"57c86d98028accddd6210281e8bddccf21755d997c118270761dbccf38abe6b3","tests/compare_dyldinfos.rs":"7499f27590d08e6ea2846efcedc53c66709bab81fafce3f070ca3119fbfb2162","tests/elf.rs":"66584365682e51d7ee5c5d109e57fd3cf849130a158f5d2398b369d7fa9401e8","tests/macho.rs":"b893a63323327c6253e256e2229be9c766a528263cfd4eaf7fecf2d2e7d20cfa"},"package":"d20fd25aa456527ce4f544271ae4fea65d2eda4a6561ea56f39fb3ee4f7e3884"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"0f57f9422b0264a594ed8e2d3300a5d47c7b06e69598a39e65754928815fe5ce","Cargo.toml":"ad28abfbdeadd05a8527e833c5cb772651f552f466e5e81fbec44db481f1866d","LICENSE":"036bf6b6d6fd6dd1abda2ff6cdb672a63bdf32c468048720072910f2268a965f","README.md":"25a1fc29ad0b2d07fb0b7887b8692ebbff308edb81031360adc7443ac91c5fc8","etc/crt1.rs":"50667c3066e00f92e038bfa4fe6968f49a31d7c6986e19c7c9e695ad9b836f74","etc/crt132.rs":"e69920ceeab57958a1890979158b57fc43f33c5a135b5798d43664c989c8c686","etc/crt1a.rs":"d158350f72aaf4fecd8501735d2f33a1a226e99bf370c794b90f7e9882c8ca64","src/archive/mod.rs":"db96ffa2b059a7ad36428fe81747095be5c887947885db35f84a389f943f5a83","src/elf/compression_header.rs":"2eb5fdda9177c1c897310d86714967de019b39c6e23b1f3a890dd3a659be0acc","src/elf/constants_header.rs":"cdd0eea9f4617f86f14b57dccf5124ae62376df6efe2bf617f95e4b24c176d1d","src/elf/constants_relocation.rs":"a010071cd2a25ab71e0c7181eb1d9f417daa2d1ec25a09c74bd12ad944892225","src/elf/dynamic.rs":"725dba82bd6e3a7b110bbbe91fba813e363f6a3939be22b379d733287142e1b6","src/elf/gnu_hash.rs":"7a9fcaf6cb38167d20527364bdf9bc2379c44dede5d7666275a1eb20dc665179","src/elf/header.rs":"833b788de75ff1208e61921d68ef1ebd312889392be16945ca6cc05215de5101","src/elf/mod.rs":"54efb36cc255de35b7bb63f2cad302dc4a8f99e323188a63fd94f23dcb869250","src/elf/note.rs":"223adb981498b0f8e24af3b8616f2e1942d20b9329bc05c68183e32048fad026","src/elf/program_header.rs":"89d70363ab478de51d161076da6fbc7d90015ce129088f161a3c558b93b7d19c","src/elf/reloc.rs":"a4b7843c0e201f83c344c0681dfd285754a7211e3472ddd53024a520e17c847f","src/elf/section_header.rs":"d9e90d5c7a2820f6a5bbe644610c52e23d00a68d62d74840f83350d612e2acc0","src/elf/sym.rs":"0d22f98836be123f65a5431ac1c0292f5527d93bbfb247d6cedfe8858d5ddb18","src/error.rs":"5b9f68814f816f679bbc10f812b9eabbd34bf72daf994f2a40a54021800de4e0","src/lib.rs":"f592c9fb610e910b0eece8b7ee8685eed7de8556bb4d8df43c0fd55109b3304b","src/mach/bind_opcodes.rs":"1dcacfb853d05c2c7e6dbb4509ee705a8ea645db0d334991a2293fef92eee851","src/mach/constants.rs":"c2a2381a0b9c3047d37582465e8965d995dca414d0da21fb7bcc6b8334e49eb6","src/mach/exports.rs":"85ca2951e71acd7f866c546d0372a4f31724b23608eb36769d010c53d166e466","src/mach/fat.rs":"a3dba2fe677abac912fdcd2b2a05386cc6272a463e340f26f59a2481122b9447","src/mach/header.rs":"ae15265e9f1a92eb9ba04333e5bb309f276e1300b87f43386f7829e820318938","src/mach/imports.rs":"b31580907f6668bfcfa7b93bee6e5fd411ba0de87dd6e51ff71d8ecd698ee1c3","src/mach/load_command.rs":"51e4a744bac16ff5e8f2b44716add516b454071e2754a8e662557df6a53e1ee7","src/mach/mod.rs":"7bedfeb5f5364e8d80930b9e6efc7436ad368652422b3e3e36e9e731fefd5dfc","src/mach/relocation.rs":"11b0b76ed7d997c87e396100515f931fe84473c228bed0e980fbab311530070a","src/mach/segment.rs":"b4b268af55c480be7d71539be76f5a5f596624ffcd8e5ef67faab00e760584a2","src/mach/symbols.rs":"08279209de4a8faa553be36880c06c241a0252ad2c36fef9002fbe734f63ea5d","src/pe/characteristic.rs":"6f810a6e5646b922cf7e3ca6d314677a4e1e1ad5695278c2b1b527a05f4299f3","src/pe/data_directories.rs":"d4e156f0c5b509860ceb3c7d42e1621e6c2143b90fc412806b3cefab1acc577a","src/pe/debug.rs":"66889cf5cb4d6613d1aea6188f0b7365322408b5ec059a37eaa70cd2696a3a24","src/pe/exception.rs":"de2c9c07812ecd315c8400fc8fdcadc6a44d7a8be96e69a3f4ccf14ef8cf8426","src/pe/export.rs":"a1fe9e69359ddf788d3659c91a250927e5174a9aad0b705074ed5c72b931d2cb","src/pe/header.rs":"015033515c6e0bdebe0270bc493b4f59f2f629e9203dd764f304db1fb5e69d11","src/pe/import.rs":"855276e46c01ccd7631104e4d1265592e36c9468aadcacc937a40c29d94aabe3","src/pe/mod.rs":"ec34e74ff62b96462bbfb33c29b0637d4a060de1f3391ee8b148a531237f626d","src/pe/optional_header.rs":"f3fb9aec04fccde3b765ec3d54cb27bfe636efceb94ddbe34e88098e28f56b55","src/pe/options.rs":"b38f4e87f13ae381712621786f89e931452b2b4857a7bb6f140c4c21a63aa652","src/pe/relocation.rs":"c479b80bb1d6910f2168505dda4f2d8925b7edc34bed4e25d069546f88f52bb3","src/pe/section_table.rs":"d7144c7be3242d7aa653d22dca1cf15f7110f79a946a15cbe6ecf531e0cacb19","src/pe/symbol.rs":"9ea92c5b18ae9071925c2a73140966febcd6aa0f91ebe41ec88cd4802ff06654","src/pe/utils.rs":"6a461256238288ac1ca0472eccf8f57be3297b7a7086509c5417bba7db94ddfb","src/strtab.rs":"a00fae65f7db30366fb8c21ea3a9283bbbb17e43b34ff14f979e39ce9991e6e9","tests/archive.rs":"0db22942024f0829a2682d64a3e8da83caaa47f70ea07e4c2c218507de2f522e","tests/bins/elf/gnu_hash/README.md":"52581e2ea7067a55bd8aedf4079200fb76448573ae9ffef7d886b9556e980db9","tests/bins/elf/gnu_hash/hello.so":"3e532c4148aad235b575400f00b09b9a95bc32cb6f5f8bf88fe316922603edf7","tests/bins/elf/gnu_hash/hello32.so":"6638a3830e138a959647acf6af05c3b5894feb7ce3e61174a428c3944fedb773","tests/bins/elf/gnu_hash/helloworld.c":"57c86d98028accddd6210281e8bddccf21755d997c118270761dbccf38abe6b3","tests/compare_dyldinfos.rs":"d8e27f984ed99eb328dc08e9293403f9c4a2dcd9cce28b03f777306304ca529f","tests/elf.rs":"4c54e9de1e9b09e244d8cd490ae2e4862d061e1a828f2b4c51d330c2034202c8","tests/macho.rs":"b893a63323327c6253e256e2229be9c766a528263cfd4eaf7fecf2d2e7d20cfa"},"package":"0b1800b95efee8ad4ef04517d4d69f8e209e763b1668f1179aeeedd0e454da55"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "goblin"
-version = "0.2.3"
+version = "0.4.2"
 authors = ["m4b <m4b.github.io@gmail.com>", "seu <seu@panopticon.re>", "Will Glynn <will@willglynn.com>", "Philip Craig <philipjcraig@gmail.com>", "Lzu Tao <taolzu@gmail.com>"]
 include = ["/etc", "/src", "/tests", "/build.rs", "/CHANGELOG.md", "/Cargo.toml", "/LICENSE", "/README.md"]
 description = "An impish, cross-platform, ELF, Mach-o, and PE binary parsing and loading crate"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,60 @@
 
 Before 1.0, this project does not adhere to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-Goblin is now 0.1, which means we will try our best to ease breaking changes. Tracking issue is here: https://github.com/m4b/goblin/issues/97
+Goblin is now 0.4, which means we will try our best to ease breaking changes. Tracking issue is here: https://github.com/m4b/goblin/issues/97
+
+## [0.4.2] - 2021-7-4
+### Added
+- strtab: preparses the string table to prevent certain class of DoS attacks, thanks @Lichtsto: https://github.com/m4b/goblin/pull/275
+
+## [0.4.1] - 2021-5-30
+### Fixed
+- elf: fix error when alloc, but not endian, thanks @dancrossnyc: https://github.com/m4b/goblin/pull/273
+
+## [0.4.0] - 2021-4-11
+### BREAKING
+- elf: fix returning invalid ranges for SH_NOBIT sections,
+  method changed to return optional range instead, thanks @Tiwalun: https://github.com/m4b/goblin/pull/253
+### Fixed
+  pe: pass parse opts correctly in pe parser in lookup table, fixes some issues loading and parsing pe libraries: https://github.com/m4b/goblin/pull/268
+  elf: remove unnecessary unsafe blocks, thanks @nico-abram: https://github.com/m4b/goblin/pull/261
+  elf: replace pub type with pub use, thanks @sollyucko: https://github.com/m4b/goblin/pull/259
+### Added
+  elf: add a lazy parse example, thanks @jesseui: https://github.com/m4b/goblin/pull/258
+  elf: add a new fuzzing harness + fix overflows in hash functions and note data iterator construction, thanks @Mrmaxmeier: https://github.com/m4b/goblin/pull/260
+
+## [0.3.4] - 2021-1-31
+### Added
+- elf: introduce "lazy" parsing of elf structure with new lazy_parse function, which allows user to fill in parts of the ELF struct they need later on; new example provided, as well as some tests, thanks @jessehui: https://github.com/m4b/goblin/pull/254
+- elf: also add new `Elf::parse_header` convenience function, which allows to parse elf header from bytes without e.g., explicitly depending on scroll, etc.
+
+## [0.3.3] - 2021-1-31
+### Fixed
+- mach: fix debug print panic, thanks @messense: https://github.com/m4b/goblin/pull/251
+### Added
+- pe: allow pe virtual memory resolve to be optional, allowing memory/process dump parsing, thanks @ko1n (as well as patience for very long time to merge PR!): https://github.com/m4b/goblin/pull/188
+
+## [0.3.2] - 2021-1-29
+### Fixed
+- elf: overflow panic when note name is 0, thanks @glandium: https://github.com/m4b/goblin/pull/256
+
+## [0.3.1] - 2021-1-18
+### Added
+- mach: add rpaths, thanks @keith: https://github.com/m4b/goblin/pull/248
+### Fixed
+- elf: fix regression parsing binaries like busybox (https://github.com/m4b/bingrep/issues/28), thanks @jan-auer: https://github.com/m4b/goblin/pull/249
+
+## [0.3.0] - 2020-11-26
+### BREAKING
+- mach: add missing load commands, and fixup minversion enum and api, thanks @woodruffw !: https://github.com/m4b/goblin/pull/240
+### Fixed
+- elf: prevent overflow in bad section sizes, thanks @jackcmay: https://github.com/m4b/goblin/pull/243
+- `Object::parse` no longer needs `std`! thanks @Evian-Zhang: https://github.com/m4b/goblin/pull/235
+-  test: remove hardcoded CommandLineTools path in macos test, thanks @quake: https://github.com/m4b/goblin/pull/238
+- build: Resolve clippy lints, thanks @connorkuehl: https://github.com/m4b/goblin/pull/225
+### Added
+- elf: add the x86-64 unwind processor specific section header type https://github.com/m4b/goblin/pull/224
+- elf: Add ability to get archive members by index https://github.com/m4b/goblin/pull/225
 
 ## [0.2.3] - 2020-5-10
 ### Fixed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -20,13 +20,13 @@
 
 ### Usage
 
-Goblin requires `rustc` 1.36.0.
+Goblin requires `rustc` 1.40.0.
 
 Add to your `Cargo.toml`
 
 ```toml
 [dependencies]
-goblin = "0.2"
+goblin = "0.4"
 ```
 
 ### Features
@@ -74,6 +74,8 @@
 
 <!-- Related projects  -->
 
+[occlum]: https://github.com/occlum/occlum
+[memflow]: https://github.com/memflow/memflow
 [cargo-sym]: https://github.com/m4b/cargo-sym
 [bingrep]: https://github.com/m4b/bingrep
 [faerie]: https://github.com/m4b/faerie
@@ -104,73 +106,105 @@
 
 In lexicographic order:
 
+- [@2vg]
 - [@amanieu]
 - [@burjui]
 - [@connorkuehl]
+- [@dancrossnyc]
 - [@ExPixel]
+- [@Evian-Zhang]
 - [@flanfly]
+- [@glandium]
 - [@ibabushkin]
 - [@jackcmay]
 - [@jan-auer]
+- [@jessehui]
 - [@jdub]
 - [@jrmuizel]
 - [@jsgf]
+- [@keith]
 - [@kjempelodott]
+- [@ko1n]
 - [@le-jzr]
+- [@Lichtso]
 - [@lion128]
 - [@llogiq]
 - [@lzutao]
 - [@lzybkr]
 - [@m4b]
+- [@messense]
 - [@mitsuhiko]
 - [@mre]
+- [@Mrmaxmeier]
+- [@nico-abram]
 - [@pchickey]
 - [@philipc]
 - [@Pzixel]
+- [@quake]
 - [@raindev]
 - [@rocallahan]
 - [@sanxiyn]
+- [@sollyucko]
 - [@tathanhdinh]
 - [@Techno-coder]
 - [@ticki]
+- [@Timmmm]
+- [@Tiwalun]
 - [@wickerwacka]
 - [@willglynn]
+- [@woodruffw]
 - [@wyxloading]
 - [@xcoldhandsx]
 
 <!-- Contributors -->
 
+[@2vg]: https://github.com/2vg
 [@amanieu]: https://github.com/amanieu
 [@burjui]: https://github.com/burjui
 [@connorkuehl]: https://github.com/connorkuehl
+[@dancrossnyc]: https://github.com/dancrossnyc
+[@Evian-Zhang]: https://github.com/Evian-Zhang
 [@ExPixel]: https://github.com/ExPixel
 [@flanfly]: https://github.com/flanfly
+[@glandium]: https://github.com/glandium
 [@ibabushkin]: https://github.com/ibabushkin
 [@jackcmay]: https://github.com/jackcmay
 [@jan-auer]: https://github.com/jan-auer
+[@jessehui]: https://github.com/jessehui
 [@jdub]: https://github.com/jdub
 [@jrmuizel]: https://github.com/jrmuizel
 [@jsgf]: https://github.com/jsgf
+[@keith]: https://github.com/keith
 [@kjempelodott]: https://github.com/kjempelodott
+[@ko1N]: https://github.com/ko1N
 [@le-jzr]: https://github.com/le-jzr
+[@Lichtso]: https://github.com/Lichtso
 [@lion128]: https://github.com/lion128
 [@llogiq]: https://github.com/llogiq
 [@lzutao]: https://github.com/lzutao
 [@lzybkr]: https://github.com/lzybkr
 [@m4b]: https://github.com/m4b
+[@messense]: https://github.com/messense
 [@mitsuhiko]: https://github.com/mitsuhiko
 [@mre]: https://github.com/mre
+[@Mrmaxmeier]: https://github.com/Mrmaxmeier
+[@nico-abram]: https://github.com/nico-abram
 [@pchickey]: https://github.com/pchickey
 [@philipc]: https://github.com/philipc
 [@Pzixel]: https://github.com/Pzixel
+[@quake]: https://github.com/quake
 [@raindev]: https://github.com/raindev
 [@rocallahan]: https://github.com/rocallahan
 [@sanxiyn]: https://github.com/sanxiyn
+[@sollyucko]: https://github.com/sollyucko
 [@tathanhdinh]: https://github.com/tathanhdinh
 [@Techno-coder]: https://github.com/Techno-coder
 [@ticki]: https://github.com/ticki
+[@Timmmm]: https://github.com/Timmmm
+[@Tiwalun]: https://github.com/Tiwalun
 [@wickerwacka]: https://github.com/wickerwaka
 [@willglynn]: https://github.com/willglynn
+[@woodruffw]: https://github.com/woodruffw
 [@wyxloading]: https://github.com/wyxloading
 [@xcoldhandsx]: https://github.com/xcoldhandsx
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/archive/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/archive/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/archive/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/archive/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -282,8 +282,8 @@
             let string_offset: u32 = buffer.pread_with(i * 8 + 4, scroll::LE)?;
             let archive_member: u32 = buffer.pread_with(i * 8 + 8, scroll::LE)?;
 
-            let string = match strtab.get(string_offset as usize) {
-                Some(result) => result,
+            let string = match strtab.get_at(string_offset as usize) {
+                Some(result) => Ok(result),
                 None => Err(Error::Malformed(format!(
                     "{} entry {} has string offset {}, which is out of bounds",
                     BSD_SYMDEF_NAME, i, string_offset
@@ -353,8 +353,8 @@
         let idx = name.trim_start_matches('/').trim_end();
         match usize::from_str_radix(idx, 10) {
             Ok(idx) => {
-                let name = match self.strtab.get(idx + 1) {
-                    Some(result) => result,
+                let name = match self.strtab.get_at(idx + 1) {
+                    Some(result) => Ok(result),
                     None => Err(Error::Malformed(format!(
                         "Name {} is out of range in archive NameIndex",
                         name
@@ -402,8 +402,10 @@
     // debugging
     index: Index<'a>,
     sysv_name_index: NameIndex<'a>,
-    // the array of members, which are indexed by the members hash and symbol index
+    // The array of members, which are indexed by the members hash and symbol index.
+    // These are in the same order they are found in the file.
     member_array: Vec<Member<'a>>,
+    // file name -> member
     members: BTreeMap<&'a str, usize>,
     // symbol -> member
     symbol_index: BTreeMap<&'a str, usize>,
@@ -513,7 +515,9 @@
         })
     }
 
-    /// Get the member named `member` in this archive, if any
+    /// Get the member named `member` in this archive, if any. If there are
+    /// multiple files in the archive with the same name it only returns one
+    /// of them.
     pub fn get(&self, member: &str) -> Option<&Member> {
         if let Some(idx) = self.members.get(member) {
             Some(&self.member_array[*idx])
@@ -522,6 +526,16 @@
         }
     }
 
+    /// Get the member at position `index` in this archive, if any.
+    pub fn get_at(&self, index: usize) -> Option<&Member> {
+        self.member_array.get(index)
+    }
+
+    /// Return the number of archive members.
+    pub fn len(&self) -> usize {
+        self.member_array.len()
+    }
+
     /// Returns a slice of the raw bytes for the given `member` in the scrollable `buffer`
     pub fn extract<'b>(&self, member: &str, buffer: &'b [u8]) -> Result<&'b [u8]> {
         if let Some(member) = self.get(member) {
@@ -553,6 +567,11 @@
     }
 
     /// Get the list of member names in this archive
+    ///
+    /// This returns members in alphabetical order, not in the order they
+    /// occurred in the archive. If there are multiple files with the same
+    /// name, the size of the returned array will be less than the size of
+    /// `len()`.
     pub fn members(&self) -> Vec<&'a str> {
         self.members.keys().cloned().collect()
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/dynamic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/dynamic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/dynamic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/dynamic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -453,7 +453,7 @@
             let mut needed = Vec::with_capacity(count);
             for dynamic in &self.dyns {
                 if dynamic.d_tag as u64 == DT_NEEDED {
-                    if let Some(Ok(lib)) = strtab.get(dynamic.d_val as usize) {
+                    if let Some(lib) = strtab.get_at(dynamic.d_val as usize) {
                         needed.push(lib)
                     } else {
                         warn!("Invalid DT_NEEDED {}", dynamic.d_val)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/gnu_hash.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/gnu_hash.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/gnu_hash.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/gnu_hash.rs	2021-12-09 12:01:26.000000000 +0000
@@ -154,6 +154,7 @@
             }
 
             /// Locate the hash chain, and corresponding hash value element.
+            #[cold]
             fn lookup(&self, symbol: &str, hash: u32, dynstrtab: &Strtab) -> Option<&'a Sym> {
                 const MASK_LOWEST_BIT: u32 = 0xffff_fffe;
                 let bucket = self.buckets[hash as usize % self.buckets.len()];
@@ -209,7 +210,6 @@
                 dynstrtab: &Strtab,
             ) -> Option<&'a Sym> {
                 if self.check_maybe_match(hash) {
-                    #[cold] // HACK: This is trick for `unlikely` in C
                     self.lookup(symbol, hash, dynstrtab)
                 } else {
                     None
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -69,15 +69,15 @@
     use alloc::vec::Vec;
     use core::cmp;
 
-    pub type Header = header::Header;
-    pub type ProgramHeader = program_header::ProgramHeader;
-    pub type SectionHeader = section_header::SectionHeader;
-    pub type Symtab<'a> = sym::Symtab<'a>;
-    pub type Sym = sym::Sym;
-    pub type Dyn = dynamic::Dyn;
-    pub type Dynamic = dynamic::Dynamic;
-    pub type Reloc = reloc::Reloc;
-    pub type RelocSection<'a> = reloc::RelocSection<'a>;
+    pub use header::Header;
+    pub use program_header::ProgramHeader;
+    pub use section_header::SectionHeader;
+    pub use sym::Symtab;
+    pub use sym::Sym;
+    pub use dynamic::Dyn;
+    pub use dynamic::Dynamic;
+    pub use reloc::Reloc;
+    pub use reloc::RelocSection;
 
     pub type ProgramHeaders = Vec<ProgramHeader>;
     pub type SectionHeaders = Vec<SectionHeader>;
@@ -145,7 +145,7 @@
                     iters.push(note::NoteDataIterator {
                         data,
                         offset,
-                        size: offset + phdr.p_filesz as usize,
+                        size: offset.saturating_add(phdr.p_filesz as usize),
                         ctx: (alignment, self.ctx)
                     });
                 }
@@ -174,9 +174,7 @@
                     continue;
                 }
 
-                if section_name.is_some() && !self.shdr_strtab
-                    .get(sect.sh_name)
-                    .map_or(false, |r| r.ok() == section_name) {
+                if section_name.is_some() && self.shdr_strtab.get_at(sect.sh_name) != section_name {
                     continue;
                 }
 
@@ -185,7 +183,7 @@
                 iters.push(note::NoteDataIterator {
                     data,
                     offset,
-                    size: offset + sect.sh_size as usize,
+                    size: offset.saturating_add(sect.sh_size as usize),
                     ctx: (alignment, self.ctx)
                 });
             }
@@ -202,22 +200,46 @@
         pub fn is_object_file(&self) -> bool {
             self.header.e_type == header::ET_REL
         }
+
+        /// Parses the contents to get the Header only. This `bytes` buffer should contain at least the length for parsing Header.
+        pub fn parse_header(bytes: &'a [u8]) -> error::Result<Header> {
+            bytes.pread::<Header>(0)
+        }
+
+        /// Lazy parse the ELF contents. This function mainly just assembles an Elf struct. Once we have the struct, we can choose to parse whatever we want.
+        pub fn lazy_parse(header: Header) -> error::Result<Self> {
+            let misc = parse_misc(&header)?;
+
+            Ok(Elf {
+                header,
+                program_headers: vec![],
+                section_headers: Default::default(),
+                shdr_strtab: Default::default(),
+                dynamic: None,
+                dynsyms: Default::default(),
+                dynstrtab: Strtab::default(),
+                syms: Default::default(),
+                strtab: Default::default(),
+                dynrelas: Default::default(),
+                dynrels: Default::default(),
+                pltrelocs: Default::default(),
+                shdr_relocs: Default::default(),
+                soname: None,
+                interpreter: None,
+                libraries: vec![],
+                is_64: misc.is_64,
+                is_lib: misc.is_lib,
+                entry: misc.entry,
+                little_endian: misc.little_endian,
+                ctx: misc.ctx,
+            })
+        }
+
         /// Parses the contents of the byte stream in `bytes`, and maybe returns a unified binary
         pub fn parse(bytes: &'a [u8]) -> error::Result<Self> {
-            let header = bytes.pread::<Header>(0)?;
-            let entry = header.e_entry as usize;
-            let is_lib = header.e_type == header::ET_DYN;
-            let is_lsb = header.e_ident[header::EI_DATA] == header::ELFDATA2LSB;
-            let endianness = scroll::Endian::from(is_lsb);
-            let class = header.e_ident[header::EI_CLASS];
-            if class != header::ELFCLASS64 && class != header::ELFCLASS32 {
-                return Err(error::Error::Malformed(format!("Unknown values in ELF ident header: class: {} endianness: {}",
-                                                           class,
-                                                           header.e_ident[header::EI_DATA])));
-            }
-            let is_64 = class == header::ELFCLASS64;
-            let container = if is_64 { Container::Big } else { Container::Little };
-            let ctx = Ctx::new(container, endianness);
+            let header = Self::parse_header(bytes)?;
+            let misc = parse_misc(&header)?;
+            let ctx = misc.ctx;
 
             let program_headers = ProgramHeader::parse(bytes, header.e_phoff as usize, header.e_phnum as usize, ctx)?;
 
@@ -274,7 +296,7 @@
 
                 if dyn_info.soname != 0 {
                     // FIXME: warn! here
-                    soname = match dynstrtab.get(dyn_info.soname) { Some(Ok(soname)) => Some(soname), _ => None };
+                    soname = dynstrtab.get_at(dyn_info.soname);
                 }
                 if dyn_info.needed_count > 0 {
                     libraries = dynamic.get_libraries(&dynstrtab);
@@ -329,11 +351,11 @@
                 soname,
                 interpreter,
                 libraries,
-                is_64,
-                is_lib,
-                entry: entry as u64,
-                little_endian: is_lsb,
-                ctx,
+                is_64: misc.is_64,
+                is_lib: misc.is_lib,
+                entry: misc.entry,
+                little_endian: misc.little_endian,
+                ctx: ctx,
             })
         }
     }
@@ -382,12 +404,44 @@
     fn hash_len(bytes: &[u8], offset: usize, machine: u16, ctx: Ctx) -> error::Result<usize> {
         // Based on readelf code.
         let nchain = if (machine == header::EM_FAKE_ALPHA || machine == header::EM_S390) && ctx.container.is_big() {
-            bytes.pread_with::<u64>(offset + 4, ctx.le)? as usize
+            bytes.pread_with::<u64>(offset.saturating_add(4), ctx.le)? as usize
         } else {
-            bytes.pread_with::<u32>(offset + 4, ctx.le)? as usize
+            bytes.pread_with::<u32>(offset.saturating_add(4), ctx.le)? as usize
         };
         Ok(nchain)
     }
+
+    struct Misc {
+        is_64: bool,
+        is_lib: bool,
+        entry: u64,
+        little_endian: bool,
+        ctx: Ctx,
+    }
+
+    fn parse_misc(header: &Header) -> error::Result<Misc> {
+        let entry = header.e_entry as usize;
+        let is_lib = header.e_type == header::ET_DYN;
+        let is_lsb = header.e_ident[header::EI_DATA] == header::ELFDATA2LSB;
+        let endianness = scroll::Endian::from(is_lsb);
+        let class = header.e_ident[header::EI_CLASS];
+        if class != header::ELFCLASS64 && class != header::ELFCLASS32 {
+            return Err(error::Error::Malformed(format!("Unknown values in ELF ident header: class: {} endianness: {}",
+                                                        class,
+                                                        header.e_ident[header::EI_DATA])));
+        }
+        let is_64 = class == header::ELFCLASS64;
+        let container = if is_64 { Container::Big } else { Container::Little };
+        let ctx = Ctx::new(container, endianness);
+
+        Ok(Misc{
+            is_64,
+            is_lib,
+            entry: entry as u64,
+            little_endian:is_lsb,
+            ctx,
+        })
+    }
 }
 
 #[cfg(test)]
@@ -449,4 +503,14 @@
             }
         }
     }
+
+    // See https://github.com/m4b/goblin/issues/257
+    #[test]
+    #[allow(unused)]
+    fn no_use_statement_conflict() {
+        use crate::elf::section_header::*;
+        use crate::elf::*;
+
+        fn f(_: SectionHeader) {}
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/note.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/note.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/note.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/note.rs	2021-12-09 12:01:26.000000000 +0000
@@ -205,8 +205,10 @@
             };
             debug!("{:?} - {:#x}", header, *offset);
             // -1 because includes \0 terminator
-            let name = bytes.gread_with::<&'a str>(offset, ctx::StrCtx::Length(header.n_namesz - 1))?;
-            *offset += 1;
+            let name = bytes.gread_with::<&'a str>(offset, ctx::StrCtx::Length(header.n_namesz.saturating_sub(1)))?;
+            if header.n_namesz > 0 {
+                *offset += 1;
+            }
             align(alignment, offset);
             debug!("note name {} - {:#x}", name, *offset);
             let desc = bytes.gread_with::<&'a [u8]>(offset, header.n_descsz)?;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/program_header.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/program_header.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/program_header.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/program_header.rs	2021-12-09 12:01:26.000000000 +0000
@@ -373,7 +373,6 @@
 
     pub const SIZEOF_PHDR: usize = 32;
 
-    use plain;
     // Declare that this is a plain type.
     unsafe impl plain::Plain for ProgramHeader {}
 
@@ -408,7 +407,6 @@
 
     pub const SIZEOF_PHDR: usize = 56;
 
-    use plain;
     // Declare that this is a plain type.
     unsafe impl plain::Plain for ProgramHeader {}
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/reloc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/reloc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/reloc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/reloc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -280,7 +280,6 @@
     use core::fmt;
     use core::result;
     use crate::container::{Ctx, Container};
-    #[cfg(feature = "endian_fd")]
     use alloc::vec::Vec;
 
     #[derive(Clone, Copy, PartialEq, Default)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/section_header.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/section_header.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/elf/section_header.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/elf/section_header.rs	2021-12-09 12:01:26.000000000 +0000
@@ -147,6 +147,8 @@
 pub const SHT_HIOS: u32 = 0x6fff_ffff;
 /// Start of processor-specific.
 pub const SHT_LOPROC: u32 = 0x7000_0000;
+/// X86-64 unwind information.
+pub const SHT_X86_64_UNWIND: u32 = 0x7000_0001;
 /// End of processor-specific.
 pub const SHT_HIPROC: u32 = 0x7fff_ffff;
 /// Start of application-specific.
@@ -235,6 +237,7 @@
         SHT_GNU_VERNEED => "SHT_GNU_VERNEED",
         SHT_GNU_VERSYM => "SHT_GNU_VERSYM",
         SHT_LOPROC => "SHT_LOPROC",
+        SHT_X86_64_UNWIND => "SHT_X86_64_UNWIND",
         SHT_HIPROC => "SHT_HIPROC",
         SHT_LOUSER => "SHT_LOUSER",
         SHT_HIUSER => "SHT_HIUSER",
@@ -423,13 +426,20 @@
                 sh_entsize: 0,
             }
         }
-        /// Returns this section header's file offset range
-        pub fn file_range(&self) -> Range<usize> {
-            self.sh_offset as usize..self.sh_offset as usize + self.sh_size as usize
+        /// Returns this section header's file offset range,
+        /// if the section occupies space in fhe file.
+        pub fn file_range(&self) -> Option<Range<usize>> {
+            // Sections with type SHT_NOBITS have no data in the file itself,
+            // they only exist in memory.
+            if self.sh_type == SHT_NOBITS {
+                None
+            } else {
+                Some(self.sh_offset as usize..(self.sh_offset as usize).saturating_add(self.sh_size as usize))
+            }
         }
         /// Returns this section header's virtual memory range
         pub fn vm_range(&self) -> Range<usize> {
-            self.sh_addr as usize..self.sh_addr as usize + self.sh_size as usize
+            self.sh_addr as usize..(self.sh_addr as usize).saturating_add(self.sh_size as usize)
         }
         /// Parse `count` section headers from `bytes` at `offset`, using the given `ctx`
         #[cfg(feature = "endian_fd")]
@@ -470,6 +480,12 @@
                     self.sh_name, self.sh_offset, self.sh_size, overflow);
                 return Err(error::Error::Malformed(message));
             }
+            let (_, overflow) = self.sh_addr.overflowing_add(self.sh_size);
+            if overflow {
+                let message = format!("Section {} size ({}) + addr ({}) is out of bounds. Overflowed: {}",
+                    self.sh_name, self.sh_addr, self.sh_size, overflow);
+                return Err(error::Error::Malformed(message));
+            }
             Ok(())
         }
         pub fn is_relocation(&self) -> bool {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,6 @@
 use alloc::string::String;
 use core::fmt;
 use core::result;
-use scroll;
 #[cfg(feature = "std")]
 use std::{error, io};
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -111,7 +111,6 @@
 
 /// Binary container size information and byte-order context
 pub mod container {
-    use scroll;
     pub use scroll::Endian;
 
     #[derive(Debug, Copy, Clone, PartialEq)]
@@ -280,6 +279,16 @@
         peek_bytes(&bytes)
     }
 
+    /// Takes a reference to the first 16 bytes of the total bytes slice and convert it to an array for `peek_bytes` to use.
+    /// Returns None if bytes's length is less than 16.
+    fn take_hint_bytes(bytes: &[u8]) -> Option<&[u8; 16]> {
+        use core::convert::TryInto;
+        bytes.get(0..16)
+            .and_then(|hint_bytes_slice| {
+                hint_bytes_slice.try_into().ok()
+            })
+    }
+
     #[derive(Debug)]
     #[allow(clippy::large_enum_variant)]
     /// A parseable object that goblin understands
@@ -296,18 +305,19 @@
         Unknown(u64),
     }
 
-    // TODO: this could avoid std using peek_bytes
-    #[cfg(feature = "std")]
     impl<'a> Object<'a> {
         /// Tries to parse an `Object` from `bytes`
         pub fn parse(bytes: &[u8]) -> error::Result<Object> {
-            use std::io::Cursor;
-            match peek(&mut Cursor::new(&bytes))? {
-                Hint::Elf(_) => Ok(Object::Elf(elf::Elf::parse(bytes)?)),
-                Hint::Mach(_) | Hint::MachFat(_) => Ok(Object::Mach(mach::Mach::parse(bytes)?)),
-                Hint::Archive => Ok(Object::Archive(archive::Archive::parse(bytes)?)),
-                Hint::PE => Ok(Object::PE(pe::PE::parse(bytes)?)),
-                Hint::Unknown(magic) => Ok(Object::Unknown(magic))
+            if let Some(hint_bytes) = take_hint_bytes(bytes) {
+                match peek_bytes(hint_bytes)? {
+                    Hint::Elf(_) => Ok(Object::Elf(elf::Elf::parse(bytes)?)),
+                    Hint::Mach(_) | Hint::MachFat(_) => Ok(Object::Mach(mach::Mach::parse(bytes)?)),
+                    Hint::Archive => Ok(Object::Archive(archive::Archive::parse(bytes)?)),
+                    Hint::PE => Ok(Object::PE(pe::PE::parse(bytes)?)),
+                    Hint::Unknown(magic) => Ok(Object::Unknown(magic))
+                }
+            } else {
+                Err(error::Error::Malformed(format!("Object is too small.")))
             }
         }
     }
@@ -363,3 +373,23 @@
 
 #[cfg(feature = "archive")]
 pub mod archive;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    if_everything! {
+        #[test]
+        fn take_hint_bytes_long_enough() {
+            let bytes_array = [1; 32];
+            let bytes = &bytes_array[..];
+            assert!(take_hint_bytes(bytes).is_some())
+        }
+
+        #[test]
+        fn take_hint_bytes_not_long_enough() {
+            let bytes_array = [1; 8];
+            let bytes = &bytes_array[..];
+            assert!(take_hint_bytes(bytes).is_none())
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/mach/constants.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/mach/constants.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/mach/constants.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/mach/constants.rs	2021-12-09 12:01:26.000000000 +0000
@@ -219,19 +219,19 @@
     pub const CPU_TYPE_MC680X0: CpuType = 6;
     pub const CPU_TYPE_X86: CpuType = 7;
     pub const CPU_TYPE_I386: CpuType = CPU_TYPE_X86;
-    pub const CPU_TYPE_X86_64: CpuType = (CPU_TYPE_X86 | CPU_ARCH_ABI64);
+    pub const CPU_TYPE_X86_64: CpuType = CPU_TYPE_X86 | CPU_ARCH_ABI64;
     pub const CPU_TYPE_MIPS: CpuType = 8;
     pub const CPU_TYPE_MC98000: CpuType = 10;
     pub const CPU_TYPE_HPPA: CpuType = 11;
     pub const CPU_TYPE_ARM: CpuType = 12;
-    pub const CPU_TYPE_ARM64: CpuType = (CPU_TYPE_ARM | CPU_ARCH_ABI64);
-    pub const CPU_TYPE_ARM64_32: CpuType = (CPU_TYPE_ARM | CPU_ARCH_ABI64_32);
+    pub const CPU_TYPE_ARM64: CpuType = CPU_TYPE_ARM | CPU_ARCH_ABI64;
+    pub const CPU_TYPE_ARM64_32: CpuType = CPU_TYPE_ARM | CPU_ARCH_ABI64_32;
     pub const CPU_TYPE_MC88000: CpuType = 13;
     pub const CPU_TYPE_SPARC: CpuType = 14;
     pub const CPU_TYPE_I860: CpuType = 15;
     pub const CPU_TYPE_ALPHA: CpuType = 16;
     pub const CPU_TYPE_POWERPC: CpuType = 18;
-    pub const CPU_TYPE_POWERPC64: CpuType = (CPU_TYPE_POWERPC | CPU_ARCH_ABI64);
+    pub const CPU_TYPE_POWERPC64: CpuType = CPU_TYPE_POWERPC | CPU_ARCH_ABI64;
 
     // CPU Subtypes
     pub const CPU_SUBTYPE_MULTIPLE: CpuSubType = !0;
@@ -351,6 +351,29 @@
             }
 
             /// Get the architecture name from cputype and cpusubtype
+            ///
+            /// When using this method to determine the architecture
+            /// name of an instance of
+            /// [`goblin::mach::header::Header`](/goblin/mach/header/struct.Header.html),
+            /// use the provided method
+            /// [`cputype()`](/goblin/mach/header/struct.Header.html#method.cputype) and
+            /// [`cpusubtype()`](/goblin/mach/header/struct.Header.html#method.cpusubtype)
+            /// instead of corresponding field `cputype` and `cpusubtype`.
+            ///
+            /// For example:
+            ///
+            /// ```rust
+            /// use std::fs::read;
+            /// use goblin::mach::constants::cputype::get_arch_name_from_types;
+            /// use goblin::mach::Mach;
+            ///
+            /// read("path/to/macho").and_then(|buf| {
+            ///     if let Ok(Mach::Binary(a)) = Mach::parse(&buf) {
+            ///         println!("arch name: {}", get_arch_name_from_types(a.header.cputype(), a.header.cpusubtype()).unwrap());
+            ///     }
+            ///     Ok(())
+            /// });
+            /// ```
             pub fn get_arch_name_from_types(cputype: CpuType, cpusubtype: CpuSubType)
                 -> Option<&'static str> {
                 match (cputype, cpusubtype) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/mach/load_command.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/mach/load_command.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/mach/load_command.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/mach/load_command.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 //! Load commands tell the kernel and dynamic linker anything from how to load this binary into memory, what the entry point is, apple specific information, to which libraries it requires for dynamic linking
 
 use crate::error;
+use core::convert::TryFrom;
 use core::fmt::{self, Display};
 use scroll::{ctx, Endian};
 use scroll::{IOread, IOwrite, Pread, Pwrite, SizeWith};
@@ -946,7 +947,8 @@
 #[repr(C)]
 #[derive(Debug, Clone, Copy, Pread, Pwrite, IOread, IOwrite, SizeWith)]
 pub struct LinkeditDataCommand {
-    /// LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO, LC_FUNCTION_STARTS, LC_DATA_IN_CODE, LC_DYLIB_CODE_SIGN_DRS or LC_LINKER_OPTIMIZATION_HINT.
+    /// LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO, LC_FUNCTION_STARTS, LC_DATA_IN_CODE,
+    /// LC_DYLIB_CODE_SIGN_DRS, LC_LINKER_OPTIMIZATION_HINT, LC_DYLD_EXPORTS_TRIE, or LC_DYLD_CHAINED_FIXUPS.
     pub cmd: u32,
     /// sizeof(struct linkedit_data_command)
     pub cmdsize: u32,
@@ -998,13 +1000,43 @@
 
 pub const SIZEOF_ENCRYPTION_INFO_COMMAND_64: usize = 24;
 
+/// An enumeration of platforms currently identifiable within a version_min_command.
+#[non_exhaustive]
+#[repr(u32)]
+#[derive(Debug)]
+pub enum Platform {
+    Macos = LC_VERSION_MIN_MACOSX,
+    Iphoneos = LC_VERSION_MIN_IPHONEOS,
+    Tvos = LC_VERSION_MIN_TVOS,
+    Watchos = LC_VERSION_MIN_WATCHOS,
+}
+
+impl TryFrom<u32> for Platform {
+    type Error = error::Error;
+
+    fn try_from(cmd: u32) -> Result<Self, Self::Error> {
+        Ok(match cmd {
+            LC_VERSION_MIN_MACOSX => Platform::Macos,
+            LC_VERSION_MIN_IPHONEOS => Platform::Iphoneos,
+            LC_VERSION_MIN_TVOS => Platform::Tvos,
+            LC_VERSION_MIN_WATCHOS => Platform::Watchos,
+            _ => {
+                return Err(error::Error::Malformed(format!(
+                    "unknown platform for load command: {:x}",
+                    cmd
+                )))
+            }
+        })
+    }
+}
+
 /// The version_min_command contains the min OS version on which this
 /// binary was built to run.
 ///
-/// LC_VERSION_MIN_MACOSX or LC_VERSION_MIN_IPHONEOS
 #[repr(C)]
 #[derive(Debug, Clone, Copy, Pread, Pwrite, IOread, IOwrite, SizeWith)]
 pub struct VersionMinCommand {
+    /// LC_VERSION_MIN_MACOSX, LC_VERSION_MIN_IPHONEOS, LC_VERSION_MIN_TVOS, or LC_VERSION_MIN_WATCHOS.
     pub cmd: u32,
     pub cmdsize: u32,
     /// X.Y.Z is encoded in nibbles xxxx.yy.zz
@@ -1014,18 +1046,22 @@
 }
 
 impl VersionMinCommand {
-    pub fn new(is_ios: bool) -> Self {
+    pub fn new(platform: Platform) -> Self {
         VersionMinCommand {
-            cmd: if is_ios {
-                LC_VERSION_MIN_IPHONEOS
-            } else {
-                LC_VERSION_MIN_MACOSX
-            },
+            cmd: platform as u32,
             cmdsize: SIZEOF_VERSION_MIN_COMMAND as u32,
             version: 0,
             sdk: 0,
         }
     }
+
+    pub fn platform(&self) -> Platform {
+        // A panic here indicates an incomplete API change above: VersionMinCommand
+        // can only be constructed from one of the LC_VERSION_* commands or directly
+        // from a Platform, so an error indicates that a new one hasn't been correctly
+        // added to the Platform enum.
+        Platform::try_from(self.cmd).expect("impossible platform (implementation error)")
+    }
 }
 
 pub const SIZEOF_VERSION_MIN_COMMAND: usize = 16;
@@ -1184,6 +1220,8 @@
 pub const LC_DYLD_INFO_ONLY: u32 = 0x22 | LC_REQ_DYLD;
 pub const LC_LOAD_UPWARD_DYLIB: u32 = 0x23 | LC_REQ_DYLD;
 pub const LC_MAIN: u32 = 0x28 | LC_REQ_DYLD;
+pub const LC_DYLD_EXPORTS_TRIE: u32 = 0x33 | LC_REQ_DYLD;
+pub const LC_DYLD_CHAINED_FIXUPS: u32 = 0x34 | LC_REQ_DYLD;
 pub const LC_SEGMENT: u32 = 0x1;
 pub const LC_SYMTAB: u32 = 0x2;
 pub const LC_SYMSEG: u32 = 0x3;
@@ -1225,6 +1263,10 @@
 pub const LC_ENCRYPTION_INFO_64: u32 = 0x2C;
 pub const LC_LINKER_OPTION: u32 = 0x2D;
 pub const LC_LINKER_OPTIMIZATION_HINT: u32 = 0x2E;
+pub const LC_VERSION_MIN_TVOS: u32 = 0x2F;
+pub const LC_VERSION_MIN_WATCHOS: u32 = 0x30;
+pub const LC_NOTE: u32 = 0x31;
+pub const LC_BUILD_VERSION: u32 = 0x32;
 
 pub fn cmd_to_str(cmd: u32) -> &'static str {
     match cmd {
@@ -1275,6 +1317,12 @@
         LC_ENCRYPTION_INFO_64 => "LC_ENCRYPTION_INFO_64",
         LC_LINKER_OPTION => "LC_LINKER_OPTION",
         LC_LINKER_OPTIMIZATION_HINT => "LC_LINKER_OPTIMIZATION_HINT",
+        LC_VERSION_MIN_TVOS => "LC_VERSION_MIN_TVOS",
+        LC_VERSION_MIN_WATCHOS => "LC_VERSION_MIN_WATCHOS",
+        LC_NOTE => "LC_NOTE",
+        LC_BUILD_VERSION => "LC_BUILD_VERSION",
+        LC_DYLD_EXPORTS_TRIE => "LC_DYLD_EXPORTS_TRIE",
+        LC_DYLD_CHAINED_FIXUPS => "LC_DYLD_CHAINED_FIXUPS",
         _ => "LC_UNKNOWN",
     }
 }
@@ -1334,6 +1382,10 @@
     DylibCodeSignDrs(LinkeditDataCommand),
     LinkerOption(LinkeditDataCommand),
     LinkerOptimizationHint(LinkeditDataCommand),
+    VersionMinTvos(VersionMinCommand),
+    VersionMinWatchos(VersionMinCommand),
+    DyldExportsTrie(LinkeditDataCommand),
+    DyldChainedFixups(LinkeditDataCommand),
     Unimplemented(LoadCommandHeader),
 }
 
@@ -1540,7 +1592,25 @@
                 let comm = bytes.pread_with::<LinkeditDataCommand>(0, le)?;
                 Ok((LinkerOptimizationHint(comm), size))
             }
-            _ => Ok((Unimplemented(lc), size)),
+            LC_VERSION_MIN_TVOS => {
+                let comm = bytes.pread_with::<VersionMinCommand>(0, le)?;
+                Ok((VersionMinTvos(comm), size))
+            }
+            LC_VERSION_MIN_WATCHOS => {
+                let comm = bytes.pread_with::<VersionMinCommand>(0, le)?;
+                Ok((VersionMinWatchos(comm), size))
+            }
+            LC_DYLD_EXPORTS_TRIE => {
+                let comm = bytes.pread_with::<LinkeditDataCommand>(0, le)?;
+                Ok((DyldExportsTrie(comm), size))
+            }
+            LC_DYLD_CHAINED_FIXUPS => {
+                let comm = bytes.pread_with::<LinkeditDataCommand>(0, le)?;
+                Ok((DyldChainedFixups(comm), size))
+            }
+            // TODO: LC_NOTE (NoteCommand) and LC_BUILD_VERSION (BuildVersionCommand)
+            // are unimplemented.
+            LC_NOTE | LC_BUILD_VERSION | _ => Ok((Unimplemented(lc), size)),
         }
     }
 }
@@ -1596,6 +1666,10 @@
             DylibCodeSignDrs(comm) => comm.cmdsize,
             LinkerOption(comm) => comm.cmdsize,
             LinkerOptimizationHint(comm) => comm.cmdsize,
+            VersionMinTvos(comm) => comm.cmdsize,
+            VersionMinWatchos(comm) => comm.cmdsize,
+            DyldExportsTrie(comm) => comm.cmdsize,
+            DyldChainedFixups(comm) => comm.cmdsize,
             Unimplemented(comm) => comm.cmdsize,
         };
         cmdsize as usize
@@ -1650,6 +1724,10 @@
             DylibCodeSignDrs(comm) => comm.cmd,
             LinkerOption(comm) => comm.cmd,
             LinkerOptimizationHint(comm) => comm.cmd,
+            VersionMinTvos(comm) => comm.cmd,
+            VersionMinWatchos(comm) => comm.cmd,
+            DyldExportsTrie(comm) => comm.cmd,
+            DyldChainedFixups(comm) => comm.cmd,
             Unimplemented(comm) => comm.cmd,
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/mach/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/mach/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/mach/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/mach/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,6 +64,8 @@
     pub symbols: Option<symbols::Symbols<'a>>,
     /// The dylibs this library depends on
     pub libs: Vec<&'a str>,
+    /// The runtime search paths for dylibs this library depends on
+    pub rpaths: Vec<&'a str>,
     /// The entry point (as a virtual memory address), 0 if none
     pub entry: u64,
     /// Whether `entry` refers to an older `LC_UNIXTHREAD` instead of the newer `LC_MAIN` entrypoint
@@ -163,6 +165,7 @@
         let mut cmds: Vec<load_command::LoadCommand> = Vec::with_capacity(ncmds);
         let mut symbols = None;
         let mut libs = vec!["self"];
+        let mut rpaths = vec![];
         let mut export_trie = None;
         let mut bind_interpreter = None;
         let mut unixthread_entry_address = None;
@@ -191,6 +194,10 @@
                     let lib = bytes.pread::<&str>(cmd.offset + command.dylib.name as usize)?;
                     libs.push(lib);
                 }
+                load_command::CommandVariant::Rpath(command) => {
+                    let rpath = bytes.pread::<&str>(cmd.offset + command.path as usize)?;
+                    rpaths.push(rpath);
+                }
                 load_command::CommandVariant::DyldInfo(command)
                 | load_command::CommandVariant::DyldInfoOnly(command) => {
                     export_trie = Some(exports::ExportTrie::new(bytes, &command));
@@ -248,6 +255,7 @@
             segments,
             symbols,
             libs,
+            rpaths,
             export_trie,
             bind_interpreter,
             entry,
@@ -402,7 +410,7 @@
 impl<'a> fmt::Debug for MultiArch<'a> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt.debug_struct("MultiArch")
-            .field("arches", &self.arches().unwrap())
+            .field("arches", &self.arches().unwrap_or_default())
             .field("data", &self.data.len())
             .finish()
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/data_directories.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/data_directories.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/data_directories.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/data_directories.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,62 +45,62 @@
     }
     pub fn get_export_table(&self) -> &Option<DataDirectory> {
         let idx = 0;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_import_table(&self) -> &Option<DataDirectory> {
         let idx = 1;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_resource_table(&self) -> &Option<DataDirectory> {
         let idx = 2;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_exception_table(&self) -> &Option<DataDirectory> {
         let idx = 3;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_certificate_table(&self) -> &Option<DataDirectory> {
         let idx = 4;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_base_relocation_table(&self) -> &Option<DataDirectory> {
         let idx = 5;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_debug_table(&self) -> &Option<DataDirectory> {
         let idx = 6;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_architecture(&self) -> &Option<DataDirectory> {
         let idx = 7;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_global_ptr(&self) -> &Option<DataDirectory> {
         let idx = 8;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_tls_table(&self) -> &Option<DataDirectory> {
         let idx = 9;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_load_config_table(&self) -> &Option<DataDirectory> {
         let idx = 10;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_bound_import_table(&self) -> &Option<DataDirectory> {
         let idx = 11;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_import_address_table(&self) -> &Option<DataDirectory> {
         let idx = 12;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_delay_import_descriptor(&self) -> &Option<DataDirectory> {
         let idx = 13;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
     pub fn get_clr_runtime_header(&self) -> &Option<DataDirectory> {
         let idx = 14;
-        unsafe { self.data_directories.get_unchecked(idx) }
+        &self.data_directories[idx]
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/debug.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/debug.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/debug.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/debug.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,7 @@
 use scroll::{Pread, Pwrite, SizeWith};
 
 use crate::pe::data_directories;
+use crate::pe::options;
 use crate::pe::section_table;
 use crate::pe::utils;
 
@@ -18,10 +19,26 @@
         sections: &[section_table::SectionTable],
         file_alignment: u32,
     ) -> error::Result<Self> {
+        Self::parse_with_opts(
+            bytes,
+            dd,
+            sections,
+            file_alignment,
+            &options::ParseOptions::default(),
+        )
+    }
+
+    pub fn parse_with_opts(
+        bytes: &'a [u8],
+        dd: data_directories::DataDirectory,
+        sections: &[section_table::SectionTable],
+        file_alignment: u32,
+        opts: &options::ParseOptions,
+    ) -> error::Result<Self> {
         let image_debug_directory =
-            ImageDebugDirectory::parse(bytes, dd, sections, file_alignment)?;
+            ImageDebugDirectory::parse_with_opts(bytes, dd, sections, file_alignment, opts)?;
         let codeview_pdb70_debug_info =
-            CodeviewPDB70DebugInfo::parse(bytes, &image_debug_directory)?;
+            CodeviewPDB70DebugInfo::parse_with_opts(bytes, &image_debug_directory, opts)?;
 
         Ok(DebugData {
             image_debug_directory,
@@ -59,14 +76,31 @@
 pub const IMAGE_DEBUG_TYPE_BORLAND: u32 = 9;
 
 impl ImageDebugDirectory {
+    #[allow(unused)]
     fn parse(
         bytes: &[u8],
         dd: data_directories::DataDirectory,
         sections: &[section_table::SectionTable],
         file_alignment: u32,
     ) -> error::Result<Self> {
+        Self::parse_with_opts(
+            bytes,
+            dd,
+            sections,
+            file_alignment,
+            &options::ParseOptions::default(),
+        )
+    }
+
+    fn parse_with_opts(
+        bytes: &[u8],
+        dd: data_directories::DataDirectory,
+        sections: &[section_table::SectionTable],
+        file_alignment: u32,
+        opts: &options::ParseOptions,
+    ) -> error::Result<Self> {
         let rva = dd.virtual_address as usize;
-        let offset = utils::find_offset(rva, sections, file_alignment).ok_or_else(|| {
+        let offset = utils::find_offset(rva, sections, file_alignment, opts).ok_or_else(|| {
             error::Error::Malformed(format!(
                 "Cannot map ImageDebugDirectory rva {:#x} into offset",
                 rva
@@ -94,6 +128,14 @@
 
 impl<'a> CodeviewPDB70DebugInfo<'a> {
     pub fn parse(bytes: &'a [u8], idd: &ImageDebugDirectory) -> error::Result<Option<Self>> {
+        Self::parse_with_opts(bytes, idd, &options::ParseOptions::default())
+    }
+
+    pub fn parse_with_opts(
+        bytes: &'a [u8],
+        idd: &ImageDebugDirectory,
+        opts: &options::ParseOptions,
+    ) -> error::Result<Option<Self>> {
         if idd.data_type != IMAGE_DEBUG_TYPE_CODEVIEW {
             // not a codeview debug directory
             // that's not an error, but it's not a CodeviewPDB70DebugInfo either
@@ -101,7 +143,10 @@
         }
 
         // ImageDebugDirectory.pointer_to_raw_data stores a raw offset -- not a virtual offset -- which we can use directly
-        let mut offset: usize = idd.pointer_to_raw_data as usize;
+        let mut offset: usize = match opts.resolve_rva {
+            true => idd.pointer_to_raw_data as usize,
+            false => idd.address_of_raw_data as usize,
+        };
 
         // calculate how long the eventual filename will be, which doubles as a check of the record size
         let filename_length = idd.size_of_data as isize - 24;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/exception.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/exception.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/exception.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/exception.rs	2021-12-09 12:01:26.000000000 +0000
@@ -49,6 +49,7 @@
 use crate::error;
 
 use crate::pe::data_directories;
+use crate::pe::options;
 use crate::pe::section_table;
 use crate::pe::utils;
 
@@ -667,6 +668,23 @@
         sections: &[section_table::SectionTable],
         file_alignment: u32,
     ) -> error::Result<Self> {
+        Self::parse_with_opts(
+            bytes,
+            directory,
+            sections,
+            file_alignment,
+            &options::ParseOptions::default(),
+        )
+    }
+
+    /// Parses exception data from the image at the given offset.
+    pub fn parse_with_opts(
+        bytes: &'a [u8],
+        directory: data_directories::DataDirectory,
+        sections: &[section_table::SectionTable],
+        file_alignment: u32,
+        opts: &options::ParseOptions,
+    ) -> error::Result<Self> {
         let size = directory.size as usize;
 
         if size % RUNTIME_FUNCTION_SIZE != 0 {
@@ -677,7 +695,7 @@
         }
 
         let rva = directory.virtual_address as usize;
-        let offset = utils::find_offset(rva, sections, file_alignment).ok_or_else(|| {
+        let offset = utils::find_offset(rva, sections, file_alignment, opts).ok_or_else(|| {
             error::Error::Malformed(format!("cannot map exception_rva ({:#x}) into offset", rva))
         })?;
 
@@ -762,30 +780,55 @@
     /// Resolves unwind information for the given function entry.
     pub fn get_unwind_info(
         &self,
+        function: RuntimeFunction,
+        sections: &[section_table::SectionTable],
+    ) -> error::Result<UnwindInfo<'a>> {
+        self.get_unwind_info_with_opts(function, sections, &options::ParseOptions::default())
+    }
+
+    /// Resolves unwind information for the given function entry.
+    pub fn get_unwind_info_with_opts(
+        &self,
         mut function: RuntimeFunction,
         sections: &[section_table::SectionTable],
+        opts: &options::ParseOptions,
     ) -> error::Result<UnwindInfo<'a>> {
         while function.unwind_info_address % 2 != 0 {
             let rva = (function.unwind_info_address & !1) as usize;
-            function = self.get_function_by_rva(rva, sections)?;
+            function = self.get_function_by_rva_with_opts(rva, sections, opts)?;
         }
 
         let rva = function.unwind_info_address as usize;
-        let offset = utils::find_offset(rva, sections, self.file_alignment).ok_or_else(|| {
-            error::Error::Malformed(format!("cannot map unwind rva ({:#x}) into offset", rva))
-        })?;
+        let offset =
+            utils::find_offset(rva, sections, self.file_alignment, opts).ok_or_else(|| {
+                error::Error::Malformed(format!("cannot map unwind rva ({:#x}) into offset", rva))
+            })?;
 
         UnwindInfo::parse(self.bytes, offset)
     }
 
+    #[allow(dead_code)]
     fn get_function_by_rva(
         &self,
         rva: usize,
         sections: &[section_table::SectionTable],
     ) -> error::Result<RuntimeFunction> {
-        let offset = utils::find_offset(rva, sections, self.file_alignment).ok_or_else(|| {
-            error::Error::Malformed(format!("cannot map exception rva ({:#x}) into offset", rva))
-        })?;
+        self.get_function_by_rva_with_opts(rva, sections, &options::ParseOptions::default())
+    }
+
+    fn get_function_by_rva_with_opts(
+        &self,
+        rva: usize,
+        sections: &[section_table::SectionTable],
+        opts: &options::ParseOptions,
+    ) -> error::Result<RuntimeFunction> {
+        let offset =
+            utils::find_offset(rva, sections, self.file_alignment, opts).ok_or_else(|| {
+                error::Error::Malformed(format!(
+                    "cannot map exception rva ({:#x}) into offset",
+                    rva
+                ))
+            })?;
 
         self.get_function_by_offset(offset)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/export.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/export.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/export.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/export.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,6 +6,7 @@
 use crate::error;
 
 use crate::pe::data_directories;
+use crate::pe::options;
 use crate::pe::section_table;
 use crate::pe::utils;
 
@@ -71,6 +72,22 @@
         sections: &[section_table::SectionTable],
         file_alignment: u32,
     ) -> error::Result<ExportData<'a>> {
+        Self::parse_with_opts(
+            bytes,
+            dd,
+            sections,
+            file_alignment,
+            &options::ParseOptions::default(),
+        )
+    }
+
+    pub fn parse_with_opts(
+        bytes: &'a [u8],
+        dd: data_directories::DataDirectory,
+        sections: &[section_table::SectionTable],
+        file_alignment: u32,
+        opts: &options::ParseOptions,
+    ) -> error::Result<ExportData<'a>> {
         let export_rva = dd.virtual_address as usize;
         let size = dd.size as usize;
         debug!("export_rva {:#x} size {:#}", export_rva, size);
@@ -78,6 +95,7 @@
             export_rva,
             sections,
             file_alignment,
+            opts,
             &format!("cannot map export_rva ({:#x}) into offset", export_rva),
         )?;
         let export_directory_table =
@@ -94,6 +112,7 @@
             export_directory_table.name_pointer_rva as usize,
             sections,
             file_alignment,
+            opts,
         )
         .map_or(vec![], |table_offset| {
             let mut offset = table_offset;
@@ -114,6 +133,7 @@
             export_directory_table.ordinal_table_rva as usize,
             sections,
             file_alignment,
+            opts,
         )
         .map_or(vec![], |table_offset| {
             let mut offset = table_offset;
@@ -134,6 +154,7 @@
             export_directory_table.export_address_table_rva as usize,
             sections,
             file_alignment,
+            opts,
         )
         .map_or(vec![], |table_offset| {
             let mut offset = table_offset;
@@ -159,6 +180,7 @@
             export_directory_table.name_rva as usize,
             sections,
             file_alignment,
+            opts,
         )
         .and_then(|offset| bytes.pread(offset).ok());
 
@@ -251,6 +273,7 @@
     pub file_alignment: u32,
     pub addresses: &'a ExportAddressTable,
     pub ordinals: &'a ExportOrdinalTable,
+    pub opts: options::ParseOptions,
 }
 
 impl<'a, 'b> scroll::ctx::TryFromCtx<'a, ExportCtx<'b>> for Export<'a> {
@@ -265,11 +288,12 @@
             file_alignment,
             addresses,
             ordinals,
+            opts,
         }: ExportCtx<'b>,
     ) -> Result<(Self, usize), Self::Error> {
         use self::ExportAddressTableEntry::*;
 
-        let name = utils::find_offset(ptr as usize, sections, file_alignment)
+        let name = utils::find_offset(ptr as usize, sections, file_alignment, &opts)
             .and_then(|offset| bytes.pread::<&str>(offset).ok());
 
         if let Some(ordinal) = ordinals.get(idx) {
@@ -281,6 +305,7 @@
                             rva,
                             sections,
                             file_alignment,
+                            &opts,
                             &format!(
                                 "cannot map RVA ({:#x}) of export ordinal {} into offset",
                                 rva, ordinal
@@ -304,6 +329,7 @@
                             rva,
                             sections,
                             file_alignment,
+                            &opts,
                             &format!(
                                 "cannot map RVA ({:#x}) of export ordinal {} into offset",
                                 rva, ordinal
@@ -344,6 +370,22 @@
         sections: &[section_table::SectionTable],
         file_alignment: u32,
     ) -> error::Result<Vec<Export<'a>>> {
+        Self::parse_with_opts(
+            bytes,
+            export_data,
+            sections,
+            file_alignment,
+            &options::ParseOptions::default(),
+        )
+    }
+
+    pub fn parse_with_opts(
+        bytes: &'a [u8],
+        export_data: &ExportData,
+        sections: &[section_table::SectionTable],
+        file_alignment: u32,
+        opts: &options::ParseOptions,
+    ) -> error::Result<Vec<Export<'a>>> {
         let pointers = &export_data.export_name_pointer_table;
         let addresses = &export_data.export_address_table;
         let ordinals = &export_data.export_ordinal_table;
@@ -359,6 +401,7 @@
                     file_alignment,
                     addresses,
                     ordinals,
+                    opts: *opts,
                 },
             ) {
                 exports.push(export);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/import.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/import.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/import.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/import.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,6 +7,7 @@
 use scroll::{Pread, Pwrite, SizeWith};
 
 use crate::pe::data_directories;
+use crate::pe::options;
 use crate::pe::section_table;
 use crate::pe::utils;
 
@@ -94,9 +95,25 @@
 impl<'a> SyntheticImportLookupTableEntry<'a> {
     pub fn parse<T: Bitfield<'a>>(
         bytes: &'a [u8],
+        offset: usize,
+        sections: &[section_table::SectionTable],
+        file_alignment: u32,
+    ) -> error::Result<ImportLookupTable<'a>> {
+        Self::parse_with_opts::<T>(
+            bytes,
+            offset,
+            sections,
+            file_alignment,
+            &options::ParseOptions::default(),
+        )
+    }
+
+    pub fn parse_with_opts<T: Bitfield<'a>>(
+        bytes: &'a [u8],
         mut offset: usize,
         sections: &[section_table::SectionTable],
         file_alignment: u32,
+        opts: &options::ParseOptions,
     ) -> error::Result<ImportLookupTable<'a>> {
         let le = scroll::LE;
         let offset = &mut offset;
@@ -119,7 +136,7 @@
                         let hentry = {
                             debug!("searching for RVA {:#x}", rva);
                             if let Some(offset) =
-                                utils::find_offset(rva as usize, sections, file_alignment)
+                                utils::find_offset(rva as usize, sections, file_alignment, opts)
                             {
                                 debug!("offset {:#x}", offset);
                                 HintNameTableEntry::parse(bytes, offset)?
@@ -181,36 +198,60 @@
         sections: &[section_table::SectionTable],
         file_alignment: u32,
     ) -> error::Result<SyntheticImportDirectoryEntry<'a>> {
+        Self::parse_with_opts::<T>(
+            bytes,
+            import_directory_entry,
+            sections,
+            file_alignment,
+            &options::ParseOptions::default(),
+        )
+    }
+
+    pub fn parse_with_opts<T: Bitfield<'a>>(
+        bytes: &'a [u8],
+        import_directory_entry: ImportDirectoryEntry,
+        sections: &[section_table::SectionTable],
+        file_alignment: u32,
+        opts: &options::ParseOptions,
+    ) -> error::Result<SyntheticImportDirectoryEntry<'a>> {
         const LE: scroll::Endian = scroll::LE;
         let name_rva = import_directory_entry.name_rva;
-        let name = utils::try_name(bytes, name_rva as usize, sections, file_alignment)?;
+        let name = utils::try_name(bytes, name_rva as usize, sections, file_alignment, opts)?;
         let import_lookup_table = {
             let import_lookup_table_rva = import_directory_entry.import_lookup_table_rva;
             let import_address_table_rva = import_directory_entry.import_address_table_rva;
-            if let Some(import_lookup_table_offset) =
-                utils::find_offset(import_lookup_table_rva as usize, sections, file_alignment)
-            {
+            if let Some(import_lookup_table_offset) = utils::find_offset(
+                import_lookup_table_rva as usize,
+                sections,
+                file_alignment,
+                opts,
+            ) {
                 debug!("Synthesizing lookup table imports for {} lib, with import lookup table rva: {:#x}", name, import_lookup_table_rva);
-                let import_lookup_table = SyntheticImportLookupTableEntry::parse::<T>(
+                let import_lookup_table = SyntheticImportLookupTableEntry::parse_with_opts::<T>(
                     bytes,
                     import_lookup_table_offset,
                     sections,
                     file_alignment,
+                    opts,
                 )?;
                 debug!(
                     "Successfully synthesized import lookup table entry from lookup table: {:#?}",
                     import_lookup_table
                 );
                 Some(import_lookup_table)
-            } else if let Some(import_address_table_offset) =
-                utils::find_offset(import_address_table_rva as usize, sections, file_alignment)
-            {
+            } else if let Some(import_address_table_offset) = utils::find_offset(
+                import_address_table_rva as usize,
+                sections,
+                file_alignment,
+                opts,
+            ) {
                 debug!("Synthesizing lookup table imports for {} lib, with import address table rva: {:#x}", name, import_lookup_table_rva);
-                let import_address_table = SyntheticImportLookupTableEntry::parse::<T>(
+                let import_address_table = SyntheticImportLookupTableEntry::parse_with_opts::<T>(
                     bytes,
                     import_address_table_offset,
                     sections,
                     file_alignment,
+                    opts,
                 )?;
                 debug!(
                     "Successfully synthesized import lookup table entry from IAT: {:#?}",
@@ -226,6 +267,7 @@
             import_directory_entry.import_address_table_rva as usize,
             sections,
             file_alignment,
+            opts,
         )
         .ok_or_else(|| {
             error::Error::Malformed(format!(
@@ -266,12 +308,35 @@
         sections: &[section_table::SectionTable],
         file_alignment: u32,
     ) -> error::Result<ImportData<'a>> {
+        Self::parse_with_opts::<T>(
+            bytes,
+            dd,
+            sections,
+            file_alignment,
+            &options::ParseOptions::default(),
+        )
+    }
+
+    pub fn parse_with_opts<T: Bitfield<'a>>(
+        bytes: &'a [u8],
+        dd: data_directories::DataDirectory,
+        sections: &[section_table::SectionTable],
+        file_alignment: u32,
+        opts: &options::ParseOptions,
+    ) -> error::Result<ImportData<'a>> {
         let import_directory_table_rva = dd.virtual_address as usize;
         debug!(
             "import_directory_table_rva {:#x}",
             import_directory_table_rva
         );
-        let offset = &mut utils::find_offset(import_directory_table_rva, sections, file_alignment).ok_or_else(|| error::Error::Malformed(format!("Cannot create ImportData; cannot map import_directory_table_rva {:#x} into offset", import_directory_table_rva)))?;
+        let offset =
+            &mut utils::find_offset(import_directory_table_rva, sections, file_alignment, opts)
+                .ok_or_else(|| {
+                    error::Error::Malformed(format!(
+                "Cannot create ImportData; cannot map import_directory_table_rva {:#x} into offset",
+                import_directory_table_rva
+            ))
+                })?;
         debug!("import data offset {:#x}", offset);
         let mut import_data = Vec::new();
         loop {
@@ -281,11 +346,12 @@
             if import_directory_entry.is_null() {
                 break;
             } else {
-                let entry = SyntheticImportDirectoryEntry::parse::<T>(
+                let entry = SyntheticImportDirectoryEntry::parse_with_opts::<T>(
                     bytes,
                     import_directory_entry,
                     sections,
                     file_alignment,
+                    opts,
                 )?;
                 debug!("entry {:#?}", entry);
                 import_data.push(entry);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,6 +13,7 @@
 pub mod header;
 pub mod import;
 pub mod optional_header;
+pub mod options;
 pub mod relocation;
 pub mod section_table;
 pub mod symbol;
@@ -62,6 +63,11 @@
 impl<'a> PE<'a> {
     /// Reads a PE binary from the underlying `bytes`
     pub fn parse(bytes: &'a [u8]) -> error::Result<Self> {
+        Self::parse_with_opts(bytes, &options::ParseOptions::default())
+    }
+
+    /// Reads a PE binary from the underlying `bytes`
+    pub fn parse_with_opts(bytes: &'a [u8], opts: &options::ParseOptions) -> error::Result<Self> {
         let header = header::Header::parse(bytes)?;
         debug!("{:#?}", header);
         let offset = &mut (header.dos_header.pe_pointer as usize
@@ -91,11 +97,21 @@
             );
             let file_alignment = optional_header.windows_fields.file_alignment;
             if let Some(export_table) = *optional_header.data_directories.get_export_table() {
-                if let Ok(ed) =
-                    export::ExportData::parse(bytes, export_table, &sections, file_alignment)
-                {
+                if let Ok(ed) = export::ExportData::parse_with_opts(
+                    bytes,
+                    export_table,
+                    &sections,
+                    file_alignment,
+                    opts,
+                ) {
                     debug!("export data {:#?}", ed);
-                    exports = export::Export::parse(bytes, &ed, &sections, file_alignment)?;
+                    exports = export::Export::parse_with_opts(
+                        bytes,
+                        &ed,
+                        &sections,
+                        file_alignment,
+                        opts,
+                    )?;
                     name = ed.name;
                     debug!("name: {:#?}", name);
                     export_data = Some(ed);
@@ -104,18 +120,20 @@
             debug!("exports: {:#?}", exports);
             if let Some(import_table) = *optional_header.data_directories.get_import_table() {
                 let id = if is_64 {
-                    import::ImportData::parse::<u64>(
+                    import::ImportData::parse_with_opts::<u64>(
                         bytes,
                         import_table,
                         &sections,
                         file_alignment,
+                        opts,
                     )?
                 } else {
-                    import::ImportData::parse::<u32>(
+                    import::ImportData::parse_with_opts::<u32>(
                         bytes,
                         import_table,
                         &sections,
                         file_alignment,
+                        opts,
                     )?
                 };
                 debug!("import data {:#?}", id);
@@ -135,11 +153,12 @@
             }
             debug!("imports: {:#?}", imports);
             if let Some(debug_table) = *optional_header.data_directories.get_debug_table() {
-                debug_data = Some(debug::DebugData::parse(
+                debug_data = Some(debug::DebugData::parse_with_opts(
                     bytes,
                     debug_table,
                     &sections,
                     file_alignment,
+                    opts,
                 )?);
             }
 
@@ -149,11 +168,12 @@
                 if let Some(exception_table) =
                     *optional_header.data_directories.get_exception_table()
                 {
-                    exception_data = Some(exception::ExceptionData::parse(
+                    exception_data = Some(exception::ExceptionData::parse_with_opts(
                         bytes,
                         exception_table,
                         &sections,
                         file_alignment,
+                        opts,
                     )?);
                 }
             }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/options.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/options.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/options.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/options.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+/// Parsing Options structure for the PE parser
+#[derive(Debug, Copy, Clone)]
+pub struct ParseOptions {
+    /// Wether the parser should resolve rvas or not. Default: true
+    pub resolve_rva: bool,
+}
+
+impl ParseOptions {
+    /// Returns a parse options structure with default values
+    pub fn default() -> Self {
+        ParseOptions { resolve_rva: true }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/symbol.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/symbol.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/symbol.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/symbol.rs	2021-12-09 12:01:26.000000000 +0000
@@ -218,11 +218,8 @@
     /// a strtab entry.
     pub fn name<'a>(&'a self, strtab: &'a strtab::Strtab) -> error::Result<&'a str> {
         if let Some(offset) = self.name_offset() {
-            strtab.get(offset as usize).unwrap_or_else(|| {
-                Err(error::Error::Malformed(format!(
-                    "Invalid Symbol name offset {:#x}",
-                    offset
-                )))
+            strtab.get_at(offset as usize).ok_or_else(|| {
+                error::Error::Malformed(format!("Invalid Symbol name offset {:#x}", offset))
             })
         } else {
             Ok(self.name.pread(0)?)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/pe/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/pe/utils.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,7 @@
 use alloc::string::ToString;
 use scroll::Pread;
 
+use super::options;
 use super::section_table;
 
 use crate::pe::data_directories::DataDirectory;
@@ -62,36 +63,42 @@
     rva: usize,
     sections: &[section_table::SectionTable],
     file_alignment: u32,
+    opts: &options::ParseOptions,
 ) -> Option<usize> {
-    for (i, section) in sections.iter().enumerate() {
-        debug!(
-            "Checking {} for {:#x} ∈ {:#x}..{:#x}",
-            section.name().unwrap_or(""),
-            rva,
-            section.virtual_address,
-            section.virtual_address + section.virtual_size
-        );
-        if is_in_section(rva, &section, file_alignment) {
-            let offset = rva2offset(rva, &section);
+    if opts.resolve_rva {
+        for (i, section) in sections.iter().enumerate() {
             debug!(
-                "Found in section {}({}), remapped into offset {:#x}",
+                "Checking {} for {:#x} ∈ {:#x}..{:#x}",
                 section.name().unwrap_or(""),
-                i,
-                offset
+                rva,
+                section.virtual_address,
+                section.virtual_address + section.virtual_size
             );
-            return Some(offset);
+            if is_in_section(rva, &section, file_alignment) {
+                let offset = rva2offset(rva, &section);
+                debug!(
+                    "Found in section {}({}), remapped into offset {:#x}",
+                    section.name().unwrap_or(""),
+                    i,
+                    offset
+                );
+                return Some(offset);
+            }
         }
+        None
+    } else {
+        Some(rva)
     }
-    None
 }
 
 pub fn find_offset_or(
     rva: usize,
     sections: &[section_table::SectionTable],
     file_alignment: u32,
+    opts: &options::ParseOptions,
     msg: &str,
 ) -> error::Result<usize> {
-    find_offset(rva, sections, file_alignment)
+    find_offset(rva, sections, file_alignment, opts)
         .ok_or_else(|| error::Error::Malformed(msg.to_string()))
 }
 
@@ -100,8 +107,9 @@
     rva: usize,
     sections: &[section_table::SectionTable],
     file_alignment: u32,
+    opts: &options::ParseOptions,
 ) -> error::Result<&'a str> {
-    match find_offset(rva, sections, file_alignment) {
+    match find_offset(rva, sections, file_alignment, opts) {
         Some(offset) => Ok(bytes.pread::<&str>(offset)?),
         None => Err(error::Error::Malformed(format!(
             "Cannot find name from rva {:#x} in sections: {:?}",
@@ -119,8 +127,27 @@
 where
     T: scroll::ctx::TryFromCtx<'a, scroll::Endian, Error = scroll::Error>,
 {
+    get_data_with_opts(
+        bytes,
+        sections,
+        directory,
+        file_alignment,
+        &options::ParseOptions::default(),
+    )
+}
+
+pub fn get_data_with_opts<'a, T>(
+    bytes: &'a [u8],
+    sections: &[section_table::SectionTable],
+    directory: DataDirectory,
+    file_alignment: u32,
+    opts: &options::ParseOptions,
+) -> error::Result<T>
+where
+    T: scroll::ctx::TryFromCtx<'a, scroll::Endian, Error = scroll::Error>,
+{
     let rva = directory.virtual_address as usize;
-    let offset = find_offset(rva, sections, file_alignment)
+    let offset = find_offset(rva, sections, file_alignment, opts)
         .ok_or_else(|| error::Error::Malformed(directory.virtual_address.to_string()))?;
     let result: T = bytes.pread_with(offset, scroll::LE)?;
     Ok(result)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/strtab.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/strtab.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/src/strtab.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/src/strtab.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,6 @@
 
 use core::fmt;
 use core::ops::Index;
-use core::slice;
 use core::str;
 use scroll::{ctx, Pread};
 if_alloc! {
@@ -15,8 +14,10 @@
 /// member index). Constructed using [`parse`](#method.parse)
 /// with your choice of delimiter. Please be careful.
 pub struct Strtab<'a> {
-    bytes: &'a [u8],
     delim: ctx::StrCtx,
+    bytes: &'a [u8],
+    #[cfg(feature = "alloc")]
+    strings: Vec<(usize, &'a str)>,
 }
 
 #[inline(always)]
@@ -25,31 +26,42 @@
 }
 
 impl<'a> Strtab<'a> {
-    /// Construct a new strtab with `bytes` as the backing string table, using `delim` as the delimiter between entries
+    /// Creates a `Strtab` with `bytes` as the backing string table, using `delim` as the delimiter between entries.
+    ///
+    /// NB: this does *not* preparse the string table, which can have non-optimal access patterns.
+    /// See https://github.com/m4b/goblin/pull/275#issue-660364025
     pub fn new(bytes: &'a [u8], delim: u8) -> Self {
-        Strtab {
+        Self::from_slice_unparsed(bytes, 0, bytes.len(), delim)
+    }
+
+    /// Creates a `Strtab` directly without bounds check and without parsing it.
+    ///
+    /// This is potentially unsafe and should only be used if `feature = "alloc"` is disabled.
+    pub fn from_slice_unparsed(bytes: &'a [u8], offset: usize, len: usize, delim: u8) -> Self {
+        Self {
             delim: ctx::StrCtx::Delimiter(delim),
-            bytes,
+            bytes: &bytes[offset..offset + len],
+            #[cfg(feature = "alloc")]
+            strings: Vec::new(),
         }
     }
-    /// Construct a strtab from a `ptr`, and a `size`, using `delim` as the delimiter
-    /// # Safety
+    /// Gets a str reference from the backing bytes starting at byte `offset`.
     ///
-    /// This function creates a `Strtab` directly from a raw pointer and size
-    pub unsafe fn from_raw(ptr: *const u8, size: usize, delim: u8) -> Strtab<'a> {
-        Strtab {
-            delim: ctx::StrCtx::Delimiter(delim),
-            bytes: slice::from_raw_parts(ptr, size),
+    /// If the index is out of bounds, `None` is returned. Panics if bytes are invalid UTF-8.
+    /// Use this method if the `Strtab` was created using `from_slice_unparsed()`.
+    pub fn get_unsafe(&self, offset: usize) -> Option<&'a str> {
+        if offset >= self.bytes.len() {
+            None
+        } else {
+            Some(get_str(offset, self.bytes, self.delim).unwrap())
         }
     }
     #[cfg(feature = "alloc")]
-    /// Parses a strtab from `bytes` at `offset` with `len` size as the backing string table, using `delim` as the delimiter
-    pub fn parse(
-        bytes: &'a [u8],
-        offset: usize,
-        len: usize,
-        delim: u8,
-    ) -> error::Result<Strtab<'a>> {
+    /// Parses a `Strtab` from `bytes` at `offset` with `len` size as the backing string table, using `delim` as the delimiter.
+    ///
+    /// Errors if bytes are invalid UTF-8.
+    /// Requires `feature = "alloc"`
+    pub fn parse(bytes: &'a [u8], offset: usize, len: usize, delim: u8) -> error::Result<Self> {
         let (end, overflow) = offset.overflowing_add(len);
         if overflow || end > bytes.len() {
             return Err(error::Error::Malformed(format!(
@@ -60,28 +72,74 @@
                 overflow
             )));
         }
-        Ok(Strtab {
-            bytes: &bytes[offset..end],
-            delim: ctx::StrCtx::Delimiter(delim),
-        })
+        let mut result = Self::from_slice_unparsed(bytes, offset, len, delim);
+        let mut i = 0;
+        while i < result.bytes.len() {
+            let string = get_str(i, result.bytes, result.delim)?;
+            result.strings.push((i, string));
+            i += string.len() + 1;
+        }
+        Ok(result)
     }
     #[cfg(feature = "alloc")]
-    /// Converts the string table to a vector, with the original `delim` used to separate the strings
+    /// Parses a `Strtab` with `bytes` as the backing string table, using `delim` as the delimiter between entries.
+    ///
+    /// Requires `feature = "alloc"`
+    pub fn new_preparsed(bytes: &'a [u8], delim: u8) -> error::Result<Self> {
+        Self::parse(bytes, 0, bytes.len(), delim)
+    }
+    #[cfg(feature = "alloc")]
+    /// Converts the string table to a vector of parsed strings.
+    ///
+    /// Requires `feature = "alloc"`
     pub fn to_vec(&self) -> error::Result<Vec<&'a str>> {
-        let len = self.bytes.len();
-        let mut strings = Vec::with_capacity(len);
-        let mut i = 0;
-        while i < len {
-            let string = self.get(i).unwrap()?;
-            i = i + string.len() + 1;
-            strings.push(string);
+        // Fallback in case `Strtab` was created using `from_slice_unparsed()`.
+        if self.strings.is_empty() {
+            let mut result = Vec::new();
+            let mut i = 0;
+            while i < self.bytes.len() {
+                let string = get_str(i, self.bytes, self.delim)?;
+                result.push(string);
+                i += string.len() + 1;
+            }
+            return Ok(result);
         }
-        Ok(strings)
+        Ok(self.strings.iter().map(|&(_key, value)| value).collect())
     }
-    /// Safely parses and gets a str reference from the backing bytes starting at byte `offset`.
+    #[cfg(feature = "alloc")]
+    /// Safely gets a str reference from the parsed table starting at byte `offset`.
+    ///
     /// If the index is out of bounds, `None` is returned.
     /// Requires `feature = "alloc"`
+    pub fn get_at(&self, offset: usize) -> Option<&'a str> {
+        match self
+            .strings
+            .binary_search_by_key(&offset, |&(key, _value)| key)
+        {
+            Ok(index) => Some(self.strings[index].1),
+            Err(index) => {
+                if index == 0 {
+                    return None;
+                }
+                let (string_begin_offset, entire_string) = self.strings[index - 1];
+                entire_string.get(offset - string_begin_offset..)
+            }
+        }
+    }
+    #[deprecated(since = "0.4.2", note = "Use from_slice_unparsed() instead")]
+    /// Construct a strtab from a `ptr`, and a `size`, using `delim` as the delimiter
+    ///
+    /// # Safety
+    /// This function creates a `Strtab` directly from a raw pointer and size
+    pub unsafe fn from_raw(ptr: *const u8, len: usize, delim: u8) -> Strtab<'a> {
+        Self::from_slice_unparsed(core::slice::from_raw_parts(ptr, len), 0, len, delim)
+    }
+    #[deprecated(since = "0.4.2", note = "Bad performance, use get_at() instead")]
     #[cfg(feature = "alloc")]
+    /// Parses a str reference from the parsed table starting at byte `offset`.
+    ///
+    /// If the index is out of bounds, `None` is returned.
+    /// Requires `feature = "alloc"`
     pub fn get(&self, offset: usize) -> Option<error::Result<&'a str>> {
         if offset >= self.bytes.len() {
             None
@@ -89,15 +147,6 @@
             Some(get_str(offset, self.bytes, self.delim).map_err(core::convert::Into::into))
         }
     }
-    /// Gets a str reference from the backing bytes starting at byte `offset`.
-    /// If the index is out of bounds, `None` is returned. Panics if bytes are invalid UTF-8.
-    pub fn get_unsafe(&self, offset: usize) -> Option<&'a str> {
-        if offset >= self.bytes.len() {
-            None
-        } else {
-            Some(get_str(offset, self.bytes, self.delim).unwrap())
-        }
-    }
 }
 
 impl<'a> fmt::Debug for Strtab<'a> {
@@ -110,10 +159,12 @@
 }
 
 impl<'a> Default for Strtab<'a> {
-    fn default() -> Strtab<'a> {
-        Strtab {
-            bytes: &[],
+    fn default() -> Self {
+        Self {
             delim: ctx::StrCtx::default(),
+            bytes: &[],
+            #[cfg(feature = "alloc")]
+            strings: Vec::new(),
         }
     }
 }
@@ -133,8 +184,7 @@
 
 #[test]
 fn as_vec_no_final_null() {
-    let bytes = b"\0printf\0memmove\0busta";
-    let strtab = unsafe { Strtab::from_raw(bytes.as_ptr(), bytes.len(), 0x0) };
+    let strtab = Strtab::new_preparsed(b"\0printf\0memmove\0busta", 0x0).unwrap();
     let vec = strtab.to_vec().unwrap();
     assert_eq!(vec.len(), 4);
     assert_eq!(vec, vec!["", "printf", "memmove", "busta"]);
@@ -142,8 +192,7 @@
 
 #[test]
 fn as_vec_no_first_null_no_final_null() {
-    let bytes = b"printf\0memmove\0busta";
-    let strtab = unsafe { Strtab::from_raw(bytes.as_ptr(), bytes.len(), 0x0) };
+    let strtab = Strtab::new_preparsed(b"printf\0memmove\0busta", 0x0).unwrap();
     let vec = strtab.to_vec().unwrap();
     assert_eq!(vec.len(), 3);
     assert_eq!(vec, vec!["printf", "memmove", "busta"]);
@@ -151,8 +200,7 @@
 
 #[test]
 fn to_vec_final_null() {
-    let bytes = b"\0printf\0memmove\0busta\0";
-    let strtab = unsafe { Strtab::from_raw(bytes.as_ptr(), bytes.len(), 0x0) };
+    let strtab = Strtab::new_preparsed(b"\0printf\0memmove\0busta\0", 0x0).unwrap();
     let vec = strtab.to_vec().unwrap();
     assert_eq!(vec.len(), 4);
     assert_eq!(vec, vec!["", "printf", "memmove", "busta"]);
@@ -160,9 +208,39 @@
 
 #[test]
 fn to_vec_newline_delim() {
-    let bytes = b"\nprintf\nmemmove\nbusta\n";
-    let strtab = unsafe { Strtab::from_raw(bytes.as_ptr(), bytes.len(), b'\n') };
+    let strtab = Strtab::new_preparsed(b"\nprintf\nmemmove\nbusta\n", b'\n').unwrap();
     let vec = strtab.to_vec().unwrap();
     assert_eq!(vec.len(), 4);
     assert_eq!(vec, vec!["", "printf", "memmove", "busta"]);
 }
+
+#[test]
+fn parse_utf8() {
+    assert!(match Strtab::new_preparsed(&[0x80, 0x80], b'\n') {
+        Err(error::Error::Scroll(scroll::Error::BadInput {
+            size: 2,
+            msg: "invalid utf8",
+        })) => true,
+        _ => false,
+    });
+    assert!(
+        match Strtab::new_preparsed(&[0xC6, 0x92, 0x6F, 0x6F], b'\n') {
+            Ok(_) => true,
+            _ => false,
+        }
+    );
+}
+
+#[test]
+fn get_at_utf8() {
+    let strtab = Strtab::new_preparsed("\nƒoo\nmemmove\n🅱�usta\n".as_bytes(), b'\n').unwrap();
+    assert_eq!(strtab.get_at(0), Some(""));
+    assert_eq!(strtab.get_at(5), Some(""));
+    assert_eq!(strtab.get_at(6), Some("memmove"));
+    assert_eq!(strtab.get_at(14), Some("\u{1f171}\u{fe0f}usta"));
+    assert_eq!(strtab.get_at(16), None);
+    assert_eq!(strtab.get_at(18), Some("\u{fe0f}usta"));
+    assert_eq!(strtab.get_at(21), Some("usta"));
+    assert_eq!(strtab.get_at(25), Some(""));
+    assert_eq!(strtab.get_at(26), None);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/tests/archive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/tests/archive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/tests/archive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/tests/archive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,6 +47,8 @@
             } else {
                 panic!("could not get crt1.o");
             }
+            assert_eq!(archive.len(), 1);
+            assert_eq!(archive.get_at(0).unwrap().extended_name(), "crt1.o");
         }
         Err(err) => panic!("could not parse archive: {:?}", err),
     };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/tests/bins/elf/gnu_hash/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/tests/bins/elf/gnu_hash/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/tests/bins/elf/gnu_hash/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/tests/bins/elf/gnu_hash/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -21,6 +21,70 @@
     10: 000000000000067b    43 FUNC    GLOBAL DEFAULT   12 main
     11: 0000000000000520     0 FUNC    GLOBAL DEFAULT    9 _init
     12: 00000000000006a8     0 FUNC    GLOBAL DEFAULT   13 _fini
+
+% readelf --section-headers hello.so
+There are 26 section headers, starting at offset 0x1140:
+
+Section Headers:
+  [Nr] Name              Type             Address           Offset
+       Size              EntSize          Flags  Link  Info  Align
+  [ 0]                   NULL             0000000000000000  00000000
+       0000000000000000  0000000000000000           0     0     0
+  [ 1] .note.gnu.build-i NOTE             00000000000001c8  000001c8
+       0000000000000024  0000000000000000   A       0     0     4
+  [ 2] .gnu.hash         GNU_HASH         00000000000001f0  000001f0
+       0000000000000040  0000000000000000   A       3     0     8
+  [ 3] .dynsym           DYNSYM           0000000000000230  00000230
+       0000000000000138  0000000000000018   A       4     1     8
+  [ 4] .dynstr           STRTAB           0000000000000368  00000368
+       00000000000000a6  0000000000000000   A       0     0     1
+  [ 5] .gnu.version      VERSYM           000000000000040e  0000040e
+       000000000000001a  0000000000000002   A       3     0     2
+  [ 6] .gnu.version_r    VERNEED          0000000000000428  00000428
+       0000000000000020  0000000000000000   A       4     1     8
+  [ 7] .rela.dyn         RELA             0000000000000448  00000448
+       00000000000000a8  0000000000000018   A       3     0     8
+  [ 8] .rela.plt         RELA             00000000000004f0  000004f0
+       0000000000000030  0000000000000018  AI       3    21     8
+  [ 9] .init             PROGBITS         0000000000000520  00000520
+       0000000000000017  0000000000000000  AX       0     0     4
+  [10] .plt              PROGBITS         0000000000000540  00000540
+       0000000000000030  0000000000000010  AX       0     0     16
+  [11] .plt.got          PROGBITS         0000000000000570  00000570
+       0000000000000008  0000000000000008  AX       0     0     8
+  [12] .text             PROGBITS         0000000000000580  00000580
+       0000000000000126  0000000000000000  AX       0     0     16
+  [13] .fini             PROGBITS         00000000000006a8  000006a8
+       0000000000000009  0000000000000000  AX       0     0     4
+  [14] .rodata           PROGBITS         00000000000006b1  000006b1
+       0000000000000010  0000000000000000   A       0     0     1
+  [15] .eh_frame_hdr     PROGBITS         00000000000006c4  000006c4
+       000000000000002c  0000000000000000   A       0     0     4
+  [16] .eh_frame         PROGBITS         00000000000006f0  000006f0
+       000000000000009c  0000000000000000   A       0     0     8
+  [17] .init_array       INIT_ARRAY       0000000000200e10  00000e10
+       0000000000000008  0000000000000008  WA       0     0     8
+  [18] .fini_array       FINI_ARRAY       0000000000200e18  00000e18
+       0000000000000008  0000000000000008  WA       0     0     8
+  [19] .dynamic          DYNAMIC          0000000000200e20  00000e20
+       00000000000001c0  0000000000000010  WA       4     0     8
+  [20] .got              PROGBITS         0000000000200fe0  00000fe0
+       0000000000000020  0000000000000008  WA       0     0     8
+  [21] .got.plt          PROGBITS         0000000000201000  00001000
+       0000000000000028  0000000000000008  WA       0     0     8
+  [22] .data             PROGBITS         0000000000201028  00001028
+       0000000000000008  0000000000000000  WA       0     0     8
+  [23] .bss              NOBITS           0000000000201030  00001030
+       0000000000000008  0000000000000000  WA       0     0     1
+  [24] .comment          PROGBITS         0000000000000000  00001030
+       000000000000002a  0000000000000001  MS       0     0     1
+  [25] .shstrtab         STRTAB           0000000000000000  0000105a
+       00000000000000e1  0000000000000000           0     0     1
+Key to Flags:
+  W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
+  L (link order), O (extra OS processing required), G (group), T (TLS),
+  C (compressed), x (unknown), o (OS specific), E (exclude),
+  l (large), p (processor specific)
 ```
 
 Or in 32-bit mode (one might need to install `gcc-multilib` on Ubuntu):
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/tests/compare_dyldinfos.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/tests/compare_dyldinfos.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/tests/compare_dyldinfos.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/tests/compare_dyldinfos.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,19 @@
 use std::process;
 
+fn get_realpath(cmd: &str) -> String {
+    let output = process::Command::new("/usr/bin/xcrun")
+        .arg("-f")
+        .arg(cmd)
+        .output()
+        .expect("can get realpath");
+    String::from_utf8(output.stdout).expect("output is valid utf8")
+}
+
 pub fn compare(args: Vec<&str>) {
-    let apple = process::Command::new("/Library/Developer/CommandLineTools/usr/bin/dyldinfo")
+    let apple = process::Command::new("/usr/bin/xcrun")
+        .arg("dyldinfo")
+        .arg("-arch")
+        .arg("x86_64")
         .args(&args)
         .output()
         .expect("run Apple dyldinfo");
@@ -12,6 +24,8 @@
         .arg("--example")
         .arg("dyldinfo")
         .arg("--")
+        .arg("-arch")
+        .arg("x86_64")
         .args(&args)
         .output()
         .expect("run cargo dyldinfo");
@@ -39,39 +53,28 @@
 #[cfg(target_os = "macos")]
 #[test]
 fn compare_binds() {
-    compare(vec![
-        "-bind",
-        "/Library/Developer/CommandLineTools/usr/bin/dyldinfo",
-    ]);
-    compare(vec![
-        "-bind",
-        "/Library/Developer/CommandLineTools/usr/bin/clang",
-    ]);
+    let dyldinfo = get_realpath("dyldinfo");
+    let clang = get_realpath("clang");
+    compare(vec!["-bind", &dyldinfo]);
+    compare(vec!["-bind", &clang]);
     compare(vec!["-bind", "/usr/bin/tmutil"]);
 }
 
 #[cfg(target_os = "macos")]
 #[test]
 fn compare_lazy_binds() {
-    compare(vec![
-        "-lazy_bind",
-        "/Library/Developer/CommandLineTools/usr/bin/dyldinfo",
-    ]);
-    compare(vec![
-        "-lazy_bind",
-        "/Library/Developer/CommandLineTools/usr/bin/clang",
-    ]);
+    let dyldinfo = get_realpath("dyldinfo");
+    let clang = get_realpath("clang");
+    compare(vec!["-lazy_bind", &dyldinfo]);
+    compare(vec!["-lazy_bind", &clang]);
     compare(vec!["-lazy_bind", "/usr/bin/tmutil"]);
 }
 
 #[cfg(target_os = "macos")]
 #[test]
 fn compare_combined_options() {
-    compare(vec![
-        "-lazy_bind",
-        "-bind",
-        "/Library/Developer/CommandLineTools/usr/bin/dyldinfo",
-    ]);
+    let dyldinfo = get_realpath("dyldinfo");
+    compare(vec!["-lazy_bind", "-bind", &dyldinfo]);
 }
 
 #[cfg(not(target_os = "macos"))]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/tests/elf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/tests/elf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/goblin/tests/elf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/goblin/tests/elf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,3 @@
-use std::slice;
-
 use goblin::elf::section_header::SHT_GNU_HASH;
 use goblin::elf::sym::Sym;
 use goblin::elf::Elf;
@@ -17,11 +15,11 @@
         .iter()
         .find(|s| s.sh_type == SHT_GNU_HASH)
         .ok_or("object does not contain .gnu.hash section")?;
-    let hashtab: &[u8] = unsafe {
-        let addr = base.as_ptr().add(hash_section.sh_offset as usize);
-        let size = hash_section.sh_size as usize;
-        slice::from_raw_parts(addr, size)
-    };
+    let (start, length) = (
+        hash_section.sh_offset as usize,
+        hash_section.sh_size as usize,
+    );
+    let hashtab: &[u8] = &base[start..(start + length)];
     let dynsyms = obj.dynsyms.to_vec();
     let section = unsafe {
         if obj.is_64 {
@@ -33,6 +31,44 @@
     section.copied().ok_or("cannot find symbol")
 }
 
+// Use lazy_parse and assembles the Elf with only parts we care
+fn parse_text_section_size_lazy(base: &[u8]) -> Result<u64, &'static str> {
+    let header = Elf::parse_header(base).map_err(|_| "parse elf header error")?;
+    // dummy Elf with only header
+    let mut obj = Elf::lazy_parse(header).map_err(|_| "cannot parse ELF file")?;
+
+    use goblin::container::{Container, Ctx};
+    use goblin::elf::SectionHeader;
+    use goblin::strtab::Strtab;
+
+    let ctx = Ctx {
+        le: scroll::Endian::Little,
+        container: Container::Big,
+    };
+
+    obj.section_headers =
+        SectionHeader::parse(base, header.e_shoff as usize, header.e_shnum as usize, ctx)
+            .map_err(|_| "parse section headers error")?;
+
+    let strtab_idx = header.e_shstrndx as usize;
+    let strtab_shdr = &obj.section_headers[strtab_idx];
+    let strtab = Strtab::parse(
+        base,
+        strtab_shdr.sh_offset as usize,
+        strtab_shdr.sh_size as usize,
+        0x0,
+    )
+    .map_err(|_| "parse string table error")?;
+    for (_, section) in obj.section_headers.iter().enumerate() {
+        let section_name = strtab.get_at(section.sh_name).unwrap();
+        if section_name == ".text" {
+            return Ok(section.sh_size);
+        }
+    }
+
+    Err("Didn't find text section")
+}
+
 #[test]
 fn test_parse_gnu_hash_section_64bit() {
     static ALIGNED_DATA: &AlignedData<[u8]> =
@@ -100,6 +136,13 @@
 }
 
 #[test]
+fn test_parse_text_section_size_lazy() {
+    static ALIGNED_DATA: &AlignedData<[u8]> =
+        &AlignedData(*include_bytes!("bins/elf/gnu_hash/hello.so"));
+    assert_eq!(parse_text_section_size_lazy(&ALIGNED_DATA.0), Ok(0x126));
+}
+
+#[test]
 fn test_oom() {
     use goblin::container::{Container, Ctx};
     use scroll::Pwrite;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"ef28734a184b6a1fe5372f284bf924863e2a0b3727635a6cbb070b408f0b10c6","CONTRIBUTING.md":"eff9610bd3a73e6c297b9b487a629bcdb40da9090e6e28c26e48fcfd3a899a6c","Cargo.lock":"af2b8735c72c1e2253ac2d0ddae15f56fa892b2d675d1f7a51553a5d9f62b1d5","Cargo.toml":"458c3ec8d3f8e7d2bddd0bdd461aa19a16d6b59e4aee84d32c76f14061e6e3ed","LICENSE":"b21623012e6c453d944b0342c515b631cfcbf30704c2621b291526b69c10724d","README.md":"1c23aebc383c31dd70a14880c93ec2ddac0001aa4ba1d8f3c5b0a9897fa5ef11","examples/akamai.rs":"f8d310ba4ba0364f887746071f76f566fdffa3b0959050ec07c47afeeb8786d4","examples/client.rs":"5ad136b838e9d55ae3d1fd8801cec4af88139b58864d6438f75d0e173eb3aeb3","examples/server.rs":"254447655808eabf6ffd0718f011d445351d5c2399fe2d545b46bcddb725f2fb","src/client.rs":"deea7e36f8f0ead43baacc8d406195c9f27a6e6e696ceba31d97f15928c622d0","src/codec/error.rs":"beb559466193d480f853cc0b26033667d01d9946239f74539dcf103d314c7ef4","src/codec/framed_read.rs":"43e877d43110e3c658c62c010e4dc0c4d56f4d2548f46f6d5eae99330e3e65d4","src/codec/framed_write.rs":"87e0354671f9137462e724e40a84f815b661fb00a3b932ce3a693385f4db99f1","src/codec/mod.rs":"10ed96b6e187a86c827f066bb81b4047dbdff942f9cc7fab81bd37c989a8a9c1","src/error.rs":"445f810c0d9f3bdd2889792aac00d6af06363c0d8e5cb73a400ae39191cdefde","src/frame/data.rs":"dd34ef8f82345aaa1b2def2c170a317c83a56de4f37324a635251812aa15ed6e","src/frame/go_away.rs":"f76843de59a0e3e82536972af7754498c3913577ee248a6e1601df2b68e06c96","src/frame/head.rs":"9cde126609db8ddd1e27b8212af3a613a1d59461166567ae1c97fcba7902f2fe","src/frame/headers.rs":"8791424e960ec1d5a851a181b1cc76ee945a445b1104c31ed0110e58d9cb50e0","src/frame/mod.rs":"f1baebdfff10c0f1d9937681b0f21df8631196c285aa860516235d49275ae90f","src/frame/ping.rs":"ff4e4059101300e7b03c23d271026b058da4315c3bd68280422e144c2aa1b9e6","src/frame/priority.rs":"9392b7aa2636157024dc645c92d0e450a4d3f7a53bc9de1188d3b61178c2b5fc","src/frame/reason.rs":"4337f5933bfd4064337c80d3c110f51514cbdfb97bc26f4980ee009e4f6fa773","src/frame/reset.rs":"7dceecf432ee82bea3f02ce50065350f6f7cf02f98378e7608568e3eb5bf913a","src/frame/settings.rs":"c769341d0fb009a3d7e57862a371dd223028f327628b466b2c22368c8ca06b26","src/frame/stream_id.rs":"0aa72cc3d735aa31e4d0cca0a8b94bae75c97d041c3712fe8e49f687881a73fe","src/frame/util.rs":"1a1408ddefe35f9efe5faa5360cb5ecc461fc0846175d4b43031720da7f5188d","src/frame/window_update.rs":"05c1b84478208802d09154f5d6fb5eb886d45397f43ccc6ccbf40bf3be912819","src/hpack/decoder.rs":"8e2875460c860abfa1eb5cfb5e23d14ed49f575be62ba2b07f23a6b3d37120fa","src/hpack/encoder.rs":"2ed0de2e967914f42340b36c006d9134416a403e1e4a1939d7be747926156405","src/hpack/header.rs":"d5b5ed925d4cf06b13a765d34f858004d1dd0003fd2e1d35d7927f86cf34f1dc","src/hpack/huffman/mod.rs":"04fc9b146177e7bf615156b8570fa0f97b89f68a2c02b946778711728b81e81f","src/hpack/huffman/table.rs":"6b7f94af0bb5d236d4e671eff4afe5dc254a20eaddd2d57dd6e8f53e2a60c337","src/hpack/mod.rs":"702a0b41ef5aa9e83683cec25363fb4f9c0f61c6697f9def9994967440fea378","src/hpack/table.rs":"c76073d0cf07e6379b4d4b26bc3883b69d7c5555dd1c0c38a5e2c69b80e59330","src/hpack/test/fixture.rs":"d451057b056e20ba7723ca7a395cba7819e69fc2ae788d9f9e676558f1fba6fb","src/hpack/test/fuzz.rs":"3db484a9b73597ac59af5135599e255771f3c2ef96e9457e2d513f8cd53ea18c","src/hpack/test/mod.rs":"56ad5643e7f1e273e5bce8a6fc0552be39c326dacfffd7f9757ccdbe75e9b66e","src/lib.rs":"e961dde655fbcef5c312ca596902a591f82868abe5f5042378532a881c497ec1","src/proto/connection.rs":"ea34073ce94db5a6bde6e739e2f6ddd8b2f5f117c0c4e73397144105bd925ee3","src/proto/error.rs":"7486777b6d9f13c9df3e4a921196e6d16ae45922b4e34aa15282876198d1ebf7","src/proto/go_away.rs":"16fdecca841ce046960d29ca03a3dbf61886e4b7b9532217dde493ebcdc10477","src/proto/mod.rs":"010fba0601c69ae1ad58a7d3abdb9c0090ab3e0902f76e836be55780456dec8c","src/proto/peer.rs":"6047ab139e774d50fc4def41508869a6fed950007825d3e76141840d4b01dcff","src/proto/ping_pong.rs":"ca88afbe2e3cec1c5dd348ecf241e767157202d7ee98804dbab35568c7144ce2","src/proto/settings.rs":"4b2cd95dbde4b4caf750d3761221cf680d1830247a18f18fb778e7b9f2c54263","src/proto/streams/buffer.rs":"949ac62539b144095fcda2e00002fa5dba5e32e7671735de040ccaf091911233","src/proto/streams/counts.rs":"9f490cea470e5118b8458603876e34d2012a61720ebbb9508eefe9344878d733","src/proto/streams/flow_control.rs":"bb85d9848b798b15a5f6d692bf2b6345d0aecccf43adfc431d6bef44a152d301","src/proto/streams/mod.rs":"27ac7844762633fdf0413ef483342fe394d5d5f5246776f39f8791e0db17befb","src/proto/streams/prioritize.rs":"4a4c9be45199263cd33344dad4245688a3fa4429ef130f5b160f38123af465b2","src/proto/streams/recv.rs":"5ddc3e62b11aa725e5c57c254d76dbad199bf5d62970f0d068634e63545a33dd","src/proto/streams/send.rs":"2fcff0e988daf1c84d2a4b008ae651b17d8c83aa6060133e98579ee678b9fec2","src/proto/streams/state.rs":"56f960a2f4fbbc005c87f57f0689f1df053517eea23fbd7d846f8afa832af611","src/proto/streams/store.rs":"75c6b6f8d6fe3f2a4ddc2e821fbad4be7a813f2ed04ee7f423ad622cbec43a83","src/proto/streams/stream.rs":"e948c7c34472b934e87b6dc5ddc624a5e4d98b3cb6aed287bf843b5f775a6bfc","src/proto/streams/streams.rs":"4982a7820de20f15dcbb01330517fd8b81cbd37f9e30f760f605286c263173b2","src/server.rs":"6b984fe7c4c9c8fde7fba180517193cd04481b36c955f10f1fd119655bd9093a","src/share.rs":"c4cc610228d6d42d803b303b2988d8bfcb1fb0bfbc5b81c45ef168b02bfdd738"},"package":"5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"e2ad423ee9ce9a35bbc002c3237396630545b2f9b2eba8afec8ef2ce12262e6b","CONTRIBUTING.md":"eff9610bd3a73e6c297b9b487a629bcdb40da9090e6e28c26e48fcfd3a899a6c","Cargo.lock":"cb84013efe86c387f23e54564dfdeefb1e9b922447762885b968c52dfd3d45f5","Cargo.toml":"e846be94a8f2b6d1754688e4b4d71debf9cfd171ea749f5bf9bbef1fd6cb2cd5","LICENSE":"b21623012e6c453d944b0342c515b631cfcbf30704c2621b291526b69c10724d","README.md":"1c23aebc383c31dd70a14880c93ec2ddac0001aa4ba1d8f3c5b0a9897fa5ef11","examples/akamai.rs":"f8d310ba4ba0364f887746071f76f566fdffa3b0959050ec07c47afeeb8786d4","examples/client.rs":"5ad136b838e9d55ae3d1fd8801cec4af88139b58864d6438f75d0e173eb3aeb3","examples/server.rs":"8cc7927c7fe98a2474c41ab0094ba2dc7a2ae6a7f58ce342a4c05bb8056a63a5","src/client.rs":"c23d51eba494dce6660f435ffe55688480f16f6f1e5d3350c86e05805480bef0","src/codec/error.rs":"beb559466193d480f853cc0b26033667d01d9946239f74539dcf103d314c7ef4","src/codec/framed_read.rs":"e1b4e5b31fd17f2df98de7b7f29fd656643db4e70b2277e870500604cb6f0974","src/codec/framed_write.rs":"6ae09b84e8c6bf818f99c2ebcafe01073146a33bae090874d5f4221e6309d9ae","src/codec/mod.rs":"10ed96b6e187a86c827f066bb81b4047dbdff942f9cc7fab81bd37c989a8a9c1","src/error.rs":"445f810c0d9f3bdd2889792aac00d6af06363c0d8e5cb73a400ae39191cdefde","src/frame/data.rs":"65fbfe306d525df7ac0ba229ca75ec3d142203ec62ddd3df0b8452da1496da3e","src/frame/go_away.rs":"f76843de59a0e3e82536972af7754498c3913577ee248a6e1601df2b68e06c96","src/frame/head.rs":"9cde126609db8ddd1e27b8212af3a613a1d59461166567ae1c97fcba7902f2fe","src/frame/headers.rs":"d25c1f2e521dfee8dcf417e1b3a34a32e63e58a7937e0be8a597263a1d061aff","src/frame/mod.rs":"8361e4a1754e50227f2e32bb85bb99a98797c2d9900f13e692e9f22e9bff9653","src/frame/ping.rs":"ff4e4059101300e7b03c23d271026b058da4315c3bd68280422e144c2aa1b9e6","src/frame/priority.rs":"9392b7aa2636157024dc645c92d0e450a4d3f7a53bc9de1188d3b61178c2b5fc","src/frame/reason.rs":"4337f5933bfd4064337c80d3c110f51514cbdfb97bc26f4980ee009e4f6fa773","src/frame/reset.rs":"7dceecf432ee82bea3f02ce50065350f6f7cf02f98378e7608568e3eb5bf913a","src/frame/settings.rs":"c769341d0fb009a3d7e57862a371dd223028f327628b466b2c22368c8ca06b26","src/frame/stream_id.rs":"0aa72cc3d735aa31e4d0cca0a8b94bae75c97d041c3712fe8e49f687881a73fe","src/frame/util.rs":"1a1408ddefe35f9efe5faa5360cb5ecc461fc0846175d4b43031720da7f5188d","src/frame/window_update.rs":"05c1b84478208802d09154f5d6fb5eb886d45397f43ccc6ccbf40bf3be912819","src/fuzz_bridge.rs":"a233d7c986671a91fd84af996a281068814e6d3a1fd7f22a77e4b4cd54a0d773","src/hpack/decoder.rs":"9c736559f00b5ecfe805c715cacf239fab4b2beff3f6a673eab2c4cff98995c2","src/hpack/encoder.rs":"8640db878e74600b01488247cace78d387c7d1933fedc2990660c2bbfa6781e5","src/hpack/header.rs":"3453be0d48ac0768360b723ea6c3668056a8f9c27562eb6845c493fa3cca761e","src/hpack/huffman/mod.rs":"04fc9b146177e7bf615156b8570fa0f97b89f68a2c02b946778711728b81e81f","src/hpack/huffman/table.rs":"6b7f94af0bb5d236d4e671eff4afe5dc254a20eaddd2d57dd6e8f53e2a60c337","src/hpack/mod.rs":"702a0b41ef5aa9e83683cec25363fb4f9c0f61c6697f9def9994967440fea378","src/hpack/table.rs":"c76073d0cf07e6379b4d4b26bc3883b69d7c5555dd1c0c38a5e2c69b80e59330","src/hpack/test/fixture.rs":"9ab6b0ed15fa3643e012bd2742e89ecf7aab821e2d0713dc6835c332611f2ec7","src/hpack/test/fuzz.rs":"c2724a48a1c3d7330e43fd381123d55a1c0bb8d73ef07e8c82ca6c495768c4c7","src/hpack/test/mod.rs":"56ad5643e7f1e273e5bce8a6fc0552be39c326dacfffd7f9757ccdbe75e9b66e","src/lib.rs":"b48e7b98a61464d70dbe3b192d690af9c7100693b4232602ce8ea67aeeb02892","src/proto/connection.rs":"fe7efe1bb8a329ce093505be4012b3b496d8dedf4632e3e33e7135a4872dc601","src/proto/error.rs":"7486777b6d9f13c9df3e4a921196e6d16ae45922b4e34aa15282876198d1ebf7","src/proto/go_away.rs":"16fdecca841ce046960d29ca03a3dbf61886e4b7b9532217dde493ebcdc10477","src/proto/mod.rs":"9a858c0c937cc9209b6cb5c0feeaf41ec116d58e2c3c7483fa7460e3e66bf0f3","src/proto/peer.rs":"6047ab139e774d50fc4def41508869a6fed950007825d3e76141840d4b01dcff","src/proto/ping_pong.rs":"eb4757f4ba7e4f323d38724e1a09476c29efda01c5606af8e1b6e91942af45e1","src/proto/settings.rs":"4b2cd95dbde4b4caf750d3761221cf680d1830247a18f18fb778e7b9f2c54263","src/proto/streams/buffer.rs":"cf2205c607f8a6b8aa8662983d9907fedeb14b5890e051d8e63d7bc2b0a960e9","src/proto/streams/counts.rs":"46e9e574d1c804b0b3a426c393a81867d8a10f553859b4964dbfd9ef9a44ee94","src/proto/streams/flow_control.rs":"bb85d9848b798b15a5f6d692bf2b6345d0aecccf43adfc431d6bef44a152d301","src/proto/streams/mod.rs":"72cd11d368ba26b65abae838ad1d7baf15ba338d57e61ceed9d62d182cb58f8c","src/proto/streams/prioritize.rs":"62caf7b502849a15a37d0fb06315b833bc816506a1cc359a6d377c84e7ffbedc","src/proto/streams/recv.rs":"5edb1b719509beae75afbf7a17835e7212d3fef62428f0d24f06c3c0d6c0d3f7","src/proto/streams/send.rs":"2fcff0e988daf1c84d2a4b008ae651b17d8c83aa6060133e98579ee678b9fec2","src/proto/streams/state.rs":"85db4958e88e25a2905186ff04c4daf6c9061b237e3b05fece26721dae7e2541","src/proto/streams/store.rs":"cd48eefcf0fd45788c20e52a9c251141eeae2dae284dbf506ebcfbe2e2fa41f5","src/proto/streams/stream.rs":"e948c7c34472b934e87b6dc5ddc624a5e4d98b3cb6aed287bf843b5f775a6bfc","src/proto/streams/streams.rs":"ea6e9cd580237bf1a462a175b5c28441518acf0d0613df54a83e38355d70e3db","src/server.rs":"a5e1a9ffbd713cedead499d91b5719d56091a5a5354a62ea85ce78c9c09b067e","src/share.rs":"0f8629a40390a62e34e9ab5b0590877af5616e48a70bde484af469de23053f7d"},"package":"d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -13,54 +15,39 @@
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "base64"
-version = "0.10.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
 
 [[package]]
 name = "bytes"
-version = "0.5.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
 [[package]]
 name = "cc"
-version = "1.0.58"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "env_logger"
@@ -87,54 +74,39 @@
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
 [[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
 name = "futures-core"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
 
 [[package]]
 name = "futures-sink"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
 
 [[package]]
 name = "futures-task"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
+ "autocfg",
  "futures-core",
  "futures-task",
- "pin-project",
+ "pin-project-lite",
  "pin-utils",
 ]
 
 [[package]]
 name = "h2"
-version = "0.2.7"
+version = "0.3.4"
 dependencies = [
  "bytes",
  "env_logger",
@@ -155,7 +127,6 @@
  "tokio-rustls",
  "tokio-util",
  "tracing",
- "tracing-futures",
  "walkdir",
  "webpki",
  "webpki-roots",
@@ -163,18 +134,15 @@
 
 [[package]]
 name = "hashbrown"
-version = "0.8.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
-dependencies = [
- "autocfg",
-]
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
@@ -187,9 +155,9 @@
 
 [[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
  "bytes",
  "fnv",
@@ -207,34 +175,25 @@
 
 [[package]]
 name = "indexmap"
-version = "1.5.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg",
  "hashbrown",
 ]
 
 [[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "js-sys"
-version = "0.3.42"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2"
+checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -257,98 +216,77 @@
 
 [[package]]
 name = "libc"
-version = "0.2.73"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
+checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "mio"
-version = "0.6.22"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
- "cfg-if",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
  "libc",
  "log",
  "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
+ "ntapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "miow"
-version = "0.2.1"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
 dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "winapi 0.3.9",
 ]
 
 [[package]]
-name = "net2"
-version = "0.2.34"
+name = "ntapi"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
 dependencies = [
- "cfg-if",
- "libc",
  "winapi 0.3.9",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
-
-[[package]]
-name = "pin-project"
-version = "0.4.23"
+name = "num_cpus"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
 dependencies = [
- "pin-project-internal",
+ "hermit-abi",
+ "libc",
 ]
 
 [[package]]
-name = "pin-project-internal"
-version = "0.4.23"
+name = "once_cell"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.7"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -358,9 +296,9 @@
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.19"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
 dependencies = [
  "unicode-xid",
 ]
@@ -382,9 +320,9 @@
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
@@ -438,9 +376,9 @@
 
 [[package]]
 name = "ring"
-version = "0.16.15"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
  "cc",
  "libc",
@@ -453,9 +391,9 @@
 
 [[package]]
 name = "rustls"
-version = "0.16.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
  "base64",
  "log",
@@ -482,9 +420,9 @@
 
 [[package]]
 name = "sct"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
 dependencies = [
  "ring",
  "untrusted",
@@ -492,15 +430,15 @@
 
 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
 
 [[package]]
 name = "serde_json"
-version = "1.0.57"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
 dependencies = [
  "itoa",
  "ryu",
@@ -509,9 +447,9 @@
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
 
 [[package]]
 name = "spin"
@@ -521,9 +459,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.36"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
+checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -532,35 +470,35 @@
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "tokio"
-version = "0.2.22"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
+checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
 dependencies = [
+ "autocfg",
  "bytes",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
+ "libc",
  "memchr",
  "mio",
+ "num_cpus",
  "pin-project-lite",
  "tokio-macros",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "0.2.5"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
+checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -569,11 +507,10 @@
 
 [[package]]
 name = "tokio-rustls"
-version = "0.12.3"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3068d891551949b37681724d6b73666787cc63fa8e255c812a41d2513aff9775"
+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
- "futures-core",
  "rustls",
  "tokio",
  "webpki",
@@ -581,9 +518,9 @@
 
 [[package]]
 name = "tokio-util"
-version = "0.3.1"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
+checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
  "bytes",
  "futures-core",
@@ -595,39 +532,29 @@
 
 [[package]]
 name = "tracing"
-version = "0.1.17"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
  "cfg-if",
- "log",
+ "pin-project-lite",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.11"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f"
+checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
-name = "tracing-futures"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
-[[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "untrusted"
@@ -648,9 +575,9 @@
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.65"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
+checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -658,9 +585,9 @@
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.65"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
+checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -673,9 +600,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.65"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
+checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -683,9 +610,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.65"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
+checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -696,15 +623,15 @@
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.65"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"
+checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
 
 [[package]]
 name = "web-sys"
-version = "0.3.42"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2"
+checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -712,9 +639,9 @@
 
 [[package]]
 name = "webpki"
-version = "0.21.3"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae"
+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
 dependencies = [
  "ring",
  "untrusted",
@@ -722,9 +649,9 @@
 
 [[package]]
 name = "webpki-roots"
-version = "0.17.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b"
+checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
 dependencies = [
  "webpki",
 ]
@@ -771,13 +698,3 @@
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,28 +3,29 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "h2"
-version = "0.2.7"
+version = "0.3.4"
 authors = ["Carl Lerche <me@carllerche.com>", "Sean McArthur <sean@seanmonstar.com>"]
 exclude = ["fixtures/**", "ci/**"]
 description = "An HTTP/2.0 client and server"
-documentation = "https://docs.rs/h2/0.2.7/h2/"
+documentation = "https://docs.rs/h2/0.3.4"
 readme = "README.md"
 keywords = ["http", "async", "non-blocking"]
 categories = ["asynchronous", "web-programming", "network-programming"]
 license = "MIT"
 repository = "https://github.com/hyperium/h2"
+[package.metadata.docs.rs]
+features = ["stream"]
 [dependencies.bytes]
-version = "0.5.2"
+version = "1"
 
 [dependencies.fnv]
 version = "1.0.5"
@@ -45,27 +46,23 @@
 version = "0.2"
 
 [dependencies.indexmap]
-version = "1.0"
+version = "1.5.2"
+features = ["std"]
 
 [dependencies.slab]
-version = "0.4.0"
+version = "0.4.2"
 
 [dependencies.tokio]
-version = "0.2"
+version = "1"
 features = ["io-util"]
 
 [dependencies.tokio-util]
-version = "0.3.1"
+version = "0.6"
 features = ["codec"]
 
 [dependencies.tracing]
-version = "0.1.13"
-features = ["std", "log"]
-default-features = false
-
-[dependencies.tracing-futures]
-version = "0.2"
-features = ["std-future"]
+version = "0.1.21"
+features = ["std"]
 default-features = false
 [dev-dependencies.env_logger]
 version = "0.5.3"
@@ -82,7 +79,7 @@
 version = "0.3.15"
 
 [dev-dependencies.rustls]
-version = "0.16"
+version = "0.19"
 
 [dev-dependencies.serde]
 version = "1.0.0"
@@ -91,11 +88,11 @@
 version = "1.0.0"
 
 [dev-dependencies.tokio]
-version = "0.2"
-features = ["dns", "macros", "rt-core", "sync", "tcp"]
+version = "1"
+features = ["rt-multi-thread", "macros", "sync", "net"]
 
 [dev-dependencies.tokio-rustls]
-version = "0.12.0"
+version = "0.22"
 
 [dev-dependencies.walkdir]
 version = "1.0.0"
@@ -104,7 +101,7 @@
 version = "0.21"
 
 [dev-dependencies.webpki-roots]
-version = "0.17"
+version = "0.21"
 
 [features]
 stream = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,33 @@
+# 0.3.4 (August 20, 2021)
+
+* Fix panic when encoding header size update over a certain size.
+* Fix `SendRequest` to wake up connection when dropped.
+* Fix potential hang if `RecvStream` is placed in the request or response `extensions`.
+* Stop calling `Instant::now` if zero reset streams are configured.
+
+# 0.3.3 (April 29, 2021)
+
+* Fix client being able to make `CONNECT` requests without a `:path`.
+* Expose `RecvStream::poll_data`.
+* Fix some docs.
+
+# 0.3.2 (March 24, 2021)
+
+* Fix incorrect handling of received 1xx responses on the client when the request body is still streaming.
+
+# 0.3.1 (February 26, 2021)
+
+* Add `Connection::max_concurrent_recv_streams()` getter.
+* Add `Connection::max_concurrent_send_streams()` getter.
+* Fix client to ignore receipt of 1xx headers frames.
+* Fix incorrect calculation of pseudo header lengths when determining if a received header is too big.
+* Reduce monomorphized code size of internal code.
+
+# 0.3.0 (December 23, 2020)
+
+* Update to Tokio v1 and Bytes v1.
+* Disable `tracing`'s `log` feature. (It can still be enabled by a user in their own `Cargo.toml`.)
+
 # 0.2.7 (October 22, 2020)
 
 * Fix stream ref count when sending a push promise
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/examples/server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/examples/server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/examples/server.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/examples/server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1,23 @@
 use std::error::Error;
 
 use bytes::Bytes;
-use h2::server;
+use h2::server::{self, SendResponse};
+use h2::RecvStream;
+use http::Request;
 use tokio::net::{TcpListener, TcpStream};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let _ = env_logger::try_init();
 
-    let mut listener = TcpListener::bind("127.0.0.1:5928").await?;
+    let listener = TcpListener::bind("127.0.0.1:5928").await?;
 
     println!("listening on {:?}", listener.local_addr());
 
     loop {
         if let Ok((socket, _peer_addr)) = listener.accept().await {
             tokio::spawn(async move {
-                if let Err(e) = handle(socket).await {
+                if let Err(e) = serve(socket).await {
                     println!("  -> err={:?}", e);
                 }
             });
@@ -23,22 +25,41 @@
     }
 }
 
-async fn handle(socket: TcpStream) -> Result<(), Box<dyn Error + Send + Sync>> {
+async fn serve(socket: TcpStream) -> Result<(), Box<dyn Error + Send + Sync>> {
     let mut connection = server::handshake(socket).await?;
     println!("H2 connection bound");
 
     while let Some(result) = connection.accept().await {
-        let (request, mut respond) = result?;
-        println!("GOT request: {:?}", request);
-        let response = http::Response::new(());
+        let (request, respond) = result?;
+        tokio::spawn(async move {
+            if let Err(e) = handle_request(request, respond).await {
+                println!("error while handling request: {}", e);
+            }
+        });
+    }
 
-        let mut send = respond.send_response(response, false)?;
+    println!("~~~~~~~~~~~ H2 connection CLOSE !!!!!! ~~~~~~~~~~~");
+    Ok(())
+}
 
-        println!(">>>> sending data");
-        send.send_data(Bytes::from_static(b"hello world"), true)?;
+async fn handle_request(
+    mut request: Request<RecvStream>,
+    mut respond: SendResponse<Bytes>,
+) -> Result<(), Box<dyn Error + Send + Sync>> {
+    println!("GOT request: {:?}", request);
+
+    let body = request.body_mut();
+    while let Some(data) = body.data().await {
+        let data = data?;
+        println!("<<<< recv {:?}", data);
+        let _ = body.flow_control().release_capacity(data.len());
     }
 
-    println!("~~~~~~~~~~~~~~~~~~~~~~~~~~~ H2 connection CLOSE !!!!!! ~~~~~~~~~~~");
+    let response = http::Response::new(());
+    let mut send = respond.send_response(response, false)?;
+    println!(">>>> send");
+    send.send_data(Bytes::from_static(b"hello "), false)?;
+    send.send_data(Bytes::from_static(b"world\n"), true)?;
 
     Ok(())
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -149,7 +149,7 @@
 use std::time::Duration;
 use std::usize;
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
-use tracing_futures::Instrument;
+use tracing::Instrument;
 
 /// Initializes new HTTP/2.0 streams on a connection by sending a request.
 ///
@@ -1124,6 +1124,20 @@
 
 // ===== impl Connection =====
 
+async fn bind_connection<T>(io: &mut T) -> Result<(), crate::Error>
+where
+    T: AsyncRead + AsyncWrite + Unpin,
+{
+    tracing::debug!("binding client connection");
+
+    let msg: &'static [u8] = b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n";
+    io.write_all(msg).await.map_err(crate::Error::from_io)?;
+
+    tracing::debug!("client connection bound");
+
+    Ok(())
+}
+
 impl<T, B> Connection<T, B>
 where
     T: AsyncRead + AsyncWrite + Unpin,
@@ -1133,12 +1147,7 @@
         mut io: T,
         builder: Builder,
     ) -> Result<(SendRequest<B>, Connection<T, B>), crate::Error> {
-        tracing::debug!("binding client connection");
-
-        let msg: &'static [u8] = b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n";
-        io.write_all(msg).await.map_err(crate::Error::from_io)?;
-
-        tracing::debug!("client connection bound");
+        bind_connection(&mut io).await?;
 
         // Create the codec
         let mut codec = Codec::new(io);
@@ -1228,6 +1237,34 @@
     pub fn ping_pong(&mut self) -> Option<PingPong> {
         self.inner.take_user_pings().map(PingPong::new)
     }
+
+    /// Returns the maximum number of concurrent streams that may be initiated
+    /// by this client.
+    ///
+    /// This limit is configured by the server peer by sending the
+    /// [`SETTINGS_MAX_CONCURRENT_STREAMS` parameter][1] in a `SETTINGS` frame.
+    /// This method returns the currently acknowledged value recieved from the
+    /// remote.
+    ///
+    /// [settings]: https://tools.ietf.org/html/rfc7540#section-5.1.2
+    pub fn max_concurrent_send_streams(&self) -> usize {
+        self.inner.max_send_streams()
+    }
+
+    /// Returns the maximum number of concurrent streams that may be initiated
+    /// by the server on this connection.
+    ///
+    /// This returns the value of the [`SETTINGS_MAX_CONCURRENT_STREAMS`
+    /// parameter][1] sent in a `SETTINGS` frame that has been
+    /// acknowledged by the remote peer. The value to be sent is configured by
+    /// the [`Builder::max_concurrent_streams`][2] method before handshaking
+    /// with the remote peer.
+    ///
+    /// [1]: https://tools.ietf.org/html/rfc7540#section-5.1.2
+    /// [2]: ../struct.Builder.html#method.max_concurrent_streams
+    pub fn max_concurrent_recv_streams(&self) -> usize {
+        self.inner.max_recv_streams()
+    }
 }
 
 impl<T, B> Future for Connection<T, B>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/codec/framed_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/codec/framed_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/codec/framed_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/codec/framed_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -59,278 +59,284 @@
         }
     }
 
-    fn decode_frame(&mut self, mut bytes: BytesMut) -> Result<Option<Frame>, RecvError> {
-        use self::RecvError::*;
-        let span = tracing::trace_span!("FramedRead::decode_frame", offset = bytes.len());
-        let _e = span.enter();
+    pub fn get_ref(&self) -> &T {
+        self.inner.get_ref()
+    }
 
-        tracing::trace!("decoding frame from {}B", bytes.len());
+    pub fn get_mut(&mut self) -> &mut T {
+        self.inner.get_mut()
+    }
 
-        // Parse the head
-        let head = frame::Head::parse(&bytes);
+    /// Returns the current max frame size setting
+    #[cfg(feature = "unstable")]
+    #[inline]
+    pub fn max_frame_size(&self) -> usize {
+        self.inner.decoder().max_frame_length()
+    }
 
-        if self.partial.is_some() && head.kind() != Kind::Continuation {
-            proto_err!(conn: "expected CONTINUATION, got {:?}", head.kind());
-            return Err(Connection(Reason::PROTOCOL_ERROR));
-        }
+    /// Updates the max frame size setting.
+    ///
+    /// Must be within 16,384 and 16,777,215.
+    #[inline]
+    pub fn set_max_frame_size(&mut self, val: usize) {
+        assert!(DEFAULT_MAX_FRAME_SIZE as usize <= val && val <= MAX_MAX_FRAME_SIZE as usize);
+        self.inner.decoder_mut().set_max_frame_length(val)
+    }
 
-        let kind = head.kind();
+    /// Update the max header list size setting.
+    #[inline]
+    pub fn set_max_header_list_size(&mut self, val: usize) {
+        self.max_header_list_size = val;
+    }
+}
 
-        tracing::trace!(frame.kind = ?kind);
+/// Decodes a frame.
+///
+/// This method is intentionally de-generified and outlined because it is very large.
+fn decode_frame(
+    hpack: &mut hpack::Decoder,
+    max_header_list_size: usize,
+    partial_inout: &mut Option<Partial>,
+    mut bytes: BytesMut,
+) -> Result<Option<Frame>, RecvError> {
+    use self::RecvError::*;
+    let span = tracing::trace_span!("FramedRead::decode_frame", offset = bytes.len());
+    let _e = span.enter();
+
+    tracing::trace!("decoding frame from {}B", bytes.len());
+
+    // Parse the head
+    let head = frame::Head::parse(&bytes);
+
+    if partial_inout.is_some() && head.kind() != Kind::Continuation {
+        proto_err!(conn: "expected CONTINUATION, got {:?}", head.kind());
+        return Err(Connection(Reason::PROTOCOL_ERROR));
+    }
 
-        macro_rules! header_block {
-            ($frame:ident, $head:ident, $bytes:ident) => ({
-                // Drop the frame header
-                // TODO: Change to drain: carllerche/bytes#130
-                let _ = $bytes.split_to(frame::HEADER_LEN);
-
-                // Parse the header frame w/o parsing the payload
-                let (mut frame, mut payload) = match frame::$frame::load($head, $bytes) {
-                    Ok(res) => res,
-                    Err(frame::Error::InvalidDependencyId) => {
-                        proto_err!(stream: "invalid HEADERS dependency ID");
-                        // A stream cannot depend on itself. An endpoint MUST
-                        // treat this as a stream error (Section 5.4.2) of type
-                        // `PROTOCOL_ERROR`.
-                        return Err(Stream {
-                            id: $head.stream_id(),
-                            reason: Reason::PROTOCOL_ERROR,
-                        });
-                    },
-                    Err(e) => {
-                        proto_err!(conn: "failed to load frame; err={:?}", e);
-                        return Err(Connection(Reason::PROTOCOL_ERROR));
-                    }
-                };
+    let kind = head.kind();
 
-                let is_end_headers = frame.is_end_headers();
+    tracing::trace!(frame.kind = ?kind);
 
-                // Load the HPACK encoded headers
-                match frame.load_hpack(&mut payload, self.max_header_list_size, &mut self.hpack) {
-                    Ok(_) => {},
-                    Err(frame::Error::Hpack(hpack::DecoderError::NeedMore(_))) if !is_end_headers => {},
-                    Err(frame::Error::MalformedMessage) => {
-                        let id = $head.stream_id();
-                        proto_err!(stream: "malformed header block; stream={:?}", id);
-                        return Err(Stream {
-                            id,
-                            reason: Reason::PROTOCOL_ERROR,
-                        });
-                    },
-                    Err(e) => {
-                        proto_err!(conn: "failed HPACK decoding; err={:?}", e);
-                        return Err(Connection(Reason::PROTOCOL_ERROR));
-                    }
+    macro_rules! header_block {
+        ($frame:ident, $head:ident, $bytes:ident) => ({
+            // Drop the frame header
+            // TODO: Change to drain: carllerche/bytes#130
+            let _ = $bytes.split_to(frame::HEADER_LEN);
+
+            // Parse the header frame w/o parsing the payload
+            let (mut frame, mut payload) = match frame::$frame::load($head, $bytes) {
+                Ok(res) => res,
+                Err(frame::Error::InvalidDependencyId) => {
+                    proto_err!(stream: "invalid HEADERS dependency ID");
+                    // A stream cannot depend on itself. An endpoint MUST
+                    // treat this as a stream error (Section 5.4.2) of type
+                    // `PROTOCOL_ERROR`.
+                    return Err(Stream {
+                        id: $head.stream_id(),
+                        reason: Reason::PROTOCOL_ERROR,
+                    });
+                },
+                Err(e) => {
+                    proto_err!(conn: "failed to load frame; err={:?}", e);
+                    return Err(Connection(Reason::PROTOCOL_ERROR));
                 }
+            };
 
-                if is_end_headers {
-                    frame.into()
-                } else {
-                    tracing::trace!("loaded partial header block");
-                    // Defer returning the frame
-                    self.partial = Some(Partial {
-                        frame: Continuable::$frame(frame),
-                        buf: payload,
-                    });
+            let is_end_headers = frame.is_end_headers();
 
-                    return Ok(None);
+            // Load the HPACK encoded headers
+            match frame.load_hpack(&mut payload, max_header_list_size, hpack) {
+                Ok(_) => {},
+                Err(frame::Error::Hpack(hpack::DecoderError::NeedMore(_))) if !is_end_headers => {},
+                Err(frame::Error::MalformedMessage) => {
+                    let id = $head.stream_id();
+                    proto_err!(stream: "malformed header block; stream={:?}", id);
+                    return Err(Stream {
+                        id,
+                        reason: Reason::PROTOCOL_ERROR,
+                    });
+                },
+                Err(e) => {
+                    proto_err!(conn: "failed HPACK decoding; err={:?}", e);
+                    return Err(Connection(Reason::PROTOCOL_ERROR));
                 }
-            });
-        }
-
-        let frame = match kind {
-            Kind::Settings => {
-                let res = frame::Settings::load(head, &bytes[frame::HEADER_LEN..]);
-
-                res.map_err(|e| {
-                    proto_err!(conn: "failed to load SETTINGS frame; err={:?}", e);
-                    Connection(Reason::PROTOCOL_ERROR)
-                })?
-                .into()
             }
-            Kind::Ping => {
-                let res = frame::Ping::load(head, &bytes[frame::HEADER_LEN..]);
 
-                res.map_err(|e| {
-                    proto_err!(conn: "failed to load PING frame; err={:?}", e);
-                    Connection(Reason::PROTOCOL_ERROR)
-                })?
-                .into()
-            }
-            Kind::WindowUpdate => {
-                let res = frame::WindowUpdate::load(head, &bytes[frame::HEADER_LEN..]);
+            if is_end_headers {
+                frame.into()
+            } else {
+                tracing::trace!("loaded partial header block");
+                // Defer returning the frame
+                *partial_inout = Some(Partial {
+                    frame: Continuable::$frame(frame),
+                    buf: payload,
+                });
 
-                res.map_err(|e| {
-                    proto_err!(conn: "failed to load WINDOW_UPDATE frame; err={:?}", e);
-                    Connection(Reason::PROTOCOL_ERROR)
-                })?
-                .into()
-            }
-            Kind::Data => {
-                let _ = bytes.split_to(frame::HEADER_LEN);
-                let res = frame::Data::load(head, bytes.freeze());
-
-                // TODO: Should this always be connection level? Probably not...
-                res.map_err(|e| {
-                    proto_err!(conn: "failed to load DATA frame; err={:?}", e);
-                    Connection(Reason::PROTOCOL_ERROR)
-                })?
-                .into()
-            }
-            Kind::Headers => header_block!(Headers, head, bytes),
-            Kind::Reset => {
-                let res = frame::Reset::load(head, &bytes[frame::HEADER_LEN..]);
-                res.map_err(|e| {
-                    proto_err!(conn: "failed to load RESET frame; err={:?}", e);
-                    Connection(Reason::PROTOCOL_ERROR)
-                })?
-                .into()
+                return Ok(None);
             }
-            Kind::GoAway => {
-                let res = frame::GoAway::load(&bytes[frame::HEADER_LEN..]);
-                res.map_err(|e| {
-                    proto_err!(conn: "failed to load GO_AWAY frame; err={:?}", e);
-                    Connection(Reason::PROTOCOL_ERROR)
-                })?
-                .into()
+        });
+    }
+
+    let frame = match kind {
+        Kind::Settings => {
+            let res = frame::Settings::load(head, &bytes[frame::HEADER_LEN..]);
+
+            res.map_err(|e| {
+                proto_err!(conn: "failed to load SETTINGS frame; err={:?}", e);
+                Connection(Reason::PROTOCOL_ERROR)
+            })?
+            .into()
+        }
+        Kind::Ping => {
+            let res = frame::Ping::load(head, &bytes[frame::HEADER_LEN..]);
+
+            res.map_err(|e| {
+                proto_err!(conn: "failed to load PING frame; err={:?}", e);
+                Connection(Reason::PROTOCOL_ERROR)
+            })?
+            .into()
+        }
+        Kind::WindowUpdate => {
+            let res = frame::WindowUpdate::load(head, &bytes[frame::HEADER_LEN..]);
+
+            res.map_err(|e| {
+                proto_err!(conn: "failed to load WINDOW_UPDATE frame; err={:?}", e);
+                Connection(Reason::PROTOCOL_ERROR)
+            })?
+            .into()
+        }
+        Kind::Data => {
+            let _ = bytes.split_to(frame::HEADER_LEN);
+            let res = frame::Data::load(head, bytes.freeze());
+
+            // TODO: Should this always be connection level? Probably not...
+            res.map_err(|e| {
+                proto_err!(conn: "failed to load DATA frame; err={:?}", e);
+                Connection(Reason::PROTOCOL_ERROR)
+            })?
+            .into()
+        }
+        Kind::Headers => header_block!(Headers, head, bytes),
+        Kind::Reset => {
+            let res = frame::Reset::load(head, &bytes[frame::HEADER_LEN..]);
+            res.map_err(|e| {
+                proto_err!(conn: "failed to load RESET frame; err={:?}", e);
+                Connection(Reason::PROTOCOL_ERROR)
+            })?
+            .into()
+        }
+        Kind::GoAway => {
+            let res = frame::GoAway::load(&bytes[frame::HEADER_LEN..]);
+            res.map_err(|e| {
+                proto_err!(conn: "failed to load GO_AWAY frame; err={:?}", e);
+                Connection(Reason::PROTOCOL_ERROR)
+            })?
+            .into()
+        }
+        Kind::PushPromise => header_block!(PushPromise, head, bytes),
+        Kind::Priority => {
+            if head.stream_id() == 0 {
+                // Invalid stream identifier
+                proto_err!(conn: "invalid stream ID 0");
+                return Err(Connection(Reason::PROTOCOL_ERROR));
             }
-            Kind::PushPromise => header_block!(PushPromise, head, bytes),
-            Kind::Priority => {
-                if head.stream_id() == 0 {
-                    // Invalid stream identifier
-                    proto_err!(conn: "invalid stream ID 0");
-                    return Err(Connection(Reason::PROTOCOL_ERROR));
-                }
 
-                match frame::Priority::load(head, &bytes[frame::HEADER_LEN..]) {
-                    Ok(frame) => frame.into(),
-                    Err(frame::Error::InvalidDependencyId) => {
-                        // A stream cannot depend on itself. An endpoint MUST
-                        // treat this as a stream error (Section 5.4.2) of type
-                        // `PROTOCOL_ERROR`.
-                        let id = head.stream_id();
-                        proto_err!(stream: "PRIORITY invalid dependency ID; stream={:?}", id);
-                        return Err(Stream {
-                            id,
-                            reason: Reason::PROTOCOL_ERROR,
-                        });
-                    }
-                    Err(e) => {
-                        proto_err!(conn: "failed to load PRIORITY frame; err={:?};", e);
-                        return Err(Connection(Reason::PROTOCOL_ERROR));
-                    }
+            match frame::Priority::load(head, &bytes[frame::HEADER_LEN..]) {
+                Ok(frame) => frame.into(),
+                Err(frame::Error::InvalidDependencyId) => {
+                    // A stream cannot depend on itself. An endpoint MUST
+                    // treat this as a stream error (Section 5.4.2) of type
+                    // `PROTOCOL_ERROR`.
+                    let id = head.stream_id();
+                    proto_err!(stream: "PRIORITY invalid dependency ID; stream={:?}", id);
+                    return Err(Stream {
+                        id,
+                        reason: Reason::PROTOCOL_ERROR,
+                    });
+                }
+                Err(e) => {
+                    proto_err!(conn: "failed to load PRIORITY frame; err={:?};", e);
+                    return Err(Connection(Reason::PROTOCOL_ERROR));
                 }
             }
-            Kind::Continuation => {
-                let is_end_headers = (head.flag() & 0x4) == 0x4;
-
-                let mut partial = match self.partial.take() {
-                    Some(partial) => partial,
-                    None => {
-                        proto_err!(conn: "received unexpected CONTINUATION frame");
-                        return Err(Connection(Reason::PROTOCOL_ERROR));
-                    }
-                };
+        }
+        Kind::Continuation => {
+            let is_end_headers = (head.flag() & 0x4) == 0x4;
 
-                // The stream identifiers must match
-                if partial.frame.stream_id() != head.stream_id() {
-                    proto_err!(conn: "CONTINUATION frame stream ID does not match previous frame stream ID");
+            let mut partial = match partial_inout.take() {
+                Some(partial) => partial,
+                None => {
+                    proto_err!(conn: "received unexpected CONTINUATION frame");
                     return Err(Connection(Reason::PROTOCOL_ERROR));
                 }
+            };
 
-                // Extend the buf
-                if partial.buf.is_empty() {
-                    partial.buf = bytes.split_off(frame::HEADER_LEN);
-                } else {
-                    if partial.frame.is_over_size() {
-                        // If there was left over bytes previously, they may be
-                        // needed to continue decoding, even though we will
-                        // be ignoring this frame. This is done to keep the HPACK
-                        // decoder state up-to-date.
-                        //
-                        // Still, we need to be careful, because if a malicious
-                        // attacker were to try to send a gigantic string, such
-                        // that it fits over multiple header blocks, we could
-                        // grow memory uncontrollably again, and that'd be a shame.
-                        //
-                        // Instead, we use a simple heuristic to determine if
-                        // we should continue to ignore decoding, or to tell
-                        // the attacker to go away.
-                        if partial.buf.len() + bytes.len() > self.max_header_list_size {
-                            proto_err!(conn: "CONTINUATION frame header block size over ignorable limit");
-                            return Err(Connection(Reason::COMPRESSION_ERROR));
-                        }
-                    }
-                    partial.buf.extend_from_slice(&bytes[frame::HEADER_LEN..]);
-                }
+            // The stream identifiers must match
+            if partial.frame.stream_id() != head.stream_id() {
+                proto_err!(conn: "CONTINUATION frame stream ID does not match previous frame stream ID");
+                return Err(Connection(Reason::PROTOCOL_ERROR));
+            }
 
-                match partial.frame.load_hpack(
-                    &mut partial.buf,
-                    self.max_header_list_size,
-                    &mut self.hpack,
-                ) {
-                    Ok(_) => {}
-                    Err(frame::Error::Hpack(hpack::DecoderError::NeedMore(_)))
-                        if !is_end_headers => {}
-                    Err(frame::Error::MalformedMessage) => {
-                        let id = head.stream_id();
-                        proto_err!(stream: "malformed CONTINUATION frame; stream={:?}", id);
-                        return Err(Stream {
-                            id,
-                            reason: Reason::PROTOCOL_ERROR,
-                        });
-                    }
-                    Err(e) => {
-                        proto_err!(conn: "failed HPACK decoding; err={:?}", e);
-                        return Err(Connection(Reason::PROTOCOL_ERROR));
+            // Extend the buf
+            if partial.buf.is_empty() {
+                partial.buf = bytes.split_off(frame::HEADER_LEN);
+            } else {
+                if partial.frame.is_over_size() {
+                    // If there was left over bytes previously, they may be
+                    // needed to continue decoding, even though we will
+                    // be ignoring this frame. This is done to keep the HPACK
+                    // decoder state up-to-date.
+                    //
+                    // Still, we need to be careful, because if a malicious
+                    // attacker were to try to send a gigantic string, such
+                    // that it fits over multiple header blocks, we could
+                    // grow memory uncontrollably again, and that'd be a shame.
+                    //
+                    // Instead, we use a simple heuristic to determine if
+                    // we should continue to ignore decoding, or to tell
+                    // the attacker to go away.
+                    if partial.buf.len() + bytes.len() > max_header_list_size {
+                        proto_err!(conn: "CONTINUATION frame header block size over ignorable limit");
+                        return Err(Connection(Reason::COMPRESSION_ERROR));
                     }
                 }
+                partial.buf.extend_from_slice(&bytes[frame::HEADER_LEN..]);
+            }
 
-                if is_end_headers {
-                    partial.frame.into()
-                } else {
-                    self.partial = Some(partial);
-                    return Ok(None);
+            match partial
+                .frame
+                .load_hpack(&mut partial.buf, max_header_list_size, hpack)
+            {
+                Ok(_) => {}
+                Err(frame::Error::Hpack(hpack::DecoderError::NeedMore(_))) if !is_end_headers => {}
+                Err(frame::Error::MalformedMessage) => {
+                    let id = head.stream_id();
+                    proto_err!(stream: "malformed CONTINUATION frame; stream={:?}", id);
+                    return Err(Stream {
+                        id,
+                        reason: Reason::PROTOCOL_ERROR,
+                    });
+                }
+                Err(e) => {
+                    proto_err!(conn: "failed HPACK decoding; err={:?}", e);
+                    return Err(Connection(Reason::PROTOCOL_ERROR));
                 }
             }
-            Kind::Unknown => {
-                // Unknown frames are ignored
+
+            if is_end_headers {
+                partial.frame.into()
+            } else {
+                *partial_inout = Some(partial);
                 return Ok(None);
             }
-        };
-
-        Ok(Some(frame))
-    }
-
-    pub fn get_ref(&self) -> &T {
-        self.inner.get_ref()
-    }
-
-    pub fn get_mut(&mut self) -> &mut T {
-        self.inner.get_mut()
-    }
-
-    /// Returns the current max frame size setting
-    #[cfg(feature = "unstable")]
-    #[inline]
-    pub fn max_frame_size(&self) -> usize {
-        self.inner.decoder().max_frame_length()
-    }
-
-    /// Updates the max frame size setting.
-    ///
-    /// Must be within 16,384 and 16,777,215.
-    #[inline]
-    pub fn set_max_frame_size(&mut self, val: usize) {
-        assert!(DEFAULT_MAX_FRAME_SIZE as usize <= val && val <= MAX_MAX_FRAME_SIZE as usize);
-        self.inner.decoder_mut().set_max_frame_length(val)
-    }
+        }
+        Kind::Unknown => {
+            // Unknown frames are ignored
+            return Ok(None);
+        }
+    };
 
-    /// Update the max header list size setting.
-    #[inline]
-    pub fn set_max_header_list_size(&mut self, val: usize) {
-        self.max_header_list_size = val;
-    }
+    Ok(Some(frame))
 }
 
 impl<T> Stream for FramedRead<T>
@@ -351,7 +357,13 @@
             };
 
             tracing::trace!(read.bytes = bytes.len());
-            if let Some(frame) = self.decode_frame(bytes)? {
+            let Self {
+                ref mut hpack,
+                max_header_list_size,
+                ref mut partial,
+                ..
+            } = *self;
+            if let Some(frame) = decode_frame(hpack, max_header_list_size, partial, bytes)? {
                 tracing::debug!(?frame, "received");
                 return Poll::Ready(Some(Ok(frame)));
             }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/codec/framed_write.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/codec/framed_write.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/codec/framed_write.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/codec/framed_write.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,15 +3,12 @@
 use crate::frame::{self, Frame, FrameSize};
 use crate::hpack;
 
-use bytes::{
-    buf::{BufExt, BufMutExt},
-    Buf, BufMut, BytesMut,
-};
+use bytes::{Buf, BufMut, BytesMut};
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
-use std::io::{self, Cursor};
+use std::io::{self, Cursor, IoSlice};
 
 // A macro to get around a method needing to borrow &mut self
 macro_rules! limited_write_buf {
@@ -26,6 +23,11 @@
     /// Upstream `AsyncWrite`
     inner: T,
 
+    encoder: Encoder<B>,
+}
+
+#[derive(Debug)]
+struct Encoder<B> {
     /// HPACK encoder
     hpack: hpack::Encoder,
 
@@ -42,6 +44,9 @@
 
     /// Max frame size, this is specified by the peer
     max_frame_size: FrameSize,
+
+    /// Whether or not the wrapped `AsyncWrite` supports vectored IO.
+    is_write_vectored: bool,
 }
 
 #[derive(Debug)]
@@ -50,7 +55,7 @@
     Continuation(frame::Continuation),
 }
 
-/// Initialze the connection with this amount of write buffer.
+/// Initialize the connection with this amount of write buffer.
 ///
 /// The minimum MAX_FRAME_SIZE is 16kb, so always be able to send a HEADERS
 /// frame that big.
@@ -71,13 +76,17 @@
     B: Buf,
 {
     pub fn new(inner: T) -> FramedWrite<T, B> {
+        let is_write_vectored = inner.is_write_vectored();
         FramedWrite {
             inner,
-            hpack: hpack::Encoder::default(),
-            buf: Cursor::new(BytesMut::with_capacity(DEFAULT_BUFFER_CAPACITY)),
-            next: None,
-            last_data_frame: None,
-            max_frame_size: frame::DEFAULT_MAX_FRAME_SIZE,
+            encoder: Encoder {
+                hpack: hpack::Encoder::default(),
+                buf: Cursor::new(BytesMut::with_capacity(DEFAULT_BUFFER_CAPACITY)),
+                next: None,
+                last_data_frame: None,
+                max_frame_size: frame::DEFAULT_MAX_FRAME_SIZE,
+                is_write_vectored,
+            },
         }
     }
 
@@ -86,11 +95,11 @@
     /// Calling this function may result in the current contents of the buffer
     /// to be flushed to `T`.
     pub fn poll_ready(&mut self, cx: &mut Context) -> Poll<io::Result<()>> {
-        if !self.has_capacity() {
+        if !self.encoder.has_capacity() {
             // Try flushing
             ready!(self.flush(cx))?;
 
-            if !self.has_capacity() {
+            if !self.encoder.has_capacity() {
                 return Poll::Pending;
             }
         }
@@ -103,6 +112,138 @@
     /// `poll_ready` must be called first to ensure that a frame may be
     /// accepted.
     pub fn buffer(&mut self, item: Frame<B>) -> Result<(), UserError> {
+        self.encoder.buffer(item)
+    }
+
+    /// Flush buffered data to the wire
+    pub fn flush(&mut self, cx: &mut Context) -> Poll<io::Result<()>> {
+        let span = tracing::trace_span!("FramedWrite::flush");
+        let _e = span.enter();
+
+        loop {
+            while !self.encoder.is_empty() {
+                match self.encoder.next {
+                    Some(Next::Data(ref mut frame)) => {
+                        tracing::trace!(queued_data_frame = true);
+                        let mut buf = (&mut self.encoder.buf).chain(frame.payload_mut());
+                        ready!(write(
+                            &mut self.inner,
+                            self.encoder.is_write_vectored,
+                            &mut buf,
+                            cx,
+                        ))?
+                    }
+                    _ => {
+                        tracing::trace!(queued_data_frame = false);
+                        ready!(write(
+                            &mut self.inner,
+                            self.encoder.is_write_vectored,
+                            &mut self.encoder.buf,
+                            cx,
+                        ))?
+                    }
+                }
+            }
+
+            match self.encoder.unset_frame() {
+                ControlFlow::Continue => (),
+                ControlFlow::Break => break,
+                ControlFlow::EndlessLoopHeaderTooBig => {
+                    return Poll::Ready(Err(std::io::Error::new(
+                        std::io::ErrorKind::InvalidInput,
+                        UserError::HeaderTooBig,
+                    )));
+                }
+            }
+        }
+
+        tracing::trace!("flushing buffer");
+        // Flush the upstream
+        ready!(Pin::new(&mut self.inner).poll_flush(cx))?;
+
+        Poll::Ready(Ok(()))
+    }
+
+    /// Close the codec
+    pub fn shutdown(&mut self, cx: &mut Context) -> Poll<io::Result<()>> {
+        ready!(self.flush(cx))?;
+        Pin::new(&mut self.inner).poll_shutdown(cx)
+    }
+}
+
+fn write<T, B>(
+    writer: &mut T,
+    is_write_vectored: bool,
+    buf: &mut B,
+    cx: &mut Context<'_>,
+) -> Poll<io::Result<()>>
+where
+    T: AsyncWrite + Unpin,
+    B: Buf,
+{
+    // TODO(eliza): when tokio-util 0.5.1 is released, this
+    // could just use `poll_write_buf`...
+    const MAX_IOVS: usize = 64;
+    let n = if is_write_vectored {
+        let mut bufs = [IoSlice::new(&[]); MAX_IOVS];
+        let cnt = buf.chunks_vectored(&mut bufs);
+        ready!(Pin::new(writer).poll_write_vectored(cx, &bufs[..cnt]))?
+    } else {
+        ready!(Pin::new(writer).poll_write(cx, buf.chunk()))?
+    };
+    buf.advance(n);
+    Ok(()).into()
+}
+
+#[must_use]
+enum ControlFlow {
+    Continue,
+    Break,
+    EndlessLoopHeaderTooBig,
+}
+
+impl<B> Encoder<B>
+where
+    B: Buf,
+{
+    fn unset_frame(&mut self) -> ControlFlow {
+        // Clear internal buffer
+        self.buf.set_position(0);
+        self.buf.get_mut().clear();
+
+        // The data frame has been written, so unset it
+        match self.next.take() {
+            Some(Next::Data(frame)) => {
+                self.last_data_frame = Some(frame);
+                debug_assert!(self.is_empty());
+                ControlFlow::Break
+            }
+            Some(Next::Continuation(frame)) => {
+                // Buffer the continuation frame, then try to write again
+                let mut buf = limited_write_buf!(self);
+                if let Some(continuation) = frame.encode(&mut self.hpack, &mut buf) {
+                    // We previously had a CONTINUATION, and after encoding
+                    // it, we got *another* one? Let's just double check
+                    // that at least some progress is being made...
+                    if self.buf.get_ref().len() == frame::HEADER_LEN {
+                        // If *only* the CONTINUATION frame header was
+                        // written, and *no* header fields, we're stuck
+                        // in a loop...
+                        tracing::warn!(
+                            "CONTINUATION frame write loop; header value too big to encode"
+                        );
+                        return ControlFlow::EndlessLoopHeaderTooBig;
+                    }
+
+                    self.next = Some(Next::Continuation(continuation));
+                }
+                ControlFlow::Continue
+            }
+            None => ControlFlow::Break,
+        }
+    }
+
+    fn buffer(&mut self, item: Frame<B>) -> Result<(), UserError> {
         // Ensure that we have enough capacity to accept the write.
         assert!(self.has_capacity());
         let span = tracing::trace_span!("FramedWrite::buffer", frame = ?item);
@@ -183,73 +324,6 @@
         Ok(())
     }
 
-    /// Flush buffered data to the wire
-    pub fn flush(&mut self, cx: &mut Context) -> Poll<io::Result<()>> {
-        let span = tracing::trace_span!("FramedWrite::flush");
-        let _e = span.enter();
-
-        loop {
-            while !self.is_empty() {
-                match self.next {
-                    Some(Next::Data(ref mut frame)) => {
-                        tracing::trace!(queued_data_frame = true);
-                        let mut buf = (&mut self.buf).chain(frame.payload_mut());
-                        ready!(Pin::new(&mut self.inner).poll_write_buf(cx, &mut buf))?;
-                    }
-                    _ => {
-                        tracing::trace!(queued_data_frame = false);
-                        ready!(Pin::new(&mut self.inner).poll_write_buf(cx, &mut self.buf))?;
-                    }
-                }
-            }
-
-            // Clear internal buffer
-            self.buf.set_position(0);
-            self.buf.get_mut().clear();
-
-            // The data frame has been written, so unset it
-            match self.next.take() {
-                Some(Next::Data(frame)) => {
-                    self.last_data_frame = Some(frame);
-                    debug_assert!(self.is_empty());
-                    break;
-                }
-                Some(Next::Continuation(frame)) => {
-                    // Buffer the continuation frame, then try to write again
-                    let mut buf = limited_write_buf!(self);
-                    if let Some(continuation) = frame.encode(&mut self.hpack, &mut buf) {
-                        // We previously had a CONTINUATION, and after encoding
-                        // it, we got *another* one? Let's just double check
-                        // that at least some progress is being made...
-                        if self.buf.get_ref().len() == frame::HEADER_LEN {
-                            // If *only* the CONTINUATION frame header was
-                            // written, and *no* header fields, we're stuck
-                            // in a loop...
-                            panic!("CONTINUATION frame write loop; header value too big to encode");
-                        }
-
-                        self.next = Some(Next::Continuation(continuation));
-                    }
-                }
-                None => {
-                    break;
-                }
-            }
-        }
-
-        tracing::trace!("flushing buffer");
-        // Flush the upstream
-        ready!(Pin::new(&mut self.inner).poll_flush(cx))?;
-
-        Poll::Ready(Ok(()))
-    }
-
-    /// Close the codec
-    pub fn shutdown(&mut self, cx: &mut Context) -> Poll<io::Result<()>> {
-        ready!(self.flush(cx))?;
-        Pin::new(&mut self.inner).poll_shutdown(cx)
-    }
-
     fn has_capacity(&self) -> bool {
         self.next.is_none() && self.buf.get_ref().remaining_mut() >= MIN_BUFFER_CAPACITY
     }
@@ -262,26 +336,32 @@
     }
 }
 
+impl<B> Encoder<B> {
+    fn max_frame_size(&self) -> usize {
+        self.max_frame_size as usize
+    }
+}
+
 impl<T, B> FramedWrite<T, B> {
     /// Returns the max frame size that can be sent
     pub fn max_frame_size(&self) -> usize {
-        self.max_frame_size as usize
+        self.encoder.max_frame_size()
     }
 
     /// Set the peer's max frame size.
     pub fn set_max_frame_size(&mut self, val: usize) {
         assert!(val <= frame::MAX_MAX_FRAME_SIZE as usize);
-        self.max_frame_size = val as FrameSize;
+        self.encoder.max_frame_size = val as FrameSize;
     }
 
     /// Set the peer's header table size.
     pub fn set_header_table_size(&mut self, val: usize) {
-        self.hpack.update_max_size(val);
+        self.encoder.hpack.update_max_size(val);
     }
 
     /// Retrieve the last data frame that has been sent
     pub fn take_last_data_frame(&mut self) -> Option<frame::Data<B>> {
-        self.last_data_frame.take()
+        self.encoder.last_data_frame.take()
     }
 
     pub fn get_mut(&mut self) -> &mut T {
@@ -290,25 +370,13 @@
 }
 
 impl<T: AsyncRead + Unpin, B> AsyncRead for FramedWrite<T, B> {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        self.inner.prepare_uninitialized_buffer(buf)
-    }
-
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf,
+    ) -> Poll<io::Result<()>> {
         Pin::new(&mut self.inner).poll_read(cx, buf)
     }
-
-    fn poll_read_buf<Buf: BufMut>(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut Buf,
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.inner).poll_read_buf(cx, buf)
-    }
 }
 
 // We never project the Pin to `B`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/frame/data.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/frame/data.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/frame/data.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/frame/data.rs	2021-12-09 12:01:26.000000000 +0000
@@ -36,7 +36,7 @@
         }
     }
 
-    /// Returns the stream identifer that this frame is associated with.
+    /// Returns the stream identifier that this frame is associated with.
     ///
     /// This cannot be a zero stream identifier.
     pub fn stream_id(&self) -> StreamId {
@@ -63,7 +63,7 @@
         }
     }
 
-    /// Returns whther the `PADDED` flag is set on this frame.
+    /// Returns whether the `PADDED` flag is set on this frame.
     #[cfg(feature = "unstable")]
     pub fn is_padded(&self) -> bool {
         self.flags.is_padded()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/frame/headers.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/frame/headers.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/frame/headers.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/frame/headers.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,12 +5,12 @@
 use http::header::{self, HeaderName, HeaderValue};
 use http::{uri, HeaderMap, Method, Request, StatusCode, Uri};
 
-use bytes::{Bytes, BytesMut};
+use bytes::BytesMut;
 
 use std::fmt;
 use std::io::Cursor;
 
-type EncodeBuf<'a> = bytes::buf::ext::Limit<&'a mut BytesMut>;
+type EncodeBuf<'a> = bytes::buf::Limit<&'a mut BytesMut>;
 
 // Minimum MAX_FRAME_SIZE is 16kb, so save some arbitrary space for frame
 // head and other header bits.
@@ -254,6 +254,11 @@
         &mut self.header_block.pseudo
     }
 
+    /// Whether it has status 1xx
+    pub(crate) fn is_informational(&self) -> bool {
+        self.header_block.pseudo.is_informational()
+    }
+
     pub fn fields(&self) -> &HeaderMap {
         &self.header_block.fields
     }
@@ -544,18 +549,22 @@
 
         let mut path = parts
             .path_and_query
-            .map(|v| Bytes::copy_from_slice(v.as_str().as_bytes()))
-            .unwrap_or_else(Bytes::new);
+            .map(|v| BytesStr::from(v.as_str()))
+            .unwrap_or(BytesStr::from_static(""));
 
-        if path.is_empty() && method != Method::OPTIONS {
-            path = Bytes::from_static(b"/");
+        match method {
+            Method::OPTIONS | Method::CONNECT => {}
+            _ if path.is_empty() => {
+                path = BytesStr::from_static("/");
+            }
+            _ => {}
         }
 
         let mut pseudo = Pseudo {
             method: Some(method),
             scheme: None,
             authority: None,
-            path: Some(unsafe { BytesStr::from_utf8_unchecked(path) }),
+            path: Some(path).filter(|p| !p.is_empty()),
             status: None,
         };
 
@@ -569,9 +578,7 @@
         // If the URI includes an authority component, add it to the pseudo
         // headers
         if let Some(authority) = parts.authority {
-            pseudo.set_authority(unsafe {
-                BytesStr::from_utf8_unchecked(Bytes::copy_from_slice(authority.as_str().as_bytes()))
-            });
+            pseudo.set_authority(BytesStr::from(authority.as_str()));
         }
 
         pseudo
@@ -588,17 +595,23 @@
     }
 
     pub fn set_scheme(&mut self, scheme: uri::Scheme) {
-        let bytes = match scheme.as_str() {
-            "http" => Bytes::from_static(b"http"),
-            "https" => Bytes::from_static(b"https"),
-            s => Bytes::copy_from_slice(s.as_bytes()),
+        let bytes_str = match scheme.as_str() {
+            "http" => BytesStr::from_static("http"),
+            "https" => BytesStr::from_static("https"),
+            s => BytesStr::from(s),
         };
-        self.scheme = Some(unsafe { BytesStr::from_utf8_unchecked(bytes) });
+        self.scheme = Some(bytes_str);
     }
 
     pub fn set_authority(&mut self, authority: BytesStr) {
         self.authority = Some(authority);
     }
+
+    /// Whether it has status 1xx
+    pub(crate) fn is_informational(&self) -> bool {
+        self.status
+            .map_or(false, |status| status.is_informational())
+    }
 }
 
 // ===== impl EncodingHeaderBlock =====
@@ -825,7 +838,7 @@
                 } else {
                     let __val = $val;
                     headers_size +=
-                        decoded_header_size(stringify!($ident).len() + 1, __val.as_str().len());
+                        decoded_header_size(stringify!($field).len() + 1, __val.as_str().len());
                     if headers_size < max_header_list_size {
                         self.pseudo.$field = Some(__val);
                     } else if !self.is_over_size {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/frame/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/frame/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/frame/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/frame/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,7 +15,6 @@
 /// let buf: [u8; 4] = [0, 0, 0, 1];
 /// assert_eq!(1u32, unpack_octets_4!(buf, 0, u32));
 /// ```
-#[macro_escape]
 macro_rules! unpack_octets_4 {
     // TODO: Get rid of this macro
     ($buf:expr, $offset:expr, $tip:ty) => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/fuzz_bridge.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/fuzz_bridge.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/fuzz_bridge.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/fuzz_bridge.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,28 @@
+#[cfg(fuzzing)]
+pub mod fuzz_logic {
+    use crate::hpack;
+    use bytes::{BufMut, BytesMut};
+    use http::header::HeaderName;
+    use std::io::Cursor;
+
+    pub fn fuzz_hpack(data_: &[u8]) {
+        let mut decoder_ = hpack::Decoder::new(0);
+        let mut buf = BytesMut::new();
+        buf.extend(data_);
+        let _dec_res = decoder_.decode(&mut Cursor::new(&mut buf), |_h| {});
+
+        if let Ok(s) = std::str::from_utf8(data_) {
+            if let Ok(h) = http::Method::from_bytes(s.as_bytes()) {
+                let m_ = hpack::Header::Method(h);
+                let mut encoder = hpack::Encoder::new(0, 0);
+                let _res = encode(&mut encoder, vec![m_]);
+            }
+        }
+    }
+
+    fn encode(e: &mut hpack::Encoder, hdrs: Vec<hpack::Header<Option<HeaderName>>>) -> BytesMut {
+        let mut dst = BytesMut::with_capacity(1024);
+        e.encode(None, &mut hdrs.into_iter(), &mut (&mut dst).limit(1024));
+        dst
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/decoder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/decoder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/decoder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/decoder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -311,7 +311,7 @@
 
         if huff {
             let ret = {
-                let raw = &buf.bytes()[..len];
+                let raw = &buf.chunk()[..len];
                 huffman::decode(raw, &mut self.buffer).map(BytesMut::freeze)
             };
 
@@ -419,7 +419,7 @@
 
 fn peek_u8<B: Buf>(buf: &mut B) -> Option<u8> {
     if buf.has_remaining() {
-        Some(buf.bytes()[0])
+        Some(buf.chunk()[0])
     } else {
         None
     }
@@ -577,13 +577,13 @@
     use http::header::HeaderValue;
 
     match idx {
-        1 => Header::Authority(from_static("")),
+        1 => Header::Authority(BytesStr::from_static("")),
         2 => Header::Method(Method::GET),
         3 => Header::Method(Method::POST),
-        4 => Header::Path(from_static("/")),
-        5 => Header::Path(from_static("/index.html")),
-        6 => Header::Scheme(from_static("http")),
-        7 => Header::Scheme(from_static("https")),
+        4 => Header::Path(BytesStr::from_static("/")),
+        5 => Header::Path(BytesStr::from_static("/index.html")),
+        6 => Header::Scheme(BytesStr::from_static("http")),
+        7 => Header::Scheme(BytesStr::from_static("https")),
         8 => Header::Status(StatusCode::OK),
         9 => Header::Status(StatusCode::NO_CONTENT),
         10 => Header::Status(StatusCode::PARTIAL_CONTENT),
@@ -783,10 +783,6 @@
     }
 }
 
-fn from_static(s: &'static str) -> BytesStr {
-    unsafe { BytesStr::from_utf8_unchecked(Bytes::from_static(s.as_bytes())) }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/encoder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/encoder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/encoder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/encoder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use super::table::{Index, Table};
 use super::{huffman, Header};
 
-use bytes::{buf::ext::Limit, BufMut, BytesMut};
+use bytes::{buf::Limit, BufMut, BytesMut};
 use http::header::{HeaderName, HeaderValue};
 
 type DstBuf<'a> = Limit<&'a mut BytesMut>;
@@ -324,7 +324,7 @@
             // Write the string head
             dst.get_mut()[idx] = 0x80 | huff_len as u8;
         } else {
-            // Write the head to a placeholer
+            // Write the head to a placeholder
             const PLACEHOLDER_LEN: usize = 8;
             let mut buf = [0u8; PLACEHOLDER_LEN];
 
@@ -384,10 +384,6 @@
 
     value -= low;
 
-    if value > 0x0fff_ffff {
-        panic!("value out of range");
-    }
-
     dst.put_u8(first_byte | low as u8);
     rem -= 1;
 
@@ -428,7 +424,7 @@
 mod test {
     use super::*;
     use crate::hpack::Header;
-    use bytes::buf::BufMutExt;
+    use bytes::buf::BufMut;
     use http::*;
 
     #[test]
@@ -852,6 +848,20 @@
     }
 
     #[test]
+    fn test_large_size_update() {
+        let mut encoder = Encoder::default();
+
+        encoder.update_max_size(1912930560);
+        assert_eq!(Some(SizeUpdate::One(1912930560)), encoder.size_update);
+
+        let mut dst = BytesMut::with_capacity(6);
+        encoder
+            .encode_size_updates(&mut (&mut dst).limit(6))
+            .unwrap();
+        assert_eq!([63, 225, 129, 148, 144, 7], &dst[..]);
+    }
+
+    #[test]
     #[ignore]
     fn test_evicted_overflow() {
         // Not sure what the best way to do this is.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/header.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/header.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/header.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/header.rs	2021-12-09 12:01:26.000000000 +0000
@@ -246,8 +246,12 @@
 // ===== impl BytesStr =====
 
 impl BytesStr {
-    pub(crate) unsafe fn from_utf8_unchecked(bytes: Bytes) -> Self {
-        BytesStr(bytes)
+    pub(crate) const fn from_static(value: &'static str) -> Self {
+        BytesStr(Bytes::from_static(value.as_bytes()))
+    }
+
+    pub(crate) fn from(value: &str) -> Self {
+        BytesStr(Bytes::copy_from_slice(value.as_bytes()))
     }
 
     #[doc(hidden)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/test/fixture.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/test/fixture.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/test/fixture.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/test/fixture.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 use crate::hpack::{Decoder, Encoder, Header};
 
-use bytes::{buf::BufMutExt, BytesMut};
+use bytes::{buf::BufMut, BytesMut};
 use hex::FromHex;
 use serde_json::Value;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/test/fuzz.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/test/fuzz.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/hpack/test/fuzz.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/hpack/test/fuzz.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 use http::header::{HeaderName, HeaderValue};
 
-use bytes::{buf::BufMutExt, Bytes, BytesMut};
+use bytes::{buf::BufMut, BytesMut};
 use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
 use rand::{Rng, SeedableRng, StdRng};
 
@@ -404,6 +404,5 @@
 }
 
 fn to_shared(src: String) -> crate::hpack::BytesStr {
-    let b: Bytes = src.into();
-    unsafe { crate::hpack::BytesStr::from_utf8_unchecked(b) }
+    crate::hpack::BytesStr::from(src.as_str())
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! h2 = "0.2"
+//! h2 = "0.3"
 //! ```
 //!
 //! # Layout
@@ -78,7 +78,7 @@
 //! [`server::handshake`]: server/fn.handshake.html
 //! [`client::handshake`]: client/fn.handshake.html
 
-#![doc(html_root_url = "https://docs.rs/h2/0.2.7")]
+#![doc(html_root_url = "https://docs.rs/h2/0.3.4")]
 #![deny(missing_debug_implementations, missing_docs)]
 #![cfg_attr(test, deny(warnings))]
 
@@ -117,6 +117,10 @@
 pub mod server;
 mod share;
 
+#[cfg(fuzzing)]
+#[cfg_attr(feature = "unstable", allow(missing_docs))]
+pub mod fuzz_bridge;
+
 pub use crate::error::{Error, Reason};
 pub use crate::share::{FlowControl, Ping, PingPong, Pong, RecvStream, SendStream, StreamId};
 
@@ -126,7 +130,7 @@
 use std::task::Poll;
 
 // TODO: Get rid of this trait once https://github.com/rust-lang/rust/pull/63512
-// is stablized.
+// is stabilized.
 trait PollExt<T, E> {
     /// Changes the success value of this `Poll` with the closure provided.
     fn map_ok_<U, F>(self, f: F) -> Poll<Option<Result<U, E>>>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/connection.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/connection.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/connection.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/connection.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,6 +20,19 @@
 where
     P: Peer,
 {
+    /// Read / write frame values
+    codec: Codec<T, Prioritized<B>>,
+
+    inner: ConnectionInner<P, B>,
+}
+
+// Extracted part of `Connection` which does not depend on `T`. Reduces the amount of duplicated
+// method instantiations.
+#[derive(Debug)]
+struct ConnectionInner<P, B: Buf = Bytes>
+where
+    P: Peer,
+{
     /// Tracks the connection level state transitions.
     state: State,
 
@@ -29,9 +42,6 @@
     /// graceful shutdown.
     error: Option<Reason>,
 
-    /// Read / write frame values
-    codec: Codec<T, Prioritized<B>>,
-
     /// Pending GOAWAY frames to write.
     go_away: GoAway,
 
@@ -51,6 +61,18 @@
     _phantom: PhantomData<P>,
 }
 
+struct DynConnection<'a, B: Buf = Bytes> {
+    state: &'a mut State,
+
+    go_away: &'a mut GoAway,
+
+    streams: DynStreams<'a, B>,
+
+    error: &'a mut Option<Reason>,
+
+    ping_pong: &'a mut PingPong,
+}
+
 #[derive(Debug, Clone)]
 pub(crate) struct Config {
     pub next_stream_id: StreamId,
@@ -79,45 +101,62 @@
     B: Buf,
 {
     pub fn new(codec: Codec<T, Prioritized<B>>, config: Config) -> Connection<T, P, B> {
-        let streams = Streams::new(streams::Config {
-            local_init_window_sz: config
-                .settings
-                .initial_window_size()
-                .unwrap_or(DEFAULT_INITIAL_WINDOW_SIZE),
-            initial_max_send_streams: config.initial_max_send_streams,
-            local_next_stream_id: config.next_stream_id,
-            local_push_enabled: config.settings.is_push_enabled().unwrap_or(true),
-            local_reset_duration: config.reset_stream_duration,
-            local_reset_max: config.reset_stream_max,
-            remote_init_window_sz: DEFAULT_INITIAL_WINDOW_SIZE,
-            remote_max_initiated: config
-                .settings
-                .max_concurrent_streams()
-                .map(|max| max as usize),
-        });
+        fn streams_config(config: &Config) -> streams::Config {
+            streams::Config {
+                local_init_window_sz: config
+                    .settings
+                    .initial_window_size()
+                    .unwrap_or(DEFAULT_INITIAL_WINDOW_SIZE),
+                initial_max_send_streams: config.initial_max_send_streams,
+                local_next_stream_id: config.next_stream_id,
+                local_push_enabled: config.settings.is_push_enabled().unwrap_or(true),
+                local_reset_duration: config.reset_stream_duration,
+                local_reset_max: config.reset_stream_max,
+                remote_init_window_sz: DEFAULT_INITIAL_WINDOW_SIZE,
+                remote_max_initiated: config
+                    .settings
+                    .max_concurrent_streams()
+                    .map(|max| max as usize),
+            }
+        }
+        let streams = Streams::new(streams_config(&config));
         Connection {
-            state: State::Open,
-            error: None,
             codec,
-            go_away: GoAway::new(),
-            ping_pong: PingPong::new(),
-            settings: Settings::new(config.settings),
-            streams,
-            span: tracing::debug_span!("Connection", peer = %P::NAME),
-            _phantom: PhantomData,
+            inner: ConnectionInner {
+                state: State::Open,
+                error: None,
+                go_away: GoAway::new(),
+                ping_pong: PingPong::new(),
+                settings: Settings::new(config.settings),
+                streams,
+                span: tracing::debug_span!("Connection", peer = %P::NAME),
+                _phantom: PhantomData,
+            },
         }
     }
 
     /// connection flow control
     pub(crate) fn set_target_window_size(&mut self, size: WindowSize) {
-        self.streams.set_target_connection_window_size(size);
+        self.inner.streams.set_target_connection_window_size(size);
     }
 
     /// Send a new SETTINGS frame with an updated initial window size.
     pub(crate) fn set_initial_window_size(&mut self, size: WindowSize) -> Result<(), UserError> {
         let mut settings = frame::Settings::default();
         settings.set_initial_window_size(Some(size));
-        self.settings.send_settings(settings)
+        self.inner.settings.send_settings(settings)
+    }
+
+    /// Returns the maximum number of concurrent streams that may be initiated
+    /// by this peer.
+    pub(crate) fn max_send_streams(&self) -> usize {
+        self.inner.streams.max_send_streams()
+    }
+
+    /// Returns the maximum number of concurrent streams that may be initiated
+    /// by the remote peer.
+    pub(crate) fn max_recv_streams(&self) -> usize {
+        self.inner.streams.max_recv_streams()
     }
 
     /// Returns `Ready` when the connection is ready to receive a frame.
@@ -125,16 +164,17 @@
     /// Returns `RecvError` as this may raise errors that are caused by delayed
     /// processing of received frames.
     fn poll_ready(&mut self, cx: &mut Context) -> Poll<Result<(), RecvError>> {
-        let _e = self.span.enter();
+        let _e = self.inner.span.enter();
         let span = tracing::trace_span!("poll_ready");
         let _e = span.enter();
         // The order of these calls don't really matter too much
-        ready!(self.ping_pong.send_pending_pong(cx, &mut self.codec))?;
-        ready!(self.ping_pong.send_pending_ping(cx, &mut self.codec))?;
+        ready!(self.inner.ping_pong.send_pending_pong(cx, &mut self.codec))?;
+        ready!(self.inner.ping_pong.send_pending_ping(cx, &mut self.codec))?;
         ready!(self
+            .inner
             .settings
-            .poll_send(cx, &mut self.codec, &mut self.streams))?;
-        ready!(self.streams.send_pending_refusal(cx, &mut self.codec))?;
+            .poll_send(cx, &mut self.codec, &mut self.inner.streams))?;
+        ready!(self.inner.streams.send_pending_refusal(cx, &mut self.codec))?;
 
         Poll::Ready(Ok(()))
     }
@@ -144,32 +184,15 @@
     /// This will return `Some(reason)` if the connection should be closed
     /// afterwards. If this is a graceful shutdown, this returns `None`.
     fn poll_go_away(&mut self, cx: &mut Context) -> Poll<Option<io::Result<Reason>>> {
-        self.go_away.send_pending_go_away(cx, &mut self.codec)
-    }
-
-    fn go_away(&mut self, id: StreamId, e: Reason) {
-        let frame = frame::GoAway::new(id, e);
-        self.streams.send_go_away(id);
-        self.go_away.go_away(frame);
-    }
-
-    fn go_away_now(&mut self, e: Reason) {
-        let last_processed_id = self.streams.last_processed_id();
-        let frame = frame::GoAway::new(last_processed_id, e);
-        self.go_away.go_away_now(frame);
+        self.inner.go_away.send_pending_go_away(cx, &mut self.codec)
     }
 
     pub fn go_away_from_user(&mut self, e: Reason) {
-        let last_processed_id = self.streams.last_processed_id();
-        let frame = frame::GoAway::new(last_processed_id, e);
-        self.go_away.go_away_from_user(frame);
-
-        // Notify all streams of reason we're abruptly closing.
-        self.streams.recv_err(&proto::Error::Proto(e));
+        self.inner.as_dyn().go_away_from_user(e)
     }
 
     fn take_error(&mut self, ours: Reason) -> Poll<Result<(), proto::Error>> {
-        let reason = if let Some(theirs) = self.error.take() {
+        let reason = if let Some(theirs) = self.inner.error.take() {
             match (ours, theirs) {
                 // If either side reported an error, return that
                 // to the user.
@@ -196,13 +219,13 @@
     pub fn maybe_close_connection_if_no_streams(&mut self) {
         // If we poll() and realize that there are no streams or references
         // then we can close the connection by transitioning to GOAWAY
-        if !self.streams.has_streams_or_other_references() {
-            self.go_away_now(Reason::NO_ERROR);
+        if !self.inner.streams.has_streams_or_other_references() {
+            self.inner.as_dyn().go_away_now(Reason::NO_ERROR);
         }
     }
 
     pub(crate) fn take_user_pings(&mut self) -> Option<UserPings> {
-        self.ping_pong.take_user_pings()
+        self.inner.ping_pong.take_user_pings()
     }
 
     /// Advances the internal state of the connection.
@@ -211,79 +234,39 @@
         // order to placate the borrow checker — `self` is mutably borrowed by
         // `poll2`, which means that we can't borrow `self.span` to enter it.
         // The clone is just an atomic ref bump.
-        let span = self.span.clone();
+        let span = self.inner.span.clone();
         let _e = span.enter();
         let span = tracing::trace_span!("poll");
         let _e = span.enter();
-        use crate::codec::RecvError::*;
 
         loop {
-            tracing::trace!(connection.state = ?self.state);
+            tracing::trace!(connection.state = ?self.inner.state);
             // TODO: probably clean up this glob of code
-            match self.state {
+            match self.inner.state {
                 // When open, continue to poll a frame
                 State::Open => {
-                    match self.poll2(cx) {
-                        // The connection has shutdown normally
-                        Poll::Ready(Ok(())) => self.state = State::Closing(Reason::NO_ERROR),
+                    let result = match self.poll2(cx) {
+                        Poll::Ready(result) => result,
                         // The connection is not ready to make progress
                         Poll::Pending => {
                             // Ensure all window updates have been sent.
                             //
                             // This will also handle flushing `self.codec`
-                            ready!(self.streams.poll_complete(cx, &mut self.codec))?;
+                            ready!(self.inner.streams.poll_complete(cx, &mut self.codec))?;
 
-                            if (self.error.is_some() || self.go_away.should_close_on_idle())
-                                && !self.streams.has_streams()
+                            if (self.inner.error.is_some()
+                                || self.inner.go_away.should_close_on_idle())
+                                && !self.inner.streams.has_streams()
                             {
-                                self.go_away_now(Reason::NO_ERROR);
+                                self.inner.as_dyn().go_away_now(Reason::NO_ERROR);
                                 continue;
                             }
 
                             return Poll::Pending;
                         }
-                        // Attempting to read a frame resulted in a connection level
-                        // error. This is handled by setting a GOAWAY frame followed by
-                        // terminating the connection.
-                        Poll::Ready(Err(Connection(e))) => {
-                            tracing::debug!(error = ?e, "Connection::poll; connection error");
-
-                            // We may have already sent a GOAWAY for this error,
-                            // if so, don't send another, just flush and close up.
-                            if let Some(reason) = self.go_away.going_away_reason() {
-                                if reason == e {
-                                    tracing::trace!("    -> already going away");
-                                    self.state = State::Closing(e);
-                                    continue;
-                                }
-                            }
-
-                            // Reset all active streams
-                            self.streams.recv_err(&e.into());
-                            self.go_away_now(e);
-                        }
-                        // Attempting to read a frame resulted in a stream level error.
-                        // This is handled by resetting the frame then trying to read
-                        // another frame.
-                        Poll::Ready(Err(Stream { id, reason })) => {
-                            tracing::trace!(?id, ?reason, "stream error");
-                            self.streams.send_reset(id, reason);
-                        }
-                        // Attempting to read a frame resulted in an I/O error. All
-                        // active streams must be reset.
-                        //
-                        // TODO: Are I/O errors recoverable?
-                        Poll::Ready(Err(Io(e))) => {
-                            tracing::debug!(error = ?e, "Connection::poll; IO error");
-                            let e = e.into();
+                    };
 
-                            // Reset all active streams
-                            self.streams.recv_err(&e);
-
-                            // Return the error
-                            return Poll::Ready(Err(e));
-                        }
-                    }
+                    self.inner.as_dyn().handle_poll2_result(result)?
                 }
                 State::Closing(reason) => {
                     tracing::trace!("connection closing after flush");
@@ -291,7 +274,7 @@
                     ready!(self.codec.shutdown(cx))?;
 
                     // Transition the state to error
-                    self.state = State::Closed(reason);
+                    self.inner.state = State::Closed(reason);
                 }
                 State::Closed(reason) => return self.take_error(reason),
             }
@@ -299,8 +282,6 @@
     }
 
     fn poll2(&mut self, cx: &mut Context) -> Poll<Result<(), RecvError>> {
-        use crate::frame::Frame::*;
-
         // This happens outside of the loop to prevent needing to do a clock
         // check and then comparison of the queue possibly multiple times a
         // second (and thus, the clock wouldn't have changed enough to matter).
@@ -313,8 +294,8 @@
             // - poll_go_away may buffer a graceful shutdown GOAWAY frame
             // - If it has, we've also added a PING to be sent in poll_ready
             if let Some(reason) = ready!(self.poll_go_away(cx)?) {
-                if self.go_away.should_close_now() {
-                    if self.go_away.is_user_initiated() {
+                if self.inner.go_away.should_close_now() {
+                    if self.inner.go_away.is_user_initiated() {
                         // A user initiated abrupt shutdown shouldn't return
                         // the same error back to the user.
                         return Poll::Ready(Ok(()));
@@ -331,79 +312,211 @@
             }
             ready!(self.poll_ready(cx))?;
 
-            match ready!(Pin::new(&mut self.codec).poll_next(cx)?) {
-                Some(Headers(frame)) => {
-                    tracing::trace!(?frame, "recv HEADERS");
-                    self.streams.recv_headers(frame)?;
-                }
-                Some(Data(frame)) => {
-                    tracing::trace!(?frame, "recv DATA");
-                    self.streams.recv_data(frame)?;
-                }
-                Some(Reset(frame)) => {
-                    tracing::trace!(?frame, "recv RST_STREAM");
-                    self.streams.recv_reset(frame)?;
-                }
-                Some(PushPromise(frame)) => {
-                    tracing::trace!(?frame, "recv PUSH_PROMISE");
-                    self.streams.recv_push_promise(frame)?;
+            match self
+                .inner
+                .as_dyn()
+                .recv_frame(ready!(Pin::new(&mut self.codec).poll_next(cx)?))?
+            {
+                ReceivedFrame::Settings(frame) => {
+                    self.inner.settings.recv_settings(
+                        frame,
+                        &mut self.codec,
+                        &mut self.inner.streams,
+                    )?;
                 }
-                Some(Settings(frame)) => {
-                    tracing::trace!(?frame, "recv SETTINGS");
-                    self.settings
-                        .recv_settings(frame, &mut self.codec, &mut self.streams)?;
-                }
-                Some(GoAway(frame)) => {
-                    tracing::trace!(?frame, "recv GOAWAY");
-                    // This should prevent starting new streams,
-                    // but should allow continuing to process current streams
-                    // until they are all EOS. Once they are, State should
-                    // transition to GoAway.
-                    self.streams.recv_go_away(&frame)?;
-                    self.error = Some(frame.reason());
+                ReceivedFrame::Continue => (),
+                ReceivedFrame::Done => {
+                    return Poll::Ready(Ok(()));
                 }
-                Some(Ping(frame)) => {
-                    tracing::trace!(?frame, "recv PING");
-                    let status = self.ping_pong.recv_ping(frame);
-                    if status.is_shutdown() {
-                        assert!(
-                            self.go_away.is_going_away(),
-                            "received unexpected shutdown ping"
-                        );
+            }
+        }
+    }
 
-                        let last_processed_id = self.streams.last_processed_id();
-                        self.go_away(last_processed_id, Reason::NO_ERROR);
+    fn clear_expired_reset_streams(&mut self) {
+        self.inner.streams.clear_expired_reset_streams();
+    }
+}
+
+impl<P, B> ConnectionInner<P, B>
+where
+    P: Peer,
+    B: Buf,
+{
+    fn as_dyn(&mut self) -> DynConnection<'_, B> {
+        let ConnectionInner {
+            state,
+            go_away,
+            streams,
+            error,
+            ping_pong,
+            ..
+        } = self;
+        let streams = streams.as_dyn();
+        DynConnection {
+            state,
+            go_away,
+            streams,
+            error,
+            ping_pong,
+        }
+    }
+}
+
+impl<B> DynConnection<'_, B>
+where
+    B: Buf,
+{
+    fn go_away(&mut self, id: StreamId, e: Reason) {
+        let frame = frame::GoAway::new(id, e);
+        self.streams.send_go_away(id);
+        self.go_away.go_away(frame);
+    }
+
+    fn go_away_now(&mut self, e: Reason) {
+        let last_processed_id = self.streams.last_processed_id();
+        let frame = frame::GoAway::new(last_processed_id, e);
+        self.go_away.go_away_now(frame);
+    }
+
+    fn go_away_from_user(&mut self, e: Reason) {
+        let last_processed_id = self.streams.last_processed_id();
+        let frame = frame::GoAway::new(last_processed_id, e);
+        self.go_away.go_away_from_user(frame);
+
+        // Notify all streams of reason we're abruptly closing.
+        self.streams.recv_err(&proto::Error::Proto(e));
+    }
+
+    fn handle_poll2_result(&mut self, result: Result<(), RecvError>) -> Result<(), Error> {
+        use crate::codec::RecvError::*;
+        match result {
+            // The connection has shutdown normally
+            Ok(()) => {
+                *self.state = State::Closing(Reason::NO_ERROR);
+                Ok(())
+            }
+            // Attempting to read a frame resulted in a connection level
+            // error. This is handled by setting a GOAWAY frame followed by
+            // terminating the connection.
+            Err(Connection(e)) => {
+                tracing::debug!(error = ?e, "Connection::poll; connection error");
+
+                // We may have already sent a GOAWAY for this error,
+                // if so, don't send another, just flush and close up.
+                if let Some(reason) = self.go_away.going_away_reason() {
+                    if reason == e {
+                        tracing::trace!("    -> already going away");
+                        *self.state = State::Closing(e);
+                        return Ok(());
                     }
                 }
-                Some(WindowUpdate(frame)) => {
-                    tracing::trace!(?frame, "recv WINDOW_UPDATE");
-                    self.streams.recv_window_update(frame)?;
-                }
-                Some(Priority(frame)) => {
-                    tracing::trace!(?frame, "recv PRIORITY");
-                    // TODO: handle
-                }
-                None => {
-                    tracing::trace!("codec closed");
-                    self.streams.recv_eof(false).expect("mutex poisoned");
-                    return Poll::Ready(Ok(()));
-                }
+
+                // Reset all active streams
+                self.streams.recv_err(&e.into());
+                self.go_away_now(e);
+                Ok(())
+            }
+            // Attempting to read a frame resulted in a stream level error.
+            // This is handled by resetting the frame then trying to read
+            // another frame.
+            Err(Stream { id, reason }) => {
+                tracing::trace!(?id, ?reason, "stream error");
+                self.streams.send_reset(id, reason);
+                Ok(())
+            }
+            // Attempting to read a frame resulted in an I/O error. All
+            // active streams must be reset.
+            //
+            // TODO: Are I/O errors recoverable?
+            Err(Io(e)) => {
+                tracing::debug!(error = ?e, "Connection::poll; IO error");
+                let e = e.into();
+
+                // Reset all active streams
+                self.streams.recv_err(&e);
+
+                // Return the error
+                Err(e)
             }
         }
     }
 
-    fn clear_expired_reset_streams(&mut self) {
-        self.streams.clear_expired_reset_streams();
+    fn recv_frame(&mut self, frame: Option<Frame>) -> Result<ReceivedFrame, RecvError> {
+        use crate::frame::Frame::*;
+        match frame {
+            Some(Headers(frame)) => {
+                tracing::trace!(?frame, "recv HEADERS");
+                self.streams.recv_headers(frame)?;
+            }
+            Some(Data(frame)) => {
+                tracing::trace!(?frame, "recv DATA");
+                self.streams.recv_data(frame)?;
+            }
+            Some(Reset(frame)) => {
+                tracing::trace!(?frame, "recv RST_STREAM");
+                self.streams.recv_reset(frame)?;
+            }
+            Some(PushPromise(frame)) => {
+                tracing::trace!(?frame, "recv PUSH_PROMISE");
+                self.streams.recv_push_promise(frame)?;
+            }
+            Some(Settings(frame)) => {
+                tracing::trace!(?frame, "recv SETTINGS");
+                return Ok(ReceivedFrame::Settings(frame));
+            }
+            Some(GoAway(frame)) => {
+                tracing::trace!(?frame, "recv GOAWAY");
+                // This should prevent starting new streams,
+                // but should allow continuing to process current streams
+                // until they are all EOS. Once they are, State should
+                // transition to GoAway.
+                self.streams.recv_go_away(&frame)?;
+                *self.error = Some(frame.reason());
+            }
+            Some(Ping(frame)) => {
+                tracing::trace!(?frame, "recv PING");
+                let status = self.ping_pong.recv_ping(frame);
+                if status.is_shutdown() {
+                    assert!(
+                        self.go_away.is_going_away(),
+                        "received unexpected shutdown ping"
+                    );
+
+                    let last_processed_id = self.streams.last_processed_id();
+                    self.go_away(last_processed_id, Reason::NO_ERROR);
+                }
+            }
+            Some(WindowUpdate(frame)) => {
+                tracing::trace!(?frame, "recv WINDOW_UPDATE");
+                self.streams.recv_window_update(frame)?;
+            }
+            Some(Priority(frame)) => {
+                tracing::trace!(?frame, "recv PRIORITY");
+                // TODO: handle
+            }
+            None => {
+                tracing::trace!("codec closed");
+                self.streams.recv_eof(false).expect("mutex poisoned");
+                return Ok(ReceivedFrame::Done);
+            }
+        }
+        Ok(ReceivedFrame::Continue)
     }
 }
 
+enum ReceivedFrame {
+    Settings(frame::Settings),
+    Continue,
+    Done,
+}
+
 impl<T, B> Connection<T, client::Peer, B>
 where
     T: AsyncRead + AsyncWrite,
     B: Buf,
 {
     pub(crate) fn streams(&self) -> &Streams<B, client::Peer> {
-        &self.streams
+        &self.inner.streams
     }
 }
 
@@ -413,12 +526,12 @@
     B: Buf,
 {
     pub fn next_incoming(&mut self) -> Option<StreamRef<B>> {
-        self.streams.next_incoming()
+        self.inner.streams.next_incoming()
     }
 
     // Graceful shutdown only makes sense for server peers.
     pub fn go_away_gracefully(&mut self) {
-        if self.go_away.is_going_away() {
+        if self.inner.go_away.is_going_away() {
             // No reason to start a new one.
             return;
         }
@@ -434,11 +547,11 @@
         // > send another GOAWAY frame with an updated last stream identifier.
         // > This ensures that a connection can be cleanly shut down without
         // > losing requests.
-        self.go_away(StreamId::MAX, Reason::NO_ERROR);
+        self.inner.as_dyn().go_away(StreamId::MAX, Reason::NO_ERROR);
 
         // We take the advice of waiting 1 RTT literally, and wait
         // for a pong before proceeding.
-        self.ping_pong.ping_shutdown();
+        self.inner.ping_pong.ping_shutdown();
     }
 }
 
@@ -449,6 +562,6 @@
 {
     fn drop(&mut self) {
         // Ignore errors as this indicates that the mutex is poisoned.
-        let _ = self.streams.recv_eof(true);
+        let _ = self.inner.streams.recv_eof(true);
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
 pub(crate) use self::error::Error;
 pub(crate) use self::peer::{Dyn as DynPeer, Peer};
 pub(crate) use self::ping_pong::UserPings;
-pub(crate) use self::streams::{OpaqueStreamRef, StreamRef, Streams};
+pub(crate) use self::streams::{DynStreams, OpaqueStreamRef, StreamRef, Streams};
 pub(crate) use self::streams::{Open, PollReset, Prioritized};
 
 use crate::codec::Codec;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/ping_pong.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/ping_pong.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/ping_pong.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/ping_pong.rs	2021-12-09 12:01:26.000000000 +0000
@@ -211,11 +211,16 @@
 
 impl UserPings {
     pub(crate) fn send_ping(&self) -> Result<(), Option<proto::Error>> {
-        let prev = self.0.state.compare_and_swap(
-            USER_STATE_EMPTY,        // current
-            USER_STATE_PENDING_PING, // new
-            Ordering::AcqRel,
-        );
+        let prev = self
+            .0
+            .state
+            .compare_exchange(
+                USER_STATE_EMPTY,        // current
+                USER_STATE_PENDING_PING, // new
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .unwrap_or_else(|v| v);
 
         match prev {
             USER_STATE_EMPTY => {
@@ -234,11 +239,16 @@
         // Must register before checking state, in case state were to change
         // before we could register, and then the ping would just be lost.
         self.0.pong_task.register(cx.waker());
-        let prev = self.0.state.compare_and_swap(
-            USER_STATE_RECEIVED_PONG, // current
-            USER_STATE_EMPTY,         // new
-            Ordering::AcqRel,
-        );
+        let prev = self
+            .0
+            .state
+            .compare_exchange(
+                USER_STATE_RECEIVED_PONG, // current
+                USER_STATE_EMPTY,         // new
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .unwrap_or_else(|v| v);
 
         match prev {
             USER_STATE_RECEIVED_PONG => Poll::Ready(Ok(())),
@@ -252,11 +262,16 @@
 
 impl UserPingsRx {
     fn receive_pong(&self) -> bool {
-        let prev = self.0.state.compare_and_swap(
-            USER_STATE_PENDING_PONG,  // current
-            USER_STATE_RECEIVED_PONG, // new
-            Ordering::AcqRel,
-        );
+        let prev = self
+            .0
+            .state
+            .compare_exchange(
+                USER_STATE_PENDING_PONG,  // current
+                USER_STATE_RECEIVED_PONG, // new
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .unwrap_or_else(|v| v);
 
         if prev == USER_STATE_PENDING_PONG {
             self.0.pong_task.wake();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/buffer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/buffer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/buffer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/buffer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -92,13 +92,4 @@
             None => None,
         }
     }
-
-    /*
-    pub fn peek_front<'a, T>(&self, buf: &'a Buffer<T>) -> Option<&'a T> {
-        match self.indices {
-            Some(idxs) => Some(&buf.slab[idxs.head].value),
-            None => None,
-        }
-    }
-    */
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/counts.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/counts.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/counts.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/counts.rs	2021-12-09 12:01:26.000000000 +0000
@@ -167,6 +167,18 @@
         }
     }
 
+    /// Returns the maximum number of streams that can be initiated by this
+    /// peer.
+    pub(crate) fn max_send_streams(&self) -> usize {
+        self.max_send_streams
+    }
+
+    /// Returns the maximum number of streams that can be initiated by the
+    /// remote peer.
+    pub(crate) fn max_recv_streams(&self) -> usize {
+        self.max_recv_streams
+    }
+
     fn dec_num_streams(&mut self, stream: &mut store::Ptr) {
         assert!(stream.is_counted);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 pub(crate) use self::prioritize::Prioritized;
 pub(crate) use self::recv::Open;
 pub(crate) use self::send::PollReset;
-pub(crate) use self::streams::{OpaqueStreamRef, StreamRef, Streams};
+pub(crate) use self::streams::{DynStreams, OpaqueStreamRef, StreamRef, Streams};
 
 use self::buffer::Buffer;
 use self::counts::Counts;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/prioritize.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/prioritize.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/prioritize.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/prioritize.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 use crate::codec::UserError;
 use crate::codec::UserError::*;
 
-use bytes::buf::ext::{BufExt, Take};
+use bytes::buf::{Buf, Take};
 use std::io;
 use std::task::{Context, Poll, Waker};
 use std::{cmp, fmt, mem};
@@ -18,7 +18,7 @@
 /// This is because "idle" stream IDs – those which have been initiated but
 /// have yet to receive frames – will be implicitly closed on receipt of a
 /// frame on a higher stream ID. If these queues was not ordered by stream
-/// IDs, some mechanism would be necessary to ensure that the lowest-numberedh]
+/// IDs, some mechanism would be necessary to ensure that the lowest-numbered]
 /// idle stream is opened first.
 #[derive(Debug)]
 pub(super) struct Prioritize {
@@ -545,43 +545,57 @@
 
         // First check if there are any data chunks to take back
         if let Some(frame) = dst.take_last_data_frame() {
-            tracing::trace!(
-                ?frame,
-                sz = frame.payload().inner.get_ref().remaining(),
-                "reclaimed"
-            );
-
-            let mut eos = false;
-            let key = frame.payload().stream;
-
-            match mem::replace(&mut self.in_flight_data_frame, InFlightData::Nothing) {
-                InFlightData::Nothing => panic!("wasn't expecting a frame to reclaim"),
-                InFlightData::Drop => {
-                    tracing::trace!("not reclaiming frame for cancelled stream");
-                    return false;
-                }
-                InFlightData::DataFrame(k) => {
-                    debug_assert_eq!(k, key);
-                }
-            }
+            self.reclaim_frame_inner(buffer, store, frame)
+        } else {
+            false
+        }
+    }
+
+    fn reclaim_frame_inner<B>(
+        &mut self,
+        buffer: &mut Buffer<Frame<B>>,
+        store: &mut Store,
+        frame: frame::Data<Prioritized<B>>,
+    ) -> bool
+    where
+        B: Buf,
+    {
+        tracing::trace!(
+            ?frame,
+            sz = frame.payload().inner.get_ref().remaining(),
+            "reclaimed"
+        );
 
-            let mut frame = frame.map(|prioritized| {
-                // TODO: Ensure fully written
-                eos = prioritized.end_of_stream;
-                prioritized.inner.into_inner()
-            });
+        let mut eos = false;
+        let key = frame.payload().stream;
 
-            if frame.payload().has_remaining() {
-                let mut stream = store.resolve(key);
+        match mem::replace(&mut self.in_flight_data_frame, InFlightData::Nothing) {
+            InFlightData::Nothing => panic!("wasn't expecting a frame to reclaim"),
+            InFlightData::Drop => {
+                tracing::trace!("not reclaiming frame for cancelled stream");
+                return false;
+            }
+            InFlightData::DataFrame(k) => {
+                debug_assert_eq!(k, key);
+            }
+        }
 
-                if eos {
-                    frame.set_end_stream(true);
-                }
+        let mut frame = frame.map(|prioritized| {
+            // TODO: Ensure fully written
+            eos = prioritized.end_of_stream;
+            prioritized.inner.into_inner()
+        });
 
-                self.push_back_frame(frame.into(), buffer, &mut stream);
+        if frame.payload().has_remaining() {
+            let mut stream = store.resolve(key);
 
-                return true;
+            if eos {
+                frame.set_end_stream(true);
             }
+
+            self.push_back_frame(frame.into(), buffer, &mut stream);
+
+            return true;
         }
 
         false
@@ -847,8 +861,12 @@
         self.inner.remaining()
     }
 
-    fn bytes(&self) -> &[u8] {
-        self.inner.bytes()
+    fn chunk(&self) -> &[u8] {
+        self.inner.chunk()
+    }
+
+    fn chunks_vectored<'a>(&'a self, dst: &mut [std::io::IoSlice<'a>]) -> usize {
+        self.inner.chunks_vectored(dst)
     }
 
     fn advance(&mut self, cnt: usize) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/recv.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/recv.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/recv.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/recv.rs	2021-12-09 12:01:26.000000000 +0000
@@ -54,7 +54,7 @@
     /// Refused StreamId, this represents a frame that must be sent out.
     refused: Option<StreamId>,
 
-    /// If push promises are allowed to be recevied.
+    /// If push promises are allowed to be received.
     is_push_enabled: bool,
 }
 
@@ -161,7 +161,7 @@
         counts: &mut Counts,
     ) -> Result<(), RecvHeaderBlockError<Option<frame::Headers>>> {
         tracing::trace!("opening stream; init_window={}", self.init_window_sz);
-        let is_initial = stream.state.recv_open(frame.is_end_stream())?;
+        let is_initial = stream.state.recv_open(&frame)?;
 
         if is_initial {
             // TODO: be smarter about this logic
@@ -226,15 +226,17 @@
 
         let stream_id = frame.stream_id();
         let (pseudo, fields) = frame.into_parts();
-        let message = counts
-            .peer()
-            .convert_poll_message(pseudo, fields, stream_id)?;
-
-        // Push the frame onto the stream's recv buffer
-        stream
-            .pending_recv
-            .push_back(&mut self.buffer, Event::Headers(message));
-        stream.notify_recv();
+        if !pseudo.is_informational() {
+            let message = counts
+                .peer()
+                .convert_poll_message(pseudo, fields, stream_id)?;
+
+            // Push the frame onto the stream's recv buffer
+            stream
+                .pending_recv
+                .push_back(&mut self.buffer, Event::Headers(message));
+            stream.notify_recv();
+        }
 
         // Only servers can receive a headers frame that initiates the stream.
         // This is verified in `Streams` before calling this function.
@@ -864,13 +866,15 @@
     }
 
     pub fn clear_expired_reset_streams(&mut self, store: &mut Store, counts: &mut Counts) {
-        let now = Instant::now();
-        let reset_duration = self.reset_duration;
-        while let Some(stream) = self.pending_reset_expired.pop_if(store, |stream| {
-            let reset_at = stream.reset_at.expect("reset_at must be set if in queue");
-            now - reset_at > reset_duration
-        }) {
-            counts.transition_after(stream, true);
+        if !self.pending_reset_expired.is_empty() {
+            let now = Instant::now();
+            let reset_duration = self.reset_duration;
+            while let Some(stream) = self.pending_reset_expired.pop_if(store, |stream| {
+                let reset_at = stream.reset_at.expect("reset_at must be set if in queue");
+                now - reset_at > reset_duration
+            }) {
+                counts.transition_after(stream, true);
+            }
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/state.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/state.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/state.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/state.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 use crate::codec::UserError::*;
 use crate::codec::{RecvError, UserError};
-use crate::frame::Reason;
+use crate::frame::{self, Reason};
 use crate::proto::{self, PollReset};
 
 use self::Inner::*;
@@ -133,9 +133,9 @@
     /// Opens the receive-half of the stream when a HEADERS frame is received.
     ///
     /// Returns true if this transitions the state to Open.
-    pub fn recv_open(&mut self, eos: bool) -> Result<bool, RecvError> {
-        let remote = Streaming;
+    pub fn recv_open(&mut self, frame: &frame::Headers) -> Result<bool, RecvError> {
         let mut initial = false;
+        let eos = frame.is_end_stream();
 
         self.inner = match self.inner {
             Idle => {
@@ -146,7 +146,12 @@
                 } else {
                     Open {
                         local: AwaitingHeaders,
-                        remote,
+                        remote: if frame.is_informational() {
+                            tracing::trace!("skipping 1xx response headers");
+                            AwaitingHeaders
+                        } else {
+                            Streaming
+                        },
                     }
                 }
             }
@@ -155,6 +160,9 @@
 
                 if eos {
                     Closed(Cause::EndStream)
+                } else if frame.is_informational() {
+                    tracing::trace!("skipping 1xx response headers");
+                    ReservedRemote
                 } else {
                     HalfClosedLocal(Streaming)
                 }
@@ -166,14 +174,25 @@
                 if eos {
                     HalfClosedRemote(local)
                 } else {
-                    Open { local, remote }
+                    Open {
+                        local,
+                        remote: if frame.is_informational() {
+                            tracing::trace!("skipping 1xx response headers");
+                            AwaitingHeaders
+                        } else {
+                            Streaming
+                        },
+                    }
                 }
             }
             HalfClosedLocal(AwaitingHeaders) => {
                 if eos {
                     Closed(Cause::EndStream)
+                } else if frame.is_informational() {
+                    tracing::trace!("skipping 1xx response headers");
+                    HalfClosedLocal(AwaitingHeaders)
                 } else {
-                    HalfClosedLocal(remote)
+                    HalfClosedLocal(Streaming)
                 }
             }
             state => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/store.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/store.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/store.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/store.rs	2021-12-09 12:01:26.000000000 +0000
@@ -304,6 +304,10 @@
         None
     }
 
+    pub fn is_empty(&self) -> bool {
+        self.indices.is_none()
+    }
+
     pub fn pop_if<'a, R, F>(&mut self, store: &'a mut R, f: F) -> Option<store::Ptr<'a>>
     where
         R: Resolve,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/streams.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/streams.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/proto/streams/streams.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/proto/streams/streams.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,6 +37,17 @@
     _p: ::std::marker::PhantomData<P>,
 }
 
+// Like `Streams` but with a `peer::Dyn` field instead of a static `P: Peer` type parameter.
+// Ensures that the methods only get one instantiation, instead of two (client and server)
+#[derive(Debug)]
+pub(crate) struct DynStreams<'a, B> {
+    inner: &'a Mutex<Inner>,
+
+    send_buffer: &'a SendBuffer<B>,
+
+    peer: peer::Dyn,
+}
+
 /// Reference to the stream state
 #[derive(Debug)]
 pub(crate) struct StreamRef<B> {
@@ -101,17 +112,7 @@
         let peer = P::r#dyn();
 
         Streams {
-            inner: Arc::new(Mutex::new(Inner {
-                counts: Counts::new(peer, &config),
-                actions: Actions {
-                    recv: Recv::new(peer, &config),
-                    send: Send::new(&config),
-                    task: None,
-                    conn_error: None,
-                },
-                store: Store::new(),
-                refs: 1,
-            })),
+            inner: Inner::new(peer, config),
             send_buffer: Arc::new(SendBuffer::new()),
             _p: ::std::marker::PhantomData,
         }
@@ -126,24 +127,269 @@
             .set_target_connection_window(size, &mut me.actions.task)
     }
 
-    /// Process inbound headers
-    pub fn recv_headers(&mut self, frame: frame::Headers) -> Result<(), RecvError> {
-        let id = frame.stream_id();
+    pub fn next_incoming(&mut self) -> Option<StreamRef<B>> {
         let mut me = self.inner.lock().unwrap();
         let me = &mut *me;
+        me.actions.recv.next_incoming(&mut me.store).map(|key| {
+            let stream = &mut me.store.resolve(key);
+            tracing::trace!(
+                "next_incoming; id={:?}, state={:?}",
+                stream.id,
+                stream.state
+            );
+            // TODO: ideally, OpaqueStreamRefs::new would do this, but we're holding
+            // the lock, so it can't.
+            me.refs += 1;
+            StreamRef {
+                opaque: OpaqueStreamRef::new(self.inner.clone(), stream),
+                send_buffer: self.send_buffer.clone(),
+            }
+        })
+    }
+
+    pub fn send_pending_refusal<T>(
+        &mut self,
+        cx: &mut Context,
+        dst: &mut Codec<T, Prioritized<B>>,
+    ) -> Poll<io::Result<()>>
+    where
+        T: AsyncWrite + Unpin,
+    {
+        let mut me = self.inner.lock().unwrap();
+        let me = &mut *me;
+        me.actions.recv.send_pending_refusal(cx, dst)
+    }
+
+    pub fn clear_expired_reset_streams(&mut self) {
+        let mut me = self.inner.lock().unwrap();
+        let me = &mut *me;
+        me.actions
+            .recv
+            .clear_expired_reset_streams(&mut me.store, &mut me.counts);
+    }
+
+    pub fn poll_complete<T>(
+        &mut self,
+        cx: &mut Context,
+        dst: &mut Codec<T, Prioritized<B>>,
+    ) -> Poll<io::Result<()>>
+    where
+        T: AsyncWrite + Unpin,
+    {
+        let mut me = self.inner.lock().unwrap();
+        me.poll_complete(&self.send_buffer, cx, dst)
+    }
+
+    pub fn apply_remote_settings(&mut self, frame: &frame::Settings) -> Result<(), RecvError> {
+        let mut me = self.inner.lock().unwrap();
+        let me = &mut *me;
+
+        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+        let send_buffer = &mut *send_buffer;
+
+        me.counts.apply_remote_settings(frame);
+
+        me.actions.send.apply_remote_settings(
+            frame,
+            send_buffer,
+            &mut me.store,
+            &mut me.counts,
+            &mut me.actions.task,
+        )
+    }
+
+    pub fn apply_local_settings(&mut self, frame: &frame::Settings) -> Result<(), RecvError> {
+        let mut me = self.inner.lock().unwrap();
+        let me = &mut *me;
+
+        me.actions.recv.apply_local_settings(frame, &mut me.store)
+    }
+
+    pub fn send_request(
+        &mut self,
+        mut request: Request<()>,
+        end_of_stream: bool,
+        pending: Option<&OpaqueStreamRef>,
+    ) -> Result<StreamRef<B>, SendError> {
+        use super::stream::ContentLength;
+        use http::Method;
+
+        // Clear before taking lock, incase extensions contain a StreamRef.
+        request.extensions_mut().clear();
+
+        // TODO: There is a hazard with assigning a stream ID before the
+        // prioritize layer. If prioritization reorders new streams, this
+        // implicitly closes the earlier stream IDs.
+        //
+        // See: hyperium/h2#11
+        let mut me = self.inner.lock().unwrap();
+        let me = &mut *me;
+
+        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+        let send_buffer = &mut *send_buffer;
+
+        me.actions.ensure_no_conn_error()?;
+        me.actions.send.ensure_next_stream_id()?;
+
+        // The `pending` argument is provided by the `Client`, and holds
+        // a store `Key` of a `Stream` that may have been not been opened
+        // yet.
+        //
+        // If that stream is still pending, the Client isn't allowed to
+        // queue up another pending stream. They should use `poll_ready`.
+        if let Some(stream) = pending {
+            if me.store.resolve(stream.key).is_pending_open {
+                return Err(UserError::Rejected.into());
+            }
+        }
+
+        if me.counts.peer().is_server() {
+            // Servers cannot open streams. PushPromise must first be reserved.
+            return Err(UserError::UnexpectedFrameType.into());
+        }
+
+        let stream_id = me.actions.send.open()?;
+
+        let mut stream = Stream::new(
+            stream_id,
+            me.actions.send.init_window_sz(),
+            me.actions.recv.init_window_sz(),
+        );
+
+        if *request.method() == Method::HEAD {
+            stream.content_length = ContentLength::Head;
+        }
+
+        // Convert the message
+        let headers = client::Peer::convert_send_message(stream_id, request, end_of_stream)?;
+
+        let mut stream = me.store.insert(stream.id, stream);
+
+        let sent = me.actions.send.send_headers(
+            headers,
+            send_buffer,
+            &mut stream,
+            &mut me.counts,
+            &mut me.actions.task,
+        );
+
+        // send_headers can return a UserError, if it does,
+        // we should forget about this stream.
+        if let Err(err) = sent {
+            stream.unlink();
+            stream.remove();
+            return Err(err.into());
+        }
+
+        // Given that the stream has been initialized, it should not be in the
+        // closed state.
+        debug_assert!(!stream.state.is_closed());
+
+        // TODO: ideally, OpaqueStreamRefs::new would do this, but we're holding
+        // the lock, so it can't.
+        me.refs += 1;
+
+        Ok(StreamRef {
+            opaque: OpaqueStreamRef::new(self.inner.clone(), &mut stream),
+            send_buffer: self.send_buffer.clone(),
+        })
+    }
+}
+
+impl<B> DynStreams<'_, B> {
+    pub fn recv_headers(&mut self, frame: frame::Headers) -> Result<(), RecvError> {
+        let mut me = self.inner.lock().unwrap();
+
+        me.recv_headers(self.peer, &self.send_buffer, frame)
+    }
+
+    pub fn recv_data(&mut self, frame: frame::Data) -> Result<(), RecvError> {
+        let mut me = self.inner.lock().unwrap();
+        me.recv_data(self.peer, &self.send_buffer, frame)
+    }
+
+    pub fn recv_reset(&mut self, frame: frame::Reset) -> Result<(), RecvError> {
+        let mut me = self.inner.lock().unwrap();
+
+        me.recv_reset(&self.send_buffer, frame)
+    }
+
+    /// Handle a received error and return the ID of the last processed stream.
+    pub fn recv_err(&mut self, err: &proto::Error) -> StreamId {
+        let mut me = self.inner.lock().unwrap();
+        me.recv_err(&self.send_buffer, err)
+    }
+
+    pub fn recv_go_away(&mut self, frame: &frame::GoAway) -> Result<(), RecvError> {
+        let mut me = self.inner.lock().unwrap();
+        me.recv_go_away(&self.send_buffer, frame)
+    }
+
+    pub fn last_processed_id(&self) -> StreamId {
+        self.inner.lock().unwrap().actions.recv.last_processed_id()
+    }
+
+    pub fn recv_window_update(&mut self, frame: frame::WindowUpdate) -> Result<(), RecvError> {
+        let mut me = self.inner.lock().unwrap();
+        me.recv_window_update(&self.send_buffer, frame)
+    }
+
+    pub fn recv_push_promise(&mut self, frame: frame::PushPromise) -> Result<(), RecvError> {
+        let mut me = self.inner.lock().unwrap();
+        me.recv_push_promise(&self.send_buffer, frame)
+    }
+
+    pub fn recv_eof(&mut self, clear_pending_accept: bool) -> Result<(), ()> {
+        let mut me = self.inner.lock().map_err(|_| ())?;
+        me.recv_eof(&self.send_buffer, clear_pending_accept)
+    }
+
+    pub fn send_reset(&mut self, id: StreamId, reason: Reason) {
+        let mut me = self.inner.lock().unwrap();
+        me.send_reset(&self.send_buffer, id, reason)
+    }
+
+    pub fn send_go_away(&mut self, last_processed_id: StreamId) {
+        let mut me = self.inner.lock().unwrap();
+        me.actions.recv.go_away(last_processed_id);
+    }
+}
+
+impl Inner {
+    fn new(peer: peer::Dyn, config: Config) -> Arc<Mutex<Self>> {
+        Arc::new(Mutex::new(Inner {
+            counts: Counts::new(peer, &config),
+            actions: Actions {
+                recv: Recv::new(peer, &config),
+                send: Send::new(&config),
+                task: None,
+                conn_error: None,
+            },
+            store: Store::new(),
+            refs: 1,
+        }))
+    }
+
+    fn recv_headers<B>(
+        &mut self,
+        peer: peer::Dyn,
+        send_buffer: &SendBuffer<B>,
+        frame: frame::Headers,
+    ) -> Result<(), RecvError> {
+        let id = frame.stream_id();
 
         // The GOAWAY process has begun. All streams with a greater ID than
         // specified as part of GOAWAY should be ignored.
-        if id > me.actions.recv.max_stream_id() {
+        if id > self.actions.recv.max_stream_id() {
             tracing::trace!(
                 "id ({:?}) > max_stream_id ({:?}), ignoring HEADERS",
                 id,
-                me.actions.recv.max_stream_id()
+                self.actions.recv.max_stream_id()
             );
             return Ok(());
         }
 
-        let key = match me.store.find_entry(id) {
+        let key = match self.store.find_entry(id) {
             Entry::Occupied(e) => e.key(),
             Entry::Vacant(e) => {
                 // Client: it's possible to send a request, and then send
@@ -151,10 +397,10 @@
                 //
                 // Server: we can't reset a stream before having received
                 // the request headers, so don't allow.
-                if !P::is_server() {
+                if !peer.is_server() {
                     // This may be response headers for a stream we've already
                     // forgotten about...
-                    if me.actions.may_have_forgotten_stream::<P>(id) {
+                    if self.actions.may_have_forgotten_stream(peer, id) {
                         tracing::debug!(
                             "recv_headers for old stream={:?}, sending STREAM_CLOSED",
                             id,
@@ -166,12 +412,16 @@
                     }
                 }
 
-                match me.actions.recv.open(id, Open::Headers, &mut me.counts)? {
+                match self
+                    .actions
+                    .recv
+                    .open(id, Open::Headers, &mut self.counts)?
+                {
                     Some(stream_id) => {
                         let stream = Stream::new(
                             stream_id,
-                            me.actions.send.init_window_sz(),
-                            me.actions.recv.init_window_sz(),
+                            self.actions.send.init_window_sz(),
+                            self.actions.recv.init_window_sz(),
                         );
 
                         e.insert(stream)
@@ -181,7 +431,7 @@
             }
         };
 
-        let stream = me.store.resolve(key);
+        let stream = self.store.resolve(key);
 
         if stream.state.is_local_reset() {
             // Locally reset streams must ignore frames "for some time".
@@ -191,11 +441,11 @@
             return Ok(());
         }
 
-        let actions = &mut me.actions;
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+        let actions = &mut self.actions;
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
         let send_buffer = &mut *send_buffer;
 
-        me.counts.transition(stream, |counts, stream| {
+        self.counts.transition(stream, |counts, stream| {
             tracing::trace!(
                 "recv_headers; stream={:?}; state={:?}",
                 stream.id,
@@ -247,27 +497,29 @@
         })
     }
 
-    pub fn recv_data(&mut self, frame: frame::Data) -> Result<(), RecvError> {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
+    fn recv_data<B>(
+        &mut self,
+        peer: peer::Dyn,
+        send_buffer: &SendBuffer<B>,
+        frame: frame::Data,
+    ) -> Result<(), RecvError> {
         let id = frame.stream_id();
 
-        let stream = match me.store.find_mut(&id) {
+        let stream = match self.store.find_mut(&id) {
             Some(stream) => stream,
             None => {
                 // The GOAWAY process has begun. All streams with a greater ID
                 // than specified as part of GOAWAY should be ignored.
-                if id > me.actions.recv.max_stream_id() {
+                if id > self.actions.recv.max_stream_id() {
                     tracing::trace!(
                         "id ({:?}) > max_stream_id ({:?}), ignoring DATA",
                         id,
-                        me.actions.recv.max_stream_id()
+                        self.actions.recv.max_stream_id()
                     );
                     return Ok(());
                 }
 
-                if me.actions.may_have_forgotten_stream::<P>(id) {
+                if self.actions.may_have_forgotten_stream(peer, id) {
                     tracing::debug!("recv_data for old stream={:?}, sending STREAM_CLOSED", id,);
 
                     let sz = frame.payload().len();
@@ -276,7 +528,7 @@
                     assert!(sz <= super::MAX_WINDOW_SIZE as usize);
                     let sz = sz as WindowSize;
 
-                    me.actions.recv.ignore_data(sz)?;
+                    self.actions.recv.ignore_data(sz)?;
                     return Err(RecvError::Stream {
                         id,
                         reason: Reason::STREAM_CLOSED,
@@ -288,11 +540,11 @@
             }
         };
 
-        let actions = &mut me.actions;
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+        let actions = &mut self.actions;
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
         let send_buffer = &mut *send_buffer;
 
-        me.counts.transition(stream, |counts, stream| {
+        self.counts.transition(stream, |counts, stream| {
             let sz = frame.payload().len();
             let res = actions.recv.recv_data(frame, stream);
 
@@ -308,10 +560,11 @@
         })
     }
 
-    pub fn recv_reset(&mut self, frame: frame::Reset) -> Result<(), RecvError> {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
+    fn recv_reset<B>(
+        &mut self,
+        send_buffer: &SendBuffer<B>,
+        frame: frame::Reset,
+    ) -> Result<(), RecvError> {
         let id = frame.stream_id();
 
         if id.is_zero() {
@@ -321,33 +574,33 @@
 
         // The GOAWAY process has begun. All streams with a greater ID than
         // specified as part of GOAWAY should be ignored.
-        if id > me.actions.recv.max_stream_id() {
+        if id > self.actions.recv.max_stream_id() {
             tracing::trace!(
                 "id ({:?}) > max_stream_id ({:?}), ignoring RST_STREAM",
                 id,
-                me.actions.recv.max_stream_id()
+                self.actions.recv.max_stream_id()
             );
             return Ok(());
         }
 
-        let stream = match me.store.find_mut(&id) {
+        let stream = match self.store.find_mut(&id) {
             Some(stream) => stream,
             None => {
                 // TODO: Are there other error cases?
-                me.actions
-                    .ensure_not_idle(me.counts.peer(), id)
+                self.actions
+                    .ensure_not_idle(self.counts.peer(), id)
                     .map_err(RecvError::Connection)?;
 
                 return Ok(());
             }
         };
 
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
         let send_buffer = &mut *send_buffer;
 
-        let actions = &mut me.actions;
+        let actions = &mut self.actions;
 
-        me.counts.transition(stream, |counts, stream| {
+        self.counts.transition(stream, |counts, stream| {
             actions.recv.recv_reset(frame, stream);
             actions.send.recv_err(send_buffer, stream, counts);
             assert!(stream.state.is_closed());
@@ -355,19 +608,54 @@
         })
     }
 
-    /// Handle a received error and return the ID of the last processed stream.
-    pub fn recv_err(&mut self, err: &proto::Error) -> StreamId {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
+    fn recv_window_update<B>(
+        &mut self,
+        send_buffer: &SendBuffer<B>,
+        frame: frame::WindowUpdate,
+    ) -> Result<(), RecvError> {
+        let id = frame.stream_id();
 
-        let actions = &mut me.actions;
-        let counts = &mut me.counts;
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
+        let send_buffer = &mut *send_buffer;
+
+        if id.is_zero() {
+            self.actions
+                .send
+                .recv_connection_window_update(frame, &mut self.store, &mut self.counts)
+                .map_err(RecvError::Connection)?;
+        } else {
+            // The remote may send window updates for streams that the local now
+            // considers closed. It's ok...
+            if let Some(mut stream) = self.store.find_mut(&id) {
+                // This result is ignored as there is nothing to do when there
+                // is an error. The stream is reset by the function on error and
+                // the error is informational.
+                let _ = self.actions.send.recv_stream_window_update(
+                    frame.size_increment(),
+                    send_buffer,
+                    &mut stream,
+                    &mut self.counts,
+                    &mut self.actions.task,
+                );
+            } else {
+                self.actions
+                    .ensure_not_idle(self.counts.peer(), id)
+                    .map_err(RecvError::Connection)?;
+            }
+        }
+
+        Ok(())
+    }
+
+    fn recv_err<B>(&mut self, send_buffer: &SendBuffer<B>, err: &proto::Error) -> StreamId {
+        let actions = &mut self.actions;
+        let counts = &mut self.counts;
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
         let send_buffer = &mut *send_buffer;
 
         let last_processed_id = actions.recv.last_processed_id();
 
-        me.store
+        self.store
             .for_each(|stream| {
                 counts.transition(stream, |counts, stream| {
                     actions.recv.recv_err(err, &mut *stream);
@@ -382,13 +670,14 @@
         last_processed_id
     }
 
-    pub fn recv_go_away(&mut self, frame: &frame::GoAway) -> Result<(), RecvError> {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
-        let actions = &mut me.actions;
-        let counts = &mut me.counts;
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+    fn recv_go_away<B>(
+        &mut self,
+        send_buffer: &SendBuffer<B>,
+        frame: &frame::GoAway,
+    ) -> Result<(), RecvError> {
+        let actions = &mut self.actions;
+        let counts = &mut self.counts;
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
         let send_buffer = &mut *send_buffer;
 
         let last_stream_id = frame.last_stream_id();
@@ -397,7 +686,7 @@
 
         let err = frame.reason().into();
 
-        me.store
+        self.store
             .for_each(|stream| {
                 if stream.id > last_stream_id {
                     counts.transition(stream, |counts, stream| {
@@ -406,74 +695,34 @@
                         Ok::<_, ()>(())
                     })
                 } else {
-                    Ok::<_, ()>(())
-                }
-            })
-            .unwrap();
-
-        actions.conn_error = Some(err);
-
-        Ok(())
-    }
-
-    pub fn last_processed_id(&self) -> StreamId {
-        self.inner.lock().unwrap().actions.recv.last_processed_id()
-    }
-
-    pub fn recv_window_update(&mut self, frame: frame::WindowUpdate) -> Result<(), RecvError> {
-        let id = frame.stream_id();
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
-        let send_buffer = &mut *send_buffer;
+                    Ok::<_, ()>(())
+                }
+            })
+            .unwrap();
 
-        if id.is_zero() {
-            me.actions
-                .send
-                .recv_connection_window_update(frame, &mut me.store, &mut me.counts)
-                .map_err(RecvError::Connection)?;
-        } else {
-            // The remote may send window updates for streams that the local now
-            // considers closed. It's ok...
-            if let Some(mut stream) = me.store.find_mut(&id) {
-                // This result is ignored as there is nothing to do when there
-                // is an error. The stream is reset by the function on error and
-                // the error is informational.
-                let _ = me.actions.send.recv_stream_window_update(
-                    frame.size_increment(),
-                    send_buffer,
-                    &mut stream,
-                    &mut me.counts,
-                    &mut me.actions.task,
-                );
-            } else {
-                me.actions
-                    .ensure_not_idle(me.counts.peer(), id)
-                    .map_err(RecvError::Connection)?;
-            }
-        }
+        actions.conn_error = Some(err);
 
         Ok(())
     }
 
-    pub fn recv_push_promise(&mut self, frame: frame::PushPromise) -> Result<(), RecvError> {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
+    fn recv_push_promise<B>(
+        &mut self,
+        send_buffer: &SendBuffer<B>,
+        frame: frame::PushPromise,
+    ) -> Result<(), RecvError> {
         let id = frame.stream_id();
         let promised_id = frame.promised_id();
 
         // First, ensure that the initiating stream is still in a valid state.
-        let parent_key = match me.store.find_mut(&id) {
+        let parent_key = match self.store.find_mut(&id) {
             Some(stream) => {
                 // The GOAWAY process has begun. All streams with a greater ID
                 // than specified as part of GOAWAY should be ignored.
-                if id > me.actions.recv.max_stream_id() {
+                if id > self.actions.recv.max_stream_id() {
                     tracing::trace!(
                         "id ({:?}) > max_stream_id ({:?}), ignoring PUSH_PROMISE",
                         id,
-                        me.actions.recv.max_stream_id()
+                        self.actions.recv.max_stream_id()
                     );
                     return Ok(());
                 }
@@ -493,16 +742,16 @@
         // could grow in memory indefinitely.
 
         // Ensure that we can reserve streams
-        me.actions.recv.ensure_can_reserve()?;
+        self.actions.recv.ensure_can_reserve()?;
 
         // Next, open the stream.
         //
         // If `None` is returned, then the stream is being refused. There is no
         // further work to be done.
-        if me
+        if self
             .actions
             .recv
-            .open(promised_id, Open::PushPromise, &mut me.counts)?
+            .open(promised_id, Open::PushPromise, &mut self.counts)?
             .is_none()
         {
             return Ok(());
@@ -512,23 +761,23 @@
         // this requires a bit of indirection to make the borrow checker happy.
         let child_key: Option<store::Key> = {
             // Create state for the stream
-            let stream = me.store.insert(promised_id, {
+            let stream = self.store.insert(promised_id, {
                 Stream::new(
                     promised_id,
-                    me.actions.send.init_window_sz(),
-                    me.actions.recv.init_window_sz(),
+                    self.actions.send.init_window_sz(),
+                    self.actions.recv.init_window_sz(),
                 )
             });
 
-            let actions = &mut me.actions;
+            let actions = &mut self.actions;
 
-            me.counts.transition(stream, |counts, stream| {
+            self.counts.transition(stream, |counts, stream| {
                 let stream_valid = actions.recv.recv_push_promise(frame, stream);
 
                 match stream_valid {
                     Ok(()) => Ok(Some(stream.key())),
                     _ => {
-                        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+                        let mut send_buffer = send_buffer.inner.lock().unwrap();
                         actions
                             .reset_on_recv_stream_err(
                                 &mut *send_buffer,
@@ -543,10 +792,10 @@
         };
         // If we're successful, push the headers and stream...
         if let Some(child) = child_key {
-            let mut ppp = me.store[parent_key].pending_push_promises.take();
-            ppp.push(&mut me.store.resolve(child));
+            let mut ppp = self.store[parent_key].pending_push_promises.take();
+            ppp.push(&mut self.store.resolve(child));
 
-            let parent = &mut me.store.resolve(parent_key);
+            let parent = &mut self.store.resolve(parent_key);
             parent.pending_push_promises = ppp;
             parent.notify_recv();
         };
@@ -554,199 +803,78 @@
         Ok(())
     }
 
-    pub fn next_incoming(&mut self) -> Option<StreamRef<B>> {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-        me.actions.recv.next_incoming(&mut me.store).map(|key| {
-            let stream = &mut me.store.resolve(key);
-            tracing::trace!(
-                "next_incoming; id={:?}, state={:?}",
-                stream.id,
-                stream.state
-            );
-            // TODO: ideally, OpaqueStreamRefs::new would do this, but we're holding
-            // the lock, so it can't.
-            me.refs += 1;
-            StreamRef {
-                opaque: OpaqueStreamRef::new(self.inner.clone(), stream),
-                send_buffer: self.send_buffer.clone(),
-            }
-        })
-    }
-
-    pub fn send_pending_refusal<T>(
+    fn recv_eof<B>(
         &mut self,
-        cx: &mut Context,
-        dst: &mut Codec<T, Prioritized<B>>,
-    ) -> Poll<io::Result<()>>
-    where
-        T: AsyncWrite + Unpin,
-    {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-        me.actions.recv.send_pending_refusal(cx, dst)
-    }
+        send_buffer: &SendBuffer<B>,
+        clear_pending_accept: bool,
+    ) -> Result<(), ()> {
+        let actions = &mut self.actions;
+        let counts = &mut self.counts;
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
+        let send_buffer = &mut *send_buffer;
 
-    pub fn clear_expired_reset_streams(&mut self) {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-        me.actions
-            .recv
-            .clear_expired_reset_streams(&mut me.store, &mut me.counts);
+        if actions.conn_error.is_none() {
+            actions.conn_error = Some(io::Error::from(io::ErrorKind::BrokenPipe).into());
+        }
+
+        tracing::trace!("Streams::recv_eof");
+
+        self.store
+            .for_each(|stream| {
+                counts.transition(stream, |counts, stream| {
+                    actions.recv.recv_eof(stream);
+
+                    // This handles resetting send state associated with the
+                    // stream
+                    actions.send.recv_err(send_buffer, stream, counts);
+                    Ok::<_, ()>(())
+                })
+            })
+            .expect("recv_eof");
+
+        actions.clear_queues(clear_pending_accept, &mut self.store, counts);
+        Ok(())
     }
 
-    pub fn poll_complete<T>(
+    fn poll_complete<T, B>(
         &mut self,
+        send_buffer: &SendBuffer<B>,
         cx: &mut Context,
         dst: &mut Codec<T, Prioritized<B>>,
     ) -> Poll<io::Result<()>>
     where
         T: AsyncWrite + Unpin,
+        B: Buf,
     {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
         let send_buffer = &mut *send_buffer;
 
         // Send WINDOW_UPDATE frames first
         //
         // TODO: It would probably be better to interleave updates w/ data
         // frames.
-        ready!(me
+        ready!(self
             .actions
             .recv
-            .poll_complete(cx, &mut me.store, &mut me.counts, dst))?;
+            .poll_complete(cx, &mut self.store, &mut self.counts, dst))?;
 
         // Send any other pending frames
-        ready!(me
-            .actions
-            .send
-            .poll_complete(cx, send_buffer, &mut me.store, &mut me.counts, dst))?;
+        ready!(self.actions.send.poll_complete(
+            cx,
+            send_buffer,
+            &mut self.store,
+            &mut self.counts,
+            dst
+        ))?;
 
         // Nothing else to do, track the task
-        me.actions.task = Some(cx.waker().clone());
+        self.actions.task = Some(cx.waker().clone());
 
         Poll::Ready(Ok(()))
     }
 
-    pub fn apply_remote_settings(&mut self, frame: &frame::Settings) -> Result<(), RecvError> {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
-        let send_buffer = &mut *send_buffer;
-
-        me.counts.apply_remote_settings(frame);
-
-        me.actions.send.apply_remote_settings(
-            frame,
-            send_buffer,
-            &mut me.store,
-            &mut me.counts,
-            &mut me.actions.task,
-        )
-    }
-
-    pub fn apply_local_settings(&mut self, frame: &frame::Settings) -> Result<(), RecvError> {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
-        me.actions.recv.apply_local_settings(frame, &mut me.store)
-    }
-
-    pub fn send_request(
-        &mut self,
-        request: Request<()>,
-        end_of_stream: bool,
-        pending: Option<&OpaqueStreamRef>,
-    ) -> Result<StreamRef<B>, SendError> {
-        use super::stream::ContentLength;
-        use http::Method;
-
-        // TODO: There is a hazard with assigning a stream ID before the
-        // prioritize layer. If prioritization reorders new streams, this
-        // implicitly closes the earlier stream IDs.
-        //
-        // See: hyperium/h2#11
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
-        let send_buffer = &mut *send_buffer;
-
-        me.actions.ensure_no_conn_error()?;
-        me.actions.send.ensure_next_stream_id()?;
-
-        // The `pending` argument is provided by the `Client`, and holds
-        // a store `Key` of a `Stream` that may have been not been opened
-        // yet.
-        //
-        // If that stream is still pending, the Client isn't allowed to
-        // queue up another pending stream. They should use `poll_ready`.
-        if let Some(stream) = pending {
-            if me.store.resolve(stream.key).is_pending_open {
-                return Err(UserError::Rejected.into());
-            }
-        }
-
-        if me.counts.peer().is_server() {
-            // Servers cannot open streams. PushPromise must first be reserved.
-            return Err(UserError::UnexpectedFrameType.into());
-        }
-
-        let stream_id = me.actions.send.open()?;
-
-        let mut stream = Stream::new(
-            stream_id,
-            me.actions.send.init_window_sz(),
-            me.actions.recv.init_window_sz(),
-        );
-
-        if *request.method() == Method::HEAD {
-            stream.content_length = ContentLength::Head;
-        }
-
-        // Convert the message
-        let headers = client::Peer::convert_send_message(stream_id, request, end_of_stream)?;
-
-        let mut stream = me.store.insert(stream.id, stream);
-
-        let sent = me.actions.send.send_headers(
-            headers,
-            send_buffer,
-            &mut stream,
-            &mut me.counts,
-            &mut me.actions.task,
-        );
-
-        // send_headers can return a UserError, if it does,
-        // we should forget about this stream.
-        if let Err(err) = sent {
-            stream.unlink();
-            stream.remove();
-            return Err(err.into());
-        }
-
-        // Given that the stream has been initialized, it should not be in the
-        // closed state.
-        debug_assert!(!stream.state.is_closed());
-
-        // TODO: ideally, OpaqueStreamRefs::new would do this, but we're holding
-        // the lock, so it can't.
-        me.refs += 1;
-
-        Ok(StreamRef {
-            opaque: OpaqueStreamRef::new(self.inner.clone(), &mut stream),
-            send_buffer: self.send_buffer.clone(),
-        })
-    }
-
-    pub fn send_reset(&mut self, id: StreamId, reason: Reason) {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-
-        let key = match me.store.find_entry(id) {
+    fn send_reset<B>(&mut self, send_buffer: &SendBuffer<B>, id: StreamId, reason: Reason) {
+        let key = match self.store.find_entry(id) {
             Entry::Occupied(e) => e.key(),
             Entry::Vacant(e) => {
                 let stream = Stream::new(id, 0, 0);
@@ -755,18 +883,11 @@
             }
         };
 
-        let stream = me.store.resolve(key);
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
+        let stream = self.store.resolve(key);
+        let mut send_buffer = send_buffer.inner.lock().unwrap();
         let send_buffer = &mut *send_buffer;
-        me.actions
-            .send_reset(stream, reason, &mut me.counts, send_buffer);
-    }
-
-    pub fn send_go_away(&mut self, last_processed_id: StreamId) {
-        let mut me = self.inner.lock().unwrap();
-        let me = &mut *me;
-        let actions = &mut me.actions;
-        actions.recv.go_away(last_processed_id);
+        self.actions
+            .send_reset(stream, reason, &mut self.counts, send_buffer);
     }
 }
 
@@ -801,39 +922,32 @@
 where
     P: Peer,
 {
+    pub fn as_dyn(&self) -> DynStreams<B> {
+        let Self {
+            inner,
+            send_buffer,
+            _p,
+        } = self;
+        DynStreams {
+            inner,
+            send_buffer,
+            peer: P::r#dyn(),
+        }
+    }
+
     /// This function is safe to call multiple times.
     ///
     /// A `Result` is returned to avoid panicking if the mutex is poisoned.
     pub fn recv_eof(&mut self, clear_pending_accept: bool) -> Result<(), ()> {
-        let mut me = self.inner.lock().map_err(|_| ())?;
-        let me = &mut *me;
-
-        let actions = &mut me.actions;
-        let counts = &mut me.counts;
-        let mut send_buffer = self.send_buffer.inner.lock().unwrap();
-        let send_buffer = &mut *send_buffer;
-
-        if actions.conn_error.is_none() {
-            actions.conn_error = Some(io::Error::from(io::ErrorKind::BrokenPipe).into());
-        }
-
-        tracing::trace!("Streams::recv_eof");
-
-        me.store
-            .for_each(|stream| {
-                counts.transition(stream, |counts, stream| {
-                    actions.recv.recv_eof(stream);
+        self.as_dyn().recv_eof(clear_pending_accept)
+    }
 
-                    // This handles resetting send state associated with the
-                    // stream
-                    actions.send.recv_err(send_buffer, stream, counts);
-                    Ok::<_, ()>(())
-                })
-            })
-            .expect("recv_eof");
+    pub(crate) fn max_send_streams(&self) -> usize {
+        self.inner.lock().unwrap().counts.max_send_streams()
+    }
 
-        actions.clear_queues(clear_pending_accept, &mut me.store, counts);
-        Ok(())
+    pub(crate) fn max_recv_streams(&self) -> usize {
+        self.inner.lock().unwrap().counts.max_recv_streams()
     }
 
     #[cfg(feature = "unstable")]
@@ -879,7 +993,14 @@
     P: Peer,
 {
     fn drop(&mut self) {
-        let _ = self.inner.lock().map(|mut inner| inner.refs -= 1);
+        if let Ok(mut inner) = self.inner.lock() {
+            inner.refs -= 1;
+            if inner.refs == 1 {
+                if let Some(task) = inner.actions.task.take() {
+                    task.wake();
+                }
+            }
+        }
     }
 }
 
@@ -944,9 +1065,11 @@
 
     pub fn send_response(
         &mut self,
-        response: Response<()>,
+        mut response: Response<()>,
         end_of_stream: bool,
     ) -> Result<(), UserError> {
+        // Clear before taking lock, incase extensions contain a StreamRef.
+        response.extensions_mut().clear();
         let mut me = self.opaque.inner.lock().unwrap();
         let me = &mut *me;
 
@@ -964,7 +1087,12 @@
         })
     }
 
-    pub fn send_push_promise(&mut self, request: Request<()>) -> Result<StreamRef<B>, UserError> {
+    pub fn send_push_promise(
+        &mut self,
+        mut request: Request<()>,
+    ) -> Result<StreamRef<B>, UserError> {
+        // Clear before taking lock, incase extensions contain a StreamRef.
+        request.extensions_mut().clear();
         let mut me = self.opaque.inner.lock().unwrap();
         let me = &mut *me;
 
@@ -1394,11 +1522,11 @@
     /// is more likely to be latency/memory constraints that caused this,
     /// and not a bad actor. So be less catastrophic, the spec allows
     /// us to send another RST_STREAM of STREAM_CLOSED.
-    fn may_have_forgotten_stream<P: Peer>(&self, id: StreamId) -> bool {
+    fn may_have_forgotten_stream(&self, peer: peer::Dyn, id: StreamId) -> bool {
         if id.is_zero() {
             return false;
         }
-        if P::is_local_init(id) {
+        if peer.is_local_init(id) {
             self.send.may_have_created_stream(id)
         } else {
             self.recv.may_have_created_stream(id)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/server.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -127,8 +127,8 @@
 use std::task::{Context, Poll};
 use std::time::Duration;
 use std::{convert, fmt, io, mem};
-use tokio::io::{AsyncRead, AsyncWrite};
-use tracing_futures::{Instrument, Instrumented};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+use tracing::instrument::{Instrument, Instrumented};
 
 /// In progress HTTP/2.0 connection handshake future.
 ///
@@ -182,9 +182,11 @@
 /// # async fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T) {
 /// let mut server = server::handshake(my_io).await.unwrap();
 /// while let Some(request) = server.accept().await {
-///     let (request, respond) = request.unwrap();
-///     // Process the request and send the response back to the client
-///     // using `respond`.
+///     tokio::spawn(async move {
+///         let (request, respond) = request.unwrap();
+///         // Process the request and send the response back to the client
+///         // using `respond`.
+///     });
 /// }
 /// # }
 /// #
@@ -529,6 +531,34 @@
     pub fn ping_pong(&mut self) -> Option<PingPong> {
         self.connection.take_user_pings().map(PingPong::new)
     }
+
+    /// Returns the maximum number of concurrent streams that may be initiated
+    /// by the server on this connection.
+    ///
+    /// This limit is configured by the client peer by sending the
+    /// [`SETTINGS_MAX_CONCURRENT_STREAMS` parameter][1] in a `SETTINGS` frame.
+    /// This method returns the currently acknowledged value recieved from the
+    /// remote.
+    ///
+    /// [1]: https://tools.ietf.org/html/rfc7540#section-5.1.2
+    pub fn max_concurrent_send_streams(&self) -> usize {
+        self.connection.max_send_streams()
+    }
+
+    /// Returns the maximum number of concurrent streams that may be initiated
+    /// by the client on this connection.
+    ///
+    /// This returns the value of the [`SETTINGS_MAX_CONCURRENT_STREAMS`
+    /// parameter][1] sent in a `SETTINGS` frame that has been
+    /// acknowledged by the remote peer. The value to be sent is configured by
+    /// the [`Builder::max_concurrent_streams`][2] method before handshaking
+    /// with the remote peer.
+    ///
+    /// [1]: https://tools.ietf.org/html/rfc7540#section-5.1.2
+    /// [2]: ../struct.Builder.html#method.max_concurrent_streams
+    pub fn max_concurrent_recv_streams(&self) -> usize {
+        self.connection.max_recv_streams()
+    }
 }
 
 #[cfg(feature = "stream")]
@@ -1031,7 +1061,7 @@
     ///
     /// # Panics
     ///
-    /// If the lock on the strean store has been poisoned.
+    /// If the lock on the stream store has been poisoned.
     pub fn stream_id(&self) -> crate::StreamId {
         crate::StreamId::from_internal(self.inner.stream_id())
     }
@@ -1103,7 +1133,7 @@
     ///
     /// # Panics
     ///
-    /// If the lock on the strean store has been poisoned.
+    /// If the lock on the stream store has been poisoned.
     pub fn stream_id(&self) -> crate::StreamId {
         self.inner.stream_id()
     }
@@ -1158,8 +1188,10 @@
         let mut rem = PREFACE.len() - self.pos;
 
         while rem > 0 {
-            let n = ready!(Pin::new(self.inner_mut()).poll_read(cx, &mut buf[..rem]))
+            let mut buf = ReadBuf::new(&mut buf[..rem]);
+            ready!(Pin::new(self.inner_mut()).poll_read(cx, &mut buf))
                 .map_err(crate::Error::from_io)?;
+            let n = buf.filled().len();
             if n == 0 {
                 return Poll::Ready(Err(crate::Error::from_io(io::Error::new(
                     io::ErrorKind::UnexpectedEof,
@@ -1167,7 +1199,7 @@
                 ))));
             }
 
-            if PREFACE[self.pos..self.pos + n] != buf[..n] {
+            if &PREFACE[self.pos..self.pos + n] != buf.filled() {
                 proto_err!(conn: "read_preface: invalid preface");
                 // TODO: Should this just write the GO_AWAY frame directly?
                 return Poll::Ready(Err(Reason::PROTOCOL_ERROR.into()));
@@ -1369,7 +1401,7 @@
                     reason: Reason::PROTOCOL_ERROR,
                 });
             }}
-        };
+        }
 
         b = b.version(Version::HTTP_2);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/share.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/share.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/h2/src/share.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/h2/src/share.rs	2021-12-09 12:01:26.000000000 +0000
@@ -125,11 +125,6 @@
 /// See method level documentation for more details on receiving data. See
 /// [`FlowControl`] for more details on inbound flow control.
 ///
-/// Note that this type implements [`Stream`], yielding the received data frames.
-/// When this implementation is used, the capacity is immediately released when
-/// the data is yielded. It is recommended to only use this API when the data
-/// will not be retained in memory for extended periods of time.
-///
 /// [`client::ResponseFuture`]: client/struct.ResponseFuture.html
 /// [`server::Connection`]: server/struct.Connection.html
 /// [`FlowControl`]: struct.FlowControl.html
@@ -178,7 +173,7 @@
 ///
 /// * A new stream is activated. The receive window is initialized to 1024 (the
 ///   value of the initial window size for this connection).
-/// * A `DATA` frame is received containing a payload of 400 bytes.
+/// * A `DATA` frame is received containing a payload of 600 bytes.
 /// * The receive window size is reduced to 424 bytes.
 /// * [`release_capacity`] is called with 200.
 /// * The receive window size is now 624 bytes. The peer may send no more than
@@ -406,7 +401,7 @@
         futures_util::future::poll_fn(move |cx| self.poll_trailers(cx)).await
     }
 
-    #[doc(hidden)]
+    /// Poll for the next data frame.
     pub fn poll_data(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, crate::Error>>> {
         self.inner.inner.poll_data(cx).map_err_(Into::into)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/benches/bench.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,8 +9,11 @@
 use test::{black_box, Bencher};
 
 use hashbrown::hash_map::DefaultHashBuilder;
-use hashbrown::HashMap;
-use std::collections::hash_map::RandomState;
+use hashbrown::{HashMap, HashSet};
+use std::{
+    collections::hash_map::RandomState,
+    sync::atomic::{self, AtomicUsize},
+};
 
 const SIZE: usize = 1000;
 
@@ -40,6 +43,20 @@
     }
 }
 
+// Just an arbitrary side effect to make the maps not shortcircuit to the non-dropping path
+// when dropping maps/entries (most real world usages likely have drop in the key or value)
+lazy_static::lazy_static! {
+    static ref SIDE_EFFECT: AtomicUsize = AtomicUsize::new(0);
+}
+
+#[derive(Clone)]
+struct DropType(usize);
+impl Drop for DropType {
+    fn drop(&mut self) {
+        SIDE_EFFECT.fetch_add(self.0, atomic::Ordering::SeqCst);
+    }
+}
+
 macro_rules! bench_suite {
     ($bench_macro:ident, $bench_ahash_serial:ident, $bench_std_serial:ident,
      $bench_ahash_highbits:ident, $bench_std_highbits:ident,
@@ -69,10 +86,11 @@
             b.iter(|| {
                 m.clear();
                 for i in ($keydist).take(SIZE) {
-                    m.insert(i, i);
+                    m.insert(i, (DropType(i), [i; 20]));
                 }
                 black_box(&mut m);
-            })
+            });
+            eprintln!("{}", SIDE_EFFECT.load(atomic::Ordering::SeqCst));
         }
     };
 }
@@ -87,13 +105,38 @@
     insert_std_random
 );
 
+macro_rules! bench_grow_insert {
+    ($name:ident, $maptype:ident, $keydist:expr) => {
+        #[bench]
+        fn $name(b: &mut Bencher) {
+            b.iter(|| {
+                let mut m = $maptype::default();
+                for i in ($keydist).take(SIZE) {
+                    m.insert(i, DropType(i));
+                }
+                black_box(&mut m);
+            })
+        }
+    };
+}
+
+bench_suite!(
+    bench_grow_insert,
+    grow_insert_ahash_serial,
+    grow_insert_std_serial,
+    grow_insert_ahash_highbits,
+    grow_insert_std_highbits,
+    grow_insert_ahash_random,
+    grow_insert_std_random
+);
+
 macro_rules! bench_insert_erase {
     ($name:ident, $maptype:ident, $keydist:expr) => {
         #[bench]
         fn $name(b: &mut Bencher) {
             let mut base = $maptype::default();
             for i in ($keydist).take(SIZE) {
-                base.insert(i, i);
+                base.insert(i, DropType(i));
             }
             let skip = $keydist.skip(SIZE);
             b.iter(|| {
@@ -103,11 +146,12 @@
                 // While keeping the size constant,
                 // replace the first keydist with the second.
                 for (add, remove) in (&mut add_iter).zip(&mut remove_iter).take(SIZE) {
-                    m.insert(add, add);
+                    m.insert(add, DropType(add));
                     black_box(m.remove(&remove));
                 }
                 black_box(m);
-            })
+            });
+            eprintln!("{}", SIDE_EFFECT.load(atomic::Ordering::SeqCst));
         }
     };
 }
@@ -128,14 +172,15 @@
         fn $name(b: &mut Bencher) {
             let mut m = $maptype::default();
             for i in $keydist.take(SIZE) {
-                m.insert(i, i);
+                m.insert(i, DropType(i));
             }
 
             b.iter(|| {
                 for i in $keydist.take(SIZE) {
                     black_box(m.get(&i));
                 }
-            })
+            });
+            eprintln!("{}", SIDE_EFFECT.load(atomic::Ordering::SeqCst));
         }
     };
 }
@@ -157,7 +202,7 @@
             let mut m = $maptype::default();
             let mut iter = $keydist;
             for i in (&mut iter).take(SIZE) {
-                m.insert(i, i);
+                m.insert(i, DropType(i));
             }
 
             b.iter(|| {
@@ -185,7 +230,7 @@
         fn $name(b: &mut Bencher) {
             let mut m = $maptype::default();
             for i in ($keydist).take(SIZE) {
-                m.insert(i, i);
+                m.insert(i, DropType(i));
             }
 
             b.iter(|| {
@@ -211,7 +256,7 @@
 fn clone_small(b: &mut Bencher) {
     let mut m = HashMap::new();
     for i in 0..10 {
-        m.insert(i, i);
+        m.insert(i, DropType(i));
     }
 
     b.iter(|| {
@@ -224,7 +269,7 @@
     let mut m = HashMap::new();
     let mut m2 = HashMap::new();
     for i in 0..10 {
-        m.insert(i, i);
+        m.insert(i, DropType(i));
     }
 
     b.iter(|| {
@@ -237,7 +282,7 @@
 fn clone_large(b: &mut Bencher) {
     let mut m = HashMap::new();
     for i in 0..1000 {
-        m.insert(i, i);
+        m.insert(i, DropType(i));
     }
 
     b.iter(|| {
@@ -250,7 +295,7 @@
     let mut m = HashMap::new();
     let mut m2 = HashMap::new();
     for i in 0..1000 {
-        m.insert(i, i);
+        m.insert(i, DropType(i));
     }
 
     b.iter(|| {
@@ -258,3 +303,29 @@
         black_box(&mut m2);
     })
 }
+
+#[bench]
+fn rehash_in_place(b: &mut Bencher) {
+    b.iter(|| {
+        let mut set = HashSet::new();
+
+        // Each loop triggers one rehash
+        for _ in 0..10 {
+            for i in 0..224 {
+                set.insert(i);
+            }
+
+            assert_eq!(
+                set.capacity(),
+                224,
+                "The set must be at or close to capacity to trigger a re hashing"
+            );
+
+            for i in 100..1400 {
+                set.remove(&(i - 100));
+                set.insert(i);
+            }
+            set.clear();
+        }
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"5a7c89b011b8a47ae3c3097d0badc86dadeac1084ce459cc9888f3f6519d7e47","Cargo.toml":"ba475021bd4563dde7d812713dbb79fc9fc7f522ad58bd0deaeed9ebadff69ef","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ff8f68cb076caf8cefe7a6430d4ac086ce6af2ca8ce2c4e5a2004d4552ef52a2","README.md":"29d265575e99c6e4b8960fa0a17571580c8973b91b1b2ce63b9b83f8e1bdc58a","benches/bench.rs":"a3f8426559ebf68d93e37edee0bf83c28f18572b394b22e47dbff33e25cac403","clippy.toml":"7535949f908c6d9aea4f9a9f3a7625552c93fc29e963d059d40f4def9d77ea7b","src/external_trait_impls/mod.rs":"d69528827794524cfd9acbeacc1ac4f6131e3c7574311e6d919f818f65fbff07","src/external_trait_impls/rayon/helpers.rs":"d4fbca4db924925548f8dab8eb94cf4a3955a53c5e1ff15f59c460546c394034","src/external_trait_impls/rayon/map.rs":"eee0d42bd8cd347d49cfb1332f15297ca63b864c3690299a3ccd6d52c22c67de","src/external_trait_impls/rayon/mod.rs":"156de9c1ad0123334ea3b7e5a17444faf1b8bf971aa88a1f23e2f2d1c3021141","src/external_trait_impls/rayon/raw.rs":"d1b2415a4c3c42279f99a23bcf45c80ddb9a641c7f7974d42ed4d55f57bf6854","src/external_trait_impls/rayon/set.rs":"59afc7b1cdc985a85952d456e34eada4ca2fedf90d2a14dccf98a69f8f496137","src/external_trait_impls/serde.rs":"9306fb6e0e339398dc23ba9e7400a9a28d713df248e8b260e3d4dc44f799e101","src/lib.rs":"a455a0387b0133114247380659c2825713a4b91ef38a45f737007b47a2c30ee4","src/macros.rs":"0b1e9a55e8f5232b82f7e56f352a98904b35ddfca015377cf71daa31939baabf","src/map.rs":"56dc55edfd3c818d8c69464ec9edce9e3fe40e5975c02a2965e0a15878a08295","src/raw/bitmask.rs":"05e72c64957af7383001ca43a827cc5b3a8a39d00fac332ecea2fd7d2704099c","src/raw/generic.rs":"28da6bb3a722dcaa26cb5aba9e028111f32212dc9ce0c323e8f39ff5f367385e","src/raw/mod.rs":"ad887f865799502e852a3c100a49cc785ee97cb755b8394b31f87ed24fffa836","src/raw/sse2.rs":"ff332a9104558fe6a86b85ab975b6f43d4a042c634d5dc6cf70cf1d71d97ad7d","src/rustc_entry.rs":"64e47870015a9f152340017b79e2262e5c70d0f42b4fc2dfa48dd25ca70465f7","src/scopeguard.rs":"337cde60c9e1109cd19d4fa53529014cef1e3d5900dffde82f647881df1505f7","src/set.rs":"4ec68cf40a41bbc50da754047893640c62c55f612e03c43e3e3e837a23defc6d","tests/hasher.rs":"9a8fdf67e4415618e16729969c386eefe71408cded5d46cf7b67d969276a3452","tests/rayon.rs":"2286707a87b139f41902c82488c355b9fb402a3e734f392f3a73e87b9b932795","tests/serde.rs":"eed27382c0e43f67e402cd9eed20dea23ef5582e1a26a183e708ca9217a559e0","tests/set.rs":"374bd312c01a01cf8953bbbc9494f431b260c2657d7c79cc250e977b869a76ad"},"package":"d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"24ff18c978b40b166f5b3fd1090c3526d1958e79137dd9d765b571fed1c59fc2","Cargo.toml":"98ca6560469b01c01771f3c22c6182497d2239463cb4f63395d8207002d9a9ad","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ff8f68cb076caf8cefe7a6430d4ac086ce6af2ca8ce2c4e5a2004d4552ef52a2","README.md":"742ce1a4c92dada5f73ce594b224b646ff4aefe702768ec2eb39bd937a5a8fd3","benches/bench.rs":"43546a3d5aed2dd8f71f5d236f4df63d82a3767aec90d86f4ab1d1496619b45d","clippy.toml":"7535949f908c6d9aea4f9a9f3a7625552c93fc29e963d059d40f4def9d77ea7b","src/external_trait_impls/mod.rs":"d69528827794524cfd9acbeacc1ac4f6131e3c7574311e6d919f818f65fbff07","src/external_trait_impls/rayon/helpers.rs":"d4fbca4db924925548f8dab8eb94cf4a3955a53c5e1ff15f59c460546c394034","src/external_trait_impls/rayon/map.rs":"eee6371f2875085b286e950a32d13c3eff3c7280e7ea6ad346d322e7a00e7b7b","src/external_trait_impls/rayon/mod.rs":"156de9c1ad0123334ea3b7e5a17444faf1b8bf971aa88a1f23e2f2d1c3021141","src/external_trait_impls/rayon/raw.rs":"ddf349051bada9a9ebd027686e03ac2f12d74dd1b3f98a36aac257e13bac57fa","src/external_trait_impls/rayon/set.rs":"c4c44d44e56c2f59e9e1355662e29d8744ac96645ca4414127a359fb46cb0fbf","src/external_trait_impls/serde.rs":"9306fb6e0e339398dc23ba9e7400a9a28d713df248e8b260e3d4dc44f799e101","src/lib.rs":"45cd368e35bdb00232bcf2f5430ee516bb448a88724ab738424ae2e1d3c1f22e","src/macros.rs":"0b1e9a55e8f5232b82f7e56f352a98904b35ddfca015377cf71daa31939baabf","src/map.rs":"f3d43769100c59b04a978c9756e1b32f88cf7a84b9bda0e050a4adf5afb95572","src/raw/alloc.rs":"893da7047ff4eb3291a3dee62c954f489c8b7666aa01ef6aeda8adf2549869c0","src/raw/bitmask.rs":"05e72c64957af7383001ca43a827cc5b3a8a39d00fac332ecea2fd7d2704099c","src/raw/generic.rs":"b31590616e76dfcca635e3aa9a8a0059b3af9a5afe6b0c5ebc98a7d96d63e8ed","src/raw/mod.rs":"a0d0b0508d41e08bfc16e5db1dd4f80cd29ca26e656a803821d1eb56a1f249b3","src/raw/sse2.rs":"a775ddd8830593bb10e2a4a11b2ce16d900a68e0b3763f24715f8f7fa9c2f69d","src/rustc_entry.rs":"148fae9e8bf4893820648c3c80b24c7161c828d103f3b2a2d7bbc32fe6605eb1","src/scopeguard.rs":"808655b3e98512fdcee5a4597e7763a6be99582ba8d77e5ba5ca130d85a97211","src/set.rs":"d64fbadd0e6a5749cb5838f869004ea8cd46cec4b948615f810abb9e0a892d72","tests/hasher.rs":"9a8fdf67e4415618e16729969c386eefe71408cded5d46cf7b67d969276a3452","tests/rayon.rs":"2286707a87b139f41902c82488c355b9fb402a3e734f392f3a73e87b9b932795","tests/serde.rs":"6bac8054db722dd049901b37a6e006535bac30f425eb5cd91af19b5bc1dfe78e","tests/set.rs":"374bd312c01a01cf8953bbbc9494f431b260c2657d7c79cc250e977b869a76ad"},"package":"ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "hashbrown"
-version = "0.9.1"
+version = "0.11.2"
 authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
 exclude = [".travis.yml", "bors.toml", "/ci/*"]
 description = "A Rust port of Google's SwissTable hash map"
@@ -25,7 +25,7 @@
 [package.metadata.docs.rs]
 features = ["nightly", "rayon", "serde", "raw"]
 [dependencies.ahash]
-version = "0.4.4"
+version = "0.7.0"
 optional = true
 default-features = false
 
@@ -34,6 +34,10 @@
 optional = true
 package = "rustc-std-workspace-alloc"
 
+[dependencies.bumpalo]
+version = "3.5.0"
+optional = true
+
 [dependencies.compiler_builtins]
 version = "0.1.2"
 optional = true
@@ -54,8 +58,11 @@
 [dev-dependencies.doc-comment]
 version = "0.3.1"
 
+[dev-dependencies.fnv]
+version = "1.0.7"
+
 [dev-dependencies.lazy_static]
-version = "1.2"
+version = "1.4"
 
 [dev-dependencies.rand]
 version = "0.7.3"
@@ -64,9 +71,6 @@
 [dev-dependencies.rayon]
 version = "1.0"
 
-[dev-dependencies.rustc-hash]
-version = "=1.0"
-
 [dev-dependencies.serde_test]
 version = "1.0"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -7,6 +7,50 @@
 
 ## [Unreleased]
 
+## [v0.11.2] - 2021-03-25
+
+## Fixed
+
+- Added missing allocator type parameter to `HashMap`'s and `HashSet`'s `Clone` impls. (#252)
+
+## [v0.11.1] - 2021-03-20
+
+## Fixed
+
+- Added missing `pub` modifier to `BumpWrapper`. (#251)
+
+## [v0.11.0] - 2021-03-14
+
+## Added
+- Added safe `try_insert_no_grow` method to `RawTable`. (#229)
+- Added support for `bumpalo` as an allocator without the `nightly` feature. (#231)
+- Implemented `Default` for `RawTable`. (#237)
+- Added new safe methods `RawTable::get_each_mut`, `HashMap::get_each_mut`, and
+  `HashMap::get_each_key_value_mut`. (#239)
+- Added `From<HashMap<T, ()>>` for `HashSet<T>`. (#235)
+- Added `try_insert` method to `HashMap`. (#247)
+
+## Changed
+- The minimum Rust version has been bumped to 1.49.0. (#230)
+- Significantly improved compilation times by reducing the amount of generated IR. (#205)
+
+## Removed
+- We no longer re-export the unstable allocator items from the standard library, nor the stable shims approximating the same. (#227)
+- Removed hasher specialization support from `aHash`, which was resulting in inconsistent hashes being generated for a key. (#248)
+
+## Fixed
+- Fixed union length comparison. (#228)
+
+## ~~[v0.10.0] - 2021-01-16~~
+
+This release was _yanked_ due to inconsistent hashes being generated with the `nightly` feature. (#248)
+
+## Changed
+- Parametrized `RawTable`, `HashSet` and `HashMap` over an allocator. (#133)
+- Improved branch prediction hints on stable. (#209)
+- Optimized hashing of primitive types with AHash using specialization. (#207)
+- Only instantiate `RawTable`'s reserve functions once per key-value. (#204)
+
 ## [v0.9.1] - 2020-09-28
 
 ## Added
@@ -263,7 +307,11 @@
 
 - Initial release
 
-[Unreleased]: https://github.com/rust-lang/hashbrown/compare/v0.9.1...HEAD
+[Unreleased]: https://github.com/rust-lang/hashbrown/compare/v0.11.2...HEAD
+[v0.11.2]: https://github.com/rust-lang/hashbrown/compare/v0.11.1...v0.11.2
+[v0.11.1]: https://github.com/rust-lang/hashbrown/compare/v0.11.0...v0.11.1
+[v0.11.0]: https://github.com/rust-lang/hashbrown/compare/v0.10.0...v0.11.0
+[v0.10.0]: https://github.com/rust-lang/hashbrown/compare/v0.9.1...v0.10.0
 [v0.9.1]: https://github.com/rust-lang/hashbrown/compare/v0.9.0...v0.9.1
 [v0.9.0]: https://github.com/rust-lang/hashbrown/compare/v0.8.2...v0.9.0
 [v0.8.2]: https://github.com/rust-lang/hashbrown/compare/v0.8.1...v0.8.2
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.com/rust-lang/hashbrown.svg?branch=master)](https://travis-ci.com/rust-lang/hashbrown)
 [![Crates.io](https://img.shields.io/crates/v/hashbrown.svg)](https://crates.io/crates/hashbrown)
 [![Documentation](https://docs.rs/hashbrown/badge.svg)](https://docs.rs/hashbrown)
-[![Rust](https://img.shields.io/badge/rust-1.36.0%2B-blue.svg?maxAge=3600)](https://github.com/rust-lang/hashbrown)
+[![Rust](https://img.shields.io/badge/rust-1.49.0%2B-blue.svg?maxAge=3600)](https://github.com/rust-lang/hashbrown)
 
 This crate is a Rust port of Google's high-performance [SwissTable] hash
 map, adapted to make it a drop-in replacement for Rust's standard `HashMap`
@@ -26,7 +26,8 @@
 ## Features
 
 - Drop-in replacement for the standard library `HashMap` and `HashSet` types.
-- Uses `AHash` as the default hasher, which is much faster than SipHash.
+- Uses [AHash](https://github.com/tkaitchuck/aHash) as the default hasher, which is much faster than SipHash.
+  However, AHash does *not provide the same level of HashDoS resistance* as SipHash, so if that is important to you, you might want to consider using a different hasher.
 - Around 2x faster than the previous standard library `HashMap`.
 - Lower memory usage: only 1 byte of overhead per entry instead of 8.
 - Compatible with `#[no_std]` (but requires a global allocator with the `alloc` crate).
@@ -37,47 +38,46 @@
 
 Compared to the previous implementation of `std::collections::HashMap` (Rust 1.35).
 
-With the hashbrown default AHash hasher (not HashDoS-resistant):
+With the hashbrown default AHash hasher:
 
-```text
- name                       oldstdhash ns/iter  hashbrown ns/iter  diff ns/iter   diff %  speedup 
- insert_ahash_highbits        20,846              7,397                   -13,449  -64.52%   x 2.82 
- insert_ahash_random          20,515              7,796                   -12,719  -62.00%   x 2.63 
- insert_ahash_serial          21,668              7,264                   -14,404  -66.48%   x 2.98 
- insert_erase_ahash_highbits  29,570              17,498                  -12,072  -40.83%   x 1.69 
- insert_erase_ahash_random    39,569              17,474                  -22,095  -55.84%   x 2.26 
- insert_erase_ahash_serial    32,073              17,332                  -14,741  -45.96%   x 1.85 
- iter_ahash_highbits          1,572               2,087                       515   32.76%   x 0.75 
- iter_ahash_random            1,609               2,074                       465   28.90%   x 0.78 
- iter_ahash_serial            2,293               2,120                      -173   -7.54%   x 1.08 
- lookup_ahash_highbits        3,460               4,403                       943   27.25%   x 0.79 
- lookup_ahash_random          6,377               3,911                    -2,466  -38.67%   x 1.63 
- lookup_ahash_serial          3,629               3,586                       -43   -1.18%   x 1.01 
- lookup_fail_ahash_highbits   5,286               3,411                    -1,875  -35.47%   x 1.55 
- lookup_fail_ahash_random     12,365              4,171                    -8,194  -66.27%   x 2.96 
- lookup_fail_ahash_serial     4,902               3,240                    -1,662  -33.90%   x 1.51 
-```
-
-With the libstd default SipHash hasher (HashDoS-resistant):
-
-```text
- name                       oldstdhash ns/iter  hashbrown ns/iter  diff ns/iter   diff %  speedup 
- insert_std_highbits        32,598              20,199                  -12,399  -38.04%   x 1.61 
- insert_std_random          29,824              20,760                   -9,064  -30.39%   x 1.44 
- insert_std_serial          33,151              17,256                  -15,895  -47.95%   x 1.92 
- insert_erase_std_highbits  74,731              48,735                  -25,996  -34.79%   x 1.53 
- insert_erase_std_random    73,828              47,649                  -26,179  -35.46%   x 1.55 
- insert_erase_std_serial    73,864              40,147                  -33,717  -45.65%   x 1.84 
- iter_std_highbits          1,518               2,264                       746   49.14%   x 0.67 
- iter_std_random            1,502               2,414                       912   60.72%   x 0.62 
- iter_std_serial            6,361               2,118                    -4,243  -66.70%   x 3.00 
- lookup_std_highbits        21,705              16,962                   -4,743  -21.85%   x 1.28 
- lookup_std_random          21,654              17,158                   -4,496  -20.76%   x 1.26 
- lookup_std_serial          18,726              14,509                   -4,217  -22.52%   x 1.29 
- lookup_fail_std_highbits   25,852              17,323                   -8,529  -32.99%   x 1.49 
- lookup_fail_std_random     25,913              17,760                   -8,153  -31.46%   x 1.46 
- lookup_fail_std_serial     22,648              14,839                   -7,809  -34.48%   x 1.53 
-```
+| name                    |  oldstdhash ns/iter | hashbrown ns/iter | diff ns/iter |  diff %  | speedup |
+|:------------------------|:-------------------:|------------------:|:------------:|---------:|---------|
+| insert_ahash_highbits       | 18,865      | 8,020         |               -10,845 | -57.49%  | x 2.35 |
+| insert_ahash_random         | 19,711      | 8,019         |               -11,692 | -59.32%  | x 2.46 |
+| insert_ahash_serial         | 19,365      | 6,463         |               -12,902 | -66.63%  | x 3.00 |
+| insert_erase_ahash_highbits | 51,136      | 17,916        |               -33,220 | -64.96%  | x 2.85 |
+| insert_erase_ahash_random   | 51,157      | 17,688        |               -33,469 | -65.42%  | x 2.89 |
+| insert_erase_ahash_serial   | 45,479      | 14,895        |               -30,584 | -67.25%  | x 3.05 |
+| iter_ahash_highbits         | 1,399       | 1,092         |                  -307 | -21.94%  | x 1.28 |
+| iter_ahash_random           | 1,586       | 1,059         |                  -527 | -33.23%  | x 1.50 |
+| iter_ahash_serial           | 3,168       | 1,079         |                -2,089 | -65.94%  | x 2.94 |
+| lookup_ahash_highbits       | 32,351      | 4,792         |               -27,559 | -85.19%  | x 6.75 |
+| lookup_ahash_random         | 17,419      | 4,817         |               -12,602 | -72.35%  | x 3.62 |
+| lookup_ahash_serial         | 15,254      | 3,606         |               -11,648 | -76.36%  | x 4.23 |
+| lookup_fail_ahash_highbits  | 21,187      | 4,369         |               -16,818 | -79.38%  | x 4.85 |
+| lookup_fail_ahash_random    | 21,550      | 4,395         |               -17,155 | -79.61%  | x 4.90 |
+| lookup_fail_ahash_serial    | 19,450      | 3,176         |               -16,274 | -83.67%  | x 6.12 |
+
+
+With the libstd default SipHash hasher:
+
+|name                     |  oldstdhash ns/iter | hashbrown ns/iter | diff ns/iter |  diff %  | speedup |
+|:------------------------|:-------------------:|------------------:|:------------:|---------:|---------|
+|insert_std_highbits       |19,216      |16,885           |            -2,331    |   -12.13%  | x 1.14 |
+|insert_std_random         |19,179      |17,034           |            -2,145    |   -11.18%  | x 1.13 |
+|insert_std_serial         |19,462      |17,493           |            -1,969    |   -10.12%  | x 1.11 |
+|insert_erase_std_highbits |50,825      |35,847           |            -14,978   |   -29.47%  | x 1.42 |
+|insert_erase_std_random   |51,448      |35,392           |            -16,056   |   -31.21%  | x 1.45 |
+|insert_erase_std_serial   |87,711      |38,091           |            -49,620   |   -56.57%  | x 2.30 |
+|iter_std_highbits         |1,378       |1,159            |            -219      |   -15.89%  | x 1.19 |
+|iter_std_random           |1,395       |1,132            |            -263      |   -18.85%  | x 1.23 |
+|iter_std_serial           |1,704       |1,105            |            -599      |   -35.15%  | x 1.54 |
+|lookup_std_highbits       |17,195      |13,642           |            -3,553    |   -20.66%  | x 1.26 |
+|lookup_std_random         |17,181      |13,773           |            -3,408    |   -19.84%  | x 1.25 |
+|lookup_std_serial         |15,483      |13,651           |            -1,832    |   -11.83%  | x 1.13 |
+|lookup_fail_std_highbits  |20,926      |13,474           |            -7,452    |   -35.61%  | x 1.55 |
+|lookup_fail_std_random    |21,766      |13,505           |            -8,261    |   -37.95%  | x 1.61 |
+|lookup_fail_std_serial    |19,336      |13,519           |            -5,817    |   -30.08%  | x 1.43 |
 
 ## Usage
 
@@ -85,7 +85,7 @@
 
 ```toml
 [dependencies]
-hashbrown = "0.9"
+hashbrown = "0.11"
 ```
 
 Then:
@@ -96,19 +96,19 @@
 let mut map = HashMap::new();
 map.insert(1, "one");
 ```
-
+## Flags
 This crate has the following Cargo features:
 
-- `nightly`: Enables nightly-only features: `#[may_dangle]`.
+- `nightly`: Enables nightly-only features including: `#[may_dangle]`.
 - `serde`: Enables serde serialization support.
 - `rayon`: Enables rayon parallel iterator support.
 - `raw`: Enables access to the experimental and unsafe `RawTable` API.
 - `inline-more`: Adds inline hints to most functions, improving run-time performance at the cost
   of compilation time. (enabled by default)
+- `bumpalo`: Provides a `BumpWrapper` type which allows `bumpalo` to be used for memory allocation.
 - `ahash`: Compiles with ahash as default hasher. (enabled by default)
-- `ahash-compile-time-rng`: Activates the `compile-time-rng` feature of ahash, to increase the
-   DOS-resistance, but can result in issues for `no_std` builds. More details in
-   [issue#124](https://github.com/rust-lang/hashbrown/issues/124). (enabled by default)
+- `ahash-compile-time-rng`: Activates the `compile-time-rng` feature of ahash. For targets with no random number generator
+this pre-generates seeds at compile time and embeds them as constants. See [aHash's documentation](https://github.com/tkaitchuck/aHash#flags) (disabled by default)
 
 ## License
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,11 @@
 //! Rayon extensions for `HashMap`.
 
+use super::raw::{RawIntoParIter, RawParDrain, RawParIter};
 use crate::hash_map::HashMap;
+use crate::raw::{Allocator, Global};
 use core::fmt;
 use core::hash::{BuildHasher, Hash};
+use core::marker::PhantomData;
 use rayon::iter::plumbing::UnindexedConsumer;
 use rayon::iter::{FromParallelIterator, IntoParallelIterator, ParallelExtend, ParallelIterator};
 
@@ -15,11 +18,12 @@
 /// [`par_iter`]: /hashbrown/struct.HashMap.html#method.par_iter
 /// [`HashMap`]: /hashbrown/struct.HashMap.html
 /// [`IntoParallelRefIterator`]: https://docs.rs/rayon/1.0/rayon/iter/trait.IntoParallelRefIterator.html
-pub struct ParIter<'a, K, V, S> {
-    map: &'a HashMap<K, V, S>,
+pub struct ParIter<'a, K, V> {
+    inner: RawParIter<(K, V)>,
+    marker: PhantomData<(&'a K, &'a V)>,
 }
 
-impl<'a, K: Sync, V: Sync, S: Sync> ParallelIterator for ParIter<'a, K, V, S> {
+impl<'a, K: Sync, V: Sync> ParallelIterator for ParIter<'a, K, V> {
     type Item = (&'a K, &'a V);
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -27,7 +31,7 @@
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        unsafe { self.map.table.par_iter() }
+        self.inner
             .map(|x| unsafe {
                 let r = x.as_ref();
                 (&r.0, &r.1)
@@ -36,16 +40,23 @@
     }
 }
 
-impl<K, V, S> Clone for ParIter<'_, K, V, S> {
+impl<K, V> Clone for ParIter<'_, K, V> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn clone(&self) -> Self {
-        ParIter { map: self.map }
+        Self {
+            inner: self.inner.clone(),
+            marker: PhantomData,
+        }
     }
 }
 
-impl<K: fmt::Debug + Eq + Hash, V: fmt::Debug, S: BuildHasher> fmt::Debug for ParIter<'_, K, V, S> {
+impl<K: fmt::Debug + Eq + Hash, V: fmt::Debug> fmt::Debug for ParIter<'_, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.map.iter().fmt(f)
+        let iter = unsafe { self.inner.iter() }.map(|x| unsafe {
+            let r = x.as_ref();
+            (&r.0, &r.1)
+        });
+        f.debug_list().entries(iter).finish()
     }
 }
 
@@ -56,11 +67,12 @@
 ///
 /// [`par_keys`]: /hashbrown/struct.HashMap.html#method.par_keys
 /// [`HashMap`]: /hashbrown/struct.HashMap.html
-pub struct ParKeys<'a, K, V, S> {
-    map: &'a HashMap<K, V, S>,
+pub struct ParKeys<'a, K, V> {
+    inner: RawParIter<(K, V)>,
+    marker: PhantomData<(&'a K, &'a V)>,
 }
 
-impl<'a, K: Sync, V: Sync, S: Sync> ParallelIterator for ParKeys<'a, K, V, S> {
+impl<'a, K: Sync, V: Sync> ParallelIterator for ParKeys<'a, K, V> {
     type Item = &'a K;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -68,22 +80,26 @@
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        unsafe { self.map.table.par_iter() }
+        self.inner
             .map(|x| unsafe { &x.as_ref().0 })
             .drive_unindexed(consumer)
     }
 }
 
-impl<K, V, S> Clone for ParKeys<'_, K, V, S> {
+impl<K, V> Clone for ParKeys<'_, K, V> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn clone(&self) -> Self {
-        ParKeys { map: self.map }
+        Self {
+            inner: self.inner.clone(),
+            marker: PhantomData,
+        }
     }
 }
 
-impl<K: fmt::Debug + Eq + Hash, V, S: BuildHasher> fmt::Debug for ParKeys<'_, K, V, S> {
+impl<K: fmt::Debug + Eq + Hash, V> fmt::Debug for ParKeys<'_, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.map.keys().fmt(f)
+        let iter = unsafe { self.inner.iter() }.map(|x| unsafe { &x.as_ref().0 });
+        f.debug_list().entries(iter).finish()
     }
 }
 
@@ -94,11 +110,12 @@
 ///
 /// [`par_values`]: /hashbrown/struct.HashMap.html#method.par_values
 /// [`HashMap`]: /hashbrown/struct.HashMap.html
-pub struct ParValues<'a, K, V, S> {
-    map: &'a HashMap<K, V, S>,
+pub struct ParValues<'a, K, V> {
+    inner: RawParIter<(K, V)>,
+    marker: PhantomData<(&'a K, &'a V)>,
 }
 
-impl<'a, K: Sync, V: Sync, S: Sync> ParallelIterator for ParValues<'a, K, V, S> {
+impl<'a, K: Sync, V: Sync> ParallelIterator for ParValues<'a, K, V> {
     type Item = &'a V;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -106,22 +123,26 @@
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        unsafe { self.map.table.par_iter() }
+        self.inner
             .map(|x| unsafe { &x.as_ref().1 })
             .drive_unindexed(consumer)
     }
 }
 
-impl<K, V, S> Clone for ParValues<'_, K, V, S> {
+impl<K, V> Clone for ParValues<'_, K, V> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn clone(&self) -> Self {
-        ParValues { map: self.map }
+        Self {
+            inner: self.inner.clone(),
+            marker: PhantomData,
+        }
     }
 }
 
-impl<K: Eq + Hash, V: fmt::Debug, S: BuildHasher> fmt::Debug for ParValues<'_, K, V, S> {
+impl<K: Eq + Hash, V: fmt::Debug> fmt::Debug for ParValues<'_, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.map.values().fmt(f)
+        let iter = unsafe { self.inner.iter() }.map(|x| unsafe { &x.as_ref().1 });
+        f.debug_list().entries(iter).finish()
     }
 }
 
@@ -134,11 +155,12 @@
 /// [`par_iter_mut`]: /hashbrown/struct.HashMap.html#method.par_iter_mut
 /// [`HashMap`]: /hashbrown/struct.HashMap.html
 /// [`IntoParallelRefMutIterator`]: https://docs.rs/rayon/1.0/rayon/iter/trait.IntoParallelRefMutIterator.html
-pub struct ParIterMut<'a, K, V, S> {
-    map: &'a mut HashMap<K, V, S>,
+pub struct ParIterMut<'a, K, V> {
+    inner: RawParIter<(K, V)>,
+    marker: PhantomData<(&'a K, &'a mut V)>,
 }
 
-impl<'a, K: Send + Sync, V: Send, S: Send> ParallelIterator for ParIterMut<'a, K, V, S> {
+impl<'a, K: Sync, V: Send> ParallelIterator for ParIterMut<'a, K, V> {
     type Item = (&'a K, &'a mut V);
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -146,7 +168,7 @@
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        unsafe { self.map.table.par_iter() }
+        self.inner
             .map(|x| unsafe {
                 let r = x.as_mut();
                 (&r.0, &mut r.1)
@@ -155,11 +177,13 @@
     }
 }
 
-impl<K: fmt::Debug + Eq + Hash, V: fmt::Debug, S: BuildHasher> fmt::Debug
-    for ParIterMut<'_, K, V, S>
-{
+impl<K: fmt::Debug + Eq + Hash, V: fmt::Debug> fmt::Debug for ParIterMut<'_, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.map.iter().fmt(f)
+        ParIter {
+            inner: self.inner.clone(),
+            marker: PhantomData,
+        }
+        .fmt(f)
     }
 }
 
@@ -170,11 +194,12 @@
 ///
 /// [`par_values_mut`]: /hashbrown/struct.HashMap.html#method.par_values_mut
 /// [`HashMap`]: /hashbrown/struct.HashMap.html
-pub struct ParValuesMut<'a, K, V, S> {
-    map: &'a mut HashMap<K, V, S>,
+pub struct ParValuesMut<'a, K, V> {
+    inner: RawParIter<(K, V)>,
+    marker: PhantomData<(&'a K, &'a mut V)>,
 }
 
-impl<'a, K: Send, V: Send, S: Send> ParallelIterator for ParValuesMut<'a, K, V, S> {
+impl<'a, K: Sync, V: Send> ParallelIterator for ParValuesMut<'a, K, V> {
     type Item = &'a mut V;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -182,15 +207,19 @@
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        unsafe { self.map.table.par_iter() }
+        self.inner
             .map(|x| unsafe { &mut x.as_mut().1 })
             .drive_unindexed(consumer)
     }
 }
 
-impl<K: Eq + Hash, V: fmt::Debug, S: BuildHasher> fmt::Debug for ParValuesMut<'_, K, V, S> {
+impl<K: Eq + Hash, V: fmt::Debug> fmt::Debug for ParValuesMut<'_, K, V> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.map.values().fmt(f)
+        ParValues {
+            inner: self.inner.clone(),
+            marker: PhantomData,
+        }
+        .fmt(f)
     }
 }
 
@@ -203,11 +232,11 @@
 /// [`into_par_iter`]: /hashbrown/struct.HashMap.html#method.into_par_iter
 /// [`HashMap`]: /hashbrown/struct.HashMap.html
 /// [`IntoParallelIterator`]: https://docs.rs/rayon/1.0/rayon/iter/trait.IntoParallelIterator.html
-pub struct IntoParIter<K, V, S> {
-    map: HashMap<K, V, S>,
+pub struct IntoParIter<K, V, A: Allocator + Clone = Global> {
+    inner: RawIntoParIter<(K, V), A>,
 }
 
-impl<K: Send, V: Send, S: Send> ParallelIterator for IntoParIter<K, V, S> {
+impl<K: Send, V: Send, A: Allocator + Clone + Send> ParallelIterator for IntoParIter<K, V, A> {
     type Item = (K, V);
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -215,13 +244,19 @@
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        self.map.table.into_par_iter().drive_unindexed(consumer)
+        self.inner.drive_unindexed(consumer)
     }
 }
 
-impl<K: fmt::Debug + Eq + Hash, V: fmt::Debug, S: BuildHasher> fmt::Debug for IntoParIter<K, V, S> {
+impl<K: fmt::Debug + Eq + Hash, V: fmt::Debug, A: Allocator + Clone> fmt::Debug
+    for IntoParIter<K, V, A>
+{
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.map.iter().fmt(f)
+        ParIter {
+            inner: unsafe { self.inner.par_iter() },
+            marker: PhantomData,
+        }
+        .fmt(f)
     }
 }
 
@@ -232,11 +267,11 @@
 ///
 /// [`par_drain`]: /hashbrown/struct.HashMap.html#method.par_drain
 /// [`HashMap`]: /hashbrown/struct.HashMap.html
-pub struct ParDrain<'a, K, V, S> {
-    map: &'a mut HashMap<K, V, S>,
+pub struct ParDrain<'a, K, V, A: Allocator + Clone = Global> {
+    inner: RawParDrain<'a, (K, V), A>,
 }
 
-impl<K: Send, V: Send, S: Send> ParallelIterator for ParDrain<'_, K, V, S> {
+impl<K: Send, V: Send, A: Allocator + Clone + Sync> ParallelIterator for ParDrain<'_, K, V, A> {
     type Item = (K, V);
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -244,52 +279,68 @@
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        self.map.table.par_drain().drive_unindexed(consumer)
+        self.inner.drive_unindexed(consumer)
     }
 }
 
-impl<K: fmt::Debug + Eq + Hash, V: fmt::Debug, S: BuildHasher> fmt::Debug
-    for ParDrain<'_, K, V, S>
+impl<K: fmt::Debug + Eq + Hash, V: fmt::Debug, A: Allocator + Clone> fmt::Debug
+    for ParDrain<'_, K, V, A>
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.map.iter().fmt(f)
+        ParIter {
+            inner: unsafe { self.inner.par_iter() },
+            marker: PhantomData,
+        }
+        .fmt(f)
     }
 }
 
-impl<K: Sync, V: Sync, S: Sync> HashMap<K, V, S> {
+impl<K: Sync, V: Sync, S, A: Allocator + Clone> HashMap<K, V, S, A> {
     /// Visits (potentially in parallel) immutably borrowed keys in an arbitrary order.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_keys(&self) -> ParKeys<'_, K, V, S> {
-        ParKeys { map: self }
+    pub fn par_keys(&self) -> ParKeys<'_, K, V> {
+        ParKeys {
+            inner: unsafe { self.table.par_iter() },
+            marker: PhantomData,
+        }
     }
 
     /// Visits (potentially in parallel) immutably borrowed values in an arbitrary order.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_values(&self) -> ParValues<'_, K, V, S> {
-        ParValues { map: self }
+    pub fn par_values(&self) -> ParValues<'_, K, V> {
+        ParValues {
+            inner: unsafe { self.table.par_iter() },
+            marker: PhantomData,
+        }
     }
 }
 
-impl<K: Send, V: Send, S: Send> HashMap<K, V, S> {
+impl<K: Send, V: Send, S, A: Allocator + Clone> HashMap<K, V, S, A> {
     /// Visits (potentially in parallel) mutably borrowed values in an arbitrary order.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_values_mut(&mut self) -> ParValuesMut<'_, K, V, S> {
-        ParValuesMut { map: self }
+    pub fn par_values_mut(&mut self) -> ParValuesMut<'_, K, V> {
+        ParValuesMut {
+            inner: unsafe { self.table.par_iter() },
+            marker: PhantomData,
+        }
     }
 
     /// Consumes (potentially in parallel) all values in an arbitrary order,
     /// while preserving the map's allocated memory for reuse.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_drain(&mut self) -> ParDrain<'_, K, V, S> {
-        ParDrain { map: self }
+    pub fn par_drain(&mut self) -> ParDrain<'_, K, V, A> {
+        ParDrain {
+            inner: self.table.par_drain(),
+        }
     }
 }
 
-impl<K, V, S> HashMap<K, V, S>
+impl<K, V, S, A> HashMap<K, V, S, A>
 where
     K: Eq + Hash + Sync,
     V: PartialEq + Sync,
     S: BuildHasher + Sync,
+    A: Allocator + Clone + Sync,
 {
     /// Returns `true` if the map is equal to another,
     /// i.e. both maps contain the same keys mapped to the same values.
@@ -303,33 +354,47 @@
     }
 }
 
-impl<K: Send, V: Send, S: Send> IntoParallelIterator for HashMap<K, V, S> {
+impl<K: Send, V: Send, S, A: Allocator + Clone + Send> IntoParallelIterator
+    for HashMap<K, V, S, A>
+{
     type Item = (K, V);
-    type Iter = IntoParIter<K, V, S>;
+    type Iter = IntoParIter<K, V, A>;
 
     #[cfg_attr(feature = "inline-more", inline)]
     fn into_par_iter(self) -> Self::Iter {
-        IntoParIter { map: self }
+        IntoParIter {
+            inner: self.table.into_par_iter(),
+        }
     }
 }
 
-impl<'a, K: Sync, V: Sync, S: Sync> IntoParallelIterator for &'a HashMap<K, V, S> {
+impl<'a, K: Sync, V: Sync, S, A: Allocator + Clone> IntoParallelIterator
+    for &'a HashMap<K, V, S, A>
+{
     type Item = (&'a K, &'a V);
-    type Iter = ParIter<'a, K, V, S>;
+    type Iter = ParIter<'a, K, V>;
 
     #[cfg_attr(feature = "inline-more", inline)]
     fn into_par_iter(self) -> Self::Iter {
-        ParIter { map: self }
+        ParIter {
+            inner: unsafe { self.table.par_iter() },
+            marker: PhantomData,
+        }
     }
 }
 
-impl<'a, K: Send + Sync, V: Send, S: Send> IntoParallelIterator for &'a mut HashMap<K, V, S> {
+impl<'a, K: Sync, V: Send, S, A: Allocator + Clone> IntoParallelIterator
+    for &'a mut HashMap<K, V, S, A>
+{
     type Item = (&'a K, &'a mut V);
-    type Iter = ParIterMut<'a, K, V, S>;
+    type Iter = ParIterMut<'a, K, V>;
 
     #[cfg_attr(feature = "inline-more", inline)]
     fn into_par_iter(self) -> Self::Iter {
-        ParIterMut { map: self }
+        ParIterMut {
+            inner: unsafe { self.table.par_iter() },
+            marker: PhantomData,
+        }
     }
 }
 
@@ -337,7 +402,7 @@
 /// hashmap. If multiple pairs correspond to the same key, then the
 /// ones produced earlier in the parallel iterator will be
 /// overwritten, just as with a sequential iterator.
-impl<K, V, S> FromParallelIterator<(K, V)> for HashMap<K, V, S>
+impl<K, V, S> FromParallelIterator<(K, V)> for HashMap<K, V, S, Global>
 where
     K: Eq + Hash + Send,
     V: Send,
@@ -354,11 +419,12 @@
 }
 
 /// Extend a hash map with items from a parallel iterator.
-impl<K, V, S> ParallelExtend<(K, V)> for HashMap<K, V, S>
+impl<K, V, S, A> ParallelExtend<(K, V)> for HashMap<K, V, S, A>
 where
     K: Eq + Hash + Send,
     V: Send,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn par_extend<I>(&mut self, par_iter: I)
     where
@@ -369,11 +435,12 @@
 }
 
 /// Extend a hash map with copied items from a parallel iterator.
-impl<'a, K, V, S> ParallelExtend<(&'a K, &'a V)> for HashMap<K, V, S>
+impl<'a, K, V, S, A> ParallelExtend<(&'a K, &'a V)> for HashMap<K, V, S, A>
 where
     K: Copy + Eq + Hash + Sync,
     V: Copy + Sync,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn par_extend<I>(&mut self, par_iter: I)
     where
@@ -384,12 +451,13 @@
 }
 
 // This is equal to the normal `HashMap` -- no custom advantage.
-fn extend<K, V, S, I>(map: &mut HashMap<K, V, S>, par_iter: I)
+fn extend<K, V, S, A, I>(map: &mut HashMap<K, V, S, A>, par_iter: I)
 where
     K: Eq + Hash,
     S: BuildHasher,
     I: IntoParallelIterator,
-    HashMap<K, V, S>: Extend<I::Item>,
+    A: Allocator + Clone,
+    HashMap<K, V, S, A>: Extend<I::Item>,
 {
     let (list, len) = super::helpers::collect(par_iter);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/raw.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/raw.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/raw.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/raw.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 use crate::raw::Bucket;
-use crate::raw::{RawIter, RawIterRange, RawTable};
+use crate::raw::{Allocator, Global, RawIter, RawIterRange, RawTable};
 use crate::scopeguard::guard;
 use alloc::alloc::dealloc;
 use core::marker::PhantomData;
@@ -15,6 +15,22 @@
     iter: RawIterRange<T>,
 }
 
+impl<T> RawParIter<T> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub(super) unsafe fn iter(&self) -> RawIterRange<T> {
+        self.iter.clone()
+    }
+}
+
+impl<T> Clone for RawParIter<T> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    fn clone(&self) -> Self {
+        Self {
+            iter: self.iter.clone(),
+        }
+    }
+}
+
 impl<T> From<RawIter<T>> for RawParIter<T> {
     fn from(it: RawIter<T>) -> Self {
         RawParIter { iter: it.iter }
@@ -60,11 +76,18 @@
 }
 
 /// Parallel iterator which consumes a table and returns elements.
-pub struct RawIntoParIter<T> {
-    table: RawTable<T>,
+pub struct RawIntoParIter<T, A: Allocator + Clone = Global> {
+    table: RawTable<T, A>,
 }
 
-impl<T: Send> ParallelIterator for RawIntoParIter<T> {
+impl<T, A: Allocator + Clone> RawIntoParIter<T, A> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub(super) unsafe fn par_iter(&self) -> RawParIter<T> {
+        self.table.par_iter()
+    }
+}
+
+impl<T: Send, A: Allocator + Clone> ParallelIterator for RawIntoParIter<T, A> {
     type Item = T;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -73,7 +96,7 @@
         C: UnindexedConsumer<Self::Item>,
     {
         let iter = unsafe { self.table.iter().iter };
-        let _guard = guard(self.table.into_alloc(), |alloc| {
+        let _guard = guard(self.table.into_allocation(), |alloc| {
             if let Some((ptr, layout)) = *alloc {
                 unsafe {
                     dealloc(ptr.as_ptr(), layout);
@@ -86,16 +109,23 @@
 }
 
 /// Parallel iterator which consumes elements without freeing the table storage.
-pub struct RawParDrain<'a, T> {
+pub struct RawParDrain<'a, T, A: Allocator + Clone = Global> {
     // We don't use a &'a mut RawTable<T> because we want RawParDrain to be
     // covariant over T.
-    table: NonNull<RawTable<T>>,
-    marker: PhantomData<&'a RawTable<T>>,
+    table: NonNull<RawTable<T, A>>,
+    marker: PhantomData<&'a RawTable<T, A>>,
 }
 
-unsafe impl<T> Send for RawParDrain<'_, T> {}
+unsafe impl<T, A: Allocator + Clone> Send for RawParDrain<'_, T, A> {}
+
+impl<T, A: Allocator + Clone> RawParDrain<'_, T, A> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub(super) unsafe fn par_iter(&self) -> RawParIter<T> {
+        self.table.as_ref().par_iter()
+    }
+}
 
-impl<T: Send> ParallelIterator for RawParDrain<'_, T> {
+impl<T: Send, A: Allocator + Clone> ParallelIterator for RawParDrain<'_, T, A> {
     type Item = T;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -113,7 +143,7 @@
     }
 }
 
-impl<T> Drop for RawParDrain<'_, T> {
+impl<T, A: Allocator + Clone> Drop for RawParDrain<'_, T, A> {
     fn drop(&mut self) {
         // If drive_unindexed is not called then simply clear the table.
         unsafe { self.table.as_mut().clear() }
@@ -172,7 +202,7 @@
     }
 }
 
-impl<T> RawTable<T> {
+impl<T, A: Allocator + Clone> RawTable<T, A> {
     /// Returns a parallel iterator over the elements in a `RawTable`.
     #[cfg_attr(feature = "inline-more", inline)]
     pub unsafe fn par_iter(&self) -> RawParIter<T> {
@@ -183,14 +213,14 @@
 
     /// Returns a parallel iterator over the elements in a `RawTable`.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn into_par_iter(self) -> RawIntoParIter<T> {
+    pub fn into_par_iter(self) -> RawIntoParIter<T, A> {
         RawIntoParIter { table: self }
     }
 
     /// Returns a parallel iterator which consumes all elements of a `RawTable`
     /// without freeing its memory allocation.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_drain(&mut self) -> RawParDrain<'_, T> {
+    pub fn par_drain(&mut self) -> RawParDrain<'_, T, A> {
         RawParDrain {
             table: NonNull::from(self),
             marker: PhantomData,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/set.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/set.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/set.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/external_trait_impls/rayon/set.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,8 @@
 //! Rayon extensions for `HashSet`.
 
+use super::map;
 use crate::hash_set::HashSet;
+use crate::raw::{Allocator, Global};
 use core::hash::{BuildHasher, Hash};
 use rayon::iter::plumbing::UnindexedConsumer;
 use rayon::iter::{FromParallelIterator, IntoParallelIterator, ParallelExtend, ParallelIterator};
@@ -14,22 +16,18 @@
 /// [`into_par_iter`]: /hashbrown/struct.HashSet.html#method.into_par_iter
 /// [`HashSet`]: /hashbrown/struct.HashSet.html
 /// [`IntoParallelIterator`]: https://docs.rs/rayon/1.0/rayon/iter/trait.IntoParallelIterator.html
-pub struct IntoParIter<T, S> {
-    set: HashSet<T, S>,
+pub struct IntoParIter<T, A: Allocator + Clone = Global> {
+    inner: map::IntoParIter<T, (), A>,
 }
 
-impl<T: Send, S: Send> ParallelIterator for IntoParIter<T, S> {
+impl<T: Send, A: Allocator + Clone + Send> ParallelIterator for IntoParIter<T, A> {
     type Item = T;
 
     fn drive_unindexed<C>(self, consumer: C) -> C::Result
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        self.set
-            .map
-            .into_par_iter()
-            .map(|(k, _)| k)
-            .drive_unindexed(consumer)
+        self.inner.map(|(k, _)| k).drive_unindexed(consumer)
     }
 }
 
@@ -40,22 +38,18 @@
 ///
 /// [`par_drain`]: /hashbrown/struct.HashSet.html#method.par_drain
 /// [`HashSet`]: /hashbrown/struct.HashSet.html
-pub struct ParDrain<'a, T, S> {
-    set: &'a mut HashSet<T, S>,
+pub struct ParDrain<'a, T, A: Allocator + Clone = Global> {
+    inner: map::ParDrain<'a, T, (), A>,
 }
 
-impl<T: Send, S: Send> ParallelIterator for ParDrain<'_, T, S> {
+impl<T: Send, A: Allocator + Clone + Send + Sync> ParallelIterator for ParDrain<'_, T, A> {
     type Item = T;
 
     fn drive_unindexed<C>(self, consumer: C) -> C::Result
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        self.set
-            .map
-            .par_drain()
-            .map(|(k, _)| k)
-            .drive_unindexed(consumer)
+        self.inner.map(|(k, _)| k).drive_unindexed(consumer)
     }
 }
 
@@ -68,18 +62,18 @@
 /// [`par_iter`]: /hashbrown/struct.HashSet.html#method.par_iter
 /// [`HashSet`]: /hashbrown/struct.HashSet.html
 /// [`IntoParallelRefIterator`]: https://docs.rs/rayon/1.0/rayon/iter/trait.IntoParallelRefIterator.html
-pub struct ParIter<'a, T, S> {
-    set: &'a HashSet<T, S>,
+pub struct ParIter<'a, T> {
+    inner: map::ParKeys<'a, T, ()>,
 }
 
-impl<'a, T: Sync, S: Sync> ParallelIterator for ParIter<'a, T, S> {
+impl<'a, T: Sync> ParallelIterator for ParIter<'a, T> {
     type Item = &'a T;
 
     fn drive_unindexed<C>(self, consumer: C) -> C::Result
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        self.set.map.par_keys().drive_unindexed(consumer)
+        self.inner.drive_unindexed(consumer)
     }
 }
 
@@ -91,15 +85,16 @@
 ///
 /// [`par_difference`]: /hashbrown/struct.HashSet.html#method.par_difference
 /// [`HashSet`]: /hashbrown/struct.HashSet.html
-pub struct ParDifference<'a, T, S> {
-    a: &'a HashSet<T, S>,
-    b: &'a HashSet<T, S>,
+pub struct ParDifference<'a, T, S, A: Allocator + Clone = Global> {
+    a: &'a HashSet<T, S, A>,
+    b: &'a HashSet<T, S, A>,
 }
 
-impl<'a, T, S> ParallelIterator for ParDifference<'a, T, S>
+impl<'a, T, S, A> ParallelIterator for ParDifference<'a, T, S, A>
 where
     T: Eq + Hash + Sync,
     S: BuildHasher + Sync,
+    A: Allocator + Clone + Sync,
 {
     type Item = &'a T;
 
@@ -123,15 +118,16 @@
 ///
 /// [`par_symmetric_difference`]: /hashbrown/struct.HashSet.html#method.par_symmetric_difference
 /// [`HashSet`]: /hashbrown/struct.HashSet.html
-pub struct ParSymmetricDifference<'a, T, S> {
-    a: &'a HashSet<T, S>,
-    b: &'a HashSet<T, S>,
+pub struct ParSymmetricDifference<'a, T, S, A: Allocator + Clone = Global> {
+    a: &'a HashSet<T, S, A>,
+    b: &'a HashSet<T, S, A>,
 }
 
-impl<'a, T, S> ParallelIterator for ParSymmetricDifference<'a, T, S>
+impl<'a, T, S, A> ParallelIterator for ParSymmetricDifference<'a, T, S, A>
 where
     T: Eq + Hash + Sync,
     S: BuildHasher + Sync,
+    A: Allocator + Clone + Sync,
 {
     type Item = &'a T;
 
@@ -154,15 +150,16 @@
 ///
 /// [`par_intersection`]: /hashbrown/struct.HashSet.html#method.par_intersection
 /// [`HashSet`]: /hashbrown/struct.HashSet.html
-pub struct ParIntersection<'a, T, S> {
-    a: &'a HashSet<T, S>,
-    b: &'a HashSet<T, S>,
+pub struct ParIntersection<'a, T, S, A: Allocator + Clone = Global> {
+    a: &'a HashSet<T, S, A>,
+    b: &'a HashSet<T, S, A>,
 }
 
-impl<'a, T, S> ParallelIterator for ParIntersection<'a, T, S>
+impl<'a, T, S, A> ParallelIterator for ParIntersection<'a, T, S, A>
 where
     T: Eq + Hash + Sync,
     S: BuildHasher + Sync,
+    A: Allocator + Clone + Sync,
 {
     type Item = &'a T;
 
@@ -184,15 +181,16 @@
 ///
 /// [`par_union`]: /hashbrown/struct.HashSet.html#method.par_union
 /// [`HashSet`]: /hashbrown/struct.HashSet.html
-pub struct ParUnion<'a, T, S> {
-    a: &'a HashSet<T, S>,
-    b: &'a HashSet<T, S>,
+pub struct ParUnion<'a, T, S, A: Allocator + Clone = Global> {
+    a: &'a HashSet<T, S, A>,
+    b: &'a HashSet<T, S, A>,
 }
 
-impl<'a, T, S> ParallelIterator for ParUnion<'a, T, S>
+impl<'a, T, S, A> ParallelIterator for ParUnion<'a, T, S, A>
 where
     T: Eq + Hash + Sync,
     S: BuildHasher + Sync,
+    A: Allocator + Clone + Sync,
 {
     type Item = &'a T;
 
@@ -200,22 +198,37 @@
     where
         C: UnindexedConsumer<Self::Item>,
     {
-        self.a
+        // We'll iterate one set in full, and only the remaining difference from the other.
+        // Use the smaller set for the difference in order to reduce hash lookups.
+        let (smaller, larger) = if self.a.len() <= self.b.len() {
+            (self.a, self.b)
+        } else {
+            (self.b, self.a)
+        };
+        larger
             .into_par_iter()
-            .chain(self.b.par_difference(self.a))
+            .chain(smaller.par_difference(larger))
             .drive_unindexed(consumer)
     }
 }
 
-impl<T, S> HashSet<T, S>
+impl<T, S, A> HashSet<T, S, A>
 where
     T: Eq + Hash + Sync,
     S: BuildHasher + Sync,
+    A: Allocator + Clone + Sync,
 {
+    /// Visits (potentially in parallel) the values representing the union,
+    /// i.e. all the values in `self` or `other`, without duplicates.
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn par_union<'a>(&'a self, other: &'a Self) -> ParUnion<'a, T, S, A> {
+        ParUnion { a: self, b: other }
+    }
+
     /// Visits (potentially in parallel) the values representing the difference,
     /// i.e. the values that are in `self` but not in `other`.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_difference<'a>(&'a self, other: &'a Self) -> ParDifference<'a, T, S> {
+    pub fn par_difference<'a>(&'a self, other: &'a Self) -> ParDifference<'a, T, S, A> {
         ParDifference { a: self, b: other }
     }
 
@@ -225,24 +238,17 @@
     pub fn par_symmetric_difference<'a>(
         &'a self,
         other: &'a Self,
-    ) -> ParSymmetricDifference<'a, T, S> {
+    ) -> ParSymmetricDifference<'a, T, S, A> {
         ParSymmetricDifference { a: self, b: other }
     }
 
     /// Visits (potentially in parallel) the values representing the
     /// intersection, i.e. the values that are both in `self` and `other`.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_intersection<'a>(&'a self, other: &'a Self) -> ParIntersection<'a, T, S> {
+    pub fn par_intersection<'a>(&'a self, other: &'a Self) -> ParIntersection<'a, T, S, A> {
         ParIntersection { a: self, b: other }
     }
 
-    /// Visits (potentially in parallel) the values representing the union,
-    /// i.e. all the values in `self` or `other`, without duplicates.
-    #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_union<'a>(&'a self, other: &'a Self) -> ParUnion<'a, T, S> {
-        ParUnion { a: self, b: other }
-    }
-
     /// Returns `true` if `self` has no elements in common with `other`.
     /// This is equivalent to checking for an empty intersection.
     ///
@@ -280,41 +286,47 @@
     }
 }
 
-impl<T, S> HashSet<T, S>
+impl<T, S, A> HashSet<T, S, A>
 where
     T: Eq + Hash + Send,
-    S: BuildHasher + Send,
+    A: Allocator + Clone + Send,
 {
     /// Consumes (potentially in parallel) all values in an arbitrary order,
     /// while preserving the set's allocated memory for reuse.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn par_drain(&mut self) -> ParDrain<'_, T, S> {
-        ParDrain { set: self }
+    pub fn par_drain(&mut self) -> ParDrain<'_, T, A> {
+        ParDrain {
+            inner: self.map.par_drain(),
+        }
     }
 }
 
-impl<T: Send, S: Send> IntoParallelIterator for HashSet<T, S> {
+impl<T: Send, S, A: Allocator + Clone + Send> IntoParallelIterator for HashSet<T, S, A> {
     type Item = T;
-    type Iter = IntoParIter<T, S>;
+    type Iter = IntoParIter<T, A>;
 
     #[cfg_attr(feature = "inline-more", inline)]
     fn into_par_iter(self) -> Self::Iter {
-        IntoParIter { set: self }
+        IntoParIter {
+            inner: self.map.into_par_iter(),
+        }
     }
 }
 
-impl<'a, T: Sync, S: Sync> IntoParallelIterator for &'a HashSet<T, S> {
+impl<'a, T: Sync, S, A: Allocator + Clone> IntoParallelIterator for &'a HashSet<T, S, A> {
     type Item = &'a T;
-    type Iter = ParIter<'a, T, S>;
+    type Iter = ParIter<'a, T>;
 
     #[cfg_attr(feature = "inline-more", inline)]
     fn into_par_iter(self) -> Self::Iter {
-        ParIter { set: self }
+        ParIter {
+            inner: self.map.par_keys(),
+        }
     }
 }
 
 /// Collect values from a parallel iterator into a hashset.
-impl<T, S> FromParallelIterator<T> for HashSet<T, S>
+impl<T, S> FromParallelIterator<T> for HashSet<T, S, Global>
 where
     T: Eq + Hash + Send,
     S: BuildHasher + Default,
@@ -330,7 +342,7 @@
 }
 
 /// Extend a hash set with items from a parallel iterator.
-impl<T, S> ParallelExtend<T> for HashSet<T, S>
+impl<T, S> ParallelExtend<T> for HashSet<T, S, Global>
 where
     T: Eq + Hash + Send,
     S: BuildHasher,
@@ -344,7 +356,7 @@
 }
 
 /// Extend a hash set with copied items from a parallel iterator.
-impl<'a, T, S> ParallelExtend<&'a T> for HashSet<T, S>
+impl<'a, T, S> ParallelExtend<&'a T> for HashSet<T, S, Global>
 where
     T: 'a + Copy + Eq + Hash + Sync,
     S: BuildHasher,
@@ -358,12 +370,13 @@
 }
 
 // This is equal to the normal `HashSet` -- no custom advantage.
-fn extend<T, S, I>(set: &mut HashSet<T, S>, par_iter: I)
+fn extend<T, S, I, A>(set: &mut HashSet<T, S, A>, par_iter: I)
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
     I: IntoParallelIterator,
-    HashSet<T, S>: Extend<I::Item>,
+    HashSet<T, S, A>: Extend<I::Item>,
 {
     let (list, len) = super::helpers::collect(par_iter);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,13 +12,25 @@
 #![no_std]
 #![cfg_attr(
     feature = "nightly",
-    feature(test, core_intrinsics, dropck_eyepatch, min_specialization, extend_one)
+    feature(
+        test,
+        core_intrinsics,
+        dropck_eyepatch,
+        min_specialization,
+        extend_one,
+        allocator_api,
+        slice_ptr_get,
+        nonnull_slice_from_raw_parts,
+        maybe_uninit_array_assume_init
+    )
 )]
 #![allow(
     clippy::doc_markdown,
     clippy::module_name_repetitions,
     clippy::must_use_candidate,
-    clippy::option_if_let_else
+    clippy::option_if_let_else,
+    clippy::redundant_else,
+    clippy::manual_map
 )]
 #![warn(missing_docs)]
 #![warn(rust_2018_idioms)]
@@ -48,6 +60,11 @@
     pub use inner::*;
 
     #[cfg(feature = "rayon")]
+    /// [rayon]-based parallel iterator types for hash maps.
+    /// You will rarely need to interact with it directly unless you have need
+    /// to name one of the iterator types.
+    ///
+    /// [rayon]: https://docs.rs/rayon/1.0/rayon
     pub mod rayon {
         pub use crate::external_trait_impls::rayon::raw::*;
     }
@@ -110,3 +127,35 @@
         layout: alloc::alloc::Layout,
     },
 }
+
+/// The error type for [`RawTable::get_each_mut`](crate::raw::RawTable::get_each_mut),
+/// [`HashMap::get_each_mut`], and [`HashMap::get_each_key_value_mut`].
+#[cfg(feature = "nightly")]
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum UnavailableMutError {
+    /// The requested entry is not present in the table.
+    Absent,
+    /// The requested entry is present, but a mutable reference to it was already created and
+    /// returned from this call to `get_each_mut` or `get_each_key_value_mut`.
+    ///
+    /// Includes the index of the existing mutable reference in the returned array.
+    Duplicate(usize),
+}
+
+/// Wrapper around `Bump` which allows it to be used as an allocator for
+/// `HashMap`, `HashSet` and `RawTable`.
+///
+/// `Bump` can be used directly without this wrapper on nightly if you enable
+/// the `allocator-api` feature of the `bumpalo` crate.
+#[cfg(feature = "bumpalo")]
+#[derive(Clone, Copy, Debug)]
+pub struct BumpWrapper<'a>(pub &'a bumpalo::Bump);
+
+#[cfg(feature = "bumpalo")]
+#[test]
+fn test_bumpalo() {
+    use bumpalo::Bump;
+    let bump = Bump::new();
+    let mut map = HashMap::new_in(BumpWrapper(&bump));
+    map.insert(0, 1);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,15 @@
-use crate::raw::{Bucket, RawDrain, RawIntoIter, RawIter, RawTable};
+use crate::raw::{Allocator, Bucket, Global, RawDrain, RawIntoIter, RawIter, RawTable};
 use crate::TryReserveError;
+#[cfg(feature = "nightly")]
+use crate::UnavailableMutError;
 use core::borrow::Borrow;
 use core::fmt::{self, Debug};
-use core::hash::{BuildHasher, Hash, Hasher};
+use core::hash::{BuildHasher, Hash};
 use core::iter::{FromIterator, FusedIterator};
 use core::marker::PhantomData;
 use core::mem;
+#[cfg(feature = "nightly")]
+use core::mem::MaybeUninit;
 use core::ops::Index;
 
 /// Default hasher for `HashMap`.
@@ -185,12 +189,12 @@
 ///     .iter().cloned().collect();
 /// // use the values stored in map
 /// ```
-pub struct HashMap<K, V, S = DefaultHashBuilder> {
+pub struct HashMap<K, V, S = DefaultHashBuilder, A: Allocator + Clone = Global> {
     pub(crate) hash_builder: S,
-    pub(crate) table: RawTable<(K, V)>,
+    pub(crate) table: RawTable<(K, V), A>,
 }
 
-impl<K: Clone, V: Clone, S: Clone> Clone for HashMap<K, V, S> {
+impl<K: Clone, V: Clone, S: Clone, A: Allocator + Clone> Clone for HashMap<K, V, S, A> {
     fn clone(&self) -> Self {
         HashMap {
             hash_builder: self.hash_builder.clone(),
@@ -206,8 +210,60 @@
     }
 }
 
+/// Ensures that a single closure type across uses of this which, in turn prevents multiple
+/// instances of any functions like RawTable::reserve from being generated
 #[cfg_attr(feature = "inline-more", inline)]
-pub(crate) fn make_hash<K: Hash + ?Sized>(hash_builder: &impl BuildHasher, val: &K) -> u64 {
+pub(crate) fn make_hasher<K, Q, V, S>(hash_builder: &S) -> impl Fn(&(Q, V)) -> u64 + '_
+where
+    K: Borrow<Q>,
+    Q: Hash,
+    S: BuildHasher,
+{
+    move |val| make_hash::<K, Q, S>(hash_builder, &val.0)
+}
+
+/// Ensures that a single closure type across uses of this which, in turn prevents multiple
+/// instances of any functions like RawTable::reserve from being generated
+#[cfg_attr(feature = "inline-more", inline)]
+fn equivalent_key<Q, K, V>(k: &Q) -> impl Fn(&(K, V)) -> bool + '_
+where
+    K: Borrow<Q>,
+    Q: ?Sized + Eq,
+{
+    move |x| k.eq(x.0.borrow())
+}
+
+/// Ensures that a single closure type across uses of this which, in turn prevents multiple
+/// instances of any functions like RawTable::reserve from being generated
+#[cfg_attr(feature = "inline-more", inline)]
+fn equivalent<Q, K>(k: &Q) -> impl Fn(&K) -> bool + '_
+where
+    K: Borrow<Q>,
+    Q: ?Sized + Eq,
+{
+    move |x| k.eq(x.borrow())
+}
+
+#[cfg_attr(feature = "inline-more", inline)]
+pub(crate) fn make_hash<K, Q, S>(hash_builder: &S, val: &Q) -> u64
+where
+    K: Borrow<Q>,
+    Q: Hash + ?Sized,
+    S: BuildHasher,
+{
+    use core::hash::Hasher;
+    let mut state = hash_builder.build_hasher();
+    val.hash(&mut state);
+    state.finish()
+}
+
+#[cfg_attr(feature = "inline-more", inline)]
+pub(crate) fn make_insert_hash<K, S>(hash_builder: &S, val: &K) -> u64
+where
+    K: Hash,
+    S: BuildHasher,
+{
+    use core::hash::Hasher;
     let mut state = hash_builder.build_hasher();
     val.hash(&mut state);
     state.finish()
@@ -248,6 +304,27 @@
     }
 }
 
+#[cfg(feature = "ahash")]
+impl<K, V, A: Allocator + Clone> HashMap<K, V, DefaultHashBuilder, A> {
+    /// Creates an empty `HashMap` using the given allocator.
+    ///
+    /// The hash map is initially created with a capacity of 0, so it will not allocate until it
+    /// is first inserted into.
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn new_in(alloc: A) -> Self {
+        Self::with_hasher_in(DefaultHashBuilder::default(), alloc)
+    }
+
+    /// Creates an empty `HashMap` with the specified capacity using the given allocator.
+    ///
+    /// The hash map will be able to hold at least `capacity` elements without
+    /// reallocating. If `capacity` is 0, the hash map will not allocate.
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn with_capacity_in(capacity: usize, alloc: A) -> Self {
+        Self::with_capacity_and_hasher_in(capacity, DefaultHashBuilder::default(), alloc)
+    }
+}
+
 impl<K, V, S> HashMap<K, V, S> {
     /// Creates an empty `HashMap` which will use the given hash builder to hash
     /// keys.
@@ -315,6 +392,65 @@
             table: RawTable::with_capacity(capacity),
         }
     }
+}
+
+impl<K, V, S, A: Allocator + Clone> HashMap<K, V, S, A> {
+    /// Creates an empty `HashMap` which will use the given hash builder to hash
+    /// keys. It will be allocated with the given allocator.
+    ///
+    /// The created map has the default initial capacity.
+    ///
+    /// Warning: `hash_builder` is normally randomly generated, and
+    /// is designed to allow HashMaps to be resistant to attacks that
+    /// cause many collisions and very poor performance. Setting it
+    /// manually using this function can expose a DoS attack vector.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use hashbrown::HashMap;
+    /// use hashbrown::hash_map::DefaultHashBuilder;
+    ///
+    /// let s = DefaultHashBuilder::default();
+    /// let mut map = HashMap::with_hasher(s);
+    /// map.insert(1, 2);
+    /// ```
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn with_hasher_in(hash_builder: S, alloc: A) -> Self {
+        Self {
+            hash_builder,
+            table: RawTable::new_in(alloc),
+        }
+    }
+
+    /// Creates an empty `HashMap` with the specified capacity, using `hash_builder`
+    /// to hash the keys. It will be allocated with the given allocator.
+    ///
+    /// The hash map will be able to hold at least `capacity` elements without
+    /// reallocating. If `capacity` is 0, the hash map will not allocate.
+    ///
+    /// Warning: `hash_builder` is normally randomly generated, and
+    /// is designed to allow HashMaps to be resistant to attacks that
+    /// cause many collisions and very poor performance. Setting it
+    /// manually using this function can expose a DoS attack vector.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use hashbrown::HashMap;
+    /// use hashbrown::hash_map::DefaultHashBuilder;
+    ///
+    /// let s = DefaultHashBuilder::default();
+    /// let mut map = HashMap::with_capacity_and_hasher(10, s);
+    /// map.insert(1, 2);
+    /// ```
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn with_capacity_and_hasher_in(capacity: usize, hash_builder: S, alloc: A) -> Self {
+        Self {
+            hash_builder,
+            table: RawTable::with_capacity_in(capacity, alloc),
+        }
+    }
 
     /// Returns a reference to the map's [`BuildHasher`].
     ///
@@ -547,7 +683,7 @@
     /// assert!(a.is_empty());
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn drain(&mut self) -> Drain<'_, K, V> {
+    pub fn drain(&mut self) -> Drain<'_, K, V, A> {
         Drain {
             inner: self.table.drain(),
         }
@@ -607,7 +743,7 @@
     /// assert_eq!(odds, vec![1, 3, 5, 7]);
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn drain_filter<F>(&mut self, f: F) -> DrainFilter<'_, K, V, F>
+    pub fn drain_filter<F>(&mut self, f: F) -> DrainFilter<'_, K, V, F, A>
     where
         F: FnMut(&K, &mut V) -> bool,
     {
@@ -639,10 +775,11 @@
     }
 }
 
-impl<K, V, S> HashMap<K, V, S>
+impl<K, V, S, A> HashMap<K, V, S, A>
 where
     K: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     /// Reserves capacity for at least `additional` more elements to be inserted
     /// in the `HashMap`. The collection may reserve more space to avoid
@@ -663,9 +800,8 @@
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn reserve(&mut self, additional: usize) {
-        let hash_builder = &self.hash_builder;
         self.table
-            .reserve(additional, |x| make_hash(hash_builder, &x.0));
+            .reserve(additional, make_hasher::<K, _, V, S>(&self.hash_builder));
     }
 
     /// Tries to reserve capacity for at least `additional` more elements to be inserted
@@ -686,9 +822,8 @@
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn try_reserve(&mut self, additional: usize) -> Result<(), TryReserveError> {
-        let hash_builder = &self.hash_builder;
         self.table
-            .try_reserve(additional, |x| make_hash(hash_builder, &x.0))
+            .try_reserve(additional, make_hasher::<K, _, V, S>(&self.hash_builder))
     }
 
     /// Shrinks the capacity of the map as much as possible. It will drop
@@ -709,8 +844,8 @@
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn shrink_to_fit(&mut self) {
-        let hash_builder = &self.hash_builder;
-        self.table.shrink_to(0, |x| make_hash(hash_builder, &x.0));
+        self.table
+            .shrink_to(0, make_hasher::<K, _, V, S>(&self.hash_builder));
     }
 
     /// Shrinks the capacity of the map with a lower limit. It will drop
@@ -738,9 +873,8 @@
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn shrink_to(&mut self, min_capacity: usize) {
-        let hash_builder = &self.hash_builder;
         self.table
-            .shrink_to(min_capacity, |x| make_hash(hash_builder, &x.0));
+            .shrink_to(min_capacity, make_hasher::<K, _, V, S>(&self.hash_builder));
     }
 
     /// Gets the given key's corresponding entry in the map for in-place manipulation.
@@ -763,9 +897,9 @@
     /// assert_eq!(letters.get(&'y'), None);
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn entry(&mut self, key: K) -> Entry<'_, K, V, S> {
-        let hash = make_hash(&self.hash_builder, &key);
-        if let Some(elem) = self.table.find(hash, |q| q.0.eq(&key)) {
+    pub fn entry(&mut self, key: K) -> Entry<'_, K, V, S, A> {
+        let hash = make_insert_hash::<K, S>(&self.hash_builder, &key);
+        if let Some(elem) = self.table.find(hash, equivalent_key(&key)) {
             Entry::Occupied(OccupiedEntry {
                 hash,
                 key: Some(key),
@@ -851,8 +985,8 @@
         K: Borrow<Q>,
         Q: Hash + Eq,
     {
-        let hash = make_hash(&self.hash_builder, k);
-        self.table.get(hash, |x| k.eq(x.0.borrow()))
+        let hash = make_hash::<K, Q, S>(&self.hash_builder, k);
+        self.table.get(hash, equivalent_key(k))
     }
 
     /// Returns the key-value pair corresponding to the supplied key, with a mutable reference to value.
@@ -959,8 +1093,143 @@
         K: Borrow<Q>,
         Q: Hash + Eq,
     {
-        let hash = make_hash(&self.hash_builder, k);
-        self.table.get_mut(hash, |x| k.eq(x.0.borrow()))
+        let hash = make_hash::<K, Q, S>(&self.hash_builder, k);
+        self.table.get_mut(hash, equivalent_key(k))
+    }
+
+    /// Attempts to get mutable references to `N` values in the map at once.
+    ///
+    /// Returns an array of length `N` with the results of each query. For soundness,
+    /// at most one mutable reference will be returned to any value. An
+    /// `Err(UnavailableMutError::Duplicate(i))` in the returned array indicates that a suitable
+    /// key-value pair exists, but a mutable reference to the value already occurs at index `i` in
+    /// the returned array.
+    ///
+    /// This method is available only if the `nightly` feature is enabled.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use hashbrown::{HashMap, UnavailableMutError};
+    ///
+    /// let mut libraries = HashMap::new();
+    /// libraries.insert("Bodleian Library".to_string(), 1602);
+    /// libraries.insert("Athenæum".to_string(), 1807);
+    /// libraries.insert("Herzogin-Anna-Amalia-Bibliothek".to_string(), 1691);
+    /// libraries.insert("Library of Congress".to_string(), 1800);
+    ///
+    /// let got = libraries.get_each_mut([
+    ///     "Athenæum",
+    ///     "New York Public Library",
+    ///     "Athenæum",
+    ///     "Library of Congress",
+    /// ]);
+    /// assert_eq!(
+    ///     got,
+    ///     [
+    ///         Ok(&mut 1807),
+    ///         Err(UnavailableMutError::Absent),
+    ///         Err(UnavailableMutError::Duplicate(0)),
+    ///         Ok(&mut 1800),
+    ///     ]
+    /// );
+    /// ```
+    #[cfg(feature = "nightly")]
+    pub fn get_each_mut<Q: ?Sized, const N: usize>(
+        &mut self,
+        ks: [&Q; N],
+    ) -> [Result<&'_ mut V, UnavailableMutError>; N]
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        let mut pairs = self.get_each_inner_mut(ks);
+        // TODO use `MaybeUninit::uninit_array` here instead once that's stable.
+        let mut out: [MaybeUninit<Result<&'_ mut V, UnavailableMutError>>; N] =
+            unsafe { MaybeUninit::uninit().assume_init() };
+        for i in 0..N {
+            out[i] = MaybeUninit::new(
+                mem::replace(&mut pairs[i], Err(UnavailableMutError::Absent)).map(|(_, v)| v),
+            );
+        }
+        unsafe { MaybeUninit::array_assume_init(out) }
+    }
+
+    /// Attempts to get mutable references to `N` values in the map at once, with immutable
+    /// references to the corresponding keys.
+    ///
+    /// Returns an array of length `N` with the results of each query. For soundness,
+    /// at most one mutable reference will be returned to any value. An
+    /// `Err(UnavailableMutError::Duplicate(i))` in the returned array indicates that a suitable
+    /// key-value pair exists, but a mutable reference to the value already occurs at index `i` in
+    /// the returned array.
+    ///
+    /// This method is available only if the `nightly` feature is enabled.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use hashbrown::{HashMap, UnavailableMutError};
+    ///
+    /// let mut libraries = HashMap::new();
+    /// libraries.insert("Bodleian Library".to_string(), 1602);
+    /// libraries.insert("Athenæum".to_string(), 1807);
+    /// libraries.insert("Herzogin-Anna-Amalia-Bibliothek".to_string(), 1691);
+    /// libraries.insert("Library of Congress".to_string(), 1800);
+    ///
+    /// let got = libraries.get_each_key_value_mut([
+    ///     "Bodleian Library",
+    ///     "Herzogin-Anna-Amalia-Bibliothek",
+    ///     "Herzogin-Anna-Amalia-Bibliothek",
+    ///     "Gewandhaus",
+    /// ]);
+    /// assert_eq!(
+    ///     got,
+    ///     [
+    ///         Ok((&"Bodleian Library".to_string(), &mut 1602)),
+    ///         Ok((&"Herzogin-Anna-Amalia-Bibliothek".to_string(), &mut 1691)),
+    ///         Err(UnavailableMutError::Duplicate(1)),
+    ///         Err(UnavailableMutError::Absent),
+    ///     ]
+    /// );
+    /// ```
+    #[cfg(feature = "nightly")]
+    pub fn get_each_key_value_mut<Q: ?Sized, const N: usize>(
+        &mut self,
+        ks: [&Q; N],
+    ) -> [Result<(&'_ K, &'_ mut V), UnavailableMutError>; N]
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        let mut pairs = self.get_each_inner_mut(ks);
+        // TODO use `MaybeUninit::uninit_array` here instead once that's stable.
+        let mut out: [MaybeUninit<Result<(&'_ K, &'_ mut V), UnavailableMutError>>; N] =
+            unsafe { MaybeUninit::uninit().assume_init() };
+        for i in 0..N {
+            out[i] = MaybeUninit::new(
+                mem::replace(&mut pairs[i], Err(UnavailableMutError::Absent))
+                    .map(|(k, v)| (&*k, v)),
+            );
+        }
+        unsafe { MaybeUninit::array_assume_init(out) }
+    }
+
+    #[cfg(feature = "nightly")]
+    fn get_each_inner_mut<Q: ?Sized, const N: usize>(
+        &mut self,
+        ks: [&Q; N],
+    ) -> [Result<&'_ mut (K, V), UnavailableMutError>; N]
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        let mut hashes = [0_u64; N];
+        for i in 0..N {
+            hashes[i] = make_hash::<K, Q, S>(&self.hash_builder, ks[i]);
+        }
+        self.table
+            .get_each_mut(hashes, |i, (k, _)| ks[i].eq(k.borrow()))
     }
 
     /// Inserts a key-value pair into the map.
@@ -990,17 +1259,51 @@
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn insert(&mut self, k: K, v: V) -> Option<V> {
-        let hash = make_hash(&self.hash_builder, &k);
-        if let Some((_, item)) = self.table.get_mut(hash, |x| k.eq(&x.0)) {
+        let hash = make_insert_hash::<K, S>(&self.hash_builder, &k);
+        if let Some((_, item)) = self.table.get_mut(hash, equivalent_key(&k)) {
             Some(mem::replace(item, v))
         } else {
-            let hash_builder = &self.hash_builder;
             self.table
-                .insert(hash, (k, v), |x| make_hash(hash_builder, &x.0));
+                .insert(hash, (k, v), make_hasher::<K, _, V, S>(&self.hash_builder));
             None
         }
     }
 
+    /// Tries to insert a key-value pair into the map, and returns
+    /// a mutable reference to the value in the entry.
+    ///
+    /// # Errors
+    ///
+    /// If the map already had this key present, nothing is updated, and
+    /// an error containing the occupied entry and the value is returned.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use hashbrown::HashMap;
+    ///
+    /// let mut map = HashMap::new();
+    /// assert_eq!(map.try_insert(37, "a").unwrap(), &"a");
+    ///
+    /// let err = map.try_insert(37, "b").unwrap_err();
+    /// assert_eq!(err.entry.key(), &37);
+    /// assert_eq!(err.entry.get(), &"a");
+    /// assert_eq!(err.value, "b");
+    /// ```
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn try_insert(
+        &mut self,
+        key: K,
+        value: V,
+    ) -> Result<&mut V, OccupiedError<'_, K, V, S, A>> {
+        match self.entry(key) {
+            Entry::Occupied(entry) => Err(OccupiedError { entry, value }),
+            Entry::Vacant(entry) => Ok(entry.insert(value)),
+        }
+    }
+
     /// Removes a key from the map, returning the value at the key if the key
     /// was previously in the map.
     ///
@@ -1060,12 +1363,12 @@
         K: Borrow<Q>,
         Q: Hash + Eq,
     {
-        let hash = make_hash(&self.hash_builder, &k);
-        self.table.remove_entry(hash, |x| k.eq(x.0.borrow()))
+        let hash = make_hash::<K, Q, S>(&self.hash_builder, k);
+        self.table.remove_entry(hash, equivalent_key(k))
     }
 }
 
-impl<K, V, S> HashMap<K, V, S> {
+impl<K, V, S, A: Allocator + Clone> HashMap<K, V, S, A> {
     /// Creates a raw entry builder for the HashMap.
     ///
     /// Raw entries provide the lowest level of control for searching and
@@ -1098,7 +1401,7 @@
     /// acting erratically, with two keys randomly masking each other. Implementations
     /// are free to assume this doesn't happen (within the limits of memory-safety).
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn raw_entry_mut(&mut self) -> RawEntryBuilderMut<'_, K, V, S> {
+    pub fn raw_entry_mut(&mut self) -> RawEntryBuilderMut<'_, K, V, S, A> {
         RawEntryBuilderMut { map: self }
     }
 
@@ -1118,16 +1421,17 @@
     ///
     /// Immutable raw entries have very limited use; you might instead want `raw_entry_mut`.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn raw_entry(&self) -> RawEntryBuilder<'_, K, V, S> {
+    pub fn raw_entry(&self) -> RawEntryBuilder<'_, K, V, S, A> {
         RawEntryBuilder { map: self }
     }
 }
 
-impl<K, V, S> PartialEq for HashMap<K, V, S>
+impl<K, V, S, A> PartialEq for HashMap<K, V, S, A>
 where
     K: Eq + Hash,
     V: PartialEq,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn eq(&self, other: &Self) -> bool {
         if self.len() != other.len() {
@@ -1139,40 +1443,44 @@
     }
 }
 
-impl<K, V, S> Eq for HashMap<K, V, S>
+impl<K, V, S, A> Eq for HashMap<K, V, S, A>
 where
     K: Eq + Hash,
     V: Eq,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
 }
 
-impl<K, V, S> Debug for HashMap<K, V, S>
+impl<K, V, S, A> Debug for HashMap<K, V, S, A>
 where
     K: Debug,
     V: Debug,
+    A: Allocator + Clone,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_map().entries(self.iter()).finish()
     }
 }
 
-impl<K, V, S> Default for HashMap<K, V, S>
+impl<K, V, S, A> Default for HashMap<K, V, S, A>
 where
     S: Default,
+    A: Default + Allocator + Clone,
 {
-    /// Creates an empty `HashMap<K, V, S>`, with the `Default` value for the hasher.
+    /// Creates an empty `HashMap<K, V, S, A>`, with the `Default` value for the hasher and allocator.
     #[cfg_attr(feature = "inline-more", inline)]
     fn default() -> Self {
-        Self::with_hasher(Default::default())
+        Self::with_hasher_in(Default::default(), Default::default())
     }
 }
 
-impl<K, Q: ?Sized, V, S> Index<&Q> for HashMap<K, V, S>
+impl<K, Q: ?Sized, V, S, A> Index<&Q> for HashMap<K, V, S, A>
 where
     K: Eq + Hash + Borrow<Q>,
     Q: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     type Output = V;
 
@@ -1252,11 +1560,11 @@
 ///
 /// [`into_iter`]: struct.HashMap.html#method.into_iter
 /// [`HashMap`]: struct.HashMap.html
-pub struct IntoIter<K, V> {
-    inner: RawIntoIter<(K, V)>,
+pub struct IntoIter<K, V, A: Allocator + Clone = Global> {
+    inner: RawIntoIter<(K, V), A>,
 }
 
-impl<K, V> IntoIter<K, V> {
+impl<K, V, A: Allocator + Clone> IntoIter<K, V, A> {
     /// Returns a iterator of references over the remaining items.
     #[cfg_attr(feature = "inline-more", inline)]
     pub(super) fn iter(&self) -> Iter<'_, K, V> {
@@ -1328,11 +1636,11 @@
 ///
 /// [`drain`]: struct.HashMap.html#method.drain
 /// [`HashMap`]: struct.HashMap.html
-pub struct Drain<'a, K, V> {
-    inner: RawDrain<'a, (K, V)>,
+pub struct Drain<'a, K, V, A: Allocator + Clone = Global> {
+    inner: RawDrain<'a, (K, V), A>,
 }
 
-impl<K, V> Drain<'_, K, V> {
+impl<K, V, A: Allocator + Clone> Drain<'_, K, V, A> {
     /// Returns a iterator of references over the remaining items.
     #[cfg_attr(feature = "inline-more", inline)]
     pub(super) fn iter(&self) -> Iter<'_, K, V> {
@@ -1350,17 +1658,18 @@
 ///
 /// [`drain_filter`]: struct.HashMap.html#method.drain_filter
 /// [`HashMap`]: struct.HashMap.html
-pub struct DrainFilter<'a, K, V, F>
+pub struct DrainFilter<'a, K, V, F, A: Allocator + Clone = Global>
 where
     F: FnMut(&K, &mut V) -> bool,
 {
     f: F,
-    inner: DrainFilterInner<'a, K, V>,
+    inner: DrainFilterInner<'a, K, V, A>,
 }
 
-impl<'a, K, V, F> Drop for DrainFilter<'a, K, V, F>
+impl<'a, K, V, F, A> Drop for DrainFilter<'a, K, V, F, A>
 where
     F: FnMut(&K, &mut V) -> bool,
+    A: Allocator + Clone,
 {
     #[cfg_attr(feature = "inline-more", inline)]
     fn drop(&mut self) {
@@ -1381,9 +1690,10 @@
     }
 }
 
-impl<K, V, F> Iterator for DrainFilter<'_, K, V, F>
+impl<K, V, F, A> Iterator for DrainFilter<'_, K, V, F, A>
 where
     F: FnMut(&K, &mut V) -> bool,
+    A: Allocator + Clone,
 {
     type Item = (K, V);
 
@@ -1401,12 +1711,12 @@
 impl<K, V, F> FusedIterator for DrainFilter<'_, K, V, F> where F: FnMut(&K, &mut V) -> bool {}
 
 /// Portions of `DrainFilter` shared with `set::DrainFilter`
-pub(super) struct DrainFilterInner<'a, K, V> {
+pub(super) struct DrainFilterInner<'a, K, V, A: Allocator + Clone> {
     pub iter: RawIter<(K, V)>,
-    pub table: &'a mut RawTable<(K, V)>,
+    pub table: &'a mut RawTable<(K, V), A>,
 }
 
-impl<K, V> DrainFilterInner<'_, K, V> {
+impl<K, V, A: Allocator + Clone> DrainFilterInner<'_, K, V, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     pub(super) fn next<F>(&mut self, f: &mut F) -> Option<(K, V)>
     where
@@ -1440,8 +1750,8 @@
 /// See the [`HashMap::raw_entry_mut`] docs for usage examples.
 ///
 /// [`HashMap::raw_entry_mut`]: struct.HashMap.html#method.raw_entry_mut
-pub struct RawEntryBuilderMut<'a, K, V, S> {
-    map: &'a mut HashMap<K, V, S>,
+pub struct RawEntryBuilderMut<'a, K, V, S, A: Allocator + Clone = Global> {
+    map: &'a mut HashMap<K, V, S, A>,
 }
 
 /// A view into a single entry in a map, which may either be vacant or occupied.
@@ -1455,35 +1765,35 @@
 /// [`Entry`]: enum.Entry.html
 /// [`raw_entry_mut`]: struct.HashMap.html#method.raw_entry_mut
 /// [`RawEntryBuilderMut`]: struct.RawEntryBuilderMut.html
-pub enum RawEntryMut<'a, K, V, S> {
+pub enum RawEntryMut<'a, K, V, S, A: Allocator + Clone = Global> {
     /// An occupied entry.
-    Occupied(RawOccupiedEntryMut<'a, K, V, S>),
+    Occupied(RawOccupiedEntryMut<'a, K, V, S, A>),
     /// A vacant entry.
-    Vacant(RawVacantEntryMut<'a, K, V, S>),
+    Vacant(RawVacantEntryMut<'a, K, V, S, A>),
 }
 
 /// A view into an occupied entry in a `HashMap`.
 /// It is part of the [`RawEntryMut`] enum.
 ///
 /// [`RawEntryMut`]: enum.RawEntryMut.html
-pub struct RawOccupiedEntryMut<'a, K, V, S> {
+pub struct RawOccupiedEntryMut<'a, K, V, S, A: Allocator + Clone = Global> {
     elem: Bucket<(K, V)>,
-    table: &'a mut RawTable<(K, V)>,
+    table: &'a mut RawTable<(K, V), A>,
     hash_builder: &'a S,
 }
 
-unsafe impl<K, V, S> Send for RawOccupiedEntryMut<'_, K, V, S>
+unsafe impl<K, V, S, A> Send for RawOccupiedEntryMut<'_, K, V, S, A>
 where
     K: Send,
     V: Send,
-    S: Sync,
+    A: Send + Allocator + Clone,
 {
 }
-unsafe impl<K, V, S> Sync for RawOccupiedEntryMut<'_, K, V, S>
+unsafe impl<K, V, S, A> Sync for RawOccupiedEntryMut<'_, K, V, S, A>
 where
     K: Sync,
     V: Sync,
-    S: Sync,
+    A: Send + Allocator + Clone,
 {
 }
 
@@ -1491,8 +1801,8 @@
 /// It is part of the [`RawEntryMut`] enum.
 ///
 /// [`RawEntryMut`]: enum.RawEntryMut.html
-pub struct RawVacantEntryMut<'a, K, V, S> {
-    table: &'a mut RawTable<(K, V)>,
+pub struct RawVacantEntryMut<'a, K, V, S, A: Allocator + Clone = Global> {
+    table: &'a mut RawTable<(K, V), A>,
     hash_builder: &'a S,
 }
 
@@ -1501,42 +1811,41 @@
 /// See the [`HashMap::raw_entry`] docs for usage examples.
 ///
 /// [`HashMap::raw_entry`]: struct.HashMap.html#method.raw_entry
-pub struct RawEntryBuilder<'a, K, V, S> {
-    map: &'a HashMap<K, V, S>,
+pub struct RawEntryBuilder<'a, K, V, S, A: Allocator + Clone = Global> {
+    map: &'a HashMap<K, V, S, A>,
 }
 
-impl<'a, K, V, S> RawEntryBuilderMut<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> RawEntryBuilderMut<'a, K, V, S, A> {
     /// Creates a `RawEntryMut` from the given key.
     #[cfg_attr(feature = "inline-more", inline)]
     #[allow(clippy::wrong_self_convention)]
-    pub fn from_key<Q: ?Sized>(self, k: &Q) -> RawEntryMut<'a, K, V, S>
+    pub fn from_key<Q: ?Sized>(self, k: &Q) -> RawEntryMut<'a, K, V, S, A>
     where
         S: BuildHasher,
         K: Borrow<Q>,
         Q: Hash + Eq,
     {
-        let mut hasher = self.map.hash_builder.build_hasher();
-        k.hash(&mut hasher);
-        self.from_key_hashed_nocheck(hasher.finish(), k)
+        let hash = make_hash::<K, Q, S>(&self.map.hash_builder, k);
+        self.from_key_hashed_nocheck(hash, k)
     }
 
     /// Creates a `RawEntryMut` from the given key and its hash.
     #[inline]
     #[allow(clippy::wrong_self_convention)]
-    pub fn from_key_hashed_nocheck<Q: ?Sized>(self, hash: u64, k: &Q) -> RawEntryMut<'a, K, V, S>
+    pub fn from_key_hashed_nocheck<Q: ?Sized>(self, hash: u64, k: &Q) -> RawEntryMut<'a, K, V, S, A>
     where
         K: Borrow<Q>,
         Q: Eq,
     {
-        self.from_hash(hash, |q| q.borrow().eq(k))
+        self.from_hash(hash, equivalent(k))
     }
 }
 
-impl<'a, K, V, S> RawEntryBuilderMut<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> RawEntryBuilderMut<'a, K, V, S, A> {
     /// Creates a `RawEntryMut` from the given hash.
     #[cfg_attr(feature = "inline-more", inline)]
     #[allow(clippy::wrong_self_convention)]
-    pub fn from_hash<F>(self, hash: u64, is_match: F) -> RawEntryMut<'a, K, V, S>
+    pub fn from_hash<F>(self, hash: u64, is_match: F) -> RawEntryMut<'a, K, V, S, A>
     where
         for<'b> F: FnMut(&'b K) -> bool,
     {
@@ -1544,7 +1853,7 @@
     }
 
     #[cfg_attr(feature = "inline-more", inline)]
-    fn search<F>(self, hash: u64, mut is_match: F) -> RawEntryMut<'a, K, V, S>
+    fn search<F>(self, hash: u64, mut is_match: F) -> RawEntryMut<'a, K, V, S, A>
     where
         for<'b> F: FnMut(&'b K) -> bool,
     {
@@ -1562,7 +1871,7 @@
     }
 }
 
-impl<'a, K, V, S> RawEntryBuilder<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> RawEntryBuilder<'a, K, V, S, A> {
     /// Access an entry by key.
     #[cfg_attr(feature = "inline-more", inline)]
     #[allow(clippy::wrong_self_convention)]
@@ -1572,9 +1881,8 @@
         K: Borrow<Q>,
         Q: Hash + Eq,
     {
-        let mut hasher = self.map.hash_builder.build_hasher();
-        k.hash(&mut hasher);
-        self.from_key_hashed_nocheck(hasher.finish(), k)
+        let hash = make_hash::<K, Q, S>(&self.map.hash_builder, k);
+        self.from_key_hashed_nocheck(hash, k)
     }
 
     /// Access an entry by a key and its hash.
@@ -1585,7 +1893,7 @@
         K: Borrow<Q>,
         Q: Eq,
     {
-        self.from_hash(hash, |q| q.borrow().eq(k))
+        self.from_hash(hash, equivalent(k))
     }
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -1610,7 +1918,7 @@
     }
 }
 
-impl<'a, K, V, S> RawEntryMut<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> RawEntryMut<'a, K, V, S, A> {
     /// Sets the value of the entry, and returns a RawOccupiedEntryMut.
     ///
     /// # Examples
@@ -1624,7 +1932,7 @@
     /// assert_eq!(entry.remove_entry(), ("horseyland", 37));
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn insert(self, key: K, value: V) -> RawOccupiedEntryMut<'a, K, V, S>
+    pub fn insert(self, key: K, value: V) -> RawOccupiedEntryMut<'a, K, V, S, A>
     where
         K: Hash,
         S: BuildHasher,
@@ -1804,7 +2112,7 @@
     }
 }
 
-impl<'a, K, V, S> RawOccupiedEntryMut<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> RawOccupiedEntryMut<'a, K, V, S, A> {
     /// Gets a reference to the key in the entry.
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn key(&self) -> &K {
@@ -1899,7 +2207,7 @@
     /// the entry and allows to replace or remove it based on the
     /// value of the returned option.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn replace_entry_with<F>(self, f: F) -> RawEntryMut<'a, K, V, S>
+    pub fn replace_entry_with<F>(self, f: F) -> RawEntryMut<'a, K, V, S, A>
     where
         F: FnOnce(&K, V) -> Option<V>,
     {
@@ -1922,7 +2230,7 @@
     }
 }
 
-impl<'a, K, V, S> RawVacantEntryMut<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> RawVacantEntryMut<'a, K, V, S, A> {
     /// Sets the value of the entry with the VacantEntry's key,
     /// and returns a mutable reference to it.
     #[cfg_attr(feature = "inline-more", inline)]
@@ -1931,9 +2239,8 @@
         K: Hash,
         S: BuildHasher,
     {
-        let mut hasher = self.hash_builder.build_hasher();
-        key.hash(&mut hasher);
-        self.insert_hashed_nocheck(hasher.finish(), key, value)
+        let hash = make_insert_hash::<K, S>(self.hash_builder, &key);
+        self.insert_hashed_nocheck(hash, key, value)
     }
 
     /// Sets the value of the entry with the VacantEntry's key,
@@ -1945,8 +2252,12 @@
         K: Hash,
         S: BuildHasher,
     {
-        let hash_builder = self.hash_builder;
-        self.insert_with_hasher(hash, key, value, |k| make_hash(hash_builder, k))
+        let &mut (ref mut k, ref mut v) = self.table.insert_entry(
+            hash,
+            (key, value),
+            make_hasher::<K, _, V, S>(self.hash_builder),
+        );
+        (k, v)
     }
 
     /// Set the value of an entry with a custom hasher function.
@@ -1968,18 +2279,17 @@
     }
 
     #[cfg_attr(feature = "inline-more", inline)]
-    fn insert_entry(self, key: K, value: V) -> RawOccupiedEntryMut<'a, K, V, S>
+    fn insert_entry(self, key: K, value: V) -> RawOccupiedEntryMut<'a, K, V, S, A>
     where
         K: Hash,
         S: BuildHasher,
     {
-        let hash_builder = self.hash_builder;
-        let mut hasher = self.hash_builder.build_hasher();
-        key.hash(&mut hasher);
-
-        let elem = self.table.insert(hasher.finish(), (key, value), |k| {
-            make_hash(hash_builder, &k.0)
-        });
+        let hash = make_insert_hash::<K, S>(self.hash_builder, &key);
+        let elem = self.table.insert(
+            hash,
+            (key, value),
+            make_hasher::<K, _, V, S>(self.hash_builder),
+        );
         RawOccupiedEntryMut {
             elem,
             table: self.table,
@@ -1988,13 +2298,13 @@
     }
 }
 
-impl<K, V, S> Debug for RawEntryBuilderMut<'_, K, V, S> {
+impl<K, V, S, A: Allocator + Clone> Debug for RawEntryBuilderMut<'_, K, V, S, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("RawEntryBuilder").finish()
     }
 }
 
-impl<K: Debug, V: Debug, S> Debug for RawEntryMut<'_, K, V, S> {
+impl<K: Debug, V: Debug, S, A: Allocator + Clone> Debug for RawEntryMut<'_, K, V, S, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             RawEntryMut::Vacant(ref v) => f.debug_tuple("RawEntry").field(v).finish(),
@@ -2003,7 +2313,7 @@
     }
 }
 
-impl<K: Debug, V: Debug, S> Debug for RawOccupiedEntryMut<'_, K, V, S> {
+impl<K: Debug, V: Debug, S, A: Allocator + Clone> Debug for RawOccupiedEntryMut<'_, K, V, S, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("RawOccupiedEntryMut")
             .field("key", self.key())
@@ -2012,13 +2322,13 @@
     }
 }
 
-impl<K, V, S> Debug for RawVacantEntryMut<'_, K, V, S> {
+impl<K, V, S, A: Allocator + Clone> Debug for RawVacantEntryMut<'_, K, V, S, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("RawVacantEntryMut").finish()
     }
 }
 
-impl<K, V, S> Debug for RawEntryBuilder<'_, K, V, S> {
+impl<K, V, S, A: Allocator + Clone> Debug for RawEntryBuilder<'_, K, V, S, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("RawEntryBuilder").finish()
     }
@@ -2030,15 +2340,18 @@
 ///
 /// [`HashMap`]: struct.HashMap.html
 /// [`entry`]: struct.HashMap.html#method.entry
-pub enum Entry<'a, K, V, S> {
+pub enum Entry<'a, K, V, S, A = Global>
+where
+    A: Allocator + Clone,
+{
     /// An occupied entry.
-    Occupied(OccupiedEntry<'a, K, V, S>),
+    Occupied(OccupiedEntry<'a, K, V, S, A>),
 
     /// A vacant entry.
-    Vacant(VacantEntry<'a, K, V, S>),
+    Vacant(VacantEntry<'a, K, V, S, A>),
 }
 
-impl<K: Debug, V: Debug, S> Debug for Entry<'_, K, V, S> {
+impl<K: Debug, V: Debug, S, A: Allocator + Clone> Debug for Entry<'_, K, V, S, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             Entry::Vacant(ref v) => f.debug_tuple("Entry").field(v).finish(),
@@ -2051,29 +2364,31 @@
 /// It is part of the [`Entry`] enum.
 ///
 /// [`Entry`]: enum.Entry.html
-pub struct OccupiedEntry<'a, K, V, S> {
+pub struct OccupiedEntry<'a, K, V, S, A: Allocator + Clone = Global> {
     hash: u64,
     key: Option<K>,
     elem: Bucket<(K, V)>,
-    table: &'a mut HashMap<K, V, S>,
+    table: &'a mut HashMap<K, V, S, A>,
 }
 
-unsafe impl<K, V, S> Send for OccupiedEntry<'_, K, V, S>
+unsafe impl<K, V, S, A> Send for OccupiedEntry<'_, K, V, S, A>
 where
     K: Send,
     V: Send,
     S: Send,
+    A: Send + Allocator + Clone,
 {
 }
-unsafe impl<K, V, S> Sync for OccupiedEntry<'_, K, V, S>
+unsafe impl<K, V, S, A> Sync for OccupiedEntry<'_, K, V, S, A>
 where
     K: Sync,
     V: Sync,
     S: Sync,
+    A: Sync + Allocator + Clone,
 {
 }
 
-impl<K: Debug, V: Debug, S> Debug for OccupiedEntry<'_, K, V, S> {
+impl<K: Debug, V: Debug, S, A: Allocator + Clone> Debug for OccupiedEntry<'_, K, V, S, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("OccupiedEntry")
             .field("key", self.key())
@@ -2086,19 +2401,53 @@
 /// It is part of the [`Entry`] enum.
 ///
 /// [`Entry`]: enum.Entry.html
-pub struct VacantEntry<'a, K, V, S> {
+pub struct VacantEntry<'a, K, V, S, A: Allocator + Clone = Global> {
     hash: u64,
     key: K,
-    table: &'a mut HashMap<K, V, S>,
+    table: &'a mut HashMap<K, V, S, A>,
 }
 
-impl<K: Debug, V, S> Debug for VacantEntry<'_, K, V, S> {
+impl<K: Debug, V, S, A: Allocator + Clone> Debug for VacantEntry<'_, K, V, S, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_tuple("VacantEntry").field(self.key()).finish()
     }
 }
 
-impl<'a, K, V, S> IntoIterator for &'a HashMap<K, V, S> {
+/// The error returned by [`try_insert`](HashMap::try_insert) when the key already exists.
+///
+/// Contains the occupied entry, and the value that was not inserted.
+pub struct OccupiedError<'a, K, V, S, A: Allocator + Clone = Global> {
+    /// The entry in the map that was already occupied.
+    pub entry: OccupiedEntry<'a, K, V, S, A>,
+    /// The value which was not inserted, because the entry was already occupied.
+    pub value: V,
+}
+
+impl<K: Debug, V: Debug, S, A: Allocator + Clone> Debug for OccupiedError<'_, K, V, S, A> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("OccupiedError")
+            .field("key", self.entry.key())
+            .field("old_value", self.entry.get())
+            .field("new_value", &self.value)
+            .finish()
+    }
+}
+
+impl<'a, K: Debug, V: Debug, S, A: Allocator + Clone> fmt::Display
+    for OccupiedError<'a, K, V, S, A>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "failed to insert {:?}, key {:?} already exists with value {:?}",
+            self.value,
+            self.entry.key(),
+            self.entry.get(),
+        )
+    }
+}
+
+impl<'a, K, V, S, A: Allocator + Clone> IntoIterator for &'a HashMap<K, V, S, A> {
     type Item = (&'a K, &'a V);
     type IntoIter = Iter<'a, K, V>;
 
@@ -2108,7 +2457,7 @@
     }
 }
 
-impl<'a, K, V, S> IntoIterator for &'a mut HashMap<K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> IntoIterator for &'a mut HashMap<K, V, S, A> {
     type Item = (&'a K, &'a mut V);
     type IntoIter = IterMut<'a, K, V>;
 
@@ -2118,9 +2467,9 @@
     }
 }
 
-impl<K, V, S> IntoIterator for HashMap<K, V, S> {
+impl<K, V, S, A: Allocator + Clone> IntoIterator for HashMap<K, V, S, A> {
     type Item = (K, V);
-    type IntoIter = IntoIter<K, V>;
+    type IntoIter = IntoIter<K, V, A>;
 
     /// Creates a consuming iterator, that is, one that moves each key-value
     /// pair out of the map in arbitrary order. The map cannot be used after
@@ -2140,7 +2489,7 @@
     /// let vec: Vec<(&str, i32)> = map.into_iter().collect();
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    fn into_iter(self) -> IntoIter<K, V> {
+    fn into_iter(self) -> IntoIter<K, V, A> {
         IntoIter {
             inner: self.table.into_iter(),
         }
@@ -2212,7 +2561,7 @@
     }
 }
 
-impl<K, V> Iterator for IntoIter<K, V> {
+impl<K, V, A: Allocator + Clone> Iterator for IntoIter<K, V, A> {
     type Item = (K, V);
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -2224,15 +2573,15 @@
         self.inner.size_hint()
     }
 }
-impl<K, V> ExactSizeIterator for IntoIter<K, V> {
+impl<K, V, A: Allocator + Clone> ExactSizeIterator for IntoIter<K, V, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn len(&self) -> usize {
         self.inner.len()
     }
 }
-impl<K, V> FusedIterator for IntoIter<K, V> {}
+impl<K, V, A: Allocator + Clone> FusedIterator for IntoIter<K, V, A> {}
 
-impl<K: Debug, V: Debug> fmt::Debug for IntoIter<K, V> {
+impl<K: Debug, V: Debug, A: Allocator + Clone> fmt::Debug for IntoIter<K, V, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_list().entries(self.iter()).finish()
     }
@@ -2320,7 +2669,7 @@
     }
 }
 
-impl<'a, K, V> Iterator for Drain<'a, K, V> {
+impl<'a, K, V, A: Allocator + Clone> Iterator for Drain<'a, K, V, A> {
     type Item = (K, V);
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -2332,25 +2681,26 @@
         self.inner.size_hint()
     }
 }
-impl<K, V> ExactSizeIterator for Drain<'_, K, V> {
+impl<K, V, A: Allocator + Clone> ExactSizeIterator for Drain<'_, K, V, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn len(&self) -> usize {
         self.inner.len()
     }
 }
-impl<K, V> FusedIterator for Drain<'_, K, V> {}
+impl<K, V, A: Allocator + Clone> FusedIterator for Drain<'_, K, V, A> {}
 
-impl<K, V> fmt::Debug for Drain<'_, K, V>
+impl<K, V, A> fmt::Debug for Drain<'_, K, V, A>
 where
     K: fmt::Debug,
     V: fmt::Debug,
+    A: Allocator + Clone,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_list().entries(self.iter()).finish()
     }
 }
 
-impl<'a, K, V, S> Entry<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> Entry<'a, K, V, S, A> {
     /// Sets the value of the entry, and returns an OccupiedEntry.
     ///
     /// # Examples
@@ -2364,7 +2714,7 @@
     /// assert_eq!(entry.key(), &"horseyland");
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn insert(self, value: V) -> OccupiedEntry<'a, K, V, S>
+    pub fn insert(self, value: V) -> OccupiedEntry<'a, K, V, S, A>
     where
         K: Hash,
         S: BuildHasher,
@@ -2433,9 +2783,12 @@
         }
     }
 
-    /// Ensures a value is in the entry by inserting, if empty, the result of the default function,
-    /// which takes the key as its argument, and returns a mutable reference to the value in the
-    /// entry.
+    /// Ensures a value is in the entry by inserting, if empty, the result of the default function.
+    /// This method allows for generating key-derived values for insertion by providing the default
+    /// function a reference to the key that was moved during the `.entry(key)` method call.
+    ///
+    /// The reference to the moved key is provided so that cloning or copying the key is
+    /// unnecessary, unlike with `.or_insert_with(|| ... )`.
     ///
     /// # Examples
     ///
@@ -2581,7 +2934,7 @@
     }
 }
 
-impl<'a, K, V: Default, S> Entry<'a, K, V, S> {
+impl<'a, K, V: Default, S, A: Allocator + Clone> Entry<'a, K, V, S, A> {
     /// Ensures a value is in the entry by inserting the default value if empty,
     /// and returns a mutable reference to the value in the entry.
     ///
@@ -2608,7 +2961,7 @@
     }
 }
 
-impl<'a, K, V, S> OccupiedEntry<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> OccupiedEntry<'a, K, V, S, A> {
     /// Gets a reference to the key in the entry.
     ///
     /// # Examples
@@ -2777,6 +3130,10 @@
     /// Replaces the entry, returning the old key and value. The new key in the hash map will be
     /// the key used to create this entry.
     ///
+    /// # Panics
+    ///
+    /// Will panic if this OccupiedEntry was created through [`Entry::insert`].
+    ///
     /// # Examples
     ///
     /// ```
@@ -2806,6 +3163,10 @@
 
     /// Replaces the key in the hash map with the key used to create this entry.
     ///
+    /// # Panics
+    ///
+    /// Will panic if this OccupiedEntry was created through [`Entry::insert`].
+    ///
     /// # Examples
     ///
     /// ```
@@ -2883,7 +3244,7 @@
     /// assert!(!map.contains_key("poneyland"));
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn replace_entry_with<F>(self, f: F) -> Entry<'a, K, V, S>
+    pub fn replace_entry_with<F>(self, f: F) -> Entry<'a, K, V, S, A>
     where
         F: FnOnce(&K, V) -> Option<V>,
     {
@@ -2914,7 +3275,7 @@
     }
 }
 
-impl<'a, K, V, S> VacantEntry<'a, K, V, S> {
+impl<'a, K, V, S, A: Allocator + Clone> VacantEntry<'a, K, V, S, A> {
     /// Gets a reference to the key that would be used when inserting a value
     /// through the `VacantEntry`.
     ///
@@ -2972,24 +3333,26 @@
         K: Hash,
         S: BuildHasher,
     {
-        let hash_builder = &self.table.hash_builder;
         let table = &mut self.table.table;
-        let entry = table.insert_entry(self.hash, (self.key, value), |x| {
-            make_hash(hash_builder, &x.0)
-        });
+        let entry = table.insert_entry(
+            self.hash,
+            (self.key, value),
+            make_hasher::<K, _, V, S>(&self.table.hash_builder),
+        );
         &mut entry.1
     }
 
     #[cfg_attr(feature = "inline-more", inline)]
-    fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V, S>
+    fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V, S, A>
     where
         K: Hash,
         S: BuildHasher,
     {
-        let hash_builder = &self.table.hash_builder;
-        let elem = self.table.table.insert(self.hash, (self.key, value), |x| {
-            make_hash(hash_builder, &x.0)
-        });
+        let elem = self.table.table.insert(
+            self.hash,
+            (self.key, value),
+            make_hasher::<K, _, V, S>(&self.table.hash_builder),
+        );
         OccupiedEntry {
             hash: self.hash,
             key: None,
@@ -2999,15 +3362,17 @@
     }
 }
 
-impl<K, V, S> FromIterator<(K, V)> for HashMap<K, V, S>
+impl<K, V, S, A> FromIterator<(K, V)> for HashMap<K, V, S, A>
 where
     K: Eq + Hash,
     S: BuildHasher + Default,
+    A: Default + Allocator + Clone,
 {
     #[cfg_attr(feature = "inline-more", inline)]
     fn from_iter<T: IntoIterator<Item = (K, V)>>(iter: T) -> Self {
         let iter = iter.into_iter();
-        let mut map = Self::with_capacity_and_hasher(iter.size_hint().0, S::default());
+        let mut map =
+            Self::with_capacity_and_hasher_in(iter.size_hint().0, S::default(), A::default());
         iter.for_each(|(k, v)| {
             map.insert(k, v);
         });
@@ -3017,10 +3382,11 @@
 
 /// Inserts all new key-values from the iterator and replaces values with existing
 /// keys with new values returned from the iterator.
-impl<K, V, S> Extend<(K, V)> for HashMap<K, V, S>
+impl<K, V, S, A> Extend<(K, V)> for HashMap<K, V, S, A>
 where
     K: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     #[cfg_attr(feature = "inline-more", inline)]
     fn extend<T: IntoIterator<Item = (K, V)>>(&mut self, iter: T) {
@@ -3062,11 +3428,12 @@
     }
 }
 
-impl<'a, K, V, S> Extend<(&'a K, &'a V)> for HashMap<K, V, S>
+impl<'a, K, V, S, A> Extend<(&'a K, &'a V)> for HashMap<K, V, S, A>
 where
     K: Eq + Hash + Copy,
     V: Copy,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     #[cfg_attr(feature = "inline-more", inline)]
     fn extend<T: IntoIterator<Item = (&'a K, &'a V)>>(&mut self, iter: T) {
@@ -3100,10 +3467,14 @@
     fn iter_val<'a, 'new>(v: Iter<'a, u8, &'static str>) -> Iter<'a, u8, &'new str> {
         v
     }
-    fn into_iter_key<'new>(v: IntoIter<&'static str, u8>) -> IntoIter<&'new str, u8> {
+    fn into_iter_key<'new, A: Allocator + Clone>(
+        v: IntoIter<&'static str, u8, A>,
+    ) -> IntoIter<&'new str, u8, A> {
         v
     }
-    fn into_iter_val<'new>(v: IntoIter<u8, &'static str>) -> IntoIter<u8, &'new str> {
+    fn into_iter_val<'new, A: Allocator + Clone>(
+        v: IntoIter<u8, &'static str, A>,
+    ) -> IntoIter<u8, &'new str, A> {
         v
     }
     fn keys_key<'a, 'new>(v: Keys<'a, &'static str, u8>) -> Keys<'a, &'new str, u8> {
@@ -3132,6 +3503,7 @@
     use super::{HashMap, RawEntryMut};
     use crate::TryReserveError::*;
     use rand::{rngs::SmallRng, Rng, SeedableRng};
+    use std::borrow::ToOwned;
     use std::cell::RefCell;
     use std::usize;
     use std::vec::Vec;
@@ -4287,11 +4659,7 @@
         let mut map: HashMap<_, _> = xs.iter().cloned().collect();
 
         let compute_hash = |map: &HashMap<i32, i32>, k: i32| -> u64 {
-            use core::hash::{BuildHasher, Hash, Hasher};
-
-            let mut hasher = map.hasher().build_hasher();
-            k.hash(&mut hasher);
-            hasher.finish()
+            super::make_insert_hash::<i32, _>(map.hasher(), &k)
         };
 
         // Existing key (insert)
@@ -4468,9 +4836,11 @@
                             left -= 1;
                         } else {
                             assert!(removed.contains(&(i, 2 * i)), "{} not in {:?}", i, removed);
-                            let e = m
-                                .table
-                                .insert(hash, (i, 2 * i), |x| super::make_hash(&hasher, &x.0));
+                            let e = m.table.insert(
+                                hash,
+                                (i, 2 * i),
+                                super::make_hasher::<usize, _, usize, _>(&hasher),
+                            );
                             it.reflect_insert(&e);
                             if let Some(p) = removed.iter().position(|e| e == &(i, 2 * i)) {
                                 removed.swap_remove(p);
@@ -4501,7 +4871,6 @@
     #[test]
     fn test_const_with_hasher() {
         use core::hash::BuildHasher;
-        use std::borrow::ToOwned;
         use std::collections::hash_map::DefaultHasher;
 
         #[derive(Clone)]
@@ -4521,4 +4890,33 @@
         map.insert(17, "seventeen".to_owned());
         assert_eq!("seventeen", map[&17]);
     }
+
+    #[test]
+    #[cfg(feature = "nightly")]
+    fn test_get_each_mut() {
+        use crate::UnavailableMutError::*;
+
+        let mut map = HashMap::new();
+        map.insert("foo".to_owned(), 0);
+        map.insert("bar".to_owned(), 10);
+        map.insert("baz".to_owned(), 20);
+        map.insert("qux".to_owned(), 30);
+
+        let xs = map.get_each_mut(["foo", "dud", "foo", "qux"]);
+        assert_eq!(
+            xs,
+            [Ok(&mut 0), Err(Absent), Err(Duplicate(0)), Ok(&mut 30)]
+        );
+
+        let ys = map.get_each_key_value_mut(["bar", "baz", "baz", "dip"]);
+        assert_eq!(
+            ys,
+            [
+                Ok((&"bar".to_owned(), &mut 10)),
+                Ok((&"baz".to_owned(), &mut 20)),
+                Err(Duplicate(1)),
+                Err(Absent),
+            ]
+        );
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/raw/alloc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/raw/alloc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/raw/alloc.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/raw/alloc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,72 @@
+pub(crate) use self::inner::{do_alloc, Allocator, Global};
+
+#[cfg(feature = "nightly")]
+mod inner {
+    use crate::alloc::alloc::Layout;
+    pub use crate::alloc::alloc::{Allocator, Global};
+    use core::ptr::NonNull;
+
+    #[allow(clippy::map_err_ignore)]
+    pub fn do_alloc<A: Allocator>(alloc: &A, layout: Layout) -> Result<NonNull<u8>, ()> {
+        alloc
+            .allocate(layout)
+            .map(|ptr| ptr.as_non_null_ptr())
+            .map_err(|_| ())
+    }
+
+    #[cfg(feature = "bumpalo")]
+    unsafe impl Allocator for crate::BumpWrapper<'_> {
+        #[inline]
+        fn allocate(&self, layout: Layout) -> Result<NonNull<[u8]>, core::alloc::AllocError> {
+            match self.0.try_alloc_layout(layout) {
+                Ok(ptr) => Ok(NonNull::slice_from_raw_parts(ptr, layout.size())),
+                Err(_) => Err(core::alloc::AllocError),
+            }
+        }
+        #[inline]
+        unsafe fn deallocate(&self, _ptr: NonNull<u8>, _layout: Layout) {}
+    }
+}
+
+#[cfg(not(feature = "nightly"))]
+mod inner {
+    use crate::alloc::alloc::{alloc, dealloc, Layout};
+    use core::ptr::NonNull;
+
+    pub unsafe trait Allocator {
+        fn allocate(&self, layout: Layout) -> Result<NonNull<u8>, ()>;
+        unsafe fn deallocate(&self, ptr: NonNull<u8>, layout: Layout);
+    }
+
+    #[derive(Copy, Clone)]
+    pub struct Global;
+    unsafe impl Allocator for Global {
+        #[inline]
+        fn allocate(&self, layout: Layout) -> Result<NonNull<u8>, ()> {
+            unsafe { NonNull::new(alloc(layout)).ok_or(()) }
+        }
+        #[inline]
+        unsafe fn deallocate(&self, ptr: NonNull<u8>, layout: Layout) {
+            dealloc(ptr.as_ptr(), layout)
+        }
+    }
+    impl Default for Global {
+        #[inline]
+        fn default() -> Self {
+            Global
+        }
+    }
+
+    pub fn do_alloc<A: Allocator>(alloc: &A, layout: Layout) -> Result<NonNull<u8>, ()> {
+        alloc.allocate(layout)
+    }
+
+    #[cfg(feature = "bumpalo")]
+    unsafe impl Allocator for crate::BumpWrapper<'_> {
+        #[allow(clippy::map_err_ignore)]
+        fn allocate(&self, layout: Layout) -> Result<NonNull<u8>, ()> {
+            self.0.try_alloc_layout(layout).map_err(|_| ())
+        }
+        unsafe fn deallocate(&self, _ptr: NonNull<u8>, _layout: Layout) {}
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/raw/generic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/raw/generic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/raw/generic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/raw/generic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -55,7 +55,7 @@
         struct AlignedBytes {
             _align: [Group; 0],
             bytes: [u8; Group::WIDTH],
-        };
+        }
         const ALIGNED_BYTES: AlignedBytes = AlignedBytes {
             _align: [],
             bytes: [EMPTY; Group::WIDTH],
@@ -67,7 +67,7 @@
     #[inline]
     #[allow(clippy::cast_ptr_alignment)] // unaligned load
     pub unsafe fn load(ptr: *const u8) -> Self {
-        Group(ptr::read_unaligned(ptr as *const _))
+        Group(ptr::read_unaligned(ptr.cast()))
     }
 
     /// Loads a group of bytes starting at the given address, which must be
@@ -77,7 +77,7 @@
     pub unsafe fn load_aligned(ptr: *const u8) -> Self {
         // FIXME: use align_offset once it stabilizes
         debug_assert_eq!(ptr as usize & (mem::align_of::<Self>() - 1), 0);
-        Group(ptr::read(ptr as *const _))
+        Group(ptr::read(ptr.cast()))
     }
 
     /// Stores the group of bytes to the given address, which must be
@@ -87,7 +87,7 @@
     pub unsafe fn store_aligned(self, ptr: *mut u8) {
         // FIXME: use align_offset once it stabilizes
         debug_assert_eq!(ptr as usize & (mem::align_of::<Self>() - 1), 0);
-        ptr::write(ptr as *mut _, self.0);
+        ptr::write(ptr.cast(), self.0);
     }
 
     /// Returns a `BitMask` indicating all bytes in the group which *may*
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/raw/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/raw/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/raw/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/raw/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,15 @@
-use crate::alloc::alloc::{alloc, dealloc, handle_alloc_error};
+use crate::alloc::alloc::{handle_alloc_error, Layout};
 use crate::scopeguard::guard;
 use crate::TryReserveError;
-use core::alloc::Layout;
+#[cfg(feature = "nightly")]
+use crate::UnavailableMutError;
 use core::hint;
 use core::iter::FusedIterator;
 use core::marker::PhantomData;
 use core::mem;
 use core::mem::ManuallyDrop;
+#[cfg(feature = "nightly")]
+use core::mem::MaybeUninit;
 use core::ptr::NonNull;
 
 cfg_if! {
@@ -32,6 +35,9 @@
     }
 }
 
+mod alloc;
+pub(crate) use self::alloc::{do_alloc, Allocator, Global};
+
 mod bitmask;
 
 use self::bitmask::{BitMask, BitMaskIter};
@@ -41,14 +47,28 @@
 // consistently improves performance by 10-15%.
 #[cfg(feature = "nightly")]
 use core::intrinsics::{likely, unlikely};
+
+// On stable we can use #[cold] to get a equivalent effect: this attributes
+// suggests that the function is unlikely to be called
+#[cfg(not(feature = "nightly"))]
+#[inline]
+#[cold]
+fn cold() {}
+
 #[cfg(not(feature = "nightly"))]
 #[inline]
 fn likely(b: bool) -> bool {
+    if !b {
+        cold()
+    }
     b
 }
 #[cfg(not(feature = "nightly"))]
 #[inline]
 fn unlikely(b: bool) -> bool {
+    if b {
+        cold()
+    }
     b
 }
 
@@ -145,27 +165,22 @@
 /// Proof that the probe will visit every group in the table:
 /// <https://fgiesen.wordpress.com/2015/02/22/triangular-numbers-mod-2n/>
 struct ProbeSeq {
-    bucket_mask: usize,
     pos: usize,
     stride: usize,
 }
 
-impl Iterator for ProbeSeq {
-    type Item = usize;
-
+impl ProbeSeq {
     #[inline]
-    fn next(&mut self) -> Option<usize> {
+    fn move_next(&mut self, bucket_mask: usize) {
         // We should have found an empty bucket by now and ended the probe.
         debug_assert!(
-            self.stride <= self.bucket_mask,
+            self.stride <= bucket_mask,
             "Went past end of probe sequence"
         );
 
-        let result = self.pos;
         self.stride += Group::WIDTH;
         self.pos += self.stride;
-        self.pos &= self.bucket_mask;
-        Some(result)
+        self.pos &= bucket_mask;
     }
 }
 
@@ -214,30 +229,39 @@
     }
 }
 
-/// Returns a Layout which describes the allocation required for a hash table,
-/// and the offset of the control bytes in the allocation.
-/// (the offset is also one past last element of buckets)
-///
-/// Returns `None` if an overflow occurs.
-#[cfg_attr(feature = "inline-more", inline)]
-#[cfg(feature = "nightly")]
-fn calculate_layout<T>(buckets: usize) -> Option<(Layout, usize)> {
-    debug_assert!(buckets.is_power_of_two());
+/// Helper which allows the max calculation for ctrl_align to be statically computed for each T
+/// while keeping the rest of `calculate_layout_for` independent of `T`
+#[derive(Copy, Clone)]
+struct TableLayout {
+    size: usize,
+    ctrl_align: usize,
+}
 
-    // Array of buckets
-    let data = Layout::array::<T>(buckets).ok()?;
+impl TableLayout {
+    #[inline]
+    fn new<T>() -> Self {
+        let layout = Layout::new::<T>();
+        Self {
+            size: layout.size(),
+            ctrl_align: usize::max(layout.align(), Group::WIDTH),
+        }
+    }
 
-    // Array of control bytes. This must be aligned to the group size.
-    //
-    // We add `Group::WIDTH` control bytes at the end of the array which
-    // replicate the bytes at the start of the array and thus avoids the need to
-    // perform bounds-checking while probing.
-    //
-    // There is no possible overflow here since buckets is a power of two and
-    // Group::WIDTH is a small number.
-    let ctrl = unsafe { Layout::from_size_align_unchecked(buckets + Group::WIDTH, Group::WIDTH) };
+    #[inline]
+    fn calculate_layout_for(self, buckets: usize) -> Option<(Layout, usize)> {
+        debug_assert!(buckets.is_power_of_two());
 
-    data.extend(ctrl).ok()
+        let TableLayout { size, ctrl_align } = self;
+        // Manual layout calculation since Layout methods are not yet stable.
+        let ctrl_offset =
+            size.checked_mul(buckets)?.checked_add(ctrl_align - 1)? & !(ctrl_align - 1);
+        let len = ctrl_offset.checked_add(buckets + Group::WIDTH)?;
+
+        Some((
+            unsafe { Layout::from_size_align_unchecked(len, ctrl_align) },
+            ctrl_offset,
+        ))
+    }
 }
 
 /// Returns a Layout which describes the allocation required for a hash table,
@@ -246,22 +270,8 @@
 ///
 /// Returns `None` if an overflow occurs.
 #[cfg_attr(feature = "inline-more", inline)]
-#[cfg(not(feature = "nightly"))]
 fn calculate_layout<T>(buckets: usize) -> Option<(Layout, usize)> {
-    debug_assert!(buckets.is_power_of_two());
-
-    // Manual layout calculation since Layout methods are not yet stable.
-    let ctrl_align = usize::max(mem::align_of::<T>(), Group::WIDTH);
-    let ctrl_offset = mem::size_of::<T>()
-        .checked_mul(buckets)?
-        .checked_add(ctrl_align - 1)?
-        & !(ctrl_align - 1);
-    let len = ctrl_offset.checked_add(buckets + Group::WIDTH)?;
-
-    Some((
-        unsafe { Layout::from_size_align_unchecked(len, ctrl_align) },
-        ctrl_offset,
-    ))
+    TableLayout::new::<T>().calculate_layout_for(buckets)
 }
 
 /// A reference to a hash table bucket containing a `T`.
@@ -310,12 +320,12 @@
         }
     }
     #[cfg_attr(feature = "inline-more", inline)]
-    pub unsafe fn as_ptr(&self) -> *mut T {
+    pub fn as_ptr(&self) -> *mut T {
         if mem::size_of::<T>() == 0 {
             // Just return an arbitrary ZST pointer which is properly aligned
             mem::align_of::<T>() as *mut T
         } else {
-            self.ptr.as_ptr().sub(1)
+            unsafe { self.ptr.as_ptr().sub(1) }
         }
     }
     #[cfg_attr(feature = "inline-more", inline)]
@@ -356,7 +366,15 @@
 }
 
 /// A raw hash table with an unsafe API.
-pub struct RawTable<T> {
+pub struct RawTable<T, A: Allocator + Clone = Global> {
+    table: RawTableInner<A>,
+    // Tell dropck that we own instances of T.
+    marker: PhantomData<T>,
+}
+
+/// Non-generic part of `RawTable` which allows functions to be instantiated only once regardless
+/// of how many different key-value types are used.
+struct RawTableInner<A> {
     // Mask to get an index from a hash value. The value is one less than the
     // number of buckets in the table.
     bucket_mask: usize,
@@ -371,11 +389,10 @@
     // Number of elements in the table, only really used by len()
     items: usize,
 
-    // Tell dropck that we own instances of T.
-    marker: PhantomData<T>,
+    alloc: A,
 }
 
-impl<T> RawTable<T> {
+impl<T> RawTable<T, Global> {
     /// Creates a new empty hash table without allocating any memory.
     ///
     /// In effect this returns a table with exactly 1 bucket. However we can
@@ -384,11 +401,36 @@
     #[cfg_attr(feature = "inline-more", inline)]
     pub const fn new() -> Self {
         Self {
-            // Be careful to cast the entire slice to a raw pointer.
-            ctrl: unsafe { NonNull::new_unchecked(Group::static_empty() as *const _ as *mut u8) },
-            bucket_mask: 0,
-            items: 0,
-            growth_left: 0,
+            table: RawTableInner::new_in(Global),
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to allocate a new hash table with at least enough capacity
+    /// for inserting the given number of elements without reallocating.
+    #[cfg(feature = "raw")]
+    pub fn try_with_capacity(capacity: usize) -> Result<Self, TryReserveError> {
+        Self::try_with_capacity_in(capacity, Global)
+    }
+
+    /// Allocates a new hash table with at least enough capacity for inserting
+    /// the given number of elements without reallocating.
+    pub fn with_capacity(capacity: usize) -> Self {
+        Self::with_capacity_in(capacity, Global)
+    }
+}
+
+impl<T, A: Allocator + Clone> RawTable<T, A> {
+    /// Creates a new empty hash table without allocating any memory, using the
+    /// given allocator.
+    ///
+    /// In effect this returns a table with exactly 1 bucket. However we can
+    /// leave the data pointer dangling since that bucket is never written to
+    /// due to our load factor forcing us to always have at least 1 free bucket.
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn new_in(alloc: A) -> Self {
+        Self {
+            table: RawTableInner::new_in(alloc),
             marker: PhantomData,
         }
     }
@@ -398,26 +440,19 @@
     /// The control bytes are left uninitialized.
     #[cfg_attr(feature = "inline-more", inline)]
     unsafe fn new_uninitialized(
+        alloc: A,
         buckets: usize,
-        fallability: Fallibility,
+        fallibility: Fallibility,
     ) -> Result<Self, TryReserveError> {
         debug_assert!(buckets.is_power_of_two());
 
-        // Avoid `Option::ok_or_else` because it bloats LLVM IR.
-        let (layout, ctrl_offset) = match calculate_layout::<T>(buckets) {
-            Some(lco) => lco,
-            None => return Err(fallability.capacity_overflow()),
-        };
-        let ptr = match NonNull::new(alloc(layout)) {
-            Some(ptr) => ptr,
-            None => return Err(fallability.alloc_err(layout)),
-        };
-        let ctrl = NonNull::new_unchecked(ptr.as_ptr().add(ctrl_offset));
         Ok(Self {
-            ctrl,
-            bucket_mask: buckets - 1,
-            items: 0,
-            growth_left: bucket_mask_to_capacity(buckets - 1),
+            table: RawTableInner::new_uninitialized(
+                alloc,
+                TableLayout::new::<T>(),
+                buckets,
+                fallibility,
+            )?,
             marker: PhantomData,
         })
     }
@@ -425,38 +460,33 @@
     /// Attempts to allocate a new hash table with at least enough capacity
     /// for inserting the given number of elements without reallocating.
     fn fallible_with_capacity(
+        alloc: A,
         capacity: usize,
-        fallability: Fallibility,
+        fallibility: Fallibility,
     ) -> Result<Self, TryReserveError> {
-        if capacity == 0 {
-            Ok(Self::new())
-        } else {
-            unsafe {
-                // Avoid `Option::ok_or_else` because it bloats LLVM IR.
-                let buckets = match capacity_to_buckets(capacity) {
-                    Some(buckets) => buckets,
-                    None => return Err(fallability.capacity_overflow()),
-                };
-                let result = Self::new_uninitialized(buckets, fallability)?;
-                result.ctrl(0).write_bytes(EMPTY, result.num_ctrl_bytes());
-
-                Ok(result)
-            }
-        }
+        Ok(Self {
+            table: RawTableInner::fallible_with_capacity(
+                alloc,
+                TableLayout::new::<T>(),
+                capacity,
+                fallibility,
+            )?,
+            marker: PhantomData,
+        })
     }
 
-    /// Attempts to allocate a new hash table with at least enough capacity
-    /// for inserting the given number of elements without reallocating.
+    /// Attempts to allocate a new hash table using the given allocator, with at least enough
+    /// capacity for inserting the given number of elements without reallocating.
     #[cfg(feature = "raw")]
-    pub fn try_with_capacity(capacity: usize) -> Result<Self, TryReserveError> {
-        Self::fallible_with_capacity(capacity, Fallibility::Fallible)
+    pub fn try_with_capacity_in(capacity: usize, alloc: A) -> Result<Self, TryReserveError> {
+        Self::fallible_with_capacity(alloc, capacity, Fallibility::Fallible)
     }
 
-    /// Allocates a new hash table with at least enough capacity for inserting
-    /// the given number of elements without reallocating.
-    pub fn with_capacity(capacity: usize) -> Self {
+    /// Allocates a new hash table using the given allocator, with at least enough capacity for
+    /// inserting the given number of elements without reallocating.
+    pub fn with_capacity_in(capacity: usize, alloc: A) -> Self {
         // Avoid `Result::unwrap_or_else` because it bloats LLVM IR.
-        match Self::fallible_with_capacity(capacity, Fallibility::Infallible) {
+        match Self::fallible_with_capacity(alloc, capacity, Fallibility::Infallible) {
             Ok(capacity) => capacity,
             Err(_) => unsafe { hint::unreachable_unchecked() },
         }
@@ -465,18 +495,13 @@
     /// Deallocates the table without dropping any entries.
     #[cfg_attr(feature = "inline-more", inline)]
     unsafe fn free_buckets(&mut self) {
-        // Avoid `Option::unwrap_or_else` because it bloats LLVM IR.
-        let (layout, ctrl_offset) = match calculate_layout::<T>(self.buckets()) {
-            Some(lco) => lco,
-            None => hint::unreachable_unchecked(),
-        };
-        dealloc(self.ctrl.as_ptr().sub(ctrl_offset), layout);
+        self.table.free_buckets(TableLayout::new::<T>())
     }
 
     /// Returns pointer to one past last element of data table.
     #[cfg_attr(feature = "inline-more", inline)]
     pub unsafe fn data_end(&self) -> NonNull<T> {
-        NonNull::new_unchecked(self.ctrl.as_ptr() as *mut T)
+        NonNull::new_unchecked(self.table.ctrl.as_ptr().cast())
     }
 
     /// Returns pointer to start of data table.
@@ -492,17 +517,10 @@
         bucket.to_base_index(self.data_end())
     }
 
-    /// Returns a pointer to a control byte.
-    #[cfg_attr(feature = "inline-more", inline)]
-    unsafe fn ctrl(&self, index: usize) -> *mut u8 {
-        debug_assert!(index < self.num_ctrl_bytes());
-        self.ctrl.as_ptr().add(index)
-    }
-
     /// Returns a pointer to an element in the table.
     #[cfg_attr(feature = "inline-more", inline)]
     pub unsafe fn bucket(&self, index: usize) -> Bucket<T> {
-        debug_assert_ne!(self.bucket_mask, 0);
+        debug_assert_ne!(self.table.bucket_mask, 0);
         debug_assert!(index < self.buckets());
         Bucket::from_base_index(self.data_end(), index)
     }
@@ -512,27 +530,7 @@
     #[deprecated(since = "0.8.1", note = "use erase or remove instead")]
     pub unsafe fn erase_no_drop(&mut self, item: &Bucket<T>) {
         let index = self.bucket_index(item);
-        debug_assert!(is_full(*self.ctrl(index)));
-        let index_before = index.wrapping_sub(Group::WIDTH) & self.bucket_mask;
-        let empty_before = Group::load(self.ctrl(index_before)).match_empty();
-        let empty_after = Group::load(self.ctrl(index)).match_empty();
-
-        // If we are inside a continuous block of Group::WIDTH full or deleted
-        // cells then a probe window may have seen a full block when trying to
-        // insert. We therefore need to keep that block non-empty so that
-        // lookups will continue searching to the next probe window.
-        //
-        // Note that in this context `leading_zeros` refers to the bytes at the
-        // end of a group, while `trailing_zeros` refers to the bytes at the
-        // begining of a group.
-        let ctrl = if empty_before.leading_zeros() + empty_after.trailing_zeros() >= Group::WIDTH {
-            DELETED
-        } else {
-            self.growth_left += 1;
-            EMPTY
-        };
-        self.set_ctrl(index, ctrl);
-        self.items -= 1;
+        self.table.erase(index)
     }
 
     /// Erases an element from the table, dropping it in place.
@@ -578,109 +576,26 @@
         }
     }
 
-    /// Returns an iterator for a probe sequence on the table.
-    ///
-    /// This iterator never terminates, but is guaranteed to visit each bucket
-    /// group exactly once. The loop using `probe_seq` must terminate upon
-    /// reaching a group containing an empty bucket.
-    #[cfg_attr(feature = "inline-more", inline)]
-    fn probe_seq(&self, hash: u64) -> ProbeSeq {
-        ProbeSeq {
-            bucket_mask: self.bucket_mask,
-            pos: h1(hash) & self.bucket_mask,
-            stride: 0,
-        }
-    }
-
-    /// Sets a control byte, and possibly also the replicated control byte at
-    /// the end of the array.
-    #[cfg_attr(feature = "inline-more", inline)]
-    unsafe fn set_ctrl(&self, index: usize, ctrl: u8) {
-        // Replicate the first Group::WIDTH control bytes at the end of
-        // the array without using a branch:
-        // - If index >= Group::WIDTH then index == index2.
-        // - Otherwise index2 == self.bucket_mask + 1 + index.
-        //
-        // The very last replicated control byte is never actually read because
-        // we mask the initial index for unaligned loads, but we write it
-        // anyways because it makes the set_ctrl implementation simpler.
-        //
-        // If there are fewer buckets than Group::WIDTH then this code will
-        // replicate the buckets at the end of the trailing group. For example
-        // with 2 buckets and a group size of 4, the control bytes will look
-        // like this:
-        //
-        //     Real    |             Replicated
-        // ---------------------------------------------
-        // | [A] | [B] | [EMPTY] | [EMPTY] | [A] | [B] |
-        // ---------------------------------------------
-        let index2 = ((index.wrapping_sub(Group::WIDTH)) & self.bucket_mask) + Group::WIDTH;
-
-        *self.ctrl(index) = ctrl;
-        *self.ctrl(index2) = ctrl;
-    }
-
-    /// Searches for an empty or deleted bucket which is suitable for inserting
-    /// a new element.
-    ///
-    /// There must be at least 1 empty bucket in the table.
-    #[cfg_attr(feature = "inline-more", inline)]
-    fn find_insert_slot(&self, hash: u64) -> usize {
-        for pos in self.probe_seq(hash) {
-            unsafe {
-                let group = Group::load(self.ctrl(pos));
-                if let Some(bit) = group.match_empty_or_deleted().lowest_set_bit() {
-                    let result = (pos + bit) & self.bucket_mask;
-
-                    // In tables smaller than the group width, trailing control
-                    // bytes outside the range of the table are filled with
-                    // EMPTY entries. These will unfortunately trigger a
-                    // match, but once masked may point to a full bucket that
-                    // is already occupied. We detect this situation here and
-                    // perform a second scan starting at the begining of the
-                    // table. This second scan is guaranteed to find an empty
-                    // slot (due to the load factor) before hitting the trailing
-                    // control bytes (containing EMPTY).
-                    if unlikely(is_full(*self.ctrl(result))) {
-                        debug_assert!(self.bucket_mask < Group::WIDTH);
-                        debug_assert_ne!(pos, 0);
-                        return Group::load_aligned(self.ctrl(0))
-                            .match_empty_or_deleted()
-                            .lowest_set_bit_nonzero();
-                    } else {
-                        return result;
-                    }
-                }
-            }
-        }
-
-        // probe_seq never returns.
-        unreachable!();
-    }
-
     /// Marks all table buckets as empty without dropping their contents.
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn clear_no_drop(&mut self) {
-        if !self.is_empty_singleton() {
-            unsafe {
-                self.ctrl(0).write_bytes(EMPTY, self.num_ctrl_bytes());
-            }
-        }
-        self.items = 0;
-        self.growth_left = bucket_mask_to_capacity(self.bucket_mask);
+        self.table.clear_no_drop()
     }
 
     /// Removes all elements from the table without freeing the backing memory.
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn clear(&mut self) {
         // Ensure that the table is reset even if one of the drops panic
-        let self_ = guard(self, |self_| self_.clear_no_drop());
+        let mut self_ = guard(self, |self_| self_.clear_no_drop());
+        unsafe {
+            self_.drop_elements();
+        }
+    }
 
-        if mem::needs_drop::<T>() && self_.len() != 0 {
-            unsafe {
-                for item in self_.iter() {
-                    item.drop();
-                }
+    unsafe fn drop_elements(&mut self) {
+        if mem::needs_drop::<T>() && self.len() != 0 {
+            for item in self.iter() {
+                item.drop();
             }
         }
     }
@@ -690,9 +605,9 @@
     pub fn shrink_to(&mut self, min_size: usize, hasher: impl Fn(&T) -> u64) {
         // Calculate the minimal number of elements that we need to reserve
         // space for.
-        let min_size = usize::max(self.items, min_size);
+        let min_size = usize::max(self.table.items, min_size);
         if min_size == 0 {
-            *self = Self::new();
+            *self = Self::new_in(self.table.alloc.clone());
             return;
         }
 
@@ -708,8 +623,8 @@
         // If we have more buckets than we need, shrink the table.
         if min_buckets < self.buckets() {
             // Fast path if the table is empty
-            if self.items == 0 {
-                *self = Self::with_capacity(min_size)
+            if self.table.items == 0 {
+                *self = Self::with_capacity_in(min_size, self.table.alloc.clone())
             } else {
                 // Avoid `Result::unwrap_or_else` because it bloats LLVM IR.
                 if self
@@ -726,7 +641,7 @@
     /// without reallocation.
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn reserve(&mut self, additional: usize, hasher: impl Fn(&T) -> u64) {
-        if additional > self.growth_left {
+        if additional > self.table.growth_left {
             // Avoid `Result::unwrap_or_else` because it bloats LLVM IR.
             if self
                 .reserve_rehash(additional, hasher, Fallibility::Infallible)
@@ -745,7 +660,7 @@
         additional: usize,
         hasher: impl Fn(&T) -> u64,
     ) -> Result<(), TryReserveError> {
-        if additional > self.growth_left {
+        if additional > self.table.growth_left {
             self.reserve_rehash(additional, hasher, Fallibility::Fallible)
         } else {
             Ok(())
@@ -759,14 +674,14 @@
         &mut self,
         additional: usize,
         hasher: impl Fn(&T) -> u64,
-        fallability: Fallibility,
+        fallibility: Fallibility,
     ) -> Result<(), TryReserveError> {
         // Avoid `Option::ok_or_else` because it bloats LLVM IR.
-        let new_items = match self.items.checked_add(additional) {
+        let new_items = match self.table.items.checked_add(additional) {
             Some(new_items) => new_items,
-            None => return Err(fallability.capacity_overflow()),
+            None => return Err(fallibility.capacity_overflow()),
         };
-        let full_capacity = bucket_mask_to_capacity(self.bucket_mask);
+        let full_capacity = bucket_mask_to_capacity(self.table.bucket_mask);
         if new_items <= full_capacity / 2 {
             // Rehash in-place without re-allocating if we have plenty of spare
             // capacity that is locked up due to DELETED entries.
@@ -778,7 +693,7 @@
             self.resize(
                 usize::max(new_items, full_capacity + 1),
                 hasher,
-                fallability,
+                fallibility,
             )
         }
     }
@@ -789,35 +704,18 @@
     /// If `hasher` panics then some the table's contents may be lost.
     fn rehash_in_place(&mut self, hasher: impl Fn(&T) -> u64) {
         unsafe {
-            // Bulk convert all full control bytes to DELETED, and all DELETED
-            // control bytes to EMPTY. This effectively frees up all buckets
-            // containing a DELETED entry.
-            for i in (0..self.buckets()).step_by(Group::WIDTH) {
-                let group = Group::load_aligned(self.ctrl(i));
-                let group = group.convert_special_to_empty_and_full_to_deleted();
-                group.store_aligned(self.ctrl(i));
-            }
-
-            // Fix up the trailing control bytes. See the comments in set_ctrl
-            // for the handling of tables smaller than the group width.
-            if self.buckets() < Group::WIDTH {
-                self.ctrl(0)
-                    .copy_to(self.ctrl(Group::WIDTH), self.buckets());
-            } else {
-                self.ctrl(0)
-                    .copy_to(self.ctrl(self.buckets()), Group::WIDTH);
-            }
-
             // If the hash function panics then properly clean up any elements
             // that we haven't rehashed yet. We unfortunately can't preserve the
             // element since we lost their hash and have no way of recovering it
             // without risking another panic.
-            let mut guard = guard(self, |self_| {
+            self.table.prepare_rehash_in_place();
+
+            let mut guard = guard(&mut self.table, move |self_| {
                 if mem::needs_drop::<T>() {
                     for i in 0..self_.buckets() {
                         if *self_.ctrl(i) == DELETED {
                             self_.set_ctrl(i, EMPTY);
-                            self_.bucket(i).drop();
+                            self_.bucket::<T>(i).drop();
                             self_.items -= 1;
                         }
                     }
@@ -832,6 +730,7 @@
                 if *guard.ctrl(i) != DELETED {
                     continue;
                 }
+
                 'inner: loop {
                     // Hash the current item
                     let item = guard.bucket(i);
@@ -845,25 +744,19 @@
                     // size. If both the new and old position fall within the
                     // same unaligned group, then there is no benefit in moving
                     // it and we can just continue to the next item.
-                    let probe_index = |pos: usize| {
-                        (pos.wrapping_sub(guard.probe_seq(hash).pos) & guard.bucket_mask)
-                            / Group::WIDTH
-                    };
-                    if likely(probe_index(i) == probe_index(new_i)) {
-                        guard.set_ctrl(i, h2(hash));
+                    if likely(guard.is_in_same_group(i, new_i, hash)) {
+                        guard.set_ctrl_h2(i, hash);
                         continue 'outer;
                     }
 
                     // We are moving the current item to a new position. Write
                     // our H2 to the control byte of the new position.
-                    let prev_ctrl = *guard.ctrl(new_i);
-                    guard.set_ctrl(new_i, h2(hash));
-
+                    let prev_ctrl = guard.replace_ctrl_h2(new_i, hash);
                     if prev_ctrl == EMPTY {
+                        guard.set_ctrl(i, EMPTY);
                         // If the target slot is empty, simply move the current
                         // element into the new slot and clear the old control
                         // byte.
-                        guard.set_ctrl(i, EMPTY);
                         guard.bucket(new_i).copy_from_nonoverlapping(&item);
                         continue 'outer;
                     } else {
@@ -888,27 +781,12 @@
         &mut self,
         capacity: usize,
         hasher: impl Fn(&T) -> u64,
-        fallability: Fallibility,
+        fallibility: Fallibility,
     ) -> Result<(), TryReserveError> {
         unsafe {
-            debug_assert!(self.items <= capacity);
-
-            // Allocate and initialize the new table.
-            let mut new_table = Self::fallible_with_capacity(capacity, fallability)?;
-            new_table.growth_left -= self.items;
-            new_table.items = self.items;
-
-            // The hash function may panic, in which case we simply free the new
-            // table without dropping any elements that may have been copied into
-            // it.
-            //
-            // This guard is also used to free the old table on success, see
-            // the comment at the bottom of this function.
-            let mut new_table = guard(ManuallyDrop::new(new_table), |new_table| {
-                if !new_table.is_empty_singleton() {
-                    new_table.free_buckets();
-                }
-            });
+            let mut new_table =
+                self.table
+                    .prepare_resize(TableLayout::new::<T>(), capacity, fallibility)?;
 
             // Copy all elements to the new table.
             for item in self.iter() {
@@ -919,8 +797,7 @@
                 // - there are no DELETED entries.
                 // - we know there is enough space in the table.
                 // - all elements are unique.
-                let index = new_table.find_insert_slot(hash);
-                new_table.set_ctrl(index, h2(hash));
+                let (index, _) = new_table.prepare_insert_slot(hash);
                 new_table.bucket(index).copy_from_nonoverlapping(&item);
             }
 
@@ -928,7 +805,7 @@
             // self with the new table. The old table will have its memory freed but
             // the items will not be dropped (since they have been moved into the
             // new table).
-            mem::swap(self, &mut new_table);
+            mem::swap(&mut self.table, &mut new_table);
 
             Ok(())
         }
@@ -940,26 +817,46 @@
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn insert(&mut self, hash: u64, value: T, hasher: impl Fn(&T) -> u64) -> Bucket<T> {
         unsafe {
-            let mut index = self.find_insert_slot(hash);
+            let mut index = self.table.find_insert_slot(hash);
 
             // We can avoid growing the table once we have reached our load
             // factor if we are replacing a tombstone. This works since the
             // number of EMPTY slots does not change in this case.
-            let old_ctrl = *self.ctrl(index);
-            if unlikely(self.growth_left == 0 && special_is_empty(old_ctrl)) {
+            let old_ctrl = *self.table.ctrl(index);
+            if unlikely(self.table.growth_left == 0 && special_is_empty(old_ctrl)) {
                 self.reserve(1, hasher);
-                index = self.find_insert_slot(hash);
+                index = self.table.find_insert_slot(hash);
             }
 
+            self.table.record_item_insert_at(index, old_ctrl, hash);
+
             let bucket = self.bucket(index);
-            self.growth_left -= special_is_empty(old_ctrl) as usize;
-            self.set_ctrl(index, h2(hash));
             bucket.write(value);
-            self.items += 1;
             bucket
         }
     }
 
+    /// Attempts to insert a new element without growing the table and return its raw bucket.
+    ///
+    /// Returns an `Err` containing the given element if inserting it would require growing the
+    /// table.
+    ///
+    /// This does not check if the given element already exists in the table.
+    #[cfg(feature = "raw")]
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn try_insert_no_grow(&mut self, hash: u64, value: T) -> Result<Bucket<T>, T> {
+        unsafe {
+            match self.table.prepare_insert_no_grow(hash) {
+                Ok(index) => {
+                    let bucket = self.bucket(index);
+                    bucket.write(value);
+                    Ok(bucket)
+                }
+                Err(()) => Err(value),
+            }
+        }
+    }
+
     /// Inserts a new element into the table, and returns a mutable reference to it.
     ///
     /// This does not check if the given element already exists in the table.
@@ -977,17 +874,15 @@
     #[cfg(any(feature = "raw", feature = "rustc-internal-api"))]
     pub fn insert_no_grow(&mut self, hash: u64, value: T) -> Bucket<T> {
         unsafe {
-            let index = self.find_insert_slot(hash);
-            let bucket = self.bucket(index);
+            let (index, old_ctrl) = self.table.prepare_insert_slot(hash);
+            let bucket = self.table.bucket(index);
 
             // If we are replacing a DELETED entry then we don't need to update
             // the load counter.
-            let old_ctrl = *self.ctrl(index);
-            self.growth_left -= special_is_empty(old_ctrl) as usize;
+            self.table.growth_left -= special_is_empty(old_ctrl) as usize;
 
-            self.set_ctrl(index, h2(hash));
             bucket.write(value);
-            self.items += 1;
+            self.table.items += 1;
             bucket
         }
     }
@@ -1004,14 +899,14 @@
         F: FnOnce(T) -> Option<T>,
     {
         let index = self.bucket_index(&bucket);
-        let old_ctrl = *self.ctrl(index);
+        let old_ctrl = *self.table.ctrl(index);
         debug_assert!(is_full(old_ctrl));
-        let old_growth_left = self.growth_left;
+        let old_growth_left = self.table.growth_left;
         let item = self.remove(bucket);
         if let Some(new_item) = f(item) {
-            self.growth_left = old_growth_left;
-            self.set_ctrl(index, old_ctrl);
-            self.items += 1;
+            self.table.growth_left = old_growth_left;
+            self.table.set_ctrl(index, old_ctrl);
+            self.table.items += 1;
             self.bucket(index).write(new_item);
             true
         } else {
@@ -1053,38 +948,83 @@
         }
     }
 
+    /// Attempts to get mutable references to `N` entries in the table at once.
+    ///
+    /// Returns an array of length `N` with the results of each query. For soundness,
+    /// at most one mutable reference will be returned to any entry. An
+    /// `Err(UnavailableMutError::Duplicate(i))` in the returned array indicates that a suitable
+    /// entry exists, but a mutable reference to it already occurs at index `i` in the returned
+    /// array.
+    ///
+    /// The `eq` argument should be a closure such that `eq(i, k)` returns true if `k` is equal to
+    /// the `i`th key to be looked up.
+    ///
+    /// This method is available only if the `nightly` feature is enabled.
+    #[cfg(feature = "nightly")]
+    pub fn get_each_mut<const N: usize>(
+        &mut self,
+        hashes: [u64; N],
+        mut eq: impl FnMut(usize, &T) -> bool,
+    ) -> [Result<&'_ mut T, UnavailableMutError>; N] {
+        // Collect the requested buckets.
+        // TODO use `MaybeUninit::uninit_array` here instead once that's stable.
+        let mut buckets: [MaybeUninit<Option<Bucket<T>>>; N] =
+            unsafe { MaybeUninit::uninit().assume_init() };
+        for i in 0..N {
+            buckets[i] = MaybeUninit::new(self.find(hashes[i], |k| eq(i, k)));
+        }
+        let buckets: [Option<Bucket<T>>; N] = unsafe { MaybeUninit::array_assume_init(buckets) };
+
+        // Walk through the buckets, checking for duplicates and building up the output array.
+        // TODO use `MaybeUninit::uninit_array` here instead once that's stable.
+        let mut out: [MaybeUninit<Result<&'_ mut T, UnavailableMutError>>; N] =
+            unsafe { MaybeUninit::uninit().assume_init() };
+        for i in 0..N {
+            out[i] = MaybeUninit::new(
+                #[allow(clippy::never_loop)]
+                'outer: loop {
+                    for j in 0..i {
+                        match (&buckets[j], &buckets[i]) {
+                            // These two buckets are the same, and we can't safely return a second
+                            // mutable reference to the same entry.
+                            (Some(prev), Some(cur)) if prev.as_ptr() == cur.as_ptr() => {
+                                break 'outer Err(UnavailableMutError::Duplicate(j));
+                            }
+                            _ => {}
+                        }
+                    }
+                    // This bucket is distinct from all previous buckets (or it doesn't exist), so
+                    // we're clear to return the result of the lookup.
+                    break match &buckets[i] {
+                        None => Err(UnavailableMutError::Absent),
+                        Some(bkt) => unsafe { Ok(bkt.as_mut()) },
+                    };
+                },
+            )
+        }
+
+        unsafe { MaybeUninit::array_assume_init(out) }
+    }
+
     /// Returns the number of elements the map can hold without reallocating.
     ///
     /// This number is a lower bound; the table might be able to hold
     /// more, but is guaranteed to be able to hold at least this many.
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn capacity(&self) -> usize {
-        self.items + self.growth_left
+        self.table.items + self.table.growth_left
     }
 
     /// Returns the number of elements in the table.
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn len(&self) -> usize {
-        self.items
+        self.table.items
     }
 
     /// Returns the number of buckets in the table.
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn buckets(&self) -> usize {
-        self.bucket_mask + 1
-    }
-
-    /// Returns the number of control bytes in the table.
-    #[cfg_attr(feature = "inline-more", inline)]
-    fn num_ctrl_bytes(&self) -> usize {
-        self.bucket_mask + 1 + Group::WIDTH
-    }
-
-    /// Returns whether this table points to the empty singleton with a capacity
-    /// of 0.
-    #[cfg_attr(feature = "inline-more", inline)]
-    fn is_empty_singleton(&self) -> bool {
-        self.bucket_mask == 0
+        self.table.bucket_mask + 1
     }
 
     /// Returns an iterator over every element in the table. It is up to
@@ -1095,8 +1035,8 @@
     pub unsafe fn iter(&self) -> RawIter<T> {
         let data = Bucket::from_base_index(self.data_end(), 0);
         RawIter {
-            iter: RawIterRange::new(self.ctrl.as_ptr(), data, self.buckets()),
-            items: self.items,
+            iter: RawIterRange::new(self.table.ctrl.as_ptr(), data, self.table.buckets()),
+            items: self.table.items,
         }
     }
 
@@ -1108,14 +1048,14 @@
     /// `RawIterHash`. Because we cannot make the `next` method unsafe on the
     /// `RawIterHash` struct, we have to make the `iter_hash` method unsafe.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub unsafe fn iter_hash(&self, hash: u64) -> RawIterHash<'_, T> {
+    pub unsafe fn iter_hash(&self, hash: u64) -> RawIterHash<'_, T, A> {
         RawIterHash::new(self, hash)
     }
 
     /// Returns an iterator which removes all elements from the table without
     /// freeing the memory.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn drain(&mut self) -> RawDrain<'_, T> {
+    pub fn drain(&mut self) -> RawDrain<'_, T, A> {
         unsafe {
             let iter = self.iter();
             self.drain_iter_from(iter)
@@ -1130,11 +1070,11 @@
     /// It is up to the caller to ensure that the iterator is valid for this
     /// `RawTable` and covers all items that remain in the table.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub unsafe fn drain_iter_from(&mut self, iter: RawIter<T>) -> RawDrain<'_, T> {
+    pub unsafe fn drain_iter_from(&mut self, iter: RawIter<T>) -> RawDrain<'_, T, A> {
         debug_assert_eq!(iter.len(), self.len());
         RawDrain {
             iter,
-            table: ManuallyDrop::new(mem::replace(self, Self::new())),
+            table: ManuallyDrop::new(mem::replace(self, Self::new_in(self.table.alloc.clone()))),
             orig_table: NonNull::from(self),
             marker: PhantomData,
         }
@@ -1146,31 +1086,33 @@
     ///
     /// It is up to the caller to ensure that the iterator is valid for this
     /// `RawTable` and covers all items that remain in the table.
-    pub unsafe fn into_iter_from(self, iter: RawIter<T>) -> RawIntoIter<T> {
+    pub unsafe fn into_iter_from(self, iter: RawIter<T>) -> RawIntoIter<T, A> {
         debug_assert_eq!(iter.len(), self.len());
 
-        let alloc = self.into_alloc();
+        let alloc = self.table.alloc.clone();
+        let allocation = self.into_allocation();
         RawIntoIter {
             iter,
-            alloc,
+            allocation,
             marker: PhantomData,
+            alloc,
         }
     }
 
     /// Converts the table into a raw allocation. The contents of the table
     /// should be dropped using a `RawIter` before freeing the allocation.
     #[cfg_attr(feature = "inline-more", inline)]
-    pub(crate) fn into_alloc(self) -> Option<(NonNull<u8>, Layout)> {
-        let alloc = if self.is_empty_singleton() {
+    pub(crate) fn into_allocation(self) -> Option<(NonNull<u8>, Layout)> {
+        let alloc = if self.table.is_empty_singleton() {
             None
         } else {
             // Avoid `Option::unwrap_or_else` because it bloats LLVM IR.
-            let (layout, ctrl_offset) = match calculate_layout::<T>(self.buckets()) {
+            let (layout, ctrl_offset) = match calculate_layout::<T>(self.table.buckets()) {
                 Some(lco) => lco,
                 None => unsafe { hint::unreachable_unchecked() },
             };
             Some((
-                unsafe { NonNull::new_unchecked(self.ctrl.as_ptr().sub(ctrl_offset)) },
+                unsafe { NonNull::new_unchecked(self.table.ctrl.as_ptr().sub(ctrl_offset)) },
                 layout,
             ))
         };
@@ -1179,18 +1121,364 @@
     }
 }
 
-unsafe impl<T> Send for RawTable<T> where T: Send {}
-unsafe impl<T> Sync for RawTable<T> where T: Sync {}
+unsafe impl<T, A: Allocator + Clone> Send for RawTable<T, A> where T: Send {}
+unsafe impl<T, A: Allocator + Clone> Sync for RawTable<T, A> where T: Sync {}
+
+impl<A> RawTableInner<A> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    const fn new_in(alloc: A) -> Self {
+        Self {
+            // Be careful to cast the entire slice to a raw pointer.
+            ctrl: unsafe { NonNull::new_unchecked(Group::static_empty() as *const _ as *mut u8) },
+            bucket_mask: 0,
+            items: 0,
+            growth_left: 0,
+            alloc,
+        }
+    }
+}
+
+impl<A: Allocator + Clone> RawTableInner<A> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    unsafe fn new_uninitialized(
+        alloc: A,
+        table_layout: TableLayout,
+        buckets: usize,
+        fallibility: Fallibility,
+    ) -> Result<Self, TryReserveError> {
+        debug_assert!(buckets.is_power_of_two());
+
+        // Avoid `Option::ok_or_else` because it bloats LLVM IR.
+        let (layout, ctrl_offset) = match table_layout.calculate_layout_for(buckets) {
+            Some(lco) => lco,
+            None => return Err(fallibility.capacity_overflow()),
+        };
+
+        let ptr: NonNull<u8> = match do_alloc(&alloc, layout) {
+            Ok(block) => block.cast(),
+            Err(_) => return Err(fallibility.alloc_err(layout)),
+        };
+
+        let ctrl = NonNull::new_unchecked(ptr.as_ptr().add(ctrl_offset));
+        Ok(Self {
+            ctrl,
+            bucket_mask: buckets - 1,
+            items: 0,
+            growth_left: bucket_mask_to_capacity(buckets - 1),
+            alloc,
+        })
+    }
+
+    #[inline]
+    fn fallible_with_capacity(
+        alloc: A,
+        table_layout: TableLayout,
+        capacity: usize,
+        fallibility: Fallibility,
+    ) -> Result<Self, TryReserveError> {
+        if capacity == 0 {
+            Ok(Self::new_in(alloc))
+        } else {
+            unsafe {
+                let buckets =
+                    capacity_to_buckets(capacity).ok_or_else(|| fallibility.capacity_overflow())?;
+
+                let result = Self::new_uninitialized(alloc, table_layout, buckets, fallibility)?;
+                result.ctrl(0).write_bytes(EMPTY, result.num_ctrl_bytes());
+
+                Ok(result)
+            }
+        }
+    }
+
+    /// Searches for an empty or deleted bucket which is suitable for inserting
+    /// a new element and sets the hash for that slot.
+    ///
+    /// There must be at least 1 empty bucket in the table.
+    #[inline]
+    unsafe fn prepare_insert_slot(&self, hash: u64) -> (usize, u8) {
+        let index = self.find_insert_slot(hash);
+        let old_ctrl = *self.ctrl(index);
+        self.set_ctrl_h2(index, hash);
+        (index, old_ctrl)
+    }
+
+    /// Searches for an empty or deleted bucket which is suitable for inserting
+    /// a new element.
+    ///
+    /// There must be at least 1 empty bucket in the table.
+    #[inline]
+    fn find_insert_slot(&self, hash: u64) -> usize {
+        let mut probe_seq = self.probe_seq(hash);
+        loop {
+            unsafe {
+                let group = Group::load(self.ctrl(probe_seq.pos));
+                if let Some(bit) = group.match_empty_or_deleted().lowest_set_bit() {
+                    let result = (probe_seq.pos + bit) & self.bucket_mask;
+
+                    // In tables smaller than the group width, trailing control
+                    // bytes outside the range of the table are filled with
+                    // EMPTY entries. These will unfortunately trigger a
+                    // match, but once masked may point to a full bucket that
+                    // is already occupied. We detect this situation here and
+                    // perform a second scan starting at the begining of the
+                    // table. This second scan is guaranteed to find an empty
+                    // slot (due to the load factor) before hitting the trailing
+                    // control bytes (containing EMPTY).
+                    if unlikely(is_full(*self.ctrl(result))) {
+                        debug_assert!(self.bucket_mask < Group::WIDTH);
+                        debug_assert_ne!(probe_seq.pos, 0);
+                        return Group::load_aligned(self.ctrl(0))
+                            .match_empty_or_deleted()
+                            .lowest_set_bit_nonzero();
+                    }
+
+                    return result;
+                }
+            }
+            probe_seq.move_next(self.bucket_mask);
+        }
+    }
+
+    #[allow(clippy::mut_mut)]
+    #[inline]
+    unsafe fn prepare_rehash_in_place(&mut self) {
+        // Bulk convert all full control bytes to DELETED, and all DELETED
+        // control bytes to EMPTY. This effectively frees up all buckets
+        // containing a DELETED entry.
+        for i in (0..self.buckets()).step_by(Group::WIDTH) {
+            let group = Group::load_aligned(self.ctrl(i));
+            let group = group.convert_special_to_empty_and_full_to_deleted();
+            group.store_aligned(self.ctrl(i));
+        }
+
+        // Fix up the trailing control bytes. See the comments in set_ctrl
+        // for the handling of tables smaller than the group width.
+        if self.buckets() < Group::WIDTH {
+            self.ctrl(0)
+                .copy_to(self.ctrl(Group::WIDTH), self.buckets());
+        } else {
+            self.ctrl(0)
+                .copy_to(self.ctrl(self.buckets()), Group::WIDTH);
+        }
+    }
+
+    #[cfg_attr(feature = "inline-more", inline)]
+    unsafe fn bucket<T>(&self, index: usize) -> Bucket<T> {
+        debug_assert_ne!(self.bucket_mask, 0);
+        debug_assert!(index < self.buckets());
+        Bucket::from_base_index(self.data_end(), index)
+    }
+
+    #[cfg_attr(feature = "inline-more", inline)]
+    unsafe fn data_end<T>(&self) -> NonNull<T> {
+        NonNull::new_unchecked(self.ctrl.as_ptr().cast())
+    }
+
+    /// Returns an iterator-like object for a probe sequence on the table.
+    ///
+    /// This iterator never terminates, but is guaranteed to visit each bucket
+    /// group exactly once. The loop using `probe_seq` must terminate upon
+    /// reaching a group containing an empty bucket.
+    #[inline]
+    fn probe_seq(&self, hash: u64) -> ProbeSeq {
+        ProbeSeq {
+            pos: h1(hash) & self.bucket_mask,
+            stride: 0,
+        }
+    }
 
-impl<T: Clone> Clone for RawTable<T> {
+    /// Returns the index of a bucket for which a value must be inserted if there is enough rooom
+    /// in the table, otherwise returns error
+    #[cfg(feature = "raw")]
+    #[inline]
+    unsafe fn prepare_insert_no_grow(&mut self, hash: u64) -> Result<usize, ()> {
+        let index = self.find_insert_slot(hash);
+        let old_ctrl = *self.ctrl(index);
+        if unlikely(self.growth_left == 0 && special_is_empty(old_ctrl)) {
+            Err(())
+        } else {
+            self.record_item_insert_at(index, old_ctrl, hash);
+            Ok(index)
+        }
+    }
+
+    #[inline]
+    unsafe fn record_item_insert_at(&mut self, index: usize, old_ctrl: u8, hash: u64) {
+        self.growth_left -= special_is_empty(old_ctrl) as usize;
+        self.set_ctrl_h2(index, hash);
+        self.items += 1;
+    }
+
+    #[inline]
+    fn is_in_same_group(&self, i: usize, new_i: usize, hash: u64) -> bool {
+        let probe_seq_pos = self.probe_seq(hash).pos;
+        let probe_index =
+            |pos: usize| (pos.wrapping_sub(probe_seq_pos) & self.bucket_mask) / Group::WIDTH;
+        probe_index(i) == probe_index(new_i)
+    }
+
+    /// Sets a control byte to the hash, and possibly also the replicated control byte at
+    /// the end of the array.
+    #[inline]
+    unsafe fn set_ctrl_h2(&self, index: usize, hash: u64) {
+        self.set_ctrl(index, h2(hash))
+    }
+
+    #[inline]
+    unsafe fn replace_ctrl_h2(&self, index: usize, hash: u64) -> u8 {
+        let prev_ctrl = *self.ctrl(index);
+        self.set_ctrl_h2(index, hash);
+        prev_ctrl
+    }
+
+    /// Sets a control byte, and possibly also the replicated control byte at
+    /// the end of the array.
+    #[inline]
+    unsafe fn set_ctrl(&self, index: usize, ctrl: u8) {
+        // Replicate the first Group::WIDTH control bytes at the end of
+        // the array without using a branch:
+        // - If index >= Group::WIDTH then index == index2.
+        // - Otherwise index2 == self.bucket_mask + 1 + index.
+        //
+        // The very last replicated control byte is never actually read because
+        // we mask the initial index for unaligned loads, but we write it
+        // anyways because it makes the set_ctrl implementation simpler.
+        //
+        // If there are fewer buckets than Group::WIDTH then this code will
+        // replicate the buckets at the end of the trailing group. For example
+        // with 2 buckets and a group size of 4, the control bytes will look
+        // like this:
+        //
+        //     Real    |             Replicated
+        // ---------------------------------------------
+        // | [A] | [B] | [EMPTY] | [EMPTY] | [A] | [B] |
+        // ---------------------------------------------
+        let index2 = ((index.wrapping_sub(Group::WIDTH)) & self.bucket_mask) + Group::WIDTH;
+
+        *self.ctrl(index) = ctrl;
+        *self.ctrl(index2) = ctrl;
+    }
+
+    /// Returns a pointer to a control byte.
+    #[inline]
+    unsafe fn ctrl(&self, index: usize) -> *mut u8 {
+        debug_assert!(index < self.num_ctrl_bytes());
+        self.ctrl.as_ptr().add(index)
+    }
+
+    #[inline]
+    fn buckets(&self) -> usize {
+        self.bucket_mask + 1
+    }
+
+    #[inline]
+    fn num_ctrl_bytes(&self) -> usize {
+        self.bucket_mask + 1 + Group::WIDTH
+    }
+
+    #[inline]
+    fn is_empty_singleton(&self) -> bool {
+        self.bucket_mask == 0
+    }
+
+    #[allow(clippy::mut_mut)]
+    #[inline]
+    unsafe fn prepare_resize(
+        &self,
+        table_layout: TableLayout,
+        capacity: usize,
+        fallibility: Fallibility,
+    ) -> Result<crate::scopeguard::ScopeGuard<Self, impl FnMut(&mut Self)>, TryReserveError> {
+        debug_assert!(self.items <= capacity);
+
+        // Allocate and initialize the new table.
+        let mut new_table = RawTableInner::fallible_with_capacity(
+            self.alloc.clone(),
+            table_layout,
+            capacity,
+            fallibility,
+        )?;
+        new_table.growth_left -= self.items;
+        new_table.items = self.items;
+
+        // The hash function may panic, in which case we simply free the new
+        // table without dropping any elements that may have been copied into
+        // it.
+        //
+        // This guard is also used to free the old table on success, see
+        // the comment at the bottom of this function.
+        Ok(guard(new_table, move |self_| {
+            if !self_.is_empty_singleton() {
+                self_.free_buckets(table_layout);
+            }
+        }))
+    }
+
+    #[inline]
+    unsafe fn free_buckets(&mut self, table_layout: TableLayout) {
+        // Avoid `Option::unwrap_or_else` because it bloats LLVM IR.
+        let (layout, ctrl_offset) = match table_layout.calculate_layout_for(self.buckets()) {
+            Some(lco) => lco,
+            None => hint::unreachable_unchecked(),
+        };
+        self.alloc.deallocate(
+            NonNull::new_unchecked(self.ctrl.as_ptr().sub(ctrl_offset)),
+            layout,
+        );
+    }
+
+    /// Marks all table buckets as empty without dropping their contents.
+    #[inline]
+    fn clear_no_drop(&mut self) {
+        if !self.is_empty_singleton() {
+            unsafe {
+                self.ctrl(0).write_bytes(EMPTY, self.num_ctrl_bytes());
+            }
+        }
+        self.items = 0;
+        self.growth_left = bucket_mask_to_capacity(self.bucket_mask);
+    }
+
+    #[inline]
+    unsafe fn erase(&mut self, index: usize) {
+        debug_assert!(is_full(*self.ctrl(index)));
+        let index_before = index.wrapping_sub(Group::WIDTH) & self.bucket_mask;
+        let empty_before = Group::load(self.ctrl(index_before)).match_empty();
+        let empty_after = Group::load(self.ctrl(index)).match_empty();
+
+        // If we are inside a continuous block of Group::WIDTH full or deleted
+        // cells then a probe window may have seen a full block when trying to
+        // insert. We therefore need to keep that block non-empty so that
+        // lookups will continue searching to the next probe window.
+        //
+        // Note that in this context `leading_zeros` refers to the bytes at the
+        // end of a group, while `trailing_zeros` refers to the bytes at the
+        // begining of a group.
+        let ctrl = if empty_before.leading_zeros() + empty_after.trailing_zeros() >= Group::WIDTH {
+            DELETED
+        } else {
+            self.growth_left += 1;
+            EMPTY
+        };
+        self.set_ctrl(index, ctrl);
+        self.items -= 1;
+    }
+}
+
+impl<T: Clone, A: Allocator + Clone> Clone for RawTable<T, A> {
     fn clone(&self) -> Self {
-        if self.is_empty_singleton() {
-            Self::new()
+        if self.table.is_empty_singleton() {
+            Self::new_in(self.table.alloc.clone())
         } else {
             unsafe {
                 let mut new_table = ManuallyDrop::new(
                     // Avoid `Result::ok_or_else` because it bloats LLVM IR.
-                    match Self::new_uninitialized(self.buckets(), Fallibility::Infallible) {
+                    match Self::new_uninitialized(
+                        self.table.alloc.clone(),
+                        self.table.buckets(),
+                        Fallibility::Infallible,
+                    ) {
                         Ok(table) => table,
                         Err(_) => hint::unreachable_unchecked(),
                     },
@@ -1208,26 +1496,26 @@
     }
 
     fn clone_from(&mut self, source: &Self) {
-        if source.is_empty_singleton() {
-            *self = Self::new();
+        if source.table.is_empty_singleton() {
+            *self = Self::new_in(self.table.alloc.clone());
         } else {
             unsafe {
                 // First, drop all our elements without clearing the control bytes.
-                if mem::needs_drop::<T>() && self.len() != 0 {
-                    for item in self.iter() {
-                        item.drop();
-                    }
-                }
+                self.drop_elements();
 
                 // If necessary, resize our table to match the source.
                 if self.buckets() != source.buckets() {
                     // Skip our drop by using ptr::write.
-                    if !self.is_empty_singleton() {
+                    if !self.table.is_empty_singleton() {
                         self.free_buckets();
                     }
                     (self as *mut Self).write(
                         // Avoid `Result::unwrap_or_else` because it bloats LLVM IR.
-                        match Self::new_uninitialized(source.buckets(), Fallibility::Infallible) {
+                        match Self::new_uninitialized(
+                            self.table.alloc.clone(),
+                            source.buckets(),
+                            Fallibility::Infallible,
+                        ) {
                             Ok(table) => table,
                             Err(_) => hint::unreachable_unchecked(),
                         },
@@ -1247,7 +1535,7 @@
 trait RawTableClone {
     unsafe fn clone_from_spec(&mut self, source: &Self, on_panic: impl FnMut(&mut Self));
 }
-impl<T: Clone> RawTableClone for RawTable<T> {
+impl<T: Clone, A: Allocator + Clone> RawTableClone for RawTable<T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     default_fn! {
         unsafe fn clone_from_spec(&mut self, source: &Self, on_panic: impl FnMut(&mut Self)) {
@@ -1256,29 +1544,31 @@
     }
 }
 #[cfg(feature = "nightly")]
-impl<T: Copy> RawTableClone for RawTable<T> {
+impl<T: Copy, A: Allocator + Clone> RawTableClone for RawTable<T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     unsafe fn clone_from_spec(&mut self, source: &Self, _on_panic: impl FnMut(&mut Self)) {
         source
+            .table
             .ctrl(0)
-            .copy_to_nonoverlapping(self.ctrl(0), self.num_ctrl_bytes());
+            .copy_to_nonoverlapping(self.table.ctrl(0), self.table.num_ctrl_bytes());
         source
             .data_start()
-            .copy_to_nonoverlapping(self.data_start(), self.buckets());
+            .copy_to_nonoverlapping(self.data_start(), self.table.buckets());
 
-        self.items = source.items;
-        self.growth_left = source.growth_left;
+        self.table.items = source.table.items;
+        self.table.growth_left = source.table.growth_left;
     }
 }
 
-impl<T: Clone> RawTable<T> {
+impl<T: Clone, A: Allocator + Clone> RawTable<T, A> {
     /// Common code for clone and clone_from. Assumes `self.buckets() == source.buckets()`.
     #[cfg_attr(feature = "inline-more", inline)]
     unsafe fn clone_from_impl(&mut self, source: &Self, mut on_panic: impl FnMut(&mut Self)) {
         // Copy the control bytes unchanged. We do this in a single pass
         source
+            .table
             .ctrl(0)
-            .copy_to_nonoverlapping(self.ctrl(0), self.num_ctrl_bytes());
+            .copy_to_nonoverlapping(self.table.ctrl(0), self.table.num_ctrl_bytes());
 
         // The cloning of elements may panic, in which case we need
         // to make sure we drop only the elements that have been
@@ -1286,7 +1576,7 @@
         let mut guard = guard((0, &mut *self), |(index, self_)| {
             if mem::needs_drop::<T>() && self_.len() != 0 {
                 for i in 0..=*index {
-                    if is_full(*self_.ctrl(i)) {
+                    if is_full(*self_.table.ctrl(i)) {
                         self_.bucket(i).drop();
                     }
                 }
@@ -1310,8 +1600,8 @@
         // Successfully cloned all items, no need to clean up.
         mem::forget(guard);
 
-        self.items = source.items;
-        self.growth_left = source.growth_left;
+        self.table.items = source.table.items;
+        self.table.growth_left = source.table.growth_left;
     }
 
     /// Variant of `clone_from` to use when a hasher is available.
@@ -1321,8 +1611,8 @@
         // elements one by one. We don't do this if we have the same number of
         // buckets as the source since we can just copy the contents directly
         // in that case.
-        if self.buckets() != source.buckets()
-            && bucket_mask_to_capacity(self.bucket_mask) >= source.len()
+        if self.table.buckets() != source.table.buckets()
+            && bucket_mask_to_capacity(self.table.bucket_mask) >= source.len()
         {
             self.clear();
 
@@ -1343,8 +1633,7 @@
                     // - there are no DELETED entries.
                     // - we know there is enough space in the table.
                     // - all elements are unique.
-                    let index = guard_self.find_insert_slot(hash);
-                    guard_self.set_ctrl(index, h2(hash));
+                    let (index, _) = guard_self.table.prepare_insert_slot(hash);
                     guard_self.bucket(index).write(item);
                 }
             }
@@ -1352,53 +1641,52 @@
             // Successfully cloned all items, no need to clean up.
             mem::forget(guard_self);
 
-            self.items = source.items;
-            self.growth_left -= source.items;
+            self.table.items = source.table.items;
+            self.table.growth_left -= source.table.items;
         } else {
             self.clone_from(source);
         }
     }
 }
 
+impl<T, A: Allocator + Clone + Default> Default for RawTable<T, A> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    fn default() -> Self {
+        Self::new_in(Default::default())
+    }
+}
+
 #[cfg(feature = "nightly")]
-unsafe impl<#[may_dangle] T> Drop for RawTable<T> {
+unsafe impl<#[may_dangle] T, A: Allocator + Clone> Drop for RawTable<T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn drop(&mut self) {
-        if !self.is_empty_singleton() {
+        if !self.table.is_empty_singleton() {
             unsafe {
-                if mem::needs_drop::<T>() && self.len() != 0 {
-                    for item in self.iter() {
-                        item.drop();
-                    }
-                }
+                self.drop_elements();
                 self.free_buckets();
             }
         }
     }
 }
 #[cfg(not(feature = "nightly"))]
-impl<T> Drop for RawTable<T> {
+impl<T, A: Allocator + Clone> Drop for RawTable<T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn drop(&mut self) {
-        if !self.is_empty_singleton() {
+        if !self.table.is_empty_singleton() {
             unsafe {
-                if mem::needs_drop::<T>() && self.len() != 0 {
-                    for item in self.iter() {
-                        item.drop();
-                    }
-                }
+                self.drop_elements();
                 self.free_buckets();
             }
         }
     }
 }
 
-impl<T> IntoIterator for RawTable<T> {
+impl<T, A: Allocator + Clone> IntoIterator for RawTable<T, A> {
     type Item = T;
-    type IntoIter = RawIntoIter<T>;
+    type IntoIter = RawIntoIter<T, A>;
 
     #[cfg_attr(feature = "inline-more", inline)]
-    fn into_iter(self) -> RawIntoIter<T> {
+    fn into_iter(self) -> RawIntoIter<T, A> {
         unsafe {
             let iter = self.iter();
             self.into_iter_from(iter)
@@ -1681,6 +1969,14 @@
             }
         }
     }
+
+    unsafe fn drop_elements(&mut self) {
+        if mem::needs_drop::<T>() && self.len() != 0 {
+            for item in self {
+                item.drop();
+            }
+        }
+    }
 }
 
 impl<T> Clone for RawIter<T> {
@@ -1720,62 +2016,55 @@
 impl<T> FusedIterator for RawIter<T> {}
 
 /// Iterator which consumes a table and returns elements.
-pub struct RawIntoIter<T> {
+pub struct RawIntoIter<T, A: Allocator + Clone = Global> {
     iter: RawIter<T>,
-    alloc: Option<(NonNull<u8>, Layout)>,
+    allocation: Option<(NonNull<u8>, Layout)>,
     marker: PhantomData<T>,
+    alloc: A,
 }
 
-impl<T> RawIntoIter<T> {
+impl<T, A: Allocator + Clone> RawIntoIter<T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn iter(&self) -> RawIter<T> {
         self.iter.clone()
     }
 }
 
-unsafe impl<T> Send for RawIntoIter<T> where T: Send {}
-unsafe impl<T> Sync for RawIntoIter<T> where T: Sync {}
+unsafe impl<T, A: Allocator + Clone> Send for RawIntoIter<T, A> where T: Send {}
+unsafe impl<T, A: Allocator + Clone> Sync for RawIntoIter<T, A> where T: Sync {}
 
 #[cfg(feature = "nightly")]
-unsafe impl<#[may_dangle] T> Drop for RawIntoIter<T> {
+unsafe impl<#[may_dangle] T, A: Allocator + Clone> Drop for RawIntoIter<T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn drop(&mut self) {
         unsafe {
             // Drop all remaining elements
-            if mem::needs_drop::<T>() && self.iter.len() != 0 {
-                while let Some(item) = self.iter.next() {
-                    item.drop();
-                }
-            }
+            self.iter.drop_elements();
 
             // Free the table
-            if let Some((ptr, layout)) = self.alloc {
-                dealloc(ptr.as_ptr(), layout);
+            if let Some((ptr, layout)) = self.allocation {
+                self.alloc.deallocate(ptr, layout);
             }
         }
     }
 }
 #[cfg(not(feature = "nightly"))]
-impl<T> Drop for RawIntoIter<T> {
+impl<T, A: Allocator + Clone> Drop for RawIntoIter<T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn drop(&mut self) {
         unsafe {
             // Drop all remaining elements
-            if mem::needs_drop::<T>() && self.iter.len() != 0 {
-                while let Some(item) = self.iter.next() {
-                    item.drop();
-                }
-            }
+            self.iter.drop_elements();
 
             // Free the table
-            if let Some((ptr, layout)) = self.alloc {
-                dealloc(ptr.as_ptr(), layout);
+            if let Some((ptr, layout)) = self.allocation {
+                self.alloc.deallocate(ptr, layout);
             }
         }
     }
 }
 
-impl<T> Iterator for RawIntoIter<T> {
+impl<T, A: Allocator + Clone> Iterator for RawIntoIter<T, A> {
     type Item = T;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -1789,44 +2078,40 @@
     }
 }
 
-impl<T> ExactSizeIterator for RawIntoIter<T> {}
-impl<T> FusedIterator for RawIntoIter<T> {}
+impl<T, A: Allocator + Clone> ExactSizeIterator for RawIntoIter<T, A> {}
+impl<T, A: Allocator + Clone> FusedIterator for RawIntoIter<T, A> {}
 
 /// Iterator which consumes elements without freeing the table storage.
-pub struct RawDrain<'a, T> {
+pub struct RawDrain<'a, T, A: Allocator + Clone = Global> {
     iter: RawIter<T>,
 
     // The table is moved into the iterator for the duration of the drain. This
     // ensures that an empty table is left if the drain iterator is leaked
     // without dropping.
-    table: ManuallyDrop<RawTable<T>>,
-    orig_table: NonNull<RawTable<T>>,
+    table: ManuallyDrop<RawTable<T, A>>,
+    orig_table: NonNull<RawTable<T, A>>,
 
     // We don't use a &'a mut RawTable<T> because we want RawDrain to be
     // covariant over T.
-    marker: PhantomData<&'a RawTable<T>>,
+    marker: PhantomData<&'a RawTable<T, A>>,
 }
 
-impl<T> RawDrain<'_, T> {
+impl<T, A: Allocator + Clone> RawDrain<'_, T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn iter(&self) -> RawIter<T> {
         self.iter.clone()
     }
 }
 
-unsafe impl<T> Send for RawDrain<'_, T> where T: Send {}
-unsafe impl<T> Sync for RawDrain<'_, T> where T: Sync {}
+unsafe impl<T, A: Allocator + Copy> Send for RawDrain<'_, T, A> where T: Send {}
+unsafe impl<T, A: Allocator + Copy> Sync for RawDrain<'_, T, A> where T: Sync {}
 
-impl<T> Drop for RawDrain<'_, T> {
+impl<T, A: Allocator + Clone> Drop for RawDrain<'_, T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn drop(&mut self) {
         unsafe {
             // Drop all remaining elements. Note that this may panic.
-            if mem::needs_drop::<T>() && self.iter.len() != 0 {
-                while let Some(item) = self.iter.next() {
-                    item.drop();
-                }
-            }
+            self.iter.drop_elements();
 
             // Reset the contents of the table now that all elements have been
             // dropped.
@@ -1840,7 +2125,7 @@
     }
 }
 
-impl<T> Iterator for RawDrain<'_, T> {
+impl<T, A: Allocator + Clone> Iterator for RawDrain<'_, T, A> {
     type Item = T;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -1857,14 +2142,19 @@
     }
 }
 
-impl<T> ExactSizeIterator for RawDrain<'_, T> {}
-impl<T> FusedIterator for RawDrain<'_, T> {}
+impl<T, A: Allocator + Clone> ExactSizeIterator for RawDrain<'_, T, A> {}
+impl<T, A: Allocator + Clone> FusedIterator for RawDrain<'_, T, A> {}
 
 /// Iterator over occupied buckets that could match a given hash.
 ///
 /// In rare cases, the iterator may return a bucket with a different hash.
-pub struct RawIterHash<'a, T> {
-    table: &'a RawTable<T>,
+pub struct RawIterHash<'a, T, A: Allocator + Clone = Global> {
+    inner: RawIterHashInner<'a, A>,
+    _marker: PhantomData<T>,
+}
+
+struct RawIterHashInner<'a, A: Allocator + Clone> {
+    table: &'a RawTableInner<A>,
 
     // The top 7 bits of the hash.
     h2_hash: u8,
@@ -1872,28 +2162,34 @@
     // The sequence of groups to probe in the search.
     probe_seq: ProbeSeq,
 
-    // The current group and its position.
-    pos: usize,
     group: Group,
 
     // The elements within the group with a matching h2-hash.
     bitmask: BitMaskIter,
 }
 
-impl<'a, T> RawIterHash<'a, T> {
-    fn new(table: &'a RawTable<T>, hash: u64) -> Self {
+impl<'a, T, A: Allocator + Clone> RawIterHash<'a, T, A> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    fn new(table: &'a RawTable<T, A>, hash: u64) -> Self {
+        RawIterHash {
+            inner: RawIterHashInner::new(&table.table, hash),
+            _marker: PhantomData,
+        }
+    }
+}
+impl<'a, A: Allocator + Clone> RawIterHashInner<'a, A> {
+    #[cfg_attr(feature = "inline-more", inline)]
+    fn new(table: &'a RawTableInner<A>, hash: u64) -> Self {
         unsafe {
             let h2_hash = h2(hash);
-            let mut probe_seq = table.probe_seq(hash);
-            let pos = probe_seq.next().unwrap();
-            let group = Group::load(table.ctrl(pos));
+            let probe_seq = table.probe_seq(hash);
+            let group = Group::load(table.ctrl(probe_seq.pos));
             let bitmask = group.match_byte(h2_hash).into_iter();
 
-            RawIterHash {
+            RawIterHashInner {
                 table,
                 h2_hash,
                 probe_seq,
-                pos,
                 group,
                 bitmask,
             }
@@ -1901,24 +2197,66 @@
     }
 }
 
-impl<'a, T> Iterator for RawIterHash<'a, T> {
+impl<'a, T, A: Allocator + Clone> Iterator for RawIterHash<'a, T, A> {
     type Item = Bucket<T>;
 
     fn next(&mut self) -> Option<Bucket<T>> {
         unsafe {
+            match self.inner.next() {
+                Some(index) => Some(self.inner.table.bucket(index)),
+                None => None,
+            }
+        }
+    }
+}
+
+impl<'a, A: Allocator + Clone> Iterator for RawIterHashInner<'a, A> {
+    type Item = usize;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        unsafe {
             loop {
                 if let Some(bit) = self.bitmask.next() {
-                    let index = (self.pos + bit) & self.table.bucket_mask;
-                    let bucket = self.table.bucket(index);
-                    return Some(bucket);
+                    let index = (self.probe_seq.pos + bit) & self.table.bucket_mask;
+                    return Some(index);
                 }
                 if likely(self.group.match_empty().any_bit_set()) {
                     return None;
                 }
-                self.pos = self.probe_seq.next().unwrap();
-                self.group = Group::load(self.table.ctrl(self.pos));
+                self.probe_seq.move_next(self.table.bucket_mask);
+                self.group = Group::load(self.table.ctrl(self.probe_seq.pos));
                 self.bitmask = self.group.match_byte(self.h2_hash).into_iter();
             }
         }
     }
 }
+
+#[cfg(test)]
+mod test_map {
+    use super::*;
+
+    #[test]
+    fn rehash() {
+        let mut table = RawTable::new();
+        let hasher = |i: &u64| *i;
+        for i in 0..100 {
+            table.insert(i, i, hasher);
+        }
+
+        for i in 0..100 {
+            unsafe {
+                assert_eq!(table.find(i, |x| *x == i).map(|b| b.read()), Some(i));
+            }
+            assert!(table.find(i + 100, |x| *x == i + 100).is_none());
+        }
+
+        table.rehash_in_place(hasher);
+
+        for i in 0..100 {
+            unsafe {
+                assert_eq!(table.find(i, |x| *x == i).map(|b| b.read()), Some(i));
+            }
+            assert!(table.find(i + 100, |x| *x == i + 100).is_none());
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/raw/sse2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/raw/sse2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/raw/sse2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/raw/sse2.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,12 +28,13 @@
     /// value for an empty hash table.
     ///
     /// This is guaranteed to be aligned to the group size.
+    #[allow(clippy::items_after_statements)]
     pub const fn static_empty() -> &'static [u8; Group::WIDTH] {
         #[repr(C)]
         struct AlignedBytes {
             _align: [Group; 0],
             bytes: [u8; Group::WIDTH],
-        };
+        }
         const ALIGNED_BYTES: AlignedBytes = AlignedBytes {
             _align: [],
             bytes: [EMPTY; Group::WIDTH],
@@ -45,7 +46,7 @@
     #[inline]
     #[allow(clippy::cast_ptr_alignment)] // unaligned load
     pub unsafe fn load(ptr: *const u8) -> Self {
-        Group(x86::_mm_loadu_si128(ptr as *const _))
+        Group(x86::_mm_loadu_si128(ptr.cast()))
     }
 
     /// Loads a group of bytes starting at the given address, which must be
@@ -55,7 +56,7 @@
     pub unsafe fn load_aligned(ptr: *const u8) -> Self {
         // FIXME: use align_offset once it stabilizes
         debug_assert_eq!(ptr as usize & (mem::align_of::<Self>() - 1), 0);
-        Group(x86::_mm_load_si128(ptr as *const _))
+        Group(x86::_mm_load_si128(ptr.cast()))
     }
 
     /// Stores the group of bytes to the given address, which must be
@@ -65,7 +66,7 @@
     pub unsafe fn store_aligned(self, ptr: *mut u8) {
         // FIXME: use align_offset once it stabilizes
         debug_assert_eq!(ptr as usize & (mem::align_of::<Self>() - 1), 0);
-        x86::_mm_store_si128(ptr as *mut _, self.0);
+        x86::_mm_store_si128(ptr.cast(), self.0);
     }
 
     /// Returns a `BitMask` indicating all bytes in the group which have
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/rustc_entry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/rustc_entry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/rustc_entry.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/rustc_entry.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,15 @@
 use self::RustcEntry::*;
-use crate::map::{make_hash, Drain, HashMap, IntoIter, Iter, IterMut};
-use crate::raw::{Bucket, RawTable};
+use crate::map::{make_insert_hash, Drain, HashMap, IntoIter, Iter, IterMut};
+use crate::raw::{Allocator, Bucket, Global, RawTable};
 use core::fmt::{self, Debug};
 use core::hash::{BuildHasher, Hash};
 use core::mem;
 
-impl<K, V, S> HashMap<K, V, S>
+impl<K, V, S, A> HashMap<K, V, S, A>
 where
     K: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     /// Gets the given key's corresponding entry in the map for in-place manipulation.
     ///
@@ -30,8 +31,8 @@
     /// assert_eq!(letters.get(&'y'), None);
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn rustc_entry(&mut self, key: K) -> RustcEntry<'_, K, V> {
-        let hash = make_hash(&self.hash_builder, &key);
+    pub fn rustc_entry(&mut self, key: K) -> RustcEntry<'_, K, V, A> {
+        let hash = make_insert_hash(&self.hash_builder, &key);
         if let Some(elem) = self.table.find(hash, |q| q.0.eq(&key)) {
             RustcEntry::Occupied(RustcOccupiedEntry {
                 key: Some(key),
@@ -59,15 +60,18 @@
 ///
 /// [`HashMap`]: struct.HashMap.html
 /// [`entry`]: struct.HashMap.html#method.rustc_entry
-pub enum RustcEntry<'a, K, V> {
+pub enum RustcEntry<'a, K, V, A = Global>
+where
+    A: Allocator + Clone,
+{
     /// An occupied entry.
-    Occupied(RustcOccupiedEntry<'a, K, V>),
+    Occupied(RustcOccupiedEntry<'a, K, V, A>),
 
     /// A vacant entry.
-    Vacant(RustcVacantEntry<'a, K, V>),
+    Vacant(RustcVacantEntry<'a, K, V, A>),
 }
 
-impl<K: Debug, V: Debug> Debug for RustcEntry<'_, K, V> {
+impl<K: Debug, V: Debug, A: Allocator + Clone> Debug for RustcEntry<'_, K, V, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             Vacant(ref v) => f.debug_tuple("Entry").field(v).finish(),
@@ -80,26 +84,31 @@
 /// It is part of the [`RustcEntry`] enum.
 ///
 /// [`RustcEntry`]: enum.RustcEntry.html
-pub struct RustcOccupiedEntry<'a, K, V> {
+pub struct RustcOccupiedEntry<'a, K, V, A = Global>
+where
+    A: Allocator + Clone,
+{
     key: Option<K>,
     elem: Bucket<(K, V)>,
-    table: &'a mut RawTable<(K, V)>,
+    table: &'a mut RawTable<(K, V), A>,
 }
 
-unsafe impl<K, V> Send for RustcOccupiedEntry<'_, K, V>
+unsafe impl<K, V, A> Send for RustcOccupiedEntry<'_, K, V, A>
 where
     K: Send,
     V: Send,
+    A: Allocator + Clone + Send,
 {
 }
-unsafe impl<K, V> Sync for RustcOccupiedEntry<'_, K, V>
+unsafe impl<K, V, A> Sync for RustcOccupiedEntry<'_, K, V, A>
 where
     K: Sync,
     V: Sync,
+    A: Allocator + Clone + Sync,
 {
 }
 
-impl<K: Debug, V: Debug> Debug for RustcOccupiedEntry<'_, K, V> {
+impl<K: Debug, V: Debug, A: Allocator + Clone> Debug for RustcOccupiedEntry<'_, K, V, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("OccupiedEntry")
             .field("key", self.key())
@@ -112,19 +121,22 @@
 /// It is part of the [`RustcEntry`] enum.
 ///
 /// [`RustcEntry`]: enum.RustcEntry.html
-pub struct RustcVacantEntry<'a, K, V> {
+pub struct RustcVacantEntry<'a, K, V, A = Global>
+where
+    A: Allocator + Clone,
+{
     hash: u64,
     key: K,
-    table: &'a mut RawTable<(K, V)>,
+    table: &'a mut RawTable<(K, V), A>,
 }
 
-impl<K: Debug, V> Debug for RustcVacantEntry<'_, K, V> {
+impl<K: Debug, V, A: Allocator + Clone> Debug for RustcVacantEntry<'_, K, V, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_tuple("VacantEntry").field(self.key()).finish()
     }
 }
 
-impl<'a, K, V> RustcEntry<'a, K, V> {
+impl<'a, K, V, A: Allocator + Clone> RustcEntry<'a, K, V, A> {
     /// Sets the value of the entry, and returns a RustcOccupiedEntry.
     ///
     /// # Examples
@@ -137,7 +149,7 @@
     ///
     /// assert_eq!(entry.key(), &"horseyland");
     /// ```
-    pub fn insert(self, value: V) -> RustcOccupiedEntry<'a, K, V> {
+    pub fn insert(self, value: V) -> RustcOccupiedEntry<'a, K, V, A> {
         match self {
             Vacant(entry) => entry.insert_entry(value),
             Occupied(mut entry) => {
@@ -253,7 +265,7 @@
     }
 }
 
-impl<'a, K, V: Default> RustcEntry<'a, K, V> {
+impl<'a, K, V: Default, A: Allocator + Clone> RustcEntry<'a, K, V, A> {
     /// Ensures a value is in the entry by inserting the default value if empty,
     /// and returns a mutable reference to the value in the entry.
     ///
@@ -281,7 +293,7 @@
     }
 }
 
-impl<'a, K, V> RustcOccupiedEntry<'a, K, V> {
+impl<'a, K, V, A: Allocator + Clone> RustcOccupiedEntry<'a, K, V, A> {
     /// Gets a reference to the key in the entry.
     ///
     /// # Examples
@@ -508,7 +520,7 @@
     }
 }
 
-impl<'a, K, V> RustcVacantEntry<'a, K, V> {
+impl<'a, K, V, A: Allocator + Clone> RustcVacantEntry<'a, K, V, A> {
     /// Gets a reference to the key that would be used when inserting a value
     /// through the `RustcVacantEntry`.
     ///
@@ -583,7 +595,7 @@
     /// }
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn insert_entry(self, value: V) -> RustcOccupiedEntry<'a, K, V> {
+    pub fn insert_entry(self, value: V) -> RustcOccupiedEntry<'a, K, V, A> {
         let bucket = self.table.insert_no_grow(self.hash, (self.key, value));
         RustcOccupiedEntry {
             key: None,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/scopeguard.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/scopeguard.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/scopeguard.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/scopeguard.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
     value: T,
 }
 
-#[cfg_attr(feature = "inline-more", inline)]
+#[inline]
 pub fn guard<T, F>(value: T, dropfn: F) -> ScopeGuard<T, F>
 where
     F: FnMut(&mut T),
@@ -22,7 +22,7 @@
     F: FnMut(&mut T),
 {
     type Target = T;
-    #[cfg_attr(feature = "inline-more", inline)]
+    #[inline]
     fn deref(&self) -> &T {
         &self.value
     }
@@ -32,7 +32,7 @@
 where
     F: FnMut(&mut T),
 {
-    #[cfg_attr(feature = "inline-more", inline)]
+    #[inline]
     fn deref_mut(&mut self) -> &mut T {
         &mut self.value
     }
@@ -42,7 +42,7 @@
 where
     F: FnMut(&mut T),
 {
-    #[cfg_attr(feature = "inline-more", inline)]
+    #[inline]
     fn drop(&mut self) {
         (self.dropfn)(&mut self.value)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/set.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/set.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/src/set.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/src/set.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,6 +8,7 @@
 use core::ops::{BitAnd, BitOr, BitXor, Sub};
 
 use super::map::{self, ConsumeAllOnDrop, DefaultHashBuilder, DrainFilterInner, HashMap, Keys};
+use crate::raw::{Allocator, Global};
 
 // Future Optimization (FIXME!)
 // =============================
@@ -71,7 +72,7 @@
 /// ```
 ///
 /// The easiest way to use `HashSet` with a custom type is to derive
-/// [`Eq`] and [`Hash`]. We must also derive [`PartialEq`], this will in the
+/// [`Eq`] and [`Hash`]. We must also derive [`PartialEq`]. This will in the
 /// future be implied by [`Eq`].
 ///
 /// ```
@@ -111,11 +112,11 @@
 /// [`HashMap`]: struct.HashMap.html
 /// [`PartialEq`]: https://doc.rust-lang.org/std/cmp/trait.PartialEq.html
 /// [`RefCell`]: https://doc.rust-lang.org/std/cell/struct.RefCell.html
-pub struct HashSet<T, S = DefaultHashBuilder> {
-    pub(crate) map: HashMap<T, (), S>,
+pub struct HashSet<T, S = DefaultHashBuilder, A: Allocator + Clone = Global> {
+    pub(crate) map: HashMap<T, (), S, A>,
 }
 
-impl<T: Clone, S: Clone> Clone for HashSet<T, S> {
+impl<T: Clone, S: Clone, A: Allocator + Clone> Clone for HashSet<T, S, A> {
     fn clone(&self) -> Self {
         HashSet {
             map: self.map.clone(),
@@ -167,73 +168,47 @@
     }
 }
 
-impl<T, S> HashSet<T, S> {
-    /// Creates a new empty hash set which will use the given hasher to hash
-    /// keys.
-    ///
-    /// The hash set is also created with the default initial capacity.
-    ///
-    /// Warning: `hasher` is normally randomly generated, and
-    /// is designed to allow `HashSet`s to be resistant to attacks that
-    /// cause many collisions and very poor performance. Setting it
-    /// manually using this function can expose a DoS attack vector.
-    ///
-    /// The `hash_builder` passed should implement the [`BuildHasher`] trait for
-    /// the HashMap to be useful, see its documentation for details.
+#[cfg(feature = "ahash")]
+impl<T: Hash + Eq, A: Allocator + Clone> HashSet<T, DefaultHashBuilder, A> {
+    /// Creates an empty `HashSet`.
     ///
+    /// The hash set is initially created with a capacity of 0, so it will not allocate until it
+    /// is first inserted into.
     ///
     /// # Examples
     ///
     /// ```
     /// use hashbrown::HashSet;
-    /// use hashbrown::hash_map::DefaultHashBuilder;
-    ///
-    /// let s = DefaultHashBuilder::default();
-    /// let mut set = HashSet::with_hasher(s);
-    /// set.insert(2);
+    /// let set: HashSet<i32> = HashSet::new();
     /// ```
-    ///
-    /// [`BuildHasher`]: ../../std/hash/trait.BuildHasher.html
     #[cfg_attr(feature = "inline-more", inline)]
-    pub const fn with_hasher(hasher: S) -> Self {
+    pub fn new_in(alloc: A) -> Self {
         Self {
-            map: HashMap::with_hasher(hasher),
+            map: HashMap::new_in(alloc),
         }
     }
 
-    /// Creates an empty `HashSet` with the specified capacity, using
-    /// `hasher` to hash the keys.
+    /// Creates an empty `HashSet` with the specified capacity.
     ///
     /// The hash set will be able to hold at least `capacity` elements without
     /// reallocating. If `capacity` is 0, the hash set will not allocate.
     ///
-    /// Warning: `hasher` is normally randomly generated, and
-    /// is designed to allow `HashSet`s to be resistant to attacks that
-    /// cause many collisions and very poor performance. Setting it
-    /// manually using this function can expose a DoS attack vector.
-    ///
-    /// The `hash_builder` passed should implement the [`BuildHasher`] trait for
-    /// the HashMap to be useful, see its documentation for details.
-    ///
     /// # Examples
     ///
     /// ```
     /// use hashbrown::HashSet;
-    /// use hashbrown::hash_map::DefaultHashBuilder;
-    ///
-    /// let s = DefaultHashBuilder::default();
-    /// let mut set = HashSet::with_capacity_and_hasher(10, s);
-    /// set.insert(1);
+    /// let set: HashSet<i32> = HashSet::with_capacity(10);
+    /// assert!(set.capacity() >= 10);
     /// ```
-    ///
-    /// [`BuildHasher`]: ../../std/hash/trait.BuildHasher.html
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn with_capacity_and_hasher(capacity: usize, hasher: S) -> Self {
+    pub fn with_capacity_in(capacity: usize, alloc: A) -> Self {
         Self {
-            map: HashMap::with_capacity_and_hasher(capacity, hasher),
+            map: HashMap::with_capacity_in(capacity, alloc),
         }
     }
+}
 
+impl<T, S, A: Allocator + Clone> HashSet<T, S, A> {
     /// Returns the number of elements the set can hold without reallocating.
     ///
     /// # Examples
@@ -323,7 +298,7 @@
     /// assert!(set.is_empty());
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn drain(&mut self) -> Drain<'_, T> {
+    pub fn drain(&mut self) -> Drain<'_, T, A> {
         Drain {
             iter: self.map.drain(),
         }
@@ -376,7 +351,7 @@
     /// assert_eq!(odds, vec![1, 3, 5, 7]);
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn drain_filter<F>(&mut self, f: F) -> DrainFilter<'_, T, F>
+    pub fn drain_filter<F>(&mut self, f: F) -> DrainFilter<'_, T, F, A>
     where
         F: FnMut(&T) -> bool,
     {
@@ -405,6 +380,134 @@
     pub fn clear(&mut self) {
         self.map.clear()
     }
+}
+
+impl<T, S> HashSet<T, S, Global> {
+    /// Creates a new empty hash set which will use the given hasher to hash
+    /// keys.
+    ///
+    /// The hash set is also created with the default initial capacity.
+    ///
+    /// Warning: `hasher` is normally randomly generated, and
+    /// is designed to allow `HashSet`s to be resistant to attacks that
+    /// cause many collisions and very poor performance. Setting it
+    /// manually using this function can expose a DoS attack vector.
+    ///
+    /// The `hash_builder` passed should implement the [`BuildHasher`] trait for
+    /// the HashMap to be useful, see its documentation for details.
+    ///
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use hashbrown::HashSet;
+    /// use hashbrown::hash_map::DefaultHashBuilder;
+    ///
+    /// let s = DefaultHashBuilder::default();
+    /// let mut set = HashSet::with_hasher(s);
+    /// set.insert(2);
+    /// ```
+    ///
+    /// [`BuildHasher`]: ../../std/hash/trait.BuildHasher.html
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub const fn with_hasher(hasher: S) -> Self {
+        Self {
+            map: HashMap::with_hasher(hasher),
+        }
+    }
+
+    /// Creates an empty `HashSet` with the specified capacity, using
+    /// `hasher` to hash the keys.
+    ///
+    /// The hash set will be able to hold at least `capacity` elements without
+    /// reallocating. If `capacity` is 0, the hash set will not allocate.
+    ///
+    /// Warning: `hasher` is normally randomly generated, and
+    /// is designed to allow `HashSet`s to be resistant to attacks that
+    /// cause many collisions and very poor performance. Setting it
+    /// manually using this function can expose a DoS attack vector.
+    ///
+    /// The `hash_builder` passed should implement the [`BuildHasher`] trait for
+    /// the HashMap to be useful, see its documentation for details.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use hashbrown::HashSet;
+    /// use hashbrown::hash_map::DefaultHashBuilder;
+    ///
+    /// let s = DefaultHashBuilder::default();
+    /// let mut set = HashSet::with_capacity_and_hasher(10, s);
+    /// set.insert(1);
+    /// ```
+    ///
+    /// [`BuildHasher`]: ../../std/hash/trait.BuildHasher.html
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn with_capacity_and_hasher(capacity: usize, hasher: S) -> Self {
+        Self {
+            map: HashMap::with_capacity_and_hasher(capacity, hasher),
+        }
+    }
+}
+
+impl<T, S, A> HashSet<T, S, A>
+where
+    A: Allocator + Clone,
+{
+    /// Creates a new empty hash set which will use the given hasher to hash
+    /// keys.
+    ///
+    /// The hash set is also created with the default initial capacity.
+    ///
+    /// Warning: `hasher` is normally randomly generated, and
+    /// is designed to allow `HashSet`s to be resistant to attacks that
+    /// cause many collisions and very poor performance. Setting it
+    /// manually using this function can expose a DoS attack vector.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use hashbrown::HashSet;
+    /// use hashbrown::hash_map::DefaultHashBuilder;
+    ///
+    /// let s = DefaultHashBuilder::default();
+    /// let mut set = HashSet::with_hasher(s);
+    /// set.insert(2);
+    /// ```
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn with_hasher_in(hasher: S, alloc: A) -> Self {
+        Self {
+            map: HashMap::with_hasher_in(hasher, alloc),
+        }
+    }
+
+    /// Creates an empty `HashSet` with the specified capacity, using
+    /// `hasher` to hash the keys.
+    ///
+    /// The hash set will be able to hold at least `capacity` elements without
+    /// reallocating. If `capacity` is 0, the hash set will not allocate.
+    ///
+    /// Warning: `hasher` is normally randomly generated, and
+    /// is designed to allow `HashSet`s to be resistant to attacks that
+    /// cause many collisions and very poor performance. Setting it
+    /// manually using this function can expose a DoS attack vector.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use hashbrown::HashSet;
+    /// use hashbrown::hash_map::DefaultHashBuilder;
+    ///
+    /// let s = DefaultHashBuilder::default();
+    /// let mut set = HashSet::with_capacity_and_hasher(10, s);
+    /// set.insert(1);
+    /// ```
+    #[cfg_attr(feature = "inline-more", inline)]
+    pub fn with_capacity_and_hasher_in(capacity: usize, hasher: S, alloc: A) -> Self {
+        Self {
+            map: HashMap::with_capacity_and_hasher_in(capacity, hasher, alloc),
+        }
+    }
 
     /// Returns a reference to the set's [`BuildHasher`].
     ///
@@ -426,10 +529,11 @@
     }
 }
 
-impl<T, S> HashSet<T, S>
+impl<T, S, A> HashSet<T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     /// Reserves capacity for at least `additional` more elements to be inserted
     /// in the `HashSet`. The collection may reserve more space to avoid
@@ -544,7 +648,7 @@
     /// assert_eq!(diff, [4].iter().collect());
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn difference<'a>(&'a self, other: &'a Self) -> Difference<'a, T, S> {
+    pub fn difference<'a>(&'a self, other: &'a Self) -> Difference<'a, T, S, A> {
         Difference {
             iter: self.iter(),
             other,
@@ -573,7 +677,7 @@
     /// assert_eq!(diff1, [1, 4].iter().collect());
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn symmetric_difference<'a>(&'a self, other: &'a Self) -> SymmetricDifference<'a, T, S> {
+    pub fn symmetric_difference<'a>(&'a self, other: &'a Self) -> SymmetricDifference<'a, T, S, A> {
         SymmetricDifference {
             iter: self.difference(other).chain(other.difference(self)),
         }
@@ -598,7 +702,7 @@
     /// assert_eq!(intersection, [2, 3].iter().collect());
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn intersection<'a>(&'a self, other: &'a Self) -> Intersection<'a, T, S> {
+    pub fn intersection<'a>(&'a self, other: &'a Self) -> Intersection<'a, T, S, A> {
         let (smaller, larger) = if self.len() <= other.len() {
             (self, other)
         } else {
@@ -629,8 +733,10 @@
     /// assert_eq!(union, [1, 2, 3, 4].iter().collect());
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    pub fn union<'a>(&'a self, other: &'a Self) -> Union<'a, T, S> {
-        let (smaller, larger) = if self.len() >= other.len() {
+    pub fn union<'a>(&'a self, other: &'a Self) -> Union<'a, T, S, A> {
+        // We'll iterate one set in full, and only the remaining difference from the other.
+        // Use the smaller set for the difference in order to reduce hash lookups.
+        let (smaller, larger) = if self.len() <= other.len() {
             (self, other)
         } else {
             (other, self)
@@ -967,10 +1073,11 @@
     }
 }
 
-impl<T, S> PartialEq for HashSet<T, S>
+impl<T, S, A> PartialEq for HashSet<T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn eq(&self, other: &Self) -> bool {
         if self.len() != other.len() {
@@ -981,40 +1088,53 @@
     }
 }
 
-impl<T, S> Eq for HashSet<T, S>
+impl<T, S, A> Eq for HashSet<T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
 }
 
-impl<T, S> fmt::Debug for HashSet<T, S>
+impl<T, S, A> fmt::Debug for HashSet<T, S, A>
 where
     T: Eq + Hash + fmt::Debug,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_set().entries(self.iter()).finish()
     }
 }
 
-impl<T, S> FromIterator<T> for HashSet<T, S>
+impl<T, S, A> From<HashMap<T, (), S, A>> for HashSet<T, S, A>
+where
+    A: Allocator + Clone,
+{
+    fn from(map: HashMap<T, (), S, A>) -> Self {
+        Self { map }
+    }
+}
+
+impl<T, S, A> FromIterator<T> for HashSet<T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher + Default,
+    A: Default + Allocator + Clone,
 {
     #[cfg_attr(feature = "inline-more", inline)]
     fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> Self {
-        let mut set = Self::with_hasher(Default::default());
+        let mut set = Self::with_hasher_in(Default::default(), Default::default());
         set.extend(iter);
         set
     }
 }
 
-impl<T, S> Extend<T> for HashSet<T, S>
+impl<T, S, A> Extend<T> for HashSet<T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     #[cfg_attr(feature = "inline-more", inline)]
     fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
@@ -1034,10 +1154,11 @@
     }
 }
 
-impl<'a, T, S> Extend<&'a T> for HashSet<T, S>
+impl<'a, T, S, A> Extend<&'a T> for HashSet<T, S, A>
 where
     T: 'a + Eq + Hash + Copy,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     #[cfg_attr(feature = "inline-more", inline)]
     fn extend<I: IntoIterator<Item = &'a T>>(&mut self, iter: I) {
@@ -1057,9 +1178,10 @@
     }
 }
 
-impl<T, S> Default for HashSet<T, S>
+impl<T, S, A> Default for HashSet<T, S, A>
 where
     S: Default,
+    A: Default + Allocator + Clone,
 {
     /// Creates an empty `HashSet<T, S>` with the `Default` value for the hasher.
     #[cfg_attr(feature = "inline-more", inline)]
@@ -1070,10 +1192,11 @@
     }
 }
 
-impl<T, S> BitOr<&HashSet<T, S>> for &HashSet<T, S>
+impl<T, S, A> BitOr<&HashSet<T, S, A>> for &HashSet<T, S, A>
 where
     T: Eq + Hash + Clone,
     S: BuildHasher + Default,
+    A: Allocator + Clone,
 {
     type Output = HashSet<T, S>;
 
@@ -1097,15 +1220,16 @@
     /// }
     /// assert_eq!(i, expected.len());
     /// ```
-    fn bitor(self, rhs: &HashSet<T, S>) -> HashSet<T, S> {
+    fn bitor(self, rhs: &HashSet<T, S, A>) -> HashSet<T, S> {
         self.union(rhs).cloned().collect()
     }
 }
 
-impl<T, S> BitAnd<&HashSet<T, S>> for &HashSet<T, S>
+impl<T, S, A> BitAnd<&HashSet<T, S, A>> for &HashSet<T, S, A>
 where
     T: Eq + Hash + Clone,
     S: BuildHasher + Default,
+    A: Allocator + Clone,
 {
     type Output = HashSet<T, S>;
 
@@ -1129,7 +1253,7 @@
     /// }
     /// assert_eq!(i, expected.len());
     /// ```
-    fn bitand(self, rhs: &HashSet<T, S>) -> HashSet<T, S> {
+    fn bitand(self, rhs: &HashSet<T, S, A>) -> HashSet<T, S> {
         self.intersection(rhs).cloned().collect()
     }
 }
@@ -1216,8 +1340,8 @@
 ///
 /// [`HashSet`]: struct.HashSet.html
 /// [`into_iter`]: struct.HashSet.html#method.into_iter
-pub struct IntoIter<K> {
-    iter: map::IntoIter<K, ()>,
+pub struct IntoIter<K, A: Allocator + Clone = Global> {
+    iter: map::IntoIter<K, (), A>,
 }
 
 /// A draining iterator over the items of a `HashSet`.
@@ -1227,8 +1351,8 @@
 ///
 /// [`HashSet`]: struct.HashSet.html
 /// [`drain`]: struct.HashSet.html#method.drain
-pub struct Drain<'a, K> {
-    iter: map::Drain<'a, K, ()>,
+pub struct Drain<'a, K, A: Allocator + Clone = Global> {
+    iter: map::Drain<'a, K, (), A>,
 }
 
 /// A draining iterator over entries of a `HashSet` which don't satisfy the predicate `f`.
@@ -1238,12 +1362,12 @@
 ///
 /// [`drain_filter`]: struct.HashSet.html#method.drain_filter
 /// [`HashSet`]: struct.HashSet.html
-pub struct DrainFilter<'a, K, F>
+pub struct DrainFilter<'a, K, F, A: Allocator + Clone = Global>
 where
     F: FnMut(&K) -> bool,
 {
     f: F,
-    inner: DrainFilterInner<'a, K, ()>,
+    inner: DrainFilterInner<'a, K, (), A>,
 }
 
 /// A lazy iterator producing elements in the intersection of `HashSet`s.
@@ -1253,11 +1377,11 @@
 ///
 /// [`HashSet`]: struct.HashSet.html
 /// [`intersection`]: struct.HashSet.html#method.intersection
-pub struct Intersection<'a, T, S> {
+pub struct Intersection<'a, T, S, A: Allocator + Clone = Global> {
     // iterator of the first set
     iter: Iter<'a, T>,
     // the second set
-    other: &'a HashSet<T, S>,
+    other: &'a HashSet<T, S, A>,
 }
 
 /// A lazy iterator producing elements in the difference of `HashSet`s.
@@ -1267,11 +1391,11 @@
 ///
 /// [`HashSet`]: struct.HashSet.html
 /// [`difference`]: struct.HashSet.html#method.difference
-pub struct Difference<'a, T, S> {
+pub struct Difference<'a, T, S, A: Allocator + Clone = Global> {
     // iterator of the first set
     iter: Iter<'a, T>,
     // the second set
-    other: &'a HashSet<T, S>,
+    other: &'a HashSet<T, S, A>,
 }
 
 /// A lazy iterator producing elements in the symmetric difference of `HashSet`s.
@@ -1281,8 +1405,8 @@
 ///
 /// [`HashSet`]: struct.HashSet.html
 /// [`symmetric_difference`]: struct.HashSet.html#method.symmetric_difference
-pub struct SymmetricDifference<'a, T, S> {
-    iter: Chain<Difference<'a, T, S>, Difference<'a, T, S>>,
+pub struct SymmetricDifference<'a, T, S, A: Allocator + Clone = Global> {
+    iter: Chain<Difference<'a, T, S, A>, Difference<'a, T, S, A>>,
 }
 
 /// A lazy iterator producing elements in the union of `HashSet`s.
@@ -1292,11 +1416,11 @@
 ///
 /// [`HashSet`]: struct.HashSet.html
 /// [`union`]: struct.HashSet.html#method.union
-pub struct Union<'a, T, S> {
-    iter: Chain<Iter<'a, T>, Difference<'a, T, S>>,
+pub struct Union<'a, T, S, A: Allocator + Clone = Global> {
+    iter: Chain<Iter<'a, T>, Difference<'a, T, S, A>>,
 }
 
-impl<'a, T, S> IntoIterator for &'a HashSet<T, S> {
+impl<'a, T, S, A: Allocator + Clone> IntoIterator for &'a HashSet<T, S, A> {
     type Item = &'a T;
     type IntoIter = Iter<'a, T>;
 
@@ -1306,9 +1430,9 @@
     }
 }
 
-impl<T, S> IntoIterator for HashSet<T, S> {
+impl<T, S, A: Allocator + Clone> IntoIterator for HashSet<T, S, A> {
     type Item = T;
-    type IntoIter = IntoIter<T>;
+    type IntoIter = IntoIter<T, A>;
 
     /// Creates a consuming iterator, that is, one that moves each value out
     /// of the set in arbitrary order. The set cannot be used after calling
@@ -1331,7 +1455,7 @@
     /// }
     /// ```
     #[cfg_attr(feature = "inline-more", inline)]
-    fn into_iter(self) -> IntoIter<T> {
+    fn into_iter(self) -> IntoIter<T, A> {
         IntoIter {
             iter: self.map.into_iter(),
         }
@@ -1372,7 +1496,7 @@
     }
 }
 
-impl<K> Iterator for IntoIter<K> {
+impl<K, A: Allocator + Clone> Iterator for IntoIter<K, A> {
     type Item = K;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -1388,22 +1512,22 @@
         self.iter.size_hint()
     }
 }
-impl<K> ExactSizeIterator for IntoIter<K> {
+impl<K, A: Allocator + Clone> ExactSizeIterator for IntoIter<K, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn len(&self) -> usize {
         self.iter.len()
     }
 }
-impl<K> FusedIterator for IntoIter<K> {}
+impl<K, A: Allocator + Clone> FusedIterator for IntoIter<K, A> {}
 
-impl<K: fmt::Debug> fmt::Debug for IntoIter<K> {
+impl<K: fmt::Debug, A: Allocator + Clone> fmt::Debug for IntoIter<K, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let entries_iter = self.iter.iter().map(|(k, _)| k);
         f.debug_list().entries(entries_iter).finish()
     }
 }
 
-impl<K> Iterator for Drain<'_, K> {
+impl<K, A: Allocator + Clone> Iterator for Drain<'_, K, A> {
     type Item = K;
 
     #[cfg_attr(feature = "inline-more", inline)]
@@ -1419,22 +1543,22 @@
         self.iter.size_hint()
     }
 }
-impl<K> ExactSizeIterator for Drain<'_, K> {
+impl<K, A: Allocator + Clone> ExactSizeIterator for Drain<'_, K, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn len(&self) -> usize {
         self.iter.len()
     }
 }
-impl<K> FusedIterator for Drain<'_, K> {}
+impl<K, A: Allocator + Clone> FusedIterator for Drain<'_, K, A> {}
 
-impl<K: fmt::Debug> fmt::Debug for Drain<'_, K> {
+impl<K: fmt::Debug, A: Allocator + Clone> fmt::Debug for Drain<'_, K, A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let entries_iter = self.iter.iter().map(|(k, _)| k);
         f.debug_list().entries(entries_iter).finish()
     }
 }
 
-impl<'a, K, F> Drop for DrainFilter<'a, K, F>
+impl<'a, K, F, A: Allocator + Clone> Drop for DrainFilter<'a, K, F, A>
 where
     F: FnMut(&K) -> bool,
 {
@@ -1448,7 +1572,7 @@
     }
 }
 
-impl<K, F> Iterator for DrainFilter<'_, K, F>
+impl<K, F, A: Allocator + Clone> Iterator for DrainFilter<'_, K, F, A>
 where
     F: FnMut(&K) -> bool,
 {
@@ -1467,9 +1591,12 @@
     }
 }
 
-impl<K, F> FusedIterator for DrainFilter<'_, K, F> where F: FnMut(&K) -> bool {}
+impl<K, F, A: Allocator + Clone> FusedIterator for DrainFilter<'_, K, F, A> where
+    F: FnMut(&K) -> bool
+{
+}
 
-impl<T, S> Clone for Intersection<'_, T, S> {
+impl<T, S, A: Allocator + Clone> Clone for Intersection<'_, T, S, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn clone(&self) -> Self {
         Intersection {
@@ -1479,10 +1606,11 @@
     }
 }
 
-impl<'a, T, S> Iterator for Intersection<'a, T, S>
+impl<'a, T, S, A> Iterator for Intersection<'a, T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     type Item = &'a T;
 
@@ -1503,24 +1631,26 @@
     }
 }
 
-impl<T, S> fmt::Debug for Intersection<'_, T, S>
+impl<T, S, A> fmt::Debug for Intersection<'_, T, S, A>
 where
     T: fmt::Debug + Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_list().entries(self.clone()).finish()
     }
 }
 
-impl<T, S> FusedIterator for Intersection<'_, T, S>
+impl<T, S, A> FusedIterator for Intersection<'_, T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
 }
 
-impl<T, S> Clone for Difference<'_, T, S> {
+impl<T, S, A: Allocator + Clone> Clone for Difference<'_, T, S, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn clone(&self) -> Self {
         Difference {
@@ -1530,10 +1660,11 @@
     }
 }
 
-impl<'a, T, S> Iterator for Difference<'a, T, S>
+impl<'a, T, S, A> Iterator for Difference<'a, T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     type Item = &'a T;
 
@@ -1554,24 +1685,26 @@
     }
 }
 
-impl<T, S> FusedIterator for Difference<'_, T, S>
+impl<T, S, A> FusedIterator for Difference<'_, T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
 }
 
-impl<T, S> fmt::Debug for Difference<'_, T, S>
+impl<T, S, A> fmt::Debug for Difference<'_, T, S, A>
 where
     T: fmt::Debug + Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_list().entries(self.clone()).finish()
     }
 }
 
-impl<T, S> Clone for SymmetricDifference<'_, T, S> {
+impl<T, S, A: Allocator + Clone> Clone for SymmetricDifference<'_, T, S, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn clone(&self) -> Self {
         SymmetricDifference {
@@ -1580,10 +1713,11 @@
     }
 }
 
-impl<'a, T, S> Iterator for SymmetricDifference<'a, T, S>
+impl<'a, T, S, A> Iterator for SymmetricDifference<'a, T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     type Item = &'a T;
 
@@ -1597,24 +1731,26 @@
     }
 }
 
-impl<T, S> FusedIterator for SymmetricDifference<'_, T, S>
+impl<T, S, A> FusedIterator for SymmetricDifference<'_, T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
 }
 
-impl<T, S> fmt::Debug for SymmetricDifference<'_, T, S>
+impl<T, S, A> fmt::Debug for SymmetricDifference<'_, T, S, A>
 where
     T: fmt::Debug + Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_list().entries(self.clone()).finish()
     }
 }
 
-impl<T, S> Clone for Union<'_, T, S> {
+impl<T, S, A: Allocator + Clone> Clone for Union<'_, T, S, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     fn clone(&self) -> Self {
         Union {
@@ -1623,27 +1759,30 @@
     }
 }
 
-impl<T, S> FusedIterator for Union<'_, T, S>
+impl<T, S, A> FusedIterator for Union<'_, T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
 }
 
-impl<T, S> fmt::Debug for Union<'_, T, S>
+impl<T, S, A> fmt::Debug for Union<'_, T, S, A>
 where
     T: fmt::Debug + Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_list().entries(self.clone()).finish()
     }
 }
 
-impl<'a, T, S> Iterator for Union<'a, T, S>
+impl<'a, T, S, A> Iterator for Union<'a, T, S, A>
 where
     T: Eq + Hash,
     S: BuildHasher,
+    A: Allocator + Clone,
 {
     type Item = &'a T;
 
@@ -1665,30 +1804,34 @@
     fn iter<'a, 'new>(v: Iter<'a, &'static str>) -> Iter<'a, &'new str> {
         v
     }
-    fn into_iter<'new>(v: IntoIter<&'static str>) -> IntoIter<&'new str> {
+    fn into_iter<'new, A: Allocator + Clone>(
+        v: IntoIter<&'static str, A>,
+    ) -> IntoIter<&'new str, A> {
         v
     }
-    fn difference<'a, 'new>(
-        v: Difference<'a, &'static str, DefaultHashBuilder>,
-    ) -> Difference<'a, &'new str, DefaultHashBuilder> {
+    fn difference<'a, 'new, A: Allocator + Clone>(
+        v: Difference<'a, &'static str, DefaultHashBuilder, A>,
+    ) -> Difference<'a, &'new str, DefaultHashBuilder, A> {
         v
     }
-    fn symmetric_difference<'a, 'new>(
-        v: SymmetricDifference<'a, &'static str, DefaultHashBuilder>,
-    ) -> SymmetricDifference<'a, &'new str, DefaultHashBuilder> {
+    fn symmetric_difference<'a, 'new, A: Allocator + Clone>(
+        v: SymmetricDifference<'a, &'static str, DefaultHashBuilder, A>,
+    ) -> SymmetricDifference<'a, &'new str, DefaultHashBuilder, A> {
         v
     }
-    fn intersection<'a, 'new>(
-        v: Intersection<'a, &'static str, DefaultHashBuilder>,
-    ) -> Intersection<'a, &'new str, DefaultHashBuilder> {
+    fn intersection<'a, 'new, A: Allocator + Clone>(
+        v: Intersection<'a, &'static str, DefaultHashBuilder, A>,
+    ) -> Intersection<'a, &'new str, DefaultHashBuilder, A> {
         v
     }
-    fn union<'a, 'new>(
-        v: Union<'a, &'static str, DefaultHashBuilder>,
-    ) -> Union<'a, &'new str, DefaultHashBuilder> {
+    fn union<'a, 'new, A: Allocator + Clone>(
+        v: Union<'a, &'static str, DefaultHashBuilder, A>,
+    ) -> Union<'a, &'new str, DefaultHashBuilder, A> {
         v
     }
-    fn drain<'new>(d: Drain<'static, &'static str>) -> Drain<'new, &'new str> {
+    fn drain<'new, A: Allocator + Clone>(
+        d: Drain<'static, &'static str, A>,
+    ) -> Drain<'new, &'new str, A> {
         d
     }
 }
@@ -1905,6 +2048,23 @@
     }
 
     #[test]
+    fn test_from_map() {
+        let mut a = crate::HashMap::new();
+        a.insert(1, ());
+        a.insert(2, ());
+        a.insert(3, ());
+        a.insert(4, ());
+
+        let a: HashSet<_> = a.into();
+
+        assert_eq!(a.len(), 4);
+        assert!(a.contains(&1));
+        assert!(a.contains(&2));
+        assert!(a.contains(&3));
+        assert!(a.contains(&4));
+    }
+
+    #[test]
     fn test_from_iter() {
         let xs = [1, 2, 2, 3, 4, 5, 6, 7, 8, 9];
 
@@ -2116,4 +2276,24 @@
         set.insert(19);
         assert!(set.contains(&19));
     }
+
+    #[test]
+    fn rehash_in_place() {
+        let mut set = HashSet::new();
+
+        for i in 0..224 {
+            set.insert(i);
+        }
+
+        assert_eq!(
+            set.capacity(),
+            224,
+            "The set must be at or close to capacity to trigger a re hashing"
+        );
+
+        for i in 100..1400 {
+            set.remove(&(i - 100));
+            set.insert(i);
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/tests/serde.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/tests/serde.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hashbrown/tests/serde.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hashbrown/tests/serde.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,24 +1,24 @@
 #![cfg(feature = "serde")]
 
 use core::hash::BuildHasherDefault;
+use fnv::FnvHasher;
 use hashbrown::{HashMap, HashSet};
-use rustc_hash::FxHasher;
 use serde_test::{assert_tokens, Token};
 
-// We use FxHash for this test because we rely on the ordering
-type FxHashMap<K, V> = HashMap<K, V, BuildHasherDefault<FxHasher>>;
-type FxHashSet<T> = HashSet<T, BuildHasherDefault<FxHasher>>;
+// We use FnvHash for this test because we rely on the ordering
+type FnvHashMap<K, V> = HashMap<K, V, BuildHasherDefault<FnvHasher>>;
+type FnvHashSet<T> = HashSet<T, BuildHasherDefault<FnvHasher>>;
 
 #[test]
 fn map_serde_tokens_empty() {
-    let map = FxHashMap::<char, u32>::default();
+    let map = FnvHashMap::<char, u32>::default();
 
     assert_tokens(&map, &[Token::Map { len: Some(0) }, Token::MapEnd]);
 }
 
 #[test]
 fn map_serde_tokens() {
-    let mut map = FxHashMap::default();
+    let mut map = FnvHashMap::default();
     map.insert('b', 20);
     map.insert('a', 10);
     map.insert('c', 30);
@@ -29,10 +29,10 @@
             Token::Map { len: Some(3) },
             Token::Char('a'),
             Token::I32(10),
-            Token::Char('b'),
-            Token::I32(20),
             Token::Char('c'),
             Token::I32(30),
+            Token::Char('b'),
+            Token::I32(20),
             Token::MapEnd,
         ],
     );
@@ -40,14 +40,14 @@
 
 #[test]
 fn set_serde_tokens_empty() {
-    let set = FxHashSet::<u32>::default();
+    let set = FnvHashSet::<u32>::default();
 
     assert_tokens(&set, &[Token::Seq { len: Some(0) }, Token::SeqEnd]);
 }
 
 #[test]
 fn set_serde_tokens() {
-    let mut set = FxHashSet::default();
+    let mut set = FnvHashSet::default();
     set.insert(20);
     set.insert(10);
     set.insert(30);
@@ -56,9 +56,9 @@
         &set,
         &[
             Token::Seq { len: Some(3) },
+            Token::I32(30),
             Token::I32(20),
             Token::I32(10),
-            Token::I32(30),
             Token::SeqEnd,
         ],
     );
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"3c88a36055be39c38da32957888c3117c6f9f6f146d0cdbfa9dd7c8e3f22f89e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"49707c0d6a7106b876e8012610e972bd8ce56427626577b7ab9d1b32e9021826","no_step_on_snek.png":"186b86731f5f07178c96da78debaeb1dcb9b5e2876a68b05e3f0f14370af4cf2","src/camel.rs":"4e0b944d83263a1ab7aec2cf0631e5c2635f2f49858c970d83019c2ca8b13d2a","src/kebab.rs":"66cba497fd1c01fec7ee265de774459779c0c459175ac72dcc754306716c513b","src/lib.rs":"93274cc28d0e24e4804de04ca7cb1e4ed1ec5deb33fb4a28b2d4e16220092873","src/mixed.rs":"4e79c4d51cfd938a6f4d5e86172d28f3429ea921a201adce68c3b263212296da","src/shouty_kebab.rs":"e40c60b641b7e04e066fa88524e1fd9f6f24f846ee6d2938b8c40da689fff27b","src/shouty_snake.rs":"5a46ec977f4490d42baf9851e5e0cf0096d9136eecc056191abf2258c3a269d7","src/snake.rs":"d70362386966c06e8208da64f90465cf94d59ba1b814fd1313e5bc8663cd9b6e","src/title.rs":"873666d445604aea6df8295ab8937ca6480e22c645d16799280101e57962fb6a"},"package":"87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"}
\ No newline at end of file
+{"files":{"Cargo.toml":"3e248a2487c80993370f242f8fbb5668f8b36a1ac9bdda89ca546d100d72b822","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"c82d9896b3309c1c590d50abe1c7fa704fd6df07f1d804915aa8646c608605ac","src/camel.rs":"1a061461a18e6dc148fb7c0d053382cacb656b937dc4ee086d74c7260b385a7e","src/kebab.rs":"a372d2aecffbf9cd860965ad703b1aa894b1cbc9f4d9d0fa9aee5372844eb24d","src/lib.rs":"a3709f595e5fcacdadb1a7074ff29a8e11fd5d75327dfafc1edac26fa5925d09","src/mixed.rs":"47ce940d45495ef3c5f9566988e2123703c2d857a3e88ec90d8d59df8d7b68e5","src/shouty_kebab.rs":"ca8dd79a2ed5c20911c970e2cd92cbf1402530d48ffe68b75960e7374bb7ffa8","src/shouty_snake.rs":"d27cea681a8c0cd31f31112b803b9bb6a0cccdc20fbebe5d524c684972899cd5","src/snake.rs":"dade07b8cd12bf4c098be7d4ad963957662d4a7105cbe7052262dcadad2daae2","src/title.rs":"5c6f0fdb66fa6421a65a036a9b111598684078716a60ce10f81f8e44bb06cceb"},"package":"6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,8 +13,9 @@
 [package]
 edition = "2018"
 name = "heck"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Without Boats <woboats@gmail.com>"]
+include = ["src/**/*", "LICENSE-*", "README.md", "CHANGELOG.md"]
 description = "heck is a case conversion library."
 homepage = "https://github.com/withoutboats/heck"
 documentation = "https://docs.rs/heck"
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/no_step_on_snek.png and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/no_step_on_snek.png differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 # **heck** is a case conversion library
 
-!["I specifically requested the opposite of this."](https://github.com/withoutboats/heck/blob/master/no_step_on_snek.png)
+!["I specifically requested the opposite of this."](./no_step_on_snek.png)
 
 This library exists to provide case conversion between common cases like
 CamelCase and snake_case. It is intended to be unicode aware, internally
@@ -28,7 +28,7 @@
 "hello_world", not the exact same string). Leading or trailing word boundary
 indicators are dropped, except insofar as CamelCase capitalizes the first word.
 
-### Cases contained in this library:
+## Cases contained in this library:
 
 1. CamelCase
 2. snake_case
@@ -38,7 +38,7 @@
 6. Title Case
 7. SHOUTY-KEBAB-CASE
 
-### Contributing
+## Contributing
 
 PRs of additional well-established cases welcome.
 
@@ -48,7 +48,14 @@
 
 Bug reports & fixes always welcome. :-)
 
-### License
+## MSRV
+
+The minimum supported Rust version for this crate is 1.32.0. This may change in
+minor or patch releases, but we probably won't ever require a very recent
+version. If you would like to have a stronger guarantee than that, please open
+an issue.
+
+## License
 
 heck is distributed under the terms of both the MIT license and the
 Apache License (Version 2.0).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/camel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/camel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/camel.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/camel.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
             fn $t() {
                 assert_eq!($s1.to_camel_case(), $s2)
             }
-        }
+        };
     }
 
     t!(test1: "CamelCase" => "CamelCase");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/kebab.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/kebab.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/kebab.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/kebab.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,7 +33,7 @@
             fn $t() {
                 assert_eq!($s1.to_kebab_case(), $s2)
             }
-        }
+        };
     }
 
     t!(test1: "CamelCase" => "camel-case");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,14 +7,15 @@
 //! ## Definition of a word boundary
 //!
 //! Word boundaries are defined as the "unicode words" defined in the
-//! `unicode_segmentation` library, as well as within those words in this manner:
+//! `unicode_segmentation` library, as well as within those words in this
+//! manner:
 //!
 //! 1. All underscore characters are considered word boundaries.
-//! 2. If an uppercase character is followed by lowercase letters, a word boundary
-//! is considered to be just prior to that uppercase character.
-//! 3. If multiple uppercase characters are consecutive, they are considered to be
-//! within a single word, except that the last will be part of the next word if it
-//! is followed by lowercase characters (see rule 2).
+//! 2. If an uppercase character is followed by lowercase letters, a word
+//! boundary is considered to be just prior to that uppercase character.
+//! 3. If multiple uppercase characters are consecutive, they are considered to
+//! be within a single word, except that the last will be part of the next word
+//! if it is followed by lowercase characters (see rule 2).
 //!
 //! That is, "HelloWorld" is segmented `Hello|World` whereas "XMLHttpRequest" is
 //! segmented `XML|Http|Request`.
@@ -24,7 +25,8 @@
 //! being converted to. Multiple adjacent word boundaries (such as a series of
 //! underscores) are folded into one. ("hello__world" in snake case is therefore
 //! "hello_world", not the exact same string). Leading or trailing word boundary
-//! indicators are dropped, except insofar as CamelCase capitalizes the first word.
+//! indicators are dropped, except insofar as CamelCase capitalizes the first
+//! word.
 //!
 //! ### Cases contained in this library:
 //!
@@ -58,18 +60,21 @@
 fn transform<F, G>(s: &str, with_word: F, boundary: G) -> String
 where
     F: Fn(&str, &mut String),
-    G: Fn(&mut String)
+    G: Fn(&mut String),
 {
-
-    /// Tracks the current 'mode' of the transformation algorithm as it scans the input string.
+    /// Tracks the current 'mode' of the transformation algorithm as it scans
+    /// the input string.
     ///
-    /// The mode is a tri-state which tracks the case of the last cased character of the current
-    /// word. If there is no cased character (either lowercase or uppercase) since the previous
-    /// word boundary, than the mode is `Boundary`. If the last cased character is lowercase, then
-    /// the mode is `Lowercase`. Othertherwise, the mode is `Uppercase`.
+    /// The mode is a tri-state which tracks the case of the last cased
+    /// character of the current word. If there is no cased character
+    /// (either lowercase or uppercase) since the previous word boundary,
+    /// than the mode is `Boundary`. If the last cased character is lowercase,
+    /// then the mode is `Lowercase`. Othertherwise, the mode is
+    /// `Uppercase`.
     #[derive(Clone, Copy, PartialEq)]
     enum WordMode {
-        /// There have been no lowercase or uppercase characters in the current word.
+        /// There have been no lowercase or uppercase characters in the current
+        /// word.
         Boundary,
         /// The previous cased character in the current word is lowercase.
         Lowercase,
@@ -88,14 +93,15 @@
         while let Some((i, c)) = char_indices.next() {
             // Skip underscore characters
             if c == '_' {
-                if init == i { init += 1; }
-                continue
+                if init == i {
+                    init += 1;
+                }
+                continue;
             }
 
             if let Some(&(next_i, next)) = char_indices.peek() {
-
-                // The mode including the current character, assuming the current character does
-                // not result in a word boundary.
+                // The mode including the current character, assuming the
+                // current character does not result in a word boundary.
                 let next_mode = if c.is_lowercase() {
                     WordMode::Lowercase
                 } else if c.is_uppercase() {
@@ -107,7 +113,9 @@
                 // Word boundary after if next is underscore or current is
                 // not uppercase and next is uppercase
                 if next == '_' || (next_mode == WordMode::Lowercase && next.is_uppercase()) {
-                    if !first_word { boundary(&mut out); }
+                    if !first_word {
+                        boundary(&mut out);
+                    }
                     with_word(&word[init..next_i], &mut out);
                     first_word = false;
                     init = next_i;
@@ -116,8 +124,11 @@
                 // Otherwise if current and previous are uppercase and next
                 // is lowercase, word boundary before
                 } else if mode == WordMode::Uppercase && c.is_uppercase() && next.is_lowercase() {
-                    if !first_word { boundary(&mut out); }
-                    else { first_word = false; }
+                    if !first_word {
+                        boundary(&mut out);
+                    } else {
+                        first_word = false;
+                    }
                     with_word(&word[init..i], &mut out);
                     init = i;
                     mode = WordMode::Boundary;
@@ -128,8 +139,11 @@
                 }
             } else {
                 // Collect trailing characters as a word
-                if !first_word { boundary(&mut out); }
-                else { first_word = false; }
+                if !first_word {
+                    boundary(&mut out);
+                } else {
+                    first_word = false;
+                }
                 with_word(&word[init..], &mut out);
                 break;
             }
@@ -150,7 +164,7 @@
     }
 }
 
-fn uppercase(s: &str, out: &mut String ) {
+fn uppercase(s: &str, out: &mut String) {
     for c in s.chars() {
         out.extend(c.to_uppercase())
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/mixed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/mixed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/mixed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/mixed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,10 +20,17 @@
 
 impl MixedCase for str {
     fn to_mixed_case(&self) -> String {
-        transform(self, |s, out| {
-            if out.is_empty() { lowercase(s, out); }
-            else { capitalize(s, out) }
-        }, |_| {})
+        transform(
+            self,
+            |s, out| {
+                if out.is_empty() {
+                    lowercase(s, out);
+                } else {
+                    capitalize(s, out)
+                }
+            },
+            |_| {},
+        )
     }
 }
 
@@ -37,7 +44,7 @@
             fn $t() {
                 assert_eq!($s1.to_mixed_case(), $s2)
             }
-        }
+        };
     }
 
     t!(test1: "CamelCase" => "camelCase");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/shouty_kebab.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/shouty_kebab.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/shouty_kebab.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/shouty_kebab.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
             fn $t() {
                 assert_eq!($s1.to_shouty_kebab_case(), $s2)
             }
-        }
+        };
     }
 
     t!(test1: "CamelCase" => "CAMEL-CASE");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/shouty_snake.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/shouty_snake.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/shouty_snake.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/shouty_snake.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,8 +18,8 @@
     fn to_shouty_snake_case(&self) -> Self::Owned;
 }
 
-/// Oh heck, ShoutySnekCase is an alias for ShoutySnakeCase. See ShoutySnakeCase for
-/// more documentation.
+/// Oh heck, ShoutySnekCase is an alias for ShoutySnakeCase. See ShoutySnakeCase
+/// for more documentation.
 pub trait ShoutySnekCase: ToOwned {
     /// CONVERT THIS TYPE TO SNEK CASE.
     #[allow(non_snake_case)]
@@ -32,7 +32,6 @@
     }
 }
 
-
 impl ShoutySnakeCase for str {
     fn to_shouty_snake_case(&self) -> Self::Owned {
         transform(self, uppercase, |s| s.push('_'))
@@ -49,7 +48,7 @@
             fn $t() {
                 assert_eq!($s1.to_shouty_snake_case(), $s2)
             }
-        }
+        };
     }
 
     t!(test1: "CamelCase" => "CAMEL_CASE");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/snake.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/snake.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/snake.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/snake.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,7 +46,7 @@
             fn $t() {
                 assert_eq!($s1.to_snake_case(), $s2)
             }
-        }
+        };
     }
 
     t!(test1: "CamelCase" => "camel_case");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/title.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/title.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/heck/src/title.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/heck/src/title.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
             fn $t() {
                 assert_eq!($s1.to_title_case(), $s2)
             }
-        }
+        };
     }
 
     t!(test1: "CamelCase" => "Camel Case");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hermit-abi/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hermit-abi/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hermit-abi/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hermit-abi/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"57aa1eca2149cce3353a30c54f3811d9de010e84ead178d329f42a4c545fe5dc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"322fadd63e558e5a10caf980cbedf83ac1546ba40fd992f54492e21ce54205af","rust-toolchain":"58bea07cb6d97f9cfcd5c8f98b1feca0fb81cce5b0bf29a8e70ed2641956e9a6","src/lib.rs":"410a9e2bc99747c9613058cff1c362dc2d3d94a8f8cf4107f98b4c3901cef241","src/tcplistener.rs":"c6e2db06d4265fa0956851e1c965336d60c53ab21573729aae76ecfe0ccc84c3","src/tcpstream.rs":"38a17de54213faf9de217f6146ff86ee75b67d4404a532b1419903269200936b"},"package":"5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"}
\ No newline at end of file
+{"files":{"Cargo.toml":"023c46a92caf2fc7a31fba3e7d4428a287e1fbdef822ed7e9a8f91284a30b387","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"322fadd63e558e5a10caf980cbedf83ac1546ba40fd992f54492e21ce54205af","rust-toolchain":"58bea07cb6d97f9cfcd5c8f98b1feca0fb81cce5b0bf29a8e70ed2641956e9a6","src/lib.rs":"c7dca30b651c91590ff46370bdaa10214062b9456395fb4bd549dedbf457c695","src/tcplistener.rs":"c6e2db06d4265fa0956851e1c965336d60c53ab21573729aae76ecfe0ccc84c3","src/tcpstream.rs":"38a17de54213faf9de217f6146ff86ee75b67d4404a532b1419903269200936b"},"package":"62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hermit-abi/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hermit-abi/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hermit-abi/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hermit-abi/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.19"
 authors = ["Stefan Lankes"]
 description = "hermit-abi is small interface to call functions from the unikernel RustyHermit.\nIt is used to build the target `x86_64-unknown-hermit`.\n"
 documentation = "https://hermitcore.github.io/rusty-hermit/hermit_abi"
@@ -26,7 +26,7 @@
 default-target = "x86_64-unknown-hermit"
 features = ["docs"]
 [dependencies.compiler_builtins]
-version = "0.1.0"
+version = "0.1"
 optional = true
 
 [dependencies.core]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hermit-abi/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hermit-abi/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hermit-abi/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hermit-abi/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,10 @@
 //! `hermit-abi` is small interface to call functions from the unikernel
 //! [RustyHermit](https://github.com/hermitcore/libhermit-rs).
 
-#![cfg_attr(feature = "rustc-dep-of-std", no_std)]
-#![feature(const_raw_ptr_to_usize_cast)]
+#![no_std]
+#![allow(clippy::missing_safety_doc)]
+#![allow(clippy::result_unit_err)]
+
 extern crate libc;
 
 pub mod tcplistener;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/benches/method.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/benches/method.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/benches/method.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/benches/method.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+#![feature(test)]
+
+extern crate test;
+
+use http::method::Method;
+use test::Bencher;
+
+fn make_all_methods() -> Vec<Vec<u8>> {
+    vec![
+        b"OPTIONS".to_vec(),
+        b"GET".to_vec(),
+        b"POST".to_vec(),
+        b"PUT".to_vec(),
+        b"DELETE".to_vec(),
+        b"HEAD".to_vec(),
+        b"TRACE".to_vec(),
+        b"CONNECT".to_vec(),
+        b"PATCH".to_vec(),
+        b"CUSTOM_SHORT".to_vec(),
+        b"CUSTOM_LONG_METHOD".to_vec(),
+    ]
+}
+
+#[bench]
+fn method_easy(b: &mut Bencher) {
+    let name = b"GET";
+    b.iter(|| {
+        Method::from_bytes(&name[..]).unwrap();
+    });
+}
+
+#[bench]
+fn method_various(b: &mut Bencher) {
+    let all_methods = make_all_methods();
+    b.iter(|| {
+        for name in &all_methods {
+            Method::from_bytes(name.as_slice()).unwrap();
+        }
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"da516bd5dd955497184131d1ad049c7387c65beeccf887341a8b49797fccac7c","Cargo.toml":"8d455a06fd7ebbaffb320a2bb271436a2af4e14efde8ac0e0b4c01f17ff47221","LICENSE-APACHE":"8bb1b50b0e5c9399ae33bd35fab2769010fa6c14e8860c729a52295d84896b7a","LICENSE-MIT":"dc91f8200e4b2a1f9261035d4c18c33c246911a6c0f7b543d75347e61b249cff","README.md":"006da76b9d578dc69162a15462840fea998b1a2fcc14f689f91d2c92cab91c8f","benches/header_map/basic.rs":"7aa1f667be9b7fd2aab249a6ca6cfa2f06229c79d3406a8354d07bf9ccf09fd8","benches/header_map/mod.rs":"c1a4c7291b94d2477c1aa6721a5cfbd3dc63242baf14b836138273830cc67990","benches/header_map/vec_map.rs":"48f4eb7a90b6f0844a445924cf24c80acfaf76f909acca4492bfeb9b1ea9e4a4","benches/header_name.rs":"ae65e76147a0251cf0191edbed5961c99cc9407f2eba006d8f59b4c2dc636c1e","benches/header_value.rs":"7aa588f2155c513b7aebfe0b1cc7f7c6b0a699fafd817fe2fee8e46fb131bd76","benches/uri.rs":"fbc88c25bc27d39162c674c162d1e40c8139452fbfb891a7caebb3c225baa1ae","src/byte_str.rs":"f003f02bc7fa087382c1d54a4d87b16e1cc9289385a93ebf39ad79ff663ef042","src/convert.rs":"a31a4351cd3ee36a58ff4f5b30ce2c8967cde8486faea2d2673a8f8cb74b3204","src/error.rs":"8163a0b4f659a0f0070559568a7b553a5370553a4570bb496811ca3b978046bf","src/extensions.rs":"ab549bfdcc51484a7faed0f4990005bc48e2fa62031bb55d9882ba9f928e1f9c","src/header/map.rs":"b5dba93de3b9f5035b5f8c444e8c21d1f53b3c65cc258aff7a284366a55123fa","src/header/mod.rs":"b91ee39f0f76aba6a2ca4e818126d0185272c150c29a43dfbec60891d213c45a","src/header/name.rs":"99fa06e941baf9c1cfecbfca8bd73bde38e13b2271e4d86eaff81623a7861935","src/header/value.rs":"735e1179687b7d03ff20f47ef7c3418b004f37163cca7d47f0fb0065fb6e042c","src/lib.rs":"f42c3d04cbfd2d935e8c94cf55d08a3233aaef7a5bd6dd4d1a28f1af7b282cba","src/method.rs":"1de55021d29174c462ed60042d0d263276af131a25c4d942c91afb09622644f8","src/request.rs":"30ba860a7d3ff6fc0bcd443490452771f417d7a977d6c278f2c277017aee2a18","src/response.rs":"f31bd4cc6d499727a8814f814ceb6f6e0d206cc940e6c7eb0e45ef6a94fad0b0","src/status.rs":"fd9d1c1670bde5f94934ff2a9fa9c7f2db5bbe32a750e4e202bf2775b5c5cac3","src/uri/authority.rs":"090dbb905848fb3ec37d77f6c4fadda1e5e5be444d1db97d60869db14fb876f2","src/uri/builder.rs":"875506b3a603a6e35557548ed0cf3beb7de0a4d1c898316e7293f3bc2ffb05c5","src/uri/mod.rs":"5a463efdfe7b68a49417c85289ae9d33fdc5c0595bb78fbdce7b68b20a564207","src/uri/path.rs":"16bead9e68c9330c33ea35ca1720d42b7643cccf026c489ef35af04663fa5afe","src/uri/port.rs":"a30793678abc96e833d026d96f060244183ab631e19eafbbad8e4643c7bb9d86","src/uri/scheme.rs":"59e6f12d3e1e1ee982e68a4a6556f25e94073ca3d77c372b6d8d71daf8f62f2a","src/uri/tests.rs":"61f88b73490c2442ec12cb0829aa1ddd28f1bce874b4fc6dd7a544c80280aeb1","src/version.rs":"623ef60a450203b051f3457e2f095508b66aaaa799b1447fb1b34d92cb2e7d62","tests/header_map.rs":"b81993a9042c21fd64114fb099b1666ea4685246f4f1c76bac72b825b6a3741b","tests/header_map_fuzz.rs":"a71387a8e1a3906f713a00cde443790cd7a86b7e37cafa2f9ed4d432cbf97026","tests/status_code.rs":"2e61889b07a87645465847b6245b681e022e7867a9d25f5e07f71c5ba02e7c7a"},"package":"84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"57882187326c394610777fca060b54d357533cb21debb19ff7de9681e49e5fd6","Cargo.toml":"a7383d39b1dd887101f1f05fd781c128f998997b6619b2a85cf9667a7bd827bf","LICENSE-APACHE":"8bb1b50b0e5c9399ae33bd35fab2769010fa6c14e8860c729a52295d84896b7a","LICENSE-MIT":"dc91f8200e4b2a1f9261035d4c18c33c246911a6c0f7b543d75347e61b249cff","README.md":"006da76b9d578dc69162a15462840fea998b1a2fcc14f689f91d2c92cab91c8f","benches/header_map/basic.rs":"7aa1f667be9b7fd2aab249a6ca6cfa2f06229c79d3406a8354d07bf9ccf09fd8","benches/header_map/mod.rs":"c1a4c7291b94d2477c1aa6721a5cfbd3dc63242baf14b836138273830cc67990","benches/header_map/vec_map.rs":"48f4eb7a90b6f0844a445924cf24c80acfaf76f909acca4492bfeb9b1ea9e4a4","benches/header_name.rs":"ae65e76147a0251cf0191edbed5961c99cc9407f2eba006d8f59b4c2dc636c1e","benches/header_value.rs":"7aa588f2155c513b7aebfe0b1cc7f7c6b0a699fafd817fe2fee8e46fb131bd76","benches/method.rs":"1913b8c95ecf542e9e50e20ff645f4024036e9b89f04a83e06303bf423053508","benches/uri.rs":"fbc88c25bc27d39162c674c162d1e40c8139452fbfb891a7caebb3c225baa1ae","src/byte_str.rs":"f003f02bc7fa087382c1d54a4d87b16e1cc9289385a93ebf39ad79ff663ef042","src/convert.rs":"a31a4351cd3ee36a58ff4f5b30ce2c8967cde8486faea2d2673a8f8cb74b3204","src/error.rs":"8163a0b4f659a0f0070559568a7b553a5370553a4570bb496811ca3b978046bf","src/extensions.rs":"ab549bfdcc51484a7faed0f4990005bc48e2fa62031bb55d9882ba9f928e1f9c","src/header/map.rs":"b5dba93de3b9f5035b5f8c444e8c21d1f53b3c65cc258aff7a284366a55123fa","src/header/mod.rs":"b91ee39f0f76aba6a2ca4e818126d0185272c150c29a43dfbec60891d213c45a","src/header/name.rs":"99fa06e941baf9c1cfecbfca8bd73bde38e13b2271e4d86eaff81623a7861935","src/header/value.rs":"735e1179687b7d03ff20f47ef7c3418b004f37163cca7d47f0fb0065fb6e042c","src/lib.rs":"5d52e385fbb2e7e3298270014a952bf16dfe962002475dde6c187bc2b1ce95ce","src/method.rs":"1de55021d29174c462ed60042d0d263276af131a25c4d942c91afb09622644f8","src/request.rs":"30ba860a7d3ff6fc0bcd443490452771f417d7a977d6c278f2c277017aee2a18","src/response.rs":"f31bd4cc6d499727a8814f814ceb6f6e0d206cc940e6c7eb0e45ef6a94fad0b0","src/status.rs":"fd9d1c1670bde5f94934ff2a9fa9c7f2db5bbe32a750e4e202bf2775b5c5cac3","src/uri/authority.rs":"090dbb905848fb3ec37d77f6c4fadda1e5e5be444d1db97d60869db14fb876f2","src/uri/builder.rs":"875506b3a603a6e35557548ed0cf3beb7de0a4d1c898316e7293f3bc2ffb05c5","src/uri/mod.rs":"5a463efdfe7b68a49417c85289ae9d33fdc5c0595bb78fbdce7b68b20a564207","src/uri/path.rs":"9db9c1ad92813ed9b5f674b93c9623905bc3435ba1154e05633f378629123c42","src/uri/port.rs":"a30793678abc96e833d026d96f060244183ab631e19eafbbad8e4643c7bb9d86","src/uri/scheme.rs":"59e6f12d3e1e1ee982e68a4a6556f25e94073ca3d77c372b6d8d71daf8f62f2a","src/uri/tests.rs":"61f88b73490c2442ec12cb0829aa1ddd28f1bce874b4fc6dd7a544c80280aeb1","src/version.rs":"623ef60a450203b051f3457e2f095508b66aaaa799b1447fb1b34d92cb2e7d62","tests/header_map.rs":"b81993a9042c21fd64114fb099b1666ea4685246f4f1c76bac72b825b6a3741b","tests/header_map_fuzz.rs":"a71387a8e1a3906f713a00cde443790cd7a86b7e37cafa2f9ed4d432cbf97026","tests/status_code.rs":"2e61889b07a87645465847b6245b681e022e7867a9d25f5e07f71c5ba02e7c7a"},"package":"527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "http"
-version = "0.2.2"
+version = "0.2.4"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Carl Lerche <me@carllerche.com>", "Sean McArthur <sean@seanmonstar.com>"]
 description = "A set of types for representing HTTP requests and responses.\n"
 documentation = "https://docs.rs/http"
@@ -36,10 +36,14 @@
 path = "benches/header_value.rs"
 
 [[bench]]
+name = "method"
+path = "benches/method.rs"
+
+[[bench]]
 name = "uri"
 path = "benches/uri.rs"
 [dependencies.bytes]
-version = "0.5"
+version = "1"
 
 [dependencies.fnv]
 version = "1.0.5"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,11 @@
+# 0.2.4 (April 4, 2021)
+
+* Fix `Uri` parsing to allow `{`, `"`, and `}` in paths.
+
+# 0.2.3 (January 7, 2021)
+
+* Upgrade internal (private) `bytes` dependency to 1.0.
+
 # 0.2.2 (December 14, 2020)
 
 * Fix (potential double) panic of (`HeaderMap`) `OccupiedEntry::remove_entry` and
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/http/0.2.2")]
+#![doc(html_root_url = "https://docs.rs/http/0.2.4")]
 
 //! A general purpose library of common HTTP types
 //!
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/src/uri/path.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/src/uri/path.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http/src/uri/path.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http/src/uri/path.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,6 +51,18 @@
                     0x7C |
                     0x7E => {},
 
+                    // These are code points that are supposed to be
+                    // percent-encoded in the path but there are clients
+                    // out there sending them as is and httparse accepts
+                    // to parse those requests, so they are allowed here
+                    // for parity.
+                    //
+                    // For reference, those are code points that are used
+                    // to send requests with JSON directly embedded in
+                    // the URI path. Yes, those things happen for real.
+                    b'"' |
+                    b'{' | b'}' => {},
+
                     _ => return Err(ErrorKind::InvalidUriChar.into()),
                 }
             }
@@ -527,6 +539,11 @@
         assert_eq!("qr=%3", pq("/a/b?qr=%3").query().unwrap());
     }
 
+    #[test]
+    fn json_is_fine() {
+        assert_eq!(r#"/{"bread":"baguette"}"#, pq(r#"/{"bread":"baguette"}"#).path());
+    }
+
     fn pq(s: &str) -> PathAndQuery {
         s.parse().expect(&format!("parsing {}", s))
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,11 @@
 use std::env;
-use std::ffi::OsString;
-use std::process::Command;
+//use std::ffi::OsString;
+//use std::process::Command;
 
 fn main() {
+    // We don't currently need to check the Version anymore...
+    // But leaving this in place in case we need to in the future.
+    /*
     let rustc = env::var_os("RUSTC").unwrap_or(OsString::from("rustc"));
     let output = Command::new(&rustc)
         .arg("--version")
@@ -12,11 +15,13 @@
 
     let version = String::from_utf8(output)
         .expect("rustc version output should be utf-8");
+    */
 
-    enable_new_features(&version);
+    enable_new_features(/*&version*/);
 }
 
-fn enable_new_features(raw_version: &str) {
+fn enable_new_features(/*raw_version: &str*/) {
+    /*
     let version = match Version::parse(raw_version) {
         Ok(version) => version,
         Err(err) => {
@@ -24,41 +29,24 @@
             return;
         }
     };
+    */
 
-    let min_rust2018_version = Version {
-        major: 1,
-        minor: 31,
-        patch: 0,
-    };
-
-    if version >= min_rust2018_version {
-        println!("cargo:rustc-cfg=httparse_min_2018");
-    }
-
-    enable_simd(version);
+    enable_simd(/*version*/);
 }
 
-fn enable_simd(version: Version) {
+fn enable_simd(/*version: Version*/) {
     if env::var_os("CARGO_FEATURE_STD").is_none() {
         println!("cargo:warning=building for no_std disables httparse SIMD");
         return;
     }
 
     let env_disable = "CARGO_CFG_HTTPARSE_DISABLE_SIMD";
-    if env::var_os(env_disable).is_some() {
+    if var_is(env_disable, "1") {
         println!("cargo:warning=detected {} environment variable, disabling SIMD", env_disable);
         return;
     }
 
-    let min_simd_version = Version {
-        major: 1,
-        minor: 27,
-        patch: 0,
-    };
-
-    if version >= min_simd_version {
-        println!("cargo:rustc-cfg=httparse_simd");
-    }
+    println!("cargo:rustc-cfg=httparse_simd");
 
     // cfg(target_feature) isn't stable yet, but CARGO_CFG_TARGET_FEATURE has
     // a list... We aren't doing anything unsafe, since the is_x86_feature_detected
@@ -74,7 +62,7 @@
 
 
     let env_runtime_only = "CARGO_CFG_HTTPARSE_DISABLE_SIMD_COMPILETIME";
-    if env::var_os(env_runtime_only).is_some() {
+    if var_is(env_runtime_only, "1") {
         println!("cargo:warning=detected {} environment variable, using runtime SIMD detection only", env_runtime_only);
         return;
     }
@@ -109,6 +97,7 @@
     }
 }
 
+/*
 #[derive(Debug, Clone, Copy, PartialEq, PartialOrd)]
 struct Version {
     major: u32,
@@ -135,7 +124,7 @@
             }
             num.push(c);
         }
-        let major = try!(num.parse::<u32>().map_err(|e| e.to_string()));
+        let major = num.parse::<u32>().map_err(|e| e.to_string())?;
 
         num.clear();
         for c in parts[1].chars() {
@@ -144,7 +133,7 @@
             }
             num.push(c);
         }
-        let minor = try!(num.parse::<u32>().map_err(|e| e.to_string()));
+        let minor = num.parse::<u32>().map_err(|e| e.to_string())?;
 
         num.clear();
         for c in parts[2].chars() {
@@ -153,7 +142,7 @@
             }
             num.push(c);
         }
-        let patch = try!(num.parse::<u32>().map_err(|e| e.to_string()));
+        let patch = num.parse::<u32>().map_err(|e| e.to_string())?;
 
         Ok(Version {
             major: major,
@@ -162,4 +151,11 @@
         })
     }
 }
+*/
 
+fn var_is(key: &str, val: &str) -> bool {
+    match env::var(key) {
+        Ok(v) => v == val,
+        Err(_) => false,
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"47a6df5227d5352acf571e1fd0414394b8622500e476b32bdf1c62162b92eb56","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ad5ce29918424008bdd8c6e7851bb064533456cbb32ec0d0955b2bc9444613d3","README.md":"b54e1e379daa12d26aadad7c1bef578a3cbcf243f2f229d8b17868c90a384d7d","benches/parse.rs":"caabd31cbcb00172bb7f31a1398dbed27a3bf36b01d69729c3d6fbd9a4008e05","build.rs":"b73e269376b98ce6bafdce52d1f17ec0ad3156260f0834cb3efc24ab53c43cf4","src/iter.rs":"3f165be2f0d3bb7e0cbe37cb67560e36e06cdb5921e145446a5985c3580a6b6e","src/lib.rs":"19b6eec5030d04753251d4592b4a151300f0fb5f5c45cbd2dcf95445cd7e450f","src/macros.rs":"25de190f894eefb48a6992f9dc3d039d9065f908f381d683f0395d568d992275","src/simd/avx2.rs":"1b27cad7b5c210f8a1283d423ca18372127ea50f5565b9be0b83d2a51a1eb826","src/simd/fallback.rs":"0234cc11459f3225d6e3d329068a01206e39625a538bdc292e0d1beaa06a37e5","src/simd/mod.rs":"c67e118a45da679d41de0d51c2f632f64902083db4be8f636021dbfe08f0f9b4","src/simd/sse42.rs":"373f5bf0596942b9ba4497a8a89975117ec0da6d8b8c2345fe03e0d28e68627f","tests/uri.rs":"8e2d086f67546f323dcb40a706fad3e5eaea2a6265c8e1b9ad013782018223a9"},"package":"cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"}
\ No newline at end of file
+{"files":{"Cargo.toml":"9516965f8b9027b94c6f8a4570a8243e375c521f302650bc76e95c431b3526b8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"d1e7f8223db09ae257ac95039ab91b95676c1ac7e55c7a6e996fd76e01fb3453","README.md":"c1cae97279e57f25d638d48e5f26818932d72d24c68e6ecb5f4f7e1fe24b83d9","benches/parse.rs":"caabd31cbcb00172bb7f31a1398dbed27a3bf36b01d69729c3d6fbd9a4008e05","build.rs":"15d594fd22d5b5980dec692494ac88d9fc7a579d9deed451623abbdb32ffc652","src/iter.rs":"979746a1f7e497c4125aeac2270c69b3b3797ff35a2b39799d4aa30598a7df38","src/lib.rs":"263630d7ed1681d5b2da31a3e082ac87c9d0c19065aa43d218a8c6411eba69d4","src/macros.rs":"7cab653acace88f47eadf57e0397946128b5693cba4c8b99e53903730216eb62","src/simd/avx2.rs":"e4e71ff55ec3871a7bb079a1e171aba5e0668810a2969e3e0dda42add57377ca","src/simd/fallback.rs":"0234cc11459f3225d6e3d329068a01206e39625a538bdc292e0d1beaa06a37e5","src/simd/mod.rs":"e647c7e4e0c7bcdf1de67d702568efdc4d44b4bf4384e9c549c312b7799b3017","src/simd/sse42.rs":"8194dd091fbb1bba8116ab3c8fe825194050b5ed68b7932dff382a7b501f9872","tests/uri.rs":"7991575f1caeeff05ba83828ec73c11a17d51dc7d1df20f3a65c6e3940dee67c"},"package":"acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,16 +3,15 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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]
 name = "httparse"
-version = "1.3.4"
+version = "1.5.1"
 authors = ["Sean McArthur <sean@seanmonstar.com>"]
 build = "build.rs"
 description = "A tiny, safe, speedy, zero-copy HTTP/1.x parser."
@@ -27,7 +26,7 @@
 lto = true
 codegen-units = 1
 [dev-dependencies.pico-sys]
-version = "0.0"
+version = "0.0.1"
 
 [features]
 default = ["std"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2015 Sean McArthur
+Copyright (c) 2015-2021 Sean McArthur
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,21 @@
 # httparse
 
-[![Build Status](https://travis-ci.org/seanmonstar/httparse.svg?branch=master)](https://travis-ci.org/seanmonstar/httparse)
-[![Coverage Status](https://coveralls.io/repos/seanmonstar/httparse/badge.svg)](https://coveralls.io/r/seanmonstar/httparse)
 [![crates.io](https://img.shields.io/crates/v/httparse.svg)](https://crates.io/crates/httparse)
+[![Released API docs](https://docs.rs/httparse/badge.svg)](https://docs.rs/httparse)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE-MIT)
+[![CI](https://github.com/seanmonstar/httparse/workflows/CI/badge.svg)](https://github.com/seanmonstar/httparse/actions?query=workflow%3ACI)
+[![Discord chat][discord-badge]][discord-url]
 
 A push parser for the HTTP 1.x protocol. Avoids allocations. No copy. **Fast.**
 
 Works with `no_std`, simply disable the `std` Cargo feature.
 
-[Documentation](https://docs.rs/httparse)
 [Changelog](https://github.com/seanmonstar/httparse/releases)
 
+
+[discord-badge]: https://img.shields.io/discord/500028886025895936.svg?logo=discord
+[discord-url]: https://discord.gg/kkwpueZ
+
 ## Usage
 
 ```rust
@@ -30,8 +35,8 @@
 
 Licensed under either of
 
-- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://apache.org/licenses/LICENSE-2.0)
-- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or https://apache.org/licenses/LICENSE-2.0)
+- MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT)
 
 ### Contribution
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,7 +64,7 @@
 
     #[inline]
     pub fn next_8<'b>(&'b mut self) -> Option<Bytes8<'b, 'a>> {
-        if self.slice.len() > self.pos + 8 {
+        if self.slice.len() >= self.pos + 8 {
             Some(Bytes8::new(self))
         } else {
             None
@@ -154,3 +154,63 @@
         self.pos += 1;
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::Bytes;
+
+    #[test]
+    fn test_next_8_too_short() {
+        // Start with 10 bytes.
+        let slice = [0u8, 1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, 8u8, 9u8];
+        let mut bytes = Bytes::new(&slice);
+        // Skip 3 of them.
+        unsafe { bytes.advance(3); }
+        // There should be 7 left, not enough to call next_8.
+        assert!(bytes.next_8().is_none());
+    }
+
+    #[test]
+    fn test_next_8_just_right() {
+        // Start with 10 bytes.
+        let slice = [0u8, 1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, 8u8, 9u8];
+        let mut bytes = Bytes::new(&slice);
+        // Skip 2 of them.
+        unsafe { bytes.advance(2); }
+        // There should be 8 left, just enough to call next_8.
+        let ret = bytes.next_8();
+        assert!(ret.is_some());
+        let mut ret = ret.unwrap();
+        // They should be the bytes starting with 2.
+        assert_eq!(ret._0(), 2u8);
+        assert_eq!(ret._1(), 3u8);
+        assert_eq!(ret._2(), 4u8);
+        assert_eq!(ret._3(), 5u8);
+        assert_eq!(ret._4(), 6u8);
+        assert_eq!(ret._5(), 7u8);
+        assert_eq!(ret._6(), 8u8);
+        assert_eq!(ret._7(), 9u8);
+    }
+
+    #[test]
+    fn test_next_8_extra() {
+        // Start with 10 bytes.
+        let slice = [0u8, 1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, 8u8, 9u8];
+        let mut bytes = Bytes::new(&slice);
+        // Skip 1 of them.
+        unsafe { bytes.advance(1); }
+        // There should be 9 left, more than enough to call next_8.
+        let ret = bytes.next_8();
+        assert!(ret.is_some());
+        let mut ret = ret.unwrap();
+        // They should be the bytes starting with 1.
+        assert_eq!(ret._0(), 1u8);
+        assert_eq!(ret._1(), 2u8);
+        assert_eq!(ret._2(), 3u8);
+        assert_eq!(ret._3(), 4u8);
+        assert_eq!(ret._4(), 5u8);
+        assert_eq!(ret._5(), 6u8);
+        assert_eq!(ret._6(), 7u8);
+        assert_eq!(ret._7(), 8u8);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,6 @@
-#![doc(html_root_url = "https://docs.rs/httparse/1.3.4")]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
 #![cfg_attr(test, deny(warnings))]
-// we can't upgrade while supporting Rust 1.3
-#![allow(deprecated)]
-#![cfg_attr(httparse_min_2018, allow(rust_2018_idioms))]
 
 //! # httparse
 //!
@@ -27,7 +23,8 @@
 #[cfg(feature = "std")]
 extern crate std as core;
 
-use core::{fmt, result, str, slice};
+use core::{fmt, result, str};
+use core::mem::{self, MaybeUninit};
 
 use iter::Bytes;
 
@@ -35,13 +32,6 @@
 #[macro_use] mod macros;
 mod simd;
 
-#[inline]
-fn shrink<T>(slice: &mut &mut [T], len: usize) {
-    debug_assert!(slice.len() >= len);
-    let ptr = slice.as_mut_ptr();
-    *slice = unsafe { slice::from_raw_parts_mut(ptr, len) };
-}
-
 /// Determines if byte is a token char.
 ///
 /// > ```notrust
@@ -65,7 +55,7 @@
 //  \0                            \n
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 //  commands
-    0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 //  \w !  "  #  $  %  &  '  (  )  *  +  ,  -  .  /
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1,
 //  0  1  2  3  4  5  6  7  8  9  :  ;  <  =  >  ?
@@ -212,7 +202,7 @@
 /// `Complete` is used when the buffer contained the complete value.
 /// `Partial` is used when parsing did not reach the end of the expected value,
 /// but no invalid data was found.
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum Status<T> {
     /// The completed result.
     Complete(T),
@@ -250,6 +240,42 @@
     }
 }
 
+/// Parser configuration.
+#[derive(Clone, Debug, Default)]
+pub struct ParserConfig {
+    allow_spaces_after_header_name_in_responses: bool,
+}
+
+impl ParserConfig {
+    /// Sets whether spaces should be allowed after header name.
+    pub fn allow_spaces_after_header_name_in_responses(
+        &mut self,
+        value: bool,
+    ) -> &mut Self {
+        self.allow_spaces_after_header_name_in_responses = value;
+        self
+    }
+
+    /// Parses a response with the given config.
+    pub fn parse_response<'headers, 'buf>(
+        &self,
+        response: &mut Response<'headers, 'buf>,
+        buf: &'buf [u8],
+    ) -> Result<usize> {
+        response.parse_with_config(buf, self)
+    }
+
+    /// Parses a response with the given config and buffer for headers
+    pub fn parse_response_with_uninit_headers<'headers, 'buf>(
+        &self,
+        response: &mut Response<'headers, 'buf>,
+        buf: &'buf [u8],
+        headers: &'headers mut [MaybeUninit<Header<'buf>>],
+    ) -> Result<usize> {
+        response.parse_with_config_and_uninit_headers(buf, self, headers)
+    }
+}
+
 /// A parsed Request.
 ///
 /// The optional values will be `None` if a parse was not complete, and did not
@@ -275,7 +301,7 @@
 ///     }
 /// }
 /// ```
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct Request<'headers, 'buf: 'headers> {
     /// The request method, such as `GET`.
     pub method: Option<&'buf str>,
@@ -299,9 +325,16 @@
         }
     }
 
-    /// Try to parse a buffer of bytes into the Request.
-    pub fn parse(&mut self, buf: &'b [u8]) -> Result<usize> {
-        let orig_len = buf.len();
+    /// Try to parse a buffer of bytes into the Request,
+    /// except use an uninitialized slice of `Header`s.
+    ///
+    /// For more information, see `parse`
+    pub fn parse_with_uninit_headers(
+        &mut self,
+        buf: &'b [u8],
+        mut headers: &'h mut [MaybeUninit<Header<'b>>],
+    ) -> Result<usize> {
+    let orig_len = buf.len();
         let mut bytes = Bytes::new(buf);
         complete!(skip_empty_lines(&mut bytes));
         self.method = Some(complete!(parse_token(&mut bytes)));
@@ -310,10 +343,37 @@
         newline!(bytes);
 
         let len = orig_len - bytes.len();
-        let headers_len = complete!(parse_headers_iter(&mut self.headers, &mut bytes));
+        let headers_len = complete!(parse_headers_iter_uninit(
+            &mut headers,
+            &mut bytes,
+            &ParserConfig::default(),
+        ));
+        /* SAFETY: see `parse_headers_iter_uninit` guarantees */
+        self.headers = unsafe { assume_init_slice(headers) };
 
         Ok(Status::Complete(len + headers_len))
     }
+
+    /// Try to parse a buffer of bytes into the Request.
+    ///
+    /// Returns byte offset in `buf` to start of HTTP body.
+    pub fn parse(&mut self, buf: &'b [u8]) -> Result<usize> {
+        let headers = mem::replace(&mut self.headers, &mut []);
+
+        /* SAFETY: see `parse_headers_iter_uninit` guarantees */
+        unsafe {
+            let headers: *mut [Header] = headers;
+            let headers = headers as *mut [MaybeUninit<Header>];
+            match self.parse_with_uninit_headers(buf, &mut *headers) {
+                Ok(Status::Complete(idx)) => Ok(Status::Complete(idx)),
+                other => {
+                    // put the original headers back
+                    self.headers = &mut *(headers as *mut [Header]);
+                    other
+                },
+            }
+        }
+    }
 }
 
 #[inline]
@@ -342,13 +402,15 @@
 /// A parsed Response.
 ///
 /// See `Request` docs for explanation of optional values.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct Response<'headers, 'buf: 'headers> {
     /// The response version, such as `HTTP/1.1`.
     pub version: Option<u8>,
     /// The response code, such as `200`.
     pub code: Option<u16>,
     /// The response reason-phrase, such as `OK`.
+    ///
+    /// Contains an empty string if the reason-phrase was missing or contained invalid characters.
     pub reason: Option<&'buf str>,
     /// The response headers.
     pub headers: &'headers mut [Header<'buf>]
@@ -368,6 +430,32 @@
 
     /// Try to parse a buffer of bytes into this `Response`.
     pub fn parse(&mut self, buf: &'b [u8]) -> Result<usize> {
+        self.parse_with_config(buf, &ParserConfig::default())
+    }
+
+    fn parse_with_config(&mut self, buf: &'b [u8], config: &ParserConfig) -> Result<usize> {
+        let headers = mem::replace(&mut self.headers, &mut []);
+
+        unsafe {
+            let headers: *mut [Header] = headers;
+            let headers = headers as *mut [MaybeUninit<Header>];
+            match self.parse_with_config_and_uninit_headers(buf, config, &mut *headers) {
+                Ok(Status::Complete(idx)) => Ok(Status::Complete(idx)),
+                other => {
+                    // put the original headers back
+                    self.headers = &mut *(headers as *mut [Header]);
+                    other
+                },
+            }
+        }
+    }
+
+    fn parse_with_config_and_uninit_headers(
+        &mut self,
+        buf: &'b [u8],
+        config: &ParserConfig,
+        mut headers: &'h mut [MaybeUninit<Header<'b>>],
+    ) -> Result<usize> {
         let orig_len = buf.len();
         let mut bytes = Bytes::new(buf);
 
@@ -395,19 +483,28 @@
                 bytes.slice();
                 self.reason = Some("");
             },
-            b'\n' => self.reason = Some(""),
+            b'\n' => {
+                bytes.slice();
+                self.reason = Some("");
+            }
             _ => return Err(Error::Status),
         }
 
 
         let len = orig_len - bytes.len();
-        let headers_len = complete!(parse_headers_iter(&mut self.headers, &mut bytes));
+        let headers_len = complete!(parse_headers_iter_uninit(
+            &mut headers,
+            &mut bytes,
+            config
+        ));
+        /* SAFETY: see `parse_headers_iter_uninit` guarantees */
+        self.headers = unsafe { assume_init_slice(headers) };
         Ok(Status::Complete(len + headers_len))
     }
 }
 
 /// Represents a parsed header.
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub struct Header<'a> {
     /// The name portion of a header.
     ///
@@ -475,28 +572,38 @@
 /// >
 /// > Non-US-ASCII content in header fields and the reason phrase
 /// > has been obsoleted and made opaque (the TEXT rule was removed).
-///
-/// Note that the following implementation deliberately rejects the obsoleted (non-US-ASCII) text range.
-///
-/// The fully compliant parser should probably just return the reason-phrase as an opaque &[u8] data
-/// and leave interpretation to user or specialized helpers (akin to .display() in std::path::Path)
 #[inline]
 fn parse_reason<'a>(bytes: &mut Bytes<'a>) -> Result<&'a str> {
+    let mut seen_obs_text = false;
     loop {
         let b = next!(bytes);
         if b == b'\r' {
             expect!(bytes.next() == b'\n' => Err(Error::Status));
             return Ok(Status::Complete(unsafe {
-                // all bytes up till `i` must have been HTAB / SP / VCHAR
-                str::from_utf8_unchecked(bytes.slice_skip(2))
+                let bytes = bytes.slice_skip(2);
+                if !seen_obs_text {
+                    // all bytes up till `i` must have been HTAB / SP / VCHAR
+                    str::from_utf8_unchecked(bytes)
+                } else {
+                    // obs-text characters were found, so return the fallback empty string
+                    ""
+                }
             }));
         } else if b == b'\n' {
             return Ok(Status::Complete(unsafe {
-                // all bytes up till `i` must have been HTAB / SP / VCHAR
-                str::from_utf8_unchecked(bytes.slice_skip(1))
+                let bytes = bytes.slice_skip(1);
+                if !seen_obs_text {
+                    // all bytes up till `i` must have been HTAB / SP / VCHAR
+                    str::from_utf8_unchecked(bytes)
+                } else {
+                    // obs-text characters were found, so return the fallback empty string
+                    ""
+                }
             }));
-        } else if !((b >= 0x20 && b <= 0x7E) || b == b'\t') {
+        } else if !(b == 0x09 || b == b' ' || (b >= 0x21 && b <= 0x7E) || b >= 0x80) {
             return Err(Error::Status);
+        } else if b >= 0x80 {
+            seen_obs_text = true;
         }
     }
 }
@@ -536,9 +643,9 @@
 
 #[inline]
 fn parse_code(bytes: &mut Bytes) -> Result<u16> {
-    let hundreds = expect!(bytes.next() == b'0'...b'9' => Err(Error::Status));
-    let tens = expect!(bytes.next() == b'0'...b'9' => Err(Error::Status));
-    let ones = expect!(bytes.next() == b'0'...b'9' => Err(Error::Status));
+    let hundreds = expect!(bytes.next() == b'0'..=b'9' => Err(Error::Status));
+    let tens = expect!(bytes.next() == b'0'..=b'9' => Err(Error::Status));
+    let ones = expect!(bytes.next() == b'0'..=b'9' => Err(Error::Status));
 
     Ok(Status::Complete((hundreds - b'0') as u16 * 100 +
         (tens - b'0') as u16 * 10 +
@@ -563,140 +670,224 @@
 ///                httparse::Header { name: "Accept", value: b"*/*" }
 ///            ][..]))));
 /// ```
-pub fn parse_headers<'b: 'h, 'h>(src: &'b [u8], mut dst: &'h mut [Header<'b>])
-    -> Result<(usize, &'h [Header<'b>])> {
+pub fn parse_headers<'b: 'h, 'h>(
+    src: &'b [u8],
+    mut dst: &'h mut [Header<'b>],
+) -> Result<(usize, &'h [Header<'b>])> {
     let mut iter = Bytes::new(src);
-    let pos = complete!(parse_headers_iter(&mut dst, &mut iter));
+    let pos = complete!(parse_headers_iter(&mut dst, &mut iter, &ParserConfig::default()));
     Ok(Status::Complete((pos, dst)))
 }
 
-
 #[inline]
-fn parse_headers_iter<'a, 'b>(headers: &mut &mut [Header<'a>], bytes: &'b mut Bytes<'a>)
-    -> Result<usize> {
-    let mut num_headers: usize = 0;
+fn parse_headers_iter<'a, 'b>(
+    headers: &mut &mut [Header<'a>],
+    bytes: &'b mut Bytes<'a>,
+    config: &ParserConfig,
+) -> Result<usize> {
+    parse_headers_iter_uninit(
+        /* SAFETY: see `parse_headers_iter_uninit` guarantees */
+        unsafe { deinit_slice_mut(headers) },
+        bytes,
+        config,
+    )
+}
+
+unsafe fn deinit_slice_mut<'a, 'b, T>(s: &'a mut &'b mut [T]) -> &'a mut &'b mut [MaybeUninit<T>] {
+    let s: *mut &mut [T] = s;
+    let s = s as *mut &mut [MaybeUninit<T>];
+    &mut *s
+}
+unsafe fn assume_init_slice<'a, T>(s: &'a mut [MaybeUninit<T>]) -> &'a mut [T] {
+    let s: *mut [MaybeUninit<T>] = s;
+    let s = s as *mut [T];
+    &mut *s
+}
+
+/* Function which parsers headers into uninitialized buffer.
+ *
+ * Guarantees that it doesn't write garbage, so casting
+ * &mut &mut [Header] -> &mut &mut [MaybeUninit<Header>]
+ * is safe here.
+ *
+ * Also it promises `headers` get shrunk to number of initialized headers,
+ * so casting the other way around after calling this function is safe
+ */
+fn parse_headers_iter_uninit<'a, 'b>(
+    headers: &mut &mut [MaybeUninit<Header<'a>>],
+    bytes: &'b mut Bytes<'a>,
+    config: &ParserConfig,
+) -> Result<usize> {
+
+    /* Flow of this function is pretty complex, especially with macros,
+     * so this struct makes sure we shrink `headers` to only parsed ones.
+     * Comparing to previous code, this only may introduce some additional
+     * instructions in case of early return */
+    struct ShrinkOnDrop<'r1, 'r2, 'a> {
+        headers: &'r1 mut &'r2 mut [MaybeUninit<Header<'a>>],
+        num_headers: usize,
+    }
+
+    impl<'r1, 'r2, 'a> Drop for ShrinkOnDrop<'r1, 'r2, 'a> {
+        fn drop(&mut self) {
+            let headers = mem::replace(self.headers, &mut []);
+
+            /* SAFETY: num_headers is the number of initialized headers */
+            let headers = unsafe { headers.get_unchecked_mut(..self.num_headers) };
+
+            *self.headers = headers;
+        }
+    }
+
+    let mut autoshrink = ShrinkOnDrop {
+        headers,
+        num_headers: 0,
+    };
     let mut count: usize = 0;
     let mut result = Err(Error::TooManyHeaders);
 
-    {
-        let mut iter = headers.iter_mut();
+    let mut iter = autoshrink.headers.iter_mut();
 
-        'headers: loop {
-            // a newline here means the head is over!
+    'headers: loop {
+        // a newline here means the head is over!
+        let b = next!(bytes);
+        if b == b'\r' {
+            expect!(bytes.next() == b'\n' => Err(Error::NewLine));
+            result = Ok(Status::Complete(count + bytes.pos()));
+            break;
+        } else if b == b'\n' {
+            result = Ok(Status::Complete(count + bytes.pos()));
+            break;
+        } else if !is_header_name_token(b) {
+            return Err(Error::HeaderName);
+        }
+
+        let uninit_header = match iter.next() {
+            Some(header) => header,
+            None => break 'headers
+        };
+
+        // parse header name until colon
+        let header_name: &str = 'name: loop {
             let b = next!(bytes);
-            if b == b'\r' {
-                expect!(bytes.next() == b'\n' => Err(Error::NewLine));
-                result = Ok(Status::Complete(count + bytes.pos()));
-                break;
-            } else if b == b'\n' {
-                result = Ok(Status::Complete(count + bytes.pos()));
-                break;
+            if b == b':' {
+                count += bytes.pos();
+                let _name = unsafe {
+                    str::from_utf8_unchecked(bytes.slice_skip(1))
+                };
+                break 'name _name;
             } else if !is_header_name_token(b) {
-                return Err(Error::HeaderName);
-            }
-
-            let header = match iter.next() {
-                Some(header) => header,
-                None => break 'headers
-            };
-
-            num_headers += 1;
-            // parse header name until colon
-            'name: loop {
-                let b = next!(bytes);
-                if b == b':' {
-                    count += bytes.pos();
-                    header.name = unsafe {
-                        str::from_utf8_unchecked(bytes.slice_skip(1))
-                    };
-                    break 'name;
-                } else if !is_header_name_token(b) {
+                if !config.allow_spaces_after_header_name_in_responses {
                     return Err(Error::HeaderName);
                 }
-            }
-
-            let mut b;
-
-            'value: loop {
-
-                // eat white space between colon and value
-                'whitespace: loop {
-                    b = next!(bytes);
+                count += bytes.pos();
+                let _name = unsafe { str::from_utf8_unchecked(bytes.slice_skip(1)) };
+                // eat white space between name and colon
+                'whitespace_before_colon: loop {
+                    let b = next!(bytes);
                     if b == b' ' || b == b'\t' {
                         count += bytes.pos();
                         bytes.slice();
-                        continue 'whitespace;
+                        continue 'whitespace_before_colon;
+                    } else if b == b':' {
+                        count += bytes.pos();
+                        bytes.slice();
+                        break 'name _name;
                     } else {
-                        if !is_header_value_token(b) {
-                            break 'value;
-                        }
-                        break 'whitespace;
+                        return Err(Error::HeaderName);
                     }
                 }
+            }
+        };
 
-                // parse value till EOL
+        let mut b;
 
-                simd::match_header_value_vectored(bytes);
+        'value: loop {
 
-                macro_rules! check {
-                    ($bytes:ident, $i:ident) => ({
-                        b = $bytes.$i();
-                        if !is_header_value_token(b) {
-                            break 'value;
-                        }
-                    });
-                    ($bytes:ident) => ({
-                        check!($bytes, _0);
-                        check!($bytes, _1);
-                        check!($bytes, _2);
-                        check!($bytes, _3);
-                        check!($bytes, _4);
-                        check!($bytes, _5);
-                        check!($bytes, _6);
-                        check!($bytes, _7);
-                    })
-                }
-                while let Some(mut bytes8) = bytes.next_8() {
-                    check!(bytes8);
-                }
-                loop {
-                    b = next!(bytes);
+            // eat white space between colon and value
+            'whitespace_after_colon: loop {
+                b = next!(bytes);
+                if b == b' ' || b == b'\t' {
+                    count += bytes.pos();
+                    bytes.slice();
+                    continue 'whitespace_after_colon;
+                } else {
                     if !is_header_value_token(b) {
                         break 'value;
                     }
+                    break 'whitespace_after_colon;
                 }
             }
 
-            //found_ctl
-            let value_slice : &[u8] = if b == b'\r' {
-                expect!(bytes.next() == b'\n' => Err(Error::HeaderValue));
-                count += bytes.pos();
-                // having just check that `\r\n` exists, it's safe to skip those 2 bytes
-                unsafe {
-                    bytes.slice_skip(2)
-                }
-            } else if b == b'\n' {
-                count += bytes.pos();
-                // having just check that `\r\n` exists, it's safe to skip 1 byte
-                unsafe {
-                    bytes.slice_skip(1)
+            // parse value till EOL
+
+            simd::match_header_value_vectored(bytes);
+
+            macro_rules! check {
+                ($bytes:ident, $i:ident) => ({
+                    b = $bytes.$i();
+                    if !is_header_value_token(b) {
+                        break 'value;
+                    }
+                });
+                ($bytes:ident) => ({
+                    check!($bytes, _0);
+                    check!($bytes, _1);
+                    check!($bytes, _2);
+                    check!($bytes, _3);
+                    check!($bytes, _4);
+                    check!($bytes, _5);
+                    check!($bytes, _6);
+                    check!($bytes, _7);
+                })
+            }
+            while let Some(mut bytes8) = bytes.next_8() {
+                check!(bytes8);
+            }
+            loop {
+                b = next!(bytes);
+                if !is_header_value_token(b) {
+                    break 'value;
                 }
-            } else {
-                return Err(Error::HeaderValue);
-            };
-            // trim trailing whitespace in the header
-            if let Some(last_visible) = value_slice.iter().rposition(|b| *b != b' ' && *b != b'\t' ) {
-                // There is at least one non-whitespace character.
-                header.value = &value_slice[0..last_visible+1];
-            } else {
-                // There is no non-whitespace character. This can only happen when value_slice is
-                // empty.
-                header.value = value_slice;
             }
         }
-    } // drop iter
 
-    shrink(headers, num_headers);
+        //found_ctl
+        let value_slice : &[u8] = if b == b'\r' {
+            expect!(bytes.next() == b'\n' => Err(Error::HeaderValue));
+            count += bytes.pos();
+            // having just check that `\r\n` exists, it's safe to skip those 2 bytes
+            unsafe {
+                bytes.slice_skip(2)
+            }
+        } else if b == b'\n' {
+            count += bytes.pos();
+            // having just check that `\r\n` exists, it's safe to skip 1 byte
+            unsafe {
+                bytes.slice_skip(1)
+            }
+        } else {
+            return Err(Error::HeaderValue);
+        };
+
+        let header_value: &[u8];
+        // trim trailing whitespace in the header
+        if let Some(last_visible) = value_slice.iter().rposition(|b| *b != b' ' && *b != b'\t' ) {
+            // There is at least one non-whitespace character.
+            header_value = &value_slice[0..last_visible+1];
+        } else {
+            // There is no non-whitespace character. This can only happen when value_slice is
+            // empty.
+            header_value = value_slice;
+        }
+
+        *uninit_header = MaybeUninit::new(Header {
+            name: header_name,
+            value: header_value,
+        });
+        autoshrink.num_headers += 1;
+    }
+
     result
 }
 
@@ -723,7 +914,7 @@
     loop {
         let b = next!(bytes);
         match b {
-            b'0' ... b'9' if in_chunk_size => {
+            b'0' ..= b'9' if in_chunk_size => {
                 if count > 15 {
                     return Err(InvalidChunkSize);
                 }
@@ -731,7 +922,7 @@
                 size *= RADIX;
                 size += (b - b'0') as u64;
             },
-            b'a' ... b'f' if in_chunk_size => {
+            b'a' ..= b'f' if in_chunk_size => {
                 if count > 15 {
                     return Err(InvalidChunkSize);
                 }
@@ -739,7 +930,7 @@
                 size *= RADIX;
                 size += (b + 10 - b'a') as u64;
             }
-            b'A' ... b'F' if in_chunk_size => {
+            b'A' ..= b'F' if in_chunk_size => {
                 if count > 15 {
                     return Err(InvalidChunkSize);
                 }
@@ -760,7 +951,7 @@
             }
             // "Linear white space" is ignored between the chunk size and the
             // extension separator token (";") due to the "implied *LWS rule".
-            b'\t' | b' ' if !in_ext & !in_chunk_size => {}
+            b'\t' | b' ' if !in_ext && !in_chunk_size => {}
             // LWS can follow the chunk size, but no more digits can come
             b'\t' | b' ' if in_chunk_size => in_chunk_size = false,
             // We allow any arbitrary octet once we are in the extension, since
@@ -779,22 +970,10 @@
 
 #[cfg(test)]
 mod tests {
-    use super::{Request, Response, Status, EMPTY_HEADER, shrink, parse_chunk_size};
+    use super::{Request, Response, Status, EMPTY_HEADER, parse_chunk_size};
 
     const NUM_OF_HEADERS: usize = 4;
 
-    #[test]
-    fn test_shrink() {
-        let mut arr = [EMPTY_HEADER; 16];
-        {
-            let slice = &mut &mut arr[..];
-            assert_eq!(slice.len(), 16);
-            shrink(slice, 4);
-            assert_eq!(slice.len(), 4);
-        }
-        assert_eq!(arr.len(), 16);
-    }
-
     macro_rules! req {
         ($name:ident, $buf:expr, |$arg:ident| $body:expr) => (
             req! {$name, $buf, Ok(Status::Complete($buf.len())), |$arg| $body }
@@ -935,6 +1114,7 @@
             assert_eq!(req.method.unwrap(), "GET");
             assert_eq!(req.path.unwrap(), "/");
             assert_eq!(req.version.unwrap(), 1);
+            assert_eq!(req.headers.len(), 2);
             assert_eq!(req.headers[0].name, "Host");
             assert_eq!(req.headers[0].value, b"foo.com");
             assert_eq!(req.headers[1].name, "User-Agent");
@@ -956,6 +1136,20 @@
     }
 
     req! {
+        test_request_partial_parses_headers_as_much_as_it_can,
+        b"GET / HTTP/1.1\r\nHost: yolo\r\n",
+        Ok(::Status::Partial),
+        |req| {
+            assert_eq!(req.method.unwrap(), "GET");
+            assert_eq!(req.path.unwrap(), "/");
+            assert_eq!(req.version.unwrap(), 1);
+            assert_eq!(req.headers.len(), NUM_OF_HEADERS); // doesn't slice since not Complete
+            assert_eq!(req.headers[0].name, "Host");
+            assert_eq!(req.headers[0].value, b"yolo");
+        }
+    }
+
+    req! {
         test_request_newlines,
         b"GET / HTTP/1.1\nHost: foo.bar\n\n",
         |_r| {}
@@ -1092,8 +1286,12 @@
     res! {
         test_response_reason_with_obsolete_text_byte,
         RESPONSE_REASON_WITH_OBS_TEXT_BYTE,
-        Err(::Error::Status),
-        |_res| {}
+        |res| {
+            assert_eq!(res.version.unwrap(), 1);
+            assert_eq!(res.code.unwrap(), 200);
+            // Empty string fallback in case of obs-text
+            assert_eq!(res.reason.unwrap(), "");
+        }
     }
 
     res! {
@@ -1118,11 +1316,79 @@
     }
 
     res! {
+        test_response_partial_parses_headers_as_much_as_it_can,
+        b"HTTP/1.1 200 OK\r\nServer: yolo\r\n",
+        Ok(::Status::Partial),
+        |res| {
+            assert_eq!(res.version.unwrap(), 1);
+            assert_eq!(res.code.unwrap(), 200);
+            assert_eq!(res.reason.unwrap(), "OK");
+            assert_eq!(res.headers.len(), NUM_OF_HEADERS); // doesn't slice since not Complete
+            assert_eq!(res.headers[0].name, "Server");
+            assert_eq!(res.headers[0].value, b"yolo");
+        }
+    }
+
+    res! {
         test_response_empty_lines_prefix_lf_only,
         b"\n\nHTTP/1.1 200 OK\n\n",
         |_res| {}
     }
 
+    res! {
+        test_response_no_cr,
+        b"HTTP/1.0 200\nContent-type: text/html\n\n",
+        |res| {
+            assert_eq!(res.version.unwrap(), 0);
+            assert_eq!(res.code.unwrap(), 200);
+            assert_eq!(res.reason.unwrap(), "");
+            assert_eq!(res.headers.len(), 1);
+            assert_eq!(res.headers[0].name, "Content-type");
+            assert_eq!(res.headers[0].value, b"text/html");
+        }
+    }
+
+    static RESPONSE_WITH_WHITESPACE_BETWEEN_HEADER_NAME_AND_COLON: &'static [u8] =
+        b"HTTP/1.1 200 OK\r\nAccess-Control-Allow-Credentials : true\r\n\r\n";
+
+    #[test]
+    fn test_forbid_response_with_whitespace_between_header_name_and_colon() {
+        let mut headers = [EMPTY_HEADER; 1];
+        let mut response = Response::new(&mut headers[..]);
+        let result = response.parse(RESPONSE_WITH_WHITESPACE_BETWEEN_HEADER_NAME_AND_COLON);
+
+        assert_eq!(result, Err(::Error::HeaderName));
+    }
+
+    #[test]
+    fn test_allow_response_with_whitespace_between_header_name_and_colon() {
+        let mut headers = [EMPTY_HEADER; 1];
+        let mut response = Response::new(&mut headers[..]);
+        let result = ::ParserConfig::default()
+            .allow_spaces_after_header_name_in_responses(true)
+            .parse_response(&mut response, RESPONSE_WITH_WHITESPACE_BETWEEN_HEADER_NAME_AND_COLON);
+
+        assert_eq!(result, Ok(Status::Complete(60)));
+        assert_eq!(response.version.unwrap(), 1);
+        assert_eq!(response.code.unwrap(), 200);
+        assert_eq!(response.reason.unwrap(), "OK");
+        assert_eq!(response.headers.len(), 1);
+        assert_eq!(response.headers[0].name, "Access-Control-Allow-Credentials");
+        assert_eq!(response.headers[0].value, &b"true"[..]);
+    }
+
+    static REQUEST_WITH_WHITESPACE_BETWEEN_HEADER_NAME_AND_COLON: &'static [u8] =
+        b"GET / HTTP/1.1\r\nHost : localhost\r\n\r\n";
+
+    #[test]
+    fn test_forbid_request_with_whitespace_between_header_name_and_colon() {
+        let mut headers = [EMPTY_HEADER; 1];
+        let mut request = Request::new(&mut headers[..]);
+        let result = request.parse(REQUEST_WITH_WHITESPACE_BETWEEN_HEADER_NAME_AND_COLON);
+
+        assert_eq!(result, Err(::Error::HeaderName));
+    }
+
     #[test]
     fn test_chunk_size() {
         assert_eq!(parse_chunk_size(b"0\r\n"), Ok(Status::Complete((3, 0))));
@@ -1140,13 +1406,4 @@
         assert_eq!(parse_chunk_size(b"Affffffffffffffff\r\n"), Err(::InvalidChunkSize));
         assert_eq!(parse_chunk_size(b"fffffffffffffffff\r\n"), Err(::InvalidChunkSize));
     }
-
-    #[cfg(feature = "std")]
-    #[test]
-    fn test_std_error() {
-        use super::Error;
-        use std::error::Error as StdError;
-        let err = Error::HeaderName;
-        assert_eq!(err.to_string(), err.description());
-    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,7 +23,7 @@
 
 macro_rules! complete {
     ($e:expr) => {
-        match try!($e) {
+        match $e? {
             Status::Complete(v) => v,
             Status::Partial => return Ok(Status::Partial)
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/simd/avx2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/simd/avx2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/simd/avx2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/simd/avx2.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,11 +37,14 @@
     let ptr = buf.as_ptr();
 
     let LSH: __m256i = _mm256_set1_epi8(0x0f);
+
+    // See comment in sse42::match_url_char_16_sse.
+
     let URI: __m256i = _mm256_setr_epi8(
-        0xb8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-        0xfc, 0xfc, 0xfc, 0x7c, 0x54, 0x7c, 0xd4, 0x7c,
-        0xb8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-        0xfc, 0xfc, 0xfc, 0x7c, 0x54, 0x7c, 0xd4, 0x7c,
+        0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
+        0xfc, 0xfc, 0xfc, 0xfc, 0xf4, 0xfc, 0xf4, 0x7c,
+        0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
+        0xfc, 0xfc, 0xfc, 0xfc, 0xf4, 0xfc, 0xf4, 0x7c,
     );
     let ARF: __m256i = _mm256_setr_epi8(
         0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
@@ -114,3 +117,45 @@
 unsafe fn match_header_value_char_32_avx(_: &[u8]) -> usize {
     unreachable!("AVX2 detection should be disabled for x86");
 }
+
+#[test]
+fn avx2_code_matches_uri_chars_table() {
+    match super::detect() {
+        super::AVX_2 | super::AVX_2_AND_SSE_42 => {},
+        _ => return,
+    }
+
+    unsafe {
+        assert!(byte_is_allowed(b'_'));
+
+        for (b, allowed) in ::URI_MAP.iter().cloned().enumerate() {
+            assert_eq!(
+                byte_is_allowed(b as u8), allowed,
+                "byte_is_allowed({:?}) should be {:?}", b, allowed,
+            );
+        }
+    }
+}
+
+#[cfg(test)]
+unsafe fn byte_is_allowed(byte: u8) -> bool {
+    let slice = [
+        b'_', b'_', b'_', b'_',
+        b'_', b'_', b'_', b'_',
+        b'_', b'_', b'_', b'_',
+        b'_', b'_', b'_', b'_',
+        b'_', b'_', b'_', b'_',
+        b'_', b'_', b'_', b'_',
+        b'_', b'_', byte, b'_',
+        b'_', b'_', b'_', b'_',
+    ];
+    let mut bytes = Bytes::new(&slice);
+
+    parse_uri_batch_32(&mut bytes);
+
+    match bytes.pos() {
+        32 => true,
+        26 => false,
+        _ => unreachable!(),
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/simd/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/simd/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/simd/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/simd/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -40,6 +40,38 @@
 
 #[cfg(all(
     httparse_simd,
+    any(
+        target_arch = "x86",
+        target_arch = "x86_64",
+    ),
+))]
+pub const SSE_42: usize = 1;
+#[cfg(all(
+    httparse_simd,
+    any(not(httparse_simd_target_feature_sse42), httparse_simd_target_feature_avx2),
+    any(
+        target_arch = "x86",
+        target_arch = "x86_64",
+    ),
+))]
+pub const AVX_2: usize = 2;
+#[cfg(all(
+    httparse_simd,
+    any(
+        not(httparse_simd_target_feature_sse42),
+        httparse_simd_target_feature_avx2,
+        test,
+    ),
+    any(
+        target_arch = "x86",
+        target_arch = "x86_64",
+    ),
+))]
+pub const AVX_2_AND_SSE_42: usize = 3;
+#[cfg(httparse_simd)]
+const NONE: usize = ::core::usize::MAX;
+#[cfg(all(
+    httparse_simd,
     not(any(
         httparse_simd_target_feature_sse42,
         httparse_simd_target_feature_avx2,
@@ -57,32 +89,28 @@
     //! at least in 1.27.0, the functions don't inline, leaving using it
     //! actually *slower* than just using the scalar fallback.
 
-    use core::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
+    use core::sync::atomic::{AtomicUsize, Ordering};
 
-    static FEATURE: AtomicUsize = ATOMIC_USIZE_INIT;
+    static FEATURE: AtomicUsize = AtomicUsize::new(0);
 
     const INIT: usize = 0;
-    const SSE_42: usize = 1;
-    const AVX_2: usize = 2;
-    const AVX_2_AND_SSE_42: usize = 3;
-    const NONE: usize = ::core::usize::MAX;
 
-    fn detect() -> usize {
+    pub fn detect() -> usize {
         let feat = FEATURE.load(Ordering::Relaxed);
         if feat == INIT {
             if cfg!(target_arch = "x86_64") && is_x86_feature_detected!("avx2") {
                 if is_x86_feature_detected!("sse4.2") {
-                    FEATURE.store(AVX_2_AND_SSE_42, Ordering::Relaxed);
-                    return AVX_2_AND_SSE_42;
+                    FEATURE.store(super::AVX_2_AND_SSE_42, Ordering::Relaxed);
+                    return super::AVX_2_AND_SSE_42;
                 } else {
-                    FEATURE.store(AVX_2, Ordering::Relaxed);
-                    return AVX_2;
+                    FEATURE.store(super::AVX_2, Ordering::Relaxed);
+                    return super::AVX_2;
                 }
             } else if is_x86_feature_detected!("sse4.2") {
-                FEATURE.store(SSE_42, Ordering::Relaxed);
-                return SSE_42;
+                FEATURE.store(super::SSE_42, Ordering::Relaxed);
+                return super::SSE_42;
             } else {
-                FEATURE.store(NONE, Ordering::Relaxed);
+                FEATURE.store(super::NONE, Ordering::Relaxed);
             }
         }
         feat
@@ -91,9 +119,9 @@
     pub fn match_uri_vectored(bytes: &mut ::Bytes) {
         unsafe {
             match detect() {
-                SSE_42 => super::sse42::parse_uri_batch_16(bytes),
-                AVX_2 => { super::avx2::parse_uri_batch_32(bytes); },
-                AVX_2_AND_SSE_42 => {
+                super::SSE_42 => super::sse42::parse_uri_batch_16(bytes),
+                super::AVX_2 => { super::avx2::parse_uri_batch_32(bytes); },
+                super::AVX_2_AND_SSE_42 => {
                     if let super::avx2::Scan::Found = super::avx2::parse_uri_batch_32(bytes) {
                         return;
                     }
@@ -109,9 +137,9 @@
     pub fn match_header_value_vectored(bytes: &mut ::Bytes) {
         unsafe {
             match detect() {
-                SSE_42 => super::sse42::match_header_value_batch_16(bytes),
-                AVX_2 => { super::avx2::match_header_value_batch_32(bytes); },
-                AVX_2_AND_SSE_42 => {
+                super::SSE_42 => super::sse42::match_header_value_batch_16(bytes),
+                super::AVX_2 => { super::avx2::match_header_value_batch_32(bytes); },
+                super::AVX_2_AND_SSE_42 => {
                     if let super::avx2::Scan::Found = super::avx2::match_header_value_batch_32(bytes) {
                         return;
                     }
@@ -149,7 +177,7 @@
 ))]
 mod sse42_compile_time {
     pub fn match_uri_vectored(bytes: &mut ::Bytes) {
-        if is_x86_feature_detected!("sse4.2") {
+        if detect() == super::SSE_42 {
             unsafe {
                 super::sse42::parse_uri_batch_16(bytes);
             }
@@ -159,7 +187,7 @@
     }
 
     pub fn match_header_value_vectored(bytes: &mut ::Bytes) {
-        if is_x86_feature_detected!("sse4.2") {
+        if detect() == super::SSE_42 {
             unsafe {
                 super::sse42::match_header_value_batch_16(bytes);
             }
@@ -167,6 +195,14 @@
 
         // else do nothing
     }
+
+    pub fn detect() -> usize {
+        if is_x86_feature_detected!("sse4.2") {
+            super::SSE_42
+        } else {
+            super::NONE
+        }
+    }
 }
 
 #[cfg(all(
@@ -191,13 +227,13 @@
 mod avx2_compile_time {
     pub fn match_uri_vectored(bytes: &mut ::Bytes) {
         // do both, since avx2 only works when bytes.len() >= 32
-        if cfg!(target_arch = "x86_64") && is_x86_feature_detected!("avx2") {
+        if detect() == super::AVX_2_AND_SSE_42 {
             unsafe {
                 super::avx2::parse_uri_batch_32(bytes);
             }
 
         } 
-        if is_x86_feature_detected!("sse4.2") {
+        if detect() == super::SSE_42 {
             unsafe {
                 super::sse42::parse_uri_batch_16(bytes);
             }
@@ -208,7 +244,7 @@
 
     pub fn match_header_value_vectored(bytes: &mut ::Bytes) {
         // do both, since avx2 only works when bytes.len() >= 32
-        if cfg!(target_arch = "x86_64") && is_x86_feature_detected!("avx2") {
+        if detect() == super::AVX_2_AND_SSE_42 {
             let scanned = unsafe {
                 super::avx2::match_header_value_batch_32(bytes)
             };
@@ -217,7 +253,7 @@
                 return;
             }
         }
-        if is_x86_feature_detected!("sse4.2") {
+        if detect() == super::SSE_42 {
             unsafe {
                 super::sse42::match_header_value_batch_16(bytes);
             }
@@ -225,6 +261,16 @@
 
         // else do nothing
     }
+
+    pub fn detect() -> usize {
+        if cfg!(target_arch = "x86_64") && is_x86_feature_detected!("avx2") {
+            super::AVX_2_AND_SSE_42
+        } else if is_x86_feature_detected!("sse4.2") {
+            super::SSE_42
+        } else {
+            super::NONE
+        }
+    }
 }
 
 #[cfg(all(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/simd/sse42.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/simd/sse42.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/src/simd/sse42.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/src/simd/sse42.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,9 +24,24 @@
     let ptr = buf.as_ptr();
 
     let LSH: __m128i = _mm_set1_epi8(0x0f);
+
+    // The first 0xf8 corresponds to the 8 first rows of the first column
+    // of URI_MAP in the crate's root, with the first row corresponding to bit 0
+    // and the 8th row corresponding to bit 7.
+    // The 8 first rows give 0 0 0 1 1 1 1 1, which is 0xf8 (with least
+    // significant digit on the left).
+    //
+    // Another example just to drive the point home: in column 15, '>' is
+    // rejected, so the values are 0 0 1 0 1 1 1 1, which gives us 0xf4.
+    //
+    // Thanks to Vlad Krasnov for explaining this stuff to us mere mortals in
+    // a GitHub comment!
+    //
+    // https://github.com/seanmonstar/httparse/pull/89#issuecomment-807039219
+
     let URI: __m128i = _mm_setr_epi8(
-        0xb8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-        0xfc, 0xfc, 0xfc, 0x7c, 0x54, 0x7c, 0xd4, 0x7c,
+        0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
+        0xfc, 0xfc, 0xfc, 0xfc, 0xf4, 0xfc, 0xf4, 0x7c,
     );
     let ARF: __m128i = _mm_setr_epi8(
         0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
@@ -82,3 +97,41 @@
 
     _tzcnt_u32(res) as usize
 }
+
+#[test]
+fn sse_code_matches_uri_chars_table() {
+    match super::detect() {
+        super::SSE_42 | super::AVX_2_AND_SSE_42 => {},
+        _ => return,
+    }
+
+    unsafe {
+        assert!(byte_is_allowed(b'_'));
+
+        for (b, allowed) in ::URI_MAP.iter().cloned().enumerate() {
+            assert_eq!(
+                byte_is_allowed(b as u8), allowed,
+                "byte_is_allowed({:?}) should be {:?}", b, allowed,
+            );
+        }
+    }
+}
+
+#[cfg(test)]
+unsafe fn byte_is_allowed(byte: u8) -> bool {
+    let slice = [
+        b'_', b'_', b'_', b'_',
+        b'_', b'_', b'_', b'_',
+        b'_', b'_', byte, b'_',
+        b'_', b'_', b'_', b'_',
+    ];
+    let mut bytes = Bytes::new(&slice);
+
+    parse_uri_batch_16(&mut bytes);
+
+    match bytes.pos() {
+        16 => true,
+        10 => false,
+        _ => unreachable!(),
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/tests/uri.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/tests/uri.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httparse/tests/uri.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httparse/tests/uri.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3679,3 +3679,15 @@
 }
 
 
+req! {
+    urltest_nvidia,
+    b"GET /nvidia_web_services/controller.gfeclientcontent.php/com.nvidia.services.GFEClientContent.getShieldReady/{\"gcV\":\"2.2.2.0\",\"dID\":\"1341\",\"osC\":\"6.20\",\"is6\":\"1\",\"lg\":\"1033\",\"GFPV\":\"389.08\",\"isO\":\"1\",\"sM\":\"16777216\"} HTTP/1.0\r\nHost: gfwsl.geforce.com\r\n\r\n",
+    |req| {
+        assert_eq!(req.method.unwrap(), "GET");
+        assert_eq!(req.path.unwrap(), "/nvidia_web_services/controller.gfeclientcontent.php/com.nvidia.services.GFEClientContent.getShieldReady/{\"gcV\":\"2.2.2.0\",\"dID\":\"1341\",\"osC\":\"6.20\",\"is6\":\"1\",\"lg\":\"1033\",\"GFPV\":\"389.08\",\"isO\":\"1\",\"sM\":\"16777216\"}");
+        assert_eq!(req.version.unwrap(), 0);
+        assert_eq!(req.headers.len(), 1);
+        assert_eq!(req.headers[0].name, "Host");
+        assert_eq!(req.headers[0].value, b"gfwsl.geforce.com");
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"f5b7d70cb2c2177a4c718c17ae87c452cec35525b3e43c56d9cd1c33c78c0ded","Cargo.toml":"264c2707f00a87f511e5f131ce2e4bd67d3458346e86600b15f99e647d559e0b","LICENSE":"0345e2b98685e3807fd802a2478085dcae35023e3da59b5a00f712504314d83a","README.md":"0f90f61ee419eefd4104005ef6900445fafce9a710dd1989463f3cebaf0fafe8","src/lib.rs":"6126e071569d147e36e8377135ddc456b4c89c00a7688487c84fd4e8ef6c0c17","src/next.rs":"d6863067b20c4bb42dced5c17bd954816b1338ce53e8d34ab81dbe240a1601cf","src/size_hint.rs":"017ed58c59b446b93aa4922e35b596490bf8f03af37c631610cc6576f1c21439","tests/is_end_stream.rs":"3a66d80d064f8a447bfa9fd212c2f91855604b1b41f554da3a029bc4a5be3a7e"},"package":"13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"fd4363e76a2456b9f6372951e197751ffee43c3008ad6aa87bcca5c0145bd7c4","Cargo.toml":"8c14b77decfcf18116bd7136c41b787422679ff45ef4b47b14751670c74e4d49","LICENSE":"0345e2b98685e3807fd802a2478085dcae35023e3da59b5a00f712504314d83a","README.md":"0f90f61ee419eefd4104005ef6900445fafce9a710dd1989463f3cebaf0fafe8","src/combinators/box_body.rs":"1475366171981c999c1be6dda84579fa34ac2a16673c77ec7bb1f2a7e2a2cc31","src/combinators/map_data.rs":"fdae4c84049a61dc1d80d12239f80928b0eb692d211fe222a1f62fc77656180e","src/combinators/map_err.rs":"8e1b77fa9e79c007d68ae4365cf431539e3186b49b3af0897f03d70c4047e4cf","src/combinators/mod.rs":"d4a5195991d7e151f2fae2e264f30bb2d67865eebb8917154b44d1b0c521fa31","src/empty.rs":"3e44cee68410101cb8bf88c0de504885075c084357e83bcd3a6761ba5c7c58d2","src/full.rs":"efcbf6831d32271170e2ed86c328bfb887aec0c93689f1218ab5a18c319b0fa8","src/lib.rs":"195a096f7cccd65f2ff3ade813a20ffbc379059f97f7462f9df330dfe7b37cfd","src/next.rs":"d6863067b20c4bb42dced5c17bd954816b1338ce53e8d34ab81dbe240a1601cf","src/size_hint.rs":"017ed58c59b446b93aa4922e35b596490bf8f03af37c631610cc6576f1c21439","tests/is_end_stream.rs":"3a66d80d064f8a447bfa9fd212c2f91855604b1b41f554da3a029bc4a5be3a7e"},"package":"399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,17 +13,23 @@
 [package]
 edition = "2018"
 name = "http-body"
-version = "0.3.1"
+version = "0.4.3"
 authors = ["Carl Lerche <me@carllerche.com>", "Lucio Franco <luciofranco14@gmail.com>", "Sean McArthur <sean@seanmonstar.com>"]
 description = "Trait representing an asynchronous, streaming, HTTP request or response body.\n"
-documentation = "https://docs.rs/http-body/0.3.0/http-body"
+documentation = "https://docs.rs/http-body"
 readme = "README.md"
 keywords = ["http"]
 categories = ["web-programming"]
 license = "MIT"
 repository = "https://github.com/hyperium/http-body"
 [dependencies.bytes]
-version = "0.5"
+version = "1"
 
 [dependencies.http]
 version = "0.2"
+
+[dependencies.pin-project-lite]
+version = "0.2"
+[dev-dependencies.tokio]
+version = "1"
+features = ["macros", "rt"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,28 @@
+# Unreleased
+
+None.
+
+# 0.4.3 (August 8, 2021)
+
+- Implement `Default` for `BoxBody`.
+
+# 0.4.2 (May 8, 2021)
+
+- Correctly override `Body::size_hint` and `Body::is_end_stream` for `Empty`.
+- Add `Full` which is a body that consists of a single chunk.
+
+# 0.4.1 (March 18, 2021)
+
+- Add combinators to `Body`:
+  - `map_data`: Change the `Data` chunks produced by the body.
+  - `map_err`: Change the `Error`s produced by the body.
+  - `boxed`: Convert the `Body` into a boxed trait object.
+- Add `Empty`.
+
+# 0.4.0 (December 23, 2020)
+
+- Update `bytes` to v1.0.
+
 # 0.3.1 (December 13, 2019)
 
 - Implement `Body` for `http::Request<impl Body>` and `http::Response<impl Body>`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/combinators/box_body.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/combinators/box_body.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/combinators/box_body.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/combinators/box_body.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,70 @@
+use crate::Body;
+use bytes::Buf;
+use std::{
+    fmt,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+/// A boxed [`Body`] trait object.
+pub struct BoxBody<D, E> {
+    inner: Pin<Box<dyn Body<Data = D, Error = E> + Send + Sync + 'static>>,
+}
+
+impl<D, E> BoxBody<D, E> {
+    /// Create a new `BoxBody`.
+    pub fn new<B>(body: B) -> Self
+    where
+        B: Body<Data = D, Error = E> + Send + Sync + 'static,
+        D: Buf,
+    {
+        Self {
+            inner: Box::pin(body),
+        }
+    }
+}
+
+impl<D, E> fmt::Debug for BoxBody<D, E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("BoxBody").finish()
+    }
+}
+
+impl<D, E> Body for BoxBody<D, E>
+where
+    D: Buf,
+{
+    type Data = D;
+    type Error = E;
+
+    fn poll_data(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Self::Data, Self::Error>>> {
+        self.inner.as_mut().poll_data(cx)
+    }
+
+    fn poll_trailers(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<Option<http::HeaderMap>, Self::Error>> {
+        self.inner.as_mut().poll_trailers(cx)
+    }
+
+    fn is_end_stream(&self) -> bool {
+        self.inner.is_end_stream()
+    }
+
+    fn size_hint(&self) -> crate::SizeHint {
+        self.inner.size_hint()
+    }
+}
+
+impl<D, E> Default for BoxBody<D, E>
+where
+    D: Buf + 'static,
+{
+    fn default() -> Self {
+        BoxBody::new(crate::Empty::new().map_err(|err| match err {}))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/combinators/map_data.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/combinators/map_data.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/combinators/map_data.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/combinators/map_data.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,80 @@
+use crate::Body;
+use bytes::Buf;
+use pin_project_lite::pin_project;
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+pin_project! {
+    /// Body returned by the [`map_data`] combinator.
+    ///
+    /// [`map_data`]: crate::util::BodyExt::map_data
+    #[derive(Debug, Clone, Copy)]
+    pub struct MapData<B, F> {
+        #[pin]
+        inner: B,
+        f: F
+    }
+}
+
+impl<B, F> MapData<B, F> {
+    #[inline]
+    pub(crate) fn new(body: B, f: F) -> Self {
+        Self { inner: body, f }
+    }
+
+    /// Get a reference to the inner body
+    pub fn get_ref(&self) -> &B {
+        &self.inner
+    }
+
+    /// Get a mutable reference to the inner body
+    pub fn get_mut(&mut self) -> &mut B {
+        &mut self.inner
+    }
+
+    /// Get a pinned mutable reference to the inner body
+    pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut B> {
+        self.project().inner
+    }
+
+    /// Consume `self`, returning the inner body
+    pub fn into_inner(self) -> B {
+        self.inner
+    }
+}
+
+impl<B, F, B2> Body for MapData<B, F>
+where
+    B: Body,
+    F: FnMut(B::Data) -> B2,
+    B2: Buf,
+{
+    type Data = B2;
+    type Error = B::Error;
+
+    fn poll_data(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Self::Data, Self::Error>>> {
+        let this = self.project();
+        match this.inner.poll_data(cx) {
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(None) => Poll::Ready(None),
+            Poll::Ready(Some(Ok(data))) => Poll::Ready(Some(Ok((this.f)(data)))),
+            Poll::Ready(Some(Err(err))) => Poll::Ready(Some(Err(err))),
+        }
+    }
+
+    fn poll_trailers(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<Option<http::HeaderMap>, Self::Error>> {
+        self.project().inner.poll_trailers(cx)
+    }
+
+    fn is_end_stream(&self) -> bool {
+        self.inner.is_end_stream()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/combinators/map_err.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/combinators/map_err.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/combinators/map_err.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/combinators/map_err.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,83 @@
+use crate::Body;
+use pin_project_lite::pin_project;
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+pin_project! {
+    /// Body returned by the [`map_err`] combinator.
+    ///
+    /// [`map_err`]: crate::util::BodyExt::map_err
+    #[derive(Debug, Clone, Copy)]
+    pub struct MapErr<B, F> {
+        #[pin]
+        inner: B,
+        f: F
+    }
+}
+
+impl<B, F> MapErr<B, F> {
+    #[inline]
+    pub(crate) fn new(body: B, f: F) -> Self {
+        Self { inner: body, f }
+    }
+
+    /// Get a reference to the inner body
+    pub fn get_ref(&self) -> &B {
+        &self.inner
+    }
+
+    /// Get a mutable reference to the inner body
+    pub fn get_mut(&mut self) -> &mut B {
+        &mut self.inner
+    }
+
+    /// Get a pinned mutable reference to the inner body
+    pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut B> {
+        self.project().inner
+    }
+
+    /// Consume `self`, returning the inner body
+    pub fn into_inner(self) -> B {
+        self.inner
+    }
+}
+
+impl<B, F, E> Body for MapErr<B, F>
+where
+    B: Body,
+    F: FnMut(B::Error) -> E,
+{
+    type Data = B::Data;
+    type Error = E;
+
+    fn poll_data(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Self::Data, Self::Error>>> {
+        let this = self.project();
+        match this.inner.poll_data(cx) {
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(None) => Poll::Ready(None),
+            Poll::Ready(Some(Ok(data))) => Poll::Ready(Some(Ok(data))),
+            Poll::Ready(Some(Err(err))) => Poll::Ready(Some(Err((this.f)(err)))),
+        }
+    }
+
+    fn poll_trailers(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<Option<http::HeaderMap>, Self::Error>> {
+        let this = self.project();
+        this.inner.poll_trailers(cx).map_err(this.f)
+    }
+
+    fn is_end_stream(&self) -> bool {
+        self.inner.is_end_stream()
+    }
+
+    fn size_hint(&self) -> crate::SizeHint {
+        self.inner.size_hint()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/combinators/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/combinators/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/combinators/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/combinators/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+//! Combinators for the `Body` trait.
+
+mod box_body;
+mod map_data;
+mod map_err;
+
+pub use self::{box_body::BoxBody, map_data::MapData, map_err::MapErr};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/empty.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/empty.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/empty.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/empty.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,75 @@
+use super::{Body, SizeHint};
+use bytes::Buf;
+use http::HeaderMap;
+use std::{
+    convert::Infallible,
+    fmt,
+    marker::PhantomData,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+/// A body that is always empty.
+pub struct Empty<D> {
+    _marker: PhantomData<fn() -> D>,
+}
+
+impl<D> Empty<D> {
+    /// Create a new `Empty`.
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+impl<D: Buf> Body for Empty<D> {
+    type Data = D;
+    type Error = Infallible;
+
+    #[inline]
+    fn poll_data(
+        self: Pin<&mut Self>,
+        _cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Self::Data, Self::Error>>> {
+        Poll::Ready(None)
+    }
+
+    #[inline]
+    fn poll_trailers(
+        self: Pin<&mut Self>,
+        _cx: &mut Context<'_>,
+    ) -> Poll<Result<Option<HeaderMap>, Self::Error>> {
+        Poll::Ready(Ok(None))
+    }
+
+    fn is_end_stream(&self) -> bool {
+        true
+    }
+
+    fn size_hint(&self) -> SizeHint {
+        SizeHint::with_exact(0)
+    }
+}
+
+impl<D> fmt::Debug for Empty<D> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Empty").finish()
+    }
+}
+
+impl<D> Default for Empty<D> {
+    fn default() -> Self {
+        Self {
+            _marker: PhantomData,
+        }
+    }
+}
+
+impl<D> Clone for Empty<D> {
+    fn clone(&self) -> Self {
+        Self {
+            _marker: PhantomData,
+        }
+    }
+}
+
+impl<D> Copy for Empty<D> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/full.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/full.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/full.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/full.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,151 @@
+use crate::{Body, SizeHint};
+use bytes::{Buf, Bytes};
+use http::HeaderMap;
+use pin_project_lite::pin_project;
+use std::borrow::Cow;
+use std::convert::{Infallible, TryFrom};
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+pin_project! {
+    /// A body that consists of a single chunk.
+    #[derive(Clone, Copy, Debug)]
+    pub struct Full<D> {
+        data: Option<D>,
+    }
+}
+
+impl<D> Full<D>
+where
+    D: Buf,
+{
+    /// Create a new `Full`.
+    pub fn new(data: D) -> Self {
+        let data = if data.has_remaining() {
+            Some(data)
+        } else {
+            None
+        };
+        Full { data }
+    }
+}
+
+impl<D> Body for Full<D>
+where
+    D: Buf,
+{
+    type Data = D;
+    type Error = Infallible;
+
+    fn poll_data(
+        mut self: Pin<&mut Self>,
+        _cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<D, Self::Error>>> {
+        Poll::Ready(self.data.take().map(Ok))
+    }
+
+    fn poll_trailers(
+        self: Pin<&mut Self>,
+        _cx: &mut Context<'_>,
+    ) -> Poll<Result<Option<HeaderMap>, Self::Error>> {
+        Poll::Ready(Ok(None))
+    }
+
+    fn is_end_stream(&self) -> bool {
+        self.data.is_none()
+    }
+
+    fn size_hint(&self) -> SizeHint {
+        self.data
+            .as_ref()
+            .map(|data| SizeHint::with_exact(u64::try_from(data.remaining()).unwrap()))
+            .unwrap_or_else(|| SizeHint::with_exact(0))
+    }
+}
+
+impl<D> Default for Full<D>
+where
+    D: Buf,
+{
+    /// Create an empty `Full`.
+    fn default() -> Self {
+        Full { data: None }
+    }
+}
+
+impl<D> From<Bytes> for Full<D>
+where
+    D: Buf + From<Bytes>,
+{
+    fn from(bytes: Bytes) -> Self {
+        Full::new(D::from(bytes))
+    }
+}
+
+impl<D> From<Vec<u8>> for Full<D>
+where
+    D: Buf + From<Vec<u8>>,
+{
+    fn from(vec: Vec<u8>) -> Self {
+        Full::new(D::from(vec))
+    }
+}
+
+impl<D> From<&'static [u8]> for Full<D>
+where
+    D: Buf + From<&'static [u8]>,
+{
+    fn from(slice: &'static [u8]) -> Self {
+        Full::new(D::from(slice))
+    }
+}
+
+impl<D, B> From<Cow<'static, B>> for Full<D>
+where
+    D: Buf + From<&'static B> + From<B::Owned>,
+    B: ToOwned + ?Sized,
+{
+    fn from(cow: Cow<'static, B>) -> Self {
+        match cow {
+            Cow::Borrowed(b) => Full::new(D::from(b)),
+            Cow::Owned(o) => Full::new(D::from(o)),
+        }
+    }
+}
+
+impl<D> From<String> for Full<D>
+where
+    D: Buf + From<String>,
+{
+    fn from(s: String) -> Self {
+        Full::new(D::from(s))
+    }
+}
+
+impl<D> From<&'static str> for Full<D>
+where
+    D: Buf + From<&'static str>,
+{
+    fn from(slice: &'static str) -> Self {
+        Full::new(D::from(slice))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn full_returns_some() {
+        let mut full = Full::new(&b"hello"[..]);
+        assert_eq!(full.size_hint().exact(), Some(b"hello".len() as u64));
+        assert_eq!(full.data().await, Some(Ok(&b"hello"[..])));
+        assert!(full.data().await.is_none());
+    }
+
+    #[tokio::test]
+    async fn empty_full_returns_none() {
+        assert!(Full::<&[u8]>::default().data().await.is_none());
+        assert!(Full::new(&b""[..]).data().await.is_none());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/http-body/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/http-body/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,10 @@
-#![doc(html_root_url = "https://docs.rs/http-body/0.3.1")]
-#![deny(missing_debug_implementations, missing_docs, unreachable_pub)]
+#![doc(html_root_url = "https://docs.rs/http-body/0.4.3")]
+#![deny(
+    missing_debug_implementations,
+    missing_docs,
+    unreachable_pub,
+    broken_intra_doc_links
+)]
 #![cfg_attr(test, deny(warnings))]
 
 //! Asynchronous HTTP request or response body.
@@ -8,12 +13,19 @@
 //!
 //! [`Body`]: trait.Body.html
 
+mod empty;
+mod full;
 mod next;
 mod size_hint;
 
+pub mod combinators;
+
+pub use self::empty::Empty;
+pub use self::full::Full;
 pub use self::next::{Data, Trailers};
 pub use self::size_hint::SizeHint;
 
+use self::combinators::{BoxBody, MapData, MapErr};
 use bytes::Buf;
 use http::HeaderMap;
 use std::ops;
@@ -83,6 +95,33 @@
     {
         Trailers(self)
     }
+
+    /// Maps this body's data value to a different value.
+    fn map_data<F, B>(self, f: F) -> MapData<Self, F>
+    where
+        Self: Sized,
+        F: FnMut(Self::Data) -> B,
+        B: Buf,
+    {
+        MapData::new(self, f)
+    }
+
+    /// Maps this body's error value to a different value.
+    fn map_err<F, E>(self, f: F) -> MapErr<Self, F>
+    where
+        Self: Sized,
+        F: FnMut(Self::Error) -> E,
+    {
+        MapErr::new(self, f)
+    }
+
+    /// Turn this body into a boxed trait object.
+    fn boxed(self) -> BoxBody<Self::Data, Self::Error>
+    where
+        Self: Sized + Send + Sync + 'static,
+    {
+        BoxBody::new(self)
+    }
 }
 
 impl<T: Body + Unpin + ?Sized> Body for &mut T {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"62ac69b9066d6ff0b2ace8a44f5f583631b79deca33dc4f680e0723209bbaa9d","LICENSE-APACHE":"4d10fe5f3aa176b05b229a248866bad70b834c173f1252a814ff4748d8a13837","LICENSE-MIT":"934887691e05d69d7c86ad3f2c360980fa30c15b035e351f3c9865e99da4debc","README.md":"7b1979a97e68f9a04d1bf6e04ea29d8b8c8c2ac6eda0732872434eaaeceeeb5a","src/httpdate.rs":"d074a63c7eb0686475b878848306299dad45f42f608a437af022ccc0475cd04d","src/lib.rs":"b1877f106fa29cccae2f464aa6af08cb0c0a8fd4f1a781baaaf8584854bba48c"},"package":"494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"}
\ No newline at end of file
+{"files":{"Cargo.toml":"e72ef197a86595628eee7bf872dbd797ff9445097ac8d7c226e7b94da25f469a","LICENSE-APACHE":"4d10fe5f3aa176b05b229a248866bad70b834c173f1252a814ff4748d8a13837","LICENSE-MIT":"934887691e05d69d7c86ad3f2c360980fa30c15b035e351f3c9865e99da4debc","README.md":"26318a99a935b392b4fc7527e2376ee67e6b7bb75558882173d25c4408ce9273","src/date.rs":"e1914707054970395959c7854020b68a961b562bee1797583bc501cd7ee329fa","src/lib.rs":"fb3443f25b035a0c11df4188285f57bdf43372fd58d33115f4f8c381c2655ede"},"package":"6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -11,15 +11,12 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "httpdate"
-version = "0.3.2"
-authors = ["Pyfisch <pyfisch@gmail.com>"]
+version = "1.0.1"
+authors = ["Pyfisch <pyfisch@posteo.org>"]
 description = "HTTP date parsing and formatting"
-documentation = "https://pyfisch.github.io/httpdate/httpdate/index.html"
 readme = "README.md"
 keywords = ["http", "date", "time", "simple", "timestamp"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/pyfisch/httpdate"
-
-[features]
-unstable = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/pyfisch/httpdate.svg?branch=master)](https://travis-ci.org/pyfisch/httpdate)
 [![Crates.io](https://img.shields.io/crates/v/httpdate.svg)](https://crates.io/crates/httpdate)
-[Documentation](https://pyfisch.github.io/httpdate/httpdate/index.html)
+[![Documentation](https://docs.rs/httpdate/badge.svg)](https://docs.rs/httpdate)
 
 Multiple HTTP header fields store timestamps.
 For example a response created on May 15, 2015 may contain the header
@@ -16,6 +16,11 @@
 * `parse_http_date` to parse a HTTP datetime string to a system time
 * `fmt_http_date` to format a system time to a IMF-fixdate
 
+In addition it exposes the `HttpDate` type that can be used to parse
+and format timestamps. Convert a sytem time to `HttpDate` and vice versa.
+The `HttpType` (8 bytes) is smaller than `SystemTime` (16 bytes) and
+using the display impl avoids a temporary allocation.
+
 Read the [blog post](https://pyfisch.org/blog/http-datetime-handling/) to learn
 more.
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/src/date.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/src/date.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/src/date.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/src/date.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,397 @@
+use std::cmp;
+use std::fmt::{self, Display, Formatter};
+use std::num::ParseIntError;
+use std::str::{from_utf8_unchecked, FromStr};
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use crate::Error;
+
+/// HTTP timestamp type.
+///
+/// Parse using `FromStr` impl.
+/// Format using the `Display` trait.
+/// Convert timestamp into/from `SytemTime` to use.
+/// Supports comparsion and sorting.
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+pub struct HttpDate {
+    /// 0...59
+    sec: u8,
+    /// 0...59
+    min: u8,
+    /// 0...23
+    hour: u8,
+    /// 1...31
+    day: u8,
+    /// 1...12
+    mon: u8,
+    /// 1970...9999
+    year: u16,
+    /// 1...7
+    wday: u8,
+}
+
+impl HttpDate {
+    fn is_valid(&self) -> bool {
+        self.sec < 60
+            && self.min < 60
+            && self.hour < 24
+            && self.day > 0
+            && self.day < 32
+            && self.mon > 0
+            && self.mon <= 12
+            && self.year >= 1970
+            && self.year <= 9999
+            && &HttpDate::from(SystemTime::from(*self)) == self
+    }
+}
+
+impl From<SystemTime> for HttpDate {
+    fn from(v: SystemTime) -> HttpDate {
+        let dur = v
+            .duration_since(UNIX_EPOCH)
+            .expect("all times should be after the epoch");
+        let secs_since_epoch = dur.as_secs();
+
+        if secs_since_epoch >= 253402300800 {
+            // year 9999
+            panic!("date must be before year 9999");
+        }
+
+        /* 2000-03-01 (mod 400 year, immediately after feb29 */
+        const LEAPOCH: i64 = 11017;
+        const DAYS_PER_400Y: i64 = 365 * 400 + 97;
+        const DAYS_PER_100Y: i64 = 365 * 100 + 24;
+        const DAYS_PER_4Y: i64 = 365 * 4 + 1;
+
+        let days = (secs_since_epoch / 86400) as i64 - LEAPOCH;
+        let secs_of_day = secs_since_epoch % 86400;
+
+        let mut qc_cycles = days / DAYS_PER_400Y;
+        let mut remdays = days % DAYS_PER_400Y;
+
+        if remdays < 0 {
+            remdays += DAYS_PER_400Y;
+            qc_cycles -= 1;
+        }
+
+        let mut c_cycles = remdays / DAYS_PER_100Y;
+        if c_cycles == 4 {
+            c_cycles -= 1;
+        }
+        remdays -= c_cycles * DAYS_PER_100Y;
+
+        let mut q_cycles = remdays / DAYS_PER_4Y;
+        if q_cycles == 25 {
+            q_cycles -= 1;
+        }
+        remdays -= q_cycles * DAYS_PER_4Y;
+
+        let mut remyears = remdays / 365;
+        if remyears == 4 {
+            remyears -= 1;
+        }
+        remdays -= remyears * 365;
+
+        let mut year = 2000 + remyears + 4 * q_cycles + 100 * c_cycles + 400 * qc_cycles;
+
+        let months = [31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29];
+        let mut mon = 0;
+        for mon_len in months.iter() {
+            mon += 1;
+            if remdays < *mon_len {
+                break;
+            }
+            remdays -= *mon_len;
+        }
+        let mday = remdays + 1;
+        let mon = if mon + 2 > 12 {
+            year += 1;
+            mon - 10
+        } else {
+            mon + 2
+        };
+
+        let mut wday = (3 + days) % 7;
+        if wday <= 0 {
+            wday += 7
+        };
+
+        HttpDate {
+            sec: (secs_of_day % 60) as u8,
+            min: ((secs_of_day % 3600) / 60) as u8,
+            hour: (secs_of_day / 3600) as u8,
+            day: mday as u8,
+            mon: mon as u8,
+            year: year as u16,
+            wday: wday as u8,
+        }
+    }
+}
+
+impl From<HttpDate> for SystemTime {
+    fn from(v: HttpDate) -> SystemTime {
+        let leap_years =
+            ((v.year - 1) - 1968) / 4 - ((v.year - 1) - 1900) / 100 + ((v.year - 1) - 1600) / 400;
+        let mut ydays = match v.mon {
+            1 => 0,
+            2 => 31,
+            3 => 59,
+            4 => 90,
+            5 => 120,
+            6 => 151,
+            7 => 181,
+            8 => 212,
+            9 => 243,
+            10 => 273,
+            11 => 304,
+            12 => 334,
+            _ => unreachable!(),
+        } + v.day as u64
+            - 1;
+        if is_leap_year(v.year) && v.mon > 2 {
+            ydays += 1;
+        }
+        let days = (v.year as u64 - 1970) * 365 + leap_years as u64 + ydays;
+        UNIX_EPOCH
+            + Duration::from_secs(
+                v.sec as u64 + v.min as u64 * 60 + v.hour as u64 * 3600 + days * 86400,
+            )
+    }
+}
+
+impl FromStr for HttpDate {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<HttpDate, Error> {
+        if !s.is_ascii() {
+            return Err(Error(()));
+        }
+        let x = s.trim().as_bytes();
+        let date = parse_imf_fixdate(x)
+            .or_else(|_| parse_rfc850_date(x))
+            .or_else(|_| parse_asctime(x))?;
+        if !date.is_valid() {
+            return Err(Error(()));
+        }
+        Ok(date)
+    }
+}
+
+impl Display for HttpDate {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        let wday = match self.wday {
+            1 => b"Mon",
+            2 => b"Tue",
+            3 => b"Wed",
+            4 => b"Thu",
+            5 => b"Fri",
+            6 => b"Sat",
+            7 => b"Sun",
+            _ => unreachable!(),
+        };
+        let mon = match self.mon {
+            1 => b"Jan",
+            2 => b"Feb",
+            3 => b"Mar",
+            4 => b"Apr",
+            5 => b"May",
+            6 => b"Jun",
+            7 => b"Jul",
+            8 => b"Aug",
+            9 => b"Sep",
+            10 => b"Oct",
+            11 => b"Nov",
+            12 => b"Dec",
+            _ => unreachable!(),
+        };
+        let mut buf: [u8; 29] = [
+            // Too long to write as: b"Thu, 01 Jan 1970 00:00:00 GMT"
+            b' ', b' ', b' ', b',', b' ', b'0', b'0', b' ', b' ', b' ', b' ', b' ', b'0', b'0',
+            b'0', b'0', b' ', b'0', b'0', b':', b'0', b'0', b':', b'0', b'0', b' ', b'G', b'M',
+            b'T',
+        ];
+        buf[0] = wday[0];
+        buf[1] = wday[1];
+        buf[2] = wday[2];
+        buf[5] = b'0' + (self.day / 10) as u8;
+        buf[6] = b'0' + (self.day % 10) as u8;
+        buf[8] = mon[0];
+        buf[9] = mon[1];
+        buf[10] = mon[2];
+        buf[12] = b'0' + (self.year / 1000) as u8;
+        buf[13] = b'0' + (self.year / 100 % 10) as u8;
+        buf[14] = b'0' + (self.year / 10 % 10) as u8;
+        buf[15] = b'0' + (self.year % 10) as u8;
+        buf[17] = b'0' + (self.hour / 10) as u8;
+        buf[18] = b'0' + (self.hour % 10) as u8;
+        buf[20] = b'0' + (self.min / 10) as u8;
+        buf[21] = b'0' + (self.min % 10) as u8;
+        buf[23] = b'0' + (self.sec / 10) as u8;
+        buf[24] = b'0' + (self.sec % 10) as u8;
+        f.write_str(unsafe { from_utf8_unchecked(&buf[..]) })
+    }
+}
+
+impl Ord for HttpDate {
+    fn cmp(&self, other: &HttpDate) -> cmp::Ordering {
+        SystemTime::from(*self).cmp(&SystemTime::from(*other))
+    }
+}
+
+impl PartialOrd for HttpDate {
+    fn partial_cmp(&self, other: &HttpDate) -> Option<cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+/// Convert &[u8] to &str with zero checks.
+///
+/// For internal use only.
+/// Intended to be used with ASCII-only strings.
+fn conv(s: &[u8]) -> &str {
+    unsafe { from_utf8_unchecked(s) }
+}
+
+fn cvt_err(_: ParseIntError) -> Error {
+    Error(())
+}
+fn parse_imf_fixdate(s: &[u8]) -> Result<HttpDate, Error> {
+    // Example: `Sun, 06 Nov 1994 08:49:37 GMT`
+    if s.len() != 29 || &s[25..] != b" GMT" || s[16] != b' ' || s[19] != b':' || s[22] != b':' {
+        return Err(Error(()));
+    }
+    Ok(HttpDate {
+        sec: conv(&s[23..25]).parse().map_err(cvt_err)?,
+        min: conv(&s[20..22]).parse().map_err(cvt_err)?,
+        hour: conv(&s[17..19]).parse().map_err(cvt_err)?,
+        day: conv(&s[5..7]).parse().map_err(cvt_err)?,
+        mon: match &s[7..12] {
+            b" Jan " => 1,
+            b" Feb " => 2,
+            b" Mar " => 3,
+            b" Apr " => 4,
+            b" May " => 5,
+            b" Jun " => 6,
+            b" Jul " => 7,
+            b" Aug " => 8,
+            b" Sep " => 9,
+            b" Oct " => 10,
+            b" Nov " => 11,
+            b" Dec " => 12,
+            _ => return Err(Error(())),
+        },
+        year: conv(&s[12..16]).parse().map_err(cvt_err)?,
+        wday: match &s[..5] {
+            b"Mon, " => 1,
+            b"Tue, " => 2,
+            b"Wed, " => 3,
+            b"Thu, " => 4,
+            b"Fri, " => 5,
+            b"Sat, " => 6,
+            b"Sun, " => 7,
+            _ => return Err(Error(())),
+        },
+    })
+}
+
+fn parse_rfc850_date(s: &[u8]) -> Result<HttpDate, Error> {
+    // Example: `Sunday, 06-Nov-94 08:49:37 GMT`
+    if s.len() < 23 {
+        return Err(Error(()));
+    }
+
+    fn wday<'a>(s: &'a [u8], wday: u8, name: &'static [u8]) -> Option<(u8, &'a [u8])> {
+        if &s[0..name.len()] == name {
+            return Some((wday, &s[name.len()..]));
+        }
+        None
+    }
+    let (wday, s) = wday(s, 1, b"Monday, ")
+        .or_else(|| wday(s, 2, b"Tuesday, "))
+        .or_else(|| wday(s, 3, b"Wednesday, "))
+        .or_else(|| wday(s, 4, b"Thursday, "))
+        .or_else(|| wday(s, 5, b"Friday, "))
+        .or_else(|| wday(s, 6, b"Saturday, "))
+        .or_else(|| wday(s, 7, b"Sunday, "))
+        .ok_or(Error(()))?;
+    if s.len() != 22 || s[12] != b':' || s[15] != b':' || &s[18..22] != b" GMT" {
+        return Err(Error(()));
+    }
+    let mut year = conv(&s[7..9]).parse::<u16>().map_err(cvt_err)?;
+    if year < 70 {
+        year += 2000;
+    } else {
+        year += 1900;
+    }
+    Ok(HttpDate {
+        sec: conv(&s[16..18]).parse().map_err(cvt_err)?,
+        min: conv(&s[13..15]).parse().map_err(cvt_err)?,
+        hour: conv(&s[10..12]).parse().map_err(cvt_err)?,
+        day: conv(&s[0..2]).parse().map_err(cvt_err)?,
+        mon: match &s[2..7] {
+            b"-Jan-" => 1,
+            b"-Feb-" => 2,
+            b"-Mar-" => 3,
+            b"-Apr-" => 4,
+            b"-May-" => 5,
+            b"-Jun-" => 6,
+            b"-Jul-" => 7,
+            b"-Aug-" => 8,
+            b"-Sep-" => 9,
+            b"-Oct-" => 10,
+            b"-Nov-" => 11,
+            b"-Dec-" => 12,
+            _ => return Err(Error(())),
+        },
+        year,
+        wday,
+    })
+}
+
+fn parse_asctime(s: &[u8]) -> Result<HttpDate, Error> {
+    // Example: `Sun Nov  6 08:49:37 1994`
+    if s.len() != 24 || s[10] != b' ' || s[13] != b':' || s[16] != b':' || s[19] != b' ' {
+        return Err(Error(()));
+    }
+    Ok(HttpDate {
+        sec: conv(&s[17..19]).parse().map_err(cvt_err)?,
+        min: conv(&s[14..16]).parse().map_err(cvt_err)?,
+        hour: conv(&s[11..13]).parse().map_err(cvt_err)?,
+        day: {
+            let x = &s[8..10];
+            conv(if x[0] == b' ' { &x[1..2] } else { x })
+                .parse()
+                .map_err(cvt_err)?
+        },
+        mon: match &s[4..8] {
+            b"Jan " => 1,
+            b"Feb " => 2,
+            b"Mar " => 3,
+            b"Apr " => 4,
+            b"May " => 5,
+            b"Jun " => 6,
+            b"Jul " => 7,
+            b"Aug " => 8,
+            b"Sep " => 9,
+            b"Oct " => 10,
+            b"Nov " => 11,
+            b"Dec " => 12,
+            _ => return Err(Error(())),
+        },
+        year: conv(&s[20..24]).parse().map_err(cvt_err)?,
+        wday: match &s[0..4] {
+            b"Mon " => 1,
+            b"Tue " => 2,
+            b"Wed " => 3,
+            b"Thu " => 4,
+            b"Fri " => 5,
+            b"Sat " => 6,
+            b"Sun " => 7,
+            _ => return Err(Error(())),
+        },
+    })
+}
+
+fn is_leap_year(y: u16) -> bool {
+    y % 4 == 0 && (y % 100 != 0 || y % 400 == 0)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/src/httpdate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/src/httpdate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/src/httpdate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/src/httpdate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,383 +0,0 @@
-#[allow(unused_imports)]
-use std::ascii::AsciiExt;
-use std::fmt::{self, Display, Formatter};
-use std::cmp;
-use std::str::{FromStr, from_utf8_unchecked};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use Error;
-
-/// HTTP timestamp type.
-///
-/// Parse using `FromStr` impl.
-/// Format using the `Display` trait.
-/// Convert timestamp into/from `SytemTime` to use.
-/// Supports comparsion and sorting.
-#[derive(Copy, Clone, Debug, Eq, Ord)]
-pub struct HttpDate {
-    /// 0...59
-    sec: u8,
-    /// 0...59
-    min: u8,
-    /// 0...23
-    hour: u8,
-    /// 1...31
-    day: u8,
-    /// 1...12
-    mon: u8,
-    /// 1970...9999
-    year: u16,
-    /// 1...7
-    wday: u8,
-}
-
-impl HttpDate {
-    fn is_valid(&self) -> bool {
-        self.sec < 60 && self.min < 60 && self.hour < 24 && self.day > 0 &&
-        self.day < 32 && self.mon > 0 && self.mon <= 12 && self.year >= 1970 &&
-        self.year <= 9999
-    }
-}
-
-impl From<SystemTime> for HttpDate {
-    fn from(v: SystemTime) -> HttpDate {
-        let dur = v.duration_since(UNIX_EPOCH)
-            .expect("all times should be after the epoch");
-        let secs_since_epoch = dur.as_secs();
-
-        if secs_since_epoch >= 253402300800 { // year 9999
-            panic!("date must be before year 9999");
-        }
-
-        /* 2000-03-01 (mod 400 year, immediately after feb29 */
-        const LEAPOCH: i64 = 11017;
-        const DAYS_PER_400Y: i64 = 365*400 + 97;
-        const DAYS_PER_100Y: i64 = 365*100 + 24;
-        const DAYS_PER_4Y: i64 = 365*4 + 1;
-
-        let days = (secs_since_epoch / 86400) as i64 - LEAPOCH;
-        let secs_of_day = secs_since_epoch % 86400;
-
-        let mut qc_cycles = days / DAYS_PER_400Y;
-        let mut remdays = days % DAYS_PER_400Y;
-
-        if remdays < 0 {
-            remdays += DAYS_PER_400Y;
-            qc_cycles -= 1;
-        }
-
-        let mut c_cycles = remdays / DAYS_PER_100Y;
-        if c_cycles == 4 { c_cycles -= 1; }
-        remdays -= c_cycles * DAYS_PER_100Y;
-
-        let mut q_cycles = remdays / DAYS_PER_4Y;
-        if q_cycles == 25 { q_cycles -= 1; }
-        remdays -= q_cycles * DAYS_PER_4Y;
-
-        let mut remyears = remdays / 365;
-        if remyears == 4 { remyears -= 1; }
-        remdays -= remyears * 365;
-
-        let mut year = 2000 +
-            remyears + 4*q_cycles + 100*c_cycles + 400*qc_cycles;
-
-        let months = [31,30,31,30,31,31,30,31,30,31,31,29];
-        let mut mon = 0;
-        for mon_len in months.iter() {
-            mon += 1;
-            if remdays < *mon_len {
-                break;
-            }
-            remdays -= *mon_len;
-        }
-        let mday = remdays+1;
-        let mon = if mon + 2 > 12 {
-            year += 1;
-            mon - 10
-        } else {
-            mon + 2
-        };
-
-        let mut wday = (3+days)%7;
-        if wday <= 0 {
-            wday += 7
-        };
-
-        HttpDate {
-            sec: (secs_of_day % 60) as u8,
-            min: ((secs_of_day % 3600) / 60) as u8,
-            hour: (secs_of_day / 3600) as u8,
-            day: mday as u8,
-            mon: mon as u8,
-            year: year as u16,
-            wday: wday as u8,
-        }
-    }
-}
-
-impl From<HttpDate> for SystemTime {
-    fn from(v: HttpDate) -> SystemTime {
-        let leap_years = ((v.year - 1) - 1968) / 4 - ((v.year - 1) - 1900) / 100 +
-                         ((v.year - 1) - 1600) / 400;
-        let mut ydays = match v.mon {
-            1 => 0,
-            2 => 31,
-            3 => 59,
-            4 => 90,
-            5 => 120,
-            6 => 151,
-            7 => 181,
-            8 => 212,
-            9 => 243,
-            10 => 273,
-            11 => 304,
-            12 => 334,
-            _ => unreachable!(),
-        } + v.day as u64 - 1;
-        if is_leap_year(v.year) && v.mon > 2 {
-            ydays += 1;
-        }
-        let days = (v.year as u64 - 1970) * 365 + leap_years as u64 + ydays;
-        UNIX_EPOCH +
-        Duration::from_secs(v.sec as u64 + v.min as u64 * 60 + v.hour as u64 * 3600 + days * 86400)
-    }
-}
-
-impl FromStr for HttpDate {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<HttpDate, Error> {
-        if !s.is_ascii() {
-            return Err(Error(()));
-        }
-        let x = s.trim().as_bytes();
-        let date = parse_imf_fixdate(x)
-            .or_else(|_| parse_rfc850_date(x))
-            .or_else(|_| parse_asctime(x))?;
-        if !date.is_valid() {
-            return Err(Error(()));
-        }
-        Ok(date)
-    }
-}
-
-impl Display for HttpDate {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        let wday = match self.wday {
-            1 => b"Mon",
-            2 => b"Tue",
-            3 => b"Wed",
-            4 => b"Thu",
-            5 => b"Fri",
-            6 => b"Sat",
-            7 => b"Sun",
-            _ => unreachable!(),
-        };
-        let mon = match self.mon {
-            1 => b"Jan",
-            2 => b"Feb",
-            3 => b"Mar",
-            4 => b"Apr",
-            5 => b"May",
-            6 => b"Jun",
-            7 => b"Jul",
-            8 => b"Aug",
-            9 => b"Sep",
-            10 => b"Oct",
-            11 => b"Nov",
-            12 => b"Dec",
-            _ => unreachable!(),
-        };
-        let mut buf: [u8; 29] = [
-            // Too long to write as: b"Thu, 01 Jan 1970 00:00:00 GMT"
-            b' ', b' ', b' ', b',', b' ',
-            b'0', b'0', b' ', b' ', b' ', b' ', b' ',
-            b'0', b'0', b'0', b'0', b' ',
-            b'0', b'0', b':', b'0', b'0', b':', b'0', b'0',
-            b' ', b'G', b'M', b'T',
-        ];
-        buf[0] = wday[0];
-        buf[1] = wday[1];
-        buf[2] = wday[2];
-        buf[5] = b'0' + (self.day / 10) as u8;
-        buf[6] = b'0' + (self.day % 10) as u8;
-        buf[8] = mon[0];
-        buf[9] = mon[1];
-        buf[10] = mon[2];
-        buf[12] = b'0' + (self.year / 1000) as u8;
-        buf[13] = b'0' + (self.year / 100 % 10) as u8;
-        buf[14] = b'0' + (self.year / 10 % 10) as u8;
-        buf[15] = b'0' + (self.year % 10) as u8;
-        buf[17] = b'0' + (self.hour / 10) as u8;
-        buf[18] = b'0' + (self.hour % 10) as u8;
-        buf[20] = b'0' + (self.min / 10) as u8;
-        buf[21] = b'0' + (self.min % 10) as u8;
-        buf[23] = b'0' + (self.sec / 10) as u8;
-        buf[24] = b'0' + (self.sec % 10) as u8;
-        f.write_str(unsafe { from_utf8_unchecked(&buf[..]) })
-    }
-}
-
-impl PartialEq for HttpDate {
-    fn eq(&self, other: &HttpDate) -> bool {
-        SystemTime::from(*self) == SystemTime::from(*other)
-    }
-}
-
-impl PartialOrd for HttpDate {
-    fn partial_cmp(&self, other: &HttpDate) -> Option<cmp::Ordering> {
-        SystemTime::from(*self).partial_cmp(&SystemTime::from(*other))
-    }
-}
-
-/// Convert &[u8] to &str with zero checks.
-///
-/// For internal use only.
-/// Intended to be used with ASCII-only strings.
-fn conv(s: &[u8]) -> &str {
-    unsafe { from_utf8_unchecked(s) }
-}
-
-fn parse_imf_fixdate(s: &[u8]) -> Result<HttpDate, Error> {
-    // Example: `Sun, 06 Nov 1994 08:49:37 GMT`
-    if s.len() != 29 || &s[25..] != b" GMT" || s[16] != b' ' || s[19] != b':' || s[22] != b':' {
-        return Err(Error(()));
-    }
-    Ok(HttpDate {
-        sec: conv(&s[23..25]).parse()?,
-        min: conv(&s[20..22]).parse()?,
-        hour: conv(&s[17..19]).parse()?,
-        day: conv(&s[5..7]).parse()?,
-        mon: match &s[7..12] {
-            b" Jan " => 1,
-            b" Feb " => 2,
-            b" Mar " => 3,
-            b" Apr " => 4,
-            b" May " => 5,
-            b" Jun " => 6,
-            b" Jul " => 7,
-            b" Aug " => 8,
-            b" Sep " => 9,
-            b" Oct " => 10,
-            b" Nov " => 11,
-            b" Dec " => 12,
-            _ => return Err(Error(())),
-        },
-        year: conv(&s[12..16]).parse()?,
-        wday: match &s[..5] {
-            b"Mon, " => 1,
-            b"Tue, " => 2,
-            b"Wed, " => 3,
-            b"Thu, " => 4,
-            b"Fri, " => 5,
-            b"Sat, " => 6,
-            b"Sun, " => 7,
-            _ => return Err(Error(())),
-        },
-    })
-}
-
-fn parse_rfc850_date(s: &[u8]) -> Result<HttpDate, Error> {
-    // Example: `Sunday, 06-Nov-94 08:49:37 GMT`
-    if s.len() < 23 {
-        return Err(Error(()));
-    }
-
-    fn wday<'a>(s: &'a [u8], wday: u8, name: &'static [u8]) -> Option<(u8, &'a [u8])> {
-        if &s[0..name.len()] == name {
-            return Some((wday, &s[name.len()..]));
-        }
-        None
-    }
-    let (wday, s) = wday(s, 1, b"Monday, ")
-        .or_else(|| wday(s, 2, b"Tuesday, "))
-        .or_else(|| wday(s, 3, b"Wednesday, "))
-        .or_else(|| wday(s, 4, b"Thursday, "))
-        .or_else(|| wday(s, 5, b"Friday, "))
-        .or_else(|| wday(s, 6, b"Saturday, "))
-        .or_else(|| wday(s, 7, b"Sunday, "))
-        .ok_or(Error(()))?;
-    if s.len() != 22 || s[12] != b':' || s[15] != b':' || &s[18..22] != b" GMT" {
-        return Err(Error(()));
-    }
-    let mut year = conv(&s[7..9]).parse::<u16>()?;
-    if year < 70 {
-        year += 2000;
-    } else {
-        year += 1900;
-    }
-    Ok(HttpDate {
-        sec: conv(&s[16..18]).parse()?,
-        min: conv(&s[13..15]).parse()?,
-        hour: conv(&s[10..12]).parse()?,
-        day: conv(&s[0..2]).parse()?,
-        mon: match &s[2..7] {
-            b"-Jan-" => 1,
-            b"-Feb-" => 2,
-            b"-Mar-" => 3,
-            b"-Apr-" => 4,
-            b"-May-" => 5,
-            b"-Jun-" => 6,
-            b"-Jul-" => 7,
-            b"-Aug-" => 8,
-            b"-Sep-" => 9,
-            b"-Oct-" => 10,
-            b"-Nov-" => 11,
-            b"-Dec-" => 12,
-            _ => return Err(Error(())),
-        },
-        year: year,
-        wday: wday,
-    })
-}
-
-fn parse_asctime(s: &[u8]) -> Result<HttpDate, Error> {
-    // Example: `Sun Nov  6 08:49:37 1994`
-    if s.len() != 24 || s[10] != b' ' || s[13] != b':' || s[16] != b':' || s[19] != b' ' {
-        return Err(Error(()));
-    }
-    Ok(HttpDate {
-        sec: conv(&s[17..19]).parse()?,
-        min: conv(&s[14..16]).parse()?,
-        hour: conv(&s[11..13]).parse()?,
-        day: {
-            let x = &s[8..10];
-            conv(if x[0] == b' ' {
-                    &x[1..2]
-                } else {
-                    x
-                })
-                .parse()?
-        },
-        mon: match &s[4..8] {
-            b"Jan " => 1,
-            b"Feb " => 2,
-            b"Mar " => 3,
-            b"Apr " => 4,
-            b"May " => 5,
-            b"Jun " => 6,
-            b"Jul " => 7,
-            b"Aug " => 8,
-            b"Sep " => 9,
-            b"Oct " => 10,
-            b"Nov " => 11,
-            b"Dec " => 12,
-            _ => return Err(Error(())),
-        },
-        year: conv(&s[20..24]).parse()?,
-        wday: match &s[0..4] {
-            b"Mon " => 1,
-            b"Tue " => 2,
-            b"Wed " => 3,
-            b"Thu " => 4,
-            b"Fri " => 5,
-            b"Sat " => 6,
-            b"Sun " => 7,
-            _ => return Err(Error(())),
-        },
-    })
-}
-
-fn is_leap_year(y: u16) -> bool {
-    y % 4 == 0 && (!(y % 100 == 0) || y % 400 == 0)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/httpdate/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/httpdate/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,35 +20,21 @@
 use std::error;
 use std::fmt::{self, Display, Formatter};
 use std::io;
-use std::num::ParseIntError;
 use std::time::SystemTime;
 
-pub use httpdate::HttpDate;
+pub use date::HttpDate;
 
-mod httpdate;
+mod date;
 
 /// An opaque error type for all parsing errors.
 #[derive(Debug)]
 pub struct Error(());
 
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        "string contains no or an invalid date"
-    }
-    fn cause(&self) -> Option<&error::Error> {
-        None
-    }
-}
+impl error::Error for Error {}
 
 impl Display for Error {
     fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
-        f.write_str(error::Error::description(self))
-    }
-}
-
-impl From<ParseIntError> for Error {
-    fn from(_: ParseIntError) -> Error {
-        Error(())
+        f.write_str("string contains no or an invalid date")
     }
 }
 
@@ -79,23 +65,29 @@
     use std::str;
     use std::time::{Duration, UNIX_EPOCH};
 
-    use super::{HttpDate, parse_http_date, fmt_http_date};
+    use super::{fmt_http_date, parse_http_date, HttpDate};
 
     #[test]
     fn test_rfc_example() {
         let d = UNIX_EPOCH + Duration::from_secs(784111777);
-        assert_eq!(d,
-                   parse_http_date("Sun, 06 Nov 1994 08:49:37 GMT").expect("#1"));
-        assert_eq!(d,
-                   parse_http_date("Sunday, 06-Nov-94 08:49:37 GMT").expect("#2"));
+        assert_eq!(
+            d,
+            parse_http_date("Sun, 06 Nov 1994 08:49:37 GMT").expect("#1")
+        );
+        assert_eq!(
+            d,
+            parse_http_date("Sunday, 06-Nov-94 08:49:37 GMT").expect("#2")
+        );
         assert_eq!(d, parse_http_date("Sun Nov  6 08:49:37 1994").expect("#3"));
     }
 
     #[test]
     fn test2() {
         let d = UNIX_EPOCH + Duration::from_secs(1475419451);
-        assert_eq!(d,
-                   parse_http_date("Sun, 02 Oct 2016 14:44:11 GMT").expect("#1"));
+        assert_eq!(
+            d,
+            parse_http_date("Sun, 02 Oct 2016 14:44:11 GMT").expect("#1")
+        );
         assert!(parse_http_date("Sun Nov 10 08:00:00 1000").is_err());
         assert!(parse_http_date("Sun Nov 10 08*00:00 2000").is_err());
         assert!(parse_http_date("Sunday, 06-Nov-94 08+49:37 GMT").is_err());
@@ -146,4 +138,22 @@
     fn size_of() {
         assert_eq!(::std::mem::size_of::<HttpDate>(), 8);
     }
+
+    #[test]
+    fn test_date_comparison() {
+        let a = UNIX_EPOCH + Duration::from_secs(784111777);
+        let b = a + Duration::from_secs(30);
+        assert!(a < b);
+        let a_date: HttpDate = a.into();
+        let b_date: HttpDate = b.into();
+        assert!(a_date < b_date);
+        assert_eq!(a_date.cmp(&b_date), ::std::cmp::Ordering::Less)
+    }
+
+    #[test]
+    fn test_parse_bad_date() {
+        // 1994-11-07 is actually a Monday
+        let parsed = "Sun, 07 Nov 1994 08:48:37 GMT".parse::<HttpDate>();
+        assert!(parsed.is_err())
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"404341711a916e6ec8bd528dcf5098fd64538c28298d8c145ca468f4e2e998f6","Cargo.toml":"b381fd01035e26f29963b77eda1420c33a38002ab6cf39c7bed8b3365539165d","LICENSE":"0008012e192415992a45a8161c08d7adb429f8032de62d43afc9fd2c6f0b5323","src/body/aggregate.rs":"5392490a5d17c01cb631da3d5b06daab465afcf970acef53c2aff56243010e01","src/body/body.rs":"8df4f8aa7be0d1f854ad8ef84c8c3dfd290de998d11c3771b87da99f79a85dcb","src/body/mod.rs":"ea7048935f3ac6885ff109ef8ecc0ccec31c2781c170a7a6fc13dfc85f905154","src/body/to_bytes.rs":"d9b8236782ae12ef090758c4eed10f429c0ddeb7f2274a7ecc4555e5562c0a4b","src/client/conn.rs":"80ce7be6c306d7942be3288358c2b9c6878e1a12ac17190dd37b8d92a7169cff","src/client/connect/dns.rs":"df4a65d16ae16e47cd64d9aa3d9d14fb95db99875f9b044b120fa24958b712b1","src/client/connect/http.rs":"1c590d32fa8e2440a919efee5af0c4c872b1578a568bf983281fbf365a0ffbd9","src/client/connect/mod.rs":"76aa9d5bf1c444a6697012009464e4d6a19f24cec83cb28726ba0a17da6e9081","src/client/dispatch.rs":"7292363f982857bf4e9481183f33f969cfcc953bd8703951c0c4ab15aa524044","src/client/mod.rs":"0d396c64e61858ecbcdc3557d63c486d9cda368c85468a325734c3d0653a3601","src/client/pool.rs":"10c92f07331cd11a7f626cf6fc12fe8181b4b0bf9c6436afefb7eb3d470d8536","src/client/service.rs":"54802c50753cc6f1cb19e92e284dcadd2bce667f9c72108ae7ff7ab173d73aa3","src/client/tests.rs":"ac9783128c74fe0369c9d03716b784940e70aca08288f806358adcc67a09fb43","src/common/buf.rs":"63c4459583e27ff52689934e1ff65b3cd02fee693d1ee7836a3e409e49c9baf2","src/common/drain.rs":"6d08d7da77182c7e1746e5426c129129e9cfc3c3c8f0cfd0faca5269bd0ee7f4","src/common/exec.rs":"033112c084dc34b8181bfb6af2c3834ef5c21d01045f70d8158b67a95e9ba340","src/common/io/mod.rs":"6f8e4518df7f24d81fc59b46a2deb61557e8d92700bdc62539fe0f034066fc89","src/common/io/rewind.rs":"9b720ded0a77ff374f1e23cc7badb1147aec1f462ce26719b4426bef37d90bf5","src/common/lazy.rs":"b4913637f573a78cfc532352aebe816d8e0f9ea37edbd2c37bb4c545a008b597","src/common/mod.rs":"e5189d091072070eb67fb8951bc8437d4931860ad12c3237a13457425e610aa9","src/common/never.rs":"4cef634f0330e8d939201b44cfbe10db8deddb9e86ce8ef1e8e2ae08e553e7bb","src/common/sync_wrapper.rs":"ca310408b04bd927fbaa2167c7aa41ac02698f3d96e614f30fd5a2ca3299e086","src/common/task.rs":"1f9b921023516456fad6a06db0863f0a23f118e692fe396166e24decd8410f5d","src/common/watch.rs":"eb6db13fbb266ec11200ffa1f5e7a9a132d7e6555373895efde1e2daea428e03","src/error.rs":"ad5fe2585baa64f1cde8df5b0443ceb196f32c5feb0a99f9fe428d337733ff91","src/headers.rs":"d59aa3584bf8038da244566450ba6a52fb8c4ef49a5badf316a358f87ed8d930","src/lib.rs":"30a26ab24d76ce6a326b817936b7eda639b1c89f60dee246cefb2a7de74266e2","src/mock.rs":"8b455312be74af6c4a27b3beba85a9493c86d43097947c5aad8a5e9dc0dcdbb3","src/proto/h1/conn.rs":"2e487821336dd88e9d4f9dbfd0c5f2bc509bc591339ff4634c8dd3846bf4a266","src/proto/h1/date.rs":"6aa3eb634da12c5d6ba0721b34e3e4615967719204ca1d18d88abe13ef8d0f39","src/proto/h1/decode.rs":"56bd9a88f2b80f65a7640bcbe6597036e3948e3b559322765466cc86e3b76d71","src/proto/h1/dispatch.rs":"1d94ced2db8ae9bd7bffbe74712071997755774b7c847c79b1859f3a6a66ae28","src/proto/h1/encode.rs":"408d5acffa4e467c005dcb44c98e31946306629a634d0ad2369701cb43d99a9e","src/proto/h1/io.rs":"29cb2a841daf076991bffbf33170d3526e0088c5b5c362033858968d309fd5b3","src/proto/h1/mod.rs":"5612a268681611fcad78171f81aae1107755dd5f7ccf51fcb8b42459b14fbce1","src/proto/h1/role.rs":"a20d5bc1d9eebc4c83da41b5633fb3c7c70c8eeaa64f2fb546cf9b3138d28355","src/proto/h2/client.rs":"2c8c0b90d61e90a5b24891ee800aec6075008b48702008982e4fcf4c05ee499a","src/proto/h2/mod.rs":"7f8c2cf44ddac7790902eb393d76ba8048ad3963244d7a219a3f99173536f582","src/proto/h2/ping.rs":"9e5da0167af4cb9872dad34cebef872f7f8dabf62662cd9b176a9750290e7125","src/proto/h2/server.rs":"a6b505eba5d38390e2c5c18321026c64086f5731b403b1029758bb207b6e5a15","src/proto/mod.rs":"9735de55a78203336959d3d4c7632665a7bd2427ad77352da9ffea1871aab706","src/rt.rs":"62e32501cb2f1830abeaae463ac0fe08ac32e08ee83bcaba7db26a5d8c56db45","src/server/accept.rs":"976139ec4287be884bf84f66a758ac0ced8be4040899ab18aeab76b000ca138d","src/server/conn.rs":"d581b293a9640908c61f53b39ddf2877a1909c33588804ed44843460c8cd183e","src/server/mod.rs":"bf06c53b0961277edcf22dab582b2c2ca6985949abdd032a44008c0ca59f497b","src/server/shutdown.rs":"3b419e190800e923e921a423af26892056300131f9c07fa0af5d6e5a174c116b","src/server/tcp.rs":"9a2e4d72c048824e4d3879356a16a3d21edb330dc2eda48382a7e76bf2291114","src/service/http.rs":"3e7c2c49e5710f9229d7b01f6f7a4e9f5c7c7360f14870f726aa470311998e65","src/service/make.rs":"ad766245b44bf703a85fcbf840e4ff6ae95a5b7e767659e8583a32dc517a42a6","src/service/mod.rs":"c73d5f4f958dedaaa3303f51ad5c5960b8d3eae69d8890faebc25d3dd9112147","src/service/oneshot.rs":"2d61330b2825dcb18c6a7ed6b4eda9645a1ba961f56f8f13d6d8af1d86bc5927","src/service/util.rs":"90452fc10c8316fdc1f0227c4fcef3cfb94e4b2d8fd52ef8c0e276cd3f1cadd5","src/upgrade.rs":"d4c180acb814efd1a1f82b25638fa7d4bd7688c686c88f0c91666b35c3d9d132"},"package":"f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"}
\ No newline at end of file
+{"files":{"Cargo.lock":"f4303bde8fbeb92397c5e6913b5186bfc12f066c1f7ebf12f664d9869ce641da","Cargo.toml":"593ca16b92339c3a0a11f9163a9afba25fdc6bcff88f28a3f538da716d1b2958","LICENSE":"25dfd9ec24ebbee73dc93e687526cd4c26deae17bc2179ea0fe3e5dc96105b9b","src/body/aggregate.rs":"bcba09b9dd91deee04f17383cb0d7ac5d876f8d462e08031cd3dfca205f1d118","src/body/body.rs":"e407a7e7461aaa182b43090c072b34237e468d35806622dd009ea005772e87de","src/body/length.rs":"af3d145b9d23bd6a85a5877c3a20f4f55babd3630c741456604bd8362f6e20ff","src/body/mod.rs":"2870b04df5eef6a307a6f4699f99dbad54f5373bc95da4e6b29277efb645058f","src/body/to_bytes.rs":"48c2b5ab6e115d3ed4d5e31dfe1b40031e5e618abecda08454ff3cd36cab8c0d","src/cfg.rs":"32fea18ac8d861a69a7ebaa8cfb6a80f541efc18a9e2d9fde489cb9402fd6538","src/client/client.rs":"29959c0ed008eb5dee51d9459b18dda81bc31824377ecca10e65fd564991153b","src/client/conn.rs":"d57fedd408a2e9bde11bcb1f5301e649af9af94e6d0a98cfbbeab03ec4587793","src/client/connect/dns.rs":"64613c0c02a1c464191dd4451c4e1b6ca9470a1589607539e122455be4ef1938","src/client/connect/http.rs":"4d7560a680e4eee3fd88336e6188abd4447cf0df084f735510961d4d7029ef7f","src/client/connect/mod.rs":"93f4c1230e2f667a19b05a1a6f428fd4cfae34a66a01361ad4f8c1538dd53d12","src/client/dispatch.rs":"597470446c0acc410ded2c282c8fa39c9d8b34fa972f4f28a058eb81b6a36eba","src/client/mod.rs":"bf00170b2a53eb433477e6cec1bc2ff83ad20814bc21186140d77575b7d77c7b","src/client/pool.rs":"b214aadda7590fbf1f50547ee3df52acebd41a6803e8093ca94106f7105589f1","src/client/service.rs":"54802c50753cc6f1cb19e92e284dcadd2bce667f9c72108ae7ff7ab173d73aa3","src/client/tests.rs":"f7eb2d1dba18e1bd69990f59e61b73a0477db5cc4de68fd64bd7cd36a9406072","src/common/buf.rs":"c762dc2688828ffc88f0549ceddeef65e57d404c245118bcacf3dd8d402bc9cc","src/common/date.rs":"f9a1a63aa7e8f5d6f5800cd56e7e6182cf07e781089930afb529263c1d8adf14","src/common/drain.rs":"262b64cc88e9146dfa3732a25ddb22dfef7cf801cebbd87fc1234b5e3e1d62bd","src/common/exec.rs":"a33a2018c9c0fed78590e7f05632f993aaf77d3f985a010c48eb3816696074ea","src/common/io/mod.rs":"6f8e4518df7f24d81fc59b46a2deb61557e8d92700bdc62539fe0f034066fc89","src/common/io/rewind.rs":"ba6704fe0b0f3d1af1184c680c97818962b1d8251e790cacfc9d56281cef23cd","src/common/lazy.rs":"f1a7ccad912492c23238f4c854e01b77e81db864455842cdc2890d76e464ff20","src/common/mod.rs":"effd3f5d6732864bf7ef18c783555bb41361030cb056aeb3087240ccd96eb750","src/common/never.rs":"b45b6a85f827081cdb7884907e7884c78540308102072dae563320acce8185fa","src/common/sync_wrapper.rs":"76206c2a52eeb62cdba279d620a4aef52134c6ac782a9f61e741edc8b653cb50","src/common/task.rs":"fd6444762d25ea6beb3b9f73bacf3b47c9f3f87e8e2037f58788b5d54767ce94","src/common/watch.rs":"eb6db13fbb266ec11200ffa1f5e7a9a132d7e6555373895efde1e2daea428e03","src/error.rs":"09ea806972e60672547bb174b3136723f10c70b3f92ae8517b2f4fa93c8ca4a8","src/ext.rs":"0e7fc9911d4eb406c6b9ec4b8d05b7cc9acd3434bdd23fb094ac9620aa8205cf","src/ffi/body.rs":"3af38392b8b3b028615b7ee783bc4077c85de1b464acd3b808b41280158122ae","src/ffi/client.rs":"f4e0dd5fadb8ef96cf25d4edde3d86a915a897d0acd9cfaecc83c89886ffb836","src/ffi/error.rs":"de3d8c1eb3818b438ed28a9dea800dfdac47bf2dd21a7c3e5fc10cb331b6e39f","src/ffi/http_types.rs":"c64efd53527f7e8ab3a86dd93cc83f4ee8735eb8c1ce599fbdfc2caae76f6788","src/ffi/io.rs":"ab176e866c179a589d22e3aa7410612615e60117019d1e589f9732c36a2282da","src/ffi/macros.rs":"8e1fe58244295db1d19aceeb0e9a777fe484ccc20194fae88b54208e0cbeb515","src/ffi/mod.rs":"0e52ae3586c6a960ae68e862561aabcee690a1e23c6d5d1045fcdc3c74b7fc96","src/ffi/task.rs":"c0fcf9df3f96ea0f7170381c82fa82ed9fbd71443570a30539bff8152ca1a88e","src/headers.rs":"edc1362c894a38eb4d401cbb88485a846bcf0e748a38048f00d4e6da49d1ddf6","src/lib.rs":"818b301c8aaeda96d86542e8d40c87a2ff46656ca2bd7dea68b69131f77be51d","src/mock.rs":"8b455312be74af6c4a27b3beba85a9493c86d43097947c5aad8a5e9dc0dcdbb3","src/proto/h1/conn.rs":"cde51565dd17ef32a487c8fe34c24b7a55380d691bdc0d173bb9475e8f4512d9","src/proto/h1/decode.rs":"ec1201daa71ac4dfedc56384b964cf2ca73748d24954923d2ecafca4e882788b","src/proto/h1/dispatch.rs":"ea63ff3eb5b5a723c538a4300352c5e8c6d4e78e3793bf73a391d37b7fac1afc","src/proto/h1/encode.rs":"1291851a8dc0ec62312a23ae0719ff706dd4b8bf8232cb1ac711f8cb9482b7f4","src/proto/h1/io.rs":"af6b75674dec567d06e9a99e792d5b5d8d601a988404ce9ef86ec32e032dc0ce","src/proto/h1/mod.rs":"31fba93d12c05386c305d1d5a71b8fb1d64e773c4c604858c84b837498d0bdcc","src/proto/h1/role.rs":"75995a0ff6b489a0e72051f937113079aa82d5739a88c27d6838e1299d636cd7","src/proto/h2/client.rs":"bae89053348936e1b9fc140ed48fd5c93329cb5d31ffe7c66044bec3d4ae9928","src/proto/h2/mod.rs":"076b225721fe048a432fc379e21af8583bd1508e6aa7b86e124d9331565f4ee8","src/proto/h2/ping.rs":"180814620245619b13379a9a8b652aceab9f7d503431edd4ef4ddcfc23940940","src/proto/h2/server.rs":"67f7f0082f6bab49306051496ac56922a1c3680b48fe53f3f26b0330da3d0d25","src/proto/mod.rs":"ce25ff269a470f143850cdeda15935224bcefe4ea7221282cb9f9851d44b604e","src/rt.rs":"1ef7d4bb3ad6637c6f37189e30d740c061a3c98ca008d266a99f865130909427","src/server/accept.rs":"9a78398b0e9d8104248288b39cbcda8f9968a866214b7d793e548a5cf359752e","src/server/conn.rs":"c4371c82d4c44536ae2b2cdbf97a32f21d8e0da6849aa40609215440f7bef42a","src/server/mod.rs":"97b09fa3d5b88c574f4592e54ba72ec574d65373e9553f5c6af16fe6dc91de35","src/server/server.rs":"8a213840dd7735cedc8086461d30c28f29d6669056c34dea88e1d8f59526548b","src/server/shutdown.rs":"10abd9e2364728751985ec1f9956e2825b23d6148322e8fea4e0d1d03c6fefdd","src/server/tcp.rs":"ad089143989532ef8c3cae0b69ead6cbc5ae9f81d22087c554f92f14fff2ad3d","src/service/http.rs":"3e7c2c49e5710f9229d7b01f6f7a4e9f5c7c7360f14870f726aa470311998e65","src/service/make.rs":"7e3d956fd0602b47d3adc520f9a614cb047323d3d162faf9162066dccefe4d11","src/service/mod.rs":"92c05f08a175fb847868a02e7aca96176df1237458d40a17a7a6aa377476df90","src/service/oneshot.rs":"871b51c455d58dd3a6db85bd60e3a663d914ee748fe0c455c4523407533c8b1a","src/service/util.rs":"90452fc10c8316fdc1f0227c4fcef3cfb94e4b2d8fd52ef8c0e276cd3f1cadd5","src/upgrade.rs":"a866e77430de0fabc53e544eb8799e0380e146a59c53dd50aac23f70bea58380"},"package":"13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,54 +1,65 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "async-stream"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625"
 dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
+ "async-stream-impl",
+ "futures-core",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.0.0"
+name = "async-stream-impl"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
-name = "bitflags"
-version = "0.5.0"
+name = "atty"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
 
 [[package]]
-name = "bitflags"
-version = "1.2.1"
+name = "autocfg"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "bytes"
-version = "0.5.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "env_logger"
@@ -58,7 +69,7 @@
 dependencies = [
  "atty",
  "humantime",
- "log 0.4.11",
+ "log",
  "regex",
  "termcolor",
 ]
@@ -70,71 +81,60 @@
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
+name = "form_urlencoded"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
 dependencies = [
- "bitflags 1.2.1",
- "fuchsia-zircon-sys",
+ "matches",
+ "percent-encoding",
 ]
 
 [[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
 name = "futures-channel"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
 
 [[package]]
 name = "futures-sink"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
 
 [[package]]
 name = "futures-task"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
+ "autocfg",
  "futures-core",
  "futures-task",
- "pin-project 0.4.23",
+ "pin-project-lite",
  "pin-utils",
 ]
 
 [[package]]
-name = "glob"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
-
-[[package]]
 name = "h2"
-version = "0.2.7"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
+checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
 dependencies = [
  "bytes",
  "fnv",
@@ -147,32 +147,28 @@
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-futures",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.8.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
-dependencies = [
- "autocfg",
-]
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
  "bytes",
  "fnv",
@@ -181,25 +177,26 @@
 
 [[package]]
 name = "http-body"
-version = "0.3.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
+checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
 dependencies = [
  "bytes",
  "http",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
 
 [[package]]
 name = "httpdate"
-version = "0.3.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
 
 [[package]]
 name = "humantime"
@@ -212,7 +209,7 @@
 
 [[package]]
 name = "hyper"
-version = "0.13.9"
+version = "0.14.12"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -224,10 +221,11 @@
  "httparse",
  "httpdate",
  "itoa",
+ "libc",
  "matches",
  "num_cpus",
- "pin-project 1.0.1",
- "pnet",
+ "pin-project-lite",
+ "pnet_datalink",
  "pretty_env_logger",
  "serde",
  "serde_derive",
@@ -237,8 +235,8 @@
  "tokio",
  "tokio-test",
  "tokio-util",
+ "tower",
  "tower-service",
- "tower-util",
  "tracing",
  "url",
  "want",
@@ -246,9 +244,9 @@
 
 [[package]]
 name = "idna"
-version = "0.1.5"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -257,47 +255,28 @@
 
 [[package]]
 name = "indexmap"
-version = "1.5.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg",
  "hashbrown",
 ]
 
 [[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
 name = "ipnetwork"
-version = "0.15.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69dd5e3613374e74da81c251750153abe3bd0ad17641ea63d43d1e21d0dbd4d"
+checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "lazy_static"
@@ -307,80 +286,60 @@
 
 [[package]]
 name = "libc"
-version = "0.2.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
-
-[[package]]
-name = "log"
-version = "0.3.9"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-dependencies = [
- "log 0.4.11",
-]
+checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "matches"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "mio"
-version = "0.6.22"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
- "cfg-if",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
  "libc",
- "log 0.4.11",
+ "log",
  "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
+ "ntapi",
+ "winapi",
 ]
 
 [[package]]
 name = "miow"
-version = "0.2.1"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
 dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "winapi",
 ]
 
 [[package]]
-name = "net2"
-version = "0.2.35"
+name = "ntapi"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
 dependencies = [
- "cfg-if",
- "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -395,44 +354,24 @@
 
 [[package]]
 name = "percent-encoding"
-version = "1.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pin-project"
-version = "0.4.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
-dependencies = [
- "pin-project-internal 0.4.23",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
-dependencies = [
- "pin-project-internal 1.0.1",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "0.4.23"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
+checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.1"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
+checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -441,9 +380,9 @@
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.7"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -452,103 +391,32 @@
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
-name = "pnet"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c08c2c6c26481fcbe49dc4405baedf47151f859c5a45d3f254c2ff74ce51cf0"
-dependencies = [
- "ipnetwork",
- "pnet_base",
- "pnet_datalink",
- "pnet_packet",
- "pnet_sys 0.25.0",
- "pnet_transport",
-]
-
-[[package]]
 name = "pnet_base"
-version = "0.22.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df28acf2fcc77436dd2b91a9a0c2bb617f9ca5f2acefee1a4135058b9f9801f"
+checksum = "4e4688aa497ef62129f302a5800ebde67825f8ff129f43690ca84099f6620bed"
 
 [[package]]
 name = "pnet_datalink"
-version = "0.25.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545f8df67cbc53438f37f56e68ae5ca49beb3990e9fd7e9e214c8ffd36c0e0ea"
+checksum = "59001c9c4d9d23bf2f61afaaf134a766fd6932ba2557c606b9112157053b9ac7"
 dependencies = [
  "ipnetwork",
  "libc",
  "pnet_base",
- "pnet_sys 0.26.0",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "pnet_macros"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbd5c52c6e04aa720400f9c71cd0e8bcb38cd13421d5caabd9035e9efa47de9"
-dependencies = [
- "regex",
- "syntex",
- "syntex_syntax",
-]
-
-[[package]]
-name = "pnet_macros_support"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e586854ba703c15f74c486e1a46624566b47f1f61cc8a6b02c6bbe5e34a383b"
-dependencies = [
- "pnet_base",
-]
-
-[[package]]
-name = "pnet_packet"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c44c075c6d4f2e814dba621a999838e4a4f749f6117024f52b05b3c559a4fd17"
-dependencies = [
- "glob",
- "pnet_base",
- "pnet_macros",
- "pnet_macros_support",
- "syntex",
-]
-
-[[package]]
-name = "pnet_sys"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82f881a6d75ac98c5541db6144682d1773bb14c6fc50c6ebac7086c8f7f23c29"
-dependencies = [
- "libc",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "pnet_sys",
+ "winapi",
 ]
 
 [[package]]
 name = "pnet_sys"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f0de0c52609f157b25d79ce24d9016ab1bbf10cde761397200d634a833872c"
-dependencies = [
- "libc",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "pnet_transport"
-version = "0.25.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b75ccaee7b5daba9f9a7d47bceeb73cc32edde9952dc5409460d6621ec667b6"
+checksum = "7589e4c4e7ed72a3ffdff8a65d3bea84e8c3a23e19d0a10e8f45efdf632fff15"
 dependencies = [
  "libc",
- "pnet_base",
- "pnet_packet",
- "pnet_sys 0.25.0",
+ "winapi",
 ]
 
 [[package]]
@@ -558,16 +426,16 @@
 checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
 dependencies = [
  "env_logger",
- "log 0.4.11",
+ "log",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
 dependencies = [
- "unicode-xid 0.2.1",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -578,42 +446,29 @@
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
-
-[[package]]
-name = "rustc-serialize"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "ryu"
@@ -623,15 +478,15 @@
 
 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.114"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -640,9 +495,9 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.57"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
 dependencies = [
  "itoa",
  "ryu",
@@ -651,20 +506,18 @@
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
 
 [[package]]
 name = "socket2"
-version = "0.3.12"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
 dependencies = [
- "cfg-if",
  "libc",
- "redox_syscall",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -675,121 +528,61 @@
 
 [[package]]
 name = "syn"
-version = "1.0.46"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad5de3220ea04da322618ded2c42233d02baca219d6f160a3e9c87cda16c942"
+checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid 0.2.1",
-]
-
-[[package]]
-name = "syntex"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317"
-dependencies = [
- "syntex_errors",
- "syntex_syntax",
-]
-
-[[package]]
-name = "syntex_errors"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646"
-dependencies = [
- "libc",
- "log 0.3.9",
- "rustc-serialize",
- "syntex_pos",
- "term",
- "unicode-xid 0.0.3",
-]
-
-[[package]]
-name = "syntex_pos"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6"
-dependencies = [
- "rustc-serialize",
-]
-
-[[package]]
-name = "syntex_syntax"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d"
-dependencies = [
- "bitflags 0.5.0",
- "libc",
- "log 0.3.9",
- "rustc-serialize",
- "syntex_errors",
- "syntex_pos",
- "term",
- "unicode-xid 0.0.3",
-]
-
-[[package]]
-name = "term"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
-dependencies = [
- "kernel32-sys",
- "winapi 0.2.8",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
-name = "thread_local"
-version = "1.0.1"
+name = "tinyvec"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
 dependencies = [
- "lazy_static",
+ "tinyvec_macros",
 ]
 
 [[package]]
-name = "tinyvec"
-version = "0.3.3"
+name = "tinyvec_macros"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "0.2.22"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
+checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
 dependencies = [
+ "autocfg",
  "bytes",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
+ "libc",
  "memchr",
  "mio",
+ "num_cpus",
  "pin-project-lite",
- "slab",
  "tokio-macros",
+ "winapi",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "0.2.5"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
+checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -797,76 +590,101 @@
 ]
 
 [[package]]
+name = "tokio-stream"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
 name = "tokio-test"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0049c119b6d505c4447f5c64873636c7af6c75ab0d45fd9f618d82acb8016d"
+checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3"
 dependencies = [
+ "async-stream",
  "bytes",
  "futures-core",
  "tokio",
+ "tokio-stream",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.3.1"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
+checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
- "log 0.4.11",
+ "log",
  "pin-project-lite",
  "tokio",
 ]
 
 [[package]]
-name = "tower-service"
-version = "0.3.0"
+name = "tower"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
-
-[[package]]
-name = "tower-util"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674"
+checksum = "f60422bc7fefa2f3ec70359b8ff1caff59d785877eb70595904605bcc412470f"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project 0.4.23",
+ "pin-project",
+ "tokio",
+ "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
+name = "tower-layer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
+
+[[package]]
+name = "tower-service"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+
+[[package]]
 name = "tracing"
-version = "0.1.17"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
  "cfg-if",
- "log 0.4.11",
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
-name = "tracing-core"
-version = "0.1.11"
+name = "tracing-attributes"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f"
+checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
 dependencies = [
- "lazy_static",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "tracing-futures"
-version = "0.2.4"
+name = "tracing-core"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
+checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
 dependencies = [
- "pin-project 0.4.23",
- "tracing",
+ "lazy_static",
 ]
 
 [[package]]
@@ -877,40 +695,32 @@
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
+checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.13"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-xid"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "url"
-version = "1.7.2"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
+ "form_urlencoded",
  "idna",
  "matches",
  "percent-encoding",
@@ -922,18 +732,12 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
- "log 0.4.11",
+ "log",
  "try-lock",
 ]
 
 [[package]]
 name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
@@ -943,12 +747,6 @@
 ]
 
 [[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -960,7 +758,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -968,13 +766,3 @@
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "hyper"
-version = "0.13.9"
+version = "0.14.12"
 authors = ["Sean McArthur <sean@seanmonstar.com>"]
 include = ["Cargo.toml", "LICENSE", "src/**/*"]
 description = "A fast and correct HTTP library."
@@ -25,7 +24,11 @@
 license = "MIT"
 repository = "https://github.com/hyperium/hyper"
 [package.metadata.docs.rs]
-features = ["runtime", "stream"]
+features = ["ffi", "full"]
+rustdoc-args = ["--cfg", "docsrs", "--cfg", "hyper_unstable_ffi"]
+
+[package.metadata.playground]
+features = ["full"]
 [profile.bench]
 codegen-units = 1
 incremental = false
@@ -34,127 +37,130 @@
 codegen-units = 1
 incremental = false
 
+[lib]
+crate-type = ["lib", "staticlib", "cdylib"]
+
 [[example]]
 name = "client"
 path = "examples/client.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "client_json"
 path = "examples/client_json.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "echo"
 path = "examples/echo.rs"
-required-features = ["runtime", "stream"]
+required-features = ["full"]
 
 [[example]]
 name = "gateway"
 path = "examples/gateway.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "hello"
 path = "examples/hello.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "http_proxy"
 path = "examples/http_proxy.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "multi_server"
 path = "examples/multi_server.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "params"
 path = "examples/params.rs"
-required-features = ["runtime", "stream"]
+required-features = ["full"]
 
 [[example]]
 name = "send_file"
 path = "examples/send_file.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "service_struct_impl"
 path = "examples/service_struct_impl.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "single_threaded"
 path = "examples/single_threaded.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "state"
 path = "examples/state.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "tower_client"
 path = "examples/tower_client.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "tower_server"
 path = "examples/tower_server.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "upgrades"
 path = "examples/upgrades.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[example]]
 name = "web_api"
 path = "examples/web_api.rs"
-required-features = ["runtime", "stream"]
+required-features = ["full"]
 
 [[test]]
 name = "client"
 path = "tests/client.rs"
-required-features = ["runtime", "stream"]
+required-features = ["full"]
 
 [[test]]
 name = "integration"
 path = "tests/integration.rs"
-required-features = ["runtime", "stream"]
+required-features = ["full"]
 
 [[test]]
 name = "server"
 path = "tests/server.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[bench]]
 name = "body"
 path = "benches/body.rs"
-required-features = ["runtime", "stream"]
+required-features = ["full"]
 
 [[bench]]
 name = "connect"
 path = "benches/connect.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[bench]]
 name = "end_to_end"
 path = "benches/end_to_end.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[bench]]
 name = "pipeline"
 path = "benches/pipeline.rs"
-required-features = ["runtime"]
+required-features = ["full"]
 
 [[bench]]
 name = "server"
 path = "benches/server.rs"
-required-features = ["runtime", "stream"]
+required-features = ["full"]
 [dependencies.bytes]
-version = "0.5"
+version = "1"
 
 [dependencies.futures-channel]
 version = "0.3"
@@ -168,32 +174,37 @@
 default-features = false
 
 [dependencies.h2]
-version = "0.2.2"
+version = "0.3.3"
+optional = true
 
 [dependencies.http]
 version = "0.2"
 
 [dependencies.http-body]
-version = "0.3.1"
+version = "0.4"
 
 [dependencies.httparse]
-version = "1.0"
+version = "1.5.1"
 
 [dependencies.httpdate]
-version = "0.3"
+version = "1.0"
 
 [dependencies.itoa]
 version = "0.4.1"
 
-[dependencies.pin-project]
-version = "1.0"
+[dependencies.libc]
+version = "0.2"
+optional = true
+
+[dependencies.pin-project-lite]
+version = "0.2.4"
 
 [dependencies.socket2]
-version = "0.3"
+version = "0.4"
 optional = true
 
 [dependencies.tokio]
-version = "0.2.11"
+version = "1"
 features = ["sync"]
 
 [dependencies.tower-service]
@@ -201,7 +212,7 @@
 
 [dependencies.tracing]
 version = "0.1"
-features = ["log", "std"]
+features = ["std"]
 default-features = false
 
 [dependencies.want]
@@ -233,28 +244,35 @@
 version = "0.3"
 
 [dev-dependencies.tokio]
-version = "0.2.2"
-features = ["fs", "macros", "io-std", "rt-util", "sync", "time", "test-util"]
+version = "1"
+features = ["fs", "macros", "io-std", "io-util", "rt", "rt-multi-thread", "sync", "time", "test-util"]
 
 [dev-dependencies.tokio-test]
-version = "0.2"
+version = "0.4"
 
 [dev-dependencies.tokio-util]
-version = "0.3"
+version = "0.6"
 features = ["codec"]
 
-[dev-dependencies.tower-util]
-version = "0.3"
+[dev-dependencies.tower]
+version = "0.4"
+features = ["make", "util"]
 
 [dev-dependencies.url]
-version = "1.0"
+version = "2.2"
 
 [features]
 __internal_happy_eyeballs_tests = []
-default = ["runtime", "stream"]
+client = []
+default = []
+ffi = ["libc"]
+full = ["client", "http1", "http2", "server", "stream", "runtime"]
+http1 = []
+http2 = ["h2"]
 nightly = []
-runtime = ["tcp", "tokio/rt-core"]
+runtime = ["tcp", "tokio/rt"]
+server = []
 stream = []
-tcp = ["socket2", "tokio/blocking", "tokio/tcp", "tokio/time"]
-[target."cfg(any(target_os = \"linux\", target_os = \"macos\"))".dev-dependencies.pnet]
-version = "0.25.0"
+tcp = ["socket2", "tokio/net", "tokio/rt", "tokio/time"]
+[target."cfg(any(target_os = \"linux\", target_os = \"macos\"))".dev-dependencies.pnet_datalink]
+version = "0.27.2"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018 Sean McArthur
+Copyright (c) 2014-2021 Sean McArthur
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,4 +17,3 @@
 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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/aggregate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/aggregate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/aggregate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/aggregate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,6 +7,12 @@
 ///
 /// The returned `impl Buf` groups the `Buf`s from the `HttpBody` without
 /// copying them. This is ideal if you don't require a contiguous buffer.
+///
+/// # Note
+///
+/// Care needs to be taken if the remote is untrusted. The function doesn't implement any length
+/// checks and an malicious peer might make it consume arbitrary amounts of memory. Checking the
+/// `Content-Length` is a possibility, but it is not strictly mandated to be present.
 pub async fn aggregate<T>(body: T) -> Result<impl Buf, T::Error>
 where
     T: HttpBody,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/body.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/body.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/body.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/body.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,26 +4,34 @@
 use std::fmt;
 
 use bytes::Bytes;
-use futures_channel::{mpsc, oneshot};
+use futures_channel::mpsc;
+use futures_channel::oneshot;
 use futures_core::Stream; // for mpsc::Receiver
 #[cfg(feature = "stream")]
 use futures_util::TryStreamExt;
 use http::HeaderMap;
 use http_body::{Body as HttpBody, SizeHint};
 
+use super::DecodedLength;
 #[cfg(feature = "stream")]
 use crate::common::sync_wrapper::SyncWrapper;
-use crate::common::{task, watch, Future, Never, Pin, Poll};
+use crate::common::Future;
+#[cfg(all(feature = "client", any(feature = "http1", feature = "http2")))]
+use crate::common::Never;
+use crate::common::{task, watch, Pin, Poll};
+#[cfg(all(feature = "http2", any(feature = "client", feature = "server")))]
 use crate::proto::h2::ping;
-use crate::proto::DecodedLength;
-use crate::upgrade::OnUpgrade;
 
 type BodySender = mpsc::Sender<Result<Bytes, crate::Error>>;
+type TrailersSender = oneshot::Sender<HeaderMap>;
 
 /// A stream of `Bytes`, used when receiving bodies.
 ///
 /// A good default [`HttpBody`](crate::body::HttpBody) to use in many
 /// applications.
+///
+/// Note: To read the full body, use [`body::to_bytes`](crate::body::to_bytes)
+/// or [`body::aggregate`](crate::body::aggregate).
 #[must_use = "streams do nothing unless polled"]
 pub struct Body {
     kind: Kind,
@@ -37,13 +45,17 @@
     Chan {
         content_length: DecodedLength,
         want_tx: watch::Sender,
-        rx: mpsc::Receiver<Result<Bytes, crate::Error>>,
+        data_rx: mpsc::Receiver<Result<Bytes, crate::Error>>,
+        trailers_rx: oneshot::Receiver<HeaderMap>,
     },
+    #[cfg(all(feature = "http2", any(feature = "client", feature = "server")))]
     H2 {
         ping: ping::Recorder,
         content_length: DecodedLength,
         recv: h2::RecvStream,
     },
+    #[cfg(feature = "ffi")]
+    Ffi(crate::ffi::UserBody),
     #[cfg(feature = "stream")]
     Wrapped(
         SyncWrapper<
@@ -62,17 +74,21 @@
     /// a brand new connection, since the pool didn't know about the idle
     /// connection yet.
     delayed_eof: Option<DelayEof>,
-    on_upgrade: OnUpgrade,
 }
 
+#[cfg(all(feature = "client", any(feature = "http1", feature = "http2")))]
 type DelayEofUntil = oneshot::Receiver<Never>;
 
 enum DelayEof {
     /// Initial state, stream hasn't seen EOF yet.
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
     NotEof(DelayEofUntil),
     /// Transitions to this state once we've seen `poll` try to
     /// return EOF (`None`). This future is then polled, and
     /// when it completes, the Body finally returns EOF (`None`).
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
     Eof(DelayEofUntil),
 }
 
@@ -92,7 +108,8 @@
 #[must_use = "Sender does nothing unless sent on"]
 pub struct Sender {
     want_rx: watch::Receiver,
-    tx: BodySender,
+    data_tx: BodySender,
+    trailers_tx: Option<TrailersSender>,
 }
 
 const WANT_PENDING: usize = 1;
@@ -123,7 +140,8 @@
     }
 
     pub(crate) fn new_channel(content_length: DecodedLength, wanter: bool) -> (Sender, Body) {
-        let (tx, rx) = mpsc::channel(0);
+        let (data_tx, data_rx) = mpsc::channel(0);
+        let (trailers_tx, trailers_rx) = oneshot::channel();
 
         // If wanter is true, `Sender::poll_ready()` won't becoming ready
         // until the `Body` has been polled for data once.
@@ -131,11 +149,16 @@
 
         let (want_tx, want_rx) = watch::channel(want);
 
-        let tx = Sender { want_rx, tx };
+        let tx = Sender {
+            want_rx,
+            data_tx,
+            trailers_tx: Some(trailers_tx),
+        };
         let rx = Body::new(Kind::Chan {
             content_length,
             want_tx,
-            rx,
+            data_rx,
+            trailers_rx,
         });
 
         (tx, rx)
@@ -163,6 +186,7 @@
     /// This function requires enabling the `stream` feature in your
     /// `Cargo.toml`.
     #[cfg(feature = "stream")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
     pub fn wrap_stream<S, O, E>(stream: S) -> Body
     where
         S: Stream<Item = Result<O, E>> + Send + 'static,
@@ -173,19 +197,11 @@
         Body::new(Kind::Wrapped(SyncWrapper::new(Box::pin(mapped))))
     }
 
-    /// Converts this `Body` into a `Future` of a pending HTTP upgrade.
-    ///
-    /// See [the `upgrade` module](crate::upgrade) for more.
-    pub fn on_upgrade(self) -> OnUpgrade {
-        self.extra
-            .map(|ex| ex.on_upgrade)
-            .unwrap_or_else(OnUpgrade::none)
-    }
-
     fn new(kind: Kind) -> Body {
         Body { kind, extra: None }
     }
 
+    #[cfg(all(feature = "http2", any(feature = "client", feature = "server")))]
     pub(crate) fn h2(
         recv: h2::RecvStream,
         content_length: DecodedLength,
@@ -200,13 +216,8 @@
         body
     }
 
-    pub(crate) fn set_on_upgrade(&mut self, upgrade: OnUpgrade) {
-        debug_assert!(!upgrade.is_none(), "set_on_upgrade with empty upgrade");
-        let extra = self.extra_mut();
-        debug_assert!(extra.on_upgrade.is_none(), "set_on_upgrade twice");
-        extra.on_upgrade = upgrade;
-    }
-
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
     pub(crate) fn delayed_eof(&mut self, fut: DelayEofUntil) {
         self.extra_mut().delayed_eof = Some(DelayEof::NotEof(fut));
     }
@@ -217,17 +228,16 @@
             .and_then(|extra| extra.delayed_eof.take())
     }
 
+    #[cfg(any(feature = "http1", feature = "http2"))]
     fn extra_mut(&mut self) -> &mut Extra {
-        self.extra.get_or_insert_with(|| {
-            Box::new(Extra {
-                delayed_eof: None,
-                on_upgrade: OnUpgrade::none(),
-            })
-        })
+        self.extra
+            .get_or_insert_with(|| Box::new(Extra { delayed_eof: None }))
     }
 
     fn poll_eof(&mut self, cx: &mut task::Context<'_>) -> Poll<Option<crate::Result<Bytes>>> {
         match self.take_delayed_eof() {
+            #[cfg(any(feature = "http1", feature = "http2"))]
+            #[cfg(feature = "client")]
             Some(DelayEof::NotEof(mut delay)) => match self.poll_inner(cx) {
                 ok @ Poll::Ready(Some(Ok(..))) | ok @ Poll::Pending => {
                     self.extra_mut().delayed_eof = Some(DelayEof::NotEof(delay));
@@ -243,6 +253,8 @@
                 },
                 Poll::Ready(Some(Err(e))) => Poll::Ready(Some(Err(e))),
             },
+            #[cfg(any(feature = "http1", feature = "http2"))]
+            #[cfg(feature = "client")]
             Some(DelayEof::Eof(mut delay)) => match Pin::new(&mut delay).poll(cx) {
                 Poll::Ready(Ok(never)) => match never {},
                 Poll::Pending => {
@@ -251,21 +263,42 @@
                 }
                 Poll::Ready(Err(_done)) => Poll::Ready(None),
             },
+            #[cfg(any(
+                not(any(feature = "http1", feature = "http2")),
+                not(feature = "client")
+            ))]
+            Some(delay_eof) => match delay_eof {},
             None => self.poll_inner(cx),
         }
     }
 
+    #[cfg(feature = "ffi")]
+    pub(crate) fn as_ffi_mut(&mut self) -> &mut crate::ffi::UserBody {
+        match self.kind {
+            Kind::Ffi(ref mut body) => return body,
+            _ => {
+                self.kind = Kind::Ffi(crate::ffi::UserBody::new());
+            }
+        }
+
+        match self.kind {
+            Kind::Ffi(ref mut body) => body,
+            _ => unreachable!(),
+        }
+    }
+
     fn poll_inner(&mut self, cx: &mut task::Context<'_>) -> Poll<Option<crate::Result<Bytes>>> {
         match self.kind {
             Kind::Once(ref mut val) => Poll::Ready(val.take().map(Ok)),
             Kind::Chan {
                 content_length: ref mut len,
-                ref mut rx,
+                ref mut data_rx,
                 ref mut want_tx,
+                ..
             } => {
                 want_tx.send(WANT_READY);
 
-                match ready!(Pin::new(rx).poll_next(cx)?) {
+                match ready!(Pin::new(data_rx).poll_next(cx)?) {
                     Some(chunk) => {
                         len.sub_if(chunk.len() as u64);
                         Poll::Ready(Some(Ok(chunk)))
@@ -273,6 +306,7 @@
                     None => Poll::Ready(None),
                 }
             }
+            #[cfg(all(feature = "http2", any(feature = "client", feature = "server")))]
             Kind::H2 {
                 ref ping,
                 recv: ref mut h2,
@@ -288,6 +322,9 @@
                 None => Poll::Ready(None),
             },
 
+            #[cfg(feature = "ffi")]
+            Kind::Ffi(ref mut body) => body.poll_data(cx),
+
             #[cfg(feature = "stream")]
             Kind::Wrapped(ref mut s) => match ready!(s.get_mut().as_mut().poll_next(cx)) {
                 Some(res) => Poll::Ready(Some(res.map_err(crate::Error::new_body))),
@@ -296,6 +333,7 @@
         }
     }
 
+    #[cfg(feature = "http1")]
     pub(super) fn take_full_data(&mut self) -> Option<Bytes> {
         if let Kind::Once(ref mut chunk) = self.kind {
             chunk.take()
@@ -325,10 +363,11 @@
     }
 
     fn poll_trailers(
-        mut self: Pin<&mut Self>,
-        cx: &mut task::Context<'_>,
+        #[cfg_attr(not(feature = "http2"), allow(unused_mut))] mut self: Pin<&mut Self>,
+        #[cfg_attr(not(feature = "http2"), allow(unused))] cx: &mut task::Context<'_>,
     ) -> Poll<Result<Option<HeaderMap>, Self::Error>> {
         match self.kind {
+            #[cfg(all(feature = "http2", any(feature = "client", feature = "server")))]
             Kind::H2 {
                 recv: ref mut h2,
                 ref ping,
@@ -340,6 +379,15 @@
                 }
                 Err(e) => Poll::Ready(Err(crate::Error::new_h2(e))),
             },
+            Kind::Chan {
+                ref mut trailers_rx,
+                ..
+            } => match ready!(Pin::new(trailers_rx).poll(cx)) {
+                Ok(t) => Poll::Ready(Ok(Some(t))),
+                Err(_) => Poll::Ready(Ok(None)),
+            },
+            #[cfg(feature = "ffi")]
+            Kind::Ffi(ref mut body) => body.poll_trailers(cx),
             _ => Poll::Ready(Ok(None)),
         }
     }
@@ -348,27 +396,38 @@
         match self.kind {
             Kind::Once(ref val) => val.is_none(),
             Kind::Chan { content_length, .. } => content_length == DecodedLength::ZERO,
+            #[cfg(all(feature = "http2", any(feature = "client", feature = "server")))]
             Kind::H2 { recv: ref h2, .. } => h2.is_end_stream(),
+            #[cfg(feature = "ffi")]
+            Kind::Ffi(..) => false,
             #[cfg(feature = "stream")]
             Kind::Wrapped(..) => false,
         }
     }
 
     fn size_hint(&self) -> SizeHint {
-        match self.kind {
-            Kind::Once(Some(ref val)) => SizeHint::with_exact(val.len() as u64),
-            Kind::Once(None) => SizeHint::with_exact(0),
-            #[cfg(feature = "stream")]
-            Kind::Wrapped(..) => SizeHint::default(),
-            Kind::Chan { content_length, .. } | Kind::H2 { content_length, .. } => {
+        macro_rules! opt_len {
+            ($content_length:expr) => {{
                 let mut hint = SizeHint::default();
 
-                if let Some(content_length) = content_length.into_opt() {
+                if let Some(content_length) = $content_length.into_opt() {
                     hint.set_exact(content_length);
                 }
 
                 hint
-            }
+            }};
+        }
+
+        match self.kind {
+            Kind::Once(Some(ref val)) => SizeHint::with_exact(val.len() as u64),
+            Kind::Once(None) => SizeHint::with_exact(0),
+            #[cfg(feature = "stream")]
+            Kind::Wrapped(..) => SizeHint::default(),
+            Kind::Chan { content_length, .. } => opt_len!(content_length),
+            #[cfg(all(feature = "http2", any(feature = "client", feature = "server")))]
+            Kind::H2 { content_length, .. } => opt_len!(content_length),
+            #[cfg(feature = "ffi")]
+            Kind::Ffi(..) => SizeHint::default(),
         }
     }
 }
@@ -484,7 +543,7 @@
     pub fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<crate::Result<()>> {
         // Check if the receiver end has tried polling for the body yet
         ready!(self.poll_want(cx)?);
-        self.tx
+        self.data_tx
             .poll_ready(cx)
             .map_err(|_| crate::Error::new_closed())
     }
@@ -502,14 +561,23 @@
         futures_util::future::poll_fn(|cx| self.poll_ready(cx)).await
     }
 
-    /// Send data on this channel when it is ready.
+    /// Send data on data channel when it is ready.
     pub async fn send_data(&mut self, chunk: Bytes) -> crate::Result<()> {
         self.ready().await?;
-        self.tx
+        self.data_tx
             .try_send(Ok(chunk))
             .map_err(|_| crate::Error::new_closed())
     }
 
+    /// Send trailers on trailers channel.
+    pub async fn send_trailers(&mut self, trailers: HeaderMap) -> crate::Result<()> {
+        let tx = match self.trailers_tx.take() {
+            Some(tx) => tx,
+            None => return Err(crate::Error::new_closed()),
+        };
+        tx.send(trailers).map_err(|_| crate::Error::new_closed())
+    }
+
     /// Try to send data on this channel.
     ///
     /// # Errors
@@ -523,7 +591,7 @@
     /// that doesn't have an async context. If in an async context, prefer
     /// `send_data()` instead.
     pub fn try_send_data(&mut self, chunk: Bytes) -> Result<(), Bytes> {
-        self.tx
+        self.data_tx
             .try_send(Ok(chunk))
             .map_err(|err| err.into_inner().expect("just sent Ok"))
     }
@@ -531,14 +599,15 @@
     /// Aborts the body in an abnormal fashion.
     pub fn abort(self) {
         let _ = self
-            .tx
+            .data_tx
             // clone so the send works even if buffer is full
             .clone()
             .try_send(Err(crate::Error::new_body_write_aborted()));
     }
 
+    #[cfg(feature = "http1")]
     pub(crate) fn send_error(&mut self, err: crate::Error) {
-        let _ = self.tx.try_send(Err(err));
+        let _ = self.data_tx.try_send(Err(err));
     }
 }
 
@@ -584,7 +653,7 @@
 
         assert_eq!(
             mem::size_of::<Sender>(),
-            mem::size_of::<usize>() * 4,
+            mem::size_of::<usize>() * 5,
             "Sender"
         );
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/length.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/length.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/length.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/length.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,111 @@
+use std::fmt;
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub(crate) struct DecodedLength(u64);
+
+#[cfg(any(feature = "http1", feature = "http2"))]
+impl From<Option<u64>> for DecodedLength {
+    fn from(len: Option<u64>) -> Self {
+        len.and_then(|len| {
+            // If the length is u64::MAX, oh well, just reported chunked.
+            Self::checked_new(len).ok()
+        })
+        .unwrap_or(DecodedLength::CHUNKED)
+    }
+}
+
+#[cfg(any(feature = "http1", feature = "http2", test))]
+const MAX_LEN: u64 = std::u64::MAX - 2;
+
+impl DecodedLength {
+    pub(crate) const CLOSE_DELIMITED: DecodedLength = DecodedLength(::std::u64::MAX);
+    pub(crate) const CHUNKED: DecodedLength = DecodedLength(::std::u64::MAX - 1);
+    pub(crate) const ZERO: DecodedLength = DecodedLength(0);
+
+    #[cfg(test)]
+    pub(crate) fn new(len: u64) -> Self {
+        debug_assert!(len <= MAX_LEN);
+        DecodedLength(len)
+    }
+
+    /// Takes the length as a content-length without other checks.
+    ///
+    /// Should only be called if previously confirmed this isn't
+    /// CLOSE_DELIMITED or CHUNKED.
+    #[inline]
+    #[cfg(feature = "http1")]
+    pub(crate) fn danger_len(self) -> u64 {
+        debug_assert!(self.0 < Self::CHUNKED.0);
+        self.0
+    }
+
+    /// Converts to an Option<u64> representing a Known or Unknown length.
+    pub(crate) fn into_opt(self) -> Option<u64> {
+        match self {
+            DecodedLength::CHUNKED | DecodedLength::CLOSE_DELIMITED => None,
+            DecodedLength(known) => Some(known),
+        }
+    }
+
+    /// Checks the `u64` is within the maximum allowed for content-length.
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    pub(crate) fn checked_new(len: u64) -> Result<Self, crate::error::Parse> {
+        if len <= MAX_LEN {
+            Ok(DecodedLength(len))
+        } else {
+            warn!("content-length bigger than maximum: {} > {}", len, MAX_LEN);
+            Err(crate::error::Parse::TooLarge)
+        }
+    }
+
+    pub(crate) fn sub_if(&mut self, amt: u64) {
+        match *self {
+            DecodedLength::CHUNKED | DecodedLength::CLOSE_DELIMITED => (),
+            DecodedLength(ref mut known) => {
+                *known -= amt;
+            }
+        }
+    }
+}
+
+impl fmt::Debug for DecodedLength {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            DecodedLength::CLOSE_DELIMITED => f.write_str("CLOSE_DELIMITED"),
+            DecodedLength::CHUNKED => f.write_str("CHUNKED"),
+            DecodedLength(n) => f.debug_tuple("DecodedLength").field(&n).finish(),
+        }
+    }
+}
+
+impl fmt::Display for DecodedLength {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            DecodedLength::CLOSE_DELIMITED => f.write_str("close-delimited"),
+            DecodedLength::CHUNKED => f.write_str("chunked encoding"),
+            DecodedLength::ZERO => f.write_str("empty"),
+            DecodedLength(n) => write!(f, "content-length ({} bytes)", n),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn sub_if_known() {
+        let mut len = DecodedLength::new(30);
+        len.sub_if(20);
+
+        assert_eq!(len.0, 10);
+    }
+
+    #[test]
+    fn sub_if_chunked() {
+        let mut len = DecodedLength::CHUNKED;
+        len.sub_if(20);
+
+        assert_eq!(len, DecodedLength::CHUNKED);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,18 +17,22 @@
 
 pub use bytes::{Buf, Bytes};
 pub use http_body::Body as HttpBody;
+pub use http_body::SizeHint;
 
 pub use self::aggregate::aggregate;
 pub use self::body::{Body, Sender};
+pub(crate) use self::length::DecodedLength;
 pub use self::to_bytes::to_bytes;
 
 mod aggregate;
 mod body;
+mod length;
 mod to_bytes;
 
 /// An optimization to try to take a full body if immediately available.
 ///
 /// This is currently limited to *only* `hyper::Body`s.
+#[cfg(feature = "http1")]
 pub(crate) fn take_full_data<T: HttpBody + 'static>(body: &mut T) -> Option<T::Data> {
     use std::any::{Any, TypeId};
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/to_bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/to_bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/body/to_bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/body/to_bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,6 +7,12 @@
 /// This may require copying the data into a single buffer. If you don't need
 /// a contiguous buffer, prefer the [`aggregate`](crate::body::aggregate())
 /// function.
+///
+/// # Note
+///
+/// Care needs to be taken if the remote is untrusted. The function doesn't implement any length
+/// checks and an malicious peer might make it consume arbitrary amounts of memory. Checking the
+/// `Content-Length` is a possibility, but it is not strictly mandated to be present.
 pub async fn to_bytes<T>(body: T) -> Result<Bytes, T::Error>
 where
     T: HttpBody,
@@ -23,7 +29,7 @@
     let second = if let Some(buf) = body.data().await {
         buf?
     } else {
-        return Ok(first.to_bytes());
+        return Ok(first.copy_to_bytes(first.remaining()));
     };
 
     // With more than 1 buf, we gotta flatten into a Vec first.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/cfg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/cfg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/cfg.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/cfg.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,62 @@
+macro_rules! cfg_feature {
+    (
+        #![$meta:meta]
+        $($item:item)*
+    ) => {
+        $(
+            #[cfg($meta)]
+            #[cfg_attr(docsrs, doc(cfg($meta)))]
+            $item
+        )*
+    }
+}
+
+macro_rules! cfg_proto {
+    ($($item:item)*) => {
+        cfg_feature! {
+            #![all(
+                any(feature = "http1", feature = "http2"),
+                any(feature = "client", feature = "server"),
+            )]
+            $($item)*
+        }
+    }
+}
+
+cfg_proto! {
+    macro_rules! cfg_http1 {
+        ($($item:item)*) => {
+            cfg_feature! {
+                #![feature = "http1"]
+                $($item)*
+            }
+        }
+    }
+
+    macro_rules! cfg_http2 {
+        ($($item:item)*) => {
+            cfg_feature! {
+                #![feature = "http2"]
+                $($item)*
+            }
+        }
+    }
+
+    macro_rules! cfg_client {
+        ($($item:item)*) => {
+            cfg_feature! {
+                #![feature = "client"]
+                $($item)*
+            }
+        }
+    }
+
+    macro_rules! cfg_server {
+        ($($item:item)*) => {
+            cfg_feature! {
+                #![feature = "server"]
+                $($item)*
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/client.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1371 @@
+use std::error::Error as StdError;
+use std::fmt;
+use std::mem;
+use std::time::Duration;
+
+use futures_channel::oneshot;
+use futures_util::future::{self, Either, FutureExt as _, TryFutureExt as _};
+use http::header::{HeaderValue, HOST};
+use http::uri::{Port, Scheme};
+use http::{Method, Request, Response, Uri, Version};
+
+use super::conn;
+use super::connect::{self, sealed::Connect, Alpn, Connected, Connection};
+use super::pool::{
+    self, CheckoutIsClosedError, Key as PoolKey, Pool, Poolable, Pooled, Reservation,
+};
+#[cfg(feature = "tcp")]
+use super::HttpConnector;
+use crate::body::{Body, HttpBody};
+use crate::common::{exec::BoxSendFuture, lazy as hyper_lazy, task, Future, Lazy, Pin, Poll};
+use crate::rt::Executor;
+
+/// A Client to make outgoing HTTP requests.
+///
+/// `Client` is cheap to clone and cloning is the recommended way to share a `Client`. The
+/// underlying connection pool will be reused.
+#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
+pub struct Client<C, B = Body> {
+    config: Config,
+    conn_builder: conn::Builder,
+    connector: C,
+    pool: Pool<PoolClient<B>>,
+}
+
+#[derive(Clone, Copy, Debug)]
+struct Config {
+    retry_canceled_requests: bool,
+    set_host: bool,
+    ver: Ver,
+}
+
+/// A `Future` that will resolve to an HTTP Response.
+///
+/// This is returned by `Client::request` (and `Client::get`).
+#[must_use = "futures do nothing unless polled"]
+pub struct ResponseFuture {
+    inner: Pin<Box<dyn Future<Output = crate::Result<Response<Body>>> + Send>>,
+}
+
+// ===== impl Client =====
+
+#[cfg(feature = "tcp")]
+impl Client<HttpConnector, Body> {
+    /// Create a new Client with the default [config](Builder).
+    ///
+    /// # Note
+    ///
+    /// The default connector does **not** handle TLS. Speaking to `https`
+    /// destinations will require [configuring a connector that implements
+    /// TLS](https://hyper.rs/guides/client/configuration).
+    #[inline]
+    pub fn new() -> Client<HttpConnector, Body> {
+        Builder::default().build_http()
+    }
+}
+
+#[cfg(feature = "tcp")]
+impl Default for Client<HttpConnector, Body> {
+    fn default() -> Client<HttpConnector, Body> {
+        Client::new()
+    }
+}
+
+impl Client<(), Body> {
+    /// Create a builder to configure a new `Client`.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # #[cfg(feature  = "runtime")]
+    /// # fn run () {
+    /// use std::time::Duration;
+    /// use hyper::Client;
+    ///
+    /// let client = Client::builder()
+    ///     .pool_idle_timeout(Duration::from_secs(30))
+    ///     .http2_only(true)
+    ///     .build_http();
+    /// # let infer: Client<_, hyper::Body> = client;
+    /// # drop(infer);
+    /// # }
+    /// # fn main() {}
+    /// ```
+    #[inline]
+    pub fn builder() -> Builder {
+        Builder::default()
+    }
+}
+
+impl<C, B> Client<C, B>
+where
+    C: Connect + Clone + Send + Sync + 'static,
+    B: HttpBody + Send + 'static,
+    B::Data: Send,
+    B::Error: Into<Box<dyn StdError + Send + Sync>>,
+{
+    /// Send a `GET` request to the supplied `Uri`.
+    ///
+    /// # Note
+    ///
+    /// This requires that the `HttpBody` type have a `Default` implementation.
+    /// It *should* return an "empty" version of itself, such that
+    /// `HttpBody::is_end_stream` is `true`.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # #[cfg(feature  = "runtime")]
+    /// # fn run () {
+    /// use hyper::{Client, Uri};
+    ///
+    /// let client = Client::new();
+    ///
+    /// let future = client.get(Uri::from_static("http://httpbin.org/ip"));
+    /// # }
+    /// # fn main() {}
+    /// ```
+    pub fn get(&self, uri: Uri) -> ResponseFuture
+    where
+        B: Default,
+    {
+        let body = B::default();
+        if !body.is_end_stream() {
+            warn!("default HttpBody used for get() does not return true for is_end_stream");
+        }
+
+        let mut req = Request::new(body);
+        *req.uri_mut() = uri;
+        self.request(req)
+    }
+
+    /// Send a constructed `Request` using this `Client`.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # #[cfg(feature  = "runtime")]
+    /// # fn run () {
+    /// use hyper::{Body, Method, Client, Request};
+    ///
+    /// let client = Client::new();
+    ///
+    /// let req = Request::builder()
+    ///     .method(Method::POST)
+    ///     .uri("http://httpbin.org/post")
+    ///     .body(Body::from("Hallo!"))
+    ///     .expect("request builder");
+    ///
+    /// let future = client.request(req);
+    /// # }
+    /// # fn main() {}
+    /// ```
+    pub fn request(&self, mut req: Request<B>) -> ResponseFuture {
+        let is_http_connect = req.method() == Method::CONNECT;
+        match req.version() {
+            Version::HTTP_11 => (),
+            Version::HTTP_10 => {
+                if is_http_connect {
+                    warn!("CONNECT is not allowed for HTTP/1.0");
+                    return ResponseFuture::new(Box::pin(future::err(
+                        crate::Error::new_user_unsupported_request_method(),
+                    )));
+                }
+            }
+            Version::HTTP_2 => (),
+            // completely unsupported HTTP version (like HTTP/0.9)!
+            other => return ResponseFuture::error_version(other),
+        };
+
+        let pool_key = match extract_domain(req.uri_mut(), is_http_connect) {
+            Ok(s) => s,
+            Err(err) => {
+                return ResponseFuture::new(Box::pin(future::err(err)));
+            }
+        };
+
+        ResponseFuture::new(Box::pin(self.clone().retryably_send_request(req, pool_key)))
+    }
+
+    async fn retryably_send_request(
+        self,
+        mut req: Request<B>,
+        pool_key: PoolKey,
+    ) -> crate::Result<Response<Body>> {
+        let uri = req.uri().clone();
+
+        loop {
+            req = match self.send_request(req, pool_key.clone()).await {
+                Ok(resp) => return Ok(resp),
+                Err(ClientError::Normal(err)) => return Err(err),
+                Err(ClientError::Canceled {
+                    connection_reused,
+                    mut req,
+                    reason,
+                }) => {
+                    if !self.config.retry_canceled_requests || !connection_reused {
+                        // if client disabled, don't retry
+                        // a fresh connection means we definitely can't retry
+                        return Err(reason);
+                    }
+
+                    trace!(
+                        "unstarted request canceled, trying again (reason={:?})",
+                        reason
+                    );
+                    *req.uri_mut() = uri.clone();
+                    req
+                }
+            }
+        }
+    }
+
+    async fn send_request(
+        &self,
+        mut req: Request<B>,
+        pool_key: PoolKey,
+    ) -> Result<Response<Body>, ClientError<B>> {
+        let mut pooled = match self.connection_for(pool_key).await {
+            Ok(pooled) => pooled,
+            Err(ClientConnectError::Normal(err)) => return Err(ClientError::Normal(err)),
+            Err(ClientConnectError::H2CheckoutIsClosed(reason)) => {
+                return Err(ClientError::Canceled {
+                    connection_reused: true,
+                    req,
+                    reason,
+                })
+            }
+        };
+
+        if pooled.is_http1() {
+            if req.version() == Version::HTTP_2 {
+                warn!("Connection is HTTP/1, but request requires HTTP/2");
+                return Err(ClientError::Normal(
+                    crate::Error::new_user_unsupported_version(),
+                ));
+            }
+
+            if self.config.set_host {
+                let uri = req.uri().clone();
+                req.headers_mut().entry(HOST).or_insert_with(|| {
+                    let hostname = uri.host().expect("authority implies host");
+                    if let Some(port) = get_non_default_port(&uri) {
+                        let s = format!("{}:{}", hostname, port);
+                        HeaderValue::from_str(&s)
+                    } else {
+                        HeaderValue::from_str(hostname)
+                    }
+                    .expect("uri host is valid header value")
+                });
+            }
+
+            // CONNECT always sends authority-form, so check it first...
+            if req.method() == Method::CONNECT {
+                authority_form(req.uri_mut());
+            } else if pooled.conn_info.is_proxied {
+                absolute_form(req.uri_mut());
+            } else {
+                origin_form(req.uri_mut());
+            }
+        } else if req.method() == Method::CONNECT {
+            authority_form(req.uri_mut());
+        }
+
+        let fut = pooled
+            .send_request_retryable(req)
+            .map_err(ClientError::map_with_reused(pooled.is_reused()));
+
+        // If the Connector included 'extra' info, add to Response...
+        let extra_info = pooled.conn_info.extra.clone();
+        let fut = fut.map_ok(move |mut res| {
+            if let Some(extra) = extra_info {
+                extra.set(res.extensions_mut());
+            }
+            res
+        });
+
+        // As of futures@0.1.21, there is a race condition in the mpsc
+        // channel, such that sending when the receiver is closing can
+        // result in the message being stuck inside the queue. It won't
+        // ever notify until the Sender side is dropped.
+        //
+        // To counteract this, we must check if our senders 'want' channel
+        // has been closed after having tried to send. If so, error out...
+        if pooled.is_closed() {
+            return fut.await;
+        }
+
+        let mut res = fut.await?;
+
+        // If pooled is HTTP/2, we can toss this reference immediately.
+        //
+        // when pooled is dropped, it will try to insert back into the
+        // pool. To delay that, spawn a future that completes once the
+        // sender is ready again.
+        //
+        // This *should* only be once the related `Connection` has polled
+        // for a new request to start.
+        //
+        // It won't be ready if there is a body to stream.
+        if pooled.is_http2() || !pooled.is_pool_enabled() || pooled.is_ready() {
+            drop(pooled);
+        } else if !res.body().is_end_stream() {
+            let (delayed_tx, delayed_rx) = oneshot::channel();
+            res.body_mut().delayed_eof(delayed_rx);
+            let on_idle = future::poll_fn(move |cx| pooled.poll_ready(cx)).map(move |_| {
+                // At this point, `pooled` is dropped, and had a chance
+                // to insert into the pool (if conn was idle)
+                drop(delayed_tx);
+            });
+
+            self.conn_builder.exec.execute(on_idle);
+        } else {
+            // There's no body to delay, but the connection isn't
+            // ready yet. Only re-insert when it's ready
+            let on_idle = future::poll_fn(move |cx| pooled.poll_ready(cx)).map(|_| ());
+
+            self.conn_builder.exec.execute(on_idle);
+        }
+
+        Ok(res)
+    }
+
+    async fn connection_for(
+        &self,
+        pool_key: PoolKey,
+    ) -> Result<Pooled<PoolClient<B>>, ClientConnectError> {
+        // This actually races 2 different futures to try to get a ready
+        // connection the fastest, and to reduce connection churn.
+        //
+        // - If the pool has an idle connection waiting, that's used
+        //   immediately.
+        // - Otherwise, the Connector is asked to start connecting to
+        //   the destination Uri.
+        // - Meanwhile, the pool Checkout is watching to see if any other
+        //   request finishes and tries to insert an idle connection.
+        // - If a new connection is started, but the Checkout wins after
+        //   (an idle connection became available first), the started
+        //   connection future is spawned into the runtime to complete,
+        //   and then be inserted into the pool as an idle connection.
+        let checkout = self.pool.checkout(pool_key.clone());
+        let connect = self.connect_to(pool_key);
+        let is_ver_h2 = self.config.ver == Ver::Http2;
+
+        // The order of the `select` is depended on below...
+
+        match future::select(checkout, connect).await {
+            // Checkout won, connect future may have been started or not.
+            //
+            // If it has, let it finish and insert back into the pool,
+            // so as to not waste the socket...
+            Either::Left((Ok(checked_out), connecting)) => {
+                // This depends on the `select` above having the correct
+                // order, such that if the checkout future were ready
+                // immediately, the connect future will never have been
+                // started.
+                //
+                // If it *wasn't* ready yet, then the connect future will
+                // have been started...
+                if connecting.started() {
+                    let bg = connecting
+                        .map_err(|err| {
+                            trace!("background connect error: {}", err);
+                        })
+                        .map(|_pooled| {
+                            // dropping here should just place it in
+                            // the Pool for us...
+                        });
+                    // An execute error here isn't important, we're just trying
+                    // to prevent a waste of a socket...
+                    self.conn_builder.exec.execute(bg);
+                }
+                Ok(checked_out)
+            }
+            // Connect won, checkout can just be dropped.
+            Either::Right((Ok(connected), _checkout)) => Ok(connected),
+            // Either checkout or connect could get canceled:
+            //
+            // 1. Connect is canceled if this is HTTP/2 and there is
+            //    an outstanding HTTP/2 connecting task.
+            // 2. Checkout is canceled if the pool cannot deliver an
+            //    idle connection reliably.
+            //
+            // In both cases, we should just wait for the other future.
+            Either::Left((Err(err), connecting)) => {
+                if err.is_canceled() {
+                    connecting.await.map_err(ClientConnectError::Normal)
+                } else {
+                    Err(ClientConnectError::Normal(err))
+                }
+            }
+            Either::Right((Err(err), checkout)) => {
+                if err.is_canceled() {
+                    checkout.await.map_err(move |err| {
+                        if is_ver_h2
+                            && err.is_canceled()
+                            && err.find_source::<CheckoutIsClosedError>().is_some()
+                        {
+                            ClientConnectError::H2CheckoutIsClosed(err)
+                        } else {
+                            ClientConnectError::Normal(err)
+                        }
+                    })
+                } else {
+                    Err(ClientConnectError::Normal(err))
+                }
+            }
+        }
+    }
+
+    fn connect_to(
+        &self,
+        pool_key: PoolKey,
+    ) -> impl Lazy<Output = crate::Result<Pooled<PoolClient<B>>>> + Unpin {
+        let executor = self.conn_builder.exec.clone();
+        let pool = self.pool.clone();
+        #[cfg(not(feature = "http2"))]
+        let conn_builder = self.conn_builder.clone();
+        #[cfg(feature = "http2")]
+        let mut conn_builder = self.conn_builder.clone();
+        let ver = self.config.ver;
+        let is_ver_h2 = ver == Ver::Http2;
+        let connector = self.connector.clone();
+        let dst = domain_as_uri(pool_key.clone());
+        hyper_lazy(move || {
+            // Try to take a "connecting lock".
+            //
+            // If the pool_key is for HTTP/2, and there is already a
+            // connection being established, then this can't take a
+            // second lock. The "connect_to" future is Canceled.
+            let connecting = match pool.connecting(&pool_key, ver) {
+                Some(lock) => lock,
+                None => {
+                    let canceled =
+                        crate::Error::new_canceled().with("HTTP/2 connection in progress");
+                    return Either::Right(future::err(canceled));
+                }
+            };
+            Either::Left(
+                connector
+                    .connect(connect::sealed::Internal, dst)
+                    .map_err(crate::Error::new_connect)
+                    .and_then(move |io| {
+                        let connected = io.connected();
+                        // If ALPN is h2 and we aren't http2_only already,
+                        // then we need to convert our pool checkout into
+                        // a single HTTP2 one.
+                        let connecting = if connected.alpn == Alpn::H2 && !is_ver_h2 {
+                            match connecting.alpn_h2(&pool) {
+                                Some(lock) => {
+                                    trace!("ALPN negotiated h2, updating pool");
+                                    lock
+                                }
+                                None => {
+                                    // Another connection has already upgraded,
+                                    // the pool checkout should finish up for us.
+                                    let canceled = crate::Error::new_canceled()
+                                        .with("ALPN upgraded to HTTP/2");
+                                    return Either::Right(future::err(canceled));
+                                }
+                            }
+                        } else {
+                            connecting
+                        };
+
+                        #[cfg_attr(not(feature = "http2"), allow(unused))]
+                        let is_h2 = is_ver_h2 || connected.alpn == Alpn::H2;
+                        #[cfg(feature = "http2")]
+                        {
+                            conn_builder.http2_only(is_h2);
+                        }
+
+                        Either::Left(Box::pin(async move {
+                            let (tx, conn) = conn_builder.handshake(io).await?;
+
+                            trace!("handshake complete, spawning background dispatcher task");
+                            executor.execute(
+                                conn.map_err(|e| debug!("client connection error: {}", e))
+                                    .map(|_| ()),
+                            );
+
+                            // Wait for 'conn' to ready up before we
+                            // declare this tx as usable
+                            let tx = tx.when_ready().await?;
+
+                            let tx = {
+                                #[cfg(feature = "http2")]
+                                {
+                                    if is_h2 {
+                                        PoolTx::Http2(tx.into_http2())
+                                    } else {
+                                        PoolTx::Http1(tx)
+                                    }
+                                }
+                                #[cfg(not(feature = "http2"))]
+                                PoolTx::Http1(tx)
+                            };
+
+                            Ok(pool.pooled(
+                                connecting,
+                                PoolClient {
+                                    conn_info: connected,
+                                    tx,
+                                },
+                            ))
+                        }))
+                    }),
+            )
+        })
+    }
+}
+
+impl<C, B> tower_service::Service<Request<B>> for Client<C, B>
+where
+    C: Connect + Clone + Send + Sync + 'static,
+    B: HttpBody + Send + 'static,
+    B::Data: Send,
+    B::Error: Into<Box<dyn StdError + Send + Sync>>,
+{
+    type Response = Response<Body>;
+    type Error = crate::Error;
+    type Future = ResponseFuture;
+
+    fn poll_ready(&mut self, _: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn call(&mut self, req: Request<B>) -> Self::Future {
+        self.request(req)
+    }
+}
+
+impl<C, B> tower_service::Service<Request<B>> for &'_ Client<C, B>
+where
+    C: Connect + Clone + Send + Sync + 'static,
+    B: HttpBody + Send + 'static,
+    B::Data: Send,
+    B::Error: Into<Box<dyn StdError + Send + Sync>>,
+{
+    type Response = Response<Body>;
+    type Error = crate::Error;
+    type Future = ResponseFuture;
+
+    fn poll_ready(&mut self, _: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn call(&mut self, req: Request<B>) -> Self::Future {
+        self.request(req)
+    }
+}
+
+impl<C: Clone, B> Clone for Client<C, B> {
+    fn clone(&self) -> Client<C, B> {
+        Client {
+            config: self.config.clone(),
+            conn_builder: self.conn_builder.clone(),
+            connector: self.connector.clone(),
+            pool: self.pool.clone(),
+        }
+    }
+}
+
+impl<C, B> fmt::Debug for Client<C, B> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Client").finish()
+    }
+}
+
+// ===== impl ResponseFuture =====
+
+impl ResponseFuture {
+    fn new(fut: Pin<Box<dyn Future<Output = crate::Result<Response<Body>>> + Send>>) -> Self {
+        Self { inner: fut }
+    }
+
+    fn error_version(ver: Version) -> Self {
+        warn!("Request has unsupported version \"{:?}\"", ver);
+        ResponseFuture::new(Box::pin(future::err(
+            crate::Error::new_user_unsupported_version(),
+        )))
+    }
+}
+
+impl fmt::Debug for ResponseFuture {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.pad("Future<Response>")
+    }
+}
+
+impl Future for ResponseFuture {
+    type Output = crate::Result<Response<Body>>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
+        Pin::new(&mut self.inner).poll(cx)
+    }
+}
+
+// ===== impl PoolClient =====
+
+// FIXME: allow() required due to `impl Trait` leaking types to this lint
+#[allow(missing_debug_implementations)]
+struct PoolClient<B> {
+    conn_info: Connected,
+    tx: PoolTx<B>,
+}
+
+enum PoolTx<B> {
+    Http1(conn::SendRequest<B>),
+    #[cfg(feature = "http2")]
+    Http2(conn::Http2SendRequest<B>),
+}
+
+impl<B> PoolClient<B> {
+    fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<crate::Result<()>> {
+        match self.tx {
+            PoolTx::Http1(ref mut tx) => tx.poll_ready(cx),
+            #[cfg(feature = "http2")]
+            PoolTx::Http2(_) => Poll::Ready(Ok(())),
+        }
+    }
+
+    fn is_http1(&self) -> bool {
+        !self.is_http2()
+    }
+
+    fn is_http2(&self) -> bool {
+        match self.tx {
+            PoolTx::Http1(_) => false,
+            #[cfg(feature = "http2")]
+            PoolTx::Http2(_) => true,
+        }
+    }
+
+    fn is_ready(&self) -> bool {
+        match self.tx {
+            PoolTx::Http1(ref tx) => tx.is_ready(),
+            #[cfg(feature = "http2")]
+            PoolTx::Http2(ref tx) => tx.is_ready(),
+        }
+    }
+
+    fn is_closed(&self) -> bool {
+        match self.tx {
+            PoolTx::Http1(ref tx) => tx.is_closed(),
+            #[cfg(feature = "http2")]
+            PoolTx::Http2(ref tx) => tx.is_closed(),
+        }
+    }
+}
+
+impl<B: HttpBody + 'static> PoolClient<B> {
+    fn send_request_retryable(
+        &mut self,
+        req: Request<B>,
+    ) -> impl Future<Output = Result<Response<Body>, (crate::Error, Option<Request<B>>)>>
+    where
+        B: Send,
+    {
+        match self.tx {
+            #[cfg(not(feature = "http2"))]
+            PoolTx::Http1(ref mut tx) => tx.send_request_retryable(req),
+            #[cfg(feature = "http2")]
+            PoolTx::Http1(ref mut tx) => Either::Left(tx.send_request_retryable(req)),
+            #[cfg(feature = "http2")]
+            PoolTx::Http2(ref mut tx) => Either::Right(tx.send_request_retryable(req)),
+        }
+    }
+}
+
+impl<B> Poolable for PoolClient<B>
+where
+    B: Send + 'static,
+{
+    fn is_open(&self) -> bool {
+        match self.tx {
+            PoolTx::Http1(ref tx) => tx.is_ready(),
+            #[cfg(feature = "http2")]
+            PoolTx::Http2(ref tx) => tx.is_ready(),
+        }
+    }
+
+    fn reserve(self) -> Reservation<Self> {
+        match self.tx {
+            PoolTx::Http1(tx) => Reservation::Unique(PoolClient {
+                conn_info: self.conn_info,
+                tx: PoolTx::Http1(tx),
+            }),
+            #[cfg(feature = "http2")]
+            PoolTx::Http2(tx) => {
+                let b = PoolClient {
+                    conn_info: self.conn_info.clone(),
+                    tx: PoolTx::Http2(tx.clone()),
+                };
+                let a = PoolClient {
+                    conn_info: self.conn_info,
+                    tx: PoolTx::Http2(tx),
+                };
+                Reservation::Shared(a, b)
+            }
+        }
+    }
+
+    fn can_share(&self) -> bool {
+        self.is_http2()
+    }
+}
+
+// ===== impl ClientError =====
+
+// FIXME: allow() required due to `impl Trait` leaking types to this lint
+#[allow(missing_debug_implementations)]
+enum ClientError<B> {
+    Normal(crate::Error),
+    Canceled {
+        connection_reused: bool,
+        req: Request<B>,
+        reason: crate::Error,
+    },
+}
+
+impl<B> ClientError<B> {
+    fn map_with_reused(conn_reused: bool) -> impl Fn((crate::Error, Option<Request<B>>)) -> Self {
+        move |(err, orig_req)| {
+            if let Some(req) = orig_req {
+                ClientError::Canceled {
+                    connection_reused: conn_reused,
+                    reason: err,
+                    req,
+                }
+            } else {
+                ClientError::Normal(err)
+            }
+        }
+    }
+}
+
+enum ClientConnectError {
+    Normal(crate::Error),
+    H2CheckoutIsClosed(crate::Error),
+}
+
+/// A marker to identify what version a pooled connection is.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub(super) enum Ver {
+    Auto,
+    Http2,
+}
+
+fn origin_form(uri: &mut Uri) {
+    let path = match uri.path_and_query() {
+        Some(path) if path.as_str() != "/" => {
+            let mut parts = ::http::uri::Parts::default();
+            parts.path_and_query = Some(path.clone());
+            Uri::from_parts(parts).expect("path is valid uri")
+        }
+        _none_or_just_slash => {
+            debug_assert!(Uri::default() == "/");
+            Uri::default()
+        }
+    };
+    *uri = path
+}
+
+fn absolute_form(uri: &mut Uri) {
+    debug_assert!(uri.scheme().is_some(), "absolute_form needs a scheme");
+    debug_assert!(
+        uri.authority().is_some(),
+        "absolute_form needs an authority"
+    );
+    // If the URI is to HTTPS, and the connector claimed to be a proxy,
+    // then it *should* have tunneled, and so we don't want to send
+    // absolute-form in that case.
+    if uri.scheme() == Some(&Scheme::HTTPS) {
+        origin_form(uri);
+    }
+}
+
+fn authority_form(uri: &mut Uri) {
+    if let Some(path) = uri.path_and_query() {
+        // `https://hyper.rs` would parse with `/` path, don't
+        // annoy people about that...
+        if path != "/" {
+            warn!("HTTP/1.1 CONNECT request stripping path: {:?}", path);
+        }
+    }
+    *uri = match uri.authority() {
+        Some(auth) => {
+            let mut parts = ::http::uri::Parts::default();
+            parts.authority = Some(auth.clone());
+            Uri::from_parts(parts).expect("authority is valid")
+        }
+        None => {
+            unreachable!("authority_form with relative uri");
+        }
+    };
+}
+
+fn extract_domain(uri: &mut Uri, is_http_connect: bool) -> crate::Result<PoolKey> {
+    let uri_clone = uri.clone();
+    match (uri_clone.scheme(), uri_clone.authority()) {
+        (Some(scheme), Some(auth)) => Ok((scheme.clone(), auth.clone())),
+        (None, Some(auth)) if is_http_connect => {
+            let scheme = match auth.port_u16() {
+                Some(443) => {
+                    set_scheme(uri, Scheme::HTTPS);
+                    Scheme::HTTPS
+                }
+                _ => {
+                    set_scheme(uri, Scheme::HTTP);
+                    Scheme::HTTP
+                }
+            };
+            Ok((scheme, auth.clone()))
+        }
+        _ => {
+            debug!("Client requires absolute-form URIs, received: {:?}", uri);
+            Err(crate::Error::new_user_absolute_uri_required())
+        }
+    }
+}
+
+fn domain_as_uri((scheme, auth): PoolKey) -> Uri {
+    http::uri::Builder::new()
+        .scheme(scheme)
+        .authority(auth)
+        .path_and_query("/")
+        .build()
+        .expect("domain is valid Uri")
+}
+
+fn set_scheme(uri: &mut Uri, scheme: Scheme) {
+    debug_assert!(
+        uri.scheme().is_none(),
+        "set_scheme expects no existing scheme"
+    );
+    let old = mem::replace(uri, Uri::default());
+    let mut parts: ::http::uri::Parts = old.into();
+    parts.scheme = Some(scheme);
+    parts.path_and_query = Some("/".parse().expect("slash is a valid path"));
+    *uri = Uri::from_parts(parts).expect("scheme is valid");
+}
+
+fn get_non_default_port(uri: &Uri) -> Option<Port<&str>> {
+    match (uri.port().map(|p| p.as_u16()), is_schema_secure(uri)) {
+        (Some(443), true) => None,
+        (Some(80), false) => None,
+        _ => uri.port(),
+    }
+}
+
+fn is_schema_secure(uri: &Uri) -> bool {
+    uri.scheme_str()
+        .map(|scheme_str| matches!(scheme_str, "wss" | "https"))
+        .unwrap_or_default()
+}
+
+/// A builder to configure a new [`Client`](Client).
+///
+/// # Example
+///
+/// ```
+/// # #[cfg(feature  = "runtime")]
+/// # fn run () {
+/// use std::time::Duration;
+/// use hyper::Client;
+///
+/// let client = Client::builder()
+///     .pool_idle_timeout(Duration::from_secs(30))
+///     .http2_only(true)
+///     .build_http();
+/// # let infer: Client<_, hyper::Body> = client;
+/// # drop(infer);
+/// # }
+/// # fn main() {}
+/// ```
+#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
+#[derive(Clone)]
+pub struct Builder {
+    client_config: Config,
+    conn_builder: conn::Builder,
+    pool_config: pool::Config,
+}
+
+impl Default for Builder {
+    fn default() -> Self {
+        Self {
+            client_config: Config {
+                retry_canceled_requests: true,
+                set_host: true,
+                ver: Ver::Auto,
+            },
+            conn_builder: conn::Builder::new(),
+            pool_config: pool::Config {
+                idle_timeout: Some(Duration::from_secs(90)),
+                max_idle_per_host: std::usize::MAX,
+            },
+        }
+    }
+}
+
+impl Builder {
+    #[doc(hidden)]
+    #[deprecated(
+        note = "name is confusing, to disable the connection pool, call pool_max_idle_per_host(0)"
+    )]
+    pub fn keep_alive(&mut self, val: bool) -> &mut Self {
+        if !val {
+            // disable
+            self.pool_max_idle_per_host(0)
+        } else if self.pool_config.max_idle_per_host == 0 {
+            // enable
+            self.pool_max_idle_per_host(std::usize::MAX)
+        } else {
+            // already enabled
+            self
+        }
+    }
+
+    #[doc(hidden)]
+    #[deprecated(note = "renamed to `pool_idle_timeout`")]
+    pub fn keep_alive_timeout<D>(&mut self, val: D) -> &mut Self
+    where
+        D: Into<Option<Duration>>,
+    {
+        self.pool_idle_timeout(val)
+    }
+
+    /// Set an optional timeout for idle sockets being kept-alive.
+    ///
+    /// Pass `None` to disable timeout.
+    ///
+    /// Default is 90 seconds.
+    pub fn pool_idle_timeout<D>(&mut self, val: D) -> &mut Self
+    where
+        D: Into<Option<Duration>>,
+    {
+        self.pool_config.idle_timeout = val.into();
+        self
+    }
+
+    #[doc(hidden)]
+    #[deprecated(note = "renamed to `pool_max_idle_per_host`")]
+    pub fn max_idle_per_host(&mut self, max_idle: usize) -> &mut Self {
+        self.pool_config.max_idle_per_host = max_idle;
+        self
+    }
+
+    /// Sets the maximum idle connection per host allowed in the pool.
+    ///
+    /// Default is `usize::MAX` (no limit).
+    pub fn pool_max_idle_per_host(&mut self, max_idle: usize) -> &mut Self {
+        self.pool_config.max_idle_per_host = max_idle;
+        self
+    }
+
+    // HTTP/1 options
+
+    /// Sets the exact size of the read buffer to *always* use.
+    ///
+    /// Note that setting this option unsets the `http1_max_buf_size` option.
+    ///
+    /// Default is an adaptive read buffer.
+    pub fn http1_read_buf_exact_size(&mut self, sz: usize) -> &mut Self {
+        self.conn_builder.http1_read_buf_exact_size(Some(sz));
+        self
+    }
+
+    /// Set the maximum buffer size for the connection.
+    ///
+    /// Default is ~400kb.
+    ///
+    /// Note that setting this option unsets the `http1_read_exact_buf_size` option.
+    ///
+    /// # Panics
+    ///
+    /// The minimum value allowed is 8192. This method panics if the passed `max` is less than the minimum.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_max_buf_size(&mut self, max: usize) -> &mut Self {
+        self.conn_builder.http1_max_buf_size(max);
+        self
+    }
+
+    /// Set whether HTTP/1 connections will accept spaces between header names
+    /// and the colon that follow them in responses.
+    ///
+    /// You probably don't need this, here is what [RFC 7230 Section 3.2.4.] has
+    /// to say about it:
+    ///
+    /// > No whitespace is allowed between the header field-name and colon. In
+    /// > the past, differences in the handling of such whitespace have led to
+    /// > security vulnerabilities in request routing and response handling. A
+    /// > server MUST reject any received request message that contains
+    /// > whitespace between a header field-name and colon with a response code
+    /// > of 400 (Bad Request). A proxy MUST remove any such whitespace from a
+    /// > response message before forwarding the message downstream.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    ///
+    /// [RFC 7230 Section 3.2.4.]: https://tools.ietf.org/html/rfc7230#section-3.2.4
+    pub fn http1_allow_spaces_after_header_name_in_responses(&mut self, val: bool) -> &mut Self {
+        self.conn_builder
+            .http1_allow_spaces_after_header_name_in_responses(val);
+        self
+    }
+
+    /// Set whether HTTP/1 connections will write header names as title case at
+    /// the socket level.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    pub fn http1_title_case_headers(&mut self, val: bool) -> &mut Self {
+        self.conn_builder.http1_title_case_headers(val);
+        self
+    }
+
+    /// Set whether HTTP/1 connections will write header names as provided
+    /// at the socket level.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    pub fn http1_preserve_header_case(&mut self, val: bool) -> &mut Self {
+        self.conn_builder.http1_preserve_header_case(val);
+        self
+    }
+
+    /// Set whether HTTP/0.9 responses should be tolerated.
+    ///
+    /// Default is false.
+    pub fn http09_responses(&mut self, val: bool) -> &mut Self {
+        self.conn_builder.http09_responses(val);
+        self
+    }
+
+    /// Set whether the connection **must** use HTTP/2.
+    ///
+    /// The destination must either allow HTTP2 Prior Knowledge, or the
+    /// `Connect` should be configured to do use ALPN to upgrade to `h2`
+    /// as part of the connection process. This will not make the `Client`
+    /// utilize ALPN by itself.
+    ///
+    /// Note that setting this to true prevents HTTP/1 from being allowed.
+    ///
+    /// Default is false.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_only(&mut self, val: bool) -> &mut Self {
+        self.client_config.ver = if val { Ver::Http2 } else { Ver::Auto };
+        self
+    }
+
+    /// Sets the [`SETTINGS_INITIAL_WINDOW_SIZE`][spec] option for HTTP2
+    /// stream-level flow control.
+    ///
+    /// Passing `None` will do nothing.
+    ///
+    /// If not set, hyper will use a default.
+    ///
+    /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_initial_stream_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
+        self.conn_builder
+            .http2_initial_stream_window_size(sz.into());
+        self
+    }
+
+    /// Sets the max connection-level flow control for HTTP2
+    ///
+    /// Passing `None` will do nothing.
+    ///
+    /// If not set, hyper will use a default.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_initial_connection_window_size(
+        &mut self,
+        sz: impl Into<Option<u32>>,
+    ) -> &mut Self {
+        self.conn_builder
+            .http2_initial_connection_window_size(sz.into());
+        self
+    }
+
+    /// Sets whether to use an adaptive flow control.
+    ///
+    /// Enabling this will override the limits set in
+    /// `http2_initial_stream_window_size` and
+    /// `http2_initial_connection_window_size`.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_adaptive_window(&mut self, enabled: bool) -> &mut Self {
+        self.conn_builder.http2_adaptive_window(enabled);
+        self
+    }
+
+    /// Sets the maximum frame size to use for HTTP2.
+    ///
+    /// Passing `None` will do nothing.
+    ///
+    /// If not set, hyper will use a default.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_max_frame_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
+        self.conn_builder.http2_max_frame_size(sz);
+        self
+    }
+
+    /// Sets an interval for HTTP2 Ping frames should be sent to keep a
+    /// connection alive.
+    ///
+    /// Pass `None` to disable HTTP2 keep-alive.
+    ///
+    /// Default is currently disabled.
+    ///
+    /// # Cargo Feature
+    ///
+    /// Requires the `runtime` cargo feature to be enabled.
+    #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_keep_alive_interval(
+        &mut self,
+        interval: impl Into<Option<Duration>>,
+    ) -> &mut Self {
+        self.conn_builder.http2_keep_alive_interval(interval);
+        self
+    }
+
+    /// Sets a timeout for receiving an acknowledgement of the keep-alive ping.
+    ///
+    /// If the ping is not acknowledged within the timeout, the connection will
+    /// be closed. Does nothing if `http2_keep_alive_interval` is disabled.
+    ///
+    /// Default is 20 seconds.
+    ///
+    /// # Cargo Feature
+    ///
+    /// Requires the `runtime` cargo feature to be enabled.
+    #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_keep_alive_timeout(&mut self, timeout: Duration) -> &mut Self {
+        self.conn_builder.http2_keep_alive_timeout(timeout);
+        self
+    }
+
+    /// Sets whether HTTP2 keep-alive should apply while the connection is idle.
+    ///
+    /// If disabled, keep-alive pings are only sent while there are open
+    /// request/responses streams. If enabled, pings are also sent when no
+    /// streams are active. Does nothing if `http2_keep_alive_interval` is
+    /// disabled.
+    ///
+    /// Default is `false`.
+    ///
+    /// # Cargo Feature
+    ///
+    /// Requires the `runtime` cargo feature to be enabled.
+    #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_keep_alive_while_idle(&mut self, enabled: bool) -> &mut Self {
+        self.conn_builder.http2_keep_alive_while_idle(enabled);
+        self
+    }
+
+    /// Sets the maximum number of HTTP2 concurrent locally reset streams.
+    ///
+    /// See the documentation of [`h2::client::Builder::max_concurrent_reset_streams`] for more
+    /// details.
+    ///
+    /// The default value is determined by the `h2` crate.
+    ///
+    /// [`h2::client::Builder::max_concurrent_reset_streams`]: https://docs.rs/h2/client/struct.Builder.html#method.max_concurrent_reset_streams
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_max_concurrent_reset_streams(&mut self, max: usize) -> &mut Self {
+        self.conn_builder.http2_max_concurrent_reset_streams(max);
+        self
+    }
+
+    /// Set whether to retry requests that get disrupted before ever starting
+    /// to write.
+    ///
+    /// This means a request that is queued, and gets given an idle, reused
+    /// connection, and then encounters an error immediately as the idle
+    /// connection was found to be unusable.
+    ///
+    /// When this is set to `false`, the related `ResponseFuture` would instead
+    /// resolve to an `Error::Cancel`.
+    ///
+    /// Default is `true`.
+    #[inline]
+    pub fn retry_canceled_requests(&mut self, val: bool) -> &mut Self {
+        self.client_config.retry_canceled_requests = val;
+        self
+    }
+
+    /// Set whether to automatically add the `Host` header to requests.
+    ///
+    /// If true, and a request does not include a `Host` header, one will be
+    /// added automatically, derived from the authority of the `Uri`.
+    ///
+    /// Default is `true`.
+    #[inline]
+    pub fn set_host(&mut self, val: bool) -> &mut Self {
+        self.client_config.set_host = val;
+        self
+    }
+
+    /// Provide an executor to execute background `Connection` tasks.
+    pub fn executor<E>(&mut self, exec: E) -> &mut Self
+    where
+        E: Executor<BoxSendFuture> + Send + Sync + 'static,
+    {
+        self.conn_builder.executor(exec);
+        self
+    }
+
+    /// Builder a client with this configuration and the default `HttpConnector`.
+    #[cfg(feature = "tcp")]
+    pub fn build_http<B>(&self) -> Client<HttpConnector, B>
+    where
+        B: HttpBody + Send,
+        B::Data: Send,
+    {
+        let mut connector = HttpConnector::new();
+        if self.pool_config.is_enabled() {
+            connector.set_keepalive(self.pool_config.idle_timeout);
+        }
+        self.build(connector)
+    }
+
+    /// Combine the configuration of this builder with a connector to create a `Client`.
+    pub fn build<C, B>(&self, connector: C) -> Client<C, B>
+    where
+        C: Connect + Clone,
+        B: HttpBody + Send,
+        B::Data: Send,
+    {
+        Client {
+            config: self.client_config,
+            conn_builder: self.conn_builder.clone(),
+            connector,
+            pool: Pool::new(self.pool_config, &self.conn_builder.exec),
+        }
+    }
+}
+
+impl fmt::Debug for Builder {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Builder")
+            .field("client_config", &self.client_config)
+            .field("conn_builder", &self.conn_builder)
+            .field("pool_config", &self.pool_config)
+            .finish()
+    }
+}
+
+#[cfg(test)]
+mod unit_tests {
+    use super::*;
+
+    #[test]
+    fn set_relative_uri_with_implicit_path() {
+        let mut uri = "http://hyper.rs".parse().unwrap();
+        origin_form(&mut uri);
+        assert_eq!(uri.to_string(), "/");
+    }
+
+    #[test]
+    fn test_origin_form() {
+        let mut uri = "http://hyper.rs/guides".parse().unwrap();
+        origin_form(&mut uri);
+        assert_eq!(uri.to_string(), "/guides");
+
+        let mut uri = "http://hyper.rs/guides?foo=bar".parse().unwrap();
+        origin_form(&mut uri);
+        assert_eq!(uri.to_string(), "/guides?foo=bar");
+    }
+
+    #[test]
+    fn test_absolute_form() {
+        let mut uri = "http://hyper.rs/guides".parse().unwrap();
+        absolute_form(&mut uri);
+        assert_eq!(uri.to_string(), "http://hyper.rs/guides");
+
+        let mut uri = "https://hyper.rs/guides".parse().unwrap();
+        absolute_form(&mut uri);
+        assert_eq!(uri.to_string(), "/guides");
+    }
+
+    #[test]
+    fn test_authority_form() {
+        let _ = pretty_env_logger::try_init();
+
+        let mut uri = "http://hyper.rs".parse().unwrap();
+        authority_form(&mut uri);
+        assert_eq!(uri.to_string(), "hyper.rs");
+
+        let mut uri = "hyper.rs".parse().unwrap();
+        authority_form(&mut uri);
+        assert_eq!(uri.to_string(), "hyper.rs");
+    }
+
+    #[test]
+    fn test_extract_domain_connect_no_port() {
+        let mut uri = "hyper.rs".parse().unwrap();
+        let (scheme, host) = extract_domain(&mut uri, true).expect("extract domain");
+        assert_eq!(scheme, *"http");
+        assert_eq!(host, "hyper.rs");
+    }
+
+    #[test]
+    fn test_is_secure() {
+        assert_eq!(
+            is_schema_secure(&"http://hyper.rs".parse::<Uri>().unwrap()),
+            false
+        );
+        assert_eq!(is_schema_secure(&"hyper.rs".parse::<Uri>().unwrap()), false);
+        assert_eq!(
+            is_schema_secure(&"wss://hyper.rs".parse::<Uri>().unwrap()),
+            true
+        );
+        assert_eq!(
+            is_schema_secure(&"ws://hyper.rs".parse::<Uri>().unwrap()),
+            false
+        );
+    }
+
+    #[test]
+    fn test_get_non_default_port() {
+        assert!(get_non_default_port(&"http://hyper.rs".parse::<Uri>().unwrap()).is_none());
+        assert!(get_non_default_port(&"http://hyper.rs:80".parse::<Uri>().unwrap()).is_none());
+        assert!(get_non_default_port(&"https://hyper.rs:443".parse::<Uri>().unwrap()).is_none());
+        assert!(get_non_default_port(&"hyper.rs:80".parse::<Uri>().unwrap()).is_none());
+
+        assert_eq!(
+            get_non_default_port(&"http://hyper.rs:123".parse::<Uri>().unwrap())
+                .unwrap()
+                .as_u16(),
+            123
+        );
+        assert_eq!(
+            get_non_default_port(&"https://hyper.rs:80".parse::<Uri>().unwrap())
+                .unwrap()
+                .as_u16(),
+            80
+        );
+        assert_eq!(
+            get_non_default_port(&"hyper.rs:123".parse::<Uri>().unwrap())
+                .unwrap()
+                .as_u16(),
+            123
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/connect/dns.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/connect/dns.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/connect/dns.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/connect/dns.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,21 +9,21 @@
 //! # Resolvers are `Service`s
 //!
 //! A resolver is just a
-//! `Service<Name, Response = impl Iterator<Item = IpAddr>>`.
+//! `Service<Name, Response = impl Iterator<Item = SocketAddr>>`.
 //!
 //! A simple resolver that ignores the name and always returns a specific
 //! address:
 //!
 //! ```rust,ignore
-//! use std::{convert::Infallible, iter, net::IpAddr};
+//! use std::{convert::Infallible, iter, net::SocketAddr};
 //!
 //! let resolver = tower::service_fn(|_name| async {
-//!     Ok::<_, Infallible>(iter::once(IpAddr::from([127, 0, 0, 1])))
+//!     Ok::<_, Infallible>(iter::once(SocketAddr::from(([127, 0, 0, 1], 8080))))
 //! });
 //! ```
 use std::error::Error;
 use std::future::Future;
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
 use std::pin::Pin;
 use std::str::FromStr;
 use std::task::{self, Poll};
@@ -48,12 +48,12 @@
 
 /// An iterator of IP addresses returned from `getaddrinfo`.
 pub struct GaiAddrs {
-    inner: IpAddrs,
+    inner: SocketAddrs,
 }
 
 /// A future to resolve a name returned by `GaiResolver`.
 pub struct GaiFuture {
-    inner: JoinHandle<Result<IpAddrs, io::Error>>,
+    inner: JoinHandle<Result<SocketAddrs, io::Error>>,
 }
 
 impl Name {
@@ -121,7 +121,7 @@
             debug!("resolving host={:?}", name.host);
             (&*name.host, 0)
                 .to_socket_addrs()
-                .map(|i| IpAddrs { iter: i })
+                .map(|i| SocketAddrs { iter: i })
         });
 
         GaiFuture { inner: blocking }
@@ -159,10 +159,10 @@
 }
 
 impl Iterator for GaiAddrs {
-    type Item = IpAddr;
+    type Item = SocketAddr;
 
     fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|sa| sa.ip())
+        self.inner.next()
     }
 }
 
@@ -172,28 +172,28 @@
     }
 }
 
-pub(super) struct IpAddrs {
+pub(super) struct SocketAddrs {
     iter: vec::IntoIter<SocketAddr>,
 }
 
-impl IpAddrs {
+impl SocketAddrs {
     pub(super) fn new(addrs: Vec<SocketAddr>) -> Self {
-        IpAddrs {
+        SocketAddrs {
             iter: addrs.into_iter(),
         }
     }
 
-    pub(super) fn try_parse(host: &str, port: u16) -> Option<IpAddrs> {
+    pub(super) fn try_parse(host: &str, port: u16) -> Option<SocketAddrs> {
         if let Ok(addr) = host.parse::<Ipv4Addr>() {
             let addr = SocketAddrV4::new(addr, port);
-            return Some(IpAddrs {
+            return Some(SocketAddrs {
                 iter: vec![SocketAddr::V4(addr)].into_iter(),
             });
         }
         let host = host.trim_start_matches('[').trim_end_matches(']');
         if let Ok(addr) = host.parse::<Ipv6Addr>() {
             let addr = SocketAddrV6::new(addr, port, 0, 0);
-            return Some(IpAddrs {
+            return Some(SocketAddrs {
                 iter: vec![SocketAddr::V6(addr)].into_iter(),
             });
         }
@@ -201,18 +201,18 @@
     }
 
     #[inline]
-    fn filter(self, predicate: impl FnMut(&SocketAddr) -> bool) -> IpAddrs {
-        IpAddrs::new(self.iter.filter(predicate).collect())
+    fn filter(self, predicate: impl FnMut(&SocketAddr) -> bool) -> SocketAddrs {
+        SocketAddrs::new(self.iter.filter(predicate).collect())
     }
 
     pub(super) fn split_by_preference(
         self,
         local_addr_ipv4: Option<Ipv4Addr>,
         local_addr_ipv6: Option<Ipv6Addr>,
-    ) -> (IpAddrs, IpAddrs) {
+    ) -> (SocketAddrs, SocketAddrs) {
         match (local_addr_ipv4, local_addr_ipv6) {
-            (Some(_), None) => (self.filter(SocketAddr::is_ipv4), IpAddrs::new(vec![])),
-            (None, Some(_)) => (self.filter(SocketAddr::is_ipv6), IpAddrs::new(vec![])),
+            (Some(_), None) => (self.filter(SocketAddr::is_ipv4), SocketAddrs::new(vec![])),
+            (None, Some(_)) => (self.filter(SocketAddr::is_ipv6), SocketAddrs::new(vec![])),
             _ => {
                 let preferring_v6 = self
                     .iter
@@ -225,7 +225,7 @@
                     .iter
                     .partition::<Vec<_>, _>(|addr| addr.is_ipv6() == preferring_v6);
 
-                (IpAddrs::new(preferred), IpAddrs::new(fallback))
+                (SocketAddrs::new(preferred), SocketAddrs::new(fallback))
             }
         }
     }
@@ -239,7 +239,7 @@
     }
 }
 
-impl Iterator for IpAddrs {
+impl Iterator for SocketAddrs {
     type Item = SocketAddr;
     #[inline]
     fn next(&mut self) -> Option<SocketAddr> {
@@ -312,13 +312,13 @@
 */
 
 mod sealed {
-    use super::{IpAddr, Name};
+    use super::{SocketAddr, Name};
     use crate::common::{task, Future, Poll};
     use tower_service::Service;
 
     // "Trait alias" for `Service<Name, Response = Addrs>`
     pub trait Resolve {
-        type Addrs: Iterator<Item = IpAddr>;
+        type Addrs: Iterator<Item = SocketAddr>;
         type Error: Into<Box<dyn std::error::Error + Send + Sync>>;
         type Future: Future<Output = Result<Self::Addrs, Self::Error>>;
 
@@ -329,7 +329,7 @@
     impl<S> Resolve for S
     where
         S: Service<Name>,
-        S::Response: Iterator<Item = IpAddr>,
+        S::Response: Iterator<Item = SocketAddr>,
         S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
     {
         type Addrs = S::Response;
@@ -346,7 +346,7 @@
     }
 }
 
-pub(crate) async fn resolve<R>(resolver: &mut R, name: Name) -> Result<R::Addrs, R::Error>
+pub(super) async fn resolve<R>(resolver: &mut R, name: Name) -> Result<R::Addrs, R::Error>
 where
     R: Resolve,
 {
@@ -366,42 +366,42 @@
         let v4_addr = (ip_v4, 80).into();
         let v6_addr = (ip_v6, 80).into();
 
-        let (mut preferred, mut fallback) = IpAddrs {
+        let (mut preferred, mut fallback) = SocketAddrs {
             iter: vec![v4_addr, v6_addr].into_iter(),
         }
         .split_by_preference(None, None);
         assert!(preferred.next().unwrap().is_ipv4());
         assert!(fallback.next().unwrap().is_ipv6());
 
-        let (mut preferred, mut fallback) = IpAddrs {
+        let (mut preferred, mut fallback) = SocketAddrs {
             iter: vec![v6_addr, v4_addr].into_iter(),
         }
         .split_by_preference(None, None);
         assert!(preferred.next().unwrap().is_ipv6());
         assert!(fallback.next().unwrap().is_ipv4());
 
-        let (mut preferred, mut fallback) = IpAddrs {
+        let (mut preferred, mut fallback) = SocketAddrs {
             iter: vec![v4_addr, v6_addr].into_iter(),
         }
         .split_by_preference(Some(ip_v4), Some(ip_v6));
         assert!(preferred.next().unwrap().is_ipv4());
         assert!(fallback.next().unwrap().is_ipv6());
 
-        let (mut preferred, mut fallback) = IpAddrs {
+        let (mut preferred, mut fallback) = SocketAddrs {
             iter: vec![v6_addr, v4_addr].into_iter(),
         }
         .split_by_preference(Some(ip_v4), Some(ip_v6));
         assert!(preferred.next().unwrap().is_ipv6());
         assert!(fallback.next().unwrap().is_ipv4());
 
-        let (mut preferred, fallback) = IpAddrs {
+        let (mut preferred, fallback) = SocketAddrs {
             iter: vec![v4_addr, v6_addr].into_iter(),
         }
         .split_by_preference(Some(ip_v4), None);
         assert!(preferred.next().unwrap().is_ipv4());
         assert!(fallback.is_empty());
 
-        let (mut preferred, fallback) = IpAddrs {
+        let (mut preferred, fallback) = SocketAddrs {
             iter: vec![v4_addr, v6_addr].into_iter(),
         }
         .split_by_preference(None, Some(ip_v6));
@@ -422,7 +422,7 @@
         let dst = ::http::Uri::from_static("http://[::1]:8080/");
 
         let mut addrs =
-            IpAddrs::try_parse(dst.host().expect("host"), dst.port_u16().expect("port"))
+            SocketAddrs::try_parse(dst.host().expect("host"), dst.port_u16().expect("port"))
                 .expect("try_parse");
 
         let expected = "[::1]:8080".parse::<SocketAddr>().expect("expected");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/connect/http.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/connect/http.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/connect/http.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/connect/http.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,9 +11,9 @@
 
 use futures_util::future::Either;
 use http::uri::{Scheme, Uri};
-use pin_project::pin_project;
-use tokio::net::TcpStream;
-use tokio::time::Delay;
+use pin_project_lite::pin_project;
+use tokio::net::{TcpSocket, TcpStream};
+use tokio::time::Sleep;
 
 use super::dns::{self, resolve, GaiResolver, Resolve};
 use super::{Connected, Connection};
@@ -27,6 +27,7 @@
 ///
 /// Sets the [`HttpInfo`](HttpInfo) value on responses, which includes
 /// transport information such as the remote socket address used.
+#[cfg_attr(docsrs, doc(cfg(feature = "tcp")))]
 #[derive(Clone)]
 pub struct HttpConnector<R = GaiResolver> {
     config: Arc<Config>,
@@ -271,98 +272,85 @@
     }
 }
 
-impl<R> HttpConnector<R>
-where
-    R: Resolve,
-{
-    async fn call_async(&mut self, dst: Uri) -> Result<TcpStream, ConnectError> {
-        trace!(
-            "Http::connect; scheme={:?}, host={:?}, port={:?}",
-            dst.scheme(),
-            dst.host(),
-            dst.port(),
-        );
-
-        if self.config.enforce_http {
-            if dst.scheme() != Some(&Scheme::HTTP) {
-                return Err(ConnectError {
-                    msg: INVALID_NOT_HTTP.into(),
-                    cause: None,
-                });
-            }
-        } else if dst.scheme().is_none() {
+fn get_host_port<'u>(config: &Config, dst: &'u Uri) -> Result<(&'u str, u16), ConnectError> {
+    trace!(
+        "Http::connect; scheme={:?}, host={:?}, port={:?}",
+        dst.scheme(),
+        dst.host(),
+        dst.port(),
+    );
+
+    if config.enforce_http {
+        if dst.scheme() != Some(&Scheme::HTTP) {
             return Err(ConnectError {
-                msg: INVALID_MISSING_SCHEME.into(),
+                msg: INVALID_NOT_HTTP.into(),
                 cause: None,
             });
         }
+    } else if dst.scheme().is_none() {
+        return Err(ConnectError {
+            msg: INVALID_MISSING_SCHEME.into(),
+            cause: None,
+        });
+    }
 
-        let host = match dst.host() {
-            Some(s) => s,
-            None => {
-                return Err(ConnectError {
-                    msg: INVALID_MISSING_HOST.into(),
-                    cause: None,
-                })
-            }
-        };
-        let port = match dst.port() {
-            Some(port) => port.as_u16(),
-            None => {
-                if dst.scheme() == Some(&Scheme::HTTPS) {
-                    443
-                } else {
-                    80
-                }
+    let host = match dst.host() {
+        Some(s) => s,
+        None => {
+            return Err(ConnectError {
+                msg: INVALID_MISSING_HOST.into(),
+                cause: None,
+            })
+        }
+    };
+    let port = match dst.port() {
+        Some(port) => port.as_u16(),
+        None => {
+            if dst.scheme() == Some(&Scheme::HTTPS) {
+                443
+            } else {
+                80
             }
-        };
+        }
+    };
+
+    Ok((host, port))
+}
 
+impl<R> HttpConnector<R>
+where
+    R: Resolve,
+{
+    async fn call_async(&mut self, dst: Uri) -> Result<TcpStream, ConnectError> {
         let config = &self.config;
 
+        let (host, port) = get_host_port(config, &dst)?;
+
         // If the host is already an IP addr (v4 or v6),
         // skip resolving the dns and start connecting right away.
-        let addrs = if let Some(addrs) = dns::IpAddrs::try_parse(host, port) {
+        let addrs = if let Some(addrs) = dns::SocketAddrs::try_parse(host, port) {
             addrs
         } else {
             let addrs = resolve(&mut self.resolver, dns::Name::new(host.into()))
                 .await
                 .map_err(ConnectError::dns)?;
-            let addrs = addrs.map(|addr| SocketAddr::new(addr, port)).collect();
-            dns::IpAddrs::new(addrs)
+            let addrs = addrs
+                .map(|mut addr| {
+                    addr.set_port(port);
+                    addr
+                })
+                .collect();
+            dns::SocketAddrs::new(addrs)
         };
 
-        let c = ConnectingTcp::new(
-            config.local_address_ipv4,
-            config.local_address_ipv6,
-            addrs,
-            config.connect_timeout,
-            config.happy_eyeballs_timeout,
-            config.reuse_address,
-        );
-
-        let sock = c
-            .connect()
-            .await
-            .map_err(ConnectError::m("tcp connect error"))?;
+        let c = ConnectingTcp::new(addrs, config);
 
-        if let Some(dur) = config.keep_alive_timeout {
-            sock.set_keepalive(Some(dur))
-                .map_err(ConnectError::m("tcp set_keepalive error"))?;
-        }
+        let sock = c.connect().await?;
 
-        if let Some(size) = config.send_buffer_size {
-            sock.set_send_buffer_size(size)
-                .map_err(ConnectError::m("tcp set_send_buffer_size error"))?;
+        if let Err(e) = sock.set_nodelay(config.nodelay) {
+            warn!("tcp set_nodelay error: {}", e);
         }
 
-        if let Some(size) = config.recv_buffer_size {
-            sock.set_recv_buffer_size(size)
-                .map_err(ConnectError::m("tcp set_recv_buffer_size error"))?;
-        }
-
-        sock.set_nodelay(config.nodelay)
-            .map_err(ConnectError::m("tcp set_nodelay error"))?;
-
         Ok(sock)
     }
 }
@@ -385,18 +373,19 @@
     }
 }
 
-// Not publicly exported (so missing_docs doesn't trigger).
-//
-// We return this `Future` instead of the `Pin<Box<dyn Future>>` directly
-// so that users don't rely on it fitting in a `Pin<Box<dyn Future>>` slot
-// (and thus we can change the type in the future).
-#[must_use = "futures do nothing unless polled"]
-#[pin_project]
-#[allow(missing_debug_implementations)]
-pub struct HttpConnecting<R> {
-    #[pin]
-    fut: BoxConnecting,
-    _marker: PhantomData<R>,
+pin_project! {
+    // Not publicly exported (so missing_docs doesn't trigger).
+    //
+    // We return this `Future` instead of the `Pin<Box<dyn Future>>` directly
+    // so that users don't rely on it fitting in a `Pin<Box<dyn Future>>` slot
+    // (and thus we can change the type in the future).
+    #[must_use = "futures do nothing unless polled"]
+    #[allow(missing_debug_implementations)]
+    pub struct HttpConnecting<R> {
+        #[pin]
+        fut: BoxConnecting,
+        _marker: PhantomData<R>,
+    }
 }
 
 type ConnectResult = Result<TcpStream, ConnectError>;
@@ -475,70 +464,55 @@
     }
 }
 
-struct ConnectingTcp {
-    local_addr_ipv4: Option<Ipv4Addr>,
-    local_addr_ipv6: Option<Ipv6Addr>,
+struct ConnectingTcp<'a> {
     preferred: ConnectingTcpRemote,
     fallback: Option<ConnectingTcpFallback>,
-    reuse_address: bool,
+    config: &'a Config,
 }
 
-impl ConnectingTcp {
-    fn new(
-        local_addr_ipv4: Option<Ipv4Addr>,
-        local_addr_ipv6: Option<Ipv6Addr>,
-        remote_addrs: dns::IpAddrs,
-        connect_timeout: Option<Duration>,
-        fallback_timeout: Option<Duration>,
-        reuse_address: bool,
-    ) -> ConnectingTcp {
-        if let Some(fallback_timeout) = fallback_timeout {
-            let (preferred_addrs, fallback_addrs) =
-                remote_addrs.split_by_preference(local_addr_ipv4, local_addr_ipv6);
+impl<'a> ConnectingTcp<'a> {
+    fn new(remote_addrs: dns::SocketAddrs, config: &'a Config) -> Self {
+        if let Some(fallback_timeout) = config.happy_eyeballs_timeout {
+            let (preferred_addrs, fallback_addrs) = remote_addrs
+                .split_by_preference(config.local_address_ipv4, config.local_address_ipv6);
             if fallback_addrs.is_empty() {
                 return ConnectingTcp {
-                    local_addr_ipv4,
-                    local_addr_ipv6,
-                    preferred: ConnectingTcpRemote::new(preferred_addrs, connect_timeout),
+                    preferred: ConnectingTcpRemote::new(preferred_addrs, config.connect_timeout),
                     fallback: None,
-                    reuse_address,
+                    config,
                 };
             }
 
             ConnectingTcp {
-                local_addr_ipv4,
-                local_addr_ipv6,
-                preferred: ConnectingTcpRemote::new(preferred_addrs, connect_timeout),
+                preferred: ConnectingTcpRemote::new(preferred_addrs, config.connect_timeout),
                 fallback: Some(ConnectingTcpFallback {
-                    delay: tokio::time::delay_for(fallback_timeout),
-                    remote: ConnectingTcpRemote::new(fallback_addrs, connect_timeout),
+                    delay: tokio::time::sleep(fallback_timeout),
+                    remote: ConnectingTcpRemote::new(fallback_addrs, config.connect_timeout),
                 }),
-                reuse_address,
+                config,
             }
         } else {
             ConnectingTcp {
-                local_addr_ipv4,
-                local_addr_ipv6,
-                preferred: ConnectingTcpRemote::new(remote_addrs, connect_timeout),
+                preferred: ConnectingTcpRemote::new(remote_addrs, config.connect_timeout),
                 fallback: None,
-                reuse_address,
+                config,
             }
         }
     }
 }
 
 struct ConnectingTcpFallback {
-    delay: Delay,
+    delay: Sleep,
     remote: ConnectingTcpRemote,
 }
 
 struct ConnectingTcpRemote {
-    addrs: dns::IpAddrs,
+    addrs: dns::SocketAddrs,
     connect_timeout: Option<Duration>,
 }
 
 impl ConnectingTcpRemote {
-    fn new(addrs: dns::IpAddrs, connect_timeout: Option<Duration>) -> Self {
+    fn new(addrs: dns::SocketAddrs, connect_timeout: Option<Duration>) -> Self {
         let connect_timeout = connect_timeout.map(|t| t / (addrs.len() as u32));
 
         Self {
@@ -549,24 +523,11 @@
 }
 
 impl ConnectingTcpRemote {
-    async fn connect(
-        &mut self,
-        local_addr_ipv4: &Option<Ipv4Addr>,
-        local_addr_ipv6: &Option<Ipv6Addr>,
-        reuse_address: bool,
-    ) -> io::Result<TcpStream> {
+    async fn connect(&mut self, config: &Config) -> Result<TcpStream, ConnectError> {
         let mut err = None;
         for addr in &mut self.addrs {
             debug!("connecting to {}", addr);
-            match connect(
-                &addr,
-                local_addr_ipv4,
-                local_addr_ipv6,
-                reuse_address,
-                self.connect_timeout,
-            )?
-            .await
-            {
+            match connect(&addr, config, self.connect_timeout)?.await {
                 Ok(tcp) => {
                     debug!("connected to {}", addr);
                     return Ok(tcp);
@@ -580,9 +541,9 @@
 
         match err {
             Some(e) => Err(e),
-            None => Err(std::io::Error::new(
-                std::io::ErrorKind::NotConnected,
-                "Network unreachable",
+            None => Err(ConnectError::new(
+                "tcp connect error",
+                std::io::Error::new(std::io::ErrorKind::NotConnected, "Network unreachable"),
             )),
         }
     }
@@ -618,30 +579,79 @@
 
 fn connect(
     addr: &SocketAddr,
-    local_addr_ipv4: &Option<Ipv4Addr>,
-    local_addr_ipv6: &Option<Ipv6Addr>,
-    reuse_address: bool,
+    config: &Config,
     connect_timeout: Option<Duration>,
-) -> io::Result<impl Future<Output = io::Result<TcpStream>>> {
-    use socket2::{Domain, Protocol, Socket, Type};
-    let domain = match *addr {
-        SocketAddr::V4(_) => Domain::ipv4(),
-        SocketAddr::V6(_) => Domain::ipv6(),
+) -> Result<impl Future<Output = Result<TcpStream, ConnectError>>, ConnectError> {
+    // TODO(eliza): if Tokio's `TcpSocket` gains support for setting the
+    // keepalive timeout, it would be nice to use that instead of socket2,
+    // and avoid the unsafe `into_raw_fd`/`from_raw_fd` dance...
+    use socket2::{Domain, Protocol, Socket, TcpKeepalive, Type};
+    use std::convert::TryInto;
+
+    let domain = Domain::for_address(*addr);
+    let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))
+        .map_err(ConnectError::m("tcp open error"))?;
+
+    // When constructing a Tokio `TcpSocket` from a raw fd/socket, the user is
+    // responsible for ensuring O_NONBLOCK is set.
+    socket
+        .set_nonblocking(true)
+        .map_err(ConnectError::m("tcp set_nonblocking error"))?;
+
+    if let Some(dur) = config.keep_alive_timeout {
+        let conf = TcpKeepalive::new().with_time(dur);
+        if let Err(e) = socket.set_tcp_keepalive(&conf) {
+            warn!("tcp set_keepalive error: {}", e);
+        }
+    }
+
+    bind_local_address(
+        &socket,
+        addr,
+        &config.local_address_ipv4,
+        &config.local_address_ipv6,
+    )
+    .map_err(ConnectError::m("tcp bind local error"))?;
+
+    #[cfg(unix)]
+    let socket = unsafe {
+        // Safety: `from_raw_fd` is only safe to call if ownership of the raw
+        // file descriptor is transferred. Since we call `into_raw_fd` on the
+        // socket2 socket, it gives up ownership of the fd and will not close
+        // it, so this is safe.
+        use std::os::unix::io::{FromRawFd, IntoRawFd};
+        TcpSocket::from_raw_fd(socket.into_raw_fd())
+    };
+    #[cfg(windows)]
+    let socket = unsafe {
+        // Safety: `from_raw_socket` is only safe to call if ownership of the raw
+        // Windows SOCKET is transferred. Since we call `into_raw_socket` on the
+        // socket2 socket, it gives up ownership of the SOCKET and will not close
+        // it, so this is safe.
+        use std::os::windows::io::{FromRawSocket, IntoRawSocket};
+        TcpSocket::from_raw_socket(socket.into_raw_socket())
     };
-    let socket = Socket::new(domain, Type::stream(), Some(Protocol::tcp()))?;
 
-    if reuse_address {
-        socket.set_reuse_address(true)?;
+    if config.reuse_address {
+        if let Err(e) = socket.set_reuseaddr(true) {
+            warn!("tcp set_reuse_address error: {}", e);
+        }
     }
 
-    bind_local_address(&socket, addr, local_addr_ipv4, local_addr_ipv6)?;
-
-    let addr = *addr;
+    if let Some(size) = config.send_buffer_size {
+        if let Err(e) = socket.set_send_buffer_size(size.try_into().unwrap_or(std::u32::MAX)) {
+            warn!("tcp set_buffer_size error: {}", e);
+        }
+    }
 
-    let std_tcp = socket.into_tcp_stream();
+    if let Some(size) = config.recv_buffer_size {
+        if let Err(e) = socket.set_recv_buffer_size(size.try_into().unwrap_or(std::u32::MAX)) {
+            warn!("tcp set_recv_buffer_size error: {}", e);
+        }
+    }
 
+    let connect = socket.connect(*addr);
     Ok(async move {
-        let connect = TcpStream::connect_std(std_tcp, &addr);
         match connect_timeout {
             Some(dur) => match tokio::time::timeout(dur, connect).await {
                 Ok(Ok(s)) => Ok(s),
@@ -650,37 +660,26 @@
             },
             None => connect.await,
         }
+        .map_err(ConnectError::m("tcp connect error"))
     })
 }
 
-impl ConnectingTcp {
-    async fn connect(mut self) -> io::Result<TcpStream> {
-        let Self {
-            ref local_addr_ipv4,
-            ref local_addr_ipv6,
-            reuse_address,
-            ..
-        } = self;
+impl ConnectingTcp<'_> {
+    async fn connect(mut self) -> Result<TcpStream, ConnectError> {
         match self.fallback {
-            None => {
-                self.preferred
-                    .connect(local_addr_ipv4, local_addr_ipv6, reuse_address)
-                    .await
-            }
+            None => self.preferred.connect(self.config).await,
             Some(mut fallback) => {
-                let preferred_fut =
-                    self.preferred
-                        .connect(local_addr_ipv4, local_addr_ipv6, reuse_address);
+                let preferred_fut = self.preferred.connect(self.config);
                 futures_util::pin_mut!(preferred_fut);
 
-                let fallback_fut =
-                    fallback
-                        .remote
-                        .connect(local_addr_ipv4, local_addr_ipv6, reuse_address);
+                let fallback_fut = fallback.remote.connect(self.config);
                 futures_util::pin_mut!(fallback_fut);
 
+                let fallback_delay = fallback.delay;
+                futures_util::pin_mut!(fallback_delay);
+
                 let (result, future) =
-                    match futures_util::future::select(preferred_fut, fallback.delay).await {
+                    match futures_util::future::select(preferred_fut, fallback_delay).await {
                         Either::Left((result, _fallback_delay)) => {
                             (result, Either::Right(fallback_fut))
                         }
@@ -711,7 +710,7 @@
     use ::http::Uri;
 
     use super::super::sealed::{Connect, ConnectSvc};
-    use super::HttpConnector;
+    use super::{Config, ConnectError, HttpConnector};
 
     async fn connect<C>(
         connector: C,
@@ -739,7 +738,7 @@
         let mut ip_v4 = None;
         let mut ip_v6 = None;
 
-        let ips = pnet::datalink::interfaces()
+        let ips = pnet_datalink::interfaces()
             .into_iter()
             .flat_map(|i| i.ips.into_iter().map(|n| n.ip()));
 
@@ -773,6 +772,7 @@
     #[tokio::test]
     async fn local_address() {
         use std::net::{IpAddr, TcpListener};
+        let _ = pretty_env_logger::try_init();
 
         let (bind_ip_v4, bind_ip_v6) = get_local_ips();
         let server4 = TcpListener::bind("127.0.0.1:0").unwrap();
@@ -818,10 +818,8 @@
         let server4 = TcpListener::bind("127.0.0.1:0").unwrap();
         let addr = server4.local_addr().unwrap();
         let _server6 = TcpListener::bind(&format!("[::1]:{}", addr.port())).unwrap();
-        let mut rt = tokio::runtime::Builder::new()
-            .enable_io()
-            .enable_time()
-            .basic_scheduler()
+        let rt = tokio::runtime::Builder::new_current_thread()
+            .enable_all()
             .build()
             .unwrap();
 
@@ -925,16 +923,21 @@
                         .iter()
                         .map(|host| (host.clone(), addr.port()).into())
                         .collect();
-                    let connecting_tcp = ConnectingTcp::new(
-                        None,
-                        None,
-                        dns::IpAddrs::new(addrs),
-                        None,
-                        Some(fallback_timeout),
-                        false,
-                    );
+                    let cfg = Config {
+                        local_address_ipv4: None,
+                        local_address_ipv6: None,
+                        connect_timeout: None,
+                        keep_alive_timeout: None,
+                        happy_eyeballs_timeout: Some(fallback_timeout),
+                        nodelay: false,
+                        reuse_address: false,
+                        enforce_http: false,
+                        send_buffer_size: None,
+                        recv_buffer_size: None,
+                    };
+                    let connecting_tcp = ConnectingTcp::new(dns::SocketAddrs::new(addrs), &cfg);
                     let start = Instant::now();
-                    Ok::<_, io::Error>((start, connecting_tcp.connect().await?))
+                    Ok::<_, ConnectError>((start, ConnectingTcp::connect(connecting_tcp).await?))
                 })
                 .unwrap();
             let res = if stream.peer_addr().unwrap().is_ipv4() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/connect/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/connect/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/connect/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/connect/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -83,13 +83,20 @@
 
 use ::http::Extensions;
 
-#[cfg(feature = "tcp")]
-pub mod dns;
-#[cfg(feature = "tcp")]
-mod http;
-#[cfg(feature = "tcp")]
-pub use self::http::{HttpConnector, HttpInfo};
-pub use self::sealed::Connect;
+cfg_feature! {
+    #![feature = "tcp"]
+
+    pub use self::http::{HttpConnector, HttpInfo};
+
+    pub mod dns;
+    mod http;
+}
+
+cfg_feature! {
+    #![any(feature = "http1", feature = "http2")]
+
+    pub use self::sealed::Connect;
+}
 
 /// Describes a type returned by a connector.
 pub trait Connection {
@@ -184,6 +191,7 @@
 
     // Don't public expose that `Connected` is `Clone`, unsure if we want to
     // keep that contract...
+    #[cfg(feature = "http2")]
     pub(super) fn clone(&self) -> Connected {
         Connected {
             alpn: self.alpn.clone(),
@@ -259,6 +267,7 @@
     }
 }
 
+#[cfg(any(feature = "http1", feature = "http2"))]
 pub(super) mod sealed {
     use std::error::Error as StdError;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/conn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/conn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/conn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/conn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,36 +7,102 @@
 //!
 //! If don't have need to manage connections yourself, consider using the
 //! higher-level [Client](super) API.
+//!
+//! ## Example
+//! A simple example that uses the `SendRequest` struct to talk HTTP over a Tokio TCP stream
+//! ```no_run
+//! # #[cfg(all(feature = "client", feature = "http1", feature = "runtime"))]
+//! # mod rt {
+//! use http::{Request, StatusCode};
+//! use hyper::{client::conn::Builder, Body};
+//! use tokio::net::TcpStream;
+//!
+//! #[tokio::main]
+//! async fn main() -> Result<(), Box<dyn std::error::Error>> {
+//!     let target_stream = TcpStream::connect("example.com:80").await?;
+//!
+//!     let (mut request_sender, connection) = Builder::new()
+//!         .handshake::<TcpStream, Body>(target_stream)
+//!         .await?;
+//!
+//!     // spawn a task to poll the connection and drive the HTTP state
+//!     tokio::spawn(async move {
+//!         if let Err(e) = connection.await {
+//!             eprintln!("Error in connection: {}", e);
+//!         }
+//!     });
+//!
+//!     let request = Request::builder()
+//!     // We need to manually add the host header because SendRequest does not
+//!         .header("Host", "example.com")
+//!         .method("GET")
+//!         .body(Body::from(""))?;
+//!
+//!     let response = request_sender.send_request(request).await?;
+//!     assert!(response.status() == StatusCode::OK);
+//!     Ok(())
+//! }
+//!
+//! # }
+//! ```
 
 use std::error::Error as StdError;
 use std::fmt;
-use std::mem;
+#[cfg(not(all(feature = "http1", feature = "http2")))]
+use std::marker::PhantomData;
 use std::sync::Arc;
-#[cfg(feature = "runtime")]
+#[cfg(all(feature = "runtime", feature = "http2"))]
 use std::time::Duration;
 
 use bytes::Bytes;
 use futures_util::future::{self, Either, FutureExt as _};
-use pin_project::pin_project;
+use httparse::ParserConfig;
+use pin_project_lite::pin_project;
 use tokio::io::{AsyncRead, AsyncWrite};
 use tower_service::Service;
 
 use super::dispatch;
 use crate::body::HttpBody;
-use crate::common::{task, BoxSendFuture, Exec, Executor, Future, Pin, Poll};
+#[cfg(not(all(feature = "http1", feature = "http2")))]
+use crate::common::Never;
+use crate::common::{
+    exec::{BoxSendFuture, Exec},
+    task, Future, Pin, Poll,
+};
 use crate::proto;
+use crate::rt::Executor;
+#[cfg(feature = "http1")]
 use crate::upgrade::Upgraded;
 use crate::{Body, Request, Response};
 
-type Http1Dispatcher<T, B, R> = proto::dispatch::Dispatcher<proto::dispatch::Client<B>, B, T, R>;
-
-#[pin_project(project = ProtoClientProj)]
-enum ProtoClient<T, B>
-where
-    B: HttpBody,
-{
-    H1(#[pin] Http1Dispatcher<T, B, proto::h1::ClientTransaction>),
-    H2(#[pin] proto::h2::ClientTask<B>),
+#[cfg(feature = "http1")]
+type Http1Dispatcher<T, B> =
+    proto::dispatch::Dispatcher<proto::dispatch::Client<B>, B, T, proto::h1::ClientTransaction>;
+
+#[cfg(not(feature = "http1"))]
+type Http1Dispatcher<T, B> = (Never, PhantomData<(T, Pin<Box<B>>)>);
+
+#[cfg(feature = "http2")]
+type Http2ClientTask<B> = proto::h2::ClientTask<B>;
+
+#[cfg(not(feature = "http2"))]
+type Http2ClientTask<B> = (Never, PhantomData<Pin<Box<B>>>);
+
+pin_project! {
+    #[project = ProtoClientProj]
+    enum ProtoClient<T, B>
+    where
+        B: HttpBody,
+    {
+        H1 {
+            #[pin]
+            h1: Http1Dispatcher<T, B>,
+        },
+        H2 {
+            #[pin]
+            h2: Http2ClientTask<B>,
+        },
+    }
 }
 
 /// Returns a handshake future over some IO.
@@ -75,12 +141,25 @@
 #[derive(Clone, Debug)]
 pub struct Builder {
     pub(super) exec: Exec,
-    h1_writev: Option<bool>,
+    h09_responses: bool,
+    h1_parser_config: ParserConfig,
     h1_title_case_headers: bool,
+    h1_preserve_header_case: bool,
     h1_read_buf_exact_size: Option<usize>,
     h1_max_buf_size: Option<usize>,
-    http2: bool,
+    #[cfg(feature = "ffi")]
+    h1_headers_raw: bool,
+    #[cfg(feature = "http2")]
     h2_builder: proto::h2::client::Config,
+    version: Proto,
+}
+
+#[derive(Clone, Debug)]
+enum Proto {
+    #[cfg(feature = "http1")]
+    Http1,
+    #[cfg(feature = "http2")]
+    Http2,
 }
 
 /// A future returned by `SendRequest::send_request`.
@@ -122,6 +201,7 @@
 // A `SendRequest` that can be cloned to send HTTP2 requests.
 // private for now, probably not a great idea of a type...
 #[must_use = "futures do nothing unless polled"]
+#[cfg(feature = "http2")]
 pub(super) struct Http2SendRequest<B> {
     dispatch: dispatch::UnboundedSender<Request<B>, Response<Body>>,
 }
@@ -136,12 +216,13 @@
         self.dispatch.poll_ready(cx)
     }
 
-    pub(super) fn when_ready(self) -> impl Future<Output = crate::Result<Self>> {
+    pub(super) async fn when_ready(self) -> crate::Result<Self> {
         let mut me = Some(self);
         future::poll_fn(move |cx| {
             ready!(me.as_mut().unwrap().poll_ready(cx))?;
             Poll::Ready(Ok(me.take().unwrap()))
         })
+        .await
     }
 
     pub(super) fn is_ready(&self) -> bool {
@@ -152,6 +233,7 @@
         self.dispatch.is_closed()
     }
 
+    #[cfg(feature = "http2")]
     pub(super) fn into_http2(self) -> Http2SendRequest<B> {
         Http2SendRequest {
             dispatch: self.dispatch.unbound(),
@@ -217,7 +299,7 @@
         ResponseFuture { inner }
     }
 
-    pub(crate) fn send_request_retryable(
+    pub(super) fn send_request_retryable(
         &mut self,
         req: Request<B>,
     ) -> impl Future<Output = Result<Response<Body>, (crate::Error, Option<Request<B>>)>> + Unpin
@@ -269,6 +351,7 @@
 
 // ===== impl Http2SendRequest
 
+#[cfg(feature = "http2")]
 impl<B> Http2SendRequest<B> {
     pub(super) fn is_ready(&self) -> bool {
         self.dispatch.is_ready()
@@ -279,6 +362,7 @@
     }
 }
 
+#[cfg(feature = "http2")]
 impl<B> Http2SendRequest<B>
 where
     B: HttpBody + 'static,
@@ -310,12 +394,14 @@
     }
 }
 
+#[cfg(feature = "http2")]
 impl<B> fmt::Debug for Http2SendRequest<B> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Http2SendRequest").finish()
     }
 }
 
+#[cfg(feature = "http2")]
 impl<B> Clone for Http2SendRequest<B> {
     fn clone(&self) -> Self {
         Http2SendRequest {
@@ -337,17 +423,22 @@
     ///
     /// Only works for HTTP/1 connections. HTTP/2 connections will panic.
     pub fn into_parts(self) -> Parts<T> {
-        let (io, read_buf, _) = match self.inner.expect("already upgraded") {
-            ProtoClient::H1(h1) => h1.into_inner(),
-            ProtoClient::H2(_h2) => {
+        match self.inner.expect("already upgraded") {
+            #[cfg(feature = "http1")]
+            ProtoClient::H1 { h1 } => {
+                let (io, read_buf, _) = h1.into_inner();
+                Parts {
+                    io,
+                    read_buf,
+                    _inner: (),
+                }
+            }
+            ProtoClient::H2 { .. } => {
                 panic!("http2 cannot into_inner");
             }
-        };
 
-        Parts {
-            io,
-            read_buf,
-            _inner: (),
+            #[cfg(not(feature = "http1"))]
+            ProtoClient::H1 { h1 } => match h1.0 {},
         }
     }
 
@@ -364,8 +455,15 @@
     /// to work with this function; or use the `without_shutdown` wrapper.
     pub fn poll_without_shutdown(&mut self, cx: &mut task::Context<'_>) -> Poll<crate::Result<()>> {
         match *self.inner.as_mut().expect("already upgraded") {
-            ProtoClient::H1(ref mut h1) => h1.poll_without_shutdown(cx),
-            ProtoClient::H2(ref mut h2) => Pin::new(h2).poll(cx).map_ok(|_| ()),
+            #[cfg(feature = "http1")]
+            ProtoClient::H1 { ref mut h1 } => h1.poll_without_shutdown(cx),
+            #[cfg(feature = "http2")]
+            ProtoClient::H2 { ref mut h2, .. } => Pin::new(h2).poll(cx).map_ok(|_| ()),
+
+            #[cfg(not(feature = "http1"))]
+            ProtoClient::H1 { ref mut h1 } => match h1.0 {},
+            #[cfg(not(feature = "http2"))]
+            ProtoClient::H2 { ref mut h2, .. } => match h2.0 {},
         }
     }
 
@@ -392,16 +490,18 @@
     fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
         match ready!(Pin::new(self.inner.as_mut().unwrap()).poll(cx))? {
             proto::Dispatched::Shutdown => Poll::Ready(Ok(())),
-            proto::Dispatched::Upgrade(pending) => {
-                let h1 = match mem::replace(&mut self.inner, None) {
-                    Some(ProtoClient::H1(h1)) => h1,
-                    _ => unreachable!("Upgrade expects h1"),
-                };
-
-                let (io, buf, _) = h1.into_inner();
-                pending.fulfill(Upgraded::new(io, buf));
-                Poll::Ready(Ok(()))
-            }
+            #[cfg(feature = "http1")]
+            proto::Dispatched::Upgrade(pending) => match self.inner.take() {
+                Some(ProtoClient::H1 { h1 }) => {
+                    let (io, buf, _) = h1.into_inner();
+                    pending.fulfill(Upgraded::new(io, buf));
+                    Poll::Ready(Ok(()))
+                }
+                _ => {
+                    drop(pending);
+                    unreachable!("Upgrade expects h1");
+                }
+            },
         }
     }
 }
@@ -424,12 +524,20 @@
     pub fn new() -> Builder {
         Builder {
             exec: Exec::Default,
-            h1_writev: None,
+            h09_responses: false,
             h1_read_buf_exact_size: None,
+            h1_parser_config: Default::default(),
             h1_title_case_headers: false,
+            h1_preserve_header_case: false,
             h1_max_buf_size: None,
-            http2: false,
+            #[cfg(feature = "ffi")]
+            h1_headers_raw: false,
+            #[cfg(feature = "http2")]
             h2_builder: Default::default(),
+            #[cfg(feature = "http1")]
+            version: Proto::Http1,
+            #[cfg(not(feature = "http1"))]
+            version: Proto::Http2,
         }
     }
 
@@ -442,23 +550,87 @@
         self
     }
 
-    pub(super) fn h1_writev(&mut self, enabled: bool) -> &mut Builder {
-        self.h1_writev = Some(enabled);
+    /// Set whether HTTP/0.9 responses should be tolerated.
+    ///
+    /// Default is false.
+    pub fn http09_responses(&mut self, enabled: bool) -> &mut Builder {
+        self.h09_responses = enabled;
+        self
+    }
+
+    /// Set whether HTTP/1 connections will accept spaces between header names
+    /// and the colon that follow them in responses.
+    ///
+    /// You probably don't need this, here is what [RFC 7230 Section 3.2.4.] has
+    /// to say about it:
+    ///
+    /// > No whitespace is allowed between the header field-name and colon. In
+    /// > the past, differences in the handling of such whitespace have led to
+    /// > security vulnerabilities in request routing and response handling. A
+    /// > server MUST reject any received request message that contains
+    /// > whitespace between a header field-name and colon with a response code
+    /// > of 400 (Bad Request). A proxy MUST remove any such whitespace from a
+    /// > response message before forwarding the message downstream.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    ///
+    /// [RFC 7230 Section 3.2.4.]: https://tools.ietf.org/html/rfc7230#section-3.2.4
+    pub fn http1_allow_spaces_after_header_name_in_responses(
+        &mut self,
+        enabled: bool,
+    ) -> &mut Builder {
+        self.h1_parser_config
+            .allow_spaces_after_header_name_in_responses(enabled);
         self
     }
 
-    pub(super) fn h1_title_case_headers(&mut self, enabled: bool) -> &mut Builder {
+    /// Set whether HTTP/1 connections will write header names as title case at
+    /// the socket level.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    pub fn http1_title_case_headers(&mut self, enabled: bool) -> &mut Builder {
         self.h1_title_case_headers = enabled;
         self
     }
 
-    pub(super) fn h1_read_buf_exact_size(&mut self, sz: Option<usize>) -> &mut Builder {
+    /// Set whether HTTP/1 connections will write header names as provided
+    /// at the socket level.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    pub fn http1_preserve_header_case(&mut self, enabled: bool) -> &mut Builder {
+        self.h1_preserve_header_case = enabled;
+        self
+    }
+
+    /// Sets the exact size of the read buffer to *always* use.
+    ///
+    /// Note that setting this option unsets the `http1_max_buf_size` option.
+    ///
+    /// Default is an adaptive read buffer.
+    pub fn http1_read_buf_exact_size(&mut self, sz: Option<usize>) -> &mut Builder {
         self.h1_read_buf_exact_size = sz;
         self.h1_max_buf_size = None;
         self
     }
 
-    pub(super) fn h1_max_buf_size(&mut self, max: usize) -> &mut Self {
+    /// Set the maximum buffer size for the connection.
+    ///
+    /// Default is ~400kb.
+    ///
+    /// Note that setting this option unsets the `http1_read_exact_buf_size` option.
+    ///
+    /// # Panics
+    ///
+    /// The minimum value allowed is 8192. This method panics if the passed `max` is less than the minimum.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_max_buf_size(&mut self, max: usize) -> &mut Self {
         assert!(
             max >= proto::h1::MINIMUM_MAX_BUFFER_SIZE,
             "the max_buf_size cannot be smaller than the minimum that h1 specifies."
@@ -469,11 +641,21 @@
         self
     }
 
+    #[cfg(feature = "ffi")]
+    pub(crate) fn http1_headers_raw(&mut self, enabled: bool) -> &mut Self {
+        self.h1_headers_raw = enabled;
+        self
+    }
+
     /// Sets whether HTTP2 is required.
     ///
     /// Default is false.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_only(&mut self, enabled: bool) -> &mut Builder {
-        self.http2 = enabled;
+        if enabled {
+            self.version = Proto::Http2
+        }
         self
     }
 
@@ -485,6 +667,8 @@
     /// If not set, hyper will use a default.
     ///
     /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_initial_stream_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
         if let Some(sz) = sz.into() {
             self.h2_builder.adaptive_window = false;
@@ -498,6 +682,8 @@
     /// Passing `None` will do nothing.
     ///
     /// If not set, hyper will use a default.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_initial_connection_window_size(
         &mut self,
         sz: impl Into<Option<u32>>,
@@ -514,6 +700,8 @@
     /// Enabling this will override the limits set in
     /// `http2_initial_stream_window_size` and
     /// `http2_initial_connection_window_size`.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_adaptive_window(&mut self, enabled: bool) -> &mut Self {
         use proto::h2::SPEC_WINDOW_SIZE;
 
@@ -530,6 +718,8 @@
     /// Passing `None` will do nothing.
     ///
     /// If not set, hyper will use a default.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_max_frame_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
         if let Some(sz) = sz.into() {
             self.h2_builder.max_frame_size = sz;
@@ -548,6 +738,8 @@
     ///
     /// Requires the `runtime` cargo feature to be enabled.
     #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_keep_alive_interval(
         &mut self,
         interval: impl Into<Option<Duration>>,
@@ -567,6 +759,8 @@
     ///
     /// Requires the `runtime` cargo feature to be enabled.
     #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_keep_alive_timeout(&mut self, timeout: Duration) -> &mut Self {
         self.h2_builder.keep_alive_timeout = timeout;
         self
@@ -585,11 +779,28 @@
     ///
     /// Requires the `runtime` cargo feature to be enabled.
     #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_keep_alive_while_idle(&mut self, enabled: bool) -> &mut Self {
         self.h2_builder.keep_alive_while_idle = enabled;
         self
     }
 
+    /// Sets the maximum number of HTTP2 concurrent locally reset streams.
+    ///
+    /// See the documentation of [`h2::client::Builder::max_concurrent_reset_streams`] for more
+    /// details.
+    ///
+    /// The default value is determined by the `h2` crate.
+    ///
+    /// [`h2::client::Builder::max_concurrent_reset_streams`]: https://docs.rs/h2/client/struct.Builder.html#method.max_concurrent_reset_streams
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_max_concurrent_reset_streams(&mut self, max: usize) -> &mut Self {
+        self.h2_builder.max_concurrent_reset_streams = Some(max);
+        self
+    }
+
     /// Constructs a connection with the configured options and IO.
     pub fn handshake<T, B>(
         &self,
@@ -604,34 +815,44 @@
         let opts = self.clone();
 
         async move {
-            trace!("client handshake HTTP/{}", if opts.http2 { 2 } else { 1 });
+            trace!("client handshake {:?}", opts.version);
 
             let (tx, rx) = dispatch::channel();
-            let proto = if !opts.http2 {
-                let mut conn = proto::Conn::new(io);
-                if let Some(writev) = opts.h1_writev {
-                    if writev {
-                        conn.set_write_strategy_queue();
-                    } else {
-                        conn.set_write_strategy_flatten();
+            let proto = match opts.version {
+                #[cfg(feature = "http1")]
+                Proto::Http1 => {
+                    let mut conn = proto::Conn::new(io);
+                    conn.set_h1_parser_config(opts.h1_parser_config);
+                    if opts.h1_title_case_headers {
+                        conn.set_title_case_headers();
                     }
+                    if opts.h1_preserve_header_case {
+                        conn.set_preserve_header_case();
+                    }
+                    if opts.h09_responses {
+                        conn.set_h09_responses();
+                    }
+
+                    #[cfg(feature = "ffi")]
+                    conn.set_raw_headers(opts.h1_headers_raw);
+
+                    if let Some(sz) = opts.h1_read_buf_exact_size {
+                        conn.set_read_buf_exact_size(sz);
+                    }
+                    if let Some(max) = opts.h1_max_buf_size {
+                        conn.set_max_buf_size(max);
+                    }
+                    let cd = proto::h1::dispatch::Client::new(rx);
+                    let dispatch = proto::h1::Dispatcher::new(cd, conn);
+                    ProtoClient::H1 { h1: dispatch }
                 }
-                if opts.h1_title_case_headers {
-                    conn.set_title_case_headers();
-                }
-                if let Some(sz) = opts.h1_read_buf_exact_size {
-                    conn.set_read_buf_exact_size(sz);
-                }
-                if let Some(max) = opts.h1_max_buf_size {
-                    conn.set_max_buf_size(max);
+                #[cfg(feature = "http2")]
+                Proto::Http2 => {
+                    let h2 =
+                        proto::h2::client::handshake(io, rx, &opts.h2_builder, opts.exec.clone())
+                            .await?;
+                    ProtoClient::H2 { h2 }
                 }
-                let cd = proto::h1::dispatch::Client::new(rx);
-                let dispatch = proto::h1::Dispatcher::new(cd, conn);
-                ProtoClient::H1(dispatch)
-            } else {
-                let h2 = proto::h2::client::handshake(io, rx, &opts.h2_builder, opts.exec.clone())
-                    .await?;
-                ProtoClient::H2(h2)
             };
 
             Ok((
@@ -683,8 +904,15 @@
 
     fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
         match self.project() {
-            ProtoClientProj::H1(c) => c.poll(cx),
-            ProtoClientProj::H2(c) => c.poll(cx),
+            #[cfg(feature = "http1")]
+            ProtoClientProj::H1 { h1 } => h1.poll(cx),
+            #[cfg(feature = "http2")]
+            ProtoClientProj::H2 { h2, .. } => h2.poll(cx),
+
+            #[cfg(not(feature = "http1"))]
+            ProtoClientProj::H1 { h1 } => match h1.0 {},
+            #[cfg(not(feature = "http2"))]
+            ProtoClientProj::H2 { h2, .. } => match h2.0 {},
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/dispatch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/dispatch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/dispatch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/dispatch.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,17 @@
-use futures_util::future;
+#[cfg(feature = "http2")]
+use std::future::Future;
+
+use futures_util::FutureExt;
 use tokio::sync::{mpsc, oneshot};
 
-use crate::common::{task, Future, Pin, Poll};
+#[cfg(feature = "http2")]
+use crate::common::Pin;
+use crate::common::{task, Poll};
 
-pub type RetryPromise<T, U> = oneshot::Receiver<Result<U, (crate::Error, Option<T>)>>;
-pub type Promise<T> = oneshot::Receiver<Result<T, crate::Error>>;
+pub(crate) type RetryPromise<T, U> = oneshot::Receiver<Result<U, (crate::Error, Option<T>)>>;
+pub(crate) type Promise<T> = oneshot::Receiver<Result<T, crate::Error>>;
 
-pub fn channel<T, U>() -> (Sender<T, U>, Receiver<T, U>) {
+pub(crate) fn channel<T, U>() -> (Sender<T, U>, Receiver<T, U>) {
     let (tx, rx) = mpsc::unbounded_channel();
     let (giver, taker) = want::new();
     let tx = Sender {
@@ -22,7 +27,7 @@
 ///
 /// While the inner sender is unbounded, the Giver is used to determine
 /// if the Receiver is ready for another request.
-pub struct Sender<T, U> {
+pub(crate) struct Sender<T, U> {
     /// One message is always allowed, even if the Receiver hasn't asked
     /// for it yet. This boolean keeps track of whether we've sent one
     /// without notice.
@@ -40,24 +45,25 @@
 ///
 /// Cannot poll the Giver, but can still use it to determine if the Receiver
 /// has been dropped. However, this version can be cloned.
-pub struct UnboundedSender<T, U> {
+#[cfg(feature = "http2")]
+pub(crate) struct UnboundedSender<T, U> {
     /// Only used for `is_closed`, since mpsc::UnboundedSender cannot be checked.
     giver: want::SharedGiver,
     inner: mpsc::UnboundedSender<Envelope<T, U>>,
 }
 
 impl<T, U> Sender<T, U> {
-    pub fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<crate::Result<()>> {
+    pub(crate) fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<crate::Result<()>> {
         self.giver
             .poll_want(cx)
             .map_err(|_| crate::Error::new_closed())
     }
 
-    pub fn is_ready(&self) -> bool {
+    pub(crate) fn is_ready(&self) -> bool {
         self.giver.is_wanting()
     }
 
-    pub fn is_closed(&self) -> bool {
+    pub(crate) fn is_closed(&self) -> bool {
         self.giver.is_canceled()
     }
 
@@ -74,7 +80,7 @@
         }
     }
 
-    pub fn try_send(&mut self, val: T) -> Result<RetryPromise<T, U>, T> {
+    pub(crate) fn try_send(&mut self, val: T) -> Result<RetryPromise<T, U>, T> {
         if !self.can_send() {
             return Err(val);
         }
@@ -85,7 +91,7 @@
             .map_err(|mut e| (e.0).0.take().expect("envelope not dropped").0)
     }
 
-    pub fn send(&mut self, val: T) -> Result<Promise<U>, T> {
+    pub(crate) fn send(&mut self, val: T) -> Result<Promise<U>, T> {
         if !self.can_send() {
             return Err(val);
         }
@@ -96,7 +102,8 @@
             .map_err(|mut e| (e.0).0.take().expect("envelope not dropped").0)
     }
 
-    pub fn unbound(self) -> UnboundedSender<T, U> {
+    #[cfg(feature = "http2")]
+    pub(crate) fn unbound(self) -> UnboundedSender<T, U> {
         UnboundedSender {
             giver: self.giver.shared(),
             inner: self.inner,
@@ -104,16 +111,17 @@
     }
 }
 
+#[cfg(feature = "http2")]
 impl<T, U> UnboundedSender<T, U> {
-    pub fn is_ready(&self) -> bool {
+    pub(crate) fn is_ready(&self) -> bool {
         !self.giver.is_canceled()
     }
 
-    pub fn is_closed(&self) -> bool {
+    pub(crate) fn is_closed(&self) -> bool {
         self.giver.is_canceled()
     }
 
-    pub fn try_send(&mut self, val: T) -> Result<RetryPromise<T, U>, T> {
+    pub(crate) fn try_send(&mut self, val: T) -> Result<RetryPromise<T, U>, T> {
         let (tx, rx) = oneshot::channel();
         self.inner
             .send(Envelope(Some((val, Callback::Retry(tx)))))
@@ -122,6 +130,7 @@
     }
 }
 
+#[cfg(feature = "http2")]
 impl<T, U> Clone for UnboundedSender<T, U> {
     fn clone(&self) -> Self {
         UnboundedSender {
@@ -131,13 +140,13 @@
     }
 }
 
-pub struct Receiver<T, U> {
+pub(crate) struct Receiver<T, U> {
     inner: mpsc::UnboundedReceiver<Envelope<T, U>>,
     taker: want::Taker,
 }
 
 impl<T, U> Receiver<T, U> {
-    pub(crate) fn poll_next(
+    pub(crate) fn poll_recv(
         &mut self,
         cx: &mut task::Context<'_>,
     ) -> Poll<Option<(T, Callback<T, U>)>> {
@@ -152,15 +161,17 @@
         }
     }
 
+    #[cfg(feature = "http1")]
     pub(crate) fn close(&mut self) {
         self.taker.cancel();
         self.inner.close();
     }
 
+    #[cfg(feature = "http1")]
     pub(crate) fn try_recv(&mut self) -> Option<(T, Callback<T, U>)> {
-        match self.inner.try_recv() {
-            Ok(mut env) => env.0.take(),
-            Err(_) => None,
+        match self.inner.recv().now_or_never() {
+            Some(Some(mut env)) => env.0.take(),
+            _ => None,
         }
     }
 }
@@ -186,12 +197,13 @@
     }
 }
 
-pub enum Callback<T, U> {
+pub(crate) enum Callback<T, U> {
     Retry(oneshot::Sender<Result<U, (crate::Error, Option<T>)>>),
     NoRetry(oneshot::Sender<Result<U, crate::Error>>),
 }
 
 impl<T, U> Callback<T, U> {
+    #[cfg(feature = "http2")]
     pub(crate) fn is_canceled(&self) -> bool {
         match *self {
             Callback::Retry(ref tx) => tx.is_closed(),
@@ -217,10 +229,13 @@
         }
     }
 
-    pub(crate) fn send_when(
+    #[cfg(feature = "http2")]
+    pub(crate) async fn send_when(
         self,
         mut when: impl Future<Output = Result<U, (crate::Error, Option<T>)>> + Unpin,
-    ) -> impl Future<Output = ()> {
+    ) {
+        use futures_util::future;
+
         let mut cb = Some(self);
 
         // "select" on this callback being canceled, and the future completing
@@ -242,6 +257,7 @@
                 }
             }
         })
+        .await
     }
 }
 
@@ -263,7 +279,7 @@
         type Output = Option<(T, Callback<T, U>)>;
 
         fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-            self.poll_next(cx)
+            self.poll_recv(cx)
         }
     }
 
@@ -325,6 +341,7 @@
         let _ = tx.try_send(Custom(2)).expect("2 ready");
     }
 
+    #[cfg(feature = "http2")]
     #[test]
     fn unbounded_sender_doesnt_bound_on_want() {
         let (tx, rx) = channel::<Custom, ()>();
@@ -344,9 +361,8 @@
     fn giver_queue_throughput(b: &mut test::Bencher) {
         use crate::{Body, Request, Response};
 
-        let mut rt = tokio::runtime::Builder::new()
+        let rt = tokio::runtime::Builder::new_current_thread()
             .enable_all()
-            .basic_scheduler()
             .build()
             .unwrap();
         let (mut tx, mut rx) = channel::<Request<Body>, Response<Body>>();
@@ -368,9 +384,8 @@
     #[cfg(feature = "nightly")]
     #[bench]
     fn giver_queue_not_ready(b: &mut test::Bencher) {
-        let mut rt = tokio::runtime::Builder::new()
+        let rt = tokio::runtime::Builder::new_current_thread()
             .enable_all()
-            .basic_scheduler()
             .build()
             .unwrap();
         let (_tx, mut rx) = channel::<i32, ()>();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -48,1213 +48,21 @@
 //! # fn main () {}
 //! ```
 
-use std::error::Error as StdError;
-use std::fmt;
-use std::mem;
-use std::time::Duration;
-
-use futures_channel::oneshot;
-use futures_util::future::{self, Either, FutureExt as _, TryFutureExt as _};
-use http::header::{HeaderValue, HOST};
-use http::uri::Scheme;
-use http::{Method, Request, Response, Uri, Version};
-
-use self::connect::{sealed::Connect, Alpn, Connected, Connection};
-use self::pool::{Key as PoolKey, Pool, Poolable, Pooled, Reservation};
-use crate::body::{Body, HttpBody};
-use crate::common::{lazy as hyper_lazy, task, BoxSendFuture, Executor, Future, Lazy, Pin, Poll};
-
 #[cfg(feature = "tcp")]
 pub use self::connect::HttpConnector;
 
-pub mod conn;
 pub mod connect;
-pub(crate) mod dispatch;
-mod pool;
-pub mod service;
-#[cfg(test)]
-#[cfg(feature = "runtime")]
+#[cfg(all(test, feature = "runtime"))]
 mod tests;
 
-/// A Client to make outgoing HTTP requests.
-pub struct Client<C, B = Body> {
-    config: Config,
-    conn_builder: conn::Builder,
-    connector: C,
-    pool: Pool<PoolClient<B>>,
-}
-
-#[derive(Clone, Copy, Debug)]
-struct Config {
-    retry_canceled_requests: bool,
-    set_host: bool,
-    ver: Ver,
-}
-
-/// A `Future` that will resolve to an HTTP Response.
-///
-/// This is returned by `Client::request` (and `Client::get`).
-#[must_use = "futures do nothing unless polled"]
-pub struct ResponseFuture {
-    inner: Pin<Box<dyn Future<Output = crate::Result<Response<Body>>> + Send>>,
-}
-
-// ===== impl Client =====
-
-#[cfg(feature = "tcp")]
-impl Client<HttpConnector, Body> {
-    /// Create a new Client with the default [config](Builder).
-    ///
-    /// # Note
-    ///
-    /// The default connector does **not** handle TLS. Speaking to `https`
-    /// destinations will require [configuring a connector that implements
-    /// TLS](https://hyper.rs/guides/client/configuration).
-    #[inline]
-    pub fn new() -> Client<HttpConnector, Body> {
-        Builder::default().build_http()
-    }
-}
-
-#[cfg(feature = "tcp")]
-impl Default for Client<HttpConnector, Body> {
-    fn default() -> Client<HttpConnector, Body> {
-        Client::new()
-    }
-}
-
-impl Client<(), Body> {
-    /// Create a builder to configure a new `Client`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # #[cfg(feature  = "runtime")]
-    /// # fn run () {
-    /// use std::time::Duration;
-    /// use hyper::Client;
-    ///
-    /// let client = Client::builder()
-    ///     .pool_idle_timeout(Duration::from_secs(30))
-    ///     .http2_only(true)
-    ///     .build_http();
-    /// # let infer: Client<_, hyper::Body> = client;
-    /// # drop(infer);
-    /// # }
-    /// # fn main() {}
-    /// ```
-    #[inline]
-    pub fn builder() -> Builder {
-        Builder::default()
-    }
-}
-
-impl<C, B> Client<C, B>
-where
-    C: Connect + Clone + Send + Sync + 'static,
-    B: HttpBody + Send + 'static,
-    B::Data: Send,
-    B::Error: Into<Box<dyn StdError + Send + Sync>>,
-{
-    /// Send a `GET` request to the supplied `Uri`.
-    ///
-    /// # Note
-    ///
-    /// This requires that the `HttpBody` type have a `Default` implementation.
-    /// It *should* return an "empty" version of itself, such that
-    /// `HttpBody::is_end_stream` is `true`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # #[cfg(feature  = "runtime")]
-    /// # fn run () {
-    /// use hyper::{Client, Uri};
-    ///
-    /// let client = Client::new();
-    ///
-    /// let future = client.get(Uri::from_static("http://httpbin.org/ip"));
-    /// # }
-    /// # fn main() {}
-    /// ```
-    pub fn get(&self, uri: Uri) -> ResponseFuture
-    where
-        B: Default,
-    {
-        let body = B::default();
-        if !body.is_end_stream() {
-            warn!("default HttpBody used for get() does not return true for is_end_stream");
-        }
-
-        let mut req = Request::new(body);
-        *req.uri_mut() = uri;
-        self.request(req)
-    }
-
-    /// Send a constructed `Request` using this `Client`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # #[cfg(feature  = "runtime")]
-    /// # fn run () {
-    /// use hyper::{Body, Client, Request};
-    ///
-    /// let client = Client::new();
-    ///
-    /// let req = Request::builder()
-    ///     .method("POST")
-    ///     .uri("http://httpin.org/post")
-    ///     .body(Body::from("Hallo!"))
-    ///     .expect("request builder");
-    ///
-    /// let future = client.request(req);
-    /// # }
-    /// # fn main() {}
-    /// ```
-    pub fn request(&self, mut req: Request<B>) -> ResponseFuture {
-        let is_http_connect = req.method() == Method::CONNECT;
-        match req.version() {
-            Version::HTTP_11 => (),
-            Version::HTTP_10 => {
-                if is_http_connect {
-                    warn!("CONNECT is not allowed for HTTP/1.0");
-                    return ResponseFuture::new(Box::new(future::err(
-                        crate::Error::new_user_unsupported_request_method(),
-                    )));
-                }
-            }
-            other_h2 @ Version::HTTP_2 => {
-                if self.config.ver != Ver::Http2 {
-                    return ResponseFuture::error_version(other_h2);
-                }
-            }
-            // completely unsupported HTTP version (like HTTP/0.9)!
-            other => return ResponseFuture::error_version(other),
-        };
-
-        let pool_key = match extract_domain(req.uri_mut(), is_http_connect) {
-            Ok(s) => s,
-            Err(err) => {
-                return ResponseFuture::new(Box::new(future::err(err)));
-            }
-        };
-
-        ResponseFuture::new(Box::new(self.retryably_send_request(req, pool_key)))
-    }
-
-    fn retryably_send_request(
-        &self,
-        req: Request<B>,
-        pool_key: PoolKey,
-    ) -> impl Future<Output = crate::Result<Response<Body>>> {
-        let client = self.clone();
-        let uri = req.uri().clone();
-
-        let mut send_fut = client.send_request(req, pool_key.clone());
-        future::poll_fn(move |cx| loop {
-            match ready!(Pin::new(&mut send_fut).poll(cx)) {
-                Ok(resp) => return Poll::Ready(Ok(resp)),
-                Err(ClientError::Normal(err)) => return Poll::Ready(Err(err)),
-                Err(ClientError::Canceled {
-                    connection_reused,
-                    mut req,
-                    reason,
-                }) => {
-                    if !client.config.retry_canceled_requests || !connection_reused {
-                        // if client disabled, don't retry
-                        // a fresh connection means we definitely can't retry
-                        return Poll::Ready(Err(reason));
-                    }
-
-                    trace!(
-                        "unstarted request canceled, trying again (reason={:?})",
-                        reason
-                    );
-                    *req.uri_mut() = uri.clone();
-                    send_fut = client.send_request(req, pool_key.clone());
-                }
-            }
-        })
-    }
-
-    fn send_request(
-        &self,
-        mut req: Request<B>,
-        pool_key: PoolKey,
-    ) -> impl Future<Output = Result<Response<Body>, ClientError<B>>> + Unpin {
-        let conn = self.connection_for(pool_key);
-
-        let set_host = self.config.set_host;
-        let executor = self.conn_builder.exec.clone();
-        conn.and_then(move |mut pooled| {
-            if pooled.is_http1() {
-                if set_host {
-                    let uri = req.uri().clone();
-                    req.headers_mut().entry(HOST).or_insert_with(|| {
-                        let hostname = uri.host().expect("authority implies host");
-                        if let Some(port) = uri.port() {
-                            let s = format!("{}:{}", hostname, port);
-                            HeaderValue::from_str(&s)
-                        } else {
-                            HeaderValue::from_str(hostname)
-                        }
-                        .expect("uri host is valid header value")
-                    });
-                }
-
-                // CONNECT always sends authority-form, so check it first...
-                if req.method() == Method::CONNECT {
-                    authority_form(req.uri_mut());
-                } else if pooled.conn_info.is_proxied {
-                    absolute_form(req.uri_mut());
-                } else {
-                    origin_form(req.uri_mut());
-                };
-            } else if req.method() == Method::CONNECT {
-                debug!("client does not support CONNECT requests over HTTP2");
-                return Either::Left(future::err(ClientError::Normal(
-                    crate::Error::new_user_unsupported_request_method(),
-                )));
-            }
-
-            let fut = pooled
-                .send_request_retryable(req)
-                .map_err(ClientError::map_with_reused(pooled.is_reused()));
-
-            // If the Connector included 'extra' info, add to Response...
-            let extra_info = pooled.conn_info.extra.clone();
-            let fut = fut.map_ok(move |mut res| {
-                if let Some(extra) = extra_info {
-                    extra.set(res.extensions_mut());
-                }
-                res
-            });
-
-            // As of futures@0.1.21, there is a race condition in the mpsc
-            // channel, such that sending when the receiver is closing can
-            // result in the message being stuck inside the queue. It won't
-            // ever notify until the Sender side is dropped.
-            //
-            // To counteract this, we must check if our senders 'want' channel
-            // has been closed after having tried to send. If so, error out...
-            if pooled.is_closed() {
-                return Either::Right(Either::Left(fut));
-            }
-
-            Either::Right(Either::Right(fut.map_ok(move |mut res| {
-                // If pooled is HTTP/2, we can toss this reference immediately.
-                //
-                // when pooled is dropped, it will try to insert back into the
-                // pool. To delay that, spawn a future that completes once the
-                // sender is ready again.
-                //
-                // This *should* only be once the related `Connection` has polled
-                // for a new request to start.
-                //
-                // It won't be ready if there is a body to stream.
-                if pooled.is_http2() || !pooled.is_pool_enabled() || pooled.is_ready() {
-                    drop(pooled);
-                } else if !res.body().is_end_stream() {
-                    let (delayed_tx, delayed_rx) = oneshot::channel();
-                    res.body_mut().delayed_eof(delayed_rx);
-                    let on_idle = future::poll_fn(move |cx| pooled.poll_ready(cx)).map(move |_| {
-                        // At this point, `pooled` is dropped, and had a chance
-                        // to insert into the pool (if conn was idle)
-                        drop(delayed_tx);
-                    });
-
-                    executor.execute(on_idle);
-                } else {
-                    // There's no body to delay, but the connection isn't
-                    // ready yet. Only re-insert when it's ready
-                    let on_idle = future::poll_fn(move |cx| pooled.poll_ready(cx)).map(|_| ());
-
-                    executor.execute(on_idle);
-                }
-                res
-            })))
-        })
-    }
-
-    fn connection_for(
-        &self,
-        pool_key: PoolKey,
-    ) -> impl Future<Output = Result<Pooled<PoolClient<B>>, ClientError<B>>> {
-        // This actually races 2 different futures to try to get a ready
-        // connection the fastest, and to reduce connection churn.
-        //
-        // - If the pool has an idle connection waiting, that's used
-        //   immediately.
-        // - Otherwise, the Connector is asked to start connecting to
-        //   the destination Uri.
-        // - Meanwhile, the pool Checkout is watching to see if any other
-        //   request finishes and tries to insert an idle connection.
-        // - If a new connection is started, but the Checkout wins after
-        //   (an idle connection became available first), the started
-        //   connection future is spawned into the runtime to complete,
-        //   and then be inserted into the pool as an idle connection.
-        let checkout = self.pool.checkout(pool_key.clone());
-        let connect = self.connect_to(pool_key);
-
-        let executor = self.conn_builder.exec.clone();
-        // The order of the `select` is depended on below...
-        future::select(checkout, connect).then(move |either| match either {
-            // Checkout won, connect future may have been started or not.
-            //
-            // If it has, let it finish and insert back into the pool,
-            // so as to not waste the socket...
-            Either::Left((Ok(checked_out), connecting)) => {
-                // This depends on the `select` above having the correct
-                // order, such that if the checkout future were ready
-                // immediately, the connect future will never have been
-                // started.
-                //
-                // If it *wasn't* ready yet, then the connect future will
-                // have been started...
-                if connecting.started() {
-                    let bg = connecting
-                        .map_err(|err| {
-                            trace!("background connect error: {}", err);
-                        })
-                        .map(|_pooled| {
-                            // dropping here should just place it in
-                            // the Pool for us...
-                        });
-                    // An execute error here isn't important, we're just trying
-                    // to prevent a waste of a socket...
-                    executor.execute(bg);
-                }
-                Either::Left(future::ok(checked_out))
-            }
-            // Connect won, checkout can just be dropped.
-            Either::Right((Ok(connected), _checkout)) => Either::Left(future::ok(connected)),
-            // Either checkout or connect could get canceled:
-            //
-            // 1. Connect is canceled if this is HTTP/2 and there is
-            //    an outstanding HTTP/2 connecting task.
-            // 2. Checkout is canceled if the pool cannot deliver an
-            //    idle connection reliably.
-            //
-            // In both cases, we should just wait for the other future.
-            Either::Left((Err(err), connecting)) => Either::Right(Either::Left({
-                if err.is_canceled() {
-                    Either::Left(connecting.map_err(ClientError::Normal))
-                } else {
-                    Either::Right(future::err(ClientError::Normal(err)))
-                }
-            })),
-            Either::Right((Err(err), checkout)) => Either::Right(Either::Right({
-                if err.is_canceled() {
-                    Either::Left(checkout.map_err(ClientError::Normal))
-                } else {
-                    Either::Right(future::err(ClientError::Normal(err)))
-                }
-            })),
-        })
-    }
-
-    fn connect_to(
-        &self,
-        pool_key: PoolKey,
-    ) -> impl Lazy<Output = crate::Result<Pooled<PoolClient<B>>>> + Unpin {
-        let executor = self.conn_builder.exec.clone();
-        let pool = self.pool.clone();
-        let mut conn_builder = self.conn_builder.clone();
-        let ver = self.config.ver;
-        let is_ver_h2 = ver == Ver::Http2;
-        let connector = self.connector.clone();
-        let dst = domain_as_uri(pool_key.clone());
-        hyper_lazy(move || {
-            // Try to take a "connecting lock".
-            //
-            // If the pool_key is for HTTP/2, and there is already a
-            // connection being established, then this can't take a
-            // second lock. The "connect_to" future is Canceled.
-            let connecting = match pool.connecting(&pool_key, ver) {
-                Some(lock) => lock,
-                None => {
-                    let canceled =
-                        crate::Error::new_canceled().with("HTTP/2 connection in progress");
-                    return Either::Right(future::err(canceled));
-                }
-            };
-            Either::Left(
-                connector
-                    .connect(connect::sealed::Internal, dst)
-                    .map_err(crate::Error::new_connect)
-                    .and_then(move |io| {
-                        let connected = io.connected();
-                        // If ALPN is h2 and we aren't http2_only already,
-                        // then we need to convert our pool checkout into
-                        // a single HTTP2 one.
-                        let connecting = if connected.alpn == Alpn::H2 && !is_ver_h2 {
-                            match connecting.alpn_h2(&pool) {
-                                Some(lock) => {
-                                    trace!("ALPN negotiated h2, updating pool");
-                                    lock
-                                }
-                                None => {
-                                    // Another connection has already upgraded,
-                                    // the pool checkout should finish up for us.
-                                    let canceled = crate::Error::new_canceled()
-                                        .with("ALPN upgraded to HTTP/2");
-                                    return Either::Right(future::err(canceled));
-                                }
-                            }
-                        } else {
-                            connecting
-                        };
-                        let is_h2 = is_ver_h2 || connected.alpn == Alpn::H2;
-                        Either::Left(Box::pin(
-                            conn_builder
-                                .http2_only(is_h2)
-                                .handshake(io)
-                                .and_then(move |(tx, conn)| {
-                                    trace!(
-                                        "handshake complete, spawning background dispatcher task"
-                                    );
-                                    executor.execute(
-                                        conn.map_err(|e| debug!("client connection error: {}", e))
-                                            .map(|_| ()),
-                                    );
-
-                                    // Wait for 'conn' to ready up before we
-                                    // declare this tx as usable
-                                    tx.when_ready()
-                                })
-                                .map_ok(move |tx| {
-                                    pool.pooled(
-                                        connecting,
-                                        PoolClient {
-                                            conn_info: connected,
-                                            tx: if is_h2 {
-                                                PoolTx::Http2(tx.into_http2())
-                                            } else {
-                                                PoolTx::Http1(tx)
-                                            },
-                                        },
-                                    )
-                                }),
-                        ))
-                    }),
-            )
-        })
-    }
-}
-
-impl<C, B> tower_service::Service<Request<B>> for Client<C, B>
-where
-    C: Connect + Clone + Send + Sync + 'static,
-    B: HttpBody + Send + 'static,
-    B::Data: Send,
-    B::Error: Into<Box<dyn StdError + Send + Sync>>,
-{
-    type Response = Response<Body>;
-    type Error = crate::Error;
-    type Future = ResponseFuture;
-
-    fn poll_ready(&mut self, _: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-
-    fn call(&mut self, req: Request<B>) -> Self::Future {
-        self.request(req)
-    }
-}
-
-impl<C, B> tower_service::Service<Request<B>> for &'_ Client<C, B>
-where
-    C: Connect + Clone + Send + Sync + 'static,
-    B: HttpBody + Send + 'static,
-    B::Data: Send,
-    B::Error: Into<Box<dyn StdError + Send + Sync>>,
-{
-    type Response = Response<Body>;
-    type Error = crate::Error;
-    type Future = ResponseFuture;
-
-    fn poll_ready(&mut self, _: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-
-    fn call(&mut self, req: Request<B>) -> Self::Future {
-        self.request(req)
-    }
-}
-
-impl<C: Clone, B> Clone for Client<C, B> {
-    fn clone(&self) -> Client<C, B> {
-        Client {
-            config: self.config.clone(),
-            conn_builder: self.conn_builder.clone(),
-            connector: self.connector.clone(),
-            pool: self.pool.clone(),
-        }
-    }
-}
-
-impl<C, B> fmt::Debug for Client<C, B> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Client").finish()
-    }
-}
-
-// ===== impl ResponseFuture =====
-
-impl ResponseFuture {
-    fn new(fut: Box<dyn Future<Output = crate::Result<Response<Body>>> + Send>) -> Self {
-        Self { inner: fut.into() }
-    }
-
-    fn error_version(ver: Version) -> Self {
-        warn!("Request has unsupported version \"{:?}\"", ver);
-        ResponseFuture::new(Box::new(future::err(
-            crate::Error::new_user_unsupported_version(),
-        )))
-    }
-}
-
-impl fmt::Debug for ResponseFuture {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.pad("Future<Response>")
-    }
-}
-
-impl Future for ResponseFuture {
-    type Output = crate::Result<Response<Body>>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.inner).poll(cx)
-    }
-}
-
-// ===== impl PoolClient =====
-
-// FIXME: allow() required due to `impl Trait` leaking types to this lint
-#[allow(missing_debug_implementations)]
-struct PoolClient<B> {
-    conn_info: Connected,
-    tx: PoolTx<B>,
-}
-
-enum PoolTx<B> {
-    Http1(conn::SendRequest<B>),
-    Http2(conn::Http2SendRequest<B>),
-}
-
-impl<B> PoolClient<B> {
-    fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<crate::Result<()>> {
-        match self.tx {
-            PoolTx::Http1(ref mut tx) => tx.poll_ready(cx),
-            PoolTx::Http2(_) => Poll::Ready(Ok(())),
-        }
-    }
-
-    fn is_http1(&self) -> bool {
-        !self.is_http2()
-    }
-
-    fn is_http2(&self) -> bool {
-        match self.tx {
-            PoolTx::Http1(_) => false,
-            PoolTx::Http2(_) => true,
-        }
-    }
-
-    fn is_ready(&self) -> bool {
-        match self.tx {
-            PoolTx::Http1(ref tx) => tx.is_ready(),
-            PoolTx::Http2(ref tx) => tx.is_ready(),
-        }
-    }
-
-    fn is_closed(&self) -> bool {
-        match self.tx {
-            PoolTx::Http1(ref tx) => tx.is_closed(),
-            PoolTx::Http2(ref tx) => tx.is_closed(),
-        }
-    }
-}
-
-impl<B: HttpBody + 'static> PoolClient<B> {
-    fn send_request_retryable(
-        &mut self,
-        req: Request<B>,
-    ) -> impl Future<Output = Result<Response<Body>, (crate::Error, Option<Request<B>>)>>
-    where
-        B: Send,
-    {
-        match self.tx {
-            PoolTx::Http1(ref mut tx) => Either::Left(tx.send_request_retryable(req)),
-            PoolTx::Http2(ref mut tx) => Either::Right(tx.send_request_retryable(req)),
-        }
-    }
-}
-
-impl<B> Poolable for PoolClient<B>
-where
-    B: Send + 'static,
-{
-    fn is_open(&self) -> bool {
-        match self.tx {
-            PoolTx::Http1(ref tx) => tx.is_ready(),
-            PoolTx::Http2(ref tx) => tx.is_ready(),
-        }
-    }
-
-    fn reserve(self) -> Reservation<Self> {
-        match self.tx {
-            PoolTx::Http1(tx) => Reservation::Unique(PoolClient {
-                conn_info: self.conn_info,
-                tx: PoolTx::Http1(tx),
-            }),
-            PoolTx::Http2(tx) => {
-                let b = PoolClient {
-                    conn_info: self.conn_info.clone(),
-                    tx: PoolTx::Http2(tx.clone()),
-                };
-                let a = PoolClient {
-                    conn_info: self.conn_info,
-                    tx: PoolTx::Http2(tx),
-                };
-                Reservation::Shared(a, b)
-            }
-        }
-    }
-
-    fn can_share(&self) -> bool {
-        self.is_http2()
-    }
-}
-
-// ===== impl ClientError =====
-
-// FIXME: allow() required due to `impl Trait` leaking types to this lint
-#[allow(missing_debug_implementations)]
-enum ClientError<B> {
-    Normal(crate::Error),
-    Canceled {
-        connection_reused: bool,
-        req: Request<B>,
-        reason: crate::Error,
-    },
-}
-
-impl<B> ClientError<B> {
-    fn map_with_reused(conn_reused: bool) -> impl Fn((crate::Error, Option<Request<B>>)) -> Self {
-        move |(err, orig_req)| {
-            if let Some(req) = orig_req {
-                ClientError::Canceled {
-                    connection_reused: conn_reused,
-                    reason: err,
-                    req,
-                }
-            } else {
-                ClientError::Normal(err)
-            }
-        }
-    }
-}
-
-/// A marker to identify what version a pooled connection is.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-enum Ver {
-    Auto,
-    Http2,
-}
-
-fn origin_form(uri: &mut Uri) {
-    let path = match uri.path_and_query() {
-        Some(path) if path.as_str() != "/" => {
-            let mut parts = ::http::uri::Parts::default();
-            parts.path_and_query = Some(path.clone());
-            Uri::from_parts(parts).expect("path is valid uri")
-        }
-        _none_or_just_slash => {
-            debug_assert!(Uri::default() == "/");
-            Uri::default()
-        }
-    };
-    *uri = path
-}
-
-fn absolute_form(uri: &mut Uri) {
-    debug_assert!(uri.scheme().is_some(), "absolute_form needs a scheme");
-    debug_assert!(
-        uri.authority().is_some(),
-        "absolute_form needs an authority"
-    );
-    // If the URI is to HTTPS, and the connector claimed to be a proxy,
-    // then it *should* have tunneled, and so we don't want to send
-    // absolute-form in that case.
-    if uri.scheme() == Some(&Scheme::HTTPS) {
-        origin_form(uri);
-    }
-}
-
-fn authority_form(uri: &mut Uri) {
-    if let Some(path) = uri.path_and_query() {
-        // `https://hyper.rs` would parse with `/` path, don't
-        // annoy people about that...
-        if path != "/" {
-            warn!("HTTP/1.1 CONNECT request stripping path: {:?}", path);
-        }
-    }
-    *uri = match uri.authority() {
-        Some(auth) => {
-            let mut parts = ::http::uri::Parts::default();
-            parts.authority = Some(auth.clone());
-            Uri::from_parts(parts).expect("authority is valid")
-        }
-        None => {
-            unreachable!("authority_form with relative uri");
-        }
-    };
-}
-
-fn extract_domain(uri: &mut Uri, is_http_connect: bool) -> crate::Result<PoolKey> {
-    let uri_clone = uri.clone();
-    match (uri_clone.scheme(), uri_clone.authority()) {
-        (Some(scheme), Some(auth)) => Ok((scheme.clone(), auth.clone())),
-        (None, Some(auth)) if is_http_connect => {
-            let scheme = match auth.port_u16() {
-                Some(443) => {
-                    set_scheme(uri, Scheme::HTTPS);
-                    Scheme::HTTPS
-                }
-                _ => {
-                    set_scheme(uri, Scheme::HTTP);
-                    Scheme::HTTP
-                }
-            };
-            Ok((scheme, auth.clone()))
-        }
-        _ => {
-            debug!("Client requires absolute-form URIs, received: {:?}", uri);
-            Err(crate::Error::new_user_absolute_uri_required())
-        }
-    }
-}
-
-fn domain_as_uri((scheme, auth): PoolKey) -> Uri {
-    http::uri::Builder::new()
-        .scheme(scheme)
-        .authority(auth)
-        .path_and_query("/")
-        .build()
-        .expect("domain is valid Uri")
-}
-
-fn set_scheme(uri: &mut Uri, scheme: Scheme) {
-    debug_assert!(
-        uri.scheme().is_none(),
-        "set_scheme expects no existing scheme"
-    );
-    let old = mem::replace(uri, Uri::default());
-    let mut parts: ::http::uri::Parts = old.into();
-    parts.scheme = Some(scheme);
-    parts.path_and_query = Some("/".parse().expect("slash is a valid path"));
-    *uri = Uri::from_parts(parts).expect("scheme is valid");
-}
-
-/// A builder to configure a new [`Client`](Client).
-///
-/// # Example
-///
-/// ```
-/// # #[cfg(feature  = "runtime")]
-/// # fn run () {
-/// use std::time::Duration;
-/// use hyper::Client;
-///
-/// let client = Client::builder()
-///     .pool_idle_timeout(Duration::from_secs(30))
-///     .http2_only(true)
-///     .build_http();
-/// # let infer: Client<_, hyper::Body> = client;
-/// # drop(infer);
-/// # }
-/// # fn main() {}
-/// ```
-#[derive(Clone)]
-pub struct Builder {
-    client_config: Config,
-    conn_builder: conn::Builder,
-    pool_config: pool::Config,
-}
-
-impl Default for Builder {
-    fn default() -> Self {
-        Self {
-            client_config: Config {
-                retry_canceled_requests: true,
-                set_host: true,
-                ver: Ver::Auto,
-            },
-            conn_builder: conn::Builder::new(),
-            pool_config: pool::Config {
-                idle_timeout: Some(Duration::from_secs(90)),
-                max_idle_per_host: std::usize::MAX,
-            },
-        }
-    }
-}
-
-impl Builder {
-    #[doc(hidden)]
-    #[deprecated(
-        note = "name is confusing, to disable the connection pool, call pool_max_idle_per_host(0)"
-    )]
-    pub fn keep_alive(&mut self, val: bool) -> &mut Self {
-        if !val {
-            // disable
-            self.pool_max_idle_per_host(0)
-        } else if self.pool_config.max_idle_per_host == 0 {
-            // enable
-            self.pool_max_idle_per_host(std::usize::MAX)
-        } else {
-            // already enabled
-            self
-        }
-    }
-
-    #[doc(hidden)]
-    #[deprecated(note = "renamed to `pool_idle_timeout`")]
-    pub fn keep_alive_timeout<D>(&mut self, val: D) -> &mut Self
-    where
-        D: Into<Option<Duration>>,
-    {
-        self.pool_idle_timeout(val)
-    }
-
-    /// Set an optional timeout for idle sockets being kept-alive.
-    ///
-    /// Pass `None` to disable timeout.
-    ///
-    /// Default is 90 seconds.
-    pub fn pool_idle_timeout<D>(&mut self, val: D) -> &mut Self
-    where
-        D: Into<Option<Duration>>,
-    {
-        self.pool_config.idle_timeout = val.into();
-        self
-    }
-
-    #[doc(hidden)]
-    #[deprecated(note = "renamed to `pool_max_idle_per_host`")]
-    pub fn max_idle_per_host(&mut self, max_idle: usize) -> &mut Self {
-        self.pool_config.max_idle_per_host = max_idle;
-        self
-    }
-
-    /// Sets the maximum idle connection per host allowed in the pool.
-    ///
-    /// Default is `usize::MAX` (no limit).
-    pub fn pool_max_idle_per_host(&mut self, max_idle: usize) -> &mut Self {
-        self.pool_config.max_idle_per_host = max_idle;
-        self
-    }
-
-    // HTTP/1 options
-
-    /// Set whether HTTP/1 connections should try to use vectored writes,
-    /// or always flatten into a single buffer.
-    ///
-    /// Note that setting this to false may mean more copies of body data,
-    /// but may also improve performance when an IO transport doesn't
-    /// support vectored writes well, such as most TLS implementations.
-    ///
-    /// Setting this to true will force hyper to use queued strategy
-    /// which may eliminate unnecessary cloning on some TLS backends
-    ///
-    /// Default is `auto`. In this mode hyper will try to guess which
-    /// mode to use
-    pub fn http1_writev(&mut self, val: bool) -> &mut Self {
-        self.conn_builder.h1_writev(val);
-        self
-    }
-
-    /// Sets the exact size of the read buffer to *always* use.
-    ///
-    /// Note that setting this option unsets the `http1_max_buf_size` option.
-    ///
-    /// Default is an adaptive read buffer.
-    pub fn http1_read_buf_exact_size(&mut self, sz: usize) -> &mut Self {
-        self.conn_builder.h1_read_buf_exact_size(Some(sz));
-        self
-    }
-
-    /// Set the maximum buffer size for the connection.
-    ///
-    /// Default is ~400kb.
-    ///
-    /// Note that setting this option unsets the `http1_read_exact_buf_size` option.
-    ///
-    /// # Panics
-    ///
-    /// The minimum value allowed is 8192. This method panics if the passed `max` is less than the minimum.
-    pub fn http1_max_buf_size(&mut self, max: usize) -> &mut Self {
-        self.conn_builder.h1_max_buf_size(max);
-        self
-    }
-
-    /// Set whether HTTP/1 connections will write header names as title case at
-    /// the socket level.
-    ///
-    /// Note that this setting does not affect HTTP/2.
-    ///
-    /// Default is false.
-    pub fn http1_title_case_headers(&mut self, val: bool) -> &mut Self {
-        self.conn_builder.h1_title_case_headers(val);
-        self
-    }
-
-    /// Set whether the connection **must** use HTTP/2.
-    ///
-    /// The destination must either allow HTTP2 Prior Knowledge, or the
-    /// `Connect` should be configured to do use ALPN to upgrade to `h2`
-    /// as part of the connection process. This will not make the `Client`
-    /// utilize ALPN by itself.
-    ///
-    /// Note that setting this to true prevents HTTP/1 from being allowed.
-    ///
-    /// Default is false.
-    pub fn http2_only(&mut self, val: bool) -> &mut Self {
-        self.client_config.ver = if val { Ver::Http2 } else { Ver::Auto };
-        self
-    }
-
-    /// Sets the [`SETTINGS_INITIAL_WINDOW_SIZE`][spec] option for HTTP2
-    /// stream-level flow control.
-    ///
-    /// Passing `None` will do nothing.
-    ///
-    /// If not set, hyper will use a default.
-    ///
-    /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE
-    pub fn http2_initial_stream_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
-        self.conn_builder
-            .http2_initial_stream_window_size(sz.into());
-        self
-    }
-
-    /// Sets the max connection-level flow control for HTTP2
-    ///
-    /// Passing `None` will do nothing.
-    ///
-    /// If not set, hyper will use a default.
-    pub fn http2_initial_connection_window_size(
-        &mut self,
-        sz: impl Into<Option<u32>>,
-    ) -> &mut Self {
-        self.conn_builder
-            .http2_initial_connection_window_size(sz.into());
-        self
-    }
-
-    /// Sets whether to use an adaptive flow control.
-    ///
-    /// Enabling this will override the limits set in
-    /// `http2_initial_stream_window_size` and
-    /// `http2_initial_connection_window_size`.
-    pub fn http2_adaptive_window(&mut self, enabled: bool) -> &mut Self {
-        self.conn_builder.http2_adaptive_window(enabled);
-        self
-    }
-
-    /// Sets the maximum frame size to use for HTTP2.
-    ///
-    /// Passing `None` will do nothing.
-    ///
-    /// If not set, hyper will use a default.
-    pub fn http2_max_frame_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
-        self.conn_builder.http2_max_frame_size(sz);
-        self
-    }
-
-    /// Sets an interval for HTTP2 Ping frames should be sent to keep a
-    /// connection alive.
-    ///
-    /// Pass `None` to disable HTTP2 keep-alive.
-    ///
-    /// Default is currently disabled.
-    ///
-    /// # Cargo Feature
-    ///
-    /// Requires the `runtime` cargo feature to be enabled.
-    #[cfg(feature = "runtime")]
-    pub fn http2_keep_alive_interval(
-        &mut self,
-        interval: impl Into<Option<Duration>>,
-    ) -> &mut Self {
-        self.conn_builder.http2_keep_alive_interval(interval);
-        self
-    }
-
-    /// Sets a timeout for receiving an acknowledgement of the keep-alive ping.
-    ///
-    /// If the ping is not acknowledged within the timeout, the connection will
-    /// be closed. Does nothing if `http2_keep_alive_interval` is disabled.
-    ///
-    /// Default is 20 seconds.
-    ///
-    /// # Cargo Feature
-    ///
-    /// Requires the `runtime` cargo feature to be enabled.
-    #[cfg(feature = "runtime")]
-    pub fn http2_keep_alive_timeout(&mut self, timeout: Duration) -> &mut Self {
-        self.conn_builder.http2_keep_alive_timeout(timeout);
-        self
-    }
-
-    /// Sets whether HTTP2 keep-alive should apply while the connection is idle.
-    ///
-    /// If disabled, keep-alive pings are only sent while there are open
-    /// request/responses streams. If enabled, pings are also sent when no
-    /// streams are active. Does nothing if `http2_keep_alive_interval` is
-    /// disabled.
-    ///
-    /// Default is `false`.
-    ///
-    /// # Cargo Feature
-    ///
-    /// Requires the `runtime` cargo feature to be enabled.
-    #[cfg(feature = "runtime")]
-    pub fn http2_keep_alive_while_idle(&mut self, enabled: bool) -> &mut Self {
-        self.conn_builder.http2_keep_alive_while_idle(enabled);
-        self
-    }
-
-    /// Set whether to retry requests that get disrupted before ever starting
-    /// to write.
-    ///
-    /// This means a request that is queued, and gets given an idle, reused
-    /// connection, and then encounters an error immediately as the idle
-    /// connection was found to be unusable.
-    ///
-    /// When this is set to `false`, the related `ResponseFuture` would instead
-    /// resolve to an `Error::Cancel`.
-    ///
-    /// Default is `true`.
-    #[inline]
-    pub fn retry_canceled_requests(&mut self, val: bool) -> &mut Self {
-        self.client_config.retry_canceled_requests = val;
-        self
-    }
-
-    /// Set whether to automatically add the `Host` header to requests.
-    ///
-    /// If true, and a request does not include a `Host` header, one will be
-    /// added automatically, derived from the authority of the `Uri`.
-    ///
-    /// Default is `true`.
-    #[inline]
-    pub fn set_host(&mut self, val: bool) -> &mut Self {
-        self.client_config.set_host = val;
-        self
-    }
-
-    /// Provide an executor to execute background `Connection` tasks.
-    pub fn executor<E>(&mut self, exec: E) -> &mut Self
-    where
-        E: Executor<BoxSendFuture> + Send + Sync + 'static,
-    {
-        self.conn_builder.executor(exec);
-        self
-    }
-
-    /// Builder a client with this configuration and the default `HttpConnector`.
-    #[cfg(feature = "tcp")]
-    pub fn build_http<B>(&self) -> Client<HttpConnector, B>
-    where
-        B: HttpBody + Send,
-        B::Data: Send,
-    {
-        let mut connector = HttpConnector::new();
-        if self.pool_config.is_enabled() {
-            connector.set_keepalive(self.pool_config.idle_timeout);
-        }
-        self.build(connector)
-    }
-
-    /// Combine the configuration of this builder with a connector to create a `Client`.
-    pub fn build<C, B>(&self, connector: C) -> Client<C, B>
-    where
-        C: Connect + Clone,
-        B: HttpBody + Send,
-        B::Data: Send,
-    {
-        Client {
-            config: self.client_config,
-            conn_builder: self.conn_builder.clone(),
-            connector,
-            pool: Pool::new(self.pool_config, &self.conn_builder.exec),
-        }
-    }
-}
-
-impl fmt::Debug for Builder {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Builder")
-            .field("client_config", &self.client_config)
-            .field("conn_builder", &self.conn_builder)
-            .field("pool_config", &self.pool_config)
-            .finish()
-    }
-}
-
-#[cfg(test)]
-mod unit_tests {
-    use super::*;
-
-    #[test]
-    fn set_relative_uri_with_implicit_path() {
-        let mut uri = "http://hyper.rs".parse().unwrap();
-        origin_form(&mut uri);
-        assert_eq!(uri.to_string(), "/");
-    }
-
-    #[test]
-    fn test_origin_form() {
-        let mut uri = "http://hyper.rs/guides".parse().unwrap();
-        origin_form(&mut uri);
-        assert_eq!(uri.to_string(), "/guides");
-
-        let mut uri = "http://hyper.rs/guides?foo=bar".parse().unwrap();
-        origin_form(&mut uri);
-        assert_eq!(uri.to_string(), "/guides?foo=bar");
-    }
-
-    #[test]
-    fn test_absolute_form() {
-        let mut uri = "http://hyper.rs/guides".parse().unwrap();
-        absolute_form(&mut uri);
-        assert_eq!(uri.to_string(), "http://hyper.rs/guides");
-
-        let mut uri = "https://hyper.rs/guides".parse().unwrap();
-        absolute_form(&mut uri);
-        assert_eq!(uri.to_string(), "/guides");
-    }
-
-    #[test]
-    fn test_authority_form() {
-        let _ = pretty_env_logger::try_init();
-
-        let mut uri = "http://hyper.rs".parse().unwrap();
-        authority_form(&mut uri);
-        assert_eq!(uri.to_string(), "hyper.rs");
+cfg_feature! {
+    #![any(feature = "http1", feature = "http2")]
 
-        let mut uri = "hyper.rs".parse().unwrap();
-        authority_form(&mut uri);
-        assert_eq!(uri.to_string(), "hyper.rs");
-    }
+    pub use self::client::{Builder, Client, ResponseFuture};
 
-    #[test]
-    fn test_extract_domain_connect_no_port() {
-        let mut uri = "hyper.rs".parse().unwrap();
-        let (scheme, host) = extract_domain(&mut uri, true).expect("extract domain");
-        assert_eq!(scheme, *"http");
-        assert_eq!(host, "hyper.rs");
-    }
+    mod client;
+    pub mod conn;
+    pub(super) mod dispatch;
+    mod pool;
+    pub mod service;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/pool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/pool.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 use std::collections::{HashMap, HashSet, VecDeque};
+use std::error::Error as StdError;
 use std::fmt;
 use std::ops::{Deref, DerefMut};
 use std::sync::{Arc, Mutex, Weak};
@@ -10,8 +11,8 @@
 #[cfg(feature = "runtime")]
 use tokio::time::{Duration, Instant, Interval};
 
-use super::Ver;
-use crate::common::{task, Exec, Future, Pin, Poll, Unpin};
+use super::client::Ver;
+use crate::common::{exec::Exec, task, Future, Pin, Poll, Unpin};
 
 // FIXME: allow() required due to `impl Trait` leaking types to this lint
 #[allow(missing_debug_implementations)]
@@ -45,6 +46,7 @@
     /// This connection could be used multiple times, the first one will be
     /// reinserted into the `idle` pool, and the second will be given to
     /// the `Checkout`.
+    #[cfg(feature = "http2")]
     Shared(T, T),
     /// This connection requires unique access. It will be returned after
     /// use is complete.
@@ -99,7 +101,7 @@
 }
 
 impl<T> Pool<T> {
-    pub fn new(config: Config, __exec: &Exec) -> Pool<T> {
+    pub(super) fn new(config: Config, __exec: &Exec) -> Pool<T> {
         let inner = if config.is_enabled() {
             Some(Arc::new(Mutex::new(PoolInner {
                 connecting: HashSet::new(),
@@ -139,7 +141,7 @@
 impl<T: Poolable> Pool<T> {
     /// Returns a `Checkout` which is a future that resolves if an idle
     /// connection becomes available.
-    pub fn checkout(&self, key: Key) -> Checkout<T> {
+    pub(super) fn checkout(&self, key: Key) -> Checkout<T> {
         Checkout {
             key,
             pool: self.clone(),
@@ -199,9 +201,14 @@
     }
     */
 
-    pub(super) fn pooled(&self, mut connecting: Connecting<T>, value: T) -> Pooled<T> {
+    pub(super) fn pooled(
+        &self,
+        #[cfg_attr(not(feature = "http2"), allow(unused_mut))] mut connecting: Connecting<T>,
+        value: T,
+    ) -> Pooled<T> {
         let (value, pool_ref) = if let Some(ref enabled) = self.inner {
             match value.reserve() {
+                #[cfg(feature = "http2")]
                 Reservation::Shared(to_insert, to_return) => {
                     let mut inner = enabled.lock().unwrap();
                     inner.put(connecting.key.clone(), to_insert, enabled);
@@ -291,6 +298,7 @@
             }
 
             let value = match entry.value.reserve() {
+                #[cfg(feature = "http2")]
                 Reservation::Shared(to_reinsert, to_checkout) => {
                     self.list.push(Idle {
                         idle_at: Instant::now(),
@@ -325,6 +333,7 @@
                 if !tx.is_canceled() {
                     let reserved = value.take().expect("value already sent");
                     let reserved = match reserved.reserve() {
+                        #[cfg(feature = "http2")]
                         Reservation::Shared(to_keep, to_send) => {
                             value = Some(to_keep);
                             to_send
@@ -481,11 +490,11 @@
 }
 
 impl<T: Poolable> Pooled<T> {
-    pub fn is_reused(&self) -> bool {
+    pub(super) fn is_reused(&self) -> bool {
         self.is_reused
     }
 
-    pub fn is_pool_enabled(&self) -> bool {
+    pub(super) fn is_pool_enabled(&self) -> bool {
         self.pool.0.is_some()
     }
 
@@ -552,28 +561,40 @@
     waiter: Option<oneshot::Receiver<T>>,
 }
 
+#[derive(Debug)]
+pub(super) struct CheckoutIsClosedError;
+
+impl StdError for CheckoutIsClosedError {}
+
+impl fmt::Display for CheckoutIsClosedError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str("checked out connection was closed")
+    }
+}
+
 impl<T: Poolable> Checkout<T> {
     fn poll_waiter(
         &mut self,
         cx: &mut task::Context<'_>,
     ) -> Poll<Option<crate::Result<Pooled<T>>>> {
-        static CANCELED: &str = "pool checkout failed";
         if let Some(mut rx) = self.waiter.take() {
             match Pin::new(&mut rx).poll(cx) {
                 Poll::Ready(Ok(value)) => {
                     if value.is_open() {
                         Poll::Ready(Some(Ok(self.pool.reuse(&self.key, value))))
                     } else {
-                        Poll::Ready(Some(Err(crate::Error::new_canceled().with(CANCELED))))
+                        Poll::Ready(Some(Err(
+                            crate::Error::new_canceled().with(CheckoutIsClosedError)
+                        )))
                     }
                 }
                 Poll::Pending => {
                     self.waiter = Some(rx);
                     Poll::Pending
                 }
-                Poll::Ready(Err(_canceled)) => {
-                    Poll::Ready(Some(Err(crate::Error::new_canceled().with(CANCELED))))
-                }
+                Poll::Ready(Err(_canceled)) => Poll::Ready(Some(Err(
+                    crate::Error::new_canceled().with("request has been canceled")
+                ))),
             }
         } else {
             Poll::Ready(None)
@@ -706,22 +727,27 @@
 }
 
 #[cfg(feature = "runtime")]
-struct IdleTask<T> {
-    interval: Interval,
-    pool: WeakOpt<Mutex<PoolInner<T>>>,
-    // This allows the IdleTask to be notified as soon as the entire
-    // Pool is fully dropped, and shutdown. This channel is never sent on,
-    // but Err(Canceled) will be received when the Pool is dropped.
-    pool_drop_notifier: oneshot::Receiver<crate::common::Never>,
+pin_project_lite::pin_project! {
+    struct IdleTask<T> {
+        #[pin]
+        interval: Interval,
+        pool: WeakOpt<Mutex<PoolInner<T>>>,
+        // This allows the IdleTask to be notified as soon as the entire
+        // Pool is fully dropped, and shutdown. This channel is never sent on,
+        // but Err(Canceled) will be received when the Pool is dropped.
+        #[pin]
+        pool_drop_notifier: oneshot::Receiver<crate::common::Never>,
+    }
 }
 
 #[cfg(feature = "runtime")]
 impl<T: Poolable + 'static> Future for IdleTask<T> {
     type Output = ();
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
+        let mut this = self.project();
         loop {
-            match Pin::new(&mut self.pool_drop_notifier).poll(cx) {
+            match this.pool_drop_notifier.as_mut().poll(cx) {
                 Poll::Ready(Ok(n)) => match n {},
                 Poll::Pending => (),
                 Poll::Ready(Err(_canceled)) => {
@@ -730,9 +756,9 @@
                 }
             }
 
-            ready!(self.interval.poll_tick(cx));
+            ready!(this.interval.as_mut().poll_tick(cx));
 
-            if let Some(inner) = self.pool.upgrade() {
+            if let Some(inner) = this.pool.upgrade() {
                 if let Ok(mut inner) = inner.lock() {
                     trace!("idle interval checking for expired");
                     inner.clear_expired();
@@ -764,7 +790,7 @@
     use std::time::Duration;
 
     use super::{Connecting, Key, Pool, Poolable, Reservation, WeakOpt};
-    use crate::common::{task, Exec, Future, Pin};
+    use crate::common::{exec::Exec, task, Future, Pin};
 
     /// Test unique reservations.
     #[derive(Debug, PartialEq, Eq)]
@@ -850,7 +876,7 @@
         let pooled = pool.pooled(c(key.clone()), Uniq(41));
 
         drop(pooled);
-        tokio::time::delay_for(pool.locked().timeout.unwrap()).await;
+        tokio::time::sleep(pool.locked().timeout.unwrap()).await;
         let mut checkout = pool.checkout(key);
         let poll_once = PollOnce(&mut checkout);
         let is_not_ready = poll_once.await.is_none();
@@ -871,7 +897,7 @@
             pool.locked().idle.get(&key).map(|entries| entries.len()),
             Some(3)
         );
-        tokio::time::delay_for(pool.locked().timeout.unwrap()).await;
+        tokio::time::sleep(pool.locked().timeout.unwrap()).await;
 
         let mut checkout = pool.checkout(key.clone());
         let poll_once = PollOnce(&mut checkout);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/client/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/client/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
 
 #[tokio::test]
 async fn client_connect_uri_argument() {
-    let connector = tower_util::service_fn(|dst: http::Uri| {
+    let connector = tower::service_fn(|dst: http::Uri| {
         assert_eq!(dst.scheme(), Some(&http::uri::Scheme::HTTP));
         assert_eq!(dst.host(), Some("example.local"));
         assert_eq!(dst.port(), None);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/buf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use std::collections::VecDeque;
 use std::io::IoSlice;
 
-use bytes::Buf;
+use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 pub(crate) struct BufList<T> {
     bufs: VecDeque<T>,
@@ -21,6 +21,7 @@
     }
 
     #[inline]
+    #[cfg(feature = "http1")]
     pub(crate) fn bufs_cnt(&self) -> usize {
         self.bufs.len()
     }
@@ -33,8 +34,8 @@
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
-        self.bufs.front().map(Buf::bytes).unwrap_or_default()
+    fn chunk(&self) -> &[u8] {
+        self.bufs.front().map(Buf::chunk).unwrap_or_default()
     }
 
     #[inline]
@@ -56,17 +57,95 @@
     }
 
     #[inline]
-    fn bytes_vectored<'t>(&'t self, dst: &mut [IoSlice<'t>]) -> usize {
+    fn chunks_vectored<'t>(&'t self, dst: &mut [IoSlice<'t>]) -> usize {
         if dst.is_empty() {
             return 0;
         }
         let mut vecs = 0;
         for buf in &self.bufs {
-            vecs += buf.bytes_vectored(&mut dst[vecs..]);
+            vecs += buf.chunks_vectored(&mut dst[vecs..]);
             if vecs == dst.len() {
                 break;
             }
         }
         vecs
     }
+
+    #[inline]
+    fn copy_to_bytes(&mut self, len: usize) -> Bytes {
+        // Our inner buffer may have an optimized version of copy_to_bytes, and if the whole
+        // request can be fulfilled by the front buffer, we can take advantage.
+        match self.bufs.front_mut() {
+            Some(front) if front.remaining() == len => {
+                let b = front.copy_to_bytes(len);
+                self.bufs.pop_front();
+                b
+            }
+            Some(front) if front.remaining() > len => front.copy_to_bytes(len),
+            _ => {
+                assert!(len <= self.remaining(), "`len` greater than remaining");
+                let mut bm = BytesMut::with_capacity(len);
+                bm.put(self.take(len));
+                bm.freeze()
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::ptr;
+
+    use super::*;
+
+    fn hello_world_buf() -> BufList<Bytes> {
+        BufList {
+            bufs: vec![Bytes::from("Hello"), Bytes::from(" "), Bytes::from("World")].into(),
+        }
+    }
+
+    #[test]
+    fn to_bytes_shorter() {
+        let mut bufs = hello_world_buf();
+        let old_ptr = bufs.chunk().as_ptr();
+        let start = bufs.copy_to_bytes(4);
+        assert_eq!(start, "Hell");
+        assert!(ptr::eq(old_ptr, start.as_ptr()));
+        assert_eq!(bufs.chunk(), b"o");
+        assert!(ptr::eq(old_ptr.wrapping_add(4), bufs.chunk().as_ptr()));
+        assert_eq!(bufs.remaining(), 7);
+    }
+
+    #[test]
+    fn to_bytes_eq() {
+        let mut bufs = hello_world_buf();
+        let old_ptr = bufs.chunk().as_ptr();
+        let start = bufs.copy_to_bytes(5);
+        assert_eq!(start, "Hello");
+        assert!(ptr::eq(old_ptr, start.as_ptr()));
+        assert_eq!(bufs.chunk(), b" ");
+        assert_eq!(bufs.remaining(), 6);
+    }
+
+    #[test]
+    fn to_bytes_longer() {
+        let mut bufs = hello_world_buf();
+        let start = bufs.copy_to_bytes(7);
+        assert_eq!(start, "Hello W");
+        assert_eq!(bufs.remaining(), 4);
+    }
+
+    #[test]
+    fn one_long_buf_to_bytes() {
+        let mut buf = BufList::new();
+        buf.push(b"Hello World" as &[_]);
+        assert_eq!(buf.copy_to_bytes(5), "Hello");
+        assert_eq!(buf.chunk(), b" World");
+    }
+
+    #[test]
+    #[should_panic(expected = "`len` greater than remaining")]
+    fn buf_to_bytes_too_many() {
+        hello_world_buf().copy_to_bytes(42);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/date.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/date.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/date.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/date.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,124 @@
+use std::cell::RefCell;
+use std::fmt::{self, Write};
+use std::str;
+use std::time::{Duration, SystemTime};
+
+#[cfg(feature = "http2")]
+use http::header::HeaderValue;
+use httpdate::HttpDate;
+
+// "Sun, 06 Nov 1994 08:49:37 GMT".len()
+pub(crate) const DATE_VALUE_LENGTH: usize = 29;
+
+#[cfg(feature = "http1")]
+pub(crate) fn extend(dst: &mut Vec<u8>) {
+    CACHED.with(|cache| {
+        dst.extend_from_slice(cache.borrow().buffer());
+    })
+}
+
+#[cfg(feature = "http1")]
+pub(crate) fn update() {
+    CACHED.with(|cache| {
+        cache.borrow_mut().check();
+    })
+}
+
+#[cfg(feature = "http2")]
+pub(crate) fn update_and_header_value() -> HeaderValue {
+    CACHED.with(|cache| {
+        let mut cache = cache.borrow_mut();
+        cache.check();
+        HeaderValue::from_bytes(cache.buffer()).expect("Date format should be valid HeaderValue")
+    })
+}
+
+struct CachedDate {
+    bytes: [u8; DATE_VALUE_LENGTH],
+    pos: usize,
+    next_update: SystemTime,
+}
+
+thread_local!(static CACHED: RefCell<CachedDate> = RefCell::new(CachedDate::new()));
+
+impl CachedDate {
+    fn new() -> Self {
+        let mut cache = CachedDate {
+            bytes: [0; DATE_VALUE_LENGTH],
+            pos: 0,
+            next_update: SystemTime::now(),
+        };
+        cache.update(cache.next_update);
+        cache
+    }
+
+    fn buffer(&self) -> &[u8] {
+        &self.bytes[..]
+    }
+
+    fn check(&mut self) {
+        let now = SystemTime::now();
+        if now > self.next_update {
+            self.update(now);
+        }
+    }
+
+    fn update(&mut self, now: SystemTime) {
+        self.render(now);
+        self.next_update = now + Duration::new(1, 0);
+    }
+
+    fn render(&mut self, now: SystemTime) {
+        self.pos = 0;
+        let _ = write!(self, "{}", HttpDate::from(now));
+        debug_assert!(self.pos == DATE_VALUE_LENGTH);
+    }
+}
+
+impl fmt::Write for CachedDate {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        let len = s.len();
+        self.bytes[self.pos..self.pos + len].copy_from_slice(s.as_bytes());
+        self.pos += len;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[cfg(feature = "nightly")]
+    use test::Bencher;
+
+    #[test]
+    fn test_date_len() {
+        assert_eq!(DATE_VALUE_LENGTH, "Sun, 06 Nov 1994 08:49:37 GMT".len());
+    }
+
+    #[cfg(feature = "nightly")]
+    #[bench]
+    fn bench_date_check(b: &mut Bencher) {
+        let mut date = CachedDate::new();
+        // cache the first update
+        date.check();
+
+        b.iter(|| {
+            date.check();
+        });
+    }
+
+    #[cfg(feature = "nightly")]
+    #[bench]
+    fn bench_date_render(b: &mut Bencher) {
+        let mut date = CachedDate::new();
+        let now = SystemTime::now();
+        date.render(now);
+        b.bytes = date.buffer().len() as u64;
+
+        b.iter(|| {
+            date.render(now);
+            test::black_box(&date);
+        });
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/drain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/drain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/drain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/drain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,52 +1,35 @@
 use std::mem;
 
-use pin_project::pin_project;
-use tokio::sync::{mpsc, watch};
+use pin_project_lite::pin_project;
+use tokio::sync::watch;
 
-use super::{task, Future, Never, Pin, Poll};
+use super::{task, Future, Pin, Poll};
 
-// Sentinel value signaling that the watch is still open
-#[derive(Clone, Copy)]
-enum Action {
-    Open,
-    // Closed isn't sent via the `Action` type, but rather once
-    // the watch::Sender is dropped.
-}
-
-pub fn channel() -> (Signal, Watch) {
-    let (tx, rx) = watch::channel(Action::Open);
-    let (drained_tx, drained_rx) = mpsc::channel(1);
-    (
-        Signal {
-            drained_rx,
-            _tx: tx,
-        },
-        Watch { drained_tx, rx },
-    )
-}
-
-pub struct Signal {
-    drained_rx: mpsc::Receiver<Never>,
-    _tx: watch::Sender<Action>,
+pub(crate) fn channel() -> (Signal, Watch) {
+    let (tx, rx) = watch::channel(());
+    (Signal { tx }, Watch { rx })
 }
 
-pub struct Draining {
-    drained_rx: mpsc::Receiver<Never>,
+pub(crate) struct Signal {
+    tx: watch::Sender<()>,
 }
 
+pub(crate) struct Draining(Pin<Box<dyn Future<Output = ()> + Send + Sync>>);
+
 #[derive(Clone)]
-pub struct Watch {
-    drained_tx: mpsc::Sender<Never>,
-    rx: watch::Receiver<Action>,
+pub(crate) struct Watch {
+    rx: watch::Receiver<()>,
 }
 
-#[allow(missing_debug_implementations)]
-#[pin_project]
-pub struct Watching<F, FN> {
-    #[pin]
-    future: F,
-    state: State<FN>,
-    watch: Watch,
+pin_project! {
+    #[allow(missing_debug_implementations)]
+    pub struct Watching<F, FN> {
+        #[pin]
+        future: F,
+        state: State<FN>,
+        watch: Pin<Box<dyn Future<Output = ()> + Send + Sync>>,
+        _rx: watch::Receiver<()>,
+    }
 }
 
 enum State<F> {
@@ -55,11 +38,9 @@
 }
 
 impl Signal {
-    pub fn drain(self) -> Draining {
-        // Simply dropping `self.tx` will signal the watchers
-        Draining {
-            drained_rx: self.drained_rx,
-        }
+    pub(crate) fn drain(self) -> Draining {
+        let _ = self.tx.send(());
+        Draining(Box::pin(async move { self.tx.closed().await }))
     }
 }
 
@@ -67,23 +48,27 @@
     type Output = ();
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
-        match ready!(self.drained_rx.poll_recv(cx)) {
-            Some(never) => match never {},
-            None => Poll::Ready(()),
-        }
+        Pin::new(&mut self.as_mut().0).poll(cx)
     }
 }
 
 impl Watch {
-    pub fn watch<F, FN>(self, future: F, on_drain: FN) -> Watching<F, FN>
+    pub(crate) fn watch<F, FN>(self, future: F, on_drain: FN) -> Watching<F, FN>
     where
         F: Future,
         FN: FnOnce(Pin<&mut F>),
     {
+        let Self { mut rx } = self;
+        let _rx = rx.clone();
         Watching {
             future,
             state: State::Watch(on_drain),
-            watch: self,
+            watch: Box::pin(async move {
+                let _ = rx.changed().await;
+            }),
+            // Keep the receiver alive until the future completes, so that
+            // dropping it can signal that draining has completed.
+            _rx,
         }
     }
 }
@@ -100,12 +85,12 @@
         loop {
             match mem::replace(me.state, State::Draining) {
                 State::Watch(on_drain) => {
-                    match me.watch.rx.poll_recv_ref(cx) {
-                        Poll::Ready(None) => {
+                    match Pin::new(&mut me.watch).poll(cx) {
+                        Poll::Ready(()) => {
                             // Drain has been triggered!
                             on_drain(me.future.as_mut());
                         }
-                        Poll::Ready(Some(_ /*State::Open*/)) | Poll::Pending => {
+                        Poll::Pending => {
                             *me.state = State::Watch(on_drain);
                             return me.future.poll(cx);
                         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/exec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/exec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/exec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/exec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,26 +3,27 @@
 use std::pin::Pin;
 use std::sync::Arc;
 
+#[cfg(feature = "server")]
 use crate::body::{Body, HttpBody};
+#[cfg(all(feature = "http2", feature = "server"))]
 use crate::proto::h2::server::H2Stream;
+use crate::rt::Executor;
+#[cfg(feature = "server")]
 use crate::server::conn::spawn_all::{NewSvcTask, Watcher};
+#[cfg(feature = "server")]
 use crate::service::HttpService;
 
-/// An executor of futures.
-pub trait Executor<Fut> {
-    /// Place the future into the executor to be run.
-    fn execute(&self, fut: Fut);
-}
-
-pub trait H2Exec<F, B: HttpBody>: Clone {
+#[cfg(feature = "server")]
+pub trait ConnStreamExec<F, B: HttpBody>: Clone {
     fn execute_h2stream(&mut self, fut: H2Stream<F, B>);
 }
 
+#[cfg(feature = "server")]
 pub trait NewSvcExec<I, N, S: HttpService<Body>, E, W: Watcher<I, S, E>>: Clone {
     fn execute_new_svc(&mut self, fut: NewSvcTask<I, N, S, E, W>);
 }
 
-pub type BoxSendFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
+pub(crate) type BoxSendFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
 
 // Either the user provides an executor for background tasks, or we use
 // `tokio::spawn`.
@@ -64,7 +65,8 @@
     }
 }
 
-impl<F, B> H2Exec<F, B> for Exec
+#[cfg(feature = "server")]
+impl<F, B> ConnStreamExec<F, B> for Exec
 where
     H2Stream<F, B>: Future<Output = ()> + Send + 'static,
     B: HttpBody,
@@ -74,6 +76,7 @@
     }
 }
 
+#[cfg(feature = "server")]
 impl<I, N, S, E, W> NewSvcExec<I, N, S, E, W> for Exec
 where
     NewSvcTask<I, N, S, E, W>: Future<Output = ()> + Send + 'static,
@@ -87,7 +90,8 @@
 
 // ==== impl Executor =====
 
-impl<E, F, B> H2Exec<F, B> for E
+#[cfg(feature = "server")]
+impl<E, F, B> ConnStreamExec<F, B> for E
 where
     E: Executor<H2Stream<F, B>> + Clone,
     H2Stream<F, B>: Future<Output = ()>,
@@ -98,6 +102,7 @@
     }
 }
 
+#[cfg(feature = "server")]
 impl<I, N, S, E, W> NewSvcExec<I, N, S, E, W> for E
 where
     E: Executor<NewSvcTask<I, N, S, E, W>> + Clone,
@@ -109,3 +114,30 @@
         self.execute(fut)
     }
 }
+
+// If http2 is not enable, we just have a stub here, so that the trait bounds
+// that *would* have been needed are still checked. Why?
+//
+// Because enabling `http2` shouldn't suddenly add new trait bounds that cause
+// a compilation error.
+#[cfg(not(feature = "http2"))]
+#[allow(missing_debug_implementations)]
+pub struct H2Stream<F, B>(std::marker::PhantomData<(F, B)>);
+
+#[cfg(not(feature = "http2"))]
+impl<F, B, E> Future for H2Stream<F, B>
+where
+    F: Future<Output = Result<http::Response<B>, E>>,
+    B: crate::body::HttpBody,
+    B::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
+    E: Into<Box<dyn std::error::Error + Send + Sync>>,
+{
+    type Output = ();
+
+    fn poll(
+        self: Pin<&mut Self>,
+        _cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Self::Output> {
+        unreachable!()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/io/rewind.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/io/rewind.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/io/rewind.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/io/rewind.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 use std::{cmp, io};
 
 use bytes::{Buf, Bytes};
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
 use crate::common::{task, Pin, Poll};
 
@@ -14,6 +14,7 @@
 }
 
 impl<T> Rewind<T> {
+    #[cfg(any(all(feature = "http2", feature = "server"), test))]
     pub(crate) fn new(io: T) -> Self {
         Rewind {
             pre: None,
@@ -28,6 +29,7 @@
         }
     }
 
+    #[cfg(any(all(feature = "http1", feature = "http2", feature = "server"), test))]
     pub(crate) fn rewind(&mut self, bs: Bytes) {
         debug_assert!(self.pre.is_none());
         self.pre = Some(bs);
@@ -37,36 +39,33 @@
         (self.inner, self.pre.unwrap_or_else(Bytes::new))
     }
 
-    pub(crate) fn get_mut(&mut self) -> &mut T {
-        &mut self.inner
-    }
+    // pub(crate) fn get_mut(&mut self) -> &mut T {
+    //     &mut self.inner
+    // }
 }
 
 impl<T> AsyncRead for Rewind<T>
 where
     T: AsyncRead + Unpin,
 {
-    #[inline]
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        self.inner.prepare_uninitialized_buffer(buf)
-    }
-
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut task::Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         if let Some(mut prefix) = self.pre.take() {
             // If there are no remaining bytes, let the bytes get dropped.
             if !prefix.is_empty() {
-                let copy_len = cmp::min(prefix.len(), buf.len());
-                prefix.copy_to_slice(&mut buf[..copy_len]);
+                let copy_len = cmp::min(prefix.len(), buf.remaining());
+                // TODO: There should be a way to do following two lines cleaner...
+                buf.put_slice(&prefix[..copy_len]);
+                prefix.advance(copy_len);
                 // Put back whats left
                 if !prefix.is_empty() {
                     self.pre = Some(prefix);
                 }
 
-                return Poll::Ready(Ok(copy_len));
+                return Poll::Ready(Ok(()));
             }
         }
         Pin::new(&mut self.inner).poll_read(cx, buf)
@@ -85,6 +84,14 @@
         Pin::new(&mut self.inner).poll_write(cx, buf)
     }
 
+    fn poll_write_vectored(
+        mut self: Pin<&mut Self>,
+        cx: &mut task::Context<'_>,
+        bufs: &[io::IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        Pin::new(&mut self.inner).poll_write_vectored(cx, bufs)
+    }
+
     fn poll_flush(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
         Pin::new(&mut self.inner).poll_flush(cx)
     }
@@ -93,13 +100,8 @@
         Pin::new(&mut self.inner).poll_shutdown(cx)
     }
 
-    #[inline]
-    fn poll_write_buf<B: Buf>(
-        mut self: Pin<&mut Self>,
-        cx: &mut task::Context<'_>,
-        buf: &mut B,
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.inner).poll_write_buf(cx, buf)
+    fn is_write_vectored(&self) -> bool {
+        self.inner.is_write_vectored()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/lazy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/lazy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/lazy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/lazy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use std::mem;
+use pin_project_lite::pin_project;
 
 use super::{task, Future, Pin, Poll};
 
@@ -12,31 +12,38 @@
     R: Future + Unpin,
 {
     Lazy {
-        inner: Inner::Init(func),
+        inner: Inner::Init { func },
     }
 }
 
 // FIXME: allow() required due to `impl Trait` leaking types to this lint
-#[allow(missing_debug_implementations)]
-pub(crate) struct Lazy<F, R> {
-    inner: Inner<F, R>,
+pin_project! {
+    #[allow(missing_debug_implementations)]
+    pub(crate) struct Lazy<F, R> {
+        #[pin]
+        inner: Inner<F, R>,
+    }
 }
 
-enum Inner<F, R> {
-    Init(F),
-    Fut(R),
-    Empty,
+pin_project! {
+    #[project = InnerProj]
+    #[project_replace = InnerProjReplace]
+    enum Inner<F, R> {
+        Init { func: F },
+        Fut { #[pin] fut: R },
+        Empty,
+    }
 }
 
 impl<F, R> Started for Lazy<F, R>
 where
     F: FnOnce() -> R,
-    R: Future + Unpin,
+    R: Future,
 {
     fn started(&self) -> bool {
         match self.inner {
-            Inner::Init(_) => false,
-            Inner::Fut(_) | Inner::Empty => true,
+            Inner::Init { .. } => false,
+            Inner::Fut { .. } | Inner::Empty => true,
         }
     }
 }
@@ -44,26 +51,26 @@
 impl<F, R> Future for Lazy<F, R>
 where
     F: FnOnce() -> R,
-    R: Future + Unpin,
+    R: Future,
 {
     type Output = R::Output;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
-        if let Inner::Fut(ref mut f) = self.inner {
-            return Pin::new(f).poll(cx);
+    fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
+        let mut this = self.project();
+
+        if let InnerProj::Fut { fut } = this.inner.as_mut().project() {
+            return fut.poll(cx);
         }
 
-        match mem::replace(&mut self.inner, Inner::Empty) {
-            Inner::Init(func) => {
-                let mut fut = func();
-                let ret = Pin::new(&mut fut).poll(cx);
-                self.inner = Inner::Fut(fut);
-                ret
+        match this.inner.as_mut().project_replace(Inner::Empty) {
+            InnerProjReplace::Init { func } => {
+                this.inner.set(Inner::Fut { fut: func() });
+                if let InnerProj::Fut { fut } = this.inner.project() {
+                    return fut.poll(cx);
+                }
+                unreachable!()
             }
             _ => unreachable!("lazy state wrong"),
         }
     }
 }
-
-// The closure `F` is never pinned
-impl<F, R: Unpin> Unpin for Lazy<F, R> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,9 +8,14 @@
 }
 
 pub(crate) mod buf;
+#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
+pub(crate) mod date;
+#[cfg(all(feature = "server", any(feature = "http1", feature = "http2")))]
 pub(crate) mod drain;
+#[cfg(any(feature = "http1", feature = "http2"))]
 pub(crate) mod exec;
 pub(crate) mod io;
+#[cfg(all(feature = "client", any(feature = "http1", feature = "http2")))]
 mod lazy;
 mod never;
 #[cfg(feature = "stream")]
@@ -18,11 +23,19 @@
 pub(crate) mod task;
 pub(crate) mod watch;
 
-pub use self::exec::Executor;
-pub(crate) use self::exec::{BoxSendFuture, Exec};
+#[cfg(all(feature = "client", any(feature = "http1", feature = "http2")))]
 pub(crate) use self::lazy::{lazy, Started as Lazy};
-pub use self::never::Never;
+#[cfg(any(
+    feature = "client",
+    feature = "http1",
+    feature = "http2",
+    feature = "runtime"
+))]
+pub(crate) use self::never::Never;
 pub(crate) use self::task::Poll;
 
 // group up types normally needed for `Future`
-pub(crate) use std::{future::Future, marker::Unpin, pin::Pin};
+cfg_proto! {
+    pub(crate) use std::marker::Unpin;
+}
+pub(crate) use std::{future::Future, pin::Pin};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/never.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/never.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/never.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/never.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 use std::fmt;
 
 #[derive(Debug)]
-pub enum Never {}
+pub(crate) enum Never {}
 
 impl fmt::Display for Never {
     fn fmt(&self, _: &mut fmt::Formatter<'_>) -> fmt::Result {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/sync_wrapper.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/sync_wrapper.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/sync_wrapper.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/sync_wrapper.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,6 @@
 /*
  * This is a copy of the sync_wrapper crate.
  */
-//! A mutual exclusion primitive that relies on static type information only
-//!
-//! This library is inspired by [this discussion](https://internals.rust-lang.org/t/what-shall-sync-mean-across-an-await/12020/2).
-#![doc(html_logo_url = "https://developer.actyx.com/img/logo.svg")]
-#![doc(html_favicon_url = "https://developer.actyx.com/img/favicon.ico")]
 
 /// A mutual exclusion primitive that relies on static type information only
 ///
@@ -46,7 +41,7 @@
 /// [`poll`]: https://doc.rust-lang.org/std/future/trait.Future.html#method.poll
 /// [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
 #[repr(transparent)]
-pub struct SyncWrapper<T>(T);
+pub(crate) struct SyncWrapper<T>(T);
 
 impl<T> SyncWrapper<T> {
     /// Creates a new SyncWrapper containing the given value.
@@ -58,7 +53,7 @@
     ///
     /// let wrapped = SyncWrapper::new(42);
     /// ```
-    pub fn new(value: T) -> Self {
+    pub(crate) fn new(value: T) -> Self {
         Self(value)
     }
 
@@ -82,7 +77,7 @@
     /// *value = 0;
     /// assert_eq!(*wrapped.get_mut(), 0);
     /// ```
-    pub fn get_mut(&mut self) -> &mut T {
+    pub(crate) fn get_mut(&mut self) -> &mut T {
         &mut self.0
     }
 
@@ -105,7 +100,7 @@
     /// assert_eq!(wrapped.into_inner(), 42);
     /// ```
     #[allow(dead_code)]
-    pub fn into_inner(self) -> T {
+    pub(crate) fn into_inner(self) -> T {
         self.0
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/task.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/task.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/common/task.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/common/task.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,11 @@
+#[cfg(feature = "http1")]
 use super::Never;
 pub(crate) use std::task::{Context, Poll};
 
 /// A function to help "yield" a future, such that it is re-scheduled immediately.
 ///
 /// Useful for spin counts, so a future doesn't hog too much time.
+#[cfg(feature = "http1")]
 pub(crate) fn yield_now(cx: &mut Context<'_>) -> Poll<Never> {
     cx.waker().wake_by_ref();
     Poll::Pending
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,6 @@
 //! Error and Result module.
 use std::error::Error as StdError;
 use std::fmt;
-use std::io;
 
 /// Result type often returned from methods that can have hyper `Error`s.
 pub type Result<T> = std::result::Result<T, Error>;
@@ -18,123 +17,175 @@
     cause: Option<Cause>,
 }
 
-#[derive(Debug, PartialEq)]
-pub(crate) enum Kind {
+#[derive(Debug)]
+pub(super) enum Kind {
     Parse(Parse),
     User(User),
     /// A message reached EOF, but is not complete.
+    #[allow(unused)]
     IncompleteMessage,
     /// A connection received a message (or bytes) when not waiting for one.
+    #[cfg(feature = "http1")]
     UnexpectedMessage,
     /// A pending item was dropped before ever being processed.
     Canceled,
     /// Indicates a channel (client or body sender) is closed.
     ChannelClosed,
     /// An `io::Error` that occurred while trying to read or write to a network stream.
+    #[cfg(any(feature = "http1", feature = "http2"))]
     Io,
     /// Error occurred while connecting.
+    #[allow(unused)]
     Connect,
     /// Error creating a TcpListener.
-    #[cfg(feature = "tcp")]
+    #[cfg(all(
+        any(feature = "http1", feature = "http2"),
+        feature = "tcp",
+        feature = "server"
+    ))]
     Listen,
     /// Error accepting on an Incoming stream.
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "server")]
     Accept,
     /// Error while reading a body from connection.
+    #[cfg(any(feature = "http1", feature = "http2", feature = "stream"))]
     Body,
     /// Error while writing a body to connection.
+    #[cfg(any(feature = "http1", feature = "http2"))]
     BodyWrite,
     /// The body write was aborted.
     BodyWriteAborted,
     /// Error calling AsyncWrite::shutdown()
+    #[cfg(feature = "http1")]
     Shutdown,
 
     /// A general error from h2.
+    #[cfg(feature = "http2")]
     Http2,
 }
 
-#[derive(Debug, PartialEq)]
-pub(crate) enum Parse {
+#[derive(Debug)]
+pub(super) enum Parse {
     Method,
     Version,
+    #[cfg(feature = "http1")]
     VersionH2,
     Uri,
-    Header,
+    Header(Header),
     TooLarge,
     Status,
+    #[cfg_attr(debug_assertions, allow(unused))]
+    Internal,
 }
 
-#[derive(Debug, PartialEq)]
-pub(crate) enum User {
+#[derive(Debug)]
+pub(super) enum Header {
+    Token,
+    #[cfg(feature = "http1")]
+    ContentLengthInvalid,
+    #[cfg(all(feature = "http1", feature = "server"))]
+    TransferEncodingInvalid,
+    #[cfg(feature = "http1")]
+    TransferEncodingUnexpected,
+}
+
+#[derive(Debug)]
+pub(super) enum User {
     /// Error calling user's HttpBody::poll_data().
+    #[cfg(any(feature = "http1", feature = "http2"))]
     Body,
     /// Error calling user's MakeService.
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "server")]
     MakeService,
     /// Error from future of user's Service.
+    #[cfg(any(feature = "http1", feature = "http2"))]
     Service,
     /// User tried to send a certain header in an unexpected context.
     ///
     /// For example, sending both `content-length` and `transfer-encoding`.
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "server")]
     UnexpectedHeader,
     /// User tried to create a Request with bad version.
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
     UnsupportedVersion,
     /// User tried to create a CONNECT Request with the Client.
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
     UnsupportedRequestMethod,
     /// User tried to respond with a 1xx (not 101) response code.
+    #[cfg(feature = "http1")]
+    #[cfg(feature = "server")]
     UnsupportedStatusCode,
     /// User tried to send a Request with Client with non-absolute URI.
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
     AbsoluteUriRequired,
 
     /// User tried polling for an upgrade that doesn't exist.
     NoUpgrade,
 
     /// User polled for an upgrade, but low-level API is not using upgrades.
+    #[cfg(feature = "http1")]
     ManualUpgrade,
+
+    /// User aborted in an FFI callback.
+    #[cfg(feature = "ffi")]
+    AbortedByCallback,
 }
 
 // Sentinel type to indicate the error was caused by a timeout.
 #[derive(Debug)]
-pub(crate) struct TimedOut;
+pub(super) struct TimedOut;
 
 impl Error {
     /// Returns true if this was an HTTP parse error.
     pub fn is_parse(&self) -> bool {
-        match self.inner.kind {
-            Kind::Parse(_) => true,
-            _ => false,
-        }
+        matches!(self.inner.kind, Kind::Parse(_))
+    }
+
+    /// Returns true if this was an HTTP parse error caused by a message that was too large.
+    pub fn is_parse_too_large(&self) -> bool {
+        matches!(self.inner.kind, Kind::Parse(Parse::TooLarge))
+    }
+
+    /// Returns true if this was an HTTP parse error caused by an invalid response status code or
+    /// reason phrase.
+    pub fn is_parse_status(&self) -> bool {
+        matches!(self.inner.kind, Kind::Parse(Parse::Status))
     }
 
     /// Returns true if this error was caused by user code.
     pub fn is_user(&self) -> bool {
-        match self.inner.kind {
-            Kind::User(_) => true,
-            _ => false,
-        }
+        matches!(self.inner.kind, Kind::User(_))
     }
 
     /// Returns true if this was about a `Request` that was canceled.
     pub fn is_canceled(&self) -> bool {
-        self.inner.kind == Kind::Canceled
+        matches!(self.inner.kind, Kind::Canceled)
     }
 
     /// Returns true if a sender's channel is closed.
     pub fn is_closed(&self) -> bool {
-        self.inner.kind == Kind::ChannelClosed
+        matches!(self.inner.kind, Kind::ChannelClosed)
     }
 
     /// Returns true if this was an error from `Connect`.
     pub fn is_connect(&self) -> bool {
-        self.inner.kind == Kind::Connect
+        matches!(self.inner.kind, Kind::Connect)
     }
 
     /// Returns true if the connection closed before a message could complete.
     pub fn is_incomplete_message(&self) -> bool {
-        self.inner.kind == Kind::IncompleteMessage
+        matches!(self.inner.kind, Kind::IncompleteMessage)
     }
 
     /// Returns true if the body write was aborted.
     pub fn is_body_write_aborted(&self) -> bool {
-        self.inner.kind == Kind::BodyWriteAborted
+        matches!(self.inner.kind, Kind::BodyWriteAborted)
     }
 
     /// Returns true if the error was caused by a timeout.
@@ -147,22 +198,23 @@
         self.inner.cause
     }
 
-    pub(crate) fn new(kind: Kind) -> Error {
+    pub(super) fn new(kind: Kind) -> Error {
         Error {
             inner: Box::new(ErrorImpl { kind, cause: None }),
         }
     }
 
-    pub(crate) fn with<C: Into<Cause>>(mut self, cause: C) -> Error {
+    pub(super) fn with<C: Into<Cause>>(mut self, cause: C) -> Error {
         self.inner.cause = Some(cause.into());
         self
     }
 
-    pub(crate) fn kind(&self) -> &Kind {
+    #[cfg(any(all(feature = "http1", feature = "server"), feature = "ffi"))]
+    pub(super) fn kind(&self) -> &Kind {
         &self.inner.kind
     }
 
-    fn find_source<E: StdError + 'static>(&self) -> Option<&E> {
+    pub(crate) fn find_source<E: StdError + 'static>(&self) -> Option<&E> {
         let mut cause = self.source();
         while let Some(err) = cause {
             if let Some(ref typed) = err.downcast_ref() {
@@ -175,7 +227,8 @@
         None
     }
 
-    pub(crate) fn h2_reason(&self) -> h2::Reason {
+    #[cfg(feature = "http2")]
+    pub(super) fn h2_reason(&self) -> h2::Reason {
         // Find an h2::Reason somewhere in the cause stack, if it exists,
         // otherwise assume an INTERNAL_ERROR.
         self.find_source::<h2::Error>()
@@ -183,56 +236,68 @@
             .unwrap_or(h2::Reason::INTERNAL_ERROR)
     }
 
-    pub(crate) fn new_canceled() -> Error {
+    pub(super) fn new_canceled() -> Error {
         Error::new(Kind::Canceled)
     }
 
-    pub(crate) fn new_incomplete() -> Error {
+    #[cfg(feature = "http1")]
+    pub(super) fn new_incomplete() -> Error {
         Error::new(Kind::IncompleteMessage)
     }
 
-    pub(crate) fn new_too_large() -> Error {
+    #[cfg(feature = "http1")]
+    pub(super) fn new_too_large() -> Error {
         Error::new(Kind::Parse(Parse::TooLarge))
     }
 
-    pub(crate) fn new_version_h2() -> Error {
+    #[cfg(feature = "http1")]
+    pub(super) fn new_version_h2() -> Error {
         Error::new(Kind::Parse(Parse::VersionH2))
     }
 
-    pub(crate) fn new_unexpected_message() -> Error {
+    #[cfg(feature = "http1")]
+    pub(super) fn new_unexpected_message() -> Error {
         Error::new(Kind::UnexpectedMessage)
     }
 
-    pub(crate) fn new_io(cause: io::Error) -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    pub(super) fn new_io(cause: std::io::Error) -> Error {
         Error::new(Kind::Io).with(cause)
     }
 
-    #[cfg(feature = "tcp")]
-    pub(crate) fn new_listen<E: Into<Cause>>(cause: E) -> Error {
+    #[cfg(all(any(feature = "http1", feature = "http2"), feature = "tcp"))]
+    #[cfg(feature = "server")]
+    pub(super) fn new_listen<E: Into<Cause>>(cause: E) -> Error {
         Error::new(Kind::Listen).with(cause)
     }
 
-    pub(crate) fn new_accept<E: Into<Cause>>(cause: E) -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "server")]
+    pub(super) fn new_accept<E: Into<Cause>>(cause: E) -> Error {
         Error::new(Kind::Accept).with(cause)
     }
 
-    pub(crate) fn new_connect<E: Into<Cause>>(cause: E) -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
+    pub(super) fn new_connect<E: Into<Cause>>(cause: E) -> Error {
         Error::new(Kind::Connect).with(cause)
     }
 
-    pub(crate) fn new_closed() -> Error {
+    pub(super) fn new_closed() -> Error {
         Error::new(Kind::ChannelClosed)
     }
 
-    pub(crate) fn new_body<E: Into<Cause>>(cause: E) -> Error {
+    #[cfg(any(feature = "http1", feature = "http2", feature = "stream"))]
+    pub(super) fn new_body<E: Into<Cause>>(cause: E) -> Error {
         Error::new(Kind::Body).with(cause)
     }
 
-    pub(crate) fn new_body_write<E: Into<Cause>>(cause: E) -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    pub(super) fn new_body_write<E: Into<Cause>>(cause: E) -> Error {
         Error::new(Kind::BodyWrite).with(cause)
     }
 
-    pub(crate) fn new_body_write_aborted() -> Error {
+    pub(super) fn new_body_write_aborted() -> Error {
         Error::new(Kind::BodyWriteAborted)
     }
 
@@ -240,51 +305,73 @@
         Error::new(Kind::User(user))
     }
 
-    pub(crate) fn new_user_header() -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "server")]
+    pub(super) fn new_user_header() -> Error {
         Error::new_user(User::UnexpectedHeader)
     }
 
-    pub(crate) fn new_user_unsupported_version() -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
+    pub(super) fn new_user_unsupported_version() -> Error {
         Error::new_user(User::UnsupportedVersion)
     }
 
-    pub(crate) fn new_user_unsupported_request_method() -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
+    pub(super) fn new_user_unsupported_request_method() -> Error {
         Error::new_user(User::UnsupportedRequestMethod)
     }
 
-    pub(crate) fn new_user_unsupported_status_code() -> Error {
+    #[cfg(feature = "http1")]
+    #[cfg(feature = "server")]
+    pub(super) fn new_user_unsupported_status_code() -> Error {
         Error::new_user(User::UnsupportedStatusCode)
     }
 
-    pub(crate) fn new_user_absolute_uri_required() -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "client")]
+    pub(super) fn new_user_absolute_uri_required() -> Error {
         Error::new_user(User::AbsoluteUriRequired)
     }
 
-    pub(crate) fn new_user_no_upgrade() -> Error {
+    pub(super) fn new_user_no_upgrade() -> Error {
         Error::new_user(User::NoUpgrade)
     }
 
-    pub(crate) fn new_user_manual_upgrade() -> Error {
+    #[cfg(feature = "http1")]
+    pub(super) fn new_user_manual_upgrade() -> Error {
         Error::new_user(User::ManualUpgrade)
     }
 
-    pub(crate) fn new_user_make_service<E: Into<Cause>>(cause: E) -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[cfg(feature = "server")]
+    pub(super) fn new_user_make_service<E: Into<Cause>>(cause: E) -> Error {
         Error::new_user(User::MakeService).with(cause)
     }
 
-    pub(crate) fn new_user_service<E: Into<Cause>>(cause: E) -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    pub(super) fn new_user_service<E: Into<Cause>>(cause: E) -> Error {
         Error::new_user(User::Service).with(cause)
     }
 
-    pub(crate) fn new_user_body<E: Into<Cause>>(cause: E) -> Error {
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    pub(super) fn new_user_body<E: Into<Cause>>(cause: E) -> Error {
         Error::new_user(User::Body).with(cause)
     }
 
-    pub(crate) fn new_shutdown(cause: io::Error) -> Error {
+    #[cfg(feature = "http1")]
+    pub(super) fn new_shutdown(cause: std::io::Error) -> Error {
         Error::new(Kind::Shutdown).with(cause)
     }
 
-    pub(crate) fn new_h2(cause: ::h2::Error) -> Error {
+    #[cfg(feature = "ffi")]
+    pub(super) fn new_user_aborted_by_callback() -> Error {
+        Error::new_user(User::AbortedByCallback)
+    }
+
+    #[cfg(feature = "http2")]
+    pub(super) fn new_h2(cause: ::h2::Error) -> Error {
         if cause.is_io() {
             Error::new_io(cause.into_io().expect("h2::Error::is_io"))
         } else {
@@ -296,38 +383,80 @@
         match self.inner.kind {
             Kind::Parse(Parse::Method) => "invalid HTTP method parsed",
             Kind::Parse(Parse::Version) => "invalid HTTP version parsed",
+            #[cfg(feature = "http1")]
             Kind::Parse(Parse::VersionH2) => "invalid HTTP version parsed (found HTTP2 preface)",
             Kind::Parse(Parse::Uri) => "invalid URI",
-            Kind::Parse(Parse::Header) => "invalid HTTP header parsed",
+            Kind::Parse(Parse::Header(Header::Token)) => "invalid HTTP header parsed",
+            #[cfg(feature = "http1")]
+            Kind::Parse(Parse::Header(Header::ContentLengthInvalid)) => {
+                "invalid content-length parsed"
+            }
+            #[cfg(all(feature = "http1", feature = "server"))]
+            Kind::Parse(Parse::Header(Header::TransferEncodingInvalid)) => {
+                "invalid transfer-encoding parsed"
+            }
+            #[cfg(feature = "http1")]
+            Kind::Parse(Parse::Header(Header::TransferEncodingUnexpected)) => {
+                "unexpected transfer-encoding parsed"
+            }
             Kind::Parse(Parse::TooLarge) => "message head is too large",
             Kind::Parse(Parse::Status) => "invalid HTTP status-code parsed",
+            Kind::Parse(Parse::Internal) => {
+                "internal error inside Hyper and/or its dependencies, please report"
+            }
             Kind::IncompleteMessage => "connection closed before message completed",
+            #[cfg(feature = "http1")]
             Kind::UnexpectedMessage => "received unexpected message from connection",
             Kind::ChannelClosed => "channel closed",
             Kind::Connect => "error trying to connect",
             Kind::Canceled => "operation was canceled",
-            #[cfg(feature = "tcp")]
+            #[cfg(all(any(feature = "http1", feature = "http2"), feature = "tcp"))]
+            #[cfg(feature = "server")]
             Kind::Listen => "error creating server listener",
+            #[cfg(any(feature = "http1", feature = "http2"))]
+            #[cfg(feature = "server")]
             Kind::Accept => "error accepting connection",
+            #[cfg(any(feature = "http1", feature = "http2", feature = "stream"))]
             Kind::Body => "error reading a body from connection",
+            #[cfg(any(feature = "http1", feature = "http2"))]
             Kind::BodyWrite => "error writing a body to connection",
             Kind::BodyWriteAborted => "body write aborted",
+            #[cfg(feature = "http1")]
             Kind::Shutdown => "error shutting down connection",
+            #[cfg(feature = "http2")]
             Kind::Http2 => "http2 error",
+            #[cfg(any(feature = "http1", feature = "http2"))]
             Kind::Io => "connection error",
 
+            #[cfg(any(feature = "http1", feature = "http2"))]
             Kind::User(User::Body) => "error from user's HttpBody stream",
+            #[cfg(any(feature = "http1", feature = "http2"))]
+            #[cfg(feature = "server")]
             Kind::User(User::MakeService) => "error from user's MakeService",
+            #[cfg(any(feature = "http1", feature = "http2"))]
             Kind::User(User::Service) => "error from user's Service",
+            #[cfg(any(feature = "http1", feature = "http2"))]
+            #[cfg(feature = "server")]
             Kind::User(User::UnexpectedHeader) => "user sent unexpected header",
+            #[cfg(any(feature = "http1", feature = "http2"))]
+            #[cfg(feature = "client")]
             Kind::User(User::UnsupportedVersion) => "request has unsupported HTTP version",
+            #[cfg(any(feature = "http1", feature = "http2"))]
+            #[cfg(feature = "client")]
             Kind::User(User::UnsupportedRequestMethod) => "request has unsupported HTTP method",
+            #[cfg(feature = "http1")]
+            #[cfg(feature = "server")]
             Kind::User(User::UnsupportedStatusCode) => {
                 "response has 1xx status code, not supported by server"
             }
+            #[cfg(any(feature = "http1", feature = "http2"))]
+            #[cfg(feature = "client")]
             Kind::User(User::AbsoluteUriRequired) => "client requires absolute-form URIs",
             Kind::User(User::NoUpgrade) => "no upgrade available",
+            #[cfg(feature = "http1")]
             Kind::User(User::ManualUpgrade) => "upgrade expected but low level API in use",
+            #[cfg(feature = "ffi")]
+            Kind::User(User::AbortedByCallback) => "operation aborted by an application callback",
         }
     }
 }
@@ -369,13 +498,29 @@
     }
 }
 
+#[cfg(feature = "http1")]
+impl Parse {
+    pub(crate) fn content_length_invalid() -> Self {
+        Parse::Header(Header::ContentLengthInvalid)
+    }
+
+    #[cfg(all(feature = "http1", feature = "server"))]
+    pub(crate) fn transfer_encoding_invalid() -> Self {
+        Parse::Header(Header::TransferEncodingInvalid)
+    }
+
+    pub(crate) fn transfer_encoding_unexpected() -> Self {
+        Parse::Header(Header::TransferEncodingUnexpected)
+    }
+}
+
 impl From<httparse::Error> for Parse {
     fn from(err: httparse::Error) -> Parse {
         match err {
             httparse::Error::HeaderName
             | httparse::Error::HeaderValue
             | httparse::Error::NewLine
-            | httparse::Error::Token => Parse::Header,
+            | httparse::Error::Token => Parse::Header(Header::Token),
             httparse::Error::Status => Parse::Status,
             httparse::Error::TooManyHeaders => Parse::TooLarge,
             httparse::Error::Version => Parse::Version,
@@ -432,18 +577,21 @@
         assert_eq!(mem::size_of::<Error>(), mem::size_of::<usize>());
     }
 
+    #[cfg(feature = "http2")]
     #[test]
     fn h2_reason_unknown() {
         let closed = Error::new_closed();
         assert_eq!(closed.h2_reason(), h2::Reason::INTERNAL_ERROR);
     }
 
+    #[cfg(feature = "http2")]
     #[test]
     fn h2_reason_one_level() {
         let body_err = Error::new_user_body(h2::Error::from(h2::Reason::ENHANCE_YOUR_CALM));
         assert_eq!(body_err.h2_reason(), h2::Reason::ENHANCE_YOUR_CALM);
     }
 
+    #[cfg(feature = "http2")]
     #[test]
     fn h2_reason_nested() {
         let recvd = Error::new_h2(h2::Error::from(h2::Reason::HTTP_1_1_REQUIRED));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ext.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ext.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,64 @@
+//! HTTP extensions
+
+use bytes::Bytes;
+#[cfg(feature = "http1")]
+use http::header::{HeaderName, IntoHeaderName, ValueIter};
+use http::HeaderMap;
+
+/// A map from header names to their original casing as received in an HTTP message.
+///
+/// If an HTTP/1 response `res` is parsed on a connection whose option
+/// [`http1_preserve_header_case`] was set to true and the response included
+/// the following headers:
+///
+/// ```ignore
+/// x-Bread: Baguette
+/// X-BREAD: Pain
+/// x-bread: Ficelle
+/// ```
+///
+/// Then `res.extensions().get::<HeaderCaseMap>()` will return a map with:
+///
+/// ```ignore
+/// HeaderCaseMap({
+///     "x-bread": ["x-Bread", "X-BREAD", "x-bread"],
+/// })
+/// ```
+///
+/// [`http1_preserve_header_case`]: /client/struct.Client.html#method.http1_preserve_header_case
+#[derive(Clone, Debug)]
+pub(crate) struct HeaderCaseMap(HeaderMap<Bytes>);
+
+#[cfg(feature = "http1")]
+impl HeaderCaseMap {
+    /// Returns a view of all spellings associated with that header name,
+    /// in the order they were found.
+    pub(crate) fn get_all<'a>(
+        &'a self,
+        name: &HeaderName,
+    ) -> impl Iterator<Item = impl AsRef<[u8]> + 'a> + 'a {
+        self.get_all_internal(name).into_iter()
+    }
+
+    /// Returns a view of all spellings associated with that header name,
+    /// in the order they were found.
+    pub(crate) fn get_all_internal<'a>(&'a self, name: &HeaderName) -> ValueIter<'_, Bytes> {
+        self.0.get_all(name).into_iter()
+    }
+
+    pub(crate) fn default() -> Self {
+        Self(Default::default())
+    }
+
+    #[cfg(any(test, feature = "ffi"))]
+    pub(crate) fn insert(&mut self, name: HeaderName, orig: Bytes) {
+        self.0.insert(name, orig);
+    }
+
+    pub(crate) fn append<N>(&mut self, name: N, orig: Bytes)
+    where
+        N: IntoHeaderName,
+    {
+        self.0.append(name, orig);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/body.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/body.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/body.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/body.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,227 @@
+use std::ffi::c_void;
+use std::mem::ManuallyDrop;
+use std::ptr;
+use std::task::{Context, Poll};
+
+use http::HeaderMap;
+use libc::{c_int, size_t};
+
+use super::task::{hyper_context, hyper_task, hyper_task_return_type, AsTaskType};
+use super::{UserDataPointer, HYPER_ITER_CONTINUE};
+use crate::body::{Body, Bytes, HttpBody as _};
+
+/// A streaming HTTP body.
+pub struct hyper_body(pub(super) Body);
+
+/// A buffer of bytes that is sent or received on a `hyper_body`.
+pub struct hyper_buf(pub(crate) Bytes);
+
+pub(crate) struct UserBody {
+    data_func: hyper_body_data_callback,
+    userdata: *mut c_void,
+}
+
+// ===== Body =====
+
+type hyper_body_foreach_callback = extern "C" fn(*mut c_void, *const hyper_buf) -> c_int;
+
+type hyper_body_data_callback =
+    extern "C" fn(*mut c_void, *mut hyper_context<'_>, *mut *mut hyper_buf) -> c_int;
+
+ffi_fn! {
+    /// Create a new "empty" body.
+    ///
+    /// If not configured, this body acts as an empty payload.
+    fn hyper_body_new() -> *mut hyper_body {
+        Box::into_raw(Box::new(hyper_body(Body::empty())))
+    } ?= ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Free a `hyper_body *`.
+    fn hyper_body_free(body: *mut hyper_body) {
+        drop(non_null!(Box::from_raw(body) ?= ()));
+    }
+}
+
+ffi_fn! {
+    /// Return a task that will poll the body for the next buffer of data.
+    ///
+    /// The task value may have different types depending on the outcome:
+    ///
+    /// - `HYPER_TASK_BUF`: Success, and more data was received.
+    /// - `HYPER_TASK_ERROR`: An error retrieving the data.
+    /// - `HYPER_TASK_EMPTY`: The body has finished streaming data.
+    ///
+    /// This does not consume the `hyper_body *`, so it may be used to again.
+    /// However, it MUST NOT be used or freed until the related task completes.
+    fn hyper_body_data(body: *mut hyper_body) -> *mut hyper_task {
+        // This doesn't take ownership of the Body, so don't allow destructor
+        let mut body = ManuallyDrop::new(non_null!(Box::from_raw(body) ?= ptr::null_mut()));
+
+        Box::into_raw(hyper_task::boxed(async move {
+            body.0.data().await.map(|res| res.map(hyper_buf))
+        }))
+    } ?= ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Return a task that will poll the body and execute the callback with each
+    /// body chunk that is received.
+    ///
+    /// The `hyper_buf` pointer is only a borrowed reference, it cannot live outside
+    /// the execution of the callback. You must make a copy to retain it.
+    ///
+    /// The callback should return `HYPER_ITER_CONTINUE` to continue iterating
+    /// chunks as they are received, or `HYPER_ITER_BREAK` to cancel.
+    ///
+    /// This will consume the `hyper_body *`, you shouldn't use it anymore or free it.
+    fn hyper_body_foreach(body: *mut hyper_body, func: hyper_body_foreach_callback, userdata: *mut c_void) -> *mut hyper_task {
+        let mut body = non_null!(Box::from_raw(body) ?= ptr::null_mut());
+        let userdata = UserDataPointer(userdata);
+
+        Box::into_raw(hyper_task::boxed(async move {
+            while let Some(item) = body.0.data().await {
+                let chunk = item?;
+                if HYPER_ITER_CONTINUE != func(userdata.0, &hyper_buf(chunk)) {
+                    return Err(crate::Error::new_user_aborted_by_callback());
+                }
+            }
+            Ok(())
+        }))
+    } ?= ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Set userdata on this body, which will be passed to callback functions.
+    fn hyper_body_set_userdata(body: *mut hyper_body, userdata: *mut c_void) {
+        let b = non_null!(&mut *body ?= ());
+        b.0.as_ffi_mut().userdata = userdata;
+    }
+}
+
+ffi_fn! {
+    /// Set the data callback for this body.
+    ///
+    /// The callback is called each time hyper needs to send more data for the
+    /// body. It is passed the value from `hyper_body_set_userdata`.
+    ///
+    /// If there is data available, the `hyper_buf **` argument should be set
+    /// to a `hyper_buf *` containing the data, and `HYPER_POLL_READY` should
+    /// be returned.
+    ///
+    /// Returning `HYPER_POLL_READY` while the `hyper_buf **` argument points
+    /// to `NULL` will indicate the body has completed all data.
+    ///
+    /// If there is more data to send, but it isn't yet available, a
+    /// `hyper_waker` should be saved from the `hyper_context *` argument, and
+    /// `HYPER_POLL_PENDING` should be returned. You must wake the saved waker
+    /// to signal the task when data is available.
+    ///
+    /// If some error has occurred, you can return `HYPER_POLL_ERROR` to abort
+    /// the body.
+    fn hyper_body_set_data_func(body: *mut hyper_body, func: hyper_body_data_callback) {
+        let b = non_null!{ &mut *body ?= () };
+        b.0.as_ffi_mut().data_func = func;
+    }
+}
+
+// ===== impl UserBody =====
+
+impl UserBody {
+    pub(crate) fn new() -> UserBody {
+        UserBody {
+            data_func: data_noop,
+            userdata: std::ptr::null_mut(),
+        }
+    }
+
+    pub(crate) fn poll_data(&mut self, cx: &mut Context<'_>) -> Poll<Option<crate::Result<Bytes>>> {
+        let mut out = std::ptr::null_mut();
+        match (self.data_func)(self.userdata, hyper_context::wrap(cx), &mut out) {
+            super::task::HYPER_POLL_READY => {
+                if out.is_null() {
+                    Poll::Ready(None)
+                } else {
+                    let buf = unsafe { Box::from_raw(out) };
+                    Poll::Ready(Some(Ok(buf.0)))
+                }
+            }
+            super::task::HYPER_POLL_PENDING => Poll::Pending,
+            super::task::HYPER_POLL_ERROR => {
+                Poll::Ready(Some(Err(crate::Error::new_body_write_aborted())))
+            }
+            unexpected => Poll::Ready(Some(Err(crate::Error::new_body_write(format!(
+                "unexpected hyper_body_data_func return code {}",
+                unexpected
+            ))))),
+        }
+    }
+
+    pub(crate) fn poll_trailers(
+        &mut self,
+        _cx: &mut Context<'_>,
+    ) -> Poll<crate::Result<Option<HeaderMap>>> {
+        Poll::Ready(Ok(None))
+    }
+}
+
+/// cbindgen:ignore
+extern "C" fn data_noop(
+    _userdata: *mut c_void,
+    _: *mut hyper_context<'_>,
+    _: *mut *mut hyper_buf,
+) -> c_int {
+    super::task::HYPER_POLL_READY
+}
+
+unsafe impl Send for UserBody {}
+unsafe impl Sync for UserBody {}
+
+// ===== Bytes =====
+
+ffi_fn! {
+    /// Create a new `hyper_buf *` by copying the provided bytes.
+    ///
+    /// This makes an owned copy of the bytes, so the `buf` argument can be
+    /// freed or changed afterwards.
+    fn hyper_buf_copy(buf: *const u8, len: size_t) -> *mut hyper_buf {
+        let slice = unsafe {
+            std::slice::from_raw_parts(buf, len)
+        };
+        Box::into_raw(Box::new(hyper_buf(Bytes::copy_from_slice(slice))))
+    } ?= ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Get a pointer to the bytes in this buffer.
+    ///
+    /// This should be used in conjunction with `hyper_buf_len` to get the length
+    /// of the bytes data.
+    ///
+    /// This pointer is borrowed data, and not valid once the `hyper_buf` is
+    /// consumed/freed.
+    fn hyper_buf_bytes(buf: *const hyper_buf) -> *const u8 {
+        unsafe { (*buf).0.as_ptr() }
+    } ?= ptr::null()
+}
+
+ffi_fn! {
+    /// Get the length of the bytes this buffer contains.
+    fn hyper_buf_len(buf: *const hyper_buf) -> size_t {
+        unsafe { (*buf).0.len() }
+    }
+}
+
+ffi_fn! {
+    /// Free this buffer.
+    fn hyper_buf_free(buf: *mut hyper_buf) {
+        drop(unsafe { Box::from_raw(buf) });
+    }
+}
+
+unsafe impl AsTaskType for hyper_buf {
+    fn as_task_type(&self) -> hyper_task_return_type {
+        hyper_task_return_type::HYPER_TASK_BUF
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/client.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,162 @@
+use std::ptr;
+use std::sync::Arc;
+
+use libc::c_int;
+
+use crate::client::conn;
+use crate::rt::Executor as _;
+
+use super::error::hyper_code;
+use super::http_types::{hyper_request, hyper_response};
+use super::io::hyper_io;
+use super::task::{hyper_executor, hyper_task, hyper_task_return_type, AsTaskType, WeakExec};
+
+/// An options builder to configure an HTTP client connection.
+pub struct hyper_clientconn_options {
+    builder: conn::Builder,
+    /// Use a `Weak` to prevent cycles.
+    exec: WeakExec,
+}
+
+/// An HTTP client connection handle.
+///
+/// These are used to send a request on a single connection. It's possible to
+/// send multiple requests on a single connection, such as when HTTP/1
+/// keep-alive or HTTP/2 is used.
+pub struct hyper_clientconn {
+    tx: conn::SendRequest<crate::Body>,
+}
+
+// ===== impl hyper_clientconn =====
+
+ffi_fn! {
+    /// Starts an HTTP client connection handshake using the provided IO transport
+    /// and options.
+    ///
+    /// Both the `io` and the `options` are consumed in this function call.
+    ///
+    /// The returned `hyper_task *` must be polled with an executor until the
+    /// handshake completes, at which point the value can be taken.
+    fn hyper_clientconn_handshake(io: *mut hyper_io, options: *mut hyper_clientconn_options) -> *mut hyper_task {
+        let options = non_null! { Box::from_raw(options) ?= ptr::null_mut() };
+        let io = non_null! { Box::from_raw(io) ?= ptr::null_mut() };
+
+        Box::into_raw(hyper_task::boxed(async move {
+            options.builder.handshake::<_, crate::Body>(io)
+                .await
+                .map(|(tx, conn)| {
+                    options.exec.execute(Box::pin(async move {
+                        let _ = conn.await;
+                    }));
+                    hyper_clientconn { tx }
+                })
+        }))
+    } ?= std::ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Send a request on the client connection.
+    ///
+    /// Returns a task that needs to be polled until it is ready. When ready, the
+    /// task yields a `hyper_response *`.
+    fn hyper_clientconn_send(conn: *mut hyper_clientconn, req: *mut hyper_request) -> *mut hyper_task {
+        let mut req = non_null! { Box::from_raw(req) ?= ptr::null_mut() };
+
+        // Update request with original-case map of headers
+        req.finalize_request();
+
+        let fut = non_null! { &mut *conn ?= ptr::null_mut() }.tx.send_request(req.0);
+
+        let fut = async move {
+            fut.await.map(hyper_response::wrap)
+        };
+
+        Box::into_raw(hyper_task::boxed(fut))
+    } ?= std::ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Free a `hyper_clientconn *`.
+    fn hyper_clientconn_free(conn: *mut hyper_clientconn) {
+        drop(non_null! { Box::from_raw(conn) ?= () });
+    }
+}
+
+unsafe impl AsTaskType for hyper_clientconn {
+    fn as_task_type(&self) -> hyper_task_return_type {
+        hyper_task_return_type::HYPER_TASK_CLIENTCONN
+    }
+}
+
+// ===== impl hyper_clientconn_options =====
+
+ffi_fn! {
+    /// Creates a new set of HTTP clientconn options to be used in a handshake.
+    fn hyper_clientconn_options_new() -> *mut hyper_clientconn_options {
+        let mut builder = conn::Builder::new();
+        builder.http1_preserve_header_case(true);
+
+        Box::into_raw(Box::new(hyper_clientconn_options {
+            builder,
+            exec: WeakExec::new(),
+        }))
+    } ?= std::ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Free a `hyper_clientconn_options *`.
+    fn hyper_clientconn_options_free(opts: *mut hyper_clientconn_options) {
+        drop(non_null! { Box::from_raw(opts) ?= () });
+    }
+}
+
+ffi_fn! {
+    /// Set the client background task executor.
+    ///
+    /// This does not consume the `options` or the `exec`.
+    fn hyper_clientconn_options_exec(opts: *mut hyper_clientconn_options, exec: *const hyper_executor) {
+        let opts = non_null! { &mut *opts ?= () };
+
+        let exec = non_null! { Arc::from_raw(exec) ?= () };
+        let weak_exec = hyper_executor::downgrade(&exec);
+        std::mem::forget(exec);
+
+        opts.builder.executor(weak_exec.clone());
+        opts.exec = weak_exec;
+    }
+}
+
+ffi_fn! {
+    /// Set the whether to use HTTP2.
+    ///
+    /// Pass `0` to disable, `1` to enable.
+    fn hyper_clientconn_options_http2(opts: *mut hyper_clientconn_options, enabled: c_int) -> hyper_code {
+        #[cfg(feature = "http2")]
+        {
+            let opts = non_null! { &mut *opts ?= hyper_code::HYPERE_INVALID_ARG };
+            opts.builder.http2_only(enabled != 0);
+            hyper_code::HYPERE_OK
+        }
+
+        #[cfg(not(feature = "http2"))]
+        {
+            drop(opts);
+            drop(enabled);
+            hyper_code::HYPERE_FEATURE_NOT_ENABLED
+        }
+    }
+}
+
+ffi_fn! {
+    /// Set the whether to include a copy of the raw headers in responses
+    /// received on this connection.
+    ///
+    /// Pass `0` to disable, `1` to enable.
+    ///
+    /// If enabled, see `hyper_response_headers_raw()` for usage.
+    fn hyper_clientconn_options_headers_raw(opts: *mut hyper_clientconn_options, enabled: c_int) -> hyper_code {
+        let opts = non_null! { &mut *opts ?= hyper_code::HYPERE_INVALID_ARG };
+        opts.builder.http1_headers_raw(enabled != 0);
+        hyper_code::HYPERE_OK
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,85 @@
+use libc::size_t;
+
+/// A more detailed error object returned by some hyper functions.
+pub struct hyper_error(crate::Error);
+
+/// A return code for many of hyper's methods.
+#[repr(C)]
+pub enum hyper_code {
+    /// All is well.
+    HYPERE_OK,
+    /// General error, details in the `hyper_error *`.
+    HYPERE_ERROR,
+    /// A function argument was invalid.
+    HYPERE_INVALID_ARG,
+    /// The IO transport returned an EOF when one wasn't expected.
+    ///
+    /// This typically means an HTTP request or response was expected, but the
+    /// connection closed cleanly without sending (all of) it.
+    HYPERE_UNEXPECTED_EOF,
+    /// Aborted by a user supplied callback.
+    HYPERE_ABORTED_BY_CALLBACK,
+    /// An optional hyper feature was not enabled.
+    #[cfg_attr(feature = "http2", allow(unused))]
+    HYPERE_FEATURE_NOT_ENABLED,
+    /// The peer sent an HTTP message that could not be parsed.
+    HYPERE_INVALID_PEER_MESSAGE,
+}
+
+// ===== impl hyper_error =====
+
+impl hyper_error {
+    fn code(&self) -> hyper_code {
+        use crate::error::Kind as ErrorKind;
+        use crate::error::User;
+
+        match self.0.kind() {
+            ErrorKind::Parse(_) => hyper_code::HYPERE_INVALID_PEER_MESSAGE,
+            ErrorKind::IncompleteMessage => hyper_code::HYPERE_UNEXPECTED_EOF,
+            ErrorKind::User(User::AbortedByCallback) => hyper_code::HYPERE_ABORTED_BY_CALLBACK,
+            // TODO: add more variants
+            _ => hyper_code::HYPERE_ERROR,
+        }
+    }
+
+    fn print_to(&self, dst: &mut [u8]) -> usize {
+        use std::io::Write;
+
+        let mut dst = std::io::Cursor::new(dst);
+
+        // A write! error doesn't matter. As much as possible will have been
+        // written, and the Cursor position will know how far that is (even
+        // if that is zero).
+        let _ = write!(dst, "{}", &self.0);
+        dst.position() as usize
+    }
+}
+
+ffi_fn! {
+    /// Frees a `hyper_error`.
+    fn hyper_error_free(err: *mut hyper_error) {
+        drop(non_null!(Box::from_raw(err) ?= ()));
+    }
+}
+
+ffi_fn! {
+    /// Get an equivalent `hyper_code` from this error.
+    fn hyper_error_code(err: *const hyper_error) -> hyper_code {
+        non_null!(&*err ?= hyper_code::HYPERE_INVALID_ARG).code()
+    }
+}
+
+ffi_fn! {
+    /// Print the details of this error to a buffer.
+    ///
+    /// The `dst_len` value must be the maximum length that the buffer can
+    /// store.
+    ///
+    /// The return value is number of bytes that were written to `dst`.
+    fn hyper_error_print(err: *const hyper_error, dst: *mut u8, dst_len: size_t) -> size_t {
+        let dst = unsafe {
+            std::slice::from_raw_parts_mut(dst, dst_len)
+        };
+        non_null!(&*err ?= 0).print_to(dst)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/http_types.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/http_types.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/http_types.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/http_types.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,497 @@
+use bytes::Bytes;
+use libc::{c_int, size_t};
+use std::ffi::c_void;
+
+use super::body::{hyper_body, hyper_buf};
+use super::error::hyper_code;
+use super::task::{hyper_task_return_type, AsTaskType};
+use super::{UserDataPointer, HYPER_ITER_CONTINUE};
+use crate::ext::HeaderCaseMap;
+use crate::header::{HeaderName, HeaderValue};
+use crate::{Body, HeaderMap, Method, Request, Response, Uri};
+
+/// An HTTP request.
+pub struct hyper_request(pub(super) Request<Body>);
+
+/// An HTTP response.
+pub struct hyper_response(pub(super) Response<Body>);
+
+/// An HTTP header map.
+///
+/// These can be part of a request or response.
+pub struct hyper_headers {
+    pub(super) headers: HeaderMap,
+    orig_casing: HeaderCaseMap,
+}
+
+#[derive(Debug)]
+pub(crate) struct ReasonPhrase(pub(crate) Bytes);
+
+pub(crate) struct RawHeaders(pub(crate) hyper_buf);
+
+pub(crate) struct OnInformational {
+    func: hyper_request_on_informational_callback,
+    data: UserDataPointer,
+}
+
+type hyper_request_on_informational_callback = extern "C" fn(*mut c_void, *mut hyper_response);
+
+// ===== impl hyper_request =====
+
+ffi_fn! {
+    /// Construct a new HTTP request.
+    fn hyper_request_new() -> *mut hyper_request {
+        Box::into_raw(Box::new(hyper_request(Request::new(Body::empty()))))
+    } ?= std::ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Free an HTTP request if not going to send it on a client.
+    fn hyper_request_free(req: *mut hyper_request) {
+        drop(non_null!(Box::from_raw(req) ?= ()));
+    }
+}
+
+ffi_fn! {
+    /// Set the HTTP Method of the request.
+    fn hyper_request_set_method(req: *mut hyper_request, method: *const u8, method_len: size_t) -> hyper_code {
+        let bytes = unsafe {
+            std::slice::from_raw_parts(method, method_len as usize)
+        };
+        let req = non_null!(&mut *req ?= hyper_code::HYPERE_INVALID_ARG);
+        match Method::from_bytes(bytes) {
+            Ok(m) => {
+                *req.0.method_mut() = m;
+                hyper_code::HYPERE_OK
+            },
+            Err(_) => {
+                hyper_code::HYPERE_INVALID_ARG
+            }
+        }
+    }
+}
+
+ffi_fn! {
+    /// Set the URI of the request.
+    fn hyper_request_set_uri(req: *mut hyper_request, uri: *const u8, uri_len: size_t) -> hyper_code {
+        let bytes = unsafe {
+            std::slice::from_raw_parts(uri, uri_len as usize)
+        };
+        let req = non_null!(&mut *req ?= hyper_code::HYPERE_INVALID_ARG);
+        match Uri::from_maybe_shared(bytes) {
+            Ok(u) => {
+                *req.0.uri_mut() = u;
+                hyper_code::HYPERE_OK
+            },
+            Err(_) => {
+                hyper_code::HYPERE_INVALID_ARG
+            }
+        }
+    }
+}
+
+ffi_fn! {
+    /// Set the preferred HTTP version of the request.
+    ///
+    /// The version value should be one of the `HYPER_HTTP_VERSION_` constants.
+    ///
+    /// Note that this won't change the major HTTP version of the connection,
+    /// since that is determined at the handshake step.
+    fn hyper_request_set_version(req: *mut hyper_request, version: c_int) -> hyper_code {
+        use http::Version;
+
+        let req = non_null!(&mut *req ?= hyper_code::HYPERE_INVALID_ARG);
+        *req.0.version_mut() = match version {
+            super::HYPER_HTTP_VERSION_NONE => Version::HTTP_11,
+            super::HYPER_HTTP_VERSION_1_0 => Version::HTTP_10,
+            super::HYPER_HTTP_VERSION_1_1 => Version::HTTP_11,
+            super::HYPER_HTTP_VERSION_2 => Version::HTTP_2,
+            _ => {
+                // We don't know this version
+                return hyper_code::HYPERE_INVALID_ARG;
+            }
+        };
+        hyper_code::HYPERE_OK
+    }
+}
+
+ffi_fn! {
+    /// Gets a reference to the HTTP headers of this request
+    ///
+    /// This is not an owned reference, so it should not be accessed after the
+    /// `hyper_request` has been consumed.
+    fn hyper_request_headers(req: *mut hyper_request) -> *mut hyper_headers {
+        hyper_headers::get_or_default(unsafe { &mut *req }.0.extensions_mut())
+    } ?= std::ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Set the body of the request.
+    ///
+    /// The default is an empty body.
+    ///
+    /// This takes ownership of the `hyper_body *`, you must not use it or
+    /// free it after setting it on the request.
+    fn hyper_request_set_body(req: *mut hyper_request, body: *mut hyper_body) -> hyper_code {
+        let body = non_null!(Box::from_raw(body) ?= hyper_code::HYPERE_INVALID_ARG);
+        let req = non_null!(&mut *req ?= hyper_code::HYPERE_INVALID_ARG);
+        *req.0.body_mut() = body.0;
+        hyper_code::HYPERE_OK
+    }
+}
+
+ffi_fn! {
+    /// Set an informational (1xx) response callback.
+    ///
+    /// The callback is called each time hyper receives an informational (1xx)
+    /// response for this request.
+    ///
+    /// The third argument is an opaque user data pointer, which is passed to
+    /// the callback each time.
+    ///
+    /// The callback is passed the `void *` data pointer, and a
+    /// `hyper_response *` which can be inspected as any other response. The
+    /// body of the response will always be empty.
+    ///
+    /// NOTE: The `hyper_response *` is just borrowed data, and will not
+    /// be valid after the callback finishes. You must copy any data you wish
+    /// to persist.
+    fn hyper_request_on_informational(req: *mut hyper_request, callback: hyper_request_on_informational_callback, data: *mut c_void) -> hyper_code {
+        let ext = OnInformational {
+            func: callback,
+            data: UserDataPointer(data),
+        };
+        let req = non_null!(&mut *req ?= hyper_code::HYPERE_INVALID_ARG);
+        req.0.extensions_mut().insert(ext);
+        hyper_code::HYPERE_OK
+    }
+}
+
+impl hyper_request {
+    pub(super) fn finalize_request(&mut self) {
+        if let Some(headers) = self.0.extensions_mut().remove::<hyper_headers>() {
+            *self.0.headers_mut() = headers.headers;
+            self.0.extensions_mut().insert(headers.orig_casing);
+        }
+    }
+}
+
+// ===== impl hyper_response =====
+
+ffi_fn! {
+    /// Free an HTTP response after using it.
+    fn hyper_response_free(resp: *mut hyper_response) {
+        drop(non_null!(Box::from_raw(resp) ?= ()));
+    }
+}
+
+ffi_fn! {
+    /// Get the HTTP-Status code of this response.
+    ///
+    /// It will always be within the range of 100-599.
+    fn hyper_response_status(resp: *const hyper_response) -> u16 {
+        non_null!(&*resp ?= 0).0.status().as_u16()
+    }
+}
+
+ffi_fn! {
+    /// Get a pointer to the reason-phrase of this response.
+    ///
+    /// This buffer is not null-terminated.
+    ///
+    /// This buffer is owned by the response, and should not be used after
+    /// the response has been freed.
+    ///
+    /// Use `hyper_response_reason_phrase_len()` to get the length of this
+    /// buffer.
+    fn hyper_response_reason_phrase(resp: *const hyper_response) -> *const u8 {
+        non_null!(&*resp ?= std::ptr::null()).reason_phrase().as_ptr()
+    } ?= std::ptr::null()
+}
+
+ffi_fn! {
+    /// Get the length of the reason-phrase of this response.
+    ///
+    /// Use `hyper_response_reason_phrase()` to get the buffer pointer.
+    fn hyper_response_reason_phrase_len(resp: *const hyper_response) -> size_t {
+        non_null!(&*resp ?= 0).reason_phrase().len()
+    }
+}
+
+ffi_fn! {
+    /// Get a reference to the full raw headers of this response.
+    ///
+    /// You must have enabled `hyper_clientconn_options_headers_raw()`, or this
+    /// will return NULL.
+    ///
+    /// The returned `hyper_buf *` is just a reference, owned by the response.
+    /// You need to make a copy if you wish to use it after freeing the
+    /// response.
+    ///
+    /// The buffer is not null-terminated, see the `hyper_buf` functions for
+    /// getting the bytes and length.
+    fn hyper_response_headers_raw(resp: *const hyper_response) -> *const hyper_buf {
+        let resp = non_null!(&*resp ?= std::ptr::null());
+        match resp.0.extensions().get::<RawHeaders>() {
+            Some(raw) => &raw.0,
+            None => std::ptr::null(),
+        }
+    } ?= std::ptr::null()
+}
+
+ffi_fn! {
+    /// Get the HTTP version used by this response.
+    ///
+    /// The returned value could be:
+    ///
+    /// - `HYPER_HTTP_VERSION_1_0`
+    /// - `HYPER_HTTP_VERSION_1_1`
+    /// - `HYPER_HTTP_VERSION_2`
+    /// - `HYPER_HTTP_VERSION_NONE` if newer (or older).
+    fn hyper_response_version(resp: *const hyper_response) -> c_int {
+        use http::Version;
+
+        match non_null!(&*resp ?= 0).0.version() {
+            Version::HTTP_10 => super::HYPER_HTTP_VERSION_1_0,
+            Version::HTTP_11 => super::HYPER_HTTP_VERSION_1_1,
+            Version::HTTP_2 => super::HYPER_HTTP_VERSION_2,
+            _ => super::HYPER_HTTP_VERSION_NONE,
+        }
+    }
+}
+
+ffi_fn! {
+    /// Gets a reference to the HTTP headers of this response.
+    ///
+    /// This is not an owned reference, so it should not be accessed after the
+    /// `hyper_response` has been freed.
+    fn hyper_response_headers(resp: *mut hyper_response) -> *mut hyper_headers {
+        hyper_headers::get_or_default(unsafe { &mut *resp }.0.extensions_mut())
+    } ?= std::ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Take ownership of the body of this response.
+    ///
+    /// It is safe to free the response even after taking ownership of its body.
+    fn hyper_response_body(resp: *mut hyper_response) -> *mut hyper_body {
+        let body = std::mem::take(non_null!(&mut *resp ?= std::ptr::null_mut()).0.body_mut());
+        Box::into_raw(Box::new(hyper_body(body)))
+    } ?= std::ptr::null_mut()
+}
+
+impl hyper_response {
+    pub(super) fn wrap(mut resp: Response<Body>) -> hyper_response {
+        let headers = std::mem::take(resp.headers_mut());
+        let orig_casing = resp
+            .extensions_mut()
+            .remove::<HeaderCaseMap>()
+            .unwrap_or_else(HeaderCaseMap::default);
+        resp.extensions_mut().insert(hyper_headers {
+            headers,
+            orig_casing,
+        });
+
+        hyper_response(resp)
+    }
+
+    fn reason_phrase(&self) -> &[u8] {
+        if let Some(reason) = self.0.extensions().get::<ReasonPhrase>() {
+            return &reason.0;
+        }
+
+        if let Some(reason) = self.0.status().canonical_reason() {
+            return reason.as_bytes();
+        }
+
+        &[]
+    }
+}
+
+unsafe impl AsTaskType for hyper_response {
+    fn as_task_type(&self) -> hyper_task_return_type {
+        hyper_task_return_type::HYPER_TASK_RESPONSE
+    }
+}
+
+// ===== impl Headers =====
+
+type hyper_headers_foreach_callback =
+    extern "C" fn(*mut c_void, *const u8, size_t, *const u8, size_t) -> c_int;
+
+impl hyper_headers {
+    pub(super) fn get_or_default(ext: &mut http::Extensions) -> &mut hyper_headers {
+        if let None = ext.get_mut::<hyper_headers>() {
+            ext.insert(hyper_headers::default());
+        }
+
+        ext.get_mut::<hyper_headers>().unwrap()
+    }
+}
+
+ffi_fn! {
+    /// Iterates the headers passing each name and value pair to the callback.
+    ///
+    /// The `userdata` pointer is also passed to the callback.
+    ///
+    /// The callback should return `HYPER_ITER_CONTINUE` to keep iterating, or
+    /// `HYPER_ITER_BREAK` to stop.
+    fn hyper_headers_foreach(headers: *const hyper_headers, func: hyper_headers_foreach_callback, userdata: *mut c_void) {
+        let headers = non_null!(&*headers ?= ());
+        // For each header name/value pair, there may be a value in the casemap
+        // that corresponds to the HeaderValue. So, we iterator all the keys,
+        // and for each one, try to pair the originally cased name with the value.
+        //
+        // TODO: consider adding http::HeaderMap::entries() iterator
+        for name in headers.headers.keys() {
+            let mut names = headers.orig_casing.get_all(name);
+
+            for value in headers.headers.get_all(name) {
+                let (name_ptr, name_len) = if let Some(orig_name) = names.next() {
+                    (orig_name.as_ref().as_ptr(), orig_name.as_ref().len())
+                } else {
+                    (
+                        name.as_str().as_bytes().as_ptr(),
+                        name.as_str().as_bytes().len(),
+                    )
+                };
+
+                let val_ptr = value.as_bytes().as_ptr();
+                let val_len = value.as_bytes().len();
+
+                if HYPER_ITER_CONTINUE != func(userdata, name_ptr, name_len, val_ptr, val_len) {
+                    return;
+                }
+            }
+        }
+    }
+}
+
+ffi_fn! {
+    /// Sets the header with the provided name to the provided value.
+    ///
+    /// This overwrites any previous value set for the header.
+    fn hyper_headers_set(headers: *mut hyper_headers, name: *const u8, name_len: size_t, value: *const u8, value_len: size_t) -> hyper_code {
+        let headers = non_null!(&mut *headers ?= hyper_code::HYPERE_INVALID_ARG);
+        match unsafe { raw_name_value(name, name_len, value, value_len) } {
+            Ok((name, value, orig_name)) => {
+                headers.headers.insert(&name, value);
+                headers.orig_casing.insert(name, orig_name);
+                hyper_code::HYPERE_OK
+            }
+            Err(code) => code,
+        }
+    }
+}
+
+ffi_fn! {
+    /// Adds the provided value to the list of the provided name.
+    ///
+    /// If there were already existing values for the name, this will append the
+    /// new value to the internal list.
+    fn hyper_headers_add(headers: *mut hyper_headers, name: *const u8, name_len: size_t, value: *const u8, value_len: size_t) -> hyper_code {
+        let headers = non_null!(&mut *headers ?= hyper_code::HYPERE_INVALID_ARG);
+
+        match unsafe { raw_name_value(name, name_len, value, value_len) } {
+            Ok((name, value, orig_name)) => {
+                headers.headers.append(&name, value);
+                headers.orig_casing.append(name, orig_name);
+                hyper_code::HYPERE_OK
+            }
+            Err(code) => code,
+        }
+    }
+}
+
+impl Default for hyper_headers {
+    fn default() -> Self {
+        Self {
+            headers: Default::default(),
+            orig_casing: HeaderCaseMap::default(),
+        }
+    }
+}
+
+unsafe fn raw_name_value(
+    name: *const u8,
+    name_len: size_t,
+    value: *const u8,
+    value_len: size_t,
+) -> Result<(HeaderName, HeaderValue, Bytes), hyper_code> {
+    let name = std::slice::from_raw_parts(name, name_len);
+    let orig_name = Bytes::copy_from_slice(name);
+    let name = match HeaderName::from_bytes(name) {
+        Ok(name) => name,
+        Err(_) => return Err(hyper_code::HYPERE_INVALID_ARG),
+    };
+    let value = std::slice::from_raw_parts(value, value_len);
+    let value = match HeaderValue::from_bytes(value) {
+        Ok(val) => val,
+        Err(_) => return Err(hyper_code::HYPERE_INVALID_ARG),
+    };
+
+    Ok((name, value, orig_name))
+}
+
+// ===== impl OnInformational =====
+
+impl OnInformational {
+    pub(crate) fn call(&mut self, resp: Response<Body>) {
+        let mut resp = hyper_response::wrap(resp);
+        (self.func)(self.data.0, &mut resp);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_headers_foreach_cases_preserved() {
+        let mut headers = hyper_headers::default();
+
+        let name1 = b"Set-CookiE";
+        let value1 = b"a=b";
+        hyper_headers_add(
+            &mut headers,
+            name1.as_ptr(),
+            name1.len(),
+            value1.as_ptr(),
+            value1.len(),
+        );
+
+        let name2 = b"SET-COOKIE";
+        let value2 = b"c=d";
+        hyper_headers_add(
+            &mut headers,
+            name2.as_ptr(),
+            name2.len(),
+            value2.as_ptr(),
+            value2.len(),
+        );
+
+        let mut vec = Vec::<u8>::new();
+        hyper_headers_foreach(&headers, concat, &mut vec as *mut _ as *mut c_void);
+
+        assert_eq!(vec, b"Set-CookiE: a=b\r\nSET-COOKIE: c=d\r\n");
+
+        extern "C" fn concat(
+            vec: *mut c_void,
+            name: *const u8,
+            name_len: usize,
+            value: *const u8,
+            value_len: usize,
+        ) -> c_int {
+            unsafe {
+                let vec = &mut *(vec as *mut Vec<u8>);
+                let name = std::slice::from_raw_parts(name, name_len);
+                let value = std::slice::from_raw_parts(value, value_len);
+                vec.extend(name);
+                vec.extend(b": ");
+                vec.extend(value);
+                vec.extend(b"\r\n");
+            }
+            HYPER_ITER_CONTINUE
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/io.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/io.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,178 @@
+use std::ffi::c_void;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+use libc::size_t;
+use tokio::io::{AsyncRead, AsyncWrite};
+
+use super::task::hyper_context;
+
+/// Sentinel value to return from a read or write callback that the operation
+/// is pending.
+pub const HYPER_IO_PENDING: size_t = 0xFFFFFFFF;
+/// Sentinel value to return from a read or write callback that the operation
+/// has errored.
+pub const HYPER_IO_ERROR: size_t = 0xFFFFFFFE;
+
+type hyper_io_read_callback =
+    extern "C" fn(*mut c_void, *mut hyper_context<'_>, *mut u8, size_t) -> size_t;
+type hyper_io_write_callback =
+    extern "C" fn(*mut c_void, *mut hyper_context<'_>, *const u8, size_t) -> size_t;
+
+/// An IO object used to represent a socket or similar concept.
+pub struct hyper_io {
+    read: hyper_io_read_callback,
+    write: hyper_io_write_callback,
+    userdata: *mut c_void,
+}
+
+ffi_fn! {
+    /// Create a new IO type used to represent a transport.
+    ///
+    /// The read and write functions of this transport should be set with
+    /// `hyper_io_set_read` and `hyper_io_set_write`.
+    fn hyper_io_new() -> *mut hyper_io {
+        Box::into_raw(Box::new(hyper_io {
+            read: read_noop,
+            write: write_noop,
+            userdata: std::ptr::null_mut(),
+        }))
+    } ?= std::ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Free an unused `hyper_io *`.
+    ///
+    /// This is typically only useful if you aren't going to pass ownership
+    /// of the IO handle to hyper, such as with `hyper_clientconn_handshake()`.
+    fn hyper_io_free(io: *mut hyper_io) {
+        drop(non_null!(Box::from_raw(io) ?= ()));
+    }
+}
+
+ffi_fn! {
+    /// Set the user data pointer for this IO to some value.
+    ///
+    /// This value is passed as an argument to the read and write callbacks.
+    fn hyper_io_set_userdata(io: *mut hyper_io, data: *mut c_void) {
+        non_null!(&mut *io ?= ()).userdata = data;
+    }
+}
+
+ffi_fn! {
+    /// Set the read function for this IO transport.
+    ///
+    /// Data that is read from the transport should be put in the `buf` pointer,
+    /// up to `buf_len` bytes. The number of bytes read should be the return value.
+    ///
+    /// It is undefined behavior to try to access the bytes in the `buf` pointer,
+    /// unless you have already written them yourself. It is also undefined behavior
+    /// to return that more bytes have been written than actually set on the `buf`.
+    ///
+    /// If there is no data currently available, a waker should be claimed from
+    /// the `ctx` and registered with whatever polling mechanism is used to signal
+    /// when data is available later on. The return value should be
+    /// `HYPER_IO_PENDING`.
+    ///
+    /// If there is an irrecoverable error reading data, then `HYPER_IO_ERROR`
+    /// should be the return value.
+    fn hyper_io_set_read(io: *mut hyper_io, func: hyper_io_read_callback) {
+        non_null!(&mut *io ?= ()).read = func;
+    }
+}
+
+ffi_fn! {
+    /// Set the write function for this IO transport.
+    ///
+    /// Data from the `buf` pointer should be written to the transport, up to
+    /// `buf_len` bytes. The number of bytes written should be the return value.
+    ///
+    /// If no data can currently be written, the `waker` should be cloned and
+    /// registered with whatever polling mechanism is used to signal when data
+    /// is available later on. The return value should be `HYPER_IO_PENDING`.
+    ///
+    /// Yeet.
+    ///
+    /// If there is an irrecoverable error reading data, then `HYPER_IO_ERROR`
+    /// should be the return value.
+    fn hyper_io_set_write(io: *mut hyper_io, func: hyper_io_write_callback) {
+        non_null!(&mut *io ?= ()).write = func;
+    }
+}
+
+/// cbindgen:ignore
+extern "C" fn read_noop(
+    _userdata: *mut c_void,
+    _: *mut hyper_context<'_>,
+    _buf: *mut u8,
+    _buf_len: size_t,
+) -> size_t {
+    0
+}
+
+/// cbindgen:ignore
+extern "C" fn write_noop(
+    _userdata: *mut c_void,
+    _: *mut hyper_context<'_>,
+    _buf: *const u8,
+    _buf_len: size_t,
+) -> size_t {
+    0
+}
+
+impl AsyncRead for hyper_io {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut tokio::io::ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
+        let buf_ptr = unsafe { buf.unfilled_mut() }.as_mut_ptr() as *mut u8;
+        let buf_len = buf.remaining();
+
+        match (self.read)(self.userdata, hyper_context::wrap(cx), buf_ptr, buf_len) {
+            HYPER_IO_PENDING => Poll::Pending,
+            HYPER_IO_ERROR => Poll::Ready(Err(std::io::Error::new(
+                std::io::ErrorKind::Other,
+                "io error",
+            ))),
+            ok => {
+                // We have to trust that the user's read callback actually
+                // filled in that many bytes... :(
+                unsafe { buf.assume_init(ok) };
+                buf.advance(ok);
+                Poll::Ready(Ok(()))
+            }
+        }
+    }
+}
+
+impl AsyncWrite for hyper_io {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<std::io::Result<usize>> {
+        let buf_ptr = buf.as_ptr();
+        let buf_len = buf.len();
+
+        match (self.write)(self.userdata, hyper_context::wrap(cx), buf_ptr, buf_len) {
+            HYPER_IO_PENDING => Poll::Pending,
+            HYPER_IO_ERROR => Poll::Ready(Err(std::io::Error::new(
+                std::io::ErrorKind::Other,
+                "io error",
+            ))),
+            ok => Poll::Ready(Ok(ok)),
+        }
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<std::io::Result<()>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<std::io::Result<()>> {
+        Poll::Ready(Ok(()))
+    }
+}
+
+unsafe impl Send for hyper_io {}
+unsafe impl Sync for hyper_io {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+macro_rules! ffi_fn {
+    ($(#[$doc:meta])* fn $name:ident($($arg:ident: $arg_ty:ty),*) -> $ret:ty $body:block ?= $default:expr) => {
+        $(#[$doc])*
+        #[no_mangle]
+        pub extern fn $name($($arg: $arg_ty),*) -> $ret {
+            use std::panic::{self, AssertUnwindSafe};
+
+            match panic::catch_unwind(AssertUnwindSafe(move || $body)) {
+                Ok(v) => v,
+                Err(_) => {
+                    $default
+                }
+            }
+        }
+    };
+
+    ($(#[$doc:meta])* fn $name:ident($($arg:ident: $arg_ty:ty),*) -> $ret:ty $body:block) => {
+        ffi_fn!($(#[$doc])* fn $name($($arg: $arg_ty),*) -> $ret $body ?= {
+            eprintln!("panic unwind caught, aborting");
+            std::process::abort()
+        });
+    };
+
+    ($(#[$doc:meta])* fn $name:ident($($arg:ident: $arg_ty:ty),*) $body:block ?= $default:expr) => {
+        ffi_fn!($(#[$doc])* fn $name($($arg: $arg_ty),*) -> () $body ?= $default);
+    };
+
+    ($(#[$doc:meta])* fn $name:ident($($arg:ident: $arg_ty:ty),*) $body:block) => {
+        ffi_fn!($(#[$doc])* fn $name($($arg: $arg_ty),*) -> () $body);
+    };
+}
+
+macro_rules! non_null {
+    ($ptr:ident, $eval:expr, $err:expr) => {{
+        debug_assert!(!$ptr.is_null(), "{:?} must not be null", stringify!($ptr));
+        if $ptr.is_null() {
+            return $err;
+        }
+        unsafe { $eval }
+    }};
+    (&*$ptr:ident ?= $err:expr) => {{
+        non_null!($ptr, &*$ptr, $err)
+    }};
+    (&mut *$ptr:ident ?= $err:expr) => {{
+        non_null!($ptr, &mut *$ptr, $err)
+    }};
+    (Box::from_raw($ptr:ident) ?= $err:expr) => {{
+        non_null!($ptr, Box::from_raw($ptr), $err)
+    }};
+    (Arc::from_raw($ptr:ident) ?= $err:expr) => {{
+        non_null!($ptr, Arc::from_raw($ptr), $err)
+    }};
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,94 @@
+// We have a lot of c-types in here, stop warning about their names!
+#![allow(non_camel_case_types)]
+// fmt::Debug isn't helpful on FFI types
+#![allow(missing_debug_implementations)]
+// unreachable_pub warns `#[no_mangle] pub extern fn` in private mod.
+#![allow(unreachable_pub)]
+
+//! # hyper C API
+//!
+//! This part of the documentation describes the C API for hyper. That is, how
+//! to *use* the hyper library in C code. This is **not** a regular Rust
+//! module, and thus it is not accessible in Rust.
+//!
+//! ## Unstable
+//!
+//! The C API of hyper is currently **unstable**, which means it's not part of
+//! the semver contract as the rest of the Rust API is. Because of that, it's
+//! only accessible if `--cfg hyper_unstable_ffi` is passed to `rustc` when
+//! compiling. The easiest way to do that is setting the `RUSTFLAGS`
+//! environment variable.
+//!
+//! ## Building
+//!
+//! The C API is part of the Rust library, but isn't compiled by default. Using
+//! `cargo`, it can be compiled with the following command:
+//!
+//! ```notrust
+//! RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --features client,http1,http2,ffi
+//! ```
+
+// We may eventually allow the FFI to be enabled without `client` or `http1`,
+// that is why we don't auto enable them as `ffi = ["client", "http1"]` in
+// the `Cargo.toml`.
+//
+// But for now, give a clear message that this compile error is expected.
+#[cfg(not(all(feature = "client", feature = "http1")))]
+compile_error!("The `ffi` feature currently requires the `client` and `http1` features.");
+
+#[cfg(not(hyper_unstable_ffi))]
+compile_error!(
+    "\
+    The `ffi` feature is unstable, and requires the \
+    `RUSTFLAGS='--cfg hyper_unstable_ffi'` environment variable to be set.\
+"
+);
+
+#[macro_use]
+mod macros;
+
+mod body;
+mod client;
+mod error;
+mod http_types;
+mod io;
+mod task;
+
+pub use self::body::*;
+pub use self::client::*;
+pub use self::error::*;
+pub use self::http_types::*;
+pub use self::io::*;
+pub use self::task::*;
+
+/// Return in iter functions to continue iterating.
+pub const HYPER_ITER_CONTINUE: libc::c_int = 0;
+/// Return in iter functions to stop iterating.
+#[allow(unused)]
+pub const HYPER_ITER_BREAK: libc::c_int = 1;
+
+/// An HTTP Version that is unspecified.
+pub const HYPER_HTTP_VERSION_NONE: libc::c_int = 0;
+/// The HTTP/1.0 version.
+pub const HYPER_HTTP_VERSION_1_0: libc::c_int = 10;
+/// The HTTP/1.1 version.
+pub const HYPER_HTTP_VERSION_1_1: libc::c_int = 11;
+/// The HTTP/2 version.
+pub const HYPER_HTTP_VERSION_2: libc::c_int = 20;
+
+struct UserDataPointer(*mut std::ffi::c_void);
+
+// We don't actually know anything about this pointer, it's up to the user
+// to do the right thing.
+unsafe impl Send for UserDataPointer {}
+unsafe impl Sync for UserDataPointer {}
+
+/// cbindgen:ignore
+static VERSION_CSTR: &str = concat!(env!("CARGO_PKG_VERSION"), "\0");
+
+ffi_fn! {
+    /// Returns a static ASCII (null terminated) string of the hyper version.
+    fn hyper_version() -> *const libc::c_char {
+        VERSION_CSTR.as_ptr() as _
+    } ?= std::ptr::null()
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/task.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/task.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/ffi/task.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/ffi/task.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,411 @@
+use std::ffi::c_void;
+use std::future::Future;
+use std::pin::Pin;
+use std::ptr;
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc, Mutex, Weak,
+};
+use std::task::{Context, Poll};
+
+use futures_util::stream::{FuturesUnordered, Stream};
+use libc::c_int;
+
+use super::error::hyper_code;
+use super::UserDataPointer;
+
+type BoxFuture<T> = Pin<Box<dyn Future<Output = T> + Send>>;
+type BoxAny = Box<dyn AsTaskType + Send + Sync>;
+
+/// Return in a poll function to indicate it was ready.
+pub const HYPER_POLL_READY: c_int = 0;
+/// Return in a poll function to indicate it is still pending.
+///
+/// The passed in `hyper_waker` should be registered to wake up the task at
+/// some later point.
+pub const HYPER_POLL_PENDING: c_int = 1;
+/// Return in a poll function indicate an error.
+pub const HYPER_POLL_ERROR: c_int = 3;
+
+/// A task executor for `hyper_task`s.
+pub struct hyper_executor {
+    /// The executor of all task futures.
+    ///
+    /// There should never be contention on the mutex, as it is only locked
+    /// to drive the futures. However, we cannot gaurantee proper usage from
+    /// `hyper_executor_poll()`, which in C could potentially be called inside
+    /// one of the stored futures. The mutex isn't re-entrant, so doing so
+    /// would result in a deadlock, but that's better than data corruption.
+    driver: Mutex<FuturesUnordered<TaskFuture>>,
+
+    /// The queue of futures that need to be pushed into the `driver`.
+    ///
+    /// This is has a separate mutex since `spawn` could be called from inside
+    /// a future, which would mean the driver's mutex is already locked.
+    spawn_queue: Mutex<Vec<TaskFuture>>,
+
+    /// This is used to track when a future calls `wake` while we are within
+    /// `hyper_executor::poll_next`.
+    is_woken: Arc<ExecWaker>,
+}
+
+#[derive(Clone)]
+pub(crate) struct WeakExec(Weak<hyper_executor>);
+
+struct ExecWaker(AtomicBool);
+
+/// An async task.
+pub struct hyper_task {
+    future: BoxFuture<BoxAny>,
+    output: Option<BoxAny>,
+    userdata: UserDataPointer,
+}
+
+struct TaskFuture {
+    task: Option<Box<hyper_task>>,
+}
+
+/// An async context for a task that contains the related waker.
+pub struct hyper_context<'a>(Context<'a>);
+
+/// A waker that is saved and used to waken a pending task.
+pub struct hyper_waker {
+    waker: std::task::Waker,
+}
+
+/// A descriptor for what type a `hyper_task` value is.
+#[repr(C)]
+pub enum hyper_task_return_type {
+    /// The value of this task is null (does not imply an error).
+    HYPER_TASK_EMPTY,
+    /// The value of this task is `hyper_error *`.
+    HYPER_TASK_ERROR,
+    /// The value of this task is `hyper_clientconn *`.
+    HYPER_TASK_CLIENTCONN,
+    /// The value of this task is `hyper_response *`.
+    HYPER_TASK_RESPONSE,
+    /// The value of this task is `hyper_buf *`.
+    HYPER_TASK_BUF,
+}
+
+pub(crate) unsafe trait AsTaskType {
+    fn as_task_type(&self) -> hyper_task_return_type;
+}
+
+pub(crate) trait IntoDynTaskType {
+    fn into_dyn_task_type(self) -> BoxAny;
+}
+
+// ===== impl hyper_executor =====
+
+impl hyper_executor {
+    fn new() -> Arc<hyper_executor> {
+        Arc::new(hyper_executor {
+            driver: Mutex::new(FuturesUnordered::new()),
+            spawn_queue: Mutex::new(Vec::new()),
+            is_woken: Arc::new(ExecWaker(AtomicBool::new(false))),
+        })
+    }
+
+    pub(crate) fn downgrade(exec: &Arc<hyper_executor>) -> WeakExec {
+        WeakExec(Arc::downgrade(exec))
+    }
+
+    fn spawn(&self, task: Box<hyper_task>) {
+        self.spawn_queue
+            .lock()
+            .unwrap()
+            .push(TaskFuture { task: Some(task) });
+    }
+
+    fn poll_next(&self) -> Option<Box<hyper_task>> {
+        // Drain the queue first.
+        self.drain_queue();
+
+        let waker = futures_util::task::waker_ref(&self.is_woken);
+        let mut cx = Context::from_waker(&waker);
+
+        loop {
+            match Pin::new(&mut *self.driver.lock().unwrap()).poll_next(&mut cx) {
+                Poll::Ready(val) => return val,
+                Poll::Pending => {
+                    // Check if any of the pending tasks tried to spawn
+                    // some new tasks. If so, drain into the driver and loop.
+                    if self.drain_queue() {
+                        continue;
+                    }
+
+                    // If the driver called `wake` while we were polling,
+                    // we should poll again immediately!
+                    if self.is_woken.0.swap(false, Ordering::SeqCst) {
+                        continue;
+                    }
+
+                    return None;
+                }
+            }
+        }
+    }
+
+    fn drain_queue(&self) -> bool {
+        let mut queue = self.spawn_queue.lock().unwrap();
+        if queue.is_empty() {
+            return false;
+        }
+
+        let driver = self.driver.lock().unwrap();
+
+        for task in queue.drain(..) {
+            driver.push(task);
+        }
+
+        true
+    }
+}
+
+impl futures_util::task::ArcWake for ExecWaker {
+    fn wake_by_ref(me: &Arc<ExecWaker>) {
+        me.0.store(true, Ordering::SeqCst);
+    }
+}
+
+// ===== impl WeakExec =====
+
+impl WeakExec {
+    pub(crate) fn new() -> Self {
+        WeakExec(Weak::new())
+    }
+}
+
+impl crate::rt::Executor<BoxFuture<()>> for WeakExec {
+    fn execute(&self, fut: BoxFuture<()>) {
+        if let Some(exec) = self.0.upgrade() {
+            exec.spawn(hyper_task::boxed(fut));
+        }
+    }
+}
+
+ffi_fn! {
+    /// Creates a new task executor.
+    fn hyper_executor_new() -> *const hyper_executor {
+        Arc::into_raw(hyper_executor::new())
+    } ?= ptr::null()
+}
+
+ffi_fn! {
+    /// Frees an executor and any incomplete tasks still part of it.
+    fn hyper_executor_free(exec: *const hyper_executor) {
+        drop(non_null!(Arc::from_raw(exec) ?= ()));
+    }
+}
+
+ffi_fn! {
+    /// Push a task onto the executor.
+    ///
+    /// The executor takes ownership of the task, it should not be accessed
+    /// again unless returned back to the user with `hyper_executor_poll`.
+    fn hyper_executor_push(exec: *const hyper_executor, task: *mut hyper_task) -> hyper_code {
+        let exec = non_null!(&*exec ?= hyper_code::HYPERE_INVALID_ARG);
+        let task = non_null!(Box::from_raw(task) ?= hyper_code::HYPERE_INVALID_ARG);
+        exec.spawn(task);
+        hyper_code::HYPERE_OK
+    }
+}
+
+ffi_fn! {
+    /// Polls the executor, trying to make progress on any tasks that have notified
+    /// that they are ready again.
+    ///
+    /// If ready, returns a task from the executor that has completed.
+    ///
+    /// If there are no ready tasks, this returns `NULL`.
+    fn hyper_executor_poll(exec: *const hyper_executor) -> *mut hyper_task {
+        let exec = non_null!(&*exec ?= ptr::null_mut());
+        match exec.poll_next() {
+            Some(task) => Box::into_raw(task),
+            None => ptr::null_mut(),
+        }
+    } ?= ptr::null_mut()
+}
+
+// ===== impl hyper_task =====
+
+impl hyper_task {
+    pub(crate) fn boxed<F>(fut: F) -> Box<hyper_task>
+    where
+        F: Future + Send + 'static,
+        F::Output: IntoDynTaskType + Send + Sync + 'static,
+    {
+        Box::new(hyper_task {
+            future: Box::pin(async move { fut.await.into_dyn_task_type() }),
+            output: None,
+            userdata: UserDataPointer(ptr::null_mut()),
+        })
+    }
+
+    fn output_type(&self) -> hyper_task_return_type {
+        match self.output {
+            None => hyper_task_return_type::HYPER_TASK_EMPTY,
+            Some(ref val) => val.as_task_type(),
+        }
+    }
+}
+
+impl Future for TaskFuture {
+    type Output = Box<hyper_task>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        match Pin::new(&mut self.task.as_mut().unwrap().future).poll(cx) {
+            Poll::Ready(val) => {
+                let mut task = self.task.take().unwrap();
+                task.output = Some(val);
+                Poll::Ready(task)
+            }
+            Poll::Pending => Poll::Pending,
+        }
+    }
+}
+
+ffi_fn! {
+    /// Free a task.
+    fn hyper_task_free(task: *mut hyper_task) {
+        drop(non_null!(Box::from_raw(task) ?= ()));
+    }
+}
+
+ffi_fn! {
+    /// Takes the output value of this task.
+    ///
+    /// This must only be called once polling the task on an executor has finished
+    /// this task.
+    ///
+    /// Use `hyper_task_type` to determine the type of the `void *` return value.
+    fn hyper_task_value(task: *mut hyper_task) -> *mut c_void {
+        let task = non_null!(&mut *task ?= ptr::null_mut());
+
+        if let Some(val) = task.output.take() {
+            let p = Box::into_raw(val) as *mut c_void;
+            // protect from returning fake pointers to empty types
+            if p == std::ptr::NonNull::<c_void>::dangling().as_ptr() {
+                ptr::null_mut()
+            } else {
+                p
+            }
+        } else {
+            ptr::null_mut()
+        }
+    } ?= ptr::null_mut()
+}
+
+ffi_fn! {
+    /// Query the return type of this task.
+    fn hyper_task_type(task: *mut hyper_task) -> hyper_task_return_type {
+        // instead of blowing up spectacularly, just say this null task
+        // doesn't have a value to retrieve.
+        non_null!(&*task ?= hyper_task_return_type::HYPER_TASK_EMPTY).output_type()
+    }
+}
+
+ffi_fn! {
+    /// Set a user data pointer to be associated with this task.
+    ///
+    /// This value will be passed to task callbacks, and can be checked later
+    /// with `hyper_task_userdata`.
+    fn hyper_task_set_userdata(task: *mut hyper_task, userdata: *mut c_void) {
+        if task.is_null() {
+            return;
+        }
+
+        unsafe { (*task).userdata = UserDataPointer(userdata) };
+    }
+}
+
+ffi_fn! {
+    /// Retrieve the userdata that has been set via `hyper_task_set_userdata`.
+    fn hyper_task_userdata(task: *mut hyper_task) -> *mut c_void {
+        non_null!(&*task ?= ptr::null_mut()).userdata.0
+    } ?= ptr::null_mut()
+}
+
+// ===== impl AsTaskType =====
+
+unsafe impl AsTaskType for () {
+    fn as_task_type(&self) -> hyper_task_return_type {
+        hyper_task_return_type::HYPER_TASK_EMPTY
+    }
+}
+
+unsafe impl AsTaskType for crate::Error {
+    fn as_task_type(&self) -> hyper_task_return_type {
+        hyper_task_return_type::HYPER_TASK_ERROR
+    }
+}
+
+impl<T> IntoDynTaskType for T
+where
+    T: AsTaskType + Send + Sync + 'static,
+{
+    fn into_dyn_task_type(self) -> BoxAny {
+        Box::new(self)
+    }
+}
+
+impl<T> IntoDynTaskType for crate::Result<T>
+where
+    T: IntoDynTaskType + Send + Sync + 'static,
+{
+    fn into_dyn_task_type(self) -> BoxAny {
+        match self {
+            Ok(val) => val.into_dyn_task_type(),
+            Err(err) => Box::new(err),
+        }
+    }
+}
+
+impl<T> IntoDynTaskType for Option<T>
+where
+    T: IntoDynTaskType + Send + Sync + 'static,
+{
+    fn into_dyn_task_type(self) -> BoxAny {
+        match self {
+            Some(val) => val.into_dyn_task_type(),
+            None => ().into_dyn_task_type(),
+        }
+    }
+}
+
+// ===== impl hyper_context =====
+
+impl hyper_context<'_> {
+    pub(crate) fn wrap<'a, 'b>(cx: &'a mut Context<'b>) -> &'a mut hyper_context<'b> {
+        // A struct with only one field has the same layout as that field.
+        unsafe { std::mem::transmute::<&mut Context<'_>, &mut hyper_context<'_>>(cx) }
+    }
+}
+
+ffi_fn! {
+    /// Copies a waker out of the task context.
+    fn hyper_context_waker(cx: *mut hyper_context<'_>) -> *mut hyper_waker {
+        let waker = non_null!(&mut *cx ?= ptr::null_mut()).0.waker().clone();
+        Box::into_raw(Box::new(hyper_waker { waker }))
+    } ?= ptr::null_mut()
+}
+
+// ===== impl hyper_waker =====
+
+ffi_fn! {
+    /// Free a waker that hasn't been woken.
+    fn hyper_waker_free(waker: *mut hyper_waker) {
+        drop(non_null!(Box::from_raw(waker) ?= ()));
+    }
+}
+
+ffi_fn! {
+    /// Wake up the task associated with a waker.
+    ///
+    /// NOTE: This consumes the waker. You should not use or free the waker afterwards.
+    fn hyper_waker_wake(waker: *mut hyper_waker) {
+        let waker = non_null!(Box::from_raw(waker) ?= ());
+        waker.waker.wake();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/headers.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/headers.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/headers.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/headers.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,22 @@
+#[cfg(feature = "http1")]
 use bytes::BytesMut;
-use http::header::{HeaderValue, OccupiedEntry, ValueIter};
-use http::header::{CONTENT_LENGTH, TRANSFER_ENCODING};
-use http::method::Method;
+use http::header::CONTENT_LENGTH;
+use http::header::{HeaderValue, ValueIter};
 use http::HeaderMap;
+#[cfg(all(feature = "http2", feature = "client"))]
+use http::Method;
 
-pub fn connection_keep_alive(value: &HeaderValue) -> bool {
+#[cfg(feature = "http1")]
+pub(super) fn connection_keep_alive(value: &HeaderValue) -> bool {
     connection_has(value, "keep-alive")
 }
 
-pub fn connection_close(value: &HeaderValue) -> bool {
+#[cfg(feature = "http1")]
+pub(super) fn connection_close(value: &HeaderValue) -> bool {
     connection_has(value, "close")
 }
 
+#[cfg(feature = "http1")]
 fn connection_has(value: &HeaderValue, needle: &str) -> bool {
     if let Ok(s) = value.to_str() {
         for val in s.split(',') {
@@ -23,59 +28,91 @@
     false
 }
 
-pub fn content_length_parse(value: &HeaderValue) -> Option<u64> {
-    value.to_str().ok().and_then(|s| s.parse().ok())
+#[cfg(all(feature = "http1", feature = "server"))]
+pub(super) fn content_length_parse(value: &HeaderValue) -> Option<u64> {
+    from_digits(value.as_bytes())
 }
 
-pub fn content_length_parse_all(headers: &HeaderMap) -> Option<u64> {
+pub(super) fn content_length_parse_all(headers: &HeaderMap) -> Option<u64> {
     content_length_parse_all_values(headers.get_all(CONTENT_LENGTH).into_iter())
 }
 
-pub fn content_length_parse_all_values(values: ValueIter<'_, HeaderValue>) -> Option<u64> {
+pub(super) fn content_length_parse_all_values(values: ValueIter<'_, HeaderValue>) -> Option<u64> {
     // If multiple Content-Length headers were sent, everything can still
     // be alright if they all contain the same value, and all parse
     // correctly. If not, then it's an error.
 
-    let folded = values.fold(None, |prev, line| match prev {
-        Some(Ok(prev)) => Some(
-            line.to_str()
-                .map_err(|_| ())
-                .and_then(|s| s.parse().map_err(|_| ()))
-                .and_then(|n| if prev == n { Ok(n) } else { Err(()) }),
-        ),
-        None => Some(
-            line.to_str()
-                .map_err(|_| ())
-                .and_then(|s| s.parse().map_err(|_| ())),
-        ),
-        Some(Err(())) => Some(Err(())),
-    });
-
-    if let Some(Ok(n)) = folded {
-        Some(n)
-    } else {
-        None
+    let mut content_length: Option<u64> = None;
+    for h in values {
+        if let Ok(line) = h.to_str() {
+            for v in line.split(',') {
+                if let Some(n) = from_digits(v.trim().as_bytes()) {
+                    if content_length.is_none() {
+                        content_length = Some(n)
+                    } else if content_length != Some(n) {
+                        return None;
+                    }
+                } else {
+                    return None
+                }
+            }
+        } else {
+            return None
+        }
+    }
+
+    return content_length
+}
+
+fn from_digits(bytes: &[u8]) -> Option<u64> {
+    // cannot use FromStr for u64, since it allows a signed prefix
+    let mut result = 0u64;
+    const RADIX: u64 = 10;
+
+    if bytes.is_empty() {
+        return None;
+    }
+
+    for &b in bytes {
+        // can't use char::to_digit, since we haven't verified these bytes
+        // are utf-8.
+        match b {
+            b'0'..=b'9' => {
+                result = result.checked_mul(RADIX)?;
+                result = result.checked_add((b - b'0') as u64)?;
+            },
+            _ => {
+                // not a DIGIT, get outta here!
+                return None;
+            }
+        }
     }
+
+    Some(result)
 }
 
-pub fn method_has_defined_payload_semantics(method: &Method) -> bool {
+#[cfg(all(feature = "http2", feature = "client"))]
+pub(super) fn method_has_defined_payload_semantics(method: &Method) -> bool {
     match *method {
         Method::GET | Method::HEAD | Method::DELETE | Method::CONNECT => false,
         _ => true,
     }
 }
 
-pub fn set_content_length_if_missing(headers: &mut HeaderMap, len: u64) {
+#[cfg(feature = "http2")]
+pub(super) fn set_content_length_if_missing(headers: &mut HeaderMap, len: u64) {
     headers
         .entry(CONTENT_LENGTH)
         .or_insert_with(|| HeaderValue::from(len));
 }
 
-pub fn transfer_encoding_is_chunked(headers: &HeaderMap) -> bool {
-    is_chunked(headers.get_all(TRANSFER_ENCODING).into_iter())
+#[cfg(feature = "http1")]
+pub(super) fn transfer_encoding_is_chunked(headers: &HeaderMap) -> bool {
+    is_chunked(headers.get_all(http::header::TRANSFER_ENCODING).into_iter())
 }
 
-pub fn is_chunked(mut encodings: ValueIter<'_, HeaderValue>) -> bool {
+#[cfg(feature = "http1")]
+pub(super) fn is_chunked(mut encodings: ValueIter<'_, HeaderValue>) -> bool {
     // chunked must always be the last encoding, according to spec
     if let Some(line) = encodings.next_back() {
         return is_chunked_(line);
@@ -84,7 +121,8 @@
     false
 }
 
-pub fn is_chunked_(value: &HeaderValue) -> bool {
+#[cfg(feature = "http1")]
+pub(super) fn is_chunked_(value: &HeaderValue) -> bool {
     // chunked must always be the last encoding, according to spec
     if let Ok(s) = value.to_str() {
         if let Some(encoding) = s.rsplit(',').next() {
@@ -95,16 +133,17 @@
     false
 }
 
-pub fn add_chunked(mut entry: OccupiedEntry<'_, HeaderValue>) {
+#[cfg(feature = "http1")]
+pub(super) fn add_chunked(mut entry: http::header::OccupiedEntry<'_, HeaderValue>) {
     const CHUNKED: &str = "chunked";
 
     if let Some(line) = entry.iter_mut().next_back() {
         // + 2 for ", "
         let new_cap = line.as_bytes().len() + CHUNKED.len() + 2;
         let mut buf = BytesMut::with_capacity(new_cap);
-        buf.copy_from_slice(line.as_bytes());
-        buf.copy_from_slice(b", ");
-        buf.copy_from_slice(CHUNKED.as_bytes());
+        buf.extend_from_slice(line.as_bytes());
+        buf.extend_from_slice(b", ");
+        buf.extend_from_slice(CHUNKED.as_bytes());
 
         *line = HeaderValue::from_maybe_shared(buf.freeze())
             .expect("original header value plus ascii is valid");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,10 @@
-#![doc(html_root_url = "https://docs.rs/hyper/0.13.9")]
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
 #![cfg_attr(test, deny(rust_2018_idioms))]
+#![cfg_attr(all(test, feature = "full"), deny(unreachable_pub))]
 #![cfg_attr(test, deny(warnings))]
 #![cfg_attr(all(test, feature = "nightly"), feature(test))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 //! # hyper
 //!
@@ -31,41 +32,87 @@
 //!
 //! # Optional Features
 //!
+//! hyper uses a set of [feature flags] to reduce the amount of compiled code.
+//! It is possible to just enable certain features over others. By default,
+//! hyper does not enable any features but allows one to enable a subset for
+//! their use case. Below is a list of the available feature flags. You may
+//! also notice above each function, struct and trait there is listed one or
+//! more feature flags that are required for that item to be used.
+//!
+//! If you are new to hyper it is possible to enable the `full` feature flag
+//! which will enable all public APIs. Beware though that this will pull in
+//! many extra dependencies that you may not need.
+//!
 //! The following optional features are available:
 //!
-//! - `runtime` (*enabled by default*): Enables convenient integration with
-//!   `tokio`, providing connectors and acceptors for TCP, and a default
-//!   executor.
-//! - `tcp` (*enabled by default*): Enables convenient implementations over
-//!   TCP (using tokio).
-//! - `stream` (*enabled by default*): Provides `futures::Stream` capabilities.
+//! - `http1`: Enables HTTP/1 support.
+//! - `http2`: Enables HTTP/2 support.
+//! - `client`: Enables the HTTP `client`.
+//! - `server`: Enables the HTTP `server`.
+//! - `runtime`: Enables convenient integration with `tokio`, providing
+//!   connectors and acceptors for TCP, and a default executor.
+//! - `tcp`: Enables convenient implementations over TCP (using tokio).
+//! - `stream`: Provides `futures::Stream` capabilities.
+//!
+//! [feature flags]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section
 
 #[doc(hidden)]
 pub use http;
+#[cfg(any(
+    feature = "http1",
+    feature = "http2",
+    all(feature = "client", feature = "tcp")
+))]
 #[macro_use]
 extern crate tracing;
 
 #[cfg(all(test, feature = "nightly"))]
 extern crate test;
 
-pub use http::{header, HeaderMap, Method, Request, Response, StatusCode, Uri, Version};
+pub use crate::http::{header, Method, Request, Response, StatusCode, Uri, Version};
+
+#[doc(no_inline)]
+pub use crate::http::HeaderMap;
 
 pub use crate::body::Body;
-pub use crate::client::Client;
 pub use crate::error::{Error, Result};
-pub use crate::server::Server;
 
 #[macro_use]
+mod cfg;
+#[macro_use]
 mod common;
 pub mod body;
-pub mod client;
-#[doc(hidden)] // Mistakenly public...
-pub mod error;
-mod headers;
+mod error;
+mod ext;
 #[cfg(test)]
 mod mock;
-mod proto;
+#[cfg(any(feature = "http1", feature = "http2",))]
 pub mod rt;
-pub mod server;
 pub mod service;
 pub mod upgrade;
+
+#[cfg(feature = "ffi")]
+pub mod ffi;
+
+cfg_proto! {
+    mod headers;
+    mod proto;
+}
+
+cfg_feature! {
+    #![all(feature = "client")]
+
+    pub mod client;
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[doc(no_inline)]
+    pub use crate::client::Client;
+}
+
+cfg_feature! {
+    #![all(feature = "server")]
+
+    pub mod server;
+    #[cfg(any(feature = "http1", feature = "http2"))]
+    #[doc(no_inline)]
+    pub use crate::server::Server;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/conn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/conn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/conn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/conn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,19 @@
 use std::fmt;
-use std::io::{self};
+use std::io;
 use std::marker::PhantomData;
 
 use bytes::{Buf, Bytes};
 use http::header::{HeaderValue, CONNECTION};
 use http::{HeaderMap, Method, Version};
+use httparse::ParserConfig;
 use tokio::io::{AsyncRead, AsyncWrite};
 
 use super::io::Buffered;
 use super::{Decoder, Encode, EncodedBuf, Encoder, Http1Transaction, ParseContext, Wants};
+use crate::body::DecodedLength;
 use crate::common::{task, Pin, Poll, Unpin};
 use crate::headers::connection_keep_alive;
-use crate::proto::{BodyLength, DecodedLength, MessageHead};
-use crate::Result;
+use crate::proto::{BodyLength, MessageHead};
 
 const H2_PREFACE: &[u8] = b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n";
 
@@ -35,7 +36,7 @@
     B: Buf,
     T: Http1Transaction,
 {
-    pub fn new(io: I) -> Conn<I, B, T> {
+    pub(crate) fn new(io: I) -> Conn<I, B, T> {
         Conn {
             io: Buffered::new(io),
             state: State {
@@ -44,7 +45,14 @@
                 error: None,
                 keep_alive: KA::Busy,
                 method: None,
+                h1_parser_config: ParserConfig::default(),
+                preserve_header_case: false,
                 title_case_headers: false,
+                h09_responses: false,
+                #[cfg(feature = "ffi")]
+                on_informational: None,
+                #[cfg(feature = "ffi")]
+                raw_headers: false,
                 notify_read: false,
                 reading: Reading::Init,
                 writing: Writing::Init,
@@ -57,51 +65,65 @@
         }
     }
 
-    pub fn set_flush_pipeline(&mut self, enabled: bool) {
+    #[cfg(feature = "server")]
+    pub(crate) fn set_flush_pipeline(&mut self, enabled: bool) {
         self.io.set_flush_pipeline(enabled);
     }
 
-    pub fn set_max_buf_size(&mut self, max: usize) {
+    pub(crate) fn set_max_buf_size(&mut self, max: usize) {
         self.io.set_max_buf_size(max);
     }
 
-    pub fn set_read_buf_exact_size(&mut self, sz: usize) {
+    #[cfg(feature = "client")]
+    pub(crate) fn set_read_buf_exact_size(&mut self, sz: usize) {
         self.io.set_read_buf_exact_size(sz);
     }
 
-    pub fn set_write_strategy_flatten(&mut self) {
-        self.io.set_write_strategy_flatten();
+    #[cfg(feature = "client")]
+    pub(crate) fn set_h1_parser_config(&mut self, parser_config: ParserConfig) {
+        self.state.h1_parser_config = parser_config;
     }
 
-    pub fn set_write_strategy_queue(&mut self) {
-        self.io.set_write_strategy_queue();
+    pub(crate) fn set_title_case_headers(&mut self) {
+        self.state.title_case_headers = true;
     }
 
-    pub fn set_title_case_headers(&mut self) {
-        self.state.title_case_headers = true;
+    pub(crate) fn set_preserve_header_case(&mut self) {
+        self.state.preserve_header_case = true;
+    }
+
+    #[cfg(feature = "client")]
+    pub(crate) fn set_h09_responses(&mut self) {
+        self.state.h09_responses = true;
     }
 
+    #[cfg(feature = "server")]
     pub(crate) fn set_allow_half_close(&mut self) {
         self.state.allow_half_close = true;
     }
 
-    pub fn into_inner(self) -> (I, Bytes) {
+    #[cfg(feature = "ffi")]
+    pub(crate) fn set_raw_headers(&mut self, enabled: bool) {
+        self.state.raw_headers = enabled;
+    }
+
+    pub(crate) fn into_inner(self) -> (I, Bytes) {
         self.io.into_inner()
     }
 
-    pub fn pending_upgrade(&mut self) -> Option<crate::upgrade::Pending> {
+    pub(crate) fn pending_upgrade(&mut self) -> Option<crate::upgrade::Pending> {
         self.state.upgrade.take()
     }
 
-    pub fn is_read_closed(&self) -> bool {
+    pub(crate) fn is_read_closed(&self) -> bool {
         self.state.is_read_closed()
     }
 
-    pub fn is_write_closed(&self) -> bool {
+    pub(crate) fn is_write_closed(&self) -> bool {
         self.state.is_write_closed()
     }
 
-    pub fn can_read_head(&self) -> bool {
+    pub(crate) fn can_read_head(&self) -> bool {
         match self.state.reading {
             Reading::Init => {
                 if T::should_read_first() {
@@ -117,7 +139,7 @@
         }
     }
 
-    pub fn can_read_body(&self) -> bool {
+    pub(crate) fn can_read_body(&self) -> bool {
         match self.state.reading {
             Reading::Body(..) | Reading::Continue(..) => true,
             _ => false,
@@ -146,6 +168,13 @@
             ParseContext {
                 cached_headers: &mut self.state.cached_headers,
                 req_method: &mut self.state.method,
+                h1_parser_config: self.state.h1_parser_config.clone(),
+                preserve_header_case: self.state.preserve_header_case,
+                h09_responses: self.state.h09_responses,
+                #[cfg(feature = "ffi")]
+                on_informational: &mut self.state.on_informational,
+                #[cfg(feature = "ffi")]
+                raw_headers: self.state.raw_headers,
             }
         )) {
             Ok(msg) => msg,
@@ -157,6 +186,15 @@
 
         debug!("incoming body is {}", msg.decode);
 
+        // Prevent accepting HTTP/0.9 responses after the initial one, if any.
+        self.state.h09_responses = false;
+
+        // Drop any OnInformational callbacks, we're done there!
+        #[cfg(feature = "ffi")]
+        {
+            self.state.on_informational = None;
+        }
+
         self.state.busy();
         self.state.keep_alive &= msg.keep_alive;
         self.state.version = msg.head.version;
@@ -211,7 +249,7 @@
         }
     }
 
-    pub fn poll_read_body(
+    pub(crate) fn poll_read_body(
         &mut self,
         cx: &mut task::Context<'_>,
     ) -> Poll<Option<io::Result<Bytes>>> {
@@ -268,13 +306,16 @@
         ret
     }
 
-    pub fn wants_read_again(&mut self) -> bool {
+    pub(crate) fn wants_read_again(&mut self) -> bool {
         let ret = self.state.notify_read;
         self.state.notify_read = false;
         ret
     }
 
-    pub fn poll_read_keep_alive(&mut self, cx: &mut task::Context<'_>) -> Poll<crate::Result<()>> {
+    pub(crate) fn poll_read_keep_alive(
+        &mut self,
+        cx: &mut task::Context<'_>,
+    ) -> Poll<crate::Result<()>> {
         debug_assert!(!self.can_read_head() && !self.can_read_body());
 
         if self.is_read_closed() {
@@ -412,7 +453,7 @@
         self.maybe_notify(cx);
     }
 
-    pub fn can_write_head(&self) -> bool {
+    pub(crate) fn can_write_head(&self) -> bool {
         if !T::should_read_first() {
             if let Reading::Closed = self.state.reading {
                 return false;
@@ -424,18 +465,18 @@
         }
     }
 
-    pub fn can_write_body(&self) -> bool {
+    pub(crate) fn can_write_body(&self) -> bool {
         match self.state.writing {
             Writing::Body(..) => true,
             Writing::Init | Writing::KeepAlive | Writing::Closed => false,
         }
     }
 
-    pub fn can_buffer_body(&self) -> bool {
+    pub(crate) fn can_buffer_body(&self) -> bool {
         self.io.can_buffer()
     }
 
-    pub fn write_head(&mut self, head: MessageHead<T::Outgoing>, body: Option<BodyLength>) {
+    pub(crate) fn write_head(&mut self, head: MessageHead<T::Outgoing>, body: Option<BodyLength>) {
         if let Some(encoder) = self.encode_head(head, body) {
             self.state.writing = if !encoder.is_eof() {
                 Writing::Body(encoder)
@@ -447,7 +488,7 @@
         }
     }
 
-    pub fn write_full_msg(&mut self, head: MessageHead<T::Outgoing>, body: B) {
+    pub(crate) fn write_full_msg(&mut self, head: MessageHead<T::Outgoing>, body: B) {
         if let Some(encoder) =
             self.encode_head(head, Some(BodyLength::Known(body.remaining() as u64)))
         {
@@ -483,6 +524,7 @@
             Encode {
                 head: &mut head,
                 body,
+                #[cfg(feature = "server")]
                 keep_alive: self.state.wants_keep_alive(),
                 req_method: &mut self.state.method,
                 title_case_headers: self.state.title_case_headers,
@@ -493,6 +535,14 @@
                 debug_assert!(self.state.cached_headers.is_none());
                 debug_assert!(head.headers.is_empty());
                 self.state.cached_headers = Some(head.headers);
+
+                #[cfg(feature = "ffi")]
+                {
+                    self.state.on_informational = head
+                        .extensions
+                        .remove::<crate::ffi::OnInformational>();
+                }
+
                 Some(encoder)
             }
             Err(err) => {
@@ -544,7 +594,7 @@
         // the user's headers be.
     }
 
-    pub fn write_body(&mut self, chunk: B) {
+    pub(crate) fn write_body(&mut self, chunk: B) {
         debug_assert!(self.can_write_body() && self.can_buffer_body());
         // empty chunks should be discarded at Dispatcher level
         debug_assert!(chunk.remaining() != 0);
@@ -569,7 +619,7 @@
         self.state.writing = state;
     }
 
-    pub fn write_body_and_end(&mut self, chunk: B) {
+    pub(crate) fn write_body_and_end(&mut self, chunk: B) {
         debug_assert!(self.can_write_body() && self.can_buffer_body());
         // empty chunks should be discarded at Dispatcher level
         debug_assert!(chunk.remaining() != 0);
@@ -589,9 +639,10 @@
         self.state.writing = state;
     }
 
-    pub fn end_body(&mut self) -> Result<()> {
+    pub(crate) fn end_body(&mut self) -> crate::Result<()> {
         debug_assert!(self.can_write_body());
 
+        let mut res = Ok(());
         let state = match self.state.writing {
             Writing::Body(ref mut encoder) => {
                 // end of stream, that means we should try to eof
@@ -600,16 +651,17 @@
                         if let Some(end) = end {
                             self.io.buffer(end);
                         }
-                        if encoder.is_last() {
+                        if encoder.is_last() || encoder.is_close_delimited() {
                             Writing::Closed
                         } else {
                             Writing::KeepAlive
                         }
                     }
                     Err(_not_eof) => {
-                        return Err(crate::Error::new_user_body(
+                        res = Err(crate::Error::new_user_body(
                             crate::Error::new_body_write_aborted(),
-                        ))
+                        ));
+                        Writing::Closed
                     }
                 }
             }
@@ -617,7 +669,7 @@
         };
 
         self.state.writing = state;
-        Ok(())
+        res
     }
 
     // When we get a parse error, depending on what side we are, we might be able
@@ -644,14 +696,14 @@
         Err(err)
     }
 
-    pub fn poll_flush(&mut self, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
+    pub(crate) fn poll_flush(&mut self, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
         ready!(Pin::new(&mut self.io).poll_flush(cx))?;
         self.try_keep_alive(cx);
         trace!("flushed({}): {:?}", T::LOG, self.state);
         Poll::Ready(Ok(()))
     }
 
-    pub fn poll_shutdown(&mut self, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
+    pub(crate) fn poll_shutdown(&mut self, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
         match ready!(Pin::new(self.io.io_mut()).poll_shutdown(cx)) {
             Ok(()) => {
                 trace!("shut down IO complete");
@@ -678,15 +730,16 @@
         }
     }
 
-    pub fn close_read(&mut self) {
+    pub(crate) fn close_read(&mut self) {
         self.state.close_read();
     }
 
-    pub fn close_write(&mut self) {
+    pub(crate) fn close_write(&mut self) {
         self.state.close_write();
     }
 
-    pub fn disable_keep_alive(&mut self) {
+    #[cfg(feature = "server")]
+    pub(crate) fn disable_keep_alive(&mut self) {
         if self.state.is_idle() {
             trace!("disable_keep_alive; closing idle connection");
             self.state.close();
@@ -696,7 +749,7 @@
         }
     }
 
-    pub fn take_error(&mut self) -> crate::Result<()> {
+    pub(crate) fn take_error(&mut self) -> crate::Result<()> {
         if let Some(err) = self.state.error.take() {
             Err(err)
         } else {
@@ -736,7 +789,17 @@
     /// This is used to know things such as if the message can include
     /// a body or not.
     method: Option<Method>,
+    h1_parser_config: ParserConfig,
+    preserve_header_case: bool,
     title_case_headers: bool,
+    h09_responses: bool,
+    /// If set, called with each 1xx informational response received for
+    /// the current request. MUST be unset after a non-1xx response is
+    /// received.
+    #[cfg(feature = "ffi")]
+    on_informational: Option<crate::ffi::OnInformational>,
+    #[cfg(feature = "ffi")]
+    raw_headers: bool,
     /// Set to true when the Dispatcher should poll read operations
     /// again. See the `maybe_notify` method for more.
     notify_read: bool,
@@ -967,9 +1030,8 @@
         *conn.io.read_buf_mut() = ::bytes::BytesMut::from(&s[..]);
         conn.state.cached_headers = Some(HeaderMap::with_capacity(2));
 
-        let mut rt = tokio::runtime::Builder::new()
+        let rt = tokio::runtime::Builder::new_current_thread()
             .enable_all()
-            .basic_scheduler()
             .build()
             .unwrap();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/date.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/date.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/date.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/date.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-use std::cell::RefCell;
-use std::fmt::{self, Write};
-use std::str;
-use std::time::{Duration, SystemTime};
-
-use http::header::HeaderValue;
-use httpdate::HttpDate;
-
-// "Sun, 06 Nov 1994 08:49:37 GMT".len()
-pub const DATE_VALUE_LENGTH: usize = 29;
-
-pub fn extend(dst: &mut Vec<u8>) {
-    CACHED.with(|cache| {
-        dst.extend_from_slice(cache.borrow().buffer());
-    })
-}
-
-pub fn update() {
-    CACHED.with(|cache| {
-        cache.borrow_mut().check();
-    })
-}
-
-pub(crate) fn update_and_header_value() -> HeaderValue {
-    CACHED.with(|cache| {
-        let mut cache = cache.borrow_mut();
-        cache.check();
-        HeaderValue::from_bytes(cache.buffer()).expect("Date format should be valid HeaderValue")
-    })
-}
-
-struct CachedDate {
-    bytes: [u8; DATE_VALUE_LENGTH],
-    pos: usize,
-    next_update: SystemTime,
-}
-
-thread_local!(static CACHED: RefCell<CachedDate> = RefCell::new(CachedDate::new()));
-
-impl CachedDate {
-    fn new() -> Self {
-        let mut cache = CachedDate {
-            bytes: [0; DATE_VALUE_LENGTH],
-            pos: 0,
-            next_update: SystemTime::now(),
-        };
-        cache.update(cache.next_update);
-        cache
-    }
-
-    fn buffer(&self) -> &[u8] {
-        &self.bytes[..]
-    }
-
-    fn check(&mut self) {
-        let now = SystemTime::now();
-        if now > self.next_update {
-            self.update(now);
-        }
-    }
-
-    fn update(&mut self, now: SystemTime) {
-        self.render(now);
-        self.next_update = now + Duration::new(1, 0);
-    }
-
-    fn render(&mut self, now: SystemTime) {
-        self.pos = 0;
-        let _ = write!(self, "{}", HttpDate::from(now));
-        debug_assert!(self.pos == DATE_VALUE_LENGTH);
-    }
-}
-
-impl fmt::Write for CachedDate {
-    fn write_str(&mut self, s: &str) -> fmt::Result {
-        let len = s.len();
-        self.bytes[self.pos..self.pos + len].copy_from_slice(s.as_bytes());
-        self.pos += len;
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[cfg(feature = "nightly")]
-    use test::Bencher;
-
-    #[test]
-    fn test_date_len() {
-        assert_eq!(DATE_VALUE_LENGTH, "Sun, 06 Nov 1994 08:49:37 GMT".len());
-    }
-
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_date_check(b: &mut Bencher) {
-        let mut date = CachedDate::new();
-        // cache the first update
-        date.check();
-
-        b.iter(|| {
-            date.check();
-        });
-    }
-
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_date_render(b: &mut Bencher) {
-        let mut date = CachedDate::new();
-        let now = SystemTime::now();
-        date.render(now);
-        b.bytes = date.buffer().len() as u64;
-
-        b.iter(|| {
-            date.render(now);
-            test::black_box(&date);
-        });
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/decode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/decode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/decode.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/decode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,7 +17,7 @@
 /// If a message body does not include a Transfer-Encoding, it *should*
 /// include a Content-Length header.
 #[derive(Clone, PartialEq)]
-pub struct Decoder {
+pub(crate) struct Decoder {
     kind: Kind,
 }
 
@@ -55,6 +55,8 @@
     Body,
     BodyCr,
     BodyLf,
+    Trailer,
+    TrailerLf,
     EndCr,
     EndLf,
     End,
@@ -63,19 +65,19 @@
 impl Decoder {
     // constructors
 
-    pub fn length(x: u64) -> Decoder {
+    pub(crate) fn length(x: u64) -> Decoder {
         Decoder {
             kind: Kind::Length(x),
         }
     }
 
-    pub fn chunked() -> Decoder {
+    pub(crate) fn chunked() -> Decoder {
         Decoder {
             kind: Kind::Chunked(ChunkedState::Size, 0),
         }
     }
 
-    pub fn eof() -> Decoder {
+    pub(crate) fn eof() -> Decoder {
         Decoder {
             kind: Kind::Eof(false),
         }
@@ -91,14 +93,11 @@
 
     // methods
 
-    pub fn is_eof(&self) -> bool {
-        match self.kind {
-            Length(0) | Chunked(ChunkedState::End, _) | Eof(true) => true,
-            _ => false,
-        }
+    pub(crate) fn is_eof(&self) -> bool {
+        matches!(self.kind, Length(0) | Chunked(ChunkedState::End, _) | Eof(true))
     }
 
-    pub fn decode<R: MemRead>(
+    pub(crate) fn decode<R: MemRead>(
         &mut self,
         cx: &mut task::Context<'_>,
         body: &mut R,
@@ -196,6 +195,8 @@
             Body => ChunkedState::read_body(cx, body, size, buf),
             BodyCr => ChunkedState::read_body_cr(cx, body),
             BodyLf => ChunkedState::read_body_lf(cx, body),
+            Trailer => ChunkedState::read_trailer(cx, body),
+            TrailerLf => ChunkedState::read_trailer_lf(cx, body),
             EndCr => ChunkedState::read_end_cr(cx, body),
             EndLf => ChunkedState::read_end_lf(cx, body),
             End => Poll::Ready(Ok(ChunkedState::End)),
@@ -207,19 +208,32 @@
         size: &mut u64,
     ) -> Poll<Result<ChunkedState, io::Error>> {
         trace!("Read chunk hex size");
+
+        macro_rules! or_overflow {
+            ($e:expr) => (
+                match $e {
+                    Some(val) => val,
+                    None => return Poll::Ready(Err(io::Error::new(
+                        io::ErrorKind::InvalidData,
+                        "invalid chunk size: overflow",
+                    ))),
+                }
+            )
+        }
+
         let radix = 16;
         match byte!(rdr, cx) {
             b @ b'0'..=b'9' => {
-                *size *= radix;
-                *size += (b - b'0') as u64;
+                *size = or_overflow!(size.checked_mul(radix));
+                *size = or_overflow!(size.checked_add((b - b'0') as u64));
             }
             b @ b'a'..=b'f' => {
-                *size *= radix;
-                *size += (b + 10 - b'a') as u64;
+                *size = or_overflow!(size.checked_mul(radix));
+                *size = or_overflow!(size.checked_add((b + 10 - b'a') as u64));
             }
             b @ b'A'..=b'F' => {
-                *size *= radix;
-                *size += (b + 10 - b'A') as u64;
+                *size = or_overflow!(size.checked_mul(radix));
+                *size = or_overflow!(size.checked_add((b + 10 - b'A') as u64));
             }
             b'\t' | b' ' => return Poll::Ready(Ok(ChunkedState::SizeLws)),
             b';' => return Poll::Ready(Ok(ChunkedState::Extension)),
@@ -254,8 +268,18 @@
         rdr: &mut R,
     ) -> Poll<Result<ChunkedState, io::Error>> {
         trace!("read_extension");
+        // We don't care about extensions really at all. Just ignore them.
+        // They "end" at the next CRLF.
+        //
+        // However, some implementations may not check for the CR, so to save
+        // them from themselves, we reject extensions containing plain LF as
+        // well.
         match byte!(rdr, cx) {
             b'\r' => Poll::Ready(Ok(ChunkedState::SizeLf)),
+            b'\n' => Poll::Ready(Err(io::Error::new(
+                io::ErrorKind::InvalidData,
+                "invalid chunk extension contains newline",
+            ))),
             _ => Poll::Ready(Ok(ChunkedState::Extension)), // no supported extensions
         }
     }
@@ -340,18 +364,38 @@
         }
     }
 
-    fn read_end_cr<R: MemRead>(
+    fn read_trailer<R: MemRead>(
         cx: &mut task::Context<'_>,
         rdr: &mut R,
     ) -> Poll<Result<ChunkedState, io::Error>> {
+        trace!("read_trailer");
         match byte!(rdr, cx) {
-            b'\r' => Poll::Ready(Ok(ChunkedState::EndLf)),
+            b'\r' => Poll::Ready(Ok(ChunkedState::TrailerLf)),
+            _ => Poll::Ready(Ok(ChunkedState::Trailer)),
+        }
+    }
+    fn read_trailer_lf<R: MemRead>(
+        cx: &mut task::Context<'_>,
+        rdr: &mut R,
+    ) -> Poll<Result<ChunkedState, io::Error>> {
+        match byte!(rdr, cx) {
+            b'\n' => Poll::Ready(Ok(ChunkedState::EndCr)),
             _ => Poll::Ready(Err(io::Error::new(
                 io::ErrorKind::InvalidInput,
-                "Invalid chunk end CR",
+                "Invalid trailer end LF",
             ))),
         }
     }
+
+    fn read_end_cr<R: MemRead>(
+        cx: &mut task::Context<'_>,
+        rdr: &mut R,
+    ) -> Poll<Result<ChunkedState, io::Error>> {
+        match byte!(rdr, cx) {
+            b'\r' => Poll::Ready(Ok(ChunkedState::EndLf)),
+            _ => Poll::Ready(Ok(ChunkedState::Trailer)),
+        }
+    }
     fn read_end_lf<R: MemRead>(
         cx: &mut task::Context<'_>,
         rdr: &mut R,
@@ -382,7 +426,7 @@
     use super::*;
     use std::pin::Pin;
     use std::time::Duration;
-    use tokio::io::AsyncRead;
+    use tokio::io::{AsyncRead, ReadBuf};
 
     impl<'a> MemRead for &'a [u8] {
         fn read_mem(&mut self, _: &mut task::Context<'_>, len: usize) -> Poll<io::Result<Bytes>> {
@@ -401,8 +445,9 @@
     impl<'a> MemRead for &'a mut (dyn AsyncRead + Unpin) {
         fn read_mem(&mut self, cx: &mut task::Context<'_>, len: usize) -> Poll<io::Result<Bytes>> {
             let mut v = vec![0; len];
-            let n = ready!(Pin::new(self).poll_read(cx, &mut v)?);
-            Poll::Ready(Ok(Bytes::copy_from_slice(&v[..n])))
+            let mut buf = ReadBuf::new(&mut v);
+            ready!(Pin::new(self).poll_read(cx, &mut buf)?);
+            Poll::Ready(Ok(Bytes::copy_from_slice(&buf.filled())))
         }
     }
 
@@ -427,7 +472,7 @@
 
     #[tokio::test]
     async fn test_read_chunk_size() {
-        use std::io::ErrorKind::{InvalidInput, UnexpectedEof};
+        use std::io::ErrorKind::{InvalidData, InvalidInput, UnexpectedEof};
 
         async fn read(s: &str) -> u64 {
             let mut state = ChunkedState::Size;
@@ -468,7 +513,7 @@
                     }
                 };
                 if state == ChunkedState::Body || state == ChunkedState::End {
-                    panic!(format!("Was Ok. Expected Err for {:?}", s));
+                    panic!("Was Ok. Expected Err for {:?}", s);
                 }
             }
         }
@@ -502,6 +547,9 @@
         read_err("1 invalid extension\r\n", InvalidInput).await;
         read_err("1 A\r\n", InvalidInput).await;
         read_err("1;no CRLF", UnexpectedEof).await;
+        read_err("1;reject\nnewlines\r\n", InvalidData).await;
+        // Overflow
+        read_err("f0000000000000003\r\n", InvalidData).await;
     }
 
     #[tokio::test]
@@ -538,6 +586,15 @@
     }
 
     #[tokio::test]
+    async fn test_read_chunked_trailer_with_missing_lf() {
+        let mut mock_buf = &b"10\r\n1234567890abcdef\r\n0\r\nbad\r\r\n"[..];
+        let mut decoder = Decoder::chunked();
+        decoder.decode_fut(&mut mock_buf).await.expect("decode");
+        let e = decoder.decode_fut(&mut mock_buf).await.unwrap_err();
+        assert_eq!(e.kind(), io::ErrorKind::InvalidInput);
+    }
+
+    #[tokio::test]
     async fn test_read_chunked_after_eof() {
         let mut mock_buf = &b"10\r\n1234567890abcdef\r\n0\r\n\r\n"[..];
         let mut decoder = Decoder::chunked();
@@ -623,7 +680,7 @@
     #[cfg(feature = "nightly")]
     #[bench]
     fn bench_decode_chunked_1kb(b: &mut test::Bencher) {
-        let mut rt = new_runtime();
+        let rt = new_runtime();
 
         const LEN: usize = 1024;
         let mut vec = Vec::new();
@@ -647,7 +704,7 @@
     #[cfg(feature = "nightly")]
     #[bench]
     fn bench_decode_length_1kb(b: &mut test::Bencher) {
-        let mut rt = new_runtime();
+        let rt = new_runtime();
 
         const LEN: usize = 1024;
         let content = Bytes::from(&[0; LEN][..]);
@@ -665,9 +722,8 @@
 
     #[cfg(feature = "nightly")]
     fn new_runtime() -> tokio::runtime::Runtime {
-        tokio::runtime::Builder::new()
+        tokio::runtime::Builder::new_current_thread()
             .enable_all()
-            .basic_scheduler()
             .build()
             .expect("rt build")
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/dispatch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/dispatch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/dispatch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/dispatch.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,16 @@
 use std::error::Error as StdError;
 
 use bytes::{Buf, Bytes};
-use http::{Request, Response, StatusCode};
+use http::Request;
 use tokio::io::{AsyncRead, AsyncWrite};
 
 use super::{Http1Transaction, Wants};
-use crate::body::{Body, HttpBody};
-use crate::common::{task, Future, Never, Pin, Poll, Unpin};
+use crate::body::{Body, DecodedLength, HttpBody};
+use crate::common::{task, Future, Pin, Poll, Unpin};
 use crate::proto::{
-    BodyLength, Conn, DecodedLength, Dispatched, MessageHead, RequestHead, RequestLine,
-    ResponseHead,
+    BodyLength, Conn, Dispatched, MessageHead, RequestHead,
 };
-use crate::service::HttpService;
+use crate::upgrade::OnUpgrade;
 
 pub(crate) struct Dispatcher<D, Bs: HttpBody, I, T> {
     conn: Conn<I, Bs::Data, T>,
@@ -27,7 +26,7 @@
     type PollError;
     type RecvItem;
     fn poll_msg(
-        &mut self,
+        self: Pin<&mut Self>,
         cx: &mut task::Context<'_>,
     ) -> Poll<Option<Result<(Self::PollItem, Self::PollBody), Self::PollError>>>;
     fn recv_msg(&mut self, msg: crate::Result<(Self::RecvItem, Body)>) -> crate::Result<()>;
@@ -35,33 +34,42 @@
     fn should_poll(&self) -> bool;
 }
 
-pub struct Server<S: HttpService<B>, B> {
-    in_flight: Pin<Box<Option<S::Future>>>,
-    pub(crate) service: S,
-}
+cfg_server! {
+    use crate::service::HttpService;
 
-pub struct Client<B> {
-    callback: Option<crate::client::dispatch::Callback<Request<B>, Response<Body>>>,
-    rx: ClientRx<B>,
-    rx_closed: bool,
+    pub(crate) struct Server<S: HttpService<B>, B> {
+        in_flight: Pin<Box<Option<S::Future>>>,
+        pub(crate) service: S,
+    }
 }
 
-type ClientRx<B> = crate::client::dispatch::Receiver<Request<B>, Response<Body>>;
+cfg_client! {
+    pin_project_lite::pin_project! {
+        pub(crate) struct Client<B> {
+            callback: Option<crate::client::dispatch::Callback<Request<B>, http::Response<Body>>>,
+            #[pin]
+            rx: ClientRx<B>,
+            rx_closed: bool,
+        }
+    }
+
+    type ClientRx<B> = crate::client::dispatch::Receiver<Request<B>, http::Response<Body>>;
+}
 
 impl<D, Bs, I, T> Dispatcher<D, Bs, I, T>
 where
     D: Dispatch<
-            PollItem = MessageHead<T::Outgoing>,
-            PollBody = Bs,
-            RecvItem = MessageHead<T::Incoming>,
-        > + Unpin,
+        PollItem = MessageHead<T::Outgoing>,
+        PollBody = Bs,
+        RecvItem = MessageHead<T::Incoming>,
+    > + Unpin,
     D::PollError: Into<Box<dyn StdError + Send + Sync>>,
     I: AsyncRead + AsyncWrite + Unpin,
     T: Http1Transaction + Unpin,
     Bs: HttpBody + 'static,
     Bs::Error: Into<Box<dyn StdError + Send + Sync>>,
 {
-    pub fn new(dispatch: D, conn: Conn<I, Bs::Data, T>) -> Self {
+    pub(crate) fn new(dispatch: D, conn: Conn<I, Bs::Data, T>) -> Self {
         Dispatcher {
             conn,
             dispatch,
@@ -71,14 +79,15 @@
         }
     }
 
-    pub fn disable_keep_alive(&mut self) {
+    #[cfg(feature = "server")]
+    pub(crate) fn disable_keep_alive(&mut self) {
         self.conn.disable_keep_alive();
         if self.conn.is_write_closed() {
             self.close();
         }
     }
 
-    pub fn into_inner(self) -> (I, Bytes, D) {
+    pub(crate) fn into_inner(self) -> (I, Bytes, D) {
         let (io, buf) = self.conn.into_inner();
         (io, buf, self.dispatch)
     }
@@ -236,8 +245,8 @@
         }
         // dispatch is ready for a message, try to read one
         match ready!(self.conn.poll_read_head(cx)) {
-            Some(Ok((head, body_len, wants))) => {
-                let mut body = match body_len {
+            Some(Ok((mut head, body_len, wants))) => {
+                let body = match body_len {
                     DecodedLength::ZERO => Body::empty(),
                     other => {
                         let (tx, rx) = Body::new_channel(other, wants.contains(Wants::EXPECT));
@@ -246,7 +255,10 @@
                     }
                 };
                 if wants.contains(Wants::UPGRADE) {
-                    body.set_on_upgrade(self.conn.on_upgrade());
+                    let upgrade = self.conn.on_upgrade();
+                    debug_assert!(!upgrade.is_none(), "empty upgrade");
+                    debug_assert!(head.extensions.get::<OnUpgrade>().is_none(), "OnUpgrade already set");
+                    head.extensions.insert(upgrade);
                 }
                 self.dispatch.recv_msg(Ok((head, body)))?;
                 Poll::Ready(Ok(()))
@@ -281,7 +293,7 @@
                 && self.conn.can_write_head()
                 && self.dispatch.should_poll()
             {
-                if let Some(msg) = ready!(self.dispatch.poll_msg(cx)) {
+                if let Some(msg) = ready!(Pin::new(&mut self.dispatch).poll_msg(cx)) {
                     let (head, mut body) = msg.map_err(crate::Error::new_user_service)?;
 
                     // Check if the body knows its full data immediately.
@@ -394,10 +406,10 @@
 impl<D, Bs, I, T> Future for Dispatcher<D, Bs, I, T>
 where
     D: Dispatch<
-            PollItem = MessageHead<T::Outgoing>,
-            PollBody = Bs,
-            RecvItem = MessageHead<T::Incoming>,
-        > + Unpin,
+        PollItem = MessageHead<T::Outgoing>,
+        PollBody = Bs,
+        RecvItem = MessageHead<T::Incoming>,
+    > + Unpin,
     D::PollError: Into<Box<dyn StdError + Send + Sync>>,
     I: AsyncRead + AsyncWrite + Unpin,
     T: Http1Transaction + Unpin,
@@ -438,196 +450,202 @@
 
 // ===== impl Server =====
 
-impl<S, B> Server<S, B>
-where
-    S: HttpService<B>,
-{
-    pub fn new(service: S) -> Server<S, B> {
-        Server {
-            in_flight: Box::pin(None),
-            service,
+cfg_server! {
+    impl<S, B> Server<S, B>
+    where
+        S: HttpService<B>,
+    {
+        pub(crate) fn new(service: S) -> Server<S, B> {
+            Server {
+                in_flight: Box::pin(None),
+                service,
+            }
         }
-    }
 
-    pub fn into_service(self) -> S {
-        self.service
+        pub(crate) fn into_service(self) -> S {
+            self.service
+        }
     }
-}
 
-// Service is never pinned
-impl<S: HttpService<B>, B> Unpin for Server<S, B> {}
+    // Service is never pinned
+    impl<S: HttpService<B>, B> Unpin for Server<S, B> {}
 
-impl<S, Bs> Dispatch for Server<S, Body>
-where
-    S: HttpService<Body, ResBody = Bs>,
-    S::Error: Into<Box<dyn StdError + Send + Sync>>,
-    Bs: HttpBody,
-{
-    type PollItem = MessageHead<StatusCode>;
-    type PollBody = Bs;
-    type PollError = S::Error;
-    type RecvItem = RequestHead;
-
-    fn poll_msg(
-        &mut self,
-        cx: &mut task::Context<'_>,
-    ) -> Poll<Option<Result<(Self::PollItem, Self::PollBody), Self::PollError>>> {
-        let ret = if let Some(ref mut fut) = self.in_flight.as_mut().as_pin_mut() {
-            let resp = ready!(fut.as_mut().poll(cx)?);
-            let (parts, body) = resp.into_parts();
-            let head = MessageHead {
-                version: parts.version,
-                subject: parts.status,
-                headers: parts.headers,
+    impl<S, Bs> Dispatch for Server<S, Body>
+    where
+        S: HttpService<Body, ResBody = Bs>,
+        S::Error: Into<Box<dyn StdError + Send + Sync>>,
+        Bs: HttpBody,
+    {
+        type PollItem = MessageHead<http::StatusCode>;
+        type PollBody = Bs;
+        type PollError = S::Error;
+        type RecvItem = RequestHead;
+
+        fn poll_msg(
+            mut self: Pin<&mut Self>,
+            cx: &mut task::Context<'_>,
+        ) -> Poll<Option<Result<(Self::PollItem, Self::PollBody), Self::PollError>>> {
+            let mut this = self.as_mut();
+            let ret = if let Some(ref mut fut) = this.in_flight.as_mut().as_pin_mut() {
+                let resp = ready!(fut.as_mut().poll(cx)?);
+                let (parts, body) = resp.into_parts();
+                let head = MessageHead {
+                    version: parts.version,
+                    subject: parts.status,
+                    headers: parts.headers,
+                    extensions: parts.extensions,
+                };
+                Poll::Ready(Some(Ok((head, body))))
+            } else {
+                unreachable!("poll_msg shouldn't be called if no inflight");
             };
-            Poll::Ready(Some(Ok((head, body))))
-        } else {
-            unreachable!("poll_msg shouldn't be called if no inflight");
-        };
-
-        // Since in_flight finished, remove it
-        self.in_flight.set(None);
-        ret
-    }
-
-    fn recv_msg(&mut self, msg: crate::Result<(Self::RecvItem, Body)>) -> crate::Result<()> {
-        let (msg, body) = msg?;
-        let mut req = Request::new(body);
-        *req.method_mut() = msg.subject.0;
-        *req.uri_mut() = msg.subject.1;
-        *req.headers_mut() = msg.headers;
-        *req.version_mut() = msg.version;
-        let fut = self.service.call(req);
-        self.in_flight.set(Some(fut));
-        Ok(())
-    }
 
-    fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<Result<(), ()>> {
-        if self.in_flight.is_some() {
-            Poll::Pending
-        } else {
-            self.service.poll_ready(cx).map_err(|_e| {
-                // FIXME: return error value.
-                trace!("service closed");
-            })
+            // Since in_flight finished, remove it
+            this.in_flight.set(None);
+            ret
+        }
+
+        fn recv_msg(&mut self, msg: crate::Result<(Self::RecvItem, Body)>) -> crate::Result<()> {
+            let (msg, body) = msg?;
+            let mut req = Request::new(body);
+            *req.method_mut() = msg.subject.0;
+            *req.uri_mut() = msg.subject.1;
+            *req.headers_mut() = msg.headers;
+            *req.version_mut() = msg.version;
+            *req.extensions_mut() = msg.extensions;
+            let fut = self.service.call(req);
+            self.in_flight.set(Some(fut));
+            Ok(())
+        }
+
+        fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<Result<(), ()>> {
+            if self.in_flight.is_some() {
+                Poll::Pending
+            } else {
+                self.service.poll_ready(cx).map_err(|_e| {
+                    // FIXME: return error value.
+                    trace!("service closed");
+                })
+            }
         }
-    }
 
-    fn should_poll(&self) -> bool {
-        self.in_flight.is_some()
+        fn should_poll(&self) -> bool {
+            self.in_flight.is_some()
+        }
     }
 }
 
 // ===== impl Client =====
 
-impl<B> Client<B> {
-    pub fn new(rx: ClientRx<B>) -> Client<B> {
-        Client {
-            callback: None,
-            rx,
-            rx_closed: false,
+cfg_client! {
+    impl<B> Client<B> {
+        pub(crate) fn new(rx: ClientRx<B>) -> Client<B> {
+            Client {
+                callback: None,
+                rx,
+                rx_closed: false,
+            }
         }
     }
-}
 
-impl<B> Dispatch for Client<B>
-where
-    B: HttpBody,
-{
-    type PollItem = RequestHead;
-    type PollBody = B;
-    type PollError = Never;
-    type RecvItem = ResponseHead;
-
-    fn poll_msg(
-        &mut self,
-        cx: &mut task::Context<'_>,
-    ) -> Poll<Option<Result<(Self::PollItem, Self::PollBody), Never>>> {
-        debug_assert!(!self.rx_closed);
-        match self.rx.poll_next(cx) {
-            Poll::Ready(Some((req, mut cb))) => {
-                // check that future hasn't been canceled already
-                match cb.poll_canceled(cx) {
-                    Poll::Ready(()) => {
-                        trace!("request canceled");
-                        Poll::Ready(None)
-                    }
-                    Poll::Pending => {
-                        let (parts, body) = req.into_parts();
-                        let head = RequestHead {
-                            version: parts.version,
-                            subject: RequestLine(parts.method, parts.uri),
-                            headers: parts.headers,
-                        };
-                        self.callback = Some(cb);
-                        Poll::Ready(Some(Ok((head, body))))
+    impl<B> Dispatch for Client<B>
+    where
+        B: HttpBody,
+    {
+        type PollItem = RequestHead;
+        type PollBody = B;
+        type PollError = crate::common::Never;
+        type RecvItem = crate::proto::ResponseHead;
+
+        fn poll_msg(
+            mut self: Pin<&mut Self>,
+            cx: &mut task::Context<'_>,
+        ) -> Poll<Option<Result<(Self::PollItem, Self::PollBody), crate::common::Never>>> {
+            let mut this = self.as_mut();
+            debug_assert!(!this.rx_closed);
+            match this.rx.poll_recv(cx) {
+                Poll::Ready(Some((req, mut cb))) => {
+                    // check that future hasn't been canceled already
+                    match cb.poll_canceled(cx) {
+                        Poll::Ready(()) => {
+                            trace!("request canceled");
+                            Poll::Ready(None)
+                        }
+                        Poll::Pending => {
+                            let (parts, body) = req.into_parts();
+                            let head = RequestHead {
+                                version: parts.version,
+                                subject: crate::proto::RequestLine(parts.method, parts.uri),
+                                headers: parts.headers,
+                                extensions: parts.extensions,
+                            };
+                            this.callback = Some(cb);
+                            Poll::Ready(Some(Ok((head, body))))
+                        }
                     }
                 }
+                Poll::Ready(None) => {
+                    // user has dropped sender handle
+                    trace!("client tx closed");
+                    this.rx_closed = true;
+                    Poll::Ready(None)
+                }
+                Poll::Pending => Poll::Pending,
             }
-            Poll::Ready(None) => {
-                // user has dropped sender handle
-                trace!("client tx closed");
-                self.rx_closed = true;
-                Poll::Ready(None)
-            }
-            Poll::Pending => Poll::Pending,
         }
-    }
 
-    fn recv_msg(&mut self, msg: crate::Result<(Self::RecvItem, Body)>) -> crate::Result<()> {
-        match msg {
-            Ok((msg, body)) => {
-                if let Some(cb) = self.callback.take() {
-                    let mut res = Response::new(body);
-                    *res.status_mut() = msg.subject;
-                    *res.headers_mut() = msg.headers;
-                    *res.version_mut() = msg.version;
-                    cb.send(Ok(res));
-                    Ok(())
-                } else {
-                    // Getting here is likely a bug! An error should have happened
-                    // in Conn::require_empty_read() before ever parsing a
-                    // full message!
-                    Err(crate::Error::new_unexpected_message())
+        fn recv_msg(&mut self, msg: crate::Result<(Self::RecvItem, Body)>) -> crate::Result<()> {
+            match msg {
+                Ok((msg, body)) => {
+                    if let Some(cb) = self.callback.take() {
+                        let res = msg.into_response(body);
+                        cb.send(Ok(res));
+                        Ok(())
+                    } else {
+                        // Getting here is likely a bug! An error should have happened
+                        // in Conn::require_empty_read() before ever parsing a
+                        // full message!
+                        Err(crate::Error::new_unexpected_message())
+                    }
                 }
-            }
-            Err(err) => {
-                if let Some(cb) = self.callback.take() {
-                    cb.send(Err((err, None)));
-                    Ok(())
-                } else if !self.rx_closed {
-                    self.rx.close();
-                    if let Some((req, cb)) = self.rx.try_recv() {
-                        trace!("canceling queued request with connection error: {}", err);
-                        // in this case, the message was never even started, so it's safe to tell
-                        // the user that the request was completely canceled
-                        cb.send(Err((crate::Error::new_canceled().with(err), Some(req))));
+                Err(err) => {
+                    if let Some(cb) = self.callback.take() {
+                        cb.send(Err((err, None)));
                         Ok(())
+                    } else if !self.rx_closed {
+                        self.rx.close();
+                        if let Some((req, cb)) = self.rx.try_recv() {
+                            trace!("canceling queued request with connection error: {}", err);
+                            // in this case, the message was never even started, so it's safe to tell
+                            // the user that the request was completely canceled
+                            cb.send(Err((crate::Error::new_canceled().with(err), Some(req))));
+                            Ok(())
+                        } else {
+                            Err(err)
+                        }
                     } else {
                         Err(err)
                     }
-                } else {
-                    Err(err)
                 }
             }
         }
-    }
 
-    fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<Result<(), ()>> {
-        match self.callback {
-            Some(ref mut cb) => match cb.poll_canceled(cx) {
-                Poll::Ready(()) => {
-                    trace!("callback receiver has dropped");
-                    Poll::Ready(Err(()))
-                }
-                Poll::Pending => Poll::Ready(Ok(())),
-            },
-            None => Poll::Ready(Err(())),
+        fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<Result<(), ()>> {
+            match self.callback {
+                Some(ref mut cb) => match cb.poll_canceled(cx) {
+                    Poll::Ready(()) => {
+                        trace!("callback receiver has dropped");
+                        Poll::Ready(Err(()))
+                    }
+                    Poll::Pending => Poll::Ready(Ok(())),
+                },
+                None => Poll::Ready(Err(())),
+            }
         }
-    }
 
-    fn should_poll(&self) -> bool {
-        self.callback.is_none()
+        fn should_poll(&self) -> bool {
+            self.callback.is_none()
+        }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/encode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/encode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/encode.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/encode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use std::fmt;
 use std::io::IoSlice;
 
-use bytes::buf::ext::{BufExt, Chain, Take};
+use bytes::buf::{Chain, Take};
 use bytes::Buf;
 
 use super::io::WriteBuf;
@@ -10,18 +10,18 @@
 
 /// Encoders to handle different Transfer-Encodings.
 #[derive(Debug, Clone, PartialEq)]
-pub struct Encoder {
+pub(crate) struct Encoder {
     kind: Kind,
     is_last: bool,
 }
 
 #[derive(Debug)]
-pub struct EncodedBuf<B> {
+pub(crate) struct EncodedBuf<B> {
     kind: BufKind<B>,
 }
 
 #[derive(Debug)]
-pub struct NotEof;
+pub(crate) struct NotEof;
 
 #[derive(Debug, PartialEq, Clone)]
 enum Kind {
@@ -35,6 +35,7 @@
     ///
     /// This is mostly only used with HTTP/1.0 with a length. This kind requires
     /// the connection to be closed when the body is finished.
+    #[cfg(feature = "server")]
     CloseDelimited,
 }
 
@@ -53,46 +54,54 @@
             is_last: false,
         }
     }
-    pub fn chunked() -> Encoder {
+    pub(crate) fn chunked() -> Encoder {
         Encoder::new(Kind::Chunked)
     }
 
-    pub fn length(len: u64) -> Encoder {
+    pub(crate) fn length(len: u64) -> Encoder {
         Encoder::new(Kind::Length(len))
     }
 
-    pub fn close_delimited() -> Encoder {
+    #[cfg(feature = "server")]
+    pub(crate) fn close_delimited() -> Encoder {
         Encoder::new(Kind::CloseDelimited)
     }
 
-    pub fn is_eof(&self) -> bool {
-        match self.kind {
-            Kind::Length(0) => true,
-            _ => false,
-        }
+    pub(crate) fn is_eof(&self) -> bool {
+        matches!(self.kind, Kind::Length(0))
     }
 
-    pub fn set_last(mut self, is_last: bool) -> Self {
+    #[cfg(feature = "server")]
+    pub(crate) fn set_last(mut self, is_last: bool) -> Self {
         self.is_last = is_last;
         self
     }
 
-    pub fn is_last(&self) -> bool {
+    pub(crate) fn is_last(&self) -> bool {
         self.is_last
     }
 
-    pub fn end<B>(&self) -> Result<Option<EncodedBuf<B>>, NotEof> {
+    pub(crate) fn is_close_delimited(&self) -> bool {
+        match self.kind {
+            #[cfg(feature = "server")]
+            Kind::CloseDelimited => true,
+            _ => false,
+        }
+    }
+
+    pub(crate) fn end<B>(&self) -> Result<Option<EncodedBuf<B>>, NotEof> {
         match self.kind {
             Kind::Length(0) => Ok(None),
             Kind::Chunked => Ok(Some(EncodedBuf {
                 kind: BufKind::ChunkedEnd(b"0\r\n\r\n"),
             })),
+            #[cfg(feature = "server")]
             Kind::CloseDelimited => Ok(None),
             Kind::Length(_) => Err(NotEof),
         }
     }
 
-    pub fn encode<B>(&mut self, msg: B) -> EncodedBuf<B>
+    pub(crate) fn encode<B>(&mut self, msg: B) -> EncodedBuf<B>
     where
         B: Buf,
     {
@@ -118,6 +127,7 @@
                     BufKind::Exact(msg)
                 }
             }
+            #[cfg(feature = "server")]
             Kind::CloseDelimited => {
                 trace!("close delimited write {}B", len);
                 BufKind::Exact(msg)
@@ -161,6 +171,7 @@
                     }
                 }
             }
+            #[cfg(feature = "server")]
             Kind::CloseDelimited => {
                 trace!("close delimited write {}B", len);
                 dst.buffer(msg);
@@ -218,12 +229,12 @@
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         match self.kind {
-            BufKind::Exact(ref b) => b.bytes(),
-            BufKind::Limited(ref b) => b.bytes(),
-            BufKind::Chunked(ref b) => b.bytes(),
-            BufKind::ChunkedEnd(ref b) => b.bytes(),
+            BufKind::Exact(ref b) => b.chunk(),
+            BufKind::Limited(ref b) => b.chunk(),
+            BufKind::Chunked(ref b) => b.chunk(),
+            BufKind::ChunkedEnd(ref b) => b.chunk(),
         }
     }
 
@@ -238,12 +249,12 @@
     }
 
     #[inline]
-    fn bytes_vectored<'t>(&'t self, dst: &mut [IoSlice<'t>]) -> usize {
+    fn chunks_vectored<'t>(&'t self, dst: &mut [IoSlice<'t>]) -> usize {
         match self.kind {
-            BufKind::Exact(ref b) => b.bytes_vectored(dst),
-            BufKind::Limited(ref b) => b.bytes_vectored(dst),
-            BufKind::Chunked(ref b) => b.bytes_vectored(dst),
-            BufKind::ChunkedEnd(ref b) => b.bytes_vectored(dst),
+            BufKind::Exact(ref b) => b.chunks_vectored(dst),
+            BufKind::Limited(ref b) => b.chunks_vectored(dst),
+            BufKind::Chunked(ref b) => b.chunks_vectored(dst),
+            BufKind::ChunkedEnd(ref b) => b.chunks_vectored(dst),
         }
     }
 }
@@ -284,7 +295,7 @@
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         &self.bytes[self.pos.into()..self.len.into()]
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/io.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,21 @@
-use std::cell::Cell;
 use std::cmp;
 use std::fmt;
 use std::io::{self, IoSlice};
+use std::marker::Unpin;
+use std::mem::MaybeUninit;
 
 use bytes::{Buf, BufMut, Bytes, BytesMut};
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
 use super::{Http1Transaction, ParseContext, ParsedMessage};
 use crate::common::buf::BufList;
-use crate::common::{task, Pin, Poll, Unpin};
+use crate::common::{task, Pin, Poll};
 
 /// The initial buffer size allocated before trying to read from IO.
 pub(crate) const INIT_BUFFER_SIZE: usize = 8192;
 
 /// The minimum value that can be set to max buffer size.
-pub const MINIMUM_MAX_BUFFER_SIZE: usize = INIT_BUFFER_SIZE;
+pub(crate) const MINIMUM_MAX_BUFFER_SIZE: usize = INIT_BUFFER_SIZE;
 
 /// The default maximum read buffer size. If the buffer gets this big and
 /// a message is still not complete, a `TooLarge` error is triggered.
@@ -28,7 +29,7 @@
 /// forces a flush if the queue gets this big.
 const MAX_BUF_LIST_BUFFERS: usize = 16;
 
-pub struct Buffered<T, B> {
+pub(crate) struct Buffered<T, B> {
     flush_pipeline: bool,
     io: T,
     read_blocked: bool,
@@ -54,18 +55,25 @@
     T: AsyncRead + AsyncWrite + Unpin,
     B: Buf,
 {
-    pub fn new(io: T) -> Buffered<T, B> {
+    pub(crate) fn new(io: T) -> Buffered<T, B> {
+        let strategy = if io.is_write_vectored() {
+            WriteStrategy::Queue
+        } else {
+            WriteStrategy::Flatten
+        };
+        let write_buf = WriteBuf::new(strategy);
         Buffered {
             flush_pipeline: false,
             io,
             read_blocked: false,
             read_buf: BytesMut::with_capacity(0),
             read_buf_strategy: ReadStrategy::default(),
-            write_buf: WriteBuf::new(),
+            write_buf,
         }
     }
 
-    pub fn set_flush_pipeline(&mut self, enabled: bool) {
+    #[cfg(feature = "server")]
+    pub(crate) fn set_flush_pipeline(&mut self, enabled: bool) {
         debug_assert!(!self.write_buf.has_remaining());
         self.flush_pipeline = enabled;
         if enabled {
@@ -73,7 +81,7 @@
         }
     }
 
-    pub fn set_max_buf_size(&mut self, max: usize) {
+    pub(crate) fn set_max_buf_size(&mut self, max: usize) {
         assert!(
             max >= MINIMUM_MAX_BUFFER_SIZE,
             "The max_buf_size cannot be smaller than {}.",
@@ -83,25 +91,20 @@
         self.write_buf.max_buf_size = max;
     }
 
-    pub fn set_read_buf_exact_size(&mut self, sz: usize) {
+    #[cfg(feature = "client")]
+    pub(crate) fn set_read_buf_exact_size(&mut self, sz: usize) {
         self.read_buf_strategy = ReadStrategy::Exact(sz);
     }
 
-    pub fn set_write_strategy_flatten(&mut self) {
+    #[cfg(feature = "server")]
+    pub(crate) fn set_write_strategy_flatten(&mut self) {
         // this should always be called only at construction time,
         // so this assert is here to catch myself
         debug_assert!(self.write_buf.queue.bufs_cnt() == 0);
         self.write_buf.set_strategy(WriteStrategy::Flatten);
     }
 
-    pub fn set_write_strategy_queue(&mut self) {
-        // this should always be called only at construction time,
-        // so this assert is here to catch myself
-        debug_assert!(self.write_buf.queue.bufs_cnt() == 0);
-        self.write_buf.set_strategy(WriteStrategy::Queue);
-    }
-
-    pub fn read_buf(&self) -> &[u8] {
+    pub(crate) fn read_buf(&self) -> &[u8] {
         self.read_buf.as_ref()
     }
 
@@ -117,7 +120,7 @@
         self.read_buf.capacity() - self.read_buf.len()
     }
 
-    pub fn headers_buf(&mut self) -> &mut Vec<u8> {
+    pub(crate) fn headers_buf(&mut self) -> &mut Vec<u8> {
         let buf = self.write_buf.headers_mut();
         &mut buf.bytes
     }
@@ -126,15 +129,15 @@
         &mut self.write_buf
     }
 
-    pub fn buffer<BB: Buf + Into<B>>(&mut self, buf: BB) {
+    pub(crate) fn buffer<BB: Buf + Into<B>>(&mut self, buf: BB) {
         self.write_buf.buffer(buf)
     }
 
-    pub fn can_buffer(&self) -> bool {
+    pub(crate) fn can_buffer(&self) -> bool {
         self.flush_pipeline || self.write_buf.can_buffer()
     }
 
-    pub fn consume_leading_lines(&mut self) {
+    pub(crate) fn consume_leading_lines(&mut self) {
         if !self.read_buf.is_empty() {
             let mut i = 0;
             while i < self.read_buf.len() {
@@ -161,6 +164,13 @@
                 ParseContext {
                     cached_headers: parse_ctx.cached_headers,
                     req_method: parse_ctx.req_method,
+                    h1_parser_config: parse_ctx.h1_parser_config.clone(),
+                    preserve_header_case: parse_ctx.preserve_header_case,
+                    h09_responses: parse_ctx.h09_responses,
+                    #[cfg(feature = "ffi")]
+                    on_informational: parse_ctx.on_informational,
+                    #[cfg(feature = "ffi")]
+                    raw_headers: parse_ctx.raw_headers,
                 },
             )? {
                 Some(msg) => {
@@ -182,15 +192,28 @@
         }
     }
 
-    pub fn poll_read_from_io(&mut self, cx: &mut task::Context<'_>) -> Poll<io::Result<usize>> {
+    pub(crate) fn poll_read_from_io(
+        &mut self,
+        cx: &mut task::Context<'_>,
+    ) -> Poll<io::Result<usize>> {
         self.read_blocked = false;
         let next = self.read_buf_strategy.next();
         if self.read_buf_remaining_mut() < next {
             self.read_buf.reserve(next);
         }
-        match Pin::new(&mut self.io).poll_read_buf(cx, &mut self.read_buf) {
-            Poll::Ready(Ok(n)) => {
-                debug!("read {} bytes", n);
+
+        let dst = self.read_buf.chunk_mut();
+        let dst = unsafe { &mut *(dst as *mut _ as *mut [MaybeUninit<u8>]) };
+        let mut buf = ReadBuf::uninit(dst);
+        match Pin::new(&mut self.io).poll_read(cx, &mut buf) {
+            Poll::Ready(Ok(_)) => {
+                let n = buf.filled().len();
+                unsafe {
+                    // Safety: we just read that many bytes into the
+                    // uninitialized part of the buffer, so this is okay.
+                    // @tokio pls give me back `poll_read_buf` thanks
+                    self.read_buf.advance_mut(n);
+                }
                 self.read_buf_strategy.record(n);
                 Poll::Ready(Ok(n))
             }
@@ -202,19 +225,19 @@
         }
     }
 
-    pub fn into_inner(self) -> (T, Bytes) {
+    pub(crate) fn into_inner(self) -> (T, Bytes) {
         (self.io, self.read_buf.freeze())
     }
 
-    pub fn io_mut(&mut self) -> &mut T {
+    pub(crate) fn io_mut(&mut self) -> &mut T {
         &mut self.io
     }
 
-    pub fn is_read_blocked(&self) -> bool {
+    pub(crate) fn is_read_blocked(&self) -> bool {
         self.read_blocked
     }
 
-    pub fn poll_flush(&mut self, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
+    pub(crate) fn poll_flush(&mut self, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
         if self.flush_pipeline && !self.read_buf.is_empty() {
             Poll::Ready(Ok(()))
         } else if self.write_buf.remaining() == 0 {
@@ -223,9 +246,18 @@
             if let WriteStrategy::Flatten = self.write_buf.strategy {
                 return self.poll_flush_flattened(cx);
             }
+
+            const MAX_WRITEV_BUFS: usize = 64;
             loop {
-                let n =
-                    ready!(Pin::new(&mut self.io).poll_write_buf(cx, &mut self.write_buf.auto()))?;
+                let n = {
+                    let mut iovs = [IoSlice::new(&[]); MAX_WRITEV_BUFS];
+                    let len = self.write_buf.chunks_vectored(&mut iovs);
+                    ready!(Pin::new(&mut self.io).poll_write_vectored(cx, &iovs[..len]))?
+                };
+                // TODO(eliza): we have to do this manually because
+                // `poll_write_buf` doesn't exist in Tokio 0.3 yet...when
+                // `poll_write_buf` comes back, the manual advance will need to leave!
+                self.write_buf.advance(n);
                 debug!("flushed {} bytes", n);
                 if self.write_buf.remaining() == 0 {
                     break;
@@ -247,7 +279,7 @@
     /// that skips some bookkeeping around using multiple buffers.
     fn poll_flush_flattened(&mut self, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
         loop {
-            let n = ready!(Pin::new(&mut self.io).poll_write(cx, self.write_buf.headers.bytes()))?;
+            let n = ready!(Pin::new(&mut self.io).poll_write(cx, self.write_buf.headers.chunk()))?;
             debug!("flushed {} bytes", n);
             self.write_buf.headers.advance(n);
             if self.write_buf.headers.remaining() == 0 {
@@ -274,7 +306,7 @@
 impl<T: Unpin, B> Unpin for Buffered<T, B> {}
 
 // TODO: This trait is old... at least rename to PollBytes or something...
-pub trait MemRead {
+pub(crate) trait MemRead {
     fn read_mem(&mut self, cx: &mut task::Context<'_>, len: usize) -> Poll<io::Result<Bytes>>;
 }
 
@@ -301,6 +333,7 @@
         next: usize,
         max: usize,
     },
+    #[cfg(feature = "client")]
     Exact(usize),
 }
 
@@ -316,6 +349,7 @@
     fn next(&self) -> usize {
         match *self {
             ReadStrategy::Adaptive { next, .. } => next,
+            #[cfg(feature = "client")]
             ReadStrategy::Exact(exact) => exact,
         }
     }
@@ -323,38 +357,42 @@
     fn max(&self) -> usize {
         match *self {
             ReadStrategy::Adaptive { max, .. } => max,
+            #[cfg(feature = "client")]
             ReadStrategy::Exact(exact) => exact,
         }
     }
 
     fn record(&mut self, bytes_read: usize) {
-        if let ReadStrategy::Adaptive {
-            ref mut decrease_now,
-            ref mut next,
-            max,
-            ..
-        } = *self
-        {
-            if bytes_read >= *next {
-                *next = cmp::min(incr_power_of_two(*next), max);
-                *decrease_now = false;
-            } else {
-                let decr_to = prev_power_of_two(*next);
-                if bytes_read < decr_to {
-                    if *decrease_now {
-                        *next = cmp::max(decr_to, INIT_BUFFER_SIZE);
-                        *decrease_now = false;
+        match *self {
+            ReadStrategy::Adaptive {
+                ref mut decrease_now,
+                ref mut next,
+                max,
+                ..
+            } => {
+                if bytes_read >= *next {
+                    *next = cmp::min(incr_power_of_two(*next), max);
+                    *decrease_now = false;
+                } else {
+                    let decr_to = prev_power_of_two(*next);
+                    if bytes_read < decr_to {
+                        if *decrease_now {
+                            *next = cmp::max(decr_to, INIT_BUFFER_SIZE);
+                            *decrease_now = false;
+                        } else {
+                            // Decreasing is a two "record" process.
+                            *decrease_now = true;
+                        }
                     } else {
-                        // Decreasing is a two "record" process.
-                        *decrease_now = true;
+                        // A read within the current range should cancel
+                        // a potential decrease, since we just saw proof
+                        // that we still need this size.
+                        *decrease_now = false;
                     }
-                } else {
-                    // A read within the current range should cancel
-                    // a potential decrease, since we just saw proof
-                    // that we still need this size.
-                    *decrease_now = false;
                 }
             }
+            #[cfg(feature = "client")]
+            ReadStrategy::Exact(_) => (),
         }
     }
 }
@@ -377,7 +415,7 @@
 }
 
 #[derive(Clone)]
-pub struct Cursor<T> {
+pub(crate) struct Cursor<T> {
     bytes: T,
     pos: usize,
 }
@@ -390,6 +428,24 @@
 }
 
 impl Cursor<Vec<u8>> {
+    /// If we've advanced the position a bit in this cursor, and wish to
+    /// extend the underlying vector, we may wish to unshift the "read" bytes
+    /// off, and move everything else over.
+    fn maybe_unshift(&mut self, additional: usize) {
+        if self.pos == 0 {
+            // nothing to do
+            return;
+        }
+
+        if self.bytes.capacity() - self.bytes.len() >= additional {
+            // there's room!
+            return;
+        }
+
+        self.bytes.drain(0..self.pos);
+        self.pos = 0;
+    }
+
     fn reset(&mut self) {
         self.pos = 0;
         self.bytes.clear();
@@ -412,7 +468,7 @@
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
+    fn chunk(&self) -> &[u8] {
         &self.bytes.as_ref()[self.pos..]
     }
 
@@ -434,12 +490,12 @@
 }
 
 impl<B: Buf> WriteBuf<B> {
-    fn new() -> WriteBuf<B> {
+    fn new(strategy: WriteStrategy) -> WriteBuf<B> {
         WriteBuf {
             headers: Cursor::new(Vec::with_capacity(INIT_BUFFER_SIZE)),
             max_buf_size: DEFAULT_MAX_BUFFER_SIZE,
             queue: BufList::new(),
-            strategy: WriteStrategy::Auto,
+            strategy,
         }
     }
 }
@@ -448,25 +504,28 @@
 where
     B: Buf,
 {
+    #[cfg(feature = "server")]
     fn set_strategy(&mut self, strategy: WriteStrategy) {
         self.strategy = strategy;
     }
 
-    #[inline]
-    fn auto(&mut self) -> WriteBufAuto<'_, B> {
-        WriteBufAuto::new(self)
-    }
-
     pub(super) fn buffer<BB: Buf + Into<B>>(&mut self, mut buf: BB) {
         debug_assert!(buf.has_remaining());
         match self.strategy {
             WriteStrategy::Flatten => {
                 let head = self.headers_mut();
+
+                head.maybe_unshift(buf.remaining());
+                trace!(
+                    self.len = head.remaining(),
+                    buf.len = buf.remaining(),
+                    "buffer.flatten"
+                );
                 //perf: This is a little faster than <Vec as BufMut>>::put,
                 //but accomplishes the same result.
                 loop {
                     let adv = {
-                        let slice = buf.bytes();
+                        let slice = buf.chunk();
                         if slice.is_empty() {
                             return;
                         }
@@ -476,7 +535,12 @@
                     buf.advance(adv);
                 }
             }
-            WriteStrategy::Auto | WriteStrategy::Queue => {
+            WriteStrategy::Queue => {
+                trace!(
+                    self.len = self.remaining(),
+                    buf.len = buf.remaining(),
+                    "buffer.queue"
+                );
                 self.queue.push(buf.into());
             }
         }
@@ -485,7 +549,7 @@
     fn can_buffer(&self) -> bool {
         match self.strategy {
             WriteStrategy::Flatten => self.remaining() < self.max_buf_size,
-            WriteStrategy::Auto | WriteStrategy::Queue => {
+            WriteStrategy::Queue => {
                 self.queue.bufs_cnt() < MAX_BUF_LIST_BUFFERS && self.remaining() < self.max_buf_size
             }
         }
@@ -513,12 +577,12 @@
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
-        let headers = self.headers.bytes();
+    fn chunk(&self) -> &[u8] {
+        let headers = self.headers.chunk();
         if !headers.is_empty() {
             headers
         } else {
-            self.queue.bytes()
+            self.queue.chunk()
         }
     }
 
@@ -538,71 +602,14 @@
     }
 
     #[inline]
-    fn bytes_vectored<'t>(&'t self, dst: &mut [IoSlice<'t>]) -> usize {
-        let n = self.headers.bytes_vectored(dst);
-        self.queue.bytes_vectored(&mut dst[n..]) + n
-    }
-}
-
-/// Detects when wrapped `WriteBuf` is used for vectored IO, and
-/// adjusts the `WriteBuf` strategy if not.
-struct WriteBufAuto<'a, B: Buf> {
-    bytes_called: Cell<bool>,
-    bytes_vec_called: Cell<bool>,
-    inner: &'a mut WriteBuf<B>,
-}
-
-impl<'a, B: Buf> WriteBufAuto<'a, B> {
-    fn new(inner: &'a mut WriteBuf<B>) -> WriteBufAuto<'a, B> {
-        WriteBufAuto {
-            bytes_called: Cell::new(false),
-            bytes_vec_called: Cell::new(false),
-            inner,
-        }
-    }
-}
-
-impl<'a, B: Buf> Buf for WriteBufAuto<'a, B> {
-    #[inline]
-    fn remaining(&self) -> usize {
-        self.inner.remaining()
-    }
-
-    #[inline]
-    fn bytes(&self) -> &[u8] {
-        self.bytes_called.set(true);
-        self.inner.bytes()
-    }
-
-    #[inline]
-    fn advance(&mut self, cnt: usize) {
-        self.inner.advance(cnt)
-    }
-
-    #[inline]
-    fn bytes_vectored<'t>(&'t self, dst: &mut [IoSlice<'t>]) -> usize {
-        self.bytes_vec_called.set(true);
-        self.inner.bytes_vectored(dst)
-    }
-}
-
-impl<'a, B: Buf + 'a> Drop for WriteBufAuto<'a, B> {
-    fn drop(&mut self) {
-        if let WriteStrategy::Auto = self.inner.strategy {
-            if self.bytes_vec_called.get() {
-                self.inner.strategy = WriteStrategy::Queue;
-            } else if self.bytes_called.get() {
-                trace!("detected no usage of vectored write, flattening");
-                self.inner.strategy = WriteStrategy::Flatten;
-                self.inner.headers.bytes.put(&mut self.inner.queue);
-            }
-        }
+    fn chunks_vectored<'t>(&'t self, dst: &mut [IoSlice<'t>]) -> usize {
+        let n = self.headers.chunks_vectored(dst);
+        self.queue.chunks_vectored(&mut dst[n..]) + n
     }
 }
 
 #[derive(Debug)]
 enum WriteStrategy {
-    Auto,
     Flatten,
     Queue,
 }
@@ -614,8 +621,8 @@
 
     use tokio_test::io::Builder as Mock;
 
-    #[cfg(feature = "nightly")]
-    use test::Bencher;
+    // #[cfg(feature = "nightly")]
+    // use test::Bencher;
 
     /*
     impl<T: Read> MemRead for AsyncIo<T> {
@@ -628,28 +635,31 @@
     */
 
     #[tokio::test]
+    #[ignore]
     async fn iobuf_write_empty_slice() {
-        // First, let's just check that the Mock would normally return an
-        // error on an unexpected write, even if the buffer is empty...
-        let mut mock = Mock::new().build();
-        futures_util::future::poll_fn(|cx| {
-            Pin::new(&mut mock).poll_write_buf(cx, &mut Cursor::new(&[]))
-        })
-        .await
-        .expect_err("should be a broken pipe");
-
-        // underlying io will return the logic error upon write,
-        // so we are testing that the io_buf does not trigger a write
-        // when there is nothing to flush
-        let mock = Mock::new().build();
-        let mut io_buf = Buffered::<_, Cursor<Vec<u8>>>::new(mock);
-        io_buf.flush().await.expect("should short-circuit flush");
+        // TODO(eliza): can i have writev back pls T_T
+        // // First, let's just check that the Mock would normally return an
+        // // error on an unexpected write, even if the buffer is empty...
+        // let mut mock = Mock::new().build();
+        // futures_util::future::poll_fn(|cx| {
+        //     Pin::new(&mut mock).poll_write_buf(cx, &mut Cursor::new(&[]))
+        // })
+        // .await
+        // .expect_err("should be a broken pipe");
+
+        // // underlying io will return the logic error upon write,
+        // // so we are testing that the io_buf does not trigger a write
+        // // when there is nothing to flush
+        // let mock = Mock::new().build();
+        // let mut io_buf = Buffered::<_, Cursor<Vec<u8>>>::new(mock);
+        // io_buf.flush().await.expect("should short-circuit flush");
     }
 
     #[tokio::test]
     async fn parse_reads_until_blocked() {
         use crate::proto::h1::ClientTransaction;
 
+        let _ = pretty_env_logger::try_init();
         let mock = Mock::new()
             // Split over multiple reads will read all of it
             .read(b"HTTP/1.1 200 OK\r\n")
@@ -666,6 +676,13 @@
             let parse_ctx = ParseContext {
                 cached_headers: &mut None,
                 req_method: &mut None,
+                h1_parser_config: Default::default(),
+                preserve_header_case: false,
+                h09_responses: false,
+                #[cfg(feature = "ffi")]
+                on_informational: &mut None,
+                #[cfg(feature = "ffi")]
+                raw_headers: false,
             };
             assert!(buffered
                 .parse::<ClientTransaction>(cx, parse_ctx)
@@ -825,7 +842,6 @@
         let _ = pretty_env_logger::try_init();
 
         let mock = Mock::new()
-            // Just a single write
             .write(b"hello world, it's hyper!")
             .build();
 
@@ -841,31 +857,39 @@
         buffered.flush().await.expect("flush");
     }
 
-    #[tokio::test]
-    async fn write_buf_auto_flatten() {
+    #[test]
+    fn write_buf_flatten_partially_flushed() {
         let _ = pretty_env_logger::try_init();
 
-        let mock = Mock::new()
-            // Expects write_buf to only consume first buffer
-            .write(b"hello ")
-            // And then the Auto strategy will have flattened
-            .write(b"world, it's hyper!")
-            .build();
+        let b = |s: &str| Cursor::new(s.as_bytes().to_vec());
 
-        let mut buffered = Buffered::<_, Cursor<Vec<u8>>>::new(mock);
+        let mut write_buf = WriteBuf::<Cursor<Vec<u8>>>::new(WriteStrategy::Flatten);
 
-        // we have 4 buffers, but hope to detect that vectored IO isn't
-        // being used, and switch to flattening automatically,
-        // resulting in only 2 writes
-        buffered.headers_buf().extend(b"hello ");
-        buffered.buffer(Cursor::new(b"world, ".to_vec()));
-        buffered.buffer(Cursor::new(b"it's ".to_vec()));
-        buffered.buffer(Cursor::new(b"hyper!".to_vec()));
-        assert_eq!(buffered.write_buf.queue.bufs_cnt(), 3);
+        write_buf.buffer(b("hello "));
+        write_buf.buffer(b("world, "));
 
-        buffered.flush().await.expect("flush");
+        assert_eq!(write_buf.chunk(), b"hello world, ");
 
-        assert_eq!(buffered.write_buf.queue.bufs_cnt(), 0);
+        // advance most of the way, but not all
+        write_buf.advance(11);
+
+        assert_eq!(write_buf.chunk(), b", ");
+        assert_eq!(write_buf.headers.pos, 11);
+        assert_eq!(write_buf.headers.bytes.capacity(), INIT_BUFFER_SIZE);
+
+        // there's still room in the headers buffer, so just push on the end
+        write_buf.buffer(b("it's hyper!"));
+
+        assert_eq!(write_buf.chunk(), b", it's hyper!");
+        assert_eq!(write_buf.headers.pos, 11);
+
+        let rem1 = write_buf.remaining();
+        let cap = write_buf.headers.bytes.capacity();
+
+        // but when this would go over capacity, don't copy the old bytes
+        write_buf.buffer(Cursor::new(vec![b'X'; cap]));
+        assert_eq!(write_buf.remaining(), cap + rem1);
+        assert_eq!(write_buf.headers.pos, 0);
     }
 
     #[tokio::test]
@@ -896,19 +920,19 @@
         assert_eq!(buffered.write_buf.queue.bufs_cnt(), 0);
     }
 
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_write_buf_flatten_buffer_chunk(b: &mut Bencher) {
-        let s = "Hello, World!";
-        b.bytes = s.len() as u64;
-
-        let mut write_buf = WriteBuf::<bytes::Bytes>::new();
-        write_buf.set_strategy(WriteStrategy::Flatten);
-        b.iter(|| {
-            let chunk = bytes::Bytes::from(s);
-            write_buf.buffer(chunk);
-            ::test::black_box(&write_buf);
-            write_buf.headers.bytes.clear();
-        })
-    }
+    // #[cfg(feature = "nightly")]
+    // #[bench]
+    // fn bench_write_buf_flatten_buffer_chunk(b: &mut Bencher) {
+    //     let s = "Hello, World!";
+    //     b.bytes = s.len() as u64;
+
+    //     let mut write_buf = WriteBuf::<bytes::Bytes>::new();
+    //     write_buf.set_strategy(WriteStrategy::Flatten);
+    //     b.iter(|| {
+    //         let chunk = bytes::Bytes::from(s);
+    //         write_buf.buffer(chunk);
+    //         ::test::black_box(&write_buf);
+    //         write_buf.headers.bytes.clear();
+    //     })
+    // }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,32 @@
 use bytes::BytesMut;
 use http::{HeaderMap, Method};
+use httparse::ParserConfig;
 
-use crate::proto::{BodyLength, DecodedLength, MessageHead};
+use crate::body::DecodedLength;
+use crate::proto::{BodyLength, MessageHead};
 
 pub(crate) use self::conn::Conn;
-pub use self::decode::Decoder;
+pub(crate) use self::decode::Decoder;
 pub(crate) use self::dispatch::Dispatcher;
-pub use self::encode::{EncodedBuf, Encoder};
-pub use self::io::Cursor; //TODO: move out of h1::io
-pub use self::io::MINIMUM_MAX_BUFFER_SIZE;
+pub(crate) use self::encode::{EncodedBuf, Encoder};
+ //TODO: move out of h1::io
+pub(crate) use self::io::MINIMUM_MAX_BUFFER_SIZE;
 
 mod conn;
-pub(super) mod date;
 mod decode;
 pub(crate) mod dispatch;
 mod encode;
 mod io;
 mod role;
 
-pub(crate) type ServerTransaction = role::Server;
-pub(crate) type ClientTransaction = role::Client;
+
+cfg_client! {
+    pub(crate) type ClientTransaction = role::Client;
+}
+
+cfg_server! {
+    pub(crate) type ServerTransaction = role::Server;
+}
 
 pub(crate) trait Http1Transaction {
     type Incoming;
@@ -64,12 +71,20 @@
 pub(crate) struct ParseContext<'a> {
     cached_headers: &'a mut Option<HeaderMap>,
     req_method: &'a mut Option<Method>,
+    h1_parser_config: ParserConfig,
+    preserve_header_case: bool,
+    h09_responses: bool,
+    #[cfg(feature = "ffi")]
+    on_informational: &'a mut Option<crate::ffi::OnInformational>,
+    #[cfg(feature = "ffi")]
+    raw_headers: bool,
 }
 
 /// Passed to Http1Transaction::encode
 pub(crate) struct Encode<'a, T> {
     head: &'a mut MessageHead<T>,
     body: Option<BodyLength>,
+    #[cfg(feature = "server")]
     keep_alive: bool,
     req_method: &'a mut Option<Method>,
     title_case_headers: bool,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/role.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/role.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h1/role.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h1/role.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,42 +1,34 @@
-// `mem::uninitialized` replaced with `mem::MaybeUninit`,
-// can't upgrade yet
-#![allow(deprecated)]
-
 use std::fmt::{self, Write};
-use std::mem;
+use std::mem::MaybeUninit;
 
+#[cfg(any(test, feature = "server", feature = "ffi"))]
+use bytes::Bytes;
 use bytes::BytesMut;
+#[cfg(feature = "server")]
+use http::header::ValueIter;
 use http::header::{self, Entry, HeaderName, HeaderValue};
 use http::{HeaderMap, Method, StatusCode, Version};
 
+use crate::body::DecodedLength;
+#[cfg(feature = "server")]
+use crate::common::date;
 use crate::error::Parse;
+use crate::ext::HeaderCaseMap;
 use crate::headers;
 use crate::proto::h1::{
-    date, Encode, Encoder, Http1Transaction, ParseContext, ParseResult, ParsedMessage,
+    Encode, Encoder, Http1Transaction, ParseContext, ParseResult, ParsedMessage,
 };
-use crate::proto::{BodyLength, DecodedLength, MessageHead, RequestHead, RequestLine};
+use crate::proto::{BodyLength, MessageHead, RequestHead, RequestLine};
 
 const MAX_HEADERS: usize = 100;
 const AVERAGE_HEADER_SIZE: usize = 30; // totally scientific
 
 macro_rules! header_name {
     ($bytes:expr) => {{
-        #[cfg(debug_assertions)]
-        {
-            match HeaderName::from_bytes($bytes) {
-                Ok(name) => name,
-                Err(_) => panic!(
-                    "illegal header name from httparse: {:?}",
-                    ::bytes::Bytes::copy_from_slice($bytes)
-                ),
-            }
-        }
-
-        #[cfg(not(debug_assertions))]
         {
             match HeaderName::from_bytes($bytes) {
                 Ok(name) => name,
-                Err(_) => panic!("illegal header name from httparse: {:?}", $bytes),
+                Err(e) => maybe_panic!(e),
             }
         }
     }};
@@ -44,23 +36,24 @@
 
 macro_rules! header_value {
     ($bytes:expr) => {{
-        #[cfg(debug_assertions)]
         {
-            let __hvb: ::bytes::Bytes = $bytes;
-            match HeaderValue::from_maybe_shared(__hvb.clone()) {
-                Ok(name) => name,
-                Err(_) => panic!("illegal header value from httparse: {:?}", __hvb),
-            }
-        }
-
-        #[cfg(not(debug_assertions))]
-        {
-            // Unsafe: httparse already validated header value
             unsafe { HeaderValue::from_maybe_shared_unchecked($bytes) }
         }
     }};
 }
 
+macro_rules! maybe_panic {
+    ($($arg:tt)*) => ({
+        let _err = ($($arg)*);
+        if cfg!(debug_assertions) {
+            panic!("{:?}", _err);
+        } else {
+            error!("Internal Hyper error, please report {:?}", _err);
+            return Err(Parse::Internal)
+        }
+    })
+}
+
 pub(super) fn parse_headers<T>(
     bytes: &mut BytesMut,
     ctx: ParseContext<'_>,
@@ -92,10 +85,13 @@
 
 // There are 2 main roles, Client and Server.
 
+#[cfg(feature = "client")]
 pub(crate) enum Client {}
 
+#[cfg(feature = "server")]
 pub(crate) enum Server {}
 
+#[cfg(feature = "server")]
 impl Http1Transaction for Server {
     type Incoming = RequestLine;
     type Outgoing = StatusCode;
@@ -115,17 +111,23 @@
         // but we *never* read any of it until after httparse has assigned
         // values into it. By not zeroing out the stack memory, this saves
         // a good ~5% on pipeline benchmarks.
-        let mut headers_indices: [HeaderIndices; MAX_HEADERS] = unsafe { mem::uninitialized() };
+        let mut headers_indices: [MaybeUninit<HeaderIndices>; MAX_HEADERS] = unsafe {
+            // SAFETY: We can go safely from MaybeUninit array to array of MaybeUninit
+            MaybeUninit::uninit().assume_init()
+        };
         {
-            let mut headers: [httparse::Header<'_>; MAX_HEADERS] = unsafe { mem::uninitialized() };
+            /* SAFETY: it is safe to go from MaybeUninit array to array of MaybeUninit */
+            let mut headers: [MaybeUninit<httparse::Header<'_>>; MAX_HEADERS] = unsafe {
+                MaybeUninit::uninit().assume_init()
+            };
             trace!(
                 "Request.parse([Header; {}], [u8; {}])",
                 headers.len(),
                 buf.len()
             );
-            let mut req = httparse::Request::new(&mut headers);
+            let mut req = httparse::Request::new(&mut []);
             let bytes = buf.as_ref();
-            match req.parse(bytes) {
+            match req.parse_with_uninit_headers(bytes, &mut headers) {
                 Ok(httparse::Status::Complete(parsed_len)) => {
                     trace!("Request.parse Complete({})", parsed_len);
                     len = parsed_len;
@@ -142,6 +144,7 @@
                         is_http_11 = false;
                         Version::HTTP_10
                     };
+                    trace!("headers: {:?}", &req.headers);
 
                     record_header_indices(bytes, &req.headers, &mut headers_indices)?;
                     headers_len = req.headers.len();
@@ -182,11 +185,19 @@
         let mut is_te_chunked = false;
         let mut wants_upgrade = subject.0 == Method::CONNECT;
 
+        let mut header_case_map = if ctx.preserve_header_case {
+            Some(HeaderCaseMap::default())
+        } else {
+            None
+        };
+
         let mut headers = ctx.cached_headers.take().unwrap_or_else(HeaderMap::new);
 
         headers.reserve(headers_len);
 
         for header in &headers_indices[..headers_len] {
+            // SAFETY: array is valid up to `headers_len`
+            let header = unsafe { &*header.as_ptr() };
             let name = header_name!(&slice[header.name.0..header.name.1]);
             let value = header_value!(slice.slice(header.value.0..header.value.1));
 
@@ -198,29 +209,29 @@
                     // malformed. A server should respond with 400 Bad Request.
                     if !is_http_11 {
                         debug!("HTTP/1.0 cannot have Transfer-Encoding header");
-                        return Err(Parse::Header);
+                        return Err(Parse::transfer_encoding_unexpected());
                     }
                     is_te = true;
                     if headers::is_chunked_(&value) {
                         is_te_chunked = true;
                         decoder = DecodedLength::CHUNKED;
+                    } else {
+                        is_te_chunked = false;
                     }
                 }
                 header::CONTENT_LENGTH => {
                     if is_te {
                         continue;
                     }
-                    let len = value
-                        .to_str()
-                        .map_err(|_| Parse::Header)
-                        .and_then(|s| s.parse().map_err(|_| Parse::Header))?;
+                    let len = headers::content_length_parse(&value)
+                        .ok_or_else(Parse::content_length_invalid)?;
                     if let Some(prev) = con_len {
                         if prev != len {
                             debug!(
                                 "multiple Content-Length headers with different values: [{}, {}]",
                                 prev, len,
                             );
-                            return Err(Parse::Header);
+                            return Err(Parse::content_length_invalid());
                         }
                         // we don't need to append this secondary length
                         continue;
@@ -249,12 +260,22 @@
                 _ => (),
             }
 
+            if let Some(ref mut header_case_map) = header_case_map {
+                header_case_map.append(&name, slice.slice(header.name.0..header.name.1));
+            }
+
             headers.append(name, value);
         }
 
         if is_te && !is_te_chunked {
             debug!("request with transfer-encoding header, but not chunked, bad request");
-            return Err(Parse::Header);
+            return Err(Parse::transfer_encoding_invalid());
+        }
+
+        let mut extensions = http::Extensions::default();
+
+        if let Some(header_case_map) = header_case_map {
+            extensions.insert(header_case_map);
         }
 
         *ctx.req_method = Some(subject.0.clone());
@@ -264,6 +285,7 @@
                 version,
                 subject,
                 headers,
+                extensions,
             },
             decode: decoder,
             expect_continue,
@@ -272,20 +294,13 @@
         }))
     }
 
-    fn encode(
-        mut msg: Encode<'_, Self::Outgoing>,
-        mut dst: &mut Vec<u8>,
-    ) -> crate::Result<Encoder> {
+    fn encode(mut msg: Encode<'_, Self::Outgoing>, dst: &mut Vec<u8>) -> crate::Result<Encoder> {
         trace!(
             "Server::encode status={:?}, body={:?}, req_method={:?}",
             msg.head.subject,
             msg.body,
             msg.req_method
         );
-        debug_assert!(
-            !msg.title_case_headers,
-            "no server config for title case headers"
-        );
 
         let mut wrote_len = false;
 
@@ -293,7 +308,7 @@
         // This is because Service only allows returning a single Response, and
         // so if you try to reply with a e.g. 100 Continue, you have no way of
         // replying with the latter status code response.
-        let (ret, mut is_last) = if msg.head.subject == StatusCode::SWITCHING_PROTOCOLS {
+        let (ret, is_last) = if msg.head.subject == StatusCode::SWITCHING_PROTOCOLS {
             (Ok(()), true)
         } else if msg.req_method == &Some(Method::CONNECT) && msg.head.subject.is_success() {
             // Sending content-length or transfer-encoding header on 2xx response
@@ -314,9 +329,6 @@
         // pushing some bytes onto the `dst`. In those cases, we don't want to send
         // the half-pushed message, so rewind to before.
         let orig_len = dst.len();
-        let rewind = |dst: &mut Vec<u8>| {
-            dst.truncate(orig_len);
-        };
 
         let init_cap = 30 + msg.head.headers.len() * AVERAGE_HEADER_SIZE;
         dst.reserve(init_cap);
@@ -327,7 +339,7 @@
                 Version::HTTP_10 => extend(dst, b"HTTP/1.0 "),
                 Version::HTTP_11 => extend(dst, b"HTTP/1.1 "),
                 Version::HTTP_2 => {
-                    warn!("response with HTTP2 version coerced to HTTP/1.1");
+                    debug!("response with HTTP2 version coerced to HTTP/1.1");
                     extend(dst, b"HTTP/1.1 ");
                 }
                 other => panic!("unexpected response version: {:?}", other),
@@ -347,6 +359,217 @@
             extend(dst, b"\r\n");
         }
 
+        let orig_headers;
+        let extensions = std::mem::take(&mut msg.head.extensions);
+        let orig_headers = match extensions.get::<HeaderCaseMap>() {
+            None if msg.title_case_headers => {
+                orig_headers = HeaderCaseMap::default();
+                Some(&orig_headers)
+            }
+            orig_headers => orig_headers,
+        };
+        let encoder = if let Some(orig_headers) = orig_headers {
+            Self::encode_headers_with_original_case(
+                msg,
+                dst,
+                is_last,
+                orig_len,
+                wrote_len,
+                orig_headers,
+            )?
+        } else {
+            Self::encode_headers_with_lower_case(msg, dst, is_last, orig_len, wrote_len)?
+        };
+
+        ret.map(|()| encoder)
+    }
+
+    fn on_error(err: &crate::Error) -> Option<MessageHead<Self::Outgoing>> {
+        use crate::error::Kind;
+        let status = match *err.kind() {
+            Kind::Parse(Parse::Method)
+            | Kind::Parse(Parse::Header(_))
+            | Kind::Parse(Parse::Uri)
+            | Kind::Parse(Parse::Version) => StatusCode::BAD_REQUEST,
+            Kind::Parse(Parse::TooLarge) => StatusCode::REQUEST_HEADER_FIELDS_TOO_LARGE,
+            _ => return None,
+        };
+
+        debug!("sending automatic response ({}) for parse error", status);
+        let mut msg = MessageHead::default();
+        msg.subject = status;
+        Some(msg)
+    }
+
+    fn is_server() -> bool {
+        true
+    }
+
+    fn update_date() {
+        date::update();
+    }
+}
+
+#[cfg(feature = "server")]
+impl Server {
+    fn can_have_body(method: &Option<Method>, status: StatusCode) -> bool {
+        Server::can_chunked(method, status)
+    }
+
+    fn can_chunked(method: &Option<Method>, status: StatusCode) -> bool {
+        if method == &Some(Method::HEAD) || method == &Some(Method::CONNECT) && status.is_success()
+        {
+            false
+        } else if status.is_informational() {
+            false
+        } else {
+            match status {
+                StatusCode::NO_CONTENT | StatusCode::NOT_MODIFIED => false,
+                _ => true,
+            }
+        }
+    }
+
+    fn can_have_content_length(method: &Option<Method>, status: StatusCode) -> bool {
+        if status.is_informational() || method == &Some(Method::CONNECT) && status.is_success() {
+            false
+        } else {
+            match status {
+                StatusCode::NO_CONTENT | StatusCode::NOT_MODIFIED => false,
+                _ => true,
+            }
+        }
+    }
+
+    fn encode_headers_with_lower_case(
+        msg: Encode<'_, StatusCode>,
+        dst: &mut Vec<u8>,
+        is_last: bool,
+        orig_len: usize,
+        wrote_len: bool,
+    ) -> crate::Result<Encoder> {
+        struct LowercaseWriter;
+
+        impl HeaderNameWriter for LowercaseWriter {
+            #[inline]
+            fn write_full_header_line(
+                &mut self,
+                dst: &mut Vec<u8>,
+                line: &str,
+                _: (HeaderName, &str),
+            ) {
+                extend(dst, line.as_bytes())
+            }
+
+            #[inline]
+            fn write_header_name_with_colon(
+                &mut self,
+                dst: &mut Vec<u8>,
+                name_with_colon: &str,
+                _: HeaderName,
+            ) {
+                extend(dst, name_with_colon.as_bytes())
+            }
+
+            #[inline]
+            fn write_header_name(&mut self, dst: &mut Vec<u8>, name: &HeaderName) {
+                extend(dst, name.as_str().as_bytes())
+            }
+        }
+
+        Self::encode_headers(msg, dst, is_last, orig_len, wrote_len, LowercaseWriter)
+    }
+
+    #[cold]
+    #[inline(never)]
+    fn encode_headers_with_original_case(
+        msg: Encode<'_, StatusCode>,
+        dst: &mut Vec<u8>,
+        is_last: bool,
+        orig_len: usize,
+        wrote_len: bool,
+        orig_headers: &HeaderCaseMap,
+    ) -> crate::Result<Encoder> {
+        struct OrigCaseWriter<'map> {
+            map: &'map HeaderCaseMap,
+            current: Option<(HeaderName, ValueIter<'map, Bytes>)>,
+            title_case_headers: bool,
+        }
+
+        impl HeaderNameWriter for OrigCaseWriter<'_> {
+            #[inline]
+            fn write_full_header_line(
+                &mut self,
+                dst: &mut Vec<u8>,
+                _: &str,
+                (name, rest): (HeaderName, &str),
+            ) {
+                self.write_header_name(dst, &name);
+                extend(dst, rest.as_bytes());
+            }
+
+            #[inline]
+            fn write_header_name_with_colon(
+                &mut self,
+                dst: &mut Vec<u8>,
+                _: &str,
+                name: HeaderName,
+            ) {
+                self.write_header_name(dst, &name);
+                extend(dst, b": ");
+            }
+
+            #[inline]
+            fn write_header_name(&mut self, dst: &mut Vec<u8>, name: &HeaderName) {
+                let Self {
+                    map,
+                    ref mut current,
+                    title_case_headers,
+                } = *self;
+                if current.as_ref().map_or(true, |(last, _)| last != name) {
+                    *current = None;
+                }
+                let (_, values) =
+                    current.get_or_insert_with(|| (name.clone(), map.get_all_internal(name)));
+
+                if let Some(orig_name) = values.next() {
+                    extend(dst, orig_name);
+                } else if title_case_headers {
+                    title_case(dst, name.as_str().as_bytes());
+                } else {
+                    extend(dst, name.as_str().as_bytes());
+                }
+            }
+        }
+
+        let header_name_writer = OrigCaseWriter {
+            map: orig_headers,
+            current: None,
+            title_case_headers: msg.title_case_headers,
+        };
+
+        Self::encode_headers(msg, dst, is_last, orig_len, wrote_len, header_name_writer)
+    }
+
+    #[inline]
+    fn encode_headers<W>(
+        msg: Encode<'_, StatusCode>,
+        mut dst: &mut Vec<u8>,
+        mut is_last: bool,
+        orig_len: usize,
+        mut wrote_len: bool,
+        mut header_name_writer: W,
+    ) -> crate::Result<Encoder>
+    where
+        W: HeaderNameWriter,
+    {
+        // In some error cases, we don't know about the invalid message until already
+        // pushing some bytes onto the `dst`. In those cases, we don't want to send
+        // the half-pushed message, so rewind to before.
+        let rewind = |dst: &mut Vec<u8>| {
+            dst.truncate(orig_len);
+        };
+
         let mut encoder = Encoder::length(0);
         let mut wrote_date = false;
         let mut cur_name = None;
@@ -410,7 +633,11 @@
 
                             if !is_name_written {
                                 encoder = Encoder::length(known_len);
-                                extend(dst, b"content-length: ");
+                                header_name_writer.write_header_name_with_colon(
+                                    dst,
+                                    "content-length: ",
+                                    header::CONTENT_LENGTH,
+                                );
                                 extend(dst, value.as_bytes());
                                 wrote_len = true;
                                 is_name_written = true;
@@ -438,7 +665,11 @@
                                 } else {
                                     // we haven't written content-length yet!
                                     encoder = Encoder::length(len);
-                                    extend(dst, b"content-length: ");
+                                    header_name_writer.write_header_name_with_colon(
+                                        dst,
+                                        "content-length: ",
+                                        header::CONTENT_LENGTH,
+                                    );
                                     extend(dst, value.as_bytes());
                                     wrote_len = true;
                                     is_name_written = true;
@@ -493,7 +724,11 @@
                     if !is_name_written {
                         encoder = Encoder::chunked();
                         is_name_written = true;
-                        extend(dst, b"transfer-encoding: ");
+                        header_name_writer.write_header_name_with_colon(
+                            dst,
+                            "transfer-encoding: ",
+                            header::TRANSFER_ENCODING,
+                        );
                         extend(dst, value.as_bytes());
                     } else {
                         extend(dst, b", ");
@@ -507,7 +742,11 @@
                     }
                     if !is_name_written {
                         is_name_written = true;
-                        extend(dst, b"connection: ");
+                        header_name_writer.write_header_name_with_colon(
+                            dst,
+                            "connection: ",
+                            header::CONNECTION,
+                        );
                         extend(dst, value.as_bytes());
                     } else {
                         extend(dst, b", ");
@@ -529,7 +768,7 @@
                 "{:?} set is_name_written and didn't continue loop",
                 name,
             );
-            extend(dst, name.as_str().as_bytes());
+            header_name_writer.write_header_name(dst, name);
             extend(dst, b": ");
             extend(dst, value.as_bytes());
             extend(dst, b"\r\n");
@@ -545,21 +784,33 @@
                     {
                         Encoder::close_delimited()
                     } else {
-                        extend(dst, b"transfer-encoding: chunked\r\n");
+                        header_name_writer.write_full_header_line(
+                            dst,
+                            "transfer-encoding: chunked\r\n",
+                            (header::TRANSFER_ENCODING, ": chunked\r\n"),
+                        );
                         Encoder::chunked()
                     }
                 }
                 None | Some(BodyLength::Known(0)) => {
-                    if msg.head.subject != StatusCode::NOT_MODIFIED {
-                        extend(dst, b"content-length: 0\r\n");
+                    if Server::can_have_content_length(msg.req_method, msg.head.subject) {
+                        header_name_writer.write_full_header_line(
+                            dst,
+                            "content-length: 0\r\n",
+                            (header::CONTENT_LENGTH, ": 0\r\n"),
+                        )
                     }
                     Encoder::length(0)
                 }
                 Some(BodyLength::Known(len)) => {
-                    if msg.head.subject == StatusCode::NOT_MODIFIED {
+                    if !Server::can_have_content_length(msg.req_method, msg.head.subject) {
                         Encoder::length(0)
                     } else {
-                        extend(dst, b"content-length: ");
+                        header_name_writer.write_header_name_with_colon(
+                            dst,
+                            "content-length: ",
+                            header::CONTENT_LENGTH,
+                        );
                         let _ = ::itoa::write(&mut dst, len);
                         extend(dst, b"\r\n");
                         Encoder::length(len)
@@ -580,64 +831,35 @@
         // cached date is much faster than formatting every request
         if !wrote_date {
             dst.reserve(date::DATE_VALUE_LENGTH + 8);
-            extend(dst, b"date: ");
+            header_name_writer.write_header_name_with_colon(dst, "date: ", header::DATE);
             date::extend(dst);
             extend(dst, b"\r\n\r\n");
         } else {
             extend(dst, b"\r\n");
         }
 
-        ret.map(|()| encoder.set_last(is_last))
-    }
-
-    fn on_error(err: &crate::Error) -> Option<MessageHead<Self::Outgoing>> {
-        use crate::error::Kind;
-        let status = match *err.kind() {
-            Kind::Parse(Parse::Method)
-            | Kind::Parse(Parse::Header)
-            | Kind::Parse(Parse::Uri)
-            | Kind::Parse(Parse::Version) => StatusCode::BAD_REQUEST,
-            Kind::Parse(Parse::TooLarge) => StatusCode::REQUEST_HEADER_FIELDS_TOO_LARGE,
-            _ => return None,
-        };
-
-        debug!("sending automatic response ({}) for parse error", status);
-        let mut msg = MessageHead::default();
-        msg.subject = status;
-        Some(msg)
-    }
-
-    fn is_server() -> bool {
-        true
-    }
-
-    fn update_date() {
-        date::update();
+        Ok(encoder.set_last(is_last))
     }
 }
 
-impl Server {
-    fn can_have_body(method: &Option<Method>, status: StatusCode) -> bool {
-        Server::can_chunked(method, status)
-    }
-
-    fn can_chunked(method: &Option<Method>, status: StatusCode) -> bool {
-        if method == &Some(Method::HEAD) || method == &Some(Method::CONNECT) && status.is_success()
-        {
-            false
-        } else {
-            match status {
-                // TODO: support for 1xx codes needs improvement everywhere
-                // would be 100...199 => false
-                StatusCode::SWITCHING_PROTOCOLS
-                | StatusCode::NO_CONTENT
-                | StatusCode::NOT_MODIFIED => false,
-                _ => true,
-            }
-        }
-    }
+#[cfg(feature = "server")]
+trait HeaderNameWriter {
+    fn write_full_header_line(
+        &mut self,
+        dst: &mut Vec<u8>,
+        line: &str,
+        name_value_pair: (HeaderName, &str),
+    );
+    fn write_header_name_with_colon(
+        &mut self,
+        dst: &mut Vec<u8>,
+        name_with_colon: &str,
+        name: HeaderName,
+    );
+    fn write_header_name(&mut self, dst: &mut Vec<u8>, name: &HeaderName);
 }
 
+#[cfg(feature = "client")]
 impl Http1Transaction for Client {
     type Incoming = StatusCode;
     type Outgoing = RequestLine;
@@ -649,21 +871,41 @@
         // Loop to skip information status code headers (100 Continue, etc).
         loop {
             // Unsafe: see comment in Server Http1Transaction, above.
-            let mut headers_indices: [HeaderIndices; MAX_HEADERS] = unsafe { mem::uninitialized() };
-            let (len, status, version, headers_len) = {
-                let mut headers: [httparse::Header<'_>; MAX_HEADERS] =
-                    unsafe { mem::uninitialized() };
+            let mut headers_indices: [MaybeUninit<HeaderIndices>; MAX_HEADERS] = unsafe {
+                // SAFETY: We can go safely from MaybeUninit array to array of MaybeUninit
+                MaybeUninit::uninit().assume_init()
+            };
+            let (len, status, reason, version, headers_len) = {
+                // SAFETY: We can go safely from MaybeUninit array to array of MaybeUninit
+                let mut headers: [MaybeUninit<httparse::Header<'_>>; MAX_HEADERS] =
+                    unsafe { MaybeUninit::uninit().assume_init() };
                 trace!(
                     "Response.parse([Header; {}], [u8; {}])",
                     headers.len(),
                     buf.len()
                 );
-                let mut res = httparse::Response::new(&mut headers);
+                let mut res = httparse::Response::new(&mut []);
                 let bytes = buf.as_ref();
-                match res.parse(bytes)? {
-                    httparse::Status::Complete(len) => {
+                match ctx.h1_parser_config
+                    .parse_response_with_uninit_headers(&mut res, bytes, &mut headers)
+                {
+                    Ok(httparse::Status::Complete(len)) => {
                         trace!("Response.parse Complete({})", len);
                         let status = StatusCode::from_u16(res.code.unwrap())?;
+
+                        #[cfg(not(feature = "ffi"))]
+                        let reason = ();
+                        #[cfg(feature = "ffi")]
+                        let reason = {
+                            let reason = res.reason.unwrap();
+                            // Only save the reason phrase if it isnt the canonical reason
+                            if Some(reason) != status.canonical_reason() {
+                                Some(Bytes::copy_from_slice(reason.as_bytes()))
+                            } else {
+                                None
+                            }
+                        };
+
                         let version = if res.version.unwrap() == 1 {
                             Version::HTTP_11
                         } else {
@@ -671,9 +913,20 @@
                         };
                         record_header_indices(bytes, &res.headers, &mut headers_indices)?;
                         let headers_len = res.headers.len();
-                        (len, status, version, headers_len)
+                        (len, status, reason, version, headers_len)
+                    }
+                    Ok(httparse::Status::Partial) => return Ok(None),
+                    Err(httparse::Error::Version) if ctx.h09_responses => {
+                        trace!("Response.parse accepted HTTP/0.9 response");
+
+                        #[cfg(not(feature = "ffi"))]
+                        let reason = ();
+                        #[cfg(feature = "ffi")]
+                        let reason = None;
+
+                        (0, StatusCode::OK, reason, Version::HTTP_09, 0)
                     }
-                    httparse::Status::Partial => return Ok(None),
+                    Err(e) => return Err(e.into()),
                 }
             };
 
@@ -683,8 +936,16 @@
 
             let mut keep_alive = version == Version::HTTP_11;
 
+            let mut header_case_map = if ctx.preserve_header_case {
+                Some(HeaderCaseMap::default())
+            } else {
+                None
+            };
+
             headers.reserve(headers_len);
             for header in &headers_indices[..headers_len] {
+                // SAFETY: array is valid up to `headers_len`
+                let header = unsafe { &*header.as_ptr() };
                 let name = header_name!(&slice[header.name.0..header.name.1]);
                 let value = header_value!(slice.slice(header.value.0..header.value.1));
 
@@ -698,13 +959,37 @@
                         keep_alive = headers::connection_keep_alive(&value);
                     }
                 }
+
+                if let Some(ref mut header_case_map) = header_case_map {
+                    header_case_map.append(&name, slice.slice(header.name.0..header.name.1));
+                }
+
                 headers.append(name, value);
             }
 
+            let mut extensions = http::Extensions::default();
+
+            if let Some(header_case_map) = header_case_map {
+                extensions.insert(header_case_map);
+            }
+
+            #[cfg(feature = "ffi")]
+            if let Some(reason) = reason {
+                extensions.insert(crate::ffi::ReasonPhrase(reason));
+            }
+            #[cfg(not(feature = "ffi"))]
+            drop(reason);
+
+            #[cfg(feature = "ffi")]
+            if ctx.raw_headers {
+                extensions.insert(crate::ffi::RawHeaders(crate::ffi::hyper_buf(slice)));
+            }
+
             let head = MessageHead {
                 version,
                 subject: status,
                 headers,
+                extensions,
             };
             if let Some((decode, is_upgrade)) = Client::decoder(&head, ctx.req_method)? {
                 return Ok(Some(ParsedMessage {
@@ -718,6 +1003,13 @@
                 }));
             }
 
+            #[cfg(feature = "ffi")]
+            if head.subject.is_informational() {
+                if let Some(callback) = ctx.on_informational {
+                    callback.call(head.into_response(crate::Body::empty()));
+                }
+            }
+
             // Parsing a 1xx response could have consumed the buffer, check if
             // it is empty now...
             if buf.is_empty() {
@@ -749,18 +1041,26 @@
             Version::HTTP_10 => extend(dst, b"HTTP/1.0"),
             Version::HTTP_11 => extend(dst, b"HTTP/1.1"),
             Version::HTTP_2 => {
-                warn!("request with HTTP2 version coerced to HTTP/1.1");
+                debug!("request with HTTP2 version coerced to HTTP/1.1");
                 extend(dst, b"HTTP/1.1");
             }
             other => panic!("unexpected request version: {:?}", other),
         }
         extend(dst, b"\r\n");
 
-        if msg.title_case_headers {
+        if let Some(orig_headers) = msg.head.extensions.get::<HeaderCaseMap>() {
+            write_headers_original_case(
+                &msg.head.headers,
+                orig_headers,
+                dst,
+                msg.title_case_headers,
+            );
+        } else if msg.title_case_headers {
             write_headers_title_case(&msg.head.headers, dst);
         } else {
             write_headers(&msg.head.headers, dst);
         }
+
         extend(dst, b"\r\n");
         msg.head.headers.clear(); //TODO: remove when switching to drain()
 
@@ -777,6 +1077,7 @@
     }
 }
 
+#[cfg(feature = "client")]
 impl Client {
     /// Returns Some(length, wants_upgrade) if successful.
     ///
@@ -827,7 +1128,7 @@
             // malformed. A server should respond with 400 Bad Request.
             if inc.version == Version::HTTP_10 {
                 debug!("HTTP/1.0 cannot have Transfer-Encoding header");
-                Err(Parse::Header)
+                Err(Parse::transfer_encoding_unexpected())
             } else if headers::transfer_encoding_is_chunked(&inc.headers) {
                 Ok(Some((DecodedLength::CHUNKED, false)))
             } else {
@@ -838,15 +1139,12 @@
             Ok(Some((DecodedLength::checked_new(len)?, false)))
         } else if inc.headers.contains_key(header::CONTENT_LENGTH) {
             debug!("illegal Content-Length header");
-            Err(Parse::Header)
+            Err(Parse::content_length_invalid())
         } else {
             trace!("neither Transfer-Encoding nor Content-Length");
             Ok(Some((DecodedLength::CLOSE_DELIMITED, false)))
         }
     }
-}
-
-impl Client {
     fn set_length(head: &mut RequestHead, body: Option<BodyLength>) -> Encoder {
         let body = if let Some(body) = body {
             body
@@ -1002,7 +1300,7 @@
 fn record_header_indices(
     bytes: &[u8],
     headers: &[httparse::Header<'_>],
-    indices: &mut [HeaderIndices],
+    indices: &mut [MaybeUninit<HeaderIndices>],
 ) -> Result<(), crate::error::Parse> {
     let bytes_ptr = bytes.as_ptr() as usize;
 
@@ -1013,45 +1311,36 @@
         }
         let name_start = header.name.as_ptr() as usize - bytes_ptr;
         let name_end = name_start + header.name.len();
-        indices.name = (name_start, name_end);
         let value_start = header.value.as_ptr() as usize - bytes_ptr;
         let value_end = value_start + header.value.len();
-        indices.value = (value_start, value_end);
+
+        // FIXME(maybe_uninit_extra)
+        // FIXME(addr_of)
+        // Currently we don't have `ptr::addr_of_mut` in stable rust or
+        // MaybeUninit::write, so this is some way of assigning into a MaybeUninit
+        // safely
+        let new_header_indices = HeaderIndices {
+            name: (name_start, name_end),
+            value: (value_start, value_end),
+        };
+        *indices = MaybeUninit::new(new_header_indices);
     }
 
     Ok(())
 }
 
-// Write header names as title case. The header name is assumed to be ASCII,
-// therefore it is trivial to convert an ASCII character from lowercase to
-// uppercase. It is as simple as XORing the lowercase character byte with
-// space.
+// Write header names as title case. The header name is assumed to be ASCII.
 fn title_case(dst: &mut Vec<u8>, name: &[u8]) {
     dst.reserve(name.len());
 
-    let mut iter = name.iter();
-
-    // Uppercase the first character
-    if let Some(c) = iter.next() {
-        if *c >= b'a' && *c <= b'z' {
-            dst.push(*c ^ b' ');
-        } else {
-            dst.push(*c);
-        }
-    }
-
-    while let Some(c) = iter.next() {
-        dst.push(*c);
-
-        if *c == b'-' {
-            if let Some(c) = iter.next() {
-                if *c >= b'a' && *c <= b'z' {
-                    dst.push(*c ^ b' ');
-                } else {
-                    dst.push(*c);
-                }
-            }
+    // Ensure first character is uppercased
+    let mut prev = b'-';
+    for &(mut c) in name {
+        if prev == b'-' {
+            c.make_ascii_uppercase();
         }
+        dst.push(c);
+        prev = c;
     }
 }
 
@@ -1073,6 +1362,42 @@
     }
 }
 
+#[cold]
+fn write_headers_original_case(
+    headers: &HeaderMap,
+    orig_case: &HeaderCaseMap,
+    dst: &mut Vec<u8>,
+    title_case_headers: bool,
+) {
+    // For each header name/value pair, there may be a value in the casemap
+    // that corresponds to the HeaderValue. So, we iterator all the keys,
+    // and for each one, try to pair the originally cased name with the value.
+    //
+    // TODO: consider adding http::HeaderMap::entries() iterator
+    for name in headers.keys() {
+        let mut names = orig_case.get_all(name);
+
+        for value in headers.get_all(name) {
+            if let Some(orig_name) = names.next() {
+                extend(dst, orig_name.as_ref());
+            } else if title_case_headers {
+                title_case(dst, name.as_str().as_bytes());
+            } else {
+                extend(dst, name.as_str().as_bytes());
+            }
+
+            // Wanted for curl test cases that send `X-Custom-Header:\r\n`
+            if value.is_empty() {
+                extend(dst, b":\r\n");
+            } else {
+                extend(dst, b": ");
+                extend(dst, value.as_bytes());
+                extend(dst, b"\r\n");
+            }
+        }
+    }
+}
+
 struct FastWrite<'a>(&'a mut Vec<u8>);
 
 impl<'a> fmt::Write for FastWrite<'a> {
@@ -1109,6 +1434,13 @@
             ParseContext {
                 cached_headers: &mut None,
                 req_method: &mut method,
+                h1_parser_config: Default::default(),
+                preserve_header_case: false,
+                h09_responses: false,
+                #[cfg(feature = "ffi")]
+                on_informational: &mut None,
+                #[cfg(feature = "ffi")]
+                raw_headers: false,
             },
         )
         .unwrap()
@@ -1129,6 +1461,13 @@
         let ctx = ParseContext {
             cached_headers: &mut None,
             req_method: &mut Some(crate::Method::GET),
+            h1_parser_config: Default::default(),
+            preserve_header_case: false,
+            h09_responses: false,
+            #[cfg(feature = "ffi")]
+            on_informational: &mut None,
+            #[cfg(feature = "ffi")]
+            raw_headers: false,
         };
         let msg = Client::parse(&mut raw, ctx).unwrap().unwrap();
         assert_eq!(raw.len(), 0);
@@ -1144,10 +1483,145 @@
         let ctx = ParseContext {
             cached_headers: &mut None,
             req_method: &mut None,
+            h1_parser_config: Default::default(),
+            preserve_header_case: false,
+            h09_responses: false,
+            #[cfg(feature = "ffi")]
+            on_informational: &mut None,
+            #[cfg(feature = "ffi")]
+            raw_headers: false,
         };
         Server::parse(&mut raw, ctx).unwrap_err();
     }
 
+    const H09_RESPONSE: &'static str = "Baguettes are super delicious, don't you agree?";
+
+    #[test]
+    fn test_parse_response_h09_allowed() {
+        let _ = pretty_env_logger::try_init();
+        let mut raw = BytesMut::from(H09_RESPONSE);
+        let ctx = ParseContext {
+            cached_headers: &mut None,
+            req_method: &mut Some(crate::Method::GET),
+            h1_parser_config: Default::default(),
+            preserve_header_case: false,
+            h09_responses: true,
+            #[cfg(feature = "ffi")]
+            on_informational: &mut None,
+            #[cfg(feature = "ffi")]
+            raw_headers: false,
+        };
+        let msg = Client::parse(&mut raw, ctx).unwrap().unwrap();
+        assert_eq!(raw, H09_RESPONSE);
+        assert_eq!(msg.head.subject, crate::StatusCode::OK);
+        assert_eq!(msg.head.version, crate::Version::HTTP_09);
+        assert_eq!(msg.head.headers.len(), 0);
+    }
+
+    #[test]
+    fn test_parse_response_h09_rejected() {
+        let _ = pretty_env_logger::try_init();
+        let mut raw = BytesMut::from(H09_RESPONSE);
+        let ctx = ParseContext {
+            cached_headers: &mut None,
+            req_method: &mut Some(crate::Method::GET),
+            h1_parser_config: Default::default(),
+            preserve_header_case: false,
+            h09_responses: false,
+            #[cfg(feature = "ffi")]
+            on_informational: &mut None,
+            #[cfg(feature = "ffi")]
+            raw_headers: false,
+        };
+        Client::parse(&mut raw, ctx).unwrap_err();
+        assert_eq!(raw, H09_RESPONSE);
+    }
+
+    const RESPONSE_WITH_WHITESPACE_BETWEEN_HEADER_NAME_AND_COLON: &'static str =
+        "HTTP/1.1 200 OK\r\nAccess-Control-Allow-Credentials : true\r\n\r\n";
+
+    #[test]
+    fn test_parse_allow_response_with_spaces_before_colons() {
+        use httparse::ParserConfig;
+
+        let _ = pretty_env_logger::try_init();
+        let mut raw = BytesMut::from(RESPONSE_WITH_WHITESPACE_BETWEEN_HEADER_NAME_AND_COLON);
+        let mut h1_parser_config = ParserConfig::default();
+        h1_parser_config.allow_spaces_after_header_name_in_responses(true);
+        let ctx = ParseContext {
+            cached_headers: &mut None,
+            req_method: &mut Some(crate::Method::GET),
+            h1_parser_config,
+            preserve_header_case: false,
+            h09_responses: false,
+            #[cfg(feature = "ffi")]
+            on_informational: &mut None,
+            #[cfg(feature = "ffi")]
+            raw_headers: false,
+        };
+        let msg = Client::parse(&mut raw, ctx).unwrap().unwrap();
+        assert_eq!(raw.len(), 0);
+        assert_eq!(msg.head.subject, crate::StatusCode::OK);
+        assert_eq!(msg.head.version, crate::Version::HTTP_11);
+        assert_eq!(msg.head.headers.len(), 1);
+        assert_eq!(msg.head.headers["Access-Control-Allow-Credentials"], "true");
+    }
+
+    #[test]
+    fn test_parse_reject_response_with_spaces_before_colons() {
+        let _ = pretty_env_logger::try_init();
+        let mut raw = BytesMut::from(RESPONSE_WITH_WHITESPACE_BETWEEN_HEADER_NAME_AND_COLON);
+        let ctx = ParseContext {
+            cached_headers: &mut None,
+            req_method: &mut Some(crate::Method::GET),
+            h1_parser_config: Default::default(),
+            preserve_header_case: false,
+            h09_responses: false,
+            #[cfg(feature = "ffi")]
+            on_informational: &mut None,
+            #[cfg(feature = "ffi")]
+            raw_headers: false,
+        };
+        Client::parse(&mut raw, ctx).unwrap_err();
+    }
+
+    #[test]
+    fn test_parse_preserve_header_case_in_request() {
+        let mut raw =
+            BytesMut::from("GET / HTTP/1.1\r\nHost: hyper.rs\r\nX-BREAD: baguette\r\n\r\n");
+        let ctx = ParseContext {
+            cached_headers: &mut None,
+            req_method: &mut None,
+            h1_parser_config: Default::default(),
+            preserve_header_case: true,
+            h09_responses: false,
+            #[cfg(feature = "ffi")]
+            on_informational: &mut None,
+            #[cfg(feature = "ffi")]
+            raw_headers: false,
+        };
+        let parsed_message = Server::parse(&mut raw, ctx).unwrap().unwrap();
+        let orig_headers = parsed_message
+            .head
+            .extensions
+            .get::<HeaderCaseMap>()
+            .unwrap();
+        assert_eq!(
+            orig_headers
+                .get_all_internal(&HeaderName::from_static("host"))
+                .into_iter()
+                .collect::<Vec<_>>(),
+            vec![&Bytes::from("Host")]
+        );
+        assert_eq!(
+            orig_headers
+                .get_all_internal(&HeaderName::from_static("x-bread"))
+                .into_iter()
+                .collect::<Vec<_>>(),
+            vec![&Bytes::from("X-BREAD")]
+        );
+    }
+
     #[test]
     fn test_decoder_request() {
         fn parse(s: &str) -> ParsedMessage<RequestLine> {
@@ -1157,6 +1631,13 @@
                 ParseContext {
                     cached_headers: &mut None,
                     req_method: &mut None,
+                    h1_parser_config: Default::default(),
+                    preserve_header_case: false,
+                    h09_responses: false,
+                    #[cfg(feature = "ffi")]
+                    on_informational: &mut None,
+                    #[cfg(feature = "ffi")]
+                    raw_headers: false,
                 },
             )
             .expect("parse ok")
@@ -1170,6 +1651,13 @@
                 ParseContext {
                     cached_headers: &mut None,
                     req_method: &mut None,
+                    h1_parser_config: Default::default(),
+                    preserve_header_case: false,
+                    h09_responses: false,
+                    #[cfg(feature = "ffi")]
+                    on_informational: &mut None,
+                    #[cfg(feature = "ffi")]
+                    raw_headers: false,
                 },
             )
             .expect_err(comment)
@@ -1315,6 +1803,16 @@
             "multiple content-lengths",
         );
 
+        // content-length with prefix is not allowed
+        parse_err(
+            "\
+             POST / HTTP/1.1\r\n\
+             content-length: +10\r\n\
+             \r\n\
+             ",
+            "prefixed content-length",
+        );
+
         // transfer-encoding that isn't chunked is an error
         parse_err(
             "\
@@ -1334,6 +1832,16 @@
             "transfer-encoding doesn't end in chunked",
         );
 
+        parse_err(
+            "\
+             POST / HTTP/1.1\r\n\
+             transfer-encoding: chunked\r\n\
+             transfer-encoding: afterlol\r\n\
+             \r\n\
+             ",
+            "transfer-encoding multiple lines doesn't end in chunked",
+        );
+
         // http/1.0
 
         assert_eq!(
@@ -1372,6 +1880,13 @@
                 ParseContext {
                     cached_headers: &mut None,
                     req_method: &mut Some(Method::GET),
+                    h1_parser_config: Default::default(),
+                    preserve_header_case: false,
+                    h09_responses: false,
+                    #[cfg(feature = "ffi")]
+                    on_informational: &mut None,
+                    #[cfg(feature = "ffi")]
+                    raw_headers: false,
                 }
             )
             .expect("parse ok")
@@ -1385,6 +1900,13 @@
                 ParseContext {
                     cached_headers: &mut None,
                     req_method: &mut Some(m),
+                    h1_parser_config: Default::default(),
+                    preserve_header_case: false,
+                    h09_responses: false,
+                    #[cfg(feature = "ffi")]
+                    on_informational: &mut None,
+                    #[cfg(feature = "ffi")]
+                    raw_headers: false,
                 },
             )
             .expect("parse ok")
@@ -1398,6 +1920,13 @@
                 ParseContext {
                     cached_headers: &mut None,
                     req_method: &mut Some(Method::GET),
+                    h1_parser_config: Default::default(),
+                    preserve_header_case: false,
+                    h09_responses: false,
+                    #[cfg(feature = "ffi")]
+                    on_informational: &mut None,
+                    #[cfg(feature = "ffi")]
+                    raw_headers: false,
                 },
             )
             .expect_err("parse should err")
@@ -1473,6 +2002,14 @@
              ",
         );
 
+        parse_err(
+            "\
+             HTTP/1.1 200 OK\r\n\
+             content-length: +8\r\n\
+             \r\n\
+             ",
+        );
+
         // transfer-encoding: chunked
         assert_eq!(
             parse(
@@ -1684,6 +2221,75 @@
     }
 
     #[test]
+    fn test_client_request_encode_orig_case() {
+        use crate::proto::BodyLength;
+        use http::header::{HeaderValue, CONTENT_LENGTH};
+
+        let mut head = MessageHead::default();
+        head.headers
+            .insert("content-length", HeaderValue::from_static("10"));
+        head.headers
+            .insert("content-type", HeaderValue::from_static("application/json"));
+
+        let mut orig_headers = HeaderCaseMap::default();
+        orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
+        head.extensions.insert(orig_headers);
+
+        let mut vec = Vec::new();
+        Client::encode(
+            Encode {
+                head: &mut head,
+                body: Some(BodyLength::Known(10)),
+                keep_alive: true,
+                req_method: &mut None,
+                title_case_headers: false,
+            },
+            &mut vec,
+        )
+        .unwrap();
+
+        assert_eq!(
+            &*vec,
+            b"GET / HTTP/1.1\r\nCONTENT-LENGTH: 10\r\ncontent-type: application/json\r\n\r\n"
+                .as_ref(),
+        );
+    }
+    #[test]
+    fn test_client_request_encode_orig_and_title_case() {
+        use crate::proto::BodyLength;
+        use http::header::{HeaderValue, CONTENT_LENGTH};
+
+        let mut head = MessageHead::default();
+        head.headers
+            .insert("content-length", HeaderValue::from_static("10"));
+        head.headers
+            .insert("content-type", HeaderValue::from_static("application/json"));
+
+        let mut orig_headers = HeaderCaseMap::default();
+        orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
+        head.extensions.insert(orig_headers);
+
+        let mut vec = Vec::new();
+        Client::encode(
+            Encode {
+                head: &mut head,
+                body: Some(BodyLength::Known(10)),
+                keep_alive: true,
+                req_method: &mut None,
+                title_case_headers: true,
+            },
+            &mut vec,
+        )
+        .unwrap();
+
+        assert_eq!(
+            &*vec,
+            b"GET / HTTP/1.1\r\nCONTENT-LENGTH: 10\r\nContent-Type: application/json\r\n\r\n"
+                .as_ref(),
+        );
+    }
+
+    #[test]
     fn test_server_encode_connect_method() {
         let mut head = MessageHead::default();
 
@@ -1704,6 +2310,106 @@
     }
 
     #[test]
+    fn test_server_response_encode_title_case() {
+        use crate::proto::BodyLength;
+        use http::header::HeaderValue;
+
+        let mut head = MessageHead::default();
+        head.headers
+            .insert("content-length", HeaderValue::from_static("10"));
+        head.headers
+            .insert("content-type", HeaderValue::from_static("application/json"));
+        head.headers
+            .insert("weird--header", HeaderValue::from_static(""));
+
+        let mut vec = Vec::new();
+        Server::encode(
+            Encode {
+                head: &mut head,
+                body: Some(BodyLength::Known(10)),
+                keep_alive: true,
+                req_method: &mut None,
+                title_case_headers: true,
+            },
+            &mut vec,
+        )
+        .unwrap();
+
+        let expected_response =
+            b"HTTP/1.1 200 OK\r\nContent-Length: 10\r\nContent-Type: application/json\r\nWeird--Header: \r\n";
+
+        assert_eq!(&vec[..expected_response.len()], &expected_response[..]);
+    }
+
+    #[test]
+    fn test_server_response_encode_orig_case() {
+        use crate::proto::BodyLength;
+        use http::header::{HeaderValue, CONTENT_LENGTH};
+
+        let mut head = MessageHead::default();
+        head.headers
+            .insert("content-length", HeaderValue::from_static("10"));
+        head.headers
+            .insert("content-type", HeaderValue::from_static("application/json"));
+
+        let mut orig_headers = HeaderCaseMap::default();
+        orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
+        head.extensions.insert(orig_headers);
+
+        let mut vec = Vec::new();
+        Server::encode(
+            Encode {
+                head: &mut head,
+                body: Some(BodyLength::Known(10)),
+                keep_alive: true,
+                req_method: &mut None,
+                title_case_headers: false,
+            },
+            &mut vec,
+        )
+        .unwrap();
+
+        let expected_response =
+            b"HTTP/1.1 200 OK\r\nCONTENT-LENGTH: 10\r\ncontent-type: application/json\r\ndate: ";
+
+        assert_eq!(&vec[..expected_response.len()], &expected_response[..]);
+    }
+
+    #[test]
+    fn test_server_response_encode_orig_and_title_case() {
+        use crate::proto::BodyLength;
+        use http::header::{HeaderValue, CONTENT_LENGTH};
+
+        let mut head = MessageHead::default();
+        head.headers
+            .insert("content-length", HeaderValue::from_static("10"));
+        head.headers
+            .insert("content-type", HeaderValue::from_static("application/json"));
+
+        let mut orig_headers = HeaderCaseMap::default();
+        orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
+        head.extensions.insert(orig_headers);
+
+        let mut vec = Vec::new();
+        Server::encode(
+            Encode {
+                head: &mut head,
+                body: Some(BodyLength::Known(10)),
+                keep_alive: true,
+                req_method: &mut None,
+                title_case_headers: true,
+            },
+            &mut vec,
+        )
+        .unwrap();
+
+        let expected_response =
+            b"HTTP/1.1 200 OK\r\nCONTENT-LENGTH: 10\r\nContent-Type: application/json\r\nDate: ";
+
+        assert_eq!(&vec[..expected_response.len()], &expected_response[..]);
+    }
+
+    #[test]
     fn parse_header_htabs() {
         let mut bytes = BytesMut::from("HTTP/1.1 200 OK\r\nserver: hello\tworld\r\n\r\n");
         let parsed = Client::parse(
@@ -1711,6 +2417,13 @@
             ParseContext {
                 cached_headers: &mut None,
                 req_method: &mut Some(Method::GET),
+                h1_parser_config: Default::default(),
+                preserve_header_case: false,
+                h09_responses: false,
+                #[cfg(feature = "ffi")]
+                on_informational: &mut None,
+                #[cfg(feature = "ffi")]
+                raw_headers: false,
             },
         )
         .expect("parse ok")
@@ -1719,6 +2432,40 @@
         assert_eq!(parsed.head.headers["server"], "hello\tworld");
     }
 
+    #[test]
+    fn test_write_headers_orig_case_empty_value() {
+        let mut headers = HeaderMap::new();
+        let name = http::header::HeaderName::from_static("x-empty");
+        headers.insert(&name, "".parse().expect("parse empty"));
+        let mut orig_cases = HeaderCaseMap::default();
+        orig_cases.insert(name, Bytes::from_static(b"X-EmptY"));
+
+        let mut dst = Vec::new();
+        super::write_headers_original_case(&headers, &orig_cases, &mut dst, false);
+
+        assert_eq!(
+            dst, b"X-EmptY:\r\n",
+            "there should be no space between the colon and CRLF"
+        );
+    }
+
+    #[test]
+    fn test_write_headers_orig_case_multiple_entries() {
+        let mut headers = HeaderMap::new();
+        let name = http::header::HeaderName::from_static("x-empty");
+        headers.insert(&name, "a".parse().unwrap());
+        headers.append(&name, "b".parse().unwrap());
+
+        let mut orig_cases = HeaderCaseMap::default();
+        orig_cases.insert(name.clone(), Bytes::from_static(b"X-Empty"));
+        orig_cases.append(name, Bytes::from_static(b"X-EMPTY"));
+
+        let mut dst = Vec::new();
+        super::write_headers_original_case(&headers, &orig_cases, &mut dst, false);
+
+        assert_eq!(dst, b"X-Empty: a\r\nX-EMPTY: b\r\n");
+    }
+
     #[cfg(feature = "nightly")]
     use test::Bencher;
 
@@ -1754,6 +2501,13 @@
                 ParseContext {
                     cached_headers: &mut headers,
                     req_method: &mut None,
+                    h1_parser_config: Default::default(),
+                    preserve_header_case: false,
+                    h09_responses: false,
+                    #[cfg(feature = "ffi")]
+                    on_informational: &mut None,
+                    #[cfg(feature = "ffi")]
+                    raw_headers: false,
                 },
             )
             .unwrap()
@@ -1787,6 +2541,13 @@
                 ParseContext {
                     cached_headers: &mut headers,
                     req_method: &mut None,
+                    h1_parser_config: Default::default(),
+                    preserve_header_case: false,
+                    h09_responses: false,
+                    #[cfg(feature = "ffi")]
+                    on_informational: &mut None,
+                    #[cfg(feature = "ffi")]
+                    raw_headers: false,
                 },
             )
             .unwrap()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h2/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h2/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h2/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h2/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,17 +2,21 @@
 #[cfg(feature = "runtime")]
 use std::time::Duration;
 
+use bytes::Bytes;
 use futures_channel::{mpsc, oneshot};
 use futures_util::future::{self, Either, FutureExt as _, TryFutureExt as _};
 use futures_util::stream::StreamExt as _;
 use h2::client::{Builder, SendRequest};
+use http::{Method, StatusCode};
 use tokio::io::{AsyncRead, AsyncWrite};
 
-use super::{decode_content_length, ping, PipeToSendStream, SendBuf};
+use super::{ping, H2Upgraded, PipeToSendStream, SendBuf};
 use crate::body::HttpBody;
-use crate::common::{task, Exec, Future, Never, Pin, Poll};
+use crate::common::{exec::Exec, task, Future, Never, Pin, Poll};
 use crate::headers;
+use crate::proto::h2::UpgradedSendStream;
 use crate::proto::Dispatched;
+use crate::upgrade::Upgraded;
 use crate::{Body, Request, Response};
 
 type ClientRx<B> = crate::client::dispatch::Receiver<Request<B>, Response<Body>>;
@@ -44,6 +48,7 @@
     pub(crate) keep_alive_timeout: Duration,
     #[cfg(feature = "runtime")]
     pub(crate) keep_alive_while_idle: bool,
+    pub(crate) max_concurrent_reset_streams: Option<usize>,
 }
 
 impl Default for Config {
@@ -59,10 +64,40 @@
             keep_alive_timeout: Duration::from_secs(20),
             #[cfg(feature = "runtime")]
             keep_alive_while_idle: false,
+            max_concurrent_reset_streams: None,
         }
     }
 }
 
+fn new_builder(config: &Config) -> Builder {
+    let mut builder = Builder::default();
+    builder
+        .initial_window_size(config.initial_stream_window_size)
+        .initial_connection_window_size(config.initial_conn_window_size)
+        .max_frame_size(config.max_frame_size)
+        .enable_push(false);
+    if let Some(max) = config.max_concurrent_reset_streams {
+        builder.max_concurrent_reset_streams(max);
+    }
+    builder
+}
+
+fn new_ping_config(config: &Config) -> ping::Config {
+    ping::Config {
+        bdp_initial_window: if config.adaptive_window {
+            Some(config.initial_stream_window_size)
+        } else {
+            None
+        },
+        #[cfg(feature = "runtime")]
+        keep_alive_interval: config.keep_alive_interval,
+        #[cfg(feature = "runtime")]
+        keep_alive_timeout: config.keep_alive_timeout,
+        #[cfg(feature = "runtime")]
+        keep_alive_while_idle: config.keep_alive_while_idle,
+    }
+}
+
 pub(crate) async fn handshake<T, B>(
     io: T,
     req_rx: ClientRx<B>,
@@ -74,11 +109,7 @@
     B: HttpBody,
     B::Data: Send + 'static,
 {
-    let (h2_tx, mut conn) = Builder::default()
-        .initial_window_size(config.initial_stream_window_size)
-        .initial_connection_window_size(config.initial_conn_window_size)
-        .max_frame_size(config.max_frame_size)
-        .enable_push(false)
+    let (h2_tx, mut conn) = new_builder(config)
         .handshake::<_, SendBuf<B::Data>>(io)
         .await
         .map_err(crate::Error::new_h2)?;
@@ -96,21 +127,9 @@
         }
     });
 
-    let ping_config = ping::Config {
-        bdp_initial_window: if config.adaptive_window {
-            Some(config.initial_stream_window_size)
-        } else {
-            None
-        },
-        #[cfg(feature = "runtime")]
-        keep_alive_interval: config.keep_alive_interval,
-        #[cfg(feature = "runtime")]
-        keep_alive_timeout: config.keep_alive_timeout,
-        #[cfg(feature = "runtime")]
-        keep_alive_while_idle: config.keep_alive_while_idle,
-    };
+    let ping_config = new_ping_config(&config);
 
-    let ping = if ping_config.is_enabled() {
+    let (conn, ping) = if ping_config.is_enabled() {
         let pp = conn.ping_pong().expect("conn.ping_pong");
         let (recorder, mut ponger) = ping::channel(pp, ping_config);
 
@@ -130,16 +149,13 @@
 
             Pin::new(&mut conn).poll(cx)
         });
-        let conn = conn.map_err(|e| debug!("connection error: {}", e));
-
-        exec.execute(conn_task(conn, conn_drop_rx, cancel_tx));
-        recorder
+        (Either::Left(conn), recorder)
     } else {
-        let conn = conn.map_err(|e| debug!("connection error: {}", e));
-
-        exec.execute(conn_task(conn, conn_drop_rx, cancel_tx));
-        ping::disabled()
+        (Either::Right(conn), ping::disabled())
     };
+    let conn = conn.map_err(|e| debug!("connection error: {}", e));
+
+    exec.execute(conn_task(conn, conn_drop_rx, cancel_tx));
 
     Ok(ClientTask {
         ping,
@@ -206,7 +222,7 @@
                 }
             };
 
-            match Pin::new(&mut self.req_rx).poll_next(cx) {
+            match self.req_rx.poll_recv(cx) {
                 Poll::Ready(Some((req, cb))) => {
                     // check that future hasn't been canceled already
                     if cb.is_canceled() {
@@ -221,8 +237,25 @@
                             headers::set_content_length_if_missing(req.headers_mut(), len);
                         }
                     }
+
+                    let is_connect = req.method() == Method::CONNECT;
                     let eos = body.is_end_stream();
-                    let (fut, body_tx) = match self.h2_tx.send_request(req, eos) {
+                    let ping = self.ping.clone();
+
+                    if is_connect {
+                        if headers::content_length_parse_all(req.headers())
+                            .map_or(false, |len| len != 0)
+                        {
+                            warn!("h2 connect request with non-zero body not supported");
+                            cb.send(Err((
+                                crate::Error::new_h2(h2::Reason::INTERNAL_ERROR.into()),
+                                None,
+                            )));
+                            continue;
+                        }
+                    }
+
+                    let (fut, body_tx) = match self.h2_tx.send_request(req, !is_connect && eos) {
                         Ok(ok) => ok,
                         Err(err) => {
                             debug!("client send request error: {}", err);
@@ -231,45 +264,81 @@
                         }
                     };
 
-                    let ping = self.ping.clone();
-                    if !eos {
-                        let mut pipe = Box::pin(PipeToSendStream::new(body, body_tx)).map(|res| {
-                            if let Err(e) = res {
-                                debug!("client request body error: {}", e);
-                            }
-                        });
-
-                        // eagerly see if the body pipe is ready and
-                        // can thus skip allocating in the executor
-                        match Pin::new(&mut pipe).poll(cx) {
-                            Poll::Ready(_) => (),
-                            Poll::Pending => {
-                                let conn_drop_ref = self.conn_drop_ref.clone();
-                                // keep the ping recorder's knowledge of an
-                                // "open stream" alive while this body is
-                                // still sending...
-                                let ping = ping.clone();
-                                let pipe = pipe.map(move |x| {
-                                    drop(conn_drop_ref);
-                                    drop(ping);
-                                    x
+                    let send_stream = if !is_connect {
+                        if !eos {
+                            let mut pipe =
+                                Box::pin(PipeToSendStream::new(body, body_tx)).map(|res| {
+                                    if let Err(e) = res {
+                                        debug!("client request body error: {}", e);
+                                    }
                                 });
-                                self.executor.execute(pipe);
+
+                            // eagerly see if the body pipe is ready and
+                            // can thus skip allocating in the executor
+                            match Pin::new(&mut pipe).poll(cx) {
+                                Poll::Ready(_) => (),
+                                Poll::Pending => {
+                                    let conn_drop_ref = self.conn_drop_ref.clone();
+                                    // keep the ping recorder's knowledge of an
+                                    // "open stream" alive while this body is
+                                    // still sending...
+                                    let ping = ping.clone();
+                                    let pipe = pipe.map(move |x| {
+                                        drop(conn_drop_ref);
+                                        drop(ping);
+                                        x
+                                    });
+                                    self.executor.execute(pipe);
+                                }
                             }
                         }
-                    }
+
+                        None
+                    } else {
+                        Some(body_tx)
+                    };
 
                     let fut = fut.map(move |result| match result {
                         Ok(res) => {
                             // record that we got the response headers
                             ping.record_non_data();
 
-                            let content_length = decode_content_length(res.headers());
-                            let res = res.map(|stream| {
-                                let ping = ping.for_stream(&stream);
-                                crate::Body::h2(stream, content_length, ping)
-                            });
-                            Ok(res)
+                            let content_length = headers::content_length_parse_all(res.headers());
+                            if let (Some(mut send_stream), StatusCode::OK) =
+                                (send_stream, res.status())
+                            {
+                                if content_length.map_or(false, |len| len != 0) {
+                                    warn!("h2 connect response with non-zero body not supported");
+
+                                    send_stream.send_reset(h2::Reason::INTERNAL_ERROR);
+                                    return Err((
+                                        crate::Error::new_h2(h2::Reason::INTERNAL_ERROR.into()),
+                                        None,
+                                    ));
+                                }
+                                let (parts, recv_stream) = res.into_parts();
+                                let mut res = Response::from_parts(parts, Body::empty());
+
+                                let (pending, on_upgrade) = crate::upgrade::pending();
+                                let io = H2Upgraded {
+                                    ping,
+                                    send_stream: unsafe { UpgradedSendStream::new(send_stream) },
+                                    recv_stream,
+                                    buf: Bytes::new(),
+                                };
+                                let upgraded = Upgraded::new(io, Bytes::new());
+
+                                pending.fulfill(upgraded);
+                                res.extensions_mut().insert(on_upgrade);
+
+                                Ok(res)
+                            } else {
+                                let res = res.map(|stream| {
+                                    let ping = ping.for_stream(&stream);
+                                    crate::Body::h2(stream, content_length.into(), ping)
+                                });
+                                Ok(res)
+                            }
                         }
                         Err(err) => {
                             ping.ensure_not_timed_out().map_err(|e| (e, None))?;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h2/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h2/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h2/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h2/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,29 @@
-use bytes::Buf;
-use h2::SendStream;
-use http::header::{
-    HeaderName, CONNECTION, PROXY_AUTHENTICATE, PROXY_AUTHORIZATION, TE, TRAILER,
-    TRANSFER_ENCODING, UPGRADE,
-};
+use bytes::{Buf, Bytes};
+use h2::{Reason, RecvStream, SendStream};
+use http::header::{HeaderName, CONNECTION, TE, TRAILER, TRANSFER_ENCODING, UPGRADE};
 use http::HeaderMap;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use std::error::Error as StdError;
-use std::io::IoSlice;
+use std::io::{self, Cursor, IoSlice};
+use std::mem;
+use std::task::Context;
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
-use super::DecodedLength;
 use crate::body::HttpBody;
 use crate::common::{task, Future, Pin, Poll};
-use crate::headers::content_length_parse_all;
+use crate::proto::h2::ping::Recorder;
 
-pub(crate) mod client;
 pub(crate) mod ping;
-pub(crate) mod server;
 
-pub(crate) use self::client::ClientTask;
-pub(crate) use self::server::Server;
+cfg_client! {
+    pub(crate) mod client;
+    pub(crate) use self::client::ClientTask;
+}
+
+cfg_server! {
+    pub(crate) mod server;
+    pub(crate) use self::server::Server;
+}
 
 /// Default initial stream window size defined in HTTP2 spec.
 pub(crate) const SPEC_WINDOW_SIZE: u32 = 65_535;
@@ -33,8 +37,6 @@
     let connection_headers = [
         HeaderName::from_lowercase(b"keep-alive").unwrap(),
         HeaderName::from_lowercase(b"proxy-connection").unwrap(),
-        PROXY_AUTHENTICATE,
-        PROXY_AUTHORIZATION,
         TRAILER,
         TRANSFER_ENCODING,
         UPGRADE,
@@ -79,26 +81,18 @@
     }
 }
 
-fn decode_content_length(headers: &HeaderMap) -> DecodedLength {
-    if let Some(len) = content_length_parse_all(headers) {
-        // If the length is u64::MAX, oh well, just reported chunked.
-        DecodedLength::checked_new(len).unwrap_or_else(|_| DecodedLength::CHUNKED)
-    } else {
-        DecodedLength::CHUNKED
-    }
-}
-
 // body adapters used by both Client and Server
 
-#[pin_project]
-struct PipeToSendStream<S>
-where
-    S: HttpBody,
-{
-    body_tx: SendStream<SendBuf<S::Data>>,
-    data_done: bool,
-    #[pin]
-    stream: S,
+pin_project! {
+    struct PipeToSendStream<S>
+    where
+        S: HttpBody,
+    {
+        body_tx: SendStream<SendBuf<S::Data>>,
+        data_done: bool,
+        #[pin]
+        stream: S,
+    }
 }
 
 impl<S> PipeToSendStream<S>
@@ -168,7 +162,7 @@
                             is_eos,
                         );
 
-                        let buf = SendBuf(Some(chunk));
+                        let buf = SendBuf::Buf(chunk);
                         me.body_tx
                             .send_data(buf, is_eos)
                             .map_err(crate::Error::new_body_write)?;
@@ -239,32 +233,236 @@
 
     fn send_eos_frame(&mut self) -> crate::Result<()> {
         trace!("send body eos");
-        self.send_data(SendBuf(None), true)
+        self.send_data(SendBuf::None, true)
             .map_err(crate::Error::new_body_write)
     }
 }
 
-struct SendBuf<B>(Option<B>);
+#[repr(usize)]
+enum SendBuf<B> {
+    Buf(B),
+    Cursor(Cursor<Box<[u8]>>),
+    None,
+}
 
 impl<B: Buf> Buf for SendBuf<B> {
     #[inline]
     fn remaining(&self) -> usize {
-        self.0.as_ref().map(|b| b.remaining()).unwrap_or(0)
+        match *self {
+            Self::Buf(ref b) => b.remaining(),
+            Self::Cursor(ref c) => Buf::remaining(c),
+            Self::None => 0,
+        }
     }
 
     #[inline]
-    fn bytes(&self) -> &[u8] {
-        self.0.as_ref().map(|b| b.bytes()).unwrap_or(&[])
+    fn chunk(&self) -> &[u8] {
+        match *self {
+            Self::Buf(ref b) => b.chunk(),
+            Self::Cursor(ref c) => c.chunk(),
+            Self::None => &[],
+        }
     }
 
     #[inline]
     fn advance(&mut self, cnt: usize) {
-        if let Some(b) = self.0.as_mut() {
-            b.advance(cnt)
+        match *self {
+            Self::Buf(ref mut b) => b.advance(cnt),
+            Self::Cursor(ref mut c) => c.advance(cnt),
+            Self::None => {}
+        }
+    }
+
+    fn chunks_vectored<'a>(&'a self, dst: &mut [IoSlice<'a>]) -> usize {
+        match *self {
+            Self::Buf(ref b) => b.chunks_vectored(dst),
+            Self::Cursor(ref c) => c.chunks_vectored(dst),
+            Self::None => 0,
+        }
+    }
+}
+
+struct H2Upgraded<B>
+where
+    B: Buf,
+{
+    ping: Recorder,
+    send_stream: UpgradedSendStream<B>,
+    recv_stream: RecvStream,
+    buf: Bytes,
+}
+
+impl<B> AsyncRead for H2Upgraded<B>
+where
+    B: Buf,
+{
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        read_buf: &mut ReadBuf<'_>,
+    ) -> Poll<Result<(), io::Error>> {
+        if self.buf.is_empty() {
+            self.buf = loop {
+                match ready!(self.recv_stream.poll_data(cx)) {
+                    None => return Poll::Ready(Ok(())),
+                    Some(Ok(buf)) if buf.is_empty() && !self.recv_stream.is_end_stream() => {
+                        continue
+                    }
+                    Some(Ok(buf)) => {
+                        self.ping.record_data(buf.len());
+                        break buf;
+                    }
+                    Some(Err(e)) => {
+                        return Poll::Ready(match e.reason() {
+                            Some(Reason::NO_ERROR) | Some(Reason::CANCEL) => Ok(()),
+                            Some(Reason::STREAM_CLOSED) => Err(io::ErrorKind::BrokenPipe.into()),
+                            _ => Err(h2_to_io_error(e)),
+                        })
+                    }
+                }
+            };
+        }
+        let cnt = std::cmp::min(self.buf.len(), read_buf.remaining());
+        read_buf.put_slice(&self.buf[..cnt]);
+        self.buf.advance(cnt);
+        let _ = self.recv_stream.flow_control().release_capacity(cnt);
+        Poll::Ready(Ok(()))
+    }
+}
+
+impl<B> AsyncWrite for H2Upgraded<B>
+where
+    B: Buf,
+{
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<Result<usize, io::Error>> {
+        if buf.is_empty() {
+            return Poll::Ready(Ok(0));
         }
+        self.send_stream.reserve_capacity(buf.len());
+
+        // We ignore all errors returned by `poll_capacity` and `write`, as we
+        // will get the correct from `poll_reset` anyway.
+        let cnt = match ready!(self.send_stream.poll_capacity(cx)) {
+            None => Some(0),
+            Some(Ok(cnt)) => self
+                .send_stream
+                .write(&buf[..cnt], false)
+                .ok()
+                .map(|()| cnt),
+            Some(Err(_)) => None,
+        };
+
+        if let Some(cnt) = cnt {
+            return Poll::Ready(Ok(cnt));
+        }
+
+        Poll::Ready(Err(h2_to_io_error(
+            match ready!(self.send_stream.poll_reset(cx)) {
+                Ok(Reason::NO_ERROR) | Ok(Reason::CANCEL) | Ok(Reason::STREAM_CLOSED) => {
+                    return Poll::Ready(Err(io::ErrorKind::BrokenPipe.into()))
+                }
+                Ok(reason) => reason.into(),
+                Err(e) => e,
+            },
+        )))
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn poll_shutdown(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<(), io::Error>> {
+        if self.send_stream.write(&[], true).is_ok() {
+            return Poll::Ready(Ok(()))
+        }
+
+        Poll::Ready(Err(h2_to_io_error(
+            match ready!(self.send_stream.poll_reset(cx)) {
+                Ok(Reason::NO_ERROR) => {
+                    return Poll::Ready(Ok(()))
+                }
+                Ok(Reason::CANCEL) | Ok(Reason::STREAM_CLOSED) => {
+                    return Poll::Ready(Err(io::ErrorKind::BrokenPipe.into()))
+                }
+                Ok(reason) => reason.into(),
+                Err(e) => e,
+            },
+        )))
+    }
+}
+
+fn h2_to_io_error(e: h2::Error) -> io::Error {
+    if e.is_io() {
+        e.into_io().unwrap()
+    } else {
+        io::Error::new(io::ErrorKind::Other, e)
+    }
+}
+
+struct UpgradedSendStream<B>(SendStream<SendBuf<Neutered<B>>>);
+
+impl<B> UpgradedSendStream<B>
+where
+    B: Buf,
+{
+    unsafe fn new(inner: SendStream<SendBuf<B>>) -> Self {
+        assert_eq!(mem::size_of::<B>(), mem::size_of::<Neutered<B>>());
+        Self(mem::transmute(inner))
+    }
+
+    fn reserve_capacity(&mut self, cnt: usize) {
+        unsafe { self.as_inner_unchecked().reserve_capacity(cnt) }
+    }
+
+    fn poll_capacity(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<usize, h2::Error>>> {
+        unsafe { self.as_inner_unchecked().poll_capacity(cx) }
+    }
+
+    fn poll_reset(&mut self, cx: &mut Context<'_>) -> Poll<Result<h2::Reason, h2::Error>> {
+        unsafe { self.as_inner_unchecked().poll_reset(cx) }
+    }
+
+    fn write(&mut self, buf: &[u8], end_of_stream: bool) -> Result<(), io::Error> {
+        let send_buf = SendBuf::Cursor(Cursor::new(buf.into()));
+        unsafe {
+            self.as_inner_unchecked()
+                .send_data(send_buf, end_of_stream)
+                .map_err(h2_to_io_error)
+        }
+    }
+
+    unsafe fn as_inner_unchecked(&mut self) -> &mut SendStream<SendBuf<B>> {
+        &mut *(&mut self.0 as *mut _ as *mut _)
+    }
+}
+
+#[repr(transparent)]
+struct Neutered<B> {
+    _inner: B,
+    impossible: Impossible,
+}
+
+enum Impossible {}
+
+unsafe impl<B> Send for Neutered<B> {}
+
+impl<B> Buf for Neutered<B> {
+    fn remaining(&self) -> usize {
+        match self.impossible {}
+    }
+
+    fn chunk(&self) -> &[u8] {
+        match self.impossible {}
     }
 
-    fn bytes_vectored<'a>(&'a self, dst: &mut [IoSlice<'a>]) -> usize {
-        self.0.as_ref().map(|b| b.bytes_vectored(dst)).unwrap_or(0)
+    fn advance(&mut self, _cnt: usize) {
+        match self.impossible {}
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h2/ping.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h2/ping.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h2/ping.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h2/ping.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,7 +33,7 @@
 
 use h2::{Ping, PingPong};
 #[cfg(feature = "runtime")]
-use tokio::time::{Delay, Instant};
+use tokio::time::{Instant, Sleep};
 
 type WindowSize = u32;
 
@@ -51,16 +51,22 @@
         bdp: wnd,
         max_bandwidth: 0.0,
         rtt: 0.0,
+        ping_delay: Duration::from_millis(100),
+        stable_count: 0,
     });
 
-    let bytes = bdp.as_ref().map(|_| 0);
+    let (bytes, next_bdp_at) = if bdp.is_some() {
+        (Some(0), Some(Instant::now()))
+    } else {
+        (None, None)
+    };
 
     #[cfg(feature = "runtime")]
     let keep_alive = config.keep_alive_interval.map(|interval| KeepAlive {
         interval,
         timeout: config.keep_alive_timeout,
         while_idle: config.keep_alive_while_idle,
-        timer: tokio::time::delay_for(interval),
+        timer: Box::pin(tokio::time::sleep(interval)),
         state: KeepAliveState::Init,
     });
 
@@ -75,6 +81,7 @@
         is_keep_alive_timed_out: false,
         ping_pong,
         ping_sent_at: None,
+        next_bdp_at,
     }));
 
     (
@@ -125,6 +132,9 @@
     /// If `Some`, bdp is enabled, and this tracks how many bytes have been
     /// read during the current sample.
     bytes: Option<usize>,
+    /// We delay a variable amount of time between BDP pings. This allows us
+    /// to send less pings as the bandwidth stabilizes.
+    next_bdp_at: Option<Instant>,
 
     // keep-alive
     /// If `Some`, keep-alive is enabled, and the Instant is how long ago
@@ -143,6 +153,12 @@
     max_bandwidth: f64,
     /// Round trip time in seconds
     rtt: f64,
+    /// Delay the next ping by this amount.
+    ///
+    /// This will change depending on how stable the current bandwidth is.
+    ping_delay: Duration,
+    /// The count of ping round trips where BDP has stayed the same.
+    stable_count: u32,
 }
 
 #[cfg(feature = "runtime")]
@@ -156,7 +172,7 @@
     while_idle: bool,
 
     state: KeepAliveState,
-    timer: Delay,
+    timer: Pin<Box<Sleep>>,
 }
 
 #[cfg(feature = "runtime")]
@@ -207,6 +223,17 @@
         #[cfg(feature = "runtime")]
         locked.update_last_read_at();
 
+        // are we ready to send another bdp ping?
+        // if not, we don't need to record bytes either
+
+        if let Some(ref next_bdp_at) = locked.next_bdp_at {
+            if Instant::now() < *next_bdp_at {
+                return;
+            } else {
+                locked.next_bdp_at = None;
+            }
+        }
+
         if let Some(ref mut bytes) = locked.bytes {
             *bytes += len;
         } else {
@@ -236,6 +263,7 @@
 
     /// If the incoming stream is already closed, convert self into
     /// a disabled reporter.
+    #[cfg(feature = "client")]
     pub(super) fn for_stream(self, stream: &h2::RecvStream) -> Self {
         if stream.is_end_stream() {
             disabled()
@@ -264,6 +292,7 @@
 
 impl Ponger {
     pub(super) fn poll(&mut self, cx: &mut task::Context<'_>) -> Poll<Ponged> {
+        let now = Instant::now();
         let mut locked = self.shared.lock().unwrap();
         #[cfg(feature = "runtime")]
         let is_idle = self.is_idle();
@@ -281,13 +310,13 @@
             return Poll::Pending;
         }
 
-        let (bytes, rtt) = match locked.ping_pong.poll_pong(cx) {
+        match locked.ping_pong.poll_pong(cx) {
             Poll::Ready(Ok(_pong)) => {
-                let rtt = locked
+                let start = locked
                     .ping_sent_at
-                    .expect("pong received implies ping_sent_at")
-                    .elapsed();
+                    .expect("pong received implies ping_sent_at");
                 locked.ping_sent_at = None;
+                let rtt = now - start;
                 trace!("recv pong");
 
                 #[cfg(feature = "runtime")]
@@ -298,19 +327,20 @@
                     }
                 }
 
-                if self.bdp.is_some() {
+                if let Some(ref mut bdp) =  self.bdp {
                     let bytes = locked.bytes.expect("bdp enabled implies bytes");
                     locked.bytes = Some(0); // reset
                     trace!("received BDP ack; bytes = {}, rtt = {:?}", bytes, rtt);
-                    (bytes, rtt)
-                } else {
-                    // no bdp, done!
-                    return Poll::Pending;
+
+                    let update = bdp.calculate(bytes, rtt);
+                    locked.next_bdp_at = Some(now + bdp.ping_delay);
+                    if let Some(update) = update {
+                        return Poll::Ready(Ponged::SizeUpdate(update))
+                    }
                 }
             }
             Poll::Ready(Err(e)) => {
                 debug!("pong error: {}", e);
-                return Poll::Pending;
             }
             Poll::Pending => {
                 #[cfg(feature = "runtime")]
@@ -323,19 +353,11 @@
                         }
                     }
                 }
-
-                return Poll::Pending;
             }
-        };
-
-        drop(locked);
-
-        if let Some(bdp) = self.bdp.as_mut().and_then(|bdp| bdp.calculate(bytes, rtt)) {
-            Poll::Ready(Ponged::SizeUpdate(bdp))
-        } else {
-            // XXX: this doesn't register a waker...?
-            Poll::Pending
         }
+
+        // XXX: this doesn't register a waker...?
+        Poll::Pending
     }
 
     #[cfg(feature = "runtime")]
@@ -385,6 +407,7 @@
     fn calculate(&mut self, bytes: usize, rtt: Duration) -> Option<WindowSize> {
         // No need to do any math if we're at the limit.
         if self.bdp as usize == BDP_LIMIT {
+            self.stabilize_delay();
             return None;
         }
 
@@ -404,6 +427,7 @@
 
         if bw < self.max_bandwidth {
             // not a faster bandwidth, so don't update
+            self.stabilize_delay();
             return None;
         } else {
             self.max_bandwidth = bw;
@@ -414,11 +438,26 @@
         if bytes >= self.bdp as usize * 2 / 3 {
             self.bdp = (bytes * 2).min(BDP_LIMIT) as WindowSize;
             trace!("BDP increased to {}", self.bdp);
+
+            self.stable_count = 0;
+            self.ping_delay /= 2;
             Some(self.bdp)
         } else {
+            self.stabilize_delay();
             None
         }
     }
+
+    fn stabilize_delay(&mut self) {
+        if self.ping_delay < Duration::from_secs(10) {
+            self.stable_count += 1;
+
+            if self.stable_count >= 2 {
+                self.ping_delay *= 4;
+                self.stable_count = 0;
+            }
+        }
+    }
 }
 
 fn seconds(dur: Duration) -> f64 {
@@ -440,7 +479,7 @@
 
                 self.state = KeepAliveState::Scheduled;
                 let interval = shared.last_read_at() + self.interval;
-                self.timer.reset(interval);
+                self.timer.as_mut().reset(interval);
             }
             KeepAliveState::PingSent => {
                 if shared.is_ping_sent() {
@@ -449,7 +488,7 @@
 
                 self.state = KeepAliveState::Scheduled;
                 let interval = shared.last_read_at() + self.interval;
-                self.timer.reset(interval);
+                self.timer.as_mut().reset(interval);
             }
             KeepAliveState::Scheduled => (),
         }
@@ -471,7 +510,7 @@
                 shared.send_ping();
                 self.state = KeepAliveState::PingSent;
                 let timeout = Instant::now() + self.timeout;
-                self.timer.reset(timeout);
+                self.timer.as_mut().reset(timeout);
             }
             KeepAliveState::Init | KeepAliveState::PingSent => (),
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h2/server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h2/server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/h2/server.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/h2/server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,19 +3,24 @@
 #[cfg(feature = "runtime")]
 use std::time::Duration;
 
+use bytes::Bytes;
 use h2::server::{Connection, Handshake, SendResponse};
-use h2::Reason;
-use pin_project::pin_project;
+use h2::{Reason, RecvStream};
+use http::{Method, Request};
+use pin_project_lite::pin_project;
 use tokio::io::{AsyncRead, AsyncWrite};
 
-use super::{decode_content_length, ping, PipeToSendStream, SendBuf};
+use super::{ping, PipeToSendStream, SendBuf};
 use crate::body::HttpBody;
-use crate::common::exec::H2Exec;
-use crate::common::{task, Future, Pin, Poll};
+use crate::common::exec::ConnStreamExec;
+use crate::common::{date, task, Future, Pin, Poll};
 use crate::headers;
+use crate::proto::h2::ping::Recorder;
+use crate::proto::h2::{H2Upgraded, UpgradedSendStream};
 use crate::proto::Dispatched;
 use crate::service::HttpService;
 
+use crate::upgrade::{OnUpgrade, Pending, Upgraded};
 use crate::{Body, Response};
 
 // Our defaults are chosen for the "majority" case, which usually are not
@@ -57,15 +62,16 @@
     }
 }
 
-#[pin_project]
-pub(crate) struct Server<T, S, B, E>
-where
-    S: HttpService<Body>,
-    B: HttpBody,
-{
-    exec: E,
-    service: S,
-    state: State<T, B>,
+pin_project! {
+    pub(crate) struct Server<T, S, B, E>
+    where
+        S: HttpService<Body>,
+        B: HttpBody,
+    {
+        exec: E,
+        service: S,
+        state: State<T, B>,
+    }
 }
 
 enum State<T, B>
@@ -95,7 +101,7 @@
     S: HttpService<Body, ResBody = B>,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
     B: HttpBody + 'static,
-    E: H2Exec<S::Future, B>,
+    E: ConnStreamExec<S::Future, B>,
 {
     pub(crate) fn new(io: T, service: S, config: &Config, exec: E) -> Server<T, S, B, E> {
         let mut builder = h2::server::Builder::default();
@@ -136,7 +142,7 @@
         }
     }
 
-    pub fn graceful_shutdown(&mut self) {
+    pub(crate) fn graceful_shutdown(&mut self) {
         trace!("graceful_shutdown");
         match self.state {
             State::Handshaking { .. } => {
@@ -162,7 +168,7 @@
     S: HttpService<Body, ResBody = B>,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
     B: HttpBody + 'static,
-    E: H2Exec<S::Future, B>,
+    E: ConnStreamExec<S::Future, B>,
 {
     type Output = crate::Result<Dispatched>;
 
@@ -216,7 +222,7 @@
     where
         S: HttpService<Body, ResBody = B>,
         S::Error: Into<Box<dyn StdError + Send + Sync>>,
-        E: H2Exec<S::Future, B>,
+        E: ConnStreamExec<S::Future, B>,
     {
         if self.closing.is_none() {
             loop {
@@ -255,9 +261,9 @@
 
                 // When the service is ready, accepts an incoming request.
                 match ready!(self.conn.poll_accept(cx)) {
-                    Some(Ok((req, respond))) => {
+                    Some(Ok((req, mut respond))) => {
                         trace!("incoming request");
-                        let content_length = decode_content_length(req.headers());
+                        let content_length = headers::content_length_parse_all(req.headers());
                         let ping = self
                             .ping
                             .as_ref()
@@ -267,8 +273,36 @@
                         // Record the headers received
                         ping.record_non_data();
 
-                        let req = req.map(|stream| crate::Body::h2(stream, content_length, ping));
-                        let fut = H2Stream::new(service.call(req), respond);
+                        let is_connect = req.method() == Method::CONNECT;
+                        let (mut parts, stream) = req.into_parts();
+                        let (req, connect_parts) = if !is_connect {
+                            (
+                                Request::from_parts(
+                                    parts,
+                                    crate::Body::h2(stream, content_length.into(), ping),
+                                ),
+                                None,
+                            )
+                        } else {
+                            if content_length.map_or(false, |len| len != 0) {
+                                warn!("h2 connect request with non-zero body not supported");
+                                respond.send_reset(h2::Reason::INTERNAL_ERROR);
+                                return Poll::Ready(Ok(()));
+                            }
+                            let (pending, upgrade) = crate::upgrade::pending();
+                            debug_assert!(parts.extensions.get::<OnUpgrade>().is_none());
+                            parts.extensions.insert(upgrade);
+                            (
+                                Request::from_parts(parts, crate::Body::empty()),
+                                Some(ConnectParts {
+                                    pending,
+                                    ping,
+                                    recv_stream: stream,
+                                }),
+                            )
+                        };
+
+                        let fut = H2Stream::new(service.call(req), connect_parts, respond);
                         exec.execute_h2stream(fut);
                     }
                     Some(Err(e)) => {
@@ -315,34 +349,54 @@
     }
 }
 
-#[allow(missing_debug_implementations)]
-#[pin_project]
-pub struct H2Stream<F, B>
-where
-    B: HttpBody,
-{
-    reply: SendResponse<SendBuf<B::Data>>,
-    #[pin]
-    state: H2StreamState<F, B>,
+pin_project! {
+    #[allow(missing_debug_implementations)]
+    pub struct H2Stream<F, B>
+    where
+        B: HttpBody,
+    {
+        reply: SendResponse<SendBuf<B::Data>>,
+        #[pin]
+        state: H2StreamState<F, B>,
+    }
 }
 
-#[pin_project(project = H2StreamStateProj)]
-enum H2StreamState<F, B>
-where
-    B: HttpBody,
-{
-    Service(#[pin] F),
-    Body(#[pin] PipeToSendStream<B>),
+pin_project! {
+    #[project = H2StreamStateProj]
+    enum H2StreamState<F, B>
+    where
+        B: HttpBody,
+    {
+        Service {
+            #[pin]
+            fut: F,
+            connect_parts: Option<ConnectParts>,
+        },
+        Body {
+            #[pin]
+            pipe: PipeToSendStream<B>,
+        },
+    }
+}
+
+struct ConnectParts {
+    pending: Pending,
+    ping: Recorder,
+    recv_stream: RecvStream,
 }
 
 impl<F, B> H2Stream<F, B>
 where
     B: HttpBody,
 {
-    fn new(fut: F, respond: SendResponse<SendBuf<B::Data>>) -> H2Stream<F, B> {
+    fn new(
+        fut: F,
+        connect_parts: Option<ConnectParts>,
+        respond: SendResponse<SendBuf<B::Data>>,
+    ) -> H2Stream<F, B> {
         H2Stream {
             reply: respond,
-            state: H2StreamState::Service(fut),
+            state: H2StreamState::Service { fut, connect_parts },
         }
     }
 }
@@ -364,6 +418,7 @@
 where
     F: Future<Output = Result<Response<B>, E>>,
     B: HttpBody,
+    B::Data: 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
     E: Into<Box<dyn StdError + Send + Sync>>,
 {
@@ -371,7 +426,10 @@
         let mut me = self.project();
         loop {
             let next = match me.state.as_mut().project() {
-                H2StreamStateProj::Service(h) => {
+                H2StreamStateProj::Service {
+                    fut: h,
+                    connect_parts,
+                } => {
                     let res = match h.poll(cx) {
                         Poll::Ready(Ok(r)) => r,
                         Poll::Pending => {
@@ -400,7 +458,30 @@
                     // set Date header if it isn't already set...
                     res.headers_mut()
                         .entry(::http::header::DATE)
-                        .or_insert_with(crate::proto::h1::date::update_and_header_value);
+                        .or_insert_with(date::update_and_header_value);
+
+                    if let Some(connect_parts) = connect_parts.take() {
+                        if res.status().is_success() {
+                            if headers::content_length_parse_all(res.headers())
+                                .map_or(false, |len| len != 0)
+                            {
+                                warn!("h2 successful response to CONNECT request with body not supported");
+                                me.reply.send_reset(h2::Reason::INTERNAL_ERROR);
+                                return Poll::Ready(Err(crate::Error::new_user_header()));
+                            }
+                            let send_stream = reply!(me, res, false);
+                            connect_parts.pending.fulfill(Upgraded::new(
+                                H2Upgraded {
+                                    ping: connect_parts.ping,
+                                    recv_stream: connect_parts.recv_stream,
+                                    send_stream: unsafe { UpgradedSendStream::new(send_stream) },
+                                    buf: Bytes::new(),
+                                },
+                                Bytes::new(),
+                            ));
+                            return Poll::Ready(Ok(()));
+                        }
+                    }
 
                     // automatically set Content-Length from body...
                     if let Some(len) = body.size_hint().exact() {
@@ -409,13 +490,15 @@
 
                     if !body.is_end_stream() {
                         let body_tx = reply!(me, res, false);
-                        H2StreamState::Body(PipeToSendStream::new(body, body_tx))
+                        H2StreamState::Body {
+                            pipe: PipeToSendStream::new(body, body_tx),
+                        }
                     } else {
                         reply!(me, res, true);
                         return Poll::Ready(Ok(()));
                     }
                 }
-                H2StreamStateProj::Body(pipe) => {
+                H2StreamStateProj::Body { pipe } => {
                     return pipe.poll(cx);
                 }
             };
@@ -428,6 +511,7 @@
 where
     F: Future<Output = Result<Response<B>, E>>,
     B: HttpBody,
+    B::Data: 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
     E: Into<Box<dyn StdError + Send + Sync>>,
 {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/proto/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/proto/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,34 +1,48 @@
 //! Pieces pertaining to the HTTP message protocol.
-use http::{HeaderMap, Method, StatusCode, Uri, Version};
 
-pub(crate) use self::body_length::DecodedLength;
-pub(crate) use self::h1::{dispatch, Conn, ServerTransaction};
+cfg_http1! {
+    pub(crate) mod h1;
 
-pub(crate) mod h1;
-pub(crate) mod h2;
+    pub(crate) use self::h1::Conn;
+
+    #[cfg(feature = "client")]
+    pub(crate) use self::h1::dispatch;
+    #[cfg(feature = "server")]
+    pub(crate) use self::h1::ServerTransaction;
+}
+
+cfg_http2! {
+    pub(crate) mod h2;
+}
 
 /// An Incoming Message head. Includes request/status line, and headers.
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct MessageHead<S> {
+#[derive(Debug, Default)]
+pub(crate) struct MessageHead<S> {
     /// HTTP version of the message.
-    pub version: Version,
+    pub(crate) version: http::Version,
     /// Subject (request line or status line) of Incoming message.
-    pub subject: S,
+    pub(crate) subject: S,
     /// Headers of the Incoming message.
-    pub headers: HeaderMap,
+    pub(crate) headers: http::HeaderMap,
+    /// Extensions.
+    extensions: http::Extensions,
 }
 
 /// An incoming request message.
-pub type RequestHead = MessageHead<RequestLine>;
+#[cfg(feature = "http1")]
+pub(crate) type RequestHead = MessageHead<RequestLine>;
 
 #[derive(Debug, Default, PartialEq)]
-pub struct RequestLine(pub Method, pub Uri);
+#[cfg(feature = "http1")]
+pub(crate) struct RequestLine(pub(crate) http::Method, pub(crate) http::Uri);
 
 /// An incoming response message.
-pub type ResponseHead = MessageHead<StatusCode>;
+#[cfg(all(feature = "http1", feature = "client"))]
+pub(crate) type ResponseHead = MessageHead<http::StatusCode>;
 
 #[derive(Debug)]
-pub enum BodyLength {
+#[cfg(feature = "http1")]
+pub(crate) enum BodyLength {
     /// Content-Length
     Known(u64),
     /// Transfer-Encoding: chunked (if h1)
@@ -40,106 +54,17 @@
     /// Dispatcher completely shutdown connection.
     Shutdown,
     /// Dispatcher has pending upgrade, and so did not shutdown.
+    #[cfg(feature = "http1")]
     Upgrade(crate::upgrade::Pending),
 }
 
-/// A separate module to encapsulate the invariants of the DecodedLength type.
-mod body_length {
-    use std::fmt;
-
-    #[derive(Clone, Copy, PartialEq, Eq)]
-    pub(crate) struct DecodedLength(u64);
-
-    const MAX_LEN: u64 = std::u64::MAX - 2;
-
-    impl DecodedLength {
-        pub(crate) const CLOSE_DELIMITED: DecodedLength = DecodedLength(::std::u64::MAX);
-        pub(crate) const CHUNKED: DecodedLength = DecodedLength(::std::u64::MAX - 1);
-        pub(crate) const ZERO: DecodedLength = DecodedLength(0);
-
-        #[cfg(test)]
-        pub(crate) fn new(len: u64) -> Self {
-            debug_assert!(len <= MAX_LEN);
-            DecodedLength(len)
-        }
-
-        /// Takes the length as a content-length without other checks.
-        ///
-        /// Should only be called if previously confirmed this isn't
-        /// CLOSE_DELIMITED or CHUNKED.
-        #[inline]
-        pub(crate) fn danger_len(self) -> u64 {
-            debug_assert!(self.0 < Self::CHUNKED.0);
-            self.0
-        }
-
-        /// Converts to an Option<u64> representing a Known or Unknown length.
-        pub(crate) fn into_opt(self) -> Option<u64> {
-            match self {
-                DecodedLength::CHUNKED | DecodedLength::CLOSE_DELIMITED => None,
-                DecodedLength(known) => Some(known),
-            }
-        }
-
-        /// Checks the `u64` is within the maximum allowed for content-length.
-        pub(crate) fn checked_new(len: u64) -> Result<Self, crate::error::Parse> {
-            if len <= MAX_LEN {
-                Ok(DecodedLength(len))
-            } else {
-                warn!("content-length bigger than maximum: {} > {}", len, MAX_LEN);
-                Err(crate::error::Parse::TooLarge)
-            }
-        }
-
-        pub(crate) fn sub_if(&mut self, amt: u64) {
-            match *self {
-                DecodedLength::CHUNKED | DecodedLength::CLOSE_DELIMITED => (),
-                DecodedLength(ref mut known) => {
-                    *known -= amt;
-                }
-            }
-        }
-    }
-
-    impl fmt::Debug for DecodedLength {
-        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-            match *self {
-                DecodedLength::CLOSE_DELIMITED => f.write_str("CLOSE_DELIMITED"),
-                DecodedLength::CHUNKED => f.write_str("CHUNKED"),
-                DecodedLength(n) => f.debug_tuple("DecodedLength").field(&n).finish(),
-            }
-        }
-    }
-
-    impl fmt::Display for DecodedLength {
-        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-            match *self {
-                DecodedLength::CLOSE_DELIMITED => f.write_str("close-delimited"),
-                DecodedLength::CHUNKED => f.write_str("chunked encoding"),
-                DecodedLength::ZERO => f.write_str("empty"),
-                DecodedLength(n) => write!(f, "content-length ({} bytes)", n),
-            }
-        }
-    }
-
-    #[cfg(test)]
-    mod tests {
-        use super::*;
-
-        #[test]
-        fn sub_if_known() {
-            let mut len = DecodedLength::new(30);
-            len.sub_if(20);
-
-            assert_eq!(len.0, 10);
-        }
-
-        #[test]
-        fn sub_if_chunked() {
-            let mut len = DecodedLength::CHUNKED;
-            len.sub_if(20);
-
-            assert_eq!(len, DecodedLength::CHUNKED);
-        }
+impl MessageHead<http::StatusCode> {
+    fn into_response<B>(self, body: B) -> http::Response<B> {
+        let mut res = http::Response::new(body);
+        *res.status_mut() = self.subject;
+        *res.headers_mut() = self.headers;
+        *res.version_mut() = self.version;
+        *res.extensions_mut() = self.extensions;
+        res
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/rt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/rt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/rt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/rt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,4 +5,8 @@
 //! If the `runtime` feature is disabled, the types in this module can be used
 //! to plug in other runtimes.
 
-pub use crate::common::Executor;
+/// An executor of futures.
+pub trait Executor<Fut> {
+    /// Place the future into the executor to be run.
+    fn execute(&self, fut: Fut);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/accept.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/accept.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/accept.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/accept.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
 #[cfg(feature = "stream")]
 use futures_core::Stream;
 #[cfg(feature = "stream")]
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
 use crate::common::{
     task::{self, Poll},
@@ -86,8 +86,12 @@
 where
     S: Stream<Item = Result<IO, E>>,
 {
-    #[pin_project]
-    struct FromStream<S>(#[pin] S);
+    pin_project! {
+        struct FromStream<S> {
+            #[pin]
+            stream: S,
+        }
+    }
 
     impl<S, IO, E> Accept for FromStream<S>
     where
@@ -99,9 +103,9 @@
             self: Pin<&mut Self>,
             cx: &mut task::Context<'_>,
         ) -> Poll<Option<Result<Self::Conn, Self::Error>>> {
-            self.project().0.poll_next(cx)
+            self.project().stream.poll_next(cx)
         }
     }
 
-    FromStream(stream)
+    FromStream { stream }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/conn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/conn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/conn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/conn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 //! ## Example
 //! A simple example that uses the `Http` struct to talk HTTP over a Tokio TCP stream
 //! ```no_run
-//! # #[cfg(feature = "runtime")]
+//! # #[cfg(all(feature = "http1", feature = "runtime"))]
 //! # mod rt {
 //! use http::{Request, Response, StatusCode};
 //! use hyper::{server::conn::Http, service::service_fn, Body};
@@ -28,7 +28,7 @@
 //!         tokio::task::spawn(async move {
 //!             if let Err(http_err) = Http::new()
 //!                     .http1_only(true)
-//!                     .keep_alive(true)
+//!                     .http1_keep_alive(true)
 //!                     .serve_connection(tcp_stream, service_fn(hello))
 //!                     .await {
 //!                 eprintln!("Error while serving HTTP connection: {}", http_err);
@@ -45,24 +45,30 @@
 
 use std::error::Error as StdError;
 use std::fmt;
-use std::mem;
+#[cfg(not(all(feature = "http1", feature = "http2")))]
+use std::marker::PhantomData;
 #[cfg(feature = "tcp")]
 use std::net::SocketAddr;
-#[cfg(feature = "runtime")]
+#[cfg(all(feature = "runtime", feature = "http2"))]
 use std::time::Duration;
 
 use bytes::Bytes;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::{AsyncRead, AsyncWrite};
 
-use super::Accept;
+use super::accept::Accept;
 use crate::body::{Body, HttpBody};
-use crate::common::exec::{Exec, H2Exec, NewSvcExec};
+use crate::common::exec::{ConnStreamExec, Exec, NewSvcExec};
+#[cfg(feature = "http2")]
 use crate::common::io::Rewind;
+#[cfg(not(all(feature = "http1", feature = "http2")))]
+use crate::common::Never;
 use crate::common::{task, Future, Pin, Poll, Unpin};
+#[cfg(all(feature = "http1", feature = "http2"))]
 use crate::error::{Kind, Parse};
 use crate::proto;
 use crate::service::{HttpService, MakeServiceRef};
+#[cfg(feature = "http1")]
 use crate::upgrade::Upgraded;
 
 use self::spawn_all::NewSvcTask;
@@ -84,7 +90,9 @@
     exec: E,
     h1_half_close: bool,
     h1_keep_alive: bool,
-    h1_writev: Option<bool>,
+    h1_title_case_headers: bool,
+    h1_preserve_header_case: bool,
+    #[cfg(feature = "http2")]
     h2_builder: proto::h2::server::Config,
     mode: ConnectionMode,
     max_buf_size: Option<usize>,
@@ -95,88 +103,116 @@
 #[derive(Clone, Debug, PartialEq)]
 enum ConnectionMode {
     /// Always use HTTP/1 and do not upgrade when a parse error occurs.
+    #[cfg(feature = "http1")]
     H1Only,
     /// Always use HTTP/2.
+    #[cfg(feature = "http2")]
     H2Only,
     /// Use HTTP/1 and try to upgrade to h2 when a parse error occurs.
+    #[cfg(all(feature = "http1", feature = "http2"))]
     Fallback,
 }
 
-/// A stream mapping incoming IOs to new services.
-///
-/// Yields `Connecting`s that are futures that should be put on a reactor.
-#[must_use = "streams do nothing unless polled"]
-#[pin_project]
-#[derive(Debug)]
-pub(super) struct Serve<I, S, E = Exec> {
-    #[pin]
-    incoming: I,
-    make_service: S,
-    protocol: Http<E>,
+pin_project! {
+    /// A stream mapping incoming IOs to new services.
+    ///
+    /// Yields `Connecting`s that are futures that should be put on a reactor.
+    #[must_use = "streams do nothing unless polled"]
+    #[derive(Debug)]
+    pub(super) struct Serve<I, S, E = Exec> {
+        #[pin]
+        incoming: I,
+        make_service: S,
+        protocol: Http<E>,
+    }
 }
 
-/// A future building a new `Service` to a `Connection`.
-///
-/// Wraps the future returned from `MakeService` into one that returns
-/// a `Connection`.
-#[must_use = "futures do nothing unless polled"]
-#[pin_project]
-#[derive(Debug)]
-pub struct Connecting<I, F, E = Exec> {
-    #[pin]
-    future: F,
-    io: Option<I>,
-    protocol: Http<E>,
+pin_project! {
+    /// A future building a new `Service` to a `Connection`.
+    ///
+    /// Wraps the future returned from `MakeService` into one that returns
+    /// a `Connection`.
+    #[must_use = "futures do nothing unless polled"]
+    #[derive(Debug)]
+    pub struct Connecting<I, F, E = Exec> {
+        #[pin]
+        future: F,
+        io: Option<I>,
+        protocol: Http<E>,
+    }
 }
 
-#[must_use = "futures do nothing unless polled"]
-#[pin_project]
-#[derive(Debug)]
-pub(super) struct SpawnAll<I, S, E> {
-    // TODO: re-add `pub(super)` once rustdoc can handle this.
-    //
-    // See https://github.com/rust-lang/rust/issues/64705
-    #[pin]
-    pub serve: Serve<I, S, E>,
+pin_project! {
+    #[must_use = "futures do nothing unless polled"]
+    #[derive(Debug)]
+    pub(super) struct SpawnAll<I, S, E> {
+        // TODO: re-add `pub(super)` once rustdoc can handle this.
+        //
+        // See https://github.com/rust-lang/rust/issues/64705
+        #[pin]
+        pub(super) serve: Serve<I, S, E>,
+    }
 }
 
-/// A future binding a connection with a Service.
-///
-/// Polling this future will drive HTTP forward.
-#[must_use = "futures do nothing unless polled"]
-#[pin_project]
-pub struct Connection<T, S, E = Exec>
-where
-    S: HttpService<Body>,
-{
-    pub(super) conn: Option<ProtoServer<T, S::ResBody, S, E>>,
-    fallback: Fallback<E>,
+pin_project! {
+    /// A future binding a connection with a Service.
+    ///
+    /// Polling this future will drive HTTP forward.
+    #[must_use = "futures do nothing unless polled"]
+    pub struct Connection<T, S, E = Exec>
+    where
+        S: HttpService<Body>,
+    {
+        pub(super) conn: Option<ProtoServer<T, S::ResBody, S, E>>,
+        fallback: Fallback<E>,
+    }
 }
 
-#[pin_project(project = ProtoServerProj)]
-pub(super) enum ProtoServer<T, B, S, E = Exec>
-where
-    S: HttpService<Body>,
-    B: HttpBody,
-{
-    H1(
-        #[pin]
-        proto::h1::Dispatcher<
-            proto::h1::dispatch::Server<S, Body>,
-            B,
-            T,
-            proto::ServerTransaction,
-        >,
-    ),
-    H2(#[pin] proto::h2::Server<Rewind<T>, S, B, E>),
+#[cfg(feature = "http1")]
+type Http1Dispatcher<T, B, S> =
+    proto::h1::Dispatcher<proto::h1::dispatch::Server<S, Body>, B, T, proto::ServerTransaction>;
+
+#[cfg(not(feature = "http1"))]
+type Http1Dispatcher<T, B, S> = (Never, PhantomData<(T, Box<Pin<B>>, Box<Pin<S>>)>);
+
+#[cfg(feature = "http2")]
+type Http2Server<T, B, S, E> = proto::h2::Server<Rewind<T>, S, B, E>;
+
+#[cfg(not(feature = "http2"))]
+type Http2Server<T, B, S, E> = (
+    Never,
+    PhantomData<(T, Box<Pin<S>>, Box<Pin<B>>, Box<Pin<E>>)>,
+);
+
+pin_project! {
+    #[project = ProtoServerProj]
+    pub(super) enum ProtoServer<T, B, S, E = Exec>
+    where
+        S: HttpService<Body>,
+        B: HttpBody,
+    {
+        H1 {
+            #[pin]
+            h1: Http1Dispatcher<T, B, S>,
+        },
+        H2 {
+            #[pin]
+            h2: Http2Server<T, B, S, E>,
+        },
+    }
 }
 
+#[cfg(all(feature = "http1", feature = "http2"))]
 #[derive(Clone, Debug)]
 enum Fallback<E> {
     ToHttp2(proto::h2::server::Config, E),
     Http1Only,
 }
 
+#[cfg(not(all(feature = "http1", feature = "http2")))]
+type Fallback<E> = PhantomData<E>;
+
+#[cfg(all(feature = "http1", feature = "http2"))]
 impl<E> Fallback<E> {
     fn to_h2(&self) -> bool {
         match *self {
@@ -186,6 +222,7 @@
     }
 }
 
+#[cfg(all(feature = "http1", feature = "http2"))]
 impl<E> Unpin for Fallback<E> {}
 
 /// Deconstructed parts of a `Connection`.
@@ -220,9 +257,11 @@
             exec: Exec::Default,
             h1_half_close: false,
             h1_keep_alive: true,
-            h1_writev: None,
+            h1_title_case_headers: false,
+            h1_preserve_header_case: false,
+            #[cfg(feature = "http2")]
             h2_builder: Default::default(),
-            mode: ConnectionMode::Fallback,
+            mode: ConnectionMode::default(),
             max_buf_size: None,
             pipeline_flush: false,
         }
@@ -233,11 +272,16 @@
     /// Sets whether HTTP1 is required.
     ///
     /// Default is false
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
     pub fn http1_only(&mut self, val: bool) -> &mut Self {
         if val {
             self.mode = ConnectionMode::H1Only;
         } else {
-            self.mode = ConnectionMode::Fallback;
+            #[cfg(feature = "http2")]
+            {
+                self.mode = ConnectionMode::Fallback;
+            }
         }
         self
     }
@@ -250,6 +294,8 @@
     /// detects an EOF in the middle of a request.
     ///
     /// Default is `false`.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
     pub fn http1_half_close(&mut self, val: bool) -> &mut Self {
         self.h1_half_close = val;
         self
@@ -258,44 +304,52 @@
     /// Enables or disables HTTP/1 keep-alive.
     ///
     /// Default is true.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
     pub fn http1_keep_alive(&mut self, val: bool) -> &mut Self {
         self.h1_keep_alive = val;
         self
     }
 
-    // renamed due different semantics of http2 keep alive
-    #[doc(hidden)]
-    #[deprecated(note = "renamed to `http1_keep_alive`")]
-    pub fn keep_alive(&mut self, val: bool) -> &mut Self {
-        self.http1_keep_alive(val)
+    /// Set whether HTTP/1 connections will write header names as title case at
+    /// the socket level.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_title_case_headers(&mut self, enabled: bool) -> &mut Self {
+        self.h1_title_case_headers = enabled;
+        self
     }
 
-    /// Set whether HTTP/1 connections should try to use vectored writes,
-    /// or always flatten into a single buffer.
+    /// Set whether HTTP/1 connections will write header names as provided
+    /// at the socket level.
     ///
-    /// Note that setting this to false may mean more copies of body data,
-    /// but may also improve performance when an IO transport doesn't
-    /// support vectored writes well, such as most TLS implementations.
+    /// Note that this setting does not affect HTTP/2.
     ///
-    /// Setting this to true will force hyper to use queued strategy
-    /// which may eliminate unnecessary cloning on some TLS backends
-    ///
-    /// Default is `auto`. In this mode hyper will try to guess which
-    /// mode to use
-    #[inline]
-    pub fn http1_writev(&mut self, val: bool) -> &mut Self {
-        self.h1_writev = Some(val);
+    /// Default is false.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_preserve_header_case(&mut self, enabled: bool) -> &mut Self {
+        self.h1_preserve_header_case = enabled;
         self
     }
 
     /// Sets whether HTTP2 is required.
     ///
     /// Default is false
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_only(&mut self, val: bool) -> &mut Self {
         if val {
             self.mode = ConnectionMode::H2Only;
         } else {
-            self.mode = ConnectionMode::Fallback;
+            #[cfg(feature = "http1")]
+            {
+                self.mode = ConnectionMode::Fallback;
+            }
         }
         self
     }
@@ -308,6 +362,8 @@
     /// If not set, hyper will use a default.
     ///
     /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_initial_stream_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
         if let Some(sz) = sz.into() {
             self.h2_builder.adaptive_window = false;
@@ -321,6 +377,8 @@
     /// Passing `None` will do nothing.
     ///
     /// If not set, hyper will use a default.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_initial_connection_window_size(
         &mut self,
         sz: impl Into<Option<u32>>,
@@ -337,6 +395,8 @@
     /// Enabling this will override the limits set in
     /// `http2_initial_stream_window_size` and
     /// `http2_initial_connection_window_size`.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_adaptive_window(&mut self, enabled: bool) -> &mut Self {
         use proto::h2::SPEC_WINDOW_SIZE;
 
@@ -353,6 +413,8 @@
     /// Passing `None` will do nothing.
     ///
     /// If not set, hyper will use a default.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_max_frame_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
         if let Some(sz) = sz.into() {
             self.h2_builder.max_frame_size = sz;
@@ -366,6 +428,8 @@
     /// Default is no limit (`std::u32::MAX`). Passing `None` will do nothing.
     ///
     /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_MAX_CONCURRENT_STREAMS
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_max_concurrent_streams(&mut self, max: impl Into<Option<u32>>) -> &mut Self {
         self.h2_builder.max_concurrent_streams = max.into();
         self
@@ -382,6 +446,8 @@
     ///
     /// Requires the `runtime` cargo feature to be enabled.
     #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_keep_alive_interval(
         &mut self,
         interval: impl Into<Option<Duration>>,
@@ -401,6 +467,8 @@
     ///
     /// Requires the `runtime` cargo feature to be enabled.
     #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_keep_alive_timeout(&mut self, timeout: Duration) -> &mut Self {
         self.h2_builder.keep_alive_timeout = timeout;
         self
@@ -413,6 +481,8 @@
     /// # Panics
     ///
     /// The minimum value allowed is 8192. This method panics if the passed `max` is less than the minimum.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
     pub fn max_buf_size(&mut self, max: usize) -> &mut Self {
         assert!(
             max >= proto::h1::MINIMUM_MAX_BUFFER_SIZE,
@@ -440,7 +510,9 @@
             exec,
             h1_half_close: self.h1_half_close,
             h1_keep_alive: self.h1_keep_alive,
-            h1_writev: self.h1_writev,
+            h1_title_case_headers: self.h1_title_case_headers,
+            h1_preserve_header_case: self.h1_preserve_header_case,
+            #[cfg(feature = "http2")]
             h2_builder: self.h2_builder,
             mode: self.mode,
             max_buf_size: self.max_buf_size,
@@ -483,10 +555,11 @@
         Bd: HttpBody + 'static,
         Bd::Error: Into<Box<dyn StdError + Send + Sync>>,
         I: AsyncRead + AsyncWrite + Unpin,
-        E: H2Exec<S::Future, Bd>,
+        E: ConnStreamExec<S::Future, Bd>,
     {
-        let proto = match self.mode {
-            ConnectionMode::H1Only | ConnectionMode::Fallback => {
+        #[cfg(feature = "http1")]
+        macro_rules! h1 {
+            () => {{
                 let mut conn = proto::Conn::new(io);
                 if !self.h1_keep_alive {
                     conn.disable_keep_alive();
@@ -494,35 +567,49 @@
                 if self.h1_half_close {
                     conn.set_allow_half_close();
                 }
-                if let Some(writev) = self.h1_writev {
-                    if writev {
-                        conn.set_write_strategy_queue();
-                    } else {
-                        conn.set_write_strategy_flatten();
-                    }
+                if self.h1_title_case_headers {
+                    conn.set_title_case_headers();
+                }
+                if self.h1_preserve_header_case {
+                    conn.set_preserve_header_case();
                 }
                 conn.set_flush_pipeline(self.pipeline_flush);
                 if let Some(max) = self.max_buf_size {
                     conn.set_max_buf_size(max);
                 }
                 let sd = proto::h1::dispatch::Server::new(service);
-                ProtoServer::H1(proto::h1::Dispatcher::new(sd, conn))
-            }
+                ProtoServer::H1 {
+                    h1: proto::h1::Dispatcher::new(sd, conn),
+                }
+            }};
+        }
+
+        let proto = match self.mode {
+            #[cfg(feature = "http1")]
+            #[cfg(not(feature = "http2"))]
+            ConnectionMode::H1Only => h1!(),
+            #[cfg(feature = "http2")]
+            #[cfg(feature = "http1")]
+            ConnectionMode::H1Only | ConnectionMode::Fallback => h1!(),
+            #[cfg(feature = "http2")]
             ConnectionMode::H2Only => {
                 let rewind_io = Rewind::new(io);
                 let h2 =
                     proto::h2::Server::new(rewind_io, service, &self.h2_builder, self.exec.clone());
-                ProtoServer::H2(h2)
+                ProtoServer::H2 { h2 }
             }
         };
 
         Connection {
             conn: Some(proto),
+            #[cfg(all(feature = "http1", feature = "http2"))]
             fallback: if self.mode == ConnectionMode::Fallback {
                 Fallback::ToHttp2(self.h2_builder.clone(), self.exec.clone())
             } else {
                 Fallback::Http1Only
             },
+            #[cfg(not(all(feature = "http1", feature = "http2")))]
+            fallback: PhantomData,
         }
     }
 
@@ -534,7 +621,7 @@
         S: MakeServiceRef<IO, Body, ResBody = Bd>,
         S::Error: Into<Box<dyn StdError + Send + Sync>>,
         Bd: HttpBody,
-        E: H2Exec<<S::Service as HttpService<Body>>::Future, Bd>,
+        E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, Bd>,
     {
         Serve {
             incoming,
@@ -553,7 +640,7 @@
     I: AsyncRead + AsyncWrite + Unpin,
     B: HttpBody + 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
-    E: H2Exec<S::Future, B>,
+    E: ConnStreamExec<S::Future, B>,
 {
     /// Start a graceful shutdown process for this connection.
     ///
@@ -565,15 +652,22 @@
     /// This should only be called while the `Connection` future is still
     /// pending. If called after `Connection::poll` has resolved, this does
     /// nothing.
-    pub fn graceful_shutdown(self: Pin<&mut Self>) {
-        match self.project().conn {
-            Some(ProtoServer::H1(ref mut h1)) => {
+    pub fn graceful_shutdown(mut self: Pin<&mut Self>) {
+        match self.conn {
+            #[cfg(feature = "http1")]
+            Some(ProtoServer::H1 { ref mut h1, .. }) => {
                 h1.disable_keep_alive();
             }
-            Some(ProtoServer::H2(ref mut h2)) => {
+            #[cfg(feature = "http2")]
+            Some(ProtoServer::H2 { ref mut h2 }) => {
                 h2.graceful_shutdown();
             }
             None => (),
+
+            #[cfg(not(feature = "http1"))]
+            Some(ProtoServer::H1 { ref mut h1, .. }) => match h1.0 {},
+            #[cfg(not(feature = "http2"))]
+            Some(ProtoServer::H2 { ref mut h2 }) => match h2.0 {},
         }
     }
 
@@ -596,7 +690,8 @@
     /// This method will return a `None` if this connection is using an h2 protocol.
     pub fn try_into_parts(self) -> Option<Parts<I, S>> {
         match self.conn.unwrap() {
-            ProtoServer::H1(h1) => {
+            #[cfg(feature = "http1")]
+            ProtoServer::H1 { h1, .. } => {
                 let (io, read_buf, dispatch) = h1.into_inner();
                 Some(Parts {
                     io,
@@ -605,7 +700,10 @@
                     _inner: (),
                 })
             }
-            ProtoServer::H2(_h2) => None,
+            ProtoServer::H2 { .. } => None,
+
+            #[cfg(not(feature = "http1"))]
+            ProtoServer::H1 { h1, .. } => match h1.0 {},
         }
     }
 
@@ -627,20 +725,31 @@
         B: Unpin,
     {
         loop {
-            let polled = match *self.conn.as_mut().unwrap() {
-                ProtoServer::H1(ref mut h1) => h1.poll_without_shutdown(cx),
-                ProtoServer::H2(ref mut h2) => return Pin::new(h2).poll(cx).map_ok(|_| ()),
-            };
-            match ready!(polled) {
-                Ok(()) => return Poll::Ready(Ok(())),
-                Err(e) => match *e.kind() {
-                    Kind::Parse(Parse::VersionH2) if self.fallback.to_h2() => {
-                        self.upgrade_h2();
-                        continue;
+            match *self.conn.as_mut().unwrap() {
+                #[cfg(feature = "http1")]
+                ProtoServer::H1 { ref mut h1, .. } => match ready!(h1.poll_without_shutdown(cx)) {
+                    Ok(()) => return Poll::Ready(Ok(())),
+                    Err(e) => {
+                        #[cfg(feature = "http2")]
+                        match *e.kind() {
+                            Kind::Parse(Parse::VersionH2) if self.fallback.to_h2() => {
+                                self.upgrade_h2();
+                                continue;
+                            }
+                            _ => (),
+                        }
+
+                        return Poll::Ready(Err(e));
                     }
-                    _ => return Poll::Ready(Err(e)),
                 },
-            }
+                #[cfg(feature = "http2")]
+                ProtoServer::H2 { ref mut h2 } => return Pin::new(h2).poll(cx).map_ok(|_| ()),
+
+                #[cfg(not(feature = "http1"))]
+                ProtoServer::H1 { ref mut h1, .. } => match h1.0 {},
+                #[cfg(not(feature = "http2"))]
+                ProtoServer::H2 { ref mut h2 } => match h2.0 {},
+            };
         }
     }
 
@@ -659,13 +768,14 @@
         })
     }
 
+    #[cfg(all(feature = "http1", feature = "http2"))]
     fn upgrade_h2(&mut self) {
         trace!("Trying to upgrade connection to h2");
         let conn = self.conn.take();
 
         let (io, read_buf, dispatch) = match conn.unwrap() {
-            ProtoServer::H1(h1) => h1.into_inner(),
-            ProtoServer::H2(_h2) => {
+            ProtoServer::H1 { h1, .. } => h1.into_inner(),
+            ProtoServer::H2 { .. } => {
                 panic!("h2 cannot into_inner");
             }
         };
@@ -678,7 +788,7 @@
         let h2 = proto::h2::Server::new(rewind_io, dispatch.into_service(), builder, exec.clone());
 
         debug_assert!(self.conn.is_none());
-        self.conn = Some(ProtoServer::H2(h2));
+        self.conn = Some(ProtoServer::H2 { h2 });
     }
 
     /// Enable this connection to support higher-level HTTP upgrades.
@@ -699,7 +809,7 @@
     I: AsyncRead + AsyncWrite + Unpin + 'static,
     B: HttpBody + 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
-    E: H2Exec<S::Future, B>,
+    E: ConnStreamExec<S::Future, B>,
 {
     type Output = crate::Result<()>;
 
@@ -707,22 +817,32 @@
         loop {
             match ready!(Pin::new(self.conn.as_mut().unwrap()).poll(cx)) {
                 Ok(done) => {
-                    if let proto::Dispatched::Upgrade(pending) = done {
-                        // With no `Send` bound on `I`, we can't try to do
-                        // upgrades here. In case a user was trying to use
-                        // `Body::on_upgrade` with this API, send a special
-                        // error letting them know about that.
-                        pending.manual();
-                    }
+                    match done {
+                        proto::Dispatched::Shutdown => {}
+                        #[cfg(feature = "http1")]
+                        proto::Dispatched::Upgrade(pending) => {
+                            // With no `Send` bound on `I`, we can't try to do
+                            // upgrades here. In case a user was trying to use
+                            // `Body::on_upgrade` with this API, send a special
+                            // error letting them know about that.
+                            pending.manual();
+                        }
+                    };
                     return Poll::Ready(Ok(()));
                 }
-                Err(e) => match *e.kind() {
-                    Kind::Parse(Parse::VersionH2) if self.fallback.to_h2() => {
-                        self.upgrade_h2();
-                        continue;
+                Err(e) => {
+                    #[cfg(feature = "http1")]
+                    #[cfg(feature = "http2")]
+                    match *e.kind() {
+                        Kind::Parse(Parse::VersionH2) if self.fallback.to_h2() => {
+                            self.upgrade_h2();
+                            continue;
+                        }
+                        _ => (),
                     }
-                    _ => return Poll::Ready(Err(e)),
-                },
+
+                    return Poll::Ready(Err(e));
+                }
             }
         }
     }
@@ -736,12 +856,32 @@
         f.debug_struct("Connection").finish()
     }
 }
+
+// ===== impl ConnectionMode =====
+
+impl Default for ConnectionMode {
+    #[cfg(all(feature = "http1", feature = "http2"))]
+    fn default() -> ConnectionMode {
+        ConnectionMode::Fallback
+    }
+
+    #[cfg(all(feature = "http1", not(feature = "http2")))]
+    fn default() -> ConnectionMode {
+        ConnectionMode::H1Only
+    }
+
+    #[cfg(all(not(feature = "http1"), feature = "http2"))]
+    fn default() -> ConnectionMode {
+        ConnectionMode::H2Only
+    }
+}
+
 // ===== impl Serve =====
 
 impl<I, S, E> Serve<I, S, E> {
     /// Get a reference to the incoming stream.
     #[inline]
-    pub fn incoming_ref(&self) -> &I {
+    pub(super) fn incoming_ref(&self) -> &I {
         &self.incoming
     }
 
@@ -766,7 +906,7 @@
     IE: Into<Box<dyn StdError + Send + Sync>>,
     S: MakeServiceRef<IO, Body, ResBody = B>,
     B: HttpBody,
-    E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
+    E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
 {
     fn poll_next_(
         self: Pin<&mut Self>,
@@ -804,14 +944,14 @@
     S: HttpService<Body, ResBody = B>,
     B: HttpBody + 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
-    E: H2Exec<S::Future, B>,
+    E: ConnStreamExec<S::Future, B>,
 {
     type Output = Result<Connection<I, S, E>, FE>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
-        let me = self.project();
+        let mut me = self.project();
         let service = ready!(me.future.poll(cx))?;
-        let io = me.io.take().expect("polled after complete");
+        let io = Option::take(&mut me.io).expect("polled after complete");
         Poll::Ready(Ok(me.protocol.serve_connection(io, service)))
     }
 }
@@ -838,7 +978,7 @@
     IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     S: MakeServiceRef<IO, Body, ResBody = B>,
     B: HttpBody,
-    E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
+    E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
 {
     pub(super) fn poll_watch<W>(
         self: Pin<&mut Self>,
@@ -875,14 +1015,21 @@
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
     B: HttpBody + 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
-    E: H2Exec<S::Future, B>,
+    E: ConnStreamExec<S::Future, B>,
 {
     type Output = crate::Result<proto::Dispatched>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
         match self.project() {
-            ProtoServerProj::H1(s) => s.poll(cx),
-            ProtoServerProj::H2(s) => s.poll(cx),
+            #[cfg(feature = "http1")]
+            ProtoServerProj::H1 { h1, .. } => h1.poll(cx),
+            #[cfg(feature = "http2")]
+            ProtoServerProj::H2 { h2 } => h2.poll(cx),
+
+            #[cfg(not(feature = "http1"))]
+            ProtoServerProj::H1 { h1, .. } => match h1.0 {},
+            #[cfg(not(feature = "http2"))]
+            ProtoServerProj::H2 { h2 } => match h2.0 {},
         }
     }
 }
@@ -893,10 +1040,10 @@
 
     use super::{Connecting, UpgradeableConnection};
     use crate::body::{Body, HttpBody};
-    use crate::common::exec::H2Exec;
+    use crate::common::exec::ConnStreamExec;
     use crate::common::{task, Future, Pin, Poll, Unpin};
     use crate::service::HttpService;
-    use pin_project::pin_project;
+    use pin_project_lite::pin_project;
 
     // Used by `SpawnAll` to optionally watch a `Connection` future.
     //
@@ -920,7 +1067,7 @@
     where
         I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
         S: HttpService<Body>,
-        E: H2Exec<S::Future, S::ResBody>,
+        E: ConnStreamExec<S::Future, S::ResBody>,
         S::ResBody: 'static,
         <S::ResBody as HttpBody>::Error: Into<Box<dyn StdError + Send + Sync>>,
     {
@@ -941,23 +1088,36 @@
     // Users cannot import this type, nor the associated `NewSvcExec`. Instead,
     // a blanket implementation for `Executor<impl Future>` is sufficient.
 
-    #[pin_project]
-    #[allow(missing_debug_implementations)]
-    pub struct NewSvcTask<I, N, S: HttpService<Body>, E, W: Watcher<I, S, E>> {
-        #[pin]
-        state: State<I, N, S, E, W>,
+    pin_project! {
+        #[allow(missing_debug_implementations)]
+        pub struct NewSvcTask<I, N, S: HttpService<Body>, E, W: Watcher<I, S, E>> {
+            #[pin]
+            state: State<I, N, S, E, W>,
+        }
     }
 
-    #[pin_project(project = StateProj)]
-    pub enum State<I, N, S: HttpService<Body>, E, W: Watcher<I, S, E>> {
-        Connecting(#[pin] Connecting<I, N, E>, W),
-        Connected(#[pin] W::Future),
+    pin_project! {
+        #[project = StateProj]
+        pub(super) enum State<I, N, S: HttpService<Body>, E, W: Watcher<I, S, E>> {
+            Connecting {
+                #[pin]
+                connecting: Connecting<I, N, E>,
+                watcher: W,
+            },
+            Connected {
+                #[pin]
+                future: W::Future,
+            },
+        }
     }
 
     impl<I, N, S: HttpService<Body>, E, W: Watcher<I, S, E>> NewSvcTask<I, N, S, E, W> {
         pub(super) fn new(connecting: Connecting<I, N, E>, watcher: W) -> Self {
             NewSvcTask {
-                state: State::Connecting(connecting, watcher),
+                state: State::Connecting {
+                    connecting,
+                    watcher,
+                },
             }
         }
     }
@@ -970,7 +1130,7 @@
         S: HttpService<Body, ResBody = B>,
         B: HttpBody + 'static,
         B::Error: Into<Box<dyn StdError + Send + Sync>>,
-        E: H2Exec<S::Future, B>,
+        E: ConnStreamExec<S::Future, B>,
         W: Watcher<I, S, E>,
     {
         type Output = ();
@@ -984,7 +1144,10 @@
             loop {
                 let next = {
                     match me.state.as_mut().project() {
-                        StateProj::Connecting(connecting, watcher) => {
+                        StateProj::Connecting {
+                            connecting,
+                            watcher,
+                        } => {
                             let res = ready!(connecting.poll(cx));
                             let conn = match res {
                                 Ok(conn) => conn,
@@ -994,10 +1157,10 @@
                                     return Poll::Ready(());
                                 }
                             };
-                            let connected = watcher.watch(conn.with_upgrades());
-                            State::Connected(connected)
+                            let future = watcher.watch(conn.with_upgrades());
+                            State::Connected { future }
                         }
-                        StateProj::Connected(future) => {
+                        StateProj::Connected { future } => {
                             return future.poll(cx).map(|res| {
                                 if let Err(err) = res {
                                     debug!("connection error: {}", err);
@@ -1036,7 +1199,7 @@
         I: AsyncRead + AsyncWrite + Unpin,
         B: HttpBody + 'static,
         B::Error: Into<Box<dyn StdError + Send + Sync>>,
-        E: H2Exec<S::Future, B>,
+        E: ConnStreamExec<S::Future, B>,
     {
         /// Start a graceful shutdown process for this connection.
         ///
@@ -1054,7 +1217,7 @@
         I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
         B: HttpBody + 'static,
         B::Error: Into<Box<dyn StdError + Send + Sync>>,
-        E: super::H2Exec<S::Future, B>,
+        E: ConnStreamExec<S::Future, B>,
     {
         type Output = crate::Result<()>;
 
@@ -1062,23 +1225,33 @@
             loop {
                 match ready!(Pin::new(self.inner.conn.as_mut().unwrap()).poll(cx)) {
                     Ok(proto::Dispatched::Shutdown) => return Poll::Ready(Ok(())),
+                    #[cfg(feature = "http1")]
                     Ok(proto::Dispatched::Upgrade(pending)) => {
-                        let h1 = match mem::replace(&mut self.inner.conn, None) {
-                            Some(ProtoServer::H1(h1)) => h1,
-                            _ => unreachable!("Upgrade expects h1"),
+                        match self.inner.conn.take() {
+                            Some(ProtoServer::H1 { h1, .. }) => {
+                                let (io, buf, _) = h1.into_inner();
+                                pending.fulfill(Upgraded::new(io, buf));
+                                return Poll::Ready(Ok(()));
+                            }
+                            _ => {
+                                drop(pending);
+                                unreachable!("Upgrade expects h1")
+                            }
                         };
-
-                        let (io, buf, _) = h1.into_inner();
-                        pending.fulfill(Upgraded::new(io, buf));
-                        return Poll::Ready(Ok(()));
                     }
-                    Err(e) => match *e.kind() {
-                        Kind::Parse(Parse::VersionH2) if self.inner.fallback.to_h2() => {
-                            self.inner.upgrade_h2();
-                            continue;
+                    Err(e) => {
+                        #[cfg(feature = "http1")]
+                        #[cfg(feature = "http2")]
+                        match *e.kind() {
+                            Kind::Parse(Parse::VersionH2) if self.inner.fallback.to_h2() => {
+                                self.inner.upgrade_h2();
+                                continue;
+                            }
+                            _ => (),
                         }
-                        _ => return Poll::Ready(Err(e)),
-                    },
+
+                        return Poll::Ready(Err(e));
+                    }
                 }
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,7 +16,7 @@
 //!
 //! [`Server`](Server) accepts connections in both HTTP1 and HTTP2 by default.
 //!
-//! ## Example
+//! ## Examples
 //!
 //! ```no_run
 //! use std::convert::Infallible;
@@ -50,448 +50,117 @@
 //! # #[cfg(not(feature = "runtime"))]
 //! # fn main() {}
 //! ```
+//!
+//! If you don't need the connection and your service implements `Clone` you can use
+//! [`tower::make::Shared`] instead of `make_service_fn` which is a bit simpler:
+//!
+//! ```no_run
+//! # use std::convert::Infallible;
+//! # use std::net::SocketAddr;
+//! # use hyper::{Body, Request, Response, Server};
+//! # use hyper::service::{make_service_fn, service_fn};
+//! # use tower::make::Shared;
+//! # async fn handle(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
+//! #     Ok(Response::new(Body::from("Hello World")))
+//! # }
+//! # #[cfg(feature = "runtime")]
+//! #[tokio::main]
+//! async fn main() {
+//!     // Construct our SocketAddr to listen on...
+//!     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
+//!
+//!     // Shared is a MakeService that produces services by cloning an inner service...
+//!     let make_service = Shared::new(service_fn(handle));
+//!
+//!     // Then bind and serve...
+//!     let server = Server::bind(&addr).serve(make_service);
+//!
+//!     // And run forever...
+//!     if let Err(e) = server.await {
+//!         eprintln!("server error: {}", e);
+//!     }
+//! }
+//! # #[cfg(not(feature = "runtime"))]
+//! # fn main() {}
+//! ```
+//!
+//! Passing data to your request handler can be done like so:
+//!
+//! ```no_run
+//! use std::convert::Infallible;
+//! use std::net::SocketAddr;
+//! use hyper::{Body, Request, Response, Server};
+//! use hyper::service::{make_service_fn, service_fn};
+//! use hyper::server::conn::AddrStream;
+//!
+//! #[derive(Clone)]
+//! struct AppContext {
+//!     // Whatever data your application needs can go here
+//! }
+//!
+//! async fn handle(
+//!     context: AppContext,
+//!     addr: SocketAddr,
+//!     req: Request<Body>
+//! ) -> Result<Response<Body>, Infallible> {
+//!     Ok(Response::new(Body::from("Hello World")))
+//! }
+//!
+//! # #[cfg(feature = "runtime")]
+//! #[tokio::main]
+//! async fn main() {
+//!     let context = AppContext {
+//!         // ...
+//!     };
+//!
+//!     // A `MakeService` that produces a `Service` to handle each connection.
+//!     let make_service = make_service_fn(move |conn: &AddrStream| {
+//!         // We have to clone the context to share it with each invocation of
+//!         // `make_service`. If your data doesn't implement `Clone` consider using
+//!         // an `std::sync::Arc`.
+//!         let context = context.clone();
+//!
+//!         // You can grab the address of the incoming connection like so.
+//!         let addr = conn.remote_addr();
+//!
+//!         // Create a `Service` for responding to the request.
+//!         let service = service_fn(move |req| {
+//!             handle(context.clone(), addr, req)
+//!         });
+//!
+//!         // Return the service to hyper.
+//!         async move { Ok::<_, Infallible>(service) }
+//!     });
+//!
+//!     // Run the server like above...
+//!     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
+//!
+//!     let server = Server::bind(&addr).serve(make_service);
+//!
+//!     if let Err(e) = server.await {
+//!         eprintln!("server error: {}", e);
+//!     }
+//! }
+//! # #[cfg(not(feature = "runtime"))]
+//! # fn main() {}
+//! ```
+//!
+//! [`tower::make::Shared`]: https://docs.rs/tower/latest/tower/make/struct.Shared.html
 
 pub mod accept;
-pub mod conn;
-mod shutdown;
-#[cfg(feature = "tcp")]
-mod tcp;
-
-use std::error::Error as StdError;
-use std::fmt;
-#[cfg(feature = "tcp")]
-use std::net::{SocketAddr, TcpListener as StdTcpListener};
-
-#[cfg(feature = "tcp")]
-use std::time::Duration;
-
-use pin_project::pin_project;
-use tokio::io::{AsyncRead, AsyncWrite};
-
-use self::accept::Accept;
-use crate::body::{Body, HttpBody};
-use crate::common::exec::{Exec, H2Exec, NewSvcExec};
-use crate::common::{task, Future, Pin, Poll, Unpin};
-use crate::service::{HttpService, MakeServiceRef};
-// Renamed `Http` as `Http_` for now so that people upgrading don't see an
-// error that `hyper::server::Http` is private...
-use self::conn::{Http as Http_, NoopWatcher, SpawnAll};
-use self::shutdown::{Graceful, GracefulWatcher};
-#[cfg(feature = "tcp")]
-use self::tcp::AddrIncoming;
-
-/// A listening HTTP server that accepts connections in both HTTP1 and HTTP2 by default.
-///
-/// `Server` is a `Future` mapping a bound listener with a set of service
-/// handlers. It is built using the [`Builder`](Builder), and the future
-/// completes when the server has been shutdown. It should be run by an
-/// `Executor`.
-#[pin_project]
-pub struct Server<I, S, E = Exec> {
-    #[pin]
-    spawn_all: SpawnAll<I, S, E>,
-}
-
-/// A builder for a [`Server`](Server).
-#[derive(Debug)]
-pub struct Builder<I, E = Exec> {
-    incoming: I,
-    protocol: Http_<E>,
-}
 
-// ===== impl Server =====
+cfg_feature! {
+    #![any(feature = "http1", feature = "http2")]
 
-impl<I> Server<I, ()> {
-    /// Starts a [`Builder`](Builder) with the provided incoming stream.
-    pub fn builder(incoming: I) -> Builder<I> {
-        Builder {
-            incoming,
-            protocol: Http_::new(),
-        }
-    }
-}
-
-#[cfg(feature = "tcp")]
-impl Server<AddrIncoming, ()> {
-    /// Binds to the provided address, and returns a [`Builder`](Builder).
-    ///
-    /// # Panics
-    ///
-    /// This method will panic if binding to the address fails. For a method
-    /// to bind to an address and return a `Result`, see `Server::try_bind`.
-    pub fn bind(addr: &SocketAddr) -> Builder<AddrIncoming> {
-        let incoming = AddrIncoming::new(addr).unwrap_or_else(|e| {
-            panic!("error binding to {}: {}", addr, e);
-        });
-        Server::builder(incoming)
-    }
-
-    /// Tries to bind to the provided address, and returns a [`Builder`](Builder).
-    pub fn try_bind(addr: &SocketAddr) -> crate::Result<Builder<AddrIncoming>> {
-        AddrIncoming::new(addr).map(Server::builder)
-    }
-
-    /// Create a new instance from a `std::net::TcpListener` instance.
-    pub fn from_tcp(listener: StdTcpListener) -> Result<Builder<AddrIncoming>, crate::Error> {
-        AddrIncoming::from_std(listener).map(Server::builder)
-    }
-}
-
-#[cfg(feature = "tcp")]
-impl<S, E> Server<AddrIncoming, S, E> {
-    /// Returns the local address that this server is bound to.
-    pub fn local_addr(&self) -> SocketAddr {
-        self.spawn_all.local_addr()
-    }
-}
-
-impl<I, IO, IE, S, E, B> Server<I, S, E>
-where
-    I: Accept<Conn = IO, Error = IE>,
-    IE: Into<Box<dyn StdError + Send + Sync>>,
-    IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-    S: MakeServiceRef<IO, Body, ResBody = B>,
-    S::Error: Into<Box<dyn StdError + Send + Sync>>,
-    B: HttpBody + Send + Sync + 'static,
-    B::Error: Into<Box<dyn StdError + Send + Sync>>,
-    E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
-    E: NewSvcExec<IO, S::Future, S::Service, E, GracefulWatcher>,
-{
-    /// Prepares a server to handle graceful shutdown when the provided future
-    /// completes.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # fn main() {}
-    /// # #[cfg(feature = "tcp")]
-    /// # async fn run() {
-    /// # use hyper::{Body, Response, Server, Error};
-    /// # use hyper::service::{make_service_fn, service_fn};
-    /// # let make_service = make_service_fn(|_| async {
-    /// #     Ok::<_, Error>(service_fn(|_req| async {
-    /// #         Ok::<_, Error>(Response::new(Body::from("Hello World")))
-    /// #     }))
-    /// # });
-    /// // Make a server from the previous examples...
-    /// let server = Server::bind(&([127, 0, 0, 1], 3000).into())
-    ///     .serve(make_service);
-    ///
-    /// // Prepare some signal for when the server should start shutting down...
-    /// let (tx, rx) = tokio::sync::oneshot::channel::<()>();
-    /// let graceful = server
-    ///     .with_graceful_shutdown(async {
-    ///         rx.await.ok();
-    ///     });
-    ///
-    /// // Await the `server` receiving the signal...
-    /// if let Err(e) = graceful.await {
-    ///     eprintln!("server error: {}", e);
-    /// }
-    ///
-    /// // And later, trigger the signal by calling `tx.send(())`.
-    /// let _ = tx.send(());
-    /// # }
-    /// ```
-    pub fn with_graceful_shutdown<F>(self, signal: F) -> Graceful<I, S, F, E>
-    where
-        F: Future<Output = ()>,
-    {
-        Graceful::new(self.spawn_all, signal)
-    }
-}
-
-impl<I, IO, IE, S, B, E> Future for Server<I, S, E>
-where
-    I: Accept<Conn = IO, Error = IE>,
-    IE: Into<Box<dyn StdError + Send + Sync>>,
-    IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-    S: MakeServiceRef<IO, Body, ResBody = B>,
-    S::Error: Into<Box<dyn StdError + Send + Sync>>,
-    B: HttpBody + 'static,
-    B::Error: Into<Box<dyn StdError + Send + Sync>>,
-    E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
-    E: NewSvcExec<IO, S::Future, S::Service, E, NoopWatcher>,
-{
-    type Output = crate::Result<()>;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
-        self.project().spawn_all.poll_watch(cx, &NoopWatcher)
-    }
-}
-
-impl<I: fmt::Debug, S: fmt::Debug> fmt::Debug for Server<I, S> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Server")
-            .field("listener", &self.spawn_all.incoming_ref())
-            .finish()
-    }
-}
-
-// ===== impl Builder =====
-
-impl<I, E> Builder<I, E> {
-    /// Start a new builder, wrapping an incoming stream and low-level options.
-    ///
-    /// For a more convenient constructor, see [`Server::bind`](Server::bind).
-    pub fn new(incoming: I, protocol: Http_<E>) -> Self {
-        Builder { incoming, protocol }
-    }
-
-    /// Sets whether to use keep-alive for HTTP/1 connections.
-    ///
-    /// Default is `true`.
-    pub fn http1_keepalive(mut self, val: bool) -> Self {
-        self.protocol.http1_keep_alive(val);
-        self
-    }
-
-    /// Set whether HTTP/1 connections should support half-closures.
-    ///
-    /// Clients can chose to shutdown their write-side while waiting
-    /// for the server to respond. Setting this to `true` will
-    /// prevent closing the connection immediately if `read`
-    /// detects an EOF in the middle of a request.
-    ///
-    /// Default is `false`.
-    pub fn http1_half_close(mut self, val: bool) -> Self {
-        self.protocol.http1_half_close(val);
-        self
-    }
-
-    /// Set the maximum buffer size.
-    ///
-    /// Default is ~ 400kb.
-    pub fn http1_max_buf_size(mut self, val: usize) -> Self {
-        self.protocol.max_buf_size(val);
-        self
-    }
-
-    // Sets whether to bunch up HTTP/1 writes until the read buffer is empty.
-    //
-    // This isn't really desirable in most cases, only really being useful in
-    // silly pipeline benchmarks.
-    #[doc(hidden)]
-    pub fn http1_pipeline_flush(mut self, val: bool) -> Self {
-        self.protocol.pipeline_flush(val);
-        self
-    }
-
-    /// Set whether HTTP/1 connections should try to use vectored writes,
-    /// or always flatten into a single buffer.
-    ///
-    /// # Note
-    ///
-    /// Setting this to `false` may mean more copies of body data,
-    /// but may also improve performance when an IO transport doesn't
-    /// support vectored writes well, such as most TLS implementations.
-    ///
-    /// Setting this to true will force hyper to use queued strategy
-    /// which may eliminate unnecessary cloning on some TLS backends
-    ///
-    /// Default is `auto`. In this mode hyper will try to guess which
-    /// mode to use
-    pub fn http1_writev(mut self, val: bool) -> Self {
-        self.protocol.http1_writev(val);
-        self
-    }
-
-    /// Sets whether HTTP/1 is required.
-    ///
-    /// Default is `false`.
-    pub fn http1_only(mut self, val: bool) -> Self {
-        self.protocol.http1_only(val);
-        self
-    }
-
-    /// Sets whether HTTP/2 is required.
-    ///
-    /// Default is `false`.
-    pub fn http2_only(mut self, val: bool) -> Self {
-        self.protocol.http2_only(val);
-        self
-    }
-
-    /// Sets the [`SETTINGS_INITIAL_WINDOW_SIZE`][spec] option for HTTP2
-    /// stream-level flow control.
-    ///
-    /// Passing `None` will do nothing.
-    ///
-    /// If not set, hyper will use a default.
-    ///
-    /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE
-    pub fn http2_initial_stream_window_size(mut self, sz: impl Into<Option<u32>>) -> Self {
-        self.protocol.http2_initial_stream_window_size(sz.into());
-        self
-    }
-
-    /// Sets the max connection-level flow control for HTTP2
-    ///
-    /// Passing `None` will do nothing.
-    ///
-    /// If not set, hyper will use a default.
-    pub fn http2_initial_connection_window_size(mut self, sz: impl Into<Option<u32>>) -> Self {
-        self.protocol
-            .http2_initial_connection_window_size(sz.into());
-        self
-    }
-
-    /// Sets whether to use an adaptive flow control.
-    ///
-    /// Enabling this will override the limits set in
-    /// `http2_initial_stream_window_size` and
-    /// `http2_initial_connection_window_size`.
-    pub fn http2_adaptive_window(mut self, enabled: bool) -> Self {
-        self.protocol.http2_adaptive_window(enabled);
-        self
-    }
+    pub use self::server::{Builder, Server};
 
-    /// Sets the maximum frame size to use for HTTP2.
-    ///
-    /// Passing `None` will do nothing.
-    ///
-    /// If not set, hyper will use a default.
-    pub fn http2_max_frame_size(mut self, sz: impl Into<Option<u32>>) -> Self {
-        self.protocol.http2_max_frame_size(sz);
-        self
-    }
-
-    /// Sets the [`SETTINGS_MAX_CONCURRENT_STREAMS`][spec] option for HTTP2
-    /// connections.
-    ///
-    /// Default is no limit (`std::u32::MAX`). Passing `None` will do nothing.
-    ///
-    /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_MAX_CONCURRENT_STREAMS
-    pub fn http2_max_concurrent_streams(mut self, max: impl Into<Option<u32>>) -> Self {
-        self.protocol.http2_max_concurrent_streams(max.into());
-        self
-    }
-
-    /// Sets an interval for HTTP2 Ping frames should be sent to keep a
-    /// connection alive.
-    ///
-    /// Pass `None` to disable HTTP2 keep-alive.
-    ///
-    /// Default is currently disabled.
-    ///
-    /// # Cargo Feature
-    ///
-    /// Requires the `runtime` cargo feature to be enabled.
-    #[cfg(feature = "runtime")]
-    pub fn http2_keep_alive_interval(mut self, interval: impl Into<Option<Duration>>) -> Self {
-        self.protocol.http2_keep_alive_interval(interval);
-        self
-    }
-
-    /// Sets a timeout for receiving an acknowledgement of the keep-alive ping.
-    ///
-    /// If the ping is not acknowledged within the timeout, the connection will
-    /// be closed. Does nothing if `http2_keep_alive_interval` is disabled.
-    ///
-    /// Default is 20 seconds.
-    ///
-    /// # Cargo Feature
-    ///
-    /// Requires the `runtime` cargo feature to be enabled.
-    #[cfg(feature = "runtime")]
-    pub fn http2_keep_alive_timeout(mut self, timeout: Duration) -> Self {
-        self.protocol.http2_keep_alive_timeout(timeout);
-        self
-    }
+    pub mod conn;
+    mod server;
+    mod shutdown;
 
-    /// Sets the `Executor` to deal with connection tasks.
-    ///
-    /// Default is `tokio::spawn`.
-    pub fn executor<E2>(self, executor: E2) -> Builder<I, E2> {
-        Builder {
-            incoming: self.incoming,
-            protocol: self.protocol.with_executor(executor),
-        }
-    }
-
-    /// Consume this `Builder`, creating a [`Server`](Server).
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # #[cfg(feature = "tcp")]
-    /// # async fn run() {
-    /// use hyper::{Body, Error, Response, Server};
-    /// use hyper::service::{make_service_fn, service_fn};
-    ///
-    /// // Construct our SocketAddr to listen on...
-    /// let addr = ([127, 0, 0, 1], 3000).into();
-    ///
-    /// // And a MakeService to handle each connection...
-    /// let make_svc = make_service_fn(|_| async {
-    ///     Ok::<_, Error>(service_fn(|_req| async {
-    ///         Ok::<_, Error>(Response::new(Body::from("Hello World")))
-    ///     }))
-    /// });
-    ///
-    /// // Then bind and serve...
-    /// let server = Server::bind(&addr)
-    ///     .serve(make_svc);
-    ///
-    /// // Run forever-ish...
-    /// if let Err(err) = server.await {
-    ///     eprintln!("server error: {}", err);
-    /// }
-    /// # }
-    /// ```
-    pub fn serve<S, B>(self, new_service: S) -> Server<I, S, E>
-    where
-        I: Accept,
-        I::Error: Into<Box<dyn StdError + Send + Sync>>,
-        I::Conn: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-        S: MakeServiceRef<I::Conn, Body, ResBody = B>,
-        S::Error: Into<Box<dyn StdError + Send + Sync>>,
-        B: HttpBody + 'static,
-        B::Error: Into<Box<dyn StdError + Send + Sync>>,
-        E: NewSvcExec<I::Conn, S::Future, S::Service, E, NoopWatcher>,
-        E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
-    {
-        let serve = self.protocol.serve(self.incoming, new_service);
-        let spawn_all = serve.spawn_all();
-        Server { spawn_all }
-    }
-}
-
-#[cfg(feature = "tcp")]
-impl<E> Builder<AddrIncoming, E> {
-    /// Set whether TCP keepalive messages are enabled on accepted connections.
-    ///
-    /// If `None` is specified, keepalive is disabled, otherwise the duration
-    /// specified will be the time to remain idle before sending TCP keepalive
-    /// probes.
-    pub fn tcp_keepalive(mut self, keepalive: Option<Duration>) -> Self {
-        self.incoming.set_keepalive(keepalive);
-        self
-    }
-
-    /// Set the value of `TCP_NODELAY` option for accepted connections.
-    pub fn tcp_nodelay(mut self, enabled: bool) -> Self {
-        self.incoming.set_nodelay(enabled);
-        self
-    }
+    cfg_feature! {
+        #![feature = "tcp"]
 
-    /// Set whether to sleep on accept errors.
-    ///
-    /// A possible scenario is that the process has hit the max open files
-    /// allowed, and so trying to accept a new connection will fail with
-    /// EMFILE. In some cases, it's preferable to just wait for some time, if
-    /// the application will likely close some files (or connections), and try
-    /// to accept the connection again. If this option is true, the error will
-    /// be logged at the error level, since it is still a big deal, and then
-    /// the listener will sleep for 1 second.
-    ///
-    /// In other cases, hitting the max open files should be treat similarly
-    /// to being out-of-memory, and simply error (and shutdown). Setting this
-    /// option to false will allow that.
-    ///
-    /// For more details see [`AddrIncoming::set_sleep_on_errors`]
-    pub fn tcp_sleep_on_accept_errors(mut self, val: bool) -> Self {
-        self.incoming.set_sleep_on_errors(val);
-        self
+        mod tcp;
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/server.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,477 @@
+use std::error::Error as StdError;
+use std::fmt;
+#[cfg(feature = "tcp")]
+use std::net::{SocketAddr, TcpListener as StdTcpListener};
+
+#[cfg(feature = "tcp")]
+use std::time::Duration;
+
+use pin_project_lite::pin_project;
+use tokio::io::{AsyncRead, AsyncWrite};
+
+use super::accept::Accept;
+use crate::body::{Body, HttpBody};
+use crate::common::exec::{ConnStreamExec, Exec, NewSvcExec};
+use crate::common::{task, Future, Pin, Poll, Unpin};
+use crate::service::{HttpService, MakeServiceRef};
+// Renamed `Http` as `Http_` for now so that people upgrading don't see an
+// error that `hyper::server::Http` is private...
+use super::conn::{Http as Http_, NoopWatcher, SpawnAll};
+use super::shutdown::{Graceful, GracefulWatcher};
+#[cfg(feature = "tcp")]
+use super::tcp::AddrIncoming;
+
+pin_project! {
+    /// A listening HTTP server that accepts connections in both HTTP1 and HTTP2 by default.
+    ///
+    /// `Server` is a `Future` mapping a bound listener with a set of service
+    /// handlers. It is built using the [`Builder`](Builder), and the future
+    /// completes when the server has been shutdown. It should be run by an
+    /// `Executor`.
+    pub struct Server<I, S, E = Exec> {
+        #[pin]
+        spawn_all: SpawnAll<I, S, E>,
+    }
+}
+
+/// A builder for a [`Server`](Server).
+#[derive(Debug)]
+pub struct Builder<I, E = Exec> {
+    incoming: I,
+    protocol: Http_<E>,
+}
+
+// ===== impl Server =====
+
+impl<I> Server<I, ()> {
+    /// Starts a [`Builder`](Builder) with the provided incoming stream.
+    pub fn builder(incoming: I) -> Builder<I> {
+        Builder {
+            incoming,
+            protocol: Http_::new(),
+        }
+    }
+}
+
+cfg_feature! {
+    #![all(feature = "tcp")]
+
+    impl Server<AddrIncoming, ()> {
+        /// Binds to the provided address, and returns a [`Builder`](Builder).
+        ///
+        /// # Panics
+        ///
+        /// This method will panic if binding to the address fails. For a method
+        /// to bind to an address and return a `Result`, see `Server::try_bind`.
+        pub fn bind(addr: &SocketAddr) -> Builder<AddrIncoming> {
+            let incoming = AddrIncoming::new(addr).unwrap_or_else(|e| {
+                panic!("error binding to {}: {}", addr, e);
+            });
+            Server::builder(incoming)
+        }
+
+        /// Tries to bind to the provided address, and returns a [`Builder`](Builder).
+        pub fn try_bind(addr: &SocketAddr) -> crate::Result<Builder<AddrIncoming>> {
+            AddrIncoming::new(addr).map(Server::builder)
+        }
+
+        /// Create a new instance from a `std::net::TcpListener` instance.
+        pub fn from_tcp(listener: StdTcpListener) -> Result<Builder<AddrIncoming>, crate::Error> {
+            AddrIncoming::from_std(listener).map(Server::builder)
+        }
+    }
+}
+
+cfg_feature! {
+    #![all(feature = "tcp")]
+
+    impl<S, E> Server<AddrIncoming, S, E> {
+        /// Returns the local address that this server is bound to.
+        pub fn local_addr(&self) -> SocketAddr {
+            self.spawn_all.local_addr()
+        }
+    }
+}
+
+impl<I, IO, IE, S, E, B> Server<I, S, E>
+where
+    I: Accept<Conn = IO, Error = IE>,
+    IE: Into<Box<dyn StdError + Send + Sync>>,
+    IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
+    S: MakeServiceRef<IO, Body, ResBody = B>,
+    S::Error: Into<Box<dyn StdError + Send + Sync>>,
+    B: HttpBody + Send + Sync + 'static,
+    B::Error: Into<Box<dyn StdError + Send + Sync>>,
+    E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
+    E: NewSvcExec<IO, S::Future, S::Service, E, GracefulWatcher>,
+{
+    /// Prepares a server to handle graceful shutdown when the provided future
+    /// completes.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # fn main() {}
+    /// # #[cfg(feature = "tcp")]
+    /// # async fn run() {
+    /// # use hyper::{Body, Response, Server, Error};
+    /// # use hyper::service::{make_service_fn, service_fn};
+    /// # let make_service = make_service_fn(|_| async {
+    /// #     Ok::<_, Error>(service_fn(|_req| async {
+    /// #         Ok::<_, Error>(Response::new(Body::from("Hello World")))
+    /// #     }))
+    /// # });
+    /// // Make a server from the previous examples...
+    /// let server = Server::bind(&([127, 0, 0, 1], 3000).into())
+    ///     .serve(make_service);
+    ///
+    /// // Prepare some signal for when the server should start shutting down...
+    /// let (tx, rx) = tokio::sync::oneshot::channel::<()>();
+    /// let graceful = server
+    ///     .with_graceful_shutdown(async {
+    ///         rx.await.ok();
+    ///     });
+    ///
+    /// // Await the `server` receiving the signal...
+    /// if let Err(e) = graceful.await {
+    ///     eprintln!("server error: {}", e);
+    /// }
+    ///
+    /// // And later, trigger the signal by calling `tx.send(())`.
+    /// let _ = tx.send(());
+    /// # }
+    /// ```
+    pub fn with_graceful_shutdown<F>(self, signal: F) -> Graceful<I, S, F, E>
+    where
+        F: Future<Output = ()>,
+    {
+        Graceful::new(self.spawn_all, signal)
+    }
+}
+
+impl<I, IO, IE, S, B, E> Future for Server<I, S, E>
+where
+    I: Accept<Conn = IO, Error = IE>,
+    IE: Into<Box<dyn StdError + Send + Sync>>,
+    IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
+    S: MakeServiceRef<IO, Body, ResBody = B>,
+    S::Error: Into<Box<dyn StdError + Send + Sync>>,
+    B: HttpBody + 'static,
+    B::Error: Into<Box<dyn StdError + Send + Sync>>,
+    E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
+    E: NewSvcExec<IO, S::Future, S::Service, E, NoopWatcher>,
+{
+    type Output = crate::Result<()>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
+        self.project().spawn_all.poll_watch(cx, &NoopWatcher)
+    }
+}
+
+impl<I: fmt::Debug, S: fmt::Debug> fmt::Debug for Server<I, S> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Server")
+            .field("listener", &self.spawn_all.incoming_ref())
+            .finish()
+    }
+}
+
+// ===== impl Builder =====
+
+impl<I, E> Builder<I, E> {
+    /// Start a new builder, wrapping an incoming stream and low-level options.
+    ///
+    /// For a more convenient constructor, see [`Server::bind`](Server::bind).
+    pub fn new(incoming: I, protocol: Http_<E>) -> Self {
+        Builder { incoming, protocol }
+    }
+
+    /// Sets whether to use keep-alive for HTTP/1 connections.
+    ///
+    /// Default is `true`.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_keepalive(mut self, val: bool) -> Self {
+        self.protocol.http1_keep_alive(val);
+        self
+    }
+
+    /// Set whether HTTP/1 connections should support half-closures.
+    ///
+    /// Clients can chose to shutdown their write-side while waiting
+    /// for the server to respond. Setting this to `true` will
+    /// prevent closing the connection immediately if `read`
+    /// detects an EOF in the middle of a request.
+    ///
+    /// Default is `false`.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_half_close(mut self, val: bool) -> Self {
+        self.protocol.http1_half_close(val);
+        self
+    }
+
+    /// Set the maximum buffer size.
+    ///
+    /// Default is ~ 400kb.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_max_buf_size(mut self, val: usize) -> Self {
+        self.protocol.max_buf_size(val);
+        self
+    }
+
+    // Sets whether to bunch up HTTP/1 writes until the read buffer is empty.
+    //
+    // This isn't really desirable in most cases, only really being useful in
+    // silly pipeline benchmarks.
+    #[doc(hidden)]
+    #[cfg(feature = "http1")]
+    pub fn http1_pipeline_flush(mut self, val: bool) -> Self {
+        self.protocol.pipeline_flush(val);
+        self
+    }
+
+    /// Set whether HTTP/1 connections will write header names as title case at
+    /// the socket level.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_title_case_headers(mut self, val: bool) -> Self {
+        self.protocol.http1_title_case_headers(val);
+        self
+    }
+
+    /// Set whether HTTP/1 connections will write header names as provided
+    /// at the socket level.
+    ///
+    /// Note that this setting does not affect HTTP/2.
+    ///
+    /// Default is false.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_preserve_header_case(mut self, val: bool) -> Self {
+        self.protocol.http1_preserve_header_case(val);
+        self
+    }
+
+    /// Sets whether HTTP/1 is required.
+    ///
+    /// Default is `false`.
+    #[cfg(feature = "http1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http1")))]
+    pub fn http1_only(mut self, val: bool) -> Self {
+        self.protocol.http1_only(val);
+        self
+    }
+
+    /// Sets whether HTTP/2 is required.
+    ///
+    /// Default is `false`.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_only(mut self, val: bool) -> Self {
+        self.protocol.http2_only(val);
+        self
+    }
+
+    /// Sets the [`SETTINGS_INITIAL_WINDOW_SIZE`][spec] option for HTTP2
+    /// stream-level flow control.
+    ///
+    /// Passing `None` will do nothing.
+    ///
+    /// If not set, hyper will use a default.
+    ///
+    /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_initial_stream_window_size(mut self, sz: impl Into<Option<u32>>) -> Self {
+        self.protocol.http2_initial_stream_window_size(sz.into());
+        self
+    }
+
+    /// Sets the max connection-level flow control for HTTP2
+    ///
+    /// Passing `None` will do nothing.
+    ///
+    /// If not set, hyper will use a default.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_initial_connection_window_size(mut self, sz: impl Into<Option<u32>>) -> Self {
+        self.protocol
+            .http2_initial_connection_window_size(sz.into());
+        self
+    }
+
+    /// Sets whether to use an adaptive flow control.
+    ///
+    /// Enabling this will override the limits set in
+    /// `http2_initial_stream_window_size` and
+    /// `http2_initial_connection_window_size`.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_adaptive_window(mut self, enabled: bool) -> Self {
+        self.protocol.http2_adaptive_window(enabled);
+        self
+    }
+
+    /// Sets the maximum frame size to use for HTTP2.
+    ///
+    /// Passing `None` will do nothing.
+    ///
+    /// If not set, hyper will use a default.
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_max_frame_size(mut self, sz: impl Into<Option<u32>>) -> Self {
+        self.protocol.http2_max_frame_size(sz);
+        self
+    }
+
+    /// Sets the [`SETTINGS_MAX_CONCURRENT_STREAMS`][spec] option for HTTP2
+    /// connections.
+    ///
+    /// Default is no limit (`std::u32::MAX`). Passing `None` will do nothing.
+    ///
+    /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_MAX_CONCURRENT_STREAMS
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_max_concurrent_streams(mut self, max: impl Into<Option<u32>>) -> Self {
+        self.protocol.http2_max_concurrent_streams(max.into());
+        self
+    }
+
+    /// Sets an interval for HTTP2 Ping frames should be sent to keep a
+    /// connection alive.
+    ///
+    /// Pass `None` to disable HTTP2 keep-alive.
+    ///
+    /// Default is currently disabled.
+    ///
+    /// # Cargo Feature
+    ///
+    /// Requires the `runtime` cargo feature to be enabled.
+    #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_keep_alive_interval(mut self, interval: impl Into<Option<Duration>>) -> Self {
+        self.protocol.http2_keep_alive_interval(interval);
+        self
+    }
+
+    /// Sets a timeout for receiving an acknowledgement of the keep-alive ping.
+    ///
+    /// If the ping is not acknowledged within the timeout, the connection will
+    /// be closed. Does nothing if `http2_keep_alive_interval` is disabled.
+    ///
+    /// Default is 20 seconds.
+    ///
+    /// # Cargo Feature
+    ///
+    /// Requires the `runtime` cargo feature to be enabled.
+    #[cfg(feature = "runtime")]
+    #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
+    pub fn http2_keep_alive_timeout(mut self, timeout: Duration) -> Self {
+        self.protocol.http2_keep_alive_timeout(timeout);
+        self
+    }
+
+    /// Sets the `Executor` to deal with connection tasks.
+    ///
+    /// Default is `tokio::spawn`.
+    pub fn executor<E2>(self, executor: E2) -> Builder<I, E2> {
+        Builder {
+            incoming: self.incoming,
+            protocol: self.protocol.with_executor(executor),
+        }
+    }
+
+    /// Consume this `Builder`, creating a [`Server`](Server).
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # #[cfg(feature = "tcp")]
+    /// # async fn run() {
+    /// use hyper::{Body, Error, Response, Server};
+    /// use hyper::service::{make_service_fn, service_fn};
+    ///
+    /// // Construct our SocketAddr to listen on...
+    /// let addr = ([127, 0, 0, 1], 3000).into();
+    ///
+    /// // And a MakeService to handle each connection...
+    /// let make_svc = make_service_fn(|_| async {
+    ///     Ok::<_, Error>(service_fn(|_req| async {
+    ///         Ok::<_, Error>(Response::new(Body::from("Hello World")))
+    ///     }))
+    /// });
+    ///
+    /// // Then bind and serve...
+    /// let server = Server::bind(&addr)
+    ///     .serve(make_svc);
+    ///
+    /// // Run forever-ish...
+    /// if let Err(err) = server.await {
+    ///     eprintln!("server error: {}", err);
+    /// }
+    /// # }
+    /// ```
+    pub fn serve<S, B>(self, new_service: S) -> Server<I, S, E>
+    where
+        I: Accept,
+        I::Error: Into<Box<dyn StdError + Send + Sync>>,
+        I::Conn: AsyncRead + AsyncWrite + Unpin + Send + 'static,
+        S: MakeServiceRef<I::Conn, Body, ResBody = B>,
+        S::Error: Into<Box<dyn StdError + Send + Sync>>,
+        B: HttpBody + 'static,
+        B::Error: Into<Box<dyn StdError + Send + Sync>>,
+        E: NewSvcExec<I::Conn, S::Future, S::Service, E, NoopWatcher>,
+        E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
+    {
+        let serve = self.protocol.serve(self.incoming, new_service);
+        let spawn_all = serve.spawn_all();
+        Server { spawn_all }
+    }
+}
+
+#[cfg(feature = "tcp")]
+impl<E> Builder<AddrIncoming, E> {
+    /// Set whether TCP keepalive messages are enabled on accepted connections.
+    ///
+    /// If `None` is specified, keepalive is disabled, otherwise the duration
+    /// specified will be the time to remain idle before sending TCP keepalive
+    /// probes.
+    pub fn tcp_keepalive(mut self, keepalive: Option<Duration>) -> Self {
+        self.incoming.set_keepalive(keepalive);
+        self
+    }
+
+    /// Set the value of `TCP_NODELAY` option for accepted connections.
+    pub fn tcp_nodelay(mut self, enabled: bool) -> Self {
+        self.incoming.set_nodelay(enabled);
+        self
+    }
+
+    /// Set whether to sleep on accept errors.
+    ///
+    /// A possible scenario is that the process has hit the max open files
+    /// allowed, and so trying to accept a new connection will fail with
+    /// EMFILE. In some cases, it's preferable to just wait for some time, if
+    /// the application will likely close some files (or connections), and try
+    /// to accept the connection again. If this option is true, the error will
+    /// be logged at the error level, since it is still a big deal, and then
+    /// the listener will sleep for 1 second.
+    ///
+    /// In other cases, hitting the max open files should be treat similarly
+    /// to being out-of-memory, and simply error (and shutdown). Setting this
+    /// option to false will allow that.
+    ///
+    /// For more details see [`AddrIncoming::set_sleep_on_errors`]
+    pub fn tcp_sleep_on_accept_errors(mut self, val: bool) -> Self {
+        self.incoming.set_sleep_on_errors(val);
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/shutdown.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/shutdown.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/shutdown.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/shutdown.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,36 @@
 use std::error::Error as StdError;
 
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tokio::io::{AsyncRead, AsyncWrite};
 
+use super::accept::Accept;
 use super::conn::{SpawnAll, UpgradeableConnection, Watcher};
-use super::Accept;
 use crate::body::{Body, HttpBody};
 use crate::common::drain::{self, Draining, Signal, Watch, Watching};
-use crate::common::exec::{H2Exec, NewSvcExec};
+use crate::common::exec::{ConnStreamExec, NewSvcExec};
 use crate::common::{task, Future, Pin, Poll, Unpin};
 use crate::service::{HttpService, MakeServiceRef};
 
-#[allow(missing_debug_implementations)]
-#[pin_project]
-pub struct Graceful<I, S, F, E> {
-    #[pin]
-    state: State<I, S, F, E>,
+pin_project! {
+    #[allow(missing_debug_implementations)]
+    pub struct Graceful<I, S, F, E> {
+        #[pin]
+        state: State<I, S, F, E>,
+    }
 }
 
-#[pin_project(project = StateProj)]
-pub(super) enum State<I, S, F, E> {
-    Running {
-        drain: Option<(Signal, Watch)>,
-        #[pin]
-        spawn_all: SpawnAll<I, S, E>,
-        #[pin]
-        signal: F,
-    },
-    Draining(Draining),
+pin_project! {
+    #[project = StateProj]
+    pub(super) enum State<I, S, F, E> {
+        Running {
+            drain: Option<(Signal, Watch)>,
+            #[pin]
+            spawn_all: SpawnAll<I, S, E>,
+            #[pin]
+            signal: F,
+        },
+        Draining { draining: Draining },
+    }
 }
 
 impl<I, S, F, E> Graceful<I, S, F, E> {
@@ -53,7 +56,7 @@
     B: HttpBody + Send + Sync + 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
     F: Future<Output = ()>,
-    E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
+    E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
     E: NewSvcExec<IO, S::Future, S::Service, E, GracefulWatcher>,
 {
     type Output = crate::Result<()>;
@@ -71,14 +74,16 @@
                         Poll::Ready(()) => {
                             debug!("signal received, starting graceful shutdown");
                             let sig = drain.take().expect("drain channel").0;
-                            State::Draining(sig.drain())
+                            State::Draining {
+                                draining: sig.drain(),
+                            }
                         }
                         Poll::Pending => {
                             let watch = drain.as_ref().expect("drain channel").1.clone();
                             return spawn_all.poll_watch(cx, &GracefulWatcher(watch));
                         }
                     },
-                    StateProj::Draining(ref mut draining) => {
+                    StateProj::Draining { ref mut draining } => {
                         return Pin::new(draining).poll(cx).map(Ok);
                     }
                 }
@@ -96,7 +101,7 @@
 where
     I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     S: HttpService<Body>,
-    E: H2Exec<S::Future, S::ResBody>,
+    E: ConnStreamExec<S::Future, S::ResBody>,
     S::ResBody: Send + Sync + 'static,
     <S::ResBody as HttpBody>::Error: Into<Box<dyn StdError + Send + Sync>>,
 {
@@ -115,7 +120,7 @@
     I: AsyncRead + AsyncWrite + Unpin,
     S::ResBody: HttpBody + Send + 'static,
     <S::ResBody as HttpBody>::Error: Into<Box<dyn StdError + Send + Sync>>,
-    E: H2Exec<S::Future, S::ResBody>,
+    E: ConnStreamExec<S::Future, S::ResBody>,
 {
     conn.graceful_shutdown()
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/tcp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/tcp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/server/tcp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/server/tcp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,12 +4,13 @@
 use std::time::Duration;
 
 use tokio::net::TcpListener;
-use tokio::time::Delay;
+use tokio::time::Sleep;
 
 use crate::common::{task, Future, Pin, Poll};
 
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::addr_stream::AddrStream;
-use super::Accept;
+use super::accept::Accept;
 
 /// A stream of connections from binding to an address.
 #[must_use = "streams do nothing unless polled"]
@@ -19,7 +20,7 @@
     sleep_on_errors: bool,
     tcp_keepalive_timeout: Option<Duration>,
     tcp_nodelay: bool,
-    timeout: Option<Delay>,
+    timeout: Option<Pin<Box<Sleep>>>,
 }
 
 impl AddrIncoming {
@@ -30,7 +31,21 @@
     }
 
     pub(super) fn from_std(std_listener: StdTcpListener) -> crate::Result<Self> {
+        // TcpListener::from_std doesn't set O_NONBLOCK
+        std_listener
+            .set_nonblocking(true)
+            .map_err(crate::Error::new_listen)?;
         let listener = TcpListener::from_std(std_listener).map_err(crate::Error::new_listen)?;
+        AddrIncoming::from_listener(listener)
+    }
+
+    /// Creates a new `AddrIncoming` binding to provided socket address.
+    pub fn bind(addr: &SocketAddr) -> crate::Result<Self> {
+        AddrIncoming::new(addr)
+    }
+
+    /// Creates a new `AddrIncoming` from an existing `tokio::net::TcpListener`.
+    pub fn from_listener(listener: TcpListener) -> crate::Result<Self> {
         let addr = listener.local_addr().map_err(crate::Error::new_listen)?;
         Ok(AddrIncoming {
             listener,
@@ -42,11 +57,6 @@
         })
     }
 
-    /// Creates a new `AddrIncoming` binding to provided socket address.
-    pub fn bind(addr: &SocketAddr) -> crate::Result<Self> {
-        AddrIncoming::new(addr)
-    }
-
     /// Get the local address bound to this listener.
     pub fn local_addr(&self) -> SocketAddr {
         self.addr
@@ -98,7 +108,9 @@
             match ready!(self.listener.poll_accept(cx)) {
                 Ok((socket, addr)) => {
                     if let Some(dur) = self.tcp_keepalive_timeout {
-                        if let Err(e) = socket.set_keepalive(Some(dur)) {
+                        let socket = socket2::SockRef::from(&socket);
+                        let conf = socket2::TcpKeepalive::new().with_time(dur);
+                        if let Err(e) = socket.set_tcp_keepalive(&conf) {
                             trace!("error trying to set TCP keepalive: {}", e);
                         }
                     }
@@ -119,9 +131,9 @@
                         error!("accept error: {}", e);
 
                         // Sleep 1s.
-                        let mut timeout = tokio::time::delay_for(Duration::from_secs(1));
+                        let mut timeout = Box::pin(tokio::time::sleep(Duration::from_secs(1)));
 
-                        match Pin::new(&mut timeout).poll(cx) {
+                        match timeout.as_mut().poll(cx) {
                             Poll::Ready(()) => {
                                 // Wow, it's been a second already? Ok then...
                                 continue;
@@ -161,12 +173,9 @@
 /// The timeout is useful to handle resource exhaustion errors like ENFILE
 /// and EMFILE. Otherwise, could enter into tight loop.
 fn is_connection_error(e: &io::Error) -> bool {
-    match e.kind() {
-        io::ErrorKind::ConnectionRefused
+    matches!(e.kind(), io::ErrorKind::ConnectionRefused
         | io::ErrorKind::ConnectionAborted
-        | io::ErrorKind::ConnectionReset => true,
-        _ => false,
-    }
+        | io::ErrorKind::ConnectionReset)
 }
 
 impl fmt::Debug for AddrIncoming {
@@ -181,21 +190,23 @@
 }
 
 mod addr_stream {
-    use bytes::{Buf, BufMut};
     use std::io;
     use std::net::SocketAddr;
     #[cfg(unix)]
     use std::os::unix::io::{AsRawFd, RawFd};
-    use tokio::io::{AsyncRead, AsyncWrite};
+    use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
     use tokio::net::TcpStream;
 
     use crate::common::{task, Pin, Poll};
 
-    /// A transport returned yieled by `AddrIncoming`.
-    #[derive(Debug)]
-    pub struct AddrStream {
-        inner: TcpStream,
-        pub(super) remote_addr: SocketAddr,
+    pin_project_lite::pin_project! {
+        /// A transport returned yieled by `AddrIncoming`.
+        #[derive(Debug)]
+        pub struct AddrStream {
+            #[pin]
+            inner: TcpStream,
+            pub(super) remote_addr: SocketAddr,
+        }
     }
 
     impl AddrStream {
@@ -224,56 +235,40 @@
         pub fn poll_peek(
             &mut self,
             cx: &mut task::Context<'_>,
-            buf: &mut [u8],
+            buf: &mut tokio::io::ReadBuf<'_>,
         ) -> Poll<io::Result<usize>> {
             self.inner.poll_peek(cx, buf)
         }
     }
 
     impl AsyncRead for AddrStream {
-        unsafe fn prepare_uninitialized_buffer(
-            &self,
-            buf: &mut [std::mem::MaybeUninit<u8>],
-        ) -> bool {
-            self.inner.prepare_uninitialized_buffer(buf)
-        }
-
         #[inline]
         fn poll_read(
-            mut self: Pin<&mut Self>,
-            cx: &mut task::Context<'_>,
-            buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
-            Pin::new(&mut self.inner).poll_read(cx, buf)
-        }
-
-        #[inline]
-        fn poll_read_buf<B: BufMut>(
-            mut self: Pin<&mut Self>,
+            self: Pin<&mut Self>,
             cx: &mut task::Context<'_>,
-            buf: &mut B,
-        ) -> Poll<io::Result<usize>> {
-            Pin::new(&mut self.inner).poll_read_buf(cx, buf)
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
+            self.project().inner.poll_read(cx, buf)
         }
     }
 
     impl AsyncWrite for AddrStream {
         #[inline]
         fn poll_write(
-            mut self: Pin<&mut Self>,
+            self: Pin<&mut Self>,
             cx: &mut task::Context<'_>,
             buf: &[u8],
         ) -> Poll<io::Result<usize>> {
-            Pin::new(&mut self.inner).poll_write(cx, buf)
+            self.project().inner.poll_write(cx, buf)
         }
 
         #[inline]
-        fn poll_write_buf<B: Buf>(
-            mut self: Pin<&mut Self>,
+        fn poll_write_vectored(
+            self: Pin<&mut Self>,
             cx: &mut task::Context<'_>,
-            buf: &mut B,
+            bufs: &[io::IoSlice<'_>],
         ) -> Poll<io::Result<usize>> {
-            Pin::new(&mut self.inner).poll_write_buf(cx, buf)
+            self.project().inner.poll_write_vectored(cx, bufs)
         }
 
         #[inline]
@@ -283,11 +278,17 @@
         }
 
         #[inline]
-        fn poll_shutdown(
-            mut self: Pin<&mut Self>,
-            cx: &mut task::Context<'_>,
-        ) -> Poll<io::Result<()>> {
-            Pin::new(&mut self.inner).poll_shutdown(cx)
+        fn poll_shutdown(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
+            self.project().inner.poll_shutdown(cx)
+        }
+
+        #[inline]
+        fn is_write_vectored(&self) -> bool {
+            // Note that since `self.inner` is a `TcpStream`, this could
+            // *probably* be hard-coded to return `true`...but it seems more
+            // correct to ask it anyway (maybe we're on some platform without
+            // scatter-gather IO?)
+            self.inner.is_write_vectored()
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/service/make.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/service/make.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/service/make.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/service/make.rs	2021-12-09 12:01:26.000000000 +0000
@@ -177,6 +177,7 @@
 mod sealed {
     pub trait Sealed<X> {}
 
+    #[allow(unreachable_pub)] // This is intentional.
     pub trait CantImpl {}
 
     #[allow(missing_debug_implementations)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/service/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/service/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/service/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/service/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -39,12 +39,17 @@
 
 mod http;
 mod make;
+#[cfg(all(any(feature = "http1", feature = "http2"), feature = "client"))]
 mod oneshot;
 mod util;
 
-pub(crate) use self::http::HttpService;
-pub(crate) use self::make::{MakeConnection, MakeServiceRef};
-pub(crate) use self::oneshot::{oneshot, Oneshot};
+pub(super) use self::http::HttpService;
+#[cfg(all(any(feature = "http1", feature = "http2"), feature = "client"))]
+pub(super) use self::make::MakeConnection;
+#[cfg(all(any(feature = "http1", feature = "http2"), feature = "server"))]
+pub(super) use self::make::MakeServiceRef;
+#[cfg(all(any(feature = "http1", feature = "http2"), feature = "client"))]
+pub(super) use self::oneshot::{oneshot, Oneshot};
 
 pub use self::make::make_service_fn;
 pub use self::util::service_fn;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/service/oneshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/service/oneshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/service/oneshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/service/oneshot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 // TODO: Eventually to be replaced with tower_util::Oneshot.
 
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 use tower_service::Service;
 
 use crate::common::{task, Future, Pin, Poll};
@@ -10,25 +10,35 @@
     S: Service<Req>,
 {
     Oneshot {
-        state: State::NotReady(svc, req),
+        state: State::NotReady { svc, req },
     }
 }
 
-// A `Future` consuming a `Service` and request, waiting until the `Service`
-// is ready, and then calling `Service::call` with the request, and
-// waiting for that `Future`.
-#[allow(missing_debug_implementations)]
-#[pin_project]
-pub struct Oneshot<S: Service<Req>, Req> {
-    #[pin]
-    state: State<S, Req>,
+pin_project! {
+    // A `Future` consuming a `Service` and request, waiting until the `Service`
+    // is ready, and then calling `Service::call` with the request, and
+    // waiting for that `Future`.
+    #[allow(missing_debug_implementations)]
+    pub struct Oneshot<S: Service<Req>, Req> {
+        #[pin]
+        state: State<S, Req>,
+    }
 }
 
-#[pin_project(project = StateProj, project_replace = StateProjOwn)]
-enum State<S: Service<Req>, Req> {
-    NotReady(S, Req),
-    Called(#[pin] S::Future),
-    Tmp,
+pin_project! {
+    #[project = StateProj]
+    #[project_replace = StateProjOwn]
+    enum State<S: Service<Req>, Req> {
+        NotReady {
+            svc: S,
+            req: Req,
+        },
+        Called {
+            #[pin]
+            fut: S::Future,
+        },
+        Tmp,
+    }
 }
 
 impl<S, Req> Future for Oneshot<S, Req>
@@ -42,19 +52,19 @@
 
         loop {
             match me.state.as_mut().project() {
-                StateProj::NotReady(ref mut svc, _) => {
+                StateProj::NotReady { ref mut svc, .. } => {
                     ready!(svc.poll_ready(cx))?;
                     // fallthrough out of the match's borrow
                 }
-                StateProj::Called(fut) => {
+                StateProj::Called { fut } => {
                     return fut.poll(cx);
                 }
                 StateProj::Tmp => unreachable!(),
             }
 
             match me.state.as_mut().project_replace(State::Tmp) {
-                StateProjOwn::NotReady(mut svc, req) => {
-                    me.state.set(State::Called(svc.call(req)));
+                StateProjOwn::NotReady { mut svc, req } => {
+                    me.state.set(State::Called { fut: svc.call(req) });
                 }
                 _ => unreachable!(),
             }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/upgrade.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/upgrade.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper/src/upgrade.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper/src/upgrade.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,8 @@
 use std::io;
 use std::marker::Unpin;
 
-use bytes::{Buf, Bytes};
-use tokio::io::{AsyncRead, AsyncWrite};
+use bytes::Bytes;
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio::sync::oneshot;
 
 use crate::common::io::Rewind;
@@ -57,18 +57,18 @@
     _inner: (),
 }
 
-pub(crate) struct Pending {
-    tx: oneshot::Sender<crate::Result<Upgraded>>,
+/// Gets a pending HTTP upgrade from this message.
+pub fn on<T: sealed::CanUpgrade>(msg: T) -> OnUpgrade {
+    msg.on_upgrade()
 }
 
-/// Error cause returned when an upgrade was expected but canceled
-/// for whatever reason.
-///
-/// This likely means the actual `Conn` future wasn't polled and upgraded.
-#[derive(Debug)]
-struct UpgradeExpected(());
+#[cfg(any(feature = "http1", feature = "http2"))]
+pub(super) struct Pending {
+    tx: oneshot::Sender<crate::Result<Upgraded>>,
+}
 
-pub(crate) fn pending() -> (Pending, OnUpgrade) {
+#[cfg(any(feature = "http1", feature = "http2"))]
+pub(super) fn pending() -> (Pending, OnUpgrade) {
     let (tx, rx) = oneshot::channel();
     (Pending { tx }, OnUpgrade { rx: Some(rx) })
 }
@@ -76,12 +76,13 @@
 // ===== impl Upgraded =====
 
 impl Upgraded {
-    pub(crate) fn new<T>(io: T, read_buf: Bytes) -> Self
+    #[cfg(any(feature = "http1", feature = "http2", test))]
+    pub(super) fn new<T>(io: T, read_buf: Bytes) -> Self
     where
         T: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     {
         Upgraded {
-            io: Rewind::new_buffered(Box::new(ForwardsWriteBuf(io)), read_buf),
+            io: Rewind::new_buffered(Box::new(io), read_buf),
         }
     }
 
@@ -91,9 +92,9 @@
     /// `Upgraded` back.
     pub fn downcast<T: AsyncRead + AsyncWrite + Unpin + 'static>(self) -> Result<Parts<T>, Self> {
         let (io, buf) = self.io.into_inner();
-        match io.__hyper_downcast::<ForwardsWriteBuf<T>>() {
+        match io.__hyper_downcast() {
             Ok(t) => Ok(Parts {
-                io: t.0,
+                io: *t,
                 read_buf: buf,
                 _inner: (),
             }),
@@ -105,15 +106,11 @@
 }
 
 impl AsyncRead for Upgraded {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        self.io.prepare_uninitialized_buffer(buf)
-    }
-
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut task::Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         Pin::new(&mut self.io).poll_read(cx, buf)
     }
 }
@@ -127,12 +124,12 @@
         Pin::new(&mut self.io).poll_write(cx, buf)
     }
 
-    fn poll_write_buf<B: Buf>(
+    fn poll_write_vectored(
         mut self: Pin<&mut Self>,
         cx: &mut task::Context<'_>,
-        buf: &mut B,
+        bufs: &[io::IoSlice<'_>],
     ) -> Poll<io::Result<usize>> {
-        Pin::new(self.io.get_mut()).poll_write_dyn_buf(cx, buf)
+        Pin::new(&mut self.io).poll_write_vectored(cx, bufs)
     }
 
     fn poll_flush(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
@@ -142,6 +139,10 @@
     fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
         Pin::new(&mut self.io).poll_shutdown(cx)
     }
+
+    fn is_write_vectored(&self) -> bool {
+        self.io.is_write_vectored()
+    }
 }
 
 impl fmt::Debug for Upgraded {
@@ -153,11 +154,12 @@
 // ===== impl OnUpgrade =====
 
 impl OnUpgrade {
-    pub(crate) fn none() -> Self {
+    pub(super) fn none() -> Self {
         OnUpgrade { rx: None }
     }
 
-    pub(crate) fn is_none(&self) -> bool {
+    #[cfg(feature = "http1")]
+    pub(super) fn is_none(&self) -> bool {
         self.rx.is_none()
     }
 }
@@ -170,9 +172,7 @@
             Some(ref mut rx) => Pin::new(rx).poll(cx).map(|res| match res {
                 Ok(Ok(upgraded)) => Ok(upgraded),
                 Ok(Err(err)) => Err(err),
-                Err(_oneshot_canceled) => {
-                    Err(crate::Error::new_canceled().with(UpgradeExpected(())))
-                }
+                Err(_oneshot_canceled) => Err(crate::Error::new_canceled().with(UpgradeExpected)),
             }),
             None => Poll::Ready(Err(crate::Error::new_user_no_upgrade())),
         }
@@ -187,15 +187,17 @@
 
 // ===== impl Pending =====
 
+#[cfg(any(feature = "http1", feature = "http2"))]
 impl Pending {
-    pub(crate) fn fulfill(self, upgraded: Upgraded) {
+    pub(super) fn fulfill(self, upgraded: Upgraded) {
         trace!("pending upgrade fulfill");
         let _ = self.tx.send(Ok(upgraded));
     }
 
+    #[cfg(feature = "http1")]
     /// Don't fulfill the pending Upgrade, but instead signal that
     /// upgrades are handled manually.
-    pub(crate) fn manual(self) {
+    pub(super) fn manual(self) {
         trace!("pending upgrade handled manually");
         let _ = self.tx.send(Err(crate::Error::new_user_manual_upgrade()));
     }
@@ -203,9 +205,16 @@
 
 // ===== impl UpgradeExpected =====
 
+/// Error cause returned when an upgrade was expected but canceled
+/// for whatever reason.
+///
+/// This likely means the actual `Conn` future wasn't polled and upgraded.
+#[derive(Debug)]
+struct UpgradeExpected;
+
 impl fmt::Display for UpgradeExpected {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "upgrade expected but not completed")
+        f.write_str("upgrade expected but not completed")
     }
 }
 
@@ -213,20 +222,14 @@
 
 // ===== impl Io =====
 
-struct ForwardsWriteBuf<T>(T);
-
-pub(crate) trait Io: AsyncRead + AsyncWrite + Unpin + 'static {
-    fn poll_write_dyn_buf(
-        &mut self,
-        cx: &mut task::Context<'_>,
-        buf: &mut dyn Buf,
-    ) -> Poll<io::Result<usize>>;
-
+pub(super) trait Io: AsyncRead + AsyncWrite + Unpin + 'static {
     fn __hyper_type_id(&self) -> TypeId {
         TypeId::of::<Self>()
     }
 }
 
+impl<T: AsyncRead + AsyncWrite + Unpin + 'static> Io for T {}
+
 impl dyn Io + Send {
     fn __hyper_is<T: Io>(&self) -> bool {
         let t = TypeId::of::<T>();
@@ -246,60 +249,49 @@
     }
 }
 
-impl<T: AsyncRead + Unpin> AsyncRead for ForwardsWriteBuf<T> {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        self.0.prepare_uninitialized_buffer(buf)
-    }
-
-    fn poll_read(
-        mut self: Pin<&mut Self>,
-        cx: &mut task::Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_read(cx, buf)
-    }
-}
+mod sealed {
+    use super::OnUpgrade;
 
-impl<T: AsyncWrite + Unpin> AsyncWrite for ForwardsWriteBuf<T> {
-    fn poll_write(
-        mut self: Pin<&mut Self>,
-        cx: &mut task::Context<'_>,
-        buf: &[u8],
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_write(cx, buf)
+    pub trait CanUpgrade {
+        fn on_upgrade(self) -> OnUpgrade;
     }
 
-    fn poll_write_buf<B: Buf>(
-        mut self: Pin<&mut Self>,
-        cx: &mut task::Context<'_>,
-        buf: &mut B,
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_write_buf(cx, buf)
+    impl CanUpgrade for http::Request<crate::Body> {
+        fn on_upgrade(mut self) -> OnUpgrade {
+            self.extensions_mut()
+                .remove::<OnUpgrade>()
+                .unwrap_or_else(OnUpgrade::none)
+        }
     }
 
-    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
-        Pin::new(&mut self.0).poll_flush(cx)
+    impl CanUpgrade for &'_ mut http::Request<crate::Body> {
+        fn on_upgrade(self) -> OnUpgrade {
+            self.extensions_mut()
+                .remove::<OnUpgrade>()
+                .unwrap_or_else(OnUpgrade::none)
+        }
     }
 
-    fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
-        Pin::new(&mut self.0).poll_shutdown(cx)
+    impl CanUpgrade for http::Response<crate::Body> {
+        fn on_upgrade(mut self) -> OnUpgrade {
+            self.extensions_mut()
+                .remove::<OnUpgrade>()
+                .unwrap_or_else(OnUpgrade::none)
+        }
     }
-}
 
-impl<T: AsyncRead + AsyncWrite + Unpin + 'static> Io for ForwardsWriteBuf<T> {
-    fn poll_write_dyn_buf(
-        &mut self,
-        cx: &mut task::Context<'_>,
-        mut buf: &mut dyn Buf,
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_write_buf(cx, &mut buf)
+    impl CanUpgrade for &'_ mut http::Response<crate::Body> {
+        fn on_upgrade(self) -> OnUpgrade {
+            self.extensions_mut()
+                .remove::<OnUpgrade>()
+                .unwrap_or_else(OnUpgrade::none)
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use tokio::io::AsyncWriteExt;
 
     #[test]
     fn upgraded_downcast() {
@@ -310,15 +302,6 @@
         upgraded.downcast::<Mock>().unwrap();
     }
 
-    #[tokio::test]
-    async fn upgraded_forwards_write_buf() {
-        // sanity check that the underlying IO implements write_buf
-        Mock.write_buf(&mut "hello".as_bytes()).await.unwrap();
-
-        let mut upgraded = Upgraded::new(Mock, Bytes::new());
-        upgraded.write_buf(&mut "hello".as_bytes()).await.unwrap();
-    }
-
     // TODO: replace with tokio_test::io when it can test write_buf
     struct Mock;
 
@@ -326,8 +309,8 @@
         fn poll_read(
             self: Pin<&mut Self>,
             _cx: &mut task::Context<'_>,
-            _buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
+            _buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
             unreachable!("Mock::poll_read")
         }
     }
@@ -335,20 +318,11 @@
     impl AsyncWrite for Mock {
         fn poll_write(
             self: Pin<&mut Self>,
-            _cx: &mut task::Context<'_>,
-            _buf: &[u8],
-        ) -> Poll<io::Result<usize>> {
-            panic!("poll_write shouldn't be called");
-        }
-
-        fn poll_write_buf<B: Buf>(
-            self: Pin<&mut Self>,
-            _cx: &mut task::Context<'_>,
-            buf: &mut B,
+            _: &mut task::Context<'_>,
+            buf: &[u8],
         ) -> Poll<io::Result<usize>> {
-            let n = buf.remaining();
-            buf.advance(n);
-            Poll::Ready(Ok(n))
+            // panic!("poll_write shouldn't be called");
+            Poll::Ready(Ok(buf.len()))
         }
 
         fn poll_flush(self: Pin<&mut Self>, _cx: &mut task::Context<'_>) -> Poll<io::Result<()>> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"a35b51f3b59d31561c9906dbfc4226744fae406f0d1ae6a5d9878f658d4ea43e","Cargo.toml":"1cd796903b63499f8c94c27a3d7b5c8df47b0e3664029e2bbb6ff4d35ad9e29f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b033f57f23fffca5bee9406cf453ce31e919c1b867df54bfa7487e73d8c9c1f","README.md":"649b9aa858c8d7d79be7e2870ade92ea1ddf62efd595e790f2467a63240558bd","examples/client.rs":"d9fe65779eb797546a3284ab0373f00ce35ed74400048361ed73260407576204","src/client.rs":"c4f836b9d20f582ac4de335039a3dd1222f59fece1e61ce9da7481d70a472d7c","src/lib.rs":"e388d1034d21417f4b24fc3fdffcc62953beca5705ecdcd09027d405b421b1f8","src/stream.rs":"e477399839439394de122abed861430af292b0349e98c2f6bddee2854584a22f"},"package":"d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"}
\ No newline at end of file
+{"files":{"Cargo.lock":"b236b804fe80b451fc4770b4a0a0b41bf19a70e220cd83d1e94aee6f0f21cf6f","Cargo.toml":"a1b8ddc48f318b35ffb0efcf4ddcd97195f6dd2f1db5b0a59ed3c7cb8183999d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b033f57f23fffca5bee9406cf453ce31e919c1b867df54bfa7487e73d8c9c1f","README.md":"649b9aa858c8d7d79be7e2870ade92ea1ddf62efd595e790f2467a63240558bd","examples/client.rs":"b736a54159ec7af09d65a4682b4902d12e00a2f976ab981570c89d519f8c72e3","src/client.rs":"e2e356dbd3dbc30b9a338bb4310e908bbc215ef21ff3fb081436ab23a96f89b3","src/lib.rs":"fe7048dabb8905e95e9fb8c9e6dbec27aff3de93ba205fa898cb5c70588724b1","src/stream.rs":"ca7982834ed156403a738c2fd984c0704f2a7eda3e5cf6d98e818a53fbf3a1f8"},"package":"d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -2,9 +2,9 @@
 # It is not intended for manual editing.
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "bitflags"
@@ -14,18 +14,21 @@
 
 [[package]]
 name = "bytes"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b"
-dependencies = [
- "loom",
-]
+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+
+[[package]]
+name = "bytes"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72"
 
 [[package]]
 name = "cc"
-version = "1.0.57"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
 
 [[package]]
 name = "cfg-if"
@@ -34,10 +37,16 @@
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
 name = "core-foundation"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -45,9 +54,9 @@
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.7.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
 
 [[package]]
 name = "fnv"
@@ -71,53 +80,31 @@
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
 name = "futures-channel"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
-
-[[package]]
-name = "futures-sink"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
 
 [[package]]
 name = "futures-task"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
+checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
 
 [[package]]
 name = "futures-util"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -126,66 +113,34 @@
 ]
 
 [[package]]
-name = "generator"
-version = "0.6.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustc_version",
- "winapi 0.3.9",
-]
-
-[[package]]
 name = "getrandom"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "wasi",
 ]
 
 [[package]]
-name = "h2"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b7246d7e4b979c03fa093da39cfb3617a96bbeee6310af63991668d7e843ff"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "log",
- "slab",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "fnv",
  "itoa",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
+checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994"
 dependencies = [
- "bytes",
+ "bytes 1.0.0",
  "http",
 ]
 
@@ -196,73 +151,50 @@
 checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 
 [[package]]
+name = "httpdate"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+
+[[package]]
 name = "hyper"
-version = "0.13.6"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e7655b9594024ad0ee439f3b5a7299369dc2a3f459b47c696f9ff676f9aa1f"
+checksum = "12219dc884514cb4a6a03737f4413c0e01c23a1b059b0156004b23f1e19dccbe"
 dependencies = [
- "bytes",
+ "bytes 1.0.0",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
  "http",
  "http-body",
  "httparse",
+ "httpdate",
  "itoa",
- "log",
  "pin-project",
  "socket2",
- "time",
  "tokio",
  "tower-service",
+ "tracing",
  "want",
 ]
 
 [[package]]
 name = "hyper-tls"
-version = "0.4.3"
+version = "0.5.0"
 dependencies = [
- "bytes",
+ "bytes 1.0.0",
  "hyper",
  "native-tls",
  "tokio",
- "tokio-tls",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
+ "tokio-native-tls",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "lazy_static"
@@ -272,72 +204,53 @@
 
 [[package]]
 name = "libc"
-version = "0.2.71"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
 
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "loom"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "mio"
-version = "0.6.22"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+checksum = "f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b"
 dependencies = [
- "cfg-if",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
  "libc",
  "log",
  "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
+ "ntapi",
+ "winapi",
 ]
 
 [[package]]
 name = "miow"
-version = "0.2.1"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
 dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "socket2",
+ "winapi",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
+checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
 dependencies = [
  "lazy_static",
  "libc",
@@ -352,24 +265,22 @@
 ]
 
 [[package]]
-name = "net2"
-version = "0.2.34"
+name = "ntapi"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
 dependencies = [
- "cfg-if",
- "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "openssl"
-version = "0.10.30"
+version = "0.10.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
 dependencies = [
  "bitflags",
- "cfg-if",
+ "cfg-if 1.0.0",
  "foreign-types",
  "lazy_static",
  "libc",
@@ -384,18 +295,18 @@
 
 [[package]]
 name = "openssl-src"
-version = "111.10.0+1.1.1g"
+version = "111.13.0+1.1.1i"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47cd4a96d49c3abf4cac8e8a80cba998a030c75608f158fb1c5f609772f265e6"
+checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.58"
+version = "0.9.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
+checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
 dependencies = [
  "autocfg",
  "cc",
@@ -407,18 +318,18 @@
 
 [[package]]
 name = "pin-project"
-version = "0.4.22"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "0.4.22"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -427,9 +338,9 @@
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.7"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
 
 [[package]]
 name = "pin-utils"
@@ -439,30 +350,30 @@
 
 [[package]]
 name = "pkg-config"
-version = "0.3.17"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
 dependencies = [
  "proc-macro2",
 ]
@@ -510,9 +421,9 @@
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.56"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "remove_dir_all"
@@ -520,16 +431,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
+ "winapi",
 ]
 
 [[package]]
@@ -539,20 +441,14 @@
 checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
 dependencies = [
  "lazy_static",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
-name = "scoped-tls"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
-
-[[package]]
 name = "security-framework"
-version = "0.4.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
+checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -563,52 +459,30 @@
 
 [[package]]
 name = "security-framework-sys"
-version = "0.4.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
+checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
 dependencies = [
  "core-foundation-sys",
  "libc",
 ]
 
 [[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-
-[[package]]
 name = "socket2"
-version = "0.3.12"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.33"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
+checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -621,47 +495,34 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "rand",
  "redox_syscall",
  "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "time"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-dependencies = [
- "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "tokio"
-version = "0.2.21"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58"
+checksum = "d258221f566b6c803c7b4714abadc080172b272090cdc5e244a6d4dd13c3a6bd"
 dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
+ "autocfg",
+ "bytes 1.0.0",
+ "libc",
  "memchr",
  "mio",
  "pin-project-lite",
- "slab",
  "tokio-macros",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "0.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
+checksum = "42517d2975ca3114b22a16192634e8241dc5cc1f130be194645970cc1c371494"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -669,40 +530,46 @@
 ]
 
 [[package]]
-name = "tokio-tls"
-version = "0.3.1"
+name = "tokio-native-tls"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
  "tokio",
 ]
 
 [[package]]
-name = "tokio-util"
-version = "0.3.1"
+name = "tower-service"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
+checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+
+[[package]]
+name = "tracing"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
 dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
+ "cfg-if 1.0.0",
  "pin-project-lite",
- "tokio",
+ "tracing-core",
 ]
 
 [[package]]
-name = "tower-service"
-version = "0.3.0"
+name = "tracing-core"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+dependencies = [
+ "lazy_static",
+]
 
 [[package]]
 name = "try-lock"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "unicode-xid"
@@ -712,9 +579,9 @@
 
 [[package]]
 name = "vcpkg"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
 
 [[package]]
 name = "want"
@@ -734,12 +601,6 @@
 
 [[package]]
 name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
@@ -749,12 +610,6 @@
 ]
 
 [[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -765,13 +620,3 @@
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "hyper-tls"
-version = "0.4.3"
+version = "0.5.0"
 authors = ["Sean McArthur <sean@seanmonstar.com>"]
 description = "Default TLS implementation for use with hyper"
 homepage = "https://hyper.rs"
@@ -22,24 +22,29 @@
 license = "MIT/Apache-2.0"
 repository = "https://github.com/hyperium/hyper-tls"
 [dependencies.bytes]
-version = "0.5"
+version = "1"
 
 [dependencies.hyper]
-version = "0.13"
-features = ["tcp"]
+version = "0.14.2"
+features = ["tcp", "client"]
 default-features = false
 
 [dependencies.native-tls]
-version = "0.2"
+version = "0.2.1"
 
 [dependencies.tokio]
-version = "0.2"
+version = "1"
 
-[dependencies.tokio-tls]
+[dependencies.tokio-native-tls]
 version = "0.3"
+[dev-dependencies.hyper]
+version = "0.14.2"
+features = ["http1"]
+default-features = false
+
 [dev-dependencies.tokio]
-version = "0.2"
-features = ["io-std", "macros"]
+version = "1.0.0"
+features = ["io-std", "macros", "io-util"]
 
 [features]
 vendored = ["native-tls/vendored"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/examples/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/examples/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/examples/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/examples/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,8 @@
-
-use hyper::{Client, body::HttpBody as _};
+use hyper::{body::HttpBody as _, Client};
 use hyper_tls::HttpsConnector;
 use tokio::io::{self, AsyncWriteExt as _};
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let https = HttpsConnector::new();
     let client = Client::builder().build::<_, hyper::Body>(https);
@@ -15,9 +14,7 @@
 
     while let Some(chunk) = res.body_mut().data().await {
         let chunk = chunk?;
-        io::stdout()
-            .write_all(&chunk)
-            .await?
+        io::stdout().write_all(&chunk).await?
     }
     Ok(())
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/src/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/src/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/src/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/src/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
 
 use hyper::{client::connect::HttpConnector, service::Service, Uri};
 use tokio::io::{AsyncRead, AsyncWrite};
-use tokio_tls::TlsConnector;
+use tokio_native_tls::TlsConnector;
 
 use crate::stream::MaybeHttpsStream;
 
@@ -65,13 +65,18 @@
     pub fn https_only(&mut self, enable: bool) {
         self.force_https = enable;
     }
-    
+
     /// With connector constructor
-    /// 
+    ///
     pub fn new_with_connector(http: T) -> Self {
         native_tls::TlsConnector::new()
             .map(|tls| HttpsConnector::from((http, tls.into())))
-            .unwrap_or_else(|e| panic!("HttpsConnector::new_with_connector(<connector>) failure: {}", e))
+            .unwrap_or_else(|e| {
+                panic!(
+                    "HttpsConnector::new_with_connector(<connector>) failure: {}",
+                    e
+                )
+            })
     }
 }
 
@@ -120,15 +125,17 @@
             return err(ForceHttpsButUriNotHttps.into());
         }
 
-        let host = dst.host().unwrap_or("").trim_matches(|c| c == '[' || c == ']').to_owned();
+        let host = dst
+            .host()
+            .unwrap_or("")
+            .trim_matches(|c| c == '[' || c == ']')
+            .to_owned();
         let connecting = self.http.call(dst);
         let tls = self.tls.clone();
         let fut = async move {
             let tcp = connecting.await.map_err(Into::into)?;
             let maybe = if is_https {
-                let tls = tls
-                    .connect(&host, tcp)
-                    .await?;
+                let tls = tls.connect(&host, tcp).await?;
                 MaybeHttpsStream::Https(tls)
             } else {
                 MaybeHttpsStream::Http(tcp)
@@ -143,8 +150,7 @@
     HttpsConnecting(Box::pin(async { Err(e) }))
 }
 
-type BoxedFut<T> =
-    Pin<Box<dyn Future<Output = Result<MaybeHttpsStream<T>, BoxError>> + Send>>;
+type BoxedFut<T> = Pin<Box<dyn Future<Output = Result<MaybeHttpsStream<T>, BoxError>> + Send>>;
 
 /// A Future representing work to connect to a URL, and a TLS handshake.
 pub struct HttpsConnecting<T>(BoxedFut<T>);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
 //! use hyper_tls::HttpsConnector;
 //! use hyper::Client;
 //!
-//! #[tokio::main]
+//! #[tokio::main(flavor = "current_thread")]
 //! async fn main() -> Result<(), Box<dyn std::error::Error>>{
 //!     let https = HttpsConnector::new();
 //!     let client = Client::builder().build::<_, hyper::Body>(https);
@@ -20,7 +20,7 @@
 //!     Ok(())
 //! }
 //! ```
-#![doc(html_root_url = "https://docs.rs/hyper-tls/0.4.3")]
+#![doc(html_root_url = "https://docs.rs/hyper-tls/0.5.0")]
 #![cfg_attr(test, deny(warnings))]
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/src/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/src/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/hyper-tls/src/stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/hyper-tls/src/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,12 @@
 use std::fmt;
 use std::io;
+use std::io::IoSlice;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-use bytes::{Buf, BufMut};
 use hyper::client::connect::{Connected, Connection};
-use tokio::io::{AsyncRead, AsyncWrite};
-pub use tokio_tls::TlsStream;
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+pub use tokio_native_tls::TlsStream;
 
 /// A stream that might be protected with TLS.
 pub enum MaybeHttpsStream<T> {
@@ -41,36 +41,16 @@
 
 impl<T: AsyncRead + AsyncWrite + Unpin> AsyncRead for MaybeHttpsStream<T> {
     #[inline]
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        match self {
-            MaybeHttpsStream::Http(s) => s.prepare_uninitialized_buffer(buf),
-            MaybeHttpsStream::Https(s) => s.prepare_uninitialized_buffer(buf),
-        }
-    }
-
-    #[inline]
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context,
-        buf: &mut [u8],
-    ) -> Poll<Result<usize, io::Error>> {
+        buf: &mut ReadBuf,
+    ) -> Poll<Result<(), io::Error>> {
         match Pin::get_mut(self) {
             MaybeHttpsStream::Http(s) => Pin::new(s).poll_read(cx, buf),
             MaybeHttpsStream::Https(s) => Pin::new(s).poll_read(cx, buf),
         }
     }
-
-    #[inline]
-    fn poll_read_buf<B: BufMut>(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut B,
-    ) -> Poll<Result<usize, io::Error>> {
-        match Pin::get_mut(self) {
-            MaybeHttpsStream::Http(s) => Pin::new(s).poll_read_buf(cx, buf),
-            MaybeHttpsStream::Https(s) => Pin::new(s).poll_read_buf(cx, buf),
-        }
-    }
 }
 
 impl<T: AsyncWrite + AsyncRead + Unpin> AsyncWrite for MaybeHttpsStream<T> {
@@ -86,15 +66,21 @@
         }
     }
 
-    #[inline]
-    fn poll_write_buf<B: Buf>(
+    fn poll_write_vectored(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut B,
+        bufs: &[IoSlice<'_>],
     ) -> Poll<Result<usize, io::Error>> {
         match Pin::get_mut(self) {
-            MaybeHttpsStream::Http(s) => Pin::new(s).poll_write_buf(cx, buf),
-            MaybeHttpsStream::Https(s) => Pin::new(s).poll_write_buf(cx, buf),
+            MaybeHttpsStream::Http(s) => Pin::new(s).poll_write_vectored(cx, bufs),
+            MaybeHttpsStream::Https(s) => Pin::new(s).poll_write_vectored(cx, bufs),
+        }
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        match self {
+            MaybeHttpsStream::Http(s) => s.is_write_vectored(),
+            MaybeHttpsStream::Https(s) => s.is_write_vectored(),
         }
     }
 
@@ -119,7 +105,7 @@
     fn connected(&self) -> Connected {
         match self {
             MaybeHttpsStream::Http(s) => s.connected(),
-            MaybeHttpsStream::Https(s) => s.get_ref().connected(),
+            MaybeHttpsStream::Https(s) => s.get_ref().get_ref().get_ref().connected(),
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/benches/all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/benches/all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/benches/all.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/benches/all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+#[macro_use]
+extern crate bencher;
+extern crate idna;
+
+use bencher::{black_box, Bencher};
+use idna::Config;
+
+fn to_unicode_puny_label(bench: &mut Bencher) {
+    let encoded = "abc.xn--mgbcm";
+    let config = Config::default();
+    bench.iter(|| config.to_unicode(black_box(encoded)));
+}
+
+fn to_unicode_ascii(bench: &mut Bencher) {
+    let encoded = "example.com";
+    let config = Config::default();
+    bench.iter(|| config.to_unicode(black_box(encoded)));
+}
+
+fn to_unicode_merged_label(bench: &mut Bencher) {
+    let encoded = "Beispiel.xn--vermgensberater-ctb";
+    let config = Config::default();
+    bench.iter(|| config.to_unicode(black_box(encoded)));
+}
+
+fn to_ascii_puny_label(bench: &mut Bencher) {
+    let encoded = "abc.ابج";
+    let config = Config::default();
+    bench.iter(|| config.to_ascii(black_box(encoded)));
+}
+
+fn to_ascii_simple(bench: &mut Bencher) {
+    let encoded = "example.com";
+    let config = Config::default();
+    bench.iter(|| config.to_ascii(black_box(encoded)));
+}
+
+fn to_ascii_merged(bench: &mut Bencher) {
+    let encoded = "beispiel.vermögensberater";
+    let config = Config::default();
+    bench.iter(|| config.to_ascii(black_box(encoded)));
+}
+
+benchmark_group!(
+    benches,
+    to_unicode_puny_label,
+    to_unicode_ascii,
+    to_unicode_merged_label,
+    to_ascii_puny_label,
+    to_ascii_simple,
+    to_ascii_merged,
+);
+benchmark_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"af4fe12b69e1354864a33c43eab5f8466d435a216b35c8fb4b6b567d11dfb28a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","src/IdnaMappingTable.txt":"813a8308aeff8bcb9368751e1fd0ad7cc467130965d53ac860f82c4d0d11523f","src/lib.rs":"590280903e929c7eadd5473faf67c48293d734b9a75ea42798264b6b10d3f33f","src/make_uts46_mapping_table.py":"fd4ff62fc27dc8d15d5b61c3504f5f754aded1c3e16c1179506adff5df766d74","src/punycode.rs":"fe078681e4a565615b71a7f8ce92373de59f09cffc1aac074822b0e1630a0cba","src/uts46.rs":"96b47ff8cc1a992bfc2f8b9138eb9a92908dce1de2e6457cc7e6d2a187fe0b5d","src/uts46_mapping_table.rs":"9d0b645182592709ea87c6db7ca1c4e1d9b2826b68efd746f764cafcb0545da2","tests/IdnaTest.txt":"921c68e5d3fbb631b26140d232af90040fc4df612857d1894641ded319e52822","tests/punycode.rs":"5a786d09f2bbedfdbd9ac18c99af25ecaf097710b5760792c328c78c1750a209","tests/punycode_tests.json":"3d4ac0cf25984c37b9ce197f5df680a0136f728fb8ec82bc76624e42139eb3a8","tests/tests.rs":"84d56979840dcbb1100cc5e0a5450be642b1e5dfc76abf853da121035903e5ae","tests/unit.rs":"4a20fded1ac8bc5177f28ae49dcbb25f9a646300de4524ce8ca20258a558d3fc","tests/uts46.rs":"ce896ba3d39f0d8e82975b97d2b9540e37b3928d07eb2dd2fb4a83f4deb4873d"},"package":"02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"}
\ No newline at end of file
+{"files":{"Cargo.toml":"fa141dcb135262e5fda9f680671699045326d96779bb1acf38d48c70c712bcdf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","benches/all.rs":"e734b9c9092ed66986725f86cfe90f3756cfddb058af308b796ba494f9beefc2","src/IdnaMappingTable.txt":"87d6553a4b86bc49dcade38bf26b745cd81800eb8af295dc3fb99b4729eaea38","src/lib.rs":"d61b2bfcf4265b9a41eedd1de33ab49ea615e3c06df944321b30c57950a85342","src/make_uts46_mapping_table.py":"917055fa841f813de2bcf79cc79b595da3d5551559ee768db8660ab77cb26c34","src/punycode.rs":"07edf5293bc384a164eebb01bc18fe3d4b2d009b4565a36b74a3030978ea6e04","src/uts46.rs":"40521a01e5b8c38667252d5b1e0141c5a71f63aeae2f451b986792984e633b09","src/uts46_mapping_table.rs":"942fff78147c61da942f5f3a7ff4e90f9d7a00a29285733ac3fc3357eb2ed06f","tests/IdnaTestV2.txt":"c6f3778b0545fd150c8063286c7f5adc901e16557eddccc3751213646d07593d","tests/punycode.rs":"e6fb978f48445d1525a6b97351c41c5393a1612a35f85b9a7f45b8794fce9aba","tests/punycode_tests.json":"3d4ac0cf25984c37b9ce197f5df680a0136f728fb8ec82bc76624e42139eb3a8","tests/tests.rs":"de7425a3e4e6e871255721107803704d1431246601fa9c87105224d88dfe60d6","tests/unit.rs":"be025a7d9bab3bd1ce134c87f9d848269e157b31ca5ba0ea03426c1ac736b69e","tests/uts46.rs":"ca91d48811d366fb9e32d7aa79cfda1261b93c271b6ed7fb5535de9a2500205b"},"package":"418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "idna"
-version = "0.2.0"
+version = "0.2.3"
 authors = ["The rust-url developers"]
 autotests = false
 description = "IDNA (Internationalizing Domain Names in Applications) and Punycode."
@@ -20,7 +21,6 @@
 repository = "https://github.com/servo/rust-url/"
 
 [lib]
-test = false
 doctest = false
 
 [[test]]
@@ -29,6 +29,10 @@
 
 [[test]]
 name = "unit"
+
+[[bench]]
+name = "all"
+harness = false
 [dependencies.matches]
 version = "0.1"
 
@@ -36,7 +40,13 @@
 version = "0.3"
 
 [dependencies.unicode-normalization]
-version = "0.1.5"
+version = "0.1.17"
+[dev-dependencies.assert_matches]
+version = "1.3"
+
+[dev-dependencies.bencher]
+version = "0.1"
+
 [dev-dependencies.rustc-test]
 version = "0.3"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/IdnaMappingTable.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/IdnaMappingTable.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/IdnaMappingTable.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/IdnaMappingTable.txt	2021-12-09 12:01:26.000000000 +0000
@@ -1,8405 +1,8727 @@
-# IdnaMappingTable-10.0.0.txt
-# Date: 2017-02-23, 14:18:32 GMT
-# © 2017 Unicode®, Inc.
-# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
-# Unicode IDNA Compatible Preprocessing (UTS #46)
-# For documentation, see http://www.unicode.org/reports/tr46/
-
-0000..002C    ; disallowed_STD3_valid                  # 1.1  <control-0000>..COMMA
-002D..002E    ; valid                                  # 1.1  HYPHEN-MINUS..FULL STOP
-002F          ; disallowed_STD3_valid                  # 1.1  SOLIDUS
-0030..0039    ; valid                                  # 1.1  DIGIT ZERO..DIGIT NINE
-003A..0040    ; disallowed_STD3_valid                  # 1.1  COLON..COMMERCIAL AT
-0041          ; mapped                 ; 0061          # 1.1  LATIN CAPITAL LETTER A
-0042          ; mapped                 ; 0062          # 1.1  LATIN CAPITAL LETTER B
-0043          ; mapped                 ; 0063          # 1.1  LATIN CAPITAL LETTER C
-0044          ; mapped                 ; 0064          # 1.1  LATIN CAPITAL LETTER D
-0045          ; mapped                 ; 0065          # 1.1  LATIN CAPITAL LETTER E
-0046          ; mapped                 ; 0066          # 1.1  LATIN CAPITAL LETTER F
-0047          ; mapped                 ; 0067          # 1.1  LATIN CAPITAL LETTER G
-0048          ; mapped                 ; 0068          # 1.1  LATIN CAPITAL LETTER H
-0049          ; mapped                 ; 0069          # 1.1  LATIN CAPITAL LETTER I
-004A          ; mapped                 ; 006A          # 1.1  LATIN CAPITAL LETTER J
-004B          ; mapped                 ; 006B          # 1.1  LATIN CAPITAL LETTER K
-004C          ; mapped                 ; 006C          # 1.1  LATIN CAPITAL LETTER L
-004D          ; mapped                 ; 006D          # 1.1  LATIN CAPITAL LETTER M
-004E          ; mapped                 ; 006E          # 1.1  LATIN CAPITAL LETTER N
-004F          ; mapped                 ; 006F          # 1.1  LATIN CAPITAL LETTER O
-0050          ; mapped                 ; 0070          # 1.1  LATIN CAPITAL LETTER P
-0051          ; mapped                 ; 0071          # 1.1  LATIN CAPITAL LETTER Q
-0052          ; mapped                 ; 0072          # 1.1  LATIN CAPITAL LETTER R
-0053          ; mapped                 ; 0073          # 1.1  LATIN CAPITAL LETTER S
-0054          ; mapped                 ; 0074          # 1.1  LATIN CAPITAL LETTER T
-0055          ; mapped                 ; 0075          # 1.1  LATIN CAPITAL LETTER U
-0056          ; mapped                 ; 0076          # 1.1  LATIN CAPITAL LETTER V
-0057          ; mapped                 ; 0077          # 1.1  LATIN CAPITAL LETTER W
-0058          ; mapped                 ; 0078          # 1.1  LATIN CAPITAL LETTER X
-0059          ; mapped                 ; 0079          # 1.1  LATIN CAPITAL LETTER Y
-005A          ; mapped                 ; 007A          # 1.1  LATIN CAPITAL LETTER Z
-005B..0060    ; disallowed_STD3_valid                  # 1.1  LEFT SQUARE BRACKET..GRAVE ACCENT
-0061..007A    ; valid                                  # 1.1  LATIN SMALL LETTER A..LATIN SMALL LETTER Z
-007B..007F    ; disallowed_STD3_valid                  # 1.1  LEFT CURLY BRACKET..<control-007F>
-0080..009F    ; disallowed                             # 1.1  <control-0080>..<control-009F>
-00A0          ; disallowed_STD3_mapped ; 0020          # 1.1  NO-BREAK SPACE
-00A1..00A7    ; valid                  ;      ; NV8    # 1.1  INVERTED EXCLAMATION MARK..SECTION SIGN
-00A8          ; disallowed_STD3_mapped ; 0020 0308     # 1.1  DIAERESIS
-00A9          ; valid                  ;      ; NV8    # 1.1  COPYRIGHT SIGN
-00AA          ; mapped                 ; 0061          # 1.1  FEMININE ORDINAL INDICATOR
-00AB..00AC    ; valid                  ;      ; NV8    # 1.1  LEFT-POINTING DOUBLE ANGLE QUOTATION MARK..NOT SIGN
-00AD          ; ignored                                # 1.1  SOFT HYPHEN
-00AE          ; valid                  ;      ; NV8    # 1.1  REGISTERED SIGN
-00AF          ; disallowed_STD3_mapped ; 0020 0304     # 1.1  MACRON
-00B0..00B1    ; valid                  ;      ; NV8    # 1.1  DEGREE SIGN..PLUS-MINUS SIGN
-00B2          ; mapped                 ; 0032          # 1.1  SUPERSCRIPT TWO
-00B3          ; mapped                 ; 0033          # 1.1  SUPERSCRIPT THREE
-00B4          ; disallowed_STD3_mapped ; 0020 0301     # 1.1  ACUTE ACCENT
-00B5          ; mapped                 ; 03BC          # 1.1  MICRO SIGN
-00B6          ; valid                  ;      ; NV8    # 1.1  PILCROW SIGN
-00B7          ; valid                                  # 1.1  MIDDLE DOT
-00B8          ; disallowed_STD3_mapped ; 0020 0327     # 1.1  CEDILLA
-00B9          ; mapped                 ; 0031          # 1.1  SUPERSCRIPT ONE
-00BA          ; mapped                 ; 006F          # 1.1  MASCULINE ORDINAL INDICATOR
-00BB          ; valid                  ;      ; NV8    # 1.1  RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-00BC          ; mapped                 ; 0031 2044 0034 #1.1  VULGAR FRACTION ONE QUARTER
-00BD          ; mapped                 ; 0031 2044 0032 #1.1  VULGAR FRACTION ONE HALF
-00BE          ; mapped                 ; 0033 2044 0034 #1.1  VULGAR FRACTION THREE QUARTERS
-00BF          ; valid                  ;      ; NV8    # 1.1  INVERTED QUESTION MARK
-00C0          ; mapped                 ; 00E0          # 1.1  LATIN CAPITAL LETTER A WITH GRAVE
-00C1          ; mapped                 ; 00E1          # 1.1  LATIN CAPITAL LETTER A WITH ACUTE
-00C2          ; mapped                 ; 00E2          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-00C3          ; mapped                 ; 00E3          # 1.1  LATIN CAPITAL LETTER A WITH TILDE
-00C4          ; mapped                 ; 00E4          # 1.1  LATIN CAPITAL LETTER A WITH DIAERESIS
-00C5          ; mapped                 ; 00E5          # 1.1  LATIN CAPITAL LETTER A WITH RING ABOVE
-00C6          ; mapped                 ; 00E6          # 1.1  LATIN CAPITAL LETTER AE
-00C7          ; mapped                 ; 00E7          # 1.1  LATIN CAPITAL LETTER C WITH CEDILLA
-00C8          ; mapped                 ; 00E8          # 1.1  LATIN CAPITAL LETTER E WITH GRAVE
-00C9          ; mapped                 ; 00E9          # 1.1  LATIN CAPITAL LETTER E WITH ACUTE
-00CA          ; mapped                 ; 00EA          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-00CB          ; mapped                 ; 00EB          # 1.1  LATIN CAPITAL LETTER E WITH DIAERESIS
-00CC          ; mapped                 ; 00EC          # 1.1  LATIN CAPITAL LETTER I WITH GRAVE
-00CD          ; mapped                 ; 00ED          # 1.1  LATIN CAPITAL LETTER I WITH ACUTE
-00CE          ; mapped                 ; 00EE          # 1.1  LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-00CF          ; mapped                 ; 00EF          # 1.1  LATIN CAPITAL LETTER I WITH DIAERESIS
-00D0          ; mapped                 ; 00F0          # 1.1  LATIN CAPITAL LETTER ETH
-00D1          ; mapped                 ; 00F1          # 1.1  LATIN CAPITAL LETTER N WITH TILDE
-00D2          ; mapped                 ; 00F2          # 1.1  LATIN CAPITAL LETTER O WITH GRAVE
-00D3          ; mapped                 ; 00F3          # 1.1  LATIN CAPITAL LETTER O WITH ACUTE
-00D4          ; mapped                 ; 00F4          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-00D5          ; mapped                 ; 00F5          # 1.1  LATIN CAPITAL LETTER O WITH TILDE
-00D6          ; mapped                 ; 00F6          # 1.1  LATIN CAPITAL LETTER O WITH DIAERESIS
-00D7          ; valid                  ;      ; NV8    # 1.1  MULTIPLICATION SIGN
-00D8          ; mapped                 ; 00F8          # 1.1  LATIN CAPITAL LETTER O WITH STROKE
-00D9          ; mapped                 ; 00F9          # 1.1  LATIN CAPITAL LETTER U WITH GRAVE
-00DA          ; mapped                 ; 00FA          # 1.1  LATIN CAPITAL LETTER U WITH ACUTE
-00DB          ; mapped                 ; 00FB          # 1.1  LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-00DC          ; mapped                 ; 00FC          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS
-00DD          ; mapped                 ; 00FD          # 1.1  LATIN CAPITAL LETTER Y WITH ACUTE
-00DE          ; mapped                 ; 00FE          # 1.1  LATIN CAPITAL LETTER THORN
-00DF          ; deviation              ; 0073 0073     # 1.1  LATIN SMALL LETTER SHARP S
-00E0..00F6    ; valid                                  # 1.1  LATIN SMALL LETTER A WITH GRAVE..LATIN SMALL LETTER O WITH DIAERESIS
-00F7          ; valid                  ;      ; NV8    # 1.1  DIVISION SIGN
-00F8..00FF    ; valid                                  # 1.1  LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER Y WITH DIAERESIS
-0100          ; mapped                 ; 0101          # 1.1  LATIN CAPITAL LETTER A WITH MACRON
-0101          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH MACRON
-0102          ; mapped                 ; 0103          # 1.1  LATIN CAPITAL LETTER A WITH BREVE
-0103          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE
-0104          ; mapped                 ; 0105          # 1.1  LATIN CAPITAL LETTER A WITH OGONEK
-0105          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH OGONEK
-0106          ; mapped                 ; 0107          # 1.1  LATIN CAPITAL LETTER C WITH ACUTE
-0107          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH ACUTE
-0108          ; mapped                 ; 0109          # 1.1  LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-0109          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH CIRCUMFLEX
-010A          ; mapped                 ; 010B          # 1.1  LATIN CAPITAL LETTER C WITH DOT ABOVE
-010B          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH DOT ABOVE
-010C          ; mapped                 ; 010D          # 1.1  LATIN CAPITAL LETTER C WITH CARON
-010D          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH CARON
-010E          ; mapped                 ; 010F          # 1.1  LATIN CAPITAL LETTER D WITH CARON
-010F          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH CARON
-0110          ; mapped                 ; 0111          # 1.1  LATIN CAPITAL LETTER D WITH STROKE
-0111          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH STROKE
-0112          ; mapped                 ; 0113          # 1.1  LATIN CAPITAL LETTER E WITH MACRON
-0113          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH MACRON
-0114          ; mapped                 ; 0115          # 1.1  LATIN CAPITAL LETTER E WITH BREVE
-0115          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH BREVE
-0116          ; mapped                 ; 0117          # 1.1  LATIN CAPITAL LETTER E WITH DOT ABOVE
-0117          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH DOT ABOVE
-0118          ; mapped                 ; 0119          # 1.1  LATIN CAPITAL LETTER E WITH OGONEK
-0119          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH OGONEK
-011A          ; mapped                 ; 011B          # 1.1  LATIN CAPITAL LETTER E WITH CARON
-011B          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CARON
-011C          ; mapped                 ; 011D          # 1.1  LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-011D          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH CIRCUMFLEX
-011E          ; mapped                 ; 011F          # 1.1  LATIN CAPITAL LETTER G WITH BREVE
-011F          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH BREVE
-0120          ; mapped                 ; 0121          # 1.1  LATIN CAPITAL LETTER G WITH DOT ABOVE
-0121          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH DOT ABOVE
-0122          ; mapped                 ; 0123          # 1.1  LATIN CAPITAL LETTER G WITH CEDILLA
-0123          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH CEDILLA
-0124          ; mapped                 ; 0125          # 1.1  LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-0125          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH CIRCUMFLEX
-0126          ; mapped                 ; 0127          # 1.1  LATIN CAPITAL LETTER H WITH STROKE
-0127          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH STROKE
-0128          ; mapped                 ; 0129          # 1.1  LATIN CAPITAL LETTER I WITH TILDE
-0129          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH TILDE
-012A          ; mapped                 ; 012B          # 1.1  LATIN CAPITAL LETTER I WITH MACRON
-012B          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH MACRON
-012C          ; mapped                 ; 012D          # 1.1  LATIN CAPITAL LETTER I WITH BREVE
-012D          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH BREVE
-012E          ; mapped                 ; 012F          # 1.1  LATIN CAPITAL LETTER I WITH OGONEK
-012F          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH OGONEK
-0130          ; mapped                 ; 0069 0307     # 1.1  LATIN CAPITAL LETTER I WITH DOT ABOVE
-0131          ; valid                                  # 1.1  LATIN SMALL LETTER DOTLESS I
-0132..0133    ; mapped                 ; 0069 006A     # 1.1  LATIN CAPITAL LIGATURE IJ..LATIN SMALL LIGATURE IJ
-0134          ; mapped                 ; 0135          # 1.1  LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-0135          ; valid                                  # 1.1  LATIN SMALL LETTER J WITH CIRCUMFLEX
-0136          ; mapped                 ; 0137          # 1.1  LATIN CAPITAL LETTER K WITH CEDILLA
-0137..0138    ; valid                                  # 1.1  LATIN SMALL LETTER K WITH CEDILLA..LATIN SMALL LETTER KRA
-0139          ; mapped                 ; 013A          # 1.1  LATIN CAPITAL LETTER L WITH ACUTE
-013A          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH ACUTE
-013B          ; mapped                 ; 013C          # 1.1  LATIN CAPITAL LETTER L WITH CEDILLA
-013C          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH CEDILLA
-013D          ; mapped                 ; 013E          # 1.1  LATIN CAPITAL LETTER L WITH CARON
-013E          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH CARON
-013F..0140    ; mapped                 ; 006C 00B7     # 1.1  LATIN CAPITAL LETTER L WITH MIDDLE DOT..LATIN SMALL LETTER L WITH MIDDLE DOT
-0141          ; mapped                 ; 0142          # 1.1  LATIN CAPITAL LETTER L WITH STROKE
-0142          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH STROKE
-0143          ; mapped                 ; 0144          # 1.1  LATIN CAPITAL LETTER N WITH ACUTE
-0144          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH ACUTE
-0145          ; mapped                 ; 0146          # 1.1  LATIN CAPITAL LETTER N WITH CEDILLA
-0146          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH CEDILLA
-0147          ; mapped                 ; 0148          # 1.1  LATIN CAPITAL LETTER N WITH CARON
-0148          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH CARON
-0149          ; mapped                 ; 02BC 006E     # 1.1  LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
-014A          ; mapped                 ; 014B          # 1.1  LATIN CAPITAL LETTER ENG
-014B          ; valid                                  # 1.1  LATIN SMALL LETTER ENG
-014C          ; mapped                 ; 014D          # 1.1  LATIN CAPITAL LETTER O WITH MACRON
-014D          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH MACRON
-014E          ; mapped                 ; 014F          # 1.1  LATIN CAPITAL LETTER O WITH BREVE
-014F          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH BREVE
-0150          ; mapped                 ; 0151          # 1.1  LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-0151          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH DOUBLE ACUTE
-0152          ; mapped                 ; 0153          # 1.1  LATIN CAPITAL LIGATURE OE
-0153          ; valid                                  # 1.1  LATIN SMALL LIGATURE OE
-0154          ; mapped                 ; 0155          # 1.1  LATIN CAPITAL LETTER R WITH ACUTE
-0155          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH ACUTE
-0156          ; mapped                 ; 0157          # 1.1  LATIN CAPITAL LETTER R WITH CEDILLA
-0157          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH CEDILLA
-0158          ; mapped                 ; 0159          # 1.1  LATIN CAPITAL LETTER R WITH CARON
-0159          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH CARON
-015A          ; mapped                 ; 015B          # 1.1  LATIN CAPITAL LETTER S WITH ACUTE
-015B          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH ACUTE
-015C          ; mapped                 ; 015D          # 1.1  LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-015D          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH CIRCUMFLEX
-015E          ; mapped                 ; 015F          # 1.1  LATIN CAPITAL LETTER S WITH CEDILLA
-015F          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH CEDILLA
-0160          ; mapped                 ; 0161          # 1.1  LATIN CAPITAL LETTER S WITH CARON
-0161          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH CARON
-0162          ; mapped                 ; 0163          # 1.1  LATIN CAPITAL LETTER T WITH CEDILLA
-0163          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH CEDILLA
-0164          ; mapped                 ; 0165          # 1.1  LATIN CAPITAL LETTER T WITH CARON
-0165          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH CARON
-0166          ; mapped                 ; 0167          # 1.1  LATIN CAPITAL LETTER T WITH STROKE
-0167          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH STROKE
-0168          ; mapped                 ; 0169          # 1.1  LATIN CAPITAL LETTER U WITH TILDE
-0169          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH TILDE
-016A          ; mapped                 ; 016B          # 1.1  LATIN CAPITAL LETTER U WITH MACRON
-016B          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH MACRON
-016C          ; mapped                 ; 016D          # 1.1  LATIN CAPITAL LETTER U WITH BREVE
-016D          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH BREVE
-016E          ; mapped                 ; 016F          # 1.1  LATIN CAPITAL LETTER U WITH RING ABOVE
-016F          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH RING ABOVE
-0170          ; mapped                 ; 0171          # 1.1  LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-0171          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DOUBLE ACUTE
-0172          ; mapped                 ; 0173          # 1.1  LATIN CAPITAL LETTER U WITH OGONEK
-0173          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH OGONEK
-0174          ; mapped                 ; 0175          # 1.1  LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-0175          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH CIRCUMFLEX
-0176          ; mapped                 ; 0177          # 1.1  LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-0177          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH CIRCUMFLEX
-0178          ; mapped                 ; 00FF          # 1.1  LATIN CAPITAL LETTER Y WITH DIAERESIS
-0179          ; mapped                 ; 017A          # 1.1  LATIN CAPITAL LETTER Z WITH ACUTE
-017A          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH ACUTE
-017B          ; mapped                 ; 017C          # 1.1  LATIN CAPITAL LETTER Z WITH DOT ABOVE
-017C          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH DOT ABOVE
-017D          ; mapped                 ; 017E          # 1.1  LATIN CAPITAL LETTER Z WITH CARON
-017E          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH CARON
-017F          ; mapped                 ; 0073          # 1.1  LATIN SMALL LETTER LONG S
-0180          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH STROKE
-0181          ; mapped                 ; 0253          # 1.1  LATIN CAPITAL LETTER B WITH HOOK
-0182          ; mapped                 ; 0183          # 1.1  LATIN CAPITAL LETTER B WITH TOPBAR
-0183          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH TOPBAR
-0184          ; mapped                 ; 0185          # 1.1  LATIN CAPITAL LETTER TONE SIX
-0185          ; valid                                  # 1.1  LATIN SMALL LETTER TONE SIX
-0186          ; mapped                 ; 0254          # 1.1  LATIN CAPITAL LETTER OPEN O
-0187          ; mapped                 ; 0188          # 1.1  LATIN CAPITAL LETTER C WITH HOOK
-0188          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH HOOK
-0189          ; mapped                 ; 0256          # 1.1  LATIN CAPITAL LETTER AFRICAN D
-018A          ; mapped                 ; 0257          # 1.1  LATIN CAPITAL LETTER D WITH HOOK
-018B          ; mapped                 ; 018C          # 1.1  LATIN CAPITAL LETTER D WITH TOPBAR
-018C..018D    ; valid                                  # 1.1  LATIN SMALL LETTER D WITH TOPBAR..LATIN SMALL LETTER TURNED DELTA
-018E          ; mapped                 ; 01DD          # 1.1  LATIN CAPITAL LETTER REVERSED E
-018F          ; mapped                 ; 0259          # 1.1  LATIN CAPITAL LETTER SCHWA
-0190          ; mapped                 ; 025B          # 1.1  LATIN CAPITAL LETTER OPEN E
-0191          ; mapped                 ; 0192          # 1.1  LATIN CAPITAL LETTER F WITH HOOK
-0192          ; valid                                  # 1.1  LATIN SMALL LETTER F WITH HOOK
-0193          ; mapped                 ; 0260          # 1.1  LATIN CAPITAL LETTER G WITH HOOK
-0194          ; mapped                 ; 0263          # 1.1  LATIN CAPITAL LETTER GAMMA
-0195          ; valid                                  # 1.1  LATIN SMALL LETTER HV
-0196          ; mapped                 ; 0269          # 1.1  LATIN CAPITAL LETTER IOTA
-0197          ; mapped                 ; 0268          # 1.1  LATIN CAPITAL LETTER I WITH STROKE
-0198          ; mapped                 ; 0199          # 1.1  LATIN CAPITAL LETTER K WITH HOOK
-0199..019B    ; valid                                  # 1.1  LATIN SMALL LETTER K WITH HOOK..LATIN SMALL LETTER LAMBDA WITH STROKE
-019C          ; mapped                 ; 026F          # 1.1  LATIN CAPITAL LETTER TURNED M
-019D          ; mapped                 ; 0272          # 1.1  LATIN CAPITAL LETTER N WITH LEFT HOOK
-019E          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH LONG RIGHT LEG
-019F          ; mapped                 ; 0275          # 1.1  LATIN CAPITAL LETTER O WITH MIDDLE TILDE
-01A0          ; mapped                 ; 01A1          # 1.1  LATIN CAPITAL LETTER O WITH HORN
-01A1          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN
-01A2          ; mapped                 ; 01A3          # 1.1  LATIN CAPITAL LETTER OI
-01A3          ; valid                                  # 1.1  LATIN SMALL LETTER OI
-01A4          ; mapped                 ; 01A5          # 1.1  LATIN CAPITAL LETTER P WITH HOOK
-01A5          ; valid                                  # 1.1  LATIN SMALL LETTER P WITH HOOK
-01A6          ; mapped                 ; 0280          # 1.1  LATIN LETTER YR
-01A7          ; mapped                 ; 01A8          # 1.1  LATIN CAPITAL LETTER TONE TWO
-01A8          ; valid                                  # 1.1  LATIN SMALL LETTER TONE TWO
-01A9          ; mapped                 ; 0283          # 1.1  LATIN CAPITAL LETTER ESH
-01AA..01AB    ; valid                                  # 1.1  LATIN LETTER REVERSED ESH LOOP..LATIN SMALL LETTER T WITH PALATAL HOOK
-01AC          ; mapped                 ; 01AD          # 1.1  LATIN CAPITAL LETTER T WITH HOOK
-01AD          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH HOOK
-01AE          ; mapped                 ; 0288          # 1.1  LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
-01AF          ; mapped                 ; 01B0          # 1.1  LATIN CAPITAL LETTER U WITH HORN
-01B0          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN
-01B1          ; mapped                 ; 028A          # 1.1  LATIN CAPITAL LETTER UPSILON
-01B2          ; mapped                 ; 028B          # 1.1  LATIN CAPITAL LETTER V WITH HOOK
-01B3          ; mapped                 ; 01B4          # 1.1  LATIN CAPITAL LETTER Y WITH HOOK
-01B4          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH HOOK
-01B5          ; mapped                 ; 01B6          # 1.1  LATIN CAPITAL LETTER Z WITH STROKE
-01B6          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH STROKE
-01B7          ; mapped                 ; 0292          # 1.1  LATIN CAPITAL LETTER EZH
-01B8          ; mapped                 ; 01B9          # 1.1  LATIN CAPITAL LETTER EZH REVERSED
-01B9..01BB    ; valid                                  # 1.1  LATIN SMALL LETTER EZH REVERSED..LATIN LETTER TWO WITH STROKE
-01BC          ; mapped                 ; 01BD          # 1.1  LATIN CAPITAL LETTER TONE FIVE
-01BD..01C3    ; valid                                  # 1.1  LATIN SMALL LETTER TONE FIVE..LATIN LETTER RETROFLEX CLICK
-01C4..01C6    ; mapped                 ; 0064 017E     # 1.1  LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER DZ WITH CARON
-01C7..01C9    ; mapped                 ; 006C 006A     # 1.1  LATIN CAPITAL LETTER LJ..LATIN SMALL LETTER LJ
-01CA..01CC    ; mapped                 ; 006E 006A     # 1.1  LATIN CAPITAL LETTER NJ..LATIN SMALL LETTER NJ
-01CD          ; mapped                 ; 01CE          # 1.1  LATIN CAPITAL LETTER A WITH CARON
-01CE          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CARON
-01CF          ; mapped                 ; 01D0          # 1.1  LATIN CAPITAL LETTER I WITH CARON
-01D0          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH CARON
-01D1          ; mapped                 ; 01D2          # 1.1  LATIN CAPITAL LETTER O WITH CARON
-01D2          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CARON
-01D3          ; mapped                 ; 01D4          # 1.1  LATIN CAPITAL LETTER U WITH CARON
-01D4          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH CARON
-01D5          ; mapped                 ; 01D6          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-01D6          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
-01D7          ; mapped                 ; 01D8          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-01D8          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-01D9          ; mapped                 ; 01DA          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-01DA          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS AND CARON
-01DB          ; mapped                 ; 01DC          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-01DC..01DD    ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE..LATIN SMALL LETTER TURNED E
-01DE          ; mapped                 ; 01DF          # 1.1  LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-01DF          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
-01E0          ; mapped                 ; 01E1          # 1.1  LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-01E1          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
-01E2          ; mapped                 ; 01E3          # 1.1  LATIN CAPITAL LETTER AE WITH MACRON
-01E3          ; valid                                  # 1.1  LATIN SMALL LETTER AE WITH MACRON
-01E4          ; mapped                 ; 01E5          # 1.1  LATIN CAPITAL LETTER G WITH STROKE
-01E5          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH STROKE
-01E6          ; mapped                 ; 01E7          # 1.1  LATIN CAPITAL LETTER G WITH CARON
-01E7          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH CARON
-01E8          ; mapped                 ; 01E9          # 1.1  LATIN CAPITAL LETTER K WITH CARON
-01E9          ; valid                                  # 1.1  LATIN SMALL LETTER K WITH CARON
-01EA          ; mapped                 ; 01EB          # 1.1  LATIN CAPITAL LETTER O WITH OGONEK
-01EB          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH OGONEK
-01EC          ; mapped                 ; 01ED          # 1.1  LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-01ED          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH OGONEK AND MACRON
-01EE          ; mapped                 ; 01EF          # 1.1  LATIN CAPITAL LETTER EZH WITH CARON
-01EF..01F0    ; valid                                  # 1.1  LATIN SMALL LETTER EZH WITH CARON..LATIN SMALL LETTER J WITH CARON
-01F1..01F3    ; mapped                 ; 0064 007A     # 1.1  LATIN CAPITAL LETTER DZ..LATIN SMALL LETTER DZ
-01F4          ; mapped                 ; 01F5          # 1.1  LATIN CAPITAL LETTER G WITH ACUTE
-01F5          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH ACUTE
-01F6          ; mapped                 ; 0195          # 3.0  LATIN CAPITAL LETTER HWAIR
-01F7          ; mapped                 ; 01BF          # 3.0  LATIN CAPITAL LETTER WYNN
-01F8          ; mapped                 ; 01F9          # 3.0  LATIN CAPITAL LETTER N WITH GRAVE
-01F9          ; valid                                  # 3.0  LATIN SMALL LETTER N WITH GRAVE
-01FA          ; mapped                 ; 01FB          # 1.1  LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-01FB          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-01FC          ; mapped                 ; 01FD          # 1.1  LATIN CAPITAL LETTER AE WITH ACUTE
-01FD          ; valid                                  # 1.1  LATIN SMALL LETTER AE WITH ACUTE
-01FE          ; mapped                 ; 01FF          # 1.1  LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-01FF          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH STROKE AND ACUTE
-0200          ; mapped                 ; 0201          # 1.1  LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-0201          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH DOUBLE GRAVE
-0202          ; mapped                 ; 0203          # 1.1  LATIN CAPITAL LETTER A WITH INVERTED BREVE
-0203          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH INVERTED BREVE
-0204          ; mapped                 ; 0205          # 1.1  LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-0205          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH DOUBLE GRAVE
-0206          ; mapped                 ; 0207          # 1.1  LATIN CAPITAL LETTER E WITH INVERTED BREVE
-0207          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH INVERTED BREVE
-0208          ; mapped                 ; 0209          # 1.1  LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-0209          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH DOUBLE GRAVE
-020A          ; mapped                 ; 020B          # 1.1  LATIN CAPITAL LETTER I WITH INVERTED BREVE
-020B          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH INVERTED BREVE
-020C          ; mapped                 ; 020D          # 1.1  LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-020D          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH DOUBLE GRAVE
-020E          ; mapped                 ; 020F          # 1.1  LATIN CAPITAL LETTER O WITH INVERTED BREVE
-020F          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH INVERTED BREVE
-0210          ; mapped                 ; 0211          # 1.1  LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-0211          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH DOUBLE GRAVE
-0212          ; mapped                 ; 0213          # 1.1  LATIN CAPITAL LETTER R WITH INVERTED BREVE
-0213          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH INVERTED BREVE
-0214          ; mapped                 ; 0215          # 1.1  LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-0215          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DOUBLE GRAVE
-0216          ; mapped                 ; 0217          # 1.1  LATIN CAPITAL LETTER U WITH INVERTED BREVE
-0217          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH INVERTED BREVE
-0218          ; mapped                 ; 0219          # 3.0  LATIN CAPITAL LETTER S WITH COMMA BELOW
-0219          ; valid                                  # 3.0  LATIN SMALL LETTER S WITH COMMA BELOW
-021A          ; mapped                 ; 021B          # 3.0  LATIN CAPITAL LETTER T WITH COMMA BELOW
-021B          ; valid                                  # 3.0  LATIN SMALL LETTER T WITH COMMA BELOW
-021C          ; mapped                 ; 021D          # 3.0  LATIN CAPITAL LETTER YOGH
-021D          ; valid                                  # 3.0  LATIN SMALL LETTER YOGH
-021E          ; mapped                 ; 021F          # 3.0  LATIN CAPITAL LETTER H WITH CARON
-021F          ; valid                                  # 3.0  LATIN SMALL LETTER H WITH CARON
-0220          ; mapped                 ; 019E          # 3.2  LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
-0221          ; valid                                  # 4.0  LATIN SMALL LETTER D WITH CURL
-0222          ; mapped                 ; 0223          # 3.0  LATIN CAPITAL LETTER OU
-0223          ; valid                                  # 3.0  LATIN SMALL LETTER OU
-0224          ; mapped                 ; 0225          # 3.0  LATIN CAPITAL LETTER Z WITH HOOK
-0225          ; valid                                  # 3.0  LATIN SMALL LETTER Z WITH HOOK
-0226          ; mapped                 ; 0227          # 3.0  LATIN CAPITAL LETTER A WITH DOT ABOVE
-0227          ; valid                                  # 3.0  LATIN SMALL LETTER A WITH DOT ABOVE
-0228          ; mapped                 ; 0229          # 3.0  LATIN CAPITAL LETTER E WITH CEDILLA
-0229          ; valid                                  # 3.0  LATIN SMALL LETTER E WITH CEDILLA
-022A          ; mapped                 ; 022B          # 3.0  LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-022B          ; valid                                  # 3.0  LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
-022C          ; mapped                 ; 022D          # 3.0  LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-022D          ; valid                                  # 3.0  LATIN SMALL LETTER O WITH TILDE AND MACRON
-022E          ; mapped                 ; 022F          # 3.0  LATIN CAPITAL LETTER O WITH DOT ABOVE
-022F          ; valid                                  # 3.0  LATIN SMALL LETTER O WITH DOT ABOVE
-0230          ; mapped                 ; 0231          # 3.0  LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-0231          ; valid                                  # 3.0  LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
-0232          ; mapped                 ; 0233          # 3.0  LATIN CAPITAL LETTER Y WITH MACRON
-0233          ; valid                                  # 3.0  LATIN SMALL LETTER Y WITH MACRON
-0234..0236    ; valid                                  # 4.0  LATIN SMALL LETTER L WITH CURL..LATIN SMALL LETTER T WITH CURL
-0237..0239    ; valid                                  # 4.1  LATIN SMALL LETTER DOTLESS J..LATIN SMALL LETTER QP DIGRAPH
-023A          ; mapped                 ; 2C65          # 4.1  LATIN CAPITAL LETTER A WITH STROKE
-023B          ; mapped                 ; 023C          # 4.1  LATIN CAPITAL LETTER C WITH STROKE
-023C          ; valid                                  # 4.1  LATIN SMALL LETTER C WITH STROKE
-023D          ; mapped                 ; 019A          # 4.1  LATIN CAPITAL LETTER L WITH BAR
-023E          ; mapped                 ; 2C66          # 4.1  LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
-023F..0240    ; valid                                  # 4.1  LATIN SMALL LETTER S WITH SWASH TAIL..LATIN SMALL LETTER Z WITH SWASH TAIL
-0241          ; mapped                 ; 0242          # 4.1  LATIN CAPITAL LETTER GLOTTAL STOP
-0242          ; valid                                  # 5.0  LATIN SMALL LETTER GLOTTAL STOP
-0243          ; mapped                 ; 0180          # 5.0  LATIN CAPITAL LETTER B WITH STROKE
-0244          ; mapped                 ; 0289          # 5.0  LATIN CAPITAL LETTER U BAR
-0245          ; mapped                 ; 028C          # 5.0  LATIN CAPITAL LETTER TURNED V
-0246          ; mapped                 ; 0247          # 5.0  LATIN CAPITAL LETTER E WITH STROKE
-0247          ; valid                                  # 5.0  LATIN SMALL LETTER E WITH STROKE
-0248          ; mapped                 ; 0249          # 5.0  LATIN CAPITAL LETTER J WITH STROKE
-0249          ; valid                                  # 5.0  LATIN SMALL LETTER J WITH STROKE
-024A          ; mapped                 ; 024B          # 5.0  LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
-024B          ; valid                                  # 5.0  LATIN SMALL LETTER Q WITH HOOK TAIL
-024C          ; mapped                 ; 024D          # 5.0  LATIN CAPITAL LETTER R WITH STROKE
-024D          ; valid                                  # 5.0  LATIN SMALL LETTER R WITH STROKE
-024E          ; mapped                 ; 024F          # 5.0  LATIN CAPITAL LETTER Y WITH STROKE
-024F          ; valid                                  # 5.0  LATIN SMALL LETTER Y WITH STROKE
-0250..02A8    ; valid                                  # 1.1  LATIN SMALL LETTER TURNED A..LATIN SMALL LETTER TC DIGRAPH WITH CURL
-02A9..02AD    ; valid                                  # 3.0  LATIN SMALL LETTER FENG DIGRAPH..LATIN LETTER BIDENTAL PERCUSSIVE
-02AE..02AF    ; valid                                  # 4.0  LATIN SMALL LETTER TURNED H WITH FISHHOOK..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
-02B0          ; mapped                 ; 0068          # 1.1  MODIFIER LETTER SMALL H
-02B1          ; mapped                 ; 0266          # 1.1  MODIFIER LETTER SMALL H WITH HOOK
-02B2          ; mapped                 ; 006A          # 1.1  MODIFIER LETTER SMALL J
-02B3          ; mapped                 ; 0072          # 1.1  MODIFIER LETTER SMALL R
-02B4          ; mapped                 ; 0279          # 1.1  MODIFIER LETTER SMALL TURNED R
-02B5          ; mapped                 ; 027B          # 1.1  MODIFIER LETTER SMALL TURNED R WITH HOOK
-02B6          ; mapped                 ; 0281          # 1.1  MODIFIER LETTER SMALL CAPITAL INVERTED R
-02B7          ; mapped                 ; 0077          # 1.1  MODIFIER LETTER SMALL W
-02B8          ; mapped                 ; 0079          # 1.1  MODIFIER LETTER SMALL Y
-02B9..02C1    ; valid                                  # 1.1  MODIFIER LETTER PRIME..MODIFIER LETTER REVERSED GLOTTAL STOP
-02C2..02C5    ; valid                  ;      ; NV8    # 1.1  MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD
-02C6..02D1    ; valid                                  # 1.1  MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
-02D2..02D7    ; valid                  ;      ; NV8    # 1.1  MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER MINUS SIGN
-02D8          ; disallowed_STD3_mapped ; 0020 0306     # 1.1  BREVE
-02D9          ; disallowed_STD3_mapped ; 0020 0307     # 1.1  DOT ABOVE
-02DA          ; disallowed_STD3_mapped ; 0020 030A     # 1.1  RING ABOVE
-02DB          ; disallowed_STD3_mapped ; 0020 0328     # 1.1  OGONEK
-02DC          ; disallowed_STD3_mapped ; 0020 0303     # 1.1  SMALL TILDE
-02DD          ; disallowed_STD3_mapped ; 0020 030B     # 1.1  DOUBLE ACUTE ACCENT
-02DE          ; valid                  ;      ; NV8    # 1.1  MODIFIER LETTER RHOTIC HOOK
-02DF          ; valid                  ;      ; NV8    # 3.0  MODIFIER LETTER CROSS ACCENT
-02E0          ; mapped                 ; 0263          # 1.1  MODIFIER LETTER SMALL GAMMA
-02E1          ; mapped                 ; 006C          # 1.1  MODIFIER LETTER SMALL L
-02E2          ; mapped                 ; 0073          # 1.1  MODIFIER LETTER SMALL S
-02E3          ; mapped                 ; 0078          # 1.1  MODIFIER LETTER SMALL X
-02E4          ; mapped                 ; 0295          # 1.1  MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
-02E5..02E9    ; valid                  ;      ; NV8    # 1.1  MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER EXTRA-LOW TONE BAR
-02EA..02EB    ; valid                  ;      ; NV8    # 3.0  MODIFIER LETTER YIN DEPARTING TONE MARK..MODIFIER LETTER YANG DEPARTING TONE MARK
-02EC          ; valid                                  # 3.0  MODIFIER LETTER VOICING
-02ED          ; valid                  ;      ; NV8    # 3.0  MODIFIER LETTER UNASPIRATED
-02EE          ; valid                                  # 3.0  MODIFIER LETTER DOUBLE APOSTROPHE
-02EF..02FF    ; valid                  ;      ; NV8    # 4.0  MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER LETTER LOW LEFT ARROW
-0300..033F    ; valid                                  # 1.1  COMBINING GRAVE ACCENT..COMBINING DOUBLE OVERLINE
-0340          ; mapped                 ; 0300          # 1.1  COMBINING GRAVE TONE MARK
-0341          ; mapped                 ; 0301          # 1.1  COMBINING ACUTE TONE MARK
-0342          ; valid                                  # 1.1  COMBINING GREEK PERISPOMENI
-0343          ; mapped                 ; 0313          # 1.1  COMBINING GREEK KORONIS
-0344          ; mapped                 ; 0308 0301     # 1.1  COMBINING GREEK DIALYTIKA TONOS
-0345          ; mapped                 ; 03B9          # 1.1  COMBINING GREEK YPOGEGRAMMENI
-0346..034E    ; valid                                  # 3.0  COMBINING BRIDGE ABOVE..COMBINING UPWARDS ARROW BELOW
-034F          ; ignored                                # 3.2  COMBINING GRAPHEME JOINER
-0350..0357    ; valid                                  # 4.0  COMBINING RIGHT ARROWHEAD ABOVE..COMBINING RIGHT HALF RING ABOVE
-0358..035C    ; valid                                  # 4.1  COMBINING DOT ABOVE RIGHT..COMBINING DOUBLE BREVE BELOW
-035D..035F    ; valid                                  # 4.0  COMBINING DOUBLE BREVE..COMBINING DOUBLE MACRON BELOW
-0360..0361    ; valid                                  # 1.1  COMBINING DOUBLE TILDE..COMBINING DOUBLE INVERTED BREVE
-0362          ; valid                                  # 3.0  COMBINING DOUBLE RIGHTWARDS ARROW BELOW
-0363..036F    ; valid                                  # 3.2  COMBINING LATIN SMALL LETTER A..COMBINING LATIN SMALL LETTER X
-0370          ; mapped                 ; 0371          # 5.1  GREEK CAPITAL LETTER HETA
-0371          ; valid                                  # 5.1  GREEK SMALL LETTER HETA
-0372          ; mapped                 ; 0373          # 5.1  GREEK CAPITAL LETTER ARCHAIC SAMPI
-0373          ; valid                                  # 5.1  GREEK SMALL LETTER ARCHAIC SAMPI
-0374          ; mapped                 ; 02B9          # 1.1  GREEK NUMERAL SIGN
-0375          ; valid                                  # 1.1  GREEK LOWER NUMERAL SIGN
-0376          ; mapped                 ; 0377          # 5.1  GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
-0377          ; valid                                  # 5.1  GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
-0378..0379    ; disallowed                             # NA   <reserved-0378>..<reserved-0379>
-037A          ; disallowed_STD3_mapped ; 0020 03B9     # 1.1  GREEK YPOGEGRAMMENI
-037B..037D    ; valid                                  # 5.0  GREEK SMALL REVERSED LUNATE SIGMA SYMBOL..GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
-037E          ; disallowed_STD3_mapped ; 003B          # 1.1  GREEK QUESTION MARK
-037F          ; mapped                 ; 03F3          # 7.0  GREEK CAPITAL LETTER YOT
-0380..0383    ; disallowed                             # NA   <reserved-0380>..<reserved-0383>
-0384          ; disallowed_STD3_mapped ; 0020 0301     # 1.1  GREEK TONOS
-0385          ; disallowed_STD3_mapped ; 0020 0308 0301 #1.1  GREEK DIALYTIKA TONOS
-0386          ; mapped                 ; 03AC          # 1.1  GREEK CAPITAL LETTER ALPHA WITH TONOS
-0387          ; mapped                 ; 00B7          # 1.1  GREEK ANO TELEIA
-0388          ; mapped                 ; 03AD          # 1.1  GREEK CAPITAL LETTER EPSILON WITH TONOS
-0389          ; mapped                 ; 03AE          # 1.1  GREEK CAPITAL LETTER ETA WITH TONOS
-038A          ; mapped                 ; 03AF          # 1.1  GREEK CAPITAL LETTER IOTA WITH TONOS
-038B          ; disallowed                             # NA   <reserved-038B>
-038C          ; mapped                 ; 03CC          # 1.1  GREEK CAPITAL LETTER OMICRON WITH TONOS
-038D          ; disallowed                             # NA   <reserved-038D>
-038E          ; mapped                 ; 03CD          # 1.1  GREEK CAPITAL LETTER UPSILON WITH TONOS
-038F          ; mapped                 ; 03CE          # 1.1  GREEK CAPITAL LETTER OMEGA WITH TONOS
-0390          ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-0391          ; mapped                 ; 03B1          # 1.1  GREEK CAPITAL LETTER ALPHA
-0392          ; mapped                 ; 03B2          # 1.1  GREEK CAPITAL LETTER BETA
-0393          ; mapped                 ; 03B3          # 1.1  GREEK CAPITAL LETTER GAMMA
-0394          ; mapped                 ; 03B4          # 1.1  GREEK CAPITAL LETTER DELTA
-0395          ; mapped                 ; 03B5          # 1.1  GREEK CAPITAL LETTER EPSILON
-0396          ; mapped                 ; 03B6          # 1.1  GREEK CAPITAL LETTER ZETA
-0397          ; mapped                 ; 03B7          # 1.1  GREEK CAPITAL LETTER ETA
-0398          ; mapped                 ; 03B8          # 1.1  GREEK CAPITAL LETTER THETA
-0399          ; mapped                 ; 03B9          # 1.1  GREEK CAPITAL LETTER IOTA
-039A          ; mapped                 ; 03BA          # 1.1  GREEK CAPITAL LETTER KAPPA
-039B          ; mapped                 ; 03BB          # 1.1  GREEK CAPITAL LETTER LAMDA
-039C          ; mapped                 ; 03BC          # 1.1  GREEK CAPITAL LETTER MU
-039D          ; mapped                 ; 03BD          # 1.1  GREEK CAPITAL LETTER NU
-039E          ; mapped                 ; 03BE          # 1.1  GREEK CAPITAL LETTER XI
-039F          ; mapped                 ; 03BF          # 1.1  GREEK CAPITAL LETTER OMICRON
-03A0          ; mapped                 ; 03C0          # 1.1  GREEK CAPITAL LETTER PI
-03A1          ; mapped                 ; 03C1          # 1.1  GREEK CAPITAL LETTER RHO
-03A2          ; disallowed                             # NA   <reserved-03A2>
-03A3          ; mapped                 ; 03C3          # 1.1  GREEK CAPITAL LETTER SIGMA
-03A4          ; mapped                 ; 03C4          # 1.1  GREEK CAPITAL LETTER TAU
-03A5          ; mapped                 ; 03C5          # 1.1  GREEK CAPITAL LETTER UPSILON
-03A6          ; mapped                 ; 03C6          # 1.1  GREEK CAPITAL LETTER PHI
-03A7          ; mapped                 ; 03C7          # 1.1  GREEK CAPITAL LETTER CHI
-03A8          ; mapped                 ; 03C8          # 1.1  GREEK CAPITAL LETTER PSI
-03A9          ; mapped                 ; 03C9          # 1.1  GREEK CAPITAL LETTER OMEGA
-03AA          ; mapped                 ; 03CA          # 1.1  GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-03AB          ; mapped                 ; 03CB          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-03AC..03C1    ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH TONOS..GREEK SMALL LETTER RHO
-03C2          ; deviation              ; 03C3          # 1.1  GREEK SMALL LETTER FINAL SIGMA
-03C3..03CE    ; valid                                  # 1.1  GREEK SMALL LETTER SIGMA..GREEK SMALL LETTER OMEGA WITH TONOS
-03CF          ; mapped                 ; 03D7          # 5.1  GREEK CAPITAL KAI SYMBOL
-03D0          ; mapped                 ; 03B2          # 1.1  GREEK BETA SYMBOL
-03D1          ; mapped                 ; 03B8          # 1.1  GREEK THETA SYMBOL
-03D2          ; mapped                 ; 03C5          # 1.1  GREEK UPSILON WITH HOOK SYMBOL
-03D3          ; mapped                 ; 03CD          # 1.1  GREEK UPSILON WITH ACUTE AND HOOK SYMBOL
-03D4          ; mapped                 ; 03CB          # 1.1  GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL
-03D5          ; mapped                 ; 03C6          # 1.1  GREEK PHI SYMBOL
-03D6          ; mapped                 ; 03C0          # 1.1  GREEK PI SYMBOL
-03D7          ; valid                                  # 3.0  GREEK KAI SYMBOL
-03D8          ; mapped                 ; 03D9          # 3.2  GREEK LETTER ARCHAIC KOPPA
-03D9          ; valid                                  # 3.2  GREEK SMALL LETTER ARCHAIC KOPPA
-03DA          ; mapped                 ; 03DB          # 1.1  GREEK LETTER STIGMA
-03DB          ; valid                                  # 3.0  GREEK SMALL LETTER STIGMA
-03DC          ; mapped                 ; 03DD          # 1.1  GREEK LETTER DIGAMMA
-03DD          ; valid                                  # 3.0  GREEK SMALL LETTER DIGAMMA
-03DE          ; mapped                 ; 03DF          # 1.1  GREEK LETTER KOPPA
-03DF          ; valid                                  # 3.0  GREEK SMALL LETTER KOPPA
-03E0          ; mapped                 ; 03E1          # 1.1  GREEK LETTER SAMPI
-03E1          ; valid                                  # 3.0  GREEK SMALL LETTER SAMPI
-03E2          ; mapped                 ; 03E3          # 1.1  COPTIC CAPITAL LETTER SHEI
-03E3          ; valid                                  # 1.1  COPTIC SMALL LETTER SHEI
-03E4          ; mapped                 ; 03E5          # 1.1  COPTIC CAPITAL LETTER FEI
-03E5          ; valid                                  # 1.1  COPTIC SMALL LETTER FEI
-03E6          ; mapped                 ; 03E7          # 1.1  COPTIC CAPITAL LETTER KHEI
-03E7          ; valid                                  # 1.1  COPTIC SMALL LETTER KHEI
-03E8          ; mapped                 ; 03E9          # 1.1  COPTIC CAPITAL LETTER HORI
-03E9          ; valid                                  # 1.1  COPTIC SMALL LETTER HORI
-03EA          ; mapped                 ; 03EB          # 1.1  COPTIC CAPITAL LETTER GANGIA
-03EB          ; valid                                  # 1.1  COPTIC SMALL LETTER GANGIA
-03EC          ; mapped                 ; 03ED          # 1.1  COPTIC CAPITAL LETTER SHIMA
-03ED          ; valid                                  # 1.1  COPTIC SMALL LETTER SHIMA
-03EE          ; mapped                 ; 03EF          # 1.1  COPTIC CAPITAL LETTER DEI
-03EF          ; valid                                  # 1.1  COPTIC SMALL LETTER DEI
-03F0          ; mapped                 ; 03BA          # 1.1  GREEK KAPPA SYMBOL
-03F1          ; mapped                 ; 03C1          # 1.1  GREEK RHO SYMBOL
-03F2          ; mapped                 ; 03C3          # 1.1  GREEK LUNATE SIGMA SYMBOL
-03F3          ; valid                                  # 1.1  GREEK LETTER YOT
-03F4          ; mapped                 ; 03B8          # 3.1  GREEK CAPITAL THETA SYMBOL
-03F5          ; mapped                 ; 03B5          # 3.1  GREEK LUNATE EPSILON SYMBOL
-03F6          ; valid                  ;      ; NV8    # 3.2  GREEK REVERSED LUNATE EPSILON SYMBOL
-03F7          ; mapped                 ; 03F8          # 4.0  GREEK CAPITAL LETTER SHO
-03F8          ; valid                                  # 4.0  GREEK SMALL LETTER SHO
-03F9          ; mapped                 ; 03C3          # 4.0  GREEK CAPITAL LUNATE SIGMA SYMBOL
-03FA          ; mapped                 ; 03FB          # 4.0  GREEK CAPITAL LETTER SAN
-03FB          ; valid                                  # 4.0  GREEK SMALL LETTER SAN
-03FC          ; valid                                  # 4.1  GREEK RHO WITH STROKE SYMBOL
-03FD          ; mapped                 ; 037B          # 4.1  GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL
-03FE          ; mapped                 ; 037C          # 4.1  GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL
-03FF          ; mapped                 ; 037D          # 4.1  GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL
-0400          ; mapped                 ; 0450          # 3.0  CYRILLIC CAPITAL LETTER IE WITH GRAVE
-0401          ; mapped                 ; 0451          # 1.1  CYRILLIC CAPITAL LETTER IO
-0402          ; mapped                 ; 0452          # 1.1  CYRILLIC CAPITAL LETTER DJE
-0403          ; mapped                 ; 0453          # 1.1  CYRILLIC CAPITAL LETTER GJE
-0404          ; mapped                 ; 0454          # 1.1  CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0405          ; mapped                 ; 0455          # 1.1  CYRILLIC CAPITAL LETTER DZE
-0406          ; mapped                 ; 0456          # 1.1  CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0407          ; mapped                 ; 0457          # 1.1  CYRILLIC CAPITAL LETTER YI
-0408          ; mapped                 ; 0458          # 1.1  CYRILLIC CAPITAL LETTER JE
-0409          ; mapped                 ; 0459          # 1.1  CYRILLIC CAPITAL LETTER LJE
-040A          ; mapped                 ; 045A          # 1.1  CYRILLIC CAPITAL LETTER NJE
-040B          ; mapped                 ; 045B          # 1.1  CYRILLIC CAPITAL LETTER TSHE
-040C          ; mapped                 ; 045C          # 1.1  CYRILLIC CAPITAL LETTER KJE
-040D          ; mapped                 ; 045D          # 3.0  CYRILLIC CAPITAL LETTER I WITH GRAVE
-040E          ; mapped                 ; 045E          # 1.1  CYRILLIC CAPITAL LETTER SHORT U
-040F          ; mapped                 ; 045F          # 1.1  CYRILLIC CAPITAL LETTER DZHE
-0410          ; mapped                 ; 0430          # 1.1  CYRILLIC CAPITAL LETTER A
-0411          ; mapped                 ; 0431          # 1.1  CYRILLIC CAPITAL LETTER BE
-0412          ; mapped                 ; 0432          # 1.1  CYRILLIC CAPITAL LETTER VE
-0413          ; mapped                 ; 0433          # 1.1  CYRILLIC CAPITAL LETTER GHE
-0414          ; mapped                 ; 0434          # 1.1  CYRILLIC CAPITAL LETTER DE
-0415          ; mapped                 ; 0435          # 1.1  CYRILLIC CAPITAL LETTER IE
-0416          ; mapped                 ; 0436          # 1.1  CYRILLIC CAPITAL LETTER ZHE
-0417          ; mapped                 ; 0437          # 1.1  CYRILLIC CAPITAL LETTER ZE
-0418          ; mapped                 ; 0438          # 1.1  CYRILLIC CAPITAL LETTER I
-0419          ; mapped                 ; 0439          # 1.1  CYRILLIC CAPITAL LETTER SHORT I
-041A          ; mapped                 ; 043A          # 1.1  CYRILLIC CAPITAL LETTER KA
-041B          ; mapped                 ; 043B          # 1.1  CYRILLIC CAPITAL LETTER EL
-041C          ; mapped                 ; 043C          # 1.1  CYRILLIC CAPITAL LETTER EM
-041D          ; mapped                 ; 043D          # 1.1  CYRILLIC CAPITAL LETTER EN
-041E          ; mapped                 ; 043E          # 1.1  CYRILLIC CAPITAL LETTER O
-041F          ; mapped                 ; 043F          # 1.1  CYRILLIC CAPITAL LETTER PE
-0420          ; mapped                 ; 0440          # 1.1  CYRILLIC CAPITAL LETTER ER
-0421          ; mapped                 ; 0441          # 1.1  CYRILLIC CAPITAL LETTER ES
-0422          ; mapped                 ; 0442          # 1.1  CYRILLIC CAPITAL LETTER TE
-0423          ; mapped                 ; 0443          # 1.1  CYRILLIC CAPITAL LETTER U
-0424          ; mapped                 ; 0444          # 1.1  CYRILLIC CAPITAL LETTER EF
-0425          ; mapped                 ; 0445          # 1.1  CYRILLIC CAPITAL LETTER HA
-0426          ; mapped                 ; 0446          # 1.1  CYRILLIC CAPITAL LETTER TSE
-0427          ; mapped                 ; 0447          # 1.1  CYRILLIC CAPITAL LETTER CHE
-0428          ; mapped                 ; 0448          # 1.1  CYRILLIC CAPITAL LETTER SHA
-0429          ; mapped                 ; 0449          # 1.1  CYRILLIC CAPITAL LETTER SHCHA
-042A          ; mapped                 ; 044A          # 1.1  CYRILLIC CAPITAL LETTER HARD SIGN
-042B          ; mapped                 ; 044B          # 1.1  CYRILLIC CAPITAL LETTER YERU
-042C          ; mapped                 ; 044C          # 1.1  CYRILLIC CAPITAL LETTER SOFT SIGN
-042D          ; mapped                 ; 044D          # 1.1  CYRILLIC CAPITAL LETTER E
-042E          ; mapped                 ; 044E          # 1.1  CYRILLIC CAPITAL LETTER YU
-042F          ; mapped                 ; 044F          # 1.1  CYRILLIC CAPITAL LETTER YA
-0430..044F    ; valid                                  # 1.1  CYRILLIC SMALL LETTER A..CYRILLIC SMALL LETTER YA
-0450          ; valid                                  # 3.0  CYRILLIC SMALL LETTER IE WITH GRAVE
-0451..045C    ; valid                                  # 1.1  CYRILLIC SMALL LETTER IO..CYRILLIC SMALL LETTER KJE
-045D          ; valid                                  # 3.0  CYRILLIC SMALL LETTER I WITH GRAVE
-045E..045F    ; valid                                  # 1.1  CYRILLIC SMALL LETTER SHORT U..CYRILLIC SMALL LETTER DZHE
-0460          ; mapped                 ; 0461          # 1.1  CYRILLIC CAPITAL LETTER OMEGA
-0461          ; valid                                  # 1.1  CYRILLIC SMALL LETTER OMEGA
-0462          ; mapped                 ; 0463          # 1.1  CYRILLIC CAPITAL LETTER YAT
-0463          ; valid                                  # 1.1  CYRILLIC SMALL LETTER YAT
-0464          ; mapped                 ; 0465          # 1.1  CYRILLIC CAPITAL LETTER IOTIFIED E
-0465          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IOTIFIED E
-0466          ; mapped                 ; 0467          # 1.1  CYRILLIC CAPITAL LETTER LITTLE YUS
-0467          ; valid                                  # 1.1  CYRILLIC SMALL LETTER LITTLE YUS
-0468          ; mapped                 ; 0469          # 1.1  CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
-0469          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS
-046A          ; mapped                 ; 046B          # 1.1  CYRILLIC CAPITAL LETTER BIG YUS
-046B          ; valid                                  # 1.1  CYRILLIC SMALL LETTER BIG YUS
-046C          ; mapped                 ; 046D          # 1.1  CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
-046D          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IOTIFIED BIG YUS
-046E          ; mapped                 ; 046F          # 1.1  CYRILLIC CAPITAL LETTER KSI
-046F          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KSI
-0470          ; mapped                 ; 0471          # 1.1  CYRILLIC CAPITAL LETTER PSI
-0471          ; valid                                  # 1.1  CYRILLIC SMALL LETTER PSI
-0472          ; mapped                 ; 0473          # 1.1  CYRILLIC CAPITAL LETTER FITA
-0473          ; valid                                  # 1.1  CYRILLIC SMALL LETTER FITA
-0474          ; mapped                 ; 0475          # 1.1  CYRILLIC CAPITAL LETTER IZHITSA
-0475          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IZHITSA
-0476          ; mapped                 ; 0477          # 1.1  CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-0477          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-0478          ; mapped                 ; 0479          # 1.1  CYRILLIC CAPITAL LETTER UK
-0479          ; valid                                  # 1.1  CYRILLIC SMALL LETTER UK
-047A          ; mapped                 ; 047B          # 1.1  CYRILLIC CAPITAL LETTER ROUND OMEGA
-047B          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ROUND OMEGA
-047C          ; mapped                 ; 047D          # 1.1  CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
-047D          ; valid                                  # 1.1  CYRILLIC SMALL LETTER OMEGA WITH TITLO
-047E          ; mapped                 ; 047F          # 1.1  CYRILLIC CAPITAL LETTER OT
-047F          ; valid                                  # 1.1  CYRILLIC SMALL LETTER OT
-0480          ; mapped                 ; 0481          # 1.1  CYRILLIC CAPITAL LETTER KOPPA
-0481          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KOPPA
-0482          ; valid                  ;      ; NV8    # 1.1  CYRILLIC THOUSANDS SIGN
-0483..0486    ; valid                                  # 1.1  COMBINING CYRILLIC TITLO..COMBINING CYRILLIC PSILI PNEUMATA
-0487          ; valid                                  # 5.1  COMBINING CYRILLIC POKRYTIE
-0488..0489    ; valid                  ;      ; NV8    # 3.0  COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN
-048A          ; mapped                 ; 048B          # 3.2  CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
-048B          ; valid                                  # 3.2  CYRILLIC SMALL LETTER SHORT I WITH TAIL
-048C          ; mapped                 ; 048D          # 3.0  CYRILLIC CAPITAL LETTER SEMISOFT SIGN
-048D          ; valid                                  # 3.0  CYRILLIC SMALL LETTER SEMISOFT SIGN
-048E          ; mapped                 ; 048F          # 3.0  CYRILLIC CAPITAL LETTER ER WITH TICK
-048F          ; valid                                  # 3.0  CYRILLIC SMALL LETTER ER WITH TICK
-0490          ; mapped                 ; 0491          # 1.1  CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-0491          ; valid                                  # 1.1  CYRILLIC SMALL LETTER GHE WITH UPTURN
-0492          ; mapped                 ; 0493          # 1.1  CYRILLIC CAPITAL LETTER GHE WITH STROKE
-0493          ; valid                                  # 1.1  CYRILLIC SMALL LETTER GHE WITH STROKE
-0494          ; mapped                 ; 0495          # 1.1  CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
-0495          ; valid                                  # 1.1  CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK
-0496          ; mapped                 ; 0497          # 1.1  CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
-0497          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZHE WITH DESCENDER
-0498          ; mapped                 ; 0499          # 1.1  CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
-0499          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZE WITH DESCENDER
-049A          ; mapped                 ; 049B          # 1.1  CYRILLIC CAPITAL LETTER KA WITH DESCENDER
-049B          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KA WITH DESCENDER
-049C          ; mapped                 ; 049D          # 1.1  CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
-049D          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
-049E          ; mapped                 ; 049F          # 1.1  CYRILLIC CAPITAL LETTER KA WITH STROKE
-049F          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KA WITH STROKE
-04A0          ; mapped                 ; 04A1          # 1.1  CYRILLIC CAPITAL LETTER BASHKIR KA
-04A1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER BASHKIR KA
-04A2          ; mapped                 ; 04A3          # 1.1  CYRILLIC CAPITAL LETTER EN WITH DESCENDER
-04A3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER EN WITH DESCENDER
-04A4          ; mapped                 ; 04A5          # 1.1  CYRILLIC CAPITAL LIGATURE EN GHE
-04A5          ; valid                                  # 1.1  CYRILLIC SMALL LIGATURE EN GHE
-04A6          ; mapped                 ; 04A7          # 1.1  CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
-04A7          ; valid                                  # 1.1  CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK
-04A8          ; mapped                 ; 04A9          # 1.1  CYRILLIC CAPITAL LETTER ABKHASIAN HA
-04A9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ABKHASIAN HA
-04AA          ; mapped                 ; 04AB          # 1.1  CYRILLIC CAPITAL LETTER ES WITH DESCENDER
-04AB          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ES WITH DESCENDER
-04AC          ; mapped                 ; 04AD          # 1.1  CYRILLIC CAPITAL LETTER TE WITH DESCENDER
-04AD          ; valid                                  # 1.1  CYRILLIC SMALL LETTER TE WITH DESCENDER
-04AE          ; mapped                 ; 04AF          # 1.1  CYRILLIC CAPITAL LETTER STRAIGHT U
-04AF          ; valid                                  # 1.1  CYRILLIC SMALL LETTER STRAIGHT U
-04B0          ; mapped                 ; 04B1          # 1.1  CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
-04B1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
-04B2          ; mapped                 ; 04B3          # 1.1  CYRILLIC CAPITAL LETTER HA WITH DESCENDER
-04B3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER HA WITH DESCENDER
-04B4          ; mapped                 ; 04B5          # 1.1  CYRILLIC CAPITAL LIGATURE TE TSE
-04B5          ; valid                                  # 1.1  CYRILLIC SMALL LIGATURE TE TSE
-04B6          ; mapped                 ; 04B7          # 1.1  CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
-04B7          ; valid                                  # 1.1  CYRILLIC SMALL LETTER CHE WITH DESCENDER
-04B8          ; mapped                 ; 04B9          # 1.1  CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
-04B9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
-04BA          ; mapped                 ; 04BB          # 1.1  CYRILLIC CAPITAL LETTER SHHA
-04BB          ; valid                                  # 1.1  CYRILLIC SMALL LETTER SHHA
-04BC          ; mapped                 ; 04BD          # 1.1  CYRILLIC CAPITAL LETTER ABKHASIAN CHE
-04BD          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ABKHASIAN CHE
-04BE          ; mapped                 ; 04BF          # 1.1  CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
-04BF          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER
-04C0          ; disallowed                             # 1.1  CYRILLIC LETTER PALOCHKA
-04C1          ; mapped                 ; 04C2          # 1.1  CYRILLIC CAPITAL LETTER ZHE WITH BREVE
-04C2          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZHE WITH BREVE
-04C3          ; mapped                 ; 04C4          # 1.1  CYRILLIC CAPITAL LETTER KA WITH HOOK
-04C4          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KA WITH HOOK
-04C5          ; mapped                 ; 04C6          # 3.2  CYRILLIC CAPITAL LETTER EL WITH TAIL
-04C6          ; valid                                  # 3.2  CYRILLIC SMALL LETTER EL WITH TAIL
-04C7          ; mapped                 ; 04C8          # 1.1  CYRILLIC CAPITAL LETTER EN WITH HOOK
-04C8          ; valid                                  # 1.1  CYRILLIC SMALL LETTER EN WITH HOOK
-04C9          ; mapped                 ; 04CA          # 3.2  CYRILLIC CAPITAL LETTER EN WITH TAIL
-04CA          ; valid                                  # 3.2  CYRILLIC SMALL LETTER EN WITH TAIL
-04CB          ; mapped                 ; 04CC          # 1.1  CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
-04CC          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KHAKASSIAN CHE
-04CD          ; mapped                 ; 04CE          # 3.2  CYRILLIC CAPITAL LETTER EM WITH TAIL
-04CE          ; valid                                  # 3.2  CYRILLIC SMALL LETTER EM WITH TAIL
-04CF          ; valid                                  # 5.0  CYRILLIC SMALL LETTER PALOCHKA
-04D0          ; mapped                 ; 04D1          # 1.1  CYRILLIC CAPITAL LETTER A WITH BREVE
-04D1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER A WITH BREVE
-04D2          ; mapped                 ; 04D3          # 1.1  CYRILLIC CAPITAL LETTER A WITH DIAERESIS
-04D3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER A WITH DIAERESIS
-04D4          ; mapped                 ; 04D5          # 1.1  CYRILLIC CAPITAL LIGATURE A IE
-04D5          ; valid                                  # 1.1  CYRILLIC SMALL LIGATURE A IE
-04D6          ; mapped                 ; 04D7          # 1.1  CYRILLIC CAPITAL LETTER IE WITH BREVE
-04D7          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IE WITH BREVE
-04D8          ; mapped                 ; 04D9          # 1.1  CYRILLIC CAPITAL LETTER SCHWA
-04D9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER SCHWA
-04DA          ; mapped                 ; 04DB          # 1.1  CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
-04DB          ; valid                                  # 1.1  CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
-04DC          ; mapped                 ; 04DD          # 1.1  CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
-04DD          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
-04DE          ; mapped                 ; 04DF          # 1.1  CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
-04DF          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZE WITH DIAERESIS
-04E0          ; mapped                 ; 04E1          # 1.1  CYRILLIC CAPITAL LETTER ABKHASIAN DZE
-04E1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ABKHASIAN DZE
-04E2          ; mapped                 ; 04E3          # 1.1  CYRILLIC CAPITAL LETTER I WITH MACRON
-04E3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER I WITH MACRON
-04E4          ; mapped                 ; 04E5          # 1.1  CYRILLIC CAPITAL LETTER I WITH DIAERESIS
-04E5          ; valid                                  # 1.1  CYRILLIC SMALL LETTER I WITH DIAERESIS
-04E6          ; mapped                 ; 04E7          # 1.1  CYRILLIC CAPITAL LETTER O WITH DIAERESIS
-04E7          ; valid                                  # 1.1  CYRILLIC SMALL LETTER O WITH DIAERESIS
-04E8          ; mapped                 ; 04E9          # 1.1  CYRILLIC CAPITAL LETTER BARRED O
-04E9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER BARRED O
-04EA          ; mapped                 ; 04EB          # 1.1  CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
-04EB          ; valid                                  # 1.1  CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
-04EC          ; mapped                 ; 04ED          # 3.0  CYRILLIC CAPITAL LETTER E WITH DIAERESIS
-04ED          ; valid                                  # 3.0  CYRILLIC SMALL LETTER E WITH DIAERESIS
-04EE          ; mapped                 ; 04EF          # 1.1  CYRILLIC CAPITAL LETTER U WITH MACRON
-04EF          ; valid                                  # 1.1  CYRILLIC SMALL LETTER U WITH MACRON
-04F0          ; mapped                 ; 04F1          # 1.1  CYRILLIC CAPITAL LETTER U WITH DIAERESIS
-04F1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER U WITH DIAERESIS
-04F2          ; mapped                 ; 04F3          # 1.1  CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
-04F3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
-04F4          ; mapped                 ; 04F5          # 1.1  CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
-04F5          ; valid                                  # 1.1  CYRILLIC SMALL LETTER CHE WITH DIAERESIS
-04F6          ; mapped                 ; 04F7          # 4.1  CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
-04F7          ; valid                                  # 4.1  CYRILLIC SMALL LETTER GHE WITH DESCENDER
-04F8          ; mapped                 ; 04F9          # 1.1  CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
-04F9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER YERU WITH DIAERESIS
-04FA          ; mapped                 ; 04FB          # 5.0  CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK
-04FB          ; valid                                  # 5.0  CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK
-04FC          ; mapped                 ; 04FD          # 5.0  CYRILLIC CAPITAL LETTER HA WITH HOOK
-04FD          ; valid                                  # 5.0  CYRILLIC SMALL LETTER HA WITH HOOK
-04FE          ; mapped                 ; 04FF          # 5.0  CYRILLIC CAPITAL LETTER HA WITH STROKE
-04FF          ; valid                                  # 5.0  CYRILLIC SMALL LETTER HA WITH STROKE
-0500          ; mapped                 ; 0501          # 3.2  CYRILLIC CAPITAL LETTER KOMI DE
-0501          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI DE
-0502          ; mapped                 ; 0503          # 3.2  CYRILLIC CAPITAL LETTER KOMI DJE
-0503          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI DJE
-0504          ; mapped                 ; 0505          # 3.2  CYRILLIC CAPITAL LETTER KOMI ZJE
-0505          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI ZJE
-0506          ; mapped                 ; 0507          # 3.2  CYRILLIC CAPITAL LETTER KOMI DZJE
-0507          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI DZJE
-0508          ; mapped                 ; 0509          # 3.2  CYRILLIC CAPITAL LETTER KOMI LJE
-0509          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI LJE
-050A          ; mapped                 ; 050B          # 3.2  CYRILLIC CAPITAL LETTER KOMI NJE
-050B          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI NJE
-050C          ; mapped                 ; 050D          # 3.2  CYRILLIC CAPITAL LETTER KOMI SJE
-050D          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI SJE
-050E          ; mapped                 ; 050F          # 3.2  CYRILLIC CAPITAL LETTER KOMI TJE
-050F          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI TJE
-0510          ; mapped                 ; 0511          # 5.0  CYRILLIC CAPITAL LETTER REVERSED ZE
-0511          ; valid                                  # 5.0  CYRILLIC SMALL LETTER REVERSED ZE
-0512          ; mapped                 ; 0513          # 5.0  CYRILLIC CAPITAL LETTER EL WITH HOOK
-0513          ; valid                                  # 5.0  CYRILLIC SMALL LETTER EL WITH HOOK
-0514          ; mapped                 ; 0515          # 5.1  CYRILLIC CAPITAL LETTER LHA
-0515          ; valid                                  # 5.1  CYRILLIC SMALL LETTER LHA
-0516          ; mapped                 ; 0517          # 5.1  CYRILLIC CAPITAL LETTER RHA
-0517          ; valid                                  # 5.1  CYRILLIC SMALL LETTER RHA
-0518          ; mapped                 ; 0519          # 5.1  CYRILLIC CAPITAL LETTER YAE
-0519          ; valid                                  # 5.1  CYRILLIC SMALL LETTER YAE
-051A          ; mapped                 ; 051B          # 5.1  CYRILLIC CAPITAL LETTER QA
-051B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER QA
-051C          ; mapped                 ; 051D          # 5.1  CYRILLIC CAPITAL LETTER WE
-051D          ; valid                                  # 5.1  CYRILLIC SMALL LETTER WE
-051E          ; mapped                 ; 051F          # 5.1  CYRILLIC CAPITAL LETTER ALEUT KA
-051F          ; valid                                  # 5.1  CYRILLIC SMALL LETTER ALEUT KA
-0520          ; mapped                 ; 0521          # 5.1  CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
-0521          ; valid                                  # 5.1  CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK
-0522          ; mapped                 ; 0523          # 5.1  CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
-0523          ; valid                                  # 5.1  CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK
-0524          ; mapped                 ; 0525          # 5.2  CYRILLIC CAPITAL LETTER PE WITH DESCENDER
-0525          ; valid                                  # 5.2  CYRILLIC SMALL LETTER PE WITH DESCENDER
-0526          ; mapped                 ; 0527          # 6.0  CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER
-0527          ; valid                                  # 6.0  CYRILLIC SMALL LETTER SHHA WITH DESCENDER
-0528          ; mapped                 ; 0529          # 7.0  CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
-0529          ; valid                                  # 7.0  CYRILLIC SMALL LETTER EN WITH LEFT HOOK
-052A          ; mapped                 ; 052B          # 7.0  CYRILLIC CAPITAL LETTER DZZHE
-052B          ; valid                                  # 7.0  CYRILLIC SMALL LETTER DZZHE
-052C          ; mapped                 ; 052D          # 7.0  CYRILLIC CAPITAL LETTER DCHE
-052D          ; valid                                  # 7.0  CYRILLIC SMALL LETTER DCHE
-052E          ; mapped                 ; 052F          # 7.0  CYRILLIC CAPITAL LETTER EL WITH DESCENDER
-052F          ; valid                                  # 7.0  CYRILLIC SMALL LETTER EL WITH DESCENDER
-0530          ; disallowed                             # NA   <reserved-0530>
-0531          ; mapped                 ; 0561          # 1.1  ARMENIAN CAPITAL LETTER AYB
-0532          ; mapped                 ; 0562          # 1.1  ARMENIAN CAPITAL LETTER BEN
-0533          ; mapped                 ; 0563          # 1.1  ARMENIAN CAPITAL LETTER GIM
-0534          ; mapped                 ; 0564          # 1.1  ARMENIAN CAPITAL LETTER DA
-0535          ; mapped                 ; 0565          # 1.1  ARMENIAN CAPITAL LETTER ECH
-0536          ; mapped                 ; 0566          # 1.1  ARMENIAN CAPITAL LETTER ZA
-0537          ; mapped                 ; 0567          # 1.1  ARMENIAN CAPITAL LETTER EH
-0538          ; mapped                 ; 0568          # 1.1  ARMENIAN CAPITAL LETTER ET
-0539          ; mapped                 ; 0569          # 1.1  ARMENIAN CAPITAL LETTER TO
-053A          ; mapped                 ; 056A          # 1.1  ARMENIAN CAPITAL LETTER ZHE
-053B          ; mapped                 ; 056B          # 1.1  ARMENIAN CAPITAL LETTER INI
-053C          ; mapped                 ; 056C          # 1.1  ARMENIAN CAPITAL LETTER LIWN
-053D          ; mapped                 ; 056D          # 1.1  ARMENIAN CAPITAL LETTER XEH
-053E          ; mapped                 ; 056E          # 1.1  ARMENIAN CAPITAL LETTER CA
-053F          ; mapped                 ; 056F          # 1.1  ARMENIAN CAPITAL LETTER KEN
-0540          ; mapped                 ; 0570          # 1.1  ARMENIAN CAPITAL LETTER HO
-0541          ; mapped                 ; 0571          # 1.1  ARMENIAN CAPITAL LETTER JA
-0542          ; mapped                 ; 0572          # 1.1  ARMENIAN CAPITAL LETTER GHAD
-0543          ; mapped                 ; 0573          # 1.1  ARMENIAN CAPITAL LETTER CHEH
-0544          ; mapped                 ; 0574          # 1.1  ARMENIAN CAPITAL LETTER MEN
-0545          ; mapped                 ; 0575          # 1.1  ARMENIAN CAPITAL LETTER YI
-0546          ; mapped                 ; 0576          # 1.1  ARMENIAN CAPITAL LETTER NOW
-0547          ; mapped                 ; 0577          # 1.1  ARMENIAN CAPITAL LETTER SHA
-0548          ; mapped                 ; 0578          # 1.1  ARMENIAN CAPITAL LETTER VO
-0549          ; mapped                 ; 0579          # 1.1  ARMENIAN CAPITAL LETTER CHA
-054A          ; mapped                 ; 057A          # 1.1  ARMENIAN CAPITAL LETTER PEH
-054B          ; mapped                 ; 057B          # 1.1  ARMENIAN CAPITAL LETTER JHEH
-054C          ; mapped                 ; 057C          # 1.1  ARMENIAN CAPITAL LETTER RA
-054D          ; mapped                 ; 057D          # 1.1  ARMENIAN CAPITAL LETTER SEH
-054E          ; mapped                 ; 057E          # 1.1  ARMENIAN CAPITAL LETTER VEW
-054F          ; mapped                 ; 057F          # 1.1  ARMENIAN CAPITAL LETTER TIWN
-0550          ; mapped                 ; 0580          # 1.1  ARMENIAN CAPITAL LETTER REH
-0551          ; mapped                 ; 0581          # 1.1  ARMENIAN CAPITAL LETTER CO
-0552          ; mapped                 ; 0582          # 1.1  ARMENIAN CAPITAL LETTER YIWN
-0553          ; mapped                 ; 0583          # 1.1  ARMENIAN CAPITAL LETTER PIWR
-0554          ; mapped                 ; 0584          # 1.1  ARMENIAN CAPITAL LETTER KEH
-0555          ; mapped                 ; 0585          # 1.1  ARMENIAN CAPITAL LETTER OH
-0556          ; mapped                 ; 0586          # 1.1  ARMENIAN CAPITAL LETTER FEH
-0557..0558    ; disallowed                             # NA   <reserved-0557>..<reserved-0558>
-0559          ; valid                                  # 1.1  ARMENIAN MODIFIER LETTER LEFT HALF RING
-055A..055F    ; valid                  ;      ; NV8    # 1.1  ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK
-0560          ; disallowed                             # NA   <reserved-0560>
-0561..0586    ; valid                                  # 1.1  ARMENIAN SMALL LETTER AYB..ARMENIAN SMALL LETTER FEH
-0587          ; mapped                 ; 0565 0582     # 1.1  ARMENIAN SMALL LIGATURE ECH YIWN
-0588          ; disallowed                             # NA   <reserved-0588>
-0589          ; valid                  ;      ; NV8    # 1.1  ARMENIAN FULL STOP
-058A          ; valid                  ;      ; NV8    # 3.0  ARMENIAN HYPHEN
-058B..058C    ; disallowed                             # NA   <reserved-058B>..<reserved-058C>
-058D..058E    ; valid                  ;      ; NV8    # 7.0  RIGHT-FACING ARMENIAN ETERNITY SIGN..LEFT-FACING ARMENIAN ETERNITY SIGN
-058F          ; valid                  ;      ; NV8    # 6.1  ARMENIAN DRAM SIGN
-0590          ; disallowed                             # NA   <reserved-0590>
-0591..05A1    ; valid                                  # 2.0  HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER
-05A2          ; valid                                  # 4.1  HEBREW ACCENT ATNAH HAFUKH
-05A3..05AF    ; valid                                  # 2.0  HEBREW ACCENT MUNAH..HEBREW MARK MASORA CIRCLE
-05B0..05B9    ; valid                                  # 1.1  HEBREW POINT SHEVA..HEBREW POINT HOLAM
-05BA          ; valid                                  # 5.0  HEBREW POINT HOLAM HASER FOR VAV
-05BB..05BD    ; valid                                  # 1.1  HEBREW POINT QUBUTS..HEBREW POINT METEG
-05BE          ; valid                  ;      ; NV8    # 1.1  HEBREW PUNCTUATION MAQAF
-05BF          ; valid                                  # 1.1  HEBREW POINT RAFE
-05C0          ; valid                  ;      ; NV8    # 1.1  HEBREW PUNCTUATION PASEQ
-05C1..05C2    ; valid                                  # 1.1  HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
-05C3          ; valid                  ;      ; NV8    # 1.1  HEBREW PUNCTUATION SOF PASUQ
-05C4          ; valid                                  # 2.0  HEBREW MARK UPPER DOT
-05C5          ; valid                                  # 4.1  HEBREW MARK LOWER DOT
-05C6          ; valid                  ;      ; NV8    # 4.1  HEBREW PUNCTUATION NUN HAFUKHA
-05C7          ; valid                                  # 4.1  HEBREW POINT QAMATS QATAN
-05C8..05CF    ; disallowed                             # NA   <reserved-05C8>..<reserved-05CF>
-05D0..05EA    ; valid                                  # 1.1  HEBREW LETTER ALEF..HEBREW LETTER TAV
-05EB..05EF    ; disallowed                             # NA   <reserved-05EB>..<reserved-05EF>
-05F0..05F4    ; valid                                  # 1.1  HEBREW LIGATURE YIDDISH DOUBLE VAV..HEBREW PUNCTUATION GERSHAYIM
-05F5..05FF    ; disallowed                             # NA   <reserved-05F5>..<reserved-05FF>
-0600..0603    ; disallowed                             # 4.0  ARABIC NUMBER SIGN..ARABIC SIGN SAFHA
-0604          ; disallowed                             # 6.1  ARABIC SIGN SAMVAT
-0605          ; disallowed                             # 7.0  ARABIC NUMBER MARK ABOVE
-0606..060A    ; valid                  ;      ; NV8    # 5.1  ARABIC-INDIC CUBE ROOT..ARABIC-INDIC PER TEN THOUSAND SIGN
-060B          ; valid                  ;      ; NV8    # 4.1  AFGHANI SIGN
-060C          ; valid                  ;      ; NV8    # 1.1  ARABIC COMMA
-060D..060F    ; valid                  ;      ; NV8    # 4.0  ARABIC DATE SEPARATOR..ARABIC SIGN MISRA
-0610..0615    ; valid                                  # 4.0  ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL HIGH TAH
-0616..061A    ; valid                                  # 5.1  ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH..ARABIC SMALL KASRA
-061B          ; valid                  ;      ; NV8    # 1.1  ARABIC SEMICOLON
-061C          ; disallowed                             # 6.3  ARABIC LETTER MARK
-061D          ; disallowed                             # NA   <reserved-061D>
-061E          ; valid                  ;      ; NV8    # 4.1  ARABIC TRIPLE DOT PUNCTUATION MARK
-061F          ; valid                  ;      ; NV8    # 1.1  ARABIC QUESTION MARK
-0620          ; valid                                  # 6.0  ARABIC LETTER KASHMIRI YEH
-0621..063A    ; valid                                  # 1.1  ARABIC LETTER HAMZA..ARABIC LETTER GHAIN
-063B..063F    ; valid                                  # 5.1  ARABIC LETTER KEHEH WITH TWO DOTS ABOVE..ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE
-0640          ; valid                  ;      ; NV8    # 1.1  ARABIC TATWEEL
-0641..0652    ; valid                                  # 1.1  ARABIC LETTER FEH..ARABIC SUKUN
-0653..0655    ; valid                                  # 3.0  ARABIC MADDAH ABOVE..ARABIC HAMZA BELOW
-0656..0658    ; valid                                  # 4.0  ARABIC SUBSCRIPT ALEF..ARABIC MARK NOON GHUNNA
-0659..065E    ; valid                                  # 4.1  ARABIC ZWARAKAY..ARABIC FATHA WITH TWO DOTS
-065F          ; valid                                  # 6.0  ARABIC WAVY HAMZA BELOW
-0660..0669    ; valid                                  # 1.1  ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE
-066A..066D    ; valid                  ;      ; NV8    # 1.1  ARABIC PERCENT SIGN..ARABIC FIVE POINTED STAR
-066E..066F    ; valid                                  # 3.2  ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF
-0670..0674    ; valid                                  # 1.1  ARABIC LETTER SUPERSCRIPT ALEF..ARABIC LETTER HIGH HAMZA
-0675          ; mapped                 ; 0627 0674     # 1.1  ARABIC LETTER HIGH HAMZA ALEF
-0676          ; mapped                 ; 0648 0674     # 1.1  ARABIC LETTER HIGH HAMZA WAW
-0677          ; mapped                 ; 06C7 0674     # 1.1  ARABIC LETTER U WITH HAMZA ABOVE
-0678          ; mapped                 ; 064A 0674     # 1.1  ARABIC LETTER HIGH HAMZA YEH
-0679..06B7    ; valid                                  # 1.1  ARABIC LETTER TTEH..ARABIC LETTER LAM WITH THREE DOTS ABOVE
-06B8..06B9    ; valid                                  # 3.0  ARABIC LETTER LAM WITH THREE DOTS BELOW..ARABIC LETTER NOON WITH DOT BELOW
-06BA..06BE    ; valid                                  # 1.1  ARABIC LETTER NOON GHUNNA..ARABIC LETTER HEH DOACHASHMEE
-06BF          ; valid                                  # 3.0  ARABIC LETTER TCHEH WITH DOT ABOVE
-06C0..06CE    ; valid                                  # 1.1  ARABIC LETTER HEH WITH YEH ABOVE..ARABIC LETTER YEH WITH SMALL V
-06CF          ; valid                                  # 3.0  ARABIC LETTER WAW WITH DOT ABOVE
-06D0..06D3    ; valid                                  # 1.1  ARABIC LETTER E..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
-06D4          ; valid                  ;      ; NV8    # 1.1  ARABIC FULL STOP
-06D5..06DC    ; valid                                  # 1.1  ARABIC LETTER AE..ARABIC SMALL HIGH SEEN
-06DD          ; disallowed                             # 1.1  ARABIC END OF AYAH
-06DE          ; valid                  ;      ; NV8    # 1.1  ARABIC START OF RUB EL HIZB
-06DF..06E8    ; valid                                  # 1.1  ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH NOON
-06E9          ; valid                  ;      ; NV8    # 1.1  ARABIC PLACE OF SAJDAH
-06EA..06ED    ; valid                                  # 1.1  ARABIC EMPTY CENTRE LOW STOP..ARABIC SMALL LOW MEEM
-06EE..06EF    ; valid                                  # 4.0  ARABIC LETTER DAL WITH INVERTED V..ARABIC LETTER REH WITH INVERTED V
-06F0..06F9    ; valid                                  # 1.1  EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE
-06FA..06FE    ; valid                                  # 3.0  ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC SIGN SINDHI POSTPOSITION MEN
-06FF          ; valid                                  # 4.0  ARABIC LETTER HEH WITH INVERTED V
-0700..070D    ; valid                  ;      ; NV8    # 3.0  SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS
-070E          ; disallowed                             # NA   <reserved-070E>
-070F          ; disallowed                             # 3.0  SYRIAC ABBREVIATION MARK
-0710..072C    ; valid                                  # 3.0  SYRIAC LETTER ALAPH..SYRIAC LETTER TAW
-072D..072F    ; valid                                  # 4.0  SYRIAC LETTER PERSIAN BHETH..SYRIAC LETTER PERSIAN DHALATH
-0730..074A    ; valid                                  # 3.0  SYRIAC PTHAHA ABOVE..SYRIAC BARREKH
-074B..074C    ; disallowed                             # NA   <reserved-074B>..<reserved-074C>
-074D..074F    ; valid                                  # 4.0  SYRIAC LETTER SOGDIAN ZHAIN..SYRIAC LETTER SOGDIAN FE
-0750..076D    ; valid                                  # 4.1  ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW..ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE
-076E..077F    ; valid                                  # 5.1  ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH BELOW..ARABIC LETTER KAF WITH TWO DOTS ABOVE
-0780..07B0    ; valid                                  # 3.0  THAANA LETTER HAA..THAANA SUKUN
-07B1          ; valid                                  # 3.2  THAANA LETTER NAA
-07B2..07BF    ; disallowed                             # NA   <reserved-07B2>..<reserved-07BF>
-07C0..07F5    ; valid                                  # 5.0  NKO DIGIT ZERO..NKO LOW TONE APOSTROPHE
-07F6..07FA    ; valid                  ;      ; NV8    # 5.0  NKO SYMBOL OO DENNEN..NKO LAJANYALAN
-07FB..07FF    ; disallowed                             # NA   <reserved-07FB>..<reserved-07FF>
-0800..082D    ; valid                                  # 5.2  SAMARITAN LETTER ALAF..SAMARITAN MARK NEQUDAA
-082E..082F    ; disallowed                             # NA   <reserved-082E>..<reserved-082F>
-0830..083E    ; valid                  ;      ; NV8    # 5.2  SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU
-083F          ; disallowed                             # NA   <reserved-083F>
-0840..085B    ; valid                                  # 6.0  MANDAIC LETTER HALQA..MANDAIC GEMINATION MARK
-085C..085D    ; disallowed                             # NA   <reserved-085C>..<reserved-085D>
-085E          ; valid                  ;      ; NV8    # 6.0  MANDAIC PUNCTUATION
-085F          ; disallowed                             # NA   <reserved-085F>
-0860..086A    ; valid                                  # 10.0 SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
-086B..089F    ; disallowed                             # NA   <reserved-086B>..<reserved-089F>
-08A0          ; valid                                  # 6.1  ARABIC LETTER BEH WITH SMALL V BELOW
-08A1          ; valid                                  # 7.0  ARABIC LETTER BEH WITH HAMZA ABOVE
-08A2..08AC    ; valid                                  # 6.1  ARABIC LETTER JEEM WITH TWO DOTS ABOVE..ARABIC LETTER ROHINGYA YEH
-08AD..08B2    ; valid                                  # 7.0  ARABIC LETTER LOW ALEF..ARABIC LETTER ZAIN WITH INVERTED V ABOVE
-08B3..08B4    ; valid                                  # 8.0  ARABIC LETTER AIN WITH THREE DOTS BELOW..ARABIC LETTER KAF WITH DOT BELOW
-08B5          ; disallowed                             # NA   <reserved-08B5>
-08B6..08BD    ; valid                                  # 9.0  ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER AFRICAN NOON
-08BE..08D3    ; disallowed                             # NA   <reserved-08BE>..<reserved-08D3>
-08D4..08E1    ; valid                                  # 9.0  ARABIC SMALL HIGH WORD AR-RUB..ARABIC SMALL HIGH SIGN SAFHA
-08E2          ; disallowed                             # 9.0  ARABIC DISPUTED END OF AYAH
-08E3          ; valid                                  # 8.0  ARABIC TURNED DAMMA BELOW
-08E4..08FE    ; valid                                  # 6.1  ARABIC CURLY FATHA..ARABIC DAMMA WITH DOT
-08FF          ; valid                                  # 7.0  ARABIC MARK SIDEWAYS NOON GHUNNA
-0900          ; valid                                  # 5.2  DEVANAGARI SIGN INVERTED CANDRABINDU
-0901..0903    ; valid                                  # 1.1  DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN VISARGA
-0904          ; valid                                  # 4.0  DEVANAGARI LETTER SHORT A
-0905..0939    ; valid                                  # 1.1  DEVANAGARI LETTER A..DEVANAGARI LETTER HA
-093A..093B    ; valid                                  # 6.0  DEVANAGARI VOWEL SIGN OE..DEVANAGARI VOWEL SIGN OOE
-093C..094D    ; valid                                  # 1.1  DEVANAGARI SIGN NUKTA..DEVANAGARI SIGN VIRAMA
-094E          ; valid                                  # 5.2  DEVANAGARI VOWEL SIGN PRISHTHAMATRA E
-094F          ; valid                                  # 6.0  DEVANAGARI VOWEL SIGN AW
-0950..0954    ; valid                                  # 1.1  DEVANAGARI OM..DEVANAGARI ACUTE ACCENT
-0955          ; valid                                  # 5.2  DEVANAGARI VOWEL SIGN CANDRA LONG E
-0956..0957    ; valid                                  # 6.0  DEVANAGARI VOWEL SIGN UE..DEVANAGARI VOWEL SIGN UUE
-0958          ; mapped                 ; 0915 093C     # 1.1  DEVANAGARI LETTER QA
-0959          ; mapped                 ; 0916 093C     # 1.1  DEVANAGARI LETTER KHHA
-095A          ; mapped                 ; 0917 093C     # 1.1  DEVANAGARI LETTER GHHA
-095B          ; mapped                 ; 091C 093C     # 1.1  DEVANAGARI LETTER ZA
-095C          ; mapped                 ; 0921 093C     # 1.1  DEVANAGARI LETTER DDDHA
-095D          ; mapped                 ; 0922 093C     # 1.1  DEVANAGARI LETTER RHA
-095E          ; mapped                 ; 092B 093C     # 1.1  DEVANAGARI LETTER FA
-095F          ; mapped                 ; 092F 093C     # 1.1  DEVANAGARI LETTER YYA
-0960..0963    ; valid                                  # 1.1  DEVANAGARI LETTER VOCALIC RR..DEVANAGARI VOWEL SIGN VOCALIC LL
-0964..0965    ; valid                  ;      ; NV8    # 1.1  DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA
-0966..096F    ; valid                                  # 1.1  DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE
-0970          ; valid                  ;      ; NV8    # 1.1  DEVANAGARI ABBREVIATION SIGN
-0971..0972    ; valid                                  # 5.1  DEVANAGARI SIGN HIGH SPACING DOT..DEVANAGARI LETTER CANDRA A
-0973..0977    ; valid                                  # 6.0  DEVANAGARI LETTER OE..DEVANAGARI LETTER UUE
-0978          ; valid                                  # 7.0  DEVANAGARI LETTER MARWARI DDA
-0979..097A    ; valid                                  # 5.2  DEVANAGARI LETTER ZHA..DEVANAGARI LETTER HEAVY YA
-097B..097C    ; valid                                  # 5.0  DEVANAGARI LETTER GGA..DEVANAGARI LETTER JJA
-097D          ; valid                                  # 4.1  DEVANAGARI LETTER GLOTTAL STOP
-097E..097F    ; valid                                  # 5.0  DEVANAGARI LETTER DDDA..DEVANAGARI LETTER BBA
-0980          ; valid                                  # 7.0  BENGALI ANJI
-0981..0983    ; valid                                  # 1.1  BENGALI SIGN CANDRABINDU..BENGALI SIGN VISARGA
-0984          ; disallowed                             # NA   <reserved-0984>
-0985..098C    ; valid                                  # 1.1  BENGALI LETTER A..BENGALI LETTER VOCALIC L
-098D..098E    ; disallowed                             # NA   <reserved-098D>..<reserved-098E>
-098F..0990    ; valid                                  # 1.1  BENGALI LETTER E..BENGALI LETTER AI
-0991..0992    ; disallowed                             # NA   <reserved-0991>..<reserved-0992>
-0993..09A8    ; valid                                  # 1.1  BENGALI LETTER O..BENGALI LETTER NA
-09A9          ; disallowed                             # NA   <reserved-09A9>
-09AA..09B0    ; valid                                  # 1.1  BENGALI LETTER PA..BENGALI LETTER RA
-09B1          ; disallowed                             # NA   <reserved-09B1>
-09B2          ; valid                                  # 1.1  BENGALI LETTER LA
-09B3..09B5    ; disallowed                             # NA   <reserved-09B3>..<reserved-09B5>
-09B6..09B9    ; valid                                  # 1.1  BENGALI LETTER SHA..BENGALI LETTER HA
-09BA..09BB    ; disallowed                             # NA   <reserved-09BA>..<reserved-09BB>
-09BC          ; valid                                  # 1.1  BENGALI SIGN NUKTA
-09BD          ; valid                                  # 4.0  BENGALI SIGN AVAGRAHA
-09BE..09C4    ; valid                                  # 1.1  BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN VOCALIC RR
-09C5..09C6    ; disallowed                             # NA   <reserved-09C5>..<reserved-09C6>
-09C7..09C8    ; valid                                  # 1.1  BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI
-09C9..09CA    ; disallowed                             # NA   <reserved-09C9>..<reserved-09CA>
-09CB..09CD    ; valid                                  # 1.1  BENGALI VOWEL SIGN O..BENGALI SIGN VIRAMA
-09CE          ; valid                                  # 4.1  BENGALI LETTER KHANDA TA
-09CF..09D6    ; disallowed                             # NA   <reserved-09CF>..<reserved-09D6>
-09D7          ; valid                                  # 1.1  BENGALI AU LENGTH MARK
-09D8..09DB    ; disallowed                             # NA   <reserved-09D8>..<reserved-09DB>
-09DC          ; mapped                 ; 09A1 09BC     # 1.1  BENGALI LETTER RRA
-09DD          ; mapped                 ; 09A2 09BC     # 1.1  BENGALI LETTER RHA
-09DE          ; disallowed                             # NA   <reserved-09DE>
-09DF          ; mapped                 ; 09AF 09BC     # 1.1  BENGALI LETTER YYA
-09E0..09E3    ; valid                                  # 1.1  BENGALI LETTER VOCALIC RR..BENGALI VOWEL SIGN VOCALIC LL
-09E4..09E5    ; disallowed                             # NA   <reserved-09E4>..<reserved-09E5>
-09E6..09F1    ; valid                                  # 1.1  BENGALI DIGIT ZERO..BENGALI LETTER RA WITH LOWER DIAGONAL
-09F2..09FA    ; valid                  ;      ; NV8    # 1.1  BENGALI RUPEE MARK..BENGALI ISSHAR
-09FB          ; valid                  ;      ; NV8    # 5.2  BENGALI GANDA MARK
-09FC          ; valid                                  # 10.0 BENGALI LETTER VEDIC ANUSVARA
-09FD          ; valid                  ;      ; NV8    # 10.0 BENGALI ABBREVIATION SIGN
-09FE..0A00    ; disallowed                             # NA   <reserved-09FE>..<reserved-0A00>
-0A01          ; valid                                  # 4.0  GURMUKHI SIGN ADAK BINDI
-0A02          ; valid                                  # 1.1  GURMUKHI SIGN BINDI
-0A03          ; valid                                  # 4.0  GURMUKHI SIGN VISARGA
-0A04          ; disallowed                             # NA   <reserved-0A04>
-0A05..0A0A    ; valid                                  # 1.1  GURMUKHI LETTER A..GURMUKHI LETTER UU
-0A0B..0A0E    ; disallowed                             # NA   <reserved-0A0B>..<reserved-0A0E>
-0A0F..0A10    ; valid                                  # 1.1  GURMUKHI LETTER EE..GURMUKHI LETTER AI
-0A11..0A12    ; disallowed                             # NA   <reserved-0A11>..<reserved-0A12>
-0A13..0A28    ; valid                                  # 1.1  GURMUKHI LETTER OO..GURMUKHI LETTER NA
-0A29          ; disallowed                             # NA   <reserved-0A29>
-0A2A..0A30    ; valid                                  # 1.1  GURMUKHI LETTER PA..GURMUKHI LETTER RA
-0A31          ; disallowed                             # NA   <reserved-0A31>
-0A32          ; valid                                  # 1.1  GURMUKHI LETTER LA
-0A33          ; mapped                 ; 0A32 0A3C     # 1.1  GURMUKHI LETTER LLA
-0A34          ; disallowed                             # NA   <reserved-0A34>
-0A35          ; valid                                  # 1.1  GURMUKHI LETTER VA
-0A36          ; mapped                 ; 0A38 0A3C     # 1.1  GURMUKHI LETTER SHA
-0A37          ; disallowed                             # NA   <reserved-0A37>
-0A38..0A39    ; valid                                  # 1.1  GURMUKHI LETTER SA..GURMUKHI LETTER HA
-0A3A..0A3B    ; disallowed                             # NA   <reserved-0A3A>..<reserved-0A3B>
-0A3C          ; valid                                  # 1.1  GURMUKHI SIGN NUKTA
-0A3D          ; disallowed                             # NA   <reserved-0A3D>
-0A3E..0A42    ; valid                                  # 1.1  GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN UU
-0A43..0A46    ; disallowed                             # NA   <reserved-0A43>..<reserved-0A46>
-0A47..0A48    ; valid                                  # 1.1  GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI
-0A49..0A4A    ; disallowed                             # NA   <reserved-0A49>..<reserved-0A4A>
-0A4B..0A4D    ; valid                                  # 1.1  GURMUKHI VOWEL SIGN OO..GURMUKHI SIGN VIRAMA
-0A4E..0A50    ; disallowed                             # NA   <reserved-0A4E>..<reserved-0A50>
-0A51          ; valid                                  # 5.1  GURMUKHI SIGN UDAAT
-0A52..0A58    ; disallowed                             # NA   <reserved-0A52>..<reserved-0A58>
-0A59          ; mapped                 ; 0A16 0A3C     # 1.1  GURMUKHI LETTER KHHA
-0A5A          ; mapped                 ; 0A17 0A3C     # 1.1  GURMUKHI LETTER GHHA
-0A5B          ; mapped                 ; 0A1C 0A3C     # 1.1  GURMUKHI LETTER ZA
-0A5C          ; valid                                  # 1.1  GURMUKHI LETTER RRA
-0A5D          ; disallowed                             # NA   <reserved-0A5D>
-0A5E          ; mapped                 ; 0A2B 0A3C     # 1.1  GURMUKHI LETTER FA
-0A5F..0A65    ; disallowed                             # NA   <reserved-0A5F>..<reserved-0A65>
-0A66..0A74    ; valid                                  # 1.1  GURMUKHI DIGIT ZERO..GURMUKHI EK ONKAR
-0A75          ; valid                                  # 5.1  GURMUKHI SIGN YAKASH
-0A76..0A80    ; disallowed                             # NA   <reserved-0A76>..<reserved-0A80>
-0A81..0A83    ; valid                                  # 1.1  GUJARATI SIGN CANDRABINDU..GUJARATI SIGN VISARGA
-0A84          ; disallowed                             # NA   <reserved-0A84>
-0A85..0A8B    ; valid                                  # 1.1  GUJARATI LETTER A..GUJARATI LETTER VOCALIC R
-0A8C          ; valid                                  # 4.0  GUJARATI LETTER VOCALIC L
-0A8D          ; valid                                  # 1.1  GUJARATI VOWEL CANDRA E
-0A8E          ; disallowed                             # NA   <reserved-0A8E>
-0A8F..0A91    ; valid                                  # 1.1  GUJARATI LETTER E..GUJARATI VOWEL CANDRA O
-0A92          ; disallowed                             # NA   <reserved-0A92>
-0A93..0AA8    ; valid                                  # 1.1  GUJARATI LETTER O..GUJARATI LETTER NA
-0AA9          ; disallowed                             # NA   <reserved-0AA9>
-0AAA..0AB0    ; valid                                  # 1.1  GUJARATI LETTER PA..GUJARATI LETTER RA
-0AB1          ; disallowed                             # NA   <reserved-0AB1>
-0AB2..0AB3    ; valid                                  # 1.1  GUJARATI LETTER LA..GUJARATI LETTER LLA
-0AB4          ; disallowed                             # NA   <reserved-0AB4>
-0AB5..0AB9    ; valid                                  # 1.1  GUJARATI LETTER VA..GUJARATI LETTER HA
-0ABA..0ABB    ; disallowed                             # NA   <reserved-0ABA>..<reserved-0ABB>
-0ABC..0AC5    ; valid                                  # 1.1  GUJARATI SIGN NUKTA..GUJARATI VOWEL SIGN CANDRA E
-0AC6          ; disallowed                             # NA   <reserved-0AC6>
-0AC7..0AC9    ; valid                                  # 1.1  GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN CANDRA O
-0ACA          ; disallowed                             # NA   <reserved-0ACA>
-0ACB..0ACD    ; valid                                  # 1.1  GUJARATI VOWEL SIGN O..GUJARATI SIGN VIRAMA
-0ACE..0ACF    ; disallowed                             # NA   <reserved-0ACE>..<reserved-0ACF>
-0AD0          ; valid                                  # 1.1  GUJARATI OM
-0AD1..0ADF    ; disallowed                             # NA   <reserved-0AD1>..<reserved-0ADF>
-0AE0          ; valid                                  # 1.1  GUJARATI LETTER VOCALIC RR
-0AE1..0AE3    ; valid                                  # 4.0  GUJARATI LETTER VOCALIC LL..GUJARATI VOWEL SIGN VOCALIC LL
-0AE4..0AE5    ; disallowed                             # NA   <reserved-0AE4>..<reserved-0AE5>
-0AE6..0AEF    ; valid                                  # 1.1  GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE
-0AF0          ; valid                  ;      ; NV8    # 6.1  GUJARATI ABBREVIATION SIGN
-0AF1          ; valid                  ;      ; NV8    # 4.0  GUJARATI RUPEE SIGN
-0AF2..0AF8    ; disallowed                             # NA   <reserved-0AF2>..<reserved-0AF8>
-0AF9          ; valid                                  # 8.0  GUJARATI LETTER ZHA
-0AFA..0AFF    ; valid                                  # 10.0 GUJARATI SIGN SUKUN..GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE
-0B00          ; disallowed                             # NA   <reserved-0B00>
-0B01..0B03    ; valid                                  # 1.1  ORIYA SIGN CANDRABINDU..ORIYA SIGN VISARGA
-0B04          ; disallowed                             # NA   <reserved-0B04>
-0B05..0B0C    ; valid                                  # 1.1  ORIYA LETTER A..ORIYA LETTER VOCALIC L
-0B0D..0B0E    ; disallowed                             # NA   <reserved-0B0D>..<reserved-0B0E>
-0B0F..0B10    ; valid                                  # 1.1  ORIYA LETTER E..ORIYA LETTER AI
-0B11..0B12    ; disallowed                             # NA   <reserved-0B11>..<reserved-0B12>
-0B13..0B28    ; valid                                  # 1.1  ORIYA LETTER O..ORIYA LETTER NA
-0B29          ; disallowed                             # NA   <reserved-0B29>
-0B2A..0B30    ; valid                                  # 1.1  ORIYA LETTER PA..ORIYA LETTER RA
-0B31          ; disallowed                             # NA   <reserved-0B31>
-0B32..0B33    ; valid                                  # 1.1  ORIYA LETTER LA..ORIYA LETTER LLA
-0B34          ; disallowed                             # NA   <reserved-0B34>
-0B35          ; valid                                  # 4.0  ORIYA LETTER VA
-0B36..0B39    ; valid                                  # 1.1  ORIYA LETTER SHA..ORIYA LETTER HA
-0B3A..0B3B    ; disallowed                             # NA   <reserved-0B3A>..<reserved-0B3B>
-0B3C..0B43    ; valid                                  # 1.1  ORIYA SIGN NUKTA..ORIYA VOWEL SIGN VOCALIC R
-0B44          ; valid                                  # 5.1  ORIYA VOWEL SIGN VOCALIC RR
-0B45..0B46    ; disallowed                             # NA   <reserved-0B45>..<reserved-0B46>
-0B47..0B48    ; valid                                  # 1.1  ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI
-0B49..0B4A    ; disallowed                             # NA   <reserved-0B49>..<reserved-0B4A>
-0B4B..0B4D    ; valid                                  # 1.1  ORIYA VOWEL SIGN O..ORIYA SIGN VIRAMA
-0B4E..0B55    ; disallowed                             # NA   <reserved-0B4E>..<reserved-0B55>
-0B56..0B57    ; valid                                  # 1.1  ORIYA AI LENGTH MARK..ORIYA AU LENGTH MARK
-0B58..0B5B    ; disallowed                             # NA   <reserved-0B58>..<reserved-0B5B>
-0B5C          ; mapped                 ; 0B21 0B3C     # 1.1  ORIYA LETTER RRA
-0B5D          ; mapped                 ; 0B22 0B3C     # 1.1  ORIYA LETTER RHA
-0B5E          ; disallowed                             # NA   <reserved-0B5E>
-0B5F..0B61    ; valid                                  # 1.1  ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL
-0B62..0B63    ; valid                                  # 5.1  ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL
-0B64..0B65    ; disallowed                             # NA   <reserved-0B64>..<reserved-0B65>
-0B66..0B6F    ; valid                                  # 1.1  ORIYA DIGIT ZERO..ORIYA DIGIT NINE
-0B70          ; valid                  ;      ; NV8    # 1.1  ORIYA ISSHAR
-0B71          ; valid                                  # 4.0  ORIYA LETTER WA
-0B72..0B77    ; valid                  ;      ; NV8    # 6.0  ORIYA FRACTION ONE QUARTER..ORIYA FRACTION THREE SIXTEENTHS
-0B78..0B81    ; disallowed                             # NA   <reserved-0B78>..<reserved-0B81>
-0B82..0B83    ; valid                                  # 1.1  TAMIL SIGN ANUSVARA..TAMIL SIGN VISARGA
-0B84          ; disallowed                             # NA   <reserved-0B84>
-0B85..0B8A    ; valid                                  # 1.1  TAMIL LETTER A..TAMIL LETTER UU
-0B8B..0B8D    ; disallowed                             # NA   <reserved-0B8B>..<reserved-0B8D>
-0B8E..0B90    ; valid                                  # 1.1  TAMIL LETTER E..TAMIL LETTER AI
-0B91          ; disallowed                             # NA   <reserved-0B91>
-0B92..0B95    ; valid                                  # 1.1  TAMIL LETTER O..TAMIL LETTER KA
-0B96..0B98    ; disallowed                             # NA   <reserved-0B96>..<reserved-0B98>
-0B99..0B9A    ; valid                                  # 1.1  TAMIL LETTER NGA..TAMIL LETTER CA
-0B9B          ; disallowed                             # NA   <reserved-0B9B>
-0B9C          ; valid                                  # 1.1  TAMIL LETTER JA
-0B9D          ; disallowed                             # NA   <reserved-0B9D>
-0B9E..0B9F    ; valid                                  # 1.1  TAMIL LETTER NYA..TAMIL LETTER TTA
-0BA0..0BA2    ; disallowed                             # NA   <reserved-0BA0>..<reserved-0BA2>
-0BA3..0BA4    ; valid                                  # 1.1  TAMIL LETTER NNA..TAMIL LETTER TA
-0BA5..0BA7    ; disallowed                             # NA   <reserved-0BA5>..<reserved-0BA7>
-0BA8..0BAA    ; valid                                  # 1.1  TAMIL LETTER NA..TAMIL LETTER PA
-0BAB..0BAD    ; disallowed                             # NA   <reserved-0BAB>..<reserved-0BAD>
-0BAE..0BB5    ; valid                                  # 1.1  TAMIL LETTER MA..TAMIL LETTER VA
-0BB6          ; valid                                  # 4.1  TAMIL LETTER SHA
-0BB7..0BB9    ; valid                                  # 1.1  TAMIL LETTER SSA..TAMIL LETTER HA
-0BBA..0BBD    ; disallowed                             # NA   <reserved-0BBA>..<reserved-0BBD>
-0BBE..0BC2    ; valid                                  # 1.1  TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN UU
-0BC3..0BC5    ; disallowed                             # NA   <reserved-0BC3>..<reserved-0BC5>
-0BC6..0BC8    ; valid                                  # 1.1  TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI
-0BC9          ; disallowed                             # NA   <reserved-0BC9>
-0BCA..0BCD    ; valid                                  # 1.1  TAMIL VOWEL SIGN O..TAMIL SIGN VIRAMA
-0BCE..0BCF    ; disallowed                             # NA   <reserved-0BCE>..<reserved-0BCF>
-0BD0          ; valid                                  # 5.1  TAMIL OM
-0BD1..0BD6    ; disallowed                             # NA   <reserved-0BD1>..<reserved-0BD6>
-0BD7          ; valid                                  # 1.1  TAMIL AU LENGTH MARK
-0BD8..0BE5    ; disallowed                             # NA   <reserved-0BD8>..<reserved-0BE5>
-0BE6          ; valid                                  # 4.1  TAMIL DIGIT ZERO
-0BE7..0BEF    ; valid                                  # 1.1  TAMIL DIGIT ONE..TAMIL DIGIT NINE
-0BF0..0BF2    ; valid                  ;      ; NV8    # 1.1  TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND
-0BF3..0BFA    ; valid                  ;      ; NV8    # 4.0  TAMIL DAY SIGN..TAMIL NUMBER SIGN
-0BFB..0BFF    ; disallowed                             # NA   <reserved-0BFB>..<reserved-0BFF>
-0C00          ; valid                                  # 7.0  TELUGU SIGN COMBINING CANDRABINDU ABOVE
-0C01..0C03    ; valid                                  # 1.1  TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA
-0C04          ; disallowed                             # NA   <reserved-0C04>
-0C05..0C0C    ; valid                                  # 1.1  TELUGU LETTER A..TELUGU LETTER VOCALIC L
-0C0D          ; disallowed                             # NA   <reserved-0C0D>
-0C0E..0C10    ; valid                                  # 1.1  TELUGU LETTER E..TELUGU LETTER AI
-0C11          ; disallowed                             # NA   <reserved-0C11>
-0C12..0C28    ; valid                                  # 1.1  TELUGU LETTER O..TELUGU LETTER NA
-0C29          ; disallowed                             # NA   <reserved-0C29>
-0C2A..0C33    ; valid                                  # 1.1  TELUGU LETTER PA..TELUGU LETTER LLA
-0C34          ; valid                                  # 7.0  TELUGU LETTER LLLA
-0C35..0C39    ; valid                                  # 1.1  TELUGU LETTER VA..TELUGU LETTER HA
-0C3A..0C3C    ; disallowed                             # NA   <reserved-0C3A>..<reserved-0C3C>
-0C3D          ; valid                                  # 5.1  TELUGU SIGN AVAGRAHA
-0C3E..0C44    ; valid                                  # 1.1  TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN VOCALIC RR
-0C45          ; disallowed                             # NA   <reserved-0C45>
-0C46..0C48    ; valid                                  # 1.1  TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI
-0C49          ; disallowed                             # NA   <reserved-0C49>
-0C4A..0C4D    ; valid                                  # 1.1  TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
-0C4E..0C54    ; disallowed                             # NA   <reserved-0C4E>..<reserved-0C54>
-0C55..0C56    ; valid                                  # 1.1  TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
-0C57          ; disallowed                             # NA   <reserved-0C57>
-0C58..0C59    ; valid                                  # 5.1  TELUGU LETTER TSA..TELUGU LETTER DZA
-0C5A          ; valid                                  # 8.0  TELUGU LETTER RRRA
-0C5B..0C5F    ; disallowed                             # NA   <reserved-0C5B>..<reserved-0C5F>
-0C60..0C61    ; valid                                  # 1.1  TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
-0C62..0C63    ; valid                                  # 5.1  TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
-0C64..0C65    ; disallowed                             # NA   <reserved-0C64>..<reserved-0C65>
-0C66..0C6F    ; valid                                  # 1.1  TELUGU DIGIT ZERO..TELUGU DIGIT NINE
-0C70..0C77    ; disallowed                             # NA   <reserved-0C70>..<reserved-0C77>
-0C78..0C7F    ; valid                  ;      ; NV8    # 5.1  TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU SIGN TUUMU
-0C80          ; valid                                  # 9.0  KANNADA SIGN SPACING CANDRABINDU
-0C81          ; valid                                  # 7.0  KANNADA SIGN CANDRABINDU
-0C82..0C83    ; valid                                  # 1.1  KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA
-0C84          ; disallowed                             # NA   <reserved-0C84>
-0C85..0C8C    ; valid                                  # 1.1  KANNADA LETTER A..KANNADA LETTER VOCALIC L
-0C8D          ; disallowed                             # NA   <reserved-0C8D>
-0C8E..0C90    ; valid                                  # 1.1  KANNADA LETTER E..KANNADA LETTER AI
-0C91          ; disallowed                             # NA   <reserved-0C91>
-0C92..0CA8    ; valid                                  # 1.1  KANNADA LETTER O..KANNADA LETTER NA
-0CA9          ; disallowed                             # NA   <reserved-0CA9>
-0CAA..0CB3    ; valid                                  # 1.1  KANNADA LETTER PA..KANNADA LETTER LLA
-0CB4          ; disallowed                             # NA   <reserved-0CB4>
-0CB5..0CB9    ; valid                                  # 1.1  KANNADA LETTER VA..KANNADA LETTER HA
-0CBA..0CBB    ; disallowed                             # NA   <reserved-0CBA>..<reserved-0CBB>
-0CBC..0CBD    ; valid                                  # 4.0  KANNADA SIGN NUKTA..KANNADA SIGN AVAGRAHA
-0CBE..0CC4    ; valid                                  # 1.1  KANNADA VOWEL SIGN AA..KANNADA VOWEL SIGN VOCALIC RR
-0CC5          ; disallowed                             # NA   <reserved-0CC5>
-0CC6..0CC8    ; valid                                  # 1.1  KANNADA VOWEL SIGN E..KANNADA VOWEL SIGN AI
-0CC9          ; disallowed                             # NA   <reserved-0CC9>
-0CCA..0CCD    ; valid                                  # 1.1  KANNADA VOWEL SIGN O..KANNADA SIGN VIRAMA
-0CCE..0CD4    ; disallowed                             # NA   <reserved-0CCE>..<reserved-0CD4>
-0CD5..0CD6    ; valid                                  # 1.1  KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
-0CD7..0CDD    ; disallowed                             # NA   <reserved-0CD7>..<reserved-0CDD>
-0CDE          ; valid                                  # 1.1  KANNADA LETTER FA
-0CDF          ; disallowed                             # NA   <reserved-0CDF>
-0CE0..0CE1    ; valid                                  # 1.1  KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
-0CE2..0CE3    ; valid                                  # 5.0  KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
-0CE4..0CE5    ; disallowed                             # NA   <reserved-0CE4>..<reserved-0CE5>
-0CE6..0CEF    ; valid                                  # 1.1  KANNADA DIGIT ZERO..KANNADA DIGIT NINE
-0CF0          ; disallowed                             # NA   <reserved-0CF0>
-0CF1..0CF2    ; valid                                  # 5.0  KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
-0CF3..0CFF    ; disallowed                             # NA   <reserved-0CF3>..<reserved-0CFF>
-0D00          ; valid                                  # 10.0 MALAYALAM SIGN COMBINING ANUSVARA ABOVE
-0D01          ; valid                                  # 7.0  MALAYALAM SIGN CANDRABINDU
-0D02..0D03    ; valid                                  # 1.1  MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA
-0D04          ; disallowed                             # NA   <reserved-0D04>
-0D05..0D0C    ; valid                                  # 1.1  MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L
-0D0D          ; disallowed                             # NA   <reserved-0D0D>
-0D0E..0D10    ; valid                                  # 1.1  MALAYALAM LETTER E..MALAYALAM LETTER AI
-0D11          ; disallowed                             # NA   <reserved-0D11>
-0D12..0D28    ; valid                                  # 1.1  MALAYALAM LETTER O..MALAYALAM LETTER NA
-0D29          ; valid                                  # 6.0  MALAYALAM LETTER NNNA
-0D2A..0D39    ; valid                                  # 1.1  MALAYALAM LETTER PA..MALAYALAM LETTER HA
-0D3A          ; valid                                  # 6.0  MALAYALAM LETTER TTTA
-0D3B..0D3C    ; valid                                  # 10.0 MALAYALAM SIGN VERTICAL BAR VIRAMA..MALAYALAM SIGN CIRCULAR VIRAMA
-0D3D          ; valid                                  # 5.1  MALAYALAM SIGN AVAGRAHA
-0D3E..0D43    ; valid                                  # 1.1  MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN VOCALIC R
-0D44          ; valid                                  # 5.1  MALAYALAM VOWEL SIGN VOCALIC RR
-0D45          ; disallowed                             # NA   <reserved-0D45>
-0D46..0D48    ; valid                                  # 1.1  MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI
-0D49          ; disallowed                             # NA   <reserved-0D49>
-0D4A..0D4D    ; valid                                  # 1.1  MALAYALAM VOWEL SIGN O..MALAYALAM SIGN VIRAMA
-0D4E          ; valid                                  # 6.0  MALAYALAM LETTER DOT REPH
-0D4F          ; valid                  ;      ; NV8    # 9.0  MALAYALAM SIGN PARA
-0D50..0D53    ; disallowed                             # NA   <reserved-0D50>..<reserved-0D53>
-0D54..0D56    ; valid                                  # 9.0  MALAYALAM LETTER CHILLU M..MALAYALAM LETTER CHILLU LLL
-0D57          ; valid                                  # 1.1  MALAYALAM AU LENGTH MARK
-0D58..0D5E    ; valid                  ;      ; NV8    # 9.0  MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH..MALAYALAM FRACTION ONE FIFTH
-0D5F          ; valid                                  # 8.0  MALAYALAM LETTER ARCHAIC II
-0D60..0D61    ; valid                                  # 1.1  MALAYALAM LETTER VOCALIC RR..MALAYALAM LETTER VOCALIC LL
-0D62..0D63    ; valid                                  # 5.1  MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL
-0D64..0D65    ; disallowed                             # NA   <reserved-0D64>..<reserved-0D65>
-0D66..0D6F    ; valid                                  # 1.1  MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE
-0D70..0D75    ; valid                  ;      ; NV8    # 5.1  MALAYALAM NUMBER TEN..MALAYALAM FRACTION THREE QUARTERS
-0D76..0D78    ; valid                  ;      ; NV8    # 9.0  MALAYALAM FRACTION ONE SIXTEENTH..MALAYALAM FRACTION THREE SIXTEENTHS
-0D79          ; valid                  ;      ; NV8    # 5.1  MALAYALAM DATE MARK
-0D7A..0D7F    ; valid                                  # 5.1  MALAYALAM LETTER CHILLU NN..MALAYALAM LETTER CHILLU K
-0D80..0D81    ; disallowed                             # NA   <reserved-0D80>..<reserved-0D81>
-0D82..0D83    ; valid                                  # 3.0  SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA
-0D84          ; disallowed                             # NA   <reserved-0D84>
-0D85..0D96    ; valid                                  # 3.0  SINHALA LETTER AYANNA..SINHALA LETTER AUYANNA
-0D97..0D99    ; disallowed                             # NA   <reserved-0D97>..<reserved-0D99>
-0D9A..0DB1    ; valid                                  # 3.0  SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA LETTER DANTAJA NAYANNA
-0DB2          ; disallowed                             # NA   <reserved-0DB2>
-0DB3..0DBB    ; valid                                  # 3.0  SINHALA LETTER SANYAKA DAYANNA..SINHALA LETTER RAYANNA
-0DBC          ; disallowed                             # NA   <reserved-0DBC>
-0DBD          ; valid                                  # 3.0  SINHALA LETTER DANTAJA LAYANNA
-0DBE..0DBF    ; disallowed                             # NA   <reserved-0DBE>..<reserved-0DBF>
-0DC0..0DC6    ; valid                                  # 3.0  SINHALA LETTER VAYANNA..SINHALA LETTER FAYANNA
-0DC7..0DC9    ; disallowed                             # NA   <reserved-0DC7>..<reserved-0DC9>
-0DCA          ; valid                                  # 3.0  SINHALA SIGN AL-LAKUNA
-0DCB..0DCE    ; disallowed                             # NA   <reserved-0DCB>..<reserved-0DCE>
-0DCF..0DD4    ; valid                                  # 3.0  SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA
-0DD5          ; disallowed                             # NA   <reserved-0DD5>
-0DD6          ; valid                                  # 3.0  SINHALA VOWEL SIGN DIGA PAA-PILLA
-0DD7          ; disallowed                             # NA   <reserved-0DD7>
-0DD8..0DDF    ; valid                                  # 3.0  SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA
-0DE0..0DE5    ; disallowed                             # NA   <reserved-0DE0>..<reserved-0DE5>
-0DE6..0DEF    ; valid                                  # 7.0  SINHALA LITH DIGIT ZERO..SINHALA LITH DIGIT NINE
-0DF0..0DF1    ; disallowed                             # NA   <reserved-0DF0>..<reserved-0DF1>
-0DF2..0DF3    ; valid                                  # 3.0  SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA
-0DF4          ; valid                  ;      ; NV8    # 3.0  SINHALA PUNCTUATION KUNDDALIYA
-0DF5..0E00    ; disallowed                             # NA   <reserved-0DF5>..<reserved-0E00>
-0E01..0E32    ; valid                                  # 1.1  THAI CHARACTER KO KAI..THAI CHARACTER SARA AA
-0E33          ; mapped                 ; 0E4D 0E32     # 1.1  THAI CHARACTER SARA AM
-0E34..0E3A    ; valid                                  # 1.1  THAI CHARACTER SARA I..THAI CHARACTER PHINTHU
-0E3B..0E3E    ; disallowed                             # NA   <reserved-0E3B>..<reserved-0E3E>
-0E3F          ; valid                  ;      ; NV8    # 1.1  THAI CURRENCY SYMBOL BAHT
-0E40..0E4E    ; valid                                  # 1.1  THAI CHARACTER SARA E..THAI CHARACTER YAMAKKAN
-0E4F          ; valid                  ;      ; NV8    # 1.1  THAI CHARACTER FONGMAN
-0E50..0E59    ; valid                                  # 1.1  THAI DIGIT ZERO..THAI DIGIT NINE
-0E5A..0E5B    ; valid                  ;      ; NV8    # 1.1  THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT
-0E5C..0E80    ; disallowed                             # NA   <reserved-0E5C>..<reserved-0E80>
-0E81..0E82    ; valid                                  # 1.1  LAO LETTER KO..LAO LETTER KHO SUNG
-0E83          ; disallowed                             # NA   <reserved-0E83>
-0E84          ; valid                                  # 1.1  LAO LETTER KHO TAM
-0E85..0E86    ; disallowed                             # NA   <reserved-0E85>..<reserved-0E86>
-0E87..0E88    ; valid                                  # 1.1  LAO LETTER NGO..LAO LETTER CO
-0E89          ; disallowed                             # NA   <reserved-0E89>
-0E8A          ; valid                                  # 1.1  LAO LETTER SO TAM
-0E8B..0E8C    ; disallowed                             # NA   <reserved-0E8B>..<reserved-0E8C>
-0E8D          ; valid                                  # 1.1  LAO LETTER NYO
-0E8E..0E93    ; disallowed                             # NA   <reserved-0E8E>..<reserved-0E93>
-0E94..0E97    ; valid                                  # 1.1  LAO LETTER DO..LAO LETTER THO TAM
-0E98          ; disallowed                             # NA   <reserved-0E98>
-0E99..0E9F    ; valid                                  # 1.1  LAO LETTER NO..LAO LETTER FO SUNG
-0EA0          ; disallowed                             # NA   <reserved-0EA0>
-0EA1..0EA3    ; valid                                  # 1.1  LAO LETTER MO..LAO LETTER LO LING
-0EA4          ; disallowed                             # NA   <reserved-0EA4>
-0EA5          ; valid                                  # 1.1  LAO LETTER LO LOOT
-0EA6          ; disallowed                             # NA   <reserved-0EA6>
-0EA7          ; valid                                  # 1.1  LAO LETTER WO
-0EA8..0EA9    ; disallowed                             # NA   <reserved-0EA8>..<reserved-0EA9>
-0EAA..0EAB    ; valid                                  # 1.1  LAO LETTER SO SUNG..LAO LETTER HO SUNG
-0EAC          ; disallowed                             # NA   <reserved-0EAC>
-0EAD..0EB2    ; valid                                  # 1.1  LAO LETTER O..LAO VOWEL SIGN AA
-0EB3          ; mapped                 ; 0ECD 0EB2     # 1.1  LAO VOWEL SIGN AM
-0EB4..0EB9    ; valid                                  # 1.1  LAO VOWEL SIGN I..LAO VOWEL SIGN UU
-0EBA          ; disallowed                             # NA   <reserved-0EBA>
-0EBB..0EBD    ; valid                                  # 1.1  LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN NYO
-0EBE..0EBF    ; disallowed                             # NA   <reserved-0EBE>..<reserved-0EBF>
-0EC0..0EC4    ; valid                                  # 1.1  LAO VOWEL SIGN E..LAO VOWEL SIGN AI
-0EC5          ; disallowed                             # NA   <reserved-0EC5>
-0EC6          ; valid                                  # 1.1  LAO KO LA
-0EC7          ; disallowed                             # NA   <reserved-0EC7>
-0EC8..0ECD    ; valid                                  # 1.1  LAO TONE MAI EK..LAO NIGGAHITA
-0ECE..0ECF    ; disallowed                             # NA   <reserved-0ECE>..<reserved-0ECF>
-0ED0..0ED9    ; valid                                  # 1.1  LAO DIGIT ZERO..LAO DIGIT NINE
-0EDA..0EDB    ; disallowed                             # NA   <reserved-0EDA>..<reserved-0EDB>
-0EDC          ; mapped                 ; 0EAB 0E99     # 1.1  LAO HO NO
-0EDD          ; mapped                 ; 0EAB 0EA1     # 1.1  LAO HO MO
-0EDE..0EDF    ; valid                                  # 6.1  LAO LETTER KHMU GO..LAO LETTER KHMU NYO
-0EE0..0EFF    ; disallowed                             # NA   <reserved-0EE0>..<reserved-0EFF>
-0F00          ; valid                                  # 2.0  TIBETAN SYLLABLE OM
-0F01..0F0A    ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBETAN MARK BKA- SHOG YIG MGO
-0F0B          ; valid                                  # 2.0  TIBETAN MARK INTERSYLLABIC TSHEG
-0F0C          ; mapped                 ; 0F0B          # 2.0  TIBETAN MARK DELIMITER TSHEG BSTAR
-0F0D..0F17    ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK SHAD..TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS
-0F18..0F19    ; valid                                  # 2.0  TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS
-0F1A..0F1F    ; valid                  ;      ; NV8    # 2.0  TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RDEL DKAR RDEL NAG
-0F20..0F29    ; valid                                  # 2.0  TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE
-0F2A..0F34    ; valid                  ;      ; NV8    # 2.0  TIBETAN DIGIT HALF ONE..TIBETAN MARK BSDUS RTAGS
-0F35          ; valid                                  # 2.0  TIBETAN MARK NGAS BZUNG NYI ZLA
-0F36          ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN
-0F37          ; valid                                  # 2.0  TIBETAN MARK NGAS BZUNG SGOR RTAGS
-0F38          ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK CHE MGO
-0F39          ; valid                                  # 2.0  TIBETAN MARK TSA -PHRU
-0F3A..0F3D    ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK GUG RTAGS GYON..TIBETAN MARK ANG KHANG GYAS
-0F3E..0F42    ; valid                                  # 2.0  TIBETAN SIGN YAR TSHES..TIBETAN LETTER GA
-0F43          ; mapped                 ; 0F42 0FB7     # 2.0  TIBETAN LETTER GHA
-0F44..0F47    ; valid                                  # 2.0  TIBETAN LETTER NGA..TIBETAN LETTER JA
-0F48          ; disallowed                             # NA   <reserved-0F48>
-0F49..0F4C    ; valid                                  # 2.0  TIBETAN LETTER NYA..TIBETAN LETTER DDA
-0F4D          ; mapped                 ; 0F4C 0FB7     # 2.0  TIBETAN LETTER DDHA
-0F4E..0F51    ; valid                                  # 2.0  TIBETAN LETTER NNA..TIBETAN LETTER DA
-0F52          ; mapped                 ; 0F51 0FB7     # 2.0  TIBETAN LETTER DHA
-0F53..0F56    ; valid                                  # 2.0  TIBETAN LETTER NA..TIBETAN LETTER BA
-0F57          ; mapped                 ; 0F56 0FB7     # 2.0  TIBETAN LETTER BHA
-0F58..0F5B    ; valid                                  # 2.0  TIBETAN LETTER MA..TIBETAN LETTER DZA
-0F5C          ; mapped                 ; 0F5B 0FB7     # 2.0  TIBETAN LETTER DZHA
-0F5D..0F68    ; valid                                  # 2.0  TIBETAN LETTER WA..TIBETAN LETTER A
-0F69          ; mapped                 ; 0F40 0FB5     # 2.0  TIBETAN LETTER KSSA
-0F6A          ; valid                                  # 3.0  TIBETAN LETTER FIXED-FORM RA
-0F6B..0F6C    ; valid                                  # 5.1  TIBETAN LETTER KKA..TIBETAN LETTER RRA
-0F6D..0F70    ; disallowed                             # NA   <reserved-0F6D>..<reserved-0F70>
-0F71..0F72    ; valid                                  # 2.0  TIBETAN VOWEL SIGN AA..TIBETAN VOWEL SIGN I
-0F73          ; mapped                 ; 0F71 0F72     # 2.0  TIBETAN VOWEL SIGN II
-0F74          ; valid                                  # 2.0  TIBETAN VOWEL SIGN U
-0F75          ; mapped                 ; 0F71 0F74     # 2.0  TIBETAN VOWEL SIGN UU
-0F76          ; mapped                 ; 0FB2 0F80     # 2.0  TIBETAN VOWEL SIGN VOCALIC R
-0F77          ; mapped                 ; 0FB2 0F71 0F80 #2.0  TIBETAN VOWEL SIGN VOCALIC RR
-0F78          ; mapped                 ; 0FB3 0F80     # 2.0  TIBETAN VOWEL SIGN VOCALIC L
-0F79          ; mapped                 ; 0FB3 0F71 0F80 #2.0  TIBETAN VOWEL SIGN VOCALIC LL
-0F7A..0F80    ; valid                                  # 2.0  TIBETAN VOWEL SIGN E..TIBETAN VOWEL SIGN REVERSED I
-0F81          ; mapped                 ; 0F71 0F80     # 2.0  TIBETAN VOWEL SIGN REVERSED II
-0F82..0F84    ; valid                                  # 2.0  TIBETAN SIGN NYI ZLA NAA DA..TIBETAN MARK HALANTA
-0F85          ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK PALUTA
-0F86..0F8B    ; valid                                  # 2.0  TIBETAN SIGN LCI RTAGS..TIBETAN SIGN GRU MED RGYINGS
-0F8C..0F8F    ; valid                                  # 6.0  TIBETAN SIGN INVERTED MCHU CAN..TIBETAN SUBJOINED SIGN INVERTED MCHU CAN
-0F90..0F92    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER KA..TIBETAN SUBJOINED LETTER GA
-0F93          ; mapped                 ; 0F92 0FB7     # 2.0  TIBETAN SUBJOINED LETTER GHA
-0F94..0F95    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER NGA..TIBETAN SUBJOINED LETTER CA
-0F96          ; valid                                  # 3.0  TIBETAN SUBJOINED LETTER CHA
-0F97          ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER JA
-0F98          ; disallowed                             # NA   <reserved-0F98>
-0F99..0F9C    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER DDA
-0F9D          ; mapped                 ; 0F9C 0FB7     # 2.0  TIBETAN SUBJOINED LETTER DDHA
-0F9E..0FA1    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER NNA..TIBETAN SUBJOINED LETTER DA
-0FA2          ; mapped                 ; 0FA1 0FB7     # 2.0  TIBETAN SUBJOINED LETTER DHA
-0FA3..0FA6    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER NA..TIBETAN SUBJOINED LETTER BA
-0FA7          ; mapped                 ; 0FA6 0FB7     # 2.0  TIBETAN SUBJOINED LETTER BHA
-0FA8..0FAB    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER MA..TIBETAN SUBJOINED LETTER DZA
-0FAC          ; mapped                 ; 0FAB 0FB7     # 2.0  TIBETAN SUBJOINED LETTER DZHA
-0FAD          ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER WA
-0FAE..0FB0    ; valid                                  # 3.0  TIBETAN SUBJOINED LETTER ZHA..TIBETAN SUBJOINED LETTER -A
-0FB1..0FB7    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER YA..TIBETAN SUBJOINED LETTER HA
-0FB8          ; valid                                  # 3.0  TIBETAN SUBJOINED LETTER A
-0FB9          ; mapped                 ; 0F90 0FB5     # 2.0  TIBETAN SUBJOINED LETTER KSSA
-0FBA..0FBC    ; valid                                  # 3.0  TIBETAN SUBJOINED LETTER FIXED-FORM WA..TIBETAN SUBJOINED LETTER FIXED-FORM RA
-0FBD          ; disallowed                             # NA   <reserved-0FBD>
-0FBE..0FC5    ; valid                  ;      ; NV8    # 3.0  TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE
-0FC6          ; valid                                  # 3.0  TIBETAN SYMBOL PADMA GDAN
-0FC7..0FCC    ; valid                  ;      ; NV8    # 3.0  TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SYMBOL NOR BU BZHI -KHYIL
-0FCD          ; disallowed                             # NA   <reserved-0FCD>
-0FCE          ; valid                  ;      ; NV8    # 5.1  TIBETAN SIGN RDEL NAG RDEL DKAR
-0FCF          ; valid                  ;      ; NV8    # 3.0  TIBETAN SIGN RDEL NAG GSUM
-0FD0..0FD1    ; valid                  ;      ; NV8    # 4.1  TIBETAN MARK BSKA- SHOG GI MGO RGYAN..TIBETAN MARK MNYAM YIG GI MGO RGYAN
-0FD2..0FD4    ; valid                  ;      ; NV8    # 5.1  TIBETAN MARK NYIS TSHEG..TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA
-0FD5..0FD8    ; valid                  ;      ; NV8    # 5.2  RIGHT-FACING SVASTI SIGN..LEFT-FACING SVASTI SIGN WITH DOTS
-0FD9..0FDA    ; valid                  ;      ; NV8    # 6.0  TIBETAN MARK LEADING MCHAN RTAGS..TIBETAN MARK TRAILING MCHAN RTAGS
-0FDB..0FFF    ; disallowed                             # NA   <reserved-0FDB>..<reserved-0FFF>
-1000..1021    ; valid                                  # 3.0  MYANMAR LETTER KA..MYANMAR LETTER A
-1022          ; valid                                  # 5.1  MYANMAR LETTER SHAN A
-1023..1027    ; valid                                  # 3.0  MYANMAR LETTER I..MYANMAR LETTER E
-1028          ; valid                                  # 5.1  MYANMAR LETTER MON E
-1029..102A    ; valid                                  # 3.0  MYANMAR LETTER O..MYANMAR LETTER AU
-102B          ; valid                                  # 5.1  MYANMAR VOWEL SIGN TALL AA
-102C..1032    ; valid                                  # 3.0  MYANMAR VOWEL SIGN AA..MYANMAR VOWEL SIGN AI
-1033..1035    ; valid                                  # 5.1  MYANMAR VOWEL SIGN MON II..MYANMAR VOWEL SIGN E ABOVE
-1036..1039    ; valid                                  # 3.0  MYANMAR SIGN ANUSVARA..MYANMAR SIGN VIRAMA
-103A..103F    ; valid                                  # 5.1  MYANMAR SIGN ASAT..MYANMAR LETTER GREAT SA
-1040..1049    ; valid                                  # 3.0  MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE
-104A..104F    ; valid                  ;      ; NV8    # 3.0  MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL GENITIVE
-1050..1059    ; valid                                  # 3.0  MYANMAR LETTER SHA..MYANMAR VOWEL SIGN VOCALIC LL
-105A..1099    ; valid                                  # 5.1  MYANMAR LETTER MON NGA..MYANMAR SHAN DIGIT NINE
-109A..109D    ; valid                                  # 5.2  MYANMAR SIGN KHAMTI TONE-1..MYANMAR VOWEL SIGN AITON AI
-109E..109F    ; valid                  ;      ; NV8    # 5.1  MYANMAR SYMBOL SHAN ONE..MYANMAR SYMBOL SHAN EXCLAMATION
-10A0..10C5    ; disallowed                             # 1.1  GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE
-10C6          ; disallowed                             # NA   <reserved-10C6>
-10C7          ; mapped                 ; 2D27          # 6.1  GEORGIAN CAPITAL LETTER YN
-10C8..10CC    ; disallowed                             # NA   <reserved-10C8>..<reserved-10CC>
-10CD          ; mapped                 ; 2D2D          # 6.1  GEORGIAN CAPITAL LETTER AEN
-10CE..10CF    ; disallowed                             # NA   <reserved-10CE>..<reserved-10CF>
-10D0..10F6    ; valid                                  # 1.1  GEORGIAN LETTER AN..GEORGIAN LETTER FI
-10F7..10F8    ; valid                                  # 3.2  GEORGIAN LETTER YN..GEORGIAN LETTER ELIFI
-10F9..10FA    ; valid                                  # 4.1  GEORGIAN LETTER TURNED GAN..GEORGIAN LETTER AIN
-10FB          ; valid                  ;      ; NV8    # 1.1  GEORGIAN PARAGRAPH SEPARATOR
-10FC          ; mapped                 ; 10DC          # 4.1  MODIFIER LETTER GEORGIAN NAR
-10FD..10FF    ; valid                                  # 6.1  GEORGIAN LETTER AEN..GEORGIAN LETTER LABIAL SIGN
-1100..1159    ; valid                  ;      ; NV8    # 1.1  HANGUL CHOSEONG KIYEOK..HANGUL CHOSEONG YEORINHIEUH
-115A..115E    ; valid                  ;      ; NV8    # 5.2  HANGUL CHOSEONG KIYEOK-TIKEUT..HANGUL CHOSEONG TIKEUT-RIEUL
-115F..1160    ; disallowed                             # 1.1  HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG FILLER
-1161..11A2    ; valid                  ;      ; NV8    # 1.1  HANGUL JUNGSEONG A..HANGUL JUNGSEONG SSANGARAEA
-11A3..11A7    ; valid                  ;      ; NV8    # 5.2  HANGUL JUNGSEONG A-EU..HANGUL JUNGSEONG O-YAE
-11A8..11F9    ; valid                  ;      ; NV8    # 1.1  HANGUL JONGSEONG KIYEOK..HANGUL JONGSEONG YEORINHIEUH
-11FA..11FF    ; valid                  ;      ; NV8    # 5.2  HANGUL JONGSEONG KIYEOK-NIEUN..HANGUL JONGSEONG SSANGNIEUN
-1200..1206    ; valid                                  # 3.0  ETHIOPIC SYLLABLE HA..ETHIOPIC SYLLABLE HO
-1207          ; valid                                  # 4.1  ETHIOPIC SYLLABLE HOA
-1208..1246    ; valid                                  # 3.0  ETHIOPIC SYLLABLE LA..ETHIOPIC SYLLABLE QO
-1247          ; valid                                  # 4.1  ETHIOPIC SYLLABLE QOA
-1248          ; valid                                  # 3.0  ETHIOPIC SYLLABLE QWA
-1249          ; disallowed                             # NA   <reserved-1249>
-124A..124D    ; valid                                  # 3.0  ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE
-124E..124F    ; disallowed                             # NA   <reserved-124E>..<reserved-124F>
-1250..1256    ; valid                                  # 3.0  ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO
-1257          ; disallowed                             # NA   <reserved-1257>
-1258          ; valid                                  # 3.0  ETHIOPIC SYLLABLE QHWA
-1259          ; disallowed                             # NA   <reserved-1259>
-125A..125D    ; valid                                  # 3.0  ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QHWE
-125E..125F    ; disallowed                             # NA   <reserved-125E>..<reserved-125F>
-1260..1286    ; valid                                  # 3.0  ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XO
-1287          ; valid                                  # 4.1  ETHIOPIC SYLLABLE XOA
-1288          ; valid                                  # 3.0  ETHIOPIC SYLLABLE XWA
-1289          ; disallowed                             # NA   <reserved-1289>
-128A..128D    ; valid                                  # 3.0  ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE
-128E..128F    ; disallowed                             # NA   <reserved-128E>..<reserved-128F>
-1290..12AE    ; valid                                  # 3.0  ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KO
-12AF          ; valid                                  # 4.1  ETHIOPIC SYLLABLE KOA
-12B0          ; valid                                  # 3.0  ETHIOPIC SYLLABLE KWA
-12B1          ; disallowed                             # NA   <reserved-12B1>
-12B2..12B5    ; valid                                  # 3.0  ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE
-12B6..12B7    ; disallowed                             # NA   <reserved-12B6>..<reserved-12B7>
-12B8..12BE    ; valid                                  # 3.0  ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO
-12BF          ; disallowed                             # NA   <reserved-12BF>
-12C0          ; valid                                  # 3.0  ETHIOPIC SYLLABLE KXWA
-12C1          ; disallowed                             # NA   <reserved-12C1>
-12C2..12C5    ; valid                                  # 3.0  ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KXWE
-12C6..12C7    ; disallowed                             # NA   <reserved-12C6>..<reserved-12C7>
-12C8..12CE    ; valid                                  # 3.0  ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE WO
-12CF          ; valid                                  # 4.1  ETHIOPIC SYLLABLE WOA
-12D0..12D6    ; valid                                  # 3.0  ETHIOPIC SYLLABLE PHARYNGEAL A..ETHIOPIC SYLLABLE PHARYNGEAL O
-12D7          ; disallowed                             # NA   <reserved-12D7>
-12D8..12EE    ; valid                                  # 3.0  ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE YO
-12EF          ; valid                                  # 4.1  ETHIOPIC SYLLABLE YOA
-12F0..130E    ; valid                                  # 3.0  ETHIOPIC SYLLABLE DA..ETHIOPIC SYLLABLE GO
-130F          ; valid                                  # 4.1  ETHIOPIC SYLLABLE GOA
-1310          ; valid                                  # 3.0  ETHIOPIC SYLLABLE GWA
-1311          ; disallowed                             # NA   <reserved-1311>
-1312..1315    ; valid                                  # 3.0  ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE
-1316..1317    ; disallowed                             # NA   <reserved-1316>..<reserved-1317>
-1318..131E    ; valid                                  # 3.0  ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE GGO
-131F          ; valid                                  # 4.1  ETHIOPIC SYLLABLE GGWAA
-1320..1346    ; valid                                  # 3.0  ETHIOPIC SYLLABLE THA..ETHIOPIC SYLLABLE TZO
-1347          ; valid                                  # 4.1  ETHIOPIC SYLLABLE TZOA
-1348..135A    ; valid                                  # 3.0  ETHIOPIC SYLLABLE FA..ETHIOPIC SYLLABLE FYA
-135B..135C    ; disallowed                             # NA   <reserved-135B>..<reserved-135C>
-135D..135E    ; valid                                  # 6.0  ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK..ETHIOPIC COMBINING VOWEL LENGTH MARK
-135F          ; valid                                  # 4.1  ETHIOPIC COMBINING GEMINATION MARK
-1360          ; valid                  ;      ; NV8    # 4.1  ETHIOPIC SECTION MARK
-1361..137C    ; valid                  ;      ; NV8    # 3.0  ETHIOPIC WORDSPACE..ETHIOPIC NUMBER TEN THOUSAND
-137D..137F    ; disallowed                             # NA   <reserved-137D>..<reserved-137F>
-1380..138F    ; valid                                  # 4.1  ETHIOPIC SYLLABLE SEBATBEIT MWA..ETHIOPIC SYLLABLE PWE
-1390..1399    ; valid                  ;      ; NV8    # 4.1  ETHIOPIC TONAL MARK YIZET..ETHIOPIC TONAL MARK KURT
-139A..139F    ; disallowed                             # NA   <reserved-139A>..<reserved-139F>
-13A0..13F4    ; valid                                  # 3.0  CHEROKEE LETTER A..CHEROKEE LETTER YV
-13F5          ; valid                                  # 8.0  CHEROKEE LETTER MV
-13F6..13F7    ; disallowed                             # NA   <reserved-13F6>..<reserved-13F7>
-13F8          ; mapped                 ; 13F0          # 8.0  CHEROKEE SMALL LETTER YE
-13F9          ; mapped                 ; 13F1          # 8.0  CHEROKEE SMALL LETTER YI
-13FA          ; mapped                 ; 13F2          # 8.0  CHEROKEE SMALL LETTER YO
-13FB          ; mapped                 ; 13F3          # 8.0  CHEROKEE SMALL LETTER YU
-13FC          ; mapped                 ; 13F4          # 8.0  CHEROKEE SMALL LETTER YV
-13FD          ; mapped                 ; 13F5          # 8.0  CHEROKEE SMALL LETTER MV
-13FE..13FF    ; disallowed                             # NA   <reserved-13FE>..<reserved-13FF>
-1400          ; valid                  ;      ; NV8    # 5.2  CANADIAN SYLLABICS HYPHEN
-1401..166C    ; valid                                  # 3.0  CANADIAN SYLLABICS E..CANADIAN SYLLABICS CARRIER TTSA
-166D..166E    ; valid                  ;      ; NV8    # 3.0  CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP
-166F..1676    ; valid                                  # 3.0  CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS NNGAA
-1677..167F    ; valid                                  # 5.2  CANADIAN SYLLABICS WOODS-CREE THWEE..CANADIAN SYLLABICS BLACKFOOT W
-1680          ; disallowed                             # 3.0  OGHAM SPACE MARK
-1681..169A    ; valid                                  # 3.0  OGHAM LETTER BEITH..OGHAM LETTER PEITH
-169B..169C    ; valid                  ;      ; NV8    # 3.0  OGHAM FEATHER MARK..OGHAM REVERSED FEATHER MARK
-169D..169F    ; disallowed                             # NA   <reserved-169D>..<reserved-169F>
-16A0..16EA    ; valid                                  # 3.0  RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X
-16EB..16F0    ; valid                  ;      ; NV8    # 3.0  RUNIC SINGLE PUNCTUATION..RUNIC BELGTHOR SYMBOL
-16F1..16F8    ; valid                                  # 7.0  RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC
-16F9..16FF    ; disallowed                             # NA   <reserved-16F9>..<reserved-16FF>
-1700..170C    ; valid                                  # 3.2  TAGALOG LETTER A..TAGALOG LETTER YA
-170D          ; disallowed                             # NA   <reserved-170D>
-170E..1714    ; valid                                  # 3.2  TAGALOG LETTER LA..TAGALOG SIGN VIRAMA
-1715..171F    ; disallowed                             # NA   <reserved-1715>..<reserved-171F>
-1720..1734    ; valid                                  # 3.2  HANUNOO LETTER A..HANUNOO SIGN PAMUDPOD
-1735..1736    ; valid                  ;      ; NV8    # 3.2  PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION
-1737..173F    ; disallowed                             # NA   <reserved-1737>..<reserved-173F>
-1740..1753    ; valid                                  # 3.2  BUHID LETTER A..BUHID VOWEL SIGN U
-1754..175F    ; disallowed                             # NA   <reserved-1754>..<reserved-175F>
-1760..176C    ; valid                                  # 3.2  TAGBANWA LETTER A..TAGBANWA LETTER YA
-176D          ; disallowed                             # NA   <reserved-176D>
-176E..1770    ; valid                                  # 3.2  TAGBANWA LETTER LA..TAGBANWA LETTER SA
-1771          ; disallowed                             # NA   <reserved-1771>
-1772..1773    ; valid                                  # 3.2  TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U
-1774..177F    ; disallowed                             # NA   <reserved-1774>..<reserved-177F>
-1780..17B3    ; valid                                  # 3.0  KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU
-17B4..17B5    ; disallowed                             # 3.0  KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA
-17B6..17D3    ; valid                                  # 3.0  KHMER VOWEL SIGN AA..KHMER SIGN BATHAMASAT
-17D4..17D6    ; valid                  ;      ; NV8    # 3.0  KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH
-17D7          ; valid                                  # 3.0  KHMER SIGN LEK TOO
-17D8..17DB    ; valid                  ;      ; NV8    # 3.0  KHMER SIGN BEYYAL..KHMER CURRENCY SYMBOL RIEL
-17DC          ; valid                                  # 3.0  KHMER SIGN AVAKRAHASANYA
-17DD          ; valid                                  # 4.0  KHMER SIGN ATTHACAN
-17DE..17DF    ; disallowed                             # NA   <reserved-17DE>..<reserved-17DF>
-17E0..17E9    ; valid                                  # 3.0  KHMER DIGIT ZERO..KHMER DIGIT NINE
-17EA..17EF    ; disallowed                             # NA   <reserved-17EA>..<reserved-17EF>
-17F0..17F9    ; valid                  ;      ; NV8    # 4.0  KHMER SYMBOL LEK ATTAK SON..KHMER SYMBOL LEK ATTAK PRAM-BUON
-17FA..17FF    ; disallowed                             # NA   <reserved-17FA>..<reserved-17FF>
-1800..1805    ; valid                  ;      ; NV8    # 3.0  MONGOLIAN BIRGA..MONGOLIAN FOUR DOTS
-1806          ; disallowed                             # 3.0  MONGOLIAN TODO SOFT HYPHEN
-1807..180A    ; valid                  ;      ; NV8    # 3.0  MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU
-180B..180D    ; ignored                                # 3.0  MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE
-180E          ; disallowed                             # 3.0  MONGOLIAN VOWEL SEPARATOR
-180F          ; disallowed                             # NA   <reserved-180F>
-1810..1819    ; valid                                  # 3.0  MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE
-181A..181F    ; disallowed                             # NA   <reserved-181A>..<reserved-181F>
-1820..1877    ; valid                                  # 3.0  MONGOLIAN LETTER A..MONGOLIAN LETTER MANCHU ZHA
-1878..187F    ; disallowed                             # NA   <reserved-1878>..<reserved-187F>
-1880..18A9    ; valid                                  # 3.0  MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER ALI GALI DAGALGA
-18AA          ; valid                                  # 5.1  MONGOLIAN LETTER MANCHU ALI GALI LHA
-18AB..18AF    ; disallowed                             # NA   <reserved-18AB>..<reserved-18AF>
-18B0..18F5    ; valid                                  # 5.2  CANADIAN SYLLABICS OY..CANADIAN SYLLABICS CARRIER DENTAL S
-18F6..18FF    ; disallowed                             # NA   <reserved-18F6>..<reserved-18FF>
-1900..191C    ; valid                                  # 4.0  LIMBU VOWEL-CARRIER LETTER..LIMBU LETTER HA
-191D..191E    ; valid                                  # 7.0  LIMBU LETTER GYAN..LIMBU LETTER TRA
-191F          ; disallowed                             # NA   <reserved-191F>
-1920..192B    ; valid                                  # 4.0  LIMBU VOWEL SIGN A..LIMBU SUBJOINED LETTER WA
-192C..192F    ; disallowed                             # NA   <reserved-192C>..<reserved-192F>
-1930..193B    ; valid                                  # 4.0  LIMBU SMALL LETTER KA..LIMBU SIGN SA-I
-193C..193F    ; disallowed                             # NA   <reserved-193C>..<reserved-193F>
-1940          ; valid                  ;      ; NV8    # 4.0  LIMBU SIGN LOO
-1941..1943    ; disallowed                             # NA   <reserved-1941>..<reserved-1943>
-1944..1945    ; valid                  ;      ; NV8    # 4.0  LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK
-1946..196D    ; valid                                  # 4.0  LIMBU DIGIT ZERO..TAI LE LETTER AI
-196E..196F    ; disallowed                             # NA   <reserved-196E>..<reserved-196F>
-1970..1974    ; valid                                  # 4.0  TAI LE LETTER TONE-2..TAI LE LETTER TONE-6
-1975..197F    ; disallowed                             # NA   <reserved-1975>..<reserved-197F>
-1980..19A9    ; valid                                  # 4.1  NEW TAI LUE LETTER HIGH QA..NEW TAI LUE LETTER LOW XVA
-19AA..19AB    ; valid                                  # 5.2  NEW TAI LUE LETTER HIGH SUA..NEW TAI LUE LETTER LOW SUA
-19AC..19AF    ; disallowed                             # NA   <reserved-19AC>..<reserved-19AF>
-19B0..19C9    ; valid                                  # 4.1  NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE TONE MARK-2
-19CA..19CF    ; disallowed                             # NA   <reserved-19CA>..<reserved-19CF>
-19D0..19D9    ; valid                                  # 4.1  NEW TAI LUE DIGIT ZERO..NEW TAI LUE DIGIT NINE
-19DA          ; valid                  ;      ; XV8    # 5.2  NEW TAI LUE THAM DIGIT ONE
-19DB..19DD    ; disallowed                             # NA   <reserved-19DB>..<reserved-19DD>
-19DE..19DF    ; valid                  ;      ; NV8    # 4.1  NEW TAI LUE SIGN LAE..NEW TAI LUE SIGN LAEV
-19E0..19FF    ; valid                  ;      ; NV8    # 4.0  KHMER SYMBOL PATHAMASAT..KHMER SYMBOL DAP-PRAM ROC
-1A00..1A1B    ; valid                                  # 4.1  BUGINESE LETTER KA..BUGINESE VOWEL SIGN AE
-1A1C..1A1D    ; disallowed                             # NA   <reserved-1A1C>..<reserved-1A1D>
-1A1E..1A1F    ; valid                  ;      ; NV8    # 4.1  BUGINESE PALLAWA..BUGINESE END OF SECTION
-1A20..1A5E    ; valid                                  # 5.2  TAI THAM LETTER HIGH KA..TAI THAM CONSONANT SIGN SA
-1A5F          ; disallowed                             # NA   <reserved-1A5F>
-1A60..1A7C    ; valid                                  # 5.2  TAI THAM SIGN SAKOT..TAI THAM SIGN KHUEN-LUE KARAN
-1A7D..1A7E    ; disallowed                             # NA   <reserved-1A7D>..<reserved-1A7E>
-1A7F..1A89    ; valid                                  # 5.2  TAI THAM COMBINING CRYPTOGRAMMIC DOT..TAI THAM HORA DIGIT NINE
-1A8A..1A8F    ; disallowed                             # NA   <reserved-1A8A>..<reserved-1A8F>
-1A90..1A99    ; valid                                  # 5.2  TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE
-1A9A..1A9F    ; disallowed                             # NA   <reserved-1A9A>..<reserved-1A9F>
-1AA0..1AA6    ; valid                  ;      ; NV8    # 5.2  TAI THAM SIGN WIANG..TAI THAM SIGN REVERSED ROTATED RANA
-1AA7          ; valid                                  # 5.2  TAI THAM SIGN MAI YAMOK
-1AA8..1AAD    ; valid                  ;      ; NV8    # 5.2  TAI THAM SIGN KAAN..TAI THAM SIGN CAANG
-1AAE..1AAF    ; disallowed                             # NA   <reserved-1AAE>..<reserved-1AAF>
-1AB0..1ABD    ; valid                                  # 7.0  COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
-1ABE          ; valid                  ;      ; NV8    # 7.0  COMBINING PARENTHESES OVERLAY
-1ABF..1AFF    ; disallowed                             # NA   <reserved-1ABF>..<reserved-1AFF>
-1B00..1B4B    ; valid                                  # 5.0  BALINESE SIGN ULU RICEM..BALINESE LETTER ASYURA SASAK
-1B4C..1B4F    ; disallowed                             # NA   <reserved-1B4C>..<reserved-1B4F>
-1B50..1B59    ; valid                                  # 5.0  BALINESE DIGIT ZERO..BALINESE DIGIT NINE
-1B5A..1B6A    ; valid                  ;      ; NV8    # 5.0  BALINESE PANTI..BALINESE MUSICAL SYMBOL DANG GEDE
-1B6B..1B73    ; valid                                  # 5.0  BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG
-1B74..1B7C    ; valid                  ;      ; NV8    # 5.0  BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG..BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING
-1B7D..1B7F    ; disallowed                             # NA   <reserved-1B7D>..<reserved-1B7F>
-1B80..1BAA    ; valid                                  # 5.1  SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PAMAAEH
-1BAB..1BAD    ; valid                                  # 6.1  SUNDANESE SIGN VIRAMA..SUNDANESE CONSONANT SIGN PASANGAN WA
-1BAE..1BB9    ; valid                                  # 5.1  SUNDANESE LETTER KHA..SUNDANESE DIGIT NINE
-1BBA..1BBF    ; valid                                  # 6.1  SUNDANESE AVAGRAHA..SUNDANESE LETTER FINAL M
-1BC0..1BF3    ; valid                                  # 6.0  BATAK LETTER A..BATAK PANONGONAN
-1BF4..1BFB    ; disallowed                             # NA   <reserved-1BF4>..<reserved-1BFB>
-1BFC..1BFF    ; valid                  ;      ; NV8    # 6.0  BATAK SYMBOL BINDU NA METEK..BATAK SYMBOL BINDU PANGOLAT
-1C00..1C37    ; valid                                  # 5.1  LEPCHA LETTER KA..LEPCHA SIGN NUKTA
-1C38..1C3A    ; disallowed                             # NA   <reserved-1C38>..<reserved-1C3A>
-1C3B..1C3F    ; valid                  ;      ; NV8    # 5.1  LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK
-1C40..1C49    ; valid                                  # 5.1  LEPCHA DIGIT ZERO..LEPCHA DIGIT NINE
-1C4A..1C4C    ; disallowed                             # NA   <reserved-1C4A>..<reserved-1C4C>
-1C4D..1C7D    ; valid                                  # 5.1  LEPCHA LETTER TTA..OL CHIKI AHAD
-1C7E..1C7F    ; valid                  ;      ; NV8    # 5.1  OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD
-1C80          ; mapped                 ; 0432          # 9.0  CYRILLIC SMALL LETTER ROUNDED VE
-1C81          ; mapped                 ; 0434          # 9.0  CYRILLIC SMALL LETTER LONG-LEGGED DE
-1C82          ; mapped                 ; 043E          # 9.0  CYRILLIC SMALL LETTER NARROW O
-1C83          ; mapped                 ; 0441          # 9.0  CYRILLIC SMALL LETTER WIDE ES
-1C84..1C85    ; mapped                 ; 0442          # 9.0  CYRILLIC SMALL LETTER TALL TE..CYRILLIC SMALL LETTER THREE-LEGGED TE
-1C86          ; mapped                 ; 044A          # 9.0  CYRILLIC SMALL LETTER TALL HARD SIGN
-1C87          ; mapped                 ; 0463          # 9.0  CYRILLIC SMALL LETTER TALL YAT
-1C88          ; mapped                 ; A64B          # 9.0  CYRILLIC SMALL LETTER UNBLENDED UK
-1C89..1CBF    ; disallowed                             # NA   <reserved-1C89>..<reserved-1CBF>
-1CC0..1CC7    ; valid                  ;      ; NV8    # 6.1  SUNDANESE PUNCTUATION BINDU SURYA..SUNDANESE PUNCTUATION BINDU BA SATANGA
-1CC8..1CCF    ; disallowed                             # NA   <reserved-1CC8>..<reserved-1CCF>
-1CD0..1CD2    ; valid                                  # 5.2  VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
-1CD3          ; valid                  ;      ; NV8    # 5.2  VEDIC SIGN NIHSHVASA
-1CD4..1CF2    ; valid                                  # 5.2  VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC SIGN ARDHAVISARGA
-1CF3..1CF6    ; valid                                  # 6.1  VEDIC SIGN ROTATED ARDHAVISARGA..VEDIC SIGN UPADHMANIYA
-1CF7          ; valid                                  # 10.0 VEDIC SIGN ATIKRAMA
-1CF8..1CF9    ; valid                                  # 7.0  VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE
-1CFA..1CFF    ; disallowed                             # NA   <reserved-1CFA>..<reserved-1CFF>
-1D00..1D2B    ; valid                                  # 4.0  LATIN LETTER SMALL CAPITAL A..CYRILLIC LETTER SMALL CAPITAL EL
-1D2C          ; mapped                 ; 0061          # 4.0  MODIFIER LETTER CAPITAL A
-1D2D          ; mapped                 ; 00E6          # 4.0  MODIFIER LETTER CAPITAL AE
-1D2E          ; mapped                 ; 0062          # 4.0  MODIFIER LETTER CAPITAL B
-1D2F          ; valid                                  # 4.0  MODIFIER LETTER CAPITAL BARRED B
-1D30          ; mapped                 ; 0064          # 4.0  MODIFIER LETTER CAPITAL D
-1D31          ; mapped                 ; 0065          # 4.0  MODIFIER LETTER CAPITAL E
-1D32          ; mapped                 ; 01DD          # 4.0  MODIFIER LETTER CAPITAL REVERSED E
-1D33          ; mapped                 ; 0067          # 4.0  MODIFIER LETTER CAPITAL G
-1D34          ; mapped                 ; 0068          # 4.0  MODIFIER LETTER CAPITAL H
-1D35          ; mapped                 ; 0069          # 4.0  MODIFIER LETTER CAPITAL I
-1D36          ; mapped                 ; 006A          # 4.0  MODIFIER LETTER CAPITAL J
-1D37          ; mapped                 ; 006B          # 4.0  MODIFIER LETTER CAPITAL K
-1D38          ; mapped                 ; 006C          # 4.0  MODIFIER LETTER CAPITAL L
-1D39          ; mapped                 ; 006D          # 4.0  MODIFIER LETTER CAPITAL M
-1D3A          ; mapped                 ; 006E          # 4.0  MODIFIER LETTER CAPITAL N
-1D3B          ; valid                                  # 4.0  MODIFIER LETTER CAPITAL REVERSED N
-1D3C          ; mapped                 ; 006F          # 4.0  MODIFIER LETTER CAPITAL O
-1D3D          ; mapped                 ; 0223          # 4.0  MODIFIER LETTER CAPITAL OU
-1D3E          ; mapped                 ; 0070          # 4.0  MODIFIER LETTER CAPITAL P
-1D3F          ; mapped                 ; 0072          # 4.0  MODIFIER LETTER CAPITAL R
-1D40          ; mapped                 ; 0074          # 4.0  MODIFIER LETTER CAPITAL T
-1D41          ; mapped                 ; 0075          # 4.0  MODIFIER LETTER CAPITAL U
-1D42          ; mapped                 ; 0077          # 4.0  MODIFIER LETTER CAPITAL W
-1D43          ; mapped                 ; 0061          # 4.0  MODIFIER LETTER SMALL A
-1D44          ; mapped                 ; 0250          # 4.0  MODIFIER LETTER SMALL TURNED A
-1D45          ; mapped                 ; 0251          # 4.0  MODIFIER LETTER SMALL ALPHA
-1D46          ; mapped                 ; 1D02          # 4.0  MODIFIER LETTER SMALL TURNED AE
-1D47          ; mapped                 ; 0062          # 4.0  MODIFIER LETTER SMALL B
-1D48          ; mapped                 ; 0064          # 4.0  MODIFIER LETTER SMALL D
-1D49          ; mapped                 ; 0065          # 4.0  MODIFIER LETTER SMALL E
-1D4A          ; mapped                 ; 0259          # 4.0  MODIFIER LETTER SMALL SCHWA
-1D4B          ; mapped                 ; 025B          # 4.0  MODIFIER LETTER SMALL OPEN E
-1D4C          ; mapped                 ; 025C          # 4.0  MODIFIER LETTER SMALL TURNED OPEN E
-1D4D          ; mapped                 ; 0067          # 4.0  MODIFIER LETTER SMALL G
-1D4E          ; valid                                  # 4.0  MODIFIER LETTER SMALL TURNED I
-1D4F          ; mapped                 ; 006B          # 4.0  MODIFIER LETTER SMALL K
-1D50          ; mapped                 ; 006D          # 4.0  MODIFIER LETTER SMALL M
-1D51          ; mapped                 ; 014B          # 4.0  MODIFIER LETTER SMALL ENG
-1D52          ; mapped                 ; 006F          # 4.0  MODIFIER LETTER SMALL O
-1D53          ; mapped                 ; 0254          # 4.0  MODIFIER LETTER SMALL OPEN O
-1D54          ; mapped                 ; 1D16          # 4.0  MODIFIER LETTER SMALL TOP HALF O
-1D55          ; mapped                 ; 1D17          # 4.0  MODIFIER LETTER SMALL BOTTOM HALF O
-1D56          ; mapped                 ; 0070          # 4.0  MODIFIER LETTER SMALL P
-1D57          ; mapped                 ; 0074          # 4.0  MODIFIER LETTER SMALL T
-1D58          ; mapped                 ; 0075          # 4.0  MODIFIER LETTER SMALL U
-1D59          ; mapped                 ; 1D1D          # 4.0  MODIFIER LETTER SMALL SIDEWAYS U
-1D5A          ; mapped                 ; 026F          # 4.0  MODIFIER LETTER SMALL TURNED M
-1D5B          ; mapped                 ; 0076          # 4.0  MODIFIER LETTER SMALL V
-1D5C          ; mapped                 ; 1D25          # 4.0  MODIFIER LETTER SMALL AIN
-1D5D          ; mapped                 ; 03B2          # 4.0  MODIFIER LETTER SMALL BETA
-1D5E          ; mapped                 ; 03B3          # 4.0  MODIFIER LETTER SMALL GREEK GAMMA
-1D5F          ; mapped                 ; 03B4          # 4.0  MODIFIER LETTER SMALL DELTA
-1D60          ; mapped                 ; 03C6          # 4.0  MODIFIER LETTER SMALL GREEK PHI
-1D61          ; mapped                 ; 03C7          # 4.0  MODIFIER LETTER SMALL CHI
-1D62          ; mapped                 ; 0069          # 4.0  LATIN SUBSCRIPT SMALL LETTER I
-1D63          ; mapped                 ; 0072          # 4.0  LATIN SUBSCRIPT SMALL LETTER R
-1D64          ; mapped                 ; 0075          # 4.0  LATIN SUBSCRIPT SMALL LETTER U
-1D65          ; mapped                 ; 0076          # 4.0  LATIN SUBSCRIPT SMALL LETTER V
-1D66          ; mapped                 ; 03B2          # 4.0  GREEK SUBSCRIPT SMALL LETTER BETA
-1D67          ; mapped                 ; 03B3          # 4.0  GREEK SUBSCRIPT SMALL LETTER GAMMA
-1D68          ; mapped                 ; 03C1          # 4.0  GREEK SUBSCRIPT SMALL LETTER RHO
-1D69          ; mapped                 ; 03C6          # 4.0  GREEK SUBSCRIPT SMALL LETTER PHI
-1D6A          ; mapped                 ; 03C7          # 4.0  GREEK SUBSCRIPT SMALL LETTER CHI
-1D6B          ; valid                                  # 4.0  LATIN SMALL LETTER UE
-1D6C..1D77    ; valid                                  # 4.1  LATIN SMALL LETTER B WITH MIDDLE TILDE..LATIN SMALL LETTER TURNED G
-1D78          ; mapped                 ; 043D          # 4.1  MODIFIER LETTER CYRILLIC EN
-1D79..1D9A    ; valid                                  # 4.1  LATIN SMALL LETTER INSULAR G..LATIN SMALL LETTER EZH WITH RETROFLEX HOOK
-1D9B          ; mapped                 ; 0252          # 4.1  MODIFIER LETTER SMALL TURNED ALPHA
-1D9C          ; mapped                 ; 0063          # 4.1  MODIFIER LETTER SMALL C
-1D9D          ; mapped                 ; 0255          # 4.1  MODIFIER LETTER SMALL C WITH CURL
-1D9E          ; mapped                 ; 00F0          # 4.1  MODIFIER LETTER SMALL ETH
-1D9F          ; mapped                 ; 025C          # 4.1  MODIFIER LETTER SMALL REVERSED OPEN E
-1DA0          ; mapped                 ; 0066          # 4.1  MODIFIER LETTER SMALL F
-1DA1          ; mapped                 ; 025F          # 4.1  MODIFIER LETTER SMALL DOTLESS J WITH STROKE
-1DA2          ; mapped                 ; 0261          # 4.1  MODIFIER LETTER SMALL SCRIPT G
-1DA3          ; mapped                 ; 0265          # 4.1  MODIFIER LETTER SMALL TURNED H
-1DA4          ; mapped                 ; 0268          # 4.1  MODIFIER LETTER SMALL I WITH STROKE
-1DA5          ; mapped                 ; 0269          # 4.1  MODIFIER LETTER SMALL IOTA
-1DA6          ; mapped                 ; 026A          # 4.1  MODIFIER LETTER SMALL CAPITAL I
-1DA7          ; mapped                 ; 1D7B          # 4.1  MODIFIER LETTER SMALL CAPITAL I WITH STROKE
-1DA8          ; mapped                 ; 029D          # 4.1  MODIFIER LETTER SMALL J WITH CROSSED-TAIL
-1DA9          ; mapped                 ; 026D          # 4.1  MODIFIER LETTER SMALL L WITH RETROFLEX HOOK
-1DAA          ; mapped                 ; 1D85          # 4.1  MODIFIER LETTER SMALL L WITH PALATAL HOOK
-1DAB          ; mapped                 ; 029F          # 4.1  MODIFIER LETTER SMALL CAPITAL L
-1DAC          ; mapped                 ; 0271          # 4.1  MODIFIER LETTER SMALL M WITH HOOK
-1DAD          ; mapped                 ; 0270          # 4.1  MODIFIER LETTER SMALL TURNED M WITH LONG LEG
-1DAE          ; mapped                 ; 0272          # 4.1  MODIFIER LETTER SMALL N WITH LEFT HOOK
-1DAF          ; mapped                 ; 0273          # 4.1  MODIFIER LETTER SMALL N WITH RETROFLEX HOOK
-1DB0          ; mapped                 ; 0274          # 4.1  MODIFIER LETTER SMALL CAPITAL N
-1DB1          ; mapped                 ; 0275          # 4.1  MODIFIER LETTER SMALL BARRED O
-1DB2          ; mapped                 ; 0278          # 4.1  MODIFIER LETTER SMALL PHI
-1DB3          ; mapped                 ; 0282          # 4.1  MODIFIER LETTER SMALL S WITH HOOK
-1DB4          ; mapped                 ; 0283          # 4.1  MODIFIER LETTER SMALL ESH
-1DB5          ; mapped                 ; 01AB          # 4.1  MODIFIER LETTER SMALL T WITH PALATAL HOOK
-1DB6          ; mapped                 ; 0289          # 4.1  MODIFIER LETTER SMALL U BAR
-1DB7          ; mapped                 ; 028A          # 4.1  MODIFIER LETTER SMALL UPSILON
-1DB8          ; mapped                 ; 1D1C          # 4.1  MODIFIER LETTER SMALL CAPITAL U
-1DB9          ; mapped                 ; 028B          # 4.1  MODIFIER LETTER SMALL V WITH HOOK
-1DBA          ; mapped                 ; 028C          # 4.1  MODIFIER LETTER SMALL TURNED V
-1DBB          ; mapped                 ; 007A          # 4.1  MODIFIER LETTER SMALL Z
-1DBC          ; mapped                 ; 0290          # 4.1  MODIFIER LETTER SMALL Z WITH RETROFLEX HOOK
-1DBD          ; mapped                 ; 0291          # 4.1  MODIFIER LETTER SMALL Z WITH CURL
-1DBE          ; mapped                 ; 0292          # 4.1  MODIFIER LETTER SMALL EZH
-1DBF          ; mapped                 ; 03B8          # 4.1  MODIFIER LETTER SMALL THETA
-1DC0..1DC3    ; valid                                  # 4.1  COMBINING DOTTED GRAVE ACCENT..COMBINING SUSPENSION MARK
-1DC4..1DCA    ; valid                                  # 5.0  COMBINING MACRON-ACUTE..COMBINING LATIN SMALL LETTER R BELOW
-1DCB..1DE6    ; valid                                  # 5.1  COMBINING BREVE-MACRON..COMBINING LATIN SMALL LETTER Z
-1DE7..1DF5    ; valid                                  # 7.0  COMBINING LATIN SMALL LETTER ALPHA..COMBINING UP TACK ABOVE
-1DF6..1DF9    ; valid                                  # 10.0 COMBINING KAVYKA ABOVE RIGHT..COMBINING WIDE INVERTED BRIDGE BELOW
-1DFA          ; disallowed                             # NA   <reserved-1DFA>
-1DFB          ; valid                                  # 9.0  COMBINING DELETION MARK
-1DFC          ; valid                                  # 6.0  COMBINING DOUBLE INVERTED BREVE BELOW
-1DFD          ; valid                                  # 5.2  COMBINING ALMOST EQUAL TO BELOW
-1DFE..1DFF    ; valid                                  # 5.0  COMBINING LEFT ARROWHEAD ABOVE..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
-1E00          ; mapped                 ; 1E01          # 1.1  LATIN CAPITAL LETTER A WITH RING BELOW
-1E01          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH RING BELOW
-1E02          ; mapped                 ; 1E03          # 1.1  LATIN CAPITAL LETTER B WITH DOT ABOVE
-1E03          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH DOT ABOVE
-1E04          ; mapped                 ; 1E05          # 1.1  LATIN CAPITAL LETTER B WITH DOT BELOW
-1E05          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH DOT BELOW
-1E06          ; mapped                 ; 1E07          # 1.1  LATIN CAPITAL LETTER B WITH LINE BELOW
-1E07          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH LINE BELOW
-1E08          ; mapped                 ; 1E09          # 1.1  LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-1E09          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-1E0A          ; mapped                 ; 1E0B          # 1.1  LATIN CAPITAL LETTER D WITH DOT ABOVE
-1E0B          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH DOT ABOVE
-1E0C          ; mapped                 ; 1E0D          # 1.1  LATIN CAPITAL LETTER D WITH DOT BELOW
-1E0D          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH DOT BELOW
-1E0E          ; mapped                 ; 1E0F          # 1.1  LATIN CAPITAL LETTER D WITH LINE BELOW
-1E0F          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH LINE BELOW
-1E10          ; mapped                 ; 1E11          # 1.1  LATIN CAPITAL LETTER D WITH CEDILLA
-1E11          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH CEDILLA
-1E12          ; mapped                 ; 1E13          # 1.1  LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-1E13          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
-1E14          ; mapped                 ; 1E15          # 1.1  LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-1E15          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH MACRON AND GRAVE
-1E16          ; mapped                 ; 1E17          # 1.1  LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-1E17          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH MACRON AND ACUTE
-1E18          ; mapped                 ; 1E19          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-1E19          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
-1E1A          ; mapped                 ; 1E1B          # 1.1  LATIN CAPITAL LETTER E WITH TILDE BELOW
-1E1B          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH TILDE BELOW
-1E1C          ; mapped                 ; 1E1D          # 1.1  LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-1E1D          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-1E1E          ; mapped                 ; 1E1F          # 1.1  LATIN CAPITAL LETTER F WITH DOT ABOVE
-1E1F          ; valid                                  # 1.1  LATIN SMALL LETTER F WITH DOT ABOVE
-1E20          ; mapped                 ; 1E21          # 1.1  LATIN CAPITAL LETTER G WITH MACRON
-1E21          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH MACRON
-1E22          ; mapped                 ; 1E23          # 1.1  LATIN CAPITAL LETTER H WITH DOT ABOVE
-1E23          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH DOT ABOVE
-1E24          ; mapped                 ; 1E25          # 1.1  LATIN CAPITAL LETTER H WITH DOT BELOW
-1E25          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH DOT BELOW
-1E26          ; mapped                 ; 1E27          # 1.1  LATIN CAPITAL LETTER H WITH DIAERESIS
-1E27          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH DIAERESIS
-1E28          ; mapped                 ; 1E29          # 1.1  LATIN CAPITAL LETTER H WITH CEDILLA
-1E29          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH CEDILLA
-1E2A          ; mapped                 ; 1E2B          # 1.1  LATIN CAPITAL LETTER H WITH BREVE BELOW
-1E2B          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH BREVE BELOW
-1E2C          ; mapped                 ; 1E2D          # 1.1  LATIN CAPITAL LETTER I WITH TILDE BELOW
-1E2D          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH TILDE BELOW
-1E2E          ; mapped                 ; 1E2F          # 1.1  LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-1E2F          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-1E30          ; mapped                 ; 1E31          # 1.1  LATIN CAPITAL LETTER K WITH ACUTE
-1E31          ; valid                                  # 1.1  LATIN SMALL LETTER K WITH ACUTE
-1E32          ; mapped                 ; 1E33          # 1.1  LATIN CAPITAL LETTER K WITH DOT BELOW
-1E33          ; valid                                  # 1.1  LATIN SMALL LETTER K WITH DOT BELOW
-1E34          ; mapped                 ; 1E35          # 1.1  LATIN CAPITAL LETTER K WITH LINE BELOW
-1E35          ; valid                                  # 1.1  LATIN SMALL LETTER K WITH LINE BELOW
-1E36          ; mapped                 ; 1E37          # 1.1  LATIN CAPITAL LETTER L WITH DOT BELOW
-1E37          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH DOT BELOW
-1E38          ; mapped                 ; 1E39          # 1.1  LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-1E39          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-1E3A          ; mapped                 ; 1E3B          # 1.1  LATIN CAPITAL LETTER L WITH LINE BELOW
-1E3B          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH LINE BELOW
-1E3C          ; mapped                 ; 1E3D          # 1.1  LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-1E3D          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
-1E3E          ; mapped                 ; 1E3F          # 1.1  LATIN CAPITAL LETTER M WITH ACUTE
-1E3F          ; valid                                  # 1.1  LATIN SMALL LETTER M WITH ACUTE
-1E40          ; mapped                 ; 1E41          # 1.1  LATIN CAPITAL LETTER M WITH DOT ABOVE
-1E41          ; valid                                  # 1.1  LATIN SMALL LETTER M WITH DOT ABOVE
-1E42          ; mapped                 ; 1E43          # 1.1  LATIN CAPITAL LETTER M WITH DOT BELOW
-1E43          ; valid                                  # 1.1  LATIN SMALL LETTER M WITH DOT BELOW
-1E44          ; mapped                 ; 1E45          # 1.1  LATIN CAPITAL LETTER N WITH DOT ABOVE
-1E45          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH DOT ABOVE
-1E46          ; mapped                 ; 1E47          # 1.1  LATIN CAPITAL LETTER N WITH DOT BELOW
-1E47          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH DOT BELOW
-1E48          ; mapped                 ; 1E49          # 1.1  LATIN CAPITAL LETTER N WITH LINE BELOW
-1E49          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH LINE BELOW
-1E4A          ; mapped                 ; 1E4B          # 1.1  LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-1E4B          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
-1E4C          ; mapped                 ; 1E4D          # 1.1  LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-1E4D          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH TILDE AND ACUTE
-1E4E          ; mapped                 ; 1E4F          # 1.1  LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-1E4F          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-1E50          ; mapped                 ; 1E51          # 1.1  LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-1E51          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH MACRON AND GRAVE
-1E52          ; mapped                 ; 1E53          # 1.1  LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-1E53          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH MACRON AND ACUTE
-1E54          ; mapped                 ; 1E55          # 1.1  LATIN CAPITAL LETTER P WITH ACUTE
-1E55          ; valid                                  # 1.1  LATIN SMALL LETTER P WITH ACUTE
-1E56          ; mapped                 ; 1E57          # 1.1  LATIN CAPITAL LETTER P WITH DOT ABOVE
-1E57          ; valid                                  # 1.1  LATIN SMALL LETTER P WITH DOT ABOVE
-1E58          ; mapped                 ; 1E59          # 1.1  LATIN CAPITAL LETTER R WITH DOT ABOVE
-1E59          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH DOT ABOVE
-1E5A          ; mapped                 ; 1E5B          # 1.1  LATIN CAPITAL LETTER R WITH DOT BELOW
-1E5B          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH DOT BELOW
-1E5C          ; mapped                 ; 1E5D          # 1.1  LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-1E5D          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-1E5E          ; mapped                 ; 1E5F          # 1.1  LATIN CAPITAL LETTER R WITH LINE BELOW
-1E5F          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH LINE BELOW
-1E60          ; mapped                 ; 1E61          # 1.1  LATIN CAPITAL LETTER S WITH DOT ABOVE
-1E61          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH DOT ABOVE
-1E62          ; mapped                 ; 1E63          # 1.1  LATIN CAPITAL LETTER S WITH DOT BELOW
-1E63          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH DOT BELOW
-1E64          ; mapped                 ; 1E65          # 1.1  LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-1E65          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
-1E66          ; mapped                 ; 1E67          # 1.1  LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-1E67          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
-1E68          ; mapped                 ; 1E69          # 1.1  LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-1E69          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-1E6A          ; mapped                 ; 1E6B          # 1.1  LATIN CAPITAL LETTER T WITH DOT ABOVE
-1E6B          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH DOT ABOVE
-1E6C          ; mapped                 ; 1E6D          # 1.1  LATIN CAPITAL LETTER T WITH DOT BELOW
-1E6D          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH DOT BELOW
-1E6E          ; mapped                 ; 1E6F          # 1.1  LATIN CAPITAL LETTER T WITH LINE BELOW
-1E6F          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH LINE BELOW
-1E70          ; mapped                 ; 1E71          # 1.1  LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-1E71          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
-1E72          ; mapped                 ; 1E73          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-1E73          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS BELOW
-1E74          ; mapped                 ; 1E75          # 1.1  LATIN CAPITAL LETTER U WITH TILDE BELOW
-1E75          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH TILDE BELOW
-1E76          ; mapped                 ; 1E77          # 1.1  LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-1E77          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
-1E78          ; mapped                 ; 1E79          # 1.1  LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-1E79          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH TILDE AND ACUTE
-1E7A          ; mapped                 ; 1E7B          # 1.1  LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
-1E7B          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
-1E7C          ; mapped                 ; 1E7D          # 1.1  LATIN CAPITAL LETTER V WITH TILDE
-1E7D          ; valid                                  # 1.1  LATIN SMALL LETTER V WITH TILDE
-1E7E          ; mapped                 ; 1E7F          # 1.1  LATIN CAPITAL LETTER V WITH DOT BELOW
-1E7F          ; valid                                  # 1.1  LATIN SMALL LETTER V WITH DOT BELOW
-1E80          ; mapped                 ; 1E81          # 1.1  LATIN CAPITAL LETTER W WITH GRAVE
-1E81          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH GRAVE
-1E82          ; mapped                 ; 1E83          # 1.1  LATIN CAPITAL LETTER W WITH ACUTE
-1E83          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH ACUTE
-1E84          ; mapped                 ; 1E85          # 1.1  LATIN CAPITAL LETTER W WITH DIAERESIS
-1E85          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH DIAERESIS
-1E86          ; mapped                 ; 1E87          # 1.1  LATIN CAPITAL LETTER W WITH DOT ABOVE
-1E87          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH DOT ABOVE
-1E88          ; mapped                 ; 1E89          # 1.1  LATIN CAPITAL LETTER W WITH DOT BELOW
-1E89          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH DOT BELOW
-1E8A          ; mapped                 ; 1E8B          # 1.1  LATIN CAPITAL LETTER X WITH DOT ABOVE
-1E8B          ; valid                                  # 1.1  LATIN SMALL LETTER X WITH DOT ABOVE
-1E8C          ; mapped                 ; 1E8D          # 1.1  LATIN CAPITAL LETTER X WITH DIAERESIS
-1E8D          ; valid                                  # 1.1  LATIN SMALL LETTER X WITH DIAERESIS
-1E8E          ; mapped                 ; 1E8F          # 1.1  LATIN CAPITAL LETTER Y WITH DOT ABOVE
-1E8F          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH DOT ABOVE
-1E90          ; mapped                 ; 1E91          # 1.1  LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
-1E91          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH CIRCUMFLEX
-1E92          ; mapped                 ; 1E93          # 1.1  LATIN CAPITAL LETTER Z WITH DOT BELOW
-1E93          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH DOT BELOW
-1E94          ; mapped                 ; 1E95          # 1.1  LATIN CAPITAL LETTER Z WITH LINE BELOW
-1E95..1E99    ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH LINE BELOW..LATIN SMALL LETTER Y WITH RING ABOVE
-1E9A          ; mapped                 ; 0061 02BE     # 1.1  LATIN SMALL LETTER A WITH RIGHT HALF RING
-1E9B          ; mapped                 ; 1E61          # 2.0  LATIN SMALL LETTER LONG S WITH DOT ABOVE
-1E9C..1E9D    ; valid                                  # 5.1  LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE..LATIN SMALL LETTER LONG S WITH HIGH STROKE
-1E9E          ; mapped                 ; 0073 0073     # 5.1  LATIN CAPITAL LETTER SHARP S
-1E9F          ; valid                                  # 5.1  LATIN SMALL LETTER DELTA
-1EA0          ; mapped                 ; 1EA1          # 1.1  LATIN CAPITAL LETTER A WITH DOT BELOW
-1EA1          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH DOT BELOW
-1EA2          ; mapped                 ; 1EA3          # 1.1  LATIN CAPITAL LETTER A WITH HOOK ABOVE
-1EA3          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH HOOK ABOVE
-1EA4          ; mapped                 ; 1EA5          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-1EA5          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-1EA6          ; mapped                 ; 1EA7          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-1EA7          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-1EA8          ; mapped                 ; 1EA9          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-1EA9          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-1EAA          ; mapped                 ; 1EAB          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-1EAB          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-1EAC          ; mapped                 ; 1EAD          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-1EAD          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-1EAE          ; mapped                 ; 1EAF          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-1EAF          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND ACUTE
-1EB0          ; mapped                 ; 1EB1          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-1EB1          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND GRAVE
-1EB2          ; mapped                 ; 1EB3          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-1EB3          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-1EB4          ; mapped                 ; 1EB5          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-1EB5          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND TILDE
-1EB6          ; mapped                 ; 1EB7          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-1EB7          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-1EB8          ; mapped                 ; 1EB9          # 1.1  LATIN CAPITAL LETTER E WITH DOT BELOW
-1EB9          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH DOT BELOW
-1EBA          ; mapped                 ; 1EBB          # 1.1  LATIN CAPITAL LETTER E WITH HOOK ABOVE
-1EBB          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH HOOK ABOVE
-1EBC          ; mapped                 ; 1EBD          # 1.1  LATIN CAPITAL LETTER E WITH TILDE
-1EBD          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH TILDE
-1EBE          ; mapped                 ; 1EBF          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-1EBF          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-1EC0          ; mapped                 ; 1EC1          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-1EC1          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-1EC2          ; mapped                 ; 1EC3          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-1EC3          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-1EC4          ; mapped                 ; 1EC5          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-1EC5          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-1EC6          ; mapped                 ; 1EC7          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-1EC7          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-1EC8          ; mapped                 ; 1EC9          # 1.1  LATIN CAPITAL LETTER I WITH HOOK ABOVE
-1EC9          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH HOOK ABOVE
-1ECA          ; mapped                 ; 1ECB          # 1.1  LATIN CAPITAL LETTER I WITH DOT BELOW
-1ECB          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH DOT BELOW
-1ECC          ; mapped                 ; 1ECD          # 1.1  LATIN CAPITAL LETTER O WITH DOT BELOW
-1ECD          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH DOT BELOW
-1ECE          ; mapped                 ; 1ECF          # 1.1  LATIN CAPITAL LETTER O WITH HOOK ABOVE
-1ECF          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HOOK ABOVE
-1ED0          ; mapped                 ; 1ED1          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-1ED1          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-1ED2          ; mapped                 ; 1ED3          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-1ED3          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-1ED4          ; mapped                 ; 1ED5          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-1ED5          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-1ED6          ; mapped                 ; 1ED7          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-1ED7          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-1ED8          ; mapped                 ; 1ED9          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-1ED9          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-1EDA          ; mapped                 ; 1EDB          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-1EDB          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND ACUTE
-1EDC          ; mapped                 ; 1EDD          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-1EDD          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND GRAVE
-1EDE          ; mapped                 ; 1EDF          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-1EDF          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-1EE0          ; mapped                 ; 1EE1          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND TILDE
-1EE1          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND TILDE
-1EE2          ; mapped                 ; 1EE3          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-1EE3          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-1EE4          ; mapped                 ; 1EE5          # 1.1  LATIN CAPITAL LETTER U WITH DOT BELOW
-1EE5          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DOT BELOW
-1EE6          ; mapped                 ; 1EE7          # 1.1  LATIN CAPITAL LETTER U WITH HOOK ABOVE
-1EE7          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HOOK ABOVE
-1EE8          ; mapped                 ; 1EE9          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-1EE9          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND ACUTE
-1EEA          ; mapped                 ; 1EEB          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-1EEB          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND GRAVE
-1EEC          ; mapped                 ; 1EED          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-1EED          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-1EEE          ; mapped                 ; 1EEF          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND TILDE
-1EEF          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND TILDE
-1EF0          ; mapped                 ; 1EF1          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-1EF1          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-1EF2          ; mapped                 ; 1EF3          # 1.1  LATIN CAPITAL LETTER Y WITH GRAVE
-1EF3          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH GRAVE
-1EF4          ; mapped                 ; 1EF5          # 1.1  LATIN CAPITAL LETTER Y WITH DOT BELOW
-1EF5          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH DOT BELOW
-1EF6          ; mapped                 ; 1EF7          # 1.1  LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-1EF7          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH HOOK ABOVE
-1EF8          ; mapped                 ; 1EF9          # 1.1  LATIN CAPITAL LETTER Y WITH TILDE
-1EF9          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH TILDE
-1EFA          ; mapped                 ; 1EFB          # 5.1  LATIN CAPITAL LETTER MIDDLE-WELSH LL
-1EFB          ; valid                                  # 5.1  LATIN SMALL LETTER MIDDLE-WELSH LL
-1EFC          ; mapped                 ; 1EFD          # 5.1  LATIN CAPITAL LETTER MIDDLE-WELSH V
-1EFD          ; valid                                  # 5.1  LATIN SMALL LETTER MIDDLE-WELSH V
-1EFE          ; mapped                 ; 1EFF          # 5.1  LATIN CAPITAL LETTER Y WITH LOOP
-1EFF          ; valid                                  # 5.1  LATIN SMALL LETTER Y WITH LOOP
-1F00..1F07    ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI..GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-1F08          ; mapped                 ; 1F00          # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI
-1F09          ; mapped                 ; 1F01          # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA
-1F0A          ; mapped                 ; 1F02          # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-1F0B          ; mapped                 ; 1F03          # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-1F0C          ; mapped                 ; 1F04          # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-1F0D          ; mapped                 ; 1F05          # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-1F0E          ; mapped                 ; 1F06          # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-1F0F          ; mapped                 ; 1F07          # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-1F10..1F15    ; valid                                  # 1.1  GREEK SMALL LETTER EPSILON WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-1F16..1F17    ; disallowed                             # NA   <reserved-1F16>..<reserved-1F17>
-1F18          ; mapped                 ; 1F10          # 1.1  GREEK CAPITAL LETTER EPSILON WITH PSILI
-1F19          ; mapped                 ; 1F11          # 1.1  GREEK CAPITAL LETTER EPSILON WITH DASIA
-1F1A          ; mapped                 ; 1F12          # 1.1  GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-1F1B          ; mapped                 ; 1F13          # 1.1  GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-1F1C          ; mapped                 ; 1F14          # 1.1  GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-1F1D          ; mapped                 ; 1F15          # 1.1  GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-1F1E..1F1F    ; disallowed                             # NA   <reserved-1F1E>..<reserved-1F1F>
-1F20..1F27    ; valid                                  # 1.1  GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-1F28          ; mapped                 ; 1F20          # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI
-1F29          ; mapped                 ; 1F21          # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA
-1F2A          ; mapped                 ; 1F22          # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-1F2B          ; mapped                 ; 1F23          # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-1F2C          ; mapped                 ; 1F24          # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-1F2D          ; mapped                 ; 1F25          # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-1F2E          ; mapped                 ; 1F26          # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-1F2F          ; mapped                 ; 1F27          # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-1F30..1F37    ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH PSILI..GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-1F38          ; mapped                 ; 1F30          # 1.1  GREEK CAPITAL LETTER IOTA WITH PSILI
-1F39          ; mapped                 ; 1F31          # 1.1  GREEK CAPITAL LETTER IOTA WITH DASIA
-1F3A          ; mapped                 ; 1F32          # 1.1  GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-1F3B          ; mapped                 ; 1F33          # 1.1  GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-1F3C          ; mapped                 ; 1F34          # 1.1  GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-1F3D          ; mapped                 ; 1F35          # 1.1  GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-1F3E          ; mapped                 ; 1F36          # 1.1  GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-1F3F          ; mapped                 ; 1F37          # 1.1  GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-1F40..1F45    ; valid                                  # 1.1  GREEK SMALL LETTER OMICRON WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-1F46..1F47    ; disallowed                             # NA   <reserved-1F46>..<reserved-1F47>
-1F48          ; mapped                 ; 1F40          # 1.1  GREEK CAPITAL LETTER OMICRON WITH PSILI
-1F49          ; mapped                 ; 1F41          # 1.1  GREEK CAPITAL LETTER OMICRON WITH DASIA
-1F4A          ; mapped                 ; 1F42          # 1.1  GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-1F4B          ; mapped                 ; 1F43          # 1.1  GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-1F4C          ; mapped                 ; 1F44          # 1.1  GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-1F4D          ; mapped                 ; 1F45          # 1.1  GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-1F4E..1F4F    ; disallowed                             # NA   <reserved-1F4E>..<reserved-1F4F>
-1F50..1F57    ; valid                                  # 1.1  GREEK SMALL LETTER UPSILON WITH PSILI..GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-1F58          ; disallowed                             # NA   <reserved-1F58>
-1F59          ; mapped                 ; 1F51          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DASIA
-1F5A          ; disallowed                             # NA   <reserved-1F5A>
-1F5B          ; mapped                 ; 1F53          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-1F5C          ; disallowed                             # NA   <reserved-1F5C>
-1F5D          ; mapped                 ; 1F55          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-1F5E          ; disallowed                             # NA   <reserved-1F5E>
-1F5F          ; mapped                 ; 1F57          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-1F60..1F67    ; valid                                  # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI..GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-1F68          ; mapped                 ; 1F60          # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI
-1F69          ; mapped                 ; 1F61          # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA
-1F6A          ; mapped                 ; 1F62          # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-1F6B          ; mapped                 ; 1F63          # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-1F6C          ; mapped                 ; 1F64          # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-1F6D          ; mapped                 ; 1F65          # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-1F6E          ; mapped                 ; 1F66          # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-1F6F          ; mapped                 ; 1F67          # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-1F70          ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH VARIA
-1F71          ; mapped                 ; 03AC          # 1.1  GREEK SMALL LETTER ALPHA WITH OXIA
-1F72          ; valid                                  # 1.1  GREEK SMALL LETTER EPSILON WITH VARIA
-1F73          ; mapped                 ; 03AD          # 1.1  GREEK SMALL LETTER EPSILON WITH OXIA
-1F74          ; valid                                  # 1.1  GREEK SMALL LETTER ETA WITH VARIA
-1F75          ; mapped                 ; 03AE          # 1.1  GREEK SMALL LETTER ETA WITH OXIA
-1F76          ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH VARIA
-1F77          ; mapped                 ; 03AF          # 1.1  GREEK SMALL LETTER IOTA WITH OXIA
-1F78          ; valid                                  # 1.1  GREEK SMALL LETTER OMICRON WITH VARIA
-1F79          ; mapped                 ; 03CC          # 1.1  GREEK SMALL LETTER OMICRON WITH OXIA
-1F7A          ; valid                                  # 1.1  GREEK SMALL LETTER UPSILON WITH VARIA
-1F7B          ; mapped                 ; 03CD          # 1.1  GREEK SMALL LETTER UPSILON WITH OXIA
-1F7C          ; valid                                  # 1.1  GREEK SMALL LETTER OMEGA WITH VARIA
-1F7D          ; mapped                 ; 03CE          # 1.1  GREEK SMALL LETTER OMEGA WITH OXIA
-1F7E..1F7F    ; disallowed                             # NA   <reserved-1F7E>..<reserved-1F7F>
-1F80          ; mapped                 ; 1F00 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-1F81          ; mapped                 ; 1F01 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-1F82          ; mapped                 ; 1F02 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-1F83          ; mapped                 ; 1F03 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-1F84          ; mapped                 ; 1F04 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-1F85          ; mapped                 ; 1F05 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-1F86          ; mapped                 ; 1F06 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-1F87          ; mapped                 ; 1F07 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-1F88          ; mapped                 ; 1F00 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-1F89          ; mapped                 ; 1F01 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-1F8A          ; mapped                 ; 1F02 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1F8B          ; mapped                 ; 1F03 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1F8C          ; mapped                 ; 1F04 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1F8D          ; mapped                 ; 1F05 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1F8E          ; mapped                 ; 1F06 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1F8F          ; mapped                 ; 1F07 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1F90          ; mapped                 ; 1F20 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-1F91          ; mapped                 ; 1F21 03B9     # 1.1  GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-1F92          ; mapped                 ; 1F22 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-1F93          ; mapped                 ; 1F23 03B9     # 1.1  GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-1F94          ; mapped                 ; 1F24 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-1F95          ; mapped                 ; 1F25 03B9     # 1.1  GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-1F96          ; mapped                 ; 1F26 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-1F97          ; mapped                 ; 1F27 03B9     # 1.1  GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-1F98          ; mapped                 ; 1F20 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-1F99          ; mapped                 ; 1F21 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-1F9A          ; mapped                 ; 1F22 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1F9B          ; mapped                 ; 1F23 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1F9C          ; mapped                 ; 1F24 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1F9D          ; mapped                 ; 1F25 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1F9E          ; mapped                 ; 1F26 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1F9F          ; mapped                 ; 1F27 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1FA0          ; mapped                 ; 1F60 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-1FA1          ; mapped                 ; 1F61 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-1FA2          ; mapped                 ; 1F62 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-1FA3          ; mapped                 ; 1F63 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-1FA4          ; mapped                 ; 1F64 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-1FA5          ; mapped                 ; 1F65 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-1FA6          ; mapped                 ; 1F66 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-1FA7          ; mapped                 ; 1F67 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-1FA8          ; mapped                 ; 1F60 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-1FA9          ; mapped                 ; 1F61 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-1FAA          ; mapped                 ; 1F62 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1FAB          ; mapped                 ; 1F63 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1FAC          ; mapped                 ; 1F64 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1FAD          ; mapped                 ; 1F65 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1FAE          ; mapped                 ; 1F66 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1FAF          ; mapped                 ; 1F67 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1FB0..1FB1    ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH VRACHY..GREEK SMALL LETTER ALPHA WITH MACRON
-1FB2          ; mapped                 ; 1F70 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-1FB3          ; mapped                 ; 03B1 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
-1FB4          ; mapped                 ; 03AC 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-1FB5          ; disallowed                             # NA   <reserved-1FB5>
-1FB6          ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH PERISPOMENI
-1FB7          ; mapped                 ; 1FB6 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-1FB8          ; mapped                 ; 1FB0          # 1.1  GREEK CAPITAL LETTER ALPHA WITH VRACHY
-1FB9          ; mapped                 ; 1FB1          # 1.1  GREEK CAPITAL LETTER ALPHA WITH MACRON
-1FBA          ; mapped                 ; 1F70          # 1.1  GREEK CAPITAL LETTER ALPHA WITH VARIA
-1FBB          ; mapped                 ; 03AC          # 1.1  GREEK CAPITAL LETTER ALPHA WITH OXIA
-1FBC          ; mapped                 ; 03B1 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-1FBD          ; disallowed_STD3_mapped ; 0020 0313     # 1.1  GREEK KORONIS
-1FBE          ; mapped                 ; 03B9          # 1.1  GREEK PROSGEGRAMMENI
-1FBF          ; disallowed_STD3_mapped ; 0020 0313     # 1.1  GREEK PSILI
-1FC0          ; disallowed_STD3_mapped ; 0020 0342     # 1.1  GREEK PERISPOMENI
-1FC1          ; disallowed_STD3_mapped ; 0020 0308 0342 #1.1  GREEK DIALYTIKA AND PERISPOMENI
-1FC2          ; mapped                 ; 1F74 03B9     # 1.1  GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-1FC3          ; mapped                 ; 03B7 03B9     # 1.1  GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
-1FC4          ; mapped                 ; 03AE 03B9     # 1.1  GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-1FC5          ; disallowed                             # NA   <reserved-1FC5>
-1FC6          ; valid                                  # 1.1  GREEK SMALL LETTER ETA WITH PERISPOMENI
-1FC7          ; mapped                 ; 1FC6 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-1FC8          ; mapped                 ; 1F72          # 1.1  GREEK CAPITAL LETTER EPSILON WITH VARIA
-1FC9          ; mapped                 ; 03AD          # 1.1  GREEK CAPITAL LETTER EPSILON WITH OXIA
-1FCA          ; mapped                 ; 1F74          # 1.1  GREEK CAPITAL LETTER ETA WITH VARIA
-1FCB          ; mapped                 ; 03AE          # 1.1  GREEK CAPITAL LETTER ETA WITH OXIA
-1FCC          ; mapped                 ; 03B7 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-1FCD          ; disallowed_STD3_mapped ; 0020 0313 0300 #1.1  GREEK PSILI AND VARIA
-1FCE          ; disallowed_STD3_mapped ; 0020 0313 0301 #1.1  GREEK PSILI AND OXIA
-1FCF          ; disallowed_STD3_mapped ; 0020 0313 0342 #1.1  GREEK PSILI AND PERISPOMENI
-1FD0..1FD2    ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH VRACHY..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-1FD3          ; mapped                 ; 0390          # 1.1  GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
-1FD4..1FD5    ; disallowed                             # NA   <reserved-1FD4>..<reserved-1FD5>
-1FD6..1FD7    ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH PERISPOMENI..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-1FD8          ; mapped                 ; 1FD0          # 1.1  GREEK CAPITAL LETTER IOTA WITH VRACHY
-1FD9          ; mapped                 ; 1FD1          # 1.1  GREEK CAPITAL LETTER IOTA WITH MACRON
-1FDA          ; mapped                 ; 1F76          # 1.1  GREEK CAPITAL LETTER IOTA WITH VARIA
-1FDB          ; mapped                 ; 03AF          # 1.1  GREEK CAPITAL LETTER IOTA WITH OXIA
-1FDC          ; disallowed                             # NA   <reserved-1FDC>
-1FDD          ; disallowed_STD3_mapped ; 0020 0314 0300 #1.1  GREEK DASIA AND VARIA
-1FDE          ; disallowed_STD3_mapped ; 0020 0314 0301 #1.1  GREEK DASIA AND OXIA
-1FDF          ; disallowed_STD3_mapped ; 0020 0314 0342 #1.1  GREEK DASIA AND PERISPOMENI
-1FE0..1FE2    ; valid                                  # 1.1  GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-1FE3          ; mapped                 ; 03B0          # 1.1  GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
-1FE4..1FE7    ; valid                                  # 1.1  GREEK SMALL LETTER RHO WITH PSILI..GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-1FE8          ; mapped                 ; 1FE0          # 1.1  GREEK CAPITAL LETTER UPSILON WITH VRACHY
-1FE9          ; mapped                 ; 1FE1          # 1.1  GREEK CAPITAL LETTER UPSILON WITH MACRON
-1FEA          ; mapped                 ; 1F7A          # 1.1  GREEK CAPITAL LETTER UPSILON WITH VARIA
-1FEB          ; mapped                 ; 03CD          # 1.1  GREEK CAPITAL LETTER UPSILON WITH OXIA
-1FEC          ; mapped                 ; 1FE5          # 1.1  GREEK CAPITAL LETTER RHO WITH DASIA
-1FED          ; disallowed_STD3_mapped ; 0020 0308 0300 #1.1  GREEK DIALYTIKA AND VARIA
-1FEE          ; disallowed_STD3_mapped ; 0020 0308 0301 #1.1  GREEK DIALYTIKA AND OXIA
-1FEF          ; disallowed_STD3_mapped ; 0060          # 1.1  GREEK VARIA
-1FF0..1FF1    ; disallowed                             # NA   <reserved-1FF0>..<reserved-1FF1>
-1FF2          ; mapped                 ; 1F7C 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-1FF3          ; mapped                 ; 03C9 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
-1FF4          ; mapped                 ; 03CE 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-1FF5          ; disallowed                             # NA   <reserved-1FF5>
-1FF6          ; valid                                  # 1.1  GREEK SMALL LETTER OMEGA WITH PERISPOMENI
-1FF7          ; mapped                 ; 1FF6 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-1FF8          ; mapped                 ; 1F78          # 1.1  GREEK CAPITAL LETTER OMICRON WITH VARIA
-1FF9          ; mapped                 ; 03CC          # 1.1  GREEK CAPITAL LETTER OMICRON WITH OXIA
-1FFA          ; mapped                 ; 1F7C          # 1.1  GREEK CAPITAL LETTER OMEGA WITH VARIA
-1FFB          ; mapped                 ; 03CE          # 1.1  GREEK CAPITAL LETTER OMEGA WITH OXIA
-1FFC          ; mapped                 ; 03C9 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-1FFD          ; disallowed_STD3_mapped ; 0020 0301     # 1.1  GREEK OXIA
-1FFE          ; disallowed_STD3_mapped ; 0020 0314     # 1.1  GREEK DASIA
-1FFF          ; disallowed                             # NA   <reserved-1FFF>
-2000..200A    ; disallowed_STD3_mapped ; 0020          # 1.1  EN QUAD..HAIR SPACE
-200B          ; ignored                                # 1.1  ZERO WIDTH SPACE
-200C..200D    ; deviation              ;               # 1.1  ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
-200E..200F    ; disallowed                             # 1.1  LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK
-2010          ; valid                  ;      ; NV8    # 1.1  HYPHEN
-2011          ; mapped                 ; 2010          # 1.1  NON-BREAKING HYPHEN
-2012..2016    ; valid                  ;      ; NV8    # 1.1  FIGURE DASH..DOUBLE VERTICAL LINE
-2017          ; disallowed_STD3_mapped ; 0020 0333     # 1.1  DOUBLE LOW LINE
-2018..2023    ; valid                  ;      ; NV8    # 1.1  LEFT SINGLE QUOTATION MARK..TRIANGULAR BULLET
-2024..2026    ; disallowed                             # 1.1  ONE DOT LEADER..HORIZONTAL ELLIPSIS
-2027          ; valid                  ;      ; NV8    # 1.1  HYPHENATION POINT
-2028..202E    ; disallowed                             # 1.1  LINE SEPARATOR..RIGHT-TO-LEFT OVERRIDE
-202F          ; disallowed_STD3_mapped ; 0020          # 3.0  NARROW NO-BREAK SPACE
-2030..2032    ; valid                  ;      ; NV8    # 1.1  PER MILLE SIGN..PRIME
-2033          ; mapped                 ; 2032 2032     # 1.1  DOUBLE PRIME
-2034          ; mapped                 ; 2032 2032 2032 #1.1  TRIPLE PRIME
-2035          ; valid                  ;      ; NV8    # 1.1  REVERSED PRIME
-2036          ; mapped                 ; 2035 2035     # 1.1  REVERSED DOUBLE PRIME
-2037          ; mapped                 ; 2035 2035 2035 #1.1  REVERSED TRIPLE PRIME
-2038..203B    ; valid                  ;      ; NV8    # 1.1  CARET..REFERENCE MARK
-203C          ; disallowed_STD3_mapped ; 0021 0021     # 1.1  DOUBLE EXCLAMATION MARK
-203D          ; valid                  ;      ; NV8    # 1.1  INTERROBANG
-203E          ; disallowed_STD3_mapped ; 0020 0305     # 1.1  OVERLINE
-203F..2046    ; valid                  ;      ; NV8    # 1.1  UNDERTIE..RIGHT SQUARE BRACKET WITH QUILL
-2047          ; disallowed_STD3_mapped ; 003F 003F     # 3.2  DOUBLE QUESTION MARK
-2048          ; disallowed_STD3_mapped ; 003F 0021     # 3.0  QUESTION EXCLAMATION MARK
-2049          ; disallowed_STD3_mapped ; 0021 003F     # 3.0  EXCLAMATION QUESTION MARK
-204A..204D    ; valid                  ;      ; NV8    # 3.0  TIRONIAN SIGN ET..BLACK RIGHTWARDS BULLET
-204E..2052    ; valid                  ;      ; NV8    # 3.2  LOW ASTERISK..COMMERCIAL MINUS SIGN
-2053..2054    ; valid                  ;      ; NV8    # 4.0  SWUNG DASH..INVERTED UNDERTIE
-2055..2056    ; valid                  ;      ; NV8    # 4.1  FLOWER PUNCTUATION MARK..THREE DOT PUNCTUATION
-2057          ; mapped                 ; 2032 2032 2032 2032 #3.2 QUADRUPLE PRIME
-2058..205E    ; valid                  ;      ; NV8    # 4.1  FOUR DOT PUNCTUATION..VERTICAL FOUR DOTS
-205F          ; disallowed_STD3_mapped ; 0020          # 3.2  MEDIUM MATHEMATICAL SPACE
-2060          ; ignored                                # 3.2  WORD JOINER
-2061..2063    ; disallowed                             # 3.2  FUNCTION APPLICATION..INVISIBLE SEPARATOR
-2064          ; ignored                                # 5.1  INVISIBLE PLUS
-2065          ; disallowed                             # NA   <reserved-2065>
-2066..2069    ; disallowed                             # 6.3  LEFT-TO-RIGHT ISOLATE..POP DIRECTIONAL ISOLATE
-206A..206F    ; disallowed                             # 1.1  INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES
-2070          ; mapped                 ; 0030          # 1.1  SUPERSCRIPT ZERO
-2071          ; mapped                 ; 0069          # 3.2  SUPERSCRIPT LATIN SMALL LETTER I
-2072..2073    ; disallowed                             # NA   <reserved-2072>..<reserved-2073>
-2074          ; mapped                 ; 0034          # 1.1  SUPERSCRIPT FOUR
-2075          ; mapped                 ; 0035          # 1.1  SUPERSCRIPT FIVE
-2076          ; mapped                 ; 0036          # 1.1  SUPERSCRIPT SIX
-2077          ; mapped                 ; 0037          # 1.1  SUPERSCRIPT SEVEN
-2078          ; mapped                 ; 0038          # 1.1  SUPERSCRIPT EIGHT
-2079          ; mapped                 ; 0039          # 1.1  SUPERSCRIPT NINE
-207A          ; disallowed_STD3_mapped ; 002B          # 1.1  SUPERSCRIPT PLUS SIGN
-207B          ; mapped                 ; 2212          # 1.1  SUPERSCRIPT MINUS
-207C          ; disallowed_STD3_mapped ; 003D          # 1.1  SUPERSCRIPT EQUALS SIGN
-207D          ; disallowed_STD3_mapped ; 0028          # 1.1  SUPERSCRIPT LEFT PARENTHESIS
-207E          ; disallowed_STD3_mapped ; 0029          # 1.1  SUPERSCRIPT RIGHT PARENTHESIS
-207F          ; mapped                 ; 006E          # 1.1  SUPERSCRIPT LATIN SMALL LETTER N
-2080          ; mapped                 ; 0030          # 1.1  SUBSCRIPT ZERO
-2081          ; mapped                 ; 0031          # 1.1  SUBSCRIPT ONE
-2082          ; mapped                 ; 0032          # 1.1  SUBSCRIPT TWO
-2083          ; mapped                 ; 0033          # 1.1  SUBSCRIPT THREE
-2084          ; mapped                 ; 0034          # 1.1  SUBSCRIPT FOUR
-2085          ; mapped                 ; 0035          # 1.1  SUBSCRIPT FIVE
-2086          ; mapped                 ; 0036          # 1.1  SUBSCRIPT SIX
-2087          ; mapped                 ; 0037          # 1.1  SUBSCRIPT SEVEN
-2088          ; mapped                 ; 0038          # 1.1  SUBSCRIPT EIGHT
-2089          ; mapped                 ; 0039          # 1.1  SUBSCRIPT NINE
-208A          ; disallowed_STD3_mapped ; 002B          # 1.1  SUBSCRIPT PLUS SIGN
-208B          ; mapped                 ; 2212          # 1.1  SUBSCRIPT MINUS
-208C          ; disallowed_STD3_mapped ; 003D          # 1.1  SUBSCRIPT EQUALS SIGN
-208D          ; disallowed_STD3_mapped ; 0028          # 1.1  SUBSCRIPT LEFT PARENTHESIS
-208E          ; disallowed_STD3_mapped ; 0029          # 1.1  SUBSCRIPT RIGHT PARENTHESIS
-208F          ; disallowed                             # NA   <reserved-208F>
-2090          ; mapped                 ; 0061          # 4.1  LATIN SUBSCRIPT SMALL LETTER A
-2091          ; mapped                 ; 0065          # 4.1  LATIN SUBSCRIPT SMALL LETTER E
-2092          ; mapped                 ; 006F          # 4.1  LATIN SUBSCRIPT SMALL LETTER O
-2093          ; mapped                 ; 0078          # 4.1  LATIN SUBSCRIPT SMALL LETTER X
-2094          ; mapped                 ; 0259          # 4.1  LATIN SUBSCRIPT SMALL LETTER SCHWA
-2095          ; mapped                 ; 0068          # 6.0  LATIN SUBSCRIPT SMALL LETTER H
-2096          ; mapped                 ; 006B          # 6.0  LATIN SUBSCRIPT SMALL LETTER K
-2097          ; mapped                 ; 006C          # 6.0  LATIN SUBSCRIPT SMALL LETTER L
-2098          ; mapped                 ; 006D          # 6.0  LATIN SUBSCRIPT SMALL LETTER M
-2099          ; mapped                 ; 006E          # 6.0  LATIN SUBSCRIPT SMALL LETTER N
-209A          ; mapped                 ; 0070          # 6.0  LATIN SUBSCRIPT SMALL LETTER P
-209B          ; mapped                 ; 0073          # 6.0  LATIN SUBSCRIPT SMALL LETTER S
-209C          ; mapped                 ; 0074          # 6.0  LATIN SUBSCRIPT SMALL LETTER T
-209D..209F    ; disallowed                             # NA   <reserved-209D>..<reserved-209F>
-20A0..20A7    ; valid                  ;      ; NV8    # 1.1  EURO-CURRENCY SIGN..PESETA SIGN
-20A8          ; mapped                 ; 0072 0073     # 1.1  RUPEE SIGN
-20A9..20AA    ; valid                  ;      ; NV8    # 1.1  WON SIGN..NEW SHEQEL SIGN
-20AB          ; valid                  ;      ; NV8    # 2.0  DONG SIGN
-20AC          ; valid                  ;      ; NV8    # 2.1  EURO SIGN
-20AD..20AF    ; valid                  ;      ; NV8    # 3.0  KIP SIGN..DRACHMA SIGN
-20B0..20B1    ; valid                  ;      ; NV8    # 3.2  GERMAN PENNY SIGN..PESO SIGN
-20B2..20B5    ; valid                  ;      ; NV8    # 4.1  GUARANI SIGN..CEDI SIGN
-20B6..20B8    ; valid                  ;      ; NV8    # 5.2  LIVRE TOURNOIS SIGN..TENGE SIGN
-20B9          ; valid                  ;      ; NV8    # 6.0  INDIAN RUPEE SIGN
-20BA          ; valid                  ;      ; NV8    # 6.2  TURKISH LIRA SIGN
-20BB..20BD    ; valid                  ;      ; NV8    # 7.0  NORDIC MARK SIGN..RUBLE SIGN
-20BE          ; valid                  ;      ; NV8    # 8.0  LARI SIGN
-20BF          ; valid                  ;      ; NV8    # 10.0 BITCOIN SIGN
-20C0..20CF    ; disallowed                             # NA   <reserved-20C0>..<reserved-20CF>
-20D0..20E1    ; valid                  ;      ; NV8    # 1.1  COMBINING LEFT HARPOON ABOVE..COMBINING LEFT RIGHT ARROW ABOVE
-20E2..20E3    ; valid                  ;      ; NV8    # 3.0  COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING KEYCAP
-20E4..20EA    ; valid                  ;      ; NV8    # 3.2  COMBINING ENCLOSING UPWARD POINTING TRIANGLE..COMBINING LEFTWARDS ARROW OVERLAY
-20EB          ; valid                  ;      ; NV8    # 4.1  COMBINING LONG DOUBLE SOLIDUS OVERLAY
-20EC..20EF    ; valid                  ;      ; NV8    # 5.0  COMBINING RIGHTWARDS HARPOON WITH BARB DOWNWARDS..COMBINING RIGHT ARROW BELOW
-20F0          ; valid                  ;      ; NV8    # 5.1  COMBINING ASTERISK ABOVE
-20F1..20FF    ; disallowed                             # NA   <reserved-20F1>..<reserved-20FF>
-2100          ; disallowed_STD3_mapped ; 0061 002F 0063 #1.1  ACCOUNT OF
-2101          ; disallowed_STD3_mapped ; 0061 002F 0073 #1.1  ADDRESSED TO THE SUBJECT
-2102          ; mapped                 ; 0063          # 1.1  DOUBLE-STRUCK CAPITAL C
-2103          ; mapped                 ; 00B0 0063     # 1.1  DEGREE CELSIUS
-2104          ; valid                  ;      ; NV8    # 1.1  CENTRE LINE SYMBOL
-2105          ; disallowed_STD3_mapped ; 0063 002F 006F #1.1  CARE OF
-2106          ; disallowed_STD3_mapped ; 0063 002F 0075 #1.1  CADA UNA
-2107          ; mapped                 ; 025B          # 1.1  EULER CONSTANT
-2108          ; valid                  ;      ; NV8    # 1.1  SCRUPLE
-2109          ; mapped                 ; 00B0 0066     # 1.1  DEGREE FAHRENHEIT
-210A          ; mapped                 ; 0067          # 1.1  SCRIPT SMALL G
-210B..210E    ; mapped                 ; 0068          # 1.1  SCRIPT CAPITAL H..PLANCK CONSTANT
-210F          ; mapped                 ; 0127          # 1.1  PLANCK CONSTANT OVER TWO PI
-2110..2111    ; mapped                 ; 0069          # 1.1  SCRIPT CAPITAL I..BLACK-LETTER CAPITAL I
-2112..2113    ; mapped                 ; 006C          # 1.1  SCRIPT CAPITAL L..SCRIPT SMALL L
-2114          ; valid                  ;      ; NV8    # 1.1  L B BAR SYMBOL
-2115          ; mapped                 ; 006E          # 1.1  DOUBLE-STRUCK CAPITAL N
-2116          ; mapped                 ; 006E 006F     # 1.1  NUMERO SIGN
-2117..2118    ; valid                  ;      ; NV8    # 1.1  SOUND RECORDING COPYRIGHT..SCRIPT CAPITAL P
-2119          ; mapped                 ; 0070          # 1.1  DOUBLE-STRUCK CAPITAL P
-211A          ; mapped                 ; 0071          # 1.1  DOUBLE-STRUCK CAPITAL Q
-211B..211D    ; mapped                 ; 0072          # 1.1  SCRIPT CAPITAL R..DOUBLE-STRUCK CAPITAL R
-211E..211F    ; valid                  ;      ; NV8    # 1.1  PRESCRIPTION TAKE..RESPONSE
-2120          ; mapped                 ; 0073 006D     # 1.1  SERVICE MARK
-2121          ; mapped                 ; 0074 0065 006C #1.1  TELEPHONE SIGN
-2122          ; mapped                 ; 0074 006D     # 1.1  TRADE MARK SIGN
-2123          ; valid                  ;      ; NV8    # 1.1  VERSICLE
-2124          ; mapped                 ; 007A          # 1.1  DOUBLE-STRUCK CAPITAL Z
-2125          ; valid                  ;      ; NV8    # 1.1  OUNCE SIGN
-2126          ; mapped                 ; 03C9          # 1.1  OHM SIGN
-2127          ; valid                  ;      ; NV8    # 1.1  INVERTED OHM SIGN
-2128          ; mapped                 ; 007A          # 1.1  BLACK-LETTER CAPITAL Z
-2129          ; valid                  ;      ; NV8    # 1.1  TURNED GREEK SMALL LETTER IOTA
-212A          ; mapped                 ; 006B          # 1.1  KELVIN SIGN
-212B          ; mapped                 ; 00E5          # 1.1  ANGSTROM SIGN
-212C          ; mapped                 ; 0062          # 1.1  SCRIPT CAPITAL B
-212D          ; mapped                 ; 0063          # 1.1  BLACK-LETTER CAPITAL C
-212E          ; valid                  ;      ; NV8    # 1.1  ESTIMATED SYMBOL
-212F..2130    ; mapped                 ; 0065          # 1.1  SCRIPT SMALL E..SCRIPT CAPITAL E
-2131          ; mapped                 ; 0066          # 1.1  SCRIPT CAPITAL F
-2132          ; disallowed                             # 1.1  TURNED CAPITAL F
-2133          ; mapped                 ; 006D          # 1.1  SCRIPT CAPITAL M
-2134          ; mapped                 ; 006F          # 1.1  SCRIPT SMALL O
-2135          ; mapped                 ; 05D0          # 1.1  ALEF SYMBOL
-2136          ; mapped                 ; 05D1          # 1.1  BET SYMBOL
-2137          ; mapped                 ; 05D2          # 1.1  GIMEL SYMBOL
-2138          ; mapped                 ; 05D3          # 1.1  DALET SYMBOL
-2139          ; mapped                 ; 0069          # 3.0  INFORMATION SOURCE
-213A          ; valid                  ;      ; NV8    # 3.0  ROTATED CAPITAL Q
-213B          ; mapped                 ; 0066 0061 0078 #4.0  FACSIMILE SIGN
-213C          ; mapped                 ; 03C0          # 4.1  DOUBLE-STRUCK SMALL PI
-213D..213E    ; mapped                 ; 03B3          # 3.2  DOUBLE-STRUCK SMALL GAMMA..DOUBLE-STRUCK CAPITAL GAMMA
-213F          ; mapped                 ; 03C0          # 3.2  DOUBLE-STRUCK CAPITAL PI
-2140          ; mapped                 ; 2211          # 3.2  DOUBLE-STRUCK N-ARY SUMMATION
-2141..2144    ; valid                  ;      ; NV8    # 3.2  TURNED SANS-SERIF CAPITAL G..TURNED SANS-SERIF CAPITAL Y
-2145..2146    ; mapped                 ; 0064          # 3.2  DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL D
-2147          ; mapped                 ; 0065          # 3.2  DOUBLE-STRUCK ITALIC SMALL E
-2148          ; mapped                 ; 0069          # 3.2  DOUBLE-STRUCK ITALIC SMALL I
-2149          ; mapped                 ; 006A          # 3.2  DOUBLE-STRUCK ITALIC SMALL J
-214A..214B    ; valid                  ;      ; NV8    # 3.2  PROPERTY LINE..TURNED AMPERSAND
-214C          ; valid                  ;      ; NV8    # 4.1  PER SIGN
-214D          ; valid                  ;      ; NV8    # 5.0  AKTIESELSKAB
-214E          ; valid                                  # 5.0  TURNED SMALL F
-214F          ; valid                  ;      ; NV8    # 5.1  SYMBOL FOR SAMARITAN SOURCE
-2150          ; mapped                 ; 0031 2044 0037 #5.2  VULGAR FRACTION ONE SEVENTH
-2151          ; mapped                 ; 0031 2044 0039 #5.2  VULGAR FRACTION ONE NINTH
-2152          ; mapped                 ; 0031 2044 0031 0030 #5.2 VULGAR FRACTION ONE TENTH
-2153          ; mapped                 ; 0031 2044 0033 #1.1  VULGAR FRACTION ONE THIRD
-2154          ; mapped                 ; 0032 2044 0033 #1.1  VULGAR FRACTION TWO THIRDS
-2155          ; mapped                 ; 0031 2044 0035 #1.1  VULGAR FRACTION ONE FIFTH
-2156          ; mapped                 ; 0032 2044 0035 #1.1  VULGAR FRACTION TWO FIFTHS
-2157          ; mapped                 ; 0033 2044 0035 #1.1  VULGAR FRACTION THREE FIFTHS
-2158          ; mapped                 ; 0034 2044 0035 #1.1  VULGAR FRACTION FOUR FIFTHS
-2159          ; mapped                 ; 0031 2044 0036 #1.1  VULGAR FRACTION ONE SIXTH
-215A          ; mapped                 ; 0035 2044 0036 #1.1  VULGAR FRACTION FIVE SIXTHS
-215B          ; mapped                 ; 0031 2044 0038 #1.1  VULGAR FRACTION ONE EIGHTH
-215C          ; mapped                 ; 0033 2044 0038 #1.1  VULGAR FRACTION THREE EIGHTHS
-215D          ; mapped                 ; 0035 2044 0038 #1.1  VULGAR FRACTION FIVE EIGHTHS
-215E          ; mapped                 ; 0037 2044 0038 #1.1  VULGAR FRACTION SEVEN EIGHTHS
-215F          ; mapped                 ; 0031 2044     # 1.1  FRACTION NUMERATOR ONE
-2160          ; mapped                 ; 0069          # 1.1  ROMAN NUMERAL ONE
-2161          ; mapped                 ; 0069 0069     # 1.1  ROMAN NUMERAL TWO
-2162          ; mapped                 ; 0069 0069 0069 #1.1  ROMAN NUMERAL THREE
-2163          ; mapped                 ; 0069 0076     # 1.1  ROMAN NUMERAL FOUR
-2164          ; mapped                 ; 0076          # 1.1  ROMAN NUMERAL FIVE
-2165          ; mapped                 ; 0076 0069     # 1.1  ROMAN NUMERAL SIX
-2166          ; mapped                 ; 0076 0069 0069 #1.1  ROMAN NUMERAL SEVEN
-2167          ; mapped                 ; 0076 0069 0069 0069 #1.1 ROMAN NUMERAL EIGHT
-2168          ; mapped                 ; 0069 0078     # 1.1  ROMAN NUMERAL NINE
-2169          ; mapped                 ; 0078          # 1.1  ROMAN NUMERAL TEN
-216A          ; mapped                 ; 0078 0069     # 1.1  ROMAN NUMERAL ELEVEN
-216B          ; mapped                 ; 0078 0069 0069 #1.1  ROMAN NUMERAL TWELVE
-216C          ; mapped                 ; 006C          # 1.1  ROMAN NUMERAL FIFTY
-216D          ; mapped                 ; 0063          # 1.1  ROMAN NUMERAL ONE HUNDRED
-216E          ; mapped                 ; 0064          # 1.1  ROMAN NUMERAL FIVE HUNDRED
-216F          ; mapped                 ; 006D          # 1.1  ROMAN NUMERAL ONE THOUSAND
-2170          ; mapped                 ; 0069          # 1.1  SMALL ROMAN NUMERAL ONE
-2171          ; mapped                 ; 0069 0069     # 1.1  SMALL ROMAN NUMERAL TWO
-2172          ; mapped                 ; 0069 0069 0069 #1.1  SMALL ROMAN NUMERAL THREE
-2173          ; mapped                 ; 0069 0076     # 1.1  SMALL ROMAN NUMERAL FOUR
-2174          ; mapped                 ; 0076          # 1.1  SMALL ROMAN NUMERAL FIVE
-2175          ; mapped                 ; 0076 0069     # 1.1  SMALL ROMAN NUMERAL SIX
-2176          ; mapped                 ; 0076 0069 0069 #1.1  SMALL ROMAN NUMERAL SEVEN
-2177          ; mapped                 ; 0076 0069 0069 0069 #1.1 SMALL ROMAN NUMERAL EIGHT
-2178          ; mapped                 ; 0069 0078     # 1.1  SMALL ROMAN NUMERAL NINE
-2179          ; mapped                 ; 0078          # 1.1  SMALL ROMAN NUMERAL TEN
-217A          ; mapped                 ; 0078 0069     # 1.1  SMALL ROMAN NUMERAL ELEVEN
-217B          ; mapped                 ; 0078 0069 0069 #1.1  SMALL ROMAN NUMERAL TWELVE
-217C          ; mapped                 ; 006C          # 1.1  SMALL ROMAN NUMERAL FIFTY
-217D          ; mapped                 ; 0063          # 1.1  SMALL ROMAN NUMERAL ONE HUNDRED
-217E          ; mapped                 ; 0064          # 1.1  SMALL ROMAN NUMERAL FIVE HUNDRED
-217F          ; mapped                 ; 006D          # 1.1  SMALL ROMAN NUMERAL ONE THOUSAND
-2180..2182    ; valid                  ;      ; NV8    # 1.1  ROMAN NUMERAL ONE THOUSAND C D..ROMAN NUMERAL TEN THOUSAND
-2183          ; disallowed                             # 3.0  ROMAN NUMERAL REVERSED ONE HUNDRED
-2184          ; valid                                  # 5.0  LATIN SMALL LETTER REVERSED C
-2185..2188    ; valid                  ;      ; NV8    # 5.1  ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND
-2189          ; mapped                 ; 0030 2044 0033 #5.2  VULGAR FRACTION ZERO THIRDS
-218A..218B    ; valid                  ;      ; NV8    # 8.0  TURNED DIGIT TWO..TURNED DIGIT THREE
-218C..218F    ; disallowed                             # NA   <reserved-218C>..<reserved-218F>
-2190..21EA    ; valid                  ;      ; NV8    # 1.1  LEFTWARDS ARROW..UPWARDS WHITE ARROW FROM BAR
-21EB..21F3    ; valid                  ;      ; NV8    # 3.0  UPWARDS WHITE ARROW ON PEDESTAL..UP DOWN WHITE ARROW
-21F4..21FF    ; valid                  ;      ; NV8    # 3.2  RIGHT ARROW WITH SMALL CIRCLE..LEFT RIGHT OPEN-HEADED ARROW
-2200..222B    ; valid                  ;      ; NV8    # 1.1  FOR ALL..INTEGRAL
-222C          ; mapped                 ; 222B 222B     # 1.1  DOUBLE INTEGRAL
-222D          ; mapped                 ; 222B 222B 222B #1.1  TRIPLE INTEGRAL
-222E          ; valid                  ;      ; NV8    # 1.1  CONTOUR INTEGRAL
-222F          ; mapped                 ; 222E 222E     # 1.1  SURFACE INTEGRAL
-2230          ; mapped                 ; 222E 222E 222E #1.1  VOLUME INTEGRAL
-2231..225F    ; valid                  ;      ; NV8    # 1.1  CLOCKWISE INTEGRAL..QUESTIONED EQUAL TO
-2260          ; disallowed_STD3_valid                  # 1.1  NOT EQUAL TO
-2261..226D    ; valid                  ;      ; NV8    # 1.1  IDENTICAL TO..NOT EQUIVALENT TO
-226E..226F    ; disallowed_STD3_valid                  # 1.1  NOT LESS-THAN..NOT GREATER-THAN
-2270..22F1    ; valid                  ;      ; NV8    # 1.1  NEITHER LESS-THAN NOR EQUAL TO..DOWN RIGHT DIAGONAL ELLIPSIS
-22F2..22FF    ; valid                  ;      ; NV8    # 3.2  ELEMENT OF WITH LONG HORIZONTAL STROKE..Z NOTATION BAG MEMBERSHIP
-2300          ; valid                  ;      ; NV8    # 1.1  DIAMETER SIGN
-2301          ; valid                  ;      ; NV8    # 3.0  ELECTRIC ARROW
-2302..2328    ; valid                  ;      ; NV8    # 1.1  HOUSE..KEYBOARD
-2329          ; mapped                 ; 3008          # 1.1  LEFT-POINTING ANGLE BRACKET
-232A          ; mapped                 ; 3009          # 1.1  RIGHT-POINTING ANGLE BRACKET
-232B..237A    ; valid                  ;      ; NV8    # 1.1  ERASE TO THE LEFT..APL FUNCTIONAL SYMBOL ALPHA
-237B          ; valid                  ;      ; NV8    # 3.0  NOT CHECK MARK
-237C          ; valid                  ;      ; NV8    # 3.2  RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW
-237D..239A    ; valid                  ;      ; NV8    # 3.0  SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL
-239B..23CE    ; valid                  ;      ; NV8    # 3.2  LEFT PARENTHESIS UPPER HOOK..RETURN SYMBOL
-23CF..23D0    ; valid                  ;      ; NV8    # 4.0  EJECT SYMBOL..VERTICAL LINE EXTENSION
-23D1..23DB    ; valid                  ;      ; NV8    # 4.1  METRICAL BREVE..FUSE
-23DC..23E7    ; valid                  ;      ; NV8    # 5.0  TOP PARENTHESIS..ELECTRICAL INTERSECTION
-23E8          ; valid                  ;      ; NV8    # 5.2  DECIMAL EXPONENT SYMBOL
-23E9..23F3    ; valid                  ;      ; NV8    # 6.0  BLACK RIGHT-POINTING DOUBLE TRIANGLE..HOURGLASS WITH FLOWING SAND
-23F4..23FA    ; valid                  ;      ; NV8    # 7.0  BLACK MEDIUM LEFT-POINTING TRIANGLE..BLACK CIRCLE FOR RECORD
-23FB..23FE    ; valid                  ;      ; NV8    # 9.0  POWER SYMBOL..POWER SLEEP SYMBOL
-23FF          ; valid                  ;      ; NV8    # 10.0 OBSERVER EYE SYMBOL
-2400..2424    ; valid                  ;      ; NV8    # 1.1  SYMBOL FOR NULL..SYMBOL FOR NEWLINE
-2425..2426    ; valid                  ;      ; NV8    # 3.0  SYMBOL FOR DELETE FORM TWO..SYMBOL FOR SUBSTITUTE FORM TWO
-2427..243F    ; disallowed                             # NA   <reserved-2427>..<reserved-243F>
-2440..244A    ; valid                  ;      ; NV8    # 1.1  OCR HOOK..OCR DOUBLE BACKSLASH
-244B..245F    ; disallowed                             # NA   <reserved-244B>..<reserved-245F>
-2460          ; mapped                 ; 0031          # 1.1  CIRCLED DIGIT ONE
-2461          ; mapped                 ; 0032          # 1.1  CIRCLED DIGIT TWO
-2462          ; mapped                 ; 0033          # 1.1  CIRCLED DIGIT THREE
-2463          ; mapped                 ; 0034          # 1.1  CIRCLED DIGIT FOUR
-2464          ; mapped                 ; 0035          # 1.1  CIRCLED DIGIT FIVE
-2465          ; mapped                 ; 0036          # 1.1  CIRCLED DIGIT SIX
-2466          ; mapped                 ; 0037          # 1.1  CIRCLED DIGIT SEVEN
-2467          ; mapped                 ; 0038          # 1.1  CIRCLED DIGIT EIGHT
-2468          ; mapped                 ; 0039          # 1.1  CIRCLED DIGIT NINE
-2469          ; mapped                 ; 0031 0030     # 1.1  CIRCLED NUMBER TEN
-246A          ; mapped                 ; 0031 0031     # 1.1  CIRCLED NUMBER ELEVEN
-246B          ; mapped                 ; 0031 0032     # 1.1  CIRCLED NUMBER TWELVE
-246C          ; mapped                 ; 0031 0033     # 1.1  CIRCLED NUMBER THIRTEEN
-246D          ; mapped                 ; 0031 0034     # 1.1  CIRCLED NUMBER FOURTEEN
-246E          ; mapped                 ; 0031 0035     # 1.1  CIRCLED NUMBER FIFTEEN
-246F          ; mapped                 ; 0031 0036     # 1.1  CIRCLED NUMBER SIXTEEN
-2470          ; mapped                 ; 0031 0037     # 1.1  CIRCLED NUMBER SEVENTEEN
-2471          ; mapped                 ; 0031 0038     # 1.1  CIRCLED NUMBER EIGHTEEN
-2472          ; mapped                 ; 0031 0039     # 1.1  CIRCLED NUMBER NINETEEN
-2473          ; mapped                 ; 0032 0030     # 1.1  CIRCLED NUMBER TWENTY
-2474          ; disallowed_STD3_mapped ; 0028 0031 0029 #1.1  PARENTHESIZED DIGIT ONE
-2475          ; disallowed_STD3_mapped ; 0028 0032 0029 #1.1  PARENTHESIZED DIGIT TWO
-2476          ; disallowed_STD3_mapped ; 0028 0033 0029 #1.1  PARENTHESIZED DIGIT THREE
-2477          ; disallowed_STD3_mapped ; 0028 0034 0029 #1.1  PARENTHESIZED DIGIT FOUR
-2478          ; disallowed_STD3_mapped ; 0028 0035 0029 #1.1  PARENTHESIZED DIGIT FIVE
-2479          ; disallowed_STD3_mapped ; 0028 0036 0029 #1.1  PARENTHESIZED DIGIT SIX
-247A          ; disallowed_STD3_mapped ; 0028 0037 0029 #1.1  PARENTHESIZED DIGIT SEVEN
-247B          ; disallowed_STD3_mapped ; 0028 0038 0029 #1.1  PARENTHESIZED DIGIT EIGHT
-247C          ; disallowed_STD3_mapped ; 0028 0039 0029 #1.1  PARENTHESIZED DIGIT NINE
-247D          ; disallowed_STD3_mapped ; 0028 0031 0030 0029 #1.1 PARENTHESIZED NUMBER TEN
-247E          ; disallowed_STD3_mapped ; 0028 0031 0031 0029 #1.1 PARENTHESIZED NUMBER ELEVEN
-247F          ; disallowed_STD3_mapped ; 0028 0031 0032 0029 #1.1 PARENTHESIZED NUMBER TWELVE
-2480          ; disallowed_STD3_mapped ; 0028 0031 0033 0029 #1.1 PARENTHESIZED NUMBER THIRTEEN
-2481          ; disallowed_STD3_mapped ; 0028 0031 0034 0029 #1.1 PARENTHESIZED NUMBER FOURTEEN
-2482          ; disallowed_STD3_mapped ; 0028 0031 0035 0029 #1.1 PARENTHESIZED NUMBER FIFTEEN
-2483          ; disallowed_STD3_mapped ; 0028 0031 0036 0029 #1.1 PARENTHESIZED NUMBER SIXTEEN
-2484          ; disallowed_STD3_mapped ; 0028 0031 0037 0029 #1.1 PARENTHESIZED NUMBER SEVENTEEN
-2485          ; disallowed_STD3_mapped ; 0028 0031 0038 0029 #1.1 PARENTHESIZED NUMBER EIGHTEEN
-2486          ; disallowed_STD3_mapped ; 0028 0031 0039 0029 #1.1 PARENTHESIZED NUMBER NINETEEN
-2487          ; disallowed_STD3_mapped ; 0028 0032 0030 0029 #1.1 PARENTHESIZED NUMBER TWENTY
-2488..249B    ; disallowed                             # 1.1  DIGIT ONE FULL STOP..NUMBER TWENTY FULL STOP
-249C          ; disallowed_STD3_mapped ; 0028 0061 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER A
-249D          ; disallowed_STD3_mapped ; 0028 0062 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER B
-249E          ; disallowed_STD3_mapped ; 0028 0063 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER C
-249F          ; disallowed_STD3_mapped ; 0028 0064 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER D
-24A0          ; disallowed_STD3_mapped ; 0028 0065 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER E
-24A1          ; disallowed_STD3_mapped ; 0028 0066 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER F
-24A2          ; disallowed_STD3_mapped ; 0028 0067 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER G
-24A3          ; disallowed_STD3_mapped ; 0028 0068 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER H
-24A4          ; disallowed_STD3_mapped ; 0028 0069 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER I
-24A5          ; disallowed_STD3_mapped ; 0028 006A 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER J
-24A6          ; disallowed_STD3_mapped ; 0028 006B 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER K
-24A7          ; disallowed_STD3_mapped ; 0028 006C 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER L
-24A8          ; disallowed_STD3_mapped ; 0028 006D 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER M
-24A9          ; disallowed_STD3_mapped ; 0028 006E 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER N
-24AA          ; disallowed_STD3_mapped ; 0028 006F 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER O
-24AB          ; disallowed_STD3_mapped ; 0028 0070 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER P
-24AC          ; disallowed_STD3_mapped ; 0028 0071 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER Q
-24AD          ; disallowed_STD3_mapped ; 0028 0072 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER R
-24AE          ; disallowed_STD3_mapped ; 0028 0073 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER S
-24AF          ; disallowed_STD3_mapped ; 0028 0074 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER T
-24B0          ; disallowed_STD3_mapped ; 0028 0075 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER U
-24B1          ; disallowed_STD3_mapped ; 0028 0076 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER V
-24B2          ; disallowed_STD3_mapped ; 0028 0077 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER W
-24B3          ; disallowed_STD3_mapped ; 0028 0078 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER X
-24B4          ; disallowed_STD3_mapped ; 0028 0079 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER Y
-24B5          ; disallowed_STD3_mapped ; 0028 007A 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER Z
-24B6          ; mapped                 ; 0061          # 1.1  CIRCLED LATIN CAPITAL LETTER A
-24B7          ; mapped                 ; 0062          # 1.1  CIRCLED LATIN CAPITAL LETTER B
-24B8          ; mapped                 ; 0063          # 1.1  CIRCLED LATIN CAPITAL LETTER C
-24B9          ; mapped                 ; 0064          # 1.1  CIRCLED LATIN CAPITAL LETTER D
-24BA          ; mapped                 ; 0065          # 1.1  CIRCLED LATIN CAPITAL LETTER E
-24BB          ; mapped                 ; 0066          # 1.1  CIRCLED LATIN CAPITAL LETTER F
-24BC          ; mapped                 ; 0067          # 1.1  CIRCLED LATIN CAPITAL LETTER G
-24BD          ; mapped                 ; 0068          # 1.1  CIRCLED LATIN CAPITAL LETTER H
-24BE          ; mapped                 ; 0069          # 1.1  CIRCLED LATIN CAPITAL LETTER I
-24BF          ; mapped                 ; 006A          # 1.1  CIRCLED LATIN CAPITAL LETTER J
-24C0          ; mapped                 ; 006B          # 1.1  CIRCLED LATIN CAPITAL LETTER K
-24C1          ; mapped                 ; 006C          # 1.1  CIRCLED LATIN CAPITAL LETTER L
-24C2          ; mapped                 ; 006D          # 1.1  CIRCLED LATIN CAPITAL LETTER M
-24C3          ; mapped                 ; 006E          # 1.1  CIRCLED LATIN CAPITAL LETTER N
-24C4          ; mapped                 ; 006F          # 1.1  CIRCLED LATIN CAPITAL LETTER O
-24C5          ; mapped                 ; 0070          # 1.1  CIRCLED LATIN CAPITAL LETTER P
-24C6          ; mapped                 ; 0071          # 1.1  CIRCLED LATIN CAPITAL LETTER Q
-24C7          ; mapped                 ; 0072          # 1.1  CIRCLED LATIN CAPITAL LETTER R
-24C8          ; mapped                 ; 0073          # 1.1  CIRCLED LATIN CAPITAL LETTER S
-24C9          ; mapped                 ; 0074          # 1.1  CIRCLED LATIN CAPITAL LETTER T
-24CA          ; mapped                 ; 0075          # 1.1  CIRCLED LATIN CAPITAL LETTER U
-24CB          ; mapped                 ; 0076          # 1.1  CIRCLED LATIN CAPITAL LETTER V
-24CC          ; mapped                 ; 0077          # 1.1  CIRCLED LATIN CAPITAL LETTER W
-24CD          ; mapped                 ; 0078          # 1.1  CIRCLED LATIN CAPITAL LETTER X
-24CE          ; mapped                 ; 0079          # 1.1  CIRCLED LATIN CAPITAL LETTER Y
-24CF          ; mapped                 ; 007A          # 1.1  CIRCLED LATIN CAPITAL LETTER Z
-24D0          ; mapped                 ; 0061          # 1.1  CIRCLED LATIN SMALL LETTER A
-24D1          ; mapped                 ; 0062          # 1.1  CIRCLED LATIN SMALL LETTER B
-24D2          ; mapped                 ; 0063          # 1.1  CIRCLED LATIN SMALL LETTER C
-24D3          ; mapped                 ; 0064          # 1.1  CIRCLED LATIN SMALL LETTER D
-24D4          ; mapped                 ; 0065          # 1.1  CIRCLED LATIN SMALL LETTER E
-24D5          ; mapped                 ; 0066          # 1.1  CIRCLED LATIN SMALL LETTER F
-24D6          ; mapped                 ; 0067          # 1.1  CIRCLED LATIN SMALL LETTER G
-24D7          ; mapped                 ; 0068          # 1.1  CIRCLED LATIN SMALL LETTER H
-24D8          ; mapped                 ; 0069          # 1.1  CIRCLED LATIN SMALL LETTER I
-24D9          ; mapped                 ; 006A          # 1.1  CIRCLED LATIN SMALL LETTER J
-24DA          ; mapped                 ; 006B          # 1.1  CIRCLED LATIN SMALL LETTER K
-24DB          ; mapped                 ; 006C          # 1.1  CIRCLED LATIN SMALL LETTER L
-24DC          ; mapped                 ; 006D          # 1.1  CIRCLED LATIN SMALL LETTER M
-24DD          ; mapped                 ; 006E          # 1.1  CIRCLED LATIN SMALL LETTER N
-24DE          ; mapped                 ; 006F          # 1.1  CIRCLED LATIN SMALL LETTER O
-24DF          ; mapped                 ; 0070          # 1.1  CIRCLED LATIN SMALL LETTER P
-24E0          ; mapped                 ; 0071          # 1.1  CIRCLED LATIN SMALL LETTER Q
-24E1          ; mapped                 ; 0072          # 1.1  CIRCLED LATIN SMALL LETTER R
-24E2          ; mapped                 ; 0073          # 1.1  CIRCLED LATIN SMALL LETTER S
-24E3          ; mapped                 ; 0074          # 1.1  CIRCLED LATIN SMALL LETTER T
-24E4          ; mapped                 ; 0075          # 1.1  CIRCLED LATIN SMALL LETTER U
-24E5          ; mapped                 ; 0076          # 1.1  CIRCLED LATIN SMALL LETTER V
-24E6          ; mapped                 ; 0077          # 1.1  CIRCLED LATIN SMALL LETTER W
-24E7          ; mapped                 ; 0078          # 1.1  CIRCLED LATIN SMALL LETTER X
-24E8          ; mapped                 ; 0079          # 1.1  CIRCLED LATIN SMALL LETTER Y
-24E9          ; mapped                 ; 007A          # 1.1  CIRCLED LATIN SMALL LETTER Z
-24EA          ; mapped                 ; 0030          # 1.1  CIRCLED DIGIT ZERO
-24EB..24FE    ; valid                  ;      ; NV8    # 3.2  NEGATIVE CIRCLED NUMBER ELEVEN..DOUBLE CIRCLED NUMBER TEN
-24FF          ; valid                  ;      ; NV8    # 4.0  NEGATIVE CIRCLED DIGIT ZERO
-2500..2595    ; valid                  ;      ; NV8    # 1.1  BOX DRAWINGS LIGHT HORIZONTAL..RIGHT ONE EIGHTH BLOCK
-2596..259F    ; valid                  ;      ; NV8    # 3.2  QUADRANT LOWER LEFT..QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT
-25A0..25EF    ; valid                  ;      ; NV8    # 1.1  BLACK SQUARE..LARGE CIRCLE
-25F0..25F7    ; valid                  ;      ; NV8    # 3.0  WHITE SQUARE WITH UPPER LEFT QUADRANT..WHITE CIRCLE WITH UPPER RIGHT QUADRANT
-25F8..25FF    ; valid                  ;      ; NV8    # 3.2  UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE
-2600..2613    ; valid                  ;      ; NV8    # 1.1  BLACK SUN WITH RAYS..SALTIRE
-2614..2615    ; valid                  ;      ; NV8    # 4.0  UMBRELLA WITH RAIN DROPS..HOT BEVERAGE
-2616..2617    ; valid                  ;      ; NV8    # 3.2  WHITE SHOGI PIECE..BLACK SHOGI PIECE
-2618          ; valid                  ;      ; NV8    # 4.1  SHAMROCK
-2619          ; valid                  ;      ; NV8    # 3.0  REVERSED ROTATED FLORAL HEART BULLET
-261A..266F    ; valid                  ;      ; NV8    # 1.1  BLACK LEFT POINTING INDEX..MUSIC SHARP SIGN
-2670..2671    ; valid                  ;      ; NV8    # 3.0  WEST SYRIAC CROSS..EAST SYRIAC CROSS
-2672..267D    ; valid                  ;      ; NV8    # 3.2  UNIVERSAL RECYCLING SYMBOL..PARTIALLY-RECYCLED PAPER SYMBOL
-267E..267F    ; valid                  ;      ; NV8    # 4.1  PERMANENT PAPER SIGN..WHEELCHAIR SYMBOL
-2680..2689    ; valid                  ;      ; NV8    # 3.2  DIE FACE-1..BLACK CIRCLE WITH TWO WHITE DOTS
-268A..2691    ; valid                  ;      ; NV8    # 4.0  MONOGRAM FOR YANG..BLACK FLAG
-2692..269C    ; valid                  ;      ; NV8    # 4.1  HAMMER AND PICK..FLEUR-DE-LIS
-269D          ; valid                  ;      ; NV8    # 5.1  OUTLINED WHITE STAR
-269E..269F    ; valid                  ;      ; NV8    # 5.2  THREE LINES CONVERGING RIGHT..THREE LINES CONVERGING LEFT
-26A0..26A1    ; valid                  ;      ; NV8    # 4.0  WARNING SIGN..HIGH VOLTAGE SIGN
-26A2..26B1    ; valid                  ;      ; NV8    # 4.1  DOUBLED FEMALE SIGN..FUNERAL URN
-26B2          ; valid                  ;      ; NV8    # 5.0  NEUTER
-26B3..26BC    ; valid                  ;      ; NV8    # 5.1  CERES..SESQUIQUADRATE
-26BD..26BF    ; valid                  ;      ; NV8    # 5.2  SOCCER BALL..SQUARED KEY
-26C0..26C3    ; valid                  ;      ; NV8    # 5.1  WHITE DRAUGHTS MAN..BLACK DRAUGHTS KING
-26C4..26CD    ; valid                  ;      ; NV8    # 5.2  SNOWMAN WITHOUT SNOW..DISABLED CAR
-26CE          ; valid                  ;      ; NV8    # 6.0  OPHIUCHUS
-26CF..26E1    ; valid                  ;      ; NV8    # 5.2  PICK..RESTRICTED LEFT ENTRY-2
-26E2          ; valid                  ;      ; NV8    # 6.0  ASTRONOMICAL SYMBOL FOR URANUS
-26E3          ; valid                  ;      ; NV8    # 5.2  HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE
-26E4..26E7    ; valid                  ;      ; NV8    # 6.0  PENTAGRAM..INVERTED PENTAGRAM
-26E8..26FF    ; valid                  ;      ; NV8    # 5.2  BLACK CROSS ON SHIELD..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE
-2700          ; valid                  ;      ; NV8    # 7.0  BLACK SAFETY SCISSORS
-2701..2704    ; valid                  ;      ; NV8    # 1.1  UPPER BLADE SCISSORS..WHITE SCISSORS
-2705          ; valid                  ;      ; NV8    # 6.0  WHITE HEAVY CHECK MARK
-2706..2709    ; valid                  ;      ; NV8    # 1.1  TELEPHONE LOCATION SIGN..ENVELOPE
-270A..270B    ; valid                  ;      ; NV8    # 6.0  RAISED FIST..RAISED HAND
-270C..2727    ; valid                  ;      ; NV8    # 1.1  VICTORY HAND..WHITE FOUR POINTED STAR
-2728          ; valid                  ;      ; NV8    # 6.0  SPARKLES
-2729..274B    ; valid                  ;      ; NV8    # 1.1  STRESS OUTLINED WHITE STAR..HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
-274C          ; valid                  ;      ; NV8    # 6.0  CROSS MARK
-274D          ; valid                  ;      ; NV8    # 1.1  SHADOWED WHITE CIRCLE
-274E          ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED CROSS MARK
-274F..2752    ; valid                  ;      ; NV8    # 1.1  LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPER RIGHT SHADOWED WHITE SQUARE
-2753..2755    ; valid                  ;      ; NV8    # 6.0  BLACK QUESTION MARK ORNAMENT..WHITE EXCLAMATION MARK ORNAMENT
-2756          ; valid                  ;      ; NV8    # 1.1  BLACK DIAMOND MINUS WHITE X
-2757          ; valid                  ;      ; NV8    # 5.2  HEAVY EXCLAMATION MARK SYMBOL
-2758..275E    ; valid                  ;      ; NV8    # 1.1  LIGHT VERTICAL BAR..HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
-275F..2760    ; valid                  ;      ; NV8    # 6.0  HEAVY LOW SINGLE COMMA QUOTATION MARK ORNAMENT..HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT
-2761..2767    ; valid                  ;      ; NV8    # 1.1  CURVED STEM PARAGRAPH SIGN ORNAMENT..ROTATED FLORAL HEART BULLET
-2768..2775    ; valid                  ;      ; NV8    # 3.2  MEDIUM LEFT PARENTHESIS ORNAMENT..MEDIUM RIGHT CURLY BRACKET ORNAMENT
-2776..2794    ; valid                  ;      ; NV8    # 1.1  DINGBAT NEGATIVE CIRCLED DIGIT ONE..HEAVY WIDE-HEADED RIGHTWARDS ARROW
-2795..2797    ; valid                  ;      ; NV8    # 6.0  HEAVY PLUS SIGN..HEAVY DIVISION SIGN
-2798..27AF    ; valid                  ;      ; NV8    # 1.1  HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-27B0          ; valid                  ;      ; NV8    # 6.0  CURLY LOOP
-27B1..27BE    ; valid                  ;      ; NV8    # 1.1  NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW..OPEN-OUTLINED RIGHTWARDS ARROW
-27BF          ; valid                  ;      ; NV8    # 6.0  DOUBLE CURLY LOOP
-27C0..27C6    ; valid                  ;      ; NV8    # 4.1  THREE DIMENSIONAL ANGLE..RIGHT S-SHAPED BAG DELIMITER
-27C7..27CA    ; valid                  ;      ; NV8    # 5.0  OR WITH DOT INSIDE..VERTICAL BAR WITH HORIZONTAL STROKE
-27CB          ; valid                  ;      ; NV8    # 6.1  MATHEMATICAL RISING DIAGONAL
-27CC          ; valid                  ;      ; NV8    # 5.1  LONG DIVISION
-27CD          ; valid                  ;      ; NV8    # 6.1  MATHEMATICAL FALLING DIAGONAL
-27CE..27CF    ; valid                  ;      ; NV8    # 6.0  SQUARED LOGICAL AND..SQUARED LOGICAL OR
-27D0..27EB    ; valid                  ;      ; NV8    # 3.2  WHITE DIAMOND WITH CENTRED DOT..MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
-27EC..27EF    ; valid                  ;      ; NV8    # 5.1  MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET..MATHEMATICAL RIGHT FLATTENED PARENTHESIS
-27F0..27FF    ; valid                  ;      ; NV8    # 3.2  UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW
-2800..28FF    ; valid                  ;      ; NV8    # 3.0  BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678
-2900..2A0B    ; valid                  ;      ; NV8    # 3.2  RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..SUMMATION WITH INTEGRAL
-2A0C          ; mapped                 ; 222B 222B 222B 222B #3.2 QUADRUPLE INTEGRAL OPERATOR
-2A0D..2A73    ; valid                  ;      ; NV8    # 3.2  FINITE PART INTEGRAL..EQUALS SIGN ABOVE TILDE OPERATOR
-2A74          ; disallowed_STD3_mapped ; 003A 003A 003D #3.2  DOUBLE COLON EQUAL
-2A75          ; disallowed_STD3_mapped ; 003D 003D     # 3.2  TWO CONSECUTIVE EQUALS SIGNS
-2A76          ; disallowed_STD3_mapped ; 003D 003D 003D #3.2  THREE CONSECUTIVE EQUALS SIGNS
-2A77..2ADB    ; valid                  ;      ; NV8    # 3.2  EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW..TRANSVERSAL INTERSECTION
-2ADC          ; mapped                 ; 2ADD 0338     # 3.2  FORKING
-2ADD..2AFF    ; valid                  ;      ; NV8    # 3.2  NONFORKING..N-ARY WHITE VERTICAL BAR
-2B00..2B0D    ; valid                  ;      ; NV8    # 4.0  NORTH EAST WHITE ARROW..UP DOWN BLACK ARROW
-2B0E..2B13    ; valid                  ;      ; NV8    # 4.1  RIGHTWARDS ARROW WITH TIP DOWNWARDS..SQUARE WITH BOTTOM HALF BLACK
-2B14..2B1A    ; valid                  ;      ; NV8    # 5.0  SQUARE WITH UPPER RIGHT DIAGONAL HALF BLACK..DOTTED SQUARE
-2B1B..2B1F    ; valid                  ;      ; NV8    # 5.1  BLACK LARGE SQUARE..BLACK PENTAGON
-2B20..2B23    ; valid                  ;      ; NV8    # 5.0  WHITE PENTAGON..HORIZONTAL BLACK HEXAGON
-2B24..2B4C    ; valid                  ;      ; NV8    # 5.1  BLACK LARGE CIRCLE..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
-2B4D..2B4F    ; valid                  ;      ; NV8    # 7.0  DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..SHORT BACKSLANTED SOUTH ARROW
-2B50..2B54    ; valid                  ;      ; NV8    # 5.1  WHITE MEDIUM STAR..WHITE RIGHT-POINTING PENTAGON
-2B55..2B59    ; valid                  ;      ; NV8    # 5.2  HEAVY LARGE CIRCLE..HEAVY CIRCLED SALTIRE
-2B5A..2B73    ; valid                  ;      ; NV8    # 7.0  SLANTED NORTH ARROW WITH HOOKED HEAD..DOWNWARDS TRIANGLE-HEADED ARROW TO BAR
-2B74..2B75    ; disallowed                             # NA   <reserved-2B74>..<reserved-2B75>
-2B76..2B95    ; valid                  ;      ; NV8    # 7.0  NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
-2B96..2B97    ; disallowed                             # NA   <reserved-2B96>..<reserved-2B97>
-2B98..2BB9    ; valid                  ;      ; NV8    # 7.0  THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD..UP ARROWHEAD IN A RECTANGLE BOX
-2BBA..2BBC    ; disallowed                             # NA   <reserved-2BBA>..<reserved-2BBC>
-2BBD..2BC8    ; valid                  ;      ; NV8    # 7.0  BALLOT BOX WITH LIGHT X..BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
-2BC9          ; disallowed                             # NA   <reserved-2BC9>
-2BCA..2BD1    ; valid                  ;      ; NV8    # 7.0  TOP HALF BLACK CIRCLE..UNCERTAINTY SIGN
-2BD2          ; valid                  ;      ; NV8    # 10.0 GROUP MARK
-2BD3..2BEB    ; disallowed                             # NA   <reserved-2BD3>..<reserved-2BEB>
-2BEC..2BEF    ; valid                  ;      ; NV8    # 8.0  LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS..DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS
-2BF0..2BFF    ; disallowed                             # NA   <reserved-2BF0>..<reserved-2BFF>
-2C00          ; mapped                 ; 2C30          # 4.1  GLAGOLITIC CAPITAL LETTER AZU
-2C01          ; mapped                 ; 2C31          # 4.1  GLAGOLITIC CAPITAL LETTER BUKY
-2C02          ; mapped                 ; 2C32          # 4.1  GLAGOLITIC CAPITAL LETTER VEDE
-2C03          ; mapped                 ; 2C33          # 4.1  GLAGOLITIC CAPITAL LETTER GLAGOLI
-2C04          ; mapped                 ; 2C34          # 4.1  GLAGOLITIC CAPITAL LETTER DOBRO
-2C05          ; mapped                 ; 2C35          # 4.1  GLAGOLITIC CAPITAL LETTER YESTU
-2C06          ; mapped                 ; 2C36          # 4.1  GLAGOLITIC CAPITAL LETTER ZHIVETE
-2C07          ; mapped                 ; 2C37          # 4.1  GLAGOLITIC CAPITAL LETTER DZELO
-2C08          ; mapped                 ; 2C38          # 4.1  GLAGOLITIC CAPITAL LETTER ZEMLJA
-2C09          ; mapped                 ; 2C39          # 4.1  GLAGOLITIC CAPITAL LETTER IZHE
-2C0A          ; mapped                 ; 2C3A          # 4.1  GLAGOLITIC CAPITAL LETTER INITIAL IZHE
-2C0B          ; mapped                 ; 2C3B          # 4.1  GLAGOLITIC CAPITAL LETTER I
-2C0C          ; mapped                 ; 2C3C          # 4.1  GLAGOLITIC CAPITAL LETTER DJERVI
-2C0D          ; mapped                 ; 2C3D          # 4.1  GLAGOLITIC CAPITAL LETTER KAKO
-2C0E          ; mapped                 ; 2C3E          # 4.1  GLAGOLITIC CAPITAL LETTER LJUDIJE
-2C0F          ; mapped                 ; 2C3F          # 4.1  GLAGOLITIC CAPITAL LETTER MYSLITE
-2C10          ; mapped                 ; 2C40          # 4.1  GLAGOLITIC CAPITAL LETTER NASHI
-2C11          ; mapped                 ; 2C41          # 4.1  GLAGOLITIC CAPITAL LETTER ONU
-2C12          ; mapped                 ; 2C42          # 4.1  GLAGOLITIC CAPITAL LETTER POKOJI
-2C13          ; mapped                 ; 2C43          # 4.1  GLAGOLITIC CAPITAL LETTER RITSI
-2C14          ; mapped                 ; 2C44          # 4.1  GLAGOLITIC CAPITAL LETTER SLOVO
-2C15          ; mapped                 ; 2C45          # 4.1  GLAGOLITIC CAPITAL LETTER TVRIDO
-2C16          ; mapped                 ; 2C46          # 4.1  GLAGOLITIC CAPITAL LETTER UKU
-2C17          ; mapped                 ; 2C47          # 4.1  GLAGOLITIC CAPITAL LETTER FRITU
-2C18          ; mapped                 ; 2C48          # 4.1  GLAGOLITIC CAPITAL LETTER HERU
-2C19          ; mapped                 ; 2C49          # 4.1  GLAGOLITIC CAPITAL LETTER OTU
-2C1A          ; mapped                 ; 2C4A          # 4.1  GLAGOLITIC CAPITAL LETTER PE
-2C1B          ; mapped                 ; 2C4B          # 4.1  GLAGOLITIC CAPITAL LETTER SHTA
-2C1C          ; mapped                 ; 2C4C          # 4.1  GLAGOLITIC CAPITAL LETTER TSI
-2C1D          ; mapped                 ; 2C4D          # 4.1  GLAGOLITIC CAPITAL LETTER CHRIVI
-2C1E          ; mapped                 ; 2C4E          # 4.1  GLAGOLITIC CAPITAL LETTER SHA
-2C1F          ; mapped                 ; 2C4F          # 4.1  GLAGOLITIC CAPITAL LETTER YERU
-2C20          ; mapped                 ; 2C50          # 4.1  GLAGOLITIC CAPITAL LETTER YERI
-2C21          ; mapped                 ; 2C51          # 4.1  GLAGOLITIC CAPITAL LETTER YATI
-2C22          ; mapped                 ; 2C52          # 4.1  GLAGOLITIC CAPITAL LETTER SPIDERY HA
-2C23          ; mapped                 ; 2C53          # 4.1  GLAGOLITIC CAPITAL LETTER YU
-2C24          ; mapped                 ; 2C54          # 4.1  GLAGOLITIC CAPITAL LETTER SMALL YUS
-2C25          ; mapped                 ; 2C55          # 4.1  GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL
-2C26          ; mapped                 ; 2C56          # 4.1  GLAGOLITIC CAPITAL LETTER YO
-2C27          ; mapped                 ; 2C57          # 4.1  GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS
-2C28          ; mapped                 ; 2C58          # 4.1  GLAGOLITIC CAPITAL LETTER BIG YUS
-2C29          ; mapped                 ; 2C59          # 4.1  GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS
-2C2A          ; mapped                 ; 2C5A          # 4.1  GLAGOLITIC CAPITAL LETTER FITA
-2C2B          ; mapped                 ; 2C5B          # 4.1  GLAGOLITIC CAPITAL LETTER IZHITSA
-2C2C          ; mapped                 ; 2C5C          # 4.1  GLAGOLITIC CAPITAL LETTER SHTAPIC
-2C2D          ; mapped                 ; 2C5D          # 4.1  GLAGOLITIC CAPITAL LETTER TROKUTASTI A
-2C2E          ; mapped                 ; 2C5E          # 4.1  GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
-2C2F          ; disallowed                             # NA   <reserved-2C2F>
-2C30..2C5E    ; valid                                  # 4.1  GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE
-2C5F          ; disallowed                             # NA   <reserved-2C5F>
-2C60          ; mapped                 ; 2C61          # 5.0  LATIN CAPITAL LETTER L WITH DOUBLE BAR
-2C61          ; valid                                  # 5.0  LATIN SMALL LETTER L WITH DOUBLE BAR
-2C62          ; mapped                 ; 026B          # 5.0  LATIN CAPITAL LETTER L WITH MIDDLE TILDE
-2C63          ; mapped                 ; 1D7D          # 5.0  LATIN CAPITAL LETTER P WITH STROKE
-2C64          ; mapped                 ; 027D          # 5.0  LATIN CAPITAL LETTER R WITH TAIL
-2C65..2C66    ; valid                                  # 5.0  LATIN SMALL LETTER A WITH STROKE..LATIN SMALL LETTER T WITH DIAGONAL STROKE
-2C67          ; mapped                 ; 2C68          # 5.0  LATIN CAPITAL LETTER H WITH DESCENDER
-2C68          ; valid                                  # 5.0  LATIN SMALL LETTER H WITH DESCENDER
-2C69          ; mapped                 ; 2C6A          # 5.0  LATIN CAPITAL LETTER K WITH DESCENDER
-2C6A          ; valid                                  # 5.0  LATIN SMALL LETTER K WITH DESCENDER
-2C6B          ; mapped                 ; 2C6C          # 5.0  LATIN CAPITAL LETTER Z WITH DESCENDER
-2C6C          ; valid                                  # 5.0  LATIN SMALL LETTER Z WITH DESCENDER
-2C6D          ; mapped                 ; 0251          # 5.1  LATIN CAPITAL LETTER ALPHA
-2C6E          ; mapped                 ; 0271          # 5.1  LATIN CAPITAL LETTER M WITH HOOK
-2C6F          ; mapped                 ; 0250          # 5.1  LATIN CAPITAL LETTER TURNED A
-2C70          ; mapped                 ; 0252          # 5.2  LATIN CAPITAL LETTER TURNED ALPHA
-2C71          ; valid                                  # 5.1  LATIN SMALL LETTER V WITH RIGHT HOOK
-2C72          ; mapped                 ; 2C73          # 5.1  LATIN CAPITAL LETTER W WITH HOOK
-2C73          ; valid                                  # 5.1  LATIN SMALL LETTER W WITH HOOK
-2C74          ; valid                                  # 5.0  LATIN SMALL LETTER V WITH CURL
-2C75          ; mapped                 ; 2C76          # 5.0  LATIN CAPITAL LETTER HALF H
-2C76..2C77    ; valid                                  # 5.0  LATIN SMALL LETTER HALF H..LATIN SMALL LETTER TAILLESS PHI
-2C78..2C7B    ; valid                                  # 5.1  LATIN SMALL LETTER E WITH NOTCH..LATIN LETTER SMALL CAPITAL TURNED E
-2C7C          ; mapped                 ; 006A          # 5.1  LATIN SUBSCRIPT SMALL LETTER J
-2C7D          ; mapped                 ; 0076          # 5.1  MODIFIER LETTER CAPITAL V
-2C7E          ; mapped                 ; 023F          # 5.2  LATIN CAPITAL LETTER S WITH SWASH TAIL
-2C7F          ; mapped                 ; 0240          # 5.2  LATIN CAPITAL LETTER Z WITH SWASH TAIL
-2C80          ; mapped                 ; 2C81          # 4.1  COPTIC CAPITAL LETTER ALFA
-2C81          ; valid                                  # 4.1  COPTIC SMALL LETTER ALFA
-2C82          ; mapped                 ; 2C83          # 4.1  COPTIC CAPITAL LETTER VIDA
-2C83          ; valid                                  # 4.1  COPTIC SMALL LETTER VIDA
-2C84          ; mapped                 ; 2C85          # 4.1  COPTIC CAPITAL LETTER GAMMA
-2C85          ; valid                                  # 4.1  COPTIC SMALL LETTER GAMMA
-2C86          ; mapped                 ; 2C87          # 4.1  COPTIC CAPITAL LETTER DALDA
-2C87          ; valid                                  # 4.1  COPTIC SMALL LETTER DALDA
-2C88          ; mapped                 ; 2C89          # 4.1  COPTIC CAPITAL LETTER EIE
-2C89          ; valid                                  # 4.1  COPTIC SMALL LETTER EIE
-2C8A          ; mapped                 ; 2C8B          # 4.1  COPTIC CAPITAL LETTER SOU
-2C8B          ; valid                                  # 4.1  COPTIC SMALL LETTER SOU
-2C8C          ; mapped                 ; 2C8D          # 4.1  COPTIC CAPITAL LETTER ZATA
-2C8D          ; valid                                  # 4.1  COPTIC SMALL LETTER ZATA
-2C8E          ; mapped                 ; 2C8F          # 4.1  COPTIC CAPITAL LETTER HATE
-2C8F          ; valid                                  # 4.1  COPTIC SMALL LETTER HATE
-2C90          ; mapped                 ; 2C91          # 4.1  COPTIC CAPITAL LETTER THETHE
-2C91          ; valid                                  # 4.1  COPTIC SMALL LETTER THETHE
-2C92          ; mapped                 ; 2C93          # 4.1  COPTIC CAPITAL LETTER IAUDA
-2C93          ; valid                                  # 4.1  COPTIC SMALL LETTER IAUDA
-2C94          ; mapped                 ; 2C95          # 4.1  COPTIC CAPITAL LETTER KAPA
-2C95          ; valid                                  # 4.1  COPTIC SMALL LETTER KAPA
-2C96          ; mapped                 ; 2C97          # 4.1  COPTIC CAPITAL LETTER LAULA
-2C97          ; valid                                  # 4.1  COPTIC SMALL LETTER LAULA
-2C98          ; mapped                 ; 2C99          # 4.1  COPTIC CAPITAL LETTER MI
-2C99          ; valid                                  # 4.1  COPTIC SMALL LETTER MI
-2C9A          ; mapped                 ; 2C9B          # 4.1  COPTIC CAPITAL LETTER NI
-2C9B          ; valid                                  # 4.1  COPTIC SMALL LETTER NI
-2C9C          ; mapped                 ; 2C9D          # 4.1  COPTIC CAPITAL LETTER KSI
-2C9D          ; valid                                  # 4.1  COPTIC SMALL LETTER KSI
-2C9E          ; mapped                 ; 2C9F          # 4.1  COPTIC CAPITAL LETTER O
-2C9F          ; valid                                  # 4.1  COPTIC SMALL LETTER O
-2CA0          ; mapped                 ; 2CA1          # 4.1  COPTIC CAPITAL LETTER PI
-2CA1          ; valid                                  # 4.1  COPTIC SMALL LETTER PI
-2CA2          ; mapped                 ; 2CA3          # 4.1  COPTIC CAPITAL LETTER RO
-2CA3          ; valid                                  # 4.1  COPTIC SMALL LETTER RO
-2CA4          ; mapped                 ; 2CA5          # 4.1  COPTIC CAPITAL LETTER SIMA
-2CA5          ; valid                                  # 4.1  COPTIC SMALL LETTER SIMA
-2CA6          ; mapped                 ; 2CA7          # 4.1  COPTIC CAPITAL LETTER TAU
-2CA7          ; valid                                  # 4.1  COPTIC SMALL LETTER TAU
-2CA8          ; mapped                 ; 2CA9          # 4.1  COPTIC CAPITAL LETTER UA
-2CA9          ; valid                                  # 4.1  COPTIC SMALL LETTER UA
-2CAA          ; mapped                 ; 2CAB          # 4.1  COPTIC CAPITAL LETTER FI
-2CAB          ; valid                                  # 4.1  COPTIC SMALL LETTER FI
-2CAC          ; mapped                 ; 2CAD          # 4.1  COPTIC CAPITAL LETTER KHI
-2CAD          ; valid                                  # 4.1  COPTIC SMALL LETTER KHI
-2CAE          ; mapped                 ; 2CAF          # 4.1  COPTIC CAPITAL LETTER PSI
-2CAF          ; valid                                  # 4.1  COPTIC SMALL LETTER PSI
-2CB0          ; mapped                 ; 2CB1          # 4.1  COPTIC CAPITAL LETTER OOU
-2CB1          ; valid                                  # 4.1  COPTIC SMALL LETTER OOU
-2CB2          ; mapped                 ; 2CB3          # 4.1  COPTIC CAPITAL LETTER DIALECT-P ALEF
-2CB3          ; valid                                  # 4.1  COPTIC SMALL LETTER DIALECT-P ALEF
-2CB4          ; mapped                 ; 2CB5          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC AIN
-2CB5          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC AIN
-2CB6          ; mapped                 ; 2CB7          # 4.1  COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE
-2CB7          ; valid                                  # 4.1  COPTIC SMALL LETTER CRYPTOGRAMMIC EIE
-2CB8          ; mapped                 ; 2CB9          # 4.1  COPTIC CAPITAL LETTER DIALECT-P KAPA
-2CB9          ; valid                                  # 4.1  COPTIC SMALL LETTER DIALECT-P KAPA
-2CBA          ; mapped                 ; 2CBB          # 4.1  COPTIC CAPITAL LETTER DIALECT-P NI
-2CBB          ; valid                                  # 4.1  COPTIC SMALL LETTER DIALECT-P NI
-2CBC          ; mapped                 ; 2CBD          # 4.1  COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI
-2CBD          ; valid                                  # 4.1  COPTIC SMALL LETTER CRYPTOGRAMMIC NI
-2CBE          ; mapped                 ; 2CBF          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC OOU
-2CBF          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC OOU
-2CC0          ; mapped                 ; 2CC1          # 4.1  COPTIC CAPITAL LETTER SAMPI
-2CC1          ; valid                                  # 4.1  COPTIC SMALL LETTER SAMPI
-2CC2          ; mapped                 ; 2CC3          # 4.1  COPTIC CAPITAL LETTER CROSSED SHEI
-2CC3          ; valid                                  # 4.1  COPTIC SMALL LETTER CROSSED SHEI
-2CC4          ; mapped                 ; 2CC5          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC SHEI
-2CC5          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC SHEI
-2CC6          ; mapped                 ; 2CC7          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC ESH
-2CC7          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC ESH
-2CC8          ; mapped                 ; 2CC9          # 4.1  COPTIC CAPITAL LETTER AKHMIMIC KHEI
-2CC9          ; valid                                  # 4.1  COPTIC SMALL LETTER AKHMIMIC KHEI
-2CCA          ; mapped                 ; 2CCB          # 4.1  COPTIC CAPITAL LETTER DIALECT-P HORI
-2CCB          ; valid                                  # 4.1  COPTIC SMALL LETTER DIALECT-P HORI
-2CCC          ; mapped                 ; 2CCD          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC HORI
-2CCD          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC HORI
-2CCE          ; mapped                 ; 2CCF          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC HA
-2CCF          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC HA
-2CD0          ; mapped                 ; 2CD1          # 4.1  COPTIC CAPITAL LETTER L-SHAPED HA
-2CD1          ; valid                                  # 4.1  COPTIC SMALL LETTER L-SHAPED HA
-2CD2          ; mapped                 ; 2CD3          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC HEI
-2CD3          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC HEI
-2CD4          ; mapped                 ; 2CD5          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC HAT
-2CD5          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC HAT
-2CD6          ; mapped                 ; 2CD7          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC GANGIA
-2CD7          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC GANGIA
-2CD8          ; mapped                 ; 2CD9          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC DJA
-2CD9          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC DJA
-2CDA          ; mapped                 ; 2CDB          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC SHIMA
-2CDB          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC SHIMA
-2CDC          ; mapped                 ; 2CDD          # 4.1  COPTIC CAPITAL LETTER OLD NUBIAN SHIMA
-2CDD          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD NUBIAN SHIMA
-2CDE          ; mapped                 ; 2CDF          # 4.1  COPTIC CAPITAL LETTER OLD NUBIAN NGI
-2CDF          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD NUBIAN NGI
-2CE0          ; mapped                 ; 2CE1          # 4.1  COPTIC CAPITAL LETTER OLD NUBIAN NYI
-2CE1          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD NUBIAN NYI
-2CE2          ; mapped                 ; 2CE3          # 4.1  COPTIC CAPITAL LETTER OLD NUBIAN WAU
-2CE3..2CE4    ; valid                                  # 4.1  COPTIC SMALL LETTER OLD NUBIAN WAU..COPTIC SYMBOL KAI
-2CE5..2CEA    ; valid                  ;      ; NV8    # 4.1  COPTIC SYMBOL MI RO..COPTIC SYMBOL SHIMA SIMA
-2CEB          ; mapped                 ; 2CEC          # 5.2  COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI
-2CEC          ; valid                                  # 5.2  COPTIC SMALL LETTER CRYPTOGRAMMIC SHEI
-2CED          ; mapped                 ; 2CEE          # 5.2  COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA
-2CEE..2CF1    ; valid                                  # 5.2  COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA..COPTIC COMBINING SPIRITUS LENIS
-2CF2          ; mapped                 ; 2CF3          # 6.1  COPTIC CAPITAL LETTER BOHAIRIC KHEI
-2CF3          ; valid                                  # 6.1  COPTIC SMALL LETTER BOHAIRIC KHEI
-2CF4..2CF8    ; disallowed                             # NA   <reserved-2CF4>..<reserved-2CF8>
-2CF9..2CFF    ; valid                  ;      ; NV8    # 4.1  COPTIC OLD NUBIAN FULL STOP..COPTIC MORPHOLOGICAL DIVIDER
-2D00..2D25    ; valid                                  # 4.1  GEORGIAN SMALL LETTER AN..GEORGIAN SMALL LETTER HOE
-2D26          ; disallowed                             # NA   <reserved-2D26>
-2D27          ; valid                                  # 6.1  GEORGIAN SMALL LETTER YN
-2D28..2D2C    ; disallowed                             # NA   <reserved-2D28>..<reserved-2D2C>
-2D2D          ; valid                                  # 6.1  GEORGIAN SMALL LETTER AEN
-2D2E..2D2F    ; disallowed                             # NA   <reserved-2D2E>..<reserved-2D2F>
-2D30..2D65    ; valid                                  # 4.1  TIFINAGH LETTER YA..TIFINAGH LETTER YAZZ
-2D66..2D67    ; valid                                  # 6.1  TIFINAGH LETTER YE..TIFINAGH LETTER YO
-2D68..2D6E    ; disallowed                             # NA   <reserved-2D68>..<reserved-2D6E>
-2D6F          ; mapped                 ; 2D61          # 4.1  TIFINAGH MODIFIER LETTER LABIALIZATION MARK
-2D70          ; valid                  ;      ; NV8    # 6.0  TIFINAGH SEPARATOR MARK
-2D71..2D7E    ; disallowed                             # NA   <reserved-2D71>..<reserved-2D7E>
-2D7F          ; valid                                  # 6.0  TIFINAGH CONSONANT JOINER
-2D80..2D96    ; valid                                  # 4.1  ETHIOPIC SYLLABLE LOA..ETHIOPIC SYLLABLE GGWE
-2D97..2D9F    ; disallowed                             # NA   <reserved-2D97>..<reserved-2D9F>
-2DA0..2DA6    ; valid                                  # 4.1  ETHIOPIC SYLLABLE SSA..ETHIOPIC SYLLABLE SSO
-2DA7          ; disallowed                             # NA   <reserved-2DA7>
-2DA8..2DAE    ; valid                                  # 4.1  ETHIOPIC SYLLABLE CCA..ETHIOPIC SYLLABLE CCO
-2DAF          ; disallowed                             # NA   <reserved-2DAF>
-2DB0..2DB6    ; valid                                  # 4.1  ETHIOPIC SYLLABLE ZZA..ETHIOPIC SYLLABLE ZZO
-2DB7          ; disallowed                             # NA   <reserved-2DB7>
-2DB8..2DBE    ; valid                                  # 4.1  ETHIOPIC SYLLABLE CCHA..ETHIOPIC SYLLABLE CCHO
-2DBF          ; disallowed                             # NA   <reserved-2DBF>
-2DC0..2DC6    ; valid                                  # 4.1  ETHIOPIC SYLLABLE QYA..ETHIOPIC SYLLABLE QYO
-2DC7          ; disallowed                             # NA   <reserved-2DC7>
-2DC8..2DCE    ; valid                                  # 4.1  ETHIOPIC SYLLABLE KYA..ETHIOPIC SYLLABLE KYO
-2DCF          ; disallowed                             # NA   <reserved-2DCF>
-2DD0..2DD6    ; valid                                  # 4.1  ETHIOPIC SYLLABLE XYA..ETHIOPIC SYLLABLE XYO
-2DD7          ; disallowed                             # NA   <reserved-2DD7>
-2DD8..2DDE    ; valid                                  # 4.1  ETHIOPIC SYLLABLE GYA..ETHIOPIC SYLLABLE GYO
-2DDF          ; disallowed                             # NA   <reserved-2DDF>
-2DE0..2DFF    ; valid                                  # 5.1  COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS
-2E00..2E17    ; valid                  ;      ; NV8    # 4.1  RIGHT ANGLE SUBSTITUTION MARKER..DOUBLE OBLIQUE HYPHEN
-2E18..2E1B    ; valid                  ;      ; NV8    # 5.1  INVERTED INTERROBANG..TILDE WITH RING ABOVE
-2E1C..2E1D    ; valid                  ;      ; NV8    # 4.1  LEFT LOW PARAPHRASE BRACKET..RIGHT LOW PARAPHRASE BRACKET
-2E1E..2E2E    ; valid                  ;      ; NV8    # 5.1  TILDE WITH DOT ABOVE..REVERSED QUESTION MARK
-2E2F          ; valid                                  # 5.1  VERTICAL TILDE
-2E30          ; valid                  ;      ; NV8    # 5.1  RING POINT
-2E31          ; valid                  ;      ; NV8    # 5.2  WORD SEPARATOR MIDDLE DOT
-2E32..2E3B    ; valid                  ;      ; NV8    # 6.1  TURNED COMMA..THREE-EM DASH
-2E3C..2E42    ; valid                  ;      ; NV8    # 7.0  STENOGRAPHIC FULL STOP..DOUBLE LOW-REVERSED-9 QUOTATION MARK
-2E43..2E44    ; valid                  ;      ; NV8    # 9.0  DASH WITH LEFT UPTURN..DOUBLE SUSPENSION MARK
-2E45..2E49    ; valid                  ;      ; NV8    # 10.0 INVERTED LOW KAVYKA..DOUBLE STACKED COMMA
-2E4A..2E7F    ; disallowed                             # NA   <reserved-2E4A>..<reserved-2E7F>
-2E80..2E99    ; valid                  ;      ; NV8    # 3.0  CJK RADICAL REPEAT..CJK RADICAL RAP
-2E9A          ; disallowed                             # NA   <reserved-2E9A>
-2E9B..2E9E    ; valid                  ;      ; NV8    # 3.0  CJK RADICAL CHOKE..CJK RADICAL DEATH
-2E9F          ; mapped                 ; 6BCD          # 3.0  CJK RADICAL MOTHER
-2EA0..2EF2    ; valid                  ;      ; NV8    # 3.0  CJK RADICAL CIVILIAN..CJK RADICAL J-SIMPLIFIED TURTLE
-2EF3          ; mapped                 ; 9F9F          # 3.0  CJK RADICAL C-SIMPLIFIED TURTLE
-2EF4..2EFF    ; disallowed                             # NA   <reserved-2EF4>..<reserved-2EFF>
-2F00          ; mapped                 ; 4E00          # 3.0  KANGXI RADICAL ONE
-2F01          ; mapped                 ; 4E28          # 3.0  KANGXI RADICAL LINE
-2F02          ; mapped                 ; 4E36          # 3.0  KANGXI RADICAL DOT
-2F03          ; mapped                 ; 4E3F          # 3.0  KANGXI RADICAL SLASH
-2F04          ; mapped                 ; 4E59          # 3.0  KANGXI RADICAL SECOND
-2F05          ; mapped                 ; 4E85          # 3.0  KANGXI RADICAL HOOK
-2F06          ; mapped                 ; 4E8C          # 3.0  KANGXI RADICAL TWO
-2F07          ; mapped                 ; 4EA0          # 3.0  KANGXI RADICAL LID
-2F08          ; mapped                 ; 4EBA          # 3.0  KANGXI RADICAL MAN
-2F09          ; mapped                 ; 513F          # 3.0  KANGXI RADICAL LEGS
-2F0A          ; mapped                 ; 5165          # 3.0  KANGXI RADICAL ENTER
-2F0B          ; mapped                 ; 516B          # 3.0  KANGXI RADICAL EIGHT
-2F0C          ; mapped                 ; 5182          # 3.0  KANGXI RADICAL DOWN BOX
-2F0D          ; mapped                 ; 5196          # 3.0  KANGXI RADICAL COVER
-2F0E          ; mapped                 ; 51AB          # 3.0  KANGXI RADICAL ICE
-2F0F          ; mapped                 ; 51E0          # 3.0  KANGXI RADICAL TABLE
-2F10          ; mapped                 ; 51F5          # 3.0  KANGXI RADICAL OPEN BOX
-2F11          ; mapped                 ; 5200          # 3.0  KANGXI RADICAL KNIFE
-2F12          ; mapped                 ; 529B          # 3.0  KANGXI RADICAL POWER
-2F13          ; mapped                 ; 52F9          # 3.0  KANGXI RADICAL WRAP
-2F14          ; mapped                 ; 5315          # 3.0  KANGXI RADICAL SPOON
-2F15          ; mapped                 ; 531A          # 3.0  KANGXI RADICAL RIGHT OPEN BOX
-2F16          ; mapped                 ; 5338          # 3.0  KANGXI RADICAL HIDING ENCLOSURE
-2F17          ; mapped                 ; 5341          # 3.0  KANGXI RADICAL TEN
-2F18          ; mapped                 ; 535C          # 3.0  KANGXI RADICAL DIVINATION
-2F19          ; mapped                 ; 5369          # 3.0  KANGXI RADICAL SEAL
-2F1A          ; mapped                 ; 5382          # 3.0  KANGXI RADICAL CLIFF
-2F1B          ; mapped                 ; 53B6          # 3.0  KANGXI RADICAL PRIVATE
-2F1C          ; mapped                 ; 53C8          # 3.0  KANGXI RADICAL AGAIN
-2F1D          ; mapped                 ; 53E3          # 3.0  KANGXI RADICAL MOUTH
-2F1E          ; mapped                 ; 56D7          # 3.0  KANGXI RADICAL ENCLOSURE
-2F1F          ; mapped                 ; 571F          # 3.0  KANGXI RADICAL EARTH
-2F20          ; mapped                 ; 58EB          # 3.0  KANGXI RADICAL SCHOLAR
-2F21          ; mapped                 ; 5902          # 3.0  KANGXI RADICAL GO
-2F22          ; mapped                 ; 590A          # 3.0  KANGXI RADICAL GO SLOWLY
-2F23          ; mapped                 ; 5915          # 3.0  KANGXI RADICAL EVENING
-2F24          ; mapped                 ; 5927          # 3.0  KANGXI RADICAL BIG
-2F25          ; mapped                 ; 5973          # 3.0  KANGXI RADICAL WOMAN
-2F26          ; mapped                 ; 5B50          # 3.0  KANGXI RADICAL CHILD
-2F27          ; mapped                 ; 5B80          # 3.0  KANGXI RADICAL ROOF
-2F28          ; mapped                 ; 5BF8          # 3.0  KANGXI RADICAL INCH
-2F29          ; mapped                 ; 5C0F          # 3.0  KANGXI RADICAL SMALL
-2F2A          ; mapped                 ; 5C22          # 3.0  KANGXI RADICAL LAME
-2F2B          ; mapped                 ; 5C38          # 3.0  KANGXI RADICAL CORPSE
-2F2C          ; mapped                 ; 5C6E          # 3.0  KANGXI RADICAL SPROUT
-2F2D          ; mapped                 ; 5C71          # 3.0  KANGXI RADICAL MOUNTAIN
-2F2E          ; mapped                 ; 5DDB          # 3.0  KANGXI RADICAL RIVER
-2F2F          ; mapped                 ; 5DE5          # 3.0  KANGXI RADICAL WORK
-2F30          ; mapped                 ; 5DF1          # 3.0  KANGXI RADICAL ONESELF
-2F31          ; mapped                 ; 5DFE          # 3.0  KANGXI RADICAL TURBAN
-2F32          ; mapped                 ; 5E72          # 3.0  KANGXI RADICAL DRY
-2F33          ; mapped                 ; 5E7A          # 3.0  KANGXI RADICAL SHORT THREAD
-2F34          ; mapped                 ; 5E7F          # 3.0  KANGXI RADICAL DOTTED CLIFF
-2F35          ; mapped                 ; 5EF4          # 3.0  KANGXI RADICAL LONG STRIDE
-2F36          ; mapped                 ; 5EFE          # 3.0  KANGXI RADICAL TWO HANDS
-2F37          ; mapped                 ; 5F0B          # 3.0  KANGXI RADICAL SHOOT
-2F38          ; mapped                 ; 5F13          # 3.0  KANGXI RADICAL BOW
-2F39          ; mapped                 ; 5F50          # 3.0  KANGXI RADICAL SNOUT
-2F3A          ; mapped                 ; 5F61          # 3.0  KANGXI RADICAL BRISTLE
-2F3B          ; mapped                 ; 5F73          # 3.0  KANGXI RADICAL STEP
-2F3C          ; mapped                 ; 5FC3          # 3.0  KANGXI RADICAL HEART
-2F3D          ; mapped                 ; 6208          # 3.0  KANGXI RADICAL HALBERD
-2F3E          ; mapped                 ; 6236          # 3.0  KANGXI RADICAL DOOR
-2F3F          ; mapped                 ; 624B          # 3.0  KANGXI RADICAL HAND
-2F40          ; mapped                 ; 652F          # 3.0  KANGXI RADICAL BRANCH
-2F41          ; mapped                 ; 6534          # 3.0  KANGXI RADICAL RAP
-2F42          ; mapped                 ; 6587          # 3.0  KANGXI RADICAL SCRIPT
-2F43          ; mapped                 ; 6597          # 3.0  KANGXI RADICAL DIPPER
-2F44          ; mapped                 ; 65A4          # 3.0  KANGXI RADICAL AXE
-2F45          ; mapped                 ; 65B9          # 3.0  KANGXI RADICAL SQUARE
-2F46          ; mapped                 ; 65E0          # 3.0  KANGXI RADICAL NOT
-2F47          ; mapped                 ; 65E5          # 3.0  KANGXI RADICAL SUN
-2F48          ; mapped                 ; 66F0          # 3.0  KANGXI RADICAL SAY
-2F49          ; mapped                 ; 6708          # 3.0  KANGXI RADICAL MOON
-2F4A          ; mapped                 ; 6728          # 3.0  KANGXI RADICAL TREE
-2F4B          ; mapped                 ; 6B20          # 3.0  KANGXI RADICAL LACK
-2F4C          ; mapped                 ; 6B62          # 3.0  KANGXI RADICAL STOP
-2F4D          ; mapped                 ; 6B79          # 3.0  KANGXI RADICAL DEATH
-2F4E          ; mapped                 ; 6BB3          # 3.0  KANGXI RADICAL WEAPON
-2F4F          ; mapped                 ; 6BCB          # 3.0  KANGXI RADICAL DO NOT
-2F50          ; mapped                 ; 6BD4          # 3.0  KANGXI RADICAL COMPARE
-2F51          ; mapped                 ; 6BDB          # 3.0  KANGXI RADICAL FUR
-2F52          ; mapped                 ; 6C0F          # 3.0  KANGXI RADICAL CLAN
-2F53          ; mapped                 ; 6C14          # 3.0  KANGXI RADICAL STEAM
-2F54          ; mapped                 ; 6C34          # 3.0  KANGXI RADICAL WATER
-2F55          ; mapped                 ; 706B          # 3.0  KANGXI RADICAL FIRE
-2F56          ; mapped                 ; 722A          # 3.0  KANGXI RADICAL CLAW
-2F57          ; mapped                 ; 7236          # 3.0  KANGXI RADICAL FATHER
-2F58          ; mapped                 ; 723B          # 3.0  KANGXI RADICAL DOUBLE X
-2F59          ; mapped                 ; 723F          # 3.0  KANGXI RADICAL HALF TREE TRUNK
-2F5A          ; mapped                 ; 7247          # 3.0  KANGXI RADICAL SLICE
-2F5B          ; mapped                 ; 7259          # 3.0  KANGXI RADICAL FANG
-2F5C          ; mapped                 ; 725B          # 3.0  KANGXI RADICAL COW
-2F5D          ; mapped                 ; 72AC          # 3.0  KANGXI RADICAL DOG
-2F5E          ; mapped                 ; 7384          # 3.0  KANGXI RADICAL PROFOUND
-2F5F          ; mapped                 ; 7389          # 3.0  KANGXI RADICAL JADE
-2F60          ; mapped                 ; 74DC          # 3.0  KANGXI RADICAL MELON
-2F61          ; mapped                 ; 74E6          # 3.0  KANGXI RADICAL TILE
-2F62          ; mapped                 ; 7518          # 3.0  KANGXI RADICAL SWEET
-2F63          ; mapped                 ; 751F          # 3.0  KANGXI RADICAL LIFE
-2F64          ; mapped                 ; 7528          # 3.0  KANGXI RADICAL USE
-2F65          ; mapped                 ; 7530          # 3.0  KANGXI RADICAL FIELD
-2F66          ; mapped                 ; 758B          # 3.0  KANGXI RADICAL BOLT OF CLOTH
-2F67          ; mapped                 ; 7592          # 3.0  KANGXI RADICAL SICKNESS
-2F68          ; mapped                 ; 7676          # 3.0  KANGXI RADICAL DOTTED TENT
-2F69          ; mapped                 ; 767D          # 3.0  KANGXI RADICAL WHITE
-2F6A          ; mapped                 ; 76AE          # 3.0  KANGXI RADICAL SKIN
-2F6B          ; mapped                 ; 76BF          # 3.0  KANGXI RADICAL DISH
-2F6C          ; mapped                 ; 76EE          # 3.0  KANGXI RADICAL EYE
-2F6D          ; mapped                 ; 77DB          # 3.0  KANGXI RADICAL SPEAR
-2F6E          ; mapped                 ; 77E2          # 3.0  KANGXI RADICAL ARROW
-2F6F          ; mapped                 ; 77F3          # 3.0  KANGXI RADICAL STONE
-2F70          ; mapped                 ; 793A          # 3.0  KANGXI RADICAL SPIRIT
-2F71          ; mapped                 ; 79B8          # 3.0  KANGXI RADICAL TRACK
-2F72          ; mapped                 ; 79BE          # 3.0  KANGXI RADICAL GRAIN
-2F73          ; mapped                 ; 7A74          # 3.0  KANGXI RADICAL CAVE
-2F74          ; mapped                 ; 7ACB          # 3.0  KANGXI RADICAL STAND
-2F75          ; mapped                 ; 7AF9          # 3.0  KANGXI RADICAL BAMBOO
-2F76          ; mapped                 ; 7C73          # 3.0  KANGXI RADICAL RICE
-2F77          ; mapped                 ; 7CF8          # 3.0  KANGXI RADICAL SILK
-2F78          ; mapped                 ; 7F36          # 3.0  KANGXI RADICAL JAR
-2F79          ; mapped                 ; 7F51          # 3.0  KANGXI RADICAL NET
-2F7A          ; mapped                 ; 7F8A          # 3.0  KANGXI RADICAL SHEEP
-2F7B          ; mapped                 ; 7FBD          # 3.0  KANGXI RADICAL FEATHER
-2F7C          ; mapped                 ; 8001          # 3.0  KANGXI RADICAL OLD
-2F7D          ; mapped                 ; 800C          # 3.0  KANGXI RADICAL AND
-2F7E          ; mapped                 ; 8012          # 3.0  KANGXI RADICAL PLOW
-2F7F          ; mapped                 ; 8033          # 3.0  KANGXI RADICAL EAR
-2F80          ; mapped                 ; 807F          # 3.0  KANGXI RADICAL BRUSH
-2F81          ; mapped                 ; 8089          # 3.0  KANGXI RADICAL MEAT
-2F82          ; mapped                 ; 81E3          # 3.0  KANGXI RADICAL MINISTER
-2F83          ; mapped                 ; 81EA          # 3.0  KANGXI RADICAL SELF
-2F84          ; mapped                 ; 81F3          # 3.0  KANGXI RADICAL ARRIVE
-2F85          ; mapped                 ; 81FC          # 3.0  KANGXI RADICAL MORTAR
-2F86          ; mapped                 ; 820C          # 3.0  KANGXI RADICAL TONGUE
-2F87          ; mapped                 ; 821B          # 3.0  KANGXI RADICAL OPPOSE
-2F88          ; mapped                 ; 821F          # 3.0  KANGXI RADICAL BOAT
-2F89          ; mapped                 ; 826E          # 3.0  KANGXI RADICAL STOPPING
-2F8A          ; mapped                 ; 8272          # 3.0  KANGXI RADICAL COLOR
-2F8B          ; mapped                 ; 8278          # 3.0  KANGXI RADICAL GRASS
-2F8C          ; mapped                 ; 864D          # 3.0  KANGXI RADICAL TIGER
-2F8D          ; mapped                 ; 866B          # 3.0  KANGXI RADICAL INSECT
-2F8E          ; mapped                 ; 8840          # 3.0  KANGXI RADICAL BLOOD
-2F8F          ; mapped                 ; 884C          # 3.0  KANGXI RADICAL WALK ENCLOSURE
-2F90          ; mapped                 ; 8863          # 3.0  KANGXI RADICAL CLOTHES
-2F91          ; mapped                 ; 897E          # 3.0  KANGXI RADICAL WEST
-2F92          ; mapped                 ; 898B          # 3.0  KANGXI RADICAL SEE
-2F93          ; mapped                 ; 89D2          # 3.0  KANGXI RADICAL HORN
-2F94          ; mapped                 ; 8A00          # 3.0  KANGXI RADICAL SPEECH
-2F95          ; mapped                 ; 8C37          # 3.0  KANGXI RADICAL VALLEY
-2F96          ; mapped                 ; 8C46          # 3.0  KANGXI RADICAL BEAN
-2F97          ; mapped                 ; 8C55          # 3.0  KANGXI RADICAL PIG
-2F98          ; mapped                 ; 8C78          # 3.0  KANGXI RADICAL BADGER
-2F99          ; mapped                 ; 8C9D          # 3.0  KANGXI RADICAL SHELL
-2F9A          ; mapped                 ; 8D64          # 3.0  KANGXI RADICAL RED
-2F9B          ; mapped                 ; 8D70          # 3.0  KANGXI RADICAL RUN
-2F9C          ; mapped                 ; 8DB3          # 3.0  KANGXI RADICAL FOOT
-2F9D          ; mapped                 ; 8EAB          # 3.0  KANGXI RADICAL BODY
-2F9E          ; mapped                 ; 8ECA          # 3.0  KANGXI RADICAL CART
-2F9F          ; mapped                 ; 8F9B          # 3.0  KANGXI RADICAL BITTER
-2FA0          ; mapped                 ; 8FB0          # 3.0  KANGXI RADICAL MORNING
-2FA1          ; mapped                 ; 8FB5          # 3.0  KANGXI RADICAL WALK
-2FA2          ; mapped                 ; 9091          # 3.0  KANGXI RADICAL CITY
-2FA3          ; mapped                 ; 9149          # 3.0  KANGXI RADICAL WINE
-2FA4          ; mapped                 ; 91C6          # 3.0  KANGXI RADICAL DISTINGUISH
-2FA5          ; mapped                 ; 91CC          # 3.0  KANGXI RADICAL VILLAGE
-2FA6          ; mapped                 ; 91D1          # 3.0  KANGXI RADICAL GOLD
-2FA7          ; mapped                 ; 9577          # 3.0  KANGXI RADICAL LONG
-2FA8          ; mapped                 ; 9580          # 3.0  KANGXI RADICAL GATE
-2FA9          ; mapped                 ; 961C          # 3.0  KANGXI RADICAL MOUND
-2FAA          ; mapped                 ; 96B6          # 3.0  KANGXI RADICAL SLAVE
-2FAB          ; mapped                 ; 96B9          # 3.0  KANGXI RADICAL SHORT TAILED BIRD
-2FAC          ; mapped                 ; 96E8          # 3.0  KANGXI RADICAL RAIN
-2FAD          ; mapped                 ; 9751          # 3.0  KANGXI RADICAL BLUE
-2FAE          ; mapped                 ; 975E          # 3.0  KANGXI RADICAL WRONG
-2FAF          ; mapped                 ; 9762          # 3.0  KANGXI RADICAL FACE
-2FB0          ; mapped                 ; 9769          # 3.0  KANGXI RADICAL LEATHER
-2FB1          ; mapped                 ; 97CB          # 3.0  KANGXI RADICAL TANNED LEATHER
-2FB2          ; mapped                 ; 97ED          # 3.0  KANGXI RADICAL LEEK
-2FB3          ; mapped                 ; 97F3          # 3.0  KANGXI RADICAL SOUND
-2FB4          ; mapped                 ; 9801          # 3.0  KANGXI RADICAL LEAF
-2FB5          ; mapped                 ; 98A8          # 3.0  KANGXI RADICAL WIND
-2FB6          ; mapped                 ; 98DB          # 3.0  KANGXI RADICAL FLY
-2FB7          ; mapped                 ; 98DF          # 3.0  KANGXI RADICAL EAT
-2FB8          ; mapped                 ; 9996          # 3.0  KANGXI RADICAL HEAD
-2FB9          ; mapped                 ; 9999          # 3.0  KANGXI RADICAL FRAGRANT
-2FBA          ; mapped                 ; 99AC          # 3.0  KANGXI RADICAL HORSE
-2FBB          ; mapped                 ; 9AA8          # 3.0  KANGXI RADICAL BONE
-2FBC          ; mapped                 ; 9AD8          # 3.0  KANGXI RADICAL TALL
-2FBD          ; mapped                 ; 9ADF          # 3.0  KANGXI RADICAL HAIR
-2FBE          ; mapped                 ; 9B25          # 3.0  KANGXI RADICAL FIGHT
-2FBF          ; mapped                 ; 9B2F          # 3.0  KANGXI RADICAL SACRIFICIAL WINE
-2FC0          ; mapped                 ; 9B32          # 3.0  KANGXI RADICAL CAULDRON
-2FC1          ; mapped                 ; 9B3C          # 3.0  KANGXI RADICAL GHOST
-2FC2          ; mapped                 ; 9B5A          # 3.0  KANGXI RADICAL FISH
-2FC3          ; mapped                 ; 9CE5          # 3.0  KANGXI RADICAL BIRD
-2FC4          ; mapped                 ; 9E75          # 3.0  KANGXI RADICAL SALT
-2FC5          ; mapped                 ; 9E7F          # 3.0  KANGXI RADICAL DEER
-2FC6          ; mapped                 ; 9EA5          # 3.0  KANGXI RADICAL WHEAT
-2FC7          ; mapped                 ; 9EBB          # 3.0  KANGXI RADICAL HEMP
-2FC8          ; mapped                 ; 9EC3          # 3.0  KANGXI RADICAL YELLOW
-2FC9          ; mapped                 ; 9ECD          # 3.0  KANGXI RADICAL MILLET
-2FCA          ; mapped                 ; 9ED1          # 3.0  KANGXI RADICAL BLACK
-2FCB          ; mapped                 ; 9EF9          # 3.0  KANGXI RADICAL EMBROIDERY
-2FCC          ; mapped                 ; 9EFD          # 3.0  KANGXI RADICAL FROG
-2FCD          ; mapped                 ; 9F0E          # 3.0  KANGXI RADICAL TRIPOD
-2FCE          ; mapped                 ; 9F13          # 3.0  KANGXI RADICAL DRUM
-2FCF          ; mapped                 ; 9F20          # 3.0  KANGXI RADICAL RAT
-2FD0          ; mapped                 ; 9F3B          # 3.0  KANGXI RADICAL NOSE
-2FD1          ; mapped                 ; 9F4A          # 3.0  KANGXI RADICAL EVEN
-2FD2          ; mapped                 ; 9F52          # 3.0  KANGXI RADICAL TOOTH
-2FD3          ; mapped                 ; 9F8D          # 3.0  KANGXI RADICAL DRAGON
-2FD4          ; mapped                 ; 9F9C          # 3.0  KANGXI RADICAL TURTLE
-2FD5          ; mapped                 ; 9FA0          # 3.0  KANGXI RADICAL FLUTE
-2FD6..2FEF    ; disallowed                             # NA   <reserved-2FD6>..<reserved-2FEF>
-2FF0..2FFB    ; disallowed                             # 3.0  IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
-2FFC..2FFF    ; disallowed                             # NA   <reserved-2FFC>..<reserved-2FFF>
-3000          ; disallowed_STD3_mapped ; 0020          # 1.1  IDEOGRAPHIC SPACE
-3001          ; valid                  ;      ; NV8    # 1.1  IDEOGRAPHIC COMMA
-3002          ; mapped                 ; 002E          # 1.1  IDEOGRAPHIC FULL STOP
-3003..3004    ; valid                  ;      ; NV8    # 1.1  DITTO MARK..JAPANESE INDUSTRIAL STANDARD SYMBOL
-3005..3007    ; valid                                  # 1.1  IDEOGRAPHIC ITERATION MARK..IDEOGRAPHIC NUMBER ZERO
-3008..3029    ; valid                  ;      ; NV8    # 1.1  LEFT ANGLE BRACKET..HANGZHOU NUMERAL NINE
-302A..302D    ; valid                                  # 1.1  IDEOGRAPHIC LEVEL TONE MARK..IDEOGRAPHIC ENTERING TONE MARK
-302E..3035    ; valid                  ;      ; NV8    # 1.1  HANGUL SINGLE DOT TONE MARK..VERTICAL KANA REPEAT MARK LOWER HALF
-3036          ; mapped                 ; 3012          # 1.1  CIRCLED POSTAL MARK
-3037          ; valid                  ;      ; NV8    # 1.1  IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL
-3038          ; mapped                 ; 5341          # 3.0  HANGZHOU NUMERAL TEN
-3039          ; mapped                 ; 5344          # 3.0  HANGZHOU NUMERAL TWENTY
-303A          ; mapped                 ; 5345          # 3.0  HANGZHOU NUMERAL THIRTY
-303B          ; valid                  ;      ; NV8    # 3.2  VERTICAL IDEOGRAPHIC ITERATION MARK
-303C          ; valid                                  # 3.2  MASU MARK
-303D          ; valid                  ;      ; NV8    # 3.2  PART ALTERNATION MARK
-303E          ; valid                  ;      ; NV8    # 3.0  IDEOGRAPHIC VARIATION INDICATOR
-303F          ; valid                  ;      ; NV8    # 1.1  IDEOGRAPHIC HALF FILL SPACE
-3040          ; disallowed                             # NA   <reserved-3040>
-3041..3094    ; valid                                  # 1.1  HIRAGANA LETTER SMALL A..HIRAGANA LETTER VU
-3095..3096    ; valid                                  # 3.2  HIRAGANA LETTER SMALL KA..HIRAGANA LETTER SMALL KE
-3097..3098    ; disallowed                             # NA   <reserved-3097>..<reserved-3098>
-3099..309A    ; valid                                  # 1.1  COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-309B          ; disallowed_STD3_mapped ; 0020 3099     # 1.1  KATAKANA-HIRAGANA VOICED SOUND MARK
-309C          ; disallowed_STD3_mapped ; 0020 309A     # 1.1  KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-309D..309E    ; valid                                  # 1.1  HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK
-309F          ; mapped                 ; 3088 308A     # 3.2  HIRAGANA DIGRAPH YORI
-30A0          ; valid                  ;      ; NV8    # 3.2  KATAKANA-HIRAGANA DOUBLE HYPHEN
-30A1..30FE    ; valid                                  # 1.1  KATAKANA LETTER SMALL A..KATAKANA VOICED ITERATION MARK
-30FF          ; mapped                 ; 30B3 30C8     # 3.2  KATAKANA DIGRAPH KOTO
-3100..3104    ; disallowed                             # NA   <reserved-3100>..<reserved-3104>
-3105..312C    ; valid                                  # 1.1  BOPOMOFO LETTER B..BOPOMOFO LETTER GN
-312D          ; valid                                  # 5.1  BOPOMOFO LETTER IH
-312E          ; valid                                  # 10.0 BOPOMOFO LETTER O WITH DOT ABOVE
-312F..3130    ; disallowed                             # NA   <reserved-312F>..<reserved-3130>
-3131          ; mapped                 ; 1100          # 1.1  HANGUL LETTER KIYEOK
-3132          ; mapped                 ; 1101          # 1.1  HANGUL LETTER SSANGKIYEOK
-3133          ; mapped                 ; 11AA          # 1.1  HANGUL LETTER KIYEOK-SIOS
-3134          ; mapped                 ; 1102          # 1.1  HANGUL LETTER NIEUN
-3135          ; mapped                 ; 11AC          # 1.1  HANGUL LETTER NIEUN-CIEUC
-3136          ; mapped                 ; 11AD          # 1.1  HANGUL LETTER NIEUN-HIEUH
-3137          ; mapped                 ; 1103          # 1.1  HANGUL LETTER TIKEUT
-3138          ; mapped                 ; 1104          # 1.1  HANGUL LETTER SSANGTIKEUT
-3139          ; mapped                 ; 1105          # 1.1  HANGUL LETTER RIEUL
-313A          ; mapped                 ; 11B0          # 1.1  HANGUL LETTER RIEUL-KIYEOK
-313B          ; mapped                 ; 11B1          # 1.1  HANGUL LETTER RIEUL-MIEUM
-313C          ; mapped                 ; 11B2          # 1.1  HANGUL LETTER RIEUL-PIEUP
-313D          ; mapped                 ; 11B3          # 1.1  HANGUL LETTER RIEUL-SIOS
-313E          ; mapped                 ; 11B4          # 1.1  HANGUL LETTER RIEUL-THIEUTH
-313F          ; mapped                 ; 11B5          # 1.1  HANGUL LETTER RIEUL-PHIEUPH
-3140          ; mapped                 ; 111A          # 1.1  HANGUL LETTER RIEUL-HIEUH
-3141          ; mapped                 ; 1106          # 1.1  HANGUL LETTER MIEUM
-3142          ; mapped                 ; 1107          # 1.1  HANGUL LETTER PIEUP
-3143          ; mapped                 ; 1108          # 1.1  HANGUL LETTER SSANGPIEUP
-3144          ; mapped                 ; 1121          # 1.1  HANGUL LETTER PIEUP-SIOS
-3145          ; mapped                 ; 1109          # 1.1  HANGUL LETTER SIOS
-3146          ; mapped                 ; 110A          # 1.1  HANGUL LETTER SSANGSIOS
-3147          ; mapped                 ; 110B          # 1.1  HANGUL LETTER IEUNG
-3148          ; mapped                 ; 110C          # 1.1  HANGUL LETTER CIEUC
-3149          ; mapped                 ; 110D          # 1.1  HANGUL LETTER SSANGCIEUC
-314A          ; mapped                 ; 110E          # 1.1  HANGUL LETTER CHIEUCH
-314B          ; mapped                 ; 110F          # 1.1  HANGUL LETTER KHIEUKH
-314C          ; mapped                 ; 1110          # 1.1  HANGUL LETTER THIEUTH
-314D          ; mapped                 ; 1111          # 1.1  HANGUL LETTER PHIEUPH
-314E          ; mapped                 ; 1112          # 1.1  HANGUL LETTER HIEUH
-314F          ; mapped                 ; 1161          # 1.1  HANGUL LETTER A
-3150          ; mapped                 ; 1162          # 1.1  HANGUL LETTER AE
-3151          ; mapped                 ; 1163          # 1.1  HANGUL LETTER YA
-3152          ; mapped                 ; 1164          # 1.1  HANGUL LETTER YAE
-3153          ; mapped                 ; 1165          # 1.1  HANGUL LETTER EO
-3154          ; mapped                 ; 1166          # 1.1  HANGUL LETTER E
-3155          ; mapped                 ; 1167          # 1.1  HANGUL LETTER YEO
-3156          ; mapped                 ; 1168          # 1.1  HANGUL LETTER YE
-3157          ; mapped                 ; 1169          # 1.1  HANGUL LETTER O
-3158          ; mapped                 ; 116A          # 1.1  HANGUL LETTER WA
-3159          ; mapped                 ; 116B          # 1.1  HANGUL LETTER WAE
-315A          ; mapped                 ; 116C          # 1.1  HANGUL LETTER OE
-315B          ; mapped                 ; 116D          # 1.1  HANGUL LETTER YO
-315C          ; mapped                 ; 116E          # 1.1  HANGUL LETTER U
-315D          ; mapped                 ; 116F          # 1.1  HANGUL LETTER WEO
-315E          ; mapped                 ; 1170          # 1.1  HANGUL LETTER WE
-315F          ; mapped                 ; 1171          # 1.1  HANGUL LETTER WI
-3160          ; mapped                 ; 1172          # 1.1  HANGUL LETTER YU
-3161          ; mapped                 ; 1173          # 1.1  HANGUL LETTER EU
-3162          ; mapped                 ; 1174          # 1.1  HANGUL LETTER YI
-3163          ; mapped                 ; 1175          # 1.1  HANGUL LETTER I
-3164          ; disallowed                             # 1.1  HANGUL FILLER
-3165          ; mapped                 ; 1114          # 1.1  HANGUL LETTER SSANGNIEUN
-3166          ; mapped                 ; 1115          # 1.1  HANGUL LETTER NIEUN-TIKEUT
-3167          ; mapped                 ; 11C7          # 1.1  HANGUL LETTER NIEUN-SIOS
-3168          ; mapped                 ; 11C8          # 1.1  HANGUL LETTER NIEUN-PANSIOS
-3169          ; mapped                 ; 11CC          # 1.1  HANGUL LETTER RIEUL-KIYEOK-SIOS
-316A          ; mapped                 ; 11CE          # 1.1  HANGUL LETTER RIEUL-TIKEUT
-316B          ; mapped                 ; 11D3          # 1.1  HANGUL LETTER RIEUL-PIEUP-SIOS
-316C          ; mapped                 ; 11D7          # 1.1  HANGUL LETTER RIEUL-PANSIOS
-316D          ; mapped                 ; 11D9          # 1.1  HANGUL LETTER RIEUL-YEORINHIEUH
-316E          ; mapped                 ; 111C          # 1.1  HANGUL LETTER MIEUM-PIEUP
-316F          ; mapped                 ; 11DD          # 1.1  HANGUL LETTER MIEUM-SIOS
-3170          ; mapped                 ; 11DF          # 1.1  HANGUL LETTER MIEUM-PANSIOS
-3171          ; mapped                 ; 111D          # 1.1  HANGUL LETTER KAPYEOUNMIEUM
-3172          ; mapped                 ; 111E          # 1.1  HANGUL LETTER PIEUP-KIYEOK
-3173          ; mapped                 ; 1120          # 1.1  HANGUL LETTER PIEUP-TIKEUT
-3174          ; mapped                 ; 1122          # 1.1  HANGUL LETTER PIEUP-SIOS-KIYEOK
-3175          ; mapped                 ; 1123          # 1.1  HANGUL LETTER PIEUP-SIOS-TIKEUT
-3176          ; mapped                 ; 1127          # 1.1  HANGUL LETTER PIEUP-CIEUC
-3177          ; mapped                 ; 1129          # 1.1  HANGUL LETTER PIEUP-THIEUTH
-3178          ; mapped                 ; 112B          # 1.1  HANGUL LETTER KAPYEOUNPIEUP
-3179          ; mapped                 ; 112C          # 1.1  HANGUL LETTER KAPYEOUNSSANGPIEUP
-317A          ; mapped                 ; 112D          # 1.1  HANGUL LETTER SIOS-KIYEOK
-317B          ; mapped                 ; 112E          # 1.1  HANGUL LETTER SIOS-NIEUN
-317C          ; mapped                 ; 112F          # 1.1  HANGUL LETTER SIOS-TIKEUT
-317D          ; mapped                 ; 1132          # 1.1  HANGUL LETTER SIOS-PIEUP
-317E          ; mapped                 ; 1136          # 1.1  HANGUL LETTER SIOS-CIEUC
-317F          ; mapped                 ; 1140          # 1.1  HANGUL LETTER PANSIOS
-3180          ; mapped                 ; 1147          # 1.1  HANGUL LETTER SSANGIEUNG
-3181          ; mapped                 ; 114C          # 1.1  HANGUL LETTER YESIEUNG
-3182          ; mapped                 ; 11F1          # 1.1  HANGUL LETTER YESIEUNG-SIOS
-3183          ; mapped                 ; 11F2          # 1.1  HANGUL LETTER YESIEUNG-PANSIOS
-3184          ; mapped                 ; 1157          # 1.1  HANGUL LETTER KAPYEOUNPHIEUPH
-3185          ; mapped                 ; 1158          # 1.1  HANGUL LETTER SSANGHIEUH
-3186          ; mapped                 ; 1159          # 1.1  HANGUL LETTER YEORINHIEUH
-3187          ; mapped                 ; 1184          # 1.1  HANGUL LETTER YO-YA
-3188          ; mapped                 ; 1185          # 1.1  HANGUL LETTER YO-YAE
-3189          ; mapped                 ; 1188          # 1.1  HANGUL LETTER YO-I
-318A          ; mapped                 ; 1191          # 1.1  HANGUL LETTER YU-YEO
-318B          ; mapped                 ; 1192          # 1.1  HANGUL LETTER YU-YE
-318C          ; mapped                 ; 1194          # 1.1  HANGUL LETTER YU-I
-318D          ; mapped                 ; 119E          # 1.1  HANGUL LETTER ARAEA
-318E          ; mapped                 ; 11A1          # 1.1  HANGUL LETTER ARAEAE
-318F          ; disallowed                             # NA   <reserved-318F>
-3190..3191    ; valid                  ;      ; NV8    # 1.1  IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK
-3192          ; mapped                 ; 4E00          # 1.1  IDEOGRAPHIC ANNOTATION ONE MARK
-3193          ; mapped                 ; 4E8C          # 1.1  IDEOGRAPHIC ANNOTATION TWO MARK
-3194          ; mapped                 ; 4E09          # 1.1  IDEOGRAPHIC ANNOTATION THREE MARK
-3195          ; mapped                 ; 56DB          # 1.1  IDEOGRAPHIC ANNOTATION FOUR MARK
-3196          ; mapped                 ; 4E0A          # 1.1  IDEOGRAPHIC ANNOTATION TOP MARK
-3197          ; mapped                 ; 4E2D          # 1.1  IDEOGRAPHIC ANNOTATION MIDDLE MARK
-3198          ; mapped                 ; 4E0B          # 1.1  IDEOGRAPHIC ANNOTATION BOTTOM MARK
-3199          ; mapped                 ; 7532          # 1.1  IDEOGRAPHIC ANNOTATION FIRST MARK
-319A          ; mapped                 ; 4E59          # 1.1  IDEOGRAPHIC ANNOTATION SECOND MARK
-319B          ; mapped                 ; 4E19          # 1.1  IDEOGRAPHIC ANNOTATION THIRD MARK
-319C          ; mapped                 ; 4E01          # 1.1  IDEOGRAPHIC ANNOTATION FOURTH MARK
-319D          ; mapped                 ; 5929          # 1.1  IDEOGRAPHIC ANNOTATION HEAVEN MARK
-319E          ; mapped                 ; 5730          # 1.1  IDEOGRAPHIC ANNOTATION EARTH MARK
-319F          ; mapped                 ; 4EBA          # 1.1  IDEOGRAPHIC ANNOTATION MAN MARK
-31A0..31B7    ; valid                                  # 3.0  BOPOMOFO LETTER BU..BOPOMOFO FINAL LETTER H
-31B8..31BA    ; valid                                  # 6.0  BOPOMOFO LETTER GH..BOPOMOFO LETTER ZY
-31BB..31BF    ; disallowed                             # NA   <reserved-31BB>..<reserved-31BF>
-31C0..31CF    ; valid                  ;      ; NV8    # 4.1  CJK STROKE T..CJK STROKE N
-31D0..31E3    ; valid                  ;      ; NV8    # 5.1  CJK STROKE H..CJK STROKE Q
-31E4..31EF    ; disallowed                             # NA   <reserved-31E4>..<reserved-31EF>
-31F0..31FF    ; valid                                  # 3.2  KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO
-3200          ; disallowed_STD3_mapped ; 0028 1100 0029 #1.1  PARENTHESIZED HANGUL KIYEOK
-3201          ; disallowed_STD3_mapped ; 0028 1102 0029 #1.1  PARENTHESIZED HANGUL NIEUN
-3202          ; disallowed_STD3_mapped ; 0028 1103 0029 #1.1  PARENTHESIZED HANGUL TIKEUT
-3203          ; disallowed_STD3_mapped ; 0028 1105 0029 #1.1  PARENTHESIZED HANGUL RIEUL
-3204          ; disallowed_STD3_mapped ; 0028 1106 0029 #1.1  PARENTHESIZED HANGUL MIEUM
-3205          ; disallowed_STD3_mapped ; 0028 1107 0029 #1.1  PARENTHESIZED HANGUL PIEUP
-3206          ; disallowed_STD3_mapped ; 0028 1109 0029 #1.1  PARENTHESIZED HANGUL SIOS
-3207          ; disallowed_STD3_mapped ; 0028 110B 0029 #1.1  PARENTHESIZED HANGUL IEUNG
-3208          ; disallowed_STD3_mapped ; 0028 110C 0029 #1.1  PARENTHESIZED HANGUL CIEUC
-3209          ; disallowed_STD3_mapped ; 0028 110E 0029 #1.1  PARENTHESIZED HANGUL CHIEUCH
-320A          ; disallowed_STD3_mapped ; 0028 110F 0029 #1.1  PARENTHESIZED HANGUL KHIEUKH
-320B          ; disallowed_STD3_mapped ; 0028 1110 0029 #1.1  PARENTHESIZED HANGUL THIEUTH
-320C          ; disallowed_STD3_mapped ; 0028 1111 0029 #1.1  PARENTHESIZED HANGUL PHIEUPH
-320D          ; disallowed_STD3_mapped ; 0028 1112 0029 #1.1  PARENTHESIZED HANGUL HIEUH
-320E          ; disallowed_STD3_mapped ; 0028 AC00 0029 #1.1  PARENTHESIZED HANGUL KIYEOK A
-320F          ; disallowed_STD3_mapped ; 0028 B098 0029 #1.1  PARENTHESIZED HANGUL NIEUN A
-3210          ; disallowed_STD3_mapped ; 0028 B2E4 0029 #1.1  PARENTHESIZED HANGUL TIKEUT A
-3211          ; disallowed_STD3_mapped ; 0028 B77C 0029 #1.1  PARENTHESIZED HANGUL RIEUL A
-3212          ; disallowed_STD3_mapped ; 0028 B9C8 0029 #1.1  PARENTHESIZED HANGUL MIEUM A
-3213          ; disallowed_STD3_mapped ; 0028 BC14 0029 #1.1  PARENTHESIZED HANGUL PIEUP A
-3214          ; disallowed_STD3_mapped ; 0028 C0AC 0029 #1.1  PARENTHESIZED HANGUL SIOS A
-3215          ; disallowed_STD3_mapped ; 0028 C544 0029 #1.1  PARENTHESIZED HANGUL IEUNG A
-3216          ; disallowed_STD3_mapped ; 0028 C790 0029 #1.1  PARENTHESIZED HANGUL CIEUC A
-3217          ; disallowed_STD3_mapped ; 0028 CC28 0029 #1.1  PARENTHESIZED HANGUL CHIEUCH A
-3218          ; disallowed_STD3_mapped ; 0028 CE74 0029 #1.1  PARENTHESIZED HANGUL KHIEUKH A
-3219          ; disallowed_STD3_mapped ; 0028 D0C0 0029 #1.1  PARENTHESIZED HANGUL THIEUTH A
-321A          ; disallowed_STD3_mapped ; 0028 D30C 0029 #1.1  PARENTHESIZED HANGUL PHIEUPH A
-321B          ; disallowed_STD3_mapped ; 0028 D558 0029 #1.1  PARENTHESIZED HANGUL HIEUH A
-321C          ; disallowed_STD3_mapped ; 0028 C8FC 0029 #1.1  PARENTHESIZED HANGUL CIEUC U
-321D          ; disallowed_STD3_mapped ; 0028 C624 C804 0029 #4.0 PARENTHESIZED KOREAN CHARACTER OJEON
-321E          ; disallowed_STD3_mapped ; 0028 C624 D6C4 0029 #4.0 PARENTHESIZED KOREAN CHARACTER O HU
-321F          ; disallowed                             # NA   <reserved-321F>
-3220          ; disallowed_STD3_mapped ; 0028 4E00 0029 #1.1  PARENTHESIZED IDEOGRAPH ONE
-3221          ; disallowed_STD3_mapped ; 0028 4E8C 0029 #1.1  PARENTHESIZED IDEOGRAPH TWO
-3222          ; disallowed_STD3_mapped ; 0028 4E09 0029 #1.1  PARENTHESIZED IDEOGRAPH THREE
-3223          ; disallowed_STD3_mapped ; 0028 56DB 0029 #1.1  PARENTHESIZED IDEOGRAPH FOUR
-3224          ; disallowed_STD3_mapped ; 0028 4E94 0029 #1.1  PARENTHESIZED IDEOGRAPH FIVE
-3225          ; disallowed_STD3_mapped ; 0028 516D 0029 #1.1  PARENTHESIZED IDEOGRAPH SIX
-3226          ; disallowed_STD3_mapped ; 0028 4E03 0029 #1.1  PARENTHESIZED IDEOGRAPH SEVEN
-3227          ; disallowed_STD3_mapped ; 0028 516B 0029 #1.1  PARENTHESIZED IDEOGRAPH EIGHT
-3228          ; disallowed_STD3_mapped ; 0028 4E5D 0029 #1.1  PARENTHESIZED IDEOGRAPH NINE
-3229          ; disallowed_STD3_mapped ; 0028 5341 0029 #1.1  PARENTHESIZED IDEOGRAPH TEN
-322A          ; disallowed_STD3_mapped ; 0028 6708 0029 #1.1  PARENTHESIZED IDEOGRAPH MOON
-322B          ; disallowed_STD3_mapped ; 0028 706B 0029 #1.1  PARENTHESIZED IDEOGRAPH FIRE
-322C          ; disallowed_STD3_mapped ; 0028 6C34 0029 #1.1  PARENTHESIZED IDEOGRAPH WATER
-322D          ; disallowed_STD3_mapped ; 0028 6728 0029 #1.1  PARENTHESIZED IDEOGRAPH WOOD
-322E          ; disallowed_STD3_mapped ; 0028 91D1 0029 #1.1  PARENTHESIZED IDEOGRAPH METAL
-322F          ; disallowed_STD3_mapped ; 0028 571F 0029 #1.1  PARENTHESIZED IDEOGRAPH EARTH
-3230          ; disallowed_STD3_mapped ; 0028 65E5 0029 #1.1  PARENTHESIZED IDEOGRAPH SUN
-3231          ; disallowed_STD3_mapped ; 0028 682A 0029 #1.1  PARENTHESIZED IDEOGRAPH STOCK
-3232          ; disallowed_STD3_mapped ; 0028 6709 0029 #1.1  PARENTHESIZED IDEOGRAPH HAVE
-3233          ; disallowed_STD3_mapped ; 0028 793E 0029 #1.1  PARENTHESIZED IDEOGRAPH SOCIETY
-3234          ; disallowed_STD3_mapped ; 0028 540D 0029 #1.1  PARENTHESIZED IDEOGRAPH NAME
-3235          ; disallowed_STD3_mapped ; 0028 7279 0029 #1.1  PARENTHESIZED IDEOGRAPH SPECIAL
-3236          ; disallowed_STD3_mapped ; 0028 8CA1 0029 #1.1  PARENTHESIZED IDEOGRAPH FINANCIAL
-3237          ; disallowed_STD3_mapped ; 0028 795D 0029 #1.1  PARENTHESIZED IDEOGRAPH CONGRATULATION
-3238          ; disallowed_STD3_mapped ; 0028 52B4 0029 #1.1  PARENTHESIZED IDEOGRAPH LABOR
-3239          ; disallowed_STD3_mapped ; 0028 4EE3 0029 #1.1  PARENTHESIZED IDEOGRAPH REPRESENT
-323A          ; disallowed_STD3_mapped ; 0028 547C 0029 #1.1  PARENTHESIZED IDEOGRAPH CALL
-323B          ; disallowed_STD3_mapped ; 0028 5B66 0029 #1.1  PARENTHESIZED IDEOGRAPH STUDY
-323C          ; disallowed_STD3_mapped ; 0028 76E3 0029 #1.1  PARENTHESIZED IDEOGRAPH SUPERVISE
-323D          ; disallowed_STD3_mapped ; 0028 4F01 0029 #1.1  PARENTHESIZED IDEOGRAPH ENTERPRISE
-323E          ; disallowed_STD3_mapped ; 0028 8CC7 0029 #1.1  PARENTHESIZED IDEOGRAPH RESOURCE
-323F          ; disallowed_STD3_mapped ; 0028 5354 0029 #1.1  PARENTHESIZED IDEOGRAPH ALLIANCE
-3240          ; disallowed_STD3_mapped ; 0028 796D 0029 #1.1  PARENTHESIZED IDEOGRAPH FESTIVAL
-3241          ; disallowed_STD3_mapped ; 0028 4F11 0029 #1.1  PARENTHESIZED IDEOGRAPH REST
-3242          ; disallowed_STD3_mapped ; 0028 81EA 0029 #1.1  PARENTHESIZED IDEOGRAPH SELF
-3243          ; disallowed_STD3_mapped ; 0028 81F3 0029 #1.1  PARENTHESIZED IDEOGRAPH REACH
-3244          ; mapped                 ; 554F          # 5.2  CIRCLED IDEOGRAPH QUESTION
-3245          ; mapped                 ; 5E7C          # 5.2  CIRCLED IDEOGRAPH KINDERGARTEN
-3246          ; mapped                 ; 6587          # 5.2  CIRCLED IDEOGRAPH SCHOOL
-3247          ; mapped                 ; 7B8F          # 5.2  CIRCLED IDEOGRAPH KOTO
-3248..324F    ; valid                  ;      ; NV8    # 5.2  CIRCLED NUMBER TEN ON BLACK SQUARE..CIRCLED NUMBER EIGHTY ON BLACK SQUARE
-3250          ; mapped                 ; 0070 0074 0065 #4.0  PARTNERSHIP SIGN
-3251          ; mapped                 ; 0032 0031     # 3.2  CIRCLED NUMBER TWENTY ONE
-3252          ; mapped                 ; 0032 0032     # 3.2  CIRCLED NUMBER TWENTY TWO
-3253          ; mapped                 ; 0032 0033     # 3.2  CIRCLED NUMBER TWENTY THREE
-3254          ; mapped                 ; 0032 0034     # 3.2  CIRCLED NUMBER TWENTY FOUR
-3255          ; mapped                 ; 0032 0035     # 3.2  CIRCLED NUMBER TWENTY FIVE
-3256          ; mapped                 ; 0032 0036     # 3.2  CIRCLED NUMBER TWENTY SIX
-3257          ; mapped                 ; 0032 0037     # 3.2  CIRCLED NUMBER TWENTY SEVEN
-3258          ; mapped                 ; 0032 0038     # 3.2  CIRCLED NUMBER TWENTY EIGHT
-3259          ; mapped                 ; 0032 0039     # 3.2  CIRCLED NUMBER TWENTY NINE
-325A          ; mapped                 ; 0033 0030     # 3.2  CIRCLED NUMBER THIRTY
-325B          ; mapped                 ; 0033 0031     # 3.2  CIRCLED NUMBER THIRTY ONE
-325C          ; mapped                 ; 0033 0032     # 3.2  CIRCLED NUMBER THIRTY TWO
-325D          ; mapped                 ; 0033 0033     # 3.2  CIRCLED NUMBER THIRTY THREE
-325E          ; mapped                 ; 0033 0034     # 3.2  CIRCLED NUMBER THIRTY FOUR
-325F          ; mapped                 ; 0033 0035     # 3.2  CIRCLED NUMBER THIRTY FIVE
-3260          ; mapped                 ; 1100          # 1.1  CIRCLED HANGUL KIYEOK
-3261          ; mapped                 ; 1102          # 1.1  CIRCLED HANGUL NIEUN
-3262          ; mapped                 ; 1103          # 1.1  CIRCLED HANGUL TIKEUT
-3263          ; mapped                 ; 1105          # 1.1  CIRCLED HANGUL RIEUL
-3264          ; mapped                 ; 1106          # 1.1  CIRCLED HANGUL MIEUM
-3265          ; mapped                 ; 1107          # 1.1  CIRCLED HANGUL PIEUP
-3266          ; mapped                 ; 1109          # 1.1  CIRCLED HANGUL SIOS
-3267          ; mapped                 ; 110B          # 1.1  CIRCLED HANGUL IEUNG
-3268          ; mapped                 ; 110C          # 1.1  CIRCLED HANGUL CIEUC
-3269          ; mapped                 ; 110E          # 1.1  CIRCLED HANGUL CHIEUCH
-326A          ; mapped                 ; 110F          # 1.1  CIRCLED HANGUL KHIEUKH
-326B          ; mapped                 ; 1110          # 1.1  CIRCLED HANGUL THIEUTH
-326C          ; mapped                 ; 1111          # 1.1  CIRCLED HANGUL PHIEUPH
-326D          ; mapped                 ; 1112          # 1.1  CIRCLED HANGUL HIEUH
-326E          ; mapped                 ; AC00          # 1.1  CIRCLED HANGUL KIYEOK A
-326F          ; mapped                 ; B098          # 1.1  CIRCLED HANGUL NIEUN A
-3270          ; mapped                 ; B2E4          # 1.1  CIRCLED HANGUL TIKEUT A
-3271          ; mapped                 ; B77C          # 1.1  CIRCLED HANGUL RIEUL A
-3272          ; mapped                 ; B9C8          # 1.1  CIRCLED HANGUL MIEUM A
-3273          ; mapped                 ; BC14          # 1.1  CIRCLED HANGUL PIEUP A
-3274          ; mapped                 ; C0AC          # 1.1  CIRCLED HANGUL SIOS A
-3275          ; mapped                 ; C544          # 1.1  CIRCLED HANGUL IEUNG A
-3276          ; mapped                 ; C790          # 1.1  CIRCLED HANGUL CIEUC A
-3277          ; mapped                 ; CC28          # 1.1  CIRCLED HANGUL CHIEUCH A
-3278          ; mapped                 ; CE74          # 1.1  CIRCLED HANGUL KHIEUKH A
-3279          ; mapped                 ; D0C0          # 1.1  CIRCLED HANGUL THIEUTH A
-327A          ; mapped                 ; D30C          # 1.1  CIRCLED HANGUL PHIEUPH A
-327B          ; mapped                 ; D558          # 1.1  CIRCLED HANGUL HIEUH A
-327C          ; mapped                 ; CC38 ACE0     # 4.0  CIRCLED KOREAN CHARACTER CHAMKO
-327D          ; mapped                 ; C8FC C758     # 4.0  CIRCLED KOREAN CHARACTER JUEUI
-327E          ; mapped                 ; C6B0          # 4.1  CIRCLED HANGUL IEUNG U
-327F          ; valid                  ;      ; NV8    # 1.1  KOREAN STANDARD SYMBOL
-3280          ; mapped                 ; 4E00          # 1.1  CIRCLED IDEOGRAPH ONE
-3281          ; mapped                 ; 4E8C          # 1.1  CIRCLED IDEOGRAPH TWO
-3282          ; mapped                 ; 4E09          # 1.1  CIRCLED IDEOGRAPH THREE
-3283          ; mapped                 ; 56DB          # 1.1  CIRCLED IDEOGRAPH FOUR
-3284          ; mapped                 ; 4E94          # 1.1  CIRCLED IDEOGRAPH FIVE
-3285          ; mapped                 ; 516D          # 1.1  CIRCLED IDEOGRAPH SIX
-3286          ; mapped                 ; 4E03          # 1.1  CIRCLED IDEOGRAPH SEVEN
-3287          ; mapped                 ; 516B          # 1.1  CIRCLED IDEOGRAPH EIGHT
-3288          ; mapped                 ; 4E5D          # 1.1  CIRCLED IDEOGRAPH NINE
-3289          ; mapped                 ; 5341          # 1.1  CIRCLED IDEOGRAPH TEN
-328A          ; mapped                 ; 6708          # 1.1  CIRCLED IDEOGRAPH MOON
-328B          ; mapped                 ; 706B          # 1.1  CIRCLED IDEOGRAPH FIRE
-328C          ; mapped                 ; 6C34          # 1.1  CIRCLED IDEOGRAPH WATER
-328D          ; mapped                 ; 6728          # 1.1  CIRCLED IDEOGRAPH WOOD
-328E          ; mapped                 ; 91D1          # 1.1  CIRCLED IDEOGRAPH METAL
-328F          ; mapped                 ; 571F          # 1.1  CIRCLED IDEOGRAPH EARTH
-3290          ; mapped                 ; 65E5          # 1.1  CIRCLED IDEOGRAPH SUN
-3291          ; mapped                 ; 682A          # 1.1  CIRCLED IDEOGRAPH STOCK
-3292          ; mapped                 ; 6709          # 1.1  CIRCLED IDEOGRAPH HAVE
-3293          ; mapped                 ; 793E          # 1.1  CIRCLED IDEOGRAPH SOCIETY
-3294          ; mapped                 ; 540D          # 1.1  CIRCLED IDEOGRAPH NAME
-3295          ; mapped                 ; 7279          # 1.1  CIRCLED IDEOGRAPH SPECIAL
-3296          ; mapped                 ; 8CA1          # 1.1  CIRCLED IDEOGRAPH FINANCIAL
-3297          ; mapped                 ; 795D          # 1.1  CIRCLED IDEOGRAPH CONGRATULATION
-3298          ; mapped                 ; 52B4          # 1.1  CIRCLED IDEOGRAPH LABOR
-3299          ; mapped                 ; 79D8          # 1.1  CIRCLED IDEOGRAPH SECRET
-329A          ; mapped                 ; 7537          # 1.1  CIRCLED IDEOGRAPH MALE
-329B          ; mapped                 ; 5973          # 1.1  CIRCLED IDEOGRAPH FEMALE
-329C          ; mapped                 ; 9069          # 1.1  CIRCLED IDEOGRAPH SUITABLE
-329D          ; mapped                 ; 512A          # 1.1  CIRCLED IDEOGRAPH EXCELLENT
-329E          ; mapped                 ; 5370          # 1.1  CIRCLED IDEOGRAPH PRINT
-329F          ; mapped                 ; 6CE8          # 1.1  CIRCLED IDEOGRAPH ATTENTION
-32A0          ; mapped                 ; 9805          # 1.1  CIRCLED IDEOGRAPH ITEM
-32A1          ; mapped                 ; 4F11          # 1.1  CIRCLED IDEOGRAPH REST
-32A2          ; mapped                 ; 5199          # 1.1  CIRCLED IDEOGRAPH COPY
-32A3          ; mapped                 ; 6B63          # 1.1  CIRCLED IDEOGRAPH CORRECT
-32A4          ; mapped                 ; 4E0A          # 1.1  CIRCLED IDEOGRAPH HIGH
-32A5          ; mapped                 ; 4E2D          # 1.1  CIRCLED IDEOGRAPH CENTRE
-32A6          ; mapped                 ; 4E0B          # 1.1  CIRCLED IDEOGRAPH LOW
-32A7          ; mapped                 ; 5DE6          # 1.1  CIRCLED IDEOGRAPH LEFT
-32A8          ; mapped                 ; 53F3          # 1.1  CIRCLED IDEOGRAPH RIGHT
-32A9          ; mapped                 ; 533B          # 1.1  CIRCLED IDEOGRAPH MEDICINE
-32AA          ; mapped                 ; 5B97          # 1.1  CIRCLED IDEOGRAPH RELIGION
-32AB          ; mapped                 ; 5B66          # 1.1  CIRCLED IDEOGRAPH STUDY
-32AC          ; mapped                 ; 76E3          # 1.1  CIRCLED IDEOGRAPH SUPERVISE
-32AD          ; mapped                 ; 4F01          # 1.1  CIRCLED IDEOGRAPH ENTERPRISE
-32AE          ; mapped                 ; 8CC7          # 1.1  CIRCLED IDEOGRAPH RESOURCE
-32AF          ; mapped                 ; 5354          # 1.1  CIRCLED IDEOGRAPH ALLIANCE
-32B0          ; mapped                 ; 591C          # 1.1  CIRCLED IDEOGRAPH NIGHT
-32B1          ; mapped                 ; 0033 0036     # 3.2  CIRCLED NUMBER THIRTY SIX
-32B2          ; mapped                 ; 0033 0037     # 3.2  CIRCLED NUMBER THIRTY SEVEN
-32B3          ; mapped                 ; 0033 0038     # 3.2  CIRCLED NUMBER THIRTY EIGHT
-32B4          ; mapped                 ; 0033 0039     # 3.2  CIRCLED NUMBER THIRTY NINE
-32B5          ; mapped                 ; 0034 0030     # 3.2  CIRCLED NUMBER FORTY
-32B6          ; mapped                 ; 0034 0031     # 3.2  CIRCLED NUMBER FORTY ONE
-32B7          ; mapped                 ; 0034 0032     # 3.2  CIRCLED NUMBER FORTY TWO
-32B8          ; mapped                 ; 0034 0033     # 3.2  CIRCLED NUMBER FORTY THREE
-32B9          ; mapped                 ; 0034 0034     # 3.2  CIRCLED NUMBER FORTY FOUR
-32BA          ; mapped                 ; 0034 0035     # 3.2  CIRCLED NUMBER FORTY FIVE
-32BB          ; mapped                 ; 0034 0036     # 3.2  CIRCLED NUMBER FORTY SIX
-32BC          ; mapped                 ; 0034 0037     # 3.2  CIRCLED NUMBER FORTY SEVEN
-32BD          ; mapped                 ; 0034 0038     # 3.2  CIRCLED NUMBER FORTY EIGHT
-32BE          ; mapped                 ; 0034 0039     # 3.2  CIRCLED NUMBER FORTY NINE
-32BF          ; mapped                 ; 0035 0030     # 3.2  CIRCLED NUMBER FIFTY
-32C0          ; mapped                 ; 0031 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY
-32C1          ; mapped                 ; 0032 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR FEBRUARY
-32C2          ; mapped                 ; 0033 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR MARCH
-32C3          ; mapped                 ; 0034 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR APRIL
-32C4          ; mapped                 ; 0035 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR MAY
-32C5          ; mapped                 ; 0036 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR JUNE
-32C6          ; mapped                 ; 0037 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR JULY
-32C7          ; mapped                 ; 0038 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR AUGUST
-32C8          ; mapped                 ; 0039 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR SEPTEMBER
-32C9          ; mapped                 ; 0031 0030 6708 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR OCTOBER
-32CA          ; mapped                 ; 0031 0031 6708 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR NOVEMBER
-32CB          ; mapped                 ; 0031 0032 6708 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER
-32CC          ; mapped                 ; 0068 0067     # 4.0  SQUARE HG
-32CD          ; mapped                 ; 0065 0072 0067 #4.0  SQUARE ERG
-32CE          ; mapped                 ; 0065 0076     # 4.0  SQUARE EV
-32CF          ; mapped                 ; 006C 0074 0064 #4.0  LIMITED LIABILITY SIGN
-32D0          ; mapped                 ; 30A2          # 1.1  CIRCLED KATAKANA A
-32D1          ; mapped                 ; 30A4          # 1.1  CIRCLED KATAKANA I
-32D2          ; mapped                 ; 30A6          # 1.1  CIRCLED KATAKANA U
-32D3          ; mapped                 ; 30A8          # 1.1  CIRCLED KATAKANA E
-32D4          ; mapped                 ; 30AA          # 1.1  CIRCLED KATAKANA O
-32D5          ; mapped                 ; 30AB          # 1.1  CIRCLED KATAKANA KA
-32D6          ; mapped                 ; 30AD          # 1.1  CIRCLED KATAKANA KI
-32D7          ; mapped                 ; 30AF          # 1.1  CIRCLED KATAKANA KU
-32D8          ; mapped                 ; 30B1          # 1.1  CIRCLED KATAKANA KE
-32D9          ; mapped                 ; 30B3          # 1.1  CIRCLED KATAKANA KO
-32DA          ; mapped                 ; 30B5          # 1.1  CIRCLED KATAKANA SA
-32DB          ; mapped                 ; 30B7          # 1.1  CIRCLED KATAKANA SI
-32DC          ; mapped                 ; 30B9          # 1.1  CIRCLED KATAKANA SU
-32DD          ; mapped                 ; 30BB          # 1.1  CIRCLED KATAKANA SE
-32DE          ; mapped                 ; 30BD          # 1.1  CIRCLED KATAKANA SO
-32DF          ; mapped                 ; 30BF          # 1.1  CIRCLED KATAKANA TA
-32E0          ; mapped                 ; 30C1          # 1.1  CIRCLED KATAKANA TI
-32E1          ; mapped                 ; 30C4          # 1.1  CIRCLED KATAKANA TU
-32E2          ; mapped                 ; 30C6          # 1.1  CIRCLED KATAKANA TE
-32E3          ; mapped                 ; 30C8          # 1.1  CIRCLED KATAKANA TO
-32E4          ; mapped                 ; 30CA          # 1.1  CIRCLED KATAKANA NA
-32E5          ; mapped                 ; 30CB          # 1.1  CIRCLED KATAKANA NI
-32E6          ; mapped                 ; 30CC          # 1.1  CIRCLED KATAKANA NU
-32E7          ; mapped                 ; 30CD          # 1.1  CIRCLED KATAKANA NE
-32E8          ; mapped                 ; 30CE          # 1.1  CIRCLED KATAKANA NO
-32E9          ; mapped                 ; 30CF          # 1.1  CIRCLED KATAKANA HA
-32EA          ; mapped                 ; 30D2          # 1.1  CIRCLED KATAKANA HI
-32EB          ; mapped                 ; 30D5          # 1.1  CIRCLED KATAKANA HU
-32EC          ; mapped                 ; 30D8          # 1.1  CIRCLED KATAKANA HE
-32ED          ; mapped                 ; 30DB          # 1.1  CIRCLED KATAKANA HO
-32EE          ; mapped                 ; 30DE          # 1.1  CIRCLED KATAKANA MA
-32EF          ; mapped                 ; 30DF          # 1.1  CIRCLED KATAKANA MI
-32F0          ; mapped                 ; 30E0          # 1.1  CIRCLED KATAKANA MU
-32F1          ; mapped                 ; 30E1          # 1.1  CIRCLED KATAKANA ME
-32F2          ; mapped                 ; 30E2          # 1.1  CIRCLED KATAKANA MO
-32F3          ; mapped                 ; 30E4          # 1.1  CIRCLED KATAKANA YA
-32F4          ; mapped                 ; 30E6          # 1.1  CIRCLED KATAKANA YU
-32F5          ; mapped                 ; 30E8          # 1.1  CIRCLED KATAKANA YO
-32F6          ; mapped                 ; 30E9          # 1.1  CIRCLED KATAKANA RA
-32F7          ; mapped                 ; 30EA          # 1.1  CIRCLED KATAKANA RI
-32F8          ; mapped                 ; 30EB          # 1.1  CIRCLED KATAKANA RU
-32F9          ; mapped                 ; 30EC          # 1.1  CIRCLED KATAKANA RE
-32FA          ; mapped                 ; 30ED          # 1.1  CIRCLED KATAKANA RO
-32FB          ; mapped                 ; 30EF          # 1.1  CIRCLED KATAKANA WA
-32FC          ; mapped                 ; 30F0          # 1.1  CIRCLED KATAKANA WI
-32FD          ; mapped                 ; 30F1          # 1.1  CIRCLED KATAKANA WE
-32FE          ; mapped                 ; 30F2          # 1.1  CIRCLED KATAKANA WO
-32FF          ; disallowed                             # NA   <reserved-32FF>
-3300          ; mapped                 ; 30A2 30D1 30FC 30C8 #1.1 SQUARE APAATO
-3301          ; mapped                 ; 30A2 30EB 30D5 30A1 #1.1 SQUARE ARUHUA
-3302          ; mapped                 ; 30A2 30F3 30DA 30A2 #1.1 SQUARE ANPEA
-3303          ; mapped                 ; 30A2 30FC 30EB #1.1  SQUARE AARU
-3304          ; mapped                 ; 30A4 30CB 30F3 30B0 #1.1 SQUARE ININGU
-3305          ; mapped                 ; 30A4 30F3 30C1 #1.1  SQUARE INTI
-3306          ; mapped                 ; 30A6 30A9 30F3 #1.1  SQUARE UON
-3307          ; mapped                 ; 30A8 30B9 30AF 30FC 30C9 #1.1 SQUARE ESUKUUDO
-3308          ; mapped                 ; 30A8 30FC 30AB 30FC #1.1 SQUARE EEKAA
-3309          ; mapped                 ; 30AA 30F3 30B9 #1.1  SQUARE ONSU
-330A          ; mapped                 ; 30AA 30FC 30E0 #1.1  SQUARE OOMU
-330B          ; mapped                 ; 30AB 30A4 30EA #1.1  SQUARE KAIRI
-330C          ; mapped                 ; 30AB 30E9 30C3 30C8 #1.1 SQUARE KARATTO
-330D          ; mapped                 ; 30AB 30ED 30EA 30FC #1.1 SQUARE KARORII
-330E          ; mapped                 ; 30AC 30ED 30F3 #1.1  SQUARE GARON
-330F          ; mapped                 ; 30AC 30F3 30DE #1.1  SQUARE GANMA
-3310          ; mapped                 ; 30AE 30AC     # 1.1  SQUARE GIGA
-3311          ; mapped                 ; 30AE 30CB 30FC #1.1  SQUARE GINII
-3312          ; mapped                 ; 30AD 30E5 30EA 30FC #1.1 SQUARE KYURII
-3313          ; mapped                 ; 30AE 30EB 30C0 30FC #1.1 SQUARE GIRUDAA
-3314          ; mapped                 ; 30AD 30ED     # 1.1  SQUARE KIRO
-3315          ; mapped                 ; 30AD 30ED 30B0 30E9 30E0 #1.1 SQUARE KIROGURAMU
-3316          ; mapped                 ; 30AD 30ED 30E1 30FC 30C8 30EB #1.1 SQUARE KIROMEETORU
-3317          ; mapped                 ; 30AD 30ED 30EF 30C3 30C8 #1.1 SQUARE KIROWATTO
-3318          ; mapped                 ; 30B0 30E9 30E0 #1.1  SQUARE GURAMU
-3319          ; mapped                 ; 30B0 30E9 30E0 30C8 30F3 #1.1 SQUARE GURAMUTON
-331A          ; mapped                 ; 30AF 30EB 30BC 30A4 30ED #1.1 SQUARE KURUZEIRO
-331B          ; mapped                 ; 30AF 30ED 30FC 30CD #1.1 SQUARE KUROONE
-331C          ; mapped                 ; 30B1 30FC 30B9 #1.1  SQUARE KEESU
-331D          ; mapped                 ; 30B3 30EB 30CA #1.1  SQUARE KORUNA
-331E          ; mapped                 ; 30B3 30FC 30DD #1.1  SQUARE KOOPO
-331F          ; mapped                 ; 30B5 30A4 30AF 30EB #1.1 SQUARE SAIKURU
-3320          ; mapped                 ; 30B5 30F3 30C1 30FC 30E0 #1.1 SQUARE SANTIIMU
-3321          ; mapped                 ; 30B7 30EA 30F3 30B0 #1.1 SQUARE SIRINGU
-3322          ; mapped                 ; 30BB 30F3 30C1 #1.1  SQUARE SENTI
-3323          ; mapped                 ; 30BB 30F3 30C8 #1.1  SQUARE SENTO
-3324          ; mapped                 ; 30C0 30FC 30B9 #1.1  SQUARE DAASU
-3325          ; mapped                 ; 30C7 30B7     # 1.1  SQUARE DESI
-3326          ; mapped                 ; 30C9 30EB     # 1.1  SQUARE DORU
-3327          ; mapped                 ; 30C8 30F3     # 1.1  SQUARE TON
-3328          ; mapped                 ; 30CA 30CE     # 1.1  SQUARE NANO
-3329          ; mapped                 ; 30CE 30C3 30C8 #1.1  SQUARE NOTTO
-332A          ; mapped                 ; 30CF 30A4 30C4 #1.1  SQUARE HAITU
-332B          ; mapped                 ; 30D1 30FC 30BB 30F3 30C8 #1.1 SQUARE PAASENTO
-332C          ; mapped                 ; 30D1 30FC 30C4 #1.1  SQUARE PAATU
-332D          ; mapped                 ; 30D0 30FC 30EC 30EB #1.1 SQUARE BAARERU
-332E          ; mapped                 ; 30D4 30A2 30B9 30C8 30EB #1.1 SQUARE PIASUTORU
-332F          ; mapped                 ; 30D4 30AF 30EB #1.1  SQUARE PIKURU
-3330          ; mapped                 ; 30D4 30B3     # 1.1  SQUARE PIKO
-3331          ; mapped                 ; 30D3 30EB     # 1.1  SQUARE BIRU
-3332          ; mapped                 ; 30D5 30A1 30E9 30C3 30C9 #1.1 SQUARE HUARADDO
-3333          ; mapped                 ; 30D5 30A3 30FC 30C8 #1.1 SQUARE HUIITO
-3334          ; mapped                 ; 30D6 30C3 30B7 30A7 30EB #1.1 SQUARE BUSSYERU
-3335          ; mapped                 ; 30D5 30E9 30F3 #1.1  SQUARE HURAN
-3336          ; mapped                 ; 30D8 30AF 30BF 30FC 30EB #1.1 SQUARE HEKUTAARU
-3337          ; mapped                 ; 30DA 30BD     # 1.1  SQUARE PESO
-3338          ; mapped                 ; 30DA 30CB 30D2 #1.1  SQUARE PENIHI
-3339          ; mapped                 ; 30D8 30EB 30C4 #1.1  SQUARE HERUTU
-333A          ; mapped                 ; 30DA 30F3 30B9 #1.1  SQUARE PENSU
-333B          ; mapped                 ; 30DA 30FC 30B8 #1.1  SQUARE PEEZI
-333C          ; mapped                 ; 30D9 30FC 30BF #1.1  SQUARE BEETA
-333D          ; mapped                 ; 30DD 30A4 30F3 30C8 #1.1 SQUARE POINTO
-333E          ; mapped                 ; 30DC 30EB 30C8 #1.1  SQUARE BORUTO
-333F          ; mapped                 ; 30DB 30F3     # 1.1  SQUARE HON
-3340          ; mapped                 ; 30DD 30F3 30C9 #1.1  SQUARE PONDO
-3341          ; mapped                 ; 30DB 30FC 30EB #1.1  SQUARE HOORU
-3342          ; mapped                 ; 30DB 30FC 30F3 #1.1  SQUARE HOON
-3343          ; mapped                 ; 30DE 30A4 30AF 30ED #1.1 SQUARE MAIKURO
-3344          ; mapped                 ; 30DE 30A4 30EB #1.1  SQUARE MAIRU
-3345          ; mapped                 ; 30DE 30C3 30CF #1.1  SQUARE MAHHA
-3346          ; mapped                 ; 30DE 30EB 30AF #1.1  SQUARE MARUKU
-3347          ; mapped                 ; 30DE 30F3 30B7 30E7 30F3 #1.1 SQUARE MANSYON
-3348          ; mapped                 ; 30DF 30AF 30ED 30F3 #1.1 SQUARE MIKURON
-3349          ; mapped                 ; 30DF 30EA     # 1.1  SQUARE MIRI
-334A          ; mapped                 ; 30DF 30EA 30D0 30FC 30EB #1.1 SQUARE MIRIBAARU
-334B          ; mapped                 ; 30E1 30AC     # 1.1  SQUARE MEGA
-334C          ; mapped                 ; 30E1 30AC 30C8 30F3 #1.1 SQUARE MEGATON
-334D          ; mapped                 ; 30E1 30FC 30C8 30EB #1.1 SQUARE MEETORU
-334E          ; mapped                 ; 30E4 30FC 30C9 #1.1  SQUARE YAADO
-334F          ; mapped                 ; 30E4 30FC 30EB #1.1  SQUARE YAARU
-3350          ; mapped                 ; 30E6 30A2 30F3 #1.1  SQUARE YUAN
-3351          ; mapped                 ; 30EA 30C3 30C8 30EB #1.1 SQUARE RITTORU
-3352          ; mapped                 ; 30EA 30E9     # 1.1  SQUARE RIRA
-3353          ; mapped                 ; 30EB 30D4 30FC #1.1  SQUARE RUPII
-3354          ; mapped                 ; 30EB 30FC 30D6 30EB #1.1 SQUARE RUUBURU
-3355          ; mapped                 ; 30EC 30E0     # 1.1  SQUARE REMU
-3356          ; mapped                 ; 30EC 30F3 30C8 30B2 30F3 #1.1 SQUARE RENTOGEN
-3357          ; mapped                 ; 30EF 30C3 30C8 #1.1  SQUARE WATTO
-3358          ; mapped                 ; 0030 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO
-3359          ; mapped                 ; 0031 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ONE
-335A          ; mapped                 ; 0032 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWO
-335B          ; mapped                 ; 0033 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THREE
-335C          ; mapped                 ; 0034 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOUR
-335D          ; mapped                 ; 0035 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIVE
-335E          ; mapped                 ; 0036 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIX
-335F          ; mapped                 ; 0037 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVEN
-3360          ; mapped                 ; 0038 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHT
-3361          ; mapped                 ; 0039 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINE
-3362          ; mapped                 ; 0031 0030 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TEN
-3363          ; mapped                 ; 0031 0031 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ELEVEN
-3364          ; mapped                 ; 0031 0032 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWELVE
-3365          ; mapped                 ; 0031 0033 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THIRTEEN
-3366          ; mapped                 ; 0031 0034 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOURTEEN
-3367          ; mapped                 ; 0031 0035 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIFTEEN
-3368          ; mapped                 ; 0031 0036 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIXTEEN
-3369          ; mapped                 ; 0031 0037 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVENTEEN
-336A          ; mapped                 ; 0031 0038 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHTEEN
-336B          ; mapped                 ; 0031 0039 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINETEEN
-336C          ; mapped                 ; 0032 0030 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY
-336D          ; mapped                 ; 0032 0031 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-ONE
-336E          ; mapped                 ; 0032 0032 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-TWO
-336F          ; mapped                 ; 0032 0033 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-THREE
-3370          ; mapped                 ; 0032 0034 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR
-3371          ; mapped                 ; 0068 0070 0061 #1.1  SQUARE HPA
-3372          ; mapped                 ; 0064 0061     # 1.1  SQUARE DA
-3373          ; mapped                 ; 0061 0075     # 1.1  SQUARE AU
-3374          ; mapped                 ; 0062 0061 0072 #1.1  SQUARE BAR
-3375          ; mapped                 ; 006F 0076     # 1.1  SQUARE OV
-3376          ; mapped                 ; 0070 0063     # 1.1  SQUARE PC
-3377          ; mapped                 ; 0064 006D     # 4.0  SQUARE DM
-3378          ; mapped                 ; 0064 006D 0032 #4.0  SQUARE DM SQUARED
-3379          ; mapped                 ; 0064 006D 0033 #4.0  SQUARE DM CUBED
-337A          ; mapped                 ; 0069 0075     # 4.0  SQUARE IU
-337B          ; mapped                 ; 5E73 6210     # 1.1  SQUARE ERA NAME HEISEI
-337C          ; mapped                 ; 662D 548C     # 1.1  SQUARE ERA NAME SYOUWA
-337D          ; mapped                 ; 5927 6B63     # 1.1  SQUARE ERA NAME TAISYOU
-337E          ; mapped                 ; 660E 6CBB     # 1.1  SQUARE ERA NAME MEIZI
-337F          ; mapped                 ; 682A 5F0F 4F1A 793E #1.1 SQUARE CORPORATION
-3380          ; mapped                 ; 0070 0061     # 1.1  SQUARE PA AMPS
-3381          ; mapped                 ; 006E 0061     # 1.1  SQUARE NA
-3382          ; mapped                 ; 03BC 0061     # 1.1  SQUARE MU A
-3383          ; mapped                 ; 006D 0061     # 1.1  SQUARE MA
-3384          ; mapped                 ; 006B 0061     # 1.1  SQUARE KA
-3385          ; mapped                 ; 006B 0062     # 1.1  SQUARE KB
-3386          ; mapped                 ; 006D 0062     # 1.1  SQUARE MB
-3387          ; mapped                 ; 0067 0062     # 1.1  SQUARE GB
-3388          ; mapped                 ; 0063 0061 006C #1.1  SQUARE CAL
-3389          ; mapped                 ; 006B 0063 0061 006C #1.1 SQUARE KCAL
-338A          ; mapped                 ; 0070 0066     # 1.1  SQUARE PF
-338B          ; mapped                 ; 006E 0066     # 1.1  SQUARE NF
-338C          ; mapped                 ; 03BC 0066     # 1.1  SQUARE MU F
-338D          ; mapped                 ; 03BC 0067     # 1.1  SQUARE MU G
-338E          ; mapped                 ; 006D 0067     # 1.1  SQUARE MG
-338F          ; mapped                 ; 006B 0067     # 1.1  SQUARE KG
-3390          ; mapped                 ; 0068 007A     # 1.1  SQUARE HZ
-3391          ; mapped                 ; 006B 0068 007A #1.1  SQUARE KHZ
-3392          ; mapped                 ; 006D 0068 007A #1.1  SQUARE MHZ
-3393          ; mapped                 ; 0067 0068 007A #1.1  SQUARE GHZ
-3394          ; mapped                 ; 0074 0068 007A #1.1  SQUARE THZ
-3395          ; mapped                 ; 03BC 006C     # 1.1  SQUARE MU L
-3396          ; mapped                 ; 006D 006C     # 1.1  SQUARE ML
-3397          ; mapped                 ; 0064 006C     # 1.1  SQUARE DL
-3398          ; mapped                 ; 006B 006C     # 1.1  SQUARE KL
-3399          ; mapped                 ; 0066 006D     # 1.1  SQUARE FM
-339A          ; mapped                 ; 006E 006D     # 1.1  SQUARE NM
-339B          ; mapped                 ; 03BC 006D     # 1.1  SQUARE MU M
-339C          ; mapped                 ; 006D 006D     # 1.1  SQUARE MM
-339D          ; mapped                 ; 0063 006D     # 1.1  SQUARE CM
-339E          ; mapped                 ; 006B 006D     # 1.1  SQUARE KM
-339F          ; mapped                 ; 006D 006D 0032 #1.1  SQUARE MM SQUARED
-33A0          ; mapped                 ; 0063 006D 0032 #1.1  SQUARE CM SQUARED
-33A1          ; mapped                 ; 006D 0032     # 1.1  SQUARE M SQUARED
-33A2          ; mapped                 ; 006B 006D 0032 #1.1  SQUARE KM SQUARED
-33A3          ; mapped                 ; 006D 006D 0033 #1.1  SQUARE MM CUBED
-33A4          ; mapped                 ; 0063 006D 0033 #1.1  SQUARE CM CUBED
-33A5          ; mapped                 ; 006D 0033     # 1.1  SQUARE M CUBED
-33A6          ; mapped                 ; 006B 006D 0033 #1.1  SQUARE KM CUBED
-33A7          ; mapped                 ; 006D 2215 0073 #1.1  SQUARE M OVER S
-33A8          ; mapped                 ; 006D 2215 0073 0032 #1.1 SQUARE M OVER S SQUARED
-33A9          ; mapped                 ; 0070 0061     # 1.1  SQUARE PA
-33AA          ; mapped                 ; 006B 0070 0061 #1.1  SQUARE KPA
-33AB          ; mapped                 ; 006D 0070 0061 #1.1  SQUARE MPA
-33AC          ; mapped                 ; 0067 0070 0061 #1.1  SQUARE GPA
-33AD          ; mapped                 ; 0072 0061 0064 #1.1  SQUARE RAD
-33AE          ; mapped                 ; 0072 0061 0064 2215 0073 #1.1 SQUARE RAD OVER S
-33AF          ; mapped                 ; 0072 0061 0064 2215 0073 0032 #1.1 SQUARE RAD OVER S SQUARED
-33B0          ; mapped                 ; 0070 0073     # 1.1  SQUARE PS
-33B1          ; mapped                 ; 006E 0073     # 1.1  SQUARE NS
-33B2          ; mapped                 ; 03BC 0073     # 1.1  SQUARE MU S
-33B3          ; mapped                 ; 006D 0073     # 1.1  SQUARE MS
-33B4          ; mapped                 ; 0070 0076     # 1.1  SQUARE PV
-33B5          ; mapped                 ; 006E 0076     # 1.1  SQUARE NV
-33B6          ; mapped                 ; 03BC 0076     # 1.1  SQUARE MU V
-33B7          ; mapped                 ; 006D 0076     # 1.1  SQUARE MV
-33B8          ; mapped                 ; 006B 0076     # 1.1  SQUARE KV
-33B9          ; mapped                 ; 006D 0076     # 1.1  SQUARE MV MEGA
-33BA          ; mapped                 ; 0070 0077     # 1.1  SQUARE PW
-33BB          ; mapped                 ; 006E 0077     # 1.1  SQUARE NW
-33BC          ; mapped                 ; 03BC 0077     # 1.1  SQUARE MU W
-33BD          ; mapped                 ; 006D 0077     # 1.1  SQUARE MW
-33BE          ; mapped                 ; 006B 0077     # 1.1  SQUARE KW
-33BF          ; mapped                 ; 006D 0077     # 1.1  SQUARE MW MEGA
-33C0          ; mapped                 ; 006B 03C9     # 1.1  SQUARE K OHM
-33C1          ; mapped                 ; 006D 03C9     # 1.1  SQUARE M OHM
-33C2          ; disallowed                             # 1.1  SQUARE AM
-33C3          ; mapped                 ; 0062 0071     # 1.1  SQUARE BQ
-33C4          ; mapped                 ; 0063 0063     # 1.1  SQUARE CC
-33C5          ; mapped                 ; 0063 0064     # 1.1  SQUARE CD
-33C6          ; mapped                 ; 0063 2215 006B 0067 #1.1 SQUARE C OVER KG
-33C7          ; disallowed                             # 1.1  SQUARE CO
-33C8          ; mapped                 ; 0064 0062     # 1.1  SQUARE DB
-33C9          ; mapped                 ; 0067 0079     # 1.1  SQUARE GY
-33CA          ; mapped                 ; 0068 0061     # 1.1  SQUARE HA
-33CB          ; mapped                 ; 0068 0070     # 1.1  SQUARE HP
-33CC          ; mapped                 ; 0069 006E     # 1.1  SQUARE IN
-33CD          ; mapped                 ; 006B 006B     # 1.1  SQUARE KK
-33CE          ; mapped                 ; 006B 006D     # 1.1  SQUARE KM CAPITAL
-33CF          ; mapped                 ; 006B 0074     # 1.1  SQUARE KT
-33D0          ; mapped                 ; 006C 006D     # 1.1  SQUARE LM
-33D1          ; mapped                 ; 006C 006E     # 1.1  SQUARE LN
-33D2          ; mapped                 ; 006C 006F 0067 #1.1  SQUARE LOG
-33D3          ; mapped                 ; 006C 0078     # 1.1  SQUARE LX
-33D4          ; mapped                 ; 006D 0062     # 1.1  SQUARE MB SMALL
-33D5          ; mapped                 ; 006D 0069 006C #1.1  SQUARE MIL
-33D6          ; mapped                 ; 006D 006F 006C #1.1  SQUARE MOL
-33D7          ; mapped                 ; 0070 0068     # 1.1  SQUARE PH
-33D8          ; disallowed                             # 1.1  SQUARE PM
-33D9          ; mapped                 ; 0070 0070 006D #1.1  SQUARE PPM
-33DA          ; mapped                 ; 0070 0072     # 1.1  SQUARE PR
-33DB          ; mapped                 ; 0073 0072     # 1.1  SQUARE SR
-33DC          ; mapped                 ; 0073 0076     # 1.1  SQUARE SV
-33DD          ; mapped                 ; 0077 0062     # 1.1  SQUARE WB
-33DE          ; mapped                 ; 0076 2215 006D #4.0  SQUARE V OVER M
-33DF          ; mapped                 ; 0061 2215 006D #4.0  SQUARE A OVER M
-33E0          ; mapped                 ; 0031 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE
-33E1          ; mapped                 ; 0032 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWO
-33E2          ; mapped                 ; 0033 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THREE
-33E3          ; mapped                 ; 0034 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOUR
-33E4          ; mapped                 ; 0035 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIVE
-33E5          ; mapped                 ; 0036 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIX
-33E6          ; mapped                 ; 0037 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVEN
-33E7          ; mapped                 ; 0038 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHT
-33E8          ; mapped                 ; 0039 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINE
-33E9          ; mapped                 ; 0031 0030 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TEN
-33EA          ; mapped                 ; 0031 0031 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ELEVEN
-33EB          ; mapped                 ; 0031 0032 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWELVE
-33EC          ; mapped                 ; 0031 0033 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTEEN
-33ED          ; mapped                 ; 0031 0034 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOURTEEN
-33EE          ; mapped                 ; 0031 0035 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIFTEEN
-33EF          ; mapped                 ; 0031 0036 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIXTEEN
-33F0          ; mapped                 ; 0031 0037 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVENTEEN
-33F1          ; mapped                 ; 0031 0038 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHTEEN
-33F2          ; mapped                 ; 0031 0039 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINETEEN
-33F3          ; mapped                 ; 0032 0030 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY
-33F4          ; mapped                 ; 0032 0031 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-ONE
-33F5          ; mapped                 ; 0032 0032 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-TWO
-33F6          ; mapped                 ; 0032 0033 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-THREE
-33F7          ; mapped                 ; 0032 0034 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FOUR
-33F8          ; mapped                 ; 0032 0035 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FIVE
-33F9          ; mapped                 ; 0032 0036 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SIX
-33FA          ; mapped                 ; 0032 0037 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SEVEN
-33FB          ; mapped                 ; 0032 0038 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-EIGHT
-33FC          ; mapped                 ; 0032 0039 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-NINE
-33FD          ; mapped                 ; 0033 0030 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY
-33FE          ; mapped                 ; 0033 0031 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE
-33FF          ; mapped                 ; 0067 0061 006C #4.0  SQUARE GAL
-3400..4DB5    ; valid                                  # 3.0  CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
-4DB6..4DBF    ; disallowed                             # NA   <reserved-4DB6>..<reserved-4DBF>
-4DC0..4DFF    ; valid                  ;      ; NV8    # 4.0  HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION
-4E00..9FA5    ; valid                                  # 1.1  CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FA5
-9FA6..9FBB    ; valid                                  # 4.1  CJK UNIFIED IDEOGRAPH-9FA6..CJK UNIFIED IDEOGRAPH-9FBB
-9FBC..9FC3    ; valid                                  # 5.1  CJK UNIFIED IDEOGRAPH-9FBC..CJK UNIFIED IDEOGRAPH-9FC3
-9FC4..9FCB    ; valid                                  # 5.2  CJK UNIFIED IDEOGRAPH-9FC4..CJK UNIFIED IDEOGRAPH-9FCB
-9FCC          ; valid                                  # 6.1  CJK UNIFIED IDEOGRAPH-9FCC
-9FCD..9FD5    ; valid                                  # 8.0  CJK UNIFIED IDEOGRAPH-9FCD..CJK UNIFIED IDEOGRAPH-9FD5
-9FD6..9FEA    ; valid                                  # 10.0 CJK UNIFIED IDEOGRAPH-9FD6..CJK UNIFIED IDEOGRAPH-9FEA
-9FEB..9FFF    ; disallowed                             # NA   <reserved-9FEB>..<reserved-9FFF>
-A000..A48C    ; valid                                  # 3.0  YI SYLLABLE IT..YI SYLLABLE YYR
-A48D..A48F    ; disallowed                             # NA   <reserved-A48D>..<reserved-A48F>
-A490..A4A1    ; valid                  ;      ; NV8    # 3.0  YI RADICAL QOT..YI RADICAL GA
-A4A2..A4A3    ; valid                  ;      ; NV8    # 3.2  YI RADICAL ZUP..YI RADICAL CYT
-A4A4..A4B3    ; valid                  ;      ; NV8    # 3.0  YI RADICAL DDUR..YI RADICAL JO
-A4B4          ; valid                  ;      ; NV8    # 3.2  YI RADICAL NZUP
-A4B5..A4C0    ; valid                  ;      ; NV8    # 3.0  YI RADICAL JJY..YI RADICAL SHAT
-A4C1          ; valid                  ;      ; NV8    # 3.2  YI RADICAL ZUR
-A4C2..A4C4    ; valid                  ;      ; NV8    # 3.0  YI RADICAL SHOP..YI RADICAL ZZIET
-A4C5          ; valid                  ;      ; NV8    # 3.2  YI RADICAL NBIE
-A4C6          ; valid                  ;      ; NV8    # 3.0  YI RADICAL KE
-A4C7..A4CF    ; disallowed                             # NA   <reserved-A4C7>..<reserved-A4CF>
-A4D0..A4FD    ; valid                                  # 5.2  LISU LETTER BA..LISU LETTER TONE MYA JEU
-A4FE..A4FF    ; valid                  ;      ; NV8    # 5.2  LISU PUNCTUATION COMMA..LISU PUNCTUATION FULL STOP
-A500..A60C    ; valid                                  # 5.1  VAI SYLLABLE EE..VAI SYLLABLE LENGTHENER
-A60D..A60F    ; valid                  ;      ; NV8    # 5.1  VAI COMMA..VAI QUESTION MARK
-A610..A62B    ; valid                                  # 5.1  VAI SYLLABLE NDOLE FA..VAI SYLLABLE NDOLE DO
-A62C..A63F    ; disallowed                             # NA   <reserved-A62C>..<reserved-A63F>
-A640          ; mapped                 ; A641          # 5.1  CYRILLIC CAPITAL LETTER ZEMLYA
-A641          ; valid                                  # 5.1  CYRILLIC SMALL LETTER ZEMLYA
-A642          ; mapped                 ; A643          # 5.1  CYRILLIC CAPITAL LETTER DZELO
-A643          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DZELO
-A644          ; mapped                 ; A645          # 5.1  CYRILLIC CAPITAL LETTER REVERSED DZE
-A645          ; valid                                  # 5.1  CYRILLIC SMALL LETTER REVERSED DZE
-A646          ; mapped                 ; A647          # 5.1  CYRILLIC CAPITAL LETTER IOTA
-A647          ; valid                                  # 5.1  CYRILLIC SMALL LETTER IOTA
-A648          ; mapped                 ; A649          # 5.1  CYRILLIC CAPITAL LETTER DJERV
-A649          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DJERV
-A64A          ; mapped                 ; A64B          # 5.1  CYRILLIC CAPITAL LETTER MONOGRAPH UK
-A64B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER MONOGRAPH UK
-A64C          ; mapped                 ; A64D          # 5.1  CYRILLIC CAPITAL LETTER BROAD OMEGA
-A64D          ; valid                                  # 5.1  CYRILLIC SMALL LETTER BROAD OMEGA
-A64E          ; mapped                 ; A64F          # 5.1  CYRILLIC CAPITAL LETTER NEUTRAL YER
-A64F          ; valid                                  # 5.1  CYRILLIC SMALL LETTER NEUTRAL YER
-A650          ; mapped                 ; A651          # 5.1  CYRILLIC CAPITAL LETTER YERU WITH BACK YER
-A651          ; valid                                  # 5.1  CYRILLIC SMALL LETTER YERU WITH BACK YER
-A652          ; mapped                 ; A653          # 5.1  CYRILLIC CAPITAL LETTER IOTIFIED YAT
-A653          ; valid                                  # 5.1  CYRILLIC SMALL LETTER IOTIFIED YAT
-A654          ; mapped                 ; A655          # 5.1  CYRILLIC CAPITAL LETTER REVERSED YU
-A655          ; valid                                  # 5.1  CYRILLIC SMALL LETTER REVERSED YU
-A656          ; mapped                 ; A657          # 5.1  CYRILLIC CAPITAL LETTER IOTIFIED A
-A657          ; valid                                  # 5.1  CYRILLIC SMALL LETTER IOTIFIED A
-A658          ; mapped                 ; A659          # 5.1  CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
-A659          ; valid                                  # 5.1  CYRILLIC SMALL LETTER CLOSED LITTLE YUS
-A65A          ; mapped                 ; A65B          # 5.1  CYRILLIC CAPITAL LETTER BLENDED YUS
-A65B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER BLENDED YUS
-A65C          ; mapped                 ; A65D          # 5.1  CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS
-A65D          ; valid                                  # 5.1  CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS
-A65E          ; mapped                 ; A65F          # 5.1  CYRILLIC CAPITAL LETTER YN
-A65F          ; valid                                  # 5.1  CYRILLIC SMALL LETTER YN
-A660          ; mapped                 ; A661          # 6.0  CYRILLIC CAPITAL LETTER REVERSED TSE
-A661          ; valid                                  # 6.0  CYRILLIC SMALL LETTER REVERSED TSE
-A662          ; mapped                 ; A663          # 5.1  CYRILLIC CAPITAL LETTER SOFT DE
-A663          ; valid                                  # 5.1  CYRILLIC SMALL LETTER SOFT DE
-A664          ; mapped                 ; A665          # 5.1  CYRILLIC CAPITAL LETTER SOFT EL
-A665          ; valid                                  # 5.1  CYRILLIC SMALL LETTER SOFT EL
-A666          ; mapped                 ; A667          # 5.1  CYRILLIC CAPITAL LETTER SOFT EM
-A667          ; valid                                  # 5.1  CYRILLIC SMALL LETTER SOFT EM
-A668          ; mapped                 ; A669          # 5.1  CYRILLIC CAPITAL LETTER MONOCULAR O
-A669          ; valid                                  # 5.1  CYRILLIC SMALL LETTER MONOCULAR O
-A66A          ; mapped                 ; A66B          # 5.1  CYRILLIC CAPITAL LETTER BINOCULAR O
-A66B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER BINOCULAR O
-A66C          ; mapped                 ; A66D          # 5.1  CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
-A66D..A66F    ; valid                                  # 5.1  CYRILLIC SMALL LETTER DOUBLE MONOCULAR O..COMBINING CYRILLIC VZMET
-A670..A673    ; valid                  ;      ; NV8    # 5.1  COMBINING CYRILLIC TEN MILLIONS SIGN..SLAVONIC ASTERISK
-A674..A67B    ; valid                                  # 6.1  COMBINING CYRILLIC LETTER UKRAINIAN IE..COMBINING CYRILLIC LETTER OMEGA
-A67C..A67D    ; valid                                  # 5.1  COMBINING CYRILLIC KAVYKA..COMBINING CYRILLIC PAYEROK
-A67E          ; valid                  ;      ; NV8    # 5.1  CYRILLIC KAVYKA
-A67F          ; valid                                  # 5.1  CYRILLIC PAYEROK
-A680          ; mapped                 ; A681          # 5.1  CYRILLIC CAPITAL LETTER DWE
-A681          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DWE
-A682          ; mapped                 ; A683          # 5.1  CYRILLIC CAPITAL LETTER DZWE
-A683          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DZWE
-A684          ; mapped                 ; A685          # 5.1  CYRILLIC CAPITAL LETTER ZHWE
-A685          ; valid                                  # 5.1  CYRILLIC SMALL LETTER ZHWE
-A686          ; mapped                 ; A687          # 5.1  CYRILLIC CAPITAL LETTER CCHE
-A687          ; valid                                  # 5.1  CYRILLIC SMALL LETTER CCHE
-A688          ; mapped                 ; A689          # 5.1  CYRILLIC CAPITAL LETTER DZZE
-A689          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DZZE
-A68A          ; mapped                 ; A68B          # 5.1  CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
-A68B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK
-A68C          ; mapped                 ; A68D          # 5.1  CYRILLIC CAPITAL LETTER TWE
-A68D          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TWE
-A68E          ; mapped                 ; A68F          # 5.1  CYRILLIC CAPITAL LETTER TSWE
-A68F          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TSWE
-A690          ; mapped                 ; A691          # 5.1  CYRILLIC CAPITAL LETTER TSSE
-A691          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TSSE
-A692          ; mapped                 ; A693          # 5.1  CYRILLIC CAPITAL LETTER TCHE
-A693          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TCHE
-A694          ; mapped                 ; A695          # 5.1  CYRILLIC CAPITAL LETTER HWE
-A695          ; valid                                  # 5.1  CYRILLIC SMALL LETTER HWE
-A696          ; mapped                 ; A697          # 5.1  CYRILLIC CAPITAL LETTER SHWE
-A697          ; valid                                  # 5.1  CYRILLIC SMALL LETTER SHWE
-A698          ; mapped                 ; A699          # 7.0  CYRILLIC CAPITAL LETTER DOUBLE O
-A699          ; valid                                  # 7.0  CYRILLIC SMALL LETTER DOUBLE O
-A69A          ; mapped                 ; A69B          # 7.0  CYRILLIC CAPITAL LETTER CROSSED O
-A69B          ; valid                                  # 7.0  CYRILLIC SMALL LETTER CROSSED O
-A69C          ; mapped                 ; 044A          # 7.0  MODIFIER LETTER CYRILLIC HARD SIGN
-A69D          ; mapped                 ; 044C          # 7.0  MODIFIER LETTER CYRILLIC SOFT SIGN
-A69E          ; valid                                  # 8.0  COMBINING CYRILLIC LETTER EF
-A69F          ; valid                                  # 6.1  COMBINING CYRILLIC LETTER IOTIFIED E
-A6A0..A6E5    ; valid                                  # 5.2  BAMUM LETTER A..BAMUM LETTER KI
-A6E6..A6EF    ; valid                  ;      ; NV8    # 5.2  BAMUM LETTER MO..BAMUM LETTER KOGHOM
-A6F0..A6F1    ; valid                                  # 5.2  BAMUM COMBINING MARK KOQNDON..BAMUM COMBINING MARK TUKWENTIS
-A6F2..A6F7    ; valid                  ;      ; NV8    # 5.2  BAMUM NJAEMLI..BAMUM QUESTION MARK
-A6F8..A6FF    ; disallowed                             # NA   <reserved-A6F8>..<reserved-A6FF>
-A700..A716    ; valid                  ;      ; NV8    # 4.1  MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR
-A717..A71A    ; valid                                  # 5.0  MODIFIER LETTER DOT VERTICAL BAR..MODIFIER LETTER LOWER RIGHT CORNER ANGLE
-A71B..A71F    ; valid                                  # 5.1  MODIFIER LETTER RAISED UP ARROW..MODIFIER LETTER LOW INVERTED EXCLAMATION MARK
-A720..A721    ; valid                  ;      ; NV8    # 5.0  MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE
-A722          ; mapped                 ; A723          # 5.1  LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
-A723          ; valid                                  # 5.1  LATIN SMALL LETTER EGYPTOLOGICAL ALEF
-A724          ; mapped                 ; A725          # 5.1  LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
-A725          ; valid                                  # 5.1  LATIN SMALL LETTER EGYPTOLOGICAL AIN
-A726          ; mapped                 ; A727          # 5.1  LATIN CAPITAL LETTER HENG
-A727          ; valid                                  # 5.1  LATIN SMALL LETTER HENG
-A728          ; mapped                 ; A729          # 5.1  LATIN CAPITAL LETTER TZ
-A729          ; valid                                  # 5.1  LATIN SMALL LETTER TZ
-A72A          ; mapped                 ; A72B          # 5.1  LATIN CAPITAL LETTER TRESILLO
-A72B          ; valid                                  # 5.1  LATIN SMALL LETTER TRESILLO
-A72C          ; mapped                 ; A72D          # 5.1  LATIN CAPITAL LETTER CUATRILLO
-A72D          ; valid                                  # 5.1  LATIN SMALL LETTER CUATRILLO
-A72E          ; mapped                 ; A72F          # 5.1  LATIN CAPITAL LETTER CUATRILLO WITH COMMA
-A72F..A731    ; valid                                  # 5.1  LATIN SMALL LETTER CUATRILLO WITH COMMA..LATIN LETTER SMALL CAPITAL S
-A732          ; mapped                 ; A733          # 5.1  LATIN CAPITAL LETTER AA
-A733          ; valid                                  # 5.1  LATIN SMALL LETTER AA
-A734          ; mapped                 ; A735          # 5.1  LATIN CAPITAL LETTER AO
-A735          ; valid                                  # 5.1  LATIN SMALL LETTER AO
-A736          ; mapped                 ; A737          # 5.1  LATIN CAPITAL LETTER AU
-A737          ; valid                                  # 5.1  LATIN SMALL LETTER AU
-A738          ; mapped                 ; A739          # 5.1  LATIN CAPITAL LETTER AV
-A739          ; valid                                  # 5.1  LATIN SMALL LETTER AV
-A73A          ; mapped                 ; A73B          # 5.1  LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
-A73B          ; valid                                  # 5.1  LATIN SMALL LETTER AV WITH HORIZONTAL BAR
-A73C          ; mapped                 ; A73D          # 5.1  LATIN CAPITAL LETTER AY
-A73D          ; valid                                  # 5.1  LATIN SMALL LETTER AY
-A73E          ; mapped                 ; A73F          # 5.1  LATIN CAPITAL LETTER REVERSED C WITH DOT
-A73F          ; valid                                  # 5.1  LATIN SMALL LETTER REVERSED C WITH DOT
-A740          ; mapped                 ; A741          # 5.1  LATIN CAPITAL LETTER K WITH STROKE
-A741          ; valid                                  # 5.1  LATIN SMALL LETTER K WITH STROKE
-A742          ; mapped                 ; A743          # 5.1  LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
-A743          ; valid                                  # 5.1  LATIN SMALL LETTER K WITH DIAGONAL STROKE
-A744          ; mapped                 ; A745          # 5.1  LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
-A745          ; valid                                  # 5.1  LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE
-A746          ; mapped                 ; A747          # 5.1  LATIN CAPITAL LETTER BROKEN L
-A747          ; valid                                  # 5.1  LATIN SMALL LETTER BROKEN L
-A748          ; mapped                 ; A749          # 5.1  LATIN CAPITAL LETTER L WITH HIGH STROKE
-A749          ; valid                                  # 5.1  LATIN SMALL LETTER L WITH HIGH STROKE
-A74A          ; mapped                 ; A74B          # 5.1  LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
-A74B          ; valid                                  # 5.1  LATIN SMALL LETTER O WITH LONG STROKE OVERLAY
-A74C          ; mapped                 ; A74D          # 5.1  LATIN CAPITAL LETTER O WITH LOOP
-A74D          ; valid                                  # 5.1  LATIN SMALL LETTER O WITH LOOP
-A74E          ; mapped                 ; A74F          # 5.1  LATIN CAPITAL LETTER OO
-A74F          ; valid                                  # 5.1  LATIN SMALL LETTER OO
-A750          ; mapped                 ; A751          # 5.1  LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
-A751          ; valid                                  # 5.1  LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER
-A752          ; mapped                 ; A753          # 5.1  LATIN CAPITAL LETTER P WITH FLOURISH
-A753          ; valid                                  # 5.1  LATIN SMALL LETTER P WITH FLOURISH
-A754          ; mapped                 ; A755          # 5.1  LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
-A755          ; valid                                  # 5.1  LATIN SMALL LETTER P WITH SQUIRREL TAIL
-A756          ; mapped                 ; A757          # 5.1  LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
-A757          ; valid                                  # 5.1  LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER
-A758          ; mapped                 ; A759          # 5.1  LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
-A759          ; valid                                  # 5.1  LATIN SMALL LETTER Q WITH DIAGONAL STROKE
-A75A          ; mapped                 ; A75B          # 5.1  LATIN CAPITAL LETTER R ROTUNDA
-A75B          ; valid                                  # 5.1  LATIN SMALL LETTER R ROTUNDA
-A75C          ; mapped                 ; A75D          # 5.1  LATIN CAPITAL LETTER RUM ROTUNDA
-A75D          ; valid                                  # 5.1  LATIN SMALL LETTER RUM ROTUNDA
-A75E          ; mapped                 ; A75F          # 5.1  LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
-A75F          ; valid                                  # 5.1  LATIN SMALL LETTER V WITH DIAGONAL STROKE
-A760          ; mapped                 ; A761          # 5.1  LATIN CAPITAL LETTER VY
-A761          ; valid                                  # 5.1  LATIN SMALL LETTER VY
-A762          ; mapped                 ; A763          # 5.1  LATIN CAPITAL LETTER VISIGOTHIC Z
-A763          ; valid                                  # 5.1  LATIN SMALL LETTER VISIGOTHIC Z
-A764          ; mapped                 ; A765          # 5.1  LATIN CAPITAL LETTER THORN WITH STROKE
-A765          ; valid                                  # 5.1  LATIN SMALL LETTER THORN WITH STROKE
-A766          ; mapped                 ; A767          # 5.1  LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER
-A767          ; valid                                  # 5.1  LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER
-A768          ; mapped                 ; A769          # 5.1  LATIN CAPITAL LETTER VEND
-A769          ; valid                                  # 5.1  LATIN SMALL LETTER VEND
-A76A          ; mapped                 ; A76B          # 5.1  LATIN CAPITAL LETTER ET
-A76B          ; valid                                  # 5.1  LATIN SMALL LETTER ET
-A76C          ; mapped                 ; A76D          # 5.1  LATIN CAPITAL LETTER IS
-A76D          ; valid                                  # 5.1  LATIN SMALL LETTER IS
-A76E          ; mapped                 ; A76F          # 5.1  LATIN CAPITAL LETTER CON
-A76F          ; valid                                  # 5.1  LATIN SMALL LETTER CON
-A770          ; mapped                 ; A76F          # 5.1  MODIFIER LETTER US
-A771..A778    ; valid                                  # 5.1  LATIN SMALL LETTER DUM..LATIN SMALL LETTER UM
-A779          ; mapped                 ; A77A          # 5.1  LATIN CAPITAL LETTER INSULAR D
-A77A          ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR D
-A77B          ; mapped                 ; A77C          # 5.1  LATIN CAPITAL LETTER INSULAR F
-A77C          ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR F
-A77D          ; mapped                 ; 1D79          # 5.1  LATIN CAPITAL LETTER INSULAR G
-A77E          ; mapped                 ; A77F          # 5.1  LATIN CAPITAL LETTER TURNED INSULAR G
-A77F          ; valid                                  # 5.1  LATIN SMALL LETTER TURNED INSULAR G
-A780          ; mapped                 ; A781          # 5.1  LATIN CAPITAL LETTER TURNED L
-A781          ; valid                                  # 5.1  LATIN SMALL LETTER TURNED L
-A782          ; mapped                 ; A783          # 5.1  LATIN CAPITAL LETTER INSULAR R
-A783          ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR R
-A784          ; mapped                 ; A785          # 5.1  LATIN CAPITAL LETTER INSULAR S
-A785          ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR S
-A786          ; mapped                 ; A787          # 5.1  LATIN CAPITAL LETTER INSULAR T
-A787..A788    ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR T..MODIFIER LETTER LOW CIRCUMFLEX ACCENT
-A789..A78A    ; valid                  ;      ; NV8    # 5.1  MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN
-A78B          ; mapped                 ; A78C          # 5.1  LATIN CAPITAL LETTER SALTILLO
-A78C          ; valid                                  # 5.1  LATIN SMALL LETTER SALTILLO
-A78D          ; mapped                 ; 0265          # 6.0  LATIN CAPITAL LETTER TURNED H
-A78E          ; valid                                  # 6.0  LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
-A78F          ; valid                                  # 8.0  LATIN LETTER SINOLOGICAL DOT
-A790          ; mapped                 ; A791          # 6.0  LATIN CAPITAL LETTER N WITH DESCENDER
-A791          ; valid                                  # 6.0  LATIN SMALL LETTER N WITH DESCENDER
-A792          ; mapped                 ; A793          # 6.1  LATIN CAPITAL LETTER C WITH BAR
-A793          ; valid                                  # 6.1  LATIN SMALL LETTER C WITH BAR
-A794..A795    ; valid                                  # 7.0  LATIN SMALL LETTER C WITH PALATAL HOOK..LATIN SMALL LETTER H WITH PALATAL HOOK
-A796          ; mapped                 ; A797          # 7.0  LATIN CAPITAL LETTER B WITH FLOURISH
-A797          ; valid                                  # 7.0  LATIN SMALL LETTER B WITH FLOURISH
-A798          ; mapped                 ; A799          # 7.0  LATIN CAPITAL LETTER F WITH STROKE
-A799          ; valid                                  # 7.0  LATIN SMALL LETTER F WITH STROKE
-A79A          ; mapped                 ; A79B          # 7.0  LATIN CAPITAL LETTER VOLAPUK AE
-A79B          ; valid                                  # 7.0  LATIN SMALL LETTER VOLAPUK AE
-A79C          ; mapped                 ; A79D          # 7.0  LATIN CAPITAL LETTER VOLAPUK OE
-A79D          ; valid                                  # 7.0  LATIN SMALL LETTER VOLAPUK OE
-A79E          ; mapped                 ; A79F          # 7.0  LATIN CAPITAL LETTER VOLAPUK UE
-A79F          ; valid                                  # 7.0  LATIN SMALL LETTER VOLAPUK UE
-A7A0          ; mapped                 ; A7A1          # 6.0  LATIN CAPITAL LETTER G WITH OBLIQUE STROKE
-A7A1          ; valid                                  # 6.0  LATIN SMALL LETTER G WITH OBLIQUE STROKE
-A7A2          ; mapped                 ; A7A3          # 6.0  LATIN CAPITAL LETTER K WITH OBLIQUE STROKE
-A7A3          ; valid                                  # 6.0  LATIN SMALL LETTER K WITH OBLIQUE STROKE
-A7A4          ; mapped                 ; A7A5          # 6.0  LATIN CAPITAL LETTER N WITH OBLIQUE STROKE
-A7A5          ; valid                                  # 6.0  LATIN SMALL LETTER N WITH OBLIQUE STROKE
-A7A6          ; mapped                 ; A7A7          # 6.0  LATIN CAPITAL LETTER R WITH OBLIQUE STROKE
-A7A7          ; valid                                  # 6.0  LATIN SMALL LETTER R WITH OBLIQUE STROKE
-A7A8          ; mapped                 ; A7A9          # 6.0  LATIN CAPITAL LETTER S WITH OBLIQUE STROKE
-A7A9          ; valid                                  # 6.0  LATIN SMALL LETTER S WITH OBLIQUE STROKE
-A7AA          ; mapped                 ; 0266          # 6.1  LATIN CAPITAL LETTER H WITH HOOK
-A7AB          ; mapped                 ; 025C          # 7.0  LATIN CAPITAL LETTER REVERSED OPEN E
-A7AC          ; mapped                 ; 0261          # 7.0  LATIN CAPITAL LETTER SCRIPT G
-A7AD          ; mapped                 ; 026C          # 7.0  LATIN CAPITAL LETTER L WITH BELT
-A7AE          ; mapped                 ; 026A          # 9.0  LATIN CAPITAL LETTER SMALL CAPITAL I
-A7AF          ; disallowed                             # NA   <reserved-A7AF>
-A7B0          ; mapped                 ; 029E          # 7.0  LATIN CAPITAL LETTER TURNED K
-A7B1          ; mapped                 ; 0287          # 7.0  LATIN CAPITAL LETTER TURNED T
-A7B2          ; mapped                 ; 029D          # 8.0  LATIN CAPITAL LETTER J WITH CROSSED-TAIL
-A7B3          ; mapped                 ; AB53          # 8.0  LATIN CAPITAL LETTER CHI
-A7B4          ; mapped                 ; A7B5          # 8.0  LATIN CAPITAL LETTER BETA
-A7B5          ; valid                                  # 8.0  LATIN SMALL LETTER BETA
-A7B6          ; mapped                 ; A7B7          # 8.0  LATIN CAPITAL LETTER OMEGA
-A7B7          ; valid                                  # 8.0  LATIN SMALL LETTER OMEGA
-A7B8..A7F6    ; disallowed                             # NA   <reserved-A7B8>..<reserved-A7F6>
-A7F7          ; valid                                  # 7.0  LATIN EPIGRAPHIC LETTER SIDEWAYS I
-A7F8          ; mapped                 ; 0127          # 6.1  MODIFIER LETTER CAPITAL H WITH STROKE
-A7F9          ; mapped                 ; 0153          # 6.1  MODIFIER LETTER SMALL LIGATURE OE
-A7FA          ; valid                                  # 6.0  LATIN LETTER SMALL CAPITAL TURNED M
-A7FB..A7FF    ; valid                                  # 5.1  LATIN EPIGRAPHIC LETTER REVERSED F..LATIN EPIGRAPHIC LETTER ARCHAIC M
-A800..A827    ; valid                                  # 4.1  SYLOTI NAGRI LETTER A..SYLOTI NAGRI VOWEL SIGN OO
-A828..A82B    ; valid                  ;      ; NV8    # 4.1  SYLOTI NAGRI POETRY MARK-1..SYLOTI NAGRI POETRY MARK-4
-A82C..A82F    ; disallowed                             # NA   <reserved-A82C>..<reserved-A82F>
-A830..A839    ; valid                  ;      ; NV8    # 5.2  NORTH INDIC FRACTION ONE QUARTER..NORTH INDIC QUANTITY MARK
-A83A..A83F    ; disallowed                             # NA   <reserved-A83A>..<reserved-A83F>
-A840..A873    ; valid                                  # 5.0  PHAGS-PA LETTER KA..PHAGS-PA LETTER CANDRABINDU
-A874..A877    ; valid                  ;      ; NV8    # 5.0  PHAGS-PA SINGLE HEAD MARK..PHAGS-PA MARK DOUBLE SHAD
-A878..A87F    ; disallowed                             # NA   <reserved-A878>..<reserved-A87F>
-A880..A8C4    ; valid                                  # 5.1  SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VIRAMA
-A8C5          ; valid                                  # 9.0  SAURASHTRA SIGN CANDRABINDU
-A8C6..A8CD    ; disallowed                             # NA   <reserved-A8C6>..<reserved-A8CD>
-A8CE..A8CF    ; valid                  ;      ; NV8    # 5.1  SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA
-A8D0..A8D9    ; valid                                  # 5.1  SAURASHTRA DIGIT ZERO..SAURASHTRA DIGIT NINE
-A8DA..A8DF    ; disallowed                             # NA   <reserved-A8DA>..<reserved-A8DF>
-A8E0..A8F7    ; valid                                  # 5.2  COMBINING DEVANAGARI DIGIT ZERO..DEVANAGARI SIGN CANDRABINDU AVAGRAHA
-A8F8..A8FA    ; valid                  ;      ; NV8    # 5.2  DEVANAGARI SIGN PUSHPIKA..DEVANAGARI CARET
-A8FB          ; valid                                  # 5.2  DEVANAGARI HEADSTROKE
-A8FC          ; valid                  ;      ; NV8    # 8.0  DEVANAGARI SIGN SIDDHAM
-A8FD          ; valid                                  # 8.0  DEVANAGARI JAIN OM
-A8FE..A8FF    ; disallowed                             # NA   <reserved-A8FE>..<reserved-A8FF>
-A900..A92D    ; valid                                  # 5.1  KAYAH LI DIGIT ZERO..KAYAH LI TONE CALYA PLOPHU
-A92E..A92F    ; valid                  ;      ; NV8    # 5.1  KAYAH LI SIGN CWI..KAYAH LI SIGN SHYA
-A930..A953    ; valid                                  # 5.1  REJANG LETTER KA..REJANG VIRAMA
-A954..A95E    ; disallowed                             # NA   <reserved-A954>..<reserved-A95E>
-A95F          ; valid                  ;      ; NV8    # 5.1  REJANG SECTION MARK
-A960..A97C    ; valid                  ;      ; NV8    # 5.2  HANGUL CHOSEONG TIKEUT-MIEUM..HANGUL CHOSEONG SSANGYEORINHIEUH
-A97D..A97F    ; disallowed                             # NA   <reserved-A97D>..<reserved-A97F>
-A980..A9C0    ; valid                                  # 5.2  JAVANESE SIGN PANYANGGA..JAVANESE PANGKON
-A9C1..A9CD    ; valid                  ;      ; NV8    # 5.2  JAVANESE LEFT RERENGGAN..JAVANESE TURNED PADA PISELEH
-A9CE          ; disallowed                             # NA   <reserved-A9CE>
-A9CF..A9D9    ; valid                                  # 5.2  JAVANESE PANGRANGKEP..JAVANESE DIGIT NINE
-A9DA..A9DD    ; disallowed                             # NA   <reserved-A9DA>..<reserved-A9DD>
-A9DE..A9DF    ; valid                  ;      ; NV8    # 5.2  JAVANESE PADA TIRTA TUMETES..JAVANESE PADA ISEN-ISEN
-A9E0..A9FE    ; valid                                  # 7.0  MYANMAR LETTER SHAN GHA..MYANMAR LETTER TAI LAING BHA
-A9FF          ; disallowed                             # NA   <reserved-A9FF>
-AA00..AA36    ; valid                                  # 5.1  CHAM LETTER A..CHAM CONSONANT SIGN WA
-AA37..AA3F    ; disallowed                             # NA   <reserved-AA37>..<reserved-AA3F>
-AA40..AA4D    ; valid                                  # 5.1  CHAM LETTER FINAL K..CHAM CONSONANT SIGN FINAL H
-AA4E..AA4F    ; disallowed                             # NA   <reserved-AA4E>..<reserved-AA4F>
-AA50..AA59    ; valid                                  # 5.1  CHAM DIGIT ZERO..CHAM DIGIT NINE
-AA5A..AA5B    ; disallowed                             # NA   <reserved-AA5A>..<reserved-AA5B>
-AA5C..AA5F    ; valid                  ;      ; NV8    # 5.1  CHAM PUNCTUATION SPIRAL..CHAM PUNCTUATION TRIPLE DANDA
-AA60..AA76    ; valid                                  # 5.2  MYANMAR LETTER KHAMTI GA..MYANMAR LOGOGRAM KHAMTI HM
-AA77..AA79    ; valid                  ;      ; NV8    # 5.2  MYANMAR SYMBOL AITON EXCLAMATION..MYANMAR SYMBOL AITON TWO
-AA7A..AA7B    ; valid                                  # 5.2  MYANMAR LETTER AITON RA..MYANMAR SIGN PAO KAREN TONE
-AA7C..AA7F    ; valid                                  # 7.0  MYANMAR SIGN TAI LAING TONE-2..MYANMAR LETTER SHWE PALAUNG SHA
-AA80..AAC2    ; valid                                  # 5.2  TAI VIET LETTER LOW KO..TAI VIET TONE MAI SONG
-AAC3..AADA    ; disallowed                             # NA   <reserved-AAC3>..<reserved-AADA>
-AADB..AADD    ; valid                                  # 5.2  TAI VIET SYMBOL KON..TAI VIET SYMBOL SAM
-AADE..AADF    ; valid                  ;      ; NV8    # 5.2  TAI VIET SYMBOL HO HOI..TAI VIET SYMBOL KOI KOI
-AAE0..AAEF    ; valid                                  # 6.1  MEETEI MAYEK LETTER E..MEETEI MAYEK VOWEL SIGN AAU
-AAF0..AAF1    ; valid                  ;      ; NV8    # 6.1  MEETEI MAYEK CHEIKHAN..MEETEI MAYEK AHANG KHUDAM
-AAF2..AAF6    ; valid                                  # 6.1  MEETEI MAYEK ANJI..MEETEI MAYEK VIRAMA
-AAF7..AB00    ; disallowed                             # NA   <reserved-AAF7>..<reserved-AB00>
-AB01..AB06    ; valid                                  # 6.0  ETHIOPIC SYLLABLE TTHU..ETHIOPIC SYLLABLE TTHO
-AB07..AB08    ; disallowed                             # NA   <reserved-AB07>..<reserved-AB08>
-AB09..AB0E    ; valid                                  # 6.0  ETHIOPIC SYLLABLE DDHU..ETHIOPIC SYLLABLE DDHO
-AB0F..AB10    ; disallowed                             # NA   <reserved-AB0F>..<reserved-AB10>
-AB11..AB16    ; valid                                  # 6.0  ETHIOPIC SYLLABLE DZU..ETHIOPIC SYLLABLE DZO
-AB17..AB1F    ; disallowed                             # NA   <reserved-AB17>..<reserved-AB1F>
-AB20..AB26    ; valid                                  # 6.0  ETHIOPIC SYLLABLE CCHHA..ETHIOPIC SYLLABLE CCHHO
-AB27          ; disallowed                             # NA   <reserved-AB27>
-AB28..AB2E    ; valid                                  # 6.0  ETHIOPIC SYLLABLE BBA..ETHIOPIC SYLLABLE BBO
-AB2F          ; disallowed                             # NA   <reserved-AB2F>
-AB30..AB5A    ; valid                                  # 7.0  LATIN SMALL LETTER BARRED ALPHA..LATIN SMALL LETTER Y WITH SHORT RIGHT LEG
-AB5B          ; valid                  ;      ; NV8    # 7.0  MODIFIER BREVE WITH INVERTED BREVE
-AB5C          ; mapped                 ; A727          # 7.0  MODIFIER LETTER SMALL HENG
-AB5D          ; mapped                 ; AB37          # 7.0  MODIFIER LETTER SMALL L WITH INVERTED LAZY S
-AB5E          ; mapped                 ; 026B          # 7.0  MODIFIER LETTER SMALL L WITH MIDDLE TILDE
-AB5F          ; mapped                 ; AB52          # 7.0  MODIFIER LETTER SMALL U WITH LEFT HOOK
-AB60..AB63    ; valid                                  # 8.0  LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER UO
-AB64..AB65    ; valid                                  # 7.0  LATIN SMALL LETTER INVERTED ALPHA..GREEK LETTER SMALL CAPITAL OMEGA
-AB66..AB6F    ; disallowed                             # NA   <reserved-AB66>..<reserved-AB6F>
-AB70          ; mapped                 ; 13A0          # 8.0  CHEROKEE SMALL LETTER A
-AB71          ; mapped                 ; 13A1          # 8.0  CHEROKEE SMALL LETTER E
-AB72          ; mapped                 ; 13A2          # 8.0  CHEROKEE SMALL LETTER I
-AB73          ; mapped                 ; 13A3          # 8.0  CHEROKEE SMALL LETTER O
-AB74          ; mapped                 ; 13A4          # 8.0  CHEROKEE SMALL LETTER U
-AB75          ; mapped                 ; 13A5          # 8.0  CHEROKEE SMALL LETTER V
-AB76          ; mapped                 ; 13A6          # 8.0  CHEROKEE SMALL LETTER GA
-AB77          ; mapped                 ; 13A7          # 8.0  CHEROKEE SMALL LETTER KA
-AB78          ; mapped                 ; 13A8          # 8.0  CHEROKEE SMALL LETTER GE
-AB79          ; mapped                 ; 13A9          # 8.0  CHEROKEE SMALL LETTER GI
-AB7A          ; mapped                 ; 13AA          # 8.0  CHEROKEE SMALL LETTER GO
-AB7B          ; mapped                 ; 13AB          # 8.0  CHEROKEE SMALL LETTER GU
-AB7C          ; mapped                 ; 13AC          # 8.0  CHEROKEE SMALL LETTER GV
-AB7D          ; mapped                 ; 13AD          # 8.0  CHEROKEE SMALL LETTER HA
-AB7E          ; mapped                 ; 13AE          # 8.0  CHEROKEE SMALL LETTER HE
-AB7F          ; mapped                 ; 13AF          # 8.0  CHEROKEE SMALL LETTER HI
-AB80          ; mapped                 ; 13B0          # 8.0  CHEROKEE SMALL LETTER HO
-AB81          ; mapped                 ; 13B1          # 8.0  CHEROKEE SMALL LETTER HU
-AB82          ; mapped                 ; 13B2          # 8.0  CHEROKEE SMALL LETTER HV
-AB83          ; mapped                 ; 13B3          # 8.0  CHEROKEE SMALL LETTER LA
-AB84          ; mapped                 ; 13B4          # 8.0  CHEROKEE SMALL LETTER LE
-AB85          ; mapped                 ; 13B5          # 8.0  CHEROKEE SMALL LETTER LI
-AB86          ; mapped                 ; 13B6          # 8.0  CHEROKEE SMALL LETTER LO
-AB87          ; mapped                 ; 13B7          # 8.0  CHEROKEE SMALL LETTER LU
-AB88          ; mapped                 ; 13B8          # 8.0  CHEROKEE SMALL LETTER LV
-AB89          ; mapped                 ; 13B9          # 8.0  CHEROKEE SMALL LETTER MA
-AB8A          ; mapped                 ; 13BA          # 8.0  CHEROKEE SMALL LETTER ME
-AB8B          ; mapped                 ; 13BB          # 8.0  CHEROKEE SMALL LETTER MI
-AB8C          ; mapped                 ; 13BC          # 8.0  CHEROKEE SMALL LETTER MO
-AB8D          ; mapped                 ; 13BD          # 8.0  CHEROKEE SMALL LETTER MU
-AB8E          ; mapped                 ; 13BE          # 8.0  CHEROKEE SMALL LETTER NA
-AB8F          ; mapped                 ; 13BF          # 8.0  CHEROKEE SMALL LETTER HNA
-AB90          ; mapped                 ; 13C0          # 8.0  CHEROKEE SMALL LETTER NAH
-AB91          ; mapped                 ; 13C1          # 8.0  CHEROKEE SMALL LETTER NE
-AB92          ; mapped                 ; 13C2          # 8.0  CHEROKEE SMALL LETTER NI
-AB93          ; mapped                 ; 13C3          # 8.0  CHEROKEE SMALL LETTER NO
-AB94          ; mapped                 ; 13C4          # 8.0  CHEROKEE SMALL LETTER NU
-AB95          ; mapped                 ; 13C5          # 8.0  CHEROKEE SMALL LETTER NV
-AB96          ; mapped                 ; 13C6          # 8.0  CHEROKEE SMALL LETTER QUA
-AB97          ; mapped                 ; 13C7          # 8.0  CHEROKEE SMALL LETTER QUE
-AB98          ; mapped                 ; 13C8          # 8.0  CHEROKEE SMALL LETTER QUI
-AB99          ; mapped                 ; 13C9          # 8.0  CHEROKEE SMALL LETTER QUO
-AB9A          ; mapped                 ; 13CA          # 8.0  CHEROKEE SMALL LETTER QUU
-AB9B          ; mapped                 ; 13CB          # 8.0  CHEROKEE SMALL LETTER QUV
-AB9C          ; mapped                 ; 13CC          # 8.0  CHEROKEE SMALL LETTER SA
-AB9D          ; mapped                 ; 13CD          # 8.0  CHEROKEE SMALL LETTER S
-AB9E          ; mapped                 ; 13CE          # 8.0  CHEROKEE SMALL LETTER SE
-AB9F          ; mapped                 ; 13CF          # 8.0  CHEROKEE SMALL LETTER SI
-ABA0          ; mapped                 ; 13D0          # 8.0  CHEROKEE SMALL LETTER SO
-ABA1          ; mapped                 ; 13D1          # 8.0  CHEROKEE SMALL LETTER SU
-ABA2          ; mapped                 ; 13D2          # 8.0  CHEROKEE SMALL LETTER SV
-ABA3          ; mapped                 ; 13D3          # 8.0  CHEROKEE SMALL LETTER DA
-ABA4          ; mapped                 ; 13D4          # 8.0  CHEROKEE SMALL LETTER TA
-ABA5          ; mapped                 ; 13D5          # 8.0  CHEROKEE SMALL LETTER DE
-ABA6          ; mapped                 ; 13D6          # 8.0  CHEROKEE SMALL LETTER TE
-ABA7          ; mapped                 ; 13D7          # 8.0  CHEROKEE SMALL LETTER DI
-ABA8          ; mapped                 ; 13D8          # 8.0  CHEROKEE SMALL LETTER TI
-ABA9          ; mapped                 ; 13D9          # 8.0  CHEROKEE SMALL LETTER DO
-ABAA          ; mapped                 ; 13DA          # 8.0  CHEROKEE SMALL LETTER DU
-ABAB          ; mapped                 ; 13DB          # 8.0  CHEROKEE SMALL LETTER DV
-ABAC          ; mapped                 ; 13DC          # 8.0  CHEROKEE SMALL LETTER DLA
-ABAD          ; mapped                 ; 13DD          # 8.0  CHEROKEE SMALL LETTER TLA
-ABAE          ; mapped                 ; 13DE          # 8.0  CHEROKEE SMALL LETTER TLE
-ABAF          ; mapped                 ; 13DF          # 8.0  CHEROKEE SMALL LETTER TLI
-ABB0          ; mapped                 ; 13E0          # 8.0  CHEROKEE SMALL LETTER TLO
-ABB1          ; mapped                 ; 13E1          # 8.0  CHEROKEE SMALL LETTER TLU
-ABB2          ; mapped                 ; 13E2          # 8.0  CHEROKEE SMALL LETTER TLV
-ABB3          ; mapped                 ; 13E3          # 8.0  CHEROKEE SMALL LETTER TSA
-ABB4          ; mapped                 ; 13E4          # 8.0  CHEROKEE SMALL LETTER TSE
-ABB5          ; mapped                 ; 13E5          # 8.0  CHEROKEE SMALL LETTER TSI
-ABB6          ; mapped                 ; 13E6          # 8.0  CHEROKEE SMALL LETTER TSO
-ABB7          ; mapped                 ; 13E7          # 8.0  CHEROKEE SMALL LETTER TSU
-ABB8          ; mapped                 ; 13E8          # 8.0  CHEROKEE SMALL LETTER TSV
-ABB9          ; mapped                 ; 13E9          # 8.0  CHEROKEE SMALL LETTER WA
-ABBA          ; mapped                 ; 13EA          # 8.0  CHEROKEE SMALL LETTER WE
-ABBB          ; mapped                 ; 13EB          # 8.0  CHEROKEE SMALL LETTER WI
-ABBC          ; mapped                 ; 13EC          # 8.0  CHEROKEE SMALL LETTER WO
-ABBD          ; mapped                 ; 13ED          # 8.0  CHEROKEE SMALL LETTER WU
-ABBE          ; mapped                 ; 13EE          # 8.0  CHEROKEE SMALL LETTER WV
-ABBF          ; mapped                 ; 13EF          # 8.0  CHEROKEE SMALL LETTER YA
-ABC0..ABEA    ; valid                                  # 5.2  MEETEI MAYEK LETTER KOK..MEETEI MAYEK VOWEL SIGN NUNG
-ABEB          ; valid                  ;      ; NV8    # 5.2  MEETEI MAYEK CHEIKHEI
-ABEC..ABED    ; valid                                  # 5.2  MEETEI MAYEK LUM IYEK..MEETEI MAYEK APUN IYEK
-ABEE..ABEF    ; disallowed                             # NA   <reserved-ABEE>..<reserved-ABEF>
-ABF0..ABF9    ; valid                                  # 5.2  MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DIGIT NINE
-ABFA..ABFF    ; disallowed                             # NA   <reserved-ABFA>..<reserved-ABFF>
-AC00..D7A3    ; valid                                  # 2.0  HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH
-D7A4..D7AF    ; disallowed                             # NA   <reserved-D7A4>..<reserved-D7AF>
-D7B0..D7C6    ; valid                  ;      ; NV8    # 5.2  HANGUL JUNGSEONG O-YEO..HANGUL JUNGSEONG ARAEA-E
-D7C7..D7CA    ; disallowed                             # NA   <reserved-D7C7>..<reserved-D7CA>
-D7CB..D7FB    ; valid                  ;      ; NV8    # 5.2  HANGUL JONGSEONG NIEUN-RIEUL..HANGUL JONGSEONG PHIEUPH-THIEUTH
-D7FC..D7FF    ; disallowed                             # NA   <reserved-D7FC>..<reserved-D7FF>
-D800..DFFF    ; disallowed                             # 2.0  <surrogate-D800>..<surrogate-DFFF>
-E000..F8FF    ; disallowed                             # 1.1  <private-use-E000>..<private-use-F8FF>
-F900          ; mapped                 ; 8C48          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F900
-F901          ; mapped                 ; 66F4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F901
-F902          ; mapped                 ; 8ECA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F902
-F903          ; mapped                 ; 8CC8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F903
-F904          ; mapped                 ; 6ED1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F904
-F905          ; mapped                 ; 4E32          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F905
-F906          ; mapped                 ; 53E5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F906
-F907..F908    ; mapped                 ; 9F9C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F907..CJK COMPATIBILITY IDEOGRAPH-F908
-F909          ; mapped                 ; 5951          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F909
-F90A          ; mapped                 ; 91D1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90A
-F90B          ; mapped                 ; 5587          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90B
-F90C          ; mapped                 ; 5948          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90C
-F90D          ; mapped                 ; 61F6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90D
-F90E          ; mapped                 ; 7669          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90E
-F90F          ; mapped                 ; 7F85          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90F
-F910          ; mapped                 ; 863F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F910
-F911          ; mapped                 ; 87BA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F911
-F912          ; mapped                 ; 88F8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F912
-F913          ; mapped                 ; 908F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F913
-F914          ; mapped                 ; 6A02          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F914
-F915          ; mapped                 ; 6D1B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F915
-F916          ; mapped                 ; 70D9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F916
-F917          ; mapped                 ; 73DE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F917
-F918          ; mapped                 ; 843D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F918
-F919          ; mapped                 ; 916A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F919
-F91A          ; mapped                 ; 99F1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91A
-F91B          ; mapped                 ; 4E82          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91B
-F91C          ; mapped                 ; 5375          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91C
-F91D          ; mapped                 ; 6B04          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91D
-F91E          ; mapped                 ; 721B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91E
-F91F          ; mapped                 ; 862D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91F
-F920          ; mapped                 ; 9E1E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F920
-F921          ; mapped                 ; 5D50          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F921
-F922          ; mapped                 ; 6FEB          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F922
-F923          ; mapped                 ; 85CD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F923
-F924          ; mapped                 ; 8964          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F924
-F925          ; mapped                 ; 62C9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F925
-F926          ; mapped                 ; 81D8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F926
-F927          ; mapped                 ; 881F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F927
-F928          ; mapped                 ; 5ECA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F928
-F929          ; mapped                 ; 6717          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F929
-F92A          ; mapped                 ; 6D6A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92A
-F92B          ; mapped                 ; 72FC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92B
-F92C          ; mapped                 ; 90CE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92C
-F92D          ; mapped                 ; 4F86          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92D
-F92E          ; mapped                 ; 51B7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92E
-F92F          ; mapped                 ; 52DE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92F
-F930          ; mapped                 ; 64C4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F930
-F931          ; mapped                 ; 6AD3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F931
-F932          ; mapped                 ; 7210          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F932
-F933          ; mapped                 ; 76E7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F933
-F934          ; mapped                 ; 8001          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F934
-F935          ; mapped                 ; 8606          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F935
-F936          ; mapped                 ; 865C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F936
-F937          ; mapped                 ; 8DEF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F937
-F938          ; mapped                 ; 9732          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F938
-F939          ; mapped                 ; 9B6F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F939
-F93A          ; mapped                 ; 9DFA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93A
-F93B          ; mapped                 ; 788C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93B
-F93C          ; mapped                 ; 797F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93C
-F93D          ; mapped                 ; 7DA0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93D
-F93E          ; mapped                 ; 83C9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93E
-F93F          ; mapped                 ; 9304          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93F
-F940          ; mapped                 ; 9E7F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F940
-F941          ; mapped                 ; 8AD6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F941
-F942          ; mapped                 ; 58DF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F942
-F943          ; mapped                 ; 5F04          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F943
-F944          ; mapped                 ; 7C60          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F944
-F945          ; mapped                 ; 807E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F945
-F946          ; mapped                 ; 7262          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F946
-F947          ; mapped                 ; 78CA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F947
-F948          ; mapped                 ; 8CC2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F948
-F949          ; mapped                 ; 96F7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F949
-F94A          ; mapped                 ; 58D8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94A
-F94B          ; mapped                 ; 5C62          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94B
-F94C          ; mapped                 ; 6A13          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94C
-F94D          ; mapped                 ; 6DDA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94D
-F94E          ; mapped                 ; 6F0F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94E
-F94F          ; mapped                 ; 7D2F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94F
-F950          ; mapped                 ; 7E37          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F950
-F951          ; mapped                 ; 964B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F951
-F952          ; mapped                 ; 52D2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F952
-F953          ; mapped                 ; 808B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F953
-F954          ; mapped                 ; 51DC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F954
-F955          ; mapped                 ; 51CC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F955
-F956          ; mapped                 ; 7A1C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F956
-F957          ; mapped                 ; 7DBE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F957
-F958          ; mapped                 ; 83F1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F958
-F959          ; mapped                 ; 9675          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F959
-F95A          ; mapped                 ; 8B80          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95A
-F95B          ; mapped                 ; 62CF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95B
-F95C          ; mapped                 ; 6A02          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95C
-F95D          ; mapped                 ; 8AFE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95D
-F95E          ; mapped                 ; 4E39          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95E
-F95F          ; mapped                 ; 5BE7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95F
-F960          ; mapped                 ; 6012          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F960
-F961          ; mapped                 ; 7387          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F961
-F962          ; mapped                 ; 7570          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F962
-F963          ; mapped                 ; 5317          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F963
-F964          ; mapped                 ; 78FB          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F964
-F965          ; mapped                 ; 4FBF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F965
-F966          ; mapped                 ; 5FA9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F966
-F967          ; mapped                 ; 4E0D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F967
-F968          ; mapped                 ; 6CCC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F968
-F969          ; mapped                 ; 6578          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F969
-F96A          ; mapped                 ; 7D22          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96A
-F96B          ; mapped                 ; 53C3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96B
-F96C          ; mapped                 ; 585E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96C
-F96D          ; mapped                 ; 7701          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96D
-F96E          ; mapped                 ; 8449          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96E
-F96F          ; mapped                 ; 8AAA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96F
-F970          ; mapped                 ; 6BBA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F970
-F971          ; mapped                 ; 8FB0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F971
-F972          ; mapped                 ; 6C88          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F972
-F973          ; mapped                 ; 62FE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F973
-F974          ; mapped                 ; 82E5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F974
-F975          ; mapped                 ; 63A0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F975
-F976          ; mapped                 ; 7565          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F976
-F977          ; mapped                 ; 4EAE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F977
-F978          ; mapped                 ; 5169          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F978
-F979          ; mapped                 ; 51C9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F979
-F97A          ; mapped                 ; 6881          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97A
-F97B          ; mapped                 ; 7CE7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97B
-F97C          ; mapped                 ; 826F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97C
-F97D          ; mapped                 ; 8AD2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97D
-F97E          ; mapped                 ; 91CF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97E
-F97F          ; mapped                 ; 52F5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97F
-F980          ; mapped                 ; 5442          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F980
-F981          ; mapped                 ; 5973          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F981
-F982          ; mapped                 ; 5EEC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F982
-F983          ; mapped                 ; 65C5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F983
-F984          ; mapped                 ; 6FFE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F984
-F985          ; mapped                 ; 792A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F985
-F986          ; mapped                 ; 95AD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F986
-F987          ; mapped                 ; 9A6A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F987
-F988          ; mapped                 ; 9E97          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F988
-F989          ; mapped                 ; 9ECE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F989
-F98A          ; mapped                 ; 529B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98A
-F98B          ; mapped                 ; 66C6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98B
-F98C          ; mapped                 ; 6B77          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98C
-F98D          ; mapped                 ; 8F62          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98D
-F98E          ; mapped                 ; 5E74          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98E
-F98F          ; mapped                 ; 6190          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98F
-F990          ; mapped                 ; 6200          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F990
-F991          ; mapped                 ; 649A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F991
-F992          ; mapped                 ; 6F23          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F992
-F993          ; mapped                 ; 7149          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F993
-F994          ; mapped                 ; 7489          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F994
-F995          ; mapped                 ; 79CA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F995
-F996          ; mapped                 ; 7DF4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F996
-F997          ; mapped                 ; 806F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F997
-F998          ; mapped                 ; 8F26          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F998
-F999          ; mapped                 ; 84EE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F999
-F99A          ; mapped                 ; 9023          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99A
-F99B          ; mapped                 ; 934A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99B
-F99C          ; mapped                 ; 5217          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99C
-F99D          ; mapped                 ; 52A3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99D
-F99E          ; mapped                 ; 54BD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99E
-F99F          ; mapped                 ; 70C8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99F
-F9A0          ; mapped                 ; 88C2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A0
-F9A1          ; mapped                 ; 8AAA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A1
-F9A2          ; mapped                 ; 5EC9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A2
-F9A3          ; mapped                 ; 5FF5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A3
-F9A4          ; mapped                 ; 637B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A4
-F9A5          ; mapped                 ; 6BAE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A5
-F9A6          ; mapped                 ; 7C3E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A6
-F9A7          ; mapped                 ; 7375          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A7
-F9A8          ; mapped                 ; 4EE4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A8
-F9A9          ; mapped                 ; 56F9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A9
-F9AA          ; mapped                 ; 5BE7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AA
-F9AB          ; mapped                 ; 5DBA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AB
-F9AC          ; mapped                 ; 601C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AC
-F9AD          ; mapped                 ; 73B2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AD
-F9AE          ; mapped                 ; 7469          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AE
-F9AF          ; mapped                 ; 7F9A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AF
-F9B0          ; mapped                 ; 8046          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B0
-F9B1          ; mapped                 ; 9234          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B1
-F9B2          ; mapped                 ; 96F6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B2
-F9B3          ; mapped                 ; 9748          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B3
-F9B4          ; mapped                 ; 9818          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B4
-F9B5          ; mapped                 ; 4F8B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B5
-F9B6          ; mapped                 ; 79AE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B6
-F9B7          ; mapped                 ; 91B4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B7
-F9B8          ; mapped                 ; 96B8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B8
-F9B9          ; mapped                 ; 60E1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B9
-F9BA          ; mapped                 ; 4E86          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BA
-F9BB          ; mapped                 ; 50DA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BB
-F9BC          ; mapped                 ; 5BEE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BC
-F9BD          ; mapped                 ; 5C3F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BD
-F9BE          ; mapped                 ; 6599          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BE
-F9BF          ; mapped                 ; 6A02          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BF
-F9C0          ; mapped                 ; 71CE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C0
-F9C1          ; mapped                 ; 7642          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C1
-F9C2          ; mapped                 ; 84FC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C2
-F9C3          ; mapped                 ; 907C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C3
-F9C4          ; mapped                 ; 9F8D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C4
-F9C5          ; mapped                 ; 6688          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C5
-F9C6          ; mapped                 ; 962E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C6
-F9C7          ; mapped                 ; 5289          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C7
-F9C8          ; mapped                 ; 677B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C8
-F9C9          ; mapped                 ; 67F3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C9
-F9CA          ; mapped                 ; 6D41          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CA
-F9CB          ; mapped                 ; 6E9C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CB
-F9CC          ; mapped                 ; 7409          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CC
-F9CD          ; mapped                 ; 7559          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CD
-F9CE          ; mapped                 ; 786B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CE
-F9CF          ; mapped                 ; 7D10          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CF
-F9D0          ; mapped                 ; 985E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D0
-F9D1          ; mapped                 ; 516D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D1
-F9D2          ; mapped                 ; 622E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D2
-F9D3          ; mapped                 ; 9678          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D3
-F9D4          ; mapped                 ; 502B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D4
-F9D5          ; mapped                 ; 5D19          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D5
-F9D6          ; mapped                 ; 6DEA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D6
-F9D7          ; mapped                 ; 8F2A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D7
-F9D8          ; mapped                 ; 5F8B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D8
-F9D9          ; mapped                 ; 6144          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D9
-F9DA          ; mapped                 ; 6817          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DA
-F9DB          ; mapped                 ; 7387          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DB
-F9DC          ; mapped                 ; 9686          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DC
-F9DD          ; mapped                 ; 5229          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DD
-F9DE          ; mapped                 ; 540F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DE
-F9DF          ; mapped                 ; 5C65          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DF
-F9E0          ; mapped                 ; 6613          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E0
-F9E1          ; mapped                 ; 674E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E1
-F9E2          ; mapped                 ; 68A8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E2
-F9E3          ; mapped                 ; 6CE5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E3
-F9E4          ; mapped                 ; 7406          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E4
-F9E5          ; mapped                 ; 75E2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E5
-F9E6          ; mapped                 ; 7F79          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E6
-F9E7          ; mapped                 ; 88CF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E7
-F9E8          ; mapped                 ; 88E1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E8
-F9E9          ; mapped                 ; 91CC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E9
-F9EA          ; mapped                 ; 96E2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EA
-F9EB          ; mapped                 ; 533F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EB
-F9EC          ; mapped                 ; 6EBA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EC
-F9ED          ; mapped                 ; 541D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9ED
-F9EE          ; mapped                 ; 71D0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EE
-F9EF          ; mapped                 ; 7498          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EF
-F9F0          ; mapped                 ; 85FA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F0
-F9F1          ; mapped                 ; 96A3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F1
-F9F2          ; mapped                 ; 9C57          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F2
-F9F3          ; mapped                 ; 9E9F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F3
-F9F4          ; mapped                 ; 6797          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F4
-F9F5          ; mapped                 ; 6DCB          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F5
-F9F6          ; mapped                 ; 81E8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F6
-F9F7          ; mapped                 ; 7ACB          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F7
-F9F8          ; mapped                 ; 7B20          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F8
-F9F9          ; mapped                 ; 7C92          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F9
-F9FA          ; mapped                 ; 72C0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FA
-F9FB          ; mapped                 ; 7099          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FB
-F9FC          ; mapped                 ; 8B58          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FC
-F9FD          ; mapped                 ; 4EC0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FD
-F9FE          ; mapped                 ; 8336          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FE
-F9FF          ; mapped                 ; 523A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FF
-FA00          ; mapped                 ; 5207          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA00
-FA01          ; mapped                 ; 5EA6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA01
-FA02          ; mapped                 ; 62D3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA02
-FA03          ; mapped                 ; 7CD6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA03
-FA04          ; mapped                 ; 5B85          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA04
-FA05          ; mapped                 ; 6D1E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA05
-FA06          ; mapped                 ; 66B4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA06
-FA07          ; mapped                 ; 8F3B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA07
-FA08          ; mapped                 ; 884C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA08
-FA09          ; mapped                 ; 964D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA09
-FA0A          ; mapped                 ; 898B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0A
-FA0B          ; mapped                 ; 5ED3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0B
-FA0C          ; mapped                 ; 5140          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0C
-FA0D          ; mapped                 ; 55C0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0D
-FA0E..FA0F    ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPATIBILITY IDEOGRAPH-FA0F
-FA10          ; mapped                 ; 585A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA10
-FA11          ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA11
-FA12          ; mapped                 ; 6674          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA12
-FA13..FA14    ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPATIBILITY IDEOGRAPH-FA14
-FA15          ; mapped                 ; 51DE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA15
-FA16          ; mapped                 ; 732A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA16
-FA17          ; mapped                 ; 76CA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA17
-FA18          ; mapped                 ; 793C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA18
-FA19          ; mapped                 ; 795E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA19
-FA1A          ; mapped                 ; 7965          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1A
-FA1B          ; mapped                 ; 798F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1B
-FA1C          ; mapped                 ; 9756          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1C
-FA1D          ; mapped                 ; 7CBE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1D
-FA1E          ; mapped                 ; 7FBD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1E
-FA1F          ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1F
-FA20          ; mapped                 ; 8612          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA20
-FA21          ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA21
-FA22          ; mapped                 ; 8AF8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA22
-FA23..FA24    ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA23..CJK COMPATIBILITY IDEOGRAPH-FA24
-FA25          ; mapped                 ; 9038          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA25
-FA26          ; mapped                 ; 90FD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA26
-FA27..FA29    ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA27..CJK COMPATIBILITY IDEOGRAPH-FA29
-FA2A          ; mapped                 ; 98EF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA2A
-FA2B          ; mapped                 ; 98FC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA2B
-FA2C          ; mapped                 ; 9928          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA2C
-FA2D          ; mapped                 ; 9DB4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA2D
-FA2E          ; mapped                 ; 90DE          # 6.1  CJK COMPATIBILITY IDEOGRAPH-FA2E
-FA2F          ; mapped                 ; 96B7          # 6.1  CJK COMPATIBILITY IDEOGRAPH-FA2F
-FA30          ; mapped                 ; 4FAE          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA30
-FA31          ; mapped                 ; 50E7          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA31
-FA32          ; mapped                 ; 514D          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA32
-FA33          ; mapped                 ; 52C9          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA33
-FA34          ; mapped                 ; 52E4          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA34
-FA35          ; mapped                 ; 5351          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA35
-FA36          ; mapped                 ; 559D          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA36
-FA37          ; mapped                 ; 5606          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA37
-FA38          ; mapped                 ; 5668          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA38
-FA39          ; mapped                 ; 5840          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA39
-FA3A          ; mapped                 ; 58A8          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3A
-FA3B          ; mapped                 ; 5C64          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3B
-FA3C          ; mapped                 ; 5C6E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3C
-FA3D          ; mapped                 ; 6094          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3D
-FA3E          ; mapped                 ; 6168          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3E
-FA3F          ; mapped                 ; 618E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3F
-FA40          ; mapped                 ; 61F2          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA40
-FA41          ; mapped                 ; 654F          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA41
-FA42          ; mapped                 ; 65E2          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA42
-FA43          ; mapped                 ; 6691          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA43
-FA44          ; mapped                 ; 6885          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA44
-FA45          ; mapped                 ; 6D77          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA45
-FA46          ; mapped                 ; 6E1A          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA46
-FA47          ; mapped                 ; 6F22          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA47
-FA48          ; mapped                 ; 716E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA48
-FA49          ; mapped                 ; 722B          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA49
-FA4A          ; mapped                 ; 7422          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4A
-FA4B          ; mapped                 ; 7891          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4B
-FA4C          ; mapped                 ; 793E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4C
-FA4D          ; mapped                 ; 7949          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4D
-FA4E          ; mapped                 ; 7948          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4E
-FA4F          ; mapped                 ; 7950          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4F
-FA50          ; mapped                 ; 7956          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA50
-FA51          ; mapped                 ; 795D          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA51
-FA52          ; mapped                 ; 798D          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA52
-FA53          ; mapped                 ; 798E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA53
-FA54          ; mapped                 ; 7A40          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA54
-FA55          ; mapped                 ; 7A81          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA55
-FA56          ; mapped                 ; 7BC0          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA56
-FA57          ; mapped                 ; 7DF4          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA57
-FA58          ; mapped                 ; 7E09          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA58
-FA59          ; mapped                 ; 7E41          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA59
-FA5A          ; mapped                 ; 7F72          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5A
-FA5B          ; mapped                 ; 8005          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5B
-FA5C          ; mapped                 ; 81ED          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5C
-FA5D..FA5E    ; mapped                 ; 8279          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5D..CJK COMPATIBILITY IDEOGRAPH-FA5E
-FA5F          ; mapped                 ; 8457          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5F
-FA60          ; mapped                 ; 8910          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA60
-FA61          ; mapped                 ; 8996          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA61
-FA62          ; mapped                 ; 8B01          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA62
-FA63          ; mapped                 ; 8B39          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA63
-FA64          ; mapped                 ; 8CD3          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA64
-FA65          ; mapped                 ; 8D08          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA65
-FA66          ; mapped                 ; 8FB6          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA66
-FA67          ; mapped                 ; 9038          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA67
-FA68          ; mapped                 ; 96E3          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA68
-FA69          ; mapped                 ; 97FF          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA69
-FA6A          ; mapped                 ; 983B          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA6A
-FA6B          ; mapped                 ; 6075          # 5.2  CJK COMPATIBILITY IDEOGRAPH-FA6B
-FA6C          ; mapped                 ; 242EE         # 5.2  CJK COMPATIBILITY IDEOGRAPH-FA6C
-FA6D          ; mapped                 ; 8218          # 5.2  CJK COMPATIBILITY IDEOGRAPH-FA6D
-FA6E..FA6F    ; disallowed                             # NA   <reserved-FA6E>..<reserved-FA6F>
-FA70          ; mapped                 ; 4E26          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA70
-FA71          ; mapped                 ; 51B5          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA71
-FA72          ; mapped                 ; 5168          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA72
-FA73          ; mapped                 ; 4F80          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA73
-FA74          ; mapped                 ; 5145          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA74
-FA75          ; mapped                 ; 5180          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA75
-FA76          ; mapped                 ; 52C7          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA76
-FA77          ; mapped                 ; 52FA          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA77
-FA78          ; mapped                 ; 559D          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA78
-FA79          ; mapped                 ; 5555          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA79
-FA7A          ; mapped                 ; 5599          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7A
-FA7B          ; mapped                 ; 55E2          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7B
-FA7C          ; mapped                 ; 585A          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7C
-FA7D          ; mapped                 ; 58B3          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7D
-FA7E          ; mapped                 ; 5944          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7E
-FA7F          ; mapped                 ; 5954          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7F
-FA80          ; mapped                 ; 5A62          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA80
-FA81          ; mapped                 ; 5B28          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA81
-FA82          ; mapped                 ; 5ED2          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA82
-FA83          ; mapped                 ; 5ED9          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA83
-FA84          ; mapped                 ; 5F69          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA84
-FA85          ; mapped                 ; 5FAD          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA85
-FA86          ; mapped                 ; 60D8          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA86
-FA87          ; mapped                 ; 614E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA87
-FA88          ; mapped                 ; 6108          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA88
-FA89          ; mapped                 ; 618E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA89
-FA8A          ; mapped                 ; 6160          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8A
-FA8B          ; mapped                 ; 61F2          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8B
-FA8C          ; mapped                 ; 6234          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8C
-FA8D          ; mapped                 ; 63C4          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8D
-FA8E          ; mapped                 ; 641C          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8E
-FA8F          ; mapped                 ; 6452          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8F
-FA90          ; mapped                 ; 6556          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA90
-FA91          ; mapped                 ; 6674          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA91
-FA92          ; mapped                 ; 6717          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA92
-FA93          ; mapped                 ; 671B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA93
-FA94          ; mapped                 ; 6756          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA94
-FA95          ; mapped                 ; 6B79          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA95
-FA96          ; mapped                 ; 6BBA          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA96
-FA97          ; mapped                 ; 6D41          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA97
-FA98          ; mapped                 ; 6EDB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA98
-FA99          ; mapped                 ; 6ECB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA99
-FA9A          ; mapped                 ; 6F22          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9A
-FA9B          ; mapped                 ; 701E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9B
-FA9C          ; mapped                 ; 716E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9C
-FA9D          ; mapped                 ; 77A7          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9D
-FA9E          ; mapped                 ; 7235          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9E
-FA9F          ; mapped                 ; 72AF          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9F
-FAA0          ; mapped                 ; 732A          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA0
-FAA1          ; mapped                 ; 7471          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA1
-FAA2          ; mapped                 ; 7506          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA2
-FAA3          ; mapped                 ; 753B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA3
-FAA4          ; mapped                 ; 761D          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA4
-FAA5          ; mapped                 ; 761F          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA5
-FAA6          ; mapped                 ; 76CA          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA6
-FAA7          ; mapped                 ; 76DB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA7
-FAA8          ; mapped                 ; 76F4          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA8
-FAA9          ; mapped                 ; 774A          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA9
-FAAA          ; mapped                 ; 7740          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAA
-FAAB          ; mapped                 ; 78CC          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAB
-FAAC          ; mapped                 ; 7AB1          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAC
-FAAD          ; mapped                 ; 7BC0          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAD
-FAAE          ; mapped                 ; 7C7B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAE
-FAAF          ; mapped                 ; 7D5B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAF
-FAB0          ; mapped                 ; 7DF4          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB0
-FAB1          ; mapped                 ; 7F3E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB1
-FAB2          ; mapped                 ; 8005          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB2
-FAB3          ; mapped                 ; 8352          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB3
-FAB4          ; mapped                 ; 83EF          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB4
-FAB5          ; mapped                 ; 8779          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB5
-FAB6          ; mapped                 ; 8941          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB6
-FAB7          ; mapped                 ; 8986          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB7
-FAB8          ; mapped                 ; 8996          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB8
-FAB9          ; mapped                 ; 8ABF          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB9
-FABA          ; mapped                 ; 8AF8          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABA
-FABB          ; mapped                 ; 8ACB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABB
-FABC          ; mapped                 ; 8B01          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABC
-FABD          ; mapped                 ; 8AFE          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABD
-FABE          ; mapped                 ; 8AED          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABE
-FABF          ; mapped                 ; 8B39          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABF
-FAC0          ; mapped                 ; 8B8A          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC0
-FAC1          ; mapped                 ; 8D08          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC1
-FAC2          ; mapped                 ; 8F38          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC2
-FAC3          ; mapped                 ; 9072          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC3
-FAC4          ; mapped                 ; 9199          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC4
-FAC5          ; mapped                 ; 9276          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC5
-FAC6          ; mapped                 ; 967C          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC6
-FAC7          ; mapped                 ; 96E3          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC7
-FAC8          ; mapped                 ; 9756          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC8
-FAC9          ; mapped                 ; 97DB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC9
-FACA          ; mapped                 ; 97FF          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACA
-FACB          ; mapped                 ; 980B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACB
-FACC          ; mapped                 ; 983B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACC
-FACD          ; mapped                 ; 9B12          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACD
-FACE          ; mapped                 ; 9F9C          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACE
-FACF          ; mapped                 ; 2284A         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACF
-FAD0          ; mapped                 ; 22844         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD0
-FAD1          ; mapped                 ; 233D5         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD1
-FAD2          ; mapped                 ; 3B9D          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD2
-FAD3          ; mapped                 ; 4018          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD3
-FAD4          ; mapped                 ; 4039          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD4
-FAD5          ; mapped                 ; 25249         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD5
-FAD6          ; mapped                 ; 25CD0         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD6
-FAD7          ; mapped                 ; 27ED3         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD7
-FAD8          ; mapped                 ; 9F43          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD8
-FAD9          ; mapped                 ; 9F8E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD9
-FADA..FAFF    ; disallowed                             # NA   <reserved-FADA>..<reserved-FAFF>
-FB00          ; mapped                 ; 0066 0066     # 1.1  LATIN SMALL LIGATURE FF
-FB01          ; mapped                 ; 0066 0069     # 1.1  LATIN SMALL LIGATURE FI
-FB02          ; mapped                 ; 0066 006C     # 1.1  LATIN SMALL LIGATURE FL
-FB03          ; mapped                 ; 0066 0066 0069 #1.1  LATIN SMALL LIGATURE FFI
-FB04          ; mapped                 ; 0066 0066 006C #1.1  LATIN SMALL LIGATURE FFL
-FB05..FB06    ; mapped                 ; 0073 0074     # 1.1  LATIN SMALL LIGATURE LONG S T..LATIN SMALL LIGATURE ST
-FB07..FB12    ; disallowed                             # NA   <reserved-FB07>..<reserved-FB12>
-FB13          ; mapped                 ; 0574 0576     # 1.1  ARMENIAN SMALL LIGATURE MEN NOW
-FB14          ; mapped                 ; 0574 0565     # 1.1  ARMENIAN SMALL LIGATURE MEN ECH
-FB15          ; mapped                 ; 0574 056B     # 1.1  ARMENIAN SMALL LIGATURE MEN INI
-FB16          ; mapped                 ; 057E 0576     # 1.1  ARMENIAN SMALL LIGATURE VEW NOW
-FB17          ; mapped                 ; 0574 056D     # 1.1  ARMENIAN SMALL LIGATURE MEN XEH
-FB18..FB1C    ; disallowed                             # NA   <reserved-FB18>..<reserved-FB1C>
-FB1D          ; mapped                 ; 05D9 05B4     # 3.0  HEBREW LETTER YOD WITH HIRIQ
-FB1E          ; valid                                  # 1.1  HEBREW POINT JUDEO-SPANISH VARIKA
-FB1F          ; mapped                 ; 05F2 05B7     # 1.1  HEBREW LIGATURE YIDDISH YOD YOD PATAH
-FB20          ; mapped                 ; 05E2          # 1.1  HEBREW LETTER ALTERNATIVE AYIN
-FB21          ; mapped                 ; 05D0          # 1.1  HEBREW LETTER WIDE ALEF
-FB22          ; mapped                 ; 05D3          # 1.1  HEBREW LETTER WIDE DALET
-FB23          ; mapped                 ; 05D4          # 1.1  HEBREW LETTER WIDE HE
-FB24          ; mapped                 ; 05DB          # 1.1  HEBREW LETTER WIDE KAF
-FB25          ; mapped                 ; 05DC          # 1.1  HEBREW LETTER WIDE LAMED
-FB26          ; mapped                 ; 05DD          # 1.1  HEBREW LETTER WIDE FINAL MEM
-FB27          ; mapped                 ; 05E8          # 1.1  HEBREW LETTER WIDE RESH
-FB28          ; mapped                 ; 05EA          # 1.1  HEBREW LETTER WIDE TAV
-FB29          ; disallowed_STD3_mapped ; 002B          # 1.1  HEBREW LETTER ALTERNATIVE PLUS SIGN
-FB2A          ; mapped                 ; 05E9 05C1     # 1.1  HEBREW LETTER SHIN WITH SHIN DOT
-FB2B          ; mapped                 ; 05E9 05C2     # 1.1  HEBREW LETTER SHIN WITH SIN DOT
-FB2C          ; mapped                 ; 05E9 05BC 05C1 #1.1  HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
-FB2D          ; mapped                 ; 05E9 05BC 05C2 #1.1  HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
-FB2E          ; mapped                 ; 05D0 05B7     # 1.1  HEBREW LETTER ALEF WITH PATAH
-FB2F          ; mapped                 ; 05D0 05B8     # 1.1  HEBREW LETTER ALEF WITH QAMATS
-FB30          ; mapped                 ; 05D0 05BC     # 1.1  HEBREW LETTER ALEF WITH MAPIQ
-FB31          ; mapped                 ; 05D1 05BC     # 1.1  HEBREW LETTER BET WITH DAGESH
-FB32          ; mapped                 ; 05D2 05BC     # 1.1  HEBREW LETTER GIMEL WITH DAGESH
-FB33          ; mapped                 ; 05D3 05BC     # 1.1  HEBREW LETTER DALET WITH DAGESH
-FB34          ; mapped                 ; 05D4 05BC     # 1.1  HEBREW LETTER HE WITH MAPIQ
-FB35          ; mapped                 ; 05D5 05BC     # 1.1  HEBREW LETTER VAV WITH DAGESH
-FB36          ; mapped                 ; 05D6 05BC     # 1.1  HEBREW LETTER ZAYIN WITH DAGESH
-FB37          ; disallowed                             # NA   <reserved-FB37>
-FB38          ; mapped                 ; 05D8 05BC     # 1.1  HEBREW LETTER TET WITH DAGESH
-FB39          ; mapped                 ; 05D9 05BC     # 1.1  HEBREW LETTER YOD WITH DAGESH
-FB3A          ; mapped                 ; 05DA 05BC     # 1.1  HEBREW LETTER FINAL KAF WITH DAGESH
-FB3B          ; mapped                 ; 05DB 05BC     # 1.1  HEBREW LETTER KAF WITH DAGESH
-FB3C          ; mapped                 ; 05DC 05BC     # 1.1  HEBREW LETTER LAMED WITH DAGESH
-FB3D          ; disallowed                             # NA   <reserved-FB3D>
-FB3E          ; mapped                 ; 05DE 05BC     # 1.1  HEBREW LETTER MEM WITH DAGESH
-FB3F          ; disallowed                             # NA   <reserved-FB3F>
-FB40          ; mapped                 ; 05E0 05BC     # 1.1  HEBREW LETTER NUN WITH DAGESH
-FB41          ; mapped                 ; 05E1 05BC     # 1.1  HEBREW LETTER SAMEKH WITH DAGESH
-FB42          ; disallowed                             # NA   <reserved-FB42>
-FB43          ; mapped                 ; 05E3 05BC     # 1.1  HEBREW LETTER FINAL PE WITH DAGESH
-FB44          ; mapped                 ; 05E4 05BC     # 1.1  HEBREW LETTER PE WITH DAGESH
-FB45          ; disallowed                             # NA   <reserved-FB45>
-FB46          ; mapped                 ; 05E6 05BC     # 1.1  HEBREW LETTER TSADI WITH DAGESH
-FB47          ; mapped                 ; 05E7 05BC     # 1.1  HEBREW LETTER QOF WITH DAGESH
-FB48          ; mapped                 ; 05E8 05BC     # 1.1  HEBREW LETTER RESH WITH DAGESH
-FB49          ; mapped                 ; 05E9 05BC     # 1.1  HEBREW LETTER SHIN WITH DAGESH
-FB4A          ; mapped                 ; 05EA 05BC     # 1.1  HEBREW LETTER TAV WITH DAGESH
-FB4B          ; mapped                 ; 05D5 05B9     # 1.1  HEBREW LETTER VAV WITH HOLAM
-FB4C          ; mapped                 ; 05D1 05BF     # 1.1  HEBREW LETTER BET WITH RAFE
-FB4D          ; mapped                 ; 05DB 05BF     # 1.1  HEBREW LETTER KAF WITH RAFE
-FB4E          ; mapped                 ; 05E4 05BF     # 1.1  HEBREW LETTER PE WITH RAFE
-FB4F          ; mapped                 ; 05D0 05DC     # 1.1  HEBREW LIGATURE ALEF LAMED
-FB50..FB51    ; mapped                 ; 0671          # 1.1  ARABIC LETTER ALEF WASLA ISOLATED FORM..ARABIC LETTER ALEF WASLA FINAL FORM
-FB52..FB55    ; mapped                 ; 067B          # 1.1  ARABIC LETTER BEEH ISOLATED FORM..ARABIC LETTER BEEH MEDIAL FORM
-FB56..FB59    ; mapped                 ; 067E          # 1.1  ARABIC LETTER PEH ISOLATED FORM..ARABIC LETTER PEH MEDIAL FORM
-FB5A..FB5D    ; mapped                 ; 0680          # 1.1  ARABIC LETTER BEHEH ISOLATED FORM..ARABIC LETTER BEHEH MEDIAL FORM
-FB5E..FB61    ; mapped                 ; 067A          # 1.1  ARABIC LETTER TTEHEH ISOLATED FORM..ARABIC LETTER TTEHEH MEDIAL FORM
-FB62..FB65    ; mapped                 ; 067F          # 1.1  ARABIC LETTER TEHEH ISOLATED FORM..ARABIC LETTER TEHEH MEDIAL FORM
-FB66..FB69    ; mapped                 ; 0679          # 1.1  ARABIC LETTER TTEH ISOLATED FORM..ARABIC LETTER TTEH MEDIAL FORM
-FB6A..FB6D    ; mapped                 ; 06A4          # 1.1  ARABIC LETTER VEH ISOLATED FORM..ARABIC LETTER VEH MEDIAL FORM
-FB6E..FB71    ; mapped                 ; 06A6          # 1.1  ARABIC LETTER PEHEH ISOLATED FORM..ARABIC LETTER PEHEH MEDIAL FORM
-FB72..FB75    ; mapped                 ; 0684          # 1.1  ARABIC LETTER DYEH ISOLATED FORM..ARABIC LETTER DYEH MEDIAL FORM
-FB76..FB79    ; mapped                 ; 0683          # 1.1  ARABIC LETTER NYEH ISOLATED FORM..ARABIC LETTER NYEH MEDIAL FORM
-FB7A..FB7D    ; mapped                 ; 0686          # 1.1  ARABIC LETTER TCHEH ISOLATED FORM..ARABIC LETTER TCHEH MEDIAL FORM
-FB7E..FB81    ; mapped                 ; 0687          # 1.1  ARABIC LETTER TCHEHEH ISOLATED FORM..ARABIC LETTER TCHEHEH MEDIAL FORM
-FB82..FB83    ; mapped                 ; 068D          # 1.1  ARABIC LETTER DDAHAL ISOLATED FORM..ARABIC LETTER DDAHAL FINAL FORM
-FB84..FB85    ; mapped                 ; 068C          # 1.1  ARABIC LETTER DAHAL ISOLATED FORM..ARABIC LETTER DAHAL FINAL FORM
-FB86..FB87    ; mapped                 ; 068E          # 1.1  ARABIC LETTER DUL ISOLATED FORM..ARABIC LETTER DUL FINAL FORM
-FB88..FB89    ; mapped                 ; 0688          # 1.1  ARABIC LETTER DDAL ISOLATED FORM..ARABIC LETTER DDAL FINAL FORM
-FB8A..FB8B    ; mapped                 ; 0698          # 1.1  ARABIC LETTER JEH ISOLATED FORM..ARABIC LETTER JEH FINAL FORM
-FB8C..FB8D    ; mapped                 ; 0691          # 1.1  ARABIC LETTER RREH ISOLATED FORM..ARABIC LETTER RREH FINAL FORM
-FB8E..FB91    ; mapped                 ; 06A9          # 1.1  ARABIC LETTER KEHEH ISOLATED FORM..ARABIC LETTER KEHEH MEDIAL FORM
-FB92..FB95    ; mapped                 ; 06AF          # 1.1  ARABIC LETTER GAF ISOLATED FORM..ARABIC LETTER GAF MEDIAL FORM
-FB96..FB99    ; mapped                 ; 06B3          # 1.1  ARABIC LETTER GUEH ISOLATED FORM..ARABIC LETTER GUEH MEDIAL FORM
-FB9A..FB9D    ; mapped                 ; 06B1          # 1.1  ARABIC LETTER NGOEH ISOLATED FORM..ARABIC LETTER NGOEH MEDIAL FORM
-FB9E..FB9F    ; mapped                 ; 06BA          # 1.1  ARABIC LETTER NOON GHUNNA ISOLATED FORM..ARABIC LETTER NOON GHUNNA FINAL FORM
-FBA0..FBA3    ; mapped                 ; 06BB          # 1.1  ARABIC LETTER RNOON ISOLATED FORM..ARABIC LETTER RNOON MEDIAL FORM
-FBA4..FBA5    ; mapped                 ; 06C0          # 1.1  ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM..ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM
-FBA6..FBA9    ; mapped                 ; 06C1          # 1.1  ARABIC LETTER HEH GOAL ISOLATED FORM..ARABIC LETTER HEH GOAL MEDIAL FORM
-FBAA..FBAD    ; mapped                 ; 06BE          # 1.1  ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM..ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM
-FBAE..FBAF    ; mapped                 ; 06D2          # 1.1  ARABIC LETTER YEH BARREE ISOLATED FORM..ARABIC LETTER YEH BARREE FINAL FORM
-FBB0..FBB1    ; mapped                 ; 06D3          # 1.1  ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM
-FBB2..FBC1    ; valid                  ;      ; NV8    # 6.0  ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL SMALL TAH BELOW
-FBC2..FBD2    ; disallowed                             # NA   <reserved-FBC2>..<reserved-FBD2>
-FBD3..FBD6    ; mapped                 ; 06AD          # 1.1  ARABIC LETTER NG ISOLATED FORM..ARABIC LETTER NG MEDIAL FORM
-FBD7..FBD8    ; mapped                 ; 06C7          # 1.1  ARABIC LETTER U ISOLATED FORM..ARABIC LETTER U FINAL FORM
-FBD9..FBDA    ; mapped                 ; 06C6          # 1.1  ARABIC LETTER OE ISOLATED FORM..ARABIC LETTER OE FINAL FORM
-FBDB..FBDC    ; mapped                 ; 06C8          # 1.1  ARABIC LETTER YU ISOLATED FORM..ARABIC LETTER YU FINAL FORM
-FBDD          ; mapped                 ; 06C7 0674     # 1.1  ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM
-FBDE..FBDF    ; mapped                 ; 06CB          # 1.1  ARABIC LETTER VE ISOLATED FORM..ARABIC LETTER VE FINAL FORM
-FBE0..FBE1    ; mapped                 ; 06C5          # 1.1  ARABIC LETTER KIRGHIZ OE ISOLATED FORM..ARABIC LETTER KIRGHIZ OE FINAL FORM
-FBE2..FBE3    ; mapped                 ; 06C9          # 1.1  ARABIC LETTER KIRGHIZ YU ISOLATED FORM..ARABIC LETTER KIRGHIZ YU FINAL FORM
-FBE4..FBE7    ; mapped                 ; 06D0          # 1.1  ARABIC LETTER E ISOLATED FORM..ARABIC LETTER E MEDIAL FORM
-FBE8..FBE9    ; mapped                 ; 0649          # 1.1  ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM..ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM
-FBEA..FBEB    ; mapped                 ; 0626 0627     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM
-FBEC..FBED    ; mapped                 ; 0626 06D5     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM
-FBEE..FBEF    ; mapped                 ; 0626 0648     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM
-FBF0..FBF1    ; mapped                 ; 0626 06C7     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM
-FBF2..FBF3    ; mapped                 ; 0626 06C6     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM
-FBF4..FBF5    ; mapped                 ; 0626 06C8     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM
-FBF6..FBF8    ; mapped                 ; 0626 06D0     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM
-FBF9..FBFB    ; mapped                 ; 0626 0649     # 1.1  ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM..ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM
-FBFC..FBFF    ; mapped                 ; 06CC          # 1.1  ARABIC LETTER FARSI YEH ISOLATED FORM..ARABIC LETTER FARSI YEH MEDIAL FORM
-FC00          ; mapped                 ; 0626 062C     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM
-FC01          ; mapped                 ; 0626 062D     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM
-FC02          ; mapped                 ; 0626 0645     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM
-FC03          ; mapped                 ; 0626 0649     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM
-FC04          ; mapped                 ; 0626 064A     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM
-FC05          ; mapped                 ; 0628 062C     # 1.1  ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM
-FC06          ; mapped                 ; 0628 062D     # 1.1  ARABIC LIGATURE BEH WITH HAH ISOLATED FORM
-FC07          ; mapped                 ; 0628 062E     # 1.1  ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM
-FC08          ; mapped                 ; 0628 0645     # 1.1  ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM
-FC09          ; mapped                 ; 0628 0649     # 1.1  ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM
-FC0A          ; mapped                 ; 0628 064A     # 1.1  ARABIC LIGATURE BEH WITH YEH ISOLATED FORM
-FC0B          ; mapped                 ; 062A 062C     # 1.1  ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM
-FC0C          ; mapped                 ; 062A 062D     # 1.1  ARABIC LIGATURE TEH WITH HAH ISOLATED FORM
-FC0D          ; mapped                 ; 062A 062E     # 1.1  ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM
-FC0E          ; mapped                 ; 062A 0645     # 1.1  ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM
-FC0F          ; mapped                 ; 062A 0649     # 1.1  ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM
-FC10          ; mapped                 ; 062A 064A     # 1.1  ARABIC LIGATURE TEH WITH YEH ISOLATED FORM
-FC11          ; mapped                 ; 062B 062C     # 1.1  ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM
-FC12          ; mapped                 ; 062B 0645     # 1.1  ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM
-FC13          ; mapped                 ; 062B 0649     # 1.1  ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM
-FC14          ; mapped                 ; 062B 064A     # 1.1  ARABIC LIGATURE THEH WITH YEH ISOLATED FORM
-FC15          ; mapped                 ; 062C 062D     # 1.1  ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM
-FC16          ; mapped                 ; 062C 0645     # 1.1  ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM
-FC17          ; mapped                 ; 062D 062C     # 1.1  ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM
-FC18          ; mapped                 ; 062D 0645     # 1.1  ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM
-FC19          ; mapped                 ; 062E 062C     # 1.1  ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM
-FC1A          ; mapped                 ; 062E 062D     # 1.1  ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM
-FC1B          ; mapped                 ; 062E 0645     # 1.1  ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM
-FC1C          ; mapped                 ; 0633 062C     # 1.1  ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM
-FC1D          ; mapped                 ; 0633 062D     # 1.1  ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM
-FC1E          ; mapped                 ; 0633 062E     # 1.1  ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM
-FC1F          ; mapped                 ; 0633 0645     # 1.1  ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM
-FC20          ; mapped                 ; 0635 062D     # 1.1  ARABIC LIGATURE SAD WITH HAH ISOLATED FORM
-FC21          ; mapped                 ; 0635 0645     # 1.1  ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM
-FC22          ; mapped                 ; 0636 062C     # 1.1  ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM
-FC23          ; mapped                 ; 0636 062D     # 1.1  ARABIC LIGATURE DAD WITH HAH ISOLATED FORM
-FC24          ; mapped                 ; 0636 062E     # 1.1  ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM
-FC25          ; mapped                 ; 0636 0645     # 1.1  ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM
-FC26          ; mapped                 ; 0637 062D     # 1.1  ARABIC LIGATURE TAH WITH HAH ISOLATED FORM
-FC27          ; mapped                 ; 0637 0645     # 1.1  ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM
-FC28          ; mapped                 ; 0638 0645     # 1.1  ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM
-FC29          ; mapped                 ; 0639 062C     # 1.1  ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM
-FC2A          ; mapped                 ; 0639 0645     # 1.1  ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM
-FC2B          ; mapped                 ; 063A 062C     # 1.1  ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM
-FC2C          ; mapped                 ; 063A 0645     # 1.1  ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM
-FC2D          ; mapped                 ; 0641 062C     # 1.1  ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM
-FC2E          ; mapped                 ; 0641 062D     # 1.1  ARABIC LIGATURE FEH WITH HAH ISOLATED FORM
-FC2F          ; mapped                 ; 0641 062E     # 1.1  ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM
-FC30          ; mapped                 ; 0641 0645     # 1.1  ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM
-FC31          ; mapped                 ; 0641 0649     # 1.1  ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM
-FC32          ; mapped                 ; 0641 064A     # 1.1  ARABIC LIGATURE FEH WITH YEH ISOLATED FORM
-FC33          ; mapped                 ; 0642 062D     # 1.1  ARABIC LIGATURE QAF WITH HAH ISOLATED FORM
-FC34          ; mapped                 ; 0642 0645     # 1.1  ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM
-FC35          ; mapped                 ; 0642 0649     # 1.1  ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM
-FC36          ; mapped                 ; 0642 064A     # 1.1  ARABIC LIGATURE QAF WITH YEH ISOLATED FORM
-FC37          ; mapped                 ; 0643 0627     # 1.1  ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM
-FC38          ; mapped                 ; 0643 062C     # 1.1  ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM
-FC39          ; mapped                 ; 0643 062D     # 1.1  ARABIC LIGATURE KAF WITH HAH ISOLATED FORM
-FC3A          ; mapped                 ; 0643 062E     # 1.1  ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM
-FC3B          ; mapped                 ; 0643 0644     # 1.1  ARABIC LIGATURE KAF WITH LAM ISOLATED FORM
-FC3C          ; mapped                 ; 0643 0645     # 1.1  ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM
-FC3D          ; mapped                 ; 0643 0649     # 1.1  ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM
-FC3E          ; mapped                 ; 0643 064A     # 1.1  ARABIC LIGATURE KAF WITH YEH ISOLATED FORM
-FC3F          ; mapped                 ; 0644 062C     # 1.1  ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM
-FC40          ; mapped                 ; 0644 062D     # 1.1  ARABIC LIGATURE LAM WITH HAH ISOLATED FORM
-FC41          ; mapped                 ; 0644 062E     # 1.1  ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM
-FC42          ; mapped                 ; 0644 0645     # 1.1  ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM
-FC43          ; mapped                 ; 0644 0649     # 1.1  ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM
-FC44          ; mapped                 ; 0644 064A     # 1.1  ARABIC LIGATURE LAM WITH YEH ISOLATED FORM
-FC45          ; mapped                 ; 0645 062C     # 1.1  ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM
-FC46          ; mapped                 ; 0645 062D     # 1.1  ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM
-FC47          ; mapped                 ; 0645 062E     # 1.1  ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM
-FC48          ; mapped                 ; 0645 0645     # 1.1  ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM
-FC49          ; mapped                 ; 0645 0649     # 1.1  ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM
-FC4A          ; mapped                 ; 0645 064A     # 1.1  ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM
-FC4B          ; mapped                 ; 0646 062C     # 1.1  ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM
-FC4C          ; mapped                 ; 0646 062D     # 1.1  ARABIC LIGATURE NOON WITH HAH ISOLATED FORM
-FC4D          ; mapped                 ; 0646 062E     # 1.1  ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM
-FC4E          ; mapped                 ; 0646 0645     # 1.1  ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM
-FC4F          ; mapped                 ; 0646 0649     # 1.1  ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM
-FC50          ; mapped                 ; 0646 064A     # 1.1  ARABIC LIGATURE NOON WITH YEH ISOLATED FORM
-FC51          ; mapped                 ; 0647 062C     # 1.1  ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM
-FC52          ; mapped                 ; 0647 0645     # 1.1  ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM
-FC53          ; mapped                 ; 0647 0649     # 1.1  ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM
-FC54          ; mapped                 ; 0647 064A     # 1.1  ARABIC LIGATURE HEH WITH YEH ISOLATED FORM
-FC55          ; mapped                 ; 064A 062C     # 1.1  ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM
-FC56          ; mapped                 ; 064A 062D     # 1.1  ARABIC LIGATURE YEH WITH HAH ISOLATED FORM
-FC57          ; mapped                 ; 064A 062E     # 1.1  ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM
-FC58          ; mapped                 ; 064A 0645     # 1.1  ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM
-FC59          ; mapped                 ; 064A 0649     # 1.1  ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM
-FC5A          ; mapped                 ; 064A 064A     # 1.1  ARABIC LIGATURE YEH WITH YEH ISOLATED FORM
-FC5B          ; mapped                 ; 0630 0670     # 1.1  ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM
-FC5C          ; mapped                 ; 0631 0670     # 1.1  ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM
-FC5D          ; mapped                 ; 0649 0670     # 1.1  ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM
-FC5E          ; disallowed_STD3_mapped ; 0020 064C 0651 #1.1  ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM
-FC5F          ; disallowed_STD3_mapped ; 0020 064D 0651 #1.1  ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM
-FC60          ; disallowed_STD3_mapped ; 0020 064E 0651 #1.1  ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM
-FC61          ; disallowed_STD3_mapped ; 0020 064F 0651 #1.1  ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM
-FC62          ; disallowed_STD3_mapped ; 0020 0650 0651 #1.1  ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM
-FC63          ; disallowed_STD3_mapped ; 0020 0651 0670 #1.1  ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM
-FC64          ; mapped                 ; 0626 0631     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM
-FC65          ; mapped                 ; 0626 0632     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM
-FC66          ; mapped                 ; 0626 0645     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM
-FC67          ; mapped                 ; 0626 0646     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM
-FC68          ; mapped                 ; 0626 0649     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM
-FC69          ; mapped                 ; 0626 064A     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM
-FC6A          ; mapped                 ; 0628 0631     # 1.1  ARABIC LIGATURE BEH WITH REH FINAL FORM
-FC6B          ; mapped                 ; 0628 0632     # 1.1  ARABIC LIGATURE BEH WITH ZAIN FINAL FORM
-FC6C          ; mapped                 ; 0628 0645     # 1.1  ARABIC LIGATURE BEH WITH MEEM FINAL FORM
-FC6D          ; mapped                 ; 0628 0646     # 1.1  ARABIC LIGATURE BEH WITH NOON FINAL FORM
-FC6E          ; mapped                 ; 0628 0649     # 1.1  ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM
-FC6F          ; mapped                 ; 0628 064A     # 1.1  ARABIC LIGATURE BEH WITH YEH FINAL FORM
-FC70          ; mapped                 ; 062A 0631     # 1.1  ARABIC LIGATURE TEH WITH REH FINAL FORM
-FC71          ; mapped                 ; 062A 0632     # 1.1  ARABIC LIGATURE TEH WITH ZAIN FINAL FORM
-FC72          ; mapped                 ; 062A 0645     # 1.1  ARABIC LIGATURE TEH WITH MEEM FINAL FORM
-FC73          ; mapped                 ; 062A 0646     # 1.1  ARABIC LIGATURE TEH WITH NOON FINAL FORM
-FC74          ; mapped                 ; 062A 0649     # 1.1  ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM
-FC75          ; mapped                 ; 062A 064A     # 1.1  ARABIC LIGATURE TEH WITH YEH FINAL FORM
-FC76          ; mapped                 ; 062B 0631     # 1.1  ARABIC LIGATURE THEH WITH REH FINAL FORM
-FC77          ; mapped                 ; 062B 0632     # 1.1  ARABIC LIGATURE THEH WITH ZAIN FINAL FORM
-FC78          ; mapped                 ; 062B 0645     # 1.1  ARABIC LIGATURE THEH WITH MEEM FINAL FORM
-FC79          ; mapped                 ; 062B 0646     # 1.1  ARABIC LIGATURE THEH WITH NOON FINAL FORM
-FC7A          ; mapped                 ; 062B 0649     # 1.1  ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM
-FC7B          ; mapped                 ; 062B 064A     # 1.1  ARABIC LIGATURE THEH WITH YEH FINAL FORM
-FC7C          ; mapped                 ; 0641 0649     # 1.1  ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM
-FC7D          ; mapped                 ; 0641 064A     # 1.1  ARABIC LIGATURE FEH WITH YEH FINAL FORM
-FC7E          ; mapped                 ; 0642 0649     # 1.1  ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM
-FC7F          ; mapped                 ; 0642 064A     # 1.1  ARABIC LIGATURE QAF WITH YEH FINAL FORM
-FC80          ; mapped                 ; 0643 0627     # 1.1  ARABIC LIGATURE KAF WITH ALEF FINAL FORM
-FC81          ; mapped                 ; 0643 0644     # 1.1  ARABIC LIGATURE KAF WITH LAM FINAL FORM
-FC82          ; mapped                 ; 0643 0645     # 1.1  ARABIC LIGATURE KAF WITH MEEM FINAL FORM
-FC83          ; mapped                 ; 0643 0649     # 1.1  ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM
-FC84          ; mapped                 ; 0643 064A     # 1.1  ARABIC LIGATURE KAF WITH YEH FINAL FORM
-FC85          ; mapped                 ; 0644 0645     # 1.1  ARABIC LIGATURE LAM WITH MEEM FINAL FORM
-FC86          ; mapped                 ; 0644 0649     # 1.1  ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM
-FC87          ; mapped                 ; 0644 064A     # 1.1  ARABIC LIGATURE LAM WITH YEH FINAL FORM
-FC88          ; mapped                 ; 0645 0627     # 1.1  ARABIC LIGATURE MEEM WITH ALEF FINAL FORM
-FC89          ; mapped                 ; 0645 0645     # 1.1  ARABIC LIGATURE MEEM WITH MEEM FINAL FORM
-FC8A          ; mapped                 ; 0646 0631     # 1.1  ARABIC LIGATURE NOON WITH REH FINAL FORM
-FC8B          ; mapped                 ; 0646 0632     # 1.1  ARABIC LIGATURE NOON WITH ZAIN FINAL FORM
-FC8C          ; mapped                 ; 0646 0645     # 1.1  ARABIC LIGATURE NOON WITH MEEM FINAL FORM
-FC8D          ; mapped                 ; 0646 0646     # 1.1  ARABIC LIGATURE NOON WITH NOON FINAL FORM
-FC8E          ; mapped                 ; 0646 0649     # 1.1  ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM
-FC8F          ; mapped                 ; 0646 064A     # 1.1  ARABIC LIGATURE NOON WITH YEH FINAL FORM
-FC90          ; mapped                 ; 0649 0670     # 1.1  ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM
-FC91          ; mapped                 ; 064A 0631     # 1.1  ARABIC LIGATURE YEH WITH REH FINAL FORM
-FC92          ; mapped                 ; 064A 0632     # 1.1  ARABIC LIGATURE YEH WITH ZAIN FINAL FORM
-FC93          ; mapped                 ; 064A 0645     # 1.1  ARABIC LIGATURE YEH WITH MEEM FINAL FORM
-FC94          ; mapped                 ; 064A 0646     # 1.1  ARABIC LIGATURE YEH WITH NOON FINAL FORM
-FC95          ; mapped                 ; 064A 0649     # 1.1  ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM
-FC96          ; mapped                 ; 064A 064A     # 1.1  ARABIC LIGATURE YEH WITH YEH FINAL FORM
-FC97          ; mapped                 ; 0626 062C     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM
-FC98          ; mapped                 ; 0626 062D     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM
-FC99          ; mapped                 ; 0626 062E     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM
-FC9A          ; mapped                 ; 0626 0645     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM
-FC9B          ; mapped                 ; 0626 0647     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM
-FC9C          ; mapped                 ; 0628 062C     # 1.1  ARABIC LIGATURE BEH WITH JEEM INITIAL FORM
-FC9D          ; mapped                 ; 0628 062D     # 1.1  ARABIC LIGATURE BEH WITH HAH INITIAL FORM
-FC9E          ; mapped                 ; 0628 062E     # 1.1  ARABIC LIGATURE BEH WITH KHAH INITIAL FORM
-FC9F          ; mapped                 ; 0628 0645     # 1.1  ARABIC LIGATURE BEH WITH MEEM INITIAL FORM
-FCA0          ; mapped                 ; 0628 0647     # 1.1  ARABIC LIGATURE BEH WITH HEH INITIAL FORM
-FCA1          ; mapped                 ; 062A 062C     # 1.1  ARABIC LIGATURE TEH WITH JEEM INITIAL FORM
-FCA2          ; mapped                 ; 062A 062D     # 1.1  ARABIC LIGATURE TEH WITH HAH INITIAL FORM
-FCA3          ; mapped                 ; 062A 062E     # 1.1  ARABIC LIGATURE TEH WITH KHAH INITIAL FORM
-FCA4          ; mapped                 ; 062A 0645     # 1.1  ARABIC LIGATURE TEH WITH MEEM INITIAL FORM
-FCA5          ; mapped                 ; 062A 0647     # 1.1  ARABIC LIGATURE TEH WITH HEH INITIAL FORM
-FCA6          ; mapped                 ; 062B 0645     # 1.1  ARABIC LIGATURE THEH WITH MEEM INITIAL FORM
-FCA7          ; mapped                 ; 062C 062D     # 1.1  ARABIC LIGATURE JEEM WITH HAH INITIAL FORM
-FCA8          ; mapped                 ; 062C 0645     # 1.1  ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM
-FCA9          ; mapped                 ; 062D 062C     # 1.1  ARABIC LIGATURE HAH WITH JEEM INITIAL FORM
-FCAA          ; mapped                 ; 062D 0645     # 1.1  ARABIC LIGATURE HAH WITH MEEM INITIAL FORM
-FCAB          ; mapped                 ; 062E 062C     # 1.1  ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM
-FCAC          ; mapped                 ; 062E 0645     # 1.1  ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM
-FCAD          ; mapped                 ; 0633 062C     # 1.1  ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM
-FCAE          ; mapped                 ; 0633 062D     # 1.1  ARABIC LIGATURE SEEN WITH HAH INITIAL FORM
-FCAF          ; mapped                 ; 0633 062E     # 1.1  ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM
-FCB0          ; mapped                 ; 0633 0645     # 1.1  ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM
-FCB1          ; mapped                 ; 0635 062D     # 1.1  ARABIC LIGATURE SAD WITH HAH INITIAL FORM
-FCB2          ; mapped                 ; 0635 062E     # 1.1  ARABIC LIGATURE SAD WITH KHAH INITIAL FORM
-FCB3          ; mapped                 ; 0635 0645     # 1.1  ARABIC LIGATURE SAD WITH MEEM INITIAL FORM
-FCB4          ; mapped                 ; 0636 062C     # 1.1  ARABIC LIGATURE DAD WITH JEEM INITIAL FORM
-FCB5          ; mapped                 ; 0636 062D     # 1.1  ARABIC LIGATURE DAD WITH HAH INITIAL FORM
-FCB6          ; mapped                 ; 0636 062E     # 1.1  ARABIC LIGATURE DAD WITH KHAH INITIAL FORM
-FCB7          ; mapped                 ; 0636 0645     # 1.1  ARABIC LIGATURE DAD WITH MEEM INITIAL FORM
-FCB8          ; mapped                 ; 0637 062D     # 1.1  ARABIC LIGATURE TAH WITH HAH INITIAL FORM
-FCB9          ; mapped                 ; 0638 0645     # 1.1  ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM
-FCBA          ; mapped                 ; 0639 062C     # 1.1  ARABIC LIGATURE AIN WITH JEEM INITIAL FORM
-FCBB          ; mapped                 ; 0639 0645     # 1.1  ARABIC LIGATURE AIN WITH MEEM INITIAL FORM
-FCBC          ; mapped                 ; 063A 062C     # 1.1  ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM
-FCBD          ; mapped                 ; 063A 0645     # 1.1  ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM
-FCBE          ; mapped                 ; 0641 062C     # 1.1  ARABIC LIGATURE FEH WITH JEEM INITIAL FORM
-FCBF          ; mapped                 ; 0641 062D     # 1.1  ARABIC LIGATURE FEH WITH HAH INITIAL FORM
-FCC0          ; mapped                 ; 0641 062E     # 1.1  ARABIC LIGATURE FEH WITH KHAH INITIAL FORM
-FCC1          ; mapped                 ; 0641 0645     # 1.1  ARABIC LIGATURE FEH WITH MEEM INITIAL FORM
-FCC2          ; mapped                 ; 0642 062D     # 1.1  ARABIC LIGATURE QAF WITH HAH INITIAL FORM
-FCC3          ; mapped                 ; 0642 0645     # 1.1  ARABIC LIGATURE QAF WITH MEEM INITIAL FORM
-FCC4          ; mapped                 ; 0643 062C     # 1.1  ARABIC LIGATURE KAF WITH JEEM INITIAL FORM
-FCC5          ; mapped                 ; 0643 062D     # 1.1  ARABIC LIGATURE KAF WITH HAH INITIAL FORM
-FCC6          ; mapped                 ; 0643 062E     # 1.1  ARABIC LIGATURE KAF WITH KHAH INITIAL FORM
-FCC7          ; mapped                 ; 0643 0644     # 1.1  ARABIC LIGATURE KAF WITH LAM INITIAL FORM
-FCC8          ; mapped                 ; 0643 0645     # 1.1  ARABIC LIGATURE KAF WITH MEEM INITIAL FORM
-FCC9          ; mapped                 ; 0644 062C     # 1.1  ARABIC LIGATURE LAM WITH JEEM INITIAL FORM
-FCCA          ; mapped                 ; 0644 062D     # 1.1  ARABIC LIGATURE LAM WITH HAH INITIAL FORM
-FCCB          ; mapped                 ; 0644 062E     # 1.1  ARABIC LIGATURE LAM WITH KHAH INITIAL FORM
-FCCC          ; mapped                 ; 0644 0645     # 1.1  ARABIC LIGATURE LAM WITH MEEM INITIAL FORM
-FCCD          ; mapped                 ; 0644 0647     # 1.1  ARABIC LIGATURE LAM WITH HEH INITIAL FORM
-FCCE          ; mapped                 ; 0645 062C     # 1.1  ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM
-FCCF          ; mapped                 ; 0645 062D     # 1.1  ARABIC LIGATURE MEEM WITH HAH INITIAL FORM
-FCD0          ; mapped                 ; 0645 062E     # 1.1  ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM
-FCD1          ; mapped                 ; 0645 0645     # 1.1  ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM
-FCD2          ; mapped                 ; 0646 062C     # 1.1  ARABIC LIGATURE NOON WITH JEEM INITIAL FORM
-FCD3          ; mapped                 ; 0646 062D     # 1.1  ARABIC LIGATURE NOON WITH HAH INITIAL FORM
-FCD4          ; mapped                 ; 0646 062E     # 1.1  ARABIC LIGATURE NOON WITH KHAH INITIAL FORM
-FCD5          ; mapped                 ; 0646 0645     # 1.1  ARABIC LIGATURE NOON WITH MEEM INITIAL FORM
-FCD6          ; mapped                 ; 0646 0647     # 1.1  ARABIC LIGATURE NOON WITH HEH INITIAL FORM
-FCD7          ; mapped                 ; 0647 062C     # 1.1  ARABIC LIGATURE HEH WITH JEEM INITIAL FORM
-FCD8          ; mapped                 ; 0647 0645     # 1.1  ARABIC LIGATURE HEH WITH MEEM INITIAL FORM
-FCD9          ; mapped                 ; 0647 0670     # 1.1  ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM
-FCDA          ; mapped                 ; 064A 062C     # 1.1  ARABIC LIGATURE YEH WITH JEEM INITIAL FORM
-FCDB          ; mapped                 ; 064A 062D     # 1.1  ARABIC LIGATURE YEH WITH HAH INITIAL FORM
-FCDC          ; mapped                 ; 064A 062E     # 1.1  ARABIC LIGATURE YEH WITH KHAH INITIAL FORM
-FCDD          ; mapped                 ; 064A 0645     # 1.1  ARABIC LIGATURE YEH WITH MEEM INITIAL FORM
-FCDE          ; mapped                 ; 064A 0647     # 1.1  ARABIC LIGATURE YEH WITH HEH INITIAL FORM
-FCDF          ; mapped                 ; 0626 0645     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM
-FCE0          ; mapped                 ; 0626 0647     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM
-FCE1          ; mapped                 ; 0628 0645     # 1.1  ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM
-FCE2          ; mapped                 ; 0628 0647     # 1.1  ARABIC LIGATURE BEH WITH HEH MEDIAL FORM
-FCE3          ; mapped                 ; 062A 0645     # 1.1  ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM
-FCE4          ; mapped                 ; 062A 0647     # 1.1  ARABIC LIGATURE TEH WITH HEH MEDIAL FORM
-FCE5          ; mapped                 ; 062B 0645     # 1.1  ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM
-FCE6          ; mapped                 ; 062B 0647     # 1.1  ARABIC LIGATURE THEH WITH HEH MEDIAL FORM
-FCE7          ; mapped                 ; 0633 0645     # 1.1  ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM
-FCE8          ; mapped                 ; 0633 0647     # 1.1  ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM
-FCE9          ; mapped                 ; 0634 0645     # 1.1  ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM
-FCEA          ; mapped                 ; 0634 0647     # 1.1  ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM
-FCEB          ; mapped                 ; 0643 0644     # 1.1  ARABIC LIGATURE KAF WITH LAM MEDIAL FORM
-FCEC          ; mapped                 ; 0643 0645     # 1.1  ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM
-FCED          ; mapped                 ; 0644 0645     # 1.1  ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM
-FCEE          ; mapped                 ; 0646 0645     # 1.1  ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM
-FCEF          ; mapped                 ; 0646 0647     # 1.1  ARABIC LIGATURE NOON WITH HEH MEDIAL FORM
-FCF0          ; mapped                 ; 064A 0645     # 1.1  ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM
-FCF1          ; mapped                 ; 064A 0647     # 1.1  ARABIC LIGATURE YEH WITH HEH MEDIAL FORM
-FCF2          ; mapped                 ; 0640 064E 0651 #1.1  ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM
-FCF3          ; mapped                 ; 0640 064F 0651 #1.1  ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM
-FCF4          ; mapped                 ; 0640 0650 0651 #1.1  ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM
-FCF5          ; mapped                 ; 0637 0649     # 1.1  ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM
-FCF6          ; mapped                 ; 0637 064A     # 1.1  ARABIC LIGATURE TAH WITH YEH ISOLATED FORM
-FCF7          ; mapped                 ; 0639 0649     # 1.1  ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM
-FCF8          ; mapped                 ; 0639 064A     # 1.1  ARABIC LIGATURE AIN WITH YEH ISOLATED FORM
-FCF9          ; mapped                 ; 063A 0649     # 1.1  ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM
-FCFA          ; mapped                 ; 063A 064A     # 1.1  ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM
-FCFB          ; mapped                 ; 0633 0649     # 1.1  ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM
-FCFC          ; mapped                 ; 0633 064A     # 1.1  ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM
-FCFD          ; mapped                 ; 0634 0649     # 1.1  ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM
-FCFE          ; mapped                 ; 0634 064A     # 1.1  ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM
-FCFF          ; mapped                 ; 062D 0649     # 1.1  ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM
-FD00          ; mapped                 ; 062D 064A     # 1.1  ARABIC LIGATURE HAH WITH YEH ISOLATED FORM
-FD01          ; mapped                 ; 062C 0649     # 1.1  ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM
-FD02          ; mapped                 ; 062C 064A     # 1.1  ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM
-FD03          ; mapped                 ; 062E 0649     # 1.1  ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM
-FD04          ; mapped                 ; 062E 064A     # 1.1  ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM
-FD05          ; mapped                 ; 0635 0649     # 1.1  ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM
-FD06          ; mapped                 ; 0635 064A     # 1.1  ARABIC LIGATURE SAD WITH YEH ISOLATED FORM
-FD07          ; mapped                 ; 0636 0649     # 1.1  ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM
-FD08          ; mapped                 ; 0636 064A     # 1.1  ARABIC LIGATURE DAD WITH YEH ISOLATED FORM
-FD09          ; mapped                 ; 0634 062C     # 1.1  ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM
-FD0A          ; mapped                 ; 0634 062D     # 1.1  ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM
-FD0B          ; mapped                 ; 0634 062E     # 1.1  ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM
-FD0C          ; mapped                 ; 0634 0645     # 1.1  ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM
-FD0D          ; mapped                 ; 0634 0631     # 1.1  ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM
-FD0E          ; mapped                 ; 0633 0631     # 1.1  ARABIC LIGATURE SEEN WITH REH ISOLATED FORM
-FD0F          ; mapped                 ; 0635 0631     # 1.1  ARABIC LIGATURE SAD WITH REH ISOLATED FORM
-FD10          ; mapped                 ; 0636 0631     # 1.1  ARABIC LIGATURE DAD WITH REH ISOLATED FORM
-FD11          ; mapped                 ; 0637 0649     # 1.1  ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM
-FD12          ; mapped                 ; 0637 064A     # 1.1  ARABIC LIGATURE TAH WITH YEH FINAL FORM
-FD13          ; mapped                 ; 0639 0649     # 1.1  ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM
-FD14          ; mapped                 ; 0639 064A     # 1.1  ARABIC LIGATURE AIN WITH YEH FINAL FORM
-FD15          ; mapped                 ; 063A 0649     # 1.1  ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM
-FD16          ; mapped                 ; 063A 064A     # 1.1  ARABIC LIGATURE GHAIN WITH YEH FINAL FORM
-FD17          ; mapped                 ; 0633 0649     # 1.1  ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM
-FD18          ; mapped                 ; 0633 064A     # 1.1  ARABIC LIGATURE SEEN WITH YEH FINAL FORM
-FD19          ; mapped                 ; 0634 0649     # 1.1  ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM
-FD1A          ; mapped                 ; 0634 064A     # 1.1  ARABIC LIGATURE SHEEN WITH YEH FINAL FORM
-FD1B          ; mapped                 ; 062D 0649     # 1.1  ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM
-FD1C          ; mapped                 ; 062D 064A     # 1.1  ARABIC LIGATURE HAH WITH YEH FINAL FORM
-FD1D          ; mapped                 ; 062C 0649     # 1.1  ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM
-FD1E          ; mapped                 ; 062C 064A     # 1.1  ARABIC LIGATURE JEEM WITH YEH FINAL FORM
-FD1F          ; mapped                 ; 062E 0649     # 1.1  ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM
-FD20          ; mapped                 ; 062E 064A     # 1.1  ARABIC LIGATURE KHAH WITH YEH FINAL FORM
-FD21          ; mapped                 ; 0635 0649     # 1.1  ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM
-FD22          ; mapped                 ; 0635 064A     # 1.1  ARABIC LIGATURE SAD WITH YEH FINAL FORM
-FD23          ; mapped                 ; 0636 0649     # 1.1  ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM
-FD24          ; mapped                 ; 0636 064A     # 1.1  ARABIC LIGATURE DAD WITH YEH FINAL FORM
-FD25          ; mapped                 ; 0634 062C     # 1.1  ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM
-FD26          ; mapped                 ; 0634 062D     # 1.1  ARABIC LIGATURE SHEEN WITH HAH FINAL FORM
-FD27          ; mapped                 ; 0634 062E     # 1.1  ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM
-FD28          ; mapped                 ; 0634 0645     # 1.1  ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM
-FD29          ; mapped                 ; 0634 0631     # 1.1  ARABIC LIGATURE SHEEN WITH REH FINAL FORM
-FD2A          ; mapped                 ; 0633 0631     # 1.1  ARABIC LIGATURE SEEN WITH REH FINAL FORM
-FD2B          ; mapped                 ; 0635 0631     # 1.1  ARABIC LIGATURE SAD WITH REH FINAL FORM
-FD2C          ; mapped                 ; 0636 0631     # 1.1  ARABIC LIGATURE DAD WITH REH FINAL FORM
-FD2D          ; mapped                 ; 0634 062C     # 1.1  ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM
-FD2E          ; mapped                 ; 0634 062D     # 1.1  ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM
-FD2F          ; mapped                 ; 0634 062E     # 1.1  ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM
-FD30          ; mapped                 ; 0634 0645     # 1.1  ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM
-FD31          ; mapped                 ; 0633 0647     # 1.1  ARABIC LIGATURE SEEN WITH HEH INITIAL FORM
-FD32          ; mapped                 ; 0634 0647     # 1.1  ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM
-FD33          ; mapped                 ; 0637 0645     # 1.1  ARABIC LIGATURE TAH WITH MEEM INITIAL FORM
-FD34          ; mapped                 ; 0633 062C     # 1.1  ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM
-FD35          ; mapped                 ; 0633 062D     # 1.1  ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM
-FD36          ; mapped                 ; 0633 062E     # 1.1  ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM
-FD37          ; mapped                 ; 0634 062C     # 1.1  ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM
-FD38          ; mapped                 ; 0634 062D     # 1.1  ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM
-FD39          ; mapped                 ; 0634 062E     # 1.1  ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM
-FD3A          ; mapped                 ; 0637 0645     # 1.1  ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM
-FD3B          ; mapped                 ; 0638 0645     # 1.1  ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM
-FD3C..FD3D    ; mapped                 ; 0627 064B     # 1.1  ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM
-FD3E..FD3F    ; valid                  ;      ; NV8    # 1.1  ORNATE LEFT PARENTHESIS..ORNATE RIGHT PARENTHESIS
-FD40..FD4F    ; disallowed                             # NA   <reserved-FD40>..<reserved-FD4F>
-FD50          ; mapped                 ; 062A 062C 0645 #1.1  ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM
-FD51..FD52    ; mapped                 ; 062A 062D 062C #1.1  ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM..ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM
-FD53          ; mapped                 ; 062A 062D 0645 #1.1  ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM
-FD54          ; mapped                 ; 062A 062E 0645 #1.1  ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM
-FD55          ; mapped                 ; 062A 0645 062C #1.1  ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM
-FD56          ; mapped                 ; 062A 0645 062D #1.1  ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM
-FD57          ; mapped                 ; 062A 0645 062E #1.1  ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM
-FD58..FD59    ; mapped                 ; 062C 0645 062D #1.1  ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM..ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM
-FD5A          ; mapped                 ; 062D 0645 064A #1.1  ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM
-FD5B          ; mapped                 ; 062D 0645 0649 #1.1  ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM
-FD5C          ; mapped                 ; 0633 062D 062C #1.1  ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM
-FD5D          ; mapped                 ; 0633 062C 062D #1.1  ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM
-FD5E          ; mapped                 ; 0633 062C 0649 #1.1  ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM
-FD5F..FD60    ; mapped                 ; 0633 0645 062D #1.1  ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM..ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM
-FD61          ; mapped                 ; 0633 0645 062C #1.1  ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM
-FD62..FD63    ; mapped                 ; 0633 0645 0645 #1.1  ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM..ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM
-FD64..FD65    ; mapped                 ; 0635 062D 062D #1.1  ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM..ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM
-FD66          ; mapped                 ; 0635 0645 0645 #1.1  ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM
-FD67..FD68    ; mapped                 ; 0634 062D 0645 #1.1  ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM..ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM
-FD69          ; mapped                 ; 0634 062C 064A #1.1  ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM
-FD6A..FD6B    ; mapped                 ; 0634 0645 062E #1.1  ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM..ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM
-FD6C..FD6D    ; mapped                 ; 0634 0645 0645 #1.1  ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM..ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM
-FD6E          ; mapped                 ; 0636 062D 0649 #1.1  ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM
-FD6F..FD70    ; mapped                 ; 0636 062E 0645 #1.1  ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM..ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM
-FD71..FD72    ; mapped                 ; 0637 0645 062D #1.1  ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM..ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM
-FD73          ; mapped                 ; 0637 0645 0645 #1.1  ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM
-FD74          ; mapped                 ; 0637 0645 064A #1.1  ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM
-FD75          ; mapped                 ; 0639 062C 0645 #1.1  ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM
-FD76..FD77    ; mapped                 ; 0639 0645 0645 #1.1  ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM..ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM
-FD78          ; mapped                 ; 0639 0645 0649 #1.1  ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM
-FD79          ; mapped                 ; 063A 0645 0645 #1.1  ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM
-FD7A          ; mapped                 ; 063A 0645 064A #1.1  ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM
-FD7B          ; mapped                 ; 063A 0645 0649 #1.1  ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM
-FD7C..FD7D    ; mapped                 ; 0641 062E 0645 #1.1  ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM..ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM
-FD7E          ; mapped                 ; 0642 0645 062D #1.1  ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM
-FD7F          ; mapped                 ; 0642 0645 0645 #1.1  ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM
-FD80          ; mapped                 ; 0644 062D 0645 #1.1  ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM
-FD81          ; mapped                 ; 0644 062D 064A #1.1  ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM
-FD82          ; mapped                 ; 0644 062D 0649 #1.1  ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM
-FD83..FD84    ; mapped                 ; 0644 062C 062C #1.1  ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM..ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM
-FD85..FD86    ; mapped                 ; 0644 062E 0645 #1.1  ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM..ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM
-FD87..FD88    ; mapped                 ; 0644 0645 062D #1.1  ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM..ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM
-FD89          ; mapped                 ; 0645 062D 062C #1.1  ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM
-FD8A          ; mapped                 ; 0645 062D 0645 #1.1  ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM
-FD8B          ; mapped                 ; 0645 062D 064A #1.1  ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM
-FD8C          ; mapped                 ; 0645 062C 062D #1.1  ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM
-FD8D          ; mapped                 ; 0645 062C 0645 #1.1  ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM
-FD8E          ; mapped                 ; 0645 062E 062C #1.1  ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM
-FD8F          ; mapped                 ; 0645 062E 0645 #1.1  ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM
-FD90..FD91    ; disallowed                             # NA   <reserved-FD90>..<reserved-FD91>
-FD92          ; mapped                 ; 0645 062C 062E #1.1  ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM
-FD93          ; mapped                 ; 0647 0645 062C #1.1  ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM
-FD94          ; mapped                 ; 0647 0645 0645 #1.1  ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM
-FD95          ; mapped                 ; 0646 062D 0645 #1.1  ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM
-FD96          ; mapped                 ; 0646 062D 0649 #1.1  ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM
-FD97..FD98    ; mapped                 ; 0646 062C 0645 #1.1  ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM
-FD99          ; mapped                 ; 0646 062C 0649 #1.1  ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM
-FD9A          ; mapped                 ; 0646 0645 064A #1.1  ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM
-FD9B          ; mapped                 ; 0646 0645 0649 #1.1  ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM
-FD9C..FD9D    ; mapped                 ; 064A 0645 0645 #1.1  ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM..ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM
-FD9E          ; mapped                 ; 0628 062E 064A #1.1  ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM
-FD9F          ; mapped                 ; 062A 062C 064A #1.1  ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM
-FDA0          ; mapped                 ; 062A 062C 0649 #1.1  ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM
-FDA1          ; mapped                 ; 062A 062E 064A #1.1  ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM
-FDA2          ; mapped                 ; 062A 062E 0649 #1.1  ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM
-FDA3          ; mapped                 ; 062A 0645 064A #1.1  ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM
-FDA4          ; mapped                 ; 062A 0645 0649 #1.1  ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM
-FDA5          ; mapped                 ; 062C 0645 064A #1.1  ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM
-FDA6          ; mapped                 ; 062C 062D 0649 #1.1  ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM
-FDA7          ; mapped                 ; 062C 0645 0649 #1.1  ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM
-FDA8          ; mapped                 ; 0633 062E 0649 #1.1  ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM
-FDA9          ; mapped                 ; 0635 062D 064A #1.1  ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM
-FDAA          ; mapped                 ; 0634 062D 064A #1.1  ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM
-FDAB          ; mapped                 ; 0636 062D 064A #1.1  ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM
-FDAC          ; mapped                 ; 0644 062C 064A #1.1  ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM
-FDAD          ; mapped                 ; 0644 0645 064A #1.1  ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM
-FDAE          ; mapped                 ; 064A 062D 064A #1.1  ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM
-FDAF          ; mapped                 ; 064A 062C 064A #1.1  ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM
-FDB0          ; mapped                 ; 064A 0645 064A #1.1  ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM
-FDB1          ; mapped                 ; 0645 0645 064A #1.1  ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM
-FDB2          ; mapped                 ; 0642 0645 064A #1.1  ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM
-FDB3          ; mapped                 ; 0646 062D 064A #1.1  ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM
-FDB4          ; mapped                 ; 0642 0645 062D #1.1  ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM
-FDB5          ; mapped                 ; 0644 062D 0645 #1.1  ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM
-FDB6          ; mapped                 ; 0639 0645 064A #1.1  ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM
-FDB7          ; mapped                 ; 0643 0645 064A #1.1  ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM
-FDB8          ; mapped                 ; 0646 062C 062D #1.1  ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM
-FDB9          ; mapped                 ; 0645 062E 064A #1.1  ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM
-FDBA          ; mapped                 ; 0644 062C 0645 #1.1  ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM
-FDBB          ; mapped                 ; 0643 0645 0645 #1.1  ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM
-FDBC          ; mapped                 ; 0644 062C 0645 #1.1  ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM
-FDBD          ; mapped                 ; 0646 062C 062D #1.1  ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM
-FDBE          ; mapped                 ; 062C 062D 064A #1.1  ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM
-FDBF          ; mapped                 ; 062D 062C 064A #1.1  ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM
-FDC0          ; mapped                 ; 0645 062C 064A #1.1  ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM
-FDC1          ; mapped                 ; 0641 0645 064A #1.1  ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM
-FDC2          ; mapped                 ; 0628 062D 064A #1.1  ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM
-FDC3          ; mapped                 ; 0643 0645 0645 #1.1  ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM
-FDC4          ; mapped                 ; 0639 062C 0645 #1.1  ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM
-FDC5          ; mapped                 ; 0635 0645 0645 #1.1  ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM
-FDC6          ; mapped                 ; 0633 062E 064A #1.1  ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM
-FDC7          ; mapped                 ; 0646 062C 064A #1.1  ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM
-FDC8..FDCF    ; disallowed                             # NA   <reserved-FDC8>..<reserved-FDCF>
-FDD0..FDEF    ; disallowed                             # 3.1  <noncharacter-FDD0>..<noncharacter-FDEF>
-FDF0          ; mapped                 ; 0635 0644 06D2 #1.1  ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM
-FDF1          ; mapped                 ; 0642 0644 06D2 #1.1  ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM
-FDF2          ; mapped                 ; 0627 0644 0644 0647 #1.1 ARABIC LIGATURE ALLAH ISOLATED FORM
-FDF3          ; mapped                 ; 0627 0643 0628 0631 #1.1 ARABIC LIGATURE AKBAR ISOLATED FORM
-FDF4          ; mapped                 ; 0645 062D 0645 062F #1.1 ARABIC LIGATURE MOHAMMAD ISOLATED FORM
-FDF5          ; mapped                 ; 0635 0644 0639 0645 #1.1 ARABIC LIGATURE SALAM ISOLATED FORM
-FDF6          ; mapped                 ; 0631 0633 0648 0644 #1.1 ARABIC LIGATURE RASOUL ISOLATED FORM
-FDF7          ; mapped                 ; 0639 0644 064A 0647 #1.1 ARABIC LIGATURE ALAYHE ISOLATED FORM
-FDF8          ; mapped                 ; 0648 0633 0644 0645 #1.1 ARABIC LIGATURE WASALLAM ISOLATED FORM
-FDF9          ; mapped                 ; 0635 0644 0649 #1.1  ARABIC LIGATURE SALLA ISOLATED FORM
-FDFA          ; disallowed_STD3_mapped ; 0635 0644 0649 0020 0627 0644 0644 0647 0020 0639 0644 064A 0647 0020 0648 0633 0644 0645 #1.1 ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM
-FDFB          ; disallowed_STD3_mapped ; 062C 0644 0020 062C 0644 0627 0644 0647 #1.1 ARABIC LIGATURE JALLAJALALOUHOU
-FDFC          ; mapped                 ; 0631 06CC 0627 0644 #3.2 RIAL SIGN
-FDFD          ; valid                  ;      ; NV8    # 4.0  ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM
-FDFE..FDFF    ; disallowed                             # NA   <reserved-FDFE>..<reserved-FDFF>
-FE00..FE0F    ; ignored                                # 3.2  VARIATION SELECTOR-1..VARIATION SELECTOR-16
-FE10          ; disallowed_STD3_mapped ; 002C          # 4.1  PRESENTATION FORM FOR VERTICAL COMMA
-FE11          ; mapped                 ; 3001          # 4.1  PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA
-FE12          ; disallowed                             # 4.1  PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP
-FE13          ; disallowed_STD3_mapped ; 003A          # 4.1  PRESENTATION FORM FOR VERTICAL COLON
-FE14          ; disallowed_STD3_mapped ; 003B          # 4.1  PRESENTATION FORM FOR VERTICAL SEMICOLON
-FE15          ; disallowed_STD3_mapped ; 0021          # 4.1  PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK
-FE16          ; disallowed_STD3_mapped ; 003F          # 4.1  PRESENTATION FORM FOR VERTICAL QUESTION MARK
-FE17          ; mapped                 ; 3016          # 4.1  PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET
-FE18          ; mapped                 ; 3017          # 4.1  PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET
-FE19          ; disallowed                             # 4.1  PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS
-FE1A..FE1F    ; disallowed                             # NA   <reserved-FE1A>..<reserved-FE1F>
-FE20..FE23    ; valid                                  # 1.1  COMBINING LIGATURE LEFT HALF..COMBINING DOUBLE TILDE RIGHT HALF
-FE24..FE26    ; valid                                  # 5.1  COMBINING MACRON LEFT HALF..COMBINING CONJOINING MACRON
-FE27..FE2D    ; valid                                  # 7.0  COMBINING LIGATURE LEFT HALF BELOW..COMBINING CONJOINING MACRON BELOW
-FE2E..FE2F    ; valid                                  # 8.0  COMBINING CYRILLIC TITLO LEFT HALF..COMBINING CYRILLIC TITLO RIGHT HALF
-FE30          ; disallowed                             # 1.1  PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
-FE31          ; mapped                 ; 2014          # 1.1  PRESENTATION FORM FOR VERTICAL EM DASH
-FE32          ; mapped                 ; 2013          # 1.1  PRESENTATION FORM FOR VERTICAL EN DASH
-FE33..FE34    ; disallowed_STD3_mapped ; 005F          # 1.1  PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
-FE35          ; disallowed_STD3_mapped ; 0028          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS
-FE36          ; disallowed_STD3_mapped ; 0029          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
-FE37          ; disallowed_STD3_mapped ; 007B          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET
-FE38          ; disallowed_STD3_mapped ; 007D          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
-FE39          ; mapped                 ; 3014          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET
-FE3A          ; mapped                 ; 3015          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
-FE3B          ; mapped                 ; 3010          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET
-FE3C          ; mapped                 ; 3011          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET
-FE3D          ; mapped                 ; 300A          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET
-FE3E          ; mapped                 ; 300B          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET
-FE3F          ; mapped                 ; 3008          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET
-FE40          ; mapped                 ; 3009          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET
-FE41          ; mapped                 ; 300C          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET
-FE42          ; mapped                 ; 300D          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET
-FE43          ; mapped                 ; 300E          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET
-FE44          ; mapped                 ; 300F          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET
-FE45..FE46    ; valid                  ;      ; NV8    # 3.2  SESAME DOT..WHITE SESAME DOT
-FE47          ; disallowed_STD3_mapped ; 005B          # 4.0  PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET
-FE48          ; disallowed_STD3_mapped ; 005D          # 4.0  PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET
-FE49..FE4C    ; disallowed_STD3_mapped ; 0020 0305     # 1.1  DASHED OVERLINE..DOUBLE WAVY OVERLINE
-FE4D..FE4F    ; disallowed_STD3_mapped ; 005F          # 1.1  DASHED LOW LINE..WAVY LOW LINE
-FE50          ; disallowed_STD3_mapped ; 002C          # 1.1  SMALL COMMA
-FE51          ; mapped                 ; 3001          # 1.1  SMALL IDEOGRAPHIC COMMA
-FE52          ; disallowed                             # 1.1  SMALL FULL STOP
-FE53          ; disallowed                             # NA   <reserved-FE53>
-FE54          ; disallowed_STD3_mapped ; 003B          # 1.1  SMALL SEMICOLON
-FE55          ; disallowed_STD3_mapped ; 003A          # 1.1  SMALL COLON
-FE56          ; disallowed_STD3_mapped ; 003F          # 1.1  SMALL QUESTION MARK
-FE57          ; disallowed_STD3_mapped ; 0021          # 1.1  SMALL EXCLAMATION MARK
-FE58          ; mapped                 ; 2014          # 1.1  SMALL EM DASH
-FE59          ; disallowed_STD3_mapped ; 0028          # 1.1  SMALL LEFT PARENTHESIS
-FE5A          ; disallowed_STD3_mapped ; 0029          # 1.1  SMALL RIGHT PARENTHESIS
-FE5B          ; disallowed_STD3_mapped ; 007B          # 1.1  SMALL LEFT CURLY BRACKET
-FE5C          ; disallowed_STD3_mapped ; 007D          # 1.1  SMALL RIGHT CURLY BRACKET
-FE5D          ; mapped                 ; 3014          # 1.1  SMALL LEFT TORTOISE SHELL BRACKET
-FE5E          ; mapped                 ; 3015          # 1.1  SMALL RIGHT TORTOISE SHELL BRACKET
-FE5F          ; disallowed_STD3_mapped ; 0023          # 1.1  SMALL NUMBER SIGN
-FE60          ; disallowed_STD3_mapped ; 0026          # 1.1  SMALL AMPERSAND
-FE61          ; disallowed_STD3_mapped ; 002A          # 1.1  SMALL ASTERISK
-FE62          ; disallowed_STD3_mapped ; 002B          # 1.1  SMALL PLUS SIGN
-FE63          ; mapped                 ; 002D          # 1.1  SMALL HYPHEN-MINUS
-FE64          ; disallowed_STD3_mapped ; 003C          # 1.1  SMALL LESS-THAN SIGN
-FE65          ; disallowed_STD3_mapped ; 003E          # 1.1  SMALL GREATER-THAN SIGN
-FE66          ; disallowed_STD3_mapped ; 003D          # 1.1  SMALL EQUALS SIGN
-FE67          ; disallowed                             # NA   <reserved-FE67>
-FE68          ; disallowed_STD3_mapped ; 005C          # 1.1  SMALL REVERSE SOLIDUS
-FE69          ; disallowed_STD3_mapped ; 0024          # 1.1  SMALL DOLLAR SIGN
-FE6A          ; disallowed_STD3_mapped ; 0025          # 1.1  SMALL PERCENT SIGN
-FE6B          ; disallowed_STD3_mapped ; 0040          # 1.1  SMALL COMMERCIAL AT
-FE6C..FE6F    ; disallowed                             # NA   <reserved-FE6C>..<reserved-FE6F>
-FE70          ; disallowed_STD3_mapped ; 0020 064B     # 1.1  ARABIC FATHATAN ISOLATED FORM
-FE71          ; mapped                 ; 0640 064B     # 1.1  ARABIC TATWEEL WITH FATHATAN ABOVE
-FE72          ; disallowed_STD3_mapped ; 0020 064C     # 1.1  ARABIC DAMMATAN ISOLATED FORM
-FE73          ; valid                                  # 3.2  ARABIC TAIL FRAGMENT
-FE74          ; disallowed_STD3_mapped ; 0020 064D     # 1.1  ARABIC KASRATAN ISOLATED FORM
-FE75          ; disallowed                             # NA   <reserved-FE75>
-FE76          ; disallowed_STD3_mapped ; 0020 064E     # 1.1  ARABIC FATHA ISOLATED FORM
-FE77          ; mapped                 ; 0640 064E     # 1.1  ARABIC FATHA MEDIAL FORM
-FE78          ; disallowed_STD3_mapped ; 0020 064F     # 1.1  ARABIC DAMMA ISOLATED FORM
-FE79          ; mapped                 ; 0640 064F     # 1.1  ARABIC DAMMA MEDIAL FORM
-FE7A          ; disallowed_STD3_mapped ; 0020 0650     # 1.1  ARABIC KASRA ISOLATED FORM
-FE7B          ; mapped                 ; 0640 0650     # 1.1  ARABIC KASRA MEDIAL FORM
-FE7C          ; disallowed_STD3_mapped ; 0020 0651     # 1.1  ARABIC SHADDA ISOLATED FORM
-FE7D          ; mapped                 ; 0640 0651     # 1.1  ARABIC SHADDA MEDIAL FORM
-FE7E          ; disallowed_STD3_mapped ; 0020 0652     # 1.1  ARABIC SUKUN ISOLATED FORM
-FE7F          ; mapped                 ; 0640 0652     # 1.1  ARABIC SUKUN MEDIAL FORM
-FE80          ; mapped                 ; 0621          # 1.1  ARABIC LETTER HAMZA ISOLATED FORM
-FE81..FE82    ; mapped                 ; 0622          # 1.1  ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM..ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM
-FE83..FE84    ; mapped                 ; 0623          # 1.1  ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM..ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM
-FE85..FE86    ; mapped                 ; 0624          # 1.1  ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM..ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM
-FE87..FE88    ; mapped                 ; 0625          # 1.1  ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM..ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM
-FE89..FE8C    ; mapped                 ; 0626          # 1.1  ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM..ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM
-FE8D..FE8E    ; mapped                 ; 0627          # 1.1  ARABIC LETTER ALEF ISOLATED FORM..ARABIC LETTER ALEF FINAL FORM
-FE8F..FE92    ; mapped                 ; 0628          # 1.1  ARABIC LETTER BEH ISOLATED FORM..ARABIC LETTER BEH MEDIAL FORM
-FE93..FE94    ; mapped                 ; 0629          # 1.1  ARABIC LETTER TEH MARBUTA ISOLATED FORM..ARABIC LETTER TEH MARBUTA FINAL FORM
-FE95..FE98    ; mapped                 ; 062A          # 1.1  ARABIC LETTER TEH ISOLATED FORM..ARABIC LETTER TEH MEDIAL FORM
-FE99..FE9C    ; mapped                 ; 062B          # 1.1  ARABIC LETTER THEH ISOLATED FORM..ARABIC LETTER THEH MEDIAL FORM
-FE9D..FEA0    ; mapped                 ; 062C          # 1.1  ARABIC LETTER JEEM ISOLATED FORM..ARABIC LETTER JEEM MEDIAL FORM
-FEA1..FEA4    ; mapped                 ; 062D          # 1.1  ARABIC LETTER HAH ISOLATED FORM..ARABIC LETTER HAH MEDIAL FORM
-FEA5..FEA8    ; mapped                 ; 062E          # 1.1  ARABIC LETTER KHAH ISOLATED FORM..ARABIC LETTER KHAH MEDIAL FORM
-FEA9..FEAA    ; mapped                 ; 062F          # 1.1  ARABIC LETTER DAL ISOLATED FORM..ARABIC LETTER DAL FINAL FORM
-FEAB..FEAC    ; mapped                 ; 0630          # 1.1  ARABIC LETTER THAL ISOLATED FORM..ARABIC LETTER THAL FINAL FORM
-FEAD..FEAE    ; mapped                 ; 0631          # 1.1  ARABIC LETTER REH ISOLATED FORM..ARABIC LETTER REH FINAL FORM
-FEAF..FEB0    ; mapped                 ; 0632          # 1.1  ARABIC LETTER ZAIN ISOLATED FORM..ARABIC LETTER ZAIN FINAL FORM
-FEB1..FEB4    ; mapped                 ; 0633          # 1.1  ARABIC LETTER SEEN ISOLATED FORM..ARABIC LETTER SEEN MEDIAL FORM
-FEB5..FEB8    ; mapped                 ; 0634          # 1.1  ARABIC LETTER SHEEN ISOLATED FORM..ARABIC LETTER SHEEN MEDIAL FORM
-FEB9..FEBC    ; mapped                 ; 0635          # 1.1  ARABIC LETTER SAD ISOLATED FORM..ARABIC LETTER SAD MEDIAL FORM
-FEBD..FEC0    ; mapped                 ; 0636          # 1.1  ARABIC LETTER DAD ISOLATED FORM..ARABIC LETTER DAD MEDIAL FORM
-FEC1..FEC4    ; mapped                 ; 0637          # 1.1  ARABIC LETTER TAH ISOLATED FORM..ARABIC LETTER TAH MEDIAL FORM
-FEC5..FEC8    ; mapped                 ; 0638          # 1.1  ARABIC LETTER ZAH ISOLATED FORM..ARABIC LETTER ZAH MEDIAL FORM
-FEC9..FECC    ; mapped                 ; 0639          # 1.1  ARABIC LETTER AIN ISOLATED FORM..ARABIC LETTER AIN MEDIAL FORM
-FECD..FED0    ; mapped                 ; 063A          # 1.1  ARABIC LETTER GHAIN ISOLATED FORM..ARABIC LETTER GHAIN MEDIAL FORM
-FED1..FED4    ; mapped                 ; 0641          # 1.1  ARABIC LETTER FEH ISOLATED FORM..ARABIC LETTER FEH MEDIAL FORM
-FED5..FED8    ; mapped                 ; 0642          # 1.1  ARABIC LETTER QAF ISOLATED FORM..ARABIC LETTER QAF MEDIAL FORM
-FED9..FEDC    ; mapped                 ; 0643          # 1.1  ARABIC LETTER KAF ISOLATED FORM..ARABIC LETTER KAF MEDIAL FORM
-FEDD..FEE0    ; mapped                 ; 0644          # 1.1  ARABIC LETTER LAM ISOLATED FORM..ARABIC LETTER LAM MEDIAL FORM
-FEE1..FEE4    ; mapped                 ; 0645          # 1.1  ARABIC LETTER MEEM ISOLATED FORM..ARABIC LETTER MEEM MEDIAL FORM
-FEE5..FEE8    ; mapped                 ; 0646          # 1.1  ARABIC LETTER NOON ISOLATED FORM..ARABIC LETTER NOON MEDIAL FORM
-FEE9..FEEC    ; mapped                 ; 0647          # 1.1  ARABIC LETTER HEH ISOLATED FORM..ARABIC LETTER HEH MEDIAL FORM
-FEED..FEEE    ; mapped                 ; 0648          # 1.1  ARABIC LETTER WAW ISOLATED FORM..ARABIC LETTER WAW FINAL FORM
-FEEF..FEF0    ; mapped                 ; 0649          # 1.1  ARABIC LETTER ALEF MAKSURA ISOLATED FORM..ARABIC LETTER ALEF MAKSURA FINAL FORM
-FEF1..FEF4    ; mapped                 ; 064A          # 1.1  ARABIC LETTER YEH ISOLATED FORM..ARABIC LETTER YEH MEDIAL FORM
-FEF5..FEF6    ; mapped                 ; 0644 0622     # 1.1  ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM
-FEF7..FEF8    ; mapped                 ; 0644 0623     # 1.1  ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM
-FEF9..FEFA    ; mapped                 ; 0644 0625     # 1.1  ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM
-FEFB..FEFC    ; mapped                 ; 0644 0627     # 1.1  ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM
-FEFD..FEFE    ; disallowed                             # NA   <reserved-FEFD>..<reserved-FEFE>
-FEFF          ; ignored                                # 1.1  ZERO WIDTH NO-BREAK SPACE
-FF00          ; disallowed                             # NA   <reserved-FF00>
-FF01          ; disallowed_STD3_mapped ; 0021          # 1.1  FULLWIDTH EXCLAMATION MARK
-FF02          ; disallowed_STD3_mapped ; 0022          # 1.1  FULLWIDTH QUOTATION MARK
-FF03          ; disallowed_STD3_mapped ; 0023          # 1.1  FULLWIDTH NUMBER SIGN
-FF04          ; disallowed_STD3_mapped ; 0024          # 1.1  FULLWIDTH DOLLAR SIGN
-FF05          ; disallowed_STD3_mapped ; 0025          # 1.1  FULLWIDTH PERCENT SIGN
-FF06          ; disallowed_STD3_mapped ; 0026          # 1.1  FULLWIDTH AMPERSAND
-FF07          ; disallowed_STD3_mapped ; 0027          # 1.1  FULLWIDTH APOSTROPHE
-FF08          ; disallowed_STD3_mapped ; 0028          # 1.1  FULLWIDTH LEFT PARENTHESIS
-FF09          ; disallowed_STD3_mapped ; 0029          # 1.1  FULLWIDTH RIGHT PARENTHESIS
-FF0A          ; disallowed_STD3_mapped ; 002A          # 1.1  FULLWIDTH ASTERISK
-FF0B          ; disallowed_STD3_mapped ; 002B          # 1.1  FULLWIDTH PLUS SIGN
-FF0C          ; disallowed_STD3_mapped ; 002C          # 1.1  FULLWIDTH COMMA
-FF0D          ; mapped                 ; 002D          # 1.1  FULLWIDTH HYPHEN-MINUS
-FF0E          ; mapped                 ; 002E          # 1.1  FULLWIDTH FULL STOP
-FF0F          ; disallowed_STD3_mapped ; 002F          # 1.1  FULLWIDTH SOLIDUS
-FF10          ; mapped                 ; 0030          # 1.1  FULLWIDTH DIGIT ZERO
-FF11          ; mapped                 ; 0031          # 1.1  FULLWIDTH DIGIT ONE
-FF12          ; mapped                 ; 0032          # 1.1  FULLWIDTH DIGIT TWO
-FF13          ; mapped                 ; 0033          # 1.1  FULLWIDTH DIGIT THREE
-FF14          ; mapped                 ; 0034          # 1.1  FULLWIDTH DIGIT FOUR
-FF15          ; mapped                 ; 0035          # 1.1  FULLWIDTH DIGIT FIVE
-FF16          ; mapped                 ; 0036          # 1.1  FULLWIDTH DIGIT SIX
-FF17          ; mapped                 ; 0037          # 1.1  FULLWIDTH DIGIT SEVEN
-FF18          ; mapped                 ; 0038          # 1.1  FULLWIDTH DIGIT EIGHT
-FF19          ; mapped                 ; 0039          # 1.1  FULLWIDTH DIGIT NINE
-FF1A          ; disallowed_STD3_mapped ; 003A          # 1.1  FULLWIDTH COLON
-FF1B          ; disallowed_STD3_mapped ; 003B          # 1.1  FULLWIDTH SEMICOLON
-FF1C          ; disallowed_STD3_mapped ; 003C          # 1.1  FULLWIDTH LESS-THAN SIGN
-FF1D          ; disallowed_STD3_mapped ; 003D          # 1.1  FULLWIDTH EQUALS SIGN
-FF1E          ; disallowed_STD3_mapped ; 003E          # 1.1  FULLWIDTH GREATER-THAN SIGN
-FF1F          ; disallowed_STD3_mapped ; 003F          # 1.1  FULLWIDTH QUESTION MARK
-FF20          ; disallowed_STD3_mapped ; 0040          # 1.1  FULLWIDTH COMMERCIAL AT
-FF21          ; mapped                 ; 0061          # 1.1  FULLWIDTH LATIN CAPITAL LETTER A
-FF22          ; mapped                 ; 0062          # 1.1  FULLWIDTH LATIN CAPITAL LETTER B
-FF23          ; mapped                 ; 0063          # 1.1  FULLWIDTH LATIN CAPITAL LETTER C
-FF24          ; mapped                 ; 0064          # 1.1  FULLWIDTH LATIN CAPITAL LETTER D
-FF25          ; mapped                 ; 0065          # 1.1  FULLWIDTH LATIN CAPITAL LETTER E
-FF26          ; mapped                 ; 0066          # 1.1  FULLWIDTH LATIN CAPITAL LETTER F
-FF27          ; mapped                 ; 0067          # 1.1  FULLWIDTH LATIN CAPITAL LETTER G
-FF28          ; mapped                 ; 0068          # 1.1  FULLWIDTH LATIN CAPITAL LETTER H
-FF29          ; mapped                 ; 0069          # 1.1  FULLWIDTH LATIN CAPITAL LETTER I
-FF2A          ; mapped                 ; 006A          # 1.1  FULLWIDTH LATIN CAPITAL LETTER J
-FF2B          ; mapped                 ; 006B          # 1.1  FULLWIDTH LATIN CAPITAL LETTER K
-FF2C          ; mapped                 ; 006C          # 1.1  FULLWIDTH LATIN CAPITAL LETTER L
-FF2D          ; mapped                 ; 006D          # 1.1  FULLWIDTH LATIN CAPITAL LETTER M
-FF2E          ; mapped                 ; 006E          # 1.1  FULLWIDTH LATIN CAPITAL LETTER N
-FF2F          ; mapped                 ; 006F          # 1.1  FULLWIDTH LATIN CAPITAL LETTER O
-FF30          ; mapped                 ; 0070          # 1.1  FULLWIDTH LATIN CAPITAL LETTER P
-FF31          ; mapped                 ; 0071          # 1.1  FULLWIDTH LATIN CAPITAL LETTER Q
-FF32          ; mapped                 ; 0072          # 1.1  FULLWIDTH LATIN CAPITAL LETTER R
-FF33          ; mapped                 ; 0073          # 1.1  FULLWIDTH LATIN CAPITAL LETTER S
-FF34          ; mapped                 ; 0074          # 1.1  FULLWIDTH LATIN CAPITAL LETTER T
-FF35          ; mapped                 ; 0075          # 1.1  FULLWIDTH LATIN CAPITAL LETTER U
-FF36          ; mapped                 ; 0076          # 1.1  FULLWIDTH LATIN CAPITAL LETTER V
-FF37          ; mapped                 ; 0077          # 1.1  FULLWIDTH LATIN CAPITAL LETTER W
-FF38          ; mapped                 ; 0078          # 1.1  FULLWIDTH LATIN CAPITAL LETTER X
-FF39          ; mapped                 ; 0079          # 1.1  FULLWIDTH LATIN CAPITAL LETTER Y
-FF3A          ; mapped                 ; 007A          # 1.1  FULLWIDTH LATIN CAPITAL LETTER Z
-FF3B          ; disallowed_STD3_mapped ; 005B          # 1.1  FULLWIDTH LEFT SQUARE BRACKET
-FF3C          ; disallowed_STD3_mapped ; 005C          # 1.1  FULLWIDTH REVERSE SOLIDUS
-FF3D          ; disallowed_STD3_mapped ; 005D          # 1.1  FULLWIDTH RIGHT SQUARE BRACKET
-FF3E          ; disallowed_STD3_mapped ; 005E          # 1.1  FULLWIDTH CIRCUMFLEX ACCENT
-FF3F          ; disallowed_STD3_mapped ; 005F          # 1.1  FULLWIDTH LOW LINE
-FF40          ; disallowed_STD3_mapped ; 0060          # 1.1  FULLWIDTH GRAVE ACCENT
-FF41          ; mapped                 ; 0061          # 1.1  FULLWIDTH LATIN SMALL LETTER A
-FF42          ; mapped                 ; 0062          # 1.1  FULLWIDTH LATIN SMALL LETTER B
-FF43          ; mapped                 ; 0063          # 1.1  FULLWIDTH LATIN SMALL LETTER C
-FF44          ; mapped                 ; 0064          # 1.1  FULLWIDTH LATIN SMALL LETTER D
-FF45          ; mapped                 ; 0065          # 1.1  FULLWIDTH LATIN SMALL LETTER E
-FF46          ; mapped                 ; 0066          # 1.1  FULLWIDTH LATIN SMALL LETTER F
-FF47          ; mapped                 ; 0067          # 1.1  FULLWIDTH LATIN SMALL LETTER G
-FF48          ; mapped                 ; 0068          # 1.1  FULLWIDTH LATIN SMALL LETTER H
-FF49          ; mapped                 ; 0069          # 1.1  FULLWIDTH LATIN SMALL LETTER I
-FF4A          ; mapped                 ; 006A          # 1.1  FULLWIDTH LATIN SMALL LETTER J
-FF4B          ; mapped                 ; 006B          # 1.1  FULLWIDTH LATIN SMALL LETTER K
-FF4C          ; mapped                 ; 006C          # 1.1  FULLWIDTH LATIN SMALL LETTER L
-FF4D          ; mapped                 ; 006D          # 1.1  FULLWIDTH LATIN SMALL LETTER M
-FF4E          ; mapped                 ; 006E          # 1.1  FULLWIDTH LATIN SMALL LETTER N
-FF4F          ; mapped                 ; 006F          # 1.1  FULLWIDTH LATIN SMALL LETTER O
-FF50          ; mapped                 ; 0070          # 1.1  FULLWIDTH LATIN SMALL LETTER P
-FF51          ; mapped                 ; 0071          # 1.1  FULLWIDTH LATIN SMALL LETTER Q
-FF52          ; mapped                 ; 0072          # 1.1  FULLWIDTH LATIN SMALL LETTER R
-FF53          ; mapped                 ; 0073          # 1.1  FULLWIDTH LATIN SMALL LETTER S
-FF54          ; mapped                 ; 0074          # 1.1  FULLWIDTH LATIN SMALL LETTER T
-FF55          ; mapped                 ; 0075          # 1.1  FULLWIDTH LATIN SMALL LETTER U
-FF56          ; mapped                 ; 0076          # 1.1  FULLWIDTH LATIN SMALL LETTER V
-FF57          ; mapped                 ; 0077          # 1.1  FULLWIDTH LATIN SMALL LETTER W
-FF58          ; mapped                 ; 0078          # 1.1  FULLWIDTH LATIN SMALL LETTER X
-FF59          ; mapped                 ; 0079          # 1.1  FULLWIDTH LATIN SMALL LETTER Y
-FF5A          ; mapped                 ; 007A          # 1.1  FULLWIDTH LATIN SMALL LETTER Z
-FF5B          ; disallowed_STD3_mapped ; 007B          # 1.1  FULLWIDTH LEFT CURLY BRACKET
-FF5C          ; disallowed_STD3_mapped ; 007C          # 1.1  FULLWIDTH VERTICAL LINE
-FF5D          ; disallowed_STD3_mapped ; 007D          # 1.1  FULLWIDTH RIGHT CURLY BRACKET
-FF5E          ; disallowed_STD3_mapped ; 007E          # 1.1  FULLWIDTH TILDE
-FF5F          ; mapped                 ; 2985          # 3.2  FULLWIDTH LEFT WHITE PARENTHESIS
-FF60          ; mapped                 ; 2986          # 3.2  FULLWIDTH RIGHT WHITE PARENTHESIS
-FF61          ; mapped                 ; 002E          # 1.1  HALFWIDTH IDEOGRAPHIC FULL STOP
-FF62          ; mapped                 ; 300C          # 1.1  HALFWIDTH LEFT CORNER BRACKET
-FF63          ; mapped                 ; 300D          # 1.1  HALFWIDTH RIGHT CORNER BRACKET
-FF64          ; mapped                 ; 3001          # 1.1  HALFWIDTH IDEOGRAPHIC COMMA
-FF65          ; mapped                 ; 30FB          # 1.1  HALFWIDTH KATAKANA MIDDLE DOT
-FF66          ; mapped                 ; 30F2          # 1.1  HALFWIDTH KATAKANA LETTER WO
-FF67          ; mapped                 ; 30A1          # 1.1  HALFWIDTH KATAKANA LETTER SMALL A
-FF68          ; mapped                 ; 30A3          # 1.1  HALFWIDTH KATAKANA LETTER SMALL I
-FF69          ; mapped                 ; 30A5          # 1.1  HALFWIDTH KATAKANA LETTER SMALL U
-FF6A          ; mapped                 ; 30A7          # 1.1  HALFWIDTH KATAKANA LETTER SMALL E
-FF6B          ; mapped                 ; 30A9          # 1.1  HALFWIDTH KATAKANA LETTER SMALL O
-FF6C          ; mapped                 ; 30E3          # 1.1  HALFWIDTH KATAKANA LETTER SMALL YA
-FF6D          ; mapped                 ; 30E5          # 1.1  HALFWIDTH KATAKANA LETTER SMALL YU
-FF6E          ; mapped                 ; 30E7          # 1.1  HALFWIDTH KATAKANA LETTER SMALL YO
-FF6F          ; mapped                 ; 30C3          # 1.1  HALFWIDTH KATAKANA LETTER SMALL TU
-FF70          ; mapped                 ; 30FC          # 1.1  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
-FF71          ; mapped                 ; 30A2          # 1.1  HALFWIDTH KATAKANA LETTER A
-FF72          ; mapped                 ; 30A4          # 1.1  HALFWIDTH KATAKANA LETTER I
-FF73          ; mapped                 ; 30A6          # 1.1  HALFWIDTH KATAKANA LETTER U
-FF74          ; mapped                 ; 30A8          # 1.1  HALFWIDTH KATAKANA LETTER E
-FF75          ; mapped                 ; 30AA          # 1.1  HALFWIDTH KATAKANA LETTER O
-FF76          ; mapped                 ; 30AB          # 1.1  HALFWIDTH KATAKANA LETTER KA
-FF77          ; mapped                 ; 30AD          # 1.1  HALFWIDTH KATAKANA LETTER KI
-FF78          ; mapped                 ; 30AF          # 1.1  HALFWIDTH KATAKANA LETTER KU
-FF79          ; mapped                 ; 30B1          # 1.1  HALFWIDTH KATAKANA LETTER KE
-FF7A          ; mapped                 ; 30B3          # 1.1  HALFWIDTH KATAKANA LETTER KO
-FF7B          ; mapped                 ; 30B5          # 1.1  HALFWIDTH KATAKANA LETTER SA
-FF7C          ; mapped                 ; 30B7          # 1.1  HALFWIDTH KATAKANA LETTER SI
-FF7D          ; mapped                 ; 30B9          # 1.1  HALFWIDTH KATAKANA LETTER SU
-FF7E          ; mapped                 ; 30BB          # 1.1  HALFWIDTH KATAKANA LETTER SE
-FF7F          ; mapped                 ; 30BD          # 1.1  HALFWIDTH KATAKANA LETTER SO
-FF80          ; mapped                 ; 30BF          # 1.1  HALFWIDTH KATAKANA LETTER TA
-FF81          ; mapped                 ; 30C1          # 1.1  HALFWIDTH KATAKANA LETTER TI
-FF82          ; mapped                 ; 30C4          # 1.1  HALFWIDTH KATAKANA LETTER TU
-FF83          ; mapped                 ; 30C6          # 1.1  HALFWIDTH KATAKANA LETTER TE
-FF84          ; mapped                 ; 30C8          # 1.1  HALFWIDTH KATAKANA LETTER TO
-FF85          ; mapped                 ; 30CA          # 1.1  HALFWIDTH KATAKANA LETTER NA
-FF86          ; mapped                 ; 30CB          # 1.1  HALFWIDTH KATAKANA LETTER NI
-FF87          ; mapped                 ; 30CC          # 1.1  HALFWIDTH KATAKANA LETTER NU
-FF88          ; mapped                 ; 30CD          # 1.1  HALFWIDTH KATAKANA LETTER NE
-FF89          ; mapped                 ; 30CE          # 1.1  HALFWIDTH KATAKANA LETTER NO
-FF8A          ; mapped                 ; 30CF          # 1.1  HALFWIDTH KATAKANA LETTER HA
-FF8B          ; mapped                 ; 30D2          # 1.1  HALFWIDTH KATAKANA LETTER HI
-FF8C          ; mapped                 ; 30D5          # 1.1  HALFWIDTH KATAKANA LETTER HU
-FF8D          ; mapped                 ; 30D8          # 1.1  HALFWIDTH KATAKANA LETTER HE
-FF8E          ; mapped                 ; 30DB          # 1.1  HALFWIDTH KATAKANA LETTER HO
-FF8F          ; mapped                 ; 30DE          # 1.1  HALFWIDTH KATAKANA LETTER MA
-FF90          ; mapped                 ; 30DF          # 1.1  HALFWIDTH KATAKANA LETTER MI
-FF91          ; mapped                 ; 30E0          # 1.1  HALFWIDTH KATAKANA LETTER MU
-FF92          ; mapped                 ; 30E1          # 1.1  HALFWIDTH KATAKANA LETTER ME
-FF93          ; mapped                 ; 30E2          # 1.1  HALFWIDTH KATAKANA LETTER MO
-FF94          ; mapped                 ; 30E4          # 1.1  HALFWIDTH KATAKANA LETTER YA
-FF95          ; mapped                 ; 30E6          # 1.1  HALFWIDTH KATAKANA LETTER YU
-FF96          ; mapped                 ; 30E8          # 1.1  HALFWIDTH KATAKANA LETTER YO
-FF97          ; mapped                 ; 30E9          # 1.1  HALFWIDTH KATAKANA LETTER RA
-FF98          ; mapped                 ; 30EA          # 1.1  HALFWIDTH KATAKANA LETTER RI
-FF99          ; mapped                 ; 30EB          # 1.1  HALFWIDTH KATAKANA LETTER RU
-FF9A          ; mapped                 ; 30EC          # 1.1  HALFWIDTH KATAKANA LETTER RE
-FF9B          ; mapped                 ; 30ED          # 1.1  HALFWIDTH KATAKANA LETTER RO
-FF9C          ; mapped                 ; 30EF          # 1.1  HALFWIDTH KATAKANA LETTER WA
-FF9D          ; mapped                 ; 30F3          # 1.1  HALFWIDTH KATAKANA LETTER N
-FF9E          ; mapped                 ; 3099          # 1.1  HALFWIDTH KATAKANA VOICED SOUND MARK
-FF9F          ; mapped                 ; 309A          # 1.1  HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
-FFA0          ; disallowed                             # 1.1  HALFWIDTH HANGUL FILLER
-FFA1          ; mapped                 ; 1100          # 1.1  HALFWIDTH HANGUL LETTER KIYEOK
-FFA2          ; mapped                 ; 1101          # 1.1  HALFWIDTH HANGUL LETTER SSANGKIYEOK
-FFA3          ; mapped                 ; 11AA          # 1.1  HALFWIDTH HANGUL LETTER KIYEOK-SIOS
-FFA4          ; mapped                 ; 1102          # 1.1  HALFWIDTH HANGUL LETTER NIEUN
-FFA5          ; mapped                 ; 11AC          # 1.1  HALFWIDTH HANGUL LETTER NIEUN-CIEUC
-FFA6          ; mapped                 ; 11AD          # 1.1  HALFWIDTH HANGUL LETTER NIEUN-HIEUH
-FFA7          ; mapped                 ; 1103          # 1.1  HALFWIDTH HANGUL LETTER TIKEUT
-FFA8          ; mapped                 ; 1104          # 1.1  HALFWIDTH HANGUL LETTER SSANGTIKEUT
-FFA9          ; mapped                 ; 1105          # 1.1  HALFWIDTH HANGUL LETTER RIEUL
-FFAA          ; mapped                 ; 11B0          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-KIYEOK
-FFAB          ; mapped                 ; 11B1          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-MIEUM
-FFAC          ; mapped                 ; 11B2          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-PIEUP
-FFAD          ; mapped                 ; 11B3          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-SIOS
-FFAE          ; mapped                 ; 11B4          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-THIEUTH
-FFAF          ; mapped                 ; 11B5          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH
-FFB0          ; mapped                 ; 111A          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-HIEUH
-FFB1          ; mapped                 ; 1106          # 1.1  HALFWIDTH HANGUL LETTER MIEUM
-FFB2          ; mapped                 ; 1107          # 1.1  HALFWIDTH HANGUL LETTER PIEUP
-FFB3          ; mapped                 ; 1108          # 1.1  HALFWIDTH HANGUL LETTER SSANGPIEUP
-FFB4          ; mapped                 ; 1121          # 1.1  HALFWIDTH HANGUL LETTER PIEUP-SIOS
-FFB5          ; mapped                 ; 1109          # 1.1  HALFWIDTH HANGUL LETTER SIOS
-FFB6          ; mapped                 ; 110A          # 1.1  HALFWIDTH HANGUL LETTER SSANGSIOS
-FFB7          ; mapped                 ; 110B          # 1.1  HALFWIDTH HANGUL LETTER IEUNG
-FFB8          ; mapped                 ; 110C          # 1.1  HALFWIDTH HANGUL LETTER CIEUC
-FFB9          ; mapped                 ; 110D          # 1.1  HALFWIDTH HANGUL LETTER SSANGCIEUC
-FFBA          ; mapped                 ; 110E          # 1.1  HALFWIDTH HANGUL LETTER CHIEUCH
-FFBB          ; mapped                 ; 110F          # 1.1  HALFWIDTH HANGUL LETTER KHIEUKH
-FFBC          ; mapped                 ; 1110          # 1.1  HALFWIDTH HANGUL LETTER THIEUTH
-FFBD          ; mapped                 ; 1111          # 1.1  HALFWIDTH HANGUL LETTER PHIEUPH
-FFBE          ; mapped                 ; 1112          # 1.1  HALFWIDTH HANGUL LETTER HIEUH
-FFBF..FFC1    ; disallowed                             # NA   <reserved-FFBF>..<reserved-FFC1>
-FFC2          ; mapped                 ; 1161          # 1.1  HALFWIDTH HANGUL LETTER A
-FFC3          ; mapped                 ; 1162          # 1.1  HALFWIDTH HANGUL LETTER AE
-FFC4          ; mapped                 ; 1163          # 1.1  HALFWIDTH HANGUL LETTER YA
-FFC5          ; mapped                 ; 1164          # 1.1  HALFWIDTH HANGUL LETTER YAE
-FFC6          ; mapped                 ; 1165          # 1.1  HALFWIDTH HANGUL LETTER EO
-FFC7          ; mapped                 ; 1166          # 1.1  HALFWIDTH HANGUL LETTER E
-FFC8..FFC9    ; disallowed                             # NA   <reserved-FFC8>..<reserved-FFC9>
-FFCA          ; mapped                 ; 1167          # 1.1  HALFWIDTH HANGUL LETTER YEO
-FFCB          ; mapped                 ; 1168          # 1.1  HALFWIDTH HANGUL LETTER YE
-FFCC          ; mapped                 ; 1169          # 1.1  HALFWIDTH HANGUL LETTER O
-FFCD          ; mapped                 ; 116A          # 1.1  HALFWIDTH HANGUL LETTER WA
-FFCE          ; mapped                 ; 116B          # 1.1  HALFWIDTH HANGUL LETTER WAE
-FFCF          ; mapped                 ; 116C          # 1.1  HALFWIDTH HANGUL LETTER OE
-FFD0..FFD1    ; disallowed                             # NA   <reserved-FFD0>..<reserved-FFD1>
-FFD2          ; mapped                 ; 116D          # 1.1  HALFWIDTH HANGUL LETTER YO
-FFD3          ; mapped                 ; 116E          # 1.1  HALFWIDTH HANGUL LETTER U
-FFD4          ; mapped                 ; 116F          # 1.1  HALFWIDTH HANGUL LETTER WEO
-FFD5          ; mapped                 ; 1170          # 1.1  HALFWIDTH HANGUL LETTER WE
-FFD6          ; mapped                 ; 1171          # 1.1  HALFWIDTH HANGUL LETTER WI
-FFD7          ; mapped                 ; 1172          # 1.1  HALFWIDTH HANGUL LETTER YU
-FFD8..FFD9    ; disallowed                             # NA   <reserved-FFD8>..<reserved-FFD9>
-FFDA          ; mapped                 ; 1173          # 1.1  HALFWIDTH HANGUL LETTER EU
-FFDB          ; mapped                 ; 1174          # 1.1  HALFWIDTH HANGUL LETTER YI
-FFDC          ; mapped                 ; 1175          # 1.1  HALFWIDTH HANGUL LETTER I
-FFDD..FFDF    ; disallowed                             # NA   <reserved-FFDD>..<reserved-FFDF>
-FFE0          ; mapped                 ; 00A2          # 1.1  FULLWIDTH CENT SIGN
-FFE1          ; mapped                 ; 00A3          # 1.1  FULLWIDTH POUND SIGN
-FFE2          ; mapped                 ; 00AC          # 1.1  FULLWIDTH NOT SIGN
-FFE3          ; disallowed_STD3_mapped ; 0020 0304     # 1.1  FULLWIDTH MACRON
-FFE4          ; mapped                 ; 00A6          # 1.1  FULLWIDTH BROKEN BAR
-FFE5          ; mapped                 ; 00A5          # 1.1  FULLWIDTH YEN SIGN
-FFE6          ; mapped                 ; 20A9          # 1.1  FULLWIDTH WON SIGN
-FFE7          ; disallowed                             # NA   <reserved-FFE7>
-FFE8          ; mapped                 ; 2502          # 1.1  HALFWIDTH FORMS LIGHT VERTICAL
-FFE9          ; mapped                 ; 2190          # 1.1  HALFWIDTH LEFTWARDS ARROW
-FFEA          ; mapped                 ; 2191          # 1.1  HALFWIDTH UPWARDS ARROW
-FFEB          ; mapped                 ; 2192          # 1.1  HALFWIDTH RIGHTWARDS ARROW
-FFEC          ; mapped                 ; 2193          # 1.1  HALFWIDTH DOWNWARDS ARROW
-FFED          ; mapped                 ; 25A0          # 1.1  HALFWIDTH BLACK SQUARE
-FFEE          ; mapped                 ; 25CB          # 1.1  HALFWIDTH WHITE CIRCLE
-FFEF..FFF8    ; disallowed                             # NA   <reserved-FFEF>..<reserved-FFF8>
-FFF9..FFFB    ; disallowed                             # 3.0  INTERLINEAR ANNOTATION ANCHOR..INTERLINEAR ANNOTATION TERMINATOR
-FFFC          ; disallowed                             # 2.1  OBJECT REPLACEMENT CHARACTER
-FFFD          ; disallowed                             # 1.1  REPLACEMENT CHARACTER
-FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE>..<noncharacter-FFFF>
-10000..1000B  ; valid                                  # 4.0  LINEAR B SYLLABLE B008 A..LINEAR B SYLLABLE B046 JE
-1000C         ; disallowed                             # NA   <reserved-1000C>
-1000D..10026  ; valid                                  # 4.0  LINEAR B SYLLABLE B036 JO..LINEAR B SYLLABLE B032 QO
-10027         ; disallowed                             # NA   <reserved-10027>
-10028..1003A  ; valid                                  # 4.0  LINEAR B SYLLABLE B060 RA..LINEAR B SYLLABLE B042 WO
-1003B         ; disallowed                             # NA   <reserved-1003B>
-1003C..1003D  ; valid                                  # 4.0  LINEAR B SYLLABLE B017 ZA..LINEAR B SYLLABLE B074 ZE
-1003E         ; disallowed                             # NA   <reserved-1003E>
-1003F..1004D  ; valid                                  # 4.0  LINEAR B SYLLABLE B020 ZO..LINEAR B SYLLABLE B091 TWO
-1004E..1004F  ; disallowed                             # NA   <reserved-1004E>..<reserved-1004F>
-10050..1005D  ; valid                                  # 4.0  LINEAR B SYMBOL B018..LINEAR B SYMBOL B089
-1005E..1007F  ; disallowed                             # NA   <reserved-1005E>..<reserved-1007F>
-10080..100FA  ; valid                                  # 4.0  LINEAR B IDEOGRAM B100 MAN..LINEAR B IDEOGRAM VESSEL B305
-100FB..100FF  ; disallowed                             # NA   <reserved-100FB>..<reserved-100FF>
-10100..10102  ; valid                  ;      ; NV8    # 4.0  AEGEAN WORD SEPARATOR LINE..AEGEAN CHECK MARK
-10103..10106  ; disallowed                             # NA   <reserved-10103>..<reserved-10106>
-10107..10133  ; valid                  ;      ; NV8    # 4.0  AEGEAN NUMBER ONE..AEGEAN NUMBER NINETY THOUSAND
-10134..10136  ; disallowed                             # NA   <reserved-10134>..<reserved-10136>
-10137..1013F  ; valid                  ;      ; NV8    # 4.0  AEGEAN WEIGHT BASE UNIT..AEGEAN MEASURE THIRD SUBUNIT
-10140..1018A  ; valid                  ;      ; NV8    # 4.1  GREEK ACROPHONIC ATTIC ONE QUARTER..GREEK ZERO SIGN
-1018B..1018C  ; valid                  ;      ; NV8    # 7.0  GREEK ONE QUARTER SIGN..GREEK SINUSOID SIGN
-1018D..1018E  ; valid                  ;      ; NV8    # 9.0  GREEK INDICTION SIGN..NOMISMA SIGN
-1018F         ; disallowed                             # NA   <reserved-1018F>
-10190..1019B  ; valid                  ;      ; NV8    # 5.1  ROMAN SEXTANS SIGN..ROMAN CENTURIAL SIGN
-1019C..1019F  ; disallowed                             # NA   <reserved-1019C>..<reserved-1019F>
-101A0         ; valid                  ;      ; NV8    # 7.0  GREEK SYMBOL TAU RHO
-101A1..101CF  ; disallowed                             # NA   <reserved-101A1>..<reserved-101CF>
-101D0..101FC  ; valid                  ;      ; NV8    # 5.1  PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND
-101FD         ; valid                                  # 5.1  PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE
-101FE..1027F  ; disallowed                             # NA   <reserved-101FE>..<reserved-1027F>
-10280..1029C  ; valid                                  # 5.1  LYCIAN LETTER A..LYCIAN LETTER X
-1029D..1029F  ; disallowed                             # NA   <reserved-1029D>..<reserved-1029F>
-102A0..102D0  ; valid                                  # 5.1  CARIAN LETTER A..CARIAN LETTER UUU3
-102D1..102DF  ; disallowed                             # NA   <reserved-102D1>..<reserved-102DF>
-102E0         ; valid                                  # 7.0  COPTIC EPACT THOUSANDS MARK
-102E1..102FB  ; valid                  ;      ; NV8    # 7.0  COPTIC EPACT DIGIT ONE..COPTIC EPACT NUMBER NINE HUNDRED
-102FC..102FF  ; disallowed                             # NA   <reserved-102FC>..<reserved-102FF>
-10300..1031E  ; valid                                  # 3.1  OLD ITALIC LETTER A..OLD ITALIC LETTER UU
-1031F         ; valid                                  # 7.0  OLD ITALIC LETTER ESS
-10320..10323  ; valid                  ;      ; NV8    # 3.1  OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY
-10324..1032C  ; disallowed                             # NA   <reserved-10324>..<reserved-1032C>
-1032D..1032F  ; valid                                  # 10.0 OLD ITALIC LETTER YE..OLD ITALIC LETTER SOUTHERN TSE
-10330..10340  ; valid                                  # 3.1  GOTHIC LETTER AHSA..GOTHIC LETTER PAIRTHRA
-10341         ; valid                  ;      ; NV8    # 3.1  GOTHIC LETTER NINETY
-10342..10349  ; valid                                  # 3.1  GOTHIC LETTER RAIDA..GOTHIC LETTER OTHAL
-1034A         ; valid                  ;      ; NV8    # 3.1  GOTHIC LETTER NINE HUNDRED
-1034B..1034F  ; disallowed                             # NA   <reserved-1034B>..<reserved-1034F>
-10350..1037A  ; valid                                  # 7.0  OLD PERMIC LETTER AN..COMBINING OLD PERMIC LETTER SII
-1037B..1037F  ; disallowed                             # NA   <reserved-1037B>..<reserved-1037F>
-10380..1039D  ; valid                                  # 4.0  UGARITIC LETTER ALPA..UGARITIC LETTER SSU
-1039E         ; disallowed                             # NA   <reserved-1039E>
-1039F         ; valid                  ;      ; NV8    # 4.0  UGARITIC WORD DIVIDER
-103A0..103C3  ; valid                                  # 4.1  OLD PERSIAN SIGN A..OLD PERSIAN SIGN HA
-103C4..103C7  ; disallowed                             # NA   <reserved-103C4>..<reserved-103C7>
-103C8..103CF  ; valid                                  # 4.1  OLD PERSIAN SIGN AURAMAZDAA..OLD PERSIAN SIGN BUUMISH
-103D0..103D5  ; valid                  ;      ; NV8    # 4.1  OLD PERSIAN WORD DIVIDER..OLD PERSIAN NUMBER HUNDRED
-103D6..103FF  ; disallowed                             # NA   <reserved-103D6>..<reserved-103FF>
-10400         ; mapped                 ; 10428         # 3.1  DESERET CAPITAL LETTER LONG I
-10401         ; mapped                 ; 10429         # 3.1  DESERET CAPITAL LETTER LONG E
-10402         ; mapped                 ; 1042A         # 3.1  DESERET CAPITAL LETTER LONG A
-10403         ; mapped                 ; 1042B         # 3.1  DESERET CAPITAL LETTER LONG AH
-10404         ; mapped                 ; 1042C         # 3.1  DESERET CAPITAL LETTER LONG O
-10405         ; mapped                 ; 1042D         # 3.1  DESERET CAPITAL LETTER LONG OO
-10406         ; mapped                 ; 1042E         # 3.1  DESERET CAPITAL LETTER SHORT I
-10407         ; mapped                 ; 1042F         # 3.1  DESERET CAPITAL LETTER SHORT E
-10408         ; mapped                 ; 10430         # 3.1  DESERET CAPITAL LETTER SHORT A
-10409         ; mapped                 ; 10431         # 3.1  DESERET CAPITAL LETTER SHORT AH
-1040A         ; mapped                 ; 10432         # 3.1  DESERET CAPITAL LETTER SHORT O
-1040B         ; mapped                 ; 10433         # 3.1  DESERET CAPITAL LETTER SHORT OO
-1040C         ; mapped                 ; 10434         # 3.1  DESERET CAPITAL LETTER AY
-1040D         ; mapped                 ; 10435         # 3.1  DESERET CAPITAL LETTER OW
-1040E         ; mapped                 ; 10436         # 3.1  DESERET CAPITAL LETTER WU
-1040F         ; mapped                 ; 10437         # 3.1  DESERET CAPITAL LETTER YEE
-10410         ; mapped                 ; 10438         # 3.1  DESERET CAPITAL LETTER H
-10411         ; mapped                 ; 10439         # 3.1  DESERET CAPITAL LETTER PEE
-10412         ; mapped                 ; 1043A         # 3.1  DESERET CAPITAL LETTER BEE
-10413         ; mapped                 ; 1043B         # 3.1  DESERET CAPITAL LETTER TEE
-10414         ; mapped                 ; 1043C         # 3.1  DESERET CAPITAL LETTER DEE
-10415         ; mapped                 ; 1043D         # 3.1  DESERET CAPITAL LETTER CHEE
-10416         ; mapped                 ; 1043E         # 3.1  DESERET CAPITAL LETTER JEE
-10417         ; mapped                 ; 1043F         # 3.1  DESERET CAPITAL LETTER KAY
-10418         ; mapped                 ; 10440         # 3.1  DESERET CAPITAL LETTER GAY
-10419         ; mapped                 ; 10441         # 3.1  DESERET CAPITAL LETTER EF
-1041A         ; mapped                 ; 10442         # 3.1  DESERET CAPITAL LETTER VEE
-1041B         ; mapped                 ; 10443         # 3.1  DESERET CAPITAL LETTER ETH
-1041C         ; mapped                 ; 10444         # 3.1  DESERET CAPITAL LETTER THEE
-1041D         ; mapped                 ; 10445         # 3.1  DESERET CAPITAL LETTER ES
-1041E         ; mapped                 ; 10446         # 3.1  DESERET CAPITAL LETTER ZEE
-1041F         ; mapped                 ; 10447         # 3.1  DESERET CAPITAL LETTER ESH
-10420         ; mapped                 ; 10448         # 3.1  DESERET CAPITAL LETTER ZHEE
-10421         ; mapped                 ; 10449         # 3.1  DESERET CAPITAL LETTER ER
-10422         ; mapped                 ; 1044A         # 3.1  DESERET CAPITAL LETTER EL
-10423         ; mapped                 ; 1044B         # 3.1  DESERET CAPITAL LETTER EM
-10424         ; mapped                 ; 1044C         # 3.1  DESERET CAPITAL LETTER EN
-10425         ; mapped                 ; 1044D         # 3.1  DESERET CAPITAL LETTER ENG
-10426         ; mapped                 ; 1044E         # 4.0  DESERET CAPITAL LETTER OI
-10427         ; mapped                 ; 1044F         # 4.0  DESERET CAPITAL LETTER EW
-10428..1044D  ; valid                                  # 3.1  DESERET SMALL LETTER LONG I..DESERET SMALL LETTER ENG
-1044E..1049D  ; valid                                  # 4.0  DESERET SMALL LETTER OI..OSMANYA LETTER OO
-1049E..1049F  ; disallowed                             # NA   <reserved-1049E>..<reserved-1049F>
-104A0..104A9  ; valid                                  # 4.0  OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE
-104AA..104AF  ; disallowed                             # NA   <reserved-104AA>..<reserved-104AF>
-104B0         ; mapped                 ; 104D8         # 9.0  OSAGE CAPITAL LETTER A
-104B1         ; mapped                 ; 104D9         # 9.0  OSAGE CAPITAL LETTER AI
-104B2         ; mapped                 ; 104DA         # 9.0  OSAGE CAPITAL LETTER AIN
-104B3         ; mapped                 ; 104DB         # 9.0  OSAGE CAPITAL LETTER AH
-104B4         ; mapped                 ; 104DC         # 9.0  OSAGE CAPITAL LETTER BRA
-104B5         ; mapped                 ; 104DD         # 9.0  OSAGE CAPITAL LETTER CHA
-104B6         ; mapped                 ; 104DE         # 9.0  OSAGE CAPITAL LETTER EHCHA
-104B7         ; mapped                 ; 104DF         # 9.0  OSAGE CAPITAL LETTER E
-104B8         ; mapped                 ; 104E0         # 9.0  OSAGE CAPITAL LETTER EIN
-104B9         ; mapped                 ; 104E1         # 9.0  OSAGE CAPITAL LETTER HA
-104BA         ; mapped                 ; 104E2         # 9.0  OSAGE CAPITAL LETTER HYA
-104BB         ; mapped                 ; 104E3         # 9.0  OSAGE CAPITAL LETTER I
-104BC         ; mapped                 ; 104E4         # 9.0  OSAGE CAPITAL LETTER KA
-104BD         ; mapped                 ; 104E5         # 9.0  OSAGE CAPITAL LETTER EHKA
-104BE         ; mapped                 ; 104E6         # 9.0  OSAGE CAPITAL LETTER KYA
-104BF         ; mapped                 ; 104E7         # 9.0  OSAGE CAPITAL LETTER LA
-104C0         ; mapped                 ; 104E8         # 9.0  OSAGE CAPITAL LETTER MA
-104C1         ; mapped                 ; 104E9         # 9.0  OSAGE CAPITAL LETTER NA
-104C2         ; mapped                 ; 104EA         # 9.0  OSAGE CAPITAL LETTER O
-104C3         ; mapped                 ; 104EB         # 9.0  OSAGE CAPITAL LETTER OIN
-104C4         ; mapped                 ; 104EC         # 9.0  OSAGE CAPITAL LETTER PA
-104C5         ; mapped                 ; 104ED         # 9.0  OSAGE CAPITAL LETTER EHPA
-104C6         ; mapped                 ; 104EE         # 9.0  OSAGE CAPITAL LETTER SA
-104C7         ; mapped                 ; 104EF         # 9.0  OSAGE CAPITAL LETTER SHA
-104C8         ; mapped                 ; 104F0         # 9.0  OSAGE CAPITAL LETTER TA
-104C9         ; mapped                 ; 104F1         # 9.0  OSAGE CAPITAL LETTER EHTA
-104CA         ; mapped                 ; 104F2         # 9.0  OSAGE CAPITAL LETTER TSA
-104CB         ; mapped                 ; 104F3         # 9.0  OSAGE CAPITAL LETTER EHTSA
-104CC         ; mapped                 ; 104F4         # 9.0  OSAGE CAPITAL LETTER TSHA
-104CD         ; mapped                 ; 104F5         # 9.0  OSAGE CAPITAL LETTER DHA
-104CE         ; mapped                 ; 104F6         # 9.0  OSAGE CAPITAL LETTER U
-104CF         ; mapped                 ; 104F7         # 9.0  OSAGE CAPITAL LETTER WA
-104D0         ; mapped                 ; 104F8         # 9.0  OSAGE CAPITAL LETTER KHA
-104D1         ; mapped                 ; 104F9         # 9.0  OSAGE CAPITAL LETTER GHA
-104D2         ; mapped                 ; 104FA         # 9.0  OSAGE CAPITAL LETTER ZA
-104D3         ; mapped                 ; 104FB         # 9.0  OSAGE CAPITAL LETTER ZHA
-104D4..104D7  ; disallowed                             # NA   <reserved-104D4>..<reserved-104D7>
-104D8..104FB  ; valid                                  # 9.0  OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA
-104FC..104FF  ; disallowed                             # NA   <reserved-104FC>..<reserved-104FF>
-10500..10527  ; valid                                  # 7.0  ELBASAN LETTER A..ELBASAN LETTER KHE
-10528..1052F  ; disallowed                             # NA   <reserved-10528>..<reserved-1052F>
-10530..10563  ; valid                                  # 7.0  CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW
-10564..1056E  ; disallowed                             # NA   <reserved-10564>..<reserved-1056E>
-1056F         ; valid                  ;      ; NV8    # 7.0  CAUCASIAN ALBANIAN CITATION MARK
-10570..105FF  ; disallowed                             # NA   <reserved-10570>..<reserved-105FF>
-10600..10736  ; valid                                  # 7.0  LINEAR A SIGN AB001..LINEAR A SIGN A664
-10737..1073F  ; disallowed                             # NA   <reserved-10737>..<reserved-1073F>
-10740..10755  ; valid                                  # 7.0  LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE
-10756..1075F  ; disallowed                             # NA   <reserved-10756>..<reserved-1075F>
-10760..10767  ; valid                                  # 7.0  LINEAR A SIGN A800..LINEAR A SIGN A807
-10768..107FF  ; disallowed                             # NA   <reserved-10768>..<reserved-107FF>
-10800..10805  ; valid                                  # 4.0  CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA
-10806..10807  ; disallowed                             # NA   <reserved-10806>..<reserved-10807>
-10808         ; valid                                  # 4.0  CYPRIOT SYLLABLE JO
-10809         ; disallowed                             # NA   <reserved-10809>
-1080A..10835  ; valid                                  # 4.0  CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO
-10836         ; disallowed                             # NA   <reserved-10836>
-10837..10838  ; valid                                  # 4.0  CYPRIOT SYLLABLE XA..CYPRIOT SYLLABLE XE
-10839..1083B  ; disallowed                             # NA   <reserved-10839>..<reserved-1083B>
-1083C         ; valid                                  # 4.0  CYPRIOT SYLLABLE ZA
-1083D..1083E  ; disallowed                             # NA   <reserved-1083D>..<reserved-1083E>
-1083F         ; valid                                  # 4.0  CYPRIOT SYLLABLE ZO
-10840..10855  ; valid                                  # 5.2  IMPERIAL ARAMAIC LETTER ALEPH..IMPERIAL ARAMAIC LETTER TAW
-10856         ; disallowed                             # NA   <reserved-10856>
-10857..1085F  ; valid                  ;      ; NV8    # 5.2  IMPERIAL ARAMAIC SECTION SIGN..IMPERIAL ARAMAIC NUMBER TEN THOUSAND
-10860..10876  ; valid                                  # 7.0  PALMYRENE LETTER ALEPH..PALMYRENE LETTER TAW
-10877..1087F  ; valid                  ;      ; NV8    # 7.0  PALMYRENE LEFT-POINTING FLEURON..PALMYRENE NUMBER TWENTY
-10880..1089E  ; valid                                  # 7.0  NABATAEAN LETTER FINAL ALEPH..NABATAEAN LETTER TAW
-1089F..108A6  ; disallowed                             # NA   <reserved-1089F>..<reserved-108A6>
-108A7..108AF  ; valid                  ;      ; NV8    # 7.0  NABATAEAN NUMBER ONE..NABATAEAN NUMBER ONE HUNDRED
-108B0..108DF  ; disallowed                             # NA   <reserved-108B0>..<reserved-108DF>
-108E0..108F2  ; valid                                  # 8.0  HATRAN LETTER ALEPH..HATRAN LETTER QOPH
-108F3         ; disallowed                             # NA   <reserved-108F3>
-108F4..108F5  ; valid                                  # 8.0  HATRAN LETTER SHIN..HATRAN LETTER TAW
-108F6..108FA  ; disallowed                             # NA   <reserved-108F6>..<reserved-108FA>
-108FB..108FF  ; valid                  ;      ; NV8    # 8.0  HATRAN NUMBER ONE..HATRAN NUMBER ONE HUNDRED
-10900..10915  ; valid                                  # 5.0  PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
-10916..10919  ; valid                  ;      ; NV8    # 5.0  PHOENICIAN NUMBER ONE..PHOENICIAN NUMBER ONE HUNDRED
-1091A..1091B  ; valid                  ;      ; NV8    # 5.2  PHOENICIAN NUMBER TWO..PHOENICIAN NUMBER THREE
-1091C..1091E  ; disallowed                             # NA   <reserved-1091C>..<reserved-1091E>
-1091F         ; valid                  ;      ; NV8    # 5.0  PHOENICIAN WORD SEPARATOR
-10920..10939  ; valid                                  # 5.1  LYDIAN LETTER A..LYDIAN LETTER C
-1093A..1093E  ; disallowed                             # NA   <reserved-1093A>..<reserved-1093E>
-1093F         ; valid                  ;      ; NV8    # 5.1  LYDIAN TRIANGULAR MARK
-10940..1097F  ; disallowed                             # NA   <reserved-10940>..<reserved-1097F>
-10980..109B7  ; valid                                  # 6.1  MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
-109B8..109BB  ; disallowed                             # NA   <reserved-109B8>..<reserved-109BB>
-109BC..109BD  ; valid                  ;      ; NV8    # 8.0  MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS..MEROITIC CURSIVE FRACTION ONE HALF
-109BE..109BF  ; valid                                  # 6.1  MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
-109C0..109CF  ; valid                  ;      ; NV8    # 8.0  MEROITIC CURSIVE NUMBER ONE..MEROITIC CURSIVE NUMBER SEVENTY
-109D0..109D1  ; disallowed                             # NA   <reserved-109D0>..<reserved-109D1>
-109D2..109FF  ; valid                  ;      ; NV8    # 8.0  MEROITIC CURSIVE NUMBER ONE HUNDRED..MEROITIC CURSIVE FRACTION TEN TWELFTHS
-10A00..10A03  ; valid                                  # 4.1  KHAROSHTHI LETTER A..KHAROSHTHI VOWEL SIGN VOCALIC R
-10A04         ; disallowed                             # NA   <reserved-10A04>
-10A05..10A06  ; valid                                  # 4.1  KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O
-10A07..10A0B  ; disallowed                             # NA   <reserved-10A07>..<reserved-10A0B>
-10A0C..10A13  ; valid                                  # 4.1  KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI LETTER GHA
-10A14         ; disallowed                             # NA   <reserved-10A14>
-10A15..10A17  ; valid                                  # 4.1  KHAROSHTHI LETTER CA..KHAROSHTHI LETTER JA
-10A18         ; disallowed                             # NA   <reserved-10A18>
-10A19..10A33  ; valid                                  # 4.1  KHAROSHTHI LETTER NYA..KHAROSHTHI LETTER TTTHA
-10A34..10A37  ; disallowed                             # NA   <reserved-10A34>..<reserved-10A37>
-10A38..10A3A  ; valid                                  # 4.1  KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN DOT BELOW
-10A3B..10A3E  ; disallowed                             # NA   <reserved-10A3B>..<reserved-10A3E>
-10A3F         ; valid                                  # 4.1  KHAROSHTHI VIRAMA
-10A40..10A47  ; valid                  ;      ; NV8    # 4.1  KHAROSHTHI DIGIT ONE..KHAROSHTHI NUMBER ONE THOUSAND
-10A48..10A4F  ; disallowed                             # NA   <reserved-10A48>..<reserved-10A4F>
-10A50..10A58  ; valid                  ;      ; NV8    # 4.1  KHAROSHTHI PUNCTUATION DOT..KHAROSHTHI PUNCTUATION LINES
-10A59..10A5F  ; disallowed                             # NA   <reserved-10A59>..<reserved-10A5F>
-10A60..10A7C  ; valid                                  # 5.2  OLD SOUTH ARABIAN LETTER HE..OLD SOUTH ARABIAN LETTER THETH
-10A7D..10A7F  ; valid                  ;      ; NV8    # 5.2  OLD SOUTH ARABIAN NUMBER ONE..OLD SOUTH ARABIAN NUMERIC INDICATOR
-10A80..10A9C  ; valid                                  # 7.0  OLD NORTH ARABIAN LETTER HEH..OLD NORTH ARABIAN LETTER ZAH
-10A9D..10A9F  ; valid                  ;      ; NV8    # 7.0  OLD NORTH ARABIAN NUMBER ONE..OLD NORTH ARABIAN NUMBER TWENTY
-10AA0..10ABF  ; disallowed                             # NA   <reserved-10AA0>..<reserved-10ABF>
-10AC0..10AC7  ; valid                                  # 7.0  MANICHAEAN LETTER ALEPH..MANICHAEAN LETTER WAW
-10AC8         ; valid                  ;      ; NV8    # 7.0  MANICHAEAN SIGN UD
-10AC9..10AE6  ; valid                                  # 7.0  MANICHAEAN LETTER ZAYIN..MANICHAEAN ABBREVIATION MARK BELOW
-10AE7..10AEA  ; disallowed                             # NA   <reserved-10AE7>..<reserved-10AEA>
-10AEB..10AF6  ; valid                  ;      ; NV8    # 7.0  MANICHAEAN NUMBER ONE..MANICHAEAN PUNCTUATION LINE FILLER
-10AF7..10AFF  ; disallowed                             # NA   <reserved-10AF7>..<reserved-10AFF>
-10B00..10B35  ; valid                                  # 5.2  AVESTAN LETTER A..AVESTAN LETTER HE
-10B36..10B38  ; disallowed                             # NA   <reserved-10B36>..<reserved-10B38>
-10B39..10B3F  ; valid                  ;      ; NV8    # 5.2  AVESTAN ABBREVIATION MARK..LARGE ONE RING OVER TWO RINGS PUNCTUATION
-10B40..10B55  ; valid                                  # 5.2  INSCRIPTIONAL PARTHIAN LETTER ALEPH..INSCRIPTIONAL PARTHIAN LETTER TAW
-10B56..10B57  ; disallowed                             # NA   <reserved-10B56>..<reserved-10B57>
-10B58..10B5F  ; valid                  ;      ; NV8    # 5.2  INSCRIPTIONAL PARTHIAN NUMBER ONE..INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND
-10B60..10B72  ; valid                                  # 5.2  INSCRIPTIONAL PAHLAVI LETTER ALEPH..INSCRIPTIONAL PAHLAVI LETTER TAW
-10B73..10B77  ; disallowed                             # NA   <reserved-10B73>..<reserved-10B77>
-10B78..10B7F  ; valid                  ;      ; NV8    # 5.2  INSCRIPTIONAL PAHLAVI NUMBER ONE..INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND
-10B80..10B91  ; valid                                  # 7.0  PSALTER PAHLAVI LETTER ALEPH..PSALTER PAHLAVI LETTER TAW
-10B92..10B98  ; disallowed                             # NA   <reserved-10B92>..<reserved-10B98>
-10B99..10B9C  ; valid                  ;      ; NV8    # 7.0  PSALTER PAHLAVI SECTION MARK..PSALTER PAHLAVI FOUR DOTS WITH DOT
-10B9D..10BA8  ; disallowed                             # NA   <reserved-10B9D>..<reserved-10BA8>
-10BA9..10BAF  ; valid                  ;      ; NV8    # 7.0  PSALTER PAHLAVI NUMBER ONE..PSALTER PAHLAVI NUMBER ONE HUNDRED
-10BB0..10BFF  ; disallowed                             # NA   <reserved-10BB0>..<reserved-10BFF>
-10C00..10C48  ; valid                                  # 5.2  OLD TURKIC LETTER ORKHON A..OLD TURKIC LETTER ORKHON BASH
-10C49..10C7F  ; disallowed                             # NA   <reserved-10C49>..<reserved-10C7F>
-10C80         ; mapped                 ; 10CC0         # 8.0  OLD HUNGARIAN CAPITAL LETTER A
-10C81         ; mapped                 ; 10CC1         # 8.0  OLD HUNGARIAN CAPITAL LETTER AA
-10C82         ; mapped                 ; 10CC2         # 8.0  OLD HUNGARIAN CAPITAL LETTER EB
-10C83         ; mapped                 ; 10CC3         # 8.0  OLD HUNGARIAN CAPITAL LETTER AMB
-10C84         ; mapped                 ; 10CC4         # 8.0  OLD HUNGARIAN CAPITAL LETTER EC
-10C85         ; mapped                 ; 10CC5         # 8.0  OLD HUNGARIAN CAPITAL LETTER ENC
-10C86         ; mapped                 ; 10CC6         # 8.0  OLD HUNGARIAN CAPITAL LETTER ECS
-10C87         ; mapped                 ; 10CC7         # 8.0  OLD HUNGARIAN CAPITAL LETTER ED
-10C88         ; mapped                 ; 10CC8         # 8.0  OLD HUNGARIAN CAPITAL LETTER AND
-10C89         ; mapped                 ; 10CC9         # 8.0  OLD HUNGARIAN CAPITAL LETTER E
-10C8A         ; mapped                 ; 10CCA         # 8.0  OLD HUNGARIAN CAPITAL LETTER CLOSE E
-10C8B         ; mapped                 ; 10CCB         # 8.0  OLD HUNGARIAN CAPITAL LETTER EE
-10C8C         ; mapped                 ; 10CCC         # 8.0  OLD HUNGARIAN CAPITAL LETTER EF
-10C8D         ; mapped                 ; 10CCD         # 8.0  OLD HUNGARIAN CAPITAL LETTER EG
-10C8E         ; mapped                 ; 10CCE         # 8.0  OLD HUNGARIAN CAPITAL LETTER EGY
-10C8F         ; mapped                 ; 10CCF         # 8.0  OLD HUNGARIAN CAPITAL LETTER EH
-10C90         ; mapped                 ; 10CD0         # 8.0  OLD HUNGARIAN CAPITAL LETTER I
-10C91         ; mapped                 ; 10CD1         # 8.0  OLD HUNGARIAN CAPITAL LETTER II
-10C92         ; mapped                 ; 10CD2         # 8.0  OLD HUNGARIAN CAPITAL LETTER EJ
-10C93         ; mapped                 ; 10CD3         # 8.0  OLD HUNGARIAN CAPITAL LETTER EK
-10C94         ; mapped                 ; 10CD4         # 8.0  OLD HUNGARIAN CAPITAL LETTER AK
-10C95         ; mapped                 ; 10CD5         # 8.0  OLD HUNGARIAN CAPITAL LETTER UNK
-10C96         ; mapped                 ; 10CD6         # 8.0  OLD HUNGARIAN CAPITAL LETTER EL
-10C97         ; mapped                 ; 10CD7         # 8.0  OLD HUNGARIAN CAPITAL LETTER ELY
-10C98         ; mapped                 ; 10CD8         # 8.0  OLD HUNGARIAN CAPITAL LETTER EM
-10C99         ; mapped                 ; 10CD9         # 8.0  OLD HUNGARIAN CAPITAL LETTER EN
-10C9A         ; mapped                 ; 10CDA         # 8.0  OLD HUNGARIAN CAPITAL LETTER ENY
-10C9B         ; mapped                 ; 10CDB         # 8.0  OLD HUNGARIAN CAPITAL LETTER O
-10C9C         ; mapped                 ; 10CDC         # 8.0  OLD HUNGARIAN CAPITAL LETTER OO
-10C9D         ; mapped                 ; 10CDD         # 8.0  OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE
-10C9E         ; mapped                 ; 10CDE         # 8.0  OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE
-10C9F         ; mapped                 ; 10CDF         # 8.0  OLD HUNGARIAN CAPITAL LETTER OEE
-10CA0         ; mapped                 ; 10CE0         # 8.0  OLD HUNGARIAN CAPITAL LETTER EP
-10CA1         ; mapped                 ; 10CE1         # 8.0  OLD HUNGARIAN CAPITAL LETTER EMP
-10CA2         ; mapped                 ; 10CE2         # 8.0  OLD HUNGARIAN CAPITAL LETTER ER
-10CA3         ; mapped                 ; 10CE3         # 8.0  OLD HUNGARIAN CAPITAL LETTER SHORT ER
-10CA4         ; mapped                 ; 10CE4         # 8.0  OLD HUNGARIAN CAPITAL LETTER ES
-10CA5         ; mapped                 ; 10CE5         # 8.0  OLD HUNGARIAN CAPITAL LETTER ESZ
-10CA6         ; mapped                 ; 10CE6         # 8.0  OLD HUNGARIAN CAPITAL LETTER ET
-10CA7         ; mapped                 ; 10CE7         # 8.0  OLD HUNGARIAN CAPITAL LETTER ENT
-10CA8         ; mapped                 ; 10CE8         # 8.0  OLD HUNGARIAN CAPITAL LETTER ETY
-10CA9         ; mapped                 ; 10CE9         # 8.0  OLD HUNGARIAN CAPITAL LETTER ECH
-10CAA         ; mapped                 ; 10CEA         # 8.0  OLD HUNGARIAN CAPITAL LETTER U
-10CAB         ; mapped                 ; 10CEB         # 8.0  OLD HUNGARIAN CAPITAL LETTER UU
-10CAC         ; mapped                 ; 10CEC         # 8.0  OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE
-10CAD         ; mapped                 ; 10CED         # 8.0  OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE
-10CAE         ; mapped                 ; 10CEE         # 8.0  OLD HUNGARIAN CAPITAL LETTER EV
-10CAF         ; mapped                 ; 10CEF         # 8.0  OLD HUNGARIAN CAPITAL LETTER EZ
-10CB0         ; mapped                 ; 10CF0         # 8.0  OLD HUNGARIAN CAPITAL LETTER EZS
-10CB1         ; mapped                 ; 10CF1         # 8.0  OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN
-10CB2         ; mapped                 ; 10CF2         # 8.0  OLD HUNGARIAN CAPITAL LETTER US
-10CB3..10CBF  ; disallowed                             # NA   <reserved-10CB3>..<reserved-10CBF>
-10CC0..10CF2  ; valid                                  # 8.0  OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US
-10CF3..10CF9  ; disallowed                             # NA   <reserved-10CF3>..<reserved-10CF9>
-10CFA..10CFF  ; valid                  ;      ; NV8    # 8.0  OLD HUNGARIAN NUMBER ONE..OLD HUNGARIAN NUMBER ONE THOUSAND
-10D00..10E5F  ; disallowed                             # NA   <reserved-10D00>..<reserved-10E5F>
-10E60..10E7E  ; valid                  ;      ; NV8    # 5.2  RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS
-10E7F..10FFF  ; disallowed                             # NA   <reserved-10E7F>..<reserved-10FFF>
-11000..11046  ; valid                                  # 6.0  BRAHMI SIGN CANDRABINDU..BRAHMI VIRAMA
-11047..1104D  ; valid                  ;      ; NV8    # 6.0  BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS
-1104E..11051  ; disallowed                             # NA   <reserved-1104E>..<reserved-11051>
-11052..11065  ; valid                  ;      ; NV8    # 6.0  BRAHMI NUMBER ONE..BRAHMI NUMBER ONE THOUSAND
-11066..1106F  ; valid                                  # 6.0  BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE
-11070..1107E  ; disallowed                             # NA   <reserved-11070>..<reserved-1107E>
-1107F         ; valid                                  # 7.0  BRAHMI NUMBER JOINER
-11080..110BA  ; valid                                  # 5.2  KAITHI SIGN CANDRABINDU..KAITHI SIGN NUKTA
-110BB..110BC  ; valid                  ;      ; NV8    # 5.2  KAITHI ABBREVIATION SIGN..KAITHI ENUMERATION SIGN
-110BD         ; disallowed                             # 5.2  KAITHI NUMBER SIGN
-110BE..110C1  ; valid                  ;      ; NV8    # 5.2  KAITHI SECTION MARK..KAITHI DOUBLE DANDA
-110C2..110CF  ; disallowed                             # NA   <reserved-110C2>..<reserved-110CF>
-110D0..110E8  ; valid                                  # 6.1  SORA SOMPENG LETTER SAH..SORA SOMPENG LETTER MAE
-110E9..110EF  ; disallowed                             # NA   <reserved-110E9>..<reserved-110EF>
-110F0..110F9  ; valid                                  # 6.1  SORA SOMPENG DIGIT ZERO..SORA SOMPENG DIGIT NINE
-110FA..110FF  ; disallowed                             # NA   <reserved-110FA>..<reserved-110FF>
-11100..11134  ; valid                                  # 6.1  CHAKMA SIGN CANDRABINDU..CHAKMA MAAYYAA
-11135         ; disallowed                             # NA   <reserved-11135>
-11136..1113F  ; valid                                  # 6.1  CHAKMA DIGIT ZERO..CHAKMA DIGIT NINE
-11140..11143  ; valid                  ;      ; NV8    # 6.1  CHAKMA SECTION MARK..CHAKMA QUESTION MARK
-11144..1114F  ; disallowed                             # NA   <reserved-11144>..<reserved-1114F>
-11150..11173  ; valid                                  # 7.0  MAHAJANI LETTER A..MAHAJANI SIGN NUKTA
-11174..11175  ; valid                  ;      ; NV8    # 7.0  MAHAJANI ABBREVIATION SIGN..MAHAJANI SECTION MARK
-11176         ; valid                                  # 7.0  MAHAJANI LIGATURE SHRI
-11177..1117F  ; disallowed                             # NA   <reserved-11177>..<reserved-1117F>
-11180..111C4  ; valid                                  # 6.1  SHARADA SIGN CANDRABINDU..SHARADA OM
-111C5..111C8  ; valid                  ;      ; NV8    # 6.1  SHARADA DANDA..SHARADA SEPARATOR
-111C9         ; valid                  ;      ; NV8    # 8.0  SHARADA SANDHI MARK
-111CA..111CC  ; valid                                  # 8.0  SHARADA SIGN NUKTA..SHARADA EXTRA SHORT VOWEL MARK
-111CD         ; valid                  ;      ; NV8    # 7.0  SHARADA SUTRA MARK
-111CE..111CF  ; disallowed                             # NA   <reserved-111CE>..<reserved-111CF>
-111D0..111D9  ; valid                                  # 6.1  SHARADA DIGIT ZERO..SHARADA DIGIT NINE
-111DA         ; valid                                  # 7.0  SHARADA EKAM
-111DB         ; valid                  ;      ; NV8    # 8.0  SHARADA SIGN SIDDHAM
-111DC         ; valid                                  # 8.0  SHARADA HEADSTROKE
-111DD..111DF  ; valid                  ;      ; NV8    # 8.0  SHARADA CONTINUATION SIGN..SHARADA SECTION MARK-2
-111E0         ; disallowed                             # NA   <reserved-111E0>
-111E1..111F4  ; valid                  ;      ; NV8    # 7.0  SINHALA ARCHAIC DIGIT ONE..SINHALA ARCHAIC NUMBER ONE THOUSAND
-111F5..111FF  ; disallowed                             # NA   <reserved-111F5>..<reserved-111FF>
-11200..11211  ; valid                                  # 7.0  KHOJKI LETTER A..KHOJKI LETTER JJA
-11212         ; disallowed                             # NA   <reserved-11212>
-11213..11237  ; valid                                  # 7.0  KHOJKI LETTER NYA..KHOJKI SIGN SHADDA
-11238..1123D  ; valid                  ;      ; NV8    # 7.0  KHOJKI DANDA..KHOJKI ABBREVIATION SIGN
-1123E         ; valid                                  # 9.0  KHOJKI SIGN SUKUN
-1123F..1127F  ; disallowed                             # NA   <reserved-1123F>..<reserved-1127F>
-11280..11286  ; valid                                  # 8.0  MULTANI LETTER A..MULTANI LETTER GA
-11287         ; disallowed                             # NA   <reserved-11287>
-11288         ; valid                                  # 8.0  MULTANI LETTER GHA
-11289         ; disallowed                             # NA   <reserved-11289>
-1128A..1128D  ; valid                                  # 8.0  MULTANI LETTER CA..MULTANI LETTER JJA
-1128E         ; disallowed                             # NA   <reserved-1128E>
-1128F..1129D  ; valid                                  # 8.0  MULTANI LETTER NYA..MULTANI LETTER BA
-1129E         ; disallowed                             # NA   <reserved-1129E>
-1129F..112A8  ; valid                                  # 8.0  MULTANI LETTER BHA..MULTANI LETTER RHA
-112A9         ; valid                  ;      ; NV8    # 8.0  MULTANI SECTION MARK
-112AA..112AF  ; disallowed                             # NA   <reserved-112AA>..<reserved-112AF>
-112B0..112EA  ; valid                                  # 7.0  KHUDAWADI LETTER A..KHUDAWADI SIGN VIRAMA
-112EB..112EF  ; disallowed                             # NA   <reserved-112EB>..<reserved-112EF>
-112F0..112F9  ; valid                                  # 7.0  KHUDAWADI DIGIT ZERO..KHUDAWADI DIGIT NINE
-112FA..112FF  ; disallowed                             # NA   <reserved-112FA>..<reserved-112FF>
-11300         ; valid                                  # 8.0  GRANTHA SIGN COMBINING ANUSVARA ABOVE
-11301..11303  ; valid                                  # 7.0  GRANTHA SIGN CANDRABINDU..GRANTHA SIGN VISARGA
-11304         ; disallowed                             # NA   <reserved-11304>
-11305..1130C  ; valid                                  # 7.0  GRANTHA LETTER A..GRANTHA LETTER VOCALIC L
-1130D..1130E  ; disallowed                             # NA   <reserved-1130D>..<reserved-1130E>
-1130F..11310  ; valid                                  # 7.0  GRANTHA LETTER EE..GRANTHA LETTER AI
-11311..11312  ; disallowed                             # NA   <reserved-11311>..<reserved-11312>
-11313..11328  ; valid                                  # 7.0  GRANTHA LETTER OO..GRANTHA LETTER NA
-11329         ; disallowed                             # NA   <reserved-11329>
-1132A..11330  ; valid                                  # 7.0  GRANTHA LETTER PA..GRANTHA LETTER RA
-11331         ; disallowed                             # NA   <reserved-11331>
-11332..11333  ; valid                                  # 7.0  GRANTHA LETTER LA..GRANTHA LETTER LLA
-11334         ; disallowed                             # NA   <reserved-11334>
-11335..11339  ; valid                                  # 7.0  GRANTHA LETTER VA..GRANTHA LETTER HA
-1133A..1133B  ; disallowed                             # NA   <reserved-1133A>..<reserved-1133B>
-1133C..11344  ; valid                                  # 7.0  GRANTHA SIGN NUKTA..GRANTHA VOWEL SIGN VOCALIC RR
-11345..11346  ; disallowed                             # NA   <reserved-11345>..<reserved-11346>
-11347..11348  ; valid                                  # 7.0  GRANTHA VOWEL SIGN EE..GRANTHA VOWEL SIGN AI
-11349..1134A  ; disallowed                             # NA   <reserved-11349>..<reserved-1134A>
-1134B..1134D  ; valid                                  # 7.0  GRANTHA VOWEL SIGN OO..GRANTHA SIGN VIRAMA
-1134E..1134F  ; disallowed                             # NA   <reserved-1134E>..<reserved-1134F>
-11350         ; valid                                  # 8.0  GRANTHA OM
-11351..11356  ; disallowed                             # NA   <reserved-11351>..<reserved-11356>
-11357         ; valid                                  # 7.0  GRANTHA AU LENGTH MARK
-11358..1135C  ; disallowed                             # NA   <reserved-11358>..<reserved-1135C>
-1135D..11363  ; valid                                  # 7.0  GRANTHA SIGN PLUTA..GRANTHA VOWEL SIGN VOCALIC LL
-11364..11365  ; disallowed                             # NA   <reserved-11364>..<reserved-11365>
-11366..1136C  ; valid                                  # 7.0  COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX
-1136D..1136F  ; disallowed                             # NA   <reserved-1136D>..<reserved-1136F>
-11370..11374  ; valid                                  # 7.0  COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA
-11375..113FF  ; disallowed                             # NA   <reserved-11375>..<reserved-113FF>
-11400..1144A  ; valid                                  # 9.0  NEWA LETTER A..NEWA SIDDHI
-1144B..1144F  ; valid                  ;      ; NV8    # 9.0  NEWA DANDA..NEWA ABBREVIATION SIGN
-11450..11459  ; valid                                  # 9.0  NEWA DIGIT ZERO..NEWA DIGIT NINE
-1145A         ; disallowed                             # NA   <reserved-1145A>
-1145B         ; valid                  ;      ; NV8    # 9.0  NEWA PLACEHOLDER MARK
-1145C         ; disallowed                             # NA   <reserved-1145C>
-1145D         ; valid                  ;      ; NV8    # 9.0  NEWA INSERTION SIGN
-1145E..1147F  ; disallowed                             # NA   <reserved-1145E>..<reserved-1147F>
-11480..114C5  ; valid                                  # 7.0  TIRHUTA ANJI..TIRHUTA GVANG
-114C6         ; valid                  ;      ; NV8    # 7.0  TIRHUTA ABBREVIATION SIGN
-114C7         ; valid                                  # 7.0  TIRHUTA OM
-114C8..114CF  ; disallowed                             # NA   <reserved-114C8>..<reserved-114CF>
-114D0..114D9  ; valid                                  # 7.0  TIRHUTA DIGIT ZERO..TIRHUTA DIGIT NINE
-114DA..1157F  ; disallowed                             # NA   <reserved-114DA>..<reserved-1157F>
-11580..115B5  ; valid                                  # 7.0  SIDDHAM LETTER A..SIDDHAM VOWEL SIGN VOCALIC RR
-115B6..115B7  ; disallowed                             # NA   <reserved-115B6>..<reserved-115B7>
-115B8..115C0  ; valid                                  # 7.0  SIDDHAM VOWEL SIGN E..SIDDHAM SIGN NUKTA
-115C1..115C9  ; valid                  ;      ; NV8    # 7.0  SIDDHAM SIGN SIDDHAM..SIDDHAM END OF TEXT MARK
-115CA..115D7  ; valid                  ;      ; NV8    # 8.0  SIDDHAM SECTION MARK WITH TRIDENT AND U-SHAPED ORNAMENTS..SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES
-115D8..115DD  ; valid                                  # 8.0  SIDDHAM LETTER THREE-CIRCLE ALTERNATE I..SIDDHAM VOWEL SIGN ALTERNATE UU
-115DE..115FF  ; disallowed                             # NA   <reserved-115DE>..<reserved-115FF>
-11600..11640  ; valid                                  # 7.0  MODI LETTER A..MODI SIGN ARDHACANDRA
-11641..11643  ; valid                  ;      ; NV8    # 7.0  MODI DANDA..MODI ABBREVIATION SIGN
-11644         ; valid                                  # 7.0  MODI SIGN HUVA
-11645..1164F  ; disallowed                             # NA   <reserved-11645>..<reserved-1164F>
-11650..11659  ; valid                                  # 7.0  MODI DIGIT ZERO..MODI DIGIT NINE
-1165A..1165F  ; disallowed                             # NA   <reserved-1165A>..<reserved-1165F>
-11660..1166C  ; valid                  ;      ; NV8    # 9.0  MONGOLIAN BIRGA WITH ORNAMENT..MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT
-1166D..1167F  ; disallowed                             # NA   <reserved-1166D>..<reserved-1167F>
-11680..116B7  ; valid                                  # 6.1  TAKRI LETTER A..TAKRI SIGN NUKTA
-116B8..116BF  ; disallowed                             # NA   <reserved-116B8>..<reserved-116BF>
-116C0..116C9  ; valid                                  # 6.1  TAKRI DIGIT ZERO..TAKRI DIGIT NINE
-116CA..116FF  ; disallowed                             # NA   <reserved-116CA>..<reserved-116FF>
-11700..11719  ; valid                                  # 8.0  AHOM LETTER KA..AHOM LETTER JHA
-1171A..1171C  ; disallowed                             # NA   <reserved-1171A>..<reserved-1171C>
-1171D..1172B  ; valid                                  # 8.0  AHOM CONSONANT SIGN MEDIAL LA..AHOM SIGN KILLER
-1172C..1172F  ; disallowed                             # NA   <reserved-1172C>..<reserved-1172F>
-11730..11739  ; valid                                  # 8.0  AHOM DIGIT ZERO..AHOM DIGIT NINE
-1173A..1173F  ; valid                  ;      ; NV8    # 8.0  AHOM NUMBER TEN..AHOM SYMBOL VI
-11740..1189F  ; disallowed                             # NA   <reserved-11740>..<reserved-1189F>
-118A0         ; mapped                 ; 118C0         # 7.0  WARANG CITI CAPITAL LETTER NGAA
-118A1         ; mapped                 ; 118C1         # 7.0  WARANG CITI CAPITAL LETTER A
-118A2         ; mapped                 ; 118C2         # 7.0  WARANG CITI CAPITAL LETTER WI
-118A3         ; mapped                 ; 118C3         # 7.0  WARANG CITI CAPITAL LETTER YU
-118A4         ; mapped                 ; 118C4         # 7.0  WARANG CITI CAPITAL LETTER YA
-118A5         ; mapped                 ; 118C5         # 7.0  WARANG CITI CAPITAL LETTER YO
-118A6         ; mapped                 ; 118C6         # 7.0  WARANG CITI CAPITAL LETTER II
-118A7         ; mapped                 ; 118C7         # 7.0  WARANG CITI CAPITAL LETTER UU
-118A8         ; mapped                 ; 118C8         # 7.0  WARANG CITI CAPITAL LETTER E
-118A9         ; mapped                 ; 118C9         # 7.0  WARANG CITI CAPITAL LETTER O
-118AA         ; mapped                 ; 118CA         # 7.0  WARANG CITI CAPITAL LETTER ANG
-118AB         ; mapped                 ; 118CB         # 7.0  WARANG CITI CAPITAL LETTER GA
-118AC         ; mapped                 ; 118CC         # 7.0  WARANG CITI CAPITAL LETTER KO
-118AD         ; mapped                 ; 118CD         # 7.0  WARANG CITI CAPITAL LETTER ENY
-118AE         ; mapped                 ; 118CE         # 7.0  WARANG CITI CAPITAL LETTER YUJ
-118AF         ; mapped                 ; 118CF         # 7.0  WARANG CITI CAPITAL LETTER UC
-118B0         ; mapped                 ; 118D0         # 7.0  WARANG CITI CAPITAL LETTER ENN
-118B1         ; mapped                 ; 118D1         # 7.0  WARANG CITI CAPITAL LETTER ODD
-118B2         ; mapped                 ; 118D2         # 7.0  WARANG CITI CAPITAL LETTER TTE
-118B3         ; mapped                 ; 118D3         # 7.0  WARANG CITI CAPITAL LETTER NUNG
-118B4         ; mapped                 ; 118D4         # 7.0  WARANG CITI CAPITAL LETTER DA
-118B5         ; mapped                 ; 118D5         # 7.0  WARANG CITI CAPITAL LETTER AT
-118B6         ; mapped                 ; 118D6         # 7.0  WARANG CITI CAPITAL LETTER AM
-118B7         ; mapped                 ; 118D7         # 7.0  WARANG CITI CAPITAL LETTER BU
-118B8         ; mapped                 ; 118D8         # 7.0  WARANG CITI CAPITAL LETTER PU
-118B9         ; mapped                 ; 118D9         # 7.0  WARANG CITI CAPITAL LETTER HIYO
-118BA         ; mapped                 ; 118DA         # 7.0  WARANG CITI CAPITAL LETTER HOLO
-118BB         ; mapped                 ; 118DB         # 7.0  WARANG CITI CAPITAL LETTER HORR
-118BC         ; mapped                 ; 118DC         # 7.0  WARANG CITI CAPITAL LETTER HAR
-118BD         ; mapped                 ; 118DD         # 7.0  WARANG CITI CAPITAL LETTER SSUU
-118BE         ; mapped                 ; 118DE         # 7.0  WARANG CITI CAPITAL LETTER SII
-118BF         ; mapped                 ; 118DF         # 7.0  WARANG CITI CAPITAL LETTER VIYO
-118C0..118E9  ; valid                                  # 7.0  WARANG CITI SMALL LETTER NGAA..WARANG CITI DIGIT NINE
-118EA..118F2  ; valid                  ;      ; NV8    # 7.0  WARANG CITI NUMBER TEN..WARANG CITI NUMBER NINETY
-118F3..118FE  ; disallowed                             # NA   <reserved-118F3>..<reserved-118FE>
-118FF         ; valid                                  # 7.0  WARANG CITI OM
-11900..119FF  ; disallowed                             # NA   <reserved-11900>..<reserved-119FF>
-11A00..11A3E  ; valid                                  # 10.0 ZANABAZAR SQUARE LETTER A..ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA
-11A3F..11A46  ; valid                  ;      ; NV8    # 10.0 ZANABAZAR SQUARE INITIAL HEAD MARK..ZANABAZAR SQUARE CLOSING DOUBLE-LINED HEAD MARK
-11A47         ; valid                                  # 10.0 ZANABAZAR SQUARE SUBJOINER
-11A48..11A4F  ; disallowed                             # NA   <reserved-11A48>..<reserved-11A4F>
-11A50..11A83  ; valid                                  # 10.0 SOYOMBO LETTER A..SOYOMBO LETTER KSSA
-11A84..11A85  ; disallowed                             # NA   <reserved-11A84>..<reserved-11A85>
-11A86..11A99  ; valid                                  # 10.0 SOYOMBO CLUSTER-INITIAL LETTER RA..SOYOMBO SUBJOINER
-11A9A..11A9C  ; valid                  ;      ; NV8    # 10.0 SOYOMBO MARK TSHEG..SOYOMBO MARK DOUBLE SHAD
-11A9D         ; disallowed                             # NA   <reserved-11A9D>
-11A9E..11AA2  ; valid                  ;      ; NV8    # 10.0 SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME..SOYOMBO TERMINAL MARK-2
-11AA3..11ABF  ; disallowed                             # NA   <reserved-11AA3>..<reserved-11ABF>
-11AC0..11AF8  ; valid                                  # 7.0  PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL
-11AF9..11BFF  ; disallowed                             # NA   <reserved-11AF9>..<reserved-11BFF>
-11C00..11C08  ; valid                                  # 9.0  BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L
-11C09         ; disallowed                             # NA   <reserved-11C09>
-11C0A..11C36  ; valid                                  # 9.0  BHAIKSUKI LETTER E..BHAIKSUKI VOWEL SIGN VOCALIC L
-11C37         ; disallowed                             # NA   <reserved-11C37>
-11C38..11C40  ; valid                                  # 9.0  BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN AVAGRAHA
-11C41..11C45  ; valid                  ;      ; NV8    # 9.0  BHAIKSUKI DANDA..BHAIKSUKI GAP FILLER-2
-11C46..11C4F  ; disallowed                             # NA   <reserved-11C46>..<reserved-11C4F>
-11C50..11C59  ; valid                                  # 9.0  BHAIKSUKI DIGIT ZERO..BHAIKSUKI DIGIT NINE
-11C5A..11C6C  ; valid                  ;      ; NV8    # 9.0  BHAIKSUKI NUMBER ONE..BHAIKSUKI HUNDREDS UNIT MARK
-11C6D..11C6F  ; disallowed                             # NA   <reserved-11C6D>..<reserved-11C6F>
-11C70..11C71  ; valid                  ;      ; NV8    # 9.0  MARCHEN HEAD MARK..MARCHEN MARK SHAD
-11C72..11C8F  ; valid                                  # 9.0  MARCHEN LETTER KA..MARCHEN LETTER A
-11C90..11C91  ; disallowed                             # NA   <reserved-11C90>..<reserved-11C91>
-11C92..11CA7  ; valid                                  # 9.0  MARCHEN SUBJOINED LETTER KA..MARCHEN SUBJOINED LETTER ZA
-11CA8         ; disallowed                             # NA   <reserved-11CA8>
-11CA9..11CB6  ; valid                                  # 9.0  MARCHEN SUBJOINED LETTER YA..MARCHEN SIGN CANDRABINDU
-11CB7..11CFF  ; disallowed                             # NA   <reserved-11CB7>..<reserved-11CFF>
-11D00..11D06  ; valid                                  # 10.0 MASARAM GONDI LETTER A..MASARAM GONDI LETTER E
-11D07         ; disallowed                             # NA   <reserved-11D07>
-11D08..11D09  ; valid                                  # 10.0 MASARAM GONDI LETTER AI..MASARAM GONDI LETTER O
-11D0A         ; disallowed                             # NA   <reserved-11D0A>
-11D0B..11D36  ; valid                                  # 10.0 MASARAM GONDI LETTER AU..MASARAM GONDI VOWEL SIGN VOCALIC R
-11D37..11D39  ; disallowed                             # NA   <reserved-11D37>..<reserved-11D39>
-11D3A         ; valid                                  # 10.0 MASARAM GONDI VOWEL SIGN E
-11D3B         ; disallowed                             # NA   <reserved-11D3B>
-11D3C..11D3D  ; valid                                  # 10.0 MASARAM GONDI VOWEL SIGN AI..MASARAM GONDI VOWEL SIGN O
-11D3E         ; disallowed                             # NA   <reserved-11D3E>
-11D3F..11D47  ; valid                                  # 10.0 MASARAM GONDI VOWEL SIGN AU..MASARAM GONDI RA-KARA
-11D48..11D4F  ; disallowed                             # NA   <reserved-11D48>..<reserved-11D4F>
-11D50..11D59  ; valid                                  # 10.0 MASARAM GONDI DIGIT ZERO..MASARAM GONDI DIGIT NINE
-11D5A..11FFF  ; disallowed                             # NA   <reserved-11D5A>..<reserved-11FFF>
-12000..1236E  ; valid                                  # 5.0  CUNEIFORM SIGN A..CUNEIFORM SIGN ZUM
-1236F..12398  ; valid                                  # 7.0  CUNEIFORM SIGN KAP ELAMITE..CUNEIFORM SIGN UM TIMES ME
-12399         ; valid                                  # 8.0  CUNEIFORM SIGN U U
-1239A..123FF  ; disallowed                             # NA   <reserved-1239A>..<reserved-123FF>
-12400..12462  ; valid                  ;      ; NV8    # 5.0  CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER
-12463..1246E  ; valid                  ;      ; NV8    # 7.0  CUNEIFORM NUMERIC SIGN ONE QUARTER GUR..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM
-1246F         ; disallowed                             # NA   <reserved-1246F>
-12470..12473  ; valid                  ;      ; NV8    # 5.0  CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
-12474         ; valid                  ;      ; NV8    # 7.0  CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON
-12475..1247F  ; disallowed                             # NA   <reserved-12475>..<reserved-1247F>
-12480..12543  ; valid                                  # 8.0  CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU
-12544..12FFF  ; disallowed                             # NA   <reserved-12544>..<reserved-12FFF>
-13000..1342E  ; valid                                  # 5.2  EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032
-1342F..143FF  ; disallowed                             # NA   <reserved-1342F>..<reserved-143FF>
-14400..14646  ; valid                                  # 8.0  ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530
-14647..167FF  ; disallowed                             # NA   <reserved-14647>..<reserved-167FF>
-16800..16A38  ; valid                                  # 6.0  BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ
-16A39..16A3F  ; disallowed                             # NA   <reserved-16A39>..<reserved-16A3F>
-16A40..16A5E  ; valid                                  # 7.0  MRO LETTER TA..MRO LETTER TEK
-16A5F         ; disallowed                             # NA   <reserved-16A5F>
-16A60..16A69  ; valid                                  # 7.0  MRO DIGIT ZERO..MRO DIGIT NINE
-16A6A..16A6D  ; disallowed                             # NA   <reserved-16A6A>..<reserved-16A6D>
-16A6E..16A6F  ; valid                  ;      ; NV8    # 7.0  MRO DANDA..MRO DOUBLE DANDA
-16A70..16ACF  ; disallowed                             # NA   <reserved-16A70>..<reserved-16ACF>
-16AD0..16AED  ; valid                                  # 7.0  BASSA VAH LETTER ENNI..BASSA VAH LETTER I
-16AEE..16AEF  ; disallowed                             # NA   <reserved-16AEE>..<reserved-16AEF>
-16AF0..16AF4  ; valid                                  # 7.0  BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
-16AF5         ; valid                  ;      ; NV8    # 7.0  BASSA VAH FULL STOP
-16AF6..16AFF  ; disallowed                             # NA   <reserved-16AF6>..<reserved-16AFF>
-16B00..16B36  ; valid                                  # 7.0  PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG MARK CIM TAUM
-16B37..16B3F  ; valid                  ;      ; NV8    # 7.0  PAHAWH HMONG SIGN VOS THOM..PAHAWH HMONG SIGN XYEEM FAIB
-16B40..16B43  ; valid                                  # 7.0  PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM
-16B44..16B45  ; valid                  ;      ; NV8    # 7.0  PAHAWH HMONG SIGN XAUS..PAHAWH HMONG SIGN CIM TSOV ROG
-16B46..16B4F  ; disallowed                             # NA   <reserved-16B46>..<reserved-16B4F>
-16B50..16B59  ; valid                                  # 7.0  PAHAWH HMONG DIGIT ZERO..PAHAWH HMONG DIGIT NINE
-16B5A         ; disallowed                             # NA   <reserved-16B5A>
-16B5B..16B61  ; valid                  ;      ; NV8    # 7.0  PAHAWH HMONG NUMBER TENS..PAHAWH HMONG NUMBER TRILLIONS
-16B62         ; disallowed                             # NA   <reserved-16B62>
-16B63..16B77  ; valid                                  # 7.0  PAHAWH HMONG SIGN VOS LUB..PAHAWH HMONG SIGN CIM NRES TOS
-16B78..16B7C  ; disallowed                             # NA   <reserved-16B78>..<reserved-16B7C>
-16B7D..16B8F  ; valid                                  # 7.0  PAHAWH HMONG CLAN SIGN TSHEEJ..PAHAWH HMONG CLAN SIGN VWJ
-16B90..16EFF  ; disallowed                             # NA   <reserved-16B90>..<reserved-16EFF>
-16F00..16F44  ; valid                                  # 6.1  MIAO LETTER PA..MIAO LETTER HHA
-16F45..16F4F  ; disallowed                             # NA   <reserved-16F45>..<reserved-16F4F>
-16F50..16F7E  ; valid                                  # 6.1  MIAO LETTER NASALIZATION..MIAO VOWEL SIGN NG
-16F7F..16F8E  ; disallowed                             # NA   <reserved-16F7F>..<reserved-16F8E>
-16F8F..16F9F  ; valid                                  # 6.1  MIAO TONE RIGHT..MIAO LETTER REFORMED TONE-8
-16FA0..16FDF  ; disallowed                             # NA   <reserved-16FA0>..<reserved-16FDF>
-16FE0         ; valid                                  # 9.0  TANGUT ITERATION MARK
-16FE1         ; valid                                  # 10.0 NUSHU ITERATION MARK
-16FE2..16FFF  ; disallowed                             # NA   <reserved-16FE2>..<reserved-16FFF>
-17000..187EC  ; valid                                  # 9.0  TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187EC
-187ED..187FF  ; disallowed                             # NA   <reserved-187ED>..<reserved-187FF>
-18800..18AF2  ; valid                                  # 9.0  TANGUT COMPONENT-001..TANGUT COMPONENT-755
-18AF3..1AFFF  ; disallowed                             # NA   <reserved-18AF3>..<reserved-1AFFF>
-1B000..1B001  ; valid                                  # 6.0  KATAKANA LETTER ARCHAIC E..HIRAGANA LETTER ARCHAIC YE
-1B002..1B11E  ; valid                                  # 10.0 HENTAIGANA LETTER A-1..HENTAIGANA LETTER N-MU-MO-2
-1B11F..1B16F  ; disallowed                             # NA   <reserved-1B11F>..<reserved-1B16F>
-1B170..1B2FB  ; valid                                  # 10.0 NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB
-1B2FC..1BBFF  ; disallowed                             # NA   <reserved-1B2FC>..<reserved-1BBFF>
-1BC00..1BC6A  ; valid                                  # 7.0  DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M
-1BC6B..1BC6F  ; disallowed                             # NA   <reserved-1BC6B>..<reserved-1BC6F>
-1BC70..1BC7C  ; valid                                  # 7.0  DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK
-1BC7D..1BC7F  ; disallowed                             # NA   <reserved-1BC7D>..<reserved-1BC7F>
-1BC80..1BC88  ; valid                                  # 7.0  DUPLOYAN AFFIX HIGH ACUTE..DUPLOYAN AFFIX HIGH VERTICAL
-1BC89..1BC8F  ; disallowed                             # NA   <reserved-1BC89>..<reserved-1BC8F>
-1BC90..1BC99  ; valid                                  # 7.0  DUPLOYAN AFFIX LOW ACUTE..DUPLOYAN AFFIX LOW ARROW
-1BC9A..1BC9B  ; disallowed                             # NA   <reserved-1BC9A>..<reserved-1BC9B>
-1BC9C         ; valid                  ;      ; NV8    # 7.0  DUPLOYAN SIGN O WITH CROSS
-1BC9D..1BC9E  ; valid                                  # 7.0  DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK
-1BC9F         ; valid                  ;      ; NV8    # 7.0  DUPLOYAN PUNCTUATION CHINOOK FULL STOP
-1BCA0..1BCA3  ; ignored                                # 7.0  SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP
-1BCA4..1CFFF  ; disallowed                             # NA   <reserved-1BCA4>..<reserved-1CFFF>
-1D000..1D0F5  ; valid                  ;      ; NV8    # 3.1  BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO
-1D0F6..1D0FF  ; disallowed                             # NA   <reserved-1D0F6>..<reserved-1D0FF>
-1D100..1D126  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2
-1D127..1D128  ; disallowed                             # NA   <reserved-1D127>..<reserved-1D128>
-1D129         ; valid                  ;      ; NV8    # 5.1  MUSICAL SYMBOL MULTIPLE MEASURE REST
-1D12A..1D15D  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL DOUBLE SHARP..MUSICAL SYMBOL WHOLE NOTE
-1D15E         ; mapped                 ; 1D157 1D165   # 3.1  MUSICAL SYMBOL HALF NOTE
-1D15F         ; mapped                 ; 1D158 1D165   # 3.1  MUSICAL SYMBOL QUARTER NOTE
-1D160         ; mapped                 ; 1D158 1D165 1D16E #3.1 MUSICAL SYMBOL EIGHTH NOTE
-1D161         ; mapped                 ; 1D158 1D165 1D16F #3.1 MUSICAL SYMBOL SIXTEENTH NOTE
-1D162         ; mapped                 ; 1D158 1D165 1D170 #3.1 MUSICAL SYMBOL THIRTY-SECOND NOTE
-1D163         ; mapped                 ; 1D158 1D165 1D171 #3.1 MUSICAL SYMBOL SIXTY-FOURTH NOTE
-1D164         ; mapped                 ; 1D158 1D165 1D172 #3.1 MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
-1D165..1D172  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING FLAG-5
-1D173..1D17A  ; disallowed                             # 3.1  MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE
-1D17B..1D1BA  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL SEMIBREVIS BLACK
-1D1BB         ; mapped                 ; 1D1B9 1D165   # 3.1  MUSICAL SYMBOL MINIMA
-1D1BC         ; mapped                 ; 1D1BA 1D165   # 3.1  MUSICAL SYMBOL MINIMA BLACK
-1D1BD         ; mapped                 ; 1D1B9 1D165 1D16E #3.1 MUSICAL SYMBOL SEMIMINIMA WHITE
-1D1BE         ; mapped                 ; 1D1BA 1D165 1D16E #3.1 MUSICAL SYMBOL SEMIMINIMA BLACK
-1D1BF         ; mapped                 ; 1D1B9 1D165 1D16F #3.1 MUSICAL SYMBOL FUSA WHITE
-1D1C0         ; mapped                 ; 1D1BA 1D165 1D16F #3.1 MUSICAL SYMBOL FUSA BLACK
-1D1C1..1D1DD  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL LONGA PERFECTA REST..MUSICAL SYMBOL PES SUBPUNCTIS
-1D1DE..1D1E8  ; valid                  ;      ; NV8    # 8.0  MUSICAL SYMBOL KIEVAN C CLEF..MUSICAL SYMBOL KIEVAN FLAT SIGN
-1D1E9..1D1FF  ; disallowed                             # NA   <reserved-1D1E9>..<reserved-1D1FF>
-1D200..1D245  ; valid                  ;      ; NV8    # 4.1  GREEK VOCAL NOTATION SYMBOL-1..GREEK MUSICAL LEIMMA
-1D246..1D2FF  ; disallowed                             # NA   <reserved-1D246>..<reserved-1D2FF>
-1D300..1D356  ; valid                  ;      ; NV8    # 4.0  MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING
-1D357..1D35F  ; disallowed                             # NA   <reserved-1D357>..<reserved-1D35F>
-1D360..1D371  ; valid                  ;      ; NV8    # 5.0  COUNTING ROD UNIT DIGIT ONE..COUNTING ROD TENS DIGIT NINE
-1D372..1D3FF  ; disallowed                             # NA   <reserved-1D372>..<reserved-1D3FF>
-1D400         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD CAPITAL A
-1D401         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD CAPITAL B
-1D402         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD CAPITAL C
-1D403         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD CAPITAL D
-1D404         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD CAPITAL E
-1D405         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD CAPITAL F
-1D406         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD CAPITAL G
-1D407         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD CAPITAL H
-1D408         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD CAPITAL I
-1D409         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD CAPITAL J
-1D40A         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD CAPITAL K
-1D40B         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD CAPITAL L
-1D40C         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD CAPITAL M
-1D40D         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD CAPITAL N
-1D40E         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD CAPITAL O
-1D40F         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD CAPITAL P
-1D410         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD CAPITAL Q
-1D411         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD CAPITAL R
-1D412         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD CAPITAL S
-1D413         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD CAPITAL T
-1D414         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD CAPITAL U
-1D415         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD CAPITAL V
-1D416         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD CAPITAL W
-1D417         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD CAPITAL X
-1D418         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD CAPITAL Y
-1D419         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD CAPITAL Z
-1D41A         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD SMALL A
-1D41B         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD SMALL B
-1D41C         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD SMALL C
-1D41D         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD SMALL D
-1D41E         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD SMALL E
-1D41F         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD SMALL F
-1D420         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD SMALL G
-1D421         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD SMALL H
-1D422         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD SMALL I
-1D423         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD SMALL J
-1D424         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD SMALL K
-1D425         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD SMALL L
-1D426         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD SMALL M
-1D427         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD SMALL N
-1D428         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD SMALL O
-1D429         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD SMALL P
-1D42A         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD SMALL Q
-1D42B         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD SMALL R
-1D42C         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD SMALL S
-1D42D         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD SMALL T
-1D42E         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD SMALL U
-1D42F         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD SMALL V
-1D430         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD SMALL W
-1D431         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD SMALL X
-1D432         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD SMALL Y
-1D433         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD SMALL Z
-1D434         ; mapped                 ; 0061          # 3.1  MATHEMATICAL ITALIC CAPITAL A
-1D435         ; mapped                 ; 0062          # 3.1  MATHEMATICAL ITALIC CAPITAL B
-1D436         ; mapped                 ; 0063          # 3.1  MATHEMATICAL ITALIC CAPITAL C
-1D437         ; mapped                 ; 0064          # 3.1  MATHEMATICAL ITALIC CAPITAL D
-1D438         ; mapped                 ; 0065          # 3.1  MATHEMATICAL ITALIC CAPITAL E
-1D439         ; mapped                 ; 0066          # 3.1  MATHEMATICAL ITALIC CAPITAL F
-1D43A         ; mapped                 ; 0067          # 3.1  MATHEMATICAL ITALIC CAPITAL G
-1D43B         ; mapped                 ; 0068          # 3.1  MATHEMATICAL ITALIC CAPITAL H
-1D43C         ; mapped                 ; 0069          # 3.1  MATHEMATICAL ITALIC CAPITAL I
-1D43D         ; mapped                 ; 006A          # 3.1  MATHEMATICAL ITALIC CAPITAL J
-1D43E         ; mapped                 ; 006B          # 3.1  MATHEMATICAL ITALIC CAPITAL K
-1D43F         ; mapped                 ; 006C          # 3.1  MATHEMATICAL ITALIC CAPITAL L
-1D440         ; mapped                 ; 006D          # 3.1  MATHEMATICAL ITALIC CAPITAL M
-1D441         ; mapped                 ; 006E          # 3.1  MATHEMATICAL ITALIC CAPITAL N
-1D442         ; mapped                 ; 006F          # 3.1  MATHEMATICAL ITALIC CAPITAL O
-1D443         ; mapped                 ; 0070          # 3.1  MATHEMATICAL ITALIC CAPITAL P
-1D444         ; mapped                 ; 0071          # 3.1  MATHEMATICAL ITALIC CAPITAL Q
-1D445         ; mapped                 ; 0072          # 3.1  MATHEMATICAL ITALIC CAPITAL R
-1D446         ; mapped                 ; 0073          # 3.1  MATHEMATICAL ITALIC CAPITAL S
-1D447         ; mapped                 ; 0074          # 3.1  MATHEMATICAL ITALIC CAPITAL T
-1D448         ; mapped                 ; 0075          # 3.1  MATHEMATICAL ITALIC CAPITAL U
-1D449         ; mapped                 ; 0076          # 3.1  MATHEMATICAL ITALIC CAPITAL V
-1D44A         ; mapped                 ; 0077          # 3.1  MATHEMATICAL ITALIC CAPITAL W
-1D44B         ; mapped                 ; 0078          # 3.1  MATHEMATICAL ITALIC CAPITAL X
-1D44C         ; mapped                 ; 0079          # 3.1  MATHEMATICAL ITALIC CAPITAL Y
-1D44D         ; mapped                 ; 007A          # 3.1  MATHEMATICAL ITALIC CAPITAL Z
-1D44E         ; mapped                 ; 0061          # 3.1  MATHEMATICAL ITALIC SMALL A
-1D44F         ; mapped                 ; 0062          # 3.1  MATHEMATICAL ITALIC SMALL B
-1D450         ; mapped                 ; 0063          # 3.1  MATHEMATICAL ITALIC SMALL C
-1D451         ; mapped                 ; 0064          # 3.1  MATHEMATICAL ITALIC SMALL D
-1D452         ; mapped                 ; 0065          # 3.1  MATHEMATICAL ITALIC SMALL E
-1D453         ; mapped                 ; 0066          # 3.1  MATHEMATICAL ITALIC SMALL F
-1D454         ; mapped                 ; 0067          # 3.1  MATHEMATICAL ITALIC SMALL G
-1D455         ; disallowed                             # NA   <reserved-1D455>
-1D456         ; mapped                 ; 0069          # 3.1  MATHEMATICAL ITALIC SMALL I
-1D457         ; mapped                 ; 006A          # 3.1  MATHEMATICAL ITALIC SMALL J
-1D458         ; mapped                 ; 006B          # 3.1  MATHEMATICAL ITALIC SMALL K
-1D459         ; mapped                 ; 006C          # 3.1  MATHEMATICAL ITALIC SMALL L
-1D45A         ; mapped                 ; 006D          # 3.1  MATHEMATICAL ITALIC SMALL M
-1D45B         ; mapped                 ; 006E          # 3.1  MATHEMATICAL ITALIC SMALL N
-1D45C         ; mapped                 ; 006F          # 3.1  MATHEMATICAL ITALIC SMALL O
-1D45D         ; mapped                 ; 0070          # 3.1  MATHEMATICAL ITALIC SMALL P
-1D45E         ; mapped                 ; 0071          # 3.1  MATHEMATICAL ITALIC SMALL Q
-1D45F         ; mapped                 ; 0072          # 3.1  MATHEMATICAL ITALIC SMALL R
-1D460         ; mapped                 ; 0073          # 3.1  MATHEMATICAL ITALIC SMALL S
-1D461         ; mapped                 ; 0074          # 3.1  MATHEMATICAL ITALIC SMALL T
-1D462         ; mapped                 ; 0075          # 3.1  MATHEMATICAL ITALIC SMALL U
-1D463         ; mapped                 ; 0076          # 3.1  MATHEMATICAL ITALIC SMALL V
-1D464         ; mapped                 ; 0077          # 3.1  MATHEMATICAL ITALIC SMALL W
-1D465         ; mapped                 ; 0078          # 3.1  MATHEMATICAL ITALIC SMALL X
-1D466         ; mapped                 ; 0079          # 3.1  MATHEMATICAL ITALIC SMALL Y
-1D467         ; mapped                 ; 007A          # 3.1  MATHEMATICAL ITALIC SMALL Z
-1D468         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL A
-1D469         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL B
-1D46A         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL C
-1D46B         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL D
-1D46C         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL E
-1D46D         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL F
-1D46E         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL G
-1D46F         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL H
-1D470         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL I
-1D471         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL J
-1D472         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL K
-1D473         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL L
-1D474         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL M
-1D475         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL N
-1D476         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL O
-1D477         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL P
-1D478         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL Q
-1D479         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL R
-1D47A         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL S
-1D47B         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL T
-1D47C         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL U
-1D47D         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL V
-1D47E         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL W
-1D47F         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL X
-1D480         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL Y
-1D481         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL Z
-1D482         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD ITALIC SMALL A
-1D483         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD ITALIC SMALL B
-1D484         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD ITALIC SMALL C
-1D485         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD ITALIC SMALL D
-1D486         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD ITALIC SMALL E
-1D487         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD ITALIC SMALL F
-1D488         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD ITALIC SMALL G
-1D489         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD ITALIC SMALL H
-1D48A         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD ITALIC SMALL I
-1D48B         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD ITALIC SMALL J
-1D48C         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD ITALIC SMALL K
-1D48D         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD ITALIC SMALL L
-1D48E         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD ITALIC SMALL M
-1D48F         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD ITALIC SMALL N
-1D490         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD ITALIC SMALL O
-1D491         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD ITALIC SMALL P
-1D492         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD ITALIC SMALL Q
-1D493         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD ITALIC SMALL R
-1D494         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD ITALIC SMALL S
-1D495         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD ITALIC SMALL T
-1D496         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD ITALIC SMALL U
-1D497         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD ITALIC SMALL V
-1D498         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD ITALIC SMALL W
-1D499         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD ITALIC SMALL X
-1D49A         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD ITALIC SMALL Y
-1D49B         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD ITALIC SMALL Z
-1D49C         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SCRIPT CAPITAL A
-1D49D         ; disallowed                             # NA   <reserved-1D49D>
-1D49E         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SCRIPT CAPITAL C
-1D49F         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SCRIPT CAPITAL D
-1D4A0..1D4A1  ; disallowed                             # NA   <reserved-1D4A0>..<reserved-1D4A1>
-1D4A2         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SCRIPT CAPITAL G
-1D4A3..1D4A4  ; disallowed                             # NA   <reserved-1D4A3>..<reserved-1D4A4>
-1D4A5         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SCRIPT CAPITAL J
-1D4A6         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SCRIPT CAPITAL K
-1D4A7..1D4A8  ; disallowed                             # NA   <reserved-1D4A7>..<reserved-1D4A8>
-1D4A9         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SCRIPT CAPITAL N
-1D4AA         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SCRIPT CAPITAL O
-1D4AB         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SCRIPT CAPITAL P
-1D4AC         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SCRIPT CAPITAL Q
-1D4AD         ; disallowed                             # NA   <reserved-1D4AD>
-1D4AE         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SCRIPT CAPITAL S
-1D4AF         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SCRIPT CAPITAL T
-1D4B0         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SCRIPT CAPITAL U
-1D4B1         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SCRIPT CAPITAL V
-1D4B2         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SCRIPT CAPITAL W
-1D4B3         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SCRIPT CAPITAL X
-1D4B4         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SCRIPT CAPITAL Y
-1D4B5         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SCRIPT CAPITAL Z
-1D4B6         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SCRIPT SMALL A
-1D4B7         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SCRIPT SMALL B
-1D4B8         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SCRIPT SMALL C
-1D4B9         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SCRIPT SMALL D
-1D4BA         ; disallowed                             # NA   <reserved-1D4BA>
-1D4BB         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SCRIPT SMALL F
-1D4BC         ; disallowed                             # NA   <reserved-1D4BC>
-1D4BD         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SCRIPT SMALL H
-1D4BE         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SCRIPT SMALL I
-1D4BF         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SCRIPT SMALL J
-1D4C0         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SCRIPT SMALL K
-1D4C1         ; mapped                 ; 006C          # 4.0  MATHEMATICAL SCRIPT SMALL L
-1D4C2         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SCRIPT SMALL M
-1D4C3         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SCRIPT SMALL N
-1D4C4         ; disallowed                             # NA   <reserved-1D4C4>
-1D4C5         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SCRIPT SMALL P
-1D4C6         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SCRIPT SMALL Q
-1D4C7         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SCRIPT SMALL R
-1D4C8         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SCRIPT SMALL S
-1D4C9         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SCRIPT SMALL T
-1D4CA         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SCRIPT SMALL U
-1D4CB         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SCRIPT SMALL V
-1D4CC         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SCRIPT SMALL W
-1D4CD         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SCRIPT SMALL X
-1D4CE         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SCRIPT SMALL Y
-1D4CF         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SCRIPT SMALL Z
-1D4D0         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL A
-1D4D1         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL B
-1D4D2         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL C
-1D4D3         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL D
-1D4D4         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL E
-1D4D5         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL F
-1D4D6         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL G
-1D4D7         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL H
-1D4D8         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL I
-1D4D9         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL J
-1D4DA         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL K
-1D4DB         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL L
-1D4DC         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL M
-1D4DD         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL N
-1D4DE         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL O
-1D4DF         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL P
-1D4E0         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL Q
-1D4E1         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL R
-1D4E2         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL S
-1D4E3         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL T
-1D4E4         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL U
-1D4E5         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL V
-1D4E6         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL W
-1D4E7         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL X
-1D4E8         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL Y
-1D4E9         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL Z
-1D4EA         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL A
-1D4EB         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL B
-1D4EC         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL C
-1D4ED         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL D
-1D4EE         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL E
-1D4EF         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL F
-1D4F0         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL G
-1D4F1         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL H
-1D4F2         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL I
-1D4F3         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL J
-1D4F4         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL K
-1D4F5         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL L
-1D4F6         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL M
-1D4F7         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL N
-1D4F8         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL O
-1D4F9         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL P
-1D4FA         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL Q
-1D4FB         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL R
-1D4FC         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL S
-1D4FD         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL T
-1D4FE         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL U
-1D4FF         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL V
-1D500         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL W
-1D501         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL X
-1D502         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL Y
-1D503         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL Z
-1D504         ; mapped                 ; 0061          # 3.1  MATHEMATICAL FRAKTUR CAPITAL A
-1D505         ; mapped                 ; 0062          # 3.1  MATHEMATICAL FRAKTUR CAPITAL B
-1D506         ; disallowed                             # NA   <reserved-1D506>
-1D507         ; mapped                 ; 0064          # 3.1  MATHEMATICAL FRAKTUR CAPITAL D
-1D508         ; mapped                 ; 0065          # 3.1  MATHEMATICAL FRAKTUR CAPITAL E
-1D509         ; mapped                 ; 0066          # 3.1  MATHEMATICAL FRAKTUR CAPITAL F
-1D50A         ; mapped                 ; 0067          # 3.1  MATHEMATICAL FRAKTUR CAPITAL G
-1D50B..1D50C  ; disallowed                             # NA   <reserved-1D50B>..<reserved-1D50C>
-1D50D         ; mapped                 ; 006A          # 3.1  MATHEMATICAL FRAKTUR CAPITAL J
-1D50E         ; mapped                 ; 006B          # 3.1  MATHEMATICAL FRAKTUR CAPITAL K
-1D50F         ; mapped                 ; 006C          # 3.1  MATHEMATICAL FRAKTUR CAPITAL L
-1D510         ; mapped                 ; 006D          # 3.1  MATHEMATICAL FRAKTUR CAPITAL M
-1D511         ; mapped                 ; 006E          # 3.1  MATHEMATICAL FRAKTUR CAPITAL N
-1D512         ; mapped                 ; 006F          # 3.1  MATHEMATICAL FRAKTUR CAPITAL O
-1D513         ; mapped                 ; 0070          # 3.1  MATHEMATICAL FRAKTUR CAPITAL P
-1D514         ; mapped                 ; 0071          # 3.1  MATHEMATICAL FRAKTUR CAPITAL Q
-1D515         ; disallowed                             # NA   <reserved-1D515>
-1D516         ; mapped                 ; 0073          # 3.1  MATHEMATICAL FRAKTUR CAPITAL S
-1D517         ; mapped                 ; 0074          # 3.1  MATHEMATICAL FRAKTUR CAPITAL T
-1D518         ; mapped                 ; 0075          # 3.1  MATHEMATICAL FRAKTUR CAPITAL U
-1D519         ; mapped                 ; 0076          # 3.1  MATHEMATICAL FRAKTUR CAPITAL V
-1D51A         ; mapped                 ; 0077          # 3.1  MATHEMATICAL FRAKTUR CAPITAL W
-1D51B         ; mapped                 ; 0078          # 3.1  MATHEMATICAL FRAKTUR CAPITAL X
-1D51C         ; mapped                 ; 0079          # 3.1  MATHEMATICAL FRAKTUR CAPITAL Y
-1D51D         ; disallowed                             # NA   <reserved-1D51D>
-1D51E         ; mapped                 ; 0061          # 3.1  MATHEMATICAL FRAKTUR SMALL A
-1D51F         ; mapped                 ; 0062          # 3.1  MATHEMATICAL FRAKTUR SMALL B
-1D520         ; mapped                 ; 0063          # 3.1  MATHEMATICAL FRAKTUR SMALL C
-1D521         ; mapped                 ; 0064          # 3.1  MATHEMATICAL FRAKTUR SMALL D
-1D522         ; mapped                 ; 0065          # 3.1  MATHEMATICAL FRAKTUR SMALL E
-1D523         ; mapped                 ; 0066          # 3.1  MATHEMATICAL FRAKTUR SMALL F
-1D524         ; mapped                 ; 0067          # 3.1  MATHEMATICAL FRAKTUR SMALL G
-1D525         ; mapped                 ; 0068          # 3.1  MATHEMATICAL FRAKTUR SMALL H
-1D526         ; mapped                 ; 0069          # 3.1  MATHEMATICAL FRAKTUR SMALL I
-1D527         ; mapped                 ; 006A          # 3.1  MATHEMATICAL FRAKTUR SMALL J
-1D528         ; mapped                 ; 006B          # 3.1  MATHEMATICAL FRAKTUR SMALL K
-1D529         ; mapped                 ; 006C          # 3.1  MATHEMATICAL FRAKTUR SMALL L
-1D52A         ; mapped                 ; 006D          # 3.1  MATHEMATICAL FRAKTUR SMALL M
-1D52B         ; mapped                 ; 006E          # 3.1  MATHEMATICAL FRAKTUR SMALL N
-1D52C         ; mapped                 ; 006F          # 3.1  MATHEMATICAL FRAKTUR SMALL O
-1D52D         ; mapped                 ; 0070          # 3.1  MATHEMATICAL FRAKTUR SMALL P
-1D52E         ; mapped                 ; 0071          # 3.1  MATHEMATICAL FRAKTUR SMALL Q
-1D52F         ; mapped                 ; 0072          # 3.1  MATHEMATICAL FRAKTUR SMALL R
-1D530         ; mapped                 ; 0073          # 3.1  MATHEMATICAL FRAKTUR SMALL S
-1D531         ; mapped                 ; 0074          # 3.1  MATHEMATICAL FRAKTUR SMALL T
-1D532         ; mapped                 ; 0075          # 3.1  MATHEMATICAL FRAKTUR SMALL U
-1D533         ; mapped                 ; 0076          # 3.1  MATHEMATICAL FRAKTUR SMALL V
-1D534         ; mapped                 ; 0077          # 3.1  MATHEMATICAL FRAKTUR SMALL W
-1D535         ; mapped                 ; 0078          # 3.1  MATHEMATICAL FRAKTUR SMALL X
-1D536         ; mapped                 ; 0079          # 3.1  MATHEMATICAL FRAKTUR SMALL Y
-1D537         ; mapped                 ; 007A          # 3.1  MATHEMATICAL FRAKTUR SMALL Z
-1D538         ; mapped                 ; 0061          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL A
-1D539         ; mapped                 ; 0062          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL B
-1D53A         ; disallowed                             # NA   <reserved-1D53A>
-1D53B         ; mapped                 ; 0064          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL D
-1D53C         ; mapped                 ; 0065          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL E
-1D53D         ; mapped                 ; 0066          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL F
-1D53E         ; mapped                 ; 0067          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL G
-1D53F         ; disallowed                             # NA   <reserved-1D53F>
-1D540         ; mapped                 ; 0069          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL I
-1D541         ; mapped                 ; 006A          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL J
-1D542         ; mapped                 ; 006B          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL K
-1D543         ; mapped                 ; 006C          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL L
-1D544         ; mapped                 ; 006D          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL M
-1D545         ; disallowed                             # NA   <reserved-1D545>
-1D546         ; mapped                 ; 006F          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL O
-1D547..1D549  ; disallowed                             # NA   <reserved-1D547>..<reserved-1D549>
-1D54A         ; mapped                 ; 0073          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL S
-1D54B         ; mapped                 ; 0074          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL T
-1D54C         ; mapped                 ; 0075          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL U
-1D54D         ; mapped                 ; 0076          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL V
-1D54E         ; mapped                 ; 0077          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL W
-1D54F         ; mapped                 ; 0078          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL X
-1D550         ; mapped                 ; 0079          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL Y
-1D551         ; disallowed                             # NA   <reserved-1D551>
-1D552         ; mapped                 ; 0061          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL A
-1D553         ; mapped                 ; 0062          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL B
-1D554         ; mapped                 ; 0063          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL C
-1D555         ; mapped                 ; 0064          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL D
-1D556         ; mapped                 ; 0065          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL E
-1D557         ; mapped                 ; 0066          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL F
-1D558         ; mapped                 ; 0067          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL G
-1D559         ; mapped                 ; 0068          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL H
-1D55A         ; mapped                 ; 0069          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL I
-1D55B         ; mapped                 ; 006A          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL J
-1D55C         ; mapped                 ; 006B          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL K
-1D55D         ; mapped                 ; 006C          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL L
-1D55E         ; mapped                 ; 006D          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL M
-1D55F         ; mapped                 ; 006E          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL N
-1D560         ; mapped                 ; 006F          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL O
-1D561         ; mapped                 ; 0070          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL P
-1D562         ; mapped                 ; 0071          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL Q
-1D563         ; mapped                 ; 0072          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL R
-1D564         ; mapped                 ; 0073          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL S
-1D565         ; mapped                 ; 0074          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL T
-1D566         ; mapped                 ; 0075          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL U
-1D567         ; mapped                 ; 0076          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL V
-1D568         ; mapped                 ; 0077          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL W
-1D569         ; mapped                 ; 0078          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL X
-1D56A         ; mapped                 ; 0079          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL Y
-1D56B         ; mapped                 ; 007A          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL Z
-1D56C         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL A
-1D56D         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL B
-1D56E         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL C
-1D56F         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL D
-1D570         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL E
-1D571         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL F
-1D572         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL G
-1D573         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL H
-1D574         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL I
-1D575         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL J
-1D576         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL K
-1D577         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL L
-1D578         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL M
-1D579         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL N
-1D57A         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL O
-1D57B         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL P
-1D57C         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL Q
-1D57D         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL R
-1D57E         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL S
-1D57F         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL T
-1D580         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL U
-1D581         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL V
-1D582         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL W
-1D583         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL X
-1D584         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL Y
-1D585         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL Z
-1D586         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL A
-1D587         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL B
-1D588         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL C
-1D589         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL D
-1D58A         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL E
-1D58B         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL F
-1D58C         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL G
-1D58D         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL H
-1D58E         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL I
-1D58F         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL J
-1D590         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL K
-1D591         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL L
-1D592         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL M
-1D593         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL N
-1D594         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL O
-1D595         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL P
-1D596         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL Q
-1D597         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL R
-1D598         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL S
-1D599         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL T
-1D59A         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL U
-1D59B         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL V
-1D59C         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL W
-1D59D         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL X
-1D59E         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL Y
-1D59F         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL Z
-1D5A0         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL A
-1D5A1         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL B
-1D5A2         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL C
-1D5A3         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL D
-1D5A4         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL E
-1D5A5         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL F
-1D5A6         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL G
-1D5A7         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL H
-1D5A8         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL I
-1D5A9         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL J
-1D5AA         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL K
-1D5AB         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL L
-1D5AC         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL M
-1D5AD         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL N
-1D5AE         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL O
-1D5AF         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL P
-1D5B0         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL Q
-1D5B1         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL R
-1D5B2         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL S
-1D5B3         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL T
-1D5B4         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL U
-1D5B5         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL V
-1D5B6         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL W
-1D5B7         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL X
-1D5B8         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL Y
-1D5B9         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL Z
-1D5BA         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF SMALL A
-1D5BB         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF SMALL B
-1D5BC         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF SMALL C
-1D5BD         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF SMALL D
-1D5BE         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF SMALL E
-1D5BF         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF SMALL F
-1D5C0         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF SMALL G
-1D5C1         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF SMALL H
-1D5C2         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF SMALL I
-1D5C3         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF SMALL J
-1D5C4         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF SMALL K
-1D5C5         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF SMALL L
-1D5C6         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF SMALL M
-1D5C7         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF SMALL N
-1D5C8         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF SMALL O
-1D5C9         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF SMALL P
-1D5CA         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF SMALL Q
-1D5CB         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF SMALL R
-1D5CC         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF SMALL S
-1D5CD         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF SMALL T
-1D5CE         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF SMALL U
-1D5CF         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF SMALL V
-1D5D0         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF SMALL W
-1D5D1         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF SMALL X
-1D5D2         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF SMALL Y
-1D5D3         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF SMALL Z
-1D5D4         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL A
-1D5D5         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL B
-1D5D6         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL C
-1D5D7         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL D
-1D5D8         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL E
-1D5D9         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL F
-1D5DA         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL G
-1D5DB         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL H
-1D5DC         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL I
-1D5DD         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL J
-1D5DE         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL K
-1D5DF         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL L
-1D5E0         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL M
-1D5E1         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL N
-1D5E2         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL O
-1D5E3         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL P
-1D5E4         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL Q
-1D5E5         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL R
-1D5E6         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL S
-1D5E7         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL T
-1D5E8         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL U
-1D5E9         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL V
-1D5EA         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL W
-1D5EB         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL X
-1D5EC         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL Y
-1D5ED         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL Z
-1D5EE         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL A
-1D5EF         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL B
-1D5F0         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL C
-1D5F1         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL D
-1D5F2         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL E
-1D5F3         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL F
-1D5F4         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL G
-1D5F5         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL H
-1D5F6         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL I
-1D5F7         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL J
-1D5F8         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL K
-1D5F9         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL L
-1D5FA         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL M
-1D5FB         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL N
-1D5FC         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL O
-1D5FD         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL P
-1D5FE         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL Q
-1D5FF         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL R
-1D600         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL S
-1D601         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL T
-1D602         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL U
-1D603         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL V
-1D604         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL W
-1D605         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL X
-1D606         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL Y
-1D607         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL Z
-1D608         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL A
-1D609         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL B
-1D60A         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL C
-1D60B         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL D
-1D60C         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL E
-1D60D         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL F
-1D60E         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL G
-1D60F         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL H
-1D610         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL I
-1D611         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL J
-1D612         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL K
-1D613         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL L
-1D614         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL M
-1D615         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL N
-1D616         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL O
-1D617         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL P
-1D618         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q
-1D619         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL R
-1D61A         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL S
-1D61B         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL T
-1D61C         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL U
-1D61D         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL V
-1D61E         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL W
-1D61F         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL X
-1D620         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y
-1D621         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z
-1D622         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL A
-1D623         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL B
-1D624         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL C
-1D625         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL D
-1D626         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL E
-1D627         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL F
-1D628         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL G
-1D629         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL H
-1D62A         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL I
-1D62B         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL J
-1D62C         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL K
-1D62D         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL L
-1D62E         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL M
-1D62F         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL N
-1D630         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL O
-1D631         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL P
-1D632         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL Q
-1D633         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL R
-1D634         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL S
-1D635         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL T
-1D636         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL U
-1D637         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL V
-1D638         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL W
-1D639         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL X
-1D63A         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL Y
-1D63B         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL Z
-1D63C         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A
-1D63D         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B
-1D63E         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C
-1D63F         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D
-1D640         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E
-1D641         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F
-1D642         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G
-1D643         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H
-1D644         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I
-1D645         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J
-1D646         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K
-1D647         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L
-1D648         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M
-1D649         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N
-1D64A         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O
-1D64B         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P
-1D64C         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q
-1D64D         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R
-1D64E         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S
-1D64F         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T
-1D650         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U
-1D651         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V
-1D652         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W
-1D653         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X
-1D654         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y
-1D655         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z
-1D656         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A
-1D657         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B
-1D658         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C
-1D659         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D
-1D65A         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E
-1D65B         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F
-1D65C         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G
-1D65D         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H
-1D65E         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I
-1D65F         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J
-1D660         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K
-1D661         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L
-1D662         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M
-1D663         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N
-1D664         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O
-1D665         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P
-1D666         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q
-1D667         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R
-1D668         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S
-1D669         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T
-1D66A         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U
-1D66B         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V
-1D66C         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W
-1D66D         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X
-1D66E         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y
-1D66F         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z
-1D670         ; mapped                 ; 0061          # 3.1  MATHEMATICAL MONOSPACE CAPITAL A
-1D671         ; mapped                 ; 0062          # 3.1  MATHEMATICAL MONOSPACE CAPITAL B
-1D672         ; mapped                 ; 0063          # 3.1  MATHEMATICAL MONOSPACE CAPITAL C
-1D673         ; mapped                 ; 0064          # 3.1  MATHEMATICAL MONOSPACE CAPITAL D
-1D674         ; mapped                 ; 0065          # 3.1  MATHEMATICAL MONOSPACE CAPITAL E
-1D675         ; mapped                 ; 0066          # 3.1  MATHEMATICAL MONOSPACE CAPITAL F
-1D676         ; mapped                 ; 0067          # 3.1  MATHEMATICAL MONOSPACE CAPITAL G
-1D677         ; mapped                 ; 0068          # 3.1  MATHEMATICAL MONOSPACE CAPITAL H
-1D678         ; mapped                 ; 0069          # 3.1  MATHEMATICAL MONOSPACE CAPITAL I
-1D679         ; mapped                 ; 006A          # 3.1  MATHEMATICAL MONOSPACE CAPITAL J
-1D67A         ; mapped                 ; 006B          # 3.1  MATHEMATICAL MONOSPACE CAPITAL K
-1D67B         ; mapped                 ; 006C          # 3.1  MATHEMATICAL MONOSPACE CAPITAL L
-1D67C         ; mapped                 ; 006D          # 3.1  MATHEMATICAL MONOSPACE CAPITAL M
-1D67D         ; mapped                 ; 006E          # 3.1  MATHEMATICAL MONOSPACE CAPITAL N
-1D67E         ; mapped                 ; 006F          # 3.1  MATHEMATICAL MONOSPACE CAPITAL O
-1D67F         ; mapped                 ; 0070          # 3.1  MATHEMATICAL MONOSPACE CAPITAL P
-1D680         ; mapped                 ; 0071          # 3.1  MATHEMATICAL MONOSPACE CAPITAL Q
-1D681         ; mapped                 ; 0072          # 3.1  MATHEMATICAL MONOSPACE CAPITAL R
-1D682         ; mapped                 ; 0073          # 3.1  MATHEMATICAL MONOSPACE CAPITAL S
-1D683         ; mapped                 ; 0074          # 3.1  MATHEMATICAL MONOSPACE CAPITAL T
-1D684         ; mapped                 ; 0075          # 3.1  MATHEMATICAL MONOSPACE CAPITAL U
-1D685         ; mapped                 ; 0076          # 3.1  MATHEMATICAL MONOSPACE CAPITAL V
-1D686         ; mapped                 ; 0077          # 3.1  MATHEMATICAL MONOSPACE CAPITAL W
-1D687         ; mapped                 ; 0078          # 3.1  MATHEMATICAL MONOSPACE CAPITAL X
-1D688         ; mapped                 ; 0079          # 3.1  MATHEMATICAL MONOSPACE CAPITAL Y
-1D689         ; mapped                 ; 007A          # 3.1  MATHEMATICAL MONOSPACE CAPITAL Z
-1D68A         ; mapped                 ; 0061          # 3.1  MATHEMATICAL MONOSPACE SMALL A
-1D68B         ; mapped                 ; 0062          # 3.1  MATHEMATICAL MONOSPACE SMALL B
-1D68C         ; mapped                 ; 0063          # 3.1  MATHEMATICAL MONOSPACE SMALL C
-1D68D         ; mapped                 ; 0064          # 3.1  MATHEMATICAL MONOSPACE SMALL D
-1D68E         ; mapped                 ; 0065          # 3.1  MATHEMATICAL MONOSPACE SMALL E
-1D68F         ; mapped                 ; 0066          # 3.1  MATHEMATICAL MONOSPACE SMALL F
-1D690         ; mapped                 ; 0067          # 3.1  MATHEMATICAL MONOSPACE SMALL G
-1D691         ; mapped                 ; 0068          # 3.1  MATHEMATICAL MONOSPACE SMALL H
-1D692         ; mapped                 ; 0069          # 3.1  MATHEMATICAL MONOSPACE SMALL I
-1D693         ; mapped                 ; 006A          # 3.1  MATHEMATICAL MONOSPACE SMALL J
-1D694         ; mapped                 ; 006B          # 3.1  MATHEMATICAL MONOSPACE SMALL K
-1D695         ; mapped                 ; 006C          # 3.1  MATHEMATICAL MONOSPACE SMALL L
-1D696         ; mapped                 ; 006D          # 3.1  MATHEMATICAL MONOSPACE SMALL M
-1D697         ; mapped                 ; 006E          # 3.1  MATHEMATICAL MONOSPACE SMALL N
-1D698         ; mapped                 ; 006F          # 3.1  MATHEMATICAL MONOSPACE SMALL O
-1D699         ; mapped                 ; 0070          # 3.1  MATHEMATICAL MONOSPACE SMALL P
-1D69A         ; mapped                 ; 0071          # 3.1  MATHEMATICAL MONOSPACE SMALL Q
-1D69B         ; mapped                 ; 0072          # 3.1  MATHEMATICAL MONOSPACE SMALL R
-1D69C         ; mapped                 ; 0073          # 3.1  MATHEMATICAL MONOSPACE SMALL S
-1D69D         ; mapped                 ; 0074          # 3.1  MATHEMATICAL MONOSPACE SMALL T
-1D69E         ; mapped                 ; 0075          # 3.1  MATHEMATICAL MONOSPACE SMALL U
-1D69F         ; mapped                 ; 0076          # 3.1  MATHEMATICAL MONOSPACE SMALL V
-1D6A0         ; mapped                 ; 0077          # 3.1  MATHEMATICAL MONOSPACE SMALL W
-1D6A1         ; mapped                 ; 0078          # 3.1  MATHEMATICAL MONOSPACE SMALL X
-1D6A2         ; mapped                 ; 0079          # 3.1  MATHEMATICAL MONOSPACE SMALL Y
-1D6A3         ; mapped                 ; 007A          # 3.1  MATHEMATICAL MONOSPACE SMALL Z
-1D6A4         ; mapped                 ; 0131          # 4.1  MATHEMATICAL ITALIC SMALL DOTLESS I
-1D6A5         ; mapped                 ; 0237          # 4.1  MATHEMATICAL ITALIC SMALL DOTLESS J
-1D6A6..1D6A7  ; disallowed                             # NA   <reserved-1D6A6>..<reserved-1D6A7>
-1D6A8         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL BOLD CAPITAL ALPHA
-1D6A9         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL BOLD CAPITAL BETA
-1D6AA         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL BOLD CAPITAL GAMMA
-1D6AB         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL BOLD CAPITAL DELTA
-1D6AC         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD CAPITAL EPSILON
-1D6AD         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL BOLD CAPITAL ZETA
-1D6AE         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL BOLD CAPITAL ETA
-1D6AF         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD CAPITAL THETA
-1D6B0         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL BOLD CAPITAL IOTA
-1D6B1         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD CAPITAL KAPPA
-1D6B2         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL BOLD CAPITAL LAMDA
-1D6B3         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL BOLD CAPITAL MU
-1D6B4         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL BOLD CAPITAL NU
-1D6B5         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL BOLD CAPITAL XI
-1D6B6         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL BOLD CAPITAL OMICRON
-1D6B7         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD CAPITAL PI
-1D6B8         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD CAPITAL RHO
-1D6B9         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD CAPITAL THETA SYMBOL
-1D6BA         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL BOLD CAPITAL SIGMA
-1D6BB         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL BOLD CAPITAL TAU
-1D6BC         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL BOLD CAPITAL UPSILON
-1D6BD         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD CAPITAL PHI
-1D6BE         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL BOLD CAPITAL CHI
-1D6BF         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL BOLD CAPITAL PSI
-1D6C0         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL BOLD CAPITAL OMEGA
-1D6C1         ; mapped                 ; 2207          # 3.1  MATHEMATICAL BOLD NABLA
-1D6C2         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL BOLD SMALL ALPHA
-1D6C3         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL BOLD SMALL BETA
-1D6C4         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL BOLD SMALL GAMMA
-1D6C5         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL BOLD SMALL DELTA
-1D6C6         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD SMALL EPSILON
-1D6C7         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL BOLD SMALL ZETA
-1D6C8         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL BOLD SMALL ETA
-1D6C9         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD SMALL THETA
-1D6CA         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL BOLD SMALL IOTA
-1D6CB         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD SMALL KAPPA
-1D6CC         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL BOLD SMALL LAMDA
-1D6CD         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL BOLD SMALL MU
-1D6CE         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL BOLD SMALL NU
-1D6CF         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL BOLD SMALL XI
-1D6D0         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL BOLD SMALL OMICRON
-1D6D1         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD SMALL PI
-1D6D2         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD SMALL RHO
-1D6D3..1D6D4  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL BOLD SMALL FINAL SIGMA..MATHEMATICAL BOLD SMALL SIGMA
-1D6D5         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL BOLD SMALL TAU
-1D6D6         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL BOLD SMALL UPSILON
-1D6D7         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD SMALL PHI
-1D6D8         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL BOLD SMALL CHI
-1D6D9         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL BOLD SMALL PSI
-1D6DA         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL BOLD SMALL OMEGA
-1D6DB         ; mapped                 ; 2202          # 3.1  MATHEMATICAL BOLD PARTIAL DIFFERENTIAL
-1D6DC         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD EPSILON SYMBOL
-1D6DD         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD THETA SYMBOL
-1D6DE         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD KAPPA SYMBOL
-1D6DF         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD PHI SYMBOL
-1D6E0         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD RHO SYMBOL
-1D6E1         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD PI SYMBOL
-1D6E2         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL ITALIC CAPITAL ALPHA
-1D6E3         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL ITALIC CAPITAL BETA
-1D6E4         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL ITALIC CAPITAL GAMMA
-1D6E5         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL ITALIC CAPITAL DELTA
-1D6E6         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL ITALIC CAPITAL EPSILON
-1D6E7         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL ITALIC CAPITAL ZETA
-1D6E8         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL ITALIC CAPITAL ETA
-1D6E9         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL ITALIC CAPITAL THETA
-1D6EA         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL ITALIC CAPITAL IOTA
-1D6EB         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL ITALIC CAPITAL KAPPA
-1D6EC         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL ITALIC CAPITAL LAMDA
-1D6ED         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL ITALIC CAPITAL MU
-1D6EE         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL ITALIC CAPITAL NU
-1D6EF         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL ITALIC CAPITAL XI
-1D6F0         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL ITALIC CAPITAL OMICRON
-1D6F1         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL ITALIC CAPITAL PI
-1D6F2         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL ITALIC CAPITAL RHO
-1D6F3         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL ITALIC CAPITAL THETA SYMBOL
-1D6F4         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL ITALIC CAPITAL SIGMA
-1D6F5         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL ITALIC CAPITAL TAU
-1D6F6         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL ITALIC CAPITAL UPSILON
-1D6F7         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL ITALIC CAPITAL PHI
-1D6F8         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL ITALIC CAPITAL CHI
-1D6F9         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL ITALIC CAPITAL PSI
-1D6FA         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL ITALIC CAPITAL OMEGA
-1D6FB         ; mapped                 ; 2207          # 3.1  MATHEMATICAL ITALIC NABLA
-1D6FC         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL ITALIC SMALL ALPHA
-1D6FD         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL ITALIC SMALL BETA
-1D6FE         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL ITALIC SMALL GAMMA
-1D6FF         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL ITALIC SMALL DELTA
-1D700         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL ITALIC SMALL EPSILON
-1D701         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL ITALIC SMALL ZETA
-1D702         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL ITALIC SMALL ETA
-1D703         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL ITALIC SMALL THETA
-1D704         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL ITALIC SMALL IOTA
-1D705         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL ITALIC SMALL KAPPA
-1D706         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL ITALIC SMALL LAMDA
-1D707         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL ITALIC SMALL MU
-1D708         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL ITALIC SMALL NU
-1D709         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL ITALIC SMALL XI
-1D70A         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL ITALIC SMALL OMICRON
-1D70B         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL ITALIC SMALL PI
-1D70C         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL ITALIC SMALL RHO
-1D70D..1D70E  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL ITALIC SMALL FINAL SIGMA..MATHEMATICAL ITALIC SMALL SIGMA
-1D70F         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL ITALIC SMALL TAU
-1D710         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL ITALIC SMALL UPSILON
-1D711         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL ITALIC SMALL PHI
-1D712         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL ITALIC SMALL CHI
-1D713         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL ITALIC SMALL PSI
-1D714         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL ITALIC SMALL OMEGA
-1D715         ; mapped                 ; 2202          # 3.1  MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL
-1D716         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL ITALIC EPSILON SYMBOL
-1D717         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL ITALIC THETA SYMBOL
-1D718         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL ITALIC KAPPA SYMBOL
-1D719         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL ITALIC PHI SYMBOL
-1D71A         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL ITALIC RHO SYMBOL
-1D71B         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL ITALIC PI SYMBOL
-1D71C         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL ALPHA
-1D71D         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL BETA
-1D71E         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL GAMMA
-1D71F         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL DELTA
-1D720         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL EPSILON
-1D721         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL ZETA
-1D722         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL ETA
-1D723         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL THETA
-1D724         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL IOTA
-1D725         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL KAPPA
-1D726         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL LAMDA
-1D727         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL MU
-1D728         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL NU
-1D729         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL XI
-1D72A         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL OMICRON
-1D72B         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL PI
-1D72C         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL RHO
-1D72D         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL
-1D72E         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL SIGMA
-1D72F         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL TAU
-1D730         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL UPSILON
-1D731         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL PHI
-1D732         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL CHI
-1D733         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL PSI
-1D734         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL OMEGA
-1D735         ; mapped                 ; 2207          # 3.1  MATHEMATICAL BOLD ITALIC NABLA
-1D736         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL BOLD ITALIC SMALL ALPHA
-1D737         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL BOLD ITALIC SMALL BETA
-1D738         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL BOLD ITALIC SMALL GAMMA
-1D739         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL BOLD ITALIC SMALL DELTA
-1D73A         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD ITALIC SMALL EPSILON
-1D73B         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL BOLD ITALIC SMALL ZETA
-1D73C         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL BOLD ITALIC SMALL ETA
-1D73D         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD ITALIC SMALL THETA
-1D73E         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL BOLD ITALIC SMALL IOTA
-1D73F         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD ITALIC SMALL KAPPA
-1D740         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL BOLD ITALIC SMALL LAMDA
-1D741         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL BOLD ITALIC SMALL MU
-1D742         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL BOLD ITALIC SMALL NU
-1D743         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL BOLD ITALIC SMALL XI
-1D744         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL BOLD ITALIC SMALL OMICRON
-1D745         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD ITALIC SMALL PI
-1D746         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD ITALIC SMALL RHO
-1D747..1D748  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA..MATHEMATICAL BOLD ITALIC SMALL SIGMA
-1D749         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL BOLD ITALIC SMALL TAU
-1D74A         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL BOLD ITALIC SMALL UPSILON
-1D74B         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD ITALIC SMALL PHI
-1D74C         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL BOLD ITALIC SMALL CHI
-1D74D         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL BOLD ITALIC SMALL PSI
-1D74E         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL BOLD ITALIC SMALL OMEGA
-1D74F         ; mapped                 ; 2202          # 3.1  MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL
-1D750         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD ITALIC EPSILON SYMBOL
-1D751         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD ITALIC THETA SYMBOL
-1D752         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD ITALIC KAPPA SYMBOL
-1D753         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD ITALIC PHI SYMBOL
-1D754         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD ITALIC RHO SYMBOL
-1D755         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD ITALIC PI SYMBOL
-1D756         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA
-1D757         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA
-1D758         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA
-1D759         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA
-1D75A         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON
-1D75B         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA
-1D75C         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA
-1D75D         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA
-1D75E         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA
-1D75F         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA
-1D760         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA
-1D761         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL MU
-1D762         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL NU
-1D763         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL XI
-1D764         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON
-1D765         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL PI
-1D766         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO
-1D767         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL
-1D768         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA
-1D769         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU
-1D76A         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON
-1D76B         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI
-1D76C         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI
-1D76D         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI
-1D76E         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA
-1D76F         ; mapped                 ; 2207          # 3.1  MATHEMATICAL SANS-SERIF BOLD NABLA
-1D770         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA
-1D771         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL BETA
-1D772         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA
-1D773         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL DELTA
-1D774         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON
-1D775         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL ZETA
-1D776         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL ETA
-1D777         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL THETA
-1D778         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL IOTA
-1D779         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA
-1D77A         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA
-1D77B         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL MU
-1D77C         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL NU
-1D77D         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL XI
-1D77E         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON
-1D77F         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL PI
-1D780         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL RHO
-1D781..1D782  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA..MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA
-1D783         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL TAU
-1D784         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON
-1D785         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL PHI
-1D786         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL CHI
-1D787         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL PSI
-1D788         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA
-1D789         ; mapped                 ; 2202          # 3.1  MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL
-1D78A         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL
-1D78B         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL
-1D78C         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL
-1D78D         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL
-1D78E         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL
-1D78F         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD PI SYMBOL
-1D790         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA
-1D791         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA
-1D792         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA
-1D793         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA
-1D794         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON
-1D795         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA
-1D796         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA
-1D797         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA
-1D798         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA
-1D799         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA
-1D79A         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA
-1D79B         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU
-1D79C         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU
-1D79D         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI
-1D79E         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON
-1D79F         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI
-1D7A0         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO
-1D7A1         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL
-1D7A2         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA
-1D7A3         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU
-1D7A4         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON
-1D7A5         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI
-1D7A6         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI
-1D7A7         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI
-1D7A8         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA
-1D7A9         ; mapped                 ; 2207          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA
-1D7AA         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA
-1D7AB         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA
-1D7AC         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA
-1D7AD         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA
-1D7AE         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON
-1D7AF         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA
-1D7B0         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA
-1D7B1         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA
-1D7B2         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA
-1D7B3         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA
-1D7B4         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA
-1D7B5         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU
-1D7B6         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU
-1D7B7         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI
-1D7B8         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON
-1D7B9         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI
-1D7BA         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO
-1D7BB..1D7BC  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA
-1D7BD         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU
-1D7BE         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON
-1D7BF         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI
-1D7C0         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI
-1D7C1         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI
-1D7C2         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA
-1D7C3         ; mapped                 ; 2202          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL
-1D7C4         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL
-1D7C5         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL
-1D7C6         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL
-1D7C7         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL
-1D7C8         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL
-1D7C9         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL
-1D7CA..1D7CB  ; mapped                 ; 03DD          # 5.0  MATHEMATICAL BOLD CAPITAL DIGAMMA..MATHEMATICAL BOLD SMALL DIGAMMA
-1D7CC..1D7CD  ; disallowed                             # NA   <reserved-1D7CC>..<reserved-1D7CD>
-1D7CE         ; mapped                 ; 0030          # 3.1  MATHEMATICAL BOLD DIGIT ZERO
-1D7CF         ; mapped                 ; 0031          # 3.1  MATHEMATICAL BOLD DIGIT ONE
-1D7D0         ; mapped                 ; 0032          # 3.1  MATHEMATICAL BOLD DIGIT TWO
-1D7D1         ; mapped                 ; 0033          # 3.1  MATHEMATICAL BOLD DIGIT THREE
-1D7D2         ; mapped                 ; 0034          # 3.1  MATHEMATICAL BOLD DIGIT FOUR
-1D7D3         ; mapped                 ; 0035          # 3.1  MATHEMATICAL BOLD DIGIT FIVE
-1D7D4         ; mapped                 ; 0036          # 3.1  MATHEMATICAL BOLD DIGIT SIX
-1D7D5         ; mapped                 ; 0037          # 3.1  MATHEMATICAL BOLD DIGIT SEVEN
-1D7D6         ; mapped                 ; 0038          # 3.1  MATHEMATICAL BOLD DIGIT EIGHT
-1D7D7         ; mapped                 ; 0039          # 3.1  MATHEMATICAL BOLD DIGIT NINE
-1D7D8         ; mapped                 ; 0030          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO
-1D7D9         ; mapped                 ; 0031          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT ONE
-1D7DA         ; mapped                 ; 0032          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT TWO
-1D7DB         ; mapped                 ; 0033          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT THREE
-1D7DC         ; mapped                 ; 0034          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR
-1D7DD         ; mapped                 ; 0035          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE
-1D7DE         ; mapped                 ; 0036          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT SIX
-1D7DF         ; mapped                 ; 0037          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN
-1D7E0         ; mapped                 ; 0038          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT
-1D7E1         ; mapped                 ; 0039          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT NINE
-1D7E2         ; mapped                 ; 0030          # 3.1  MATHEMATICAL SANS-SERIF DIGIT ZERO
-1D7E3         ; mapped                 ; 0031          # 3.1  MATHEMATICAL SANS-SERIF DIGIT ONE
-1D7E4         ; mapped                 ; 0032          # 3.1  MATHEMATICAL SANS-SERIF DIGIT TWO
-1D7E5         ; mapped                 ; 0033          # 3.1  MATHEMATICAL SANS-SERIF DIGIT THREE
-1D7E6         ; mapped                 ; 0034          # 3.1  MATHEMATICAL SANS-SERIF DIGIT FOUR
-1D7E7         ; mapped                 ; 0035          # 3.1  MATHEMATICAL SANS-SERIF DIGIT FIVE
-1D7E8         ; mapped                 ; 0036          # 3.1  MATHEMATICAL SANS-SERIF DIGIT SIX
-1D7E9         ; mapped                 ; 0037          # 3.1  MATHEMATICAL SANS-SERIF DIGIT SEVEN
-1D7EA         ; mapped                 ; 0038          # 3.1  MATHEMATICAL SANS-SERIF DIGIT EIGHT
-1D7EB         ; mapped                 ; 0039          # 3.1  MATHEMATICAL SANS-SERIF DIGIT NINE
-1D7EC         ; mapped                 ; 0030          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO
-1D7ED         ; mapped                 ; 0031          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT ONE
-1D7EE         ; mapped                 ; 0032          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT TWO
-1D7EF         ; mapped                 ; 0033          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT THREE
-1D7F0         ; mapped                 ; 0034          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR
-1D7F1         ; mapped                 ; 0035          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE
-1D7F2         ; mapped                 ; 0036          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT SIX
-1D7F3         ; mapped                 ; 0037          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN
-1D7F4         ; mapped                 ; 0038          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT
-1D7F5         ; mapped                 ; 0039          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT NINE
-1D7F6         ; mapped                 ; 0030          # 3.1  MATHEMATICAL MONOSPACE DIGIT ZERO
-1D7F7         ; mapped                 ; 0031          # 3.1  MATHEMATICAL MONOSPACE DIGIT ONE
-1D7F8         ; mapped                 ; 0032          # 3.1  MATHEMATICAL MONOSPACE DIGIT TWO
-1D7F9         ; mapped                 ; 0033          # 3.1  MATHEMATICAL MONOSPACE DIGIT THREE
-1D7FA         ; mapped                 ; 0034          # 3.1  MATHEMATICAL MONOSPACE DIGIT FOUR
-1D7FB         ; mapped                 ; 0035          # 3.1  MATHEMATICAL MONOSPACE DIGIT FIVE
-1D7FC         ; mapped                 ; 0036          # 3.1  MATHEMATICAL MONOSPACE DIGIT SIX
-1D7FD         ; mapped                 ; 0037          # 3.1  MATHEMATICAL MONOSPACE DIGIT SEVEN
-1D7FE         ; mapped                 ; 0038          # 3.1  MATHEMATICAL MONOSPACE DIGIT EIGHT
-1D7FF         ; mapped                 ; 0039          # 3.1  MATHEMATICAL MONOSPACE DIGIT NINE
-1D800..1D9FF  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING HAND-FIST INDEX..SIGNWRITING HEAD
-1DA00..1DA36  ; valid                                  # 8.0  SIGNWRITING HEAD RIM..SIGNWRITING AIR SUCKING IN
-1DA37..1DA3A  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING AIR BLOW SMALL ROTATIONS..SIGNWRITING BREATH EXHALE
-1DA3B..1DA6C  ; valid                                  # 8.0  SIGNWRITING MOUTH CLOSED NEUTRAL..SIGNWRITING EXCITEMENT
-1DA6D..1DA74  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING SHOULDER HIP SPINE..SIGNWRITING TORSO-FLOORPLANE TWISTING
-1DA75         ; valid                                  # 8.0  SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS
-1DA76..1DA83  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING LIMB COMBINATION..SIGNWRITING LOCATION DEPTH
-1DA84         ; valid                                  # 8.0  SIGNWRITING LOCATION HEAD NECK
-1DA85..1DA8B  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING LOCATION TORSO..SIGNWRITING PARENTHESIS
-1DA8C..1DA9A  ; disallowed                             # NA   <reserved-1DA8C>..<reserved-1DA9A>
-1DA9B..1DA9F  ; valid                                  # 8.0  SIGNWRITING FILL MODIFIER-2..SIGNWRITING FILL MODIFIER-6
-1DAA0         ; disallowed                             # NA   <reserved-1DAA0>
-1DAA1..1DAAF  ; valid                                  # 8.0  SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16
-1DAB0..1DFFF  ; disallowed                             # NA   <reserved-1DAB0>..<reserved-1DFFF>
-1E000..1E006  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE
-1E007         ; disallowed                             # NA   <reserved-1E007>
-1E008..1E018  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU
-1E019..1E01A  ; disallowed                             # NA   <reserved-1E019>..<reserved-1E01A>
-1E01B..1E021  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI
-1E022         ; disallowed                             # NA   <reserved-1E022>
-1E023..1E024  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS
-1E025         ; disallowed                             # NA   <reserved-1E025>
-1E026..1E02A  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA
-1E02B..1E7FF  ; disallowed                             # NA   <reserved-1E02B>..<reserved-1E7FF>
-1E800..1E8C4  ; valid                                  # 7.0  MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON
-1E8C5..1E8C6  ; disallowed                             # NA   <reserved-1E8C5>..<reserved-1E8C6>
-1E8C7..1E8CF  ; valid                  ;      ; NV8    # 7.0  MENDE KIKAKUI DIGIT ONE..MENDE KIKAKUI DIGIT NINE
-1E8D0..1E8D6  ; valid                                  # 7.0  MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
-1E8D7..1E8FF  ; disallowed                             # NA   <reserved-1E8D7>..<reserved-1E8FF>
-1E900         ; mapped                 ; 1E922         # 9.0  ADLAM CAPITAL LETTER ALIF
-1E901         ; mapped                 ; 1E923         # 9.0  ADLAM CAPITAL LETTER DAALI
-1E902         ; mapped                 ; 1E924         # 9.0  ADLAM CAPITAL LETTER LAAM
-1E903         ; mapped                 ; 1E925         # 9.0  ADLAM CAPITAL LETTER MIIM
-1E904         ; mapped                 ; 1E926         # 9.0  ADLAM CAPITAL LETTER BA
-1E905         ; mapped                 ; 1E927         # 9.0  ADLAM CAPITAL LETTER SINNYIIYHE
-1E906         ; mapped                 ; 1E928         # 9.0  ADLAM CAPITAL LETTER PE
-1E907         ; mapped                 ; 1E929         # 9.0  ADLAM CAPITAL LETTER BHE
-1E908         ; mapped                 ; 1E92A         # 9.0  ADLAM CAPITAL LETTER RA
-1E909         ; mapped                 ; 1E92B         # 9.0  ADLAM CAPITAL LETTER E
-1E90A         ; mapped                 ; 1E92C         # 9.0  ADLAM CAPITAL LETTER FA
-1E90B         ; mapped                 ; 1E92D         # 9.0  ADLAM CAPITAL LETTER I
-1E90C         ; mapped                 ; 1E92E         # 9.0  ADLAM CAPITAL LETTER O
-1E90D         ; mapped                 ; 1E92F         # 9.0  ADLAM CAPITAL LETTER DHA
-1E90E         ; mapped                 ; 1E930         # 9.0  ADLAM CAPITAL LETTER YHE
-1E90F         ; mapped                 ; 1E931         # 9.0  ADLAM CAPITAL LETTER WAW
-1E910         ; mapped                 ; 1E932         # 9.0  ADLAM CAPITAL LETTER NUN
-1E911         ; mapped                 ; 1E933         # 9.0  ADLAM CAPITAL LETTER KAF
-1E912         ; mapped                 ; 1E934         # 9.0  ADLAM CAPITAL LETTER YA
-1E913         ; mapped                 ; 1E935         # 9.0  ADLAM CAPITAL LETTER U
-1E914         ; mapped                 ; 1E936         # 9.0  ADLAM CAPITAL LETTER JIIM
-1E915         ; mapped                 ; 1E937         # 9.0  ADLAM CAPITAL LETTER CHI
-1E916         ; mapped                 ; 1E938         # 9.0  ADLAM CAPITAL LETTER HA
-1E917         ; mapped                 ; 1E939         # 9.0  ADLAM CAPITAL LETTER QAAF
-1E918         ; mapped                 ; 1E93A         # 9.0  ADLAM CAPITAL LETTER GA
-1E919         ; mapped                 ; 1E93B         # 9.0  ADLAM CAPITAL LETTER NYA
-1E91A         ; mapped                 ; 1E93C         # 9.0  ADLAM CAPITAL LETTER TU
-1E91B         ; mapped                 ; 1E93D         # 9.0  ADLAM CAPITAL LETTER NHA
-1E91C         ; mapped                 ; 1E93E         # 9.0  ADLAM CAPITAL LETTER VA
-1E91D         ; mapped                 ; 1E93F         # 9.0  ADLAM CAPITAL LETTER KHA
-1E91E         ; mapped                 ; 1E940         # 9.0  ADLAM CAPITAL LETTER GBE
-1E91F         ; mapped                 ; 1E941         # 9.0  ADLAM CAPITAL LETTER ZAL
-1E920         ; mapped                 ; 1E942         # 9.0  ADLAM CAPITAL LETTER KPO
-1E921         ; mapped                 ; 1E943         # 9.0  ADLAM CAPITAL LETTER SHA
-1E922..1E94A  ; valid                                  # 9.0  ADLAM SMALL LETTER ALIF..ADLAM NUKTA
-1E94B..1E94F  ; disallowed                             # NA   <reserved-1E94B>..<reserved-1E94F>
-1E950..1E959  ; valid                                  # 9.0  ADLAM DIGIT ZERO..ADLAM DIGIT NINE
-1E95A..1E95D  ; disallowed                             # NA   <reserved-1E95A>..<reserved-1E95D>
-1E95E..1E95F  ; valid                  ;      ; NV8    # 9.0  ADLAM INITIAL EXCLAMATION MARK..ADLAM INITIAL QUESTION MARK
-1E960..1EDFF  ; disallowed                             # NA   <reserved-1E960>..<reserved-1EDFF>
-1EE00         ; mapped                 ; 0627          # 6.1  ARABIC MATHEMATICAL ALEF
-1EE01         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL BEH
-1EE02         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL JEEM
-1EE03         ; mapped                 ; 062F          # 6.1  ARABIC MATHEMATICAL DAL
-1EE04         ; disallowed                             # NA   <reserved-1EE04>
-1EE05         ; mapped                 ; 0648          # 6.1  ARABIC MATHEMATICAL WAW
-1EE06         ; mapped                 ; 0632          # 6.1  ARABIC MATHEMATICAL ZAIN
-1EE07         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL HAH
-1EE08         ; mapped                 ; 0637          # 6.1  ARABIC MATHEMATICAL TAH
-1EE09         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL YEH
-1EE0A         ; mapped                 ; 0643          # 6.1  ARABIC MATHEMATICAL KAF
-1EE0B         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL LAM
-1EE0C         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL MEEM
-1EE0D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL NOON
-1EE0E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL SEEN
-1EE0F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL AIN
-1EE10         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL FEH
-1EE11         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL SAD
-1EE12         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL QAF
-1EE13         ; mapped                 ; 0631          # 6.1  ARABIC MATHEMATICAL REH
-1EE14         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL SHEEN
-1EE15         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL TEH
-1EE16         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL THEH
-1EE17         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL KHAH
-1EE18         ; mapped                 ; 0630          # 6.1  ARABIC MATHEMATICAL THAL
-1EE19         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL DAD
-1EE1A         ; mapped                 ; 0638          # 6.1  ARABIC MATHEMATICAL ZAH
-1EE1B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL GHAIN
-1EE1C         ; mapped                 ; 066E          # 6.1  ARABIC MATHEMATICAL DOTLESS BEH
-1EE1D         ; mapped                 ; 06BA          # 6.1  ARABIC MATHEMATICAL DOTLESS NOON
-1EE1E         ; mapped                 ; 06A1          # 6.1  ARABIC MATHEMATICAL DOTLESS FEH
-1EE1F         ; mapped                 ; 066F          # 6.1  ARABIC MATHEMATICAL DOTLESS QAF
-1EE20         ; disallowed                             # NA   <reserved-1EE20>
-1EE21         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL INITIAL BEH
-1EE22         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL INITIAL JEEM
-1EE23         ; disallowed                             # NA   <reserved-1EE23>
-1EE24         ; mapped                 ; 0647          # 6.1  ARABIC MATHEMATICAL INITIAL HEH
-1EE25..1EE26  ; disallowed                             # NA   <reserved-1EE25>..<reserved-1EE26>
-1EE27         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL INITIAL HAH
-1EE28         ; disallowed                             # NA   <reserved-1EE28>
-1EE29         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL INITIAL YEH
-1EE2A         ; mapped                 ; 0643          # 6.1  ARABIC MATHEMATICAL INITIAL KAF
-1EE2B         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL INITIAL LAM
-1EE2C         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL INITIAL MEEM
-1EE2D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL INITIAL NOON
-1EE2E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL INITIAL SEEN
-1EE2F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL INITIAL AIN
-1EE30         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL INITIAL FEH
-1EE31         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL INITIAL SAD
-1EE32         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL INITIAL QAF
-1EE33         ; disallowed                             # NA   <reserved-1EE33>
-1EE34         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL INITIAL SHEEN
-1EE35         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL INITIAL TEH
-1EE36         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL INITIAL THEH
-1EE37         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL INITIAL KHAH
-1EE38         ; disallowed                             # NA   <reserved-1EE38>
-1EE39         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL INITIAL DAD
-1EE3A         ; disallowed                             # NA   <reserved-1EE3A>
-1EE3B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL INITIAL GHAIN
-1EE3C..1EE41  ; disallowed                             # NA   <reserved-1EE3C>..<reserved-1EE41>
-1EE42         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL TAILED JEEM
-1EE43..1EE46  ; disallowed                             # NA   <reserved-1EE43>..<reserved-1EE46>
-1EE47         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL TAILED HAH
-1EE48         ; disallowed                             # NA   <reserved-1EE48>
-1EE49         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL TAILED YEH
-1EE4A         ; disallowed                             # NA   <reserved-1EE4A>
-1EE4B         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL TAILED LAM
-1EE4C         ; disallowed                             # NA   <reserved-1EE4C>
-1EE4D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL TAILED NOON
-1EE4E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL TAILED SEEN
-1EE4F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL TAILED AIN
-1EE50         ; disallowed                             # NA   <reserved-1EE50>
-1EE51         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL TAILED SAD
-1EE52         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL TAILED QAF
-1EE53         ; disallowed                             # NA   <reserved-1EE53>
-1EE54         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL TAILED SHEEN
-1EE55..1EE56  ; disallowed                             # NA   <reserved-1EE55>..<reserved-1EE56>
-1EE57         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL TAILED KHAH
-1EE58         ; disallowed                             # NA   <reserved-1EE58>
-1EE59         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL TAILED DAD
-1EE5A         ; disallowed                             # NA   <reserved-1EE5A>
-1EE5B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL TAILED GHAIN
-1EE5C         ; disallowed                             # NA   <reserved-1EE5C>
-1EE5D         ; mapped                 ; 06BA          # 6.1  ARABIC MATHEMATICAL TAILED DOTLESS NOON
-1EE5E         ; disallowed                             # NA   <reserved-1EE5E>
-1EE5F         ; mapped                 ; 066F          # 6.1  ARABIC MATHEMATICAL TAILED DOTLESS QAF
-1EE60         ; disallowed                             # NA   <reserved-1EE60>
-1EE61         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL STRETCHED BEH
-1EE62         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL STRETCHED JEEM
-1EE63         ; disallowed                             # NA   <reserved-1EE63>
-1EE64         ; mapped                 ; 0647          # 6.1  ARABIC MATHEMATICAL STRETCHED HEH
-1EE65..1EE66  ; disallowed                             # NA   <reserved-1EE65>..<reserved-1EE66>
-1EE67         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL STRETCHED HAH
-1EE68         ; mapped                 ; 0637          # 6.1  ARABIC MATHEMATICAL STRETCHED TAH
-1EE69         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL STRETCHED YEH
-1EE6A         ; mapped                 ; 0643          # 6.1  ARABIC MATHEMATICAL STRETCHED KAF
-1EE6B         ; disallowed                             # NA   <reserved-1EE6B>
-1EE6C         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL STRETCHED MEEM
-1EE6D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL STRETCHED NOON
-1EE6E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL STRETCHED SEEN
-1EE6F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL STRETCHED AIN
-1EE70         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL STRETCHED FEH
-1EE71         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL STRETCHED SAD
-1EE72         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL STRETCHED QAF
-1EE73         ; disallowed                             # NA   <reserved-1EE73>
-1EE74         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL STRETCHED SHEEN
-1EE75         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL STRETCHED TEH
-1EE76         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL STRETCHED THEH
-1EE77         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL STRETCHED KHAH
-1EE78         ; disallowed                             # NA   <reserved-1EE78>
-1EE79         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL STRETCHED DAD
-1EE7A         ; mapped                 ; 0638          # 6.1  ARABIC MATHEMATICAL STRETCHED ZAH
-1EE7B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL STRETCHED GHAIN
-1EE7C         ; mapped                 ; 066E          # 6.1  ARABIC MATHEMATICAL STRETCHED DOTLESS BEH
-1EE7D         ; disallowed                             # NA   <reserved-1EE7D>
-1EE7E         ; mapped                 ; 06A1          # 6.1  ARABIC MATHEMATICAL STRETCHED DOTLESS FEH
-1EE7F         ; disallowed                             # NA   <reserved-1EE7F>
-1EE80         ; mapped                 ; 0627          # 6.1  ARABIC MATHEMATICAL LOOPED ALEF
-1EE81         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL LOOPED BEH
-1EE82         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL LOOPED JEEM
-1EE83         ; mapped                 ; 062F          # 6.1  ARABIC MATHEMATICAL LOOPED DAL
-1EE84         ; mapped                 ; 0647          # 6.1  ARABIC MATHEMATICAL LOOPED HEH
-1EE85         ; mapped                 ; 0648          # 6.1  ARABIC MATHEMATICAL LOOPED WAW
-1EE86         ; mapped                 ; 0632          # 6.1  ARABIC MATHEMATICAL LOOPED ZAIN
-1EE87         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL LOOPED HAH
-1EE88         ; mapped                 ; 0637          # 6.1  ARABIC MATHEMATICAL LOOPED TAH
-1EE89         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL LOOPED YEH
-1EE8A         ; disallowed                             # NA   <reserved-1EE8A>
-1EE8B         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL LOOPED LAM
-1EE8C         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL LOOPED MEEM
-1EE8D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL LOOPED NOON
-1EE8E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL LOOPED SEEN
-1EE8F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL LOOPED AIN
-1EE90         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL LOOPED FEH
-1EE91         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL LOOPED SAD
-1EE92         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL LOOPED QAF
-1EE93         ; mapped                 ; 0631          # 6.1  ARABIC MATHEMATICAL LOOPED REH
-1EE94         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL LOOPED SHEEN
-1EE95         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL LOOPED TEH
-1EE96         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL LOOPED THEH
-1EE97         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL LOOPED KHAH
-1EE98         ; mapped                 ; 0630          # 6.1  ARABIC MATHEMATICAL LOOPED THAL
-1EE99         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL LOOPED DAD
-1EE9A         ; mapped                 ; 0638          # 6.1  ARABIC MATHEMATICAL LOOPED ZAH
-1EE9B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL LOOPED GHAIN
-1EE9C..1EEA0  ; disallowed                             # NA   <reserved-1EE9C>..<reserved-1EEA0>
-1EEA1         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK BEH
-1EEA2         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK JEEM
-1EEA3         ; mapped                 ; 062F          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK DAL
-1EEA4         ; disallowed                             # NA   <reserved-1EEA4>
-1EEA5         ; mapped                 ; 0648          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK WAW
-1EEA6         ; mapped                 ; 0632          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK ZAIN
-1EEA7         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK HAH
-1EEA8         ; mapped                 ; 0637          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK TAH
-1EEA9         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK YEH
-1EEAA         ; disallowed                             # NA   <reserved-1EEAA>
-1EEAB         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK LAM
-1EEAC         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK MEEM
-1EEAD         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK NOON
-1EEAE         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK SEEN
-1EEAF         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK AIN
-1EEB0         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK FEH
-1EEB1         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK SAD
-1EEB2         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK QAF
-1EEB3         ; mapped                 ; 0631          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK REH
-1EEB4         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK SHEEN
-1EEB5         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK TEH
-1EEB6         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK THEH
-1EEB7         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK KHAH
-1EEB8         ; mapped                 ; 0630          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK THAL
-1EEB9         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK DAD
-1EEBA         ; mapped                 ; 0638          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK ZAH
-1EEBB         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
-1EEBC..1EEEF  ; disallowed                             # NA   <reserved-1EEBC>..<reserved-1EEEF>
-1EEF0..1EEF1  ; valid                  ;      ; NV8    # 6.1  ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
-1EEF2..1EFFF  ; disallowed                             # NA   <reserved-1EEF2>..<reserved-1EFFF>
-1F000..1F02B  ; valid                  ;      ; NV8    # 5.1  MAHJONG TILE EAST WIND..MAHJONG TILE BACK
-1F02C..1F02F  ; disallowed                             # NA   <reserved-1F02C>..<reserved-1F02F>
-1F030..1F093  ; valid                  ;      ; NV8    # 5.1  DOMINO TILE HORIZONTAL BACK..DOMINO TILE VERTICAL-06-06
-1F094..1F09F  ; disallowed                             # NA   <reserved-1F094>..<reserved-1F09F>
-1F0A0..1F0AE  ; valid                  ;      ; NV8    # 6.0  PLAYING CARD BACK..PLAYING CARD KING OF SPADES
-1F0AF..1F0B0  ; disallowed                             # NA   <reserved-1F0AF>..<reserved-1F0B0>
-1F0B1..1F0BE  ; valid                  ;      ; NV8    # 6.0  PLAYING CARD ACE OF HEARTS..PLAYING CARD KING OF HEARTS
-1F0BF         ; valid                  ;      ; NV8    # 7.0  PLAYING CARD RED JOKER
-1F0C0         ; disallowed                             # NA   <reserved-1F0C0>
-1F0C1..1F0CF  ; valid                  ;      ; NV8    # 6.0  PLAYING CARD ACE OF DIAMONDS..PLAYING CARD BLACK JOKER
-1F0D0         ; disallowed                             # NA   <reserved-1F0D0>
-1F0D1..1F0DF  ; valid                  ;      ; NV8    # 6.0  PLAYING CARD ACE OF CLUBS..PLAYING CARD WHITE JOKER
-1F0E0..1F0F5  ; valid                  ;      ; NV8    # 7.0  PLAYING CARD FOOL..PLAYING CARD TRUMP-21
-1F0F6..1F0FF  ; disallowed                             # NA   <reserved-1F0F6>..<reserved-1F0FF>
-1F100         ; disallowed                             # 5.2  DIGIT ZERO FULL STOP
-1F101         ; disallowed_STD3_mapped ; 0030 002C     # 5.2  DIGIT ZERO COMMA
-1F102         ; disallowed_STD3_mapped ; 0031 002C     # 5.2  DIGIT ONE COMMA
-1F103         ; disallowed_STD3_mapped ; 0032 002C     # 5.2  DIGIT TWO COMMA
-1F104         ; disallowed_STD3_mapped ; 0033 002C     # 5.2  DIGIT THREE COMMA
-1F105         ; disallowed_STD3_mapped ; 0034 002C     # 5.2  DIGIT FOUR COMMA
-1F106         ; disallowed_STD3_mapped ; 0035 002C     # 5.2  DIGIT FIVE COMMA
-1F107         ; disallowed_STD3_mapped ; 0036 002C     # 5.2  DIGIT SIX COMMA
-1F108         ; disallowed_STD3_mapped ; 0037 002C     # 5.2  DIGIT SEVEN COMMA
-1F109         ; disallowed_STD3_mapped ; 0038 002C     # 5.2  DIGIT EIGHT COMMA
-1F10A         ; disallowed_STD3_mapped ; 0039 002C     # 5.2  DIGIT NINE COMMA
-1F10B..1F10C  ; valid                  ;      ; NV8    # 7.0  DINGBAT CIRCLED SANS-SERIF DIGIT ZERO..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO
-1F10D..1F10F  ; disallowed                             # NA   <reserved-1F10D>..<reserved-1F10F>
-1F110         ; disallowed_STD3_mapped ; 0028 0061 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER A
-1F111         ; disallowed_STD3_mapped ; 0028 0062 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER B
-1F112         ; disallowed_STD3_mapped ; 0028 0063 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER C
-1F113         ; disallowed_STD3_mapped ; 0028 0064 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER D
-1F114         ; disallowed_STD3_mapped ; 0028 0065 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER E
-1F115         ; disallowed_STD3_mapped ; 0028 0066 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER F
-1F116         ; disallowed_STD3_mapped ; 0028 0067 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER G
-1F117         ; disallowed_STD3_mapped ; 0028 0068 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER H
-1F118         ; disallowed_STD3_mapped ; 0028 0069 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER I
-1F119         ; disallowed_STD3_mapped ; 0028 006A 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER J
-1F11A         ; disallowed_STD3_mapped ; 0028 006B 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER K
-1F11B         ; disallowed_STD3_mapped ; 0028 006C 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER L
-1F11C         ; disallowed_STD3_mapped ; 0028 006D 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER M
-1F11D         ; disallowed_STD3_mapped ; 0028 006E 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER N
-1F11E         ; disallowed_STD3_mapped ; 0028 006F 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER O
-1F11F         ; disallowed_STD3_mapped ; 0028 0070 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER P
-1F120         ; disallowed_STD3_mapped ; 0028 0071 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER Q
-1F121         ; disallowed_STD3_mapped ; 0028 0072 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER R
-1F122         ; disallowed_STD3_mapped ; 0028 0073 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER S
-1F123         ; disallowed_STD3_mapped ; 0028 0074 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER T
-1F124         ; disallowed_STD3_mapped ; 0028 0075 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER U
-1F125         ; disallowed_STD3_mapped ; 0028 0076 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER V
-1F126         ; disallowed_STD3_mapped ; 0028 0077 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER W
-1F127         ; disallowed_STD3_mapped ; 0028 0078 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER X
-1F128         ; disallowed_STD3_mapped ; 0028 0079 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER Y
-1F129         ; disallowed_STD3_mapped ; 0028 007A 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER Z
-1F12A         ; mapped                 ; 3014 0073 3015 #5.2  TORTOISE SHELL BRACKETED LATIN CAPITAL LETTER S
-1F12B         ; mapped                 ; 0063          # 5.2  CIRCLED ITALIC LATIN CAPITAL LETTER C
-1F12C         ; mapped                 ; 0072          # 5.2  CIRCLED ITALIC LATIN CAPITAL LETTER R
-1F12D         ; mapped                 ; 0063 0064     # 5.2  CIRCLED CD
-1F12E         ; mapped                 ; 0077 007A     # 5.2  CIRCLED WZ
-1F12F         ; disallowed                             # NA   <reserved-1F12F>
-1F130         ; mapped                 ; 0061          # 6.0  SQUARED LATIN CAPITAL LETTER A
-1F131         ; mapped                 ; 0062          # 5.2  SQUARED LATIN CAPITAL LETTER B
-1F132         ; mapped                 ; 0063          # 6.0  SQUARED LATIN CAPITAL LETTER C
-1F133         ; mapped                 ; 0064          # 6.0  SQUARED LATIN CAPITAL LETTER D
-1F134         ; mapped                 ; 0065          # 6.0  SQUARED LATIN CAPITAL LETTER E
-1F135         ; mapped                 ; 0066          # 6.0  SQUARED LATIN CAPITAL LETTER F
-1F136         ; mapped                 ; 0067          # 6.0  SQUARED LATIN CAPITAL LETTER G
-1F137         ; mapped                 ; 0068          # 6.0  SQUARED LATIN CAPITAL LETTER H
-1F138         ; mapped                 ; 0069          # 6.0  SQUARED LATIN CAPITAL LETTER I
-1F139         ; mapped                 ; 006A          # 6.0  SQUARED LATIN CAPITAL LETTER J
-1F13A         ; mapped                 ; 006B          # 6.0  SQUARED LATIN CAPITAL LETTER K
-1F13B         ; mapped                 ; 006C          # 6.0  SQUARED LATIN CAPITAL LETTER L
-1F13C         ; mapped                 ; 006D          # 6.0  SQUARED LATIN CAPITAL LETTER M
-1F13D         ; mapped                 ; 006E          # 5.2  SQUARED LATIN CAPITAL LETTER N
-1F13E         ; mapped                 ; 006F          # 6.0  SQUARED LATIN CAPITAL LETTER O
-1F13F         ; mapped                 ; 0070          # 5.2  SQUARED LATIN CAPITAL LETTER P
-1F140         ; mapped                 ; 0071          # 6.0  SQUARED LATIN CAPITAL LETTER Q
-1F141         ; mapped                 ; 0072          # 6.0  SQUARED LATIN CAPITAL LETTER R
-1F142         ; mapped                 ; 0073          # 5.2  SQUARED LATIN CAPITAL LETTER S
-1F143         ; mapped                 ; 0074          # 6.0  SQUARED LATIN CAPITAL LETTER T
-1F144         ; mapped                 ; 0075          # 6.0  SQUARED LATIN CAPITAL LETTER U
-1F145         ; mapped                 ; 0076          # 6.0  SQUARED LATIN CAPITAL LETTER V
-1F146         ; mapped                 ; 0077          # 5.2  SQUARED LATIN CAPITAL LETTER W
-1F147         ; mapped                 ; 0078          # 6.0  SQUARED LATIN CAPITAL LETTER X
-1F148         ; mapped                 ; 0079          # 6.0  SQUARED LATIN CAPITAL LETTER Y
-1F149         ; mapped                 ; 007A          # 6.0  SQUARED LATIN CAPITAL LETTER Z
-1F14A         ; mapped                 ; 0068 0076     # 5.2  SQUARED HV
-1F14B         ; mapped                 ; 006D 0076     # 5.2  SQUARED MV
-1F14C         ; mapped                 ; 0073 0064     # 5.2  SQUARED SD
-1F14D         ; mapped                 ; 0073 0073     # 5.2  SQUARED SS
-1F14E         ; mapped                 ; 0070 0070 0076 #5.2  SQUARED PPV
-1F14F         ; mapped                 ; 0077 0063     # 6.0  SQUARED WC
-1F150..1F156  ; valid                  ;      ; NV8    # 6.0  NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER G
-1F157         ; valid                  ;      ; NV8    # 5.2  NEGATIVE CIRCLED LATIN CAPITAL LETTER H
-1F158..1F15E  ; valid                  ;      ; NV8    # 6.0  NEGATIVE CIRCLED LATIN CAPITAL LETTER I..NEGATIVE CIRCLED LATIN CAPITAL LETTER O
-1F15F         ; valid                  ;      ; NV8    # 5.2  NEGATIVE CIRCLED LATIN CAPITAL LETTER P
-1F160..1F169  ; valid                  ;      ; NV8    # 6.0  NEGATIVE CIRCLED LATIN CAPITAL LETTER Q..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
-1F16A         ; mapped                 ; 006D 0063     # 6.1  RAISED MC SIGN
-1F16B         ; mapped                 ; 006D 0064     # 6.1  RAISED MD SIGN
-1F16C..1F16F  ; disallowed                             # NA   <reserved-1F16C>..<reserved-1F16F>
-1F170..1F178  ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER I
-1F179         ; valid                  ;      ; NV8    # 5.2  NEGATIVE SQUARED LATIN CAPITAL LETTER J
-1F17A         ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED LATIN CAPITAL LETTER K
-1F17B..1F17C  ; valid                  ;      ; NV8    # 5.2  NEGATIVE SQUARED LATIN CAPITAL LETTER L..NEGATIVE SQUARED LATIN CAPITAL LETTER M
-1F17D..1F17E  ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED LATIN CAPITAL LETTER N..NEGATIVE SQUARED LATIN CAPITAL LETTER O
-1F17F         ; valid                  ;      ; NV8    # 5.2  NEGATIVE SQUARED LATIN CAPITAL LETTER P
-1F180..1F189  ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED LATIN CAPITAL LETTER Q..NEGATIVE SQUARED LATIN CAPITAL LETTER Z
-1F18A..1F18D  ; valid                  ;      ; NV8    # 5.2  CROSSED NEGATIVE SQUARED LATIN CAPITAL LETTER P..NEGATIVE SQUARED SA
-1F18E..1F18F  ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED AB..NEGATIVE SQUARED WC
-1F190         ; mapped                 ; 0064 006A     # 5.2  SQUARE DJ
-1F191..1F19A  ; valid                  ;      ; NV8    # 6.0  SQUARED CL..SQUARED VS
-1F19B..1F1AC  ; valid                  ;      ; NV8    # 9.0  SQUARED THREE D..SQUARED VOD
-1F1AD..1F1E5  ; disallowed                             # NA   <reserved-1F1AD>..<reserved-1F1E5>
-1F1E6..1F1FF  ; valid                  ;      ; NV8    # 6.0  REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z
-1F200         ; mapped                 ; 307B 304B     # 5.2  SQUARE HIRAGANA HOKA
-1F201         ; mapped                 ; 30B3 30B3     # 6.0  SQUARED KATAKANA KOKO
-1F202         ; mapped                 ; 30B5          # 6.0  SQUARED KATAKANA SA
-1F203..1F20F  ; disallowed                             # NA   <reserved-1F203>..<reserved-1F20F>
-1F210         ; mapped                 ; 624B          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-624B
-1F211         ; mapped                 ; 5B57          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5B57
-1F212         ; mapped                 ; 53CC          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-53CC
-1F213         ; mapped                 ; 30C7          # 5.2  SQUARED KATAKANA DE
-1F214         ; mapped                 ; 4E8C          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4E8C
-1F215         ; mapped                 ; 591A          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-591A
-1F216         ; mapped                 ; 89E3          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-89E3
-1F217         ; mapped                 ; 5929          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5929
-1F218         ; mapped                 ; 4EA4          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4EA4
-1F219         ; mapped                 ; 6620          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6620
-1F21A         ; mapped                 ; 7121          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-7121
-1F21B         ; mapped                 ; 6599          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6599
-1F21C         ; mapped                 ; 524D          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-524D
-1F21D         ; mapped                 ; 5F8C          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5F8C
-1F21E         ; mapped                 ; 518D          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-518D
-1F21F         ; mapped                 ; 65B0          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-65B0
-1F220         ; mapped                 ; 521D          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-521D
-1F221         ; mapped                 ; 7D42          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-7D42
-1F222         ; mapped                 ; 751F          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-751F
-1F223         ; mapped                 ; 8CA9          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-8CA9
-1F224         ; mapped                 ; 58F0          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-58F0
-1F225         ; mapped                 ; 5439          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5439
-1F226         ; mapped                 ; 6F14          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6F14
-1F227         ; mapped                 ; 6295          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6295
-1F228         ; mapped                 ; 6355          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6355
-1F229         ; mapped                 ; 4E00          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4E00
-1F22A         ; mapped                 ; 4E09          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4E09
-1F22B         ; mapped                 ; 904A          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-904A
-1F22C         ; mapped                 ; 5DE6          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5DE6
-1F22D         ; mapped                 ; 4E2D          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4E2D
-1F22E         ; mapped                 ; 53F3          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-53F3
-1F22F         ; mapped                 ; 6307          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6307
-1F230         ; mapped                 ; 8D70          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-8D70
-1F231         ; mapped                 ; 6253          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6253
-1F232         ; mapped                 ; 7981          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-7981
-1F233         ; mapped                 ; 7A7A          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-7A7A
-1F234         ; mapped                 ; 5408          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-5408
-1F235         ; mapped                 ; 6E80          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-6E80
-1F236         ; mapped                 ; 6709          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-6709
-1F237         ; mapped                 ; 6708          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-6708
-1F238         ; mapped                 ; 7533          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-7533
-1F239         ; mapped                 ; 5272          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-5272
-1F23A         ; mapped                 ; 55B6          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-55B6
-1F23B         ; mapped                 ; 914D          # 9.0  SQUARED CJK UNIFIED IDEOGRAPH-914D
-1F23C..1F23F  ; disallowed                             # NA   <reserved-1F23C>..<reserved-1F23F>
-1F240         ; mapped                 ; 3014 672C 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C
-1F241         ; mapped                 ; 3014 4E09 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E09
-1F242         ; mapped                 ; 3014 4E8C 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E8C
-1F243         ; mapped                 ; 3014 5B89 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-5B89
-1F244         ; mapped                 ; 3014 70B9 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-70B9
-1F245         ; mapped                 ; 3014 6253 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6253
-1F246         ; mapped                 ; 3014 76D7 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-76D7
-1F247         ; mapped                 ; 3014 52DD 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-52DD
-1F248         ; mapped                 ; 3014 6557 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557
-1F249..1F24F  ; disallowed                             # NA   <reserved-1F249>..<reserved-1F24F>
-1F250         ; mapped                 ; 5F97          # 6.0  CIRCLED IDEOGRAPH ADVANTAGE
-1F251         ; mapped                 ; 53EF          # 6.0  CIRCLED IDEOGRAPH ACCEPT
-1F252..1F25F  ; disallowed                             # NA   <reserved-1F252>..<reserved-1F25F>
-1F260..1F265  ; valid                  ;      ; NV8    # 10.0 ROUNDED SYMBOL FOR FU..ROUNDED SYMBOL FOR CAI
-1F266..1F2FF  ; disallowed                             # NA   <reserved-1F266>..<reserved-1F2FF>
-1F300..1F320  ; valid                  ;      ; NV8    # 6.0  CYCLONE..SHOOTING STAR
-1F321..1F32C  ; valid                  ;      ; NV8    # 7.0  THERMOMETER..WIND BLOWING FACE
-1F32D..1F32F  ; valid                  ;      ; NV8    # 8.0  HOT DOG..BURRITO
-1F330..1F335  ; valid                  ;      ; NV8    # 6.0  CHESTNUT..CACTUS
-1F336         ; valid                  ;      ; NV8    # 7.0  HOT PEPPER
-1F337..1F37C  ; valid                  ;      ; NV8    # 6.0  TULIP..BABY BOTTLE
-1F37D         ; valid                  ;      ; NV8    # 7.0  FORK AND KNIFE WITH PLATE
-1F37E..1F37F  ; valid                  ;      ; NV8    # 8.0  BOTTLE WITH POPPING CORK..POPCORN
-1F380..1F393  ; valid                  ;      ; NV8    # 6.0  RIBBON..GRADUATION CAP
-1F394..1F39F  ; valid                  ;      ; NV8    # 7.0  HEART WITH TIP ON THE LEFT..ADMISSION TICKETS
-1F3A0..1F3C4  ; valid                  ;      ; NV8    # 6.0  CAROUSEL HORSE..SURFER
-1F3C5         ; valid                  ;      ; NV8    # 7.0  SPORTS MEDAL
-1F3C6..1F3CA  ; valid                  ;      ; NV8    # 6.0  TROPHY..SWIMMER
-1F3CB..1F3CE  ; valid                  ;      ; NV8    # 7.0  WEIGHT LIFTER..RACING CAR
-1F3CF..1F3D3  ; valid                  ;      ; NV8    # 8.0  CRICKET BAT AND BALL..TABLE TENNIS PADDLE AND BALL
-1F3D4..1F3DF  ; valid                  ;      ; NV8    # 7.0  SNOW CAPPED MOUNTAIN..STADIUM
-1F3E0..1F3F0  ; valid                  ;      ; NV8    # 6.0  HOUSE BUILDING..EUROPEAN CASTLE
-1F3F1..1F3F7  ; valid                  ;      ; NV8    # 7.0  WHITE PENNANT..LABEL
-1F3F8..1F3FF  ; valid                  ;      ; NV8    # 8.0  BADMINTON RACQUET AND SHUTTLECOCK..EMOJI MODIFIER FITZPATRICK TYPE-6
-1F400..1F43E  ; valid                  ;      ; NV8    # 6.0  RAT..PAW PRINTS
-1F43F         ; valid                  ;      ; NV8    # 7.0  CHIPMUNK
-1F440         ; valid                  ;      ; NV8    # 6.0  EYES
-1F441         ; valid                  ;      ; NV8    # 7.0  EYE
-1F442..1F4F7  ; valid                  ;      ; NV8    # 6.0  EAR..CAMERA
-1F4F8         ; valid                  ;      ; NV8    # 7.0  CAMERA WITH FLASH
-1F4F9..1F4FC  ; valid                  ;      ; NV8    # 6.0  VIDEO CAMERA..VIDEOCASSETTE
-1F4FD..1F4FE  ; valid                  ;      ; NV8    # 7.0  FILM PROJECTOR..PORTABLE STEREO
-1F4FF         ; valid                  ;      ; NV8    # 8.0  PRAYER BEADS
-1F500..1F53D  ; valid                  ;      ; NV8    # 6.0  TWISTED RIGHTWARDS ARROWS..DOWN-POINTING SMALL RED TRIANGLE
-1F53E..1F53F  ; valid                  ;      ; NV8    # 7.0  LOWER RIGHT SHADOWED WHITE CIRCLE..UPPER RIGHT SHADOWED WHITE CIRCLE
-1F540..1F543  ; valid                  ;      ; NV8    # 6.1  CIRCLED CROSS POMMEE..NOTCHED LEFT SEMICIRCLE WITH THREE DOTS
-1F544..1F54A  ; valid                  ;      ; NV8    # 7.0  NOTCHED RIGHT SEMICIRCLE WITH THREE DOTS..DOVE OF PEACE
-1F54B..1F54F  ; valid                  ;      ; NV8    # 8.0  KAABA..BOWL OF HYGIEIA
-1F550..1F567  ; valid                  ;      ; NV8    # 6.0  CLOCK FACE ONE OCLOCK..CLOCK FACE TWELVE-THIRTY
-1F568..1F579  ; valid                  ;      ; NV8    # 7.0  RIGHT SPEAKER..JOYSTICK
-1F57A         ; valid                  ;      ; NV8    # 9.0  MAN DANCING
-1F57B..1F5A3  ; valid                  ;      ; NV8    # 7.0  LEFT HAND TELEPHONE RECEIVER..BLACK DOWN POINTING BACKHAND INDEX
-1F5A4         ; valid                  ;      ; NV8    # 9.0  BLACK HEART
-1F5A5..1F5FA  ; valid                  ;      ; NV8    # 7.0  DESKTOP COMPUTER..WORLD MAP
-1F5FB..1F5FF  ; valid                  ;      ; NV8    # 6.0  MOUNT FUJI..MOYAI
-1F600         ; valid                  ;      ; NV8    # 6.1  GRINNING FACE
-1F601..1F610  ; valid                  ;      ; NV8    # 6.0  GRINNING FACE WITH SMILING EYES..NEUTRAL FACE
-1F611         ; valid                  ;      ; NV8    # 6.1  EXPRESSIONLESS FACE
-1F612..1F614  ; valid                  ;      ; NV8    # 6.0  UNAMUSED FACE..PENSIVE FACE
-1F615         ; valid                  ;      ; NV8    # 6.1  CONFUSED FACE
-1F616         ; valid                  ;      ; NV8    # 6.0  CONFOUNDED FACE
-1F617         ; valid                  ;      ; NV8    # 6.1  KISSING FACE
-1F618         ; valid                  ;      ; NV8    # 6.0  FACE THROWING A KISS
-1F619         ; valid                  ;      ; NV8    # 6.1  KISSING FACE WITH SMILING EYES
-1F61A         ; valid                  ;      ; NV8    # 6.0  KISSING FACE WITH CLOSED EYES
-1F61B         ; valid                  ;      ; NV8    # 6.1  FACE WITH STUCK-OUT TONGUE
-1F61C..1F61E  ; valid                  ;      ; NV8    # 6.0  FACE WITH STUCK-OUT TONGUE AND WINKING EYE..DISAPPOINTED FACE
-1F61F         ; valid                  ;      ; NV8    # 6.1  WORRIED FACE
-1F620..1F625  ; valid                  ;      ; NV8    # 6.0  ANGRY FACE..DISAPPOINTED BUT RELIEVED FACE
-1F626..1F627  ; valid                  ;      ; NV8    # 6.1  FROWNING FACE WITH OPEN MOUTH..ANGUISHED FACE
-1F628..1F62B  ; valid                  ;      ; NV8    # 6.0  FEARFUL FACE..TIRED FACE
-1F62C         ; valid                  ;      ; NV8    # 6.1  GRIMACING FACE
-1F62D         ; valid                  ;      ; NV8    # 6.0  LOUDLY CRYING FACE
-1F62E..1F62F  ; valid                  ;      ; NV8    # 6.1  FACE WITH OPEN MOUTH..HUSHED FACE
-1F630..1F633  ; valid                  ;      ; NV8    # 6.0  FACE WITH OPEN MOUTH AND COLD SWEAT..FLUSHED FACE
-1F634         ; valid                  ;      ; NV8    # 6.1  SLEEPING FACE
-1F635..1F640  ; valid                  ;      ; NV8    # 6.0  DIZZY FACE..WEARY CAT FACE
-1F641..1F642  ; valid                  ;      ; NV8    # 7.0  SLIGHTLY FROWNING FACE..SLIGHTLY SMILING FACE
-1F643..1F644  ; valid                  ;      ; NV8    # 8.0  UPSIDE-DOWN FACE..FACE WITH ROLLING EYES
-1F645..1F64F  ; valid                  ;      ; NV8    # 6.0  FACE WITH NO GOOD GESTURE..PERSON WITH FOLDED HANDS
-1F650..1F67F  ; valid                  ;      ; NV8    # 7.0  NORTH WEST POINTING LEAF..REVERSE CHECKER BOARD
-1F680..1F6C5  ; valid                  ;      ; NV8    # 6.0  ROCKET..LEFT LUGGAGE
-1F6C6..1F6CF  ; valid                  ;      ; NV8    # 7.0  TRIANGLE WITH ROUNDED CORNERS..BED
-1F6D0         ; valid                  ;      ; NV8    # 8.0  PLACE OF WORSHIP
-1F6D1..1F6D2  ; valid                  ;      ; NV8    # 9.0  OCTAGONAL SIGN..SHOPPING TROLLEY
-1F6D3..1F6D4  ; valid                  ;      ; NV8    # 10.0 STUPA..PAGODA
-1F6D5..1F6DF  ; disallowed                             # NA   <reserved-1F6D5>..<reserved-1F6DF>
-1F6E0..1F6EC  ; valid                  ;      ; NV8    # 7.0  HAMMER AND WRENCH..AIRPLANE ARRIVING
-1F6ED..1F6EF  ; disallowed                             # NA   <reserved-1F6ED>..<reserved-1F6EF>
-1F6F0..1F6F3  ; valid                  ;      ; NV8    # 7.0  SATELLITE..PASSENGER SHIP
-1F6F4..1F6F6  ; valid                  ;      ; NV8    # 9.0  SCOOTER..CANOE
-1F6F7..1F6F8  ; valid                  ;      ; NV8    # 10.0 SLED..FLYING SAUCER
-1F6F9..1F6FF  ; disallowed                             # NA   <reserved-1F6F9>..<reserved-1F6FF>
-1F700..1F773  ; valid                  ;      ; NV8    # 6.0  ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE
-1F774..1F77F  ; disallowed                             # NA   <reserved-1F774>..<reserved-1F77F>
-1F780..1F7D4  ; valid                  ;      ; NV8    # 7.0  BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE..HEAVY TWELVE POINTED PINWHEEL STAR
-1F7D5..1F7FF  ; disallowed                             # NA   <reserved-1F7D5>..<reserved-1F7FF>
-1F800..1F80B  ; valid                  ;      ; NV8    # 7.0  LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
-1F80C..1F80F  ; disallowed                             # NA   <reserved-1F80C>..<reserved-1F80F>
-1F810..1F847  ; valid                  ;      ; NV8    # 7.0  LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD..DOWNWARDS HEAVY ARROW
-1F848..1F84F  ; disallowed                             # NA   <reserved-1F848>..<reserved-1F84F>
-1F850..1F859  ; valid                  ;      ; NV8    # 7.0  LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW
-1F85A..1F85F  ; disallowed                             # NA   <reserved-1F85A>..<reserved-1F85F>
-1F860..1F887  ; valid                  ;      ; NV8    # 7.0  WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW
-1F888..1F88F  ; disallowed                             # NA   <reserved-1F888>..<reserved-1F88F>
-1F890..1F8AD  ; valid                  ;      ; NV8    # 7.0  LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS
-1F8AE..1F8FF  ; disallowed                             # NA   <reserved-1F8AE>..<reserved-1F8FF>
-1F900..1F90B  ; valid                  ;      ; NV8    # 10.0 CIRCLED CROSS FORMEE WITH FOUR DOTS..DOWNWARD FACING NOTCHED HOOK WITH DOT
-1F90C..1F90F  ; disallowed                             # NA   <reserved-1F90C>..<reserved-1F90F>
-1F910..1F918  ; valid                  ;      ; NV8    # 8.0  ZIPPER-MOUTH FACE..SIGN OF THE HORNS
-1F919..1F91E  ; valid                  ;      ; NV8    # 9.0  CALL ME HAND..HAND WITH INDEX AND MIDDLE FINGERS CROSSED
-1F91F         ; valid                  ;      ; NV8    # 10.0 I LOVE YOU HAND SIGN
-1F920..1F927  ; valid                  ;      ; NV8    # 9.0  FACE WITH COWBOY HAT..SNEEZING FACE
-1F928..1F92F  ; valid                  ;      ; NV8    # 10.0 FACE WITH ONE EYEBROW RAISED..SHOCKED FACE WITH EXPLODING HEAD
-1F930         ; valid                  ;      ; NV8    # 9.0  PREGNANT WOMAN
-1F931..1F932  ; valid                  ;      ; NV8    # 10.0 BREAST-FEEDING..PALMS UP TOGETHER
-1F933..1F93E  ; valid                  ;      ; NV8    # 9.0  SELFIE..HANDBALL
-1F93F         ; disallowed                             # NA   <reserved-1F93F>
-1F940..1F94B  ; valid                  ;      ; NV8    # 9.0  WILTED FLOWER..MARTIAL ARTS UNIFORM
-1F94C         ; valid                  ;      ; NV8    # 10.0 CURLING STONE
-1F94D..1F94F  ; disallowed                             # NA   <reserved-1F94D>..<reserved-1F94F>
-1F950..1F95E  ; valid                  ;      ; NV8    # 9.0  CROISSANT..PANCAKES
-1F95F..1F96B  ; valid                  ;      ; NV8    # 10.0 DUMPLING..CANNED FOOD
-1F96C..1F97F  ; disallowed                             # NA   <reserved-1F96C>..<reserved-1F97F>
-1F980..1F984  ; valid                  ;      ; NV8    # 8.0  CRAB..UNICORN FACE
-1F985..1F991  ; valid                  ;      ; NV8    # 9.0  EAGLE..SQUID
-1F992..1F997  ; valid                  ;      ; NV8    # 10.0 GIRAFFE FACE..CRICKET
-1F998..1F9BF  ; disallowed                             # NA   <reserved-1F998>..<reserved-1F9BF>
-1F9C0         ; valid                  ;      ; NV8    # 8.0  CHEESE WEDGE
-1F9C1..1F9CF  ; disallowed                             # NA   <reserved-1F9C1>..<reserved-1F9CF>
-1F9D0..1F9E6  ; valid                  ;      ; NV8    # 10.0 FACE WITH MONOCLE..SOCKS
-1F9E7..1FFFD  ; disallowed                             # NA   <reserved-1F9E7>..<reserved-1FFFD>
-1FFFE..1FFFF  ; disallowed                             # 2.0  <noncharacter-1FFFE>..<noncharacter-1FFFF>
-20000..2A6D6  ; valid                                  # 3.1  CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
-2A6D7..2A6FF  ; disallowed                             # NA   <reserved-2A6D7>..<reserved-2A6FF>
-2A700..2B734  ; valid                                  # 5.2  CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
-2B735..2B73F  ; disallowed                             # NA   <reserved-2B735>..<reserved-2B73F>
-2B740..2B81D  ; valid                                  # 6.0  CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B81E..2B81F  ; disallowed                             # NA   <reserved-2B81E>..<reserved-2B81F>
-2B820..2CEA1  ; valid                                  # 8.0  CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
-2CEA2..2CEAF  ; disallowed                             # NA   <reserved-2CEA2>..<reserved-2CEAF>
-2CEB0..2EBE0  ; valid                                  # 10.0 CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
-2EBE1..2F7FF  ; disallowed                             # NA   <reserved-2EBE1>..<reserved-2F7FF>
-2F800         ; mapped                 ; 4E3D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F800
-2F801         ; mapped                 ; 4E38          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F801
-2F802         ; mapped                 ; 4E41          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F802
-2F803         ; mapped                 ; 20122         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F803
-2F804         ; mapped                 ; 4F60          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F804
-2F805         ; mapped                 ; 4FAE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F805
-2F806         ; mapped                 ; 4FBB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F806
-2F807         ; mapped                 ; 5002          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F807
-2F808         ; mapped                 ; 507A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F808
-2F809         ; mapped                 ; 5099          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F809
-2F80A         ; mapped                 ; 50E7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80A
-2F80B         ; mapped                 ; 50CF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80B
-2F80C         ; mapped                 ; 349E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80C
-2F80D         ; mapped                 ; 2063A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80D
-2F80E         ; mapped                 ; 514D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80E
-2F80F         ; mapped                 ; 5154          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80F
-2F810         ; mapped                 ; 5164          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F810
-2F811         ; mapped                 ; 5177          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F811
-2F812         ; mapped                 ; 2051C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F812
-2F813         ; mapped                 ; 34B9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F813
-2F814         ; mapped                 ; 5167          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F814
-2F815         ; mapped                 ; 518D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F815
-2F816         ; mapped                 ; 2054B         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F816
-2F817         ; mapped                 ; 5197          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F817
-2F818         ; mapped                 ; 51A4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F818
-2F819         ; mapped                 ; 4ECC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F819
-2F81A         ; mapped                 ; 51AC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81A
-2F81B         ; mapped                 ; 51B5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81B
-2F81C         ; mapped                 ; 291DF         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81C
-2F81D         ; mapped                 ; 51F5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81D
-2F81E         ; mapped                 ; 5203          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81E
-2F81F         ; mapped                 ; 34DF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81F
-2F820         ; mapped                 ; 523B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F820
-2F821         ; mapped                 ; 5246          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F821
-2F822         ; mapped                 ; 5272          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F822
-2F823         ; mapped                 ; 5277          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F823
-2F824         ; mapped                 ; 3515          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F824
-2F825         ; mapped                 ; 52C7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F825
-2F826         ; mapped                 ; 52C9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F826
-2F827         ; mapped                 ; 52E4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F827
-2F828         ; mapped                 ; 52FA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F828
-2F829         ; mapped                 ; 5305          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F829
-2F82A         ; mapped                 ; 5306          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82A
-2F82B         ; mapped                 ; 5317          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82B
-2F82C         ; mapped                 ; 5349          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82C
-2F82D         ; mapped                 ; 5351          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82D
-2F82E         ; mapped                 ; 535A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82E
-2F82F         ; mapped                 ; 5373          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82F
-2F830         ; mapped                 ; 537D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F830
-2F831..2F833  ; mapped                 ; 537F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F831..CJK COMPATIBILITY IDEOGRAPH-2F833
-2F834         ; mapped                 ; 20A2C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F834
-2F835         ; mapped                 ; 7070          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F835
-2F836         ; mapped                 ; 53CA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F836
-2F837         ; mapped                 ; 53DF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F837
-2F838         ; mapped                 ; 20B63         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F838
-2F839         ; mapped                 ; 53EB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F839
-2F83A         ; mapped                 ; 53F1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83A
-2F83B         ; mapped                 ; 5406          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83B
-2F83C         ; mapped                 ; 549E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83C
-2F83D         ; mapped                 ; 5438          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83D
-2F83E         ; mapped                 ; 5448          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83E
-2F83F         ; mapped                 ; 5468          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83F
-2F840         ; mapped                 ; 54A2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F840
-2F841         ; mapped                 ; 54F6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F841
-2F842         ; mapped                 ; 5510          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F842
-2F843         ; mapped                 ; 5553          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F843
-2F844         ; mapped                 ; 5563          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F844
-2F845..2F846  ; mapped                 ; 5584          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F845..CJK COMPATIBILITY IDEOGRAPH-2F846
-2F847         ; mapped                 ; 5599          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F847
-2F848         ; mapped                 ; 55AB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F848
-2F849         ; mapped                 ; 55B3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F849
-2F84A         ; mapped                 ; 55C2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84A
-2F84B         ; mapped                 ; 5716          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84B
-2F84C         ; mapped                 ; 5606          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84C
-2F84D         ; mapped                 ; 5717          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84D
-2F84E         ; mapped                 ; 5651          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84E
-2F84F         ; mapped                 ; 5674          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84F
-2F850         ; mapped                 ; 5207          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F850
-2F851         ; mapped                 ; 58EE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F851
-2F852         ; mapped                 ; 57CE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F852
-2F853         ; mapped                 ; 57F4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F853
-2F854         ; mapped                 ; 580D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F854
-2F855         ; mapped                 ; 578B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F855
-2F856         ; mapped                 ; 5832          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F856
-2F857         ; mapped                 ; 5831          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F857
-2F858         ; mapped                 ; 58AC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F858
-2F859         ; mapped                 ; 214E4         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F859
-2F85A         ; mapped                 ; 58F2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85A
-2F85B         ; mapped                 ; 58F7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85B
-2F85C         ; mapped                 ; 5906          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85C
-2F85D         ; mapped                 ; 591A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85D
-2F85E         ; mapped                 ; 5922          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85E
-2F85F         ; mapped                 ; 5962          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85F
-2F860         ; mapped                 ; 216A8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F860
-2F861         ; mapped                 ; 216EA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F861
-2F862         ; mapped                 ; 59EC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F862
-2F863         ; mapped                 ; 5A1B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F863
-2F864         ; mapped                 ; 5A27          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F864
-2F865         ; mapped                 ; 59D8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F865
-2F866         ; mapped                 ; 5A66          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F866
-2F867         ; mapped                 ; 36EE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F867
-2F868         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F868
-2F869         ; mapped                 ; 5B08          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F869
-2F86A..2F86B  ; mapped                 ; 5B3E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86A..CJK COMPATIBILITY IDEOGRAPH-2F86B
-2F86C         ; mapped                 ; 219C8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86C
-2F86D         ; mapped                 ; 5BC3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86D
-2F86E         ; mapped                 ; 5BD8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86E
-2F86F         ; mapped                 ; 5BE7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86F
-2F870         ; mapped                 ; 5BF3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F870
-2F871         ; mapped                 ; 21B18         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F871
-2F872         ; mapped                 ; 5BFF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F872
-2F873         ; mapped                 ; 5C06          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F873
-2F874         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F874
-2F875         ; mapped                 ; 5C22          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F875
-2F876         ; mapped                 ; 3781          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F876
-2F877         ; mapped                 ; 5C60          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F877
-2F878         ; mapped                 ; 5C6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F878
-2F879         ; mapped                 ; 5CC0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F879
-2F87A         ; mapped                 ; 5C8D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87A
-2F87B         ; mapped                 ; 21DE4         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87B
-2F87C         ; mapped                 ; 5D43          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87C
-2F87D         ; mapped                 ; 21DE6         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87D
-2F87E         ; mapped                 ; 5D6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87E
-2F87F         ; mapped                 ; 5D6B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87F
-2F880         ; mapped                 ; 5D7C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F880
-2F881         ; mapped                 ; 5DE1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F881
-2F882         ; mapped                 ; 5DE2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F882
-2F883         ; mapped                 ; 382F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F883
-2F884         ; mapped                 ; 5DFD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F884
-2F885         ; mapped                 ; 5E28          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F885
-2F886         ; mapped                 ; 5E3D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F886
-2F887         ; mapped                 ; 5E69          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F887
-2F888         ; mapped                 ; 3862          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F888
-2F889         ; mapped                 ; 22183         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F889
-2F88A         ; mapped                 ; 387C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88A
-2F88B         ; mapped                 ; 5EB0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88B
-2F88C         ; mapped                 ; 5EB3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88C
-2F88D         ; mapped                 ; 5EB6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88D
-2F88E         ; mapped                 ; 5ECA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88E
-2F88F         ; mapped                 ; 2A392         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88F
-2F890         ; mapped                 ; 5EFE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F890
-2F891..2F892  ; mapped                 ; 22331         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F891..CJK COMPATIBILITY IDEOGRAPH-2F892
-2F893         ; mapped                 ; 8201          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F893
-2F894..2F895  ; mapped                 ; 5F22          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F894..CJK COMPATIBILITY IDEOGRAPH-2F895
-2F896         ; mapped                 ; 38C7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F896
-2F897         ; mapped                 ; 232B8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F897
-2F898         ; mapped                 ; 261DA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F898
-2F899         ; mapped                 ; 5F62          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F899
-2F89A         ; mapped                 ; 5F6B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89A
-2F89B         ; mapped                 ; 38E3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89B
-2F89C         ; mapped                 ; 5F9A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89C
-2F89D         ; mapped                 ; 5FCD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89D
-2F89E         ; mapped                 ; 5FD7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89E
-2F89F         ; mapped                 ; 5FF9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89F
-2F8A0         ; mapped                 ; 6081          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A0
-2F8A1         ; mapped                 ; 393A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A1
-2F8A2         ; mapped                 ; 391C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A2
-2F8A3         ; mapped                 ; 6094          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A3
-2F8A4         ; mapped                 ; 226D4         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A4
-2F8A5         ; mapped                 ; 60C7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A5
-2F8A6         ; mapped                 ; 6148          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A6
-2F8A7         ; mapped                 ; 614C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A7
-2F8A8         ; mapped                 ; 614E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A8
-2F8A9         ; mapped                 ; 614C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A9
-2F8AA         ; mapped                 ; 617A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AA
-2F8AB         ; mapped                 ; 618E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AB
-2F8AC         ; mapped                 ; 61B2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AC
-2F8AD         ; mapped                 ; 61A4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AD
-2F8AE         ; mapped                 ; 61AF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AE
-2F8AF         ; mapped                 ; 61DE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AF
-2F8B0         ; mapped                 ; 61F2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B0
-2F8B1         ; mapped                 ; 61F6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B1
-2F8B2         ; mapped                 ; 6210          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B2
-2F8B3         ; mapped                 ; 621B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B3
-2F8B4         ; mapped                 ; 625D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B4
-2F8B5         ; mapped                 ; 62B1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B5
-2F8B6         ; mapped                 ; 62D4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B6
-2F8B7         ; mapped                 ; 6350          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B7
-2F8B8         ; mapped                 ; 22B0C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B8
-2F8B9         ; mapped                 ; 633D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B9
-2F8BA         ; mapped                 ; 62FC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BA
-2F8BB         ; mapped                 ; 6368          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BB
-2F8BC         ; mapped                 ; 6383          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BC
-2F8BD         ; mapped                 ; 63E4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BD
-2F8BE         ; mapped                 ; 22BF1         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BE
-2F8BF         ; mapped                 ; 6422          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BF
-2F8C0         ; mapped                 ; 63C5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C0
-2F8C1         ; mapped                 ; 63A9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C1
-2F8C2         ; mapped                 ; 3A2E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C2
-2F8C3         ; mapped                 ; 6469          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C3
-2F8C4         ; mapped                 ; 647E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C4
-2F8C5         ; mapped                 ; 649D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C5
-2F8C6         ; mapped                 ; 6477          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C6
-2F8C7         ; mapped                 ; 3A6C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C7
-2F8C8         ; mapped                 ; 654F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C8
-2F8C9         ; mapped                 ; 656C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C9
-2F8CA         ; mapped                 ; 2300A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CA
-2F8CB         ; mapped                 ; 65E3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CB
-2F8CC         ; mapped                 ; 66F8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CC
-2F8CD         ; mapped                 ; 6649          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CD
-2F8CE         ; mapped                 ; 3B19          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CE
-2F8CF         ; mapped                 ; 6691          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CF
-2F8D0         ; mapped                 ; 3B08          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D0
-2F8D1         ; mapped                 ; 3AE4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D1
-2F8D2         ; mapped                 ; 5192          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D2
-2F8D3         ; mapped                 ; 5195          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D3
-2F8D4         ; mapped                 ; 6700          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D4
-2F8D5         ; mapped                 ; 669C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D5
-2F8D6         ; mapped                 ; 80AD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D6
-2F8D7         ; mapped                 ; 43D9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D7
-2F8D8         ; mapped                 ; 6717          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D8
-2F8D9         ; mapped                 ; 671B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D9
-2F8DA         ; mapped                 ; 6721          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DA
-2F8DB         ; mapped                 ; 675E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DB
-2F8DC         ; mapped                 ; 6753          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DC
-2F8DD         ; mapped                 ; 233C3         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DD
-2F8DE         ; mapped                 ; 3B49          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DE
-2F8DF         ; mapped                 ; 67FA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DF
-2F8E0         ; mapped                 ; 6785          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E0
-2F8E1         ; mapped                 ; 6852          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E1
-2F8E2         ; mapped                 ; 6885          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E2
-2F8E3         ; mapped                 ; 2346D         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E3
-2F8E4         ; mapped                 ; 688E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E4
-2F8E5         ; mapped                 ; 681F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E5
-2F8E6         ; mapped                 ; 6914          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E6
-2F8E7         ; mapped                 ; 3B9D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E7
-2F8E8         ; mapped                 ; 6942          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E8
-2F8E9         ; mapped                 ; 69A3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E9
-2F8EA         ; mapped                 ; 69EA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EA
-2F8EB         ; mapped                 ; 6AA8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EB
-2F8EC         ; mapped                 ; 236A3         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EC
-2F8ED         ; mapped                 ; 6ADB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8ED
-2F8EE         ; mapped                 ; 3C18          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EE
-2F8EF         ; mapped                 ; 6B21          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EF
-2F8F0         ; mapped                 ; 238A7         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F0
-2F8F1         ; mapped                 ; 6B54          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F1
-2F8F2         ; mapped                 ; 3C4E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F2
-2F8F3         ; mapped                 ; 6B72          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F3
-2F8F4         ; mapped                 ; 6B9F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F4
-2F8F5         ; mapped                 ; 6BBA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F5
-2F8F6         ; mapped                 ; 6BBB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F6
-2F8F7         ; mapped                 ; 23A8D         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F7
-2F8F8         ; mapped                 ; 21D0B         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F8
-2F8F9         ; mapped                 ; 23AFA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F9
-2F8FA         ; mapped                 ; 6C4E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FA
-2F8FB         ; mapped                 ; 23CBC         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FB
-2F8FC         ; mapped                 ; 6CBF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FC
-2F8FD         ; mapped                 ; 6CCD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FD
-2F8FE         ; mapped                 ; 6C67          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FE
-2F8FF         ; mapped                 ; 6D16          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FF
-2F900         ; mapped                 ; 6D3E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F900
-2F901         ; mapped                 ; 6D77          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F901
-2F902         ; mapped                 ; 6D41          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F902
-2F903         ; mapped                 ; 6D69          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F903
-2F904         ; mapped                 ; 6D78          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F904
-2F905         ; mapped                 ; 6D85          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F905
-2F906         ; mapped                 ; 23D1E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F906
-2F907         ; mapped                 ; 6D34          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F907
-2F908         ; mapped                 ; 6E2F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F908
-2F909         ; mapped                 ; 6E6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F909
-2F90A         ; mapped                 ; 3D33          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90A
-2F90B         ; mapped                 ; 6ECB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90B
-2F90C         ; mapped                 ; 6EC7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90C
-2F90D         ; mapped                 ; 23ED1         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90D
-2F90E         ; mapped                 ; 6DF9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90E
-2F90F         ; mapped                 ; 6F6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90F
-2F910         ; mapped                 ; 23F5E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F910
-2F911         ; mapped                 ; 23F8E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F911
-2F912         ; mapped                 ; 6FC6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F912
-2F913         ; mapped                 ; 7039          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F913
-2F914         ; mapped                 ; 701E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F914
-2F915         ; mapped                 ; 701B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F915
-2F916         ; mapped                 ; 3D96          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F916
-2F917         ; mapped                 ; 704A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F917
-2F918         ; mapped                 ; 707D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F918
-2F919         ; mapped                 ; 7077          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F919
-2F91A         ; mapped                 ; 70AD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91A
-2F91B         ; mapped                 ; 20525         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91B
-2F91C         ; mapped                 ; 7145          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91C
-2F91D         ; mapped                 ; 24263         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91D
-2F91E         ; mapped                 ; 719C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91E
-2F91F         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91F
-2F920         ; mapped                 ; 7228          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F920
-2F921         ; mapped                 ; 7235          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F921
-2F922         ; mapped                 ; 7250          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F922
-2F923         ; mapped                 ; 24608         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F923
-2F924         ; mapped                 ; 7280          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F924
-2F925         ; mapped                 ; 7295          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F925
-2F926         ; mapped                 ; 24735         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F926
-2F927         ; mapped                 ; 24814         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F927
-2F928         ; mapped                 ; 737A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F928
-2F929         ; mapped                 ; 738B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F929
-2F92A         ; mapped                 ; 3EAC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92A
-2F92B         ; mapped                 ; 73A5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92B
-2F92C..2F92D  ; mapped                 ; 3EB8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92C..CJK COMPATIBILITY IDEOGRAPH-2F92D
-2F92E         ; mapped                 ; 7447          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92E
-2F92F         ; mapped                 ; 745C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92F
-2F930         ; mapped                 ; 7471          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F930
-2F931         ; mapped                 ; 7485          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F931
-2F932         ; mapped                 ; 74CA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F932
-2F933         ; mapped                 ; 3F1B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F933
-2F934         ; mapped                 ; 7524          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F934
-2F935         ; mapped                 ; 24C36         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F935
-2F936         ; mapped                 ; 753E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F936
-2F937         ; mapped                 ; 24C92         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F937
-2F938         ; mapped                 ; 7570          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F938
-2F939         ; mapped                 ; 2219F         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F939
-2F93A         ; mapped                 ; 7610          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93A
-2F93B         ; mapped                 ; 24FA1         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93B
-2F93C         ; mapped                 ; 24FB8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93C
-2F93D         ; mapped                 ; 25044         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93D
-2F93E         ; mapped                 ; 3FFC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93E
-2F93F         ; mapped                 ; 4008          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93F
-2F940         ; mapped                 ; 76F4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F940
-2F941         ; mapped                 ; 250F3         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F941
-2F942         ; mapped                 ; 250F2         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F942
-2F943         ; mapped                 ; 25119         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F943
-2F944         ; mapped                 ; 25133         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F944
-2F945         ; mapped                 ; 771E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F945
-2F946..2F947  ; mapped                 ; 771F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F946..CJK COMPATIBILITY IDEOGRAPH-2F947
-2F948         ; mapped                 ; 774A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F948
-2F949         ; mapped                 ; 4039          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F949
-2F94A         ; mapped                 ; 778B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94A
-2F94B         ; mapped                 ; 4046          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94B
-2F94C         ; mapped                 ; 4096          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94C
-2F94D         ; mapped                 ; 2541D         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94D
-2F94E         ; mapped                 ; 784E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94E
-2F94F         ; mapped                 ; 788C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94F
-2F950         ; mapped                 ; 78CC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F950
-2F951         ; mapped                 ; 40E3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F951
-2F952         ; mapped                 ; 25626         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F952
-2F953         ; mapped                 ; 7956          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F953
-2F954         ; mapped                 ; 2569A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F954
-2F955         ; mapped                 ; 256C5         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F955
-2F956         ; mapped                 ; 798F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F956
-2F957         ; mapped                 ; 79EB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F957
-2F958         ; mapped                 ; 412F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F958
-2F959         ; mapped                 ; 7A40          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F959
-2F95A         ; mapped                 ; 7A4A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95A
-2F95B         ; mapped                 ; 7A4F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95B
-2F95C         ; mapped                 ; 2597C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95C
-2F95D..2F95E  ; mapped                 ; 25AA7         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95D..CJK COMPATIBILITY IDEOGRAPH-2F95E
-2F95F         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95F
-2F960         ; mapped                 ; 4202          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F960
-2F961         ; mapped                 ; 25BAB         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F961
-2F962         ; mapped                 ; 7BC6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F962
-2F963         ; mapped                 ; 7BC9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F963
-2F964         ; mapped                 ; 4227          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F964
-2F965         ; mapped                 ; 25C80         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F965
-2F966         ; mapped                 ; 7CD2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F966
-2F967         ; mapped                 ; 42A0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F967
-2F968         ; mapped                 ; 7CE8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F968
-2F969         ; mapped                 ; 7CE3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F969
-2F96A         ; mapped                 ; 7D00          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96A
-2F96B         ; mapped                 ; 25F86         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96B
-2F96C         ; mapped                 ; 7D63          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96C
-2F96D         ; mapped                 ; 4301          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96D
-2F96E         ; mapped                 ; 7DC7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96E
-2F96F         ; mapped                 ; 7E02          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96F
-2F970         ; mapped                 ; 7E45          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F970
-2F971         ; mapped                 ; 4334          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F971
-2F972         ; mapped                 ; 26228         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F972
-2F973         ; mapped                 ; 26247         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F973
-2F974         ; mapped                 ; 4359          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F974
-2F975         ; mapped                 ; 262D9         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F975
-2F976         ; mapped                 ; 7F7A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F976
-2F977         ; mapped                 ; 2633E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F977
-2F978         ; mapped                 ; 7F95          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F978
-2F979         ; mapped                 ; 7FFA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F979
-2F97A         ; mapped                 ; 8005          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97A
-2F97B         ; mapped                 ; 264DA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97B
-2F97C         ; mapped                 ; 26523         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97C
-2F97D         ; mapped                 ; 8060          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97D
-2F97E         ; mapped                 ; 265A8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97E
-2F97F         ; mapped                 ; 8070          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97F
-2F980         ; mapped                 ; 2335F         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F980
-2F981         ; mapped                 ; 43D5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F981
-2F982         ; mapped                 ; 80B2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F982
-2F983         ; mapped                 ; 8103          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F983
-2F984         ; mapped                 ; 440B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F984
-2F985         ; mapped                 ; 813E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F985
-2F986         ; mapped                 ; 5AB5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F986
-2F987         ; mapped                 ; 267A7         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F987
-2F988         ; mapped                 ; 267B5         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F988
-2F989         ; mapped                 ; 23393         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F989
-2F98A         ; mapped                 ; 2339C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98A
-2F98B         ; mapped                 ; 8201          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98B
-2F98C         ; mapped                 ; 8204          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98C
-2F98D         ; mapped                 ; 8F9E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98D
-2F98E         ; mapped                 ; 446B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98E
-2F98F         ; mapped                 ; 8291          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98F
-2F990         ; mapped                 ; 828B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F990
-2F991         ; mapped                 ; 829D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F991
-2F992         ; mapped                 ; 52B3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F992
-2F993         ; mapped                 ; 82B1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F993
-2F994         ; mapped                 ; 82B3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F994
-2F995         ; mapped                 ; 82BD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F995
-2F996         ; mapped                 ; 82E6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F996
-2F997         ; mapped                 ; 26B3C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F997
-2F998         ; mapped                 ; 82E5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F998
-2F999         ; mapped                 ; 831D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F999
-2F99A         ; mapped                 ; 8363          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99A
-2F99B         ; mapped                 ; 83AD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99B
-2F99C         ; mapped                 ; 8323          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99C
-2F99D         ; mapped                 ; 83BD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99D
-2F99E         ; mapped                 ; 83E7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99E
-2F99F         ; mapped                 ; 8457          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99F
-2F9A0         ; mapped                 ; 8353          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A0
-2F9A1         ; mapped                 ; 83CA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A1
-2F9A2         ; mapped                 ; 83CC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A2
-2F9A3         ; mapped                 ; 83DC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A3
-2F9A4         ; mapped                 ; 26C36         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A4
-2F9A5         ; mapped                 ; 26D6B         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A5
-2F9A6         ; mapped                 ; 26CD5         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A6
-2F9A7         ; mapped                 ; 452B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A7
-2F9A8         ; mapped                 ; 84F1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A8
-2F9A9         ; mapped                 ; 84F3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A9
-2F9AA         ; mapped                 ; 8516          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AA
-2F9AB         ; mapped                 ; 273CA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AB
-2F9AC         ; mapped                 ; 8564          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AC
-2F9AD         ; mapped                 ; 26F2C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AD
-2F9AE         ; mapped                 ; 455D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AE
-2F9AF         ; mapped                 ; 4561          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AF
-2F9B0         ; mapped                 ; 26FB1         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B0
-2F9B1         ; mapped                 ; 270D2         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B1
-2F9B2         ; mapped                 ; 456B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B2
-2F9B3         ; mapped                 ; 8650          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B3
-2F9B4         ; mapped                 ; 865C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B4
-2F9B5         ; mapped                 ; 8667          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B5
-2F9B6         ; mapped                 ; 8669          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B6
-2F9B7         ; mapped                 ; 86A9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B7
-2F9B8         ; mapped                 ; 8688          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B8
-2F9B9         ; mapped                 ; 870E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B9
-2F9BA         ; mapped                 ; 86E2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BA
-2F9BB         ; mapped                 ; 8779          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BB
-2F9BC         ; mapped                 ; 8728          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BC
-2F9BD         ; mapped                 ; 876B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BD
-2F9BE         ; mapped                 ; 8786          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BE
-2F9BF         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BF
-2F9C0         ; mapped                 ; 87E1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C0
-2F9C1         ; mapped                 ; 8801          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C1
-2F9C2         ; mapped                 ; 45F9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C2
-2F9C3         ; mapped                 ; 8860          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C3
-2F9C4         ; mapped                 ; 8863          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C4
-2F9C5         ; mapped                 ; 27667         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C5
-2F9C6         ; mapped                 ; 88D7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C6
-2F9C7         ; mapped                 ; 88DE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C7
-2F9C8         ; mapped                 ; 4635          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C8
-2F9C9         ; mapped                 ; 88FA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C9
-2F9CA         ; mapped                 ; 34BB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CA
-2F9CB         ; mapped                 ; 278AE         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CB
-2F9CC         ; mapped                 ; 27966         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CC
-2F9CD         ; mapped                 ; 46BE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CD
-2F9CE         ; mapped                 ; 46C7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CE
-2F9CF         ; mapped                 ; 8AA0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CF
-2F9D0         ; mapped                 ; 8AED          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D0
-2F9D1         ; mapped                 ; 8B8A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D1
-2F9D2         ; mapped                 ; 8C55          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D2
-2F9D3         ; mapped                 ; 27CA8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D3
-2F9D4         ; mapped                 ; 8CAB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D4
-2F9D5         ; mapped                 ; 8CC1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D5
-2F9D6         ; mapped                 ; 8D1B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D6
-2F9D7         ; mapped                 ; 8D77          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D7
-2F9D8         ; mapped                 ; 27F2F         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D8
-2F9D9         ; mapped                 ; 20804         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D9
-2F9DA         ; mapped                 ; 8DCB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DA
-2F9DB         ; mapped                 ; 8DBC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DB
-2F9DC         ; mapped                 ; 8DF0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DC
-2F9DD         ; mapped                 ; 208DE         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DD
-2F9DE         ; mapped                 ; 8ED4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DE
-2F9DF         ; mapped                 ; 8F38          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DF
-2F9E0         ; mapped                 ; 285D2         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E0
-2F9E1         ; mapped                 ; 285ED         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E1
-2F9E2         ; mapped                 ; 9094          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E2
-2F9E3         ; mapped                 ; 90F1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E3
-2F9E4         ; mapped                 ; 9111          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E4
-2F9E5         ; mapped                 ; 2872E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E5
-2F9E6         ; mapped                 ; 911B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E6
-2F9E7         ; mapped                 ; 9238          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E7
-2F9E8         ; mapped                 ; 92D7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E8
-2F9E9         ; mapped                 ; 92D8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E9
-2F9EA         ; mapped                 ; 927C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EA
-2F9EB         ; mapped                 ; 93F9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EB
-2F9EC         ; mapped                 ; 9415          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EC
-2F9ED         ; mapped                 ; 28BFA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9ED
-2F9EE         ; mapped                 ; 958B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EE
-2F9EF         ; mapped                 ; 4995          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EF
-2F9F0         ; mapped                 ; 95B7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F0
-2F9F1         ; mapped                 ; 28D77         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F1
-2F9F2         ; mapped                 ; 49E6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F2
-2F9F3         ; mapped                 ; 96C3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F3
-2F9F4         ; mapped                 ; 5DB2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F4
-2F9F5         ; mapped                 ; 9723          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F5
-2F9F6         ; mapped                 ; 29145         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F6
-2F9F7         ; mapped                 ; 2921A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F7
-2F9F8         ; mapped                 ; 4A6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F8
-2F9F9         ; mapped                 ; 4A76          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F9
-2F9FA         ; mapped                 ; 97E0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FA
-2F9FB         ; mapped                 ; 2940A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FB
-2F9FC         ; mapped                 ; 4AB2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FC
-2F9FD         ; mapped                 ; 29496         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FD
-2F9FE..2F9FF  ; mapped                 ; 980B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FE..CJK COMPATIBILITY IDEOGRAPH-2F9FF
-2FA00         ; mapped                 ; 9829          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA00
-2FA01         ; mapped                 ; 295B6         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA01
-2FA02         ; mapped                 ; 98E2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA02
-2FA03         ; mapped                 ; 4B33          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA03
-2FA04         ; mapped                 ; 9929          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA04
-2FA05         ; mapped                 ; 99A7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA05
-2FA06         ; mapped                 ; 99C2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA06
-2FA07         ; mapped                 ; 99FE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA07
-2FA08         ; mapped                 ; 4BCE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA08
-2FA09         ; mapped                 ; 29B30         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA09
-2FA0A         ; mapped                 ; 9B12          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0A
-2FA0B         ; mapped                 ; 9C40          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0B
-2FA0C         ; mapped                 ; 9CFD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0C
-2FA0D         ; mapped                 ; 4CCE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0D
-2FA0E         ; mapped                 ; 4CED          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0E
-2FA0F         ; mapped                 ; 9D67          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0F
-2FA10         ; mapped                 ; 2A0CE         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA10
-2FA11         ; mapped                 ; 4CF8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA11
-2FA12         ; mapped                 ; 2A105         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA12
-2FA13         ; mapped                 ; 2A20E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA13
-2FA14         ; mapped                 ; 2A291         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA14
-2FA15         ; mapped                 ; 9EBB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA15
-2FA16         ; mapped                 ; 4D56          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA16
-2FA17         ; mapped                 ; 9EF9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA17
-2FA18         ; mapped                 ; 9EFE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA18
-2FA19         ; mapped                 ; 9F05          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA19
-2FA1A         ; mapped                 ; 9F0F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA1A
-2FA1B         ; mapped                 ; 9F16          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA1B
-2FA1C         ; mapped                 ; 9F3B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA1C
-2FA1D         ; mapped                 ; 2A600         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA1D
-2FA1E..2FFFD  ; disallowed                             # NA   <reserved-2FA1E>..<reserved-2FFFD>
-2FFFE..2FFFF  ; disallowed                             # 2.0  <noncharacter-2FFFE>..<noncharacter-2FFFF>
-30000..3FFFD  ; disallowed                             # NA   <reserved-30000>..<reserved-3FFFD>
-3FFFE..3FFFF  ; disallowed                             # 2.0  <noncharacter-3FFFE>..<noncharacter-3FFFF>
-40000..4FFFD  ; disallowed                             # NA   <reserved-40000>..<reserved-4FFFD>
-4FFFE..4FFFF  ; disallowed                             # 2.0  <noncharacter-4FFFE>..<noncharacter-4FFFF>
-50000..5FFFD  ; disallowed                             # NA   <reserved-50000>..<reserved-5FFFD>
-5FFFE..5FFFF  ; disallowed                             # 2.0  <noncharacter-5FFFE>..<noncharacter-5FFFF>
-60000..6FFFD  ; disallowed                             # NA   <reserved-60000>..<reserved-6FFFD>
-6FFFE..6FFFF  ; disallowed                             # 2.0  <noncharacter-6FFFE>..<noncharacter-6FFFF>
-70000..7FFFD  ; disallowed                             # NA   <reserved-70000>..<reserved-7FFFD>
-7FFFE..7FFFF  ; disallowed                             # 2.0  <noncharacter-7FFFE>..<noncharacter-7FFFF>
-80000..8FFFD  ; disallowed                             # NA   <reserved-80000>..<reserved-8FFFD>
-8FFFE..8FFFF  ; disallowed                             # 2.0  <noncharacter-8FFFE>..<noncharacter-8FFFF>
-90000..9FFFD  ; disallowed                             # NA   <reserved-90000>..<reserved-9FFFD>
-9FFFE..9FFFF  ; disallowed                             # 2.0  <noncharacter-9FFFE>..<noncharacter-9FFFF>
-A0000..AFFFD  ; disallowed                             # NA   <reserved-A0000>..<reserved-AFFFD>
-AFFFE..AFFFF  ; disallowed                             # 2.0  <noncharacter-AFFFE>..<noncharacter-AFFFF>
-B0000..BFFFD  ; disallowed                             # NA   <reserved-B0000>..<reserved-BFFFD>
-BFFFE..BFFFF  ; disallowed                             # 2.0  <noncharacter-BFFFE>..<noncharacter-BFFFF>
-C0000..CFFFD  ; disallowed                             # NA   <reserved-C0000>..<reserved-CFFFD>
-CFFFE..CFFFF  ; disallowed                             # 2.0  <noncharacter-CFFFE>..<noncharacter-CFFFF>
-D0000..DFFFD  ; disallowed                             # NA   <reserved-D0000>..<reserved-DFFFD>
-DFFFE..DFFFF  ; disallowed                             # 2.0  <noncharacter-DFFFE>..<noncharacter-DFFFF>
-E0000         ; disallowed                             # NA   <reserved-E0000>
-E0001         ; disallowed                             # 3.1  LANGUAGE TAG
-E0002..E001F  ; disallowed                             # NA   <reserved-E0002>..<reserved-E001F>
-E0020..E007F  ; disallowed                             # 3.1  TAG SPACE..CANCEL TAG
-E0080..E00FF  ; disallowed                             # NA   <reserved-E0080>..<reserved-E00FF>
-E0100..E01EF  ; ignored                                # 4.0  VARIATION SELECTOR-17..VARIATION SELECTOR-256
-E01F0..EFFFD  ; disallowed                             # NA   <reserved-E01F0>..<reserved-EFFFD>
-EFFFE..EFFFF  ; disallowed                             # 2.0  <noncharacter-EFFFE>..<noncharacter-EFFFF>
-F0000..FFFFD  ; disallowed                             # 2.0  <private-use-F0000>..<private-use-FFFFD>
-FFFFE..FFFFF  ; disallowed                             # 2.0  <noncharacter-FFFFE>..<noncharacter-FFFFF>
-100000..10FFFD; disallowed                             # 2.0  <private-use-100000>..<private-use-10FFFD>
-10FFFE..10FFFF; disallowed                             # 2.0  <noncharacter-10FFFE>..<noncharacter-10FFFF>
-
-# Total code points: 1114112
-
+# IdnaMappingTable.txt
+# Date: 2019-11-07, 13:44:35 GMT
+# © 2019 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Unicode IDNA Compatible Preprocessing for UTS #46
+# Version: 13.0.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr46
+#
+0000..002C    ; disallowed_STD3_valid                  # 1.1  <control-0000>..COMMA
+002D..002E    ; valid                                  # 1.1  HYPHEN-MINUS..FULL STOP
+002F          ; disallowed_STD3_valid                  # 1.1  SOLIDUS
+0030..0039    ; valid                                  # 1.1  DIGIT ZERO..DIGIT NINE
+003A..0040    ; disallowed_STD3_valid                  # 1.1  COLON..COMMERCIAL AT
+0041          ; mapped                 ; 0061          # 1.1  LATIN CAPITAL LETTER A
+0042          ; mapped                 ; 0062          # 1.1  LATIN CAPITAL LETTER B
+0043          ; mapped                 ; 0063          # 1.1  LATIN CAPITAL LETTER C
+0044          ; mapped                 ; 0064          # 1.1  LATIN CAPITAL LETTER D
+0045          ; mapped                 ; 0065          # 1.1  LATIN CAPITAL LETTER E
+0046          ; mapped                 ; 0066          # 1.1  LATIN CAPITAL LETTER F
+0047          ; mapped                 ; 0067          # 1.1  LATIN CAPITAL LETTER G
+0048          ; mapped                 ; 0068          # 1.1  LATIN CAPITAL LETTER H
+0049          ; mapped                 ; 0069          # 1.1  LATIN CAPITAL LETTER I
+004A          ; mapped                 ; 006A          # 1.1  LATIN CAPITAL LETTER J
+004B          ; mapped                 ; 006B          # 1.1  LATIN CAPITAL LETTER K
+004C          ; mapped                 ; 006C          # 1.1  LATIN CAPITAL LETTER L
+004D          ; mapped                 ; 006D          # 1.1  LATIN CAPITAL LETTER M
+004E          ; mapped                 ; 006E          # 1.1  LATIN CAPITAL LETTER N
+004F          ; mapped                 ; 006F          # 1.1  LATIN CAPITAL LETTER O
+0050          ; mapped                 ; 0070          # 1.1  LATIN CAPITAL LETTER P
+0051          ; mapped                 ; 0071          # 1.1  LATIN CAPITAL LETTER Q
+0052          ; mapped                 ; 0072          # 1.1  LATIN CAPITAL LETTER R
+0053          ; mapped                 ; 0073          # 1.1  LATIN CAPITAL LETTER S
+0054          ; mapped                 ; 0074          # 1.1  LATIN CAPITAL LETTER T
+0055          ; mapped                 ; 0075          # 1.1  LATIN CAPITAL LETTER U
+0056          ; mapped                 ; 0076          # 1.1  LATIN CAPITAL LETTER V
+0057          ; mapped                 ; 0077          # 1.1  LATIN CAPITAL LETTER W
+0058          ; mapped                 ; 0078          # 1.1  LATIN CAPITAL LETTER X
+0059          ; mapped                 ; 0079          # 1.1  LATIN CAPITAL LETTER Y
+005A          ; mapped                 ; 007A          # 1.1  LATIN CAPITAL LETTER Z
+005B..0060    ; disallowed_STD3_valid                  # 1.1  LEFT SQUARE BRACKET..GRAVE ACCENT
+0061..007A    ; valid                                  # 1.1  LATIN SMALL LETTER A..LATIN SMALL LETTER Z
+007B..007F    ; disallowed_STD3_valid                  # 1.1  LEFT CURLY BRACKET..<control-007F>
+0080..009F    ; disallowed                             # 1.1  <control-0080>..<control-009F>
+00A0          ; disallowed_STD3_mapped ; 0020          # 1.1  NO-BREAK SPACE
+00A1..00A7    ; valid                  ;      ; NV8    # 1.1  INVERTED EXCLAMATION MARK..SECTION SIGN
+00A8          ; disallowed_STD3_mapped ; 0020 0308     # 1.1  DIAERESIS
+00A9          ; valid                  ;      ; NV8    # 1.1  COPYRIGHT SIGN
+00AA          ; mapped                 ; 0061          # 1.1  FEMININE ORDINAL INDICATOR
+00AB..00AC    ; valid                  ;      ; NV8    # 1.1  LEFT-POINTING DOUBLE ANGLE QUOTATION MARK..NOT SIGN
+00AD          ; ignored                                # 1.1  SOFT HYPHEN
+00AE          ; valid                  ;      ; NV8    # 1.1  REGISTERED SIGN
+00AF          ; disallowed_STD3_mapped ; 0020 0304     # 1.1  MACRON
+00B0..00B1    ; valid                  ;      ; NV8    # 1.1  DEGREE SIGN..PLUS-MINUS SIGN
+00B2          ; mapped                 ; 0032          # 1.1  SUPERSCRIPT TWO
+00B3          ; mapped                 ; 0033          # 1.1  SUPERSCRIPT THREE
+00B4          ; disallowed_STD3_mapped ; 0020 0301     # 1.1  ACUTE ACCENT
+00B5          ; mapped                 ; 03BC          # 1.1  MICRO SIGN
+00B6          ; valid                  ;      ; NV8    # 1.1  PILCROW SIGN
+00B7          ; valid                                  # 1.1  MIDDLE DOT
+00B8          ; disallowed_STD3_mapped ; 0020 0327     # 1.1  CEDILLA
+00B9          ; mapped                 ; 0031          # 1.1  SUPERSCRIPT ONE
+00BA          ; mapped                 ; 006F          # 1.1  MASCULINE ORDINAL INDICATOR
+00BB          ; valid                  ;      ; NV8    # 1.1  RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+00BC          ; mapped                 ; 0031 2044 0034 #1.1  VULGAR FRACTION ONE QUARTER
+00BD          ; mapped                 ; 0031 2044 0032 #1.1  VULGAR FRACTION ONE HALF
+00BE          ; mapped                 ; 0033 2044 0034 #1.1  VULGAR FRACTION THREE QUARTERS
+00BF          ; valid                  ;      ; NV8    # 1.1  INVERTED QUESTION MARK
+00C0          ; mapped                 ; 00E0          # 1.1  LATIN CAPITAL LETTER A WITH GRAVE
+00C1          ; mapped                 ; 00E1          # 1.1  LATIN CAPITAL LETTER A WITH ACUTE
+00C2          ; mapped                 ; 00E2          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+00C3          ; mapped                 ; 00E3          # 1.1  LATIN CAPITAL LETTER A WITH TILDE
+00C4          ; mapped                 ; 00E4          # 1.1  LATIN CAPITAL LETTER A WITH DIAERESIS
+00C5          ; mapped                 ; 00E5          # 1.1  LATIN CAPITAL LETTER A WITH RING ABOVE
+00C6          ; mapped                 ; 00E6          # 1.1  LATIN CAPITAL LETTER AE
+00C7          ; mapped                 ; 00E7          # 1.1  LATIN CAPITAL LETTER C WITH CEDILLA
+00C8          ; mapped                 ; 00E8          # 1.1  LATIN CAPITAL LETTER E WITH GRAVE
+00C9          ; mapped                 ; 00E9          # 1.1  LATIN CAPITAL LETTER E WITH ACUTE
+00CA          ; mapped                 ; 00EA          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+00CB          ; mapped                 ; 00EB          # 1.1  LATIN CAPITAL LETTER E WITH DIAERESIS
+00CC          ; mapped                 ; 00EC          # 1.1  LATIN CAPITAL LETTER I WITH GRAVE
+00CD          ; mapped                 ; 00ED          # 1.1  LATIN CAPITAL LETTER I WITH ACUTE
+00CE          ; mapped                 ; 00EE          # 1.1  LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+00CF          ; mapped                 ; 00EF          # 1.1  LATIN CAPITAL LETTER I WITH DIAERESIS
+00D0          ; mapped                 ; 00F0          # 1.1  LATIN CAPITAL LETTER ETH
+00D1          ; mapped                 ; 00F1          # 1.1  LATIN CAPITAL LETTER N WITH TILDE
+00D2          ; mapped                 ; 00F2          # 1.1  LATIN CAPITAL LETTER O WITH GRAVE
+00D3          ; mapped                 ; 00F3          # 1.1  LATIN CAPITAL LETTER O WITH ACUTE
+00D4          ; mapped                 ; 00F4          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+00D5          ; mapped                 ; 00F5          # 1.1  LATIN CAPITAL LETTER O WITH TILDE
+00D6          ; mapped                 ; 00F6          # 1.1  LATIN CAPITAL LETTER O WITH DIAERESIS
+00D7          ; valid                  ;      ; NV8    # 1.1  MULTIPLICATION SIGN
+00D8          ; mapped                 ; 00F8          # 1.1  LATIN CAPITAL LETTER O WITH STROKE
+00D9          ; mapped                 ; 00F9          # 1.1  LATIN CAPITAL LETTER U WITH GRAVE
+00DA          ; mapped                 ; 00FA          # 1.1  LATIN CAPITAL LETTER U WITH ACUTE
+00DB          ; mapped                 ; 00FB          # 1.1  LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+00DC          ; mapped                 ; 00FC          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS
+00DD          ; mapped                 ; 00FD          # 1.1  LATIN CAPITAL LETTER Y WITH ACUTE
+00DE          ; mapped                 ; 00FE          # 1.1  LATIN CAPITAL LETTER THORN
+00DF          ; deviation              ; 0073 0073     # 1.1  LATIN SMALL LETTER SHARP S
+00E0..00F6    ; valid                                  # 1.1  LATIN SMALL LETTER A WITH GRAVE..LATIN SMALL LETTER O WITH DIAERESIS
+00F7          ; valid                  ;      ; NV8    # 1.1  DIVISION SIGN
+00F8..00FF    ; valid                                  # 1.1  LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER Y WITH DIAERESIS
+0100          ; mapped                 ; 0101          # 1.1  LATIN CAPITAL LETTER A WITH MACRON
+0101          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH MACRON
+0102          ; mapped                 ; 0103          # 1.1  LATIN CAPITAL LETTER A WITH BREVE
+0103          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE
+0104          ; mapped                 ; 0105          # 1.1  LATIN CAPITAL LETTER A WITH OGONEK
+0105          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH OGONEK
+0106          ; mapped                 ; 0107          # 1.1  LATIN CAPITAL LETTER C WITH ACUTE
+0107          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH ACUTE
+0108          ; mapped                 ; 0109          # 1.1  LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+0109          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH CIRCUMFLEX
+010A          ; mapped                 ; 010B          # 1.1  LATIN CAPITAL LETTER C WITH DOT ABOVE
+010B          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH DOT ABOVE
+010C          ; mapped                 ; 010D          # 1.1  LATIN CAPITAL LETTER C WITH CARON
+010D          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH CARON
+010E          ; mapped                 ; 010F          # 1.1  LATIN CAPITAL LETTER D WITH CARON
+010F          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH CARON
+0110          ; mapped                 ; 0111          # 1.1  LATIN CAPITAL LETTER D WITH STROKE
+0111          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH STROKE
+0112          ; mapped                 ; 0113          # 1.1  LATIN CAPITAL LETTER E WITH MACRON
+0113          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH MACRON
+0114          ; mapped                 ; 0115          # 1.1  LATIN CAPITAL LETTER E WITH BREVE
+0115          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH BREVE
+0116          ; mapped                 ; 0117          # 1.1  LATIN CAPITAL LETTER E WITH DOT ABOVE
+0117          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH DOT ABOVE
+0118          ; mapped                 ; 0119          # 1.1  LATIN CAPITAL LETTER E WITH OGONEK
+0119          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH OGONEK
+011A          ; mapped                 ; 011B          # 1.1  LATIN CAPITAL LETTER E WITH CARON
+011B          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CARON
+011C          ; mapped                 ; 011D          # 1.1  LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+011D          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH CIRCUMFLEX
+011E          ; mapped                 ; 011F          # 1.1  LATIN CAPITAL LETTER G WITH BREVE
+011F          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH BREVE
+0120          ; mapped                 ; 0121          # 1.1  LATIN CAPITAL LETTER G WITH DOT ABOVE
+0121          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH DOT ABOVE
+0122          ; mapped                 ; 0123          # 1.1  LATIN CAPITAL LETTER G WITH CEDILLA
+0123          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH CEDILLA
+0124          ; mapped                 ; 0125          # 1.1  LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+0125          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH CIRCUMFLEX
+0126          ; mapped                 ; 0127          # 1.1  LATIN CAPITAL LETTER H WITH STROKE
+0127          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH STROKE
+0128          ; mapped                 ; 0129          # 1.1  LATIN CAPITAL LETTER I WITH TILDE
+0129          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH TILDE
+012A          ; mapped                 ; 012B          # 1.1  LATIN CAPITAL LETTER I WITH MACRON
+012B          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH MACRON
+012C          ; mapped                 ; 012D          # 1.1  LATIN CAPITAL LETTER I WITH BREVE
+012D          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH BREVE
+012E          ; mapped                 ; 012F          # 1.1  LATIN CAPITAL LETTER I WITH OGONEK
+012F          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH OGONEK
+0130          ; mapped                 ; 0069 0307     # 1.1  LATIN CAPITAL LETTER I WITH DOT ABOVE
+0131          ; valid                                  # 1.1  LATIN SMALL LETTER DOTLESS I
+0132..0133    ; mapped                 ; 0069 006A     # 1.1  LATIN CAPITAL LIGATURE IJ..LATIN SMALL LIGATURE IJ
+0134          ; mapped                 ; 0135          # 1.1  LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+0135          ; valid                                  # 1.1  LATIN SMALL LETTER J WITH CIRCUMFLEX
+0136          ; mapped                 ; 0137          # 1.1  LATIN CAPITAL LETTER K WITH CEDILLA
+0137..0138    ; valid                                  # 1.1  LATIN SMALL LETTER K WITH CEDILLA..LATIN SMALL LETTER KRA
+0139          ; mapped                 ; 013A          # 1.1  LATIN CAPITAL LETTER L WITH ACUTE
+013A          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH ACUTE
+013B          ; mapped                 ; 013C          # 1.1  LATIN CAPITAL LETTER L WITH CEDILLA
+013C          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH CEDILLA
+013D          ; mapped                 ; 013E          # 1.1  LATIN CAPITAL LETTER L WITH CARON
+013E          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH CARON
+013F..0140    ; mapped                 ; 006C 00B7     # 1.1  LATIN CAPITAL LETTER L WITH MIDDLE DOT..LATIN SMALL LETTER L WITH MIDDLE DOT
+0141          ; mapped                 ; 0142          # 1.1  LATIN CAPITAL LETTER L WITH STROKE
+0142          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH STROKE
+0143          ; mapped                 ; 0144          # 1.1  LATIN CAPITAL LETTER N WITH ACUTE
+0144          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH ACUTE
+0145          ; mapped                 ; 0146          # 1.1  LATIN CAPITAL LETTER N WITH CEDILLA
+0146          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH CEDILLA
+0147          ; mapped                 ; 0148          # 1.1  LATIN CAPITAL LETTER N WITH CARON
+0148          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH CARON
+0149          ; mapped                 ; 02BC 006E     # 1.1  LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+014A          ; mapped                 ; 014B          # 1.1  LATIN CAPITAL LETTER ENG
+014B          ; valid                                  # 1.1  LATIN SMALL LETTER ENG
+014C          ; mapped                 ; 014D          # 1.1  LATIN CAPITAL LETTER O WITH MACRON
+014D          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH MACRON
+014E          ; mapped                 ; 014F          # 1.1  LATIN CAPITAL LETTER O WITH BREVE
+014F          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH BREVE
+0150          ; mapped                 ; 0151          # 1.1  LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0151          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH DOUBLE ACUTE
+0152          ; mapped                 ; 0153          # 1.1  LATIN CAPITAL LIGATURE OE
+0153          ; valid                                  # 1.1  LATIN SMALL LIGATURE OE
+0154          ; mapped                 ; 0155          # 1.1  LATIN CAPITAL LETTER R WITH ACUTE
+0155          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH ACUTE
+0156          ; mapped                 ; 0157          # 1.1  LATIN CAPITAL LETTER R WITH CEDILLA
+0157          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH CEDILLA
+0158          ; mapped                 ; 0159          # 1.1  LATIN CAPITAL LETTER R WITH CARON
+0159          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH CARON
+015A          ; mapped                 ; 015B          # 1.1  LATIN CAPITAL LETTER S WITH ACUTE
+015B          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH ACUTE
+015C          ; mapped                 ; 015D          # 1.1  LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+015D          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH CIRCUMFLEX
+015E          ; mapped                 ; 015F          # 1.1  LATIN CAPITAL LETTER S WITH CEDILLA
+015F          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH CEDILLA
+0160          ; mapped                 ; 0161          # 1.1  LATIN CAPITAL LETTER S WITH CARON
+0161          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH CARON
+0162          ; mapped                 ; 0163          # 1.1  LATIN CAPITAL LETTER T WITH CEDILLA
+0163          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH CEDILLA
+0164          ; mapped                 ; 0165          # 1.1  LATIN CAPITAL LETTER T WITH CARON
+0165          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH CARON
+0166          ; mapped                 ; 0167          # 1.1  LATIN CAPITAL LETTER T WITH STROKE
+0167          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH STROKE
+0168          ; mapped                 ; 0169          # 1.1  LATIN CAPITAL LETTER U WITH TILDE
+0169          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH TILDE
+016A          ; mapped                 ; 016B          # 1.1  LATIN CAPITAL LETTER U WITH MACRON
+016B          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH MACRON
+016C          ; mapped                 ; 016D          # 1.1  LATIN CAPITAL LETTER U WITH BREVE
+016D          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH BREVE
+016E          ; mapped                 ; 016F          # 1.1  LATIN CAPITAL LETTER U WITH RING ABOVE
+016F          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH RING ABOVE
+0170          ; mapped                 ; 0171          # 1.1  LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0171          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DOUBLE ACUTE
+0172          ; mapped                 ; 0173          # 1.1  LATIN CAPITAL LETTER U WITH OGONEK
+0173          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH OGONEK
+0174          ; mapped                 ; 0175          # 1.1  LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+0175          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH CIRCUMFLEX
+0176          ; mapped                 ; 0177          # 1.1  LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+0177          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH CIRCUMFLEX
+0178          ; mapped                 ; 00FF          # 1.1  LATIN CAPITAL LETTER Y WITH DIAERESIS
+0179          ; mapped                 ; 017A          # 1.1  LATIN CAPITAL LETTER Z WITH ACUTE
+017A          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH ACUTE
+017B          ; mapped                 ; 017C          # 1.1  LATIN CAPITAL LETTER Z WITH DOT ABOVE
+017C          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH DOT ABOVE
+017D          ; mapped                 ; 017E          # 1.1  LATIN CAPITAL LETTER Z WITH CARON
+017E          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH CARON
+017F          ; mapped                 ; 0073          # 1.1  LATIN SMALL LETTER LONG S
+0180          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH STROKE
+0181          ; mapped                 ; 0253          # 1.1  LATIN CAPITAL LETTER B WITH HOOK
+0182          ; mapped                 ; 0183          # 1.1  LATIN CAPITAL LETTER B WITH TOPBAR
+0183          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH TOPBAR
+0184          ; mapped                 ; 0185          # 1.1  LATIN CAPITAL LETTER TONE SIX
+0185          ; valid                                  # 1.1  LATIN SMALL LETTER TONE SIX
+0186          ; mapped                 ; 0254          # 1.1  LATIN CAPITAL LETTER OPEN O
+0187          ; mapped                 ; 0188          # 1.1  LATIN CAPITAL LETTER C WITH HOOK
+0188          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH HOOK
+0189          ; mapped                 ; 0256          # 1.1  LATIN CAPITAL LETTER AFRICAN D
+018A          ; mapped                 ; 0257          # 1.1  LATIN CAPITAL LETTER D WITH HOOK
+018B          ; mapped                 ; 018C          # 1.1  LATIN CAPITAL LETTER D WITH TOPBAR
+018C..018D    ; valid                                  # 1.1  LATIN SMALL LETTER D WITH TOPBAR..LATIN SMALL LETTER TURNED DELTA
+018E          ; mapped                 ; 01DD          # 1.1  LATIN CAPITAL LETTER REVERSED E
+018F          ; mapped                 ; 0259          # 1.1  LATIN CAPITAL LETTER SCHWA
+0190          ; mapped                 ; 025B          # 1.1  LATIN CAPITAL LETTER OPEN E
+0191          ; mapped                 ; 0192          # 1.1  LATIN CAPITAL LETTER F WITH HOOK
+0192          ; valid                                  # 1.1  LATIN SMALL LETTER F WITH HOOK
+0193          ; mapped                 ; 0260          # 1.1  LATIN CAPITAL LETTER G WITH HOOK
+0194          ; mapped                 ; 0263          # 1.1  LATIN CAPITAL LETTER GAMMA
+0195          ; valid                                  # 1.1  LATIN SMALL LETTER HV
+0196          ; mapped                 ; 0269          # 1.1  LATIN CAPITAL LETTER IOTA
+0197          ; mapped                 ; 0268          # 1.1  LATIN CAPITAL LETTER I WITH STROKE
+0198          ; mapped                 ; 0199          # 1.1  LATIN CAPITAL LETTER K WITH HOOK
+0199..019B    ; valid                                  # 1.1  LATIN SMALL LETTER K WITH HOOK..LATIN SMALL LETTER LAMBDA WITH STROKE
+019C          ; mapped                 ; 026F          # 1.1  LATIN CAPITAL LETTER TURNED M
+019D          ; mapped                 ; 0272          # 1.1  LATIN CAPITAL LETTER N WITH LEFT HOOK
+019E          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH LONG RIGHT LEG
+019F          ; mapped                 ; 0275          # 1.1  LATIN CAPITAL LETTER O WITH MIDDLE TILDE
+01A0          ; mapped                 ; 01A1          # 1.1  LATIN CAPITAL LETTER O WITH HORN
+01A1          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN
+01A2          ; mapped                 ; 01A3          # 1.1  LATIN CAPITAL LETTER OI
+01A3          ; valid                                  # 1.1  LATIN SMALL LETTER OI
+01A4          ; mapped                 ; 01A5          # 1.1  LATIN CAPITAL LETTER P WITH HOOK
+01A5          ; valid                                  # 1.1  LATIN SMALL LETTER P WITH HOOK
+01A6          ; mapped                 ; 0280          # 1.1  LATIN LETTER YR
+01A7          ; mapped                 ; 01A8          # 1.1  LATIN CAPITAL LETTER TONE TWO
+01A8          ; valid                                  # 1.1  LATIN SMALL LETTER TONE TWO
+01A9          ; mapped                 ; 0283          # 1.1  LATIN CAPITAL LETTER ESH
+01AA..01AB    ; valid                                  # 1.1  LATIN LETTER REVERSED ESH LOOP..LATIN SMALL LETTER T WITH PALATAL HOOK
+01AC          ; mapped                 ; 01AD          # 1.1  LATIN CAPITAL LETTER T WITH HOOK
+01AD          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH HOOK
+01AE          ; mapped                 ; 0288          # 1.1  LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
+01AF          ; mapped                 ; 01B0          # 1.1  LATIN CAPITAL LETTER U WITH HORN
+01B0          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN
+01B1          ; mapped                 ; 028A          # 1.1  LATIN CAPITAL LETTER UPSILON
+01B2          ; mapped                 ; 028B          # 1.1  LATIN CAPITAL LETTER V WITH HOOK
+01B3          ; mapped                 ; 01B4          # 1.1  LATIN CAPITAL LETTER Y WITH HOOK
+01B4          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH HOOK
+01B5          ; mapped                 ; 01B6          # 1.1  LATIN CAPITAL LETTER Z WITH STROKE
+01B6          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH STROKE
+01B7          ; mapped                 ; 0292          # 1.1  LATIN CAPITAL LETTER EZH
+01B8          ; mapped                 ; 01B9          # 1.1  LATIN CAPITAL LETTER EZH REVERSED
+01B9..01BB    ; valid                                  # 1.1  LATIN SMALL LETTER EZH REVERSED..LATIN LETTER TWO WITH STROKE
+01BC          ; mapped                 ; 01BD          # 1.1  LATIN CAPITAL LETTER TONE FIVE
+01BD..01C3    ; valid                                  # 1.1  LATIN SMALL LETTER TONE FIVE..LATIN LETTER RETROFLEX CLICK
+01C4..01C6    ; mapped                 ; 0064 017E     # 1.1  LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER DZ WITH CARON
+01C7..01C9    ; mapped                 ; 006C 006A     # 1.1  LATIN CAPITAL LETTER LJ..LATIN SMALL LETTER LJ
+01CA..01CC    ; mapped                 ; 006E 006A     # 1.1  LATIN CAPITAL LETTER NJ..LATIN SMALL LETTER NJ
+01CD          ; mapped                 ; 01CE          # 1.1  LATIN CAPITAL LETTER A WITH CARON
+01CE          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CARON
+01CF          ; mapped                 ; 01D0          # 1.1  LATIN CAPITAL LETTER I WITH CARON
+01D0          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH CARON
+01D1          ; mapped                 ; 01D2          # 1.1  LATIN CAPITAL LETTER O WITH CARON
+01D2          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CARON
+01D3          ; mapped                 ; 01D4          # 1.1  LATIN CAPITAL LETTER U WITH CARON
+01D4          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH CARON
+01D5          ; mapped                 ; 01D6          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+01D6          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
+01D7          ; mapped                 ; 01D8          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+01D8          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
+01D9          ; mapped                 ; 01DA          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+01DA          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+01DB          ; mapped                 ; 01DC          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+01DC..01DD    ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE..LATIN SMALL LETTER TURNED E
+01DE          ; mapped                 ; 01DF          # 1.1  LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+01DF          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+01E0          ; mapped                 ; 01E1          # 1.1  LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+01E1          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
+01E2          ; mapped                 ; 01E3          # 1.1  LATIN CAPITAL LETTER AE WITH MACRON
+01E3          ; valid                                  # 1.1  LATIN SMALL LETTER AE WITH MACRON
+01E4          ; mapped                 ; 01E5          # 1.1  LATIN CAPITAL LETTER G WITH STROKE
+01E5          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH STROKE
+01E6          ; mapped                 ; 01E7          # 1.1  LATIN CAPITAL LETTER G WITH CARON
+01E7          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH CARON
+01E8          ; mapped                 ; 01E9          # 1.1  LATIN CAPITAL LETTER K WITH CARON
+01E9          ; valid                                  # 1.1  LATIN SMALL LETTER K WITH CARON
+01EA          ; mapped                 ; 01EB          # 1.1  LATIN CAPITAL LETTER O WITH OGONEK
+01EB          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH OGONEK
+01EC          ; mapped                 ; 01ED          # 1.1  LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+01ED          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH OGONEK AND MACRON
+01EE          ; mapped                 ; 01EF          # 1.1  LATIN CAPITAL LETTER EZH WITH CARON
+01EF..01F0    ; valid                                  # 1.1  LATIN SMALL LETTER EZH WITH CARON..LATIN SMALL LETTER J WITH CARON
+01F1..01F3    ; mapped                 ; 0064 007A     # 1.1  LATIN CAPITAL LETTER DZ..LATIN SMALL LETTER DZ
+01F4          ; mapped                 ; 01F5          # 1.1  LATIN CAPITAL LETTER G WITH ACUTE
+01F5          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH ACUTE
+01F6          ; mapped                 ; 0195          # 3.0  LATIN CAPITAL LETTER HWAIR
+01F7          ; mapped                 ; 01BF          # 3.0  LATIN CAPITAL LETTER WYNN
+01F8          ; mapped                 ; 01F9          # 3.0  LATIN CAPITAL LETTER N WITH GRAVE
+01F9          ; valid                                  # 3.0  LATIN SMALL LETTER N WITH GRAVE
+01FA          ; mapped                 ; 01FB          # 1.1  LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+01FB          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+01FC          ; mapped                 ; 01FD          # 1.1  LATIN CAPITAL LETTER AE WITH ACUTE
+01FD          ; valid                                  # 1.1  LATIN SMALL LETTER AE WITH ACUTE
+01FE          ; mapped                 ; 01FF          # 1.1  LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+01FF          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH STROKE AND ACUTE
+0200          ; mapped                 ; 0201          # 1.1  LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+0201          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH DOUBLE GRAVE
+0202          ; mapped                 ; 0203          # 1.1  LATIN CAPITAL LETTER A WITH INVERTED BREVE
+0203          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH INVERTED BREVE
+0204          ; mapped                 ; 0205          # 1.1  LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+0205          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH DOUBLE GRAVE
+0206          ; mapped                 ; 0207          # 1.1  LATIN CAPITAL LETTER E WITH INVERTED BREVE
+0207          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH INVERTED BREVE
+0208          ; mapped                 ; 0209          # 1.1  LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+0209          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH DOUBLE GRAVE
+020A          ; mapped                 ; 020B          # 1.1  LATIN CAPITAL LETTER I WITH INVERTED BREVE
+020B          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH INVERTED BREVE
+020C          ; mapped                 ; 020D          # 1.1  LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+020D          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH DOUBLE GRAVE
+020E          ; mapped                 ; 020F          # 1.1  LATIN CAPITAL LETTER O WITH INVERTED BREVE
+020F          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH INVERTED BREVE
+0210          ; mapped                 ; 0211          # 1.1  LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+0211          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH DOUBLE GRAVE
+0212          ; mapped                 ; 0213          # 1.1  LATIN CAPITAL LETTER R WITH INVERTED BREVE
+0213          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH INVERTED BREVE
+0214          ; mapped                 ; 0215          # 1.1  LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+0215          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DOUBLE GRAVE
+0216          ; mapped                 ; 0217          # 1.1  LATIN CAPITAL LETTER U WITH INVERTED BREVE
+0217          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH INVERTED BREVE
+0218          ; mapped                 ; 0219          # 3.0  LATIN CAPITAL LETTER S WITH COMMA BELOW
+0219          ; valid                                  # 3.0  LATIN SMALL LETTER S WITH COMMA BELOW
+021A          ; mapped                 ; 021B          # 3.0  LATIN CAPITAL LETTER T WITH COMMA BELOW
+021B          ; valid                                  # 3.0  LATIN SMALL LETTER T WITH COMMA BELOW
+021C          ; mapped                 ; 021D          # 3.0  LATIN CAPITAL LETTER YOGH
+021D          ; valid                                  # 3.0  LATIN SMALL LETTER YOGH
+021E          ; mapped                 ; 021F          # 3.0  LATIN CAPITAL LETTER H WITH CARON
+021F          ; valid                                  # 3.0  LATIN SMALL LETTER H WITH CARON
+0220          ; mapped                 ; 019E          # 3.2  LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+0221          ; valid                                  # 4.0  LATIN SMALL LETTER D WITH CURL
+0222          ; mapped                 ; 0223          # 3.0  LATIN CAPITAL LETTER OU
+0223          ; valid                                  # 3.0  LATIN SMALL LETTER OU
+0224          ; mapped                 ; 0225          # 3.0  LATIN CAPITAL LETTER Z WITH HOOK
+0225          ; valid                                  # 3.0  LATIN SMALL LETTER Z WITH HOOK
+0226          ; mapped                 ; 0227          # 3.0  LATIN CAPITAL LETTER A WITH DOT ABOVE
+0227          ; valid                                  # 3.0  LATIN SMALL LETTER A WITH DOT ABOVE
+0228          ; mapped                 ; 0229          # 3.0  LATIN CAPITAL LETTER E WITH CEDILLA
+0229          ; valid                                  # 3.0  LATIN SMALL LETTER E WITH CEDILLA
+022A          ; mapped                 ; 022B          # 3.0  LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+022B          ; valid                                  # 3.0  LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
+022C          ; mapped                 ; 022D          # 3.0  LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+022D          ; valid                                  # 3.0  LATIN SMALL LETTER O WITH TILDE AND MACRON
+022E          ; mapped                 ; 022F          # 3.0  LATIN CAPITAL LETTER O WITH DOT ABOVE
+022F          ; valid                                  # 3.0  LATIN SMALL LETTER O WITH DOT ABOVE
+0230          ; mapped                 ; 0231          # 3.0  LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
+0231          ; valid                                  # 3.0  LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
+0232          ; mapped                 ; 0233          # 3.0  LATIN CAPITAL LETTER Y WITH MACRON
+0233          ; valid                                  # 3.0  LATIN SMALL LETTER Y WITH MACRON
+0234..0236    ; valid                                  # 4.0  LATIN SMALL LETTER L WITH CURL..LATIN SMALL LETTER T WITH CURL
+0237..0239    ; valid                                  # 4.1  LATIN SMALL LETTER DOTLESS J..LATIN SMALL LETTER QP DIGRAPH
+023A          ; mapped                 ; 2C65          # 4.1  LATIN CAPITAL LETTER A WITH STROKE
+023B          ; mapped                 ; 023C          # 4.1  LATIN CAPITAL LETTER C WITH STROKE
+023C          ; valid                                  # 4.1  LATIN SMALL LETTER C WITH STROKE
+023D          ; mapped                 ; 019A          # 4.1  LATIN CAPITAL LETTER L WITH BAR
+023E          ; mapped                 ; 2C66          # 4.1  LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
+023F..0240    ; valid                                  # 4.1  LATIN SMALL LETTER S WITH SWASH TAIL..LATIN SMALL LETTER Z WITH SWASH TAIL
+0241          ; mapped                 ; 0242          # 4.1  LATIN CAPITAL LETTER GLOTTAL STOP
+0242          ; valid                                  # 5.0  LATIN SMALL LETTER GLOTTAL STOP
+0243          ; mapped                 ; 0180          # 5.0  LATIN CAPITAL LETTER B WITH STROKE
+0244          ; mapped                 ; 0289          # 5.0  LATIN CAPITAL LETTER U BAR
+0245          ; mapped                 ; 028C          # 5.0  LATIN CAPITAL LETTER TURNED V
+0246          ; mapped                 ; 0247          # 5.0  LATIN CAPITAL LETTER E WITH STROKE
+0247          ; valid                                  # 5.0  LATIN SMALL LETTER E WITH STROKE
+0248          ; mapped                 ; 0249          # 5.0  LATIN CAPITAL LETTER J WITH STROKE
+0249          ; valid                                  # 5.0  LATIN SMALL LETTER J WITH STROKE
+024A          ; mapped                 ; 024B          # 5.0  LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
+024B          ; valid                                  # 5.0  LATIN SMALL LETTER Q WITH HOOK TAIL
+024C          ; mapped                 ; 024D          # 5.0  LATIN CAPITAL LETTER R WITH STROKE
+024D          ; valid                                  # 5.0  LATIN SMALL LETTER R WITH STROKE
+024E          ; mapped                 ; 024F          # 5.0  LATIN CAPITAL LETTER Y WITH STROKE
+024F          ; valid                                  # 5.0  LATIN SMALL LETTER Y WITH STROKE
+0250..02A8    ; valid                                  # 1.1  LATIN SMALL LETTER TURNED A..LATIN SMALL LETTER TC DIGRAPH WITH CURL
+02A9..02AD    ; valid                                  # 3.0  LATIN SMALL LETTER FENG DIGRAPH..LATIN LETTER BIDENTAL PERCUSSIVE
+02AE..02AF    ; valid                                  # 4.0  LATIN SMALL LETTER TURNED H WITH FISHHOOK..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+02B0          ; mapped                 ; 0068          # 1.1  MODIFIER LETTER SMALL H
+02B1          ; mapped                 ; 0266          # 1.1  MODIFIER LETTER SMALL H WITH HOOK
+02B2          ; mapped                 ; 006A          # 1.1  MODIFIER LETTER SMALL J
+02B3          ; mapped                 ; 0072          # 1.1  MODIFIER LETTER SMALL R
+02B4          ; mapped                 ; 0279          # 1.1  MODIFIER LETTER SMALL TURNED R
+02B5          ; mapped                 ; 027B          # 1.1  MODIFIER LETTER SMALL TURNED R WITH HOOK
+02B6          ; mapped                 ; 0281          # 1.1  MODIFIER LETTER SMALL CAPITAL INVERTED R
+02B7          ; mapped                 ; 0077          # 1.1  MODIFIER LETTER SMALL W
+02B8          ; mapped                 ; 0079          # 1.1  MODIFIER LETTER SMALL Y
+02B9..02C1    ; valid                                  # 1.1  MODIFIER LETTER PRIME..MODIFIER LETTER REVERSED GLOTTAL STOP
+02C2..02C5    ; valid                  ;      ; NV8    # 1.1  MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD
+02C6..02D1    ; valid                                  # 1.1  MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
+02D2..02D7    ; valid                  ;      ; NV8    # 1.1  MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER MINUS SIGN
+02D8          ; disallowed_STD3_mapped ; 0020 0306     # 1.1  BREVE
+02D9          ; disallowed_STD3_mapped ; 0020 0307     # 1.1  DOT ABOVE
+02DA          ; disallowed_STD3_mapped ; 0020 030A     # 1.1  RING ABOVE
+02DB          ; disallowed_STD3_mapped ; 0020 0328     # 1.1  OGONEK
+02DC          ; disallowed_STD3_mapped ; 0020 0303     # 1.1  SMALL TILDE
+02DD          ; disallowed_STD3_mapped ; 0020 030B     # 1.1  DOUBLE ACUTE ACCENT
+02DE          ; valid                  ;      ; NV8    # 1.1  MODIFIER LETTER RHOTIC HOOK
+02DF          ; valid                  ;      ; NV8    # 3.0  MODIFIER LETTER CROSS ACCENT
+02E0          ; mapped                 ; 0263          # 1.1  MODIFIER LETTER SMALL GAMMA
+02E1          ; mapped                 ; 006C          # 1.1  MODIFIER LETTER SMALL L
+02E2          ; mapped                 ; 0073          # 1.1  MODIFIER LETTER SMALL S
+02E3          ; mapped                 ; 0078          # 1.1  MODIFIER LETTER SMALL X
+02E4          ; mapped                 ; 0295          # 1.1  MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
+02E5..02E9    ; valid                  ;      ; NV8    # 1.1  MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER EXTRA-LOW TONE BAR
+02EA..02EB    ; valid                  ;      ; NV8    # 3.0  MODIFIER LETTER YIN DEPARTING TONE MARK..MODIFIER LETTER YANG DEPARTING TONE MARK
+02EC          ; valid                                  # 3.0  MODIFIER LETTER VOICING
+02ED          ; valid                  ;      ; NV8    # 3.0  MODIFIER LETTER UNASPIRATED
+02EE          ; valid                                  # 3.0  MODIFIER LETTER DOUBLE APOSTROPHE
+02EF..02FF    ; valid                  ;      ; NV8    # 4.0  MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER LETTER LOW LEFT ARROW
+0300..033F    ; valid                                  # 1.1  COMBINING GRAVE ACCENT..COMBINING DOUBLE OVERLINE
+0340          ; mapped                 ; 0300          # 1.1  COMBINING GRAVE TONE MARK
+0341          ; mapped                 ; 0301          # 1.1  COMBINING ACUTE TONE MARK
+0342          ; valid                                  # 1.1  COMBINING GREEK PERISPOMENI
+0343          ; mapped                 ; 0313          # 1.1  COMBINING GREEK KORONIS
+0344          ; mapped                 ; 0308 0301     # 1.1  COMBINING GREEK DIALYTIKA TONOS
+0345          ; mapped                 ; 03B9          # 1.1  COMBINING GREEK YPOGEGRAMMENI
+0346..034E    ; valid                                  # 3.0  COMBINING BRIDGE ABOVE..COMBINING UPWARDS ARROW BELOW
+034F          ; ignored                                # 3.2  COMBINING GRAPHEME JOINER
+0350..0357    ; valid                                  # 4.0  COMBINING RIGHT ARROWHEAD ABOVE..COMBINING RIGHT HALF RING ABOVE
+0358..035C    ; valid                                  # 4.1  COMBINING DOT ABOVE RIGHT..COMBINING DOUBLE BREVE BELOW
+035D..035F    ; valid                                  # 4.0  COMBINING DOUBLE BREVE..COMBINING DOUBLE MACRON BELOW
+0360..0361    ; valid                                  # 1.1  COMBINING DOUBLE TILDE..COMBINING DOUBLE INVERTED BREVE
+0362          ; valid                                  # 3.0  COMBINING DOUBLE RIGHTWARDS ARROW BELOW
+0363..036F    ; valid                                  # 3.2  COMBINING LATIN SMALL LETTER A..COMBINING LATIN SMALL LETTER X
+0370          ; mapped                 ; 0371          # 5.1  GREEK CAPITAL LETTER HETA
+0371          ; valid                                  # 5.1  GREEK SMALL LETTER HETA
+0372          ; mapped                 ; 0373          # 5.1  GREEK CAPITAL LETTER ARCHAIC SAMPI
+0373          ; valid                                  # 5.1  GREEK SMALL LETTER ARCHAIC SAMPI
+0374          ; mapped                 ; 02B9          # 1.1  GREEK NUMERAL SIGN
+0375          ; valid                                  # 1.1  GREEK LOWER NUMERAL SIGN
+0376          ; mapped                 ; 0377          # 5.1  GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
+0377          ; valid                                  # 5.1  GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
+0378..0379    ; disallowed                             # NA   <reserved-0378>..<reserved-0379>
+037A          ; disallowed_STD3_mapped ; 0020 03B9     # 1.1  GREEK YPOGEGRAMMENI
+037B..037D    ; valid                                  # 5.0  GREEK SMALL REVERSED LUNATE SIGMA SYMBOL..GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
+037E          ; disallowed_STD3_mapped ; 003B          # 1.1  GREEK QUESTION MARK
+037F          ; mapped                 ; 03F3          # 7.0  GREEK CAPITAL LETTER YOT
+0380..0383    ; disallowed                             # NA   <reserved-0380>..<reserved-0383>
+0384          ; disallowed_STD3_mapped ; 0020 0301     # 1.1  GREEK TONOS
+0385          ; disallowed_STD3_mapped ; 0020 0308 0301 #1.1  GREEK DIALYTIKA TONOS
+0386          ; mapped                 ; 03AC          # 1.1  GREEK CAPITAL LETTER ALPHA WITH TONOS
+0387          ; mapped                 ; 00B7          # 1.1  GREEK ANO TELEIA
+0388          ; mapped                 ; 03AD          # 1.1  GREEK CAPITAL LETTER EPSILON WITH TONOS
+0389          ; mapped                 ; 03AE          # 1.1  GREEK CAPITAL LETTER ETA WITH TONOS
+038A          ; mapped                 ; 03AF          # 1.1  GREEK CAPITAL LETTER IOTA WITH TONOS
+038B          ; disallowed                             # NA   <reserved-038B>
+038C          ; mapped                 ; 03CC          # 1.1  GREEK CAPITAL LETTER OMICRON WITH TONOS
+038D          ; disallowed                             # NA   <reserved-038D>
+038E          ; mapped                 ; 03CD          # 1.1  GREEK CAPITAL LETTER UPSILON WITH TONOS
+038F          ; mapped                 ; 03CE          # 1.1  GREEK CAPITAL LETTER OMEGA WITH TONOS
+0390          ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+0391          ; mapped                 ; 03B1          # 1.1  GREEK CAPITAL LETTER ALPHA
+0392          ; mapped                 ; 03B2          # 1.1  GREEK CAPITAL LETTER BETA
+0393          ; mapped                 ; 03B3          # 1.1  GREEK CAPITAL LETTER GAMMA
+0394          ; mapped                 ; 03B4          # 1.1  GREEK CAPITAL LETTER DELTA
+0395          ; mapped                 ; 03B5          # 1.1  GREEK CAPITAL LETTER EPSILON
+0396          ; mapped                 ; 03B6          # 1.1  GREEK CAPITAL LETTER ZETA
+0397          ; mapped                 ; 03B7          # 1.1  GREEK CAPITAL LETTER ETA
+0398          ; mapped                 ; 03B8          # 1.1  GREEK CAPITAL LETTER THETA
+0399          ; mapped                 ; 03B9          # 1.1  GREEK CAPITAL LETTER IOTA
+039A          ; mapped                 ; 03BA          # 1.1  GREEK CAPITAL LETTER KAPPA
+039B          ; mapped                 ; 03BB          # 1.1  GREEK CAPITAL LETTER LAMDA
+039C          ; mapped                 ; 03BC          # 1.1  GREEK CAPITAL LETTER MU
+039D          ; mapped                 ; 03BD          # 1.1  GREEK CAPITAL LETTER NU
+039E          ; mapped                 ; 03BE          # 1.1  GREEK CAPITAL LETTER XI
+039F          ; mapped                 ; 03BF          # 1.1  GREEK CAPITAL LETTER OMICRON
+03A0          ; mapped                 ; 03C0          # 1.1  GREEK CAPITAL LETTER PI
+03A1          ; mapped                 ; 03C1          # 1.1  GREEK CAPITAL LETTER RHO
+03A2          ; disallowed                             # NA   <reserved-03A2>
+03A3          ; mapped                 ; 03C3          # 1.1  GREEK CAPITAL LETTER SIGMA
+03A4          ; mapped                 ; 03C4          # 1.1  GREEK CAPITAL LETTER TAU
+03A5          ; mapped                 ; 03C5          # 1.1  GREEK CAPITAL LETTER UPSILON
+03A6          ; mapped                 ; 03C6          # 1.1  GREEK CAPITAL LETTER PHI
+03A7          ; mapped                 ; 03C7          # 1.1  GREEK CAPITAL LETTER CHI
+03A8          ; mapped                 ; 03C8          # 1.1  GREEK CAPITAL LETTER PSI
+03A9          ; mapped                 ; 03C9          # 1.1  GREEK CAPITAL LETTER OMEGA
+03AA          ; mapped                 ; 03CA          # 1.1  GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+03AB          ; mapped                 ; 03CB          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+03AC..03C1    ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH TONOS..GREEK SMALL LETTER RHO
+03C2          ; deviation              ; 03C3          # 1.1  GREEK SMALL LETTER FINAL SIGMA
+03C3..03CE    ; valid                                  # 1.1  GREEK SMALL LETTER SIGMA..GREEK SMALL LETTER OMEGA WITH TONOS
+03CF          ; mapped                 ; 03D7          # 5.1  GREEK CAPITAL KAI SYMBOL
+03D0          ; mapped                 ; 03B2          # 1.1  GREEK BETA SYMBOL
+03D1          ; mapped                 ; 03B8          # 1.1  GREEK THETA SYMBOL
+03D2          ; mapped                 ; 03C5          # 1.1  GREEK UPSILON WITH HOOK SYMBOL
+03D3          ; mapped                 ; 03CD          # 1.1  GREEK UPSILON WITH ACUTE AND HOOK SYMBOL
+03D4          ; mapped                 ; 03CB          # 1.1  GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL
+03D5          ; mapped                 ; 03C6          # 1.1  GREEK PHI SYMBOL
+03D6          ; mapped                 ; 03C0          # 1.1  GREEK PI SYMBOL
+03D7          ; valid                                  # 3.0  GREEK KAI SYMBOL
+03D8          ; mapped                 ; 03D9          # 3.2  GREEK LETTER ARCHAIC KOPPA
+03D9          ; valid                                  # 3.2  GREEK SMALL LETTER ARCHAIC KOPPA
+03DA          ; mapped                 ; 03DB          # 1.1  GREEK LETTER STIGMA
+03DB          ; valid                                  # 3.0  GREEK SMALL LETTER STIGMA
+03DC          ; mapped                 ; 03DD          # 1.1  GREEK LETTER DIGAMMA
+03DD          ; valid                                  # 3.0  GREEK SMALL LETTER DIGAMMA
+03DE          ; mapped                 ; 03DF          # 1.1  GREEK LETTER KOPPA
+03DF          ; valid                                  # 3.0  GREEK SMALL LETTER KOPPA
+03E0          ; mapped                 ; 03E1          # 1.1  GREEK LETTER SAMPI
+03E1          ; valid                                  # 3.0  GREEK SMALL LETTER SAMPI
+03E2          ; mapped                 ; 03E3          # 1.1  COPTIC CAPITAL LETTER SHEI
+03E3          ; valid                                  # 1.1  COPTIC SMALL LETTER SHEI
+03E4          ; mapped                 ; 03E5          # 1.1  COPTIC CAPITAL LETTER FEI
+03E5          ; valid                                  # 1.1  COPTIC SMALL LETTER FEI
+03E6          ; mapped                 ; 03E7          # 1.1  COPTIC CAPITAL LETTER KHEI
+03E7          ; valid                                  # 1.1  COPTIC SMALL LETTER KHEI
+03E8          ; mapped                 ; 03E9          # 1.1  COPTIC CAPITAL LETTER HORI
+03E9          ; valid                                  # 1.1  COPTIC SMALL LETTER HORI
+03EA          ; mapped                 ; 03EB          # 1.1  COPTIC CAPITAL LETTER GANGIA
+03EB          ; valid                                  # 1.1  COPTIC SMALL LETTER GANGIA
+03EC          ; mapped                 ; 03ED          # 1.1  COPTIC CAPITAL LETTER SHIMA
+03ED          ; valid                                  # 1.1  COPTIC SMALL LETTER SHIMA
+03EE          ; mapped                 ; 03EF          # 1.1  COPTIC CAPITAL LETTER DEI
+03EF          ; valid                                  # 1.1  COPTIC SMALL LETTER DEI
+03F0          ; mapped                 ; 03BA          # 1.1  GREEK KAPPA SYMBOL
+03F1          ; mapped                 ; 03C1          # 1.1  GREEK RHO SYMBOL
+03F2          ; mapped                 ; 03C3          # 1.1  GREEK LUNATE SIGMA SYMBOL
+03F3          ; valid                                  # 1.1  GREEK LETTER YOT
+03F4          ; mapped                 ; 03B8          # 3.1  GREEK CAPITAL THETA SYMBOL
+03F5          ; mapped                 ; 03B5          # 3.1  GREEK LUNATE EPSILON SYMBOL
+03F6          ; valid                  ;      ; NV8    # 3.2  GREEK REVERSED LUNATE EPSILON SYMBOL
+03F7          ; mapped                 ; 03F8          # 4.0  GREEK CAPITAL LETTER SHO
+03F8          ; valid                                  # 4.0  GREEK SMALL LETTER SHO
+03F9          ; mapped                 ; 03C3          # 4.0  GREEK CAPITAL LUNATE SIGMA SYMBOL
+03FA          ; mapped                 ; 03FB          # 4.0  GREEK CAPITAL LETTER SAN
+03FB          ; valid                                  # 4.0  GREEK SMALL LETTER SAN
+03FC          ; valid                                  # 4.1  GREEK RHO WITH STROKE SYMBOL
+03FD          ; mapped                 ; 037B          # 4.1  GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL
+03FE          ; mapped                 ; 037C          # 4.1  GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL
+03FF          ; mapped                 ; 037D          # 4.1  GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL
+0400          ; mapped                 ; 0450          # 3.0  CYRILLIC CAPITAL LETTER IE WITH GRAVE
+0401          ; mapped                 ; 0451          # 1.1  CYRILLIC CAPITAL LETTER IO
+0402          ; mapped                 ; 0452          # 1.1  CYRILLIC CAPITAL LETTER DJE
+0403          ; mapped                 ; 0453          # 1.1  CYRILLIC CAPITAL LETTER GJE
+0404          ; mapped                 ; 0454          # 1.1  CYRILLIC CAPITAL LETTER UKRAINIAN IE
+0405          ; mapped                 ; 0455          # 1.1  CYRILLIC CAPITAL LETTER DZE
+0406          ; mapped                 ; 0456          # 1.1  CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0407          ; mapped                 ; 0457          # 1.1  CYRILLIC CAPITAL LETTER YI
+0408          ; mapped                 ; 0458          # 1.1  CYRILLIC CAPITAL LETTER JE
+0409          ; mapped                 ; 0459          # 1.1  CYRILLIC CAPITAL LETTER LJE
+040A          ; mapped                 ; 045A          # 1.1  CYRILLIC CAPITAL LETTER NJE
+040B          ; mapped                 ; 045B          # 1.1  CYRILLIC CAPITAL LETTER TSHE
+040C          ; mapped                 ; 045C          # 1.1  CYRILLIC CAPITAL LETTER KJE
+040D          ; mapped                 ; 045D          # 3.0  CYRILLIC CAPITAL LETTER I WITH GRAVE
+040E          ; mapped                 ; 045E          # 1.1  CYRILLIC CAPITAL LETTER SHORT U
+040F          ; mapped                 ; 045F          # 1.1  CYRILLIC CAPITAL LETTER DZHE
+0410          ; mapped                 ; 0430          # 1.1  CYRILLIC CAPITAL LETTER A
+0411          ; mapped                 ; 0431          # 1.1  CYRILLIC CAPITAL LETTER BE
+0412          ; mapped                 ; 0432          # 1.1  CYRILLIC CAPITAL LETTER VE
+0413          ; mapped                 ; 0433          # 1.1  CYRILLIC CAPITAL LETTER GHE
+0414          ; mapped                 ; 0434          # 1.1  CYRILLIC CAPITAL LETTER DE
+0415          ; mapped                 ; 0435          # 1.1  CYRILLIC CAPITAL LETTER IE
+0416          ; mapped                 ; 0436          # 1.1  CYRILLIC CAPITAL LETTER ZHE
+0417          ; mapped                 ; 0437          # 1.1  CYRILLIC CAPITAL LETTER ZE
+0418          ; mapped                 ; 0438          # 1.1  CYRILLIC CAPITAL LETTER I
+0419          ; mapped                 ; 0439          # 1.1  CYRILLIC CAPITAL LETTER SHORT I
+041A          ; mapped                 ; 043A          # 1.1  CYRILLIC CAPITAL LETTER KA
+041B          ; mapped                 ; 043B          # 1.1  CYRILLIC CAPITAL LETTER EL
+041C          ; mapped                 ; 043C          # 1.1  CYRILLIC CAPITAL LETTER EM
+041D          ; mapped                 ; 043D          # 1.1  CYRILLIC CAPITAL LETTER EN
+041E          ; mapped                 ; 043E          # 1.1  CYRILLIC CAPITAL LETTER O
+041F          ; mapped                 ; 043F          # 1.1  CYRILLIC CAPITAL LETTER PE
+0420          ; mapped                 ; 0440          # 1.1  CYRILLIC CAPITAL LETTER ER
+0421          ; mapped                 ; 0441          # 1.1  CYRILLIC CAPITAL LETTER ES
+0422          ; mapped                 ; 0442          # 1.1  CYRILLIC CAPITAL LETTER TE
+0423          ; mapped                 ; 0443          # 1.1  CYRILLIC CAPITAL LETTER U
+0424          ; mapped                 ; 0444          # 1.1  CYRILLIC CAPITAL LETTER EF
+0425          ; mapped                 ; 0445          # 1.1  CYRILLIC CAPITAL LETTER HA
+0426          ; mapped                 ; 0446          # 1.1  CYRILLIC CAPITAL LETTER TSE
+0427          ; mapped                 ; 0447          # 1.1  CYRILLIC CAPITAL LETTER CHE
+0428          ; mapped                 ; 0448          # 1.1  CYRILLIC CAPITAL LETTER SHA
+0429          ; mapped                 ; 0449          # 1.1  CYRILLIC CAPITAL LETTER SHCHA
+042A          ; mapped                 ; 044A          # 1.1  CYRILLIC CAPITAL LETTER HARD SIGN
+042B          ; mapped                 ; 044B          # 1.1  CYRILLIC CAPITAL LETTER YERU
+042C          ; mapped                 ; 044C          # 1.1  CYRILLIC CAPITAL LETTER SOFT SIGN
+042D          ; mapped                 ; 044D          # 1.1  CYRILLIC CAPITAL LETTER E
+042E          ; mapped                 ; 044E          # 1.1  CYRILLIC CAPITAL LETTER YU
+042F          ; mapped                 ; 044F          # 1.1  CYRILLIC CAPITAL LETTER YA
+0430..044F    ; valid                                  # 1.1  CYRILLIC SMALL LETTER A..CYRILLIC SMALL LETTER YA
+0450          ; valid                                  # 3.0  CYRILLIC SMALL LETTER IE WITH GRAVE
+0451..045C    ; valid                                  # 1.1  CYRILLIC SMALL LETTER IO..CYRILLIC SMALL LETTER KJE
+045D          ; valid                                  # 3.0  CYRILLIC SMALL LETTER I WITH GRAVE
+045E..045F    ; valid                                  # 1.1  CYRILLIC SMALL LETTER SHORT U..CYRILLIC SMALL LETTER DZHE
+0460          ; mapped                 ; 0461          # 1.1  CYRILLIC CAPITAL LETTER OMEGA
+0461          ; valid                                  # 1.1  CYRILLIC SMALL LETTER OMEGA
+0462          ; mapped                 ; 0463          # 1.1  CYRILLIC CAPITAL LETTER YAT
+0463          ; valid                                  # 1.1  CYRILLIC SMALL LETTER YAT
+0464          ; mapped                 ; 0465          # 1.1  CYRILLIC CAPITAL LETTER IOTIFIED E
+0465          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IOTIFIED E
+0466          ; mapped                 ; 0467          # 1.1  CYRILLIC CAPITAL LETTER LITTLE YUS
+0467          ; valid                                  # 1.1  CYRILLIC SMALL LETTER LITTLE YUS
+0468          ; mapped                 ; 0469          # 1.1  CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
+0469          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS
+046A          ; mapped                 ; 046B          # 1.1  CYRILLIC CAPITAL LETTER BIG YUS
+046B          ; valid                                  # 1.1  CYRILLIC SMALL LETTER BIG YUS
+046C          ; mapped                 ; 046D          # 1.1  CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
+046D          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IOTIFIED BIG YUS
+046E          ; mapped                 ; 046F          # 1.1  CYRILLIC CAPITAL LETTER KSI
+046F          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KSI
+0470          ; mapped                 ; 0471          # 1.1  CYRILLIC CAPITAL LETTER PSI
+0471          ; valid                                  # 1.1  CYRILLIC SMALL LETTER PSI
+0472          ; mapped                 ; 0473          # 1.1  CYRILLIC CAPITAL LETTER FITA
+0473          ; valid                                  # 1.1  CYRILLIC SMALL LETTER FITA
+0474          ; mapped                 ; 0475          # 1.1  CYRILLIC CAPITAL LETTER IZHITSA
+0475          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IZHITSA
+0476          ; mapped                 ; 0477          # 1.1  CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+0477          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+0478          ; mapped                 ; 0479          # 1.1  CYRILLIC CAPITAL LETTER UK
+0479          ; valid                                  # 1.1  CYRILLIC SMALL LETTER UK
+047A          ; mapped                 ; 047B          # 1.1  CYRILLIC CAPITAL LETTER ROUND OMEGA
+047B          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ROUND OMEGA
+047C          ; mapped                 ; 047D          # 1.1  CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
+047D          ; valid                                  # 1.1  CYRILLIC SMALL LETTER OMEGA WITH TITLO
+047E          ; mapped                 ; 047F          # 1.1  CYRILLIC CAPITAL LETTER OT
+047F          ; valid                                  # 1.1  CYRILLIC SMALL LETTER OT
+0480          ; mapped                 ; 0481          # 1.1  CYRILLIC CAPITAL LETTER KOPPA
+0481          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KOPPA
+0482          ; valid                  ;      ; NV8    # 1.1  CYRILLIC THOUSANDS SIGN
+0483..0486    ; valid                                  # 1.1  COMBINING CYRILLIC TITLO..COMBINING CYRILLIC PSILI PNEUMATA
+0487          ; valid                                  # 5.1  COMBINING CYRILLIC POKRYTIE
+0488..0489    ; valid                  ;      ; NV8    # 3.0  COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN
+048A          ; mapped                 ; 048B          # 3.2  CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
+048B          ; valid                                  # 3.2  CYRILLIC SMALL LETTER SHORT I WITH TAIL
+048C          ; mapped                 ; 048D          # 3.0  CYRILLIC CAPITAL LETTER SEMISOFT SIGN
+048D          ; valid                                  # 3.0  CYRILLIC SMALL LETTER SEMISOFT SIGN
+048E          ; mapped                 ; 048F          # 3.0  CYRILLIC CAPITAL LETTER ER WITH TICK
+048F          ; valid                                  # 3.0  CYRILLIC SMALL LETTER ER WITH TICK
+0490          ; mapped                 ; 0491          # 1.1  CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+0491          ; valid                                  # 1.1  CYRILLIC SMALL LETTER GHE WITH UPTURN
+0492          ; mapped                 ; 0493          # 1.1  CYRILLIC CAPITAL LETTER GHE WITH STROKE
+0493          ; valid                                  # 1.1  CYRILLIC SMALL LETTER GHE WITH STROKE
+0494          ; mapped                 ; 0495          # 1.1  CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
+0495          ; valid                                  # 1.1  CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK
+0496          ; mapped                 ; 0497          # 1.1  CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+0497          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZHE WITH DESCENDER
+0498          ; mapped                 ; 0499          # 1.1  CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+0499          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZE WITH DESCENDER
+049A          ; mapped                 ; 049B          # 1.1  CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+049B          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KA WITH DESCENDER
+049C          ; mapped                 ; 049D          # 1.1  CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+049D          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
+049E          ; mapped                 ; 049F          # 1.1  CYRILLIC CAPITAL LETTER KA WITH STROKE
+049F          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KA WITH STROKE
+04A0          ; mapped                 ; 04A1          # 1.1  CYRILLIC CAPITAL LETTER BASHKIR KA
+04A1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER BASHKIR KA
+04A2          ; mapped                 ; 04A3          # 1.1  CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+04A3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER EN WITH DESCENDER
+04A4          ; mapped                 ; 04A5          # 1.1  CYRILLIC CAPITAL LIGATURE EN GHE
+04A5          ; valid                                  # 1.1  CYRILLIC SMALL LIGATURE EN GHE
+04A6          ; mapped                 ; 04A7          # 1.1  CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
+04A7          ; valid                                  # 1.1  CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK
+04A8          ; mapped                 ; 04A9          # 1.1  CYRILLIC CAPITAL LETTER ABKHASIAN HA
+04A9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ABKHASIAN HA
+04AA          ; mapped                 ; 04AB          # 1.1  CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+04AB          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ES WITH DESCENDER
+04AC          ; mapped                 ; 04AD          # 1.1  CYRILLIC CAPITAL LETTER TE WITH DESCENDER
+04AD          ; valid                                  # 1.1  CYRILLIC SMALL LETTER TE WITH DESCENDER
+04AE          ; mapped                 ; 04AF          # 1.1  CYRILLIC CAPITAL LETTER STRAIGHT U
+04AF          ; valid                                  # 1.1  CYRILLIC SMALL LETTER STRAIGHT U
+04B0          ; mapped                 ; 04B1          # 1.1  CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+04B1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+04B2          ; mapped                 ; 04B3          # 1.1  CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+04B3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER HA WITH DESCENDER
+04B4          ; mapped                 ; 04B5          # 1.1  CYRILLIC CAPITAL LIGATURE TE TSE
+04B5          ; valid                                  # 1.1  CYRILLIC SMALL LIGATURE TE TSE
+04B6          ; mapped                 ; 04B7          # 1.1  CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+04B7          ; valid                                  # 1.1  CYRILLIC SMALL LETTER CHE WITH DESCENDER
+04B8          ; mapped                 ; 04B9          # 1.1  CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+04B9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
+04BA          ; mapped                 ; 04BB          # 1.1  CYRILLIC CAPITAL LETTER SHHA
+04BB          ; valid                                  # 1.1  CYRILLIC SMALL LETTER SHHA
+04BC          ; mapped                 ; 04BD          # 1.1  CYRILLIC CAPITAL LETTER ABKHASIAN CHE
+04BD          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ABKHASIAN CHE
+04BE          ; mapped                 ; 04BF          # 1.1  CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
+04BF          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER
+04C0          ; disallowed                             # 1.1  CYRILLIC LETTER PALOCHKA
+04C1          ; mapped                 ; 04C2          # 1.1  CYRILLIC CAPITAL LETTER ZHE WITH BREVE
+04C2          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZHE WITH BREVE
+04C3          ; mapped                 ; 04C4          # 1.1  CYRILLIC CAPITAL LETTER KA WITH HOOK
+04C4          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KA WITH HOOK
+04C5          ; mapped                 ; 04C6          # 3.2  CYRILLIC CAPITAL LETTER EL WITH TAIL
+04C6          ; valid                                  # 3.2  CYRILLIC SMALL LETTER EL WITH TAIL
+04C7          ; mapped                 ; 04C8          # 1.1  CYRILLIC CAPITAL LETTER EN WITH HOOK
+04C8          ; valid                                  # 1.1  CYRILLIC SMALL LETTER EN WITH HOOK
+04C9          ; mapped                 ; 04CA          # 3.2  CYRILLIC CAPITAL LETTER EN WITH TAIL
+04CA          ; valid                                  # 3.2  CYRILLIC SMALL LETTER EN WITH TAIL
+04CB          ; mapped                 ; 04CC          # 1.1  CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
+04CC          ; valid                                  # 1.1  CYRILLIC SMALL LETTER KHAKASSIAN CHE
+04CD          ; mapped                 ; 04CE          # 3.2  CYRILLIC CAPITAL LETTER EM WITH TAIL
+04CE          ; valid                                  # 3.2  CYRILLIC SMALL LETTER EM WITH TAIL
+04CF          ; valid                                  # 5.0  CYRILLIC SMALL LETTER PALOCHKA
+04D0          ; mapped                 ; 04D1          # 1.1  CYRILLIC CAPITAL LETTER A WITH BREVE
+04D1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER A WITH BREVE
+04D2          ; mapped                 ; 04D3          # 1.1  CYRILLIC CAPITAL LETTER A WITH DIAERESIS
+04D3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER A WITH DIAERESIS
+04D4          ; mapped                 ; 04D5          # 1.1  CYRILLIC CAPITAL LIGATURE A IE
+04D5          ; valid                                  # 1.1  CYRILLIC SMALL LIGATURE A IE
+04D6          ; mapped                 ; 04D7          # 1.1  CYRILLIC CAPITAL LETTER IE WITH BREVE
+04D7          ; valid                                  # 1.1  CYRILLIC SMALL LETTER IE WITH BREVE
+04D8          ; mapped                 ; 04D9          # 1.1  CYRILLIC CAPITAL LETTER SCHWA
+04D9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER SCHWA
+04DA          ; mapped                 ; 04DB          # 1.1  CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
+04DB          ; valid                                  # 1.1  CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
+04DC          ; mapped                 ; 04DD          # 1.1  CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
+04DD          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
+04DE          ; mapped                 ; 04DF          # 1.1  CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
+04DF          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ZE WITH DIAERESIS
+04E0          ; mapped                 ; 04E1          # 1.1  CYRILLIC CAPITAL LETTER ABKHASIAN DZE
+04E1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER ABKHASIAN DZE
+04E2          ; mapped                 ; 04E3          # 1.1  CYRILLIC CAPITAL LETTER I WITH MACRON
+04E3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER I WITH MACRON
+04E4          ; mapped                 ; 04E5          # 1.1  CYRILLIC CAPITAL LETTER I WITH DIAERESIS
+04E5          ; valid                                  # 1.1  CYRILLIC SMALL LETTER I WITH DIAERESIS
+04E6          ; mapped                 ; 04E7          # 1.1  CYRILLIC CAPITAL LETTER O WITH DIAERESIS
+04E7          ; valid                                  # 1.1  CYRILLIC SMALL LETTER O WITH DIAERESIS
+04E8          ; mapped                 ; 04E9          # 1.1  CYRILLIC CAPITAL LETTER BARRED O
+04E9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER BARRED O
+04EA          ; mapped                 ; 04EB          # 1.1  CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
+04EB          ; valid                                  # 1.1  CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
+04EC          ; mapped                 ; 04ED          # 3.0  CYRILLIC CAPITAL LETTER E WITH DIAERESIS
+04ED          ; valid                                  # 3.0  CYRILLIC SMALL LETTER E WITH DIAERESIS
+04EE          ; mapped                 ; 04EF          # 1.1  CYRILLIC CAPITAL LETTER U WITH MACRON
+04EF          ; valid                                  # 1.1  CYRILLIC SMALL LETTER U WITH MACRON
+04F0          ; mapped                 ; 04F1          # 1.1  CYRILLIC CAPITAL LETTER U WITH DIAERESIS
+04F1          ; valid                                  # 1.1  CYRILLIC SMALL LETTER U WITH DIAERESIS
+04F2          ; mapped                 ; 04F3          # 1.1  CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
+04F3          ; valid                                  # 1.1  CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
+04F4          ; mapped                 ; 04F5          # 1.1  CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
+04F5          ; valid                                  # 1.1  CYRILLIC SMALL LETTER CHE WITH DIAERESIS
+04F6          ; mapped                 ; 04F7          # 4.1  CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
+04F7          ; valid                                  # 4.1  CYRILLIC SMALL LETTER GHE WITH DESCENDER
+04F8          ; mapped                 ; 04F9          # 1.1  CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
+04F9          ; valid                                  # 1.1  CYRILLIC SMALL LETTER YERU WITH DIAERESIS
+04FA          ; mapped                 ; 04FB          # 5.0  CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK
+04FB          ; valid                                  # 5.0  CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK
+04FC          ; mapped                 ; 04FD          # 5.0  CYRILLIC CAPITAL LETTER HA WITH HOOK
+04FD          ; valid                                  # 5.0  CYRILLIC SMALL LETTER HA WITH HOOK
+04FE          ; mapped                 ; 04FF          # 5.0  CYRILLIC CAPITAL LETTER HA WITH STROKE
+04FF          ; valid                                  # 5.0  CYRILLIC SMALL LETTER HA WITH STROKE
+0500          ; mapped                 ; 0501          # 3.2  CYRILLIC CAPITAL LETTER KOMI DE
+0501          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI DE
+0502          ; mapped                 ; 0503          # 3.2  CYRILLIC CAPITAL LETTER KOMI DJE
+0503          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI DJE
+0504          ; mapped                 ; 0505          # 3.2  CYRILLIC CAPITAL LETTER KOMI ZJE
+0505          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI ZJE
+0506          ; mapped                 ; 0507          # 3.2  CYRILLIC CAPITAL LETTER KOMI DZJE
+0507          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI DZJE
+0508          ; mapped                 ; 0509          # 3.2  CYRILLIC CAPITAL LETTER KOMI LJE
+0509          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI LJE
+050A          ; mapped                 ; 050B          # 3.2  CYRILLIC CAPITAL LETTER KOMI NJE
+050B          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI NJE
+050C          ; mapped                 ; 050D          # 3.2  CYRILLIC CAPITAL LETTER KOMI SJE
+050D          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI SJE
+050E          ; mapped                 ; 050F          # 3.2  CYRILLIC CAPITAL LETTER KOMI TJE
+050F          ; valid                                  # 3.2  CYRILLIC SMALL LETTER KOMI TJE
+0510          ; mapped                 ; 0511          # 5.0  CYRILLIC CAPITAL LETTER REVERSED ZE
+0511          ; valid                                  # 5.0  CYRILLIC SMALL LETTER REVERSED ZE
+0512          ; mapped                 ; 0513          # 5.0  CYRILLIC CAPITAL LETTER EL WITH HOOK
+0513          ; valid                                  # 5.0  CYRILLIC SMALL LETTER EL WITH HOOK
+0514          ; mapped                 ; 0515          # 5.1  CYRILLIC CAPITAL LETTER LHA
+0515          ; valid                                  # 5.1  CYRILLIC SMALL LETTER LHA
+0516          ; mapped                 ; 0517          # 5.1  CYRILLIC CAPITAL LETTER RHA
+0517          ; valid                                  # 5.1  CYRILLIC SMALL LETTER RHA
+0518          ; mapped                 ; 0519          # 5.1  CYRILLIC CAPITAL LETTER YAE
+0519          ; valid                                  # 5.1  CYRILLIC SMALL LETTER YAE
+051A          ; mapped                 ; 051B          # 5.1  CYRILLIC CAPITAL LETTER QA
+051B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER QA
+051C          ; mapped                 ; 051D          # 5.1  CYRILLIC CAPITAL LETTER WE
+051D          ; valid                                  # 5.1  CYRILLIC SMALL LETTER WE
+051E          ; mapped                 ; 051F          # 5.1  CYRILLIC CAPITAL LETTER ALEUT KA
+051F          ; valid                                  # 5.1  CYRILLIC SMALL LETTER ALEUT KA
+0520          ; mapped                 ; 0521          # 5.1  CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
+0521          ; valid                                  # 5.1  CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK
+0522          ; mapped                 ; 0523          # 5.1  CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
+0523          ; valid                                  # 5.1  CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK
+0524          ; mapped                 ; 0525          # 5.2  CYRILLIC CAPITAL LETTER PE WITH DESCENDER
+0525          ; valid                                  # 5.2  CYRILLIC SMALL LETTER PE WITH DESCENDER
+0526          ; mapped                 ; 0527          # 6.0  CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER
+0527          ; valid                                  # 6.0  CYRILLIC SMALL LETTER SHHA WITH DESCENDER
+0528          ; mapped                 ; 0529          # 7.0  CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
+0529          ; valid                                  # 7.0  CYRILLIC SMALL LETTER EN WITH LEFT HOOK
+052A          ; mapped                 ; 052B          # 7.0  CYRILLIC CAPITAL LETTER DZZHE
+052B          ; valid                                  # 7.0  CYRILLIC SMALL LETTER DZZHE
+052C          ; mapped                 ; 052D          # 7.0  CYRILLIC CAPITAL LETTER DCHE
+052D          ; valid                                  # 7.0  CYRILLIC SMALL LETTER DCHE
+052E          ; mapped                 ; 052F          # 7.0  CYRILLIC CAPITAL LETTER EL WITH DESCENDER
+052F          ; valid                                  # 7.0  CYRILLIC SMALL LETTER EL WITH DESCENDER
+0530          ; disallowed                             # NA   <reserved-0530>
+0531          ; mapped                 ; 0561          # 1.1  ARMENIAN CAPITAL LETTER AYB
+0532          ; mapped                 ; 0562          # 1.1  ARMENIAN CAPITAL LETTER BEN
+0533          ; mapped                 ; 0563          # 1.1  ARMENIAN CAPITAL LETTER GIM
+0534          ; mapped                 ; 0564          # 1.1  ARMENIAN CAPITAL LETTER DA
+0535          ; mapped                 ; 0565          # 1.1  ARMENIAN CAPITAL LETTER ECH
+0536          ; mapped                 ; 0566          # 1.1  ARMENIAN CAPITAL LETTER ZA
+0537          ; mapped                 ; 0567          # 1.1  ARMENIAN CAPITAL LETTER EH
+0538          ; mapped                 ; 0568          # 1.1  ARMENIAN CAPITAL LETTER ET
+0539          ; mapped                 ; 0569          # 1.1  ARMENIAN CAPITAL LETTER TO
+053A          ; mapped                 ; 056A          # 1.1  ARMENIAN CAPITAL LETTER ZHE
+053B          ; mapped                 ; 056B          # 1.1  ARMENIAN CAPITAL LETTER INI
+053C          ; mapped                 ; 056C          # 1.1  ARMENIAN CAPITAL LETTER LIWN
+053D          ; mapped                 ; 056D          # 1.1  ARMENIAN CAPITAL LETTER XEH
+053E          ; mapped                 ; 056E          # 1.1  ARMENIAN CAPITAL LETTER CA
+053F          ; mapped                 ; 056F          # 1.1  ARMENIAN CAPITAL LETTER KEN
+0540          ; mapped                 ; 0570          # 1.1  ARMENIAN CAPITAL LETTER HO
+0541          ; mapped                 ; 0571          # 1.1  ARMENIAN CAPITAL LETTER JA
+0542          ; mapped                 ; 0572          # 1.1  ARMENIAN CAPITAL LETTER GHAD
+0543          ; mapped                 ; 0573          # 1.1  ARMENIAN CAPITAL LETTER CHEH
+0544          ; mapped                 ; 0574          # 1.1  ARMENIAN CAPITAL LETTER MEN
+0545          ; mapped                 ; 0575          # 1.1  ARMENIAN CAPITAL LETTER YI
+0546          ; mapped                 ; 0576          # 1.1  ARMENIAN CAPITAL LETTER NOW
+0547          ; mapped                 ; 0577          # 1.1  ARMENIAN CAPITAL LETTER SHA
+0548          ; mapped                 ; 0578          # 1.1  ARMENIAN CAPITAL LETTER VO
+0549          ; mapped                 ; 0579          # 1.1  ARMENIAN CAPITAL LETTER CHA
+054A          ; mapped                 ; 057A          # 1.1  ARMENIAN CAPITAL LETTER PEH
+054B          ; mapped                 ; 057B          # 1.1  ARMENIAN CAPITAL LETTER JHEH
+054C          ; mapped                 ; 057C          # 1.1  ARMENIAN CAPITAL LETTER RA
+054D          ; mapped                 ; 057D          # 1.1  ARMENIAN CAPITAL LETTER SEH
+054E          ; mapped                 ; 057E          # 1.1  ARMENIAN CAPITAL LETTER VEW
+054F          ; mapped                 ; 057F          # 1.1  ARMENIAN CAPITAL LETTER TIWN
+0550          ; mapped                 ; 0580          # 1.1  ARMENIAN CAPITAL LETTER REH
+0551          ; mapped                 ; 0581          # 1.1  ARMENIAN CAPITAL LETTER CO
+0552          ; mapped                 ; 0582          # 1.1  ARMENIAN CAPITAL LETTER YIWN
+0553          ; mapped                 ; 0583          # 1.1  ARMENIAN CAPITAL LETTER PIWR
+0554          ; mapped                 ; 0584          # 1.1  ARMENIAN CAPITAL LETTER KEH
+0555          ; mapped                 ; 0585          # 1.1  ARMENIAN CAPITAL LETTER OH
+0556          ; mapped                 ; 0586          # 1.1  ARMENIAN CAPITAL LETTER FEH
+0557..0558    ; disallowed                             # NA   <reserved-0557>..<reserved-0558>
+0559          ; valid                                  # 1.1  ARMENIAN MODIFIER LETTER LEFT HALF RING
+055A..055F    ; valid                  ;      ; NV8    # 1.1  ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK
+0560          ; valid                                  # 11.0 ARMENIAN SMALL LETTER TURNED AYB
+0561..0586    ; valid                                  # 1.1  ARMENIAN SMALL LETTER AYB..ARMENIAN SMALL LETTER FEH
+0587          ; mapped                 ; 0565 0582     # 1.1  ARMENIAN SMALL LIGATURE ECH YIWN
+0588          ; valid                                  # 11.0 ARMENIAN SMALL LETTER YI WITH STROKE
+0589          ; valid                  ;      ; NV8    # 1.1  ARMENIAN FULL STOP
+058A          ; valid                  ;      ; NV8    # 3.0  ARMENIAN HYPHEN
+058B..058C    ; disallowed                             # NA   <reserved-058B>..<reserved-058C>
+058D..058E    ; valid                  ;      ; NV8    # 7.0  RIGHT-FACING ARMENIAN ETERNITY SIGN..LEFT-FACING ARMENIAN ETERNITY SIGN
+058F          ; valid                  ;      ; NV8    # 6.1  ARMENIAN DRAM SIGN
+0590          ; disallowed                             # NA   <reserved-0590>
+0591..05A1    ; valid                                  # 2.0  HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER
+05A2          ; valid                                  # 4.1  HEBREW ACCENT ATNAH HAFUKH
+05A3..05AF    ; valid                                  # 2.0  HEBREW ACCENT MUNAH..HEBREW MARK MASORA CIRCLE
+05B0..05B9    ; valid                                  # 1.1  HEBREW POINT SHEVA..HEBREW POINT HOLAM
+05BA          ; valid                                  # 5.0  HEBREW POINT HOLAM HASER FOR VAV
+05BB..05BD    ; valid                                  # 1.1  HEBREW POINT QUBUTS..HEBREW POINT METEG
+05BE          ; valid                  ;      ; NV8    # 1.1  HEBREW PUNCTUATION MAQAF
+05BF          ; valid                                  # 1.1  HEBREW POINT RAFE
+05C0          ; valid                  ;      ; NV8    # 1.1  HEBREW PUNCTUATION PASEQ
+05C1..05C2    ; valid                                  # 1.1  HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
+05C3          ; valid                  ;      ; NV8    # 1.1  HEBREW PUNCTUATION SOF PASUQ
+05C4          ; valid                                  # 2.0  HEBREW MARK UPPER DOT
+05C5          ; valid                                  # 4.1  HEBREW MARK LOWER DOT
+05C6          ; valid                  ;      ; NV8    # 4.1  HEBREW PUNCTUATION NUN HAFUKHA
+05C7          ; valid                                  # 4.1  HEBREW POINT QAMATS QATAN
+05C8..05CF    ; disallowed                             # NA   <reserved-05C8>..<reserved-05CF>
+05D0..05EA    ; valid                                  # 1.1  HEBREW LETTER ALEF..HEBREW LETTER TAV
+05EB..05EE    ; disallowed                             # NA   <reserved-05EB>..<reserved-05EE>
+05EF          ; valid                                  # 11.0 HEBREW YOD TRIANGLE
+05F0..05F4    ; valid                                  # 1.1  HEBREW LIGATURE YIDDISH DOUBLE VAV..HEBREW PUNCTUATION GERSHAYIM
+05F5..05FF    ; disallowed                             # NA   <reserved-05F5>..<reserved-05FF>
+0600..0603    ; disallowed                             # 4.0  ARABIC NUMBER SIGN..ARABIC SIGN SAFHA
+0604          ; disallowed                             # 6.1  ARABIC SIGN SAMVAT
+0605          ; disallowed                             # 7.0  ARABIC NUMBER MARK ABOVE
+0606..060A    ; valid                  ;      ; NV8    # 5.1  ARABIC-INDIC CUBE ROOT..ARABIC-INDIC PER TEN THOUSAND SIGN
+060B          ; valid                  ;      ; NV8    # 4.1  AFGHANI SIGN
+060C          ; valid                  ;      ; NV8    # 1.1  ARABIC COMMA
+060D..060F    ; valid                  ;      ; NV8    # 4.0  ARABIC DATE SEPARATOR..ARABIC SIGN MISRA
+0610..0615    ; valid                                  # 4.0  ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL HIGH TAH
+0616..061A    ; valid                                  # 5.1  ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH..ARABIC SMALL KASRA
+061B          ; valid                  ;      ; NV8    # 1.1  ARABIC SEMICOLON
+061C          ; disallowed                             # 6.3  ARABIC LETTER MARK
+061D          ; disallowed                             # NA   <reserved-061D>
+061E          ; valid                  ;      ; NV8    # 4.1  ARABIC TRIPLE DOT PUNCTUATION MARK
+061F          ; valid                  ;      ; NV8    # 1.1  ARABIC QUESTION MARK
+0620          ; valid                                  # 6.0  ARABIC LETTER KASHMIRI YEH
+0621..063A    ; valid                                  # 1.1  ARABIC LETTER HAMZA..ARABIC LETTER GHAIN
+063B..063F    ; valid                                  # 5.1  ARABIC LETTER KEHEH WITH TWO DOTS ABOVE..ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE
+0640          ; valid                  ;      ; NV8    # 1.1  ARABIC TATWEEL
+0641..0652    ; valid                                  # 1.1  ARABIC LETTER FEH..ARABIC SUKUN
+0653..0655    ; valid                                  # 3.0  ARABIC MADDAH ABOVE..ARABIC HAMZA BELOW
+0656..0658    ; valid                                  # 4.0  ARABIC SUBSCRIPT ALEF..ARABIC MARK NOON GHUNNA
+0659..065E    ; valid                                  # 4.1  ARABIC ZWARAKAY..ARABIC FATHA WITH TWO DOTS
+065F          ; valid                                  # 6.0  ARABIC WAVY HAMZA BELOW
+0660..0669    ; valid                                  # 1.1  ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE
+066A..066D    ; valid                  ;      ; NV8    # 1.1  ARABIC PERCENT SIGN..ARABIC FIVE POINTED STAR
+066E..066F    ; valid                                  # 3.2  ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF
+0670..0674    ; valid                                  # 1.1  ARABIC LETTER SUPERSCRIPT ALEF..ARABIC LETTER HIGH HAMZA
+0675          ; mapped                 ; 0627 0674     # 1.1  ARABIC LETTER HIGH HAMZA ALEF
+0676          ; mapped                 ; 0648 0674     # 1.1  ARABIC LETTER HIGH HAMZA WAW
+0677          ; mapped                 ; 06C7 0674     # 1.1  ARABIC LETTER U WITH HAMZA ABOVE
+0678          ; mapped                 ; 064A 0674     # 1.1  ARABIC LETTER HIGH HAMZA YEH
+0679..06B7    ; valid                                  # 1.1  ARABIC LETTER TTEH..ARABIC LETTER LAM WITH THREE DOTS ABOVE
+06B8..06B9    ; valid                                  # 3.0  ARABIC LETTER LAM WITH THREE DOTS BELOW..ARABIC LETTER NOON WITH DOT BELOW
+06BA..06BE    ; valid                                  # 1.1  ARABIC LETTER NOON GHUNNA..ARABIC LETTER HEH DOACHASHMEE
+06BF          ; valid                                  # 3.0  ARABIC LETTER TCHEH WITH DOT ABOVE
+06C0..06CE    ; valid                                  # 1.1  ARABIC LETTER HEH WITH YEH ABOVE..ARABIC LETTER YEH WITH SMALL V
+06CF          ; valid                                  # 3.0  ARABIC LETTER WAW WITH DOT ABOVE
+06D0..06D3    ; valid                                  # 1.1  ARABIC LETTER E..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
+06D4          ; valid                  ;      ; NV8    # 1.1  ARABIC FULL STOP
+06D5..06DC    ; valid                                  # 1.1  ARABIC LETTER AE..ARABIC SMALL HIGH SEEN
+06DD          ; disallowed                             # 1.1  ARABIC END OF AYAH
+06DE          ; valid                  ;      ; NV8    # 1.1  ARABIC START OF RUB EL HIZB
+06DF..06E8    ; valid                                  # 1.1  ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH NOON
+06E9          ; valid                  ;      ; NV8    # 1.1  ARABIC PLACE OF SAJDAH
+06EA..06ED    ; valid                                  # 1.1  ARABIC EMPTY CENTRE LOW STOP..ARABIC SMALL LOW MEEM
+06EE..06EF    ; valid                                  # 4.0  ARABIC LETTER DAL WITH INVERTED V..ARABIC LETTER REH WITH INVERTED V
+06F0..06F9    ; valid                                  # 1.1  EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE
+06FA..06FE    ; valid                                  # 3.0  ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC SIGN SINDHI POSTPOSITION MEN
+06FF          ; valid                                  # 4.0  ARABIC LETTER HEH WITH INVERTED V
+0700..070D    ; valid                  ;      ; NV8    # 3.0  SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS
+070E          ; disallowed                             # NA   <reserved-070E>
+070F          ; disallowed                             # 3.0  SYRIAC ABBREVIATION MARK
+0710..072C    ; valid                                  # 3.0  SYRIAC LETTER ALAPH..SYRIAC LETTER TAW
+072D..072F    ; valid                                  # 4.0  SYRIAC LETTER PERSIAN BHETH..SYRIAC LETTER PERSIAN DHALATH
+0730..074A    ; valid                                  # 3.0  SYRIAC PTHAHA ABOVE..SYRIAC BARREKH
+074B..074C    ; disallowed                             # NA   <reserved-074B>..<reserved-074C>
+074D..074F    ; valid                                  # 4.0  SYRIAC LETTER SOGDIAN ZHAIN..SYRIAC LETTER SOGDIAN FE
+0750..076D    ; valid                                  # 4.1  ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW..ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE
+076E..077F    ; valid                                  # 5.1  ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH BELOW..ARABIC LETTER KAF WITH TWO DOTS ABOVE
+0780..07B0    ; valid                                  # 3.0  THAANA LETTER HAA..THAANA SUKUN
+07B1          ; valid                                  # 3.2  THAANA LETTER NAA
+07B2..07BF    ; disallowed                             # NA   <reserved-07B2>..<reserved-07BF>
+07C0..07F5    ; valid                                  # 5.0  NKO DIGIT ZERO..NKO LOW TONE APOSTROPHE
+07F6..07FA    ; valid                  ;      ; NV8    # 5.0  NKO SYMBOL OO DENNEN..NKO LAJANYALAN
+07FB..07FC    ; disallowed                             # NA   <reserved-07FB>..<reserved-07FC>
+07FD          ; valid                                  # 11.0 NKO DANTAYALAN
+07FE..07FF    ; valid                  ;      ; NV8    # 11.0 NKO DOROME SIGN..NKO TAMAN SIGN
+0800..082D    ; valid                                  # 5.2  SAMARITAN LETTER ALAF..SAMARITAN MARK NEQUDAA
+082E..082F    ; disallowed                             # NA   <reserved-082E>..<reserved-082F>
+0830..083E    ; valid                  ;      ; NV8    # 5.2  SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU
+083F          ; disallowed                             # NA   <reserved-083F>
+0840..085B    ; valid                                  # 6.0  MANDAIC LETTER HALQA..MANDAIC GEMINATION MARK
+085C..085D    ; disallowed                             # NA   <reserved-085C>..<reserved-085D>
+085E          ; valid                  ;      ; NV8    # 6.0  MANDAIC PUNCTUATION
+085F          ; disallowed                             # NA   <reserved-085F>
+0860..086A    ; valid                                  # 10.0 SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
+086B..089F    ; disallowed                             # NA   <reserved-086B>..<reserved-089F>
+08A0          ; valid                                  # 6.1  ARABIC LETTER BEH WITH SMALL V BELOW
+08A1          ; valid                                  # 7.0  ARABIC LETTER BEH WITH HAMZA ABOVE
+08A2..08AC    ; valid                                  # 6.1  ARABIC LETTER JEEM WITH TWO DOTS ABOVE..ARABIC LETTER ROHINGYA YEH
+08AD..08B2    ; valid                                  # 7.0  ARABIC LETTER LOW ALEF..ARABIC LETTER ZAIN WITH INVERTED V ABOVE
+08B3..08B4    ; valid                                  # 8.0  ARABIC LETTER AIN WITH THREE DOTS BELOW..ARABIC LETTER KAF WITH DOT BELOW
+08B5          ; disallowed                             # NA   <reserved-08B5>
+08B6..08BD    ; valid                                  # 9.0  ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER AFRICAN NOON
+08BE..08C7    ; valid                                  # 13.0 ARABIC LETTER PEH WITH SMALL V..ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE
+08C8..08D2    ; disallowed                             # NA   <reserved-08C8>..<reserved-08D2>
+08D3          ; valid                                  # 11.0 ARABIC SMALL LOW WAW
+08D4..08E1    ; valid                                  # 9.0  ARABIC SMALL HIGH WORD AR-RUB..ARABIC SMALL HIGH SIGN SAFHA
+08E2          ; disallowed                             # 9.0  ARABIC DISPUTED END OF AYAH
+08E3          ; valid                                  # 8.0  ARABIC TURNED DAMMA BELOW
+08E4..08FE    ; valid                                  # 6.1  ARABIC CURLY FATHA..ARABIC DAMMA WITH DOT
+08FF          ; valid                                  # 7.0  ARABIC MARK SIDEWAYS NOON GHUNNA
+0900          ; valid                                  # 5.2  DEVANAGARI SIGN INVERTED CANDRABINDU
+0901..0903    ; valid                                  # 1.1  DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN VISARGA
+0904          ; valid                                  # 4.0  DEVANAGARI LETTER SHORT A
+0905..0939    ; valid                                  # 1.1  DEVANAGARI LETTER A..DEVANAGARI LETTER HA
+093A..093B    ; valid                                  # 6.0  DEVANAGARI VOWEL SIGN OE..DEVANAGARI VOWEL SIGN OOE
+093C..094D    ; valid                                  # 1.1  DEVANAGARI SIGN NUKTA..DEVANAGARI SIGN VIRAMA
+094E          ; valid                                  # 5.2  DEVANAGARI VOWEL SIGN PRISHTHAMATRA E
+094F          ; valid                                  # 6.0  DEVANAGARI VOWEL SIGN AW
+0950..0954    ; valid                                  # 1.1  DEVANAGARI OM..DEVANAGARI ACUTE ACCENT
+0955          ; valid                                  # 5.2  DEVANAGARI VOWEL SIGN CANDRA LONG E
+0956..0957    ; valid                                  # 6.0  DEVANAGARI VOWEL SIGN UE..DEVANAGARI VOWEL SIGN UUE
+0958          ; mapped                 ; 0915 093C     # 1.1  DEVANAGARI LETTER QA
+0959          ; mapped                 ; 0916 093C     # 1.1  DEVANAGARI LETTER KHHA
+095A          ; mapped                 ; 0917 093C     # 1.1  DEVANAGARI LETTER GHHA
+095B          ; mapped                 ; 091C 093C     # 1.1  DEVANAGARI LETTER ZA
+095C          ; mapped                 ; 0921 093C     # 1.1  DEVANAGARI LETTER DDDHA
+095D          ; mapped                 ; 0922 093C     # 1.1  DEVANAGARI LETTER RHA
+095E          ; mapped                 ; 092B 093C     # 1.1  DEVANAGARI LETTER FA
+095F          ; mapped                 ; 092F 093C     # 1.1  DEVANAGARI LETTER YYA
+0960..0963    ; valid                                  # 1.1  DEVANAGARI LETTER VOCALIC RR..DEVANAGARI VOWEL SIGN VOCALIC LL
+0964..0965    ; valid                  ;      ; NV8    # 1.1  DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA
+0966..096F    ; valid                                  # 1.1  DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE
+0970          ; valid                  ;      ; NV8    # 1.1  DEVANAGARI ABBREVIATION SIGN
+0971..0972    ; valid                                  # 5.1  DEVANAGARI SIGN HIGH SPACING DOT..DEVANAGARI LETTER CANDRA A
+0973..0977    ; valid                                  # 6.0  DEVANAGARI LETTER OE..DEVANAGARI LETTER UUE
+0978          ; valid                                  # 7.0  DEVANAGARI LETTER MARWARI DDA
+0979..097A    ; valid                                  # 5.2  DEVANAGARI LETTER ZHA..DEVANAGARI LETTER HEAVY YA
+097B..097C    ; valid                                  # 5.0  DEVANAGARI LETTER GGA..DEVANAGARI LETTER JJA
+097D          ; valid                                  # 4.1  DEVANAGARI LETTER GLOTTAL STOP
+097E..097F    ; valid                                  # 5.0  DEVANAGARI LETTER DDDA..DEVANAGARI LETTER BBA
+0980          ; valid                                  # 7.0  BENGALI ANJI
+0981..0983    ; valid                                  # 1.1  BENGALI SIGN CANDRABINDU..BENGALI SIGN VISARGA
+0984          ; disallowed                             # NA   <reserved-0984>
+0985..098C    ; valid                                  # 1.1  BENGALI LETTER A..BENGALI LETTER VOCALIC L
+098D..098E    ; disallowed                             # NA   <reserved-098D>..<reserved-098E>
+098F..0990    ; valid                                  # 1.1  BENGALI LETTER E..BENGALI LETTER AI
+0991..0992    ; disallowed                             # NA   <reserved-0991>..<reserved-0992>
+0993..09A8    ; valid                                  # 1.1  BENGALI LETTER O..BENGALI LETTER NA
+09A9          ; disallowed                             # NA   <reserved-09A9>
+09AA..09B0    ; valid                                  # 1.1  BENGALI LETTER PA..BENGALI LETTER RA
+09B1          ; disallowed                             # NA   <reserved-09B1>
+09B2          ; valid                                  # 1.1  BENGALI LETTER LA
+09B3..09B5    ; disallowed                             # NA   <reserved-09B3>..<reserved-09B5>
+09B6..09B9    ; valid                                  # 1.1  BENGALI LETTER SHA..BENGALI LETTER HA
+09BA..09BB    ; disallowed                             # NA   <reserved-09BA>..<reserved-09BB>
+09BC          ; valid                                  # 1.1  BENGALI SIGN NUKTA
+09BD          ; valid                                  # 4.0  BENGALI SIGN AVAGRAHA
+09BE..09C4    ; valid                                  # 1.1  BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN VOCALIC RR
+09C5..09C6    ; disallowed                             # NA   <reserved-09C5>..<reserved-09C6>
+09C7..09C8    ; valid                                  # 1.1  BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI
+09C9..09CA    ; disallowed                             # NA   <reserved-09C9>..<reserved-09CA>
+09CB..09CD    ; valid                                  # 1.1  BENGALI VOWEL SIGN O..BENGALI SIGN VIRAMA
+09CE          ; valid                                  # 4.1  BENGALI LETTER KHANDA TA
+09CF..09D6    ; disallowed                             # NA   <reserved-09CF>..<reserved-09D6>
+09D7          ; valid                                  # 1.1  BENGALI AU LENGTH MARK
+09D8..09DB    ; disallowed                             # NA   <reserved-09D8>..<reserved-09DB>
+09DC          ; mapped                 ; 09A1 09BC     # 1.1  BENGALI LETTER RRA
+09DD          ; mapped                 ; 09A2 09BC     # 1.1  BENGALI LETTER RHA
+09DE          ; disallowed                             # NA   <reserved-09DE>
+09DF          ; mapped                 ; 09AF 09BC     # 1.1  BENGALI LETTER YYA
+09E0..09E3    ; valid                                  # 1.1  BENGALI LETTER VOCALIC RR..BENGALI VOWEL SIGN VOCALIC LL
+09E4..09E5    ; disallowed                             # NA   <reserved-09E4>..<reserved-09E5>
+09E6..09F1    ; valid                                  # 1.1  BENGALI DIGIT ZERO..BENGALI LETTER RA WITH LOWER DIAGONAL
+09F2..09FA    ; valid                  ;      ; NV8    # 1.1  BENGALI RUPEE MARK..BENGALI ISSHAR
+09FB          ; valid                  ;      ; NV8    # 5.2  BENGALI GANDA MARK
+09FC          ; valid                                  # 10.0 BENGALI LETTER VEDIC ANUSVARA
+09FD          ; valid                  ;      ; NV8    # 10.0 BENGALI ABBREVIATION SIGN
+09FE          ; valid                                  # 11.0 BENGALI SANDHI MARK
+09FF..0A00    ; disallowed                             # NA   <reserved-09FF>..<reserved-0A00>
+0A01          ; valid                                  # 4.0  GURMUKHI SIGN ADAK BINDI
+0A02          ; valid                                  # 1.1  GURMUKHI SIGN BINDI
+0A03          ; valid                                  # 4.0  GURMUKHI SIGN VISARGA
+0A04          ; disallowed                             # NA   <reserved-0A04>
+0A05..0A0A    ; valid                                  # 1.1  GURMUKHI LETTER A..GURMUKHI LETTER UU
+0A0B..0A0E    ; disallowed                             # NA   <reserved-0A0B>..<reserved-0A0E>
+0A0F..0A10    ; valid                                  # 1.1  GURMUKHI LETTER EE..GURMUKHI LETTER AI
+0A11..0A12    ; disallowed                             # NA   <reserved-0A11>..<reserved-0A12>
+0A13..0A28    ; valid                                  # 1.1  GURMUKHI LETTER OO..GURMUKHI LETTER NA
+0A29          ; disallowed                             # NA   <reserved-0A29>
+0A2A..0A30    ; valid                                  # 1.1  GURMUKHI LETTER PA..GURMUKHI LETTER RA
+0A31          ; disallowed                             # NA   <reserved-0A31>
+0A32          ; valid                                  # 1.1  GURMUKHI LETTER LA
+0A33          ; mapped                 ; 0A32 0A3C     # 1.1  GURMUKHI LETTER LLA
+0A34          ; disallowed                             # NA   <reserved-0A34>
+0A35          ; valid                                  # 1.1  GURMUKHI LETTER VA
+0A36          ; mapped                 ; 0A38 0A3C     # 1.1  GURMUKHI LETTER SHA
+0A37          ; disallowed                             # NA   <reserved-0A37>
+0A38..0A39    ; valid                                  # 1.1  GURMUKHI LETTER SA..GURMUKHI LETTER HA
+0A3A..0A3B    ; disallowed                             # NA   <reserved-0A3A>..<reserved-0A3B>
+0A3C          ; valid                                  # 1.1  GURMUKHI SIGN NUKTA
+0A3D          ; disallowed                             # NA   <reserved-0A3D>
+0A3E..0A42    ; valid                                  # 1.1  GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN UU
+0A43..0A46    ; disallowed                             # NA   <reserved-0A43>..<reserved-0A46>
+0A47..0A48    ; valid                                  # 1.1  GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI
+0A49..0A4A    ; disallowed                             # NA   <reserved-0A49>..<reserved-0A4A>
+0A4B..0A4D    ; valid                                  # 1.1  GURMUKHI VOWEL SIGN OO..GURMUKHI SIGN VIRAMA
+0A4E..0A50    ; disallowed                             # NA   <reserved-0A4E>..<reserved-0A50>
+0A51          ; valid                                  # 5.1  GURMUKHI SIGN UDAAT
+0A52..0A58    ; disallowed                             # NA   <reserved-0A52>..<reserved-0A58>
+0A59          ; mapped                 ; 0A16 0A3C     # 1.1  GURMUKHI LETTER KHHA
+0A5A          ; mapped                 ; 0A17 0A3C     # 1.1  GURMUKHI LETTER GHHA
+0A5B          ; mapped                 ; 0A1C 0A3C     # 1.1  GURMUKHI LETTER ZA
+0A5C          ; valid                                  # 1.1  GURMUKHI LETTER RRA
+0A5D          ; disallowed                             # NA   <reserved-0A5D>
+0A5E          ; mapped                 ; 0A2B 0A3C     # 1.1  GURMUKHI LETTER FA
+0A5F..0A65    ; disallowed                             # NA   <reserved-0A5F>..<reserved-0A65>
+0A66..0A74    ; valid                                  # 1.1  GURMUKHI DIGIT ZERO..GURMUKHI EK ONKAR
+0A75          ; valid                                  # 5.1  GURMUKHI SIGN YAKASH
+0A76          ; valid                  ;      ; NV8    # 11.0 GURMUKHI ABBREVIATION SIGN
+0A77..0A80    ; disallowed                             # NA   <reserved-0A77>..<reserved-0A80>
+0A81..0A83    ; valid                                  # 1.1  GUJARATI SIGN CANDRABINDU..GUJARATI SIGN VISARGA
+0A84          ; disallowed                             # NA   <reserved-0A84>
+0A85..0A8B    ; valid                                  # 1.1  GUJARATI LETTER A..GUJARATI LETTER VOCALIC R
+0A8C          ; valid                                  # 4.0  GUJARATI LETTER VOCALIC L
+0A8D          ; valid                                  # 1.1  GUJARATI VOWEL CANDRA E
+0A8E          ; disallowed                             # NA   <reserved-0A8E>
+0A8F..0A91    ; valid                                  # 1.1  GUJARATI LETTER E..GUJARATI VOWEL CANDRA O
+0A92          ; disallowed                             # NA   <reserved-0A92>
+0A93..0AA8    ; valid                                  # 1.1  GUJARATI LETTER O..GUJARATI LETTER NA
+0AA9          ; disallowed                             # NA   <reserved-0AA9>
+0AAA..0AB0    ; valid                                  # 1.1  GUJARATI LETTER PA..GUJARATI LETTER RA
+0AB1          ; disallowed                             # NA   <reserved-0AB1>
+0AB2..0AB3    ; valid                                  # 1.1  GUJARATI LETTER LA..GUJARATI LETTER LLA
+0AB4          ; disallowed                             # NA   <reserved-0AB4>
+0AB5..0AB9    ; valid                                  # 1.1  GUJARATI LETTER VA..GUJARATI LETTER HA
+0ABA..0ABB    ; disallowed                             # NA   <reserved-0ABA>..<reserved-0ABB>
+0ABC..0AC5    ; valid                                  # 1.1  GUJARATI SIGN NUKTA..GUJARATI VOWEL SIGN CANDRA E
+0AC6          ; disallowed                             # NA   <reserved-0AC6>
+0AC7..0AC9    ; valid                                  # 1.1  GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN CANDRA O
+0ACA          ; disallowed                             # NA   <reserved-0ACA>
+0ACB..0ACD    ; valid                                  # 1.1  GUJARATI VOWEL SIGN O..GUJARATI SIGN VIRAMA
+0ACE..0ACF    ; disallowed                             # NA   <reserved-0ACE>..<reserved-0ACF>
+0AD0          ; valid                                  # 1.1  GUJARATI OM
+0AD1..0ADF    ; disallowed                             # NA   <reserved-0AD1>..<reserved-0ADF>
+0AE0          ; valid                                  # 1.1  GUJARATI LETTER VOCALIC RR
+0AE1..0AE3    ; valid                                  # 4.0  GUJARATI LETTER VOCALIC LL..GUJARATI VOWEL SIGN VOCALIC LL
+0AE4..0AE5    ; disallowed                             # NA   <reserved-0AE4>..<reserved-0AE5>
+0AE6..0AEF    ; valid                                  # 1.1  GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE
+0AF0          ; valid                  ;      ; NV8    # 6.1  GUJARATI ABBREVIATION SIGN
+0AF1          ; valid                  ;      ; NV8    # 4.0  GUJARATI RUPEE SIGN
+0AF2..0AF8    ; disallowed                             # NA   <reserved-0AF2>..<reserved-0AF8>
+0AF9          ; valid                                  # 8.0  GUJARATI LETTER ZHA
+0AFA..0AFF    ; valid                                  # 10.0 GUJARATI SIGN SUKUN..GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE
+0B00          ; disallowed                             # NA   <reserved-0B00>
+0B01..0B03    ; valid                                  # 1.1  ORIYA SIGN CANDRABINDU..ORIYA SIGN VISARGA
+0B04          ; disallowed                             # NA   <reserved-0B04>
+0B05..0B0C    ; valid                                  # 1.1  ORIYA LETTER A..ORIYA LETTER VOCALIC L
+0B0D..0B0E    ; disallowed                             # NA   <reserved-0B0D>..<reserved-0B0E>
+0B0F..0B10    ; valid                                  # 1.1  ORIYA LETTER E..ORIYA LETTER AI
+0B11..0B12    ; disallowed                             # NA   <reserved-0B11>..<reserved-0B12>
+0B13..0B28    ; valid                                  # 1.1  ORIYA LETTER O..ORIYA LETTER NA
+0B29          ; disallowed                             # NA   <reserved-0B29>
+0B2A..0B30    ; valid                                  # 1.1  ORIYA LETTER PA..ORIYA LETTER RA
+0B31          ; disallowed                             # NA   <reserved-0B31>
+0B32..0B33    ; valid                                  # 1.1  ORIYA LETTER LA..ORIYA LETTER LLA
+0B34          ; disallowed                             # NA   <reserved-0B34>
+0B35          ; valid                                  # 4.0  ORIYA LETTER VA
+0B36..0B39    ; valid                                  # 1.1  ORIYA LETTER SHA..ORIYA LETTER HA
+0B3A..0B3B    ; disallowed                             # NA   <reserved-0B3A>..<reserved-0B3B>
+0B3C..0B43    ; valid                                  # 1.1  ORIYA SIGN NUKTA..ORIYA VOWEL SIGN VOCALIC R
+0B44          ; valid                                  # 5.1  ORIYA VOWEL SIGN VOCALIC RR
+0B45..0B46    ; disallowed                             # NA   <reserved-0B45>..<reserved-0B46>
+0B47..0B48    ; valid                                  # 1.1  ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI
+0B49..0B4A    ; disallowed                             # NA   <reserved-0B49>..<reserved-0B4A>
+0B4B..0B4D    ; valid                                  # 1.1  ORIYA VOWEL SIGN O..ORIYA SIGN VIRAMA
+0B4E..0B54    ; disallowed                             # NA   <reserved-0B4E>..<reserved-0B54>
+0B55          ; valid                                  # 13.0 ORIYA SIGN OVERLINE
+0B56..0B57    ; valid                                  # 1.1  ORIYA AI LENGTH MARK..ORIYA AU LENGTH MARK
+0B58..0B5B    ; disallowed                             # NA   <reserved-0B58>..<reserved-0B5B>
+0B5C          ; mapped                 ; 0B21 0B3C     # 1.1  ORIYA LETTER RRA
+0B5D          ; mapped                 ; 0B22 0B3C     # 1.1  ORIYA LETTER RHA
+0B5E          ; disallowed                             # NA   <reserved-0B5E>
+0B5F..0B61    ; valid                                  # 1.1  ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL
+0B62..0B63    ; valid                                  # 5.1  ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL
+0B64..0B65    ; disallowed                             # NA   <reserved-0B64>..<reserved-0B65>
+0B66..0B6F    ; valid                                  # 1.1  ORIYA DIGIT ZERO..ORIYA DIGIT NINE
+0B70          ; valid                  ;      ; NV8    # 1.1  ORIYA ISSHAR
+0B71          ; valid                                  # 4.0  ORIYA LETTER WA
+0B72..0B77    ; valid                  ;      ; NV8    # 6.0  ORIYA FRACTION ONE QUARTER..ORIYA FRACTION THREE SIXTEENTHS
+0B78..0B81    ; disallowed                             # NA   <reserved-0B78>..<reserved-0B81>
+0B82..0B83    ; valid                                  # 1.1  TAMIL SIGN ANUSVARA..TAMIL SIGN VISARGA
+0B84          ; disallowed                             # NA   <reserved-0B84>
+0B85..0B8A    ; valid                                  # 1.1  TAMIL LETTER A..TAMIL LETTER UU
+0B8B..0B8D    ; disallowed                             # NA   <reserved-0B8B>..<reserved-0B8D>
+0B8E..0B90    ; valid                                  # 1.1  TAMIL LETTER E..TAMIL LETTER AI
+0B91          ; disallowed                             # NA   <reserved-0B91>
+0B92..0B95    ; valid                                  # 1.1  TAMIL LETTER O..TAMIL LETTER KA
+0B96..0B98    ; disallowed                             # NA   <reserved-0B96>..<reserved-0B98>
+0B99..0B9A    ; valid                                  # 1.1  TAMIL LETTER NGA..TAMIL LETTER CA
+0B9B          ; disallowed                             # NA   <reserved-0B9B>
+0B9C          ; valid                                  # 1.1  TAMIL LETTER JA
+0B9D          ; disallowed                             # NA   <reserved-0B9D>
+0B9E..0B9F    ; valid                                  # 1.1  TAMIL LETTER NYA..TAMIL LETTER TTA
+0BA0..0BA2    ; disallowed                             # NA   <reserved-0BA0>..<reserved-0BA2>
+0BA3..0BA4    ; valid                                  # 1.1  TAMIL LETTER NNA..TAMIL LETTER TA
+0BA5..0BA7    ; disallowed                             # NA   <reserved-0BA5>..<reserved-0BA7>
+0BA8..0BAA    ; valid                                  # 1.1  TAMIL LETTER NA..TAMIL LETTER PA
+0BAB..0BAD    ; disallowed                             # NA   <reserved-0BAB>..<reserved-0BAD>
+0BAE..0BB5    ; valid                                  # 1.1  TAMIL LETTER MA..TAMIL LETTER VA
+0BB6          ; valid                                  # 4.1  TAMIL LETTER SHA
+0BB7..0BB9    ; valid                                  # 1.1  TAMIL LETTER SSA..TAMIL LETTER HA
+0BBA..0BBD    ; disallowed                             # NA   <reserved-0BBA>..<reserved-0BBD>
+0BBE..0BC2    ; valid                                  # 1.1  TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN UU
+0BC3..0BC5    ; disallowed                             # NA   <reserved-0BC3>..<reserved-0BC5>
+0BC6..0BC8    ; valid                                  # 1.1  TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI
+0BC9          ; disallowed                             # NA   <reserved-0BC9>
+0BCA..0BCD    ; valid                                  # 1.1  TAMIL VOWEL SIGN O..TAMIL SIGN VIRAMA
+0BCE..0BCF    ; disallowed                             # NA   <reserved-0BCE>..<reserved-0BCF>
+0BD0          ; valid                                  # 5.1  TAMIL OM
+0BD1..0BD6    ; disallowed                             # NA   <reserved-0BD1>..<reserved-0BD6>
+0BD7          ; valid                                  # 1.1  TAMIL AU LENGTH MARK
+0BD8..0BE5    ; disallowed                             # NA   <reserved-0BD8>..<reserved-0BE5>
+0BE6          ; valid                                  # 4.1  TAMIL DIGIT ZERO
+0BE7..0BEF    ; valid                                  # 1.1  TAMIL DIGIT ONE..TAMIL DIGIT NINE
+0BF0..0BF2    ; valid                  ;      ; NV8    # 1.1  TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND
+0BF3..0BFA    ; valid                  ;      ; NV8    # 4.0  TAMIL DAY SIGN..TAMIL NUMBER SIGN
+0BFB..0BFF    ; disallowed                             # NA   <reserved-0BFB>..<reserved-0BFF>
+0C00          ; valid                                  # 7.0  TELUGU SIGN COMBINING CANDRABINDU ABOVE
+0C01..0C03    ; valid                                  # 1.1  TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA
+0C04          ; valid                                  # 11.0 TELUGU SIGN COMBINING ANUSVARA ABOVE
+0C05..0C0C    ; valid                                  # 1.1  TELUGU LETTER A..TELUGU LETTER VOCALIC L
+0C0D          ; disallowed                             # NA   <reserved-0C0D>
+0C0E..0C10    ; valid                                  # 1.1  TELUGU LETTER E..TELUGU LETTER AI
+0C11          ; disallowed                             # NA   <reserved-0C11>
+0C12..0C28    ; valid                                  # 1.1  TELUGU LETTER O..TELUGU LETTER NA
+0C29          ; disallowed                             # NA   <reserved-0C29>
+0C2A..0C33    ; valid                                  # 1.1  TELUGU LETTER PA..TELUGU LETTER LLA
+0C34          ; valid                                  # 7.0  TELUGU LETTER LLLA
+0C35..0C39    ; valid                                  # 1.1  TELUGU LETTER VA..TELUGU LETTER HA
+0C3A..0C3C    ; disallowed                             # NA   <reserved-0C3A>..<reserved-0C3C>
+0C3D          ; valid                                  # 5.1  TELUGU SIGN AVAGRAHA
+0C3E..0C44    ; valid                                  # 1.1  TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN VOCALIC RR
+0C45          ; disallowed                             # NA   <reserved-0C45>
+0C46..0C48    ; valid                                  # 1.1  TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI
+0C49          ; disallowed                             # NA   <reserved-0C49>
+0C4A..0C4D    ; valid                                  # 1.1  TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
+0C4E..0C54    ; disallowed                             # NA   <reserved-0C4E>..<reserved-0C54>
+0C55..0C56    ; valid                                  # 1.1  TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
+0C57          ; disallowed                             # NA   <reserved-0C57>
+0C58..0C59    ; valid                                  # 5.1  TELUGU LETTER TSA..TELUGU LETTER DZA
+0C5A          ; valid                                  # 8.0  TELUGU LETTER RRRA
+0C5B..0C5F    ; disallowed                             # NA   <reserved-0C5B>..<reserved-0C5F>
+0C60..0C61    ; valid                                  # 1.1  TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
+0C62..0C63    ; valid                                  # 5.1  TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
+0C64..0C65    ; disallowed                             # NA   <reserved-0C64>..<reserved-0C65>
+0C66..0C6F    ; valid                                  # 1.1  TELUGU DIGIT ZERO..TELUGU DIGIT NINE
+0C70..0C76    ; disallowed                             # NA   <reserved-0C70>..<reserved-0C76>
+0C77          ; valid                  ;      ; NV8    # 12.0 TELUGU SIGN SIDDHAM
+0C78..0C7F    ; valid                  ;      ; NV8    # 5.1  TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU SIGN TUUMU
+0C80          ; valid                                  # 9.0  KANNADA SIGN SPACING CANDRABINDU
+0C81          ; valid                                  # 7.0  KANNADA SIGN CANDRABINDU
+0C82..0C83    ; valid                                  # 1.1  KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA
+0C84          ; valid                  ;      ; NV8    # 11.0 KANNADA SIGN SIDDHAM
+0C85..0C8C    ; valid                                  # 1.1  KANNADA LETTER A..KANNADA LETTER VOCALIC L
+0C8D          ; disallowed                             # NA   <reserved-0C8D>
+0C8E..0C90    ; valid                                  # 1.1  KANNADA LETTER E..KANNADA LETTER AI
+0C91          ; disallowed                             # NA   <reserved-0C91>
+0C92..0CA8    ; valid                                  # 1.1  KANNADA LETTER O..KANNADA LETTER NA
+0CA9          ; disallowed                             # NA   <reserved-0CA9>
+0CAA..0CB3    ; valid                                  # 1.1  KANNADA LETTER PA..KANNADA LETTER LLA
+0CB4          ; disallowed                             # NA   <reserved-0CB4>
+0CB5..0CB9    ; valid                                  # 1.1  KANNADA LETTER VA..KANNADA LETTER HA
+0CBA..0CBB    ; disallowed                             # NA   <reserved-0CBA>..<reserved-0CBB>
+0CBC..0CBD    ; valid                                  # 4.0  KANNADA SIGN NUKTA..KANNADA SIGN AVAGRAHA
+0CBE..0CC4    ; valid                                  # 1.1  KANNADA VOWEL SIGN AA..KANNADA VOWEL SIGN VOCALIC RR
+0CC5          ; disallowed                             # NA   <reserved-0CC5>
+0CC6..0CC8    ; valid                                  # 1.1  KANNADA VOWEL SIGN E..KANNADA VOWEL SIGN AI
+0CC9          ; disallowed                             # NA   <reserved-0CC9>
+0CCA..0CCD    ; valid                                  # 1.1  KANNADA VOWEL SIGN O..KANNADA SIGN VIRAMA
+0CCE..0CD4    ; disallowed                             # NA   <reserved-0CCE>..<reserved-0CD4>
+0CD5..0CD6    ; valid                                  # 1.1  KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
+0CD7..0CDD    ; disallowed                             # NA   <reserved-0CD7>..<reserved-0CDD>
+0CDE          ; valid                                  # 1.1  KANNADA LETTER FA
+0CDF          ; disallowed                             # NA   <reserved-0CDF>
+0CE0..0CE1    ; valid                                  # 1.1  KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
+0CE2..0CE3    ; valid                                  # 5.0  KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
+0CE4..0CE5    ; disallowed                             # NA   <reserved-0CE4>..<reserved-0CE5>
+0CE6..0CEF    ; valid                                  # 1.1  KANNADA DIGIT ZERO..KANNADA DIGIT NINE
+0CF0          ; disallowed                             # NA   <reserved-0CF0>
+0CF1..0CF2    ; valid                                  # 5.0  KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
+0CF3..0CFF    ; disallowed                             # NA   <reserved-0CF3>..<reserved-0CFF>
+0D00          ; valid                                  # 10.0 MALAYALAM SIGN COMBINING ANUSVARA ABOVE
+0D01          ; valid                                  # 7.0  MALAYALAM SIGN CANDRABINDU
+0D02..0D03    ; valid                                  # 1.1  MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA
+0D04          ; valid                                  # 13.0 MALAYALAM LETTER VEDIC ANUSVARA
+0D05..0D0C    ; valid                                  # 1.1  MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L
+0D0D          ; disallowed                             # NA   <reserved-0D0D>
+0D0E..0D10    ; valid                                  # 1.1  MALAYALAM LETTER E..MALAYALAM LETTER AI
+0D11          ; disallowed                             # NA   <reserved-0D11>
+0D12..0D28    ; valid                                  # 1.1  MALAYALAM LETTER O..MALAYALAM LETTER NA
+0D29          ; valid                                  # 6.0  MALAYALAM LETTER NNNA
+0D2A..0D39    ; valid                                  # 1.1  MALAYALAM LETTER PA..MALAYALAM LETTER HA
+0D3A          ; valid                                  # 6.0  MALAYALAM LETTER TTTA
+0D3B..0D3C    ; valid                                  # 10.0 MALAYALAM SIGN VERTICAL BAR VIRAMA..MALAYALAM SIGN CIRCULAR VIRAMA
+0D3D          ; valid                                  # 5.1  MALAYALAM SIGN AVAGRAHA
+0D3E..0D43    ; valid                                  # 1.1  MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN VOCALIC R
+0D44          ; valid                                  # 5.1  MALAYALAM VOWEL SIGN VOCALIC RR
+0D45          ; disallowed                             # NA   <reserved-0D45>
+0D46..0D48    ; valid                                  # 1.1  MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI
+0D49          ; disallowed                             # NA   <reserved-0D49>
+0D4A..0D4D    ; valid                                  # 1.1  MALAYALAM VOWEL SIGN O..MALAYALAM SIGN VIRAMA
+0D4E          ; valid                                  # 6.0  MALAYALAM LETTER DOT REPH
+0D4F          ; valid                  ;      ; NV8    # 9.0  MALAYALAM SIGN PARA
+0D50..0D53    ; disallowed                             # NA   <reserved-0D50>..<reserved-0D53>
+0D54..0D56    ; valid                                  # 9.0  MALAYALAM LETTER CHILLU M..MALAYALAM LETTER CHILLU LLL
+0D57          ; valid                                  # 1.1  MALAYALAM AU LENGTH MARK
+0D58..0D5E    ; valid                  ;      ; NV8    # 9.0  MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH..MALAYALAM FRACTION ONE FIFTH
+0D5F          ; valid                                  # 8.0  MALAYALAM LETTER ARCHAIC II
+0D60..0D61    ; valid                                  # 1.1  MALAYALAM LETTER VOCALIC RR..MALAYALAM LETTER VOCALIC LL
+0D62..0D63    ; valid                                  # 5.1  MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL
+0D64..0D65    ; disallowed                             # NA   <reserved-0D64>..<reserved-0D65>
+0D66..0D6F    ; valid                                  # 1.1  MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE
+0D70..0D75    ; valid                  ;      ; NV8    # 5.1  MALAYALAM NUMBER TEN..MALAYALAM FRACTION THREE QUARTERS
+0D76..0D78    ; valid                  ;      ; NV8    # 9.0  MALAYALAM FRACTION ONE SIXTEENTH..MALAYALAM FRACTION THREE SIXTEENTHS
+0D79          ; valid                  ;      ; NV8    # 5.1  MALAYALAM DATE MARK
+0D7A..0D7F    ; valid                                  # 5.1  MALAYALAM LETTER CHILLU NN..MALAYALAM LETTER CHILLU K
+0D80          ; disallowed                             # NA   <reserved-0D80>
+0D81          ; valid                                  # 13.0 SINHALA SIGN CANDRABINDU
+0D82..0D83    ; valid                                  # 3.0  SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA
+0D84          ; disallowed                             # NA   <reserved-0D84>
+0D85..0D96    ; valid                                  # 3.0  SINHALA LETTER AYANNA..SINHALA LETTER AUYANNA
+0D97..0D99    ; disallowed                             # NA   <reserved-0D97>..<reserved-0D99>
+0D9A..0DB1    ; valid                                  # 3.0  SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA LETTER DANTAJA NAYANNA
+0DB2          ; disallowed                             # NA   <reserved-0DB2>
+0DB3..0DBB    ; valid                                  # 3.0  SINHALA LETTER SANYAKA DAYANNA..SINHALA LETTER RAYANNA
+0DBC          ; disallowed                             # NA   <reserved-0DBC>
+0DBD          ; valid                                  # 3.0  SINHALA LETTER DANTAJA LAYANNA
+0DBE..0DBF    ; disallowed                             # NA   <reserved-0DBE>..<reserved-0DBF>
+0DC0..0DC6    ; valid                                  # 3.0  SINHALA LETTER VAYANNA..SINHALA LETTER FAYANNA
+0DC7..0DC9    ; disallowed                             # NA   <reserved-0DC7>..<reserved-0DC9>
+0DCA          ; valid                                  # 3.0  SINHALA SIGN AL-LAKUNA
+0DCB..0DCE    ; disallowed                             # NA   <reserved-0DCB>..<reserved-0DCE>
+0DCF..0DD4    ; valid                                  # 3.0  SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA
+0DD5          ; disallowed                             # NA   <reserved-0DD5>
+0DD6          ; valid                                  # 3.0  SINHALA VOWEL SIGN DIGA PAA-PILLA
+0DD7          ; disallowed                             # NA   <reserved-0DD7>
+0DD8..0DDF    ; valid                                  # 3.0  SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA
+0DE0..0DE5    ; disallowed                             # NA   <reserved-0DE0>..<reserved-0DE5>
+0DE6..0DEF    ; valid                                  # 7.0  SINHALA LITH DIGIT ZERO..SINHALA LITH DIGIT NINE
+0DF0..0DF1    ; disallowed                             # NA   <reserved-0DF0>..<reserved-0DF1>
+0DF2..0DF3    ; valid                                  # 3.0  SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA
+0DF4          ; valid                  ;      ; NV8    # 3.0  SINHALA PUNCTUATION KUNDDALIYA
+0DF5..0E00    ; disallowed                             # NA   <reserved-0DF5>..<reserved-0E00>
+0E01..0E32    ; valid                                  # 1.1  THAI CHARACTER KO KAI..THAI CHARACTER SARA AA
+0E33          ; mapped                 ; 0E4D 0E32     # 1.1  THAI CHARACTER SARA AM
+0E34..0E3A    ; valid                                  # 1.1  THAI CHARACTER SARA I..THAI CHARACTER PHINTHU
+0E3B..0E3E    ; disallowed                             # NA   <reserved-0E3B>..<reserved-0E3E>
+0E3F          ; valid                  ;      ; NV8    # 1.1  THAI CURRENCY SYMBOL BAHT
+0E40..0E4E    ; valid                                  # 1.1  THAI CHARACTER SARA E..THAI CHARACTER YAMAKKAN
+0E4F          ; valid                  ;      ; NV8    # 1.1  THAI CHARACTER FONGMAN
+0E50..0E59    ; valid                                  # 1.1  THAI DIGIT ZERO..THAI DIGIT NINE
+0E5A..0E5B    ; valid                  ;      ; NV8    # 1.1  THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT
+0E5C..0E80    ; disallowed                             # NA   <reserved-0E5C>..<reserved-0E80>
+0E81..0E82    ; valid                                  # 1.1  LAO LETTER KO..LAO LETTER KHO SUNG
+0E83          ; disallowed                             # NA   <reserved-0E83>
+0E84          ; valid                                  # 1.1  LAO LETTER KHO TAM
+0E85          ; disallowed                             # NA   <reserved-0E85>
+0E86          ; valid                                  # 12.0 LAO LETTER PALI GHA
+0E87..0E88    ; valid                                  # 1.1  LAO LETTER NGO..LAO LETTER CO
+0E89          ; valid                                  # 12.0 LAO LETTER PALI CHA
+0E8A          ; valid                                  # 1.1  LAO LETTER SO TAM
+0E8B          ; disallowed                             # NA   <reserved-0E8B>
+0E8C          ; valid                                  # 12.0 LAO LETTER PALI JHA
+0E8D          ; valid                                  # 1.1  LAO LETTER NYO
+0E8E..0E93    ; valid                                  # 12.0 LAO LETTER PALI NYA..LAO LETTER PALI NNA
+0E94..0E97    ; valid                                  # 1.1  LAO LETTER DO..LAO LETTER THO TAM
+0E98          ; valid                                  # 12.0 LAO LETTER PALI DHA
+0E99..0E9F    ; valid                                  # 1.1  LAO LETTER NO..LAO LETTER FO SUNG
+0EA0          ; valid                                  # 12.0 LAO LETTER PALI BHA
+0EA1..0EA3    ; valid                                  # 1.1  LAO LETTER MO..LAO LETTER LO LING
+0EA4          ; disallowed                             # NA   <reserved-0EA4>
+0EA5          ; valid                                  # 1.1  LAO LETTER LO LOOT
+0EA6          ; disallowed                             # NA   <reserved-0EA6>
+0EA7          ; valid                                  # 1.1  LAO LETTER WO
+0EA8..0EA9    ; valid                                  # 12.0 LAO LETTER SANSKRIT SHA..LAO LETTER SANSKRIT SSA
+0EAA..0EAB    ; valid                                  # 1.1  LAO LETTER SO SUNG..LAO LETTER HO SUNG
+0EAC          ; valid                                  # 12.0 LAO LETTER PALI LLA
+0EAD..0EB2    ; valid                                  # 1.1  LAO LETTER O..LAO VOWEL SIGN AA
+0EB3          ; mapped                 ; 0ECD 0EB2     # 1.1  LAO VOWEL SIGN AM
+0EB4..0EB9    ; valid                                  # 1.1  LAO VOWEL SIGN I..LAO VOWEL SIGN UU
+0EBA          ; valid                                  # 12.0 LAO SIGN PALI VIRAMA
+0EBB..0EBD    ; valid                                  # 1.1  LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN NYO
+0EBE..0EBF    ; disallowed                             # NA   <reserved-0EBE>..<reserved-0EBF>
+0EC0..0EC4    ; valid                                  # 1.1  LAO VOWEL SIGN E..LAO VOWEL SIGN AI
+0EC5          ; disallowed                             # NA   <reserved-0EC5>
+0EC6          ; valid                                  # 1.1  LAO KO LA
+0EC7          ; disallowed                             # NA   <reserved-0EC7>
+0EC8..0ECD    ; valid                                  # 1.1  LAO TONE MAI EK..LAO NIGGAHITA
+0ECE..0ECF    ; disallowed                             # NA   <reserved-0ECE>..<reserved-0ECF>
+0ED0..0ED9    ; valid                                  # 1.1  LAO DIGIT ZERO..LAO DIGIT NINE
+0EDA..0EDB    ; disallowed                             # NA   <reserved-0EDA>..<reserved-0EDB>
+0EDC          ; mapped                 ; 0EAB 0E99     # 1.1  LAO HO NO
+0EDD          ; mapped                 ; 0EAB 0EA1     # 1.1  LAO HO MO
+0EDE..0EDF    ; valid                                  # 6.1  LAO LETTER KHMU GO..LAO LETTER KHMU NYO
+0EE0..0EFF    ; disallowed                             # NA   <reserved-0EE0>..<reserved-0EFF>
+0F00          ; valid                                  # 2.0  TIBETAN SYLLABLE OM
+0F01..0F0A    ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBETAN MARK BKA- SHOG YIG MGO
+0F0B          ; valid                                  # 2.0  TIBETAN MARK INTERSYLLABIC TSHEG
+0F0C          ; mapped                 ; 0F0B          # 2.0  TIBETAN MARK DELIMITER TSHEG BSTAR
+0F0D..0F17    ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK SHAD..TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS
+0F18..0F19    ; valid                                  # 2.0  TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS
+0F1A..0F1F    ; valid                  ;      ; NV8    # 2.0  TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RDEL DKAR RDEL NAG
+0F20..0F29    ; valid                                  # 2.0  TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE
+0F2A..0F34    ; valid                  ;      ; NV8    # 2.0  TIBETAN DIGIT HALF ONE..TIBETAN MARK BSDUS RTAGS
+0F35          ; valid                                  # 2.0  TIBETAN MARK NGAS BZUNG NYI ZLA
+0F36          ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN
+0F37          ; valid                                  # 2.0  TIBETAN MARK NGAS BZUNG SGOR RTAGS
+0F38          ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK CHE MGO
+0F39          ; valid                                  # 2.0  TIBETAN MARK TSA -PHRU
+0F3A..0F3D    ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK GUG RTAGS GYON..TIBETAN MARK ANG KHANG GYAS
+0F3E..0F42    ; valid                                  # 2.0  TIBETAN SIGN YAR TSHES..TIBETAN LETTER GA
+0F43          ; mapped                 ; 0F42 0FB7     # 2.0  TIBETAN LETTER GHA
+0F44..0F47    ; valid                                  # 2.0  TIBETAN LETTER NGA..TIBETAN LETTER JA
+0F48          ; disallowed                             # NA   <reserved-0F48>
+0F49..0F4C    ; valid                                  # 2.0  TIBETAN LETTER NYA..TIBETAN LETTER DDA
+0F4D          ; mapped                 ; 0F4C 0FB7     # 2.0  TIBETAN LETTER DDHA
+0F4E..0F51    ; valid                                  # 2.0  TIBETAN LETTER NNA..TIBETAN LETTER DA
+0F52          ; mapped                 ; 0F51 0FB7     # 2.0  TIBETAN LETTER DHA
+0F53..0F56    ; valid                                  # 2.0  TIBETAN LETTER NA..TIBETAN LETTER BA
+0F57          ; mapped                 ; 0F56 0FB7     # 2.0  TIBETAN LETTER BHA
+0F58..0F5B    ; valid                                  # 2.0  TIBETAN LETTER MA..TIBETAN LETTER DZA
+0F5C          ; mapped                 ; 0F5B 0FB7     # 2.0  TIBETAN LETTER DZHA
+0F5D..0F68    ; valid                                  # 2.0  TIBETAN LETTER WA..TIBETAN LETTER A
+0F69          ; mapped                 ; 0F40 0FB5     # 2.0  TIBETAN LETTER KSSA
+0F6A          ; valid                                  # 3.0  TIBETAN LETTER FIXED-FORM RA
+0F6B..0F6C    ; valid                                  # 5.1  TIBETAN LETTER KKA..TIBETAN LETTER RRA
+0F6D..0F70    ; disallowed                             # NA   <reserved-0F6D>..<reserved-0F70>
+0F71..0F72    ; valid                                  # 2.0  TIBETAN VOWEL SIGN AA..TIBETAN VOWEL SIGN I
+0F73          ; mapped                 ; 0F71 0F72     # 2.0  TIBETAN VOWEL SIGN II
+0F74          ; valid                                  # 2.0  TIBETAN VOWEL SIGN U
+0F75          ; mapped                 ; 0F71 0F74     # 2.0  TIBETAN VOWEL SIGN UU
+0F76          ; mapped                 ; 0FB2 0F80     # 2.0  TIBETAN VOWEL SIGN VOCALIC R
+0F77          ; mapped                 ; 0FB2 0F71 0F80 #2.0  TIBETAN VOWEL SIGN VOCALIC RR
+0F78          ; mapped                 ; 0FB3 0F80     # 2.0  TIBETAN VOWEL SIGN VOCALIC L
+0F79          ; mapped                 ; 0FB3 0F71 0F80 #2.0  TIBETAN VOWEL SIGN VOCALIC LL
+0F7A..0F80    ; valid                                  # 2.0  TIBETAN VOWEL SIGN E..TIBETAN VOWEL SIGN REVERSED I
+0F81          ; mapped                 ; 0F71 0F80     # 2.0  TIBETAN VOWEL SIGN REVERSED II
+0F82..0F84    ; valid                                  # 2.0  TIBETAN SIGN NYI ZLA NAA DA..TIBETAN MARK HALANTA
+0F85          ; valid                  ;      ; NV8    # 2.0  TIBETAN MARK PALUTA
+0F86..0F8B    ; valid                                  # 2.0  TIBETAN SIGN LCI RTAGS..TIBETAN SIGN GRU MED RGYINGS
+0F8C..0F8F    ; valid                                  # 6.0  TIBETAN SIGN INVERTED MCHU CAN..TIBETAN SUBJOINED SIGN INVERTED MCHU CAN
+0F90..0F92    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER KA..TIBETAN SUBJOINED LETTER GA
+0F93          ; mapped                 ; 0F92 0FB7     # 2.0  TIBETAN SUBJOINED LETTER GHA
+0F94..0F95    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER NGA..TIBETAN SUBJOINED LETTER CA
+0F96          ; valid                                  # 3.0  TIBETAN SUBJOINED LETTER CHA
+0F97          ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER JA
+0F98          ; disallowed                             # NA   <reserved-0F98>
+0F99..0F9C    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER DDA
+0F9D          ; mapped                 ; 0F9C 0FB7     # 2.0  TIBETAN SUBJOINED LETTER DDHA
+0F9E..0FA1    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER NNA..TIBETAN SUBJOINED LETTER DA
+0FA2          ; mapped                 ; 0FA1 0FB7     # 2.0  TIBETAN SUBJOINED LETTER DHA
+0FA3..0FA6    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER NA..TIBETAN SUBJOINED LETTER BA
+0FA7          ; mapped                 ; 0FA6 0FB7     # 2.0  TIBETAN SUBJOINED LETTER BHA
+0FA8..0FAB    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER MA..TIBETAN SUBJOINED LETTER DZA
+0FAC          ; mapped                 ; 0FAB 0FB7     # 2.0  TIBETAN SUBJOINED LETTER DZHA
+0FAD          ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER WA
+0FAE..0FB0    ; valid                                  # 3.0  TIBETAN SUBJOINED LETTER ZHA..TIBETAN SUBJOINED LETTER -A
+0FB1..0FB7    ; valid                                  # 2.0  TIBETAN SUBJOINED LETTER YA..TIBETAN SUBJOINED LETTER HA
+0FB8          ; valid                                  # 3.0  TIBETAN SUBJOINED LETTER A
+0FB9          ; mapped                 ; 0F90 0FB5     # 2.0  TIBETAN SUBJOINED LETTER KSSA
+0FBA..0FBC    ; valid                                  # 3.0  TIBETAN SUBJOINED LETTER FIXED-FORM WA..TIBETAN SUBJOINED LETTER FIXED-FORM RA
+0FBD          ; disallowed                             # NA   <reserved-0FBD>
+0FBE..0FC5    ; valid                  ;      ; NV8    # 3.0  TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE
+0FC6          ; valid                                  # 3.0  TIBETAN SYMBOL PADMA GDAN
+0FC7..0FCC    ; valid                  ;      ; NV8    # 3.0  TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SYMBOL NOR BU BZHI -KHYIL
+0FCD          ; disallowed                             # NA   <reserved-0FCD>
+0FCE          ; valid                  ;      ; NV8    # 5.1  TIBETAN SIGN RDEL NAG RDEL DKAR
+0FCF          ; valid                  ;      ; NV8    # 3.0  TIBETAN SIGN RDEL NAG GSUM
+0FD0..0FD1    ; valid                  ;      ; NV8    # 4.1  TIBETAN MARK BSKA- SHOG GI MGO RGYAN..TIBETAN MARK MNYAM YIG GI MGO RGYAN
+0FD2..0FD4    ; valid                  ;      ; NV8    # 5.1  TIBETAN MARK NYIS TSHEG..TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA
+0FD5..0FD8    ; valid                  ;      ; NV8    # 5.2  RIGHT-FACING SVASTI SIGN..LEFT-FACING SVASTI SIGN WITH DOTS
+0FD9..0FDA    ; valid                  ;      ; NV8    # 6.0  TIBETAN MARK LEADING MCHAN RTAGS..TIBETAN MARK TRAILING MCHAN RTAGS
+0FDB..0FFF    ; disallowed                             # NA   <reserved-0FDB>..<reserved-0FFF>
+1000..1021    ; valid                                  # 3.0  MYANMAR LETTER KA..MYANMAR LETTER A
+1022          ; valid                                  # 5.1  MYANMAR LETTER SHAN A
+1023..1027    ; valid                                  # 3.0  MYANMAR LETTER I..MYANMAR LETTER E
+1028          ; valid                                  # 5.1  MYANMAR LETTER MON E
+1029..102A    ; valid                                  # 3.0  MYANMAR LETTER O..MYANMAR LETTER AU
+102B          ; valid                                  # 5.1  MYANMAR VOWEL SIGN TALL AA
+102C..1032    ; valid                                  # 3.0  MYANMAR VOWEL SIGN AA..MYANMAR VOWEL SIGN AI
+1033..1035    ; valid                                  # 5.1  MYANMAR VOWEL SIGN MON II..MYANMAR VOWEL SIGN E ABOVE
+1036..1039    ; valid                                  # 3.0  MYANMAR SIGN ANUSVARA..MYANMAR SIGN VIRAMA
+103A..103F    ; valid                                  # 5.1  MYANMAR SIGN ASAT..MYANMAR LETTER GREAT SA
+1040..1049    ; valid                                  # 3.0  MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE
+104A..104F    ; valid                  ;      ; NV8    # 3.0  MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL GENITIVE
+1050..1059    ; valid                                  # 3.0  MYANMAR LETTER SHA..MYANMAR VOWEL SIGN VOCALIC LL
+105A..1099    ; valid                                  # 5.1  MYANMAR LETTER MON NGA..MYANMAR SHAN DIGIT NINE
+109A..109D    ; valid                                  # 5.2  MYANMAR SIGN KHAMTI TONE-1..MYANMAR VOWEL SIGN AITON AI
+109E..109F    ; valid                  ;      ; NV8    # 5.1  MYANMAR SYMBOL SHAN ONE..MYANMAR SYMBOL SHAN EXCLAMATION
+10A0..10C5    ; disallowed                             # 1.1  GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE
+10C6          ; disallowed                             # NA   <reserved-10C6>
+10C7          ; mapped                 ; 2D27          # 6.1  GEORGIAN CAPITAL LETTER YN
+10C8..10CC    ; disallowed                             # NA   <reserved-10C8>..<reserved-10CC>
+10CD          ; mapped                 ; 2D2D          # 6.1  GEORGIAN CAPITAL LETTER AEN
+10CE..10CF    ; disallowed                             # NA   <reserved-10CE>..<reserved-10CF>
+10D0..10F6    ; valid                                  # 1.1  GEORGIAN LETTER AN..GEORGIAN LETTER FI
+10F7..10F8    ; valid                                  # 3.2  GEORGIAN LETTER YN..GEORGIAN LETTER ELIFI
+10F9..10FA    ; valid                                  # 4.1  GEORGIAN LETTER TURNED GAN..GEORGIAN LETTER AIN
+10FB          ; valid                  ;      ; NV8    # 1.1  GEORGIAN PARAGRAPH SEPARATOR
+10FC          ; mapped                 ; 10DC          # 4.1  MODIFIER LETTER GEORGIAN NAR
+10FD..10FF    ; valid                                  # 6.1  GEORGIAN LETTER AEN..GEORGIAN LETTER LABIAL SIGN
+1100..1159    ; valid                  ;      ; NV8    # 1.1  HANGUL CHOSEONG KIYEOK..HANGUL CHOSEONG YEORINHIEUH
+115A..115E    ; valid                  ;      ; NV8    # 5.2  HANGUL CHOSEONG KIYEOK-TIKEUT..HANGUL CHOSEONG TIKEUT-RIEUL
+115F..1160    ; disallowed                             # 1.1  HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG FILLER
+1161..11A2    ; valid                  ;      ; NV8    # 1.1  HANGUL JUNGSEONG A..HANGUL JUNGSEONG SSANGARAEA
+11A3..11A7    ; valid                  ;      ; NV8    # 5.2  HANGUL JUNGSEONG A-EU..HANGUL JUNGSEONG O-YAE
+11A8..11F9    ; valid                  ;      ; NV8    # 1.1  HANGUL JONGSEONG KIYEOK..HANGUL JONGSEONG YEORINHIEUH
+11FA..11FF    ; valid                  ;      ; NV8    # 5.2  HANGUL JONGSEONG KIYEOK-NIEUN..HANGUL JONGSEONG SSANGNIEUN
+1200..1206    ; valid                                  # 3.0  ETHIOPIC SYLLABLE HA..ETHIOPIC SYLLABLE HO
+1207          ; valid                                  # 4.1  ETHIOPIC SYLLABLE HOA
+1208..1246    ; valid                                  # 3.0  ETHIOPIC SYLLABLE LA..ETHIOPIC SYLLABLE QO
+1247          ; valid                                  # 4.1  ETHIOPIC SYLLABLE QOA
+1248          ; valid                                  # 3.0  ETHIOPIC SYLLABLE QWA
+1249          ; disallowed                             # NA   <reserved-1249>
+124A..124D    ; valid                                  # 3.0  ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE
+124E..124F    ; disallowed                             # NA   <reserved-124E>..<reserved-124F>
+1250..1256    ; valid                                  # 3.0  ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO
+1257          ; disallowed                             # NA   <reserved-1257>
+1258          ; valid                                  # 3.0  ETHIOPIC SYLLABLE QHWA
+1259          ; disallowed                             # NA   <reserved-1259>
+125A..125D    ; valid                                  # 3.0  ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QHWE
+125E..125F    ; disallowed                             # NA   <reserved-125E>..<reserved-125F>
+1260..1286    ; valid                                  # 3.0  ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XO
+1287          ; valid                                  # 4.1  ETHIOPIC SYLLABLE XOA
+1288          ; valid                                  # 3.0  ETHIOPIC SYLLABLE XWA
+1289          ; disallowed                             # NA   <reserved-1289>
+128A..128D    ; valid                                  # 3.0  ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE
+128E..128F    ; disallowed                             # NA   <reserved-128E>..<reserved-128F>
+1290..12AE    ; valid                                  # 3.0  ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KO
+12AF          ; valid                                  # 4.1  ETHIOPIC SYLLABLE KOA
+12B0          ; valid                                  # 3.0  ETHIOPIC SYLLABLE KWA
+12B1          ; disallowed                             # NA   <reserved-12B1>
+12B2..12B5    ; valid                                  # 3.0  ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE
+12B6..12B7    ; disallowed                             # NA   <reserved-12B6>..<reserved-12B7>
+12B8..12BE    ; valid                                  # 3.0  ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO
+12BF          ; disallowed                             # NA   <reserved-12BF>
+12C0          ; valid                                  # 3.0  ETHIOPIC SYLLABLE KXWA
+12C1          ; disallowed                             # NA   <reserved-12C1>
+12C2..12C5    ; valid                                  # 3.0  ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KXWE
+12C6..12C7    ; disallowed                             # NA   <reserved-12C6>..<reserved-12C7>
+12C8..12CE    ; valid                                  # 3.0  ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE WO
+12CF          ; valid                                  # 4.1  ETHIOPIC SYLLABLE WOA
+12D0..12D6    ; valid                                  # 3.0  ETHIOPIC SYLLABLE PHARYNGEAL A..ETHIOPIC SYLLABLE PHARYNGEAL O
+12D7          ; disallowed                             # NA   <reserved-12D7>
+12D8..12EE    ; valid                                  # 3.0  ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE YO
+12EF          ; valid                                  # 4.1  ETHIOPIC SYLLABLE YOA
+12F0..130E    ; valid                                  # 3.0  ETHIOPIC SYLLABLE DA..ETHIOPIC SYLLABLE GO
+130F          ; valid                                  # 4.1  ETHIOPIC SYLLABLE GOA
+1310          ; valid                                  # 3.0  ETHIOPIC SYLLABLE GWA
+1311          ; disallowed                             # NA   <reserved-1311>
+1312..1315    ; valid                                  # 3.0  ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE
+1316..1317    ; disallowed                             # NA   <reserved-1316>..<reserved-1317>
+1318..131E    ; valid                                  # 3.0  ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE GGO
+131F          ; valid                                  # 4.1  ETHIOPIC SYLLABLE GGWAA
+1320..1346    ; valid                                  # 3.0  ETHIOPIC SYLLABLE THA..ETHIOPIC SYLLABLE TZO
+1347          ; valid                                  # 4.1  ETHIOPIC SYLLABLE TZOA
+1348..135A    ; valid                                  # 3.0  ETHIOPIC SYLLABLE FA..ETHIOPIC SYLLABLE FYA
+135B..135C    ; disallowed                             # NA   <reserved-135B>..<reserved-135C>
+135D..135E    ; valid                                  # 6.0  ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK..ETHIOPIC COMBINING VOWEL LENGTH MARK
+135F          ; valid                                  # 4.1  ETHIOPIC COMBINING GEMINATION MARK
+1360          ; valid                  ;      ; NV8    # 4.1  ETHIOPIC SECTION MARK
+1361..137C    ; valid                  ;      ; NV8    # 3.0  ETHIOPIC WORDSPACE..ETHIOPIC NUMBER TEN THOUSAND
+137D..137F    ; disallowed                             # NA   <reserved-137D>..<reserved-137F>
+1380..138F    ; valid                                  # 4.1  ETHIOPIC SYLLABLE SEBATBEIT MWA..ETHIOPIC SYLLABLE PWE
+1390..1399    ; valid                  ;      ; NV8    # 4.1  ETHIOPIC TONAL MARK YIZET..ETHIOPIC TONAL MARK KURT
+139A..139F    ; disallowed                             # NA   <reserved-139A>..<reserved-139F>
+13A0..13F4    ; valid                                  # 3.0  CHEROKEE LETTER A..CHEROKEE LETTER YV
+13F5          ; valid                                  # 8.0  CHEROKEE LETTER MV
+13F6..13F7    ; disallowed                             # NA   <reserved-13F6>..<reserved-13F7>
+13F8          ; mapped                 ; 13F0          # 8.0  CHEROKEE SMALL LETTER YE
+13F9          ; mapped                 ; 13F1          # 8.0  CHEROKEE SMALL LETTER YI
+13FA          ; mapped                 ; 13F2          # 8.0  CHEROKEE SMALL LETTER YO
+13FB          ; mapped                 ; 13F3          # 8.0  CHEROKEE SMALL LETTER YU
+13FC          ; mapped                 ; 13F4          # 8.0  CHEROKEE SMALL LETTER YV
+13FD          ; mapped                 ; 13F5          # 8.0  CHEROKEE SMALL LETTER MV
+13FE..13FF    ; disallowed                             # NA   <reserved-13FE>..<reserved-13FF>
+1400          ; valid                  ;      ; NV8    # 5.2  CANADIAN SYLLABICS HYPHEN
+1401..166C    ; valid                                  # 3.0  CANADIAN SYLLABICS E..CANADIAN SYLLABICS CARRIER TTSA
+166D..166E    ; valid                  ;      ; NV8    # 3.0  CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP
+166F..1676    ; valid                                  # 3.0  CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS NNGAA
+1677..167F    ; valid                                  # 5.2  CANADIAN SYLLABICS WOODS-CREE THWEE..CANADIAN SYLLABICS BLACKFOOT W
+1680          ; disallowed                             # 3.0  OGHAM SPACE MARK
+1681..169A    ; valid                                  # 3.0  OGHAM LETTER BEITH..OGHAM LETTER PEITH
+169B..169C    ; valid                  ;      ; NV8    # 3.0  OGHAM FEATHER MARK..OGHAM REVERSED FEATHER MARK
+169D..169F    ; disallowed                             # NA   <reserved-169D>..<reserved-169F>
+16A0..16EA    ; valid                                  # 3.0  RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X
+16EB..16F0    ; valid                  ;      ; NV8    # 3.0  RUNIC SINGLE PUNCTUATION..RUNIC BELGTHOR SYMBOL
+16F1..16F8    ; valid                                  # 7.0  RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC
+16F9..16FF    ; disallowed                             # NA   <reserved-16F9>..<reserved-16FF>
+1700..170C    ; valid                                  # 3.2  TAGALOG LETTER A..TAGALOG LETTER YA
+170D          ; disallowed                             # NA   <reserved-170D>
+170E..1714    ; valid                                  # 3.2  TAGALOG LETTER LA..TAGALOG SIGN VIRAMA
+1715..171F    ; disallowed                             # NA   <reserved-1715>..<reserved-171F>
+1720..1734    ; valid                                  # 3.2  HANUNOO LETTER A..HANUNOO SIGN PAMUDPOD
+1735..1736    ; valid                  ;      ; NV8    # 3.2  PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION
+1737..173F    ; disallowed                             # NA   <reserved-1737>..<reserved-173F>
+1740..1753    ; valid                                  # 3.2  BUHID LETTER A..BUHID VOWEL SIGN U
+1754..175F    ; disallowed                             # NA   <reserved-1754>..<reserved-175F>
+1760..176C    ; valid                                  # 3.2  TAGBANWA LETTER A..TAGBANWA LETTER YA
+176D          ; disallowed                             # NA   <reserved-176D>
+176E..1770    ; valid                                  # 3.2  TAGBANWA LETTER LA..TAGBANWA LETTER SA
+1771          ; disallowed                             # NA   <reserved-1771>
+1772..1773    ; valid                                  # 3.2  TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U
+1774..177F    ; disallowed                             # NA   <reserved-1774>..<reserved-177F>
+1780..17B3    ; valid                                  # 3.0  KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU
+17B4..17B5    ; disallowed                             # 3.0  KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA
+17B6..17D3    ; valid                                  # 3.0  KHMER VOWEL SIGN AA..KHMER SIGN BATHAMASAT
+17D4..17D6    ; valid                  ;      ; NV8    # 3.0  KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH
+17D7          ; valid                                  # 3.0  KHMER SIGN LEK TOO
+17D8..17DB    ; valid                  ;      ; NV8    # 3.0  KHMER SIGN BEYYAL..KHMER CURRENCY SYMBOL RIEL
+17DC          ; valid                                  # 3.0  KHMER SIGN AVAKRAHASANYA
+17DD          ; valid                                  # 4.0  KHMER SIGN ATTHACAN
+17DE..17DF    ; disallowed                             # NA   <reserved-17DE>..<reserved-17DF>
+17E0..17E9    ; valid                                  # 3.0  KHMER DIGIT ZERO..KHMER DIGIT NINE
+17EA..17EF    ; disallowed                             # NA   <reserved-17EA>..<reserved-17EF>
+17F0..17F9    ; valid                  ;      ; NV8    # 4.0  KHMER SYMBOL LEK ATTAK SON..KHMER SYMBOL LEK ATTAK PRAM-BUON
+17FA..17FF    ; disallowed                             # NA   <reserved-17FA>..<reserved-17FF>
+1800..1805    ; valid                  ;      ; NV8    # 3.0  MONGOLIAN BIRGA..MONGOLIAN FOUR DOTS
+1806          ; disallowed                             # 3.0  MONGOLIAN TODO SOFT HYPHEN
+1807..180A    ; valid                  ;      ; NV8    # 3.0  MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU
+180B..180D    ; ignored                                # 3.0  MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE
+180E          ; disallowed                             # 3.0  MONGOLIAN VOWEL SEPARATOR
+180F          ; disallowed                             # NA   <reserved-180F>
+1810..1819    ; valid                                  # 3.0  MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE
+181A..181F    ; disallowed                             # NA   <reserved-181A>..<reserved-181F>
+1820..1877    ; valid                                  # 3.0  MONGOLIAN LETTER A..MONGOLIAN LETTER MANCHU ZHA
+1878          ; valid                                  # 11.0 MONGOLIAN LETTER CHA WITH TWO DOTS
+1879..187F    ; disallowed                             # NA   <reserved-1879>..<reserved-187F>
+1880..18A9    ; valid                                  # 3.0  MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER ALI GALI DAGALGA
+18AA          ; valid                                  # 5.1  MONGOLIAN LETTER MANCHU ALI GALI LHA
+18AB..18AF    ; disallowed                             # NA   <reserved-18AB>..<reserved-18AF>
+18B0..18F5    ; valid                                  # 5.2  CANADIAN SYLLABICS OY..CANADIAN SYLLABICS CARRIER DENTAL S
+18F6..18FF    ; disallowed                             # NA   <reserved-18F6>..<reserved-18FF>
+1900..191C    ; valid                                  # 4.0  LIMBU VOWEL-CARRIER LETTER..LIMBU LETTER HA
+191D..191E    ; valid                                  # 7.0  LIMBU LETTER GYAN..LIMBU LETTER TRA
+191F          ; disallowed                             # NA   <reserved-191F>
+1920..192B    ; valid                                  # 4.0  LIMBU VOWEL SIGN A..LIMBU SUBJOINED LETTER WA
+192C..192F    ; disallowed                             # NA   <reserved-192C>..<reserved-192F>
+1930..193B    ; valid                                  # 4.0  LIMBU SMALL LETTER KA..LIMBU SIGN SA-I
+193C..193F    ; disallowed                             # NA   <reserved-193C>..<reserved-193F>
+1940          ; valid                  ;      ; NV8    # 4.0  LIMBU SIGN LOO
+1941..1943    ; disallowed                             # NA   <reserved-1941>..<reserved-1943>
+1944..1945    ; valid                  ;      ; NV8    # 4.0  LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK
+1946..196D    ; valid                                  # 4.0  LIMBU DIGIT ZERO..TAI LE LETTER AI
+196E..196F    ; disallowed                             # NA   <reserved-196E>..<reserved-196F>
+1970..1974    ; valid                                  # 4.0  TAI LE LETTER TONE-2..TAI LE LETTER TONE-6
+1975..197F    ; disallowed                             # NA   <reserved-1975>..<reserved-197F>
+1980..19A9    ; valid                                  # 4.1  NEW TAI LUE LETTER HIGH QA..NEW TAI LUE LETTER LOW XVA
+19AA..19AB    ; valid                                  # 5.2  NEW TAI LUE LETTER HIGH SUA..NEW TAI LUE LETTER LOW SUA
+19AC..19AF    ; disallowed                             # NA   <reserved-19AC>..<reserved-19AF>
+19B0..19C9    ; valid                                  # 4.1  NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE TONE MARK-2
+19CA..19CF    ; disallowed                             # NA   <reserved-19CA>..<reserved-19CF>
+19D0..19D9    ; valid                                  # 4.1  NEW TAI LUE DIGIT ZERO..NEW TAI LUE DIGIT NINE
+19DA          ; valid                  ;      ; XV8    # 5.2  NEW TAI LUE THAM DIGIT ONE
+19DB..19DD    ; disallowed                             # NA   <reserved-19DB>..<reserved-19DD>
+19DE..19DF    ; valid                  ;      ; NV8    # 4.1  NEW TAI LUE SIGN LAE..NEW TAI LUE SIGN LAEV
+19E0..19FF    ; valid                  ;      ; NV8    # 4.0  KHMER SYMBOL PATHAMASAT..KHMER SYMBOL DAP-PRAM ROC
+1A00..1A1B    ; valid                                  # 4.1  BUGINESE LETTER KA..BUGINESE VOWEL SIGN AE
+1A1C..1A1D    ; disallowed                             # NA   <reserved-1A1C>..<reserved-1A1D>
+1A1E..1A1F    ; valid                  ;      ; NV8    # 4.1  BUGINESE PALLAWA..BUGINESE END OF SECTION
+1A20..1A5E    ; valid                                  # 5.2  TAI THAM LETTER HIGH KA..TAI THAM CONSONANT SIGN SA
+1A5F          ; disallowed                             # NA   <reserved-1A5F>
+1A60..1A7C    ; valid                                  # 5.2  TAI THAM SIGN SAKOT..TAI THAM SIGN KHUEN-LUE KARAN
+1A7D..1A7E    ; disallowed                             # NA   <reserved-1A7D>..<reserved-1A7E>
+1A7F..1A89    ; valid                                  # 5.2  TAI THAM COMBINING CRYPTOGRAMMIC DOT..TAI THAM HORA DIGIT NINE
+1A8A..1A8F    ; disallowed                             # NA   <reserved-1A8A>..<reserved-1A8F>
+1A90..1A99    ; valid                                  # 5.2  TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE
+1A9A..1A9F    ; disallowed                             # NA   <reserved-1A9A>..<reserved-1A9F>
+1AA0..1AA6    ; valid                  ;      ; NV8    # 5.2  TAI THAM SIGN WIANG..TAI THAM SIGN REVERSED ROTATED RANA
+1AA7          ; valid                                  # 5.2  TAI THAM SIGN MAI YAMOK
+1AA8..1AAD    ; valid                  ;      ; NV8    # 5.2  TAI THAM SIGN KAAN..TAI THAM SIGN CAANG
+1AAE..1AAF    ; disallowed                             # NA   <reserved-1AAE>..<reserved-1AAF>
+1AB0..1ABD    ; valid                                  # 7.0  COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
+1ABE          ; valid                  ;      ; NV8    # 7.0  COMBINING PARENTHESES OVERLAY
+1ABF..1AC0    ; valid                                  # 13.0 COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER TURNED W BELOW
+1AC1..1AFF    ; disallowed                             # NA   <reserved-1AC1>..<reserved-1AFF>
+1B00..1B4B    ; valid                                  # 5.0  BALINESE SIGN ULU RICEM..BALINESE LETTER ASYURA SASAK
+1B4C..1B4F    ; disallowed                             # NA   <reserved-1B4C>..<reserved-1B4F>
+1B50..1B59    ; valid                                  # 5.0  BALINESE DIGIT ZERO..BALINESE DIGIT NINE
+1B5A..1B6A    ; valid                  ;      ; NV8    # 5.0  BALINESE PANTI..BALINESE MUSICAL SYMBOL DANG GEDE
+1B6B..1B73    ; valid                                  # 5.0  BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG
+1B74..1B7C    ; valid                  ;      ; NV8    # 5.0  BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG..BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING
+1B7D..1B7F    ; disallowed                             # NA   <reserved-1B7D>..<reserved-1B7F>
+1B80..1BAA    ; valid                                  # 5.1  SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PAMAAEH
+1BAB..1BAD    ; valid                                  # 6.1  SUNDANESE SIGN VIRAMA..SUNDANESE CONSONANT SIGN PASANGAN WA
+1BAE..1BB9    ; valid                                  # 5.1  SUNDANESE LETTER KHA..SUNDANESE DIGIT NINE
+1BBA..1BBF    ; valid                                  # 6.1  SUNDANESE AVAGRAHA..SUNDANESE LETTER FINAL M
+1BC0..1BF3    ; valid                                  # 6.0  BATAK LETTER A..BATAK PANONGONAN
+1BF4..1BFB    ; disallowed                             # NA   <reserved-1BF4>..<reserved-1BFB>
+1BFC..1BFF    ; valid                  ;      ; NV8    # 6.0  BATAK SYMBOL BINDU NA METEK..BATAK SYMBOL BINDU PANGOLAT
+1C00..1C37    ; valid                                  # 5.1  LEPCHA LETTER KA..LEPCHA SIGN NUKTA
+1C38..1C3A    ; disallowed                             # NA   <reserved-1C38>..<reserved-1C3A>
+1C3B..1C3F    ; valid                  ;      ; NV8    # 5.1  LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK
+1C40..1C49    ; valid                                  # 5.1  LEPCHA DIGIT ZERO..LEPCHA DIGIT NINE
+1C4A..1C4C    ; disallowed                             # NA   <reserved-1C4A>..<reserved-1C4C>
+1C4D..1C7D    ; valid                                  # 5.1  LEPCHA LETTER TTA..OL CHIKI AHAD
+1C7E..1C7F    ; valid                  ;      ; NV8    # 5.1  OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD
+1C80          ; mapped                 ; 0432          # 9.0  CYRILLIC SMALL LETTER ROUNDED VE
+1C81          ; mapped                 ; 0434          # 9.0  CYRILLIC SMALL LETTER LONG-LEGGED DE
+1C82          ; mapped                 ; 043E          # 9.0  CYRILLIC SMALL LETTER NARROW O
+1C83          ; mapped                 ; 0441          # 9.0  CYRILLIC SMALL LETTER WIDE ES
+1C84..1C85    ; mapped                 ; 0442          # 9.0  CYRILLIC SMALL LETTER TALL TE..CYRILLIC SMALL LETTER THREE-LEGGED TE
+1C86          ; mapped                 ; 044A          # 9.0  CYRILLIC SMALL LETTER TALL HARD SIGN
+1C87          ; mapped                 ; 0463          # 9.0  CYRILLIC SMALL LETTER TALL YAT
+1C88          ; mapped                 ; A64B          # 9.0  CYRILLIC SMALL LETTER UNBLENDED UK
+1C89..1C8F    ; disallowed                             # NA   <reserved-1C89>..<reserved-1C8F>
+1C90          ; mapped                 ; 10D0          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER AN
+1C91          ; mapped                 ; 10D1          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER BAN
+1C92          ; mapped                 ; 10D2          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER GAN
+1C93          ; mapped                 ; 10D3          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER DON
+1C94          ; mapped                 ; 10D4          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER EN
+1C95          ; mapped                 ; 10D5          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER VIN
+1C96          ; mapped                 ; 10D6          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER ZEN
+1C97          ; mapped                 ; 10D7          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER TAN
+1C98          ; mapped                 ; 10D8          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER IN
+1C99          ; mapped                 ; 10D9          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER KAN
+1C9A          ; mapped                 ; 10DA          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER LAS
+1C9B          ; mapped                 ; 10DB          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER MAN
+1C9C          ; mapped                 ; 10DC          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER NAR
+1C9D          ; mapped                 ; 10DD          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER ON
+1C9E          ; mapped                 ; 10DE          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER PAR
+1C9F          ; mapped                 ; 10DF          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER ZHAR
+1CA0          ; mapped                 ; 10E0          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER RAE
+1CA1          ; mapped                 ; 10E1          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER SAN
+1CA2          ; mapped                 ; 10E2          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER TAR
+1CA3          ; mapped                 ; 10E3          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER UN
+1CA4          ; mapped                 ; 10E4          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER PHAR
+1CA5          ; mapped                 ; 10E5          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER KHAR
+1CA6          ; mapped                 ; 10E6          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER GHAN
+1CA7          ; mapped                 ; 10E7          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER QAR
+1CA8          ; mapped                 ; 10E8          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER SHIN
+1CA9          ; mapped                 ; 10E9          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER CHIN
+1CAA          ; mapped                 ; 10EA          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER CAN
+1CAB          ; mapped                 ; 10EB          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER JIL
+1CAC          ; mapped                 ; 10EC          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER CIL
+1CAD          ; mapped                 ; 10ED          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER CHAR
+1CAE          ; mapped                 ; 10EE          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER XAN
+1CAF          ; mapped                 ; 10EF          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER JHAN
+1CB0          ; mapped                 ; 10F0          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER HAE
+1CB1          ; mapped                 ; 10F1          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER HE
+1CB2          ; mapped                 ; 10F2          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER HIE
+1CB3          ; mapped                 ; 10F3          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER WE
+1CB4          ; mapped                 ; 10F4          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER HAR
+1CB5          ; mapped                 ; 10F5          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER HOE
+1CB6          ; mapped                 ; 10F6          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER FI
+1CB7          ; mapped                 ; 10F7          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER YN
+1CB8          ; mapped                 ; 10F8          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER ELIFI
+1CB9          ; mapped                 ; 10F9          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN
+1CBA          ; mapped                 ; 10FA          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER AIN
+1CBB..1CBC    ; disallowed                             # NA   <reserved-1CBB>..<reserved-1CBC>
+1CBD          ; mapped                 ; 10FD          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER AEN
+1CBE          ; mapped                 ; 10FE          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN
+1CBF          ; mapped                 ; 10FF          # 11.0 GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN
+1CC0..1CC7    ; valid                  ;      ; NV8    # 6.1  SUNDANESE PUNCTUATION BINDU SURYA..SUNDANESE PUNCTUATION BINDU BA SATANGA
+1CC8..1CCF    ; disallowed                             # NA   <reserved-1CC8>..<reserved-1CCF>
+1CD0..1CD2    ; valid                                  # 5.2  VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
+1CD3          ; valid                  ;      ; NV8    # 5.2  VEDIC SIGN NIHSHVASA
+1CD4..1CF2    ; valid                                  # 5.2  VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC SIGN ARDHAVISARGA
+1CF3..1CF6    ; valid                                  # 6.1  VEDIC SIGN ROTATED ARDHAVISARGA..VEDIC SIGN UPADHMANIYA
+1CF7          ; valid                                  # 10.0 VEDIC SIGN ATIKRAMA
+1CF8..1CF9    ; valid                                  # 7.0  VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE
+1CFA          ; valid                                  # 12.0 VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA
+1CFB..1CFF    ; disallowed                             # NA   <reserved-1CFB>..<reserved-1CFF>
+1D00..1D2B    ; valid                                  # 4.0  LATIN LETTER SMALL CAPITAL A..CYRILLIC LETTER SMALL CAPITAL EL
+1D2C          ; mapped                 ; 0061          # 4.0  MODIFIER LETTER CAPITAL A
+1D2D          ; mapped                 ; 00E6          # 4.0  MODIFIER LETTER CAPITAL AE
+1D2E          ; mapped                 ; 0062          # 4.0  MODIFIER LETTER CAPITAL B
+1D2F          ; valid                                  # 4.0  MODIFIER LETTER CAPITAL BARRED B
+1D30          ; mapped                 ; 0064          # 4.0  MODIFIER LETTER CAPITAL D
+1D31          ; mapped                 ; 0065          # 4.0  MODIFIER LETTER CAPITAL E
+1D32          ; mapped                 ; 01DD          # 4.0  MODIFIER LETTER CAPITAL REVERSED E
+1D33          ; mapped                 ; 0067          # 4.0  MODIFIER LETTER CAPITAL G
+1D34          ; mapped                 ; 0068          # 4.0  MODIFIER LETTER CAPITAL H
+1D35          ; mapped                 ; 0069          # 4.0  MODIFIER LETTER CAPITAL I
+1D36          ; mapped                 ; 006A          # 4.0  MODIFIER LETTER CAPITAL J
+1D37          ; mapped                 ; 006B          # 4.0  MODIFIER LETTER CAPITAL K
+1D38          ; mapped                 ; 006C          # 4.0  MODIFIER LETTER CAPITAL L
+1D39          ; mapped                 ; 006D          # 4.0  MODIFIER LETTER CAPITAL M
+1D3A          ; mapped                 ; 006E          # 4.0  MODIFIER LETTER CAPITAL N
+1D3B          ; valid                                  # 4.0  MODIFIER LETTER CAPITAL REVERSED N
+1D3C          ; mapped                 ; 006F          # 4.0  MODIFIER LETTER CAPITAL O
+1D3D          ; mapped                 ; 0223          # 4.0  MODIFIER LETTER CAPITAL OU
+1D3E          ; mapped                 ; 0070          # 4.0  MODIFIER LETTER CAPITAL P
+1D3F          ; mapped                 ; 0072          # 4.0  MODIFIER LETTER CAPITAL R
+1D40          ; mapped                 ; 0074          # 4.0  MODIFIER LETTER CAPITAL T
+1D41          ; mapped                 ; 0075          # 4.0  MODIFIER LETTER CAPITAL U
+1D42          ; mapped                 ; 0077          # 4.0  MODIFIER LETTER CAPITAL W
+1D43          ; mapped                 ; 0061          # 4.0  MODIFIER LETTER SMALL A
+1D44          ; mapped                 ; 0250          # 4.0  MODIFIER LETTER SMALL TURNED A
+1D45          ; mapped                 ; 0251          # 4.0  MODIFIER LETTER SMALL ALPHA
+1D46          ; mapped                 ; 1D02          # 4.0  MODIFIER LETTER SMALL TURNED AE
+1D47          ; mapped                 ; 0062          # 4.0  MODIFIER LETTER SMALL B
+1D48          ; mapped                 ; 0064          # 4.0  MODIFIER LETTER SMALL D
+1D49          ; mapped                 ; 0065          # 4.0  MODIFIER LETTER SMALL E
+1D4A          ; mapped                 ; 0259          # 4.0  MODIFIER LETTER SMALL SCHWA
+1D4B          ; mapped                 ; 025B          # 4.0  MODIFIER LETTER SMALL OPEN E
+1D4C          ; mapped                 ; 025C          # 4.0  MODIFIER LETTER SMALL TURNED OPEN E
+1D4D          ; mapped                 ; 0067          # 4.0  MODIFIER LETTER SMALL G
+1D4E          ; valid                                  # 4.0  MODIFIER LETTER SMALL TURNED I
+1D4F          ; mapped                 ; 006B          # 4.0  MODIFIER LETTER SMALL K
+1D50          ; mapped                 ; 006D          # 4.0  MODIFIER LETTER SMALL M
+1D51          ; mapped                 ; 014B          # 4.0  MODIFIER LETTER SMALL ENG
+1D52          ; mapped                 ; 006F          # 4.0  MODIFIER LETTER SMALL O
+1D53          ; mapped                 ; 0254          # 4.0  MODIFIER LETTER SMALL OPEN O
+1D54          ; mapped                 ; 1D16          # 4.0  MODIFIER LETTER SMALL TOP HALF O
+1D55          ; mapped                 ; 1D17          # 4.0  MODIFIER LETTER SMALL BOTTOM HALF O
+1D56          ; mapped                 ; 0070          # 4.0  MODIFIER LETTER SMALL P
+1D57          ; mapped                 ; 0074          # 4.0  MODIFIER LETTER SMALL T
+1D58          ; mapped                 ; 0075          # 4.0  MODIFIER LETTER SMALL U
+1D59          ; mapped                 ; 1D1D          # 4.0  MODIFIER LETTER SMALL SIDEWAYS U
+1D5A          ; mapped                 ; 026F          # 4.0  MODIFIER LETTER SMALL TURNED M
+1D5B          ; mapped                 ; 0076          # 4.0  MODIFIER LETTER SMALL V
+1D5C          ; mapped                 ; 1D25          # 4.0  MODIFIER LETTER SMALL AIN
+1D5D          ; mapped                 ; 03B2          # 4.0  MODIFIER LETTER SMALL BETA
+1D5E          ; mapped                 ; 03B3          # 4.0  MODIFIER LETTER SMALL GREEK GAMMA
+1D5F          ; mapped                 ; 03B4          # 4.0  MODIFIER LETTER SMALL DELTA
+1D60          ; mapped                 ; 03C6          # 4.0  MODIFIER LETTER SMALL GREEK PHI
+1D61          ; mapped                 ; 03C7          # 4.0  MODIFIER LETTER SMALL CHI
+1D62          ; mapped                 ; 0069          # 4.0  LATIN SUBSCRIPT SMALL LETTER I
+1D63          ; mapped                 ; 0072          # 4.0  LATIN SUBSCRIPT SMALL LETTER R
+1D64          ; mapped                 ; 0075          # 4.0  LATIN SUBSCRIPT SMALL LETTER U
+1D65          ; mapped                 ; 0076          # 4.0  LATIN SUBSCRIPT SMALL LETTER V
+1D66          ; mapped                 ; 03B2          # 4.0  GREEK SUBSCRIPT SMALL LETTER BETA
+1D67          ; mapped                 ; 03B3          # 4.0  GREEK SUBSCRIPT SMALL LETTER GAMMA
+1D68          ; mapped                 ; 03C1          # 4.0  GREEK SUBSCRIPT SMALL LETTER RHO
+1D69          ; mapped                 ; 03C6          # 4.0  GREEK SUBSCRIPT SMALL LETTER PHI
+1D6A          ; mapped                 ; 03C7          # 4.0  GREEK SUBSCRIPT SMALL LETTER CHI
+1D6B          ; valid                                  # 4.0  LATIN SMALL LETTER UE
+1D6C..1D77    ; valid                                  # 4.1  LATIN SMALL LETTER B WITH MIDDLE TILDE..LATIN SMALL LETTER TURNED G
+1D78          ; mapped                 ; 043D          # 4.1  MODIFIER LETTER CYRILLIC EN
+1D79..1D9A    ; valid                                  # 4.1  LATIN SMALL LETTER INSULAR G..LATIN SMALL LETTER EZH WITH RETROFLEX HOOK
+1D9B          ; mapped                 ; 0252          # 4.1  MODIFIER LETTER SMALL TURNED ALPHA
+1D9C          ; mapped                 ; 0063          # 4.1  MODIFIER LETTER SMALL C
+1D9D          ; mapped                 ; 0255          # 4.1  MODIFIER LETTER SMALL C WITH CURL
+1D9E          ; mapped                 ; 00F0          # 4.1  MODIFIER LETTER SMALL ETH
+1D9F          ; mapped                 ; 025C          # 4.1  MODIFIER LETTER SMALL REVERSED OPEN E
+1DA0          ; mapped                 ; 0066          # 4.1  MODIFIER LETTER SMALL F
+1DA1          ; mapped                 ; 025F          # 4.1  MODIFIER LETTER SMALL DOTLESS J WITH STROKE
+1DA2          ; mapped                 ; 0261          # 4.1  MODIFIER LETTER SMALL SCRIPT G
+1DA3          ; mapped                 ; 0265          # 4.1  MODIFIER LETTER SMALL TURNED H
+1DA4          ; mapped                 ; 0268          # 4.1  MODIFIER LETTER SMALL I WITH STROKE
+1DA5          ; mapped                 ; 0269          # 4.1  MODIFIER LETTER SMALL IOTA
+1DA6          ; mapped                 ; 026A          # 4.1  MODIFIER LETTER SMALL CAPITAL I
+1DA7          ; mapped                 ; 1D7B          # 4.1  MODIFIER LETTER SMALL CAPITAL I WITH STROKE
+1DA8          ; mapped                 ; 029D          # 4.1  MODIFIER LETTER SMALL J WITH CROSSED-TAIL
+1DA9          ; mapped                 ; 026D          # 4.1  MODIFIER LETTER SMALL L WITH RETROFLEX HOOK
+1DAA          ; mapped                 ; 1D85          # 4.1  MODIFIER LETTER SMALL L WITH PALATAL HOOK
+1DAB          ; mapped                 ; 029F          # 4.1  MODIFIER LETTER SMALL CAPITAL L
+1DAC          ; mapped                 ; 0271          # 4.1  MODIFIER LETTER SMALL M WITH HOOK
+1DAD          ; mapped                 ; 0270          # 4.1  MODIFIER LETTER SMALL TURNED M WITH LONG LEG
+1DAE          ; mapped                 ; 0272          # 4.1  MODIFIER LETTER SMALL N WITH LEFT HOOK
+1DAF          ; mapped                 ; 0273          # 4.1  MODIFIER LETTER SMALL N WITH RETROFLEX HOOK
+1DB0          ; mapped                 ; 0274          # 4.1  MODIFIER LETTER SMALL CAPITAL N
+1DB1          ; mapped                 ; 0275          # 4.1  MODIFIER LETTER SMALL BARRED O
+1DB2          ; mapped                 ; 0278          # 4.1  MODIFIER LETTER SMALL PHI
+1DB3          ; mapped                 ; 0282          # 4.1  MODIFIER LETTER SMALL S WITH HOOK
+1DB4          ; mapped                 ; 0283          # 4.1  MODIFIER LETTER SMALL ESH
+1DB5          ; mapped                 ; 01AB          # 4.1  MODIFIER LETTER SMALL T WITH PALATAL HOOK
+1DB6          ; mapped                 ; 0289          # 4.1  MODIFIER LETTER SMALL U BAR
+1DB7          ; mapped                 ; 028A          # 4.1  MODIFIER LETTER SMALL UPSILON
+1DB8          ; mapped                 ; 1D1C          # 4.1  MODIFIER LETTER SMALL CAPITAL U
+1DB9          ; mapped                 ; 028B          # 4.1  MODIFIER LETTER SMALL V WITH HOOK
+1DBA          ; mapped                 ; 028C          # 4.1  MODIFIER LETTER SMALL TURNED V
+1DBB          ; mapped                 ; 007A          # 4.1  MODIFIER LETTER SMALL Z
+1DBC          ; mapped                 ; 0290          # 4.1  MODIFIER LETTER SMALL Z WITH RETROFLEX HOOK
+1DBD          ; mapped                 ; 0291          # 4.1  MODIFIER LETTER SMALL Z WITH CURL
+1DBE          ; mapped                 ; 0292          # 4.1  MODIFIER LETTER SMALL EZH
+1DBF          ; mapped                 ; 03B8          # 4.1  MODIFIER LETTER SMALL THETA
+1DC0..1DC3    ; valid                                  # 4.1  COMBINING DOTTED GRAVE ACCENT..COMBINING SUSPENSION MARK
+1DC4..1DCA    ; valid                                  # 5.0  COMBINING MACRON-ACUTE..COMBINING LATIN SMALL LETTER R BELOW
+1DCB..1DE6    ; valid                                  # 5.1  COMBINING BREVE-MACRON..COMBINING LATIN SMALL LETTER Z
+1DE7..1DF5    ; valid                                  # 7.0  COMBINING LATIN SMALL LETTER ALPHA..COMBINING UP TACK ABOVE
+1DF6..1DF9    ; valid                                  # 10.0 COMBINING KAVYKA ABOVE RIGHT..COMBINING WIDE INVERTED BRIDGE BELOW
+1DFA          ; disallowed                             # NA   <reserved-1DFA>
+1DFB          ; valid                                  # 9.0  COMBINING DELETION MARK
+1DFC          ; valid                                  # 6.0  COMBINING DOUBLE INVERTED BREVE BELOW
+1DFD          ; valid                                  # 5.2  COMBINING ALMOST EQUAL TO BELOW
+1DFE..1DFF    ; valid                                  # 5.0  COMBINING LEFT ARROWHEAD ABOVE..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
+1E00          ; mapped                 ; 1E01          # 1.1  LATIN CAPITAL LETTER A WITH RING BELOW
+1E01          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH RING BELOW
+1E02          ; mapped                 ; 1E03          # 1.1  LATIN CAPITAL LETTER B WITH DOT ABOVE
+1E03          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH DOT ABOVE
+1E04          ; mapped                 ; 1E05          # 1.1  LATIN CAPITAL LETTER B WITH DOT BELOW
+1E05          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH DOT BELOW
+1E06          ; mapped                 ; 1E07          # 1.1  LATIN CAPITAL LETTER B WITH LINE BELOW
+1E07          ; valid                                  # 1.1  LATIN SMALL LETTER B WITH LINE BELOW
+1E08          ; mapped                 ; 1E09          # 1.1  LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+1E09          ; valid                                  # 1.1  LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+1E0A          ; mapped                 ; 1E0B          # 1.1  LATIN CAPITAL LETTER D WITH DOT ABOVE
+1E0B          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH DOT ABOVE
+1E0C          ; mapped                 ; 1E0D          # 1.1  LATIN CAPITAL LETTER D WITH DOT BELOW
+1E0D          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH DOT BELOW
+1E0E          ; mapped                 ; 1E0F          # 1.1  LATIN CAPITAL LETTER D WITH LINE BELOW
+1E0F          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH LINE BELOW
+1E10          ; mapped                 ; 1E11          # 1.1  LATIN CAPITAL LETTER D WITH CEDILLA
+1E11          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH CEDILLA
+1E12          ; mapped                 ; 1E13          # 1.1  LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+1E13          ; valid                                  # 1.1  LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
+1E14          ; mapped                 ; 1E15          # 1.1  LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
+1E15          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH MACRON AND GRAVE
+1E16          ; mapped                 ; 1E17          # 1.1  LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
+1E17          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH MACRON AND ACUTE
+1E18          ; mapped                 ; 1E19          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+1E19          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
+1E1A          ; mapped                 ; 1E1B          # 1.1  LATIN CAPITAL LETTER E WITH TILDE BELOW
+1E1B          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH TILDE BELOW
+1E1C          ; mapped                 ; 1E1D          # 1.1  LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+1E1D          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+1E1E          ; mapped                 ; 1E1F          # 1.1  LATIN CAPITAL LETTER F WITH DOT ABOVE
+1E1F          ; valid                                  # 1.1  LATIN SMALL LETTER F WITH DOT ABOVE
+1E20          ; mapped                 ; 1E21          # 1.1  LATIN CAPITAL LETTER G WITH MACRON
+1E21          ; valid                                  # 1.1  LATIN SMALL LETTER G WITH MACRON
+1E22          ; mapped                 ; 1E23          # 1.1  LATIN CAPITAL LETTER H WITH DOT ABOVE
+1E23          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH DOT ABOVE
+1E24          ; mapped                 ; 1E25          # 1.1  LATIN CAPITAL LETTER H WITH DOT BELOW
+1E25          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH DOT BELOW
+1E26          ; mapped                 ; 1E27          # 1.1  LATIN CAPITAL LETTER H WITH DIAERESIS
+1E27          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH DIAERESIS
+1E28          ; mapped                 ; 1E29          # 1.1  LATIN CAPITAL LETTER H WITH CEDILLA
+1E29          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH CEDILLA
+1E2A          ; mapped                 ; 1E2B          # 1.1  LATIN CAPITAL LETTER H WITH BREVE BELOW
+1E2B          ; valid                                  # 1.1  LATIN SMALL LETTER H WITH BREVE BELOW
+1E2C          ; mapped                 ; 1E2D          # 1.1  LATIN CAPITAL LETTER I WITH TILDE BELOW
+1E2D          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH TILDE BELOW
+1E2E          ; mapped                 ; 1E2F          # 1.1  LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
+1E2F          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
+1E30          ; mapped                 ; 1E31          # 1.1  LATIN CAPITAL LETTER K WITH ACUTE
+1E31          ; valid                                  # 1.1  LATIN SMALL LETTER K WITH ACUTE
+1E32          ; mapped                 ; 1E33          # 1.1  LATIN CAPITAL LETTER K WITH DOT BELOW
+1E33          ; valid                                  # 1.1  LATIN SMALL LETTER K WITH DOT BELOW
+1E34          ; mapped                 ; 1E35          # 1.1  LATIN CAPITAL LETTER K WITH LINE BELOW
+1E35          ; valid                                  # 1.1  LATIN SMALL LETTER K WITH LINE BELOW
+1E36          ; mapped                 ; 1E37          # 1.1  LATIN CAPITAL LETTER L WITH DOT BELOW
+1E37          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH DOT BELOW
+1E38          ; mapped                 ; 1E39          # 1.1  LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
+1E39          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
+1E3A          ; mapped                 ; 1E3B          # 1.1  LATIN CAPITAL LETTER L WITH LINE BELOW
+1E3B          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH LINE BELOW
+1E3C          ; mapped                 ; 1E3D          # 1.1  LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+1E3D          ; valid                                  # 1.1  LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
+1E3E          ; mapped                 ; 1E3F          # 1.1  LATIN CAPITAL LETTER M WITH ACUTE
+1E3F          ; valid                                  # 1.1  LATIN SMALL LETTER M WITH ACUTE
+1E40          ; mapped                 ; 1E41          # 1.1  LATIN CAPITAL LETTER M WITH DOT ABOVE
+1E41          ; valid                                  # 1.1  LATIN SMALL LETTER M WITH DOT ABOVE
+1E42          ; mapped                 ; 1E43          # 1.1  LATIN CAPITAL LETTER M WITH DOT BELOW
+1E43          ; valid                                  # 1.1  LATIN SMALL LETTER M WITH DOT BELOW
+1E44          ; mapped                 ; 1E45          # 1.1  LATIN CAPITAL LETTER N WITH DOT ABOVE
+1E45          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH DOT ABOVE
+1E46          ; mapped                 ; 1E47          # 1.1  LATIN CAPITAL LETTER N WITH DOT BELOW
+1E47          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH DOT BELOW
+1E48          ; mapped                 ; 1E49          # 1.1  LATIN CAPITAL LETTER N WITH LINE BELOW
+1E49          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH LINE BELOW
+1E4A          ; mapped                 ; 1E4B          # 1.1  LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+1E4B          ; valid                                  # 1.1  LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
+1E4C          ; mapped                 ; 1E4D          # 1.1  LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
+1E4D          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH TILDE AND ACUTE
+1E4E          ; mapped                 ; 1E4F          # 1.1  LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
+1E4F          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
+1E50          ; mapped                 ; 1E51          # 1.1  LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
+1E51          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH MACRON AND GRAVE
+1E52          ; mapped                 ; 1E53          # 1.1  LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
+1E53          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH MACRON AND ACUTE
+1E54          ; mapped                 ; 1E55          # 1.1  LATIN CAPITAL LETTER P WITH ACUTE
+1E55          ; valid                                  # 1.1  LATIN SMALL LETTER P WITH ACUTE
+1E56          ; mapped                 ; 1E57          # 1.1  LATIN CAPITAL LETTER P WITH DOT ABOVE
+1E57          ; valid                                  # 1.1  LATIN SMALL LETTER P WITH DOT ABOVE
+1E58          ; mapped                 ; 1E59          # 1.1  LATIN CAPITAL LETTER R WITH DOT ABOVE
+1E59          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH DOT ABOVE
+1E5A          ; mapped                 ; 1E5B          # 1.1  LATIN CAPITAL LETTER R WITH DOT BELOW
+1E5B          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH DOT BELOW
+1E5C          ; mapped                 ; 1E5D          # 1.1  LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
+1E5D          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
+1E5E          ; mapped                 ; 1E5F          # 1.1  LATIN CAPITAL LETTER R WITH LINE BELOW
+1E5F          ; valid                                  # 1.1  LATIN SMALL LETTER R WITH LINE BELOW
+1E60          ; mapped                 ; 1E61          # 1.1  LATIN CAPITAL LETTER S WITH DOT ABOVE
+1E61          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH DOT ABOVE
+1E62          ; mapped                 ; 1E63          # 1.1  LATIN CAPITAL LETTER S WITH DOT BELOW
+1E63          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH DOT BELOW
+1E64          ; mapped                 ; 1E65          # 1.1  LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
+1E65          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
+1E66          ; mapped                 ; 1E67          # 1.1  LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
+1E67          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
+1E68          ; mapped                 ; 1E69          # 1.1  LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
+1E69          ; valid                                  # 1.1  LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
+1E6A          ; mapped                 ; 1E6B          # 1.1  LATIN CAPITAL LETTER T WITH DOT ABOVE
+1E6B          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH DOT ABOVE
+1E6C          ; mapped                 ; 1E6D          # 1.1  LATIN CAPITAL LETTER T WITH DOT BELOW
+1E6D          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH DOT BELOW
+1E6E          ; mapped                 ; 1E6F          # 1.1  LATIN CAPITAL LETTER T WITH LINE BELOW
+1E6F          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH LINE BELOW
+1E70          ; mapped                 ; 1E71          # 1.1  LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+1E71          ; valid                                  # 1.1  LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
+1E72          ; mapped                 ; 1E73          # 1.1  LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+1E73          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DIAERESIS BELOW
+1E74          ; mapped                 ; 1E75          # 1.1  LATIN CAPITAL LETTER U WITH TILDE BELOW
+1E75          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH TILDE BELOW
+1E76          ; mapped                 ; 1E77          # 1.1  LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+1E77          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
+1E78          ; mapped                 ; 1E79          # 1.1  LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
+1E79          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH TILDE AND ACUTE
+1E7A          ; mapped                 ; 1E7B          # 1.1  LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
+1E7B          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
+1E7C          ; mapped                 ; 1E7D          # 1.1  LATIN CAPITAL LETTER V WITH TILDE
+1E7D          ; valid                                  # 1.1  LATIN SMALL LETTER V WITH TILDE
+1E7E          ; mapped                 ; 1E7F          # 1.1  LATIN CAPITAL LETTER V WITH DOT BELOW
+1E7F          ; valid                                  # 1.1  LATIN SMALL LETTER V WITH DOT BELOW
+1E80          ; mapped                 ; 1E81          # 1.1  LATIN CAPITAL LETTER W WITH GRAVE
+1E81          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH GRAVE
+1E82          ; mapped                 ; 1E83          # 1.1  LATIN CAPITAL LETTER W WITH ACUTE
+1E83          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH ACUTE
+1E84          ; mapped                 ; 1E85          # 1.1  LATIN CAPITAL LETTER W WITH DIAERESIS
+1E85          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH DIAERESIS
+1E86          ; mapped                 ; 1E87          # 1.1  LATIN CAPITAL LETTER W WITH DOT ABOVE
+1E87          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH DOT ABOVE
+1E88          ; mapped                 ; 1E89          # 1.1  LATIN CAPITAL LETTER W WITH DOT BELOW
+1E89          ; valid                                  # 1.1  LATIN SMALL LETTER W WITH DOT BELOW
+1E8A          ; mapped                 ; 1E8B          # 1.1  LATIN CAPITAL LETTER X WITH DOT ABOVE
+1E8B          ; valid                                  # 1.1  LATIN SMALL LETTER X WITH DOT ABOVE
+1E8C          ; mapped                 ; 1E8D          # 1.1  LATIN CAPITAL LETTER X WITH DIAERESIS
+1E8D          ; valid                                  # 1.1  LATIN SMALL LETTER X WITH DIAERESIS
+1E8E          ; mapped                 ; 1E8F          # 1.1  LATIN CAPITAL LETTER Y WITH DOT ABOVE
+1E8F          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH DOT ABOVE
+1E90          ; mapped                 ; 1E91          # 1.1  LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+1E91          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH CIRCUMFLEX
+1E92          ; mapped                 ; 1E93          # 1.1  LATIN CAPITAL LETTER Z WITH DOT BELOW
+1E93          ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH DOT BELOW
+1E94          ; mapped                 ; 1E95          # 1.1  LATIN CAPITAL LETTER Z WITH LINE BELOW
+1E95..1E99    ; valid                                  # 1.1  LATIN SMALL LETTER Z WITH LINE BELOW..LATIN SMALL LETTER Y WITH RING ABOVE
+1E9A          ; mapped                 ; 0061 02BE     # 1.1  LATIN SMALL LETTER A WITH RIGHT HALF RING
+1E9B          ; mapped                 ; 1E61          # 2.0  LATIN SMALL LETTER LONG S WITH DOT ABOVE
+1E9C..1E9D    ; valid                                  # 5.1  LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE..LATIN SMALL LETTER LONG S WITH HIGH STROKE
+1E9E          ; mapped                 ; 0073 0073     # 5.1  LATIN CAPITAL LETTER SHARP S
+1E9F          ; valid                                  # 5.1  LATIN SMALL LETTER DELTA
+1EA0          ; mapped                 ; 1EA1          # 1.1  LATIN CAPITAL LETTER A WITH DOT BELOW
+1EA1          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH DOT BELOW
+1EA2          ; mapped                 ; 1EA3          # 1.1  LATIN CAPITAL LETTER A WITH HOOK ABOVE
+1EA3          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH HOOK ABOVE
+1EA4          ; mapped                 ; 1EA5          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+1EA5          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+1EA6          ; mapped                 ; 1EA7          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+1EA7          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+1EA8          ; mapped                 ; 1EA9          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+1EA9          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+1EAA          ; mapped                 ; 1EAB          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+1EAB          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+1EAC          ; mapped                 ; 1EAD          # 1.1  LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+1EAD          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+1EAE          ; mapped                 ; 1EAF          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+1EAF          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND ACUTE
+1EB0          ; mapped                 ; 1EB1          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+1EB1          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND GRAVE
+1EB2          ; mapped                 ; 1EB3          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+1EB3          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+1EB4          ; mapped                 ; 1EB5          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+1EB5          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND TILDE
+1EB6          ; mapped                 ; 1EB7          # 1.1  LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+1EB7          ; valid                                  # 1.1  LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+1EB8          ; mapped                 ; 1EB9          # 1.1  LATIN CAPITAL LETTER E WITH DOT BELOW
+1EB9          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH DOT BELOW
+1EBA          ; mapped                 ; 1EBB          # 1.1  LATIN CAPITAL LETTER E WITH HOOK ABOVE
+1EBB          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH HOOK ABOVE
+1EBC          ; mapped                 ; 1EBD          # 1.1  LATIN CAPITAL LETTER E WITH TILDE
+1EBD          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH TILDE
+1EBE          ; mapped                 ; 1EBF          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+1EBF          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+1EC0          ; mapped                 ; 1EC1          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+1EC1          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+1EC2          ; mapped                 ; 1EC3          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+1EC3          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+1EC4          ; mapped                 ; 1EC5          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+1EC5          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+1EC6          ; mapped                 ; 1EC7          # 1.1  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+1EC7          ; valid                                  # 1.1  LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+1EC8          ; mapped                 ; 1EC9          # 1.1  LATIN CAPITAL LETTER I WITH HOOK ABOVE
+1EC9          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH HOOK ABOVE
+1ECA          ; mapped                 ; 1ECB          # 1.1  LATIN CAPITAL LETTER I WITH DOT BELOW
+1ECB          ; valid                                  # 1.1  LATIN SMALL LETTER I WITH DOT BELOW
+1ECC          ; mapped                 ; 1ECD          # 1.1  LATIN CAPITAL LETTER O WITH DOT BELOW
+1ECD          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH DOT BELOW
+1ECE          ; mapped                 ; 1ECF          # 1.1  LATIN CAPITAL LETTER O WITH HOOK ABOVE
+1ECF          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HOOK ABOVE
+1ED0          ; mapped                 ; 1ED1          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+1ED1          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+1ED2          ; mapped                 ; 1ED3          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+1ED3          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+1ED4          ; mapped                 ; 1ED5          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+1ED5          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+1ED6          ; mapped                 ; 1ED7          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+1ED7          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+1ED8          ; mapped                 ; 1ED9          # 1.1  LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+1ED9          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+1EDA          ; mapped                 ; 1EDB          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+1EDB          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND ACUTE
+1EDC          ; mapped                 ; 1EDD          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+1EDD          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND GRAVE
+1EDE          ; mapped                 ; 1EDF          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+1EDF          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+1EE0          ; mapped                 ; 1EE1          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND TILDE
+1EE1          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND TILDE
+1EE2          ; mapped                 ; 1EE3          # 1.1  LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+1EE3          ; valid                                  # 1.1  LATIN SMALL LETTER O WITH HORN AND DOT BELOW
+1EE4          ; mapped                 ; 1EE5          # 1.1  LATIN CAPITAL LETTER U WITH DOT BELOW
+1EE5          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH DOT BELOW
+1EE6          ; mapped                 ; 1EE7          # 1.1  LATIN CAPITAL LETTER U WITH HOOK ABOVE
+1EE7          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HOOK ABOVE
+1EE8          ; mapped                 ; 1EE9          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+1EE9          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND ACUTE
+1EEA          ; mapped                 ; 1EEB          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+1EEB          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND GRAVE
+1EEC          ; mapped                 ; 1EED          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+1EED          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+1EEE          ; mapped                 ; 1EEF          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND TILDE
+1EEF          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND TILDE
+1EF0          ; mapped                 ; 1EF1          # 1.1  LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+1EF1          ; valid                                  # 1.1  LATIN SMALL LETTER U WITH HORN AND DOT BELOW
+1EF2          ; mapped                 ; 1EF3          # 1.1  LATIN CAPITAL LETTER Y WITH GRAVE
+1EF3          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH GRAVE
+1EF4          ; mapped                 ; 1EF5          # 1.1  LATIN CAPITAL LETTER Y WITH DOT BELOW
+1EF5          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH DOT BELOW
+1EF6          ; mapped                 ; 1EF7          # 1.1  LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+1EF7          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH HOOK ABOVE
+1EF8          ; mapped                 ; 1EF9          # 1.1  LATIN CAPITAL LETTER Y WITH TILDE
+1EF9          ; valid                                  # 1.1  LATIN SMALL LETTER Y WITH TILDE
+1EFA          ; mapped                 ; 1EFB          # 5.1  LATIN CAPITAL LETTER MIDDLE-WELSH LL
+1EFB          ; valid                                  # 5.1  LATIN SMALL LETTER MIDDLE-WELSH LL
+1EFC          ; mapped                 ; 1EFD          # 5.1  LATIN CAPITAL LETTER MIDDLE-WELSH V
+1EFD          ; valid                                  # 5.1  LATIN SMALL LETTER MIDDLE-WELSH V
+1EFE          ; mapped                 ; 1EFF          # 5.1  LATIN CAPITAL LETTER Y WITH LOOP
+1EFF          ; valid                                  # 5.1  LATIN SMALL LETTER Y WITH LOOP
+1F00..1F07    ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI..GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+1F08          ; mapped                 ; 1F00          # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI
+1F09          ; mapped                 ; 1F01          # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA
+1F0A          ; mapped                 ; 1F02          # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+1F0B          ; mapped                 ; 1F03          # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+1F0C          ; mapped                 ; 1F04          # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+1F0D          ; mapped                 ; 1F05          # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+1F0E          ; mapped                 ; 1F06          # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+1F0F          ; mapped                 ; 1F07          # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+1F10..1F15    ; valid                                  # 1.1  GREEK SMALL LETTER EPSILON WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+1F16..1F17    ; disallowed                             # NA   <reserved-1F16>..<reserved-1F17>
+1F18          ; mapped                 ; 1F10          # 1.1  GREEK CAPITAL LETTER EPSILON WITH PSILI
+1F19          ; mapped                 ; 1F11          # 1.1  GREEK CAPITAL LETTER EPSILON WITH DASIA
+1F1A          ; mapped                 ; 1F12          # 1.1  GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+1F1B          ; mapped                 ; 1F13          # 1.1  GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+1F1C          ; mapped                 ; 1F14          # 1.1  GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+1F1D          ; mapped                 ; 1F15          # 1.1  GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+1F1E..1F1F    ; disallowed                             # NA   <reserved-1F1E>..<reserved-1F1F>
+1F20..1F27    ; valid                                  # 1.1  GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+1F28          ; mapped                 ; 1F20          # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI
+1F29          ; mapped                 ; 1F21          # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA
+1F2A          ; mapped                 ; 1F22          # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+1F2B          ; mapped                 ; 1F23          # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+1F2C          ; mapped                 ; 1F24          # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+1F2D          ; mapped                 ; 1F25          # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+1F2E          ; mapped                 ; 1F26          # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+1F2F          ; mapped                 ; 1F27          # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+1F30..1F37    ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH PSILI..GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+1F38          ; mapped                 ; 1F30          # 1.1  GREEK CAPITAL LETTER IOTA WITH PSILI
+1F39          ; mapped                 ; 1F31          # 1.1  GREEK CAPITAL LETTER IOTA WITH DASIA
+1F3A          ; mapped                 ; 1F32          # 1.1  GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+1F3B          ; mapped                 ; 1F33          # 1.1  GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+1F3C          ; mapped                 ; 1F34          # 1.1  GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+1F3D          ; mapped                 ; 1F35          # 1.1  GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+1F3E          ; mapped                 ; 1F36          # 1.1  GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+1F3F          ; mapped                 ; 1F37          # 1.1  GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+1F40..1F45    ; valid                                  # 1.1  GREEK SMALL LETTER OMICRON WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+1F46..1F47    ; disallowed                             # NA   <reserved-1F46>..<reserved-1F47>
+1F48          ; mapped                 ; 1F40          # 1.1  GREEK CAPITAL LETTER OMICRON WITH PSILI
+1F49          ; mapped                 ; 1F41          # 1.1  GREEK CAPITAL LETTER OMICRON WITH DASIA
+1F4A          ; mapped                 ; 1F42          # 1.1  GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+1F4B          ; mapped                 ; 1F43          # 1.1  GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+1F4C          ; mapped                 ; 1F44          # 1.1  GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+1F4D          ; mapped                 ; 1F45          # 1.1  GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+1F4E..1F4F    ; disallowed                             # NA   <reserved-1F4E>..<reserved-1F4F>
+1F50..1F57    ; valid                                  # 1.1  GREEK SMALL LETTER UPSILON WITH PSILI..GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+1F58          ; disallowed                             # NA   <reserved-1F58>
+1F59          ; mapped                 ; 1F51          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DASIA
+1F5A          ; disallowed                             # NA   <reserved-1F5A>
+1F5B          ; mapped                 ; 1F53          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+1F5C          ; disallowed                             # NA   <reserved-1F5C>
+1F5D          ; mapped                 ; 1F55          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+1F5E          ; disallowed                             # NA   <reserved-1F5E>
+1F5F          ; mapped                 ; 1F57          # 1.1  GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+1F60..1F67    ; valid                                  # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI..GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+1F68          ; mapped                 ; 1F60          # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI
+1F69          ; mapped                 ; 1F61          # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA
+1F6A          ; mapped                 ; 1F62          # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+1F6B          ; mapped                 ; 1F63          # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+1F6C          ; mapped                 ; 1F64          # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+1F6D          ; mapped                 ; 1F65          # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+1F6E          ; mapped                 ; 1F66          # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+1F6F          ; mapped                 ; 1F67          # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+1F70          ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH VARIA
+1F71          ; mapped                 ; 03AC          # 1.1  GREEK SMALL LETTER ALPHA WITH OXIA
+1F72          ; valid                                  # 1.1  GREEK SMALL LETTER EPSILON WITH VARIA
+1F73          ; mapped                 ; 03AD          # 1.1  GREEK SMALL LETTER EPSILON WITH OXIA
+1F74          ; valid                                  # 1.1  GREEK SMALL LETTER ETA WITH VARIA
+1F75          ; mapped                 ; 03AE          # 1.1  GREEK SMALL LETTER ETA WITH OXIA
+1F76          ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH VARIA
+1F77          ; mapped                 ; 03AF          # 1.1  GREEK SMALL LETTER IOTA WITH OXIA
+1F78          ; valid                                  # 1.1  GREEK SMALL LETTER OMICRON WITH VARIA
+1F79          ; mapped                 ; 03CC          # 1.1  GREEK SMALL LETTER OMICRON WITH OXIA
+1F7A          ; valid                                  # 1.1  GREEK SMALL LETTER UPSILON WITH VARIA
+1F7B          ; mapped                 ; 03CD          # 1.1  GREEK SMALL LETTER UPSILON WITH OXIA
+1F7C          ; valid                                  # 1.1  GREEK SMALL LETTER OMEGA WITH VARIA
+1F7D          ; mapped                 ; 03CE          # 1.1  GREEK SMALL LETTER OMEGA WITH OXIA
+1F7E..1F7F    ; disallowed                             # NA   <reserved-1F7E>..<reserved-1F7F>
+1F80          ; mapped                 ; 1F00 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+1F81          ; mapped                 ; 1F01 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+1F82          ; mapped                 ; 1F02 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1F83          ; mapped                 ; 1F03 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1F84          ; mapped                 ; 1F04 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1F85          ; mapped                 ; 1F05 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1F86          ; mapped                 ; 1F06 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1F87          ; mapped                 ; 1F07 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F88          ; mapped                 ; 1F00 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+1F89          ; mapped                 ; 1F01 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+1F8A          ; mapped                 ; 1F02 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F8B          ; mapped                 ; 1F03 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F8C          ; mapped                 ; 1F04 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F8D          ; mapped                 ; 1F05 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F8E          ; mapped                 ; 1F06 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F8F          ; mapped                 ; 1F07 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F90          ; mapped                 ; 1F20 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+1F91          ; mapped                 ; 1F21 03B9     # 1.1  GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+1F92          ; mapped                 ; 1F22 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1F93          ; mapped                 ; 1F23 03B9     # 1.1  GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1F94          ; mapped                 ; 1F24 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1F95          ; mapped                 ; 1F25 03B9     # 1.1  GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1F96          ; mapped                 ; 1F26 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1F97          ; mapped                 ; 1F27 03B9     # 1.1  GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F98          ; mapped                 ; 1F20 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+1F99          ; mapped                 ; 1F21 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+1F9A          ; mapped                 ; 1F22 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F9B          ; mapped                 ; 1F23 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F9C          ; mapped                 ; 1F24 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F9D          ; mapped                 ; 1F25 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F9E          ; mapped                 ; 1F26 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F9F          ; mapped                 ; 1F27 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FA0          ; mapped                 ; 1F60 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+1FA1          ; mapped                 ; 1F61 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+1FA2          ; mapped                 ; 1F62 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1FA3          ; mapped                 ; 1F63 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1FA4          ; mapped                 ; 1F64 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1FA5          ; mapped                 ; 1F65 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1FA6          ; mapped                 ; 1F66 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1FA7          ; mapped                 ; 1F67 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1FA8          ; mapped                 ; 1F60 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+1FA9          ; mapped                 ; 1F61 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+1FAA          ; mapped                 ; 1F62 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1FAB          ; mapped                 ; 1F63 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1FAC          ; mapped                 ; 1F64 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1FAD          ; mapped                 ; 1F65 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1FAE          ; mapped                 ; 1F66 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1FAF          ; mapped                 ; 1F67 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FB0..1FB1    ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH VRACHY..GREEK SMALL LETTER ALPHA WITH MACRON
+1FB2          ; mapped                 ; 1F70 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
+1FB3          ; mapped                 ; 03B1 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
+1FB4          ; mapped                 ; 03AC 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
+1FB5          ; disallowed                             # NA   <reserved-1FB5>
+1FB6          ; valid                                  # 1.1  GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+1FB7          ; mapped                 ; 1FB6 03B9     # 1.1  GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FB8          ; mapped                 ; 1FB0          # 1.1  GREEK CAPITAL LETTER ALPHA WITH VRACHY
+1FB9          ; mapped                 ; 1FB1          # 1.1  GREEK CAPITAL LETTER ALPHA WITH MACRON
+1FBA          ; mapped                 ; 1F70          # 1.1  GREEK CAPITAL LETTER ALPHA WITH VARIA
+1FBB          ; mapped                 ; 03AC          # 1.1  GREEK CAPITAL LETTER ALPHA WITH OXIA
+1FBC          ; mapped                 ; 03B1 03B9     # 1.1  GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+1FBD          ; disallowed_STD3_mapped ; 0020 0313     # 1.1  GREEK KORONIS
+1FBE          ; mapped                 ; 03B9          # 1.1  GREEK PROSGEGRAMMENI
+1FBF          ; disallowed_STD3_mapped ; 0020 0313     # 1.1  GREEK PSILI
+1FC0          ; disallowed_STD3_mapped ; 0020 0342     # 1.1  GREEK PERISPOMENI
+1FC1          ; disallowed_STD3_mapped ; 0020 0308 0342 #1.1  GREEK DIALYTIKA AND PERISPOMENI
+1FC2          ; mapped                 ; 1F74 03B9     # 1.1  GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
+1FC3          ; mapped                 ; 03B7 03B9     # 1.1  GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
+1FC4          ; mapped                 ; 03AE 03B9     # 1.1  GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
+1FC5          ; disallowed                             # NA   <reserved-1FC5>
+1FC6          ; valid                                  # 1.1  GREEK SMALL LETTER ETA WITH PERISPOMENI
+1FC7          ; mapped                 ; 1FC6 03B9     # 1.1  GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FC8          ; mapped                 ; 1F72          # 1.1  GREEK CAPITAL LETTER EPSILON WITH VARIA
+1FC9          ; mapped                 ; 03AD          # 1.1  GREEK CAPITAL LETTER EPSILON WITH OXIA
+1FCA          ; mapped                 ; 1F74          # 1.1  GREEK CAPITAL LETTER ETA WITH VARIA
+1FCB          ; mapped                 ; 03AE          # 1.1  GREEK CAPITAL LETTER ETA WITH OXIA
+1FCC          ; mapped                 ; 03B7 03B9     # 1.1  GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+1FCD          ; disallowed_STD3_mapped ; 0020 0313 0300 #1.1  GREEK PSILI AND VARIA
+1FCE          ; disallowed_STD3_mapped ; 0020 0313 0301 #1.1  GREEK PSILI AND OXIA
+1FCF          ; disallowed_STD3_mapped ; 0020 0313 0342 #1.1  GREEK PSILI AND PERISPOMENI
+1FD0..1FD2    ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH VRACHY..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
+1FD3          ; mapped                 ; 0390          # 1.1  GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
+1FD4..1FD5    ; disallowed                             # NA   <reserved-1FD4>..<reserved-1FD5>
+1FD6..1FD7    ; valid                                  # 1.1  GREEK SMALL LETTER IOTA WITH PERISPOMENI..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+1FD8          ; mapped                 ; 1FD0          # 1.1  GREEK CAPITAL LETTER IOTA WITH VRACHY
+1FD9          ; mapped                 ; 1FD1          # 1.1  GREEK CAPITAL LETTER IOTA WITH MACRON
+1FDA          ; mapped                 ; 1F76          # 1.1  GREEK CAPITAL LETTER IOTA WITH VARIA
+1FDB          ; mapped                 ; 03AF          # 1.1  GREEK CAPITAL LETTER IOTA WITH OXIA
+1FDC          ; disallowed                             # NA   <reserved-1FDC>
+1FDD          ; disallowed_STD3_mapped ; 0020 0314 0300 #1.1  GREEK DASIA AND VARIA
+1FDE          ; disallowed_STD3_mapped ; 0020 0314 0301 #1.1  GREEK DASIA AND OXIA
+1FDF          ; disallowed_STD3_mapped ; 0020 0314 0342 #1.1  GREEK DASIA AND PERISPOMENI
+1FE0..1FE2    ; valid                                  # 1.1  GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
+1FE3          ; mapped                 ; 03B0          # 1.1  GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
+1FE4..1FE7    ; valid                                  # 1.1  GREEK SMALL LETTER RHO WITH PSILI..GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+1FE8          ; mapped                 ; 1FE0          # 1.1  GREEK CAPITAL LETTER UPSILON WITH VRACHY
+1FE9          ; mapped                 ; 1FE1          # 1.1  GREEK CAPITAL LETTER UPSILON WITH MACRON
+1FEA          ; mapped                 ; 1F7A          # 1.1  GREEK CAPITAL LETTER UPSILON WITH VARIA
+1FEB          ; mapped                 ; 03CD          # 1.1  GREEK CAPITAL LETTER UPSILON WITH OXIA
+1FEC          ; mapped                 ; 1FE5          # 1.1  GREEK CAPITAL LETTER RHO WITH DASIA
+1FED          ; disallowed_STD3_mapped ; 0020 0308 0300 #1.1  GREEK DIALYTIKA AND VARIA
+1FEE          ; disallowed_STD3_mapped ; 0020 0308 0301 #1.1  GREEK DIALYTIKA AND OXIA
+1FEF          ; disallowed_STD3_mapped ; 0060          # 1.1  GREEK VARIA
+1FF0..1FF1    ; disallowed                             # NA   <reserved-1FF0>..<reserved-1FF1>
+1FF2          ; mapped                 ; 1F7C 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
+1FF3          ; mapped                 ; 03C9 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
+1FF4          ; mapped                 ; 03CE 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
+1FF5          ; disallowed                             # NA   <reserved-1FF5>
+1FF6          ; valid                                  # 1.1  GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+1FF7          ; mapped                 ; 1FF6 03B9     # 1.1  GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FF8          ; mapped                 ; 1F78          # 1.1  GREEK CAPITAL LETTER OMICRON WITH VARIA
+1FF9          ; mapped                 ; 03CC          # 1.1  GREEK CAPITAL LETTER OMICRON WITH OXIA
+1FFA          ; mapped                 ; 1F7C          # 1.1  GREEK CAPITAL LETTER OMEGA WITH VARIA
+1FFB          ; mapped                 ; 03CE          # 1.1  GREEK CAPITAL LETTER OMEGA WITH OXIA
+1FFC          ; mapped                 ; 03C9 03B9     # 1.1  GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+1FFD          ; disallowed_STD3_mapped ; 0020 0301     # 1.1  GREEK OXIA
+1FFE          ; disallowed_STD3_mapped ; 0020 0314     # 1.1  GREEK DASIA
+1FFF          ; disallowed                             # NA   <reserved-1FFF>
+2000..200A    ; disallowed_STD3_mapped ; 0020          # 1.1  EN QUAD..HAIR SPACE
+200B          ; ignored                                # 1.1  ZERO WIDTH SPACE
+200C..200D    ; deviation              ;               # 1.1  ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
+200E..200F    ; disallowed                             # 1.1  LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK
+2010          ; valid                  ;      ; NV8    # 1.1  HYPHEN
+2011          ; mapped                 ; 2010          # 1.1  NON-BREAKING HYPHEN
+2012..2016    ; valid                  ;      ; NV8    # 1.1  FIGURE DASH..DOUBLE VERTICAL LINE
+2017          ; disallowed_STD3_mapped ; 0020 0333     # 1.1  DOUBLE LOW LINE
+2018..2023    ; valid                  ;      ; NV8    # 1.1  LEFT SINGLE QUOTATION MARK..TRIANGULAR BULLET
+2024..2026    ; disallowed                             # 1.1  ONE DOT LEADER..HORIZONTAL ELLIPSIS
+2027          ; valid                  ;      ; NV8    # 1.1  HYPHENATION POINT
+2028..202E    ; disallowed                             # 1.1  LINE SEPARATOR..RIGHT-TO-LEFT OVERRIDE
+202F          ; disallowed_STD3_mapped ; 0020          # 3.0  NARROW NO-BREAK SPACE
+2030..2032    ; valid                  ;      ; NV8    # 1.1  PER MILLE SIGN..PRIME
+2033          ; mapped                 ; 2032 2032     # 1.1  DOUBLE PRIME
+2034          ; mapped                 ; 2032 2032 2032 #1.1  TRIPLE PRIME
+2035          ; valid                  ;      ; NV8    # 1.1  REVERSED PRIME
+2036          ; mapped                 ; 2035 2035     # 1.1  REVERSED DOUBLE PRIME
+2037          ; mapped                 ; 2035 2035 2035 #1.1  REVERSED TRIPLE PRIME
+2038..203B    ; valid                  ;      ; NV8    # 1.1  CARET..REFERENCE MARK
+203C          ; disallowed_STD3_mapped ; 0021 0021     # 1.1  DOUBLE EXCLAMATION MARK
+203D          ; valid                  ;      ; NV8    # 1.1  INTERROBANG
+203E          ; disallowed_STD3_mapped ; 0020 0305     # 1.1  OVERLINE
+203F..2046    ; valid                  ;      ; NV8    # 1.1  UNDERTIE..RIGHT SQUARE BRACKET WITH QUILL
+2047          ; disallowed_STD3_mapped ; 003F 003F     # 3.2  DOUBLE QUESTION MARK
+2048          ; disallowed_STD3_mapped ; 003F 0021     # 3.0  QUESTION EXCLAMATION MARK
+2049          ; disallowed_STD3_mapped ; 0021 003F     # 3.0  EXCLAMATION QUESTION MARK
+204A..204D    ; valid                  ;      ; NV8    # 3.0  TIRONIAN SIGN ET..BLACK RIGHTWARDS BULLET
+204E..2052    ; valid                  ;      ; NV8    # 3.2  LOW ASTERISK..COMMERCIAL MINUS SIGN
+2053..2054    ; valid                  ;      ; NV8    # 4.0  SWUNG DASH..INVERTED UNDERTIE
+2055..2056    ; valid                  ;      ; NV8    # 4.1  FLOWER PUNCTUATION MARK..THREE DOT PUNCTUATION
+2057          ; mapped                 ; 2032 2032 2032 2032 #3.2 QUADRUPLE PRIME
+2058..205E    ; valid                  ;      ; NV8    # 4.1  FOUR DOT PUNCTUATION..VERTICAL FOUR DOTS
+205F          ; disallowed_STD3_mapped ; 0020          # 3.2  MEDIUM MATHEMATICAL SPACE
+2060          ; ignored                                # 3.2  WORD JOINER
+2061..2063    ; disallowed                             # 3.2  FUNCTION APPLICATION..INVISIBLE SEPARATOR
+2064          ; ignored                                # 5.1  INVISIBLE PLUS
+2065          ; disallowed                             # NA   <reserved-2065>
+2066..2069    ; disallowed                             # 6.3  LEFT-TO-RIGHT ISOLATE..POP DIRECTIONAL ISOLATE
+206A..206F    ; disallowed                             # 1.1  INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES
+2070          ; mapped                 ; 0030          # 1.1  SUPERSCRIPT ZERO
+2071          ; mapped                 ; 0069          # 3.2  SUPERSCRIPT LATIN SMALL LETTER I
+2072..2073    ; disallowed                             # NA   <reserved-2072>..<reserved-2073>
+2074          ; mapped                 ; 0034          # 1.1  SUPERSCRIPT FOUR
+2075          ; mapped                 ; 0035          # 1.1  SUPERSCRIPT FIVE
+2076          ; mapped                 ; 0036          # 1.1  SUPERSCRIPT SIX
+2077          ; mapped                 ; 0037          # 1.1  SUPERSCRIPT SEVEN
+2078          ; mapped                 ; 0038          # 1.1  SUPERSCRIPT EIGHT
+2079          ; mapped                 ; 0039          # 1.1  SUPERSCRIPT NINE
+207A          ; disallowed_STD3_mapped ; 002B          # 1.1  SUPERSCRIPT PLUS SIGN
+207B          ; mapped                 ; 2212          # 1.1  SUPERSCRIPT MINUS
+207C          ; disallowed_STD3_mapped ; 003D          # 1.1  SUPERSCRIPT EQUALS SIGN
+207D          ; disallowed_STD3_mapped ; 0028          # 1.1  SUPERSCRIPT LEFT PARENTHESIS
+207E          ; disallowed_STD3_mapped ; 0029          # 1.1  SUPERSCRIPT RIGHT PARENTHESIS
+207F          ; mapped                 ; 006E          # 1.1  SUPERSCRIPT LATIN SMALL LETTER N
+2080          ; mapped                 ; 0030          # 1.1  SUBSCRIPT ZERO
+2081          ; mapped                 ; 0031          # 1.1  SUBSCRIPT ONE
+2082          ; mapped                 ; 0032          # 1.1  SUBSCRIPT TWO
+2083          ; mapped                 ; 0033          # 1.1  SUBSCRIPT THREE
+2084          ; mapped                 ; 0034          # 1.1  SUBSCRIPT FOUR
+2085          ; mapped                 ; 0035          # 1.1  SUBSCRIPT FIVE
+2086          ; mapped                 ; 0036          # 1.1  SUBSCRIPT SIX
+2087          ; mapped                 ; 0037          # 1.1  SUBSCRIPT SEVEN
+2088          ; mapped                 ; 0038          # 1.1  SUBSCRIPT EIGHT
+2089          ; mapped                 ; 0039          # 1.1  SUBSCRIPT NINE
+208A          ; disallowed_STD3_mapped ; 002B          # 1.1  SUBSCRIPT PLUS SIGN
+208B          ; mapped                 ; 2212          # 1.1  SUBSCRIPT MINUS
+208C          ; disallowed_STD3_mapped ; 003D          # 1.1  SUBSCRIPT EQUALS SIGN
+208D          ; disallowed_STD3_mapped ; 0028          # 1.1  SUBSCRIPT LEFT PARENTHESIS
+208E          ; disallowed_STD3_mapped ; 0029          # 1.1  SUBSCRIPT RIGHT PARENTHESIS
+208F          ; disallowed                             # NA   <reserved-208F>
+2090          ; mapped                 ; 0061          # 4.1  LATIN SUBSCRIPT SMALL LETTER A
+2091          ; mapped                 ; 0065          # 4.1  LATIN SUBSCRIPT SMALL LETTER E
+2092          ; mapped                 ; 006F          # 4.1  LATIN SUBSCRIPT SMALL LETTER O
+2093          ; mapped                 ; 0078          # 4.1  LATIN SUBSCRIPT SMALL LETTER X
+2094          ; mapped                 ; 0259          # 4.1  LATIN SUBSCRIPT SMALL LETTER SCHWA
+2095          ; mapped                 ; 0068          # 6.0  LATIN SUBSCRIPT SMALL LETTER H
+2096          ; mapped                 ; 006B          # 6.0  LATIN SUBSCRIPT SMALL LETTER K
+2097          ; mapped                 ; 006C          # 6.0  LATIN SUBSCRIPT SMALL LETTER L
+2098          ; mapped                 ; 006D          # 6.0  LATIN SUBSCRIPT SMALL LETTER M
+2099          ; mapped                 ; 006E          # 6.0  LATIN SUBSCRIPT SMALL LETTER N
+209A          ; mapped                 ; 0070          # 6.0  LATIN SUBSCRIPT SMALL LETTER P
+209B          ; mapped                 ; 0073          # 6.0  LATIN SUBSCRIPT SMALL LETTER S
+209C          ; mapped                 ; 0074          # 6.0  LATIN SUBSCRIPT SMALL LETTER T
+209D..209F    ; disallowed                             # NA   <reserved-209D>..<reserved-209F>
+20A0..20A7    ; valid                  ;      ; NV8    # 1.1  EURO-CURRENCY SIGN..PESETA SIGN
+20A8          ; mapped                 ; 0072 0073     # 1.1  RUPEE SIGN
+20A9..20AA    ; valid                  ;      ; NV8    # 1.1  WON SIGN..NEW SHEQEL SIGN
+20AB          ; valid                  ;      ; NV8    # 2.0  DONG SIGN
+20AC          ; valid                  ;      ; NV8    # 2.1  EURO SIGN
+20AD..20AF    ; valid                  ;      ; NV8    # 3.0  KIP SIGN..DRACHMA SIGN
+20B0..20B1    ; valid                  ;      ; NV8    # 3.2  GERMAN PENNY SIGN..PESO SIGN
+20B2..20B5    ; valid                  ;      ; NV8    # 4.1  GUARANI SIGN..CEDI SIGN
+20B6..20B8    ; valid                  ;      ; NV8    # 5.2  LIVRE TOURNOIS SIGN..TENGE SIGN
+20B9          ; valid                  ;      ; NV8    # 6.0  INDIAN RUPEE SIGN
+20BA          ; valid                  ;      ; NV8    # 6.2  TURKISH LIRA SIGN
+20BB..20BD    ; valid                  ;      ; NV8    # 7.0  NORDIC MARK SIGN..RUBLE SIGN
+20BE          ; valid                  ;      ; NV8    # 8.0  LARI SIGN
+20BF          ; valid                  ;      ; NV8    # 10.0 BITCOIN SIGN
+20C0..20CF    ; disallowed                             # NA   <reserved-20C0>..<reserved-20CF>
+20D0..20E1    ; valid                  ;      ; NV8    # 1.1  COMBINING LEFT HARPOON ABOVE..COMBINING LEFT RIGHT ARROW ABOVE
+20E2..20E3    ; valid                  ;      ; NV8    # 3.0  COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING KEYCAP
+20E4..20EA    ; valid                  ;      ; NV8    # 3.2  COMBINING ENCLOSING UPWARD POINTING TRIANGLE..COMBINING LEFTWARDS ARROW OVERLAY
+20EB          ; valid                  ;      ; NV8    # 4.1  COMBINING LONG DOUBLE SOLIDUS OVERLAY
+20EC..20EF    ; valid                  ;      ; NV8    # 5.0  COMBINING RIGHTWARDS HARPOON WITH BARB DOWNWARDS..COMBINING RIGHT ARROW BELOW
+20F0          ; valid                  ;      ; NV8    # 5.1  COMBINING ASTERISK ABOVE
+20F1..20FF    ; disallowed                             # NA   <reserved-20F1>..<reserved-20FF>
+2100          ; disallowed_STD3_mapped ; 0061 002F 0063 #1.1  ACCOUNT OF
+2101          ; disallowed_STD3_mapped ; 0061 002F 0073 #1.1  ADDRESSED TO THE SUBJECT
+2102          ; mapped                 ; 0063          # 1.1  DOUBLE-STRUCK CAPITAL C
+2103          ; mapped                 ; 00B0 0063     # 1.1  DEGREE CELSIUS
+2104          ; valid                  ;      ; NV8    # 1.1  CENTRE LINE SYMBOL
+2105          ; disallowed_STD3_mapped ; 0063 002F 006F #1.1  CARE OF
+2106          ; disallowed_STD3_mapped ; 0063 002F 0075 #1.1  CADA UNA
+2107          ; mapped                 ; 025B          # 1.1  EULER CONSTANT
+2108          ; valid                  ;      ; NV8    # 1.1  SCRUPLE
+2109          ; mapped                 ; 00B0 0066     # 1.1  DEGREE FAHRENHEIT
+210A          ; mapped                 ; 0067          # 1.1  SCRIPT SMALL G
+210B..210E    ; mapped                 ; 0068          # 1.1  SCRIPT CAPITAL H..PLANCK CONSTANT
+210F          ; mapped                 ; 0127          # 1.1  PLANCK CONSTANT OVER TWO PI
+2110..2111    ; mapped                 ; 0069          # 1.1  SCRIPT CAPITAL I..BLACK-LETTER CAPITAL I
+2112..2113    ; mapped                 ; 006C          # 1.1  SCRIPT CAPITAL L..SCRIPT SMALL L
+2114          ; valid                  ;      ; NV8    # 1.1  L B BAR SYMBOL
+2115          ; mapped                 ; 006E          # 1.1  DOUBLE-STRUCK CAPITAL N
+2116          ; mapped                 ; 006E 006F     # 1.1  NUMERO SIGN
+2117..2118    ; valid                  ;      ; NV8    # 1.1  SOUND RECORDING COPYRIGHT..SCRIPT CAPITAL P
+2119          ; mapped                 ; 0070          # 1.1  DOUBLE-STRUCK CAPITAL P
+211A          ; mapped                 ; 0071          # 1.1  DOUBLE-STRUCK CAPITAL Q
+211B..211D    ; mapped                 ; 0072          # 1.1  SCRIPT CAPITAL R..DOUBLE-STRUCK CAPITAL R
+211E..211F    ; valid                  ;      ; NV8    # 1.1  PRESCRIPTION TAKE..RESPONSE
+2120          ; mapped                 ; 0073 006D     # 1.1  SERVICE MARK
+2121          ; mapped                 ; 0074 0065 006C #1.1  TELEPHONE SIGN
+2122          ; mapped                 ; 0074 006D     # 1.1  TRADE MARK SIGN
+2123          ; valid                  ;      ; NV8    # 1.1  VERSICLE
+2124          ; mapped                 ; 007A          # 1.1  DOUBLE-STRUCK CAPITAL Z
+2125          ; valid                  ;      ; NV8    # 1.1  OUNCE SIGN
+2126          ; mapped                 ; 03C9          # 1.1  OHM SIGN
+2127          ; valid                  ;      ; NV8    # 1.1  INVERTED OHM SIGN
+2128          ; mapped                 ; 007A          # 1.1  BLACK-LETTER CAPITAL Z
+2129          ; valid                  ;      ; NV8    # 1.1  TURNED GREEK SMALL LETTER IOTA
+212A          ; mapped                 ; 006B          # 1.1  KELVIN SIGN
+212B          ; mapped                 ; 00E5          # 1.1  ANGSTROM SIGN
+212C          ; mapped                 ; 0062          # 1.1  SCRIPT CAPITAL B
+212D          ; mapped                 ; 0063          # 1.1  BLACK-LETTER CAPITAL C
+212E          ; valid                  ;      ; NV8    # 1.1  ESTIMATED SYMBOL
+212F..2130    ; mapped                 ; 0065          # 1.1  SCRIPT SMALL E..SCRIPT CAPITAL E
+2131          ; mapped                 ; 0066          # 1.1  SCRIPT CAPITAL F
+2132          ; disallowed                             # 1.1  TURNED CAPITAL F
+2133          ; mapped                 ; 006D          # 1.1  SCRIPT CAPITAL M
+2134          ; mapped                 ; 006F          # 1.1  SCRIPT SMALL O
+2135          ; mapped                 ; 05D0          # 1.1  ALEF SYMBOL
+2136          ; mapped                 ; 05D1          # 1.1  BET SYMBOL
+2137          ; mapped                 ; 05D2          # 1.1  GIMEL SYMBOL
+2138          ; mapped                 ; 05D3          # 1.1  DALET SYMBOL
+2139          ; mapped                 ; 0069          # 3.0  INFORMATION SOURCE
+213A          ; valid                  ;      ; NV8    # 3.0  ROTATED CAPITAL Q
+213B          ; mapped                 ; 0066 0061 0078 #4.0  FACSIMILE SIGN
+213C          ; mapped                 ; 03C0          # 4.1  DOUBLE-STRUCK SMALL PI
+213D..213E    ; mapped                 ; 03B3          # 3.2  DOUBLE-STRUCK SMALL GAMMA..DOUBLE-STRUCK CAPITAL GAMMA
+213F          ; mapped                 ; 03C0          # 3.2  DOUBLE-STRUCK CAPITAL PI
+2140          ; mapped                 ; 2211          # 3.2  DOUBLE-STRUCK N-ARY SUMMATION
+2141..2144    ; valid                  ;      ; NV8    # 3.2  TURNED SANS-SERIF CAPITAL G..TURNED SANS-SERIF CAPITAL Y
+2145..2146    ; mapped                 ; 0064          # 3.2  DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL D
+2147          ; mapped                 ; 0065          # 3.2  DOUBLE-STRUCK ITALIC SMALL E
+2148          ; mapped                 ; 0069          # 3.2  DOUBLE-STRUCK ITALIC SMALL I
+2149          ; mapped                 ; 006A          # 3.2  DOUBLE-STRUCK ITALIC SMALL J
+214A..214B    ; valid                  ;      ; NV8    # 3.2  PROPERTY LINE..TURNED AMPERSAND
+214C          ; valid                  ;      ; NV8    # 4.1  PER SIGN
+214D          ; valid                  ;      ; NV8    # 5.0  AKTIESELSKAB
+214E          ; valid                                  # 5.0  TURNED SMALL F
+214F          ; valid                  ;      ; NV8    # 5.1  SYMBOL FOR SAMARITAN SOURCE
+2150          ; mapped                 ; 0031 2044 0037 #5.2  VULGAR FRACTION ONE SEVENTH
+2151          ; mapped                 ; 0031 2044 0039 #5.2  VULGAR FRACTION ONE NINTH
+2152          ; mapped                 ; 0031 2044 0031 0030 #5.2 VULGAR FRACTION ONE TENTH
+2153          ; mapped                 ; 0031 2044 0033 #1.1  VULGAR FRACTION ONE THIRD
+2154          ; mapped                 ; 0032 2044 0033 #1.1  VULGAR FRACTION TWO THIRDS
+2155          ; mapped                 ; 0031 2044 0035 #1.1  VULGAR FRACTION ONE FIFTH
+2156          ; mapped                 ; 0032 2044 0035 #1.1  VULGAR FRACTION TWO FIFTHS
+2157          ; mapped                 ; 0033 2044 0035 #1.1  VULGAR FRACTION THREE FIFTHS
+2158          ; mapped                 ; 0034 2044 0035 #1.1  VULGAR FRACTION FOUR FIFTHS
+2159          ; mapped                 ; 0031 2044 0036 #1.1  VULGAR FRACTION ONE SIXTH
+215A          ; mapped                 ; 0035 2044 0036 #1.1  VULGAR FRACTION FIVE SIXTHS
+215B          ; mapped                 ; 0031 2044 0038 #1.1  VULGAR FRACTION ONE EIGHTH
+215C          ; mapped                 ; 0033 2044 0038 #1.1  VULGAR FRACTION THREE EIGHTHS
+215D          ; mapped                 ; 0035 2044 0038 #1.1  VULGAR FRACTION FIVE EIGHTHS
+215E          ; mapped                 ; 0037 2044 0038 #1.1  VULGAR FRACTION SEVEN EIGHTHS
+215F          ; mapped                 ; 0031 2044     # 1.1  FRACTION NUMERATOR ONE
+2160          ; mapped                 ; 0069          # 1.1  ROMAN NUMERAL ONE
+2161          ; mapped                 ; 0069 0069     # 1.1  ROMAN NUMERAL TWO
+2162          ; mapped                 ; 0069 0069 0069 #1.1  ROMAN NUMERAL THREE
+2163          ; mapped                 ; 0069 0076     # 1.1  ROMAN NUMERAL FOUR
+2164          ; mapped                 ; 0076          # 1.1  ROMAN NUMERAL FIVE
+2165          ; mapped                 ; 0076 0069     # 1.1  ROMAN NUMERAL SIX
+2166          ; mapped                 ; 0076 0069 0069 #1.1  ROMAN NUMERAL SEVEN
+2167          ; mapped                 ; 0076 0069 0069 0069 #1.1 ROMAN NUMERAL EIGHT
+2168          ; mapped                 ; 0069 0078     # 1.1  ROMAN NUMERAL NINE
+2169          ; mapped                 ; 0078          # 1.1  ROMAN NUMERAL TEN
+216A          ; mapped                 ; 0078 0069     # 1.1  ROMAN NUMERAL ELEVEN
+216B          ; mapped                 ; 0078 0069 0069 #1.1  ROMAN NUMERAL TWELVE
+216C          ; mapped                 ; 006C          # 1.1  ROMAN NUMERAL FIFTY
+216D          ; mapped                 ; 0063          # 1.1  ROMAN NUMERAL ONE HUNDRED
+216E          ; mapped                 ; 0064          # 1.1  ROMAN NUMERAL FIVE HUNDRED
+216F          ; mapped                 ; 006D          # 1.1  ROMAN NUMERAL ONE THOUSAND
+2170          ; mapped                 ; 0069          # 1.1  SMALL ROMAN NUMERAL ONE
+2171          ; mapped                 ; 0069 0069     # 1.1  SMALL ROMAN NUMERAL TWO
+2172          ; mapped                 ; 0069 0069 0069 #1.1  SMALL ROMAN NUMERAL THREE
+2173          ; mapped                 ; 0069 0076     # 1.1  SMALL ROMAN NUMERAL FOUR
+2174          ; mapped                 ; 0076          # 1.1  SMALL ROMAN NUMERAL FIVE
+2175          ; mapped                 ; 0076 0069     # 1.1  SMALL ROMAN NUMERAL SIX
+2176          ; mapped                 ; 0076 0069 0069 #1.1  SMALL ROMAN NUMERAL SEVEN
+2177          ; mapped                 ; 0076 0069 0069 0069 #1.1 SMALL ROMAN NUMERAL EIGHT
+2178          ; mapped                 ; 0069 0078     # 1.1  SMALL ROMAN NUMERAL NINE
+2179          ; mapped                 ; 0078          # 1.1  SMALL ROMAN NUMERAL TEN
+217A          ; mapped                 ; 0078 0069     # 1.1  SMALL ROMAN NUMERAL ELEVEN
+217B          ; mapped                 ; 0078 0069 0069 #1.1  SMALL ROMAN NUMERAL TWELVE
+217C          ; mapped                 ; 006C          # 1.1  SMALL ROMAN NUMERAL FIFTY
+217D          ; mapped                 ; 0063          # 1.1  SMALL ROMAN NUMERAL ONE HUNDRED
+217E          ; mapped                 ; 0064          # 1.1  SMALL ROMAN NUMERAL FIVE HUNDRED
+217F          ; mapped                 ; 006D          # 1.1  SMALL ROMAN NUMERAL ONE THOUSAND
+2180..2182    ; valid                  ;      ; NV8    # 1.1  ROMAN NUMERAL ONE THOUSAND C D..ROMAN NUMERAL TEN THOUSAND
+2183          ; disallowed                             # 3.0  ROMAN NUMERAL REVERSED ONE HUNDRED
+2184          ; valid                                  # 5.0  LATIN SMALL LETTER REVERSED C
+2185..2188    ; valid                  ;      ; NV8    # 5.1  ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND
+2189          ; mapped                 ; 0030 2044 0033 #5.2  VULGAR FRACTION ZERO THIRDS
+218A..218B    ; valid                  ;      ; NV8    # 8.0  TURNED DIGIT TWO..TURNED DIGIT THREE
+218C..218F    ; disallowed                             # NA   <reserved-218C>..<reserved-218F>
+2190..21EA    ; valid                  ;      ; NV8    # 1.1  LEFTWARDS ARROW..UPWARDS WHITE ARROW FROM BAR
+21EB..21F3    ; valid                  ;      ; NV8    # 3.0  UPWARDS WHITE ARROW ON PEDESTAL..UP DOWN WHITE ARROW
+21F4..21FF    ; valid                  ;      ; NV8    # 3.2  RIGHT ARROW WITH SMALL CIRCLE..LEFT RIGHT OPEN-HEADED ARROW
+2200..222B    ; valid                  ;      ; NV8    # 1.1  FOR ALL..INTEGRAL
+222C          ; mapped                 ; 222B 222B     # 1.1  DOUBLE INTEGRAL
+222D          ; mapped                 ; 222B 222B 222B #1.1  TRIPLE INTEGRAL
+222E          ; valid                  ;      ; NV8    # 1.1  CONTOUR INTEGRAL
+222F          ; mapped                 ; 222E 222E     # 1.1  SURFACE INTEGRAL
+2230          ; mapped                 ; 222E 222E 222E #1.1  VOLUME INTEGRAL
+2231..225F    ; valid                  ;      ; NV8    # 1.1  CLOCKWISE INTEGRAL..QUESTIONED EQUAL TO
+2260          ; disallowed_STD3_valid                  # 1.1  NOT EQUAL TO
+2261..226D    ; valid                  ;      ; NV8    # 1.1  IDENTICAL TO..NOT EQUIVALENT TO
+226E..226F    ; disallowed_STD3_valid                  # 1.1  NOT LESS-THAN..NOT GREATER-THAN
+2270..22F1    ; valid                  ;      ; NV8    # 1.1  NEITHER LESS-THAN NOR EQUAL TO..DOWN RIGHT DIAGONAL ELLIPSIS
+22F2..22FF    ; valid                  ;      ; NV8    # 3.2  ELEMENT OF WITH LONG HORIZONTAL STROKE..Z NOTATION BAG MEMBERSHIP
+2300          ; valid                  ;      ; NV8    # 1.1  DIAMETER SIGN
+2301          ; valid                  ;      ; NV8    # 3.0  ELECTRIC ARROW
+2302..2328    ; valid                  ;      ; NV8    # 1.1  HOUSE..KEYBOARD
+2329          ; mapped                 ; 3008          # 1.1  LEFT-POINTING ANGLE BRACKET
+232A          ; mapped                 ; 3009          # 1.1  RIGHT-POINTING ANGLE BRACKET
+232B..237A    ; valid                  ;      ; NV8    # 1.1  ERASE TO THE LEFT..APL FUNCTIONAL SYMBOL ALPHA
+237B          ; valid                  ;      ; NV8    # 3.0  NOT CHECK MARK
+237C          ; valid                  ;      ; NV8    # 3.2  RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW
+237D..239A    ; valid                  ;      ; NV8    # 3.0  SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL
+239B..23CE    ; valid                  ;      ; NV8    # 3.2  LEFT PARENTHESIS UPPER HOOK..RETURN SYMBOL
+23CF..23D0    ; valid                  ;      ; NV8    # 4.0  EJECT SYMBOL..VERTICAL LINE EXTENSION
+23D1..23DB    ; valid                  ;      ; NV8    # 4.1  METRICAL BREVE..FUSE
+23DC..23E7    ; valid                  ;      ; NV8    # 5.0  TOP PARENTHESIS..ELECTRICAL INTERSECTION
+23E8          ; valid                  ;      ; NV8    # 5.2  DECIMAL EXPONENT SYMBOL
+23E9..23F3    ; valid                  ;      ; NV8    # 6.0  BLACK RIGHT-POINTING DOUBLE TRIANGLE..HOURGLASS WITH FLOWING SAND
+23F4..23FA    ; valid                  ;      ; NV8    # 7.0  BLACK MEDIUM LEFT-POINTING TRIANGLE..BLACK CIRCLE FOR RECORD
+23FB..23FE    ; valid                  ;      ; NV8    # 9.0  POWER SYMBOL..POWER SLEEP SYMBOL
+23FF          ; valid                  ;      ; NV8    # 10.0 OBSERVER EYE SYMBOL
+2400..2424    ; valid                  ;      ; NV8    # 1.1  SYMBOL FOR NULL..SYMBOL FOR NEWLINE
+2425..2426    ; valid                  ;      ; NV8    # 3.0  SYMBOL FOR DELETE FORM TWO..SYMBOL FOR SUBSTITUTE FORM TWO
+2427..243F    ; disallowed                             # NA   <reserved-2427>..<reserved-243F>
+2440..244A    ; valid                  ;      ; NV8    # 1.1  OCR HOOK..OCR DOUBLE BACKSLASH
+244B..245F    ; disallowed                             # NA   <reserved-244B>..<reserved-245F>
+2460          ; mapped                 ; 0031          # 1.1  CIRCLED DIGIT ONE
+2461          ; mapped                 ; 0032          # 1.1  CIRCLED DIGIT TWO
+2462          ; mapped                 ; 0033          # 1.1  CIRCLED DIGIT THREE
+2463          ; mapped                 ; 0034          # 1.1  CIRCLED DIGIT FOUR
+2464          ; mapped                 ; 0035          # 1.1  CIRCLED DIGIT FIVE
+2465          ; mapped                 ; 0036          # 1.1  CIRCLED DIGIT SIX
+2466          ; mapped                 ; 0037          # 1.1  CIRCLED DIGIT SEVEN
+2467          ; mapped                 ; 0038          # 1.1  CIRCLED DIGIT EIGHT
+2468          ; mapped                 ; 0039          # 1.1  CIRCLED DIGIT NINE
+2469          ; mapped                 ; 0031 0030     # 1.1  CIRCLED NUMBER TEN
+246A          ; mapped                 ; 0031 0031     # 1.1  CIRCLED NUMBER ELEVEN
+246B          ; mapped                 ; 0031 0032     # 1.1  CIRCLED NUMBER TWELVE
+246C          ; mapped                 ; 0031 0033     # 1.1  CIRCLED NUMBER THIRTEEN
+246D          ; mapped                 ; 0031 0034     # 1.1  CIRCLED NUMBER FOURTEEN
+246E          ; mapped                 ; 0031 0035     # 1.1  CIRCLED NUMBER FIFTEEN
+246F          ; mapped                 ; 0031 0036     # 1.1  CIRCLED NUMBER SIXTEEN
+2470          ; mapped                 ; 0031 0037     # 1.1  CIRCLED NUMBER SEVENTEEN
+2471          ; mapped                 ; 0031 0038     # 1.1  CIRCLED NUMBER EIGHTEEN
+2472          ; mapped                 ; 0031 0039     # 1.1  CIRCLED NUMBER NINETEEN
+2473          ; mapped                 ; 0032 0030     # 1.1  CIRCLED NUMBER TWENTY
+2474          ; disallowed_STD3_mapped ; 0028 0031 0029 #1.1  PARENTHESIZED DIGIT ONE
+2475          ; disallowed_STD3_mapped ; 0028 0032 0029 #1.1  PARENTHESIZED DIGIT TWO
+2476          ; disallowed_STD3_mapped ; 0028 0033 0029 #1.1  PARENTHESIZED DIGIT THREE
+2477          ; disallowed_STD3_mapped ; 0028 0034 0029 #1.1  PARENTHESIZED DIGIT FOUR
+2478          ; disallowed_STD3_mapped ; 0028 0035 0029 #1.1  PARENTHESIZED DIGIT FIVE
+2479          ; disallowed_STD3_mapped ; 0028 0036 0029 #1.1  PARENTHESIZED DIGIT SIX
+247A          ; disallowed_STD3_mapped ; 0028 0037 0029 #1.1  PARENTHESIZED DIGIT SEVEN
+247B          ; disallowed_STD3_mapped ; 0028 0038 0029 #1.1  PARENTHESIZED DIGIT EIGHT
+247C          ; disallowed_STD3_mapped ; 0028 0039 0029 #1.1  PARENTHESIZED DIGIT NINE
+247D          ; disallowed_STD3_mapped ; 0028 0031 0030 0029 #1.1 PARENTHESIZED NUMBER TEN
+247E          ; disallowed_STD3_mapped ; 0028 0031 0031 0029 #1.1 PARENTHESIZED NUMBER ELEVEN
+247F          ; disallowed_STD3_mapped ; 0028 0031 0032 0029 #1.1 PARENTHESIZED NUMBER TWELVE
+2480          ; disallowed_STD3_mapped ; 0028 0031 0033 0029 #1.1 PARENTHESIZED NUMBER THIRTEEN
+2481          ; disallowed_STD3_mapped ; 0028 0031 0034 0029 #1.1 PARENTHESIZED NUMBER FOURTEEN
+2482          ; disallowed_STD3_mapped ; 0028 0031 0035 0029 #1.1 PARENTHESIZED NUMBER FIFTEEN
+2483          ; disallowed_STD3_mapped ; 0028 0031 0036 0029 #1.1 PARENTHESIZED NUMBER SIXTEEN
+2484          ; disallowed_STD3_mapped ; 0028 0031 0037 0029 #1.1 PARENTHESIZED NUMBER SEVENTEEN
+2485          ; disallowed_STD3_mapped ; 0028 0031 0038 0029 #1.1 PARENTHESIZED NUMBER EIGHTEEN
+2486          ; disallowed_STD3_mapped ; 0028 0031 0039 0029 #1.1 PARENTHESIZED NUMBER NINETEEN
+2487          ; disallowed_STD3_mapped ; 0028 0032 0030 0029 #1.1 PARENTHESIZED NUMBER TWENTY
+2488..249B    ; disallowed                             # 1.1  DIGIT ONE FULL STOP..NUMBER TWENTY FULL STOP
+249C          ; disallowed_STD3_mapped ; 0028 0061 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER A
+249D          ; disallowed_STD3_mapped ; 0028 0062 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER B
+249E          ; disallowed_STD3_mapped ; 0028 0063 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER C
+249F          ; disallowed_STD3_mapped ; 0028 0064 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER D
+24A0          ; disallowed_STD3_mapped ; 0028 0065 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER E
+24A1          ; disallowed_STD3_mapped ; 0028 0066 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER F
+24A2          ; disallowed_STD3_mapped ; 0028 0067 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER G
+24A3          ; disallowed_STD3_mapped ; 0028 0068 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER H
+24A4          ; disallowed_STD3_mapped ; 0028 0069 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER I
+24A5          ; disallowed_STD3_mapped ; 0028 006A 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER J
+24A6          ; disallowed_STD3_mapped ; 0028 006B 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER K
+24A7          ; disallowed_STD3_mapped ; 0028 006C 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER L
+24A8          ; disallowed_STD3_mapped ; 0028 006D 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER M
+24A9          ; disallowed_STD3_mapped ; 0028 006E 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER N
+24AA          ; disallowed_STD3_mapped ; 0028 006F 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER O
+24AB          ; disallowed_STD3_mapped ; 0028 0070 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER P
+24AC          ; disallowed_STD3_mapped ; 0028 0071 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER Q
+24AD          ; disallowed_STD3_mapped ; 0028 0072 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER R
+24AE          ; disallowed_STD3_mapped ; 0028 0073 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER S
+24AF          ; disallowed_STD3_mapped ; 0028 0074 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER T
+24B0          ; disallowed_STD3_mapped ; 0028 0075 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER U
+24B1          ; disallowed_STD3_mapped ; 0028 0076 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER V
+24B2          ; disallowed_STD3_mapped ; 0028 0077 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER W
+24B3          ; disallowed_STD3_mapped ; 0028 0078 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER X
+24B4          ; disallowed_STD3_mapped ; 0028 0079 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER Y
+24B5          ; disallowed_STD3_mapped ; 0028 007A 0029 #1.1  PARENTHESIZED LATIN SMALL LETTER Z
+24B6          ; mapped                 ; 0061          # 1.1  CIRCLED LATIN CAPITAL LETTER A
+24B7          ; mapped                 ; 0062          # 1.1  CIRCLED LATIN CAPITAL LETTER B
+24B8          ; mapped                 ; 0063          # 1.1  CIRCLED LATIN CAPITAL LETTER C
+24B9          ; mapped                 ; 0064          # 1.1  CIRCLED LATIN CAPITAL LETTER D
+24BA          ; mapped                 ; 0065          # 1.1  CIRCLED LATIN CAPITAL LETTER E
+24BB          ; mapped                 ; 0066          # 1.1  CIRCLED LATIN CAPITAL LETTER F
+24BC          ; mapped                 ; 0067          # 1.1  CIRCLED LATIN CAPITAL LETTER G
+24BD          ; mapped                 ; 0068          # 1.1  CIRCLED LATIN CAPITAL LETTER H
+24BE          ; mapped                 ; 0069          # 1.1  CIRCLED LATIN CAPITAL LETTER I
+24BF          ; mapped                 ; 006A          # 1.1  CIRCLED LATIN CAPITAL LETTER J
+24C0          ; mapped                 ; 006B          # 1.1  CIRCLED LATIN CAPITAL LETTER K
+24C1          ; mapped                 ; 006C          # 1.1  CIRCLED LATIN CAPITAL LETTER L
+24C2          ; mapped                 ; 006D          # 1.1  CIRCLED LATIN CAPITAL LETTER M
+24C3          ; mapped                 ; 006E          # 1.1  CIRCLED LATIN CAPITAL LETTER N
+24C4          ; mapped                 ; 006F          # 1.1  CIRCLED LATIN CAPITAL LETTER O
+24C5          ; mapped                 ; 0070          # 1.1  CIRCLED LATIN CAPITAL LETTER P
+24C6          ; mapped                 ; 0071          # 1.1  CIRCLED LATIN CAPITAL LETTER Q
+24C7          ; mapped                 ; 0072          # 1.1  CIRCLED LATIN CAPITAL LETTER R
+24C8          ; mapped                 ; 0073          # 1.1  CIRCLED LATIN CAPITAL LETTER S
+24C9          ; mapped                 ; 0074          # 1.1  CIRCLED LATIN CAPITAL LETTER T
+24CA          ; mapped                 ; 0075          # 1.1  CIRCLED LATIN CAPITAL LETTER U
+24CB          ; mapped                 ; 0076          # 1.1  CIRCLED LATIN CAPITAL LETTER V
+24CC          ; mapped                 ; 0077          # 1.1  CIRCLED LATIN CAPITAL LETTER W
+24CD          ; mapped                 ; 0078          # 1.1  CIRCLED LATIN CAPITAL LETTER X
+24CE          ; mapped                 ; 0079          # 1.1  CIRCLED LATIN CAPITAL LETTER Y
+24CF          ; mapped                 ; 007A          # 1.1  CIRCLED LATIN CAPITAL LETTER Z
+24D0          ; mapped                 ; 0061          # 1.1  CIRCLED LATIN SMALL LETTER A
+24D1          ; mapped                 ; 0062          # 1.1  CIRCLED LATIN SMALL LETTER B
+24D2          ; mapped                 ; 0063          # 1.1  CIRCLED LATIN SMALL LETTER C
+24D3          ; mapped                 ; 0064          # 1.1  CIRCLED LATIN SMALL LETTER D
+24D4          ; mapped                 ; 0065          # 1.1  CIRCLED LATIN SMALL LETTER E
+24D5          ; mapped                 ; 0066          # 1.1  CIRCLED LATIN SMALL LETTER F
+24D6          ; mapped                 ; 0067          # 1.1  CIRCLED LATIN SMALL LETTER G
+24D7          ; mapped                 ; 0068          # 1.1  CIRCLED LATIN SMALL LETTER H
+24D8          ; mapped                 ; 0069          # 1.1  CIRCLED LATIN SMALL LETTER I
+24D9          ; mapped                 ; 006A          # 1.1  CIRCLED LATIN SMALL LETTER J
+24DA          ; mapped                 ; 006B          # 1.1  CIRCLED LATIN SMALL LETTER K
+24DB          ; mapped                 ; 006C          # 1.1  CIRCLED LATIN SMALL LETTER L
+24DC          ; mapped                 ; 006D          # 1.1  CIRCLED LATIN SMALL LETTER M
+24DD          ; mapped                 ; 006E          # 1.1  CIRCLED LATIN SMALL LETTER N
+24DE          ; mapped                 ; 006F          # 1.1  CIRCLED LATIN SMALL LETTER O
+24DF          ; mapped                 ; 0070          # 1.1  CIRCLED LATIN SMALL LETTER P
+24E0          ; mapped                 ; 0071          # 1.1  CIRCLED LATIN SMALL LETTER Q
+24E1          ; mapped                 ; 0072          # 1.1  CIRCLED LATIN SMALL LETTER R
+24E2          ; mapped                 ; 0073          # 1.1  CIRCLED LATIN SMALL LETTER S
+24E3          ; mapped                 ; 0074          # 1.1  CIRCLED LATIN SMALL LETTER T
+24E4          ; mapped                 ; 0075          # 1.1  CIRCLED LATIN SMALL LETTER U
+24E5          ; mapped                 ; 0076          # 1.1  CIRCLED LATIN SMALL LETTER V
+24E6          ; mapped                 ; 0077          # 1.1  CIRCLED LATIN SMALL LETTER W
+24E7          ; mapped                 ; 0078          # 1.1  CIRCLED LATIN SMALL LETTER X
+24E8          ; mapped                 ; 0079          # 1.1  CIRCLED LATIN SMALL LETTER Y
+24E9          ; mapped                 ; 007A          # 1.1  CIRCLED LATIN SMALL LETTER Z
+24EA          ; mapped                 ; 0030          # 1.1  CIRCLED DIGIT ZERO
+24EB..24FE    ; valid                  ;      ; NV8    # 3.2  NEGATIVE CIRCLED NUMBER ELEVEN..DOUBLE CIRCLED NUMBER TEN
+24FF          ; valid                  ;      ; NV8    # 4.0  NEGATIVE CIRCLED DIGIT ZERO
+2500..2595    ; valid                  ;      ; NV8    # 1.1  BOX DRAWINGS LIGHT HORIZONTAL..RIGHT ONE EIGHTH BLOCK
+2596..259F    ; valid                  ;      ; NV8    # 3.2  QUADRANT LOWER LEFT..QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT
+25A0..25EF    ; valid                  ;      ; NV8    # 1.1  BLACK SQUARE..LARGE CIRCLE
+25F0..25F7    ; valid                  ;      ; NV8    # 3.0  WHITE SQUARE WITH UPPER LEFT QUADRANT..WHITE CIRCLE WITH UPPER RIGHT QUADRANT
+25F8..25FF    ; valid                  ;      ; NV8    # 3.2  UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE
+2600..2613    ; valid                  ;      ; NV8    # 1.1  BLACK SUN WITH RAYS..SALTIRE
+2614..2615    ; valid                  ;      ; NV8    # 4.0  UMBRELLA WITH RAIN DROPS..HOT BEVERAGE
+2616..2617    ; valid                  ;      ; NV8    # 3.2  WHITE SHOGI PIECE..BLACK SHOGI PIECE
+2618          ; valid                  ;      ; NV8    # 4.1  SHAMROCK
+2619          ; valid                  ;      ; NV8    # 3.0  REVERSED ROTATED FLORAL HEART BULLET
+261A..266F    ; valid                  ;      ; NV8    # 1.1  BLACK LEFT POINTING INDEX..MUSIC SHARP SIGN
+2670..2671    ; valid                  ;      ; NV8    # 3.0  WEST SYRIAC CROSS..EAST SYRIAC CROSS
+2672..267D    ; valid                  ;      ; NV8    # 3.2  UNIVERSAL RECYCLING SYMBOL..PARTIALLY-RECYCLED PAPER SYMBOL
+267E..267F    ; valid                  ;      ; NV8    # 4.1  PERMANENT PAPER SIGN..WHEELCHAIR SYMBOL
+2680..2689    ; valid                  ;      ; NV8    # 3.2  DIE FACE-1..BLACK CIRCLE WITH TWO WHITE DOTS
+268A..2691    ; valid                  ;      ; NV8    # 4.0  MONOGRAM FOR YANG..BLACK FLAG
+2692..269C    ; valid                  ;      ; NV8    # 4.1  HAMMER AND PICK..FLEUR-DE-LIS
+269D          ; valid                  ;      ; NV8    # 5.1  OUTLINED WHITE STAR
+269E..269F    ; valid                  ;      ; NV8    # 5.2  THREE LINES CONVERGING RIGHT..THREE LINES CONVERGING LEFT
+26A0..26A1    ; valid                  ;      ; NV8    # 4.0  WARNING SIGN..HIGH VOLTAGE SIGN
+26A2..26B1    ; valid                  ;      ; NV8    # 4.1  DOUBLED FEMALE SIGN..FUNERAL URN
+26B2          ; valid                  ;      ; NV8    # 5.0  NEUTER
+26B3..26BC    ; valid                  ;      ; NV8    # 5.1  CERES..SESQUIQUADRATE
+26BD..26BF    ; valid                  ;      ; NV8    # 5.2  SOCCER BALL..SQUARED KEY
+26C0..26C3    ; valid                  ;      ; NV8    # 5.1  WHITE DRAUGHTS MAN..BLACK DRAUGHTS KING
+26C4..26CD    ; valid                  ;      ; NV8    # 5.2  SNOWMAN WITHOUT SNOW..DISABLED CAR
+26CE          ; valid                  ;      ; NV8    # 6.0  OPHIUCHUS
+26CF..26E1    ; valid                  ;      ; NV8    # 5.2  PICK..RESTRICTED LEFT ENTRY-2
+26E2          ; valid                  ;      ; NV8    # 6.0  ASTRONOMICAL SYMBOL FOR URANUS
+26E3          ; valid                  ;      ; NV8    # 5.2  HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE
+26E4..26E7    ; valid                  ;      ; NV8    # 6.0  PENTAGRAM..INVERTED PENTAGRAM
+26E8..26FF    ; valid                  ;      ; NV8    # 5.2  BLACK CROSS ON SHIELD..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE
+2700          ; valid                  ;      ; NV8    # 7.0  BLACK SAFETY SCISSORS
+2701..2704    ; valid                  ;      ; NV8    # 1.1  UPPER BLADE SCISSORS..WHITE SCISSORS
+2705          ; valid                  ;      ; NV8    # 6.0  WHITE HEAVY CHECK MARK
+2706..2709    ; valid                  ;      ; NV8    # 1.1  TELEPHONE LOCATION SIGN..ENVELOPE
+270A..270B    ; valid                  ;      ; NV8    # 6.0  RAISED FIST..RAISED HAND
+270C..2727    ; valid                  ;      ; NV8    # 1.1  VICTORY HAND..WHITE FOUR POINTED STAR
+2728          ; valid                  ;      ; NV8    # 6.0  SPARKLES
+2729..274B    ; valid                  ;      ; NV8    # 1.1  STRESS OUTLINED WHITE STAR..HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
+274C          ; valid                  ;      ; NV8    # 6.0  CROSS MARK
+274D          ; valid                  ;      ; NV8    # 1.1  SHADOWED WHITE CIRCLE
+274E          ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED CROSS MARK
+274F..2752    ; valid                  ;      ; NV8    # 1.1  LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPER RIGHT SHADOWED WHITE SQUARE
+2753..2755    ; valid                  ;      ; NV8    # 6.0  BLACK QUESTION MARK ORNAMENT..WHITE EXCLAMATION MARK ORNAMENT
+2756          ; valid                  ;      ; NV8    # 1.1  BLACK DIAMOND MINUS WHITE X
+2757          ; valid                  ;      ; NV8    # 5.2  HEAVY EXCLAMATION MARK SYMBOL
+2758..275E    ; valid                  ;      ; NV8    # 1.1  LIGHT VERTICAL BAR..HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
+275F..2760    ; valid                  ;      ; NV8    # 6.0  HEAVY LOW SINGLE COMMA QUOTATION MARK ORNAMENT..HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT
+2761..2767    ; valid                  ;      ; NV8    # 1.1  CURVED STEM PARAGRAPH SIGN ORNAMENT..ROTATED FLORAL HEART BULLET
+2768..2775    ; valid                  ;      ; NV8    # 3.2  MEDIUM LEFT PARENTHESIS ORNAMENT..MEDIUM RIGHT CURLY BRACKET ORNAMENT
+2776..2794    ; valid                  ;      ; NV8    # 1.1  DINGBAT NEGATIVE CIRCLED DIGIT ONE..HEAVY WIDE-HEADED RIGHTWARDS ARROW
+2795..2797    ; valid                  ;      ; NV8    # 6.0  HEAVY PLUS SIGN..HEAVY DIVISION SIGN
+2798..27AF    ; valid                  ;      ; NV8    # 1.1  HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
+27B0          ; valid                  ;      ; NV8    # 6.0  CURLY LOOP
+27B1..27BE    ; valid                  ;      ; NV8    # 1.1  NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW..OPEN-OUTLINED RIGHTWARDS ARROW
+27BF          ; valid                  ;      ; NV8    # 6.0  DOUBLE CURLY LOOP
+27C0..27C6    ; valid                  ;      ; NV8    # 4.1  THREE DIMENSIONAL ANGLE..RIGHT S-SHAPED BAG DELIMITER
+27C7..27CA    ; valid                  ;      ; NV8    # 5.0  OR WITH DOT INSIDE..VERTICAL BAR WITH HORIZONTAL STROKE
+27CB          ; valid                  ;      ; NV8    # 6.1  MATHEMATICAL RISING DIAGONAL
+27CC          ; valid                  ;      ; NV8    # 5.1  LONG DIVISION
+27CD          ; valid                  ;      ; NV8    # 6.1  MATHEMATICAL FALLING DIAGONAL
+27CE..27CF    ; valid                  ;      ; NV8    # 6.0  SQUARED LOGICAL AND..SQUARED LOGICAL OR
+27D0..27EB    ; valid                  ;      ; NV8    # 3.2  WHITE DIAMOND WITH CENTRED DOT..MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
+27EC..27EF    ; valid                  ;      ; NV8    # 5.1  MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET..MATHEMATICAL RIGHT FLATTENED PARENTHESIS
+27F0..27FF    ; valid                  ;      ; NV8    # 3.2  UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW
+2800..28FF    ; valid                  ;      ; NV8    # 3.0  BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678
+2900..2A0B    ; valid                  ;      ; NV8    # 3.2  RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..SUMMATION WITH INTEGRAL
+2A0C          ; mapped                 ; 222B 222B 222B 222B #3.2 QUADRUPLE INTEGRAL OPERATOR
+2A0D..2A73    ; valid                  ;      ; NV8    # 3.2  FINITE PART INTEGRAL..EQUALS SIGN ABOVE TILDE OPERATOR
+2A74          ; disallowed_STD3_mapped ; 003A 003A 003D #3.2  DOUBLE COLON EQUAL
+2A75          ; disallowed_STD3_mapped ; 003D 003D     # 3.2  TWO CONSECUTIVE EQUALS SIGNS
+2A76          ; disallowed_STD3_mapped ; 003D 003D 003D #3.2  THREE CONSECUTIVE EQUALS SIGNS
+2A77..2ADB    ; valid                  ;      ; NV8    # 3.2  EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW..TRANSVERSAL INTERSECTION
+2ADC          ; mapped                 ; 2ADD 0338     # 3.2  FORKING
+2ADD..2AFF    ; valid                  ;      ; NV8    # 3.2  NONFORKING..N-ARY WHITE VERTICAL BAR
+2B00..2B0D    ; valid                  ;      ; NV8    # 4.0  NORTH EAST WHITE ARROW..UP DOWN BLACK ARROW
+2B0E..2B13    ; valid                  ;      ; NV8    # 4.1  RIGHTWARDS ARROW WITH TIP DOWNWARDS..SQUARE WITH BOTTOM HALF BLACK
+2B14..2B1A    ; valid                  ;      ; NV8    # 5.0  SQUARE WITH UPPER RIGHT DIAGONAL HALF BLACK..DOTTED SQUARE
+2B1B..2B1F    ; valid                  ;      ; NV8    # 5.1  BLACK LARGE SQUARE..BLACK PENTAGON
+2B20..2B23    ; valid                  ;      ; NV8    # 5.0  WHITE PENTAGON..HORIZONTAL BLACK HEXAGON
+2B24..2B4C    ; valid                  ;      ; NV8    # 5.1  BLACK LARGE CIRCLE..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
+2B4D..2B4F    ; valid                  ;      ; NV8    # 7.0  DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..SHORT BACKSLANTED SOUTH ARROW
+2B50..2B54    ; valid                  ;      ; NV8    # 5.1  WHITE MEDIUM STAR..WHITE RIGHT-POINTING PENTAGON
+2B55..2B59    ; valid                  ;      ; NV8    # 5.2  HEAVY LARGE CIRCLE..HEAVY CIRCLED SALTIRE
+2B5A..2B73    ; valid                  ;      ; NV8    # 7.0  SLANTED NORTH ARROW WITH HOOKED HEAD..DOWNWARDS TRIANGLE-HEADED ARROW TO BAR
+2B74..2B75    ; disallowed                             # NA   <reserved-2B74>..<reserved-2B75>
+2B76..2B95    ; valid                  ;      ; NV8    # 7.0  NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
+2B96          ; disallowed                             # NA   <reserved-2B96>
+2B97          ; valid                  ;      ; NV8    # 13.0 SYMBOL FOR TYPE A ELECTRONICS
+2B98..2BB9    ; valid                  ;      ; NV8    # 7.0  THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD..UP ARROWHEAD IN A RECTANGLE BOX
+2BBA..2BBC    ; valid                  ;      ; NV8    # 11.0 OVERLAPPING WHITE SQUARES..OVERLAPPING BLACK SQUARES
+2BBD..2BC8    ; valid                  ;      ; NV8    # 7.0  BALLOT BOX WITH LIGHT X..BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
+2BC9          ; valid                  ;      ; NV8    # 12.0 NEPTUNE FORM TWO
+2BCA..2BD1    ; valid                  ;      ; NV8    # 7.0  TOP HALF BLACK CIRCLE..UNCERTAINTY SIGN
+2BD2          ; valid                  ;      ; NV8    # 10.0 GROUP MARK
+2BD3..2BEB    ; valid                  ;      ; NV8    # 11.0 PLUTO FORM TWO..STAR WITH RIGHT HALF BLACK
+2BEC..2BEF    ; valid                  ;      ; NV8    # 8.0  LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS..DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS
+2BF0..2BFE    ; valid                  ;      ; NV8    # 11.0 ERIS FORM ONE..REVERSED RIGHT ANGLE
+2BFF          ; valid                  ;      ; NV8    # 12.0 HELLSCHREIBER PAUSE SYMBOL
+2C00          ; mapped                 ; 2C30          # 4.1  GLAGOLITIC CAPITAL LETTER AZU
+2C01          ; mapped                 ; 2C31          # 4.1  GLAGOLITIC CAPITAL LETTER BUKY
+2C02          ; mapped                 ; 2C32          # 4.1  GLAGOLITIC CAPITAL LETTER VEDE
+2C03          ; mapped                 ; 2C33          # 4.1  GLAGOLITIC CAPITAL LETTER GLAGOLI
+2C04          ; mapped                 ; 2C34          # 4.1  GLAGOLITIC CAPITAL LETTER DOBRO
+2C05          ; mapped                 ; 2C35          # 4.1  GLAGOLITIC CAPITAL LETTER YESTU
+2C06          ; mapped                 ; 2C36          # 4.1  GLAGOLITIC CAPITAL LETTER ZHIVETE
+2C07          ; mapped                 ; 2C37          # 4.1  GLAGOLITIC CAPITAL LETTER DZELO
+2C08          ; mapped                 ; 2C38          # 4.1  GLAGOLITIC CAPITAL LETTER ZEMLJA
+2C09          ; mapped                 ; 2C39          # 4.1  GLAGOLITIC CAPITAL LETTER IZHE
+2C0A          ; mapped                 ; 2C3A          # 4.1  GLAGOLITIC CAPITAL LETTER INITIAL IZHE
+2C0B          ; mapped                 ; 2C3B          # 4.1  GLAGOLITIC CAPITAL LETTER I
+2C0C          ; mapped                 ; 2C3C          # 4.1  GLAGOLITIC CAPITAL LETTER DJERVI
+2C0D          ; mapped                 ; 2C3D          # 4.1  GLAGOLITIC CAPITAL LETTER KAKO
+2C0E          ; mapped                 ; 2C3E          # 4.1  GLAGOLITIC CAPITAL LETTER LJUDIJE
+2C0F          ; mapped                 ; 2C3F          # 4.1  GLAGOLITIC CAPITAL LETTER MYSLITE
+2C10          ; mapped                 ; 2C40          # 4.1  GLAGOLITIC CAPITAL LETTER NASHI
+2C11          ; mapped                 ; 2C41          # 4.1  GLAGOLITIC CAPITAL LETTER ONU
+2C12          ; mapped                 ; 2C42          # 4.1  GLAGOLITIC CAPITAL LETTER POKOJI
+2C13          ; mapped                 ; 2C43          # 4.1  GLAGOLITIC CAPITAL LETTER RITSI
+2C14          ; mapped                 ; 2C44          # 4.1  GLAGOLITIC CAPITAL LETTER SLOVO
+2C15          ; mapped                 ; 2C45          # 4.1  GLAGOLITIC CAPITAL LETTER TVRIDO
+2C16          ; mapped                 ; 2C46          # 4.1  GLAGOLITIC CAPITAL LETTER UKU
+2C17          ; mapped                 ; 2C47          # 4.1  GLAGOLITIC CAPITAL LETTER FRITU
+2C18          ; mapped                 ; 2C48          # 4.1  GLAGOLITIC CAPITAL LETTER HERU
+2C19          ; mapped                 ; 2C49          # 4.1  GLAGOLITIC CAPITAL LETTER OTU
+2C1A          ; mapped                 ; 2C4A          # 4.1  GLAGOLITIC CAPITAL LETTER PE
+2C1B          ; mapped                 ; 2C4B          # 4.1  GLAGOLITIC CAPITAL LETTER SHTA
+2C1C          ; mapped                 ; 2C4C          # 4.1  GLAGOLITIC CAPITAL LETTER TSI
+2C1D          ; mapped                 ; 2C4D          # 4.1  GLAGOLITIC CAPITAL LETTER CHRIVI
+2C1E          ; mapped                 ; 2C4E          # 4.1  GLAGOLITIC CAPITAL LETTER SHA
+2C1F          ; mapped                 ; 2C4F          # 4.1  GLAGOLITIC CAPITAL LETTER YERU
+2C20          ; mapped                 ; 2C50          # 4.1  GLAGOLITIC CAPITAL LETTER YERI
+2C21          ; mapped                 ; 2C51          # 4.1  GLAGOLITIC CAPITAL LETTER YATI
+2C22          ; mapped                 ; 2C52          # 4.1  GLAGOLITIC CAPITAL LETTER SPIDERY HA
+2C23          ; mapped                 ; 2C53          # 4.1  GLAGOLITIC CAPITAL LETTER YU
+2C24          ; mapped                 ; 2C54          # 4.1  GLAGOLITIC CAPITAL LETTER SMALL YUS
+2C25          ; mapped                 ; 2C55          # 4.1  GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL
+2C26          ; mapped                 ; 2C56          # 4.1  GLAGOLITIC CAPITAL LETTER YO
+2C27          ; mapped                 ; 2C57          # 4.1  GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS
+2C28          ; mapped                 ; 2C58          # 4.1  GLAGOLITIC CAPITAL LETTER BIG YUS
+2C29          ; mapped                 ; 2C59          # 4.1  GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS
+2C2A          ; mapped                 ; 2C5A          # 4.1  GLAGOLITIC CAPITAL LETTER FITA
+2C2B          ; mapped                 ; 2C5B          # 4.1  GLAGOLITIC CAPITAL LETTER IZHITSA
+2C2C          ; mapped                 ; 2C5C          # 4.1  GLAGOLITIC CAPITAL LETTER SHTAPIC
+2C2D          ; mapped                 ; 2C5D          # 4.1  GLAGOLITIC CAPITAL LETTER TROKUTASTI A
+2C2E          ; mapped                 ; 2C5E          # 4.1  GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
+2C2F          ; disallowed                             # NA   <reserved-2C2F>
+2C30..2C5E    ; valid                                  # 4.1  GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE
+2C5F          ; disallowed                             # NA   <reserved-2C5F>
+2C60          ; mapped                 ; 2C61          # 5.0  LATIN CAPITAL LETTER L WITH DOUBLE BAR
+2C61          ; valid                                  # 5.0  LATIN SMALL LETTER L WITH DOUBLE BAR
+2C62          ; mapped                 ; 026B          # 5.0  LATIN CAPITAL LETTER L WITH MIDDLE TILDE
+2C63          ; mapped                 ; 1D7D          # 5.0  LATIN CAPITAL LETTER P WITH STROKE
+2C64          ; mapped                 ; 027D          # 5.0  LATIN CAPITAL LETTER R WITH TAIL
+2C65..2C66    ; valid                                  # 5.0  LATIN SMALL LETTER A WITH STROKE..LATIN SMALL LETTER T WITH DIAGONAL STROKE
+2C67          ; mapped                 ; 2C68          # 5.0  LATIN CAPITAL LETTER H WITH DESCENDER
+2C68          ; valid                                  # 5.0  LATIN SMALL LETTER H WITH DESCENDER
+2C69          ; mapped                 ; 2C6A          # 5.0  LATIN CAPITAL LETTER K WITH DESCENDER
+2C6A          ; valid                                  # 5.0  LATIN SMALL LETTER K WITH DESCENDER
+2C6B          ; mapped                 ; 2C6C          # 5.0  LATIN CAPITAL LETTER Z WITH DESCENDER
+2C6C          ; valid                                  # 5.0  LATIN SMALL LETTER Z WITH DESCENDER
+2C6D          ; mapped                 ; 0251          # 5.1  LATIN CAPITAL LETTER ALPHA
+2C6E          ; mapped                 ; 0271          # 5.1  LATIN CAPITAL LETTER M WITH HOOK
+2C6F          ; mapped                 ; 0250          # 5.1  LATIN CAPITAL LETTER TURNED A
+2C70          ; mapped                 ; 0252          # 5.2  LATIN CAPITAL LETTER TURNED ALPHA
+2C71          ; valid                                  # 5.1  LATIN SMALL LETTER V WITH RIGHT HOOK
+2C72          ; mapped                 ; 2C73          # 5.1  LATIN CAPITAL LETTER W WITH HOOK
+2C73          ; valid                                  # 5.1  LATIN SMALL LETTER W WITH HOOK
+2C74          ; valid                                  # 5.0  LATIN SMALL LETTER V WITH CURL
+2C75          ; mapped                 ; 2C76          # 5.0  LATIN CAPITAL LETTER HALF H
+2C76..2C77    ; valid                                  # 5.0  LATIN SMALL LETTER HALF H..LATIN SMALL LETTER TAILLESS PHI
+2C78..2C7B    ; valid                                  # 5.1  LATIN SMALL LETTER E WITH NOTCH..LATIN LETTER SMALL CAPITAL TURNED E
+2C7C          ; mapped                 ; 006A          # 5.1  LATIN SUBSCRIPT SMALL LETTER J
+2C7D          ; mapped                 ; 0076          # 5.1  MODIFIER LETTER CAPITAL V
+2C7E          ; mapped                 ; 023F          # 5.2  LATIN CAPITAL LETTER S WITH SWASH TAIL
+2C7F          ; mapped                 ; 0240          # 5.2  LATIN CAPITAL LETTER Z WITH SWASH TAIL
+2C80          ; mapped                 ; 2C81          # 4.1  COPTIC CAPITAL LETTER ALFA
+2C81          ; valid                                  # 4.1  COPTIC SMALL LETTER ALFA
+2C82          ; mapped                 ; 2C83          # 4.1  COPTIC CAPITAL LETTER VIDA
+2C83          ; valid                                  # 4.1  COPTIC SMALL LETTER VIDA
+2C84          ; mapped                 ; 2C85          # 4.1  COPTIC CAPITAL LETTER GAMMA
+2C85          ; valid                                  # 4.1  COPTIC SMALL LETTER GAMMA
+2C86          ; mapped                 ; 2C87          # 4.1  COPTIC CAPITAL LETTER DALDA
+2C87          ; valid                                  # 4.1  COPTIC SMALL LETTER DALDA
+2C88          ; mapped                 ; 2C89          # 4.1  COPTIC CAPITAL LETTER EIE
+2C89          ; valid                                  # 4.1  COPTIC SMALL LETTER EIE
+2C8A          ; mapped                 ; 2C8B          # 4.1  COPTIC CAPITAL LETTER SOU
+2C8B          ; valid                                  # 4.1  COPTIC SMALL LETTER SOU
+2C8C          ; mapped                 ; 2C8D          # 4.1  COPTIC CAPITAL LETTER ZATA
+2C8D          ; valid                                  # 4.1  COPTIC SMALL LETTER ZATA
+2C8E          ; mapped                 ; 2C8F          # 4.1  COPTIC CAPITAL LETTER HATE
+2C8F          ; valid                                  # 4.1  COPTIC SMALL LETTER HATE
+2C90          ; mapped                 ; 2C91          # 4.1  COPTIC CAPITAL LETTER THETHE
+2C91          ; valid                                  # 4.1  COPTIC SMALL LETTER THETHE
+2C92          ; mapped                 ; 2C93          # 4.1  COPTIC CAPITAL LETTER IAUDA
+2C93          ; valid                                  # 4.1  COPTIC SMALL LETTER IAUDA
+2C94          ; mapped                 ; 2C95          # 4.1  COPTIC CAPITAL LETTER KAPA
+2C95          ; valid                                  # 4.1  COPTIC SMALL LETTER KAPA
+2C96          ; mapped                 ; 2C97          # 4.1  COPTIC CAPITAL LETTER LAULA
+2C97          ; valid                                  # 4.1  COPTIC SMALL LETTER LAULA
+2C98          ; mapped                 ; 2C99          # 4.1  COPTIC CAPITAL LETTER MI
+2C99          ; valid                                  # 4.1  COPTIC SMALL LETTER MI
+2C9A          ; mapped                 ; 2C9B          # 4.1  COPTIC CAPITAL LETTER NI
+2C9B          ; valid                                  # 4.1  COPTIC SMALL LETTER NI
+2C9C          ; mapped                 ; 2C9D          # 4.1  COPTIC CAPITAL LETTER KSI
+2C9D          ; valid                                  # 4.1  COPTIC SMALL LETTER KSI
+2C9E          ; mapped                 ; 2C9F          # 4.1  COPTIC CAPITAL LETTER O
+2C9F          ; valid                                  # 4.1  COPTIC SMALL LETTER O
+2CA0          ; mapped                 ; 2CA1          # 4.1  COPTIC CAPITAL LETTER PI
+2CA1          ; valid                                  # 4.1  COPTIC SMALL LETTER PI
+2CA2          ; mapped                 ; 2CA3          # 4.1  COPTIC CAPITAL LETTER RO
+2CA3          ; valid                                  # 4.1  COPTIC SMALL LETTER RO
+2CA4          ; mapped                 ; 2CA5          # 4.1  COPTIC CAPITAL LETTER SIMA
+2CA5          ; valid                                  # 4.1  COPTIC SMALL LETTER SIMA
+2CA6          ; mapped                 ; 2CA7          # 4.1  COPTIC CAPITAL LETTER TAU
+2CA7          ; valid                                  # 4.1  COPTIC SMALL LETTER TAU
+2CA8          ; mapped                 ; 2CA9          # 4.1  COPTIC CAPITAL LETTER UA
+2CA9          ; valid                                  # 4.1  COPTIC SMALL LETTER UA
+2CAA          ; mapped                 ; 2CAB          # 4.1  COPTIC CAPITAL LETTER FI
+2CAB          ; valid                                  # 4.1  COPTIC SMALL LETTER FI
+2CAC          ; mapped                 ; 2CAD          # 4.1  COPTIC CAPITAL LETTER KHI
+2CAD          ; valid                                  # 4.1  COPTIC SMALL LETTER KHI
+2CAE          ; mapped                 ; 2CAF          # 4.1  COPTIC CAPITAL LETTER PSI
+2CAF          ; valid                                  # 4.1  COPTIC SMALL LETTER PSI
+2CB0          ; mapped                 ; 2CB1          # 4.1  COPTIC CAPITAL LETTER OOU
+2CB1          ; valid                                  # 4.1  COPTIC SMALL LETTER OOU
+2CB2          ; mapped                 ; 2CB3          # 4.1  COPTIC CAPITAL LETTER DIALECT-P ALEF
+2CB3          ; valid                                  # 4.1  COPTIC SMALL LETTER DIALECT-P ALEF
+2CB4          ; mapped                 ; 2CB5          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC AIN
+2CB5          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC AIN
+2CB6          ; mapped                 ; 2CB7          # 4.1  COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE
+2CB7          ; valid                                  # 4.1  COPTIC SMALL LETTER CRYPTOGRAMMIC EIE
+2CB8          ; mapped                 ; 2CB9          # 4.1  COPTIC CAPITAL LETTER DIALECT-P KAPA
+2CB9          ; valid                                  # 4.1  COPTIC SMALL LETTER DIALECT-P KAPA
+2CBA          ; mapped                 ; 2CBB          # 4.1  COPTIC CAPITAL LETTER DIALECT-P NI
+2CBB          ; valid                                  # 4.1  COPTIC SMALL LETTER DIALECT-P NI
+2CBC          ; mapped                 ; 2CBD          # 4.1  COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI
+2CBD          ; valid                                  # 4.1  COPTIC SMALL LETTER CRYPTOGRAMMIC NI
+2CBE          ; mapped                 ; 2CBF          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC OOU
+2CBF          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC OOU
+2CC0          ; mapped                 ; 2CC1          # 4.1  COPTIC CAPITAL LETTER SAMPI
+2CC1          ; valid                                  # 4.1  COPTIC SMALL LETTER SAMPI
+2CC2          ; mapped                 ; 2CC3          # 4.1  COPTIC CAPITAL LETTER CROSSED SHEI
+2CC3          ; valid                                  # 4.1  COPTIC SMALL LETTER CROSSED SHEI
+2CC4          ; mapped                 ; 2CC5          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC SHEI
+2CC5          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC SHEI
+2CC6          ; mapped                 ; 2CC7          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC ESH
+2CC7          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC ESH
+2CC8          ; mapped                 ; 2CC9          # 4.1  COPTIC CAPITAL LETTER AKHMIMIC KHEI
+2CC9          ; valid                                  # 4.1  COPTIC SMALL LETTER AKHMIMIC KHEI
+2CCA          ; mapped                 ; 2CCB          # 4.1  COPTIC CAPITAL LETTER DIALECT-P HORI
+2CCB          ; valid                                  # 4.1  COPTIC SMALL LETTER DIALECT-P HORI
+2CCC          ; mapped                 ; 2CCD          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC HORI
+2CCD          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC HORI
+2CCE          ; mapped                 ; 2CCF          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC HA
+2CCF          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC HA
+2CD0          ; mapped                 ; 2CD1          # 4.1  COPTIC CAPITAL LETTER L-SHAPED HA
+2CD1          ; valid                                  # 4.1  COPTIC SMALL LETTER L-SHAPED HA
+2CD2          ; mapped                 ; 2CD3          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC HEI
+2CD3          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC HEI
+2CD4          ; mapped                 ; 2CD5          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC HAT
+2CD5          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC HAT
+2CD6          ; mapped                 ; 2CD7          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC GANGIA
+2CD7          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC GANGIA
+2CD8          ; mapped                 ; 2CD9          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC DJA
+2CD9          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC DJA
+2CDA          ; mapped                 ; 2CDB          # 4.1  COPTIC CAPITAL LETTER OLD COPTIC SHIMA
+2CDB          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD COPTIC SHIMA
+2CDC          ; mapped                 ; 2CDD          # 4.1  COPTIC CAPITAL LETTER OLD NUBIAN SHIMA
+2CDD          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD NUBIAN SHIMA
+2CDE          ; mapped                 ; 2CDF          # 4.1  COPTIC CAPITAL LETTER OLD NUBIAN NGI
+2CDF          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD NUBIAN NGI
+2CE0          ; mapped                 ; 2CE1          # 4.1  COPTIC CAPITAL LETTER OLD NUBIAN NYI
+2CE1          ; valid                                  # 4.1  COPTIC SMALL LETTER OLD NUBIAN NYI
+2CE2          ; mapped                 ; 2CE3          # 4.1  COPTIC CAPITAL LETTER OLD NUBIAN WAU
+2CE3..2CE4    ; valid                                  # 4.1  COPTIC SMALL LETTER OLD NUBIAN WAU..COPTIC SYMBOL KAI
+2CE5..2CEA    ; valid                  ;      ; NV8    # 4.1  COPTIC SYMBOL MI RO..COPTIC SYMBOL SHIMA SIMA
+2CEB          ; mapped                 ; 2CEC          # 5.2  COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI
+2CEC          ; valid                                  # 5.2  COPTIC SMALL LETTER CRYPTOGRAMMIC SHEI
+2CED          ; mapped                 ; 2CEE          # 5.2  COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA
+2CEE..2CF1    ; valid                                  # 5.2  COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA..COPTIC COMBINING SPIRITUS LENIS
+2CF2          ; mapped                 ; 2CF3          # 6.1  COPTIC CAPITAL LETTER BOHAIRIC KHEI
+2CF3          ; valid                                  # 6.1  COPTIC SMALL LETTER BOHAIRIC KHEI
+2CF4..2CF8    ; disallowed                             # NA   <reserved-2CF4>..<reserved-2CF8>
+2CF9..2CFF    ; valid                  ;      ; NV8    # 4.1  COPTIC OLD NUBIAN FULL STOP..COPTIC MORPHOLOGICAL DIVIDER
+2D00..2D25    ; valid                                  # 4.1  GEORGIAN SMALL LETTER AN..GEORGIAN SMALL LETTER HOE
+2D26          ; disallowed                             # NA   <reserved-2D26>
+2D27          ; valid                                  # 6.1  GEORGIAN SMALL LETTER YN
+2D28..2D2C    ; disallowed                             # NA   <reserved-2D28>..<reserved-2D2C>
+2D2D          ; valid                                  # 6.1  GEORGIAN SMALL LETTER AEN
+2D2E..2D2F    ; disallowed                             # NA   <reserved-2D2E>..<reserved-2D2F>
+2D30..2D65    ; valid                                  # 4.1  TIFINAGH LETTER YA..TIFINAGH LETTER YAZZ
+2D66..2D67    ; valid                                  # 6.1  TIFINAGH LETTER YE..TIFINAGH LETTER YO
+2D68..2D6E    ; disallowed                             # NA   <reserved-2D68>..<reserved-2D6E>
+2D6F          ; mapped                 ; 2D61          # 4.1  TIFINAGH MODIFIER LETTER LABIALIZATION MARK
+2D70          ; valid                  ;      ; NV8    # 6.0  TIFINAGH SEPARATOR MARK
+2D71..2D7E    ; disallowed                             # NA   <reserved-2D71>..<reserved-2D7E>
+2D7F          ; valid                                  # 6.0  TIFINAGH CONSONANT JOINER
+2D80..2D96    ; valid                                  # 4.1  ETHIOPIC SYLLABLE LOA..ETHIOPIC SYLLABLE GGWE
+2D97..2D9F    ; disallowed                             # NA   <reserved-2D97>..<reserved-2D9F>
+2DA0..2DA6    ; valid                                  # 4.1  ETHIOPIC SYLLABLE SSA..ETHIOPIC SYLLABLE SSO
+2DA7          ; disallowed                             # NA   <reserved-2DA7>
+2DA8..2DAE    ; valid                                  # 4.1  ETHIOPIC SYLLABLE CCA..ETHIOPIC SYLLABLE CCO
+2DAF          ; disallowed                             # NA   <reserved-2DAF>
+2DB0..2DB6    ; valid                                  # 4.1  ETHIOPIC SYLLABLE ZZA..ETHIOPIC SYLLABLE ZZO
+2DB7          ; disallowed                             # NA   <reserved-2DB7>
+2DB8..2DBE    ; valid                                  # 4.1  ETHIOPIC SYLLABLE CCHA..ETHIOPIC SYLLABLE CCHO
+2DBF          ; disallowed                             # NA   <reserved-2DBF>
+2DC0..2DC6    ; valid                                  # 4.1  ETHIOPIC SYLLABLE QYA..ETHIOPIC SYLLABLE QYO
+2DC7          ; disallowed                             # NA   <reserved-2DC7>
+2DC8..2DCE    ; valid                                  # 4.1  ETHIOPIC SYLLABLE KYA..ETHIOPIC SYLLABLE KYO
+2DCF          ; disallowed                             # NA   <reserved-2DCF>
+2DD0..2DD6    ; valid                                  # 4.1  ETHIOPIC SYLLABLE XYA..ETHIOPIC SYLLABLE XYO
+2DD7          ; disallowed                             # NA   <reserved-2DD7>
+2DD8..2DDE    ; valid                                  # 4.1  ETHIOPIC SYLLABLE GYA..ETHIOPIC SYLLABLE GYO
+2DDF          ; disallowed                             # NA   <reserved-2DDF>
+2DE0..2DFF    ; valid                                  # 5.1  COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS
+2E00..2E17    ; valid                  ;      ; NV8    # 4.1  RIGHT ANGLE SUBSTITUTION MARKER..DOUBLE OBLIQUE HYPHEN
+2E18..2E1B    ; valid                  ;      ; NV8    # 5.1  INVERTED INTERROBANG..TILDE WITH RING ABOVE
+2E1C..2E1D    ; valid                  ;      ; NV8    # 4.1  LEFT LOW PARAPHRASE BRACKET..RIGHT LOW PARAPHRASE BRACKET
+2E1E..2E2E    ; valid                  ;      ; NV8    # 5.1  TILDE WITH DOT ABOVE..REVERSED QUESTION MARK
+2E2F          ; valid                                  # 5.1  VERTICAL TILDE
+2E30          ; valid                  ;      ; NV8    # 5.1  RING POINT
+2E31          ; valid                  ;      ; NV8    # 5.2  WORD SEPARATOR MIDDLE DOT
+2E32..2E3B    ; valid                  ;      ; NV8    # 6.1  TURNED COMMA..THREE-EM DASH
+2E3C..2E42    ; valid                  ;      ; NV8    # 7.0  STENOGRAPHIC FULL STOP..DOUBLE LOW-REVERSED-9 QUOTATION MARK
+2E43..2E44    ; valid                  ;      ; NV8    # 9.0  DASH WITH LEFT UPTURN..DOUBLE SUSPENSION MARK
+2E45..2E49    ; valid                  ;      ; NV8    # 10.0 INVERTED LOW KAVYKA..DOUBLE STACKED COMMA
+2E4A..2E4E    ; valid                  ;      ; NV8    # 11.0 DOTTED SOLIDUS..PUNCTUS ELEVATUS MARK
+2E4F          ; valid                  ;      ; NV8    # 12.0 CORNISH VERSE DIVIDER
+2E50..2E52    ; valid                  ;      ; NV8    # 13.0 CROSS PATTY WITH RIGHT CROSSBAR..TIRONIAN SIGN CAPITAL ET
+2E53..2E7F    ; disallowed                             # NA   <reserved-2E53>..<reserved-2E7F>
+2E80..2E99    ; valid                  ;      ; NV8    # 3.0  CJK RADICAL REPEAT..CJK RADICAL RAP
+2E9A          ; disallowed                             # NA   <reserved-2E9A>
+2E9B..2E9E    ; valid                  ;      ; NV8    # 3.0  CJK RADICAL CHOKE..CJK RADICAL DEATH
+2E9F          ; mapped                 ; 6BCD          # 3.0  CJK RADICAL MOTHER
+2EA0..2EF2    ; valid                  ;      ; NV8    # 3.0  CJK RADICAL CIVILIAN..CJK RADICAL J-SIMPLIFIED TURTLE
+2EF3          ; mapped                 ; 9F9F          # 3.0  CJK RADICAL C-SIMPLIFIED TURTLE
+2EF4..2EFF    ; disallowed                             # NA   <reserved-2EF4>..<reserved-2EFF>
+2F00          ; mapped                 ; 4E00          # 3.0  KANGXI RADICAL ONE
+2F01          ; mapped                 ; 4E28          # 3.0  KANGXI RADICAL LINE
+2F02          ; mapped                 ; 4E36          # 3.0  KANGXI RADICAL DOT
+2F03          ; mapped                 ; 4E3F          # 3.0  KANGXI RADICAL SLASH
+2F04          ; mapped                 ; 4E59          # 3.0  KANGXI RADICAL SECOND
+2F05          ; mapped                 ; 4E85          # 3.0  KANGXI RADICAL HOOK
+2F06          ; mapped                 ; 4E8C          # 3.0  KANGXI RADICAL TWO
+2F07          ; mapped                 ; 4EA0          # 3.0  KANGXI RADICAL LID
+2F08          ; mapped                 ; 4EBA          # 3.0  KANGXI RADICAL MAN
+2F09          ; mapped                 ; 513F          # 3.0  KANGXI RADICAL LEGS
+2F0A          ; mapped                 ; 5165          # 3.0  KANGXI RADICAL ENTER
+2F0B          ; mapped                 ; 516B          # 3.0  KANGXI RADICAL EIGHT
+2F0C          ; mapped                 ; 5182          # 3.0  KANGXI RADICAL DOWN BOX
+2F0D          ; mapped                 ; 5196          # 3.0  KANGXI RADICAL COVER
+2F0E          ; mapped                 ; 51AB          # 3.0  KANGXI RADICAL ICE
+2F0F          ; mapped                 ; 51E0          # 3.0  KANGXI RADICAL TABLE
+2F10          ; mapped                 ; 51F5          # 3.0  KANGXI RADICAL OPEN BOX
+2F11          ; mapped                 ; 5200          # 3.0  KANGXI RADICAL KNIFE
+2F12          ; mapped                 ; 529B          # 3.0  KANGXI RADICAL POWER
+2F13          ; mapped                 ; 52F9          # 3.0  KANGXI RADICAL WRAP
+2F14          ; mapped                 ; 5315          # 3.0  KANGXI RADICAL SPOON
+2F15          ; mapped                 ; 531A          # 3.0  KANGXI RADICAL RIGHT OPEN BOX
+2F16          ; mapped                 ; 5338          # 3.0  KANGXI RADICAL HIDING ENCLOSURE
+2F17          ; mapped                 ; 5341          # 3.0  KANGXI RADICAL TEN
+2F18          ; mapped                 ; 535C          # 3.0  KANGXI RADICAL DIVINATION
+2F19          ; mapped                 ; 5369          # 3.0  KANGXI RADICAL SEAL
+2F1A          ; mapped                 ; 5382          # 3.0  KANGXI RADICAL CLIFF
+2F1B          ; mapped                 ; 53B6          # 3.0  KANGXI RADICAL PRIVATE
+2F1C          ; mapped                 ; 53C8          # 3.0  KANGXI RADICAL AGAIN
+2F1D          ; mapped                 ; 53E3          # 3.0  KANGXI RADICAL MOUTH
+2F1E          ; mapped                 ; 56D7          # 3.0  KANGXI RADICAL ENCLOSURE
+2F1F          ; mapped                 ; 571F          # 3.0  KANGXI RADICAL EARTH
+2F20          ; mapped                 ; 58EB          # 3.0  KANGXI RADICAL SCHOLAR
+2F21          ; mapped                 ; 5902          # 3.0  KANGXI RADICAL GO
+2F22          ; mapped                 ; 590A          # 3.0  KANGXI RADICAL GO SLOWLY
+2F23          ; mapped                 ; 5915          # 3.0  KANGXI RADICAL EVENING
+2F24          ; mapped                 ; 5927          # 3.0  KANGXI RADICAL BIG
+2F25          ; mapped                 ; 5973          # 3.0  KANGXI RADICAL WOMAN
+2F26          ; mapped                 ; 5B50          # 3.0  KANGXI RADICAL CHILD
+2F27          ; mapped                 ; 5B80          # 3.0  KANGXI RADICAL ROOF
+2F28          ; mapped                 ; 5BF8          # 3.0  KANGXI RADICAL INCH
+2F29          ; mapped                 ; 5C0F          # 3.0  KANGXI RADICAL SMALL
+2F2A          ; mapped                 ; 5C22          # 3.0  KANGXI RADICAL LAME
+2F2B          ; mapped                 ; 5C38          # 3.0  KANGXI RADICAL CORPSE
+2F2C          ; mapped                 ; 5C6E          # 3.0  KANGXI RADICAL SPROUT
+2F2D          ; mapped                 ; 5C71          # 3.0  KANGXI RADICAL MOUNTAIN
+2F2E          ; mapped                 ; 5DDB          # 3.0  KANGXI RADICAL RIVER
+2F2F          ; mapped                 ; 5DE5          # 3.0  KANGXI RADICAL WORK
+2F30          ; mapped                 ; 5DF1          # 3.0  KANGXI RADICAL ONESELF
+2F31          ; mapped                 ; 5DFE          # 3.0  KANGXI RADICAL TURBAN
+2F32          ; mapped                 ; 5E72          # 3.0  KANGXI RADICAL DRY
+2F33          ; mapped                 ; 5E7A          # 3.0  KANGXI RADICAL SHORT THREAD
+2F34          ; mapped                 ; 5E7F          # 3.0  KANGXI RADICAL DOTTED CLIFF
+2F35          ; mapped                 ; 5EF4          # 3.0  KANGXI RADICAL LONG STRIDE
+2F36          ; mapped                 ; 5EFE          # 3.0  KANGXI RADICAL TWO HANDS
+2F37          ; mapped                 ; 5F0B          # 3.0  KANGXI RADICAL SHOOT
+2F38          ; mapped                 ; 5F13          # 3.0  KANGXI RADICAL BOW
+2F39          ; mapped                 ; 5F50          # 3.0  KANGXI RADICAL SNOUT
+2F3A          ; mapped                 ; 5F61          # 3.0  KANGXI RADICAL BRISTLE
+2F3B          ; mapped                 ; 5F73          # 3.0  KANGXI RADICAL STEP
+2F3C          ; mapped                 ; 5FC3          # 3.0  KANGXI RADICAL HEART
+2F3D          ; mapped                 ; 6208          # 3.0  KANGXI RADICAL HALBERD
+2F3E          ; mapped                 ; 6236          # 3.0  KANGXI RADICAL DOOR
+2F3F          ; mapped                 ; 624B          # 3.0  KANGXI RADICAL HAND
+2F40          ; mapped                 ; 652F          # 3.0  KANGXI RADICAL BRANCH
+2F41          ; mapped                 ; 6534          # 3.0  KANGXI RADICAL RAP
+2F42          ; mapped                 ; 6587          # 3.0  KANGXI RADICAL SCRIPT
+2F43          ; mapped                 ; 6597          # 3.0  KANGXI RADICAL DIPPER
+2F44          ; mapped                 ; 65A4          # 3.0  KANGXI RADICAL AXE
+2F45          ; mapped                 ; 65B9          # 3.0  KANGXI RADICAL SQUARE
+2F46          ; mapped                 ; 65E0          # 3.0  KANGXI RADICAL NOT
+2F47          ; mapped                 ; 65E5          # 3.0  KANGXI RADICAL SUN
+2F48          ; mapped                 ; 66F0          # 3.0  KANGXI RADICAL SAY
+2F49          ; mapped                 ; 6708          # 3.0  KANGXI RADICAL MOON
+2F4A          ; mapped                 ; 6728          # 3.0  KANGXI RADICAL TREE
+2F4B          ; mapped                 ; 6B20          # 3.0  KANGXI RADICAL LACK
+2F4C          ; mapped                 ; 6B62          # 3.0  KANGXI RADICAL STOP
+2F4D          ; mapped                 ; 6B79          # 3.0  KANGXI RADICAL DEATH
+2F4E          ; mapped                 ; 6BB3          # 3.0  KANGXI RADICAL WEAPON
+2F4F          ; mapped                 ; 6BCB          # 3.0  KANGXI RADICAL DO NOT
+2F50          ; mapped                 ; 6BD4          # 3.0  KANGXI RADICAL COMPARE
+2F51          ; mapped                 ; 6BDB          # 3.0  KANGXI RADICAL FUR
+2F52          ; mapped                 ; 6C0F          # 3.0  KANGXI RADICAL CLAN
+2F53          ; mapped                 ; 6C14          # 3.0  KANGXI RADICAL STEAM
+2F54          ; mapped                 ; 6C34          # 3.0  KANGXI RADICAL WATER
+2F55          ; mapped                 ; 706B          # 3.0  KANGXI RADICAL FIRE
+2F56          ; mapped                 ; 722A          # 3.0  KANGXI RADICAL CLAW
+2F57          ; mapped                 ; 7236          # 3.0  KANGXI RADICAL FATHER
+2F58          ; mapped                 ; 723B          # 3.0  KANGXI RADICAL DOUBLE X
+2F59          ; mapped                 ; 723F          # 3.0  KANGXI RADICAL HALF TREE TRUNK
+2F5A          ; mapped                 ; 7247          # 3.0  KANGXI RADICAL SLICE
+2F5B          ; mapped                 ; 7259          # 3.0  KANGXI RADICAL FANG
+2F5C          ; mapped                 ; 725B          # 3.0  KANGXI RADICAL COW
+2F5D          ; mapped                 ; 72AC          # 3.0  KANGXI RADICAL DOG
+2F5E          ; mapped                 ; 7384          # 3.0  KANGXI RADICAL PROFOUND
+2F5F          ; mapped                 ; 7389          # 3.0  KANGXI RADICAL JADE
+2F60          ; mapped                 ; 74DC          # 3.0  KANGXI RADICAL MELON
+2F61          ; mapped                 ; 74E6          # 3.0  KANGXI RADICAL TILE
+2F62          ; mapped                 ; 7518          # 3.0  KANGXI RADICAL SWEET
+2F63          ; mapped                 ; 751F          # 3.0  KANGXI RADICAL LIFE
+2F64          ; mapped                 ; 7528          # 3.0  KANGXI RADICAL USE
+2F65          ; mapped                 ; 7530          # 3.0  KANGXI RADICAL FIELD
+2F66          ; mapped                 ; 758B          # 3.0  KANGXI RADICAL BOLT OF CLOTH
+2F67          ; mapped                 ; 7592          # 3.0  KANGXI RADICAL SICKNESS
+2F68          ; mapped                 ; 7676          # 3.0  KANGXI RADICAL DOTTED TENT
+2F69          ; mapped                 ; 767D          # 3.0  KANGXI RADICAL WHITE
+2F6A          ; mapped                 ; 76AE          # 3.0  KANGXI RADICAL SKIN
+2F6B          ; mapped                 ; 76BF          # 3.0  KANGXI RADICAL DISH
+2F6C          ; mapped                 ; 76EE          # 3.0  KANGXI RADICAL EYE
+2F6D          ; mapped                 ; 77DB          # 3.0  KANGXI RADICAL SPEAR
+2F6E          ; mapped                 ; 77E2          # 3.0  KANGXI RADICAL ARROW
+2F6F          ; mapped                 ; 77F3          # 3.0  KANGXI RADICAL STONE
+2F70          ; mapped                 ; 793A          # 3.0  KANGXI RADICAL SPIRIT
+2F71          ; mapped                 ; 79B8          # 3.0  KANGXI RADICAL TRACK
+2F72          ; mapped                 ; 79BE          # 3.0  KANGXI RADICAL GRAIN
+2F73          ; mapped                 ; 7A74          # 3.0  KANGXI RADICAL CAVE
+2F74          ; mapped                 ; 7ACB          # 3.0  KANGXI RADICAL STAND
+2F75          ; mapped                 ; 7AF9          # 3.0  KANGXI RADICAL BAMBOO
+2F76          ; mapped                 ; 7C73          # 3.0  KANGXI RADICAL RICE
+2F77          ; mapped                 ; 7CF8          # 3.0  KANGXI RADICAL SILK
+2F78          ; mapped                 ; 7F36          # 3.0  KANGXI RADICAL JAR
+2F79          ; mapped                 ; 7F51          # 3.0  KANGXI RADICAL NET
+2F7A          ; mapped                 ; 7F8A          # 3.0  KANGXI RADICAL SHEEP
+2F7B          ; mapped                 ; 7FBD          # 3.0  KANGXI RADICAL FEATHER
+2F7C          ; mapped                 ; 8001          # 3.0  KANGXI RADICAL OLD
+2F7D          ; mapped                 ; 800C          # 3.0  KANGXI RADICAL AND
+2F7E          ; mapped                 ; 8012          # 3.0  KANGXI RADICAL PLOW
+2F7F          ; mapped                 ; 8033          # 3.0  KANGXI RADICAL EAR
+2F80          ; mapped                 ; 807F          # 3.0  KANGXI RADICAL BRUSH
+2F81          ; mapped                 ; 8089          # 3.0  KANGXI RADICAL MEAT
+2F82          ; mapped                 ; 81E3          # 3.0  KANGXI RADICAL MINISTER
+2F83          ; mapped                 ; 81EA          # 3.0  KANGXI RADICAL SELF
+2F84          ; mapped                 ; 81F3          # 3.0  KANGXI RADICAL ARRIVE
+2F85          ; mapped                 ; 81FC          # 3.0  KANGXI RADICAL MORTAR
+2F86          ; mapped                 ; 820C          # 3.0  KANGXI RADICAL TONGUE
+2F87          ; mapped                 ; 821B          # 3.0  KANGXI RADICAL OPPOSE
+2F88          ; mapped                 ; 821F          # 3.0  KANGXI RADICAL BOAT
+2F89          ; mapped                 ; 826E          # 3.0  KANGXI RADICAL STOPPING
+2F8A          ; mapped                 ; 8272          # 3.0  KANGXI RADICAL COLOR
+2F8B          ; mapped                 ; 8278          # 3.0  KANGXI RADICAL GRASS
+2F8C          ; mapped                 ; 864D          # 3.0  KANGXI RADICAL TIGER
+2F8D          ; mapped                 ; 866B          # 3.0  KANGXI RADICAL INSECT
+2F8E          ; mapped                 ; 8840          # 3.0  KANGXI RADICAL BLOOD
+2F8F          ; mapped                 ; 884C          # 3.0  KANGXI RADICAL WALK ENCLOSURE
+2F90          ; mapped                 ; 8863          # 3.0  KANGXI RADICAL CLOTHES
+2F91          ; mapped                 ; 897E          # 3.0  KANGXI RADICAL WEST
+2F92          ; mapped                 ; 898B          # 3.0  KANGXI RADICAL SEE
+2F93          ; mapped                 ; 89D2          # 3.0  KANGXI RADICAL HORN
+2F94          ; mapped                 ; 8A00          # 3.0  KANGXI RADICAL SPEECH
+2F95          ; mapped                 ; 8C37          # 3.0  KANGXI RADICAL VALLEY
+2F96          ; mapped                 ; 8C46          # 3.0  KANGXI RADICAL BEAN
+2F97          ; mapped                 ; 8C55          # 3.0  KANGXI RADICAL PIG
+2F98          ; mapped                 ; 8C78          # 3.0  KANGXI RADICAL BADGER
+2F99          ; mapped                 ; 8C9D          # 3.0  KANGXI RADICAL SHELL
+2F9A          ; mapped                 ; 8D64          # 3.0  KANGXI RADICAL RED
+2F9B          ; mapped                 ; 8D70          # 3.0  KANGXI RADICAL RUN
+2F9C          ; mapped                 ; 8DB3          # 3.0  KANGXI RADICAL FOOT
+2F9D          ; mapped                 ; 8EAB          # 3.0  KANGXI RADICAL BODY
+2F9E          ; mapped                 ; 8ECA          # 3.0  KANGXI RADICAL CART
+2F9F          ; mapped                 ; 8F9B          # 3.0  KANGXI RADICAL BITTER
+2FA0          ; mapped                 ; 8FB0          # 3.0  KANGXI RADICAL MORNING
+2FA1          ; mapped                 ; 8FB5          # 3.0  KANGXI RADICAL WALK
+2FA2          ; mapped                 ; 9091          # 3.0  KANGXI RADICAL CITY
+2FA3          ; mapped                 ; 9149          # 3.0  KANGXI RADICAL WINE
+2FA4          ; mapped                 ; 91C6          # 3.0  KANGXI RADICAL DISTINGUISH
+2FA5          ; mapped                 ; 91CC          # 3.0  KANGXI RADICAL VILLAGE
+2FA6          ; mapped                 ; 91D1          # 3.0  KANGXI RADICAL GOLD
+2FA7          ; mapped                 ; 9577          # 3.0  KANGXI RADICAL LONG
+2FA8          ; mapped                 ; 9580          # 3.0  KANGXI RADICAL GATE
+2FA9          ; mapped                 ; 961C          # 3.0  KANGXI RADICAL MOUND
+2FAA          ; mapped                 ; 96B6          # 3.0  KANGXI RADICAL SLAVE
+2FAB          ; mapped                 ; 96B9          # 3.0  KANGXI RADICAL SHORT TAILED BIRD
+2FAC          ; mapped                 ; 96E8          # 3.0  KANGXI RADICAL RAIN
+2FAD          ; mapped                 ; 9751          # 3.0  KANGXI RADICAL BLUE
+2FAE          ; mapped                 ; 975E          # 3.0  KANGXI RADICAL WRONG
+2FAF          ; mapped                 ; 9762          # 3.0  KANGXI RADICAL FACE
+2FB0          ; mapped                 ; 9769          # 3.0  KANGXI RADICAL LEATHER
+2FB1          ; mapped                 ; 97CB          # 3.0  KANGXI RADICAL TANNED LEATHER
+2FB2          ; mapped                 ; 97ED          # 3.0  KANGXI RADICAL LEEK
+2FB3          ; mapped                 ; 97F3          # 3.0  KANGXI RADICAL SOUND
+2FB4          ; mapped                 ; 9801          # 3.0  KANGXI RADICAL LEAF
+2FB5          ; mapped                 ; 98A8          # 3.0  KANGXI RADICAL WIND
+2FB6          ; mapped                 ; 98DB          # 3.0  KANGXI RADICAL FLY
+2FB7          ; mapped                 ; 98DF          # 3.0  KANGXI RADICAL EAT
+2FB8          ; mapped                 ; 9996          # 3.0  KANGXI RADICAL HEAD
+2FB9          ; mapped                 ; 9999          # 3.0  KANGXI RADICAL FRAGRANT
+2FBA          ; mapped                 ; 99AC          # 3.0  KANGXI RADICAL HORSE
+2FBB          ; mapped                 ; 9AA8          # 3.0  KANGXI RADICAL BONE
+2FBC          ; mapped                 ; 9AD8          # 3.0  KANGXI RADICAL TALL
+2FBD          ; mapped                 ; 9ADF          # 3.0  KANGXI RADICAL HAIR
+2FBE          ; mapped                 ; 9B25          # 3.0  KANGXI RADICAL FIGHT
+2FBF          ; mapped                 ; 9B2F          # 3.0  KANGXI RADICAL SACRIFICIAL WINE
+2FC0          ; mapped                 ; 9B32          # 3.0  KANGXI RADICAL CAULDRON
+2FC1          ; mapped                 ; 9B3C          # 3.0  KANGXI RADICAL GHOST
+2FC2          ; mapped                 ; 9B5A          # 3.0  KANGXI RADICAL FISH
+2FC3          ; mapped                 ; 9CE5          # 3.0  KANGXI RADICAL BIRD
+2FC4          ; mapped                 ; 9E75          # 3.0  KANGXI RADICAL SALT
+2FC5          ; mapped                 ; 9E7F          # 3.0  KANGXI RADICAL DEER
+2FC6          ; mapped                 ; 9EA5          # 3.0  KANGXI RADICAL WHEAT
+2FC7          ; mapped                 ; 9EBB          # 3.0  KANGXI RADICAL HEMP
+2FC8          ; mapped                 ; 9EC3          # 3.0  KANGXI RADICAL YELLOW
+2FC9          ; mapped                 ; 9ECD          # 3.0  KANGXI RADICAL MILLET
+2FCA          ; mapped                 ; 9ED1          # 3.0  KANGXI RADICAL BLACK
+2FCB          ; mapped                 ; 9EF9          # 3.0  KANGXI RADICAL EMBROIDERY
+2FCC          ; mapped                 ; 9EFD          # 3.0  KANGXI RADICAL FROG
+2FCD          ; mapped                 ; 9F0E          # 3.0  KANGXI RADICAL TRIPOD
+2FCE          ; mapped                 ; 9F13          # 3.0  KANGXI RADICAL DRUM
+2FCF          ; mapped                 ; 9F20          # 3.0  KANGXI RADICAL RAT
+2FD0          ; mapped                 ; 9F3B          # 3.0  KANGXI RADICAL NOSE
+2FD1          ; mapped                 ; 9F4A          # 3.0  KANGXI RADICAL EVEN
+2FD2          ; mapped                 ; 9F52          # 3.0  KANGXI RADICAL TOOTH
+2FD3          ; mapped                 ; 9F8D          # 3.0  KANGXI RADICAL DRAGON
+2FD4          ; mapped                 ; 9F9C          # 3.0  KANGXI RADICAL TURTLE
+2FD5          ; mapped                 ; 9FA0          # 3.0  KANGXI RADICAL FLUTE
+2FD6..2FEF    ; disallowed                             # NA   <reserved-2FD6>..<reserved-2FEF>
+2FF0..2FFB    ; disallowed                             # 3.0  IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
+2FFC..2FFF    ; disallowed                             # NA   <reserved-2FFC>..<reserved-2FFF>
+3000          ; disallowed_STD3_mapped ; 0020          # 1.1  IDEOGRAPHIC SPACE
+3001          ; valid                  ;      ; NV8    # 1.1  IDEOGRAPHIC COMMA
+3002          ; mapped                 ; 002E          # 1.1  IDEOGRAPHIC FULL STOP
+3003..3004    ; valid                  ;      ; NV8    # 1.1  DITTO MARK..JAPANESE INDUSTRIAL STANDARD SYMBOL
+3005..3007    ; valid                                  # 1.1  IDEOGRAPHIC ITERATION MARK..IDEOGRAPHIC NUMBER ZERO
+3008..3029    ; valid                  ;      ; NV8    # 1.1  LEFT ANGLE BRACKET..HANGZHOU NUMERAL NINE
+302A..302D    ; valid                                  # 1.1  IDEOGRAPHIC LEVEL TONE MARK..IDEOGRAPHIC ENTERING TONE MARK
+302E..3035    ; valid                  ;      ; NV8    # 1.1  HANGUL SINGLE DOT TONE MARK..VERTICAL KANA REPEAT MARK LOWER HALF
+3036          ; mapped                 ; 3012          # 1.1  CIRCLED POSTAL MARK
+3037          ; valid                  ;      ; NV8    # 1.1  IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL
+3038          ; mapped                 ; 5341          # 3.0  HANGZHOU NUMERAL TEN
+3039          ; mapped                 ; 5344          # 3.0  HANGZHOU NUMERAL TWENTY
+303A          ; mapped                 ; 5345          # 3.0  HANGZHOU NUMERAL THIRTY
+303B          ; valid                  ;      ; NV8    # 3.2  VERTICAL IDEOGRAPHIC ITERATION MARK
+303C          ; valid                                  # 3.2  MASU MARK
+303D          ; valid                  ;      ; NV8    # 3.2  PART ALTERNATION MARK
+303E          ; valid                  ;      ; NV8    # 3.0  IDEOGRAPHIC VARIATION INDICATOR
+303F          ; valid                  ;      ; NV8    # 1.1  IDEOGRAPHIC HALF FILL SPACE
+3040          ; disallowed                             # NA   <reserved-3040>
+3041..3094    ; valid                                  # 1.1  HIRAGANA LETTER SMALL A..HIRAGANA LETTER VU
+3095..3096    ; valid                                  # 3.2  HIRAGANA LETTER SMALL KA..HIRAGANA LETTER SMALL KE
+3097..3098    ; disallowed                             # NA   <reserved-3097>..<reserved-3098>
+3099..309A    ; valid                                  # 1.1  COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+309B          ; disallowed_STD3_mapped ; 0020 3099     # 1.1  KATAKANA-HIRAGANA VOICED SOUND MARK
+309C          ; disallowed_STD3_mapped ; 0020 309A     # 1.1  KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+309D..309E    ; valid                                  # 1.1  HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK
+309F          ; mapped                 ; 3088 308A     # 3.2  HIRAGANA DIGRAPH YORI
+30A0          ; valid                  ;      ; NV8    # 3.2  KATAKANA-HIRAGANA DOUBLE HYPHEN
+30A1..30FE    ; valid                                  # 1.1  KATAKANA LETTER SMALL A..KATAKANA VOICED ITERATION MARK
+30FF          ; mapped                 ; 30B3 30C8     # 3.2  KATAKANA DIGRAPH KOTO
+3100..3104    ; disallowed                             # NA   <reserved-3100>..<reserved-3104>
+3105..312C    ; valid                                  # 1.1  BOPOMOFO LETTER B..BOPOMOFO LETTER GN
+312D          ; valid                                  # 5.1  BOPOMOFO LETTER IH
+312E          ; valid                                  # 10.0 BOPOMOFO LETTER O WITH DOT ABOVE
+312F          ; valid                                  # 11.0 BOPOMOFO LETTER NN
+3130          ; disallowed                             # NA   <reserved-3130>
+3131          ; mapped                 ; 1100          # 1.1  HANGUL LETTER KIYEOK
+3132          ; mapped                 ; 1101          # 1.1  HANGUL LETTER SSANGKIYEOK
+3133          ; mapped                 ; 11AA          # 1.1  HANGUL LETTER KIYEOK-SIOS
+3134          ; mapped                 ; 1102          # 1.1  HANGUL LETTER NIEUN
+3135          ; mapped                 ; 11AC          # 1.1  HANGUL LETTER NIEUN-CIEUC
+3136          ; mapped                 ; 11AD          # 1.1  HANGUL LETTER NIEUN-HIEUH
+3137          ; mapped                 ; 1103          # 1.1  HANGUL LETTER TIKEUT
+3138          ; mapped                 ; 1104          # 1.1  HANGUL LETTER SSANGTIKEUT
+3139          ; mapped                 ; 1105          # 1.1  HANGUL LETTER RIEUL
+313A          ; mapped                 ; 11B0          # 1.1  HANGUL LETTER RIEUL-KIYEOK
+313B          ; mapped                 ; 11B1          # 1.1  HANGUL LETTER RIEUL-MIEUM
+313C          ; mapped                 ; 11B2          # 1.1  HANGUL LETTER RIEUL-PIEUP
+313D          ; mapped                 ; 11B3          # 1.1  HANGUL LETTER RIEUL-SIOS
+313E          ; mapped                 ; 11B4          # 1.1  HANGUL LETTER RIEUL-THIEUTH
+313F          ; mapped                 ; 11B5          # 1.1  HANGUL LETTER RIEUL-PHIEUPH
+3140          ; mapped                 ; 111A          # 1.1  HANGUL LETTER RIEUL-HIEUH
+3141          ; mapped                 ; 1106          # 1.1  HANGUL LETTER MIEUM
+3142          ; mapped                 ; 1107          # 1.1  HANGUL LETTER PIEUP
+3143          ; mapped                 ; 1108          # 1.1  HANGUL LETTER SSANGPIEUP
+3144          ; mapped                 ; 1121          # 1.1  HANGUL LETTER PIEUP-SIOS
+3145          ; mapped                 ; 1109          # 1.1  HANGUL LETTER SIOS
+3146          ; mapped                 ; 110A          # 1.1  HANGUL LETTER SSANGSIOS
+3147          ; mapped                 ; 110B          # 1.1  HANGUL LETTER IEUNG
+3148          ; mapped                 ; 110C          # 1.1  HANGUL LETTER CIEUC
+3149          ; mapped                 ; 110D          # 1.1  HANGUL LETTER SSANGCIEUC
+314A          ; mapped                 ; 110E          # 1.1  HANGUL LETTER CHIEUCH
+314B          ; mapped                 ; 110F          # 1.1  HANGUL LETTER KHIEUKH
+314C          ; mapped                 ; 1110          # 1.1  HANGUL LETTER THIEUTH
+314D          ; mapped                 ; 1111          # 1.1  HANGUL LETTER PHIEUPH
+314E          ; mapped                 ; 1112          # 1.1  HANGUL LETTER HIEUH
+314F          ; mapped                 ; 1161          # 1.1  HANGUL LETTER A
+3150          ; mapped                 ; 1162          # 1.1  HANGUL LETTER AE
+3151          ; mapped                 ; 1163          # 1.1  HANGUL LETTER YA
+3152          ; mapped                 ; 1164          # 1.1  HANGUL LETTER YAE
+3153          ; mapped                 ; 1165          # 1.1  HANGUL LETTER EO
+3154          ; mapped                 ; 1166          # 1.1  HANGUL LETTER E
+3155          ; mapped                 ; 1167          # 1.1  HANGUL LETTER YEO
+3156          ; mapped                 ; 1168          # 1.1  HANGUL LETTER YE
+3157          ; mapped                 ; 1169          # 1.1  HANGUL LETTER O
+3158          ; mapped                 ; 116A          # 1.1  HANGUL LETTER WA
+3159          ; mapped                 ; 116B          # 1.1  HANGUL LETTER WAE
+315A          ; mapped                 ; 116C          # 1.1  HANGUL LETTER OE
+315B          ; mapped                 ; 116D          # 1.1  HANGUL LETTER YO
+315C          ; mapped                 ; 116E          # 1.1  HANGUL LETTER U
+315D          ; mapped                 ; 116F          # 1.1  HANGUL LETTER WEO
+315E          ; mapped                 ; 1170          # 1.1  HANGUL LETTER WE
+315F          ; mapped                 ; 1171          # 1.1  HANGUL LETTER WI
+3160          ; mapped                 ; 1172          # 1.1  HANGUL LETTER YU
+3161          ; mapped                 ; 1173          # 1.1  HANGUL LETTER EU
+3162          ; mapped                 ; 1174          # 1.1  HANGUL LETTER YI
+3163          ; mapped                 ; 1175          # 1.1  HANGUL LETTER I
+3164          ; disallowed                             # 1.1  HANGUL FILLER
+3165          ; mapped                 ; 1114          # 1.1  HANGUL LETTER SSANGNIEUN
+3166          ; mapped                 ; 1115          # 1.1  HANGUL LETTER NIEUN-TIKEUT
+3167          ; mapped                 ; 11C7          # 1.1  HANGUL LETTER NIEUN-SIOS
+3168          ; mapped                 ; 11C8          # 1.1  HANGUL LETTER NIEUN-PANSIOS
+3169          ; mapped                 ; 11CC          # 1.1  HANGUL LETTER RIEUL-KIYEOK-SIOS
+316A          ; mapped                 ; 11CE          # 1.1  HANGUL LETTER RIEUL-TIKEUT
+316B          ; mapped                 ; 11D3          # 1.1  HANGUL LETTER RIEUL-PIEUP-SIOS
+316C          ; mapped                 ; 11D7          # 1.1  HANGUL LETTER RIEUL-PANSIOS
+316D          ; mapped                 ; 11D9          # 1.1  HANGUL LETTER RIEUL-YEORINHIEUH
+316E          ; mapped                 ; 111C          # 1.1  HANGUL LETTER MIEUM-PIEUP
+316F          ; mapped                 ; 11DD          # 1.1  HANGUL LETTER MIEUM-SIOS
+3170          ; mapped                 ; 11DF          # 1.1  HANGUL LETTER MIEUM-PANSIOS
+3171          ; mapped                 ; 111D          # 1.1  HANGUL LETTER KAPYEOUNMIEUM
+3172          ; mapped                 ; 111E          # 1.1  HANGUL LETTER PIEUP-KIYEOK
+3173          ; mapped                 ; 1120          # 1.1  HANGUL LETTER PIEUP-TIKEUT
+3174          ; mapped                 ; 1122          # 1.1  HANGUL LETTER PIEUP-SIOS-KIYEOK
+3175          ; mapped                 ; 1123          # 1.1  HANGUL LETTER PIEUP-SIOS-TIKEUT
+3176          ; mapped                 ; 1127          # 1.1  HANGUL LETTER PIEUP-CIEUC
+3177          ; mapped                 ; 1129          # 1.1  HANGUL LETTER PIEUP-THIEUTH
+3178          ; mapped                 ; 112B          # 1.1  HANGUL LETTER KAPYEOUNPIEUP
+3179          ; mapped                 ; 112C          # 1.1  HANGUL LETTER KAPYEOUNSSANGPIEUP
+317A          ; mapped                 ; 112D          # 1.1  HANGUL LETTER SIOS-KIYEOK
+317B          ; mapped                 ; 112E          # 1.1  HANGUL LETTER SIOS-NIEUN
+317C          ; mapped                 ; 112F          # 1.1  HANGUL LETTER SIOS-TIKEUT
+317D          ; mapped                 ; 1132          # 1.1  HANGUL LETTER SIOS-PIEUP
+317E          ; mapped                 ; 1136          # 1.1  HANGUL LETTER SIOS-CIEUC
+317F          ; mapped                 ; 1140          # 1.1  HANGUL LETTER PANSIOS
+3180          ; mapped                 ; 1147          # 1.1  HANGUL LETTER SSANGIEUNG
+3181          ; mapped                 ; 114C          # 1.1  HANGUL LETTER YESIEUNG
+3182          ; mapped                 ; 11F1          # 1.1  HANGUL LETTER YESIEUNG-SIOS
+3183          ; mapped                 ; 11F2          # 1.1  HANGUL LETTER YESIEUNG-PANSIOS
+3184          ; mapped                 ; 1157          # 1.1  HANGUL LETTER KAPYEOUNPHIEUPH
+3185          ; mapped                 ; 1158          # 1.1  HANGUL LETTER SSANGHIEUH
+3186          ; mapped                 ; 1159          # 1.1  HANGUL LETTER YEORINHIEUH
+3187          ; mapped                 ; 1184          # 1.1  HANGUL LETTER YO-YA
+3188          ; mapped                 ; 1185          # 1.1  HANGUL LETTER YO-YAE
+3189          ; mapped                 ; 1188          # 1.1  HANGUL LETTER YO-I
+318A          ; mapped                 ; 1191          # 1.1  HANGUL LETTER YU-YEO
+318B          ; mapped                 ; 1192          # 1.1  HANGUL LETTER YU-YE
+318C          ; mapped                 ; 1194          # 1.1  HANGUL LETTER YU-I
+318D          ; mapped                 ; 119E          # 1.1  HANGUL LETTER ARAEA
+318E          ; mapped                 ; 11A1          # 1.1  HANGUL LETTER ARAEAE
+318F          ; disallowed                             # NA   <reserved-318F>
+3190..3191    ; valid                  ;      ; NV8    # 1.1  IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK
+3192          ; mapped                 ; 4E00          # 1.1  IDEOGRAPHIC ANNOTATION ONE MARK
+3193          ; mapped                 ; 4E8C          # 1.1  IDEOGRAPHIC ANNOTATION TWO MARK
+3194          ; mapped                 ; 4E09          # 1.1  IDEOGRAPHIC ANNOTATION THREE MARK
+3195          ; mapped                 ; 56DB          # 1.1  IDEOGRAPHIC ANNOTATION FOUR MARK
+3196          ; mapped                 ; 4E0A          # 1.1  IDEOGRAPHIC ANNOTATION TOP MARK
+3197          ; mapped                 ; 4E2D          # 1.1  IDEOGRAPHIC ANNOTATION MIDDLE MARK
+3198          ; mapped                 ; 4E0B          # 1.1  IDEOGRAPHIC ANNOTATION BOTTOM MARK
+3199          ; mapped                 ; 7532          # 1.1  IDEOGRAPHIC ANNOTATION FIRST MARK
+319A          ; mapped                 ; 4E59          # 1.1  IDEOGRAPHIC ANNOTATION SECOND MARK
+319B          ; mapped                 ; 4E19          # 1.1  IDEOGRAPHIC ANNOTATION THIRD MARK
+319C          ; mapped                 ; 4E01          # 1.1  IDEOGRAPHIC ANNOTATION FOURTH MARK
+319D          ; mapped                 ; 5929          # 1.1  IDEOGRAPHIC ANNOTATION HEAVEN MARK
+319E          ; mapped                 ; 5730          # 1.1  IDEOGRAPHIC ANNOTATION EARTH MARK
+319F          ; mapped                 ; 4EBA          # 1.1  IDEOGRAPHIC ANNOTATION MAN MARK
+31A0..31B7    ; valid                                  # 3.0  BOPOMOFO LETTER BU..BOPOMOFO FINAL LETTER H
+31B8..31BA    ; valid                                  # 6.0  BOPOMOFO LETTER GH..BOPOMOFO LETTER ZY
+31BB..31BF    ; valid                                  # 13.0 BOPOMOFO FINAL LETTER G..BOPOMOFO LETTER AH
+31C0..31CF    ; valid                  ;      ; NV8    # 4.1  CJK STROKE T..CJK STROKE N
+31D0..31E3    ; valid                  ;      ; NV8    # 5.1  CJK STROKE H..CJK STROKE Q
+31E4..31EF    ; disallowed                             # NA   <reserved-31E4>..<reserved-31EF>
+31F0..31FF    ; valid                                  # 3.2  KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO
+3200          ; disallowed_STD3_mapped ; 0028 1100 0029 #1.1  PARENTHESIZED HANGUL KIYEOK
+3201          ; disallowed_STD3_mapped ; 0028 1102 0029 #1.1  PARENTHESIZED HANGUL NIEUN
+3202          ; disallowed_STD3_mapped ; 0028 1103 0029 #1.1  PARENTHESIZED HANGUL TIKEUT
+3203          ; disallowed_STD3_mapped ; 0028 1105 0029 #1.1  PARENTHESIZED HANGUL RIEUL
+3204          ; disallowed_STD3_mapped ; 0028 1106 0029 #1.1  PARENTHESIZED HANGUL MIEUM
+3205          ; disallowed_STD3_mapped ; 0028 1107 0029 #1.1  PARENTHESIZED HANGUL PIEUP
+3206          ; disallowed_STD3_mapped ; 0028 1109 0029 #1.1  PARENTHESIZED HANGUL SIOS
+3207          ; disallowed_STD3_mapped ; 0028 110B 0029 #1.1  PARENTHESIZED HANGUL IEUNG
+3208          ; disallowed_STD3_mapped ; 0028 110C 0029 #1.1  PARENTHESIZED HANGUL CIEUC
+3209          ; disallowed_STD3_mapped ; 0028 110E 0029 #1.1  PARENTHESIZED HANGUL CHIEUCH
+320A          ; disallowed_STD3_mapped ; 0028 110F 0029 #1.1  PARENTHESIZED HANGUL KHIEUKH
+320B          ; disallowed_STD3_mapped ; 0028 1110 0029 #1.1  PARENTHESIZED HANGUL THIEUTH
+320C          ; disallowed_STD3_mapped ; 0028 1111 0029 #1.1  PARENTHESIZED HANGUL PHIEUPH
+320D          ; disallowed_STD3_mapped ; 0028 1112 0029 #1.1  PARENTHESIZED HANGUL HIEUH
+320E          ; disallowed_STD3_mapped ; 0028 AC00 0029 #1.1  PARENTHESIZED HANGUL KIYEOK A
+320F          ; disallowed_STD3_mapped ; 0028 B098 0029 #1.1  PARENTHESIZED HANGUL NIEUN A
+3210          ; disallowed_STD3_mapped ; 0028 B2E4 0029 #1.1  PARENTHESIZED HANGUL TIKEUT A
+3211          ; disallowed_STD3_mapped ; 0028 B77C 0029 #1.1  PARENTHESIZED HANGUL RIEUL A
+3212          ; disallowed_STD3_mapped ; 0028 B9C8 0029 #1.1  PARENTHESIZED HANGUL MIEUM A
+3213          ; disallowed_STD3_mapped ; 0028 BC14 0029 #1.1  PARENTHESIZED HANGUL PIEUP A
+3214          ; disallowed_STD3_mapped ; 0028 C0AC 0029 #1.1  PARENTHESIZED HANGUL SIOS A
+3215          ; disallowed_STD3_mapped ; 0028 C544 0029 #1.1  PARENTHESIZED HANGUL IEUNG A
+3216          ; disallowed_STD3_mapped ; 0028 C790 0029 #1.1  PARENTHESIZED HANGUL CIEUC A
+3217          ; disallowed_STD3_mapped ; 0028 CC28 0029 #1.1  PARENTHESIZED HANGUL CHIEUCH A
+3218          ; disallowed_STD3_mapped ; 0028 CE74 0029 #1.1  PARENTHESIZED HANGUL KHIEUKH A
+3219          ; disallowed_STD3_mapped ; 0028 D0C0 0029 #1.1  PARENTHESIZED HANGUL THIEUTH A
+321A          ; disallowed_STD3_mapped ; 0028 D30C 0029 #1.1  PARENTHESIZED HANGUL PHIEUPH A
+321B          ; disallowed_STD3_mapped ; 0028 D558 0029 #1.1  PARENTHESIZED HANGUL HIEUH A
+321C          ; disallowed_STD3_mapped ; 0028 C8FC 0029 #1.1  PARENTHESIZED HANGUL CIEUC U
+321D          ; disallowed_STD3_mapped ; 0028 C624 C804 0029 #4.0 PARENTHESIZED KOREAN CHARACTER OJEON
+321E          ; disallowed_STD3_mapped ; 0028 C624 D6C4 0029 #4.0 PARENTHESIZED KOREAN CHARACTER O HU
+321F          ; disallowed                             # NA   <reserved-321F>
+3220          ; disallowed_STD3_mapped ; 0028 4E00 0029 #1.1  PARENTHESIZED IDEOGRAPH ONE
+3221          ; disallowed_STD3_mapped ; 0028 4E8C 0029 #1.1  PARENTHESIZED IDEOGRAPH TWO
+3222          ; disallowed_STD3_mapped ; 0028 4E09 0029 #1.1  PARENTHESIZED IDEOGRAPH THREE
+3223          ; disallowed_STD3_mapped ; 0028 56DB 0029 #1.1  PARENTHESIZED IDEOGRAPH FOUR
+3224          ; disallowed_STD3_mapped ; 0028 4E94 0029 #1.1  PARENTHESIZED IDEOGRAPH FIVE
+3225          ; disallowed_STD3_mapped ; 0028 516D 0029 #1.1  PARENTHESIZED IDEOGRAPH SIX
+3226          ; disallowed_STD3_mapped ; 0028 4E03 0029 #1.1  PARENTHESIZED IDEOGRAPH SEVEN
+3227          ; disallowed_STD3_mapped ; 0028 516B 0029 #1.1  PARENTHESIZED IDEOGRAPH EIGHT
+3228          ; disallowed_STD3_mapped ; 0028 4E5D 0029 #1.1  PARENTHESIZED IDEOGRAPH NINE
+3229          ; disallowed_STD3_mapped ; 0028 5341 0029 #1.1  PARENTHESIZED IDEOGRAPH TEN
+322A          ; disallowed_STD3_mapped ; 0028 6708 0029 #1.1  PARENTHESIZED IDEOGRAPH MOON
+322B          ; disallowed_STD3_mapped ; 0028 706B 0029 #1.1  PARENTHESIZED IDEOGRAPH FIRE
+322C          ; disallowed_STD3_mapped ; 0028 6C34 0029 #1.1  PARENTHESIZED IDEOGRAPH WATER
+322D          ; disallowed_STD3_mapped ; 0028 6728 0029 #1.1  PARENTHESIZED IDEOGRAPH WOOD
+322E          ; disallowed_STD3_mapped ; 0028 91D1 0029 #1.1  PARENTHESIZED IDEOGRAPH METAL
+322F          ; disallowed_STD3_mapped ; 0028 571F 0029 #1.1  PARENTHESIZED IDEOGRAPH EARTH
+3230          ; disallowed_STD3_mapped ; 0028 65E5 0029 #1.1  PARENTHESIZED IDEOGRAPH SUN
+3231          ; disallowed_STD3_mapped ; 0028 682A 0029 #1.1  PARENTHESIZED IDEOGRAPH STOCK
+3232          ; disallowed_STD3_mapped ; 0028 6709 0029 #1.1  PARENTHESIZED IDEOGRAPH HAVE
+3233          ; disallowed_STD3_mapped ; 0028 793E 0029 #1.1  PARENTHESIZED IDEOGRAPH SOCIETY
+3234          ; disallowed_STD3_mapped ; 0028 540D 0029 #1.1  PARENTHESIZED IDEOGRAPH NAME
+3235          ; disallowed_STD3_mapped ; 0028 7279 0029 #1.1  PARENTHESIZED IDEOGRAPH SPECIAL
+3236          ; disallowed_STD3_mapped ; 0028 8CA1 0029 #1.1  PARENTHESIZED IDEOGRAPH FINANCIAL
+3237          ; disallowed_STD3_mapped ; 0028 795D 0029 #1.1  PARENTHESIZED IDEOGRAPH CONGRATULATION
+3238          ; disallowed_STD3_mapped ; 0028 52B4 0029 #1.1  PARENTHESIZED IDEOGRAPH LABOR
+3239          ; disallowed_STD3_mapped ; 0028 4EE3 0029 #1.1  PARENTHESIZED IDEOGRAPH REPRESENT
+323A          ; disallowed_STD3_mapped ; 0028 547C 0029 #1.1  PARENTHESIZED IDEOGRAPH CALL
+323B          ; disallowed_STD3_mapped ; 0028 5B66 0029 #1.1  PARENTHESIZED IDEOGRAPH STUDY
+323C          ; disallowed_STD3_mapped ; 0028 76E3 0029 #1.1  PARENTHESIZED IDEOGRAPH SUPERVISE
+323D          ; disallowed_STD3_mapped ; 0028 4F01 0029 #1.1  PARENTHESIZED IDEOGRAPH ENTERPRISE
+323E          ; disallowed_STD3_mapped ; 0028 8CC7 0029 #1.1  PARENTHESIZED IDEOGRAPH RESOURCE
+323F          ; disallowed_STD3_mapped ; 0028 5354 0029 #1.1  PARENTHESIZED IDEOGRAPH ALLIANCE
+3240          ; disallowed_STD3_mapped ; 0028 796D 0029 #1.1  PARENTHESIZED IDEOGRAPH FESTIVAL
+3241          ; disallowed_STD3_mapped ; 0028 4F11 0029 #1.1  PARENTHESIZED IDEOGRAPH REST
+3242          ; disallowed_STD3_mapped ; 0028 81EA 0029 #1.1  PARENTHESIZED IDEOGRAPH SELF
+3243          ; disallowed_STD3_mapped ; 0028 81F3 0029 #1.1  PARENTHESIZED IDEOGRAPH REACH
+3244          ; mapped                 ; 554F          # 5.2  CIRCLED IDEOGRAPH QUESTION
+3245          ; mapped                 ; 5E7C          # 5.2  CIRCLED IDEOGRAPH KINDERGARTEN
+3246          ; mapped                 ; 6587          # 5.2  CIRCLED IDEOGRAPH SCHOOL
+3247          ; mapped                 ; 7B8F          # 5.2  CIRCLED IDEOGRAPH KOTO
+3248..324F    ; valid                  ;      ; NV8    # 5.2  CIRCLED NUMBER TEN ON BLACK SQUARE..CIRCLED NUMBER EIGHTY ON BLACK SQUARE
+3250          ; mapped                 ; 0070 0074 0065 #4.0  PARTNERSHIP SIGN
+3251          ; mapped                 ; 0032 0031     # 3.2  CIRCLED NUMBER TWENTY ONE
+3252          ; mapped                 ; 0032 0032     # 3.2  CIRCLED NUMBER TWENTY TWO
+3253          ; mapped                 ; 0032 0033     # 3.2  CIRCLED NUMBER TWENTY THREE
+3254          ; mapped                 ; 0032 0034     # 3.2  CIRCLED NUMBER TWENTY FOUR
+3255          ; mapped                 ; 0032 0035     # 3.2  CIRCLED NUMBER TWENTY FIVE
+3256          ; mapped                 ; 0032 0036     # 3.2  CIRCLED NUMBER TWENTY SIX
+3257          ; mapped                 ; 0032 0037     # 3.2  CIRCLED NUMBER TWENTY SEVEN
+3258          ; mapped                 ; 0032 0038     # 3.2  CIRCLED NUMBER TWENTY EIGHT
+3259          ; mapped                 ; 0032 0039     # 3.2  CIRCLED NUMBER TWENTY NINE
+325A          ; mapped                 ; 0033 0030     # 3.2  CIRCLED NUMBER THIRTY
+325B          ; mapped                 ; 0033 0031     # 3.2  CIRCLED NUMBER THIRTY ONE
+325C          ; mapped                 ; 0033 0032     # 3.2  CIRCLED NUMBER THIRTY TWO
+325D          ; mapped                 ; 0033 0033     # 3.2  CIRCLED NUMBER THIRTY THREE
+325E          ; mapped                 ; 0033 0034     # 3.2  CIRCLED NUMBER THIRTY FOUR
+325F          ; mapped                 ; 0033 0035     # 3.2  CIRCLED NUMBER THIRTY FIVE
+3260          ; mapped                 ; 1100          # 1.1  CIRCLED HANGUL KIYEOK
+3261          ; mapped                 ; 1102          # 1.1  CIRCLED HANGUL NIEUN
+3262          ; mapped                 ; 1103          # 1.1  CIRCLED HANGUL TIKEUT
+3263          ; mapped                 ; 1105          # 1.1  CIRCLED HANGUL RIEUL
+3264          ; mapped                 ; 1106          # 1.1  CIRCLED HANGUL MIEUM
+3265          ; mapped                 ; 1107          # 1.1  CIRCLED HANGUL PIEUP
+3266          ; mapped                 ; 1109          # 1.1  CIRCLED HANGUL SIOS
+3267          ; mapped                 ; 110B          # 1.1  CIRCLED HANGUL IEUNG
+3268          ; mapped                 ; 110C          # 1.1  CIRCLED HANGUL CIEUC
+3269          ; mapped                 ; 110E          # 1.1  CIRCLED HANGUL CHIEUCH
+326A          ; mapped                 ; 110F          # 1.1  CIRCLED HANGUL KHIEUKH
+326B          ; mapped                 ; 1110          # 1.1  CIRCLED HANGUL THIEUTH
+326C          ; mapped                 ; 1111          # 1.1  CIRCLED HANGUL PHIEUPH
+326D          ; mapped                 ; 1112          # 1.1  CIRCLED HANGUL HIEUH
+326E          ; mapped                 ; AC00          # 1.1  CIRCLED HANGUL KIYEOK A
+326F          ; mapped                 ; B098          # 1.1  CIRCLED HANGUL NIEUN A
+3270          ; mapped                 ; B2E4          # 1.1  CIRCLED HANGUL TIKEUT A
+3271          ; mapped                 ; B77C          # 1.1  CIRCLED HANGUL RIEUL A
+3272          ; mapped                 ; B9C8          # 1.1  CIRCLED HANGUL MIEUM A
+3273          ; mapped                 ; BC14          # 1.1  CIRCLED HANGUL PIEUP A
+3274          ; mapped                 ; C0AC          # 1.1  CIRCLED HANGUL SIOS A
+3275          ; mapped                 ; C544          # 1.1  CIRCLED HANGUL IEUNG A
+3276          ; mapped                 ; C790          # 1.1  CIRCLED HANGUL CIEUC A
+3277          ; mapped                 ; CC28          # 1.1  CIRCLED HANGUL CHIEUCH A
+3278          ; mapped                 ; CE74          # 1.1  CIRCLED HANGUL KHIEUKH A
+3279          ; mapped                 ; D0C0          # 1.1  CIRCLED HANGUL THIEUTH A
+327A          ; mapped                 ; D30C          # 1.1  CIRCLED HANGUL PHIEUPH A
+327B          ; mapped                 ; D558          # 1.1  CIRCLED HANGUL HIEUH A
+327C          ; mapped                 ; CC38 ACE0     # 4.0  CIRCLED KOREAN CHARACTER CHAMKO
+327D          ; mapped                 ; C8FC C758     # 4.0  CIRCLED KOREAN CHARACTER JUEUI
+327E          ; mapped                 ; C6B0          # 4.1  CIRCLED HANGUL IEUNG U
+327F          ; valid                  ;      ; NV8    # 1.1  KOREAN STANDARD SYMBOL
+3280          ; mapped                 ; 4E00          # 1.1  CIRCLED IDEOGRAPH ONE
+3281          ; mapped                 ; 4E8C          # 1.1  CIRCLED IDEOGRAPH TWO
+3282          ; mapped                 ; 4E09          # 1.1  CIRCLED IDEOGRAPH THREE
+3283          ; mapped                 ; 56DB          # 1.1  CIRCLED IDEOGRAPH FOUR
+3284          ; mapped                 ; 4E94          # 1.1  CIRCLED IDEOGRAPH FIVE
+3285          ; mapped                 ; 516D          # 1.1  CIRCLED IDEOGRAPH SIX
+3286          ; mapped                 ; 4E03          # 1.1  CIRCLED IDEOGRAPH SEVEN
+3287          ; mapped                 ; 516B          # 1.1  CIRCLED IDEOGRAPH EIGHT
+3288          ; mapped                 ; 4E5D          # 1.1  CIRCLED IDEOGRAPH NINE
+3289          ; mapped                 ; 5341          # 1.1  CIRCLED IDEOGRAPH TEN
+328A          ; mapped                 ; 6708          # 1.1  CIRCLED IDEOGRAPH MOON
+328B          ; mapped                 ; 706B          # 1.1  CIRCLED IDEOGRAPH FIRE
+328C          ; mapped                 ; 6C34          # 1.1  CIRCLED IDEOGRAPH WATER
+328D          ; mapped                 ; 6728          # 1.1  CIRCLED IDEOGRAPH WOOD
+328E          ; mapped                 ; 91D1          # 1.1  CIRCLED IDEOGRAPH METAL
+328F          ; mapped                 ; 571F          # 1.1  CIRCLED IDEOGRAPH EARTH
+3290          ; mapped                 ; 65E5          # 1.1  CIRCLED IDEOGRAPH SUN
+3291          ; mapped                 ; 682A          # 1.1  CIRCLED IDEOGRAPH STOCK
+3292          ; mapped                 ; 6709          # 1.1  CIRCLED IDEOGRAPH HAVE
+3293          ; mapped                 ; 793E          # 1.1  CIRCLED IDEOGRAPH SOCIETY
+3294          ; mapped                 ; 540D          # 1.1  CIRCLED IDEOGRAPH NAME
+3295          ; mapped                 ; 7279          # 1.1  CIRCLED IDEOGRAPH SPECIAL
+3296          ; mapped                 ; 8CA1          # 1.1  CIRCLED IDEOGRAPH FINANCIAL
+3297          ; mapped                 ; 795D          # 1.1  CIRCLED IDEOGRAPH CONGRATULATION
+3298          ; mapped                 ; 52B4          # 1.1  CIRCLED IDEOGRAPH LABOR
+3299          ; mapped                 ; 79D8          # 1.1  CIRCLED IDEOGRAPH SECRET
+329A          ; mapped                 ; 7537          # 1.1  CIRCLED IDEOGRAPH MALE
+329B          ; mapped                 ; 5973          # 1.1  CIRCLED IDEOGRAPH FEMALE
+329C          ; mapped                 ; 9069          # 1.1  CIRCLED IDEOGRAPH SUITABLE
+329D          ; mapped                 ; 512A          # 1.1  CIRCLED IDEOGRAPH EXCELLENT
+329E          ; mapped                 ; 5370          # 1.1  CIRCLED IDEOGRAPH PRINT
+329F          ; mapped                 ; 6CE8          # 1.1  CIRCLED IDEOGRAPH ATTENTION
+32A0          ; mapped                 ; 9805          # 1.1  CIRCLED IDEOGRAPH ITEM
+32A1          ; mapped                 ; 4F11          # 1.1  CIRCLED IDEOGRAPH REST
+32A2          ; mapped                 ; 5199          # 1.1  CIRCLED IDEOGRAPH COPY
+32A3          ; mapped                 ; 6B63          # 1.1  CIRCLED IDEOGRAPH CORRECT
+32A4          ; mapped                 ; 4E0A          # 1.1  CIRCLED IDEOGRAPH HIGH
+32A5          ; mapped                 ; 4E2D          # 1.1  CIRCLED IDEOGRAPH CENTRE
+32A6          ; mapped                 ; 4E0B          # 1.1  CIRCLED IDEOGRAPH LOW
+32A7          ; mapped                 ; 5DE6          # 1.1  CIRCLED IDEOGRAPH LEFT
+32A8          ; mapped                 ; 53F3          # 1.1  CIRCLED IDEOGRAPH RIGHT
+32A9          ; mapped                 ; 533B          # 1.1  CIRCLED IDEOGRAPH MEDICINE
+32AA          ; mapped                 ; 5B97          # 1.1  CIRCLED IDEOGRAPH RELIGION
+32AB          ; mapped                 ; 5B66          # 1.1  CIRCLED IDEOGRAPH STUDY
+32AC          ; mapped                 ; 76E3          # 1.1  CIRCLED IDEOGRAPH SUPERVISE
+32AD          ; mapped                 ; 4F01          # 1.1  CIRCLED IDEOGRAPH ENTERPRISE
+32AE          ; mapped                 ; 8CC7          # 1.1  CIRCLED IDEOGRAPH RESOURCE
+32AF          ; mapped                 ; 5354          # 1.1  CIRCLED IDEOGRAPH ALLIANCE
+32B0          ; mapped                 ; 591C          # 1.1  CIRCLED IDEOGRAPH NIGHT
+32B1          ; mapped                 ; 0033 0036     # 3.2  CIRCLED NUMBER THIRTY SIX
+32B2          ; mapped                 ; 0033 0037     # 3.2  CIRCLED NUMBER THIRTY SEVEN
+32B3          ; mapped                 ; 0033 0038     # 3.2  CIRCLED NUMBER THIRTY EIGHT
+32B4          ; mapped                 ; 0033 0039     # 3.2  CIRCLED NUMBER THIRTY NINE
+32B5          ; mapped                 ; 0034 0030     # 3.2  CIRCLED NUMBER FORTY
+32B6          ; mapped                 ; 0034 0031     # 3.2  CIRCLED NUMBER FORTY ONE
+32B7          ; mapped                 ; 0034 0032     # 3.2  CIRCLED NUMBER FORTY TWO
+32B8          ; mapped                 ; 0034 0033     # 3.2  CIRCLED NUMBER FORTY THREE
+32B9          ; mapped                 ; 0034 0034     # 3.2  CIRCLED NUMBER FORTY FOUR
+32BA          ; mapped                 ; 0034 0035     # 3.2  CIRCLED NUMBER FORTY FIVE
+32BB          ; mapped                 ; 0034 0036     # 3.2  CIRCLED NUMBER FORTY SIX
+32BC          ; mapped                 ; 0034 0037     # 3.2  CIRCLED NUMBER FORTY SEVEN
+32BD          ; mapped                 ; 0034 0038     # 3.2  CIRCLED NUMBER FORTY EIGHT
+32BE          ; mapped                 ; 0034 0039     # 3.2  CIRCLED NUMBER FORTY NINE
+32BF          ; mapped                 ; 0035 0030     # 3.2  CIRCLED NUMBER FIFTY
+32C0          ; mapped                 ; 0031 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY
+32C1          ; mapped                 ; 0032 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR FEBRUARY
+32C2          ; mapped                 ; 0033 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR MARCH
+32C3          ; mapped                 ; 0034 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR APRIL
+32C4          ; mapped                 ; 0035 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR MAY
+32C5          ; mapped                 ; 0036 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR JUNE
+32C6          ; mapped                 ; 0037 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR JULY
+32C7          ; mapped                 ; 0038 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR AUGUST
+32C8          ; mapped                 ; 0039 6708     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR SEPTEMBER
+32C9          ; mapped                 ; 0031 0030 6708 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR OCTOBER
+32CA          ; mapped                 ; 0031 0031 6708 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR NOVEMBER
+32CB          ; mapped                 ; 0031 0032 6708 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER
+32CC          ; mapped                 ; 0068 0067     # 4.0  SQUARE HG
+32CD          ; mapped                 ; 0065 0072 0067 #4.0  SQUARE ERG
+32CE          ; mapped                 ; 0065 0076     # 4.0  SQUARE EV
+32CF          ; mapped                 ; 006C 0074 0064 #4.0  LIMITED LIABILITY SIGN
+32D0          ; mapped                 ; 30A2          # 1.1  CIRCLED KATAKANA A
+32D1          ; mapped                 ; 30A4          # 1.1  CIRCLED KATAKANA I
+32D2          ; mapped                 ; 30A6          # 1.1  CIRCLED KATAKANA U
+32D3          ; mapped                 ; 30A8          # 1.1  CIRCLED KATAKANA E
+32D4          ; mapped                 ; 30AA          # 1.1  CIRCLED KATAKANA O
+32D5          ; mapped                 ; 30AB          # 1.1  CIRCLED KATAKANA KA
+32D6          ; mapped                 ; 30AD          # 1.1  CIRCLED KATAKANA KI
+32D7          ; mapped                 ; 30AF          # 1.1  CIRCLED KATAKANA KU
+32D8          ; mapped                 ; 30B1          # 1.1  CIRCLED KATAKANA KE
+32D9          ; mapped                 ; 30B3          # 1.1  CIRCLED KATAKANA KO
+32DA          ; mapped                 ; 30B5          # 1.1  CIRCLED KATAKANA SA
+32DB          ; mapped                 ; 30B7          # 1.1  CIRCLED KATAKANA SI
+32DC          ; mapped                 ; 30B9          # 1.1  CIRCLED KATAKANA SU
+32DD          ; mapped                 ; 30BB          # 1.1  CIRCLED KATAKANA SE
+32DE          ; mapped                 ; 30BD          # 1.1  CIRCLED KATAKANA SO
+32DF          ; mapped                 ; 30BF          # 1.1  CIRCLED KATAKANA TA
+32E0          ; mapped                 ; 30C1          # 1.1  CIRCLED KATAKANA TI
+32E1          ; mapped                 ; 30C4          # 1.1  CIRCLED KATAKANA TU
+32E2          ; mapped                 ; 30C6          # 1.1  CIRCLED KATAKANA TE
+32E3          ; mapped                 ; 30C8          # 1.1  CIRCLED KATAKANA TO
+32E4          ; mapped                 ; 30CA          # 1.1  CIRCLED KATAKANA NA
+32E5          ; mapped                 ; 30CB          # 1.1  CIRCLED KATAKANA NI
+32E6          ; mapped                 ; 30CC          # 1.1  CIRCLED KATAKANA NU
+32E7          ; mapped                 ; 30CD          # 1.1  CIRCLED KATAKANA NE
+32E8          ; mapped                 ; 30CE          # 1.1  CIRCLED KATAKANA NO
+32E9          ; mapped                 ; 30CF          # 1.1  CIRCLED KATAKANA HA
+32EA          ; mapped                 ; 30D2          # 1.1  CIRCLED KATAKANA HI
+32EB          ; mapped                 ; 30D5          # 1.1  CIRCLED KATAKANA HU
+32EC          ; mapped                 ; 30D8          # 1.1  CIRCLED KATAKANA HE
+32ED          ; mapped                 ; 30DB          # 1.1  CIRCLED KATAKANA HO
+32EE          ; mapped                 ; 30DE          # 1.1  CIRCLED KATAKANA MA
+32EF          ; mapped                 ; 30DF          # 1.1  CIRCLED KATAKANA MI
+32F0          ; mapped                 ; 30E0          # 1.1  CIRCLED KATAKANA MU
+32F1          ; mapped                 ; 30E1          # 1.1  CIRCLED KATAKANA ME
+32F2          ; mapped                 ; 30E2          # 1.1  CIRCLED KATAKANA MO
+32F3          ; mapped                 ; 30E4          # 1.1  CIRCLED KATAKANA YA
+32F4          ; mapped                 ; 30E6          # 1.1  CIRCLED KATAKANA YU
+32F5          ; mapped                 ; 30E8          # 1.1  CIRCLED KATAKANA YO
+32F6          ; mapped                 ; 30E9          # 1.1  CIRCLED KATAKANA RA
+32F7          ; mapped                 ; 30EA          # 1.1  CIRCLED KATAKANA RI
+32F8          ; mapped                 ; 30EB          # 1.1  CIRCLED KATAKANA RU
+32F9          ; mapped                 ; 30EC          # 1.1  CIRCLED KATAKANA RE
+32FA          ; mapped                 ; 30ED          # 1.1  CIRCLED KATAKANA RO
+32FB          ; mapped                 ; 30EF          # 1.1  CIRCLED KATAKANA WA
+32FC          ; mapped                 ; 30F0          # 1.1  CIRCLED KATAKANA WI
+32FD          ; mapped                 ; 30F1          # 1.1  CIRCLED KATAKANA WE
+32FE          ; mapped                 ; 30F2          # 1.1  CIRCLED KATAKANA WO
+32FF          ; mapped                 ; 4EE4 548C     # 12.1 SQUARE ERA NAME REIWA
+3300          ; mapped                 ; 30A2 30D1 30FC 30C8 #1.1 SQUARE APAATO
+3301          ; mapped                 ; 30A2 30EB 30D5 30A1 #1.1 SQUARE ARUHUA
+3302          ; mapped                 ; 30A2 30F3 30DA 30A2 #1.1 SQUARE ANPEA
+3303          ; mapped                 ; 30A2 30FC 30EB #1.1  SQUARE AARU
+3304          ; mapped                 ; 30A4 30CB 30F3 30B0 #1.1 SQUARE ININGU
+3305          ; mapped                 ; 30A4 30F3 30C1 #1.1  SQUARE INTI
+3306          ; mapped                 ; 30A6 30A9 30F3 #1.1  SQUARE UON
+3307          ; mapped                 ; 30A8 30B9 30AF 30FC 30C9 #1.1 SQUARE ESUKUUDO
+3308          ; mapped                 ; 30A8 30FC 30AB 30FC #1.1 SQUARE EEKAA
+3309          ; mapped                 ; 30AA 30F3 30B9 #1.1  SQUARE ONSU
+330A          ; mapped                 ; 30AA 30FC 30E0 #1.1  SQUARE OOMU
+330B          ; mapped                 ; 30AB 30A4 30EA #1.1  SQUARE KAIRI
+330C          ; mapped                 ; 30AB 30E9 30C3 30C8 #1.1 SQUARE KARATTO
+330D          ; mapped                 ; 30AB 30ED 30EA 30FC #1.1 SQUARE KARORII
+330E          ; mapped                 ; 30AC 30ED 30F3 #1.1  SQUARE GARON
+330F          ; mapped                 ; 30AC 30F3 30DE #1.1  SQUARE GANMA
+3310          ; mapped                 ; 30AE 30AC     # 1.1  SQUARE GIGA
+3311          ; mapped                 ; 30AE 30CB 30FC #1.1  SQUARE GINII
+3312          ; mapped                 ; 30AD 30E5 30EA 30FC #1.1 SQUARE KYURII
+3313          ; mapped                 ; 30AE 30EB 30C0 30FC #1.1 SQUARE GIRUDAA
+3314          ; mapped                 ; 30AD 30ED     # 1.1  SQUARE KIRO
+3315          ; mapped                 ; 30AD 30ED 30B0 30E9 30E0 #1.1 SQUARE KIROGURAMU
+3316          ; mapped                 ; 30AD 30ED 30E1 30FC 30C8 30EB #1.1 SQUARE KIROMEETORU
+3317          ; mapped                 ; 30AD 30ED 30EF 30C3 30C8 #1.1 SQUARE KIROWATTO
+3318          ; mapped                 ; 30B0 30E9 30E0 #1.1  SQUARE GURAMU
+3319          ; mapped                 ; 30B0 30E9 30E0 30C8 30F3 #1.1 SQUARE GURAMUTON
+331A          ; mapped                 ; 30AF 30EB 30BC 30A4 30ED #1.1 SQUARE KURUZEIRO
+331B          ; mapped                 ; 30AF 30ED 30FC 30CD #1.1 SQUARE KUROONE
+331C          ; mapped                 ; 30B1 30FC 30B9 #1.1  SQUARE KEESU
+331D          ; mapped                 ; 30B3 30EB 30CA #1.1  SQUARE KORUNA
+331E          ; mapped                 ; 30B3 30FC 30DD #1.1  SQUARE KOOPO
+331F          ; mapped                 ; 30B5 30A4 30AF 30EB #1.1 SQUARE SAIKURU
+3320          ; mapped                 ; 30B5 30F3 30C1 30FC 30E0 #1.1 SQUARE SANTIIMU
+3321          ; mapped                 ; 30B7 30EA 30F3 30B0 #1.1 SQUARE SIRINGU
+3322          ; mapped                 ; 30BB 30F3 30C1 #1.1  SQUARE SENTI
+3323          ; mapped                 ; 30BB 30F3 30C8 #1.1  SQUARE SENTO
+3324          ; mapped                 ; 30C0 30FC 30B9 #1.1  SQUARE DAASU
+3325          ; mapped                 ; 30C7 30B7     # 1.1  SQUARE DESI
+3326          ; mapped                 ; 30C9 30EB     # 1.1  SQUARE DORU
+3327          ; mapped                 ; 30C8 30F3     # 1.1  SQUARE TON
+3328          ; mapped                 ; 30CA 30CE     # 1.1  SQUARE NANO
+3329          ; mapped                 ; 30CE 30C3 30C8 #1.1  SQUARE NOTTO
+332A          ; mapped                 ; 30CF 30A4 30C4 #1.1  SQUARE HAITU
+332B          ; mapped                 ; 30D1 30FC 30BB 30F3 30C8 #1.1 SQUARE PAASENTO
+332C          ; mapped                 ; 30D1 30FC 30C4 #1.1  SQUARE PAATU
+332D          ; mapped                 ; 30D0 30FC 30EC 30EB #1.1 SQUARE BAARERU
+332E          ; mapped                 ; 30D4 30A2 30B9 30C8 30EB #1.1 SQUARE PIASUTORU
+332F          ; mapped                 ; 30D4 30AF 30EB #1.1  SQUARE PIKURU
+3330          ; mapped                 ; 30D4 30B3     # 1.1  SQUARE PIKO
+3331          ; mapped                 ; 30D3 30EB     # 1.1  SQUARE BIRU
+3332          ; mapped                 ; 30D5 30A1 30E9 30C3 30C9 #1.1 SQUARE HUARADDO
+3333          ; mapped                 ; 30D5 30A3 30FC 30C8 #1.1 SQUARE HUIITO
+3334          ; mapped                 ; 30D6 30C3 30B7 30A7 30EB #1.1 SQUARE BUSSYERU
+3335          ; mapped                 ; 30D5 30E9 30F3 #1.1  SQUARE HURAN
+3336          ; mapped                 ; 30D8 30AF 30BF 30FC 30EB #1.1 SQUARE HEKUTAARU
+3337          ; mapped                 ; 30DA 30BD     # 1.1  SQUARE PESO
+3338          ; mapped                 ; 30DA 30CB 30D2 #1.1  SQUARE PENIHI
+3339          ; mapped                 ; 30D8 30EB 30C4 #1.1  SQUARE HERUTU
+333A          ; mapped                 ; 30DA 30F3 30B9 #1.1  SQUARE PENSU
+333B          ; mapped                 ; 30DA 30FC 30B8 #1.1  SQUARE PEEZI
+333C          ; mapped                 ; 30D9 30FC 30BF #1.1  SQUARE BEETA
+333D          ; mapped                 ; 30DD 30A4 30F3 30C8 #1.1 SQUARE POINTO
+333E          ; mapped                 ; 30DC 30EB 30C8 #1.1  SQUARE BORUTO
+333F          ; mapped                 ; 30DB 30F3     # 1.1  SQUARE HON
+3340          ; mapped                 ; 30DD 30F3 30C9 #1.1  SQUARE PONDO
+3341          ; mapped                 ; 30DB 30FC 30EB #1.1  SQUARE HOORU
+3342          ; mapped                 ; 30DB 30FC 30F3 #1.1  SQUARE HOON
+3343          ; mapped                 ; 30DE 30A4 30AF 30ED #1.1 SQUARE MAIKURO
+3344          ; mapped                 ; 30DE 30A4 30EB #1.1  SQUARE MAIRU
+3345          ; mapped                 ; 30DE 30C3 30CF #1.1  SQUARE MAHHA
+3346          ; mapped                 ; 30DE 30EB 30AF #1.1  SQUARE MARUKU
+3347          ; mapped                 ; 30DE 30F3 30B7 30E7 30F3 #1.1 SQUARE MANSYON
+3348          ; mapped                 ; 30DF 30AF 30ED 30F3 #1.1 SQUARE MIKURON
+3349          ; mapped                 ; 30DF 30EA     # 1.1  SQUARE MIRI
+334A          ; mapped                 ; 30DF 30EA 30D0 30FC 30EB #1.1 SQUARE MIRIBAARU
+334B          ; mapped                 ; 30E1 30AC     # 1.1  SQUARE MEGA
+334C          ; mapped                 ; 30E1 30AC 30C8 30F3 #1.1 SQUARE MEGATON
+334D          ; mapped                 ; 30E1 30FC 30C8 30EB #1.1 SQUARE MEETORU
+334E          ; mapped                 ; 30E4 30FC 30C9 #1.1  SQUARE YAADO
+334F          ; mapped                 ; 30E4 30FC 30EB #1.1  SQUARE YAARU
+3350          ; mapped                 ; 30E6 30A2 30F3 #1.1  SQUARE YUAN
+3351          ; mapped                 ; 30EA 30C3 30C8 30EB #1.1 SQUARE RITTORU
+3352          ; mapped                 ; 30EA 30E9     # 1.1  SQUARE RIRA
+3353          ; mapped                 ; 30EB 30D4 30FC #1.1  SQUARE RUPII
+3354          ; mapped                 ; 30EB 30FC 30D6 30EB #1.1 SQUARE RUUBURU
+3355          ; mapped                 ; 30EC 30E0     # 1.1  SQUARE REMU
+3356          ; mapped                 ; 30EC 30F3 30C8 30B2 30F3 #1.1 SQUARE RENTOGEN
+3357          ; mapped                 ; 30EF 30C3 30C8 #1.1  SQUARE WATTO
+3358          ; mapped                 ; 0030 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO
+3359          ; mapped                 ; 0031 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ONE
+335A          ; mapped                 ; 0032 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWO
+335B          ; mapped                 ; 0033 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THREE
+335C          ; mapped                 ; 0034 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOUR
+335D          ; mapped                 ; 0035 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIVE
+335E          ; mapped                 ; 0036 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIX
+335F          ; mapped                 ; 0037 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVEN
+3360          ; mapped                 ; 0038 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHT
+3361          ; mapped                 ; 0039 70B9     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINE
+3362          ; mapped                 ; 0031 0030 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TEN
+3363          ; mapped                 ; 0031 0031 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ELEVEN
+3364          ; mapped                 ; 0031 0032 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWELVE
+3365          ; mapped                 ; 0031 0033 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THIRTEEN
+3366          ; mapped                 ; 0031 0034 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOURTEEN
+3367          ; mapped                 ; 0031 0035 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIFTEEN
+3368          ; mapped                 ; 0031 0036 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIXTEEN
+3369          ; mapped                 ; 0031 0037 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVENTEEN
+336A          ; mapped                 ; 0031 0038 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHTEEN
+336B          ; mapped                 ; 0031 0039 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINETEEN
+336C          ; mapped                 ; 0032 0030 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY
+336D          ; mapped                 ; 0032 0031 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-ONE
+336E          ; mapped                 ; 0032 0032 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-TWO
+336F          ; mapped                 ; 0032 0033 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-THREE
+3370          ; mapped                 ; 0032 0034 70B9 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR
+3371          ; mapped                 ; 0068 0070 0061 #1.1  SQUARE HPA
+3372          ; mapped                 ; 0064 0061     # 1.1  SQUARE DA
+3373          ; mapped                 ; 0061 0075     # 1.1  SQUARE AU
+3374          ; mapped                 ; 0062 0061 0072 #1.1  SQUARE BAR
+3375          ; mapped                 ; 006F 0076     # 1.1  SQUARE OV
+3376          ; mapped                 ; 0070 0063     # 1.1  SQUARE PC
+3377          ; mapped                 ; 0064 006D     # 4.0  SQUARE DM
+3378          ; mapped                 ; 0064 006D 0032 #4.0  SQUARE DM SQUARED
+3379          ; mapped                 ; 0064 006D 0033 #4.0  SQUARE DM CUBED
+337A          ; mapped                 ; 0069 0075     # 4.0  SQUARE IU
+337B          ; mapped                 ; 5E73 6210     # 1.1  SQUARE ERA NAME HEISEI
+337C          ; mapped                 ; 662D 548C     # 1.1  SQUARE ERA NAME SYOUWA
+337D          ; mapped                 ; 5927 6B63     # 1.1  SQUARE ERA NAME TAISYOU
+337E          ; mapped                 ; 660E 6CBB     # 1.1  SQUARE ERA NAME MEIZI
+337F          ; mapped                 ; 682A 5F0F 4F1A 793E #1.1 SQUARE CORPORATION
+3380          ; mapped                 ; 0070 0061     # 1.1  SQUARE PA AMPS
+3381          ; mapped                 ; 006E 0061     # 1.1  SQUARE NA
+3382          ; mapped                 ; 03BC 0061     # 1.1  SQUARE MU A
+3383          ; mapped                 ; 006D 0061     # 1.1  SQUARE MA
+3384          ; mapped                 ; 006B 0061     # 1.1  SQUARE KA
+3385          ; mapped                 ; 006B 0062     # 1.1  SQUARE KB
+3386          ; mapped                 ; 006D 0062     # 1.1  SQUARE MB
+3387          ; mapped                 ; 0067 0062     # 1.1  SQUARE GB
+3388          ; mapped                 ; 0063 0061 006C #1.1  SQUARE CAL
+3389          ; mapped                 ; 006B 0063 0061 006C #1.1 SQUARE KCAL
+338A          ; mapped                 ; 0070 0066     # 1.1  SQUARE PF
+338B          ; mapped                 ; 006E 0066     # 1.1  SQUARE NF
+338C          ; mapped                 ; 03BC 0066     # 1.1  SQUARE MU F
+338D          ; mapped                 ; 03BC 0067     # 1.1  SQUARE MU G
+338E          ; mapped                 ; 006D 0067     # 1.1  SQUARE MG
+338F          ; mapped                 ; 006B 0067     # 1.1  SQUARE KG
+3390          ; mapped                 ; 0068 007A     # 1.1  SQUARE HZ
+3391          ; mapped                 ; 006B 0068 007A #1.1  SQUARE KHZ
+3392          ; mapped                 ; 006D 0068 007A #1.1  SQUARE MHZ
+3393          ; mapped                 ; 0067 0068 007A #1.1  SQUARE GHZ
+3394          ; mapped                 ; 0074 0068 007A #1.1  SQUARE THZ
+3395          ; mapped                 ; 03BC 006C     # 1.1  SQUARE MU L
+3396          ; mapped                 ; 006D 006C     # 1.1  SQUARE ML
+3397          ; mapped                 ; 0064 006C     # 1.1  SQUARE DL
+3398          ; mapped                 ; 006B 006C     # 1.1  SQUARE KL
+3399          ; mapped                 ; 0066 006D     # 1.1  SQUARE FM
+339A          ; mapped                 ; 006E 006D     # 1.1  SQUARE NM
+339B          ; mapped                 ; 03BC 006D     # 1.1  SQUARE MU M
+339C          ; mapped                 ; 006D 006D     # 1.1  SQUARE MM
+339D          ; mapped                 ; 0063 006D     # 1.1  SQUARE CM
+339E          ; mapped                 ; 006B 006D     # 1.1  SQUARE KM
+339F          ; mapped                 ; 006D 006D 0032 #1.1  SQUARE MM SQUARED
+33A0          ; mapped                 ; 0063 006D 0032 #1.1  SQUARE CM SQUARED
+33A1          ; mapped                 ; 006D 0032     # 1.1  SQUARE M SQUARED
+33A2          ; mapped                 ; 006B 006D 0032 #1.1  SQUARE KM SQUARED
+33A3          ; mapped                 ; 006D 006D 0033 #1.1  SQUARE MM CUBED
+33A4          ; mapped                 ; 0063 006D 0033 #1.1  SQUARE CM CUBED
+33A5          ; mapped                 ; 006D 0033     # 1.1  SQUARE M CUBED
+33A6          ; mapped                 ; 006B 006D 0033 #1.1  SQUARE KM CUBED
+33A7          ; mapped                 ; 006D 2215 0073 #1.1  SQUARE M OVER S
+33A8          ; mapped                 ; 006D 2215 0073 0032 #1.1 SQUARE M OVER S SQUARED
+33A9          ; mapped                 ; 0070 0061     # 1.1  SQUARE PA
+33AA          ; mapped                 ; 006B 0070 0061 #1.1  SQUARE KPA
+33AB          ; mapped                 ; 006D 0070 0061 #1.1  SQUARE MPA
+33AC          ; mapped                 ; 0067 0070 0061 #1.1  SQUARE GPA
+33AD          ; mapped                 ; 0072 0061 0064 #1.1  SQUARE RAD
+33AE          ; mapped                 ; 0072 0061 0064 2215 0073 #1.1 SQUARE RAD OVER S
+33AF          ; mapped                 ; 0072 0061 0064 2215 0073 0032 #1.1 SQUARE RAD OVER S SQUARED
+33B0          ; mapped                 ; 0070 0073     # 1.1  SQUARE PS
+33B1          ; mapped                 ; 006E 0073     # 1.1  SQUARE NS
+33B2          ; mapped                 ; 03BC 0073     # 1.1  SQUARE MU S
+33B3          ; mapped                 ; 006D 0073     # 1.1  SQUARE MS
+33B4          ; mapped                 ; 0070 0076     # 1.1  SQUARE PV
+33B5          ; mapped                 ; 006E 0076     # 1.1  SQUARE NV
+33B6          ; mapped                 ; 03BC 0076     # 1.1  SQUARE MU V
+33B7          ; mapped                 ; 006D 0076     # 1.1  SQUARE MV
+33B8          ; mapped                 ; 006B 0076     # 1.1  SQUARE KV
+33B9          ; mapped                 ; 006D 0076     # 1.1  SQUARE MV MEGA
+33BA          ; mapped                 ; 0070 0077     # 1.1  SQUARE PW
+33BB          ; mapped                 ; 006E 0077     # 1.1  SQUARE NW
+33BC          ; mapped                 ; 03BC 0077     # 1.1  SQUARE MU W
+33BD          ; mapped                 ; 006D 0077     # 1.1  SQUARE MW
+33BE          ; mapped                 ; 006B 0077     # 1.1  SQUARE KW
+33BF          ; mapped                 ; 006D 0077     # 1.1  SQUARE MW MEGA
+33C0          ; mapped                 ; 006B 03C9     # 1.1  SQUARE K OHM
+33C1          ; mapped                 ; 006D 03C9     # 1.1  SQUARE M OHM
+33C2          ; disallowed                             # 1.1  SQUARE AM
+33C3          ; mapped                 ; 0062 0071     # 1.1  SQUARE BQ
+33C4          ; mapped                 ; 0063 0063     # 1.1  SQUARE CC
+33C5          ; mapped                 ; 0063 0064     # 1.1  SQUARE CD
+33C6          ; mapped                 ; 0063 2215 006B 0067 #1.1 SQUARE C OVER KG
+33C7          ; disallowed                             # 1.1  SQUARE CO
+33C8          ; mapped                 ; 0064 0062     # 1.1  SQUARE DB
+33C9          ; mapped                 ; 0067 0079     # 1.1  SQUARE GY
+33CA          ; mapped                 ; 0068 0061     # 1.1  SQUARE HA
+33CB          ; mapped                 ; 0068 0070     # 1.1  SQUARE HP
+33CC          ; mapped                 ; 0069 006E     # 1.1  SQUARE IN
+33CD          ; mapped                 ; 006B 006B     # 1.1  SQUARE KK
+33CE          ; mapped                 ; 006B 006D     # 1.1  SQUARE KM CAPITAL
+33CF          ; mapped                 ; 006B 0074     # 1.1  SQUARE KT
+33D0          ; mapped                 ; 006C 006D     # 1.1  SQUARE LM
+33D1          ; mapped                 ; 006C 006E     # 1.1  SQUARE LN
+33D2          ; mapped                 ; 006C 006F 0067 #1.1  SQUARE LOG
+33D3          ; mapped                 ; 006C 0078     # 1.1  SQUARE LX
+33D4          ; mapped                 ; 006D 0062     # 1.1  SQUARE MB SMALL
+33D5          ; mapped                 ; 006D 0069 006C #1.1  SQUARE MIL
+33D6          ; mapped                 ; 006D 006F 006C #1.1  SQUARE MOL
+33D7          ; mapped                 ; 0070 0068     # 1.1  SQUARE PH
+33D8          ; disallowed                             # 1.1  SQUARE PM
+33D9          ; mapped                 ; 0070 0070 006D #1.1  SQUARE PPM
+33DA          ; mapped                 ; 0070 0072     # 1.1  SQUARE PR
+33DB          ; mapped                 ; 0073 0072     # 1.1  SQUARE SR
+33DC          ; mapped                 ; 0073 0076     # 1.1  SQUARE SV
+33DD          ; mapped                 ; 0077 0062     # 1.1  SQUARE WB
+33DE          ; mapped                 ; 0076 2215 006D #4.0  SQUARE V OVER M
+33DF          ; mapped                 ; 0061 2215 006D #4.0  SQUARE A OVER M
+33E0          ; mapped                 ; 0031 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE
+33E1          ; mapped                 ; 0032 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWO
+33E2          ; mapped                 ; 0033 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THREE
+33E3          ; mapped                 ; 0034 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOUR
+33E4          ; mapped                 ; 0035 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIVE
+33E5          ; mapped                 ; 0036 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIX
+33E6          ; mapped                 ; 0037 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVEN
+33E7          ; mapped                 ; 0038 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHT
+33E8          ; mapped                 ; 0039 65E5     # 1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINE
+33E9          ; mapped                 ; 0031 0030 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TEN
+33EA          ; mapped                 ; 0031 0031 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ELEVEN
+33EB          ; mapped                 ; 0031 0032 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWELVE
+33EC          ; mapped                 ; 0031 0033 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTEEN
+33ED          ; mapped                 ; 0031 0034 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOURTEEN
+33EE          ; mapped                 ; 0031 0035 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIFTEEN
+33EF          ; mapped                 ; 0031 0036 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIXTEEN
+33F0          ; mapped                 ; 0031 0037 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVENTEEN
+33F1          ; mapped                 ; 0031 0038 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHTEEN
+33F2          ; mapped                 ; 0031 0039 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINETEEN
+33F3          ; mapped                 ; 0032 0030 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY
+33F4          ; mapped                 ; 0032 0031 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-ONE
+33F5          ; mapped                 ; 0032 0032 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-TWO
+33F6          ; mapped                 ; 0032 0033 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-THREE
+33F7          ; mapped                 ; 0032 0034 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FOUR
+33F8          ; mapped                 ; 0032 0035 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FIVE
+33F9          ; mapped                 ; 0032 0036 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SIX
+33FA          ; mapped                 ; 0032 0037 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SEVEN
+33FB          ; mapped                 ; 0032 0038 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-EIGHT
+33FC          ; mapped                 ; 0032 0039 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-NINE
+33FD          ; mapped                 ; 0033 0030 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY
+33FE          ; mapped                 ; 0033 0031 65E5 #1.1  IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE
+33FF          ; mapped                 ; 0067 0061 006C #4.0  SQUARE GAL
+3400..4DB5    ; valid                                  # 3.0  CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
+4DB6..4DBF    ; valid                                  # 13.0 CJK UNIFIED IDEOGRAPH-4DB6..CJK UNIFIED IDEOGRAPH-4DBF
+4DC0..4DFF    ; valid                  ;      ; NV8    # 4.0  HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION
+4E00..9FA5    ; valid                                  # 1.1  CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FA5
+9FA6..9FBB    ; valid                                  # 4.1  CJK UNIFIED IDEOGRAPH-9FA6..CJK UNIFIED IDEOGRAPH-9FBB
+9FBC..9FC3    ; valid                                  # 5.1  CJK UNIFIED IDEOGRAPH-9FBC..CJK UNIFIED IDEOGRAPH-9FC3
+9FC4..9FCB    ; valid                                  # 5.2  CJK UNIFIED IDEOGRAPH-9FC4..CJK UNIFIED IDEOGRAPH-9FCB
+9FCC          ; valid                                  # 6.1  CJK UNIFIED IDEOGRAPH-9FCC
+9FCD..9FD5    ; valid                                  # 8.0  CJK UNIFIED IDEOGRAPH-9FCD..CJK UNIFIED IDEOGRAPH-9FD5
+9FD6..9FEA    ; valid                                  # 10.0 CJK UNIFIED IDEOGRAPH-9FD6..CJK UNIFIED IDEOGRAPH-9FEA
+9FEB..9FEF    ; valid                                  # 11.0 CJK UNIFIED IDEOGRAPH-9FEB..CJK UNIFIED IDEOGRAPH-9FEF
+9FF0..9FFC    ; valid                                  # 13.0 CJK UNIFIED IDEOGRAPH-9FF0..CJK UNIFIED IDEOGRAPH-9FFC
+9FFD..9FFF    ; disallowed                             # NA   <reserved-9FFD>..<reserved-9FFF>
+A000..A48C    ; valid                                  # 3.0  YI SYLLABLE IT..YI SYLLABLE YYR
+A48D..A48F    ; disallowed                             # NA   <reserved-A48D>..<reserved-A48F>
+A490..A4A1    ; valid                  ;      ; NV8    # 3.0  YI RADICAL QOT..YI RADICAL GA
+A4A2..A4A3    ; valid                  ;      ; NV8    # 3.2  YI RADICAL ZUP..YI RADICAL CYT
+A4A4..A4B3    ; valid                  ;      ; NV8    # 3.0  YI RADICAL DDUR..YI RADICAL JO
+A4B4          ; valid                  ;      ; NV8    # 3.2  YI RADICAL NZUP
+A4B5..A4C0    ; valid                  ;      ; NV8    # 3.0  YI RADICAL JJY..YI RADICAL SHAT
+A4C1          ; valid                  ;      ; NV8    # 3.2  YI RADICAL ZUR
+A4C2..A4C4    ; valid                  ;      ; NV8    # 3.0  YI RADICAL SHOP..YI RADICAL ZZIET
+A4C5          ; valid                  ;      ; NV8    # 3.2  YI RADICAL NBIE
+A4C6          ; valid                  ;      ; NV8    # 3.0  YI RADICAL KE
+A4C7..A4CF    ; disallowed                             # NA   <reserved-A4C7>..<reserved-A4CF>
+A4D0..A4FD    ; valid                                  # 5.2  LISU LETTER BA..LISU LETTER TONE MYA JEU
+A4FE..A4FF    ; valid                  ;      ; NV8    # 5.2  LISU PUNCTUATION COMMA..LISU PUNCTUATION FULL STOP
+A500..A60C    ; valid                                  # 5.1  VAI SYLLABLE EE..VAI SYLLABLE LENGTHENER
+A60D..A60F    ; valid                  ;      ; NV8    # 5.1  VAI COMMA..VAI QUESTION MARK
+A610..A62B    ; valid                                  # 5.1  VAI SYLLABLE NDOLE FA..VAI SYLLABLE NDOLE DO
+A62C..A63F    ; disallowed                             # NA   <reserved-A62C>..<reserved-A63F>
+A640          ; mapped                 ; A641          # 5.1  CYRILLIC CAPITAL LETTER ZEMLYA
+A641          ; valid                                  # 5.1  CYRILLIC SMALL LETTER ZEMLYA
+A642          ; mapped                 ; A643          # 5.1  CYRILLIC CAPITAL LETTER DZELO
+A643          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DZELO
+A644          ; mapped                 ; A645          # 5.1  CYRILLIC CAPITAL LETTER REVERSED DZE
+A645          ; valid                                  # 5.1  CYRILLIC SMALL LETTER REVERSED DZE
+A646          ; mapped                 ; A647          # 5.1  CYRILLIC CAPITAL LETTER IOTA
+A647          ; valid                                  # 5.1  CYRILLIC SMALL LETTER IOTA
+A648          ; mapped                 ; A649          # 5.1  CYRILLIC CAPITAL LETTER DJERV
+A649          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DJERV
+A64A          ; mapped                 ; A64B          # 5.1  CYRILLIC CAPITAL LETTER MONOGRAPH UK
+A64B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER MONOGRAPH UK
+A64C          ; mapped                 ; A64D          # 5.1  CYRILLIC CAPITAL LETTER BROAD OMEGA
+A64D          ; valid                                  # 5.1  CYRILLIC SMALL LETTER BROAD OMEGA
+A64E          ; mapped                 ; A64F          # 5.1  CYRILLIC CAPITAL LETTER NEUTRAL YER
+A64F          ; valid                                  # 5.1  CYRILLIC SMALL LETTER NEUTRAL YER
+A650          ; mapped                 ; A651          # 5.1  CYRILLIC CAPITAL LETTER YERU WITH BACK YER
+A651          ; valid                                  # 5.1  CYRILLIC SMALL LETTER YERU WITH BACK YER
+A652          ; mapped                 ; A653          # 5.1  CYRILLIC CAPITAL LETTER IOTIFIED YAT
+A653          ; valid                                  # 5.1  CYRILLIC SMALL LETTER IOTIFIED YAT
+A654          ; mapped                 ; A655          # 5.1  CYRILLIC CAPITAL LETTER REVERSED YU
+A655          ; valid                                  # 5.1  CYRILLIC SMALL LETTER REVERSED YU
+A656          ; mapped                 ; A657          # 5.1  CYRILLIC CAPITAL LETTER IOTIFIED A
+A657          ; valid                                  # 5.1  CYRILLIC SMALL LETTER IOTIFIED A
+A658          ; mapped                 ; A659          # 5.1  CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
+A659          ; valid                                  # 5.1  CYRILLIC SMALL LETTER CLOSED LITTLE YUS
+A65A          ; mapped                 ; A65B          # 5.1  CYRILLIC CAPITAL LETTER BLENDED YUS
+A65B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER BLENDED YUS
+A65C          ; mapped                 ; A65D          # 5.1  CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS
+A65D          ; valid                                  # 5.1  CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS
+A65E          ; mapped                 ; A65F          # 5.1  CYRILLIC CAPITAL LETTER YN
+A65F          ; valid                                  # 5.1  CYRILLIC SMALL LETTER YN
+A660          ; mapped                 ; A661          # 6.0  CYRILLIC CAPITAL LETTER REVERSED TSE
+A661          ; valid                                  # 6.0  CYRILLIC SMALL LETTER REVERSED TSE
+A662          ; mapped                 ; A663          # 5.1  CYRILLIC CAPITAL LETTER SOFT DE
+A663          ; valid                                  # 5.1  CYRILLIC SMALL LETTER SOFT DE
+A664          ; mapped                 ; A665          # 5.1  CYRILLIC CAPITAL LETTER SOFT EL
+A665          ; valid                                  # 5.1  CYRILLIC SMALL LETTER SOFT EL
+A666          ; mapped                 ; A667          # 5.1  CYRILLIC CAPITAL LETTER SOFT EM
+A667          ; valid                                  # 5.1  CYRILLIC SMALL LETTER SOFT EM
+A668          ; mapped                 ; A669          # 5.1  CYRILLIC CAPITAL LETTER MONOCULAR O
+A669          ; valid                                  # 5.1  CYRILLIC SMALL LETTER MONOCULAR O
+A66A          ; mapped                 ; A66B          # 5.1  CYRILLIC CAPITAL LETTER BINOCULAR O
+A66B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER BINOCULAR O
+A66C          ; mapped                 ; A66D          # 5.1  CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
+A66D..A66F    ; valid                                  # 5.1  CYRILLIC SMALL LETTER DOUBLE MONOCULAR O..COMBINING CYRILLIC VZMET
+A670..A673    ; valid                  ;      ; NV8    # 5.1  COMBINING CYRILLIC TEN MILLIONS SIGN..SLAVONIC ASTERISK
+A674..A67B    ; valid                                  # 6.1  COMBINING CYRILLIC LETTER UKRAINIAN IE..COMBINING CYRILLIC LETTER OMEGA
+A67C..A67D    ; valid                                  # 5.1  COMBINING CYRILLIC KAVYKA..COMBINING CYRILLIC PAYEROK
+A67E          ; valid                  ;      ; NV8    # 5.1  CYRILLIC KAVYKA
+A67F          ; valid                                  # 5.1  CYRILLIC PAYEROK
+A680          ; mapped                 ; A681          # 5.1  CYRILLIC CAPITAL LETTER DWE
+A681          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DWE
+A682          ; mapped                 ; A683          # 5.1  CYRILLIC CAPITAL LETTER DZWE
+A683          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DZWE
+A684          ; mapped                 ; A685          # 5.1  CYRILLIC CAPITAL LETTER ZHWE
+A685          ; valid                                  # 5.1  CYRILLIC SMALL LETTER ZHWE
+A686          ; mapped                 ; A687          # 5.1  CYRILLIC CAPITAL LETTER CCHE
+A687          ; valid                                  # 5.1  CYRILLIC SMALL LETTER CCHE
+A688          ; mapped                 ; A689          # 5.1  CYRILLIC CAPITAL LETTER DZZE
+A689          ; valid                                  # 5.1  CYRILLIC SMALL LETTER DZZE
+A68A          ; mapped                 ; A68B          # 5.1  CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
+A68B          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK
+A68C          ; mapped                 ; A68D          # 5.1  CYRILLIC CAPITAL LETTER TWE
+A68D          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TWE
+A68E          ; mapped                 ; A68F          # 5.1  CYRILLIC CAPITAL LETTER TSWE
+A68F          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TSWE
+A690          ; mapped                 ; A691          # 5.1  CYRILLIC CAPITAL LETTER TSSE
+A691          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TSSE
+A692          ; mapped                 ; A693          # 5.1  CYRILLIC CAPITAL LETTER TCHE
+A693          ; valid                                  # 5.1  CYRILLIC SMALL LETTER TCHE
+A694          ; mapped                 ; A695          # 5.1  CYRILLIC CAPITAL LETTER HWE
+A695          ; valid                                  # 5.1  CYRILLIC SMALL LETTER HWE
+A696          ; mapped                 ; A697          # 5.1  CYRILLIC CAPITAL LETTER SHWE
+A697          ; valid                                  # 5.1  CYRILLIC SMALL LETTER SHWE
+A698          ; mapped                 ; A699          # 7.0  CYRILLIC CAPITAL LETTER DOUBLE O
+A699          ; valid                                  # 7.0  CYRILLIC SMALL LETTER DOUBLE O
+A69A          ; mapped                 ; A69B          # 7.0  CYRILLIC CAPITAL LETTER CROSSED O
+A69B          ; valid                                  # 7.0  CYRILLIC SMALL LETTER CROSSED O
+A69C          ; mapped                 ; 044A          # 7.0  MODIFIER LETTER CYRILLIC HARD SIGN
+A69D          ; mapped                 ; 044C          # 7.0  MODIFIER LETTER CYRILLIC SOFT SIGN
+A69E          ; valid                                  # 8.0  COMBINING CYRILLIC LETTER EF
+A69F          ; valid                                  # 6.1  COMBINING CYRILLIC LETTER IOTIFIED E
+A6A0..A6E5    ; valid                                  # 5.2  BAMUM LETTER A..BAMUM LETTER KI
+A6E6..A6EF    ; valid                  ;      ; NV8    # 5.2  BAMUM LETTER MO..BAMUM LETTER KOGHOM
+A6F0..A6F1    ; valid                                  # 5.2  BAMUM COMBINING MARK KOQNDON..BAMUM COMBINING MARK TUKWENTIS
+A6F2..A6F7    ; valid                  ;      ; NV8    # 5.2  BAMUM NJAEMLI..BAMUM QUESTION MARK
+A6F8..A6FF    ; disallowed                             # NA   <reserved-A6F8>..<reserved-A6FF>
+A700..A716    ; valid                  ;      ; NV8    # 4.1  MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR
+A717..A71A    ; valid                                  # 5.0  MODIFIER LETTER DOT VERTICAL BAR..MODIFIER LETTER LOWER RIGHT CORNER ANGLE
+A71B..A71F    ; valid                                  # 5.1  MODIFIER LETTER RAISED UP ARROW..MODIFIER LETTER LOW INVERTED EXCLAMATION MARK
+A720..A721    ; valid                  ;      ; NV8    # 5.0  MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE
+A722          ; mapped                 ; A723          # 5.1  LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
+A723          ; valid                                  # 5.1  LATIN SMALL LETTER EGYPTOLOGICAL ALEF
+A724          ; mapped                 ; A725          # 5.1  LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
+A725          ; valid                                  # 5.1  LATIN SMALL LETTER EGYPTOLOGICAL AIN
+A726          ; mapped                 ; A727          # 5.1  LATIN CAPITAL LETTER HENG
+A727          ; valid                                  # 5.1  LATIN SMALL LETTER HENG
+A728          ; mapped                 ; A729          # 5.1  LATIN CAPITAL LETTER TZ
+A729          ; valid                                  # 5.1  LATIN SMALL LETTER TZ
+A72A          ; mapped                 ; A72B          # 5.1  LATIN CAPITAL LETTER TRESILLO
+A72B          ; valid                                  # 5.1  LATIN SMALL LETTER TRESILLO
+A72C          ; mapped                 ; A72D          # 5.1  LATIN CAPITAL LETTER CUATRILLO
+A72D          ; valid                                  # 5.1  LATIN SMALL LETTER CUATRILLO
+A72E          ; mapped                 ; A72F          # 5.1  LATIN CAPITAL LETTER CUATRILLO WITH COMMA
+A72F..A731    ; valid                                  # 5.1  LATIN SMALL LETTER CUATRILLO WITH COMMA..LATIN LETTER SMALL CAPITAL S
+A732          ; mapped                 ; A733          # 5.1  LATIN CAPITAL LETTER AA
+A733          ; valid                                  # 5.1  LATIN SMALL LETTER AA
+A734          ; mapped                 ; A735          # 5.1  LATIN CAPITAL LETTER AO
+A735          ; valid                                  # 5.1  LATIN SMALL LETTER AO
+A736          ; mapped                 ; A737          # 5.1  LATIN CAPITAL LETTER AU
+A737          ; valid                                  # 5.1  LATIN SMALL LETTER AU
+A738          ; mapped                 ; A739          # 5.1  LATIN CAPITAL LETTER AV
+A739          ; valid                                  # 5.1  LATIN SMALL LETTER AV
+A73A          ; mapped                 ; A73B          # 5.1  LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
+A73B          ; valid                                  # 5.1  LATIN SMALL LETTER AV WITH HORIZONTAL BAR
+A73C          ; mapped                 ; A73D          # 5.1  LATIN CAPITAL LETTER AY
+A73D          ; valid                                  # 5.1  LATIN SMALL LETTER AY
+A73E          ; mapped                 ; A73F          # 5.1  LATIN CAPITAL LETTER REVERSED C WITH DOT
+A73F          ; valid                                  # 5.1  LATIN SMALL LETTER REVERSED C WITH DOT
+A740          ; mapped                 ; A741          # 5.1  LATIN CAPITAL LETTER K WITH STROKE
+A741          ; valid                                  # 5.1  LATIN SMALL LETTER K WITH STROKE
+A742          ; mapped                 ; A743          # 5.1  LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
+A743          ; valid                                  # 5.1  LATIN SMALL LETTER K WITH DIAGONAL STROKE
+A744          ; mapped                 ; A745          # 5.1  LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
+A745          ; valid                                  # 5.1  LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE
+A746          ; mapped                 ; A747          # 5.1  LATIN CAPITAL LETTER BROKEN L
+A747          ; valid                                  # 5.1  LATIN SMALL LETTER BROKEN L
+A748          ; mapped                 ; A749          # 5.1  LATIN CAPITAL LETTER L WITH HIGH STROKE
+A749          ; valid                                  # 5.1  LATIN SMALL LETTER L WITH HIGH STROKE
+A74A          ; mapped                 ; A74B          # 5.1  LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
+A74B          ; valid                                  # 5.1  LATIN SMALL LETTER O WITH LONG STROKE OVERLAY
+A74C          ; mapped                 ; A74D          # 5.1  LATIN CAPITAL LETTER O WITH LOOP
+A74D          ; valid                                  # 5.1  LATIN SMALL LETTER O WITH LOOP
+A74E          ; mapped                 ; A74F          # 5.1  LATIN CAPITAL LETTER OO
+A74F          ; valid                                  # 5.1  LATIN SMALL LETTER OO
+A750          ; mapped                 ; A751          # 5.1  LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
+A751          ; valid                                  # 5.1  LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER
+A752          ; mapped                 ; A753          # 5.1  LATIN CAPITAL LETTER P WITH FLOURISH
+A753          ; valid                                  # 5.1  LATIN SMALL LETTER P WITH FLOURISH
+A754          ; mapped                 ; A755          # 5.1  LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
+A755          ; valid                                  # 5.1  LATIN SMALL LETTER P WITH SQUIRREL TAIL
+A756          ; mapped                 ; A757          # 5.1  LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
+A757          ; valid                                  # 5.1  LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER
+A758          ; mapped                 ; A759          # 5.1  LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
+A759          ; valid                                  # 5.1  LATIN SMALL LETTER Q WITH DIAGONAL STROKE
+A75A          ; mapped                 ; A75B          # 5.1  LATIN CAPITAL LETTER R ROTUNDA
+A75B          ; valid                                  # 5.1  LATIN SMALL LETTER R ROTUNDA
+A75C          ; mapped                 ; A75D          # 5.1  LATIN CAPITAL LETTER RUM ROTUNDA
+A75D          ; valid                                  # 5.1  LATIN SMALL LETTER RUM ROTUNDA
+A75E          ; mapped                 ; A75F          # 5.1  LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
+A75F          ; valid                                  # 5.1  LATIN SMALL LETTER V WITH DIAGONAL STROKE
+A760          ; mapped                 ; A761          # 5.1  LATIN CAPITAL LETTER VY
+A761          ; valid                                  # 5.1  LATIN SMALL LETTER VY
+A762          ; mapped                 ; A763          # 5.1  LATIN CAPITAL LETTER VISIGOTHIC Z
+A763          ; valid                                  # 5.1  LATIN SMALL LETTER VISIGOTHIC Z
+A764          ; mapped                 ; A765          # 5.1  LATIN CAPITAL LETTER THORN WITH STROKE
+A765          ; valid                                  # 5.1  LATIN SMALL LETTER THORN WITH STROKE
+A766          ; mapped                 ; A767          # 5.1  LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER
+A767          ; valid                                  # 5.1  LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER
+A768          ; mapped                 ; A769          # 5.1  LATIN CAPITAL LETTER VEND
+A769          ; valid                                  # 5.1  LATIN SMALL LETTER VEND
+A76A          ; mapped                 ; A76B          # 5.1  LATIN CAPITAL LETTER ET
+A76B          ; valid                                  # 5.1  LATIN SMALL LETTER ET
+A76C          ; mapped                 ; A76D          # 5.1  LATIN CAPITAL LETTER IS
+A76D          ; valid                                  # 5.1  LATIN SMALL LETTER IS
+A76E          ; mapped                 ; A76F          # 5.1  LATIN CAPITAL LETTER CON
+A76F          ; valid                                  # 5.1  LATIN SMALL LETTER CON
+A770          ; mapped                 ; A76F          # 5.1  MODIFIER LETTER US
+A771..A778    ; valid                                  # 5.1  LATIN SMALL LETTER DUM..LATIN SMALL LETTER UM
+A779          ; mapped                 ; A77A          # 5.1  LATIN CAPITAL LETTER INSULAR D
+A77A          ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR D
+A77B          ; mapped                 ; A77C          # 5.1  LATIN CAPITAL LETTER INSULAR F
+A77C          ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR F
+A77D          ; mapped                 ; 1D79          # 5.1  LATIN CAPITAL LETTER INSULAR G
+A77E          ; mapped                 ; A77F          # 5.1  LATIN CAPITAL LETTER TURNED INSULAR G
+A77F          ; valid                                  # 5.1  LATIN SMALL LETTER TURNED INSULAR G
+A780          ; mapped                 ; A781          # 5.1  LATIN CAPITAL LETTER TURNED L
+A781          ; valid                                  # 5.1  LATIN SMALL LETTER TURNED L
+A782          ; mapped                 ; A783          # 5.1  LATIN CAPITAL LETTER INSULAR R
+A783          ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR R
+A784          ; mapped                 ; A785          # 5.1  LATIN CAPITAL LETTER INSULAR S
+A785          ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR S
+A786          ; mapped                 ; A787          # 5.1  LATIN CAPITAL LETTER INSULAR T
+A787..A788    ; valid                                  # 5.1  LATIN SMALL LETTER INSULAR T..MODIFIER LETTER LOW CIRCUMFLEX ACCENT
+A789..A78A    ; valid                  ;      ; NV8    # 5.1  MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN
+A78B          ; mapped                 ; A78C          # 5.1  LATIN CAPITAL LETTER SALTILLO
+A78C          ; valid                                  # 5.1  LATIN SMALL LETTER SALTILLO
+A78D          ; mapped                 ; 0265          # 6.0  LATIN CAPITAL LETTER TURNED H
+A78E          ; valid                                  # 6.0  LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
+A78F          ; valid                                  # 8.0  LATIN LETTER SINOLOGICAL DOT
+A790          ; mapped                 ; A791          # 6.0  LATIN CAPITAL LETTER N WITH DESCENDER
+A791          ; valid                                  # 6.0  LATIN SMALL LETTER N WITH DESCENDER
+A792          ; mapped                 ; A793          # 6.1  LATIN CAPITAL LETTER C WITH BAR
+A793          ; valid                                  # 6.1  LATIN SMALL LETTER C WITH BAR
+A794..A795    ; valid                                  # 7.0  LATIN SMALL LETTER C WITH PALATAL HOOK..LATIN SMALL LETTER H WITH PALATAL HOOK
+A796          ; mapped                 ; A797          # 7.0  LATIN CAPITAL LETTER B WITH FLOURISH
+A797          ; valid                                  # 7.0  LATIN SMALL LETTER B WITH FLOURISH
+A798          ; mapped                 ; A799          # 7.0  LATIN CAPITAL LETTER F WITH STROKE
+A799          ; valid                                  # 7.0  LATIN SMALL LETTER F WITH STROKE
+A79A          ; mapped                 ; A79B          # 7.0  LATIN CAPITAL LETTER VOLAPUK AE
+A79B          ; valid                                  # 7.0  LATIN SMALL LETTER VOLAPUK AE
+A79C          ; mapped                 ; A79D          # 7.0  LATIN CAPITAL LETTER VOLAPUK OE
+A79D          ; valid                                  # 7.0  LATIN SMALL LETTER VOLAPUK OE
+A79E          ; mapped                 ; A79F          # 7.0  LATIN CAPITAL LETTER VOLAPUK UE
+A79F          ; valid                                  # 7.0  LATIN SMALL LETTER VOLAPUK UE
+A7A0          ; mapped                 ; A7A1          # 6.0  LATIN CAPITAL LETTER G WITH OBLIQUE STROKE
+A7A1          ; valid                                  # 6.0  LATIN SMALL LETTER G WITH OBLIQUE STROKE
+A7A2          ; mapped                 ; A7A3          # 6.0  LATIN CAPITAL LETTER K WITH OBLIQUE STROKE
+A7A3          ; valid                                  # 6.0  LATIN SMALL LETTER K WITH OBLIQUE STROKE
+A7A4          ; mapped                 ; A7A5          # 6.0  LATIN CAPITAL LETTER N WITH OBLIQUE STROKE
+A7A5          ; valid                                  # 6.0  LATIN SMALL LETTER N WITH OBLIQUE STROKE
+A7A6          ; mapped                 ; A7A7          # 6.0  LATIN CAPITAL LETTER R WITH OBLIQUE STROKE
+A7A7          ; valid                                  # 6.0  LATIN SMALL LETTER R WITH OBLIQUE STROKE
+A7A8          ; mapped                 ; A7A9          # 6.0  LATIN CAPITAL LETTER S WITH OBLIQUE STROKE
+A7A9          ; valid                                  # 6.0  LATIN SMALL LETTER S WITH OBLIQUE STROKE
+A7AA          ; mapped                 ; 0266          # 6.1  LATIN CAPITAL LETTER H WITH HOOK
+A7AB          ; mapped                 ; 025C          # 7.0  LATIN CAPITAL LETTER REVERSED OPEN E
+A7AC          ; mapped                 ; 0261          # 7.0  LATIN CAPITAL LETTER SCRIPT G
+A7AD          ; mapped                 ; 026C          # 7.0  LATIN CAPITAL LETTER L WITH BELT
+A7AE          ; mapped                 ; 026A          # 9.0  LATIN CAPITAL LETTER SMALL CAPITAL I
+A7AF          ; valid                                  # 11.0 LATIN LETTER SMALL CAPITAL Q
+A7B0          ; mapped                 ; 029E          # 7.0  LATIN CAPITAL LETTER TURNED K
+A7B1          ; mapped                 ; 0287          # 7.0  LATIN CAPITAL LETTER TURNED T
+A7B2          ; mapped                 ; 029D          # 8.0  LATIN CAPITAL LETTER J WITH CROSSED-TAIL
+A7B3          ; mapped                 ; AB53          # 8.0  LATIN CAPITAL LETTER CHI
+A7B4          ; mapped                 ; A7B5          # 8.0  LATIN CAPITAL LETTER BETA
+A7B5          ; valid                                  # 8.0  LATIN SMALL LETTER BETA
+A7B6          ; mapped                 ; A7B7          # 8.0  LATIN CAPITAL LETTER OMEGA
+A7B7          ; valid                                  # 8.0  LATIN SMALL LETTER OMEGA
+A7B8          ; mapped                 ; A7B9          # 11.0 LATIN CAPITAL LETTER U WITH STROKE
+A7B9          ; valid                                  # 11.0 LATIN SMALL LETTER U WITH STROKE
+A7BA          ; mapped                 ; A7BB          # 12.0 LATIN CAPITAL LETTER GLOTTAL A
+A7BB          ; valid                                  # 12.0 LATIN SMALL LETTER GLOTTAL A
+A7BC          ; mapped                 ; A7BD          # 12.0 LATIN CAPITAL LETTER GLOTTAL I
+A7BD          ; valid                                  # 12.0 LATIN SMALL LETTER GLOTTAL I
+A7BE          ; mapped                 ; A7BF          # 12.0 LATIN CAPITAL LETTER GLOTTAL U
+A7BF          ; valid                                  # 12.0 LATIN SMALL LETTER GLOTTAL U
+A7C0..A7C1    ; disallowed                             # NA   <reserved-A7C0>..<reserved-A7C1>
+A7C2          ; mapped                 ; A7C3          # 12.0 LATIN CAPITAL LETTER ANGLICANA W
+A7C3          ; valid                                  # 12.0 LATIN SMALL LETTER ANGLICANA W
+A7C4          ; mapped                 ; A794          # 12.0 LATIN CAPITAL LETTER C WITH PALATAL HOOK
+A7C5          ; mapped                 ; 0282          # 12.0 LATIN CAPITAL LETTER S WITH HOOK
+A7C6          ; mapped                 ; 1D8E          # 12.0 LATIN CAPITAL LETTER Z WITH PALATAL HOOK
+A7C7          ; mapped                 ; A7C8          # 13.0 LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
+A7C8          ; valid                                  # 13.0 LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY
+A7C9          ; mapped                 ; A7CA          # 13.0 LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
+A7CA          ; valid                                  # 13.0 LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
+A7CB..A7F4    ; disallowed                             # NA   <reserved-A7CB>..<reserved-A7F4>
+A7F5          ; mapped                 ; A7F6          # 13.0 LATIN CAPITAL LETTER REVERSED HALF H
+A7F6          ; valid                                  # 13.0 LATIN SMALL LETTER REVERSED HALF H
+A7F7          ; valid                                  # 7.0  LATIN EPIGRAPHIC LETTER SIDEWAYS I
+A7F8          ; mapped                 ; 0127          # 6.1  MODIFIER LETTER CAPITAL H WITH STROKE
+A7F9          ; mapped                 ; 0153          # 6.1  MODIFIER LETTER SMALL LIGATURE OE
+A7FA          ; valid                                  # 6.0  LATIN LETTER SMALL CAPITAL TURNED M
+A7FB..A7FF    ; valid                                  # 5.1  LATIN EPIGRAPHIC LETTER REVERSED F..LATIN EPIGRAPHIC LETTER ARCHAIC M
+A800..A827    ; valid                                  # 4.1  SYLOTI NAGRI LETTER A..SYLOTI NAGRI VOWEL SIGN OO
+A828..A82B    ; valid                  ;      ; NV8    # 4.1  SYLOTI NAGRI POETRY MARK-1..SYLOTI NAGRI POETRY MARK-4
+A82C          ; valid                                  # 13.0 SYLOTI NAGRI SIGN ALTERNATE HASANTA
+A82D..A82F    ; disallowed                             # NA   <reserved-A82D>..<reserved-A82F>
+A830..A839    ; valid                  ;      ; NV8    # 5.2  NORTH INDIC FRACTION ONE QUARTER..NORTH INDIC QUANTITY MARK
+A83A..A83F    ; disallowed                             # NA   <reserved-A83A>..<reserved-A83F>
+A840..A873    ; valid                                  # 5.0  PHAGS-PA LETTER KA..PHAGS-PA LETTER CANDRABINDU
+A874..A877    ; valid                  ;      ; NV8    # 5.0  PHAGS-PA SINGLE HEAD MARK..PHAGS-PA MARK DOUBLE SHAD
+A878..A87F    ; disallowed                             # NA   <reserved-A878>..<reserved-A87F>
+A880..A8C4    ; valid                                  # 5.1  SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VIRAMA
+A8C5          ; valid                                  # 9.0  SAURASHTRA SIGN CANDRABINDU
+A8C6..A8CD    ; disallowed                             # NA   <reserved-A8C6>..<reserved-A8CD>
+A8CE..A8CF    ; valid                  ;      ; NV8    # 5.1  SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA
+A8D0..A8D9    ; valid                                  # 5.1  SAURASHTRA DIGIT ZERO..SAURASHTRA DIGIT NINE
+A8DA..A8DF    ; disallowed                             # NA   <reserved-A8DA>..<reserved-A8DF>
+A8E0..A8F7    ; valid                                  # 5.2  COMBINING DEVANAGARI DIGIT ZERO..DEVANAGARI SIGN CANDRABINDU AVAGRAHA
+A8F8..A8FA    ; valid                  ;      ; NV8    # 5.2  DEVANAGARI SIGN PUSHPIKA..DEVANAGARI CARET
+A8FB          ; valid                                  # 5.2  DEVANAGARI HEADSTROKE
+A8FC          ; valid                  ;      ; NV8    # 8.0  DEVANAGARI SIGN SIDDHAM
+A8FD          ; valid                                  # 8.0  DEVANAGARI JAIN OM
+A8FE..A8FF    ; valid                                  # 11.0 DEVANAGARI LETTER AY..DEVANAGARI VOWEL SIGN AY
+A900..A92D    ; valid                                  # 5.1  KAYAH LI DIGIT ZERO..KAYAH LI TONE CALYA PLOPHU
+A92E..A92F    ; valid                  ;      ; NV8    # 5.1  KAYAH LI SIGN CWI..KAYAH LI SIGN SHYA
+A930..A953    ; valid                                  # 5.1  REJANG LETTER KA..REJANG VIRAMA
+A954..A95E    ; disallowed                             # NA   <reserved-A954>..<reserved-A95E>
+A95F          ; valid                  ;      ; NV8    # 5.1  REJANG SECTION MARK
+A960..A97C    ; valid                  ;      ; NV8    # 5.2  HANGUL CHOSEONG TIKEUT-MIEUM..HANGUL CHOSEONG SSANGYEORINHIEUH
+A97D..A97F    ; disallowed                             # NA   <reserved-A97D>..<reserved-A97F>
+A980..A9C0    ; valid                                  # 5.2  JAVANESE SIGN PANYANGGA..JAVANESE PANGKON
+A9C1..A9CD    ; valid                  ;      ; NV8    # 5.2  JAVANESE LEFT RERENGGAN..JAVANESE TURNED PADA PISELEH
+A9CE          ; disallowed                             # NA   <reserved-A9CE>
+A9CF..A9D9    ; valid                                  # 5.2  JAVANESE PANGRANGKEP..JAVANESE DIGIT NINE
+A9DA..A9DD    ; disallowed                             # NA   <reserved-A9DA>..<reserved-A9DD>
+A9DE..A9DF    ; valid                  ;      ; NV8    # 5.2  JAVANESE PADA TIRTA TUMETES..JAVANESE PADA ISEN-ISEN
+A9E0..A9FE    ; valid                                  # 7.0  MYANMAR LETTER SHAN GHA..MYANMAR LETTER TAI LAING BHA
+A9FF          ; disallowed                             # NA   <reserved-A9FF>
+AA00..AA36    ; valid                                  # 5.1  CHAM LETTER A..CHAM CONSONANT SIGN WA
+AA37..AA3F    ; disallowed                             # NA   <reserved-AA37>..<reserved-AA3F>
+AA40..AA4D    ; valid                                  # 5.1  CHAM LETTER FINAL K..CHAM CONSONANT SIGN FINAL H
+AA4E..AA4F    ; disallowed                             # NA   <reserved-AA4E>..<reserved-AA4F>
+AA50..AA59    ; valid                                  # 5.1  CHAM DIGIT ZERO..CHAM DIGIT NINE
+AA5A..AA5B    ; disallowed                             # NA   <reserved-AA5A>..<reserved-AA5B>
+AA5C..AA5F    ; valid                  ;      ; NV8    # 5.1  CHAM PUNCTUATION SPIRAL..CHAM PUNCTUATION TRIPLE DANDA
+AA60..AA76    ; valid                                  # 5.2  MYANMAR LETTER KHAMTI GA..MYANMAR LOGOGRAM KHAMTI HM
+AA77..AA79    ; valid                  ;      ; NV8    # 5.2  MYANMAR SYMBOL AITON EXCLAMATION..MYANMAR SYMBOL AITON TWO
+AA7A..AA7B    ; valid                                  # 5.2  MYANMAR LETTER AITON RA..MYANMAR SIGN PAO KAREN TONE
+AA7C..AA7F    ; valid                                  # 7.0  MYANMAR SIGN TAI LAING TONE-2..MYANMAR LETTER SHWE PALAUNG SHA
+AA80..AAC2    ; valid                                  # 5.2  TAI VIET LETTER LOW KO..TAI VIET TONE MAI SONG
+AAC3..AADA    ; disallowed                             # NA   <reserved-AAC3>..<reserved-AADA>
+AADB..AADD    ; valid                                  # 5.2  TAI VIET SYMBOL KON..TAI VIET SYMBOL SAM
+AADE..AADF    ; valid                  ;      ; NV8    # 5.2  TAI VIET SYMBOL HO HOI..TAI VIET SYMBOL KOI KOI
+AAE0..AAEF    ; valid                                  # 6.1  MEETEI MAYEK LETTER E..MEETEI MAYEK VOWEL SIGN AAU
+AAF0..AAF1    ; valid                  ;      ; NV8    # 6.1  MEETEI MAYEK CHEIKHAN..MEETEI MAYEK AHANG KHUDAM
+AAF2..AAF6    ; valid                                  # 6.1  MEETEI MAYEK ANJI..MEETEI MAYEK VIRAMA
+AAF7..AB00    ; disallowed                             # NA   <reserved-AAF7>..<reserved-AB00>
+AB01..AB06    ; valid                                  # 6.0  ETHIOPIC SYLLABLE TTHU..ETHIOPIC SYLLABLE TTHO
+AB07..AB08    ; disallowed                             # NA   <reserved-AB07>..<reserved-AB08>
+AB09..AB0E    ; valid                                  # 6.0  ETHIOPIC SYLLABLE DDHU..ETHIOPIC SYLLABLE DDHO
+AB0F..AB10    ; disallowed                             # NA   <reserved-AB0F>..<reserved-AB10>
+AB11..AB16    ; valid                                  # 6.0  ETHIOPIC SYLLABLE DZU..ETHIOPIC SYLLABLE DZO
+AB17..AB1F    ; disallowed                             # NA   <reserved-AB17>..<reserved-AB1F>
+AB20..AB26    ; valid                                  # 6.0  ETHIOPIC SYLLABLE CCHHA..ETHIOPIC SYLLABLE CCHHO
+AB27          ; disallowed                             # NA   <reserved-AB27>
+AB28..AB2E    ; valid                                  # 6.0  ETHIOPIC SYLLABLE BBA..ETHIOPIC SYLLABLE BBO
+AB2F          ; disallowed                             # NA   <reserved-AB2F>
+AB30..AB5A    ; valid                                  # 7.0  LATIN SMALL LETTER BARRED ALPHA..LATIN SMALL LETTER Y WITH SHORT RIGHT LEG
+AB5B          ; valid                  ;      ; NV8    # 7.0  MODIFIER BREVE WITH INVERTED BREVE
+AB5C          ; mapped                 ; A727          # 7.0  MODIFIER LETTER SMALL HENG
+AB5D          ; mapped                 ; AB37          # 7.0  MODIFIER LETTER SMALL L WITH INVERTED LAZY S
+AB5E          ; mapped                 ; 026B          # 7.0  MODIFIER LETTER SMALL L WITH MIDDLE TILDE
+AB5F          ; mapped                 ; AB52          # 7.0  MODIFIER LETTER SMALL U WITH LEFT HOOK
+AB60..AB63    ; valid                                  # 8.0  LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER UO
+AB64..AB65    ; valid                                  # 7.0  LATIN SMALL LETTER INVERTED ALPHA..GREEK LETTER SMALL CAPITAL OMEGA
+AB66..AB67    ; valid                                  # 12.0 LATIN SMALL LETTER DZ DIGRAPH WITH RETROFLEX HOOK..LATIN SMALL LETTER TS DIGRAPH WITH RETROFLEX HOOK
+AB68          ; valid                                  # 13.0 LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE
+AB69          ; mapped                 ; 028D          # 13.0 MODIFIER LETTER SMALL TURNED W
+AB6A..AB6B    ; valid                  ;      ; NV8    # 13.0 MODIFIER LETTER LEFT TACK..MODIFIER LETTER RIGHT TACK
+AB6C..AB6F    ; disallowed                             # NA   <reserved-AB6C>..<reserved-AB6F>
+AB70          ; mapped                 ; 13A0          # 8.0  CHEROKEE SMALL LETTER A
+AB71          ; mapped                 ; 13A1          # 8.0  CHEROKEE SMALL LETTER E
+AB72          ; mapped                 ; 13A2          # 8.0  CHEROKEE SMALL LETTER I
+AB73          ; mapped                 ; 13A3          # 8.0  CHEROKEE SMALL LETTER O
+AB74          ; mapped                 ; 13A4          # 8.0  CHEROKEE SMALL LETTER U
+AB75          ; mapped                 ; 13A5          # 8.0  CHEROKEE SMALL LETTER V
+AB76          ; mapped                 ; 13A6          # 8.0  CHEROKEE SMALL LETTER GA
+AB77          ; mapped                 ; 13A7          # 8.0  CHEROKEE SMALL LETTER KA
+AB78          ; mapped                 ; 13A8          # 8.0  CHEROKEE SMALL LETTER GE
+AB79          ; mapped                 ; 13A9          # 8.0  CHEROKEE SMALL LETTER GI
+AB7A          ; mapped                 ; 13AA          # 8.0  CHEROKEE SMALL LETTER GO
+AB7B          ; mapped                 ; 13AB          # 8.0  CHEROKEE SMALL LETTER GU
+AB7C          ; mapped                 ; 13AC          # 8.0  CHEROKEE SMALL LETTER GV
+AB7D          ; mapped                 ; 13AD          # 8.0  CHEROKEE SMALL LETTER HA
+AB7E          ; mapped                 ; 13AE          # 8.0  CHEROKEE SMALL LETTER HE
+AB7F          ; mapped                 ; 13AF          # 8.0  CHEROKEE SMALL LETTER HI
+AB80          ; mapped                 ; 13B0          # 8.0  CHEROKEE SMALL LETTER HO
+AB81          ; mapped                 ; 13B1          # 8.0  CHEROKEE SMALL LETTER HU
+AB82          ; mapped                 ; 13B2          # 8.0  CHEROKEE SMALL LETTER HV
+AB83          ; mapped                 ; 13B3          # 8.0  CHEROKEE SMALL LETTER LA
+AB84          ; mapped                 ; 13B4          # 8.0  CHEROKEE SMALL LETTER LE
+AB85          ; mapped                 ; 13B5          # 8.0  CHEROKEE SMALL LETTER LI
+AB86          ; mapped                 ; 13B6          # 8.0  CHEROKEE SMALL LETTER LO
+AB87          ; mapped                 ; 13B7          # 8.0  CHEROKEE SMALL LETTER LU
+AB88          ; mapped                 ; 13B8          # 8.0  CHEROKEE SMALL LETTER LV
+AB89          ; mapped                 ; 13B9          # 8.0  CHEROKEE SMALL LETTER MA
+AB8A          ; mapped                 ; 13BA          # 8.0  CHEROKEE SMALL LETTER ME
+AB8B          ; mapped                 ; 13BB          # 8.0  CHEROKEE SMALL LETTER MI
+AB8C          ; mapped                 ; 13BC          # 8.0  CHEROKEE SMALL LETTER MO
+AB8D          ; mapped                 ; 13BD          # 8.0  CHEROKEE SMALL LETTER MU
+AB8E          ; mapped                 ; 13BE          # 8.0  CHEROKEE SMALL LETTER NA
+AB8F          ; mapped                 ; 13BF          # 8.0  CHEROKEE SMALL LETTER HNA
+AB90          ; mapped                 ; 13C0          # 8.0  CHEROKEE SMALL LETTER NAH
+AB91          ; mapped                 ; 13C1          # 8.0  CHEROKEE SMALL LETTER NE
+AB92          ; mapped                 ; 13C2          # 8.0  CHEROKEE SMALL LETTER NI
+AB93          ; mapped                 ; 13C3          # 8.0  CHEROKEE SMALL LETTER NO
+AB94          ; mapped                 ; 13C4          # 8.0  CHEROKEE SMALL LETTER NU
+AB95          ; mapped                 ; 13C5          # 8.0  CHEROKEE SMALL LETTER NV
+AB96          ; mapped                 ; 13C6          # 8.0  CHEROKEE SMALL LETTER QUA
+AB97          ; mapped                 ; 13C7          # 8.0  CHEROKEE SMALL LETTER QUE
+AB98          ; mapped                 ; 13C8          # 8.0  CHEROKEE SMALL LETTER QUI
+AB99          ; mapped                 ; 13C9          # 8.0  CHEROKEE SMALL LETTER QUO
+AB9A          ; mapped                 ; 13CA          # 8.0  CHEROKEE SMALL LETTER QUU
+AB9B          ; mapped                 ; 13CB          # 8.0  CHEROKEE SMALL LETTER QUV
+AB9C          ; mapped                 ; 13CC          # 8.0  CHEROKEE SMALL LETTER SA
+AB9D          ; mapped                 ; 13CD          # 8.0  CHEROKEE SMALL LETTER S
+AB9E          ; mapped                 ; 13CE          # 8.0  CHEROKEE SMALL LETTER SE
+AB9F          ; mapped                 ; 13CF          # 8.0  CHEROKEE SMALL LETTER SI
+ABA0          ; mapped                 ; 13D0          # 8.0  CHEROKEE SMALL LETTER SO
+ABA1          ; mapped                 ; 13D1          # 8.0  CHEROKEE SMALL LETTER SU
+ABA2          ; mapped                 ; 13D2          # 8.0  CHEROKEE SMALL LETTER SV
+ABA3          ; mapped                 ; 13D3          # 8.0  CHEROKEE SMALL LETTER DA
+ABA4          ; mapped                 ; 13D4          # 8.0  CHEROKEE SMALL LETTER TA
+ABA5          ; mapped                 ; 13D5          # 8.0  CHEROKEE SMALL LETTER DE
+ABA6          ; mapped                 ; 13D6          # 8.0  CHEROKEE SMALL LETTER TE
+ABA7          ; mapped                 ; 13D7          # 8.0  CHEROKEE SMALL LETTER DI
+ABA8          ; mapped                 ; 13D8          # 8.0  CHEROKEE SMALL LETTER TI
+ABA9          ; mapped                 ; 13D9          # 8.0  CHEROKEE SMALL LETTER DO
+ABAA          ; mapped                 ; 13DA          # 8.0  CHEROKEE SMALL LETTER DU
+ABAB          ; mapped                 ; 13DB          # 8.0  CHEROKEE SMALL LETTER DV
+ABAC          ; mapped                 ; 13DC          # 8.0  CHEROKEE SMALL LETTER DLA
+ABAD          ; mapped                 ; 13DD          # 8.0  CHEROKEE SMALL LETTER TLA
+ABAE          ; mapped                 ; 13DE          # 8.0  CHEROKEE SMALL LETTER TLE
+ABAF          ; mapped                 ; 13DF          # 8.0  CHEROKEE SMALL LETTER TLI
+ABB0          ; mapped                 ; 13E0          # 8.0  CHEROKEE SMALL LETTER TLO
+ABB1          ; mapped                 ; 13E1          # 8.0  CHEROKEE SMALL LETTER TLU
+ABB2          ; mapped                 ; 13E2          # 8.0  CHEROKEE SMALL LETTER TLV
+ABB3          ; mapped                 ; 13E3          # 8.0  CHEROKEE SMALL LETTER TSA
+ABB4          ; mapped                 ; 13E4          # 8.0  CHEROKEE SMALL LETTER TSE
+ABB5          ; mapped                 ; 13E5          # 8.0  CHEROKEE SMALL LETTER TSI
+ABB6          ; mapped                 ; 13E6          # 8.0  CHEROKEE SMALL LETTER TSO
+ABB7          ; mapped                 ; 13E7          # 8.0  CHEROKEE SMALL LETTER TSU
+ABB8          ; mapped                 ; 13E8          # 8.0  CHEROKEE SMALL LETTER TSV
+ABB9          ; mapped                 ; 13E9          # 8.0  CHEROKEE SMALL LETTER WA
+ABBA          ; mapped                 ; 13EA          # 8.0  CHEROKEE SMALL LETTER WE
+ABBB          ; mapped                 ; 13EB          # 8.0  CHEROKEE SMALL LETTER WI
+ABBC          ; mapped                 ; 13EC          # 8.0  CHEROKEE SMALL LETTER WO
+ABBD          ; mapped                 ; 13ED          # 8.0  CHEROKEE SMALL LETTER WU
+ABBE          ; mapped                 ; 13EE          # 8.0  CHEROKEE SMALL LETTER WV
+ABBF          ; mapped                 ; 13EF          # 8.0  CHEROKEE SMALL LETTER YA
+ABC0..ABEA    ; valid                                  # 5.2  MEETEI MAYEK LETTER KOK..MEETEI MAYEK VOWEL SIGN NUNG
+ABEB          ; valid                  ;      ; NV8    # 5.2  MEETEI MAYEK CHEIKHEI
+ABEC..ABED    ; valid                                  # 5.2  MEETEI MAYEK LUM IYEK..MEETEI MAYEK APUN IYEK
+ABEE..ABEF    ; disallowed                             # NA   <reserved-ABEE>..<reserved-ABEF>
+ABF0..ABF9    ; valid                                  # 5.2  MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DIGIT NINE
+ABFA..ABFF    ; disallowed                             # NA   <reserved-ABFA>..<reserved-ABFF>
+AC00..D7A3    ; valid                                  # 2.0  HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH
+D7A4..D7AF    ; disallowed                             # NA   <reserved-D7A4>..<reserved-D7AF>
+D7B0..D7C6    ; valid                  ;      ; NV8    # 5.2  HANGUL JUNGSEONG O-YEO..HANGUL JUNGSEONG ARAEA-E
+D7C7..D7CA    ; disallowed                             # NA   <reserved-D7C7>..<reserved-D7CA>
+D7CB..D7FB    ; valid                  ;      ; NV8    # 5.2  HANGUL JONGSEONG NIEUN-RIEUL..HANGUL JONGSEONG PHIEUPH-THIEUTH
+D7FC..D7FF    ; disallowed                             # NA   <reserved-D7FC>..<reserved-D7FF>
+D800..DFFF    ; disallowed                             # 2.0  <surrogate-D800>..<surrogate-DFFF>
+E000..F8FF    ; disallowed                             # 1.1  <private-use-E000>..<private-use-F8FF>
+F900          ; mapped                 ; 8C48          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F900
+F901          ; mapped                 ; 66F4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F901
+F902          ; mapped                 ; 8ECA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F902
+F903          ; mapped                 ; 8CC8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F903
+F904          ; mapped                 ; 6ED1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F904
+F905          ; mapped                 ; 4E32          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F905
+F906          ; mapped                 ; 53E5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F906
+F907..F908    ; mapped                 ; 9F9C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F907..CJK COMPATIBILITY IDEOGRAPH-F908
+F909          ; mapped                 ; 5951          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F909
+F90A          ; mapped                 ; 91D1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90A
+F90B          ; mapped                 ; 5587          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90B
+F90C          ; mapped                 ; 5948          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90C
+F90D          ; mapped                 ; 61F6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90D
+F90E          ; mapped                 ; 7669          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90E
+F90F          ; mapped                 ; 7F85          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F90F
+F910          ; mapped                 ; 863F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F910
+F911          ; mapped                 ; 87BA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F911
+F912          ; mapped                 ; 88F8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F912
+F913          ; mapped                 ; 908F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F913
+F914          ; mapped                 ; 6A02          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F914
+F915          ; mapped                 ; 6D1B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F915
+F916          ; mapped                 ; 70D9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F916
+F917          ; mapped                 ; 73DE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F917
+F918          ; mapped                 ; 843D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F918
+F919          ; mapped                 ; 916A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F919
+F91A          ; mapped                 ; 99F1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91A
+F91B          ; mapped                 ; 4E82          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91B
+F91C          ; mapped                 ; 5375          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91C
+F91D          ; mapped                 ; 6B04          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91D
+F91E          ; mapped                 ; 721B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91E
+F91F          ; mapped                 ; 862D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F91F
+F920          ; mapped                 ; 9E1E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F920
+F921          ; mapped                 ; 5D50          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F921
+F922          ; mapped                 ; 6FEB          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F922
+F923          ; mapped                 ; 85CD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F923
+F924          ; mapped                 ; 8964          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F924
+F925          ; mapped                 ; 62C9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F925
+F926          ; mapped                 ; 81D8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F926
+F927          ; mapped                 ; 881F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F927
+F928          ; mapped                 ; 5ECA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F928
+F929          ; mapped                 ; 6717          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F929
+F92A          ; mapped                 ; 6D6A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92A
+F92B          ; mapped                 ; 72FC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92B
+F92C          ; mapped                 ; 90CE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92C
+F92D          ; mapped                 ; 4F86          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92D
+F92E          ; mapped                 ; 51B7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92E
+F92F          ; mapped                 ; 52DE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F92F
+F930          ; mapped                 ; 64C4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F930
+F931          ; mapped                 ; 6AD3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F931
+F932          ; mapped                 ; 7210          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F932
+F933          ; mapped                 ; 76E7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F933
+F934          ; mapped                 ; 8001          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F934
+F935          ; mapped                 ; 8606          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F935
+F936          ; mapped                 ; 865C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F936
+F937          ; mapped                 ; 8DEF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F937
+F938          ; mapped                 ; 9732          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F938
+F939          ; mapped                 ; 9B6F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F939
+F93A          ; mapped                 ; 9DFA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93A
+F93B          ; mapped                 ; 788C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93B
+F93C          ; mapped                 ; 797F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93C
+F93D          ; mapped                 ; 7DA0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93D
+F93E          ; mapped                 ; 83C9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93E
+F93F          ; mapped                 ; 9304          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F93F
+F940          ; mapped                 ; 9E7F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F940
+F941          ; mapped                 ; 8AD6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F941
+F942          ; mapped                 ; 58DF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F942
+F943          ; mapped                 ; 5F04          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F943
+F944          ; mapped                 ; 7C60          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F944
+F945          ; mapped                 ; 807E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F945
+F946          ; mapped                 ; 7262          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F946
+F947          ; mapped                 ; 78CA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F947
+F948          ; mapped                 ; 8CC2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F948
+F949          ; mapped                 ; 96F7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F949
+F94A          ; mapped                 ; 58D8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94A
+F94B          ; mapped                 ; 5C62          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94B
+F94C          ; mapped                 ; 6A13          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94C
+F94D          ; mapped                 ; 6DDA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94D
+F94E          ; mapped                 ; 6F0F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94E
+F94F          ; mapped                 ; 7D2F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F94F
+F950          ; mapped                 ; 7E37          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F950
+F951          ; mapped                 ; 964B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F951
+F952          ; mapped                 ; 52D2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F952
+F953          ; mapped                 ; 808B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F953
+F954          ; mapped                 ; 51DC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F954
+F955          ; mapped                 ; 51CC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F955
+F956          ; mapped                 ; 7A1C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F956
+F957          ; mapped                 ; 7DBE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F957
+F958          ; mapped                 ; 83F1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F958
+F959          ; mapped                 ; 9675          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F959
+F95A          ; mapped                 ; 8B80          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95A
+F95B          ; mapped                 ; 62CF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95B
+F95C          ; mapped                 ; 6A02          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95C
+F95D          ; mapped                 ; 8AFE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95D
+F95E          ; mapped                 ; 4E39          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95E
+F95F          ; mapped                 ; 5BE7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F95F
+F960          ; mapped                 ; 6012          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F960
+F961          ; mapped                 ; 7387          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F961
+F962          ; mapped                 ; 7570          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F962
+F963          ; mapped                 ; 5317          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F963
+F964          ; mapped                 ; 78FB          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F964
+F965          ; mapped                 ; 4FBF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F965
+F966          ; mapped                 ; 5FA9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F966
+F967          ; mapped                 ; 4E0D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F967
+F968          ; mapped                 ; 6CCC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F968
+F969          ; mapped                 ; 6578          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F969
+F96A          ; mapped                 ; 7D22          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96A
+F96B          ; mapped                 ; 53C3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96B
+F96C          ; mapped                 ; 585E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96C
+F96D          ; mapped                 ; 7701          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96D
+F96E          ; mapped                 ; 8449          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96E
+F96F          ; mapped                 ; 8AAA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F96F
+F970          ; mapped                 ; 6BBA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F970
+F971          ; mapped                 ; 8FB0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F971
+F972          ; mapped                 ; 6C88          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F972
+F973          ; mapped                 ; 62FE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F973
+F974          ; mapped                 ; 82E5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F974
+F975          ; mapped                 ; 63A0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F975
+F976          ; mapped                 ; 7565          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F976
+F977          ; mapped                 ; 4EAE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F977
+F978          ; mapped                 ; 5169          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F978
+F979          ; mapped                 ; 51C9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F979
+F97A          ; mapped                 ; 6881          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97A
+F97B          ; mapped                 ; 7CE7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97B
+F97C          ; mapped                 ; 826F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97C
+F97D          ; mapped                 ; 8AD2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97D
+F97E          ; mapped                 ; 91CF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97E
+F97F          ; mapped                 ; 52F5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F97F
+F980          ; mapped                 ; 5442          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F980
+F981          ; mapped                 ; 5973          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F981
+F982          ; mapped                 ; 5EEC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F982
+F983          ; mapped                 ; 65C5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F983
+F984          ; mapped                 ; 6FFE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F984
+F985          ; mapped                 ; 792A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F985
+F986          ; mapped                 ; 95AD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F986
+F987          ; mapped                 ; 9A6A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F987
+F988          ; mapped                 ; 9E97          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F988
+F989          ; mapped                 ; 9ECE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F989
+F98A          ; mapped                 ; 529B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98A
+F98B          ; mapped                 ; 66C6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98B
+F98C          ; mapped                 ; 6B77          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98C
+F98D          ; mapped                 ; 8F62          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98D
+F98E          ; mapped                 ; 5E74          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98E
+F98F          ; mapped                 ; 6190          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F98F
+F990          ; mapped                 ; 6200          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F990
+F991          ; mapped                 ; 649A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F991
+F992          ; mapped                 ; 6F23          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F992
+F993          ; mapped                 ; 7149          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F993
+F994          ; mapped                 ; 7489          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F994
+F995          ; mapped                 ; 79CA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F995
+F996          ; mapped                 ; 7DF4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F996
+F997          ; mapped                 ; 806F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F997
+F998          ; mapped                 ; 8F26          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F998
+F999          ; mapped                 ; 84EE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F999
+F99A          ; mapped                 ; 9023          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99A
+F99B          ; mapped                 ; 934A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99B
+F99C          ; mapped                 ; 5217          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99C
+F99D          ; mapped                 ; 52A3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99D
+F99E          ; mapped                 ; 54BD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99E
+F99F          ; mapped                 ; 70C8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F99F
+F9A0          ; mapped                 ; 88C2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A0
+F9A1          ; mapped                 ; 8AAA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A1
+F9A2          ; mapped                 ; 5EC9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A2
+F9A3          ; mapped                 ; 5FF5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A3
+F9A4          ; mapped                 ; 637B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A4
+F9A5          ; mapped                 ; 6BAE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A5
+F9A6          ; mapped                 ; 7C3E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A6
+F9A7          ; mapped                 ; 7375          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A7
+F9A8          ; mapped                 ; 4EE4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A8
+F9A9          ; mapped                 ; 56F9          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9A9
+F9AA          ; mapped                 ; 5BE7          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AA
+F9AB          ; mapped                 ; 5DBA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AB
+F9AC          ; mapped                 ; 601C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AC
+F9AD          ; mapped                 ; 73B2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AD
+F9AE          ; mapped                 ; 7469          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AE
+F9AF          ; mapped                 ; 7F9A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9AF
+F9B0          ; mapped                 ; 8046          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B0
+F9B1          ; mapped                 ; 9234          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B1
+F9B2          ; mapped                 ; 96F6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B2
+F9B3          ; mapped                 ; 9748          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B3
+F9B4          ; mapped                 ; 9818          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B4
+F9B5          ; mapped                 ; 4F8B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B5
+F9B6          ; mapped                 ; 79AE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B6
+F9B7          ; mapped                 ; 91B4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B7
+F9B8          ; mapped                 ; 96B8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B8
+F9B9          ; mapped                 ; 60E1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9B9
+F9BA          ; mapped                 ; 4E86          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BA
+F9BB          ; mapped                 ; 50DA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BB
+F9BC          ; mapped                 ; 5BEE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BC
+F9BD          ; mapped                 ; 5C3F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BD
+F9BE          ; mapped                 ; 6599          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BE
+F9BF          ; mapped                 ; 6A02          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9BF
+F9C0          ; mapped                 ; 71CE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C0
+F9C1          ; mapped                 ; 7642          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C1
+F9C2          ; mapped                 ; 84FC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C2
+F9C3          ; mapped                 ; 907C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C3
+F9C4          ; mapped                 ; 9F8D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C4
+F9C5          ; mapped                 ; 6688          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C5
+F9C6          ; mapped                 ; 962E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C6
+F9C7          ; mapped                 ; 5289          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C7
+F9C8          ; mapped                 ; 677B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C8
+F9C9          ; mapped                 ; 67F3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9C9
+F9CA          ; mapped                 ; 6D41          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CA
+F9CB          ; mapped                 ; 6E9C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CB
+F9CC          ; mapped                 ; 7409          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CC
+F9CD          ; mapped                 ; 7559          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CD
+F9CE          ; mapped                 ; 786B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CE
+F9CF          ; mapped                 ; 7D10          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9CF
+F9D0          ; mapped                 ; 985E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D0
+F9D1          ; mapped                 ; 516D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D1
+F9D2          ; mapped                 ; 622E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D2
+F9D3          ; mapped                 ; 9678          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D3
+F9D4          ; mapped                 ; 502B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D4
+F9D5          ; mapped                 ; 5D19          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D5
+F9D6          ; mapped                 ; 6DEA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D6
+F9D7          ; mapped                 ; 8F2A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D7
+F9D8          ; mapped                 ; 5F8B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D8
+F9D9          ; mapped                 ; 6144          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9D9
+F9DA          ; mapped                 ; 6817          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DA
+F9DB          ; mapped                 ; 7387          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DB
+F9DC          ; mapped                 ; 9686          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DC
+F9DD          ; mapped                 ; 5229          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DD
+F9DE          ; mapped                 ; 540F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DE
+F9DF          ; mapped                 ; 5C65          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9DF
+F9E0          ; mapped                 ; 6613          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E0
+F9E1          ; mapped                 ; 674E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E1
+F9E2          ; mapped                 ; 68A8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E2
+F9E3          ; mapped                 ; 6CE5          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E3
+F9E4          ; mapped                 ; 7406          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E4
+F9E5          ; mapped                 ; 75E2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E5
+F9E6          ; mapped                 ; 7F79          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E6
+F9E7          ; mapped                 ; 88CF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E7
+F9E8          ; mapped                 ; 88E1          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E8
+F9E9          ; mapped                 ; 91CC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9E9
+F9EA          ; mapped                 ; 96E2          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EA
+F9EB          ; mapped                 ; 533F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EB
+F9EC          ; mapped                 ; 6EBA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EC
+F9ED          ; mapped                 ; 541D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9ED
+F9EE          ; mapped                 ; 71D0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EE
+F9EF          ; mapped                 ; 7498          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9EF
+F9F0          ; mapped                 ; 85FA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F0
+F9F1          ; mapped                 ; 96A3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F1
+F9F2          ; mapped                 ; 9C57          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F2
+F9F3          ; mapped                 ; 9E9F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F3
+F9F4          ; mapped                 ; 6797          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F4
+F9F5          ; mapped                 ; 6DCB          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F5
+F9F6          ; mapped                 ; 81E8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F6
+F9F7          ; mapped                 ; 7ACB          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F7
+F9F8          ; mapped                 ; 7B20          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F8
+F9F9          ; mapped                 ; 7C92          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9F9
+F9FA          ; mapped                 ; 72C0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FA
+F9FB          ; mapped                 ; 7099          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FB
+F9FC          ; mapped                 ; 8B58          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FC
+F9FD          ; mapped                 ; 4EC0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FD
+F9FE          ; mapped                 ; 8336          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FE
+F9FF          ; mapped                 ; 523A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-F9FF
+FA00          ; mapped                 ; 5207          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA00
+FA01          ; mapped                 ; 5EA6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA01
+FA02          ; mapped                 ; 62D3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA02
+FA03          ; mapped                 ; 7CD6          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA03
+FA04          ; mapped                 ; 5B85          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA04
+FA05          ; mapped                 ; 6D1E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA05
+FA06          ; mapped                 ; 66B4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA06
+FA07          ; mapped                 ; 8F3B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA07
+FA08          ; mapped                 ; 884C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA08
+FA09          ; mapped                 ; 964D          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA09
+FA0A          ; mapped                 ; 898B          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0A
+FA0B          ; mapped                 ; 5ED3          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0B
+FA0C          ; mapped                 ; 5140          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0C
+FA0D          ; mapped                 ; 55C0          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0D
+FA0E..FA0F    ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPATIBILITY IDEOGRAPH-FA0F
+FA10          ; mapped                 ; 585A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA10
+FA11          ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA11
+FA12          ; mapped                 ; 6674          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA12
+FA13..FA14    ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPATIBILITY IDEOGRAPH-FA14
+FA15          ; mapped                 ; 51DE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA15
+FA16          ; mapped                 ; 732A          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA16
+FA17          ; mapped                 ; 76CA          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA17
+FA18          ; mapped                 ; 793C          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA18
+FA19          ; mapped                 ; 795E          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA19
+FA1A          ; mapped                 ; 7965          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1A
+FA1B          ; mapped                 ; 798F          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1B
+FA1C          ; mapped                 ; 9756          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1C
+FA1D          ; mapped                 ; 7CBE          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1D
+FA1E          ; mapped                 ; 7FBD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1E
+FA1F          ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA1F
+FA20          ; mapped                 ; 8612          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA20
+FA21          ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA21
+FA22          ; mapped                 ; 8AF8          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA22
+FA23..FA24    ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA23..CJK COMPATIBILITY IDEOGRAPH-FA24
+FA25          ; mapped                 ; 9038          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA25
+FA26          ; mapped                 ; 90FD          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA26
+FA27..FA29    ; valid                                  # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA27..CJK COMPATIBILITY IDEOGRAPH-FA29
+FA2A          ; mapped                 ; 98EF          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA2A
+FA2B          ; mapped                 ; 98FC          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA2B
+FA2C          ; mapped                 ; 9928          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA2C
+FA2D          ; mapped                 ; 9DB4          # 1.1  CJK COMPATIBILITY IDEOGRAPH-FA2D
+FA2E          ; mapped                 ; 90DE          # 6.1  CJK COMPATIBILITY IDEOGRAPH-FA2E
+FA2F          ; mapped                 ; 96B7          # 6.1  CJK COMPATIBILITY IDEOGRAPH-FA2F
+FA30          ; mapped                 ; 4FAE          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA30
+FA31          ; mapped                 ; 50E7          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA31
+FA32          ; mapped                 ; 514D          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA32
+FA33          ; mapped                 ; 52C9          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA33
+FA34          ; mapped                 ; 52E4          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA34
+FA35          ; mapped                 ; 5351          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA35
+FA36          ; mapped                 ; 559D          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA36
+FA37          ; mapped                 ; 5606          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA37
+FA38          ; mapped                 ; 5668          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA38
+FA39          ; mapped                 ; 5840          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA39
+FA3A          ; mapped                 ; 58A8          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3A
+FA3B          ; mapped                 ; 5C64          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3B
+FA3C          ; mapped                 ; 5C6E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3C
+FA3D          ; mapped                 ; 6094          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3D
+FA3E          ; mapped                 ; 6168          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3E
+FA3F          ; mapped                 ; 618E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA3F
+FA40          ; mapped                 ; 61F2          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA40
+FA41          ; mapped                 ; 654F          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA41
+FA42          ; mapped                 ; 65E2          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA42
+FA43          ; mapped                 ; 6691          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA43
+FA44          ; mapped                 ; 6885          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA44
+FA45          ; mapped                 ; 6D77          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA45
+FA46          ; mapped                 ; 6E1A          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA46
+FA47          ; mapped                 ; 6F22          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA47
+FA48          ; mapped                 ; 716E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA48
+FA49          ; mapped                 ; 722B          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA49
+FA4A          ; mapped                 ; 7422          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4A
+FA4B          ; mapped                 ; 7891          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4B
+FA4C          ; mapped                 ; 793E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4C
+FA4D          ; mapped                 ; 7949          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4D
+FA4E          ; mapped                 ; 7948          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4E
+FA4F          ; mapped                 ; 7950          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA4F
+FA50          ; mapped                 ; 7956          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA50
+FA51          ; mapped                 ; 795D          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA51
+FA52          ; mapped                 ; 798D          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA52
+FA53          ; mapped                 ; 798E          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA53
+FA54          ; mapped                 ; 7A40          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA54
+FA55          ; mapped                 ; 7A81          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA55
+FA56          ; mapped                 ; 7BC0          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA56
+FA57          ; mapped                 ; 7DF4          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA57
+FA58          ; mapped                 ; 7E09          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA58
+FA59          ; mapped                 ; 7E41          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA59
+FA5A          ; mapped                 ; 7F72          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5A
+FA5B          ; mapped                 ; 8005          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5B
+FA5C          ; mapped                 ; 81ED          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5C
+FA5D..FA5E    ; mapped                 ; 8279          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5D..CJK COMPATIBILITY IDEOGRAPH-FA5E
+FA5F          ; mapped                 ; 8457          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA5F
+FA60          ; mapped                 ; 8910          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA60
+FA61          ; mapped                 ; 8996          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA61
+FA62          ; mapped                 ; 8B01          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA62
+FA63          ; mapped                 ; 8B39          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA63
+FA64          ; mapped                 ; 8CD3          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA64
+FA65          ; mapped                 ; 8D08          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA65
+FA66          ; mapped                 ; 8FB6          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA66
+FA67          ; mapped                 ; 9038          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA67
+FA68          ; mapped                 ; 96E3          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA68
+FA69          ; mapped                 ; 97FF          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA69
+FA6A          ; mapped                 ; 983B          # 3.2  CJK COMPATIBILITY IDEOGRAPH-FA6A
+FA6B          ; mapped                 ; 6075          # 5.2  CJK COMPATIBILITY IDEOGRAPH-FA6B
+FA6C          ; mapped                 ; 242EE         # 5.2  CJK COMPATIBILITY IDEOGRAPH-FA6C
+FA6D          ; mapped                 ; 8218          # 5.2  CJK COMPATIBILITY IDEOGRAPH-FA6D
+FA6E..FA6F    ; disallowed                             # NA   <reserved-FA6E>..<reserved-FA6F>
+FA70          ; mapped                 ; 4E26          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA70
+FA71          ; mapped                 ; 51B5          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA71
+FA72          ; mapped                 ; 5168          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA72
+FA73          ; mapped                 ; 4F80          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA73
+FA74          ; mapped                 ; 5145          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA74
+FA75          ; mapped                 ; 5180          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA75
+FA76          ; mapped                 ; 52C7          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA76
+FA77          ; mapped                 ; 52FA          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA77
+FA78          ; mapped                 ; 559D          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA78
+FA79          ; mapped                 ; 5555          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA79
+FA7A          ; mapped                 ; 5599          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7A
+FA7B          ; mapped                 ; 55E2          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7B
+FA7C          ; mapped                 ; 585A          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7C
+FA7D          ; mapped                 ; 58B3          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7D
+FA7E          ; mapped                 ; 5944          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7E
+FA7F          ; mapped                 ; 5954          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA7F
+FA80          ; mapped                 ; 5A62          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA80
+FA81          ; mapped                 ; 5B28          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA81
+FA82          ; mapped                 ; 5ED2          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA82
+FA83          ; mapped                 ; 5ED9          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA83
+FA84          ; mapped                 ; 5F69          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA84
+FA85          ; mapped                 ; 5FAD          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA85
+FA86          ; mapped                 ; 60D8          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA86
+FA87          ; mapped                 ; 614E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA87
+FA88          ; mapped                 ; 6108          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA88
+FA89          ; mapped                 ; 618E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA89
+FA8A          ; mapped                 ; 6160          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8A
+FA8B          ; mapped                 ; 61F2          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8B
+FA8C          ; mapped                 ; 6234          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8C
+FA8D          ; mapped                 ; 63C4          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8D
+FA8E          ; mapped                 ; 641C          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8E
+FA8F          ; mapped                 ; 6452          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA8F
+FA90          ; mapped                 ; 6556          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA90
+FA91          ; mapped                 ; 6674          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA91
+FA92          ; mapped                 ; 6717          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA92
+FA93          ; mapped                 ; 671B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA93
+FA94          ; mapped                 ; 6756          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA94
+FA95          ; mapped                 ; 6B79          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA95
+FA96          ; mapped                 ; 6BBA          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA96
+FA97          ; mapped                 ; 6D41          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA97
+FA98          ; mapped                 ; 6EDB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA98
+FA99          ; mapped                 ; 6ECB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA99
+FA9A          ; mapped                 ; 6F22          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9A
+FA9B          ; mapped                 ; 701E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9B
+FA9C          ; mapped                 ; 716E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9C
+FA9D          ; mapped                 ; 77A7          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9D
+FA9E          ; mapped                 ; 7235          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9E
+FA9F          ; mapped                 ; 72AF          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FA9F
+FAA0          ; mapped                 ; 732A          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA0
+FAA1          ; mapped                 ; 7471          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA1
+FAA2          ; mapped                 ; 7506          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA2
+FAA3          ; mapped                 ; 753B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA3
+FAA4          ; mapped                 ; 761D          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA4
+FAA5          ; mapped                 ; 761F          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA5
+FAA6          ; mapped                 ; 76CA          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA6
+FAA7          ; mapped                 ; 76DB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA7
+FAA8          ; mapped                 ; 76F4          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA8
+FAA9          ; mapped                 ; 774A          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAA9
+FAAA          ; mapped                 ; 7740          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAA
+FAAB          ; mapped                 ; 78CC          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAB
+FAAC          ; mapped                 ; 7AB1          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAC
+FAAD          ; mapped                 ; 7BC0          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAD
+FAAE          ; mapped                 ; 7C7B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAE
+FAAF          ; mapped                 ; 7D5B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAAF
+FAB0          ; mapped                 ; 7DF4          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB0
+FAB1          ; mapped                 ; 7F3E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB1
+FAB2          ; mapped                 ; 8005          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB2
+FAB3          ; mapped                 ; 8352          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB3
+FAB4          ; mapped                 ; 83EF          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB4
+FAB5          ; mapped                 ; 8779          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB5
+FAB6          ; mapped                 ; 8941          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB6
+FAB7          ; mapped                 ; 8986          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB7
+FAB8          ; mapped                 ; 8996          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB8
+FAB9          ; mapped                 ; 8ABF          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAB9
+FABA          ; mapped                 ; 8AF8          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABA
+FABB          ; mapped                 ; 8ACB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABB
+FABC          ; mapped                 ; 8B01          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABC
+FABD          ; mapped                 ; 8AFE          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABD
+FABE          ; mapped                 ; 8AED          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABE
+FABF          ; mapped                 ; 8B39          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FABF
+FAC0          ; mapped                 ; 8B8A          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC0
+FAC1          ; mapped                 ; 8D08          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC1
+FAC2          ; mapped                 ; 8F38          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC2
+FAC3          ; mapped                 ; 9072          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC3
+FAC4          ; mapped                 ; 9199          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC4
+FAC5          ; mapped                 ; 9276          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC5
+FAC6          ; mapped                 ; 967C          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC6
+FAC7          ; mapped                 ; 96E3          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC7
+FAC8          ; mapped                 ; 9756          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC8
+FAC9          ; mapped                 ; 97DB          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAC9
+FACA          ; mapped                 ; 97FF          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACA
+FACB          ; mapped                 ; 980B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACB
+FACC          ; mapped                 ; 983B          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACC
+FACD          ; mapped                 ; 9B12          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACD
+FACE          ; mapped                 ; 9F9C          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACE
+FACF          ; mapped                 ; 2284A         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FACF
+FAD0          ; mapped                 ; 22844         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD0
+FAD1          ; mapped                 ; 233D5         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD1
+FAD2          ; mapped                 ; 3B9D          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD2
+FAD3          ; mapped                 ; 4018          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD3
+FAD4          ; mapped                 ; 4039          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD4
+FAD5          ; mapped                 ; 25249         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD5
+FAD6          ; mapped                 ; 25CD0         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD6
+FAD7          ; mapped                 ; 27ED3         # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD7
+FAD8          ; mapped                 ; 9F43          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD8
+FAD9          ; mapped                 ; 9F8E          # 4.1  CJK COMPATIBILITY IDEOGRAPH-FAD9
+FADA..FAFF    ; disallowed                             # NA   <reserved-FADA>..<reserved-FAFF>
+FB00          ; mapped                 ; 0066 0066     # 1.1  LATIN SMALL LIGATURE FF
+FB01          ; mapped                 ; 0066 0069     # 1.1  LATIN SMALL LIGATURE FI
+FB02          ; mapped                 ; 0066 006C     # 1.1  LATIN SMALL LIGATURE FL
+FB03          ; mapped                 ; 0066 0066 0069 #1.1  LATIN SMALL LIGATURE FFI
+FB04          ; mapped                 ; 0066 0066 006C #1.1  LATIN SMALL LIGATURE FFL
+FB05..FB06    ; mapped                 ; 0073 0074     # 1.1  LATIN SMALL LIGATURE LONG S T..LATIN SMALL LIGATURE ST
+FB07..FB12    ; disallowed                             # NA   <reserved-FB07>..<reserved-FB12>
+FB13          ; mapped                 ; 0574 0576     # 1.1  ARMENIAN SMALL LIGATURE MEN NOW
+FB14          ; mapped                 ; 0574 0565     # 1.1  ARMENIAN SMALL LIGATURE MEN ECH
+FB15          ; mapped                 ; 0574 056B     # 1.1  ARMENIAN SMALL LIGATURE MEN INI
+FB16          ; mapped                 ; 057E 0576     # 1.1  ARMENIAN SMALL LIGATURE VEW NOW
+FB17          ; mapped                 ; 0574 056D     # 1.1  ARMENIAN SMALL LIGATURE MEN XEH
+FB18..FB1C    ; disallowed                             # NA   <reserved-FB18>..<reserved-FB1C>
+FB1D          ; mapped                 ; 05D9 05B4     # 3.0  HEBREW LETTER YOD WITH HIRIQ
+FB1E          ; valid                                  # 1.1  HEBREW POINT JUDEO-SPANISH VARIKA
+FB1F          ; mapped                 ; 05F2 05B7     # 1.1  HEBREW LIGATURE YIDDISH YOD YOD PATAH
+FB20          ; mapped                 ; 05E2          # 1.1  HEBREW LETTER ALTERNATIVE AYIN
+FB21          ; mapped                 ; 05D0          # 1.1  HEBREW LETTER WIDE ALEF
+FB22          ; mapped                 ; 05D3          # 1.1  HEBREW LETTER WIDE DALET
+FB23          ; mapped                 ; 05D4          # 1.1  HEBREW LETTER WIDE HE
+FB24          ; mapped                 ; 05DB          # 1.1  HEBREW LETTER WIDE KAF
+FB25          ; mapped                 ; 05DC          # 1.1  HEBREW LETTER WIDE LAMED
+FB26          ; mapped                 ; 05DD          # 1.1  HEBREW LETTER WIDE FINAL MEM
+FB27          ; mapped                 ; 05E8          # 1.1  HEBREW LETTER WIDE RESH
+FB28          ; mapped                 ; 05EA          # 1.1  HEBREW LETTER WIDE TAV
+FB29          ; disallowed_STD3_mapped ; 002B          # 1.1  HEBREW LETTER ALTERNATIVE PLUS SIGN
+FB2A          ; mapped                 ; 05E9 05C1     # 1.1  HEBREW LETTER SHIN WITH SHIN DOT
+FB2B          ; mapped                 ; 05E9 05C2     # 1.1  HEBREW LETTER SHIN WITH SIN DOT
+FB2C          ; mapped                 ; 05E9 05BC 05C1 #1.1  HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
+FB2D          ; mapped                 ; 05E9 05BC 05C2 #1.1  HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
+FB2E          ; mapped                 ; 05D0 05B7     # 1.1  HEBREW LETTER ALEF WITH PATAH
+FB2F          ; mapped                 ; 05D0 05B8     # 1.1  HEBREW LETTER ALEF WITH QAMATS
+FB30          ; mapped                 ; 05D0 05BC     # 1.1  HEBREW LETTER ALEF WITH MAPIQ
+FB31          ; mapped                 ; 05D1 05BC     # 1.1  HEBREW LETTER BET WITH DAGESH
+FB32          ; mapped                 ; 05D2 05BC     # 1.1  HEBREW LETTER GIMEL WITH DAGESH
+FB33          ; mapped                 ; 05D3 05BC     # 1.1  HEBREW LETTER DALET WITH DAGESH
+FB34          ; mapped                 ; 05D4 05BC     # 1.1  HEBREW LETTER HE WITH MAPIQ
+FB35          ; mapped                 ; 05D5 05BC     # 1.1  HEBREW LETTER VAV WITH DAGESH
+FB36          ; mapped                 ; 05D6 05BC     # 1.1  HEBREW LETTER ZAYIN WITH DAGESH
+FB37          ; disallowed                             # NA   <reserved-FB37>
+FB38          ; mapped                 ; 05D8 05BC     # 1.1  HEBREW LETTER TET WITH DAGESH
+FB39          ; mapped                 ; 05D9 05BC     # 1.1  HEBREW LETTER YOD WITH DAGESH
+FB3A          ; mapped                 ; 05DA 05BC     # 1.1  HEBREW LETTER FINAL KAF WITH DAGESH
+FB3B          ; mapped                 ; 05DB 05BC     # 1.1  HEBREW LETTER KAF WITH DAGESH
+FB3C          ; mapped                 ; 05DC 05BC     # 1.1  HEBREW LETTER LAMED WITH DAGESH
+FB3D          ; disallowed                             # NA   <reserved-FB3D>
+FB3E          ; mapped                 ; 05DE 05BC     # 1.1  HEBREW LETTER MEM WITH DAGESH
+FB3F          ; disallowed                             # NA   <reserved-FB3F>
+FB40          ; mapped                 ; 05E0 05BC     # 1.1  HEBREW LETTER NUN WITH DAGESH
+FB41          ; mapped                 ; 05E1 05BC     # 1.1  HEBREW LETTER SAMEKH WITH DAGESH
+FB42          ; disallowed                             # NA   <reserved-FB42>
+FB43          ; mapped                 ; 05E3 05BC     # 1.1  HEBREW LETTER FINAL PE WITH DAGESH
+FB44          ; mapped                 ; 05E4 05BC     # 1.1  HEBREW LETTER PE WITH DAGESH
+FB45          ; disallowed                             # NA   <reserved-FB45>
+FB46          ; mapped                 ; 05E6 05BC     # 1.1  HEBREW LETTER TSADI WITH DAGESH
+FB47          ; mapped                 ; 05E7 05BC     # 1.1  HEBREW LETTER QOF WITH DAGESH
+FB48          ; mapped                 ; 05E8 05BC     # 1.1  HEBREW LETTER RESH WITH DAGESH
+FB49          ; mapped                 ; 05E9 05BC     # 1.1  HEBREW LETTER SHIN WITH DAGESH
+FB4A          ; mapped                 ; 05EA 05BC     # 1.1  HEBREW LETTER TAV WITH DAGESH
+FB4B          ; mapped                 ; 05D5 05B9     # 1.1  HEBREW LETTER VAV WITH HOLAM
+FB4C          ; mapped                 ; 05D1 05BF     # 1.1  HEBREW LETTER BET WITH RAFE
+FB4D          ; mapped                 ; 05DB 05BF     # 1.1  HEBREW LETTER KAF WITH RAFE
+FB4E          ; mapped                 ; 05E4 05BF     # 1.1  HEBREW LETTER PE WITH RAFE
+FB4F          ; mapped                 ; 05D0 05DC     # 1.1  HEBREW LIGATURE ALEF LAMED
+FB50..FB51    ; mapped                 ; 0671          # 1.1  ARABIC LETTER ALEF WASLA ISOLATED FORM..ARABIC LETTER ALEF WASLA FINAL FORM
+FB52..FB55    ; mapped                 ; 067B          # 1.1  ARABIC LETTER BEEH ISOLATED FORM..ARABIC LETTER BEEH MEDIAL FORM
+FB56..FB59    ; mapped                 ; 067E          # 1.1  ARABIC LETTER PEH ISOLATED FORM..ARABIC LETTER PEH MEDIAL FORM
+FB5A..FB5D    ; mapped                 ; 0680          # 1.1  ARABIC LETTER BEHEH ISOLATED FORM..ARABIC LETTER BEHEH MEDIAL FORM
+FB5E..FB61    ; mapped                 ; 067A          # 1.1  ARABIC LETTER TTEHEH ISOLATED FORM..ARABIC LETTER TTEHEH MEDIAL FORM
+FB62..FB65    ; mapped                 ; 067F          # 1.1  ARABIC LETTER TEHEH ISOLATED FORM..ARABIC LETTER TEHEH MEDIAL FORM
+FB66..FB69    ; mapped                 ; 0679          # 1.1  ARABIC LETTER TTEH ISOLATED FORM..ARABIC LETTER TTEH MEDIAL FORM
+FB6A..FB6D    ; mapped                 ; 06A4          # 1.1  ARABIC LETTER VEH ISOLATED FORM..ARABIC LETTER VEH MEDIAL FORM
+FB6E..FB71    ; mapped                 ; 06A6          # 1.1  ARABIC LETTER PEHEH ISOLATED FORM..ARABIC LETTER PEHEH MEDIAL FORM
+FB72..FB75    ; mapped                 ; 0684          # 1.1  ARABIC LETTER DYEH ISOLATED FORM..ARABIC LETTER DYEH MEDIAL FORM
+FB76..FB79    ; mapped                 ; 0683          # 1.1  ARABIC LETTER NYEH ISOLATED FORM..ARABIC LETTER NYEH MEDIAL FORM
+FB7A..FB7D    ; mapped                 ; 0686          # 1.1  ARABIC LETTER TCHEH ISOLATED FORM..ARABIC LETTER TCHEH MEDIAL FORM
+FB7E..FB81    ; mapped                 ; 0687          # 1.1  ARABIC LETTER TCHEHEH ISOLATED FORM..ARABIC LETTER TCHEHEH MEDIAL FORM
+FB82..FB83    ; mapped                 ; 068D          # 1.1  ARABIC LETTER DDAHAL ISOLATED FORM..ARABIC LETTER DDAHAL FINAL FORM
+FB84..FB85    ; mapped                 ; 068C          # 1.1  ARABIC LETTER DAHAL ISOLATED FORM..ARABIC LETTER DAHAL FINAL FORM
+FB86..FB87    ; mapped                 ; 068E          # 1.1  ARABIC LETTER DUL ISOLATED FORM..ARABIC LETTER DUL FINAL FORM
+FB88..FB89    ; mapped                 ; 0688          # 1.1  ARABIC LETTER DDAL ISOLATED FORM..ARABIC LETTER DDAL FINAL FORM
+FB8A..FB8B    ; mapped                 ; 0698          # 1.1  ARABIC LETTER JEH ISOLATED FORM..ARABIC LETTER JEH FINAL FORM
+FB8C..FB8D    ; mapped                 ; 0691          # 1.1  ARABIC LETTER RREH ISOLATED FORM..ARABIC LETTER RREH FINAL FORM
+FB8E..FB91    ; mapped                 ; 06A9          # 1.1  ARABIC LETTER KEHEH ISOLATED FORM..ARABIC LETTER KEHEH MEDIAL FORM
+FB92..FB95    ; mapped                 ; 06AF          # 1.1  ARABIC LETTER GAF ISOLATED FORM..ARABIC LETTER GAF MEDIAL FORM
+FB96..FB99    ; mapped                 ; 06B3          # 1.1  ARABIC LETTER GUEH ISOLATED FORM..ARABIC LETTER GUEH MEDIAL FORM
+FB9A..FB9D    ; mapped                 ; 06B1          # 1.1  ARABIC LETTER NGOEH ISOLATED FORM..ARABIC LETTER NGOEH MEDIAL FORM
+FB9E..FB9F    ; mapped                 ; 06BA          # 1.1  ARABIC LETTER NOON GHUNNA ISOLATED FORM..ARABIC LETTER NOON GHUNNA FINAL FORM
+FBA0..FBA3    ; mapped                 ; 06BB          # 1.1  ARABIC LETTER RNOON ISOLATED FORM..ARABIC LETTER RNOON MEDIAL FORM
+FBA4..FBA5    ; mapped                 ; 06C0          # 1.1  ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM..ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM
+FBA6..FBA9    ; mapped                 ; 06C1          # 1.1  ARABIC LETTER HEH GOAL ISOLATED FORM..ARABIC LETTER HEH GOAL MEDIAL FORM
+FBAA..FBAD    ; mapped                 ; 06BE          # 1.1  ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM..ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM
+FBAE..FBAF    ; mapped                 ; 06D2          # 1.1  ARABIC LETTER YEH BARREE ISOLATED FORM..ARABIC LETTER YEH BARREE FINAL FORM
+FBB0..FBB1    ; mapped                 ; 06D3          # 1.1  ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM
+FBB2..FBC1    ; valid                  ;      ; NV8    # 6.0  ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL SMALL TAH BELOW
+FBC2..FBD2    ; disallowed                             # NA   <reserved-FBC2>..<reserved-FBD2>
+FBD3..FBD6    ; mapped                 ; 06AD          # 1.1  ARABIC LETTER NG ISOLATED FORM..ARABIC LETTER NG MEDIAL FORM
+FBD7..FBD8    ; mapped                 ; 06C7          # 1.1  ARABIC LETTER U ISOLATED FORM..ARABIC LETTER U FINAL FORM
+FBD9..FBDA    ; mapped                 ; 06C6          # 1.1  ARABIC LETTER OE ISOLATED FORM..ARABIC LETTER OE FINAL FORM
+FBDB..FBDC    ; mapped                 ; 06C8          # 1.1  ARABIC LETTER YU ISOLATED FORM..ARABIC LETTER YU FINAL FORM
+FBDD          ; mapped                 ; 06C7 0674     # 1.1  ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM
+FBDE..FBDF    ; mapped                 ; 06CB          # 1.1  ARABIC LETTER VE ISOLATED FORM..ARABIC LETTER VE FINAL FORM
+FBE0..FBE1    ; mapped                 ; 06C5          # 1.1  ARABIC LETTER KIRGHIZ OE ISOLATED FORM..ARABIC LETTER KIRGHIZ OE FINAL FORM
+FBE2..FBE3    ; mapped                 ; 06C9          # 1.1  ARABIC LETTER KIRGHIZ YU ISOLATED FORM..ARABIC LETTER KIRGHIZ YU FINAL FORM
+FBE4..FBE7    ; mapped                 ; 06D0          # 1.1  ARABIC LETTER E ISOLATED FORM..ARABIC LETTER E MEDIAL FORM
+FBE8..FBE9    ; mapped                 ; 0649          # 1.1  ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM..ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM
+FBEA..FBEB    ; mapped                 ; 0626 0627     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM
+FBEC..FBED    ; mapped                 ; 0626 06D5     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM
+FBEE..FBEF    ; mapped                 ; 0626 0648     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM
+FBF0..FBF1    ; mapped                 ; 0626 06C7     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM
+FBF2..FBF3    ; mapped                 ; 0626 06C6     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM
+FBF4..FBF5    ; mapped                 ; 0626 06C8     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM
+FBF6..FBF8    ; mapped                 ; 0626 06D0     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM..ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM
+FBF9..FBFB    ; mapped                 ; 0626 0649     # 1.1  ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM..ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM
+FBFC..FBFF    ; mapped                 ; 06CC          # 1.1  ARABIC LETTER FARSI YEH ISOLATED FORM..ARABIC LETTER FARSI YEH MEDIAL FORM
+FC00          ; mapped                 ; 0626 062C     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM
+FC01          ; mapped                 ; 0626 062D     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM
+FC02          ; mapped                 ; 0626 0645     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM
+FC03          ; mapped                 ; 0626 0649     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM
+FC04          ; mapped                 ; 0626 064A     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM
+FC05          ; mapped                 ; 0628 062C     # 1.1  ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM
+FC06          ; mapped                 ; 0628 062D     # 1.1  ARABIC LIGATURE BEH WITH HAH ISOLATED FORM
+FC07          ; mapped                 ; 0628 062E     # 1.1  ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM
+FC08          ; mapped                 ; 0628 0645     # 1.1  ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM
+FC09          ; mapped                 ; 0628 0649     # 1.1  ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM
+FC0A          ; mapped                 ; 0628 064A     # 1.1  ARABIC LIGATURE BEH WITH YEH ISOLATED FORM
+FC0B          ; mapped                 ; 062A 062C     # 1.1  ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM
+FC0C          ; mapped                 ; 062A 062D     # 1.1  ARABIC LIGATURE TEH WITH HAH ISOLATED FORM
+FC0D          ; mapped                 ; 062A 062E     # 1.1  ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM
+FC0E          ; mapped                 ; 062A 0645     # 1.1  ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM
+FC0F          ; mapped                 ; 062A 0649     # 1.1  ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM
+FC10          ; mapped                 ; 062A 064A     # 1.1  ARABIC LIGATURE TEH WITH YEH ISOLATED FORM
+FC11          ; mapped                 ; 062B 062C     # 1.1  ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM
+FC12          ; mapped                 ; 062B 0645     # 1.1  ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM
+FC13          ; mapped                 ; 062B 0649     # 1.1  ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM
+FC14          ; mapped                 ; 062B 064A     # 1.1  ARABIC LIGATURE THEH WITH YEH ISOLATED FORM
+FC15          ; mapped                 ; 062C 062D     # 1.1  ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM
+FC16          ; mapped                 ; 062C 0645     # 1.1  ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM
+FC17          ; mapped                 ; 062D 062C     # 1.1  ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM
+FC18          ; mapped                 ; 062D 0645     # 1.1  ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM
+FC19          ; mapped                 ; 062E 062C     # 1.1  ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM
+FC1A          ; mapped                 ; 062E 062D     # 1.1  ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM
+FC1B          ; mapped                 ; 062E 0645     # 1.1  ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM
+FC1C          ; mapped                 ; 0633 062C     # 1.1  ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM
+FC1D          ; mapped                 ; 0633 062D     # 1.1  ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM
+FC1E          ; mapped                 ; 0633 062E     # 1.1  ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM
+FC1F          ; mapped                 ; 0633 0645     # 1.1  ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM
+FC20          ; mapped                 ; 0635 062D     # 1.1  ARABIC LIGATURE SAD WITH HAH ISOLATED FORM
+FC21          ; mapped                 ; 0635 0645     # 1.1  ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM
+FC22          ; mapped                 ; 0636 062C     # 1.1  ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM
+FC23          ; mapped                 ; 0636 062D     # 1.1  ARABIC LIGATURE DAD WITH HAH ISOLATED FORM
+FC24          ; mapped                 ; 0636 062E     # 1.1  ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM
+FC25          ; mapped                 ; 0636 0645     # 1.1  ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM
+FC26          ; mapped                 ; 0637 062D     # 1.1  ARABIC LIGATURE TAH WITH HAH ISOLATED FORM
+FC27          ; mapped                 ; 0637 0645     # 1.1  ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM
+FC28          ; mapped                 ; 0638 0645     # 1.1  ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM
+FC29          ; mapped                 ; 0639 062C     # 1.1  ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM
+FC2A          ; mapped                 ; 0639 0645     # 1.1  ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM
+FC2B          ; mapped                 ; 063A 062C     # 1.1  ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM
+FC2C          ; mapped                 ; 063A 0645     # 1.1  ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM
+FC2D          ; mapped                 ; 0641 062C     # 1.1  ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM
+FC2E          ; mapped                 ; 0641 062D     # 1.1  ARABIC LIGATURE FEH WITH HAH ISOLATED FORM
+FC2F          ; mapped                 ; 0641 062E     # 1.1  ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM
+FC30          ; mapped                 ; 0641 0645     # 1.1  ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM
+FC31          ; mapped                 ; 0641 0649     # 1.1  ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM
+FC32          ; mapped                 ; 0641 064A     # 1.1  ARABIC LIGATURE FEH WITH YEH ISOLATED FORM
+FC33          ; mapped                 ; 0642 062D     # 1.1  ARABIC LIGATURE QAF WITH HAH ISOLATED FORM
+FC34          ; mapped                 ; 0642 0645     # 1.1  ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM
+FC35          ; mapped                 ; 0642 0649     # 1.1  ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM
+FC36          ; mapped                 ; 0642 064A     # 1.1  ARABIC LIGATURE QAF WITH YEH ISOLATED FORM
+FC37          ; mapped                 ; 0643 0627     # 1.1  ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM
+FC38          ; mapped                 ; 0643 062C     # 1.1  ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM
+FC39          ; mapped                 ; 0643 062D     # 1.1  ARABIC LIGATURE KAF WITH HAH ISOLATED FORM
+FC3A          ; mapped                 ; 0643 062E     # 1.1  ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM
+FC3B          ; mapped                 ; 0643 0644     # 1.1  ARABIC LIGATURE KAF WITH LAM ISOLATED FORM
+FC3C          ; mapped                 ; 0643 0645     # 1.1  ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM
+FC3D          ; mapped                 ; 0643 0649     # 1.1  ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM
+FC3E          ; mapped                 ; 0643 064A     # 1.1  ARABIC LIGATURE KAF WITH YEH ISOLATED FORM
+FC3F          ; mapped                 ; 0644 062C     # 1.1  ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM
+FC40          ; mapped                 ; 0644 062D     # 1.1  ARABIC LIGATURE LAM WITH HAH ISOLATED FORM
+FC41          ; mapped                 ; 0644 062E     # 1.1  ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM
+FC42          ; mapped                 ; 0644 0645     # 1.1  ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM
+FC43          ; mapped                 ; 0644 0649     # 1.1  ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM
+FC44          ; mapped                 ; 0644 064A     # 1.1  ARABIC LIGATURE LAM WITH YEH ISOLATED FORM
+FC45          ; mapped                 ; 0645 062C     # 1.1  ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM
+FC46          ; mapped                 ; 0645 062D     # 1.1  ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM
+FC47          ; mapped                 ; 0645 062E     # 1.1  ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM
+FC48          ; mapped                 ; 0645 0645     # 1.1  ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM
+FC49          ; mapped                 ; 0645 0649     # 1.1  ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM
+FC4A          ; mapped                 ; 0645 064A     # 1.1  ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM
+FC4B          ; mapped                 ; 0646 062C     # 1.1  ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM
+FC4C          ; mapped                 ; 0646 062D     # 1.1  ARABIC LIGATURE NOON WITH HAH ISOLATED FORM
+FC4D          ; mapped                 ; 0646 062E     # 1.1  ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM
+FC4E          ; mapped                 ; 0646 0645     # 1.1  ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM
+FC4F          ; mapped                 ; 0646 0649     # 1.1  ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM
+FC50          ; mapped                 ; 0646 064A     # 1.1  ARABIC LIGATURE NOON WITH YEH ISOLATED FORM
+FC51          ; mapped                 ; 0647 062C     # 1.1  ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM
+FC52          ; mapped                 ; 0647 0645     # 1.1  ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM
+FC53          ; mapped                 ; 0647 0649     # 1.1  ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM
+FC54          ; mapped                 ; 0647 064A     # 1.1  ARABIC LIGATURE HEH WITH YEH ISOLATED FORM
+FC55          ; mapped                 ; 064A 062C     # 1.1  ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM
+FC56          ; mapped                 ; 064A 062D     # 1.1  ARABIC LIGATURE YEH WITH HAH ISOLATED FORM
+FC57          ; mapped                 ; 064A 062E     # 1.1  ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM
+FC58          ; mapped                 ; 064A 0645     # 1.1  ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM
+FC59          ; mapped                 ; 064A 0649     # 1.1  ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM
+FC5A          ; mapped                 ; 064A 064A     # 1.1  ARABIC LIGATURE YEH WITH YEH ISOLATED FORM
+FC5B          ; mapped                 ; 0630 0670     # 1.1  ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM
+FC5C          ; mapped                 ; 0631 0670     # 1.1  ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM
+FC5D          ; mapped                 ; 0649 0670     # 1.1  ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM
+FC5E          ; disallowed_STD3_mapped ; 0020 064C 0651 #1.1  ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM
+FC5F          ; disallowed_STD3_mapped ; 0020 064D 0651 #1.1  ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM
+FC60          ; disallowed_STD3_mapped ; 0020 064E 0651 #1.1  ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM
+FC61          ; disallowed_STD3_mapped ; 0020 064F 0651 #1.1  ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM
+FC62          ; disallowed_STD3_mapped ; 0020 0650 0651 #1.1  ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM
+FC63          ; disallowed_STD3_mapped ; 0020 0651 0670 #1.1  ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM
+FC64          ; mapped                 ; 0626 0631     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM
+FC65          ; mapped                 ; 0626 0632     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM
+FC66          ; mapped                 ; 0626 0645     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM
+FC67          ; mapped                 ; 0626 0646     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM
+FC68          ; mapped                 ; 0626 0649     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM
+FC69          ; mapped                 ; 0626 064A     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM
+FC6A          ; mapped                 ; 0628 0631     # 1.1  ARABIC LIGATURE BEH WITH REH FINAL FORM
+FC6B          ; mapped                 ; 0628 0632     # 1.1  ARABIC LIGATURE BEH WITH ZAIN FINAL FORM
+FC6C          ; mapped                 ; 0628 0645     # 1.1  ARABIC LIGATURE BEH WITH MEEM FINAL FORM
+FC6D          ; mapped                 ; 0628 0646     # 1.1  ARABIC LIGATURE BEH WITH NOON FINAL FORM
+FC6E          ; mapped                 ; 0628 0649     # 1.1  ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM
+FC6F          ; mapped                 ; 0628 064A     # 1.1  ARABIC LIGATURE BEH WITH YEH FINAL FORM
+FC70          ; mapped                 ; 062A 0631     # 1.1  ARABIC LIGATURE TEH WITH REH FINAL FORM
+FC71          ; mapped                 ; 062A 0632     # 1.1  ARABIC LIGATURE TEH WITH ZAIN FINAL FORM
+FC72          ; mapped                 ; 062A 0645     # 1.1  ARABIC LIGATURE TEH WITH MEEM FINAL FORM
+FC73          ; mapped                 ; 062A 0646     # 1.1  ARABIC LIGATURE TEH WITH NOON FINAL FORM
+FC74          ; mapped                 ; 062A 0649     # 1.1  ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM
+FC75          ; mapped                 ; 062A 064A     # 1.1  ARABIC LIGATURE TEH WITH YEH FINAL FORM
+FC76          ; mapped                 ; 062B 0631     # 1.1  ARABIC LIGATURE THEH WITH REH FINAL FORM
+FC77          ; mapped                 ; 062B 0632     # 1.1  ARABIC LIGATURE THEH WITH ZAIN FINAL FORM
+FC78          ; mapped                 ; 062B 0645     # 1.1  ARABIC LIGATURE THEH WITH MEEM FINAL FORM
+FC79          ; mapped                 ; 062B 0646     # 1.1  ARABIC LIGATURE THEH WITH NOON FINAL FORM
+FC7A          ; mapped                 ; 062B 0649     # 1.1  ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM
+FC7B          ; mapped                 ; 062B 064A     # 1.1  ARABIC LIGATURE THEH WITH YEH FINAL FORM
+FC7C          ; mapped                 ; 0641 0649     # 1.1  ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM
+FC7D          ; mapped                 ; 0641 064A     # 1.1  ARABIC LIGATURE FEH WITH YEH FINAL FORM
+FC7E          ; mapped                 ; 0642 0649     # 1.1  ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM
+FC7F          ; mapped                 ; 0642 064A     # 1.1  ARABIC LIGATURE QAF WITH YEH FINAL FORM
+FC80          ; mapped                 ; 0643 0627     # 1.1  ARABIC LIGATURE KAF WITH ALEF FINAL FORM
+FC81          ; mapped                 ; 0643 0644     # 1.1  ARABIC LIGATURE KAF WITH LAM FINAL FORM
+FC82          ; mapped                 ; 0643 0645     # 1.1  ARABIC LIGATURE KAF WITH MEEM FINAL FORM
+FC83          ; mapped                 ; 0643 0649     # 1.1  ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM
+FC84          ; mapped                 ; 0643 064A     # 1.1  ARABIC LIGATURE KAF WITH YEH FINAL FORM
+FC85          ; mapped                 ; 0644 0645     # 1.1  ARABIC LIGATURE LAM WITH MEEM FINAL FORM
+FC86          ; mapped                 ; 0644 0649     # 1.1  ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM
+FC87          ; mapped                 ; 0644 064A     # 1.1  ARABIC LIGATURE LAM WITH YEH FINAL FORM
+FC88          ; mapped                 ; 0645 0627     # 1.1  ARABIC LIGATURE MEEM WITH ALEF FINAL FORM
+FC89          ; mapped                 ; 0645 0645     # 1.1  ARABIC LIGATURE MEEM WITH MEEM FINAL FORM
+FC8A          ; mapped                 ; 0646 0631     # 1.1  ARABIC LIGATURE NOON WITH REH FINAL FORM
+FC8B          ; mapped                 ; 0646 0632     # 1.1  ARABIC LIGATURE NOON WITH ZAIN FINAL FORM
+FC8C          ; mapped                 ; 0646 0645     # 1.1  ARABIC LIGATURE NOON WITH MEEM FINAL FORM
+FC8D          ; mapped                 ; 0646 0646     # 1.1  ARABIC LIGATURE NOON WITH NOON FINAL FORM
+FC8E          ; mapped                 ; 0646 0649     # 1.1  ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM
+FC8F          ; mapped                 ; 0646 064A     # 1.1  ARABIC LIGATURE NOON WITH YEH FINAL FORM
+FC90          ; mapped                 ; 0649 0670     # 1.1  ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM
+FC91          ; mapped                 ; 064A 0631     # 1.1  ARABIC LIGATURE YEH WITH REH FINAL FORM
+FC92          ; mapped                 ; 064A 0632     # 1.1  ARABIC LIGATURE YEH WITH ZAIN FINAL FORM
+FC93          ; mapped                 ; 064A 0645     # 1.1  ARABIC LIGATURE YEH WITH MEEM FINAL FORM
+FC94          ; mapped                 ; 064A 0646     # 1.1  ARABIC LIGATURE YEH WITH NOON FINAL FORM
+FC95          ; mapped                 ; 064A 0649     # 1.1  ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM
+FC96          ; mapped                 ; 064A 064A     # 1.1  ARABIC LIGATURE YEH WITH YEH FINAL FORM
+FC97          ; mapped                 ; 0626 062C     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM
+FC98          ; mapped                 ; 0626 062D     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM
+FC99          ; mapped                 ; 0626 062E     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM
+FC9A          ; mapped                 ; 0626 0645     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM
+FC9B          ; mapped                 ; 0626 0647     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM
+FC9C          ; mapped                 ; 0628 062C     # 1.1  ARABIC LIGATURE BEH WITH JEEM INITIAL FORM
+FC9D          ; mapped                 ; 0628 062D     # 1.1  ARABIC LIGATURE BEH WITH HAH INITIAL FORM
+FC9E          ; mapped                 ; 0628 062E     # 1.1  ARABIC LIGATURE BEH WITH KHAH INITIAL FORM
+FC9F          ; mapped                 ; 0628 0645     # 1.1  ARABIC LIGATURE BEH WITH MEEM INITIAL FORM
+FCA0          ; mapped                 ; 0628 0647     # 1.1  ARABIC LIGATURE BEH WITH HEH INITIAL FORM
+FCA1          ; mapped                 ; 062A 062C     # 1.1  ARABIC LIGATURE TEH WITH JEEM INITIAL FORM
+FCA2          ; mapped                 ; 062A 062D     # 1.1  ARABIC LIGATURE TEH WITH HAH INITIAL FORM
+FCA3          ; mapped                 ; 062A 062E     # 1.1  ARABIC LIGATURE TEH WITH KHAH INITIAL FORM
+FCA4          ; mapped                 ; 062A 0645     # 1.1  ARABIC LIGATURE TEH WITH MEEM INITIAL FORM
+FCA5          ; mapped                 ; 062A 0647     # 1.1  ARABIC LIGATURE TEH WITH HEH INITIAL FORM
+FCA6          ; mapped                 ; 062B 0645     # 1.1  ARABIC LIGATURE THEH WITH MEEM INITIAL FORM
+FCA7          ; mapped                 ; 062C 062D     # 1.1  ARABIC LIGATURE JEEM WITH HAH INITIAL FORM
+FCA8          ; mapped                 ; 062C 0645     # 1.1  ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM
+FCA9          ; mapped                 ; 062D 062C     # 1.1  ARABIC LIGATURE HAH WITH JEEM INITIAL FORM
+FCAA          ; mapped                 ; 062D 0645     # 1.1  ARABIC LIGATURE HAH WITH MEEM INITIAL FORM
+FCAB          ; mapped                 ; 062E 062C     # 1.1  ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM
+FCAC          ; mapped                 ; 062E 0645     # 1.1  ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM
+FCAD          ; mapped                 ; 0633 062C     # 1.1  ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM
+FCAE          ; mapped                 ; 0633 062D     # 1.1  ARABIC LIGATURE SEEN WITH HAH INITIAL FORM
+FCAF          ; mapped                 ; 0633 062E     # 1.1  ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM
+FCB0          ; mapped                 ; 0633 0645     # 1.1  ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM
+FCB1          ; mapped                 ; 0635 062D     # 1.1  ARABIC LIGATURE SAD WITH HAH INITIAL FORM
+FCB2          ; mapped                 ; 0635 062E     # 1.1  ARABIC LIGATURE SAD WITH KHAH INITIAL FORM
+FCB3          ; mapped                 ; 0635 0645     # 1.1  ARABIC LIGATURE SAD WITH MEEM INITIAL FORM
+FCB4          ; mapped                 ; 0636 062C     # 1.1  ARABIC LIGATURE DAD WITH JEEM INITIAL FORM
+FCB5          ; mapped                 ; 0636 062D     # 1.1  ARABIC LIGATURE DAD WITH HAH INITIAL FORM
+FCB6          ; mapped                 ; 0636 062E     # 1.1  ARABIC LIGATURE DAD WITH KHAH INITIAL FORM
+FCB7          ; mapped                 ; 0636 0645     # 1.1  ARABIC LIGATURE DAD WITH MEEM INITIAL FORM
+FCB8          ; mapped                 ; 0637 062D     # 1.1  ARABIC LIGATURE TAH WITH HAH INITIAL FORM
+FCB9          ; mapped                 ; 0638 0645     # 1.1  ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM
+FCBA          ; mapped                 ; 0639 062C     # 1.1  ARABIC LIGATURE AIN WITH JEEM INITIAL FORM
+FCBB          ; mapped                 ; 0639 0645     # 1.1  ARABIC LIGATURE AIN WITH MEEM INITIAL FORM
+FCBC          ; mapped                 ; 063A 062C     # 1.1  ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM
+FCBD          ; mapped                 ; 063A 0645     # 1.1  ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM
+FCBE          ; mapped                 ; 0641 062C     # 1.1  ARABIC LIGATURE FEH WITH JEEM INITIAL FORM
+FCBF          ; mapped                 ; 0641 062D     # 1.1  ARABIC LIGATURE FEH WITH HAH INITIAL FORM
+FCC0          ; mapped                 ; 0641 062E     # 1.1  ARABIC LIGATURE FEH WITH KHAH INITIAL FORM
+FCC1          ; mapped                 ; 0641 0645     # 1.1  ARABIC LIGATURE FEH WITH MEEM INITIAL FORM
+FCC2          ; mapped                 ; 0642 062D     # 1.1  ARABIC LIGATURE QAF WITH HAH INITIAL FORM
+FCC3          ; mapped                 ; 0642 0645     # 1.1  ARABIC LIGATURE QAF WITH MEEM INITIAL FORM
+FCC4          ; mapped                 ; 0643 062C     # 1.1  ARABIC LIGATURE KAF WITH JEEM INITIAL FORM
+FCC5          ; mapped                 ; 0643 062D     # 1.1  ARABIC LIGATURE KAF WITH HAH INITIAL FORM
+FCC6          ; mapped                 ; 0643 062E     # 1.1  ARABIC LIGATURE KAF WITH KHAH INITIAL FORM
+FCC7          ; mapped                 ; 0643 0644     # 1.1  ARABIC LIGATURE KAF WITH LAM INITIAL FORM
+FCC8          ; mapped                 ; 0643 0645     # 1.1  ARABIC LIGATURE KAF WITH MEEM INITIAL FORM
+FCC9          ; mapped                 ; 0644 062C     # 1.1  ARABIC LIGATURE LAM WITH JEEM INITIAL FORM
+FCCA          ; mapped                 ; 0644 062D     # 1.1  ARABIC LIGATURE LAM WITH HAH INITIAL FORM
+FCCB          ; mapped                 ; 0644 062E     # 1.1  ARABIC LIGATURE LAM WITH KHAH INITIAL FORM
+FCCC          ; mapped                 ; 0644 0645     # 1.1  ARABIC LIGATURE LAM WITH MEEM INITIAL FORM
+FCCD          ; mapped                 ; 0644 0647     # 1.1  ARABIC LIGATURE LAM WITH HEH INITIAL FORM
+FCCE          ; mapped                 ; 0645 062C     # 1.1  ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM
+FCCF          ; mapped                 ; 0645 062D     # 1.1  ARABIC LIGATURE MEEM WITH HAH INITIAL FORM
+FCD0          ; mapped                 ; 0645 062E     # 1.1  ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM
+FCD1          ; mapped                 ; 0645 0645     # 1.1  ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM
+FCD2          ; mapped                 ; 0646 062C     # 1.1  ARABIC LIGATURE NOON WITH JEEM INITIAL FORM
+FCD3          ; mapped                 ; 0646 062D     # 1.1  ARABIC LIGATURE NOON WITH HAH INITIAL FORM
+FCD4          ; mapped                 ; 0646 062E     # 1.1  ARABIC LIGATURE NOON WITH KHAH INITIAL FORM
+FCD5          ; mapped                 ; 0646 0645     # 1.1  ARABIC LIGATURE NOON WITH MEEM INITIAL FORM
+FCD6          ; mapped                 ; 0646 0647     # 1.1  ARABIC LIGATURE NOON WITH HEH INITIAL FORM
+FCD7          ; mapped                 ; 0647 062C     # 1.1  ARABIC LIGATURE HEH WITH JEEM INITIAL FORM
+FCD8          ; mapped                 ; 0647 0645     # 1.1  ARABIC LIGATURE HEH WITH MEEM INITIAL FORM
+FCD9          ; mapped                 ; 0647 0670     # 1.1  ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM
+FCDA          ; mapped                 ; 064A 062C     # 1.1  ARABIC LIGATURE YEH WITH JEEM INITIAL FORM
+FCDB          ; mapped                 ; 064A 062D     # 1.1  ARABIC LIGATURE YEH WITH HAH INITIAL FORM
+FCDC          ; mapped                 ; 064A 062E     # 1.1  ARABIC LIGATURE YEH WITH KHAH INITIAL FORM
+FCDD          ; mapped                 ; 064A 0645     # 1.1  ARABIC LIGATURE YEH WITH MEEM INITIAL FORM
+FCDE          ; mapped                 ; 064A 0647     # 1.1  ARABIC LIGATURE YEH WITH HEH INITIAL FORM
+FCDF          ; mapped                 ; 0626 0645     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM
+FCE0          ; mapped                 ; 0626 0647     # 1.1  ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM
+FCE1          ; mapped                 ; 0628 0645     # 1.1  ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM
+FCE2          ; mapped                 ; 0628 0647     # 1.1  ARABIC LIGATURE BEH WITH HEH MEDIAL FORM
+FCE3          ; mapped                 ; 062A 0645     # 1.1  ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM
+FCE4          ; mapped                 ; 062A 0647     # 1.1  ARABIC LIGATURE TEH WITH HEH MEDIAL FORM
+FCE5          ; mapped                 ; 062B 0645     # 1.1  ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM
+FCE6          ; mapped                 ; 062B 0647     # 1.1  ARABIC LIGATURE THEH WITH HEH MEDIAL FORM
+FCE7          ; mapped                 ; 0633 0645     # 1.1  ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM
+FCE8          ; mapped                 ; 0633 0647     # 1.1  ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM
+FCE9          ; mapped                 ; 0634 0645     # 1.1  ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM
+FCEA          ; mapped                 ; 0634 0647     # 1.1  ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM
+FCEB          ; mapped                 ; 0643 0644     # 1.1  ARABIC LIGATURE KAF WITH LAM MEDIAL FORM
+FCEC          ; mapped                 ; 0643 0645     # 1.1  ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM
+FCED          ; mapped                 ; 0644 0645     # 1.1  ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM
+FCEE          ; mapped                 ; 0646 0645     # 1.1  ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM
+FCEF          ; mapped                 ; 0646 0647     # 1.1  ARABIC LIGATURE NOON WITH HEH MEDIAL FORM
+FCF0          ; mapped                 ; 064A 0645     # 1.1  ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM
+FCF1          ; mapped                 ; 064A 0647     # 1.1  ARABIC LIGATURE YEH WITH HEH MEDIAL FORM
+FCF2          ; mapped                 ; 0640 064E 0651 #1.1  ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM
+FCF3          ; mapped                 ; 0640 064F 0651 #1.1  ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM
+FCF4          ; mapped                 ; 0640 0650 0651 #1.1  ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM
+FCF5          ; mapped                 ; 0637 0649     # 1.1  ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM
+FCF6          ; mapped                 ; 0637 064A     # 1.1  ARABIC LIGATURE TAH WITH YEH ISOLATED FORM
+FCF7          ; mapped                 ; 0639 0649     # 1.1  ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM
+FCF8          ; mapped                 ; 0639 064A     # 1.1  ARABIC LIGATURE AIN WITH YEH ISOLATED FORM
+FCF9          ; mapped                 ; 063A 0649     # 1.1  ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM
+FCFA          ; mapped                 ; 063A 064A     # 1.1  ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM
+FCFB          ; mapped                 ; 0633 0649     # 1.1  ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM
+FCFC          ; mapped                 ; 0633 064A     # 1.1  ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM
+FCFD          ; mapped                 ; 0634 0649     # 1.1  ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM
+FCFE          ; mapped                 ; 0634 064A     # 1.1  ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM
+FCFF          ; mapped                 ; 062D 0649     # 1.1  ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM
+FD00          ; mapped                 ; 062D 064A     # 1.1  ARABIC LIGATURE HAH WITH YEH ISOLATED FORM
+FD01          ; mapped                 ; 062C 0649     # 1.1  ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM
+FD02          ; mapped                 ; 062C 064A     # 1.1  ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM
+FD03          ; mapped                 ; 062E 0649     # 1.1  ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM
+FD04          ; mapped                 ; 062E 064A     # 1.1  ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM
+FD05          ; mapped                 ; 0635 0649     # 1.1  ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM
+FD06          ; mapped                 ; 0635 064A     # 1.1  ARABIC LIGATURE SAD WITH YEH ISOLATED FORM
+FD07          ; mapped                 ; 0636 0649     # 1.1  ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM
+FD08          ; mapped                 ; 0636 064A     # 1.1  ARABIC LIGATURE DAD WITH YEH ISOLATED FORM
+FD09          ; mapped                 ; 0634 062C     # 1.1  ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM
+FD0A          ; mapped                 ; 0634 062D     # 1.1  ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM
+FD0B          ; mapped                 ; 0634 062E     # 1.1  ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM
+FD0C          ; mapped                 ; 0634 0645     # 1.1  ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM
+FD0D          ; mapped                 ; 0634 0631     # 1.1  ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM
+FD0E          ; mapped                 ; 0633 0631     # 1.1  ARABIC LIGATURE SEEN WITH REH ISOLATED FORM
+FD0F          ; mapped                 ; 0635 0631     # 1.1  ARABIC LIGATURE SAD WITH REH ISOLATED FORM
+FD10          ; mapped                 ; 0636 0631     # 1.1  ARABIC LIGATURE DAD WITH REH ISOLATED FORM
+FD11          ; mapped                 ; 0637 0649     # 1.1  ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM
+FD12          ; mapped                 ; 0637 064A     # 1.1  ARABIC LIGATURE TAH WITH YEH FINAL FORM
+FD13          ; mapped                 ; 0639 0649     # 1.1  ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM
+FD14          ; mapped                 ; 0639 064A     # 1.1  ARABIC LIGATURE AIN WITH YEH FINAL FORM
+FD15          ; mapped                 ; 063A 0649     # 1.1  ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM
+FD16          ; mapped                 ; 063A 064A     # 1.1  ARABIC LIGATURE GHAIN WITH YEH FINAL FORM
+FD17          ; mapped                 ; 0633 0649     # 1.1  ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM
+FD18          ; mapped                 ; 0633 064A     # 1.1  ARABIC LIGATURE SEEN WITH YEH FINAL FORM
+FD19          ; mapped                 ; 0634 0649     # 1.1  ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM
+FD1A          ; mapped                 ; 0634 064A     # 1.1  ARABIC LIGATURE SHEEN WITH YEH FINAL FORM
+FD1B          ; mapped                 ; 062D 0649     # 1.1  ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM
+FD1C          ; mapped                 ; 062D 064A     # 1.1  ARABIC LIGATURE HAH WITH YEH FINAL FORM
+FD1D          ; mapped                 ; 062C 0649     # 1.1  ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM
+FD1E          ; mapped                 ; 062C 064A     # 1.1  ARABIC LIGATURE JEEM WITH YEH FINAL FORM
+FD1F          ; mapped                 ; 062E 0649     # 1.1  ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM
+FD20          ; mapped                 ; 062E 064A     # 1.1  ARABIC LIGATURE KHAH WITH YEH FINAL FORM
+FD21          ; mapped                 ; 0635 0649     # 1.1  ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM
+FD22          ; mapped                 ; 0635 064A     # 1.1  ARABIC LIGATURE SAD WITH YEH FINAL FORM
+FD23          ; mapped                 ; 0636 0649     # 1.1  ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM
+FD24          ; mapped                 ; 0636 064A     # 1.1  ARABIC LIGATURE DAD WITH YEH FINAL FORM
+FD25          ; mapped                 ; 0634 062C     # 1.1  ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM
+FD26          ; mapped                 ; 0634 062D     # 1.1  ARABIC LIGATURE SHEEN WITH HAH FINAL FORM
+FD27          ; mapped                 ; 0634 062E     # 1.1  ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM
+FD28          ; mapped                 ; 0634 0645     # 1.1  ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM
+FD29          ; mapped                 ; 0634 0631     # 1.1  ARABIC LIGATURE SHEEN WITH REH FINAL FORM
+FD2A          ; mapped                 ; 0633 0631     # 1.1  ARABIC LIGATURE SEEN WITH REH FINAL FORM
+FD2B          ; mapped                 ; 0635 0631     # 1.1  ARABIC LIGATURE SAD WITH REH FINAL FORM
+FD2C          ; mapped                 ; 0636 0631     # 1.1  ARABIC LIGATURE DAD WITH REH FINAL FORM
+FD2D          ; mapped                 ; 0634 062C     # 1.1  ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM
+FD2E          ; mapped                 ; 0634 062D     # 1.1  ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM
+FD2F          ; mapped                 ; 0634 062E     # 1.1  ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM
+FD30          ; mapped                 ; 0634 0645     # 1.1  ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM
+FD31          ; mapped                 ; 0633 0647     # 1.1  ARABIC LIGATURE SEEN WITH HEH INITIAL FORM
+FD32          ; mapped                 ; 0634 0647     # 1.1  ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM
+FD33          ; mapped                 ; 0637 0645     # 1.1  ARABIC LIGATURE TAH WITH MEEM INITIAL FORM
+FD34          ; mapped                 ; 0633 062C     # 1.1  ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM
+FD35          ; mapped                 ; 0633 062D     # 1.1  ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM
+FD36          ; mapped                 ; 0633 062E     # 1.1  ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM
+FD37          ; mapped                 ; 0634 062C     # 1.1  ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM
+FD38          ; mapped                 ; 0634 062D     # 1.1  ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM
+FD39          ; mapped                 ; 0634 062E     # 1.1  ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM
+FD3A          ; mapped                 ; 0637 0645     # 1.1  ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM
+FD3B          ; mapped                 ; 0638 0645     # 1.1  ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM
+FD3C..FD3D    ; mapped                 ; 0627 064B     # 1.1  ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM
+FD3E..FD3F    ; valid                  ;      ; NV8    # 1.1  ORNATE LEFT PARENTHESIS..ORNATE RIGHT PARENTHESIS
+FD40..FD4F    ; disallowed                             # NA   <reserved-FD40>..<reserved-FD4F>
+FD50          ; mapped                 ; 062A 062C 0645 #1.1  ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM
+FD51..FD52    ; mapped                 ; 062A 062D 062C #1.1  ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM..ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM
+FD53          ; mapped                 ; 062A 062D 0645 #1.1  ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM
+FD54          ; mapped                 ; 062A 062E 0645 #1.1  ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM
+FD55          ; mapped                 ; 062A 0645 062C #1.1  ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM
+FD56          ; mapped                 ; 062A 0645 062D #1.1  ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM
+FD57          ; mapped                 ; 062A 0645 062E #1.1  ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM
+FD58..FD59    ; mapped                 ; 062C 0645 062D #1.1  ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM..ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM
+FD5A          ; mapped                 ; 062D 0645 064A #1.1  ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM
+FD5B          ; mapped                 ; 062D 0645 0649 #1.1  ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM
+FD5C          ; mapped                 ; 0633 062D 062C #1.1  ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM
+FD5D          ; mapped                 ; 0633 062C 062D #1.1  ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM
+FD5E          ; mapped                 ; 0633 062C 0649 #1.1  ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM
+FD5F..FD60    ; mapped                 ; 0633 0645 062D #1.1  ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM..ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM
+FD61          ; mapped                 ; 0633 0645 062C #1.1  ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM
+FD62..FD63    ; mapped                 ; 0633 0645 0645 #1.1  ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM..ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM
+FD64..FD65    ; mapped                 ; 0635 062D 062D #1.1  ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM..ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM
+FD66          ; mapped                 ; 0635 0645 0645 #1.1  ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM
+FD67..FD68    ; mapped                 ; 0634 062D 0645 #1.1  ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM..ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM
+FD69          ; mapped                 ; 0634 062C 064A #1.1  ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM
+FD6A..FD6B    ; mapped                 ; 0634 0645 062E #1.1  ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM..ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM
+FD6C..FD6D    ; mapped                 ; 0634 0645 0645 #1.1  ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM..ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM
+FD6E          ; mapped                 ; 0636 062D 0649 #1.1  ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM
+FD6F..FD70    ; mapped                 ; 0636 062E 0645 #1.1  ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM..ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM
+FD71..FD72    ; mapped                 ; 0637 0645 062D #1.1  ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM..ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM
+FD73          ; mapped                 ; 0637 0645 0645 #1.1  ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM
+FD74          ; mapped                 ; 0637 0645 064A #1.1  ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM
+FD75          ; mapped                 ; 0639 062C 0645 #1.1  ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM
+FD76..FD77    ; mapped                 ; 0639 0645 0645 #1.1  ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM..ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM
+FD78          ; mapped                 ; 0639 0645 0649 #1.1  ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM
+FD79          ; mapped                 ; 063A 0645 0645 #1.1  ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM
+FD7A          ; mapped                 ; 063A 0645 064A #1.1  ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM
+FD7B          ; mapped                 ; 063A 0645 0649 #1.1  ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM
+FD7C..FD7D    ; mapped                 ; 0641 062E 0645 #1.1  ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM..ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM
+FD7E          ; mapped                 ; 0642 0645 062D #1.1  ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM
+FD7F          ; mapped                 ; 0642 0645 0645 #1.1  ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM
+FD80          ; mapped                 ; 0644 062D 0645 #1.1  ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM
+FD81          ; mapped                 ; 0644 062D 064A #1.1  ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM
+FD82          ; mapped                 ; 0644 062D 0649 #1.1  ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM
+FD83..FD84    ; mapped                 ; 0644 062C 062C #1.1  ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM..ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM
+FD85..FD86    ; mapped                 ; 0644 062E 0645 #1.1  ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM..ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM
+FD87..FD88    ; mapped                 ; 0644 0645 062D #1.1  ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM..ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM
+FD89          ; mapped                 ; 0645 062D 062C #1.1  ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM
+FD8A          ; mapped                 ; 0645 062D 0645 #1.1  ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM
+FD8B          ; mapped                 ; 0645 062D 064A #1.1  ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM
+FD8C          ; mapped                 ; 0645 062C 062D #1.1  ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM
+FD8D          ; mapped                 ; 0645 062C 0645 #1.1  ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM
+FD8E          ; mapped                 ; 0645 062E 062C #1.1  ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM
+FD8F          ; mapped                 ; 0645 062E 0645 #1.1  ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM
+FD90..FD91    ; disallowed                             # NA   <reserved-FD90>..<reserved-FD91>
+FD92          ; mapped                 ; 0645 062C 062E #1.1  ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM
+FD93          ; mapped                 ; 0647 0645 062C #1.1  ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM
+FD94          ; mapped                 ; 0647 0645 0645 #1.1  ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM
+FD95          ; mapped                 ; 0646 062D 0645 #1.1  ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM
+FD96          ; mapped                 ; 0646 062D 0649 #1.1  ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM
+FD97..FD98    ; mapped                 ; 0646 062C 0645 #1.1  ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM
+FD99          ; mapped                 ; 0646 062C 0649 #1.1  ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM
+FD9A          ; mapped                 ; 0646 0645 064A #1.1  ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM
+FD9B          ; mapped                 ; 0646 0645 0649 #1.1  ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM
+FD9C..FD9D    ; mapped                 ; 064A 0645 0645 #1.1  ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM..ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM
+FD9E          ; mapped                 ; 0628 062E 064A #1.1  ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM
+FD9F          ; mapped                 ; 062A 062C 064A #1.1  ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM
+FDA0          ; mapped                 ; 062A 062C 0649 #1.1  ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM
+FDA1          ; mapped                 ; 062A 062E 064A #1.1  ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM
+FDA2          ; mapped                 ; 062A 062E 0649 #1.1  ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM
+FDA3          ; mapped                 ; 062A 0645 064A #1.1  ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM
+FDA4          ; mapped                 ; 062A 0645 0649 #1.1  ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM
+FDA5          ; mapped                 ; 062C 0645 064A #1.1  ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM
+FDA6          ; mapped                 ; 062C 062D 0649 #1.1  ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM
+FDA7          ; mapped                 ; 062C 0645 0649 #1.1  ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM
+FDA8          ; mapped                 ; 0633 062E 0649 #1.1  ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM
+FDA9          ; mapped                 ; 0635 062D 064A #1.1  ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM
+FDAA          ; mapped                 ; 0634 062D 064A #1.1  ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM
+FDAB          ; mapped                 ; 0636 062D 064A #1.1  ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM
+FDAC          ; mapped                 ; 0644 062C 064A #1.1  ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM
+FDAD          ; mapped                 ; 0644 0645 064A #1.1  ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM
+FDAE          ; mapped                 ; 064A 062D 064A #1.1  ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM
+FDAF          ; mapped                 ; 064A 062C 064A #1.1  ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM
+FDB0          ; mapped                 ; 064A 0645 064A #1.1  ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM
+FDB1          ; mapped                 ; 0645 0645 064A #1.1  ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM
+FDB2          ; mapped                 ; 0642 0645 064A #1.1  ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM
+FDB3          ; mapped                 ; 0646 062D 064A #1.1  ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM
+FDB4          ; mapped                 ; 0642 0645 062D #1.1  ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM
+FDB5          ; mapped                 ; 0644 062D 0645 #1.1  ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM
+FDB6          ; mapped                 ; 0639 0645 064A #1.1  ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM
+FDB7          ; mapped                 ; 0643 0645 064A #1.1  ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM
+FDB8          ; mapped                 ; 0646 062C 062D #1.1  ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM
+FDB9          ; mapped                 ; 0645 062E 064A #1.1  ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM
+FDBA          ; mapped                 ; 0644 062C 0645 #1.1  ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM
+FDBB          ; mapped                 ; 0643 0645 0645 #1.1  ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM
+FDBC          ; mapped                 ; 0644 062C 0645 #1.1  ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM
+FDBD          ; mapped                 ; 0646 062C 062D #1.1  ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM
+FDBE          ; mapped                 ; 062C 062D 064A #1.1  ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM
+FDBF          ; mapped                 ; 062D 062C 064A #1.1  ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM
+FDC0          ; mapped                 ; 0645 062C 064A #1.1  ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM
+FDC1          ; mapped                 ; 0641 0645 064A #1.1  ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM
+FDC2          ; mapped                 ; 0628 062D 064A #1.1  ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM
+FDC3          ; mapped                 ; 0643 0645 0645 #1.1  ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM
+FDC4          ; mapped                 ; 0639 062C 0645 #1.1  ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM
+FDC5          ; mapped                 ; 0635 0645 0645 #1.1  ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM
+FDC6          ; mapped                 ; 0633 062E 064A #1.1  ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM
+FDC7          ; mapped                 ; 0646 062C 064A #1.1  ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM
+FDC8..FDCF    ; disallowed                             # NA   <reserved-FDC8>..<reserved-FDCF>
+FDD0..FDEF    ; disallowed                             # 3.1  <noncharacter-FDD0>..<noncharacter-FDEF>
+FDF0          ; mapped                 ; 0635 0644 06D2 #1.1  ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM
+FDF1          ; mapped                 ; 0642 0644 06D2 #1.1  ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM
+FDF2          ; mapped                 ; 0627 0644 0644 0647 #1.1 ARABIC LIGATURE ALLAH ISOLATED FORM
+FDF3          ; mapped                 ; 0627 0643 0628 0631 #1.1 ARABIC LIGATURE AKBAR ISOLATED FORM
+FDF4          ; mapped                 ; 0645 062D 0645 062F #1.1 ARABIC LIGATURE MOHAMMAD ISOLATED FORM
+FDF5          ; mapped                 ; 0635 0644 0639 0645 #1.1 ARABIC LIGATURE SALAM ISOLATED FORM
+FDF6          ; mapped                 ; 0631 0633 0648 0644 #1.1 ARABIC LIGATURE RASOUL ISOLATED FORM
+FDF7          ; mapped                 ; 0639 0644 064A 0647 #1.1 ARABIC LIGATURE ALAYHE ISOLATED FORM
+FDF8          ; mapped                 ; 0648 0633 0644 0645 #1.1 ARABIC LIGATURE WASALLAM ISOLATED FORM
+FDF9          ; mapped                 ; 0635 0644 0649 #1.1  ARABIC LIGATURE SALLA ISOLATED FORM
+FDFA          ; disallowed_STD3_mapped ; 0635 0644 0649 0020 0627 0644 0644 0647 0020 0639 0644 064A 0647 0020 0648 0633 0644 0645 #1.1 ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM
+FDFB          ; disallowed_STD3_mapped ; 062C 0644 0020 062C 0644 0627 0644 0647 #1.1 ARABIC LIGATURE JALLAJALALOUHOU
+FDFC          ; mapped                 ; 0631 06CC 0627 0644 #3.2 RIAL SIGN
+FDFD          ; valid                  ;      ; NV8    # 4.0  ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM
+FDFE..FDFF    ; disallowed                             # NA   <reserved-FDFE>..<reserved-FDFF>
+FE00..FE0F    ; ignored                                # 3.2  VARIATION SELECTOR-1..VARIATION SELECTOR-16
+FE10          ; disallowed_STD3_mapped ; 002C          # 4.1  PRESENTATION FORM FOR VERTICAL COMMA
+FE11          ; mapped                 ; 3001          # 4.1  PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA
+FE12          ; disallowed                             # 4.1  PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP
+FE13          ; disallowed_STD3_mapped ; 003A          # 4.1  PRESENTATION FORM FOR VERTICAL COLON
+FE14          ; disallowed_STD3_mapped ; 003B          # 4.1  PRESENTATION FORM FOR VERTICAL SEMICOLON
+FE15          ; disallowed_STD3_mapped ; 0021          # 4.1  PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK
+FE16          ; disallowed_STD3_mapped ; 003F          # 4.1  PRESENTATION FORM FOR VERTICAL QUESTION MARK
+FE17          ; mapped                 ; 3016          # 4.1  PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET
+FE18          ; mapped                 ; 3017          # 4.1  PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET
+FE19          ; disallowed                             # 4.1  PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS
+FE1A..FE1F    ; disallowed                             # NA   <reserved-FE1A>..<reserved-FE1F>
+FE20..FE23    ; valid                                  # 1.1  COMBINING LIGATURE LEFT HALF..COMBINING DOUBLE TILDE RIGHT HALF
+FE24..FE26    ; valid                                  # 5.1  COMBINING MACRON LEFT HALF..COMBINING CONJOINING MACRON
+FE27..FE2D    ; valid                                  # 7.0  COMBINING LIGATURE LEFT HALF BELOW..COMBINING CONJOINING MACRON BELOW
+FE2E..FE2F    ; valid                                  # 8.0  COMBINING CYRILLIC TITLO LEFT HALF..COMBINING CYRILLIC TITLO RIGHT HALF
+FE30          ; disallowed                             # 1.1  PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
+FE31          ; mapped                 ; 2014          # 1.1  PRESENTATION FORM FOR VERTICAL EM DASH
+FE32          ; mapped                 ; 2013          # 1.1  PRESENTATION FORM FOR VERTICAL EN DASH
+FE33..FE34    ; disallowed_STD3_mapped ; 005F          # 1.1  PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
+FE35          ; disallowed_STD3_mapped ; 0028          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS
+FE36          ; disallowed_STD3_mapped ; 0029          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
+FE37          ; disallowed_STD3_mapped ; 007B          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET
+FE38          ; disallowed_STD3_mapped ; 007D          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
+FE39          ; mapped                 ; 3014          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET
+FE3A          ; mapped                 ; 3015          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
+FE3B          ; mapped                 ; 3010          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET
+FE3C          ; mapped                 ; 3011          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET
+FE3D          ; mapped                 ; 300A          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET
+FE3E          ; mapped                 ; 300B          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET
+FE3F          ; mapped                 ; 3008          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET
+FE40          ; mapped                 ; 3009          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET
+FE41          ; mapped                 ; 300C          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET
+FE42          ; mapped                 ; 300D          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET
+FE43          ; mapped                 ; 300E          # 1.1  PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET
+FE44          ; mapped                 ; 300F          # 1.1  PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET
+FE45..FE46    ; valid                  ;      ; NV8    # 3.2  SESAME DOT..WHITE SESAME DOT
+FE47          ; disallowed_STD3_mapped ; 005B          # 4.0  PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET
+FE48          ; disallowed_STD3_mapped ; 005D          # 4.0  PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET
+FE49..FE4C    ; disallowed_STD3_mapped ; 0020 0305     # 1.1  DASHED OVERLINE..DOUBLE WAVY OVERLINE
+FE4D..FE4F    ; disallowed_STD3_mapped ; 005F          # 1.1  DASHED LOW LINE..WAVY LOW LINE
+FE50          ; disallowed_STD3_mapped ; 002C          # 1.1  SMALL COMMA
+FE51          ; mapped                 ; 3001          # 1.1  SMALL IDEOGRAPHIC COMMA
+FE52          ; disallowed                             # 1.1  SMALL FULL STOP
+FE53          ; disallowed                             # NA   <reserved-FE53>
+FE54          ; disallowed_STD3_mapped ; 003B          # 1.1  SMALL SEMICOLON
+FE55          ; disallowed_STD3_mapped ; 003A          # 1.1  SMALL COLON
+FE56          ; disallowed_STD3_mapped ; 003F          # 1.1  SMALL QUESTION MARK
+FE57          ; disallowed_STD3_mapped ; 0021          # 1.1  SMALL EXCLAMATION MARK
+FE58          ; mapped                 ; 2014          # 1.1  SMALL EM DASH
+FE59          ; disallowed_STD3_mapped ; 0028          # 1.1  SMALL LEFT PARENTHESIS
+FE5A          ; disallowed_STD3_mapped ; 0029          # 1.1  SMALL RIGHT PARENTHESIS
+FE5B          ; disallowed_STD3_mapped ; 007B          # 1.1  SMALL LEFT CURLY BRACKET
+FE5C          ; disallowed_STD3_mapped ; 007D          # 1.1  SMALL RIGHT CURLY BRACKET
+FE5D          ; mapped                 ; 3014          # 1.1  SMALL LEFT TORTOISE SHELL BRACKET
+FE5E          ; mapped                 ; 3015          # 1.1  SMALL RIGHT TORTOISE SHELL BRACKET
+FE5F          ; disallowed_STD3_mapped ; 0023          # 1.1  SMALL NUMBER SIGN
+FE60          ; disallowed_STD3_mapped ; 0026          # 1.1  SMALL AMPERSAND
+FE61          ; disallowed_STD3_mapped ; 002A          # 1.1  SMALL ASTERISK
+FE62          ; disallowed_STD3_mapped ; 002B          # 1.1  SMALL PLUS SIGN
+FE63          ; mapped                 ; 002D          # 1.1  SMALL HYPHEN-MINUS
+FE64          ; disallowed_STD3_mapped ; 003C          # 1.1  SMALL LESS-THAN SIGN
+FE65          ; disallowed_STD3_mapped ; 003E          # 1.1  SMALL GREATER-THAN SIGN
+FE66          ; disallowed_STD3_mapped ; 003D          # 1.1  SMALL EQUALS SIGN
+FE67          ; disallowed                             # NA   <reserved-FE67>
+FE68          ; disallowed_STD3_mapped ; 005C          # 1.1  SMALL REVERSE SOLIDUS
+FE69          ; disallowed_STD3_mapped ; 0024          # 1.1  SMALL DOLLAR SIGN
+FE6A          ; disallowed_STD3_mapped ; 0025          # 1.1  SMALL PERCENT SIGN
+FE6B          ; disallowed_STD3_mapped ; 0040          # 1.1  SMALL COMMERCIAL AT
+FE6C..FE6F    ; disallowed                             # NA   <reserved-FE6C>..<reserved-FE6F>
+FE70          ; disallowed_STD3_mapped ; 0020 064B     # 1.1  ARABIC FATHATAN ISOLATED FORM
+FE71          ; mapped                 ; 0640 064B     # 1.1  ARABIC TATWEEL WITH FATHATAN ABOVE
+FE72          ; disallowed_STD3_mapped ; 0020 064C     # 1.1  ARABIC DAMMATAN ISOLATED FORM
+FE73          ; valid                                  # 3.2  ARABIC TAIL FRAGMENT
+FE74          ; disallowed_STD3_mapped ; 0020 064D     # 1.1  ARABIC KASRATAN ISOLATED FORM
+FE75          ; disallowed                             # NA   <reserved-FE75>
+FE76          ; disallowed_STD3_mapped ; 0020 064E     # 1.1  ARABIC FATHA ISOLATED FORM
+FE77          ; mapped                 ; 0640 064E     # 1.1  ARABIC FATHA MEDIAL FORM
+FE78          ; disallowed_STD3_mapped ; 0020 064F     # 1.1  ARABIC DAMMA ISOLATED FORM
+FE79          ; mapped                 ; 0640 064F     # 1.1  ARABIC DAMMA MEDIAL FORM
+FE7A          ; disallowed_STD3_mapped ; 0020 0650     # 1.1  ARABIC KASRA ISOLATED FORM
+FE7B          ; mapped                 ; 0640 0650     # 1.1  ARABIC KASRA MEDIAL FORM
+FE7C          ; disallowed_STD3_mapped ; 0020 0651     # 1.1  ARABIC SHADDA ISOLATED FORM
+FE7D          ; mapped                 ; 0640 0651     # 1.1  ARABIC SHADDA MEDIAL FORM
+FE7E          ; disallowed_STD3_mapped ; 0020 0652     # 1.1  ARABIC SUKUN ISOLATED FORM
+FE7F          ; mapped                 ; 0640 0652     # 1.1  ARABIC SUKUN MEDIAL FORM
+FE80          ; mapped                 ; 0621          # 1.1  ARABIC LETTER HAMZA ISOLATED FORM
+FE81..FE82    ; mapped                 ; 0622          # 1.1  ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM..ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM
+FE83..FE84    ; mapped                 ; 0623          # 1.1  ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM..ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM
+FE85..FE86    ; mapped                 ; 0624          # 1.1  ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM..ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM
+FE87..FE88    ; mapped                 ; 0625          # 1.1  ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM..ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM
+FE89..FE8C    ; mapped                 ; 0626          # 1.1  ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM..ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM
+FE8D..FE8E    ; mapped                 ; 0627          # 1.1  ARABIC LETTER ALEF ISOLATED FORM..ARABIC LETTER ALEF FINAL FORM
+FE8F..FE92    ; mapped                 ; 0628          # 1.1  ARABIC LETTER BEH ISOLATED FORM..ARABIC LETTER BEH MEDIAL FORM
+FE93..FE94    ; mapped                 ; 0629          # 1.1  ARABIC LETTER TEH MARBUTA ISOLATED FORM..ARABIC LETTER TEH MARBUTA FINAL FORM
+FE95..FE98    ; mapped                 ; 062A          # 1.1  ARABIC LETTER TEH ISOLATED FORM..ARABIC LETTER TEH MEDIAL FORM
+FE99..FE9C    ; mapped                 ; 062B          # 1.1  ARABIC LETTER THEH ISOLATED FORM..ARABIC LETTER THEH MEDIAL FORM
+FE9D..FEA0    ; mapped                 ; 062C          # 1.1  ARABIC LETTER JEEM ISOLATED FORM..ARABIC LETTER JEEM MEDIAL FORM
+FEA1..FEA4    ; mapped                 ; 062D          # 1.1  ARABIC LETTER HAH ISOLATED FORM..ARABIC LETTER HAH MEDIAL FORM
+FEA5..FEA8    ; mapped                 ; 062E          # 1.1  ARABIC LETTER KHAH ISOLATED FORM..ARABIC LETTER KHAH MEDIAL FORM
+FEA9..FEAA    ; mapped                 ; 062F          # 1.1  ARABIC LETTER DAL ISOLATED FORM..ARABIC LETTER DAL FINAL FORM
+FEAB..FEAC    ; mapped                 ; 0630          # 1.1  ARABIC LETTER THAL ISOLATED FORM..ARABIC LETTER THAL FINAL FORM
+FEAD..FEAE    ; mapped                 ; 0631          # 1.1  ARABIC LETTER REH ISOLATED FORM..ARABIC LETTER REH FINAL FORM
+FEAF..FEB0    ; mapped                 ; 0632          # 1.1  ARABIC LETTER ZAIN ISOLATED FORM..ARABIC LETTER ZAIN FINAL FORM
+FEB1..FEB4    ; mapped                 ; 0633          # 1.1  ARABIC LETTER SEEN ISOLATED FORM..ARABIC LETTER SEEN MEDIAL FORM
+FEB5..FEB8    ; mapped                 ; 0634          # 1.1  ARABIC LETTER SHEEN ISOLATED FORM..ARABIC LETTER SHEEN MEDIAL FORM
+FEB9..FEBC    ; mapped                 ; 0635          # 1.1  ARABIC LETTER SAD ISOLATED FORM..ARABIC LETTER SAD MEDIAL FORM
+FEBD..FEC0    ; mapped                 ; 0636          # 1.1  ARABIC LETTER DAD ISOLATED FORM..ARABIC LETTER DAD MEDIAL FORM
+FEC1..FEC4    ; mapped                 ; 0637          # 1.1  ARABIC LETTER TAH ISOLATED FORM..ARABIC LETTER TAH MEDIAL FORM
+FEC5..FEC8    ; mapped                 ; 0638          # 1.1  ARABIC LETTER ZAH ISOLATED FORM..ARABIC LETTER ZAH MEDIAL FORM
+FEC9..FECC    ; mapped                 ; 0639          # 1.1  ARABIC LETTER AIN ISOLATED FORM..ARABIC LETTER AIN MEDIAL FORM
+FECD..FED0    ; mapped                 ; 063A          # 1.1  ARABIC LETTER GHAIN ISOLATED FORM..ARABIC LETTER GHAIN MEDIAL FORM
+FED1..FED4    ; mapped                 ; 0641          # 1.1  ARABIC LETTER FEH ISOLATED FORM..ARABIC LETTER FEH MEDIAL FORM
+FED5..FED8    ; mapped                 ; 0642          # 1.1  ARABIC LETTER QAF ISOLATED FORM..ARABIC LETTER QAF MEDIAL FORM
+FED9..FEDC    ; mapped                 ; 0643          # 1.1  ARABIC LETTER KAF ISOLATED FORM..ARABIC LETTER KAF MEDIAL FORM
+FEDD..FEE0    ; mapped                 ; 0644          # 1.1  ARABIC LETTER LAM ISOLATED FORM..ARABIC LETTER LAM MEDIAL FORM
+FEE1..FEE4    ; mapped                 ; 0645          # 1.1  ARABIC LETTER MEEM ISOLATED FORM..ARABIC LETTER MEEM MEDIAL FORM
+FEE5..FEE8    ; mapped                 ; 0646          # 1.1  ARABIC LETTER NOON ISOLATED FORM..ARABIC LETTER NOON MEDIAL FORM
+FEE9..FEEC    ; mapped                 ; 0647          # 1.1  ARABIC LETTER HEH ISOLATED FORM..ARABIC LETTER HEH MEDIAL FORM
+FEED..FEEE    ; mapped                 ; 0648          # 1.1  ARABIC LETTER WAW ISOLATED FORM..ARABIC LETTER WAW FINAL FORM
+FEEF..FEF0    ; mapped                 ; 0649          # 1.1  ARABIC LETTER ALEF MAKSURA ISOLATED FORM..ARABIC LETTER ALEF MAKSURA FINAL FORM
+FEF1..FEF4    ; mapped                 ; 064A          # 1.1  ARABIC LETTER YEH ISOLATED FORM..ARABIC LETTER YEH MEDIAL FORM
+FEF5..FEF6    ; mapped                 ; 0644 0622     # 1.1  ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM
+FEF7..FEF8    ; mapped                 ; 0644 0623     # 1.1  ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM
+FEF9..FEFA    ; mapped                 ; 0644 0625     # 1.1  ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM
+FEFB..FEFC    ; mapped                 ; 0644 0627     # 1.1  ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM
+FEFD..FEFE    ; disallowed                             # NA   <reserved-FEFD>..<reserved-FEFE>
+FEFF          ; ignored                                # 1.1  ZERO WIDTH NO-BREAK SPACE
+FF00          ; disallowed                             # NA   <reserved-FF00>
+FF01          ; disallowed_STD3_mapped ; 0021          # 1.1  FULLWIDTH EXCLAMATION MARK
+FF02          ; disallowed_STD3_mapped ; 0022          # 1.1  FULLWIDTH QUOTATION MARK
+FF03          ; disallowed_STD3_mapped ; 0023          # 1.1  FULLWIDTH NUMBER SIGN
+FF04          ; disallowed_STD3_mapped ; 0024          # 1.1  FULLWIDTH DOLLAR SIGN
+FF05          ; disallowed_STD3_mapped ; 0025          # 1.1  FULLWIDTH PERCENT SIGN
+FF06          ; disallowed_STD3_mapped ; 0026          # 1.1  FULLWIDTH AMPERSAND
+FF07          ; disallowed_STD3_mapped ; 0027          # 1.1  FULLWIDTH APOSTROPHE
+FF08          ; disallowed_STD3_mapped ; 0028          # 1.1  FULLWIDTH LEFT PARENTHESIS
+FF09          ; disallowed_STD3_mapped ; 0029          # 1.1  FULLWIDTH RIGHT PARENTHESIS
+FF0A          ; disallowed_STD3_mapped ; 002A          # 1.1  FULLWIDTH ASTERISK
+FF0B          ; disallowed_STD3_mapped ; 002B          # 1.1  FULLWIDTH PLUS SIGN
+FF0C          ; disallowed_STD3_mapped ; 002C          # 1.1  FULLWIDTH COMMA
+FF0D          ; mapped                 ; 002D          # 1.1  FULLWIDTH HYPHEN-MINUS
+FF0E          ; mapped                 ; 002E          # 1.1  FULLWIDTH FULL STOP
+FF0F          ; disallowed_STD3_mapped ; 002F          # 1.1  FULLWIDTH SOLIDUS
+FF10          ; mapped                 ; 0030          # 1.1  FULLWIDTH DIGIT ZERO
+FF11          ; mapped                 ; 0031          # 1.1  FULLWIDTH DIGIT ONE
+FF12          ; mapped                 ; 0032          # 1.1  FULLWIDTH DIGIT TWO
+FF13          ; mapped                 ; 0033          # 1.1  FULLWIDTH DIGIT THREE
+FF14          ; mapped                 ; 0034          # 1.1  FULLWIDTH DIGIT FOUR
+FF15          ; mapped                 ; 0035          # 1.1  FULLWIDTH DIGIT FIVE
+FF16          ; mapped                 ; 0036          # 1.1  FULLWIDTH DIGIT SIX
+FF17          ; mapped                 ; 0037          # 1.1  FULLWIDTH DIGIT SEVEN
+FF18          ; mapped                 ; 0038          # 1.1  FULLWIDTH DIGIT EIGHT
+FF19          ; mapped                 ; 0039          # 1.1  FULLWIDTH DIGIT NINE
+FF1A          ; disallowed_STD3_mapped ; 003A          # 1.1  FULLWIDTH COLON
+FF1B          ; disallowed_STD3_mapped ; 003B          # 1.1  FULLWIDTH SEMICOLON
+FF1C          ; disallowed_STD3_mapped ; 003C          # 1.1  FULLWIDTH LESS-THAN SIGN
+FF1D          ; disallowed_STD3_mapped ; 003D          # 1.1  FULLWIDTH EQUALS SIGN
+FF1E          ; disallowed_STD3_mapped ; 003E          # 1.1  FULLWIDTH GREATER-THAN SIGN
+FF1F          ; disallowed_STD3_mapped ; 003F          # 1.1  FULLWIDTH QUESTION MARK
+FF20          ; disallowed_STD3_mapped ; 0040          # 1.1  FULLWIDTH COMMERCIAL AT
+FF21          ; mapped                 ; 0061          # 1.1  FULLWIDTH LATIN CAPITAL LETTER A
+FF22          ; mapped                 ; 0062          # 1.1  FULLWIDTH LATIN CAPITAL LETTER B
+FF23          ; mapped                 ; 0063          # 1.1  FULLWIDTH LATIN CAPITAL LETTER C
+FF24          ; mapped                 ; 0064          # 1.1  FULLWIDTH LATIN CAPITAL LETTER D
+FF25          ; mapped                 ; 0065          # 1.1  FULLWIDTH LATIN CAPITAL LETTER E
+FF26          ; mapped                 ; 0066          # 1.1  FULLWIDTH LATIN CAPITAL LETTER F
+FF27          ; mapped                 ; 0067          # 1.1  FULLWIDTH LATIN CAPITAL LETTER G
+FF28          ; mapped                 ; 0068          # 1.1  FULLWIDTH LATIN CAPITAL LETTER H
+FF29          ; mapped                 ; 0069          # 1.1  FULLWIDTH LATIN CAPITAL LETTER I
+FF2A          ; mapped                 ; 006A          # 1.1  FULLWIDTH LATIN CAPITAL LETTER J
+FF2B          ; mapped                 ; 006B          # 1.1  FULLWIDTH LATIN CAPITAL LETTER K
+FF2C          ; mapped                 ; 006C          # 1.1  FULLWIDTH LATIN CAPITAL LETTER L
+FF2D          ; mapped                 ; 006D          # 1.1  FULLWIDTH LATIN CAPITAL LETTER M
+FF2E          ; mapped                 ; 006E          # 1.1  FULLWIDTH LATIN CAPITAL LETTER N
+FF2F          ; mapped                 ; 006F          # 1.1  FULLWIDTH LATIN CAPITAL LETTER O
+FF30          ; mapped                 ; 0070          # 1.1  FULLWIDTH LATIN CAPITAL LETTER P
+FF31          ; mapped                 ; 0071          # 1.1  FULLWIDTH LATIN CAPITAL LETTER Q
+FF32          ; mapped                 ; 0072          # 1.1  FULLWIDTH LATIN CAPITAL LETTER R
+FF33          ; mapped                 ; 0073          # 1.1  FULLWIDTH LATIN CAPITAL LETTER S
+FF34          ; mapped                 ; 0074          # 1.1  FULLWIDTH LATIN CAPITAL LETTER T
+FF35          ; mapped                 ; 0075          # 1.1  FULLWIDTH LATIN CAPITAL LETTER U
+FF36          ; mapped                 ; 0076          # 1.1  FULLWIDTH LATIN CAPITAL LETTER V
+FF37          ; mapped                 ; 0077          # 1.1  FULLWIDTH LATIN CAPITAL LETTER W
+FF38          ; mapped                 ; 0078          # 1.1  FULLWIDTH LATIN CAPITAL LETTER X
+FF39          ; mapped                 ; 0079          # 1.1  FULLWIDTH LATIN CAPITAL LETTER Y
+FF3A          ; mapped                 ; 007A          # 1.1  FULLWIDTH LATIN CAPITAL LETTER Z
+FF3B          ; disallowed_STD3_mapped ; 005B          # 1.1  FULLWIDTH LEFT SQUARE BRACKET
+FF3C          ; disallowed_STD3_mapped ; 005C          # 1.1  FULLWIDTH REVERSE SOLIDUS
+FF3D          ; disallowed_STD3_mapped ; 005D          # 1.1  FULLWIDTH RIGHT SQUARE BRACKET
+FF3E          ; disallowed_STD3_mapped ; 005E          # 1.1  FULLWIDTH CIRCUMFLEX ACCENT
+FF3F          ; disallowed_STD3_mapped ; 005F          # 1.1  FULLWIDTH LOW LINE
+FF40          ; disallowed_STD3_mapped ; 0060          # 1.1  FULLWIDTH GRAVE ACCENT
+FF41          ; mapped                 ; 0061          # 1.1  FULLWIDTH LATIN SMALL LETTER A
+FF42          ; mapped                 ; 0062          # 1.1  FULLWIDTH LATIN SMALL LETTER B
+FF43          ; mapped                 ; 0063          # 1.1  FULLWIDTH LATIN SMALL LETTER C
+FF44          ; mapped                 ; 0064          # 1.1  FULLWIDTH LATIN SMALL LETTER D
+FF45          ; mapped                 ; 0065          # 1.1  FULLWIDTH LATIN SMALL LETTER E
+FF46          ; mapped                 ; 0066          # 1.1  FULLWIDTH LATIN SMALL LETTER F
+FF47          ; mapped                 ; 0067          # 1.1  FULLWIDTH LATIN SMALL LETTER G
+FF48          ; mapped                 ; 0068          # 1.1  FULLWIDTH LATIN SMALL LETTER H
+FF49          ; mapped                 ; 0069          # 1.1  FULLWIDTH LATIN SMALL LETTER I
+FF4A          ; mapped                 ; 006A          # 1.1  FULLWIDTH LATIN SMALL LETTER J
+FF4B          ; mapped                 ; 006B          # 1.1  FULLWIDTH LATIN SMALL LETTER K
+FF4C          ; mapped                 ; 006C          # 1.1  FULLWIDTH LATIN SMALL LETTER L
+FF4D          ; mapped                 ; 006D          # 1.1  FULLWIDTH LATIN SMALL LETTER M
+FF4E          ; mapped                 ; 006E          # 1.1  FULLWIDTH LATIN SMALL LETTER N
+FF4F          ; mapped                 ; 006F          # 1.1  FULLWIDTH LATIN SMALL LETTER O
+FF50          ; mapped                 ; 0070          # 1.1  FULLWIDTH LATIN SMALL LETTER P
+FF51          ; mapped                 ; 0071          # 1.1  FULLWIDTH LATIN SMALL LETTER Q
+FF52          ; mapped                 ; 0072          # 1.1  FULLWIDTH LATIN SMALL LETTER R
+FF53          ; mapped                 ; 0073          # 1.1  FULLWIDTH LATIN SMALL LETTER S
+FF54          ; mapped                 ; 0074          # 1.1  FULLWIDTH LATIN SMALL LETTER T
+FF55          ; mapped                 ; 0075          # 1.1  FULLWIDTH LATIN SMALL LETTER U
+FF56          ; mapped                 ; 0076          # 1.1  FULLWIDTH LATIN SMALL LETTER V
+FF57          ; mapped                 ; 0077          # 1.1  FULLWIDTH LATIN SMALL LETTER W
+FF58          ; mapped                 ; 0078          # 1.1  FULLWIDTH LATIN SMALL LETTER X
+FF59          ; mapped                 ; 0079          # 1.1  FULLWIDTH LATIN SMALL LETTER Y
+FF5A          ; mapped                 ; 007A          # 1.1  FULLWIDTH LATIN SMALL LETTER Z
+FF5B          ; disallowed_STD3_mapped ; 007B          # 1.1  FULLWIDTH LEFT CURLY BRACKET
+FF5C          ; disallowed_STD3_mapped ; 007C          # 1.1  FULLWIDTH VERTICAL LINE
+FF5D          ; disallowed_STD3_mapped ; 007D          # 1.1  FULLWIDTH RIGHT CURLY BRACKET
+FF5E          ; disallowed_STD3_mapped ; 007E          # 1.1  FULLWIDTH TILDE
+FF5F          ; mapped                 ; 2985          # 3.2  FULLWIDTH LEFT WHITE PARENTHESIS
+FF60          ; mapped                 ; 2986          # 3.2  FULLWIDTH RIGHT WHITE PARENTHESIS
+FF61          ; mapped                 ; 002E          # 1.1  HALFWIDTH IDEOGRAPHIC FULL STOP
+FF62          ; mapped                 ; 300C          # 1.1  HALFWIDTH LEFT CORNER BRACKET
+FF63          ; mapped                 ; 300D          # 1.1  HALFWIDTH RIGHT CORNER BRACKET
+FF64          ; mapped                 ; 3001          # 1.1  HALFWIDTH IDEOGRAPHIC COMMA
+FF65          ; mapped                 ; 30FB          # 1.1  HALFWIDTH KATAKANA MIDDLE DOT
+FF66          ; mapped                 ; 30F2          # 1.1  HALFWIDTH KATAKANA LETTER WO
+FF67          ; mapped                 ; 30A1          # 1.1  HALFWIDTH KATAKANA LETTER SMALL A
+FF68          ; mapped                 ; 30A3          # 1.1  HALFWIDTH KATAKANA LETTER SMALL I
+FF69          ; mapped                 ; 30A5          # 1.1  HALFWIDTH KATAKANA LETTER SMALL U
+FF6A          ; mapped                 ; 30A7          # 1.1  HALFWIDTH KATAKANA LETTER SMALL E
+FF6B          ; mapped                 ; 30A9          # 1.1  HALFWIDTH KATAKANA LETTER SMALL O
+FF6C          ; mapped                 ; 30E3          # 1.1  HALFWIDTH KATAKANA LETTER SMALL YA
+FF6D          ; mapped                 ; 30E5          # 1.1  HALFWIDTH KATAKANA LETTER SMALL YU
+FF6E          ; mapped                 ; 30E7          # 1.1  HALFWIDTH KATAKANA LETTER SMALL YO
+FF6F          ; mapped                 ; 30C3          # 1.1  HALFWIDTH KATAKANA LETTER SMALL TU
+FF70          ; mapped                 ; 30FC          # 1.1  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
+FF71          ; mapped                 ; 30A2          # 1.1  HALFWIDTH KATAKANA LETTER A
+FF72          ; mapped                 ; 30A4          # 1.1  HALFWIDTH KATAKANA LETTER I
+FF73          ; mapped                 ; 30A6          # 1.1  HALFWIDTH KATAKANA LETTER U
+FF74          ; mapped                 ; 30A8          # 1.1  HALFWIDTH KATAKANA LETTER E
+FF75          ; mapped                 ; 30AA          # 1.1  HALFWIDTH KATAKANA LETTER O
+FF76          ; mapped                 ; 30AB          # 1.1  HALFWIDTH KATAKANA LETTER KA
+FF77          ; mapped                 ; 30AD          # 1.1  HALFWIDTH KATAKANA LETTER KI
+FF78          ; mapped                 ; 30AF          # 1.1  HALFWIDTH KATAKANA LETTER KU
+FF79          ; mapped                 ; 30B1          # 1.1  HALFWIDTH KATAKANA LETTER KE
+FF7A          ; mapped                 ; 30B3          # 1.1  HALFWIDTH KATAKANA LETTER KO
+FF7B          ; mapped                 ; 30B5          # 1.1  HALFWIDTH KATAKANA LETTER SA
+FF7C          ; mapped                 ; 30B7          # 1.1  HALFWIDTH KATAKANA LETTER SI
+FF7D          ; mapped                 ; 30B9          # 1.1  HALFWIDTH KATAKANA LETTER SU
+FF7E          ; mapped                 ; 30BB          # 1.1  HALFWIDTH KATAKANA LETTER SE
+FF7F          ; mapped                 ; 30BD          # 1.1  HALFWIDTH KATAKANA LETTER SO
+FF80          ; mapped                 ; 30BF          # 1.1  HALFWIDTH KATAKANA LETTER TA
+FF81          ; mapped                 ; 30C1          # 1.1  HALFWIDTH KATAKANA LETTER TI
+FF82          ; mapped                 ; 30C4          # 1.1  HALFWIDTH KATAKANA LETTER TU
+FF83          ; mapped                 ; 30C6          # 1.1  HALFWIDTH KATAKANA LETTER TE
+FF84          ; mapped                 ; 30C8          # 1.1  HALFWIDTH KATAKANA LETTER TO
+FF85          ; mapped                 ; 30CA          # 1.1  HALFWIDTH KATAKANA LETTER NA
+FF86          ; mapped                 ; 30CB          # 1.1  HALFWIDTH KATAKANA LETTER NI
+FF87          ; mapped                 ; 30CC          # 1.1  HALFWIDTH KATAKANA LETTER NU
+FF88          ; mapped                 ; 30CD          # 1.1  HALFWIDTH KATAKANA LETTER NE
+FF89          ; mapped                 ; 30CE          # 1.1  HALFWIDTH KATAKANA LETTER NO
+FF8A          ; mapped                 ; 30CF          # 1.1  HALFWIDTH KATAKANA LETTER HA
+FF8B          ; mapped                 ; 30D2          # 1.1  HALFWIDTH KATAKANA LETTER HI
+FF8C          ; mapped                 ; 30D5          # 1.1  HALFWIDTH KATAKANA LETTER HU
+FF8D          ; mapped                 ; 30D8          # 1.1  HALFWIDTH KATAKANA LETTER HE
+FF8E          ; mapped                 ; 30DB          # 1.1  HALFWIDTH KATAKANA LETTER HO
+FF8F          ; mapped                 ; 30DE          # 1.1  HALFWIDTH KATAKANA LETTER MA
+FF90          ; mapped                 ; 30DF          # 1.1  HALFWIDTH KATAKANA LETTER MI
+FF91          ; mapped                 ; 30E0          # 1.1  HALFWIDTH KATAKANA LETTER MU
+FF92          ; mapped                 ; 30E1          # 1.1  HALFWIDTH KATAKANA LETTER ME
+FF93          ; mapped                 ; 30E2          # 1.1  HALFWIDTH KATAKANA LETTER MO
+FF94          ; mapped                 ; 30E4          # 1.1  HALFWIDTH KATAKANA LETTER YA
+FF95          ; mapped                 ; 30E6          # 1.1  HALFWIDTH KATAKANA LETTER YU
+FF96          ; mapped                 ; 30E8          # 1.1  HALFWIDTH KATAKANA LETTER YO
+FF97          ; mapped                 ; 30E9          # 1.1  HALFWIDTH KATAKANA LETTER RA
+FF98          ; mapped                 ; 30EA          # 1.1  HALFWIDTH KATAKANA LETTER RI
+FF99          ; mapped                 ; 30EB          # 1.1  HALFWIDTH KATAKANA LETTER RU
+FF9A          ; mapped                 ; 30EC          # 1.1  HALFWIDTH KATAKANA LETTER RE
+FF9B          ; mapped                 ; 30ED          # 1.1  HALFWIDTH KATAKANA LETTER RO
+FF9C          ; mapped                 ; 30EF          # 1.1  HALFWIDTH KATAKANA LETTER WA
+FF9D          ; mapped                 ; 30F3          # 1.1  HALFWIDTH KATAKANA LETTER N
+FF9E          ; mapped                 ; 3099          # 1.1  HALFWIDTH KATAKANA VOICED SOUND MARK
+FF9F          ; mapped                 ; 309A          # 1.1  HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+FFA0          ; disallowed                             # 1.1  HALFWIDTH HANGUL FILLER
+FFA1          ; mapped                 ; 1100          # 1.1  HALFWIDTH HANGUL LETTER KIYEOK
+FFA2          ; mapped                 ; 1101          # 1.1  HALFWIDTH HANGUL LETTER SSANGKIYEOK
+FFA3          ; mapped                 ; 11AA          # 1.1  HALFWIDTH HANGUL LETTER KIYEOK-SIOS
+FFA4          ; mapped                 ; 1102          # 1.1  HALFWIDTH HANGUL LETTER NIEUN
+FFA5          ; mapped                 ; 11AC          # 1.1  HALFWIDTH HANGUL LETTER NIEUN-CIEUC
+FFA6          ; mapped                 ; 11AD          # 1.1  HALFWIDTH HANGUL LETTER NIEUN-HIEUH
+FFA7          ; mapped                 ; 1103          # 1.1  HALFWIDTH HANGUL LETTER TIKEUT
+FFA8          ; mapped                 ; 1104          # 1.1  HALFWIDTH HANGUL LETTER SSANGTIKEUT
+FFA9          ; mapped                 ; 1105          # 1.1  HALFWIDTH HANGUL LETTER RIEUL
+FFAA          ; mapped                 ; 11B0          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-KIYEOK
+FFAB          ; mapped                 ; 11B1          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-MIEUM
+FFAC          ; mapped                 ; 11B2          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-PIEUP
+FFAD          ; mapped                 ; 11B3          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-SIOS
+FFAE          ; mapped                 ; 11B4          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-THIEUTH
+FFAF          ; mapped                 ; 11B5          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH
+FFB0          ; mapped                 ; 111A          # 1.1  HALFWIDTH HANGUL LETTER RIEUL-HIEUH
+FFB1          ; mapped                 ; 1106          # 1.1  HALFWIDTH HANGUL LETTER MIEUM
+FFB2          ; mapped                 ; 1107          # 1.1  HALFWIDTH HANGUL LETTER PIEUP
+FFB3          ; mapped                 ; 1108          # 1.1  HALFWIDTH HANGUL LETTER SSANGPIEUP
+FFB4          ; mapped                 ; 1121          # 1.1  HALFWIDTH HANGUL LETTER PIEUP-SIOS
+FFB5          ; mapped                 ; 1109          # 1.1  HALFWIDTH HANGUL LETTER SIOS
+FFB6          ; mapped                 ; 110A          # 1.1  HALFWIDTH HANGUL LETTER SSANGSIOS
+FFB7          ; mapped                 ; 110B          # 1.1  HALFWIDTH HANGUL LETTER IEUNG
+FFB8          ; mapped                 ; 110C          # 1.1  HALFWIDTH HANGUL LETTER CIEUC
+FFB9          ; mapped                 ; 110D          # 1.1  HALFWIDTH HANGUL LETTER SSANGCIEUC
+FFBA          ; mapped                 ; 110E          # 1.1  HALFWIDTH HANGUL LETTER CHIEUCH
+FFBB          ; mapped                 ; 110F          # 1.1  HALFWIDTH HANGUL LETTER KHIEUKH
+FFBC          ; mapped                 ; 1110          # 1.1  HALFWIDTH HANGUL LETTER THIEUTH
+FFBD          ; mapped                 ; 1111          # 1.1  HALFWIDTH HANGUL LETTER PHIEUPH
+FFBE          ; mapped                 ; 1112          # 1.1  HALFWIDTH HANGUL LETTER HIEUH
+FFBF..FFC1    ; disallowed                             # NA   <reserved-FFBF>..<reserved-FFC1>
+FFC2          ; mapped                 ; 1161          # 1.1  HALFWIDTH HANGUL LETTER A
+FFC3          ; mapped                 ; 1162          # 1.1  HALFWIDTH HANGUL LETTER AE
+FFC4          ; mapped                 ; 1163          # 1.1  HALFWIDTH HANGUL LETTER YA
+FFC5          ; mapped                 ; 1164          # 1.1  HALFWIDTH HANGUL LETTER YAE
+FFC6          ; mapped                 ; 1165          # 1.1  HALFWIDTH HANGUL LETTER EO
+FFC7          ; mapped                 ; 1166          # 1.1  HALFWIDTH HANGUL LETTER E
+FFC8..FFC9    ; disallowed                             # NA   <reserved-FFC8>..<reserved-FFC9>
+FFCA          ; mapped                 ; 1167          # 1.1  HALFWIDTH HANGUL LETTER YEO
+FFCB          ; mapped                 ; 1168          # 1.1  HALFWIDTH HANGUL LETTER YE
+FFCC          ; mapped                 ; 1169          # 1.1  HALFWIDTH HANGUL LETTER O
+FFCD          ; mapped                 ; 116A          # 1.1  HALFWIDTH HANGUL LETTER WA
+FFCE          ; mapped                 ; 116B          # 1.1  HALFWIDTH HANGUL LETTER WAE
+FFCF          ; mapped                 ; 116C          # 1.1  HALFWIDTH HANGUL LETTER OE
+FFD0..FFD1    ; disallowed                             # NA   <reserved-FFD0>..<reserved-FFD1>
+FFD2          ; mapped                 ; 116D          # 1.1  HALFWIDTH HANGUL LETTER YO
+FFD3          ; mapped                 ; 116E          # 1.1  HALFWIDTH HANGUL LETTER U
+FFD4          ; mapped                 ; 116F          # 1.1  HALFWIDTH HANGUL LETTER WEO
+FFD5          ; mapped                 ; 1170          # 1.1  HALFWIDTH HANGUL LETTER WE
+FFD6          ; mapped                 ; 1171          # 1.1  HALFWIDTH HANGUL LETTER WI
+FFD7          ; mapped                 ; 1172          # 1.1  HALFWIDTH HANGUL LETTER YU
+FFD8..FFD9    ; disallowed                             # NA   <reserved-FFD8>..<reserved-FFD9>
+FFDA          ; mapped                 ; 1173          # 1.1  HALFWIDTH HANGUL LETTER EU
+FFDB          ; mapped                 ; 1174          # 1.1  HALFWIDTH HANGUL LETTER YI
+FFDC          ; mapped                 ; 1175          # 1.1  HALFWIDTH HANGUL LETTER I
+FFDD..FFDF    ; disallowed                             # NA   <reserved-FFDD>..<reserved-FFDF>
+FFE0          ; mapped                 ; 00A2          # 1.1  FULLWIDTH CENT SIGN
+FFE1          ; mapped                 ; 00A3          # 1.1  FULLWIDTH POUND SIGN
+FFE2          ; mapped                 ; 00AC          # 1.1  FULLWIDTH NOT SIGN
+FFE3          ; disallowed_STD3_mapped ; 0020 0304     # 1.1  FULLWIDTH MACRON
+FFE4          ; mapped                 ; 00A6          # 1.1  FULLWIDTH BROKEN BAR
+FFE5          ; mapped                 ; 00A5          # 1.1  FULLWIDTH YEN SIGN
+FFE6          ; mapped                 ; 20A9          # 1.1  FULLWIDTH WON SIGN
+FFE7          ; disallowed                             # NA   <reserved-FFE7>
+FFE8          ; mapped                 ; 2502          # 1.1  HALFWIDTH FORMS LIGHT VERTICAL
+FFE9          ; mapped                 ; 2190          # 1.1  HALFWIDTH LEFTWARDS ARROW
+FFEA          ; mapped                 ; 2191          # 1.1  HALFWIDTH UPWARDS ARROW
+FFEB          ; mapped                 ; 2192          # 1.1  HALFWIDTH RIGHTWARDS ARROW
+FFEC          ; mapped                 ; 2193          # 1.1  HALFWIDTH DOWNWARDS ARROW
+FFED          ; mapped                 ; 25A0          # 1.1  HALFWIDTH BLACK SQUARE
+FFEE          ; mapped                 ; 25CB          # 1.1  HALFWIDTH WHITE CIRCLE
+FFEF..FFF8    ; disallowed                             # NA   <reserved-FFEF>..<reserved-FFF8>
+FFF9..FFFB    ; disallowed                             # 3.0  INTERLINEAR ANNOTATION ANCHOR..INTERLINEAR ANNOTATION TERMINATOR
+FFFC          ; disallowed                             # 2.1  OBJECT REPLACEMENT CHARACTER
+FFFD          ; disallowed                             # 1.1  REPLACEMENT CHARACTER
+FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE>..<noncharacter-FFFF>
+10000..1000B  ; valid                                  # 4.0  LINEAR B SYLLABLE B008 A..LINEAR B SYLLABLE B046 JE
+1000C         ; disallowed                             # NA   <reserved-1000C>
+1000D..10026  ; valid                                  # 4.0  LINEAR B SYLLABLE B036 JO..LINEAR B SYLLABLE B032 QO
+10027         ; disallowed                             # NA   <reserved-10027>
+10028..1003A  ; valid                                  # 4.0  LINEAR B SYLLABLE B060 RA..LINEAR B SYLLABLE B042 WO
+1003B         ; disallowed                             # NA   <reserved-1003B>
+1003C..1003D  ; valid                                  # 4.0  LINEAR B SYLLABLE B017 ZA..LINEAR B SYLLABLE B074 ZE
+1003E         ; disallowed                             # NA   <reserved-1003E>
+1003F..1004D  ; valid                                  # 4.0  LINEAR B SYLLABLE B020 ZO..LINEAR B SYLLABLE B091 TWO
+1004E..1004F  ; disallowed                             # NA   <reserved-1004E>..<reserved-1004F>
+10050..1005D  ; valid                                  # 4.0  LINEAR B SYMBOL B018..LINEAR B SYMBOL B089
+1005E..1007F  ; disallowed                             # NA   <reserved-1005E>..<reserved-1007F>
+10080..100FA  ; valid                                  # 4.0  LINEAR B IDEOGRAM B100 MAN..LINEAR B IDEOGRAM VESSEL B305
+100FB..100FF  ; disallowed                             # NA   <reserved-100FB>..<reserved-100FF>
+10100..10102  ; valid                  ;      ; NV8    # 4.0  AEGEAN WORD SEPARATOR LINE..AEGEAN CHECK MARK
+10103..10106  ; disallowed                             # NA   <reserved-10103>..<reserved-10106>
+10107..10133  ; valid                  ;      ; NV8    # 4.0  AEGEAN NUMBER ONE..AEGEAN NUMBER NINETY THOUSAND
+10134..10136  ; disallowed                             # NA   <reserved-10134>..<reserved-10136>
+10137..1013F  ; valid                  ;      ; NV8    # 4.0  AEGEAN WEIGHT BASE UNIT..AEGEAN MEASURE THIRD SUBUNIT
+10140..1018A  ; valid                  ;      ; NV8    # 4.1  GREEK ACROPHONIC ATTIC ONE QUARTER..GREEK ZERO SIGN
+1018B..1018C  ; valid                  ;      ; NV8    # 7.0  GREEK ONE QUARTER SIGN..GREEK SINUSOID SIGN
+1018D..1018E  ; valid                  ;      ; NV8    # 9.0  GREEK INDICTION SIGN..NOMISMA SIGN
+1018F         ; disallowed                             # NA   <reserved-1018F>
+10190..1019B  ; valid                  ;      ; NV8    # 5.1  ROMAN SEXTANS SIGN..ROMAN CENTURIAL SIGN
+1019C         ; valid                  ;      ; NV8    # 13.0 ASCIA SYMBOL
+1019D..1019F  ; disallowed                             # NA   <reserved-1019D>..<reserved-1019F>
+101A0         ; valid                  ;      ; NV8    # 7.0  GREEK SYMBOL TAU RHO
+101A1..101CF  ; disallowed                             # NA   <reserved-101A1>..<reserved-101CF>
+101D0..101FC  ; valid                  ;      ; NV8    # 5.1  PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND
+101FD         ; valid                                  # 5.1  PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE
+101FE..1027F  ; disallowed                             # NA   <reserved-101FE>..<reserved-1027F>
+10280..1029C  ; valid                                  # 5.1  LYCIAN LETTER A..LYCIAN LETTER X
+1029D..1029F  ; disallowed                             # NA   <reserved-1029D>..<reserved-1029F>
+102A0..102D0  ; valid                                  # 5.1  CARIAN LETTER A..CARIAN LETTER UUU3
+102D1..102DF  ; disallowed                             # NA   <reserved-102D1>..<reserved-102DF>
+102E0         ; valid                                  # 7.0  COPTIC EPACT THOUSANDS MARK
+102E1..102FB  ; valid                  ;      ; NV8    # 7.0  COPTIC EPACT DIGIT ONE..COPTIC EPACT NUMBER NINE HUNDRED
+102FC..102FF  ; disallowed                             # NA   <reserved-102FC>..<reserved-102FF>
+10300..1031E  ; valid                                  # 3.1  OLD ITALIC LETTER A..OLD ITALIC LETTER UU
+1031F         ; valid                                  # 7.0  OLD ITALIC LETTER ESS
+10320..10323  ; valid                  ;      ; NV8    # 3.1  OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY
+10324..1032C  ; disallowed                             # NA   <reserved-10324>..<reserved-1032C>
+1032D..1032F  ; valid                                  # 10.0 OLD ITALIC LETTER YE..OLD ITALIC LETTER SOUTHERN TSE
+10330..10340  ; valid                                  # 3.1  GOTHIC LETTER AHSA..GOTHIC LETTER PAIRTHRA
+10341         ; valid                  ;      ; NV8    # 3.1  GOTHIC LETTER NINETY
+10342..10349  ; valid                                  # 3.1  GOTHIC LETTER RAIDA..GOTHIC LETTER OTHAL
+1034A         ; valid                  ;      ; NV8    # 3.1  GOTHIC LETTER NINE HUNDRED
+1034B..1034F  ; disallowed                             # NA   <reserved-1034B>..<reserved-1034F>
+10350..1037A  ; valid                                  # 7.0  OLD PERMIC LETTER AN..COMBINING OLD PERMIC LETTER SII
+1037B..1037F  ; disallowed                             # NA   <reserved-1037B>..<reserved-1037F>
+10380..1039D  ; valid                                  # 4.0  UGARITIC LETTER ALPA..UGARITIC LETTER SSU
+1039E         ; disallowed                             # NA   <reserved-1039E>
+1039F         ; valid                  ;      ; NV8    # 4.0  UGARITIC WORD DIVIDER
+103A0..103C3  ; valid                                  # 4.1  OLD PERSIAN SIGN A..OLD PERSIAN SIGN HA
+103C4..103C7  ; disallowed                             # NA   <reserved-103C4>..<reserved-103C7>
+103C8..103CF  ; valid                                  # 4.1  OLD PERSIAN SIGN AURAMAZDAA..OLD PERSIAN SIGN BUUMISH
+103D0..103D5  ; valid                  ;      ; NV8    # 4.1  OLD PERSIAN WORD DIVIDER..OLD PERSIAN NUMBER HUNDRED
+103D6..103FF  ; disallowed                             # NA   <reserved-103D6>..<reserved-103FF>
+10400         ; mapped                 ; 10428         # 3.1  DESERET CAPITAL LETTER LONG I
+10401         ; mapped                 ; 10429         # 3.1  DESERET CAPITAL LETTER LONG E
+10402         ; mapped                 ; 1042A         # 3.1  DESERET CAPITAL LETTER LONG A
+10403         ; mapped                 ; 1042B         # 3.1  DESERET CAPITAL LETTER LONG AH
+10404         ; mapped                 ; 1042C         # 3.1  DESERET CAPITAL LETTER LONG O
+10405         ; mapped                 ; 1042D         # 3.1  DESERET CAPITAL LETTER LONG OO
+10406         ; mapped                 ; 1042E         # 3.1  DESERET CAPITAL LETTER SHORT I
+10407         ; mapped                 ; 1042F         # 3.1  DESERET CAPITAL LETTER SHORT E
+10408         ; mapped                 ; 10430         # 3.1  DESERET CAPITAL LETTER SHORT A
+10409         ; mapped                 ; 10431         # 3.1  DESERET CAPITAL LETTER SHORT AH
+1040A         ; mapped                 ; 10432         # 3.1  DESERET CAPITAL LETTER SHORT O
+1040B         ; mapped                 ; 10433         # 3.1  DESERET CAPITAL LETTER SHORT OO
+1040C         ; mapped                 ; 10434         # 3.1  DESERET CAPITAL LETTER AY
+1040D         ; mapped                 ; 10435         # 3.1  DESERET CAPITAL LETTER OW
+1040E         ; mapped                 ; 10436         # 3.1  DESERET CAPITAL LETTER WU
+1040F         ; mapped                 ; 10437         # 3.1  DESERET CAPITAL LETTER YEE
+10410         ; mapped                 ; 10438         # 3.1  DESERET CAPITAL LETTER H
+10411         ; mapped                 ; 10439         # 3.1  DESERET CAPITAL LETTER PEE
+10412         ; mapped                 ; 1043A         # 3.1  DESERET CAPITAL LETTER BEE
+10413         ; mapped                 ; 1043B         # 3.1  DESERET CAPITAL LETTER TEE
+10414         ; mapped                 ; 1043C         # 3.1  DESERET CAPITAL LETTER DEE
+10415         ; mapped                 ; 1043D         # 3.1  DESERET CAPITAL LETTER CHEE
+10416         ; mapped                 ; 1043E         # 3.1  DESERET CAPITAL LETTER JEE
+10417         ; mapped                 ; 1043F         # 3.1  DESERET CAPITAL LETTER KAY
+10418         ; mapped                 ; 10440         # 3.1  DESERET CAPITAL LETTER GAY
+10419         ; mapped                 ; 10441         # 3.1  DESERET CAPITAL LETTER EF
+1041A         ; mapped                 ; 10442         # 3.1  DESERET CAPITAL LETTER VEE
+1041B         ; mapped                 ; 10443         # 3.1  DESERET CAPITAL LETTER ETH
+1041C         ; mapped                 ; 10444         # 3.1  DESERET CAPITAL LETTER THEE
+1041D         ; mapped                 ; 10445         # 3.1  DESERET CAPITAL LETTER ES
+1041E         ; mapped                 ; 10446         # 3.1  DESERET CAPITAL LETTER ZEE
+1041F         ; mapped                 ; 10447         # 3.1  DESERET CAPITAL LETTER ESH
+10420         ; mapped                 ; 10448         # 3.1  DESERET CAPITAL LETTER ZHEE
+10421         ; mapped                 ; 10449         # 3.1  DESERET CAPITAL LETTER ER
+10422         ; mapped                 ; 1044A         # 3.1  DESERET CAPITAL LETTER EL
+10423         ; mapped                 ; 1044B         # 3.1  DESERET CAPITAL LETTER EM
+10424         ; mapped                 ; 1044C         # 3.1  DESERET CAPITAL LETTER EN
+10425         ; mapped                 ; 1044D         # 3.1  DESERET CAPITAL LETTER ENG
+10426         ; mapped                 ; 1044E         # 4.0  DESERET CAPITAL LETTER OI
+10427         ; mapped                 ; 1044F         # 4.0  DESERET CAPITAL LETTER EW
+10428..1044D  ; valid                                  # 3.1  DESERET SMALL LETTER LONG I..DESERET SMALL LETTER ENG
+1044E..1049D  ; valid                                  # 4.0  DESERET SMALL LETTER OI..OSMANYA LETTER OO
+1049E..1049F  ; disallowed                             # NA   <reserved-1049E>..<reserved-1049F>
+104A0..104A9  ; valid                                  # 4.0  OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE
+104AA..104AF  ; disallowed                             # NA   <reserved-104AA>..<reserved-104AF>
+104B0         ; mapped                 ; 104D8         # 9.0  OSAGE CAPITAL LETTER A
+104B1         ; mapped                 ; 104D9         # 9.0  OSAGE CAPITAL LETTER AI
+104B2         ; mapped                 ; 104DA         # 9.0  OSAGE CAPITAL LETTER AIN
+104B3         ; mapped                 ; 104DB         # 9.0  OSAGE CAPITAL LETTER AH
+104B4         ; mapped                 ; 104DC         # 9.0  OSAGE CAPITAL LETTER BRA
+104B5         ; mapped                 ; 104DD         # 9.0  OSAGE CAPITAL LETTER CHA
+104B6         ; mapped                 ; 104DE         # 9.0  OSAGE CAPITAL LETTER EHCHA
+104B7         ; mapped                 ; 104DF         # 9.0  OSAGE CAPITAL LETTER E
+104B8         ; mapped                 ; 104E0         # 9.0  OSAGE CAPITAL LETTER EIN
+104B9         ; mapped                 ; 104E1         # 9.0  OSAGE CAPITAL LETTER HA
+104BA         ; mapped                 ; 104E2         # 9.0  OSAGE CAPITAL LETTER HYA
+104BB         ; mapped                 ; 104E3         # 9.0  OSAGE CAPITAL LETTER I
+104BC         ; mapped                 ; 104E4         # 9.0  OSAGE CAPITAL LETTER KA
+104BD         ; mapped                 ; 104E5         # 9.0  OSAGE CAPITAL LETTER EHKA
+104BE         ; mapped                 ; 104E6         # 9.0  OSAGE CAPITAL LETTER KYA
+104BF         ; mapped                 ; 104E7         # 9.0  OSAGE CAPITAL LETTER LA
+104C0         ; mapped                 ; 104E8         # 9.0  OSAGE CAPITAL LETTER MA
+104C1         ; mapped                 ; 104E9         # 9.0  OSAGE CAPITAL LETTER NA
+104C2         ; mapped                 ; 104EA         # 9.0  OSAGE CAPITAL LETTER O
+104C3         ; mapped                 ; 104EB         # 9.0  OSAGE CAPITAL LETTER OIN
+104C4         ; mapped                 ; 104EC         # 9.0  OSAGE CAPITAL LETTER PA
+104C5         ; mapped                 ; 104ED         # 9.0  OSAGE CAPITAL LETTER EHPA
+104C6         ; mapped                 ; 104EE         # 9.0  OSAGE CAPITAL LETTER SA
+104C7         ; mapped                 ; 104EF         # 9.0  OSAGE CAPITAL LETTER SHA
+104C8         ; mapped                 ; 104F0         # 9.0  OSAGE CAPITAL LETTER TA
+104C9         ; mapped                 ; 104F1         # 9.0  OSAGE CAPITAL LETTER EHTA
+104CA         ; mapped                 ; 104F2         # 9.0  OSAGE CAPITAL LETTER TSA
+104CB         ; mapped                 ; 104F3         # 9.0  OSAGE CAPITAL LETTER EHTSA
+104CC         ; mapped                 ; 104F4         # 9.0  OSAGE CAPITAL LETTER TSHA
+104CD         ; mapped                 ; 104F5         # 9.0  OSAGE CAPITAL LETTER DHA
+104CE         ; mapped                 ; 104F6         # 9.0  OSAGE CAPITAL LETTER U
+104CF         ; mapped                 ; 104F7         # 9.0  OSAGE CAPITAL LETTER WA
+104D0         ; mapped                 ; 104F8         # 9.0  OSAGE CAPITAL LETTER KHA
+104D1         ; mapped                 ; 104F9         # 9.0  OSAGE CAPITAL LETTER GHA
+104D2         ; mapped                 ; 104FA         # 9.0  OSAGE CAPITAL LETTER ZA
+104D3         ; mapped                 ; 104FB         # 9.0  OSAGE CAPITAL LETTER ZHA
+104D4..104D7  ; disallowed                             # NA   <reserved-104D4>..<reserved-104D7>
+104D8..104FB  ; valid                                  # 9.0  OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA
+104FC..104FF  ; disallowed                             # NA   <reserved-104FC>..<reserved-104FF>
+10500..10527  ; valid                                  # 7.0  ELBASAN LETTER A..ELBASAN LETTER KHE
+10528..1052F  ; disallowed                             # NA   <reserved-10528>..<reserved-1052F>
+10530..10563  ; valid                                  # 7.0  CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW
+10564..1056E  ; disallowed                             # NA   <reserved-10564>..<reserved-1056E>
+1056F         ; valid                  ;      ; NV8    # 7.0  CAUCASIAN ALBANIAN CITATION MARK
+10570..105FF  ; disallowed                             # NA   <reserved-10570>..<reserved-105FF>
+10600..10736  ; valid                                  # 7.0  LINEAR A SIGN AB001..LINEAR A SIGN A664
+10737..1073F  ; disallowed                             # NA   <reserved-10737>..<reserved-1073F>
+10740..10755  ; valid                                  # 7.0  LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE
+10756..1075F  ; disallowed                             # NA   <reserved-10756>..<reserved-1075F>
+10760..10767  ; valid                                  # 7.0  LINEAR A SIGN A800..LINEAR A SIGN A807
+10768..107FF  ; disallowed                             # NA   <reserved-10768>..<reserved-107FF>
+10800..10805  ; valid                                  # 4.0  CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA
+10806..10807  ; disallowed                             # NA   <reserved-10806>..<reserved-10807>
+10808         ; valid                                  # 4.0  CYPRIOT SYLLABLE JO
+10809         ; disallowed                             # NA   <reserved-10809>
+1080A..10835  ; valid                                  # 4.0  CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO
+10836         ; disallowed                             # NA   <reserved-10836>
+10837..10838  ; valid                                  # 4.0  CYPRIOT SYLLABLE XA..CYPRIOT SYLLABLE XE
+10839..1083B  ; disallowed                             # NA   <reserved-10839>..<reserved-1083B>
+1083C         ; valid                                  # 4.0  CYPRIOT SYLLABLE ZA
+1083D..1083E  ; disallowed                             # NA   <reserved-1083D>..<reserved-1083E>
+1083F         ; valid                                  # 4.0  CYPRIOT SYLLABLE ZO
+10840..10855  ; valid                                  # 5.2  IMPERIAL ARAMAIC LETTER ALEPH..IMPERIAL ARAMAIC LETTER TAW
+10856         ; disallowed                             # NA   <reserved-10856>
+10857..1085F  ; valid                  ;      ; NV8    # 5.2  IMPERIAL ARAMAIC SECTION SIGN..IMPERIAL ARAMAIC NUMBER TEN THOUSAND
+10860..10876  ; valid                                  # 7.0  PALMYRENE LETTER ALEPH..PALMYRENE LETTER TAW
+10877..1087F  ; valid                  ;      ; NV8    # 7.0  PALMYRENE LEFT-POINTING FLEURON..PALMYRENE NUMBER TWENTY
+10880..1089E  ; valid                                  # 7.0  NABATAEAN LETTER FINAL ALEPH..NABATAEAN LETTER TAW
+1089F..108A6  ; disallowed                             # NA   <reserved-1089F>..<reserved-108A6>
+108A7..108AF  ; valid                  ;      ; NV8    # 7.0  NABATAEAN NUMBER ONE..NABATAEAN NUMBER ONE HUNDRED
+108B0..108DF  ; disallowed                             # NA   <reserved-108B0>..<reserved-108DF>
+108E0..108F2  ; valid                                  # 8.0  HATRAN LETTER ALEPH..HATRAN LETTER QOPH
+108F3         ; disallowed                             # NA   <reserved-108F3>
+108F4..108F5  ; valid                                  # 8.0  HATRAN LETTER SHIN..HATRAN LETTER TAW
+108F6..108FA  ; disallowed                             # NA   <reserved-108F6>..<reserved-108FA>
+108FB..108FF  ; valid                  ;      ; NV8    # 8.0  HATRAN NUMBER ONE..HATRAN NUMBER ONE HUNDRED
+10900..10915  ; valid                                  # 5.0  PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
+10916..10919  ; valid                  ;      ; NV8    # 5.0  PHOENICIAN NUMBER ONE..PHOENICIAN NUMBER ONE HUNDRED
+1091A..1091B  ; valid                  ;      ; NV8    # 5.2  PHOENICIAN NUMBER TWO..PHOENICIAN NUMBER THREE
+1091C..1091E  ; disallowed                             # NA   <reserved-1091C>..<reserved-1091E>
+1091F         ; valid                  ;      ; NV8    # 5.0  PHOENICIAN WORD SEPARATOR
+10920..10939  ; valid                                  # 5.1  LYDIAN LETTER A..LYDIAN LETTER C
+1093A..1093E  ; disallowed                             # NA   <reserved-1093A>..<reserved-1093E>
+1093F         ; valid                  ;      ; NV8    # 5.1  LYDIAN TRIANGULAR MARK
+10940..1097F  ; disallowed                             # NA   <reserved-10940>..<reserved-1097F>
+10980..109B7  ; valid                                  # 6.1  MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
+109B8..109BB  ; disallowed                             # NA   <reserved-109B8>..<reserved-109BB>
+109BC..109BD  ; valid                  ;      ; NV8    # 8.0  MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS..MEROITIC CURSIVE FRACTION ONE HALF
+109BE..109BF  ; valid                                  # 6.1  MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
+109C0..109CF  ; valid                  ;      ; NV8    # 8.0  MEROITIC CURSIVE NUMBER ONE..MEROITIC CURSIVE NUMBER SEVENTY
+109D0..109D1  ; disallowed                             # NA   <reserved-109D0>..<reserved-109D1>
+109D2..109FF  ; valid                  ;      ; NV8    # 8.0  MEROITIC CURSIVE NUMBER ONE HUNDRED..MEROITIC CURSIVE FRACTION TEN TWELFTHS
+10A00..10A03  ; valid                                  # 4.1  KHAROSHTHI LETTER A..KHAROSHTHI VOWEL SIGN VOCALIC R
+10A04         ; disallowed                             # NA   <reserved-10A04>
+10A05..10A06  ; valid                                  # 4.1  KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O
+10A07..10A0B  ; disallowed                             # NA   <reserved-10A07>..<reserved-10A0B>
+10A0C..10A13  ; valid                                  # 4.1  KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI LETTER GHA
+10A14         ; disallowed                             # NA   <reserved-10A14>
+10A15..10A17  ; valid                                  # 4.1  KHAROSHTHI LETTER CA..KHAROSHTHI LETTER JA
+10A18         ; disallowed                             # NA   <reserved-10A18>
+10A19..10A33  ; valid                                  # 4.1  KHAROSHTHI LETTER NYA..KHAROSHTHI LETTER TTTHA
+10A34..10A35  ; valid                                  # 11.0 KHAROSHTHI LETTER TTTA..KHAROSHTHI LETTER VHA
+10A36..10A37  ; disallowed                             # NA   <reserved-10A36>..<reserved-10A37>
+10A38..10A3A  ; valid                                  # 4.1  KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN DOT BELOW
+10A3B..10A3E  ; disallowed                             # NA   <reserved-10A3B>..<reserved-10A3E>
+10A3F         ; valid                                  # 4.1  KHAROSHTHI VIRAMA
+10A40..10A47  ; valid                  ;      ; NV8    # 4.1  KHAROSHTHI DIGIT ONE..KHAROSHTHI NUMBER ONE THOUSAND
+10A48         ; valid                  ;      ; NV8    # 11.0 KHAROSHTHI FRACTION ONE HALF
+10A49..10A4F  ; disallowed                             # NA   <reserved-10A49>..<reserved-10A4F>
+10A50..10A58  ; valid                  ;      ; NV8    # 4.1  KHAROSHTHI PUNCTUATION DOT..KHAROSHTHI PUNCTUATION LINES
+10A59..10A5F  ; disallowed                             # NA   <reserved-10A59>..<reserved-10A5F>
+10A60..10A7C  ; valid                                  # 5.2  OLD SOUTH ARABIAN LETTER HE..OLD SOUTH ARABIAN LETTER THETH
+10A7D..10A7F  ; valid                  ;      ; NV8    # 5.2  OLD SOUTH ARABIAN NUMBER ONE..OLD SOUTH ARABIAN NUMERIC INDICATOR
+10A80..10A9C  ; valid                                  # 7.0  OLD NORTH ARABIAN LETTER HEH..OLD NORTH ARABIAN LETTER ZAH
+10A9D..10A9F  ; valid                  ;      ; NV8    # 7.0  OLD NORTH ARABIAN NUMBER ONE..OLD NORTH ARABIAN NUMBER TWENTY
+10AA0..10ABF  ; disallowed                             # NA   <reserved-10AA0>..<reserved-10ABF>
+10AC0..10AC7  ; valid                                  # 7.0  MANICHAEAN LETTER ALEPH..MANICHAEAN LETTER WAW
+10AC8         ; valid                  ;      ; NV8    # 7.0  MANICHAEAN SIGN UD
+10AC9..10AE6  ; valid                                  # 7.0  MANICHAEAN LETTER ZAYIN..MANICHAEAN ABBREVIATION MARK BELOW
+10AE7..10AEA  ; disallowed                             # NA   <reserved-10AE7>..<reserved-10AEA>
+10AEB..10AF6  ; valid                  ;      ; NV8    # 7.0  MANICHAEAN NUMBER ONE..MANICHAEAN PUNCTUATION LINE FILLER
+10AF7..10AFF  ; disallowed                             # NA   <reserved-10AF7>..<reserved-10AFF>
+10B00..10B35  ; valid                                  # 5.2  AVESTAN LETTER A..AVESTAN LETTER HE
+10B36..10B38  ; disallowed                             # NA   <reserved-10B36>..<reserved-10B38>
+10B39..10B3F  ; valid                  ;      ; NV8    # 5.2  AVESTAN ABBREVIATION MARK..LARGE ONE RING OVER TWO RINGS PUNCTUATION
+10B40..10B55  ; valid                                  # 5.2  INSCRIPTIONAL PARTHIAN LETTER ALEPH..INSCRIPTIONAL PARTHIAN LETTER TAW
+10B56..10B57  ; disallowed                             # NA   <reserved-10B56>..<reserved-10B57>
+10B58..10B5F  ; valid                  ;      ; NV8    # 5.2  INSCRIPTIONAL PARTHIAN NUMBER ONE..INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND
+10B60..10B72  ; valid                                  # 5.2  INSCRIPTIONAL PAHLAVI LETTER ALEPH..INSCRIPTIONAL PAHLAVI LETTER TAW
+10B73..10B77  ; disallowed                             # NA   <reserved-10B73>..<reserved-10B77>
+10B78..10B7F  ; valid                  ;      ; NV8    # 5.2  INSCRIPTIONAL PAHLAVI NUMBER ONE..INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND
+10B80..10B91  ; valid                                  # 7.0  PSALTER PAHLAVI LETTER ALEPH..PSALTER PAHLAVI LETTER TAW
+10B92..10B98  ; disallowed                             # NA   <reserved-10B92>..<reserved-10B98>
+10B99..10B9C  ; valid                  ;      ; NV8    # 7.0  PSALTER PAHLAVI SECTION MARK..PSALTER PAHLAVI FOUR DOTS WITH DOT
+10B9D..10BA8  ; disallowed                             # NA   <reserved-10B9D>..<reserved-10BA8>
+10BA9..10BAF  ; valid                  ;      ; NV8    # 7.0  PSALTER PAHLAVI NUMBER ONE..PSALTER PAHLAVI NUMBER ONE HUNDRED
+10BB0..10BFF  ; disallowed                             # NA   <reserved-10BB0>..<reserved-10BFF>
+10C00..10C48  ; valid                                  # 5.2  OLD TURKIC LETTER ORKHON A..OLD TURKIC LETTER ORKHON BASH
+10C49..10C7F  ; disallowed                             # NA   <reserved-10C49>..<reserved-10C7F>
+10C80         ; mapped                 ; 10CC0         # 8.0  OLD HUNGARIAN CAPITAL LETTER A
+10C81         ; mapped                 ; 10CC1         # 8.0  OLD HUNGARIAN CAPITAL LETTER AA
+10C82         ; mapped                 ; 10CC2         # 8.0  OLD HUNGARIAN CAPITAL LETTER EB
+10C83         ; mapped                 ; 10CC3         # 8.0  OLD HUNGARIAN CAPITAL LETTER AMB
+10C84         ; mapped                 ; 10CC4         # 8.0  OLD HUNGARIAN CAPITAL LETTER EC
+10C85         ; mapped                 ; 10CC5         # 8.0  OLD HUNGARIAN CAPITAL LETTER ENC
+10C86         ; mapped                 ; 10CC6         # 8.0  OLD HUNGARIAN CAPITAL LETTER ECS
+10C87         ; mapped                 ; 10CC7         # 8.0  OLD HUNGARIAN CAPITAL LETTER ED
+10C88         ; mapped                 ; 10CC8         # 8.0  OLD HUNGARIAN CAPITAL LETTER AND
+10C89         ; mapped                 ; 10CC9         # 8.0  OLD HUNGARIAN CAPITAL LETTER E
+10C8A         ; mapped                 ; 10CCA         # 8.0  OLD HUNGARIAN CAPITAL LETTER CLOSE E
+10C8B         ; mapped                 ; 10CCB         # 8.0  OLD HUNGARIAN CAPITAL LETTER EE
+10C8C         ; mapped                 ; 10CCC         # 8.0  OLD HUNGARIAN CAPITAL LETTER EF
+10C8D         ; mapped                 ; 10CCD         # 8.0  OLD HUNGARIAN CAPITAL LETTER EG
+10C8E         ; mapped                 ; 10CCE         # 8.0  OLD HUNGARIAN CAPITAL LETTER EGY
+10C8F         ; mapped                 ; 10CCF         # 8.0  OLD HUNGARIAN CAPITAL LETTER EH
+10C90         ; mapped                 ; 10CD0         # 8.0  OLD HUNGARIAN CAPITAL LETTER I
+10C91         ; mapped                 ; 10CD1         # 8.0  OLD HUNGARIAN CAPITAL LETTER II
+10C92         ; mapped                 ; 10CD2         # 8.0  OLD HUNGARIAN CAPITAL LETTER EJ
+10C93         ; mapped                 ; 10CD3         # 8.0  OLD HUNGARIAN CAPITAL LETTER EK
+10C94         ; mapped                 ; 10CD4         # 8.0  OLD HUNGARIAN CAPITAL LETTER AK
+10C95         ; mapped                 ; 10CD5         # 8.0  OLD HUNGARIAN CAPITAL LETTER UNK
+10C96         ; mapped                 ; 10CD6         # 8.0  OLD HUNGARIAN CAPITAL LETTER EL
+10C97         ; mapped                 ; 10CD7         # 8.0  OLD HUNGARIAN CAPITAL LETTER ELY
+10C98         ; mapped                 ; 10CD8         # 8.0  OLD HUNGARIAN CAPITAL LETTER EM
+10C99         ; mapped                 ; 10CD9         # 8.0  OLD HUNGARIAN CAPITAL LETTER EN
+10C9A         ; mapped                 ; 10CDA         # 8.0  OLD HUNGARIAN CAPITAL LETTER ENY
+10C9B         ; mapped                 ; 10CDB         # 8.0  OLD HUNGARIAN CAPITAL LETTER O
+10C9C         ; mapped                 ; 10CDC         # 8.0  OLD HUNGARIAN CAPITAL LETTER OO
+10C9D         ; mapped                 ; 10CDD         # 8.0  OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE
+10C9E         ; mapped                 ; 10CDE         # 8.0  OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE
+10C9F         ; mapped                 ; 10CDF         # 8.0  OLD HUNGARIAN CAPITAL LETTER OEE
+10CA0         ; mapped                 ; 10CE0         # 8.0  OLD HUNGARIAN CAPITAL LETTER EP
+10CA1         ; mapped                 ; 10CE1         # 8.0  OLD HUNGARIAN CAPITAL LETTER EMP
+10CA2         ; mapped                 ; 10CE2         # 8.0  OLD HUNGARIAN CAPITAL LETTER ER
+10CA3         ; mapped                 ; 10CE3         # 8.0  OLD HUNGARIAN CAPITAL LETTER SHORT ER
+10CA4         ; mapped                 ; 10CE4         # 8.0  OLD HUNGARIAN CAPITAL LETTER ES
+10CA5         ; mapped                 ; 10CE5         # 8.0  OLD HUNGARIAN CAPITAL LETTER ESZ
+10CA6         ; mapped                 ; 10CE6         # 8.0  OLD HUNGARIAN CAPITAL LETTER ET
+10CA7         ; mapped                 ; 10CE7         # 8.0  OLD HUNGARIAN CAPITAL LETTER ENT
+10CA8         ; mapped                 ; 10CE8         # 8.0  OLD HUNGARIAN CAPITAL LETTER ETY
+10CA9         ; mapped                 ; 10CE9         # 8.0  OLD HUNGARIAN CAPITAL LETTER ECH
+10CAA         ; mapped                 ; 10CEA         # 8.0  OLD HUNGARIAN CAPITAL LETTER U
+10CAB         ; mapped                 ; 10CEB         # 8.0  OLD HUNGARIAN CAPITAL LETTER UU
+10CAC         ; mapped                 ; 10CEC         # 8.0  OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE
+10CAD         ; mapped                 ; 10CED         # 8.0  OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE
+10CAE         ; mapped                 ; 10CEE         # 8.0  OLD HUNGARIAN CAPITAL LETTER EV
+10CAF         ; mapped                 ; 10CEF         # 8.0  OLD HUNGARIAN CAPITAL LETTER EZ
+10CB0         ; mapped                 ; 10CF0         # 8.0  OLD HUNGARIAN CAPITAL LETTER EZS
+10CB1         ; mapped                 ; 10CF1         # 8.0  OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN
+10CB2         ; mapped                 ; 10CF2         # 8.0  OLD HUNGARIAN CAPITAL LETTER US
+10CB3..10CBF  ; disallowed                             # NA   <reserved-10CB3>..<reserved-10CBF>
+10CC0..10CF2  ; valid                                  # 8.0  OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US
+10CF3..10CF9  ; disallowed                             # NA   <reserved-10CF3>..<reserved-10CF9>
+10CFA..10CFF  ; valid                  ;      ; NV8    # 8.0  OLD HUNGARIAN NUMBER ONE..OLD HUNGARIAN NUMBER ONE THOUSAND
+10D00..10D27  ; valid                                  # 11.0 HANIFI ROHINGYA LETTER A..HANIFI ROHINGYA SIGN TASSI
+10D28..10D2F  ; disallowed                             # NA   <reserved-10D28>..<reserved-10D2F>
+10D30..10D39  ; valid                                  # 11.0 HANIFI ROHINGYA DIGIT ZERO..HANIFI ROHINGYA DIGIT NINE
+10D3A..10E5F  ; disallowed                             # NA   <reserved-10D3A>..<reserved-10E5F>
+10E60..10E7E  ; valid                  ;      ; NV8    # 5.2  RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS
+10E7F         ; disallowed                             # NA   <reserved-10E7F>
+10E80..10EA9  ; valid                                  # 13.0 YEZIDI LETTER ELIF..YEZIDI LETTER ET
+10EAA         ; disallowed                             # NA   <reserved-10EAA>
+10EAB..10EAC  ; valid                                  # 13.0 YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
+10EAD         ; valid                  ;      ; NV8    # 13.0 YEZIDI HYPHENATION MARK
+10EAE..10EAF  ; disallowed                             # NA   <reserved-10EAE>..<reserved-10EAF>
+10EB0..10EB1  ; valid                                  # 13.0 YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
+10EB2..10EFF  ; disallowed                             # NA   <reserved-10EB2>..<reserved-10EFF>
+10F00..10F1C  ; valid                                  # 11.0 OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
+10F1D..10F26  ; valid                  ;      ; NV8    # 11.0 OLD SOGDIAN NUMBER ONE..OLD SOGDIAN FRACTION ONE HALF
+10F27         ; valid                                  # 11.0 OLD SOGDIAN LIGATURE AYIN-DALETH
+10F28..10F2F  ; disallowed                             # NA   <reserved-10F28>..<reserved-10F2F>
+10F30..10F50  ; valid                                  # 11.0 SOGDIAN LETTER ALEPH..SOGDIAN COMBINING STROKE BELOW
+10F51..10F59  ; valid                  ;      ; NV8    # 11.0 SOGDIAN NUMBER ONE..SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT
+10F5A..10FAF  ; disallowed                             # NA   <reserved-10F5A>..<reserved-10FAF>
+10FB0..10FC4  ; valid                                  # 13.0 CHORASMIAN LETTER ALEPH..CHORASMIAN LETTER TAW
+10FC5..10FCB  ; valid                  ;      ; NV8    # 13.0 CHORASMIAN NUMBER ONE..CHORASMIAN NUMBER ONE HUNDRED
+10FCC..10FDF  ; disallowed                             # NA   <reserved-10FCC>..<reserved-10FDF>
+10FE0..10FF6  ; valid                                  # 12.0 ELYMAIC LETTER ALEPH..ELYMAIC LIGATURE ZAYIN-YODH
+10FF7..10FFF  ; disallowed                             # NA   <reserved-10FF7>..<reserved-10FFF>
+11000..11046  ; valid                                  # 6.0  BRAHMI SIGN CANDRABINDU..BRAHMI VIRAMA
+11047..1104D  ; valid                  ;      ; NV8    # 6.0  BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS
+1104E..11051  ; disallowed                             # NA   <reserved-1104E>..<reserved-11051>
+11052..11065  ; valid                  ;      ; NV8    # 6.0  BRAHMI NUMBER ONE..BRAHMI NUMBER ONE THOUSAND
+11066..1106F  ; valid                                  # 6.0  BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE
+11070..1107E  ; disallowed                             # NA   <reserved-11070>..<reserved-1107E>
+1107F         ; valid                                  # 7.0  BRAHMI NUMBER JOINER
+11080..110BA  ; valid                                  # 5.2  KAITHI SIGN CANDRABINDU..KAITHI SIGN NUKTA
+110BB..110BC  ; valid                  ;      ; NV8    # 5.2  KAITHI ABBREVIATION SIGN..KAITHI ENUMERATION SIGN
+110BD         ; disallowed                             # 5.2  KAITHI NUMBER SIGN
+110BE..110C1  ; valid                  ;      ; NV8    # 5.2  KAITHI SECTION MARK..KAITHI DOUBLE DANDA
+110C2..110CC  ; disallowed                             # NA   <reserved-110C2>..<reserved-110CC>
+110CD         ; disallowed                             # 11.0 KAITHI NUMBER SIGN ABOVE
+110CE..110CF  ; disallowed                             # NA   <reserved-110CE>..<reserved-110CF>
+110D0..110E8  ; valid                                  # 6.1  SORA SOMPENG LETTER SAH..SORA SOMPENG LETTER MAE
+110E9..110EF  ; disallowed                             # NA   <reserved-110E9>..<reserved-110EF>
+110F0..110F9  ; valid                                  # 6.1  SORA SOMPENG DIGIT ZERO..SORA SOMPENG DIGIT NINE
+110FA..110FF  ; disallowed                             # NA   <reserved-110FA>..<reserved-110FF>
+11100..11134  ; valid                                  # 6.1  CHAKMA SIGN CANDRABINDU..CHAKMA MAAYYAA
+11135         ; disallowed                             # NA   <reserved-11135>
+11136..1113F  ; valid                                  # 6.1  CHAKMA DIGIT ZERO..CHAKMA DIGIT NINE
+11140..11143  ; valid                  ;      ; NV8    # 6.1  CHAKMA SECTION MARK..CHAKMA QUESTION MARK
+11144..11146  ; valid                                  # 11.0 CHAKMA LETTER LHAA..CHAKMA VOWEL SIGN EI
+11147         ; valid                                  # 13.0 CHAKMA LETTER VAA
+11148..1114F  ; disallowed                             # NA   <reserved-11148>..<reserved-1114F>
+11150..11173  ; valid                                  # 7.0  MAHAJANI LETTER A..MAHAJANI SIGN NUKTA
+11174..11175  ; valid                  ;      ; NV8    # 7.0  MAHAJANI ABBREVIATION SIGN..MAHAJANI SECTION MARK
+11176         ; valid                                  # 7.0  MAHAJANI LIGATURE SHRI
+11177..1117F  ; disallowed                             # NA   <reserved-11177>..<reserved-1117F>
+11180..111C4  ; valid                                  # 6.1  SHARADA SIGN CANDRABINDU..SHARADA OM
+111C5..111C8  ; valid                  ;      ; NV8    # 6.1  SHARADA DANDA..SHARADA SEPARATOR
+111C9..111CC  ; valid                                  # 8.0  SHARADA SANDHI MARK..SHARADA EXTRA SHORT VOWEL MARK
+111CD         ; valid                  ;      ; NV8    # 7.0  SHARADA SUTRA MARK
+111CE..111CF  ; valid                                  # 13.0 SHARADA VOWEL SIGN PRISHTHAMATRA E..SHARADA SIGN INVERTED CANDRABINDU
+111D0..111D9  ; valid                                  # 6.1  SHARADA DIGIT ZERO..SHARADA DIGIT NINE
+111DA         ; valid                                  # 7.0  SHARADA EKAM
+111DB         ; valid                  ;      ; NV8    # 8.0  SHARADA SIGN SIDDHAM
+111DC         ; valid                                  # 8.0  SHARADA HEADSTROKE
+111DD..111DF  ; valid                  ;      ; NV8    # 8.0  SHARADA CONTINUATION SIGN..SHARADA SECTION MARK-2
+111E0         ; disallowed                             # NA   <reserved-111E0>
+111E1..111F4  ; valid                  ;      ; NV8    # 7.0  SINHALA ARCHAIC DIGIT ONE..SINHALA ARCHAIC NUMBER ONE THOUSAND
+111F5..111FF  ; disallowed                             # NA   <reserved-111F5>..<reserved-111FF>
+11200..11211  ; valid                                  # 7.0  KHOJKI LETTER A..KHOJKI LETTER JJA
+11212         ; disallowed                             # NA   <reserved-11212>
+11213..11237  ; valid                                  # 7.0  KHOJKI LETTER NYA..KHOJKI SIGN SHADDA
+11238..1123D  ; valid                  ;      ; NV8    # 7.0  KHOJKI DANDA..KHOJKI ABBREVIATION SIGN
+1123E         ; valid                                  # 9.0  KHOJKI SIGN SUKUN
+1123F..1127F  ; disallowed                             # NA   <reserved-1123F>..<reserved-1127F>
+11280..11286  ; valid                                  # 8.0  MULTANI LETTER A..MULTANI LETTER GA
+11287         ; disallowed                             # NA   <reserved-11287>
+11288         ; valid                                  # 8.0  MULTANI LETTER GHA
+11289         ; disallowed                             # NA   <reserved-11289>
+1128A..1128D  ; valid                                  # 8.0  MULTANI LETTER CA..MULTANI LETTER JJA
+1128E         ; disallowed                             # NA   <reserved-1128E>
+1128F..1129D  ; valid                                  # 8.0  MULTANI LETTER NYA..MULTANI LETTER BA
+1129E         ; disallowed                             # NA   <reserved-1129E>
+1129F..112A8  ; valid                                  # 8.0  MULTANI LETTER BHA..MULTANI LETTER RHA
+112A9         ; valid                  ;      ; NV8    # 8.0  MULTANI SECTION MARK
+112AA..112AF  ; disallowed                             # NA   <reserved-112AA>..<reserved-112AF>
+112B0..112EA  ; valid                                  # 7.0  KHUDAWADI LETTER A..KHUDAWADI SIGN VIRAMA
+112EB..112EF  ; disallowed                             # NA   <reserved-112EB>..<reserved-112EF>
+112F0..112F9  ; valid                                  # 7.0  KHUDAWADI DIGIT ZERO..KHUDAWADI DIGIT NINE
+112FA..112FF  ; disallowed                             # NA   <reserved-112FA>..<reserved-112FF>
+11300         ; valid                                  # 8.0  GRANTHA SIGN COMBINING ANUSVARA ABOVE
+11301..11303  ; valid                                  # 7.0  GRANTHA SIGN CANDRABINDU..GRANTHA SIGN VISARGA
+11304         ; disallowed                             # NA   <reserved-11304>
+11305..1130C  ; valid                                  # 7.0  GRANTHA LETTER A..GRANTHA LETTER VOCALIC L
+1130D..1130E  ; disallowed                             # NA   <reserved-1130D>..<reserved-1130E>
+1130F..11310  ; valid                                  # 7.0  GRANTHA LETTER EE..GRANTHA LETTER AI
+11311..11312  ; disallowed                             # NA   <reserved-11311>..<reserved-11312>
+11313..11328  ; valid                                  # 7.0  GRANTHA LETTER OO..GRANTHA LETTER NA
+11329         ; disallowed                             # NA   <reserved-11329>
+1132A..11330  ; valid                                  # 7.0  GRANTHA LETTER PA..GRANTHA LETTER RA
+11331         ; disallowed                             # NA   <reserved-11331>
+11332..11333  ; valid                                  # 7.0  GRANTHA LETTER LA..GRANTHA LETTER LLA
+11334         ; disallowed                             # NA   <reserved-11334>
+11335..11339  ; valid                                  # 7.0  GRANTHA LETTER VA..GRANTHA LETTER HA
+1133A         ; disallowed                             # NA   <reserved-1133A>
+1133B         ; valid                                  # 11.0 COMBINING BINDU BELOW
+1133C..11344  ; valid                                  # 7.0  GRANTHA SIGN NUKTA..GRANTHA VOWEL SIGN VOCALIC RR
+11345..11346  ; disallowed                             # NA   <reserved-11345>..<reserved-11346>
+11347..11348  ; valid                                  # 7.0  GRANTHA VOWEL SIGN EE..GRANTHA VOWEL SIGN AI
+11349..1134A  ; disallowed                             # NA   <reserved-11349>..<reserved-1134A>
+1134B..1134D  ; valid                                  # 7.0  GRANTHA VOWEL SIGN OO..GRANTHA SIGN VIRAMA
+1134E..1134F  ; disallowed                             # NA   <reserved-1134E>..<reserved-1134F>
+11350         ; valid                                  # 8.0  GRANTHA OM
+11351..11356  ; disallowed                             # NA   <reserved-11351>..<reserved-11356>
+11357         ; valid                                  # 7.0  GRANTHA AU LENGTH MARK
+11358..1135C  ; disallowed                             # NA   <reserved-11358>..<reserved-1135C>
+1135D..11363  ; valid                                  # 7.0  GRANTHA SIGN PLUTA..GRANTHA VOWEL SIGN VOCALIC LL
+11364..11365  ; disallowed                             # NA   <reserved-11364>..<reserved-11365>
+11366..1136C  ; valid                                  # 7.0  COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX
+1136D..1136F  ; disallowed                             # NA   <reserved-1136D>..<reserved-1136F>
+11370..11374  ; valid                                  # 7.0  COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA
+11375..113FF  ; disallowed                             # NA   <reserved-11375>..<reserved-113FF>
+11400..1144A  ; valid                                  # 9.0  NEWA LETTER A..NEWA SIDDHI
+1144B..1144F  ; valid                  ;      ; NV8    # 9.0  NEWA DANDA..NEWA ABBREVIATION SIGN
+11450..11459  ; valid                                  # 9.0  NEWA DIGIT ZERO..NEWA DIGIT NINE
+1145A         ; valid                  ;      ; NV8    # 13.0 NEWA DOUBLE COMMA
+1145B         ; valid                  ;      ; NV8    # 9.0  NEWA PLACEHOLDER MARK
+1145C         ; disallowed                             # NA   <reserved-1145C>
+1145D         ; valid                  ;      ; NV8    # 9.0  NEWA INSERTION SIGN
+1145E         ; valid                                  # 11.0 NEWA SANDHI MARK
+1145F         ; valid                                  # 12.0 NEWA LETTER VEDIC ANUSVARA
+11460..11461  ; valid                                  # 13.0 NEWA SIGN JIHVAMULIYA..NEWA SIGN UPADHMANIYA
+11462..1147F  ; disallowed                             # NA   <reserved-11462>..<reserved-1147F>
+11480..114C5  ; valid                                  # 7.0  TIRHUTA ANJI..TIRHUTA GVANG
+114C6         ; valid                  ;      ; NV8    # 7.0  TIRHUTA ABBREVIATION SIGN
+114C7         ; valid                                  # 7.0  TIRHUTA OM
+114C8..114CF  ; disallowed                             # NA   <reserved-114C8>..<reserved-114CF>
+114D0..114D9  ; valid                                  # 7.0  TIRHUTA DIGIT ZERO..TIRHUTA DIGIT NINE
+114DA..1157F  ; disallowed                             # NA   <reserved-114DA>..<reserved-1157F>
+11580..115B5  ; valid                                  # 7.0  SIDDHAM LETTER A..SIDDHAM VOWEL SIGN VOCALIC RR
+115B6..115B7  ; disallowed                             # NA   <reserved-115B6>..<reserved-115B7>
+115B8..115C0  ; valid                                  # 7.0  SIDDHAM VOWEL SIGN E..SIDDHAM SIGN NUKTA
+115C1..115C9  ; valid                  ;      ; NV8    # 7.0  SIDDHAM SIGN SIDDHAM..SIDDHAM END OF TEXT MARK
+115CA..115D7  ; valid                  ;      ; NV8    # 8.0  SIDDHAM SECTION MARK WITH TRIDENT AND U-SHAPED ORNAMENTS..SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES
+115D8..115DD  ; valid                                  # 8.0  SIDDHAM LETTER THREE-CIRCLE ALTERNATE I..SIDDHAM VOWEL SIGN ALTERNATE UU
+115DE..115FF  ; disallowed                             # NA   <reserved-115DE>..<reserved-115FF>
+11600..11640  ; valid                                  # 7.0  MODI LETTER A..MODI SIGN ARDHACANDRA
+11641..11643  ; valid                  ;      ; NV8    # 7.0  MODI DANDA..MODI ABBREVIATION SIGN
+11644         ; valid                                  # 7.0  MODI SIGN HUVA
+11645..1164F  ; disallowed                             # NA   <reserved-11645>..<reserved-1164F>
+11650..11659  ; valid                                  # 7.0  MODI DIGIT ZERO..MODI DIGIT NINE
+1165A..1165F  ; disallowed                             # NA   <reserved-1165A>..<reserved-1165F>
+11660..1166C  ; valid                  ;      ; NV8    # 9.0  MONGOLIAN BIRGA WITH ORNAMENT..MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT
+1166D..1167F  ; disallowed                             # NA   <reserved-1166D>..<reserved-1167F>
+11680..116B7  ; valid                                  # 6.1  TAKRI LETTER A..TAKRI SIGN NUKTA
+116B8         ; valid                                  # 12.0 TAKRI LETTER ARCHAIC KHA
+116B9..116BF  ; disallowed                             # NA   <reserved-116B9>..<reserved-116BF>
+116C0..116C9  ; valid                                  # 6.1  TAKRI DIGIT ZERO..TAKRI DIGIT NINE
+116CA..116FF  ; disallowed                             # NA   <reserved-116CA>..<reserved-116FF>
+11700..11719  ; valid                                  # 8.0  AHOM LETTER KA..AHOM LETTER JHA
+1171A         ; valid                                  # 11.0 AHOM LETTER ALTERNATE BA
+1171B..1171C  ; disallowed                             # NA   <reserved-1171B>..<reserved-1171C>
+1171D..1172B  ; valid                                  # 8.0  AHOM CONSONANT SIGN MEDIAL LA..AHOM SIGN KILLER
+1172C..1172F  ; disallowed                             # NA   <reserved-1172C>..<reserved-1172F>
+11730..11739  ; valid                                  # 8.0  AHOM DIGIT ZERO..AHOM DIGIT NINE
+1173A..1173F  ; valid                  ;      ; NV8    # 8.0  AHOM NUMBER TEN..AHOM SYMBOL VI
+11740..117FF  ; disallowed                             # NA   <reserved-11740>..<reserved-117FF>
+11800..1183A  ; valid                                  # 11.0 DOGRA LETTER A..DOGRA SIGN NUKTA
+1183B         ; valid                  ;      ; NV8    # 11.0 DOGRA ABBREVIATION SIGN
+1183C..1189F  ; disallowed                             # NA   <reserved-1183C>..<reserved-1189F>
+118A0         ; mapped                 ; 118C0         # 7.0  WARANG CITI CAPITAL LETTER NGAA
+118A1         ; mapped                 ; 118C1         # 7.0  WARANG CITI CAPITAL LETTER A
+118A2         ; mapped                 ; 118C2         # 7.0  WARANG CITI CAPITAL LETTER WI
+118A3         ; mapped                 ; 118C3         # 7.0  WARANG CITI CAPITAL LETTER YU
+118A4         ; mapped                 ; 118C4         # 7.0  WARANG CITI CAPITAL LETTER YA
+118A5         ; mapped                 ; 118C5         # 7.0  WARANG CITI CAPITAL LETTER YO
+118A6         ; mapped                 ; 118C6         # 7.0  WARANG CITI CAPITAL LETTER II
+118A7         ; mapped                 ; 118C7         # 7.0  WARANG CITI CAPITAL LETTER UU
+118A8         ; mapped                 ; 118C8         # 7.0  WARANG CITI CAPITAL LETTER E
+118A9         ; mapped                 ; 118C9         # 7.0  WARANG CITI CAPITAL LETTER O
+118AA         ; mapped                 ; 118CA         # 7.0  WARANG CITI CAPITAL LETTER ANG
+118AB         ; mapped                 ; 118CB         # 7.0  WARANG CITI CAPITAL LETTER GA
+118AC         ; mapped                 ; 118CC         # 7.0  WARANG CITI CAPITAL LETTER KO
+118AD         ; mapped                 ; 118CD         # 7.0  WARANG CITI CAPITAL LETTER ENY
+118AE         ; mapped                 ; 118CE         # 7.0  WARANG CITI CAPITAL LETTER YUJ
+118AF         ; mapped                 ; 118CF         # 7.0  WARANG CITI CAPITAL LETTER UC
+118B0         ; mapped                 ; 118D0         # 7.0  WARANG CITI CAPITAL LETTER ENN
+118B1         ; mapped                 ; 118D1         # 7.0  WARANG CITI CAPITAL LETTER ODD
+118B2         ; mapped                 ; 118D2         # 7.0  WARANG CITI CAPITAL LETTER TTE
+118B3         ; mapped                 ; 118D3         # 7.0  WARANG CITI CAPITAL LETTER NUNG
+118B4         ; mapped                 ; 118D4         # 7.0  WARANG CITI CAPITAL LETTER DA
+118B5         ; mapped                 ; 118D5         # 7.0  WARANG CITI CAPITAL LETTER AT
+118B6         ; mapped                 ; 118D6         # 7.0  WARANG CITI CAPITAL LETTER AM
+118B7         ; mapped                 ; 118D7         # 7.0  WARANG CITI CAPITAL LETTER BU
+118B8         ; mapped                 ; 118D8         # 7.0  WARANG CITI CAPITAL LETTER PU
+118B9         ; mapped                 ; 118D9         # 7.0  WARANG CITI CAPITAL LETTER HIYO
+118BA         ; mapped                 ; 118DA         # 7.0  WARANG CITI CAPITAL LETTER HOLO
+118BB         ; mapped                 ; 118DB         # 7.0  WARANG CITI CAPITAL LETTER HORR
+118BC         ; mapped                 ; 118DC         # 7.0  WARANG CITI CAPITAL LETTER HAR
+118BD         ; mapped                 ; 118DD         # 7.0  WARANG CITI CAPITAL LETTER SSUU
+118BE         ; mapped                 ; 118DE         # 7.0  WARANG CITI CAPITAL LETTER SII
+118BF         ; mapped                 ; 118DF         # 7.0  WARANG CITI CAPITAL LETTER VIYO
+118C0..118E9  ; valid                                  # 7.0  WARANG CITI SMALL LETTER NGAA..WARANG CITI DIGIT NINE
+118EA..118F2  ; valid                  ;      ; NV8    # 7.0  WARANG CITI NUMBER TEN..WARANG CITI NUMBER NINETY
+118F3..118FE  ; disallowed                             # NA   <reserved-118F3>..<reserved-118FE>
+118FF         ; valid                                  # 7.0  WARANG CITI OM
+11900..11906  ; valid                                  # 13.0 DIVES AKURU LETTER A..DIVES AKURU LETTER E
+11907..11908  ; disallowed                             # NA   <reserved-11907>..<reserved-11908>
+11909         ; valid                                  # 13.0 DIVES AKURU LETTER O
+1190A..1190B  ; disallowed                             # NA   <reserved-1190A>..<reserved-1190B>
+1190C..11913  ; valid                                  # 13.0 DIVES AKURU LETTER KA..DIVES AKURU LETTER JA
+11914         ; disallowed                             # NA   <reserved-11914>
+11915..11916  ; valid                                  # 13.0 DIVES AKURU LETTER NYA..DIVES AKURU LETTER TTA
+11917         ; disallowed                             # NA   <reserved-11917>
+11918..11935  ; valid                                  # 13.0 DIVES AKURU LETTER DDA..DIVES AKURU VOWEL SIGN E
+11936         ; disallowed                             # NA   <reserved-11936>
+11937..11938  ; valid                                  # 13.0 DIVES AKURU VOWEL SIGN AI..DIVES AKURU VOWEL SIGN O
+11939..1193A  ; disallowed                             # NA   <reserved-11939>..<reserved-1193A>
+1193B..11943  ; valid                                  # 13.0 DIVES AKURU SIGN ANUSVARA..DIVES AKURU SIGN NUKTA
+11944..11946  ; valid                  ;      ; NV8    # 13.0 DIVES AKURU DOUBLE DANDA..DIVES AKURU END OF TEXT MARK
+11947..1194F  ; disallowed                             # NA   <reserved-11947>..<reserved-1194F>
+11950..11959  ; valid                                  # 13.0 DIVES AKURU DIGIT ZERO..DIVES AKURU DIGIT NINE
+1195A..1199F  ; disallowed                             # NA   <reserved-1195A>..<reserved-1199F>
+119A0..119A7  ; valid                                  # 12.0 NANDINAGARI LETTER A..NANDINAGARI LETTER VOCALIC RR
+119A8..119A9  ; disallowed                             # NA   <reserved-119A8>..<reserved-119A9>
+119AA..119D7  ; valid                                  # 12.0 NANDINAGARI LETTER E..NANDINAGARI VOWEL SIGN VOCALIC RR
+119D8..119D9  ; disallowed                             # NA   <reserved-119D8>..<reserved-119D9>
+119DA..119E1  ; valid                                  # 12.0 NANDINAGARI VOWEL SIGN E..NANDINAGARI SIGN AVAGRAHA
+119E2         ; valid                  ;      ; NV8    # 12.0 NANDINAGARI SIGN SIDDHAM
+119E3..119E4  ; valid                                  # 12.0 NANDINAGARI HEADSTROKE..NANDINAGARI VOWEL SIGN PRISHTHAMATRA E
+119E5..119FF  ; disallowed                             # NA   <reserved-119E5>..<reserved-119FF>
+11A00..11A3E  ; valid                                  # 10.0 ZANABAZAR SQUARE LETTER A..ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA
+11A3F..11A46  ; valid                  ;      ; NV8    # 10.0 ZANABAZAR SQUARE INITIAL HEAD MARK..ZANABAZAR SQUARE CLOSING DOUBLE-LINED HEAD MARK
+11A47         ; valid                                  # 10.0 ZANABAZAR SQUARE SUBJOINER
+11A48..11A4F  ; disallowed                             # NA   <reserved-11A48>..<reserved-11A4F>
+11A50..11A83  ; valid                                  # 10.0 SOYOMBO LETTER A..SOYOMBO LETTER KSSA
+11A84..11A85  ; valid                                  # 12.0 SOYOMBO SIGN JIHVAMULIYA..SOYOMBO SIGN UPADHMANIYA
+11A86..11A99  ; valid                                  # 10.0 SOYOMBO CLUSTER-INITIAL LETTER RA..SOYOMBO SUBJOINER
+11A9A..11A9C  ; valid                  ;      ; NV8    # 10.0 SOYOMBO MARK TSHEG..SOYOMBO MARK DOUBLE SHAD
+11A9D         ; valid                                  # 11.0 SOYOMBO MARK PLUTA
+11A9E..11AA2  ; valid                  ;      ; NV8    # 10.0 SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME..SOYOMBO TERMINAL MARK-2
+11AA3..11ABF  ; disallowed                             # NA   <reserved-11AA3>..<reserved-11ABF>
+11AC0..11AF8  ; valid                                  # 7.0  PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL
+11AF9..11BFF  ; disallowed                             # NA   <reserved-11AF9>..<reserved-11BFF>
+11C00..11C08  ; valid                                  # 9.0  BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L
+11C09         ; disallowed                             # NA   <reserved-11C09>
+11C0A..11C36  ; valid                                  # 9.0  BHAIKSUKI LETTER E..BHAIKSUKI VOWEL SIGN VOCALIC L
+11C37         ; disallowed                             # NA   <reserved-11C37>
+11C38..11C40  ; valid                                  # 9.0  BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN AVAGRAHA
+11C41..11C45  ; valid                  ;      ; NV8    # 9.0  BHAIKSUKI DANDA..BHAIKSUKI GAP FILLER-2
+11C46..11C4F  ; disallowed                             # NA   <reserved-11C46>..<reserved-11C4F>
+11C50..11C59  ; valid                                  # 9.0  BHAIKSUKI DIGIT ZERO..BHAIKSUKI DIGIT NINE
+11C5A..11C6C  ; valid                  ;      ; NV8    # 9.0  BHAIKSUKI NUMBER ONE..BHAIKSUKI HUNDREDS UNIT MARK
+11C6D..11C6F  ; disallowed                             # NA   <reserved-11C6D>..<reserved-11C6F>
+11C70..11C71  ; valid                  ;      ; NV8    # 9.0  MARCHEN HEAD MARK..MARCHEN MARK SHAD
+11C72..11C8F  ; valid                                  # 9.0  MARCHEN LETTER KA..MARCHEN LETTER A
+11C90..11C91  ; disallowed                             # NA   <reserved-11C90>..<reserved-11C91>
+11C92..11CA7  ; valid                                  # 9.0  MARCHEN SUBJOINED LETTER KA..MARCHEN SUBJOINED LETTER ZA
+11CA8         ; disallowed                             # NA   <reserved-11CA8>
+11CA9..11CB6  ; valid                                  # 9.0  MARCHEN SUBJOINED LETTER YA..MARCHEN SIGN CANDRABINDU
+11CB7..11CFF  ; disallowed                             # NA   <reserved-11CB7>..<reserved-11CFF>
+11D00..11D06  ; valid                                  # 10.0 MASARAM GONDI LETTER A..MASARAM GONDI LETTER E
+11D07         ; disallowed                             # NA   <reserved-11D07>
+11D08..11D09  ; valid                                  # 10.0 MASARAM GONDI LETTER AI..MASARAM GONDI LETTER O
+11D0A         ; disallowed                             # NA   <reserved-11D0A>
+11D0B..11D36  ; valid                                  # 10.0 MASARAM GONDI LETTER AU..MASARAM GONDI VOWEL SIGN VOCALIC R
+11D37..11D39  ; disallowed                             # NA   <reserved-11D37>..<reserved-11D39>
+11D3A         ; valid                                  # 10.0 MASARAM GONDI VOWEL SIGN E
+11D3B         ; disallowed                             # NA   <reserved-11D3B>
+11D3C..11D3D  ; valid                                  # 10.0 MASARAM GONDI VOWEL SIGN AI..MASARAM GONDI VOWEL SIGN O
+11D3E         ; disallowed                             # NA   <reserved-11D3E>
+11D3F..11D47  ; valid                                  # 10.0 MASARAM GONDI VOWEL SIGN AU..MASARAM GONDI RA-KARA
+11D48..11D4F  ; disallowed                             # NA   <reserved-11D48>..<reserved-11D4F>
+11D50..11D59  ; valid                                  # 10.0 MASARAM GONDI DIGIT ZERO..MASARAM GONDI DIGIT NINE
+11D5A..11D5F  ; disallowed                             # NA   <reserved-11D5A>..<reserved-11D5F>
+11D60..11D65  ; valid                                  # 11.0 GUNJALA GONDI LETTER A..GUNJALA GONDI LETTER UU
+11D66         ; disallowed                             # NA   <reserved-11D66>
+11D67..11D68  ; valid                                  # 11.0 GUNJALA GONDI LETTER EE..GUNJALA GONDI LETTER AI
+11D69         ; disallowed                             # NA   <reserved-11D69>
+11D6A..11D8E  ; valid                                  # 11.0 GUNJALA GONDI LETTER OO..GUNJALA GONDI VOWEL SIGN UU
+11D8F         ; disallowed                             # NA   <reserved-11D8F>
+11D90..11D91  ; valid                                  # 11.0 GUNJALA GONDI VOWEL SIGN EE..GUNJALA GONDI VOWEL SIGN AI
+11D92         ; disallowed                             # NA   <reserved-11D92>
+11D93..11D98  ; valid                                  # 11.0 GUNJALA GONDI VOWEL SIGN OO..GUNJALA GONDI OM
+11D99..11D9F  ; disallowed                             # NA   <reserved-11D99>..<reserved-11D9F>
+11DA0..11DA9  ; valid                                  # 11.0 GUNJALA GONDI DIGIT ZERO..GUNJALA GONDI DIGIT NINE
+11DAA..11EDF  ; disallowed                             # NA   <reserved-11DAA>..<reserved-11EDF>
+11EE0..11EF6  ; valid                                  # 11.0 MAKASAR LETTER KA..MAKASAR VOWEL SIGN O
+11EF7..11EF8  ; valid                  ;      ; NV8    # 11.0 MAKASAR PASSIMBANG..MAKASAR END OF SECTION
+11EF9..11FAF  ; disallowed                             # NA   <reserved-11EF9>..<reserved-11FAF>
+11FB0         ; valid                                  # 13.0 LISU LETTER YHA
+11FB1..11FBF  ; disallowed                             # NA   <reserved-11FB1>..<reserved-11FBF>
+11FC0..11FF1  ; valid                  ;      ; NV8    # 12.0 TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH..TAMIL SIGN VAKAIYARAA
+11FF2..11FFE  ; disallowed                             # NA   <reserved-11FF2>..<reserved-11FFE>
+11FFF         ; valid                  ;      ; NV8    # 12.0 TAMIL PUNCTUATION END OF TEXT
+12000..1236E  ; valid                                  # 5.0  CUNEIFORM SIGN A..CUNEIFORM SIGN ZUM
+1236F..12398  ; valid                                  # 7.0  CUNEIFORM SIGN KAP ELAMITE..CUNEIFORM SIGN UM TIMES ME
+12399         ; valid                                  # 8.0  CUNEIFORM SIGN U U
+1239A..123FF  ; disallowed                             # NA   <reserved-1239A>..<reserved-123FF>
+12400..12462  ; valid                  ;      ; NV8    # 5.0  CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER
+12463..1246E  ; valid                  ;      ; NV8    # 7.0  CUNEIFORM NUMERIC SIGN ONE QUARTER GUR..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM
+1246F         ; disallowed                             # NA   <reserved-1246F>
+12470..12473  ; valid                  ;      ; NV8    # 5.0  CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
+12474         ; valid                  ;      ; NV8    # 7.0  CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON
+12475..1247F  ; disallowed                             # NA   <reserved-12475>..<reserved-1247F>
+12480..12543  ; valid                                  # 8.0  CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU
+12544..12FFF  ; disallowed                             # NA   <reserved-12544>..<reserved-12FFF>
+13000..1342E  ; valid                                  # 5.2  EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032
+1342F         ; disallowed                             # NA   <reserved-1342F>
+13430..13438  ; disallowed                             # 12.0 EGYPTIAN HIEROGLYPH VERTICAL JOINER..EGYPTIAN HIEROGLYPH END SEGMENT
+13439..143FF  ; disallowed                             # NA   <reserved-13439>..<reserved-143FF>
+14400..14646  ; valid                                  # 8.0  ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530
+14647..167FF  ; disallowed                             # NA   <reserved-14647>..<reserved-167FF>
+16800..16A38  ; valid                                  # 6.0  BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ
+16A39..16A3F  ; disallowed                             # NA   <reserved-16A39>..<reserved-16A3F>
+16A40..16A5E  ; valid                                  # 7.0  MRO LETTER TA..MRO LETTER TEK
+16A5F         ; disallowed                             # NA   <reserved-16A5F>
+16A60..16A69  ; valid                                  # 7.0  MRO DIGIT ZERO..MRO DIGIT NINE
+16A6A..16A6D  ; disallowed                             # NA   <reserved-16A6A>..<reserved-16A6D>
+16A6E..16A6F  ; valid                  ;      ; NV8    # 7.0  MRO DANDA..MRO DOUBLE DANDA
+16A70..16ACF  ; disallowed                             # NA   <reserved-16A70>..<reserved-16ACF>
+16AD0..16AED  ; valid                                  # 7.0  BASSA VAH LETTER ENNI..BASSA VAH LETTER I
+16AEE..16AEF  ; disallowed                             # NA   <reserved-16AEE>..<reserved-16AEF>
+16AF0..16AF4  ; valid                                  # 7.0  BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
+16AF5         ; valid                  ;      ; NV8    # 7.0  BASSA VAH FULL STOP
+16AF6..16AFF  ; disallowed                             # NA   <reserved-16AF6>..<reserved-16AFF>
+16B00..16B36  ; valid                                  # 7.0  PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG MARK CIM TAUM
+16B37..16B3F  ; valid                  ;      ; NV8    # 7.0  PAHAWH HMONG SIGN VOS THOM..PAHAWH HMONG SIGN XYEEM FAIB
+16B40..16B43  ; valid                                  # 7.0  PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM
+16B44..16B45  ; valid                  ;      ; NV8    # 7.0  PAHAWH HMONG SIGN XAUS..PAHAWH HMONG SIGN CIM TSOV ROG
+16B46..16B4F  ; disallowed                             # NA   <reserved-16B46>..<reserved-16B4F>
+16B50..16B59  ; valid                                  # 7.0  PAHAWH HMONG DIGIT ZERO..PAHAWH HMONG DIGIT NINE
+16B5A         ; disallowed                             # NA   <reserved-16B5A>
+16B5B..16B61  ; valid                  ;      ; NV8    # 7.0  PAHAWH HMONG NUMBER TENS..PAHAWH HMONG NUMBER TRILLIONS
+16B62         ; disallowed                             # NA   <reserved-16B62>
+16B63..16B77  ; valid                                  # 7.0  PAHAWH HMONG SIGN VOS LUB..PAHAWH HMONG SIGN CIM NRES TOS
+16B78..16B7C  ; disallowed                             # NA   <reserved-16B78>..<reserved-16B7C>
+16B7D..16B8F  ; valid                                  # 7.0  PAHAWH HMONG CLAN SIGN TSHEEJ..PAHAWH HMONG CLAN SIGN VWJ
+16B90..16E3F  ; disallowed                             # NA   <reserved-16B90>..<reserved-16E3F>
+16E40         ; mapped                 ; 16E60         # 11.0 MEDEFAIDRIN CAPITAL LETTER M
+16E41         ; mapped                 ; 16E61         # 11.0 MEDEFAIDRIN CAPITAL LETTER S
+16E42         ; mapped                 ; 16E62         # 11.0 MEDEFAIDRIN CAPITAL LETTER V
+16E43         ; mapped                 ; 16E63         # 11.0 MEDEFAIDRIN CAPITAL LETTER W
+16E44         ; mapped                 ; 16E64         # 11.0 MEDEFAIDRIN CAPITAL LETTER ATIU
+16E45         ; mapped                 ; 16E65         # 11.0 MEDEFAIDRIN CAPITAL LETTER Z
+16E46         ; mapped                 ; 16E66         # 11.0 MEDEFAIDRIN CAPITAL LETTER KP
+16E47         ; mapped                 ; 16E67         # 11.0 MEDEFAIDRIN CAPITAL LETTER P
+16E48         ; mapped                 ; 16E68         # 11.0 MEDEFAIDRIN CAPITAL LETTER T
+16E49         ; mapped                 ; 16E69         # 11.0 MEDEFAIDRIN CAPITAL LETTER G
+16E4A         ; mapped                 ; 16E6A         # 11.0 MEDEFAIDRIN CAPITAL LETTER F
+16E4B         ; mapped                 ; 16E6B         # 11.0 MEDEFAIDRIN CAPITAL LETTER I
+16E4C         ; mapped                 ; 16E6C         # 11.0 MEDEFAIDRIN CAPITAL LETTER K
+16E4D         ; mapped                 ; 16E6D         # 11.0 MEDEFAIDRIN CAPITAL LETTER A
+16E4E         ; mapped                 ; 16E6E         # 11.0 MEDEFAIDRIN CAPITAL LETTER J
+16E4F         ; mapped                 ; 16E6F         # 11.0 MEDEFAIDRIN CAPITAL LETTER E
+16E50         ; mapped                 ; 16E70         # 11.0 MEDEFAIDRIN CAPITAL LETTER B
+16E51         ; mapped                 ; 16E71         # 11.0 MEDEFAIDRIN CAPITAL LETTER C
+16E52         ; mapped                 ; 16E72         # 11.0 MEDEFAIDRIN CAPITAL LETTER U
+16E53         ; mapped                 ; 16E73         # 11.0 MEDEFAIDRIN CAPITAL LETTER YU
+16E54         ; mapped                 ; 16E74         # 11.0 MEDEFAIDRIN CAPITAL LETTER L
+16E55         ; mapped                 ; 16E75         # 11.0 MEDEFAIDRIN CAPITAL LETTER Q
+16E56         ; mapped                 ; 16E76         # 11.0 MEDEFAIDRIN CAPITAL LETTER HP
+16E57         ; mapped                 ; 16E77         # 11.0 MEDEFAIDRIN CAPITAL LETTER NY
+16E58         ; mapped                 ; 16E78         # 11.0 MEDEFAIDRIN CAPITAL LETTER X
+16E59         ; mapped                 ; 16E79         # 11.0 MEDEFAIDRIN CAPITAL LETTER D
+16E5A         ; mapped                 ; 16E7A         # 11.0 MEDEFAIDRIN CAPITAL LETTER OE
+16E5B         ; mapped                 ; 16E7B         # 11.0 MEDEFAIDRIN CAPITAL LETTER N
+16E5C         ; mapped                 ; 16E7C         # 11.0 MEDEFAIDRIN CAPITAL LETTER R
+16E5D         ; mapped                 ; 16E7D         # 11.0 MEDEFAIDRIN CAPITAL LETTER O
+16E5E         ; mapped                 ; 16E7E         # 11.0 MEDEFAIDRIN CAPITAL LETTER AI
+16E5F         ; mapped                 ; 16E7F         # 11.0 MEDEFAIDRIN CAPITAL LETTER Y
+16E60..16E7F  ; valid                                  # 11.0 MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16E80..16E9A  ; valid                  ;      ; NV8    # 11.0 MEDEFAIDRIN DIGIT ZERO..MEDEFAIDRIN EXCLAMATION OH
+16E9B..16EFF  ; disallowed                             # NA   <reserved-16E9B>..<reserved-16EFF>
+16F00..16F44  ; valid                                  # 6.1  MIAO LETTER PA..MIAO LETTER HHA
+16F45..16F4A  ; valid                                  # 12.0 MIAO LETTER BRI..MIAO LETTER RTE
+16F4B..16F4E  ; disallowed                             # NA   <reserved-16F4B>..<reserved-16F4E>
+16F4F         ; valid                                  # 12.0 MIAO SIGN CONSONANT MODIFIER BAR
+16F50..16F7E  ; valid                                  # 6.1  MIAO LETTER NASALIZATION..MIAO VOWEL SIGN NG
+16F7F..16F87  ; valid                                  # 12.0 MIAO VOWEL SIGN UOG..MIAO VOWEL SIGN UI
+16F88..16F8E  ; disallowed                             # NA   <reserved-16F88>..<reserved-16F8E>
+16F8F..16F9F  ; valid                                  # 6.1  MIAO TONE RIGHT..MIAO LETTER REFORMED TONE-8
+16FA0..16FDF  ; disallowed                             # NA   <reserved-16FA0>..<reserved-16FDF>
+16FE0         ; valid                                  # 9.0  TANGUT ITERATION MARK
+16FE1         ; valid                                  # 10.0 NUSHU ITERATION MARK
+16FE2         ; valid                  ;      ; NV8    # 12.0 OLD CHINESE HOOK MARK
+16FE3         ; valid                                  # 12.0 OLD CHINESE ITERATION MARK
+16FE4         ; valid                                  # 13.0 KHITAN SMALL SCRIPT FILLER
+16FE5..16FEF  ; disallowed                             # NA   <reserved-16FE5>..<reserved-16FEF>
+16FF0..16FF1  ; valid                                  # 13.0 VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY
+16FF2..16FFF  ; disallowed                             # NA   <reserved-16FF2>..<reserved-16FFF>
+17000..187EC  ; valid                                  # 9.0  TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187EC
+187ED..187F1  ; valid                                  # 11.0 TANGUT IDEOGRAPH-187ED..TANGUT IDEOGRAPH-187F1
+187F2..187F7  ; valid                                  # 12.0 TANGUT IDEOGRAPH-187F2..TANGUT IDEOGRAPH-187F7
+187F8..187FF  ; disallowed                             # NA   <reserved-187F8>..<reserved-187FF>
+18800..18AF2  ; valid                                  # 9.0  TANGUT COMPONENT-001..TANGUT COMPONENT-755
+18AF3..18CD5  ; valid                                  # 13.0 TANGUT COMPONENT-756..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18CD6..18CFF  ; disallowed                             # NA   <reserved-18CD6>..<reserved-18CFF>
+18D00..18D08  ; valid                                  # 13.0 TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08
+18D09..1AFFF  ; disallowed                             # NA   <reserved-18D09>..<reserved-1AFFF>
+1B000..1B001  ; valid                                  # 6.0  KATAKANA LETTER ARCHAIC E..HIRAGANA LETTER ARCHAIC YE
+1B002..1B11E  ; valid                                  # 10.0 HENTAIGANA LETTER A-1..HENTAIGANA LETTER N-MU-MO-2
+1B11F..1B14F  ; disallowed                             # NA   <reserved-1B11F>..<reserved-1B14F>
+1B150..1B152  ; valid                                  # 12.0 HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO
+1B153..1B163  ; disallowed                             # NA   <reserved-1B153>..<reserved-1B163>
+1B164..1B167  ; valid                                  # 12.0 KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N
+1B168..1B16F  ; disallowed                             # NA   <reserved-1B168>..<reserved-1B16F>
+1B170..1B2FB  ; valid                                  # 10.0 NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB
+1B2FC..1BBFF  ; disallowed                             # NA   <reserved-1B2FC>..<reserved-1BBFF>
+1BC00..1BC6A  ; valid                                  # 7.0  DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M
+1BC6B..1BC6F  ; disallowed                             # NA   <reserved-1BC6B>..<reserved-1BC6F>
+1BC70..1BC7C  ; valid                                  # 7.0  DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK
+1BC7D..1BC7F  ; disallowed                             # NA   <reserved-1BC7D>..<reserved-1BC7F>
+1BC80..1BC88  ; valid                                  # 7.0  DUPLOYAN AFFIX HIGH ACUTE..DUPLOYAN AFFIX HIGH VERTICAL
+1BC89..1BC8F  ; disallowed                             # NA   <reserved-1BC89>..<reserved-1BC8F>
+1BC90..1BC99  ; valid                                  # 7.0  DUPLOYAN AFFIX LOW ACUTE..DUPLOYAN AFFIX LOW ARROW
+1BC9A..1BC9B  ; disallowed                             # NA   <reserved-1BC9A>..<reserved-1BC9B>
+1BC9C         ; valid                  ;      ; NV8    # 7.0  DUPLOYAN SIGN O WITH CROSS
+1BC9D..1BC9E  ; valid                                  # 7.0  DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK
+1BC9F         ; valid                  ;      ; NV8    # 7.0  DUPLOYAN PUNCTUATION CHINOOK FULL STOP
+1BCA0..1BCA3  ; ignored                                # 7.0  SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP
+1BCA4..1CFFF  ; disallowed                             # NA   <reserved-1BCA4>..<reserved-1CFFF>
+1D000..1D0F5  ; valid                  ;      ; NV8    # 3.1  BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO
+1D0F6..1D0FF  ; disallowed                             # NA   <reserved-1D0F6>..<reserved-1D0FF>
+1D100..1D126  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2
+1D127..1D128  ; disallowed                             # NA   <reserved-1D127>..<reserved-1D128>
+1D129         ; valid                  ;      ; NV8    # 5.1  MUSICAL SYMBOL MULTIPLE MEASURE REST
+1D12A..1D15D  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL DOUBLE SHARP..MUSICAL SYMBOL WHOLE NOTE
+1D15E         ; mapped                 ; 1D157 1D165   # 3.1  MUSICAL SYMBOL HALF NOTE
+1D15F         ; mapped                 ; 1D158 1D165   # 3.1  MUSICAL SYMBOL QUARTER NOTE
+1D160         ; mapped                 ; 1D158 1D165 1D16E #3.1 MUSICAL SYMBOL EIGHTH NOTE
+1D161         ; mapped                 ; 1D158 1D165 1D16F #3.1 MUSICAL SYMBOL SIXTEENTH NOTE
+1D162         ; mapped                 ; 1D158 1D165 1D170 #3.1 MUSICAL SYMBOL THIRTY-SECOND NOTE
+1D163         ; mapped                 ; 1D158 1D165 1D171 #3.1 MUSICAL SYMBOL SIXTY-FOURTH NOTE
+1D164         ; mapped                 ; 1D158 1D165 1D172 #3.1 MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
+1D165..1D172  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING FLAG-5
+1D173..1D17A  ; disallowed                             # 3.1  MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE
+1D17B..1D1BA  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL SEMIBREVIS BLACK
+1D1BB         ; mapped                 ; 1D1B9 1D165   # 3.1  MUSICAL SYMBOL MINIMA
+1D1BC         ; mapped                 ; 1D1BA 1D165   # 3.1  MUSICAL SYMBOL MINIMA BLACK
+1D1BD         ; mapped                 ; 1D1B9 1D165 1D16E #3.1 MUSICAL SYMBOL SEMIMINIMA WHITE
+1D1BE         ; mapped                 ; 1D1BA 1D165 1D16E #3.1 MUSICAL SYMBOL SEMIMINIMA BLACK
+1D1BF         ; mapped                 ; 1D1B9 1D165 1D16F #3.1 MUSICAL SYMBOL FUSA WHITE
+1D1C0         ; mapped                 ; 1D1BA 1D165 1D16F #3.1 MUSICAL SYMBOL FUSA BLACK
+1D1C1..1D1DD  ; valid                  ;      ; NV8    # 3.1  MUSICAL SYMBOL LONGA PERFECTA REST..MUSICAL SYMBOL PES SUBPUNCTIS
+1D1DE..1D1E8  ; valid                  ;      ; NV8    # 8.0  MUSICAL SYMBOL KIEVAN C CLEF..MUSICAL SYMBOL KIEVAN FLAT SIGN
+1D1E9..1D1FF  ; disallowed                             # NA   <reserved-1D1E9>..<reserved-1D1FF>
+1D200..1D245  ; valid                  ;      ; NV8    # 4.1  GREEK VOCAL NOTATION SYMBOL-1..GREEK MUSICAL LEIMMA
+1D246..1D2DF  ; disallowed                             # NA   <reserved-1D246>..<reserved-1D2DF>
+1D2E0..1D2F3  ; valid                  ;      ; NV8    # 11.0 MAYAN NUMERAL ZERO..MAYAN NUMERAL NINETEEN
+1D2F4..1D2FF  ; disallowed                             # NA   <reserved-1D2F4>..<reserved-1D2FF>
+1D300..1D356  ; valid                  ;      ; NV8    # 4.0  MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING
+1D357..1D35F  ; disallowed                             # NA   <reserved-1D357>..<reserved-1D35F>
+1D360..1D371  ; valid                  ;      ; NV8    # 5.0  COUNTING ROD UNIT DIGIT ONE..COUNTING ROD TENS DIGIT NINE
+1D372..1D378  ; valid                  ;      ; NV8    # 11.0 IDEOGRAPHIC TALLY MARK ONE..TALLY MARK FIVE
+1D379..1D3FF  ; disallowed                             # NA   <reserved-1D379>..<reserved-1D3FF>
+1D400         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD CAPITAL A
+1D401         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD CAPITAL B
+1D402         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD CAPITAL C
+1D403         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD CAPITAL D
+1D404         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD CAPITAL E
+1D405         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD CAPITAL F
+1D406         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD CAPITAL G
+1D407         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD CAPITAL H
+1D408         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD CAPITAL I
+1D409         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD CAPITAL J
+1D40A         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD CAPITAL K
+1D40B         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD CAPITAL L
+1D40C         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD CAPITAL M
+1D40D         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD CAPITAL N
+1D40E         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD CAPITAL O
+1D40F         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD CAPITAL P
+1D410         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD CAPITAL Q
+1D411         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD CAPITAL R
+1D412         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD CAPITAL S
+1D413         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD CAPITAL T
+1D414         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD CAPITAL U
+1D415         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD CAPITAL V
+1D416         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD CAPITAL W
+1D417         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD CAPITAL X
+1D418         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD CAPITAL Y
+1D419         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD CAPITAL Z
+1D41A         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD SMALL A
+1D41B         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD SMALL B
+1D41C         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD SMALL C
+1D41D         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD SMALL D
+1D41E         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD SMALL E
+1D41F         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD SMALL F
+1D420         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD SMALL G
+1D421         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD SMALL H
+1D422         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD SMALL I
+1D423         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD SMALL J
+1D424         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD SMALL K
+1D425         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD SMALL L
+1D426         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD SMALL M
+1D427         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD SMALL N
+1D428         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD SMALL O
+1D429         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD SMALL P
+1D42A         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD SMALL Q
+1D42B         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD SMALL R
+1D42C         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD SMALL S
+1D42D         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD SMALL T
+1D42E         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD SMALL U
+1D42F         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD SMALL V
+1D430         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD SMALL W
+1D431         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD SMALL X
+1D432         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD SMALL Y
+1D433         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD SMALL Z
+1D434         ; mapped                 ; 0061          # 3.1  MATHEMATICAL ITALIC CAPITAL A
+1D435         ; mapped                 ; 0062          # 3.1  MATHEMATICAL ITALIC CAPITAL B
+1D436         ; mapped                 ; 0063          # 3.1  MATHEMATICAL ITALIC CAPITAL C
+1D437         ; mapped                 ; 0064          # 3.1  MATHEMATICAL ITALIC CAPITAL D
+1D438         ; mapped                 ; 0065          # 3.1  MATHEMATICAL ITALIC CAPITAL E
+1D439         ; mapped                 ; 0066          # 3.1  MATHEMATICAL ITALIC CAPITAL F
+1D43A         ; mapped                 ; 0067          # 3.1  MATHEMATICAL ITALIC CAPITAL G
+1D43B         ; mapped                 ; 0068          # 3.1  MATHEMATICAL ITALIC CAPITAL H
+1D43C         ; mapped                 ; 0069          # 3.1  MATHEMATICAL ITALIC CAPITAL I
+1D43D         ; mapped                 ; 006A          # 3.1  MATHEMATICAL ITALIC CAPITAL J
+1D43E         ; mapped                 ; 006B          # 3.1  MATHEMATICAL ITALIC CAPITAL K
+1D43F         ; mapped                 ; 006C          # 3.1  MATHEMATICAL ITALIC CAPITAL L
+1D440         ; mapped                 ; 006D          # 3.1  MATHEMATICAL ITALIC CAPITAL M
+1D441         ; mapped                 ; 006E          # 3.1  MATHEMATICAL ITALIC CAPITAL N
+1D442         ; mapped                 ; 006F          # 3.1  MATHEMATICAL ITALIC CAPITAL O
+1D443         ; mapped                 ; 0070          # 3.1  MATHEMATICAL ITALIC CAPITAL P
+1D444         ; mapped                 ; 0071          # 3.1  MATHEMATICAL ITALIC CAPITAL Q
+1D445         ; mapped                 ; 0072          # 3.1  MATHEMATICAL ITALIC CAPITAL R
+1D446         ; mapped                 ; 0073          # 3.1  MATHEMATICAL ITALIC CAPITAL S
+1D447         ; mapped                 ; 0074          # 3.1  MATHEMATICAL ITALIC CAPITAL T
+1D448         ; mapped                 ; 0075          # 3.1  MATHEMATICAL ITALIC CAPITAL U
+1D449         ; mapped                 ; 0076          # 3.1  MATHEMATICAL ITALIC CAPITAL V
+1D44A         ; mapped                 ; 0077          # 3.1  MATHEMATICAL ITALIC CAPITAL W
+1D44B         ; mapped                 ; 0078          # 3.1  MATHEMATICAL ITALIC CAPITAL X
+1D44C         ; mapped                 ; 0079          # 3.1  MATHEMATICAL ITALIC CAPITAL Y
+1D44D         ; mapped                 ; 007A          # 3.1  MATHEMATICAL ITALIC CAPITAL Z
+1D44E         ; mapped                 ; 0061          # 3.1  MATHEMATICAL ITALIC SMALL A
+1D44F         ; mapped                 ; 0062          # 3.1  MATHEMATICAL ITALIC SMALL B
+1D450         ; mapped                 ; 0063          # 3.1  MATHEMATICAL ITALIC SMALL C
+1D451         ; mapped                 ; 0064          # 3.1  MATHEMATICAL ITALIC SMALL D
+1D452         ; mapped                 ; 0065          # 3.1  MATHEMATICAL ITALIC SMALL E
+1D453         ; mapped                 ; 0066          # 3.1  MATHEMATICAL ITALIC SMALL F
+1D454         ; mapped                 ; 0067          # 3.1  MATHEMATICAL ITALIC SMALL G
+1D455         ; disallowed                             # NA   <reserved-1D455>
+1D456         ; mapped                 ; 0069          # 3.1  MATHEMATICAL ITALIC SMALL I
+1D457         ; mapped                 ; 006A          # 3.1  MATHEMATICAL ITALIC SMALL J
+1D458         ; mapped                 ; 006B          # 3.1  MATHEMATICAL ITALIC SMALL K
+1D459         ; mapped                 ; 006C          # 3.1  MATHEMATICAL ITALIC SMALL L
+1D45A         ; mapped                 ; 006D          # 3.1  MATHEMATICAL ITALIC SMALL M
+1D45B         ; mapped                 ; 006E          # 3.1  MATHEMATICAL ITALIC SMALL N
+1D45C         ; mapped                 ; 006F          # 3.1  MATHEMATICAL ITALIC SMALL O
+1D45D         ; mapped                 ; 0070          # 3.1  MATHEMATICAL ITALIC SMALL P
+1D45E         ; mapped                 ; 0071          # 3.1  MATHEMATICAL ITALIC SMALL Q
+1D45F         ; mapped                 ; 0072          # 3.1  MATHEMATICAL ITALIC SMALL R
+1D460         ; mapped                 ; 0073          # 3.1  MATHEMATICAL ITALIC SMALL S
+1D461         ; mapped                 ; 0074          # 3.1  MATHEMATICAL ITALIC SMALL T
+1D462         ; mapped                 ; 0075          # 3.1  MATHEMATICAL ITALIC SMALL U
+1D463         ; mapped                 ; 0076          # 3.1  MATHEMATICAL ITALIC SMALL V
+1D464         ; mapped                 ; 0077          # 3.1  MATHEMATICAL ITALIC SMALL W
+1D465         ; mapped                 ; 0078          # 3.1  MATHEMATICAL ITALIC SMALL X
+1D466         ; mapped                 ; 0079          # 3.1  MATHEMATICAL ITALIC SMALL Y
+1D467         ; mapped                 ; 007A          # 3.1  MATHEMATICAL ITALIC SMALL Z
+1D468         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL A
+1D469         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL B
+1D46A         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL C
+1D46B         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL D
+1D46C         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL E
+1D46D         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL F
+1D46E         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL G
+1D46F         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL H
+1D470         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL I
+1D471         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL J
+1D472         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL K
+1D473         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL L
+1D474         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL M
+1D475         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL N
+1D476         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL O
+1D477         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL P
+1D478         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL Q
+1D479         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL R
+1D47A         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL S
+1D47B         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL T
+1D47C         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL U
+1D47D         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL V
+1D47E         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL W
+1D47F         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL X
+1D480         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL Y
+1D481         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL Z
+1D482         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD ITALIC SMALL A
+1D483         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD ITALIC SMALL B
+1D484         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD ITALIC SMALL C
+1D485         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD ITALIC SMALL D
+1D486         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD ITALIC SMALL E
+1D487         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD ITALIC SMALL F
+1D488         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD ITALIC SMALL G
+1D489         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD ITALIC SMALL H
+1D48A         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD ITALIC SMALL I
+1D48B         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD ITALIC SMALL J
+1D48C         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD ITALIC SMALL K
+1D48D         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD ITALIC SMALL L
+1D48E         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD ITALIC SMALL M
+1D48F         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD ITALIC SMALL N
+1D490         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD ITALIC SMALL O
+1D491         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD ITALIC SMALL P
+1D492         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD ITALIC SMALL Q
+1D493         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD ITALIC SMALL R
+1D494         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD ITALIC SMALL S
+1D495         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD ITALIC SMALL T
+1D496         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD ITALIC SMALL U
+1D497         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD ITALIC SMALL V
+1D498         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD ITALIC SMALL W
+1D499         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD ITALIC SMALL X
+1D49A         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD ITALIC SMALL Y
+1D49B         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD ITALIC SMALL Z
+1D49C         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SCRIPT CAPITAL A
+1D49D         ; disallowed                             # NA   <reserved-1D49D>
+1D49E         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SCRIPT CAPITAL C
+1D49F         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SCRIPT CAPITAL D
+1D4A0..1D4A1  ; disallowed                             # NA   <reserved-1D4A0>..<reserved-1D4A1>
+1D4A2         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SCRIPT CAPITAL G
+1D4A3..1D4A4  ; disallowed                             # NA   <reserved-1D4A3>..<reserved-1D4A4>
+1D4A5         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SCRIPT CAPITAL J
+1D4A6         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SCRIPT CAPITAL K
+1D4A7..1D4A8  ; disallowed                             # NA   <reserved-1D4A7>..<reserved-1D4A8>
+1D4A9         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SCRIPT CAPITAL N
+1D4AA         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SCRIPT CAPITAL O
+1D4AB         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SCRIPT CAPITAL P
+1D4AC         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SCRIPT CAPITAL Q
+1D4AD         ; disallowed                             # NA   <reserved-1D4AD>
+1D4AE         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SCRIPT CAPITAL S
+1D4AF         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SCRIPT CAPITAL T
+1D4B0         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SCRIPT CAPITAL U
+1D4B1         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SCRIPT CAPITAL V
+1D4B2         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SCRIPT CAPITAL W
+1D4B3         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SCRIPT CAPITAL X
+1D4B4         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SCRIPT CAPITAL Y
+1D4B5         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SCRIPT CAPITAL Z
+1D4B6         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SCRIPT SMALL A
+1D4B7         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SCRIPT SMALL B
+1D4B8         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SCRIPT SMALL C
+1D4B9         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SCRIPT SMALL D
+1D4BA         ; disallowed                             # NA   <reserved-1D4BA>
+1D4BB         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SCRIPT SMALL F
+1D4BC         ; disallowed                             # NA   <reserved-1D4BC>
+1D4BD         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SCRIPT SMALL H
+1D4BE         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SCRIPT SMALL I
+1D4BF         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SCRIPT SMALL J
+1D4C0         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SCRIPT SMALL K
+1D4C1         ; mapped                 ; 006C          # 4.0  MATHEMATICAL SCRIPT SMALL L
+1D4C2         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SCRIPT SMALL M
+1D4C3         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SCRIPT SMALL N
+1D4C4         ; disallowed                             # NA   <reserved-1D4C4>
+1D4C5         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SCRIPT SMALL P
+1D4C6         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SCRIPT SMALL Q
+1D4C7         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SCRIPT SMALL R
+1D4C8         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SCRIPT SMALL S
+1D4C9         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SCRIPT SMALL T
+1D4CA         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SCRIPT SMALL U
+1D4CB         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SCRIPT SMALL V
+1D4CC         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SCRIPT SMALL W
+1D4CD         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SCRIPT SMALL X
+1D4CE         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SCRIPT SMALL Y
+1D4CF         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SCRIPT SMALL Z
+1D4D0         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL A
+1D4D1         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL B
+1D4D2         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL C
+1D4D3         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL D
+1D4D4         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL E
+1D4D5         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL F
+1D4D6         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL G
+1D4D7         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL H
+1D4D8         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL I
+1D4D9         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL J
+1D4DA         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL K
+1D4DB         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL L
+1D4DC         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL M
+1D4DD         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL N
+1D4DE         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL O
+1D4DF         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL P
+1D4E0         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL Q
+1D4E1         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL R
+1D4E2         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL S
+1D4E3         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL T
+1D4E4         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL U
+1D4E5         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL V
+1D4E6         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL W
+1D4E7         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL X
+1D4E8         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL Y
+1D4E9         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD SCRIPT CAPITAL Z
+1D4EA         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL A
+1D4EB         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL B
+1D4EC         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL C
+1D4ED         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL D
+1D4EE         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL E
+1D4EF         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL F
+1D4F0         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL G
+1D4F1         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL H
+1D4F2         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL I
+1D4F3         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL J
+1D4F4         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL K
+1D4F5         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL L
+1D4F6         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL M
+1D4F7         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL N
+1D4F8         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL O
+1D4F9         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL P
+1D4FA         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL Q
+1D4FB         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL R
+1D4FC         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL S
+1D4FD         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL T
+1D4FE         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL U
+1D4FF         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL V
+1D500         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL W
+1D501         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL X
+1D502         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL Y
+1D503         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD SCRIPT SMALL Z
+1D504         ; mapped                 ; 0061          # 3.1  MATHEMATICAL FRAKTUR CAPITAL A
+1D505         ; mapped                 ; 0062          # 3.1  MATHEMATICAL FRAKTUR CAPITAL B
+1D506         ; disallowed                             # NA   <reserved-1D506>
+1D507         ; mapped                 ; 0064          # 3.1  MATHEMATICAL FRAKTUR CAPITAL D
+1D508         ; mapped                 ; 0065          # 3.1  MATHEMATICAL FRAKTUR CAPITAL E
+1D509         ; mapped                 ; 0066          # 3.1  MATHEMATICAL FRAKTUR CAPITAL F
+1D50A         ; mapped                 ; 0067          # 3.1  MATHEMATICAL FRAKTUR CAPITAL G
+1D50B..1D50C  ; disallowed                             # NA   <reserved-1D50B>..<reserved-1D50C>
+1D50D         ; mapped                 ; 006A          # 3.1  MATHEMATICAL FRAKTUR CAPITAL J
+1D50E         ; mapped                 ; 006B          # 3.1  MATHEMATICAL FRAKTUR CAPITAL K
+1D50F         ; mapped                 ; 006C          # 3.1  MATHEMATICAL FRAKTUR CAPITAL L
+1D510         ; mapped                 ; 006D          # 3.1  MATHEMATICAL FRAKTUR CAPITAL M
+1D511         ; mapped                 ; 006E          # 3.1  MATHEMATICAL FRAKTUR CAPITAL N
+1D512         ; mapped                 ; 006F          # 3.1  MATHEMATICAL FRAKTUR CAPITAL O
+1D513         ; mapped                 ; 0070          # 3.1  MATHEMATICAL FRAKTUR CAPITAL P
+1D514         ; mapped                 ; 0071          # 3.1  MATHEMATICAL FRAKTUR CAPITAL Q
+1D515         ; disallowed                             # NA   <reserved-1D515>
+1D516         ; mapped                 ; 0073          # 3.1  MATHEMATICAL FRAKTUR CAPITAL S
+1D517         ; mapped                 ; 0074          # 3.1  MATHEMATICAL FRAKTUR CAPITAL T
+1D518         ; mapped                 ; 0075          # 3.1  MATHEMATICAL FRAKTUR CAPITAL U
+1D519         ; mapped                 ; 0076          # 3.1  MATHEMATICAL FRAKTUR CAPITAL V
+1D51A         ; mapped                 ; 0077          # 3.1  MATHEMATICAL FRAKTUR CAPITAL W
+1D51B         ; mapped                 ; 0078          # 3.1  MATHEMATICAL FRAKTUR CAPITAL X
+1D51C         ; mapped                 ; 0079          # 3.1  MATHEMATICAL FRAKTUR CAPITAL Y
+1D51D         ; disallowed                             # NA   <reserved-1D51D>
+1D51E         ; mapped                 ; 0061          # 3.1  MATHEMATICAL FRAKTUR SMALL A
+1D51F         ; mapped                 ; 0062          # 3.1  MATHEMATICAL FRAKTUR SMALL B
+1D520         ; mapped                 ; 0063          # 3.1  MATHEMATICAL FRAKTUR SMALL C
+1D521         ; mapped                 ; 0064          # 3.1  MATHEMATICAL FRAKTUR SMALL D
+1D522         ; mapped                 ; 0065          # 3.1  MATHEMATICAL FRAKTUR SMALL E
+1D523         ; mapped                 ; 0066          # 3.1  MATHEMATICAL FRAKTUR SMALL F
+1D524         ; mapped                 ; 0067          # 3.1  MATHEMATICAL FRAKTUR SMALL G
+1D525         ; mapped                 ; 0068          # 3.1  MATHEMATICAL FRAKTUR SMALL H
+1D526         ; mapped                 ; 0069          # 3.1  MATHEMATICAL FRAKTUR SMALL I
+1D527         ; mapped                 ; 006A          # 3.1  MATHEMATICAL FRAKTUR SMALL J
+1D528         ; mapped                 ; 006B          # 3.1  MATHEMATICAL FRAKTUR SMALL K
+1D529         ; mapped                 ; 006C          # 3.1  MATHEMATICAL FRAKTUR SMALL L
+1D52A         ; mapped                 ; 006D          # 3.1  MATHEMATICAL FRAKTUR SMALL M
+1D52B         ; mapped                 ; 006E          # 3.1  MATHEMATICAL FRAKTUR SMALL N
+1D52C         ; mapped                 ; 006F          # 3.1  MATHEMATICAL FRAKTUR SMALL O
+1D52D         ; mapped                 ; 0070          # 3.1  MATHEMATICAL FRAKTUR SMALL P
+1D52E         ; mapped                 ; 0071          # 3.1  MATHEMATICAL FRAKTUR SMALL Q
+1D52F         ; mapped                 ; 0072          # 3.1  MATHEMATICAL FRAKTUR SMALL R
+1D530         ; mapped                 ; 0073          # 3.1  MATHEMATICAL FRAKTUR SMALL S
+1D531         ; mapped                 ; 0074          # 3.1  MATHEMATICAL FRAKTUR SMALL T
+1D532         ; mapped                 ; 0075          # 3.1  MATHEMATICAL FRAKTUR SMALL U
+1D533         ; mapped                 ; 0076          # 3.1  MATHEMATICAL FRAKTUR SMALL V
+1D534         ; mapped                 ; 0077          # 3.1  MATHEMATICAL FRAKTUR SMALL W
+1D535         ; mapped                 ; 0078          # 3.1  MATHEMATICAL FRAKTUR SMALL X
+1D536         ; mapped                 ; 0079          # 3.1  MATHEMATICAL FRAKTUR SMALL Y
+1D537         ; mapped                 ; 007A          # 3.1  MATHEMATICAL FRAKTUR SMALL Z
+1D538         ; mapped                 ; 0061          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL A
+1D539         ; mapped                 ; 0062          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL B
+1D53A         ; disallowed                             # NA   <reserved-1D53A>
+1D53B         ; mapped                 ; 0064          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL D
+1D53C         ; mapped                 ; 0065          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL E
+1D53D         ; mapped                 ; 0066          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL F
+1D53E         ; mapped                 ; 0067          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL G
+1D53F         ; disallowed                             # NA   <reserved-1D53F>
+1D540         ; mapped                 ; 0069          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL I
+1D541         ; mapped                 ; 006A          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL J
+1D542         ; mapped                 ; 006B          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL K
+1D543         ; mapped                 ; 006C          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL L
+1D544         ; mapped                 ; 006D          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL M
+1D545         ; disallowed                             # NA   <reserved-1D545>
+1D546         ; mapped                 ; 006F          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL O
+1D547..1D549  ; disallowed                             # NA   <reserved-1D547>..<reserved-1D549>
+1D54A         ; mapped                 ; 0073          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL S
+1D54B         ; mapped                 ; 0074          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL T
+1D54C         ; mapped                 ; 0075          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL U
+1D54D         ; mapped                 ; 0076          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL V
+1D54E         ; mapped                 ; 0077          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL W
+1D54F         ; mapped                 ; 0078          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL X
+1D550         ; mapped                 ; 0079          # 3.1  MATHEMATICAL DOUBLE-STRUCK CAPITAL Y
+1D551         ; disallowed                             # NA   <reserved-1D551>
+1D552         ; mapped                 ; 0061          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL A
+1D553         ; mapped                 ; 0062          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL B
+1D554         ; mapped                 ; 0063          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL C
+1D555         ; mapped                 ; 0064          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL D
+1D556         ; mapped                 ; 0065          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL E
+1D557         ; mapped                 ; 0066          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL F
+1D558         ; mapped                 ; 0067          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL G
+1D559         ; mapped                 ; 0068          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL H
+1D55A         ; mapped                 ; 0069          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL I
+1D55B         ; mapped                 ; 006A          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL J
+1D55C         ; mapped                 ; 006B          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL K
+1D55D         ; mapped                 ; 006C          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL L
+1D55E         ; mapped                 ; 006D          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL M
+1D55F         ; mapped                 ; 006E          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL N
+1D560         ; mapped                 ; 006F          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL O
+1D561         ; mapped                 ; 0070          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL P
+1D562         ; mapped                 ; 0071          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL Q
+1D563         ; mapped                 ; 0072          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL R
+1D564         ; mapped                 ; 0073          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL S
+1D565         ; mapped                 ; 0074          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL T
+1D566         ; mapped                 ; 0075          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL U
+1D567         ; mapped                 ; 0076          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL V
+1D568         ; mapped                 ; 0077          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL W
+1D569         ; mapped                 ; 0078          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL X
+1D56A         ; mapped                 ; 0079          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL Y
+1D56B         ; mapped                 ; 007A          # 3.1  MATHEMATICAL DOUBLE-STRUCK SMALL Z
+1D56C         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL A
+1D56D         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL B
+1D56E         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL C
+1D56F         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL D
+1D570         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL E
+1D571         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL F
+1D572         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL G
+1D573         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL H
+1D574         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL I
+1D575         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL J
+1D576         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL K
+1D577         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL L
+1D578         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL M
+1D579         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL N
+1D57A         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL O
+1D57B         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL P
+1D57C         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL Q
+1D57D         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL R
+1D57E         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL S
+1D57F         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL T
+1D580         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL U
+1D581         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL V
+1D582         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL W
+1D583         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL X
+1D584         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL Y
+1D585         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD FRAKTUR CAPITAL Z
+1D586         ; mapped                 ; 0061          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL A
+1D587         ; mapped                 ; 0062          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL B
+1D588         ; mapped                 ; 0063          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL C
+1D589         ; mapped                 ; 0064          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL D
+1D58A         ; mapped                 ; 0065          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL E
+1D58B         ; mapped                 ; 0066          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL F
+1D58C         ; mapped                 ; 0067          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL G
+1D58D         ; mapped                 ; 0068          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL H
+1D58E         ; mapped                 ; 0069          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL I
+1D58F         ; mapped                 ; 006A          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL J
+1D590         ; mapped                 ; 006B          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL K
+1D591         ; mapped                 ; 006C          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL L
+1D592         ; mapped                 ; 006D          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL M
+1D593         ; mapped                 ; 006E          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL N
+1D594         ; mapped                 ; 006F          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL O
+1D595         ; mapped                 ; 0070          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL P
+1D596         ; mapped                 ; 0071          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL Q
+1D597         ; mapped                 ; 0072          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL R
+1D598         ; mapped                 ; 0073          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL S
+1D599         ; mapped                 ; 0074          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL T
+1D59A         ; mapped                 ; 0075          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL U
+1D59B         ; mapped                 ; 0076          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL V
+1D59C         ; mapped                 ; 0077          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL W
+1D59D         ; mapped                 ; 0078          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL X
+1D59E         ; mapped                 ; 0079          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL Y
+1D59F         ; mapped                 ; 007A          # 3.1  MATHEMATICAL BOLD FRAKTUR SMALL Z
+1D5A0         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL A
+1D5A1         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL B
+1D5A2         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL C
+1D5A3         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL D
+1D5A4         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL E
+1D5A5         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL F
+1D5A6         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL G
+1D5A7         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL H
+1D5A8         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL I
+1D5A9         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL J
+1D5AA         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL K
+1D5AB         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL L
+1D5AC         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL M
+1D5AD         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL N
+1D5AE         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL O
+1D5AF         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL P
+1D5B0         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL Q
+1D5B1         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL R
+1D5B2         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL S
+1D5B3         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL T
+1D5B4         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL U
+1D5B5         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL V
+1D5B6         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL W
+1D5B7         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL X
+1D5B8         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL Y
+1D5B9         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF CAPITAL Z
+1D5BA         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF SMALL A
+1D5BB         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF SMALL B
+1D5BC         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF SMALL C
+1D5BD         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF SMALL D
+1D5BE         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF SMALL E
+1D5BF         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF SMALL F
+1D5C0         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF SMALL G
+1D5C1         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF SMALL H
+1D5C2         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF SMALL I
+1D5C3         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF SMALL J
+1D5C4         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF SMALL K
+1D5C5         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF SMALL L
+1D5C6         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF SMALL M
+1D5C7         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF SMALL N
+1D5C8         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF SMALL O
+1D5C9         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF SMALL P
+1D5CA         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF SMALL Q
+1D5CB         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF SMALL R
+1D5CC         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF SMALL S
+1D5CD         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF SMALL T
+1D5CE         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF SMALL U
+1D5CF         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF SMALL V
+1D5D0         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF SMALL W
+1D5D1         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF SMALL X
+1D5D2         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF SMALL Y
+1D5D3         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF SMALL Z
+1D5D4         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL A
+1D5D5         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL B
+1D5D6         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL C
+1D5D7         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL D
+1D5D8         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL E
+1D5D9         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL F
+1D5DA         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL G
+1D5DB         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL H
+1D5DC         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL I
+1D5DD         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL J
+1D5DE         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL K
+1D5DF         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL L
+1D5E0         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL M
+1D5E1         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL N
+1D5E2         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL O
+1D5E3         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL P
+1D5E4         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL Q
+1D5E5         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL R
+1D5E6         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL S
+1D5E7         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL T
+1D5E8         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL U
+1D5E9         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL V
+1D5EA         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL W
+1D5EB         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL X
+1D5EC         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL Y
+1D5ED         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL Z
+1D5EE         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL A
+1D5EF         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL B
+1D5F0         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL C
+1D5F1         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL D
+1D5F2         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL E
+1D5F3         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL F
+1D5F4         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL G
+1D5F5         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL H
+1D5F6         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL I
+1D5F7         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL J
+1D5F8         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL K
+1D5F9         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL L
+1D5FA         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL M
+1D5FB         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL N
+1D5FC         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL O
+1D5FD         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL P
+1D5FE         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL Q
+1D5FF         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL R
+1D600         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL S
+1D601         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL T
+1D602         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL U
+1D603         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL V
+1D604         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL W
+1D605         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL X
+1D606         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL Y
+1D607         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL Z
+1D608         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL A
+1D609         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL B
+1D60A         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL C
+1D60B         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL D
+1D60C         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL E
+1D60D         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL F
+1D60E         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL G
+1D60F         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL H
+1D610         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL I
+1D611         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL J
+1D612         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL K
+1D613         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL L
+1D614         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL M
+1D615         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL N
+1D616         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL O
+1D617         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL P
+1D618         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q
+1D619         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL R
+1D61A         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL S
+1D61B         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL T
+1D61C         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL U
+1D61D         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL V
+1D61E         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL W
+1D61F         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL X
+1D620         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y
+1D621         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z
+1D622         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL A
+1D623         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL B
+1D624         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL C
+1D625         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL D
+1D626         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL E
+1D627         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL F
+1D628         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL G
+1D629         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL H
+1D62A         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL I
+1D62B         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL J
+1D62C         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL K
+1D62D         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL L
+1D62E         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL M
+1D62F         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL N
+1D630         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL O
+1D631         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL P
+1D632         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL Q
+1D633         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL R
+1D634         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL S
+1D635         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL T
+1D636         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL U
+1D637         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL V
+1D638         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL W
+1D639         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL X
+1D63A         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL Y
+1D63B         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF ITALIC SMALL Z
+1D63C         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A
+1D63D         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B
+1D63E         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C
+1D63F         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D
+1D640         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E
+1D641         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F
+1D642         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G
+1D643         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H
+1D644         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I
+1D645         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J
+1D646         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K
+1D647         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L
+1D648         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M
+1D649         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N
+1D64A         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O
+1D64B         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P
+1D64C         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q
+1D64D         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R
+1D64E         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S
+1D64F         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T
+1D650         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U
+1D651         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V
+1D652         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W
+1D653         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X
+1D654         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y
+1D655         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z
+1D656         ; mapped                 ; 0061          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A
+1D657         ; mapped                 ; 0062          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B
+1D658         ; mapped                 ; 0063          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C
+1D659         ; mapped                 ; 0064          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D
+1D65A         ; mapped                 ; 0065          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E
+1D65B         ; mapped                 ; 0066          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F
+1D65C         ; mapped                 ; 0067          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G
+1D65D         ; mapped                 ; 0068          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H
+1D65E         ; mapped                 ; 0069          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I
+1D65F         ; mapped                 ; 006A          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J
+1D660         ; mapped                 ; 006B          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K
+1D661         ; mapped                 ; 006C          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L
+1D662         ; mapped                 ; 006D          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M
+1D663         ; mapped                 ; 006E          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N
+1D664         ; mapped                 ; 006F          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O
+1D665         ; mapped                 ; 0070          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P
+1D666         ; mapped                 ; 0071          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q
+1D667         ; mapped                 ; 0072          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R
+1D668         ; mapped                 ; 0073          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S
+1D669         ; mapped                 ; 0074          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T
+1D66A         ; mapped                 ; 0075          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U
+1D66B         ; mapped                 ; 0076          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V
+1D66C         ; mapped                 ; 0077          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W
+1D66D         ; mapped                 ; 0078          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X
+1D66E         ; mapped                 ; 0079          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y
+1D66F         ; mapped                 ; 007A          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z
+1D670         ; mapped                 ; 0061          # 3.1  MATHEMATICAL MONOSPACE CAPITAL A
+1D671         ; mapped                 ; 0062          # 3.1  MATHEMATICAL MONOSPACE CAPITAL B
+1D672         ; mapped                 ; 0063          # 3.1  MATHEMATICAL MONOSPACE CAPITAL C
+1D673         ; mapped                 ; 0064          # 3.1  MATHEMATICAL MONOSPACE CAPITAL D
+1D674         ; mapped                 ; 0065          # 3.1  MATHEMATICAL MONOSPACE CAPITAL E
+1D675         ; mapped                 ; 0066          # 3.1  MATHEMATICAL MONOSPACE CAPITAL F
+1D676         ; mapped                 ; 0067          # 3.1  MATHEMATICAL MONOSPACE CAPITAL G
+1D677         ; mapped                 ; 0068          # 3.1  MATHEMATICAL MONOSPACE CAPITAL H
+1D678         ; mapped                 ; 0069          # 3.1  MATHEMATICAL MONOSPACE CAPITAL I
+1D679         ; mapped                 ; 006A          # 3.1  MATHEMATICAL MONOSPACE CAPITAL J
+1D67A         ; mapped                 ; 006B          # 3.1  MATHEMATICAL MONOSPACE CAPITAL K
+1D67B         ; mapped                 ; 006C          # 3.1  MATHEMATICAL MONOSPACE CAPITAL L
+1D67C         ; mapped                 ; 006D          # 3.1  MATHEMATICAL MONOSPACE CAPITAL M
+1D67D         ; mapped                 ; 006E          # 3.1  MATHEMATICAL MONOSPACE CAPITAL N
+1D67E         ; mapped                 ; 006F          # 3.1  MATHEMATICAL MONOSPACE CAPITAL O
+1D67F         ; mapped                 ; 0070          # 3.1  MATHEMATICAL MONOSPACE CAPITAL P
+1D680         ; mapped                 ; 0071          # 3.1  MATHEMATICAL MONOSPACE CAPITAL Q
+1D681         ; mapped                 ; 0072          # 3.1  MATHEMATICAL MONOSPACE CAPITAL R
+1D682         ; mapped                 ; 0073          # 3.1  MATHEMATICAL MONOSPACE CAPITAL S
+1D683         ; mapped                 ; 0074          # 3.1  MATHEMATICAL MONOSPACE CAPITAL T
+1D684         ; mapped                 ; 0075          # 3.1  MATHEMATICAL MONOSPACE CAPITAL U
+1D685         ; mapped                 ; 0076          # 3.1  MATHEMATICAL MONOSPACE CAPITAL V
+1D686         ; mapped                 ; 0077          # 3.1  MATHEMATICAL MONOSPACE CAPITAL W
+1D687         ; mapped                 ; 0078          # 3.1  MATHEMATICAL MONOSPACE CAPITAL X
+1D688         ; mapped                 ; 0079          # 3.1  MATHEMATICAL MONOSPACE CAPITAL Y
+1D689         ; mapped                 ; 007A          # 3.1  MATHEMATICAL MONOSPACE CAPITAL Z
+1D68A         ; mapped                 ; 0061          # 3.1  MATHEMATICAL MONOSPACE SMALL A
+1D68B         ; mapped                 ; 0062          # 3.1  MATHEMATICAL MONOSPACE SMALL B
+1D68C         ; mapped                 ; 0063          # 3.1  MATHEMATICAL MONOSPACE SMALL C
+1D68D         ; mapped                 ; 0064          # 3.1  MATHEMATICAL MONOSPACE SMALL D
+1D68E         ; mapped                 ; 0065          # 3.1  MATHEMATICAL MONOSPACE SMALL E
+1D68F         ; mapped                 ; 0066          # 3.1  MATHEMATICAL MONOSPACE SMALL F
+1D690         ; mapped                 ; 0067          # 3.1  MATHEMATICAL MONOSPACE SMALL G
+1D691         ; mapped                 ; 0068          # 3.1  MATHEMATICAL MONOSPACE SMALL H
+1D692         ; mapped                 ; 0069          # 3.1  MATHEMATICAL MONOSPACE SMALL I
+1D693         ; mapped                 ; 006A          # 3.1  MATHEMATICAL MONOSPACE SMALL J
+1D694         ; mapped                 ; 006B          # 3.1  MATHEMATICAL MONOSPACE SMALL K
+1D695         ; mapped                 ; 006C          # 3.1  MATHEMATICAL MONOSPACE SMALL L
+1D696         ; mapped                 ; 006D          # 3.1  MATHEMATICAL MONOSPACE SMALL M
+1D697         ; mapped                 ; 006E          # 3.1  MATHEMATICAL MONOSPACE SMALL N
+1D698         ; mapped                 ; 006F          # 3.1  MATHEMATICAL MONOSPACE SMALL O
+1D699         ; mapped                 ; 0070          # 3.1  MATHEMATICAL MONOSPACE SMALL P
+1D69A         ; mapped                 ; 0071          # 3.1  MATHEMATICAL MONOSPACE SMALL Q
+1D69B         ; mapped                 ; 0072          # 3.1  MATHEMATICAL MONOSPACE SMALL R
+1D69C         ; mapped                 ; 0073          # 3.1  MATHEMATICAL MONOSPACE SMALL S
+1D69D         ; mapped                 ; 0074          # 3.1  MATHEMATICAL MONOSPACE SMALL T
+1D69E         ; mapped                 ; 0075          # 3.1  MATHEMATICAL MONOSPACE SMALL U
+1D69F         ; mapped                 ; 0076          # 3.1  MATHEMATICAL MONOSPACE SMALL V
+1D6A0         ; mapped                 ; 0077          # 3.1  MATHEMATICAL MONOSPACE SMALL W
+1D6A1         ; mapped                 ; 0078          # 3.1  MATHEMATICAL MONOSPACE SMALL X
+1D6A2         ; mapped                 ; 0079          # 3.1  MATHEMATICAL MONOSPACE SMALL Y
+1D6A3         ; mapped                 ; 007A          # 3.1  MATHEMATICAL MONOSPACE SMALL Z
+1D6A4         ; mapped                 ; 0131          # 4.1  MATHEMATICAL ITALIC SMALL DOTLESS I
+1D6A5         ; mapped                 ; 0237          # 4.1  MATHEMATICAL ITALIC SMALL DOTLESS J
+1D6A6..1D6A7  ; disallowed                             # NA   <reserved-1D6A6>..<reserved-1D6A7>
+1D6A8         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL BOLD CAPITAL ALPHA
+1D6A9         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL BOLD CAPITAL BETA
+1D6AA         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL BOLD CAPITAL GAMMA
+1D6AB         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL BOLD CAPITAL DELTA
+1D6AC         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD CAPITAL EPSILON
+1D6AD         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL BOLD CAPITAL ZETA
+1D6AE         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL BOLD CAPITAL ETA
+1D6AF         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD CAPITAL THETA
+1D6B0         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL BOLD CAPITAL IOTA
+1D6B1         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD CAPITAL KAPPA
+1D6B2         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL BOLD CAPITAL LAMDA
+1D6B3         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL BOLD CAPITAL MU
+1D6B4         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL BOLD CAPITAL NU
+1D6B5         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL BOLD CAPITAL XI
+1D6B6         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL BOLD CAPITAL OMICRON
+1D6B7         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD CAPITAL PI
+1D6B8         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD CAPITAL RHO
+1D6B9         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD CAPITAL THETA SYMBOL
+1D6BA         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL BOLD CAPITAL SIGMA
+1D6BB         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL BOLD CAPITAL TAU
+1D6BC         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL BOLD CAPITAL UPSILON
+1D6BD         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD CAPITAL PHI
+1D6BE         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL BOLD CAPITAL CHI
+1D6BF         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL BOLD CAPITAL PSI
+1D6C0         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL BOLD CAPITAL OMEGA
+1D6C1         ; mapped                 ; 2207          # 3.1  MATHEMATICAL BOLD NABLA
+1D6C2         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL BOLD SMALL ALPHA
+1D6C3         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL BOLD SMALL BETA
+1D6C4         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL BOLD SMALL GAMMA
+1D6C5         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL BOLD SMALL DELTA
+1D6C6         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD SMALL EPSILON
+1D6C7         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL BOLD SMALL ZETA
+1D6C8         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL BOLD SMALL ETA
+1D6C9         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD SMALL THETA
+1D6CA         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL BOLD SMALL IOTA
+1D6CB         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD SMALL KAPPA
+1D6CC         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL BOLD SMALL LAMDA
+1D6CD         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL BOLD SMALL MU
+1D6CE         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL BOLD SMALL NU
+1D6CF         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL BOLD SMALL XI
+1D6D0         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL BOLD SMALL OMICRON
+1D6D1         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD SMALL PI
+1D6D2         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD SMALL RHO
+1D6D3..1D6D4  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL BOLD SMALL FINAL SIGMA..MATHEMATICAL BOLD SMALL SIGMA
+1D6D5         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL BOLD SMALL TAU
+1D6D6         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL BOLD SMALL UPSILON
+1D6D7         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD SMALL PHI
+1D6D8         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL BOLD SMALL CHI
+1D6D9         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL BOLD SMALL PSI
+1D6DA         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL BOLD SMALL OMEGA
+1D6DB         ; mapped                 ; 2202          # 3.1  MATHEMATICAL BOLD PARTIAL DIFFERENTIAL
+1D6DC         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD EPSILON SYMBOL
+1D6DD         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD THETA SYMBOL
+1D6DE         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD KAPPA SYMBOL
+1D6DF         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD PHI SYMBOL
+1D6E0         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD RHO SYMBOL
+1D6E1         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD PI SYMBOL
+1D6E2         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL ITALIC CAPITAL ALPHA
+1D6E3         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL ITALIC CAPITAL BETA
+1D6E4         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL ITALIC CAPITAL GAMMA
+1D6E5         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL ITALIC CAPITAL DELTA
+1D6E6         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL ITALIC CAPITAL EPSILON
+1D6E7         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL ITALIC CAPITAL ZETA
+1D6E8         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL ITALIC CAPITAL ETA
+1D6E9         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL ITALIC CAPITAL THETA
+1D6EA         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL ITALIC CAPITAL IOTA
+1D6EB         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL ITALIC CAPITAL KAPPA
+1D6EC         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL ITALIC CAPITAL LAMDA
+1D6ED         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL ITALIC CAPITAL MU
+1D6EE         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL ITALIC CAPITAL NU
+1D6EF         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL ITALIC CAPITAL XI
+1D6F0         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL ITALIC CAPITAL OMICRON
+1D6F1         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL ITALIC CAPITAL PI
+1D6F2         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL ITALIC CAPITAL RHO
+1D6F3         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL ITALIC CAPITAL THETA SYMBOL
+1D6F4         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL ITALIC CAPITAL SIGMA
+1D6F5         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL ITALIC CAPITAL TAU
+1D6F6         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL ITALIC CAPITAL UPSILON
+1D6F7         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL ITALIC CAPITAL PHI
+1D6F8         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL ITALIC CAPITAL CHI
+1D6F9         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL ITALIC CAPITAL PSI
+1D6FA         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL ITALIC CAPITAL OMEGA
+1D6FB         ; mapped                 ; 2207          # 3.1  MATHEMATICAL ITALIC NABLA
+1D6FC         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL ITALIC SMALL ALPHA
+1D6FD         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL ITALIC SMALL BETA
+1D6FE         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL ITALIC SMALL GAMMA
+1D6FF         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL ITALIC SMALL DELTA
+1D700         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL ITALIC SMALL EPSILON
+1D701         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL ITALIC SMALL ZETA
+1D702         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL ITALIC SMALL ETA
+1D703         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL ITALIC SMALL THETA
+1D704         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL ITALIC SMALL IOTA
+1D705         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL ITALIC SMALL KAPPA
+1D706         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL ITALIC SMALL LAMDA
+1D707         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL ITALIC SMALL MU
+1D708         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL ITALIC SMALL NU
+1D709         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL ITALIC SMALL XI
+1D70A         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL ITALIC SMALL OMICRON
+1D70B         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL ITALIC SMALL PI
+1D70C         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL ITALIC SMALL RHO
+1D70D..1D70E  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL ITALIC SMALL FINAL SIGMA..MATHEMATICAL ITALIC SMALL SIGMA
+1D70F         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL ITALIC SMALL TAU
+1D710         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL ITALIC SMALL UPSILON
+1D711         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL ITALIC SMALL PHI
+1D712         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL ITALIC SMALL CHI
+1D713         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL ITALIC SMALL PSI
+1D714         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL ITALIC SMALL OMEGA
+1D715         ; mapped                 ; 2202          # 3.1  MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL
+1D716         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL ITALIC EPSILON SYMBOL
+1D717         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL ITALIC THETA SYMBOL
+1D718         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL ITALIC KAPPA SYMBOL
+1D719         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL ITALIC PHI SYMBOL
+1D71A         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL ITALIC RHO SYMBOL
+1D71B         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL ITALIC PI SYMBOL
+1D71C         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL ALPHA
+1D71D         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL BETA
+1D71E         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL GAMMA
+1D71F         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL DELTA
+1D720         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL EPSILON
+1D721         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL ZETA
+1D722         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL ETA
+1D723         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL THETA
+1D724         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL IOTA
+1D725         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL KAPPA
+1D726         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL LAMDA
+1D727         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL MU
+1D728         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL NU
+1D729         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL XI
+1D72A         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL OMICRON
+1D72B         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL PI
+1D72C         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL RHO
+1D72D         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL
+1D72E         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL SIGMA
+1D72F         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL TAU
+1D730         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL UPSILON
+1D731         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL PHI
+1D732         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL CHI
+1D733         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL PSI
+1D734         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL BOLD ITALIC CAPITAL OMEGA
+1D735         ; mapped                 ; 2207          # 3.1  MATHEMATICAL BOLD ITALIC NABLA
+1D736         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL BOLD ITALIC SMALL ALPHA
+1D737         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL BOLD ITALIC SMALL BETA
+1D738         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL BOLD ITALIC SMALL GAMMA
+1D739         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL BOLD ITALIC SMALL DELTA
+1D73A         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD ITALIC SMALL EPSILON
+1D73B         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL BOLD ITALIC SMALL ZETA
+1D73C         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL BOLD ITALIC SMALL ETA
+1D73D         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD ITALIC SMALL THETA
+1D73E         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL BOLD ITALIC SMALL IOTA
+1D73F         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD ITALIC SMALL KAPPA
+1D740         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL BOLD ITALIC SMALL LAMDA
+1D741         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL BOLD ITALIC SMALL MU
+1D742         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL BOLD ITALIC SMALL NU
+1D743         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL BOLD ITALIC SMALL XI
+1D744         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL BOLD ITALIC SMALL OMICRON
+1D745         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD ITALIC SMALL PI
+1D746         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD ITALIC SMALL RHO
+1D747..1D748  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA..MATHEMATICAL BOLD ITALIC SMALL SIGMA
+1D749         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL BOLD ITALIC SMALL TAU
+1D74A         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL BOLD ITALIC SMALL UPSILON
+1D74B         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD ITALIC SMALL PHI
+1D74C         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL BOLD ITALIC SMALL CHI
+1D74D         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL BOLD ITALIC SMALL PSI
+1D74E         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL BOLD ITALIC SMALL OMEGA
+1D74F         ; mapped                 ; 2202          # 3.1  MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL
+1D750         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL BOLD ITALIC EPSILON SYMBOL
+1D751         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL BOLD ITALIC THETA SYMBOL
+1D752         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL BOLD ITALIC KAPPA SYMBOL
+1D753         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL BOLD ITALIC PHI SYMBOL
+1D754         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL BOLD ITALIC RHO SYMBOL
+1D755         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL BOLD ITALIC PI SYMBOL
+1D756         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA
+1D757         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA
+1D758         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA
+1D759         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA
+1D75A         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON
+1D75B         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA
+1D75C         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA
+1D75D         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA
+1D75E         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA
+1D75F         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA
+1D760         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA
+1D761         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL MU
+1D762         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL NU
+1D763         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL XI
+1D764         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON
+1D765         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL PI
+1D766         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO
+1D767         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL
+1D768         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA
+1D769         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU
+1D76A         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON
+1D76B         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI
+1D76C         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI
+1D76D         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI
+1D76E         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA
+1D76F         ; mapped                 ; 2207          # 3.1  MATHEMATICAL SANS-SERIF BOLD NABLA
+1D770         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA
+1D771         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL BETA
+1D772         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA
+1D773         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL DELTA
+1D774         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON
+1D775         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL ZETA
+1D776         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL ETA
+1D777         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL THETA
+1D778         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL IOTA
+1D779         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA
+1D77A         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA
+1D77B         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL MU
+1D77C         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL NU
+1D77D         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL XI
+1D77E         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON
+1D77F         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL PI
+1D780         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL RHO
+1D781..1D782  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA..MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA
+1D783         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL TAU
+1D784         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON
+1D785         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL PHI
+1D786         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL CHI
+1D787         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL PSI
+1D788         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA
+1D789         ; mapped                 ; 2202          # 3.1  MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL
+1D78A         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL
+1D78B         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL
+1D78C         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL
+1D78D         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL
+1D78E         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL
+1D78F         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD PI SYMBOL
+1D790         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA
+1D791         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA
+1D792         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA
+1D793         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA
+1D794         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON
+1D795         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA
+1D796         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA
+1D797         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA
+1D798         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA
+1D799         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA
+1D79A         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA
+1D79B         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU
+1D79C         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU
+1D79D         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI
+1D79E         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON
+1D79F         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI
+1D7A0         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO
+1D7A1         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL
+1D7A2         ; mapped                 ; 03C3          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA
+1D7A3         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU
+1D7A4         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON
+1D7A5         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI
+1D7A6         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI
+1D7A7         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI
+1D7A8         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA
+1D7A9         ; mapped                 ; 2207          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA
+1D7AA         ; mapped                 ; 03B1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA
+1D7AB         ; mapped                 ; 03B2          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA
+1D7AC         ; mapped                 ; 03B3          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA
+1D7AD         ; mapped                 ; 03B4          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA
+1D7AE         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON
+1D7AF         ; mapped                 ; 03B6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA
+1D7B0         ; mapped                 ; 03B7          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA
+1D7B1         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA
+1D7B2         ; mapped                 ; 03B9          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA
+1D7B3         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA
+1D7B4         ; mapped                 ; 03BB          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA
+1D7B5         ; mapped                 ; 03BC          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU
+1D7B6         ; mapped                 ; 03BD          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU
+1D7B7         ; mapped                 ; 03BE          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI
+1D7B8         ; mapped                 ; 03BF          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON
+1D7B9         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI
+1D7BA         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO
+1D7BB..1D7BC  ; mapped                 ; 03C3          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA
+1D7BD         ; mapped                 ; 03C4          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU
+1D7BE         ; mapped                 ; 03C5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON
+1D7BF         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI
+1D7C0         ; mapped                 ; 03C7          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI
+1D7C1         ; mapped                 ; 03C8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI
+1D7C2         ; mapped                 ; 03C9          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA
+1D7C3         ; mapped                 ; 2202          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL
+1D7C4         ; mapped                 ; 03B5          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL
+1D7C5         ; mapped                 ; 03B8          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL
+1D7C6         ; mapped                 ; 03BA          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL
+1D7C7         ; mapped                 ; 03C6          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL
+1D7C8         ; mapped                 ; 03C1          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL
+1D7C9         ; mapped                 ; 03C0          # 3.1  MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL
+1D7CA..1D7CB  ; mapped                 ; 03DD          # 5.0  MATHEMATICAL BOLD CAPITAL DIGAMMA..MATHEMATICAL BOLD SMALL DIGAMMA
+1D7CC..1D7CD  ; disallowed                             # NA   <reserved-1D7CC>..<reserved-1D7CD>
+1D7CE         ; mapped                 ; 0030          # 3.1  MATHEMATICAL BOLD DIGIT ZERO
+1D7CF         ; mapped                 ; 0031          # 3.1  MATHEMATICAL BOLD DIGIT ONE
+1D7D0         ; mapped                 ; 0032          # 3.1  MATHEMATICAL BOLD DIGIT TWO
+1D7D1         ; mapped                 ; 0033          # 3.1  MATHEMATICAL BOLD DIGIT THREE
+1D7D2         ; mapped                 ; 0034          # 3.1  MATHEMATICAL BOLD DIGIT FOUR
+1D7D3         ; mapped                 ; 0035          # 3.1  MATHEMATICAL BOLD DIGIT FIVE
+1D7D4         ; mapped                 ; 0036          # 3.1  MATHEMATICAL BOLD DIGIT SIX
+1D7D5         ; mapped                 ; 0037          # 3.1  MATHEMATICAL BOLD DIGIT SEVEN
+1D7D6         ; mapped                 ; 0038          # 3.1  MATHEMATICAL BOLD DIGIT EIGHT
+1D7D7         ; mapped                 ; 0039          # 3.1  MATHEMATICAL BOLD DIGIT NINE
+1D7D8         ; mapped                 ; 0030          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO
+1D7D9         ; mapped                 ; 0031          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT ONE
+1D7DA         ; mapped                 ; 0032          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT TWO
+1D7DB         ; mapped                 ; 0033          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT THREE
+1D7DC         ; mapped                 ; 0034          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR
+1D7DD         ; mapped                 ; 0035          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE
+1D7DE         ; mapped                 ; 0036          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT SIX
+1D7DF         ; mapped                 ; 0037          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN
+1D7E0         ; mapped                 ; 0038          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT
+1D7E1         ; mapped                 ; 0039          # 3.1  MATHEMATICAL DOUBLE-STRUCK DIGIT NINE
+1D7E2         ; mapped                 ; 0030          # 3.1  MATHEMATICAL SANS-SERIF DIGIT ZERO
+1D7E3         ; mapped                 ; 0031          # 3.1  MATHEMATICAL SANS-SERIF DIGIT ONE
+1D7E4         ; mapped                 ; 0032          # 3.1  MATHEMATICAL SANS-SERIF DIGIT TWO
+1D7E5         ; mapped                 ; 0033          # 3.1  MATHEMATICAL SANS-SERIF DIGIT THREE
+1D7E6         ; mapped                 ; 0034          # 3.1  MATHEMATICAL SANS-SERIF DIGIT FOUR
+1D7E7         ; mapped                 ; 0035          # 3.1  MATHEMATICAL SANS-SERIF DIGIT FIVE
+1D7E8         ; mapped                 ; 0036          # 3.1  MATHEMATICAL SANS-SERIF DIGIT SIX
+1D7E9         ; mapped                 ; 0037          # 3.1  MATHEMATICAL SANS-SERIF DIGIT SEVEN
+1D7EA         ; mapped                 ; 0038          # 3.1  MATHEMATICAL SANS-SERIF DIGIT EIGHT
+1D7EB         ; mapped                 ; 0039          # 3.1  MATHEMATICAL SANS-SERIF DIGIT NINE
+1D7EC         ; mapped                 ; 0030          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO
+1D7ED         ; mapped                 ; 0031          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT ONE
+1D7EE         ; mapped                 ; 0032          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT TWO
+1D7EF         ; mapped                 ; 0033          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT THREE
+1D7F0         ; mapped                 ; 0034          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR
+1D7F1         ; mapped                 ; 0035          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE
+1D7F2         ; mapped                 ; 0036          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT SIX
+1D7F3         ; mapped                 ; 0037          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN
+1D7F4         ; mapped                 ; 0038          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT
+1D7F5         ; mapped                 ; 0039          # 3.1  MATHEMATICAL SANS-SERIF BOLD DIGIT NINE
+1D7F6         ; mapped                 ; 0030          # 3.1  MATHEMATICAL MONOSPACE DIGIT ZERO
+1D7F7         ; mapped                 ; 0031          # 3.1  MATHEMATICAL MONOSPACE DIGIT ONE
+1D7F8         ; mapped                 ; 0032          # 3.1  MATHEMATICAL MONOSPACE DIGIT TWO
+1D7F9         ; mapped                 ; 0033          # 3.1  MATHEMATICAL MONOSPACE DIGIT THREE
+1D7FA         ; mapped                 ; 0034          # 3.1  MATHEMATICAL MONOSPACE DIGIT FOUR
+1D7FB         ; mapped                 ; 0035          # 3.1  MATHEMATICAL MONOSPACE DIGIT FIVE
+1D7FC         ; mapped                 ; 0036          # 3.1  MATHEMATICAL MONOSPACE DIGIT SIX
+1D7FD         ; mapped                 ; 0037          # 3.1  MATHEMATICAL MONOSPACE DIGIT SEVEN
+1D7FE         ; mapped                 ; 0038          # 3.1  MATHEMATICAL MONOSPACE DIGIT EIGHT
+1D7FF         ; mapped                 ; 0039          # 3.1  MATHEMATICAL MONOSPACE DIGIT NINE
+1D800..1D9FF  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING HAND-FIST INDEX..SIGNWRITING HEAD
+1DA00..1DA36  ; valid                                  # 8.0  SIGNWRITING HEAD RIM..SIGNWRITING AIR SUCKING IN
+1DA37..1DA3A  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING AIR BLOW SMALL ROTATIONS..SIGNWRITING BREATH EXHALE
+1DA3B..1DA6C  ; valid                                  # 8.0  SIGNWRITING MOUTH CLOSED NEUTRAL..SIGNWRITING EXCITEMENT
+1DA6D..1DA74  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING SHOULDER HIP SPINE..SIGNWRITING TORSO-FLOORPLANE TWISTING
+1DA75         ; valid                                  # 8.0  SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS
+1DA76..1DA83  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING LIMB COMBINATION..SIGNWRITING LOCATION DEPTH
+1DA84         ; valid                                  # 8.0  SIGNWRITING LOCATION HEAD NECK
+1DA85..1DA8B  ; valid                  ;      ; NV8    # 8.0  SIGNWRITING LOCATION TORSO..SIGNWRITING PARENTHESIS
+1DA8C..1DA9A  ; disallowed                             # NA   <reserved-1DA8C>..<reserved-1DA9A>
+1DA9B..1DA9F  ; valid                                  # 8.0  SIGNWRITING FILL MODIFIER-2..SIGNWRITING FILL MODIFIER-6
+1DAA0         ; disallowed                             # NA   <reserved-1DAA0>
+1DAA1..1DAAF  ; valid                                  # 8.0  SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16
+1DAB0..1DFFF  ; disallowed                             # NA   <reserved-1DAB0>..<reserved-1DFFF>
+1E000..1E006  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE
+1E007         ; disallowed                             # NA   <reserved-1E007>
+1E008..1E018  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU
+1E019..1E01A  ; disallowed                             # NA   <reserved-1E019>..<reserved-1E01A>
+1E01B..1E021  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI
+1E022         ; disallowed                             # NA   <reserved-1E022>
+1E023..1E024  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS
+1E025         ; disallowed                             # NA   <reserved-1E025>
+1E026..1E02A  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA
+1E02B..1E0FF  ; disallowed                             # NA   <reserved-1E02B>..<reserved-1E0FF>
+1E100..1E12C  ; valid                                  # 12.0 NYIAKENG PUACHUE HMONG LETTER MA..NYIAKENG PUACHUE HMONG LETTER W
+1E12D..1E12F  ; disallowed                             # NA   <reserved-1E12D>..<reserved-1E12F>
+1E130..1E13D  ; valid                                  # 12.0 NYIAKENG PUACHUE HMONG TONE-B..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER
+1E13E..1E13F  ; disallowed                             # NA   <reserved-1E13E>..<reserved-1E13F>
+1E140..1E149  ; valid                                  # 12.0 NYIAKENG PUACHUE HMONG DIGIT ZERO..NYIAKENG PUACHUE HMONG DIGIT NINE
+1E14A..1E14D  ; disallowed                             # NA   <reserved-1E14A>..<reserved-1E14D>
+1E14E         ; valid                                  # 12.0 NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ
+1E14F         ; valid                  ;      ; NV8    # 12.0 NYIAKENG PUACHUE HMONG CIRCLED CA
+1E150..1E2BF  ; disallowed                             # NA   <reserved-1E150>..<reserved-1E2BF>
+1E2C0..1E2F9  ; valid                                  # 12.0 WANCHO LETTER AA..WANCHO DIGIT NINE
+1E2FA..1E2FE  ; disallowed                             # NA   <reserved-1E2FA>..<reserved-1E2FE>
+1E2FF         ; valid                  ;      ; NV8    # 12.0 WANCHO NGUN SIGN
+1E300..1E7FF  ; disallowed                             # NA   <reserved-1E300>..<reserved-1E7FF>
+1E800..1E8C4  ; valid                                  # 7.0  MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON
+1E8C5..1E8C6  ; disallowed                             # NA   <reserved-1E8C5>..<reserved-1E8C6>
+1E8C7..1E8CF  ; valid                  ;      ; NV8    # 7.0  MENDE KIKAKUI DIGIT ONE..MENDE KIKAKUI DIGIT NINE
+1E8D0..1E8D6  ; valid                                  # 7.0  MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
+1E8D7..1E8FF  ; disallowed                             # NA   <reserved-1E8D7>..<reserved-1E8FF>
+1E900         ; mapped                 ; 1E922         # 9.0  ADLAM CAPITAL LETTER ALIF
+1E901         ; mapped                 ; 1E923         # 9.0  ADLAM CAPITAL LETTER DAALI
+1E902         ; mapped                 ; 1E924         # 9.0  ADLAM CAPITAL LETTER LAAM
+1E903         ; mapped                 ; 1E925         # 9.0  ADLAM CAPITAL LETTER MIIM
+1E904         ; mapped                 ; 1E926         # 9.0  ADLAM CAPITAL LETTER BA
+1E905         ; mapped                 ; 1E927         # 9.0  ADLAM CAPITAL LETTER SINNYIIYHE
+1E906         ; mapped                 ; 1E928         # 9.0  ADLAM CAPITAL LETTER PE
+1E907         ; mapped                 ; 1E929         # 9.0  ADLAM CAPITAL LETTER BHE
+1E908         ; mapped                 ; 1E92A         # 9.0  ADLAM CAPITAL LETTER RA
+1E909         ; mapped                 ; 1E92B         # 9.0  ADLAM CAPITAL LETTER E
+1E90A         ; mapped                 ; 1E92C         # 9.0  ADLAM CAPITAL LETTER FA
+1E90B         ; mapped                 ; 1E92D         # 9.0  ADLAM CAPITAL LETTER I
+1E90C         ; mapped                 ; 1E92E         # 9.0  ADLAM CAPITAL LETTER O
+1E90D         ; mapped                 ; 1E92F         # 9.0  ADLAM CAPITAL LETTER DHA
+1E90E         ; mapped                 ; 1E930         # 9.0  ADLAM CAPITAL LETTER YHE
+1E90F         ; mapped                 ; 1E931         # 9.0  ADLAM CAPITAL LETTER WAW
+1E910         ; mapped                 ; 1E932         # 9.0  ADLAM CAPITAL LETTER NUN
+1E911         ; mapped                 ; 1E933         # 9.0  ADLAM CAPITAL LETTER KAF
+1E912         ; mapped                 ; 1E934         # 9.0  ADLAM CAPITAL LETTER YA
+1E913         ; mapped                 ; 1E935         # 9.0  ADLAM CAPITAL LETTER U
+1E914         ; mapped                 ; 1E936         # 9.0  ADLAM CAPITAL LETTER JIIM
+1E915         ; mapped                 ; 1E937         # 9.0  ADLAM CAPITAL LETTER CHI
+1E916         ; mapped                 ; 1E938         # 9.0  ADLAM CAPITAL LETTER HA
+1E917         ; mapped                 ; 1E939         # 9.0  ADLAM CAPITAL LETTER QAAF
+1E918         ; mapped                 ; 1E93A         # 9.0  ADLAM CAPITAL LETTER GA
+1E919         ; mapped                 ; 1E93B         # 9.0  ADLAM CAPITAL LETTER NYA
+1E91A         ; mapped                 ; 1E93C         # 9.0  ADLAM CAPITAL LETTER TU
+1E91B         ; mapped                 ; 1E93D         # 9.0  ADLAM CAPITAL LETTER NHA
+1E91C         ; mapped                 ; 1E93E         # 9.0  ADLAM CAPITAL LETTER VA
+1E91D         ; mapped                 ; 1E93F         # 9.0  ADLAM CAPITAL LETTER KHA
+1E91E         ; mapped                 ; 1E940         # 9.0  ADLAM CAPITAL LETTER GBE
+1E91F         ; mapped                 ; 1E941         # 9.0  ADLAM CAPITAL LETTER ZAL
+1E920         ; mapped                 ; 1E942         # 9.0  ADLAM CAPITAL LETTER KPO
+1E921         ; mapped                 ; 1E943         # 9.0  ADLAM CAPITAL LETTER SHA
+1E922..1E94A  ; valid                                  # 9.0  ADLAM SMALL LETTER ALIF..ADLAM NUKTA
+1E94B         ; valid                                  # 12.0 ADLAM NASALIZATION MARK
+1E94C..1E94F  ; disallowed                             # NA   <reserved-1E94C>..<reserved-1E94F>
+1E950..1E959  ; valid                                  # 9.0  ADLAM DIGIT ZERO..ADLAM DIGIT NINE
+1E95A..1E95D  ; disallowed                             # NA   <reserved-1E95A>..<reserved-1E95D>
+1E95E..1E95F  ; valid                  ;      ; NV8    # 9.0  ADLAM INITIAL EXCLAMATION MARK..ADLAM INITIAL QUESTION MARK
+1E960..1EC70  ; disallowed                             # NA   <reserved-1E960>..<reserved-1EC70>
+1EC71..1ECB4  ; valid                  ;      ; NV8    # 11.0 INDIC SIYAQ NUMBER ONE..INDIC SIYAQ ALTERNATE LAKH MARK
+1ECB5..1ED00  ; disallowed                             # NA   <reserved-1ECB5>..<reserved-1ED00>
+1ED01..1ED3D  ; valid                  ;      ; NV8    # 12.0 OTTOMAN SIYAQ NUMBER ONE..OTTOMAN SIYAQ FRACTION ONE SIXTH
+1ED3E..1EDFF  ; disallowed                             # NA   <reserved-1ED3E>..<reserved-1EDFF>
+1EE00         ; mapped                 ; 0627          # 6.1  ARABIC MATHEMATICAL ALEF
+1EE01         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL BEH
+1EE02         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL JEEM
+1EE03         ; mapped                 ; 062F          # 6.1  ARABIC MATHEMATICAL DAL
+1EE04         ; disallowed                             # NA   <reserved-1EE04>
+1EE05         ; mapped                 ; 0648          # 6.1  ARABIC MATHEMATICAL WAW
+1EE06         ; mapped                 ; 0632          # 6.1  ARABIC MATHEMATICAL ZAIN
+1EE07         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL HAH
+1EE08         ; mapped                 ; 0637          # 6.1  ARABIC MATHEMATICAL TAH
+1EE09         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL YEH
+1EE0A         ; mapped                 ; 0643          # 6.1  ARABIC MATHEMATICAL KAF
+1EE0B         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL LAM
+1EE0C         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL MEEM
+1EE0D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL NOON
+1EE0E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL SEEN
+1EE0F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL AIN
+1EE10         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL FEH
+1EE11         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL SAD
+1EE12         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL QAF
+1EE13         ; mapped                 ; 0631          # 6.1  ARABIC MATHEMATICAL REH
+1EE14         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL SHEEN
+1EE15         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL TEH
+1EE16         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL THEH
+1EE17         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL KHAH
+1EE18         ; mapped                 ; 0630          # 6.1  ARABIC MATHEMATICAL THAL
+1EE19         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL DAD
+1EE1A         ; mapped                 ; 0638          # 6.1  ARABIC MATHEMATICAL ZAH
+1EE1B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL GHAIN
+1EE1C         ; mapped                 ; 066E          # 6.1  ARABIC MATHEMATICAL DOTLESS BEH
+1EE1D         ; mapped                 ; 06BA          # 6.1  ARABIC MATHEMATICAL DOTLESS NOON
+1EE1E         ; mapped                 ; 06A1          # 6.1  ARABIC MATHEMATICAL DOTLESS FEH
+1EE1F         ; mapped                 ; 066F          # 6.1  ARABIC MATHEMATICAL DOTLESS QAF
+1EE20         ; disallowed                             # NA   <reserved-1EE20>
+1EE21         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL INITIAL BEH
+1EE22         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL INITIAL JEEM
+1EE23         ; disallowed                             # NA   <reserved-1EE23>
+1EE24         ; mapped                 ; 0647          # 6.1  ARABIC MATHEMATICAL INITIAL HEH
+1EE25..1EE26  ; disallowed                             # NA   <reserved-1EE25>..<reserved-1EE26>
+1EE27         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL INITIAL HAH
+1EE28         ; disallowed                             # NA   <reserved-1EE28>
+1EE29         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL INITIAL YEH
+1EE2A         ; mapped                 ; 0643          # 6.1  ARABIC MATHEMATICAL INITIAL KAF
+1EE2B         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL INITIAL LAM
+1EE2C         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL INITIAL MEEM
+1EE2D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL INITIAL NOON
+1EE2E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL INITIAL SEEN
+1EE2F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL INITIAL AIN
+1EE30         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL INITIAL FEH
+1EE31         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL INITIAL SAD
+1EE32         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL INITIAL QAF
+1EE33         ; disallowed                             # NA   <reserved-1EE33>
+1EE34         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL INITIAL SHEEN
+1EE35         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL INITIAL TEH
+1EE36         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL INITIAL THEH
+1EE37         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL INITIAL KHAH
+1EE38         ; disallowed                             # NA   <reserved-1EE38>
+1EE39         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL INITIAL DAD
+1EE3A         ; disallowed                             # NA   <reserved-1EE3A>
+1EE3B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL INITIAL GHAIN
+1EE3C..1EE41  ; disallowed                             # NA   <reserved-1EE3C>..<reserved-1EE41>
+1EE42         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL TAILED JEEM
+1EE43..1EE46  ; disallowed                             # NA   <reserved-1EE43>..<reserved-1EE46>
+1EE47         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL TAILED HAH
+1EE48         ; disallowed                             # NA   <reserved-1EE48>
+1EE49         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL TAILED YEH
+1EE4A         ; disallowed                             # NA   <reserved-1EE4A>
+1EE4B         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL TAILED LAM
+1EE4C         ; disallowed                             # NA   <reserved-1EE4C>
+1EE4D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL TAILED NOON
+1EE4E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL TAILED SEEN
+1EE4F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL TAILED AIN
+1EE50         ; disallowed                             # NA   <reserved-1EE50>
+1EE51         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL TAILED SAD
+1EE52         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL TAILED QAF
+1EE53         ; disallowed                             # NA   <reserved-1EE53>
+1EE54         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL TAILED SHEEN
+1EE55..1EE56  ; disallowed                             # NA   <reserved-1EE55>..<reserved-1EE56>
+1EE57         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL TAILED KHAH
+1EE58         ; disallowed                             # NA   <reserved-1EE58>
+1EE59         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL TAILED DAD
+1EE5A         ; disallowed                             # NA   <reserved-1EE5A>
+1EE5B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL TAILED GHAIN
+1EE5C         ; disallowed                             # NA   <reserved-1EE5C>
+1EE5D         ; mapped                 ; 06BA          # 6.1  ARABIC MATHEMATICAL TAILED DOTLESS NOON
+1EE5E         ; disallowed                             # NA   <reserved-1EE5E>
+1EE5F         ; mapped                 ; 066F          # 6.1  ARABIC MATHEMATICAL TAILED DOTLESS QAF
+1EE60         ; disallowed                             # NA   <reserved-1EE60>
+1EE61         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL STRETCHED BEH
+1EE62         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL STRETCHED JEEM
+1EE63         ; disallowed                             # NA   <reserved-1EE63>
+1EE64         ; mapped                 ; 0647          # 6.1  ARABIC MATHEMATICAL STRETCHED HEH
+1EE65..1EE66  ; disallowed                             # NA   <reserved-1EE65>..<reserved-1EE66>
+1EE67         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL STRETCHED HAH
+1EE68         ; mapped                 ; 0637          # 6.1  ARABIC MATHEMATICAL STRETCHED TAH
+1EE69         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL STRETCHED YEH
+1EE6A         ; mapped                 ; 0643          # 6.1  ARABIC MATHEMATICAL STRETCHED KAF
+1EE6B         ; disallowed                             # NA   <reserved-1EE6B>
+1EE6C         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL STRETCHED MEEM
+1EE6D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL STRETCHED NOON
+1EE6E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL STRETCHED SEEN
+1EE6F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL STRETCHED AIN
+1EE70         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL STRETCHED FEH
+1EE71         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL STRETCHED SAD
+1EE72         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL STRETCHED QAF
+1EE73         ; disallowed                             # NA   <reserved-1EE73>
+1EE74         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL STRETCHED SHEEN
+1EE75         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL STRETCHED TEH
+1EE76         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL STRETCHED THEH
+1EE77         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL STRETCHED KHAH
+1EE78         ; disallowed                             # NA   <reserved-1EE78>
+1EE79         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL STRETCHED DAD
+1EE7A         ; mapped                 ; 0638          # 6.1  ARABIC MATHEMATICAL STRETCHED ZAH
+1EE7B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL STRETCHED GHAIN
+1EE7C         ; mapped                 ; 066E          # 6.1  ARABIC MATHEMATICAL STRETCHED DOTLESS BEH
+1EE7D         ; disallowed                             # NA   <reserved-1EE7D>
+1EE7E         ; mapped                 ; 06A1          # 6.1  ARABIC MATHEMATICAL STRETCHED DOTLESS FEH
+1EE7F         ; disallowed                             # NA   <reserved-1EE7F>
+1EE80         ; mapped                 ; 0627          # 6.1  ARABIC MATHEMATICAL LOOPED ALEF
+1EE81         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL LOOPED BEH
+1EE82         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL LOOPED JEEM
+1EE83         ; mapped                 ; 062F          # 6.1  ARABIC MATHEMATICAL LOOPED DAL
+1EE84         ; mapped                 ; 0647          # 6.1  ARABIC MATHEMATICAL LOOPED HEH
+1EE85         ; mapped                 ; 0648          # 6.1  ARABIC MATHEMATICAL LOOPED WAW
+1EE86         ; mapped                 ; 0632          # 6.1  ARABIC MATHEMATICAL LOOPED ZAIN
+1EE87         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL LOOPED HAH
+1EE88         ; mapped                 ; 0637          # 6.1  ARABIC MATHEMATICAL LOOPED TAH
+1EE89         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL LOOPED YEH
+1EE8A         ; disallowed                             # NA   <reserved-1EE8A>
+1EE8B         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL LOOPED LAM
+1EE8C         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL LOOPED MEEM
+1EE8D         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL LOOPED NOON
+1EE8E         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL LOOPED SEEN
+1EE8F         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL LOOPED AIN
+1EE90         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL LOOPED FEH
+1EE91         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL LOOPED SAD
+1EE92         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL LOOPED QAF
+1EE93         ; mapped                 ; 0631          # 6.1  ARABIC MATHEMATICAL LOOPED REH
+1EE94         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL LOOPED SHEEN
+1EE95         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL LOOPED TEH
+1EE96         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL LOOPED THEH
+1EE97         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL LOOPED KHAH
+1EE98         ; mapped                 ; 0630          # 6.1  ARABIC MATHEMATICAL LOOPED THAL
+1EE99         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL LOOPED DAD
+1EE9A         ; mapped                 ; 0638          # 6.1  ARABIC MATHEMATICAL LOOPED ZAH
+1EE9B         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL LOOPED GHAIN
+1EE9C..1EEA0  ; disallowed                             # NA   <reserved-1EE9C>..<reserved-1EEA0>
+1EEA1         ; mapped                 ; 0628          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK BEH
+1EEA2         ; mapped                 ; 062C          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK JEEM
+1EEA3         ; mapped                 ; 062F          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK DAL
+1EEA4         ; disallowed                             # NA   <reserved-1EEA4>
+1EEA5         ; mapped                 ; 0648          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK WAW
+1EEA6         ; mapped                 ; 0632          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK ZAIN
+1EEA7         ; mapped                 ; 062D          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK HAH
+1EEA8         ; mapped                 ; 0637          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK TAH
+1EEA9         ; mapped                 ; 064A          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK YEH
+1EEAA         ; disallowed                             # NA   <reserved-1EEAA>
+1EEAB         ; mapped                 ; 0644          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK LAM
+1EEAC         ; mapped                 ; 0645          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK MEEM
+1EEAD         ; mapped                 ; 0646          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK NOON
+1EEAE         ; mapped                 ; 0633          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK SEEN
+1EEAF         ; mapped                 ; 0639          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK AIN
+1EEB0         ; mapped                 ; 0641          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK FEH
+1EEB1         ; mapped                 ; 0635          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK SAD
+1EEB2         ; mapped                 ; 0642          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK QAF
+1EEB3         ; mapped                 ; 0631          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK REH
+1EEB4         ; mapped                 ; 0634          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK SHEEN
+1EEB5         ; mapped                 ; 062A          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK TEH
+1EEB6         ; mapped                 ; 062B          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK THEH
+1EEB7         ; mapped                 ; 062E          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK KHAH
+1EEB8         ; mapped                 ; 0630          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK THAL
+1EEB9         ; mapped                 ; 0636          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK DAD
+1EEBA         ; mapped                 ; 0638          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK ZAH
+1EEBB         ; mapped                 ; 063A          # 6.1  ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
+1EEBC..1EEEF  ; disallowed                             # NA   <reserved-1EEBC>..<reserved-1EEEF>
+1EEF0..1EEF1  ; valid                  ;      ; NV8    # 6.1  ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
+1EEF2..1EFFF  ; disallowed                             # NA   <reserved-1EEF2>..<reserved-1EFFF>
+1F000..1F02B  ; valid                  ;      ; NV8    # 5.1  MAHJONG TILE EAST WIND..MAHJONG TILE BACK
+1F02C..1F02F  ; disallowed                             # NA   <reserved-1F02C>..<reserved-1F02F>
+1F030..1F093  ; valid                  ;      ; NV8    # 5.1  DOMINO TILE HORIZONTAL BACK..DOMINO TILE VERTICAL-06-06
+1F094..1F09F  ; disallowed                             # NA   <reserved-1F094>..<reserved-1F09F>
+1F0A0..1F0AE  ; valid                  ;      ; NV8    # 6.0  PLAYING CARD BACK..PLAYING CARD KING OF SPADES
+1F0AF..1F0B0  ; disallowed                             # NA   <reserved-1F0AF>..<reserved-1F0B0>
+1F0B1..1F0BE  ; valid                  ;      ; NV8    # 6.0  PLAYING CARD ACE OF HEARTS..PLAYING CARD KING OF HEARTS
+1F0BF         ; valid                  ;      ; NV8    # 7.0  PLAYING CARD RED JOKER
+1F0C0         ; disallowed                             # NA   <reserved-1F0C0>
+1F0C1..1F0CF  ; valid                  ;      ; NV8    # 6.0  PLAYING CARD ACE OF DIAMONDS..PLAYING CARD BLACK JOKER
+1F0D0         ; disallowed                             # NA   <reserved-1F0D0>
+1F0D1..1F0DF  ; valid                  ;      ; NV8    # 6.0  PLAYING CARD ACE OF CLUBS..PLAYING CARD WHITE JOKER
+1F0E0..1F0F5  ; valid                  ;      ; NV8    # 7.0  PLAYING CARD FOOL..PLAYING CARD TRUMP-21
+1F0F6..1F0FF  ; disallowed                             # NA   <reserved-1F0F6>..<reserved-1F0FF>
+1F100         ; disallowed                             # 5.2  DIGIT ZERO FULL STOP
+1F101         ; disallowed_STD3_mapped ; 0030 002C     # 5.2  DIGIT ZERO COMMA
+1F102         ; disallowed_STD3_mapped ; 0031 002C     # 5.2  DIGIT ONE COMMA
+1F103         ; disallowed_STD3_mapped ; 0032 002C     # 5.2  DIGIT TWO COMMA
+1F104         ; disallowed_STD3_mapped ; 0033 002C     # 5.2  DIGIT THREE COMMA
+1F105         ; disallowed_STD3_mapped ; 0034 002C     # 5.2  DIGIT FOUR COMMA
+1F106         ; disallowed_STD3_mapped ; 0035 002C     # 5.2  DIGIT FIVE COMMA
+1F107         ; disallowed_STD3_mapped ; 0036 002C     # 5.2  DIGIT SIX COMMA
+1F108         ; disallowed_STD3_mapped ; 0037 002C     # 5.2  DIGIT SEVEN COMMA
+1F109         ; disallowed_STD3_mapped ; 0038 002C     # 5.2  DIGIT EIGHT COMMA
+1F10A         ; disallowed_STD3_mapped ; 0039 002C     # 5.2  DIGIT NINE COMMA
+1F10B..1F10C  ; valid                  ;      ; NV8    # 7.0  DINGBAT CIRCLED SANS-SERIF DIGIT ZERO..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO
+1F10D..1F10F  ; valid                  ;      ; NV8    # 13.0 CIRCLED ZERO WITH SLASH..CIRCLED DOLLAR SIGN WITH OVERLAID BACKSLASH
+1F110         ; disallowed_STD3_mapped ; 0028 0061 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER A
+1F111         ; disallowed_STD3_mapped ; 0028 0062 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER B
+1F112         ; disallowed_STD3_mapped ; 0028 0063 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER C
+1F113         ; disallowed_STD3_mapped ; 0028 0064 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER D
+1F114         ; disallowed_STD3_mapped ; 0028 0065 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER E
+1F115         ; disallowed_STD3_mapped ; 0028 0066 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER F
+1F116         ; disallowed_STD3_mapped ; 0028 0067 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER G
+1F117         ; disallowed_STD3_mapped ; 0028 0068 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER H
+1F118         ; disallowed_STD3_mapped ; 0028 0069 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER I
+1F119         ; disallowed_STD3_mapped ; 0028 006A 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER J
+1F11A         ; disallowed_STD3_mapped ; 0028 006B 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER K
+1F11B         ; disallowed_STD3_mapped ; 0028 006C 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER L
+1F11C         ; disallowed_STD3_mapped ; 0028 006D 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER M
+1F11D         ; disallowed_STD3_mapped ; 0028 006E 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER N
+1F11E         ; disallowed_STD3_mapped ; 0028 006F 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER O
+1F11F         ; disallowed_STD3_mapped ; 0028 0070 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER P
+1F120         ; disallowed_STD3_mapped ; 0028 0071 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER Q
+1F121         ; disallowed_STD3_mapped ; 0028 0072 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER R
+1F122         ; disallowed_STD3_mapped ; 0028 0073 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER S
+1F123         ; disallowed_STD3_mapped ; 0028 0074 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER T
+1F124         ; disallowed_STD3_mapped ; 0028 0075 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER U
+1F125         ; disallowed_STD3_mapped ; 0028 0076 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER V
+1F126         ; disallowed_STD3_mapped ; 0028 0077 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER W
+1F127         ; disallowed_STD3_mapped ; 0028 0078 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER X
+1F128         ; disallowed_STD3_mapped ; 0028 0079 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER Y
+1F129         ; disallowed_STD3_mapped ; 0028 007A 0029 #5.2  PARENTHESIZED LATIN CAPITAL LETTER Z
+1F12A         ; mapped                 ; 3014 0073 3015 #5.2  TORTOISE SHELL BRACKETED LATIN CAPITAL LETTER S
+1F12B         ; mapped                 ; 0063          # 5.2  CIRCLED ITALIC LATIN CAPITAL LETTER C
+1F12C         ; mapped                 ; 0072          # 5.2  CIRCLED ITALIC LATIN CAPITAL LETTER R
+1F12D         ; mapped                 ; 0063 0064     # 5.2  CIRCLED CD
+1F12E         ; mapped                 ; 0077 007A     # 5.2  CIRCLED WZ
+1F12F         ; valid                  ;      ; NV8    # 11.0 COPYLEFT SYMBOL
+1F130         ; mapped                 ; 0061          # 6.0  SQUARED LATIN CAPITAL LETTER A
+1F131         ; mapped                 ; 0062          # 5.2  SQUARED LATIN CAPITAL LETTER B
+1F132         ; mapped                 ; 0063          # 6.0  SQUARED LATIN CAPITAL LETTER C
+1F133         ; mapped                 ; 0064          # 6.0  SQUARED LATIN CAPITAL LETTER D
+1F134         ; mapped                 ; 0065          # 6.0  SQUARED LATIN CAPITAL LETTER E
+1F135         ; mapped                 ; 0066          # 6.0  SQUARED LATIN CAPITAL LETTER F
+1F136         ; mapped                 ; 0067          # 6.0  SQUARED LATIN CAPITAL LETTER G
+1F137         ; mapped                 ; 0068          # 6.0  SQUARED LATIN CAPITAL LETTER H
+1F138         ; mapped                 ; 0069          # 6.0  SQUARED LATIN CAPITAL LETTER I
+1F139         ; mapped                 ; 006A          # 6.0  SQUARED LATIN CAPITAL LETTER J
+1F13A         ; mapped                 ; 006B          # 6.0  SQUARED LATIN CAPITAL LETTER K
+1F13B         ; mapped                 ; 006C          # 6.0  SQUARED LATIN CAPITAL LETTER L
+1F13C         ; mapped                 ; 006D          # 6.0  SQUARED LATIN CAPITAL LETTER M
+1F13D         ; mapped                 ; 006E          # 5.2  SQUARED LATIN CAPITAL LETTER N
+1F13E         ; mapped                 ; 006F          # 6.0  SQUARED LATIN CAPITAL LETTER O
+1F13F         ; mapped                 ; 0070          # 5.2  SQUARED LATIN CAPITAL LETTER P
+1F140         ; mapped                 ; 0071          # 6.0  SQUARED LATIN CAPITAL LETTER Q
+1F141         ; mapped                 ; 0072          # 6.0  SQUARED LATIN CAPITAL LETTER R
+1F142         ; mapped                 ; 0073          # 5.2  SQUARED LATIN CAPITAL LETTER S
+1F143         ; mapped                 ; 0074          # 6.0  SQUARED LATIN CAPITAL LETTER T
+1F144         ; mapped                 ; 0075          # 6.0  SQUARED LATIN CAPITAL LETTER U
+1F145         ; mapped                 ; 0076          # 6.0  SQUARED LATIN CAPITAL LETTER V
+1F146         ; mapped                 ; 0077          # 5.2  SQUARED LATIN CAPITAL LETTER W
+1F147         ; mapped                 ; 0078          # 6.0  SQUARED LATIN CAPITAL LETTER X
+1F148         ; mapped                 ; 0079          # 6.0  SQUARED LATIN CAPITAL LETTER Y
+1F149         ; mapped                 ; 007A          # 6.0  SQUARED LATIN CAPITAL LETTER Z
+1F14A         ; mapped                 ; 0068 0076     # 5.2  SQUARED HV
+1F14B         ; mapped                 ; 006D 0076     # 5.2  SQUARED MV
+1F14C         ; mapped                 ; 0073 0064     # 5.2  SQUARED SD
+1F14D         ; mapped                 ; 0073 0073     # 5.2  SQUARED SS
+1F14E         ; mapped                 ; 0070 0070 0076 #5.2  SQUARED PPV
+1F14F         ; mapped                 ; 0077 0063     # 6.0  SQUARED WC
+1F150..1F156  ; valid                  ;      ; NV8    # 6.0  NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER G
+1F157         ; valid                  ;      ; NV8    # 5.2  NEGATIVE CIRCLED LATIN CAPITAL LETTER H
+1F158..1F15E  ; valid                  ;      ; NV8    # 6.0  NEGATIVE CIRCLED LATIN CAPITAL LETTER I..NEGATIVE CIRCLED LATIN CAPITAL LETTER O
+1F15F         ; valid                  ;      ; NV8    # 5.2  NEGATIVE CIRCLED LATIN CAPITAL LETTER P
+1F160..1F169  ; valid                  ;      ; NV8    # 6.0  NEGATIVE CIRCLED LATIN CAPITAL LETTER Q..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
+1F16A         ; mapped                 ; 006D 0063     # 6.1  RAISED MC SIGN
+1F16B         ; mapped                 ; 006D 0064     # 6.1  RAISED MD SIGN
+1F16C         ; mapped                 ; 006D 0072     # 12.0 RAISED MR SIGN
+1F16D..1F16F  ; valid                  ;      ; NV8    # 13.0 CIRCLED CC..CIRCLED HUMAN FIGURE
+1F170..1F178  ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER I
+1F179         ; valid                  ;      ; NV8    # 5.2  NEGATIVE SQUARED LATIN CAPITAL LETTER J
+1F17A         ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED LATIN CAPITAL LETTER K
+1F17B..1F17C  ; valid                  ;      ; NV8    # 5.2  NEGATIVE SQUARED LATIN CAPITAL LETTER L..NEGATIVE SQUARED LATIN CAPITAL LETTER M
+1F17D..1F17E  ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED LATIN CAPITAL LETTER N..NEGATIVE SQUARED LATIN CAPITAL LETTER O
+1F17F         ; valid                  ;      ; NV8    # 5.2  NEGATIVE SQUARED LATIN CAPITAL LETTER P
+1F180..1F189  ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED LATIN CAPITAL LETTER Q..NEGATIVE SQUARED LATIN CAPITAL LETTER Z
+1F18A..1F18D  ; valid                  ;      ; NV8    # 5.2  CROSSED NEGATIVE SQUARED LATIN CAPITAL LETTER P..NEGATIVE SQUARED SA
+1F18E..1F18F  ; valid                  ;      ; NV8    # 6.0  NEGATIVE SQUARED AB..NEGATIVE SQUARED WC
+1F190         ; mapped                 ; 0064 006A     # 5.2  SQUARE DJ
+1F191..1F19A  ; valid                  ;      ; NV8    # 6.0  SQUARED CL..SQUARED VS
+1F19B..1F1AC  ; valid                  ;      ; NV8    # 9.0  SQUARED THREE D..SQUARED VOD
+1F1AD         ; valid                  ;      ; NV8    # 13.0 MASK WORK SYMBOL
+1F1AE..1F1E5  ; disallowed                             # NA   <reserved-1F1AE>..<reserved-1F1E5>
+1F1E6..1F1FF  ; valid                  ;      ; NV8    # 6.0  REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z
+1F200         ; mapped                 ; 307B 304B     # 5.2  SQUARE HIRAGANA HOKA
+1F201         ; mapped                 ; 30B3 30B3     # 6.0  SQUARED KATAKANA KOKO
+1F202         ; mapped                 ; 30B5          # 6.0  SQUARED KATAKANA SA
+1F203..1F20F  ; disallowed                             # NA   <reserved-1F203>..<reserved-1F20F>
+1F210         ; mapped                 ; 624B          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-624B
+1F211         ; mapped                 ; 5B57          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5B57
+1F212         ; mapped                 ; 53CC          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-53CC
+1F213         ; mapped                 ; 30C7          # 5.2  SQUARED KATAKANA DE
+1F214         ; mapped                 ; 4E8C          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4E8C
+1F215         ; mapped                 ; 591A          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-591A
+1F216         ; mapped                 ; 89E3          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-89E3
+1F217         ; mapped                 ; 5929          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5929
+1F218         ; mapped                 ; 4EA4          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4EA4
+1F219         ; mapped                 ; 6620          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6620
+1F21A         ; mapped                 ; 7121          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-7121
+1F21B         ; mapped                 ; 6599          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6599
+1F21C         ; mapped                 ; 524D          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-524D
+1F21D         ; mapped                 ; 5F8C          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5F8C
+1F21E         ; mapped                 ; 518D          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-518D
+1F21F         ; mapped                 ; 65B0          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-65B0
+1F220         ; mapped                 ; 521D          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-521D
+1F221         ; mapped                 ; 7D42          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-7D42
+1F222         ; mapped                 ; 751F          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-751F
+1F223         ; mapped                 ; 8CA9          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-8CA9
+1F224         ; mapped                 ; 58F0          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-58F0
+1F225         ; mapped                 ; 5439          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5439
+1F226         ; mapped                 ; 6F14          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6F14
+1F227         ; mapped                 ; 6295          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6295
+1F228         ; mapped                 ; 6355          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6355
+1F229         ; mapped                 ; 4E00          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4E00
+1F22A         ; mapped                 ; 4E09          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4E09
+1F22B         ; mapped                 ; 904A          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-904A
+1F22C         ; mapped                 ; 5DE6          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-5DE6
+1F22D         ; mapped                 ; 4E2D          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-4E2D
+1F22E         ; mapped                 ; 53F3          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-53F3
+1F22F         ; mapped                 ; 6307          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6307
+1F230         ; mapped                 ; 8D70          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-8D70
+1F231         ; mapped                 ; 6253          # 5.2  SQUARED CJK UNIFIED IDEOGRAPH-6253
+1F232         ; mapped                 ; 7981          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-7981
+1F233         ; mapped                 ; 7A7A          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-7A7A
+1F234         ; mapped                 ; 5408          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-5408
+1F235         ; mapped                 ; 6E80          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-6E80
+1F236         ; mapped                 ; 6709          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-6709
+1F237         ; mapped                 ; 6708          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-6708
+1F238         ; mapped                 ; 7533          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-7533
+1F239         ; mapped                 ; 5272          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-5272
+1F23A         ; mapped                 ; 55B6          # 6.0  SQUARED CJK UNIFIED IDEOGRAPH-55B6
+1F23B         ; mapped                 ; 914D          # 9.0  SQUARED CJK UNIFIED IDEOGRAPH-914D
+1F23C..1F23F  ; disallowed                             # NA   <reserved-1F23C>..<reserved-1F23F>
+1F240         ; mapped                 ; 3014 672C 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C
+1F241         ; mapped                 ; 3014 4E09 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E09
+1F242         ; mapped                 ; 3014 4E8C 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E8C
+1F243         ; mapped                 ; 3014 5B89 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-5B89
+1F244         ; mapped                 ; 3014 70B9 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-70B9
+1F245         ; mapped                 ; 3014 6253 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6253
+1F246         ; mapped                 ; 3014 76D7 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-76D7
+1F247         ; mapped                 ; 3014 52DD 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-52DD
+1F248         ; mapped                 ; 3014 6557 3015 #5.2  TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557
+1F249..1F24F  ; disallowed                             # NA   <reserved-1F249>..<reserved-1F24F>
+1F250         ; mapped                 ; 5F97          # 6.0  CIRCLED IDEOGRAPH ADVANTAGE
+1F251         ; mapped                 ; 53EF          # 6.0  CIRCLED IDEOGRAPH ACCEPT
+1F252..1F25F  ; disallowed                             # NA   <reserved-1F252>..<reserved-1F25F>
+1F260..1F265  ; valid                  ;      ; NV8    # 10.0 ROUNDED SYMBOL FOR FU..ROUNDED SYMBOL FOR CAI
+1F266..1F2FF  ; disallowed                             # NA   <reserved-1F266>..<reserved-1F2FF>
+1F300..1F320  ; valid                  ;      ; NV8    # 6.0  CYCLONE..SHOOTING STAR
+1F321..1F32C  ; valid                  ;      ; NV8    # 7.0  THERMOMETER..WIND BLOWING FACE
+1F32D..1F32F  ; valid                  ;      ; NV8    # 8.0  HOT DOG..BURRITO
+1F330..1F335  ; valid                  ;      ; NV8    # 6.0  CHESTNUT..CACTUS
+1F336         ; valid                  ;      ; NV8    # 7.0  HOT PEPPER
+1F337..1F37C  ; valid                  ;      ; NV8    # 6.0  TULIP..BABY BOTTLE
+1F37D         ; valid                  ;      ; NV8    # 7.0  FORK AND KNIFE WITH PLATE
+1F37E..1F37F  ; valid                  ;      ; NV8    # 8.0  BOTTLE WITH POPPING CORK..POPCORN
+1F380..1F393  ; valid                  ;      ; NV8    # 6.0  RIBBON..GRADUATION CAP
+1F394..1F39F  ; valid                  ;      ; NV8    # 7.0  HEART WITH TIP ON THE LEFT..ADMISSION TICKETS
+1F3A0..1F3C4  ; valid                  ;      ; NV8    # 6.0  CAROUSEL HORSE..SURFER
+1F3C5         ; valid                  ;      ; NV8    # 7.0  SPORTS MEDAL
+1F3C6..1F3CA  ; valid                  ;      ; NV8    # 6.0  TROPHY..SWIMMER
+1F3CB..1F3CE  ; valid                  ;      ; NV8    # 7.0  WEIGHT LIFTER..RACING CAR
+1F3CF..1F3D3  ; valid                  ;      ; NV8    # 8.0  CRICKET BAT AND BALL..TABLE TENNIS PADDLE AND BALL
+1F3D4..1F3DF  ; valid                  ;      ; NV8    # 7.0  SNOW CAPPED MOUNTAIN..STADIUM
+1F3E0..1F3F0  ; valid                  ;      ; NV8    # 6.0  HOUSE BUILDING..EUROPEAN CASTLE
+1F3F1..1F3F7  ; valid                  ;      ; NV8    # 7.0  WHITE PENNANT..LABEL
+1F3F8..1F3FF  ; valid                  ;      ; NV8    # 8.0  BADMINTON RACQUET AND SHUTTLECOCK..EMOJI MODIFIER FITZPATRICK TYPE-6
+1F400..1F43E  ; valid                  ;      ; NV8    # 6.0  RAT..PAW PRINTS
+1F43F         ; valid                  ;      ; NV8    # 7.0  CHIPMUNK
+1F440         ; valid                  ;      ; NV8    # 6.0  EYES
+1F441         ; valid                  ;      ; NV8    # 7.0  EYE
+1F442..1F4F7  ; valid                  ;      ; NV8    # 6.0  EAR..CAMERA
+1F4F8         ; valid                  ;      ; NV8    # 7.0  CAMERA WITH FLASH
+1F4F9..1F4FC  ; valid                  ;      ; NV8    # 6.0  VIDEO CAMERA..VIDEOCASSETTE
+1F4FD..1F4FE  ; valid                  ;      ; NV8    # 7.0  FILM PROJECTOR..PORTABLE STEREO
+1F4FF         ; valid                  ;      ; NV8    # 8.0  PRAYER BEADS
+1F500..1F53D  ; valid                  ;      ; NV8    # 6.0  TWISTED RIGHTWARDS ARROWS..DOWN-POINTING SMALL RED TRIANGLE
+1F53E..1F53F  ; valid                  ;      ; NV8    # 7.0  LOWER RIGHT SHADOWED WHITE CIRCLE..UPPER RIGHT SHADOWED WHITE CIRCLE
+1F540..1F543  ; valid                  ;      ; NV8    # 6.1  CIRCLED CROSS POMMEE..NOTCHED LEFT SEMICIRCLE WITH THREE DOTS
+1F544..1F54A  ; valid                  ;      ; NV8    # 7.0  NOTCHED RIGHT SEMICIRCLE WITH THREE DOTS..DOVE OF PEACE
+1F54B..1F54F  ; valid                  ;      ; NV8    # 8.0  KAABA..BOWL OF HYGIEIA
+1F550..1F567  ; valid                  ;      ; NV8    # 6.0  CLOCK FACE ONE OCLOCK..CLOCK FACE TWELVE-THIRTY
+1F568..1F579  ; valid                  ;      ; NV8    # 7.0  RIGHT SPEAKER..JOYSTICK
+1F57A         ; valid                  ;      ; NV8    # 9.0  MAN DANCING
+1F57B..1F5A3  ; valid                  ;      ; NV8    # 7.0  LEFT HAND TELEPHONE RECEIVER..BLACK DOWN POINTING BACKHAND INDEX
+1F5A4         ; valid                  ;      ; NV8    # 9.0  BLACK HEART
+1F5A5..1F5FA  ; valid                  ;      ; NV8    # 7.0  DESKTOP COMPUTER..WORLD MAP
+1F5FB..1F5FF  ; valid                  ;      ; NV8    # 6.0  MOUNT FUJI..MOYAI
+1F600         ; valid                  ;      ; NV8    # 6.1  GRINNING FACE
+1F601..1F610  ; valid                  ;      ; NV8    # 6.0  GRINNING FACE WITH SMILING EYES..NEUTRAL FACE
+1F611         ; valid                  ;      ; NV8    # 6.1  EXPRESSIONLESS FACE
+1F612..1F614  ; valid                  ;      ; NV8    # 6.0  UNAMUSED FACE..PENSIVE FACE
+1F615         ; valid                  ;      ; NV8    # 6.1  CONFUSED FACE
+1F616         ; valid                  ;      ; NV8    # 6.0  CONFOUNDED FACE
+1F617         ; valid                  ;      ; NV8    # 6.1  KISSING FACE
+1F618         ; valid                  ;      ; NV8    # 6.0  FACE THROWING A KISS
+1F619         ; valid                  ;      ; NV8    # 6.1  KISSING FACE WITH SMILING EYES
+1F61A         ; valid                  ;      ; NV8    # 6.0  KISSING FACE WITH CLOSED EYES
+1F61B         ; valid                  ;      ; NV8    # 6.1  FACE WITH STUCK-OUT TONGUE
+1F61C..1F61E  ; valid                  ;      ; NV8    # 6.0  FACE WITH STUCK-OUT TONGUE AND WINKING EYE..DISAPPOINTED FACE
+1F61F         ; valid                  ;      ; NV8    # 6.1  WORRIED FACE
+1F620..1F625  ; valid                  ;      ; NV8    # 6.0  ANGRY FACE..DISAPPOINTED BUT RELIEVED FACE
+1F626..1F627  ; valid                  ;      ; NV8    # 6.1  FROWNING FACE WITH OPEN MOUTH..ANGUISHED FACE
+1F628..1F62B  ; valid                  ;      ; NV8    # 6.0  FEARFUL FACE..TIRED FACE
+1F62C         ; valid                  ;      ; NV8    # 6.1  GRIMACING FACE
+1F62D         ; valid                  ;      ; NV8    # 6.0  LOUDLY CRYING FACE
+1F62E..1F62F  ; valid                  ;      ; NV8    # 6.1  FACE WITH OPEN MOUTH..HUSHED FACE
+1F630..1F633  ; valid                  ;      ; NV8    # 6.0  FACE WITH OPEN MOUTH AND COLD SWEAT..FLUSHED FACE
+1F634         ; valid                  ;      ; NV8    # 6.1  SLEEPING FACE
+1F635..1F640  ; valid                  ;      ; NV8    # 6.0  DIZZY FACE..WEARY CAT FACE
+1F641..1F642  ; valid                  ;      ; NV8    # 7.0  SLIGHTLY FROWNING FACE..SLIGHTLY SMILING FACE
+1F643..1F644  ; valid                  ;      ; NV8    # 8.0  UPSIDE-DOWN FACE..FACE WITH ROLLING EYES
+1F645..1F64F  ; valid                  ;      ; NV8    # 6.0  FACE WITH NO GOOD GESTURE..PERSON WITH FOLDED HANDS
+1F650..1F67F  ; valid                  ;      ; NV8    # 7.0  NORTH WEST POINTING LEAF..REVERSE CHECKER BOARD
+1F680..1F6C5  ; valid                  ;      ; NV8    # 6.0  ROCKET..LEFT LUGGAGE
+1F6C6..1F6CF  ; valid                  ;      ; NV8    # 7.0  TRIANGLE WITH ROUNDED CORNERS..BED
+1F6D0         ; valid                  ;      ; NV8    # 8.0  PLACE OF WORSHIP
+1F6D1..1F6D2  ; valid                  ;      ; NV8    # 9.0  OCTAGONAL SIGN..SHOPPING TROLLEY
+1F6D3..1F6D4  ; valid                  ;      ; NV8    # 10.0 STUPA..PAGODA
+1F6D5         ; valid                  ;      ; NV8    # 12.0 HINDU TEMPLE
+1F6D6..1F6D7  ; valid                  ;      ; NV8    # 13.0 HUT..ELEVATOR
+1F6D8..1F6DF  ; disallowed                             # NA   <reserved-1F6D8>..<reserved-1F6DF>
+1F6E0..1F6EC  ; valid                  ;      ; NV8    # 7.0  HAMMER AND WRENCH..AIRPLANE ARRIVING
+1F6ED..1F6EF  ; disallowed                             # NA   <reserved-1F6ED>..<reserved-1F6EF>
+1F6F0..1F6F3  ; valid                  ;      ; NV8    # 7.0  SATELLITE..PASSENGER SHIP
+1F6F4..1F6F6  ; valid                  ;      ; NV8    # 9.0  SCOOTER..CANOE
+1F6F7..1F6F8  ; valid                  ;      ; NV8    # 10.0 SLED..FLYING SAUCER
+1F6F9         ; valid                  ;      ; NV8    # 11.0 SKATEBOARD
+1F6FA         ; valid                  ;      ; NV8    # 12.0 AUTO RICKSHAW
+1F6FB..1F6FC  ; valid                  ;      ; NV8    # 13.0 PICKUP TRUCK..ROLLER SKATE
+1F6FD..1F6FF  ; disallowed                             # NA   <reserved-1F6FD>..<reserved-1F6FF>
+1F700..1F773  ; valid                  ;      ; NV8    # 6.0  ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE
+1F774..1F77F  ; disallowed                             # NA   <reserved-1F774>..<reserved-1F77F>
+1F780..1F7D4  ; valid                  ;      ; NV8    # 7.0  BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE..HEAVY TWELVE POINTED PINWHEEL STAR
+1F7D5..1F7D8  ; valid                  ;      ; NV8    # 11.0 CIRCLED TRIANGLE..NEGATIVE CIRCLED SQUARE
+1F7D9..1F7DF  ; disallowed                             # NA   <reserved-1F7D9>..<reserved-1F7DF>
+1F7E0..1F7EB  ; valid                  ;      ; NV8    # 12.0 LARGE ORANGE CIRCLE..LARGE BROWN SQUARE
+1F7EC..1F7FF  ; disallowed                             # NA   <reserved-1F7EC>..<reserved-1F7FF>
+1F800..1F80B  ; valid                  ;      ; NV8    # 7.0  LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
+1F80C..1F80F  ; disallowed                             # NA   <reserved-1F80C>..<reserved-1F80F>
+1F810..1F847  ; valid                  ;      ; NV8    # 7.0  LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD..DOWNWARDS HEAVY ARROW
+1F848..1F84F  ; disallowed                             # NA   <reserved-1F848>..<reserved-1F84F>
+1F850..1F859  ; valid                  ;      ; NV8    # 7.0  LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW
+1F85A..1F85F  ; disallowed                             # NA   <reserved-1F85A>..<reserved-1F85F>
+1F860..1F887  ; valid                  ;      ; NV8    # 7.0  WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW
+1F888..1F88F  ; disallowed                             # NA   <reserved-1F888>..<reserved-1F88F>
+1F890..1F8AD  ; valid                  ;      ; NV8    # 7.0  LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS
+1F8AE..1F8AF  ; disallowed                             # NA   <reserved-1F8AE>..<reserved-1F8AF>
+1F8B0..1F8B1  ; valid                  ;      ; NV8    # 13.0 ARROW POINTING UPWARDS THEN NORTH WEST..ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST
+1F8B2..1F8FF  ; disallowed                             # NA   <reserved-1F8B2>..<reserved-1F8FF>
+1F900..1F90B  ; valid                  ;      ; NV8    # 10.0 CIRCLED CROSS FORMEE WITH FOUR DOTS..DOWNWARD FACING NOTCHED HOOK WITH DOT
+1F90C         ; valid                  ;      ; NV8    # 13.0 PINCHED FINGERS
+1F90D..1F90F  ; valid                  ;      ; NV8    # 12.0 WHITE HEART..PINCHING HAND
+1F910..1F918  ; valid                  ;      ; NV8    # 8.0  ZIPPER-MOUTH FACE..SIGN OF THE HORNS
+1F919..1F91E  ; valid                  ;      ; NV8    # 9.0  CALL ME HAND..HAND WITH INDEX AND MIDDLE FINGERS CROSSED
+1F91F         ; valid                  ;      ; NV8    # 10.0 I LOVE YOU HAND SIGN
+1F920..1F927  ; valid                  ;      ; NV8    # 9.0  FACE WITH COWBOY HAT..SNEEZING FACE
+1F928..1F92F  ; valid                  ;      ; NV8    # 10.0 FACE WITH ONE EYEBROW RAISED..SHOCKED FACE WITH EXPLODING HEAD
+1F930         ; valid                  ;      ; NV8    # 9.0  PREGNANT WOMAN
+1F931..1F932  ; valid                  ;      ; NV8    # 10.0 BREAST-FEEDING..PALMS UP TOGETHER
+1F933..1F93E  ; valid                  ;      ; NV8    # 9.0  SELFIE..HANDBALL
+1F93F         ; valid                  ;      ; NV8    # 12.0 DIVING MASK
+1F940..1F94B  ; valid                  ;      ; NV8    # 9.0  WILTED FLOWER..MARTIAL ARTS UNIFORM
+1F94C         ; valid                  ;      ; NV8    # 10.0 CURLING STONE
+1F94D..1F94F  ; valid                  ;      ; NV8    # 11.0 LACROSSE STICK AND BALL..FLYING DISC
+1F950..1F95E  ; valid                  ;      ; NV8    # 9.0  CROISSANT..PANCAKES
+1F95F..1F96B  ; valid                  ;      ; NV8    # 10.0 DUMPLING..CANNED FOOD
+1F96C..1F970  ; valid                  ;      ; NV8    # 11.0 LEAFY GREEN..SMILING FACE WITH SMILING EYES AND THREE HEARTS
+1F971         ; valid                  ;      ; NV8    # 12.0 YAWNING FACE
+1F972         ; valid                  ;      ; NV8    # 13.0 SMILING FACE WITH TEAR
+1F973..1F976  ; valid                  ;      ; NV8    # 11.0 FACE WITH PARTY HORN AND PARTY HAT..FREEZING FACE
+1F977..1F978  ; valid                  ;      ; NV8    # 13.0 NINJA..DISGUISED FACE
+1F979         ; disallowed                             # NA   <reserved-1F979>
+1F97A         ; valid                  ;      ; NV8    # 11.0 FACE WITH PLEADING EYES
+1F97B         ; valid                  ;      ; NV8    # 12.0 SARI
+1F97C..1F97F  ; valid                  ;      ; NV8    # 11.0 LAB COAT..FLAT SHOE
+1F980..1F984  ; valid                  ;      ; NV8    # 8.0  CRAB..UNICORN FACE
+1F985..1F991  ; valid                  ;      ; NV8    # 9.0  EAGLE..SQUID
+1F992..1F997  ; valid                  ;      ; NV8    # 10.0 GIRAFFE FACE..CRICKET
+1F998..1F9A2  ; valid                  ;      ; NV8    # 11.0 KANGAROO..SWAN
+1F9A3..1F9A4  ; valid                  ;      ; NV8    # 13.0 MAMMOTH..DODO
+1F9A5..1F9AA  ; valid                  ;      ; NV8    # 12.0 SLOTH..OYSTER
+1F9AB..1F9AD  ; valid                  ;      ; NV8    # 13.0 BEAVER..SEAL
+1F9AE..1F9AF  ; valid                  ;      ; NV8    # 12.0 GUIDE DOG..PROBING CANE
+1F9B0..1F9B9  ; valid                  ;      ; NV8    # 11.0 EMOJI COMPONENT RED HAIR..SUPERVILLAIN
+1F9BA..1F9BF  ; valid                  ;      ; NV8    # 12.0 SAFETY VEST..MECHANICAL LEG
+1F9C0         ; valid                  ;      ; NV8    # 8.0  CHEESE WEDGE
+1F9C1..1F9C2  ; valid                  ;      ; NV8    # 11.0 CUPCAKE..SALT SHAKER
+1F9C3..1F9CA  ; valid                  ;      ; NV8    # 12.0 BEVERAGE BOX..ICE CUBE
+1F9CB         ; valid                  ;      ; NV8    # 13.0 BUBBLE TEA
+1F9CC         ; disallowed                             # NA   <reserved-1F9CC>
+1F9CD..1F9CF  ; valid                  ;      ; NV8    # 12.0 STANDING PERSON..DEAF PERSON
+1F9D0..1F9E6  ; valid                  ;      ; NV8    # 10.0 FACE WITH MONOCLE..SOCKS
+1F9E7..1F9FF  ; valid                  ;      ; NV8    # 11.0 RED GIFT ENVELOPE..NAZAR AMULET
+1FA00..1FA53  ; valid                  ;      ; NV8    # 12.0 NEUTRAL CHESS KING..BLACK CHESS KNIGHT-BISHOP
+1FA54..1FA5F  ; disallowed                             # NA   <reserved-1FA54>..<reserved-1FA5F>
+1FA60..1FA6D  ; valid                  ;      ; NV8    # 11.0 XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER
+1FA6E..1FA6F  ; disallowed                             # NA   <reserved-1FA6E>..<reserved-1FA6F>
+1FA70..1FA73  ; valid                  ;      ; NV8    # 12.0 BALLET SHOES..SHORTS
+1FA74         ; valid                  ;      ; NV8    # 13.0 THONG SANDAL
+1FA75..1FA77  ; disallowed                             # NA   <reserved-1FA75>..<reserved-1FA77>
+1FA78..1FA7A  ; valid                  ;      ; NV8    # 12.0 DROP OF BLOOD..STETHOSCOPE
+1FA7B..1FA7F  ; disallowed                             # NA   <reserved-1FA7B>..<reserved-1FA7F>
+1FA80..1FA82  ; valid                  ;      ; NV8    # 12.0 YO-YO..PARACHUTE
+1FA83..1FA86  ; valid                  ;      ; NV8    # 13.0 BOOMERANG..NESTING DOLLS
+1FA87..1FA8F  ; disallowed                             # NA   <reserved-1FA87>..<reserved-1FA8F>
+1FA90..1FA95  ; valid                  ;      ; NV8    # 12.0 RINGED PLANET..BANJO
+1FA96..1FAA8  ; valid                  ;      ; NV8    # 13.0 MILITARY HELMET..ROCK
+1FAA9..1FAAF  ; disallowed                             # NA   <reserved-1FAA9>..<reserved-1FAAF>
+1FAB0..1FAB6  ; valid                  ;      ; NV8    # 13.0 FLY..FEATHER
+1FAB7..1FABF  ; disallowed                             # NA   <reserved-1FAB7>..<reserved-1FABF>
+1FAC0..1FAC2  ; valid                  ;      ; NV8    # 13.0 ANATOMICAL HEART..PEOPLE HUGGING
+1FAC3..1FACF  ; disallowed                             # NA   <reserved-1FAC3>..<reserved-1FACF>
+1FAD0..1FAD6  ; valid                  ;      ; NV8    # 13.0 BLUEBERRIES..TEAPOT
+1FAD7..1FAFF  ; disallowed                             # NA   <reserved-1FAD7>..<reserved-1FAFF>
+1FB00..1FB92  ; valid                  ;      ; NV8    # 13.0 BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
+1FB93         ; disallowed                             # NA   <reserved-1FB93>
+1FB94..1FBCA  ; valid                  ;      ; NV8    # 13.0 LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON
+1FBCB..1FBEF  ; disallowed                             # NA   <reserved-1FBCB>..<reserved-1FBEF>
+1FBF0         ; mapped                 ; 0030          # 13.0 SEGMENTED DIGIT ZERO
+1FBF1         ; mapped                 ; 0031          # 13.0 SEGMENTED DIGIT ONE
+1FBF2         ; mapped                 ; 0032          # 13.0 SEGMENTED DIGIT TWO
+1FBF3         ; mapped                 ; 0033          # 13.0 SEGMENTED DIGIT THREE
+1FBF4         ; mapped                 ; 0034          # 13.0 SEGMENTED DIGIT FOUR
+1FBF5         ; mapped                 ; 0035          # 13.0 SEGMENTED DIGIT FIVE
+1FBF6         ; mapped                 ; 0036          # 13.0 SEGMENTED DIGIT SIX
+1FBF7         ; mapped                 ; 0037          # 13.0 SEGMENTED DIGIT SEVEN
+1FBF8         ; mapped                 ; 0038          # 13.0 SEGMENTED DIGIT EIGHT
+1FBF9         ; mapped                 ; 0039          # 13.0 SEGMENTED DIGIT NINE
+1FBFA..1FFFD  ; disallowed                             # NA   <reserved-1FBFA>..<reserved-1FFFD>
+1FFFE..1FFFF  ; disallowed                             # 2.0  <noncharacter-1FFFE>..<noncharacter-1FFFF>
+20000..2A6D6  ; valid                                  # 3.1  CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
+2A6D7..2A6DD  ; valid                                  # 13.0 CJK UNIFIED IDEOGRAPH-2A6D7..CJK UNIFIED IDEOGRAPH-2A6DD
+2A6DE..2A6FF  ; disallowed                             # NA   <reserved-2A6DE>..<reserved-2A6FF>
+2A700..2B734  ; valid                                  # 5.2  CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
+2B735..2B73F  ; disallowed                             # NA   <reserved-2B735>..<reserved-2B73F>
+2B740..2B81D  ; valid                                  # 6.0  CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
+2B81E..2B81F  ; disallowed                             # NA   <reserved-2B81E>..<reserved-2B81F>
+2B820..2CEA1  ; valid                                  # 8.0  CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2CEA2..2CEAF  ; disallowed                             # NA   <reserved-2CEA2>..<reserved-2CEAF>
+2CEB0..2EBE0  ; valid                                  # 10.0 CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBE1..2F7FF  ; disallowed                             # NA   <reserved-2EBE1>..<reserved-2F7FF>
+2F800         ; mapped                 ; 4E3D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F800
+2F801         ; mapped                 ; 4E38          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F801
+2F802         ; mapped                 ; 4E41          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F802
+2F803         ; mapped                 ; 20122         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F803
+2F804         ; mapped                 ; 4F60          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F804
+2F805         ; mapped                 ; 4FAE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F805
+2F806         ; mapped                 ; 4FBB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F806
+2F807         ; mapped                 ; 5002          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F807
+2F808         ; mapped                 ; 507A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F808
+2F809         ; mapped                 ; 5099          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F809
+2F80A         ; mapped                 ; 50E7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80A
+2F80B         ; mapped                 ; 50CF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80B
+2F80C         ; mapped                 ; 349E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80C
+2F80D         ; mapped                 ; 2063A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80D
+2F80E         ; mapped                 ; 514D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80E
+2F80F         ; mapped                 ; 5154          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F80F
+2F810         ; mapped                 ; 5164          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F810
+2F811         ; mapped                 ; 5177          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F811
+2F812         ; mapped                 ; 2051C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F812
+2F813         ; mapped                 ; 34B9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F813
+2F814         ; mapped                 ; 5167          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F814
+2F815         ; mapped                 ; 518D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F815
+2F816         ; mapped                 ; 2054B         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F816
+2F817         ; mapped                 ; 5197          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F817
+2F818         ; mapped                 ; 51A4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F818
+2F819         ; mapped                 ; 4ECC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F819
+2F81A         ; mapped                 ; 51AC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81A
+2F81B         ; mapped                 ; 51B5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81B
+2F81C         ; mapped                 ; 291DF         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81C
+2F81D         ; mapped                 ; 51F5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81D
+2F81E         ; mapped                 ; 5203          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81E
+2F81F         ; mapped                 ; 34DF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F81F
+2F820         ; mapped                 ; 523B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F820
+2F821         ; mapped                 ; 5246          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F821
+2F822         ; mapped                 ; 5272          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F822
+2F823         ; mapped                 ; 5277          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F823
+2F824         ; mapped                 ; 3515          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F824
+2F825         ; mapped                 ; 52C7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F825
+2F826         ; mapped                 ; 52C9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F826
+2F827         ; mapped                 ; 52E4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F827
+2F828         ; mapped                 ; 52FA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F828
+2F829         ; mapped                 ; 5305          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F829
+2F82A         ; mapped                 ; 5306          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82A
+2F82B         ; mapped                 ; 5317          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82B
+2F82C         ; mapped                 ; 5349          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82C
+2F82D         ; mapped                 ; 5351          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82D
+2F82E         ; mapped                 ; 535A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82E
+2F82F         ; mapped                 ; 5373          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F82F
+2F830         ; mapped                 ; 537D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F830
+2F831..2F833  ; mapped                 ; 537F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F831..CJK COMPATIBILITY IDEOGRAPH-2F833
+2F834         ; mapped                 ; 20A2C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F834
+2F835         ; mapped                 ; 7070          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F835
+2F836         ; mapped                 ; 53CA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F836
+2F837         ; mapped                 ; 53DF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F837
+2F838         ; mapped                 ; 20B63         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F838
+2F839         ; mapped                 ; 53EB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F839
+2F83A         ; mapped                 ; 53F1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83A
+2F83B         ; mapped                 ; 5406          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83B
+2F83C         ; mapped                 ; 549E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83C
+2F83D         ; mapped                 ; 5438          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83D
+2F83E         ; mapped                 ; 5448          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83E
+2F83F         ; mapped                 ; 5468          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F83F
+2F840         ; mapped                 ; 54A2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F840
+2F841         ; mapped                 ; 54F6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F841
+2F842         ; mapped                 ; 5510          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F842
+2F843         ; mapped                 ; 5553          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F843
+2F844         ; mapped                 ; 5563          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F844
+2F845..2F846  ; mapped                 ; 5584          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F845..CJK COMPATIBILITY IDEOGRAPH-2F846
+2F847         ; mapped                 ; 5599          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F847
+2F848         ; mapped                 ; 55AB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F848
+2F849         ; mapped                 ; 55B3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F849
+2F84A         ; mapped                 ; 55C2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84A
+2F84B         ; mapped                 ; 5716          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84B
+2F84C         ; mapped                 ; 5606          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84C
+2F84D         ; mapped                 ; 5717          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84D
+2F84E         ; mapped                 ; 5651          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84E
+2F84F         ; mapped                 ; 5674          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F84F
+2F850         ; mapped                 ; 5207          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F850
+2F851         ; mapped                 ; 58EE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F851
+2F852         ; mapped                 ; 57CE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F852
+2F853         ; mapped                 ; 57F4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F853
+2F854         ; mapped                 ; 580D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F854
+2F855         ; mapped                 ; 578B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F855
+2F856         ; mapped                 ; 5832          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F856
+2F857         ; mapped                 ; 5831          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F857
+2F858         ; mapped                 ; 58AC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F858
+2F859         ; mapped                 ; 214E4         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F859
+2F85A         ; mapped                 ; 58F2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85A
+2F85B         ; mapped                 ; 58F7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85B
+2F85C         ; mapped                 ; 5906          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85C
+2F85D         ; mapped                 ; 591A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85D
+2F85E         ; mapped                 ; 5922          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85E
+2F85F         ; mapped                 ; 5962          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F85F
+2F860         ; mapped                 ; 216A8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F860
+2F861         ; mapped                 ; 216EA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F861
+2F862         ; mapped                 ; 59EC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F862
+2F863         ; mapped                 ; 5A1B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F863
+2F864         ; mapped                 ; 5A27          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F864
+2F865         ; mapped                 ; 59D8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F865
+2F866         ; mapped                 ; 5A66          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F866
+2F867         ; mapped                 ; 36EE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F867
+2F868         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F868
+2F869         ; mapped                 ; 5B08          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F869
+2F86A..2F86B  ; mapped                 ; 5B3E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86A..CJK COMPATIBILITY IDEOGRAPH-2F86B
+2F86C         ; mapped                 ; 219C8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86C
+2F86D         ; mapped                 ; 5BC3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86D
+2F86E         ; mapped                 ; 5BD8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86E
+2F86F         ; mapped                 ; 5BE7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F86F
+2F870         ; mapped                 ; 5BF3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F870
+2F871         ; mapped                 ; 21B18         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F871
+2F872         ; mapped                 ; 5BFF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F872
+2F873         ; mapped                 ; 5C06          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F873
+2F874         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F874
+2F875         ; mapped                 ; 5C22          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F875
+2F876         ; mapped                 ; 3781          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F876
+2F877         ; mapped                 ; 5C60          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F877
+2F878         ; mapped                 ; 5C6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F878
+2F879         ; mapped                 ; 5CC0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F879
+2F87A         ; mapped                 ; 5C8D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87A
+2F87B         ; mapped                 ; 21DE4         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87B
+2F87C         ; mapped                 ; 5D43          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87C
+2F87D         ; mapped                 ; 21DE6         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87D
+2F87E         ; mapped                 ; 5D6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87E
+2F87F         ; mapped                 ; 5D6B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F87F
+2F880         ; mapped                 ; 5D7C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F880
+2F881         ; mapped                 ; 5DE1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F881
+2F882         ; mapped                 ; 5DE2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F882
+2F883         ; mapped                 ; 382F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F883
+2F884         ; mapped                 ; 5DFD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F884
+2F885         ; mapped                 ; 5E28          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F885
+2F886         ; mapped                 ; 5E3D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F886
+2F887         ; mapped                 ; 5E69          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F887
+2F888         ; mapped                 ; 3862          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F888
+2F889         ; mapped                 ; 22183         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F889
+2F88A         ; mapped                 ; 387C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88A
+2F88B         ; mapped                 ; 5EB0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88B
+2F88C         ; mapped                 ; 5EB3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88C
+2F88D         ; mapped                 ; 5EB6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88D
+2F88E         ; mapped                 ; 5ECA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88E
+2F88F         ; mapped                 ; 2A392         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F88F
+2F890         ; mapped                 ; 5EFE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F890
+2F891..2F892  ; mapped                 ; 22331         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F891..CJK COMPATIBILITY IDEOGRAPH-2F892
+2F893         ; mapped                 ; 8201          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F893
+2F894..2F895  ; mapped                 ; 5F22          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F894..CJK COMPATIBILITY IDEOGRAPH-2F895
+2F896         ; mapped                 ; 38C7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F896
+2F897         ; mapped                 ; 232B8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F897
+2F898         ; mapped                 ; 261DA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F898
+2F899         ; mapped                 ; 5F62          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F899
+2F89A         ; mapped                 ; 5F6B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89A
+2F89B         ; mapped                 ; 38E3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89B
+2F89C         ; mapped                 ; 5F9A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89C
+2F89D         ; mapped                 ; 5FCD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89D
+2F89E         ; mapped                 ; 5FD7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89E
+2F89F         ; mapped                 ; 5FF9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F89F
+2F8A0         ; mapped                 ; 6081          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A0
+2F8A1         ; mapped                 ; 393A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A1
+2F8A2         ; mapped                 ; 391C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A2
+2F8A3         ; mapped                 ; 6094          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A3
+2F8A4         ; mapped                 ; 226D4         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A4
+2F8A5         ; mapped                 ; 60C7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A5
+2F8A6         ; mapped                 ; 6148          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A6
+2F8A7         ; mapped                 ; 614C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A7
+2F8A8         ; mapped                 ; 614E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A8
+2F8A9         ; mapped                 ; 614C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8A9
+2F8AA         ; mapped                 ; 617A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AA
+2F8AB         ; mapped                 ; 618E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AB
+2F8AC         ; mapped                 ; 61B2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AC
+2F8AD         ; mapped                 ; 61A4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AD
+2F8AE         ; mapped                 ; 61AF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AE
+2F8AF         ; mapped                 ; 61DE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8AF
+2F8B0         ; mapped                 ; 61F2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B0
+2F8B1         ; mapped                 ; 61F6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B1
+2F8B2         ; mapped                 ; 6210          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B2
+2F8B3         ; mapped                 ; 621B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B3
+2F8B4         ; mapped                 ; 625D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B4
+2F8B5         ; mapped                 ; 62B1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B5
+2F8B6         ; mapped                 ; 62D4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B6
+2F8B7         ; mapped                 ; 6350          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B7
+2F8B8         ; mapped                 ; 22B0C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B8
+2F8B9         ; mapped                 ; 633D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8B9
+2F8BA         ; mapped                 ; 62FC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BA
+2F8BB         ; mapped                 ; 6368          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BB
+2F8BC         ; mapped                 ; 6383          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BC
+2F8BD         ; mapped                 ; 63E4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BD
+2F8BE         ; mapped                 ; 22BF1         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BE
+2F8BF         ; mapped                 ; 6422          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8BF
+2F8C0         ; mapped                 ; 63C5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C0
+2F8C1         ; mapped                 ; 63A9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C1
+2F8C2         ; mapped                 ; 3A2E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C2
+2F8C3         ; mapped                 ; 6469          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C3
+2F8C4         ; mapped                 ; 647E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C4
+2F8C5         ; mapped                 ; 649D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C5
+2F8C6         ; mapped                 ; 6477          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C6
+2F8C7         ; mapped                 ; 3A6C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C7
+2F8C8         ; mapped                 ; 654F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C8
+2F8C9         ; mapped                 ; 656C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8C9
+2F8CA         ; mapped                 ; 2300A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CA
+2F8CB         ; mapped                 ; 65E3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CB
+2F8CC         ; mapped                 ; 66F8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CC
+2F8CD         ; mapped                 ; 6649          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CD
+2F8CE         ; mapped                 ; 3B19          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CE
+2F8CF         ; mapped                 ; 6691          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8CF
+2F8D0         ; mapped                 ; 3B08          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D0
+2F8D1         ; mapped                 ; 3AE4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D1
+2F8D2         ; mapped                 ; 5192          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D2
+2F8D3         ; mapped                 ; 5195          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D3
+2F8D4         ; mapped                 ; 6700          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D4
+2F8D5         ; mapped                 ; 669C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D5
+2F8D6         ; mapped                 ; 80AD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D6
+2F8D7         ; mapped                 ; 43D9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D7
+2F8D8         ; mapped                 ; 6717          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D8
+2F8D9         ; mapped                 ; 671B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8D9
+2F8DA         ; mapped                 ; 6721          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DA
+2F8DB         ; mapped                 ; 675E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DB
+2F8DC         ; mapped                 ; 6753          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DC
+2F8DD         ; mapped                 ; 233C3         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DD
+2F8DE         ; mapped                 ; 3B49          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DE
+2F8DF         ; mapped                 ; 67FA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8DF
+2F8E0         ; mapped                 ; 6785          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E0
+2F8E1         ; mapped                 ; 6852          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E1
+2F8E2         ; mapped                 ; 6885          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E2
+2F8E3         ; mapped                 ; 2346D         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E3
+2F8E4         ; mapped                 ; 688E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E4
+2F8E5         ; mapped                 ; 681F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E5
+2F8E6         ; mapped                 ; 6914          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E6
+2F8E7         ; mapped                 ; 3B9D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E7
+2F8E8         ; mapped                 ; 6942          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E8
+2F8E9         ; mapped                 ; 69A3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8E9
+2F8EA         ; mapped                 ; 69EA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EA
+2F8EB         ; mapped                 ; 6AA8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EB
+2F8EC         ; mapped                 ; 236A3         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EC
+2F8ED         ; mapped                 ; 6ADB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8ED
+2F8EE         ; mapped                 ; 3C18          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EE
+2F8EF         ; mapped                 ; 6B21          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8EF
+2F8F0         ; mapped                 ; 238A7         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F0
+2F8F1         ; mapped                 ; 6B54          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F1
+2F8F2         ; mapped                 ; 3C4E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F2
+2F8F3         ; mapped                 ; 6B72          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F3
+2F8F4         ; mapped                 ; 6B9F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F4
+2F8F5         ; mapped                 ; 6BBA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F5
+2F8F6         ; mapped                 ; 6BBB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F6
+2F8F7         ; mapped                 ; 23A8D         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F7
+2F8F8         ; mapped                 ; 21D0B         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F8
+2F8F9         ; mapped                 ; 23AFA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8F9
+2F8FA         ; mapped                 ; 6C4E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FA
+2F8FB         ; mapped                 ; 23CBC         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FB
+2F8FC         ; mapped                 ; 6CBF          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FC
+2F8FD         ; mapped                 ; 6CCD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FD
+2F8FE         ; mapped                 ; 6C67          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FE
+2F8FF         ; mapped                 ; 6D16          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F8FF
+2F900         ; mapped                 ; 6D3E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F900
+2F901         ; mapped                 ; 6D77          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F901
+2F902         ; mapped                 ; 6D41          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F902
+2F903         ; mapped                 ; 6D69          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F903
+2F904         ; mapped                 ; 6D78          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F904
+2F905         ; mapped                 ; 6D85          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F905
+2F906         ; mapped                 ; 23D1E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F906
+2F907         ; mapped                 ; 6D34          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F907
+2F908         ; mapped                 ; 6E2F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F908
+2F909         ; mapped                 ; 6E6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F909
+2F90A         ; mapped                 ; 3D33          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90A
+2F90B         ; mapped                 ; 6ECB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90B
+2F90C         ; mapped                 ; 6EC7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90C
+2F90D         ; mapped                 ; 23ED1         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90D
+2F90E         ; mapped                 ; 6DF9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90E
+2F90F         ; mapped                 ; 6F6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F90F
+2F910         ; mapped                 ; 23F5E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F910
+2F911         ; mapped                 ; 23F8E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F911
+2F912         ; mapped                 ; 6FC6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F912
+2F913         ; mapped                 ; 7039          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F913
+2F914         ; mapped                 ; 701E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F914
+2F915         ; mapped                 ; 701B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F915
+2F916         ; mapped                 ; 3D96          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F916
+2F917         ; mapped                 ; 704A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F917
+2F918         ; mapped                 ; 707D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F918
+2F919         ; mapped                 ; 7077          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F919
+2F91A         ; mapped                 ; 70AD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91A
+2F91B         ; mapped                 ; 20525         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91B
+2F91C         ; mapped                 ; 7145          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91C
+2F91D         ; mapped                 ; 24263         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91D
+2F91E         ; mapped                 ; 719C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91E
+2F91F         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F91F
+2F920         ; mapped                 ; 7228          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F920
+2F921         ; mapped                 ; 7235          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F921
+2F922         ; mapped                 ; 7250          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F922
+2F923         ; mapped                 ; 24608         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F923
+2F924         ; mapped                 ; 7280          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F924
+2F925         ; mapped                 ; 7295          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F925
+2F926         ; mapped                 ; 24735         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F926
+2F927         ; mapped                 ; 24814         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F927
+2F928         ; mapped                 ; 737A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F928
+2F929         ; mapped                 ; 738B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F929
+2F92A         ; mapped                 ; 3EAC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92A
+2F92B         ; mapped                 ; 73A5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92B
+2F92C..2F92D  ; mapped                 ; 3EB8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92C..CJK COMPATIBILITY IDEOGRAPH-2F92D
+2F92E         ; mapped                 ; 7447          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92E
+2F92F         ; mapped                 ; 745C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F92F
+2F930         ; mapped                 ; 7471          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F930
+2F931         ; mapped                 ; 7485          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F931
+2F932         ; mapped                 ; 74CA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F932
+2F933         ; mapped                 ; 3F1B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F933
+2F934         ; mapped                 ; 7524          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F934
+2F935         ; mapped                 ; 24C36         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F935
+2F936         ; mapped                 ; 753E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F936
+2F937         ; mapped                 ; 24C92         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F937
+2F938         ; mapped                 ; 7570          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F938
+2F939         ; mapped                 ; 2219F         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F939
+2F93A         ; mapped                 ; 7610          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93A
+2F93B         ; mapped                 ; 24FA1         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93B
+2F93C         ; mapped                 ; 24FB8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93C
+2F93D         ; mapped                 ; 25044         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93D
+2F93E         ; mapped                 ; 3FFC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93E
+2F93F         ; mapped                 ; 4008          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F93F
+2F940         ; mapped                 ; 76F4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F940
+2F941         ; mapped                 ; 250F3         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F941
+2F942         ; mapped                 ; 250F2         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F942
+2F943         ; mapped                 ; 25119         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F943
+2F944         ; mapped                 ; 25133         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F944
+2F945         ; mapped                 ; 771E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F945
+2F946..2F947  ; mapped                 ; 771F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F946..CJK COMPATIBILITY IDEOGRAPH-2F947
+2F948         ; mapped                 ; 774A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F948
+2F949         ; mapped                 ; 4039          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F949
+2F94A         ; mapped                 ; 778B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94A
+2F94B         ; mapped                 ; 4046          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94B
+2F94C         ; mapped                 ; 4096          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94C
+2F94D         ; mapped                 ; 2541D         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94D
+2F94E         ; mapped                 ; 784E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94E
+2F94F         ; mapped                 ; 788C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F94F
+2F950         ; mapped                 ; 78CC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F950
+2F951         ; mapped                 ; 40E3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F951
+2F952         ; mapped                 ; 25626         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F952
+2F953         ; mapped                 ; 7956          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F953
+2F954         ; mapped                 ; 2569A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F954
+2F955         ; mapped                 ; 256C5         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F955
+2F956         ; mapped                 ; 798F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F956
+2F957         ; mapped                 ; 79EB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F957
+2F958         ; mapped                 ; 412F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F958
+2F959         ; mapped                 ; 7A40          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F959
+2F95A         ; mapped                 ; 7A4A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95A
+2F95B         ; mapped                 ; 7A4F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95B
+2F95C         ; mapped                 ; 2597C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95C
+2F95D..2F95E  ; mapped                 ; 25AA7         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95D..CJK COMPATIBILITY IDEOGRAPH-2F95E
+2F95F         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F95F
+2F960         ; mapped                 ; 4202          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F960
+2F961         ; mapped                 ; 25BAB         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F961
+2F962         ; mapped                 ; 7BC6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F962
+2F963         ; mapped                 ; 7BC9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F963
+2F964         ; mapped                 ; 4227          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F964
+2F965         ; mapped                 ; 25C80         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F965
+2F966         ; mapped                 ; 7CD2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F966
+2F967         ; mapped                 ; 42A0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F967
+2F968         ; mapped                 ; 7CE8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F968
+2F969         ; mapped                 ; 7CE3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F969
+2F96A         ; mapped                 ; 7D00          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96A
+2F96B         ; mapped                 ; 25F86         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96B
+2F96C         ; mapped                 ; 7D63          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96C
+2F96D         ; mapped                 ; 4301          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96D
+2F96E         ; mapped                 ; 7DC7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96E
+2F96F         ; mapped                 ; 7E02          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F96F
+2F970         ; mapped                 ; 7E45          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F970
+2F971         ; mapped                 ; 4334          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F971
+2F972         ; mapped                 ; 26228         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F972
+2F973         ; mapped                 ; 26247         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F973
+2F974         ; mapped                 ; 4359          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F974
+2F975         ; mapped                 ; 262D9         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F975
+2F976         ; mapped                 ; 7F7A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F976
+2F977         ; mapped                 ; 2633E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F977
+2F978         ; mapped                 ; 7F95          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F978
+2F979         ; mapped                 ; 7FFA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F979
+2F97A         ; mapped                 ; 8005          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97A
+2F97B         ; mapped                 ; 264DA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97B
+2F97C         ; mapped                 ; 26523         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97C
+2F97D         ; mapped                 ; 8060          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97D
+2F97E         ; mapped                 ; 265A8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97E
+2F97F         ; mapped                 ; 8070          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F97F
+2F980         ; mapped                 ; 2335F         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F980
+2F981         ; mapped                 ; 43D5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F981
+2F982         ; mapped                 ; 80B2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F982
+2F983         ; mapped                 ; 8103          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F983
+2F984         ; mapped                 ; 440B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F984
+2F985         ; mapped                 ; 813E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F985
+2F986         ; mapped                 ; 5AB5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F986
+2F987         ; mapped                 ; 267A7         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F987
+2F988         ; mapped                 ; 267B5         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F988
+2F989         ; mapped                 ; 23393         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F989
+2F98A         ; mapped                 ; 2339C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98A
+2F98B         ; mapped                 ; 8201          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98B
+2F98C         ; mapped                 ; 8204          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98C
+2F98D         ; mapped                 ; 8F9E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98D
+2F98E         ; mapped                 ; 446B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98E
+2F98F         ; mapped                 ; 8291          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F98F
+2F990         ; mapped                 ; 828B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F990
+2F991         ; mapped                 ; 829D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F991
+2F992         ; mapped                 ; 52B3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F992
+2F993         ; mapped                 ; 82B1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F993
+2F994         ; mapped                 ; 82B3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F994
+2F995         ; mapped                 ; 82BD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F995
+2F996         ; mapped                 ; 82E6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F996
+2F997         ; mapped                 ; 26B3C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F997
+2F998         ; mapped                 ; 82E5          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F998
+2F999         ; mapped                 ; 831D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F999
+2F99A         ; mapped                 ; 8363          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99A
+2F99B         ; mapped                 ; 83AD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99B
+2F99C         ; mapped                 ; 8323          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99C
+2F99D         ; mapped                 ; 83BD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99D
+2F99E         ; mapped                 ; 83E7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99E
+2F99F         ; mapped                 ; 8457          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F99F
+2F9A0         ; mapped                 ; 8353          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A0
+2F9A1         ; mapped                 ; 83CA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A1
+2F9A2         ; mapped                 ; 83CC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A2
+2F9A3         ; mapped                 ; 83DC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A3
+2F9A4         ; mapped                 ; 26C36         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A4
+2F9A5         ; mapped                 ; 26D6B         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A5
+2F9A6         ; mapped                 ; 26CD5         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A6
+2F9A7         ; mapped                 ; 452B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A7
+2F9A8         ; mapped                 ; 84F1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A8
+2F9A9         ; mapped                 ; 84F3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9A9
+2F9AA         ; mapped                 ; 8516          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AA
+2F9AB         ; mapped                 ; 273CA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AB
+2F9AC         ; mapped                 ; 8564          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AC
+2F9AD         ; mapped                 ; 26F2C         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AD
+2F9AE         ; mapped                 ; 455D          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AE
+2F9AF         ; mapped                 ; 4561          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9AF
+2F9B0         ; mapped                 ; 26FB1         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B0
+2F9B1         ; mapped                 ; 270D2         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B1
+2F9B2         ; mapped                 ; 456B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B2
+2F9B3         ; mapped                 ; 8650          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B3
+2F9B4         ; mapped                 ; 865C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B4
+2F9B5         ; mapped                 ; 8667          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B5
+2F9B6         ; mapped                 ; 8669          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B6
+2F9B7         ; mapped                 ; 86A9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B7
+2F9B8         ; mapped                 ; 8688          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B8
+2F9B9         ; mapped                 ; 870E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9B9
+2F9BA         ; mapped                 ; 86E2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BA
+2F9BB         ; mapped                 ; 8779          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BB
+2F9BC         ; mapped                 ; 8728          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BC
+2F9BD         ; mapped                 ; 876B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BD
+2F9BE         ; mapped                 ; 8786          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BE
+2F9BF         ; disallowed                             # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9BF
+2F9C0         ; mapped                 ; 87E1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C0
+2F9C1         ; mapped                 ; 8801          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C1
+2F9C2         ; mapped                 ; 45F9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C2
+2F9C3         ; mapped                 ; 8860          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C3
+2F9C4         ; mapped                 ; 8863          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C4
+2F9C5         ; mapped                 ; 27667         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C5
+2F9C6         ; mapped                 ; 88D7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C6
+2F9C7         ; mapped                 ; 88DE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C7
+2F9C8         ; mapped                 ; 4635          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C8
+2F9C9         ; mapped                 ; 88FA          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9C9
+2F9CA         ; mapped                 ; 34BB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CA
+2F9CB         ; mapped                 ; 278AE         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CB
+2F9CC         ; mapped                 ; 27966         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CC
+2F9CD         ; mapped                 ; 46BE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CD
+2F9CE         ; mapped                 ; 46C7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CE
+2F9CF         ; mapped                 ; 8AA0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9CF
+2F9D0         ; mapped                 ; 8AED          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D0
+2F9D1         ; mapped                 ; 8B8A          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D1
+2F9D2         ; mapped                 ; 8C55          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D2
+2F9D3         ; mapped                 ; 27CA8         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D3
+2F9D4         ; mapped                 ; 8CAB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D4
+2F9D5         ; mapped                 ; 8CC1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D5
+2F9D6         ; mapped                 ; 8D1B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D6
+2F9D7         ; mapped                 ; 8D77          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D7
+2F9D8         ; mapped                 ; 27F2F         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D8
+2F9D9         ; mapped                 ; 20804         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9D9
+2F9DA         ; mapped                 ; 8DCB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DA
+2F9DB         ; mapped                 ; 8DBC          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DB
+2F9DC         ; mapped                 ; 8DF0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DC
+2F9DD         ; mapped                 ; 208DE         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DD
+2F9DE         ; mapped                 ; 8ED4          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DE
+2F9DF         ; mapped                 ; 8F38          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9DF
+2F9E0         ; mapped                 ; 285D2         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E0
+2F9E1         ; mapped                 ; 285ED         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E1
+2F9E2         ; mapped                 ; 9094          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E2
+2F9E3         ; mapped                 ; 90F1          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E3
+2F9E4         ; mapped                 ; 9111          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E4
+2F9E5         ; mapped                 ; 2872E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E5
+2F9E6         ; mapped                 ; 911B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E6
+2F9E7         ; mapped                 ; 9238          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E7
+2F9E8         ; mapped                 ; 92D7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E8
+2F9E9         ; mapped                 ; 92D8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9E9
+2F9EA         ; mapped                 ; 927C          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EA
+2F9EB         ; mapped                 ; 93F9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EB
+2F9EC         ; mapped                 ; 9415          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EC
+2F9ED         ; mapped                 ; 28BFA         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9ED
+2F9EE         ; mapped                 ; 958B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EE
+2F9EF         ; mapped                 ; 4995          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9EF
+2F9F0         ; mapped                 ; 95B7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F0
+2F9F1         ; mapped                 ; 28D77         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F1
+2F9F2         ; mapped                 ; 49E6          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F2
+2F9F3         ; mapped                 ; 96C3          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F3
+2F9F4         ; mapped                 ; 5DB2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F4
+2F9F5         ; mapped                 ; 9723          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F5
+2F9F6         ; mapped                 ; 29145         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F6
+2F9F7         ; mapped                 ; 2921A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F7
+2F9F8         ; mapped                 ; 4A6E          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F8
+2F9F9         ; mapped                 ; 4A76          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9F9
+2F9FA         ; mapped                 ; 97E0          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FA
+2F9FB         ; mapped                 ; 2940A         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FB
+2F9FC         ; mapped                 ; 4AB2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FC
+2F9FD         ; mapped                 ; 29496         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FD
+2F9FE..2F9FF  ; mapped                 ; 980B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2F9FE..CJK COMPATIBILITY IDEOGRAPH-2F9FF
+2FA00         ; mapped                 ; 9829          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA00
+2FA01         ; mapped                 ; 295B6         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA01
+2FA02         ; mapped                 ; 98E2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA02
+2FA03         ; mapped                 ; 4B33          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA03
+2FA04         ; mapped                 ; 9929          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA04
+2FA05         ; mapped                 ; 99A7          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA05
+2FA06         ; mapped                 ; 99C2          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA06
+2FA07         ; mapped                 ; 99FE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA07
+2FA08         ; mapped                 ; 4BCE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA08
+2FA09         ; mapped                 ; 29B30         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA09
+2FA0A         ; mapped                 ; 9B12          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0A
+2FA0B         ; mapped                 ; 9C40          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0B
+2FA0C         ; mapped                 ; 9CFD          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0C
+2FA0D         ; mapped                 ; 4CCE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0D
+2FA0E         ; mapped                 ; 4CED          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0E
+2FA0F         ; mapped                 ; 9D67          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA0F
+2FA10         ; mapped                 ; 2A0CE         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA10
+2FA11         ; mapped                 ; 4CF8          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA11
+2FA12         ; mapped                 ; 2A105         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA12
+2FA13         ; mapped                 ; 2A20E         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA13
+2FA14         ; mapped                 ; 2A291         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA14
+2FA15         ; mapped                 ; 9EBB          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA15
+2FA16         ; mapped                 ; 4D56          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA16
+2FA17         ; mapped                 ; 9EF9          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA17
+2FA18         ; mapped                 ; 9EFE          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA18
+2FA19         ; mapped                 ; 9F05          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA19
+2FA1A         ; mapped                 ; 9F0F          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA1A
+2FA1B         ; mapped                 ; 9F16          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA1B
+2FA1C         ; mapped                 ; 9F3B          # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA1C
+2FA1D         ; mapped                 ; 2A600         # 3.1  CJK COMPATIBILITY IDEOGRAPH-2FA1D
+2FA1E..2FFFD  ; disallowed                             # NA   <reserved-2FA1E>..<reserved-2FFFD>
+2FFFE..2FFFF  ; disallowed                             # 2.0  <noncharacter-2FFFE>..<noncharacter-2FFFF>
+30000..3134A  ; valid                                  # 13.0 CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
+3134B..3FFFD  ; disallowed                             # NA   <reserved-3134B>..<reserved-3FFFD>
+3FFFE..3FFFF  ; disallowed                             # 2.0  <noncharacter-3FFFE>..<noncharacter-3FFFF>
+40000..4FFFD  ; disallowed                             # NA   <reserved-40000>..<reserved-4FFFD>
+4FFFE..4FFFF  ; disallowed                             # 2.0  <noncharacter-4FFFE>..<noncharacter-4FFFF>
+50000..5FFFD  ; disallowed                             # NA   <reserved-50000>..<reserved-5FFFD>
+5FFFE..5FFFF  ; disallowed                             # 2.0  <noncharacter-5FFFE>..<noncharacter-5FFFF>
+60000..6FFFD  ; disallowed                             # NA   <reserved-60000>..<reserved-6FFFD>
+6FFFE..6FFFF  ; disallowed                             # 2.0  <noncharacter-6FFFE>..<noncharacter-6FFFF>
+70000..7FFFD  ; disallowed                             # NA   <reserved-70000>..<reserved-7FFFD>
+7FFFE..7FFFF  ; disallowed                             # 2.0  <noncharacter-7FFFE>..<noncharacter-7FFFF>
+80000..8FFFD  ; disallowed                             # NA   <reserved-80000>..<reserved-8FFFD>
+8FFFE..8FFFF  ; disallowed                             # 2.0  <noncharacter-8FFFE>..<noncharacter-8FFFF>
+90000..9FFFD  ; disallowed                             # NA   <reserved-90000>..<reserved-9FFFD>
+9FFFE..9FFFF  ; disallowed                             # 2.0  <noncharacter-9FFFE>..<noncharacter-9FFFF>
+A0000..AFFFD  ; disallowed                             # NA   <reserved-A0000>..<reserved-AFFFD>
+AFFFE..AFFFF  ; disallowed                             # 2.0  <noncharacter-AFFFE>..<noncharacter-AFFFF>
+B0000..BFFFD  ; disallowed                             # NA   <reserved-B0000>..<reserved-BFFFD>
+BFFFE..BFFFF  ; disallowed                             # 2.0  <noncharacter-BFFFE>..<noncharacter-BFFFF>
+C0000..CFFFD  ; disallowed                             # NA   <reserved-C0000>..<reserved-CFFFD>
+CFFFE..CFFFF  ; disallowed                             # 2.0  <noncharacter-CFFFE>..<noncharacter-CFFFF>
+D0000..DFFFD  ; disallowed                             # NA   <reserved-D0000>..<reserved-DFFFD>
+DFFFE..DFFFF  ; disallowed                             # 2.0  <noncharacter-DFFFE>..<noncharacter-DFFFF>
+E0000         ; disallowed                             # NA   <reserved-E0000>
+E0001         ; disallowed                             # 3.1  LANGUAGE TAG
+E0002..E001F  ; disallowed                             # NA   <reserved-E0002>..<reserved-E001F>
+E0020..E007F  ; disallowed                             # 3.1  TAG SPACE..CANCEL TAG
+E0080..E00FF  ; disallowed                             # NA   <reserved-E0080>..<reserved-E00FF>
+E0100..E01EF  ; ignored                                # 4.0  VARIATION SELECTOR-17..VARIATION SELECTOR-256
+E01F0..EFFFD  ; disallowed                             # NA   <reserved-E01F0>..<reserved-EFFFD>
+EFFFE..EFFFF  ; disallowed                             # 2.0  <noncharacter-EFFFE>..<noncharacter-EFFFF>
+F0000..FFFFD  ; disallowed                             # 2.0  <private-use-F0000>..<private-use-FFFFD>
+FFFFE..FFFFF  ; disallowed                             # 2.0  <noncharacter-FFFFE>..<noncharacter-FFFFF>
+100000..10FFFD; disallowed                             # 2.0  <private-use-100000>..<private-use-10FFFD>
+10FFFE..10FFFF; disallowed                             # 2.0  <noncharacter-10FFFE>..<noncharacter-10FFFF>
+
+# Total code points: 1114112
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,13 +34,11 @@
 
 #[macro_use]
 extern crate matches;
-extern crate unicode_bidi;
-extern crate unicode_normalization;
 
 pub mod punycode;
 mod uts46;
 
-pub use uts46::{Config, Errors};
+pub use crate::uts46::{Config, Errors, Idna};
 
 /// The [domain to ASCII](https://url.spec.whatwg.org/#concept-domain-to-ascii) algorithm.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/make_uts46_mapping_table.py thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/make_uts46_mapping_table.py
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/make_uts46_mapping_table.py	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/make_uts46_mapping_table.py	2021-12-09 12:01:26.000000000 +0000
@@ -10,12 +10,11 @@
 # You can get the latest idna table from
 # http://www.unicode.org/Public/idna/latest/IdnaMappingTable.txt
 
-from __future__ import print_function
 import collections
 import itertools
 
 print('''\
-// Copyright 2013-2014 The rust-url developers.
+// Copyright 2013-2020 The rust-url developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -32,7 +31,7 @@
     return "\\u{%x}" % ord(c[0])
 
 def char(s):
-    return unichr(int(s, 16))
+    return chr(int(s, 16))
 
 strtab = collections.OrderedDict()
 strtab_offset = 0
@@ -79,6 +78,12 @@
             unicode_str = u''.join(char(c) for c in fields[2].strip().split(' '))
         elif mapping == "Deviation":
             unicode_str = u''
+
+    if len(fields) > 3:
+        assert fields[3].strip() in ('NV8', 'XV8'), fields[3]
+        assert mapping == 'Valid', mapping
+        mapping = 'DisallowedIdna2008'
+
     ranges.append((first, last, mapping, unicode_str))
 
 def mergeable_key(r):
@@ -87,7 +92,7 @@
     # These types have associated data, so we should not merge them.
     if mapping in ('Mapped', 'Deviation', 'DisallowedStd3Mapped'):
         return r
-    assert mapping in ('Valid', 'Ignored', 'Disallowed', 'DisallowedStd3Valid')
+    assert mapping in ('Valid', 'Ignored', 'Disallowed', 'DisallowedStd3Valid', 'DisallowedIdna2008')
     return mapping
 
 grouped_ranges = itertools.groupby(ranges, key=mergeable_key)
@@ -107,7 +112,7 @@
     # the codepoint space.
     a, b = itertools.tee(group)
     next(b, None)
-    for (g1, g2) in itertools.izip(a, b):
+    for (g1, g2) in zip(a, b):
         last_char = int(g1[1], 16)
         next_char = int(g2[0], 16)
         if last_char + 1 == next_char:
@@ -117,11 +122,7 @@
         # Assert we're seeing the surrogate case here.
         assert last_char == 0xd7ff
         assert next_char == 0xe000
-    first = group[0][0]
-    last = group[-1][1]
-    mapping = group[0][2]
-    unicode_str = group[0][3]
-    optimized_ranges.append((first, last, mapping, unicode_str))
+    optimized_ranges.append((group[0][0], group[-1][1]) + group[0][2:])
 
 def is_single_char_range(r):
     (first, last, _, _) = r
@@ -149,33 +150,25 @@
 
 optimized_ranges = list(merge_single_char_ranges(optimized_ranges))
 
-
-print("static TABLE: &'static [Range] = &[")
-
-for ranges in optimized_ranges:
-    first = ranges[0][0]
-    last = ranges[-1][1]
-    print("    Range { from: '%s', to: '%s', }," % (escape_char(char(first)),
-                                                            escape_char(char(last))))
-
-print("];\n")
-
-print("static INDEX_TABLE: &'static [u16] = &[")
-
 SINGLE_MARKER = 1 << 15
 
+print("static TABLE: &[(char, u16)] = &[")
+
 offset = 0
 for ranges in optimized_ranges:
     assert offset < SINGLE_MARKER
 
     block_len = len(ranges)
     single = SINGLE_MARKER if block_len == 1 else 0
-    print("    %s," % (offset | single))
+    index = offset | single
     offset += block_len
 
+    start = escape_char(char(ranges[0][0]))
+    print("    ('%s', %s)," % (start, index))
+
 print("];\n")
 
-print("static MAPPING_TABLE: &'static [Mapping] = &[")
+print("static MAPPING_TABLE: &[Mapping] = &[")
 
 for ranges in optimized_ranges:
     for (first, last, mapping, unicode_str) in ranges:
@@ -188,5 +181,5 @@
 def escape_str(s):
     return [escape_char(c) for c in s]
 
-print("static STRING_TABLE: &'static str = \"%s\";"
-      % '\\\n  '.join(itertools.chain(*[escape_str(s) for s in strtab.iterkeys()])))
+print("static STRING_TABLE: &str = \"%s\";"
+      % '\\\n  '.join(itertools.chain(*[escape_str(s) for s in strtab.keys()])))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/punycode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/punycode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/punycode.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/punycode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -52,81 +52,161 @@
 /// Overflow can only happen on inputs that take more than
 /// 63 encoded bytes, the DNS limit on domain name labels.
 pub fn decode(input: &str) -> Option<Vec<char>> {
-    // Handle "basic" (ASCII) code points.
-    // They are encoded as-is before the last delimiter, if any.
-    let (mut output, input) = match input.rfind(DELIMITER) {
-        None => (Vec::new(), input),
-        Some(position) => (
-            input[..position].chars().collect(),
-            if position > 0 {
-                &input[position + 1..]
-            } else {
-                input
-            },
-        ),
-    };
-    let mut code_point = INITIAL_N;
-    let mut bias = INITIAL_BIAS;
-    let mut i = 0;
-    let mut iter = input.bytes();
-    loop {
-        let previous_i = i;
-        let mut weight = 1;
-        let mut k = BASE;
-        let mut byte = match iter.next() {
-            None => break,
-            Some(byte) => byte,
+    Some(Decoder::default().decode(input).ok()?.collect())
+}
+
+#[derive(Default)]
+pub(crate) struct Decoder {
+    insertions: Vec<(usize, char)>,
+}
+
+impl Decoder {
+    /// Split the input iterator and return a Vec with insertions of encoded characters
+    pub(crate) fn decode<'a>(&'a mut self, input: &'a str) -> Result<Decode<'a>, ()> {
+        self.insertions.clear();
+        // Handle "basic" (ASCII) code points.
+        // They are encoded as-is before the last delimiter, if any.
+        let (base, input) = match input.rfind(DELIMITER) {
+            None => ("", input),
+            Some(position) => (
+                &input[..position],
+                if position > 0 {
+                    &input[position + 1..]
+                } else {
+                    input
+                },
+            ),
         };
-        // Decode a generalized variable-length integer into delta,
-        // which gets added to i.
+
+        if !base.is_ascii() {
+            return Err(());
+        }
+
+        let base_len = base.len();
+        let mut length = base_len as u32;
+        let mut code_point = INITIAL_N;
+        let mut bias = INITIAL_BIAS;
+        let mut i = 0;
+        let mut iter = input.bytes();
         loop {
-            let digit = match byte {
-                byte @ b'0'..=b'9' => byte - b'0' + 26,
-                byte @ b'A'..=b'Z' => byte - b'A',
-                byte @ b'a'..=b'z' => byte - b'a',
-                _ => return None,
-            } as u32;
-            if digit > (u32::MAX - i) / weight {
-                return None; // Overflow
-            }
-            i += digit * weight;
-            let t = if k <= bias {
-                T_MIN
-            } else if k >= bias + T_MAX {
-                T_MAX
-            } else {
-                k - bias
+            let previous_i = i;
+            let mut weight = 1;
+            let mut k = BASE;
+            let mut byte = match iter.next() {
+                None => break,
+                Some(byte) => byte,
             };
-            if digit < t {
-                break;
+
+            // Decode a generalized variable-length integer into delta,
+            // which gets added to i.
+            loop {
+                let digit = match byte {
+                    byte @ b'0'..=b'9' => byte - b'0' + 26,
+                    byte @ b'A'..=b'Z' => byte - b'A',
+                    byte @ b'a'..=b'z' => byte - b'a',
+                    _ => return Err(()),
+                } as u32;
+                if digit > (u32::MAX - i) / weight {
+                    return Err(()); // Overflow
+                }
+                i += digit * weight;
+                let t = if k <= bias {
+                    T_MIN
+                } else if k >= bias + T_MAX {
+                    T_MAX
+                } else {
+                    k - bias
+                };
+                if digit < t {
+                    break;
+                }
+                if weight > u32::MAX / (BASE - t) {
+                    return Err(()); // Overflow
+                }
+                weight *= BASE - t;
+                k += BASE;
+                byte = match iter.next() {
+                    None => return Err(()), // End of input before the end of this delta
+                    Some(byte) => byte,
+                };
             }
-            if weight > u32::MAX / (BASE - t) {
-                return None; // Overflow
+
+            bias = adapt(i - previous_i, length + 1, previous_i == 0);
+            if i / (length + 1) > u32::MAX - code_point {
+                return Err(()); // Overflow
             }
-            weight *= BASE - t;
-            k += BASE;
-            byte = match iter.next() {
-                None => return None, // End of input before the end of this delta
-                Some(byte) => byte,
+
+            // i was supposed to wrap around from length+1 to 0,
+            // incrementing code_point each time.
+            code_point += i / (length + 1);
+            i %= length + 1;
+            let c = match char::from_u32(code_point) {
+                Some(c) => c,
+                None => return Err(()),
             };
+
+            // Move earlier insertions farther out in the string
+            for (idx, _) in &mut self.insertions {
+                if *idx >= i as usize {
+                    *idx += 1;
+                }
+            }
+            self.insertions.push((i as usize, c));
+            length += 1;
+            i += 1;
         }
-        let length = output.len() as u32;
-        bias = adapt(i - previous_i, length + 1, previous_i == 0);
-        if i / (length + 1) > u32::MAX - code_point {
-            return None; // Overflow
-        }
-        // i was supposed to wrap around from length+1 to 0,
-        // incrementing code_point each time.
-        code_point += i / (length + 1);
-        i %= length + 1;
-        let c = match char::from_u32(code_point) {
-            Some(c) => c,
-            None => return None,
-        };
-        output.insert(i as usize, c);
-        i += 1;
+
+        self.insertions.sort_by_key(|(i, _)| *i);
+        Ok(Decode {
+            base: base.chars(),
+            insertions: &self.insertions,
+            inserted: 0,
+            position: 0,
+            len: base_len + self.insertions.len(),
+        })
+    }
+}
+
+pub(crate) struct Decode<'a> {
+    base: std::str::Chars<'a>,
+    pub(crate) insertions: &'a [(usize, char)],
+    inserted: usize,
+    position: usize,
+    len: usize,
+}
+
+impl<'a> Iterator for Decode<'a> {
+    type Item = char;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        loop {
+            match self.insertions.get(self.inserted) {
+                Some((pos, c)) if *pos == self.position => {
+                    self.inserted += 1;
+                    self.position += 1;
+                    return Some(*c);
+                }
+                _ => {}
+            }
+            if let Some(c) = self.base.next() {
+                self.position += 1;
+                return Some(c);
+            } else if self.inserted >= self.insertions.len() {
+                return None;
+            }
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.len - self.position;
+        (len, Some(len))
+    }
+}
+
+impl<'a> ExactSizeIterator for Decode<'a> {
+    fn len(&self) -> usize {
+        self.len - self.position
     }
-    Some(output)
 }
 
 /// Convert an Unicode `str` to Punycode.
@@ -134,7 +214,8 @@
 /// This is a convenience wrapper around `encode`.
 #[inline]
 pub fn encode_str(input: &str) -> Option<String> {
-    encode(&input.chars().collect::<Vec<char>>())
+    let mut buf = String::with_capacity(input.len());
+    encode_into(input.chars(), &mut buf).ok().map(|()| buf)
 }
 
 /// Convert Unicode to Punycode.
@@ -142,42 +223,54 @@
 /// Return None on overflow, which can only happen on inputs that would take more than
 /// 63 encoded bytes, the DNS limit on domain name labels.
 pub fn encode(input: &[char]) -> Option<String> {
+    let mut buf = String::with_capacity(input.len());
+    encode_into(input.iter().copied(), &mut buf)
+        .ok()
+        .map(|()| buf)
+}
+
+pub(crate) fn encode_into<I>(input: I, output: &mut String) -> Result<(), ()>
+where
+    I: Iterator<Item = char> + Clone,
+{
     // Handle "basic" (ASCII) code points. They are encoded as-is.
-    let output_bytes = input
-        .iter()
-        .filter_map(|&c| if c.is_ascii() { Some(c as u8) } else { None })
-        .collect();
-    let mut output = unsafe { String::from_utf8_unchecked(output_bytes) };
-    let basic_length = output.len() as u32;
+    let (mut input_length, mut basic_length) = (0, 0);
+    for c in input.clone() {
+        input_length += 1;
+        if c.is_ascii() {
+            output.push(c);
+            basic_length += 1;
+        }
+    }
+
     if basic_length > 0 {
-        output.push_str("-")
+        output.push('-')
     }
     let mut code_point = INITIAL_N;
     let mut delta = 0;
     let mut bias = INITIAL_BIAS;
     let mut processed = basic_length;
-    let input_length = input.len() as u32;
     while processed < input_length {
         // All code points < code_point have been handled already.
         // Find the next larger one.
         let min_code_point = input
-            .iter()
-            .map(|&c| c as u32)
+            .clone()
+            .map(|c| c as u32)
             .filter(|&c| c >= code_point)
             .min()
             .unwrap();
         if min_code_point - code_point > (u32::MAX - delta) / (processed + 1) {
-            return None; // Overflow
+            return Err(()); // Overflow
         }
         // Increase delta to advance the decoder’s <code_point,i> state to <min_code_point,0>
         delta += (min_code_point - code_point) * (processed + 1);
         code_point = min_code_point;
-        for &c in input {
+        for c in input.clone() {
             let c = c as u32;
             if c < code_point {
                 delta += 1;
                 if delta == 0 {
-                    return None; // Overflow
+                    return Err(()); // Overflow
                 }
             }
             if c == code_point {
@@ -209,14 +302,14 @@
         delta += 1;
         code_point += 1;
     }
-    Some(output)
+    Ok(())
 }
 
 #[inline]
 fn value_to_digit(value: u32) -> char {
     match value {
-        0..=25 => (value as u8 + 'a' as u8) as char, // a..z
-        26..=35 => (value as u8 - 26 + '0' as u8) as char, // 0..9
+        0..=25 => (value as u8 + b'a') as char,       // a..z
+        26..=35 => (value as u8 - 26 + b'0') as char, // 0..9
         _ => panic!(),
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/uts46_mapping_table.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/uts46_mapping_table.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/uts46_mapping_table.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/uts46_mapping_table.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-// Copyright 2013-2014 The rust-url developers.
+// Copyright 2013-2020 The rust-url developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -8,3169 +8,1892 @@
 
 // Generated by make_idna_table.py
 
-static TABLE: &'static [Range] = &[
-    Range { from: '\u{0}', to: '\u{2c}', },
-    Range { from: '\u{2d}', to: '\u{2e}', },
-    Range { from: '\u{2f}', to: '\u{2f}', },
-    Range { from: '\u{30}', to: '\u{39}', },
-    Range { from: '\u{3a}', to: '\u{40}', },
-    Range { from: '\u{41}', to: '\u{5a}', },
-    Range { from: '\u{5b}', to: '\u{60}', },
-    Range { from: '\u{61}', to: '\u{7a}', },
-    Range { from: '\u{7b}', to: '\u{7f}', },
-    Range { from: '\u{80}', to: '\u{9f}', },
-    Range { from: '\u{a0}', to: '\u{a0}', },
-    Range { from: '\u{a1}', to: '\u{a7}', },
-    Range { from: '\u{a8}', to: '\u{aa}', },
-    Range { from: '\u{ab}', to: '\u{ac}', },
-    Range { from: '\u{ad}', to: '\u{af}', },
-    Range { from: '\u{b0}', to: '\u{b1}', },
-    Range { from: '\u{b2}', to: '\u{b5}', },
-    Range { from: '\u{b6}', to: '\u{b7}', },
-    Range { from: '\u{b8}', to: '\u{df}', },
-    Range { from: '\u{e0}', to: '\u{ff}', },
-    Range { from: '\u{100}', to: '\u{131}', },
-    Range { from: '\u{132}', to: '\u{133}', },
-    Range { from: '\u{134}', to: '\u{136}', },
-    Range { from: '\u{137}', to: '\u{138}', },
-    Range { from: '\u{139}', to: '\u{13e}', },
-    Range { from: '\u{13f}', to: '\u{140}', },
-    Range { from: '\u{141}', to: '\u{18b}', },
-    Range { from: '\u{18c}', to: '\u{18d}', },
-    Range { from: '\u{18e}', to: '\u{198}', },
-    Range { from: '\u{199}', to: '\u{19b}', },
-    Range { from: '\u{19c}', to: '\u{1a9}', },
-    Range { from: '\u{1aa}', to: '\u{1ab}', },
-    Range { from: '\u{1ac}', to: '\u{1b8}', },
-    Range { from: '\u{1b9}', to: '\u{1bb}', },
-    Range { from: '\u{1bc}', to: '\u{1bc}', },
-    Range { from: '\u{1bd}', to: '\u{1c3}', },
-    Range { from: '\u{1c4}', to: '\u{1c6}', },
-    Range { from: '\u{1c7}', to: '\u{1c9}', },
-    Range { from: '\u{1ca}', to: '\u{1cc}', },
-    Range { from: '\u{1cd}', to: '\u{1db}', },
-    Range { from: '\u{1dc}', to: '\u{1dd}', },
-    Range { from: '\u{1de}', to: '\u{1ee}', },
-    Range { from: '\u{1ef}', to: '\u{1f0}', },
-    Range { from: '\u{1f1}', to: '\u{1f3}', },
-    Range { from: '\u{1f4}', to: '\u{232}', },
-    Range { from: '\u{233}', to: '\u{239}', },
-    Range { from: '\u{23a}', to: '\u{23e}', },
-    Range { from: '\u{23f}', to: '\u{240}', },
-    Range { from: '\u{241}', to: '\u{24e}', },
-    Range { from: '\u{24f}', to: '\u{2af}', },
-    Range { from: '\u{2b0}', to: '\u{2b8}', },
-    Range { from: '\u{2b9}', to: '\u{2d7}', },
-    Range { from: '\u{2d8}', to: '\u{2dd}', },
-    Range { from: '\u{2de}', to: '\u{2df}', },
-    Range { from: '\u{2e0}', to: '\u{2e4}', },
-    Range { from: '\u{2e5}', to: '\u{33f}', },
-    Range { from: '\u{340}', to: '\u{345}', },
-    Range { from: '\u{346}', to: '\u{34e}', },
-    Range { from: '\u{34f}', to: '\u{34f}', },
-    Range { from: '\u{350}', to: '\u{36f}', },
-    Range { from: '\u{370}', to: '\u{377}', },
-    Range { from: '\u{378}', to: '\u{379}', },
-    Range { from: '\u{37a}', to: '\u{37a}', },
-    Range { from: '\u{37b}', to: '\u{37d}', },
-    Range { from: '\u{37e}', to: '\u{37f}', },
-    Range { from: '\u{380}', to: '\u{383}', },
-    Range { from: '\u{384}', to: '\u{3ab}', },
-    Range { from: '\u{3ac}', to: '\u{3c1}', },
-    Range { from: '\u{3c2}', to: '\u{3c2}', },
-    Range { from: '\u{3c3}', to: '\u{3ce}', },
-    Range { from: '\u{3cf}', to: '\u{3fa}', },
-    Range { from: '\u{3fb}', to: '\u{3fc}', },
-    Range { from: '\u{3fd}', to: '\u{42f}', },
-    Range { from: '\u{430}', to: '\u{45f}', },
-    Range { from: '\u{460}', to: '\u{480}', },
-    Range { from: '\u{481}', to: '\u{489}', },
-    Range { from: '\u{48a}', to: '\u{4cd}', },
-    Range { from: '\u{4ce}', to: '\u{4cf}', },
-    Range { from: '\u{4d0}', to: '\u{556}', },
-    Range { from: '\u{557}', to: '\u{558}', },
-    Range { from: '\u{559}', to: '\u{55f}', },
-    Range { from: '\u{560}', to: '\u{560}', },
-    Range { from: '\u{561}', to: '\u{586}', },
-    Range { from: '\u{587}', to: '\u{588}', },
-    Range { from: '\u{589}', to: '\u{58a}', },
-    Range { from: '\u{58b}', to: '\u{58c}', },
-    Range { from: '\u{58d}', to: '\u{58f}', },
-    Range { from: '\u{590}', to: '\u{590}', },
-    Range { from: '\u{591}', to: '\u{5c7}', },
-    Range { from: '\u{5c8}', to: '\u{5cf}', },
-    Range { from: '\u{5d0}', to: '\u{5ea}', },
-    Range { from: '\u{5eb}', to: '\u{5ef}', },
-    Range { from: '\u{5f0}', to: '\u{5f4}', },
-    Range { from: '\u{5f5}', to: '\u{605}', },
-    Range { from: '\u{606}', to: '\u{61b}', },
-    Range { from: '\u{61c}', to: '\u{61d}', },
-    Range { from: '\u{61e}', to: '\u{674}', },
-    Range { from: '\u{675}', to: '\u{678}', },
-    Range { from: '\u{679}', to: '\u{6dc}', },
-    Range { from: '\u{6dd}', to: '\u{6dd}', },
-    Range { from: '\u{6de}', to: '\u{70d}', },
-    Range { from: '\u{70e}', to: '\u{70f}', },
-    Range { from: '\u{710}', to: '\u{74a}', },
-    Range { from: '\u{74b}', to: '\u{74c}', },
-    Range { from: '\u{74d}', to: '\u{7b1}', },
-    Range { from: '\u{7b2}', to: '\u{7bf}', },
-    Range { from: '\u{7c0}', to: '\u{7fa}', },
-    Range { from: '\u{7fb}', to: '\u{7ff}', },
-    Range { from: '\u{800}', to: '\u{82d}', },
-    Range { from: '\u{82e}', to: '\u{82f}', },
-    Range { from: '\u{830}', to: '\u{83e}', },
-    Range { from: '\u{83f}', to: '\u{83f}', },
-    Range { from: '\u{840}', to: '\u{85b}', },
-    Range { from: '\u{85c}', to: '\u{85d}', },
-    Range { from: '\u{85e}', to: '\u{85f}', },
-    Range { from: '\u{860}', to: '\u{86a}', },
-    Range { from: '\u{86b}', to: '\u{89f}', },
-    Range { from: '\u{8a0}', to: '\u{8b4}', },
-    Range { from: '\u{8b5}', to: '\u{8b5}', },
-    Range { from: '\u{8b6}', to: '\u{8bd}', },
-    Range { from: '\u{8be}', to: '\u{8d3}', },
-    Range { from: '\u{8d4}', to: '\u{8e1}', },
-    Range { from: '\u{8e2}', to: '\u{8e2}', },
-    Range { from: '\u{8e3}', to: '\u{957}', },
-    Range { from: '\u{958}', to: '\u{95f}', },
-    Range { from: '\u{960}', to: '\u{983}', },
-    Range { from: '\u{984}', to: '\u{984}', },
-    Range { from: '\u{985}', to: '\u{98c}', },
-    Range { from: '\u{98d}', to: '\u{98e}', },
-    Range { from: '\u{98f}', to: '\u{990}', },
-    Range { from: '\u{991}', to: '\u{992}', },
-    Range { from: '\u{993}', to: '\u{9a8}', },
-    Range { from: '\u{9a9}', to: '\u{9a9}', },
-    Range { from: '\u{9aa}', to: '\u{9b0}', },
-    Range { from: '\u{9b1}', to: '\u{9b2}', },
-    Range { from: '\u{9b3}', to: '\u{9b5}', },
-    Range { from: '\u{9b6}', to: '\u{9b9}', },
-    Range { from: '\u{9ba}', to: '\u{9bb}', },
-    Range { from: '\u{9bc}', to: '\u{9c4}', },
-    Range { from: '\u{9c5}', to: '\u{9c6}', },
-    Range { from: '\u{9c7}', to: '\u{9c8}', },
-    Range { from: '\u{9c9}', to: '\u{9ca}', },
-    Range { from: '\u{9cb}', to: '\u{9ce}', },
-    Range { from: '\u{9cf}', to: '\u{9d6}', },
-    Range { from: '\u{9d7}', to: '\u{9d7}', },
-    Range { from: '\u{9d8}', to: '\u{9db}', },
-    Range { from: '\u{9dc}', to: '\u{9df}', },
-    Range { from: '\u{9e0}', to: '\u{9e3}', },
-    Range { from: '\u{9e4}', to: '\u{9e5}', },
-    Range { from: '\u{9e6}', to: '\u{9fd}', },
-    Range { from: '\u{9fe}', to: '\u{a00}', },
-    Range { from: '\u{a01}', to: '\u{a03}', },
-    Range { from: '\u{a04}', to: '\u{a04}', },
-    Range { from: '\u{a05}', to: '\u{a0a}', },
-    Range { from: '\u{a0b}', to: '\u{a0e}', },
-    Range { from: '\u{a0f}', to: '\u{a10}', },
-    Range { from: '\u{a11}', to: '\u{a12}', },
-    Range { from: '\u{a13}', to: '\u{a28}', },
-    Range { from: '\u{a29}', to: '\u{a29}', },
-    Range { from: '\u{a2a}', to: '\u{a30}', },
-    Range { from: '\u{a31}', to: '\u{a37}', },
-    Range { from: '\u{a38}', to: '\u{a39}', },
-    Range { from: '\u{a3a}', to: '\u{a3b}', },
-    Range { from: '\u{a3c}', to: '\u{a3d}', },
-    Range { from: '\u{a3e}', to: '\u{a42}', },
-    Range { from: '\u{a43}', to: '\u{a46}', },
-    Range { from: '\u{a47}', to: '\u{a48}', },
-    Range { from: '\u{a49}', to: '\u{a4a}', },
-    Range { from: '\u{a4b}', to: '\u{a4d}', },
-    Range { from: '\u{a4e}', to: '\u{a50}', },
-    Range { from: '\u{a51}', to: '\u{a51}', },
-    Range { from: '\u{a52}', to: '\u{a58}', },
-    Range { from: '\u{a59}', to: '\u{a5e}', },
-    Range { from: '\u{a5f}', to: '\u{a65}', },
-    Range { from: '\u{a66}', to: '\u{a75}', },
-    Range { from: '\u{a76}', to: '\u{a80}', },
-    Range { from: '\u{a81}', to: '\u{a83}', },
-    Range { from: '\u{a84}', to: '\u{a84}', },
-    Range { from: '\u{a85}', to: '\u{a8d}', },
-    Range { from: '\u{a8e}', to: '\u{a8e}', },
-    Range { from: '\u{a8f}', to: '\u{a91}', },
-    Range { from: '\u{a92}', to: '\u{a92}', },
-    Range { from: '\u{a93}', to: '\u{aa8}', },
-    Range { from: '\u{aa9}', to: '\u{aa9}', },
-    Range { from: '\u{aaa}', to: '\u{ab0}', },
-    Range { from: '\u{ab1}', to: '\u{ab1}', },
-    Range { from: '\u{ab2}', to: '\u{ab3}', },
-    Range { from: '\u{ab4}', to: '\u{ab4}', },
-    Range { from: '\u{ab5}', to: '\u{ab9}', },
-    Range { from: '\u{aba}', to: '\u{abb}', },
-    Range { from: '\u{abc}', to: '\u{ac5}', },
-    Range { from: '\u{ac6}', to: '\u{ac6}', },
-    Range { from: '\u{ac7}', to: '\u{ac9}', },
-    Range { from: '\u{aca}', to: '\u{aca}', },
-    Range { from: '\u{acb}', to: '\u{acd}', },
-    Range { from: '\u{ace}', to: '\u{acf}', },
-    Range { from: '\u{ad0}', to: '\u{ad0}', },
-    Range { from: '\u{ad1}', to: '\u{adf}', },
-    Range { from: '\u{ae0}', to: '\u{ae3}', },
-    Range { from: '\u{ae4}', to: '\u{ae5}', },
-    Range { from: '\u{ae6}', to: '\u{af1}', },
-    Range { from: '\u{af2}', to: '\u{af8}', },
-    Range { from: '\u{af9}', to: '\u{aff}', },
-    Range { from: '\u{b00}', to: '\u{b00}', },
-    Range { from: '\u{b01}', to: '\u{b03}', },
-    Range { from: '\u{b04}', to: '\u{b04}', },
-    Range { from: '\u{b05}', to: '\u{b0c}', },
-    Range { from: '\u{b0d}', to: '\u{b0e}', },
-    Range { from: '\u{b0f}', to: '\u{b10}', },
-    Range { from: '\u{b11}', to: '\u{b12}', },
-    Range { from: '\u{b13}', to: '\u{b28}', },
-    Range { from: '\u{b29}', to: '\u{b29}', },
-    Range { from: '\u{b2a}', to: '\u{b30}', },
-    Range { from: '\u{b31}', to: '\u{b31}', },
-    Range { from: '\u{b32}', to: '\u{b33}', },
-    Range { from: '\u{b34}', to: '\u{b34}', },
-    Range { from: '\u{b35}', to: '\u{b39}', },
-    Range { from: '\u{b3a}', to: '\u{b3b}', },
-    Range { from: '\u{b3c}', to: '\u{b44}', },
-    Range { from: '\u{b45}', to: '\u{b46}', },
-    Range { from: '\u{b47}', to: '\u{b48}', },
-    Range { from: '\u{b49}', to: '\u{b4a}', },
-    Range { from: '\u{b4b}', to: '\u{b4d}', },
-    Range { from: '\u{b4e}', to: '\u{b55}', },
-    Range { from: '\u{b56}', to: '\u{b57}', },
-    Range { from: '\u{b58}', to: '\u{b5b}', },
-    Range { from: '\u{b5c}', to: '\u{b5e}', },
-    Range { from: '\u{b5f}', to: '\u{b63}', },
-    Range { from: '\u{b64}', to: '\u{b65}', },
-    Range { from: '\u{b66}', to: '\u{b77}', },
-    Range { from: '\u{b78}', to: '\u{b81}', },
-    Range { from: '\u{b82}', to: '\u{b83}', },
-    Range { from: '\u{b84}', to: '\u{b84}', },
-    Range { from: '\u{b85}', to: '\u{b8a}', },
-    Range { from: '\u{b8b}', to: '\u{b8d}', },
-    Range { from: '\u{b8e}', to: '\u{b90}', },
-    Range { from: '\u{b91}', to: '\u{b91}', },
-    Range { from: '\u{b92}', to: '\u{b95}', },
-    Range { from: '\u{b96}', to: '\u{b98}', },
-    Range { from: '\u{b99}', to: '\u{b9a}', },
-    Range { from: '\u{b9b}', to: '\u{b9d}', },
-    Range { from: '\u{b9e}', to: '\u{b9f}', },
-    Range { from: '\u{ba0}', to: '\u{ba2}', },
-    Range { from: '\u{ba3}', to: '\u{ba4}', },
-    Range { from: '\u{ba5}', to: '\u{ba7}', },
-    Range { from: '\u{ba8}', to: '\u{baa}', },
-    Range { from: '\u{bab}', to: '\u{bad}', },
-    Range { from: '\u{bae}', to: '\u{bb9}', },
-    Range { from: '\u{bba}', to: '\u{bbd}', },
-    Range { from: '\u{bbe}', to: '\u{bc2}', },
-    Range { from: '\u{bc3}', to: '\u{bc5}', },
-    Range { from: '\u{bc6}', to: '\u{bc8}', },
-    Range { from: '\u{bc9}', to: '\u{bc9}', },
-    Range { from: '\u{bca}', to: '\u{bcd}', },
-    Range { from: '\u{bce}', to: '\u{bcf}', },
-    Range { from: '\u{bd0}', to: '\u{bd0}', },
-    Range { from: '\u{bd1}', to: '\u{bd6}', },
-    Range { from: '\u{bd7}', to: '\u{bd7}', },
-    Range { from: '\u{bd8}', to: '\u{be5}', },
-    Range { from: '\u{be6}', to: '\u{bfa}', },
-    Range { from: '\u{bfb}', to: '\u{bff}', },
-    Range { from: '\u{c00}', to: '\u{c03}', },
-    Range { from: '\u{c04}', to: '\u{c04}', },
-    Range { from: '\u{c05}', to: '\u{c0c}', },
-    Range { from: '\u{c0d}', to: '\u{c0d}', },
-    Range { from: '\u{c0e}', to: '\u{c10}', },
-    Range { from: '\u{c11}', to: '\u{c11}', },
-    Range { from: '\u{c12}', to: '\u{c28}', },
-    Range { from: '\u{c29}', to: '\u{c29}', },
-    Range { from: '\u{c2a}', to: '\u{c39}', },
-    Range { from: '\u{c3a}', to: '\u{c3c}', },
-    Range { from: '\u{c3d}', to: '\u{c44}', },
-    Range { from: '\u{c45}', to: '\u{c45}', },
-    Range { from: '\u{c46}', to: '\u{c48}', },
-    Range { from: '\u{c49}', to: '\u{c49}', },
-    Range { from: '\u{c4a}', to: '\u{c4d}', },
-    Range { from: '\u{c4e}', to: '\u{c54}', },
-    Range { from: '\u{c55}', to: '\u{c56}', },
-    Range { from: '\u{c57}', to: '\u{c57}', },
-    Range { from: '\u{c58}', to: '\u{c5a}', },
-    Range { from: '\u{c5b}', to: '\u{c5f}', },
-    Range { from: '\u{c60}', to: '\u{c63}', },
-    Range { from: '\u{c64}', to: '\u{c65}', },
-    Range { from: '\u{c66}', to: '\u{c6f}', },
-    Range { from: '\u{c70}', to: '\u{c77}', },
-    Range { from: '\u{c78}', to: '\u{c83}', },
-    Range { from: '\u{c84}', to: '\u{c84}', },
-    Range { from: '\u{c85}', to: '\u{c8c}', },
-    Range { from: '\u{c8d}', to: '\u{c8d}', },
-    Range { from: '\u{c8e}', to: '\u{c90}', },
-    Range { from: '\u{c91}', to: '\u{c91}', },
-    Range { from: '\u{c92}', to: '\u{ca8}', },
-    Range { from: '\u{ca9}', to: '\u{ca9}', },
-    Range { from: '\u{caa}', to: '\u{cb3}', },
-    Range { from: '\u{cb4}', to: '\u{cb4}', },
-    Range { from: '\u{cb5}', to: '\u{cb9}', },
-    Range { from: '\u{cba}', to: '\u{cbb}', },
-    Range { from: '\u{cbc}', to: '\u{cc4}', },
-    Range { from: '\u{cc5}', to: '\u{cc5}', },
-    Range { from: '\u{cc6}', to: '\u{cc8}', },
-    Range { from: '\u{cc9}', to: '\u{cc9}', },
-    Range { from: '\u{cca}', to: '\u{ccd}', },
-    Range { from: '\u{cce}', to: '\u{cd4}', },
-    Range { from: '\u{cd5}', to: '\u{cd6}', },
-    Range { from: '\u{cd7}', to: '\u{cdd}', },
-    Range { from: '\u{cde}', to: '\u{cdf}', },
-    Range { from: '\u{ce0}', to: '\u{ce3}', },
-    Range { from: '\u{ce4}', to: '\u{ce5}', },
-    Range { from: '\u{ce6}', to: '\u{cef}', },
-    Range { from: '\u{cf0}', to: '\u{cf0}', },
-    Range { from: '\u{cf1}', to: '\u{cf2}', },
-    Range { from: '\u{cf3}', to: '\u{cff}', },
-    Range { from: '\u{d00}', to: '\u{d03}', },
-    Range { from: '\u{d04}', to: '\u{d04}', },
-    Range { from: '\u{d05}', to: '\u{d0c}', },
-    Range { from: '\u{d0d}', to: '\u{d0d}', },
-    Range { from: '\u{d0e}', to: '\u{d10}', },
-    Range { from: '\u{d11}', to: '\u{d11}', },
-    Range { from: '\u{d12}', to: '\u{d44}', },
-    Range { from: '\u{d45}', to: '\u{d45}', },
-    Range { from: '\u{d46}', to: '\u{d48}', },
-    Range { from: '\u{d49}', to: '\u{d49}', },
-    Range { from: '\u{d4a}', to: '\u{d4f}', },
-    Range { from: '\u{d50}', to: '\u{d53}', },
-    Range { from: '\u{d54}', to: '\u{d63}', },
-    Range { from: '\u{d64}', to: '\u{d65}', },
-    Range { from: '\u{d66}', to: '\u{d7f}', },
-    Range { from: '\u{d80}', to: '\u{d81}', },
-    Range { from: '\u{d82}', to: '\u{d83}', },
-    Range { from: '\u{d84}', to: '\u{d84}', },
-    Range { from: '\u{d85}', to: '\u{d96}', },
-    Range { from: '\u{d97}', to: '\u{d99}', },
-    Range { from: '\u{d9a}', to: '\u{db1}', },
-    Range { from: '\u{db2}', to: '\u{db2}', },
-    Range { from: '\u{db3}', to: '\u{dbb}', },
-    Range { from: '\u{dbc}', to: '\u{dbd}', },
-    Range { from: '\u{dbe}', to: '\u{dbf}', },
-    Range { from: '\u{dc0}', to: '\u{dc6}', },
-    Range { from: '\u{dc7}', to: '\u{dc9}', },
-    Range { from: '\u{dca}', to: '\u{dca}', },
-    Range { from: '\u{dcb}', to: '\u{dce}', },
-    Range { from: '\u{dcf}', to: '\u{dd4}', },
-    Range { from: '\u{dd5}', to: '\u{dd7}', },
-    Range { from: '\u{dd8}', to: '\u{ddf}', },
-    Range { from: '\u{de0}', to: '\u{de5}', },
-    Range { from: '\u{de6}', to: '\u{def}', },
-    Range { from: '\u{df0}', to: '\u{df1}', },
-    Range { from: '\u{df2}', to: '\u{df4}', },
-    Range { from: '\u{df5}', to: '\u{e00}', },
-    Range { from: '\u{e01}', to: '\u{e32}', },
-    Range { from: '\u{e33}', to: '\u{e33}', },
-    Range { from: '\u{e34}', to: '\u{e3a}', },
-    Range { from: '\u{e3b}', to: '\u{e3e}', },
-    Range { from: '\u{e3f}', to: '\u{e5b}', },
-    Range { from: '\u{e5c}', to: '\u{e80}', },
-    Range { from: '\u{e81}', to: '\u{e82}', },
-    Range { from: '\u{e83}', to: '\u{e84}', },
-    Range { from: '\u{e85}', to: '\u{e86}', },
-    Range { from: '\u{e87}', to: '\u{e88}', },
-    Range { from: '\u{e89}', to: '\u{e8a}', },
-    Range { from: '\u{e8b}', to: '\u{e8c}', },
-    Range { from: '\u{e8d}', to: '\u{e8d}', },
-    Range { from: '\u{e8e}', to: '\u{e93}', },
-    Range { from: '\u{e94}', to: '\u{e97}', },
-    Range { from: '\u{e98}', to: '\u{e98}', },
-    Range { from: '\u{e99}', to: '\u{e9f}', },
-    Range { from: '\u{ea0}', to: '\u{ea0}', },
-    Range { from: '\u{ea1}', to: '\u{ea3}', },
-    Range { from: '\u{ea4}', to: '\u{ea7}', },
-    Range { from: '\u{ea8}', to: '\u{ea9}', },
-    Range { from: '\u{eaa}', to: '\u{eab}', },
-    Range { from: '\u{eac}', to: '\u{eac}', },
-    Range { from: '\u{ead}', to: '\u{eb2}', },
-    Range { from: '\u{eb3}', to: '\u{eb3}', },
-    Range { from: '\u{eb4}', to: '\u{eb9}', },
-    Range { from: '\u{eba}', to: '\u{eba}', },
-    Range { from: '\u{ebb}', to: '\u{ebd}', },
-    Range { from: '\u{ebe}', to: '\u{ebf}', },
-    Range { from: '\u{ec0}', to: '\u{ec4}', },
-    Range { from: '\u{ec5}', to: '\u{ec7}', },
-    Range { from: '\u{ec8}', to: '\u{ecd}', },
-    Range { from: '\u{ece}', to: '\u{ecf}', },
-    Range { from: '\u{ed0}', to: '\u{ed9}', },
-    Range { from: '\u{eda}', to: '\u{edb}', },
-    Range { from: '\u{edc}', to: '\u{edd}', },
-    Range { from: '\u{ede}', to: '\u{edf}', },
-    Range { from: '\u{ee0}', to: '\u{eff}', },
-    Range { from: '\u{f00}', to: '\u{f0b}', },
-    Range { from: '\u{f0c}', to: '\u{f0c}', },
-    Range { from: '\u{f0d}', to: '\u{f42}', },
-    Range { from: '\u{f43}', to: '\u{f43}', },
-    Range { from: '\u{f44}', to: '\u{f47}', },
-    Range { from: '\u{f48}', to: '\u{f48}', },
-    Range { from: '\u{f49}', to: '\u{f4c}', },
-    Range { from: '\u{f4d}', to: '\u{f4d}', },
-    Range { from: '\u{f4e}', to: '\u{f51}', },
-    Range { from: '\u{f52}', to: '\u{f52}', },
-    Range { from: '\u{f53}', to: '\u{f56}', },
-    Range { from: '\u{f57}', to: '\u{f57}', },
-    Range { from: '\u{f58}', to: '\u{f5b}', },
-    Range { from: '\u{f5c}', to: '\u{f5c}', },
-    Range { from: '\u{f5d}', to: '\u{f68}', },
-    Range { from: '\u{f69}', to: '\u{f69}', },
-    Range { from: '\u{f6a}', to: '\u{f6c}', },
-    Range { from: '\u{f6d}', to: '\u{f70}', },
-    Range { from: '\u{f71}', to: '\u{f72}', },
-    Range { from: '\u{f73}', to: '\u{f79}', },
-    Range { from: '\u{f7a}', to: '\u{f80}', },
-    Range { from: '\u{f81}', to: '\u{f81}', },
-    Range { from: '\u{f82}', to: '\u{f92}', },
-    Range { from: '\u{f93}', to: '\u{f93}', },
-    Range { from: '\u{f94}', to: '\u{f97}', },
-    Range { from: '\u{f98}', to: '\u{f98}', },
-    Range { from: '\u{f99}', to: '\u{f9c}', },
-    Range { from: '\u{f9d}', to: '\u{f9d}', },
-    Range { from: '\u{f9e}', to: '\u{fa1}', },
-    Range { from: '\u{fa2}', to: '\u{fa2}', },
-    Range { from: '\u{fa3}', to: '\u{fa6}', },
-    Range { from: '\u{fa7}', to: '\u{fa7}', },
-    Range { from: '\u{fa8}', to: '\u{fab}', },
-    Range { from: '\u{fac}', to: '\u{fac}', },
-    Range { from: '\u{fad}', to: '\u{fb8}', },
-    Range { from: '\u{fb9}', to: '\u{fb9}', },
-    Range { from: '\u{fba}', to: '\u{fbc}', },
-    Range { from: '\u{fbd}', to: '\u{fbd}', },
-    Range { from: '\u{fbe}', to: '\u{fcc}', },
-    Range { from: '\u{fcd}', to: '\u{fcd}', },
-    Range { from: '\u{fce}', to: '\u{fda}', },
-    Range { from: '\u{fdb}', to: '\u{fff}', },
-    Range { from: '\u{1000}', to: '\u{109f}', },
-    Range { from: '\u{10a0}', to: '\u{10c6}', },
-    Range { from: '\u{10c7}', to: '\u{10c7}', },
-    Range { from: '\u{10c8}', to: '\u{10cc}', },
-    Range { from: '\u{10cd}', to: '\u{10cd}', },
-    Range { from: '\u{10ce}', to: '\u{10cf}', },
-    Range { from: '\u{10d0}', to: '\u{10fb}', },
-    Range { from: '\u{10fc}', to: '\u{10fc}', },
-    Range { from: '\u{10fd}', to: '\u{115e}', },
-    Range { from: '\u{115f}', to: '\u{1160}', },
-    Range { from: '\u{1161}', to: '\u{1248}', },
-    Range { from: '\u{1249}', to: '\u{1249}', },
-    Range { from: '\u{124a}', to: '\u{124d}', },
-    Range { from: '\u{124e}', to: '\u{124f}', },
-    Range { from: '\u{1250}', to: '\u{1256}', },
-    Range { from: '\u{1257}', to: '\u{1259}', },
-    Range { from: '\u{125a}', to: '\u{125d}', },
-    Range { from: '\u{125e}', to: '\u{125f}', },
-    Range { from: '\u{1260}', to: '\u{1288}', },
-    Range { from: '\u{1289}', to: '\u{1289}', },
-    Range { from: '\u{128a}', to: '\u{128d}', },
-    Range { from: '\u{128e}', to: '\u{128f}', },
-    Range { from: '\u{1290}', to: '\u{12b0}', },
-    Range { from: '\u{12b1}', to: '\u{12b1}', },
-    Range { from: '\u{12b2}', to: '\u{12b5}', },
-    Range { from: '\u{12b6}', to: '\u{12b7}', },
-    Range { from: '\u{12b8}', to: '\u{12be}', },
-    Range { from: '\u{12bf}', to: '\u{12c1}', },
-    Range { from: '\u{12c2}', to: '\u{12c5}', },
-    Range { from: '\u{12c6}', to: '\u{12c7}', },
-    Range { from: '\u{12c8}', to: '\u{12d6}', },
-    Range { from: '\u{12d7}', to: '\u{12d7}', },
-    Range { from: '\u{12d8}', to: '\u{1310}', },
-    Range { from: '\u{1311}', to: '\u{1311}', },
-    Range { from: '\u{1312}', to: '\u{1315}', },
-    Range { from: '\u{1316}', to: '\u{1317}', },
-    Range { from: '\u{1318}', to: '\u{135a}', },
-    Range { from: '\u{135b}', to: '\u{135c}', },
-    Range { from: '\u{135d}', to: '\u{137c}', },
-    Range { from: '\u{137d}', to: '\u{137f}', },
-    Range { from: '\u{1380}', to: '\u{1399}', },
-    Range { from: '\u{139a}', to: '\u{139f}', },
-    Range { from: '\u{13a0}', to: '\u{13f5}', },
-    Range { from: '\u{13f6}', to: '\u{13f7}', },
-    Range { from: '\u{13f8}', to: '\u{13fd}', },
-    Range { from: '\u{13fe}', to: '\u{13ff}', },
-    Range { from: '\u{1400}', to: '\u{167f}', },
-    Range { from: '\u{1680}', to: '\u{1680}', },
-    Range { from: '\u{1681}', to: '\u{169c}', },
-    Range { from: '\u{169d}', to: '\u{169f}', },
-    Range { from: '\u{16a0}', to: '\u{16f8}', },
-    Range { from: '\u{16f9}', to: '\u{16ff}', },
-    Range { from: '\u{1700}', to: '\u{170c}', },
-    Range { from: '\u{170d}', to: '\u{170d}', },
-    Range { from: '\u{170e}', to: '\u{1714}', },
-    Range { from: '\u{1715}', to: '\u{171f}', },
-    Range { from: '\u{1720}', to: '\u{1736}', },
-    Range { from: '\u{1737}', to: '\u{173f}', },
-    Range { from: '\u{1740}', to: '\u{1753}', },
-    Range { from: '\u{1754}', to: '\u{175f}', },
-    Range { from: '\u{1760}', to: '\u{176c}', },
-    Range { from: '\u{176d}', to: '\u{176d}', },
-    Range { from: '\u{176e}', to: '\u{1770}', },
-    Range { from: '\u{1771}', to: '\u{1771}', },
-    Range { from: '\u{1772}', to: '\u{1773}', },
-    Range { from: '\u{1774}', to: '\u{177f}', },
-    Range { from: '\u{1780}', to: '\u{17b3}', },
-    Range { from: '\u{17b4}', to: '\u{17b5}', },
-    Range { from: '\u{17b6}', to: '\u{17dd}', },
-    Range { from: '\u{17de}', to: '\u{17df}', },
-    Range { from: '\u{17e0}', to: '\u{17e9}', },
-    Range { from: '\u{17ea}', to: '\u{17ef}', },
-    Range { from: '\u{17f0}', to: '\u{17f9}', },
-    Range { from: '\u{17fa}', to: '\u{17ff}', },
-    Range { from: '\u{1800}', to: '\u{1805}', },
-    Range { from: '\u{1806}', to: '\u{1806}', },
-    Range { from: '\u{1807}', to: '\u{180a}', },
-    Range { from: '\u{180b}', to: '\u{180d}', },
-    Range { from: '\u{180e}', to: '\u{180f}', },
-    Range { from: '\u{1810}', to: '\u{1819}', },
-    Range { from: '\u{181a}', to: '\u{181f}', },
-    Range { from: '\u{1820}', to: '\u{1877}', },
-    Range { from: '\u{1878}', to: '\u{187f}', },
-    Range { from: '\u{1880}', to: '\u{18aa}', },
-    Range { from: '\u{18ab}', to: '\u{18af}', },
-    Range { from: '\u{18b0}', to: '\u{18f5}', },
-    Range { from: '\u{18f6}', to: '\u{18ff}', },
-    Range { from: '\u{1900}', to: '\u{191e}', },
-    Range { from: '\u{191f}', to: '\u{191f}', },
-    Range { from: '\u{1920}', to: '\u{192b}', },
-    Range { from: '\u{192c}', to: '\u{192f}', },
-    Range { from: '\u{1930}', to: '\u{193b}', },
-    Range { from: '\u{193c}', to: '\u{193f}', },
-    Range { from: '\u{1940}', to: '\u{1940}', },
-    Range { from: '\u{1941}', to: '\u{1943}', },
-    Range { from: '\u{1944}', to: '\u{196d}', },
-    Range { from: '\u{196e}', to: '\u{196f}', },
-    Range { from: '\u{1970}', to: '\u{1974}', },
-    Range { from: '\u{1975}', to: '\u{197f}', },
-    Range { from: '\u{1980}', to: '\u{19ab}', },
-    Range { from: '\u{19ac}', to: '\u{19af}', },
-    Range { from: '\u{19b0}', to: '\u{19c9}', },
-    Range { from: '\u{19ca}', to: '\u{19cf}', },
-    Range { from: '\u{19d0}', to: '\u{19da}', },
-    Range { from: '\u{19db}', to: '\u{19dd}', },
-    Range { from: '\u{19de}', to: '\u{1a1b}', },
-    Range { from: '\u{1a1c}', to: '\u{1a1d}', },
-    Range { from: '\u{1a1e}', to: '\u{1a5e}', },
-    Range { from: '\u{1a5f}', to: '\u{1a5f}', },
-    Range { from: '\u{1a60}', to: '\u{1a7c}', },
-    Range { from: '\u{1a7d}', to: '\u{1a7e}', },
-    Range { from: '\u{1a7f}', to: '\u{1a89}', },
-    Range { from: '\u{1a8a}', to: '\u{1a8f}', },
-    Range { from: '\u{1a90}', to: '\u{1a99}', },
-    Range { from: '\u{1a9a}', to: '\u{1a9f}', },
-    Range { from: '\u{1aa0}', to: '\u{1aad}', },
-    Range { from: '\u{1aae}', to: '\u{1aaf}', },
-    Range { from: '\u{1ab0}', to: '\u{1abe}', },
-    Range { from: '\u{1abf}', to: '\u{1aff}', },
-    Range { from: '\u{1b00}', to: '\u{1b4b}', },
-    Range { from: '\u{1b4c}', to: '\u{1b4f}', },
-    Range { from: '\u{1b50}', to: '\u{1b7c}', },
-    Range { from: '\u{1b7d}', to: '\u{1b7f}', },
-    Range { from: '\u{1b80}', to: '\u{1bf3}', },
-    Range { from: '\u{1bf4}', to: '\u{1bfb}', },
-    Range { from: '\u{1bfc}', to: '\u{1c37}', },
-    Range { from: '\u{1c38}', to: '\u{1c3a}', },
-    Range { from: '\u{1c3b}', to: '\u{1c49}', },
-    Range { from: '\u{1c4a}', to: '\u{1c4c}', },
-    Range { from: '\u{1c4d}', to: '\u{1c7f}', },
-    Range { from: '\u{1c80}', to: '\u{1c83}', },
-    Range { from: '\u{1c84}', to: '\u{1c85}', },
-    Range { from: '\u{1c86}', to: '\u{1c88}', },
-    Range { from: '\u{1c89}', to: '\u{1cbf}', },
-    Range { from: '\u{1cc0}', to: '\u{1cc7}', },
-    Range { from: '\u{1cc8}', to: '\u{1ccf}', },
-    Range { from: '\u{1cd0}', to: '\u{1cf9}', },
-    Range { from: '\u{1cfa}', to: '\u{1cff}', },
-    Range { from: '\u{1d00}', to: '\u{1d2b}', },
-    Range { from: '\u{1d2c}', to: '\u{1d6a}', },
-    Range { from: '\u{1d6b}', to: '\u{1d77}', },
-    Range { from: '\u{1d78}', to: '\u{1d78}', },
-    Range { from: '\u{1d79}', to: '\u{1d9a}', },
-    Range { from: '\u{1d9b}', to: '\u{1dbf}', },
-    Range { from: '\u{1dc0}', to: '\u{1df9}', },
-    Range { from: '\u{1dfa}', to: '\u{1dfa}', },
-    Range { from: '\u{1dfb}', to: '\u{1dff}', },
-    Range { from: '\u{1e00}', to: '\u{1e94}', },
-    Range { from: '\u{1e95}', to: '\u{1e99}', },
-    Range { from: '\u{1e9a}', to: '\u{1e9b}', },
-    Range { from: '\u{1e9c}', to: '\u{1e9d}', },
-    Range { from: '\u{1e9e}', to: '\u{1efe}', },
-    Range { from: '\u{1eff}', to: '\u{1f07}', },
-    Range { from: '\u{1f08}', to: '\u{1f0f}', },
-    Range { from: '\u{1f10}', to: '\u{1f15}', },
-    Range { from: '\u{1f16}', to: '\u{1f17}', },
-    Range { from: '\u{1f18}', to: '\u{1f1d}', },
-    Range { from: '\u{1f1e}', to: '\u{1f1f}', },
-    Range { from: '\u{1f20}', to: '\u{1f27}', },
-    Range { from: '\u{1f28}', to: '\u{1f2f}', },
-    Range { from: '\u{1f30}', to: '\u{1f37}', },
-    Range { from: '\u{1f38}', to: '\u{1f3f}', },
-    Range { from: '\u{1f40}', to: '\u{1f45}', },
-    Range { from: '\u{1f46}', to: '\u{1f47}', },
-    Range { from: '\u{1f48}', to: '\u{1f4d}', },
-    Range { from: '\u{1f4e}', to: '\u{1f4f}', },
-    Range { from: '\u{1f50}', to: '\u{1f57}', },
-    Range { from: '\u{1f58}', to: '\u{1f5f}', },
-    Range { from: '\u{1f60}', to: '\u{1f67}', },
-    Range { from: '\u{1f68}', to: '\u{1f7d}', },
-    Range { from: '\u{1f7e}', to: '\u{1f7f}', },
-    Range { from: '\u{1f80}', to: '\u{1faf}', },
-    Range { from: '\u{1fb0}', to: '\u{1fb1}', },
-    Range { from: '\u{1fb2}', to: '\u{1fcf}', },
-    Range { from: '\u{1fd0}', to: '\u{1fd2}', },
-    Range { from: '\u{1fd3}', to: '\u{1fd3}', },
-    Range { from: '\u{1fd4}', to: '\u{1fd5}', },
-    Range { from: '\u{1fd6}', to: '\u{1fd7}', },
-    Range { from: '\u{1fd8}', to: '\u{1fdf}', },
-    Range { from: '\u{1fe0}', to: '\u{1fe2}', },
-    Range { from: '\u{1fe3}', to: '\u{1fe3}', },
-    Range { from: '\u{1fe4}', to: '\u{1fe7}', },
-    Range { from: '\u{1fe8}', to: '\u{1fef}', },
-    Range { from: '\u{1ff0}', to: '\u{1ff1}', },
-    Range { from: '\u{1ff2}', to: '\u{1fff}', },
-    Range { from: '\u{2000}', to: '\u{200a}', },
-    Range { from: '\u{200b}', to: '\u{200b}', },
-    Range { from: '\u{200c}', to: '\u{200d}', },
-    Range { from: '\u{200e}', to: '\u{200f}', },
-    Range { from: '\u{2010}', to: '\u{2011}', },
-    Range { from: '\u{2012}', to: '\u{2016}', },
-    Range { from: '\u{2017}', to: '\u{2017}', },
-    Range { from: '\u{2018}', to: '\u{2023}', },
-    Range { from: '\u{2024}', to: '\u{2026}', },
-    Range { from: '\u{2027}', to: '\u{2027}', },
-    Range { from: '\u{2028}', to: '\u{202e}', },
-    Range { from: '\u{202f}', to: '\u{202f}', },
-    Range { from: '\u{2030}', to: '\u{2032}', },
-    Range { from: '\u{2033}', to: '\u{2037}', },
-    Range { from: '\u{2038}', to: '\u{203b}', },
-    Range { from: '\u{203c}', to: '\u{203e}', },
-    Range { from: '\u{203f}', to: '\u{2046}', },
-    Range { from: '\u{2047}', to: '\u{2049}', },
-    Range { from: '\u{204a}', to: '\u{2056}', },
-    Range { from: '\u{2057}', to: '\u{2057}', },
-    Range { from: '\u{2058}', to: '\u{205e}', },
-    Range { from: '\u{205f}', to: '\u{2060}', },
-    Range { from: '\u{2061}', to: '\u{2063}', },
-    Range { from: '\u{2064}', to: '\u{2064}', },
-    Range { from: '\u{2065}', to: '\u{206f}', },
-    Range { from: '\u{2070}', to: '\u{2071}', },
-    Range { from: '\u{2072}', to: '\u{2073}', },
-    Range { from: '\u{2074}', to: '\u{209c}', },
-    Range { from: '\u{209d}', to: '\u{209f}', },
-    Range { from: '\u{20a0}', to: '\u{20a7}', },
-    Range { from: '\u{20a8}', to: '\u{20a8}', },
-    Range { from: '\u{20a9}', to: '\u{20bf}', },
-    Range { from: '\u{20c0}', to: '\u{20cf}', },
-    Range { from: '\u{20d0}', to: '\u{20f0}', },
-    Range { from: '\u{20f1}', to: '\u{20ff}', },
-    Range { from: '\u{2100}', to: '\u{210a}', },
-    Range { from: '\u{210b}', to: '\u{210e}', },
-    Range { from: '\u{210f}', to: '\u{210f}', },
-    Range { from: '\u{2110}', to: '\u{2111}', },
-    Range { from: '\u{2112}', to: '\u{2113}', },
-    Range { from: '\u{2114}', to: '\u{2116}', },
-    Range { from: '\u{2117}', to: '\u{2118}', },
-    Range { from: '\u{2119}', to: '\u{211a}', },
-    Range { from: '\u{211b}', to: '\u{211d}', },
-    Range { from: '\u{211e}', to: '\u{211f}', },
-    Range { from: '\u{2120}', to: '\u{212e}', },
-    Range { from: '\u{212f}', to: '\u{2130}', },
-    Range { from: '\u{2131}', to: '\u{213c}', },
-    Range { from: '\u{213d}', to: '\u{213e}', },
-    Range { from: '\u{213f}', to: '\u{2140}', },
-    Range { from: '\u{2141}', to: '\u{2144}', },
-    Range { from: '\u{2145}', to: '\u{2146}', },
-    Range { from: '\u{2147}', to: '\u{2149}', },
-    Range { from: '\u{214a}', to: '\u{214f}', },
-    Range { from: '\u{2150}', to: '\u{217f}', },
-    Range { from: '\u{2180}', to: '\u{2182}', },
-    Range { from: '\u{2183}', to: '\u{2183}', },
-    Range { from: '\u{2184}', to: '\u{2188}', },
-    Range { from: '\u{2189}', to: '\u{2189}', },
-    Range { from: '\u{218a}', to: '\u{218b}', },
-    Range { from: '\u{218c}', to: '\u{218f}', },
-    Range { from: '\u{2190}', to: '\u{222b}', },
-    Range { from: '\u{222c}', to: '\u{2230}', },
-    Range { from: '\u{2231}', to: '\u{225f}', },
-    Range { from: '\u{2260}', to: '\u{2260}', },
-    Range { from: '\u{2261}', to: '\u{226d}', },
-    Range { from: '\u{226e}', to: '\u{226f}', },
-    Range { from: '\u{2270}', to: '\u{2328}', },
-    Range { from: '\u{2329}', to: '\u{232a}', },
-    Range { from: '\u{232b}', to: '\u{2426}', },
-    Range { from: '\u{2427}', to: '\u{243f}', },
-    Range { from: '\u{2440}', to: '\u{244a}', },
-    Range { from: '\u{244b}', to: '\u{245f}', },
-    Range { from: '\u{2460}', to: '\u{2487}', },
-    Range { from: '\u{2488}', to: '\u{249b}', },
-    Range { from: '\u{249c}', to: '\u{24ea}', },
-    Range { from: '\u{24eb}', to: '\u{2a0b}', },
-    Range { from: '\u{2a0c}', to: '\u{2a0c}', },
-    Range { from: '\u{2a0d}', to: '\u{2a73}', },
-    Range { from: '\u{2a74}', to: '\u{2a76}', },
-    Range { from: '\u{2a77}', to: '\u{2adb}', },
-    Range { from: '\u{2adc}', to: '\u{2adc}', },
-    Range { from: '\u{2add}', to: '\u{2b73}', },
-    Range { from: '\u{2b74}', to: '\u{2b75}', },
-    Range { from: '\u{2b76}', to: '\u{2b95}', },
-    Range { from: '\u{2b96}', to: '\u{2b97}', },
-    Range { from: '\u{2b98}', to: '\u{2bb9}', },
-    Range { from: '\u{2bba}', to: '\u{2bbc}', },
-    Range { from: '\u{2bbd}', to: '\u{2bc8}', },
-    Range { from: '\u{2bc9}', to: '\u{2bc9}', },
-    Range { from: '\u{2bca}', to: '\u{2bd2}', },
-    Range { from: '\u{2bd3}', to: '\u{2beb}', },
-    Range { from: '\u{2bec}', to: '\u{2bef}', },
-    Range { from: '\u{2bf0}', to: '\u{2bff}', },
-    Range { from: '\u{2c00}', to: '\u{2c2f}', },
-    Range { from: '\u{2c30}', to: '\u{2c5e}', },
-    Range { from: '\u{2c5f}', to: '\u{2c64}', },
-    Range { from: '\u{2c65}', to: '\u{2c66}', },
-    Range { from: '\u{2c67}', to: '\u{2c72}', },
-    Range { from: '\u{2c73}', to: '\u{2c74}', },
-    Range { from: '\u{2c75}', to: '\u{2c75}', },
-    Range { from: '\u{2c76}', to: '\u{2c7b}', },
-    Range { from: '\u{2c7c}', to: '\u{2ce2}', },
-    Range { from: '\u{2ce3}', to: '\u{2cea}', },
-    Range { from: '\u{2ceb}', to: '\u{2ced}', },
-    Range { from: '\u{2cee}', to: '\u{2cf1}', },
-    Range { from: '\u{2cf2}', to: '\u{2cf3}', },
-    Range { from: '\u{2cf4}', to: '\u{2cf8}', },
-    Range { from: '\u{2cf9}', to: '\u{2d25}', },
-    Range { from: '\u{2d26}', to: '\u{2d27}', },
-    Range { from: '\u{2d28}', to: '\u{2d2c}', },
-    Range { from: '\u{2d2d}', to: '\u{2d2d}', },
-    Range { from: '\u{2d2e}', to: '\u{2d2f}', },
-    Range { from: '\u{2d30}', to: '\u{2d67}', },
-    Range { from: '\u{2d68}', to: '\u{2d6e}', },
-    Range { from: '\u{2d6f}', to: '\u{2d70}', },
-    Range { from: '\u{2d71}', to: '\u{2d7e}', },
-    Range { from: '\u{2d7f}', to: '\u{2d96}', },
-    Range { from: '\u{2d97}', to: '\u{2d9f}', },
-    Range { from: '\u{2da0}', to: '\u{2da6}', },
-    Range { from: '\u{2da7}', to: '\u{2da7}', },
-    Range { from: '\u{2da8}', to: '\u{2dae}', },
-    Range { from: '\u{2daf}', to: '\u{2daf}', },
-    Range { from: '\u{2db0}', to: '\u{2db6}', },
-    Range { from: '\u{2db7}', to: '\u{2db7}', },
-    Range { from: '\u{2db8}', to: '\u{2dbe}', },
-    Range { from: '\u{2dbf}', to: '\u{2dbf}', },
-    Range { from: '\u{2dc0}', to: '\u{2dc6}', },
-    Range { from: '\u{2dc7}', to: '\u{2dc7}', },
-    Range { from: '\u{2dc8}', to: '\u{2dce}', },
-    Range { from: '\u{2dcf}', to: '\u{2dcf}', },
-    Range { from: '\u{2dd0}', to: '\u{2dd6}', },
-    Range { from: '\u{2dd7}', to: '\u{2dd7}', },
-    Range { from: '\u{2dd8}', to: '\u{2dde}', },
-    Range { from: '\u{2ddf}', to: '\u{2ddf}', },
-    Range { from: '\u{2de0}', to: '\u{2e49}', },
-    Range { from: '\u{2e4a}', to: '\u{2e7f}', },
-    Range { from: '\u{2e80}', to: '\u{2e99}', },
-    Range { from: '\u{2e9a}', to: '\u{2e9a}', },
-    Range { from: '\u{2e9b}', to: '\u{2e9e}', },
-    Range { from: '\u{2e9f}', to: '\u{2e9f}', },
-    Range { from: '\u{2ea0}', to: '\u{2ef2}', },
-    Range { from: '\u{2ef3}', to: '\u{2ef3}', },
-    Range { from: '\u{2ef4}', to: '\u{2eff}', },
-    Range { from: '\u{2f00}', to: '\u{2fd5}', },
-    Range { from: '\u{2fd6}', to: '\u{2fff}', },
-    Range { from: '\u{3000}', to: '\u{3002}', },
-    Range { from: '\u{3003}', to: '\u{3035}', },
-    Range { from: '\u{3036}', to: '\u{303a}', },
-    Range { from: '\u{303b}', to: '\u{303f}', },
-    Range { from: '\u{3040}', to: '\u{3040}', },
-    Range { from: '\u{3041}', to: '\u{3096}', },
-    Range { from: '\u{3097}', to: '\u{3098}', },
-    Range { from: '\u{3099}', to: '\u{309a}', },
-    Range { from: '\u{309b}', to: '\u{309c}', },
-    Range { from: '\u{309d}', to: '\u{309e}', },
-    Range { from: '\u{309f}', to: '\u{309f}', },
-    Range { from: '\u{30a0}', to: '\u{30fe}', },
-    Range { from: '\u{30ff}', to: '\u{30ff}', },
-    Range { from: '\u{3100}', to: '\u{3104}', },
-    Range { from: '\u{3105}', to: '\u{312e}', },
-    Range { from: '\u{312f}', to: '\u{3130}', },
-    Range { from: '\u{3131}', to: '\u{318f}', },
-    Range { from: '\u{3190}', to: '\u{3191}', },
-    Range { from: '\u{3192}', to: '\u{319f}', },
-    Range { from: '\u{31a0}', to: '\u{31ba}', },
-    Range { from: '\u{31bb}', to: '\u{31bf}', },
-    Range { from: '\u{31c0}', to: '\u{31e3}', },
-    Range { from: '\u{31e4}', to: '\u{31ef}', },
-    Range { from: '\u{31f0}', to: '\u{31ff}', },
-    Range { from: '\u{3200}', to: '\u{3247}', },
-    Range { from: '\u{3248}', to: '\u{324f}', },
-    Range { from: '\u{3250}', to: '\u{33ff}', },
-    Range { from: '\u{3400}', to: '\u{4db5}', },
-    Range { from: '\u{4db6}', to: '\u{4dbf}', },
-    Range { from: '\u{4dc0}', to: '\u{9fea}', },
-    Range { from: '\u{9feb}', to: '\u{9fff}', },
-    Range { from: '\u{a000}', to: '\u{a48c}', },
-    Range { from: '\u{a48d}', to: '\u{a48f}', },
-    Range { from: '\u{a490}', to: '\u{a4c6}', },
-    Range { from: '\u{a4c7}', to: '\u{a4cf}', },
-    Range { from: '\u{a4d0}', to: '\u{a62b}', },
-    Range { from: '\u{a62c}', to: '\u{a63f}', },
-    Range { from: '\u{a640}', to: '\u{a66c}', },
-    Range { from: '\u{a66d}', to: '\u{a67f}', },
-    Range { from: '\u{a680}', to: '\u{a69d}', },
-    Range { from: '\u{a69e}', to: '\u{a6f7}', },
-    Range { from: '\u{a6f8}', to: '\u{a6ff}', },
-    Range { from: '\u{a700}', to: '\u{a721}', },
-    Range { from: '\u{a722}', to: '\u{a72e}', },
-    Range { from: '\u{a72f}', to: '\u{a731}', },
-    Range { from: '\u{a732}', to: '\u{a770}', },
-    Range { from: '\u{a771}', to: '\u{a778}', },
-    Range { from: '\u{a779}', to: '\u{a786}', },
-    Range { from: '\u{a787}', to: '\u{a78a}', },
-    Range { from: '\u{a78b}', to: '\u{a78d}', },
-    Range { from: '\u{a78e}', to: '\u{a78f}', },
-    Range { from: '\u{a790}', to: '\u{a792}', },
-    Range { from: '\u{a793}', to: '\u{a795}', },
-    Range { from: '\u{a796}', to: '\u{a7b7}', },
-    Range { from: '\u{a7b8}', to: '\u{a7f6}', },
-    Range { from: '\u{a7f7}', to: '\u{a7f9}', },
-    Range { from: '\u{a7fa}', to: '\u{a82b}', },
-    Range { from: '\u{a82c}', to: '\u{a82f}', },
-    Range { from: '\u{a830}', to: '\u{a839}', },
-    Range { from: '\u{a83a}', to: '\u{a83f}', },
-    Range { from: '\u{a840}', to: '\u{a877}', },
-    Range { from: '\u{a878}', to: '\u{a87f}', },
-    Range { from: '\u{a880}', to: '\u{a8c5}', },
-    Range { from: '\u{a8c6}', to: '\u{a8cd}', },
-    Range { from: '\u{a8ce}', to: '\u{a8d9}', },
-    Range { from: '\u{a8da}', to: '\u{a8df}', },
-    Range { from: '\u{a8e0}', to: '\u{a8fd}', },
-    Range { from: '\u{a8fe}', to: '\u{a8ff}', },
-    Range { from: '\u{a900}', to: '\u{a953}', },
-    Range { from: '\u{a954}', to: '\u{a95e}', },
-    Range { from: '\u{a95f}', to: '\u{a97c}', },
-    Range { from: '\u{a97d}', to: '\u{a97f}', },
-    Range { from: '\u{a980}', to: '\u{a9cd}', },
-    Range { from: '\u{a9ce}', to: '\u{a9ce}', },
-    Range { from: '\u{a9cf}', to: '\u{a9d9}', },
-    Range { from: '\u{a9da}', to: '\u{a9dd}', },
-    Range { from: '\u{a9de}', to: '\u{a9fe}', },
-    Range { from: '\u{a9ff}', to: '\u{a9ff}', },
-    Range { from: '\u{aa00}', to: '\u{aa36}', },
-    Range { from: '\u{aa37}', to: '\u{aa3f}', },
-    Range { from: '\u{aa40}', to: '\u{aa4d}', },
-    Range { from: '\u{aa4e}', to: '\u{aa4f}', },
-    Range { from: '\u{aa50}', to: '\u{aa59}', },
-    Range { from: '\u{aa5a}', to: '\u{aa5b}', },
-    Range { from: '\u{aa5c}', to: '\u{aac2}', },
-    Range { from: '\u{aac3}', to: '\u{aada}', },
-    Range { from: '\u{aadb}', to: '\u{aaf6}', },
-    Range { from: '\u{aaf7}', to: '\u{ab00}', },
-    Range { from: '\u{ab01}', to: '\u{ab06}', },
-    Range { from: '\u{ab07}', to: '\u{ab08}', },
-    Range { from: '\u{ab09}', to: '\u{ab0e}', },
-    Range { from: '\u{ab0f}', to: '\u{ab10}', },
-    Range { from: '\u{ab11}', to: '\u{ab16}', },
-    Range { from: '\u{ab17}', to: '\u{ab1f}', },
-    Range { from: '\u{ab20}', to: '\u{ab26}', },
-    Range { from: '\u{ab27}', to: '\u{ab27}', },
-    Range { from: '\u{ab28}', to: '\u{ab2e}', },
-    Range { from: '\u{ab2f}', to: '\u{ab2f}', },
-    Range { from: '\u{ab30}', to: '\u{ab5b}', },
-    Range { from: '\u{ab5c}', to: '\u{ab5f}', },
-    Range { from: '\u{ab60}', to: '\u{ab65}', },
-    Range { from: '\u{ab66}', to: '\u{ab6f}', },
-    Range { from: '\u{ab70}', to: '\u{abbf}', },
-    Range { from: '\u{abc0}', to: '\u{abed}', },
-    Range { from: '\u{abee}', to: '\u{abef}', },
-    Range { from: '\u{abf0}', to: '\u{abf9}', },
-    Range { from: '\u{abfa}', to: '\u{abff}', },
-    Range { from: '\u{ac00}', to: '\u{d7a3}', },
-    Range { from: '\u{d7a4}', to: '\u{d7af}', },
-    Range { from: '\u{d7b0}', to: '\u{d7c6}', },
-    Range { from: '\u{d7c7}', to: '\u{d7ca}', },
-    Range { from: '\u{d7cb}', to: '\u{d7fb}', },
-    Range { from: '\u{d7fc}', to: '\u{f8ff}', },
-    Range { from: '\u{f900}', to: '\u{f906}', },
-    Range { from: '\u{f907}', to: '\u{f908}', },
-    Range { from: '\u{f909}', to: '\u{fa0d}', },
-    Range { from: '\u{fa0e}', to: '\u{fa0f}', },
-    Range { from: '\u{fa10}', to: '\u{fa12}', },
-    Range { from: '\u{fa13}', to: '\u{fa14}', },
-    Range { from: '\u{fa15}', to: '\u{fa22}', },
-    Range { from: '\u{fa23}', to: '\u{fa24}', },
-    Range { from: '\u{fa25}', to: '\u{fa26}', },
-    Range { from: '\u{fa27}', to: '\u{fa29}', },
-    Range { from: '\u{fa2a}', to: '\u{fa5c}', },
-    Range { from: '\u{fa5d}', to: '\u{fa5e}', },
-    Range { from: '\u{fa5f}', to: '\u{fa6d}', },
-    Range { from: '\u{fa6e}', to: '\u{fa6f}', },
-    Range { from: '\u{fa70}', to: '\u{fad9}', },
-    Range { from: '\u{fada}', to: '\u{faff}', },
-    Range { from: '\u{fb00}', to: '\u{fb04}', },
-    Range { from: '\u{fb05}', to: '\u{fb06}', },
-    Range { from: '\u{fb07}', to: '\u{fb12}', },
-    Range { from: '\u{fb13}', to: '\u{fb17}', },
-    Range { from: '\u{fb18}', to: '\u{fb1c}', },
-    Range { from: '\u{fb1d}', to: '\u{fb4f}', },
-    Range { from: '\u{fb50}', to: '\u{fb51}', },
-    Range { from: '\u{fb52}', to: '\u{fb55}', },
-    Range { from: '\u{fb56}', to: '\u{fb59}', },
-    Range { from: '\u{fb5a}', to: '\u{fb5d}', },
-    Range { from: '\u{fb5e}', to: '\u{fb61}', },
-    Range { from: '\u{fb62}', to: '\u{fb65}', },
-    Range { from: '\u{fb66}', to: '\u{fb69}', },
-    Range { from: '\u{fb6a}', to: '\u{fb6d}', },
-    Range { from: '\u{fb6e}', to: '\u{fb71}', },
-    Range { from: '\u{fb72}', to: '\u{fb75}', },
-    Range { from: '\u{fb76}', to: '\u{fb79}', },
-    Range { from: '\u{fb7a}', to: '\u{fb7d}', },
-    Range { from: '\u{fb7e}', to: '\u{fb81}', },
-    Range { from: '\u{fb82}', to: '\u{fb83}', },
-    Range { from: '\u{fb84}', to: '\u{fb85}', },
-    Range { from: '\u{fb86}', to: '\u{fb87}', },
-    Range { from: '\u{fb88}', to: '\u{fb89}', },
-    Range { from: '\u{fb8a}', to: '\u{fb8b}', },
-    Range { from: '\u{fb8c}', to: '\u{fb8d}', },
-    Range { from: '\u{fb8e}', to: '\u{fb91}', },
-    Range { from: '\u{fb92}', to: '\u{fb95}', },
-    Range { from: '\u{fb96}', to: '\u{fb99}', },
-    Range { from: '\u{fb9a}', to: '\u{fb9d}', },
-    Range { from: '\u{fb9e}', to: '\u{fb9f}', },
-    Range { from: '\u{fba0}', to: '\u{fba3}', },
-    Range { from: '\u{fba4}', to: '\u{fba5}', },
-    Range { from: '\u{fba6}', to: '\u{fba9}', },
-    Range { from: '\u{fbaa}', to: '\u{fbad}', },
-    Range { from: '\u{fbae}', to: '\u{fbaf}', },
-    Range { from: '\u{fbb0}', to: '\u{fbb1}', },
-    Range { from: '\u{fbb2}', to: '\u{fbc1}', },
-    Range { from: '\u{fbc2}', to: '\u{fbd2}', },
-    Range { from: '\u{fbd3}', to: '\u{fbd6}', },
-    Range { from: '\u{fbd7}', to: '\u{fbd8}', },
-    Range { from: '\u{fbd9}', to: '\u{fbda}', },
-    Range { from: '\u{fbdb}', to: '\u{fbdc}', },
-    Range { from: '\u{fbdd}', to: '\u{fbdd}', },
-    Range { from: '\u{fbde}', to: '\u{fbdf}', },
-    Range { from: '\u{fbe0}', to: '\u{fbe1}', },
-    Range { from: '\u{fbe2}', to: '\u{fbe3}', },
-    Range { from: '\u{fbe4}', to: '\u{fbe7}', },
-    Range { from: '\u{fbe8}', to: '\u{fbe9}', },
-    Range { from: '\u{fbea}', to: '\u{fbeb}', },
-    Range { from: '\u{fbec}', to: '\u{fbed}', },
-    Range { from: '\u{fbee}', to: '\u{fbef}', },
-    Range { from: '\u{fbf0}', to: '\u{fbf1}', },
-    Range { from: '\u{fbf2}', to: '\u{fbf3}', },
-    Range { from: '\u{fbf4}', to: '\u{fbf5}', },
-    Range { from: '\u{fbf6}', to: '\u{fbf8}', },
-    Range { from: '\u{fbf9}', to: '\u{fbfb}', },
-    Range { from: '\u{fbfc}', to: '\u{fbff}', },
-    Range { from: '\u{fc00}', to: '\u{fd3b}', },
-    Range { from: '\u{fd3c}', to: '\u{fd3d}', },
-    Range { from: '\u{fd3e}', to: '\u{fd3f}', },
-    Range { from: '\u{fd40}', to: '\u{fd4f}', },
-    Range { from: '\u{fd50}', to: '\u{fd50}', },
-    Range { from: '\u{fd51}', to: '\u{fd52}', },
-    Range { from: '\u{fd53}', to: '\u{fd57}', },
-    Range { from: '\u{fd58}', to: '\u{fd59}', },
-    Range { from: '\u{fd5a}', to: '\u{fd5e}', },
-    Range { from: '\u{fd5f}', to: '\u{fd60}', },
-    Range { from: '\u{fd61}', to: '\u{fd61}', },
-    Range { from: '\u{fd62}', to: '\u{fd63}', },
-    Range { from: '\u{fd64}', to: '\u{fd65}', },
-    Range { from: '\u{fd66}', to: '\u{fd66}', },
-    Range { from: '\u{fd67}', to: '\u{fd68}', },
-    Range { from: '\u{fd69}', to: '\u{fd69}', },
-    Range { from: '\u{fd6a}', to: '\u{fd6b}', },
-    Range { from: '\u{fd6c}', to: '\u{fd6d}', },
-    Range { from: '\u{fd6e}', to: '\u{fd6e}', },
-    Range { from: '\u{fd6f}', to: '\u{fd70}', },
-    Range { from: '\u{fd71}', to: '\u{fd72}', },
-    Range { from: '\u{fd73}', to: '\u{fd75}', },
-    Range { from: '\u{fd76}', to: '\u{fd77}', },
-    Range { from: '\u{fd78}', to: '\u{fd7b}', },
-    Range { from: '\u{fd7c}', to: '\u{fd7d}', },
-    Range { from: '\u{fd7e}', to: '\u{fd82}', },
-    Range { from: '\u{fd83}', to: '\u{fd84}', },
-    Range { from: '\u{fd85}', to: '\u{fd86}', },
-    Range { from: '\u{fd87}', to: '\u{fd88}', },
-    Range { from: '\u{fd89}', to: '\u{fd8f}', },
-    Range { from: '\u{fd90}', to: '\u{fd91}', },
-    Range { from: '\u{fd92}', to: '\u{fd96}', },
-    Range { from: '\u{fd97}', to: '\u{fd98}', },
-    Range { from: '\u{fd99}', to: '\u{fd9b}', },
-    Range { from: '\u{fd9c}', to: '\u{fd9d}', },
-    Range { from: '\u{fd9e}', to: '\u{fdc7}', },
-    Range { from: '\u{fdc8}', to: '\u{fdef}', },
-    Range { from: '\u{fdf0}', to: '\u{fdfd}', },
-    Range { from: '\u{fdfe}', to: '\u{fdff}', },
-    Range { from: '\u{fe00}', to: '\u{fe0f}', },
-    Range { from: '\u{fe10}', to: '\u{fe18}', },
-    Range { from: '\u{fe19}', to: '\u{fe1f}', },
-    Range { from: '\u{fe20}', to: '\u{fe2f}', },
-    Range { from: '\u{fe30}', to: '\u{fe32}', },
-    Range { from: '\u{fe33}', to: '\u{fe34}', },
-    Range { from: '\u{fe35}', to: '\u{fe44}', },
-    Range { from: '\u{fe45}', to: '\u{fe46}', },
-    Range { from: '\u{fe47}', to: '\u{fe48}', },
-    Range { from: '\u{fe49}', to: '\u{fe4c}', },
-    Range { from: '\u{fe4d}', to: '\u{fe4f}', },
-    Range { from: '\u{fe50}', to: '\u{fe51}', },
-    Range { from: '\u{fe52}', to: '\u{fe53}', },
-    Range { from: '\u{fe54}', to: '\u{fe6b}', },
-    Range { from: '\u{fe6c}', to: '\u{fe6f}', },
-    Range { from: '\u{fe70}', to: '\u{fe80}', },
-    Range { from: '\u{fe81}', to: '\u{fe82}', },
-    Range { from: '\u{fe83}', to: '\u{fe84}', },
-    Range { from: '\u{fe85}', to: '\u{fe86}', },
-    Range { from: '\u{fe87}', to: '\u{fe88}', },
-    Range { from: '\u{fe89}', to: '\u{fe8c}', },
-    Range { from: '\u{fe8d}', to: '\u{fe8e}', },
-    Range { from: '\u{fe8f}', to: '\u{fe92}', },
-    Range { from: '\u{fe93}', to: '\u{fe94}', },
-    Range { from: '\u{fe95}', to: '\u{fe98}', },
-    Range { from: '\u{fe99}', to: '\u{fe9c}', },
-    Range { from: '\u{fe9d}', to: '\u{fea0}', },
-    Range { from: '\u{fea1}', to: '\u{fea4}', },
-    Range { from: '\u{fea5}', to: '\u{fea8}', },
-    Range { from: '\u{fea9}', to: '\u{feaa}', },
-    Range { from: '\u{feab}', to: '\u{feac}', },
-    Range { from: '\u{fead}', to: '\u{feae}', },
-    Range { from: '\u{feaf}', to: '\u{feb0}', },
-    Range { from: '\u{feb1}', to: '\u{feb4}', },
-    Range { from: '\u{feb5}', to: '\u{feb8}', },
-    Range { from: '\u{feb9}', to: '\u{febc}', },
-    Range { from: '\u{febd}', to: '\u{fec0}', },
-    Range { from: '\u{fec1}', to: '\u{fec4}', },
-    Range { from: '\u{fec5}', to: '\u{fec8}', },
-    Range { from: '\u{fec9}', to: '\u{fecc}', },
-    Range { from: '\u{fecd}', to: '\u{fed0}', },
-    Range { from: '\u{fed1}', to: '\u{fed4}', },
-    Range { from: '\u{fed5}', to: '\u{fed8}', },
-    Range { from: '\u{fed9}', to: '\u{fedc}', },
-    Range { from: '\u{fedd}', to: '\u{fee0}', },
-    Range { from: '\u{fee1}', to: '\u{fee4}', },
-    Range { from: '\u{fee5}', to: '\u{fee8}', },
-    Range { from: '\u{fee9}', to: '\u{feec}', },
-    Range { from: '\u{feed}', to: '\u{feee}', },
-    Range { from: '\u{feef}', to: '\u{fef0}', },
-    Range { from: '\u{fef1}', to: '\u{fef4}', },
-    Range { from: '\u{fef5}', to: '\u{fef6}', },
-    Range { from: '\u{fef7}', to: '\u{fef8}', },
-    Range { from: '\u{fef9}', to: '\u{fefa}', },
-    Range { from: '\u{fefb}', to: '\u{fefc}', },
-    Range { from: '\u{fefd}', to: '\u{fefe}', },
-    Range { from: '\u{feff}', to: '\u{ffbe}', },
-    Range { from: '\u{ffbf}', to: '\u{ffc1}', },
-    Range { from: '\u{ffc2}', to: '\u{ffc7}', },
-    Range { from: '\u{ffc8}', to: '\u{ffc9}', },
-    Range { from: '\u{ffca}', to: '\u{ffcf}', },
-    Range { from: '\u{ffd0}', to: '\u{ffd1}', },
-    Range { from: '\u{ffd2}', to: '\u{ffd7}', },
-    Range { from: '\u{ffd8}', to: '\u{ffd9}', },
-    Range { from: '\u{ffda}', to: '\u{ffdc}', },
-    Range { from: '\u{ffdd}', to: '\u{ffdf}', },
-    Range { from: '\u{ffe0}', to: '\u{ffee}', },
-    Range { from: '\u{ffef}', to: '\u{ffff}', },
-    Range { from: '\u{10000}', to: '\u{1000b}', },
-    Range { from: '\u{1000c}', to: '\u{1000c}', },
-    Range { from: '\u{1000d}', to: '\u{10026}', },
-    Range { from: '\u{10027}', to: '\u{10027}', },
-    Range { from: '\u{10028}', to: '\u{1003a}', },
-    Range { from: '\u{1003b}', to: '\u{1003b}', },
-    Range { from: '\u{1003c}', to: '\u{1003d}', },
-    Range { from: '\u{1003e}', to: '\u{1003e}', },
-    Range { from: '\u{1003f}', to: '\u{1004d}', },
-    Range { from: '\u{1004e}', to: '\u{1004f}', },
-    Range { from: '\u{10050}', to: '\u{1005d}', },
-    Range { from: '\u{1005e}', to: '\u{1007f}', },
-    Range { from: '\u{10080}', to: '\u{100fa}', },
-    Range { from: '\u{100fb}', to: '\u{100ff}', },
-    Range { from: '\u{10100}', to: '\u{10102}', },
-    Range { from: '\u{10103}', to: '\u{10106}', },
-    Range { from: '\u{10107}', to: '\u{10133}', },
-    Range { from: '\u{10134}', to: '\u{10136}', },
-    Range { from: '\u{10137}', to: '\u{1018e}', },
-    Range { from: '\u{1018f}', to: '\u{1018f}', },
-    Range { from: '\u{10190}', to: '\u{1019b}', },
-    Range { from: '\u{1019c}', to: '\u{1019f}', },
-    Range { from: '\u{101a0}', to: '\u{101a0}', },
-    Range { from: '\u{101a1}', to: '\u{101cf}', },
-    Range { from: '\u{101d0}', to: '\u{101fd}', },
-    Range { from: '\u{101fe}', to: '\u{1027f}', },
-    Range { from: '\u{10280}', to: '\u{1029c}', },
-    Range { from: '\u{1029d}', to: '\u{1029f}', },
-    Range { from: '\u{102a0}', to: '\u{102d0}', },
-    Range { from: '\u{102d1}', to: '\u{102df}', },
-    Range { from: '\u{102e0}', to: '\u{102fb}', },
-    Range { from: '\u{102fc}', to: '\u{102ff}', },
-    Range { from: '\u{10300}', to: '\u{10323}', },
-    Range { from: '\u{10324}', to: '\u{1032c}', },
-    Range { from: '\u{1032d}', to: '\u{1034a}', },
-    Range { from: '\u{1034b}', to: '\u{1034f}', },
-    Range { from: '\u{10350}', to: '\u{1037a}', },
-    Range { from: '\u{1037b}', to: '\u{1037f}', },
-    Range { from: '\u{10380}', to: '\u{1039d}', },
-    Range { from: '\u{1039e}', to: '\u{1039e}', },
-    Range { from: '\u{1039f}', to: '\u{103c3}', },
-    Range { from: '\u{103c4}', to: '\u{103c7}', },
-    Range { from: '\u{103c8}', to: '\u{103d5}', },
-    Range { from: '\u{103d6}', to: '\u{103ff}', },
-    Range { from: '\u{10400}', to: '\u{10427}', },
-    Range { from: '\u{10428}', to: '\u{1049d}', },
-    Range { from: '\u{1049e}', to: '\u{1049f}', },
-    Range { from: '\u{104a0}', to: '\u{104a9}', },
-    Range { from: '\u{104aa}', to: '\u{104af}', },
-    Range { from: '\u{104b0}', to: '\u{104d3}', },
-    Range { from: '\u{104d4}', to: '\u{104d7}', },
-    Range { from: '\u{104d8}', to: '\u{104fb}', },
-    Range { from: '\u{104fc}', to: '\u{104ff}', },
-    Range { from: '\u{10500}', to: '\u{10527}', },
-    Range { from: '\u{10528}', to: '\u{1052f}', },
-    Range { from: '\u{10530}', to: '\u{10563}', },
-    Range { from: '\u{10564}', to: '\u{1056e}', },
-    Range { from: '\u{1056f}', to: '\u{1056f}', },
-    Range { from: '\u{10570}', to: '\u{105ff}', },
-    Range { from: '\u{10600}', to: '\u{10736}', },
-    Range { from: '\u{10737}', to: '\u{1073f}', },
-    Range { from: '\u{10740}', to: '\u{10755}', },
-    Range { from: '\u{10756}', to: '\u{1075f}', },
-    Range { from: '\u{10760}', to: '\u{10767}', },
-    Range { from: '\u{10768}', to: '\u{107ff}', },
-    Range { from: '\u{10800}', to: '\u{10805}', },
-    Range { from: '\u{10806}', to: '\u{10807}', },
-    Range { from: '\u{10808}', to: '\u{10809}', },
-    Range { from: '\u{1080a}', to: '\u{10835}', },
-    Range { from: '\u{10836}', to: '\u{10836}', },
-    Range { from: '\u{10837}', to: '\u{10838}', },
-    Range { from: '\u{10839}', to: '\u{1083b}', },
-    Range { from: '\u{1083c}', to: '\u{1083c}', },
-    Range { from: '\u{1083d}', to: '\u{1083e}', },
-    Range { from: '\u{1083f}', to: '\u{10855}', },
-    Range { from: '\u{10856}', to: '\u{10856}', },
-    Range { from: '\u{10857}', to: '\u{1089e}', },
-    Range { from: '\u{1089f}', to: '\u{108a6}', },
-    Range { from: '\u{108a7}', to: '\u{108af}', },
-    Range { from: '\u{108b0}', to: '\u{108df}', },
-    Range { from: '\u{108e0}', to: '\u{108f2}', },
-    Range { from: '\u{108f3}', to: '\u{108f3}', },
-    Range { from: '\u{108f4}', to: '\u{108f5}', },
-    Range { from: '\u{108f6}', to: '\u{108fa}', },
-    Range { from: '\u{108fb}', to: '\u{1091b}', },
-    Range { from: '\u{1091c}', to: '\u{1091e}', },
-    Range { from: '\u{1091f}', to: '\u{10939}', },
-    Range { from: '\u{1093a}', to: '\u{1093e}', },
-    Range { from: '\u{1093f}', to: '\u{1093f}', },
-    Range { from: '\u{10940}', to: '\u{1097f}', },
-    Range { from: '\u{10980}', to: '\u{109b7}', },
-    Range { from: '\u{109b8}', to: '\u{109bb}', },
-    Range { from: '\u{109bc}', to: '\u{109cf}', },
-    Range { from: '\u{109d0}', to: '\u{109d1}', },
-    Range { from: '\u{109d2}', to: '\u{10a03}', },
-    Range { from: '\u{10a04}', to: '\u{10a04}', },
-    Range { from: '\u{10a05}', to: '\u{10a06}', },
-    Range { from: '\u{10a07}', to: '\u{10a0b}', },
-    Range { from: '\u{10a0c}', to: '\u{10a13}', },
-    Range { from: '\u{10a14}', to: '\u{10a14}', },
-    Range { from: '\u{10a15}', to: '\u{10a17}', },
-    Range { from: '\u{10a18}', to: '\u{10a18}', },
-    Range { from: '\u{10a19}', to: '\u{10a33}', },
-    Range { from: '\u{10a34}', to: '\u{10a37}', },
-    Range { from: '\u{10a38}', to: '\u{10a3a}', },
-    Range { from: '\u{10a3b}', to: '\u{10a3e}', },
-    Range { from: '\u{10a3f}', to: '\u{10a47}', },
-    Range { from: '\u{10a48}', to: '\u{10a4f}', },
-    Range { from: '\u{10a50}', to: '\u{10a58}', },
-    Range { from: '\u{10a59}', to: '\u{10a5f}', },
-    Range { from: '\u{10a60}', to: '\u{10a9f}', },
-    Range { from: '\u{10aa0}', to: '\u{10abf}', },
-    Range { from: '\u{10ac0}', to: '\u{10ae6}', },
-    Range { from: '\u{10ae7}', to: '\u{10aea}', },
-    Range { from: '\u{10aeb}', to: '\u{10af6}', },
-    Range { from: '\u{10af7}', to: '\u{10aff}', },
-    Range { from: '\u{10b00}', to: '\u{10b35}', },
-    Range { from: '\u{10b36}', to: '\u{10b38}', },
-    Range { from: '\u{10b39}', to: '\u{10b55}', },
-    Range { from: '\u{10b56}', to: '\u{10b57}', },
-    Range { from: '\u{10b58}', to: '\u{10b72}', },
-    Range { from: '\u{10b73}', to: '\u{10b77}', },
-    Range { from: '\u{10b78}', to: '\u{10b91}', },
-    Range { from: '\u{10b92}', to: '\u{10b98}', },
-    Range { from: '\u{10b99}', to: '\u{10b9c}', },
-    Range { from: '\u{10b9d}', to: '\u{10ba8}', },
-    Range { from: '\u{10ba9}', to: '\u{10baf}', },
-    Range { from: '\u{10bb0}', to: '\u{10bff}', },
-    Range { from: '\u{10c00}', to: '\u{10c48}', },
-    Range { from: '\u{10c49}', to: '\u{10c7f}', },
-    Range { from: '\u{10c80}', to: '\u{10cb2}', },
-    Range { from: '\u{10cb3}', to: '\u{10cbf}', },
-    Range { from: '\u{10cc0}', to: '\u{10cf2}', },
-    Range { from: '\u{10cf3}', to: '\u{10cf9}', },
-    Range { from: '\u{10cfa}', to: '\u{10cff}', },
-    Range { from: '\u{10d00}', to: '\u{10e5f}', },
-    Range { from: '\u{10e60}', to: '\u{10e7e}', },
-    Range { from: '\u{10e7f}', to: '\u{10fff}', },
-    Range { from: '\u{11000}', to: '\u{1104d}', },
-    Range { from: '\u{1104e}', to: '\u{11051}', },
-    Range { from: '\u{11052}', to: '\u{1106f}', },
-    Range { from: '\u{11070}', to: '\u{1107e}', },
-    Range { from: '\u{1107f}', to: '\u{110bc}', },
-    Range { from: '\u{110bd}', to: '\u{110bd}', },
-    Range { from: '\u{110be}', to: '\u{110c1}', },
-    Range { from: '\u{110c2}', to: '\u{110cf}', },
-    Range { from: '\u{110d0}', to: '\u{110e8}', },
-    Range { from: '\u{110e9}', to: '\u{110ef}', },
-    Range { from: '\u{110f0}', to: '\u{110f9}', },
-    Range { from: '\u{110fa}', to: '\u{110ff}', },
-    Range { from: '\u{11100}', to: '\u{11134}', },
-    Range { from: '\u{11135}', to: '\u{11135}', },
-    Range { from: '\u{11136}', to: '\u{11143}', },
-    Range { from: '\u{11144}', to: '\u{1114f}', },
-    Range { from: '\u{11150}', to: '\u{11176}', },
-    Range { from: '\u{11177}', to: '\u{1117f}', },
-    Range { from: '\u{11180}', to: '\u{111cd}', },
-    Range { from: '\u{111ce}', to: '\u{111cf}', },
-    Range { from: '\u{111d0}', to: '\u{111df}', },
-    Range { from: '\u{111e0}', to: '\u{111e0}', },
-    Range { from: '\u{111e1}', to: '\u{111f4}', },
-    Range { from: '\u{111f5}', to: '\u{111ff}', },
-    Range { from: '\u{11200}', to: '\u{11211}', },
-    Range { from: '\u{11212}', to: '\u{11212}', },
-    Range { from: '\u{11213}', to: '\u{1123e}', },
-    Range { from: '\u{1123f}', to: '\u{1127f}', },
-    Range { from: '\u{11280}', to: '\u{11286}', },
-    Range { from: '\u{11287}', to: '\u{11289}', },
-    Range { from: '\u{1128a}', to: '\u{1128d}', },
-    Range { from: '\u{1128e}', to: '\u{1128e}', },
-    Range { from: '\u{1128f}', to: '\u{1129d}', },
-    Range { from: '\u{1129e}', to: '\u{1129e}', },
-    Range { from: '\u{1129f}', to: '\u{112a9}', },
-    Range { from: '\u{112aa}', to: '\u{112af}', },
-    Range { from: '\u{112b0}', to: '\u{112ea}', },
-    Range { from: '\u{112eb}', to: '\u{112ef}', },
-    Range { from: '\u{112f0}', to: '\u{112f9}', },
-    Range { from: '\u{112fa}', to: '\u{112ff}', },
-    Range { from: '\u{11300}', to: '\u{11303}', },
-    Range { from: '\u{11304}', to: '\u{11304}', },
-    Range { from: '\u{11305}', to: '\u{1130c}', },
-    Range { from: '\u{1130d}', to: '\u{1130e}', },
-    Range { from: '\u{1130f}', to: '\u{11310}', },
-    Range { from: '\u{11311}', to: '\u{11312}', },
-    Range { from: '\u{11313}', to: '\u{11328}', },
-    Range { from: '\u{11329}', to: '\u{11329}', },
-    Range { from: '\u{1132a}', to: '\u{11330}', },
-    Range { from: '\u{11331}', to: '\u{11331}', },
-    Range { from: '\u{11332}', to: '\u{11333}', },
-    Range { from: '\u{11334}', to: '\u{11334}', },
-    Range { from: '\u{11335}', to: '\u{11339}', },
-    Range { from: '\u{1133a}', to: '\u{1133b}', },
-    Range { from: '\u{1133c}', to: '\u{11344}', },
-    Range { from: '\u{11345}', to: '\u{11346}', },
-    Range { from: '\u{11347}', to: '\u{11348}', },
-    Range { from: '\u{11349}', to: '\u{1134a}', },
-    Range { from: '\u{1134b}', to: '\u{1134d}', },
-    Range { from: '\u{1134e}', to: '\u{1134f}', },
-    Range { from: '\u{11350}', to: '\u{11350}', },
-    Range { from: '\u{11351}', to: '\u{11356}', },
-    Range { from: '\u{11357}', to: '\u{11357}', },
-    Range { from: '\u{11358}', to: '\u{1135c}', },
-    Range { from: '\u{1135d}', to: '\u{11363}', },
-    Range { from: '\u{11364}', to: '\u{11365}', },
-    Range { from: '\u{11366}', to: '\u{1136c}', },
-    Range { from: '\u{1136d}', to: '\u{1136f}', },
-    Range { from: '\u{11370}', to: '\u{11374}', },
-    Range { from: '\u{11375}', to: '\u{113ff}', },
-    Range { from: '\u{11400}', to: '\u{11459}', },
-    Range { from: '\u{1145a}', to: '\u{1145d}', },
-    Range { from: '\u{1145e}', to: '\u{1147f}', },
-    Range { from: '\u{11480}', to: '\u{114c7}', },
-    Range { from: '\u{114c8}', to: '\u{114cf}', },
-    Range { from: '\u{114d0}', to: '\u{114d9}', },
-    Range { from: '\u{114da}', to: '\u{1157f}', },
-    Range { from: '\u{11580}', to: '\u{115b5}', },
-    Range { from: '\u{115b6}', to: '\u{115b7}', },
-    Range { from: '\u{115b8}', to: '\u{115dd}', },
-    Range { from: '\u{115de}', to: '\u{115ff}', },
-    Range { from: '\u{11600}', to: '\u{11644}', },
-    Range { from: '\u{11645}', to: '\u{1164f}', },
-    Range { from: '\u{11650}', to: '\u{11659}', },
-    Range { from: '\u{1165a}', to: '\u{1165f}', },
-    Range { from: '\u{11660}', to: '\u{1166c}', },
-    Range { from: '\u{1166d}', to: '\u{1167f}', },
-    Range { from: '\u{11680}', to: '\u{116b7}', },
-    Range { from: '\u{116b8}', to: '\u{116bf}', },
-    Range { from: '\u{116c0}', to: '\u{116c9}', },
-    Range { from: '\u{116ca}', to: '\u{116ff}', },
-    Range { from: '\u{11700}', to: '\u{11719}', },
-    Range { from: '\u{1171a}', to: '\u{1171c}', },
-    Range { from: '\u{1171d}', to: '\u{1172b}', },
-    Range { from: '\u{1172c}', to: '\u{1172f}', },
-    Range { from: '\u{11730}', to: '\u{1173f}', },
-    Range { from: '\u{11740}', to: '\u{1189f}', },
-    Range { from: '\u{118a0}', to: '\u{118bf}', },
-    Range { from: '\u{118c0}', to: '\u{118f2}', },
-    Range { from: '\u{118f3}', to: '\u{118fe}', },
-    Range { from: '\u{118ff}', to: '\u{118ff}', },
-    Range { from: '\u{11900}', to: '\u{119ff}', },
-    Range { from: '\u{11a00}', to: '\u{11a47}', },
-    Range { from: '\u{11a48}', to: '\u{11a4f}', },
-    Range { from: '\u{11a50}', to: '\u{11a83}', },
-    Range { from: '\u{11a84}', to: '\u{11a85}', },
-    Range { from: '\u{11a86}', to: '\u{11a9c}', },
-    Range { from: '\u{11a9d}', to: '\u{11a9d}', },
-    Range { from: '\u{11a9e}', to: '\u{11aa2}', },
-    Range { from: '\u{11aa3}', to: '\u{11abf}', },
-    Range { from: '\u{11ac0}', to: '\u{11af8}', },
-    Range { from: '\u{11af9}', to: '\u{11bff}', },
-    Range { from: '\u{11c00}', to: '\u{11c08}', },
-    Range { from: '\u{11c09}', to: '\u{11c09}', },
-    Range { from: '\u{11c0a}', to: '\u{11c36}', },
-    Range { from: '\u{11c37}', to: '\u{11c37}', },
-    Range { from: '\u{11c38}', to: '\u{11c45}', },
-    Range { from: '\u{11c46}', to: '\u{11c4f}', },
-    Range { from: '\u{11c50}', to: '\u{11c6c}', },
-    Range { from: '\u{11c6d}', to: '\u{11c6f}', },
-    Range { from: '\u{11c70}', to: '\u{11c8f}', },
-    Range { from: '\u{11c90}', to: '\u{11c91}', },
-    Range { from: '\u{11c92}', to: '\u{11ca7}', },
-    Range { from: '\u{11ca8}', to: '\u{11ca8}', },
-    Range { from: '\u{11ca9}', to: '\u{11cb6}', },
-    Range { from: '\u{11cb7}', to: '\u{11cff}', },
-    Range { from: '\u{11d00}', to: '\u{11d06}', },
-    Range { from: '\u{11d07}', to: '\u{11d07}', },
-    Range { from: '\u{11d08}', to: '\u{11d09}', },
-    Range { from: '\u{11d0a}', to: '\u{11d0a}', },
-    Range { from: '\u{11d0b}', to: '\u{11d36}', },
-    Range { from: '\u{11d37}', to: '\u{11d39}', },
-    Range { from: '\u{11d3a}', to: '\u{11d3b}', },
-    Range { from: '\u{11d3c}', to: '\u{11d3d}', },
-    Range { from: '\u{11d3e}', to: '\u{11d3e}', },
-    Range { from: '\u{11d3f}', to: '\u{11d47}', },
-    Range { from: '\u{11d48}', to: '\u{11d4f}', },
-    Range { from: '\u{11d50}', to: '\u{11d59}', },
-    Range { from: '\u{11d5a}', to: '\u{11fff}', },
-    Range { from: '\u{12000}', to: '\u{12399}', },
-    Range { from: '\u{1239a}', to: '\u{123ff}', },
-    Range { from: '\u{12400}', to: '\u{1246e}', },
-    Range { from: '\u{1246f}', to: '\u{1246f}', },
-    Range { from: '\u{12470}', to: '\u{12474}', },
-    Range { from: '\u{12475}', to: '\u{1247f}', },
-    Range { from: '\u{12480}', to: '\u{12543}', },
-    Range { from: '\u{12544}', to: '\u{12fff}', },
-    Range { from: '\u{13000}', to: '\u{1342e}', },
-    Range { from: '\u{1342f}', to: '\u{143ff}', },
-    Range { from: '\u{14400}', to: '\u{14646}', },
-    Range { from: '\u{14647}', to: '\u{167ff}', },
-    Range { from: '\u{16800}', to: '\u{16a38}', },
-    Range { from: '\u{16a39}', to: '\u{16a3f}', },
-    Range { from: '\u{16a40}', to: '\u{16a5e}', },
-    Range { from: '\u{16a5f}', to: '\u{16a5f}', },
-    Range { from: '\u{16a60}', to: '\u{16a69}', },
-    Range { from: '\u{16a6a}', to: '\u{16a6d}', },
-    Range { from: '\u{16a6e}', to: '\u{16a6f}', },
-    Range { from: '\u{16a70}', to: '\u{16acf}', },
-    Range { from: '\u{16ad0}', to: '\u{16aed}', },
-    Range { from: '\u{16aee}', to: '\u{16aef}', },
-    Range { from: '\u{16af0}', to: '\u{16af5}', },
-    Range { from: '\u{16af6}', to: '\u{16aff}', },
-    Range { from: '\u{16b00}', to: '\u{16b45}', },
-    Range { from: '\u{16b46}', to: '\u{16b4f}', },
-    Range { from: '\u{16b50}', to: '\u{16b59}', },
-    Range { from: '\u{16b5a}', to: '\u{16b5a}', },
-    Range { from: '\u{16b5b}', to: '\u{16b61}', },
-    Range { from: '\u{16b62}', to: '\u{16b62}', },
-    Range { from: '\u{16b63}', to: '\u{16b77}', },
-    Range { from: '\u{16b78}', to: '\u{16b7c}', },
-    Range { from: '\u{16b7d}', to: '\u{16b8f}', },
-    Range { from: '\u{16b90}', to: '\u{16eff}', },
-    Range { from: '\u{16f00}', to: '\u{16f44}', },
-    Range { from: '\u{16f45}', to: '\u{16f4f}', },
-    Range { from: '\u{16f50}', to: '\u{16f7e}', },
-    Range { from: '\u{16f7f}', to: '\u{16f8e}', },
-    Range { from: '\u{16f8f}', to: '\u{16f9f}', },
-    Range { from: '\u{16fa0}', to: '\u{16fdf}', },
-    Range { from: '\u{16fe0}', to: '\u{16fe1}', },
-    Range { from: '\u{16fe2}', to: '\u{16fff}', },
-    Range { from: '\u{17000}', to: '\u{187ec}', },
-    Range { from: '\u{187ed}', to: '\u{187ff}', },
-    Range { from: '\u{18800}', to: '\u{18af2}', },
-    Range { from: '\u{18af3}', to: '\u{1afff}', },
-    Range { from: '\u{1b000}', to: '\u{1b11e}', },
-    Range { from: '\u{1b11f}', to: '\u{1b16f}', },
-    Range { from: '\u{1b170}', to: '\u{1b2fb}', },
-    Range { from: '\u{1b2fc}', to: '\u{1bbff}', },
-    Range { from: '\u{1bc00}', to: '\u{1bc6a}', },
-    Range { from: '\u{1bc6b}', to: '\u{1bc6f}', },
-    Range { from: '\u{1bc70}', to: '\u{1bc7c}', },
-    Range { from: '\u{1bc7d}', to: '\u{1bc7f}', },
-    Range { from: '\u{1bc80}', to: '\u{1bc88}', },
-    Range { from: '\u{1bc89}', to: '\u{1bc8f}', },
-    Range { from: '\u{1bc90}', to: '\u{1bc99}', },
-    Range { from: '\u{1bc9a}', to: '\u{1bc9b}', },
-    Range { from: '\u{1bc9c}', to: '\u{1bc9f}', },
-    Range { from: '\u{1bca0}', to: '\u{1bca3}', },
-    Range { from: '\u{1bca4}', to: '\u{1cfff}', },
-    Range { from: '\u{1d000}', to: '\u{1d0f5}', },
-    Range { from: '\u{1d0f6}', to: '\u{1d0ff}', },
-    Range { from: '\u{1d100}', to: '\u{1d126}', },
-    Range { from: '\u{1d127}', to: '\u{1d128}', },
-    Range { from: '\u{1d129}', to: '\u{1d15d}', },
-    Range { from: '\u{1d15e}', to: '\u{1d164}', },
-    Range { from: '\u{1d165}', to: '\u{1d172}', },
-    Range { from: '\u{1d173}', to: '\u{1d17a}', },
-    Range { from: '\u{1d17b}', to: '\u{1d1ba}', },
-    Range { from: '\u{1d1bb}', to: '\u{1d1c0}', },
-    Range { from: '\u{1d1c1}', to: '\u{1d1e8}', },
-    Range { from: '\u{1d1e9}', to: '\u{1d1ff}', },
-    Range { from: '\u{1d200}', to: '\u{1d245}', },
-    Range { from: '\u{1d246}', to: '\u{1d2ff}', },
-    Range { from: '\u{1d300}', to: '\u{1d356}', },
-    Range { from: '\u{1d357}', to: '\u{1d35f}', },
-    Range { from: '\u{1d360}', to: '\u{1d371}', },
-    Range { from: '\u{1d372}', to: '\u{1d3ff}', },
-    Range { from: '\u{1d400}', to: '\u{1d49f}', },
-    Range { from: '\u{1d4a0}', to: '\u{1d4a1}', },
-    Range { from: '\u{1d4a2}', to: '\u{1d4a2}', },
-    Range { from: '\u{1d4a3}', to: '\u{1d4a4}', },
-    Range { from: '\u{1d4a5}', to: '\u{1d4a6}', },
-    Range { from: '\u{1d4a7}', to: '\u{1d4a8}', },
-    Range { from: '\u{1d4a9}', to: '\u{1d50a}', },
-    Range { from: '\u{1d50b}', to: '\u{1d50c}', },
-    Range { from: '\u{1d50d}', to: '\u{1d546}', },
-    Range { from: '\u{1d547}', to: '\u{1d549}', },
-    Range { from: '\u{1d54a}', to: '\u{1d6a5}', },
-    Range { from: '\u{1d6a6}', to: '\u{1d6a7}', },
-    Range { from: '\u{1d6a8}', to: '\u{1d6d2}', },
-    Range { from: '\u{1d6d3}', to: '\u{1d6d4}', },
-    Range { from: '\u{1d6d5}', to: '\u{1d70c}', },
-    Range { from: '\u{1d70d}', to: '\u{1d70e}', },
-    Range { from: '\u{1d70f}', to: '\u{1d746}', },
-    Range { from: '\u{1d747}', to: '\u{1d748}', },
-    Range { from: '\u{1d749}', to: '\u{1d780}', },
-    Range { from: '\u{1d781}', to: '\u{1d782}', },
-    Range { from: '\u{1d783}', to: '\u{1d7ba}', },
-    Range { from: '\u{1d7bb}', to: '\u{1d7bc}', },
-    Range { from: '\u{1d7bd}', to: '\u{1d7c9}', },
-    Range { from: '\u{1d7ca}', to: '\u{1d7cb}', },
-    Range { from: '\u{1d7cc}', to: '\u{1d7cd}', },
-    Range { from: '\u{1d7ce}', to: '\u{1d7ff}', },
-    Range { from: '\u{1d800}', to: '\u{1da8b}', },
-    Range { from: '\u{1da8c}', to: '\u{1da9a}', },
-    Range { from: '\u{1da9b}', to: '\u{1da9f}', },
-    Range { from: '\u{1daa0}', to: '\u{1daa0}', },
-    Range { from: '\u{1daa1}', to: '\u{1daaf}', },
-    Range { from: '\u{1dab0}', to: '\u{1dfff}', },
-    Range { from: '\u{1e000}', to: '\u{1e006}', },
-    Range { from: '\u{1e007}', to: '\u{1e007}', },
-    Range { from: '\u{1e008}', to: '\u{1e018}', },
-    Range { from: '\u{1e019}', to: '\u{1e01a}', },
-    Range { from: '\u{1e01b}', to: '\u{1e021}', },
-    Range { from: '\u{1e022}', to: '\u{1e022}', },
-    Range { from: '\u{1e023}', to: '\u{1e024}', },
-    Range { from: '\u{1e025}', to: '\u{1e025}', },
-    Range { from: '\u{1e026}', to: '\u{1e02a}', },
-    Range { from: '\u{1e02b}', to: '\u{1e7ff}', },
-    Range { from: '\u{1e800}', to: '\u{1e8c4}', },
-    Range { from: '\u{1e8c5}', to: '\u{1e8c6}', },
-    Range { from: '\u{1e8c7}', to: '\u{1e8d6}', },
-    Range { from: '\u{1e8d7}', to: '\u{1e8ff}', },
-    Range { from: '\u{1e900}', to: '\u{1e921}', },
-    Range { from: '\u{1e922}', to: '\u{1e94a}', },
-    Range { from: '\u{1e94b}', to: '\u{1e94f}', },
-    Range { from: '\u{1e950}', to: '\u{1e959}', },
-    Range { from: '\u{1e95a}', to: '\u{1e95d}', },
-    Range { from: '\u{1e95e}', to: '\u{1e95f}', },
-    Range { from: '\u{1e960}', to: '\u{1edff}', },
-    Range { from: '\u{1ee00}', to: '\u{1ee24}', },
-    Range { from: '\u{1ee25}', to: '\u{1ee26}', },
-    Range { from: '\u{1ee27}', to: '\u{1ee3b}', },
-    Range { from: '\u{1ee3c}', to: '\u{1ee41}', },
-    Range { from: '\u{1ee42}', to: '\u{1ee42}', },
-    Range { from: '\u{1ee43}', to: '\u{1ee46}', },
-    Range { from: '\u{1ee47}', to: '\u{1ee54}', },
-    Range { from: '\u{1ee55}', to: '\u{1ee56}', },
-    Range { from: '\u{1ee57}', to: '\u{1ee64}', },
-    Range { from: '\u{1ee65}', to: '\u{1ee66}', },
-    Range { from: '\u{1ee67}', to: '\u{1ee9b}', },
-    Range { from: '\u{1ee9c}', to: '\u{1eea0}', },
-    Range { from: '\u{1eea1}', to: '\u{1eebb}', },
-    Range { from: '\u{1eebc}', to: '\u{1eeef}', },
-    Range { from: '\u{1eef0}', to: '\u{1eef1}', },
-    Range { from: '\u{1eef2}', to: '\u{1efff}', },
-    Range { from: '\u{1f000}', to: '\u{1f02b}', },
-    Range { from: '\u{1f02c}', to: '\u{1f02f}', },
-    Range { from: '\u{1f030}', to: '\u{1f093}', },
-    Range { from: '\u{1f094}', to: '\u{1f09f}', },
-    Range { from: '\u{1f0a0}', to: '\u{1f0ae}', },
-    Range { from: '\u{1f0af}', to: '\u{1f0b0}', },
-    Range { from: '\u{1f0b1}', to: '\u{1f0bf}', },
-    Range { from: '\u{1f0c0}', to: '\u{1f0c0}', },
-    Range { from: '\u{1f0c1}', to: '\u{1f0cf}', },
-    Range { from: '\u{1f0d0}', to: '\u{1f0d0}', },
-    Range { from: '\u{1f0d1}', to: '\u{1f0f5}', },
-    Range { from: '\u{1f0f6}', to: '\u{1f100}', },
-    Range { from: '\u{1f101}', to: '\u{1f10a}', },
-    Range { from: '\u{1f10b}', to: '\u{1f10c}', },
-    Range { from: '\u{1f10d}', to: '\u{1f10f}', },
-    Range { from: '\u{1f110}', to: '\u{1f14f}', },
-    Range { from: '\u{1f150}', to: '\u{1f169}', },
-    Range { from: '\u{1f16a}', to: '\u{1f16b}', },
-    Range { from: '\u{1f16c}', to: '\u{1f16f}', },
-    Range { from: '\u{1f170}', to: '\u{1f18f}', },
-    Range { from: '\u{1f190}', to: '\u{1f190}', },
-    Range { from: '\u{1f191}', to: '\u{1f1ac}', },
-    Range { from: '\u{1f1ad}', to: '\u{1f1e5}', },
-    Range { from: '\u{1f1e6}', to: '\u{1f1ff}', },
-    Range { from: '\u{1f200}', to: '\u{1f202}', },
-    Range { from: '\u{1f203}', to: '\u{1f20f}', },
-    Range { from: '\u{1f210}', to: '\u{1f23b}', },
-    Range { from: '\u{1f23c}', to: '\u{1f23f}', },
-    Range { from: '\u{1f240}', to: '\u{1f248}', },
-    Range { from: '\u{1f249}', to: '\u{1f24f}', },
-    Range { from: '\u{1f250}', to: '\u{1f251}', },
-    Range { from: '\u{1f252}', to: '\u{1f25f}', },
-    Range { from: '\u{1f260}', to: '\u{1f265}', },
-    Range { from: '\u{1f266}', to: '\u{1f2ff}', },
-    Range { from: '\u{1f300}', to: '\u{1f6d4}', },
-    Range { from: '\u{1f6d5}', to: '\u{1f6df}', },
-    Range { from: '\u{1f6e0}', to: '\u{1f6ec}', },
-    Range { from: '\u{1f6ed}', to: '\u{1f6ef}', },
-    Range { from: '\u{1f6f0}', to: '\u{1f6f8}', },
-    Range { from: '\u{1f6f9}', to: '\u{1f6ff}', },
-    Range { from: '\u{1f700}', to: '\u{1f773}', },
-    Range { from: '\u{1f774}', to: '\u{1f77f}', },
-    Range { from: '\u{1f780}', to: '\u{1f7d4}', },
-    Range { from: '\u{1f7d5}', to: '\u{1f7ff}', },
-    Range { from: '\u{1f800}', to: '\u{1f80b}', },
-    Range { from: '\u{1f80c}', to: '\u{1f80f}', },
-    Range { from: '\u{1f810}', to: '\u{1f847}', },
-    Range { from: '\u{1f848}', to: '\u{1f84f}', },
-    Range { from: '\u{1f850}', to: '\u{1f859}', },
-    Range { from: '\u{1f85a}', to: '\u{1f85f}', },
-    Range { from: '\u{1f860}', to: '\u{1f887}', },
-    Range { from: '\u{1f888}', to: '\u{1f88f}', },
-    Range { from: '\u{1f890}', to: '\u{1f8ad}', },
-    Range { from: '\u{1f8ae}', to: '\u{1f8ff}', },
-    Range { from: '\u{1f900}', to: '\u{1f90b}', },
-    Range { from: '\u{1f90c}', to: '\u{1f90f}', },
-    Range { from: '\u{1f910}', to: '\u{1f93e}', },
-    Range { from: '\u{1f93f}', to: '\u{1f93f}', },
-    Range { from: '\u{1f940}', to: '\u{1f94c}', },
-    Range { from: '\u{1f94d}', to: '\u{1f94f}', },
-    Range { from: '\u{1f950}', to: '\u{1f96b}', },
-    Range { from: '\u{1f96c}', to: '\u{1f97f}', },
-    Range { from: '\u{1f980}', to: '\u{1f997}', },
-    Range { from: '\u{1f998}', to: '\u{1f9bf}', },
-    Range { from: '\u{1f9c0}', to: '\u{1f9c0}', },
-    Range { from: '\u{1f9c1}', to: '\u{1f9cf}', },
-    Range { from: '\u{1f9d0}', to: '\u{1f9e6}', },
-    Range { from: '\u{1f9e7}', to: '\u{1ffff}', },
-    Range { from: '\u{20000}', to: '\u{2a6d6}', },
-    Range { from: '\u{2a6d7}', to: '\u{2a6ff}', },
-    Range { from: '\u{2a700}', to: '\u{2b734}', },
-    Range { from: '\u{2b735}', to: '\u{2b73f}', },
-    Range { from: '\u{2b740}', to: '\u{2b81d}', },
-    Range { from: '\u{2b81e}', to: '\u{2b81f}', },
-    Range { from: '\u{2b820}', to: '\u{2cea1}', },
-    Range { from: '\u{2cea2}', to: '\u{2ceaf}', },
-    Range { from: '\u{2ceb0}', to: '\u{2ebe0}', },
-    Range { from: '\u{2ebe1}', to: '\u{2f7ff}', },
-    Range { from: '\u{2f800}', to: '\u{2f830}', },
-    Range { from: '\u{2f831}', to: '\u{2f833}', },
-    Range { from: '\u{2f834}', to: '\u{2f844}', },
-    Range { from: '\u{2f845}', to: '\u{2f846}', },
-    Range { from: '\u{2f847}', to: '\u{2f869}', },
-    Range { from: '\u{2f86a}', to: '\u{2f86b}', },
-    Range { from: '\u{2f86c}', to: '\u{2f890}', },
-    Range { from: '\u{2f891}', to: '\u{2f892}', },
-    Range { from: '\u{2f893}', to: '\u{2f893}', },
-    Range { from: '\u{2f894}', to: '\u{2f895}', },
-    Range { from: '\u{2f896}', to: '\u{2f92b}', },
-    Range { from: '\u{2f92c}', to: '\u{2f92d}', },
-    Range { from: '\u{2f92e}', to: '\u{2f945}', },
-    Range { from: '\u{2f946}', to: '\u{2f947}', },
-    Range { from: '\u{2f948}', to: '\u{2f95c}', },
-    Range { from: '\u{2f95d}', to: '\u{2f95e}', },
-    Range { from: '\u{2f95f}', to: '\u{2f9fd}', },
-    Range { from: '\u{2f9fe}', to: '\u{2f9ff}', },
-    Range { from: '\u{2fa00}', to: '\u{2fa1d}', },
-    Range { from: '\u{2fa1e}', to: '\u{e00ff}', },
-    Range { from: '\u{e0100}', to: '\u{e01ef}', },
-    Range { from: '\u{e01f0}', to: '\u{10ffff}', },
+static TABLE: &[(char, u16)] = &[
+    ('\u{0}', 32768),
+    ('\u{2d}', 32769),
+    ('\u{2f}', 32770),
+    ('\u{30}', 32771),
+    ('\u{3a}', 32772),
+    ('\u{41}', 5),
+    ('\u{5b}', 32799),
+    ('\u{61}', 32800),
+    ('\u{7b}', 32801),
+    ('\u{80}', 32802),
+    ('\u{a0}', 32803),
+    ('\u{a1}', 32804),
+    ('\u{a8}', 37),
+    ('\u{ab}', 32808),
+    ('\u{ad}', 41),
+    ('\u{b0}', 32812),
+    ('\u{b2}', 45),
+    ('\u{e0}', 32859),
+    ('\u{f7}', 32860),
+    ('\u{f8}', 32861),
+    ('\u{100}', 94),
+    ('\u{132}', 32912),
+    ('\u{134}', 145),
+    ('\u{137}', 32916),
+    ('\u{139}', 149),
+    ('\u{13f}', 32923),
+    ('\u{141}', 156),
+    ('\u{18c}', 32999),
+    ('\u{18e}', 232),
+    ('\u{199}', 33011),
+    ('\u{19c}', 244),
+    ('\u{1aa}', 33026),
+    ('\u{1ac}', 259),
+    ('\u{1b9}', 33040),
+    ('\u{1bc}', 33041),
+    ('\u{1bd}', 33042),
+    ('\u{1c4}', 33043),
+    ('\u{1c7}', 33044),
+    ('\u{1ca}', 33045),
+    ('\u{1cd}', 278),
+    ('\u{1dc}', 33061),
+    ('\u{1de}', 294),
+    ('\u{1ef}', 33079),
+    ('\u{1f1}', 33080),
+    ('\u{1f4}', 313),
+    ('\u{233}', 33144),
+    ('\u{23a}', 377),
+    ('\u{23f}', 33150),
+    ('\u{241}', 383),
+    ('\u{24f}', 33165),
+    ('\u{2b0}', 398),
+    ('\u{2b9}', 33175),
+    ('\u{2c2}', 33176),
+    ('\u{2c6}', 33177),
+    ('\u{2d2}', 33178),
+    ('\u{2d8}', 411),
+    ('\u{2de}', 33185),
+    ('\u{2e0}', 418),
+    ('\u{2e5}', 33191),
+    ('\u{2ec}', 424),
+    ('\u{2ef}', 33195),
+    ('\u{300}', 33196),
+    ('\u{340}', 429),
+    ('\u{346}', 33203),
+    ('\u{34f}', 33204),
+    ('\u{350}', 33205),
+    ('\u{370}', 438),
+    ('\u{378}', 33214),
+    ('\u{37a}', 33215),
+    ('\u{37b}', 33216),
+    ('\u{37e}', 449),
+    ('\u{380}', 33219),
+    ('\u{384}', 452),
+    ('\u{3ac}', 33260),
+    ('\u{3c2}', 33261),
+    ('\u{3c3}', 33262),
+    ('\u{3cf}', 495),
+    ('\u{3fb}', 33307),
+    ('\u{3fd}', 540),
+    ('\u{430}', 33359),
+    ('\u{460}', 592),
+    ('\u{483}', 33395),
+    ('\u{488}', 33396),
+    ('\u{48a}', 629),
+    ('\u{4ce}', 33465),
+    ('\u{4d0}', 698),
+    ('\u{557}', 33601),
+    ('\u{559}', 33602),
+    ('\u{55a}', 33603),
+    ('\u{560}', 33604),
+    ('\u{587}', 837),
+    ('\u{589}', 33607),
+    ('\u{58b}', 33608),
+    ('\u{58d}', 33609),
+    ('\u{590}', 33610),
+    ('\u{591}', 33611),
+    ('\u{5be}', 844),
+    ('\u{5c1}', 33615),
+    ('\u{5c3}', 33616),
+    ('\u{5c4}', 33617),
+    ('\u{5c6}', 850),
+    ('\u{5c8}', 33620),
+    ('\u{5d0}', 33621),
+    ('\u{5eb}', 33622),
+    ('\u{5ef}', 33623),
+    ('\u{5f5}', 33624),
+    ('\u{606}', 33625),
+    ('\u{610}', 33626),
+    ('\u{61b}', 33627),
+    ('\u{61c}', 33628),
+    ('\u{61e}', 33629),
+    ('\u{620}', 33630),
+    ('\u{640}', 33631),
+    ('\u{641}', 33632),
+    ('\u{66a}', 33633),
+    ('\u{66e}', 33634),
+    ('\u{675}', 867),
+    ('\u{679}', 33639),
+    ('\u{6d4}', 33640),
+    ('\u{6d5}', 33641),
+    ('\u{6dd}', 874),
+    ('\u{6df}', 33644),
+    ('\u{6e9}', 33645),
+    ('\u{6ea}', 33646),
+    ('\u{700}', 33647),
+    ('\u{70e}', 33648),
+    ('\u{710}', 33649),
+    ('\u{74b}', 33650),
+    ('\u{74d}', 33651),
+    ('\u{7b2}', 33652),
+    ('\u{7c0}', 33653),
+    ('\u{7f6}', 33654),
+    ('\u{7fb}', 33655),
+    ('\u{7fd}', 33656),
+    ('\u{7fe}', 33657),
+    ('\u{800}', 33658),
+    ('\u{82e}', 33659),
+    ('\u{830}', 33660),
+    ('\u{83f}', 33661),
+    ('\u{840}', 33662),
+    ('\u{85c}', 33663),
+    ('\u{85e}', 896),
+    ('\u{860}', 33666),
+    ('\u{86b}', 33667),
+    ('\u{8a0}', 33668),
+    ('\u{8b5}', 33669),
+    ('\u{8b6}', 33670),
+    ('\u{8c8}', 33671),
+    ('\u{8d3}', 33672),
+    ('\u{8e2}', 33673),
+    ('\u{8e3}', 33674),
+    ('\u{958}', 907),
+    ('\u{960}', 33683),
+    ('\u{964}', 33684),
+    ('\u{966}', 33685),
+    ('\u{970}', 33686),
+    ('\u{971}', 33687),
+    ('\u{984}', 33688),
+    ('\u{985}', 33689),
+    ('\u{98d}', 33690),
+    ('\u{98f}', 33691),
+    ('\u{991}', 33692),
+    ('\u{993}', 33693),
+    ('\u{9a9}', 33694),
+    ('\u{9aa}', 33695),
+    ('\u{9b1}', 928),
+    ('\u{9b3}', 33698),
+    ('\u{9b6}', 33699),
+    ('\u{9ba}', 33700),
+    ('\u{9bc}', 33701),
+    ('\u{9c5}', 33702),
+    ('\u{9c7}', 33703),
+    ('\u{9c9}', 33704),
+    ('\u{9cb}', 33705),
+    ('\u{9cf}', 33706),
+    ('\u{9d7}', 33707),
+    ('\u{9d8}', 33708),
+    ('\u{9dc}', 941),
+    ('\u{9e0}', 33713),
+    ('\u{9e4}', 33714),
+    ('\u{9e6}', 33715),
+    ('\u{9f2}', 33716),
+    ('\u{9fc}', 949),
+    ('\u{9ff}', 33720),
+    ('\u{a01}', 33721),
+    ('\u{a04}', 33722),
+    ('\u{a05}', 33723),
+    ('\u{a0b}', 33724),
+    ('\u{a0f}', 33725),
+    ('\u{a11}', 33726),
+    ('\u{a13}', 33727),
+    ('\u{a29}', 33728),
+    ('\u{a2a}', 33729),
+    ('\u{a31}', 962),
+    ('\u{a38}', 33737),
+    ('\u{a3a}', 33738),
+    ('\u{a3c}', 971),
+    ('\u{a3e}', 33741),
+    ('\u{a43}', 33742),
+    ('\u{a47}', 33743),
+    ('\u{a49}', 33744),
+    ('\u{a4b}', 33745),
+    ('\u{a4e}', 33746),
+    ('\u{a51}', 33747),
+    ('\u{a52}', 33748),
+    ('\u{a59}', 981),
+    ('\u{a5f}', 33755),
+    ('\u{a66}', 33756),
+    ('\u{a76}', 33757),
+    ('\u{a77}', 33758),
+    ('\u{a81}', 33759),
+    ('\u{a84}', 33760),
+    ('\u{a85}', 33761),
+    ('\u{a8e}', 33762),
+    ('\u{a8f}', 33763),
+    ('\u{a92}', 33764),
+    ('\u{a93}', 33765),
+    ('\u{aa9}', 33766),
+    ('\u{aaa}', 33767),
+    ('\u{ab1}', 33768),
+    ('\u{ab2}', 33769),
+    ('\u{ab4}', 33770),
+    ('\u{ab5}', 33771),
+    ('\u{aba}', 33772),
+    ('\u{abc}', 33773),
+    ('\u{ac6}', 33774),
+    ('\u{ac7}', 33775),
+    ('\u{aca}', 33776),
+    ('\u{acb}', 33777),
+    ('\u{ace}', 33778),
+    ('\u{ad0}', 33779),
+    ('\u{ad1}', 33780),
+    ('\u{ae0}', 33781),
+    ('\u{ae4}', 33782),
+    ('\u{ae6}', 33783),
+    ('\u{af0}', 33784),
+    ('\u{af2}', 33785),
+    ('\u{af9}', 33786),
+    ('\u{b00}', 33787),
+    ('\u{b01}', 33788),
+    ('\u{b04}', 33789),
+    ('\u{b05}', 33790),
+    ('\u{b0d}', 33791),
+    ('\u{b0f}', 33792),
+    ('\u{b11}', 33793),
+    ('\u{b13}', 33794),
+    ('\u{b29}', 33795),
+    ('\u{b2a}', 33796),
+    ('\u{b31}', 33797),
+    ('\u{b32}', 33798),
+    ('\u{b34}', 33799),
+    ('\u{b35}', 33800),
+    ('\u{b3a}', 33801),
+    ('\u{b3c}', 33802),
+    ('\u{b45}', 33803),
+    ('\u{b47}', 33804),
+    ('\u{b49}', 33805),
+    ('\u{b4b}', 33806),
+    ('\u{b4e}', 33807),
+    ('\u{b55}', 33808),
+    ('\u{b58}', 33809),
+    ('\u{b5c}', 1042),
+    ('\u{b5f}', 33813),
+    ('\u{b64}', 33814),
+    ('\u{b66}', 33815),
+    ('\u{b70}', 1048),
+    ('\u{b72}', 33818),
+    ('\u{b78}', 33819),
+    ('\u{b82}', 33820),
+    ('\u{b84}', 33821),
+    ('\u{b85}', 33822),
+    ('\u{b8b}', 33823),
+    ('\u{b8e}', 33824),
+    ('\u{b91}', 33825),
+    ('\u{b92}', 33826),
+    ('\u{b96}', 33827),
+    ('\u{b99}', 33828),
+    ('\u{b9b}', 1061),
+    ('\u{b9e}', 33832),
+    ('\u{ba0}', 33833),
+    ('\u{ba3}', 33834),
+    ('\u{ba5}', 33835),
+    ('\u{ba8}', 33836),
+    ('\u{bab}', 33837),
+    ('\u{bae}', 33838),
+    ('\u{bba}', 33839),
+    ('\u{bbe}', 33840),
+    ('\u{bc3}', 33841),
+    ('\u{bc6}', 33842),
+    ('\u{bc9}', 33843),
+    ('\u{bca}', 33844),
+    ('\u{bce}', 33845),
+    ('\u{bd0}', 33846),
+    ('\u{bd1}', 33847),
+    ('\u{bd7}', 33848),
+    ('\u{bd8}', 33849),
+    ('\u{be6}', 33850),
+    ('\u{bf0}', 33851),
+    ('\u{bfb}', 33852),
+    ('\u{c00}', 33853),
+    ('\u{c0d}', 33854),
+    ('\u{c0e}', 33855),
+    ('\u{c11}', 33856),
+    ('\u{c12}', 33857),
+    ('\u{c29}', 33858),
+    ('\u{c2a}', 33859),
+    ('\u{c3a}', 33860),
+    ('\u{c3d}', 33861),
+    ('\u{c45}', 33862),
+    ('\u{c46}', 33863),
+    ('\u{c49}', 33864),
+    ('\u{c4a}', 33865),
+    ('\u{c4e}', 33866),
+    ('\u{c55}', 33867),
+    ('\u{c57}', 33868),
+    ('\u{c58}', 33869),
+    ('\u{c5b}', 33870),
+    ('\u{c60}', 33871),
+    ('\u{c64}', 33872),
+    ('\u{c66}', 33873),
+    ('\u{c70}', 33874),
+    ('\u{c77}', 33875),
+    ('\u{c80}', 33876),
+    ('\u{c84}', 33877),
+    ('\u{c85}', 33878),
+    ('\u{c8d}', 33879),
+    ('\u{c8e}', 33880),
+    ('\u{c91}', 33881),
+    ('\u{c92}', 33882),
+    ('\u{ca9}', 33883),
+    ('\u{caa}', 33884),
+    ('\u{cb4}', 33885),
+    ('\u{cb5}', 33886),
+    ('\u{cba}', 33887),
+    ('\u{cbc}', 33888),
+    ('\u{cc5}', 33889),
+    ('\u{cc6}', 33890),
+    ('\u{cc9}', 33891),
+    ('\u{cca}', 33892),
+    ('\u{cce}', 33893),
+    ('\u{cd5}', 33894),
+    ('\u{cd7}', 33895),
+    ('\u{cde}', 1128),
+    ('\u{ce0}', 33898),
+    ('\u{ce4}', 33899),
+    ('\u{ce6}', 33900),
+    ('\u{cf0}', 33901),
+    ('\u{cf1}', 33902),
+    ('\u{cf3}', 33903),
+    ('\u{d00}', 33904),
+    ('\u{d0d}', 33905),
+    ('\u{d0e}', 33906),
+    ('\u{d11}', 33907),
+    ('\u{d12}', 33908),
+    ('\u{d45}', 33909),
+    ('\u{d46}', 33910),
+    ('\u{d49}', 33911),
+    ('\u{d4a}', 33912),
+    ('\u{d4f}', 33913),
+    ('\u{d50}', 33914),
+    ('\u{d54}', 33915),
+    ('\u{d58}', 33916),
+    ('\u{d5f}', 33917),
+    ('\u{d64}', 33918),
+    ('\u{d66}', 33919),
+    ('\u{d70}', 33920),
+    ('\u{d7a}', 33921),
+    ('\u{d80}', 33922),
+    ('\u{d81}', 33923),
+    ('\u{d84}', 33924),
+    ('\u{d85}', 33925),
+    ('\u{d97}', 33926),
+    ('\u{d9a}', 33927),
+    ('\u{db2}', 33928),
+    ('\u{db3}', 33929),
+    ('\u{dbc}', 1162),
+    ('\u{dbe}', 33932),
+    ('\u{dc0}', 33933),
+    ('\u{dc7}', 33934),
+    ('\u{dca}', 33935),
+    ('\u{dcb}', 33936),
+    ('\u{dcf}', 33937),
+    ('\u{dd5}', 1170),
+    ('\u{dd8}', 33941),
+    ('\u{de0}', 33942),
+    ('\u{de6}', 33943),
+    ('\u{df0}', 33944),
+    ('\u{df2}', 33945),
+    ('\u{df4}', 33946),
+    ('\u{df5}', 33947),
+    ('\u{e01}', 33948),
+    ('\u{e33}', 33949),
+    ('\u{e34}', 33950),
+    ('\u{e3b}', 33951),
+    ('\u{e3f}', 33952),
+    ('\u{e40}', 33953),
+    ('\u{e4f}', 33954),
+    ('\u{e50}', 33955),
+    ('\u{e5a}', 33956),
+    ('\u{e5c}', 33957),
+    ('\u{e81}', 33958),
+    ('\u{e83}', 1191),
+    ('\u{e86}', 33962),
+    ('\u{e8b}', 33963),
+    ('\u{e8c}', 33964),
+    ('\u{ea4}', 1197),
+    ('\u{ea7}', 33968),
+    ('\u{eb3}', 33969),
+    ('\u{eb4}', 33970),
+    ('\u{ebe}', 33971),
+    ('\u{ec0}', 33972),
+    ('\u{ec5}', 1205),
+    ('\u{ec8}', 33976),
+    ('\u{ece}', 33977),
+    ('\u{ed0}', 33978),
+    ('\u{eda}', 33979),
+    ('\u{edc}', 1212),
+    ('\u{ede}', 33982),
+    ('\u{ee0}', 33983),
+    ('\u{f00}', 33984),
+    ('\u{f01}', 33985),
+    ('\u{f0b}', 1218),
+    ('\u{f0d}', 33988),
+    ('\u{f18}', 33989),
+    ('\u{f1a}', 33990),
+    ('\u{f20}', 33991),
+    ('\u{f2a}', 33992),
+    ('\u{f35}', 1225),
+    ('\u{f3a}', 33998),
+    ('\u{f3e}', 33999),
+    ('\u{f43}', 34000),
+    ('\u{f44}', 34001),
+    ('\u{f48}', 34002),
+    ('\u{f49}', 34003),
+    ('\u{f4d}', 34004),
+    ('\u{f4e}', 34005),
+    ('\u{f52}', 34006),
+    ('\u{f53}', 34007),
+    ('\u{f57}', 34008),
+    ('\u{f58}', 34009),
+    ('\u{f5c}', 34010),
+    ('\u{f5d}', 34011),
+    ('\u{f69}', 34012),
+    ('\u{f6a}', 34013),
+    ('\u{f6d}', 34014),
+    ('\u{f71}', 34015),
+    ('\u{f73}', 1248),
+    ('\u{f7a}', 34023),
+    ('\u{f81}', 34024),
+    ('\u{f82}', 34025),
+    ('\u{f85}', 34026),
+    ('\u{f86}', 34027),
+    ('\u{f93}', 34028),
+    ('\u{f94}', 34029),
+    ('\u{f98}', 34030),
+    ('\u{f99}', 34031),
+    ('\u{f9d}', 34032),
+    ('\u{f9e}', 34033),
+    ('\u{fa2}', 34034),
+    ('\u{fa3}', 34035),
+    ('\u{fa7}', 34036),
+    ('\u{fa8}', 34037),
+    ('\u{fac}', 34038),
+    ('\u{fad}', 34039),
+    ('\u{fb9}', 34040),
+    ('\u{fba}', 34041),
+    ('\u{fbd}', 34042),
+    ('\u{fbe}', 34043),
+    ('\u{fc6}', 34044),
+    ('\u{fc7}', 34045),
+    ('\u{fcd}', 34046),
+    ('\u{fce}', 34047),
+    ('\u{fdb}', 34048),
+    ('\u{1000}', 34049),
+    ('\u{104a}', 34050),
+    ('\u{1050}', 34051),
+    ('\u{109e}', 34052),
+    ('\u{10a0}', 34053),
+    ('\u{10c7}', 34054),
+    ('\u{10c8}', 34055),
+    ('\u{10cd}', 34056),
+    ('\u{10ce}', 34057),
+    ('\u{10d0}', 34058),
+    ('\u{10fb}', 1291),
+    ('\u{10fd}', 34061),
+    ('\u{1100}', 34062),
+    ('\u{115f}', 34063),
+    ('\u{1161}', 34064),
+    ('\u{1200}', 34065),
+    ('\u{1249}', 34066),
+    ('\u{124a}', 34067),
+    ('\u{124e}', 34068),
+    ('\u{1250}', 34069),
+    ('\u{1257}', 1302),
+    ('\u{125a}', 34073),
+    ('\u{125e}', 34074),
+    ('\u{1260}', 34075),
+    ('\u{1289}', 34076),
+    ('\u{128a}', 34077),
+    ('\u{128e}', 34078),
+    ('\u{1290}', 34079),
+    ('\u{12b1}', 34080),
+    ('\u{12b2}', 34081),
+    ('\u{12b6}', 34082),
+    ('\u{12b8}', 34083),
+    ('\u{12bf}', 1316),
+    ('\u{12c2}', 34087),
+    ('\u{12c6}', 34088),
+    ('\u{12c8}', 34089),
+    ('\u{12d7}', 34090),
+    ('\u{12d8}', 34091),
+    ('\u{1311}', 34092),
+    ('\u{1312}', 34093),
+    ('\u{1316}', 34094),
+    ('\u{1318}', 34095),
+    ('\u{135b}', 34096),
+    ('\u{135d}', 34097),
+    ('\u{1360}', 34098),
+    ('\u{137d}', 34099),
+    ('\u{1380}', 34100),
+    ('\u{1390}', 34101),
+    ('\u{139a}', 34102),
+    ('\u{13a0}', 34103),
+    ('\u{13f6}', 34104),
+    ('\u{13f8}', 1337),
+    ('\u{13fe}', 34111),
+    ('\u{1400}', 34112),
+    ('\u{1401}', 34113),
+    ('\u{166d}', 34114),
+    ('\u{166f}', 34115),
+    ('\u{1680}', 34116),
+    ('\u{1681}', 34117),
+    ('\u{169b}', 34118),
+    ('\u{169d}', 34119),
+    ('\u{16a0}', 34120),
+    ('\u{16eb}', 34121),
+    ('\u{16f1}', 34122),
+    ('\u{16f9}', 34123),
+    ('\u{1700}', 34124),
+    ('\u{170d}', 34125),
+    ('\u{170e}', 34126),
+    ('\u{1715}', 34127),
+    ('\u{1720}', 34128),
+    ('\u{1735}', 34129),
+    ('\u{1737}', 34130),
+    ('\u{1740}', 34131),
+    ('\u{1754}', 34132),
+    ('\u{1760}', 34133),
+    ('\u{176d}', 34134),
+    ('\u{176e}', 34135),
+    ('\u{1771}', 34136),
+    ('\u{1772}', 34137),
+    ('\u{1774}', 34138),
+    ('\u{1780}', 34139),
+    ('\u{17b4}', 34140),
+    ('\u{17b6}', 34141),
+    ('\u{17d4}', 34142),
+    ('\u{17d7}', 34143),
+    ('\u{17d8}', 34144),
+    ('\u{17dc}', 34145),
+    ('\u{17de}', 34146),
+    ('\u{17e0}', 34147),
+    ('\u{17ea}', 34148),
+    ('\u{17f0}', 34149),
+    ('\u{17fa}', 34150),
+    ('\u{1800}', 34151),
+    ('\u{1806}', 34152),
+    ('\u{1807}', 34153),
+    ('\u{180b}', 34154),
+    ('\u{180e}', 34155),
+    ('\u{1810}', 34156),
+    ('\u{181a}', 34157),
+    ('\u{1820}', 34158),
+    ('\u{1879}', 34159),
+    ('\u{1880}', 34160),
+    ('\u{18ab}', 34161),
+    ('\u{18b0}', 34162),
+    ('\u{18f6}', 34163),
+    ('\u{1900}', 34164),
+    ('\u{191f}', 34165),
+    ('\u{1920}', 34166),
+    ('\u{192c}', 34167),
+    ('\u{1930}', 34168),
+    ('\u{193c}', 34169),
+    ('\u{1940}', 34170),
+    ('\u{1941}', 34171),
+    ('\u{1944}', 34172),
+    ('\u{1946}', 34173),
+    ('\u{196e}', 34174),
+    ('\u{1970}', 34175),
+    ('\u{1975}', 34176),
+    ('\u{1980}', 34177),
+    ('\u{19ac}', 34178),
+    ('\u{19b0}', 34179),
+    ('\u{19ca}', 34180),
+    ('\u{19d0}', 34181),
+    ('\u{19da}', 34182),
+    ('\u{19db}', 34183),
+    ('\u{19de}', 34184),
+    ('\u{1a00}', 34185),
+    ('\u{1a1c}', 34186),
+    ('\u{1a1e}', 34187),
+    ('\u{1a20}', 34188),
+    ('\u{1a5f}', 34189),
+    ('\u{1a60}', 34190),
+    ('\u{1a7d}', 34191),
+    ('\u{1a7f}', 34192),
+    ('\u{1a8a}', 34193),
+    ('\u{1a90}', 34194),
+    ('\u{1a9a}', 34195),
+    ('\u{1aa0}', 34196),
+    ('\u{1aa7}', 34197),
+    ('\u{1aa8}', 34198),
+    ('\u{1aae}', 34199),
+    ('\u{1ab0}', 34200),
+    ('\u{1abe}', 34201),
+    ('\u{1abf}', 34202),
+    ('\u{1ac1}', 34203),
+    ('\u{1b00}', 34204),
+    ('\u{1b4c}', 34205),
+    ('\u{1b50}', 34206),
+    ('\u{1b5a}', 34207),
+    ('\u{1b6b}', 34208),
+    ('\u{1b74}', 34209),
+    ('\u{1b7d}', 34210),
+    ('\u{1b80}', 34211),
+    ('\u{1bf4}', 34212),
+    ('\u{1bfc}', 34213),
+    ('\u{1c00}', 34214),
+    ('\u{1c38}', 34215),
+    ('\u{1c3b}', 34216),
+    ('\u{1c40}', 34217),
+    ('\u{1c4a}', 34218),
+    ('\u{1c4d}', 34219),
+    ('\u{1c7e}', 34220),
+    ('\u{1c80}', 1453),
+    ('\u{1c84}', 34225),
+    ('\u{1c86}', 1458),
+    ('\u{1c89}', 34229),
+    ('\u{1c90}', 1462),
+    ('\u{1cbb}', 34273),
+    ('\u{1cbd}', 1506),
+    ('\u{1cc0}', 34277),
+    ('\u{1cc8}', 34278),
+    ('\u{1cd0}', 34279),
+    ('\u{1cd3}', 34280),
+    ('\u{1cd4}', 34281),
+    ('\u{1cfb}', 34282),
+    ('\u{1d00}', 34283),
+    ('\u{1d2c}', 1516),
+    ('\u{1d6b}', 34347),
+    ('\u{1d78}', 34348),
+    ('\u{1d79}', 34349),
+    ('\u{1d9b}', 1582),
+    ('\u{1dc0}', 34387),
+    ('\u{1dfa}', 34388),
+    ('\u{1dfb}', 34389),
+    ('\u{1e00}', 1622),
+    ('\u{1e95}', 34539),
+    ('\u{1e9a}', 1772),
+    ('\u{1e9c}', 34542),
+    ('\u{1e9e}', 1775),
+    ('\u{1eff}', 34640),
+    ('\u{1f08}', 1873),
+    ('\u{1f10}', 34649),
+    ('\u{1f16}', 34650),
+    ('\u{1f18}', 1883),
+    ('\u{1f1e}', 34657),
+    ('\u{1f20}', 34658),
+    ('\u{1f28}', 1891),
+    ('\u{1f30}', 34667),
+    ('\u{1f38}', 1900),
+    ('\u{1f40}', 34676),
+    ('\u{1f46}', 34677),
+    ('\u{1f48}', 1910),
+    ('\u{1f4e}', 34684),
+    ('\u{1f50}', 34685),
+    ('\u{1f58}', 1918),
+    ('\u{1f60}', 34694),
+    ('\u{1f68}', 1927),
+    ('\u{1f7e}', 34717),
+    ('\u{1f80}', 1950),
+    ('\u{1fb0}', 34766),
+    ('\u{1fb2}', 1999),
+    ('\u{1fd0}', 34797),
+    ('\u{1fd3}', 34798),
+    ('\u{1fd4}', 34799),
+    ('\u{1fd6}', 34800),
+    ('\u{1fd8}', 2033),
+    ('\u{1fe0}', 34809),
+    ('\u{1fe3}', 34810),
+    ('\u{1fe4}', 34811),
+    ('\u{1fe8}', 2044),
+    ('\u{1ff0}', 34820),
+    ('\u{1ff2}', 2053),
+    ('\u{2000}', 34835),
+    ('\u{200b}', 34836),
+    ('\u{200c}', 34837),
+    ('\u{200e}', 34838),
+    ('\u{2010}', 2071),
+    ('\u{2012}', 34841),
+    ('\u{2017}', 34842),
+    ('\u{2018}', 34843),
+    ('\u{2024}', 34844),
+    ('\u{2027}', 34845),
+    ('\u{2028}', 34846),
+    ('\u{202f}', 34847),
+    ('\u{2030}', 34848),
+    ('\u{2033}', 2081),
+    ('\u{2038}', 34854),
+    ('\u{203c}', 2087),
+    ('\u{203f}', 34858),
+    ('\u{2047}', 2091),
+    ('\u{204a}', 34862),
+    ('\u{2057}', 34863),
+    ('\u{2058}', 34864),
+    ('\u{205f}', 2097),
+    ('\u{2061}', 34867),
+    ('\u{2064}', 34868),
+    ('\u{2065}', 34869),
+    ('\u{2070}', 2102),
+    ('\u{2072}', 34872),
+    ('\u{2074}', 2105),
+    ('\u{209d}', 34914),
+    ('\u{20a0}', 34915),
+    ('\u{20a8}', 34916),
+    ('\u{20a9}', 34917),
+    ('\u{20c0}', 34918),
+    ('\u{20d0}', 34919),
+    ('\u{20f1}', 34920),
+    ('\u{2100}', 2153),
+    ('\u{210b}', 34932),
+    ('\u{210f}', 34933),
+    ('\u{2110}', 34934),
+    ('\u{2112}', 34935),
+    ('\u{2114}', 2168),
+    ('\u{2117}', 34939),
+    ('\u{2119}', 2172),
+    ('\u{211b}', 34942),
+    ('\u{211e}', 34943),
+    ('\u{2120}', 2176),
+    ('\u{212f}', 34959),
+    ('\u{2131}', 2192),
+    ('\u{213d}', 34972),
+    ('\u{213f}', 2205),
+    ('\u{2141}', 34975),
+    ('\u{2145}', 34976),
+    ('\u{2147}', 2209),
+    ('\u{214a}', 34980),
+    ('\u{214e}', 2213),
+    ('\u{2180}', 35031),
+    ('\u{2183}', 2264),
+    ('\u{2185}', 35034),
+    ('\u{2189}', 35035),
+    ('\u{218a}', 35036),
+    ('\u{218c}', 35037),
+    ('\u{2190}', 35038),
+    ('\u{222c}', 2271),
+    ('\u{2231}', 35044),
+    ('\u{2260}', 35045),
+    ('\u{2261}', 35046),
+    ('\u{226e}', 35047),
+    ('\u{2270}', 35048),
+    ('\u{2329}', 2281),
+    ('\u{232b}', 35051),
+    ('\u{2427}', 35052),
+    ('\u{2440}', 35053),
+    ('\u{244b}', 35054),
+    ('\u{2460}', 2287),
+    ('\u{2488}', 35095),
+    ('\u{249c}', 2328),
+    ('\u{24eb}', 35175),
+    ('\u{2a0c}', 35176),
+    ('\u{2a0d}', 35177),
+    ('\u{2a74}', 2410),
+    ('\u{2a77}', 35181),
+    ('\u{2adc}', 35182),
+    ('\u{2add}', 35183),
+    ('\u{2b74}', 35184),
+    ('\u{2b76}', 35185),
+    ('\u{2b96}', 35186),
+    ('\u{2b97}', 35187),
+    ('\u{2c00}', 2420),
+    ('\u{2c30}', 35236),
+    ('\u{2c5f}', 2469),
+    ('\u{2c65}', 35243),
+    ('\u{2c67}', 2476),
+    ('\u{2c73}', 35256),
+    ('\u{2c75}', 35257),
+    ('\u{2c76}', 35258),
+    ('\u{2c7c}', 2491),
+    ('\u{2ce3}', 35362),
+    ('\u{2ce5}', 35363),
+    ('\u{2ceb}', 2596),
+    ('\u{2cee}', 35367),
+    ('\u{2cf2}', 2600),
+    ('\u{2cf4}', 35370),
+    ('\u{2cf9}', 35371),
+    ('\u{2d00}', 35372),
+    ('\u{2d26}', 2605),
+    ('\u{2d28}', 35375),
+    ('\u{2d2d}', 35376),
+    ('\u{2d2e}', 35377),
+    ('\u{2d30}', 35378),
+    ('\u{2d68}', 35379),
+    ('\u{2d6f}', 2612),
+    ('\u{2d71}', 35382),
+    ('\u{2d7f}', 35383),
+    ('\u{2d97}', 35384),
+    ('\u{2da0}', 35385),
+    ('\u{2da7}', 35386),
+    ('\u{2da8}', 35387),
+    ('\u{2daf}', 35388),
+    ('\u{2db0}', 35389),
+    ('\u{2db7}', 35390),
+    ('\u{2db8}', 35391),
+    ('\u{2dbf}', 35392),
+    ('\u{2dc0}', 35393),
+    ('\u{2dc7}', 35394),
+    ('\u{2dc8}', 35395),
+    ('\u{2dcf}', 35396),
+    ('\u{2dd0}', 35397),
+    ('\u{2dd7}', 35398),
+    ('\u{2dd8}', 35399),
+    ('\u{2ddf}', 35400),
+    ('\u{2de0}', 35401),
+    ('\u{2e00}', 35402),
+    ('\u{2e2f}', 35403),
+    ('\u{2e30}', 35404),
+    ('\u{2e53}', 35405),
+    ('\u{2e80}', 35406),
+    ('\u{2e9a}', 35407),
+    ('\u{2e9b}', 35408),
+    ('\u{2e9f}', 35409),
+    ('\u{2ea0}', 35410),
+    ('\u{2ef3}', 35411),
+    ('\u{2ef4}', 35412),
+    ('\u{2f00}', 2645),
+    ('\u{2fd6}', 35627),
+    ('\u{3000}', 2860),
+    ('\u{3003}', 35631),
+    ('\u{3005}', 35632),
+    ('\u{3008}', 35633),
+    ('\u{302a}', 35634),
+    ('\u{302e}', 35635),
+    ('\u{3036}', 2868),
+    ('\u{303d}', 35643),
+    ('\u{3040}', 35644),
+    ('\u{3041}', 35645),
+    ('\u{3097}', 35646),
+    ('\u{3099}', 35647),
+    ('\u{309b}', 2880),
+    ('\u{309d}', 35650),
+    ('\u{309f}', 2883),
+    ('\u{30a1}', 35653),
+    ('\u{30ff}', 35654),
+    ('\u{3100}', 35655),
+    ('\u{3105}', 35656),
+    ('\u{3130}', 2889),
+    ('\u{3190}', 35753),
+    ('\u{3192}', 2986),
+    ('\u{31a0}', 35768),
+    ('\u{31c0}', 35769),
+    ('\u{31e4}', 35770),
+    ('\u{31f0}', 35771),
+    ('\u{3200}', 3004),
+    ('\u{3248}', 35844),
+    ('\u{3250}', 3077),
+    ('\u{3400}', 36277),
+    ('\u{4dc0}', 36278),
+    ('\u{4e00}', 36279),
+    ('\u{9ffd}', 36280),
+    ('\u{a000}', 36281),
+    ('\u{a48d}', 36282),
+    ('\u{a490}', 36283),
+    ('\u{a4c7}', 36284),
+    ('\u{a4d0}', 36285),
+    ('\u{a4fe}', 36286),
+    ('\u{a500}', 36287),
+    ('\u{a60d}', 36288),
+    ('\u{a610}', 36289),
+    ('\u{a62c}', 36290),
+    ('\u{a640}', 3523),
+    ('\u{a66d}', 36336),
+    ('\u{a670}', 36337),
+    ('\u{a674}', 36338),
+    ('\u{a67e}', 3571),
+    ('\u{a69e}', 36371),
+    ('\u{a6e6}', 36372),
+    ('\u{a6f0}', 36373),
+    ('\u{a6f2}', 36374),
+    ('\u{a6f8}', 36375),
+    ('\u{a700}', 36376),
+    ('\u{a717}', 36377),
+    ('\u{a720}', 36378),
+    ('\u{a722}', 3611),
+    ('\u{a72f}', 36392),
+    ('\u{a732}', 3625),
+    ('\u{a771}', 36456),
+    ('\u{a779}', 3689),
+    ('\u{a787}', 36471),
+    ('\u{a789}', 36472),
+    ('\u{a78b}', 3705),
+    ('\u{a78e}', 36476),
+    ('\u{a790}', 3709),
+    ('\u{a793}', 36480),
+    ('\u{a796}', 3713),
+    ('\u{a7c0}', 36523),
+    ('\u{a7c2}', 3756),
+    ('\u{a7cb}', 36533),
+    ('\u{a7f5}', 36534),
+    ('\u{a7f6}', 36535),
+    ('\u{a7f8}', 3768),
+    ('\u{a7fa}', 36538),
+    ('\u{a828}', 36539),
+    ('\u{a82c}', 36540),
+    ('\u{a82d}', 36541),
+    ('\u{a830}', 36542),
+    ('\u{a83a}', 36543),
+    ('\u{a840}', 36544),
+    ('\u{a874}', 36545),
+    ('\u{a878}', 36546),
+    ('\u{a880}', 36547),
+    ('\u{a8c6}', 36548),
+    ('\u{a8ce}', 36549),
+    ('\u{a8d0}', 36550),
+    ('\u{a8da}', 36551),
+    ('\u{a8e0}', 36552),
+    ('\u{a8f8}', 36553),
+    ('\u{a8fb}', 3786),
+    ('\u{a8fd}', 36556),
+    ('\u{a92e}', 36557),
+    ('\u{a930}', 36558),
+    ('\u{a954}', 36559),
+    ('\u{a95f}', 36560),
+    ('\u{a97d}', 36561),
+    ('\u{a980}', 36562),
+    ('\u{a9c1}', 36563),
+    ('\u{a9ce}', 36564),
+    ('\u{a9cf}', 36565),
+    ('\u{a9da}', 36566),
+    ('\u{a9de}', 36567),
+    ('\u{a9e0}', 36568),
+    ('\u{a9ff}', 36569),
+    ('\u{aa00}', 36570),
+    ('\u{aa37}', 36571),
+    ('\u{aa40}', 36572),
+    ('\u{aa4e}', 36573),
+    ('\u{aa50}', 36574),
+    ('\u{aa5a}', 36575),
+    ('\u{aa5c}', 36576),
+    ('\u{aa60}', 36577),
+    ('\u{aa77}', 36578),
+    ('\u{aa7a}', 36579),
+    ('\u{aac3}', 36580),
+    ('\u{aadb}', 36581),
+    ('\u{aade}', 36582),
+    ('\u{aae0}', 36583),
+    ('\u{aaf0}', 36584),
+    ('\u{aaf2}', 36585),
+    ('\u{aaf7}', 36586),
+    ('\u{ab01}', 36587),
+    ('\u{ab07}', 36588),
+    ('\u{ab09}', 36589),
+    ('\u{ab0f}', 36590),
+    ('\u{ab11}', 36591),
+    ('\u{ab17}', 36592),
+    ('\u{ab20}', 36593),
+    ('\u{ab27}', 36594),
+    ('\u{ab28}', 36595),
+    ('\u{ab2f}', 36596),
+    ('\u{ab30}', 36597),
+    ('\u{ab5b}', 3830),
+    ('\u{ab60}', 36603),
+    ('\u{ab69}', 36604),
+    ('\u{ab6a}', 36605),
+    ('\u{ab6c}', 36606),
+    ('\u{ab70}', 3839),
+    ('\u{abc0}', 36687),
+    ('\u{abeb}', 36688),
+    ('\u{abec}', 36689),
+    ('\u{abee}', 36690),
+    ('\u{abf0}', 36691),
+    ('\u{abfa}', 36692),
+    ('\u{ac00}', 36693),
+    ('\u{d7a4}', 36694),
+    ('\u{d7b0}', 36695),
+    ('\u{d7c7}', 36696),
+    ('\u{d7cb}', 36697),
+    ('\u{d7fc}', 36698),
+    ('\u{f900}', 3931),
+    ('\u{f907}', 36706),
+    ('\u{f909}', 3939),
+    ('\u{fa0e}', 36968),
+    ('\u{fa10}', 4201),
+    ('\u{fa13}', 36972),
+    ('\u{fa15}', 4205),
+    ('\u{fa23}', 36987),
+    ('\u{fa25}', 4220),
+    ('\u{fa27}', 36990),
+    ('\u{fa2a}', 4223),
+    ('\u{fa5d}', 37042),
+    ('\u{fa5f}', 4275),
+    ('\u{fa6e}', 37058),
+    ('\u{fa70}', 4291),
+    ('\u{fada}', 37165),
+    ('\u{fb00}', 4398),
+    ('\u{fb05}', 37171),
+    ('\u{fb07}', 37172),
+    ('\u{fb13}', 4405),
+    ('\u{fb18}', 37178),
+    ('\u{fb1d}', 4411),
+    ('\u{fb50}', 37230),
+    ('\u{fb52}', 37231),
+    ('\u{fb56}', 37232),
+    ('\u{fb5a}', 37233),
+    ('\u{fb5e}', 37234),
+    ('\u{fb62}', 37235),
+    ('\u{fb66}', 37236),
+    ('\u{fb6a}', 37237),
+    ('\u{fb6e}', 37238),
+    ('\u{fb72}', 37239),
+    ('\u{fb76}', 37240),
+    ('\u{fb7a}', 37241),
+    ('\u{fb7e}', 37242),
+    ('\u{fb82}', 37243),
+    ('\u{fb84}', 37244),
+    ('\u{fb86}', 37245),
+    ('\u{fb88}', 37246),
+    ('\u{fb8a}', 37247),
+    ('\u{fb8c}', 37248),
+    ('\u{fb8e}', 37249),
+    ('\u{fb92}', 37250),
+    ('\u{fb96}', 37251),
+    ('\u{fb9a}', 37252),
+    ('\u{fb9e}', 37253),
+    ('\u{fba0}', 37254),
+    ('\u{fba4}', 37255),
+    ('\u{fba6}', 37256),
+    ('\u{fbaa}', 37257),
+    ('\u{fbae}', 37258),
+    ('\u{fbb0}', 37259),
+    ('\u{fbb2}', 37260),
+    ('\u{fbc2}', 37261),
+    ('\u{fbd3}', 37262),
+    ('\u{fbd7}', 37263),
+    ('\u{fbd9}', 37264),
+    ('\u{fbdb}', 37265),
+    ('\u{fbdd}', 37266),
+    ('\u{fbde}', 37267),
+    ('\u{fbe0}', 37268),
+    ('\u{fbe2}', 37269),
+    ('\u{fbe4}', 37270),
+    ('\u{fbe8}', 37271),
+    ('\u{fbea}', 37272),
+    ('\u{fbec}', 37273),
+    ('\u{fbee}', 37274),
+    ('\u{fbf0}', 37275),
+    ('\u{fbf2}', 37276),
+    ('\u{fbf4}', 37277),
+    ('\u{fbf6}', 37278),
+    ('\u{fbf9}', 37279),
+    ('\u{fbfc}', 37280),
+    ('\u{fc00}', 4513),
+    ('\u{fd3c}', 37597),
+    ('\u{fd3e}', 37598),
+    ('\u{fd40}', 37599),
+    ('\u{fd50}', 37600),
+    ('\u{fd51}', 37601),
+    ('\u{fd53}', 4834),
+    ('\u{fd58}', 37607),
+    ('\u{fd5a}', 4840),
+    ('\u{fd5f}', 37613),
+    ('\u{fd61}', 37614),
+    ('\u{fd62}', 37615),
+    ('\u{fd64}', 37616),
+    ('\u{fd66}', 37617),
+    ('\u{fd67}', 37618),
+    ('\u{fd69}', 37619),
+    ('\u{fd6a}', 37620),
+    ('\u{fd6c}', 37621),
+    ('\u{fd6e}', 37622),
+    ('\u{fd6f}', 37623),
+    ('\u{fd71}', 37624),
+    ('\u{fd73}', 4857),
+    ('\u{fd76}', 37628),
+    ('\u{fd78}', 4861),
+    ('\u{fd7c}', 37633),
+    ('\u{fd7e}', 4866),
+    ('\u{fd83}', 37639),
+    ('\u{fd85}', 37640),
+    ('\u{fd87}', 37641),
+    ('\u{fd89}', 4874),
+    ('\u{fd90}', 37649),
+    ('\u{fd92}', 4882),
+    ('\u{fd97}', 37655),
+    ('\u{fd99}', 4888),
+    ('\u{fd9c}', 37659),
+    ('\u{fd9e}', 4892),
+    ('\u{fdc8}', 37702),
+    ('\u{fdf0}', 4935),
+    ('\u{fdfe}', 37717),
+    ('\u{fe00}', 37718),
+    ('\u{fe10}', 4951),
+    ('\u{fe19}', 37728),
+    ('\u{fe20}', 37729),
+    ('\u{fe30}', 4962),
+    ('\u{fe33}', 37733),
+    ('\u{fe35}', 4966),
+    ('\u{fe45}', 37750),
+    ('\u{fe47}', 4983),
+    ('\u{fe49}', 37753),
+    ('\u{fe4d}', 37754),
+    ('\u{fe50}', 4987),
+    ('\u{fe52}', 37757),
+    ('\u{fe54}', 4990),
+    ('\u{fe6c}', 37782),
+    ('\u{fe70}', 5015),
+    ('\u{fe81}', 37800),
+    ('\u{fe83}', 37801),
+    ('\u{fe85}', 37802),
+    ('\u{fe87}', 37803),
+    ('\u{fe89}', 37804),
+    ('\u{fe8d}', 37805),
+    ('\u{fe8f}', 37806),
+    ('\u{fe93}', 37807),
+    ('\u{fe95}', 37808),
+    ('\u{fe99}', 37809),
+    ('\u{fe9d}', 37810),
+    ('\u{fea1}', 37811),
+    ('\u{fea5}', 37812),
+    ('\u{fea9}', 37813),
+    ('\u{feab}', 37814),
+    ('\u{fead}', 37815),
+    ('\u{feaf}', 37816),
+    ('\u{feb1}', 37817),
+    ('\u{feb5}', 37818),
+    ('\u{feb9}', 37819),
+    ('\u{febd}', 37820),
+    ('\u{fec1}', 37821),
+    ('\u{fec5}', 37822),
+    ('\u{fec9}', 37823),
+    ('\u{fecd}', 37824),
+    ('\u{fed1}', 37825),
+    ('\u{fed5}', 37826),
+    ('\u{fed9}', 37827),
+    ('\u{fedd}', 37828),
+    ('\u{fee1}', 37829),
+    ('\u{fee5}', 37830),
+    ('\u{fee9}', 37831),
+    ('\u{feed}', 37832),
+    ('\u{feef}', 37833),
+    ('\u{fef1}', 37834),
+    ('\u{fef5}', 37835),
+    ('\u{fef7}', 37836),
+    ('\u{fef9}', 37837),
+    ('\u{fefb}', 37838),
+    ('\u{fefd}', 37839),
+    ('\u{feff}', 5072),
+    ('\u{ffbf}', 38032),
+    ('\u{ffc2}', 5265),
+    ('\u{ffc8}', 38039),
+    ('\u{ffca}', 5272),
+    ('\u{ffd0}', 38046),
+    ('\u{ffd2}', 5279),
+    ('\u{ffd8}', 38053),
+    ('\u{ffda}', 5286),
+    ('\u{ffdd}', 38057),
+    ('\u{ffe0}', 5290),
+    ('\u{ffef}', 38073),
+    ('\u{10000}', 38074),
+    ('\u{1000c}', 38075),
+    ('\u{1000d}', 38076),
+    ('\u{10027}', 38077),
+    ('\u{10028}', 38078),
+    ('\u{1003b}', 38079),
+    ('\u{1003c}', 38080),
+    ('\u{1003e}', 38081),
+    ('\u{1003f}', 38082),
+    ('\u{1004e}', 38083),
+    ('\u{10050}', 38084),
+    ('\u{1005e}', 38085),
+    ('\u{10080}', 38086),
+    ('\u{100fb}', 38087),
+    ('\u{10100}', 38088),
+    ('\u{10103}', 38089),
+    ('\u{10107}', 38090),
+    ('\u{10134}', 38091),
+    ('\u{10137}', 38092),
+    ('\u{1018f}', 38093),
+    ('\u{10190}', 38094),
+    ('\u{1019d}', 38095),
+    ('\u{101a0}', 38096),
+    ('\u{101a1}', 38097),
+    ('\u{101d0}', 38098),
+    ('\u{101fd}', 38099),
+    ('\u{101fe}', 38100),
+    ('\u{10280}', 38101),
+    ('\u{1029d}', 38102),
+    ('\u{102a0}', 38103),
+    ('\u{102d1}', 38104),
+    ('\u{102e0}', 38105),
+    ('\u{102e1}', 38106),
+    ('\u{102fc}', 38107),
+    ('\u{10300}', 38108),
+    ('\u{10320}', 38109),
+    ('\u{10324}', 38110),
+    ('\u{1032d}', 38111),
+    ('\u{10341}', 38112),
+    ('\u{10342}', 38113),
+    ('\u{1034a}', 38114),
+    ('\u{1034b}', 38115),
+    ('\u{10350}', 38116),
+    ('\u{1037b}', 38117),
+    ('\u{10380}', 38118),
+    ('\u{1039e}', 5351),
+    ('\u{103a0}', 38121),
+    ('\u{103c4}', 38122),
+    ('\u{103c8}', 38123),
+    ('\u{103d0}', 38124),
+    ('\u{103d6}', 38125),
+    ('\u{10400}', 5358),
+    ('\u{10428}', 38166),
+    ('\u{1049e}', 38167),
+    ('\u{104a0}', 38168),
+    ('\u{104aa}', 38169),
+    ('\u{104b0}', 5402),
+    ('\u{104d4}', 38206),
+    ('\u{104d8}', 38207),
+    ('\u{104fc}', 38208),
+    ('\u{10500}', 38209),
+    ('\u{10528}', 38210),
+    ('\u{10530}', 38211),
+    ('\u{10564}', 38212),
+    ('\u{1056f}', 38213),
+    ('\u{10570}', 38214),
+    ('\u{10600}', 38215),
+    ('\u{10737}', 38216),
+    ('\u{10740}', 38217),
+    ('\u{10756}', 38218),
+    ('\u{10760}', 38219),
+    ('\u{10768}', 38220),
+    ('\u{10800}', 38221),
+    ('\u{10806}', 38222),
+    ('\u{10808}', 5455),
+    ('\u{1080a}', 38225),
+    ('\u{10836}', 38226),
+    ('\u{10837}', 38227),
+    ('\u{10839}', 38228),
+    ('\u{1083c}', 38229),
+    ('\u{1083d}', 38230),
+    ('\u{1083f}', 38231),
+    ('\u{10856}', 38232),
+    ('\u{10857}', 38233),
+    ('\u{10860}', 38234),
+    ('\u{10877}', 38235),
+    ('\u{10880}', 38236),
+    ('\u{1089f}', 38237),
+    ('\u{108a7}', 38238),
+    ('\u{108b0}', 38239),
+    ('\u{108e0}', 38240),
+    ('\u{108f3}', 38241),
+    ('\u{108f4}', 38242),
+    ('\u{108f6}', 38243),
+    ('\u{108fb}', 38244),
+    ('\u{10900}', 38245),
+    ('\u{10916}', 38246),
+    ('\u{1091c}', 38247),
+    ('\u{1091f}', 38248),
+    ('\u{10920}', 38249),
+    ('\u{1093a}', 38250),
+    ('\u{1093f}', 38251),
+    ('\u{10940}', 38252),
+    ('\u{10980}', 38253),
+    ('\u{109b8}', 38254),
+    ('\u{109bc}', 38255),
+    ('\u{109be}', 38256),
+    ('\u{109c0}', 38257),
+    ('\u{109d0}', 38258),
+    ('\u{109d2}', 38259),
+    ('\u{10a00}', 38260),
+    ('\u{10a04}', 38261),
+    ('\u{10a05}', 38262),
+    ('\u{10a07}', 38263),
+    ('\u{10a0c}', 38264),
+    ('\u{10a14}', 38265),
+    ('\u{10a15}', 38266),
+    ('\u{10a18}', 38267),
+    ('\u{10a19}', 38268),
+    ('\u{10a36}', 38269),
+    ('\u{10a38}', 38270),
+    ('\u{10a3b}', 38271),
+    ('\u{10a3f}', 38272),
+    ('\u{10a40}', 38273),
+    ('\u{10a49}', 38274),
+    ('\u{10a50}', 38275),
+    ('\u{10a59}', 38276),
+    ('\u{10a60}', 38277),
+    ('\u{10a7d}', 38278),
+    ('\u{10a80}', 38279),
+    ('\u{10a9d}', 38280),
+    ('\u{10aa0}', 38281),
+    ('\u{10ac0}', 38282),
+    ('\u{10ac8}', 38283),
+    ('\u{10ac9}', 38284),
+    ('\u{10ae7}', 38285),
+    ('\u{10aeb}', 38286),
+    ('\u{10af7}', 38287),
+    ('\u{10b00}', 38288),
+    ('\u{10b36}', 38289),
+    ('\u{10b39}', 38290),
+    ('\u{10b40}', 38291),
+    ('\u{10b56}', 38292),
+    ('\u{10b58}', 38293),
+    ('\u{10b60}', 38294),
+    ('\u{10b73}', 38295),
+    ('\u{10b78}', 38296),
+    ('\u{10b80}', 38297),
+    ('\u{10b92}', 38298),
+    ('\u{10b99}', 38299),
+    ('\u{10b9d}', 38300),
+    ('\u{10ba9}', 38301),
+    ('\u{10bb0}', 38302),
+    ('\u{10c00}', 38303),
+    ('\u{10c49}', 38304),
+    ('\u{10c80}', 5537),
+    ('\u{10cb3}', 38356),
+    ('\u{10cc0}', 38357),
+    ('\u{10cf3}', 38358),
+    ('\u{10cfa}', 38359),
+    ('\u{10d00}', 38360),
+    ('\u{10d28}', 38361),
+    ('\u{10d30}', 38362),
+    ('\u{10d3a}', 38363),
+    ('\u{10e60}', 38364),
+    ('\u{10e7f}', 38365),
+    ('\u{10e80}', 38366),
+    ('\u{10eaa}', 38367),
+    ('\u{10eab}', 38368),
+    ('\u{10ead}', 38369),
+    ('\u{10eae}', 38370),
+    ('\u{10eb0}', 38371),
+    ('\u{10eb2}', 38372),
+    ('\u{10f00}', 38373),
+    ('\u{10f1d}', 38374),
+    ('\u{10f27}', 38375),
+    ('\u{10f28}', 38376),
+    ('\u{10f30}', 38377),
+    ('\u{10f51}', 38378),
+    ('\u{10f5a}', 38379),
+    ('\u{10fb0}', 38380),
+    ('\u{10fc5}', 38381),
+    ('\u{10fcc}', 38382),
+    ('\u{10fe0}', 38383),
+    ('\u{10ff7}', 38384),
+    ('\u{11000}', 38385),
+    ('\u{11047}', 38386),
+    ('\u{1104e}', 38387),
+    ('\u{11052}', 38388),
+    ('\u{11066}', 38389),
+    ('\u{11070}', 38390),
+    ('\u{1107f}', 38391),
+    ('\u{110bb}', 38392),
+    ('\u{110bd}', 38393),
+    ('\u{110be}', 38394),
+    ('\u{110c2}', 38395),
+    ('\u{110d0}', 38396),
+    ('\u{110e9}', 38397),
+    ('\u{110f0}', 38398),
+    ('\u{110fa}', 38399),
+    ('\u{11100}', 38400),
+    ('\u{11135}', 38401),
+    ('\u{11136}', 38402),
+    ('\u{11140}', 38403),
+    ('\u{11144}', 38404),
+    ('\u{11148}', 38405),
+    ('\u{11150}', 38406),
+    ('\u{11174}', 38407),
+    ('\u{11176}', 38408),
+    ('\u{11177}', 38409),
+    ('\u{11180}', 38410),
+    ('\u{111c5}', 38411),
+    ('\u{111c9}', 38412),
+    ('\u{111cd}', 38413),
+    ('\u{111ce}', 38414),
+    ('\u{111db}', 5647),
+    ('\u{111dd}', 38417),
+    ('\u{111e0}', 38418),
+    ('\u{111e1}', 38419),
+    ('\u{111f5}', 38420),
+    ('\u{11200}', 38421),
+    ('\u{11212}', 38422),
+    ('\u{11213}', 38423),
+    ('\u{11238}', 38424),
+    ('\u{1123e}', 38425),
+    ('\u{1123f}', 38426),
+    ('\u{11280}', 38427),
+    ('\u{11287}', 5660),
+    ('\u{1128a}', 38431),
+    ('\u{1128e}', 38432),
+    ('\u{1128f}', 38433),
+    ('\u{1129e}', 38434),
+    ('\u{1129f}', 38435),
+    ('\u{112a9}', 38436),
+    ('\u{112aa}', 38437),
+    ('\u{112b0}', 38438),
+    ('\u{112eb}', 38439),
+    ('\u{112f0}', 38440),
+    ('\u{112fa}', 38441),
+    ('\u{11300}', 38442),
+    ('\u{11304}', 38443),
+    ('\u{11305}', 38444),
+    ('\u{1130d}', 38445),
+    ('\u{1130f}', 38446),
+    ('\u{11311}', 38447),
+    ('\u{11313}', 38448),
+    ('\u{11329}', 38449),
+    ('\u{1132a}', 38450),
+    ('\u{11331}', 38451),
+    ('\u{11332}', 38452),
+    ('\u{11334}', 38453),
+    ('\u{11335}', 38454),
+    ('\u{1133a}', 38455),
+    ('\u{1133b}', 38456),
+    ('\u{11345}', 38457),
+    ('\u{11347}', 38458),
+    ('\u{11349}', 38459),
+    ('\u{1134b}', 38460),
+    ('\u{1134e}', 38461),
+    ('\u{11350}', 38462),
+    ('\u{11351}', 38463),
+    ('\u{11357}', 38464),
+    ('\u{11358}', 38465),
+    ('\u{1135d}', 38466),
+    ('\u{11364}', 38467),
+    ('\u{11366}', 38468),
+    ('\u{1136d}', 38469),
+    ('\u{11370}', 38470),
+    ('\u{11375}', 38471),
+    ('\u{11400}', 38472),
+    ('\u{1144b}', 38473),
+    ('\u{11450}', 38474),
+    ('\u{1145a}', 38475),
+    ('\u{1145c}', 5708),
+    ('\u{1145e}', 38478),
+    ('\u{11462}', 38479),
+    ('\u{11480}', 38480),
+    ('\u{114c6}', 5713),
+    ('\u{114c8}', 38483),
+    ('\u{114d0}', 38484),
+    ('\u{114da}', 38485),
+    ('\u{11580}', 38486),
+    ('\u{115b6}', 38487),
+    ('\u{115b8}', 38488),
+    ('\u{115c1}', 38489),
+    ('\u{115d8}', 38490),
+    ('\u{115de}', 38491),
+    ('\u{11600}', 38492),
+    ('\u{11641}', 38493),
+    ('\u{11644}', 38494),
+    ('\u{11645}', 38495),
+    ('\u{11650}', 38496),
+    ('\u{1165a}', 38497),
+    ('\u{11660}', 38498),
+    ('\u{1166d}', 38499),
+    ('\u{11680}', 38500),
+    ('\u{116b9}', 38501),
+    ('\u{116c0}', 38502),
+    ('\u{116ca}', 38503),
+    ('\u{11700}', 38504),
+    ('\u{1171b}', 38505),
+    ('\u{1171d}', 38506),
+    ('\u{1172c}', 38507),
+    ('\u{11730}', 38508),
+    ('\u{1173a}', 38509),
+    ('\u{11740}', 38510),
+    ('\u{11800}', 38511),
+    ('\u{1183b}', 38512),
+    ('\u{1183c}', 38513),
+    ('\u{118a0}', 5746),
+    ('\u{118c0}', 38546),
+    ('\u{118ea}', 38547),
+    ('\u{118f3}', 38548),
+    ('\u{118ff}', 38549),
+    ('\u{11907}', 38550),
+    ('\u{11909}', 38551),
+    ('\u{1190a}', 38552),
+    ('\u{1190c}', 38553),
+    ('\u{11914}', 38554),
+    ('\u{11915}', 38555),
+    ('\u{11917}', 38556),
+    ('\u{11918}', 38557),
+    ('\u{11936}', 38558),
+    ('\u{11937}', 38559),
+    ('\u{11939}', 38560),
+    ('\u{1193b}', 38561),
+    ('\u{11944}', 38562),
+    ('\u{11947}', 38563),
+    ('\u{11950}', 38564),
+    ('\u{1195a}', 38565),
+    ('\u{119a0}', 38566),
+    ('\u{119a8}', 38567),
+    ('\u{119aa}', 38568),
+    ('\u{119d8}', 38569),
+    ('\u{119da}', 38570),
+    ('\u{119e2}', 38571),
+    ('\u{119e3}', 38572),
+    ('\u{119e5}', 38573),
+    ('\u{11a00}', 38574),
+    ('\u{11a3f}', 38575),
+    ('\u{11a47}', 38576),
+    ('\u{11a48}', 38577),
+    ('\u{11a50}', 38578),
+    ('\u{11a9a}', 38579),
+    ('\u{11a9d}', 38580),
+    ('\u{11a9e}', 38581),
+    ('\u{11aa3}', 38582),
+    ('\u{11ac0}', 38583),
+    ('\u{11af9}', 38584),
+    ('\u{11c00}', 38585),
+    ('\u{11c09}', 38586),
+    ('\u{11c0a}', 38587),
+    ('\u{11c37}', 38588),
+    ('\u{11c38}', 38589),
+    ('\u{11c41}', 38590),
+    ('\u{11c46}', 38591),
+    ('\u{11c50}', 38592),
+    ('\u{11c5a}', 38593),
+    ('\u{11c6d}', 38594),
+    ('\u{11c70}', 38595),
+    ('\u{11c72}', 38596),
+    ('\u{11c90}', 38597),
+    ('\u{11c92}', 38598),
+    ('\u{11ca8}', 38599),
+    ('\u{11ca9}', 38600),
+    ('\u{11cb7}', 38601),
+    ('\u{11d00}', 38602),
+    ('\u{11d07}', 38603),
+    ('\u{11d08}', 38604),
+    ('\u{11d0a}', 38605),
+    ('\u{11d0b}', 38606),
+    ('\u{11d37}', 38607),
+    ('\u{11d3a}', 5840),
+    ('\u{11d3c}', 38610),
+    ('\u{11d3e}', 38611),
+    ('\u{11d3f}', 38612),
+    ('\u{11d48}', 38613),
+    ('\u{11d50}', 38614),
+    ('\u{11d5a}', 38615),
+    ('\u{11d60}', 38616),
+    ('\u{11d66}', 38617),
+    ('\u{11d67}', 38618),
+    ('\u{11d69}', 38619),
+    ('\u{11d6a}', 38620),
+    ('\u{11d8f}', 38621),
+    ('\u{11d90}', 38622),
+    ('\u{11d92}', 38623),
+    ('\u{11d93}', 38624),
+    ('\u{11d99}', 38625),
+    ('\u{11da0}', 38626),
+    ('\u{11daa}', 38627),
+    ('\u{11ee0}', 38628),
+    ('\u{11ef7}', 38629),
+    ('\u{11ef9}', 38630),
+    ('\u{11fb0}', 38631),
+    ('\u{11fb1}', 38632),
+    ('\u{11fc0}', 38633),
+    ('\u{11ff2}', 38634),
+    ('\u{11fff}', 38635),
+    ('\u{12000}', 38636),
+    ('\u{1239a}', 38637),
+    ('\u{12400}', 38638),
+    ('\u{1246f}', 38639),
+    ('\u{12470}', 38640),
+    ('\u{12475}', 38641),
+    ('\u{12480}', 38642),
+    ('\u{12544}', 38643),
+    ('\u{13000}', 38644),
+    ('\u{1342f}', 38645),
+    ('\u{14400}', 38646),
+    ('\u{14647}', 38647),
+    ('\u{16800}', 38648),
+    ('\u{16a39}', 38649),
+    ('\u{16a40}', 38650),
+    ('\u{16a5f}', 38651),
+    ('\u{16a60}', 38652),
+    ('\u{16a6a}', 38653),
+    ('\u{16a6e}', 38654),
+    ('\u{16a70}', 38655),
+    ('\u{16ad0}', 38656),
+    ('\u{16aee}', 38657),
+    ('\u{16af0}', 38658),
+    ('\u{16af5}', 38659),
+    ('\u{16af6}', 38660),
+    ('\u{16b00}', 38661),
+    ('\u{16b37}', 38662),
+    ('\u{16b40}', 38663),
+    ('\u{16b44}', 38664),
+    ('\u{16b46}', 38665),
+    ('\u{16b50}', 38666),
+    ('\u{16b5a}', 38667),
+    ('\u{16b5b}', 38668),
+    ('\u{16b62}', 38669),
+    ('\u{16b63}', 38670),
+    ('\u{16b78}', 38671),
+    ('\u{16b7d}', 38672),
+    ('\u{16b90}', 38673),
+    ('\u{16e40}', 5906),
+    ('\u{16e60}', 38706),
+    ('\u{16e80}', 38707),
+    ('\u{16e9b}', 38708),
+    ('\u{16f00}', 38709),
+    ('\u{16f4b}', 38710),
+    ('\u{16f4f}', 38711),
+    ('\u{16f88}', 38712),
+    ('\u{16f8f}', 38713),
+    ('\u{16fa0}', 38714),
+    ('\u{16fe0}', 38715),
+    ('\u{16fe2}', 38716),
+    ('\u{16fe3}', 38717),
+    ('\u{16fe5}', 38718),
+    ('\u{16ff0}', 38719),
+    ('\u{16ff2}', 38720),
+    ('\u{17000}', 38721),
+    ('\u{187f8}', 38722),
+    ('\u{18800}', 38723),
+    ('\u{18cd6}', 38724),
+    ('\u{18d00}', 38725),
+    ('\u{18d09}', 38726),
+    ('\u{1b000}', 38727),
+    ('\u{1b11f}', 38728),
+    ('\u{1b150}', 38729),
+    ('\u{1b153}', 38730),
+    ('\u{1b164}', 38731),
+    ('\u{1b168}', 38732),
+    ('\u{1b170}', 38733),
+    ('\u{1b2fc}', 38734),
+    ('\u{1bc00}', 38735),
+    ('\u{1bc6b}', 38736),
+    ('\u{1bc70}', 38737),
+    ('\u{1bc7d}', 38738),
+    ('\u{1bc80}', 38739),
+    ('\u{1bc89}', 38740),
+    ('\u{1bc90}', 38741),
+    ('\u{1bc9a}', 38742),
+    ('\u{1bc9c}', 38743),
+    ('\u{1bc9d}', 38744),
+    ('\u{1bc9f}', 38745),
+    ('\u{1bca0}', 38746),
+    ('\u{1bca4}', 38747),
+    ('\u{1d000}', 38748),
+    ('\u{1d0f6}', 38749),
+    ('\u{1d100}', 38750),
+    ('\u{1d127}', 38751),
+    ('\u{1d129}', 38752),
+    ('\u{1d15e}', 5985),
+    ('\u{1d165}', 38760),
+    ('\u{1d173}', 38761),
+    ('\u{1d17b}', 38762),
+    ('\u{1d1bb}', 5995),
+    ('\u{1d1c1}', 38769),
+    ('\u{1d1e9}', 38770),
+    ('\u{1d200}', 38771),
+    ('\u{1d246}', 38772),
+    ('\u{1d2e0}', 38773),
+    ('\u{1d2f4}', 38774),
+    ('\u{1d300}', 38775),
+    ('\u{1d357}', 38776),
+    ('\u{1d360}', 38777),
+    ('\u{1d379}', 38778),
+    ('\u{1d400}', 6011),
+    ('\u{1d4a0}', 38939),
+    ('\u{1d4a2}', 38940),
+    ('\u{1d4a3}', 38941),
+    ('\u{1d4a5}', 6174),
+    ('\u{1d4a7}', 38944),
+    ('\u{1d4a9}', 6177),
+    ('\u{1d50b}', 39043),
+    ('\u{1d50d}', 6276),
+    ('\u{1d547}', 39102),
+    ('\u{1d54a}', 6335),
+    ('\u{1d6a6}', 39451),
+    ('\u{1d6a8}', 6684),
+    ('\u{1d6d3}', 39495),
+    ('\u{1d6d5}', 6728),
+    ('\u{1d70d}', 39552),
+    ('\u{1d70f}', 6785),
+    ('\u{1d747}', 39609),
+    ('\u{1d749}', 6842),
+    ('\u{1d781}', 39666),
+    ('\u{1d783}', 6899),
+    ('\u{1d7bb}', 39723),
+    ('\u{1d7bd}', 6956),
+    ('\u{1d7ca}', 39737),
+    ('\u{1d7cc}', 39738),
+    ('\u{1d7ce}', 6971),
+    ('\u{1d800}', 39789),
+    ('\u{1da00}', 39790),
+    ('\u{1da37}', 39791),
+    ('\u{1da3b}', 39792),
+    ('\u{1da6d}', 39793),
+    ('\u{1da75}', 39794),
+    ('\u{1da76}', 39795),
+    ('\u{1da84}', 39796),
+    ('\u{1da85}', 39797),
+    ('\u{1da8c}', 39798),
+    ('\u{1da9b}', 39799),
+    ('\u{1daa0}', 39800),
+    ('\u{1daa1}', 39801),
+    ('\u{1dab0}', 39802),
+    ('\u{1e000}', 39803),
+    ('\u{1e007}', 39804),
+    ('\u{1e008}', 39805),
+    ('\u{1e019}', 39806),
+    ('\u{1e01b}', 39807),
+    ('\u{1e022}', 39808),
+    ('\u{1e023}', 39809),
+    ('\u{1e025}', 39810),
+    ('\u{1e026}', 39811),
+    ('\u{1e02b}', 39812),
+    ('\u{1e100}', 39813),
+    ('\u{1e12d}', 39814),
+    ('\u{1e130}', 39815),
+    ('\u{1e13e}', 39816),
+    ('\u{1e140}', 39817),
+    ('\u{1e14a}', 39818),
+    ('\u{1e14e}', 7051),
+    ('\u{1e150}', 39821),
+    ('\u{1e2c0}', 39822),
+    ('\u{1e2fa}', 39823),
+    ('\u{1e2ff}', 39824),
+    ('\u{1e300}', 39825),
+    ('\u{1e800}', 39826),
+    ('\u{1e8c5}', 39827),
+    ('\u{1e8c7}', 39828),
+    ('\u{1e8d0}', 39829),
+    ('\u{1e8d7}', 39830),
+    ('\u{1e900}', 7063),
+    ('\u{1e922}', 39865),
+    ('\u{1e94c}', 39866),
+    ('\u{1e950}', 39867),
+    ('\u{1e95a}', 39868),
+    ('\u{1e95e}', 39869),
+    ('\u{1e960}', 39870),
+    ('\u{1ec71}', 39871),
+    ('\u{1ecb5}', 39872),
+    ('\u{1ed01}', 39873),
+    ('\u{1ed3e}', 39874),
+    ('\u{1ee00}', 7107),
+    ('\u{1ee25}', 39912),
+    ('\u{1ee27}', 7145),
+    ('\u{1ee3c}', 39934),
+    ('\u{1ee42}', 39935),
+    ('\u{1ee43}', 39936),
+    ('\u{1ee47}', 7169),
+    ('\u{1ee55}', 39951),
+    ('\u{1ee57}', 7184),
+    ('\u{1ee65}', 39966),
+    ('\u{1ee67}', 7199),
+    ('\u{1ee9c}', 40020),
+    ('\u{1eea1}', 7253),
+    ('\u{1eebc}', 40048),
+    ('\u{1eef0}', 40049),
+    ('\u{1eef2}', 40050),
+    ('\u{1f000}', 40051),
+    ('\u{1f02c}', 40052),
+    ('\u{1f030}', 40053),
+    ('\u{1f094}', 40054),
+    ('\u{1f0a0}', 40055),
+    ('\u{1f0af}', 40056),
+    ('\u{1f0b1}', 40057),
+    ('\u{1f0c0}', 40058),
+    ('\u{1f0c1}', 40059),
+    ('\u{1f0d0}', 40060),
+    ('\u{1f0d1}', 40061),
+    ('\u{1f0f6}', 40062),
+    ('\u{1f101}', 7295),
+    ('\u{1f10b}', 40073),
+    ('\u{1f110}', 7306),
+    ('\u{1f150}', 40138),
+    ('\u{1f16a}', 7371),
+    ('\u{1f16d}', 40142),
+    ('\u{1f190}', 40143),
+    ('\u{1f191}', 40144),
+    ('\u{1f1ae}', 40145),
+    ('\u{1f1e6}', 40146),
+    ('\u{1f200}', 7379),
+    ('\u{1f203}', 40150),
+    ('\u{1f210}', 7383),
+    ('\u{1f23c}', 40195),
+    ('\u{1f240}', 7428),
+    ('\u{1f249}', 40205),
+    ('\u{1f250}', 7438),
+    ('\u{1f252}', 40208),
+    ('\u{1f260}', 40209),
+    ('\u{1f266}', 40210),
+    ('\u{1f300}', 40211),
+    ('\u{1f6d8}', 40212),
+    ('\u{1f6e0}', 40213),
+    ('\u{1f6ed}', 40214),
+    ('\u{1f6f0}', 40215),
+    ('\u{1f6fd}', 40216),
+    ('\u{1f700}', 40217),
+    ('\u{1f774}', 40218),
+    ('\u{1f780}', 40219),
+    ('\u{1f7d9}', 40220),
+    ('\u{1f7e0}', 40221),
+    ('\u{1f7ec}', 40222),
+    ('\u{1f800}', 40223),
+    ('\u{1f80c}', 40224),
+    ('\u{1f810}', 40225),
+    ('\u{1f848}', 40226),
+    ('\u{1f850}', 40227),
+    ('\u{1f85a}', 40228),
+    ('\u{1f860}', 40229),
+    ('\u{1f888}', 40230),
+    ('\u{1f890}', 40231),
+    ('\u{1f8ae}', 40232),
+    ('\u{1f8b0}', 40233),
+    ('\u{1f8b2}', 40234),
+    ('\u{1f900}', 40235),
+    ('\u{1f979}', 40236),
+    ('\u{1f97a}', 40237),
+    ('\u{1f9cc}', 40238),
+    ('\u{1f9cd}', 40239),
+    ('\u{1fa54}', 40240),
+    ('\u{1fa60}', 40241),
+    ('\u{1fa6e}', 40242),
+    ('\u{1fa70}', 40243),
+    ('\u{1fa75}', 40244),
+    ('\u{1fa78}', 40245),
+    ('\u{1fa7b}', 40246),
+    ('\u{1fa80}', 40247),
+    ('\u{1fa87}', 40248),
+    ('\u{1fa90}', 40249),
+    ('\u{1faa9}', 40250),
+    ('\u{1fab0}', 40251),
+    ('\u{1fab7}', 40252),
+    ('\u{1fac0}', 40253),
+    ('\u{1fac3}', 40254),
+    ('\u{1fad0}', 40255),
+    ('\u{1fad7}', 40256),
+    ('\u{1fb00}', 40257),
+    ('\u{1fb93}', 40258),
+    ('\u{1fb94}', 40259),
+    ('\u{1fbcb}', 40260),
+    ('\u{1fbf0}', 7493),
+    ('\u{1fbfa}', 40271),
+    ('\u{20000}', 40272),
+    ('\u{2a6de}', 40273),
+    ('\u{2a700}', 40274),
+    ('\u{2b735}', 40275),
+    ('\u{2b740}', 40276),
+    ('\u{2b81e}', 40277),
+    ('\u{2b820}', 40278),
+    ('\u{2cea2}', 40279),
+    ('\u{2ceb0}', 40280),
+    ('\u{2ebe1}', 40281),
+    ('\u{2f800}', 7514),
+    ('\u{2f831}', 40331),
+    ('\u{2f834}', 7564),
+    ('\u{2f845}', 40349),
+    ('\u{2f847}', 7582),
+    ('\u{2f86a}', 40385),
+    ('\u{2f86c}', 7618),
+    ('\u{2f891}', 40423),
+    ('\u{2f893}', 40424),
+    ('\u{2f894}', 40425),
+    ('\u{2f896}', 7658),
+    ('\u{2f92c}', 40576),
+    ('\u{2f92e}', 7809),
+    ('\u{2f946}', 40601),
+    ('\u{2f948}', 7834),
+    ('\u{2f95d}', 40623),
+    ('\u{2f95f}', 7856),
+    ('\u{2f9fe}', 40783),
+    ('\u{2fa00}', 8016),
+    ('\u{2fa1e}', 40814),
+    ('\u{30000}', 40815),
+    ('\u{3134b}', 40816),
+    ('\u{e0100}', 40817),
+    ('\u{e01f0}', 40818),
 ];
 
-static INDEX_TABLE: &'static [u16] = &[
-    32768,
-    32769,
-    32770,
-    32771,
-    32772,
-    5,
-    32799,
-    32800,
-    32801,
-    32802,
-    32803,
-    32804,
-    37,
-    32808,
-    41,
-    32812,
-    45,
-    32817,
-    50,
-    32858,
-    91,
-    32909,
-    142,
-    32913,
-    146,
-    32920,
-    153,
-    32996,
-    229,
-    33008,
-    241,
-    33023,
-    256,
-    33037,
-    33038,
-    33039,
-    33040,
-    33041,
-    33042,
-    275,
-    33058,
-    291,
-    33076,
-    33077,
-    310,
-    33141,
-    374,
-    33147,
-    380,
-    33162,
-    395,
-    33172,
-    405,
-    33179,
-    412,
-    33185,
-    418,
-    33192,
-    33193,
-    33194,
-    427,
-    33203,
-    33204,
-    33205,
-    438,
-    33208,
-    441,
-    33249,
-    33250,
-    33251,
-    484,
-    33296,
-    529,
-    33348,
-    581,
-    33382,
-    615,
-    33451,
-    684,
-    33587,
-    33588,
-    33589,
-    33590,
-    823,
-    33593,
-    33594,
-    33595,
-    33596,
-    33597,
-    33598,
-    33599,
-    33600,
-    33601,
-    33602,
-    33603,
-    33604,
-    33605,
-    838,
-    33610,
-    33611,
-    33612,
-    33613,
-    33614,
-    33615,
-    33616,
-    33617,
-    33618,
-    33619,
-    33620,
-    33621,
-    33622,
-    33623,
-    33624,
-    33625,
-    858,
-    33628,
-    33629,
-    33630,
-    33631,
-    33632,
-    33633,
-    33634,
-    33635,
-    33636,
-    869,
-    33645,
-    33646,
-    33647,
-    33648,
-    33649,
-    33650,
-    33651,
-    33652,
-    33653,
-    886,
-    33656,
-    33657,
-    33658,
-    33659,
-    33660,
-    33661,
-    33662,
-    33663,
-    33664,
-    33665,
-    33666,
-    899,
-    33671,
-    33672,
-    33673,
-    33674,
-    33675,
-    33676,
-    33677,
-    33678,
-    33679,
-    33680,
-    33681,
-    33682,
-    33683,
-    916,
-    33691,
-    33692,
-    925,
-    33695,
-    33696,
-    33697,
-    33698,
-    33699,
-    33700,
-    33701,
-    33702,
-    935,
-    33709,
-    33710,
-    33711,
-    33712,
-    33713,
-    33714,
-    33715,
-    33716,
-    33717,
-    33718,
-    33719,
-    33720,
-    33721,
-    33722,
-    33723,
-    33724,
-    33725,
-    33726,
-    33727,
-    33728,
-    33729,
-    33730,
-    33731,
-    33732,
-    33733,
-    33734,
-    33735,
-    33736,
-    33737,
-    33738,
-    33739,
-    33740,
-    33741,
-    33742,
-    33743,
-    33744,
-    33745,
-    33746,
-    33747,
-    33748,
-    33749,
-    33750,
-    33751,
-    33752,
-    33753,
-    33754,
-    33755,
-    33756,
-    33757,
-    33758,
-    33759,
-    33760,
-    33761,
-    994,
-    33765,
-    33766,
-    33767,
-    33768,
-    33769,
-    33770,
-    33771,
-    33772,
-    33773,
-    33774,
-    33775,
-    33776,
-    33777,
-    1010,
-    33781,
-    33782,
-    33783,
-    33784,
-    33785,
-    33786,
-    33787,
-    33788,
-    33789,
-    33790,
-    33791,
-    33792,
-    33793,
-    33794,
-    33795,
-    33796,
-    33797,
-    33798,
-    33799,
-    33800,
-    33801,
-    33802,
-    33803,
-    33804,
-    33805,
-    33806,
-    33807,
-    33808,
-    33809,
-    33810,
-    33811,
-    33812,
-    33813,
-    33814,
-    33815,
-    33816,
-    33817,
-    33818,
-    33819,
-    33820,
-    33821,
-    33822,
-    33823,
-    33824,
-    33825,
-    33826,
-    33827,
-    33828,
-    33829,
-    33830,
-    33831,
-    33832,
-    33833,
-    33834,
-    33835,
-    33836,
-    33837,
-    33838,
-    33839,
-    33840,
-    33841,
-    33842,
-    33843,
-    33844,
-    1077,
-    33847,
-    33848,
-    33849,
-    33850,
-    33851,
-    33852,
-    33853,
-    33854,
-    33855,
-    33856,
-    33857,
-    33858,
-    33859,
-    33860,
-    33861,
-    33862,
-    33863,
-    33864,
-    33865,
-    33866,
-    33867,
-    33868,
-    33869,
-    33870,
-    33871,
-    33872,
-    33873,
-    33874,
-    33875,
-    1108,
-    33878,
-    33879,
-    33880,
-    33881,
-    33882,
-    33883,
-    1116,
-    33887,
-    33888,
-    33889,
-    33890,
-    33891,
-    33892,
-    33893,
-    33894,
-    33895,
-    33896,
-    33897,
-    33898,
-    33899,
-    1132,
-    33902,
-    33903,
-    1136,
-    33906,
-    33907,
-    33908,
-    33909,
-    33910,
-    33911,
-    33912,
-    33913,
-    1146,
-    33918,
-    33919,
-    33920,
-    33921,
-    33922,
-    33923,
-    33924,
-    33925,
-    33926,
-    33927,
-    1160,
-    33931,
-    33932,
-    33933,
-    33934,
-    1167,
-    33937,
-    33938,
-    33939,
-    33940,
-    33941,
-    33942,
-    33943,
-    33944,
-    33945,
-    33946,
-    33947,
-    33948,
-    33949,
-    33950,
-    33951,
-    33952,
-    33953,
-    33954,
-    33955,
-    33956,
-    33957,
-    1190,
-    33965,
-    33966,
-    33967,
-    33968,
-    33969,
-    33970,
-    33971,
-    33972,
-    33973,
-    33974,
-    33975,
-    33976,
-    33977,
-    33978,
-    33979,
-    33980,
-    33981,
-    33982,
-    33983,
-    33984,
-    33985,
-    33986,
-    33987,
-    33988,
-    33989,
-    33990,
-    33991,
-    33992,
-    33993,
-    33994,
-    33995,
-    33996,
-    33997,
-    33998,
-    33999,
-    34000,
-    34001,
-    1234,
-    34005,
-    34006,
-    34007,
-    34008,
-    34009,
-    34010,
-    34011,
-    34012,
-    34013,
-    34014,
-    34015,
-    1248,
-    34019,
-    34020,
-    34021,
-    34022,
-    34023,
-    34024,
-    34025,
-    34026,
-    34027,
-    34028,
-    34029,
-    34030,
-    34031,
-    34032,
-    34033,
-    34034,
-    1267,
-    34041,
-    34042,
-    34043,
-    34044,
-    34045,
-    34046,
-    34047,
-    34048,
-    34049,
-    34050,
-    34051,
-    34052,
-    34053,
-    34054,
-    34055,
-    34056,
-    34057,
-    34058,
-    34059,
-    34060,
-    34061,
-    34062,
-    34063,
-    34064,
-    34065,
-    34066,
-    34067,
-    34068,
-    34069,
-    34070,
-    34071,
-    34072,
-    34073,
-    34074,
-    34075,
-    34076,
-    34077,
-    34078,
-    34079,
-    34080,
-    34081,
-    34082,
-    34083,
-    34084,
-    34085,
-    34086,
-    34087,
-    34088,
-    34089,
-    34090,
-    34091,
-    34092,
-    34093,
-    34094,
-    34095,
-    34096,
-    34097,
-    34098,
-    34099,
-    34100,
-    34101,
-    34102,
-    34103,
-    34104,
-    34105,
-    34106,
-    34107,
-    34108,
-    34109,
-    34110,
-    34111,
-    34112,
-    34113,
-    34114,
-    34115,
-    34116,
-    34117,
-    34118,
-    34119,
-    34120,
-    34121,
-    34122,
-    34123,
-    34124,
-    34125,
-    1358,
-    34130,
-    1363,
-    34134,
-    34135,
-    34136,
-    34137,
-    34138,
-    34139,
-    1372,
-    34203,
-    34204,
-    34205,
-    1438,
-    34243,
-    34244,
-    34245,
-    1478,
-    34395,
-    1628,
-    34398,
-    1631,
-    34496,
-    1729,
-    34505,
-    34506,
-    1739,
-    34513,
-    34514,
-    1747,
-    34523,
-    1756,
-    34532,
-    34533,
-    1766,
-    34540,
-    34541,
-    1774,
-    34550,
-    1783,
-    34573,
-    1806,
-    34622,
-    1855,
-    34653,
-    34654,
-    34655,
-    34656,
-    1889,
-    34665,
-    34666,
-    34667,
-    1900,
-    34676,
-    1909,
-    34691,
-    34692,
-    34693,
-    34694,
-    1927,
-    34697,
-    34698,
-    34699,
-    34700,
-    34701,
-    34702,
-    34703,
-    34704,
-    1937,
-    34710,
-    1943,
-    34714,
-    1947,
-    34718,
-    34719,
-    34720,
-    1953,
-    34723,
-    34724,
-    34725,
-    1958,
-    34728,
-    1961,
-    34770,
-    34771,
-    34772,
-    34773,
-    34774,
-    34775,
-    34776,
-    2009,
-    34788,
-    34789,
-    34790,
-    34791,
-    2024,
-    34795,
-    2028,
-    34798,
-    34799,
-    2032,
-    34815,
-    2048,
-    34828,
-    2061,
-    34831,
-    34832,
-    2065,
-    34836,
-    2069,
-    34885,
-    34886,
-    34887,
-    34888,
-    34889,
-    34890,
-    34891,
-    2124,
-    34897,
-    34898,
-    34899,
-    34900,
-    34901,
-    2134,
-    34904,
-    34905,
-    34906,
-    34907,
-    2140,
-    34948,
-    2181,
-    35028,
-    35029,
-    35030,
-    2263,
-    35034,
-    35035,
-    35036,
-    35037,
-    35038,
-    35039,
-    35040,
-    35041,
-    35042,
-    35043,
-    35044,
-    35045,
-    35046,
-    35047,
-    2280,
-    35096,
-    2329,
-    35103,
-    2336,
-    35116,
-    35117,
-    35118,
-    2351,
-    35222,
-    2455,
-    35226,
-    2459,
-    35229,
-    35230,
-    2463,
-    35233,
-    35234,
-    35235,
-    35236,
-    35237,
-    2470,
-    35240,
-    35241,
-    35242,
-    35243,
-    35244,
-    35245,
-    35246,
-    35247,
-    35248,
-    35249,
-    35250,
-    35251,
-    35252,
-    35253,
-    35254,
-    35255,
-    35256,
-    35257,
-    35258,
-    35259,
-    35260,
-    35261,
-    35262,
-    35263,
-    35264,
-    35265,
-    35266,
-    35267,
-    2500,
-    35482,
-    2715,
-    35486,
-    2719,
-    35492,
-    35493,
-    35494,
-    35495,
-    35496,
-    2729,
-    35499,
-    35500,
-    35501,
-    35502,
-    35503,
-    35504,
-    35505,
-    2738,
-    35601,
-    2834,
-    35616,
-    35617,
-    35618,
-    35619,
-    35620,
-    2853,
-    35693,
-    2926,
-    36126,
-    36127,
-    36128,
-    36129,
-    36130,
-    36131,
-    36132,
-    36133,
-    36134,
-    36135,
-    3368,
-    36181,
-    3414,
-    36212,
-    36213,
-    36214,
-    3447,
-    36228,
-    3461,
-    36292,
-    3525,
-    36307,
-    3540,
-    36311,
-    3544,
-    36315,
-    3548,
-    36350,
-    3583,
-    36354,
-    36355,
-    36356,
-    36357,
-    36358,
-    36359,
-    36360,
-    36361,
-    36362,
-    36363,
-    36364,
-    36365,
-    36366,
-    36367,
-    36368,
-    36369,
-    36370,
-    36371,
-    36372,
-    36373,
-    36374,
-    36375,
-    36376,
-    36377,
-    36378,
-    36379,
-    36380,
-    36381,
-    36382,
-    36383,
-    36384,
-    36385,
-    36386,
-    36387,
-    36388,
-    36389,
-    36390,
-    36391,
-    36392,
-    36393,
-    36394,
-    36395,
-    36396,
-    3629,
-    36401,
-    36402,
-    3635,
-    36483,
-    36484,
-    36485,
-    36486,
-    36487,
-    36488,
-    36489,
-    36490,
-    36491,
-    36492,
-    3725,
-    36500,
-    3733,
-    36762,
-    3995,
-    36766,
-    3999,
-    36781,
-    4014,
-    36784,
-    4017,
-    36836,
-    4069,
-    36852,
-    4085,
-    36959,
-    4192,
-    36965,
-    36966,
-    4199,
-    36972,
-    4205,
-    37024,
-    37025,
-    37026,
-    37027,
-    37028,
-    37029,
-    37030,
-    37031,
-    37032,
-    37033,
-    37034,
-    37035,
-    37036,
-    37037,
-    37038,
-    37039,
-    37040,
-    37041,
-    37042,
-    37043,
-    37044,
-    37045,
-    37046,
-    37047,
-    37048,
-    37049,
-    37050,
-    37051,
-    37052,
-    37053,
-    37054,
-    37055,
-    37056,
-    37057,
-    37058,
-    37059,
-    37060,
-    37061,
-    37062,
-    37063,
-    37064,
-    37065,
-    37066,
-    37067,
-    37068,
-    37069,
-    37070,
-    37071,
-    37072,
-    37073,
-    37074,
-    4307,
-    37391,
-    37392,
-    37393,
-    37394,
-    37395,
-    4628,
-    37401,
-    4634,
-    37407,
-    37408,
-    37409,
-    37410,
-    37411,
-    37412,
-    37413,
-    37414,
-    37415,
-    37416,
-    37417,
-    37418,
-    4651,
-    37422,
-    4655,
-    37427,
-    4660,
-    37433,
-    37434,
-    37435,
-    4668,
-    37443,
-    4676,
-    37449,
-    4682,
-    37453,
-    4686,
-    37496,
-    4729,
-    37511,
-    37512,
-    4745,
-    37522,
-    37523,
-    4756,
-    37527,
-    4760,
-    37544,
-    4777,
-    37547,
-    37548,
-    4781,
-    37551,
-    4784,
-    37576,
-    4809,
-    37594,
-    37595,
-    37596,
-    37597,
-    37598,
-    37599,
-    37600,
-    37601,
-    37602,
-    37603,
-    37604,
-    37605,
-    37606,
-    37607,
-    37608,
-    37609,
-    37610,
-    37611,
-    37612,
-    37613,
-    37614,
-    37615,
-    37616,
-    37617,
-    37618,
-    37619,
-    37620,
-    37621,
-    37622,
-    37623,
-    37624,
-    37625,
-    37626,
-    37627,
-    37628,
-    37629,
-    37630,
-    37631,
-    37632,
-    37633,
-    4866,
-    37826,
-    5059,
-    37833,
-    5066,
-    37840,
-    5073,
-    37847,
-    5080,
-    37851,
-    5084,
-    37867,
-    37868,
-    37869,
-    37870,
-    37871,
-    37872,
-    37873,
-    37874,
-    37875,
-    37876,
-    37877,
-    37878,
-    37879,
-    37880,
-    37881,
-    37882,
-    37883,
-    37884,
-    37885,
-    37886,
-    37887,
-    37888,
-    37889,
-    37890,
-    37891,
-    37892,
-    37893,
-    37894,
-    37895,
-    37896,
-    37897,
-    37898,
-    37899,
-    37900,
-    37901,
-    37902,
-    37903,
-    37904,
-    37905,
-    37906,
-    37907,
-    37908,
-    37909,
-    37910,
-    37911,
-    5144,
-    37952,
-    37953,
-    37954,
-    37955,
-    5188,
-    37992,
-    37993,
-    37994,
-    37995,
-    37996,
-    37997,
-    37998,
-    37999,
-    38000,
-    38001,
-    38002,
-    38003,
-    38004,
-    38005,
-    38006,
-    38007,
-    38008,
-    5241,
-    38011,
-    38012,
-    38013,
-    38014,
-    38015,
-    38016,
-    38017,
-    38018,
-    38019,
-    38020,
-    38021,
-    38022,
-    38023,
-    38024,
-    38025,
-    38026,
-    38027,
-    38028,
-    38029,
-    38030,
-    38031,
-    38032,
-    38033,
-    38034,
-    38035,
-    38036,
-    38037,
-    38038,
-    38039,
-    38040,
-    38041,
-    38042,
-    38043,
-    38044,
-    38045,
-    38046,
-    38047,
-    38048,
-    38049,
-    38050,
-    38051,
-    38052,
-    38053,
-    38054,
-    38055,
-    38056,
-    38057,
-    38058,
-    38059,
-    38060,
-    38061,
-    38062,
-    38063,
-    38064,
-    38065,
-    38066,
-    38067,
-    38068,
-    38069,
-    38070,
-    38071,
-    38072,
-    5305,
-    38124,
-    38125,
-    38126,
-    38127,
-    38128,
-    38129,
-    38130,
-    38131,
-    38132,
-    38133,
-    38134,
-    38135,
-    38136,
-    38137,
-    38138,
-    38139,
-    38140,
-    38141,
-    38142,
-    38143,
-    38144,
-    38145,
-    38146,
-    38147,
-    38148,
-    38149,
-    38150,
-    38151,
-    38152,
-    38153,
-    38154,
-    38155,
-    38156,
-    38157,
-    38158,
-    38159,
-    5392,
-    38163,
-    38164,
-    38165,
-    38166,
-    38167,
-    38168,
-    38169,
-    38170,
-    38171,
-    38172,
-    38173,
-    38174,
-    38175,
-    38176,
-    38177,
-    38178,
-    38179,
-    38180,
-    38181,
-    38182,
-    38183,
-    38184,
-    38185,
-    38186,
-    38187,
-    38188,
-    38189,
-    38190,
-    38191,
-    38192,
-    38193,
-    38194,
-    38195,
-    38196,
-    38197,
-    38198,
-    38199,
-    38200,
-    38201,
-    38202,
-    38203,
-    5436,
-    38208,
-    38209,
-    38210,
-    38211,
-    38212,
-    38213,
-    38214,
-    38215,
-    38216,
-    38217,
-    38218,
-    38219,
-    38220,
-    38221,
-    38222,
-    38223,
-    38224,
-    38225,
-    38226,
-    38227,
-    38228,
-    38229,
-    38230,
-    38231,
-    38232,
-    5465,
-    38265,
-    38266,
-    38267,
-    38268,
-    38269,
-    38270,
-    38271,
-    38272,
-    38273,
-    38274,
-    38275,
-    38276,
-    38277,
-    38278,
-    38279,
-    38280,
-    38281,
-    38282,
-    38283,
-    38284,
-    38285,
-    38286,
-    38287,
-    38288,
-    38289,
-    38290,
-    38291,
-    38292,
-    38293,
-    38294,
-    38295,
-    38296,
-    38297,
-    38298,
-    5531,
-    38301,
-    38302,
-    38303,
-    38304,
-    38305,
-    38306,
-    38307,
-    38308,
-    38309,
-    38310,
-    38311,
-    38312,
-    38313,
-    38314,
-    38315,
-    38316,
-    38317,
-    38318,
-    38319,
-    38320,
-    38321,
-    38322,
-    38323,
-    38324,
-    38325,
-    38326,
-    38327,
-    38328,
-    38329,
-    38330,
-    38331,
-    38332,
-    38333,
-    38334,
-    38335,
-    38336,
-    38337,
-    38338,
-    38339,
-    38340,
-    38341,
-    38342,
-    38343,
-    38344,
-    38345,
-    38346,
-    38347,
-    38348,
-    38349,
-    38350,
-    38351,
-    38352,
-    38353,
-    38354,
-    38355,
-    38356,
-    38357,
-    38358,
-    38359,
-    38360,
-    38361,
-    38362,
-    38363,
-    38364,
-    38365,
-    38366,
-    38367,
-    38368,
-    38369,
-    38370,
-    38371,
-    38372,
-    5605,
-    38380,
-    38381,
-    38382,
-    5615,
-    38389,
-    38390,
-    38391,
-    38392,
-    38393,
-    38394,
-    38395,
-    38396,
-    5629,
-    38557,
-    38558,
-    38559,
-    5792,
-    38562,
-    5795,
-    38661,
-    5894,
-    38720,
-    5953,
-    39069,
-    6302,
-    39113,
-    6346,
-    39170,
-    6403,
-    39227,
-    6460,
-    39284,
-    6517,
-    39341,
-    6574,
-    39355,
-    39356,
-    6589,
-    39407,
-    39408,
-    39409,
-    39410,
-    39411,
-    39412,
-    39413,
-    39414,
-    39415,
-    39416,
-    39417,
-    39418,
-    39419,
-    39420,
-    39421,
-    39422,
-    39423,
-    39424,
-    39425,
-    39426,
-    6659,
-    39461,
-    39462,
-    39463,
-    39464,
-    39465,
-    39466,
-    6699,
-    39504,
-    6737,
-    39526,
-    39527,
-    39528,
-    6761,
-    39543,
-    6776,
-    39558,
-    6791,
-    39612,
-    6845,
-    39640,
-    39641,
-    39642,
-    39643,
-    39644,
-    39645,
-    39646,
-    39647,
-    39648,
-    39649,
-    39650,
-    39651,
-    39652,
-    39653,
-    39654,
-    6887,
-    39665,
-    39666,
-    6899,
-    39731,
-    6964,
-    39734,
-    39735,
-    39736,
-    39737,
-    39738,
-    39739,
-    6972,
-    39743,
-    6976,
-    39788,
-    7021,
-    39798,
-    7031,
-    39801,
-    39802,
-    39803,
-    39804,
-    39805,
-    39806,
-    39807,
-    39808,
-    39809,
-    39810,
-    39811,
-    39812,
-    39813,
-    39814,
-    39815,
-    39816,
-    39817,
-    39818,
-    39819,
-    39820,
-    39821,
-    39822,
-    39823,
-    39824,
-    39825,
-    39826,
-    39827,
-    39828,
-    39829,
-    39830,
-    39831,
-    39832,
-    39833,
-    39834,
-    39835,
-    39836,
-    39837,
-    39838,
-    39839,
-    39840,
-    39841,
-    39842,
-    39843,
-    39844,
-    39845,
-    39846,
-    39847,
-    7080,
-    39897,
-    7130,
-    39915,
-    7148,
-    39951,
-    7184,
-    39989,
-    39990,
-    39991,
-    7224,
-    40142,
-    7375,
-    40167,
-    7400,
-    40189,
-    7422,
-    40349,
-    7582,
-    40380,
-    40381,
-    40382,
-];
-
-static MAPPING_TABLE: &'static [Mapping] = &[
+static MAPPING_TABLE: &[Mapping] = &[
     DisallowedStd3Valid,
     Valid,
     DisallowedStd3Valid,
@@ -3207,28 +1930,29 @@
     DisallowedStd3Valid,
     Disallowed,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
+    DisallowedIdna2008,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 0, byte_len: 3 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
+    DisallowedIdna2008,
     Ignored,
-    Valid,
+    DisallowedIdna2008,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 0, byte_len: 3 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 0, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 0, byte_len: 2 }),
+    DisallowedIdna2008,
     Valid,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 0, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 0, byte_len: 5 }),
     Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 0, byte_len: 5 }),
     Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 0, byte_len: 5 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 0, byte_len: 2 }),
@@ -3252,7 +1976,7 @@
     Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 0, byte_len: 2 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 0, byte_len: 2 }),
@@ -3262,6 +1986,8 @@
     Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 0, byte_len: 2 }),
     Deviation(StringTableSlice { byte_start_lo: 119, byte_start_hi: 0, byte_len: 2 }),
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 0, byte_len: 2 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 0, byte_len: 2 }),
@@ -3576,18 +2302,26 @@
     Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 0, byte_len: 1 }),
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 1, byte_len: 3 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 1, byte_len: 3 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 1, byte_len: 3 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 1, byte_len: 3 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 1, byte_len: 3 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 1, byte_len: 3 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 1, byte_len: 2 }),
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 1, byte_len: 2 }),
@@ -3694,7 +2428,7 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 2, byte_len: 2 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 2, byte_len: 2 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 2, byte_len: 2 }),
@@ -3786,6 +2520,9 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 2, byte_len: 2 }),
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 2, byte_len: 2 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 2, byte_len: 2 }),
@@ -3992,45 +2729,69 @@
     Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 3, byte_len: 2 }),
     Disallowed,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 3, byte_len: 4 }),
-    Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 3, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 3, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 3, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 3, byte_len: 4 }),
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
     Valid,
     Disallowed,
     Valid,
@@ -4049,6 +2810,10 @@
     Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 4, byte_len: 6 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 4, byte_len: 6 }),
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
@@ -4077,6 +2842,10 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
@@ -4114,6 +2883,7 @@
     Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 4, byte_len: 6 }),
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -4140,6 +2910,7 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -4171,8 +2942,9 @@
     Valid,
     Disallowed,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -4205,6 +2977,7 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -4228,8 +3001,9 @@
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -4265,12 +3039,15 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
@@ -4295,14 +3072,17 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 4, byte_len: 6 }),
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -4315,7 +3095,7 @@
     Valid,
     Disallowed,
     Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 4, byte_len: 6 }),
     Valid,
     Disallowed,
     Valid,
@@ -4325,25 +3105,26 @@
     Valid,
     Disallowed,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 4, byte_len: 6 }),
-    Valid,
     Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 4, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 4, byte_len: 6 }),
     Valid,
     Disallowed,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 4, byte_len: 3 }),
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 4, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 4, byte_len: 6 }),
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 4, byte_len: 3 }),
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 4, byte_len: 6 }),
     Valid,
@@ -4371,6 +3152,8 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 4, byte_len: 6 }),
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 4, byte_len: 6 }),
     Valid,
     Disallowed,
@@ -4386,20 +3169,28 @@
     Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 4, byte_len: 6 }),
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 4, byte_len: 3 }),
     Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 4, byte_len: 3 }),
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 4, byte_len: 3 }),
     Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -4433,8 +3224,10 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -4445,14 +3238,16 @@
     Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 5, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 5, byte_len: 3 }),
     Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -4460,6 +3255,7 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -4472,10 +3268,18 @@
     Valid,
     Disallowed,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
     Ignored,
     Disallowed,
     Valid,
@@ -4492,8 +3296,9 @@
     Disallowed,
     Valid,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -4503,9 +3308,12 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -4514,21 +3322,31 @@
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 2, byte_len: 2 }),
@@ -4538,9 +3356,58 @@
     Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 5, byte_len: 3 }),
     Disallowed,
-    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 4, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 5, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 5, byte_len: 3 }),
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
@@ -4567,15 +3434,15 @@
     Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 5, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 1, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 0, byte_len: 1 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 0, byte_len: 1 }),
@@ -4583,15 +3450,15 @@
     Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 1, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 5, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 5, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 5, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 5, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 2, byte_len: 2 }),
@@ -4609,136 +3476,46 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 2, byte_len: 2 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 0, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 1, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 5, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 5, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 1, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 1, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 1, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 1, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 5, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 5, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 1, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 2, byte_len: 2 }),
     Valid,
     Disallowed,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
     Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 5, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 5, byte_len: 3 }),
@@ -4800,9 +3577,6 @@
     Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 6, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 6, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 0, byte_len: 2 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 6, byte_len: 3 }),
     Valid,
@@ -4893,6 +3667,9 @@
     Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 6, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 6, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 0, byte_len: 2 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 6, byte_len: 3 }),
     Valid,
@@ -4901,67 +3678,157 @@
     Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 6, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 6, byte_len: 3 }),
     Valid,
-    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 6, byte_len: 3 }),
-    Disallowed,
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 6, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 7, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 7, byte_len: 3 }),
     Valid,
-    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 7, byte_len: 3 }),
-    Disallowed,
     Valid,
-    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 7, byte_len: 3 }),
-    Disallowed,
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 7, byte_len: 3 }),
-    Disallowed,
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 7, byte_len: 3 }),
-    Disallowed,
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 7, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 7, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 7, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 7, byte_len: 3 }),
+    Disallowed,
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 7, byte_len: 3 }),
+    Disallowed,
+    Valid,
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 7, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 7, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 7, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 7, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 7, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 2, byte_len: 2 }),
     Valid,
@@ -4977,188 +3844,188 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 2, byte_len: 2 }),
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 7, byte_len: 5 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 7, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 7, byte_len: 4 }),
-    Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 7, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 7, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 7, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 8, byte_len: 5 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 8, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 8, byte_len: 4 }),
+    Disallowed,
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 8, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 7, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 7, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 8, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 8, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 1, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 7, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 7, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 7, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 7, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 8, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 8, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 8, byte_len: 4 }),
     Disallowed,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 8, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 8, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 7, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 8, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 8, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 8, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 8, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 8, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 8, byte_len: 5 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 8, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 2 }),
     Disallowed,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 8, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 8, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 8, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 2, byte_len: 2 }),
     Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 8, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 8, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 8, byte_len: 5 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 8, byte_len: 2 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 8, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 8, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 8, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 8, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 8, byte_len: 5 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 8, byte_len: 2 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 8, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 8, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 8, byte_len: 5 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 2, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 8, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 8, byte_len: 1 }),
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 8, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 8, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 8, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 8, byte_len: 4 }),
     Disallowed,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 8, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 8, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 8, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 8, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 8, byte_len: 4 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 0, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 8, byte_len: 3 }),
     Disallowed,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 0, byte_len: 1 }),
     Ignored,
-    Deviation(StringTableSlice { byte_start_lo: 105, byte_start_hi: 8, byte_len: 0 }),
+    Deviation(StringTableSlice { byte_start_lo: 240, byte_start_hi: 8, byte_len: 0 }),
     Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 8, byte_len: 3 }),
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 8, byte_len: 3 }),
-    Valid,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedIdna2008,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 8, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 8, byte_len: 9 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 8, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 8, byte_len: 9 }),
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 8, byte_len: 2 }),
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 8, byte_len: 3 }),
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 8, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 8, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 8, byte_len: 2 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 8, byte_len: 12 }),
-    Valid,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 8, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 8, byte_len: 9 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 9, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 9, byte_len: 9 }),
+    DisallowedIdna2008,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 9, byte_len: 2 }),
+    DisallowedIdna2008,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedIdna2008,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 9, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 9, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 9, byte_len: 2 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 9, byte_len: 12 }),
+    DisallowedIdna2008,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 0, byte_len: 1 }),
     Ignored,
     Disallowed,
     Ignored,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 0, byte_len: 1 }),
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 8, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 8, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 9, byte_len: 1 }),
     Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 0, byte_len: 1 }),
@@ -5174,210 +4041,213 @@
     Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 0, byte_len: 1 }),
     Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 8, byte_len: 2 }),
-    Valid,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 9, byte_len: 2 }),
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 8, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 9, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 8, byte_len: 3 }),
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 8, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 8, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedIdna2008,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 9, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 1, byte_len: 2 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 9, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 8, byte_len: 2 }),
-    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 9, byte_len: 2 }),
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 8, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 8, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 8, byte_len: 2 }),
-    Valid,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 9, byte_len: 2 }),
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 0, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 0, byte_len: 1 }),
     Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 8, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 8, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 8, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 8, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 9, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 8, byte_len: 3 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 9, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 8, byte_len: 3 }),
-    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 0, byte_len: 1 }),
+    DisallowedIdna2008,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 8, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 8, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 9, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 9, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 9, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 9, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 9, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 9, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 9, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 9, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 9, byte_len: 4 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 9, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 9, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 9, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 9, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 9, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 9, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 9, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 9, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 9, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 9, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 9, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 9, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 9, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 9, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 9, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
-    Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 9, byte_len: 5 }),
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 9, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 9, byte_len: 9 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 9, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 9, byte_len: 9 }),
-    Valid,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 9, byte_len: 5 }),
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 9, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 9, byte_len: 9 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 9, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 9, byte_len: 9 }),
+    DisallowedIdna2008,
     DisallowedStd3Valid,
-    Valid,
+    DisallowedIdna2008,
     DisallowedStd3Valid,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 9, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 9, byte_len: 3 }),
-    Valid,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 9, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 9, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 9, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 9, byte_len: 4 }),
-    Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 10, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 10, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 10, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 10, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 10, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 10, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 10, byte_len: 4 }),
+    Disallowed,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 10, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
@@ -5430,209 +4300,204 @@
     Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 10, byte_len: 12 }),
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 10, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 10, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 10, byte_len: 5 }),
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 10, byte_len: 12 }),
+    DisallowedIdna2008,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 10, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 10, byte_len: 5 }),
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 10, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 11, byte_len: 3 }),
     Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 10, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 10, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 11, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 11, byte_len: 2 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 5, byte_len: 2 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 11, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 10, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 10, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 11, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 11, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 11, byte_len: 3 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 11, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 11, byte_len: 3 }),
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -5641,8 +4506,8 @@
     Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 11, byte_len: 3 }),
-    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 12, byte_len: 3 }),
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -5663,59 +4528,17 @@
     Valid,
     Disallowed,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 11, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 11, byte_len: 3 }),
+    DisallowedIdna2008,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 12, byte_len: 3 }),
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 12, byte_len: 3 }),
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 12, byte_len: 3 }),
+    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 12, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 12, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 12, byte_len: 3 }),
@@ -5885,30 +4708,16 @@
     Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 13, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 13, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 14, byte_len: 3 }),
-    Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 0, byte_len: 1 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 14, byte_len: 1 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 14, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 14, byte_len: 3 }),
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 14, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 14, byte_len: 4 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 14, byte_len: 6 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 14, byte_len: 6 }),
-    Disallowed,
-    Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 14, byte_len: 3 }),
@@ -5944,23 +4753,43 @@
     Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 14, byte_len: 3 }),
+    Disallowed,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 0, byte_len: 1 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 14, byte_len: 1 }),
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 14, byte_len: 3 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 14, byte_len: 3 }),
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    Valid,
+    Disallowed,
+    Valid,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 14, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 14, byte_len: 4 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 14, byte_len: 6 }),
+    DisallowedIdna2008,
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 14, byte_len: 6 }),
+    Disallowed,
+    Valid,
+    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 14, byte_len: 3 }),
-    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 14, byte_len: 3 }),
@@ -6003,86 +4832,104 @@
     Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 15, byte_len: 3 }),
-    Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 11, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 15, byte_len: 3 }),
+    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 11, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 11, byte_len: 3 }),
-    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 15, byte_len: 3 }),
     Disallowed,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 12, byte_len: 3 }),
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 15, byte_len: 5 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 15, byte_len: 5 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 15, byte_len: 8 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 15, byte_len: 8 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 15, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 15, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 15, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 15, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 15, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 16, byte_len: 8 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 16, byte_len: 8 }),
     Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 15, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 16, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 16, byte_len: 5 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 16, byte_len: 5 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 16, byte_len: 5 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 16, byte_len: 5 }),
@@ -6092,554 +4939,484 @@
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 16, byte_len: 5 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 16, byte_len: 5 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 16, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 16, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 16, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 16, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 17, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 17, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 17, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 17, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 16, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 17, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 17, byte_len: 5 }),
     Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 17, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 11, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 12, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 17, byte_len: 3 }),
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 15, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 17, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 17, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 17, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 17, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 17, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 17, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 17, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 17, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 17, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 17, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 18, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 18, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 18, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 18, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 18, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 18, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 18, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 18, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 18, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 18, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 18, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 18, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 18, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 18, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 17, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 17, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 17, byte_len: 3 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 17, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 18, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 18, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 18, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 18, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 18, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 18, byte_len: 6 }),
     Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 18, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 18, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 18, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 19, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 18, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 18, byte_len: 12 }),
     Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 19, byte_len: 9 }),
     Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 19, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 19, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 19, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 19, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 19, byte_len: 9 }),
     Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 19, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 19, byte_len: 18 }),
-    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 19, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 19, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 19, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 19, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 19, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 19, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 19, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 19, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 19, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 19, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 19, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 19, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 19, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 19, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 19, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 19, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 19, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 20, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 20, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 19, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 19, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 19, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 19, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 19, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 19, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 19, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 19, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 19, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 19, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 19, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 19, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 19, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 19, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 19, byte_len: 18 }),
+    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 19, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 19, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 19, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 20, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 20, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 20, byte_len: 9 }),
     Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 20, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 20, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 20, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 20, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 20, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 20, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 20, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 20, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 20, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 20, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 20, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 20, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 21, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 20, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 20, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 20, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 20, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 20, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 20, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 20, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 20, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 20, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 20, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 20, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 20, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 20, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 20, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 20, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 20, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 20, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 20, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 20, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 20, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 20, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 20, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 21, byte_len: 15 }),
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 21, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 21, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 21, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 21, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 21, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 21, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 21, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 21, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 21, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 21, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 21, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 21, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 21, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 21, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 21, byte_len: 9 }),
     Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 21, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 21, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 21, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 21, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 21, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 21, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 21, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 21, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 21, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 21, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 21, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 21, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 22, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 22, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 22, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 22, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 22, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 22, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 22, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 22, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 22, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 21, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 21, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 21, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 21, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 21, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 21, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 21, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 22, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 22, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 22, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 22, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 22, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 22, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 22, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 22, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 22, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 22, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 22, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 22, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 22, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 22, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 22, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 22, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 22, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 22, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 22, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 22, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 23, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 23, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 23, byte_len: 7 }),
-    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 23, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 22, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 22, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 22, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 22, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 22, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 22, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 23, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 23, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 23, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 23, byte_len: 12 }),
     Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 23, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 23, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 23, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 23, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 23, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 23, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 23, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 23, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 23, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 23, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 23, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 23, byte_len: 6 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 22, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 23, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 22, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 23, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 23, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 23, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 23, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 23, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 23, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 23, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 23, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 23, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 23, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 23, byte_len: 7 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 23, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 23, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 23, byte_len: 6 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 23, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 23, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 23, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 23, byte_len: 5 }),
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 24, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 24, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 24, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 24, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 24, byte_len: 3 }),
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 5, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 24, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 24, byte_len: 3 }),
+    DisallowedIdna2008,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 2, byte_len: 2 }),
+    DisallowedIdna2008,
     Valid,
     Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
     Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 24, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 24, byte_len: 3 }),
@@ -6650,6 +5427,8 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 24, byte_len: 3 }),
     Valid,
+    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 5, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 24, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 24, byte_len: 3 }),
@@ -6684,6 +5463,10 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 24, byte_len: 3 }),
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 24, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 24, byte_len: 3 }),
@@ -6694,13 +5477,12 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 24, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 24, byte_len: 3 }),
-    Valid,
     Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 24, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 24, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 24, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 24, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 24, byte_len: 3 }),
@@ -6713,8 +5495,16 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 25, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 2, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 2, byte_len: 2 }),
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 25, byte_len: 3 }),
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 25, byte_len: 3 }),
@@ -6739,1338 +5529,1477 @@
     Valid,
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 25, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 1, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 25, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 5, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 25, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 25, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 5, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 25, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 25, byte_len: 3 }),
-    Valid,
-    Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 0, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 0, byte_len: 2 }),
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
-    Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 25, byte_len: 3 }),
     Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 25, byte_len: 3 }),
     Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 25, byte_len: 3 }),
     Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 25, byte_len: 3 }),
     Valid,
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 25, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 24, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 10, byte_len: 2 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 25, byte_len: 3 }),
     Valid,
-    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 25, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 5, byte_len: 2 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 1, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 5, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 25, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 5, byte_len: 2 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 25, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 25, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 25, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
+    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 25, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 5, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 25, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
     Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
+    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 25, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 0, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 0, byte_len: 2 }),
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    Valid,
+    Disallowed,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    Valid,
+    Disallowed,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    Valid,
+    Disallowed,
+    Valid,
+    Disallowed,
+    Valid,
+    Disallowed,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    Valid,
+    Disallowed,
+    Valid,
+    Disallowed,
+    Valid,
+    Disallowed,
+    Valid,
+    Disallowed,
+    Valid,
+    Disallowed,
+    Valid,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 25, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 25, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 11, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 25, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 26, byte_len: 3 }),
     Valid,
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 25, byte_len: 2 }),
+    DisallowedIdna2008,
     Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 25, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 25, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 25, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 25, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 25, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 25, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 26, byte_len: 3 }),
+    Valid,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 28, byte_len: 3 }),
+    DisallowedIdna2008,
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 26, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 29, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 29, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 29, byte_len: 3 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 29, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 29, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 29, byte_len: 3 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 13, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 29, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 29, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 29, byte_len: 3 }),
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 30, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 30, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 30, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 30, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 30, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 30, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 30, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 30, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 30, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 30, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 30, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 31, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 31, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 31, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 31, byte_len: 4 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 31, byte_len: 4 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 8, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 8, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 31, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 31, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 31, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 31, byte_len: 4 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 31, byte_len: 4 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 31, byte_len: 4 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 31, byte_len: 4 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 31, byte_len: 4 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 31, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 31, byte_len: 2 }),
-    Valid,
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 30, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 30, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 31, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 31, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 31, byte_len: 4 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 31, byte_len: 4 }),
+    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 9, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 31, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 31, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 31, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 31, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 31, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 32, byte_len: 4 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 32, byte_len: 4 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 32, byte_len: 4 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 32, byte_len: 4 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 32, byte_len: 4 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 32, byte_len: 2 }),
+    DisallowedIdna2008,
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 32, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 3, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 32, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 32, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 32, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 32, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 32, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 32, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 33, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 33, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 33, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 33, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 33, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 33, byte_len: 5 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 33, byte_len: 5 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 33, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 34, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 32, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 34, byte_len: 4 }),
-    Valid,
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 34, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 35, byte_len: 6 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 35, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 36, byte_len: 6 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 36, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 37, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 37, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 37, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 37, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 37, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 37, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 37, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 37, byte_len: 6 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 37, byte_len: 33 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 37, byte_len: 15 }),
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 37, byte_len: 8 }),
-    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 34, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 34, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 34, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 34, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 34, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 34, byte_len: 5 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 34, byte_len: 5 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 32, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 34, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 34, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 34, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 34, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 35, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 33, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 35, byte_len: 4 }),
+    DisallowedIdna2008,
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 36, byte_len: 6 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 36, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 35, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 37, byte_len: 6 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 37, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 37, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 37, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 37, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 37, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 37, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 37, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 37, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 37, byte_len: 6 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 37, byte_len: 33 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 38, byte_len: 15 }),
+    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 38, byte_len: 8 }),
+    DisallowedIdna2008,
     Disallowed,
     Ignored,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 37, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 37, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 3 }),
     Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 37, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 38, byte_len: 1 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 2, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 37, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 37, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 38, byte_len: 3 }),
     Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 37, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 37, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 9, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 9, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 37, byte_len: 3 }),
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 8, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 37, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 37, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 38, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 9, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 38, byte_len: 3 }),
+    DisallowedIdna2008,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 9, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 3 }),
     Disallowed,
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 2, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 37, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 37, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 37, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 37, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 8, byte_len: 1 }),
-    Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 37, byte_len: 1 }),
-    Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 37, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 37, byte_len: 3 }),
-    Valid,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 37, byte_len: 3 }),
-    Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 37, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 37, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 37, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 37, byte_len: 4 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 37, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 32, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 38, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 38, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 38, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 9, byte_len: 1 }),
+    Disallowed,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 38, byte_len: 1 }),
+    Disallowed,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 38, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 38, byte_len: 3 }),
+    Valid,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 38, byte_len: 3 }),
+    Disallowed,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 38, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 38, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 38, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 38, byte_len: 4 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 38, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 38, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 38, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 38, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 38, byte_len: 4 }),
     Disallowed,
     Ignored,
     Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 38, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 38, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 37, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 37, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 14, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 38, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 14, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 37, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 38, byte_len: 1 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 2, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 8, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 37, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 38, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
@@ -8097,179 +7026,179 @@
     Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 38, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 8, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 8, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 38, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 37, byte_len: 1 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 38, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 14, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 37, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 18, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 38, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 14, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 38, byte_len: 1 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 38, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 14, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 18, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 39, byte_len: 3 }),
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 14, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 14, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 14, byte_len: 3 }),
-    Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 14, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 15, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 15, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 15, byte_len: 3 }),
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 15, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 15, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 39, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 39, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 39, byte_len: 2 }),
     DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 0, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 39, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 39, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 39, byte_len: 3 }),
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 38, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 38, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 39, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 39, byte_len: 3 }),
     Disallowed,
     Valid,
     Disallowed,
@@ -8285,10 +7214,17 @@
     Disallowed,
     Valid,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -8296,105 +7232,114 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 39, byte_len: 4 }),
     Valid,
     Disallowed,
     Valid,
     Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 39, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 40, byte_len: 4 }),
+    Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 38, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 39, byte_len: 4 }),
     Valid,
     Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 39, byte_len: 4 }),
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -8414,20 +7359,33 @@
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -8441,96 +7399,128 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    Disallowed,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
     Valid,
     Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 40, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 41, byte_len: 4 }),
+    Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 39, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 40, byte_len: 4 }),
+    Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -8539,14 +7529,29 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
@@ -8557,6 +7562,7 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -8593,21 +7599,33 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
     Valid,
     Disallowed,
     Valid,
@@ -8617,10 +7635,45 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 41, byte_len: 4 }),
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -8635,39 +7688,8 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 40, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 41, byte_len: 4 }),
     Valid,
     Disallowed,
     Valid,
@@ -8675,10 +7697,17 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -8687,9 +7716,12 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
     Valid,
@@ -8723,11 +7755,19 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
     Valid,
     Disallowed,
     Valid,
@@ -8740,19 +7780,60 @@
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 41, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 42, byte_len: 4 }),
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -8761,6 +7842,8 @@
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
+    Valid,
     Disallowed,
     Valid,
     Disallowed,
@@ -8769,36 +7852,58 @@
     Valid,
     Disallowed,
     Valid,
-    Ignored,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 41, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 41, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 41, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 41, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 41, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 41, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 41, byte_len: 12 }),
+    Disallowed,
     Valid,
     Disallowed,
     Valid,
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 41, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 41, byte_len: 8 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 41, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 41, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 41, byte_len: 12 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 41, byte_len: 12 }),
+    Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
+    Ignored,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 42, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 42, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 42, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 42, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 42, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 42, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 42, byte_len: 12 }),
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 42, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 42, byte_len: 8 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 42, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 42, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 42, byte_len: 12 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 42, byte_len: 12 }),
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
     Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 0, byte_len: 1 }),
@@ -9470,8 +8575,8 @@
     Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 41, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 41, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 42, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 42, byte_len: 2 }),
     Disallowed,
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 2, byte_len: 2 }),
@@ -9498,7 +8603,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 2, byte_len: 2 }),
@@ -9523,7 +8628,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 2, byte_len: 2 }),
@@ -9555,7 +8660,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 2, byte_len: 2 }),
@@ -9580,7 +8685,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 2, byte_len: 2 }),
@@ -9612,7 +8717,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 2, byte_len: 2 }),
@@ -9637,7 +8742,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 2, byte_len: 2 }),
@@ -9669,7 +8774,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 2, byte_len: 2 }),
@@ -9694,7 +8799,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 2, byte_len: 2 }),
@@ -9726,7 +8831,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 2, byte_len: 2 }),
@@ -9751,7 +8856,7 @@
     Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 2, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 41, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 42, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 2, byte_len: 2 }),
@@ -9760,63 +8865,65 @@
     Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 2, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 2, byte_len: 2 }),
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 8, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 8, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
-    Disallowed,
+    DisallowedIdna2008,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
@@ -9830,278 +8937,301 @@
     Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 41, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 42, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 42, byte_len: 4 }),
     Valid,
     Disallowed,
     Valid,
     Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 42, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 31, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 42, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 42, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 37, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 37, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 37, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 37, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 31, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 42, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 37, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 42, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 42, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 37, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 38, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 38, byte_len: 2 }),
-    Disallowed,
     Valid,
     Disallowed,
     Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
     Valid,
     Disallowed,
+    DisallowedIdna2008,
     Valid,
     Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 42, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 43, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 43, byte_len: 4 }),
     Valid,
     Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 52, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 42, byte_len: 2 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 42, byte_len: 2 }),
     Valid,
     Disallowed,
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 9, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 10, byte_len: 3 }),
-    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 10, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 42, byte_len: 7 }),
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 43, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 32, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 43, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 43, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 32, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 43, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 43, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 43, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 38, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 38, byte_len: 2 }),
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedIdna2008,
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 10, byte_len: 3 }),
+    DisallowedStd3Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 10, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 43, byte_len: 7 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 42, byte_len: 2 }),
-    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedIdna2008,
     Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 2, byte_start_hi: 0, byte_len: 1 }),
@@ -10128,120 +9258,145 @@
     Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 0, byte_len: 1 }),
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 0, byte_len: 1 }),
-    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 42, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 23, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 42, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 43, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 23, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 43, byte_len: 2 }),
     Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 0, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 42, byte_len: 2 }),
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 42, byte_len: 2 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 42, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 43, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 43, byte_len: 2 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 43, byte_len: 2 }),
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 43, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 43, byte_len: 6 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 18, byte_len: 3 }),
     Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 42, byte_len: 2 }),
-    Valid,
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 15, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 166, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 43, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 43, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 44, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 44, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 44, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 44, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 44, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 44, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 44, byte_len: 9 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 44, byte_len: 9 }),
     Disallowed,
-    Valid,
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 42, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 42, byte_len: 6 }),
-    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 17, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 44, byte_len: 3 }),
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 15, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 17, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 42, byte_len: 3 }),
+    DisallowedIdna2008,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 42, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 42, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 42, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 42, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 42, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 42, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 42, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 8, byte_start_hi: 43, byte_len: 9 }),
-    Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 43, byte_len: 9 }),
+    DisallowedIdna2008,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 43, byte_len: 3 }),
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
     Disallowed,
-    Valid,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    DisallowedIdna2008,
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 0, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 9, byte_len: 1 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 9, byte_len: 1 }),
     Disallowed,
     Valid,
     Disallowed,
@@ -10251,544 +9406,548 @@
     Disallowed,
     Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 43, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 43, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 43, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 43, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 43, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 11, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 43, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 43, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 43, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 43, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 42, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 44, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 44, byte_len: 3 }),
+    Valid,
     Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 44, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 44, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 30, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 44, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 44, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 44, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 12, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 44, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 44, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 44, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 43, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 44, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 205, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 208, byte_start_hi: 44, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 236, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 44, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 30, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 29, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 29, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 45, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 43, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 62, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 59, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 45, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 45, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 123, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 45, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 144, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 150, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 28, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 45, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 239, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 242, byte_start_hi: 45, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 164, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 172, byte_start_hi: 12, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 45, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 211, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 49, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 45, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 245, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 45, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 30, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 11, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 14, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 46, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 251, byte_start_hi: 26, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 46, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 120, byte_start_hi: 30, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 66, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 69, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 82, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 126, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 79, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 176, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 46, byte_len: 4 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 153, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 178, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 181, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 46, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 219, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 229, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 232, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 248, byte_start_hi: 46, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 46, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 255, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 225, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 46, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 46, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 47, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 213, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 27, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 38, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 41, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 44, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 56, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 44, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 75, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 16, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 19, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 22, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 30, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 25, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 42, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 45, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 48, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 65, byte_start_hi: 47, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 68, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 47, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 47, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 96, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 27, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 109, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 222, byte_start_hi: 29, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 98, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 101, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 110, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 113, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 116, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 129, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 47, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 47, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 147, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 154, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 157, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 160, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 163, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 167, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 170, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 151, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 158, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 55, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 161, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 169, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 173, byte_start_hi: 47, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 191, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 26, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 197, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 200, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 47, byte_len: 3 }),
-    Disallowed,
-    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 249, byte_start_hi: 47, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 252, byte_start_hi: 47, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 58, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 29, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 220, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 223, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 226, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 47, byte_len: 4 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 47, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 254, byte_start_hi: 47, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 4, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 7, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 10, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 72, byte_start_hi: 13, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 13, byte_start_hi: 48, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 17, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 20, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 23, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 26, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 33, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 29, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 32, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 35, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 39, byte_start_hi: 48, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 46, byte_start_hi: 48, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 50, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 189, byte_start_hi: 30, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 53, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 61, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 77, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 83, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 86, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 89, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 92, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 99, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 102, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 105, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 112, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 118, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 132, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 135, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 138, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 141, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 145, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 148, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 30, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 63, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 71, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 74, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 78, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 81, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 88, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 91, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 94, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 45, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 119, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 125, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 128, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 131, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 134, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 137, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 140, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 143, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 36, byte_start_hi: 28, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 156, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 30, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 174, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 177, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 30, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 184, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 187, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 193, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 196, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 203, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 180, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 183, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 190, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 194, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 198, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 201, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 204, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 210, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 48, byte_len: 4 }),
-    Mapped(StringTableSlice { byte_start_lo: 216, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 228, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 214, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 217, byte_start_hi: 48, byte_len: 4 }),
     Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 48, byte_len: 3 }),
     Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 230, byte_start_hi: 48, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 13, byte_len: 3 }),
-    Mapped(StringTableSlice { byte_start_lo: 233, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 48, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 235, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 238, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 115, byte_start_hi: 27, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 241, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 244, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 247, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 48, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 0, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 85, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 3, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 6, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 49, byte_len: 3 }),
+    Disallowed,
+    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 186, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 28, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 31, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 34, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 37, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 40, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 43, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 47, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 51, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 54, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 57, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 103, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 207, byte_start_hi: 13, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 60, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 64, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 67, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 70, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 73, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 76, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 80, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 84, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 87, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 90, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 93, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 97, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 106, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 100, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 104, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 108, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 111, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 114, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 117, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 121, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 130, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 133, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 136, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 139, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 142, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 146, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 149, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 152, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 155, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 159, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 162, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 165, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 168, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 171, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 175, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 179, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 182, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 185, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 188, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 192, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 195, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 124, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 199, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 202, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 206, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 209, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 212, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 215, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 218, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 221, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 224, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 227, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 127, byte_start_hi: 31, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 231, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 234, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 237, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 240, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 243, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 246, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 250, byte_start_hi: 49, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 253, byte_start_hi: 49, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 1, byte_start_hi: 50, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 5, byte_start_hi: 50, byte_len: 4 }),
+    Mapped(StringTableSlice { byte_start_lo: 95, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 9, byte_start_hi: 50, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 107, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 12, byte_start_hi: 50, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 15, byte_start_hi: 50, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 18, byte_start_hi: 50, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 21, byte_start_hi: 50, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 122, byte_start_hi: 14, byte_len: 3 }),
+    Mapped(StringTableSlice { byte_start_lo: 24, byte_start_hi: 50, byte_len: 4 }),
+    Disallowed,
+    Valid,
     Disallowed,
     Ignored,
     Disallowed,
 ];
 
-static STRING_TABLE: &'static str = "\u{61}\
+static STRING_TABLE: &str = "\u{61}\
   \u{62}\
   \u{63}\
   \u{64}\
@@ -11419,6 +10578,51 @@
   \u{13f4}\
   \u{13f5}\
   \u{a64b}\
+  \u{10d0}\
+  \u{10d1}\
+  \u{10d2}\
+  \u{10d3}\
+  \u{10d4}\
+  \u{10d5}\
+  \u{10d6}\
+  \u{10d7}\
+  \u{10d8}\
+  \u{10d9}\
+  \u{10da}\
+  \u{10db}\
+  \u{10dd}\
+  \u{10de}\
+  \u{10df}\
+  \u{10e0}\
+  \u{10e1}\
+  \u{10e2}\
+  \u{10e3}\
+  \u{10e4}\
+  \u{10e5}\
+  \u{10e6}\
+  \u{10e7}\
+  \u{10e8}\
+  \u{10e9}\
+  \u{10ea}\
+  \u{10eb}\
+  \u{10ec}\
+  \u{10ed}\
+  \u{10ee}\
+  \u{10ef}\
+  \u{10f0}\
+  \u{10f1}\
+  \u{10f2}\
+  \u{10f3}\
+  \u{10f4}\
+  \u{10f5}\
+  \u{10f6}\
+  \u{10f7}\
+  \u{10f8}\
+  \u{10f9}\
+  \u{10fa}\
+  \u{10fd}\
+  \u{10fe}\
+  \u{10ff}\
   \u{250}\
   \u{251}\
   \u{1d02}\
@@ -12932,6 +12136,8 @@
   \u{30f0}\
   \u{30f1}\
   \u{30f2}\
+  \u{4ee4}\
+  \u{548c}\
   \u{30a2}\
   \u{30d1}\
   \u{30fc}\
@@ -13734,8 +12940,19 @@
   \u{ab53}\
   \u{a7b5}\
   \u{a7b7}\
+  \u{a7b9}\
+  \u{a7bb}\
+  \u{a7bd}\
+  \u{a7bf}\
+  \u{a7c3}\
+  \u{a794}\
+  \u{1d8e}\
+  \u{a7c8}\
+  \u{a7ca}\
+  \u{a7f6}\
   \u{ab37}\
   \u{ab52}\
+  \u{28d}\
   \u{13a0}\
   \u{13a1}\
   \u{13a2}\
@@ -15362,6 +14579,38 @@
   \u{118dd}\
   \u{118de}\
   \u{118df}\
+  \u{16e60}\
+  \u{16e61}\
+  \u{16e62}\
+  \u{16e63}\
+  \u{16e64}\
+  \u{16e65}\
+  \u{16e66}\
+  \u{16e67}\
+  \u{16e68}\
+  \u{16e69}\
+  \u{16e6a}\
+  \u{16e6b}\
+  \u{16e6c}\
+  \u{16e6d}\
+  \u{16e6e}\
+  \u{16e6f}\
+  \u{16e70}\
+  \u{16e71}\
+  \u{16e72}\
+  \u{16e73}\
+  \u{16e74}\
+  \u{16e75}\
+  \u{16e76}\
+  \u{16e77}\
+  \u{16e78}\
+  \u{16e79}\
+  \u{16e7a}\
+  \u{16e7b}\
+  \u{16e7c}\
+  \u{16e7d}\
+  \u{16e7e}\
+  \u{16e7f}\
   \u{1d157}\
   \u{1d165}\
   \u{1d158}\
@@ -15476,6 +14725,8 @@
   \u{63}\
   \u{6d}\
   \u{64}\
+  \u{6d}\
+  \u{72}\
   \u{64}\
   \u{6a}\
   \u{307b}\
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/uts46.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/uts46.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/src/uts46.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/src/uts46.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,15 +10,15 @@
 //! (Unicode Technical Standard #46)](http://www.unicode.org/reports/tr46/)
 
 use self::Mapping::*;
-use punycode;
-use std::cmp::Ordering::{Equal, Greater, Less};
+use crate::punycode;
+use std::{error::Error as StdError, fmt};
 use unicode_bidi::{bidi_class, BidiClass};
 use unicode_normalization::char::is_combining_mark;
-use unicode_normalization::UnicodeNormalization;
+use unicode_normalization::{is_nfc, UnicodeNormalization};
 
 include!("uts46_mapping_table.rs");
 
-const PUNYCODE_PREFIX: &'static str = "xn--";
+const PUNYCODE_PREFIX: &str = "xn--";
 
 #[derive(Debug)]
 struct StringTableSlice {
@@ -47,67 +47,93 @@
     Disallowed,
     DisallowedStd3Valid,
     DisallowedStd3Mapped(StringTableSlice),
-}
-
-struct Range {
-    from: char,
-    to: char,
+    DisallowedIdna2008,
 }
 
 fn find_char(codepoint: char) -> &'static Mapping {
-    let r = TABLE.binary_search_by(|ref range| {
-        if codepoint > range.to {
-            Less
-        } else if codepoint < range.from {
-            Greater
-        } else {
-            Equal
-        }
-    });
-    r.ok()
-        .map(|i| {
-            const SINGLE_MARKER: u16 = 1 << 15;
-
-            let x = INDEX_TABLE[i];
-            let single = (x & SINGLE_MARKER) != 0;
-            let offset = !SINGLE_MARKER & x;
+    let idx = match TABLE.binary_search_by_key(&codepoint, |&val| val.0) {
+        Ok(idx) => idx,
+        Err(idx) => idx - 1,
+    };
 
-            if single {
-                &MAPPING_TABLE[offset as usize]
-            } else {
-                &MAPPING_TABLE[(offset + (codepoint as u16 - TABLE[i].from as u16)) as usize]
-            }
-        })
-        .unwrap()
+    const SINGLE_MARKER: u16 = 1 << 15;
+
+    let (base, x) = TABLE[idx];
+    let single = (x & SINGLE_MARKER) != 0;
+    let offset = !SINGLE_MARKER & x;
+
+    if single {
+        &MAPPING_TABLE[offset as usize]
+    } else {
+        &MAPPING_TABLE[(offset + (codepoint as u16 - base as u16)) as usize]
+    }
 }
 
-fn map_char(codepoint: char, config: Config, output: &mut String, errors: &mut Vec<Error>) {
-    match *find_char(codepoint) {
-        Mapping::Valid => output.push(codepoint),
-        Mapping::Ignored => {}
-        Mapping::Mapped(ref slice) => output.push_str(decode_slice(slice)),
-        Mapping::Deviation(ref slice) => {
-            if config.transitional_processing {
-                output.push_str(decode_slice(slice))
-            } else {
-                output.push(codepoint)
-            }
-        }
-        Mapping::Disallowed => {
-            errors.push(Error::DissallowedCharacter);
-            output.push(codepoint);
-        }
-        Mapping::DisallowedStd3Valid => {
-            if config.use_std3_ascii_rules {
-                errors.push(Error::DissallowedByStd3AsciiRules);
+struct Mapper<'a> {
+    chars: std::str::Chars<'a>,
+    config: Config,
+    errors: &'a mut Errors,
+    slice: Option<std::str::Chars<'static>>,
+}
+
+impl<'a> Iterator for Mapper<'a> {
+    type Item = char;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        loop {
+            if let Some(s) = &mut self.slice {
+                match s.next() {
+                    Some(c) => return Some(c),
+                    None => {
+                        self.slice = None;
+                    }
+                }
             }
-            output.push(codepoint)
-        }
-        Mapping::DisallowedStd3Mapped(ref slice) => {
-            if config.use_std3_ascii_rules {
-                errors.push(Error::DissallowedMappedInStd3);
+
+            let codepoint = self.chars.next()?;
+            if let '.' | '-' | 'a'..='z' | '0'..='9' = codepoint {
+                return Some(codepoint);
             }
-            output.push_str(decode_slice(slice))
+
+            return Some(match *find_char(codepoint) {
+                Mapping::Valid => codepoint,
+                Mapping::Ignored => continue,
+                Mapping::Mapped(ref slice) => {
+                    self.slice = Some(decode_slice(slice).chars());
+                    continue;
+                }
+                Mapping::Deviation(ref slice) => {
+                    if self.config.transitional_processing {
+                        self.slice = Some(decode_slice(slice).chars());
+                        continue;
+                    } else {
+                        codepoint
+                    }
+                }
+                Mapping::Disallowed => {
+                    self.errors.disallowed_character = true;
+                    codepoint
+                }
+                Mapping::DisallowedStd3Valid => {
+                    if self.config.use_std3_ascii_rules {
+                        self.errors.disallowed_by_std3_ascii_rules = true;
+                    };
+                    codepoint
+                }
+                Mapping::DisallowedStd3Mapped(ref slice) => {
+                    if self.config.use_std3_ascii_rules {
+                        self.errors.disallowed_mapped_in_std3 = true;
+                    };
+                    self.slice = Some(decode_slice(slice).chars());
+                    continue;
+                }
+                Mapping::DisallowedIdna2008 => {
+                    if self.config.use_idna_2008_rules {
+                        self.errors.disallowed_in_idna_2008 = true;
+                    }
+                    codepoint
+                }
+            });
         }
     }
 }
@@ -130,26 +156,19 @@
         // LTR label
         BidiClass::L => {
             // Rule 5
-            loop {
-                match chars.next() {
-                    Some(c) => {
-                        if !matches!(
-                            bidi_class(c),
-                            BidiClass::L
-                                | BidiClass::EN
-                                | BidiClass::ES
-                                | BidiClass::CS
-                                | BidiClass::ET
-                                | BidiClass::ON
-                                | BidiClass::BN
-                                | BidiClass::NSM
-                        ) {
-                            return false;
-                        }
-                    }
-                    None => {
-                        break;
-                    }
+            while let Some(c) = chars.next() {
+                if !matches!(
+                    bidi_class(c),
+                    BidiClass::L
+                        | BidiClass::EN
+                        | BidiClass::ES
+                        | BidiClass::CS
+                        | BidiClass::ET
+                        | BidiClass::ON
+                        | BidiClass::BN
+                        | BidiClass::NSM
+                ) {
+                    return false;
                 }
             }
 
@@ -183,37 +202,28 @@
             let mut found_an = false;
 
             // Rule 2
-            loop {
-                match chars.next() {
-                    Some(c) => {
-                        let char_class = bidi_class(c);
-
-                        if char_class == BidiClass::EN {
-                            found_en = true;
-                        }
-                        if char_class == BidiClass::AN {
-                            found_an = true;
-                        }
+            for c in chars {
+                let char_class = bidi_class(c);
+                if char_class == BidiClass::EN {
+                    found_en = true;
+                } else if char_class == BidiClass::AN {
+                    found_an = true;
+                }
 
-                        if !matches!(
-                            char_class,
-                            BidiClass::R
-                                | BidiClass::AL
-                                | BidiClass::AN
-                                | BidiClass::EN
-                                | BidiClass::ES
-                                | BidiClass::CS
-                                | BidiClass::ET
-                                | BidiClass::ON
-                                | BidiClass::BN
-                                | BidiClass::NSM
-                        ) {
-                            return false;
-                        }
-                    }
-                    None => {
-                        break;
-                    }
+                if !matches!(
+                    char_class,
+                    BidiClass::R
+                        | BidiClass::AL
+                        | BidiClass::AN
+                        | BidiClass::EN
+                        | BidiClass::ES
+                        | BidiClass::CS
+                        | BidiClass::ET
+                        | BidiClass::ON
+                        | BidiClass::BN
+                        | BidiClass::NSM
+                ) {
+                    return false;
                 }
             }
             // Rule 3
@@ -254,24 +264,21 @@
         }
     }
 
-    return true;
+    true
 }
 
+/// Check the validity criteria for the given label
+///
+/// V1 (NFC) and V8 (Bidi) are checked inside `processing()` to prevent doing duplicate work.
+///
 /// http://www.unicode.org/reports/tr46/#Validity_Criteria
-fn validate_full(label: &str, is_bidi_domain: bool, config: Config, errors: &mut Vec<Error>) {
-    // V1: Must be in NFC form.
-    if label.nfc().ne(label.chars()) {
-        errors.push(Error::ValidityCriteria);
-    } else {
-        validate(label, is_bidi_domain, config, errors);
-    }
-}
-
-fn validate(label: &str, is_bidi_domain: bool, config: Config, errors: &mut Vec<Error>) {
+fn check_validity(label: &str, config: Config, errors: &mut Errors) {
     let first_char = label.chars().next();
     if first_char == None {
         // Empty string, pass
+        return;
     }
+
     // V2: No U+002D HYPHEN-MINUS in both third and fourth positions.
     //
     // NOTE: Spec says that the label must not contain a HYPHEN-MINUS character in both the
@@ -279,96 +286,214 @@
     // https://github.com/whatwg/url/issues/53
 
     // V3: neither begin nor end with a U+002D HYPHEN-MINUS
-    else if config.check_hyphens && (label.starts_with("-") || label.ends_with("-")) {
-        errors.push(Error::ValidityCriteria);
+    if config.check_hyphens && (label.starts_with('-') || label.ends_with('-')) {
+        errors.check_hyphens = true;
+        return;
     }
+
     // V4: not contain a U+002E FULL STOP
     //
     // Here, label can't contain '.' since the input is from .split('.')
 
     // V5: not begin with a GC=Mark
-    else if is_combining_mark(first_char.unwrap()) {
-        errors.push(Error::ValidityCriteria);
+    if is_combining_mark(first_char.unwrap()) {
+        errors.start_combining_mark = true;
+        return;
     }
+
     // V6: Check against Mapping Table
-    else if label.chars().any(|c| match *find_char(c) {
-        Mapping::Valid => false,
+    if label.chars().any(|c| match *find_char(c) {
+        Mapping::Valid | Mapping::DisallowedIdna2008 => false,
         Mapping::Deviation(_) => config.transitional_processing,
         Mapping::DisallowedStd3Valid => config.use_std3_ascii_rules,
         _ => true,
     }) {
-        errors.push(Error::ValidityCriteria);
+        errors.invalid_mapping = true;
     }
+
     // V7: ContextJ rules
     //
     // TODO: Implement rules and add *CheckJoiners* flag.
 
-    // V8: Bidi rules
-    //
-    // TODO: Add *CheckBidi* flag
-    else if !passes_bidi(label, is_bidi_domain) {
-        errors.push(Error::ValidityCriteria);
-    }
+    // V8: Bidi rules are checked inside `processing()`
 }
 
 /// http://www.unicode.org/reports/tr46/#Processing
-fn processing(domain: &str, config: Config, errors: &mut Vec<Error>) -> String {
-    let mut mapped = String::with_capacity(domain.len());
+#[allow(clippy::manual_strip)] // introduced in 1.45, MSRV is 1.36
+fn processing(
+    domain: &str,
+    config: Config,
+    normalized: &mut String,
+    output: &mut String,
+) -> Errors {
+    // Weed out the simple cases: only allow all lowercase ASCII characters and digits where none
+    // of the labels start with PUNYCODE_PREFIX and labels don't start or end with hyphen.
+    let (mut prev, mut simple, mut puny_prefix) = ('?', !domain.is_empty(), 0);
     for c in domain.chars() {
-        map_char(c, config, &mut mapped, errors)
-    }
-    let mut normalized = String::with_capacity(mapped.len());
-    normalized.extend(mapped.nfc());
-
-    // Find out if it's a Bidi Domain Name
-    //
-    // First, check for literal bidi chars
-    let mut is_bidi_domain = domain
-        .chars()
-        .any(|c| matches!(bidi_class(c), BidiClass::R | BidiClass::AL | BidiClass::AN));
-    if !is_bidi_domain {
-        // Then check for punycode-encoded bidi chars
-        for label in normalized.split('.') {
-            if label.starts_with(PUNYCODE_PREFIX) {
-                match punycode::decode_to_string(&label[PUNYCODE_PREFIX.len()..]) {
-                    Some(decoded_label) => {
-                        if decoded_label.chars().any(|c| {
-                            matches!(bidi_class(c), BidiClass::R | BidiClass::AL | BidiClass::AN)
-                        }) {
-                            is_bidi_domain = true;
-                        }
-                    }
-                    None => {
-                        is_bidi_domain = true;
-                    }
+        if c == '.' {
+            if prev == '-' {
+                simple = false;
+                break;
+            }
+            puny_prefix = 0;
+            continue;
+        } else if puny_prefix == 0 && c == '-' {
+            simple = false;
+            break;
+        } else if puny_prefix < 5 {
+            if c == ['x', 'n', '-', '-'][puny_prefix] {
+                puny_prefix += 1;
+                if puny_prefix == 4 {
+                    simple = false;
+                    break;
                 }
+            } else {
+                puny_prefix = 5;
             }
         }
+        if !c.is_ascii_lowercase() && !c.is_ascii_digit() {
+            simple = false;
+            break;
+        }
+        prev = c;
+    }
+
+    if simple {
+        output.push_str(domain);
+        return Errors::default();
     }
 
-    let mut validated = String::new();
-    let mut first = true;
+    normalized.clear();
+    let mut errors = Errors::default();
+    let offset = output.len();
+
+    let iter = Mapper {
+        chars: domain.chars(),
+        config,
+        errors: &mut errors,
+        slice: None,
+    };
+
+    normalized.extend(iter.nfc());
+
+    let mut decoder = punycode::Decoder::default();
+    let non_transitional = config.transitional_processing(false);
+    let (mut first, mut has_bidi_labels) = (true, false);
     for label in normalized.split('.') {
         if !first {
-            validated.push('.');
+            output.push('.');
         }
         first = false;
         if label.starts_with(PUNYCODE_PREFIX) {
-            match punycode::decode_to_string(&label[PUNYCODE_PREFIX.len()..]) {
-                Some(decoded_label) => {
-                    let config = config.transitional_processing(false);
-                    validate_full(&decoded_label, is_bidi_domain, config, errors);
-                    validated.push_str(&decoded_label)
+            match decoder.decode(&label[PUNYCODE_PREFIX.len()..]) {
+                Ok(decode) => {
+                    let start = output.len();
+                    output.extend(decode);
+                    let decoded_label = &output[start..];
+
+                    if !has_bidi_labels {
+                        has_bidi_labels |= is_bidi_domain(decoded_label);
+                    }
+
+                    if !errors.is_err() {
+                        if !is_nfc(&decoded_label) {
+                            errors.nfc = true;
+                        } else {
+                            check_validity(decoded_label, non_transitional, &mut errors);
+                        }
+                    }
+                }
+                Err(()) => {
+                    has_bidi_labels = true;
+                    errors.punycode = true;
                 }
-                None => errors.push(Error::PunycodeError),
             }
         } else {
+            if !has_bidi_labels {
+                has_bidi_labels |= is_bidi_domain(label);
+            }
+
             // `normalized` is already `NFC` so we can skip that check
-            validate(label, is_bidi_domain, config, errors);
-            validated.push_str(label)
+            check_validity(label, config, &mut errors);
+            output.push_str(label)
+        }
+    }
+
+    for label in output[offset..].split('.') {
+        // V8: Bidi rules
+        //
+        // TODO: Add *CheckBidi* flag
+        if !passes_bidi(label, has_bidi_labels) {
+            errors.check_bidi = true;
+            break;
+        }
+    }
+
+    errors
+}
+
+#[derive(Default)]
+pub struct Idna {
+    config: Config,
+    normalized: String,
+    output: String,
+}
+
+impl Idna {
+    pub fn new(config: Config) -> Self {
+        Self {
+            config,
+            normalized: String::new(),
+            output: String::new(),
+        }
+    }
+
+    /// http://www.unicode.org/reports/tr46/#ToASCII
+    #[allow(clippy::wrong_self_convention)]
+    pub fn to_ascii<'a>(&'a mut self, domain: &str, out: &mut String) -> Result<(), Errors> {
+        let mut errors = processing(domain, self.config, &mut self.normalized, &mut self.output);
+
+        let mut first = true;
+        for label in self.output.split('.') {
+            if !first {
+                out.push('.');
+            }
+            first = false;
+
+            if label.is_ascii() {
+                out.push_str(label);
+            } else {
+                let offset = out.len();
+                out.push_str(PUNYCODE_PREFIX);
+                if let Err(()) = punycode::encode_into(label.chars(), out) {
+                    errors.punycode = true;
+                    out.truncate(offset);
+                }
+            }
+        }
+
+        if self.config.verify_dns_length {
+            let domain = if out.ends_with('.') {
+                &out[..out.len() - 1]
+            } else {
+                &*out
+            };
+            if domain.is_empty() || domain.split('.').any(|label| label.is_empty()) {
+                errors.too_short_for_dns = true;
+            }
+            if domain.len() > 253 || domain.split('.').any(|label| label.len() > 63) {
+                errors.too_long_for_dns = true;
+            }
         }
+
+        errors.into()
+    }
+
+    /// http://www.unicode.org/reports/tr46/#ToUnicode
+    #[allow(clippy::wrong_self_convention)]
+    pub fn to_unicode<'a>(&'a mut self, domain: &str, out: &mut String) -> Result<(), Errors> {
+        processing(domain, self.config, &mut self.normalized, out).into()
     }
-    validated
 }
 
 #[derive(Clone, Copy)]
@@ -377,6 +502,7 @@
     transitional_processing: bool,
     verify_dns_length: bool,
     check_hyphens: bool,
+    use_idna_2008_rules: bool,
 }
 
 /// The defaults are that of https://url.spec.whatwg.org/#idna
@@ -391,6 +517,7 @@
 
             // Only use for to_ascii, not to_unicode
             verify_dns_length: false,
+            use_idna_2008_rules: false,
         }
     }
 }
@@ -420,76 +547,181 @@
         self
     }
 
+    #[inline]
+    pub fn use_idna_2008_rules(mut self, value: bool) -> Self {
+        self.use_idna_2008_rules = value;
+        self
+    }
+
     /// http://www.unicode.org/reports/tr46/#ToASCII
     pub fn to_ascii(self, domain: &str) -> Result<String, Errors> {
-        let mut errors = Vec::new();
         let mut result = String::new();
-        let mut first = true;
-        for label in processing(domain, self, &mut errors).split('.') {
-            if !first {
-                result.push('.');
-            }
-            first = false;
-            if label.is_ascii() {
-                result.push_str(label);
-            } else {
-                match punycode::encode_str(label) {
-                    Some(x) => {
-                        result.push_str(PUNYCODE_PREFIX);
-                        result.push_str(&x);
-                    }
-                    None => errors.push(Error::PunycodeError),
-                }
-            }
+        let mut codec = Idna::new(self);
+        codec.to_ascii(domain, &mut result).map(|()| result)
+    }
+
+    /// http://www.unicode.org/reports/tr46/#ToUnicode
+    pub fn to_unicode(self, domain: &str) -> (String, Result<(), Errors>) {
+        let mut codec = Idna::new(self);
+        let mut out = String::with_capacity(domain.len());
+        let result = codec.to_unicode(domain, &mut out);
+        (out, result)
+    }
+}
+
+fn is_bidi_domain(s: &str) -> bool {
+    for c in s.chars() {
+        if c.is_ascii_graphic() {
+            continue;
         }
+        match bidi_class(c) {
+            BidiClass::R | BidiClass::AL | BidiClass::AN => return true,
+            _ => {}
+        }
+    }
+    false
+}
 
-        if self.verify_dns_length {
-            let domain = if result.ends_with(".") {
-                &result[..result.len() - 1]
-            } else {
-                &*result
-            };
-            if domain.len() < 1 || domain.split('.').any(|label| label.len() < 1) {
-                errors.push(Error::TooShortForDns)
-            }
-            if domain.len() > 253 || domain.split('.').any(|label| label.len() > 63) {
-                errors.push(Error::TooLongForDns)
+/// Errors recorded during UTS #46 processing.
+///
+/// This is opaque for now, indicating what types of errors have been encountered at least once.
+/// More details may be exposed in the future.
+#[derive(Default)]
+pub struct Errors {
+    punycode: bool,
+    check_hyphens: bool,
+    check_bidi: bool,
+    start_combining_mark: bool,
+    invalid_mapping: bool,
+    nfc: bool,
+    disallowed_by_std3_ascii_rules: bool,
+    disallowed_mapped_in_std3: bool,
+    disallowed_character: bool,
+    too_long_for_dns: bool,
+    too_short_for_dns: bool,
+    disallowed_in_idna_2008: bool,
+}
+
+impl Errors {
+    fn is_err(&self) -> bool {
+        let Errors {
+            punycode,
+            check_hyphens,
+            check_bidi,
+            start_combining_mark,
+            invalid_mapping,
+            nfc,
+            disallowed_by_std3_ascii_rules,
+            disallowed_mapped_in_std3,
+            disallowed_character,
+            too_long_for_dns,
+            too_short_for_dns,
+            disallowed_in_idna_2008,
+        } = *self;
+        punycode
+            || check_hyphens
+            || check_bidi
+            || start_combining_mark
+            || invalid_mapping
+            || nfc
+            || disallowed_by_std3_ascii_rules
+            || disallowed_mapped_in_std3
+            || disallowed_character
+            || too_long_for_dns
+            || too_short_for_dns
+            || disallowed_in_idna_2008
+    }
+}
+
+impl fmt::Debug for Errors {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let Errors {
+            punycode,
+            check_hyphens,
+            check_bidi,
+            start_combining_mark,
+            invalid_mapping,
+            nfc,
+            disallowed_by_std3_ascii_rules,
+            disallowed_mapped_in_std3,
+            disallowed_character,
+            too_long_for_dns,
+            too_short_for_dns,
+            disallowed_in_idna_2008,
+        } = *self;
+
+        let fields = [
+            ("punycode", punycode),
+            ("check_hyphens", check_hyphens),
+            ("check_bidi", check_bidi),
+            ("start_combining_mark", start_combining_mark),
+            ("invalid_mapping", invalid_mapping),
+            ("nfc", nfc),
+            (
+                "disallowed_by_std3_ascii_rules",
+                disallowed_by_std3_ascii_rules,
+            ),
+            ("disallowed_mapped_in_std3", disallowed_mapped_in_std3),
+            ("disallowed_character", disallowed_character),
+            ("too_long_for_dns", too_long_for_dns),
+            ("too_short_for_dns", too_short_for_dns),
+            ("disallowed_in_idna_2008", disallowed_in_idna_2008),
+        ];
+
+        let mut empty = true;
+        f.write_str("Errors { ")?;
+        for (name, val) in &fields {
+            if *val {
+                if !empty {
+                    f.write_str(", ")?;
+                }
+                f.write_str(*name)?;
+                empty = false;
             }
         }
-        if errors.is_empty() {
-            Ok(result)
+
+        if !empty {
+            f.write_str(" }")
         } else {
-            Err(Errors(errors))
+            f.write_str("}")
         }
     }
+}
 
-    /// http://www.unicode.org/reports/tr46/#ToUnicode
-    pub fn to_unicode(self, domain: &str) -> (String, Result<(), Errors>) {
-        let mut errors = Vec::new();
-        let domain = processing(domain, self, &mut errors);
-        let errors = if errors.is_empty() {
+impl From<Errors> for Result<(), Errors> {
+    fn from(e: Errors) -> Result<(), Errors> {
+        if !e.is_err() {
             Ok(())
         } else {
-            Err(Errors(errors))
-        };
-        (domain, errors)
+            Err(e)
+        }
     }
 }
 
-#[derive(PartialEq, Eq, Clone, Copy, Debug)]
-enum Error {
-    PunycodeError,
-    ValidityCriteria,
-    DissallowedByStd3AsciiRules,
-    DissallowedMappedInStd3,
-    DissallowedCharacter,
-    TooLongForDns,
-    TooShortForDns,
+impl StdError for Errors {}
+
+impl fmt::Display for Errors {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(self, f)
+    }
 }
 
-/// Errors recorded during UTS #46 processing.
-///
-/// This is opaque for now, only indicating the presence of at least one error.
-/// More details may be exposed in the future.
-#[derive(Debug)]
-pub struct Errors(Vec<Error>);
+#[cfg(test)]
+mod tests {
+    use super::{find_char, Mapping};
+
+    #[test]
+    fn mapping_fast_path() {
+        assert_matches!(find_char('-'), &Mapping::Valid);
+        assert_matches!(find_char('.'), &Mapping::Valid);
+        for c in &['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] {
+            assert_matches!(find_char(*c), &Mapping::Valid);
+        }
+        for c in &[
+            'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+            'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+        ] {
+            assert_matches!(find_char(*c), &Mapping::Valid);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/IdnaTest.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/IdnaTest.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/IdnaTest.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/IdnaTest.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,7848 +0,0 @@
-# IdnaTest.txt
-# Date: 2017-06-02, 14:19:52 GMT
-# © 2017 Unicode®, Inc.
-# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
-# Contains test cases for verifying UTS46 conformance. For more information,
-# see http://www.unicode.org/reports/tr46/
-#
-# FORMAT:
-#
-# This file is in UTF8, with certain characters escaped using the \uXXXX or \x{XXXX}
-# convention where they could otherwise have a confusing display.
-# These characters include:
-# 
-# - General Categories C, Z, and M
-# - Default ignorable characters
-# - Bidi categories R, AL, AN
-# 
-# Columns (c1, c2,...) are separated by semicolons.
-# Leading and trailing spaces and tabs in each column are ignored.
-# Comments are indicated with hash marks.
-#
-#  Column 1: type -       T for transitional, N for nontransitional, B for both
-#  Column 2: source -     The source string to be tested
-#  Column 3: toUnicode -  The result of applying toUnicode to the source, using nontransitional. 
-#                         A blank value means the same as the source value; a value in [...] is a set of error codes.
-#  Column 4: toASCII -    The result of applying toASCII to the source, using the specified type: T, N, or B.
-#                         A blank value means the same as the toUnicode value; a value in [...] is a set of error codes.
-#  Column 5: idna2008 -   NV8 is only present if the status is valid but the character is excluded by IDNA2008
-#                         from all domain names for all versions of Unicode.
-#                         XV8 is present when the character is excluded by IDNA2008 for the current version of Unicode. 
-#                         These are informative values only.
-#
-# If the value of toUnicode is the same as source, the column will be blank.
-# The line comments currently show visible characters that have been escaped 
-# (after removing default-ignorables and controls, except for whitespace)
-#
-# The test is performed with the following flag settings:
-#
-# VerifyDnsLength:   true
-# CheckHyphens:      true
-# CheckBidi:         true
-# CheckJoiners:      true
-# UseSTD3ASCIIRules: true
-#
-# An error in toUnicode or toASCII is indicated by a value in square brackets, such as "[B5 B6]".
-# In such a case, the contents is a list of error codes based on the step numbers in UTS46 and IDNA2008,
-# with the following formats:
-#
-#   Pn for Section 4 Processing step n
-#   Vn for 4.1 Validity Criteria step n
-#   An for 4.2 ToASCII step n
-#   Bn for Bidi (in IDNA2008)
-#   Cn for ContextJ (in IDNA2008)
-#
-# However, these particular error codes are only informative;
-# the important feature is whether or not there is an error.
-#
-# CONFORMANCE:
-#
-# To test for conformance to UTS46, an implementation must first perform the toUnicode operation
-# on the source string, then the toASCII operation (with the indicated type) on the source string. 
-# Implementations may be more strict than UTS46; thus they may have errors where the file indicates results.
-# In particular, an implementation conformant to IDNA2008 would disallow the input for lines marked with NV8.
-#
-# Moreover, the error codes in the file are informative; implementations need only record that there is an error:
-# they need not reproduce those codes. Thus to then verify conformance for the toASCII and toUnicode columns:
-#
-# - If the file indicates an error, the implementation must also have an error.
-# - If the file does not indicate an error, then the implementation must either have an error, 
-#   or must have a matching result.
-#
-# ====================================================================================================
-B;	fass.de;	;	
-T;	faß.de;	;	fass.de
-N;	faß.de;	;	xn--fa-hia.de
-T;	Faß.de;	faß.de;	fass.de
-N;	Faß.de;	faß.de;	xn--fa-hia.de
-B;	xn--fa-hia.de;	faß.de;	xn--fa-hia.de
-
-# BIDI TESTS
-
-B;	à\u05D0;	[B5 B6];	[B5 B6]	#	à�
-B;	a\u0300\u05D0;	[B5 B6];	[B5 B6]	#	à�
-B;	A\u0300\u05D0;	[B5 B6];	[B5 B6]	#	à�
-B;	À\u05D0;	[B5 B6];	[B5 B6]	#	à�
-B;	xn--0ca24w;	[B5 B6];	[B5 B6]	#	à�
-B;	0à.\u05D0;	[B1];	[B1]	#	0à.�
-B;	0a\u0300.\u05D0;	[B1];	[B1]	#	0à.�
-B;	0A\u0300.\u05D0;	[B1];	[B1]	#	0à.�
-B;	0À.\u05D0;	[B1];	[B1]	#	0à.�
-B;	xn--0-sfa.xn--4db;	[B1];	[B1]	#	0à.�
-B;	à.\u05D0\u0308;	;	xn--0ca.xn--ssa73l	#	à.�̈
-B;	a\u0300.\u05D0\u0308;	à.\u05D0\u0308;	xn--0ca.xn--ssa73l	#	à.�̈
-B;	A\u0300.\u05D0\u0308;	à.\u05D0\u0308;	xn--0ca.xn--ssa73l	#	à.�̈
-B;	À.\u05D0\u0308;	à.\u05D0\u0308;	xn--0ca.xn--ssa73l	#	à.�̈
-B;	xn--0ca.xn--ssa73l;	à.\u05D0\u0308;	xn--0ca.xn--ssa73l	#	à.�̈
-B;	à.\u05D00\u0660\u05D0;	[B4];	[B4]	#	à.�0٠�
-B;	a\u0300.\u05D00\u0660\u05D0;	[B4];	[B4]	#	à.�0٠�
-B;	A\u0300.\u05D00\u0660\u05D0;	[B4];	[B4]	#	à.�0٠�
-B;	À.\u05D00\u0660\u05D0;	[B4];	[B4]	#	à.�0٠�
-B;	xn--0ca.xn--0-zhcb98c;	[B4];	[B4]	#	à.�0٠�
-B;	\u0308.\u05D0;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	̈.�
-B;	xn--ssa.xn--4db;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	̈.�
-B;	à.\u05D00\u0660;	[B4];	[B4]	#	à.�0٠
-B;	a\u0300.\u05D00\u0660;	[B4];	[B4]	#	à.�0٠
-B;	A\u0300.\u05D00\u0660;	[B4];	[B4]	#	à.�0٠
-B;	À.\u05D00\u0660;	[B4];	[B4]	#	à.�0٠
-B;	xn--0ca.xn--0-zhc74b;	[B4];	[B4]	#	à.�0٠
-B;	àˇ.\u05D0;	[B6];	[B6]	#	àˇ.�
-B;	a\u0300ˇ.\u05D0;	[B6];	[B6]	#	àˇ.�
-B;	A\u0300ˇ.\u05D0;	[B6];	[B6]	#	àˇ.�
-B;	Àˇ.\u05D0;	[B6];	[B6]	#	àˇ.�
-B;	xn--0ca88g.xn--4db;	[B6];	[B6]	#	àˇ.�
-B;	à\u0308.\u05D0;	;	xn--0ca81i.xn--4db	#	à̈.�
-B;	a\u0300\u0308.\u05D0;	à\u0308.\u05D0;	xn--0ca81i.xn--4db	#	à̈.�
-B;	A\u0300\u0308.\u05D0;	à\u0308.\u05D0;	xn--0ca81i.xn--4db	#	à̈.�
-B;	À\u0308.\u05D0;	à\u0308.\u05D0;	xn--0ca81i.xn--4db	#	à̈.�
-B;	xn--0ca81i.xn--4db;	à\u0308.\u05D0;	xn--0ca81i.xn--4db	#	à̈.�
-
-# CONTEXT TESTS
-
-T;	a\u200Cb;	[C1];	ab	#	ab
-N;	a\u200Cb;	[C1];	[C1]	#	ab
-T;	A\u200CB;	[C1];	ab	#	ab
-N;	A\u200CB;	[C1];	[C1]	#	ab
-T;	A\u200Cb;	[C1];	ab	#	ab
-N;	A\u200Cb;	[C1];	[C1]	#	ab
-B;	ab;	;	
-B;	xn--ab-j1t;	[C1];	[C1]	#	ab
-T;	a\u094D\u200Cb;	;	xn--ab-fsf	#	a�b
-N;	a\u094D\u200Cb;	;	xn--ab-fsf604u	#	a�b
-T;	A\u094D\u200CB;	a\u094D\u200Cb;	xn--ab-fsf	#	a�b
-N;	A\u094D\u200CB;	a\u094D\u200Cb;	xn--ab-fsf604u	#	a�b
-T;	A\u094D\u200Cb;	a\u094D\u200Cb;	xn--ab-fsf	#	a�b
-N;	A\u094D\u200Cb;	a\u094D\u200Cb;	xn--ab-fsf604u	#	a�b
-B;	xn--ab-fsf;	a\u094Db;	xn--ab-fsf	#	a�b
-B;	a\u094Db;	;	xn--ab-fsf	#	a�b
-B;	A\u094DB;	a\u094Db;	xn--ab-fsf	#	a�b
-B;	A\u094Db;	a\u094Db;	xn--ab-fsf	#	a�b
-B;	xn--ab-fsf604u;	a\u094D\u200Cb;	xn--ab-fsf604u	#	a�b
-T;	\u0308\u200C\u0308\u0628b;	[B1 C1 V5];	[B1 V5]	#	̈̈بb
-N;	\u0308\u200C\u0308\u0628b;	[B1 C1 V5];	[B1 C1 V5]	#	̈̈بb
-T;	\u0308\u200C\u0308\u0628B;	[B1 C1 V5];	[B1 V5]	#	̈̈بb
-N;	\u0308\u200C\u0308\u0628B;	[B1 C1 V5];	[B1 C1 V5]	#	̈̈بb
-B;	xn--b-bcba413a;	[B1 V5];	[B1 V5]	#	̈̈بb
-B;	xn--b-bcba413a2w8b;	[B1 C1 V5];	[B1 C1 V5]	#	̈̈بb
-T;	a\u0628\u0308\u200C\u0308;	[B5 B6 C1];	[B5 B6]	#	aب̈̈
-N;	a\u0628\u0308\u200C\u0308;	[B5 B6 C1];	[B5 B6 C1]	#	aب̈̈
-T;	A\u0628\u0308\u200C\u0308;	[B5 B6 C1];	[B5 B6]	#	aب̈̈
-N;	A\u0628\u0308\u200C\u0308;	[B5 B6 C1];	[B5 B6 C1]	#	aب̈̈
-B;	xn--a-ccba213a;	[B5 B6];	[B5 B6]	#	aب̈̈
-B;	xn--a-ccba213a5w8b;	[B5 B6 C1];	[B5 B6 C1]	#	aب̈̈
-T;	a\u0628\u0308\u200C\u0308\u0628b;	[B5];	[B5]	#	aب̈̈بb
-N;	a\u0628\u0308\u200C\u0308\u0628b;	[B5];	[B5]	#	aب̈̈بb
-T;	A\u0628\u0308\u200C\u0308\u0628B;	[B5];	[B5]	#	aب̈̈بb
-N;	A\u0628\u0308\u200C\u0308\u0628B;	[B5];	[B5]	#	aب̈̈بb
-T;	A\u0628\u0308\u200C\u0308\u0628b;	[B5];	[B5]	#	aب̈̈بb
-N;	A\u0628\u0308\u200C\u0308\u0628b;	[B5];	[B5]	#	aب̈̈بb
-B;	xn--ab-uuba211bca;	[B5];	[B5]	#	aب̈̈بb
-B;	xn--ab-uuba211bca8057b;	[B5];	[B5]	#	aب̈̈بb
-T;	a\u200Db;	[C2];	ab	#	ab
-N;	a\u200Db;	[C2];	[C2]	#	ab
-T;	A\u200DB;	[C2];	ab	#	ab
-N;	A\u200DB;	[C2];	[C2]	#	ab
-T;	A\u200Db;	[C2];	ab	#	ab
-N;	A\u200Db;	[C2];	[C2]	#	ab
-B;	xn--ab-m1t;	[C2];	[C2]	#	ab
-T;	a\u094D\u200Db;	;	xn--ab-fsf	#	a�b
-N;	a\u094D\u200Db;	;	xn--ab-fsf014u	#	a�b
-T;	A\u094D\u200DB;	a\u094D\u200Db;	xn--ab-fsf	#	a�b
-N;	A\u094D\u200DB;	a\u094D\u200Db;	xn--ab-fsf014u	#	a�b
-T;	A\u094D\u200Db;	a\u094D\u200Db;	xn--ab-fsf	#	a�b
-N;	A\u094D\u200Db;	a\u094D\u200Db;	xn--ab-fsf014u	#	a�b
-B;	xn--ab-fsf014u;	a\u094D\u200Db;	xn--ab-fsf014u	#	a�b
-T;	\u0308\u200D\u0308\u0628b;	[B1 C2 V5];	[B1 V5]	#	̈̈بb
-N;	\u0308\u200D\u0308\u0628b;	[B1 C2 V5];	[B1 C2 V5]	#	̈̈بb
-T;	\u0308\u200D\u0308\u0628B;	[B1 C2 V5];	[B1 V5]	#	̈̈بb
-N;	\u0308\u200D\u0308\u0628B;	[B1 C2 V5];	[B1 C2 V5]	#	̈̈بb
-B;	xn--b-bcba413a7w8b;	[B1 C2 V5];	[B1 C2 V5]	#	̈̈بb
-T;	a\u0628\u0308\u200D\u0308;	[B5 B6 C2];	[B5 B6]	#	aب̈̈
-N;	a\u0628\u0308\u200D\u0308;	[B5 B6 C2];	[B5 B6 C2]	#	aب̈̈
-T;	A\u0628\u0308\u200D\u0308;	[B5 B6 C2];	[B5 B6]	#	aب̈̈
-N;	A\u0628\u0308\u200D\u0308;	[B5 B6 C2];	[B5 B6 C2]	#	aب̈̈
-B;	xn--a-ccba213abx8b;	[B5 B6 C2];	[B5 B6 C2]	#	aب̈̈
-T;	a\u0628\u0308\u200D\u0308\u0628b;	[B5 C2];	[B5]	#	aب̈̈بb
-N;	a\u0628\u0308\u200D\u0308\u0628b;	[B5 C2];	[B5 C2]	#	aب̈̈بb
-T;	A\u0628\u0308\u200D\u0308\u0628B;	[B5 C2];	[B5]	#	aب̈̈بb
-N;	A\u0628\u0308\u200D\u0308\u0628B;	[B5 C2];	[B5 C2]	#	aب̈̈بb
-T;	A\u0628\u0308\u200D\u0308\u0628b;	[B5 C2];	[B5]	#	aب̈̈بb
-N;	A\u0628\u0308\u200D\u0308\u0628b;	[B5 C2];	[B5 C2]	#	aب̈̈بb
-B;	xn--ab-uuba211bca5157b;	[B5 C2];	[B5 C2]	#	aب̈̈بb
-
-# SELECTED TESTS
-
-B;	¡;	;	xn--7a;	NV8
-B;	xn--7a;	¡;	xn--7a;	NV8
-B;	᧚;	;	xn--pkf;	XV8
-B;	xn--pkf;	᧚;	xn--pkf;	XV8
-B;	。;	[A4_2];	[A4_2]
-B;	.;	[A4_2];	[A4_2]
-B;	ê­ ;	;	xn--3y9a
-B;	xn--3y9a;	ê­ ;	xn--3y9a
-B;	1234567890ä1234567890123456789012345678901234567890123456;	;	[A4_2]
-B;	1234567890a\u03081234567890123456789012345678901234567890123456;	1234567890ä1234567890123456789012345678901234567890123456;	[A4_2]
-B;	1234567890A\u03081234567890123456789012345678901234567890123456;	1234567890ä1234567890123456789012345678901234567890123456;	[A4_2]
-B;	1234567890Ä1234567890123456789012345678901234567890123456;	1234567890ä1234567890123456789012345678901234567890123456;	[A4_2]
-B;	xn--12345678901234567890123456789012345678901234567890123456-fxe;	1234567890ä1234567890123456789012345678901234567890123456;	[A4_2]
-B;	www.eXample.cOm;	www.example.com;	
-B;	Bücher.de;	bücher.de;	xn--bcher-kva.de
-B;	Bu\u0308cher.de;	bücher.de;	xn--bcher-kva.de
-B;	bu\u0308cher.de;	bücher.de;	xn--bcher-kva.de
-B;	bücher.de;	;	xn--bcher-kva.de
-B;	BÜCHER.DE;	bücher.de;	xn--bcher-kva.de
-B;	BU\u0308CHER.DE;	bücher.de;	xn--bcher-kva.de
-B;	xn--bcher-kva.de;	bücher.de;	xn--bcher-kva.de
-B;	ÖBB;	öbb;	xn--bb-eka
-B;	O\u0308BB;	öbb;	xn--bb-eka
-B;	o\u0308bb;	öbb;	xn--bb-eka
-B;	öbb;	;	xn--bb-eka
-B;	Öbb;	öbb;	xn--bb-eka
-B;	O\u0308bb;	öbb;	xn--bb-eka
-B;	xn--bb-eka;	öbb;	xn--bb-eka
-T;	βόλος.com;	;	xn--nxasmq6b.com
-N;	βόλος.com;	;	xn--nxasmm1c.com
-T;	βο\u0301λος.com;	βόλος.com;	xn--nxasmq6b.com
-N;	βο\u0301λος.com;	βόλος.com;	xn--nxasmm1c.com
-B;	ΒΟ\u0301ΛΟΣ.COM;	βόλοσ.com;	xn--nxasmq6b.com
-B;	ΒΌΛΟΣ.COM;	βόλοσ.com;	xn--nxasmq6b.com
-B;	βόλοσ.com;	;	xn--nxasmq6b.com
-B;	βο\u0301λοσ.com;	βόλοσ.com;	xn--nxasmq6b.com
-B;	Βο\u0301λοσ.com;	βόλοσ.com;	xn--nxasmq6b.com
-B;	Βόλοσ.com;	βόλοσ.com;	xn--nxasmq6b.com
-B;	xn--nxasmq6b.com;	βόλοσ.com;	xn--nxasmq6b.com
-T;	Βο\u0301λος.com;	βόλος.com;	xn--nxasmq6b.com
-N;	Βο\u0301λος.com;	βόλος.com;	xn--nxasmm1c.com
-T;	Βόλος.com;	βόλος.com;	xn--nxasmq6b.com
-N;	Βόλος.com;	βόλος.com;	xn--nxasmm1c.com
-B;	xn--nxasmm1c.com;	βόλος.com;	xn--nxasmm1c.com
-B;	xn--nxasmm1c;	βόλος;	xn--nxasmm1c
-T;	βόλος;	;	xn--nxasmq6b
-N;	βόλος;	;	xn--nxasmm1c
-T;	βο\u0301λος;	βόλος;	xn--nxasmq6b
-N;	βο\u0301λος;	βόλος;	xn--nxasmm1c
-B;	ΒΟ\u0301ΛΟΣ;	βόλοσ;	xn--nxasmq6b
-B;	ΒΌΛΟΣ;	βόλοσ;	xn--nxasmq6b
-B;	βόλοσ;	;	xn--nxasmq6b
-B;	βο\u0301λοσ;	βόλοσ;	xn--nxasmq6b
-B;	Βο\u0301λοσ;	βόλοσ;	xn--nxasmq6b
-B;	Βόλοσ;	βόλοσ;	xn--nxasmq6b
-B;	xn--nxasmq6b;	βόλοσ;	xn--nxasmq6b
-T;	Βόλος;	βόλος;	xn--nxasmq6b
-N;	Βόλος;	βόλος;	xn--nxasmm1c
-T;	Βο\u0301λος;	βόλος;	xn--nxasmq6b
-N;	Βο\u0301λος;	βόλος;	xn--nxasmm1c
-T;	www.�\u0DCA\u200Dර\u0DD3.com;	;	www.xn--10cl1a0b.com	#	www.�්රී.com
-N;	www.�\u0DCA\u200Dර\u0DD3.com;	;	www.xn--10cl1a0b660p.com	#	www.�්රී.com
-T;	WWW.�\u0DCA\u200Dර\u0DD3.COM;	www.�\u0DCA\u200Dර\u0DD3.com;	www.xn--10cl1a0b.com	#	www.�්රී.com
-N;	WWW.�\u0DCA\u200Dර\u0DD3.COM;	www.�\u0DCA\u200Dර\u0DD3.com;	www.xn--10cl1a0b660p.com	#	www.�්රී.com
-T;	Www.�\u0DCA\u200Dර\u0DD3.com;	www.�\u0DCA\u200Dර\u0DD3.com;	www.xn--10cl1a0b.com	#	www.�්රී.com
-N;	Www.�\u0DCA\u200Dර\u0DD3.com;	www.�\u0DCA\u200Dර\u0DD3.com;	www.xn--10cl1a0b660p.com	#	www.�්රී.com
-B;	www.xn--10cl1a0b.com;	www.�\u0DCAර\u0DD3.com;	www.xn--10cl1a0b.com	#	www.�්රී.com
-B;	www.�\u0DCAර\u0DD3.com;	;	www.xn--10cl1a0b.com	#	www.�්රී.com
-B;	WWW.�\u0DCAර\u0DD3.COM;	www.�\u0DCAර\u0DD3.com;	www.xn--10cl1a0b.com	#	www.�්රී.com
-B;	Www.�\u0DCAර\u0DD3.com;	www.�\u0DCAර\u0DD3.com;	www.xn--10cl1a0b.com	#	www.�්රී.com
-B;	www.xn--10cl1a0b660p.com;	www.�\u0DCA\u200Dර\u0DD3.com;	www.xn--10cl1a0b660p.com	#	www.�්රී.com
-T;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC;	;	xn--mgba3gch31f	#	نامهای
-N;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC;	;	xn--mgba3gch31f060k	#	نامهای
-B;	xn--mgba3gch31f;	\u0646\u0627\u0645\u0647\u0627\u06CC;	xn--mgba3gch31f	#	نامهای
-B;	\u0646\u0627\u0645\u0647\u0627\u06CC;	;	xn--mgba3gch31f	#	نامهای
-B;	xn--mgba3gch31f060k;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC;	xn--mgba3gch31f060k	#	نامهای
-B;	xn--mgba3gch31f060k.com;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.com;	xn--mgba3gch31f060k.com	#	نامهای.com
-T;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.com;	;	xn--mgba3gch31f.com	#	نامهای.com
-N;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.com;	;	xn--mgba3gch31f060k.com	#	نامهای.com
-T;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.COM;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.com;	xn--mgba3gch31f.com	#	نامهای.com
-N;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.COM;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.com;	xn--mgba3gch31f060k.com	#	نامهای.com
-T;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.Com;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.com;	xn--mgba3gch31f.com	#	نامهای.com
-N;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.Com;	\u0646\u0627\u0645\u0647\u200C\u0627\u06CC.com;	xn--mgba3gch31f060k.com	#	نامهای.com
-B;	xn--mgba3gch31f.com;	\u0646\u0627\u0645\u0647\u0627\u06CC.com;	xn--mgba3gch31f.com	#	نامهای.com
-B;	\u0646\u0627\u0645\u0647\u0627\u06CC.com;	;	xn--mgba3gch31f.com	#	نامهای.com
-B;	\u0646\u0627\u0645\u0647\u0627\u06CC.COM;	\u0646\u0627\u0645\u0647\u0627\u06CC.com;	xn--mgba3gch31f.com	#	نامهای.com
-B;	\u0646\u0627\u0645\u0647\u0627\u06CC.Com;	\u0646\u0627\u0645\u0647\u0627\u06CC.com;	xn--mgba3gch31f.com	#	نامهای.com
-B;	a.b．c。d｡;	a.b.c.d.;	
-B;	a.b.c。d。;	a.b.c.d.;	
-B;	A.B.C。D。;	a.b.c.d.;	
-B;	A.b.c。D。;	a.b.c.d.;	
-B;	a.b.c.d.;	;	
-B;	A.B．C。D｡;	a.b.c.d.;	
-B;	A.b．c。D｡;	a.b.c.d.;	
-B;	U\u0308.xn--tda;	ü.ü;	xn--tda.xn--tda
-B;	Ü.xn--tda;	ü.ü;	xn--tda.xn--tda
-B;	ü.xn--tda;	ü.ü;	xn--tda.xn--tda
-B;	u\u0308.xn--tda;	ü.ü;	xn--tda.xn--tda
-B;	U\u0308.XN--TDA;	ü.ü;	xn--tda.xn--tda
-B;	Ü.XN--TDA;	ü.ü;	xn--tda.xn--tda
-B;	Ü.xn--Tda;	ü.ü;	xn--tda.xn--tda
-B;	U\u0308.xn--Tda;	ü.ü;	xn--tda.xn--tda
-B;	xn--tda.xn--tda;	ü.ü;	xn--tda.xn--tda
-B;	ü.ü;	;	xn--tda.xn--tda
-B;	u\u0308.u\u0308;	ü.ü;	xn--tda.xn--tda
-B;	U\u0308.U\u0308;	ü.ü;	xn--tda.xn--tda
-B;	Ü.Ü;	ü.ü;	xn--tda.xn--tda
-B;	Ü.ü;	ü.ü;	xn--tda.xn--tda
-B;	U\u0308.u\u0308;	ü.ü;	xn--tda.xn--tda
-B;	xn--u-ccb;	[V1];	[V1]	#	ü
-B;	aâ’ˆcom;	[P1 V6];	[P1 V6]
-B;	a1.com;	;	
-B;	Aâ’ˆCOM;	[P1 V6];	[P1 V6]
-B;	Aâ’ˆCom;	[P1 V6];	[P1 V6]
-B;	xn--acom-0w1b;	[V6];	[V6]
-B;	xn--a-ecp.ru;	[V6];	[V6]
-B;	xn--0.pt;	[A3];	[A3]
-B;	xn--a.pt;	[V6];	[V6]	#	.pt
-B;	xn--a-Ä.pt;	[A3];	[A3]
-B;	xn--a-A\u0308.pt;	[A3];	[A3]
-B;	xn--a-a\u0308.pt;	[A3];	[A3]
-B;	xn--a-ä.pt;	[A3];	[A3]
-B;	XN--A-Ä.PT;	[A3];	[A3]
-B;	XN--A-A\u0308.PT;	[A3];	[A3]
-B;	Xn--A-A\u0308.pt;	[A3];	[A3]
-B;	Xn--A-Ä.pt;	[A3];	[A3]
-B;	xn--xn--a--gua.pt;	[V2];	[V2]
-B;	日本語。ＪＰ;	日本語.jp;	xn--wgv71a119e.jp
-B;	日本語。JP;	日本語.jp;	xn--wgv71a119e.jp
-B;	日本語。jp;	日本語.jp;	xn--wgv71a119e.jp
-B;	日本語。Jp;	日本語.jp;	xn--wgv71a119e.jp
-B;	xn--wgv71a119e.jp;	日本語.jp;	xn--wgv71a119e.jp
-B;	日本語.jp;	;	xn--wgv71a119e.jp
-B;	日本語.JP;	日本語.jp;	xn--wgv71a119e.jp
-B;	日本語.Jp;	日本語.jp;	xn--wgv71a119e.jp
-B;	日本語。ｊ�;	日本語.jp;	xn--wgv71a119e.jp
-B;	日本語。Ｊ�;	日本語.jp;	xn--wgv71a119e.jp
-B;	☕;	;	xn--53h;	NV8
-B;	xn--53h;	☕;	xn--53h;	NV8
-T;	1.aß\u200C\u200Db\u200C\u200Dcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß\u0302ßz;	[C1 C2];	[A4_2]	#	1.aßbcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz
-N;	1.aß\u200C\u200Db\u200C\u200Dcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß\u0302ßz;	[C1 C2];	[C1 C2 A4_2]	#	1.aßbcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz
-T;	1.ASS\u200C\u200DB\u200C\u200DCSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSS\u0302SSZ;	[C1 C2];	[A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-N;	1.ASS\u200C\u200DB\u200C\u200DCSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSS\u0302SSZ;	[C1 C2];	[C1 C2 A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-T;	1.ASS\u200C\u200DB\u200C\u200DCSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSŜSSZ;	[C1 C2];	[A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-N;	1.ASS\u200C\u200DB\u200C\u200DCSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSŜSSZ;	[C1 C2];	[C1 C2 A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-T;	1.ass\u200C\u200Db\u200C\u200Dcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[C1 C2];	[A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-N;	1.ass\u200C\u200Db\u200C\u200Dcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[C1 C2];	[C1 C2 A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-T;	1.ass\u200C\u200Db\u200C\u200Dcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssyssssssssssssssss\u0302ssz;	[C1 C2];	[A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-N;	1.ass\u200C\u200Db\u200C\u200Dcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssyssssssssssssssss\u0302ssz;	[C1 C2];	[C1 C2 A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-T;	1.Ass\u200C\u200Db\u200C\u200Dcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssyssssssssssssssss\u0302ssz;	[C1 C2];	[A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-N;	1.Ass\u200C\u200Db\u200C\u200Dcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssyssssssssssssssss\u0302ssz;	[C1 C2];	[C1 C2 A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-T;	1.Ass\u200C\u200Db\u200C\u200Dcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[C1 C2];	[A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-N;	1.Ass\u200C\u200Db\u200C\u200Dcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[C1 C2];	[C1 C2 A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-B;	1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa;	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[A4_2]
-B;	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	;	[A4_2]
-B;	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssyssssssssssssssss\u0302ssz;	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[A4_2]
-B;	1.ASSBCSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSS\u0302SSZ;	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[A4_2]
-B;	1.ASSBCSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSŜSSZ;	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[A4_2]
-B;	1.Assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[A4_2]
-B;	1.Assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssyssssssssssssssss\u0302ssz;	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz;	[A4_2]
-B;	1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc;	[C1 C2];	[C1 C2 A4_2]	#	1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
-T;	1.Aß\u200C\u200Db\u200C\u200Dcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß\u0302ßz;	[C1 C2];	[A4_2]	#	1.aßbcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz
-N;	1.Aß\u200C\u200Db\u200C\u200Dcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß\u0302ßz;	[C1 C2];	[C1 C2 A4_2]	#	1.aßbcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz
-B;	1.xn--abcdexyz-qyacaaabaaaaaaabaaaaaaaaabaaaaaaaaabaaaaaaaa010ze2isb1140zba8cc;	[C1 C2];	[C1 C2 A4_2]	#	1.aßbcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz
-T;	\u200Cx\u200Dn\u200C-\u200D-bß;	[C1 C2];	xn--bss	#	xn--bß
-N;	\u200Cx\u200Dn\u200C-\u200D-bß;	[C1 C2];	[C1 C2]	#	xn--bß
-T;	\u200CX\u200DN\u200C-\u200D-BSS;	[C1 C2];	xn--bss	#	xn--bss
-N;	\u200CX\u200DN\u200C-\u200D-BSS;	[C1 C2];	[C1 C2]	#	xn--bss
-T;	\u200Cx\u200Dn\u200C-\u200D-bss;	[C1 C2];	xn--bss	#	xn--bss
-N;	\u200Cx\u200Dn\u200C-\u200D-bss;	[C1 C2];	[C1 C2]	#	xn--bss
-T;	\u200CX\u200Dn\u200C-\u200D-Bss;	[C1 C2];	xn--bss	#	xn--bss
-N;	\u200CX\u200Dn\u200C-\u200D-Bss;	[C1 C2];	[C1 C2]	#	xn--bss
-B;	xn--bss;	夙;	xn--bss
-B;	夙;	;	xn--bss
-B;	xn--xn--bss-7z6ccid;	[C1 C2];	[C1 C2]	#	xn--bss
-T;	\u200CX\u200Dn\u200C-\u200D-Bß;	[C1 C2];	xn--bss	#	xn--bß
-N;	\u200CX\u200Dn\u200C-\u200D-Bß;	[C1 C2];	[C1 C2]	#	xn--bß
-B;	xn--xn--b-pqa5796ccahd;	[C1 C2];	[C1 C2]	#	xn--bß
-B;	ˣ\u034Fℕ\u200B﹣\u00AD�\u180Cℬ\uFE00ſ\u2064�󠇯ffl;	夡夞夜夙;	xn--bssffl
-B;	x\u034FN\u200B-\u00AD-\u180CB\uFE00s\u2064s󠇯ffl;	夡夞夜夙;	xn--bssffl
-B;	x\u034Fn\u200B-\u00AD-\u180Cb\uFE00s\u2064s󠇯ffl;	夡夞夜夙;	xn--bssffl
-B;	X\u034FN\u200B-\u00AD-\u180CB\uFE00S\u2064S󠇯FFL;	夡夞夜夙;	xn--bssffl
-B;	X\u034Fn\u200B-\u00AD-\u180CB\uFE00s\u2064s󠇯ffl;	夡夞夜夙;	xn--bssffl
-B;	xn--bssffl;	夡夞夜夙;	xn--bssffl
-B;	夡夞夜夙;	;	xn--bssffl
-B;	ˣ\u034Fℕ\u200B﹣\u00AD�\u180Cℬ\uFE00S\u2064�󠇯FFL;	夡夞夜夙;	xn--bssffl
-B;	x\u034FN\u200B-\u00AD-\u180CB\uFE00S\u2064s󠇯FFL;	夡夞夜夙;	xn--bssffl
-B;	ˣ\u034Fℕ\u200B﹣\u00AD�\u180Cℬ\uFE00s\u2064�󠇯ffl;	夡夞夜夙;	xn--bssffl
-B;	123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	;	
-B;	123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	;	
-B;	123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	;	[A4_1]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	;	[A4_1 A4_2]
-B;	ä1234567890123456789012345678901234567890123456789012345;	;	xn--1234567890123456789012345678901234567890123456789012345-9te
-B;	a\u03081234567890123456789012345678901234567890123456789012345;	ä1234567890123456789012345678901234567890123456789012345;	xn--1234567890123456789012345678901234567890123456789012345-9te
-B;	A\u03081234567890123456789012345678901234567890123456789012345;	ä1234567890123456789012345678901234567890123456789012345;	xn--1234567890123456789012345678901234567890123456789012345-9te
-B;	Ä1234567890123456789012345678901234567890123456789012345;	ä1234567890123456789012345678901234567890123456789012345;	xn--1234567890123456789012345678901234567890123456789012345-9te
-B;	xn--1234567890123456789012345678901234567890123456789012345-9te;	ä1234567890123456789012345678901234567890123456789012345;	xn--1234567890123456789012345678901234567890123456789012345-9te
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890a\u0308123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890A\u0308123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
-B;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890a\u0308123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890A\u0308123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
-B;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	;	[A4_1]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890a\u0308123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	[A4_1]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890A\u0308123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	[A4_1]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	[A4_1]
-B;	123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012;	[A4_1]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890a\u03081234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890A\u03081234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890a\u03081234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890A\u03081234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.;	[A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	;	[A4_1 A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890a\u03081234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	[A4_1 A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890A\u03081234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	[A4_1 A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	[A4_1 A4_2]
-B;	123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901;	[A4_1 A4_2]
-B;	a.b..-q--a-.e;	[V2 V3 A4_2];	[V2 V3 A4_2]
-B;	a.b..-q--ä-.e;	[V2 V3 A4_2];	[V2 V3 A4_2]
-B;	a.b..-q--a\u0308-.e;	[V2 V3 A4_2];	[V2 V3 A4_2]
-B;	A.B..-Q--A\u0308-.E;	[V2 V3 A4_2];	[V2 V3 A4_2]
-B;	A.B..-Q--Ä-.E;	[V2 V3 A4_2];	[V2 V3 A4_2]
-B;	A.b..-Q--Ä-.E;	[V2 V3 A4_2];	[V2 V3 A4_2]
-B;	A.b..-Q--A\u0308-.E;	[V2 V3 A4_2];	[V2 V3 A4_2]
-B;	a.b..xn---q----jra.e;	[V2 V3 A4_2];	[V2 V3 A4_2]
-B;	a..c;	[A4_2];	[A4_2]
-B;	a.-b.;	[V3];	[V3]
-B;	a.b-.c;	[V3];	[V3]
-B;	a.-.c;	[V3];	[V3]
-B;	a.bc--de.f;	[V2];	[V2]
-B;	ä.\u00AD.c;	[A4_2];	[A4_2]
-B;	a\u0308.\u00AD.c;	[A4_2];	[A4_2]
-B;	A\u0308.\u00AD.C;	[A4_2];	[A4_2]
-B;	Ä.\u00AD.C;	[A4_2];	[A4_2]
-B;	xn--4ca..c;	[A4_2];	[A4_2]
-B;	ä.-b.;	[V3];	[V3]
-B;	a\u0308.-b.;	[V3];	[V3]
-B;	A\u0308.-B.;	[V3];	[V3]
-B;	Ä.-B.;	[V3];	[V3]
-B;	xn--4ca.-b.;	[V3];	[V3]
-B;	ä.b-.c;	[V3];	[V3]
-B;	a\u0308.b-.c;	[V3];	[V3]
-B;	A\u0308.B-.C;	[V3];	[V3]
-B;	Ä.B-.C;	[V3];	[V3]
-B;	Ä.b-.C;	[V3];	[V3]
-B;	A\u0308.b-.C;	[V3];	[V3]
-B;	xn--4ca.b-.c;	[V3];	[V3]
-B;	ä.-.c;	[V3];	[V3]
-B;	a\u0308.-.c;	[V3];	[V3]
-B;	A\u0308.-.C;	[V3];	[V3]
-B;	Ä.-.C;	[V3];	[V3]
-B;	xn--4ca.-.c;	[V3];	[V3]
-B;	ä.bc--de.f;	[V2];	[V2]
-B;	a\u0308.bc--de.f;	[V2];	[V2]
-B;	A\u0308.BC--DE.F;	[V2];	[V2]
-B;	Ä.BC--DE.F;	[V2];	[V2]
-B;	Ä.bc--De.f;	[V2];	[V2]
-B;	A\u0308.bc--De.f;	[V2];	[V2]
-B;	xn--4ca.bc--de.f;	[V2];	[V2]
-B;	a.b.\u0308c.d;	[V5];	[V5]	#	a.b.̈c.d
-B;	A.B.\u0308C.D;	[V5];	[V5]	#	a.b.̈c.d
-B;	A.b.\u0308c.d;	[V5];	[V5]	#	a.b.̈c.d
-B;	a.b.xn--c-bcb.d;	[V5];	[V5]	#	a.b.̈c.d
-B;	A0;	a0;	
-B;	0A;	0a;	
-B;	0A.\u05D0;	[B1];	[B1]	#	0a.�
-B;	0a.\u05D0;	[B1];	[B1]	#	0a.�
-B;	0a.xn--4db;	[B1];	[B1]	#	0a.�
-B;	c.xn--0-eha.xn--4db;	[B1];	[B1]	#	c.0ü.�
-B;	b-.\u05D0;	[B6 V3];	[B6 V3]	#	b-.�
-B;	B-.\u05D0;	[B6 V3];	[B6 V3]	#	b-.�
-B;	b-.xn--4db;	[B6 V3];	[B6 V3]	#	b-.�
-B;	d.xn----dha.xn--4db;	[B6 V3];	[B6 V3]	#	d.ü-.�
-B;	a\u05D0;	[B5 B6];	[B5 B6]	#	a�
-B;	A\u05D0;	[B5 B6];	[B5 B6]	#	a�
-B;	xn--a-0hc;	[B5 B6];	[B5 B6]	#	a�
-B;	\u05D0\u05C7;	;	xn--vdbr	#	�ׇ
-B;	xn--vdbr;	\u05D0\u05C7;	xn--vdbr	#	�ׇ
-B;	\u05D09\u05C7;	;	xn--9-ihcz	#	�9ׇ
-B;	xn--9-ihcz;	\u05D09\u05C7;	xn--9-ihcz	#	�9ׇ
-B;	\u05D0a\u05C7;	[B2 B3];	[B2 B3]	#	�aׇ
-B;	\u05D0A\u05C7;	[B2 B3];	[B2 B3]	#	�aׇ
-B;	xn--a-ihcz;	[B2 B3];	[B2 B3]	#	�aׇ
-B;	\u05D0\u05EA;	;	xn--4db6c	#	�ת
-B;	xn--4db6c;	\u05D0\u05EA;	xn--4db6c	#	�ת
-B;	\u05D0\u05F3\u05EA;	;	xn--4db6c0a	#	�׳ת
-B;	xn--4db6c0a;	\u05D0\u05F3\u05EA;	xn--4db6c0a	#	�׳ת
-B;	a\u05D0Tz;	[B5];	[B5]	#	a�tz
-B;	a\u05D0tz;	[B5];	[B5]	#	a�tz
-B;	A\u05D0TZ;	[B5];	[B5]	#	a�tz
-B;	A\u05D0tz;	[B5];	[B5]	#	a�tz
-B;	xn--atz-qpe;	[B5];	[B5]	#	a�tz
-B;	\u05D0T\u05EA;	[B2];	[B2]	#	�tת
-B;	\u05D0t\u05EA;	[B2];	[B2]	#	�tת
-B;	xn--t-zhc3f;	[B2];	[B2]	#	�tת
-B;	\u05D07\u05EA;	;	xn--7-zhc3f	#	�7ת
-B;	xn--7-zhc3f;	\u05D07\u05EA;	xn--7-zhc3f	#	�7ת
-B;	\u05D0\u0667\u05EA;	;	xn--4db6c6t	#	�٧ת
-B;	xn--4db6c6t;	\u05D0\u0667\u05EA;	xn--4db6c6t	#	�٧ת
-B;	a7\u0667z;	[B5];	[B5]	#	a7Ù§z
-B;	A7\u0667Z;	[B5];	[B5]	#	a7Ù§z
-B;	A7\u0667z;	[B5];	[B5]	#	a7Ù§z
-B;	xn--a7z-06e;	[B5];	[B5]	#	a7Ù§z
-B;	\u05D07\u0667\u05EA;	[B4];	[B4]	#	�7٧ת
-B;	xn--7-zhc3fty;	[B4];	[B4]	#	�7٧ת
-T;	ஹ\u0BCD\u200D;	;	xn--dmc4b	#	ஹ�
-N;	ஹ\u0BCD\u200D;	;	xn--dmc4b194h	#	ஹ�
-B;	xn--dmc4b;	ஹ\u0BCD;	xn--dmc4b	#	ஹ�
-B;	ஹ\u0BCD;	;	xn--dmc4b	#	ஹ�
-B;	xn--dmc4b194h;	ஹ\u0BCD\u200D;	xn--dmc4b194h	#	ஹ�
-T;	ஹ\u200D;	[C2];	xn--dmc	#	ஹ
-N;	ஹ\u200D;	[C2];	[C2]	#	ஹ
-B;	xn--dmc;	ஹ;	xn--dmc
-B;	ஹ;	;	xn--dmc
-B;	xn--dmc225h;	[C2];	[C2]	#	ஹ
-T;	\u200D;	[C2];	[A4_2]	#	
-N;	\u200D;	[C2];	[C2]	#	
-B;	;	[A4_2];	[A4_2]
-B;	xn--1ug;	[C2];	[C2]	#	
-T;	ஹ\u0BCD\u200C;	;	xn--dmc4b	#	ஹ�
-N;	ஹ\u0BCD\u200C;	;	xn--dmc4by94h	#	ஹ�
-B;	xn--dmc4by94h;	ஹ\u0BCD\u200C;	xn--dmc4by94h	#	ஹ�
-T;	ஹ\u200C;	[C1];	xn--dmc	#	ஹ
-N;	ஹ\u200C;	[C1];	[C1]	#	ஹ
-B;	xn--dmc025h;	[C1];	[C1]	#	ஹ
-T;	\u200C;	[C1];	[A4_2]	#	
-N;	\u200C;	[C1];	[C1]	#	
-B;	xn--0ug;	[C1];	[C1]	#	
-T;	\u0644\u0670\u200C\u06ED\u06EF;	;	xn--ghb2gxqia	#	لٰۭۯ
-N;	\u0644\u0670\u200C\u06ED\u06EF;	;	xn--ghb2gxqia7523a	#	لٰۭۯ
-B;	xn--ghb2gxqia;	\u0644\u0670\u06ED\u06EF;	xn--ghb2gxqia	#	لٰۭۯ
-B;	\u0644\u0670\u06ED\u06EF;	;	xn--ghb2gxqia	#	لٰۭۯ
-B;	xn--ghb2gxqia7523a;	\u0644\u0670\u200C\u06ED\u06EF;	xn--ghb2gxqia7523a	#	لٰۭۯ
-T;	\u0644\u0670\u200C\u06EF;	;	xn--ghb2g3q	#	لٰۯ
-N;	\u0644\u0670\u200C\u06EF;	;	xn--ghb2g3qq34f	#	لٰۯ
-B;	xn--ghb2g3q;	\u0644\u0670\u06EF;	xn--ghb2g3q	#	لٰۯ
-B;	\u0644\u0670\u06EF;	;	xn--ghb2g3q	#	لٰۯ
-B;	xn--ghb2g3qq34f;	\u0644\u0670\u200C\u06EF;	xn--ghb2g3qq34f	#	لٰۯ
-T;	\u0644\u200C\u06ED\u06EF;	;	xn--ghb25aga	#	Ù„Û­Û¯
-N;	\u0644\u200C\u06ED\u06EF;	;	xn--ghb25aga828w	#	Ù„Û­Û¯
-B;	xn--ghb25aga;	\u0644\u06ED\u06EF;	xn--ghb25aga	#	Ù„Û­Û¯
-B;	\u0644\u06ED\u06EF;	;	xn--ghb25aga	#	Ù„Û­Û¯
-B;	xn--ghb25aga828w;	\u0644\u200C\u06ED\u06EF;	xn--ghb25aga828w	#	Ù„Û­Û¯
-T;	\u0644\u200C\u06EF;	;	xn--ghb65a	#	Ù„Û¯
-N;	\u0644\u200C\u06EF;	;	xn--ghb65a953d	#	Ù„Û¯
-B;	xn--ghb65a;	\u0644\u06EF;	xn--ghb65a	#	Ù„Û¯
-B;	\u0644\u06EF;	;	xn--ghb65a	#	Ù„Û¯
-B;	xn--ghb65a953d;	\u0644\u200C\u06EF;	xn--ghb65a953d	#	Ù„Û¯
-T;	\u0644\u0670\u200C\u06ED;	[B3 C1];	xn--ghb2gxq	#	لٰۭ
-N;	\u0644\u0670\u200C\u06ED;	[B3 C1];	[B3 C1]	#	لٰۭ
-B;	xn--ghb2gxq;	\u0644\u0670\u06ED;	xn--ghb2gxq	#	لٰۭ
-B;	\u0644\u0670\u06ED;	;	xn--ghb2gxq	#	لٰۭ
-B;	xn--ghb2gxqy34f;	[B3 C1];	[B3 C1]	#	لٰۭ
-T;	\u06EF\u200C\u06EF;	[C1];	xn--cmba	#	Û¯Û¯
-N;	\u06EF\u200C\u06EF;	[C1];	[C1]	#	Û¯Û¯
-B;	xn--cmba;	\u06EF\u06EF;	xn--cmba	#	Û¯Û¯
-B;	\u06EF\u06EF;	;	xn--cmba	#	Û¯Û¯
-B;	xn--cmba004q;	[C1];	[C1]	#	Û¯Û¯
-T;	\u0644\u200C;	[B3 C1];	xn--ghb	#	Ù„
-N;	\u0644\u200C;	[B3 C1];	[B3 C1]	#	Ù„
-B;	xn--ghb;	\u0644;	xn--ghb	#	Ù„
-B;	\u0644;	;	xn--ghb	#	Ù„
-B;	xn--ghb413k;	[B3 C1];	[B3 C1]	#	Ù„
-B;	a。。b;	[A4_2];	[A4_2]
-B;	A。。B;	[A4_2];	[A4_2]
-B;	a..b;	[A4_2];	[A4_2]
-T;	\u200D。。\u06B9\u200C;	[B1 B3 C1 C2 A4_2];	[A4_2]	#	..ڹ
-N;	\u200D。。\u06B9\u200C;	[B1 B3 C1 C2 A4_2];	[B1 B3 C1 C2 A4_2]	#	..ڹ
-B;	..xn--skb;	[A4_2];	[A4_2]	#	..Ú¹
-B;	xn--1ug..xn--skb080k;	[B1 B3 C1 C2 A4_2];	[B1 B3 C1 C2 A4_2]	#	..Ú¹
-B;	\u05D00\u0660;	[B4];	[B4]	#	�0٠
-B;	xn--0-zhc74b;	[B4];	[B4]	#	�0٠
-B;	$;	[P1 V6];	[P1 V6]
-
-# RANDOMIZED TESTS
-
-B;	c.0ü.\u05D0;	[B1];	[B1]	#	c.0ü.�
-B;	c.0u\u0308.\u05D0;	[B1];	[B1]	#	c.0ü.�
-B;	C.0U\u0308.\u05D0;	[B1];	[B1]	#	c.0ü.�
-B;	C.0Ü.\u05D0;	[B1];	[B1]	#	c.0ü.�
-B;	⒕�\u065F򓤦．-󠄯;	[P1 V3 V6];	[P1 V3 V6]	#	⒕�ٟ.-
-B;	14.�\u065F򓤦.-󠄯;	[P1 V3 V6];	[P1 V3 V6]	#	14.�ٟ.-
-B;	14.xn--7hb713l3v90n.-;	[V3 V6];	[V3 V6]	#	14.�ٟ.-
-B;	xn--7hb713lfwbi1311b.-;	[V3 V6];	[V3 V6]	#	⒕�ٟ.-
-B;	ꡣ.\u07CF;	;	xn--8c9a.xn--qsb	#	ꡣ.�
-B;	xn--8c9a.xn--qsb;	ꡣ.\u07CF;	xn--8c9a.xn--qsb	#	ꡣ.�
-B;	≯\u0603｡-;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	≯.-
-B;	>\u0338\u0603｡-;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	≯.-
-B;	≯\u0603。-;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	≯.-
-B;	>\u0338\u0603。-;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	≯.-
-B;	xn--lfb566l.-;	[B1 V3 V6];	[B1 V3 V6]	#	≯.-
-T;	⾛�⾕.\u115F󠗰ςႭ;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.ςႭ
-N;	⾛�⾕.\u115F󠗰ςႭ;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.ςႭ
-T;	走�谷.\u115F󠗰ςႭ;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.ςႭ
-N;	走�谷.\u115F󠗰ςႭ;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.ςႭ
-T;	走�谷.\u115F󠗰ς�;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.ς�
-N;	走�谷.\u115F󠗰ς�;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.ς�
-B;	走�谷.\u115F󠗰ΣႭ;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.σႭ
-B;	走�谷.\u115F󠗰σ�;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.σ�
-B;	走�谷.\u115F󠗰Σ�;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.σ�
-B;	xn--6g3a1x434z.xn--4xa180eotvh7453a;	[B5 V6];	[B5 V6]	#	走�谷.σ�
-B;	xn--6g3a1x434z.xn--4xa627dhpae6345i;	[B5 V6];	[B5 V6]	#	走�谷.σႭ
-B;	xn--6g3a1x434z.xn--3xa380eotvh7453a;	[B5 V6];	[B5 V6]	#	走�谷.ς�
-B;	xn--6g3a1x434z.xn--3xa827dhpae6345i;	[B5 V6];	[B5 V6]	#	走�谷.ςႭ
-T;	⾛�⾕.\u115F󠗰ς�;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.ς�
-N;	⾛�⾕.\u115F󠗰ς�;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.ς�
-B;	⾛�⾕.\u115F󠗰ΣႭ;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.σႭ
-B;	⾛�⾕.\u115F󠗰σ�;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.σ�
-B;	⾛�⾕.\u115F󠗰Σ�;	[B5 P1 V6];	[B5 P1 V6]	#	走�谷.σ�
-T;	\u200D≠ᢙ≯.솣-ᡴႠ;	[C2 P1 V6];	[P1 V6]	#	≠ᢙ≯.솣-ᡴႠ
-N;	\u200D≠ᢙ≯.솣-ᡴႠ;	[C2 P1 V6];	[C2 P1 V6]	#	≠ᢙ≯.솣-ᡴႠ
-T;	\u200D=\u0338ᢙ>\u0338.솣-ᡴႠ;	[C2 P1 V6];	[P1 V6]	#	≠ᢙ≯.솣-ᡴႠ
-N;	\u200D=\u0338ᢙ>\u0338.솣-ᡴႠ;	[C2 P1 V6];	[C2 P1 V6]	#	≠ᢙ≯.솣-ᡴႠ
-T;	\u200D=\u0338ᢙ>\u0338.솣-ᡴⴀ;	[C2 P1 V6];	[P1 V6]	#	≠ᢙ≯.솣-ᡴⴀ
-N;	\u200D=\u0338ᢙ>\u0338.솣-ᡴⴀ;	[C2 P1 V6];	[C2 P1 V6]	#	≠ᢙ≯.솣-ᡴⴀ
-T;	\u200D≠ᢙ≯.솣-ᡴⴀ;	[C2 P1 V6];	[P1 V6]	#	≠ᢙ≯.솣-ᡴⴀ
-N;	\u200D≠ᢙ≯.솣-ᡴⴀ;	[C2 P1 V6];	[C2 P1 V6]	#	≠ᢙ≯.솣-ᡴⴀ
-B;	xn--jbf911clb.xn----p9j493ivi4l;	[V6];	[V6]
-B;	xn--jbf929a90b0b.xn----p9j493ivi4l;	[C2 V6];	[C2 V6]	#	≠ᢙ≯.솣-ᡴⴀ
-B;	xn--jbf911clb.xn----6zg521d196p;	[V6];	[V6]
-B;	xn--jbf929a90b0b.xn----6zg521d196p;	[C2 V6];	[C2 V6]	#	≠ᢙ≯.솣-ᡴႠ
-B;	񯞜．�\u0FA2\u077D\u0600;	[P1 V6];	[P1 V6]	#	.ྡྷݽ
-B;	񯞜．�\u0FA1\u0FB7\u077D\u0600;	[P1 V6];	[P1 V6]	#	.ྡྷݽ
-B;	񯞜.�\u0FA1\u0FB7\u077D\u0600;	[P1 V6];	[P1 V6]	#	.ྡྷݽ
-B;	xn--gw68a.xn--ifb57ev2psc6027m;	[V6];	[V6]	#	.ྡྷݽ
-B;	𣳔\u0303.𑓂;	[V5];	[V5]	#	𣳔̃.𑓂
-B;	xn--nsa95820a.xn--wz1d;	[V5];	[V5]	#	𣳔̃.𑓂
-B;	𞤀𞥅�。󠄌Ⴣꡥ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	𞤢𞥅�。󠄌ⴣꡥ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	xn--9d6hgcy3556a.xn--rlju750b;	[B2 B3 V6];	[B2 B3 V6]
-B;	xn--9d6hgcy3556a.xn--7nd0578e;	[B2 B3 V6];	[B2 B3 V6]
-B;	𞤀𞥅�。󠄌ⴣꡥ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-T;	\u08E2�ς𖬱。󠅡렧;	[B1 P1 V6];	[B1 P1 V6]	#	�ς𖬱.렧
-N;	\u08E2�ς𖬱。󠅡렧;	[B1 P1 V6];	[B1 P1 V6]	#	�ς𖬱.렧
-T;	\u08E2�ς𖬱。󠅡렧;	[B1 P1 V6];	[B1 P1 V6]	#	�ς𖬱.렧
-N;	\u08E2�ς𖬱。󠅡렧;	[B1 P1 V6];	[B1 P1 V6]	#	�ς𖬱.렧
-B;	\u08E2�Σ𖬱。󠅡렧;	[B1 P1 V6];	[B1 P1 V6]	#	�σ𖬱.렧
-B;	\u08E2�Σ𖬱。󠅡렧;	[B1 P1 V6];	[B1 P1 V6]	#	�σ𖬱.렧
-B;	\u08E2�σ𖬱。󠅡렧;	[B1 P1 V6];	[B1 P1 V6]	#	�σ𖬱.렧
-B;	\u08E2�σ𖬱。󠅡렧;	[B1 P1 V6];	[B1 P1 V6]	#	�σ𖬱.렧
-B;	xn--4xa53xp48ys2xc.xn--kn2b;	[B1 V6];	[B1 V6]	#	�σ𖬱.렧
-B;	xn--3xa73xp48ys2xc.xn--kn2b;	[B1 V6];	[B1 V6]	#	�ς𖬱.렧
-T;	-\u200D。�\u200C\u200D⒈;	[B1 C1 C2 P1 V3 V6];	[B1 P1 V3 V6]	#	-.𞤯⒈
-N;	-\u200D。�\u200C\u200D⒈;	[B1 C1 C2 P1 V3 V6];	[B1 C1 C2 P1 V3 V6]	#	-.𞤯⒈
-T;	-\u200D。�\u200C\u200D1.;	[B1 C1 C2 V3];	[B1 V3]	#	-.𞤯1.
-N;	-\u200D。�\u200C\u200D1.;	[B1 C1 C2 V3];	[B1 C1 C2 V3]	#	-.𞤯1.
-T;	-\u200D。𞤯\u200C\u200D1.;	[B1 C1 C2 V3];	[B1 V3]	#	-.𞤯1.
-N;	-\u200D。𞤯\u200C\u200D1.;	[B1 C1 C2 V3];	[B1 C1 C2 V3]	#	-.𞤯1.
-B;	-.xn--1-0i8r.;	[B1 V3];	[B1 V3]
-B;	xn----ugn.xn--1-rgnd61297b.;	[B1 C1 C2 V3];	[B1 C1 C2 V3]	#	-.𞤯1.
-T;	-\u200D。𞤯\u200C\u200D⒈;	[B1 C1 C2 P1 V3 V6];	[B1 P1 V3 V6]	#	-.𞤯⒈
-N;	-\u200D。𞤯\u200C\u200D⒈;	[B1 C1 C2 P1 V3 V6];	[B1 C1 C2 P1 V3 V6]	#	-.𞤯⒈
-B;	-.xn--tsh3666n;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn----ugn.xn--0ugc555aiv51d;	[B1 C1 C2 V3 V6];	[B1 C1 C2 V3 V6]	#	-.𞤯⒈
-T;	\u200C򅎭.Ⴒ𑇀;	[C1 P1 V6];	[P1 V6]	#	.Ⴒ𑇀
-N;	\u200C򅎭.Ⴒ𑇀;	[C1 P1 V6];	[C1 P1 V6]	#	.Ⴒ𑇀
-T;	\u200C򅎭.ⴒ𑇀;	[C1 P1 V6];	[P1 V6]	#	.ⴒ𑇀
-N;	\u200C򅎭.ⴒ𑇀;	[C1 P1 V6];	[C1 P1 V6]	#	.ⴒ𑇀
-B;	xn--bn95b.xn--9kj2034e;	[V6];	[V6]
-B;	xn--0ug15083f.xn--9kj2034e;	[C1 V6];	[C1 V6]	#	.ⴒ𑇀
-B;	xn--bn95b.xn--qnd6272k;	[V6];	[V6]
-B;	xn--0ug15083f.xn--qnd6272k;	[C1 V6];	[C1 V6]	#	.Ⴒ𑇀
-T;	繱𑖿\u200D.８︒;	[P1 V6];	[P1 V6]	#	繱𑖿.8︒
-N;	繱𑖿\u200D.８︒;	[P1 V6];	[P1 V6]	#	繱𑖿.8︒
-T;	繱𑖿\u200D.8。;	繱𑖿\u200D.8.;	xn--gl0as212a.8.	#	繱𑖿.8.
-N;	繱𑖿\u200D.8。;	繱𑖿\u200D.8.;	xn--1ug6928ac48e.8.	#	繱𑖿.8.
-B;	xn--gl0as212a.8.;	繱𑖿.8.;	xn--gl0as212a.8.
-B;	繱𑖿.8.;	;	xn--gl0as212a.8.
-B;	xn--1ug6928ac48e.8.;	繱𑖿\u200D.8.;	xn--1ug6928ac48e.8.	#	繱𑖿.8.
-T;	繱𑖿\u200D.8.;	;	xn--gl0as212a.8.	#	繱𑖿.8.
-N;	繱𑖿\u200D.8.;	;	xn--1ug6928ac48e.8.	#	繱𑖿.8.
-B;	xn--gl0as212a.xn--8-o89h;	[V6];	[V6]
-B;	xn--1ug6928ac48e.xn--8-o89h;	[V6];	[V6]	#	繱𑖿.8︒
-B;	󠆾．𞀈;	[V5 A4_2];	[V5 A4_2]
-B;	󠆾.𞀈;	[V5 A4_2];	[V5 A4_2]
-B;	.xn--ph4h;	[V5 A4_2];	[V5 A4_2]
-T;	ß\u06EB。\u200D;	[C2];	xn--ss-59d.	#	ß۫.
-N;	ß\u06EB。\u200D;	[C2];	[C2]	#	ß۫.
-T;	SS\u06EB。\u200D;	[C2];	xn--ss-59d.	#	ss۫.
-N;	SS\u06EB。\u200D;	[C2];	[C2]	#	ss۫.
-T;	ss\u06EB。\u200D;	[C2];	xn--ss-59d.	#	ss۫.
-N;	ss\u06EB。\u200D;	[C2];	[C2]	#	ss۫.
-T;	Ss\u06EB。\u200D;	[C2];	xn--ss-59d.	#	ss۫.
-N;	Ss\u06EB。\u200D;	[C2];	[C2]	#	ss۫.
-B;	xn--ss-59d.;	ss\u06EB.;	xn--ss-59d.	#	ssÛ«.
-B;	ss\u06EB.;	;	xn--ss-59d.	#	ssÛ«.
-B;	SS\u06EB.;	ss\u06EB.;	xn--ss-59d.	#	ssÛ«.
-B;	Ss\u06EB.;	ss\u06EB.;	xn--ss-59d.	#	ssÛ«.
-B;	xn--ss-59d.xn--1ug;	[C2];	[C2]	#	ssÛ«.
-B;	xn--zca012a.xn--1ug;	[C2];	[C2]	#	ß۫.
-T;	�\u200C⒈．󠎇;	[C1 P1 V6];	[P1 V6]	#	⒈.
-N;	�\u200C⒈．󠎇;	[C1 P1 V6];	[C1 P1 V6]	#	⒈.
-T;	�\u200C1..󠎇;	[C1 P1 V6 A4_2];	[P1 V6 A4_2]	#	1..
-N;	�\u200C1..󠎇;	[C1 P1 V6 A4_2];	[C1 P1 V6 A4_2]	#	1..
-B;	xn--1-bs31m..xn--tv36e;	[V6 A4_2];	[V6 A4_2]
-B;	xn--1-rgn37671n..xn--tv36e;	[C1 V6 A4_2];	[C1 V6 A4_2]	#	1..
-B;	xn--tshz2001k.xn--tv36e;	[V6];	[V6]
-B;	xn--0ug88o47900b.xn--tv36e;	[C1 V6];	[C1 V6]	#	â’ˆ.
-T;	󟈣\u065F\uAAB2ß。󌓧;	[P1 V6];	[P1 V6]	#	ٟꪲß.
-N;	󟈣\u065F\uAAB2ß。󌓧;	[P1 V6];	[P1 V6]	#	ٟꪲß.
-B;	󟈣\u065F\uAAB2SS。󌓧;	[P1 V6];	[P1 V6]	#	ٟꪲss.
-B;	󟈣\u065F\uAAB2ss。󌓧;	[P1 V6];	[P1 V6]	#	ٟꪲss.
-B;	󟈣\u065F\uAAB2Ss。󌓧;	[P1 V6];	[P1 V6]	#	ٟꪲss.
-B;	xn--ss-3xd2839nncy1m.xn--bb79d;	[V6];	[V6]	#	ٟꪲss.
-B;	xn--zca92z0t7n5w96j.xn--bb79d;	[V6];	[V6]	#	ٟꪲß.
-T;	\u0774\u200C𞤿。�䉜\u200D񿤼;	[C1 C2 P1 V6];	[P1 V6]	#	ݴ𞤿.䉜
-N;	\u0774\u200C𞤿。�䉜\u200D񿤼;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	ݴ𞤿.䉜
-T;	\u0774\u200C�。�䉜\u200D񿤼;	[C1 C2 P1 V6];	[P1 V6]	#	ݴ𞤿.䉜
-N;	\u0774\u200C�。�䉜\u200D񿤼;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	ݴ𞤿.䉜
-B;	xn--4pb2977v.xn--z0nt555ukbnv;	[V6];	[V6]	#	ݴ𞤿.䉜
-B;	xn--4pb607jjt73a.xn--1ug236ke314donv1a;	[C1 C2 V6];	[C1 C2 V6]	#	ݴ𞤿.䉜
-T;	򔭜ςᡱ⒈.≮𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	ςᡱ⒈.≮𑄳�
-N;	򔭜ςᡱ⒈.≮𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	ςᡱ⒈.≮𑄳�
-T;	򔭜ςᡱ⒈.<\u0338𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	ςᡱ⒈.≮𑄳�
-N;	򔭜ςᡱ⒈.<\u0338𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	ςᡱ⒈.≮𑄳�
-T;	򔭜ςᡱ1..≮𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	ςᡱ1..≮𑄳�
-N;	򔭜ςᡱ1..≮𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	ςᡱ1..≮𑄳�
-T;	򔭜ςᡱ1..<\u0338𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	ςᡱ1..≮𑄳�
-N;	򔭜ςᡱ1..<\u0338𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	ςᡱ1..≮𑄳�
-T;	򔭜Σᡱ1..<\u0338𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	σᡱ1..≮𑄳�
-N;	򔭜Σᡱ1..<\u0338𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	σᡱ1..≮𑄳�
-T;	򔭜Σᡱ1..≮𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	σᡱ1..≮𑄳�
-N;	򔭜Σᡱ1..≮𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	σᡱ1..≮𑄳�
-T;	򔭜σᡱ1..≮𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	σᡱ1..≮𑄳�
-N;	򔭜σᡱ1..≮𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	σᡱ1..≮𑄳�
-T;	򔭜σᡱ1..<\u0338𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	σᡱ1..≮𑄳�
-N;	򔭜σᡱ1..<\u0338𑄳\u200D�;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	σᡱ1..≮𑄳�
-B;	xn--1-zmb699meq63t..xn--gdh5392g6sd;	[B1 V6 A4_2];	[B1 V6 A4_2]
-B;	xn--1-zmb699meq63t..xn--1ug85gn777ahze;	[B1 V6 A4_2];	[B1 V6 A4_2]	#	σᡱ1..≮𑄳�
-B;	xn--1-xmb999meq63t..xn--1ug85gn777ahze;	[B1 V6 A4_2];	[B1 V6 A4_2]	#	ςᡱ1..≮𑄳�
-T;	򔭜Σᡱ⒈.<\u0338𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	σᡱ⒈.≮𑄳�
-N;	򔭜Σᡱ⒈.<\u0338𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	σᡱ⒈.≮𑄳�
-T;	򔭜Σᡱ⒈.≮𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	σᡱ⒈.≮𑄳�
-N;	򔭜Σᡱ⒈.≮𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	σᡱ⒈.≮𑄳�
-T;	򔭜σᡱ⒈.≮𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	σᡱ⒈.≮𑄳�
-N;	򔭜σᡱ⒈.≮𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	σᡱ⒈.≮𑄳�
-T;	򔭜σᡱ⒈.<\u0338𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	σᡱ⒈.≮𑄳�
-N;	򔭜σᡱ⒈.<\u0338𑄳\u200D�;	[B1 P1 V6];	[B1 P1 V6]	#	σᡱ⒈.≮𑄳�
-B;	xn--4xa207hkzinr77u.xn--gdh5392g6sd;	[B1 V6];	[B1 V6]
-B;	xn--4xa207hkzinr77u.xn--1ug85gn777ahze;	[B1 V6];	[B1 V6]	#	σᡱ⒈.≮𑄳�
-B;	xn--3xa407hkzinr77u.xn--1ug85gn777ahze;	[B1 V6];	[B1 V6]	#	ςᡱ⒈.≮𑄳�
-B;	\u3164\u094DႠ\u17D0.\u180B;	[P1 V6];	[P1 V6]	#	�Ⴀ�.
-B;	\u1160\u094DႠ\u17D0.\u180B;	[P1 V6];	[P1 V6]	#	�Ⴀ�.
-B;	\u1160\u094Dⴀ\u17D0.\u180B;	[P1 V6];	[P1 V6]	#	�ⴀ�.
-B;	xn--n3b742bkqf4ty.;	[V6];	[V6]	#	�ⴀ�.
-B;	xn--n3b468aoqa89r.;	[V6];	[V6]	#	�Ⴀ�.
-B;	\u3164\u094Dⴀ\u17D0.\u180B;	[P1 V6];	[P1 V6]	#	�ⴀ�.
-B;	xn--n3b445e53po6d.;	[V6];	[V6]	#	�ⴀ�.
-B;	xn--n3b468azngju2a.;	[V6];	[V6]	#	�Ⴀ�.
-T;	�\u200D．\u09CD𑰽\u0612\uA929;	[C2 V5];	[V5]	#	�.�𑰽ؒꤩ
-N;	�\u200D．\u09CD𑰽\u0612\uA929;	[C2 V5];	[C2 V5]	#	�.�𑰽ؒꤩ
-T;	�\u200D.\u09CD𑰽\u0612\uA929;	[C2 V5];	[V5]	#	�.�𑰽ؒꤩ
-N;	�\u200D.\u09CD𑰽\u0612\uA929;	[C2 V5];	[C2 V5]	#	�.�𑰽ؒꤩ
-B;	xn--pei.xn--0fb32q3w7q2g4d;	[V5];	[V5]	#	�.�𑰽ؒꤩ
-B;	xn--1ugy10a.xn--0fb32q3w7q2g4d;	[C2 V5];	[C2 V5]	#	�.�𑰽ؒꤩ
-B;	≮��.≯񪮸ꡅ;	[B1 P1 V6];	[B1 P1 V6]
-B;	<\u0338��.>\u0338񪮸ꡅ;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--gdh7943gk2a.xn--hdh1383c5e36c;	[B1 V6];	[B1 V6]
-B;	\u0CCC��󠲺｡\u0CCDᠦ;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ೌ��.�ᠦ
-B;	\u0CCC��󠲺。\u0CCDᠦ;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ೌ��.�ᠦ
-B;	\u0CCC��󠲺。\u0CCDᠦ;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ೌ��.�ᠦ
-B;	xn--7tc6360ky5bn2732c.xn--8tc429c;	[B1 V5 V6];	[B1 V5 V6]	#	ೌ��.�ᠦ
-B;	\u0CCC��󠲺｡\u0CCDᠦ;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ೌ��.�ᠦ
-B;	\u0349。𧡫;	[V5];	[V5]	#	͉.𧡫
-B;	xn--nua.xn--bc6k;	[V5];	[V5]	#	͉.𧡫
-B;	𑰿󠅦．\u1160;	[P1 V5 V6];	[P1 V5 V6]	#	𑰿.
-B;	ð‘°¿ó …¦.\u1160;	[P1 V5 V6];	[P1 V5 V6]	#	ð‘°¿.
-B;	xn--ok3d.xn--psd;	[V5 V6];	[V5 V6]	#	ð‘°¿.
-T;	-𞤆\u200D。󸼄𞳒;	[B1 B5 B6 C2 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	-𞤨.
-N;	-𞤆\u200D。󸼄𞳒;	[B1 B5 B6 C2 P1 V3 V6];	[B1 B5 B6 C2 P1 V3 V6]	#	-𞤨.
-T;	-𞤨\u200D。󸼄𞳒;	[B1 B5 B6 C2 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	-𞤨.
-N;	-𞤨\u200D。󸼄𞳒;	[B1 B5 B6 C2 P1 V3 V6];	[B1 B5 B6 C2 P1 V3 V6]	#	-𞤨.
-B;	xn----ni8r.xn--846h96596c;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]
-B;	xn----ugnx367r.xn--846h96596c;	[B1 B5 B6 C2 V3 V6];	[B1 B5 B6 C2 V3 V6]	#	-𞤨.
-B;	�󠇶≯𳾽。\u1DFD⾇滸�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�≯.᷽舛滸�
-B;	�󠇶>\u0338𳾽。\u1DFD⾇滸�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�≯.᷽舛滸�
-B;	�󠇶≯𳾽。\u1DFD舛滸�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�≯.᷽舛滸�
-B;	�󠇶>\u0338𳾽。\u1DFD舛滸�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�≯.᷽舛滸�
-B;	xn--hdh7483cu6twwki8e.xn--yfg0765a58l0n6k;	[B1 V5 V6];	[B1 V5 V6]	#	�≯.᷽舛滸�
-B;	�｡𑰺;	[V5];	[V5]
-B;	�。𑰺;	[V5];	[V5]
-B;	xn--uy1a.xn--jk3d;	[V5];	[V5]
-B;	��。󠄊;	[B1];	[B1]
-B;	9�。󠄊;	[B1];	[B1]
-B;	xn--9-rv5i.;	[B1];	[B1]
-B;	󟇇-䟖F。\u07CB⒈\u0662;	[B4 P1 V6];	[B4 P1 V6]	#	-䟖f.ߋ⒈٢
-B;	󟇇-䟖F。\u07CB1.\u0662;	[B1 P1 V6];	[B1 P1 V6]	#	-䟖f.ߋ1.٢
-B;	󟇇-䟖f。\u07CB1.\u0662;	[B1 P1 V6];	[B1 P1 V6]	#	-䟖f.ߋ1.٢
-B;	xn---f-mz8b08788k.xn--1-ybd.xn--bib;	[B1 V6];	[B1 V6]	#	-䟖f.ߋ1.٢
-B;	󟇇-䟖f。\u07CB⒈\u0662;	[B4 P1 V6];	[B4 P1 V6]	#	-䟖f.ߋ⒈٢
-B;	xn---f-mz8b08788k.xn--bib53ev44d;	[B4 V6];	[B4 V6]	#	-䟖f.ߋ⒈٢
-T;	\u200C｡�;	[B1 C1];	[B1 A4_2]	#	.�
-N;	\u200C｡�;	[B1 C1];	[B1 C1]	#	.�
-T;	\u200C。�;	[B1 C1];	[B1 A4_2]	#	.�
-N;	\u200C。�;	[B1 C1];	[B1 C1]	#	.�
-B;	.xn--yo0d;	[B1 A4_2];	[B1 A4_2]
-B;	xn--0ug.xn--yo0d;	[B1 C1];	[B1 C1]	#	.�
-T;	�.≯\u200C-𞥀;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�.≯-𞥀
-N;	�.≯\u200C-𞥀;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.≯-𞥀
-T;	�.>\u0338\u200C-𞥀;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�.≯-𞥀
-N;	�.>\u0338\u200C-𞥀;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.≯-𞥀
-T;	�.>\u0338\u200C-𞤞;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�.≯-𞥀
-N;	�.>\u0338\u200C-𞤞;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.≯-𞥀
-T;	�.≯\u200C-𞤞;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�.≯-𞥀
-N;	�.≯\u200C-𞤞;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.≯-𞥀
-B;	xn--le9c.xn----ogo9956r;	[B1 V6];	[B1 V6]
-B;	xn--le9c.xn----rgn40iy359e;	[B1 C1 V6];	[B1 C1 V6]	#	�.≯-𞥀
-B;	�-。≠\uFCD7;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.≠هج
-B;	�-。=\u0338\uFCD7;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.≠هج
-B;	�-。≠\u0647\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.≠هج
-B;	�-。=\u0338\u0647\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.≠هج
-B;	xn----f411m.xn--rgb7c611j;	[B1 V3 V6];	[B1 V3 V6]	#	-.≠هج
-T;	񻬹𑈵。\u200D𞨶;	[B1 C2 P1 V6];	[P1 V6]	#	𑈵.
-N;	񻬹𑈵。\u200D𞨶;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	𑈵.
-B;	xn--8g1d12120a.xn--5l6h;	[V6];	[V6]
-B;	xn--8g1d12120a.xn--1ug6651p;	[B1 C2 V6];	[B1 C2 V6]	#	𑈵.
-B;	𑋧\uA9C02｡㧉򒖄;	[P1 V5 V6];	[P1 V5 V6]	#	𑋧꧀2.㧉
-B;	𑋧\uA9C02。㧉򒖄;	[P1 V5 V6];	[P1 V5 V6]	#	𑋧꧀2.㧉
-B;	xn--2-5z4eu89y.xn--97l02706d;	[V5 V6];	[V5 V6]	#	𑋧꧀2.㧉
-T;	\u200C𽬄�𞩥。≯6;	[B1 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	�.≯6
-N;	\u200C𽬄�𞩥。≯6;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.≯6
-T;	\u200C𽬄�𞩥。>\u03386;	[B1 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	�.≯6
-N;	\u200C𽬄�𞩥。>\u03386;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.≯6
-B;	xn--so0du768aim9m.xn--6-ogo;	[B1 B5 B6 V6];	[B1 B5 B6 V6]
-B;	xn--0ug7105gf5wfxepq.xn--6-ogo;	[B1 C1 V6];	[B1 C1 V6]	#	�.≯6
-T;	�．�𻞵-\u200D;	[B1 B3 B6 C2 P1 V5 V6];	[B1 B3 B6 P1 V3 V5 V6]	#	�.�-
-N;	�．�𻞵-\u200D;	[B1 B3 B6 C2 P1 V5 V6];	[B1 B3 B6 C2 P1 V5 V6]	#	�.�-
-T;	�.�𻞵-\u200D;	[B1 B3 B6 C2 P1 V5 V6];	[B1 B3 B6 P1 V3 V5 V6]	#	�.�-
-N;	�.�𻞵-\u200D;	[B1 B3 B6 C2 P1 V5 V6];	[B1 B3 B6 C2 P1 V5 V6]	#	�.�-
-B;	xn--q30d.xn----i26i1299n;	[B1 B3 B6 V3 V5 V6];	[B1 B3 B6 V3 V5 V6]
-B;	xn--q30d.xn----ugn1088hfsxv;	[B1 B3 B6 C2 V5 V6];	[B1 B3 B6 C2 V5 V6]	#	�.�-
-T;	⤸ς𺱀｡\uFFA0;	[P1 V6];	[P1 V6]	#	⤸ς.
-N;	⤸ς𺱀｡\uFFA0;	[P1 V6];	[P1 V6]	#	⤸ς.
-T;	⤸ς𺱀。\u1160;	[P1 V6];	[P1 V6]	#	⤸ς.
-N;	⤸ς𺱀。\u1160;	[P1 V6];	[P1 V6]	#	⤸ς.
-B;	⤸Σ𺱀。\u1160;	[P1 V6];	[P1 V6]	#	⤸σ.
-B;	⤸σ𺱀。\u1160;	[P1 V6];	[P1 V6]	#	⤸σ.
-B;	xn--4xa192qmp03d.xn--psd;	[V6];	[V6]	#	⤸σ.
-B;	xn--3xa392qmp03d.xn--psd;	[V6];	[V6]	#	⤸ς.
-B;	⤸Σ𺱀｡\uFFA0;	[P1 V6];	[P1 V6]	#	⤸σ.
-B;	⤸σ𺱀｡\uFFA0;	[P1 V6];	[P1 V6]	#	⤸σ.
-B;	xn--4xa192qmp03d.xn--cl7c;	[V6];	[V6]	#	⤸σ.
-B;	xn--3xa392qmp03d.xn--cl7c;	[V6];	[V6]	#	⤸ς.
-B;	\u0765\u1035�\u06D5.�𑋪Ⴃ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ݥဵ�ە.�𑋪Ⴃ
-B;	\u0765\u1035�\u06D5.�𑋪ⴃ;	[B2 B3];	[B2 B3]	#	ݥဵ�ە.�𑋪ⴃ
-B;	xn--llb10as9tqp5y.xn--ukj7371e21f;	[B2 B3];	[B2 B3]	#	ݥဵ�ە.�𑋪ⴃ
-B;	xn--llb10as9tqp5y.xn--bnd9168j21f;	[B2 B3 V6];	[B2 B3 V6]	#	ݥဵ�ە.�𑋪Ⴃ
-B;	\u0661\u1B44-킼.\u1BAA\u0616\u066C≯;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	١᭄-킼.᮪ؖ٬≯
-B;	\u0661\u1B44-�ᅵᆿ.\u1BAA\u0616\u066C>\u0338;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	١᭄-킼.᮪ؖ٬≯
-B;	xn----9pc551nk39n.xn--4fb6o571degg;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	١᭄-킼.᮪ؖ٬≯
-B;	-。\u06C2\u0604򅖡𑓂;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-.ۂ𑓂
-B;	-。\u06C1\u0654\u0604򅖡𑓂;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-.ۂ𑓂
-B;	-.xn--mfb39a7208dzgs3d;	[B1 B2 B3 V3 V6];	[B1 B2 B3 V3 V6]	#	-.Û‚ð‘“‚
-T;	\u200D󯑖�．\u05BD𙮰��;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.ֽ��
-N;	\u200D󯑖�．\u05BD𙮰��;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.ֽ��
-T;	\u200D󯑖�.\u05BD𙮰��;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.ֽ��
-N;	\u200D󯑖�.\u05BD𙮰��;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.ֽ��
-B;	xn--b726ey18m.xn--ldb8734fg0qcyzzg;	[V5 V6];	[V5 V6]	#	.ֽ��
-B;	xn--1ug66101lt8me.xn--ldb8734fg0qcyzzg;	[C2 V5 V6];	[C2 V5 V6]	#	.ֽ��
-T;	︒􃈵ς񀠇｡�;	[B1 P1 V6];	[B1 P1 V6]
-N;	︒􃈵ς񀠇｡�;	[B1 P1 V6];	[B1 P1 V6]
-T;	。􃈵ς񀠇。�;	[P1 V6 A4_2];	[P1 V6 A4_2]
-N;	。􃈵ς񀠇。�;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	。􃈵Σ񀠇。�;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	。􃈵σ񀠇。�;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	.xn--4xa68573c7n64d.xn--f29c;	[V6 A4_2];	[V6 A4_2]
-B;	.xn--3xa88573c7n64d.xn--f29c;	[V6 A4_2];	[V6 A4_2]
-B;	︒􃈵Σ񀠇｡�;	[B1 P1 V6];	[B1 P1 V6]
-B;	︒􃈵σ񀠇｡�;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--4xa1729jwz5t7gl5f.xn--f29c;	[B1 V6];	[B1 V6]
-B;	xn--3xa3729jwz5t7gl5f.xn--f29c;	[B1 V6];	[B1 V6]
-B;	\u07D9．\u06EE󆾃≯󠅲;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ߙ.ۮ≯
-B;	\u07D9．\u06EE󆾃>\u0338󠅲;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ߙ.ۮ≯
-B;	\u07D9.\u06EE󆾃≯󠅲;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ߙ.ۮ≯
-B;	\u07D9.\u06EE󆾃>\u0338󠅲;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ߙ.ۮ≯
-B;	xn--0sb.xn--bmb691l0524t;	[B2 B3 V6];	[B2 B3 V6]	#	ߙ.ۮ≯
-B;	\u1A73󚙸.�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᩳ.�
-B;	xn--2of22352n.xn--q09c;	[B1 V5 V6];	[B1 V5 V6]	#	ᩳ.�
-B;	⒉󠊓≠｡Ⴟ⬣Ⴈ;	[P1 V6];	[P1 V6]
-B;	⒉󠊓=\u0338｡Ⴟ⬣Ⴈ;	[P1 V6];	[P1 V6]
-B;	2.󠊓≠。Ⴟ⬣Ⴈ;	[P1 V6];	[P1 V6]
-B;	2.󠊓=\u0338。Ⴟ⬣Ⴈ;	[P1 V6];	[P1 V6]
-B;	2.󠊓=\u0338。ⴟ⬣ⴈ;	[P1 V6];	[P1 V6]
-B;	2.󠊓≠。ⴟ⬣ⴈ;	[P1 V6];	[P1 V6]
-B;	2.xn--1chz4101l.xn--45iz7d6b;	[V6];	[V6]
-B;	2.xn--1chz4101l.xn--gnd9b297j;	[V6];	[V6]
-B;	⒉󠊓=\u0338｡ⴟ⬣ⴈ;	[P1 V6];	[P1 V6]
-B;	⒉󠊓≠｡ⴟ⬣ⴈ;	[P1 V6];	[P1 V6]
-B;	xn--1ch07f91401d.xn--45iz7d6b;	[V6];	[V6]
-B;	xn--1ch07f91401d.xn--gnd9b297j;	[V6];	[V6]
-B;	-󠉱\u0FB8Ⴥ。-�\u0774𞣑;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ྸჅ.-�ݴ𞣑
-B;	-󠉱\u0FB8ⴥ。-�\u0774𞣑;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ྸⴥ.-�ݴ𞣑
-B;	xn----xmg317tgv352a.xn----05c4213ryr0g;	[B1 V3 V6];	[B1 V3 V6]	#	-ྸⴥ.-�ݴ𞣑
-B;	xn----xmg12fm2555h.xn----05c4213ryr0g;	[B1 V3 V6];	[B1 V3 V6]	#	-ྸჅ.-�ݴ𞣑
-B;	\u0659。𑄴︒\u0627\u07DD;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	ٙ.𑄴︒ا�
-B;	\u0659。𑄴。\u0627\u07DD;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ٙ.𑄴.ا�
-B;	xn--1hb.xn--w80d.xn--mgb09f;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ٙ.𑄴.ا�
-B;	xn--1hb.xn--mgb09fp820c08pa;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	ٙ.𑄴︒ا�
-T;	Ⴙ\u0638.󠆓\u200D;	[B1 B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴙظ.
-N;	Ⴙ\u0638.󠆓\u200D;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	Ⴙظ.
-T;	ⴙ\u0638.󠆓\u200D;	[B1 B5 B6 C2];	[B5 B6]	#	ⴙظ.
-N;	ⴙ\u0638.󠆓\u200D;	[B1 B5 B6 C2];	[B1 B5 B6 C2]	#	ⴙظ.
-B;	xn--3gb910r.;	[B5 B6];	[B5 B6]	#	ⴙظ.
-B;	xn--3gb910r.xn--1ug;	[B1 B5 B6 C2];	[B1 B5 B6 C2]	#	ⴙظ.
-B;	xn--3gb194c.;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴙظ.
-B;	xn--3gb194c.xn--1ug;	[B1 B5 B6 C2 V6];	[B1 B5 B6 C2 V6]	#	Ⴙظ.
-B;	󠆸｡₆��\u0756;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	.60ݖ
-B;	󠆸。60�\u0756;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	.60ݖ
-B;	.xn--60-cke9470y;	[B1 V6 A4_2];	[B1 V6 A4_2]	#	.60Ý–
-B;	6\u084F｡-𑈴;	[B1 V3];	[B1 V3]	#	6�.-𑈴
-B;	6\u084F。-𑈴;	[B1 V3];	[B1 V3]	#	6�.-𑈴
-B;	xn--6-jjd.xn----6n8i;	[B1 V3];	[B1 V3]	#	6�.-𑈴
-T;	\u200D񋌿�｡\u0ACDς𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�.�ςࣖ
-N;	\u200D񋌿�｡\u0ACDς𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�.�ςࣖ
-T;	\u200D񋌿�。\u0ACDς𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�.�ςࣖ
-N;	\u200D񋌿�。\u0ACDς𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�.�ςࣖ
-T;	\u200D񋌿�。\u0ACDΣ𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�.�σࣖ
-N;	\u200D񋌿�。\u0ACDΣ𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�.�σࣖ
-T;	\u200D񋌿�。\u0ACDσ𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�.�σࣖ
-N;	\u200D񋌿�。\u0ACDσ𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�.�σࣖ
-B;	xn--oo0d1330n.xn--4xa21xcwbfz15g;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	�.�σࣖ
-B;	xn--1ugx105gq26y.xn--4xa21xcwbfz15g;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	�.�σࣖ
-B;	xn--1ugx105gq26y.xn--3xa41xcwbfz15g;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	�.�ςࣖ
-T;	\u200D񋌿�｡\u0ACDΣ𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�.�σࣖ
-N;	\u200D񋌿�｡\u0ACDΣ𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�.�σࣖ
-T;	\u200D񋌿�｡\u0ACDσ𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�.�σࣖ
-N;	\u200D񋌿�｡\u0ACDσ𞰎\u08D6;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�.�σࣖ
-B;	⒈񟄜Ⴓ⒪．\u0DCA򘘶\u088B�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	⒈Ⴓ⒪.්�
-B;	1.񟄜Ⴓ(o).\u0DCA򘘶\u088B�;	[B1 B6 P1 V5 V6];	[B1 B6 P1 V5 V6]	#	1.Ⴓ(o).්�
-B;	1.񟄜ⴓ(o).\u0DCA򘘶\u088B�;	[B1 B6 P1 V5 V6];	[B1 B6 P1 V5 V6]	#	1.ⴓ(o).්�
-B;	1.񟄜Ⴓ(O).\u0DCA򘘶\u088B�;	[B1 B6 P1 V5 V6];	[B1 B6 P1 V5 V6]	#	1.Ⴓ(o).්�
-B;	1.xn--(o)-7sn88849j.xn--3xb99xpx1yoes3e;	[B1 B6 P1 V5 V6];	[B1 B6 P1 V5 V6]	#	1.Ⴓ(o).්�
-B;	1.xn--(o)-ej1bu5389e.xn--3xb99xpx1yoes3e;	[B1 B6 P1 V5 V6];	[B1 B6 P1 V5 V6]	#	1.ⴓ(o).්�
-B;	⒈񟄜ⴓ⒪．\u0DCA򘘶\u088B�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	⒈ⴓ⒪.්�
-B;	xn--tsh0ds63atl31n.xn--3xb99xpx1yoes3e;	[B1 V5 V6];	[B1 V5 V6]	#	⒈ⴓ⒪.්�
-B;	xn--rnd762h7cx3027d.xn--3xb99xpx1yoes3e;	[B1 V5 V6];	[B1 V5 V6]	#	⒈Ⴓ⒪.්�
-B;	𞤷.���\u0624;	;	xn--ve6h.xn--jgb1694kz0b2176a;	NV8	#	𞤷.���ؤ
-B;	𞤷.���\u0648\u0654;	𞤷.���\u0624;	xn--ve6h.xn--jgb1694kz0b2176a;	NV8	#	𞤷.���ؤ
-B;	𞤕.���\u0648\u0654;	𞤷.���\u0624;	xn--ve6h.xn--jgb1694kz0b2176a;	NV8	#	𞤷.���ؤ
-B;	𞤕.���\u0624;	𞤷.���\u0624;	xn--ve6h.xn--jgb1694kz0b2176a;	NV8	#	𞤷.���ؤ
-B;	xn--ve6h.xn--jgb1694kz0b2176a;	𞤷.���\u0624;	xn--ve6h.xn--jgb1694kz0b2176a;	NV8	#	𞤷.���ؤ
-B;	�-｡𑄳񢌻;	[B1 B3 P1 V3 V5 V6];	[B1 B3 P1 V3 V5 V6]
-B;	�-。𑄳񢌻;	[B1 B3 P1 V3 V5 V6];	[B1 B3 P1 V3 V5 V6]
-B;	�-。𑄳񢌻;	[B1 B3 P1 V3 V5 V6];	[B1 B3 P1 V3 V5 V6]
-B;	xn----ue6i.xn--v80d6662t;	[B1 B3 V3 V5 V6];	[B1 B3 V3 V5 V6]
-B;	�-｡𑄳񢌻;	[B1 B3 P1 V3 V5 V6];	[B1 B3 P1 V3 V5 V6]
-B;	-󠉖ꡧ．󠊂񇆃🄉;	[P1 V3 V6];	[P1 V3 V6]
-B;	-󠉖ꡧ.󠊂񇆃8,;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn----hg4ei0361g.xn--8,-k362evu488a;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn----hg4ei0361g.xn--207ht163h7m94c;	[V3 V6];	[V3 V6]
-B;	󠾛󠈴臯𧔤.\u0768�;	[B1 P1 V6];	[B1 P1 V6]	#	臯𧔤.ݨ5
-B;	󠾛󠈴臯𧔤.\u07685;	[B1 P1 V6];	[B1 P1 V6]	#	臯𧔤.ݨ5
-B;	xn--zb1at733hm579ddhla.xn--5-b5c;	[B1 V6];	[B1 V6]	#	臯𧔤.ݨ5
-B;	≮�．�;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]
-B;	<\u0338�．�;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]
-B;	≮�.�;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]
-B;	<\u0338�.�;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]
-B;	xn--gdh1504g.xn--e92h;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]
-B;	�ᯛ\u0A4D｡脥;	[B1];	[B1]	#	�ᯛ�.脥
-B;	�ᯛ\u0A4D。脥;	[B1];	[B1]	#	�ᯛ�.脥
-B;	xn--ybc101g3m1p.xn--740a;	[B1];	[B1]	#	�ᯛ�.脥
-B;	\u1B44\u115F𞷿�.-;	[B1 B5 P1 V3 V5 V6];	[B1 B5 P1 V3 V5 V6]	#	᭄.-
-B;	xn--osd971cpx70btgt8b.-;	[B1 B5 V3 V5 V6];	[B1 B5 V3 V5 V6]	#	á­„.-
-T;	\u200C｡\u0354;	[C1 V5];	[V5 A4_2]	#	.͔
-N;	\u200C｡\u0354;	[C1 V5];	[C1 V5]	#	.͔
-T;	\u200C。\u0354;	[C1 V5];	[V5 A4_2]	#	.͔
-N;	\u200C。\u0354;	[C1 V5];	[C1 V5]	#	.͔
-B;	.xn--yua;	[V5 A4_2];	[V5 A4_2]	#	.Í”
-B;	xn--0ug.xn--yua;	[C1 V5];	[C1 V5]	#	.Í”
-B;	𞤥󠅮．ᡄႮ;	[P1 V6];	[P1 V6]
-B;	𞤥󠅮.ᡄႮ;	[P1 V6];	[P1 V6]
-B;	𞤥󠅮.ᡄⴎ;	𞤥.ᡄⴎ;	xn--de6h.xn--37e857h
-B;	𞤃󠅮.ᡄႮ;	[P1 V6];	[P1 V6]
-B;	𞤃󠅮.ᡄⴎ;	𞤥.ᡄⴎ;	xn--de6h.xn--37e857h
-B;	xn--de6h.xn--37e857h;	𞤥.ᡄⴎ;	xn--de6h.xn--37e857h
-B;	𞤥.ᡄⴎ;	;	xn--de6h.xn--37e857h
-B;	𞤃.ᡄႮ;	[P1 V6];	[P1 V6]
-B;	𞤃.ᡄⴎ;	𞤥.ᡄⴎ;	xn--de6h.xn--37e857h
-B;	xn--de6h.xn--mnd799a;	[V6];	[V6]
-B;	𞤥󠅮．ᡄⴎ;	𞤥.ᡄⴎ;	xn--de6h.xn--37e857h
-B;	𞤃󠅮．ᡄႮ;	[P1 V6];	[P1 V6]
-B;	𞤃󠅮．ᡄⴎ;	𞤥.ᡄⴎ;	xn--de6h.xn--37e857h
-B;	𞤥.ᡄႮ;	[P1 V6];	[P1 V6]
-B;	𞤧�Ξ．�㛨�;	[B2 B3 B6];	[B2 B3 B6]
-B;	𞤧�Ξ.�㛨�;	[B2 B3 B6];	[B2 B3 B6]
-B;	𞤧�ξ.�㛨�;	[B2 B3 B6];	[B2 B3 B6]
-B;	𞤅�Ξ.�㛨�;	[B2 B3 B6];	[B2 B3 B6]
-B;	𞤅�ξ.�㛨�;	[B2 B3 B6];	[B2 B3 B6]
-B;	xn--zxa5691vboja.xn--bfi293ci119b;	[B2 B3 B6];	[B2 B3 B6]
-B;	𞤧�ξ．�㛨�;	[B2 B3 B6];	[B2 B3 B6]
-B;	𞤅�Ξ．�㛨�;	[B2 B3 B6];	[B2 B3 B6]
-B;	𞤅�ξ．�㛨�;	[B2 B3 B6];	[B2 B3 B6]
-T;	᠆몆\u200C-｡Ⴛ�︒;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	᠆몆-.Ⴛ�︒
-N;	᠆몆\u200C-｡Ⴛ�︒;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 C1 P1 V3 V6]	#	᠆몆-.Ⴛ�︒
-T;	᠆몆\u200C-｡Ⴛ�︒;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	᠆몆-.Ⴛ�︒
-N;	᠆몆\u200C-｡Ⴛ�︒;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 C1 P1 V3 V6]	#	᠆몆-.Ⴛ�︒
-T;	᠆몆\u200C-。Ⴛ�。;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	᠆몆-.Ⴛ�.
-N;	᠆몆\u200C-。Ⴛ�。;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 C1 P1 V3 V6]	#	᠆몆-.Ⴛ�.
-T;	᠆몆\u200C-。Ⴛ�。;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	᠆몆-.Ⴛ�.
-N;	᠆몆\u200C-。Ⴛ�。;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 C1 P1 V3 V6]	#	᠆몆-.Ⴛ�.
-T;	᠆몆\u200C-。ⴛ�。;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	᠆몆-.ⴛ�.
-N;	᠆몆\u200C-。ⴛ�。;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 C1 P1 V3 V6]	#	᠆몆-.ⴛ�.
-T;	᠆몆\u200C-。ⴛ�。;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	᠆몆-.ⴛ�.
-N;	᠆몆\u200C-。ⴛ�。;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 C1 P1 V3 V6]	#	᠆몆-.ⴛ�.
-B;	xn----e3j6620g.xn--jlju661e.;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]
-B;	xn----e3j425bsk1o.xn--jlju661e.;	[B1 B5 B6 C1 V3 V6];	[B1 B5 B6 C1 V3 V6]	#	᠆몆-.ⴛ�.
-B;	xn----e3j6620g.xn--znd4948j.;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]
-B;	xn----e3j425bsk1o.xn--znd4948j.;	[B1 B5 B6 C1 V3 V6];	[B1 B5 B6 C1 V3 V6]	#	᠆몆-.Ⴛ�.
-T;	᠆몆\u200C-｡ⴛ�︒;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	᠆몆-.ⴛ�︒
-N;	᠆몆\u200C-｡ⴛ�︒;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 C1 P1 V3 V6]	#	᠆몆-.ⴛ�︒
-T;	᠆몆\u200C-｡ⴛ�︒;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	᠆몆-.ⴛ�︒
-N;	᠆몆\u200C-｡ⴛ�︒;	[B1 B5 B6 C1 P1 V3 V6];	[B1 B5 B6 C1 P1 V3 V6]	#	᠆몆-.ⴛ�︒
-B;	xn----e3j6620g.xn--jlj4997dhgh;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]
-B;	xn----e3j425bsk1o.xn--jlj4997dhgh;	[B1 B5 B6 C1 V3 V6];	[B1 B5 B6 C1 V3 V6]	#	᠆몆-.ⴛ�︒
-B;	xn----e3j6620g.xn--znd2362jhgh;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]
-B;	xn----e3j425bsk1o.xn--znd2362jhgh;	[B1 B5 B6 C1 V3 V6];	[B1 B5 B6 C1 V3 V6]	#	᠆몆-.Ⴛ�︒
-T;	󠾳.︒⥱\u200C�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	.︒⥱�
-N;	󠾳.︒⥱\u200C�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	.︒⥱�
-T;	󠾳.。⥱\u200C�;	[B1 C1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	..⥱�
-N;	󠾳.。⥱\u200C�;	[B1 C1 P1 V6 A4_2];	[B1 C1 P1 V6 A4_2]	#	..⥱�
-B;	xn--uf66e..xn--qti2829e;	[B1 V6 A4_2];	[B1 V6 A4_2]
-B;	xn--uf66e..xn--0ugz28as66q;	[B1 C1 V6 A4_2];	[B1 C1 V6 A4_2]	#	..⥱�
-B;	xn--uf66e.xn--qtiz073e3ik;	[B1 V6];	[B1 V6]
-B;	xn--uf66e.xn--0ugz28axl3pqxna;	[B1 C1 V6];	[B1 C1 V6]	#	.︒⥱�
-B;	�.�Ⴑ񚇜�;	[B1 P1 V6];	[B1 P1 V6]
-B;	�.�ⴑ񚇜�;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--n49c.xn--8kj8702ewicl862o;	[B1 V6];	[B1 V6]
-B;	xn--n49c.xn--pnd4619jwicl862o;	[B1 V6];	[B1 V6]
-B;	\u0FA4񱤯．�Ⴛ;	[P1 V5 V6];	[P1 V5 V6]	#	ྤ.1Ⴛ
-B;	\u0FA4񱤯.1Ⴛ;	[P1 V5 V6];	[P1 V5 V6]	#	ྤ.1Ⴛ
-B;	\u0FA4񱤯.1ⴛ;	[P1 V5 V6];	[P1 V5 V6]	#	ྤ.1ⴛ
-B;	xn--0fd40533g.xn--1-tws;	[V5 V6];	[V5 V6]	#	ྤ.1ⴛ
-B;	xn--0fd40533g.xn--1-q1g;	[V5 V6];	[V5 V6]	#	ྤ.1Ⴛ
-B;	\u0FA4񱤯．�ⴛ;	[P1 V5 V6];	[P1 V5 V6]	#	ྤ.1ⴛ
-B;	-\u0826齀。릿�;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	-ࠦ齀.릿
-B;	-\u0826齀。릿�;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	-ࠦ齀.릿
-B;	xn----6gd0617i.xn--7y2bm55m;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]	#	-ࠦ齀.릿
-T;	󠔊\u071C�꾗。�\u200D\u200D�;	[B1 B6 C2 P1 V6];	[B1 B6 P1 V6]	#	ܜ�꾗.�
-N;	󠔊\u071C�꾗。�\u200D\u200D�;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ܜ�꾗.�
-T;	󠔊\u071C��ᅬᆾ。�\u200D\u200D�;	[B1 B6 C2 P1 V6];	[B1 B6 P1 V6]	#	ܜ�꾗.�
-N;	󠔊\u071C��ᅬᆾ。�\u200D\u200D�;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ܜ�꾗.�
-B;	xn--mnb6558e91kyq533a.xn--6mh27269e;	[B1 B6 V6];	[B1 B6 V6]	#	ܜ�꾗.�
-B;	xn--mnb6558e91kyq533a.xn--1uga46zs309y;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	ܜ�꾗.�
-B;	≮．-\u0708--;	[B1 P1 V2 V3 V6];	[B1 P1 V2 V3 V6]	#	≮.-܈--
-B;	<\u0338．-\u0708--;	[B1 P1 V2 V3 V6];	[B1 P1 V2 V3 V6]	#	≮.-܈--
-B;	≮.-\u0708--;	[B1 P1 V2 V3 V6];	[B1 P1 V2 V3 V6]	#	≮.-܈--
-B;	<\u0338.-\u0708--;	[B1 P1 V2 V3 V6];	[B1 P1 V2 V3 V6]	#	≮.-܈--
-B;	xn--gdh.xn------eqf;	[B1 V2 V3 V6];	[B1 V2 V3 V6]	#	≮.-܈--
-T;	�󠋳。\u200Dς�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.ς7
-N;	�󠋳。\u200Dς�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.ς7
-T;	�󠋳。\u200Dς7;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.ς7
-N;	�󠋳。\u200Dς7;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.ς7
-T;	�󠋳。\u200DΣ7;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.σ7
-N;	�󠋳。\u200DΣ7;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.σ7
-T;	�󠋳。\u200Dσ7;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.σ7
-N;	�󠋳。\u200Dσ7;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.σ7
-B;	xn--wo0di5177c.xn--7-zmb;	[B1 V6];	[B1 V6]
-B;	xn--wo0di5177c.xn--7-zmb938s;	[B1 C2 V6];	[B1 C2 V6]	#	�.σ7
-B;	xn--wo0di5177c.xn--7-xmb248s;	[B1 C2 V6];	[B1 C2 V6]	#	�.ς7
-T;	�󠋳。\u200DΣ�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.σ7
-N;	�󠋳。\u200DΣ�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.σ7
-T;	�󠋳。\u200Dσ�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.σ7
-N;	�󠋳。\u200Dσ�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.σ7
-T;	ς򅜌８.𞭤;	[P1 V6];	[P1 V6]
-N;	ς򅜌８.𞭤;	[P1 V6];	[P1 V6]
-T;	ς򅜌8.𞭤;	[P1 V6];	[P1 V6]
-N;	ς򅜌8.𞭤;	[P1 V6];	[P1 V6]
-B;	Σ򅜌8.𞭤;	[P1 V6];	[P1 V6]
-B;	σ򅜌8.𞭤;	[P1 V6];	[P1 V6]
-B;	xn--8-zmb14974n.xn--su6h;	[V6];	[V6]
-B;	xn--8-xmb44974n.xn--su6h;	[V6];	[V6]
-B;	Σ򅜌８.𞭤;	[P1 V6];	[P1 V6]
-B;	σ򅜌８.𞭤;	[P1 V6];	[P1 V6]
-T;	\u200Cᡑ🄀\u0684．-�𑲤;	[B1 C1 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	ᡑ🄀ڄ.-�𑲤
-N;	\u200Cᡑ🄀\u0684．-�𑲤;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	ᡑ🄀ڄ.-�𑲤
-T;	\u200Cᡑ0.\u0684.-�𑲤;	[B1 C1 V3];	[B1 V3]	#	ᡑ0.ڄ.-�𑲤
-N;	\u200Cᡑ0.\u0684.-�𑲤;	[B1 C1 V3];	[B1 C1 V3]	#	ᡑ0.ڄ.-�𑲤
-B;	xn--0-o7j.xn--9ib.xn----ek5i065b;	[B1 V3];	[B1 V3]	#	ᡑ0.ڄ.-�𑲤
-B;	xn--0-o7j263b.xn--9ib.xn----ek5i065b;	[B1 C1 V3];	[B1 C1 V3]	#	ᡑ0.ڄ.-�𑲤
-B;	xn--9ib722gbw95a.xn----ek5i065b;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]	#	ᡑ🄀ڄ.-�𑲤
-B;	xn--9ib722gvtfi563c.xn----ek5i065b;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	ᡑ🄀ڄ.-�𑲤
-B;	�。�넯򞵲;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	�。�넯򞵲;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	xn--4e9e.xn--l60bj21opd57g;	[B2 B3 V6];	[B2 B3 V6]
-B;	᠇Ⴘ。\u0603Ⴈ�;	[B1 P1 V6];	[B1 P1 V6]	#	᠇Ⴘ.Ⴈ�
-B;	᠇ⴘ。\u0603ⴈ�;	[B1 P1 V6];	[B1 P1 V6]	#	᠇ⴘ.ⴈ�
-B;	xn--d6e009h.xn--lfb290rfu3z;	[B1 V6];	[B1 V6]	#	᠇ⴘ.ⴈ�
-B;	xn--wnd558a.xn--lfb465c1v87a;	[B1 V6];	[B1 V6]	#	᠇Ⴘ.Ⴈ�
-B;	⒚󠋑𞤰。牣\u0667Ⴜᣥ;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	⒚𞤰.牣٧Ⴜᣥ
-B;	19.󠋑𞤰。牣\u0667Ⴜᣥ;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	19.𞤰.牣٧Ⴜᣥ
-B;	19.󠋑𞤰。牣\u0667ⴜᣥ;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	19.𞤰.牣٧ⴜᣥ
-B;	19.󠋑𞤎。牣\u0667Ⴜᣥ;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	19.𞤰.牣٧Ⴜᣥ
-B;	19.xn--oe6h75760c.xn--gib404ccxgh00h;	[B1 B5 V6];	[B1 B5 V6]	#	19.𞤰.牣٧Ⴜᣥ
-B;	19.xn--oe6h75760c.xn--gib285gtxo2l9d;	[B1 B5 V6];	[B1 B5 V6]	#	19.𞤰.牣٧ⴜᣥ
-B;	⒚󠋑𞤰。牣\u0667ⴜᣥ;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	⒚𞤰.牣٧ⴜᣥ
-B;	⒚󠋑𞤎。牣\u0667Ⴜᣥ;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	⒚𞤰.牣٧Ⴜᣥ
-B;	xn--cthy466n29j3e.xn--gib404ccxgh00h;	[B1 B5 V6];	[B1 B5 V6]	#	⒚𞤰.牣٧Ⴜᣥ
-B;	xn--cthy466n29j3e.xn--gib285gtxo2l9d;	[B1 B5 V6];	[B1 B5 V6]	#	⒚𞤰.牣٧ⴜᣥ
-B;	-��⒈.Ⴓ;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	-��1..Ⴓ;	[B1 P1 V3 V6 A4_2];	[B1 P1 V3 V6 A4_2]
-B;	-��1..ⴓ;	[B1 V3 A4_2];	[B1 V3 A4_2]
-B;	xn---1-895nq11a..xn--blj;	[B1 V3 A4_2];	[B1 V3 A4_2]
-B;	xn---1-895nq11a..xn--rnd;	[B1 V3 V6 A4_2];	[B1 V3 V6 A4_2]
-B;	-��⒈.ⴓ;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	xn----ecp0206g90h.xn--blj;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn----ecp0206g90h.xn--rnd;	[B1 V3 V6];	[B1 V3 V6]
-T;	\u200C긃.榶-;	[C1 V3];	[V3]	#	긃.榶-
-N;	\u200C긃.榶-;	[C1 V3];	[C1 V3]	#	긃.榶-
-T;	\u200C긃.榶-;	[C1 V3];	[V3]	#	긃.榶-
-N;	\u200C긃.榶-;	[C1 V3];	[C1 V3]	#	긃.榶-
-B;	xn--ej0b.xn----d87b;	[V3];	[V3]
-B;	xn--0ug3307c.xn----d87b;	[C1 V3];	[C1 V3]	#	긃.榶-
-T;	뉓泓𜵽.\u09CD\u200D;	[P1 V5 V6];	[P1 V5 V6]	#	뉓泓.�
-N;	뉓泓𜵽.\u09CD\u200D;	[P1 V5 V6];	[P1 V5 V6]	#	뉓泓.�
-T;	뉓泓𜵽.\u09CD\u200D;	[P1 V5 V6];	[P1 V5 V6]	#	뉓泓.�
-N;	뉓泓𜵽.\u09CD\u200D;	[P1 V5 V6];	[P1 V5 V6]	#	뉓泓.�
-B;	xn--lwwp69lqs7m.xn--b7b;	[V5 V6];	[V5 V6]	#	뉓泓.�
-B;	xn--lwwp69lqs7m.xn--b7b605i;	[V5 V6];	[V5 V6]	#	뉓泓.�
-T;	\u200D�ß｡\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ß.ິ
-N;	\u200D�ß｡\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ß.ິ
-T;	\u200D�ß。\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ß.ິ
-N;	\u200D�ß。\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ß.ິ
-T;	\u200D�SS。\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ss.ິ
-N;	\u200D�SS。\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ss.ິ
-T;	\u200D�ss。\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ss.ິ
-N;	\u200D�ss。\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ss.ິ
-T;	\u200D�Ss。\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ss.ິ
-N;	\u200D�Ss。\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ss.ິ
-B;	xn--ss-ti3o.xn--57c638l8774i;	[B1 V5 V6];	[B1 V5 V6]	#	�ss.ິ
-B;	xn--ss-l1t5169j.xn--57c638l8774i;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	�ss.ິ
-B;	xn--zca770nip7n.xn--57c638l8774i;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	�ß.ິ
-T;	\u200D�SS｡\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ss.ິ
-N;	\u200D�SS｡\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ss.ິ
-T;	\u200D�ss｡\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ss.ິ
-N;	\u200D�ss｡\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ss.ິ
-T;	\u200D�Ss｡\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ss.ິ
-N;	\u200D�Ss｡\u0EB4\u2B75񪅌;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ss.ິ
-B;	\u1B44．\u1BAA-≮≠;	[P1 V5 V6];	[P1 V5 V6]	#	᭄.᮪-≮≠
-B;	\u1B44．\u1BAA-<\u0338=\u0338;	[P1 V5 V6];	[P1 V5 V6]	#	᭄.᮪-≮≠
-B;	\u1B44.\u1BAA-≮≠;	[P1 V5 V6];	[P1 V5 V6]	#	᭄.᮪-≮≠
-B;	\u1B44.\u1BAA-<\u0338=\u0338;	[P1 V5 V6];	[P1 V5 V6]	#	᭄.᮪-≮≠
-B;	xn--1uf.xn----nmlz65aub;	[V5 V6];	[V5 V6]	#	᭄.᮪-≮≠
-B;	\u1BF3Ⴑ\u115F．𑄴Ⅎ;	[P1 V5 V6];	[P1 V5 V6]	#	᯳Ⴑ.𑄴Ⅎ
-B;	\u1BF3Ⴑ\u115F.𑄴Ⅎ;	[P1 V5 V6];	[P1 V5 V6]	#	᯳Ⴑ.𑄴Ⅎ
-B;	\u1BF3ⴑ\u115F.𑄴ⅎ;	[P1 V5 V6];	[P1 V5 V6]	#	᯳ⴑ.𑄴ⅎ
-B;	\u1BF3Ⴑ\u115F.𑄴ⅎ;	[P1 V5 V6];	[P1 V5 V6]	#	᯳Ⴑ.𑄴ⅎ
-B;	xn--pnd26a55x.xn--73g3065g;	[V5 V6];	[V5 V6]	#	᯳Ⴑ.𑄴ⅎ
-B;	xn--osd925cvyn.xn--73g3065g;	[V5 V6];	[V5 V6]	#	᯳ⴑ.𑄴ⅎ
-B;	xn--pnd26a55x.xn--f3g7465g;	[V5 V6];	[V5 V6]	#	᯳Ⴑ.𑄴Ⅎ
-B;	\u1BF3ⴑ\u115F．𑄴ⅎ;	[P1 V5 V6];	[P1 V5 V6]	#	᯳ⴑ.𑄴ⅎ
-B;	\u1BF3Ⴑ\u115F．𑄴ⅎ;	[P1 V5 V6];	[P1 V5 V6]	#	᯳Ⴑ.𑄴ⅎ
-B;	𜉆。Ⴃ��똯;	[B5 P1 V6];	[B5 P1 V6]
-B;	𜉆。Ⴃ��똯;	[B5 P1 V6];	[B5 P1 V6]
-B;	𜉆。ⴃ��똯;	[B5 P1 V6];	[B5 P1 V6]
-B;	𜉆。ⴃ��똯;	[B5 P1 V6];	[B5 P1 V6]
-B;	xn--187g.xn--ukjy205b8rscdeb;	[B5 V6];	[B5 V6]
-B;	xn--187g.xn--bnd4785f8r8bdeb;	[B5 V6];	[B5 V6]
-B;	�｡⳻󠙾󠄷\u3164;	[B1 P1 V6];	[B1 P1 V6]	#	�.⳻
-B;	�。⳻󠙾󠄷\u1160;	[B1 P1 V6];	[B1 P1 V6]	#	�.⳻
-B;	xn--pw9c.xn--psd742lxt32w;	[B1 V6];	[B1 V6]	#	�.⳻
-B;	xn--pw9c.xn--mkj83l4v899a;	[B1 V6];	[B1 V6]	#	�.⳻
-B;	\u079A⾇．\u071E-�;	[B2 B3];	[B2 B3]	#	ޚ舛.ܞ-�
-B;	\u079A舛.\u071E-�;	[B2 B3];	[B2 B3]	#	ޚ舛.ܞ-�
-B;	xn--7qb6383d.xn----20c3154q;	[B2 B3];	[B2 B3]	#	ޚ舛.ܞ-�
-B;	Ⴉ猕󹛫≮．︒;	[P1 V6];	[P1 V6]
-B;	Ⴉ猕󹛫<\u0338．︒;	[P1 V6];	[P1 V6]
-B;	Ⴉ猕󹛫≮.。;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	Ⴉ猕󹛫<\u0338.。;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	ⴉ猕󹛫<\u0338.。;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	ⴉ猕󹛫≮.。;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	xn--gdh892bbz0d5438s..;	[V6 A4_2];	[V6 A4_2]
-B;	xn--hnd212gz32d54x5r..;	[V6 A4_2];	[V6 A4_2]
-B;	ⴉ猕󹛫<\u0338．︒;	[P1 V6];	[P1 V6]
-B;	ⴉ猕󹛫≮．︒;	[P1 V6];	[P1 V6]
-B;	xn--gdh892bbz0d5438s.xn--y86c;	[V6];	[V6]
-B;	xn--hnd212gz32d54x5r.xn--y86c;	[V6];	[V6]
-B;	�｡\u062B鳳\u07E2󠅉;	[B1 B2];	[B1 B2]	#	�.ث鳳ߢ
-B;	�。\u062B鳳\u07E2󠅉;	[B1 B2];	[B1 B2]	#	�.ث鳳ߢ
-B;	xn--8m8h.xn--qgb29f6z90a;	[B1 B2];	[B1 B2]	#	�.ث鳳ߢ
-T;	\u200D�。ß;	[B1 C2];	[B1]	#	�.ß
-N;	\u200D�。ß;	[B1 C2];	[B1 C2]	#	�.ß
-T;	\u200D�。SS;	[B1 C2];	[B1]	#	�.ss
-N;	\u200D�。SS;	[B1 C2];	[B1 C2]	#	�.ss
-T;	\u200D�。ss;	[B1 C2];	[B1]	#	�.ss
-N;	\u200D�。ss;	[B1 C2];	[B1 C2]	#	�.ss
-T;	\u200D�。Ss;	[B1 C2];	[B1]	#	�.ss
-N;	\u200D�。Ss;	[B1 C2];	[B1 C2]	#	�.ss
-B;	xn--uo0d.ss;	[B1];	[B1]
-B;	xn--1ug9105g.ss;	[B1 C2];	[B1 C2]	#	�.ss
-B;	xn--1ug9105g.xn--zca;	[B1 C2];	[B1 C2]	#	�.ß
-T;	Å둄-．\u200C;	[C1 V3];	[V3]	#	å둄-.
-N;	Å둄-．\u200C;	[C1 V3];	[C1 V3]	#	å둄-.
-T;	A\u030A둄-．\u200C;	[C1 V3];	[V3]	#	å둄-.
-N;	A\u030A둄-．\u200C;	[C1 V3];	[C1 V3]	#	å둄-.
-T;	Å둄-.\u200C;	[C1 V3];	[V3]	#	å둄-.
-N;	Å둄-.\u200C;	[C1 V3];	[C1 V3]	#	å둄-.
-T;	A\u030A둄-.\u200C;	[C1 V3];	[V3]	#	å둄-.
-N;	A\u030A둄-.\u200C;	[C1 V3];	[C1 V3]	#	å둄-.
-T;	a\u030A둄-.\u200C;	[C1 V3];	[V3]	#	å둄-.
-N;	a\u030A둄-.\u200C;	[C1 V3];	[C1 V3]	#	å둄-.
-T;	å둄-.\u200C;	[C1 V3];	[V3]	#	å둄-.
-N;	å둄-.\u200C;	[C1 V3];	[C1 V3]	#	å둄-.
-B;	xn----1fa1788k.;	[V3];	[V3]
-B;	xn----1fa1788k.xn--0ug;	[C1 V3];	[C1 V3]	#	å둄-.
-T;	a\u030A둄-．\u200C;	[C1 V3];	[V3]	#	å둄-.
-N;	a\u030A둄-．\u200C;	[C1 V3];	[C1 V3]	#	å둄-.
-T;	å둄-．\u200C;	[C1 V3];	[V3]	#	å둄-.
-N;	å둄-．\u200C;	[C1 V3];	[C1 V3]	#	å둄-.
-B;	\u3099򬎑\u1DD7𞤀.򱲢-\u0953;	[B1 B6 P1 V5 V6];	[B1 B6 P1 V5 V6]	#	゙ᷗ𞤢.-॓
-B;	\u3099򬎑\u1DD7𞤢.򱲢-\u0953;	[B1 B6 P1 V5 V6];	[B1 B6 P1 V5 V6]	#	゙ᷗ𞤢.-॓
-B;	xn--veg121fwg63altj9d.xn----eyd92688s;	[B1 B6 V5 V6];	[B1 B6 V5 V6]	#	゙ᷗ𞤢.-॓
-T;	ς.ß񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ς.ß⵿
-N;	ς.ß񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ς.ß⵿
-B;	Σ.SS񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	σ.ss⵿
-B;	σ.ss񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	σ.ss⵿
-B;	Σ.ss񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	σ.ss⵿
-B;	xn--4xa.xn--ss-y8d4760biv60n;	[B5 B6 V6];	[B5 B6 V6]	#	σ.ss⵿
-T;	Σ.ß񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	σ.ß⵿
-N;	Σ.ß񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	σ.ß⵿
-T;	σ.ß񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	σ.ß⵿
-N;	σ.ß񴱄\u06DD\u2D7F;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	σ.ß⵿
-B;	xn--4xa.xn--zca281az71b8x73m;	[B5 B6 V6];	[B5 B6 V6]	#	σ.ß⵿
-B;	xn--3xa.xn--zca281az71b8x73m;	[B5 B6 V6];	[B5 B6 V6]	#	ς.ß⵿
-B;	ꡀ𞀟｡\u066B\u0599;	[B1];	[B1]	#	ꡀ𞀟.٫֙
-B;	ꡀ𞀟。\u066B\u0599;	[B1];	[B1]	#	ꡀ𞀟.٫֙
-B;	xn--8b9a1720d.xn--kcb33b;	[B1];	[B1]	#	ꡀ𞀟.٫֙
-T;	򈛉\u200C\u08A9｡⧅񘘡-�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	ࢩ.⧅-�
-N;	򈛉\u200C\u08A9｡⧅񘘡-�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	ࢩ.⧅-�
-T;	򈛉\u200C\u08A9。⧅񘘡-�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	ࢩ.⧅-�
-N;	򈛉\u200C\u08A9。⧅񘘡-�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	ࢩ.⧅-�
-B;	xn--yyb56242i.xn----zir1232guu71b;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	ࢩ.⧅-�
-B;	xn--yyb780jll63m.xn----zir1232guu71b;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	ࢩ.⧅-�
-T;	룱\u200D�\u200C。�︒;	[C1 C2 P1 V5 V6];	[P1 V5 V6]	#	룱.�︒
-N;	룱\u200D�\u200C。�︒;	[C1 C2 P1 V5 V6];	[C1 C2 P1 V5 V6]	#	룱.�︒
-T;	룱\u200D�\u200C。�︒;	[C1 C2 P1 V5 V6];	[P1 V5 V6]	#	룱.�︒
-N;	룱\u200D�\u200C。�︒;	[C1 C2 P1 V5 V6];	[C1 C2 P1 V5 V6]	#	룱.�︒
-T;	룱\u200D�\u200C。�。;	[C1 C2 P1 V5 V6];	[P1 V5 V6]	#	룱.�.
-N;	룱\u200D�\u200C。�。;	[C1 C2 P1 V5 V6];	[C1 C2 P1 V5 V6]	#	룱.�.
-T;	룱\u200D�\u200C。�。;	[C1 C2 P1 V5 V6];	[P1 V5 V6]	#	룱.�.
-N;	룱\u200D�\u200C。�。;	[C1 C2 P1 V5 V6];	[C1 C2 P1 V5 V6]	#	룱.�.
-B;	xn--ct2b0738h.xn--772h.;	[V5 V6];	[V5 V6]
-B;	xn--0ugb3358ili2v.xn--772h.;	[C1 C2 V5 V6];	[C1 C2 V5 V6]	#	룱.�.
-B;	xn--ct2b0738h.xn--y86cl899a;	[V5 V6];	[V5 V6]
-B;	xn--0ugb3358ili2v.xn--y86cl899a;	[C1 C2 V5 V6];	[C1 C2 V5 V6]	#	룱.�︒
-T;	🄄．\u1CDC⒈ß;	[P1 V5 V6];	[P1 V5 V6]	#	🄄.᳜⒈ß
-N;	🄄．\u1CDC⒈ß;	[P1 V5 V6];	[P1 V5 V6]	#	🄄.᳜⒈ß
-T;	3,.\u1CDC1.ß;	[P1 V5 V6];	[P1 V5 V6]	#	3,.᳜1.ß
-N;	3,.\u1CDC1.ß;	[P1 V5 V6];	[P1 V5 V6]	#	3,.᳜1.ß
-B;	3,.\u1CDC1.SS;	[P1 V5 V6];	[P1 V5 V6]	#	3,.᳜1.ss
-B;	3,.\u1CDC1.ss;	[P1 V5 V6];	[P1 V5 V6]	#	3,.᳜1.ss
-B;	3,.\u1CDC1.Ss;	[P1 V5 V6];	[P1 V5 V6]	#	3,.᳜1.ss
-B;	3,.xn--1-43l.ss;	[P1 V5 V6];	[P1 V5 V6]	#	3,.᳜1.ss
-B;	3,.xn--1-43l.xn--zca;	[P1 V5 V6];	[P1 V5 V6]	#	3,.᳜1.ß
-B;	🄄．\u1CDC⒈SS;	[P1 V5 V6];	[P1 V5 V6]	#	🄄.᳜⒈ss
-B;	🄄．\u1CDC⒈ss;	[P1 V5 V6];	[P1 V5 V6]	#	🄄.᳜⒈ss
-B;	🄄．\u1CDC⒈Ss;	[P1 V5 V6];	[P1 V5 V6]	#	🄄.᳜⒈ss
-B;	xn--x07h.xn--ss-k1r094b;	[V5 V6];	[V5 V6]	#	🄄.᳜⒈ss
-B;	xn--x07h.xn--zca344lmif;	[V5 V6];	[V5 V6]	#	🄄.᳜⒈ß
-B;	�\u2D7F｡𞼓򡄨�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	⵿.�
-B;	�\u2D7F。𞼓򡄨�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	⵿.�
-B;	xn--eoj16016a.xn--0v1d3848a3lr0d;	[B2 B3 V6];	[B2 B3 V6]	#	⵿.�
-T;	\u1DFD\u103A\u094D．≠\u200D㇛;	[C2 P1 V5 V6];	[P1 V5 V6]	#	်�᷽.≠㇛
-N;	\u1DFD\u103A\u094D．≠\u200D㇛;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	်�᷽.≠㇛
-T;	\u103A\u094D\u1DFD．≠\u200D㇛;	[C2 P1 V5 V6];	[P1 V5 V6]	#	်�᷽.≠㇛
-N;	\u103A\u094D\u1DFD．≠\u200D㇛;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	်�᷽.≠㇛
-T;	\u103A\u094D\u1DFD．=\u0338\u200D㇛;	[C2 P1 V5 V6];	[P1 V5 V6]	#	်�᷽.≠㇛
-N;	\u103A\u094D\u1DFD．=\u0338\u200D㇛;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	်�᷽.≠㇛
-T;	\u103A\u094D\u1DFD.≠\u200D㇛;	[C2 P1 V5 V6];	[P1 V5 V6]	#	်�᷽.≠㇛
-N;	\u103A\u094D\u1DFD.≠\u200D㇛;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	်�᷽.≠㇛
-T;	\u103A\u094D\u1DFD.=\u0338\u200D㇛;	[C2 P1 V5 V6];	[P1 V5 V6]	#	်�᷽.≠㇛
-N;	\u103A\u094D\u1DFD.=\u0338\u200D㇛;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	်�᷽.≠㇛
-B;	xn--n3b956a9zm.xn--1ch912d;	[V5 V6];	[V5 V6]	#	်�᷽.≠㇛
-B;	xn--n3b956a9zm.xn--1ug63gz5w;	[C2 V5 V6];	[C2 V5 V6]	#	်�᷽.≠㇛
-T;	Ⴁ�娤.\u200D\u033C\u0662𑖿;	[B1 C2 P1 V6];	[B1 P1 V5 V6]	#	Ⴁ�娤.̼٢𑖿
-N;	Ⴁ�娤.\u200D\u033C\u0662𑖿;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	Ⴁ�娤.̼٢𑖿
-T;	��娤.\u200D\u033C\u0662𑖿;	[B1 C2];	[B1 V5]	#	��娤.̼٢𑖿
-N;	��娤.\u200D\u033C\u0662𑖿;	[B1 C2];	[B1 C2]	#	��娤.̼٢𑖿
-B;	xn--skjw75lg29h.xn--9ta62nrv36a;	[B1 V5];	[B1 V5]	#	��娤.̼٢𑖿
-B;	xn--skjw75lg29h.xn--9ta62ngt6aou8t;	[B1 C2];	[B1 C2]	#	��娤.̼٢𑖿
-B;	xn--8md2578ag21g.xn--9ta62nrv36a;	[B1 V5 V6];	[B1 V5 V6]	#	Ⴁ�娤.̼٢𑖿
-B;	xn--8md2578ag21g.xn--9ta62ngt6aou8t;	[B1 C2 V6];	[B1 C2 V6]	#	Ⴁ�娤.̼٢𑖿
-T;	🄀Ⴄ\u0669\u0820。⒈\u0FB6ß;	[B1 P1 V6];	[B1 P1 V6]	#	🄀Ⴄ٩ࠠ.⒈ྶß
-N;	🄀Ⴄ\u0669\u0820。⒈\u0FB6ß;	[B1 P1 V6];	[B1 P1 V6]	#	🄀Ⴄ٩ࠠ.⒈ྶß
-T;	0.Ⴄ\u0669\u0820。1.\u0FB6ß;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	0.Ⴄ٩ࠠ.1.ྶß
-N;	0.Ⴄ\u0669\u0820。1.\u0FB6ß;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	0.Ⴄ٩ࠠ.1.ྶß
-T;	0.ⴄ\u0669\u0820。1.\u0FB6ß;	[B1 B5 B6 V5];	[B1 B5 B6 V5]	#	0.ⴄ٩ࠠ.1.ྶß
-N;	0.ⴄ\u0669\u0820。1.\u0FB6ß;	[B1 B5 B6 V5];	[B1 B5 B6 V5]	#	0.ⴄ٩ࠠ.1.ྶß
-B;	0.Ⴄ\u0669\u0820。1.\u0FB6SS;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	0.Ⴄ٩ࠠ.1.ྶss
-B;	0.ⴄ\u0669\u0820。1.\u0FB6ss;	[B1 B5 B6 V5];	[B1 B5 B6 V5]	#	0.ⴄ٩ࠠ.1.ྶss
-B;	0.Ⴄ\u0669\u0820。1.\u0FB6Ss;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	0.Ⴄ٩ࠠ.1.ྶss
-B;	0.xn--iib29f26o.1.xn--ss-1sj;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	0.Ⴄ٩ࠠ.1.ྶss
-B;	0.xn--iib29fp25e.1.xn--ss-1sj;	[B1 B5 B6 V5];	[B1 B5 B6 V5]	#	0.ⴄ٩ࠠ.1.ྶss
-B;	0.xn--iib29fp25e.1.xn--zca117e;	[B1 B5 B6 V5];	[B1 B5 B6 V5]	#	0.ⴄ٩ࠠ.1.ྶß
-B;	0.xn--iib29f26o.1.xn--zca117e;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	0.Ⴄ٩ࠠ.1.ྶß
-T;	🄀ⴄ\u0669\u0820。⒈\u0FB6ß;	[B1 P1 V6];	[B1 P1 V6]	#	🄀ⴄ٩ࠠ.⒈ྶß
-N;	🄀ⴄ\u0669\u0820。⒈\u0FB6ß;	[B1 P1 V6];	[B1 P1 V6]	#	🄀ⴄ٩ࠠ.⒈ྶß
-B;	🄀Ⴄ\u0669\u0820。⒈\u0FB6SS;	[B1 P1 V6];	[B1 P1 V6]	#	🄀Ⴄ٩ࠠ.⒈ྶss
-B;	🄀ⴄ\u0669\u0820。⒈\u0FB6ss;	[B1 P1 V6];	[B1 P1 V6]	#	🄀ⴄ٩ࠠ.⒈ྶss
-B;	🄀Ⴄ\u0669\u0820。⒈\u0FB6Ss;	[B1 P1 V6];	[B1 P1 V6]	#	🄀Ⴄ٩ࠠ.⒈ྶss
-B;	xn--iib29f26o6n43c.xn--ss-1sj588o;	[B1 V6];	[B1 V6]	#	🄀Ⴄ٩ࠠ.⒈ྶss
-B;	xn--iib29fp25e0219a.xn--ss-1sj588o;	[B1 V6];	[B1 V6]	#	🄀ⴄ٩ࠠ.⒈ྶss
-B;	xn--iib29fp25e0219a.xn--zca117e3vp;	[B1 V6];	[B1 V6]	#	🄀ⴄ٩ࠠ.⒈ྶß
-B;	xn--iib29f26o6n43c.xn--zca117e3vp;	[B1 V6];	[B1 V6]	#	🄀Ⴄ٩ࠠ.⒈ྶß
-T;	≠.\u200C-\u066B;	[B1 C1 P1 V6];	[B1 P1 V3 V6]	#	≠.-٫
-N;	≠.\u200C-\u066B;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	≠.-٫
-T;	=\u0338.\u200C-\u066B;	[B1 C1 P1 V6];	[B1 P1 V3 V6]	#	≠.-٫
-N;	=\u0338.\u200C-\u066B;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	≠.-٫
-B;	xn--1ch.xn----vqc;	[B1 V3 V6];	[B1 V3 V6]	#	≠.-٫
-B;	xn--1ch.xn----vqc597q;	[B1 C1 V6];	[B1 C1 V6]	#	≠.-٫
-B;	\u0660۱｡󠳶�\u0665;	[B1 P1 V6];	[B1 P1 V6]	#	٠۱.�٥
-B;	\u0660۱。󠳶�\u0665;	[B1 P1 V6];	[B1 P1 V6]	#	٠۱.�٥
-B;	xn--8hb40a.xn--eib7967vner3e;	[B1 V6];	[B1 V6]	#	Ù Û±.ðž �Ù¥
-T;	\u200C\u0663⒖。󱅉𽷛\u1BF3;	[B1 C1 P1 V6];	[B1 P1 V6]	#	٣⒖.᯳
-N;	\u200C\u0663⒖。󱅉𽷛\u1BF3;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	٣⒖.᯳
-T;	\u200C\u066315.。󱅉𽷛\u1BF3;	[B1 C1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	٣15..᯳
-N;	\u200C\u066315.。󱅉𽷛\u1BF3;	[B1 C1 P1 V6 A4_2];	[B1 C1 P1 V6 A4_2]	#	٣15..᯳
-B;	xn--15-gyd..xn--1zf13512buy41d;	[B1 V6 A4_2];	[B1 V6 A4_2]	#	٣15..᯳
-B;	xn--15-gyd983x..xn--1zf13512buy41d;	[B1 C1 V6 A4_2];	[B1 C1 V6 A4_2]	#	٣15..᯳
-B;	xn--cib675m.xn--1zf13512buy41d;	[B1 V6];	[B1 V6]	#	٣⒖.᯳
-B;	xn--cib152kwgd.xn--1zf13512buy41d;	[B1 C1 V6];	[B1 C1 V6]	#	٣⒖.᯳
-B;	\u1BF3.-逋񳦭󙙮;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	᯳.-逋
-B;	xn--1zf.xn----483d46987byr50b;	[V3 V5 V6];	[V3 V5 V6]	#	᯳.-逋
-T;	\u0756。\u3164\u200Dς;	[C2 P1 V6];	[P1 V6]	#	ݖ.ς
-N;	\u0756。\u3164\u200Dς;	[C2 P1 V6];	[C2 P1 V6]	#	ݖ.ς
-T;	\u0756。\u1160\u200Dς;	[C2 P1 V6];	[P1 V6]	#	ݖ.ς
-N;	\u0756。\u1160\u200Dς;	[C2 P1 V6];	[C2 P1 V6]	#	ݖ.ς
-T;	\u0756。\u1160\u200DΣ;	[C2 P1 V6];	[P1 V6]	#	ݖ.σ
-N;	\u0756。\u1160\u200DΣ;	[C2 P1 V6];	[C2 P1 V6]	#	ݖ.σ
-T;	\u0756。\u1160\u200Dσ;	[C2 P1 V6];	[P1 V6]	#	ݖ.σ
-N;	\u0756。\u1160\u200Dσ;	[C2 P1 V6];	[C2 P1 V6]	#	ݖ.σ
-B;	xn--9ob.xn--4xa380e;	[V6];	[V6]	#	ݖ.σ
-B;	xn--9ob.xn--4xa380ebol;	[C2 V6];	[C2 V6]	#	ݖ.σ
-B;	xn--9ob.xn--3xa580ebol;	[C2 V6];	[C2 V6]	#	Ý–.Ï‚
-T;	\u0756。\u3164\u200DΣ;	[C2 P1 V6];	[P1 V6]	#	ݖ.σ
-N;	\u0756。\u3164\u200DΣ;	[C2 P1 V6];	[C2 P1 V6]	#	ݖ.σ
-T;	\u0756。\u3164\u200Dσ;	[C2 P1 V6];	[P1 V6]	#	ݖ.σ
-N;	\u0756。\u3164\u200Dσ;	[C2 P1 V6];	[C2 P1 V6]	#	ݖ.σ
-B;	xn--9ob.xn--4xa574u;	[V6];	[V6]	#	ݖ.σ
-B;	xn--9ob.xn--4xa795lq2l;	[C2 V6];	[C2 V6]	#	ݖ.σ
-B;	xn--9ob.xn--3xa995lq2l;	[C2 V6];	[C2 V6]	#	Ý–.Ï‚
-T;	ᡆႣ｡󞢧\u0315\u200D\u200D;	[C2 P1 V6];	[P1 V6]	#	ᡆႣ.̕
-N;	ᡆႣ｡󞢧\u0315\u200D\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	ᡆႣ.̕
-T;	ᡆႣ。󞢧\u0315\u200D\u200D;	[C2 P1 V6];	[P1 V6]	#	ᡆႣ.̕
-N;	ᡆႣ。󞢧\u0315\u200D\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	ᡆႣ.̕
-T;	ᡆⴃ。󞢧\u0315\u200D\u200D;	[C2 P1 V6];	[P1 V6]	#	ᡆⴃ.̕
-N;	ᡆⴃ。󞢧\u0315\u200D\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	ᡆⴃ.̕
-B;	xn--57e237h.xn--5sa98523p;	[V6];	[V6]	#	ᡆⴃ.̕
-B;	xn--57e237h.xn--5sa649la993427a;	[C2 V6];	[C2 V6]	#	ᡆⴃ.̕
-B;	xn--bnd320b.xn--5sa98523p;	[V6];	[V6]	#	ᡆႣ.̕
-B;	xn--bnd320b.xn--5sa649la993427a;	[C2 V6];	[C2 V6]	#	ᡆႣ.̕
-T;	ᡆⴃ｡󞢧\u0315\u200D\u200D;	[C2 P1 V6];	[P1 V6]	#	ᡆⴃ.̕
-N;	ᡆⴃ｡󞢧\u0315\u200D\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	ᡆⴃ.̕
-T;	㭄\u200D\u084F𑚵．ς�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6]	#	㭄�𑚵.ς�
-N;	㭄\u200D\u084F𑚵．ς�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6 C1 C2]	#	㭄�𑚵.ς�
-T;	㭄\u200D\u084F𑚵.ς�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6]	#	㭄�𑚵.ς�
-N;	㭄\u200D\u084F𑚵.ς�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6 C1 C2]	#	㭄�𑚵.ς�
-T;	㭄\u200D\u084F𑚵.Σ�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6]	#	㭄�𑚵.σ�
-N;	㭄\u200D\u084F𑚵.Σ�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6 C1 C2]	#	㭄�𑚵.σ�
-T;	㭄\u200D\u084F𑚵.σ�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6]	#	㭄�𑚵.σ�
-N;	㭄\u200D\u084F𑚵.σ�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6 C1 C2]	#	㭄�𑚵.σ�
-B;	xn--ewb302xhu1l.xn--4xa0426k;	[B5 B6];	[B5 B6]	#	㭄�𑚵.σ�
-B;	xn--ewb962jfitku4r.xn--4xa695lda6932v;	[B5 B6 C1 C2];	[B5 B6 C1 C2]	#	㭄�𑚵.σ�
-B;	xn--ewb962jfitku4r.xn--3xa895lda6932v;	[B5 B6 C1 C2];	[B5 B6 C1 C2]	#	㭄�𑚵.ς�
-T;	㭄\u200D\u084F𑚵．Σ�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6]	#	㭄�𑚵.σ�
-N;	㭄\u200D\u084F𑚵．Σ�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6 C1 C2]	#	㭄�𑚵.σ�
-T;	㭄\u200D\u084F𑚵．σ�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6]	#	㭄�𑚵.σ�
-N;	㭄\u200D\u084F𑚵．σ�\u200C\u200D;	[B5 B6 C1 C2];	[B5 B6 C1 C2]	#	㭄�𑚵.σ�
-B;	\u17B5。𞯸ꡀ🄋;	[B1 B2 B3 B6 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	.ꡀ🄋
-B;	xn--03e.xn--8b9ar252dngd;	[B1 B2 B3 B6 V5 V6];	[B1 B2 B3 B6 V5 V6]	#	.ꡀ🄋
-B;	�暑．⾑\u0668;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	暑.襾٨
-B;	�暑.襾\u0668;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	暑.襾٨
-B;	xn--tlvq3513e.xn--hib9228d;	[B5 B6 V6];	[B5 B6 V6]	#	暑.襾٨
-B;	󠄚≯ꡢ。\u0891\u1DFF;	[B1 P1 V6];	[B1 P1 V6]	#	≯ꡢ.᷿
-B;	󠄚>\u0338ꡢ。\u0891\u1DFF;	[B1 P1 V6];	[B1 P1 V6]	#	≯ꡢ.᷿
-B;	xn--hdh7783c.xn--9xb680i;	[B1 V6];	[B1 V6]	#	≯ꡢ.᷿
-B;	\uFDC3�\u0B4D�.�Ⴗ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	كمم���.Ⴗ
-B;	\u0643\u0645\u0645�\u0B4D�.�Ⴗ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	كمم���.Ⴗ
-B;	\u0643\u0645\u0645�\u0B4D�.�ⴗ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	كمم���.ⴗ
-B;	xn--fhbea662czx68a2tju.xn--fljz2846h;	[B2 B3 V6];	[B2 B3 V6]	#	كمم���.ⴗ
-B;	xn--fhbea662czx68a2tju.xn--vnd55511o;	[B2 B3 V6];	[B2 B3 V6]	#	كمم���.Ⴗ
-B;	\uFDC3�\u0B4D�.�ⴗ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	كمم���.ⴗ
-B;	𞀨｡\u1B44򡛨𞎇;	[P1 V5 V6];	[P1 V5 V6]	#	𞀨.᭄
-B;	𞀨。\u1B44򡛨𞎇;	[P1 V5 V6];	[P1 V5 V6]	#	𞀨.᭄
-B;	xn--mi4h.xn--1uf6843smg20c;	[V5 V6];	[V5 V6]	#	𞀨.᭄
-T;	󠣼\u200C．�\u200Cᡟ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	.ᡟ
-N;	󠣼\u200C．�\u200Cᡟ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.ᡟ
-T;	󠣼\u200C.�\u200Cᡟ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	.ᡟ
-N;	󠣼\u200C.�\u200Cᡟ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.ᡟ
-B;	xn--q046e.xn--v8e7227j;	[B1 B2 B3 V6];	[B1 B2 B3 V6]
-B;	xn--0ug18531l.xn--v8e340bp21t;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	.á¡Ÿ
-T;	ᢛ󨅟ß.ጧ;	[P1 V6];	[P1 V6]
-N;	ᢛ󨅟ß.ጧ;	[P1 V6];	[P1 V6]
-B;	ᢛ󨅟SS.ጧ;	[P1 V6];	[P1 V6]
-B;	ᢛ󨅟ss.ጧ;	[P1 V6];	[P1 V6]
-B;	ᢛ󨅟Ss.ጧ;	[P1 V6];	[P1 V6]
-B;	xn--ss-7dp66033t.xn--p5d;	[V6];	[V6]
-B;	xn--zca562jc642x.xn--p5d;	[V6];	[V6]
-T;	â®’\u200C.ñ’š—\u200C;	[C1 P1 V6];	[P1 V6]	#	â®’.
-N;	â®’\u200C.ñ’š—\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	â®’.
-B;	xn--b9i.xn--5p9y;	[V6];	[V6]
-B;	xn--0ugx66b.xn--0ugz2871c;	[C1 V6];	[C1 V6]	#	â®’.
-B;	𞤂��。Ⴜ;	[B2 P1 V6];	[B2 P1 V6]
-B;	𞤤��。ⴜ;	[B2 P1 V6];	[B2 P1 V6]
-B;	xn--no0dr648a51o3b.xn--klj;	[B2 V6];	[B2 V6]
-B;	xn--no0dr648a51o3b.xn--0nd;	[B2 V6];	[B2 V6]
-B;	𞤂��。ⴜ;	[B2 P1 V6];	[B2 P1 V6]
-T;	�⮣\u200C𑄰｡񷴿\uFCB7;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	�⮣𑄰.ضم
-N;	�⮣\u200C𑄰｡񷴿\uFCB7;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	�⮣𑄰.ضم
-T;	�⮣\u200C𑄰。񷴿\u0636\u0645;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	�⮣𑄰.ضم
-N;	�⮣\u200C𑄰。񷴿\u0636\u0645;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	�⮣𑄰.ضم
-B;	xn--s9i5458e7yb.xn--1gb4a66004i;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	�⮣𑄰.ضم
-B;	xn--0ug586bcj8p7jc.xn--1gb4a66004i;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	�⮣𑄰.ضم
-T;	Ⴒ。デß𞤵\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デß𞤵�
-N;	Ⴒ。デß𞤵\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デß𞤵�
-T;	Ⴒ。テ\u3099ß𞤵\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デß𞤵�
-N;	Ⴒ。テ\u3099ß𞤵\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デß𞤵�
-T;	ⴒ。テ\u3099ß𞤵\u0C4D;	[B5 B6];	[B5 B6]	#	ⴒ.デß𞤵�
-N;	ⴒ。テ\u3099ß𞤵\u0C4D;	[B5 B6];	[B5 B6]	#	ⴒ.デß𞤵�
-T;	ⴒ。デß𞤵\u0C4D;	[B5 B6];	[B5 B6]	#	ⴒ.デß𞤵�
-N;	ⴒ。デß𞤵\u0C4D;	[B5 B6];	[B5 B6]	#	ⴒ.デß𞤵�
-B;	Ⴒ。デSS𞤓\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デss𞤵�
-B;	Ⴒ。テ\u3099SS𞤓\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デss𞤵�
-B;	ⴒ。テ\u3099ss𞤵\u0C4D;	[B5 B6];	[B5 B6]	#	ⴒ.デss𞤵�
-B;	ⴒ。デss𞤵\u0C4D;	[B5 B6];	[B5 B6]	#	ⴒ.デss𞤵�
-B;	Ⴒ。デSs𞤵\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デss𞤵�
-B;	Ⴒ。テ\u3099Ss𞤵\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デss𞤵�
-B;	xn--qnd.xn--ss-9nh3648ahh20b;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴒ.デss𞤵�
-B;	xn--9kj.xn--ss-9nh3648ahh20b;	[B5 B6];	[B5 B6]	#	ⴒ.デss𞤵�
-B;	xn--9kj.xn--zca669cmr3a0f28a;	[B5 B6];	[B5 B6]	#	ⴒ.デß𞤵�
-B;	xn--qnd.xn--zca669cmr3a0f28a;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴒ.デß𞤵�
-B;	Ⴒ。デSS𞤵\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デss𞤵�
-B;	Ⴒ。テ\u3099SS𞤵\u0C4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴒ.デss𞤵�
-B;	�\u0D4D．７-\u07D2;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.7-ߒ
-B;	�\u0D4D.7-\u07D2;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.7-ߒ
-B;	xn--wxc1283k.xn--7--yue;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.7-ߒ
-B;	≯𑜫󠭇.\u1734񒞤�ᢧ;	[P1 V5 V6];	[P1 V5 V6]	#	≯𑜫.᜴�ᢧ
-B;	>\u0338𑜫󠭇.\u1734񒞤�ᢧ;	[P1 V5 V6];	[P1 V5 V6]	#	≯𑜫.᜴�ᢧ
-B;	xn--hdhx157g68o0g.xn--c0e65eu616c34o7a;	[V5 V6];	[V5 V6]	#	≯𑜫.᜴�ᢧ
-B;	\u1DDB�Ⴗ�。\u0781;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᷛႷ�.�
-B;	\u1DDB�Ⴗ쏔。\u0781;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᷛႷ�.�
-B;	\u1DDB�ⴗ쏔。\u0781;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᷛⴗ�.�
-B;	\u1DDB�ⴗ�。\u0781;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᷛⴗ�.�
-B;	xn--zegy26dw47iy6w2f.xn--iqb;	[B1 V5 V6];	[B1 V5 V6]	#	ᷛⴗ�.�
-B;	xn--vnd148d733ky6n9e.xn--iqb;	[B1 V5 V6];	[B1 V5 V6]	#	ᷛႷ�.�
-T;	ß｡�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ß.�Ⴌྸ
-N;	ß｡�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ß.�Ⴌྸ
-T;	ß。�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ß.�Ⴌྸ
-N;	ß。�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ß.�Ⴌྸ
-T;	ß。�ⴌ\u0FB8;	ß.�ⴌ\u0FB8;	ss.xn--lgd921mvv0m;	NV8	#	ß.�ⴌྸ
-N;	ß。�ⴌ\u0FB8;	ß.�ⴌ\u0FB8;	xn--zca.xn--lgd921mvv0m;	NV8	#	ß.�ⴌྸ
-B;	SS。�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ss.�Ⴌྸ
-B;	ss。�ⴌ\u0FB8;	ss.�ⴌ\u0FB8;	ss.xn--lgd921mvv0m;	NV8	#	ss.�ⴌྸ
-B;	Ss。�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ss.�Ⴌྸ
-B;	ss.xn--lgd10cu829c;	[V6];	[V6]	#	ss.�Ⴌྸ
-B;	ss.xn--lgd921mvv0m;	ss.�ⴌ\u0FB8;	ss.xn--lgd921mvv0m;	NV8	#	ss.�ⴌྸ
-B;	ss.�ⴌ\u0FB8;	;	ss.xn--lgd921mvv0m;	NV8	#	ss.�ⴌྸ
-B;	SS.�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ss.�Ⴌྸ
-B;	Ss.�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ss.�Ⴌྸ
-B;	xn--zca.xn--lgd921mvv0m;	ß.�ⴌ\u0FB8;	xn--zca.xn--lgd921mvv0m;	NV8	#	ß.�ⴌྸ
-T;	ß.�ⴌ\u0FB8;	;	ss.xn--lgd921mvv0m;	NV8	#	ß.�ⴌྸ
-N;	ß.�ⴌ\u0FB8;	;	xn--zca.xn--lgd921mvv0m;	NV8	#	ß.�ⴌྸ
-B;	xn--zca.xn--lgd10cu829c;	[V6];	[V6]	#	ß.�Ⴌྸ
-T;	ß｡�ⴌ\u0FB8;	ß.�ⴌ\u0FB8;	ss.xn--lgd921mvv0m;	NV8	#	ß.�ⴌྸ
-N;	ß｡�ⴌ\u0FB8;	ß.�ⴌ\u0FB8;	xn--zca.xn--lgd921mvv0m;	NV8	#	ß.�ⴌྸ
-B;	SS｡�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ss.�Ⴌྸ
-B;	ss｡�ⴌ\u0FB8;	ss.�ⴌ\u0FB8;	ss.xn--lgd921mvv0m;	NV8	#	ss.�ⴌྸ
-B;	Ss｡�Ⴌ\u0FB8;	[P1 V6];	[P1 V6]	#	ss.�Ⴌྸ
-T;	-\u069E�.\u200C�\u09CD;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ڞ.身�
-N;	-\u069E�.\u200C�\u09CD;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	-ڞ.身�
-T;	-\u069E�.\u200C身\u09CD;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ڞ.身�
-N;	-\u069E�.\u200C身\u09CD;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	-ڞ.身�
-B;	xn----stc7013r.xn--b7b1419d;	[B1 V3 V6];	[B1 V3 V6]	#	-ڞ.身�
-B;	xn----stc7013r.xn--b7b305imj2f;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	-ڞ.身�
-T;	😮\u0764𑈵𞀖.💅\u200D;	[B1 C2];	[B1]	#	😮ݤ𑈵𞀖.💅
-N;	😮\u0764𑈵𞀖.💅\u200D;	[B1 C2];	[B1 C2]	#	😮ݤ𑈵𞀖.💅
-T;	😮\u0764𑈵𞀖.💅\u200D;	[B1 C2];	[B1]	#	😮ݤ𑈵𞀖.💅
-N;	😮\u0764𑈵𞀖.💅\u200D;	[B1 C2];	[B1 C2]	#	😮ݤ𑈵𞀖.💅
-B;	xn--opb4277kuc7elqsa.xn--kr8h;	[B1];	[B1]	#	😮ݤ𑈵𞀖.💅
-B;	xn--opb4277kuc7elqsa.xn--1ug5265p;	[B1 C2];	[B1 C2]	#	😮ݤ𑈵𞀖.💅
-T;	\u08F2\u200D꙳\u0712.�\u200C�;	[B1 B6 C1 C2 P1 V5 V6];	[B1 B6 P1 V5 V6]	#	ࣲ꙳ܒ.�
-N;	\u08F2\u200D꙳\u0712.�\u200C�;	[B1 B6 C1 C2 P1 V5 V6];	[B1 B6 C1 C2 P1 V5 V6]	#	ࣲ꙳ܒ.�
-B;	xn--cnb37gdy00a.xn--89e02253p;	[B1 B6 V5 V6];	[B1 B6 V5 V6]	#	ࣲ꙳ܒ.�
-B;	xn--cnb37g904be26j.xn--89e849ax9363a;	[B1 B6 C1 C2 V5 V6];	[B1 B6 C1 C2 V5 V6]	#	ࣲ꙳ܒ.�
-B;	Ⴑ．\u06BF𞯓ᠲ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	Ⴑ.ڿᠲ
-B;	Ⴑ.\u06BF𞯓ᠲ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	Ⴑ.ڿᠲ
-B;	ⴑ.\u06BF𞯓ᠲ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ⴑ.ڿᠲ
-B;	xn--8kj.xn--ykb840gd555a;	[B2 B3 V6];	[B2 B3 V6]	#	â´‘.Ú¿á ²
-B;	xn--pnd.xn--ykb840gd555a;	[B2 B3 V6];	[B2 B3 V6]	#	Ⴑ.ڿᠲ
-B;	ⴑ．\u06BF𞯓ᠲ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ⴑ.ڿᠲ
-B;	\u1A5A�\u0C4D。��;	[P1 V5 V6];	[P1 V5 V6]	#	ᩚ�.9
-B;	\u1A5A�\u0C4D。�9;	[P1 V5 V6];	[P1 V5 V6]	#	ᩚ�.9
-B;	xn--lqc703ebm93a.xn--9-000p;	[V5 V6];	[V5 V6]	#	ᩚ�.9
-T;	\u200C\u06A0𿺆�｡Ⴣ꒘\uFCD0�;	[B1 B5 C1 P1 V6];	[B2 B5 P1 V6]	#	ڠ9.Ⴣ꒘مخ
-N;	\u200C\u06A0𿺆�｡Ⴣ꒘\uFCD0�;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ڠ9.Ⴣ꒘مخ
-T;	\u200C\u06A0𿺆9。Ⴣ꒘\u0645\u062E�;	[B1 B5 C1 P1 V6];	[B2 B5 P1 V6]	#	ڠ9.Ⴣ꒘مخ
-N;	\u200C\u06A0𿺆9。Ⴣ꒘\u0645\u062E�;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ڠ9.Ⴣ꒘مخ
-T;	\u200C\u06A0𿺆9。ⴣ꒘\u0645\u062E�;	[B1 B5 C1 P1 V6];	[B2 B5 P1 V6]	#	ڠ9.ⴣ꒘مخ
-N;	\u200C\u06A0𿺆9。ⴣ꒘\u0645\u062E�;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ڠ9.ⴣ꒘مخ
-B;	xn--9-vtc42319e.xn--tgb9bz87p833hw316c;	[B2 B5 V6];	[B2 B5 V6]	#	ڠ9.ⴣ꒘مخ
-B;	xn--9-vtc736qts91g.xn--tgb9bz87p833hw316c;	[B1 B5 C1 V6];	[B1 B5 C1 V6]	#	ڠ9.ⴣ꒘مخ
-B;	xn--9-vtc42319e.xn--tgb9bz61cfn8mw3t2c;	[B2 B5 V6];	[B2 B5 V6]	#	ڠ9.Ⴣ꒘مخ
-B;	xn--9-vtc736qts91g.xn--tgb9bz61cfn8mw3t2c;	[B1 B5 C1 V6];	[B1 B5 C1 V6]	#	ڠ9.Ⴣ꒘مخ
-T;	\u200C\u06A0𿺆�｡ⴣ꒘\uFCD0�;	[B1 B5 C1 P1 V6];	[B2 B5 P1 V6]	#	ڠ9.ⴣ꒘مخ
-N;	\u200C\u06A0𿺆�｡ⴣ꒘\uFCD0�;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ڠ9.ⴣ꒘مخ
-B;	ᡖ｡\u031F񗛨\u0B82-;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ᡖ.̟ஂ-
-B;	ᡖ。\u031F񗛨\u0B82-;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ᡖ.̟ஂ-
-B;	xn--m8e.xn----mdb555dkk71m;	[V3 V5 V6];	[V3 V5 V6]	#	ᡖ.̟ஂ-
-B;	𞠠浘。絧𞀀;	[B2 B3];	[B2 B3]
-B;	xn--e0wp491f.xn--ud0a3573e;	[B2 B3];	[B2 B3]
-B;	\u0596Ⴋ．�≯︒\uFE0A;	[P1 V5 V6];	[P1 V5 V6]	#	֖Ⴋ.7≯︒
-B;	\u0596Ⴋ．�>\u0338︒\uFE0A;	[P1 V5 V6];	[P1 V5 V6]	#	֖Ⴋ.7≯︒
-B;	\u0596Ⴋ.7≯。\uFE0A;	[P1 V5 V6];	[P1 V5 V6]	#	֖Ⴋ.7≯.
-B;	\u0596Ⴋ.7>\u0338。\uFE0A;	[P1 V5 V6];	[P1 V5 V6]	#	֖Ⴋ.7≯.
-B;	\u0596ⴋ.7>\u0338。\uFE0A;	[P1 V5 V6];	[P1 V5 V6]	#	֖ⴋ.7≯.
-B;	\u0596ⴋ.7≯。\uFE0A;	[P1 V5 V6];	[P1 V5 V6]	#	֖ⴋ.7≯.
-B;	xn--hcb613r.xn--7-pgo.;	[V5 V6];	[V5 V6]	#	֖ⴋ.7≯.
-B;	xn--hcb887c.xn--7-pgo.;	[V5 V6];	[V5 V6]	#	֖Ⴋ.7≯.
-B;	\u0596ⴋ．�>\u0338︒\uFE0A;	[P1 V5 V6];	[P1 V5 V6]	#	֖ⴋ.7≯︒
-B;	\u0596ⴋ．�≯︒\uFE0A;	[P1 V5 V6];	[P1 V5 V6]	#	֖ⴋ.7≯︒
-B;	xn--hcb613r.xn--7-pgoy530h;	[V5 V6];	[V5 V6]	#	֖ⴋ.7≯︒
-B;	xn--hcb887c.xn--7-pgoy530h;	[V5 V6];	[V5 V6]	#	֖Ⴋ.7≯︒
-T;	\u200DF𑓂。󠺨︒\u077E�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	f𑓂.︒ݾ�
-N;	\u200DF𑓂。󠺨︒\u077E�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	f𑓂.︒ݾ�
-T;	\u200DF𑓂。󠺨。\u077E�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	f𑓂..ݾ�
-N;	\u200DF𑓂。󠺨。\u077E�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	f𑓂..ݾ�
-T;	\u200Df𑓂。󠺨。\u077E�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	f𑓂..ݾ�
-N;	\u200Df𑓂。󠺨。\u077E�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	f𑓂..ݾ�
-B;	xn--f-kq9i.xn--7656e.xn--fqb4175k;	[B1 V6];	[B1 V6]	#	f𑓂..ݾ�
-B;	xn--f-tgn9761i.xn--7656e.xn--fqb4175k;	[B1 C2 V6];	[B1 C2 V6]	#	f𑓂..ݾ�
-T;	\u200Df𑓂。󠺨︒\u077E�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	f𑓂.︒ݾ�
-N;	\u200Df𑓂。󠺨︒\u077E�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	f𑓂.︒ݾ�
-B;	xn--f-kq9i.xn--fqb1637j8hky9452a;	[B1 V6];	[B1 V6]	#	f𑓂.︒ݾ�
-B;	xn--f-tgn9761i.xn--fqb1637j8hky9452a;	[B1 C2 V6];	[B1 C2 V6]	#	f𑓂.︒ݾ�
-B;	\u0845🄇�︒｡�𑜫;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	ࡅ🄇︒.�𑜫
-B;	\u08456,�。。�𑜫;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	ࡅ6,..�𑜫
-B;	xn--6,-r4e4420y..xn--zo0di2m;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	ࡅ6,..�𑜫
-B;	xn--3vb4696jpxkjh7s.xn--zo0di2m;	[B1 B3 V6];	[B1 B3 V6]	#	ࡅ🄇︒.�𑜫
-B;	�.\u1DC0𑈱�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	.᷀𑈱�
-B;	xn--jn0d.xn--7dg0871h3lf;	[B1 V5 V6];	[B1 V5 V6]	#	.᷀𑈱�
-B;	Ⴂ䠺。𞤃�󙮦\u0693;	[B2 P1 V6];	[B2 P1 V6]	#	Ⴂ䠺.𞤥ړ
-B;	ⴂ䠺。𞤥�󙮦\u0693;	[B2 P1 V6];	[B2 P1 V6]	#	ⴂ䠺.𞤥ړ
-B;	xn--tkj638f.xn--pjb9818vg4xno967d;	[B2 V6];	[B2 V6]	#	ⴂ䠺.𞤥ړ
-B;	xn--9md875z.xn--pjb9818vg4xno967d;	[B2 V6];	[B2 V6]	#	Ⴂ䠺.𞤥ړ
-B;	ⴂ䠺。𞤃�󙮦\u0693;	[B2 P1 V6];	[B2 P1 V6]	#	ⴂ䠺.𞤥ړ
-B;	🄇�︒.𜙚\uA8C4;	[P1 V6];	[P1 V6]	#	🄇�︒.꣄
-B;	6,�。.𜙚\uA8C4;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	6,�..꣄
-B;	xn--6,-7i3c..xn--0f9ao925c;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	6,�..꣄
-B;	xn--woqs083bel0g.xn--0f9ao925c;	[V6];	[V6]	#	🄇�︒.꣄
-T;	\u200D�\uABED\uFFFB。\u200D�Ⴚ𑂹;	[B1 C2 P1 V6];	[B1 B2 B3 P1 V6]	#	�꯭.�Ⴚ𑂹
-N;	\u200D�\uABED\uFFFB。\u200D�Ⴚ𑂹;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�꯭.�Ⴚ𑂹
-T;	\u200D�\uABED\uFFFB。\u200D�ⴚ𑂹;	[B1 C2 P1 V6];	[B1 B2 B3 P1 V6]	#	�꯭.�ⴚ𑂹
-N;	\u200D�\uABED\uFFFB。\u200D�ⴚ𑂹;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�꯭.�ⴚ𑂹
-B;	xn--429az70n29i.xn--ilj7702eqyd;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	�꯭.�ⴚ𑂹
-B;	xn--1ugz126coy7bdbm.xn--1ug062chv7ov6e;	[B1 C2 V6];	[B1 C2 V6]	#	�꯭.�ⴚ𑂹
-B;	xn--429az70n29i.xn--ynd3619jqyd;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	�꯭.�Ⴚ𑂹
-B;	xn--1ugz126coy7bdbm.xn--ynd959evs1pv6e;	[B1 C2 V6];	[B1 C2 V6]	#	�꯭.�Ⴚ𑂹
-B;	󠆠．�󌟈;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	󠆠.�󌟈;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	.xn--rx21bhv12i;	[V6 A4_2];	[V6 A4_2]
-T;	�\u200CႦ.≠𞷙;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�Ⴆ.≠
-N;	�\u200CႦ.≠𞷙;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	�Ⴆ.≠
-T;	�\u200CႦ.=\u0338𞷙;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�Ⴆ.≠
-N;	�\u200CႦ.=\u0338𞷙;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	�Ⴆ.≠
-T;	�\u200Cⴆ.=\u0338𞷙;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�ⴆ.≠
-N;	�\u200Cⴆ.=\u0338𞷙;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	�ⴆ.≠
-T;	�\u200Cⴆ.≠𞷙;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�ⴆ.≠
-N;	�\u200Cⴆ.≠𞷙;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	�ⴆ.≠
-B;	xn--xkjz802e.xn--1ch2802p;	[B1 B2 B3 V6];	[B1 B2 B3 V6]
-B;	xn--0ug132csv7o.xn--1ch2802p;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	�ⴆ.≠
-B;	xn--end1719j.xn--1ch2802p;	[B1 B2 B3 V6];	[B1 B2 B3 V6]
-B;	xn--end799ekr1p.xn--1ch2802p;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	�Ⴆ.≠
-B;	�𙩢�ꘌ．\u0841;	[B1 P1 V6];	[B1 P1 V6]	#	3ꘌ.�
-B;	�𙩢3ꘌ.\u0841;	[B1 P1 V6];	[B1 P1 V6]	#	3ꘌ.�
-B;	xn--3-0g3es485d8i15h.xn--zvb;	[B1 V6];	[B1 V6]	#	3ꘌ.�
-B;	-.\u1886󡲣-;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-.ᢆ-
-B;	-.xn----pbkx6497q;	[V3 V5 V6];	[V3 V5 V6]	#	-.ᢆ-
-T;	󲚗\u200C｡\u200C𞰆ς;	[B1 B6 C1 P1 V6];	[B2 B3 P1 V6]	#	.ς
-N;	󲚗\u200C｡\u200C𞰆ς;	[B1 B6 C1 P1 V6];	[B1 B6 C1 P1 V6]	#	.ς
-T;	󲚗\u200C。\u200C𞰆ς;	[B1 B6 C1 P1 V6];	[B2 B3 P1 V6]	#	.ς
-N;	󲚗\u200C。\u200C𞰆ς;	[B1 B6 C1 P1 V6];	[B1 B6 C1 P1 V6]	#	.ς
-T;	󲚗\u200C。\u200C𞰆Σ;	[B1 B6 C1 P1 V6];	[B2 B3 P1 V6]	#	.σ
-N;	󲚗\u200C。\u200C𞰆Σ;	[B1 B6 C1 P1 V6];	[B1 B6 C1 P1 V6]	#	.σ
-T;	󲚗\u200C。\u200C𞰆σ;	[B1 B6 C1 P1 V6];	[B2 B3 P1 V6]	#	.σ
-N;	󲚗\u200C。\u200C𞰆σ;	[B1 B6 C1 P1 V6];	[B1 B6 C1 P1 V6]	#	.σ
-B;	xn--qp42f.xn--4xa3011w;	[B2 B3 V6];	[B2 B3 V6]
-B;	xn--0ug76062m.xn--4xa595lhn92a;	[B1 B6 C1 V6];	[B1 B6 C1 V6]	#	.σ
-B;	xn--0ug76062m.xn--3xa795lhn92a;	[B1 B6 C1 V6];	[B1 B6 C1 V6]	#	.Ï‚
-T;	󲚗\u200C｡\u200C𞰆Σ;	[B1 B6 C1 P1 V6];	[B2 B3 P1 V6]	#	.σ
-N;	󲚗\u200C｡\u200C𞰆Σ;	[B1 B6 C1 P1 V6];	[B1 B6 C1 P1 V6]	#	.σ
-T;	󲚗\u200C｡\u200C𞰆σ;	[B1 B6 C1 P1 V6];	[B2 B3 P1 V6]	#	.σ
-N;	󲚗\u200C｡\u200C𞰆σ;	[B1 B6 C1 P1 V6];	[B1 B6 C1 P1 V6]	#	.σ
-T;	堕𑓂\u1B02。�𞤽\u200C-;	[B3 C1 V3];	[B3 V3]	#	堕𑓂ᬂ.�𞤽-
-N;	堕𑓂\u1B02。�𞤽\u200C-;	[B3 C1 V3];	[B3 C1 V3]	#	堕𑓂ᬂ.�𞤽-
-T;	堕𑓂\u1B02。�𞤛\u200C-;	[B3 C1 V3];	[B3 V3]	#	堕𑓂ᬂ.�𞤽-
-N;	堕𑓂\u1B02。�𞤛\u200C-;	[B3 C1 V3];	[B3 C1 V3]	#	堕𑓂ᬂ.�𞤽-
-B;	xn--5sf345zdk8h.xn----iv5iw606c;	[B3 V3];	[B3 V3]	#	堕𑓂ᬂ.�𞤽-
-B;	xn--5sf345zdk8h.xn----rgnt157hwl9g;	[B3 C1 V3];	[B3 C1 V3]	#	堕𑓂ᬂ.�𞤽-
-T;	��ᡕ𞤢｡ᡥς\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥςتς
-N;	��ᡕ𞤢｡ᡥς\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥςتς
-T;	��ᡕ𞤢。ᡥς\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥςتς
-N;	��ᡕ𞤢。ᡥς\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥςتς
-B;	��ᡕ𞤀。ᡥΣ\u062AΣ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-B;	��ᡕ𞤢。ᡥσ\u062Aσ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-B;	��ᡕ𞤀。ᡥΣ\u062Aσ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-B;	xn--l8e1317j1ebz456b.xn--4xaa85plx4a;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-T;	��ᡕ𞤀。ᡥΣ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-N;	��ᡕ𞤀。ᡥΣ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-T;	��ᡕ𞤢。ᡥσ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-N;	��ᡕ𞤢。ᡥσ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-B;	xn--l8e1317j1ebz456b.xn--3xab95plx4a;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-B;	xn--l8e1317j1ebz456b.xn--3xaa16plx4a;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥςتς
-B;	��ᡕ𞤀｡ᡥΣ\u062AΣ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-B;	��ᡕ𞤢｡ᡥσ\u062Aσ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-B;	��ᡕ𞤀｡ᡥΣ\u062Aσ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-T;	��ᡕ𞤀｡ᡥΣ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-N;	��ᡕ𞤀｡ᡥΣ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-T;	��ᡕ𞤢｡ᡥσ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-N;	��ᡕ𞤢｡ᡥσ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-B;	��ᡕ𞤢。ᡥΣ\u062AΣ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-B;	��ᡕ𞤢。ᡥΣ\u062Aσ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-T;	��ᡕ𞤢。ᡥΣ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-N;	��ᡕ𞤢。ᡥΣ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-B;	��ᡕ𞤢｡ᡥΣ\u062AΣ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-B;	��ᡕ𞤢｡ᡥΣ\u062Aσ;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتσ
-T;	��ᡕ𞤢｡ᡥΣ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-N;	��ᡕ𞤢｡ᡥΣ\u062Aς;	[B1 B5];	[B1 B5]	#	��ᡕ𞤢.ᡥσتς
-T;	�．-�ß;	[P1 V3 V6];	[P1 V3 V6]
-N;	�．-�ß;	[P1 V3 V6];	[P1 V3 V6]
-T;	�.-5ß;	[P1 V3 V6];	[P1 V3 V6]
-N;	�.-5ß;	[P1 V3 V6];	[P1 V3 V6]
-B;	ó�’°.-5SS;	[P1 V3 V6];	[P1 V3 V6]
-B;	ó�’°.-5ss;	[P1 V3 V6];	[P1 V3 V6]
-B;	ó�’°.-5Ss;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn--t960e.-5ss;	[V3 V6];	[V3 V6]
-B;	xn--t960e.xn---5-hia;	[V3 V6];	[V3 V6]
-B;	�．-�SS;	[P1 V3 V6];	[P1 V3 V6]
-B;	�．-�ss;	[P1 V3 V6];	[P1 V3 V6]
-B;	�．-�Ss;	[P1 V3 V6];	[P1 V3 V6]
-T;	\u200D�.🤒Ⴥ򑮶;	[C2 P1 V6];	[P1 V5 V6]	#	�.🤒Ⴥ
-N;	\u200D�.🤒Ⴥ򑮶;	[C2 P1 V6];	[C2 P1 V6]	#	�.🤒Ⴥ
-T;	\u200D�.🤒ⴥ򑮶;	[C2 P1 V6];	[P1 V5 V6]	#	�.🤒ⴥ
-N;	\u200D�.🤒ⴥ򑮶;	[C2 P1 V6];	[C2 P1 V6]	#	�.🤒ⴥ
-B;	xn--0s9c.xn--tljz038l0gz4b;	[V5 V6];	[V5 V6]
-B;	xn--1ug9533g.xn--tljz038l0gz4b;	[C2 V6];	[C2 V6]	#	�.🤒ⴥ
-B;	xn--0s9c.xn--9nd3211w0gz4b;	[V5 V6];	[V5 V6]
-B;	xn--1ug9533g.xn--9nd3211w0gz4b;	[C2 V6];	[C2 V6]	#	�.🤒Ⴥ
-T;	𵋅。ß𬵩\u200D;	[C2 P1 V6];	[P1 V6]	#	.ß𬵩
-N;	𵋅。ß𬵩\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	.ß𬵩
-T;	𵋅。SS𬵩\u200D;	[C2 P1 V6];	[P1 V6]	#	.ss𬵩
-N;	𵋅。SS𬵩\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	.ss𬵩
-T;	𵋅。ss𬵩\u200D;	[C2 P1 V6];	[P1 V6]	#	.ss𬵩
-N;	𵋅。ss𬵩\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	.ss𬵩
-T;	𵋅。Ss𬵩\u200D;	[C2 P1 V6];	[P1 V6]	#	.ss𬵩
-N;	𵋅。Ss𬵩\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	.ss𬵩
-B;	xn--ey1p.xn--ss-eq36b;	[V6];	[V6]
-B;	xn--ey1p.xn--ss-n1tx0508a;	[C2 V6];	[C2 V6]	#	.ss𬵩
-B;	xn--ey1p.xn--zca870nz438b;	[C2 V6];	[C2 V6]	#	.ß𬵩
-T;	\u200C�。\u07F1\u0301𞹻;	[B1 C1 V5];	[B1 V5]	#	�.߱�غ
-N;	\u200C�。\u07F1\u0301𞹻;	[B1 C1 V5];	[B1 C1 V5]	#	�.߱�غ
-T;	\u200C�。\u07F1\u0301\u063A;	[B1 C1 V5];	[B1 V5]	#	�.߱�غ
-N;	\u200C�。\u07F1\u0301\u063A;	[B1 C1 V5];	[B1 C1 V5]	#	�.߱�غ
-B;	xn--634m.xn--lsa46nuub;	[B1 V5];	[B1 V5]	#	�.߱�غ
-B;	xn--0ugy003y.xn--lsa46nuub;	[B1 C1 V5];	[B1 C1 V5]	#	�.߱�غ
-T;	𞼌\u200C𑈶。�;	[B1 B3 C1 P1 V6];	[B1 P1 V6]	#	𑈶.�
-N;	𞼌\u200C𑈶。�;	[B1 B3 C1 P1 V6];	[B1 B3 C1 P1 V6]	#	𑈶.�
-B;	xn--9g1d1288a.xn--8n0d;	[B1 V6];	[B1 V6]
-B;	xn--0ug7946gzpxf.xn--8n0d;	[B1 B3 C1 V6];	[B1 B3 C1 V6]	#	𑈶.�
-T;	󠅯򇽭\u200C🜭｡𑖿\u1ABBς≠;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻ς≠
-N;	󠅯򇽭\u200C🜭｡𑖿\u1ABBς≠;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻ς≠
-T;	󠅯򇽭\u200C🜭｡𑖿\u1ABBς=\u0338;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻ς≠
-N;	󠅯򇽭\u200C🜭｡𑖿\u1ABBς=\u0338;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻ς≠
-T;	󠅯򇽭\u200C🜭。𑖿\u1ABBς≠;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻ς≠
-N;	󠅯򇽭\u200C🜭。𑖿\u1ABBς≠;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻ς≠
-T;	󠅯򇽭\u200C🜭。𑖿\u1ABBς=\u0338;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻ς≠
-N;	󠅯򇽭\u200C🜭。𑖿\u1ABBς=\u0338;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻ς≠
-T;	󠅯򇽭\u200C🜭。𑖿\u1ABBΣ=\u0338;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻σ≠
-N;	󠅯򇽭\u200C🜭。𑖿\u1ABBΣ=\u0338;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻σ≠
-T;	󠅯򇽭\u200C🜭。𑖿\u1ABBΣ≠;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻σ≠
-N;	󠅯򇽭\u200C🜭。𑖿\u1ABBΣ≠;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻σ≠
-T;	󠅯򇽭\u200C🜭。𑖿\u1ABBσ≠;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻σ≠
-N;	󠅯򇽭\u200C🜭。𑖿\u1ABBσ≠;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻σ≠
-T;	󠅯򇽭\u200C🜭。𑖿\u1ABBσ=\u0338;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻σ≠
-N;	󠅯򇽭\u200C🜭。𑖿\u1ABBσ=\u0338;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻σ≠
-B;	xn--zb9h5968x.xn--4xa378i1mfjw7y;	[V5 V6];	[V5 V6]	#	🜭.𑖿᪻σ≠
-B;	xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y;	[C1 V5 V6];	[C1 V5 V6]	#	🜭.𑖿᪻σ≠
-B;	xn--0ug3766p5nm1b.xn--3xa578i1mfjw7y;	[C1 V5 V6];	[C1 V5 V6]	#	🜭.𑖿᪻ς≠
-T;	󠅯򇽭\u200C🜭｡𑖿\u1ABBΣ=\u0338;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻σ≠
-N;	󠅯򇽭\u200C🜭｡𑖿\u1ABBΣ=\u0338;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻σ≠
-T;	󠅯򇽭\u200C🜭｡𑖿\u1ABBΣ≠;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻σ≠
-N;	󠅯򇽭\u200C🜭｡𑖿\u1ABBΣ≠;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻σ≠
-T;	󠅯򇽭\u200C🜭｡𑖿\u1ABBσ≠;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻σ≠
-N;	󠅯򇽭\u200C🜭｡𑖿\u1ABBσ≠;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻σ≠
-T;	󠅯򇽭\u200C🜭｡𑖿\u1ABBσ=\u0338;	[C1 P1 V5 V6];	[P1 V5 V6]	#	🜭.𑖿᪻σ≠
-N;	󠅯򇽭\u200C🜭｡𑖿\u1ABBσ=\u0338;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	🜭.𑖿᪻σ≠
-T;	⒋｡⒈\u200D򳴢;	[C2 P1 V6];	[P1 V6]	#	⒋.⒈
-N;	⒋｡⒈\u200D򳴢;	[C2 P1 V6];	[C2 P1 V6]	#	⒋.⒈
-T;	4.。1.\u200D򳴢;	[C2 P1 V6 A4_2];	[P1 V6 A4_2]	#	4..1.
-N;	4.。1.\u200D򳴢;	[C2 P1 V6 A4_2];	[C2 P1 V6 A4_2]	#	4..1.
-B;	4..1.xn--sf51d;	[V6 A4_2];	[V6 A4_2]
-B;	4..1.xn--1ug64613i;	[C2 V6 A4_2];	[C2 V6 A4_2]	#	4..1.
-B;	xn--wsh.xn--tsh07994h;	[V6];	[V6]
-B;	xn--wsh.xn--1ug58o74922a;	[C2 V6];	[C2 V6]	#	â’‹.â’ˆ
-T;	\u0644ß｡�\u1A60򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لß.᩠�𞤾
-N;	\u0644ß｡�\u1A60򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لß.᩠�𞤾
-T;	\u0644ß｡\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لß.᩠�𞤾
-N;	\u0644ß｡\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لß.᩠�𞤾
-T;	\u0644ß。\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لß.᩠�𞤾
-N;	\u0644ß。\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لß.᩠�𞤾
-B;	\u0644SS。\u1A60�򾅢𞤜;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644ss。\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644Ss。\u1A60�򾅢𞤜;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	xn--ss-svd.xn--jof2298hn83fln78f;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	لss.᩠�𞤾
-B;	xn--zca57y.xn--jof2298hn83fln78f;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	لß.᩠�𞤾
-B;	\u0644SS｡\u1A60�򾅢𞤜;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644ss｡\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644Ss｡\u1A60�򾅢𞤜;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644SS｡�\u1A60򾅢𞤜;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644ss｡�\u1A60򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644Ss｡�\u1A60򾅢𞤜;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644SS。\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644Ss。\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644SS｡\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644Ss｡\u1A60�򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644SS｡�\u1A60򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	\u0644Ss｡�\u1A60򾅢𞤾;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	لss.᩠�𞤾
-B;	�𑄳񼜲.\u1DDF\u17B8\uA806𑜫;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	�𑄳.ᷟី꠆𑜫
-B;	xn--1o0di0c0652w.xn--33e362arr1l153d;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	�𑄳.ᷟី꠆𑜫
-T;	Ⴓ𑜫\u200D򗭓．\u06A7𑰶;	[P1 V6];	[P1 V6]	#	Ⴓ𑜫.ڧ𑰶
-N;	Ⴓ𑜫\u200D򗭓．\u06A7𑰶;	[P1 V6];	[P1 V6]	#	Ⴓ𑜫.ڧ𑰶
-T;	Ⴓ𑜫\u200D򗭓.\u06A7𑰶;	[P1 V6];	[P1 V6]	#	Ⴓ𑜫.ڧ𑰶
-N;	Ⴓ𑜫\u200D򗭓.\u06A7𑰶;	[P1 V6];	[P1 V6]	#	Ⴓ𑜫.ڧ𑰶
-T;	ⴓ𑜫\u200D򗭓.\u06A7𑰶;	[P1 V6];	[P1 V6]	#	ⴓ𑜫.ڧ𑰶
-N;	ⴓ𑜫\u200D򗭓.\u06A7𑰶;	[P1 V6];	[P1 V6]	#	ⴓ𑜫.ڧ𑰶
-B;	xn--blj6306ey091d.xn--9jb4223l;	[V6];	[V6]	#	ⴓ𑜫.ڧ𑰶
-B;	xn--1ugy52cym7p7xu5e.xn--9jb4223l;	[V6];	[V6]	#	ⴓ𑜫.ڧ𑰶
-B;	xn--rnd8945ky009c.xn--9jb4223l;	[V6];	[V6]	#	Ⴓ𑜫.ڧ𑰶
-B;	xn--rnd479ep20q7x12e.xn--9jb4223l;	[V6];	[V6]	#	Ⴓ𑜫.ڧ𑰶
-T;	ⴓ𑜫\u200D򗭓．\u06A7𑰶;	[P1 V6];	[P1 V6]	#	ⴓ𑜫.ڧ𑰶
-N;	ⴓ𑜫\u200D򗭓．\u06A7𑰶;	[P1 V6];	[P1 V6]	#	ⴓ𑜫.ڧ𑰶
-B;	�.🄆—;	[P1 V5 V6];	[P1 V5 V6]
-B;	�.5,—;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--0s9c.xn--5,-81t;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--0s9c.xn--8ug8324p;	[V5 V6];	[V5 V6]
-B;	򔊱�۸。󠾭-;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn--lmb18944c0g2z.xn----2k81m;	[V3 V6];	[V3 V6]
-B;	𼗸\u07CD�。\u06DDᡎᠴ;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	��.ᡎᠴ
-B;	xn--osb0855kcc2r.xn--tlb299fhc;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	��.ᡎᠴ
-T;	\u200DᠮႾ🄂.🚗\u0841𮹌\u200C;	[B1 C1 C2 P1 V6];	[B1 P1 V6]	#	ᠮႾ🄂.🚗�
-N;	\u200DᠮႾ🄂.🚗\u0841𮹌\u200C;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	ᠮႾ🄂.🚗�
-T;	\u200DᠮႾ1,.🚗\u0841𮹌\u200C;	[B1 C1 C2 P1 V6];	[B1 B6 P1 V6]	#	ᠮႾ1,.🚗�
-N;	\u200DᠮႾ1,.🚗\u0841𮹌\u200C;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	ᠮႾ1,.🚗�
-T;	\u200Dᠮⴞ1,.🚗\u0841𮹌\u200C;	[B1 C1 C2 P1 V6];	[B1 B6 P1 V6]	#	ᠮⴞ1,.🚗�
-N;	\u200Dᠮⴞ1,.🚗\u0841𮹌\u200C;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	ᠮⴞ1,.🚗�
-B;	xn--1,-v3o625k.xn--zvb3124wpkpf;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	ᠮⴞ1,.🚗�
-B;	xn--1,-v3o161c53q.xn--zvb692j9664aic1g;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	ᠮⴞ1,.🚗�
-B;	xn--1,-ogkx89c.xn--zvb3124wpkpf;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	ᠮႾ1,.🚗�
-B;	xn--1,-ogkx89c39j.xn--zvb692j9664aic1g;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	ᠮႾ1,.🚗�
-T;	\u200Dᠮⴞ🄂.🚗\u0841𮹌\u200C;	[B1 C1 C2 P1 V6];	[B1 P1 V6]	#	ᠮⴞ🄂.🚗�
-N;	\u200Dᠮⴞ🄂.🚗\u0841𮹌\u200C;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	ᠮⴞ🄂.🚗�
-B;	xn--h7e438h1p44a.xn--zvb3124wpkpf;	[B1 V6];	[B1 V6]	#	ᠮⴞ🄂.🚗�
-B;	xn--h7e341b0wlbv45b.xn--zvb692j9664aic1g;	[B1 C1 C2 V6];	[B1 C1 C2 V6]	#	ᠮⴞ🄂.🚗�
-B;	xn--2nd129ai554b.xn--zvb3124wpkpf;	[B1 V6];	[B1 V6]	#	ᠮႾ🄂.🚗�
-B;	xn--2nd129ay2gnw71c.xn--zvb692j9664aic1g;	[B1 C1 C2 V6];	[B1 C1 C2 V6]	#	ᠮႾ🄂.🚗�
-B;	\u0601\u0697．𑚶񼡷⾆;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ڗ.𑚶舌
-B;	\u0601\u0697.𑚶񼡷舌;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ڗ.𑚶舌
-B;	xn--jfb41a.xn--tc1ap851axo39c;	[B1 V5 V6];	[B1 V5 V6]	#	ڗ.𑚶舌
-B;	🞅󠳡�.񲖷;	[P1 V6];	[P1 V6]
-B;	xn--ie9hi1349bqdlb.xn--oj69a;	[V6];	[V6]
-T;	\u20E7񯡎-�.4Ⴄ\u200C;	[C1 P1 V5 V6];	[P1 V5 V6]	#	⃧-.4Ⴄ
-N;	\u20E7񯡎-�.4Ⴄ\u200C;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	⃧-.4Ⴄ
-T;	\u20E7񯡎-�.4ⴄ\u200C;	[C1 P1 V5 V6];	[P1 V5 V6]	#	⃧-.4ⴄ
-N;	\u20E7񯡎-�.4ⴄ\u200C;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	⃧-.4ⴄ
-B;	xn----9snu5320fi76w.xn--4-ivs;	[V5 V6];	[V5 V6]	#	⃧-.4ⴄ
-B;	xn----9snu5320fi76w.xn--4-sgn589c;	[C1 V5 V6];	[C1 V5 V6]	#	⃧-.4ⴄ
-B;	xn----9snu5320fi76w.xn--4-f0g;	[V5 V6];	[V5 V6]	#	⃧-.4Ⴄ
-B;	xn----9snu5320fi76w.xn--4-f0g649i;	[C1 V5 V6];	[C1 V5 V6]	#	⃧-.4Ⴄ
-T;	ᚭ｡�ß𖫱;	ᚭ.�ß𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-N;	ᚭ｡�ß𖫱;	ᚭ.�ß𖫱;	xn--hwe.xn--zca4946pblnc;	NV8
-T;	ᚭ。�ß𖫱;	ᚭ.�ß𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-N;	ᚭ。�ß𖫱;	ᚭ.�ß𖫱;	xn--hwe.xn--zca4946pblnc;	NV8
-B;	ᚭ。�SS𖫱;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	ᚭ。�ss𖫱;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	ᚭ。�Ss𖫱;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	xn--hwe.xn--ss-ci1ub261a;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	ᚭ.�ss𖫱;	;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	ᚭ.�SS𖫱;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	ᚭ.�Ss𖫱;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	xn--hwe.xn--zca4946pblnc;	ᚭ.�ß𖫱;	xn--hwe.xn--zca4946pblnc;	NV8
-T;	ᚭ.�ß𖫱;	;	xn--hwe.xn--ss-ci1ub261a;	NV8
-N;	ᚭ.�ß𖫱;	;	xn--hwe.xn--zca4946pblnc;	NV8
-B;	ᚭ｡�SS𖫱;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	ᚭ｡�ss𖫱;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	ᚭ｡�Ss𖫱;	ᚭ.�ss𖫱;	xn--hwe.xn--ss-ci1ub261a;	NV8
-B;	�｡𞤫ꡪ;	[B1 B2 B3];	[B1 B2 B3]
-B;	1。𞤫ꡪ;	[B1 B2 B3];	[B1 B2 B3]
-B;	1。𞤉ꡪ;	[B1 B2 B3];	[B1 B2 B3]
-B;	1.xn--gd9al691d;	[B1 B2 B3];	[B1 B2 B3]
-B;	�｡𞤉ꡪ;	[B1 B2 B3];	[B1 B2 B3]
-T;	𯻼\u200C.𞶞򻙤񥘇;	[B2 B3 B6 C1 P1 V6];	[B2 B3 P1 V6]	#	.
-N;	𯻼\u200C.𞶞򻙤񥘇;	[B2 B3 B6 C1 P1 V6];	[B2 B3 B6 C1 P1 V6]	#	.
-B;	xn--kg4n.xn--2b7hs861pl540a;	[B2 B3 V6];	[B2 B3 V6]
-B;	xn--0ug27500a.xn--2b7hs861pl540a;	[B2 B3 B6 C1 V6];	[B2 B3 B6 C1 V6]	#	.
-B;	𑑄≯｡𑜤;	[P1 V5 V6];	[P1 V5 V6]
-B;	𑑄>\u0338｡𑜤;	[P1 V5 V6];	[P1 V5 V6]
-B;	𑑄≯。𑜤;	[P1 V5 V6];	[P1 V5 V6]
-B;	𑑄>\u0338。𑜤;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--hdh5636g.xn--ci2d;	[V5 V6];	[V5 V6]
-T;	Ⴋ≮𱲆。\u200D\u07A7�;	[C2 P1 V6];	[P1 V5 V6]	#	Ⴋ≮.ާ�
-N;	Ⴋ≮𱲆。\u200D\u07A7�;	[C2 P1 V6];	[C2 P1 V6]	#	Ⴋ≮.ާ�
-T;	Ⴋ<\u0338𱲆。\u200D\u07A7�;	[C2 P1 V6];	[P1 V5 V6]	#	Ⴋ≮.ާ�
-N;	Ⴋ<\u0338𱲆。\u200D\u07A7�;	[C2 P1 V6];	[C2 P1 V6]	#	Ⴋ≮.ާ�
-T;	ⴋ<\u0338𱲆。\u200D\u07A7�;	[C2 P1 V6];	[P1 V5 V6]	#	ⴋ≮.ާ�
-N;	ⴋ<\u0338𱲆。\u200D\u07A7�;	[C2 P1 V6];	[C2 P1 V6]	#	ⴋ≮.ާ�
-T;	ⴋ≮𱲆。\u200D\u07A7�;	[C2 P1 V6];	[P1 V5 V6]	#	ⴋ≮.ާ�
-N;	ⴋ≮𱲆。\u200D\u07A7�;	[C2 P1 V6];	[C2 P1 V6]	#	ⴋ≮.ާ�
-B;	xn--gdhz03bxt42d.xn--lrb6479j;	[V5 V6];	[V5 V6]	#	ⴋ≮.ާ�
-B;	xn--gdhz03bxt42d.xn--lrb506jqr4n;	[C2 V6];	[C2 V6]	#	ⴋ≮.ާ�
-B;	xn--jnd802gsm17c.xn--lrb6479j;	[V5 V6];	[V5 V6]	#	Ⴋ≮.ާ�
-B;	xn--jnd802gsm17c.xn--lrb506jqr4n;	[C2 V6];	[C2 V6]	#	Ⴋ≮.ާ�
-B;	\u17D2.򆽒≯;	[P1 V5 V6];	[P1 V5 V6]	#	្.≯
-B;	\u17D2.򆽒>\u0338;	[P1 V5 V6];	[P1 V5 V6]	#	្.≯
-B;	xn--u4e.xn--hdhx0084f;	[V5 V6];	[V5 V6]	#	្.≯
-B;	�\u1734．�É⬓𑄴;	[P1 V5 V6];	[P1 V5 V6]	#	᜴.�é⬓𑄴
-B;	�\u1734．�E\u0301⬓𑄴;	[P1 V5 V6];	[P1 V5 V6]	#	᜴.�é⬓𑄴
-B;	�\u1734.�É⬓𑄴;	[P1 V5 V6];	[P1 V5 V6]	#	᜴.�é⬓𑄴
-B;	�\u1734.�E\u0301⬓𑄴;	[P1 V5 V6];	[P1 V5 V6]	#	᜴.�é⬓𑄴
-B;	�\u1734.�e\u0301⬓𑄴;	[P1 V5 V6];	[P1 V5 V6]	#	᜴.�é⬓𑄴
-B;	�\u1734.�é⬓𑄴;	[P1 V5 V6];	[P1 V5 V6]	#	᜴.�é⬓𑄴
-B;	xn--c0e34564d.xn--9ca207st53lg3f;	[V5 V6];	[V5 V6]	#	᜴.�é⬓𑄴
-B;	�\u1734．�e\u0301⬓𑄴;	[P1 V5 V6];	[P1 V5 V6]	#	᜴.�é⬓𑄴
-B;	�\u1734．�é⬓𑄴;	[P1 V5 V6];	[P1 V5 V6]	#	᜴.�é⬓𑄴
-T;	ᢇ\u200D\uA8C4｡︒𞤺;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	ᢇ꣄.︒𞤺
-N;	ᢇ\u200D\uA8C4｡︒𞤺;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ᢇ꣄.︒𞤺
-T;	ᢇ\u200D\uA8C4。。𞤺;	[B6 C2 A4_2];	[A4_2]	#	ᢇ꣄..𞤺
-N;	ᢇ\u200D\uA8C4。。𞤺;	[B6 C2 A4_2];	[B6 C2 A4_2]	#	ᢇ꣄..𞤺
-T;	ᢇ\u200D\uA8C4。。𞤘;	[B6 C2 A4_2];	[A4_2]	#	ᢇ꣄..𞤺
-N;	ᢇ\u200D\uA8C4。。𞤘;	[B6 C2 A4_2];	[B6 C2 A4_2]	#	ᢇ꣄..𞤺
-B;	xn--09e4694e..xn--ye6h;	[A4_2];	[A4_2]	#	ᢇ꣄..𞤺
-B;	xn--09e669a6x8j..xn--ye6h;	[B6 C2 A4_2];	[B6 C2 A4_2]	#	ᢇ꣄..𞤺
-T;	ᢇ\u200D\uA8C4｡︒𞤘;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	ᢇ꣄.︒𞤺
-N;	ᢇ\u200D\uA8C4｡︒𞤘;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ᢇ꣄.︒𞤺
-B;	xn--09e4694e.xn--y86cv562b;	[B1 V6];	[B1 V6]	#	ᢇ꣄.︒𞤺
-B;	xn--09e669a6x8j.xn--y86cv562b;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	ᢇ꣄.︒𞤺
-T;	𞩬򖙱\u1714\u200C｡\u0631\u07AA≮;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	᜔.رު≮
-N;	𞩬򖙱\u1714\u200C｡\u0631\u07AA≮;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	᜔.رު≮
-T;	𞩬򖙱\u1714\u200C｡\u0631\u07AA<\u0338;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	᜔.رު≮
-N;	𞩬򖙱\u1714\u200C｡\u0631\u07AA<\u0338;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	᜔.رު≮
-T;	𞩬򖙱\u1714\u200C。\u0631\u07AA≮;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	᜔.رު≮
-N;	𞩬򖙱\u1714\u200C。\u0631\u07AA≮;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	᜔.رު≮
-T;	𞩬򖙱\u1714\u200C。\u0631\u07AA<\u0338;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	᜔.رު≮
-N;	𞩬򖙱\u1714\u200C。\u0631\u07AA<\u0338;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	᜔.رު≮
-B;	xn--fze3930v7hz6b.xn--wgb86el10d;	[B2 B3 V6];	[B2 B3 V6]	#	᜔.رު≮
-B;	xn--fze607b9651bjwl7c.xn--wgb86el10d;	[B2 B3 V6];	[B2 B3 V6]	#	᜔.رު≮
-B;	Ⴣ．\u0653ᢤ;	[P1 V5 V6];	[P1 V5 V6]	#	Ⴣ.ٓᢤ
-B;	Ⴣ.\u0653ᢤ;	[P1 V5 V6];	[P1 V5 V6]	#	Ⴣ.ٓᢤ
-B;	ⴣ.\u0653ᢤ;	[V5];	[V5]	#	ⴣ.ٓᢤ
-B;	xn--rlj.xn--vhb294g;	[V5];	[V5]	#	ⴣ.ٓᢤ
-B;	xn--7nd.xn--vhb294g;	[V5 V6];	[V5 V6]	#	Ⴣ.ٓᢤ
-B;	ⴣ．\u0653ᢤ;	[V5];	[V5]	#	ⴣ.ٓᢤ
-B;	󠄈\u0813．싉򄆻Ⴤ�;	[P1 V6];	[P1 V6]	#	ࠓ.싉Ⴤ
-B;	󠄈\u0813．싉򄆻Ⴤ�;	[P1 V6];	[P1 V6]	#	ࠓ.싉Ⴤ
-B;	󠄈\u0813.싉򄆻Ⴤ�;	[P1 V6];	[P1 V6]	#	ࠓ.싉Ⴤ
-B;	󠄈\u0813.싉򄆻Ⴤ�;	[P1 V6];	[P1 V6]	#	ࠓ.싉Ⴤ
-B;	󠄈\u0813.싉򄆻ⴤ�;	[P1 V6];	[P1 V6]	#	ࠓ.싉ⴤ
-B;	󠄈\u0813.싉򄆻ⴤ�;	[P1 V6];	[P1 V6]	#	ࠓ.싉ⴤ
-B;	xn--oub.xn--sljz109bpe25dviva;	[V6];	[V6]	#	ࠓ.싉ⴤ
-B;	xn--oub.xn--8nd9522gpe69cviva;	[V6];	[V6]	#	ࠓ.싉Ⴤ
-B;	󠄈\u0813．싉򄆻ⴤ�;	[P1 V6];	[P1 V6]	#	ࠓ.싉ⴤ
-B;	󠄈\u0813．싉򄆻ⴤ�;	[P1 V6];	[P1 V6]	#	ࠓ.싉ⴤ
-B;	\uAA2C𑲫≮．⤂;	[P1 V5 V6];	[P1 V5 V6]	#	ꨬ𑲫≮.⤂
-B;	\uAA2C𑲫<\u0338．⤂;	[P1 V5 V6];	[P1 V5 V6]	#	ꨬ𑲫≮.⤂
-B;	\uAA2C𑲫≮.⤂;	[P1 V5 V6];	[P1 V5 V6]	#	ꨬ𑲫≮.⤂
-B;	\uAA2C𑲫<\u0338.⤂;	[P1 V5 V6];	[P1 V5 V6]	#	ꨬ𑲫≮.⤂
-B;	xn--gdh1854cn19c.xn--kqi;	[V5 V6];	[V5 V6]	#	ꨬ𑲫≮.⤂
-B;	\u0604�≮Ⴢ．Ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮Ⴢ.Ⴃ
-B;	\u0604�<\u0338Ⴢ．Ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮Ⴢ.Ⴃ
-B;	\u0604�≮Ⴢ.Ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮Ⴢ.Ⴃ
-B;	\u0604�<\u0338Ⴢ.Ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮Ⴢ.Ⴃ
-B;	\u0604�<\u0338ⴢ.ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮ⴢ.ⴃ
-B;	\u0604�≮ⴢ.ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮ⴢ.ⴃ
-B;	\u0604�≮Ⴢ.ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮Ⴢ.ⴃ
-B;	\u0604�<\u0338Ⴢ.ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮Ⴢ.ⴃ
-B;	xn--mfb416c0jox02t.xn--ukj;	[B1 V6];	[B1 V6]	#	�≮Ⴢ.ⴃ
-B;	xn--mfb266l4khr54u.xn--ukj;	[B1 V6];	[B1 V6]	#	�≮ⴢ.ⴃ
-B;	xn--mfb416c0jox02t.xn--bnd;	[B1 V6];	[B1 V6]	#	�≮Ⴢ.Ⴃ
-B;	\u0604�<\u0338ⴢ．ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮ⴢ.ⴃ
-B;	\u0604�≮ⴢ．ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮ⴢ.ⴃ
-B;	\u0604�≮Ⴢ．ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮Ⴢ.ⴃ
-B;	\u0604�<\u0338Ⴢ．ⴃ;	[B1 P1 V6];	[B1 P1 V6]	#	�≮Ⴢ.ⴃ
-B;	�。-;	[V3 V5];	[V3 V5]
-B;	xn--210d.-;	[V3 V5];	[V3 V5]
-B;	\u0DCA򕸽󠧱｡饈≠\u0664;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	්.饈≠٤
-B;	\u0DCA򕸽󠧱｡饈=\u0338\u0664;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	්.饈≠٤
-B;	\u0DCA򕸽󠧱。饈≠\u0664;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	්.饈≠٤
-B;	\u0DCA򕸽󠧱。饈=\u0338\u0664;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	්.饈≠٤
-B;	xn--h1c25913jfwov.xn--dib144ler5f;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	්.饈≠٤
-B;	𞥃ᠠ�｡≯邅⬻4;	[B1 B2 P1 V6];	[B1 B2 P1 V6]
-B;	𞥃ᠠ�｡>\u0338邅⬻4;	[B1 B2 P1 V6];	[B1 B2 P1 V6]
-B;	𞥃ᠠ7。≯邅⬻4;	[B1 B2 P1 V6];	[B1 B2 P1 V6]
-B;	𞥃ᠠ7。>\u0338邅⬻4;	[B1 B2 P1 V6];	[B1 B2 P1 V6]
-B;	𞤡ᠠ7。>\u0338邅⬻4;	[B1 B2 P1 V6];	[B1 B2 P1 V6]
-B;	𞤡ᠠ7。≯邅⬻4;	[B1 B2 P1 V6];	[B1 B2 P1 V6]
-B;	xn--7-v4j2826w.xn--4-ogoy01bou3i;	[B1 B2 V6];	[B1 B2 V6]
-B;	𞤡ᠠ�｡>\u0338邅⬻4;	[B1 B2 P1 V6];	[B1 B2 P1 V6]
-B;	𞤡ᠠ�｡≯邅⬻4;	[B1 B2 P1 V6];	[B1 B2 P1 V6]
-B;	򠿯ᡳ-�.��\u0605󑎳;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	ᡳ-�.��
-B;	xn----m9j3429kxmy7e.xn--nfb7950kdihrp812a;	[B1 B6 V6];	[B1 B6 V6]	#	ᡳ-�.��
-B;	򠶆\u0845\u0A51.넨-󶧈;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ࡅੑ.넨-
-B;	򠶆\u0845\u0A51.넨-󶧈;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ࡅੑ.넨-
-B;	xn--3vb26hb6834b.xn----i37ez0957g;	[B5 B6 V6];	[B5 B6 V6]	#	ࡅੑ.넨-
-T;	ꡦᡑ\u200D⒈。�-;	[C2 P1 V3 V6];	[P1 V3 V6]	#	ꡦᡑ⒈.�-
-N;	ꡦᡑ\u200D⒈。�-;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	ꡦᡑ⒈.�-
-T;	ꡦᡑ\u200D1.。�-;	[C2 V3 A4_2];	[V3 A4_2]	#	ꡦᡑ1..�-
-N;	ꡦᡑ\u200D1.。�-;	[C2 V3 A4_2];	[C2 V3 A4_2]	#	ꡦᡑ1..�-
-B;	xn--1-o7j0610f..xn----381i;	[V3 A4_2];	[V3 A4_2]
-B;	xn--1-o7j663bdl7m..xn----381i;	[C2 V3 A4_2];	[C2 V3 A4_2]	#	ꡦᡑ1..�-
-B;	xn--h8e863drj7h.xn----381i;	[V3 V6];	[V3 V6]
-B;	xn--h8e470bl0d838o.xn----381i;	[C2 V3 V6];	[C2 V3 V6]	#	ꡦᡑ⒈.�-
-B;	Ⴌ。�\uFB69;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴌ.ٹ
-B;	Ⴌ。�\u0679;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴌ.ٹ
-B;	ⴌ。�\u0679;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴌ.ٹ
-B;	xn--3kj.xn--yib19191t;	[B5 B6 V6];	[B5 B6 V6]	#	ⴌ.ٹ
-B;	xn--knd.xn--yib19191t;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴌ.ٹ
-B;	ⴌ。�\uFB69;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴌ.ٹ
-B;	��.\u0F84\u135E-\u1CFA;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	��.྄�-
-B;	xn--r19c5a.xn----xjg270ag3m;	[B1 V5 V6];	[B1 V5 V6]	#	��.྄�-
-T;	⒈䰹\u200D-。웈;	[C2 P1 V3 V6];	[P1 V3 V6]	#	⒈䰹-.웈
-N;	⒈䰹\u200D-。웈;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	⒈䰹-.웈
-T;	⒈䰹\u200D-。웈;	[C2 P1 V3 V6];	[P1 V3 V6]	#	⒈䰹-.웈
-N;	⒈䰹\u200D-。웈;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	⒈䰹-.웈
-T;	1.䰹\u200D-。웈;	[C2 V3];	[V3]	#	1.䰹-.웈
-N;	1.䰹\u200D-。웈;	[C2 V3];	[C2 V3]	#	1.䰹-.웈
-T;	1.䰹\u200D-。웈;	[C2 V3];	[V3]	#	1.䰹-.웈
-N;	1.䰹\u200D-。웈;	[C2 V3];	[C2 V3]	#	1.䰹-.웈
-B;	1.xn----zw5a.xn--kp5b;	[V3];	[V3]
-B;	1.xn----tgnz80r.xn--kp5b;	[C2 V3];	[C2 V3]	#	1.䰹-.웈
-B;	xn----dcp160o.xn--kp5b;	[V3 V6];	[V3 V6]
-B;	xn----tgnx5rjr6c.xn--kp5b;	[C2 V3 V6];	[C2 V3 V6]	#	⒈䰹-.웈
-T;	�。\u200C󠳽\u07F3;	[C1 P1 V6];	[P1 V6]	#	�.߳
-N;	�。\u200C󠳽\u07F3;	[C1 P1 V6];	[C1 P1 V6]	#	�.߳
-B;	xn--m9j.xn--rtb10784p;	[V6];	[V6]	#	�.߳
-B;	xn--m9j.xn--rtb154j9l73w;	[C1 V6];	[C1 V6]	#	�.߳
-T;	ς｡\uA9C0\u06E7;	[V5];	[V5]	#	ς.꧀ۧ
-N;	ς｡\uA9C0\u06E7;	[V5];	[V5]	#	ς.꧀ۧ
-T;	ς。\uA9C0\u06E7;	[V5];	[V5]	#	ς.꧀ۧ
-N;	ς。\uA9C0\u06E7;	[V5];	[V5]	#	ς.꧀ۧ
-B;	Σ。\uA9C0\u06E7;	[V5];	[V5]	#	σ.꧀ۧ
-B;	σ。\uA9C0\u06E7;	[V5];	[V5]	#	σ.꧀ۧ
-B;	xn--4xa.xn--3lb1944f;	[V5];	[V5]	#	σ.꧀ۧ
-B;	xn--3xa.xn--3lb1944f;	[V5];	[V5]	#	ς.꧀ۧ
-B;	Σ｡\uA9C0\u06E7;	[V5];	[V5]	#	σ.꧀ۧ
-B;	σ｡\uA9C0\u06E7;	[V5];	[V5]	#	σ.꧀ۧ
-B;	\u0BCD󥫅򌉑.ႢႵ;	[P1 V5 V6];	[P1 V5 V6]	#	�.ႢႵ
-B;	\u0BCD󥫅򌉑.ⴂⴕ;	[P1 V5 V6];	[P1 V5 V6]	#	�.ⴂⴕ
-B;	\u0BCD󥫅򌉑.Ⴂⴕ;	[P1 V5 V6];	[P1 V5 V6]	#	�.Ⴂⴕ
-B;	xn--xmc83135idcxza.xn--9md086l;	[V5 V6];	[V5 V6]	#	�.Ⴂⴕ
-B;	xn--xmc83135idcxza.xn--tkjwb;	[V5 V6];	[V5 V6]	#	�.ⴂⴕ
-B;	xn--xmc83135idcxza.xn--9md2b;	[V5 V6];	[V5 V6]	#	�.ႢႵ
-T;	\u1C32🄈⾛\u05A6．\u200D򯥤\u07FD;	[B1 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ᰲ🄈走֦.
-N;	\u1C32🄈⾛\u05A6．\u200D򯥤\u07FD;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	ᰲ🄈走֦.
-T;	\u1C327,走\u05A6.\u200D򯥤\u07FD;	[B1 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ᰲ7,走֦.
-N;	\u1C327,走\u05A6.\u200D򯥤\u07FD;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	ᰲ7,走֦.
-B;	xn--7,-bid991urn3k.xn--1tb13454l;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	á°²7,èµ°Ö¦.
-B;	xn--7,-bid991urn3k.xn--1tb334j1197q;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	á°²7,èµ°Ö¦.
-B;	xn--xcb756i493fwi5o.xn--1tb13454l;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	ᰲ🄈走֦.
-B;	xn--xcb756i493fwi5o.xn--1tb334j1197q;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	ᰲ🄈走֦.
-B;	ᢗ｡Ӏ�;	[P1 V6];	[P1 V6]
-B;	ᢗ。Ӏ�;	[P1 V6];	[P1 V6]
-B;	ᢗ。��;	[P1 V6];	[P1 V6]
-B;	xn--hbf.xn--s5a83117e;	[V6];	[V6]
-B;	xn--hbf.xn--d5a86117e;	[V6];	[V6]
-B;	ᢗ｡��;	[P1 V6];	[P1 V6]
-B;	\u0668-。��ᄾ;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	٨-.�ᄾ
-B;	xn----oqc.xn--qrd1699v327w;	[B1 V3 V6];	[B1 V3 V6]	#	٨-.�ᄾ
-B;	-�𖾑。󠆬;	[V3];	[V3]
-B;	xn----991iq40y.;	[V3];	[V3]
-T;	\u200C��멈.\uABED�;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	��멈.꯭
-N;	\u200C��멈.\uABED�;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	��멈.꯭
-T;	\u200C��멈.\uABED�;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	��멈.꯭
-N;	\u200C��멈.\uABED�;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	��멈.꯭
-B;	xn--422b325mqb6i.xn--429a8682s;	[B1 V5 V6];	[B1 V5 V6]	#	��멈.꯭
-B;	xn--0ug6681d406b7bwk.xn--429a8682s;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	��멈.꯭
-B;	≮.\u0769\u0603;	[B1 P1 V6];	[B1 P1 V6]	#	≮.ݩ
-B;	<\u0338.\u0769\u0603;	[B1 P1 V6];	[B1 P1 V6]	#	≮.ݩ
-B;	xn--gdh.xn--lfb92e;	[B1 V6];	[B1 V6]	#	≮.ݩ
-T;	�⾆｡\u200C𑚶򟱃𞰘;	[B1 B2 B3 C1 P1 V6];	[B2 B3 B5 B6 P1 V5 V6]	#	舌.𑚶
-N;	�⾆｡\u200C𑚶򟱃𞰘;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	舌.𑚶
-T;	�舌。\u200C𑚶򟱃𞰘;	[B1 B2 B3 C1 P1 V6];	[B2 B3 B5 B6 P1 V5 V6]	#	舌.𑚶
-N;	�舌。\u200C𑚶򟱃𞰘;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	舌.𑚶
-B;	xn--tc1ao37z.xn--6e2dw557azds2d;	[B2 B3 B5 B6 V5 V6];	[B2 B3 B5 B6 V5 V6]
-B;	xn--tc1ao37z.xn--0ugx728gi1nfwqz2e;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	舌.𑚶
-T;	\u200CჀ-.�ς𞴺ς;	[B1 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	Ⴠ-.1ςς
-N;	\u200CჀ-.�ς𞴺ς;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	Ⴠ-.1ςς
-T;	\u200CჀ-.1ς𞴺ς;	[B1 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	Ⴠ-.1ςς
-N;	\u200CჀ-.1ς𞴺ς;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	Ⴠ-.1ςς
-T;	\u200Cⴠ-.1ς𞴺ς;	[B1 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	ⴠ-.1ςς
-N;	\u200Cⴠ-.1ς𞴺ς;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	ⴠ-.1ςς
-T;	\u200CჀ-.1Σ𞴺Σ;	[B1 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	Ⴠ-.1σσ
-N;	\u200CჀ-.1Σ𞴺Σ;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	Ⴠ-.1σσ
-T;	\u200Cⴠ-.1σ𞴺σ;	[B1 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	ⴠ-.1σσ
-N;	\u200Cⴠ-.1σ𞴺σ;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	ⴠ-.1σσ
-B;	xn----2ws.xn--1-0mba52321c;	[B1 B6 V3 V6];	[B1 B6 V3 V6]
-B;	xn----rgn530d.xn--1-0mba52321c;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	ⴠ-.1σσ
-B;	xn----z1g.xn--1-0mba52321c;	[B1 B6 V3 V6];	[B1 B6 V3 V6]
-B;	xn----z1g168i.xn--1-0mba52321c;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	Ⴠ-.1σσ
-B;	xn----rgn530d.xn--1-ymba92321c;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	â´ -.1Ï‚Ï‚
-B;	xn----z1g168i.xn--1-ymba92321c;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	Ⴠ-.1ςς
-T;	\u200Cⴠ-.�ς𞴺ς;	[B1 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	ⴠ-.1ςς
-N;	\u200Cⴠ-.�ς𞴺ς;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	ⴠ-.1ςς
-T;	\u200CჀ-.�Σ𞴺Σ;	[B1 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	Ⴠ-.1σσ
-N;	\u200CჀ-.�Σ𞴺Σ;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	Ⴠ-.1σσ
-T;	\u200Cⴠ-.�σ𞴺σ;	[B1 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	ⴠ-.1σσ
-N;	\u200Cⴠ-.�σ𞴺σ;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	ⴠ-.1σσ
-B;	𑲘󠄒𓑡｡�Ⴜ;	[P1 V5 V6];	[P1 V5 V6]
-B;	𑲘󠄒𓑡。8Ⴜ;	[P1 V5 V6];	[P1 V5 V6]
-B;	𑲘󠄒𓑡。8ⴜ;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--7m3d291b.xn--8-vws;	[V5 V6];	[V5 V6]
-B;	xn--7m3d291b.xn--8-s1g;	[V5 V6];	[V5 V6]
-B;	𑲘󠄒𓑡｡�ⴜ;	[P1 V5 V6];	[P1 V5 V6]
-B;	�\u06AB\u07E0\u0941｡뭕�\u17B9;	[B5 B6];	[B5 B6]	#	�ګߠ�.뭕�ឹ
-B;	�\u06AB\u07E0\u0941｡뭕�\u17B9;	[B5 B6];	[B5 B6]	#	�ګߠ�.뭕�ឹ
-B;	�\u06AB\u07E0\u0941。뭕�\u17B9;	[B5 B6];	[B5 B6]	#	�ګߠ�.뭕�ឹ
-B;	�\u06AB\u07E0\u0941。뭕�\u17B9;	[B5 B6];	[B5 B6]	#	�ګߠ�.뭕�ឹ
-B;	xn--ekb23dj4at01n.xn--43e96bh910b;	[B5 B6];	[B5 B6]	#	�ګߠ�.뭕�ឹ
-B;	\u1BAB｡🂉�;	[P1 V5 V6];	[P1 V5 V6]	#	᮫.🂉
-B;	\u1BAB。🂉�;	[P1 V5 V6];	[P1 V5 V6]	#	᮫.🂉
-B;	xn--zxf.xn--fx7ho0250c;	[V5 V6];	[V5 V6]	#	᮫.🂉
-T;	󩎃\u0AC4。ς\u200D�𑈵;	[B5 C2 P1 V6];	[B5 P1 V6]	#	ૄ.ς�𑈵
-N;	󩎃\u0AC4。ς\u200D�𑈵;	[B5 C2 P1 V6];	[B5 C2 P1 V6]	#	ૄ.ς�𑈵
-T;	󩎃\u0AC4。Σ\u200D�𑈵;	[B5 C2 P1 V6];	[B5 P1 V6]	#	ૄ.σ�𑈵
-N;	󩎃\u0AC4。Σ\u200D�𑈵;	[B5 C2 P1 V6];	[B5 C2 P1 V6]	#	ૄ.σ�𑈵
-T;	󩎃\u0AC4。σ\u200D�𑈵;	[B5 C2 P1 V6];	[B5 P1 V6]	#	ૄ.σ�𑈵
-N;	󩎃\u0AC4。σ\u200D�𑈵;	[B5 C2 P1 V6];	[B5 C2 P1 V6]	#	ૄ.σ�𑈵
-B;	xn--dfc53161q.xn--4xa8467k5mc;	[B5 V6];	[B5 V6]	#	ૄ.σ�𑈵
-B;	xn--dfc53161q.xn--4xa895lzo7nsfd;	[B5 C2 V6];	[B5 C2 V6]	#	ૄ.σ�𑈵
-B;	xn--dfc53161q.xn--3xa006lzo7nsfd;	[B5 C2 V6];	[B5 C2 V6]	#	ૄ.ς�𑈵
-B;	�ᡂ𑜫．𑘿;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]
-B;	�ᡂ𑜫.𑘿;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]
-B;	xn--17e9625js1h.xn--sb2d;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]
-T;	󬚶󸋖򖩰-。\u200C;	[C1 P1 V3 V6];	[P1 V3 V6]	#	-.
-N;	󬚶󸋖򖩰-。\u200C;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	-.
-B;	xn----7i12hu122k9ire.;	[V3 V6];	[V3 V6]
-B;	xn----7i12hu122k9ire.xn--0ug;	[C1 V3 V6];	[C1 V3 V6]	#	-.
-B;	�．\u07C2;	[B1];	[B1]	#	�.߂
-B;	�.\u07C2;	[B1];	[B1]	#	�.߂
-B;	xn--bo0d.xn--dsb;	[B1];	[B1]	#	�.߂
-B;	-\u07E1｡Ↄ;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ߡ.Ↄ
-B;	-\u07E1。Ↄ;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ߡ.Ↄ
-B;	-\u07E1。ↄ;	[B1 V3];	[B1 V3]	#	-ߡ.ↄ
-B;	xn----8cd.xn--r5g;	[B1 V3];	[B1 V3]	#	-ߡ.ↄ
-B;	xn----8cd.xn--q5g;	[B1 V3 V6];	[B1 V3 V6]	#	-ߡ.Ↄ
-B;	-\u07E1｡ↄ;	[B1 V3];	[B1 V3]	#	-ߡ.ↄ
-T;	\u200D-︒󠄄。ß哑\u200C�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 P1 V3 V6]	#	-︒.ß哑
-N;	\u200D-︒󠄄。ß哑\u200C�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 C1 C2 P1 V6]	#	-︒.ß哑
-T;	\u200D-。󠄄。ß哑\u200C�;	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2];	[B1 B5 B6 P1 V3 V6 A4_2]	#	-..ß哑
-N;	\u200D-。󠄄。ß哑\u200C�;	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2];	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2]	#	-..ß哑
-T;	\u200D-。󠄄。SS哑\u200C�;	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2];	[B1 B5 B6 P1 V3 V6 A4_2]	#	-..ss哑
-N;	\u200D-。󠄄。SS哑\u200C�;	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2];	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2]	#	-..ss哑
-T;	\u200D-。󠄄。ss哑\u200C�;	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2];	[B1 B5 B6 P1 V3 V6 A4_2]	#	-..ss哑
-N;	\u200D-。󠄄。ss哑\u200C�;	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2];	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2]	#	-..ss哑
-T;	\u200D-。󠄄。Ss哑\u200C�;	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2];	[B1 B5 B6 P1 V3 V6 A4_2]	#	-..ss哑
-N;	\u200D-。󠄄。Ss哑\u200C�;	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2];	[B1 B5 B6 C1 C2 P1 V3 V6 A4_2]	#	-..ss哑
-B;	-..xn--ss-h46c5711e;	[B1 B5 B6 V3 V6 A4_2];	[B1 B5 B6 V3 V6 A4_2]
-B;	xn----tgn..xn--ss-k1ts75zb8ym;	[B1 B5 B6 C1 C2 V3 V6 A4_2];	[B1 B5 B6 C1 C2 V3 V6 A4_2]	#	-..sså“‘
-B;	xn----tgn..xn--zca670n5f0binyk;	[B1 B5 B6 C1 C2 V3 V6 A4_2];	[B1 B5 B6 C1 C2 V3 V6 A4_2]	#	-..ß哑
-T;	\u200D-︒󠄄。SS哑\u200C�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 P1 V3 V6]	#	-︒.ss哑
-N;	\u200D-︒󠄄。SS哑\u200C�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 C1 C2 P1 V6]	#	-︒.ss哑
-T;	\u200D-︒󠄄。ss哑\u200C�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 P1 V3 V6]	#	-︒.ss哑
-N;	\u200D-︒󠄄。ss哑\u200C�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 C1 C2 P1 V6]	#	-︒.ss哑
-T;	\u200D-︒󠄄。Ss哑\u200C�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 P1 V3 V6]	#	-︒.ss哑
-N;	\u200D-︒󠄄。Ss哑\u200C�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 C1 C2 P1 V6]	#	-︒.ss哑
-B;	xn----o89h.xn--ss-h46c5711e;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]
-B;	xn----tgnt341h.xn--ss-k1ts75zb8ym;	[B1 B5 B6 C1 C2 V6];	[B1 B5 B6 C1 C2 V6]	#	-︒.ss哑
-B;	xn----tgnt341h.xn--zca670n5f0binyk;	[B1 B5 B6 C1 C2 V6];	[B1 B5 B6 C1 C2 V6]	#	-︒.ß哑
-B;	︒．\uFE2F𑑂;	[P1 V5 V6];	[P1 V5 V6]	#	︒.𑑂︯
-B;	︒．𑑂\uFE2F;	[P1 V5 V6];	[P1 V5 V6]	#	︒.𑑂︯
-B;	。.𑑂\uFE2F;	[V5 A4_2];	[V5 A4_2]	#	..𑑂︯
-B;	..xn--s96cu30b;	[V5 A4_2];	[V5 A4_2]	#	..𑑂︯
-B;	xn--y86c.xn--s96cu30b;	[V5 V6];	[V5 V6]	#	︒.𑑂︯
-T;	\uA92C。\u200D;	[C2 V5];	[V5]	#	꤬.
-N;	\uA92C。\u200D;	[C2 V5];	[C2 V5]	#	꤬.
-B;	xn--zi9a.;	[V5];	[V5]	#	꤬.
-B;	xn--zi9a.xn--1ug;	[C2 V5];	[C2 V5]	#	꤬.
-T;	\u200D󠸡｡\uFCD7;	[B1 C2 P1 V6];	[B1 P1 V6]	#	.هج
-N;	\u200D󠸡｡\uFCD7;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	.هج
-T;	\u200D󠸡。\u0647\u062C;	[B1 C2 P1 V6];	[B1 P1 V6]	#	.هج
-N;	\u200D󠸡。\u0647\u062C;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	.هج
-B;	xn--d356e.xn--rgb7c;	[B1 V6];	[B1 V6]	#	.هج
-B;	xn--1ug80651l.xn--rgb7c;	[B1 C2 V6];	[B1 C2 V6]	#	.هج
-T;	-Ⴄ�\u0663．�ς;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-Ⴄ0٣.�ς
-N;	-Ⴄ�\u0663．�ς;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-Ⴄ0٣.�ς
-T;	-Ⴄ0\u0663.�ς;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-Ⴄ0٣.�ς
-N;	-Ⴄ0\u0663.�ς;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-Ⴄ0٣.�ς
-T;	-ⴄ0\u0663.�ς;	[B1 V3 V5];	[B1 V3 V5]	#	-ⴄ0٣.�ς
-N;	-ⴄ0\u0663.�ς;	[B1 V3 V5];	[B1 V3 V5]	#	-ⴄ0٣.�ς
-B;	-Ⴄ0\u0663.�Σ;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-Ⴄ0٣.�σ
-B;	-ⴄ0\u0663.�σ;	[B1 V3 V5];	[B1 V3 V5]	#	-ⴄ0٣.�σ
-B;	xn---0-iyd8660b.xn--4xa9120l;	[B1 V3 V5];	[B1 V3 V5]	#	-ⴄ0٣.�σ
-B;	xn---0-iyd216h.xn--4xa9120l;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	-Ⴄ0٣.�σ
-B;	xn---0-iyd8660b.xn--3xa1220l;	[B1 V3 V5];	[B1 V3 V5]	#	-ⴄ0٣.�ς
-B;	xn---0-iyd216h.xn--3xa1220l;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	-Ⴄ0٣.�ς
-T;	-ⴄ�\u0663．�ς;	[B1 V3 V5];	[B1 V3 V5]	#	-ⴄ0٣.�ς
-N;	-ⴄ�\u0663．�ς;	[B1 V3 V5];	[B1 V3 V5]	#	-ⴄ0٣.�ς
-B;	-Ⴄ�\u0663．�Σ;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-Ⴄ0٣.�σ
-B;	-ⴄ�\u0663．�σ;	[B1 V3 V5];	[B1 V3 V5]	#	-ⴄ0٣.�σ
-B;	󦈄。-;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn--xm38e.-;	[V3 V6];	[V3 V6]
-T;	⋠�．򶈮\u0F18ß≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ß≯
-N;	⋠�．򶈮\u0F18ß≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ß≯
-T;	≼\u0338�．򶈮\u0F18ß>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ß≯
-N;	≼\u0338�．򶈮\u0F18ß>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ß≯
-T;	⋠�.򶈮\u0F18ß≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ß≯
-N;	⋠�.򶈮\u0F18ß≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ß≯
-T;	≼\u0338�.򶈮\u0F18ß>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ß≯
-N;	≼\u0338�.򶈮\u0F18ß>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ß≯
-B;	≼\u0338�.򶈮\u0F18SS>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	⋠�.򶈮\u0F18SS≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	⋠�.򶈮\u0F18ss≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	≼\u0338�.򶈮\u0F18ss>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	≼\u0338�.򶈮\u0F18Ss>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	⋠�.򶈮\u0F18Ss≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	xn--pgh4639f.xn--ss-ifj426nle504a;	[V6];	[V6]	#	⋠�.༘ss≯
-B;	xn--pgh4639f.xn--zca593eo6oc013y;	[V6];	[V6]	#	⋠�.༘ß≯
-B;	≼\u0338�．򶈮\u0F18SS>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	⋠�．򶈮\u0F18SS≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	⋠�．򶈮\u0F18ss≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	≼\u0338�．򶈮\u0F18ss>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	≼\u0338�．򶈮\u0F18Ss>\u0338;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	⋠�．򶈮\u0F18Ss≯;	[P1 V6];	[P1 V6]	#	⋠�.༘ss≯
-B;	1�\u0664｡󠢮\uFBA4�;	[B1 P1 V6];	[B1 P1 V6]	#	1�٤.ۀ
-B;	1�\u0664。󠢮\u06C0�;	[B1 P1 V6];	[B1 P1 V6]	#	1�٤.ۀ
-B;	1�\u0664。󠢮\u06D5\u0654�;	[B1 P1 V6];	[B1 P1 V6]	#	1�٤.ۀ
-B;	xn--1-hqc3905q.xn--zkb83268gqee4a;	[B1 V6];	[B1 V6]	#	1�٤.ۀ
-T;	儭-｡�Ⴢ񥳠\u200C;	[B1 B6 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	儭-.�Ⴢ
-N;	儭-｡�Ⴢ񥳠\u200C;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	儭-.�Ⴢ
-T;	儭-。�Ⴢ񥳠\u200C;	[B1 B6 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	儭-.�Ⴢ
-N;	儭-。�Ⴢ񥳠\u200C;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	儭-.�Ⴢ
-T;	儭-。�ⴢ񥳠\u200C;	[B1 B6 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	儭-.�ⴢ
-N;	儭-。�ⴢ񥳠\u200C;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	儭-.�ⴢ
-B;	xn----gz7a.xn--qlj9223eywx0b;	[B1 B6 V3 V6];	[B1 B6 V3 V6]
-B;	xn----gz7a.xn--0ug472cfq0pus98b;	[B1 B6 C1 V3 V6];	[B1 B6 C1 V3 V6]	#	儭-.�ⴢ
-B;	xn----gz7a.xn--6nd5001kyw98a;	[B1 B6 V3 V6];	[B1 B6 V3 V6]
-B;	xn----gz7a.xn--6nd249ejl4pusr7b;	[B1 B6 C1 V3 V6];	[B1 B6 C1 V3 V6]	#	儭-.�Ⴢ
-T;	儭-｡�ⴢ񥳠\u200C;	[B1 B6 C1 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	儭-.�ⴢ
-N;	儭-｡�ⴢ񥳠\u200C;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	儭-.�ⴢ
-B;	��\u06B9．𞤭�;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	4�ڹ.𞤭
-B;	4�\u06B9.𞤭�;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	4�ڹ.𞤭
-B;	4�\u06B9.𞤋�;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	4�ڹ.𞤭
-B;	xn--4-cvc5384q.xn--le6hi7322b;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	4�ڹ.𞤭
-B;	��\u06B9．𞤋�;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	4�ڹ.𞤭
-B;	≯-ꡋ𑲣.⒈�;	[B1 P1 V6];	[B1 P1 V6]
-B;	>\u0338-ꡋ𑲣.⒈�;	[B1 P1 V6];	[B1 P1 V6]
-B;	≯-ꡋ𑲣.1.�;	[B1 P1 V6];	[B1 P1 V6]
-B;	>\u0338-ꡋ𑲣.1.�;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn----ogox061d5i8d.1.xn--lo0d;	[B1 V6];	[B1 V6]
-B;	xn----ogox061d5i8d.xn--tsh0666f;	[B1 V6];	[B1 V6]
-B;	\u0330．󰜱蚀;	[P1 V5 V6];	[P1 V5 V6]	#	̰.蚀
-B;	\u0330.󰜱蚀;	[P1 V5 V6];	[P1 V5 V6]	#	̰.蚀
-B;	xn--xta.xn--e91aw9417e;	[V5 V6];	[V5 V6]	#	̰.蚀
-T;	\uFB39Ⴘ.𞡼𑇀ß\u20D7;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	יּႸ.𞡼𑇀ß⃗
-N;	\uFB39Ⴘ.𞡼𑇀ß\u20D7;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	יּႸ.𞡼𑇀ß⃗
-T;	\u05D9\u05BCႸ.𞡼𑇀ß\u20D7;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	יּႸ.𞡼𑇀ß⃗
-N;	\u05D9\u05BCႸ.𞡼𑇀ß\u20D7;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	יּႸ.𞡼𑇀ß⃗
-T;	\u05D9\u05BCⴘ.𞡼𑇀ß\u20D7;	[B2 B3];	[B2 B3]	#	יּⴘ.𞡼𑇀ß⃗
-N;	\u05D9\u05BCⴘ.𞡼𑇀ß\u20D7;	[B2 B3];	[B2 B3]	#	יּⴘ.𞡼𑇀ß⃗
-B;	\u05D9\u05BCႸ.𞡼𑇀SS\u20D7;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	יּႸ.𞡼𑇀ss⃗
-B;	\u05D9\u05BCⴘ.𞡼𑇀ss\u20D7;	[B2 B3];	[B2 B3]	#	יּⴘ.𞡼𑇀ss⃗
-B;	\u05D9\u05BCႸ.𞡼𑇀ss\u20D7;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	יּႸ.𞡼𑇀ss⃗
-B;	xn--kdb1d867b.xn--ss-yju5690ken9h;	[B2 B3 V6];	[B2 B3 V6]	#	יּႸ.𞡼𑇀ss⃗
-B;	xn--kdb1d278n.xn--ss-yju5690ken9h;	[B2 B3];	[B2 B3]	#	יּⴘ.𞡼𑇀ss⃗
-B;	xn--kdb1d278n.xn--zca284nhg9nrrxg;	[B2 B3];	[B2 B3]	#	יּⴘ.𞡼𑇀ß⃗
-B;	xn--kdb1d867b.xn--zca284nhg9nrrxg;	[B2 B3 V6];	[B2 B3 V6]	#	יּႸ.𞡼𑇀ß⃗
-T;	\uFB39ⴘ.𞡼𑇀ß\u20D7;	[B2 B3];	[B2 B3]	#	יּⴘ.𞡼𑇀ß⃗
-N;	\uFB39ⴘ.𞡼𑇀ß\u20D7;	[B2 B3];	[B2 B3]	#	יּⴘ.𞡼𑇀ß⃗
-B;	\uFB39Ⴘ.𞡼𑇀SS\u20D7;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	יּႸ.𞡼𑇀ss⃗
-B;	\uFB39ⴘ.𞡼𑇀ss\u20D7;	[B2 B3];	[B2 B3]	#	יּⴘ.𞡼𑇀ss⃗
-B;	\uFB39Ⴘ.𞡼𑇀ss\u20D7;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	יּႸ.𞡼𑇀ss⃗
-B;	\u1BA3��｡凬;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᮣ�.凬
-B;	\u1BA3��。凬;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᮣ�.凬
-B;	xn--rxfz314ilg20c.xn--t9q;	[B1 V5 V6];	[B1 V5 V6]	#	ᮣ�.凬
-T;	🢟🄈\u200Dꡎ｡\u0F84;	[C2 P1 V5 V6];	[P1 V5 V6]	#	🢟🄈ꡎ.྄
-N;	🢟🄈\u200Dꡎ｡\u0F84;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	🢟🄈ꡎ.྄
-T;	🢟7,\u200Dꡎ。\u0F84;	[C2 P1 V5 V6];	[P1 V5 V6]	#	🢟7,ꡎ.྄
-N;	🢟7,\u200Dꡎ。\u0F84;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	🢟7,ꡎ.྄
-B;	xn--7,-gh9hg322i.xn--3ed;	[P1 V5 V6];	[P1 V5 V6]	#	🢟7,ꡎ.྄
-B;	xn--7,-n1t0654eqo3o.xn--3ed;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	🢟7,ꡎ.྄
-B;	xn--nc9aq743ds0e.xn--3ed;	[V5 V6];	[V5 V6]	#	🢟🄈ꡎ.྄
-B;	xn--1ug4874cfd0kbmg.xn--3ed;	[C2 V5 V6];	[C2 V5 V6]	#	🢟🄈ꡎ.྄
-B;	ꡔ。\u1039ᢇ;	[V5];	[V5]	#	ꡔ.္ᢇ
-B;	xn--tc9a.xn--9jd663b;	[V5];	[V5]	#	ꡔ.္ᢇ
-B;	\u20EB≮.�;	[P1 V5 V6];	[P1 V5 V6]	#	⃫≮.�
-B;	\u20EB<\u0338.�;	[P1 V5 V6];	[P1 V5 V6]	#	⃫≮.�
-B;	xn--e1g71d.xn--772h;	[V5 V6];	[V5 V6]	#	⃫≮.�
-B;	Ⴢ≯褦．ᠪ\u07EAႾ\u0767;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴢ≯褦.ᠪߪႾݧ
-B;	Ⴢ>\u0338褦．ᠪ\u07EAႾ\u0767;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴢ≯褦.ᠪߪႾݧ
-B;	Ⴢ≯褦.ᠪ\u07EAႾ\u0767;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴢ≯褦.ᠪߪႾݧ
-B;	Ⴢ>\u0338褦.ᠪ\u07EAႾ\u0767;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴢ≯褦.ᠪߪႾݧ
-B;	ⴢ>\u0338褦.ᠪ\u07EAⴞ\u0767;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴢ≯褦.ᠪߪⴞݧ
-B;	ⴢ≯褦.ᠪ\u07EAⴞ\u0767;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴢ≯褦.ᠪߪⴞݧ
-B;	xn--hdh433bev8e.xn--rpb5x392bcyt;	[B5 B6 V6];	[B5 B6 V6]	#	ⴢ≯褦.ᠪߪⴞݧ
-B;	xn--6nd461g478e.xn--rpb5x49td2h;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴢ≯褦.ᠪߪႾݧ
-B;	ⴢ>\u0338褦．ᠪ\u07EAⴞ\u0767;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴢ≯褦.ᠪߪⴞݧ
-B;	ⴢ≯褦．ᠪ\u07EAⴞ\u0767;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴢ≯褦.ᠪߪⴞݧ
-T;	򊉆󠆒\u200C\uA953。𞤙\u067Bꡘ;	[B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	꥓.𞤻ٻꡘ
-N;	򊉆󠆒\u200C\uA953。𞤙\u067Bꡘ;	[B2 B3 C1 P1 V6];	[B2 B3 C1 P1 V6]	#	꥓.𞤻ٻꡘ
-T;	򊉆󠆒\u200C\uA953。𞤻\u067Bꡘ;	[B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	꥓.𞤻ٻꡘ
-N;	򊉆󠆒\u200C\uA953。𞤻\u067Bꡘ;	[B2 B3 C1 P1 V6];	[B2 B3 C1 P1 V6]	#	꥓.𞤻ٻꡘ
-B;	xn--3j9al6189a.xn--0ib8893fegvj;	[B2 B3 V6];	[B2 B3 V6]	#	꥓.𞤻ٻꡘ
-B;	xn--0ug8815chtz0e.xn--0ib8893fegvj;	[B2 B3 C1 V6];	[B2 B3 C1 V6]	#	꥓.𞤻ٻꡘ
-T;	\u200C.≯;	[C1 P1 V6];	[P1 V6 A4_2]	#	.≯
-N;	\u200C.≯;	[C1 P1 V6];	[C1 P1 V6]	#	.≯
-T;	\u200C.>\u0338;	[C1 P1 V6];	[P1 V6 A4_2]	#	.≯
-N;	\u200C.>\u0338;	[C1 P1 V6];	[C1 P1 V6]	#	.≯
-B;	.xn--hdh;	[V6 A4_2];	[V6 A4_2]
-B;	xn--0ug.xn--hdh;	[C1 V6];	[C1 V6]	#	.≯
-B;	𰅧񣩠-．\uABED-悜;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-.꯭-悜
-B;	𰅧񣩠-.\uABED-悜;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-.꯭-悜
-B;	xn----7m53aj640l.xn----8f4br83t;	[V3 V5 V6];	[V3 V5 V6]	#	-.꯭-悜
-T;	ᡉ𶓧⬞ᢜ.-\u200D𞣑\u202E;	[C2 P1 V3 V6];	[P1 V3 V6]	#	ᡉ⬞ᢜ.-𞣑
-N;	ᡉ𶓧⬞ᢜ.-\u200D𞣑\u202E;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	ᡉ⬞ᢜ.-𞣑
-B;	xn--87e0ol04cdl39e.xn----qinu247r;	[V3 V6];	[V3 V6]	#	ᡉ⬞ᢜ.-𞣑
-B;	xn--87e0ol04cdl39e.xn----ugn5e3763s;	[C2 V3 V6];	[C2 V3 V6]	#	ᡉ⬞ᢜ.-𞣑
-T;	�\u200C衃Ⴝ.\u0682Ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�衃Ⴝ.ڂႴ
-N;	�\u200C衃Ⴝ.\u0682Ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	�衃Ⴝ.ڂႴ
-T;	9.\u200C衃Ⴝ.\u0682Ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	9.衃Ⴝ.ڂႴ
-N;	9.\u200C衃Ⴝ.\u0682Ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	9.衃Ⴝ.ڂႴ
-T;	9.\u200C衃�.\u0682ⴔ;	[B1 B2 B3 C1];	[B1 B2 B3]	#	9.衃�.ڂⴔ
-N;	9.\u200C衃�.\u0682ⴔ;	[B1 B2 B3 C1];	[B1 B2 B3 C1]	#	9.衃�.ڂⴔ
-T;	9.\u200C衃Ⴝ.\u0682ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	9.衃Ⴝ.ڂⴔ
-N;	9.\u200C衃Ⴝ.\u0682ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	9.衃Ⴝ.ڂⴔ
-B;	9.xn--1nd9032d.xn--7ib268q;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	9.衃Ⴝ.ڂⴔ
-B;	9.xn--1nd159e1y2f.xn--7ib268q;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	9.衃Ⴝ.ڂⴔ
-B;	9.xn--llj1920a.xn--7ib268q;	[B1 B2 B3];	[B1 B2 B3]	#	9.衃�.ڂⴔ
-B;	9.xn--0ug862cbm5e.xn--7ib268q;	[B1 B2 B3 C1];	[B1 B2 B3 C1]	#	9.衃�.ڂⴔ
-B;	9.xn--1nd9032d.xn--7ib433c;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	9.衃Ⴝ.ڂႴ
-B;	9.xn--1nd159e1y2f.xn--7ib433c;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	9.衃Ⴝ.ڂႴ
-T;	�\u200C衃�.\u0682ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�衃�.ڂⴔ
-N;	�\u200C衃�.\u0682ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	�衃�.ڂⴔ
-T;	�\u200C衃Ⴝ.\u0682ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�衃Ⴝ.ڂⴔ
-N;	�\u200C衃Ⴝ.\u0682ⴔ;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	�衃Ⴝ.ڂⴔ
-B;	xn--1nd362hy16e.xn--7ib268q;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	�衃Ⴝ.ڂⴔ
-B;	xn--1nd159ecmd785k.xn--7ib268q;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	�衃Ⴝ.ڂⴔ
-B;	xn--1shy52abz3f.xn--7ib268q;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	�衃�.ڂⴔ
-B;	xn--0ugx0px1izu2h.xn--7ib268q;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	�衃�.ڂⴔ
-B;	xn--1nd362hy16e.xn--7ib433c;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	�衃Ⴝ.ڂႴ
-B;	xn--1nd159ecmd785k.xn--7ib433c;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	�衃Ⴝ.ڂႴ
-T;	\u07E1\u200C。--⸬;	[B1 B3 C1 V3];	[B1 V3]	#	ߡ.--⸬
-N;	\u07E1\u200C。--⸬;	[B1 B3 C1 V3];	[B1 B3 C1 V3]	#	ߡ.--⸬
-B;	xn--8sb.xn-----iw2a;	[B1 V3];	[B1 V3]	#	ߡ.--⸬
-B;	xn--8sb884j.xn-----iw2a;	[B1 B3 C1 V3];	[B1 B3 C1 V3]	#	ߡ.--⸬
-B;	𞥓．\u0718;	𞥓.\u0718;	xn--of6h.xn--inb	#	𞥓.ܘ
-B;	𞥓.\u0718;	;	xn--of6h.xn--inb	#	𞥓.ܘ
-B;	xn--of6h.xn--inb;	𞥓.\u0718;	xn--of6h.xn--inb	#	𞥓.ܘ
-B;	󠄽-．-\u0DCA;	[V3];	[V3]	#	-.-්
-B;	ó „½-.-\u0DCA;	[V3];	[V3]	#	-.-à·Š
-B;	-.xn----ptf;	[V3];	[V3]	#	-.-à·Š
-B;	�\u075B-.\u1927;	[B1 B3 B6 V3 V5];	[B1 B3 B6 V3 V5]	#	ݛ-.ᤧ
-B;	xn----k4c.xn--lff;	[B1 B3 B6 V3 V5];	[B1 B3 B6 V3 V5]	#	ݛ-.ᤧ
-B;	𞤴󠆹⦉�.\uA806⒌󘤸;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤴⦉�.꠆⒌
-B;	𞤴󠆹⦉�.\uA8065.󘤸;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤴⦉�.꠆5.
-B;	𞤒󠆹⦉�.\uA8065.󘤸;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤴⦉�.꠆5.
-B;	xn--fuix729epewf.xn--5-w93e.xn--7b83e;	[B1 V5 V6];	[B1 V5 V6]	#	𞤴⦉�.꠆5.
-B;	𞤒󠆹⦉�.\uA806⒌󘤸;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤴⦉�.꠆⒌
-B;	xn--fuix729epewf.xn--xsh5029b6e77i;	[B1 V5 V6];	[B1 V5 V6]	#	𞤴⦉�.꠆⒌
-T;	󠄸₀。𑖿\u200C�\u200D;	[B1 C2 V5];	[B1 V5]	#	0.𑖿�
-N;	󠄸₀。𑖿\u200C�\u200D;	[B1 C2 V5];	[B1 C2 V5]	#	0.𑖿�
-T;	󠄸0。𑖿\u200C�\u200D;	[B1 C2 V5];	[B1 V5]	#	0.𑖿�
-N;	󠄸0。𑖿\u200C�\u200D;	[B1 C2 V5];	[B1 C2 V5]	#	0.𑖿�
-B;	0.xn--mn9cz2s;	[B1 V5];	[B1 V5]
-B;	0.xn--0ugc8040p9hk;	[B1 C2 V5];	[B1 C2 V5]	#	0.𑖿�
-B;	Ⴚ�󠄄。�ퟶ\u103A;	[P1 V6];	[P1 V6]	#	Ⴚ�.5ퟶ်
-B;	Ⴚ�󠄄。5ퟶ\u103A;	[P1 V6];	[P1 V6]	#	Ⴚ�.5ퟶ်
-B;	ⴚ�󠄄。5ퟶ\u103A;	ⴚ�.5ퟶ\u103A;	xn--ilj2659d.xn--5-dug9054m;	NV8	#	ⴚ�.5ퟶ်
-B;	xn--ilj2659d.xn--5-dug9054m;	ⴚ�.5ퟶ\u103A;	xn--ilj2659d.xn--5-dug9054m;	NV8	#	ⴚ�.5ퟶ်
-B;	ⴚ�.5ퟶ\u103A;	;	xn--ilj2659d.xn--5-dug9054m;	NV8	#	ⴚ�.5ퟶ်
-B;	Ⴚ�.5ퟶ\u103A;	[P1 V6];	[P1 V6]	#	Ⴚ�.5ퟶ်
-B;	xn--ynd2415j.xn--5-dug9054m;	[V6];	[V6]	#	Ⴚ�.5ퟶ်
-B;	ⴚ�󠄄。�ퟶ\u103A;	ⴚ�.5ퟶ\u103A;	xn--ilj2659d.xn--5-dug9054m;	NV8	#	ⴚ�.5ퟶ်
-T;	\u200D-ᠹ﹪.\u1DE1\u1922;	[C2 P1 V5 V6];	[P1 V3 V5 V6]	#	-ᠹ﹪.ᷡᤢ
-N;	\u200D-ᠹ﹪.\u1DE1\u1922;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	-ᠹ﹪.ᷡᤢ
-T;	\u200D-ᠹ%.\u1DE1\u1922;	[C2 P1 V5 V6];	[P1 V3 V5 V6]	#	-ᠹ%.ᷡᤢ
-N;	\u200D-ᠹ%.\u1DE1\u1922;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	-ᠹ%.ᷡᤢ
-B;	xn---%-u4o.xn--gff52t;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-ᠹ%.ᷡᤢ
-B;	xn---%-u4oy48b.xn--gff52t;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	-ᠹ%.ᷡᤢ
-B;	xn----c6jx047j.xn--gff52t;	[V3 V5 V6];	[V3 V5 V6]	#	-ᠹ﹪.ᷡᤢ
-B;	xn----c6j614b1z4v.xn--gff52t;	[C2 V5 V6];	[C2 V5 V6]	#	-ᠹ﹪.ᷡᤢ
-B;	≠.ᠿ;	[P1 V6];	[P1 V6]
-B;	=\u0338.á ¿;	[P1 V6];	[P1 V6]
-B;	xn--1ch.xn--y7e;	[V6];	[V6]
-B;	\u0723\u05A3｡㌪;	\u0723\u05A3.�イツ;	xn--ucb18e.xn--eck4c5a	#	ܣ֣.�イツ
-B;	\u0723\u05A3。�イツ;	\u0723\u05A3.�イツ;	xn--ucb18e.xn--eck4c5a	#	ܣ֣.�イツ
-B;	xn--ucb18e.xn--eck4c5a;	\u0723\u05A3.�イツ;	xn--ucb18e.xn--eck4c5a	#	ܣ֣.�イツ
-B;	\u0723\u05A3.�イツ;	;	xn--ucb18e.xn--eck4c5a	#	ܣ֣.�イツ
-B;	𞷥󠆀≮.\u2D7F-;	[B1 B3 P1 V3 V5 V6];	[B1 B3 P1 V3 V5 V6]	#	≮.⵿-
-B;	𞷥󠆀<\u0338.\u2D7F-;	[B1 B3 P1 V3 V5 V6];	[B1 B3 P1 V3 V5 V6]	#	≮.⵿-
-B;	xn--gdhx802p.xn----i2s;	[B1 B3 V3 V5 V6];	[B1 B3 V3 V5 V6]	#	≮.⵿-
-B;	₆榎򦖎\u0D4D｡𞤅\u06ED\uFC5A󠮨;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	6榎�.𞤧ۭيي
-B;	6榎򦖎\u0D4D。𞤅\u06ED\u064A\u064A󠮨;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	6榎�.𞤧ۭيي
-B;	6榎򦖎\u0D4D。𞤧\u06ED\u064A\u064A󠮨;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	6榎�.𞤧ۭيي
-B;	xn--6-kmf4691ejv41j.xn--mhba10ch545mn8v8h;	[B1 B3 V6];	[B1 B3 V6]	#	6榎�.𞤧ۭيي
-B;	₆榎򦖎\u0D4D｡𞤧\u06ED\uFC5A󠮨;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	6榎�.𞤧ۭيي
-B;	𣩫．򌑲;	[P1 V6];	[P1 V6]
-B;	𣩫.򌑲;	[P1 V6];	[P1 V6]
-B;	xn--td3j.xn--4628b;	[V6];	[V6]
-T;	\u200D︒｡\u06B9\u200C;	[B1 B3 C1 C2 P1 V6];	[B1 P1 V6]	#	︒.ڹ
-N;	\u200D︒｡\u06B9\u200C;	[B1 B3 C1 C2 P1 V6];	[B1 B3 C1 C2 P1 V6]	#	︒.ڹ
-B;	xn--y86c.xn--skb;	[B1 V6];	[B1 V6]	#	︒.ڹ
-B;	xn--1ug2658f.xn--skb080k;	[B1 B3 C1 C2 V6];	[B1 B3 C1 C2 V6]	#	︒.ڹ
-B;	xn--skb;	\u06B9;	xn--skb	#	Ú¹
-B;	\u06B9;	;	xn--skb	#	Ú¹
-T;	�\u200C�。\u206D;	[B1 C1 P1 V6];	[B1 P1 V6]	#	��.
-N;	�\u200C�。\u206D;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	��.
-B;	xn--eo0d6a.xn--sxg;	[B1 V6];	[B1 V6]	#	��.
-B;	xn--0ug4994goba.xn--sxg;	[B1 C1 V6];	[B1 C1 V6]	#	��.
-B;	\u0C4D�\u05A9�。-𑜨;	[V3 V5];	[V3 V5]	#	��֩1.-𑜨
-B;	\u0C4D�\u05A91。-𑜨;	[V3 V5];	[V3 V5]	#	��֩1.-𑜨
-B;	xn--1-rfc312cdp45c.xn----nq0j;	[V3 V5];	[V3 V5]	#	��֩1.-𑜨
-B;	򣿈。�;	[P1 V6];	[P1 V6]
-B;	򣿈。뙏;	[P1 V6];	[P1 V6]
-B;	xn--ph26c.xn--281b;	[V6];	[V6]
-B;	񕨚󠄌󑽀ᡀ.\u08B6;	[P1 V6];	[P1 V6]	#	ᡀ.ࢶ
-B;	xn--z7e98100evc01b.xn--czb;	[V6];	[V6]	#	ᡀ.ࢶ
-T;	\u200D｡�;	[C2 P1 V6];	[P1 V6 A4_2]	#	.
-N;	\u200D｡�;	[C2 P1 V6];	[C2 P1 V6]	#	.
-T;	\u200D。�;	[C2 P1 V6];	[P1 V6 A4_2]	#	.
-N;	\u200D。�;	[C2 P1 V6];	[C2 P1 V6]	#	.
-B;	.xn--6x4u;	[V6 A4_2];	[V6 A4_2]
-B;	xn--1ug.xn--6x4u;	[C2 V6];	[C2 V6]	#	.
-B;	\u084B皥．-;	[B1 B2 B3 V3];	[B1 B2 B3 V3]	#	ࡋ皥.-
-B;	\u084B皥.-;	[B1 B2 B3 V3];	[B1 B2 B3 V3]	#	ࡋ皥.-
-B;	xn--9vb4167c.-;	[B1 B2 B3 V3];	[B1 B2 B3 V3]	#	ࡋ皥.-
-B;	�\u0315�．⒈ꡦ;	[B1 P1 V6];	[B1 P1 V6]	#	̕�.⒈ꡦ
-B;	�\u0315�.1.ꡦ;	[B1 P1 V6];	[B1 P1 V6]	#	̕�.1.ꡦ
-B;	xn--5sa9915kgvb.1.xn--cd9a;	[B1 V6];	[B1 V6]	#	̕�.1.ꡦ
-B;	xn--5sa9915kgvb.xn--tshw539b;	[B1 V6];	[B1 V6]	#	̕�.⒈ꡦ
-T;	Ⴛ\u200C\u05A2\u200D。\uFFA0��;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴛ֢.��
-N;	Ⴛ\u200C\u05A2\u200D。\uFFA0��;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	Ⴛ֢.��
-T;	Ⴛ\u200C\u05A2\u200D。\uFFA0a\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴛ֢.��
-N;	Ⴛ\u200C\u05A2\u200D。\uFFA0a\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	Ⴛ֢.��
-T;	Ⴛ\u200C\u05A2\u200D。\u1160��;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴛ֢.��
-N;	Ⴛ\u200C\u05A2\u200D。\u1160��;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	Ⴛ֢.��
-T;	Ⴛ\u200C\u05A2\u200D。\u1160a\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴛ֢.��
-N;	Ⴛ\u200C\u05A2\u200D。\u1160a\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	Ⴛ֢.��
-T;	ⴛ\u200C\u05A2\u200D。\u1160a\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	ⴛ֢.��
-N;	ⴛ\u200C\u05A2\u200D。\u1160a\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	ⴛ֢.��
-T;	ⴛ\u200C\u05A2\u200D。\u1160��;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	ⴛ֢.��
-N;	ⴛ\u200C\u05A2\u200D。\u1160��;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	ⴛ֢.��
-T;	Ⴛ\u200C\u05A2\u200D。\u1160Ā�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴛ֢.��
-N;	Ⴛ\u200C\u05A2\u200D。\u1160Ā�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	Ⴛ֢.��
-T;	Ⴛ\u200C\u05A2\u200D。\u1160A\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴛ֢.��
-N;	Ⴛ\u200C\u05A2\u200D。\u1160A\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	Ⴛ֢.��
-B;	xn--tcb597c.xn--yda594fdn5q;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴛ֢.��
-B;	xn--tcb597cdmmfa.xn--yda594fdn5q;	[B5 B6 C1 C2 V6];	[B5 B6 C1 C2 V6]	#	Ⴛ֢.��
-B;	xn--tcb323r.xn--yda594fdn5q;	[B5 B6 V6];	[B5 B6 V6]	#	ⴛ֢.��
-B;	xn--tcb736kea974k.xn--yda594fdn5q;	[B5 B6 C1 C2 V6];	[B5 B6 C1 C2 V6]	#	ⴛ֢.��
-T;	ⴛ\u200C\u05A2\u200D。\uFFA0a\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	ⴛ֢.��
-N;	ⴛ\u200C\u05A2\u200D。\uFFA0a\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	ⴛ֢.��
-T;	ⴛ\u200C\u05A2\u200D。\uFFA0��;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	ⴛ֢.��
-N;	ⴛ\u200C\u05A2\u200D。\uFFA0��;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	ⴛ֢.��
-T;	Ⴛ\u200C\u05A2\u200D。\uFFA0Ā�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴛ֢.��
-N;	Ⴛ\u200C\u05A2\u200D。\uFFA0Ā�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	Ⴛ֢.��
-T;	Ⴛ\u200C\u05A2\u200D。\uFFA0A\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	Ⴛ֢.��
-N;	Ⴛ\u200C\u05A2\u200D。\uFFA0A\u0304�;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	Ⴛ֢.��
-B;	xn--tcb597c.xn--yda9741khjj;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴛ֢.��
-B;	xn--tcb597cdmmfa.xn--yda9741khjj;	[B5 B6 C1 C2 V6];	[B5 B6 C1 C2 V6]	#	Ⴛ֢.��
-B;	xn--tcb323r.xn--yda9741khjj;	[B5 B6 V6];	[B5 B6 V6]	#	ⴛ֢.��
-B;	xn--tcb736kea974k.xn--yda9741khjj;	[B5 B6 C1 C2 V6];	[B5 B6 C1 C2 V6]	#	ⴛ֢.��
-T;	\uFFF9\u200C｡曳⾑�≯;	[C1 P1 V6];	[P1 V6]	#	.曳襾�≯
-N;	\uFFF9\u200C｡曳⾑�≯;	[C1 P1 V6];	[C1 P1 V6]	#	.曳襾�≯
-T;	\uFFF9\u200C｡曳⾑�>\u0338;	[C1 P1 V6];	[P1 V6]	#	.曳襾�≯
-N;	\uFFF9\u200C｡曳⾑�>\u0338;	[C1 P1 V6];	[C1 P1 V6]	#	.曳襾�≯
-T;	\uFFF9\u200C。曳襾�≯;	[C1 P1 V6];	[P1 V6]	#	.曳襾�≯
-N;	\uFFF9\u200C。曳襾�≯;	[C1 P1 V6];	[C1 P1 V6]	#	.曳襾�≯
-T;	\uFFF9\u200C。曳襾�>\u0338;	[C1 P1 V6];	[P1 V6]	#	.曳襾�≯
-N;	\uFFF9\u200C。曳襾�>\u0338;	[C1 P1 V6];	[C1 P1 V6]	#	.曳襾�≯
-B;	xn--vn7c.xn--hdh501y8wvfs5h;	[V6];	[V6]	#	.曳襾�≯
-B;	xn--0ug2139f.xn--hdh501y8wvfs5h;	[C1 V6];	[C1 V6]	#	.曳襾�≯
-T;	≯⒈。ß;	[P1 V6];	[P1 V6]
-N;	≯⒈。ß;	[P1 V6];	[P1 V6]
-T;	>\u0338⒈。ß;	[P1 V6];	[P1 V6]
-N;	>\u0338⒈。ß;	[P1 V6];	[P1 V6]
-T;	≯1.。ß;	[P1 V6 A4_2];	[P1 V6 A4_2]
-N;	≯1.。ß;	[P1 V6 A4_2];	[P1 V6 A4_2]
-T;	>\u03381.。ß;	[P1 V6 A4_2];	[P1 V6 A4_2]
-N;	>\u03381.。ß;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	>\u03381.。SS;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	≯1.。SS;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	≯1.。ss;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	>\u03381.。ss;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	>\u03381.。Ss;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	≯1.。Ss;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	xn--1-ogo..ss;	[V6 A4_2];	[V6 A4_2]
-B;	xn--1-ogo..xn--zca;	[V6 A4_2];	[V6 A4_2]
-B;	>\u0338⒈。SS;	[P1 V6];	[P1 V6]
-B;	≯⒈。SS;	[P1 V6];	[P1 V6]
-B;	≯⒈。ss;	[P1 V6];	[P1 V6]
-B;	>\u0338⒈。ss;	[P1 V6];	[P1 V6]
-B;	>\u0338⒈。Ss;	[P1 V6];	[P1 V6]
-B;	≯⒈。Ss;	[P1 V6];	[P1 V6]
-B;	xn--hdh84f.ss;	[V6];	[V6]
-B;	xn--hdh84f.xn--zca;	[V6];	[V6]
-T;	\u0667\u200D\uFB96｡\u07DA-₆Ⴙ;	[B1 B2 B3 C2 P1 V6];	[B1 B2 B3 P1 V6]	#	٧ڳ.ߚ-6Ⴙ
-N;	\u0667\u200D\uFB96｡\u07DA-₆Ⴙ;	[B1 B2 B3 C2 P1 V6];	[B1 B2 B3 C2 P1 V6]	#	٧ڳ.ߚ-6Ⴙ
-T;	\u0667\u200D\u06B3。\u07DA-6Ⴙ;	[B1 B2 B3 C2 P1 V6];	[B1 B2 B3 P1 V6]	#	٧ڳ.ߚ-6Ⴙ
-N;	\u0667\u200D\u06B3。\u07DA-6Ⴙ;	[B1 B2 B3 C2 P1 V6];	[B1 B2 B3 C2 P1 V6]	#	٧ڳ.ߚ-6Ⴙ
-T;	\u0667\u200D\u06B3。\u07DA-6ⴙ;	[B1 B2 B3 C2];	[B1 B2 B3]	#	٧ڳ.ߚ-6ⴙ
-N;	\u0667\u200D\u06B3。\u07DA-6ⴙ;	[B1 B2 B3 C2];	[B1 B2 B3 C2]	#	٧ڳ.ߚ-6ⴙ
-B;	xn--gib6m.xn---6-lve6529a;	[B1 B2 B3];	[B1 B2 B3]	#	Ù§Ú³.ßš-6â´™
-B;	xn--gib6m343e.xn---6-lve6529a;	[B1 B2 B3 C2];	[B1 B2 B3 C2]	#	Ù§Ú³.ßš-6â´™
-B;	xn--gib6m.xn---6-lve002g;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	٧ڳ.ߚ-6Ⴙ
-B;	xn--gib6m343e.xn---6-lve002g;	[B1 B2 B3 C2 V6];	[B1 B2 B3 C2 V6]	#	٧ڳ.ߚ-6Ⴙ
-T;	\u0667\u200D\uFB96｡\u07DA-₆ⴙ;	[B1 B2 B3 C2];	[B1 B2 B3]	#	٧ڳ.ߚ-6ⴙ
-N;	\u0667\u200D\uFB96｡\u07DA-₆ⴙ;	[B1 B2 B3 C2];	[B1 B2 B3 C2]	#	٧ڳ.ߚ-6ⴙ
-T;	\u200C｡≠;	[C1 P1 V6];	[P1 V6 A4_2]	#	.≠
-N;	\u200C｡≠;	[C1 P1 V6];	[C1 P1 V6]	#	.≠
-T;	\u200C｡=\u0338;	[C1 P1 V6];	[P1 V6 A4_2]	#	.≠
-N;	\u200C｡=\u0338;	[C1 P1 V6];	[C1 P1 V6]	#	.≠
-T;	\u200C。≠;	[C1 P1 V6];	[P1 V6 A4_2]	#	.≠
-N;	\u200C。≠;	[C1 P1 V6];	[C1 P1 V6]	#	.≠
-T;	\u200C。=\u0338;	[C1 P1 V6];	[P1 V6 A4_2]	#	.≠
-N;	\u200C。=\u0338;	[C1 P1 V6];	[C1 P1 V6]	#	.≠
-B;	.xn--1ch;	[V6 A4_2];	[V6 A4_2]
-B;	xn--0ug.xn--1ch;	[C1 V6];	[C1 V6]	#	.≠
-T;	𑖿�.ᡟ𑖿\u1B42\u200C;	[C1 V5];	[V5]	#	𑖿�.ᡟ𑖿ᭂ
-N;	𑖿�.ᡟ𑖿\u1B42\u200C;	[C1 V5];	[C1 V5]	#	𑖿�.ᡟ𑖿ᭂ
-B;	xn--461dw464a.xn--v8e29loy65a;	[V5];	[V5]	#	𑖿�.ᡟ𑖿ᭂ
-B;	xn--461dw464a.xn--v8e29ldzfo952a;	[C1 V5];	[C1 V5]	#	𑖿�.ᡟ𑖿ᭂ
-T;	򔣳\u200D�.𖬴Ↄ≠-;	[C2 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	.𖬴Ↄ≠-
-N;	򔣳\u200D�.𖬴Ↄ≠-;	[C2 P1 V3 V5 V6];	[C2 P1 V3 V5 V6]	#	.𖬴Ↄ≠-
-T;	򔣳\u200D�.𖬴Ↄ=\u0338-;	[C2 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	.𖬴Ↄ≠-
-N;	򔣳\u200D�.𖬴Ↄ=\u0338-;	[C2 P1 V3 V5 V6];	[C2 P1 V3 V5 V6]	#	.𖬴Ↄ≠-
-T;	򔣳\u200D�.𖬴ↄ=\u0338-;	[C2 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	.𖬴ↄ≠-
-N;	򔣳\u200D�.𖬴ↄ=\u0338-;	[C2 P1 V3 V5 V6];	[C2 P1 V3 V5 V6]	#	.𖬴ↄ≠-
-T;	򔣳\u200D�.𖬴ↄ≠-;	[C2 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	.𖬴ↄ≠-
-N;	򔣳\u200D�.𖬴ↄ≠-;	[C2 P1 V3 V5 V6];	[C2 P1 V3 V5 V6]	#	.𖬴ↄ≠-
-B;	xn--6j00chy9a.xn----81n51bt713h;	[V3 V5 V6];	[V3 V5 V6]
-B;	xn--1ug15151gkb5a.xn----81n51bt713h;	[C2 V3 V5 V6];	[C2 V3 V5 V6]	#	.𖬴ↄ≠-
-B;	xn--6j00chy9a.xn----61n81bt713h;	[V3 V5 V6];	[V3 V5 V6]
-B;	xn--1ug15151gkb5a.xn----61n81bt713h;	[C2 V3 V5 V6];	[C2 V3 V5 V6]	#	.𖬴Ↄ≠-
-T;	\u07E2ς\u200D�。蔑򛖢;	[B2 C2 P1 V6];	[B2 P1 V6]	#	ߢς7.蔑
-N;	\u07E2ς\u200D�。蔑򛖢;	[B2 C2 P1 V6];	[B2 C2 P1 V6]	#	ߢς7.蔑
-T;	\u07E2ς\u200D7。蔑򛖢;	[B2 C2 P1 V6];	[B2 P1 V6]	#	ߢς7.蔑
-N;	\u07E2ς\u200D7。蔑򛖢;	[B2 C2 P1 V6];	[B2 C2 P1 V6]	#	ߢς7.蔑
-T;	\u07E2Σ\u200D7。蔑򛖢;	[B2 C2 P1 V6];	[B2 P1 V6]	#	ߢσ7.蔑
-N;	\u07E2Σ\u200D7。蔑򛖢;	[B2 C2 P1 V6];	[B2 C2 P1 V6]	#	ߢσ7.蔑
-T;	\u07E2σ\u200D7。蔑򛖢;	[B2 C2 P1 V6];	[B2 P1 V6]	#	ߢσ7.蔑
-N;	\u07E2σ\u200D7。蔑򛖢;	[B2 C2 P1 V6];	[B2 C2 P1 V6]	#	ߢσ7.蔑
-B;	xn--7-zmb872a.xn--wy1ao4929b;	[B2 V6];	[B2 V6]	#	ߢσ7.蔑
-B;	xn--7-zmb872aez5a.xn--wy1ao4929b;	[B2 C2 V6];	[B2 C2 V6]	#	ߢσ7.蔑
-B;	xn--7-xmb182aez5a.xn--wy1ao4929b;	[B2 C2 V6];	[B2 C2 V6]	#	ߢς7.蔑
-T;	\u07E2Σ\u200D�。蔑򛖢;	[B2 C2 P1 V6];	[B2 P1 V6]	#	ߢσ7.蔑
-N;	\u07E2Σ\u200D�。蔑򛖢;	[B2 C2 P1 V6];	[B2 C2 P1 V6]	#	ߢσ7.蔑
-T;	\u07E2σ\u200D�。蔑򛖢;	[B2 C2 P1 V6];	[B2 P1 V6]	#	ߢσ7.蔑
-N;	\u07E2σ\u200D�。蔑򛖢;	[B2 C2 P1 V6];	[B2 C2 P1 V6]	#	ߢσ7.蔑
-B;	�.\u0600;	[B1 P1 V6];	[B1 P1 V6]	#	�.
-B;	xn--oo0d.xn--ifb;	[B1 V6];	[B1 V6]	#	�.
-B;	-\u08A8.𱠖;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ࢨ.
-B;	xn----mod.xn--5o9n;	[B1 V3 V6];	[B1 V3 V6]	#	-ࢨ.
-B;	≯𞱸󠇀。誆⒈;	[B1 P1 V6];	[B1 P1 V6]
-B;	>\u0338𞱸󠇀。誆⒈;	[B1 P1 V6];	[B1 P1 V6]
-B;	≯𞱸󠇀。誆1.;	[B1 P1 V6];	[B1 P1 V6]
-B;	>\u0338𞱸󠇀。誆1.;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--hdh7151p.xn--1-dy1d.;	[B1 V6];	[B1 V6]
-B;	xn--hdh7151p.xn--tsh1248a;	[B1 V6];	[B1 V6]
-B;	\u0616𞥙�\u0650．︒\u0645↺\u069C;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ؖ𞥙��.︒م↺ڜ
-B;	\u0616𞥙�\u0650.。\u0645↺\u069C;	[B1 V5 A4_2];	[B1 V5 A4_2]	#	ؖ𞥙��..م↺ڜ
-B;	xn--4fb0j490qjg4x..xn--hhb8o948e;	[B1 V5 A4_2];	[B1 V5 A4_2]	#	ؖ𞥙��..م↺ڜ
-B;	xn--4fb0j490qjg4x.xn--hhb8o948euo5r;	[B1 V5 V6];	[B1 V5 V6]	#	ؖ𞥙��.︒م↺ڜ
-T;	퀬-\uDF7E񶳒.\u200C\u0AC5󩸤۴;	[C1 P1 V6];	[P1 V5 V6 A3]	#	퀬-.ૅ۴
-N;	퀬-\uDF7E񶳒.\u200C\u0AC5󩸤۴;	[C1 P1 V6];	[C1 P1 V6 A3]	#	퀬-.ૅ۴
-T;	�ᅰᆻ-\uDF7E񶳒.\u200C\u0AC5󩸤۴;	[C1 P1 V6];	[P1 V5 V6 A3]	#	퀬-.ૅ۴
-N;	�ᅰᆻ-\uDF7E񶳒.\u200C\u0AC5󩸤۴;	[C1 P1 V6];	[C1 P1 V6 A3]	#	퀬-.ૅ۴
-B;	퀬-\uDF7E񶳒.xn--hmb76q74166b;	[P1 V5 V6];	[P1 V5 V6 A3]	#	퀬-.ૅ۴
-B;	�ᅰᆻ-\uDF7E񶳒.xn--hmb76q74166b;	[P1 V5 V6];	[P1 V5 V6 A3]	#	퀬-.ૅ۴
-B;	�ᅰᆻ-\uDF7E񶳒.XN--HMB76Q74166B;	[P1 V5 V6];	[P1 V5 V6 A3]	#	퀬-.ૅ۴
-B;	퀬-\uDF7E񶳒.XN--HMB76Q74166B;	[P1 V5 V6];	[P1 V5 V6 A3]	#	퀬-.ૅ۴
-B;	퀬-\uDF7E񶳒.Xn--Hmb76q74166b;	[P1 V5 V6];	[P1 V5 V6 A3]	#	퀬-.ૅ۴
-B;	�ᅰᆻ-\uDF7E񶳒.Xn--Hmb76q74166b;	[P1 V5 V6];	[P1 V5 V6 A3]	#	퀬-.ૅ۴
-B;	퀬-\uDF7E񶳒.xn--hmb76q48y18505a;	[C1 P1 V6];	[C1 P1 V6 A3]	#	퀬-.ૅ۴
-B;	�ᅰᆻ-\uDF7E񶳒.xn--hmb76q48y18505a;	[C1 P1 V6];	[C1 P1 V6 A3]	#	퀬-.ૅ۴
-B;	�ᅰᆻ-\uDF7E񶳒.XN--HMB76Q48Y18505A;	[C1 P1 V6];	[C1 P1 V6 A3]	#	퀬-.ૅ۴
-B;	퀬-\uDF7E񶳒.XN--HMB76Q48Y18505A;	[C1 P1 V6];	[C1 P1 V6 A3]	#	퀬-.ૅ۴
-B;	퀬-\uDF7E񶳒.Xn--Hmb76q48y18505a;	[C1 P1 V6];	[C1 P1 V6 A3]	#	퀬-.ૅ۴
-B;	�ᅰᆻ-\uDF7E񶳒.Xn--Hmb76q48y18505a;	[C1 P1 V6];	[C1 P1 V6 A3]	#	퀬-.ૅ۴
-B;	Ⴌ.�︒�𞾄;	[B1 P1 V6];	[B1 P1 V6]
-B;	Ⴌ.�。�𞾄;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	ⴌ.�。�𞾄;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	xn--3kj.xn--2o0d.xn--q30dg029a;	[B1 V5 V6];	[B1 V5 V6]
-B;	xn--knd.xn--2o0d.xn--q30dg029a;	[B1 V5 V6];	[B1 V5 V6]
-B;	ⴌ.�︒�𞾄;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--3kj.xn--y86c030a9ob6374b;	[B1 V6];	[B1 V6]
-B;	xn--knd.xn--y86c030a9ob6374b;	[B1 V6];	[B1 V6]
-B;	񧞿�。𞩕�;	[B3 B6 P1 V6];	[B3 B6 P1 V6]
-B;	xn--iyh90030d.xn--1m6hs0260c;	[B3 B6 V6];	[B3 B6 V6]
-T;	\u200D┮�．\u0C00\u0C4D\u1734\u200D;	[C2 V5];	[V5]	#	┮.ఀ�᜴
-N;	\u200D┮�．\u0C00\u0C4D\u1734\u200D;	[C2 V5];	[C2 V5]	#	┮.ఀ�᜴
-T;	\u200D┮�.\u0C00\u0C4D\u1734\u200D;	[C2 V5];	[V5]	#	┮.ఀ�᜴
-N;	\u200D┮�.\u0C00\u0C4D\u1734\u200D;	[C2 V5];	[C2 V5]	#	┮.ఀ�᜴
-B;	xn--kxh.xn--eoc8m432a;	[V5];	[V5]	#	┮.ఀ�᜴
-B;	xn--1ug04r.xn--eoc8m432a40i;	[C2 V5];	[C2 V5]	#	┮.ఀ�᜴
-B;	򹚪｡🄂;	[P1 V6];	[P1 V6]
-B;	򹚪。1,;	[P1 V6];	[P1 V6]
-B;	xn--n433d.1,;	[P1 V6];	[P1 V6]
-B;	xn--n433d.xn--v07h;	[V6];	[V6]
-B;	��.🛦;	[V5];	[V5]
-B;	xn--rbry728b.xn--y88h;	[V5];	[V5]
-B;	�3｡\u1BF1�;	[P1 V5 V6];	[P1 V5 V6]	#	3.ᯱ4
-B;	�3。\u1BF14;	[P1 V5 V6];	[P1 V5 V6]	#	3.ᯱ4
-B;	xn--3-ib31m.xn--4-pql;	[V5 V6];	[V5 V6]	#	3.ᯱ4
-T;	\u0687６Ⴔ辘.\uFD22\u0687\u200C;	[B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	ڇ6Ⴔ辘.صيڇ
-N;	\u0687６Ⴔ辘.\uFD22\u0687\u200C;	[B2 B3 C1 P1 V6];	[B2 B3 C1 P1 V6]	#	ڇ6Ⴔ辘.صيڇ
-T;	\u06876Ⴔ辘.\u0635\u064A\u0687\u200C;	[B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	ڇ6Ⴔ辘.صيڇ
-N;	\u06876Ⴔ辘.\u0635\u064A\u0687\u200C;	[B2 B3 C1 P1 V6];	[B2 B3 C1 P1 V6]	#	ڇ6Ⴔ辘.صيڇ
-T;	\u06876ⴔ辘.\u0635\u064A\u0687\u200C;	[B2 B3 C1];	[B2 B3]	#	ڇ6ⴔ辘.صيڇ
-N;	\u06876ⴔ辘.\u0635\u064A\u0687\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڇ6ⴔ辘.صيڇ
-B;	xn--6-gsc2270akm6f.xn--0gb6bxk;	[B2 B3];	[B2 B3]	#	ڇ6ⴔ辘.صيڇ
-B;	xn--6-gsc2270akm6f.xn--0gb6bxkx18g;	[B2 B3 C1];	[B2 B3 C1]	#	ڇ6ⴔ辘.صيڇ
-B;	xn--6-gsc039eqq6k.xn--0gb6bxk;	[B2 B3 V6];	[B2 B3 V6]	#	ڇ6Ⴔ辘.صيڇ
-B;	xn--6-gsc039eqq6k.xn--0gb6bxkx18g;	[B2 B3 C1 V6];	[B2 B3 C1 V6]	#	ڇ6Ⴔ辘.صيڇ
-T;	\u0687６ⴔ辘.\uFD22\u0687\u200C;	[B2 B3 C1];	[B2 B3]	#	ڇ6ⴔ辘.صيڇ
-N;	\u0687６ⴔ辘.\uFD22\u0687\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڇ6ⴔ辘.صيڇ
-B;	�.�𞰬򻫞۹;	[B2 P1 V6 A4_2];	[B2 P1 V6 A4_2]
-B;	.xn--mmb3954kd0uf1zx7f;	[B2 V6 A4_2];	[B2 V6 A4_2]
-B;	\uA87D≯．򻲀򒳄;	[P1 V6];	[P1 V6]	#	≯.
-B;	\uA87D>\u0338．򻲀򒳄;	[P1 V6];	[P1 V6]	#	≯.
-B;	\uA87D≯.򻲀򒳄;	[P1 V6];	[P1 V6]	#	≯.
-B;	\uA87D>\u0338.򻲀򒳄;	[P1 V6];	[P1 V6]	#	≯.
-B;	xn--hdh8193c.xn--5z40cp629b;	[V6];	[V6]	#	≯.
-T;	ς�\u067B.ς\u0714;	[B5 B6];	[B5 B6]	#	ς�ٻ.ςܔ
-N;	ς�\u067B.ς\u0714;	[B5 B6];	[B5 B6]	#	ς�ٻ.ςܔ
-B;	Σ�\u067B.Σ\u0714;	[B5 B6];	[B5 B6]	#	σ�ٻ.σܔ
-B;	σ�\u067B.σ\u0714;	[B5 B6];	[B5 B6]	#	σ�ٻ.σܔ
-B;	Σ�\u067B.σ\u0714;	[B5 B6];	[B5 B6]	#	σ�ٻ.σܔ
-B;	xn--4xa60l26n.xn--4xa21o;	[B5 B6];	[B5 B6]	#	σ�ٻ.σܔ
-T;	Σ�\u067B.ς\u0714;	[B5 B6];	[B5 B6]	#	σ�ٻ.ςܔ
-N;	Σ�\u067B.ς\u0714;	[B5 B6];	[B5 B6]	#	σ�ٻ.ςܔ
-T;	σ�\u067B.ς\u0714;	[B5 B6];	[B5 B6]	#	σ�ٻ.ςܔ
-N;	σ�\u067B.ς\u0714;	[B5 B6];	[B5 B6]	#	σ�ٻ.ςܔ
-B;	xn--4xa60l26n.xn--3xa41o;	[B5 B6];	[B5 B6]	#	σ�ٻ.ςܔ
-B;	xn--3xa80l26n.xn--3xa41o;	[B5 B6];	[B5 B6]	#	ς�ٻ.ςܔ
-B;	򄖚\u0748𠄯\u075F｡󠛩;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	݈𠄯ݟ.
-B;	򄖚\u0748𠄯\u075F。󠛩;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	݈𠄯ݟ.
-B;	xn--vob0c4369twfv8b.xn--kl46e;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	݈𠄯ݟ.
-T;	󠳛．\u200D䤫≠Ⴞ;	[C2 P1 V6];	[P1 V6]	#	.䤫≠Ⴞ
-N;	󠳛．\u200D䤫≠Ⴞ;	[C2 P1 V6];	[C2 P1 V6]	#	.䤫≠Ⴞ
-T;	󠳛．\u200D䤫=\u0338Ⴞ;	[C2 P1 V6];	[P1 V6]	#	.䤫≠Ⴞ
-N;	󠳛．\u200D䤫=\u0338Ⴞ;	[C2 P1 V6];	[C2 P1 V6]	#	.䤫≠Ⴞ
-T;	󠳛.\u200D䤫≠Ⴞ;	[C2 P1 V6];	[P1 V6]	#	.䤫≠Ⴞ
-N;	󠳛.\u200D䤫≠Ⴞ;	[C2 P1 V6];	[C2 P1 V6]	#	.䤫≠Ⴞ
-T;	󠳛.\u200D䤫=\u0338Ⴞ;	[C2 P1 V6];	[P1 V6]	#	.䤫≠Ⴞ
-N;	󠳛.\u200D䤫=\u0338Ⴞ;	[C2 P1 V6];	[C2 P1 V6]	#	.䤫≠Ⴞ
-T;	󠳛.\u200D䤫=\u0338ⴞ;	[C2 P1 V6];	[P1 V6]	#	.䤫≠ⴞ
-N;	󠳛.\u200D䤫=\u0338ⴞ;	[C2 P1 V6];	[C2 P1 V6]	#	.䤫≠ⴞ
-T;	󠳛.\u200D䤫≠ⴞ;	[C2 P1 V6];	[P1 V6]	#	.䤫≠ⴞ
-N;	󠳛.\u200D䤫≠ⴞ;	[C2 P1 V6];	[C2 P1 V6]	#	.䤫≠ⴞ
-B;	xn--1t56e.xn--1ch153bqvw;	[V6];	[V6]
-B;	xn--1t56e.xn--1ug73gzzpwi3a;	[C2 V6];	[C2 V6]	#	.䤫≠ⴞ
-B;	xn--1t56e.xn--2nd141ghl2a;	[V6];	[V6]
-B;	xn--1t56e.xn--2nd159e9vb743e;	[C2 V6];	[C2 V6]	#	.䤫≠Ⴞ
-T;	󠳛．\u200D䤫=\u0338ⴞ;	[C2 P1 V6];	[P1 V6]	#	.䤫≠ⴞ
-N;	󠳛．\u200D䤫=\u0338ⴞ;	[C2 P1 V6];	[C2 P1 V6]	#	.䤫≠ⴞ
-T;	󠳛．\u200D䤫≠ⴞ;	[C2 P1 V6];	[P1 V6]	#	.䤫≠ⴞ
-N;	󠳛．\u200D䤫≠ⴞ;	[C2 P1 V6];	[C2 P1 V6]	#	.䤫≠ⴞ
-B;	�𑈵．�🕥;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]
-B;	�𑈵.�🕥;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]
-B;	xn--bv0d02c.xn--bo0dq650b;	[B1 B2 B3 V6];	[B1 B2 B3 V6]
-B;	⒊⒈�。9;	[P1 V6];	[P1 V6]
-B;	3.1.�。9;	[V5];	[V5]
-B;	3.1.xn--110d.9;	[V5];	[V5]
-B;	xn--tshd3512p.9;	[V6];	[V6]
-T;	-\u200C\u2DF1≮．��4₉;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ⷱ≮.�49
-N;	-\u200C\u2DF1≮．��4₉;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	-ⷱ≮.�49
-T;	-\u200C\u2DF1<\u0338．��4₉;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ⷱ≮.�49
-N;	-\u200C\u2DF1<\u0338．��4₉;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	-ⷱ≮.�49
-T;	-\u200C\u2DF1≮.��49;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ⷱ≮.�49
-N;	-\u200C\u2DF1≮.��49;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	-ⷱ≮.�49
-T;	-\u200C\u2DF1<\u0338.��49;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ⷱ≮.�49
-N;	-\u200C\u2DF1<\u0338.��49;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	-ⷱ≮.�49
-B;	xn----ngo823c.xn--49-ki3om2611f;	[B1 V3 V6];	[B1 V3 V6]	#	-ⷱ≮.�49
-B;	xn----sgn20i14s.xn--49-ki3om2611f;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	-ⷱ≮.�49
-B;	-≯딾｡\u0847;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-≯딾.ࡇ
-B;	->\u0338딾｡\u0847;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-≯딾.ࡇ
-B;	-≯딾。\u0847;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-≯딾.ࡇ
-B;	->\u0338딾。\u0847;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-≯딾.ࡇ
-B;	xn----pgow547d.xn--5vb;	[B1 V3 V6];	[B1 V3 V6]	#	-≯딾.ࡇ
-T;	𑙢⒈�-｡�\u200C;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𑙢⒈�-.
-N;	𑙢⒈�-｡�\u200C;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𑙢⒈�-.
-T;	𑙢1.�-。�\u200C;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𑙢1.�-.
-N;	𑙢1.�-。�\u200C;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𑙢1.�-.
-B;	xn--1-bf0j.xn----516i.xn--jd46e;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn--1-bf0j.xn----516i.xn--0ug23321l;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	𑙢1.�-.
-B;	xn----dcpy090hiyg.xn--jd46e;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn----dcpy090hiyg.xn--0ug23321l;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	𑙢⒈�-.
-B;	\u034A．�;	[V5];	[V5]	#	͊.�
-B;	\u034A.�;	[V5];	[V5]	#	͊.�
-B;	xn--oua.xn--mr9c;	[V5];	[V5]	#	͊.�
-B;	훉≮｡\u0E34;	[P1 V5 V6];	[P1 V5 V6]	#	훉≮.ิ
-B;	훉<\u0338｡\u0E34;	[P1 V5 V6];	[P1 V5 V6]	#	훉≮.ิ
-B;	훉≮。\u0E34;	[P1 V5 V6];	[P1 V5 V6]	#	훉≮.ิ
-B;	훉<\u0338。\u0E34;	[P1 V5 V6];	[P1 V5 V6]	#	훉≮.ิ
-B;	xn--gdh2512e.xn--i4c;	[V5 V6];	[V5 V6]	#	훉≮.ิ
-B;	\u2DF7򞣉🃘．𴈇�\u0659𞤯;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ⷷ🃘.2ٙ𞤯
-B;	\u2DF7򞣉🃘.𴈇2\u0659𞤯;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ⷷ🃘.2ٙ𞤯
-B;	\u2DF7򞣉🃘.𴈇2\u0659�;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ⷷ🃘.2ٙ𞤯
-B;	xn--trj8045le6s9b.xn--2-upc23918acjsj;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	ⷷ🃘.2ٙ𞤯
-B;	\u2DF7򞣉🃘．𴈇�\u0659�;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ⷷ🃘.2ٙ𞤯
-T;	󗇩ßᢞ\u200C。\u0660𞷻\uFCD4-;	[B1 B6 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	ßᢞ.٠نخ-
-N;	󗇩ßᢞ\u200C。\u0660𞷻\uFCD4-;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	ßᢞ.٠نخ-
-T;	󗇩ßᢞ\u200C。\u0660𞷻\u0646\u062E-;	[B1 B6 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	ßᢞ.٠نخ-
-N;	󗇩ßᢞ\u200C。\u0660𞷻\u0646\u062E-;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	ßᢞ.٠نخ-
-T;	󗇩SSᢞ\u200C。\u0660𞷻\u0646\u062E-;	[B1 B6 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	ssᢞ.٠نخ-
-N;	󗇩SSᢞ\u200C。\u0660𞷻\u0646\u062E-;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	ssᢞ.٠نخ-
-T;	󗇩ssᢞ\u200C。\u0660𞷻\u0646\u062E-;	[B1 B6 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	ssᢞ.٠نخ-
-N;	󗇩ssᢞ\u200C。\u0660𞷻\u0646\u062E-;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	ssᢞ.٠نخ-
-T;	󗇩Ssᢞ\u200C。\u0660𞷻\u0646\u062E-;	[B1 B6 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	ssᢞ.٠نخ-
-N;	󗇩Ssᢞ\u200C。\u0660𞷻\u0646\u062E-;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	ssᢞ.٠نخ-
-B;	xn--ss-jepz4596r.xn----dnc5e1er384z;	[B1 V3 V6];	[B1 V3 V6]	#	ssᢞ.٠نخ-
-B;	xn--ss-jep006bqt765b.xn----dnc5e1er384z;	[B1 B6 C1 V3 V6];	[B1 B6 C1 V3 V6]	#	ssᢞ.٠نخ-
-B;	xn--zca272jbif10059a.xn----dnc5e1er384z;	[B1 B6 C1 V3 V6];	[B1 B6 C1 V3 V6]	#	ßᢞ.٠نخ-
-T;	󗇩SSᢞ\u200C。\u0660𞷻\uFCD4-;	[B1 B6 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	ssᢞ.٠نخ-
-N;	󗇩SSᢞ\u200C。\u0660𞷻\uFCD4-;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	ssᢞ.٠نخ-
-T;	󗇩ssᢞ\u200C。\u0660𞷻\uFCD4-;	[B1 B6 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	ssᢞ.٠نخ-
-N;	󗇩ssᢞ\u200C。\u0660𞷻\uFCD4-;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	ssᢞ.٠نخ-
-T;	󗇩Ssᢞ\u200C。\u0660𞷻\uFCD4-;	[B1 B6 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	ssᢞ.٠نخ-
-N;	󗇩Ssᢞ\u200C。\u0660𞷻\uFCD4-;	[B1 B6 C1 P1 V3 V6];	[B1 B6 C1 P1 V3 V6]	#	ssᢞ.٠نخ-
-B;	ꡆ。Ↄ\u0FB5놮-;	[P1 V3 V6];	[P1 V3 V6]	#	ꡆ.Ↄྵ놮-
-B;	ꡆ。Ↄ\u0FB5놔�-;	[P1 V3 V6];	[P1 V3 V6]	#	ꡆ.Ↄྵ놮-
-B;	ꡆ。ↄ\u0FB5놔�-;	[V3];	[V3]	#	ꡆ.ↄྵ놮-
-B;	ꡆ。ↄ\u0FB5놮-;	[V3];	[V3]	#	ꡆ.ↄྵ놮-
-B;	xn--fc9a.xn----qmg097k469k;	[V3];	[V3]	#	ꡆ.ↄྵ놮-
-B;	xn--fc9a.xn----qmg787k869k;	[V3 V6];	[V3 V6]	#	ꡆ.Ↄྵ놮-
-T;	\uFDAD\u200D.񥰌\u06A9;	[B3 B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	لمي.ک
-N;	\uFDAD\u200D.񥰌\u06A9;	[B3 B5 B6 C2 P1 V6];	[B3 B5 B6 C2 P1 V6]	#	لمي.ک
-T;	\u0644\u0645\u064A\u200D.񥰌\u06A9;	[B3 B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	لمي.ک
-N;	\u0644\u0645\u064A\u200D.񥰌\u06A9;	[B3 B5 B6 C2 P1 V6];	[B3 B5 B6 C2 P1 V6]	#	لمي.ک
-B;	xn--ghbcp.xn--ckb36214f;	[B5 B6 V6];	[B5 B6 V6]	#	لمي.ک
-B;	xn--ghbcp494x.xn--ckb36214f;	[B3 B5 B6 C2 V6];	[B3 B5 B6 C2 V6]	#	لمي.ک
-B;	Ⴜ\u1C2F�≯。\u06E0\u1732\u0FBA;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	Ⴜᰯ�≯.۠ᜲྺ
-B;	Ⴜ\u1C2F�>\u0338。\u06E0\u1732\u0FBA;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	Ⴜᰯ�≯.۠ᜲྺ
-B;	ⴜ\u1C2F�>\u0338。\u06E0\u1732\u0FBA;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ⴜᰯ�≯.۠ᜲྺ
-B;	ⴜ\u1C2F�≯。\u06E0\u1732\u0FBA;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ⴜᰯ�≯.۠ᜲྺ
-B;	Ⴜ\u1C2F�≯。\u06E0\u1732\u0FBA;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	Ⴜᰯ�≯.۠ᜲྺ
-B;	Ⴜ\u1C2F�>\u0338。\u06E0\u1732\u0FBA;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	Ⴜᰯ�≯.۠ᜲྺ
-B;	xn--0nd679cf3eq67y.xn--wlb646b4ng;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	Ⴜᰯ�≯.۠ᜲྺ
-B;	xn--r1f68xh1jgv7u.xn--wlb646b4ng;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	ⴜᰯ�≯.۠ᜲྺ
-B;	�。\uFCEC;	[B1];	[B1]	#	�.كم
-B;	�。\u0643\u0645;	[B1];	[B1]	#	�.كم
-B;	xn--p97c.xn--fhbe;	[B1];	[B1]	#	�.كم
-B;	�.\u0643\u0645;	[B1];	[B1]	#	�.كم
-B;	≮�．�\uAAEC⹈󰥭;	[P1 V6];	[P1 V6]	#	≮.ꫬ⹈
-B;	<\u0338�．�\uAAEC⹈󰥭;	[P1 V6];	[P1 V6]	#	≮.ꫬ⹈
-B;	≮�.�\uAAEC⹈󰥭;	[P1 V6];	[P1 V6]	#	≮.ꫬ⹈
-B;	<\u0338�.�\uAAEC⹈󰥭;	[P1 V6];	[P1 V6]	#	≮.ꫬ⹈
-B;	xn--gdh0880o.xn--4tjx101bsg00ds9pyc;	[V6];	[V6]	#	≮.ꫬ⹈
-B;	\u2DF0\u0358ᢕ．\u0361��;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ⷰ͘ᢕ.͡�
-B;	\u2DF0\u0358ᢕ.\u0361��;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ⷰ͘ᢕ.͡�
-B;	xn--2ua889htsp.xn--cva2687k2tv0g;	[B1 V5 V6];	[B1 V5 V6]	#	ⷰ͘ᢕ.͡�
-T;	\uFD79�\u200C\u06AD．𑋪\u05C7;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]	#	غمم�ڭ.𑋪ׇ
-N;	\uFD79�\u200C\u06AD．𑋪\u05C7;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]	#	غمم�ڭ.𑋪ׇ
-T;	\u063A\u0645\u0645�\u200C\u06AD.𑋪\u05C7;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]	#	غمم�ڭ.𑋪ׇ
-N;	\u063A\u0645\u0645�\u200C\u06AD.𑋪\u05C7;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]	#	غمم�ڭ.𑋪ׇ
-B;	xn--5gbwa03bg24e.xn--vdb1198k;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]	#	غمم�ڭ.𑋪ׇ
-B;	xn--5gbwa03bg24eptk.xn--vdb1198k;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]	#	غمم�ڭ.𑋪ׇ
-T;	𑑂｡\u200D󥞀🞕�;	[C2 P1 V5 V6];	[P1 V5 V6]	#	𑑂.🞕
-N;	𑑂｡\u200D󥞀🞕�;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	𑑂.🞕
-T;	𑑂。\u200D󥞀🞕�;	[C2 P1 V5 V6];	[P1 V5 V6]	#	𑑂.🞕
-N;	𑑂。\u200D󥞀🞕�;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	𑑂.🞕
-B;	xn--8v1d.xn--ye9h41035a2qqs;	[V5 V6];	[V5 V6]
-B;	xn--8v1d.xn--1ug1386plvx1cd8vya;	[C2 V5 V6];	[C2 V5 V6]	#	𑑂.🞕
-B;	-\u05E9。⒚;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ש.⒚
-B;	-\u05E9。19.;	[B1 V3];	[B1 V3]	#	-ש.19.
-B;	xn----gjc.19.;	[B1 V3];	[B1 V3]	#	-ש.19.
-B;	xn----gjc.xn--cth;	[B1 V3 V6];	[B1 V3 V6]	#	-ש.⒚
-T;	􊾻\u0845\u200C｡ᢎ\u200D;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	ࡅ.ᢎ
-N;	􊾻\u0845\u200C｡ᢎ\u200D;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	ࡅ.ᢎ
-T;	􊾻\u0845\u200C。ᢎ\u200D;	[B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	ࡅ.ᢎ
-N;	􊾻\u0845\u200C。ᢎ\u200D;	[B5 B6 C1 C2 P1 V6];	[B5 B6 C1 C2 P1 V6]	#	ࡅ.ᢎ
-B;	xn--3vb50049s.xn--79e;	[B5 B6 V6];	[B5 B6 V6]	#	ࡅ.ᢎ
-B;	xn--3vb882jz4411a.xn--79e259a;	[B5 B6 C1 C2 V6];	[B5 B6 C1 C2 V6]	#	ࡅ.ᢎ
-T;	ß\u09C1\u1DED。\u06208₅;	ß\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ß�ᷭ.ؠ85
-N;	ß\u09C1\u1DED。\u06208₅;	ß\u09C1\u1DED.\u062085;	xn--zca266bwrr.xn--85-psd	#	ß�ᷭ.ؠ85
-T;	ß\u09C1\u1DED。\u062085;	ß\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ß�ᷭ.ؠ85
-N;	ß\u09C1\u1DED。\u062085;	ß\u09C1\u1DED.\u062085;	xn--zca266bwrr.xn--85-psd	#	ß�ᷭ.ؠ85
-B;	SS\u09C1\u1DED。\u062085;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	ss\u09C1\u1DED。\u062085;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	Ss\u09C1\u1DED。\u062085;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	xn--ss-e2f077r.xn--85-psd;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	ss\u09C1\u1DED.\u062085;	;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	SS\u09C1\u1DED.\u062085;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	Ss\u09C1\u1DED.\u062085;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	xn--zca266bwrr.xn--85-psd;	ß\u09C1\u1DED.\u062085;	xn--zca266bwrr.xn--85-psd	#	ß�ᷭ.ؠ85
-T;	ß\u09C1\u1DED.\u062085;	;	xn--ss-e2f077r.xn--85-psd	#	ß�ᷭ.ؠ85
-N;	ß\u09C1\u1DED.\u062085;	;	xn--zca266bwrr.xn--85-psd	#	ß�ᷭ.ؠ85
-B;	SS\u09C1\u1DED。\u06208₅;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	ss\u09C1\u1DED。\u06208₅;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-B;	Ss\u09C1\u1DED。\u06208₅;	ss\u09C1\u1DED.\u062085;	xn--ss-e2f077r.xn--85-psd	#	ss�ᷭ.ؠ85
-T;	\u0ACD\u0484魅�．₃�ß;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ß
-N;	\u0ACD\u0484魅�．₃�ß;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ß
-T;	\u0ACD\u0484魅1.3�ß;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ß
-N;	\u0ACD\u0484魅1.3�ß;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ß
-B;	\u0ACD\u0484魅1.3�SS;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ss
-B;	\u0ACD\u0484魅1.3�ss;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ss
-B;	\u0ACD\u0484魅1.3�Ss;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ss
-B;	xn--1-0xb049b102o.xn--3ss-nv9t;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ss
-B;	xn--1-0xb049b102o.xn--3-qfa7018r;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ß
-B;	\u0ACD\u0484魅�．₃�SS;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ss
-B;	\u0ACD\u0484魅�．₃�ss;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ss
-B;	\u0ACD\u0484魅�．₃�Ss;	[B1 V5];	[B1 V5]	#	�҄魅1.3�ss
-B;	\u072B｡𑓂⒈𑜫󠿻;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ܫ.𑓂⒈𑜫
-B;	\u072B。𑓂1.𑜫󠿻;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ܫ.𑓂1.𑜫
-B;	xn--1nb.xn--1-jq9i.xn--ji2dg9877c;	[B1 V5 V6];	[B1 V5 V6]	#	ܫ.𑓂1.𑜫
-B;	xn--1nb.xn--tsh7798f6rbrt828c;	[B1 V5 V6];	[B1 V5 V6]	#	ܫ.𑓂⒈𑜫
-B;	\uFE0Dછ。嵨;	છ.嵨;	xn--6dc.xn--tot
-B;	xn--6dc.xn--tot;	છ.嵨;	xn--6dc.xn--tot
-B;	છ.嵨;	;	xn--6dc.xn--tot
-B;	Ⴔ≠Ⴀ.��;	[B1 P1 V6];	[B1 P1 V6]
-B;	Ⴔ=\u0338Ⴀ.��;	[B1 P1 V6];	[B1 P1 V6]
-B;	ⴔ=\u0338ⴀ.��;	[B1 P1 V6];	[B1 P1 V6]
-B;	ⴔ≠ⴀ.��;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--1ch603bxb.xn--do0dwa;	[B1 V6];	[B1 V6]
-B;	xn--7md3b171g.xn--do0dwa;	[B1 V6];	[B1 V6]
-T;	-\u200C⒙�｡�;	[C1 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-⒙�.�
-N;	-\u200C⒙�｡�;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	-⒙�.�
-T;	-\u200C18.�。�;	[C1 V3 V5];	[V3 V5]	#	-18.�.�
-N;	-\u200C18.�。�;	[C1 V3 V5];	[C1 V3 V5]	#	-18.�.�
-B;	-18.xn--rx9c.xn--382h;	[V3 V5];	[V3 V5]
-B;	xn---18-9m0a.xn--rx9c.xn--382h;	[C1 V3 V5];	[C1 V3 V5]	#	-18.�.�
-B;	xn----ddps939g.xn--382h;	[V3 V5 V6];	[V3 V5 V6]
-B;	xn----sgn18r3191a.xn--382h;	[C1 V3 V5 V6];	[C1 V3 V5 V6]	#	-⒙�.�
-B;	︒.ʌᠣ-�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]
-B;	。.ʌᠣ-�;	[B5 B6 A4_2];	[B5 B6 A4_2]
-B;	。.Ʌᠣ-�;	[B5 B6 A4_2];	[B5 B6 A4_2]
-B;	..xn----73a596nuh9t;	[B5 B6 A4_2];	[B5 B6 A4_2]
-B;	︒.Ʌᠣ-�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]
-B;	xn--y86c.xn----73a596nuh9t;	[B1 B5 B6 V6];	[B1 B5 B6 V6]
-B;	\uFE05︒。𦀾\u1CE0;	[P1 V6];	[P1 V6]	#	︒.𦀾᳠
-B;	\uFE05。。𦀾\u1CE0;	[A4_2];	[A4_2]	#	..𦀾᳠
-B;	..xn--t6f5138v;	[A4_2];	[A4_2]	#	..𦀾᳠
-B;	xn--y86c.xn--t6f5138v;	[V6];	[V6]	#	︒.𦀾᳠
-B;	xn--t6f5138v;	𦀾\u1CE0;	xn--t6f5138v	#	𦀾᳠
-B;	𦀾\u1CE0;	;	xn--t6f5138v	#	𦀾᳠
-T;	𞮑ß�。�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-N;	𞮑ß�。�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	𞮑SS�。�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	𞮑ss�。�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	𞮑Ss�。�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	xn--ss-o412ac6305g.xn--07e;	[B2 B3 V6];	[B2 B3 V6]
-B;	xn--zca9432wb989f.xn--07e;	[B2 B3 V6];	[B2 B3 V6]
-T;	\uA953\u200D\u062C\u066C。𱆎󻡟\u200C󠅆;	[B5 B6 C1 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	꥓ج٬.
-N;	\uA953\u200D\u062C\u066C。𱆎󻡟\u200C󠅆;	[B5 B6 C1 P1 V5 V6];	[B5 B6 C1 P1 V5 V6]	#	꥓ج٬.
-B;	xn--rgb2k6711c.xn--ec8nj3948b;	[B5 B6 V5 V6];	[B5 B6 V5 V6]	#	꥓ج٬.
-B;	xn--rgb2k500fhq9j.xn--0ug78870a5sp9d;	[B5 B6 C1 V5 V6];	[B5 B6 C1 V5 V6]	#	꥓ج٬.
-T;	�．-ß\u200C≠;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ß≠
-N;	�．-ß\u200C≠;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ß≠
-T;	�．-ß\u200C=\u0338;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ß≠
-N;	�．-ß\u200C=\u0338;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ß≠
-T;	�.-ß\u200C≠;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ß≠
-N;	�.-ß\u200C≠;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ß≠
-T;	�.-ß\u200C=\u0338;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ß≠
-N;	�.-ß\u200C=\u0338;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ß≠
-T;	�.-SS\u200C=\u0338;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�.-SS\u200C=\u0338;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�.-SS\u200C≠;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�.-SS\u200C≠;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�.-ss\u200C≠;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�.-ss\u200C≠;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�.-ss\u200C=\u0338;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�.-ss\u200C=\u0338;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�.-Ss\u200C=\u0338;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�.-Ss\u200C=\u0338;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�.-Ss\u200C≠;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�.-Ss\u200C≠;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-B;	xn--u836e.xn---ss-gl2a;	[V3 V6];	[V3 V6]
-B;	xn--u836e.xn---ss-cn0at5l;	[C1 V3 V6];	[C1 V3 V6]	#	.-ss≠
-B;	xn--u836e.xn----qfa750ve7b;	[C1 V3 V6];	[C1 V3 V6]	#	.-ß≠
-T;	�．-SS\u200C=\u0338;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�．-SS\u200C=\u0338;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�．-SS\u200C≠;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�．-SS\u200C≠;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�．-ss\u200C≠;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�．-ss\u200C≠;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�．-ss\u200C=\u0338;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�．-ss\u200C=\u0338;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�．-Ss\u200C=\u0338;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�．-Ss\u200C=\u0338;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	�．-Ss\u200C≠;	[C1 P1 V3 V6];	[P1 V3 V6]	#	.-ss≠
-N;	�．-Ss\u200C≠;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.-ss≠
-T;	ᡙ\u200C｡≯�≠;	[C1 P1 V6];	[P1 V6]	#	ᡙ.≯�≠
-N;	ᡙ\u200C｡≯�≠;	[C1 P1 V6];	[C1 P1 V6]	#	ᡙ.≯�≠
-T;	ᡙ\u200C｡>\u0338�=\u0338;	[C1 P1 V6];	[P1 V6]	#	ᡙ.≯�≠
-N;	ᡙ\u200C｡>\u0338�=\u0338;	[C1 P1 V6];	[C1 P1 V6]	#	ᡙ.≯�≠
-T;	ᡙ\u200C。≯�≠;	[C1 P1 V6];	[P1 V6]	#	ᡙ.≯�≠
-N;	ᡙ\u200C。≯�≠;	[C1 P1 V6];	[C1 P1 V6]	#	ᡙ.≯�≠
-T;	ᡙ\u200C。>\u0338�=\u0338;	[C1 P1 V6];	[P1 V6]	#	ᡙ.≯�≠
-N;	ᡙ\u200C。>\u0338�=\u0338;	[C1 P1 V6];	[C1 P1 V6]	#	ᡙ.≯�≠
-B;	xn--p8e.xn--1ch3a7084l;	[V6];	[V6]
-B;	xn--p8e650b.xn--1ch3a7084l;	[C1 V6];	[C1 V6]	#	ᡙ.≯�≠
-B;	�𞲄�񆼩。\u034E🄀;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�.͎🄀
-B;	�𞲄�񆼩。\u034E0.;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�.͎0.
-B;	xn--fo0dw409aq58qrn69d.xn--0-bgb.;	[B1 V5 V6];	[B1 V5 V6]	#	�.͎0.
-B;	xn--fo0dw409aq58qrn69d.xn--sua6883w;	[B1 V5 V6];	[B1 V5 V6]	#	�.͎🄀
-T;	Ⴄ．\u200D\u0721󻣋ς;	[B1 C2 P1 V6];	[B2 B3 P1 V6]	#	Ⴄ.ܡς
-N;	Ⴄ．\u200D\u0721󻣋ς;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	Ⴄ.ܡς
-T;	Ⴄ.\u200D\u0721󻣋ς;	[B1 C2 P1 V6];	[B2 B3 P1 V6]	#	Ⴄ.ܡς
-N;	Ⴄ.\u200D\u0721󻣋ς;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	Ⴄ.ܡς
-T;	ⴄ.\u200D\u0721󻣋ς;	[B1 C2 P1 V6];	[B2 B3 P1 V6]	#	ⴄ.ܡς
-N;	ⴄ.\u200D\u0721󻣋ς;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	ⴄ.ܡς
-T;	Ⴄ.\u200D\u0721󻣋Σ;	[B1 C2 P1 V6];	[B2 B3 P1 V6]	#	Ⴄ.ܡσ
-N;	Ⴄ.\u200D\u0721󻣋Σ;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	Ⴄ.ܡσ
-T;	ⴄ.\u200D\u0721󻣋σ;	[B1 C2 P1 V6];	[B2 B3 P1 V6]	#	ⴄ.ܡσ
-N;	ⴄ.\u200D\u0721󻣋σ;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	ⴄ.ܡσ
-B;	xn--vkj.xn--4xa73ob5892c;	[B2 B3 V6];	[B2 B3 V6]	#	ⴄ.ܡσ
-B;	xn--vkj.xn--4xa73o3t5ajq467a;	[B1 C2 V6];	[B1 C2 V6]	#	ⴄ.ܡσ
-B;	xn--cnd.xn--4xa73ob5892c;	[B2 B3 V6];	[B2 B3 V6]	#	Ⴄ.ܡσ
-B;	xn--cnd.xn--4xa73o3t5ajq467a;	[B1 C2 V6];	[B1 C2 V6]	#	Ⴄ.ܡσ
-B;	xn--vkj.xn--3xa93o3t5ajq467a;	[B1 C2 V6];	[B1 C2 V6]	#	â´„.Ü¡Ï‚
-B;	xn--cnd.xn--3xa93o3t5ajq467a;	[B1 C2 V6];	[B1 C2 V6]	#	Ⴄ.ܡς
-T;	ⴄ．\u200D\u0721󻣋ς;	[B1 C2 P1 V6];	[B2 B3 P1 V6]	#	ⴄ.ܡς
-N;	ⴄ．\u200D\u0721󻣋ς;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	ⴄ.ܡς
-T;	Ⴄ．\u200D\u0721󻣋Σ;	[B1 C2 P1 V6];	[B2 B3 P1 V6]	#	Ⴄ.ܡσ
-N;	Ⴄ．\u200D\u0721󻣋Σ;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	Ⴄ.ܡσ
-T;	ⴄ．\u200D\u0721󻣋σ;	[B1 C2 P1 V6];	[B2 B3 P1 V6]	#	ⴄ.ܡσ
-N;	ⴄ．\u200D\u0721󻣋σ;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	ⴄ.ܡσ
-B;	򮵛\u0613.Ⴕ;	[P1 V6];	[P1 V6]	#	ؓ.Ⴕ
-B;	ò®µ›\u0613.â´•;	[P1 V6];	[P1 V6]	#	Ø“.â´•
-B;	xn--1fb94204l.xn--dlj;	[V6];	[V6]	#	Ø“.â´•
-B;	xn--1fb94204l.xn--tnd;	[V6];	[V6]	#	ؓ.Ⴕ
-T;	≯\u1DF3𞤥。\u200C\uA8C4󠪉\u200D;	[B1 C1 C2 P1 V6];	[B1 P1 V5 V6]	#	≯ᷳ𞤥.꣄
-N;	≯\u1DF3𞤥。\u200C\uA8C4󠪉\u200D;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	≯ᷳ𞤥.꣄
-T;	>\u0338\u1DF3𞤥。\u200C\uA8C4󠪉\u200D;	[B1 C1 C2 P1 V6];	[B1 P1 V5 V6]	#	≯ᷳ𞤥.꣄
-N;	>\u0338\u1DF3𞤥。\u200C\uA8C4󠪉\u200D;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	≯ᷳ𞤥.꣄
-T;	>\u0338\u1DF3𞤃。\u200C\uA8C4󠪉\u200D;	[B1 C1 C2 P1 V6];	[B1 P1 V5 V6]	#	≯ᷳ𞤥.꣄
-N;	>\u0338\u1DF3𞤃。\u200C\uA8C4󠪉\u200D;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	≯ᷳ𞤥.꣄
-T;	≯\u1DF3𞤃。\u200C\uA8C4󠪉\u200D;	[B1 C1 C2 P1 V6];	[B1 P1 V5 V6]	#	≯ᷳ𞤥.꣄
-N;	≯\u1DF3𞤃。\u200C\uA8C4󠪉\u200D;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	≯ᷳ𞤥.꣄
-B;	xn--ofg13qyr21c.xn--0f9au6706d;	[B1 V5 V6];	[B1 V5 V6]	#	≯ᷳ𞤥.꣄
-B;	xn--ofg13qyr21c.xn--0ugc0116hix29k;	[B1 C1 C2 V6];	[B1 C1 C2 V6]	#	≯ᷳ𞤥.꣄
-T;	\u200C󠄷｡�;	[C1 P1 V6];	[P1 V6 A4_2]	#	.
-N;	\u200C󠄷｡�;	[C1 P1 V6];	[C1 P1 V6]	#	.
-T;	\u200C󠄷。�;	[C1 P1 V6];	[P1 V6 A4_2]	#	.
-N;	\u200C󠄷。�;	[C1 P1 V6];	[C1 P1 V6]	#	.
-B;	.xn--w720c;	[V6 A4_2];	[V6 A4_2]
-B;	xn--0ug.xn--w720c;	[C1 V6];	[C1 V6]	#	.
-T;	⒈\u0DD6焅.󗡙\u200Dꡟ;	[C2 P1 V6];	[P1 V6]	#	⒈ූ焅.ꡟ
-N;	⒈\u0DD6焅.󗡙\u200Dꡟ;	[C2 P1 V6];	[C2 P1 V6]	#	⒈ූ焅.ꡟ
-T;	1.\u0DD6ç„….ó—¡™\u200Dê¡Ÿ;	[C2 P1 V5 V6];	[P1 V5 V6]	#	1.à·–ç„….ê¡Ÿ
-N;	1.\u0DD6ç„….ó—¡™\u200Dê¡Ÿ;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	1.à·–ç„….ê¡Ÿ
-B;	1.xn--t1c6981c.xn--4c9a21133d;	[V5 V6];	[V5 V6]	#	1.à·–ç„….ê¡Ÿ
-B;	1.xn--t1c6981c.xn--1ugz184c9lw7i;	[C2 V5 V6];	[C2 V5 V6]	#	1.à·–ç„….ê¡Ÿ
-B;	xn--t1c337io97c.xn--4c9a21133d;	[V6];	[V6]	#	⒈ූ焅.ꡟ
-B;	xn--t1c337io97c.xn--1ugz184c9lw7i;	[C2 V6];	[C2 V6]	#	⒈ූ焅.ꡟ
-T;	\u1DCDς≮.ς�𞤕0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ς≮.ς�𞤷0
-N;	\u1DCDς≮.ς�𞤕0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ς≮.ς�𞤷0
-T;	\u1DCDς<\u0338.ς�𞤕0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ς≮.ς�𞤷0
-N;	\u1DCDς<\u0338.ς�𞤕0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ς≮.ς�𞤷0
-T;	\u1DCDς<\u0338.ς�𞤷0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ς≮.ς�𞤷0
-N;	\u1DCDς<\u0338.ς�𞤷0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ς≮.ς�𞤷0
-T;	\u1DCDς≮.ς�𞤷0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ς≮.ς�𞤷0
-N;	\u1DCDς≮.ς�𞤷0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ς≮.ς�𞤷0
-B;	\u1DCDΣ≮.Σ�𞤕0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�σ≮.σ�𞤷0
-B;	\u1DCDΣ<\u0338.Σ�𞤕0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�σ≮.σ�𞤷0
-B;	\u1DCDσ<\u0338.σ�𞤷0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�σ≮.σ�𞤷0
-B;	\u1DCDσ≮.σ�𞤷0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�σ≮.σ�𞤷0
-B;	\u1DCDΣ≮.Σ�𞤷0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�σ≮.σ�𞤷0
-B;	\u1DCDΣ<\u0338.Σ�𞤷0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�σ≮.σ�𞤷0
-B;	xn--4xa544kvid.xn--0-zmb55727aggma;	[B1 B5 V5 V6];	[B1 B5 V5 V6]	#	�σ≮.σ�𞤷0
-B;	xn--3xa744kvid.xn--0-xmb85727aggma;	[B1 B5 V5 V6];	[B1 B5 V5 V6]	#	�ς≮.ς�𞤷0
-B;	\u1DCDσ≮.σ�𞤕0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�σ≮.σ�𞤷0
-B;	\u1DCDσ<\u0338.σ�𞤕0;	[B1 B5 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�σ≮.σ�𞤷0
-T;	򢦾ß\u05B9�.\u05AD\u08A1;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ßֹ�.֭ࢡ
-N;	򢦾ß\u05B9�.\u05AD\u08A1;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ßֹ�.֭ࢡ
-B;	򢦾SS\u05B9�.\u05AD\u08A1;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ssֹ�.֭ࢡ
-B;	򢦾ss\u05B9�.\u05AD\u08A1;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ssֹ�.֭ࢡ
-B;	򢦾Ss\u05B9�.\u05AD\u08A1;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ssֹ�.֭ࢡ
-B;	xn--ss-xjd6058xlz50g.xn--4cb62m;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	ssֹ�.֭ࢡ
-B;	xn--zca89v339zj118e.xn--4cb62m;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	ßֹ�.֭ࢡ
-B;	-𞣄｡⒈;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	-𞣄。1.;	[B1 V3];	[B1 V3]
-B;	xn----xc8r.1.;	[B1 V3];	[B1 V3]
-B;	xn----xc8r.xn--tsh;	[B1 V3 V6];	[B1 V3 V6]
-B;	񈠢��。\u063E𑘿;	[B5 P1 V6];	[B5 P1 V6]	#	�9.ؾ𑘿
-B;	񈠢�9。\u063E𑘿;	[B5 P1 V6];	[B5 P1 V6]	#	�9.ؾ𑘿
-B;	xn--9-el5iv442t.xn--9gb0830l;	[B5 V6];	[B5 V6]	#	�9.ؾ𑘿
-T;	\u0668\uFC8C\u0668\u1A5D.\u200D;	[B1 C2];	[B1]	#	٨نم٨�.
-N;	\u0668\uFC8C\u0668\u1A5D.\u200D;	[B1 C2];	[B1 C2]	#	٨نم٨�.
-T;	\u0668\u0646\u0645\u0668\u1A5D.\u200D;	[B1 C2];	[B1]	#	٨نم٨�.
-N;	\u0668\u0646\u0645\u0668\u1A5D.\u200D;	[B1 C2];	[B1 C2]	#	٨نم٨�.
-B;	xn--hhbb5hc956w.;	[B1];	[B1]	#	٨نم٨�.
-B;	xn--hhbb5hc956w.xn--1ug;	[B1 C2];	[B1 C2]	#	٨نم٨�.
-B;	�．Ⴇ󀳑\uFD50񫃱;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	0.Ⴇتجم
-B;	0.Ⴇ󀳑\u062A\u062C\u0645񫃱;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	0.Ⴇتجم
-B;	0.ⴇ󀳑\u062A\u062C\u0645񫃱;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	0.ⴇتجم
-B;	0.xn--pgbe9ez79qd207lvff8b;	[B1 B5 V6];	[B1 B5 V6]	#	0.ⴇتجم
-B;	0.xn--pgbe9e344c2725svff8b;	[B1 B5 V6];	[B1 B5 V6]	#	0.Ⴇتجم
-B;	�．ⴇ󀳑\uFD50񫃱;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	0.ⴇتجم
-B;	𑇀�.�ᠰ;	[V5];	[V5]
-B;	xn--9zh3057f.xn--j7e103b;	[V5];	[V5]
-T;	\u200D-\u067A.�;	[B1 C2 P1 V6];	[B1 P1 V3 V6]	#	-ٺ.
-N;	\u200D-\u067A.�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	-ٺ.
-B;	xn----qrc.xn--ts49b;	[B1 V3 V6];	[B1 V3 V6]	#	-Ùº.
-B;	xn----qrc357q.xn--ts49b;	[B1 C2 V6];	[B1 C2 V6]	#	-Ùº.
-T;	ᠢ���｡\u200C≯✳;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6]	#	ᠢ���.≯✳
-N;	ᠢ���｡\u200C≯✳;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ᠢ���.≯✳
-T;	ᠢ���｡\u200C>\u0338✳;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6]	#	ᠢ���.≯✳
-N;	ᠢ���｡\u200C>\u0338✳;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ᠢ���.≯✳
-T;	ᠢ���。\u200C≯✳;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6]	#	ᠢ���.≯✳
-N;	ᠢ���。\u200C≯✳;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ᠢ���.≯✳
-T;	ᠢ���。\u200C>\u0338✳;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6]	#	ᠢ���.≯✳
-N;	ᠢ���。\u200C>\u0338✳;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ᠢ���.≯✳
-B;	xn--46e6675axzzhota.xn--hdh99p;	[B1 B5 V6];	[B1 B5 V6]
-B;	xn--46e6675axzzhota.xn--0ug06gu8f;	[B1 B5 C1 V6];	[B1 B5 C1 V6]	#	ᠢ���.≯✳
-T;	\u200D｡󸲜ႺႴ𞨇;	[B1 B5 B6 C2 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ႺႴ
-N;	\u200D｡󸲜ႺႴ𞨇;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	.ႺႴ
-T;	\u200D。󸲜ႺႴ𞨇;	[B1 B5 B6 C2 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ႺႴ
-N;	\u200D。󸲜ႺႴ𞨇;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	.ႺႴ
-T;	\u200D。󸲜ⴚⴔ𞨇;	[B1 B5 B6 C2 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ⴚⴔ
-N;	\u200D。󸲜ⴚⴔ𞨇;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	.ⴚⴔ
-T;	\u200D。󸲜Ⴚⴔ𞨇;	[B1 B5 B6 C2 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.Ⴚⴔ
-N;	\u200D。󸲜Ⴚⴔ𞨇;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	.Ⴚⴔ
-B;	.xn--ynd036lq981an3r4h;	[B5 B6 V6 A4_2];	[B5 B6 V6 A4_2]
-B;	xn--1ug.xn--ynd036lq981an3r4h;	[B1 B5 B6 C2 V6];	[B1 B5 B6 C2 V6]	#	.Ⴚⴔ
-B;	.xn--cljl81825an3r4h;	[B5 B6 V6 A4_2];	[B5 B6 V6 A4_2]
-B;	xn--1ug.xn--cljl81825an3r4h;	[B1 B5 B6 C2 V6];	[B1 B5 B6 C2 V6]	#	.â´šâ´”
-B;	.xn--sndl01647an3h1h;	[B5 B6 V6 A4_2];	[B5 B6 V6 A4_2]
-B;	xn--1ug.xn--sndl01647an3h1h;	[B1 B5 B6 C2 V6];	[B1 B5 B6 C2 V6]	#	.ႺႴ
-T;	\u200D｡󸲜ⴚⴔ𞨇;	[B1 B5 B6 C2 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ⴚⴔ
-N;	\u200D｡󸲜ⴚⴔ𞨇;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	.ⴚⴔ
-T;	\u200D｡󸲜Ⴚⴔ𞨇;	[B1 B5 B6 C2 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.Ⴚⴔ
-N;	\u200D｡󸲜Ⴚⴔ𞨇;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	.Ⴚⴔ
-T;	-3.\u200Dヌᢕ;	[C2 V3];	[V3]	#	-3.ヌᢕ
-N;	-3.\u200Dヌᢕ;	[C2 V3];	[C2 V3]	#	-3.ヌᢕ
-B;	-3.xn--fbf115j;	[V3];	[V3]
-B;	-3.xn--fbf739aq5o;	[C2 V3];	[C2 V3]	#	-3.ヌᢕ
-T;	🂃\u0666ß\u200D。󠠂�𞩒-;	[B1 C2 P1 V3 V6];	[B1 P1 V3 V6]	#	🂃٦ß.-
-N;	🂃\u0666ß\u200D。󠠂�𞩒-;	[B1 C2 P1 V3 V6];	[B1 C2 P1 V3 V6]	#	🂃٦ß.-
-T;	🂃\u0666SS\u200D。󠠂�𞩒-;	[B1 C2 P1 V3 V6];	[B1 P1 V3 V6]	#	🂃٦ss.-
-N;	🂃\u0666SS\u200D。󠠂�𞩒-;	[B1 C2 P1 V3 V6];	[B1 C2 P1 V3 V6]	#	🂃٦ss.-
-T;	🂃\u0666ss\u200D。󠠂�𞩒-;	[B1 C2 P1 V3 V6];	[B1 P1 V3 V6]	#	🂃٦ss.-
-N;	🂃\u0666ss\u200D。󠠂�𞩒-;	[B1 C2 P1 V3 V6];	[B1 C2 P1 V3 V6]	#	🂃٦ss.-
-T;	🂃\u0666Ss\u200D。󠠂�𞩒-;	[B1 C2 P1 V3 V6];	[B1 P1 V3 V6]	#	🂃٦ss.-
-N;	🂃\u0666Ss\u200D。󠠂�𞩒-;	[B1 C2 P1 V3 V6];	[B1 C2 P1 V3 V6]	#	🂃٦ss.-
-B;	xn--ss-pyd98921c.xn----nz8rh7531csznt;	[B1 V3 V6];	[B1 V3 V6]	#	🂃٦ss.-
-B;	xn--ss-pyd483x5k99b.xn----nz8rh7531csznt;	[B1 C2 V3 V6];	[B1 C2 V3 V6]	#	🂃٦ss.-
-B;	xn--zca34z68yzu83b.xn----nz8rh7531csznt;	[B1 C2 V3 V6];	[B1 C2 V3 V6]	#	🂃٦ß.-
-T;	ꇟ-�\u069F。򰀺\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ꇟ-ڟ.
-N;	ꇟ-�\u069F。򰀺\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ꇟ-ڟ.
-B;	xn----utc4430jd3zd.xn--bp20d;	[B5 B6 V6];	[B5 B6 V6]	#	ꇟ-ڟ.
-B;	xn----utc4430jd3zd.xn--0ugx6670i;	[B5 B6 C1 V6];	[B5 B6 C1 V6]	#	ꇟ-ڟ.
-B;	\u0665.\u0484��𴤃;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	٥.҄��
-B;	xn--eib.xn--n3a0405kus8eft5l;	[B1 V5 V6];	[B1 V5 V6]	#	٥.҄��
-B;	-.񱼓\u0649�;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	-.ى�
-B;	-.xn--lhb4124khbq4b;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]	#	-.ى�
-T;	󾬨ς.𞶙녫ß;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-N;	󾬨ς.𞶙녫ß;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-T;	󾬨ς.𞶙녫ß;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-N;	󾬨ς.𞶙녫ß;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	󾬨Σ.𞶙녫SS;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	󾬨Σ.𞶙녫SS;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	󾬨σ.𞶙녫ss;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	󾬨σ.𞶙녫ss;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	󾬨Σ.𞶙녫Ss;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	󾬨Σ.𞶙녫Ss;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	xn--4xa76659r.xn--ss-d64i8755h;	[B2 B3 V6];	[B2 B3 V6]
-B;	xn--3xa96659r.xn--zca5051g4h4i;	[B2 B3 V6];	[B2 B3 V6]
-T;	Ⅎ\u17D2\u200D｡≠\u200D\u200C;	[C1 C2 P1 V6];	[P1 V6]	#	Ⅎ្.≠
-N;	Ⅎ\u17D2\u200D｡≠\u200D\u200C;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	Ⅎ្.≠
-T;	Ⅎ\u17D2\u200D｡=\u0338\u200D\u200C;	[C1 C2 P1 V6];	[P1 V6]	#	Ⅎ្.≠
-N;	Ⅎ\u17D2\u200D｡=\u0338\u200D\u200C;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	Ⅎ្.≠
-T;	Ⅎ\u17D2\u200D。≠\u200D\u200C;	[C1 C2 P1 V6];	[P1 V6]	#	Ⅎ្.≠
-N;	Ⅎ\u17D2\u200D。≠\u200D\u200C;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	Ⅎ្.≠
-T;	Ⅎ\u17D2\u200D。=\u0338\u200D\u200C;	[C1 C2 P1 V6];	[P1 V6]	#	Ⅎ្.≠
-N;	Ⅎ\u17D2\u200D。=\u0338\u200D\u200C;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	Ⅎ្.≠
-T;	ⅎ\u17D2\u200D。=\u0338\u200D\u200C;	[C1 C2 P1 V6];	[P1 V6]	#	ⅎ្.≠
-N;	ⅎ\u17D2\u200D。=\u0338\u200D\u200C;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	ⅎ្.≠
-T;	ⅎ\u17D2\u200D。≠\u200D\u200C;	[C1 C2 P1 V6];	[P1 V6]	#	ⅎ្.≠
-N;	ⅎ\u17D2\u200D。≠\u200D\u200C;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	ⅎ្.≠
-B;	xn--u4e969b.xn--1ch;	[V6];	[V6]	#	ⅎ្.≠
-B;	xn--u4e823bq1a.xn--0ugb89o;	[C1 C2 V6];	[C1 C2 V6]	#	ⅎ្.≠
-B;	xn--u4e319b.xn--1ch;	[V6];	[V6]	#	Ⅎ្.≠
-B;	xn--u4e823bcza.xn--0ugb89o;	[C1 C2 V6];	[C1 C2 V6]	#	Ⅎ្.≠
-T;	ⅎ\u17D2\u200D｡=\u0338\u200D\u200C;	[C1 C2 P1 V6];	[P1 V6]	#	ⅎ្.≠
-N;	ⅎ\u17D2\u200D｡=\u0338\u200D\u200C;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	ⅎ្.≠
-T;	ⅎ\u17D2\u200D｡≠\u200D\u200C;	[C1 C2 P1 V6];	[P1 V6]	#	ⅎ្.≠
-N;	ⅎ\u17D2\u200D｡≠\u200D\u200C;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	ⅎ្.≠
-T;	�\uAAF6\uA953󧦉．\u200C\u1714\u068F;	[B1 C1 P1 V6];	[B1 P1 V5 V6]	#	�꫶꥓.᜔�
-N;	�\uAAF6\uA953󧦉．\u200C\u1714\u068F;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�꫶꥓.᜔�
-T;	�\uAAF6\uA953󧦉.\u200C\u1714\u068F;	[B1 C1 P1 V6];	[B1 P1 V5 V6]	#	�꫶꥓.᜔�
-N;	�\uAAF6\uA953󧦉.\u200C\u1714\u068F;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�꫶꥓.᜔�
-B;	xn--3j9a14ak27osbz2o.xn--ljb175f;	[B1 V5 V6];	[B1 V5 V6]	#	�꫶꥓.᜔�
-B;	xn--3j9a14ak27osbz2o.xn--ljb175f1wg;	[B1 C1 V6];	[B1 C1 V6]	#	�꫶꥓.᜔�
-B;	񺔯\u0FA8．≯;	[P1 V6];	[P1 V6]	#	ྨ.≯
-B;	񺔯\u0FA8．>\u0338;	[P1 V6];	[P1 V6]	#	ྨ.≯
-B;	񺔯\u0FA8.≯;	[P1 V6];	[P1 V6]	#	ྨ.≯
-B;	񺔯\u0FA8.>\u0338;	[P1 V6];	[P1 V6]	#	ྨ.≯
-B;	xn--4fd57150h.xn--hdh;	[V6];	[V6]	#	ྨ.≯
-T;	\u200D𞡄Ⴓ．�;	[B1 B3 B6 C2 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	𞡄Ⴓ.�
-N;	\u200D𞡄Ⴓ．�;	[B1 B3 B6 C2 P1 V5 V6];	[B1 B3 B6 C2 P1 V5 V6]	#	𞡄Ⴓ.�
-T;	\u200D𞡄Ⴓ.�;	[B1 B3 B6 C2 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	𞡄Ⴓ.�
-N;	\u200D𞡄Ⴓ.�;	[B1 B3 B6 C2 P1 V5 V6];	[B1 B3 B6 C2 P1 V5 V6]	#	𞡄Ⴓ.�
-T;	\u200D𞡄ⴓ.�;	[B1 B3 B6 C2 V5];	[B1 B2 B3 B6 V5]	#	𞡄ⴓ.�
-N;	\u200D𞡄ⴓ.�;	[B1 B3 B6 C2 V5];	[B1 B3 B6 C2 V5]	#	𞡄ⴓ.�
-B;	xn--blj7492l.xn--m27c;	[B1 B2 B3 B6 V5];	[B1 B2 B3 B6 V5]
-B;	xn--1ugz52c4i16a.xn--m27c;	[B1 B3 B6 C2 V5];	[B1 B3 B6 C2 V5]	#	𞡄ⴓ.�
-B;	xn--rnd5552v.xn--m27c;	[B1 B2 B3 B6 V5 V6];	[B1 B2 B3 B6 V5 V6]
-B;	xn--rnd379ex885a.xn--m27c;	[B1 B3 B6 C2 V5 V6];	[B1 B3 B6 C2 V5 V6]	#	𞡄Ⴓ.�
-T;	\u200D𞡄ⴓ．�;	[B1 B3 B6 C2 V5];	[B1 B2 B3 B6 V5]	#	𞡄ⴓ.�
-N;	\u200D𞡄ⴓ．�;	[B1 B3 B6 C2 V5];	[B1 B3 B6 C2 V5]	#	𞡄ⴓ.�
-T;	�ß\uA8EA．ᡤ;	[B2 B3];	[B2 B3]	#	�ß꣪.ᡤ
-N;	�ß\uA8EA．ᡤ;	[B2 B3];	[B2 B3]	#	�ß꣪.ᡤ
-T;	�ß\uA8EA.ᡤ;	[B2 B3];	[B2 B3]	#	�ß꣪.ᡤ
-N;	�ß\uA8EA.ᡤ;	[B2 B3];	[B2 B3]	#	�ß꣪.ᡤ
-B;	�SS\uA8EA.ᡤ;	[B2 B3];	[B2 B3]	#	�ss꣪.ᡤ
-B;	�ss\uA8EA.ᡤ;	[B2 B3];	[B2 B3]	#	�ss꣪.ᡤ
-B;	�Ss\uA8EA.ᡤ;	[B2 B3];	[B2 B3]	#	�ss꣪.ᡤ
-B;	xn--ss-tu9hw933a.xn--08e;	[B2 B3];	[B2 B3]	#	�ss꣪.ᡤ
-B;	xn--zca2517f2hvc.xn--08e;	[B2 B3];	[B2 B3]	#	�ß꣪.ᡤ
-B;	�SS\uA8EA．ᡤ;	[B2 B3];	[B2 B3]	#	�ss꣪.ᡤ
-B;	�ss\uA8EA．ᡤ;	[B2 B3];	[B2 B3]	#	�ss꣪.ᡤ
-B;	�Ss\uA8EA．ᡤ;	[B2 B3];	[B2 B3]	#	�ss꣪.ᡤ
-T;	�󠆌鸮𑚶.ς;	[V5];	[V5]
-N;	�󠆌鸮𑚶.ς;	[V5];	[V5]
-B;	�󠆌鸮𑚶.Σ;	[V5];	[V5]
-B;	�󠆌鸮𑚶.σ;	[V5];	[V5]
-B;	xn--l76a726rt2h.xn--4xa;	[V5];	[V5]
-B;	xn--l76a726rt2h.xn--3xa;	[V5];	[V5]
-B;	⒗𞤬。-𑚶;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	16.𞤬。-𑚶;	[B1 V3];	[B1 V3]
-B;	16.𞤊。-𑚶;	[B1 V3];	[B1 V3]
-B;	16.xn--ke6h.xn----4j0j;	[B1 V3];	[B1 V3]
-B;	⒗𞤊。-𑚶;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	xn--8shw466n.xn----4j0j;	[B1 V3 V6];	[B1 V3 V6]
-B;	\u08B3𞤿⾫｡�\u068F⒈;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	ࢳ𞤿隹.��⒈
-B;	\u08B3𞤿隹。�\u068F1.;	[B1 B2 B3];	[B1 B2 B3]	#	ࢳ𞤿隹.��1.
-B;	\u08B3�隹。�\u068F1.;	[B1 B2 B3];	[B1 B2 B3]	#	ࢳ𞤿隹.��1.
-B;	xn--8yb0383efiwk.xn--1-wsc3373r.;	[B1 B2 B3];	[B1 B2 B3]	#	ࢳ𞤿隹.��1.
-B;	\u08B3�⾫｡�\u068F⒈;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	ࢳ𞤿隹.��⒈
-B;	xn--8yb0383efiwk.xn--ljb064mol4n;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	ࢳ𞤿隹.��⒈
-B;	\u2433𚎛�\u0661.ᡢ8\u0F72\u0600;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	5١.ᡢ8ི
-B;	\u2433𚎛5\u0661.ᡢ8\u0F72\u0600;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	5١.ᡢ8ི
-B;	xn--5-bqc410un435a.xn--8-rkc763epjj;	[B5 B6 V6];	[B5 B6 V6]	#	5١.ᡢ8ི
-B;	�.🄀⒒-󨰈;	[B1 P1 V6];	[B1 P1 V6]
-B;	�.0.11.-󨰈;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	xn--7n0d.0.11.xn----8j07m;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn--7n0d.xn----xcp9757q1s13g;	[B1 V6];	[B1 V6]
-T;	ς-。\u200C�-;	[C1 V3];	[V3]	#	ς-.1-
-N;	ς-。\u200C�-;	[C1 V3];	[C1 V3]	#	ς-.1-
-T;	ς-。\u200C1-;	[C1 V3];	[V3]	#	ς-.1-
-N;	ς-。\u200C1-;	[C1 V3];	[C1 V3]	#	ς-.1-
-T;	Σ-。\u200C1-;	[C1 V3];	[V3]	#	σ-.1-
-N;	Σ-。\u200C1-;	[C1 V3];	[C1 V3]	#	σ-.1-
-T;	σ-。\u200C1-;	[C1 V3];	[V3]	#	σ-.1-
-N;	σ-。\u200C1-;	[C1 V3];	[C1 V3]	#	σ-.1-
-B;	xn----zmb.1-;	[V3];	[V3]
-B;	xn----zmb.xn--1--i1t;	[C1 V3];	[C1 V3]	#	σ-.1-
-B;	xn----xmb.xn--1--i1t;	[C1 V3];	[C1 V3]	#	Ï‚-.1-
-T;	Σ-。\u200C�-;	[C1 V3];	[V3]	#	σ-.1-
-N;	Σ-。\u200C�-;	[C1 V3];	[C1 V3]	#	σ-.1-
-T;	σ-。\u200C�-;	[C1 V3];	[V3]	#	σ-.1-
-N;	σ-。\u200C�-;	[C1 V3];	[C1 V3]	#	σ-.1-
-B;	\u1734-\u0CE2．󠄩Ⴄ;	[P1 V5 V6];	[P1 V5 V6]	#	᜴-ೢ.Ⴄ
-B;	\u1734-\u0CE2.󠄩Ⴄ;	[P1 V5 V6];	[P1 V5 V6]	#	᜴-ೢ.Ⴄ
-B;	\u1734-\u0CE2.󠄩ⴄ;	[V5];	[V5]	#	᜴-ೢ.ⴄ
-B;	xn----ggf830f.xn--vkj;	[V5];	[V5]	#	᜴-ೢ.ⴄ
-B;	xn----ggf830f.xn--cnd;	[V5 V6];	[V5 V6]	#	᜴-ೢ.Ⴄ
-B;	\u1734-\u0CE2．󠄩ⴄ;	[V5];	[V5]	#	᜴-ೢ.ⴄ
-B;	򭈗♋\u06BB�｡\u0954⒈;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	♋ڻ�.॔⒈
-B;	򭈗♋\u06BB�。\u09541.;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	♋ڻ�.॔1.
-B;	xn--ukb372n129m3rs7f.xn--1-fyd.;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	♋ڻ�.॔1.
-B;	xn--ukb372n129m3rs7f.xn--u3b240l;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	♋ڻ�.॔⒈
-T;	\u05A4．\u06C1\u1AB3\u200C;	[B1 B3 B6 C1 V5];	[B1 B3 B6 V5]	#	֤.�᪳
-N;	\u05A4．\u06C1\u1AB3\u200C;	[B1 B3 B6 C1 V5];	[B1 B3 B6 C1 V5]	#	֤.�᪳
-T;	\u05A4.\u06C1\u1AB3\u200C;	[B1 B3 B6 C1 V5];	[B1 B3 B6 V5]	#	֤.�᪳
-N;	\u05A4.\u06C1\u1AB3\u200C;	[B1 B3 B6 C1 V5];	[B1 B3 B6 C1 V5]	#	֤.�᪳
-B;	xn--vcb.xn--0kb623h;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	֤.�᪳
-B;	xn--vcb.xn--0kb623hm1d;	[B1 B3 B6 C1 V5];	[B1 B3 B6 C1 V5]	#	֤.�᪳
-B;	�\u0846≮\u0ACD．𞦊;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ࡆ≮�.
-B;	�\u0846<\u0338\u0ACD．𞦊;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ࡆ≮�.
-B;	�\u0846≮\u0ACD.𞦊;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ࡆ≮�.
-B;	�\u0846<\u0338\u0ACD.𞦊;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ࡆ≮�.
-B;	xn--4vb80kq29ayo62l.xn--8g6h;	[B5 B6 V6];	[B5 B6 V6]	#	ࡆ≮�.
-T;	\u200D。𞀘⒈�擉;	[C2 P1 V5 V6];	[P1 V5 V6 A4_2]	#	.𞀘⒈�擉
-N;	\u200D。𞀘⒈�擉;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.𞀘⒈�擉
-T;	\u200D。𞀘1.�擉;	[C2 V5];	[V5 A4_2]	#	.𞀘1.�擉
-N;	\u200D。𞀘1.�擉;	[C2 V5];	[C2 V5]	#	.𞀘1.�擉
-B;	.xn--1-1p4r.xn--s7uv61m;	[V5 A4_2];	[V5 A4_2]
-B;	xn--1ug.xn--1-1p4r.xn--s7uv61m;	[C2 V5];	[C2 V5]	#	.𞀘1.�擉
-B;	.xn--tsh026uql4bew9p;	[V5 V6 A4_2];	[V5 V6 A4_2]
-B;	xn--1ug.xn--tsh026uql4bew9p;	[C2 V5 V6];	[C2 V5 V6]	#	.𞀘⒈�擉
-B;	₈\u07CB．\uFB64≠;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	8ߋ.ٿ≠
-B;	₈\u07CB．\uFB64=\u0338;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	8ߋ.ٿ≠
-B;	8\u07CB.\u067F≠;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	8ߋ.ٿ≠
-B;	8\u07CB.\u067F=\u0338;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	8ߋ.ٿ≠
-B;	xn--8-zbd.xn--4ib883l;	[B1 B3 V6];	[B1 B3 V6]	#	8ߋ.ٿ≠
-B;	ᢡ\u07DE�.⒒\u0642�;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	ᢡߞ.⒒ق�
-B;	ᢡ\u07DE�.11.\u0642�;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	ᢡߞ.11.ق�
-B;	xn--5sb596fi873t.11.xn--ehb4198k;	[B1 B5 V6];	[B1 B5 V6]	#	ᢡߞ.11.ق�
-B;	xn--5sb596fi873t.xn--ehb336mvy7n;	[B1 B5 V6];	[B1 B5 V6]	#	ᢡߞ.⒒ق�
-B;	\u0E48-��.\u0363\u06E1�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	่-�4.ͣۡ�
-B;	\u0E48-�4.\u0363\u06E18.;	[B1 V5];	[B1 V5]	#	่-�4.ͣۡ8.
-B;	xn---4-owiz479s.xn--8-ihb69x.;	[B1 V5];	[B1 V5]	#	่-�4.ͣۡ8.
-B;	xn---4-owiz479s.xn--eva20pjv9a;	[B1 V5 V6];	[B1 V5 V6]	#	่-�4.ͣۡ�
-B;	�｡Ⴠ-�;	[P1 V6];	[P1 V6]
-B;	�。Ⴠ-�;	[P1 V6];	[P1 V6]
-B;	�。ⴠ-�;	[P1 V6];	[P1 V6]
-B;	xn--r3i.xn----2wst7439i;	[V6];	[V6]
-B;	xn--r3i.xn----z1g58579u;	[V6];	[V6]
-B;	�｡ⴠ-�;	[P1 V6];	[P1 V6]
-B;	𑑂◊．⦟∠;	[V5];	[V5]
-B;	𑑂◊.⦟∠;	[V5];	[V5]
-B;	xn--01h3338f.xn--79g270a;	[V5];	[V5]
-B;	𿌰-\u0662。󋸛ꡂ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-٢.ꡂ
-B;	xn----dqc20828e.xn--bc9an2879c;	[B5 B6 V6];	[B5 B6 V6]	#	-Ù¢.ê¡‚
-B;	\u0678。�\u0741𞪭�;	[B1 P1 V6];	[B1 P1 V6]	#	يٴ.��
-B;	\u064A\u0674。�\u0741𞪭�;	[B1 P1 V6];	[B1 P1 V6]	#	يٴ.��
-B;	xn--mhb8f.xn--oob2585kfdsfsbo7h;	[B1 V6];	[B1 V6]	#	يٴ.��
-T;	�ꌄ｡\u200Dᣬ;	[B1 B2 B3 C2];	[B2 B3]	#	�ꌄ.ᣬ
-N;	�ꌄ｡\u200Dᣬ;	[B1 B2 B3 C2];	[B1 B2 B3 C2]	#	�ꌄ.ᣬ
-T;	�ꌄ。\u200Dᣬ;	[B1 B2 B3 C2];	[B2 B3]	#	�ꌄ.ᣬ
-N;	�ꌄ。\u200Dᣬ;	[B1 B2 B3 C2];	[B1 B2 B3 C2]	#	�ꌄ.ᣬ
-B;	xn--y77ao18q.xn--wdf;	[B2 B3];	[B2 B3]
-B;	xn--y77ao18q.xn--wdf367a;	[B1 B2 B3 C2];	[B1 B2 B3 C2]	#	�ꌄ.ᣬ
-B;	₀\u0662。󅪞≯-;	[B1 B6 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	0٢.≯-
-B;	₀\u0662。󅪞>\u0338-;	[B1 B6 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	0٢.≯-
-B;	0\u0662。󅪞≯-;	[B1 B6 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	0٢.≯-
-B;	0\u0662。󅪞>\u0338-;	[B1 B6 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	0٢.≯-
-B;	xn--0-dqc.xn----ogov3342l;	[B1 B6 V3 V6];	[B1 B6 V3 V6]	#	0٢.≯-
-B;	\u031C�-𞯃.�\u0845;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	̜�-.�ࡅ
-B;	xn----gdb7046r692g.xn--3vb1349j;	[B1 V5 V6];	[B1 V5 V6]	#	̜�-.�ࡅ
-B;	≠｡���\u0594;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≠.���֔
-B;	=\u0338｡���\u0594;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≠.���֔
-B;	≠。���\u0594;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≠.���֔
-B;	=\u0338。���\u0594;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≠.���֔
-B;	=\u0338。��ⴡ\u0594;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≠.��ⴡ֔
-B;	≠。��ⴡ\u0594;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≠.��ⴡ֔
-B;	xn--1ch.xn--fcb363rk03mypug;	[B1 V5 V6];	[B1 V5 V6]	#	≠.��ⴡ֔
-B;	xn--1ch.xn--fcb538c649rypog;	[B1 V5 V6];	[B1 V5 V6]	#	≠.���֔
-B;	=\u0338｡��ⴡ\u0594;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≠.��ⴡ֔
-B;	≠｡��ⴡ\u0594;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≠.��ⴡ֔
-B;	𖫳≠.Ⴀ�;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]
-B;	𖫳=\u0338.Ⴀ�;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]
-B;	𖫳=\u0338.ⴀ�;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]
-B;	𖫳≠.ⴀ�;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]
-B;	xn--1ch9250k.xn--rkj6232e;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]
-B;	xn--1ch9250k.xn--7md2659j;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]
-B;	󠅾\u0736\u0726．ᢚ閪\u08E2�;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ܶܦ.ᢚ閪�
-B;	󠅾\u0736\u0726.ᢚ閪\u08E2�;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ܶܦ.ᢚ閪�
-B;	xn--wnb5a.xn--l0b161fis8gbp5m;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	ܶܦ.ᢚ閪�
-T;	\u200D󠇜\u06CB\uA8E9｡\u20DD\u0FB0-ᛟ;	[B1 C2 V5];	[B1 V5]	#	ۋ꣩.�ྰ-ᛟ
-N;	\u200D󠇜\u06CB\uA8E9｡\u20DD\u0FB0-ᛟ;	[B1 C2 V5];	[B1 C2 V5]	#	ۋ꣩.�ྰ-ᛟ
-T;	\u200D󠇜\u06CB\uA8E9。\u20DD\u0FB0-ᛟ;	[B1 C2 V5];	[B1 V5]	#	ۋ꣩.�ྰ-ᛟ
-N;	\u200D󠇜\u06CB\uA8E9。\u20DD\u0FB0-ᛟ;	[B1 C2 V5];	[B1 C2 V5]	#	ۋ꣩.�ྰ-ᛟ
-B;	xn--blb8114f.xn----gmg236cj6k;	[B1 V5];	[B1 V5]	#	ۋ꣩.�ྰ-ᛟ
-B;	xn--blb540ke10h.xn----gmg236cj6k;	[B1 C2 V5];	[B1 C2 V5]	#	ۋ꣩.�ྰ-ᛟ
-B;	�󘖙\u0E3A�。\u06BA�;	[P1 V6];	[P1 V6]	#	�ฺ.ں4
-B;	헁󘖙\u0E3A�。\u06BA�;	[P1 V6];	[P1 V6]	#	�ฺ.ں4
-B;	�󘖙\u0E3A�。\u06BA4;	[P1 V6];	[P1 V6]	#	�ฺ.ں4
-B;	헁󘖙\u0E3A�。\u06BA4;	[P1 V6];	[P1 V6]	#	�ฺ.ں4
-B;	xn--o4c1723h8g85gt4ya.xn--4-dvc;	[V6];	[V6]	#	�ฺ.ں4
-T;	�｡󃱂\u200CႾ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�.Ⴞ
-N;	�｡󃱂\u200CႾ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.Ⴞ
-T;	�。󃱂\u200CႾ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�.Ⴞ
-N;	�。󃱂\u200CႾ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.Ⴞ
-T;	�。󃱂\u200Cⴞ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�.ⴞ
-N;	�。󃱂\u200Cⴞ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.ⴞ
-B;	xn--lo0d.xn--mljx1099g;	[B1 V6];	[B1 V6]
-B;	xn--lo0d.xn--0ugx72cwi33v;	[B1 C1 V6];	[B1 C1 V6]	#	�.ⴞ
-B;	xn--lo0d.xn--2nd75260n;	[B1 V6];	[B1 V6]
-B;	xn--lo0d.xn--2nd949eqw95u;	[B1 C1 V6];	[B1 C1 V6]	#	�.Ⴞ
-T;	�｡󃱂\u200Cⴞ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�.ⴞ
-N;	�｡󃱂\u200Cⴞ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�.ⴞ
-B;	\uA953.\u033D𑂽馋;	[P1 V5 V6];	[P1 V5 V6]	#	꥓.̽馋
-B;	xn--3j9a.xn--bua0708eqzrd;	[V5 V6];	[V5 V6]	#	꥓.̽馋
-T;	�򪛸\u200D｡䜖;	[C2 P1 V6];	[P1 V6]	#	.䜖
-N;	�򪛸\u200D｡䜖;	[C2 P1 V6];	[C2 P1 V6]	#	.䜖
-T;	�򪛸\u200D。䜖;	[C2 P1 V6];	[P1 V6]	#	.䜖
-N;	�򪛸\u200D。䜖;	[C2 P1 V6];	[C2 P1 V6]	#	.䜖
-B;	xn--g138cxw05a.xn--k0o;	[V6];	[V6]
-B;	xn--1ug30527h9mxi.xn--k0o;	[C2 V6];	[C2 V6]	#	.䜖
-T;	ᡯ⚉姶🄉．۷\u200D🎪\u200D;	[C2 P1 V6];	[P1 V6]	#	ᡯ⚉姶🄉.۷🎪
-N;	ᡯ⚉姶🄉．۷\u200D🎪\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	ᡯ⚉姶🄉.۷🎪
-T;	ᡯ⚉姶8,.۷\u200D🎪\u200D;	[C2 P1 V6];	[P1 V6]	#	ᡯ⚉姶8,.۷🎪
-N;	ᡯ⚉姶8,.۷\u200D🎪\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	ᡯ⚉姶8,.۷🎪
-B;	xn--8,-g9oy26fzu4d.xn--kmb6733w;	[P1 V6];	[P1 V6]
-B;	xn--8,-g9oy26fzu4d.xn--kmb859ja94998b;	[C2 P1 V6];	[C2 P1 V6]	#	ᡯ⚉姶8,.۷🎪
-B;	xn--c9e433epi4b3j20a.xn--kmb6733w;	[V6];	[V6]
-B;	xn--c9e433epi4b3j20a.xn--kmb859ja94998b;	[C2 V6];	[C2 V6]	#	ᡯ⚉姶🄉.۷🎪
-B;	𞽀.�🚖\u0E3A;	[B1 P1 V6];	[B1 P1 V6]	#	.�🚖ฺ
-B;	xn--0n7h.xn--o4c9032klszf;	[B1 V6];	[B1 V6]	#	.�🚖ฺ
-B;	Ⴔᠵ｡�\u0747۹;	[B1 P1 V6];	[B1 P1 V6]	#	Ⴔᠵ.�݇۹
-B;	Ⴔᠵ。�\u0747۹;	[B1 P1 V6];	[B1 P1 V6]	#	Ⴔᠵ.�݇۹
-B;	ⴔᠵ。�\u0747۹;	[B1];	[B1]	#	ⴔᠵ.�݇۹
-B;	xn--o7e997h.xn--mmb9ml895e;	[B1];	[B1]	#	ⴔᠵ.�݇۹
-B;	xn--snd659a.xn--mmb9ml895e;	[B1 V6];	[B1 V6]	#	Ⴔᠵ.�݇۹
-B;	ⴔᠵ｡�\u0747۹;	[B1];	[B1]	#	ⴔᠵ.�݇۹
-T;	\u135Fᡈ\u200C．︒-�-;	[C1 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	�ᡈ.︒-�-
-N;	\u135Fᡈ\u200C．︒-�-;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	�ᡈ.︒-�-
-T;	\u135Fᡈ\u200C.。-�-;	[C1 V3 V5 A4_2];	[V3 V5 A4_2]	#	�ᡈ..-�-
-N;	\u135Fᡈ\u200C.。-�-;	[C1 V3 V5 A4_2];	[C1 V3 V5 A4_2]	#	�ᡈ..-�-
-B;	xn--b7d82w..xn-----pe4u;	[V3 V5 A4_2];	[V3 V5 A4_2]	#	�ᡈ..-�-
-B;	xn--b7d82wo4h..xn-----pe4u;	[C1 V3 V5 A4_2];	[C1 V3 V5 A4_2]	#	�ᡈ..-�-
-B;	xn--b7d82w.xn-----c82nz547a;	[V3 V5 V6];	[V3 V5 V6]	#	�ᡈ.︒-�-
-B;	xn--b7d82wo4h.xn-----c82nz547a;	[C1 V3 V5 V6];	[C1 V3 V5 V6]	#	�ᡈ.︒-�-
-T;	⒈\u0601⒖\u200C.\u1DF0\u07DB;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	⒈⒖.ᷰߛ
-N;	⒈\u0601⒖\u200C.\u1DF0\u07DB;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	⒈⒖.ᷰߛ
-T;	1.\u060115.\u200C.\u1DF0\u07DB;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6 A4_2]	#	1.15..á·°ß›
-N;	1.\u060115.\u200C.\u1DF0\u07DB;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	1.15..á·°ß›
-B;	1.xn--15-1pd..xn--2sb914i;	[B1 V5 V6 A4_2];	[B1 V5 V6 A4_2]	#	1.15..á·°ß›
-B;	1.xn--15-1pd.xn--0ug.xn--2sb914i;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	1.15..á·°ß›
-B;	xn--jfb347mib.xn--2sb914i;	[B1 V5 V6];	[B1 V5 V6]	#	⒈⒖.ᷰߛ
-B;	xn--jfb844kmfdwb.xn--2sb914i;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	⒈⒖.ᷰߛ
-B;	�。-\u0B4DႫ;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	�.-�Ⴋ
-B;	�。-\u0B4Dⴋ;	[V3 V5];	[V3 V5]	#	�.-�ⴋ
-B;	xn--792h.xn----bse820x;	[V3 V5];	[V3 V5]	#	�.-�ⴋ
-B;	xn--792h.xn----bse632b;	[V3 V5 V6];	[V3 V5 V6]	#	�.-�Ⴋ
-T;	ßჀ.\u0620刯Ⴝ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ßჀ.ؠ刯Ⴝ
-N;	ßჀ.\u0620刯Ⴝ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ßჀ.ؠ刯Ⴝ
-T;	ßⴠ.\u0620刯�;	[B2 B3];	[B2 B3]	#	ßⴠ.ؠ刯�
-N;	ßⴠ.\u0620刯�;	[B2 B3];	[B2 B3]	#	ßⴠ.ؠ刯�
-B;	SSჀ.\u0620刯Ⴝ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ssჀ.ؠ刯Ⴝ
-B;	ssⴠ.\u0620刯�;	[B2 B3];	[B2 B3]	#	ssⴠ.ؠ刯�
-B;	Ssⴠ.\u0620刯Ⴝ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ssⴠ.ؠ刯Ⴝ
-B;	xn--ss-j81a.xn--fgb845cb66c;	[B2 B3 V6];	[B2 B3 V6]	#	ssⴠ.ؠ刯Ⴝ
-B;	xn--ss-j81a.xn--fgb670rovy;	[B2 B3];	[B2 B3]	#	ssⴠ.ؠ刯�
-B;	xn--ss-wgk.xn--fgb845cb66c;	[B2 B3 V6];	[B2 B3 V6]	#	ssჀ.ؠ刯Ⴝ
-B;	xn--zca277t.xn--fgb670rovy;	[B2 B3];	[B2 B3]	#	ßⴠ.ؠ刯�
-B;	xn--zca442f.xn--fgb845cb66c;	[B2 B3 V6];	[B2 B3 V6]	#	ßჀ.ؠ刯Ⴝ
-B;	\u1BAAႣℲ｡ᠳ툻\u0673;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	᮪ႣℲ.ᠳ툻ٳ
-B;	\u1BAAႣℲ｡ᠳ�ᅮᆶ\u0673;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	᮪ႣℲ.ᠳ툻ٳ
-B;	\u1BAAႣℲ。ᠳ툻\u0673;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	᮪ႣℲ.ᠳ툻ٳ
-B;	\u1BAAႣℲ。ᠳ�ᅮᆶ\u0673;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	᮪ႣℲ.ᠳ툻ٳ
-B;	\u1BAAⴃⅎ。ᠳ�ᅮᆶ\u0673;	[B5 B6 V5];	[B5 B6 V5]	#	᮪ⴃⅎ.ᠳ툻ٳ
-B;	\u1BAAⴃⅎ。ᠳ툻\u0673;	[B5 B6 V5];	[B5 B6 V5]	#	᮪ⴃⅎ.ᠳ툻ٳ
-B;	\u1BAAႣⅎ。ᠳ툻\u0673;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	᮪Ⴃⅎ.ᠳ툻ٳ
-B;	\u1BAAႣⅎ。ᠳ�ᅮᆶ\u0673;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	᮪Ⴃⅎ.ᠳ툻ٳ
-B;	xn--bnd957c2pe.xn--sib102gc69k;	[B5 B6 V5 V6];	[B5 B6 V5 V6]	#	᮪Ⴃⅎ.ᠳ툻ٳ
-B;	xn--yxf24x4ol.xn--sib102gc69k;	[B5 B6 V5];	[B5 B6 V5]	#	᮪ⴃⅎ.ᠳ툻ٳ
-B;	xn--bnd957cone.xn--sib102gc69k;	[B5 B6 V5 V6];	[B5 B6 V5 V6]	#	᮪ႣℲ.ᠳ툻ٳ
-B;	\u1BAAⴃⅎ｡ᠳ�ᅮᆶ\u0673;	[B5 B6 V5];	[B5 B6 V5]	#	᮪ⴃⅎ.ᠳ툻ٳ
-B;	\u1BAAⴃⅎ｡ᠳ툻\u0673;	[B5 B6 V5];	[B5 B6 V5]	#	᮪ⴃⅎ.ᠳ툻ٳ
-B;	\u1BAAႣⅎ｡ᠳ툻\u0673;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	᮪Ⴃⅎ.ᠳ툻ٳ
-B;	\u1BAAႣⅎ｡ᠳ�ᅮᆶ\u0673;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	᮪Ⴃⅎ.ᠳ툻ٳ
-B;	\u06EC.\u08A2�\u067C;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	۬.ࢢ�ټ
-B;	xn--8lb.xn--1ib31ily45b;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	۬.ࢢ�ټ
-B;	\u06B6\u06DF。₇\uA806;	[B1];	[B1]	#	ڶ۟.7꠆
-B;	\u06B6\u06DF。7\uA806;	[B1];	[B1]	#	ڶ۟.7꠆
-B;	xn--pkb6f.xn--7-x93e;	[B1];	[B1]	#	Ú¶ÛŸ.7ê †
-B;	\u06B6\u06DF.7\uA806;	[B1];	[B1]	#	Ú¶ÛŸ.7ê †
-T;	Ⴣ�.\u200C�≮󠩉;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V5 V6]	#	Ⴣ�.�≮
-N;	Ⴣ�.\u200C�≮󠩉;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	Ⴣ�.�≮
-T;	Ⴣ�.\u200C�<\u0338󠩉;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V5 V6]	#	Ⴣ�.�≮
-N;	Ⴣ�.\u200C�<\u0338󠩉;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	Ⴣ�.�≮
-T;	ⴣ�.\u200C�<\u0338󠩉;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V5 V6]	#	ⴣ�.�≮
-N;	ⴣ�.\u200C�<\u0338󠩉;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	ⴣ�.�≮
-T;	ⴣ�.\u200C�≮󠩉;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V5 V6]	#	ⴣ�.�≮
-N;	ⴣ�.\u200C�≮󠩉;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	ⴣ�.�≮
-B;	xn--rlj6323e.xn--gdh4944ob3x3e;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]
-B;	xn--rlj6323e.xn--0ugy6gn120eb103g;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	ⴣ�.�≮
-B;	xn--7nd8101k.xn--gdh4944ob3x3e;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]
-B;	xn--7nd8101k.xn--0ugy6gn120eb103g;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	Ⴣ�.�≮
-T;	��⯮．\u180D\u200C;	[C1];	xn--9-mfs8024b.	#	9�⯮.
-N;	��⯮．\u180D\u200C;	[C1];	[C1]	#	9�⯮.
-T;	9�⯮.\u180D\u200C;	[C1];	xn--9-mfs8024b.	#	9�⯮.
-N;	9�⯮.\u180D\u200C;	[C1];	[C1]	#	9�⯮.
-B;	xn--9-mfs8024b.;	9�⯮.;	xn--9-mfs8024b.;	NV8
-B;	9�⯮.;	;	xn--9-mfs8024b.;	NV8
-B;	xn--9-mfs8024b.xn--0ug;	[C1];	[C1]	#	9�⯮.
-B;	��｡Ⴣ\u0F84彦;	[B1 P1 V6];	[B1 P1 V6]	#	��.Ⴣ྄彦
-B;	8.�。Ⴣ\u0F84彦;	[B1 P1 V6];	[B1 P1 V6]	#	8.�.Ⴣ྄彦
-B;	8.�。ⴣ\u0F84彦;	[B1];	[B1]	#	8.�.ⴣ྄彦
-B;	8.xn--fo0d.xn--3ed972m6o8a;	[B1];	[B1]	#	8.�.ⴣ྄彦
-B;	8.xn--fo0d.xn--3ed15dt93o;	[B1 V6];	[B1 V6]	#	8.�.Ⴣ྄彦
-B;	��｡ⴣ\u0F84彦;	[B1 P1 V6];	[B1 P1 V6]	#	��.ⴣ྄彦
-B;	xn--0sh2466f.xn--3ed972m6o8a;	[B1 V6];	[B1 V6]	#	��.ⴣ྄彦
-B;	xn--0sh2466f.xn--3ed15dt93o;	[B1 V6];	[B1 V6]	#	��.Ⴣ྄彦
-B;	-问񬰔⒛。\u0604-񜗉橬;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-问⒛.-橬
-B;	-问񬰔20.。\u0604-񜗉橬;	[B1 P1 V3 V6 A4_2];	[B1 P1 V3 V6 A4_2]	#	-问20..-橬
-B;	xn---20-658jx1776d..xn----ykc7228efm46d;	[B1 V3 V6 A4_2];	[B1 V3 V6 A4_2]	#	-问20..-橬
-B;	xn----hdpu849bhis3e.xn----ykc7228efm46d;	[B1 V3 V6];	[B1 V3 V6]	#	-问⒛.-橬
-T;	\u1BACႬ\u200C\u0325。�;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ᮬႬ̥.2
-N;	\u1BACႬ\u200C\u0325。�;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ᮬႬ̥.2
-T;	\u1BACႬ\u200C\u0325。2;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ᮬႬ̥.2
-N;	\u1BACႬ\u200C\u0325。2;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ᮬႬ̥.2
-T;	\u1BACⴌ\u200C\u0325。2;	[C1 V5];	[V5]	#	ᮬⴌ̥.2
-N;	\u1BACⴌ\u200C\u0325。2;	[C1 V5];	[C1 V5]	#	ᮬⴌ̥.2
-B;	xn--mta176jjjm.2;	[V5];	[V5]	#	ᮬⴌ̥.2
-B;	xn--mta176j97cl2q.2;	[C1 V5];	[C1 V5]	#	ᮬⴌ̥.2
-B;	xn--mta930emri.2;	[V5 V6];	[V5 V6]	#	ᮬႬ̥.2
-B;	xn--mta930emribme.2;	[C1 V5 V6];	[C1 V5 V6]	#	ᮬႬ̥.2
-T;	\u1BACⴌ\u200C\u0325。�;	[C1 V5];	[V5]	#	ᮬⴌ̥.2
-N;	\u1BACⴌ\u200C\u0325。�;	[C1 V5];	[C1 V5]	#	ᮬⴌ̥.2
-B;	\uDC5F。\uA806\u0669󠒩;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	.꠆٩
-B;	\uDC5F.xn--iib9583fusy0i;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	.ê †Ù©
-B;	\uDC5F.XN--IIB9583FUSY0I;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	.ê †Ù©
-B;	\uDC5F.Xn--Iib9583fusy0i;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	.ê †Ù©
-B;	�\u035F⾶｡₇︒눇≮;	[P1 V5 V6];	[P1 V5 V6]	#	͟飛.7︒눇≮
-B;	�\u035F⾶｡₇︒눇<\u0338;	[P1 V5 V6];	[P1 V5 V6]	#	͟飛.7︒눇≮
-B;	�\u035F飛。7。눇≮;	[P1 V5 V6];	[P1 V5 V6]	#	͟飛.7.눇≮
-B;	�\u035F飛。7。눇<\u0338;	[P1 V5 V6];	[P1 V5 V6]	#	͟飛.7.눇≮
-B;	xn--9ua0567e.7.xn--gdh6767c;	[V5 V6];	[V5 V6]	#	͟飛.7.눇≮
-B;	xn--9ua0567e.xn--7-ngou006d1ttc;	[V5 V6];	[V5 V6]	#	͟飛.7︒눇≮
-T;	\u200C\uFE09�\u200D．\u200C⿃;	[B1 C1 C2];	[B1]	#	�.鳥
-N;	\u200C\uFE09�\u200D．\u200C⿃;	[B1 C1 C2];	[B1 C1 C2]	#	�.鳥
-T;	\u200C\uFE09�\u200D.\u200C鳥;	[B1 C1 C2];	[B1]	#	�.鳥
-N;	\u200C\uFE09�\u200D.\u200C鳥;	[B1 C1 C2];	[B1 C1 C2]	#	�.鳥
-B;	xn--so0d.xn--6x6a;	[B1];	[B1]
-B;	xn--0ugc6024p.xn--0ug1920c;	[B1 C1 C2];	[B1 C1 C2]	#	�.鳥
-T;	�．\u200D󠗒��;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.��
-N;	�．\u200D󠗒��;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.��
-T;	�.\u200D󠗒��;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.��
-N;	�.\u200D󠗒��;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.��
-B;	xn--lj8h.xn--ln9ci476aqmr2g;	[B1 V6];	[B1 V6]
-B;	xn--lj8h.xn--1ug6603gr1pfwq37h;	[B1 C2 V6];	[B1 C2 V6]	#	�.��
-T;	\u067D\u0943.𞤓\u200D;	[B3 C2];	xn--2ib43l.xn--te6h	#	ٽृ.𞤵
-N;	\u067D\u0943.𞤓\u200D;	[B3 C2];	[B3 C2]	#	ٽृ.𞤵
-T;	\u067D\u0943.𞤵\u200D;	[B3 C2];	xn--2ib43l.xn--te6h	#	ٽृ.𞤵
-N;	\u067D\u0943.𞤵\u200D;	[B3 C2];	[B3 C2]	#	ٽृ.𞤵
-B;	xn--2ib43l.xn--te6h;	\u067D\u0943.𞤵;	xn--2ib43l.xn--te6h	#	ٽृ.𞤵
-B;	\u067D\u0943.𞤵;	;	xn--2ib43l.xn--te6h	#	ٽृ.𞤵
-B;	\u067D\u0943.𞤓;	\u067D\u0943.𞤵;	xn--2ib43l.xn--te6h	#	ٽृ.𞤵
-B;	xn--2ib43l.xn--1ugy711p;	[B3 C2];	[B3 C2]	#	ٽृ.𞤵
-B;	\u0664\u0A4D-．󥜽\u1039�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	٤�-.္
-B;	\u0664\u0A4D-.󥜽\u1039�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	٤�-.္
-B;	xn----gqc711a.xn--9jd88234f3qm0b;	[B1 V3 V6];	[B1 V3 V6]	#	٤�-.္
-T;	4\u103A-�｡\uAA29\u200C�≮;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	4်-�.ꨩ�≮
-N;	4\u103A-�｡\uAA29\u200C�≮;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	4်-�.ꨩ�≮
-T;	4\u103A-�｡\uAA29\u200C�<\u0338;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	4်-�.ꨩ�≮
-N;	4\u103A-�｡\uAA29\u200C�<\u0338;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	4်-�.ꨩ�≮
-T;	4\u103A-�。\uAA29\u200C�≮;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	4်-�.ꨩ�≮
-N;	4\u103A-�。\uAA29\u200C�≮;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	4်-�.ꨩ�≮
-T;	4\u103A-�。\uAA29\u200C�<\u0338;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	4်-�.ꨩ�≮
-N;	4\u103A-�。\uAA29\u200C�<\u0338;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	4်-�.ꨩ�≮
-B;	xn--4--e4j7831r.xn--gdh8754cz40c;	[B1 V5 V6];	[B1 V5 V6]	#	4်-�.ꨩ�≮
-B;	xn--4--e4j7831r.xn--0ugy6gjy5sl3ud;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	4်-�.ꨩ�≮
-T;	\u200C。\uFFA0\u0F84\u0F96;	[C1 P1 V6];	[P1 V6 A4_2]	#	.྄ྖ
-N;	\u200C。\uFFA0\u0F84\u0F96;	[C1 P1 V6];	[C1 P1 V6]	#	.྄ྖ
-T;	\u200C。\u1160\u0F84\u0F96;	[C1 P1 V6];	[P1 V6 A4_2]	#	.྄ྖ
-N;	\u200C。\u1160\u0F84\u0F96;	[C1 P1 V6];	[C1 P1 V6]	#	.྄ྖ
-B;	.xn--3ed0b20h;	[V6 A4_2];	[V6 A4_2]	#	.྄ྖ
-B;	xn--0ug.xn--3ed0b20h;	[C1 V6];	[C1 V6]	#	.྄ྖ
-B;	.xn--3ed0by082k;	[V6 A4_2];	[V6 A4_2]	#	.྄ྖ
-B;	xn--0ug.xn--3ed0by082k;	[C1 V6];	[C1 V6]	#	.྄ྖ
-T;	≯�．\u200D�򲇛;	[C2 P1 V6];	[P1 V6]	#	≯.�
-N;	≯�．\u200D�򲇛;	[C2 P1 V6];	[C2 P1 V6]	#	≯.�
-T;	>\u0338�．\u200D�򲇛;	[C2 P1 V6];	[P1 V6]	#	≯.�
-N;	>\u0338�．\u200D�򲇛;	[C2 P1 V6];	[C2 P1 V6]	#	≯.�
-T;	≯�.\u200D�򲇛;	[C2 P1 V6];	[P1 V6]	#	≯.�
-N;	≯�.\u200D�򲇛;	[C2 P1 V6];	[C2 P1 V6]	#	≯.�
-T;	>\u0338�.\u200D�򲇛;	[C2 P1 V6];	[P1 V6]	#	≯.�
-N;	>\u0338�.\u200D�򲇛;	[C2 P1 V6];	[C2 P1 V6]	#	≯.�
-B;	xn--hdh84488f.xn--xy7cw2886b;	[V6];	[V6]
-B;	xn--hdh84488f.xn--1ug8099fbjp4e;	[C2 V6];	[C2 V6]	#	≯.�
-T;	\u0641ß�｡��;	[B1 B2];	[B1 B2]	#	�ß�.7�
-N;	\u0641ß�｡��;	[B1 B2];	[B1 B2]	#	�ß�.7�
-T;	\u0641ß�。7�;	[B1 B2];	[B1 B2]	#	�ß�.7�
-N;	\u0641ß�。7�;	[B1 B2];	[B1 B2]	#	�ß�.7�
-B;	\u0641SS�。7�;	[B1 B2];	[B1 B2]	#	�ss�.7�
-B;	\u0641ss�。7�;	[B1 B2];	[B1 B2]	#	�ss�.7�
-B;	\u0641Ss�。7�;	[B1 B2];	[B1 B2]	#	�ss�.7�
-B;	xn--ss-jvd2339x.xn--7-mm5i;	[B1 B2];	[B1 B2]	#	�ss�.7�
-B;	xn--zca96ys96y.xn--7-mm5i;	[B1 B2];	[B1 B2]	#	��.7�
-B;	\u0641SS�｡��;	[B1 B2];	[B1 B2]	#	�ss�.7�
-B;	\u0641ss�｡��;	[B1 B2];	[B1 B2]	#	�ss�.7�
-B;	\u0641Ss�｡��;	[B1 B2];	[B1 B2]	#	�ss�.7�
-T;	ß\u07AC\u07A7\u08B1。�􅮙�;	[B2 B5 B6 P1 V6];	[B2 B5 B6 P1 V6]	#	ßެާࢱ.��
-N;	ß\u07AC\u07A7\u08B1。�􅮙�;	[B2 B5 B6 P1 V6];	[B2 B5 B6 P1 V6]	#	ßެާࢱ.��
-B;	SS\u07AC\u07A7\u08B1。�􅮙�;	[B2 B5 B6 P1 V6];	[B2 B5 B6 P1 V6]	#	ssެާࢱ.��
-B;	ss\u07AC\u07A7\u08B1。�􅮙�;	[B2 B5 B6 P1 V6];	[B2 B5 B6 P1 V6]	#	ssެާࢱ.��
-B;	Ss\u07AC\u07A7\u08B1。�􅮙�;	[B2 B5 B6 P1 V6];	[B2 B5 B6 P1 V6]	#	ssެާࢱ.��
-B;	xn--ss-9qet02k.xn--e09co8cr9861c;	[B2 B5 B6 V6];	[B2 B5 B6 V6]	#	ssެާࢱ.��
-B;	xn--zca685aoa95h.xn--e09co8cr9861c;	[B2 B5 B6 V6];	[B2 B5 B6 V6]	#	ßެާࢱ.��
-B;	-｡󠉗⒌𞯛;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	-。󠉗5.𞯛;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	-.xn--5-zz21m.xn--6x6h;	[B1 V3 V6];	[B1 V3 V6]
-B;	-.xn--xsh6367n1bi3e;	[B1 V3 V6];	[B1 V3 V6]
-T;	�ς．-≮\uFCAB;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	ς.-≮خج
-N;	�ς．-≮\uFCAB;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	ς.-≮خج
-T;	�ς．-<\u0338\uFCAB;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	ς.-≮خج
-N;	�ς．-<\u0338\uFCAB;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	ς.-≮خج
-T;	�ς.-≮\u062E\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	ς.-≮خج
-N;	�ς.-≮\u062E\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	ς.-≮خج
-T;	�ς.-<\u0338\u062E\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	ς.-≮خج
-N;	�ς.-<\u0338\u062E\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	ς.-≮خج
-B;	�Σ.-<\u0338\u062E\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	σ.-≮خج
-B;	�Σ.-≮\u062E\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	σ.-≮خج
-B;	�σ.-≮\u062E\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	σ.-≮خج
-B;	�σ.-<\u0338\u062E\u062C;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	σ.-≮خج
-B;	xn--4xa92520c.xn----9mcf1400a;	[B1 V3 V6];	[B1 V3 V6]	#	σ.-≮خج
-B;	xn--3xa13520c.xn----9mcf1400a;	[B1 V3 V6];	[B1 V3 V6]	#	ς.-≮خج
-B;	�Σ．-<\u0338\uFCAB;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	σ.-≮خج
-B;	�Σ．-≮\uFCAB;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	σ.-≮خج
-B;	�σ．-≮\uFCAB;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	σ.-≮خج
-B;	�σ．-<\u0338\uFCAB;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	σ.-≮خج
-B;	ꡗ\u08B8\u0719．񔤔󠛙\u0C4D\uFC3E;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ꡗࢸܙ.�كي
-B;	ꡗ\u08B8\u0719.񔤔󠛙\u0C4D\u0643\u064A;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ꡗࢸܙ.�كي
-B;	xn--jnb34fs003a.xn--fhbo927bk128mpi24d;	[B5 B6 V6];	[B5 B6 V6]	#	ꡗࢸܙ.�كي
-B;	�\u08B7𞤌�。�\u17CD�;	[B1];	[B1]	#	�ࢷ𞤮�.���
-B;	�\u08B7𞤮�。�\u17CD�;	[B1];	[B1]	#	�ࢷ𞤮�.���
-B;	xn--dzb5191kezbrw47a.xn--p4e3841jz9tf;	[B1];	[B1]	#	�ࢷ𞤮�.���
-B;	�\u08B7𞤮�.�\u17CD�;	[B1];	[B1]	#	�ࢷ𞤮�.���
-B;	�\u08B7𞤌�.�\u17CD�;	[B1];	[B1]	#	�ࢷ𞤮�.���
-T;	₂㘷--。\u06D3\u200C�𑖿;	[B1 C1 V2 V3];	[B1 V2 V3]	#	2㘷--.ۓ�𑖿
-N;	₂㘷--。\u06D3\u200C�𑖿;	[B1 C1 V2 V3];	[B1 C1 V2 V3]	#	2㘷--.ۓ�𑖿
-T;	₂㘷--。\u06D2\u0654\u200C�𑖿;	[B1 C1 V2 V3];	[B1 V2 V3]	#	2㘷--.ۓ�𑖿
-N;	₂㘷--。\u06D2\u0654\u200C�𑖿;	[B1 C1 V2 V3];	[B1 C1 V2 V3]	#	2㘷--.ۓ�𑖿
-T;	2㘷--。\u06D3\u200C�𑖿;	[B1 C1 V2 V3];	[B1 V2 V3]	#	2㘷--.ۓ�𑖿
-N;	2㘷--。\u06D3\u200C�𑖿;	[B1 C1 V2 V3];	[B1 C1 V2 V3]	#	2㘷--.ۓ�𑖿
-T;	2㘷--。\u06D2\u0654\u200C�𑖿;	[B1 C1 V2 V3];	[B1 V2 V3]	#	2㘷--.ۓ�𑖿
-N;	2㘷--。\u06D2\u0654\u200C�𑖿;	[B1 C1 V2 V3];	[B1 C1 V2 V3]	#	2㘷--.ۓ�𑖿
-B;	xn--2---u58b.xn--jlb8024k14g;	[B1 V2 V3];	[B1 V2 V3]	#	2㘷--.ۓ�𑖿
-B;	xn--2---u58b.xn--jlb820ku99nbgj;	[B1 C1 V2 V3];	[B1 C1 V2 V3]	#	2㘷--.ۓ�𑖿
-B;	-𘊻．ᡮ\u062D-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	-𘊻.ᡮح-
-B;	-𘊻.ᡮ\u062D-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	-𘊻.ᡮح-
-B;	xn----bp5n.xn----bnc231l;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	-𘊻.ᡮح-
-T;	\u200C-ß｡ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 V3]	#	-ß.ᢣ�ؿ
-N;	\u200C-ß｡ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ß.ᢣ�ؿ
-T;	\u200C-ß。ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 V3]	#	-ß.ᢣ�ؿ
-N;	\u200C-ß。ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ß.ᢣ�ؿ
-T;	\u200C-SS。ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 V3]	#	-ss.ᢣ�ؿ
-N;	\u200C-SS。ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ss.ᢣ�ؿ
-T;	\u200C-ss。ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 V3]	#	-ss.ᢣ�ؿ
-N;	\u200C-ss。ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ss.ᢣ�ؿ
-T;	\u200C-Ss。ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 V3]	#	-ss.ᢣ�ؿ
-N;	\u200C-Ss。ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ss.ᢣ�ؿ
-B;	-ss.xn--bhb925glx3p;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	-ss.ᢣ�ؿ
-B;	xn---ss-8m0a.xn--bhb925glx3p;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ss.ᢣ�ؿ
-B;	xn----qfa550v.xn--bhb925glx3p;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ß.ᢣ�ؿ
-T;	\u200C-SS｡ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 V3]	#	-ss.ᢣ�ؿ
-N;	\u200C-SS｡ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ss.ᢣ�ؿ
-T;	\u200C-ss｡ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 V3]	#	-ss.ᢣ�ؿ
-N;	\u200C-ss｡ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ss.ᢣ�ؿ
-T;	\u200C-Ss｡ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 V3]	#	-ss.ᢣ�ؿ
-N;	\u200C-Ss｡ᢣ�\u063F;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	-ss.ᢣ�ؿ
-B;	�Ӏ\u1BAA\u08F6．눵;	[P1 V6];	[P1 V6]	#	�Ӏ᮪ࣶ.눵
-B;	�Ӏ\u1BAA\u08F6．눵;	[P1 V6];	[P1 V6]	#	�Ӏ᮪ࣶ.눵
-B;	�Ӏ\u1BAA\u08F6.눵;	[P1 V6];	[P1 V6]	#	�Ӏ᮪ࣶ.눵
-B;	�Ӏ\u1BAA\u08F6.눵;	[P1 V6];	[P1 V6]	#	�Ӏ᮪ࣶ.눵
-B;	��\u1BAA\u08F6.눵;	��\u1BAA\u08F6.눵;	xn--s5a04sn4u297k.xn--2e1b	#	��᮪ࣶ.눵
-B;	��\u1BAA\u08F6.눵;	;	xn--s5a04sn4u297k.xn--2e1b	#	��᮪ࣶ.눵
-B;	xn--s5a04sn4u297k.xn--2e1b;	��\u1BAA\u08F6.눵;	xn--s5a04sn4u297k.xn--2e1b	#	��᮪ࣶ.눵
-B;	xn--d5a07sn4u297k.xn--2e1b;	[V6];	[V6]	#	�Ӏ᮪ࣶ.눵
-B;	��\u1BAA\u08F6．눵;	��\u1BAA\u08F6.눵;	xn--s5a04sn4u297k.xn--2e1b	#	��᮪ࣶ.눵
-B;	��\u1BAA\u08F6．눵;	��\u1BAA\u08F6.눵;	xn--s5a04sn4u297k.xn--2e1b	#	��᮪ࣶ.눵
-B;	\uA8EA｡𖄿𑆾󠇗;	[P1 V5 V6];	[P1 V5 V6]	#	꣪.𑆾
-B;	\uA8EA。𖄿𑆾󠇗;	[P1 V5 V6];	[P1 V5 V6]	#	꣪.𑆾
-B;	xn--3g9a.xn--ud1dz07k;	[V5 V6];	[V5 V6]	#	꣪.𑆾
-B;	󇓓𑚳。�≯⾇;	[P1 V6];	[P1 V6]
-B;	󇓓𑚳。�>\u0338⾇;	[P1 V6];	[P1 V6]
-B;	󇓓𑚳。�≯舛;	[P1 V6];	[P1 V6]
-B;	󇓓𑚳。�>\u0338舛;	[P1 V6];	[P1 V6]
-B;	xn--3e2d79770c.xn--hdh0088abyy1c;	[V6];	[V6]
-T;	�\u0661\u200C．\u200D\u200C;	[B1 B3 C1 C2];	xn--9hb7344k.	#	�١.
-N;	�\u0661\u200C．\u200D\u200C;	[B1 B3 C1 C2];	[B1 B3 C1 C2]	#	�١.
-T;	�\u0661\u200C.\u200D\u200C;	[B1 B3 C1 C2];	xn--9hb7344k.	#	�١.
-N;	�\u0661\u200C.\u200D\u200C;	[B1 B3 C1 C2];	[B1 B3 C1 C2]	#	�١.
-B;	xn--9hb7344k.;	�\u0661.;	xn--9hb7344k.	#	�١.
-B;	�\u0661.;	;	xn--9hb7344k.	#	�١.
-B;	xn--9hb652kv99n.xn--0ugb;	[B1 B3 C1 C2];	[B1 B3 C1 C2]	#	�١.
-T;	񡅈砪≯ᢑ｡≯�򓴔\u200C;	[C1 P1 V6];	[P1 V6]	#	砪≯ᢑ.≯�
-N;	񡅈砪≯ᢑ｡≯�򓴔\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	砪≯ᢑ.≯�
-T;	񡅈砪>\u0338ᢑ｡>\u0338�򓴔\u200C;	[C1 P1 V6];	[P1 V6]	#	砪≯ᢑ.≯�
-N;	񡅈砪>\u0338ᢑ｡>\u0338�򓴔\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	砪≯ᢑ.≯�
-T;	񡅈砪≯ᢑ。≯�򓴔\u200C;	[C1 P1 V6];	[P1 V6]	#	砪≯ᢑ.≯�
-N;	񡅈砪≯ᢑ。≯�򓴔\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	砪≯ᢑ.≯�
-T;	񡅈砪>\u0338ᢑ。>\u0338�򓴔\u200C;	[C1 P1 V6];	[P1 V6]	#	砪≯ᢑ.≯�
-N;	񡅈砪>\u0338ᢑ。>\u0338�򓴔\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	砪≯ᢑ.≯�
-B;	xn--bbf561cf95e57y3e.xn--hdh0834o7mj6b;	[V6];	[V6]
-B;	xn--bbf561cf95e57y3e.xn--0ugz6gc910ejro8c;	[C1 V6];	[C1 V6]	#	砪≯ᢑ.≯�
-B;	Ⴥ.𑄳㊸;	[P1 V5 V6];	[P1 V5 V6]
-B;	Ⴥ.𑄳43;	[P1 V5 V6];	[P1 V5 V6]
-B;	â´¥.ð‘„³43;	[V5];	[V5]
-B;	xn--tlj.xn--43-274o;	[V5];	[V5]
-B;	xn--9nd.xn--43-274o;	[V5 V6];	[V5 V6]
-B;	ⴥ.𑄳㊸;	[V5];	[V5]
-B;	�\u0663。Ⴒᡇ\u08F2�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	0٣.Ⴒᡇࣲ�
-B;	0\u0663。Ⴒᡇ\u08F2�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	0٣.Ⴒᡇࣲ�
-B;	0\u0663。ⴒᡇ\u08F2�;	[B1 B5 B6];	[B1 B5 B6]	#	0٣.ⴒᡇࣲ�
-B;	xn--0-fqc.xn--10b369eivp359r;	[B1 B5 B6];	[B1 B5 B6]	#	0٣.ⴒᡇࣲ�
-B;	xn--0-fqc.xn--10b180bnwgfy0z;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	0٣.Ⴒᡇࣲ�
-B;	�\u0663。ⴒᡇ\u08F2�;	[B1 B5 B6];	[B1 B5 B6]	#	0٣.ⴒᡇࣲ�
-B;	񗪨󠄉\uFFA0\u0FB7.񸞰\uA953;	[P1 V6];	[P1 V6]	#	ྷ.꥓
-B;	񗪨󠄉\u1160\u0FB7.񸞰\uA953;	[P1 V6];	[P1 V6]	#	ྷ.꥓
-B;	xn--kgd36f9z57y.xn--3j9au7544a;	[V6];	[V6]	#	ྷ.꥓
-B;	xn--kgd7493jee34a.xn--3j9au7544a;	[V6];	[V6]	#	ྷ.꥓
-T;	\u0618.۳\u200C\uA953;	[C1 V5];	[V5]	#	ؘ.۳꥓
-N;	\u0618.۳\u200C\uA953;	[C1 V5];	[C1 V5]	#	ؘ.۳꥓
-B;	xn--6fb.xn--gmb0524f;	[V5];	[V5]	#	ؘ.۳꥓
-B;	xn--6fb.xn--gmb469jjf1h;	[C1 V5];	[C1 V5]	#	ؘ.۳꥓
-B;	ᡌ．︒ᢑ;	[P1 V6];	[P1 V6]
-B;	ᡌ.。ᢑ;	[A4_2];	[A4_2]
-B;	xn--c8e..xn--bbf;	[A4_2];	[A4_2]
-B;	xn--c8e.xn--bbf9168i;	[V6];	[V6]
-B;	𑋪\u1073｡𞽧;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑋪�.
-B;	𑋪\u1073。𞽧;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑋪�.
-B;	xn--xld7443k.xn--4o7h;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	𑋪�.
-B;	�。ᠢ򓘆;	[P1 V6];	[P1 V6]
-B;	xn--hd7h.xn--46e66060j;	[V6];	[V6]
-T;	𑄳㴼．\u200C�\u20EB񫺦;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	𑄳㴼.�⃫
-N;	𑄳㴼．\u200C�\u20EB񫺦;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	𑄳㴼.�⃫
-T;	𑄳㴼.\u200C�\u20EB񫺦;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	𑄳㴼.�⃫
-N;	𑄳㴼.\u200C�\u20EB񫺦;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	𑄳㴼.�⃫
-B;	xn--iym9428c.xn--e1g3464g08p3b;	[B1 V5 V6];	[B1 V5 V6]	#	𑄳㴼.�⃫
-B;	xn--iym9428c.xn--0ug46a7218cllv0c;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	𑄳㴼.�⃫
-B;	񠻟�𑈯｡\u031D;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	�𑈯.�
-B;	񠻟�𑈯。\u031D;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	�𑈯.�
-B;	xn--ro0dw7dey96m.xn--eta;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	�𑈯.�
-B;	ᢊ뾜󠱴𑚶。\u089D�;	[P1 V6];	[P1 V6]	#	ᢊ뾜𑚶.�
-B;	ᢊ뾜󠱴𑚶。\u089D�;	[P1 V6];	[P1 V6]	#	ᢊ뾜𑚶.�
-B;	xn--39e4566fjv8bwmt6n.xn--myb6415k;	[V6];	[V6]	#	ᢊ뾜𑚶.�
-T;	�≠｡�󠧠\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�≠.�
-N;	�≠｡�󠧠\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�≠.�
-T;	�=\u0338｡�󠧠\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�≠.�
-N;	�=\u0338｡�󠧠\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�≠.�
-T;	�≠。�󠧠\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�≠.�
-N;	�≠。�󠧠\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�≠.�
-T;	�=\u0338。�󠧠\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�≠.�
-N;	�=\u0338。�󠧠\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�≠.�
-B;	xn--1ch6704g.xn--m97cw2999c;	[B1 V6];	[B1 V6]
-B;	xn--1ch6704g.xn--0ug3840g51u4g;	[B1 C1 V6];	[B1 C1 V6]	#	�≠.�
-T;	\u115F񙯠\u094D．\u200D\uA953�;	[B1 C2 P1 V6];	[B5 B6 P1 V5 V6]	#	�.꥓
-N;	\u115F񙯠\u094D．\u200D\uA953�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.꥓
-T;	\u115F񙯠\u094D.\u200D\uA953�;	[B1 C2 P1 V6];	[B5 B6 P1 V5 V6]	#	�.꥓
-N;	\u115F񙯠\u094D.\u200D\uA953�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.꥓
-B;	xn--n3b542bb085j.xn--3j9al95p;	[B5 B6 V5 V6];	[B5 B6 V5 V6]	#	�.꥓
-B;	xn--n3b542bb085j.xn--1ug6815co9wc;	[B1 C2 V6];	[B1 C2 V6]	#	�.꥓
-B;	򌋔󠆎󠆗𑲕。≮;	[P1 V6];	[P1 V6]
-B;	򌋔󠆎󠆗𑲕。<\u0338;	[P1 V6];	[P1 V6]
-B;	xn--4m3dv4354a.xn--gdh;	[V6];	[V6]
-B;	󠆦.\u08E3暀≠;	[P1 V5 V6 A4_2];	[P1 V5 V6 A4_2]	#	.ࣣ暀≠
-B;	󠆦.\u08E3暀=\u0338;	[P1 V5 V6 A4_2];	[P1 V5 V6 A4_2]	#	.ࣣ暀≠
-B;	.xn--m0b461k3g2c;	[V5 V6 A4_2];	[V5 V6 A4_2]	#	.ࣣ暀≠
-B;	�\uABED｡\uFD30򜖅\u1DF0;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�꯭.شمᷰ
-B;	�\uABED。\u0634\u0645򜖅\u1DF0;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�꯭.شمᷰ
-B;	xn--429ak76o.xn--zgb8a701kox37t;	[B2 B3 V6];	[B2 B3 V6]	#	�꯭.شمᷰ
-T;	�\u200D⒈｡Ⴌ𞱓;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�⒈.Ⴌ
-N;	�\u200D⒈｡Ⴌ𞱓;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 C2 P1 V5 V6]	#	�⒈.Ⴌ
-T;	�\u200D1.。Ⴌ𞱓;	[B1 B5 B6 C2 P1 V5 V6 A4_2];	[B1 B5 B6 P1 V5 V6 A4_2]	#	�1..Ⴌ
-N;	�\u200D1.。Ⴌ𞱓;	[B1 B5 B6 C2 P1 V5 V6 A4_2];	[B1 B5 B6 C2 P1 V5 V6 A4_2]	#	�1..Ⴌ
-T;	�\u200D1.。ⴌ𞱓;	[B1 B5 B6 C2 P1 V5 V6 A4_2];	[B1 B5 B6 P1 V5 V6 A4_2]	#	�1..ⴌ
-N;	�\u200D1.。ⴌ𞱓;	[B1 B5 B6 C2 P1 V5 V6 A4_2];	[B1 B5 B6 C2 P1 V5 V6 A4_2]	#	�1..ⴌ
-B;	xn--1-px8q..xn--3kj4524l;	[B1 B5 B6 V5 V6 A4_2];	[B1 B5 B6 V5 V6 A4_2]
-B;	xn--1-tgn9827q..xn--3kj4524l;	[B1 B5 B6 C2 V5 V6 A4_2];	[B1 B5 B6 C2 V5 V6 A4_2]	#	�1..ⴌ
-B;	xn--1-px8q..xn--knd8464v;	[B1 B5 B6 V5 V6 A4_2];	[B1 B5 B6 V5 V6 A4_2]
-B;	xn--1-tgn9827q..xn--knd8464v;	[B1 B5 B6 C2 V5 V6 A4_2];	[B1 B5 B6 C2 V5 V6 A4_2]	#	�1..Ⴌ
-T;	�\u200D⒈｡ⴌ𞱓;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�⒈.ⴌ
-N;	�\u200D⒈｡ⴌ𞱓;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 C2 P1 V5 V6]	#	�⒈.ⴌ
-B;	xn--tshz828m.xn--3kj4524l;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]
-B;	xn--1ug68oq348b.xn--3kj4524l;	[B1 B5 B6 C2 V5 V6];	[B1 B5 B6 C2 V5 V6]	#	�⒈.ⴌ
-B;	xn--tshz828m.xn--knd8464v;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]
-B;	xn--1ug68oq348b.xn--knd8464v;	[B1 B5 B6 C2 V5 V6];	[B1 B5 B6 C2 V5 V6]	#	�⒈.Ⴌ
-T;	󠣙\u0A4D𱫘𞤸.ς񵯞􈰔;	[B1 P1 V6];	[B1 P1 V6]	#	�𞤸.ς
-N;	󠣙\u0A4D𱫘𞤸.ς񵯞􈰔;	[B1 P1 V6];	[B1 P1 V6]	#	�𞤸.ς
-B;	󠣙\u0A4D𱫘𞤖.Σ񵯞􈰔;	[B1 P1 V6];	[B1 P1 V6]	#	�𞤸.σ
-B;	󠣙\u0A4D𱫘𞤸.σ񵯞􈰔;	[B1 P1 V6];	[B1 P1 V6]	#	�𞤸.σ
-B;	󠣙\u0A4D𱫘𞤖.σ񵯞􈰔;	[B1 P1 V6];	[B1 P1 V6]	#	�𞤸.σ
-B;	xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b;	[B1 V6];	[B1 V6]	#	�𞤸.σ
-T;	󠣙\u0A4D𱫘𞤖.ς񵯞􈰔;	[B1 P1 V6];	[B1 P1 V6]	#	�𞤸.ς
-N;	󠣙\u0A4D𱫘𞤖.ς񵯞􈰔;	[B1 P1 V6];	[B1 P1 V6]	#	�𞤸.ς
-B;	xn--ybc0236vjvxgt5q0g.xn--3xa03737giye6b;	[B1 V6];	[B1 V6]	#	�𞤸.ς
-B;	󠣙\u0A4D𱫘𞤸.Σ񵯞􈰔;	[B1 P1 V6];	[B1 P1 V6]	#	�𞤸.σ
-T;	\u07D3。\u200C�򞭱;	[B1 C1 P1 V6];	[B2 B3 P1 V6]	#	ߓ.�
-N;	\u07D3。\u200C�򞭱;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ߓ.�
-B;	xn--usb.xn--pw9ci1099a;	[B2 B3 V6];	[B2 B3 V6]	#	ߓ.�
-B;	xn--usb.xn--0ug9553gm3v5d;	[B1 C1 V6];	[B1 C1 V6]	#	ߓ.�
-B;	\u1C2E�.\u05A6ꡟ𞤕󠆖;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ᰮ�.֦ꡟ𞤷
-B;	\u1C2E�.\u05A6ꡟ𞤷󠆖;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ᰮ�.֦ꡟ𞤷
-B;	xn--q1f4493q.xn--xcb8244fifvj;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ᰮ�.֦ꡟ𞤷
-T;	䂹󾖅�．\u200D;	[C2 P1 V6];	[P1 V6]	#	䂹�.
-N;	䂹󾖅�．\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	䂹�.
-T;	䂹󾖅�.\u200D;	[C2 P1 V6];	[P1 V6]	#	䂹�.
-N;	䂹󾖅�.\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	䂹�.
-B;	xn--0on3543c5981i.;	[V6];	[V6]
-B;	xn--0on3543c5981i.xn--1ug;	[C2 V6];	[C2 V6]	#	䂹�.
-T;	\uA9C0\u200C�\u200C｡\u0767🄉;	[B5 B6 C1 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	꧀�.ݧ🄉
-N;	\uA9C0\u200C�\u200C｡\u0767🄉;	[B5 B6 C1 P1 V5 V6];	[B5 B6 C1 P1 V5 V6]	#	꧀�.ݧ🄉
-T;	\uA9C0\u200C�\u200C。\u07678,;	[B3 B5 B6 C1 P1 V5 V6];	[B3 B5 B6 P1 V5 V6]	#	꧀�.ݧ8,
-N;	\uA9C0\u200C�\u200C。\u07678,;	[B3 B5 B6 C1 P1 V5 V6];	[B3 B5 B6 C1 P1 V5 V6]	#	꧀�.ݧ8,
-B;	xn--7m9an32q.xn--8,-qle;	[B3 B5 B6 P1 V5 V6];	[B3 B5 B6 P1 V5 V6]	#	꧀�.ݧ8,
-B;	xn--0uga8686hdgvd.xn--8,-qle;	[B3 B5 B6 C1 P1 V5 V6];	[B3 B5 B6 C1 P1 V5 V6]	#	꧀�.ݧ8,
-B;	xn--7m9an32q.xn--rpb6081w;	[B5 B6 V5 V6];	[B5 B6 V5 V6]	#	꧀�.ݧ🄉
-B;	xn--0uga8686hdgvd.xn--rpb6081w;	[B5 B6 C1 V5 V6];	[B5 B6 C1 V5 V6]	#	꧀�.ݧ🄉
-B;	︒｡Ⴃ≯;	[P1 V6];	[P1 V6]
-B;	︒｡Ⴃ>\u0338;	[P1 V6];	[P1 V6]
-B;	。。Ⴃ≯;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	。。Ⴃ>\u0338;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	。。ⴃ>\u0338;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	。。ⴃ≯;	[P1 V6 A4_2];	[P1 V6 A4_2]
-B;	..xn--hdh782b;	[V6 A4_2];	[V6 A4_2]
-B;	..xn--bnd622g;	[V6 A4_2];	[V6 A4_2]
-B;	︒｡ⴃ>\u0338;	[P1 V6];	[P1 V6]
-B;	︒｡ⴃ≯;	[P1 V6];	[P1 V6]
-B;	xn--y86c.xn--hdh782b;	[V6];	[V6]
-B;	xn--y86c.xn--bnd622g;	[V6];	[V6]
-T;	�｡󠢼\u200D;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.
-N;	�｡󠢼\u200D;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.
-T;	�。󠢼\u200D;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.
-N;	�。󠢼\u200D;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.
-B;	xn--mo0d.xn--wy46e;	[B1 V6];	[B1 V6]
-B;	xn--mo0d.xn--1ug18431l;	[B1 C2 V6];	[B1 C2 V6]	#	�.
-T;	Ⴞ�｡︒\u077D\u200DႯ;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 P1 V6]	#	Ⴞ�.︒ݽႯ
-N;	Ⴞ�｡︒\u077D\u200DႯ;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	Ⴞ�.︒ݽႯ
-T;	Ⴞ�。。\u077D\u200DႯ;	[B2 B3 B5 B6 C2 P1 V6 A4_2];	[B2 B3 B5 B6 P1 V6 A4_2]	#	Ⴞ�..ݽႯ
-N;	Ⴞ�。。\u077D\u200DႯ;	[B2 B3 B5 B6 C2 P1 V6 A4_2];	[B2 B3 B5 B6 C2 P1 V6 A4_2]	#	Ⴞ�..ݽႯ
-T;	ⴞ�。。\u077D\u200D�;	[B2 B3 B5 B6 C2 A4_2];	[B2 B3 B5 B6 A4_2]	#	ⴞ�..ݽ�
-N;	ⴞ�。。\u077D\u200D�;	[B2 B3 B5 B6 C2 A4_2];	[B2 B3 B5 B6 C2 A4_2]	#	ⴞ�..ݽ�
-B;	xn--mlju223e..xn--eqb053q;	[B2 B3 B5 B6 A4_2];	[B2 B3 B5 B6 A4_2]	#	ⴞ�..ݽ�
-B;	xn--mlju223e..xn--eqb096jpgj;	[B2 B3 B5 B6 C2 A4_2];	[B2 B3 B5 B6 C2 A4_2]	#	ⴞ�..ݽ�
-B;	xn--2nd0990k..xn--eqb228b;	[B2 B3 B5 B6 V6 A4_2];	[B2 B3 B5 B6 V6 A4_2]	#	Ⴞ�..ݽႯ
-B;	xn--2nd0990k..xn--eqb228bgzm;	[B2 B3 B5 B6 C2 V6 A4_2];	[B2 B3 B5 B6 C2 V6 A4_2]	#	Ⴞ�..ݽႯ
-T;	ⴞ�｡︒\u077D\u200D�;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 P1 V6]	#	ⴞ�.︒ݽ�
-N;	ⴞ�｡︒\u077D\u200D�;	[B1 B5 B6 C2 P1 V6];	[B1 B5 B6 C2 P1 V6]	#	ⴞ�.︒ݽ�
-B;	xn--mlju223e.xn--eqb053qjk7l;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	ⴞ�.︒ݽ�
-B;	xn--mlju223e.xn--eqb096jpgj9y7r;	[B1 B5 B6 C2 V6];	[B1 B5 B6 C2 V6]	#	ⴞ�.︒ݽ�
-B;	xn--2nd0990k.xn--eqb228b583r;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	Ⴞ�.︒ݽႯ
-B;	xn--2nd0990k.xn--eqb228bgzmvp0t;	[B1 B5 B6 C2 V6];	[B1 B5 B6 C2 V6]	#	Ⴞ�.︒ݽႯ
-T;	\u200CႦ�。-\u20D2-\u07D1;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	Ⴆ3.-⃒-ߑ
-N;	\u200CႦ�。-\u20D2-\u07D1;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	Ⴆ3.-⃒-ߑ
-T;	\u200CႦ3。-\u20D2-\u07D1;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	Ⴆ3.-⃒-ߑ
-N;	\u200CႦ3。-\u20D2-\u07D1;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	Ⴆ3.-⃒-ߑ
-T;	\u200Cⴆ3。-\u20D2-\u07D1;	[B1 C1 V3];	[B1 V3]	#	ⴆ3.-⃒-ߑ
-N;	\u200Cⴆ3。-\u20D2-\u07D1;	[B1 C1 V3];	[B1 C1 V3]	#	ⴆ3.-⃒-ߑ
-B;	xn--3-lvs.xn-----vue617w;	[B1 V3];	[B1 V3]	#	ⴆ3.-⃒-ߑ
-B;	xn--3-rgnv99c.xn-----vue617w;	[B1 C1 V3];	[B1 C1 V3]	#	ⴆ3.-⃒-ߑ
-B;	xn--3-i0g.xn-----vue617w;	[B1 V3 V6];	[B1 V3 V6]	#	Ⴆ3.-⃒-ߑ
-B;	xn--3-i0g939i.xn-----vue617w;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	Ⴆ3.-⃒-ߑ
-T;	\u200Cⴆ�。-\u20D2-\u07D1;	[B1 C1 V3];	[B1 V3]	#	ⴆ3.-⃒-ߑ
-N;	\u200Cⴆ�。-\u20D2-\u07D1;	[B1 C1 V3];	[B1 C1 V3]	#	ⴆ3.-⃒-ߑ
-B;	箃�-�｡≠-🤖;	[P1 V6];	[P1 V6]
-B;	箃�-�｡=\u0338-🤖;	[P1 V6];	[P1 V6]
-B;	箃�-�。≠-🤖;	[P1 V6];	[P1 V6]
-B;	箃�-�。=\u0338-🤖;	[P1 V6];	[P1 V6]
-B;	箃ⴡ-�。=\u0338-🤖;	[P1 V6];	[P1 V6]
-B;	箃ⴡ-�。≠-🤖;	[P1 V6];	[P1 V6]
-B;	xn----4wsr321ay823p.xn----tfot873s;	[V6];	[V6]
-B;	xn----11g3013fy8x5m.xn----tfot873s;	[V6];	[V6]
-B;	箃ⴡ-�｡=\u0338-🤖;	[P1 V6];	[P1 V6]
-B;	箃ⴡ-�｡≠-🤖;	[P1 V6];	[P1 V6]
-B;	\u07E5.\u06B5;	;	xn--dtb.xn--okb	#	ߥ.ڵ
-B;	xn--dtb.xn--okb;	\u07E5.\u06B5;	xn--dtb.xn--okb	#	ߥ.ڵ
-T;	\u200C\u200D.𞤿;	[B1 C1 C2];	[A4_2]	#	.𞤿
-N;	\u200C\u200D.𞤿;	[B1 C1 C2];	[B1 C1 C2]	#	.𞤿
-T;	\u200C\u200D.�;	[B1 C1 C2];	[A4_2]	#	.𞤿
-N;	\u200C\u200D.�;	[B1 C1 C2];	[B1 C1 C2]	#	.𞤿
-B;	.xn--3e6h;	[A4_2];	[A4_2]
-B;	xn--0ugc.xn--3e6h;	[B1 C1 C2];	[B1 C1 C2]	#	.𞤿
-B;	xn--3e6h;	𞤿;	xn--3e6h
-B;	𞤿;	;	xn--3e6h
-B;	�;	𞤿;	xn--3e6h
-T;	🜑�\u0639.ς�蜹;	[B1];	[B1]	#	🜑�ع.ς�蜹
-N;	🜑�\u0639.ς�蜹;	[B1];	[B1]	#	🜑�ع.ς�蜹
-B;	🜑�\u0639.Σ�蜹;	[B1];	[B1]	#	🜑�ع.σ�蜹
-B;	🜑�\u0639.σ�蜹;	[B1];	[B1]	#	🜑�ع.σ�蜹
-B;	xn--4gb3736kk4zf.xn--4xa2248dy27d;	[B1];	[B1]	#	🜑�ع.σ�蜹
-B;	xn--4gb3736kk4zf.xn--3xa4248dy27d;	[B1];	[B1]	#	🜑�ع.ς�蜹
-B;	�ス􆟤\u0669．󚃟;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ス٩.
-B;	�ス􆟤\u0669.󚃟;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ス٩.
-B;	xn--iib777sp230oo708a.xn--7824e;	[B5 B6 V6];	[B5 B6 V6]	#	ス٩.
-B;	��．\u059A\uD850\u06C2;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	��．\u059A\uD850\u06C1\u0654;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	��.\u059A\uD850\u06C2;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	��.\u059A\uD850\u06C1\u0654;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	xn--8c3hu7971a.\u059A\uD850\u06C2;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	xn--8c3hu7971a.\u059A\uD850\u06C1\u0654;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	XN--8C3HU7971A.\u059A\uD850\u06C1\u0654;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	XN--8C3HU7971A.\u059A\uD850\u06C2;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	Xn--8C3hu7971a.\u059A\uD850\u06C2;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-B;	Xn--8C3hu7971a.\u059A\uD850\u06C1\u0654;	[B1 P1 V5 V6];	[B1 P1 V5 V6 A3]	#	�.֚ۂ
-T;	\u0660򪓵\u200C。\u0757;	[B1 C1 P1 V6];	[B1 P1 V6]	#	٠.ݗ
-N;	\u0660򪓵\u200C。\u0757;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	٠.ݗ
-B;	xn--8hb82030l.xn--bpb;	[B1 V6];	[B1 V6]	#	Ù .Ý—
-B;	xn--8hb852ke991q.xn--bpb;	[B1 C1 V6];	[B1 C1 V6]	#	Ù .Ý—
-T;	\u103A\u200D\u200C。-\u200C;	[C1 V3 V5];	[V3 V5]	#	်.-
-N;	\u103A\u200D\u200C。-\u200C;	[C1 V3 V5];	[C1 V3 V5]	#	်.-
-B;	xn--bkd.-;	[V3 V5];	[V3 V5]	#	်.-
-B;	xn--bkd412fca.xn----sgn;	[C1 V3 V5];	[C1 V3 V5]	#	်.-
-B;	︒｡\u1B44ᡉ;	[P1 V5 V6];	[P1 V5 V6]	#	︒.᭄ᡉ
-B;	。。\u1B44ᡉ;	[V5 A4_2];	[V5 A4_2]	#	..᭄ᡉ
-B;	..xn--87e93m;	[V5 A4_2];	[V5 A4_2]	#	..᭄ᡉ
-B;	xn--y86c.xn--87e93m;	[V5 V6];	[V5 V6]	#	︒.᭄ᡉ
-T;	\u0758ß。ጫᢊ\u0768�;	[B2 B3 B5];	[B2 B3 B5]	#	ݘß.ጫᢊݨ2
-N;	\u0758ß。ጫᢊ\u0768�;	[B2 B3 B5];	[B2 B3 B5]	#	ݘß.ጫᢊݨ2
-T;	\u0758ß。ጫᢊ\u07682;	[B2 B3 B5];	[B2 B3 B5]	#	ݘß.ጫᢊݨ2
-N;	\u0758ß。ጫᢊ\u07682;	[B2 B3 B5];	[B2 B3 B5]	#	ݘß.ጫᢊݨ2
-B;	\u0758SS。ጫᢊ\u07682;	[B2 B3 B5];	[B2 B3 B5]	#	ݘss.ጫᢊݨ2
-B;	\u0758ss。ጫᢊ\u07682;	[B2 B3 B5];	[B2 B3 B5]	#	ݘss.ጫᢊݨ2
-B;	\u0758Ss。ጫᢊ\u07682;	[B2 B3 B5];	[B2 B3 B5]	#	ݘss.ጫᢊݨ2
-B;	xn--ss-gke.xn--2-b5c641gfmf;	[B2 B3 B5];	[B2 B3 B5]	#	ݘss.ጫᢊݨ2
-B;	xn--zca724a.xn--2-b5c641gfmf;	[B2 B3 B5];	[B2 B3 B5]	#	ݘß.ጫᢊݨ2
-B;	\u0758SS。ጫᢊ\u0768�;	[B2 B3 B5];	[B2 B3 B5]	#	ݘss.ጫᢊݨ2
-B;	\u0758ss。ጫᢊ\u0768�;	[B2 B3 B5];	[B2 B3 B5]	#	ݘss.ጫᢊݨ2
-B;	\u0758Ss。ጫᢊ\u0768�;	[B2 B3 B5];	[B2 B3 B5]	#	ݘss.ጫᢊݨ2
-B;	\u07C3𞶇ᚲ.\u0902\u0353�\u09CD;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	߃ᚲ.ं͓2�
-B;	\u07C3𞶇ᚲ.\u0902\u03532\u09CD;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	߃ᚲ.ं͓2�
-B;	xn--esb067enh07a.xn--2-lgb874bjxa;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	߃ᚲ.ं͓2�
-T;	-\u1BAB︒\u200D.񒶈񥹓;	[C2 P1 V3 V6];	[P1 V3 V6]	#	-᮫︒.
-N;	-\u1BAB︒\u200D.񒶈񥹓;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	-᮫︒.
-T;	-\u1BAB。\u200D.񒶈񥹓;	[C2 P1 V3 V6];	[P1 V3 V6 A4_2]	#	-᮫..
-N;	-\u1BAB。\u200D.񒶈񥹓;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	-᮫..
-B;	xn----qml..xn--x50zy803a;	[V3 V6 A4_2];	[V3 V6 A4_2]	#	-᮫..
-B;	xn----qml.xn--1ug.xn--x50zy803a;	[C2 V3 V6];	[C2 V3 V6]	#	-᮫..
-B;	xn----qml1407i.xn--x50zy803a;	[V3 V6];	[V3 V6]	#	-᮫︒.
-B;	xn----qmlv7tw180a.xn--x50zy803a;	[C2 V3 V6];	[C2 V3 V6]	#	-᮫︒.
-B;	󠦮.≯𞀆;	[P1 V6];	[P1 V6]
-B;	󠦮.>\u0338𞀆;	[P1 V6];	[P1 V6]
-B;	xn--t546e.xn--hdh5166o;	[V6];	[V6]
-B;	-𑄳󠊗�。𞮱;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	xn----p26i72em2894c.xn--zw6h;	[B1 V3 V6];	[B1 V3 V6]
-B;	\u06B9．ᡳ\u115F;	[P1 V6];	[P1 V6]	#	ڹ.ᡳ
-B;	\u06B9.ᡳ\u115F;	[P1 V6];	[P1 V6]	#	ڹ.ᡳ
-B;	xn--skb.xn--osd737a;	[V6];	[V6]	#	ڹ.ᡳ
-B;	㨛𘱎.︒�\u0D01;	[P1 V6];	[P1 V6]	#	㨛.︒7�
-B;	㨛𘱎.。7\u0D01;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	㨛..7�
-B;	xn--mbm8237g..xn--7-7hf;	[V6 A4_2];	[V6 A4_2]	#	㨛..7�
-B;	xn--mbm8237g.xn--7-7hf1526p;	[V6];	[V6]	#	㨛.︒7�
-B;	\u06DD𻱧-｡�\u2064𞤣≮;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	-.𞤣≮
-B;	\u06DD𻱧-｡�\u2064𞤣<\u0338;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	-.𞤣≮
-B;	\u06DD𻱧-。�\u2064𞤣≮;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	-.𞤣≮
-B;	\u06DD𻱧-。�\u2064𞤣<\u0338;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	-.𞤣≮
-B;	\u06DD𻱧-。�\u2064�<\u0338;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	-.𞤣≮
-B;	\u06DD𻱧-。�\u2064�≮;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	-.𞤣≮
-B;	xn----dxc06304e.xn--gdh5020pk5c;	[B1 B3 V3 V6];	[B1 B3 V3 V6]	#	-.𞤣≮
-B;	\u06DD𻱧-｡�\u2064�<\u0338;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	-.𞤣≮
-B;	\u06DD𻱧-｡�\u2064�≮;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	-.𞤣≮
-T;	ß\u200C\uAAF6ᢥ．⊶�Ⴖ;	[C1 P1 V6];	[P1 V6]	#	ß꫶ᢥ.⊶�Ⴖ
-N;	ß\u200C\uAAF6ᢥ．⊶�Ⴖ;	[C1 P1 V6];	[C1 P1 V6]	#	ß꫶ᢥ.⊶�Ⴖ
-T;	ß\u200C\uAAF6ᢥ.⊶�Ⴖ;	[C1 P1 V6];	[P1 V6]	#	ß꫶ᢥ.⊶�Ⴖ
-N;	ß\u200C\uAAF6ᢥ.⊶�Ⴖ;	[C1 P1 V6];	[C1 P1 V6]	#	ß꫶ᢥ.⊶�Ⴖ
-T;	ß\u200C\uAAF6ᢥ.⊶ⴡⴖ;	[C1];	xn--ss-4epx629f.xn--ifh802b6a	#	ß꫶ᢥ.⊶ⴡⴖ
-N;	ß\u200C\uAAF6ᢥ.⊶ⴡⴖ;	[C1];	[C1]	#	ß꫶ᢥ.⊶ⴡⴖ
-T;	SS\u200C\uAAF6ᢥ.⊶�Ⴖ;	[C1 P1 V6];	[P1 V6]	#	ss꫶ᢥ.⊶�Ⴖ
-N;	SS\u200C\uAAF6ᢥ.⊶�Ⴖ;	[C1 P1 V6];	[C1 P1 V6]	#	ss꫶ᢥ.⊶�Ⴖ
-T;	ss\u200C\uAAF6ᢥ.⊶ⴡⴖ;	[C1];	xn--ss-4epx629f.xn--ifh802b6a	#	ss꫶ᢥ.⊶ⴡⴖ
-N;	ss\u200C\uAAF6ᢥ.⊶ⴡⴖ;	[C1];	[C1]	#	ss꫶ᢥ.⊶ⴡⴖ
-T;	Ss\u200C\uAAF6ᢥ.⊶�ⴖ;	[C1 P1 V6];	[P1 V6]	#	ss꫶ᢥ.⊶�ⴖ
-N;	Ss\u200C\uAAF6ᢥ.⊶�ⴖ;	[C1 P1 V6];	[C1 P1 V6]	#	ss꫶ᢥ.⊶�ⴖ
-B;	xn--ss-4epx629f.xn--5nd703gyrh;	[V6];	[V6]	#	ss꫶ᢥ.⊶�ⴖ
-B;	xn--ss-4ep585bkm5p.xn--5nd703gyrh;	[C1 V6];	[C1 V6]	#	ss꫶ᢥ.⊶�ⴖ
-B;	xn--ss-4epx629f.xn--ifh802b6a;	ss\uAAF6ᢥ.⊶ⴡⴖ;	xn--ss-4epx629f.xn--ifh802b6a;	NV8	#	ss꫶ᢥ.⊶ⴡⴖ
-B;	ss\uAAF6ᢥ.⊶ⴡⴖ;	;	xn--ss-4epx629f.xn--ifh802b6a;	NV8	#	ss꫶ᢥ.⊶ⴡⴖ
-B;	SS\uAAF6ᢥ.⊶�Ⴖ;	[P1 V6];	[P1 V6]	#	ss꫶ᢥ.⊶�Ⴖ
-B;	Ss\uAAF6ᢥ.⊶�ⴖ;	[P1 V6];	[P1 V6]	#	ss꫶ᢥ.⊶�ⴖ
-B;	xn--ss-4epx629f.xn--undv409k;	[V6];	[V6]	#	ss꫶ᢥ.⊶�Ⴖ
-B;	xn--ss-4ep585bkm5p.xn--ifh802b6a;	[C1];	[C1]	#	ss꫶ᢥ.⊶ⴡⴖ
-B;	xn--ss-4ep585bkm5p.xn--undv409k;	[C1 V6];	[C1 V6]	#	ss꫶ᢥ.⊶�Ⴖ
-B;	xn--zca682johfi89m.xn--ifh802b6a;	[C1];	[C1]	#	ß꫶ᢥ.⊶ⴡⴖ
-B;	xn--zca682johfi89m.xn--undv409k;	[C1 V6];	[C1 V6]	#	ß꫶ᢥ.⊶�Ⴖ
-T;	ß\u200C\uAAF6ᢥ．⊶ⴡⴖ;	[C1];	xn--ss-4epx629f.xn--ifh802b6a	#	ß꫶ᢥ.⊶ⴡⴖ
-N;	ß\u200C\uAAF6ᢥ．⊶ⴡⴖ;	[C1];	[C1]	#	ß꫶ᢥ.⊶ⴡⴖ
-T;	SS\u200C\uAAF6ᢥ．⊶�Ⴖ;	[C1 P1 V6];	[P1 V6]	#	ss꫶ᢥ.⊶�Ⴖ
-N;	SS\u200C\uAAF6ᢥ．⊶�Ⴖ;	[C1 P1 V6];	[C1 P1 V6]	#	ss꫶ᢥ.⊶�Ⴖ
-T;	ss\u200C\uAAF6ᢥ．⊶ⴡⴖ;	[C1];	xn--ss-4epx629f.xn--ifh802b6a	#	ss꫶ᢥ.⊶ⴡⴖ
-N;	ss\u200C\uAAF6ᢥ．⊶ⴡⴖ;	[C1];	[C1]	#	ss꫶ᢥ.⊶ⴡⴖ
-T;	Ss\u200C\uAAF6ᢥ．⊶�ⴖ;	[C1 P1 V6];	[P1 V6]	#	ss꫶ᢥ.⊶�ⴖ
-N;	Ss\u200C\uAAF6ᢥ．⊶�ⴖ;	[C1 P1 V6];	[C1 P1 V6]	#	ss꫶ᢥ.⊶�ⴖ
-T;	\u200D。ς�;	[C2 P1 V6];	[P1 V6 A4_2]	#	.ς
-N;	\u200D。ς�;	[C2 P1 V6];	[C2 P1 V6]	#	.ς
-T;	\u200D。Σ�;	[C2 P1 V6];	[P1 V6 A4_2]	#	.σ
-N;	\u200D。Σ�;	[C2 P1 V6];	[C2 P1 V6]	#	.σ
-T;	\u200D。σ�;	[C2 P1 V6];	[P1 V6 A4_2]	#	.σ
-N;	\u200D。σ�;	[C2 P1 V6];	[C2 P1 V6]	#	.σ
-B;	.xn--4xa24344p;	[V6 A4_2];	[V6 A4_2]
-B;	xn--1ug.xn--4xa24344p;	[C2 V6];	[C2 V6]	#	.σ
-B;	xn--1ug.xn--3xa44344p;	[C2 V6];	[C2 V6]	#	.Ï‚
-T;	𞵑ß.\u0751\u200D𞤛-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	ß.ݑ𞤽-
-N;	𞵑ß.\u0751\u200D𞤛-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 C2 P1 V3 V6]	#	ß.ݑ𞤽-
-T;	𞵑ß.\u0751\u200D𞤽-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	ß.ݑ𞤽-
-N;	𞵑ß.\u0751\u200D𞤽-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 C2 P1 V3 V6]	#	ß.ݑ𞤽-
-T;	𞵑SS.\u0751\u200D𞤛-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	ss.ݑ𞤽-
-N;	𞵑SS.\u0751\u200D𞤛-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 C2 P1 V3 V6]	#	ss.ݑ𞤽-
-T;	𞵑ss.\u0751\u200D𞤽-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	ss.ݑ𞤽-
-N;	𞵑ss.\u0751\u200D𞤽-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 C2 P1 V3 V6]	#	ss.ݑ𞤽-
-T;	𞵑Ss.\u0751\u200D𞤽-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	ss.ݑ𞤽-
-N;	𞵑Ss.\u0751\u200D𞤽-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 C2 P1 V3 V6]	#	ss.ݑ𞤽-
-B;	xn--ss-2722a.xn----z3c03218a;	[B2 B3 V3 V6];	[B2 B3 V3 V6]	#	ss.ݑ𞤽-
-B;	xn--ss-2722a.xn----z3c011q9513b;	[B2 B3 C2 V3 V6];	[B2 B3 C2 V3 V6]	#	ss.ݑ𞤽-
-B;	xn--zca5423w.xn----z3c011q9513b;	[B2 B3 C2 V3 V6];	[B2 B3 C2 V3 V6]	#	ß.ݑ𞤽-
-T;	𞵑ss.\u0751\u200D𞤛-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	ss.ݑ𞤽-
-N;	𞵑ss.\u0751\u200D𞤛-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 C2 P1 V3 V6]	#	ss.ݑ𞤽-
-T;	𞵑Ss.\u0751\u200D𞤛-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	ss.ݑ𞤽-
-N;	𞵑Ss.\u0751\u200D𞤛-;	[B2 B3 C2 P1 V3 V6];	[B2 B3 C2 P1 V3 V6]	#	ss.ݑ𞤽-
-T;	𑘽\u200D𞤧．�󡦪-;	[B1 C2 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	𑘽𞤧.�-
-N;	𑘽\u200D𞤧．�󡦪-;	[B1 C2 P1 V3 V5 V6];	[B1 C2 P1 V3 V5 V6]	#	𑘽𞤧.�-
-T;	𑘽\u200D𞤧.�󡦪-;	[B1 C2 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	𑘽𞤧.�-
-N;	𑘽\u200D𞤧.�󡦪-;	[B1 C2 P1 V3 V5 V6];	[B1 C2 P1 V3 V5 V6]	#	𑘽𞤧.�-
-T;	𑘽\u200D𞤅.�󡦪-;	[B1 C2 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	𑘽𞤧.�-
-N;	𑘽\u200D𞤅.�󡦪-;	[B1 C2 P1 V3 V5 V6];	[B1 C2 P1 V3 V5 V6]	#	𑘽𞤧.�-
-B;	xn--qb2ds317a.xn----k26iq1483f;	[B1 V3 V5 V6];	[B1 V3 V5 V6]
-B;	xn--1ugz808gdimf.xn----k26iq1483f;	[B1 C2 V3 V5 V6];	[B1 C2 V3 V5 V6]	#	𑘽𞤧.�-
-T;	𑘽\u200D𞤅．�󡦪-;	[B1 C2 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	𑘽𞤧.�-
-N;	𑘽\u200D𞤅．�󡦪-;	[B1 C2 P1 V3 V5 V6];	[B1 C2 P1 V3 V5 V6]	#	𑘽𞤧.�-
-B;	⒒򨘙򳳠𑓀.-󞡊;	[P1 V3 V6];	[P1 V3 V6]
-B;	11.򨘙򳳠𑓀.-󞡊;	[P1 V3 V6];	[P1 V3 V6]
-B;	11.xn--uz1d59632bxujd.xn----x310m;	[V3 V6];	[V3 V6]
-B;	xn--3shy698frsu9dt1me.xn----x310m;	[V3 V6];	[V3 V6]
-T;	-｡\u200D;	[C2 V3];	[V3]	#	-.
-N;	-｡\u200D;	[C2 V3];	[C2 V3]	#	-.
-T;	-。\u200D;	[C2 V3];	[V3]	#	-.
-N;	-。\u200D;	[C2 V3];	[C2 V3]	#	-.
-B;	-.;	[V3];	[V3]
-B;	-.xn--1ug;	[C2 V3];	[C2 V3]	#	-.
-T;	≮ᡬ．ς¹-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-N;	≮ᡬ．ς¹-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-T;	<\u0338ᡬ．ς¹-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-N;	<\u0338ᡬ．ς¹-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-T;	≮ᡬ.ς1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-N;	≮ᡬ.ς1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-T;	<\u0338ᡬ.ς1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-N;	<\u0338ᡬ.ς1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-B;	<\u0338ᡬ.Σ1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	≮ᡬ.Σ1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	≮ᡬ.σ1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	<\u0338ᡬ.σ1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	xn--88e732c.σ1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	XN--88E732C.Σ1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-T;	xn--88e732c.ς1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-N;	xn--88e732c.ς1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-T;	Xn--88E732c.ς1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-N;	Xn--88E732c.ς1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.ς1-
-B;	Xn--88E732c.σ1-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	<\u0338ᡬ．Σ¹-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	≮ᡬ．Σ¹-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	≮ᡬ．σ¹-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	<\u0338ᡬ．σ¹-\uDB09;	[P1 V6];	[P1 V6 A3]	#	≮ᡬ.σ1-
-B;	ቬ򔠼�｡��;	[P1 V6];	[P1 V6]
-B;	ቬ򔠼�。�8;	[P1 V6];	[P1 V6]
-B;	xn--d0d41273c887z.xn--8-ob5i;	[V6];	[V6]
-B;	�。蔫\u0766;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	.蔫ݦ
-B;	xn--389c.xn--qpb7055d;	[B5 B6 V6];	[B5 B6 V6]	#	.蔫ݦ
-B;	򒲧₃｡ꡚ𛇑󠄳\u0647;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	3.ꡚ𛇑ه
-B;	򒲧3。ꡚ𛇑󠄳\u0647;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	3.ꡚ𛇑ه
-B;	xn--3-ep59g.xn--jhb5904fcp0h;	[B5 B6 V6];	[B5 B6 V6]	#	3.ꡚ𛇑ه
-T;	蓸\u0642≠.ß;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ß
-N;	蓸\u0642≠.ß;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ß
-T;	蓸\u0642=\u0338.ß;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ß
-N;	蓸\u0642=\u0338.ß;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ß
-B;	蓸\u0642=\u0338.SS;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ss
-B;	蓸\u0642≠.SS;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ss
-B;	蓸\u0642≠.ss;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ss
-B;	蓸\u0642=\u0338.ss;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ss
-B;	蓸\u0642=\u0338.Ss;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ss
-B;	蓸\u0642≠.Ss;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	蓸ق≠.ss
-B;	xn--ehb015lnt1e.ss;	[B5 B6 V6];	[B5 B6 V6]	#	蓸ق≠.ss
-B;	xn--ehb015lnt1e.xn--zca;	[B5 B6 V6];	[B5 B6 V6]	#	蓸ق≠.ß
-T;	\u084E\u067A\u0DD3⒊.�𞱩󠃪\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	ࡎٺී⒊.�
-N;	\u084E\u067A\u0DD3⒊.�𞱩󠃪\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ࡎٺී⒊.�
-T;	\u084E\u067A\u0DD33..�𞱩󠃪\u200C;	[B1 C1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	ࡎٺී3..�
-N;	\u084E\u067A\u0DD33..�𞱩󠃪\u200C;	[B1 C1 P1 V6 A4_2];	[B1 C1 P1 V6 A4_2]	#	ࡎٺී3..�
-B;	xn--3-prc71ls9j..xn--xo0dw109an237f;	[B1 V6 A4_2];	[B1 V6 A4_2]	#	ࡎٺී3..�
-B;	xn--3-prc71ls9j..xn--0ug3205g7eyf3c96h;	[B1 C1 V6 A4_2];	[B1 C1 V6 A4_2]	#	ࡎٺී3..�
-B;	xn--zib94gfziuq1a.xn--xo0dw109an237f;	[B1 V6];	[B1 V6]	#	ࡎٺී⒊.�
-B;	xn--zib94gfziuq1a.xn--0ug3205g7eyf3c96h;	[B1 C1 V6];	[B1 C1 V6]	#	ࡎٺී⒊.�
-T;	ς\u200D-.Ⴣ𦟙;	[C2 P1 V3 V6];	[P1 V3 V6]	#	ς-.Ⴣ𦟙
-N;	ς\u200D-.Ⴣ𦟙;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	ς-.Ⴣ𦟙
-T;	ς\u200D-.ⴣ𦟙;	[C2 V3];	[V3]	#	ς-.ⴣ𦟙
-N;	ς\u200D-.ⴣ𦟙;	[C2 V3];	[C2 V3]	#	ς-.ⴣ𦟙
-T;	Σ\u200D-.Ⴣ𦟙;	[C2 P1 V3 V6];	[P1 V3 V6]	#	σ-.Ⴣ𦟙
-N;	Σ\u200D-.Ⴣ𦟙;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	σ-.Ⴣ𦟙
-T;	σ\u200D-.ⴣ𦟙;	[C2 V3];	[V3]	#	σ-.ⴣ𦟙
-N;	σ\u200D-.ⴣ𦟙;	[C2 V3];	[C2 V3]	#	σ-.ⴣ𦟙
-B;	xn----zmb.xn--rlj2573p;	[V3];	[V3]
-B;	xn----zmb048s.xn--rlj2573p;	[C2 V3];	[C2 V3]	#	σ-.ⴣ𦟙
-B;	xn----zmb.xn--7nd64871a;	[V3 V6];	[V3 V6]
-B;	xn----zmb048s.xn--7nd64871a;	[C2 V3 V6];	[C2 V3 V6]	#	σ-.Ⴣ𦟙
-B;	xn----xmb348s.xn--rlj2573p;	[C2 V3];	[C2 V3]	#	ς-.ⴣ𦟙
-B;	xn----xmb348s.xn--7nd64871a;	[C2 V3 V6];	[C2 V3 V6]	#	ς-.Ⴣ𦟙
-B;	≠。🞳�;	[P1 V6];	[P1 V6]
-B;	=\u0338。🞳�;	[P1 V6];	[P1 V6]
-B;	≠。🞳6;	[P1 V6];	[P1 V6]
-B;	=\u0338。🞳6;	[P1 V6];	[P1 V6]
-B;	xn--1ch.xn--6-dl4s;	[V6];	[V6]
-B;	󅬽.蠔;	[P1 V6];	[P1 V6]
-B;	xn--g747d.xn--xl2a;	[V6];	[V6]
-T;	\u08E6\u200D．뼽;	[C2 V5];	[V5]	#	ࣦ.뼽
-N;	\u08E6\u200D．뼽;	[C2 V5];	[C2 V5]	#	ࣦ.뼽
-T;	\u08E6\u200D．뼽;	[C2 V5];	[V5]	#	ࣦ.뼽
-N;	\u08E6\u200D．뼽;	[C2 V5];	[C2 V5]	#	ࣦ.뼽
-T;	\u08E6\u200D.뼽;	[C2 V5];	[V5]	#	ࣦ.뼽
-N;	\u08E6\u200D.뼽;	[C2 V5];	[C2 V5]	#	ࣦ.뼽
-T;	\u08E6\u200D.뼽;	[C2 V5];	[V5]	#	ࣦ.뼽
-N;	\u08E6\u200D.뼽;	[C2 V5];	[C2 V5]	#	ࣦ.뼽
-B;	xn--p0b.xn--e43b;	[V5];	[V5]	#	ࣦ.뼽
-B;	xn--p0b869i.xn--e43b;	[C2 V5];	[C2 V5]	#	ࣦ.뼽
-B;	₇\u0BCD􃂷\u06D2。👖\u0675-𞪑;	[B1 P1 V6];	[B1 P1 V6]	#	7�ے.👖اٴ-
-B;	7\u0BCD􃂷\u06D2。👖\u0627\u0674-𞪑;	[B1 P1 V6];	[B1 P1 V6]	#	7�ے.👖اٴ-
-B;	xn--7-rwc839aj3073c.xn----ymc5uv818oghka;	[B1 V6];	[B1 V6]	#	7�ے.👖اٴ-
-B;	-｡\u077B;	[B1 V3];	[B1 V3]	#	-.ݻ
-B;	-。\u077B;	[B1 V3];	[B1 V3]	#	-.ݻ
-B;	-.xn--cqb;	[B1 V3];	[B1 V3]	#	-.Ý»
-B;	𑇌𵛓｡-⒈�\u072B;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	𑇌.-⒈�ܫ
-B;	𑇌𵛓。-1.�\u072B;	[B1 B5 B6 P1 V3 V5 V6];	[B1 B5 B6 P1 V3 V5 V6]	#	𑇌.-1.�ܫ
-B;	xn--8d1dg030h.-1.xn--1nb7163f;	[B1 B5 B6 V3 V5 V6];	[B1 B5 B6 V3 V5 V6]	#	𑇌.-1.�ܫ
-B;	xn--8d1dg030h.xn----u1c466tp10j;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	𑇌.-⒈�ܫ
-B;	璛\u1734\u06AF.-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	璛᜴گ.-
-B;	xn--ikb175frt4e.-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	璛᜴گ.-
-B;	󠆰\u08A1\u0A4D샕．��;	[B1 B2 B3];	[B1 B2 B3]	#	ࢡ�샕.��
-B;	󠆰\u08A1\u0A4D샕．�휁;	[B1 B2 B3];	[B1 B2 B3]	#	ࢡ�샕.��
-B;	󠆰\u08A1\u0A4D샕.��;	[B1 B2 B3];	[B1 B2 B3]	#	ࢡ�샕.��
-B;	󠆰\u08A1\u0A4D샕.�휁;	[B1 B2 B3];	[B1 B2 B3]	#	ࢡ�샕.��
-B;	xn--qyb07fj857a.xn--728bv72h;	[B1 B2 B3];	[B1 B2 B3]	#	ࢡ�샕.��
-B;	�．񋸕;	[P1 V6];	[P1 V6]
-B;	�.񋸕;	[P1 V6];	[P1 V6]
-B;	xn--pr3x.xn--rv7w;	[V6];	[V6]
-B;	\u067D𞥕｡𑑂𞤶Ⴍ-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ٽ𞥕.𑑂𞤶Ⴍ-
-B;	\u067D𞥕。𑑂𞤶Ⴍ-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ٽ𞥕.𑑂𞤶Ⴍ-
-B;	\u067D𞥕。𑑂𞤶�-;	[B1 V3 V5];	[B1 V3 V5]	#	ٽ𞥕.𑑂𞤶�-
-B;	\u067D𞥕。𑑂𞤔Ⴍ-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ٽ𞥕.𑑂𞤶Ⴍ-
-B;	\u067D𞥕。𑑂𞤔�-;	[B1 V3 V5];	[B1 V3 V5]	#	ٽ𞥕.𑑂𞤶�-
-B;	xn--2ib0338v.xn----zvs0199fo91g;	[B1 V3 V5];	[B1 V3 V5]	#	ٽ𞥕.𑑂𞤶�-
-B;	xn--2ib0338v.xn----w0g2740ro9vg;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	ٽ𞥕.𑑂𞤶Ⴍ-
-B;	\u067D𞥕｡𑑂𞤶�-;	[B1 V3 V5];	[B1 V3 V5]	#	ٽ𞥕.𑑂𞤶�-
-B;	\u067D𞥕｡𑑂𞤔Ⴍ-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ٽ𞥕.𑑂𞤶Ⴍ-
-B;	\u067D𞥕｡𑑂𞤔�-;	[B1 V3 V5];	[B1 V3 V5]	#	ٽ𞥕.𑑂𞤶�-
-B;	���。񢚧₄Ⴋ񂹫;	[P1 V6];	[P1 V6]
-B;	���。񢚧4Ⴋ񂹫;	[P1 V6];	[P1 V6]
-B;	���。񢚧4ⴋ񂹫;	[P1 V6];	[P1 V6]
-B;	xn--039c42bq865a.xn--4-wvs27840bnrzm;	[V6];	[V6]
-B;	xn--039c42bq865a.xn--4-t0g49302fnrzm;	[V6];	[V6]
-B;	���。񢚧₄ⴋ񂹫;	[P1 V6];	[P1 V6]
-B;	4\u06BD︒󠑥.≠;	[B1 P1 V6];	[B1 P1 V6]	#	4ڽ︒.≠
-B;	4\u06BD︒󠑥.=\u0338;	[B1 P1 V6];	[B1 P1 V6]	#	4ڽ︒.≠
-B;	4\u06BD。󠑥.≠;	[B1 P1 V6];	[B1 P1 V6]	#	4ڽ..≠
-B;	4\u06BD。󠑥.=\u0338;	[B1 P1 V6];	[B1 P1 V6]	#	4ڽ..≠
-B;	xn--4-kvc.xn--5136e.xn--1ch;	[B1 V6];	[B1 V6]	#	4ڽ..≠
-B;	xn--4-kvc5601q2h50i.xn--1ch;	[B1 V6];	[B1 V6]	#	4ڽ︒.≠
-B;	�。\u06D7;	[V5];	[V5]	#	5.ۗ
-B;	5。\u06D7;	[V5];	[V5]	#	5.ۗ
-B;	5.xn--nlb;	[V5];	[V5]	#	5.Û—
-T;	\u200C򺸩.⾕;	[C1 P1 V6];	[P1 V6]	#	.谷
-N;	\u200C򺸩.⾕;	[C1 P1 V6];	[C1 P1 V6]	#	.谷
-T;	\u200C򺸩.谷;	[C1 P1 V6];	[P1 V6]	#	.谷
-N;	\u200C򺸩.谷;	[C1 P1 V6];	[C1 P1 V6]	#	.谷
-B;	xn--i183d.xn--6g3a;	[V6];	[V6]
-B;	xn--0ug26167i.xn--6g3a;	[C1 V6];	[C1 V6]	#	.è°·
-T;	︒󎰇\u200D.-\u073C\u200C;	[C1 C2 P1 V3 V6];	[P1 V3 V6]	#	︒.-ܼ
-N;	︒󎰇\u200D.-\u073C\u200C;	[C1 C2 P1 V3 V6];	[C1 C2 P1 V3 V6]	#	︒.-ܼ
-T;	。󎰇\u200D.-\u073C\u200C;	[C1 C2 P1 V3 V6 A4_2];	[P1 V3 V6 A4_2]	#	..-ܼ
-N;	。󎰇\u200D.-\u073C\u200C;	[C1 C2 P1 V3 V6 A4_2];	[C1 C2 P1 V3 V6 A4_2]	#	..-ܼ
-B;	.xn--hh50e.xn----t2c;	[V3 V6 A4_2];	[V3 V6 A4_2]	#	..-ܼ
-B;	.xn--1ug05310k.xn----t2c071q;	[C1 C2 V3 V6 A4_2];	[C1 C2 V3 V6 A4_2]	#	..-ܼ
-B;	xn--y86c71305c.xn----t2c;	[V3 V6];	[V3 V6]	#	︒.-ܼ
-B;	xn--1ug1658ftw26f.xn----t2c071q;	[C1 C2 V3 V6];	[C1 C2 V3 V6]	#	︒.-ܼ
-B;	≯𞤟。ᡨ;	[B1 P1 V6];	[B1 P1 V6]
-B;	>\u0338𞤟。ᡨ;	[B1 P1 V6];	[B1 P1 V6]
-B;	>\u0338�。ᡨ;	[B1 P1 V6];	[B1 P1 V6]
-B;	≯�。ᡨ;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--hdhz520p.xn--48e;	[B1 V6];	[B1 V6]
-B;	\u0F74𫫰�。\u0713�;	[B1 V5];	[B1 V5]	#	ུ𫫰�.ܓ�
-B;	xn--ned8985uo92e.xn--dnb6395k;	[B1 V5];	[B1 V5]	#	ུ𫫰�.ܓ�
-B;	\u033C\u07DB��｡�;	[B1 V5];	[B1 V5]	#	̼ߛ73.0
-B;	\u033C\u07DB73。0;	[B1 V5];	[B1 V5]	#	̼ߛ73.0
-B;	xn--73-9yb648b.0;	[B1 V5];	[B1 V5]	#	̼ߛ73.0
-T;	\u200D．�;	[C2];	[A4_2]	#	.9
-N;	\u200D．�;	[C2];	[C2]	#	.9
-T;	\u200D.9;	[C2];	[A4_2]	#	.9
-N;	\u200D.9;	[C2];	[C2]	#	.9
-B;	.9;	[A4_2];	[A4_2]
-B;	xn--1ug.9;	[C2];	[C2]	#	.9
-B;	9;	;	
-B;	\u0779ᡭ𪕈。\u06B6\u08D9;	[B2 B3];	[B2 B3]	#	ݹᡭ𪕈.ڶࣙ
-B;	xn--9pb497fs270c.xn--pkb80i;	[B2 B3];	[B2 B3]	#	ݹᡭ𪕈.ڶࣙ
-B;	\u0726５\u07E2겙。\u1CF4�;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	ܦ5ߢ겙.᳴
-B;	\u0726５\u07E2겙。\u1CF4�;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	ܦ5ߢ겙.᳴
-B;	\u07265\u07E2겙。\u1CF4�;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	ܦ5ߢ겙.᳴
-B;	\u07265\u07E2겙。\u1CF4�;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	ܦ5ߢ겙.᳴
-B;	xn--5-j1c97c2483c.xn--e7f2093h;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	ܦ5ߢ겙.᳴
-T;	Ⴍ�ꡨ\u05AE。Ⴞ\u200C\u200C;	[C1 P1 V6];	[P1 V6]	#	Ⴍꡨ֮.Ⴞ
-N;	Ⴍ�ꡨ\u05AE。Ⴞ\u200C\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴍꡨ֮.Ⴞ
-T;	��ꡨ\u05AE。ⴞ\u200C\u200C;	[C1 P1 V6];	[P1 V6]	#	�ꡨ֮.ⴞ
-N;	��ꡨ\u05AE。ⴞ\u200C\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	�ꡨ֮.ⴞ
-B;	xn--5cb172r175fug38a.xn--mlj;	[V6];	[V6]	#	�ꡨ֮.ⴞ
-B;	xn--5cb172r175fug38a.xn--0uga051h;	[C1 V6];	[C1 V6]	#	�ꡨ֮.ⴞ
-B;	xn--5cb347co96jug15a.xn--2nd;	[V6];	[V6]	#	Ⴍꡨ֮.Ⴞ
-B;	xn--5cb347co96jug15a.xn--2nd059ea;	[C1 V6];	[C1 V6]	#	Ⴍꡨ֮.Ⴞ
-B;	�。󑓱;	[P1 V6];	[P1 V6]
-B;	xn--k97c.xn--q031e;	[V6];	[V6]
-B;	󡎦\u17B4\u0B4D.�;	[B1 P1 V6];	[B1 P1 V6]	#	�.�
-B;	xn--9ic364dho91z.xn--2o0d;	[B1 V6];	[B1 V6]	#	�.�
-B;	\u08DFႫ𶿸귤．򠅼�휪\u0AE3;	[P1 V5 V6];	[P1 V5 V6]	#	ࣟႫ귤.0휪ૣ
-B;	\u08DFႫ𶿸귤．򠅼�휪\u0AE3;	[P1 V5 V6];	[P1 V5 V6]	#	ࣟႫ귤.0휪ૣ
-B;	\u08DFႫ𶿸귤.򠅼0휪\u0AE3;	[P1 V5 V6];	[P1 V5 V6]	#	ࣟႫ귤.0휪ૣ
-B;	\u08DFႫ𶿸귤.򠅼0휪\u0AE3;	[P1 V5 V6];	[P1 V5 V6]	#	ࣟႫ귤.0휪ૣ
-B;	\u08DFⴋ𶿸귤.򠅼0휪\u0AE3;	[P1 V5 V6];	[P1 V5 V6]	#	ࣟⴋ귤.0휪ૣ
-B;	\u08DFⴋ𶿸귤.򠅼0휪\u0AE3;	[P1 V5 V6];	[P1 V5 V6]	#	ࣟⴋ귤.0휪ૣ
-B;	xn--i0b436pkl2g2h42a.xn--0-8le8997mulr5f;	[V5 V6];	[V5 V6]	#	ࣟⴋ귤.0휪ૣ
-B;	xn--i0b601b6r7l2hs0a.xn--0-8le8997mulr5f;	[V5 V6];	[V5 V6]	#	ࣟႫ귤.0휪ૣ
-B;	\u08DFⴋ𶿸귤．򠅼�휪\u0AE3;	[P1 V5 V6];	[P1 V5 V6]	#	ࣟⴋ귤.0휪ૣ
-B;	\u08DFⴋ𶿸귤．򠅼�휪\u0AE3;	[P1 V5 V6];	[P1 V5 V6]	#	ࣟⴋ귤.0휪ૣ
-B;	\u0784．�\u0601;	[P1 V6];	[P1 V6]	#	ބ.�
-B;	\u0784.�\u0601;	[P1 V6];	[P1 V6]	#	ބ.�
-B;	xn--lqb.xn--jfb1808v;	[V6];	[V6]	#	ބ.�
-T;	\u0ACD₃.8\uA8C4\u200D🃤;	[V5];	[V5]	#	�3.8꣄🃤
-N;	\u0ACD₃.8\uA8C4\u200D🃤;	[V5];	[V5]	#	�3.8꣄🃤
-T;	\u0ACD3.8\uA8C4\u200D🃤;	[V5];	[V5]	#	�3.8꣄🃤
-N;	\u0ACD3.8\uA8C4\u200D🃤;	[V5];	[V5]	#	�3.8꣄🃤
-B;	xn--3-yke.xn--8-sl4et308f;	[V5];	[V5]	#	�3.8꣄🃤
-B;	xn--3-yke.xn--8-ugnv982dbkwm;	[V5];	[V5]	#	�3.8꣄🃤
-B;	℻⩷�。𞤠�\u180C;	[B6];	[B6]
-B;	FAX⩷�。𞤠�\u180C;	[B6];	[B6]
-B;	fax⩷�。𞥂�\u180C;	[B6];	[B6]
-B;	Fax⩷�。𞤠�\u180C;	[B6];	[B6]
-B;	xn--fax-4c9a1676t.xn--6e6h;	[B6];	[B6]
-B;	℻⩷�。𞥂�\u180C;	[B6];	[B6]
-B;	FAX⩷�。𞥂�\u180C;	[B6];	[B6]
-B;	fax⩷�。𞤠�\u180C;	[B6];	[B6]
-B;	fax⩷�.𞥂;	[B6];	[B6]
-B;	FAX⩷�.𞤠;	[B6];	[B6]
-B;	Fax⩷�.𞤠;	[B6];	[B6]
-B;	FAX⩷�.𞥂;	[B6];	[B6]
-B;	Fax⩷�.𞥂;	[B6];	[B6]
-B;	ꡕ≠\u105E󮿱｡�󠄫\uFFA0;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ꡕ≠�.
-B;	ꡕ=\u0338\u105E󮿱｡�󠄫\uFFA0;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ꡕ≠�.
-B;	ꡕ≠\u105E󮿱。�󠄫\u1160;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ꡕ≠�.
-B;	ꡕ=\u0338\u105E󮿱。�󠄫\u1160;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ꡕ≠�.
-B;	xn--cld333gn31h0158l.xn--psd1510k;	[B2 B3 V6];	[B2 B3 V6]	#	ꡕ≠�.
-B;	xn--cld333gn31h0158l.xn--cl7c96v;	[B2 B3 V6];	[B2 B3 V6]	#	ꡕ≠�.
-T;	鱊。\u200C;	[C1];	xn--rt6a.	#	鱊.
-N;	鱊。\u200C;	[C1];	[C1]	#	鱊.
-B;	xn--rt6a.;	鱊.;	xn--rt6a.
-B;	鱊.;	;	xn--rt6a.
-B;	xn--rt6a.xn--0ug;	[C1];	[C1]	#	鱊.
-B;	8�．�;	[B1 B3 B6 V5];	[B1 B3 B6 V5]
-B;	8�.�;	[B1 B3 B6 V5];	[B1 B3 B6 V5]
-B;	xn--8-d26i.xn--0p1d;	[B1 B3 B6 V5];	[B1 B3 B6 V5]
-B;	��．�;	[B1];	[B1]
-B;	��.�;	[B1];	[B1]
-B;	xn--qoh9161g.xn--1x9c;	[B1];	[B1]
-T;	𞤺\u07CC4．\u200D;	[B1 C2];	xn--4-0bd15808a.	#	𞤺ߌ4.
-N;	𞤺\u07CC4．\u200D;	[B1 C2];	[B1 C2]	#	𞤺ߌ4.
-T;	𞤺\u07CC4.\u200D;	[B1 C2];	xn--4-0bd15808a.	#	𞤺ߌ4.
-N;	𞤺\u07CC4.\u200D;	[B1 C2];	[B1 C2]	#	𞤺ߌ4.
-T;	𞤘\u07CC4.\u200D;	[B1 C2];	xn--4-0bd15808a.	#	𞤺ߌ4.
-N;	𞤘\u07CC4.\u200D;	[B1 C2];	[B1 C2]	#	𞤺ߌ4.
-B;	xn--4-0bd15808a.;	𞤺\u07CC4.;	xn--4-0bd15808a.	#	𞤺ߌ4.
-B;	𞤺\u07CC4.;	;	xn--4-0bd15808a.	#	𞤺ߌ4.
-B;	𞤘\u07CC4.;	𞤺\u07CC4.;	xn--4-0bd15808a.	#	𞤺ߌ4.
-B;	xn--4-0bd15808a.xn--1ug;	[B1 C2];	[B1 C2]	#	𞤺ߌ4.
-T;	𞤘\u07CC4．\u200D;	[B1 C2];	xn--4-0bd15808a.	#	𞤺ߌ4.
-N;	𞤘\u07CC4．\u200D;	[B1 C2];	[B1 C2]	#	𞤺ߌ4.
-B;	⒗\u0981\u20EF-.\u08E2•;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	⒗�⃯-.•
-B;	16.\u0981\u20EF-.\u08E2•;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	16.�⃯-.•
-B;	16.xn----z0d801p.xn--l0b810j;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	16.�⃯-.•
-B;	xn----z0d801p6kd.xn--l0b810j;	[B1 V3 V6];	[B1 V3 V6]	#	⒗�⃯-.•
-B;	-｡�;	[V3];	[V3]
-B;	-。�;	[V3];	[V3]
-B;	-.xn--xco;	[V3];	[V3]
-T;	\u200C񒃠．\u200D;	[C1 C2 P1 V6];	[P1 V6]	#	.
-N;	\u200C񒃠．\u200D;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	.
-T;	\u200Cñ’ƒ .\u200D;	[C1 C2 P1 V6];	[P1 V6]	#	.
-N;	\u200Cñ’ƒ .\u200D;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	.
-B;	xn--dj8y.;	[V6];	[V6]
-B;	xn--0ugz7551c.xn--1ug;	[C1 C2 V6];	[C1 C2 V6]	#	.
-T;	⒈⓰󥣇｡�\u200D򗷦Ⴕ;	[B1 C2 P1 V6];	[B1 P1 V6]	#	⒈⓰.�Ⴕ
-N;	⒈⓰󥣇｡�\u200D򗷦Ⴕ;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	⒈⓰.�Ⴕ
-T;	1.⓰󥣇。�\u200D򗷦Ⴕ;	[B1 C2 P1 V6];	[B1 P1 V6]	#	1.⓰.�Ⴕ
-N;	1.⓰󥣇。�\u200D򗷦Ⴕ;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	1.⓰.�Ⴕ
-T;	1.⓰󥣇。�\u200D򗷦ⴕ;	[B1 C2 P1 V6];	[B1 P1 V6]	#	1.⓰.�ⴕ
-N;	1.⓰󥣇。�\u200D򗷦ⴕ;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	1.⓰.�ⴕ
-B;	1.xn--svh00804k.xn--dljv223ee5t2d;	[B1 V6];	[B1 V6]
-B;	1.xn--svh00804k.xn--1ug352csp0psg45e;	[B1 C2 V6];	[B1 C2 V6]	#	1.⓰.�ⴕ
-B;	1.xn--svh00804k.xn--tnd1990ke579c;	[B1 V6];	[B1 V6]
-B;	1.xn--svh00804k.xn--tnd969erj4psgl3e;	[B1 C2 V6];	[B1 C2 V6]	#	1.⓰.�Ⴕ
-T;	⒈⓰󥣇｡�\u200D򗷦ⴕ;	[B1 C2 P1 V6];	[B1 P1 V6]	#	⒈⓰.�ⴕ
-N;	⒈⓰󥣇｡�\u200D򗷦ⴕ;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	⒈⓰.�ⴕ
-B;	xn--tsh0nz9380h.xn--dljv223ee5t2d;	[B1 V6];	[B1 V6]
-B;	xn--tsh0nz9380h.xn--1ug352csp0psg45e;	[B1 C2 V6];	[B1 C2 V6]	#	⒈⓰.�ⴕ
-B;	xn--tsh0nz9380h.xn--tnd1990ke579c;	[B1 V6];	[B1 V6]
-B;	xn--tsh0nz9380h.xn--tnd969erj4psgl3e;	[B1 C2 V6];	[B1 C2 V6]	#	⒈⓰.�Ⴕ
-T;	𞠊ᠮ-ß｡\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ß.�効
-N;	𞠊ᠮ-ß｡\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ß.�効
-T;	𞠊ᠮ-ß。\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ß.�効
-N;	𞠊ᠮ-ß。\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ß.�効
-B;	𞠊ᠮ-SS。\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ss.�効
-B;	𞠊ᠮ-ss。\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ss.�効
-B;	𞠊ᠮ-Ss。\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ss.�効
-B;	xn---ss-21t18904a.xn--jfb197i791bi6x4c;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	𞠊ᠮ-ss.�効
-B;	xn----qfa310pg973b.xn--jfb197i791bi6x4c;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	𞠊ᠮ-ß.�効
-B;	𞠊ᠮ-SS｡\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ss.�効
-B;	𞠊ᠮ-ss｡\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ss.�効
-B;	𞠊ᠮ-Ss｡\u1CD0効\u0601𷣭;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	𞠊ᠮ-ss.�効
-B;	𑇀.󠨱;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--wd1d.xn--k946e;	[V5 V6];	[V5 V6]
-B;	�3\uFB88｡���;	[B1 P1 V6];	[B1 P1 V6]	#	�3ڈ.0�
-B;	�3\u0688。0��;	[B1 P1 V6];	[B1 P1 V6]	#	�3ڈ.0�
-B;	xn--3-jsc897t.xn--0-sc5iy3h;	[B1 V6];	[B1 V6]	#	�3ڈ.0�
-B;	\u076B６\u0A81\u08A6。\u1DE3;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ݫ6�ࢦ.ᷣ
-B;	\u076B6\u0A81\u08A6。\u1DE3;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ݫ6�ࢦ.ᷣ
-B;	xn--6-h5c06gj6c.xn--7eg;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ݫ6�ࢦ.ᷣ
-T;	\u0605-𽤞Ⴂ。򅤶\u200D;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	-Ⴂ.
-N;	\u0605-𽤞Ⴂ。򅤶\u200D;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	-Ⴂ.
-T;	\u0605-𽤞ⴂ。򅤶\u200D;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	-ⴂ.
-N;	\u0605-𽤞ⴂ。򅤶\u200D;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	-ⴂ.
-B;	xn----0kc8501a5399e.xn--ss06b;	[B1 V6];	[B1 V6]	#	-â´‚.
-B;	xn----0kc8501a5399e.xn--1ugy3204f;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	-â´‚.
-B;	xn----0kc662fc152h.xn--ss06b;	[B1 V6];	[B1 V6]	#	-á‚¢.
-B;	xn----0kc662fc152h.xn--1ugy3204f;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	-á‚¢.
-T;	⾆．ꡈ５≯ß;	[P1 V6];	[P1 V6]
-N;	⾆．ꡈ５≯ß;	[P1 V6];	[P1 V6]
-T;	⾆．ꡈ５>\u0338ß;	[P1 V6];	[P1 V6]
-N;	⾆．ꡈ５>\u0338ß;	[P1 V6];	[P1 V6]
-T;	舌.ꡈ5≯ß;	[P1 V6];	[P1 V6]
-N;	舌.ꡈ5≯ß;	[P1 V6];	[P1 V6]
-T;	舌.ꡈ5>\u0338ß;	[P1 V6];	[P1 V6]
-N;	舌.ꡈ5>\u0338ß;	[P1 V6];	[P1 V6]
-B;	舌.ꡈ5>\u0338SS;	[P1 V6];	[P1 V6]
-B;	舌.ꡈ5≯SS;	[P1 V6];	[P1 V6]
-B;	舌.ꡈ5≯ss;	[P1 V6];	[P1 V6]
-B;	舌.ꡈ5>\u0338ss;	[P1 V6];	[P1 V6]
-B;	舌.ꡈ5>\u0338Ss;	[P1 V6];	[P1 V6]
-B;	舌.ꡈ5≯Ss;	[P1 V6];	[P1 V6]
-B;	xn--tc1a.xn--5ss-3m2a5009e;	[V6];	[V6]
-B;	xn--tc1a.xn--5-qfa988w745i;	[V6];	[V6]
-B;	⾆．ꡈ５>\u0338SS;	[P1 V6];	[P1 V6]
-B;	⾆．ꡈ５≯SS;	[P1 V6];	[P1 V6]
-B;	⾆．ꡈ５≯ss;	[P1 V6];	[P1 V6]
-B;	⾆．ꡈ５>\u0338ss;	[P1 V6];	[P1 V6]
-B;	⾆．ꡈ５>\u0338Ss;	[P1 V6];	[P1 V6]
-B;	⾆．ꡈ５≯Ss;	[P1 V6];	[P1 V6]
-T;	\u0ACD8\u200D．򾂈\u075C;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�8.ݜ
-N;	\u0ACD8\u200D．򾂈\u075C;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 C2 P1 V5 V6]	#	�8.ݜ
-T;	\u0ACD8\u200D.򾂈\u075C;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�8.ݜ
-N;	\u0ACD8\u200D.򾂈\u075C;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 C2 P1 V5 V6]	#	�8.ݜ
-B;	xn--8-yke.xn--gpb79046m;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	�8.ݜ
-B;	xn--8-yke534n.xn--gpb79046m;	[B1 B5 B6 C2 V5 V6];	[B1 B5 B6 C2 V5 V6]	#	�8.ݜ
-B;	򸷆\u0A70≮򹓙．񞎧�󠯙\u06B6;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ੰ≮.7ڶ
-B;	򸷆\u0A70<\u0338򹓙．񞎧�󠯙\u06B6;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ੰ≮.7ڶ
-B;	򸷆\u0A70≮򹓙.񞎧7󠯙\u06B6;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ੰ≮.7ڶ
-B;	򸷆\u0A70<\u0338򹓙.񞎧7󠯙\u06B6;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ੰ≮.7ڶ
-B;	xn--ycc893jqh38rb6fa.xn--7-5uc53836ixt41c;	[B5 B6 V6];	[B5 B6 V6]	#	ੰ≮.7ڶ
-T;	𞤪.ς;	;	xn--ie6h.xn--4xa
-N;	𞤪.ς;	;	xn--ie6h.xn--3xa
-B;	𞤈.Σ;	𞤪.σ;	xn--ie6h.xn--4xa
-B;	𞤪.σ;	;	xn--ie6h.xn--4xa
-B;	𞤈.σ;	𞤪.σ;	xn--ie6h.xn--4xa
-B;	xn--ie6h.xn--4xa;	𞤪.σ;	xn--ie6h.xn--4xa
-T;	𞤈.ς;	𞤪.ς;	xn--ie6h.xn--4xa
-N;	𞤈.ς;	𞤪.ς;	xn--ie6h.xn--3xa
-B;	xn--ie6h.xn--3xa;	𞤪.ς;	xn--ie6h.xn--3xa
-B;	𞤪.Σ;	𞤪.σ;	xn--ie6h.xn--4xa
-T;	\u200CႺ｡ς;	[C1 P1 V6];	[P1 V6]	#	Ⴚ.ς
-N;	\u200CႺ｡ς;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴚ.ς
-T;	\u200CႺ。ς;	[C1 P1 V6];	[P1 V6]	#	Ⴚ.ς
-N;	\u200CႺ。ς;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴚ.ς
-T;	\u200Cⴚ。ς;	[C1];	xn--ilj.xn--4xa	#	ⴚ.ς
-N;	\u200Cⴚ。ς;	[C1];	[C1]	#	ⴚ.ς
-T;	\u200CႺ。Σ;	[C1 P1 V6];	[P1 V6]	#	Ⴚ.σ
-N;	\u200CႺ。Σ;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴚ.σ
-T;	\u200Cⴚ。σ;	[C1];	xn--ilj.xn--4xa	#	ⴚ.σ
-N;	\u200Cⴚ。σ;	[C1];	[C1]	#	ⴚ.σ
-B;	xn--ilj.xn--4xa;	ⴚ.σ;	xn--ilj.xn--4xa
-B;	ⴚ.σ;	;	xn--ilj.xn--4xa
-B;	Ⴚ.Σ;	[P1 V6];	[P1 V6]
-T;	â´š.Ï‚;	;	xn--ilj.xn--4xa
-N;	â´š.Ï‚;	;	xn--ilj.xn--3xa
-T;	Ⴚ.ς;	[P1 V6];	[P1 V6]
-N;	Ⴚ.ς;	[P1 V6];	[P1 V6]
-B;	xn--ynd.xn--4xa;	[V6];	[V6]
-B;	xn--ynd.xn--3xa;	[V6];	[V6]
-B;	xn--ilj.xn--3xa;	â´š.Ï‚;	xn--ilj.xn--3xa
-B;	Ⴚ.σ;	[P1 V6];	[P1 V6]
-B;	xn--0ug262c.xn--4xa;	[C1];	[C1]	#	ⴚ.σ
-B;	xn--ynd759e.xn--4xa;	[C1 V6];	[C1 V6]	#	Ⴚ.σ
-B;	xn--0ug262c.xn--3xa;	[C1];	[C1]	#	â´š.Ï‚
-B;	xn--ynd759e.xn--3xa;	[C1 V6];	[C1 V6]	#	Ⴚ.ς
-T;	\u200Cⴚ｡ς;	[C1];	xn--ilj.xn--4xa	#	ⴚ.ς
-N;	\u200Cⴚ｡ς;	[C1];	[C1]	#	ⴚ.ς
-T;	\u200CႺ｡Σ;	[C1 P1 V6];	[P1 V6]	#	Ⴚ.σ
-N;	\u200CႺ｡Σ;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴚ.σ
-T;	\u200Cⴚ｡σ;	[C1];	xn--ilj.xn--4xa	#	ⴚ.σ
-N;	\u200Cⴚ｡σ;	[C1];	[C1]	#	ⴚ.σ
-B;	𞤃．�;	[B1];	[B1]
-B;	𞤃.�;	[B1];	[B1]
-B;	𞤥.�;	[B1];	[B1]
-B;	xn--de6h.xn--eo0d;	[B1];	[B1]
-B;	𞤥．�;	[B1];	[B1]
-T;	\u200D⾕。\u200C\u0310\uA953ꡎ;	[C1 C2];	[V5]	#	谷.꥓�ꡎ
-N;	\u200D⾕。\u200C\u0310\uA953ꡎ;	[C1 C2];	[C1 C2]	#	谷.꥓�ꡎ
-T;	\u200D⾕。\u200C\uA953\u0310ꡎ;	[C1 C2];	[V5]	#	谷.꥓�ꡎ
-N;	\u200D⾕。\u200C\uA953\u0310ꡎ;	[C1 C2];	[C1 C2]	#	谷.꥓�ꡎ
-T;	\u200D谷。\u200C\uA953\u0310ꡎ;	[C1 C2];	[V5]	#	谷.꥓�ꡎ
-N;	\u200D谷。\u200C\uA953\u0310ꡎ;	[C1 C2];	[C1 C2]	#	谷.꥓�ꡎ
-B;	xn--6g3a.xn--0sa8175flwa;	[V5];	[V5]	#	谷.꥓�ꡎ
-B;	xn--1ug0273b.xn--0sa359l6n7g13a;	[C1 C2];	[C1 C2]	#	谷.꥓�ꡎ
-T;	\u06AA-뉔．�\u200C;	[B2 B3 C1];	[B2 B3]	#	ڪ-뉔.𞤲
-N;	\u06AA-뉔．�\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-T;	\u06AA-뉔．�\u200C;	[B2 B3 C1];	[B2 B3]	#	ڪ-뉔.𞤲
-N;	\u06AA-뉔．�\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-T;	\u06AA-뉔.�\u200C;	[B2 B3 C1];	[B2 B3]	#	ڪ-뉔.𞤲
-N;	\u06AA-뉔.�\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-T;	\u06AA-뉔.�\u200C;	[B2 B3 C1];	[B2 B3]	#	ڪ-뉔.𞤲
-N;	\u06AA-뉔.�\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-T;	\u06AA-뉔.𞤲\u200C;	[B2 B3 C1];	[B2 B3]	#	ڪ-뉔.𞤲
-N;	\u06AA-뉔.𞤲\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-T;	\u06AA-뉔.𞤲\u200C;	[B2 B3 C1];	[B2 B3]	#	ڪ-뉔.𞤲
-N;	\u06AA-뉔.𞤲\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-B;	xn----guc3592k.xn--qe6h;	[B2 B3];	[B2 B3]	#	ڪ-뉔.𞤲
-B;	xn----guc3592k.xn--0ug7611p;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-T;	\u06AA-뉔．𞤲\u200C;	[B2 B3 C1];	[B2 B3]	#	ڪ-뉔.𞤲
-N;	\u06AA-뉔．𞤲\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-T;	\u06AA-뉔．𞤲\u200C;	[B2 B3 C1];	[B2 B3]	#	ڪ-뉔.𞤲
-N;	\u06AA-뉔．𞤲\u200C;	[B2 B3 C1];	[B2 B3 C1]	#	ڪ-뉔.𞤲
-T;	񔲵５ᦛς.\uA8C4\u077B\u1CD2\u0738;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛς.꣄ݻܸ᳒
-N;	񔲵５ᦛς.\uA8C4\u077B\u1CD2\u0738;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛς.꣄ݻܸ᳒
-T;	񔲵５ᦛς.\uA8C4\u077B\u0738\u1CD2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛς.꣄ݻܸ᳒
-N;	񔲵５ᦛς.\uA8C4\u077B\u0738\u1CD2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛς.꣄ݻܸ᳒
-T;	񔲵5ᦛς.\uA8C4\u077B\u0738\u1CD2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛς.꣄ݻܸ᳒
-N;	񔲵5ᦛς.\uA8C4\u077B\u0738\u1CD2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛς.꣄ݻܸ᳒
-B;	񔲵5ᦛΣ.\uA8C4\u077B\u0738\u1CD2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛσ.꣄ݻܸ᳒
-B;	񔲵5ᦛσ.\uA8C4\u077B\u0738\u1CD2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛσ.꣄ݻܸ᳒
-B;	xn--5-0mb988ng603j.xn--fob7kk44dl41k;	[B1 V5 V6];	[B1 V5 V6]	#	5ᦛσ.꣄ݻܸ᳒
-B;	xn--5-ymb298ng603j.xn--fob7kk44dl41k;	[B1 V5 V6];	[B1 V5 V6]	#	5ᦛς.꣄ݻܸ᳒
-B;	񔲵５ᦛΣ.\uA8C4\u077B\u0738\u1CD2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛσ.꣄ݻܸ᳒
-B;	񔲵５ᦛσ.\uA8C4\u077B\u0738\u1CD2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛσ.꣄ݻܸ᳒
-B;	񔲵５ᦛΣ.\uA8C4\u077B\u1CD2\u0738;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛσ.꣄ݻܸ᳒
-B;	񔲵５ᦛσ.\uA8C4\u077B\u1CD2\u0738;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	5ᦛσ.꣄ݻܸ᳒
-B;	淽。ᠾ;	淽.ᠾ;	xn--34w.xn--x7e
-B;	xn--34w.xn--x7e;	æ·½.á ¾;	xn--34w.xn--x7e
-B;	æ·½.á ¾;	;	xn--34w.xn--x7e
-B;	�𑘷。-;	[B1 V3];	[B1 V3]
-B;	xn--so0do6k.-;	[B1 V3];	[B1 V3]
-B;	򬨩Ⴓ�｡𑄨;	[P1 V5 V6];	[P1 V5 V6]
-B;	򬨩Ⴓ�。𑄨;	[P1 V5 V6];	[P1 V5 V6]
-B;	򬨩ⴓ�。𑄨;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--8di78qvw32y.xn--k80d;	[V5 V6];	[V5 V6]
-B;	xn--rnd896i0j14q.xn--k80d;	[V5 V6];	[V5 V6]
-B;	򬨩ⴓ�｡𑄨;	[P1 V5 V6];	[P1 V5 V6]
-T;	\u200C�𞤌Ⴇ｡ßႣ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�𞤮Ⴇ.ßႣ
-N;	\u200C�𞤌Ⴇ｡ßႣ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�𞤮Ⴇ.ßႣ
-T;	\u200C�𞤌Ⴇ。ßႣ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�𞤮Ⴇ.ßႣ
-N;	\u200C�𞤌Ⴇ。ßႣ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�𞤮Ⴇ.ßႣ
-T;	\u200C�𞤮ⴇ。ßⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ßⴃ
-N;	\u200C�𞤮ⴇ。ßⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ßⴃ
-T;	\u200C�𞤌Ⴇ。SSႣ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�𞤮Ⴇ.ssႣ
-N;	\u200C�𞤌Ⴇ。SSႣ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�𞤮Ⴇ.ssႣ
-T;	\u200C�𞤮ⴇ。ssⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ssⴃ
-N;	\u200C�𞤮ⴇ。ssⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ssⴃ
-T;	\u200C�𞤌ⴇ。Ssⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ssⴃ
-N;	\u200C�𞤌ⴇ。Ssⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ssⴃ
-B;	xn--ykj9323eegwf.xn--ss-151a;	[B1];	[B1]
-B;	xn--0ug332c3q0pr56g.xn--ss-151a;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ssⴃ
-B;	xn--fnd1201kegrf.xn--ss-fek;	[B1 V6];	[B1 V6]
-B;	xn--fnd599eyj4pr50g.xn--ss-fek;	[B1 C1 V6];	[B1 C1 V6]	#	�𞤮Ⴇ.ssႣ
-B;	xn--0ug332c3q0pr56g.xn--zca417t;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ßⴃ
-B;	xn--fnd599eyj4pr50g.xn--zca681f;	[B1 C1 V6];	[B1 C1 V6]	#	�𞤮Ⴇ.ßႣ
-T;	\u200C�𞤮ⴇ｡ßⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ßⴃ
-N;	\u200C�𞤮ⴇ｡ßⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ßⴃ
-T;	\u200C�𞤌Ⴇ｡SSႣ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�𞤮Ⴇ.ssႣ
-N;	\u200C�𞤌Ⴇ｡SSႣ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�𞤮Ⴇ.ssႣ
-T;	\u200C�𞤮ⴇ｡ssⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ssⴃ
-N;	\u200C�𞤮ⴇ｡ssⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ssⴃ
-T;	\u200C�𞤌ⴇ｡Ssⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ssⴃ
-N;	\u200C�𞤌ⴇ｡Ssⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ssⴃ
-T;	\u200C�𞤌ⴇ。ßⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ßⴃ
-N;	\u200C�𞤌ⴇ。ßⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ßⴃ
-T;	\u200C�𞤌ⴇ。ssⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ssⴃ
-N;	\u200C�𞤌ⴇ。ssⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ssⴃ
-T;	\u200C�𞤌Ⴇ。Ssⴃ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�𞤮Ⴇ.ssⴃ
-N;	\u200C�𞤌Ⴇ。Ssⴃ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�𞤮Ⴇ.ssⴃ
-B;	xn--fnd1201kegrf.xn--ss-151a;	[B1 V6];	[B1 V6]
-B;	xn--fnd599eyj4pr50g.xn--ss-151a;	[B1 C1 V6];	[B1 C1 V6]	#	�𞤮Ⴇ.ssⴃ
-T;	\u200C�𞤌ⴇ｡ßⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ßⴃ
-N;	\u200C�𞤌ⴇ｡ßⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ßⴃ
-T;	\u200C�𞤌ⴇ｡ssⴃ;	[B1 C1];	[B1]	#	�𞤮ⴇ.ssⴃ
-N;	\u200C�𞤌ⴇ｡ssⴃ;	[B1 C1];	[B1 C1]	#	�𞤮ⴇ.ssⴃ
-T;	\u200C�𞤌Ⴇ｡Ssⴃ;	[B1 C1 P1 V6];	[B1 P1 V6]	#	�𞤮Ⴇ.ssⴃ
-N;	\u200C�𞤌Ⴇ｡Ssⴃ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�𞤮Ⴇ.ssⴃ
-B;	\u17FF｡𞬳;	[P1 V6];	[P1 V6]	#	.
-B;	\u17FF。𞬳;	[P1 V6];	[P1 V6]	#	.
-B;	xn--45e.xn--et6h;	[V6];	[V6]	#	.
-T;	\u0652\u200D｡\u0CCD𑚳;	[C2 V5];	[V5]	#	ْ.�𑚳
-N;	\u0652\u200D｡\u0CCD𑚳;	[C2 V5];	[C2 V5]	#	ْ.�𑚳
-T;	\u0652\u200D。\u0CCD𑚳;	[C2 V5];	[V5]	#	ْ.�𑚳
-N;	\u0652\u200D。\u0CCD𑚳;	[C2 V5];	[C2 V5]	#	ْ.�𑚳
-B;	xn--uhb.xn--8tc4527k;	[V5];	[V5]	#	ْ.�𑚳
-B;	xn--uhb882k.xn--8tc4527k;	[C2 V5];	[C2 V5]	#	ْ.�𑚳
-B;	-≠ᠻ．\u076D𞥃≮󟷺;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	-=\u0338ᠻ．\u076D𞥃<\u0338󟷺;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	-≠ᠻ.\u076D𞥃≮󟷺;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	-=\u0338ᠻ.\u076D𞥃<\u0338󟷺;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	-=\u0338ᠻ.\u076D𞤡<\u0338󟷺;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	-≠ᠻ.\u076D𞤡≮󟷺;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	xn----g6j886c.xn--xpb049kk353abj99f;	[B1 B2 B3 V3 V6];	[B1 B2 B3 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	-=\u0338ᠻ．\u076D𞤡<\u0338󟷺;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	-≠ᠻ．\u076D𞤡≮󟷺;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	-≠ᠻ.ݭ𞥃≮
-B;	󠰆≯\u07B5�．򊥕≮�\u084C;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	≯.≮�ࡌ
-B;	󠰆>\u0338\u07B5�．򊥕<\u0338�\u084C;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	≯.≮�ࡌ
-B;	󠰆≯\u07B5�.򊥕≮�\u084C;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	≯.≮�ࡌ
-B;	󠰆>\u0338\u07B5�.򊥕<\u0338�\u084C;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	≯.≮�ࡌ
-B;	xn--zrb797kdm1oes34i.xn--bwb394k8k2o25n6d;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	≯.≮�ࡌ
-B;	≠󦋂.\u0600\u0BCD-\u06B9;	[B1 P1 V6];	[B1 P1 V6]	#	≠.�-ڹ
-B;	=\u0338󦋂.\u0600\u0BCD-\u06B9;	[B1 P1 V6];	[B1 P1 V6]	#	≠.�-ڹ
-B;	xn--1ch22084l.xn----qkc07co6n;	[B1 V6];	[B1 V6]	#	≠.�-ڹ
-B;	\u17DD�≠｡��;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�≠.��
-B;	\u17DD�=\u0338｡��;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�≠.��
-B;	\u17DD�≠。��;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�≠.��
-B;	\u17DD�=\u0338。��;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�≠.��
-B;	xn--54e694cn389z.xn--787ct8r;	[B1 V5 V6];	[B1 V5 V6]	#	�≠.��
-T;	ß𰀻񆬗｡�🕮ß;	[P1 V5 V6];	[P1 V5 V6]
-N;	ß𰀻񆬗｡�🕮ß;	[P1 V5 V6];	[P1 V5 V6]
-T;	ß𰀻񆬗。�🕮ß;	[P1 V5 V6];	[P1 V5 V6]
-N;	ß𰀻񆬗。�🕮ß;	[P1 V5 V6];	[P1 V5 V6]
-B;	SS𰀻񆬗。�🕮SS;	[P1 V5 V6];	[P1 V5 V6]
-B;	ss𰀻񆬗。�🕮ss;	[P1 V5 V6];	[P1 V5 V6]
-B;	Ss𰀻񆬗。�🕮Ss;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--ss-jl59biy67d.xn--ss-4d11aw87d;	[V5 V6];	[V5 V6]
-B;	xn--zca20040bgrkh.xn--zca3653v86qa;	[V5 V6];	[V5 V6]
-B;	SS𰀻񆬗｡�🕮SS;	[P1 V5 V6];	[P1 V5 V6]
-B;	ss𰀻񆬗｡�🕮ss;	[P1 V5 V6];	[P1 V5 V6]
-B;	Ss𰀻񆬗｡�🕮Ss;	[P1 V5 V6];	[P1 V5 V6]
-T;	\u200D。\u200C;	[C1 C2];	[A4_2]	#	.
-N;	\u200D。\u200C;	[C1 C2];	[C1 C2]	#	.
-B;	xn--1ug.xn--0ug;	[C1 C2];	[C1 C2]	#	.
-T;	\u0483�\u200D.\u17B9𞯌򟩚;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	҃�.ឹ
-N;	\u0483�\u200D.\u17B9𞯌򟩚;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	҃�.ឹ
-B;	xn--m3a6965k.xn--43e8670vmd79b;	[B1 V5 V6];	[B1 V5 V6]	#	҃�.ឹ
-B;	xn--m3a412lrr0o.xn--43e8670vmd79b;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	҃�.ឹ
-T;	\u200C�\u200C临。ꡢ򄷞��;	[B1 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	�临.ꡢ��
-N;	\u200C�\u200C临。ꡢ򄷞��;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	�临.ꡢ��
-B;	xn--miq9646b.xn--uojv340bk71c99u9f;	[B2 B3 B5 B6 V6];	[B2 B3 B5 B6 V6]
-B;	xn--0uga2656aop9k.xn--uojv340bk71c99u9f;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	�临.ꡢ��
-B;	󠑘．󠄮;	[P1 V6];	[P1 V6]
-B;	󠑘.󠄮;	[P1 V6];	[P1 V6]
-B;	xn--s136e.;	[V6];	[V6]
-B;	�\u0D4D．\uAAF6;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.꫶
-B;	�\u0D4D.\uAAF6;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.꫶
-B;	xn--wxc7880k.xn--2v9a;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.꫶
-B;	\uA9B7�멹。⒛󠨇;	[P1 V5 V6];	[P1 V5 V6]	#	ꦷ멹.⒛
-B;	\uA9B7�멹。⒛󠨇;	[P1 V5 V6];	[P1 V5 V6]	#	ꦷ멹.⒛
-B;	\uA9B7�멹。20.󠨇;	[P1 V5 V6];	[P1 V5 V6]	#	ꦷ멹.20.
-B;	\uA9B7�멹。20.󠨇;	[P1 V5 V6];	[P1 V5 V6]	#	ꦷ멹.20.
-B;	xn--ym9av13acp85w.20.xn--d846e;	[V5 V6];	[V5 V6]	#	ꦷ멹.20.
-B;	xn--ym9av13acp85w.xn--dth22121k;	[V5 V6];	[V5 V6]	#	ꦷ멹.⒛
-B;	Ⴅ󲬹릖󠶚.\u0777�⒊;	[B4 B6 P1 V6];	[B4 B6 P1 V6]	#	Ⴅ릖.ݷ�⒊
-B;	Ⴅ󲬹릖󠶚.\u0777�⒊;	[B4 B6 P1 V6];	[B4 B6 P1 V6]	#	Ⴅ릖.ݷ�⒊
-B;	Ⴅ󲬹릖󠶚.\u0777�3.;	[B4 B6 P1 V6];	[B4 B6 P1 V6]	#	Ⴅ릖.ݷ�3.
-B;	Ⴅ󲬹릖󠶚.\u0777�3.;	[B4 B6 P1 V6];	[B4 B6 P1 V6]	#	Ⴅ릖.ݷ�3.
-B;	ⴅ󲬹릖󠶚.\u0777�3.;	[B4 B6 P1 V6];	[B4 B6 P1 V6]	#	ⴅ릖.ݷ�3.
-B;	ⴅ󲬹릖󠶚.\u0777�3.;	[B4 B6 P1 V6];	[B4 B6 P1 V6]	#	ⴅ릖.ݷ�3.
-B;	xn--wkj8016bne45io02g.xn--3-55c6803r.;	[B4 B6 V6];	[B4 B6 V6]	#	ⴅ릖.ݷ�3.
-B;	xn--dnd2167fnet0io02g.xn--3-55c6803r.;	[B4 B6 V6];	[B4 B6 V6]	#	Ⴅ릖.ݷ�3.
-B;	ⴅ󲬹릖󠶚.\u0777�⒊;	[B4 B6 P1 V6];	[B4 B6 P1 V6]	#	ⴅ릖.ݷ�⒊
-B;	ⴅ󲬹릖󠶚.\u0777�⒊;	[B4 B6 P1 V6];	[B4 B6 P1 V6]	#	ⴅ릖.ݷ�⒊
-B;	xn--wkj8016bne45io02g.xn--7pb000mwm4n;	[B4 B6 V6];	[B4 B6 V6]	#	ⴅ릖.ݷ�⒊
-B;	xn--dnd2167fnet0io02g.xn--7pb000mwm4n;	[B4 B6 V6];	[B4 B6 V6]	#	Ⴅ릖.ݷ�⒊
-T;	\u200C｡︒;	[C1 P1 V6];	[P1 V6 A4_2]	#	.︒
-N;	\u200C｡︒;	[C1 P1 V6];	[C1 P1 V6]	#	.︒
-T;	\u200C。。;	[C1 A4_2];	[A4_2]	#	..
-N;	\u200C。。;	[C1 A4_2];	[C1 A4_2]	#	..
-B;	..;	[A4_2];	[A4_2]
-B;	xn--0ug..;	[C1 A4_2];	[C1 A4_2]	#	..
-B;	.xn--y86c;	[V6 A4_2];	[V6 A4_2]
-B;	xn--0ug.xn--y86c;	[C1 V6];	[C1 V6]	#	.︒
-B;	≯\u076D．₄;	[B1 P1 V6];	[B1 P1 V6]	#	≯ݭ.4
-B;	>\u0338\u076D．₄;	[B1 P1 V6];	[B1 P1 V6]	#	≯ݭ.4
-B;	≯\u076D.4;	[B1 P1 V6];	[B1 P1 V6]	#	≯ݭ.4
-B;	>\u0338\u076D.4;	[B1 P1 V6];	[B1 P1 V6]	#	≯ݭ.4
-B;	xn--xpb149k.4;	[B1 V6];	[B1 V6]	#	≯ݭ.4
-T;	ᡲ-�.ß-\u200C-;	[C1 V3];	[V2 V3]	#	ᡲ-3.ß--
-N;	ᡲ-�.ß-\u200C-;	[C1 V3];	[C1 V3]	#	ᡲ-3.ß--
-T;	ᡲ-3.ß-\u200C-;	[C1 V3];	[V2 V3]	#	ᡲ-3.ß--
-N;	ᡲ-3.ß-\u200C-;	[C1 V3];	[C1 V3]	#	ᡲ-3.ß--
-T;	ᡲ-3.SS-\u200C-;	[C1 V3];	[V2 V3]	#	ᡲ-3.ss--
-N;	ᡲ-3.SS-\u200C-;	[C1 V3];	[C1 V3]	#	ᡲ-3.ss--
-T;	ᡲ-3.ss-\u200C-;	[C1 V3];	[V2 V3]	#	ᡲ-3.ss--
-N;	ᡲ-3.ss-\u200C-;	[C1 V3];	[C1 V3]	#	ᡲ-3.ss--
-T;	ᡲ-3.Ss-\u200C-;	[C1 V3];	[V2 V3]	#	ᡲ-3.ss--
-N;	ᡲ-3.Ss-\u200C-;	[C1 V3];	[C1 V3]	#	ᡲ-3.ss--
-B;	xn---3-p9o.ss--;	[V2 V3];	[V2 V3]
-B;	xn---3-p9o.xn--ss---276a;	[C1 V3];	[C1 V3]	#	ᡲ-3.ss--
-B;	xn---3-p9o.xn-----fia9303a;	[C1 V3];	[C1 V3]	#	ᡲ-3.ß--
-T;	ᡲ-�.SS-\u200C-;	[C1 V3];	[V2 V3]	#	ᡲ-3.ss--
-N;	ᡲ-�.SS-\u200C-;	[C1 V3];	[C1 V3]	#	ᡲ-3.ss--
-T;	ᡲ-�.ss-\u200C-;	[C1 V3];	[V2 V3]	#	ᡲ-3.ss--
-N;	ᡲ-�.ss-\u200C-;	[C1 V3];	[C1 V3]	#	ᡲ-3.ss--
-T;	ᡲ-�.Ss-\u200C-;	[C1 V3];	[V2 V3]	#	ᡲ-3.ss--
-N;	ᡲ-�.Ss-\u200C-;	[C1 V3];	[C1 V3]	#	ᡲ-3.ss--
-B;	\uFD08�\u0647󎊯｡Ӏ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ضي4ه.Ӏ
-B;	\u0636\u064A4\u0647󎊯。Ӏ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ضي4ه.Ӏ
-B;	\u0636\u064A4\u0647󎊯。�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ضي4ه.�
-B;	xn--4-tnc6ck183523b.xn--s5a;	[B2 B3 V6];	[B2 B3 V6]	#	ضي4ه.�
-B;	xn--4-tnc6ck183523b.xn--d5a;	[B2 B3 V6];	[B2 B3 V6]	#	ضي4ه.Ӏ
-B;	\uFD08�\u0647󎊯｡�;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ضي4ه.�
-B;	-.\u0602\u0622𑆾�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.آ𑆾�
-B;	-.\u0602\u0627\u0653𑆾�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.آ𑆾�
-B;	-.xn--kfb8dy983hgl7g;	[B1 V3 V6];	[B1 V3 V6]	#	-.آ𑆾�
-B;	󙶜ᢘ。\u1A7F⺢;	[P1 V5 V6];	[P1 V5 V6]	#	ᢘ.᩿⺢
-B;	xn--ibf35138o.xn--fpfz94g;	[V5 V6];	[V5 V6]	#	ᢘ.᩿⺢
-B;	≠ႷᠤႫ｡\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ႷᠤႫ.͌س觴
-B;	=\u0338ႷᠤႫ｡\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ႷᠤႫ.͌س觴
-B;	≠ႷᠤႫ。\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ႷᠤႫ.͌س觴
-B;	=\u0338ႷᠤႫ。\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ႷᠤႫ.͌س觴
-B;	=\u0338ⴗᠤⴋ。\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ⴗᠤⴋ.͌س觴
-B;	≠ⴗᠤⴋ。\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ⴗᠤⴋ.͌س觴
-B;	≠Ⴗᠤⴋ。\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠Ⴗᠤⴋ.͌س觴
-B;	=\u0338Ⴗᠤⴋ。\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠Ⴗᠤⴋ.͌س觴
-B;	xn--vnd619as6ig6k.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠Ⴗᠤⴋ.͌س觴
-B;	XN--VND619AS6IG6K.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠Ⴗᠤⴋ.͌س觴
-B;	Xn--Vnd619as6ig6k.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠Ⴗᠤⴋ.͌س觴
-B;	xn--66e353ce0ilb.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ⴗᠤⴋ.͌س觴
-B;	XN--66E353CE0ILB.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ⴗᠤⴋ.͌س觴
-B;	Xn--66E353ce0ilb.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ⴗᠤⴋ.͌س觴
-B;	xn--jndx718cnnl.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ႷᠤႫ.͌س觴
-B;	XN--JNDX718CNNL.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ႷᠤႫ.͌س觴
-B;	Xn--Jndx718cnnl.\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ႷᠤႫ.͌س觴
-B;	=\u0338ⴗᠤⴋ｡\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ⴗᠤⴋ.͌س觴
-B;	≠ⴗᠤⴋ｡\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠ⴗᠤⴋ.͌س觴
-B;	≠Ⴗᠤⴋ｡\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠Ⴗᠤⴋ.͌س觴
-B;	=\u0338Ⴗᠤⴋ｡\uD907\u034C\u0633觴;	[B1 B5 P1 V6];	[B1 B5 P1 V6 A3]	#	≠Ⴗᠤⴋ.͌س觴
-B;	\u0667.�;	[B1 P1 V6];	[B1 P1 V6]	#	٧.
-B;	xn--gib.xn--vm9c;	[B1 V6];	[B1 V6]	#	Ù§.
-T;	\uA9C0�｡\u200D񼑥�\u1BF3;	[B1 C2 P1 V5 V6];	[B5 P1 V5 V6]	#	꧀3.�᯳
-N;	\uA9C0�｡\u200D񼑥�\u1BF3;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	꧀3.�᯳
-T;	\uA9C03。\u200D񼑥�\u1BF3;	[B1 C2 P1 V5 V6];	[B5 P1 V5 V6]	#	꧀3.�᯳
-N;	\uA9C03。\u200D񼑥�\u1BF3;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	꧀3.�᯳
-B;	xn--3-5z4e.xn--1zfz754hncv8b;	[B5 V5 V6];	[B5 V5 V6]	#	꧀3.�᯳
-B;	xn--3-5z4e.xn--1zf96ony8ygd68c;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	꧀3.�᯳
-B;	򣕄4񠖽.≯\u0664𑀾󠸌;	[B1 P1 V6];	[B1 P1 V6]	#	4.≯٤𑀾
-B;	򣕄4񠖽.>\u0338\u0664𑀾󠸌;	[B1 P1 V6];	[B1 P1 V6]	#	4.≯٤𑀾
-B;	xn--4-fg85dl688i.xn--dib174li86ntdy0i;	[B1 V6];	[B1 V6]	#	4.≯٤𑀾
-B;	򗆧�。⒈\u1A76�򠘌;	[P1 V6];	[P1 V6]	#	3.⒈᩶2
-B;	򗆧3。1.\u1A762򠘌;	[P1 V5 V6];	[P1 V5 V6]	#	3.1.᩶2
-B;	xn--3-rj42h.1.xn--2-13k96240l;	[V5 V6];	[V5 V6]	#	3.1.᩶2
-B;	xn--3-rj42h.xn--2-13k746cq465x;	[V6];	[V6]	#	3.⒈᩶2
-T;	\u200D₅⒈。≯�\u200D;	[C2 P1 V6];	[P1 V6]	#	5⒈.≯8
-N;	\u200D₅⒈。≯�\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	5⒈.≯8
-T;	\u200D₅⒈。>\u0338�\u200D;	[C2 P1 V6];	[P1 V6]	#	5⒈.≯8
-N;	\u200D₅⒈。>\u0338�\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	5⒈.≯8
-T;	\u200D51.。≯8\u200D;	[C2 P1 V6 A4_2];	[P1 V6 A4_2]	#	51..≯8
-N;	\u200D51.。≯8\u200D;	[C2 P1 V6 A4_2];	[C2 P1 V6 A4_2]	#	51..≯8
-T;	\u200D51.。>\u03388\u200D;	[C2 P1 V6 A4_2];	[P1 V6 A4_2]	#	51..≯8
-N;	\u200D51.。>\u03388\u200D;	[C2 P1 V6 A4_2];	[C2 P1 V6 A4_2]	#	51..≯8
-B;	51..xn--8-ogo;	[V6 A4_2];	[V6 A4_2]
-B;	xn--51-l1t..xn--8-ugn00i;	[C2 V6 A4_2];	[C2 V6 A4_2]	#	51..≯8
-B;	xn--5-ecp.xn--8-ogo;	[V6];	[V6]
-B;	xn--5-tgnz5r.xn--8-ugn00i;	[C2 V6];	[C2 V6]	#	5⒈.≯8
-T;	ꡰ\u0697\u1086．򪘙\u072F≠\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ꡰڗႆ.ܯ≠
-N;	ꡰ\u0697\u1086．򪘙\u072F≠\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ꡰڗႆ.ܯ≠
-T;	ꡰ\u0697\u1086．򪘙\u072F=\u0338\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ꡰڗႆ.ܯ≠
-N;	ꡰ\u0697\u1086．򪘙\u072F=\u0338\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ꡰڗႆ.ܯ≠
-T;	ꡰ\u0697\u1086.򪘙\u072F≠\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ꡰڗႆ.ܯ≠
-N;	ꡰ\u0697\u1086.򪘙\u072F≠\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ꡰڗႆ.ܯ≠
-T;	ꡰ\u0697\u1086.򪘙\u072F=\u0338\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ꡰڗႆ.ܯ≠
-N;	ꡰ\u0697\u1086.򪘙\u072F=\u0338\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ꡰڗႆ.ܯ≠
-B;	xn--tjb002cn51k.xn--5nb630lbj91q;	[B5 B6 V6];	[B5 B6 V6]	#	ꡰڗႆ.ܯ≠
-B;	xn--tjb002cn51k.xn--5nb448jcubcz547b;	[B5 B6 C1 V6];	[B5 B6 C1 V6]	#	ꡰڗႆ.ܯ≠
-B;	𑄱｡򪌿�;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]
-B;	𑄱。򪌿�;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]
-B;	xn--t80d.xn--to0d14792b;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]
-B;	�\u0600。\u073D;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	3.ܽ
-B;	3\u0600。\u073D;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	3.ܽ
-B;	xn--3-rkc.xn--kob;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	3.ܽ
-B;	\u0637�\u0666.\u076D긷;	[B2 B3];	[B2 B3]	#	ط�٦.ݭ긷
-B;	\u0637�\u0666.\u076D긷;	[B2 B3];	[B2 B3]	#	ط�٦.ݭ긷
-B;	xn--2gb8gu829f.xn--xpb0156f;	[B2 B3];	[B2 B3]	#	ط�٦.ݭ긷
-B;	︒Ↄ\u2DE7򾀃．Ⴗ�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	︒Ↄⷧ.Ⴗ
-B;	。Ↄ\u2DE7򾀃.Ⴗ�;	[B5 B6 P1 V6 A4_2];	[B5 B6 P1 V6 A4_2]	#	.Ↄⷧ.Ⴗ
-B;	。ↄ\u2DE7򾀃.ⴗ�;	[B5 B6 P1 V6 A4_2];	[B5 B6 P1 V6 A4_2]	#	.ↄⷧ.ⴗ
-B;	.xn--r5gy00cll06u.xn--flj4541e;	[B5 B6 V6 A4_2];	[B5 B6 V6 A4_2]	#	.ↄⷧ.ⴗ
-B;	.xn--q5g000cll06u.xn--vnd8618j;	[B5 B6 V6 A4_2];	[B5 B6 V6 A4_2]	#	.Ↄⷧ.Ⴗ
-B;	︒ↄ\u2DE7򾀃．ⴗ�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	︒ↄⷧ.ⴗ
-B;	xn--r5gy00c056n0226g.xn--flj4541e;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	︒ↄⷧ.ⴗ
-B;	xn--q5g000c056n0226g.xn--vnd8618j;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	︒Ↄⷧ.Ⴗ
-B;	\u0600.\u05B1;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	.Ö±
-B;	xn--ifb.xn--8cb;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	.Ö±
-T;	ς≯｡�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-N;	ς≯｡�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-T;	ς>\u0338｡�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-N;	ς>\u0338｡�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-T;	ς≯。�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-N;	ς≯。�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-T;	ς>\u0338。�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-N;	ς>\u0338。�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	Σ>\u0338。�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	Σ≯。�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	σ≯。�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	σ>\u0338。�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	xn--4xa818m.xn--1o0d;	[B1 B6 V6];	[B1 B6 V6]
-B;	xn--3xa028m.xn--1o0d;	[B1 B6 V6];	[B1 B6 V6]
-B;	Σ>\u0338｡�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	Σ≯｡�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	σ≯｡�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	σ>\u0338｡�;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-T;	\u17D2\u200D\u075F。�;	[B1 V5];	[B1 V5]	#	្ݟ.�
-N;	\u17D2\u200D\u075F。�;	[B1 V5];	[B1 V5]	#	្ݟ.�
-B;	xn--jpb535f.xn--uo0d;	[B1 V5];	[B1 V5]	#	្ݟ.�
-B;	xn--jpb535fv9f.xn--uo0d;	[B1 V5];	[B1 V5]	#	្ݟ.�
-B;	𾷂\u0A42Ⴊ񂂟.≮;	[P1 V6];	[P1 V6]	#	ੂႪ.≮
-B;	𾷂\u0A42Ⴊ񂂟.<\u0338;	[P1 V6];	[P1 V6]	#	ੂႪ.≮
-B;	𾷂\u0A42ⴊ񂂟.<\u0338;	[P1 V6];	[P1 V6]	#	ੂⴊ.≮
-B;	𾷂\u0A42ⴊ񂂟.≮;	[P1 V6];	[P1 V6]	#	ੂⴊ.≮
-B;	xn--nbc229o4y27dgskb.xn--gdh;	[V6];	[V6]	#	ੂⴊ.≮
-B;	xn--nbc493aro75ggskb.xn--gdh;	[V6];	[V6]	#	ੂႪ.≮
-B;	ꡠ．۲;	ꡠ.۲;	xn--5c9a.xn--fmb
-B;	ê¡ .Û²;	;	xn--5c9a.xn--fmb
-B;	xn--5c9a.xn--fmb;	ê¡ .Û²;	xn--5c9a.xn--fmb
-B;	�񄷄｡ꡬ🄄;	[B1 P1 V6];	[B1 P1 V6]
-B;	�񄷄。ꡬ3,;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	xn--bo0d0203l.xn--3,-yj9h;	[B1 B6 P1 V6];	[B1 B6 P1 V6]
-B;	xn--bo0d0203l.xn--id9a4443d;	[B1 V6];	[B1 V6]
-T;	-\u0C4D𞾀𑲓｡\u200D\u0D4D;	[B1 C2 P1 V3 V6];	[B1 B3 B6 P1 V3 V5 V6]	#	-�𑲓.�
-N;	-\u0C4D𞾀𑲓｡\u200D\u0D4D;	[B1 C2 P1 V3 V6];	[B1 C2 P1 V3 V6]	#	-�𑲓.�
-T;	-\u0C4D𞾀𑲓。\u200D\u0D4D;	[B1 C2 P1 V3 V6];	[B1 B3 B6 P1 V3 V5 V6]	#	-�𑲓.�
-N;	-\u0C4D𞾀𑲓。\u200D\u0D4D;	[B1 C2 P1 V3 V6];	[B1 C2 P1 V3 V6]	#	-�𑲓.�
-B;	xn----x6e0220sclug.xn--wxc;	[B1 B3 B6 V3 V5 V6];	[B1 B3 B6 V3 V5 V6]	#	-�𑲓.�
-B;	xn----x6e0220sclug.xn--wxc317g;	[B1 C2 V3 V6];	[B1 C2 V3 V6]	#	-�𑲓.�
-T;	\uA67D\u200C霣🄆｡\u200C�\u1B01;	[C1 P1 V5 V6];	[P1 V5 V6]	#	꙽霣🄆.��
-N;	\uA67D\u200C霣🄆｡\u200C�\u1B01;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	꙽霣🄆.��
-T;	\uA67D\u200C霣🄆｡\u200C�\u1B01;	[C1 P1 V5 V6];	[P1 V5 V6]	#	꙽霣🄆.��
-N;	\uA67D\u200C霣🄆｡\u200C�\u1B01;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	꙽霣🄆.��
-T;	\uA67D\u200C霣5,。\u200C�\u1B01;	[C1 P1 V5 V6];	[P1 V5 V6]	#	꙽霣5,.��
-N;	\uA67D\u200C霣5,。\u200C�\u1B01;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	꙽霣5,.��
-B;	xn--5,-op8g373c.xn--4sf0725i;	[P1 V5 V6];	[P1 V5 V6]	#	꙽霣5,.��
-B;	xn--5,-i1tz135dnbqa.xn--4sf36u6u4w;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	꙽霣5,.��
-B;	xn--2q5a751a653w.xn--4sf0725i;	[V5 V6];	[V5 V6]	#	꙽霣🄆.��
-B;	xn--0ug4208b2vjuk63a.xn--4sf36u6u4w;	[C1 V5 V6];	[C1 V5 V6]	#	꙽霣🄆.��
-B;	兎｡ᠼ󠴜𑚶𑰿;	[P1 V6];	[P1 V6]
-B;	兎。ᠼ󠴜𑚶𑰿;	[P1 V6];	[P1 V6]
-B;	xn--b5q.xn--v7e6041kqqd4m251b;	[V6];	[V6]
-T;	�｡\u200D�\u200D�;	[C2];	1.27	#	1.27
-N;	�｡\u200D�\u200D�;	[C2];	[C2]	#	1.27
-T;	1。\u200D2\u200D7;	[C2];	1.27	#	1.27
-N;	1。\u200D2\u200D7;	[C2];	[C2]	#	1.27
-B;	1.27;	;	
-B;	1.xn--27-l1tb;	[C2];	[C2]	#	1.27
-B;	ᡨ-｡󠻋�;	[P1 V3 V6];	[P1 V3 V6]
-B;	ᡨ-。󠻋1;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn----z8j.xn--1-5671m;	[V3 V6];	[V3 V6]
-B;	𑰻��．\u0668�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𑰻�.٨9
-B;	𑰻��.\u06689;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𑰻�.٨9
-B;	xn--gx9cr01aul57i.xn--9-oqc;	[B1 V5 V6];	[B1 V5 V6]	#	𑰻�.٨9
-T;	Ⴜ򈷭\u0F80⾇。Ⴏ♀\u200C\u200C;	[C1 P1 V6];	[P1 V6]	#	Ⴜྀ舛.Ⴏ♀
-N;	Ⴜ򈷭\u0F80⾇。Ⴏ♀\u200C\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴜྀ舛.Ⴏ♀
-T;	Ⴜ򈷭\u0F80舛。Ⴏ♀\u200C\u200C;	[C1 P1 V6];	[P1 V6]	#	Ⴜྀ舛.Ⴏ♀
-N;	Ⴜ򈷭\u0F80舛。Ⴏ♀\u200C\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴜྀ舛.Ⴏ♀
-T;	ⴜ򈷭\u0F80舛。�♀\u200C\u200C;	[C1 P1 V6];	[P1 V6]	#	ⴜྀ舛.�♀
-N;	ⴜ򈷭\u0F80舛。�♀\u200C\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	ⴜྀ舛.�♀
-B;	xn--zed372mdj2do3v4h.xn--e5h11w;	[V6];	[V6]	#	ⴜྀ舛.�♀
-B;	xn--zed372mdj2do3v4h.xn--0uga678bgyh;	[C1 V6];	[C1 V6]	#	ⴜྀ舛.�♀
-B;	xn--zed54dz10wo343g.xn--nnd651i;	[V6];	[V6]	#	Ⴜྀ舛.Ⴏ♀
-B;	xn--zed54dz10wo343g.xn--nnd089ea464d;	[C1 V6];	[C1 V6]	#	Ⴜྀ舛.Ⴏ♀
-T;	ⴜ򈷭\u0F80⾇。�♀\u200C\u200C;	[C1 P1 V6];	[P1 V6]	#	ⴜྀ舛.�♀
-N;	ⴜ򈷭\u0F80⾇。�♀\u200C\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	ⴜྀ舛.�♀
-T;	��.\u200D;	[C2 V5];	[V5]	#	�4.
-N;	��.\u200D;	[C2 V5];	[C2 V5]	#	�4.
-T;	�4.\u200D;	[C2 V5];	[V5]	#	�4.
-N;	�4.\u200D;	[C2 V5];	[C2 V5]	#	�4.
-B;	xn--4-xu7i.;	[V5];	[V5]
-B;	xn--4-xu7i.xn--1ug;	[C2 V5];	[C2 V5]	#	�4.
-T;	񮴘Ⴞ癀｡𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[P1 V5 V6]	#	Ⴞ癀.𑘿붼
-N;	񮴘Ⴞ癀｡𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	Ⴞ癀.𑘿붼
-T;	񮴘Ⴞ癀｡𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[P1 V5 V6]	#	Ⴞ癀.𑘿붼
-N;	񮴘Ⴞ癀｡𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	Ⴞ癀.𑘿붼
-T;	񮴘Ⴞ癀。𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[P1 V5 V6]	#	Ⴞ癀.𑘿붼
-N;	񮴘Ⴞ癀。𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	Ⴞ癀.𑘿붼
-T;	񮴘Ⴞ癀。𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[P1 V5 V6]	#	Ⴞ癀.𑘿붼
-N;	񮴘Ⴞ癀。𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	Ⴞ癀.𑘿붼
-T;	񮴘ⴞ癀。𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ⴞ癀.𑘿붼
-N;	񮴘ⴞ癀。𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ⴞ癀.𑘿붼
-T;	񮴘ⴞ癀。𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ⴞ癀.𑘿붼
-N;	񮴘ⴞ癀。𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ⴞ癀.𑘿붼
-B;	xn--mlju35u7qx2f.xn--et3bn23n;	[V5 V6];	[V5 V6]
-B;	xn--mlju35u7qx2f.xn--0ugb6122js83c;	[C1 V5 V6];	[C1 V5 V6]	#	ⴞ癀.𑘿붼
-B;	xn--2nd6803c7q37d.xn--et3bn23n;	[V5 V6];	[V5 V6]
-B;	xn--2nd6803c7q37d.xn--0ugb6122js83c;	[C1 V5 V6];	[C1 V5 V6]	#	Ⴞ癀.𑘿붼
-T;	񮴘ⴞ癀｡𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ⴞ癀.𑘿붼
-N;	񮴘ⴞ癀｡𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ⴞ癀.𑘿붼
-T;	񮴘ⴞ癀｡𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ⴞ癀.𑘿붼
-N;	񮴘ⴞ癀｡𑘿\u200D\u200C붼;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ⴞ癀.𑘿붼
-B;	󚀅-\u0BCD。\u06B9;	[B6 P1 V6];	[B6 P1 V6]	#	-�.ڹ
-B;	xn----mze84808x.xn--skb;	[B6 V6];	[B6 V6]	#	-�.ڹ
-B;	ᡃ�≯ᠣ．���;	[P1 V6];	[P1 V6]
-B;	ᡃ�>\u0338ᠣ．���;	[P1 V6];	[P1 V6]
-B;	ᡃ5≯ᠣ.���;	[P1 V6];	[P1 V6]
-B;	ᡃ5>\u0338ᠣ.���;	[P1 V6];	[P1 V6]
-B;	xn--5-24jyf768b.xn--lqw213ime95g;	[V6];	[V6]
-B;	��．\u0F76;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.ྲྀ
-B;	��．\u0FB2\u0F80;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.ྲྀ
-B;	��.\u0FB2\u0F80;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.ྲྀ
-B;	xn--ko0d8295a.xn--zed3h;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	��.ྲྀ
-B;	-𑈶�．⒎𰛢󠎭;	[P1 V3 V6];	[P1 V3 V6]
-B;	-𑈶8..7.𰛢󠎭;	[P1 V3 V6 A4_2];	[P1 V3 V6 A4_2]
-B;	xn---8-bv5o..7.xn--c35nf1622b;	[V3 V6 A4_2];	[V3 V6 A4_2]
-B;	xn----scp6252h.xn--zshy411yzpx2d;	[V3 V6];	[V3 V6]
-T;	\u200CႡ�\u200D．≮;	[C1 C2 P1 V6];	[P1 V6]	#	Ⴁ�.≮
-N;	\u200CႡ�\u200D．≮;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	Ⴁ�.≮
-T;	\u200CႡ�\u200D．<\u0338;	[C1 C2 P1 V6];	[P1 V6]	#	Ⴁ�.≮
-N;	\u200CႡ�\u200D．<\u0338;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	Ⴁ�.≮
-T;	\u200CႡ�\u200D.≮;	[C1 C2 P1 V6];	[P1 V6]	#	Ⴁ�.≮
-N;	\u200CႡ�\u200D.≮;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	Ⴁ�.≮
-T;	\u200CႡ�\u200D.<\u0338;	[C1 C2 P1 V6];	[P1 V6]	#	Ⴁ�.≮
-N;	\u200CႡ�\u200D.<\u0338;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	Ⴁ�.≮
-T;	\u200C��\u200D.<\u0338;	[C1 C2 P1 V6];	[P1 V6]	#	��.≮
-N;	\u200C��\u200D.<\u0338;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	��.≮
-T;	\u200C��\u200D.≮;	[C1 C2 P1 V6];	[P1 V6]	#	��.≮
-N;	\u200C��\u200D.≮;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	��.≮
-B;	xn--skjy82u.xn--gdh;	[V6];	[V6]
-B;	xn--0ugc160hb36e.xn--gdh;	[C1 C2 V6];	[C1 C2 V6]	#	��.≮
-B;	xn--8md0962c.xn--gdh;	[V6];	[V6]
-B;	xn--8md700fea3748f.xn--gdh;	[C1 C2 V6];	[C1 C2 V6]	#	Ⴁ�.≮
-T;	\u200C��\u200D．<\u0338;	[C1 C2 P1 V6];	[P1 V6]	#	��.≮
-N;	\u200C��\u200D．<\u0338;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	��.≮
-T;	\u200C��\u200D．≮;	[C1 C2 P1 V6];	[P1 V6]	#	��.≮
-N;	\u200C��\u200D．≮;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	��.≮
-T;	歷｡�≯󳛽\u200D;	[B1 C2 P1 V6];	[B1 P1 V6]	#	歷.�≯
-N;	歷｡�≯󳛽\u200D;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	歷.�≯
-T;	歷｡�>\u0338󳛽\u200D;	[B1 C2 P1 V6];	[B1 P1 V6]	#	歷.�≯
-N;	歷｡�>\u0338󳛽\u200D;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	歷.�≯
-T;	歷。�≯󳛽\u200D;	[B1 C2 P1 V6];	[B1 P1 V6]	#	歷.�≯
-N;	歷。�≯󳛽\u200D;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	歷.�≯
-T;	歷。�>\u0338󳛽\u200D;	[B1 C2 P1 V6];	[B1 P1 V6]	#	歷.�≯
-N;	歷。�>\u0338󳛽\u200D;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	歷.�≯
-B;	xn--nmw.xn--hdh7804gdms2h;	[B1 V6];	[B1 V6]
-B;	xn--nmw.xn--1ugx6gs128a1134j;	[B1 C2 V6];	[B1 C2 V6]	#	歷.�≯
-T;	\u0ECB\u200D．�󠰑;	[C2 P1 V5 V6];	[P1 V5 V6]	#	໋.�
-N;	\u0ECB\u200D．�󠰑;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	໋.�
-T;	\u0ECB\u200D.�󠰑;	[C2 P1 V5 V6];	[P1 V5 V6]	#	໋.�
-N;	\u0ECB\u200D.�󠰑;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	໋.�
-B;	xn--t8c.xn--iz4a43209d;	[V5 V6];	[V5 V6]	#	໋.�
-B;	xn--t8c059f.xn--iz4a43209d;	[C2 V5 V6];	[C2 V5 V6]	#	໋.�
-T;	\u200D\u200C𞤀｡𱘅�;	[B1 B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	𞤢.
-N;	\u200D\u200C𞤀｡𱘅�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 C1 C2 P1 V6]	#	𞤢.
-T;	\u200D\u200C𞤀。𱘅�;	[B1 B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	𞤢.
-N;	\u200D\u200C𞤀。𱘅�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 C1 C2 P1 V6]	#	𞤢.
-T;	\u200D\u200C𞤢。𱘅�;	[B1 B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	𞤢.
-N;	\u200D\u200C𞤢。𱘅�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 C1 C2 P1 V6]	#	𞤢.
-B;	xn--9d6h.xn--wh0dj799f;	[B5 B6 V6];	[B5 B6 V6]
-B;	xn--0ugb45126a.xn--wh0dj799f;	[B1 B5 B6 C1 C2 V6];	[B1 B5 B6 C1 C2 V6]	#	𞤢.
-T;	\u200D\u200C𞤢｡𱘅�;	[B1 B5 B6 C1 C2 P1 V6];	[B5 B6 P1 V6]	#	𞤢.
-N;	\u200D\u200C𞤢｡𱘅�;	[B1 B5 B6 C1 C2 P1 V6];	[B1 B5 B6 C1 C2 P1 V6]	#	𞤢.
-T;	\u0628≠�-.ς��≠;	[B3 B5 B6 P1 V3 V6];	[B3 B5 B6 P1 V3 V6]	#	ب≠9-.ς��≠
-N;	\u0628≠�-.ς��≠;	[B3 B5 B6 P1 V3 V6];	[B3 B5 B6 P1 V3 V6]	#	ب≠9-.ς��≠
-T;	\u0628=\u0338�-.ς��=\u0338;	[B3 B5 B6 P1 V3 V6];	[B3 B5 B6 P1 V3 V6]	#	ب≠9-.ς��≠
-N;	\u0628=\u0338�-.ς��=\u0338;	[B3 B5 B6 P1 V3 V6];	[B3 B5 B6 P1 V3 V6]	#	ب≠9-.ς��≠
-T;	\u0628≠9-.ς6.�≠;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	ب≠9-.ς6.�≠
-N;	\u0628≠9-.ς6.�≠;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	ب≠9-.ς6.�≠
-T;	\u0628=\u03389-.ς6.�=\u0338;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	ب≠9-.ς6.�≠
-N;	\u0628=\u03389-.ς6.�=\u0338;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	ب≠9-.ς6.�≠
-B;	\u0628=\u03389-.Σ6.�=\u0338;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	ب≠9-.σ6.�≠
-B;	\u0628≠9-.Σ6.�≠;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	ب≠9-.σ6.�≠
-B;	\u0628≠9-.σ6.�≠;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	ب≠9-.σ6.�≠
-B;	\u0628=\u03389-.σ6.�=\u0338;	[B1 B3 P1 V3 V6];	[B1 B3 P1 V3 V6]	#	ب≠9-.σ6.�≠
-B;	xn--9--etd0100a.xn--6-zmb.xn--1ch8704g;	[B1 B3 V3 V6];	[B1 B3 V3 V6]	#	ب≠9-.σ6.�≠
-B;	xn--9--etd0100a.xn--6-xmb.xn--1ch8704g;	[B1 B3 V3 V6];	[B1 B3 V3 V6]	#	ب≠9-.ς6.�≠
-B;	\u0628=\u0338�-.Σ��=\u0338;	[B3 B5 B6 P1 V3 V6];	[B3 B5 B6 P1 V3 V6]	#	ب≠9-.σ��≠
-B;	\u0628≠�-.Σ��≠;	[B3 B5 B6 P1 V3 V6];	[B3 B5 B6 P1 V3 V6]	#	ب≠9-.σ��≠
-B;	\u0628≠�-.σ��≠;	[B3 B5 B6 P1 V3 V6];	[B3 B5 B6 P1 V3 V6]	#	ب≠9-.σ��≠
-B;	\u0628=\u0338�-.σ��=\u0338;	[B3 B5 B6 P1 V3 V6];	[B3 B5 B6 P1 V3 V6]	#	ب≠9-.σ��≠
-B;	xn--9--etd0100a.xn--4xa887mzpbzz04b;	[B3 B5 B6 V3 V6];	[B3 B5 B6 V3 V6]	#	ب≠9-.σ��≠
-B;	xn--9--etd0100a.xn--3xa097mzpbzz04b;	[B3 B5 B6 V3 V6];	[B3 B5 B6 V3 V6]	#	ب≠9-.ς��≠
-B;	򉛴.-ᡢ\u0592�;	[P1 V3 V6];	[P1 V3 V6]	#	.-ᡢ֒�
-B;	xn--ep37b.xn----hec165lho83b;	[V3 V6];	[V3 V6]	#	.-ᡢ֒�
-T;	\u06CB⒈ß󠄽。�-;	[B2 B3 B6 P1 V3 V6];	[B2 B3 B6 P1 V3 V6]	#	ۋ⒈ß.-
-N;	\u06CB⒈ß󠄽。�-;	[B2 B3 B6 P1 V3 V6];	[B2 B3 B6 P1 V3 V6]	#	ۋ⒈ß.-
-T;	\u06CB1.ß󠄽。�-;	[B6 P1 V3 V6];	[B6 P1 V3 V6]	#	ۋ1.ß.-
-N;	\u06CB1.ß󠄽。�-;	[B6 P1 V3 V6];	[B6 P1 V3 V6]	#	ۋ1.ß.-
-B;	\u06CB1.SS󠄽。�-;	[B6 P1 V3 V6];	[B6 P1 V3 V6]	#	ۋ1.ss.-
-B;	\u06CB1.ss󠄽。�-;	[B6 P1 V3 V6];	[B6 P1 V3 V6]	#	ۋ1.ss.-
-B;	\u06CB1.Ss󠄽。�-;	[B6 P1 V3 V6];	[B6 P1 V3 V6]	#	ۋ1.ss.-
-B;	xn--1-cwc.ss.xn----q001f;	[B6 V3 V6];	[B6 V3 V6]	#	Û‹1.ss.-
-B;	xn--1-cwc.xn--zca.xn----q001f;	[B6 V3 V6];	[B6 V3 V6]	#	ۋ1.ß.-
-B;	\u06CB⒈SS󠄽。�-;	[B2 B3 B6 P1 V3 V6];	[B2 B3 B6 P1 V3 V6]	#	ۋ⒈ss.-
-B;	\u06CB⒈ss󠄽。�-;	[B2 B3 B6 P1 V3 V6];	[B2 B3 B6 P1 V3 V6]	#	ۋ⒈ss.-
-B;	\u06CB⒈Ss󠄽。�-;	[B2 B3 B6 P1 V3 V6];	[B2 B3 B6 P1 V3 V6]	#	ۋ⒈ss.-
-B;	xn--ss-d7d6651a.xn----q001f;	[B2 B3 B6 V3 V6];	[B2 B3 B6 V3 V6]	#	Û‹â’ˆss.-
-B;	xn--zca541ato3a.xn----q001f;	[B2 B3 B6 V3 V6];	[B2 B3 B6 V3 V6]	#	ۋ⒈ß.-
-T;	𿀫．\u1BAAςႦ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪ςႦ
-N;	𿀫．\u1BAAςႦ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪ςႦ
-T;	𿀫.\u1BAAςႦ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪ςႦ
-N;	𿀫.\u1BAAςႦ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪ςႦ
-T;	𿀫.\u1BAAςⴆ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪ςⴆ
-N;	𿀫.\u1BAAςⴆ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪ςⴆ
-T;	𿀫.\u1BAAΣႦ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪σႦ
-N;	𿀫.\u1BAAΣႦ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪σႦ
-T;	𿀫.\u1BAAσⴆ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪σⴆ
-N;	𿀫.\u1BAAσⴆ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪σⴆ
-T;	𿀫.\u1BAAΣⴆ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪σⴆ
-N;	𿀫.\u1BAAΣⴆ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪σⴆ
-B;	xn--nu4s.xn--4xa153j7im;	[V5 V6];	[V5 V6]	#	.᮪σⴆ
-B;	xn--nu4s.xn--4xa153jk8cs1q;	[C2 V5 V6];	[C2 V5 V6]	#	.᮪σⴆ
-B;	xn--nu4s.xn--4xa217dxri;	[V5 V6];	[V5 V6]	#	.᮪σႦ
-B;	xn--nu4s.xn--4xa217dxriome;	[C2 V5 V6];	[C2 V5 V6]	#	.᮪σႦ
-B;	xn--nu4s.xn--3xa353jk8cs1q;	[C2 V5 V6];	[C2 V5 V6]	#	.᮪ςⴆ
-B;	xn--nu4s.xn--3xa417dxriome;	[C2 V5 V6];	[C2 V5 V6]	#	.᮪ςႦ
-T;	𿀫．\u1BAAςⴆ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪ςⴆ
-N;	𿀫．\u1BAAςⴆ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪ςⴆ
-T;	𿀫．\u1BAAΣႦ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪σႦ
-N;	𿀫．\u1BAAΣႦ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪σႦ
-T;	𿀫．\u1BAAσⴆ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪σⴆ
-N;	𿀫．\u1BAAσⴆ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪σⴆ
-T;	𿀫．\u1BAAΣⴆ\u200D;	[C2 P1 V5 V6];	[P1 V5 V6]	#	.᮪σⴆ
-N;	𿀫．\u1BAAΣⴆ\u200D;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	.᮪σⴆ
-B;	⾆\u08E2.�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	舌.�
-B;	舌\u08E2.�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	舌.�
-B;	xn--l0b9413d.xn--kl1h;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	舌.�
-B;	⫞�𖫴。⭠⒈;	[B1 P1 V6];	[B1 P1 V6]
-B;	⫞�𖫴。⭠1.;	[B1];	[B1]
-B;	xn--53ix188et88b.xn--1-h6r.;	[B1];	[B1]
-B;	xn--53ix188et88b.xn--tsh52w;	[B1 V6];	[B1 V6]
-T;	⒈\u200C\uAAEC︒．\u0ACD;	[C1 P1 V5 V6];	[P1 V5 V6]	#	⒈ꫬ︒.�
-N;	⒈\u200C\uAAEC︒．\u0ACD;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	⒈ꫬ︒.�
-T;	1.\u200C\uAAEC。.\u0ACD;	[C1 V5 A4_2];	[V5 A4_2]	#	1.ꫬ..�
-N;	1.\u200C\uAAEC。.\u0ACD;	[C1 V5 A4_2];	[C1 V5 A4_2]	#	1.ꫬ..�
-B;	1.xn--sv9a..xn--mfc;	[V5 A4_2];	[V5 A4_2]	#	1.ꫬ..�
-B;	1.xn--0ug7185c..xn--mfc;	[C1 V5 A4_2];	[C1 V5 A4_2]	#	1.ꫬ..�
-B;	xn--tsh0720cse8b.xn--mfc;	[V5 V6];	[V5 V6]	#	⒈ꫬ︒.�
-B;	xn--0ug78o720myr1c.xn--mfc;	[C1 V5 V6];	[C1 V5 V6]	#	⒈ꫬ︒.�
-B;	\u0C46。䰀\u0668𞭅󠅼;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ె.䰀٨
-B;	xn--eqc.xn--hib5476aim6t;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	ె.䰀٨
-T;	ß\u200D.\u1BF2񄾼;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ß.᯲
-N;	ß\u200D.\u1BF2񄾼;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ß.᯲
-T;	SS\u200D.\u1BF2񄾼;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ss.᯲
-N;	SS\u200D.\u1BF2񄾼;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ss.᯲
-T;	ss\u200D.\u1BF2񄾼;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ss.᯲
-N;	ss\u200D.\u1BF2񄾼;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ss.᯲
-T;	Ss\u200D.\u1BF2񄾼;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ss.᯲
-N;	Ss\u200D.\u1BF2񄾼;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ss.᯲
-B;	ss.xn--0zf22107b;	[V5 V6];	[V5 V6]	#	ss.᯲
-B;	xn--ss-n1t.xn--0zf22107b;	[C2 V5 V6];	[C2 V5 V6]	#	ss.᯲
-B;	xn--zca870n.xn--0zf22107b;	[C2 V5 V6];	[C2 V5 V6]	#	ß.᯲
-T;	𑓂\u200C≮.≮;	[P1 V5 V6];	[P1 V5 V6]	#	𑓂≮.≮
-N;	𑓂\u200C≮.≮;	[P1 V5 V6];	[P1 V5 V6]	#	𑓂≮.≮
-T;	𑓂\u200C<\u0338.<\u0338;	[P1 V5 V6];	[P1 V5 V6]	#	𑓂≮.≮
-N;	𑓂\u200C<\u0338.<\u0338;	[P1 V5 V6];	[P1 V5 V6]	#	𑓂≮.≮
-B;	xn--gdhz656g.xn--gdh;	[V5 V6];	[V5 V6]
-B;	xn--0ugy6glz29a.xn--gdh;	[V5 V6];	[V5 V6]	#	𑓂≮.≮
-B;	🕼．\uFFA0;	[P1 V6];	[P1 V6]	#	🕼.
-B;	🕼.\u1160;	[P1 V6];	[P1 V6]	#	🕼.
-B;	xn--my8h.xn--psd;	[V6];	[V6]	#	🕼.
-B;	xn--my8h.xn--cl7c;	[V6];	[V6]	#	🕼.
-B;	ᡔ\uFD82。񷘎;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ᡔلحى.
-B;	ᡔ\u0644\u062D\u0649。񷘎;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ᡔلحى.
-B;	xn--sgb9bq785p.xn--bc31b;	[B5 B6 V6];	[B5 B6 V6]	#	ᡔلحى.
-B;	爕򳙑．�気;	[P1 V6];	[P1 V6]
-B;	爕򳙑.4気;	[P1 V6];	[P1 V6]
-B;	xn--1zxq3199c.xn--4-678b;	[V6];	[V6]
-B;	⒋�Ⴝ-．𞬪\u0DCA\u05B5;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	⒋�Ⴝ-.්ֵ
-B;	4.�Ⴝ-.𞬪\u0DCA\u05B5;	[B1 B6 P1 V3 V5 V6];	[B1 B6 P1 V3 V5 V6]	#	4.�Ⴝ-.්ֵ
-B;	4.��-.𞬪\u0DCA\u05B5;	[B1 B6 P1 V3 V5 V6];	[B1 B6 P1 V3 V5 V6]	#	4.��-.්ֵ
-B;	4.xn----wwsx259f.xn--ddb152b7y23b;	[B1 B6 V3 V5 V6];	[B1 B6 V3 V5 V6]	#	4.��-.්ֵ
-B;	4.xn----t1g9869q.xn--ddb152b7y23b;	[B1 B6 V3 V5 V6];	[B1 B6 V3 V5 V6]	#	4.�Ⴝ-.්ֵ
-B;	⒋��-．𞬪\u0DCA\u05B5;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	⒋��-.්ֵ
-B;	xn----jcp487avl3w.xn--ddb152b7y23b;	[B1 V3 V6];	[B1 V3 V6]	#	⒋��-.්ֵ
-B;	xn----t1g323mnk9t.xn--ddb152b7y23b;	[B1 V3 V6];	[B1 V3 V6]	#	⒋�Ⴝ-.්ֵ
-B;	�。򑆃񉢗--;	[P1 V2 V3 V6];	[P1 V2 V3 V6]
-B;	xn--2y75e.xn-----1l15eer88n;	[V2 V3 V6];	[V2 V3 V6]
-T;	\u200D\u07DF｡\u200C\uABED;	[B1 C1 C2];	[B1 B3 B6 V5]	#	ߟ.꯭
-N;	\u200D\u07DF｡\u200C\uABED;	[B1 C1 C2];	[B1 C1 C2]	#	ߟ.꯭
-T;	\u200D\u07DF。\u200C\uABED;	[B1 C1 C2];	[B1 B3 B6 V5]	#	ߟ.꯭
-N;	\u200D\u07DF。\u200C\uABED;	[B1 C1 C2];	[B1 C1 C2]	#	ߟ.꯭
-B;	xn--6sb.xn--429a;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ߟ.꯭
-B;	xn--6sb394j.xn--0ug1126c;	[B1 C1 C2];	[B1 C1 C2]	#	ߟ.꯭
-B;	𞮽\u07FF\u084E｡���;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ࡎ.��
-B;	𞮽\u07FF\u084E。���;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ࡎ.��
-B;	xn--3tb2nz468k.xn--69e8615j5rn5d;	[B5 B6 V6];	[B5 B6 V6]	#	ࡎ.��
-B;	\u06ED𞺌𑄚\u1714.ꡞ\u08B7;	[B1 B5 B6 V5];	[B1 B5 B6 V5]	#	ۭم𑄚᜔.ꡞࢷ
-B;	\u06ED\u0645𑄚\u1714.ꡞ\u08B7;	[B1 B5 B6 V5];	[B1 B5 B6 V5]	#	ۭم𑄚᜔.ꡞࢷ
-B;	xn--hhb94ag41b739u.xn--dzb5582f;	[B1 B5 B6 V5];	[B1 B5 B6 V5]	#	ۭم𑄚᜔.ꡞࢷ
-T;	񻂵킃𑘶\u07DC｡ς\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.ςؼς
-N;	񻂵킃𑘶\u07DC｡ς\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.ςؼς
-T;	񻂵�ᅳᆾ𑘶\u07DC｡ς\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.ςؼς
-N;	񻂵�ᅳᆾ𑘶\u07DC｡ς\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.ςؼς
-T;	񻂵킃𑘶\u07DC。ς\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.ςؼς
-N;	񻂵킃𑘶\u07DC。ς\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.ςؼς
-T;	񻂵�ᅳᆾ𑘶\u07DC。ς\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.ςؼς
-N;	񻂵�ᅳᆾ𑘶\u07DC。ς\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.ςؼς
-B;	񻂵�ᅳᆾ𑘶\u07DC。Σ\u063CΣ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵킃𑘶\u07DC。Σ\u063CΣ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵킃𑘶\u07DC。σ\u063Cσ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵�ᅳᆾ𑘶\u07DC。σ\u063Cσ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵�ᅳᆾ𑘶\u07DC。Σ\u063Cσ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵킃𑘶\u07DC。Σ\u063Cσ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	xn--3sb7483hoyvbbe76g.xn--4xaa21q;	[B5 B6 V6];	[B5 B6 V6]	#	킃𑘶ߜ.σؼσ
-T;	񻂵�ᅳᆾ𑘶\u07DC。Σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-N;	񻂵�ᅳᆾ𑘶\u07DC。Σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-T;	񻂵킃𑘶\u07DC。Σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-N;	񻂵킃𑘶\u07DC。Σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-T;	񻂵킃𑘶\u07DC。σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-N;	񻂵킃𑘶\u07DC。σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-T;	񻂵�ᅳᆾ𑘶\u07DC。σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-N;	񻂵�ᅳᆾ𑘶\u07DC。σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-B;	xn--3sb7483hoyvbbe76g.xn--3xab31q;	[B5 B6 V6];	[B5 B6 V6]	#	킃𑘶ߜ.σؼς
-B;	xn--3sb7483hoyvbbe76g.xn--3xaa51q;	[B5 B6 V6];	[B5 B6 V6]	#	킃𑘶ߜ.ςؼς
-B;	񻂵�ᅳᆾ𑘶\u07DC｡Σ\u063CΣ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵킃𑘶\u07DC｡Σ\u063CΣ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵킃𑘶\u07DC｡σ\u063Cσ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵�ᅳᆾ𑘶\u07DC｡σ\u063Cσ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵�ᅳᆾ𑘶\u07DC｡Σ\u063Cσ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-B;	񻂵킃𑘶\u07DC｡Σ\u063Cσ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼσ
-T;	񻂵�ᅳᆾ𑘶\u07DC｡Σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-N;	񻂵�ᅳᆾ𑘶\u07DC｡Σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-T;	񻂵킃𑘶\u07DC｡Σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-N;	񻂵킃𑘶\u07DC｡Σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-T;	񻂵킃𑘶\u07DC｡σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-N;	񻂵킃𑘶\u07DC｡σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-T;	񻂵�ᅳᆾ𑘶\u07DC｡σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-N;	񻂵�ᅳᆾ𑘶\u07DC｡σ\u063Cς;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	킃𑘶ߜ.σؼς
-B;	蔰。�\u08DD-𑈵;	[P1 V6];	[P1 V6]	#	蔰.�-𑈵
-B;	xn--sz1a.xn----mrd9984r3dl0i;	[V6];	[V6]	#	蔰.�-𑈵
-T;	ςჅ。\u075A;	[P1 V6];	[P1 V6]	#	ςჅ.ݚ
-N;	ςჅ。\u075A;	[P1 V6];	[P1 V6]	#	ςჅ.ݚ
-T;	ςⴥ。\u075A;	ςⴥ.\u075A;	xn--4xa203s.xn--epb	#	ςⴥ.ݚ
-N;	ςⴥ。\u075A;	ςⴥ.\u075A;	xn--3xa403s.xn--epb	#	ςⴥ.ݚ
-B;	ΣჅ。\u075A;	[P1 V6];	[P1 V6]	#	σჅ.ݚ
-B;	σⴥ。\u075A;	σⴥ.\u075A;	xn--4xa203s.xn--epb	#	σⴥ.ݚ
-B;	Σⴥ。\u075A;	σⴥ.\u075A;	xn--4xa203s.xn--epb	#	σⴥ.ݚ
-B;	xn--4xa203s.xn--epb;	σⴥ.\u075A;	xn--4xa203s.xn--epb	#	σⴥ.ݚ
-B;	σⴥ.\u075A;	;	xn--4xa203s.xn--epb	#	σⴥ.ݚ
-B;	ΣჅ.\u075A;	[P1 V6];	[P1 V6]	#	σჅ.ݚ
-B;	Σⴥ.\u075A;	σⴥ.\u075A;	xn--4xa203s.xn--epb	#	σⴥ.ݚ
-B;	xn--4xa477d.xn--epb;	[V6];	[V6]	#	σჅ.ݚ
-B;	xn--3xa403s.xn--epb;	Ï‚â´¥.\u075A;	xn--3xa403s.xn--epb	#	Ï‚â´¥.Ýš
-T;	Ï‚â´¥.\u075A;	;	xn--4xa203s.xn--epb	#	Ï‚â´¥.Ýš
-N;	Ï‚â´¥.\u075A;	;	xn--3xa403s.xn--epb	#	Ï‚â´¥.Ýš
-B;	xn--3xa677d.xn--epb;	[V6];	[V6]	#	ςჅ.ݚ
-B;	\u0C4DႩ𞰓．\u1B72;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	�Ⴉ.᭲
-B;	\u0C4DႩ𞰓.\u1B72;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	�Ⴉ.᭲
-B;	\u0C4Dⴉ𞰓.\u1B72;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	�ⴉ.᭲
-B;	xn--lqc478nlr02a.xn--dwf;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	�ⴉ.᭲
-B;	xn--lqc64t7t26c.xn--dwf;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	�Ⴉ.᭲
-B;	\u0C4Dⴉ𞰓．\u1B72;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	�ⴉ.᭲
-B;	⮷≮񎈴󠄟。�;	[B1 P1 V6];	[B1 P1 V6]
-B;	⮷<\u0338񎈴󠄟。�;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--gdh877a3513h.xn--pc9c;	[B1 V6];	[B1 V6]
-T;	\u06BC｡\u200D�\u200Cᡤ;	[B1 C1 C2];	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-N;	\u06BC｡\u200D�\u200Cᡤ;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-T;	\u06BC｡\u200Dy\u0307\u200Cᡤ;	[B1 C1 C2];	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-N;	\u06BC｡\u200Dy\u0307\u200Cᡤ;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-T;	\u06BC。\u200D�\u200Cᡤ;	[B1 C1 C2];	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-N;	\u06BC。\u200D�\u200Cᡤ;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-T;	\u06BC。\u200Dy\u0307\u200Cᡤ;	[B1 C1 C2];	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-N;	\u06BC。\u200Dy\u0307\u200Cᡤ;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-T;	\u06BC。\u200DY\u0307\u200Cᡤ;	[B1 C1 C2];	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-N;	\u06BC。\u200DY\u0307\u200Cᡤ;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-T;	\u06BC。\u200DẎ\u200Cᡤ;	[B1 C1 C2];	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-N;	\u06BC。\u200DẎ\u200Cᡤ;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-B;	xn--vkb.xn--08e172a;	\u06BC.�ᡤ;	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-B;	\u06BC.�ᡤ;	;	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-B;	\u06BC.y\u0307ᡤ;	\u06BC.�ᡤ;	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-B;	\u06BC.Y\u0307ᡤ;	\u06BC.�ᡤ;	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-B;	\u06BC.Ẏᡤ;	\u06BC.�ᡤ;	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-B;	xn--vkb.xn--08e172ax6aca;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-T;	\u06BC｡\u200DY\u0307\u200Cᡤ;	[B1 C1 C2];	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-N;	\u06BC｡\u200DY\u0307\u200Cᡤ;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-T;	\u06BC｡\u200DẎ\u200Cᡤ;	[B1 C1 C2];	xn--vkb.xn--08e172a	#	ڼ.�ᡤ
-N;	\u06BC｡\u200DẎ\u200Cᡤ;	[B1 C1 C2];	[B1 C1 C2]	#	ڼ.�ᡤ
-B;	�𑲛。�\u0DCA;	[B1 P1 V6];	[B1 P1 V6]	#	�𑲛.්
-B;	xn--xo0dg5v.xn--h1c39876d;	[B1 V6];	[B1 V6]	#	�𑲛.්
-B;	-≠𑈵｡嵕\uFEF1۴\uA953;	[B1 B5 P1 V3 V6];	[B1 B5 P1 V3 V6]	#	-≠𑈵.嵕ي۴꥓
-B;	-=\u0338𑈵｡嵕\uFEF1۴\uA953;	[B1 B5 P1 V3 V6];	[B1 B5 P1 V3 V6]	#	-≠𑈵.嵕ي۴꥓
-B;	-≠𑈵。嵕\u064A۴\uA953;	[B1 B5 P1 V3 V6];	[B1 B5 P1 V3 V6]	#	-≠𑈵.嵕ي۴꥓
-B;	-=\u0338𑈵。嵕\u064A۴\uA953;	[B1 B5 P1 V3 V6];	[B1 B5 P1 V3 V6]	#	-≠𑈵.嵕ي۴꥓
-B;	xn----ufo4749h.xn--mhb45a235sns3c;	[B1 B5 V3 V6];	[B1 B5 V3 V6]	#	-≠𑈵.嵕ي۴꥓
-T;	\u200C��\u076E．\u06C1\u200D≯\u200D;	[B1 B3 C1 C2 P1 V6];	[B3 B5 B6 P1 V6]	#	�ݮ.�≯
-N;	\u200C��\u076E．\u06C1\u200D≯\u200D;	[B1 B3 C1 C2 P1 V6];	[B1 B3 C1 C2 P1 V6]	#	�ݮ.�≯
-T;	\u200C��\u076E．\u06C1\u200D>\u0338\u200D;	[B1 B3 C1 C2 P1 V6];	[B3 B5 B6 P1 V6]	#	�ݮ.�≯
-N;	\u200C��\u076E．\u06C1\u200D>\u0338\u200D;	[B1 B3 C1 C2 P1 V6];	[B1 B3 C1 C2 P1 V6]	#	�ݮ.�≯
-T;	\u200C��\u076E.\u06C1\u200D≯\u200D;	[B1 B3 C1 C2 P1 V6];	[B3 B5 B6 P1 V6]	#	�ݮ.�≯
-N;	\u200C��\u076E.\u06C1\u200D≯\u200D;	[B1 B3 C1 C2 P1 V6];	[B1 B3 C1 C2 P1 V6]	#	�ݮ.�≯
-T;	\u200C��\u076E.\u06C1\u200D>\u0338\u200D;	[B1 B3 C1 C2 P1 V6];	[B3 B5 B6 P1 V6]	#	�ݮ.�≯
-N;	\u200C��\u076E.\u06C1\u200D>\u0338\u200D;	[B1 B3 C1 C2 P1 V6];	[B1 B3 C1 C2 P1 V6]	#	�ݮ.�≯
-B;	xn--ypb5875khz9y.xn--0kb682l;	[B3 B5 B6 V6];	[B3 B5 B6 V6]	#	�ݮ.�≯
-B;	xn--ypb717jrx2o7v94a.xn--0kb660ka35v;	[B1 B3 C1 C2 V6];	[B1 B3 C1 C2 V6]	#	�ݮ.�≯
-B;	≮．\u17B5\u0855�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≮.ࡕ�
-B;	<\u0338．\u17B5\u0855�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≮.ࡕ�
-B;	≮.\u17B5\u0855�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≮.ࡕ�
-B;	<\u0338.\u17B5\u0855�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≮.ࡕ�
-B;	xn--gdh.xn--kwb589e217p;	[B1 V5 V6];	[B1 V5 V6]	#	≮.ࡕ�
-T;	�\u200D｡ႩႵ;	[B3 C2 P1 V6];	[P1 V6]	#	�.ႩႵ
-N;	�\u200D｡ႩႵ;	[B3 C2 P1 V6];	[B3 C2 P1 V6]	#	�.ႩႵ
-T;	�\u200D。ႩႵ;	[B3 C2 P1 V6];	[P1 V6]	#	�.ႩႵ
-N;	�\u200D。ႩႵ;	[B3 C2 P1 V6];	[B3 C2 P1 V6]	#	�.ႩႵ
-T;	�\u200D。ⴉⴕ;	[B3 C2];	xn--pt9c.xn--0kjya	#	�.ⴉⴕ
-N;	�\u200D。ⴉⴕ;	[B3 C2];	[B3 C2]	#	�.ⴉⴕ
-T;	�\u200D。Ⴉⴕ;	[B3 C2 P1 V6];	[P1 V6]	#	�.Ⴉⴕ
-N;	�\u200D。Ⴉⴕ;	[B3 C2 P1 V6];	[B3 C2 P1 V6]	#	�.Ⴉⴕ
-B;	xn--pt9c.xn--hnd666l;	[V6];	[V6]
-B;	xn--1ug4933g.xn--hnd666l;	[B3 C2 V6];	[B3 C2 V6]	#	�.Ⴉⴕ
-B;	xn--pt9c.xn--0kjya;	�.ⴉⴕ;	xn--pt9c.xn--0kjya;	NV8
-B;	�.ⴉⴕ;	;	xn--pt9c.xn--0kjya;	NV8
-B;	�.ႩႵ;	[P1 V6];	[P1 V6]
-B;	�.Ⴉⴕ;	[P1 V6];	[P1 V6]
-B;	xn--pt9c.xn--hndy;	[V6];	[V6]
-B;	xn--1ug4933g.xn--0kjya;	[B3 C2];	[B3 C2]	#	�.ⴉⴕ
-B;	xn--1ug4933g.xn--hndy;	[B3 C2 V6];	[B3 C2 V6]	#	�.ႩႵ
-T;	�\u200D｡ⴉⴕ;	[B3 C2];	xn--pt9c.xn--0kjya	#	�.ⴉⴕ
-N;	�\u200D｡ⴉⴕ;	[B3 C2];	[B3 C2]	#	�.ⴉⴕ
-T;	�\u200D｡Ⴉⴕ;	[B3 C2 P1 V6];	[P1 V6]	#	�.Ⴉⴕ
-N;	�\u200D｡Ⴉⴕ;	[B3 C2 P1 V6];	[B3 C2 P1 V6]	#	�.Ⴉⴕ
-T;	\u200C\u200Cㄤ．\u032E󕨑\u09C2;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ㄤ.̮ূ
-N;	\u200C\u200Cㄤ．\u032E󕨑\u09C2;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ㄤ.̮ূ
-T;	\u200C\u200Cㄤ.\u032E󕨑\u09C2;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ㄤ.̮ূ
-N;	\u200C\u200Cㄤ.\u032E󕨑\u09C2;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ㄤ.̮ূ
-B;	xn--1fk.xn--vta284a9o563a;	[V5 V6];	[V5 V6]	#	ㄤ.̮ূ
-B;	xn--0uga242k.xn--vta284a9o563a;	[C1 V5 V6];	[C1 V5 V6]	#	ㄤ.̮ূ
-T;	�｡-\u200C�Ⴗ;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	�.-�Ⴗ
-N;	�｡-\u200C�Ⴗ;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	�.-�Ⴗ
-T;	�。-\u200C�Ⴗ;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	�.-�Ⴗ
-N;	�。-\u200C�Ⴗ;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	�.-�Ⴗ
-T;	�。-\u200C�ⴗ;	[B1 C1 V3];	[B1 V3]	#	�.-�ⴗ
-N;	�。-\u200C�ⴗ;	[B1 C1 V3];	[B1 C1 V3]	#	�.-�ⴗ
-B;	xn--v97c.xn----lws0526f;	[B1 V3];	[B1 V3]
-B;	xn--v97c.xn----sgnv20du99s;	[B1 C1 V3];	[B1 C1 V3]	#	�.-�ⴗ
-B;	xn--v97c.xn----i1g2513q;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn--v97c.xn----i1g888ih12u;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	�.-�Ⴗ
-T;	�｡-\u200C�ⴗ;	[B1 C1 V3];	[B1 V3]	#	�.-�ⴗ
-N;	�｡-\u200C�ⴗ;	[B1 C1 V3];	[B1 C1 V3]	#	�.-�ⴗ
-T;	🙑�．≠\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	🙑.≠
-N;	🙑�．≠\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	🙑.≠
-T;	🙑�．=\u0338\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	🙑.≠
-N;	🙑�．=\u0338\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	🙑.≠
-T;	🙑�.≠\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	🙑.≠
-N;	🙑�.≠\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	🙑.≠
-T;	🙑�.=\u0338\u200C;	[B1 C1 P1 V6];	[B1 P1 V6]	#	🙑.≠
-N;	🙑�.=\u0338\u200C;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	🙑.≠
-B;	xn--bl0dh970b.xn--1ch;	[B1 V6];	[B1 V6]
-B;	xn--bl0dh970b.xn--0ug83g;	[B1 C1 V6];	[B1 C1 V6]	#	🙑.≠
-B;	\u064C\u1CD2｡𞮞\u2D7F⧎;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	ٌ᳒.⵿⧎
-B;	\u064C\u1CD2。𞮞\u2D7F⧎;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	ٌ᳒.⵿⧎
-B;	xn--ohb646i.xn--ewi38jf765c;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	ٌ᳒.⵿⧎
-B;	Ⴔ�₃�．�𑂹\u0B82;	[P1 V6];	[P1 V6]	#	Ⴔ�3.7𑂹ஂ
-B;	Ⴔ�3�.7𑂹\u0B82;	[P1 V6];	[P1 V6]	#	Ⴔ�3.7𑂹ஂ
-B;	ⴔ�3�.7𑂹\u0B82;	[P1 V6];	[P1 V6]	#	ⴔ�3.7𑂹ஂ
-B;	xn--3-ews6985n35s3g.xn--7-cve6271r;	[V6];	[V6]	#	ⴔ�3.7𑂹ஂ
-B;	xn--3-b1g83426a35t0g.xn--7-cve6271r;	[V6];	[V6]	#	Ⴔ�3.7𑂹ஂ
-B;	ⴔ�₃�．�𑂹\u0B82;	[P1 V6];	[P1 V6]	#	ⴔ�3.7𑂹ஂ
-T;	�\u200C。\u200C⒈񱢕;	[C1 P1 V6];	[P1 V6]	#	�.⒈
-N;	�\u200C。\u200C⒈񱢕;	[C1 P1 V6];	[C1 P1 V6]	#	�.⒈
-T;	�\u200C。\u200C1.񱢕;	[C1 P1 V6];	[P1 V6]	#	�.1.
-N;	�\u200C。\u200C1.񱢕;	[C1 P1 V6];	[C1 P1 V6]	#	�.1.
-B;	xn--eco.1.xn--ms39a;	[V6];	[V6]
-B;	xn--0ug491l.xn--1-rgn.xn--ms39a;	[C1 V6];	[C1 V6]	#	�.1.
-B;	xn--eco.xn--tsh21126d;	[V6];	[V6]
-B;	xn--0ug491l.xn--0ug88oot66q;	[C1 V6];	[C1 V6]	#	�.⒈
-T;	１\uAAF6ß𑲥｡\u1DD8;	[V5];	[V5]	#	1꫶ß𑲥.ᷘ
-N;	１\uAAF6ß𑲥｡\u1DD8;	[V5];	[V5]	#	1꫶ß𑲥.ᷘ
-T;	1\uAAF6ß𑲥。\u1DD8;	[V5];	[V5]	#	1꫶ß𑲥.ᷘ
-N;	1\uAAF6ß𑲥。\u1DD8;	[V5];	[V5]	#	1꫶ß𑲥.ᷘ
-B;	1\uAAF6SS𑲥。\u1DD8;	[V5];	[V5]	#	1꫶ss𑲥.ᷘ
-B;	1\uAAF6ss𑲥。\u1DD8;	[V5];	[V5]	#	1꫶ss𑲥.ᷘ
-B;	1\uAAF6Ss𑲥。\u1DD8;	[V5];	[V5]	#	1꫶ss𑲥.ᷘ
-B;	xn--1ss-ir6ln166b.xn--weg;	[V5];	[V5]	#	1꫶ss𑲥.ᷘ
-B;	xn--1-qfa2471kdb0d.xn--weg;	[V5];	[V5]	#	1꫶ß𑲥.ᷘ
-B;	１\uAAF6SS𑲥｡\u1DD8;	[V5];	[V5]	#	1꫶ss𑲥.ᷘ
-B;	１\uAAF6ss𑲥｡\u1DD8;	[V5];	[V5]	#	1꫶ss𑲥.ᷘ
-B;	１\uAAF6Ss𑲥｡\u1DD8;	[V5];	[V5]	#	1꫶ss𑲥.ᷘ
-T;	\u200D񫶩𞪯\u0CCD｡\u077C⒈;	[B1 C2 P1 V6];	[B5 B6 P1 V6]	#	�.ݼ⒈
-N;	\u200D񫶩𞪯\u0CCD｡\u077C⒈;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.ݼ⒈
-T;	\u200D񫶩𞪯\u0CCD。\u077C1.;	[B1 C2 P1 V6];	[B5 B6 P1 V6]	#	�.ݼ1.
-N;	\u200D񫶩𞪯\u0CCD。\u077C1.;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.ݼ1.
-B;	xn--8tc9875v5is1a.xn--1-g6c.;	[B5 B6 V6];	[B5 B6 V6]	#	�.ݼ1.
-B;	xn--8tc969gzn94a4lm8a.xn--1-g6c.;	[B1 C2 V6];	[B1 C2 V6]	#	�.ݼ1.
-B;	xn--8tc9875v5is1a.xn--dqb689l;	[B5 B6 V6];	[B5 B6 V6]	#	�.ݼ⒈
-B;	xn--8tc969gzn94a4lm8a.xn--dqb689l;	[B1 C2 V6];	[B1 C2 V6]	#	�.ݼ⒈
-B;	\u1AB6．𞤳򓢖򻉒\u07D7;	[B1 B2 B3 B6 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	᪶.𞤳ߗ
-B;	\u1AB6.𞤳򓢖򻉒\u07D7;	[B1 B2 B3 B6 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	᪶.𞤳ߗ
-B;	\u1AB6.𞤑򓢖򻉒\u07D7;	[B1 B2 B3 B6 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	᪶.𞤳ߗ
-B;	xn--zqf.xn--ysb9657vuiz5bj0ep;	[B1 B2 B3 B6 V5 V6];	[B1 B2 B3 B6 V5 V6]	#	᪶.𞤳ߗ
-B;	\u1AB6．𞤑򓢖򻉒\u07D7;	[B1 B2 B3 B6 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	᪶.𞤳ߗ
-B;	\u0842𞩚⒈．󠬌８�\u0770;	[B1 P1 V6];	[B1 P1 V6]	#	ࡂ⒈.8ݰ
-B;	\u0842𞩚1..󠬌8�\u0770;	[B1 P1 V6 A4_2];	[B1 P1 V6 A4_2]	#	ࡂ1..8ݰ
-B;	xn--1-rid26318a..xn--8-s5c22427ox454a;	[B1 V6 A4_2];	[B1 V6 A4_2]	#	à¡‚1..8Ý°
-B;	xn--0vb095ldg52a.xn--8-s5c22427ox454a;	[B1 V6];	[B1 V6]	#	à¡‚â’ˆ.8Ý°
-B;	\u0361�\u0369ᡷ。-󠰛鞰;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	͡�ͩᡷ.-鞰
-B;	xn--cvaq482npv5t.xn----yg7dt1332g;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	͡�ͩᡷ.-鞰
-T;	-.\u0ACD剘ß�;	[B1 V3 V5];	[B1 V3 V5]	#	-.�剘ß�
-N;	-.\u0ACD剘ß�;	[B1 V3 V5];	[B1 V3 V5]	#	-.�剘ß�
-B;	-.\u0ACD剘SS�;	[B1 V3 V5];	[B1 V3 V5]	#	-.�剘ss�
-B;	-.\u0ACD剘ss�;	[B1 V3 V5];	[B1 V3 V5]	#	-.�剘ss�
-B;	-.\u0ACD剘Ss�;	[B1 V3 V5];	[B1 V3 V5]	#	-.�剘ss�
-B;	-.xn--ss-bqg4734erywk;	[B1 V3 V5];	[B1 V3 V5]	#	-.�剘ss�
-B;	-.xn--zca791c493duf8i;	[B1 V3 V5];	[B1 V3 V5]	#	-.�剘ß�
-B;	\u08FB𞵸｡-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ࣻ.-
-B;	\u08FB𞵸。-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ࣻ.-
-B;	xn--b1b2719v.-;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	ࣻ.-
-B;	⒈󠈻�｡≠\u0603�;	[B1 P1 V6];	[B1 P1 V6]	#	⒈�.≠�
-B;	⒈󠈻�｡=\u0338\u0603�;	[B1 P1 V6];	[B1 P1 V6]	#	⒈�.≠�
-B;	1.󠈻�。≠\u0603�;	[B1 P1 V6];	[B1 P1 V6]	#	1.�.≠�
-B;	1.󠈻�。=\u0338\u0603�;	[B1 P1 V6];	[B1 P1 V6]	#	1.�.≠�
-B;	1.xn--qo0dl3077c.xn--lfb536lb35n;	[B1 V6];	[B1 V6]	#	1.�.≠�
-B;	xn--tshw766f1153g.xn--lfb536lb35n;	[B1 V6];	[B1 V6]	#	⒈�.≠�
-T;	�󠈚Ⴎ\u200C.㖾�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	�Ⴎ.㖾�
-N;	�󠈚Ⴎ\u200C.㖾�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	�Ⴎ.㖾�
-T;	�󠈚ⴎ\u200C.㖾�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	�ⴎ.㖾�
-N;	�󠈚ⴎ\u200C.㖾�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	�ⴎ.㖾�
-B;	xn--5kjx323em053g.xn--pelu572d;	[B1 B5 B6 V6];	[B1 B5 B6 V6]
-B;	xn--0ug342clq0pqxv4i.xn--pelu572d;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	�ⴎ.㖾�
-B;	xn--mnd9001km0o0g.xn--pelu572d;	[B1 B5 B6 V6];	[B1 B5 B6 V6]
-B;	xn--mnd289ezj4pqxp0i.xn--pelu572d;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	�Ⴎ.㖾�
-B;	򩼗．\u07C7ᡖႳႧ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	.߇ᡖႳႧ
-B;	򩼗.\u07C7ᡖႳႧ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	.߇ᡖႳႧ
-B;	򩼗.\u07C7ᡖⴓⴇ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	.߇ᡖⴓⴇ
-B;	򩼗.\u07C7ᡖႳⴇ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	.߇ᡖႳⴇ
-B;	xn--te28c.xn--isb286btrgo7w;	[B2 B3 V6];	[B2 B3 V6]	#	.߇ᡖႳⴇ
-B;	xn--te28c.xn--isb295fbtpmb;	[B2 B3 V6];	[B2 B3 V6]	#	.߇ᡖⴓⴇ
-B;	xn--te28c.xn--isb856b9a631d;	[B2 B3 V6];	[B2 B3 V6]	#	.߇ᡖႳႧ
-B;	򩼗．\u07C7ᡖⴓⴇ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	.߇ᡖⴓⴇ
-B;	򩼗．\u07C7ᡖႳⴇ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	.߇ᡖႳⴇ
-T;	\u200D�.\u06B3\u0775;	[B1 C2 P1 V6];	[P1 V6]	#	.ڳݵ
-N;	\u200D�.\u06B3\u0775;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	.ڳݵ
-B;	xn--3j78f.xn--mkb20b;	[V6];	[V6]	#	.ڳݵ
-B;	xn--1ug39444n.xn--mkb20b;	[B1 C2 V6];	[B1 C2 V6]	#	.ڳݵ
-B;	𲤱⒛⾳．ꡦ⒈;	[P1 V6];	[P1 V6]
-B;	𲤱20.音.ꡦ1.;	[P1 V6];	[P1 V6]
-B;	xn--20-9802c.xn--0w5a.xn--1-eg4e.;	[V6];	[V6]
-B;	xn--dth6033bzbvx.xn--tsh9439b;	[V6];	[V6]
-B;	\u07DC８񳦓-｡򞲙��\u09CD;	[B2 B3 B5 B6 P1 V3 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	ߜ8-.���
-B;	\u07DC8񳦓-。򞲙��\u09CD;	[B2 B3 B5 B6 P1 V3 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	ߜ8-.���
-B;	xn--8--rve13079p.xn--b7b9842k42df776x;	[B2 B3 B5 B6 V3 V6];	[B2 B3 B5 B6 V3 V6]	#	ߜ8-.���
-T;	Ⴕ。۰≮ß\u0745;	[P1 V6];	[P1 V6]	#	Ⴕ.۰≮ß݅
-N;	Ⴕ。۰≮ß\u0745;	[P1 V6];	[P1 V6]	#	Ⴕ.۰≮ß݅
-T;	Ⴕ。۰<\u0338ß\u0745;	[P1 V6];	[P1 V6]	#	Ⴕ.۰≮ß݅
-N;	Ⴕ。۰<\u0338ß\u0745;	[P1 V6];	[P1 V6]	#	Ⴕ.۰≮ß݅
-T;	ⴕ。۰<\u0338ß\u0745;	[P1 V6];	[P1 V6]	#	ⴕ.۰≮ß݅
-N;	ⴕ。۰<\u0338ß\u0745;	[P1 V6];	[P1 V6]	#	ⴕ.۰≮ß݅
-T;	ⴕ。۰≮ß\u0745;	[P1 V6];	[P1 V6]	#	ⴕ.۰≮ß݅
-N;	ⴕ。۰≮ß\u0745;	[P1 V6];	[P1 V6]	#	ⴕ.۰≮ß݅
-B;	Ⴕ。۰≮SS\u0745;	[P1 V6];	[P1 V6]	#	Ⴕ.۰≮ss݅
-B;	Ⴕ。۰<\u0338SS\u0745;	[P1 V6];	[P1 V6]	#	Ⴕ.۰≮ss݅
-B;	ⴕ。۰<\u0338ss\u0745;	[P1 V6];	[P1 V6]	#	ⴕ.۰≮ss݅
-B;	ⴕ。۰≮ss\u0745;	[P1 V6];	[P1 V6]	#	ⴕ.۰≮ss݅
-B;	Ⴕ。۰≮Ss\u0745;	[P1 V6];	[P1 V6]	#	Ⴕ.۰≮ss݅
-B;	Ⴕ。۰<\u0338Ss\u0745;	[P1 V6];	[P1 V6]	#	Ⴕ.۰≮ss݅
-B;	xn--tnd.xn--ss-jbe65aw27i;	[V6];	[V6]	#	Ⴕ.۰≮ss݅
-B;	xn--dlj.xn--ss-jbe65aw27i;	[V6];	[V6]	#	ⴕ.۰≮ss݅
-B;	xn--dlj.xn--zca912alh227g;	[V6];	[V6]	#	ⴕ.۰≮ß݅
-B;	xn--tnd.xn--zca912alh227g;	[V6];	[V6]	#	Ⴕ.۰≮ß݅
-B;	\u07E9-.�꒱\u1B72;	[B1 B3 V3 V5];	[B1 B3 V3 V5]	#	ߩ-.�꒱᭲
-B;	xn----odd.xn--dwf8994dc8wj;	[B1 B3 V3 V5];	[B1 B3 V3 V5]	#	ߩ-.�꒱᭲
-T;	𞼸\u200C.≯䕵⫧;	[B1 B3 C1 P1 V6];	[B1 P1 V6]	#	.≯䕵⫧
-N;	𞼸\u200C.≯䕵⫧;	[B1 B3 C1 P1 V6];	[B1 B3 C1 P1 V6]	#	.≯䕵⫧
-T;	𞼸\u200C.>\u0338䕵⫧;	[B1 B3 C1 P1 V6];	[B1 P1 V6]	#	.≯䕵⫧
-N;	𞼸\u200C.>\u0338䕵⫧;	[B1 B3 C1 P1 V6];	[B1 B3 C1 P1 V6]	#	.≯䕵⫧
-B;	xn--sn7h.xn--hdh754ax6w;	[B1 V6];	[B1 V6]
-B;	xn--0ugx453p.xn--hdh754ax6w;	[B1 B3 C1 V6];	[B1 B3 C1 V6]	#	.≯䕵⫧
-T;	�ß\uFC57.\u06AC۳︒;	[B1 B3 P1 V5 V6];	[B1 B3 P1 V5 V6]	#	�ßيخ.ڬ۳︒
-N;	�ß\uFC57.\u06AC۳︒;	[B1 B3 P1 V5 V6];	[B1 B3 P1 V5 V6]	#	�ßيخ.ڬ۳︒
-T;	�ß\u064A\u062E.\u06AC۳。;	[B1 V5];	[B1 V5]	#	�ßيخ.ڬ۳.
-N;	�ß\u064A\u062E.\u06AC۳。;	[B1 V5];	[B1 V5]	#	�ßيخ.ڬ۳.
-B;	�SS\u064A\u062E.\u06AC۳。;	[B1 V5];	[B1 V5]	#	�ssيخ.ڬ۳.
-B;	�ss\u064A\u062E.\u06AC۳。;	[B1 V5];	[B1 V5]	#	�ssيخ.ڬ۳.
-B;	�Ss\u064A\u062E.\u06AC۳。;	[B1 V5];	[B1 V5]	#	�ssيخ.ڬ۳.
-B;	xn--ss-ytd5i7765l.xn--fkb6l.;	[B1 V5];	[B1 V5]	#	�ssيخ.ڬ۳.
-B;	xn--zca23yncs877j.xn--fkb6l.;	[B1 V5];	[B1 V5]	#	�ßيخ.ڬ۳.
-B;	�SS\uFC57.\u06AC۳︒;	[B1 B3 P1 V5 V6];	[B1 B3 P1 V5 V6]	#	�ssيخ.ڬ۳︒
-B;	�ss\uFC57.\u06AC۳︒;	[B1 B3 P1 V5 V6];	[B1 B3 P1 V5 V6]	#	�ssيخ.ڬ۳︒
-B;	�Ss\uFC57.\u06AC۳︒;	[B1 B3 P1 V5 V6];	[B1 B3 P1 V5 V6]	#	�ssيخ.ڬ۳︒
-B;	xn--ss-ytd5i7765l.xn--fkb6lp314e;	[B1 B3 V5 V6];	[B1 B3 V5 V6]	#	�ssيخ.ڬ۳︒
-B;	xn--zca23yncs877j.xn--fkb6lp314e;	[B1 B3 V5 V6];	[B1 B3 V5 V6]	#	�ßيخ.ڬ۳︒
-B;	-≮🡒\u1CED.�Ⴁ\u0714;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-≮🡒᳭.Ⴁܔ
-B;	-<\u0338🡒\u1CED.�Ⴁ\u0714;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-≮🡒᳭.Ⴁܔ
-B;	-<\u0338🡒\u1CED.��\u0714;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-≮🡒᳭.�ܔ
-B;	-≮🡒\u1CED.��\u0714;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-≮🡒᳭.�ܔ
-B;	xn----44l04zxt68c.xn--enb135qf106f;	[B1 V3 V6];	[B1 V3 V6]	#	-≮🡒᳭.�ܔ
-B;	xn----44l04zxt68c.xn--enb300c1597h;	[B1 V3 V6];	[B1 V3 V6]	#	-≮🡒᳭.Ⴁܔ
-T;	𞤨｡�\u200D\u200C;	[B6 C1 C2];	xn--ge6h.xn--oc9a	#	𞤨.�
-N;	𞤨｡�\u200D\u200C;	[B6 C1 C2];	[B6 C1 C2]	#	𞤨.�
-T;	𞤨。�\u200D\u200C;	[B6 C1 C2];	xn--ge6h.xn--oc9a	#	𞤨.�
-N;	𞤨。�\u200D\u200C;	[B6 C1 C2];	[B6 C1 C2]	#	𞤨.�
-T;	𞤆。�\u200D\u200C;	[B6 C1 C2];	xn--ge6h.xn--oc9a	#	𞤨.�
-N;	𞤆。�\u200D\u200C;	[B6 C1 C2];	[B6 C1 C2]	#	𞤨.�
-B;	xn--ge6h.xn--oc9a;	𞤨.�;	xn--ge6h.xn--oc9a
-B;	𞤨.�;	;	xn--ge6h.xn--oc9a
-B;	𞤆.�;	𞤨.�;	xn--ge6h.xn--oc9a
-B;	xn--ge6h.xn--0ugb9575h;	[B6 C1 C2];	[B6 C1 C2]	#	𞤨.�
-T;	𞤆｡�\u200D\u200C;	[B6 C1 C2];	xn--ge6h.xn--oc9a	#	𞤨.�
-N;	𞤆｡�\u200D\u200C;	[B6 C1 C2];	[B6 C1 C2]	#	𞤨.�
-B;	󠅹𑂶．ᢌ𑂹\u0669;	[B1 B3 B5 B6 V5];	[B1 B3 B5 B6 V5]	#	𑂶.ᢌ𑂹٩
-B;	󠅹𑂶.ᢌ𑂹\u0669;	[B1 B3 B5 B6 V5];	[B1 B3 B5 B6 V5]	#	𑂶.ᢌ𑂹٩
-B;	xn--b50d.xn--iib993gyp5p;	[B1 B3 B5 B6 V5];	[B1 B3 B5 B6 V5]	#	𑂶.ᢌ𑂹٩
-B;	Ⅎ󠅺�。≯⾑;	[P1 V6];	[P1 V6]
-B;	Ⅎ󠅺�。>\u0338⾑;	[P1 V6];	[P1 V6]
-B;	Ⅎ󠅺�。≯襾;	[P1 V6];	[P1 V6]
-B;	Ⅎ󠅺�。>\u0338襾;	[P1 V6];	[P1 V6]
-B;	ⅎ󠅺�。>\u0338襾;	[P1 V6];	[P1 V6]
-B;	ⅎ󠅺�。≯襾;	[P1 V6];	[P1 V6]
-B;	xn--73g39298c.xn--hdhz171b;	[V6];	[V6]
-B;	xn--f3g73398c.xn--hdhz171b;	[V6];	[V6]
-B;	ⅎ󠅺�。>\u0338⾑;	[P1 V6];	[P1 V6]
-B;	ⅎ󠅺�。≯⾑;	[P1 V6];	[P1 V6]
-T;	ς\u200D\u0DD4\u0660｡-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 V3]	#	ςු٠.-
-N;	ς\u200D\u0DD4\u0660｡-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 C2 V3]	#	ςු٠.-
-T;	ς\u200D\u0DD4\u0660。-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 V3]	#	ςු٠.-
-N;	ς\u200D\u0DD4\u0660。-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 C2 V3]	#	ςු٠.-
-T;	Σ\u200D\u0DD4\u0660。-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 V3]	#	σු٠.-
-N;	Σ\u200D\u0DD4\u0660。-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 C2 V3]	#	σු٠.-
-T;	σ\u200D\u0DD4\u0660。-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 V3]	#	σු٠.-
-N;	σ\u200D\u0DD4\u0660。-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 C2 V3]	#	σු٠.-
-B;	xn--4xa25ks2j.-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	σු٠.-
-B;	xn--4xa25ks2jenu.-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 C2 V3]	#	σු٠.-
-B;	xn--3xa45ks2jenu.-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 C2 V3]	#	Ï‚à·”Ù .-
-T;	Σ\u200D\u0DD4\u0660｡-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 V3]	#	σු٠.-
-N;	Σ\u200D\u0DD4\u0660｡-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 C2 V3]	#	σු٠.-
-T;	σ\u200D\u0DD4\u0660｡-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 V3]	#	σු٠.-
-N;	σ\u200D\u0DD4\u0660｡-;	[B1 B5 B6 C2 V3];	[B1 B5 B6 C2 V3]	#	σු٠.-
-T;	\u200C.ßႩ-;	[C1 P1 V3 V6];	[P1 V3 V6 A4_2]	#	.ßႩ-
-N;	\u200C.ßႩ-;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.ßႩ-
-T;	\u200C.ßⴉ-;	[C1 V3];	[V3 A4_2]	#	.ßⴉ-
-N;	\u200C.ßⴉ-;	[C1 V3];	[C1 V3]	#	.ßⴉ-
-T;	\u200C.SSá‚©-;	[C1 P1 V3 V6];	[P1 V3 V6 A4_2]	#	.ssá‚©-
-N;	\u200C.SSá‚©-;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	.ssá‚©-
-T;	\u200C.ssâ´‰-;	[C1 V3];	[V3 A4_2]	#	.ssâ´‰-
-N;	\u200C.ssâ´‰-;	[C1 V3];	[C1 V3]	#	.ssâ´‰-
-T;	\u200C.Ssâ´‰-;	[C1 V3];	[V3 A4_2]	#	.ssâ´‰-
-N;	\u200C.Ssâ´‰-;	[C1 V3];	[C1 V3]	#	.ssâ´‰-
-B;	.xn--ss--bi1b;	[V3 A4_2];	[V3 A4_2]
-B;	xn--0ug.xn--ss--bi1b;	[C1 V3];	[C1 V3]	#	.ssâ´‰-
-B;	.xn--ss--4rn;	[V3 V6 A4_2];	[V3 V6 A4_2]
-B;	xn--0ug.xn--ss--4rn;	[C1 V3 V6];	[C1 V3 V6]	#	.ssá‚©-
-B;	xn--0ug.xn----pfa2305a;	[C1 V3];	[C1 V3]	#	.ßⴉ-
-B;	xn--0ug.xn----pfa042j;	[C1 V3 V6];	[C1 V3 V6]	#	.ßႩ-
-B;	��㓱。⾑;	[B5 P1 V6];	[B5 P1 V6]
-B;	��㓱。襾;	[B5 P1 V6];	[B5 P1 V6]
-B;	xn--u7kt691dlj09f.xn--9v2a;	[B5 V6];	[B5 V6]
-T;	\u06A0��≮。≯󠦗\u200D;	[B1 B3 C2 P1 V6];	[B1 B3 P1 V6]	#	ڠ��≮.≯
-N;	\u06A0��≮。≯󠦗\u200D;	[B1 B3 C2 P1 V6];	[B1 B3 C2 P1 V6]	#	ڠ��≮.≯
-T;	\u06A0��<\u0338。>\u0338󠦗\u200D;	[B1 B3 C2 P1 V6];	[B1 B3 P1 V6]	#	ڠ��≮.≯
-N;	\u06A0��<\u0338。>\u0338󠦗\u200D;	[B1 B3 C2 P1 V6];	[B1 B3 C2 P1 V6]	#	ڠ��≮.≯
-B;	xn--2jb053lf13nyoc.xn--hdh08821l;	[B1 B3 V6];	[B1 B3 V6]	#	ڠ��≮.≯
-B;	xn--2jb053lf13nyoc.xn--1ugx6gc8096c;	[B1 B3 C2 V6];	[B1 B3 C2 V6]	#	ڠ��≮.≯
-B;	�｡񃰶\u0777\u08B0⩋;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	6.ݷࢰ⩋
-B;	6。񃰶\u0777\u08B0⩋;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	6.ݷࢰ⩋
-B;	6.xn--7pb04do15eq748f;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	6.ݷࢰ⩋
-B;	-\uFCFD。�𑇀;	[B1 V3 V5];	[B1 V3 V5]	#	-شى.𑇀�
-B;	-\uFCFD。𑇀�;	[B1 V3 V5];	[B1 V3 V5]	#	-شى.𑇀�
-B;	-\u0634\u0649。𑇀�;	[B1 V3 V5];	[B1 V3 V5]	#	-شى.𑇀�
-B;	xn----qnc7d.xn--wd1d62a;	[B1 V3 V5];	[B1 V3 V5]	#	-شى.𑇀�
-T;	\u200C󠊶�.\u0D43��󊓶;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	1.ൃ�
-N;	\u200C󠊶�.\u0D43��󊓶;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	1.ൃ�
-T;	\u200C󠊶1.\u0D43��󊓶;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	1.ൃ�
-N;	\u200C󠊶1.\u0D43��󊓶;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	1.ൃ�
-B;	xn--1-f521m.xn--mxc0872kcu37dnmem;	[B1 V5 V6];	[B1 V5 V6]	#	1.ൃ�
-B;	xn--1-rgnu0071n.xn--mxc0872kcu37dnmem;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	1.ൃ�
-T;	齙--�.ß;	齙--4.ß;	xn----4-p16k.ss
-N;	齙--�.ß;	齙--4.ß;	xn----4-p16k.xn--zca
-T;	齙--4.ß;	;	xn----4-p16k.ss
-N;	齙--4.ß;	;	xn----4-p16k.xn--zca
-B;	é½™--4.SS;	é½™--4.ss;	xn----4-p16k.ss
-B;	é½™--4.ss;	;	xn----4-p16k.ss
-B;	é½™--4.Ss;	é½™--4.ss;	xn----4-p16k.ss
-B;	xn----4-p16k.ss;	é½™--4.ss;	xn----4-p16k.ss
-B;	xn----4-p16k.xn--zca;	齙--4.ß;	xn----4-p16k.xn--zca
-B;	齙--�.SS;	齙--4.ss;	xn----4-p16k.ss
-B;	齙--�.ss;	齙--4.ss;	xn----4-p16k.ss
-B;	齙--�.Ss;	齙--4.ss;	xn----4-p16k.ss
-T;	\u1BF2.�𞀖\u200C;	[B1 C1 V5];	[B1 V5]	#	᯲.�𞀖
-N;	\u1BF2.�𞀖\u200C;	[B1 C1 V5];	[B1 C1 V5]	#	᯲.�𞀖
-B;	xn--0zf.xn--9n0d2296a;	[B1 V5];	[B1 V5]	#	᯲.�𞀖
-B;	xn--0zf.xn--0ug9894grqqf;	[B1 C1 V5];	[B1 C1 V5]	#	᯲.�𞀖
-T;	󃲙󠋘｡\uDEDE-\u200D;	[C2 P1 V6];	[P1 V3 V6 A3]	#	.-
-N;	󃲙󠋘｡\uDEDE-\u200D;	[C2 P1 V6];	[C2 P1 V6 A3]	#	.-
-T;	󃲙󠋘。\uDEDE-\u200D;	[C2 P1 V6];	[P1 V3 V6 A3]	#	.-
-N;	󃲙󠋘。\uDEDE-\u200D;	[C2 P1 V6];	[C2 P1 V6 A3]	#	.-
-B;	xn--ct86d8w51a.\uDEDE-;	[P1 V3 V6];	[P1 V3 V6 A3]	#	.-
-B;	XN--CT86D8W51A.\uDEDE-;	[P1 V3 V6];	[P1 V3 V6 A3]	#	.-
-B;	Xn--Ct86d8w51a.\uDEDE-;	[P1 V3 V6];	[P1 V3 V6 A3]	#	.-
-T;	xn--ct86d8w51a.\uDEDE-\u200D;	[C2 P1 V6];	[P1 V3 V6 A3]	#	.-
-N;	xn--ct86d8w51a.\uDEDE-\u200D;	[C2 P1 V6];	[C2 P1 V6 A3]	#	.-
-T;	XN--CT86D8W51A.\uDEDE-\u200D;	[C2 P1 V6];	[P1 V3 V6 A3]	#	.-
-N;	XN--CT86D8W51A.\uDEDE-\u200D;	[C2 P1 V6];	[C2 P1 V6 A3]	#	.-
-T;	Xn--Ct86d8w51a.\uDEDE-\u200D;	[C2 P1 V6];	[P1 V3 V6 A3]	#	.-
-N;	Xn--Ct86d8w51a.\uDEDE-\u200D;	[C2 P1 V6];	[C2 P1 V6 A3]	#	.-
-B;	\u1A60．𞵷-�悎;	[B1 B2 B3 B6 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	᩠.-�悎
-B;	\u1A60.𞵷-�悎;	[B1 B2 B3 B6 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	᩠.-�悎
-B;	xn--jof.xn----gf4bq282iezpa;	[B1 B2 B3 B6 V5 V6];	[B1 B2 B3 B6 V5 V6]	#	᩠.-�悎
-B;	𛜯󠊛．𞤳�;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]
-B;	𛜯󠊛.𞤳�;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]
-B;	𛜯󠊛.𞤑�;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]
-B;	xn--xx5gy2741c.xn--re6hw266j;	[B2 B3 B6 V6];	[B2 B3 B6 V6]
-B;	𛜯󠊛．𞤑�;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]
-B;	\u071C�\u062E.�;	[B1];	[B1]	#	ܜ�خ.�
-B;	xn--tgb98b8643d.xn--m97c;	[B1];	[B1]	#	ܜ�خ.�
-B;	�𞤓\u0637\u08E2.\uDF56;	[P1 V6];	[P1 V6 A3]	#	𞤵ط.
-B;	�𞤵\u0637\u08E2.\uDF56;	[P1 V6];	[P1 V6 A3]	#	𞤵ط.
-B;	xn--2gb08k9w69agm0g.\uDF56;	[P1 V6];	[P1 V6 A3]	#	𞤵ط.
-B;	XN--2GB08K9W69AGM0G.\uDF56;	[P1 V6];	[P1 V6 A3]	#	𞤵ط.
-B;	Xn--2Gb08k9w69agm0g.\uDF56;	[P1 V6];	[P1 V6 A3]	#	𞤵ط.
-B;	Ↄ。\u0A4D\u1CD4𞷣;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	Ↄ.᳔�
-B;	Ↄ。\u1CD4\u0A4D𞷣;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	Ↄ.᳔�
-B;	ↄ。\u1CD4\u0A4D𞷣;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ↄ.᳔�
-B;	xn--r5g.xn--ybc995g0835a;	[B1 V5 V6];	[B1 V5 V6]	#	ↄ.᳔�
-B;	xn--q5g.xn--ybc995g0835a;	[B1 V5 V6];	[B1 V5 V6]	#	Ↄ.᳔�
-B;	ↄ。\u0A4D\u1CD4𞷣;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ↄ.᳔�
-B;	󠪢-。�≮𑜫;	[P1 V3 V6];	[P1 V3 V6]
-B;	󠪢-。�<\u0338𑜫;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn----bh61m.xn--gdhz157g0em1d;	[V3 V6];	[V3 V6]
-T;	\u200C󠉹\u200D。򌿧≮Ⴉ;	[C1 C2 P1 V6];	[P1 V6]	#	.≮Ⴉ
-N;	\u200C󠉹\u200D。򌿧≮Ⴉ;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	.≮Ⴉ
-T;	\u200C󠉹\u200D。򌿧<\u0338Ⴉ;	[C1 C2 P1 V6];	[P1 V6]	#	.≮Ⴉ
-N;	\u200C󠉹\u200D。򌿧<\u0338Ⴉ;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	.≮Ⴉ
-T;	\u200C󠉹\u200D。򌿧<\u0338ⴉ;	[C1 C2 P1 V6];	[P1 V6]	#	.≮ⴉ
-N;	\u200C󠉹\u200D。򌿧<\u0338ⴉ;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	.≮ⴉ
-T;	\u200C󠉹\u200D。򌿧≮ⴉ;	[C1 C2 P1 V6];	[P1 V6]	#	.≮ⴉ
-N;	\u200C󠉹\u200D。򌿧≮ⴉ;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	.≮ⴉ
-B;	xn--3n36e.xn--gdh992byu01p;	[V6];	[V6]
-B;	xn--0ugc90904y.xn--gdh992byu01p;	[C1 C2 V6];	[C1 C2 V6]	#	.≮ⴉ
-B;	xn--3n36e.xn--hnd112gpz83n;	[V6];	[V6]
-B;	xn--0ugc90904y.xn--hnd112gpz83n;	[C1 C2 V6];	[C1 C2 V6]	#	.≮Ⴉ
-B;	�-𑄴\u08BC。︒�⾆;	[B1 P1 V6];	[B1 P1 V6]	#	�-𑄴ࢼ.︒�舌
-B;	�-𑄴\u08BC。。�舌;	[B1 A4_2];	[B1 A4_2]	#	�-𑄴ࢼ..�舌
-B;	xn----rpd7902rclc..xn--fpo216m;	[B1 A4_2];	[B1 A4_2]	#	�-𑄴ࢼ..�舌
-B;	xn----rpd7902rclc.xn--fpo216mn07e;	[B1 V6];	[B1 V6]	#	�-𑄴ࢼ.︒�舌
-B;	�Ⴐ｡쪡;	[P1 V5 V6];	[P1 V5 V6]
-B;	�Ⴐ｡�ᅨᆨ;	[P1 V5 V6];	[P1 V5 V6]
-B;	�Ⴐ。쪡;	[P1 V5 V6];	[P1 V5 V6]
-B;	�Ⴐ。�ᅨᆨ;	[P1 V5 V6];	[P1 V5 V6]
-B;	��。�ᅨᆨ;	[V5];	[V5]
-B;	��。쪡;	[V5];	[V5]
-B;	xn--7kj1858k.xn--pi6b;	[V5];	[V5]
-B;	xn--ond3755u.xn--pi6b;	[V5 V6];	[V5 V6]
-B;	��｡�ᅨᆨ;	[V5];	[V5]
-B;	��｡쪡;	[V5];	[V5]
-B;	\u0E3A��.􋉳;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ฺ��.
-B;	\u0E3A�ᅤᆸ�.􋉳;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ฺ��.
-B;	xn--o4c4837g2zvb.xn--5f70g;	[B1 V5 V6];	[B1 V5 V6]	#	ฺ��.
-T;	ᡅ�\u200C｡⎢󤨄;	[C1 P1 V6];	[P1 V6]	#	ᡅ0.⎢
-N;	ᡅ�\u200C｡⎢󤨄;	[C1 P1 V6];	[C1 P1 V6]	#	ᡅ0.⎢
-T;	ᡅ0\u200C。⎢󤨄;	[C1 P1 V6];	[P1 V6]	#	ᡅ0.⎢
-N;	ᡅ0\u200C。⎢󤨄;	[C1 P1 V6];	[C1 P1 V6]	#	ᡅ0.⎢
-B;	xn--0-z6j.xn--8lh28773l;	[V6];	[V6]
-B;	xn--0-z6jy93b.xn--8lh28773l;	[C1 V6];	[C1 V6]	#	ᡅ0.⎢
-T;	𲮚９�\u17D3．\u200Dß;	[C2 P1 V6];	[P1 V6]	#	9�៓.ß
-N;	𲮚９�\u17D3．\u200Dß;	[C2 P1 V6];	[C2 P1 V6]	#	9�៓.ß
-T;	𲮚9�\u17D3.\u200Dß;	[C2 P1 V6];	[P1 V6]	#	9�៓.ß
-N;	𲮚9�\u17D3.\u200Dß;	[C2 P1 V6];	[C2 P1 V6]	#	9�៓.ß
-T;	𲮚9�\u17D3.\u200DSS;	[C2 P1 V6];	[P1 V6]	#	9�៓.ss
-N;	𲮚9�\u17D3.\u200DSS;	[C2 P1 V6];	[C2 P1 V6]	#	9�៓.ss
-T;	𲮚9�\u17D3.\u200Dss;	[C2 P1 V6];	[P1 V6]	#	9�៓.ss
-N;	𲮚9�\u17D3.\u200Dss;	[C2 P1 V6];	[C2 P1 V6]	#	9�៓.ss
-T;	𲮚9�\u17D3.\u200DSs;	[C2 P1 V6];	[P1 V6]	#	9�៓.ss
-N;	𲮚9�\u17D3.\u200DSs;	[C2 P1 V6];	[C2 P1 V6]	#	9�៓.ss
-B;	xn--9-i0j5967eg3qz.ss;	[V6];	[V6]	#	9�៓.ss
-B;	xn--9-i0j5967eg3qz.xn--ss-l1t;	[C2 V6];	[C2 V6]	#	9�៓.ss
-B;	xn--9-i0j5967eg3qz.xn--zca770n;	[C2 V6];	[C2 V6]	#	9�៓.ß
-T;	𲮚９�\u17D3．\u200DSS;	[C2 P1 V6];	[P1 V6]	#	9�៓.ss
-N;	𲮚９�\u17D3．\u200DSS;	[C2 P1 V6];	[C2 P1 V6]	#	9�៓.ss
-T;	𲮚９�\u17D3．\u200Dss;	[C2 P1 V6];	[P1 V6]	#	9�៓.ss
-N;	𲮚９�\u17D3．\u200Dss;	[C2 P1 V6];	[C2 P1 V6]	#	9�៓.ss
-T;	𲮚９�\u17D3．\u200DSs;	[C2 P1 V6];	[P1 V6]	#	9�៓.ss
-N;	𲮚９�\u17D3．\u200DSs;	[C2 P1 V6];	[C2 P1 V6]	#	9�៓.ss
-B;	ꗷ𑆀.\u075D�;	;	xn--ju8a625r.xn--hpb0073k;	NV8	#	ꗷ𑆀.��
-B;	xn--ju8a625r.xn--hpb0073k;	ꗷ𑆀.\u075D�;	xn--ju8a625r.xn--hpb0073k;	NV8	#	ꗷ𑆀.��
-B;	�≯-。︒򩑣-񞛠;	[P1 V3 V6];	[P1 V3 V6]
-B;	�>\u0338-。︒򩑣-񞛠;	[P1 V3 V6];	[P1 V3 V6]
-B;	9.≯-。。򩑣-񞛠;	[P1 V3 V6 A4_2];	[P1 V3 V6 A4_2]
-B;	9.>\u0338-。。򩑣-񞛠;	[P1 V3 V6 A4_2];	[P1 V3 V6 A4_2]
-B;	9.xn----ogo..xn----xj54d1s69k;	[V3 V6 A4_2];	[V3 V6 A4_2]
-B;	xn----ogot9g.xn----n89hl0522az9u2a;	[V3 V6];	[V3 V6]
-B;	򈪚\u0CE3��．\u061D;	[B6 P1 V6];	[B6 P1 V6]	#	ೣ�.
-B;	򈪚\u0CE3��.\u061D;	[B6 P1 V6];	[B6 P1 V6]	#	ೣ�.
-B;	򈪚\u0CE3ⴡ�.\u061D;	[B6 P1 V6];	[B6 P1 V6]	#	ೣⴡ.
-B;	xn--vuc226n8n28lmju7a.xn--cgb;	[B6 V6];	[B6 V6]	#	ೣⴡ.
-B;	xn--vuc49qvu85xmju7a.xn--cgb;	[B6 V6];	[B6 V6]	#	ೣ�.
-B;	򈪚\u0CE3ⴡ�．\u061D;	[B6 P1 V6];	[B6 P1 V6]	#	ೣⴡ.
-B;	\u1DEB。�\u0638-�;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ᷫ.�ظ-�
-B;	xn--gfg.xn----xnc0815qyyg;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ᷫ.�ظ-�
-B;	싇。⾇�Ⴝ;	[B5 P1 V6];	[B5 P1 V6]
-B;	싇。⾇�Ⴝ;	[B5 P1 V6];	[B5 P1 V6]
-B;	싇。舛�Ⴝ;	[B5 P1 V6];	[B5 P1 V6]
-B;	싇。舛�Ⴝ;	[B5 P1 V6];	[B5 P1 V6]
-B;	싇。舛��;	[B5];	[B5]
-B;	싇。舛��;	[B5];	[B5]
-B;	싇。舛�Ⴝ;	[B5 P1 V6];	[B5 P1 V6]
-B;	싇。舛�Ⴝ;	[B5 P1 V6];	[B5 P1 V6]
-B;	싇。舛��;	[B5];	[B5]
-B;	싇。舛��;	[B5];	[B5]
-B;	xn--9u4b.xn--llj123yh74e;	[B5];	[B5]
-B;	xn--9u4b.xn--1nd7519ch79d;	[B5 V6];	[B5 V6]
-B;	싇。⾇��;	[B5];	[B5]
-B;	싇。⾇��;	[B5];	[B5]
-B;	싇。⾇�Ⴝ;	[B5 P1 V6];	[B5 P1 V6]
-B;	싇。⾇�Ⴝ;	[B5 P1 V6];	[B5 P1 V6]
-B;	싇。⾇��;	[B5];	[B5]
-B;	싇。⾇��;	[B5];	[B5]
-T;	�ς。\u200C\u06BFჀ;	[B1 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�ς.ڿჀ
-N;	�ς。\u200C\u06BFჀ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�ς.ڿჀ
-T;	�ς。\u200C\u06BFⴠ;	[B1 C1];	[B1 B2 B3]	#	�ς.ڿⴠ
-N;	�ς。\u200C\u06BFⴠ;	[B1 C1];	[B1 C1]	#	�ς.ڿⴠ
-T;	�Σ。\u200C\u06BFჀ;	[B1 C1 P1 V6];	[B1 B2 B3 P1 V6]	#	�σ.ڿჀ
-N;	�Σ。\u200C\u06BFჀ;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	�σ.ڿჀ
-T;	�σ。\u200C\u06BFⴠ;	[B1 C1];	[B1 B2 B3]	#	�σ.ڿⴠ
-N;	�σ。\u200C\u06BFⴠ;	[B1 C1];	[B1 C1]	#	�σ.ڿⴠ
-B;	xn--4xa9167k.xn--ykb467q;	[B1 B2 B3];	[B1 B2 B3]	#	�σ.ڿⴠ
-B;	xn--4xa9167k.xn--ykb760k9hj;	[B1 C1];	[B1 C1]	#	�σ.ڿⴠ
-B;	xn--4xa9167k.xn--ykb632c;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	�σ.ڿჀ
-B;	xn--4xa9167k.xn--ykb632cvxm;	[B1 C1 V6];	[B1 C1 V6]	#	�σ.ڿჀ
-B;	xn--3xa1267k.xn--ykb760k9hj;	[B1 C1];	[B1 C1]	#	�ς.ڿⴠ
-B;	xn--3xa1267k.xn--ykb632cvxm;	[B1 C1 V6];	[B1 C1 V6]	#	�ς.ڿჀ
-T;	�\u200C\u0604.\u069A-ß;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	.ښ-ß
-N;	�\u200C\u0604.\u069A-ß;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 C1 P1 V6]	#	.ښ-ß
-T;	ò‡’�\u200C\u0604.\u069A-SS;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	.Úš-ss
-N;	ò‡’�\u200C\u0604.\u069A-SS;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 C1 P1 V6]	#	.Úš-ss
-T;	ò‡’�\u200C\u0604.\u069A-ss;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	.Úš-ss
-N;	ò‡’�\u200C\u0604.\u069A-ss;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 C1 P1 V6]	#	.Úš-ss
-T;	ò‡’�\u200C\u0604.\u069A-Ss;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	.Úš-ss
-N;	ò‡’�\u200C\u0604.\u069A-Ss;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 C1 P1 V6]	#	.Úš-ss
-B;	xn--mfb98261i.xn---ss-sdf;	[B2 B3 B5 B6 V6];	[B2 B3 B5 B6 V6]	#	.Úš-ss
-B;	xn--mfb144kqo32m.xn---ss-sdf;	[B2 B3 B5 B6 C1 V6];	[B2 B3 B5 B6 C1 V6]	#	.Úš-ss
-B;	xn--mfb144kqo32m.xn----qfa315b;	[B2 B3 B5 B6 C1 V6];	[B2 B3 B5 B6 C1 V6]	#	.ښ-ß
-T;	\u200C\u200D\u17B5\u067A.-\uFBB0󅄞�;	[B1 C1 C2 P1 V3 V6];	[B1 P1 V3 V5 V6]	#	ٺ.-ۓ
-N;	\u200C\u200D\u17B5\u067A.-\uFBB0󅄞�;	[B1 C1 C2 P1 V3 V6];	[B1 C1 C2 P1 V3 V6]	#	ٺ.-ۓ
-T;	\u200C\u200D\u17B5\u067A.-\u06D3󅄞�;	[B1 C1 C2 P1 V3 V6];	[B1 P1 V3 V5 V6]	#	ٺ.-ۓ
-N;	\u200C\u200D\u17B5\u067A.-\u06D3󅄞�;	[B1 C1 C2 P1 V3 V6];	[B1 C1 C2 P1 V3 V6]	#	ٺ.-ۓ
-T;	\u200C\u200D\u17B5\u067A.-\u06D2\u0654󅄞�;	[B1 C1 C2 P1 V3 V6];	[B1 P1 V3 V5 V6]	#	ٺ.-ۓ
-N;	\u200C\u200D\u17B5\u067A.-\u06D2\u0654󅄞�;	[B1 C1 C2 P1 V3 V6];	[B1 C1 C2 P1 V3 V6]	#	ٺ.-ۓ
-B;	xn--zib539f.xn----twc1133r17r6g;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	Ùº.-Û“
-B;	xn--zib539f8igea.xn----twc1133r17r6g;	[B1 C1 C2 V3 V6];	[B1 C1 C2 V3 V6]	#	Ùº.-Û“
-B;	򡶱｡�≠;	[B3 P1 V6];	[B3 P1 V6]
-B;	򡶱｡�=\u0338;	[B3 P1 V6];	[B3 P1 V6]
-B;	򡶱。�≠;	[B3 P1 V6];	[B3 P1 V6]
-B;	򡶱。�=\u0338;	[B3 P1 V6];	[B3 P1 V6]
-B;	xn--dd55c.xn--1ch3003g;	[B3 V6];	[B3 V6]
-B;	\u0FB2𞶅｡���۵;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ྲ.���۵
-B;	\u0FB2𞶅｡��덝۵;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ྲ.���۵
-B;	\u0FB2𞶅。���۵;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ྲ.���۵
-B;	\u0FB2𞶅。��덝۵;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ྲ.���۵
-B;	xn--fgd0675v.xn--imb5839fidpcbba;	[B1 V5 V6];	[B1 V5 V6]	#	ྲ.���۵
-T;	Ⴏ󠅋-．\u200DႩ;	[C2 P1 V3 V6];	[P1 V3 V6]	#	Ⴏ-.Ⴉ
-N;	Ⴏ󠅋-．\u200DႩ;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	Ⴏ-.Ⴉ
-T;	Ⴏ󠅋-.\u200DႩ;	[C2 P1 V3 V6];	[P1 V3 V6]	#	Ⴏ-.Ⴉ
-N;	Ⴏ󠅋-.\u200DႩ;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	Ⴏ-.Ⴉ
-T;	â´�ó …‹-.\u200Dâ´‰;	[C2 V3];	[V3]	#	â´�-.â´‰
-N;	â´�ó …‹-.\u200Dâ´‰;	[C2 V3];	[C2 V3]	#	â´�-.â´‰
-B;	xn----3vs.xn--0kj;	[V3];	[V3]
-B;	xn----3vs.xn--1ug532c;	[C2 V3];	[C2 V3]	#	â´�-.â´‰
-B;	xn----00g.xn--hnd;	[V3 V6];	[V3 V6]
-B;	xn----00g.xn--hnd399e;	[C2 V3 V6];	[C2 V3 V6]	#	Ⴏ-.Ⴉ
-T;	�󠅋-．\u200Dⴉ;	[C2 V3];	[V3]	#	�-.ⴉ
-N;	�󠅋-．\u200Dⴉ;	[C2 V3];	[C2 V3]	#	�-.ⴉ
-B;	⇧�󠾈󯶅。\u0600󠈵󠆉;	[B1 P1 V6];	[B1 P1 V6]	#	⇧�.
-B;	xn--l8g5552g64t4g46xf.xn--ifb08144p;	[B1 V6];	[B1 V6]	#	⇧�.
-B;	≠�.↑🄇⒈;	[B1 P1 V6];	[B1 P1 V6]
-B;	=\u0338�.↑🄇⒈;	[B1 P1 V6];	[B1 P1 V6]
-B;	≠�.↑6,1.;	[B1 P1 V6];	[B1 P1 V6]
-B;	=\u0338�.↑6,1.;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--1chy492g.xn--6,1-pw1a.;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--1chy492g.xn--45gx9iuy44d;	[B1 V6];	[B1 V6]
-T;	�󠲉ß.ᢤ򄦌\u200C�;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�ß.ᢤ�
-N;	�󠲉ß.ᢤ򄦌\u200C�;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 C1 P1 V5 V6]	#	�ß.ᢤ�
-T;	�󠲉SS.ᢤ򄦌\u200C�;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�ss.ᢤ�
-N;	�󠲉SS.ᢤ򄦌\u200C�;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 C1 P1 V5 V6]	#	�ss.ᢤ�
-T;	�󠲉ss.ᢤ򄦌\u200C�;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�ss.ᢤ�
-N;	�󠲉ss.ᢤ򄦌\u200C�;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 C1 P1 V5 V6]	#	�ss.ᢤ�
-T;	�󠲉Ss.ᢤ򄦌\u200C�;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	�ss.ᢤ�
-N;	�󠲉Ss.ᢤ򄦌\u200C�;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 C1 P1 V5 V6]	#	�ss.ᢤ�
-B;	xn--ss-zb11ap1427e.xn--ubf2596jbt61c;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]
-B;	xn--ss-zb11ap1427e.xn--ubf609atw1tynn3d;	[B1 B5 B6 C1 V5 V6];	[B1 B5 B6 C1 V5 V6]	#	�ss.ᢤ�
-B;	xn--zca3153vupz3e.xn--ubf609atw1tynn3d;	[B1 B5 B6 C1 V5 V6];	[B1 B5 B6 C1 V5 V6]	#	�ß.ᢤ�
-T;	ß��Ⴇ｡\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ßႧ.ꙺ
-N;	ß��Ⴇ｡\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ßႧ.ꙺ
-T;	ß��Ⴇ。\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ßႧ.ꙺ
-N;	ß��Ⴇ。\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ßႧ.ꙺ
-T;	ß��ⴇ。\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ßⴇ.ꙺ
-N;	ß��ⴇ。\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ßⴇ.ꙺ
-B;	SS��Ⴇ。\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ssႧ.ꙺ
-B;	ss��ⴇ。\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ssⴇ.ꙺ
-B;	Ss��Ⴇ。\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ssႧ.ꙺ
-B;	xn--ss-rek7420r4hs7b.xn--9x8a;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	ssႧ.ꙺ
-B;	xn--ss-e61ar955h4hs7b.xn--9x8a;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	ssⴇ.ꙺ
-B;	xn--zca227tpy4lkns1b.xn--9x8a;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	ßⴇ.ꙺ
-B;	xn--zca491fci5qkn79a.xn--9x8a;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	ßႧ.ꙺ
-T;	ß��ⴇ｡\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ßⴇ.ꙺ
-N;	ß��ⴇ｡\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ßⴇ.ꙺ
-B;	SS��Ⴇ｡\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ssႧ.ꙺ
-B;	ss��ⴇ｡\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ssⴇ.ꙺ
-B;	Ss��Ⴇ｡\uA67A;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	ssႧ.ꙺ
-B;	\u1714。󠆣-𑋪;	[V3 V5];	[V3 V5]	#	᜔.-𑋪
-B;	xn--fze.xn----ly8i;	[V3 V5];	[V3 V5]	#	᜔.-𑋪
-T;	\uABE8-．�\u05BDß;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽß
-N;	\uABE8-．�\u05BDß;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽß
-T;	\uABE8-.�\u05BDß;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽß
-N;	\uABE8-.�\u05BDß;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽß
-B;	\uABE8-.�\u05BDSS;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽss
-B;	\uABE8-.�\u05BDss;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽss
-B;	\uABE8-.�\u05BDSs;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽss
-B;	xn----pw5e.xn--ss-7jd10716y;	[V3 V5 V6];	[V3 V5 V6]	#	ꯨ-.ֽss
-B;	xn----pw5e.xn--zca50wfv060a;	[V3 V5 V6];	[V3 V5 V6]	#	ꯨ-.ֽß
-B;	\uABE8-．�\u05BDSS;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽss
-B;	\uABE8-．�\u05BDss;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽss
-B;	\uABE8-．�\u05BDSs;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ꯨ-.ֽss
-B;	ᡓ-≮。\u066B󠅱ᡄ;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	ᡓ-≮.٫ᡄ
-B;	ᡓ-<\u0338。\u066B󠅱ᡄ;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	ᡓ-≮.٫ᡄ
-B;	xn----s7j866c.xn--kib252g;	[B1 B6 V6];	[B1 B6 V6]	#	ᡓ-≮.٫ᡄ
-B;	�♮𑜫\u08ED．\u17D2𑜫8�;	[V5];	[V5]	#	3♮𑜫࣭.្𑜫8
-B;	3♮𑜫\u08ED.\u17D2𑜫8�;	[V5];	[V5]	#	3♮𑜫࣭.្𑜫8
-B;	xn--3-ksd277tlo7s.xn--8-f0jx021l;	[V5];	[V5]	#	3♮𑜫࣭.្𑜫8
-T;	-｡򕌀\u200D�;	[C2 P1 V3 V6];	[P1 V3 V6]	#	-.�
-N;	-｡򕌀\u200D�;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	-.�
-T;	-。򕌀\u200D�;	[C2 P1 V3 V6];	[P1 V3 V6]	#	-.�
-N;	-。򕌀\u200D�;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	-.�
-B;	-.xn--nei54421f;	[V3 V6];	[V3 V6]
-B;	-.xn--1ug800aq795s;	[C2 V3 V6];	[C2 V3 V6]	#	-.�
-B;	�☱�򥰵｡��;	[P1 V5 V6];	[P1 V5 V6]
-B;	5☱2򥰵。��;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--52-dwx47758j.xn--kd3hk431k;	[V5 V6];	[V5 V6]
-B;	-.-├򖦣;	[P1 V3 V6];	[P1 V3 V6]
-B;	-.xn----ukp70432h;	[V3 V6];	[V3 V6]
-T;	\u05A5\u076D｡\u200D󠀘;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	֥ݭ.
-N;	\u05A5\u076D｡\u200D󠀘;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	֥ݭ.
-T;	\u05A5\u076D。\u200D󠀘;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	֥ݭ.
-N;	\u05A5\u076D。\u200D󠀘;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	֥ݭ.
-B;	xn--wcb62g.xn--p526e;	[B1 V5 V6];	[B1 V5 V6]	#	֥ݭ.
-B;	xn--wcb62g.xn--1ugy8001l;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	֥ݭ.
-T;	쥥�Ⴎ．\u200C⒈⒈�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	쥥Ⴎ.⒈⒈�
-N;	쥥�Ⴎ．\u200C⒈⒈�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	쥥Ⴎ.⒈⒈�
-T;	쥥�Ⴎ．\u200C⒈⒈�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	쥥Ⴎ.⒈⒈�
-N;	쥥�Ⴎ．\u200C⒈⒈�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	쥥Ⴎ.⒈⒈�
-T;	쥥�Ⴎ.\u200C1.1.�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	쥥Ⴎ.1.1.�
-N;	쥥�Ⴎ.\u200C1.1.�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	쥥Ⴎ.1.1.�
-T;	쥥�Ⴎ.\u200C1.1.�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	쥥Ⴎ.1.1.�
-N;	쥥�Ⴎ.\u200C1.1.�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	쥥Ⴎ.1.1.�
-T;	쥥�ⴎ.\u200C1.1.�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	쥥ⴎ.1.1.�
-N;	쥥�ⴎ.\u200C1.1.�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	쥥ⴎ.1.1.�
-T;	쥥�ⴎ.\u200C1.1.�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	쥥ⴎ.1.1.�
-N;	쥥�ⴎ.\u200C1.1.�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	쥥ⴎ.1.1.�
-B;	xn--5kj3511ccyw3h.1.1.xn--7w9c;	[B1 V6];	[B1 V6]
-B;	xn--5kj3511ccyw3h.xn--1-rgn.1.xn--7w9c;	[B1 C1 V6];	[B1 C1 V6]	#	쥥ⴎ.1.1.�
-B;	xn--mnd7865gcy28g.1.1.xn--7w9c;	[B1 V6];	[B1 V6]
-B;	xn--mnd7865gcy28g.xn--1-rgn.1.xn--7w9c;	[B1 C1 V6];	[B1 C1 V6]	#	쥥Ⴎ.1.1.�
-T;	쥥�ⴎ．\u200C⒈⒈�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	쥥ⴎ.⒈⒈�
-N;	쥥�ⴎ．\u200C⒈⒈�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	쥥ⴎ.⒈⒈�
-T;	쥥�ⴎ．\u200C⒈⒈�;	[B1 C1 P1 V6];	[B1 P1 V6]	#	쥥ⴎ.⒈⒈�
-N;	쥥�ⴎ．\u200C⒈⒈�;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	쥥ⴎ.⒈⒈�
-B;	xn--5kj3511ccyw3h.xn--tsha6797o;	[B1 V6];	[B1 V6]
-B;	xn--5kj3511ccyw3h.xn--0ug88oa0396u;	[B1 C1 V6];	[B1 C1 V6]	#	쥥ⴎ.⒈⒈�
-B;	xn--mnd7865gcy28g.xn--tsha6797o;	[B1 V6];	[B1 V6]
-B;	xn--mnd7865gcy28g.xn--0ug88oa0396u;	[B1 C1 V6];	[B1 C1 V6]	#	쥥Ⴎ.⒈⒈�
-B;	\u0827�\u06A0-。𑄳;	[B1 B3 B6 V3 V5];	[B1 B3 B6 V3 V5]	#	ࠧ0ڠ-.𑄳
-B;	\u08270\u06A0-。𑄳;	[B1 B3 B6 V3 V5];	[B1 B3 B6 V3 V5]	#	ࠧ0ڠ-.𑄳
-B;	xn--0--p3d67m.xn--v80d;	[B1 B3 B6 V3 V5];	[B1 B3 B6 V3 V5]	#	à §0Ú -.ð‘„³
-T;	ς．\uFDC1🞛⒈;	[P1 V6];	[P1 V6]	#	ς.�مي🞛⒈
-N;	ς．\uFDC1🞛⒈;	[P1 V6];	[P1 V6]	#	ς.�مي🞛⒈
-T;	ς.\u0641\u0645\u064A🞛1.;	;	xn--4xa.xn--1-gocmu97674d.;	NV8	#	ς.�مي🞛1.
-N;	ς.\u0641\u0645\u064A🞛1.;	;	xn--3xa.xn--1-gocmu97674d.;	NV8	#	ς.�مي🞛1.
-B;	Σ.\u0641\u0645\u064A🞛1.;	σ.\u0641\u0645\u064A🞛1.;	xn--4xa.xn--1-gocmu97674d.;	NV8	#	σ.�مي🞛1.
-B;	σ.\u0641\u0645\u064A🞛1.;	;	xn--4xa.xn--1-gocmu97674d.;	NV8	#	σ.�مي🞛1.
-B;	xn--4xa.xn--1-gocmu97674d.;	σ.\u0641\u0645\u064A🞛1.;	xn--4xa.xn--1-gocmu97674d.;	NV8	#	σ.�مي🞛1.
-B;	xn--3xa.xn--1-gocmu97674d.;	ς.\u0641\u0645\u064A🞛1.;	xn--3xa.xn--1-gocmu97674d.;	NV8	#	ς.�مي🞛1.
-B;	Σ．\uFDC1🞛⒈;	[P1 V6];	[P1 V6]	#	σ.�مي🞛⒈
-B;	σ．\uFDC1🞛⒈;	[P1 V6];	[P1 V6]	#	σ.�مي🞛⒈
-B;	xn--4xa.xn--dhbip2802atb20c;	[V6];	[V6]	#	σ.�مي🞛⒈
-B;	xn--3xa.xn--dhbip2802atb20c;	[V6];	[V6]	#	ς.�مي🞛⒈
-B;	🗩-｡��񥉮;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	🗩-。��񥉮;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	xn----6t3s.xn--zo0d4811u6ru6a;	[B1 V3 V6];	[B1 V3 V6]
-T;	�-🔪｡�\u200C�;	[B1 B3 C1 P1 V6];	[B1 B3 P1 V6]	#	�-🔪.5
-N;	�-🔪｡�\u200C�;	[B1 B3 C1 P1 V6];	[B1 B3 C1 P1 V6]	#	�-🔪.5
-T;	�-🔪。5\u200C�;	[B1 B3 C1 P1 V6];	[B1 B3 P1 V6]	#	�-🔪.5
-N;	�-🔪。5\u200C�;	[B1 B3 C1 P1 V6];	[B1 B3 C1 P1 V6]	#	�-🔪.5
-B;	xn----5j4iv089c.xn--5-bn7i;	[B1 B3 V6];	[B1 B3 V6]
-B;	xn----5j4iv089c.xn--5-sgn7149h;	[B1 B3 C1 V6];	[B1 B3 C1 V6]	#	�-🔪.5
-T;	�늿\u200Dß．\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ß.�0ּ
-N;	�늿\u200Dß．\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ß.�0ּ
-T;	�늿\u200Dß．\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ß.�0ּ
-N;	�늿\u200Dß．\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ß.�0ּ
-T;	�늿\u200Dß.\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ß.�0ּ
-N;	�늿\u200Dß.\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ß.�0ּ
-T;	�늿\u200Dß.\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ß.�0ּ
-N;	�늿\u200Dß.\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ß.�0ּ
-T;	�늿\u200DSS.\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200DSS.\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200DSS.\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200DSS.\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200Dss.\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200Dss.\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200Dss.\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200Dss.\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200DSs.\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200DSs.\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200DSs.\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200DSs.\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-B;	xn--ss-i05i7041a.xn--0-vgc50n;	[B1];	[B1]	#	�늿ss.�0ּ
-B;	xn--ss-l1tu910fo0xd.xn--0-vgc50n;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-B;	xn--zca770n5s4hev6c.xn--0-vgc50n;	[B1 C2];	[B1 C2]	#	�늿ß.�0ּ
-T;	�늿\u200DSS．\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200DSS．\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200DSS．\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200DSS．\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200Dss．\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200Dss．\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200Dss．\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200Dss．\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200DSs．\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200DSs．\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-T;	�늿\u200DSs．\u07CF0\u05BC;	[B1 C2];	[B1]	#	�늿ss.�0ּ
-N;	�늿\u200DSs．\u07CF0\u05BC;	[B1 C2];	[B1 C2]	#	�늿ss.�0ּ
-B;	9󠇥．󪴴ᢓ;	[P1 V6];	[P1 V6]
-B;	9󠇥.󪴴ᢓ;	[P1 V6];	[P1 V6]
-B;	9.xn--dbf91222q;	[V6];	[V6]
-T;	\u200C\uFFA0.�🠗ß⽟;	[B1 B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	.�🠗ß玉
-N;	\u200C\uFFA0.�🠗ß⽟;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.�🠗ß玉
-T;	\u200C\u1160.�🠗ß玉;	[B1 B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	.�🠗ß玉
-N;	\u200C\u1160.�🠗ß玉;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.�🠗ß玉
-T;	\u200C\u1160.�🠗SS玉;	[B1 B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	.�🠗ss玉
-N;	\u200C\u1160.�🠗SS玉;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.�🠗ss玉
-T;	\u200C\u1160.�🠗ss玉;	[B1 B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	.�🠗ss玉
-N;	\u200C\u1160.�🠗ss玉;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.�🠗ss玉
-T;	\u200C\u1160.�🠗Ss玉;	[B1 B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	.�🠗ss玉
-N;	\u200C\u1160.�🠗Ss玉;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.�🠗ss玉
-B;	xn--psd.xn--ss-je6eq954cp25j;	[B2 B3 V6];	[B2 B3 V6]	#	.�🠗ss玉
-B;	xn--psd526e.xn--ss-je6eq954cp25j;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	.�🠗ss玉
-B;	xn--psd526e.xn--zca2289c550e0iwi;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	.�🠗ß玉
-T;	\u200C\uFFA0.�🠗SS⽟;	[B1 B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	.�🠗ss玉
-N;	\u200C\uFFA0.�🠗SS⽟;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.�🠗ss玉
-T;	\u200C\uFFA0.�🠗ss⽟;	[B1 B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	.�🠗ss玉
-N;	\u200C\uFFA0.�🠗ss⽟;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.�🠗ss玉
-T;	\u200C\uFFA0.�🠗Ss⽟;	[B1 B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	.�🠗ss玉
-N;	\u200C\uFFA0.�🠗Ss⽟;	[B1 B2 B3 C1 P1 V6];	[B1 B2 B3 C1 P1 V6]	#	.�🠗ss玉
-B;	xn--cl7c.xn--ss-je6eq954cp25j;	[B2 B3 V6];	[B2 B3 V6]	#	.�🠗ss玉
-B;	xn--0ug7719f.xn--ss-je6eq954cp25j;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	.�🠗ss玉
-B;	xn--0ug7719f.xn--zca2289c550e0iwi;	[B1 B2 B3 C1 V6];	[B1 B2 B3 C1 V6]	#	.�🠗ß玉
-T;	︒Ⴖ\u0366．\u200C;	[C1 P1 V6];	[P1 V6]	#	︒Ⴖͦ.
-N;	︒Ⴖ\u0366．\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	︒Ⴖͦ.
-T;	。Ⴖ\u0366.\u200C;	[C1 P1 V6 A4_2];	[P1 V6 A4_2]	#	.Ⴖͦ.
-N;	。Ⴖ\u0366.\u200C;	[C1 P1 V6 A4_2];	[C1 P1 V6 A4_2]	#	.Ⴖͦ.
-T;	。ⴖ\u0366.\u200C;	[C1 A4_2];	[A4_2]	#	.ⴖͦ.
-N;	。ⴖ\u0366.\u200C;	[C1 A4_2];	[C1 A4_2]	#	.ⴖͦ.
-B;	.xn--hva754s.;	[A4_2];	[A4_2]	#	.ⴖͦ.
-B;	.xn--hva754s.xn--0ug;	[C1 A4_2];	[C1 A4_2]	#	.ⴖͦ.
-B;	.xn--hva929d.;	[V6 A4_2];	[V6 A4_2]	#	.Ⴖͦ.
-B;	.xn--hva929d.xn--0ug;	[C1 V6 A4_2];	[C1 V6 A4_2]	#	.Ⴖͦ.
-T;	︒ⴖ\u0366．\u200C;	[C1 P1 V6];	[P1 V6]	#	︒ⴖͦ.
-N;	︒ⴖ\u0366．\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	︒ⴖͦ.
-B;	xn--hva754sy94k.;	[V6];	[V6]	#	︒ⴖͦ.
-B;	xn--hva754sy94k.xn--0ug;	[C1 V6];	[C1 V6]	#	︒ⴖͦ.
-B;	xn--hva929dl29p.;	[V6];	[V6]	#	︒Ⴖͦ.
-B;	xn--hva929dl29p.xn--0ug;	[C1 V6];	[C1 V6]	#	︒Ⴖͦ.
-B;	xn--hva754s.;	ⴖ\u0366.;	xn--hva754s.	#	ⴖͦ.
-B;	ⴖ\u0366.;	;	xn--hva754s.	#	ⴖͦ.
-B;	Ⴖ\u0366.;	[P1 V6];	[P1 V6]	#	Ⴖͦ.
-B;	xn--hva929d.;	[V6];	[V6]	#	Ⴖͦ.
-T;	\u08BB．\u200CႣ𞀒;	[B1 C1 P1 V6];	[P1 V6]	#	ࢻ.Ⴃ𞀒
-N;	\u08BB．\u200CႣ𞀒;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ࢻ.Ⴃ𞀒
-T;	\u08BB.\u200CႣ𞀒;	[B1 C1 P1 V6];	[P1 V6]	#	ࢻ.Ⴃ𞀒
-N;	\u08BB.\u200CႣ𞀒;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ࢻ.Ⴃ𞀒
-T;	\u08BB.\u200Cⴃ𞀒;	[B1 C1];	xn--hzb.xn--ukj4430l	#	ࢻ.ⴃ𞀒
-N;	\u08BB.\u200Cⴃ𞀒;	[B1 C1];	[B1 C1]	#	ࢻ.ⴃ𞀒
-B;	xn--hzb.xn--ukj4430l;	\u08BB.ⴃ𞀒;	xn--hzb.xn--ukj4430l	#	ࢻ.ⴃ𞀒
-B;	\u08BB.ⴃ𞀒;	;	xn--hzb.xn--ukj4430l	#	ࢻ.ⴃ𞀒
-B;	\u08BB.Ⴃ𞀒;	[P1 V6];	[P1 V6]	#	ࢻ.Ⴃ𞀒
-B;	xn--hzb.xn--bnd2938u;	[V6];	[V6]	#	ࢻ.Ⴃ𞀒
-B;	xn--hzb.xn--0ug822cp045a;	[B1 C1];	[B1 C1]	#	ࢻ.ⴃ𞀒
-B;	xn--hzb.xn--bnd300f7225a;	[B1 C1 V6];	[B1 C1 V6]	#	ࢻ.Ⴃ𞀒
-T;	\u08BB．\u200Cⴃ𞀒;	[B1 C1];	xn--hzb.xn--ukj4430l	#	ࢻ.ⴃ𞀒
-N;	\u08BB．\u200Cⴃ𞀒;	[B1 C1];	[B1 C1]	#	ࢻ.ⴃ𞀒
-T;	\u200D\u200C。２䫷󠧷;	[C1 C2 P1 V6];	[P1 V6 A4_2]	#	.2䫷
-N;	\u200D\u200C。２䫷󠧷;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	.2䫷
-T;	\u200D\u200C。2䫷󠧷;	[C1 C2 P1 V6];	[P1 V6 A4_2]	#	.2䫷
-N;	\u200D\u200C。2䫷󠧷;	[C1 C2 P1 V6];	[C1 C2 P1 V6]	#	.2䫷
-B;	.xn--2-me5ay1273i;	[V6 A4_2];	[V6 A4_2]
-B;	xn--0ugb.xn--2-me5ay1273i;	[C1 C2 V6];	[C1 C2 V6]	#	.2ä«·
-B;	-𞀤�。򈬖;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn----rq4re4997d.xn--l707b;	[V3 V6];	[V3 V6]
-T;	󳛂︒\u200C㟀．\u0624⒈;	[C1 P1 V6];	[P1 V6]	#	︒㟀.ؤ⒈
-N;	󳛂︒\u200C㟀．\u0624⒈;	[C1 P1 V6];	[C1 P1 V6]	#	︒㟀.ؤ⒈
-T;	󳛂︒\u200C㟀．\u0648\u0654⒈;	[C1 P1 V6];	[P1 V6]	#	︒㟀.ؤ⒈
-N;	󳛂︒\u200C㟀．\u0648\u0654⒈;	[C1 P1 V6];	[C1 P1 V6]	#	︒㟀.ؤ⒈
-T;	󳛂。\u200C㟀.\u06241.;	[B1 C1 P1 V6];	[P1 V6]	#	.㟀.ؤ1.
-N;	󳛂。\u200C㟀.\u06241.;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	.㟀.ؤ1.
-T;	󳛂。\u200C㟀.\u0648\u06541.;	[B1 C1 P1 V6];	[P1 V6]	#	.㟀.ؤ1.
-N;	󳛂。\u200C㟀.\u0648\u06541.;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	.㟀.ؤ1.
-B;	xn--z272f.xn--etl.xn--1-smc.;	[V6];	[V6]	#	.㟀.ؤ1.
-B;	xn--z272f.xn--0ug754g.xn--1-smc.;	[B1 C1 V6];	[B1 C1 V6]	#	.㟀.ؤ1.
-B;	xn--etlt457ccrq7h.xn--jgb476m;	[V6];	[V6]	#	︒㟀.ؤ⒈
-B;	xn--0ug754gxl4ldlt0k.xn--jgb476m;	[C1 V6];	[C1 V6]	#	︒㟀.ؤ⒈
-T;	𑲜\u07CA�。-\u200D;	[B1 C2 V3 V5];	[B1 V3 V5]	#	𑲜ߊ�.-
-N;	𑲜\u07CA�。-\u200D;	[B1 C2 V3 V5];	[B1 C2 V3 V5]	#	𑲜ߊ�.-
-B;	xn--lsb5482l7nre.-;	[B1 V3 V5];	[B1 V3 V5]	#	𑲜ߊ�.-
-B;	xn--lsb5482l7nre.xn----ugn;	[B1 C2 V3 V5];	[B1 C2 V3 V5]	#	𑲜ߊ�.-
-T;	\u200C．Ⴉ≠�;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.Ⴉ≠�
-N;	\u200C．Ⴉ≠�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.Ⴉ≠�
-T;	\u200C．Ⴉ=\u0338�;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.Ⴉ≠�
-N;	\u200C．Ⴉ=\u0338�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.Ⴉ≠�
-T;	\u200C.Ⴉ≠�;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.Ⴉ≠�
-N;	\u200C.Ⴉ≠�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.Ⴉ≠�
-T;	\u200C.Ⴉ=\u0338�;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.Ⴉ≠�
-N;	\u200C.Ⴉ=\u0338�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.Ⴉ≠�
-T;	\u200C.ⴉ=\u0338�;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ⴉ≠�
-N;	\u200C.ⴉ=\u0338�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ⴉ≠�
-T;	\u200C.ⴉ≠�;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ⴉ≠�
-N;	\u200C.ⴉ≠�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ⴉ≠�
-B;	.xn--1chx23bzj4p;	[B5 B6 V6 A4_2];	[B5 B6 V6 A4_2]
-B;	xn--0ug.xn--1chx23bzj4p;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	.ⴉ≠�
-B;	.xn--hnd481gv73o;	[B5 B6 V6 A4_2];	[B5 B6 V6 A4_2]
-B;	xn--0ug.xn--hnd481gv73o;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	.Ⴉ≠�
-T;	\u200C．ⴉ=\u0338�;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ⴉ≠�
-N;	\u200C．ⴉ=\u0338�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ⴉ≠�
-T;	\u200C．ⴉ≠�;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ⴉ≠�
-N;	\u200C．ⴉ≠�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ⴉ≠�
-T;	\u0750。≯ς;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯ς
-N;	\u0750。≯ς;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯ς
-T;	\u0750。>\u0338ς;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯ς
-N;	\u0750。>\u0338ς;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯ς
-B;	\u0750。>\u0338Σ;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯σ
-B;	\u0750。≯Σ;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯σ
-B;	\u0750。≯σ;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯σ
-B;	\u0750。>\u0338σ;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯σ
-B;	xn--3ob.xn--4xa718m;	[B1 V6];	[B1 V6]	#	�.≯σ
-B;	xn--3ob.xn--3xa918m;	[B1 V6];	[B1 V6]	#	�.≯ς
-B;	\u07FC�.�︒񊨩Ⴐ;	[P1 V6];	[P1 V6]	#	.︒Ⴐ
-B;	\u07FC�.�。񊨩Ⴐ;	[P1 V6];	[P1 V6]	#	..Ⴐ
-B;	\u07FC�.�。񊨩�;	[P1 V6];	[P1 V6]	#	..�
-B;	xn--0tb8725k.xn--tu8d.xn--7kj73887a;	[V6];	[V6]	#	..â´�
-B;	xn--0tb8725k.xn--tu8d.xn--ond97931d;	[V6];	[V6]	#	..á‚°
-B;	\u07FC�.�︒񊨩�;	[P1 V6];	[P1 V6]	#	.︒�
-B;	xn--0tb8725k.xn--7kj9008dt18a7py9c;	[V6];	[V6]	#	.︒�
-B;	xn--0tb8725k.xn--ond3562jt18a7py9c;	[V6];	[V6]	#	.︒Ⴐ
-B;	Ⴥ⚭󠖫⋃｡𑌼;	[P1 V5 V6];	[P1 V5 V6]
-B;	Ⴥ⚭󠖫⋃。𑌼;	[P1 V5 V6];	[P1 V5 V6]
-B;	ⴥ⚭󠖫⋃。𑌼;	[P1 V5 V6];	[P1 V5 V6]
-B;	xn--vfh16m67gx1162b.xn--ro1d;	[V5 V6];	[V5 V6]
-B;	xn--9nd623g4zc5z060c.xn--ro1d;	[V5 V6];	[V5 V6]
-B;	ⴥ⚭󠖫⋃｡𑌼;	[P1 V5 V6];	[P1 V5 V6]
-B;	🄈。󠷳\u0844;	[B1 P1 V6];	[B1 P1 V6]	#	🄈.ࡄ
-B;	7,。󠷳\u0844;	[B1 P1 V6];	[B1 P1 V6]	#	7,.ࡄ
-B;	7,.xn--2vb13094p;	[B1 P1 V6];	[B1 P1 V6]	#	7,.à¡„
-B;	xn--107h.xn--2vb13094p;	[B1 V6];	[B1 V6]	#	🄈.ࡄ
-T;	≮\u0846。섖쮖ß;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ß
-N;	≮\u0846。섖쮖ß;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ß
-T;	<\u0338\u0846。섖�ᅰᆽß;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ß
-N;	<\u0338\u0846。섖�ᅰᆽß;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ß
-B;	<\u0338\u0846。섖�ᅰᆽSS;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ss
-B;	≮\u0846。섖쮖SS;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ss
-B;	≮\u0846。섖쮖ss;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ss
-B;	<\u0338\u0846。섖�ᅰᆽss;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ss
-B;	<\u0338\u0846。섖�ᅰᆽSs;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ss
-B;	≮\u0846。섖쮖Ss;	[B1 P1 V6];	[B1 P1 V6]	#	≮ࡆ.섖쮖ss
-B;	xn--4vb505k.xn--ss-5z4j006a;	[B1 V6];	[B1 V6]	#	≮ࡆ.섖쮖ss
-B;	xn--4vb505k.xn--zca7259goug;	[B1 V6];	[B1 V6]	#	≮ࡆ.섖쮖ß
-B;	󠆓�-。ꡒ;	[V3];	[V3]
-B;	xn----o9p.xn--rc9a;	[V3];	[V3]
-T;	\u07BB�\u0626�。\u08A7\u06B0\u200Cᢒ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�ئ�.ࢧڰᢒ
-N;	\u07BB�\u0626�。\u08A7\u06B0\u200Cᢒ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�ئ�.ࢧڰᢒ
-T;	\u07BB�\u064A�\u0654。\u08A7\u06B0\u200Cᢒ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�ئ�.ࢧڰᢒ
-N;	\u07BB�\u064A�\u0654。\u08A7\u06B0\u200Cᢒ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�ئ�.ࢧڰᢒ
-B;	xn--lgb32f2753cosb.xn--jkb91hlz1a;	[B2 B3 V6];	[B2 B3 V6]	#	�ئ�.ࢧڰᢒ
-B;	xn--lgb32f2753cosb.xn--jkb91hlz1azih;	[B2 B3 V6];	[B2 B3 V6]	#	�ئ�.ࢧڰᢒ
-B;	\u0816.�𚚕;	[B1 B2 B3 B6 P1 V5 V6];	[B1 B2 B3 B6 P1 V5 V6]	#	ࠖ.�
-B;	xn--rub.xn--tr9c248x;	[B1 B2 B3 B6 V5 V6];	[B1 B2 B3 B6 V5 V6]	#	ࠖ.�
-B;	--。𽊆\u0767�𞠬;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	--.ݧ𞠬
-B;	--.xn--rpb6226k77pfh58p;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]	#	--.ݧ𞠬
-B;	򛭦��.≯\u08B0\u08A6󔛣;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯ࢰࢦ
-B;	򛭦��.>\u0338\u08B0\u08A6󔛣;	[B1 P1 V6];	[B1 P1 V6]	#	�.≯ࢰࢦ
-B;	xn--887c2298i5mv6a.xn--vybt688qm8981a;	[B1 V6];	[B1 V6]	#	�.≯ࢰࢦ
-B;	䔛󠇒򤸞�．-䤷;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]
-B;	䔛󠇒򤸞�.-䤷;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]
-B;	xn--2loy662coo60e.xn----0n4a;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]
-T;	�．\u200D-;	[B1 C2 V3];	[B1 V3]	#	�.-
-N;	�．\u200D-;	[B1 C2 V3];	[B1 C2 V3]	#	�.-
-T;	�.\u200D-;	[B1 C2 V3];	[B1 V3]	#	�.-
-N;	�.\u200D-;	[B1 C2 V3];	[B1 C2 V3]	#	�.-
-B;	xn--ho0d.-;	[B1 V3];	[B1 V3]
-B;	xn--ho0d.xn----tgn;	[B1 C2 V3];	[B1 C2 V3]	#	�.-
-B;	񂈦帷｡≯�\u1DC8-;	[P1 V3 V6];	[P1 V3 V6]	#	帷.≯�᷈-
-B;	񂈦帷｡>\u0338�\u1DC8-;	[P1 V3 V6];	[P1 V3 V6]	#	帷.≯�᷈-
-B;	񂈦帷。≯�\u1DC8-;	[P1 V3 V6];	[P1 V3 V6]	#	帷.≯�᷈-
-B;	񂈦帷。>\u0338�\u1DC8-;	[P1 V3 V6];	[P1 V3 V6]	#	帷.≯�᷈-
-B;	xn--qutw175s.xn----mimu6tf67j;	[V3 V6];	[V3 V6]	#	帷.≯�᷈-
-T;	\u200D攌\uABED。ᢖ-Ⴘ;	[C2 P1 V6];	[P1 V6]	#	攌꯭.ᢖ-Ⴘ
-N;	\u200D攌\uABED。ᢖ-Ⴘ;	[C2 P1 V6];	[C2 P1 V6]	#	攌꯭.ᢖ-Ⴘ
-T;	\u200D攌\uABED。ᢖ-ⴘ;	[C2];	xn--p9ut19m.xn----mck373i	#	攌꯭.ᢖ-ⴘ
-N;	\u200D攌\uABED。ᢖ-ⴘ;	[C2];	[C2]	#	攌꯭.ᢖ-ⴘ
-B;	xn--p9ut19m.xn----mck373i;	攌\uABED.ᢖ-ⴘ;	xn--p9ut19m.xn----mck373i	#	攌꯭.ᢖ-ⴘ
-B;	攌\uABED.ᢖ-ⴘ;	;	xn--p9ut19m.xn----mck373i	#	攌꯭.ᢖ-ⴘ
-B;	攌\uABED.ᢖ-Ⴘ;	[P1 V6];	[P1 V6]	#	攌꯭.ᢖ-Ⴘ
-B;	xn--p9ut19m.xn----k1g451d;	[V6];	[V6]	#	攌꯭.ᢖ-Ⴘ
-B;	xn--1ug592ykp6b.xn----mck373i;	[C2];	[C2]	#	攌꯭.ᢖ-ⴘ
-B;	xn--1ug592ykp6b.xn----k1g451d;	[C2 V6];	[C2 V6]	#	攌꯭.ᢖ-Ⴘ
-T;	\u200Cꖨ．⒗３툒۳;	[C1 P1 V6];	[P1 V6]	#	ꖨ.⒗3툒۳
-N;	\u200Cꖨ．⒗３툒۳;	[C1 P1 V6];	[C1 P1 V6]	#	ꖨ.⒗3툒۳
-T;	\u200Cꖨ．⒗３�ᅭᆩ۳;	[C1 P1 V6];	[P1 V6]	#	ꖨ.⒗3툒۳
-N;	\u200Cꖨ．⒗３�ᅭᆩ۳;	[C1 P1 V6];	[C1 P1 V6]	#	ꖨ.⒗3툒۳
-T;	\u200Cꖨ.16.3툒۳;	[C1];	xn--9r8a.16.xn--3-nyc0117m	#	ꖨ.16.3툒۳
-N;	\u200Cꖨ.16.3툒۳;	[C1];	[C1]	#	ꖨ.16.3툒۳
-T;	\u200Cꖨ.16.3�ᅭᆩ۳;	[C1];	xn--9r8a.16.xn--3-nyc0117m	#	ꖨ.16.3툒۳
-N;	\u200Cꖨ.16.3�ᅭᆩ۳;	[C1];	[C1]	#	ꖨ.16.3툒۳
-B;	xn--9r8a.16.xn--3-nyc0117m;	ꖨ.16.3툒۳;	xn--9r8a.16.xn--3-nyc0117m
-B;	ꖨ.16.3툒۳;	;	xn--9r8a.16.xn--3-nyc0117m
-B;	ꖨ.16.3�ᅭᆩ۳;	ꖨ.16.3툒۳;	xn--9r8a.16.xn--3-nyc0117m
-B;	xn--0ug2473c.16.xn--3-nyc0117m;	[C1];	[C1]	#	ꖨ.16.3툒۳
-B;	xn--9r8a.xn--3-nyc678tu07m;	[V6];	[V6]
-B;	xn--0ug2473c.xn--3-nyc678tu07m;	[C1 V6];	[C1 V6]	#	ꖨ.⒗3툒۳
-B;	⒈걾6.�\u06D0;	[B1 P1 V6];	[B1 P1 V6]	#	⒈걾6.��
-B;	⒈걾6.�\u06D0;	[B1 P1 V6];	[B1 P1 V6]	#	⒈걾6.��
-B;	1.걾6.�\u06D0;	[B1];	[B1]	#	1.걾6.��
-B;	1.걾6.�\u06D0;	[B1];	[B1]	#	1.걾6.��
-B;	1.xn--6-945e.xn--glb1794k;	[B1];	[B1]	#	1.걾6.��
-B;	xn--6-dcps419c.xn--glb1794k;	[B1 V6];	[B1 V6]	#	⒈걾6.��
-B;	��≮≮.󠀧\u0639;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	�0≮≮.ع
-B;	��<\u0338<\u0338.󠀧\u0639;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	�0≮≮.ع
-B;	�0≮≮.󠀧\u0639;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	�0≮≮.ع
-B;	�0<\u0338<\u0338.󠀧\u0639;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	�0≮≮.ع
-B;	�0<\u0338<\u0338.󠀧\u0639;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	�0≮≮.ع
-B;	�0≮≮.󠀧\u0639;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	�0≮≮.ع
-B;	xn--0-ngoa5711v.xn--4gb31034p;	[B1 B3 V6];	[B1 B3 V6]	#	�0≮≮.ع
-B;	��<\u0338<\u0338.󠀧\u0639;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	�0≮≮.ع
-B;	��≮≮.󠀧\u0639;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	�0≮≮.ع
-B;	\u0AE3.�\u115F;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	ૣ.�
-B;	xn--8fc.xn--osd3070k;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	ૣ.�
-T;	��⸖.\u200D;	[C2];	xn--1-5bt6845n.	#	1�⸖.
-N;	��⸖.\u200D;	[C2];	[C2]	#	1�⸖.
-T;	1�⸖.\u200D;	[C2];	xn--1-5bt6845n.	#	1�⸖.
-N;	1�⸖.\u200D;	[C2];	[C2]	#	1�⸖.
-B;	xn--1-5bt6845n.;	1�⸖.;	xn--1-5bt6845n.;	NV8
-B;	1�⸖.;	;	xn--1-5bt6845n.;	NV8
-B;	xn--1-5bt6845n.xn--1ug;	[C2];	[C2]	#	1�⸖.
-T;	�≠\u0726\u1A60｡-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-N;	�≠\u0726\u1A60｡-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-T;	�=\u0338\u0726\u1A60｡-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-N;	�=\u0338\u0726\u1A60｡-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-T;	�≠\u0726\u1A60。-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-N;	�≠\u0726\u1A60。-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-T;	�=\u0338\u0726\u1A60。-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-N;	�=\u0338\u0726\u1A60。-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-T;	𞤲=\u0338\u0726\u1A60。-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-N;	𞤲=\u0338\u0726\u1A60。-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-T;	𞤲≠\u0726\u1A60。-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-N;	𞤲≠\u0726\u1A60。-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-B;	xn--wnb859grzfzw60c.xn----kcd;	[B1 V3 V6];	[B1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-B;	xn--wnb859grzfzw60c.xn----kcd017p;	[B1 C1 V3 V6];	[B1 C1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-T;	𞤲=\u0338\u0726\u1A60｡-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-N;	𞤲=\u0338\u0726\u1A60｡-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-T;	𞤲≠\u0726\u1A60｡-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-N;	𞤲≠\u0726\u1A60｡-\u200C\u07D5;	[B1 C1 P1 V3 V6];	[B1 C1 P1 V3 V6]	#	𞤲≠ܦ᩠.-ߕ
-B;	�\u0368-ꡧ｡\u0675;	[B1];	[B1]	#	�ͨ-ꡧ.اٴ
-B;	�\u0368-ꡧ。\u0627\u0674;	[B1];	[B1]	#	�ͨ-ꡧ.اٴ
-B;	xn----shb2387jgkqd.xn--mgb8m;	[B1];	[B1]	#	�ͨ-ꡧ.اٴ
-B;	F󠅟｡�♚;	[P1 V6];	[P1 V6]
-B;	F󠅟。�♚;	[P1 V6];	[P1 V6]
-B;	f󠅟。�♚;	[P1 V6];	[P1 V6]
-B;	f.xn--45hz6953f;	[V6];	[V6]
-B;	f󠅟｡�♚;	[P1 V6];	[P1 V6]
-B;	\u0B4D𑄴\u1DE9。�Ⴘ𞀨񃥇;	[P1 V5 V6];	[P1 V5 V6]	#	�𑄴ᷩ.2Ⴘ𞀨
-B;	\u0B4D𑄴\u1DE9。2Ⴘ𞀨񃥇;	[P1 V5 V6];	[P1 V5 V6]	#	�𑄴ᷩ.2Ⴘ𞀨
-B;	\u0B4D𑄴\u1DE9。2ⴘ𞀨񃥇;	[P1 V5 V6];	[P1 V5 V6]	#	�𑄴ᷩ.2ⴘ𞀨
-B;	xn--9ic246gs21p.xn--2-nws2918ndrjr;	[V5 V6];	[V5 V6]	#	�𑄴ᷩ.2ⴘ𞀨
-B;	xn--9ic246gs21p.xn--2-k1g43076adrwq;	[V5 V6];	[V5 V6]	#	�𑄴ᷩ.2Ⴘ𞀨
-B;	\u0B4D𑄴\u1DE9。�ⴘ𞀨񃥇;	[P1 V5 V6];	[P1 V5 V6]	#	�𑄴ᷩ.2ⴘ𞀨
-T;	򓠭\u200C\u200C⒈。勉�;	[C1 P1 V6];	[P1 V6]	#	⒈.勉�
-N;	򓠭\u200C\u200C⒈。勉�;	[C1 P1 V6];	[C1 P1 V6]	#	⒈.勉�
-T;	򓠭\u200C\u200C1.。勉�;	[C1 P1 V6 A4_2];	[P1 V6 A4_2]	#	1..勉�
-N;	򓠭\u200C\u200C1.。勉�;	[C1 P1 V6 A4_2];	[C1 P1 V6 A4_2]	#	1..勉�
-B;	xn--1-yi00h..xn--4grs325b;	[V6 A4_2];	[V6 A4_2]
-B;	xn--1-rgna61159u..xn--4grs325b;	[C1 V6 A4_2];	[C1 V6 A4_2]	#	1..勉�
-B;	xn--tsh11906f.xn--4grs325b;	[V6];	[V6]
-B;	xn--0uga855aez302a.xn--4grs325b;	[C1 V6];	[C1 V6]	#	⒈.勉�
-B;	ᡃ.玿񫈜�;	[P1 V6];	[P1 V6]
-B;	xn--27e.xn--7cy81125a0yq4a;	[V6];	[V6]
-T;	\u200C\u200C｡⒈≯�;	[C1 P1 V6];	[P1 V6 A4_2]	#	.⒈≯9
-N;	\u200C\u200C｡⒈≯�;	[C1 P1 V6];	[C1 P1 V6]	#	.⒈≯9
-T;	\u200C\u200C｡⒈>\u0338�;	[C1 P1 V6];	[P1 V6 A4_2]	#	.⒈≯9
-N;	\u200C\u200C｡⒈>\u0338�;	[C1 P1 V6];	[C1 P1 V6]	#	.⒈≯9
-T;	\u200C\u200C。1.≯9;	[C1 P1 V6];	[P1 V6 A4_2]	#	.1.≯9
-N;	\u200C\u200C。1.≯9;	[C1 P1 V6];	[C1 P1 V6]	#	.1.≯9
-T;	\u200C\u200C。1.>\u03389;	[C1 P1 V6];	[P1 V6 A4_2]	#	.1.≯9
-N;	\u200C\u200C。1.>\u03389;	[C1 P1 V6];	[C1 P1 V6]	#	.1.≯9
-B;	.1.xn--9-ogo;	[V6 A4_2];	[V6 A4_2]
-B;	xn--0uga.1.xn--9-ogo;	[C1 V6];	[C1 V6]	#	.1.≯9
-B;	.xn--9-ogo37g;	[V6 A4_2];	[V6 A4_2]
-B;	xn--0uga.xn--9-ogo37g;	[C1 V6];	[C1 V6]	#	.⒈≯9
-B;	\u115F\u1DE0�.𺻆≯�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ᷠ.≯�
-B;	\u115F\u1DE0�.𺻆>\u0338�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ᷠ.≯�
-B;	xn--osd615d5659o.xn--hdh5192gkm6r;	[B5 B6 V6];	[B5 B6 V6]	#	ᷠ.≯�
-T;	󠄫�\u200D\u063E.�-\u081E󑼩;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�ؾ.�-ࠞ
-N;	󠄫�\u200D\u063E.�-\u081E󑼩;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�ؾ.�-ࠞ
-B;	xn--9gb5080v.xn----qgd52296avol4f;	[B1 V5 V6];	[B1 V5 V6]	#	�ؾ.�-ࠞ
-B;	xn--9gb723kg862a.xn----qgd52296avol4f;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	�ؾ.�-ࠞ
-B;	\u20DA．𑘿-;	[V3 V5];	[V3 V5]	#	⃚.𑘿-
-B;	\u20DA.𑘿-;	[V3 V5];	[V3 V5]	#	⃚.𑘿-
-B;	xn--w0g.xn----bd0j;	[V3 V5];	[V3 V5]	#	⃚.𑘿-
-T;	䮸ß.󠵟󠭎紙\u08A8;	[B1 P1 V6];	[B1 P1 V6]	#	䮸ß.紙ࢨ
-N;	䮸ß.󠵟󠭎紙\u08A8;	[B1 P1 V6];	[B1 P1 V6]	#	䮸ß.紙ࢨ
-B;	䮸SS.󠵟󠭎紙\u08A8;	[B1 P1 V6];	[B1 P1 V6]	#	䮸ss.紙ࢨ
-B;	䮸ss.󠵟󠭎紙\u08A8;	[B1 P1 V6];	[B1 P1 V6]	#	䮸ss.紙ࢨ
-B;	䮸Ss.󠵟󠭎紙\u08A8;	[B1 P1 V6];	[B1 P1 V6]	#	䮸ss.紙ࢨ
-B;	xn--ss-sf1c.xn--xyb1370div70kpzba;	[B1 V6];	[B1 V6]	#	䮸ss.紙ࢨ
-B;	xn--zca5349a.xn--xyb1370div70kpzba;	[B1 V6];	[B1 V6]	#	䮸ß.紙ࢨ
-B;	-Ⴞ.-�⅔�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	-Ⴞ.-�2�3�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]
-B;	-ⴞ.-�2�3�;	[B1 V3];	[B1 V3]
-B;	xn----zws.xn---23-pt0a0433lk3jj;	[B1 V3];	[B1 V3]
-B;	xn----w1g.xn---23-pt0a0433lk3jj;	[B1 V3 V6];	[B1 V3 V6]
-B;	-ⴞ.-�⅔�;	[B1 V3];	[B1 V3]
-B;	󧈯�\u0AC2｡򖢨�񇼖ᡂ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	�ૂ.�ᡂ
-B;	󧈯�\u0AC2。򖢨�񇼖ᡂ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	�ૂ.�ᡂ
-B;	xn--bfc7604kv8m3g.xn--17e5565jl7zw4h16a;	[B5 B6 V6];	[B5 B6 V6]	#	�ૂ.�ᡂ
-T;	\u1082-\u200D\uA8EA．ꡊ\u200D񼸳;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ႂ-꣪.ꡊ
-N;	\u1082-\u200D\uA8EA．ꡊ\u200D񼸳;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ႂ-꣪.ꡊ
-T;	\u1082-\u200D\uA8EA.ꡊ\u200D񼸳;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ႂ-꣪.ꡊ
-N;	\u1082-\u200D\uA8EA.ꡊ\u200D񼸳;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ႂ-꣪.ꡊ
-B;	xn----gyg3618i.xn--jc9ao4185a;	[V5 V6];	[V5 V6]	#	ႂ-꣪.ꡊ
-B;	xn----gyg250jio7k.xn--1ug8774cri56d;	[C2 V5 V6];	[C2 V5 V6]	#	ႂ-꣪.ꡊ
-B;	۱。≠\u0668;	[B1 P1 V6];	[B1 P1 V6]	#	۱.≠٨
-B;	۱。=\u0338\u0668;	[B1 P1 V6];	[B1 P1 V6]	#	۱.≠٨
-B;	xn--emb.xn--hib334l;	[B1 V6];	[B1 V6]	#	۱.≠٨
-B;	𑈵廊.�;	[V5];	[V5]
-B;	xn--xytw701b.xn--yc9c;	[V5];	[V5]
-T;	\u200D\u0356-．-Ⴐ\u0661;	[B1 C2 P1 V3 V6];	[B1 P1 V3 V5 V6]	#	͖-.-Ⴐ١
-N;	\u200D\u0356-．-Ⴐ\u0661;	[B1 C2 P1 V3 V6];	[B1 C2 P1 V3 V6]	#	͖-.-Ⴐ١
-T;	\u200D\u0356-.-á‚°\u0661;	[B1 C2 P1 V3 V6];	[B1 P1 V3 V5 V6]	#	Í–-.-á‚°Ù¡
-N;	\u200D\u0356-.-á‚°\u0661;	[B1 C2 P1 V3 V6];	[B1 C2 P1 V3 V6]	#	Í–-.-á‚°Ù¡
-T;	\u200D\u0356-.-â´�\u0661;	[B1 C2 V3];	[B1 V3 V5]	#	Í–-.-â´�Ù¡
-N;	\u200D\u0356-.-â´�\u0661;	[B1 C2 V3];	[B1 C2 V3]	#	Í–-.-â´�Ù¡
-B;	xn----rgb.xn----bqc2280a;	[B1 V3 V5];	[B1 V3 V5]	#	Í–-.-â´�Ù¡
-B;	xn----rgb661t.xn----bqc2280a;	[B1 C2 V3];	[B1 C2 V3]	#	Í–-.-â´�Ù¡
-B;	xn----rgb.xn----bqc030f;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	Í–-.-á‚°Ù¡
-B;	xn----rgb661t.xn----bqc030f;	[B1 C2 V3 V6];	[B1 C2 V3 V6]	#	Í–-.-á‚°Ù¡
-T;	\u200D\u0356-．-�\u0661;	[B1 C2 V3];	[B1 V3 V5]	#	͖-.-�١
-N;	\u200D\u0356-．-�\u0661;	[B1 C2 V3];	[B1 C2 V3]	#	͖-.-�١
-B;	\u063A\u0661��.-;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	غ١�.-
-B;	xn--5gb2f4205aqi47p.-;	[B1 B2 B3 V3 V6];	[B1 B2 B3 V3 V6]	#	غ١�.-
-B;	\u06EF｡�𞤽;	[B1];	[B1]	#	ۯ.�𞤽
-B;	\u06EF。�𞤽;	[B1];	[B1]	#	ۯ.�𞤽
-B;	\u06EF。�𞤛;	[B1];	[B1]	#	ۯ.�𞤽
-B;	xn--cmb.xn--fo0dy848a;	[B1];	[B1]	#	ۯ.�𞤽
-B;	\u06EF｡�𞤛;	[B1];	[B1]	#	ۯ.�𞤽
-B;	Ⴞ𶛀𛗻．ᢗ릫;	[P1 V6];	[P1 V6]
-B;	Ⴞ𶛀𛗻．ᢗ릫;	[P1 V6];	[P1 V6]
-B;	Ⴞ𶛀𛗻.ᢗ릫;	[P1 V6];	[P1 V6]
-B;	Ⴞ𶛀𛗻.ᢗ릫;	[P1 V6];	[P1 V6]
-B;	ⴞ𶛀𛗻.ᢗ릫;	[P1 V6];	[P1 V6]
-B;	ⴞ𶛀𛗻.ᢗ릫;	[P1 V6];	[P1 V6]
-B;	xn--mlj0486jgl2j.xn--hbf6853f;	[V6];	[V6]
-B;	xn--2nd8876sgl2j.xn--hbf6853f;	[V6];	[V6]
-B;	ⴞ𶛀𛗻．ᢗ릫;	[P1 V6];	[P1 V6]
-B;	ⴞ𶛀𛗻．ᢗ릫;	[P1 V6];	[P1 V6]
-T;	󠎃󗭞\u06B7�｡≯\u200C\u1DFE;	[B1 C1 P1 V6];	[B1 P1 V6]	#	ڷ�.≯᷾
-N;	󠎃󗭞\u06B7�｡≯\u200C\u1DFE;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ڷ�.≯᷾
-T;	󠎃󗭞\u06B7�｡>\u0338\u200C\u1DFE;	[B1 C1 P1 V6];	[B1 P1 V6]	#	ڷ�.≯᷾
-N;	󠎃󗭞\u06B7�｡>\u0338\u200C\u1DFE;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ڷ�.≯᷾
-T;	󠎃󗭞\u06B7�。≯\u200C\u1DFE;	[B1 C1 P1 V6];	[B1 P1 V6]	#	ڷ�.≯᷾
-N;	󠎃󗭞\u06B7�。≯\u200C\u1DFE;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ڷ�.≯᷾
-T;	󠎃󗭞\u06B7�。>\u0338\u200C\u1DFE;	[B1 C1 P1 V6];	[B1 P1 V6]	#	ڷ�.≯᷾
-N;	󠎃󗭞\u06B7�。>\u0338\u200C\u1DFE;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ڷ�.≯᷾
-B;	xn--qkb4516kbi06fg2id.xn--zfg31q;	[B1 V6];	[B1 V6]	#	ڷ�.≯᷾
-B;	xn--qkb4516kbi06fg2id.xn--zfg59fm0c;	[B1 C1 V6];	[B1 C1 V6]	#	ڷ�.≯᷾
-T;	ᛎ��\u200D｡���-;	[B1 B6 C2 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	ᛎ.��-
-N;	ᛎ��\u200D｡���-;	[B1 B6 C2 P1 V3 V6];	[B1 B6 C2 P1 V3 V6]	#	ᛎ.��-
-T;	ᛎ��\u200D。���-;	[B1 B6 C2 P1 V3 V6];	[B1 B6 P1 V3 V6]	#	ᛎ.��-
-N;	ᛎ��\u200D。���-;	[B1 B6 C2 P1 V3 V6];	[B1 B6 C2 P1 V3 V6]	#	ᛎ.��-
-B;	xn--fxe63563p.xn----q26i2bvu;	[B1 B6 V3 V6];	[B1 B6 V3 V6]
-B;	xn--fxe848bq3411a.xn----q26i2bvu;	[B1 B6 C2 V3 V6];	[B1 B6 C2 V3 V6]	#	ᛎ.��-
-B;	�.�;	[B1];	[B1]
-B;	xn--uo0d.xn--rw9c;	[B1];	[B1]
-T;	ß\u200D\u103A｡⒈;	[C2 P1 V6];	[P1 V6]	#	ß်.⒈
-N;	ß\u200D\u103A｡⒈;	[C2 P1 V6];	[C2 P1 V6]	#	ß်.⒈
-T;	ß\u200D\u103A。1.;	[C2];	xn--ss-f4j.1.	#	ß်.1.
-N;	ß\u200D\u103A。1.;	[C2];	[C2]	#	ß်.1.
-T;	SS\u200D\u103A。1.;	[C2];	xn--ss-f4j.1.	#	ss်.1.
-N;	SS\u200D\u103A。1.;	[C2];	[C2]	#	ss်.1.
-T;	ss\u200D\u103A。1.;	[C2];	xn--ss-f4j.1.	#	ss်.1.
-N;	ss\u200D\u103A。1.;	[C2];	[C2]	#	ss်.1.
-T;	Ss\u200D\u103A。1.;	[C2];	xn--ss-f4j.1.	#	ss်.1.
-N;	Ss\u200D\u103A。1.;	[C2];	[C2]	#	ss်.1.
-B;	xn--ss-f4j.1.;	ss\u103A.1.;	xn--ss-f4j.1.	#	ss်.1.
-B;	ss\u103A.1.;	;	xn--ss-f4j.1.	#	ss်.1.
-B;	SS\u103A.1.;	ss\u103A.1.;	xn--ss-f4j.1.	#	ss်.1.
-B;	Ss\u103A.1.;	ss\u103A.1.;	xn--ss-f4j.1.	#	ss်.1.
-B;	xn--ss-f4j585j.1.;	[C2];	[C2]	#	ss်.1.
-B;	xn--zca679eh2l.1.;	[C2];	[C2]	#	ß်.1.
-T;	SS\u200D\u103A｡⒈;	[C2 P1 V6];	[P1 V6]	#	ss်.⒈
-N;	SS\u200D\u103A｡⒈;	[C2 P1 V6];	[C2 P1 V6]	#	ss်.⒈
-T;	ss\u200D\u103A｡⒈;	[C2 P1 V6];	[P1 V6]	#	ss်.⒈
-N;	ss\u200D\u103A｡⒈;	[C2 P1 V6];	[C2 P1 V6]	#	ss်.⒈
-T;	Ss\u200D\u103A｡⒈;	[C2 P1 V6];	[P1 V6]	#	ss်.⒈
-N;	Ss\u200D\u103A｡⒈;	[C2 P1 V6];	[C2 P1 V6]	#	ss်.⒈
-B;	xn--ss-f4j.xn--tsh;	[V6];	[V6]	#	ss်.⒈
-B;	xn--ss-f4j585j.xn--tsh;	[C2 V6];	[C2 V6]	#	ss်.⒈
-B;	xn--zca679eh2l.xn--tsh;	[C2 V6];	[C2 V6]	#	ß်.⒈
-T;	\u0B4D\u200C𙶵𞻘。\u200D;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	�.
-N;	\u0B4D\u200C𙶵𞻘。\u200D;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	�.
-B;	xn--9ic6417rn4xb.;	[B1 V5 V6];	[B1 V5 V6]	#	à­�.
-B;	xn--9ic637hz82z32jc.xn--1ug;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	à­�.
-B;	�｡\u06BC�;	[B3];	[B3]	#	�.ڼ�
-B;	�。\u06BC�;	[B3];	[B3]	#	�.ڼ�
-B;	xn--c29c.xn--vkb8871w;	[B3];	[B3]	#	�.ڼ�
-T;	\u0620\u17D2。�󠀧\u200C𑈵;	[B2 B3 C1 P1 V6];	[B2 B3 P1 V6]	#	ؠ្.�𑈵
-N;	\u0620\u17D2。�󠀧\u200C𑈵;	[B2 B3 C1 P1 V6];	[B2 B3 C1 P1 V6]	#	ؠ្.�𑈵
-B;	xn--fgb471g.xn--9w9c29jw3931a;	[B2 B3 V6];	[B2 B3 V6]	#	ؠ្.�𑈵
-B;	xn--fgb471g.xn--0ug9853g7verp838a;	[B2 B3 C1 V6];	[B2 B3 C1 V6]	#	ؠ្.�𑈵
-B;	񋉕.𞣕𞤊;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	񋉕.𞣕𞤬;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	xn--tf5w.xn--2b6hof;	[B1 V5 V6];	[B1 V5 V6]
-T;	\u06CC�．ß\u0F84�;	\u06CC�.ß\u0F84�;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ß྄�
-N;	\u06CC�．ß\u0F84�;	\u06CC�.ß\u0F84�;	xn--clb2593k.xn--zca216edt0r	#	ی�.ß྄�
-T;	\u06CC�.ß\u0F84�;	;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ß྄�
-N;	\u06CC�.ß\u0F84�;	;	xn--clb2593k.xn--zca216edt0r	#	ی�.ß྄�
-B;	\u06CC�.SS\u0F84�;	\u06CC�.ss\u0F84�;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ss྄�
-B;	\u06CC�.ss\u0F84�;	;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ss྄�
-B;	\u06CC�.Ss\u0F84�;	\u06CC�.ss\u0F84�;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ss྄�
-B;	xn--clb2593k.xn--ss-toj6092t;	\u06CC�.ss\u0F84�;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ss྄�
-B;	xn--clb2593k.xn--zca216edt0r;	\u06CC�.ß\u0F84�;	xn--clb2593k.xn--zca216edt0r	#	ی�.ß྄�
-B;	\u06CC�．SS\u0F84�;	\u06CC�.ss\u0F84�;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ss྄�
-B;	\u06CC�．ss\u0F84�;	\u06CC�.ss\u0F84�;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ss྄�
-B;	\u06CC�．Ss\u0F84�;	\u06CC�.ss\u0F84�;	xn--clb2593k.xn--ss-toj6092t	#	ی�.ss྄�
-T;	�≮\u200C｡󠅱\u17B4;	[C1 P1 V5 V6];	[P1 V5 V6]	#	8≮.
-N;	�≮\u200C｡󠅱\u17B4;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	8≮.
-T;	�<\u0338\u200C｡󠅱\u17B4;	[C1 P1 V5 V6];	[P1 V5 V6]	#	8≮.
-N;	�<\u0338\u200C｡󠅱\u17B4;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	8≮.
-T;	8≮\u200C。󠅱\u17B4;	[C1 P1 V5 V6];	[P1 V5 V6]	#	8≮.
-N;	8≮\u200C。󠅱\u17B4;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	8≮.
-T;	8<\u0338\u200C。󠅱\u17B4;	[C1 P1 V5 V6];	[P1 V5 V6]	#	8≮.
-N;	8<\u0338\u200C。󠅱\u17B4;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	8≮.
-B;	xn--8-ngo.xn--z3e;	[V5 V6];	[V5 V6]	#	8≮.
-B;	xn--8-sgn10i.xn--z3e;	[C1 V5 V6];	[C1 V5 V6]	#	8≮.
-B;	ᢕ≯︒񄂯．Ⴀ;	[P1 V6];	[P1 V6]
-B;	ᢕ>\u0338︒񄂯．Ⴀ;	[P1 V6];	[P1 V6]
-B;	ᢕ≯。񄂯.Ⴀ;	[P1 V6];	[P1 V6]
-B;	ᢕ>\u0338。񄂯.Ⴀ;	[P1 V6];	[P1 V6]
-B;	ᢕ>\u0338。񄂯.ⴀ;	[P1 V6];	[P1 V6]
-B;	ᢕ≯。񄂯.ⴀ;	[P1 V6];	[P1 V6]
-B;	xn--fbf851c.xn--ko1u.xn--rkj;	[V6];	[V6]
-B;	xn--fbf851c.xn--ko1u.xn--7md;	[V6];	[V6]
-B;	ᢕ>\u0338︒񄂯．ⴀ;	[P1 V6];	[P1 V6]
-B;	ᢕ≯︒񄂯．ⴀ;	[P1 V6];	[P1 V6]
-B;	xn--fbf851cq98poxw1a.xn--rkj;	[V6];	[V6]
-B;	xn--fbf851cq98poxw1a.xn--7md;	[V6];	[V6]
-B;	\u0F9F．-\u082A;	[V3 V5];	[V3 V5]	#	ྟ.-ࠪ
-B;	\u0F9F.-\u082A;	[V3 V5];	[V3 V5]	#	ྟ.-ࠪ
-B;	xn--vfd.xn----fhd;	[V3 V5];	[V3 V5]	#	ྟ.-ࠪ
-B;	ᵬ󠆠．핒⒒⒈􈄦;	[P1 V6];	[P1 V6]
-B;	ᵬ󠆠．핒⒒⒈􈄦;	[P1 V6];	[P1 V6]
-B;	ᵬ󠆠.핒11.1.􈄦;	[P1 V6];	[P1 V6]
-B;	ᵬ󠆠.핒11.1.􈄦;	[P1 V6];	[P1 V6]
-B;	xn--tbg.xn--11-5o7k.1.xn--k469f;	[V6];	[V6]
-B;	xn--tbg.xn--tsht7586kyts9l;	[V6];	[V6]
-T;	ς𑓂�．\u0668;	[B1];	[B1]	#	ς𑓂�.٨
-N;	ς𑓂�．\u0668;	[B1];	[B1]	#	ς𑓂�.٨
-T;	ς𑓂�.\u0668;	[B1];	[B1]	#	ς𑓂�.٨
-N;	ς𑓂�.\u0668;	[B1];	[B1]	#	ς𑓂�.٨
-B;	Σ𑓂�.\u0668;	[B1];	[B1]	#	σ𑓂�.٨
-B;	σ𑓂�.\u0668;	[B1];	[B1]	#	σ𑓂�.٨
-B;	xn--4xa6371khhl.xn--hib;	[B1];	[B1]	#	σ𑓂�.٨
-B;	xn--3xa8371khhl.xn--hib;	[B1];	[B1]	#	ς𑓂�.٨
-B;	Σ𑓂�．\u0668;	[B1];	[B1]	#	σ𑓂�.٨
-B;	σ𑓂�．\u0668;	[B1];	[B1]	#	σ𑓂�.٨
-T;	\uA953\u200C�\u200D.\u2DF8𞿄�;	[B1 B6 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	꥓�.ⷸ�
-N;	\uA953\u200C�\u200D.\u2DF8𞿄�;	[B1 B6 C2 P1 V5 V6];	[B1 B6 C2 P1 V5 V6]	#	꥓�.ⷸ�
-B;	xn--3j9a531o.xn--urju692efj0f;	[B1 V5 V6];	[B1 V5 V6]	#	꥓�.ⷸ�
-B;	xn--0ugc8356he76c.xn--urju692efj0f;	[B1 B6 C2 V5 V6];	[B1 B6 C2 V5 V6]	#	꥓�.ⷸ�
-B;	⊼。񪧖\u0695;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	⊼.ڕ
-B;	xn--ofh.xn--rjb13118f;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	⊼.ڕ
-B;	�񖋔。󜳥;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	xn--949co370q.xn--7g25e;	[B2 B3 V6];	[B2 B3 V6]
-T;	\u0601�\u07DD。ς�🀞\u17B5;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	��.ς🀞
-N;	\u0601�\u07DD。ς�🀞\u17B5;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	��.ς🀞
-B;	\u0601�\u07DD。Σ�🀞\u17B5;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	��.σ🀞
-B;	\u0601�\u07DD。σ�🀞\u17B5;	[B1 B6 P1 V6];	[B1 B6 P1 V6]	#	��.σ🀞
-B;	xn--jfb66gt010c.xn--4xa623h9p95ars26d;	[B1 B6 V6];	[B1 B6 V6]	#	��.σ🀞
-B;	xn--jfb66gt010c.xn--3xa823h9p95ars26d;	[B1 B6 V6];	[B1 B6 V6]	#	��.ς🀞
-B;	-�\u0646�。\uABED�;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-�ن.꯭3
-B;	-�\u0646�。\uABED3;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-�ن.꯭3
-B;	-�\u0646�。\uABED3;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-�ن.꯭3
-B;	xn----roc5482rek10i.xn--3-zw5e;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	-�ن.꯭3
-B;	-�\u0646�。\uABED�;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	-�ن.꯭3
-T;	\u200C󠴦｡񲨕≮�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	.≮�
-N;	\u200C󠴦｡񲨕≮�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.≮�
-T;	\u200C󠴦｡񲨕<\u0338�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	.≮�
-N;	\u200C󠴦｡񲨕<\u0338�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.≮�
-T;	\u200C󠴦。񲨕≮�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	.≮�
-N;	\u200C󠴦。񲨕≮�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.≮�
-T;	\u200C󠴦。񲨕<\u0338�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 P1 V6]	#	.≮�
-N;	\u200C󠴦。񲨕<\u0338�;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.≮�
-B;	xn--6v56e.xn--gdhz712gzlr6b;	[B1 B5 B6 V6];	[B1 B5 B6 V6]
-B;	xn--0ug22251l.xn--gdhz712gzlr6b;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	.≮�
-B;	⒈✌򟬟．�񠱣;	[P1 V6];	[P1 V6]
-B;	1.✌򟬟.9񠱣;	[P1 V6];	[P1 V6]
-B;	1.xn--7bi44996f.xn--9-o706d;	[V6];	[V6]
-B;	xn--tsh24g49550b.xn--9-o706d;	[V6];	[V6]
-B;	𑆾𞤬�.\u0666\u1DD4;	[B1 V5];	[B1 V5]	#	𑆾𞤬�.٦ᷔ
-B;	𑆾𞤊�.\u0666\u1DD4;	[B1 V5];	[B1 V5]	#	𑆾𞤬�.٦ᷔ
-B;	xn--d29c79hf98r.xn--fib011j;	[B1 V5];	[B1 V5]	#	𑆾𞤬�.٦ᷔ
-T;	ς．\uA9C0\uA8C4;	[V5];	[V5]	#	ς.꧀꣄
-N;	ς．\uA9C0\uA8C4;	[V5];	[V5]	#	ς.꧀꣄
-T;	ς.\uA9C0\uA8C4;	[V5];	[V5]	#	ς.꧀꣄
-N;	ς.\uA9C0\uA8C4;	[V5];	[V5]	#	ς.꧀꣄
-B;	Σ.\uA9C0\uA8C4;	[V5];	[V5]	#	σ.꧀꣄
-B;	σ.\uA9C0\uA8C4;	[V5];	[V5]	#	σ.꧀꣄
-B;	xn--4xa.xn--0f9ars;	[V5];	[V5]	#	σ.꧀꣄
-B;	xn--3xa.xn--0f9ars;	[V5];	[V5]	#	ς.꧀꣄
-B;	Σ．\uA9C0\uA8C4;	[V5];	[V5]	#	σ.꧀꣄
-B;	σ．\uA9C0\uA8C4;	[V5];	[V5]	#	σ.꧀꣄
-T;	𑰶\u200C≯�．\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑰶≯�.࡛
-N;	𑰶\u200C≯�．\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 C1 P1 V5 V6]	#	𑰶≯�.࡛
-T;	𑰶\u200C>\u0338�．\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑰶≯�.࡛
-N;	𑰶\u200C>\u0338�．\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 C1 P1 V5 V6]	#	𑰶≯�.࡛
-T;	𑰶\u200C≯�.\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑰶≯�.࡛
-N;	𑰶\u200C≯�.\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 C1 P1 V5 V6]	#	𑰶≯�.࡛
-T;	𑰶\u200C>\u0338�.\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑰶≯�.࡛
-N;	𑰶\u200C>\u0338�.\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 C1 P1 V5 V6]	#	𑰶≯�.࡛
-T;	𑰶\u200C>\u0338�.\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑰶≯�.࡛
-N;	𑰶\u200C>\u0338�.\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 C1 P1 V5 V6]	#	𑰶≯�.࡛
-T;	𑰶\u200C≯�.\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑰶≯�.࡛
-N;	𑰶\u200C≯�.\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 C1 P1 V5 V6]	#	𑰶≯�.࡛
-B;	xn--hdhz343g3wj.xn--qwb;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	𑰶≯�.࡛
-B;	xn--0ug06g7697ap4ma.xn--qwb;	[B1 B3 B6 C1 V5 V6];	[B1 B3 B6 C1 V5 V6]	#	𑰶≯�.࡛
-T;	𑰶\u200C>\u0338�．\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑰶≯�.࡛
-N;	𑰶\u200C>\u0338�．\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 C1 P1 V5 V6]	#	𑰶≯�.࡛
-T;	𑰶\u200C≯�．\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	𑰶≯�.࡛
-N;	𑰶\u200C≯�．\u085B;	[B1 B3 B6 C1 P1 V5 V6];	[B1 B3 B6 C1 P1 V5 V6]	#	𑰶≯�.࡛
-B;	羚｡≯;	[P1 V6];	[P1 V6]
-B;	羚｡>\u0338;	[P1 V6];	[P1 V6]
-B;	羚。≯;	[P1 V6];	[P1 V6]
-B;	羚。>\u0338;	[P1 V6];	[P1 V6]
-B;	xn--xt0a.xn--hdh;	[V6];	[V6]
-B;	𑓂\u1759．\u08A8;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𑓂.ࢨ
-B;	𑓂\u1759.\u08A8;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𑓂.ࢨ
-B;	xn--e1e9580k.xn--xyb;	[B1 V5 V6];	[B1 V5 V6]	#	𑓂.ࢨ
-T;	󨣿󠇀\u200D｡\u0663ҠჀ�;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	.٣ҡჀ3
-N;	󨣿󠇀\u200D｡\u0663ҠჀ�;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	.٣ҡჀ3
-T;	󨣿󠇀\u200D。\u0663ҠჀ3;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	.٣ҡჀ3
-N;	󨣿󠇀\u200D。\u0663ҠჀ3;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	.٣ҡჀ3
-T;	󨣿󠇀\u200D。\u0663ҡⴠ3;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	.٣ҡⴠ3
-N;	󨣿󠇀\u200D。\u0663ҡⴠ3;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	.٣ҡⴠ3
-T;	󨣿󠇀\u200D。\u0663Ҡⴠ3;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	.٣ҡⴠ3
-N;	󨣿󠇀\u200D。\u0663Ҡⴠ3;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	.٣ҡⴠ3
-B;	xn--1r19e.xn--3-ozb36ko13f;	[B1 V6];	[B1 V6]	#	.Ù£Ò¡â´ 3
-B;	xn--1ug89936l.xn--3-ozb36ko13f;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	.Ù£Ò¡â´ 3
-B;	xn--1r19e.xn--3-ozb36kixu;	[B1 V6];	[B1 V6]	#	.٣ҡჀ3
-B;	xn--1ug89936l.xn--3-ozb36kixu;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	.٣ҡჀ3
-T;	󨣿󠇀\u200D｡\u0663ҡⴠ�;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	.٣ҡⴠ3
-N;	󨣿󠇀\u200D｡\u0663ҡⴠ�;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	.٣ҡⴠ3
-T;	󨣿󠇀\u200D｡\u0663Ҡⴠ�;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	.٣ҡⴠ3
-N;	󨣿󠇀\u200D｡\u0663Ҡⴠ�;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	.٣ҡⴠ3
-B;	ᡷ。�\u08E0;	[B1];	[B1]	#	ᡷ.�࣠
-B;	xn--k9e.xn--j0b5005k;	[B1];	[B1]	#	ᡷ.�࣠
-T;	򕮇\u1BF3｡\u0666񗜼\u17D2ß;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ß
-N;	򕮇\u1BF3｡\u0666񗜼\u17D2ß;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ß
-T;	򕮇\u1BF3。\u0666񗜼\u17D2ß;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ß
-N;	򕮇\u1BF3。\u0666񗜼\u17D2ß;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ß
-B;	򕮇\u1BF3。\u0666񗜼\u17D2SS;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ss
-B;	򕮇\u1BF3。\u0666񗜼\u17D2ss;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ss
-B;	򕮇\u1BF3。\u0666񗜼\u17D2Ss;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ss
-B;	xn--1zf58212h.xn--ss-pyd459o3258m;	[B1 V6];	[B1 V6]	#	᯳.٦្ss
-B;	xn--1zf58212h.xn--zca34zk4qx711k;	[B1 V6];	[B1 V6]	#	᯳.٦្ß
-B;	򕮇\u1BF3｡\u0666񗜼\u17D2SS;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ss
-B;	򕮇\u1BF3｡\u0666񗜼\u17D2ss;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ss
-B;	򕮇\u1BF3｡\u0666񗜼\u17D2Ss;	[B1 P1 V6];	[B1 P1 V6]	#	᯳.٦្ss
-B;	\u0664򤽎𑲛.󠔢︒≠;	[B1 P1 V6];	[B1 P1 V6]	#	٤𑲛.︒≠
-B;	\u0664򤽎𑲛.󠔢︒=\u0338;	[B1 P1 V6];	[B1 P1 V6]	#	٤𑲛.︒≠
-B;	\u0664򤽎𑲛.󠔢。≠;	[B1 P1 V6];	[B1 P1 V6]	#	٤𑲛..≠
-B;	\u0664򤽎𑲛.󠔢。=\u0338;	[B1 P1 V6];	[B1 P1 V6]	#	٤𑲛..≠
-B;	xn--dib0653l2i02d.xn--k736e.xn--1ch;	[B1 V6];	[B1 V6]	#	٤𑲛..≠
-B;	xn--dib0653l2i02d.xn--1ch7467f14u4g;	[B1 V6];	[B1 V6]	#	٤𑲛.︒≠
-B;	➆񷧕ỗ⒈．򑬒񡘮\u085B�;	[P1 V6];	[P1 V6]	#	➆ỗ⒈.࡛9
-B;	➆񷧕o\u0302\u0303⒈．򑬒񡘮\u085B�;	[P1 V6];	[P1 V6]	#	➆ỗ⒈.࡛9
-B;	➆񷧕ỗ1..򑬒񡘮\u085B9;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	➆ỗ1..࡛9
-B;	➆񷧕o\u0302\u03031..򑬒񡘮\u085B9;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	➆ỗ1..࡛9
-B;	➆񷧕O\u0302\u03031..򑬒񡘮\u085B9;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	➆ỗ1..࡛9
-B;	➆񷧕Ỗ1..򑬒񡘮\u085B9;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	➆ỗ1..࡛9
-B;	xn--1-3xm292b6044r..xn--9-6jd87310jtcqs;	[V6 A4_2];	[V6 A4_2]	#	➆ỗ1..࡛9
-B;	➆񷧕O\u0302\u0303⒈．򑬒񡘮\u085B�;	[P1 V6];	[P1 V6]	#	➆ỗ⒈.࡛9
-B;	➆񷧕Ỗ⒈．򑬒񡘮\u085B�;	[P1 V6];	[P1 V6]	#	➆ỗ⒈.࡛9
-B;	xn--6lg26tvvc6v99z.xn--9-6jd87310jtcqs;	[V6];	[V6]	#	➆ỗ⒈.࡛9
-T;	\u200D｡𞤘;	[B1 C2];	[A4_2]	#	.𞤺
-N;	\u200D｡𞤘;	[B1 C2];	[B1 C2]	#	.𞤺
-T;	\u200D。𞤘;	[B1 C2];	[A4_2]	#	.𞤺
-N;	\u200D。𞤘;	[B1 C2];	[B1 C2]	#	.𞤺
-T;	\u200D。𞤺;	[B1 C2];	[A4_2]	#	.𞤺
-N;	\u200D。𞤺;	[B1 C2];	[B1 C2]	#	.𞤺
-B;	.xn--ye6h;	[A4_2];	[A4_2]
-B;	xn--1ug.xn--ye6h;	[B1 C2];	[B1 C2]	#	.𞤺
-T;	\u200D｡𞤺;	[B1 C2];	[A4_2]	#	.𞤺
-N;	\u200D｡𞤺;	[B1 C2];	[B1 C2]	#	.𞤺
-B;	xn--ye6h;	𞤺;	xn--ye6h
-B;	𞤺;	;	xn--ye6h
-B;	𞤘;	𞤺;	xn--ye6h
-B;	\u0829\u0724.ᢣ;	[B1 V5];	[B1 V5]	#	ࠩܤ.ᢣ
-B;	xn--unb53c.xn--tbf;	[B1 V5];	[B1 V5]	#	ࠩܤ.ᢣ
-T;	\u073C\u200C-。�ß;	[C1 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ܼ-.ß
-N;	\u073C\u200C-。�ß;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	ܼ-.ß
-T;	\u073C\u200C-。�SS;	[C1 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ܼ-.ss
-N;	\u073C\u200C-。�SS;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	ܼ-.ss
-T;	\u073C\u200C-。�ss;	[C1 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ܼ-.ss
-N;	\u073C\u200C-。�ss;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	ܼ-.ss
-T;	\u073C\u200C-。�Ss;	[C1 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	ܼ-.ss
-N;	\u073C\u200C-。�Ss;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	ܼ-.ss
-B;	xn----s2c.xn--ss-066q;	[V3 V5 V6];	[V3 V5 V6]	#	ܼ-.ss
-B;	xn----s2c071q.xn--ss-066q;	[C1 V3 V5 V6];	[C1 V3 V5 V6]	#	ܼ-.ss
-B;	xn----s2c071q.xn--zca7848m;	[C1 V3 V5 V6];	[C1 V3 V5 V6]	#	ܼ-.ß
-T;	\u200Cς🃡⒗.\u0CC6仧\u0756;	[B1 B5 B6 C1 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	ς🃡⒗.ೆ仧ݖ
-N;	\u200Cς🃡⒗.\u0CC6仧\u0756;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 C1 P1 V5 V6]	#	ς🃡⒗.ೆ仧ݖ
-T;	\u200Cς🃡16..\u0CC6仧\u0756;	[B1 B5 B6 C1 V5 A4_2];	[B5 B6 V5 A4_2]	#	ς🃡16..ೆ仧ݖ
-N;	\u200Cς🃡16..\u0CC6仧\u0756;	[B1 B5 B6 C1 V5 A4_2];	[B1 B5 B6 C1 V5 A4_2]	#	ς🃡16..ೆ仧ݖ
-T;	\u200CΣ🃡16..\u0CC6仧\u0756;	[B1 B5 B6 C1 V5 A4_2];	[B5 B6 V5 A4_2]	#	σ🃡16..ೆ仧ݖ
-N;	\u200CΣ🃡16..\u0CC6仧\u0756;	[B1 B5 B6 C1 V5 A4_2];	[B1 B5 B6 C1 V5 A4_2]	#	σ🃡16..ೆ仧ݖ
-T;	\u200Cσ🃡16..\u0CC6仧\u0756;	[B1 B5 B6 C1 V5 A4_2];	[B5 B6 V5 A4_2]	#	σ🃡16..ೆ仧ݖ
-N;	\u200Cσ🃡16..\u0CC6仧\u0756;	[B1 B5 B6 C1 V5 A4_2];	[B1 B5 B6 C1 V5 A4_2]	#	σ🃡16..ೆ仧ݖ
-B;	xn--16-ubc66061c..xn--9ob79ycx2e;	[B5 B6 V5 A4_2];	[B5 B6 V5 A4_2]	#	σ🃡16..ೆ仧ݖ
-B;	xn--16-ubc7700avy99b..xn--9ob79ycx2e;	[B1 B5 B6 C1 V5 A4_2];	[B1 B5 B6 C1 V5 A4_2]	#	σ🃡16..ೆ仧ݖ
-B;	xn--16-rbc1800avy99b..xn--9ob79ycx2e;	[B1 B5 B6 C1 V5 A4_2];	[B1 B5 B6 C1 V5 A4_2]	#	ς🃡16..ೆ仧ݖ
-T;	\u200CΣ🃡⒗.\u0CC6仧\u0756;	[B1 B5 B6 C1 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	σ🃡⒗.ೆ仧ݖ
-N;	\u200CΣ🃡⒗.\u0CC6仧\u0756;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 C1 P1 V5 V6]	#	σ🃡⒗.ೆ仧ݖ
-T;	\u200Cσ🃡⒗.\u0CC6仧\u0756;	[B1 B5 B6 C1 P1 V5 V6];	[B5 B6 P1 V5 V6]	#	σ🃡⒗.ೆ仧ݖ
-N;	\u200Cσ🃡⒗.\u0CC6仧\u0756;	[B1 B5 B6 C1 P1 V5 V6];	[B1 B5 B6 C1 P1 V5 V6]	#	σ🃡⒗.ೆ仧ݖ
-B;	xn--4xa229nbu92a.xn--9ob79ycx2e;	[B5 B6 V5 V6];	[B5 B6 V5 V6]	#	σ🃡⒗.ೆ仧ݖ
-B;	xn--4xa595lz9czy52d.xn--9ob79ycx2e;	[B1 B5 B6 C1 V5 V6];	[B1 B5 B6 C1 V5 V6]	#	σ🃡⒗.ೆ仧ݖ
-B;	xn--3xa795lz9czy52d.xn--9ob79ycx2e;	[B1 B5 B6 C1 V5 V6];	[B1 B5 B6 C1 V5 V6]	#	ς🃡⒗.ೆ仧ݖ
-B;	-.𞸚;	[B1 V3];	[B1 V3]	#	-.ظ
-B;	-.\u0638;	[B1 V3];	[B1 V3]	#	-.ظ
-B;	-.xn--3gb;	[B1 V3];	[B1 V3]	#	-.ظ
-B;	�\u0683.\u0F7E\u0634;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ڃ.ཾش
-B;	xn--8ib92728i.xn--zgb968b;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	ڃ.ཾش
-B;	\u0FE6\u0843񽶬.�;	[B5 P1 V6];	[B5 P1 V6]	#	ࡃ.�
-B;	xn--1vb320b5m04p.xn--m29c;	[B5 V6];	[B5 V6]	#	ࡃ.�
-T;	2񎨠\u07CBß。ᠽ;	[B1 P1 V6];	[B1 P1 V6]	#	2ߋß.ᠽ
-N;	2񎨠\u07CBß。ᠽ;	[B1 P1 V6];	[B1 P1 V6]	#	2ߋß.ᠽ
-B;	2񎨠\u07CBSS。ᠽ;	[B1 P1 V6];	[B1 P1 V6]	#	2ߋss.ᠽ
-B;	2񎨠\u07CBss。ᠽ;	[B1 P1 V6];	[B1 P1 V6]	#	2ߋss.ᠽ
-B;	2񎨠\u07CBSs。ᠽ;	[B1 P1 V6];	[B1 P1 V6]	#	2ߋss.ᠽ
-B;	xn--2ss-odg83511n.xn--w7e;	[B1 V6];	[B1 V6]	#	2ß‹ss.á ½
-B;	xn--2-qfa924cez02l.xn--w7e;	[B1 V6];	[B1 V6]	#	2ߋß.ᠽ
-T;	㸳\u07CA≮．\u06CEß-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێß-
-N;	㸳\u07CA≮．\u06CEß-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێß-
-T;	㸳\u07CA<\u0338．\u06CEß-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێß-
-N;	㸳\u07CA<\u0338．\u06CEß-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێß-
-T;	㸳\u07CA≮.\u06CEß-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێß-
-N;	㸳\u07CA≮.\u06CEß-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێß-
-T;	㸳\u07CA<\u0338.\u06CEß-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێß-
-N;	㸳\u07CA<\u0338.\u06CEß-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێß-
-T;	㸳\u07CA<\u0338.\u06CESS-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA<\u0338.\u06CESS-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA≮.\u06CESS-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA≮.\u06CESS-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA≮.\u06CEss-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA≮.\u06CEss-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA<\u0338.\u06CEss-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA<\u0338.\u06CEss-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA<\u0338.\u06CESs-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA<\u0338.\u06CESs-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA≮.\u06CESs-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA≮.\u06CESs-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-B;	xn--lsb457kkut.xn--ss--qjf;	[B2 B3 B5 B6 V3 V6];	[B2 B3 B5 B6 V3 V6]	#	㸳ߊ≮.ێss-
-B;	xn--lsb457kkut.xn--ss--qjf2343a;	[B2 B3 B5 B6 C2 V6];	[B2 B3 B5 B6 C2 V6]	#	㸳ߊ≮.ێss-
-B;	xn--lsb457kkut.xn----pfa076bys4a;	[B2 B3 B5 B6 C2 V6];	[B2 B3 B5 B6 C2 V6]	#	㸳ߊ≮.ێß-
-T;	㸳\u07CA<\u0338．\u06CESS-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA<\u0338．\u06CESS-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA≮．\u06CESS-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA≮．\u06CESS-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA≮．\u06CEss-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA≮．\u06CEss-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA<\u0338．\u06CEss-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA<\u0338．\u06CEss-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA<\u0338．\u06CESs-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA<\u0338．\u06CESs-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-T;	㸳\u07CA≮．\u06CESs-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V3 V6]	#	㸳ߊ≮.ێss-
-N;	㸳\u07CA≮．\u06CESs-\u200D;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	㸳ߊ≮.ێss-
-B;	-�\u135E𑜧.\u1DEB-︒;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-�𑜧.ᷫ-︒
-B;	-�\u135E𑜧.\u1DEB-。;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-�𑜧.ᷫ-.
-B;	xn----b5h1837n2ok9f.xn----mkm.;	[V3 V5 V6];	[V3 V5 V6]	#	-�𑜧.ᷫ-.
-B;	xn----b5h1837n2ok9f.xn----mkmw278h;	[V3 V5 V6];	[V3 V5 V6]	#	-�𑜧.ᷫ-︒
-B;	︒.򚠡\u1A59;	[P1 V6];	[P1 V6]	#	︒.ᩙ
-B;	。.򚠡\u1A59;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	..ᩙ
-B;	..xn--cof61594i;	[V6 A4_2];	[V6 A4_2]	#	..á©™
-B;	xn--y86c.xn--cof61594i;	[V6];	[V6]	#	︒.ᩙ
-T;	\u0323\u2DE1。\u200C⓾\u200C\u06B9;	[B1 B3 B6 C1 V5];	[B1 B3 B6 V5]	#	̣ⷡ.⓾ڹ
-N;	\u0323\u2DE1。\u200C⓾\u200C\u06B9;	[B1 B3 B6 C1 V5];	[B1 B3 B6 C1 V5]	#	̣ⷡ.⓾ڹ
-B;	xn--kta899s.xn--skb116m;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	̣ⷡ.⓾ڹ
-B;	xn--kta899s.xn--skb970ka771c;	[B1 B3 B6 C1 V5];	[B1 B3 B6 C1 V5]	#	̣ⷡ.⓾ڹ
-B;	𞠶ᠴ\u06DD｡\u1074𞤵󠅦;	[B1 B2 P1 V5 V6];	[B1 B2 P1 V5 V6]	#	𞠶ᠴ.�𞤵
-B;	𞠶ᠴ\u06DD。\u1074𞤵󠅦;	[B1 B2 P1 V5 V6];	[B1 B2 P1 V5 V6]	#	𞠶ᠴ.�𞤵
-B;	𞠶ᠴ\u06DD。\u1074𞤓󠅦;	[B1 B2 P1 V5 V6];	[B1 B2 P1 V5 V6]	#	𞠶ᠴ.�𞤵
-B;	xn--tlb199fwl35a.xn--yld4613v;	[B1 B2 V5 V6];	[B1 B2 V5 V6]	#	𞠶ᠴ.�𞤵
-B;	𞠶ᠴ\u06DD｡\u1074𞤓󠅦;	[B1 B2 P1 V5 V6];	[B1 B2 P1 V5 V6]	#	𞠶ᠴ.�𞤵
-B;	𑰺.-�;	[P1 V3 V5 V6];	[P1 V3 V5 V6]
-B;	xn--jk3d.xn----iz68g;	[V3 V5 V6];	[V3 V5 V6]
-B;	󠻩．�;	[P1 V6];	[P1 V6]
-B;	󠻩.�;	[P1 V6];	[P1 V6]
-B;	xn--2856e.xn--6o3a;	[V6];	[V6]
-B;	\u06B0ᠡ｡Ⴁ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ڰᠡ.Ⴁ
-B;	\u06B0ᠡ。Ⴁ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	ڰᠡ.Ⴁ
-B;	\u06B0ᠡ。�;	[B2 B3];	[B2 B3]	#	ڰᠡ.�
-B;	xn--jkb440g.xn--skj;	[B2 B3];	[B2 B3]	#	Ú°á ¡.â´�
-B;	xn--jkb440g.xn--8md;	[B2 B3 V6];	[B2 B3 V6]	#	Ú°á ¡.á‚¡
-B;	\u06B0ᠡ｡�;	[B2 B3];	[B2 B3]	#	ڰᠡ.�
-T;	\u20DEႪ\u06BBς｡-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	⃞Ⴊڻς.-
-N;	\u20DEႪ\u06BBς｡-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	⃞Ⴊڻς.-
-T;	\u20DEႪ\u06BBς。-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	⃞Ⴊڻς.-
-N;	\u20DEႪ\u06BBς。-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	⃞Ⴊڻς.-
-T;	\u20DEⴊ\u06BBς。-;	[B1 V3 V5];	[B1 V3 V5]	#	⃞ⴊڻς.-
-N;	\u20DEⴊ\u06BBς。-;	[B1 V3 V5];	[B1 V3 V5]	#	⃞ⴊڻς.-
-B;	\u20DEႪ\u06BBΣ。-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	⃞Ⴊڻσ.-
-B;	\u20DEⴊ\u06BBσ。-;	[B1 V3 V5];	[B1 V3 V5]	#	⃞ⴊڻσ.-
-B;	\u20DEႪ\u06BBσ。-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	⃞Ⴊڻσ.-
-B;	xn--4xa33m7zmb0q.-;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	⃞Ⴊڻσ.-
-B;	xn--4xa33mr38aeel.-;	[B1 V3 V5];	[B1 V3 V5]	#	⃞ⴊڻσ.-
-B;	xn--3xa53mr38aeel.-;	[B1 V3 V5];	[B1 V3 V5]	#	⃞ⴊڻς.-
-B;	xn--3xa53m7zmb0q.-;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	⃞Ⴊڻς.-
-T;	\u20DEⴊ\u06BBς｡-;	[B1 V3 V5];	[B1 V3 V5]	#	⃞ⴊڻς.-
-N;	\u20DEⴊ\u06BBς｡-;	[B1 V3 V5];	[B1 V3 V5]	#	⃞ⴊڻς.-
-B;	\u20DEႪ\u06BBΣ｡-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	⃞Ⴊڻσ.-
-B;	\u20DEⴊ\u06BBσ｡-;	[B1 V3 V5];	[B1 V3 V5]	#	⃞ⴊڻσ.-
-B;	\u20DEႪ\u06BBσ｡-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	⃞Ⴊڻσ.-
-T;	Ⴍ．�\u200C;	[C1 P1 V6];	[P1 V6]	#	Ⴍ.
-N;	Ⴍ．�\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴍ.
-T;	Ⴍ.�\u200C;	[C1 P1 V6];	[P1 V6]	#	Ⴍ.
-N;	Ⴍ.�\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	Ⴍ.
-T;	�.�\u200C;	[C1 P1 V6];	[P1 V6]	#	�.
-N;	�.�\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	�.
-B;	xn--4kj.xn--p01x;	[V6];	[V6]
-B;	xn--4kj.xn--0ug56448b;	[C1 V6];	[C1 V6]	#	â´�.
-B;	xn--lnd.xn--p01x;	[V6];	[V6]
-B;	xn--lnd.xn--0ug56448b;	[C1 V6];	[C1 V6]	#	á‚­.
-T;	�．�\u200C;	[C1 P1 V6];	[P1 V6]	#	�.
-N;	�．�\u200C;	[C1 P1 V6];	[C1 P1 V6]	#	�.
-B;	򉟂󠵣.�\u1A60󴺖\u1B44;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	.�᩠᭄
-B;	xn--9u37blu98h.xn--jof13bt568cork1j;	[B2 B3 B6 V6];	[B2 B3 B6 V6]	#	.�᩠᭄
-B;	≯�ᠯ｡�⺨;	[B1 P1 V6];	[B1 P1 V6]
-B;	>\u0338�ᠯ｡�⺨;	[B1 P1 V6];	[B1 P1 V6]
-B;	≯�ᠯ。�⺨;	[B1 P1 V6];	[B1 P1 V6]
-B;	>\u0338�ᠯ。�⺨;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--i7e163ct2d.xn--vwj7372e;	[B1 V6];	[B1 V6]
-B;	����。Ⴈ�Ⴏ;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	����。ⴈ��;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	xn--fo0de1270ope54j.xn--zkjo0151o;	[B5 B6 V6];	[B5 B6 V6]
-B;	xn--fo0de1270ope54j.xn--gndo2033q;	[B5 B6 V6];	[B5 B6 V6]
-B;	𞠂。\uA926;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	𞠂.ꤦ
-B;	xn--145h.xn--ti9a;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	𞠂.ꤦ
-B;	��．\u0733\u1037９ꡇ;	[B1 V5];	[B1 V5]	#	6�.့ܳ9ꡇ
-B;	��．\u1037\u0733９ꡇ;	[B1 V5];	[B1 V5]	#	6�.့ܳ9ꡇ
-B;	6�.\u1037\u07339ꡇ;	[B1 V5];	[B1 V5]	#	6�.့ܳ9ꡇ
-B;	xn--6-t26i.xn--9-91c730e8u8n;	[B1 V5];	[B1 V5]	#	6�.့ܳ9ꡇ
-B;	\u0724\u0603𞲶．\u06D8;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	ܤ.ۘ
-B;	\u0724\u0603𞲶.\u06D8;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	ܤ.ۘ
-B;	xn--lfb19ct414i.xn--olb;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	ܤ.ۘ
-T;	✆񱔩ꡋ．\u0632\u200D𞣴;	[B1 C2 P1 V6];	[B1 P1 V6]	#	✆ꡋ.ز
-N;	✆񱔩ꡋ．\u0632\u200D𞣴;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	✆ꡋ.ز
-T;	✆񱔩ꡋ.\u0632\u200D𞣴;	[B1 C2 P1 V6];	[B1 P1 V6]	#	✆ꡋ.ز
-N;	✆񱔩ꡋ.\u0632\u200D𞣴;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	✆ꡋ.ز
-B;	xn--1biv525bcix0d.xn--xgb6828v;	[B1 V6];	[B1 V6]	#	✆ꡋ.ز
-B;	xn--1biv525bcix0d.xn--xgb253k0m73a;	[B1 C2 V6];	[B1 C2 V6]	#	✆ꡋ.ز
-B;	\u0845񃾰�-．≠�𑋪;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ࡅن-.≠𑋪
-B;	\u0845񃾰�-．=\u0338�𑋪;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ࡅن-.≠𑋪
-B;	\u0845񃾰\u0646-.≠�𑋪;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ࡅن-.≠𑋪
-B;	\u0845񃾰\u0646-.=\u0338�𑋪;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ࡅن-.≠𑋪
-B;	xn----qoc64my971s.xn--1ch7585g76o3c;	[B1 B2 B3 V3 V6];	[B1 B2 B3 V3 V6]	#	ࡅن-.≠𑋪
-B;	�．笠;	3.笠;	3.xn--6vz
-B;	�．笠;	3.笠;	3.xn--6vz
-B;	3.笠;	;	3.xn--6vz
-B;	3.xn--6vz;	3.笠;	3.xn--6vz
-T;	-\u200D.Ⴞ�;	[C2 P1 V3 V6];	[P1 V3 V6]	#	-.Ⴞ�
-N;	-\u200D.Ⴞ�;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	-.Ⴞ�
-T;	-\u200D.ⴞ�;	[C2 V3];	[V3]	#	-.ⴞ�
-N;	-\u200D.ⴞ�;	[C2 V3];	[C2 V3]	#	-.ⴞ�
-B;	-.xn--mlj8559d;	[V3];	[V3]
-B;	xn----ugn.xn--mlj8559d;	[C2 V3];	[C2 V3]	#	-.ⴞ�
-B;	-.xn--2nd2315j;	[V3 V6];	[V3 V6]
-B;	xn----ugn.xn--2nd2315j;	[C2 V3 V6];	[C2 V3 V6]	#	-.Ⴞ�
-T;	\u200Dςß\u0731．\u0BCD;	[C2 V5];	[V5]	#	ςßܱ.�
-N;	\u200Dςß\u0731．\u0BCD;	[C2 V5];	[C2 V5]	#	ςßܱ.�
-T;	\u200Dςß\u0731.\u0BCD;	[C2 V5];	[V5]	#	ςßܱ.�
-N;	\u200Dςß\u0731.\u0BCD;	[C2 V5];	[C2 V5]	#	ςßܱ.�
-T;	\u200DΣSS\u0731.\u0BCD;	[C2 V5];	[V5]	#	σssܱ.�
-N;	\u200DΣSS\u0731.\u0BCD;	[C2 V5];	[C2 V5]	#	σssܱ.�
-T;	\u200Dσss\u0731.\u0BCD;	[C2 V5];	[V5]	#	σssܱ.�
-N;	\u200Dσss\u0731.\u0BCD;	[C2 V5];	[C2 V5]	#	σssܱ.�
-T;	\u200DΣss\u0731.\u0BCD;	[C2 V5];	[V5]	#	σssܱ.�
-N;	\u200DΣss\u0731.\u0BCD;	[C2 V5];	[C2 V5]	#	σssܱ.�
-B;	xn--ss-ubc826a.xn--xmc;	[V5];	[V5]	#	σssܱ.�
-B;	xn--ss-ubc826ab34b.xn--xmc;	[C2 V5];	[C2 V5]	#	σssܱ.�
-T;	\u200DΣß\u0731.\u0BCD;	[C2 V5];	[V5]	#	σßܱ.�
-N;	\u200DΣß\u0731.\u0BCD;	[C2 V5];	[C2 V5]	#	σßܱ.�
-T;	\u200Dσß\u0731.\u0BCD;	[C2 V5];	[V5]	#	σßܱ.�
-N;	\u200Dσß\u0731.\u0BCD;	[C2 V5];	[C2 V5]	#	σßܱ.�
-B;	xn--zca39lk1di19a.xn--xmc;	[C2 V5];	[C2 V5]	#	σßܱ.�
-B;	xn--zca19ln1di19a.xn--xmc;	[C2 V5];	[C2 V5]	#	ςßܱ.�
-T;	\u200DΣSS\u0731．\u0BCD;	[C2 V5];	[V5]	#	σssܱ.�
-N;	\u200DΣSS\u0731．\u0BCD;	[C2 V5];	[C2 V5]	#	σssܱ.�
-T;	\u200Dσss\u0731．\u0BCD;	[C2 V5];	[V5]	#	σssܱ.�
-N;	\u200Dσss\u0731．\u0BCD;	[C2 V5];	[C2 V5]	#	σssܱ.�
-T;	\u200DΣss\u0731．\u0BCD;	[C2 V5];	[V5]	#	σssܱ.�
-N;	\u200DΣss\u0731．\u0BCD;	[C2 V5];	[C2 V5]	#	σssܱ.�
-T;	\u200DΣß\u0731．\u0BCD;	[C2 V5];	[V5]	#	σßܱ.�
-N;	\u200DΣß\u0731．\u0BCD;	[C2 V5];	[C2 V5]	#	σßܱ.�
-T;	\u200Dσß\u0731．\u0BCD;	[C2 V5];	[V5]	#	σßܱ.�
-N;	\u200Dσß\u0731．\u0BCD;	[C2 V5];	[C2 V5]	#	σßܱ.�
-T;	≠．\u200D;	[C2 P1 V6];	[P1 V6]	#	≠.
-N;	≠．\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	≠.
-T;	=\u0338．\u200D;	[C2 P1 V6];	[P1 V6]	#	≠.
-N;	=\u0338．\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	≠.
-T;	≠.\u200D;	[C2 P1 V6];	[P1 V6]	#	≠.
-N;	≠.\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	≠.
-T;	=\u0338.\u200D;	[C2 P1 V6];	[P1 V6]	#	≠.
-N;	=\u0338.\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	≠.
-B;	xn--1ch.;	[V6];	[V6]
-B;	xn--1ch.xn--1ug;	[C2 V6];	[C2 V6]	#	≠.
-B;	\uFC01｡\u0C81ᠼ▗�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ئح.�ᠼ▗
-B;	\u0626\u062D。\u0C81ᠼ▗�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ئح.�ᠼ▗
-B;	\u064A\u0654\u062D。\u0C81ᠼ▗�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ئح.�ᠼ▗
-B;	xn--lgbo.xn--2rc021dcxkrx55t;	[B1 V5 V6];	[B1 V5 V6]	#	ئح.�ᠼ▗
-T;	󧋵\u09CDς．ς�;	[P1 V6];	[P1 V6]	#	�ς.ς�
-N;	󧋵\u09CDς．ς�;	[P1 V6];	[P1 V6]	#	�ς.ς�
-T;	󧋵\u09CDς.ς�;	[P1 V6];	[P1 V6]	#	�ς.ς�
-N;	󧋵\u09CDς.ς�;	[P1 V6];	[P1 V6]	#	�ς.ς�
-B;	󧋵\u09CDΣ.Σ�;	[P1 V6];	[P1 V6]	#	�σ.σ�
-T;	󧋵\u09CDσ.ς�;	[P1 V6];	[P1 V6]	#	�σ.ς�
-N;	󧋵\u09CDσ.ς�;	[P1 V6];	[P1 V6]	#	�σ.ς�
-B;	󧋵\u09CDσ.σ�;	[P1 V6];	[P1 V6]	#	�σ.σ�
-B;	󧋵\u09CDΣ.σ�;	[P1 V6];	[P1 V6]	#	�σ.σ�
-B;	xn--4xa502av8297a.xn--4xa6055k;	[V6];	[V6]	#	�σ.σ�
-T;	󧋵\u09CDΣ.ς�;	[P1 V6];	[P1 V6]	#	�σ.ς�
-N;	󧋵\u09CDΣ.ς�;	[P1 V6];	[P1 V6]	#	�σ.ς�
-B;	xn--4xa502av8297a.xn--3xa8055k;	[V6];	[V6]	#	�σ.ς�
-B;	xn--3xa702av8297a.xn--3xa8055k;	[V6];	[V6]	#	�ς.ς�
-B;	󧋵\u09CDΣ．Σ�;	[P1 V6];	[P1 V6]	#	�σ.σ�
-T;	󧋵\u09CDσ．ς�;	[P1 V6];	[P1 V6]	#	�σ.ς�
-N;	󧋵\u09CDσ．ς�;	[P1 V6];	[P1 V6]	#	�σ.ς�
-B;	󧋵\u09CDσ．σ�;	[P1 V6];	[P1 V6]	#	�σ.σ�
-B;	󧋵\u09CDΣ．σ�;	[P1 V6];	[P1 V6]	#	�σ.σ�
-T;	󧋵\u09CDΣ．ς�;	[P1 V6];	[P1 V6]	#	�σ.ς�
-N;	󧋵\u09CDΣ．ς�;	[P1 V6];	[P1 V6]	#	�σ.ς�
-B;	�\u07D8牅\u08F8｡𞦤\u1A17�Ⴙ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�ߘ牅ࣸ.ᨗႹ
-B;	�\u07D8牅\u08F8。𞦤\u1A17�Ⴙ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�ߘ牅ࣸ.ᨗႹ
-B;	�\u07D8牅\u08F8。𞦤\u1A17�ⴙ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�ߘ牅ࣸ.ᨗⴙ
-B;	xn--zsb09cu46vjs6f.xn--gmf469fr883am5r1e;	[B2 B3 V6];	[B2 B3 V6]	#	�ߘ牅ࣸ.ᨗⴙ
-B;	xn--zsb09cu46vjs6f.xn--xnd909bv540bm5k9d;	[B2 B3 V6];	[B2 B3 V6]	#	�ߘ牅ࣸ.ᨗႹ
-B;	�\u07D8牅\u08F8｡𞦤\u1A17�ⴙ;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	�ߘ牅ࣸ.ᨗⴙ
-B;	񣤒｡륧;	[P1 V6];	[P1 V6]
-B;	񣤒｡륧;	[P1 V6];	[P1 V6]
-B;	񣤒。륧;	[P1 V6];	[P1 V6]
-B;	񣤒。륧;	[P1 V6];	[P1 V6]
-B;	xn--s264a.xn--pw2b;	[V6];	[V6]
-T;	�\u200D。󉵢;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.
-N;	�\u200D。󉵢;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.
-B;	xn--vo0d.xn--8088d;	[B1 V6];	[B1 V6]
-B;	xn--1ugx205g.xn--8088d;	[B1 C2 V6];	[B1 C2 V6]	#	�.
-B;	Ⴘ\u06C2𑲭｡-;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	Ⴘۂ𑲭.-
-B;	Ⴘ\u06C1\u0654𑲭｡-;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	Ⴘۂ𑲭.-
-B;	Ⴘ\u06C2𑲭。-;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	Ⴘۂ𑲭.-
-B;	Ⴘ\u06C1\u0654𑲭。-;	[B1 B5 B6 P1 V3 V6];	[B1 B5 B6 P1 V3 V6]	#	Ⴘۂ𑲭.-
-B;	ⴘ\u06C1\u0654𑲭。-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	ⴘۂ𑲭.-
-B;	ⴘ\u06C2𑲭。-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	ⴘۂ𑲭.-
-B;	xn--1kb147qfk3n.-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	ⴘۂ𑲭.-
-B;	xn--1kb312c139t.-;	[B1 B5 B6 V3 V6];	[B1 B5 B6 V3 V6]	#	Ⴘۂ𑲭.-
-B;	ⴘ\u06C1\u0654𑲭｡-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	ⴘۂ𑲭.-
-B;	ⴘ\u06C2𑲭｡-;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	ⴘۂ𑲭.-
-B;	\uA806\u067B₆�。🛇\uFCDD;	[B1 V5];	[B1 V5]	#	꠆ٻ6�.🛇يم
-B;	\uA806\u067B6�。🛇\u064A\u0645;	[B1 V5];	[B1 V5]	#	꠆ٻ6�.🛇يم
-B;	xn--6-rrc018krt9k.xn--hhbj61429a;	[B1 V5];	[B1 V5]	#	꠆ٻ6�.🛇يم
-B;	�.㇄ᡟ�\u0622;	[B1 P1 V6];	[B1 P1 V6]	#	.㇄ᡟ�آ
-B;	�.㇄ᡟ�\u0627\u0653;	[B1 P1 V6];	[B1 P1 V6]	#	.㇄ᡟ�آ
-B;	xn--p292d.xn--hgb154ghrsvm2r;	[B1 V6];	[B1 V6]	#	.㇄ᡟ�آ
-B;	\u07DF򵚌。-\u07E9;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ߟ.-ߩ
-B;	xn--6sb88139l.xn----pdd;	[B1 B2 B3 V3 V6];	[B1 B2 B3 V3 V6]	#	ߟ.-ߩ
-T;	ς\u0643⾑．\u200Cᢟ\u200C⒈;	[B1 B5 C1 P1 V6];	[B5 P1 V6]	#	ςك襾.ᢟ⒈
-N;	ς\u0643⾑．\u200Cᢟ\u200C⒈;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	ςك襾.ᢟ⒈
-T;	ς\u0643襾.\u200Cᢟ\u200C1.;	[B1 B5 C1];	[B5]	#	ςك襾.ᢟ1.
-N;	ς\u0643襾.\u200Cᢟ\u200C1.;	[B1 B5 C1];	[B1 B5 C1]	#	ςك襾.ᢟ1.
-T;	Σ\u0643襾.\u200Cᢟ\u200C1.;	[B1 B5 C1];	[B5]	#	σك襾.ᢟ1.
-N;	Σ\u0643襾.\u200Cᢟ\u200C1.;	[B1 B5 C1];	[B1 B5 C1]	#	σك襾.ᢟ1.
-T;	σ\u0643襾.\u200Cᢟ\u200C1.;	[B1 B5 C1];	[B5]	#	σك襾.ᢟ1.
-N;	σ\u0643襾.\u200Cᢟ\u200C1.;	[B1 B5 C1];	[B1 B5 C1]	#	σك襾.ᢟ1.
-B;	xn--4xa49jux8r.xn--1-4ck.;	[B5];	[B5]	#	σك襾.ᢟ1.
-B;	xn--4xa49jux8r.xn--1-4ck691bba.;	[B1 B5 C1];	[B1 B5 C1]	#	σك襾.ᢟ1.
-B;	xn--3xa69jux8r.xn--1-4ck691bba.;	[B1 B5 C1];	[B1 B5 C1]	#	ςك襾.ᢟ1.
-T;	Σ\u0643⾑．\u200Cᢟ\u200C⒈;	[B1 B5 C1 P1 V6];	[B5 P1 V6]	#	σك襾.ᢟ⒈
-N;	Σ\u0643⾑．\u200Cᢟ\u200C⒈;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	σك襾.ᢟ⒈
-T;	σ\u0643⾑．\u200Cᢟ\u200C⒈;	[B1 B5 C1 P1 V6];	[B5 P1 V6]	#	σك襾.ᢟ⒈
-N;	σ\u0643⾑．\u200Cᢟ\u200C⒈;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	σك襾.ᢟ⒈
-B;	xn--4xa49jux8r.xn--pbf212d;	[B5 V6];	[B5 V6]	#	σك襾.ᢟ⒈
-B;	xn--4xa49jux8r.xn--pbf519aba607b;	[B1 B5 C1 V6];	[B1 B5 C1 V6]	#	σك襾.ᢟ⒈
-B;	xn--3xa69jux8r.xn--pbf519aba607b;	[B1 B5 C1 V6];	[B1 B5 C1 V6]	#	ςك襾.ᢟ⒈
-B;	ᡆ�．𞵆;	[P1 V6];	[P1 V6]
-B;	ᡆ�.𞵆;	[P1 V6];	[P1 V6]
-B;	xn--57e0440k.xn--k86h;	[V6];	[V6]
-T;	\u0A4D�\u1DEE｡\u200C\u08BD�;	[B1 C1 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	��ᷮ.ࢽ
-N;	\u0A4D�\u1DEE｡\u200C\u08BD�;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	��ᷮ.ࢽ
-T;	\u0A4D�\u1DEE。\u200C\u08BD�;	[B1 C1 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	��ᷮ.ࢽ
-N;	\u0A4D�\u1DEE。\u200C\u08BD�;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	��ᷮ.ࢽ
-B;	xn--ybc461hph93b.xn--jzb29857e;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	��ᷮ.ࢽ
-B;	xn--ybc461hph93b.xn--jzb740j1y45h;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	��ᷮ.ࢽ
-T;	\u062E\u0748񅪪-．\u200C먿;	[B1 B2 B3 C1 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	خ݈-.먿
-N;	\u062E\u0748񅪪-．\u200C먿;	[B1 B2 B3 C1 P1 V3 V6];	[B1 B2 B3 C1 P1 V3 V6]	#	خ݈-.먿
-T;	\u062E\u0748񅪪-．\u200C먿;	[B1 B2 B3 C1 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	خ݈-.먿
-N;	\u062E\u0748񅪪-．\u200C먿;	[B1 B2 B3 C1 P1 V3 V6];	[B1 B2 B3 C1 P1 V3 V6]	#	خ݈-.먿
-T;	\u062E\u0748񅪪-.\u200C먿;	[B1 B2 B3 C1 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	خ݈-.먿
-N;	\u062E\u0748񅪪-.\u200C먿;	[B1 B2 B3 C1 P1 V3 V6];	[B1 B2 B3 C1 P1 V3 V6]	#	خ݈-.먿
-T;	\u062E\u0748񅪪-.\u200C먿;	[B1 B2 B3 C1 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	خ݈-.먿
-N;	\u062E\u0748񅪪-.\u200C먿;	[B1 B2 B3 C1 P1 V3 V6];	[B1 B2 B3 C1 P1 V3 V6]	#	خ݈-.먿
-B;	xn----dnc06f42153a.xn--v22b;	[B2 B3 V3 V6];	[B2 B3 V3 V6]	#	خ݈-.먿
-B;	xn----dnc06f42153a.xn--0ug1581d;	[B1 B2 B3 C1 V3 V6];	[B1 B2 B3 C1 V3 V6]	#	خ݈-.먿
-B;	􋿦｡ᠽ;	[P1 V6];	[P1 V6]
-B;	􋿦。ᠽ;	[P1 V6];	[P1 V6]
-B;	xn--j890g.xn--w7e;	[V6];	[V6]
-T;	嬃�．\u200D\u0B44;	[C2];	[V5]	#	嬃�.ୄ
-N;	嬃�．\u200D\u0B44;	[C2];	[C2]	#	嬃�.ୄ
-T;	嬃�.\u200D\u0B44;	[C2];	[V5]	#	嬃�.ୄ
-N;	嬃�.\u200D\u0B44;	[C2];	[C2]	#	嬃�.ୄ
-B;	xn--b6s0078f.xn--0ic;	[V5];	[V5]	#	嬃�.ୄ
-B;	xn--b6s0078f.xn--0ic557h;	[C2];	[C2]	#	嬃�.ୄ
-B;	\u0602�≯．𚋲�;	[B1 P1 V6];	[B1 P1 V6]	#	�≯.
-B;	\u0602�>\u0338．𚋲�;	[B1 P1 V6];	[B1 P1 V6]	#	�≯.
-B;	\u0602�≯.𚋲�;	[B1 P1 V6];	[B1 P1 V6]	#	�≯.
-B;	\u0602�>\u0338.𚋲�;	[B1 P1 V6];	[B1 P1 V6]	#	�≯.
-B;	xn--kfb866llx01a.xn--wp1gm3570b;	[B1 V6];	[B1 V6]	#	�≯.
-B;	򫾥\u08B7\u17CC\uA9C0.𞼠;	[B5 P1 V6];	[B5 P1 V6]	#	ࢷ៌꧀.
-B;	xn--dzb638ewm4i1iy1h.xn--3m7h;	[B5 V6];	[B5 V6]	#	ࢷ៌꧀.
-T;	\u200C.񟛤;	[C1 P1 V6];	[P1 V6 A4_2]	#	.
-N;	\u200C.񟛤;	[C1 P1 V6];	[C1 P1 V6]	#	.
-B;	.xn--q823a;	[V6 A4_2];	[V6 A4_2]
-B;	xn--0ug.xn--q823a;	[C1 V6];	[C1 V6]	#	.
-B;	򺛕Ⴃ䠅．�;	[P1 V6];	[P1 V6]
-B;	򺛕Ⴃ䠅.�;	[P1 V6];	[P1 V6]
-B;	򺛕ⴃ䠅.�;	[P1 V6];	[P1 V6]
-B;	xn--ukju77frl47r.xn--yl0d;	[V6];	[V6]
-B;	xn--bnd074zr557n.xn--yl0d;	[V6];	[V6]
-B;	򺛕ⴃ䠅．�;	[P1 V6];	[P1 V6]
-B;	\u1BF1��𞤚｡�Ⴅ;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᯱ��𞤼.6Ⴅ
-B;	\u1BF1��𞤚。6Ⴅ;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ᯱ��𞤼.6Ⴅ
-B;	\u1BF1��𞤼。6ⴅ;	[B1 V5];	[B1 V5]	#	ᯱ��𞤼.6ⴅ
-B;	xn--zzfy954hga2415t.xn--6-kvs;	[B1 V5];	[B1 V5]	#	ᯱ��𞤼.6ⴅ
-B;	xn--zzfy954hga2415t.xn--6-h0g;	[B1 V5 V6];	[B1 V5 V6]	#	ᯱ��𞤼.6Ⴅ
-B;	\u1BF1��𞤼｡�ⴅ;	[B1 V5];	[B1 V5]	#	ᯱ��𞤼.6ⴅ
-B;	\u1BF1��𞤚。6ⴅ;	[B1 V5];	[B1 V5]	#	ᯱ��𞤼.6ⴅ
-B;	\u1BF1��𞤚｡�ⴅ;	[B1 V5];	[B1 V5]	#	ᯱ��𞤼.6ⴅ
-B;	-｡︒;	[P1 V3 V6];	[P1 V3 V6]
-B;	-。。;	[V3 A4_2];	[V3 A4_2]
-B;	-..;	[V3 A4_2];	[V3 A4_2]
-B;	-.xn--y86c;	[V3 V6];	[V3 V6]
-B;	\u07DBჀ｡-�--;	[B1 B2 B3 P1 V2 V3 V6];	[B1 B2 B3 P1 V2 V3 V6]	#	ߛჀ.-5--
-B;	\u07DBჀ。-5--;	[B1 B2 B3 P1 V2 V3 V6];	[B1 B2 B3 P1 V2 V3 V6]	#	ߛჀ.-5--
-B;	\u07DBⴠ。-5--;	[B1 B2 B3 V2 V3];	[B1 B2 B3 V2 V3]	#	ߛⴠ.-5--
-B;	xn--2sb691q.-5--;	[B1 B2 B3 V2 V3];	[B1 B2 B3 V2 V3]	#	ߛⴠ.-5--
-B;	xn--2sb866b.-5--;	[B1 B2 B3 V2 V3 V6];	[B1 B2 B3 V2 V3 V6]	#	ߛჀ.-5--
-B;	\u07DBⴠ｡-�--;	[B1 B2 B3 V2 V3];	[B1 B2 B3 V2 V3]	#	ߛⴠ.-5--
-B;	≯\uD8DD󠑕｡��≯�;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	>\u0338\uD8DD󠑕｡��>\u0338�;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	≯\uD8DD󠑕。��≯�;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	>\u0338\uD8DD󠑕。��>\u0338�;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	≯\uD8DD󠑕.xn--hdh8283gdoaqa;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	>\u0338\uD8DD󠑕.xn--hdh8283gdoaqa;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	>\u0338\uD8DD󠑕.XN--HDH8283GDOAQA;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	≯\uD8DD󠑕.XN--HDH8283GDOAQA;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	≯\uD8DD󠑕.Xn--Hdh8283gdoaqa;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-B;	>\u0338\uD8DD󠑕.Xn--Hdh8283gdoaqa;	[B1 P1 V6];	[B1 P1 V6 A3]	#	≯.��≯
-T;	�\u08E6\u077C\u200D。\u0346��\u0604;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ルーブルࣦݼ.͆
-N;	�\u08E6\u077C\u200D。\u0346��\u0604;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 C2 P1 V5 V6]	#	ルーブルࣦݼ.͆
-T;	ルーブル\u08E6\u077C\u200D。\u0346��\u0604;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ルーブルࣦݼ.͆
-N;	ルーブル\u08E6\u077C\u200D。\u0346��\u0604;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 C2 P1 V5 V6]	#	ルーブルࣦݼ.͆
-T;	ルーフ\u3099ル\u08E6\u077C\u200D。\u0346��\u0604;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ルーブルࣦݼ.͆
-N;	ルーフ\u3099ル\u08E6\u077C\u200D。\u0346��\u0604;	[B1 B5 B6 C2 P1 V5 V6];	[B1 B5 B6 C2 P1 V5 V6]	#	ルーブルࣦݼ.͆
-B;	xn--dqb73el09fncab4h.xn--kua81ls548d3608b;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	ルーブルࣦݼ.͆
-B;	xn--dqb73ec22c9kp8cb1j.xn--kua81ls548d3608b;	[B1 B5 B6 C2 V5 V6];	[B1 B5 B6 C2 V5 V6]	#	ルーブルࣦݼ.͆
-T;	\u200D.F;	[C2];	[A4_2]	#	.f
-N;	\u200D.F;	[C2];	[C2]	#	.f
-T;	\u200D.f;	[C2];	[A4_2]	#	.f
-N;	\u200D.f;	[C2];	[C2]	#	.f
-B;	.f;	[A4_2];	[A4_2]
-B;	xn--1ug.f;	[C2];	[C2]	#	.f
-B;	f;	;	
-T;	\u200D㨲｡ß;	[C2];	xn--9bm.ss	#	㨲.ß
-N;	\u200D㨲｡ß;	[C2];	[C2]	#	㨲.ß
-T;	\u200D㨲。ß;	[C2];	xn--9bm.ss	#	㨲.ß
-N;	\u200D㨲。ß;	[C2];	[C2]	#	㨲.ß
-T;	\u200D㨲。SS;	[C2];	xn--9bm.ss	#	㨲.ss
-N;	\u200D㨲。SS;	[C2];	[C2]	#	㨲.ss
-T;	\u200D㨲。ss;	[C2];	xn--9bm.ss	#	㨲.ss
-N;	\u200D㨲。ss;	[C2];	[C2]	#	㨲.ss
-T;	\u200D㨲。Ss;	[C2];	xn--9bm.ss	#	㨲.ss
-N;	\u200D㨲。Ss;	[C2];	[C2]	#	㨲.ss
-B;	xn--9bm.ss;	㨲.ss;	xn--9bm.ss
-B;	㨲.ss;	;	xn--9bm.ss
-B;	㨲.SS;	㨲.ss;	xn--9bm.ss
-B;	㨲.Ss;	㨲.ss;	xn--9bm.ss
-B;	xn--1ug914h.ss;	[C2];	[C2]	#	㨲.ss
-B;	xn--1ug914h.xn--zca;	[C2];	[C2]	#	㨲.ß
-T;	\u200D㨲｡SS;	[C2];	xn--9bm.ss	#	㨲.ss
-N;	\u200D㨲｡SS;	[C2];	[C2]	#	㨲.ss
-T;	\u200D㨲｡ss;	[C2];	xn--9bm.ss	#	㨲.ss
-N;	\u200D㨲｡ss;	[C2];	[C2]	#	㨲.ss
-T;	\u200D㨲｡Ss;	[C2];	xn--9bm.ss	#	㨲.ss
-N;	\u200D㨲｡Ss;	[C2];	[C2]	#	㨲.ss
-B;	\u0605\u067E｡\u08A8;	[B1 P1 V6];	[B1 P1 V6]	#	پ.ࢨ
-B;	\u0605\u067E。\u08A8;	[B1 P1 V6];	[B1 P1 V6]	#	پ.ࢨ
-B;	xn--nfb6v.xn--xyb;	[B1 V6];	[B1 V6]	#	پ.ࢨ
-B;	⾑\u0753�。�\u0682;	[B1 B5 B6];	[B1 B5 B6]	#	襾ݓ𞤣.�ڂ
-B;	襾\u0753�。�\u0682;	[B1 B5 B6];	[B1 B5 B6]	#	襾ݓ𞤣.�ڂ
-B;	襾\u0753𞤣。�\u0682;	[B1 B5 B6];	[B1 B5 B6]	#	襾ݓ𞤣.�ڂ
-B;	xn--6ob9577deqwl.xn--7ib5526k;	[B1 B5 B6];	[B1 B5 B6]	#	襾ݓ𞤣.�ڂ
-B;	⾑\u0753𞤣。�\u0682;	[B1 B5 B6];	[B1 B5 B6]	#	襾ݓ𞤣.�ڂ
-T;	񦴻ς-\u20EB｡\u0754-ꡛ;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	ς-⃫.ݔ-ꡛ
-N;	񦴻ς-\u20EB｡\u0754-ꡛ;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	ς-⃫.ݔ-ꡛ
-T;	񦴻ς-\u20EB。\u0754-ꡛ;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	ς-⃫.ݔ-ꡛ
-N;	񦴻ς-\u20EB。\u0754-ꡛ;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	ς-⃫.ݔ-ꡛ
-B;	񦴻Σ-\u20EB。\u0754-ꡛ;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	σ-⃫.ݔ-ꡛ
-B;	񦴻σ-\u20EB。\u0754-ꡛ;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	σ-⃫.ݔ-ꡛ
-B;	xn----zmb705tuo34l.xn----53c4874j;	[B2 B3 B6 V6];	[B2 B3 B6 V6]	#	σ-⃫.ݔ-ꡛ
-B;	xn----xmb015tuo34l.xn----53c4874j;	[B2 B3 B6 V6];	[B2 B3 B6 V6]	#	ς-⃫.ݔ-ꡛ
-B;	񦴻Σ-\u20EB｡\u0754-ꡛ;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	σ-⃫.ݔ-ꡛ
-B;	񦴻σ-\u20EB｡\u0754-ꡛ;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	σ-⃫.ݔ-ꡛ
-T;	\u200D．􀸨;	[C2 P1 V6];	[P1 V6 A4_2]	#	.
-N;	\u200D．􀸨;	[C2 P1 V6];	[C2 P1 V6]	#	.
-T;	\u200D.􀸨;	[C2 P1 V6];	[P1 V6 A4_2]	#	.
-N;	\u200D.􀸨;	[C2 P1 V6];	[C2 P1 V6]	#	.
-B;	.xn--h327f;	[V6 A4_2];	[V6 A4_2]
-B;	xn--1ug.xn--h327f;	[C2 V6];	[C2 V6]	#	.
-B;	񣭻�｡≠�;	[P1 V6];	[P1 V6]
-B;	񣭻�｡=\u0338�;	[P1 V6];	[P1 V6]
-B;	񣭻�。≠6;	[P1 V6];	[P1 V6]
-B;	񣭻�。=\u03386;	[P1 V6];	[P1 V6]
-B;	xn--h79w4z99a.xn--6-tfo;	[V6];	[V6]
-T;	󠅊ᡭ\u200D.�;	[B6 C2 P1 V6];	[P1 V6]	#	ᡭ.
-N;	󠅊ᡭ\u200D.�;	[B6 C2 P1 V6];	[B6 C2 P1 V6]	#	ᡭ.
-B;	xn--98e.xn--om9c;	[V6];	[V6]
-B;	xn--98e810b.xn--om9c;	[B6 C2 V6];	[B6 C2 V6]	#	á¡­.
-B;	\u0C40\u0855�𑄴．󭰵;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ీࡕ𑄴.
-B;	\u0C40\u0855�𑄴.󭰵;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	ీࡕ𑄴.
-B;	xn--kwb91r5112avtg.xn--o580f;	[B1 V5 V6];	[B1 V5 V6]	#	ీࡕ𑄴.
-T;	𞤮。𑇊\u200C≯\u1CE6;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤮.𑇊≯᳦
-N;	𞤮。𑇊\u200C≯\u1CE6;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	𞤮.𑇊≯᳦
-T;	𞤮。𑇊\u200C>\u0338\u1CE6;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤮.𑇊≯᳦
-N;	𞤮。𑇊\u200C>\u0338\u1CE6;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	𞤮.𑇊≯᳦
-T;	𞤌。𑇊\u200C>\u0338\u1CE6;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤮.𑇊≯᳦
-N;	𞤌。𑇊\u200C>\u0338\u1CE6;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	𞤮.𑇊≯᳦
-T;	𞤌。𑇊\u200C≯\u1CE6;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤮.𑇊≯᳦
-N;	𞤌。𑇊\u200C≯\u1CE6;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	𞤮.𑇊≯᳦
-B;	xn--me6h.xn--z6fz8ueq2v;	[B1 V5 V6];	[B1 V5 V6]	#	𞤮.𑇊≯᳦
-B;	xn--me6h.xn--z6f16kn9b2642b;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	𞤮.𑇊≯᳦
-B;	󠄀�.𞤌񛗓Ⴉ;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]
-B;	󠄀7.𞤌񛗓Ⴉ;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]
-B;	󠄀7.𞤮񛗓ⴉ;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]
-B;	7.xn--0kjz523lv1vv;	[B1 B2 B3 V6];	[B1 B2 B3 V6]
-B;	7.xn--hnd3403vv1vv;	[B1 B2 B3 V6];	[B1 B2 B3 V6]
-B;	󠄀�.𞤮񛗓ⴉ;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]
-B;	󠄀7.𞤌񛗓ⴉ;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]
-B;	󠄀�.𞤌񛗓ⴉ;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]
-B;	閃9�。Ↄ\u0669\u08B1\u0B4D;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	閃9�.Ↄ٩ࢱ�
-B;	閃9�。ↄ\u0669\u08B1\u0B4D;	[B5 B6];	[B5 B6]	#	閃9�.ↄ٩ࢱ�
-B;	xn--9-3j6dk517f.xn--iib28ij3c4t9a;	[B5 B6];	[B5 B6]	#	閃9�.ↄ٩ࢱ�
-B;	xn--9-3j6dk517f.xn--iib28ij3c0t9a;	[B5 B6 V6];	[B5 B6 V6]	#	閃9�.Ↄ٩ࢱ�
-B;	\uAAF6�\u0E3A２.�\u0745\u0F9F︒;	[P1 V5 V6];	[P1 V5 V6]	#	꫶�ฺ2.�݅ྟ︒
-B;	\uAAF6�\u0E3A2.�\u0745\u0F9F。;	[V5];	[V5]	#	꫶�ฺ2.�݅ྟ.
-B;	xn--2-2zf840fk16m.xn--sob093b2m7s.;	[V5];	[V5]	#	꫶�ฺ2.�݅ྟ.
-B;	xn--2-2zf840fk16m.xn--sob093bj62sz9d;	[V5 V6];	[V5 V6]	#	꫶�ฺ2.�݅ྟ︒
-B;	󅴧｡≠-󠙄⾛;	[P1 V6];	[P1 V6]
-B;	󅴧｡=\u0338-󠙄⾛;	[P1 V6];	[P1 V6]
-B;	󅴧。≠-󠙄走;	[P1 V6];	[P1 V6]
-B;	󅴧。=\u0338-󠙄走;	[P1 V6];	[P1 V6]
-B;	xn--gm57d.xn----tfo4949b3664m;	[V6];	[V6]
-B;	\u076E\u0604Ⴊ。-≠\u1160;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ݮႪ.-≠
-B;	\u076E\u0604Ⴊ。-=\u0338\u1160;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ݮႪ.-≠
-B;	\u076E\u0604ⴊ。-=\u0338\u1160;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ݮⴊ.-≠
-B;	\u076E\u0604ⴊ。-≠\u1160;	[B1 B2 B3 P1 V3 V6];	[B1 B2 B3 P1 V3 V6]	#	ݮⴊ.-≠
-B;	xn--mfb73ek93f.xn----5bh589i;	[B1 B2 B3 V3 V6];	[B1 B2 B3 V3 V6]	#	ݮⴊ.-≠
-B;	xn--mfb73ex6r.xn----5bh589i;	[B1 B2 B3 V3 V6];	[B1 B2 B3 V3 V6]	#	ݮႪ.-≠
-T;	\uFB4F��≯｡\u200C;	[B1 B3 B4 C1 P1 V6];	[B3 B4 P1 V6]	#	�ל�4≯.
-N;	\uFB4F��≯｡\u200C;	[B1 B3 B4 C1 P1 V6];	[B1 B3 B4 C1 P1 V6]	#	�ל�4≯.
-T;	\uFB4F��>\u0338｡\u200C;	[B1 B3 B4 C1 P1 V6];	[B3 B4 P1 V6]	#	�ל�4≯.
-N;	\uFB4F��>\u0338｡\u200C;	[B1 B3 B4 C1 P1 V6];	[B1 B3 B4 C1 P1 V6]	#	�ל�4≯.
-T;	\u05D0\u05DC�4≯。\u200C;	[B1 B3 B4 C1 P1 V6];	[B3 B4 P1 V6]	#	�ל�4≯.
-N;	\u05D0\u05DC�4≯。\u200C;	[B1 B3 B4 C1 P1 V6];	[B1 B3 B4 C1 P1 V6]	#	�ל�4≯.
-T;	\u05D0\u05DC�4>\u0338。\u200C;	[B1 B3 B4 C1 P1 V6];	[B3 B4 P1 V6]	#	�ל�4≯.
-N;	\u05D0\u05DC�4>\u0338。\u200C;	[B1 B3 B4 C1 P1 V6];	[B1 B3 B4 C1 P1 V6]	#	�ל�4≯.
-B;	xn--4-zhc0by36txt0w.;	[B3 B4 V6];	[B3 B4 V6]	#	�ל�4≯.
-B;	xn--4-zhc0by36txt0w.xn--0ug;	[B1 B3 B4 C1 V6];	[B1 B3 B4 C1 V6]	#	�ל�4≯.
-B;	�。甯;	0.甯;	0.xn--qny
-B;	0。甯;	0.甯;	0.xn--qny
-B;	0.xn--qny;	0.甯;	0.xn--qny
-B;	0.甯;	;	0.xn--qny
-B;	-⾆．\uAAF6;	[V3 V5];	[V3 V5]	#	-舌.꫶
-B;	-舌.\uAAF6;	[V3 V5];	[V3 V5]	#	-舌.꫶
-B;	xn----ef8c.xn--2v9a;	[V3 V5];	[V3 V5]	#	-舌.꫶
-B;	-｡ᢘ;	[V3];	[V3]
-B;	-。ᢘ;	[V3];	[V3]
-B;	-.xn--ibf;	[V3];	[V3]
-B;	🂴Ⴋ.≮;	[P1 V6];	[P1 V6]
-B;	🂴Ⴋ.<\u0338;	[P1 V6];	[P1 V6]
-B;	🂴ⴋ.<\u0338;	[P1 V6];	[P1 V6]
-B;	🂴ⴋ.≮;	[P1 V6];	[P1 V6]
-B;	xn--2kj7565l.xn--gdh;	[V6];	[V6]
-B;	xn--jnd1986v.xn--gdh;	[V6];	[V6]
-T;	璼�｡\u200C󠇟;	[C1];	xn--gky8837e.	#	璼�.
-N;	璼�｡\u200C󠇟;	[C1];	[C1]	#	璼�.
-T;	璼�。\u200C󠇟;	[C1];	xn--gky8837e.	#	璼�.
-N;	璼�。\u200C󠇟;	[C1];	[C1]	#	璼�.
-B;	xn--gky8837e.;	璼�.;	xn--gky8837e.
-B;	璼�.;	;	xn--gky8837e.
-B;	xn--gky8837e.xn--0ug;	[C1];	[C1]	#	璼�.
-B;	\u06698�｡-5🞥;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	٩8.-5🞥
-B;	\u06698�。-5🞥;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	٩8.-5🞥
-B;	xn--8-qqc97891f.xn---5-rp92a;	[B1 V3 V6];	[B1 V3 V6]	#	٩8.-5🞥
-T;	\u200C.\u200C;	[C1];	[A4_2]	#	.
-N;	\u200C.\u200C;	[C1];	[C1]	#	.
-B;	xn--0ug.xn--0ug;	[C1];	[C1]	#	.
-T;	\u200D튛.\u0716;	[B1 C2];	xn--157b.xn--gnb	#	튛.ܖ
-N;	\u200D튛.\u0716;	[B1 C2];	[B1 C2]	#	튛.ܖ
-T;	\u200D�ᅱᇂ.\u0716;	[B1 C2];	xn--157b.xn--gnb	#	튛.ܖ
-N;	\u200D�ᅱᇂ.\u0716;	[B1 C2];	[B1 C2]	#	튛.ܖ
-B;	xn--157b.xn--gnb;	튛.\u0716;	xn--157b.xn--gnb	#	튛.ܖ
-B;	튛.\u0716;	;	xn--157b.xn--gnb	#	튛.ܖ
-B;	�ᅱᇂ.\u0716;	튛.\u0716;	xn--157b.xn--gnb	#	튛.ܖ
-B;	xn--1ug4441e.xn--gnb;	[B1 C2];	[B1 C2]	#	튛.ܖ
-B;	ᡋ�𞽳.\u0779ⴞ;	[B2 B3 B5 B6 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	ᡋ�.ݹⴞ
-B;	ᡋ�𞽳.\u0779Ⴞ;	[B2 B3 B5 B6 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	ᡋ�.ݹႾ
-B;	xn--b8e0417jocvf.xn--9pb068b;	[B2 B3 B5 B6 V6];	[B2 B3 B5 B6 V6]	#	ᡋ�.ݹႾ
-B;	xn--b8e0417jocvf.xn--9pb883q;	[B2 B3 B5 B6 V6];	[B2 B3 B5 B6 V6]	#	ᡋ�.ݹⴞ
-B;	�\u0662��．��Ⴇ;	[B1 B4 P1 V6];	[B1 B4 P1 V6]	#	٢�5.��Ⴇ
-B;	�\u0662�5.��Ⴇ;	[B1 B4 P1 V6];	[B1 B4 P1 V6]	#	٢�5.��Ⴇ
-B;	�\u0662�5.��ⴇ;	[B1 B4 P1 V6];	[B1 B4 P1 V6]	#	٢�5.��ⴇ
-B;	xn--5-cqc8833rhv7f.xn--ykjz523efa;	[B1 B4 V6];	[B1 B4 V6]	#	٢�5.��ⴇ
-B;	xn--5-cqc8833rhv7f.xn--fnd3401kfa;	[B1 B4 V6];	[B1 B4 V6]	#	٢�5.��Ⴇ
-B;	�\u0662��．��ⴇ;	[B1 B4 P1 V6];	[B1 B4 P1 V6]	#	٢�5.��ⴇ
-B;	Ⴗ．\u05C2𑄴\uA9B7񘃨;	[P1 V5 V6];	[P1 V5 V6]	#	Ⴗ.𑄴ׂꦷ
-B;	Ⴗ．𑄴\u05C2\uA9B7񘃨;	[P1 V5 V6];	[P1 V5 V6]	#	Ⴗ.𑄴ׂꦷ
-B;	Ⴗ.𑄴\u05C2\uA9B7񘃨;	[P1 V5 V6];	[P1 V5 V6]	#	Ⴗ.𑄴ׂꦷ
-B;	ⴗ.𑄴\u05C2\uA9B7񘃨;	[P1 V5 V6];	[P1 V5 V6]	#	ⴗ.𑄴ׂꦷ
-B;	xn--flj.xn--qdb0605f14ycrms3c;	[V5 V6];	[V5 V6]	#	ⴗ.𑄴ׂꦷ
-B;	xn--vnd.xn--qdb0605f14ycrms3c;	[V5 V6];	[V5 V6]	#	Ⴗ.𑄴ׂꦷ
-B;	ⴗ．𑄴\u05C2\uA9B7񘃨;	[P1 V5 V6];	[P1 V5 V6]	#	ⴗ.𑄴ׂꦷ
-B;	ⴗ．\u05C2𑄴\uA9B7񘃨;	[P1 V5 V6];	[P1 V5 V6]	#	ⴗ.𑄴ׂꦷ
-B;	�𾤘．򇕛\u066C;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	8.٬
-B;	8𾤘.򇕛\u066C;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	8.٬
-B;	xn--8-kh23b.xn--lib78461i;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	8.Ù¬
-B;	⒈酫︒。\u08D6;	[P1 V5 V6];	[P1 V5 V6]	#	⒈酫︒.ࣖ
-B;	1.酫。。\u08D6;	[V5 A4_2];	[V5 A4_2]	#	1.酫..ࣖ
-B;	1.xn--8j4a..xn--8zb;	[V5 A4_2];	[V5 A4_2]	#	1.酫..ࣖ
-B;	xn--tsh4490bfe8c.xn--8zb;	[V5 V6];	[V5 V6]	#	⒈酫︒.ࣖ
-T;	\u2DE3\u200C≮\u1A6B.\u200C\u0E3A;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ⷣ≮ᩫ.ฺ
-N;	\u2DE3\u200C≮\u1A6B.\u200C\u0E3A;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ⷣ≮ᩫ.ฺ
-T;	\u2DE3\u200C<\u0338\u1A6B.\u200C\u0E3A;	[C1 P1 V5 V6];	[P1 V5 V6]	#	ⷣ≮ᩫ.ฺ
-N;	\u2DE3\u200C<\u0338\u1A6B.\u200C\u0E3A;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	ⷣ≮ᩫ.ฺ
-B;	xn--uof548an0j.xn--o4c;	[V5 V6];	[V5 V6]	#	ⷣ≮ᩫ.ฺ
-B;	xn--uof63xk4bf3s.xn--o4c732g;	[C1 V5 V6];	[C1 V5 V6]	#	ⷣ≮ᩫ.ฺ
-T;	𞪂。ႷႽ¹\u200D;	[B6 C2 P1 V6];	[P1 V6]	#	.ႷႽ1
-N;	𞪂。ႷႽ¹\u200D;	[B6 C2 P1 V6];	[B6 C2 P1 V6]	#	.ႷႽ1
-T;	𞪂。ႷႽ1\u200D;	[B6 C2 P1 V6];	[P1 V6]	#	.ႷႽ1
-N;	𞪂。ႷႽ1\u200D;	[B6 C2 P1 V6];	[B6 C2 P1 V6]	#	.ႷႽ1
-T;	𞪂。ⴗ�1\u200D;	[B6 C2 P1 V6];	[P1 V6]	#	.ⴗ�1
-N;	𞪂。ⴗ�1\u200D;	[B6 C2 P1 V6];	[B6 C2 P1 V6]	#	.ⴗ�1
-T;	𞪂。Ⴗ�1\u200D;	[B6 C2 P1 V6];	[P1 V6]	#	.Ⴗ�1
-N;	𞪂。Ⴗ�1\u200D;	[B6 C2 P1 V6];	[B6 C2 P1 V6]	#	.Ⴗ�1
-B;	xn--co6h.xn--1-h1g429s;	[V6];	[V6]
-B;	xn--co6h.xn--1-h1g398iewm;	[B6 C2 V6];	[B6 C2 V6]	#	.á‚·â´�1
-B;	xn--co6h.xn--1-kwssa;	[V6];	[V6]
-B;	xn--co6h.xn--1-ugn710dya;	[B6 C2 V6];	[B6 C2 V6]	#	.â´—â´�1
-B;	xn--co6h.xn--1-h1gs;	[V6];	[V6]
-B;	xn--co6h.xn--1-h1gs597m;	[B6 C2 V6];	[B6 C2 V6]	#	.ႷႽ1
-T;	𞪂。ⴗ�¹\u200D;	[B6 C2 P1 V6];	[P1 V6]	#	.ⴗ�1
-N;	𞪂。ⴗ�¹\u200D;	[B6 C2 P1 V6];	[B6 C2 P1 V6]	#	.ⴗ�1
-T;	𞪂。Ⴗ�¹\u200D;	[B6 C2 P1 V6];	[P1 V6]	#	.Ⴗ�1
-N;	𞪂。Ⴗ�¹\u200D;	[B6 C2 P1 V6];	[B6 C2 P1 V6]	#	.Ⴗ�1
-B;	𑄴𑄳2.𞳿󠀳-;	[B1 B3 P1 V3 V5 V6];	[B1 B3 P1 V3 V5 V6]
-B;	xn--2-h87ic.xn----s39r33498d;	[B1 B3 V3 V5 V6];	[B1 B3 V3 V5 V6]
-B;	󠕲󟶶\u0665｡�𑄳𞤃\u0710;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	٥.𑄳𞤥�
-B;	󠕲󟶶\u0665。�𑄳𞤃\u0710;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	٥.𑄳𞤥�
-B;	󠕲󟶶\u0665。�𑄳𞤥\u0710;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	٥.𑄳𞤥�
-B;	xn--eib57614py3ea.xn--9mb5737kqnpfzkwr;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	٥.𑄳𞤥�
-B;	󠕲󟶶\u0665｡�𑄳𞤥\u0710;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	٥.𑄳𞤥�
-T;	\u0720򲠽�\u17BB｡ςᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 P1 V6]	#	ܠ�ុ.ςᢈ�
-N;	\u0720򲠽�\u17BB｡ςᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 C1 P1 V6]	#	ܠ�ុ.ςᢈ�
-T;	\u0720򲠽�\u17BB。ςᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 P1 V6]	#	ܠ�ុ.ςᢈ�
-N;	\u0720򲠽�\u17BB。ςᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 C1 P1 V6]	#	ܠ�ុ.ςᢈ�
-T;	\u0720򲠽�\u17BB。Σᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 P1 V6]	#	ܠ�ុ.σᢈ�
-N;	\u0720򲠽�\u17BB。Σᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 C1 P1 V6]	#	ܠ�ុ.σᢈ�
-T;	\u0720򲠽�\u17BB。σᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 P1 V6]	#	ܠ�ុ.σᢈ�
-N;	\u0720򲠽�\u17BB。σᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 C1 P1 V6]	#	ܠ�ុ.σᢈ�
-B;	xn--qnb616fis0qzt36f.xn--4xa847hli46a;	[B2 B6 V6];	[B2 B6 V6]	#	ܠ�ុ.σᢈ�
-B;	xn--qnb616fis0qzt36f.xn--4xa847h6ofgl44c;	[B2 B6 C1 V6];	[B2 B6 C1 V6]	#	ܠ�ុ.σᢈ�
-B;	xn--qnb616fis0qzt36f.xn--3xa057h6ofgl44c;	[B2 B6 C1 V6];	[B2 B6 C1 V6]	#	ܠ�ុ.ςᢈ�
-T;	\u0720򲠽�\u17BB｡Σᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 P1 V6]	#	ܠ�ុ.σᢈ�
-N;	\u0720򲠽�\u17BB｡Σᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 C1 P1 V6]	#	ܠ�ុ.σᢈ�
-T;	\u0720򲠽�\u17BB｡σᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 P1 V6]	#	ܠ�ុ.σᢈ�
-N;	\u0720򲠽�\u17BB｡σᢈ�\u200C;	[B2 B6 C1 P1 V6];	[B2 B6 C1 P1 V6]	#	ܠ�ុ.σᢈ�
-T;	\u200D--≮。�;	[B1 C2 P1 V6];	[B1 P1 V3 V6]	#	--≮.�
-N;	\u200D--≮。�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	--≮.�
-T;	\u200D--<\u0338。�;	[B1 C2 P1 V6];	[B1 P1 V3 V6]	#	--≮.�
-N;	\u200D--<\u0338。�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	--≮.�
-B;	xn-----ujv.xn--fo0d;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn-----l1tz1k.xn--fo0d;	[B1 C2 V6];	[B1 C2 V6]	#	--≮.�
-B;	\uA806。�\u0FB0⒕;	[P1 V5 V6];	[P1 V5 V6]	#	꠆.ྰ⒕
-B;	\uA806。�\u0FB014.;	[P1 V5 V6];	[P1 V5 V6]	#	꠆.ྰ14.
-B;	xn--l98a.xn--14-jsj57880f.;	[V5 V6];	[V5 V6]	#	꠆.ྰ14.
-B;	xn--l98a.xn--dgd218hhp28d;	[V5 V6];	[V5 V6]	#	꠆.ྰ⒕
-B;	򮉂\u06BC．𑆺\u0669;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ڼ.𑆺٩
-B;	򮉂\u06BC.𑆺\u0669;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	ڼ.𑆺٩
-B;	xn--vkb92243l.xn--iib9797k;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	ڼ.𑆺٩
-B;	�\u06D0-。𞤴;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	�-.𞤴
-B;	�\u06D0-。𞤒;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	�-.𞤴
-B;	xn----mwc72685y.xn--se6h;	[B1 V3 V6];	[B1 V3 V6]	#	�-.𞤴
-T;	�4󠇗�．\u200D�⛧\u200D;	[C2];	xn--84-s850a.xn--59h6326e	#	84�.�⛧
-N;	�4󠇗�．\u200D�⛧\u200D;	[C2];	[C2]	#	84�.�⛧
-T;	84󠇗�.\u200D�⛧\u200D;	[C2];	xn--84-s850a.xn--59h6326e	#	84�.�⛧
-N;	84󠇗�.\u200D�⛧\u200D;	[C2];	[C2]	#	84�.�⛧
-B;	xn--84-s850a.xn--59h6326e;	84�.�⛧;	xn--84-s850a.xn--59h6326e;	NV8
-B;	84�.�⛧;	;	xn--84-s850a.xn--59h6326e;	NV8
-B;	xn--84-s850a.xn--1uga573cfq1w;	[C2];	[C2]	#	84�.�⛧
-B;	-\u0601｡ᡪ;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.ᡪ
-B;	-\u0601。ᡪ;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.ᡪ
-B;	xn----tkc.xn--68e;	[B1 V3 V6];	[B1 V3 V6]	#	-.ᡪ
-T;	≮�．謖ß≯;	[P1 V6];	[P1 V6]
-N;	≮�．謖ß≯;	[P1 V6];	[P1 V6]
-T;	<\u0338�．謖ß>\u0338;	[P1 V6];	[P1 V6]
-N;	<\u0338�．謖ß>\u0338;	[P1 V6];	[P1 V6]
-T;	≮7.謖ß≯;	[P1 V6];	[P1 V6]
-N;	≮7.謖ß≯;	[P1 V6];	[P1 V6]
-T;	<\u03387.謖ß>\u0338;	[P1 V6];	[P1 V6]
-N;	<\u03387.謖ß>\u0338;	[P1 V6];	[P1 V6]
-B;	<\u03387.謖SS>\u0338;	[P1 V6];	[P1 V6]
-B;	≮7.謖SS≯;	[P1 V6];	[P1 V6]
-B;	≮7.謖ss≯;	[P1 V6];	[P1 V6]
-B;	<\u03387.謖ss>\u0338;	[P1 V6];	[P1 V6]
-B;	<\u03387.謖Ss>\u0338;	[P1 V6];	[P1 V6]
-B;	≮7.謖Ss≯;	[P1 V6];	[P1 V6]
-B;	xn--7-mgo.xn--ss-xjvv174c;	[V6];	[V6]
-B;	xn--7-mgo.xn--zca892oly5e;	[V6];	[V6]
-B;	<\u0338�．謖SS>\u0338;	[P1 V6];	[P1 V6]
-B;	≮�．謖SS≯;	[P1 V6];	[P1 V6]
-B;	≮�．謖ss≯;	[P1 V6];	[P1 V6]
-B;	<\u0338�．謖ss>\u0338;	[P1 V6];	[P1 V6]
-B;	<\u0338�．謖Ss>\u0338;	[P1 V6];	[P1 V6]
-B;	≮�．謖Ss≯;	[P1 V6];	[P1 V6]
-B;	朶Ⴉ𞪡.�\u0825📻-;	[B1 B5 B6 P1 V3 V5 V6];	[B1 B5 B6 P1 V3 V5 V6]	#	朶Ⴉ.�ࠥ📻-
-B;	朶ⴉ𞪡.�\u0825📻-;	[B1 B5 B6 P1 V3 V5 V6];	[B1 B5 B6 P1 V3 V5 V6]	#	朶ⴉ.�ࠥ📻-
-B;	xn--0kjz47pd57t.xn----3gd37096apmwa;	[B1 B5 B6 V3 V5 V6];	[B1 B5 B6 V3 V5 V6]	#	朶ⴉ.�ࠥ📻-
-B;	xn--hnd7245bd56p.xn----3gd37096apmwa;	[B1 B5 B6 V3 V5 V6];	[B1 B5 B6 V3 V5 V6]	#	朶Ⴉ.�ࠥ📻-
-T;	�。󑿰\u200C≮\u200D;	[B6 C1 C2 P1 V6];	[B6 P1 V6]	#	�.≮
-N;	�。󑿰\u200C≮\u200D;	[B6 C1 C2 P1 V6];	[B6 C1 C2 P1 V6]	#	�.≮
-T;	�。󑿰\u200C<\u0338\u200D;	[B6 C1 C2 P1 V6];	[B6 P1 V6]	#	�.≮
-N;	�。󑿰\u200C<\u0338\u200D;	[B6 C1 C2 P1 V6];	[B6 C1 C2 P1 V6]	#	�.≮
-B;	xn--bk9c.xn--gdhx6802k;	[B6 V6];	[B6 V6]
-B;	xn--bk9c.xn--0ugc04p2u638c;	[B6 C1 C2 V6];	[B6 C1 C2 V6]	#	�.≮
-T;	񭜎⒈｡\u200C�;	[C1 P1 V6];	[P1 V6]	#	⒈.2
-N;	񭜎⒈｡\u200C�;	[C1 P1 V6];	[C1 P1 V6]	#	⒈.2
-T;	񭜎1.。\u200C2;	[C1 P1 V6 A4_2];	[P1 V6 A4_2]	#	1..2
-N;	񭜎1.。\u200C2;	[C1 P1 V6 A4_2];	[C1 P1 V6 A4_2]	#	1..2
-B;	xn--1-ex54e..2;	[V6 A4_2];	[V6 A4_2]
-B;	xn--1-ex54e..xn--2-rgn;	[C1 V6 A4_2];	[C1 V6 A4_2]	#	1..2
-B;	xn--tsh94183d.2;	[V6];	[V6]
-B;	xn--tsh94183d.xn--2-rgn;	[C1 V6];	[C1 V6]	#	â’ˆ.2
-T;	󠟊�\u200D．�󙄵�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.��
-N;	󠟊�\u200D．�󙄵�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.��
-T;	󠟊�\u200D.�󙄵�;	[B1 C2 P1 V6];	[B1 P1 V6]	#	�.��
-N;	󠟊�\u200D.�󙄵�;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	�.��
-B;	xn--co0d98977c.xn--ro0dga22807v;	[B1 V6];	[B1 V6]
-B;	xn--1ugy994g7k93g.xn--ro0dga22807v;	[B1 C2 V6];	[B1 C2 V6]	#	�.��
-B;	𞤴�𑓂�．\u094D\uFE07􉛯;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤴�𑓂�.�
-B;	𞤴�𑓂�.\u094D\uFE07􉛯;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤴�𑓂�.�
-B;	𞤒�𑓂�.\u094D\uFE07􉛯;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤴�𑓂�.�
-B;	xn--609c96c09grp2w.xn--n3b28708s;	[B1 V5 V6];	[B1 V5 V6]	#	𞤴�𑓂�.�
-B;	𞤒�𑓂�．\u094D\uFE07􉛯;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	𞤴�𑓂�.�
-B;	\u0668｡��񗮶;	[B1 P1 V6];	[B1 P1 V6]	#	٨.��
-B;	\u0668。��񗮶;	[B1 P1 V6];	[B1 P1 V6]	#	٨.��
-B;	xn--hib.xn--7n0d2bu9196b;	[B1 V6];	[B1 V6]	#	٨.��
-B;	\u1160�.8򶾵\u069C;	[B1 P1 V6];	[B1 P1 V6]	#	.8ڜ
-B;	xn--psd85033d.xn--8-otc61545t;	[B1 V6];	[B1 V6]	#	.8ڜ
-T;	\u200D\u200C󠆪｡ß𑓃;	[C1 C2];	[A4_2]	#	.ß𑓃
-N;	\u200D\u200C󠆪｡ß𑓃;	[C1 C2];	[C1 C2]	#	.ß𑓃
-T;	\u200D\u200C󠆪。ß𑓃;	[C1 C2];	[A4_2]	#	.ß𑓃
-N;	\u200D\u200C󠆪。ß𑓃;	[C1 C2];	[C1 C2]	#	.ß𑓃
-T;	\u200D\u200C󠆪。SS𑓃;	[C1 C2];	[A4_2]	#	.ss𑓃
-N;	\u200D\u200C󠆪。SS𑓃;	[C1 C2];	[C1 C2]	#	.ss𑓃
-T;	\u200D\u200C󠆪。ss𑓃;	[C1 C2];	[A4_2]	#	.ss𑓃
-N;	\u200D\u200C󠆪。ss𑓃;	[C1 C2];	[C1 C2]	#	.ss𑓃
-T;	\u200D\u200C󠆪。Ss𑓃;	[C1 C2];	[A4_2]	#	.ss𑓃
-N;	\u200D\u200C󠆪。Ss𑓃;	[C1 C2];	[C1 C2]	#	.ss𑓃
-B;	.xn--ss-bh7o;	[A4_2];	[A4_2]
-B;	xn--0ugb.xn--ss-bh7o;	[C1 C2];	[C1 C2]	#	.ss𑓃
-B;	xn--0ugb.xn--zca0732l;	[C1 C2];	[C1 C2]	#	.ß𑓃
-T;	\u200D\u200C󠆪｡SS𑓃;	[C1 C2];	[A4_2]	#	.ss𑓃
-N;	\u200D\u200C󠆪｡SS𑓃;	[C1 C2];	[C1 C2]	#	.ss𑓃
-T;	\u200D\u200C󠆪｡ss𑓃;	[C1 C2];	[A4_2]	#	.ss𑓃
-N;	\u200D\u200C󠆪｡ss𑓃;	[C1 C2];	[C1 C2]	#	.ss𑓃
-T;	\u200D\u200C󠆪｡Ss𑓃;	[C1 C2];	[A4_2]	#	.ss𑓃
-N;	\u200D\u200C󠆪｡Ss𑓃;	[C1 C2];	[C1 C2]	#	.ss𑓃
-B;	xn--ss-bh7o;	ss𑓃;	xn--ss-bh7o
-B;	ss𑓃;	;	xn--ss-bh7o
-B;	SS𑓃;	ss𑓃;	xn--ss-bh7o
-B;	Ss𑓃;	ss𑓃;	xn--ss-bh7o
-T;	︒\u200Cヶ䒩.ꡪ;	[C1 P1 V6];	[P1 V6]	#	︒ヶ䒩.ꡪ
-N;	︒\u200Cヶ䒩.ꡪ;	[C1 P1 V6];	[C1 P1 V6]	#	︒ヶ䒩.ꡪ
-T;	。\u200Cヶ䒩.ꡪ;	[C1 A4_2];	[A4_2]	#	.ヶ䒩.ꡪ
-N;	。\u200Cヶ䒩.ꡪ;	[C1 A4_2];	[C1 A4_2]	#	.ヶ䒩.ꡪ
-B;	.xn--qekw60d.xn--gd9a;	[A4_2];	[A4_2]
-B;	.xn--0ug287dj0o.xn--gd9a;	[C1 A4_2];	[C1 A4_2]	#	.ヶ䒩.ꡪ
-B;	xn--qekw60dns9k.xn--gd9a;	[V6];	[V6]
-B;	xn--0ug287dj0or48o.xn--gd9a;	[C1 V6];	[C1 V6]	#	︒ヶ䒩.ꡪ
-B;	xn--qekw60d.xn--gd9a;	ヶ䒩.ꡪ;	xn--qekw60d.xn--gd9a
-B;	ヶ䒩.ꡪ;	;	xn--qekw60d.xn--gd9a
-T;	\u200C⒈�.󢓋\u1A60;	[C1 P1 V6];	[P1 V6]	#	⒈�.᩠
-N;	\u200C⒈�.󢓋\u1A60;	[C1 P1 V6];	[C1 P1 V6]	#	⒈�.᩠
-T;	\u200C1.�.󢓋\u1A60;	[C1 P1 V6];	[P1 V6]	#	1.�.᩠
-N;	\u200C1.�.󢓋\u1A60;	[C1 P1 V6];	[C1 P1 V6]	#	1.�.᩠
-B;	1.xn--4x6j.xn--jof45148n;	[V6];	[V6]	#	1.�.᩠
-B;	xn--1-rgn.xn--4x6j.xn--jof45148n;	[C1 V6];	[C1 V6]	#	1.�.᩠
-B;	xn--tshw462r.xn--jof45148n;	[V6];	[V6]	#	⒈�.᩠
-B;	xn--0ug88o7471d.xn--jof45148n;	[C1 V6];	[C1 V6]	#	⒈�.᩠
-T;	⒈\u200C�󠀺。\u1A60񤰵\u200D;	[B1 C1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	⒈�.᩠
-N;	⒈\u200C�󠀺。\u1A60񤰵\u200D;	[B1 C1 C2 P1 V5 V6];	[B1 C1 C2 P1 V5 V6]	#	⒈�.᩠
-T;	1.\u200C�󠀺。\u1A60񤰵\u200D;	[B1 C1 C2 P1 V5 V6];	[B1 B3 P1 V5 V6]	#	1.�.᩠
-N;	1.\u200C�󠀺。\u1A60񤰵\u200D;	[B1 C1 C2 P1 V5 V6];	[B1 C1 C2 P1 V5 V6]	#	1.�.᩠
-B;	1.xn--8w9c40377c.xn--jofz5294e;	[B1 B3 V5 V6];	[B1 B3 V5 V6]	#	1.�.᩠
-B;	1.xn--0ug8853gk263g.xn--jof95xex98m;	[B1 C1 C2 V5 V6];	[B1 C1 C2 V5 V6]	#	1.�.᩠
-B;	xn--tsh4435fk263g.xn--jofz5294e;	[B1 V5 V6];	[B1 V5 V6]	#	⒈�.᩠
-B;	xn--0ug78ol75wzcx4i.xn--jof95xex98m;	[B1 C1 C2 V5 V6];	[B1 C1 C2 V5 V6]	#	⒈�.᩠
-B;	�｡�𞀈䬺⒈;	[P1 V6];	[P1 V6]
-B;	�。9𞀈䬺1.;	[P1 V6];	[P1 V6]
-B;	xn--3f1h.xn--91-030c1650n.;	[V6];	[V6]
-B;	xn--3f1h.xn--9-ecp936non25a;	[V6];	[V6]
-B;	򡼺≯。盚\u0635;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	≯.盚ص
-B;	򡼺>\u0338。盚\u0635;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	≯.盚ص
-B;	xn--hdh30181h.xn--0gb7878c;	[B5 B6 V6];	[B5 B6 V6]	#	≯.盚ص
-B;	-񿰭\u05B4。-��≯;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ִ.-≯
-B;	-񿰭\u05B4。-��>\u0338;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ִ.-≯
-B;	xn----fgc06667m.xn----pgoy615he5y4i;	[B1 V3 V6];	[B1 V3 V6]	#	-ִ.-≯
-T;	󿭓\u1B44\u200C\u0A4D．�񳋔;	[B2 B3 B6 P1 V6];	[B2 B3 P1 V6]	#	᭄�.�
-N;	󿭓\u1B44\u200C\u0A4D．�񳋔;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	᭄�.�
-T;	󿭓\u1B44\u200C\u0A4D.�񳋔;	[B2 B3 B6 P1 V6];	[B2 B3 P1 V6]	#	᭄�.�
-N;	󿭓\u1B44\u200C\u0A4D.�񳋔;	[B2 B3 B6 P1 V6];	[B2 B3 B6 P1 V6]	#	᭄�.�
-B;	xn--ybc997fb5881a.xn--409c6100y;	[B2 B3 V6];	[B2 B3 V6]	#	᭄�.�
-B;	xn--ybc997f6rd2n772c.xn--409c6100y;	[B2 B3 B6 V6];	[B2 B3 B6 V6]	#	᭄�.�
-T;	⾇.\u067D𞤴\u06BB\u200D;	[B3 C2];	xn--8c1a.xn--2ib8jn539l	#	舛.ٽ𞤴ڻ
-N;	⾇.\u067D𞤴\u06BB\u200D;	[B3 C2];	[B3 C2]	#	舛.ٽ𞤴ڻ
-T;	舛.\u067D𞤴\u06BB\u200D;	[B3 C2];	xn--8c1a.xn--2ib8jn539l	#	舛.ٽ𞤴ڻ
-N;	舛.\u067D𞤴\u06BB\u200D;	[B3 C2];	[B3 C2]	#	舛.ٽ𞤴ڻ
-T;	舛.\u067D𞤒\u06BB\u200D;	[B3 C2];	xn--8c1a.xn--2ib8jn539l	#	舛.ٽ𞤴ڻ
-N;	舛.\u067D𞤒\u06BB\u200D;	[B3 C2];	[B3 C2]	#	舛.ٽ𞤴ڻ
-B;	xn--8c1a.xn--2ib8jn539l;	舛.\u067D𞤴\u06BB;	xn--8c1a.xn--2ib8jn539l	#	舛.ٽ𞤴ڻ
-B;	舛.\u067D𞤴\u06BB;	;	xn--8c1a.xn--2ib8jn539l	#	舛.ٽ𞤴ڻ
-B;	舛.\u067D𞤒\u06BB;	舛.\u067D𞤴\u06BB;	xn--8c1a.xn--2ib8jn539l	#	舛.ٽ𞤴ڻ
-B;	xn--8c1a.xn--2ib8jv19e6413b;	[B3 C2];	[B3 C2]	#	舛.ٽ𞤴ڻ
-T;	⾇.\u067D𞤒\u06BB\u200D;	[B3 C2];	xn--8c1a.xn--2ib8jn539l	#	舛.ٽ𞤴ڻ
-N;	⾇.\u067D𞤒\u06BB\u200D;	[B3 C2];	[B3 C2]	#	舛.ٽ𞤴ڻ
-B;	4򭆥。\u0767≯;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	4.ݧ≯
-B;	4򭆥。\u0767>\u0338;	[B1 B3 P1 V6];	[B1 B3 P1 V6]	#	4.ݧ≯
-B;	xn--4-xn17i.xn--rpb459k;	[B1 B3 V6];	[B1 B3 V6]	#	4.ݧ≯
-B;	�𞫨񺿂硲．\u06AD;	[B5 P1 V6];	[B5 P1 V6]	#	硲.ڭ
-B;	�𞫨񺿂硲.\u06AD;	[B5 P1 V6];	[B5 P1 V6]	#	硲.ڭ
-B;	xn--lcz1610fn78gk609a.xn--gkb;	[B5 V6];	[B5 V6]	#	硲.ڭ
-T;	\u200C.\uFE08\u0666Ⴆ℮;	[B1 C1 P1 V6];	[B1 P1 V6 A4_2]	#	.٦Ⴆ℮
-N;	\u200C.\uFE08\u0666Ⴆ℮;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	.٦Ⴆ℮
-T;	\u200C.\uFE08\u0666ⴆ℮;	[B1 C1];	[B1 A4_2]	#	.٦ⴆ℮
-N;	\u200C.\uFE08\u0666ⴆ℮;	[B1 C1];	[B1 C1]	#	.٦ⴆ℮
-B;	.xn--fib628k4li;	[B1 A4_2];	[B1 A4_2]	#	.٦ⴆ℮
-B;	xn--0ug.xn--fib628k4li;	[B1 C1];	[B1 C1]	#	.٦ⴆ℮
-B;	.xn--fib263c0yn;	[B1 V6 A4_2];	[B1 V6 A4_2]	#	.٦Ⴆ℮
-B;	xn--0ug.xn--fib263c0yn;	[B1 C1 V6];	[B1 C1 V6]	#	.٦Ⴆ℮
-T;	\u06A3．\u0D4D\u200DϞ;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-N;	\u06A3．\u0D4D\u200DϞ;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-T;	\u06A3.\u0D4D\u200DϞ;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-N;	\u06A3.\u0D4D\u200DϞ;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-T;	\u06A3.\u0D4D\u200Dϟ;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-N;	\u06A3.\u0D4D\u200Dϟ;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-B;	xn--5jb.xn--xya149b;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-B;	xn--5jb.xn--xya149bpvp;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-T;	\u06A3．\u0D4D\u200Dϟ;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-N;	\u06A3．\u0D4D\u200Dϟ;	[B1 V5];	[B1 V5]	#	ڣ.�ϟ
-T;	\u200C𞸇𑘿。\u0623�-�;	[B1 B2 B3 C1];	[B2 B3]	#	ح𑘿.أ�-�
-N;	\u200C𞸇𑘿。\u0623�-�;	[B1 B2 B3 C1];	[B1 B2 B3 C1]	#	ح𑘿.أ�-�
-T;	\u200C𞸇𑘿。\u0627\u0654�-�;	[B1 B2 B3 C1];	[B2 B3]	#	ح𑘿.أ�-�
-N;	\u200C𞸇𑘿。\u0627\u0654�-�;	[B1 B2 B3 C1];	[B1 B2 B3 C1]	#	ح𑘿.أ�-�
-T;	\u200C\u062D𑘿。\u0623�-�;	[B1 B2 B3 C1];	[B2 B3]	#	ح𑘿.أ�-�
-N;	\u200C\u062D𑘿。\u0623�-�;	[B1 B2 B3 C1];	[B1 B2 B3 C1]	#	ح𑘿.أ�-�
-T;	\u200C\u062D𑘿。\u0627\u0654�-�;	[B1 B2 B3 C1];	[B2 B3]	#	ح𑘿.أ�-�
-N;	\u200C\u062D𑘿。\u0627\u0654�-�;	[B1 B2 B3 C1];	[B1 B2 B3 C1]	#	ح𑘿.أ�-�
-B;	xn--sgb4140l.xn----qmc5075grs9e;	[B2 B3];	[B2 B3]	#	ح𑘿.أ�-�
-B;	xn--sgb953kmi8o.xn----qmc5075grs9e;	[B1 B2 B3 C1];	[B1 B2 B3 C1]	#	ح𑘿.أ�-�
-B;	-򭷙\u066B纛｡�񭤇🄅;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-٫纛.3🄅
-B;	-򭷙\u066B纛。3񭤇4,;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-٫纛.34,
-B;	xn----vqc8143g0tt4i.xn--34,-8787l;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-٫纛.34,
-B;	xn----vqc8143g0tt4i.xn--3-os1sn476y;	[B1 V3 V6];	[B1 V3 V6]	#	-٫纛.3🄅
-B;	🔔．Ⴂ\u07CC\u0BCD�;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	🔔.Ⴂߌ��
-B;	🔔.Ⴂ\u07CC\u0BCD�;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	🔔.Ⴂߌ��
-B;	🔔.ⴂ\u07CC\u0BCD�;	[B1 B5];	[B1 B5]	#	🔔.ⴂߌ��
-B;	xn--nv8h.xn--nsb46rvz1b222p;	[B1 B5];	[B1 B5]	#	🔔.ⴂߌ��
-B;	xn--nv8h.xn--nsb46r83e8112a;	[B1 B5 V6];	[B1 B5 V6]	#	🔔.Ⴂߌ��
-B;	🔔．ⴂ\u07CC\u0BCD�;	[B1 B5];	[B1 B5]	#	🔔.ⴂߌ��
-B;	軥\u06B3.-𖬵;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	軥ڳ.-𖬵
-B;	xn--mkb5480e.xn----6u5m;	[B1 B5 B6 V3];	[B1 B5 B6 V3]	#	軥ڳ.-𖬵
-B;	�\u07CA\u06B6.�-;	[B1 V3 V5];	[B1 V3 V5]	#	�ߊڶ.�-
-B;	xn--pkb56cn614d.xn----974i;	[B1 V3 V5];	[B1 V3 V5]	#	�ߊڶ.�-
-B;	-󠅱0｡\u17CF\u1DFD톇십;	[V3 V5];	[V3 V5]	#	-0.�᷽톇십
-B;	-󠅱0｡\u17CF\u1DFD�ᅨᆪ십;	[V3 V5];	[V3 V5]	#	-0.�᷽톇십
-B;	-󠅱0。\u17CF\u1DFD톇십;	[V3 V5];	[V3 V5]	#	-0.�᷽톇십
-B;	-󠅱0。\u17CF\u1DFD�ᅨᆪ십;	[V3 V5];	[V3 V5]	#	-0.�᷽톇십
-B;	-0.xn--r4e872ah77nghm;	[V3 V5];	[V3 V5]	#	-0.�᷽톇십
-B;	ꡰ︒--｡\u17CC��񘳮;	[B1 B6 P1 V2 V3 V5 V6];	[B1 B6 P1 V2 V3 V5 V6]	#	ꡰ︒--.៌��
-B;	ꡰ。--。\u17CC��񘳮;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ꡰ.--.៌��
-B;	xn--md9a.--.xn--o4e6836dpxudz0v1c;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	ꡰ.--.៌��
-B;	xn-----bk9hu24z.xn--o4e6836dpxudz0v1c;	[B1 B6 V2 V3 V5 V6];	[B1 B6 V2 V3 V5 V6]	#	ꡰ︒--.៌��
-B;	\u115FႿႵრ｡\u0B4D;	[P1 V5 V6];	[P1 V5 V6]	#	ႿႵრ.�
-B;	\u115FႿႵრ。\u0B4D;	[P1 V5 V6];	[P1 V5 V6]	#	ႿႵრ.�
-B;	\u115Fⴟⴕრ。\u0B4D;	[P1 V5 V6];	[P1 V5 V6]	#	ⴟⴕრ.�
-B;	\u115FႿⴕრ。\u0B4D;	[P1 V5 V6];	[P1 V5 V6]	#	Ⴟⴕრ.�
-B;	xn--3nd0etsm92g.xn--9ic;	[V5 V6];	[V5 V6]	#	Ⴟⴕრ.�
-B;	xn--1od7wz74eeb.xn--9ic;	[V5 V6];	[V5 V6]	#	ⴟⴕრ.�
-B;	xn--tndt4hvw.xn--9ic;	[V5 V6];	[V5 V6]	#	ႿႵრ.�
-B;	\u115Fⴟⴕრ｡\u0B4D;	[P1 V5 V6];	[P1 V5 V6]	#	ⴟⴕრ.�
-B;	\u115FႿⴕრ｡\u0B4D;	[P1 V5 V6];	[P1 V5 V6]	#	Ⴟⴕრ.�
-B;	🄃�.\u0664󠅇;	[B1 P1 V6];	[B1 P1 V6]	#	🄃�.٤
-B;	2,�.\u0664󠅇;	[B1 P1 V6];	[B1 P1 V6]	#	2,�.٤
-B;	xn--2,-5g3o.xn--dib;	[B1 P1 V6];	[B1 P1 V6]	#	2,�.٤
-B;	xn--7n0d1189a.xn--dib;	[B1 V6];	[B1 V6]	#	🄃�.٤
-T;	򻲼\u200C\uFC5B．\u07D2\u0848\u1BF3;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	ذٰ.ߒࡈ᯳
-N;	򻲼\u200C\uFC5B．\u07D2\u0848\u1BF3;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 C1 P1 V6]	#	ذٰ.ߒࡈ᯳
-T;	򻲼\u200C\u0630\u0670.\u07D2\u0848\u1BF3;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	ذٰ.ߒࡈ᯳
-N;	򻲼\u200C\u0630\u0670.\u07D2\u0848\u1BF3;	[B2 B3 B5 B6 C1 P1 V6];	[B2 B3 B5 B6 C1 P1 V6]	#	ذٰ.ߒࡈ᯳
-B;	xn--vgb2kp1223g.xn--tsb0vz43c;	[B2 B3 B5 B6 V6];	[B2 B3 B5 B6 V6]	#	ذٰ.ߒࡈ᯳
-B;	xn--vgb2kq00fl213y.xn--tsb0vz43c;	[B2 B3 B5 B6 C1 V6];	[B2 B3 B5 B6 C1 V6]	#	ذٰ.ߒࡈ᯳
-T;	\u200D\u200D𞵪\u200C。ᡘ𑲭\u17B5;	[B1 C1 C2 P1 V6];	[P1 V6]	#	.ᡘ𑲭
-N;	\u200D\u200D𞵪\u200C。ᡘ𑲭\u17B5;	[B1 C1 C2 P1 V6];	[B1 C1 C2 P1 V6]	#	.ᡘ𑲭
-B;	xn--l96h.xn--03e93aq365d;	[V6];	[V6]	#	.ᡘ𑲭
-B;	xn--0ugba05538b.xn--03e93aq365d;	[B1 C1 C2 V6];	[B1 C1 C2 V6]	#	.ᡘ𑲭
-B;	𞷻。⚄񗑇�;	[B1 P1 V6];	[B1 P1 V6]
-B;	xn--qe7h.xn--c7h2966f7so4a;	[B1 V6];	[B1 V6]
-B;	\uA8C4≠．𞠨\u0667;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	꣄≠.𞠨٧
-B;	\uA8C4=\u0338．𞠨\u0667;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	꣄≠.𞠨٧
-B;	\uA8C4≠.𞠨\u0667;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	꣄≠.𞠨٧
-B;	\uA8C4=\u0338.𞠨\u0667;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	꣄≠.𞠨٧
-B;	xn--1chy504c.xn--gib1777v;	[B1 V5 V6];	[B1 V5 V6]	#	꣄≠.𞠨٧
-B;	��\uA8C4｡\uA8EA-;	[V3 V5];	[V3 V5]	#	3꣄�.꣪-
-B;	�\uA8C4�｡\uA8EA-;	[V3 V5];	[V3 V5]	#	3꣄�.꣪-
-B;	3\uA8C4�。\uA8EA-;	[V3 V5];	[V3 V5]	#	3꣄�.꣪-
-B;	xn--3-sl4eu679e.xn----xn4e;	[V3 V5];	[V3 V5]	#	3꣄�.꣪-
-B;	\u075F\u1BA2\u103AႧ.4;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	ݟᮢ်Ⴇ.4
-B;	\u075F\u1BA2\u103Aⴇ.4;	[B1 B2 B3];	[B1 B2 B3]	#	ݟᮢ်ⴇ.4
-B;	xn--jpb846bjzj7pr.4;	[B1 B2 B3];	[B1 B2 B3]	#	ݟᮢ်ⴇ.4
-B;	xn--jpb846bmjw88a.4;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	ݟᮢ်Ⴇ.4
-B;	ᄹ｡\u0ECA򠯤󠄞;	[P1 V5 V6];	[P1 V5 V6]	#	ᄹ.໊
-B;	ᄹ。\u0ECA򠯤󠄞;	[P1 V5 V6];	[P1 V5 V6]	#	ᄹ.໊
-B;	xn--lrd.xn--s8c05302k;	[V5 V6];	[V5 V6]	#	ᄹ.໊
-B;	Ⴆ򻢩．󠆡\uFE09�;	[P1 V6];	[P1 V6]
-B;	Ⴆ򻢩.󠆡\uFE09�;	[P1 V6];	[P1 V6]
-B;	ⴆ򻢩.󠆡\uFE09𞤯;	[P1 V6];	[P1 V6]
-B;	xn--xkjw3965g.xn--ne6h;	[V6];	[V6]
-B;	xn--end82983m.xn--ne6h;	[V6];	[V6]
-B;	ⴆ򻢩．󠆡\uFE09𞤯;	[P1 V6];	[P1 V6]
-B;	ⴆ򻢩.󠆡\uFE09�;	[P1 V6];	[P1 V6]
-B;	ⴆ򻢩．󠆡\uFE09�;	[P1 V6];	[P1 V6]
-T;	ß\u080B︒\u067B．帼F∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ßࠋ︒ٻ.帼f∫∫
-N;	ß\u080B︒\u067B．帼F∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ßࠋ︒ٻ.帼f∫∫
-T;	ß\u080B。\u067B.帼F∫∫\u200C;	[B5 B6 C1];	[B5 B6]	#	ßࠋ.ٻ.帼f∫∫
-N;	ß\u080B。\u067B.帼F∫∫\u200C;	[B5 B6 C1];	[B5 B6 C1]	#	ßࠋ.ٻ.帼f∫∫
-T;	ß\u080B。\u067B.帼f∫∫\u200C;	[B5 B6 C1];	[B5 B6]	#	ßࠋ.ٻ.帼f∫∫
-N;	ß\u080B。\u067B.帼f∫∫\u200C;	[B5 B6 C1];	[B5 B6 C1]	#	ßࠋ.ٻ.帼f∫∫
-T;	SS\u080B。\u067B.帼F∫∫\u200C;	[B5 B6 C1];	[B5 B6]	#	ssࠋ.ٻ.帼f∫∫
-N;	SS\u080B。\u067B.帼F∫∫\u200C;	[B5 B6 C1];	[B5 B6 C1]	#	ssࠋ.ٻ.帼f∫∫
-T;	ss\u080B。\u067B.帼f∫∫\u200C;	[B5 B6 C1];	[B5 B6]	#	ssࠋ.ٻ.帼f∫∫
-N;	ss\u080B。\u067B.帼f∫∫\u200C;	[B5 B6 C1];	[B5 B6 C1]	#	ssࠋ.ٻ.帼f∫∫
-T;	Ss\u080B。\u067B.帼F∫∫\u200C;	[B5 B6 C1];	[B5 B6]	#	ssࠋ.ٻ.帼f∫∫
-N;	Ss\u080B。\u067B.帼F∫∫\u200C;	[B5 B6 C1];	[B5 B6 C1]	#	ssࠋ.ٻ.帼f∫∫
-B;	xn--ss-uze.xn--0ib.xn--f-tcoa9162d;	[B5 B6];	[B5 B6]	#	ssࠋ.ٻ.帼f∫∫
-B;	xn--ss-uze.xn--0ib.xn--f-sgn48ga6997e;	[B5 B6 C1];	[B5 B6 C1]	#	ssࠋ.ٻ.帼f∫∫
-B;	xn--zca687a.xn--0ib.xn--f-sgn48ga6997e;	[B5 B6 C1];	[B5 B6 C1]	#	ßࠋ.ٻ.帼f∫∫
-T;	ß\u080B︒\u067B．帼f∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ßࠋ︒ٻ.帼f∫∫
-N;	ß\u080B︒\u067B．帼f∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ßࠋ︒ٻ.帼f∫∫
-T;	SS\u080B︒\u067B．帼F∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ssࠋ︒ٻ.帼f∫∫
-N;	SS\u080B︒\u067B．帼F∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ssࠋ︒ٻ.帼f∫∫
-T;	ss\u080B︒\u067B．帼f∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ssࠋ︒ٻ.帼f∫∫
-N;	ss\u080B︒\u067B．帼f∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ssࠋ︒ٻ.帼f∫∫
-T;	Ss\u080B︒\u067B．帼F∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	ssࠋ︒ٻ.帼f∫∫
-N;	Ss\u080B︒\u067B．帼F∬\u200C;	[B5 B6 C1 P1 V6];	[B5 B6 C1 P1 V6]	#	ssࠋ︒ٻ.帼f∫∫
-B;	xn--ss-k0d31nu121d.xn--f-tcoa9162d;	[B5 B6 V6];	[B5 B6 V6]	#	ssࠋ︒ٻ.帼f∫∫
-B;	xn--ss-k0d31nu121d.xn--f-sgn48ga6997e;	[B5 B6 C1 V6];	[B5 B6 C1 V6]	#	ssࠋ︒ٻ.帼f∫∫
-B;	xn--zca68zj8ac956c.xn--f-sgn48ga6997e;	[B5 B6 C1 V6];	[B5 B6 C1 V6]	#	ßࠋ︒ٻ.帼f∫∫
-T;	󘪗｡�𞨌\u200D;	[B1 C2 P1 V6];	[B1 P1 V6]	#	.�
-N;	󘪗｡�𞨌\u200D;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	.�
-T;	󘪗。�𞨌\u200D;	[B1 C2 P1 V6];	[B1 P1 V6]	#	.�
-N;	󘪗。�𞨌\u200D;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	.�
-B;	xn--8l83e.xn--so0dw168a;	[B1 V6];	[B1 V6]
-B;	xn--8l83e.xn--1ug4105gsxwf;	[B1 C2 V6];	[B1 C2 V6]	#	.�
-B;	񗛨.򅟢�\uA8C4;	[P1 V6];	[P1 V6]	#	.6꣄
-B;	񗛨.򅟢6\uA8C4;	[P1 V6];	[P1 V6]	#	.6꣄
-B;	xn--mi60a.xn--6-sl4es8023c;	[V6];	[V6]	#	.6꣄
-B;	\u1AB2\uFD8E。-۹ႱႨ;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	᪲مخج.-۹ႱႨ
-B;	\u1AB2\u0645\u062E\u062C。-۹ႱႨ;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	᪲مخج.-۹ႱႨ
-B;	\u1AB2\u0645\u062E\u062C。-۹ⴑⴈ;	[B1 V3 V5];	[B1 V3 V5]	#	᪲مخج.-۹ⴑⴈ
-B;	\u1AB2\u0645\u062E\u062C。-۹Ⴑⴈ;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	᪲مخج.-۹Ⴑⴈ
-B;	xn--rgbd2e831i.xn----zyc875efr3a;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	᪲مخج.-۹Ⴑⴈ
-B;	xn--rgbd2e831i.xn----zyc3430a9a;	[B1 V3 V5];	[B1 V3 V5]	#	᪲مخج.-۹ⴑⴈ
-B;	xn--rgbd2e831i.xn----zyc155e9a;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	᪲مخج.-۹ႱႨ
-B;	\u1AB2\uFD8E。-۹ⴑⴈ;	[B1 V3 V5];	[B1 V3 V5]	#	᪲مخج.-۹ⴑⴈ
-B;	\u1AB2\uFD8E。-۹Ⴑⴈ;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	᪲مخج.-۹Ⴑⴈ
-B;	𞤤．-\u08A3︒;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤤.-ࢣ︒
-B;	𞤤.-\u08A3。;	[B1 V3];	[B1 V3]	#	𞤤.-ࢣ.
-B;	𞤂.-\u08A3。;	[B1 V3];	[B1 V3]	#	𞤤.-ࢣ.
-B;	xn--ce6h.xn----cod.;	[B1 V3];	[B1 V3]	#	𞤤.-ࢣ.
-B;	𞤂．-\u08A3︒;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	𞤤.-ࢣ︒
-B;	xn--ce6h.xn----cod7069p;	[B1 V3 V6];	[B1 V3 V6]	#	𞤤.-ࢣ︒
-T;	\u200C�.\u0859--;	[B1 C1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	.࡙--
-N;	\u200C�.\u0859--;	[B1 C1 P1 V3 V5 V6];	[B1 C1 P1 V3 V5 V6]	#	.࡙--
-B;	xn--9p0d.xn-----h6e;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	.à¡™--
-B;	xn--0ug7905g.xn-----h6e;	[B1 C1 V3 V5 V6];	[B1 C1 V3 V5 V6]	#	.à¡™--
-B;	�󮘋Ⴢ.Ⴁ;	[P1 V6];	[P1 V6]
-B;	�󮘋ⴢ.�;	[P1 V6];	[P1 V6]
-B;	�󮘋Ⴢ.�;	[P1 V6];	[P1 V6]
-B;	xn--6nd5215jr2u0h.xn--skj;	[V6];	[V6]
-B;	xn--qlj1559dr224h.xn--skj;	[V6];	[V6]
-B;	xn--6nd5215jr2u0h.xn--8md;	[V6];	[V6]
-T;	񗑿\uA806₄򩞆｡𲩧󠒹ς;	[P1 V6];	[P1 V6]	#	꠆4.ς
-N;	񗑿\uA806₄򩞆｡𲩧󠒹ς;	[P1 V6];	[P1 V6]	#	꠆4.ς
-T;	񗑿\uA8064򩞆。𲩧󠒹ς;	[P1 V6];	[P1 V6]	#	꠆4.ς
-N;	񗑿\uA8064򩞆。𲩧󠒹ς;	[P1 V6];	[P1 V6]	#	꠆4.ς
-B;	񗑿\uA8064򩞆。𲩧󠒹Σ;	[P1 V6];	[P1 V6]	#	꠆4.σ
-B;	񗑿\uA8064򩞆。𲩧󠒹σ;	[P1 V6];	[P1 V6]	#	꠆4.σ
-B;	xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d;	[V6];	[V6]	#	꠆4.σ
-B;	xn--4-w93ej7463a9io5a.xn--3xa51142bk3f0d;	[V6];	[V6]	#	ê †4.Ï‚
-B;	񗑿\uA806₄򩞆｡𲩧󠒹Σ;	[P1 V6];	[P1 V6]	#	꠆4.σ
-B;	񗑿\uA806₄򩞆｡𲩧󠒹σ;	[P1 V6];	[P1 V6]	#	꠆4.σ
-B;	󠆀\u0723。\u1DF4\u0775;	[B1 V5];	[B1 V5]	#	ܣ.ᷴݵ
-B;	xn--tnb.xn--5pb136i;	[B1 V5];	[B1 V5]	#	ܣ.ᷴݵ
-T;	�\u0842�｡𬼖Ⴑ\u200D;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	�ࡂ�.𬼖Ⴑ
-N;	�\u0842�｡𬼖Ⴑ\u200D;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	�ࡂ�.𬼖Ⴑ
-T;	�\u0842�。𬼖Ⴑ\u200D;	[B1 B6 C2 P1 V6];	[B1 P1 V6]	#	�ࡂ�.𬼖Ⴑ
-N;	�\u0842�。𬼖Ⴑ\u200D;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	�ࡂ�.𬼖Ⴑ
-T;	�\u0842�。𬼖ⴑ\u200D;	[B1 B6 C2];	[B1]	#	�ࡂ�.𬼖ⴑ
-N;	�\u0842�。𬼖ⴑ\u200D;	[B1 B6 C2];	[B1 B6 C2]	#	�ࡂ�.𬼖ⴑ
-B;	xn--0vb1535kdb6e.xn--8kjz186s;	[B1];	[B1]	#	�ࡂ�.𬼖ⴑ
-B;	xn--0vb1535kdb6e.xn--1ug742c5714c;	[B1 B6 C2];	[B1 B6 C2]	#	�ࡂ�.𬼖ⴑ
-B;	xn--0vb1535kdb6e.xn--pnd93707a;	[B1 V6];	[B1 V6]	#	�ࡂ�.𬼖Ⴑ
-B;	xn--0vb1535kdb6e.xn--pnd879eqy33c;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	�ࡂ�.𬼖Ⴑ
-T;	�\u0842�｡𬼖ⴑ\u200D;	[B1 B6 C2];	[B1]	#	�ࡂ�.𬼖ⴑ
-N;	�\u0842�｡𬼖ⴑ\u200D;	[B1 B6 C2];	[B1 B6 C2]	#	�ࡂ�.𬼖ⴑ
-T;	\u1714�󠙘\u200D｡-�;	[B1 C2 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	᜔�.-�
-N;	\u1714�󠙘\u200D｡-�;	[B1 C2 P1 V3 V5 V6];	[B1 C2 P1 V3 V5 V6]	#	᜔�.-�
-T;	\u1714�󠙘\u200D。-�;	[B1 C2 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	᜔�.-�
-N;	\u1714�󠙘\u200D。-�;	[B1 C2 P1 V3 V5 V6];	[B1 C2 P1 V3 V5 V6]	#	᜔�.-�
-B;	xn--fze4126jujt0g.xn----c36i;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	᜔�.-�
-B;	xn--fze807bso0spy14i.xn----c36i;	[B1 C2 V3 V5 V6];	[B1 C2 V3 V5 V6]	#	᜔�.-�
-B;	𾢬｡\u0729︒쯙�;	[B2 P1 V6];	[B2 P1 V6]	#	.ܩ︒쯙5
-B;	𾢬｡\u0729︒�ᅳᆬ�;	[B2 P1 V6];	[B2 P1 V6]	#	.ܩ︒쯙5
-B;	𾢬。\u0729。쯙5;	[P1 V6];	[P1 V6]	#	.ܩ.쯙5
-B;	𾢬。\u0729。�ᅳᆬ5;	[P1 V6];	[P1 V6]	#	.ܩ.쯙5
-B;	xn--t92s.xn--znb.xn--5-y88f;	[V6];	[V6]	#	.ܩ.쯙5
-B;	xn--t92s.xn--5-p1c0712mm8rb;	[B2 V6];	[B2 V6]	#	.ܩ︒쯙5
-B;	𞤟-。\u0762≮�;	[B2 B3 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	�-.ݢ≮�
-B;	𞤟-。\u0762<\u0338뻐;	[B2 B3 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	�-.ݢ≮�
-B;	�-。\u0762<\u0338뻐;	[B2 B3 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	�-.ݢ≮�
-B;	�-。\u0762≮�;	[B2 B3 P1 V3 V6];	[B2 B3 P1 V3 V6]	#	�-.ݢ≮�
-B;	xn----1j8r.xn--mpb269krv4i;	[B2 B3 V3 V6];	[B2 B3 V3 V6]	#	�-.ݢ≮�
-B;	𞥩-򊫠．\u08B4≠;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	-.ࢴ≠
-B;	𞥩-򊫠．\u08B4=\u0338;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	-.ࢴ≠
-B;	𞥩-򊫠.\u08B4≠;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	-.ࢴ≠
-B;	𞥩-򊫠.\u08B4=\u0338;	[B2 B3 P1 V6];	[B2 B3 P1 V6]	#	-.ࢴ≠
-B;	xn----cm8rp3609a.xn--9yb852k;	[B2 B3 V6];	[B2 B3 V6]	#	-.ࢴ≠
-T;	-�ςႼ．\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ςႼ.١
-N;	-�ςႼ．\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ςႼ.١
-T;	-�ςႼ.\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ςႼ.١
-N;	-�ςႼ.\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ςႼ.١
-T;	-�ςⴜ.\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ςⴜ.١
-N;	-�ςⴜ.\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ςⴜ.١
-B;	-�ΣႼ.\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-σႼ.١
-B;	-�σⴜ.\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-σⴜ.١
-B;	-�Σⴜ.\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-σⴜ.١
-B;	xn----0mb9682aov12f.xn--9hb;	[B1 V3 V6];	[B1 V3 V6]	#	-σⴜ.١
-B;	xn----0mb770hun11i.xn--9hb;	[B1 V3 V6];	[B1 V3 V6]	#	-σႼ.١
-B;	xn----ymb2782aov12f.xn--9hb;	[B1 V3 V6];	[B1 V3 V6]	#	-ςⴜ.١
-B;	xn----ymb080hun11i.xn--9hb;	[B1 V3 V6];	[B1 V3 V6]	#	-ςႼ.١
-T;	-�ςⴜ．\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ςⴜ.١
-N;	-�ςⴜ．\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ςⴜ.١
-B;	-�ΣႼ．\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-σႼ.١
-B;	-�σⴜ．\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-σⴜ.١
-B;	-�Σⴜ．\u0661;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-σⴜ.١
-T;	\u17CA.\u200D�𑀿;	[C2 V5];	[V5]	#	៊.2𑀿
-N;	\u17CA.\u200D�𑀿;	[C2 V5];	[C2 V5]	#	៊.2𑀿
-T;	\u17CA.\u200D2𑀿;	[C2 V5];	[V5]	#	៊.2𑀿
-N;	\u17CA.\u200D2𑀿;	[C2 V5];	[C2 V5]	#	៊.2𑀿
-B;	xn--m4e.xn--2-ku7i;	[V5];	[V5]	#	៊.2𑀿
-B;	xn--m4e.xn--2-tgnv469h;	[C2 V5];	[C2 V5]	#	៊.2𑀿
-B;	≯�｡\u1A60�򟇑;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≯8.᩠�
-B;	>\u0338�｡\u1A60�򟇑;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≯8.᩠�
-B;	≯8。\u1A60�򟇑;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≯8.᩠�
-B;	>\u03388。\u1A60�򟇑;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≯8.᩠�
-B;	xn--8-ogo.xn--jof5303iv1z5d;	[B1 V5 V6];	[B1 V5 V6]	#	≯8.᩠�
-T;	𑲫Ↄ\u0664｡\u200C;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	𑲫Ↄ٤.
-N;	𑲫Ↄ\u0664｡\u200C;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	𑲫Ↄ٤.
-T;	𑲫Ↄ\u0664。\u200C;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	𑲫Ↄ٤.
-N;	𑲫Ↄ\u0664。\u200C;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	𑲫Ↄ٤.
-T;	𑲫ↄ\u0664。\u200C;	[B1 C1 V5];	[B1 V5]	#	𑲫ↄ٤.
-N;	𑲫ↄ\u0664。\u200C;	[B1 C1 V5];	[B1 C1 V5]	#	𑲫ↄ٤.
-B;	xn--dib100l8x1p.;	[B1 V5];	[B1 V5]	#	𑲫ↄ٤.
-B;	xn--dib100l8x1p.xn--0ug;	[B1 C1 V5];	[B1 C1 V5]	#	𑲫ↄ٤.
-B;	xn--dib999kcy1p.;	[B1 V5 V6];	[B1 V5 V6]	#	𑲫Ↄ٤.
-B;	xn--dib999kcy1p.xn--0ug;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	𑲫Ↄ٤.
-T;	𑲫ↄ\u0664｡\u200C;	[B1 C1 V5];	[B1 V5]	#	𑲫ↄ٤.
-N;	𑲫ↄ\u0664｡\u200C;	[B1 C1 V5];	[B1 C1 V5]	#	𑲫ↄ٤.
-T;	\u0C00�\u200D\uFC9D.\u200D\u0750⒈;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	ఀ9بح.�⒈
-N;	\u0C00�\u200D\uFC9D.\u200D\u0750⒈;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	ఀ9بح.�⒈
-T;	\u0C009\u200D\u0628\u062D.\u200D\u07501.;	[B1 C2 V5];	[B1 V5]	#	ఀ9بح.�1.
-N;	\u0C009\u200D\u0628\u062D.\u200D\u07501.;	[B1 C2 V5];	[B1 C2 V5]	#	ఀ9بح.�1.
-B;	xn--9-1mcp570d.xn--1-x3c.;	[B1 V5];	[B1 V5]	#	ఀ9بح.�1.
-B;	xn--9-1mcp570dl51a.xn--1-x3c211q.;	[B1 C2 V5];	[B1 C2 V5]	#	ఀ9بح.�1.
-B;	xn--9-1mcp570d.xn--3ob470m;	[B1 V5 V6];	[B1 V5 V6]	#	ఀ9بح.�⒈
-B;	xn--9-1mcp570dl51a.xn--3ob977jmfd;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	ఀ9بح.�⒈
-T;	\uAAF6。嬶ß葽;	[V5];	[V5]	#	꫶.嬶ß葽
-N;	\uAAF6。嬶ß葽;	[V5];	[V5]	#	꫶.嬶ß葽
-B;	\uAAF6。嬶SS葽;	[V5];	[V5]	#	꫶.嬶ss葽
-B;	\uAAF6。嬶ss葽;	[V5];	[V5]	#	꫶.嬶ss葽
-B;	\uAAF6。嬶Ss葽;	[V5];	[V5]	#	꫶.嬶ss葽
-B;	xn--2v9a.xn--ss-q40dp97m;	[V5];	[V5]	#	꫶.嬶ss葽
-B;	xn--2v9a.xn--zca7637b14za;	[V5];	[V5]	#	꫶.嬶ß葽
-B;	𑚶⒈。񞻡�;	[B5 B6 P1 V5 V6];	[B5 B6 P1 V5 V6]
-B;	𑚶1.。񞻡�;	[B5 B6 P1 V5 V6 A4_2];	[B5 B6 P1 V5 V6 A4_2]
-B;	xn--1-3j0j..xn--yo0d5914s;	[B5 B6 V5 V6 A4_2];	[B5 B6 V5 V6 A4_2]
-B;	xn--tshz969f.xn--yo0d5914s;	[B5 B6 V5 V6];	[B5 B6 V5 V6]
-B;	𑜤︒≮．񚕽\u05D8𞾩;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	𑜤︒≮.ט
-B;	𑜤︒<\u0338．񚕽\u05D8𞾩;	[B1 B5 B6 P1 V5 V6];	[B1 B5 B6 P1 V5 V6]	#	𑜤︒≮.ט
-B;	𑜤。≮.񚕽\u05D8𞾩;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	𑜤.≮.ט
-B;	𑜤。<\u0338.񚕽\u05D8𞾩;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	𑜤.≮.ט
-B;	xn--ci2d.xn--gdh.xn--deb0091w5q9u;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	𑜤.≮.ט
-B;	xn--gdh5267fdzpa.xn--deb0091w5q9u;	[B1 B5 B6 V5 V6];	[B1 B5 B6 V5 V6]	#	𑜤︒≮.ט
-T;	󠆋\u0603�.�ς�򺇥;	[B1 P1 V6];	[B1 P1 V6]	#	.�ς
-N;	󠆋\u0603�.�ς�򺇥;	[B1 P1 V6];	[B1 P1 V6]	#	.�ς
-B;	󠆋\u0603�.�Σ�򺇥;	[B1 P1 V6];	[B1 P1 V6]	#	.�σ
-B;	󠆋\u0603�.�σ�򺇥;	[B1 P1 V6];	[B1 P1 V6]	#	.�σ
-B;	xn--lfb04106d.xn--4xa964mxv16m8moq;	[B1 V6];	[B1 V6]	#	.�σ
-B;	xn--lfb04106d.xn--3xa174mxv16m8moq;	[B1 V6];	[B1 V6]	#	.�ς
-T;	ς�𵢈𑜫｡𞬩\u200C�;	[C1 P1 V6];	[P1 V6]	#	ς�𑜫.�
-N;	ς�𵢈𑜫｡𞬩\u200C�;	[C1 P1 V6];	[C1 P1 V6]	#	ς�𑜫.�
-T;	ς�𵢈𑜫。𞬩\u200C�;	[C1 P1 V6];	[P1 V6]	#	ς�𑜫.�
-N;	ς�𵢈𑜫。𞬩\u200C�;	[C1 P1 V6];	[C1 P1 V6]	#	ς�𑜫.�
-T;	Σ�𵢈𑜫。𞬩\u200C�;	[C1 P1 V6];	[P1 V6]	#	σ�𑜫.�
-N;	Σ�𵢈𑜫。𞬩\u200C�;	[C1 P1 V6];	[C1 P1 V6]	#	σ�𑜫.�
-T;	σ�𵢈𑜫。𞬩\u200C�;	[C1 P1 V6];	[P1 V6]	#	σ�𑜫.�
-N;	σ�𵢈𑜫。𞬩\u200C�;	[C1 P1 V6];	[C1 P1 V6]	#	σ�𑜫.�
-B;	xn--4xa2260lk3b8z15g.xn--tw9ct349a;	[V6];	[V6]
-B;	xn--4xa2260lk3b8z15g.xn--0ug4653g2xzf;	[C1 V6];	[C1 V6]	#	σ�𑜫.�
-B;	xn--3xa4260lk3b8z15g.xn--0ug4653g2xzf;	[C1 V6];	[C1 V6]	#	ς�𑜫.�
-T;	Σ�𵢈𑜫｡𞬩\u200C�;	[C1 P1 V6];	[P1 V6]	#	σ�𑜫.�
-N;	Σ�𵢈𑜫｡𞬩\u200C�;	[C1 P1 V6];	[C1 P1 V6]	#	σ�𑜫.�
-T;	σ�𵢈𑜫｡𞬩\u200C�;	[C1 P1 V6];	[P1 V6]	#	σ�𑜫.�
-N;	σ�𵢈𑜫｡𞬩\u200C�;	[C1 P1 V6];	[C1 P1 V6]	#	σ�𑜫.�
-B;	-�｡-\uFC4C\u075B;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.-نحݛ
-B;	-�。-\u0646\u062D\u075B;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-.-نحݛ
-B;	xn----o452j.xn----cnc8e38c;	[B1 V3 V6];	[B1 V3 V6]	#	-.-نحݛ
-T;	⺢򇺅�｡\u200D🚷;	[C2 P1 V6];	[P1 V6]	#	⺢2.🚷
-N;	⺢򇺅�｡\u200D🚷;	[C2 P1 V6];	[C2 P1 V6]	#	⺢2.🚷
-T;	⺢򇺅2。\u200D🚷;	[C2 P1 V6];	[P1 V6]	#	⺢2.🚷
-N;	⺢򇺅2。\u200D🚷;	[C2 P1 V6];	[C2 P1 V6]	#	⺢2.🚷
-B;	xn--2-4jtr4282f.xn--m78h;	[V6];	[V6]
-B;	xn--2-4jtr4282f.xn--1ugz946p;	[C2 V6];	[C2 V6]	#	⺢2.🚷
-T;	\u0CF8\u200D\u2DFE�｡�;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	ⷾ�.
-N;	\u0CF8\u200D\u2DFE�｡�;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	ⷾ�.
-T;	\u0CF8\u200D\u2DFE�。�;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	ⷾ�.
-N;	\u0CF8\u200D\u2DFE�。�;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	ⷾ�.
-B;	xn--hvc220of37m.xn--3e36c;	[B5 B6 V6];	[B5 B6 V6]	#	ⷾ�.
-B;	xn--hvc488g69j402t.xn--3e36c;	[B5 B6 C2 V6];	[B5 B6 C2 V6]	#	ⷾ�.
-B;	�．Ⴍ₉�;	[B1 P1 V6];	[B1 P1 V6]
-B;	�.Ⴍ98;	[B1 P1 V6];	[B1 P1 V6]
-B;	�.�98;	[B1];	[B1]
-B;	xn--9n0d.xn--98-u61a;	[B1];	[B1]
-B;	xn--9n0d.xn--98-7ek;	[B1 V6];	[B1 V6]
-B;	�．�₉�;	[B1];	[B1]
-T;	\u200C\u034F｡ß\u08E2⒚≯;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ß⒚≯
-N;	\u200C\u034F｡ß\u08E2⒚≯;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ß⒚≯
-T;	\u200C\u034F｡ß\u08E2⒚>\u0338;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ß⒚≯
-N;	\u200C\u034F｡ß\u08E2⒚>\u0338;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ß⒚≯
-T;	\u200C\u034F。ß\u08E219.≯;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6 A4_2]	#	.ß19.≯
-N;	\u200C\u034F。ß\u08E219.≯;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	.ß19.≯
-T;	\u200C\u034F。ß\u08E219.>\u0338;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6 A4_2]	#	.ß19.≯
-N;	\u200C\u034F。ß\u08E219.>\u0338;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	.ß19.≯
-T;	\u200C\u034F。SS\u08E219.>\u0338;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6 A4_2]	#	.ss19.≯
-N;	\u200C\u034F。SS\u08E219.>\u0338;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	.ss19.≯
-T;	\u200C\u034F。SS\u08E219.≯;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6 A4_2]	#	.ss19.≯
-N;	\u200C\u034F。SS\u08E219.≯;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	.ss19.≯
-T;	\u200C\u034F。ss\u08E219.≯;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6 A4_2]	#	.ss19.≯
-N;	\u200C\u034F。ss\u08E219.≯;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	.ss19.≯
-T;	\u200C\u034F。ss\u08E219.>\u0338;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6 A4_2]	#	.ss19.≯
-N;	\u200C\u034F。ss\u08E219.>\u0338;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	.ss19.≯
-T;	\u200C\u034F。Ss\u08E219.>\u0338;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6 A4_2]	#	.ss19.≯
-N;	\u200C\u034F。Ss\u08E219.>\u0338;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	.ss19.≯
-T;	\u200C\u034F。Ss\u08E219.≯;	[B1 B5 C1 P1 V6];	[B1 B5 P1 V6 A4_2]	#	.ss19.≯
-N;	\u200C\u034F。Ss\u08E219.≯;	[B1 B5 C1 P1 V6];	[B1 B5 C1 P1 V6]	#	.ss19.≯
-B;	.xn--ss19-w0i.xn--hdh;	[B1 B5 V6 A4_2];	[B1 B5 V6 A4_2]	#	.ss19.≯
-B;	xn--0ug.xn--ss19-w0i.xn--hdh;	[B1 B5 C1 V6];	[B1 B5 C1 V6]	#	.ss19.≯
-B;	xn--0ug.xn--19-fia813f.xn--hdh;	[B1 B5 C1 V6];	[B1 B5 C1 V6]	#	.ß19.≯
-T;	\u200C\u034F｡SS\u08E2⒚>\u0338;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ss⒚≯
-N;	\u200C\u034F｡SS\u08E2⒚>\u0338;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ss⒚≯
-T;	\u200C\u034F｡SS\u08E2⒚≯;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ss⒚≯
-N;	\u200C\u034F｡SS\u08E2⒚≯;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ss⒚≯
-T;	\u200C\u034F｡ss\u08E2⒚≯;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ss⒚≯
-N;	\u200C\u034F｡ss\u08E2⒚≯;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ss⒚≯
-T;	\u200C\u034F｡ss\u08E2⒚>\u0338;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ss⒚≯
-N;	\u200C\u034F｡ss\u08E2⒚>\u0338;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ss⒚≯
-T;	\u200C\u034F｡Ss\u08E2⒚>\u0338;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ss⒚≯
-N;	\u200C\u034F｡Ss\u08E2⒚>\u0338;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ss⒚≯
-T;	\u200C\u034F｡Ss\u08E2⒚≯;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6 A4_2]	#	.ss⒚≯
-N;	\u200C\u034F｡Ss\u08E2⒚≯;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	.ss⒚≯
-B;	.xn--ss-9if872xjjc;	[B5 B6 V6 A4_2];	[B5 B6 V6 A4_2]	#	.ss⒚≯
-B;	xn--0ug.xn--ss-9if872xjjc;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	.ss⒚≯
-B;	xn--0ug.xn--zca612bx9vo5b;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	.ß⒚≯
-T;	\u200C�ᡌ．𣃔;	[B1 C1 P1 V6];	[B2 B3 P1 V6]	#	ᡌ.𣃔
-N;	\u200C�ᡌ．𣃔;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ᡌ.𣃔
-T;	\u200C�ᡌ.𣃔;	[B1 C1 P1 V6];	[B2 B3 P1 V6]	#	ᡌ.𣃔
-N;	\u200C�ᡌ.𣃔;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	ᡌ.𣃔
-B;	xn--c8e5919u.xn--od1j;	[B2 B3 V6];	[B2 B3 V6]
-B;	xn--c8e180bqz13b.xn--od1j;	[B1 C1 V6];	[B1 C1 V6]	#	ᡌ.𣃔
-B;	\u07D0�-񡢬。\u0FA0Ⴛ��;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	�-.ྠႻ�
-B;	\u07D0�-񡢬。\u0FA0ⴛ��;	[B1 B2 B3 P1 V5 V6];	[B1 B2 B3 P1 V5 V6]	#	�-.ྠⴛ�
-B;	xn----8bd11730jefvw.xn--wfd802mpm20agsxa;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	�-.ྠⴛ�
-B;	xn----8bd11730jefvw.xn--wfd08cd265hgsxa;	[B1 B2 B3 V5 V6];	[B1 B2 B3 V5 V6]	#	�-.ྠႻ�
-B;	�。⫟𑈾;	[V5];	[V5]
-B;	xn--n82h.xn--63iw010f;	[V5];	[V5]
-T;	⾛\u0753.Ⴕ𞠬\u0604\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	走ݓ.Ⴕ𞠬
-N;	⾛\u0753.Ⴕ𞠬\u0604\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	走ݓ.Ⴕ𞠬
-T;	走\u0753.Ⴕ𞠬\u0604\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	走ݓ.Ⴕ𞠬
-N;	走\u0753.Ⴕ𞠬\u0604\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	走ݓ.Ⴕ𞠬
-T;	èµ°\u0753.â´•ðž ¬\u0604\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	èµ°Ý“.â´•ðž ¬
-N;	èµ°\u0753.â´•ðž ¬\u0604\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	èµ°Ý“.â´•ðž ¬
-B;	xn--6ob9779d.xn--mfb511rxu80a;	[B5 B6 V6];	[B5 B6 V6]	#	èµ°Ý“.â´•ðž ¬
-B;	xn--6ob9779d.xn--mfb444k5gjt754b;	[B5 B6 C2 V6];	[B5 B6 C2 V6]	#	èµ°Ý“.â´•ðž ¬
-B;	xn--6ob9779d.xn--mfb785ck569a;	[B5 B6 V6];	[B5 B6 V6]	#	走ݓ.Ⴕ𞠬
-B;	xn--6ob9779d.xn--mfb785czmm0y85b;	[B5 B6 C2 V6];	[B5 B6 C2 V6]	#	走ݓ.Ⴕ𞠬
-T;	â¾›\u0753.â´•ðž ¬\u0604\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	èµ°Ý“.â´•ðž ¬
-N;	â¾›\u0753.â´•ðž ¬\u0604\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	èµ°Ý“.â´•ðž ¬
-T;	-ᢗ\u200C🄄.𑜢;	[C1 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-ᢗ🄄.𑜢
-N;	-ᢗ\u200C🄄.𑜢;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	-ᢗ🄄.𑜢
-T;	-ᢗ\u200C3,.𑜢;	[C1 P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-ᢗ3,.𑜢
-N;	-ᢗ\u200C3,.𑜢;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	-ᢗ3,.𑜢
-B;	xn---3,-3eu.xn--9h2d;	[P1 V3 V5 V6];	[P1 V3 V5 V6]
-B;	xn---3,-3eu051c.xn--9h2d;	[C1 P1 V3 V5 V6];	[C1 P1 V3 V5 V6]	#	-ᢗ3,.𑜢
-B;	xn----pck1820x.xn--9h2d;	[V3 V5 V6];	[V3 V5 V6]
-B;	xn----pck312bx563c.xn--9h2d;	[C1 V3 V5 V6];	[C1 V3 V5 V6]	#	-ᢗ🄄.𑜢
-T;	≠��\u200C.Ⴚ򳄠;	[B1 C1 P1 V6];	[B1 P1 V6]	#	≠.Ⴚ
-N;	≠��\u200C.Ⴚ򳄠;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	≠.Ⴚ
-T;	=\u0338��\u200C.Ⴚ򳄠;	[B1 C1 P1 V6];	[B1 P1 V6]	#	≠.Ⴚ
-N;	=\u0338��\u200C.Ⴚ򳄠;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	≠.Ⴚ
-T;	=\u0338��\u200C.ⴚ򳄠;	[B1 C1 P1 V6];	[B1 P1 V6]	#	≠.ⴚ
-N;	=\u0338��\u200C.ⴚ򳄠;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	≠.ⴚ
-T;	≠��\u200C.ⴚ򳄠;	[B1 C1 P1 V6];	[B1 P1 V6]	#	≠.ⴚ
-N;	≠��\u200C.ⴚ򳄠;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	≠.ⴚ
-B;	xn--1ch2293gv3nr.xn--ilj23531g;	[B1 V6];	[B1 V6]
-B;	xn--0ug83gn618a21ov.xn--ilj23531g;	[B1 C1 V6];	[B1 C1 V6]	#	≠.ⴚ
-B;	xn--1ch2293gv3nr.xn--ynd49496l;	[B1 V6];	[B1 V6]
-B;	xn--0ug83gn618a21ov.xn--ynd49496l;	[B1 C1 V6];	[B1 C1 V6]	#	≠.Ⴚ
-B;	\u0669｡󠇀𑇊;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	٩.𑇊
-B;	\u0669。󠇀𑇊;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	٩.𑇊
-B;	xn--iib.xn--6d1d;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	٩.𑇊
-B;	\u1086𞶀≯�。-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ႆ≯�.-
-B;	\u1086𞶀>\u0338�。-;	[B1 P1 V3 V5 V6];	[B1 P1 V3 V5 V6]	#	ႆ≯�.-
-B;	\u1086𞶀≯6.。-;	[B1 P1 V3 V5 V6 A4_2];	[B1 P1 V3 V5 V6 A4_2]	#	ႆ≯6..-
-B;	\u1086𞶀>\u03386.。-;	[B1 P1 V3 V5 V6 A4_2];	[B1 P1 V3 V5 V6 A4_2]	#	ႆ≯6..-
-B;	xn--6-oyg968k7h74b..-;	[B1 V3 V5 V6 A4_2];	[B1 V3 V5 V6 A4_2]	#	ႆ≯6..-
-B;	xn--hmd482gqqb8730g.-;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	ႆ≯�.-
-B;	\u17B4.쮇-;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	.쮇-
-B;	\u17B4.�ᅰᆮ-;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	.쮇-
-B;	xn--z3e.xn----938f;	[V3 V5 V6];	[V3 V5 V6]	#	.쮇-
-T;	\u200C𑓂。⒈-􀪛;	[C1 P1 V6];	[P1 V5 V6]	#	𑓂.⒈-
-N;	\u200C𑓂。⒈-􀪛;	[C1 P1 V6];	[C1 P1 V6]	#	𑓂.⒈-
-T;	\u200C𑓂。1.-􀪛;	[C1 P1 V3 V6];	[P1 V3 V5 V6]	#	𑓂.1.-
-N;	\u200C𑓂。1.-􀪛;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	𑓂.1.-
-B;	xn--wz1d.1.xn----rg03o;	[V3 V5 V6];	[V3 V5 V6]
-B;	xn--0ugy057g.1.xn----rg03o;	[C1 V3 V6];	[C1 V3 V6]	#	ð‘“‚.1.-
-B;	xn--wz1d.xn----dcp29674o;	[V5 V6];	[V5 V6]
-B;	xn--0ugy057g.xn----dcp29674o;	[C1 V6];	[C1 V6]	#	ð‘“‚.â’ˆ-
-T;	⒈\uFEAE\u200C。\u20E9🖞\u200C𖬴;	[B1 C1 P1 V5 V6];	[B1 P1 V5 V6]	#	⒈ر.⃩🖞𖬴
-N;	⒈\uFEAE\u200C。\u20E9🖞\u200C𖬴;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	⒈ر.⃩🖞𖬴
-T;	1.\u0631\u200C。\u20E9🖞\u200C𖬴;	[B1 B3 C1 V5];	[B1 V5]	#	1.ر.⃩🖞𖬴
-N;	1.\u0631\u200C。\u20E9🖞\u200C𖬴;	[B1 B3 C1 V5];	[B1 B3 C1 V5]	#	1.ر.⃩🖞𖬴
-B;	1.xn--wgb.xn--c1g6021kg18c;	[B1 V5];	[B1 V5]	#	1.ر.⃩🖞𖬴
-B;	1.xn--wgb253k.xn--0ugz6a8040fty5d;	[B1 B3 C1 V5];	[B1 B3 C1 V5]	#	1.ر.⃩🖞𖬴
-B;	xn--wgb746m.xn--c1g6021kg18c;	[B1 V5 V6];	[B1 V5 V6]	#	⒈ر.⃩🖞𖬴
-B;	xn--wgb253kmfd.xn--0ugz6a8040fty5d;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	⒈ر.⃩🖞𖬴
-B;	󌭇｡�\u1BA8\u07D4;	[B1 P1 V6];	[B1 P1 V6]	#	.2ᮨߔ
-B;	󌭇。2\u1BA8\u07D4;	[B1 P1 V6];	[B1 P1 V6]	#	.2ᮨߔ
-B;	xn--xm89d.xn--2-icd143m;	[B1 V6];	[B1 V6]	#	.2ᮨߔ
-T;	\uFD8F򫳺.ς\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	مخم.ς�
-N;	\uFD8F򫳺.ς\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	مخم.ς�
-T;	\u0645\u062E\u0645򫳺.ς\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	مخم.ς�
-N;	\u0645\u062E\u0645򫳺.ς\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	مخم.ς�
-T;	\u0645\u062E\u0645򫳺.Σ\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	مخم.σ�
-N;	\u0645\u062E\u0645򫳺.Σ\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	مخم.σ�
-T;	\u0645\u062E\u0645򫳺.σ\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	مخم.σ�
-N;	\u0645\u062E\u0645򫳺.σ\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	مخم.σ�
-B;	xn--tgb9bb64691z.xn--4xa6667k;	[B2 B3 B5 B6 V6];	[B2 B3 B5 B6 V6]	#	مخم.σ�
-B;	xn--tgb9bb64691z.xn--4xa895lrp7n;	[B2 B3 B5 B6 C2 V6];	[B2 B3 B5 B6 C2 V6]	#	مخم.σ�
-B;	xn--tgb9bb64691z.xn--3xa006lrp7n;	[B2 B3 B5 B6 C2 V6];	[B2 B3 B5 B6 C2 V6]	#	مخم.ς�
-T;	\uFD8F򫳺.Σ\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	مخم.σ�
-N;	\uFD8F򫳺.Σ\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	مخم.σ�
-T;	\uFD8F򫳺.σ\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	مخم.σ�
-N;	\uFD8F򫳺.σ\u200D�;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	مخم.σ�
-B;	⒎\u06C1\u0605｡\uAAF6۵�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	⒎�.꫶۵�
-B;	7.\u06C1\u0605。\uAAF6۵�;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	7.�.꫶۵�
-B;	7.xn--nfb98a.xn--imb3805fxt8b;	[B1 V5 V6];	[B1 V5 V6]	#	7.�.꫶۵�
-B;	xn--nfb98ai25e.xn--imb3805fxt8b;	[B1 V5 V6];	[B1 V5 V6]	#	⒎�.꫶۵�
-B;	-ᡥ᠆�。\u0605\u1A5D�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	-ᡥ᠆.��
-B;	xn----f3j6s87156i.xn--nfb035hoo2p;	[B1 V3 V6];	[B1 V3 V6]	#	-ᡥ᠆.��
-T;	\u200D.\u06BD\u0663\u0596;	[B1 C2];	[A4_2]	#	.Ú½Ù£Ö–
-N;	\u200D.\u06BD\u0663\u0596;	[B1 C2];	[B1 C2]	#	.Ú½Ù£Ö–
-B;	.xn--hcb32bni;	[A4_2];	[A4_2]	#	.Ú½Ù£Ö–
-B;	xn--1ug.xn--hcb32bni;	[B1 C2];	[B1 C2]	#	.Ú½Ù£Ö–
-B;	xn--hcb32bni;	\u06BD\u0663\u0596;	xn--hcb32bni	#	Ú½Ù£Ö–
-B;	\u06BD\u0663\u0596;	;	xn--hcb32bni	#	Ú½Ù£Ö–
-T;	㒧۱.Ⴚ\u0678\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	㒧۱.Ⴚيٴ
-N;	㒧۱.Ⴚ\u0678\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	㒧۱.Ⴚيٴ
-T;	㒧۱.Ⴚ\u064A\u0674\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	㒧۱.Ⴚيٴ
-N;	㒧۱.Ⴚ\u064A\u0674\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	㒧۱.Ⴚيٴ
-T;	㒧۱.ⴚ\u064A\u0674\u200D;	[B5 B6 C2];	[B5 B6]	#	㒧۱.ⴚيٴ
-N;	㒧۱.ⴚ\u064A\u0674\u200D;	[B5 B6 C2];	[B5 B6 C2]	#	㒧۱.ⴚيٴ
-B;	xn--emb715u.xn--mhb8fy26k;	[B5 B6];	[B5 B6]	#	㒧۱.ⴚيٴ
-B;	xn--emb715u.xn--mhb8f960g03l;	[B5 B6 C2];	[B5 B6 C2]	#	㒧۱.ⴚيٴ
-B;	xn--emb715u.xn--mhb8f817a;	[B5 B6 V6];	[B5 B6 V6]	#	㒧۱.Ⴚيٴ
-B;	xn--emb715u.xn--mhb8f817ao2p;	[B5 B6 C2 V6];	[B5 B6 C2 V6]	#	㒧۱.Ⴚيٴ
-T;	㒧۱.ⴚ\u0678\u200D;	[B5 B6 C2];	[B5 B6]	#	㒧۱.ⴚيٴ
-N;	㒧۱.ⴚ\u0678\u200D;	[B5 B6 C2];	[B5 B6 C2]	#	㒧۱.ⴚيٴ
-B;	\u0F94ꡋ-．-𖬴;	[V3 V5];	[V3 V5]	#	ྔꡋ-.-𖬴
-B;	\u0F94ꡋ-.-𖬴;	[V3 V5];	[V3 V5]	#	ྔꡋ-.-𖬴
-B;	xn----ukg9938i.xn----4u5m;	[V3 V5];	[V3 V5]	#	ྔꡋ-.-𖬴
-T;	񿒳-⋢\u200C．标-;	[C1 P1 V3 V6];	[P1 V3 V6]	#	-⋢.标-
-N;	񿒳-⋢\u200C．标-;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	-⋢.标-
-T;	񿒳-⊑\u0338\u200C．标-;	[C1 P1 V3 V6];	[P1 V3 V6]	#	-⋢.标-
-N;	񿒳-⊑\u0338\u200C．标-;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	-⋢.标-
-T;	ñ¿’³-â‹¢\u200C.æ ‡-;	[C1 P1 V3 V6];	[P1 V3 V6]	#	-â‹¢.æ ‡-
-N;	ñ¿’³-â‹¢\u200C.æ ‡-;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	-â‹¢.æ ‡-
-T;	񿒳-⊑\u0338\u200C.标-;	[C1 P1 V3 V6];	[P1 V3 V6]	#	-⋢.标-
-N;	񿒳-⊑\u0338\u200C.标-;	[C1 P1 V3 V6];	[C1 P1 V3 V6]	#	-⋢.标-
-B;	xn----9mo67451g.xn----qj7b;	[V3 V6];	[V3 V6]
-B;	xn----sgn90kn5663a.xn----qj7b;	[C1 V3 V6];	[C1 V3 V6]	#	-â‹¢.æ ‡-
-T;	\u0671．ς\u07DC;	[B5 B6];	[B5 B6]	#	ٱ.ςߜ
-N;	\u0671．ς\u07DC;	[B5 B6];	[B5 B6]	#	ٱ.ςߜ
-T;	\u0671.ς\u07DC;	[B5 B6];	[B5 B6]	#	ٱ.ςߜ
-N;	\u0671.ς\u07DC;	[B5 B6];	[B5 B6]	#	ٱ.ςߜ
-B;	\u0671.Σ\u07DC;	[B5 B6];	[B5 B6]	#	ٱ.σߜ
-B;	\u0671.σ\u07DC;	[B5 B6];	[B5 B6]	#	ٱ.σߜ
-B;	xn--qib.xn--4xa21s;	[B5 B6];	[B5 B6]	#	ٱ.σߜ
-B;	xn--qib.xn--3xa41s;	[B5 B6];	[B5 B6]	#	ٱ.ςߜ
-B;	\u0671．Σ\u07DC;	[B5 B6];	[B5 B6]	#	ٱ.σߜ
-B;	\u0671．σ\u07DC;	[B5 B6];	[B5 B6]	#	ٱ.σߜ
-T;	񼈶\u0605．\u08C1\u200D𑑂𱼱;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	.𑑂
-N;	񼈶\u0605．\u08C1\u200D𑑂𱼱;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	.𑑂
-T;	񼈶\u0605.\u08C1\u200D𑑂𱼱;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 P1 V6]	#	.𑑂
-N;	񼈶\u0605.\u08C1\u200D𑑂𱼱;	[B2 B3 B5 B6 C2 P1 V6];	[B2 B3 B5 B6 C2 P1 V6]	#	.𑑂
-B;	xn--nfb17942h.xn--nzb6708kx3pn;	[B2 B3 B5 B6 V6];	[B2 B3 B5 B6 V6]	#	.ð‘‘‚
-B;	xn--nfb17942h.xn--nzb240jv06otevq;	[B2 B3 B5 B6 C2 V6];	[B2 B3 B5 B6 C2 V6]	#	.ð‘‘‚
-B;	��𞵜｡\u1BF2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	��.᯲
-B;	��𞵜。\u1BF2;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	��.᯲
-B;	xn--d97cn8rn44p.xn--0zf;	[B1 V5 V6];	[B1 V5 V6]	#	��.᯲
-T;	6\u1160\u1C33󠸧.򟜊锰\u072Cς;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	6ᰳ.锰ܬς
-N;	6\u1160\u1C33󠸧.򟜊锰\u072Cς;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	6ᰳ.锰ܬς
-B;	6\u1160\u1C33󠸧.򟜊锰\u072CΣ;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	6ᰳ.锰ܬσ
-B;	6\u1160\u1C33󠸧.򟜊锰\u072Cσ;	[B1 B5 P1 V6];	[B1 B5 P1 V6]	#	6ᰳ.锰ܬσ
-B;	xn--6-5bh476ewr517a.xn--4xa95ohw6pk078g;	[B1 B5 V6];	[B1 B5 V6]	#	6ᰳ.锰ܬσ
-B;	xn--6-5bh476ewr517a.xn--3xa16ohw6pk078g;	[B1 B5 V6];	[B1 B5 V6]	#	6ᰳ.锰ܬς
-B;	\u06B3\uFE04񅎦�｡�;	[B1 B2 P1 V6];	[B1 B2 P1 V6]	#	ڳ7.�
-B;	\u06B3\uFE04񅎦7。�;	[B1 B2 P1 V6];	[B1 B2 P1 V6]	#	ڳ7.�
-B;	xn--7-yuc34665f.xn--1o0d;	[B1 B2 V6];	[B1 B2 V6]	#	ڳ7.�
-T;	𞮧．\u200C⫞;	[B1 C1 P1 V6];	[B1 P1 V6]	#	.⫞
-N;	𞮧．\u200C⫞;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	.⫞
-T;	𞮧.\u200C⫞;	[B1 C1 P1 V6];	[B1 P1 V6]	#	.⫞
-N;	𞮧.\u200C⫞;	[B1 C1 P1 V6];	[B1 C1 P1 V6]	#	.⫞
-B;	xn--pw6h.xn--53i;	[B1 V6];	[B1 V6]
-B;	xn--pw6h.xn--0ug283b;	[B1 C1 V6];	[B1 C1 V6]	#	.â«ž
-B;	-񕉴.\u06E0ᢚ-;	[P1 V3 V5 V6];	[P1 V3 V5 V6]	#	-.۠ᢚ-
-B;	xn----qi38c.xn----jxc827k;	[V3 V5 V6];	[V3 V5 V6]	#	-.۠ᢚ-
-T;	�\u200D𑄴．\u200C�\u066C;	[B1 C1 C2];	[B1]	#	�𑄴.7٬
-N;	�\u200D𑄴．\u200C�\u066C;	[B1 C1 C2];	[B1 C1 C2]	#	�𑄴.7٬
-T;	�\u200D𑄴.\u200C7\u066C;	[B1 C1 C2];	[B1]	#	�𑄴.7٬
-N;	�\u200D𑄴.\u200C7\u066C;	[B1 C1 C2];	[B1 C1 C2]	#	�𑄴.7٬
-B;	xn--nhh5394g.xn--7-xqc;	[B1];	[B1]	#	�𑄴.7٬
-B;	xn--1ug38i2093a.xn--7-xqc297q;	[B1 C1 C2];	[B1 C1 C2]	#	�𑄴.7٬
-B;	︒\uFD05\u0E37\uFEFC。岓\u1BF2󠾃ᡂ;	[B1 P1 V6];	[B1 P1 V6]	#	︒صىืلا.岓᯲ᡂ
-B;	。\u0635\u0649\u0E37\u0644\u0627。岓\u1BF2󠾃ᡂ;	[P1 V6 A4_2];	[P1 V6 A4_2]	#	.صىืلا.岓᯲ᡂ
-B;	.xn--mgb1a7bt462h.xn--17e10qe61f9r71s;	[V6 A4_2];	[V6 A4_2]	#	.صىืلا.岓᯲ᡂ
-B;	xn--mgb1a7bt462hf267a.xn--17e10qe61f9r71s;	[B1 V6];	[B1 V6]	#	︒صىืلا.岓᯲ᡂ
-B;	�。8�;	[B1];	[B1]
-B;	xn--go0d.xn--8-yu7i;	[B1];	[B1]
-B;	𞀕\u0D43．ꡚ\u08FA�\u0D44;	[B1 B3 B5 B6 V5];	[B1 B3 B5 B6 V5]	#	𞀕ൃ.ꡚࣺ�ൄ
-B;	𞀕\u0D43.ꡚ\u08FA�\u0D44;	[B1 B3 B5 B6 V5];	[B1 B3 B5 B6 V5]	#	𞀕ൃ.ꡚࣺ�ൄ
-B;	xn--mxc5210v.xn--90b01t8u2p1ltd;	[B1 B3 B5 B6 V5];	[B1 B3 B5 B6 V5]	#	𞀕ൃ.ꡚࣺ�ൄ
-B;	��\u0303｡�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	̃.
-B;	��\u0303。�;	[B1 B5 B6 P1 V6];	[B1 B5 B6 P1 V6]	#	̃.
-B;	xn--nsa1265kp9z9e.xn--xt36e;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	̃.
-B;	ᢌ．-\u085A;	[V3];	[V3]	#	ᢌ.-࡚
-B;	ᢌ.-\u085A;	[V3];	[V3]	#	ᢌ.-࡚
-B;	xn--59e.xn----5jd;	[V3];	[V3]	#	ᢌ.-࡚
-B;	𥛛𑘶｡��\u0BCD;	[B1 P1 V6];	[B1 P1 V6]	#	𥛛𑘶.��
-B;	𥛛𑘶。��\u0BCD;	[B1 P1 V6];	[B1 P1 V6]	#	𥛛𑘶.��
-B;	xn--jb2dj685c.xn--xmc5562kmcb;	[B1 V6];	[B1 V6]	#	𥛛𑘶.��
-T;	Ⴐ\u077F．\u200C;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	Ⴐݿ.
-N;	Ⴐ\u077F．\u200C;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	Ⴐݿ.
-T;	á‚°\u077F.\u200C;	[B1 B5 B6 C1 P1 V6];	[B5 B6 P1 V6]	#	á‚°Ý¿.
-N;	á‚°\u077F.\u200C;	[B1 B5 B6 C1 P1 V6];	[B1 B5 B6 C1 P1 V6]	#	á‚°Ý¿.
-T;	�\u077F.\u200C;	[B1 B5 B6 C1];	[B5 B6]	#	�ݿ.
-N;	�\u077F.\u200C;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	�ݿ.
-B;	xn--gqb743q.;	[B5 B6];	[B5 B6]	#	�ݿ.
-B;	xn--gqb743q.xn--0ug;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	�ݿ.
-B;	xn--gqb918b.;	[B5 B6 V6];	[B5 B6 V6]	#	á‚°Ý¿.
-B;	xn--gqb918b.xn--0ug;	[B1 B5 B6 C1 V6];	[B1 B5 B6 C1 V6]	#	á‚°Ý¿.
-T;	�\u077F．\u200C;	[B1 B5 B6 C1];	[B5 B6]	#	�ݿ.
-N;	�\u077F．\u200C;	[B1 B5 B6 C1];	[B1 B5 B6 C1]	#	�ݿ.
-T;	🄅𑲞-⒈。\u200Dᠩ\u06A5;	[B1 C2 P1 V6];	[B1 B5 B6 P1 V6]	#	🄅𑲞-⒈.ᠩڥ
-N;	🄅𑲞-⒈。\u200Dᠩ\u06A5;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	🄅𑲞-⒈.ᠩڥ
-T;	4,𑲞-1.。\u200Dᠩ\u06A5;	[B1 C2 P1 V6 A4_2];	[B1 B5 B6 P1 V6 A4_2]	#	4,𑲞-1..ᠩڥ
-N;	4,𑲞-1.。\u200Dᠩ\u06A5;	[B1 C2 P1 V6 A4_2];	[B1 C2 P1 V6 A4_2]	#	4,𑲞-1..ᠩڥ
-B;	xn--4,-1-w401a..xn--7jb180g;	[B1 B5 B6 P1 V6 A4_2];	[B1 B5 B6 P1 V6 A4_2]	#	4,𑲞-1..ᠩڥ
-B;	xn--4,-1-w401a..xn--7jb180gexf;	[B1 C2 P1 V6 A4_2];	[B1 C2 P1 V6 A4_2]	#	4,𑲞-1..ᠩڥ
-B;	xn----ecp8796hjtvg.xn--7jb180g;	[B1 B5 B6 V6];	[B1 B5 B6 V6]	#	🄅𑲞-⒈.ᠩڥ
-B;	xn----ecp8796hjtvg.xn--7jb180gexf;	[B1 C2 V6];	[B1 C2 V6]	#	🄅𑲞-⒈.ᠩڥ
-B;	񗀤。𞤪򮿋;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	񗀤。𞤈򮿋;	[B2 B3 P1 V6];	[B2 B3 P1 V6]
-B;	xn--4240a.xn--ie6h83808a;	[B2 B3 V6];	[B2 B3 V6]
-B;	\u05C1۲｡�\u066C�鄨;	[B1 B2 B3 V5];	[B1 B2 B3 V5]	#	�۲.�٬�鄨
-B;	\u05C1۲。�\u066C�鄨;	[B1 B2 B3 V5];	[B1 B2 B3 V5]	#	�۲.�٬�鄨
-B;	xn--pdb42d.xn--lib6412enztdwv6h;	[B1 B2 B3 V5];	[B1 B2 B3 V5]	#	�۲.�٬�鄨
-B;	𞭳-�。\u1A69\u0BCD-;	[B1 B2 B3 P1 V3 V5 V6];	[B1 B2 B3 P1 V3 V5 V6]	#	-�.ᩩ�-
-B;	xn----be4e4276f.xn----lze333i;	[B1 B2 B3 V3 V5 V6];	[B1 B2 B3 V3 V5 V6]	#	-�.ᩩ�-
-T;	\u1039-𚮭🞢．ß;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ß
-N;	\u1039-𚮭🞢．ß;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ß
-T;	\u1039-𚮭🞢.ß;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ß
-N;	\u1039-𚮭🞢.ß;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ß
-B;	\u1039-𚮭🞢.SS;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ss
-B;	\u1039-𚮭🞢.ss;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ss
-B;	\u1039-𚮭🞢.Ss;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ss
-B;	xn----9tg11172akr8b.ss;	[V5 V6];	[V5 V6]	#	္-🞢.ss
-B;	xn----9tg11172akr8b.xn--zca;	[V5 V6];	[V5 V6]	#	္-🞢.ß
-B;	\u1039-𚮭🞢．SS;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ss
-B;	\u1039-𚮭🞢．ss;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ss
-B;	\u1039-𚮭🞢．Ss;	[P1 V5 V6];	[P1 V5 V6]	#	္-🞢.ss
-T;	\uFCF2-\u200C｡Ⴟ\u200C�;	[B3 B6 C1 P1 V6];	[B3 B6 P1 V3 V6]	#	ـَّ-.Ⴟ�
-N;	\uFCF2-\u200C｡Ⴟ\u200C�;	[B3 B6 C1 P1 V6];	[B3 B6 C1 P1 V6]	#	ـَّ-.Ⴟ�
-T;	\u0640\u064E\u0651-\u200C。Ⴟ\u200C�;	[B3 B6 C1 P1 V6];	[B3 B6 P1 V3 V6]	#	ـَّ-.Ⴟ�
-N;	\u0640\u064E\u0651-\u200C。Ⴟ\u200C�;	[B3 B6 C1 P1 V6];	[B3 B6 C1 P1 V6]	#	ـَّ-.Ⴟ�
-T;	\u0640\u064E\u0651-\u200C。ⴟ\u200C�;	[B3 B6 C1];	[B3 B6 V3]	#	ـَّ-.ⴟ�
-N;	\u0640\u064E\u0651-\u200C。ⴟ\u200C�;	[B3 B6 C1];	[B3 B6 C1]	#	ـَّ-.ⴟ�
-B;	xn----eoc6bm.xn--xph904a;	[B3 B6 V3];	[B3 B6 V3]	#	ـَّ-.ⴟ�
-B;	xn----eoc6bm0504a.xn--0ug13nd0j;	[B3 B6 C1];	[B3 B6 C1]	#	ـَّ-.ⴟ�
-B;	xn----eoc6bm.xn--3nd240h;	[B3 B6 V3 V6];	[B3 B6 V3 V6]	#	ـَّ-.Ⴟ�
-B;	xn----eoc6bm0504a.xn--3nd849e05c;	[B3 B6 C1 V6];	[B3 B6 C1 V6]	#	ـَّ-.Ⴟ�
-T;	\uFCF2-\u200C｡ⴟ\u200C�;	[B3 B6 C1];	[B3 B6 V3]	#	ـَّ-.ⴟ�
-N;	\uFCF2-\u200C｡ⴟ\u200C�;	[B3 B6 C1];	[B3 B6 C1]	#	ـَّ-.ⴟ�
-T;	\u0D4D-\u200D\u200C｡񥞧₅≠;	[C1 C2 P1 V5 V6];	[P1 V3 V5 V6]	#	�-.5≠
-N;	\u0D4D-\u200D\u200C｡񥞧₅≠;	[C1 C2 P1 V5 V6];	[C1 C2 P1 V5 V6]	#	�-.5≠
-T;	\u0D4D-\u200D\u200C｡񥞧₅=\u0338;	[C1 C2 P1 V5 V6];	[P1 V3 V5 V6]	#	�-.5≠
-N;	\u0D4D-\u200D\u200C｡񥞧₅=\u0338;	[C1 C2 P1 V5 V6];	[C1 C2 P1 V5 V6]	#	�-.5≠
-T;	\u0D4D-\u200D\u200C。񥞧5≠;	[C1 C2 P1 V5 V6];	[P1 V3 V5 V6]	#	�-.5≠
-N;	\u0D4D-\u200D\u200C。񥞧5≠;	[C1 C2 P1 V5 V6];	[C1 C2 P1 V5 V6]	#	�-.5≠
-T;	\u0D4D-\u200D\u200C。񥞧5=\u0338;	[C1 C2 P1 V5 V6];	[P1 V3 V5 V6]	#	�-.5≠
-N;	\u0D4D-\u200D\u200C。񥞧5=\u0338;	[C1 C2 P1 V5 V6];	[C1 C2 P1 V5 V6]	#	�-.5≠
-B;	xn----jmf.xn--5-ufo50192e;	[V3 V5 V6];	[V3 V5 V6]	#	�-.5≠
-B;	xn----jmf215lda.xn--5-ufo50192e;	[C1 C2 V5 V6];	[C1 C2 V5 V6]	#	�-.5≠
-B;	锣。\u0A4D󠘻󠚆;	[P1 V5 V6];	[P1 V5 V6]	#	锣.�
-B;	xn--gc5a.xn--ybc83044ppga;	[V5 V6];	[V5 V6]	#	锣.�
-T;	\u063D𑈾．\u0649\u200D\uA92B;	[B3 C2];	xn--8gb2338k.xn--lhb0154f	#	ؽ𑈾.ى꤫
-N;	\u063D𑈾．\u0649\u200D\uA92B;	[B3 C2];	[B3 C2]	#	ؽ𑈾.ى꤫
-T;	\u063D𑈾.\u0649\u200D\uA92B;	[B3 C2];	xn--8gb2338k.xn--lhb0154f	#	ؽ𑈾.ى꤫
-N;	\u063D𑈾.\u0649\u200D\uA92B;	[B3 C2];	[B3 C2]	#	ؽ𑈾.ى꤫
-B;	xn--8gb2338k.xn--lhb0154f;	\u063D𑈾.\u0649\uA92B;	xn--8gb2338k.xn--lhb0154f	#	ؽ𑈾.ى꤫
-B;	\u063D𑈾.\u0649\uA92B;	;	xn--8gb2338k.xn--lhb0154f	#	ؽ𑈾.ى꤫
-B;	xn--8gb2338k.xn--lhb603k060h;	[B3 C2];	[B3 C2]	#	ؽ𑈾.ى꤫
-T;	\u0666�Ⴅ．\u08BD\u200C;	[B1 B3 C1 P1 V6];	[B1 P1 V6]	#	٦4Ⴅ.ࢽ
-N;	\u0666�Ⴅ．\u08BD\u200C;	[B1 B3 C1 P1 V6];	[B1 B3 C1 P1 V6]	#	٦4Ⴅ.ࢽ
-T;	\u06664Ⴅ.\u08BD\u200C;	[B1 B3 C1 P1 V6];	[B1 P1 V6]	#	٦4Ⴅ.ࢽ
-N;	\u06664Ⴅ.\u08BD\u200C;	[B1 B3 C1 P1 V6];	[B1 B3 C1 P1 V6]	#	٦4Ⴅ.ࢽ
-T;	\u06664ⴅ.\u08BD\u200C;	[B1 B3 C1];	[B1]	#	٦4ⴅ.ࢽ
-N;	\u06664ⴅ.\u08BD\u200C;	[B1 B3 C1];	[B1 B3 C1]	#	٦4ⴅ.ࢽ
-B;	xn--4-kqc6770a.xn--jzb;	[B1];	[B1]	#	٦4ⴅ.ࢽ
-B;	xn--4-kqc6770a.xn--jzb840j;	[B1 B3 C1];	[B1 B3 C1]	#	٦4ⴅ.ࢽ
-B;	xn--4-kqc489e.xn--jzb;	[B1 V6];	[B1 V6]	#	٦4Ⴅ.ࢽ
-B;	xn--4-kqc489e.xn--jzb840j;	[B1 B3 C1 V6];	[B1 B3 C1 V6]	#	٦4Ⴅ.ࢽ
-T;	\u0666�ⴅ．\u08BD\u200C;	[B1 B3 C1];	[B1]	#	٦4ⴅ.ࢽ
-N;	\u0666�ⴅ．\u08BD\u200C;	[B1 B3 C1];	[B1 B3 C1]	#	٦4ⴅ.ࢽ
-T;	�Ⴑ6\u0318。ß\u1B03;	[P1 V6];	[P1 V6]	#	�Ⴑ6̘.ßᬃ
-N;	�Ⴑ6\u0318。ß\u1B03;	[P1 V6];	[P1 V6]	#	�Ⴑ6̘.ßᬃ
-T;	ⴡⴑ6\u0318。ß\u1B03;	ⴡⴑ6\u0318.ß\u1B03;	xn--6-8cb7433a2ba.xn--ss-2vq	#	ⴡⴑ6̘.ßᬃ
-N;	ⴡⴑ6\u0318。ß\u1B03;	ⴡⴑ6\u0318.ß\u1B03;	xn--6-8cb7433a2ba.xn--zca894k	#	ⴡⴑ6̘.ßᬃ
-B;	�Ⴑ6\u0318。SS\u1B03;	[P1 V6];	[P1 V6]	#	�Ⴑ6̘.ssᬃ
-B;	ⴡⴑ6\u0318。ss\u1B03;	ⴡⴑ6\u0318.ss\u1B03;	xn--6-8cb7433a2ba.xn--ss-2vq	#	ⴡⴑ6̘.ssᬃ
-B;	�ⴑ6\u0318。Ss\u1B03;	[P1 V6];	[P1 V6]	#	�ⴑ6̘.ssᬃ
-B;	xn--6-8cb306hms1a.xn--ss-2vq;	[V6];	[V6]	#	�ⴑ6̘.ssᬃ
-B;	xn--6-8cb7433a2ba.xn--ss-2vq;	ⴡⴑ6\u0318.ss\u1B03;	xn--6-8cb7433a2ba.xn--ss-2vq	#	ⴡⴑ6̘.ssᬃ
-B;	ⴡⴑ6\u0318.ss\u1B03;	;	xn--6-8cb7433a2ba.xn--ss-2vq	#	ⴡⴑ6̘.ssᬃ
-B;	�Ⴑ6\u0318.SS\u1B03;	[P1 V6];	[P1 V6]	#	�Ⴑ6̘.ssᬃ
-B;	�ⴑ6\u0318.Ss\u1B03;	[P1 V6];	[P1 V6]	#	�ⴑ6̘.ssᬃ
-B;	xn--6-8cb555h2b.xn--ss-2vq;	[V6];	[V6]	#	�Ⴑ6̘.ssᬃ
-B;	xn--6-8cb7433a2ba.xn--zca894k;	ⴡⴑ6\u0318.ß\u1B03;	xn--6-8cb7433a2ba.xn--zca894k	#	ⴡⴑ6̘.ßᬃ
-T;	ⴡⴑ6\u0318.ß\u1B03;	;	xn--6-8cb7433a2ba.xn--ss-2vq	#	ⴡⴑ6̘.ßᬃ
-N;	ⴡⴑ6\u0318.ß\u1B03;	;	xn--6-8cb7433a2ba.xn--zca894k	#	ⴡⴑ6̘.ßᬃ
-B;	xn--6-8cb555h2b.xn--zca894k;	[V6];	[V6]	#	�Ⴑ6̘.ßᬃ
-B;	�｡≯𑋪;	[P1 V6];	[P1 V6]
-B;	�｡>\u0338𑋪;	[P1 V6];	[P1 V6]
-B;	�。≯𑋪;	[P1 V6];	[P1 V6]
-B;	�。>\u0338𑋪;	[P1 V6];	[P1 V6]
-B;	xn--eo08b.xn--hdh3385g;	[V6];	[V6]
-T;	\u065A۲。\u200C-\u1BF3\u08E2;	[B1 C1 P1 V5 V6];	[B1 P1 V3 V5 V6]	#	ٚ۲.-᯳
-N;	\u065A۲。\u200C-\u1BF3\u08E2;	[B1 C1 P1 V5 V6];	[B1 C1 P1 V5 V6]	#	ٚ۲.-᯳
-B;	xn--2hb81a.xn----xrd657l;	[B1 V3 V5 V6];	[B1 V3 V5 V6]	#	ٚ۲.-᯳
-B;	xn--2hb81a.xn----xrd657l30d;	[B1 C1 V5 V6];	[B1 C1 V5 V6]	#	ٚ۲.-᯳
-B;	�𖬴󠲽｡\uFFA0;	[P1 V5 V6];	[P1 V5 V6]	#	𖬴.
-B;	�𖬴󠲽。\u1160;	[P1 V5 V6];	[P1 V5 V6]	#	𖬴.
-B;	xn--619ep9154c.xn--psd;	[V5 V6];	[V5 V6]	#	ð–¬´.
-B;	xn--619ep9154c.xn--cl7c;	[V5 V6];	[V5 V6]	#	ð–¬´.
-T;	ß⒈\u0760\uD7AE．􉖲󠅄\u0605򉔯;	[B5 P1 V6];	[B5 P1 V6]	#	ß⒈ݠ.
-N;	ß⒈\u0760\uD7AE．􉖲󠅄\u0605򉔯;	[B5 P1 V6];	[B5 P1 V6]	#	ß⒈ݠ.
-T;	ß1.\u0760\uD7AE.􉖲󠅄\u0605򉔯;	[B2 B3 B5 P1 V6];	[B2 B3 B5 P1 V6]	#	ß1.ݠ.
-N;	ß1.\u0760\uD7AE.􉖲󠅄\u0605򉔯;	[B2 B3 B5 P1 V6];	[B2 B3 B5 P1 V6]	#	ß1.ݠ.
-B;	SS1.\u0760\uD7AE.􉖲󠅄\u0605򉔯;	[B2 B3 B5 P1 V6];	[B2 B3 B5 P1 V6]	#	ss1.ݠ.
-B;	ss1.\u0760\uD7AE.􉖲󠅄\u0605򉔯;	[B2 B3 B5 P1 V6];	[B2 B3 B5 P1 V6]	#	ss1.ݠ.
-B;	Ss1.\u0760\uD7AE.􉖲󠅄\u0605򉔯;	[B2 B3 B5 P1 V6];	[B2 B3 B5 P1 V6]	#	ss1.ݠ.
-B;	ss1.xn--kpb6677h.xn--nfb09923ifkyyb;	[B2 B3 B5 V6];	[B2 B3 B5 V6]	#	ss1.Ý .
-B;	xn--1-pfa.xn--kpb6677h.xn--nfb09923ifkyyb;	[B2 B3 B5 V6];	[B2 B3 B5 V6]	#	ß1.ݠ.
-B;	SS⒈\u0760\uD7AE．􉖲󠅄\u0605򉔯;	[B5 P1 V6];	[B5 P1 V6]	#	ss⒈ݠ.
-B;	ss⒈\u0760\uD7AE．􉖲󠅄\u0605򉔯;	[B5 P1 V6];	[B5 P1 V6]	#	ss⒈ݠ.
-B;	Ss⒈\u0760\uD7AE．􉖲󠅄\u0605򉔯;	[B5 P1 V6];	[B5 P1 V6]	#	ss⒈ݠ.
-B;	xn--ss-6ke9690a0g1q.xn--nfb09923ifkyyb;	[B5 V6];	[B5 V6]	#	ss⒈ݠ.
-B;	xn--zca444a0s1ao12n.xn--nfb09923ifkyyb;	[B5 V6];	[B5 V6]	#	ß⒈ݠ.
-B;	󠭔.�₂;	[P1 V6];	[P1 V6]
-B;	󠭔.�2;	[P1 V6];	[P1 V6]
-B;	xn--vi56e.xn--2-w91i;	[V6];	[V6]
-T;	\u0716\u0947。-ß\u06A5\u200C;	[B1 C1 V3];	[B1 V3]	#	ܖे.-ßڥ
-N;	\u0716\u0947。-ß\u06A5\u200C;	[B1 C1 V3];	[B1 C1 V3]	#	ܖे.-ßڥ
-T;	\u0716\u0947。-SS\u06A5\u200C;	[B1 C1 V3];	[B1 V3]	#	ܖे.-ssڥ
-N;	\u0716\u0947。-SS\u06A5\u200C;	[B1 C1 V3];	[B1 C1 V3]	#	ܖे.-ssڥ
-T;	\u0716\u0947。-ss\u06A5\u200C;	[B1 C1 V3];	[B1 V3]	#	ܖे.-ssڥ
-N;	\u0716\u0947。-ss\u06A5\u200C;	[B1 C1 V3];	[B1 C1 V3]	#	ܖे.-ssڥ
-T;	\u0716\u0947。-Ss\u06A5\u200C;	[B1 C1 V3];	[B1 V3]	#	ܖे.-ssڥ
-N;	\u0716\u0947。-Ss\u06A5\u200C;	[B1 C1 V3];	[B1 C1 V3]	#	ܖे.-ssڥ
-B;	xn--gnb63i.xn---ss-4ef;	[B1 V3];	[B1 V3]	#	ܖे.-ssڥ
-B;	xn--gnb63i.xn---ss-4ef9263a;	[B1 C1 V3];	[B1 C1 V3]	#	ܖे.-ssڥ
-B;	xn--gnb63i.xn----qfa845bhx4a;	[B1 C1 V3];	[B1 C1 V3]	#	ܖे.-ßڥ
-T;	\u1BA9\u200D\u062A񡚈．\u1CD5䷉�;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	ᮩت.᳕䷉�
-N;	\u1BA9\u200D\u062A񡚈．\u1CD5䷉�;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	ᮩت.᳕䷉�
-T;	\u1BA9\u200D\u062A񡚈.\u1CD5䷉�;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	ᮩت.᳕䷉�
-N;	\u1BA9\u200D\u062A񡚈.\u1CD5䷉�;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	ᮩت.᳕䷉�
-T;	\u1BA9\u200D\u062A񡚈.\u1CD5䷉ⴡ;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	ᮩت.᳕䷉ⴡ
-N;	\u1BA9\u200D\u062A񡚈.\u1CD5䷉ⴡ;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	ᮩت.᳕䷉ⴡ
-B;	xn--pgb911izv33i.xn--i6f270etuy;	[B1 V5 V6];	[B1 V5 V6]	#	ᮩت.᳕䷉ⴡ
-B;	xn--pgb911imgdrw34r.xn--i6f270etuy;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	ᮩت.᳕䷉ⴡ
-B;	xn--pgb911izv33i.xn--5nd792dgv3b;	[B1 V5 V6];	[B1 V5 V6]	#	ᮩت.᳕䷉�
-B;	xn--pgb911imgdrw34r.xn--5nd792dgv3b;	[B1 C2 V5 V6];	[B1 C2 V5 V6]	#	ᮩت.᳕䷉�
-T;	\u1BA9\u200D\u062A񡚈．\u1CD5䷉ⴡ;	[B1 C2 P1 V5 V6];	[B1 P1 V5 V6]	#	ᮩت.᳕䷉ⴡ
-N;	\u1BA9\u200D\u062A񡚈．\u1CD5䷉ⴡ;	[B1 C2 P1 V5 V6];	[B1 C2 P1 V5 V6]	#	ᮩت.᳕䷉ⴡ
-T;	\u2DBF.ß\u200D;	[C2 P1 V6];	[P1 V6]	#	.ß
-N;	\u2DBF.ß\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	.ß
-T;	\u2DBF.SS\u200D;	[C2 P1 V6];	[P1 V6]	#	.ss
-N;	\u2DBF.SS\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	.ss
-T;	\u2DBF.ss\u200D;	[C2 P1 V6];	[P1 V6]	#	.ss
-N;	\u2DBF.ss\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	.ss
-T;	\u2DBF.Ss\u200D;	[C2 P1 V6];	[P1 V6]	#	.ss
-N;	\u2DBF.Ss\u200D;	[C2 P1 V6];	[C2 P1 V6]	#	.ss
-B;	xn--7pj.ss;	[V6];	[V6]	#	.ss
-B;	xn--7pj.xn--ss-n1t;	[C2 V6];	[C2 V6]	#	.ss
-B;	xn--7pj.xn--zca870n;	[C2 V6];	[C2 V6]	#	.ß
-B;	\u1BF3︒.\u062A≯ꡂ;	[B2 B3 B6 P1 V5 V6];	[B2 B3 B6 P1 V5 V6]	#	᯳︒.ت≯ꡂ
-B;	\u1BF3︒.\u062A>\u0338ꡂ;	[B2 B3 B6 P1 V5 V6];	[B2 B3 B6 P1 V5 V6]	#	᯳︒.ت≯ꡂ
-B;	\u1BF3。.\u062A≯ꡂ;	[B2 B3 P1 V5 V6 A4_2];	[B2 B3 P1 V5 V6 A4_2]	#	᯳..ت≯ꡂ
-B;	\u1BF3。.\u062A>\u0338ꡂ;	[B2 B3 P1 V5 V6 A4_2];	[B2 B3 P1 V5 V6 A4_2]	#	᯳..ت≯ꡂ
-B;	xn--1zf..xn--pgb885lry5g;	[B2 B3 V5 V6 A4_2];	[B2 B3 V5 V6 A4_2]	#	᯳..ت≯ꡂ
-B;	xn--1zf8957g.xn--pgb885lry5g;	[B2 B3 B6 V5 V6];	[B2 B3 B6 V5 V6]	#	᯳︒.ت≯ꡂ
-B;	≮≠�｡-𫠆\u06B7�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	≮≠.-𫠆ڷ�
-B;	<\u0338=\u0338�｡-𫠆\u06B7�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	≮≠.-𫠆ڷ�
-B;	≮≠�。-𫠆\u06B7�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	≮≠.-𫠆ڷ�
-B;	<\u0338=\u0338�。-𫠆\u06B7�;	[B1 P1 V3 V6];	[B1 P1 V3 V6]	#	≮≠.-𫠆ڷ�
-B;	xn--1ch1a29470f.xn----7uc5363rc1rn;	[B1 V3 V6];	[B1 V3 V6]	#	≮≠.-𫠆ڷ�
-B;	�\u0777。ꡂ;	[B1];	[B1]	#	�ݷ.ꡂ
-B;	xn--7pb5275k.xn--bc9a;	[B1];	[B1]	#	�ݷ.ꡂ
-T;	Ⴉ�񔻅\u0619.ß��\u0775;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴉ�ؙ.ß��ݵ
-N;	Ⴉ�񔻅\u0619.ß��\u0775;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴉ�ؙ.ß��ݵ
-T;	ⴉ�񔻅\u0619.ß��\u0775;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴉ�ؙ.ß��ݵ
-N;	ⴉ�񔻅\u0619.ß��\u0775;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴉ�ؙ.ß��ݵ
-B;	Ⴉ�񔻅\u0619.SS��\u0775;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴉ�ؙ.ss��ݵ
-B;	ⴉ�񔻅\u0619.ss��\u0775;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	ⴉ�ؙ.ss��ݵ
-B;	Ⴉ�񔻅\u0619.Ss��\u0775;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	Ⴉ�ؙ.ss��ݵ
-B;	xn--7fb125cjv87a7xvz.xn--ss-zme7575xp0e;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴉ�ؙ.ss��ݵ
-B;	xn--7fb940rwt3z7xvz.xn--ss-zme7575xp0e;	[B5 B6 V6];	[B5 B6 V6]	#	ⴉ�ؙ.ss��ݵ
-B;	xn--7fb940rwt3z7xvz.xn--zca684a699vf2d;	[B5 B6 V6];	[B5 B6 V6]	#	ⴉ�ؙ.ß��ݵ
-B;	xn--7fb125cjv87a7xvz.xn--zca684a699vf2d;	[B5 B6 V6];	[B5 B6 V6]	#	Ⴉ�ؙ.ß��ݵ
-T;	\u200D\u0643�↙.񊽡;	[B1 C2 P1 V6];	[B3 P1 V6]	#	ك�↙.
-N;	\u200D\u0643�↙.񊽡;	[B1 C2 P1 V6];	[B1 C2 P1 V6]	#	ك�↙.
-B;	xn--fhb011lnp8n.xn--7s4w;	[B3 V6];	[B3 V6]	#	ك�↙.
-B;	xn--fhb713k87ag053c.xn--7s4w;	[B1 C2 V6];	[B1 C2 V6]	#	ك�↙.
-T;	梉。\u200C;	[C1];	xn--7zv.	#	梉.
-N;	梉。\u200C;	[C1];	[C1]	#	梉.
-B;	xn--7zv.;	梉.;	xn--7zv.
-B;	梉.;	;	xn--7zv.
-B;	xn--7zv.xn--0ug;	[C1];	[C1]	#	梉.
-T;	ꡣ-≠.\u200D𞤗�Ↄ;	[B1 B6 C2 P1 V6];	[B2 B3 B6 P1 V6]	#	ꡣ-≠.𞤹�Ↄ
-N;	ꡣ-≠.\u200D𞤗�Ↄ;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ꡣ-≠.𞤹�Ↄ
-T;	ꡣ-=\u0338.\u200D𞤗�Ↄ;	[B1 B6 C2 P1 V6];	[B2 B3 B6 P1 V6]	#	ꡣ-≠.𞤹�Ↄ
-N;	ꡣ-=\u0338.\u200D𞤗�Ↄ;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ꡣ-≠.𞤹�Ↄ
-T;	ꡣ-=\u0338.\u200D𞤹�ↄ;	[B1 B6 C2 P1 V6];	[B2 B3 B6 P1 V6]	#	ꡣ-≠.𞤹�ↄ
-N;	ꡣ-=\u0338.\u200D𞤹�ↄ;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ꡣ-≠.𞤹�ↄ
-T;	ꡣ-≠.\u200D𞤹�ↄ;	[B1 B6 C2 P1 V6];	[B2 B3 B6 P1 V6]	#	ꡣ-≠.𞤹�ↄ
-N;	ꡣ-≠.\u200D𞤹�ↄ;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ꡣ-≠.𞤹�ↄ
-T;	ꡣ-≠.\u200D𞤗�ↄ;	[B1 B6 C2 P1 V6];	[B2 B3 B6 P1 V6]	#	ꡣ-≠.𞤹�ↄ
-N;	ꡣ-≠.\u200D𞤗�ↄ;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ꡣ-≠.𞤹�ↄ
-T;	ꡣ-=\u0338.\u200D𞤗�ↄ;	[B1 B6 C2 P1 V6];	[B2 B3 B6 P1 V6]	#	ꡣ-≠.𞤹�ↄ
-N;	ꡣ-=\u0338.\u200D𞤗�ↄ;	[B1 B6 C2 P1 V6];	[B1 B6 C2 P1 V6]	#	ꡣ-≠.𞤹�ↄ
-B;	xn----ufo9661d.xn--r5gy929fhm4f;	[B2 B3 B6 V6];	[B2 B3 B6 V6]
-B;	xn----ufo9661d.xn--1ug99cj620c71sh;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	ꡣ-≠.𞤹�ↄ
-B;	xn----ufo9661d.xn--q5g0929fhm4f;	[B2 B3 B6 V6];	[B2 B3 B6 V6]
-B;	xn----ufo9661d.xn--1ug79cm620c71sh;	[B1 B6 C2 V6];	[B1 B6 C2 V6]	#	ꡣ-≠.𞤹�Ↄ
-T;	ς��⸵｡�🄊�;	[B6 P1 V6];	[B6 P1 V6]
-N;	ς��⸵｡�🄊�;	[B6 P1 V6];	[B6 P1 V6]
-T;	ς9.�⸵。�9,7;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-N;	ς9.�⸵。�9,7;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	Σ9.�⸵。�9,7;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	σ9.�⸵。�9,7;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	xn--9-zmb.xn--ltj1535k.xn--9,7-r67t;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	xn--9-xmb.xn--ltj1535k.xn--9,7-r67t;	[B1 P1 V5 V6];	[B1 P1 V5 V6]
-B;	Σ��⸵｡�🄊�;	[B6 P1 V6];	[B6 P1 V6]
-B;	σ��⸵｡�🄊�;	[B6 P1 V6];	[B6 P1 V6]
-B;	xn--4xa809nwtghi25b.xn--7-075iy877c;	[B6 V6];	[B6 V6]
-B;	xn--3xa019nwtghi25b.xn--7-075iy877c;	[B6 V6];	[B6 V6]
-T;	\u0853．\u200Cß;	[B1 C1];	xn--iwb.ss	#	ࡓ.ß
-N;	\u0853．\u200Cß;	[B1 C1];	[B1 C1]	#	ࡓ.ß
-T;	\u0853.\u200Cß;	[B1 C1];	xn--iwb.ss	#	ࡓ.ß
-N;	\u0853.\u200Cß;	[B1 C1];	[B1 C1]	#	ࡓ.ß
-T;	\u0853.\u200CSS;	[B1 C1];	xn--iwb.ss	#	à¡“.ss
-N;	\u0853.\u200CSS;	[B1 C1];	[B1 C1]	#	à¡“.ss
-T;	\u0853.\u200Css;	[B1 C1];	xn--iwb.ss	#	à¡“.ss
-N;	\u0853.\u200Css;	[B1 C1];	[B1 C1]	#	à¡“.ss
-T;	\u0853.\u200CSs;	[B1 C1];	xn--iwb.ss	#	à¡“.ss
-N;	\u0853.\u200CSs;	[B1 C1];	[B1 C1]	#	à¡“.ss
-B;	xn--iwb.ss;	\u0853.ss;	xn--iwb.ss	#	à¡“.ss
-B;	\u0853.ss;	;	xn--iwb.ss	#	à¡“.ss
-B;	\u0853.SS;	\u0853.ss;	xn--iwb.ss	#	à¡“.ss
-B;	\u0853.Ss;	\u0853.ss;	xn--iwb.ss	#	à¡“.ss
-B;	xn--iwb.xn--ss-i1t;	[B1 C1];	[B1 C1]	#	à¡“.ss
-B;	xn--iwb.xn--zca570n;	[B1 C1];	[B1 C1]	#	ࡓ.ß
-T;	\u0853．\u200CSS;	[B1 C1];	xn--iwb.ss	#	ࡓ.ss
-N;	\u0853．\u200CSS;	[B1 C1];	[B1 C1]	#	ࡓ.ss
-T;	\u0853．\u200Css;	[B1 C1];	xn--iwb.ss	#	ࡓ.ss
-N;	\u0853．\u200Css;	[B1 C1];	[B1 C1]	#	ࡓ.ss
-T;	\u0853．\u200CSs;	[B1 C1];	xn--iwb.ss	#	ࡓ.ss
-N;	\u0853．\u200CSs;	[B1 C1];	[B1 C1]	#	ࡓ.ss
-T;	񯶣-.\u200D\u074E\uA94D󠻨;	[B1 B6 C2 P1 V3 V6];	[B3 B6 P1 V3 V6]	#	-.ݎ�
-N;	񯶣-.\u200D\u074E\uA94D󠻨;	[B1 B6 C2 P1 V3 V6];	[B1 B6 C2 P1 V3 V6]	#	-.ݎ�
-B;	xn----s116e.xn--1ob6504fmf40i;	[B3 B6 V3 V6];	[B3 B6 V3 V6]	#	-.ݎ�
-B;	xn----s116e.xn--1ob387jy90hq459k;	[B1 B6 C2 V3 V6];	[B1 B6 C2 V3 V6]	#	-.ݎ�
-B;	䃚蟥-。-񽒘⒈;	[P1 V3 V6];	[P1 V3 V6]
-B;	䃚蟥-。-񽒘1.;	[P1 V3 V6];	[P1 V3 V6]
-B;	xn----n50a258u.xn---1-up07j.;	[V3 V6];	[V3 V6]
-B;	xn----n50a258u.xn----ecp33805f;	[V3 V6];	[V3 V6]
-B;	�䚵-ꡡ。⺇;	[B1];	[B1]
-B;	xn----bm3an932a1l5d.xn--xvj;	[B1];	[B1]
-B;	𑄳。\u1ADC�;	[B1 B3 B5 B6 P1 V5 V6];	[B1 B3 B5 B6 P1 V5 V6]	#	𑄳.�
-B;	xn--v80d.xn--2rf1154i;	[B1 B3 B5 B6 V5 V6];	[B1 B3 B5 B6 V5 V6]	#	𑄳.�
-B;	≮�.⒎𑂵\u06BA\u0602;	[B1 P1 V6];	[B1 P1 V6]	#	≮�.⒎𑂵ں
-B;	<\u0338�.⒎𑂵\u06BA\u0602;	[B1 P1 V6];	[B1 P1 V6]	#	≮�.⒎𑂵ں
-B;	≮�.7.𑂵\u06BA\u0602;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≮�.7.𑂵ں
-B;	<\u0338�.7.𑂵\u06BA\u0602;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	≮�.7.𑂵ں
-B;	xn--gdhx904g.7.xn--kfb18an307d;	[B1 V5 V6];	[B1 V5 V6]	#	≮�.7.𑂵ں
-B;	xn--gdhx904g.xn--kfb18a325efm3s;	[B1 V6];	[B1 V6]	#	≮�.⒎𑂵ں
-T;	ᢔ≠􋉂.\u200D�;	[C2 P1 V6];	[P1 V6]	#	ᢔ≠.�
-N;	ᢔ≠􋉂.\u200D�;	[C2 P1 V6];	[C2 P1 V6]	#	ᢔ≠.�
-T;	ᢔ=\u0338􋉂.\u200D�;	[C2 P1 V6];	[P1 V6]	#	ᢔ≠.�
-N;	ᢔ=\u0338􋉂.\u200D�;	[C2 P1 V6];	[C2 P1 V6]	#	ᢔ≠.�
-B;	xn--ebf031cf7196a.xn--587c;	[V6];	[V6]
-B;	xn--ebf031cf7196a.xn--1ug9540g;	[C2 V6];	[C2 V6]	#	ᢔ≠.�
-B;	�≮񣊛≯．\u066C𞵕⳿;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	�≮≯.٬⳿
-B;	�<\u0338񣊛>\u0338．\u066C𞵕⳿;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	�≮≯.٬⳿
-B;	�≮񣊛≯.\u066C𞵕⳿;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	�≮≯.٬⳿
-B;	�<\u0338񣊛>\u0338.\u066C𞵕⳿;	[B1 B2 B3 P1 V6];	[B1 B2 B3 P1 V6]	#	�≮≯.٬⳿
-B;	xn--gdhc0519o0y27b.xn--lib468q0d21a;	[B1 B2 B3 V6];	[B1 B2 B3 V6]	#	�≮≯.٬⳿
-B;	-｡�;	[V3];	[V3]
-B;	-。�;	[V3];	[V3]
-B;	-.xn--6vj;	[V3];	[V3]
-B;	󠰩𑲬．\u065C;	[P1 V5 V6];	[P1 V5 V6]	#	𑲬.ٜ
-B;	󠰩𑲬.\u065C;	[P1 V5 V6];	[P1 V5 V6]	#	𑲬.ٜ
-B;	xn--sn3d59267c.xn--4hb;	[V5 V6];	[V5 V6]	#	𑲬.ٜ
-T;	�.񚇃\u200C;	[C1 P1 V5 V6];	[P1 V5 V6]	#	�.
-N;	�.񚇃\u200C;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	�.
-B;	xn--ie8c.xn--2g51a;	[V5 V6];	[V5 V6]
-B;	xn--ie8c.xn--0ug03366c;	[C1 V5 V6];	[C1 V5 V6]	#	�.
-B;	\u063D\u06E3.�;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ؽۣ.�
-B;	xn--8gb64a.xn--mr9c;	[B1 B3 B6 V5];	[B1 B3 B6 V5]	#	ؽۣ.�
-T;	漦Ⴙς.񡻀�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-N;	漦Ⴙς.񡻀�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-T;	漦ⴙς.񡻀�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-N;	漦ⴙς.񡻀�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	漦ႹΣ.񡻀�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	漦ⴙσ.񡻀�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	漦Ⴙσ.񡻀�;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	xn--4xa947d717e.xn--9d0d3162t;	[B5 B6 V6];	[B5 B6 V6]
-B;	xn--4xa772sl47b.xn--9d0d3162t;	[B5 B6 V6];	[B5 B6 V6]
-B;	xn--3xa972sl47b.xn--9d0d3162t;	[B5 B6 V6];	[B5 B6 V6]
-B;	xn--3xa157d717e.xn--9d0d3162t;	[B5 B6 V6];	[B5 B6 V6]
-B;	�踧\u0CCD򫚇.󜀃⒈�;	[B1 P1 V6];	[B1 P1 V6]	#	�踧�.⒈�
-B;	�踧\u0CCD򫚇.󜀃1.�;	[B1 B3 B6 P1 V5 V6];	[B1 B3 B6 P1 V5 V6]	#	�踧�.1.�
-B;	xn--8tc1437dro0d6q06h.xn--1-p948l.xn--m82h;	[B1 B3 B6 V5 V6];	[B1 B3 B6 V5 V6]	#	�踧�.1.�
-B;	xn--8tc1437dro0d6q06h.xn--tsh2611ncu71e;	[B1 V6];	[B1 V6]	#	�踧�.⒈�
-T;	\u200D≮．󠟪�-;	[C2 P1 V3 V6];	[P1 V3 V6]	#	≮.-
-N;	\u200D≮．󠟪�-;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	≮.-
-T;	\u200D<\u0338．󠟪�-;	[C2 P1 V3 V6];	[P1 V3 V6]	#	≮.-
-N;	\u200D<\u0338．󠟪�-;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	≮.-
-T;	\u200D≮.󠟪�-;	[C2 P1 V3 V6];	[P1 V3 V6]	#	≮.-
-N;	\u200D≮.󠟪�-;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	≮.-
-T;	\u200D<\u0338.󠟪�-;	[C2 P1 V3 V6];	[P1 V3 V6]	#	≮.-
-N;	\u200D<\u0338.󠟪�-;	[C2 P1 V3 V6];	[C2 P1 V3 V6]	#	≮.-
-B;	xn--gdh.xn----cr99a1w710b;	[V3 V6];	[V3 V6]
-B;	xn--1ug95g.xn----cr99a1w710b;	[C2 V3 V6];	[C2 V3 V6]	#	≮.-
-T;	\u200D\u200D襔。Ⴜ5ꡮ�;	[C2 P1 V6];	[P1 V6]	#	襔.Ⴜ5ꡮ
-N;	\u200D\u200D襔。Ⴜ5ꡮ�;	[C2 P1 V6];	[C2 P1 V6]	#	襔.Ⴜ5ꡮ
-T;	\u200D\u200D襔。ⴜ5ꡮ�;	[C2 P1 V6];	[P1 V6]	#	襔.ⴜ5ꡮ
-N;	\u200D\u200D襔。ⴜ5ꡮ�;	[C2 P1 V6];	[C2 P1 V6]	#	襔.ⴜ5ꡮ
-B;	xn--2u2a.xn--5-uws5848bpf44e;	[V6];	[V6]
-B;	xn--1uga7691f.xn--5-uws5848bpf44e;	[C2 V6];	[C2 V6]	#	襔.ⴜ5ꡮ
-B;	xn--2u2a.xn--5-r1g7167ipfw8d;	[V6];	[V6]
-B;	xn--1uga7691f.xn--5-r1g7167ipfw8d;	[C2 V6];	[C2 V6]	#	襔.Ⴜ5ꡮ
-T;	�𑌼\u200D．婀;	[B3 C2];	xn--ix9c26l.xn--q0s	#	�𑌼.婀
-N;	�𑌼\u200D．婀;	[B3 C2];	[B3 C2]	#	�𑌼.婀
-T;	�𑌼\u200D.婀;	[B3 C2];	xn--ix9c26l.xn--q0s	#	�𑌼.婀
-N;	�𑌼\u200D.婀;	[B3 C2];	[B3 C2]	#	�𑌼.婀
-B;	xn--ix9c26l.xn--q0s;	�𑌼.婀;	xn--ix9c26l.xn--q0s
-B;	�𑌼.婀;	;	xn--ix9c26l.xn--q0s
-B;	xn--1ugx063g1if.xn--q0s;	[B3 C2];	[B3 C2]	#	�𑌼.婀
-B;	󠅽︒︒�｡⬳\u1A78;	[B1 P1 V6];	[B1 P1 V6]	#	︒︒�.⬳᩸
-B;	󠅽。。�。⬳\u1A78;	[B1 A4_2];	[B1 A4_2]	#	..�.⬳᩸
-B;	..xn--no0d.xn--7of309e;	[B1 A4_2];	[B1 A4_2]	#	..�.⬳᩸
-B;	xn--y86ca186j.xn--7of309e;	[B1 V6];	[B1 V6]	#	︒︒�.⬳᩸
-T;	�ß．�-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-Ⴏ
-N;	�ß．�-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-Ⴏ
-T;	8ß.�-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-Ⴏ
-N;	8ß.�-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-Ⴏ
-T;	8ß.�-\uDBDA�;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-�
-N;	8ß.�-\uDBDA�;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-�
-B;	8SS.�-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-Ⴏ
-B;	8ss.�-\uDBDA�;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-�
-B;	8Ss.�-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-Ⴏ
-B;	8ss.-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-Ⴏ
-B;	8ss.-\uDBDAâ´�;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-â´�
-B;	8SS.-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-Ⴏ
-B;	8Ss.-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-Ⴏ
-B;	xn--8-qfa.-\uDBDA�;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-�
-B;	XN--8-QFA.-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-Ⴏ
-B;	Xn--8-Qfa.-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-Ⴏ
-B;	xn--8-qfa.-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-Ⴏ
-T;	�ß．�-\uDBDA�;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-�
-N;	�ß．�-\uDBDA�;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ß.-�
-B;	�SS．�-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-Ⴏ
-B;	�ss．�-\uDBDA�;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-�
-B;	�Ss．�-\uDBDAႯ;	[P1 V3 V6];	[P1 V3 V6 A3]	#	8ss.-Ⴏ
-T;	-\u200D󠋟.\u200C�Ⴅ;	[B1 C1 C2 P1 V3 V6];	[B1 P1 V3 V6]	#	-.�Ⴅ
-N;	-\u200D󠋟.\u200C�Ⴅ;	[B1 C1 C2 P1 V3 V6];	[B1 C1 C2 P1 V3 V6]	#	-.�Ⴅ
-T;	-\u200D󠋟.\u200C�ⴅ;	[B1 C1 C2 P1 V3 V6];	[B1 P1 V3 V6]	#	-.�ⴅ
-N;	-\u200D󠋟.\u200C�ⴅ;	[B1 C1 C2 P1 V3 V6];	[B1 C1 C2 P1 V3 V6]	#	-.�ⴅ
-B;	xn----s721m.xn--wkj1423e;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn----ugnv7071n.xn--0ugz32cgr0p;	[B1 C1 C2 V3 V6];	[B1 C1 C2 V3 V6]	#	-.�ⴅ
-B;	xn----s721m.xn--dnd9201k;	[B1 V3 V6];	[B1 V3 V6]
-B;	xn----ugnv7071n.xn--dnd999e4j4p;	[B1 C1 C2 V3 V6];	[B1 C1 C2 V3 V6]	#	-.�Ⴅ
-T;	\uA9B9\u200D�𻶡｡₂;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ꦹ�.2
-N;	\uA9B9\u200D�𻶡｡₂;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ꦹ�.2
-T;	\uA9B9\u200D�ᅳᆲ𻶡｡₂;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ꦹ�.2
-N;	\uA9B9\u200D�ᅳᆲ𻶡｡₂;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ꦹ�.2
-T;	\uA9B9\u200D�𻶡。2;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ꦹ�.2
-N;	\uA9B9\u200D�𻶡。2;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ꦹ�.2
-T;	\uA9B9\u200D�ᅳᆲ𻶡。2;	[C2 P1 V5 V6];	[P1 V5 V6]	#	ꦹ�.2
-N;	\uA9B9\u200D�ᅳᆲ𻶡。2;	[C2 P1 V5 V6];	[C2 P1 V5 V6]	#	ꦹ�.2
-B;	xn--0m9as84e2e21c.2;	[V5 V6];	[V5 V6]	#	ꦹ�.2
-B;	xn--1ug1435cfkyaoi04d.2;	[C2 V5 V6];	[C2 V5 V6]	#	ꦹ�.2
-B;	\uDF4D.🄄𞯘;	[B1 P1 V6];	[B1 P1 V6 A3]	#	.🄄
-B;	\uDF4D.3,𞯘;	[B1 P1 V6];	[B1 P1 V6 A3]	#	.3,
-B;	\uDF4D.xn--3,-tb22a;	[B1 P1 V6];	[B1 P1 V6 A3]	#	.3,
-B;	\uDF4D.XN--3,-TB22A;	[B1 P1 V6];	[B1 P1 V6 A3]	#	.3,
-B;	\uDF4D.Xn--3,-Tb22a;	[B1 P1 V6];	[B1 P1 V6 A3]	#	.3,
-B;	\uDF4D.xn--3x6hx6f;	[B1 P1 V6];	[B1 P1 V6 A3]	#	.🄄
-B;	\uDF4D.XN--3X6HX6F;	[B1 P1 V6];	[B1 P1 V6 A3]	#	.🄄
-B;	\uDF4D.Xn--3X6hx6f;	[B1 P1 V6];	[B1 P1 V6 A3]	#	.🄄
-B;	��。\u06DD󀡶\uA8C5⒈;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�.ꣅ⒈
-B;	��。\u06DD󀡶\uA8C51.;	[B1 P1 V5 V6];	[B1 P1 V5 V6]	#	�.ꣅ1.
-B;	xn--rt9cl956a.xn--1-dxc8545j0693i.;	[B1 V5 V6];	[B1 V5 V6]	#	�.ꣅ1.
-B;	xn--rt9cl956a.xn--tlb403mxv4g06s9i;	[B1 V5 V6];	[B1 V5 V6]	#	�.ꣅ⒈
-T;	򒈣\u05E1\u06B8。Ⴈ\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	סڸ.Ⴈ
-N;	򒈣\u05E1\u06B8。Ⴈ\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	סڸ.Ⴈ
-T;	򒈣\u05E1\u06B8。ⴈ\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 P1 V6]	#	סڸ.ⴈ
-N;	򒈣\u05E1\u06B8。ⴈ\u200D;	[B5 B6 C2 P1 V6];	[B5 B6 C2 P1 V6]	#	סڸ.ⴈ
-B;	xn--meb44b57607c.xn--zkj;	[B5 B6 V6];	[B5 B6 V6]	#	סڸ.ⴈ
-B;	xn--meb44b57607c.xn--1ug232c;	[B5 B6 C2 V6];	[B5 B6 C2 V6]	#	סڸ.ⴈ
-B;	xn--meb44b57607c.xn--gnd;	[B5 B6 V6];	[B5 B6 V6]	#	סڸ.Ⴈ
-B;	xn--meb44b57607c.xn--gnd699e;	[B5 B6 C2 V6];	[B5 B6 C2 V6]	#	סڸ.Ⴈ
-T;	󀚶�\u07E6⒈．�髯\u200C;	[B1 B5 C1 P1 V5 V6];	[B1 B5 P1 V5 V6]	#	�ߦ⒈.�髯
-N;	󀚶�\u07E6⒈．�髯\u200C;	[B1 B5 C1 P1 V5 V6];	[B1 B5 C1 P1 V5 V6]	#	�ߦ⒈.�髯
-T;	󀚶�\u07E61..�髯\u200C;	[B1 B5 C1 P1 V5 V6 A4_2];	[B1 B5 P1 V5 V6 A4_2]	#	�ߦ1..�髯
-N;	󀚶�\u07E61..�髯\u200C;	[B1 B5 C1 P1 V5 V6 A4_2];	[B1 B5 C1 P1 V5 V6 A4_2]	#	�ߦ1..�髯
-B;	xn--1-idd62296a1fr6e..xn--uj6at43v;	[B1 B5 V5 V6 A4_2];	[B1 B5 V5 V6 A4_2]	#	�ߦ1..�髯
-B;	xn--1-idd62296a1fr6e..xn--0ugx259bocxd;	[B1 B5 C1 V5 V6 A4_2];	[B1 B5 C1 V5 V6 A4_2]	#	�ߦ1..�髯
-B;	xn--etb477lq931a1f58e.xn--uj6at43v;	[B1 B5 V5 V6];	[B1 B5 V5 V6]	#	�ߦ⒈.�髯
-B;	xn--etb477lq931a1f58e.xn--0ugx259bocxd;	[B1 B5 C1 V5 V6];	[B1 B5 C1 V5 V6]	#	�ߦ⒈.�髯
-B;	�．\u0689𑌀;	�.\u0689𑌀;	xn--pw9c.xn--fjb8658k	#	�.ډ𑌀
-B;	�.\u0689𑌀;	;	xn--pw9c.xn--fjb8658k	#	�.ډ𑌀
-B;	xn--pw9c.xn--fjb8658k;	�.\u0689𑌀;	xn--pw9c.xn--fjb8658k	#	�.ډ𑌀
-B;	𑋪．�;	[B1 B3 B6 V5];	[B1 B3 B6 V5]
-B;	𑋪.�;	[B1 B3 B6 V5];	[B1 B3 B6 V5]
-B;	𑋪.�;	[B1 B3 B6 V5];	[B1 B3 B6 V5]
-B;	xn--fm1d.xn--5c0d;	[B1 B3 B6 V5];	[B1 B3 B6 V5]
-B;	𑋪．�;	[B1 B3 B6 V5];	[B1 B3 B6 V5]
-B;	≠膣。\u0F83;	[P1 V5 V6];	[P1 V5 V6]	#	≠膣.ྃ
-B;	=\u0338膣。\u0F83;	[P1 V5 V6];	[P1 V5 V6]	#	≠膣.ྃ
-B;	xn--1chy468a.xn--2ed;	[V5 V6];	[V5 V6]	#	≠膣.ྃ
-T;	񰀎-\u077D｡ß;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ß
-N;	񰀎-\u077D｡ß;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ß
-T;	񰀎-\u077D。ß;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ß
-N;	񰀎-\u077D。ß;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ß
-B;	񰀎-\u077D。SS;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ss
-B;	񰀎-\u077D。ss;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ss
-B;	񰀎-\u077D。Ss;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ss
-B;	xn----j6c95618k.ss;	[B5 B6 V6];	[B5 B6 V6]	#	-ݽ.ss
-B;	xn----j6c95618k.xn--zca;	[B5 B6 V6];	[B5 B6 V6]	#	-ݽ.ß
-B;	񰀎-\u077D｡SS;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ss
-B;	񰀎-\u077D｡ss;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ss
-B;	񰀎-\u077D｡Ss;	[B5 B6 P1 V6];	[B5 B6 P1 V6]	#	-ݽ.ss
-T;	ς�ᡚ𑄳．⾭���;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-N;	ς�ᡚ𑄳．⾭���;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-T;	ς�ᡚ𑄳.����;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-N;	ς�ᡚ𑄳.����;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	Σ�ᡚ𑄳.����;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	σ�ᡚ𑄳.����;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h;	[B5 B6 V6];	[B5 B6 V6]
-B;	xn--3xa856hp23pxmc.xn--es5a888tvjc2u15h;	[B5 B6 V6];	[B5 B6 V6]
-B;	Σ�ᡚ𑄳．⾭���;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-B;	σ�ᡚ𑄳．⾭���;	[B5 B6 P1 V6];	[B5 B6 P1 V6]
-T;	�。\u200D;	[C2];	xn--r97c.	#	�.
-N;	�。\u200D;	[C2];	[C2]	#	�.
-B;	xn--r97c.;	�.;	xn--r97c.;	NV8
-B;	�.;	;	xn--r97c.;	NV8
-B;	xn--r97c.xn--1ug;	[C2];	[C2]	#	�.
-B;	𑰳𑈯。⥪;	[V5];	[V5]
-B;	xn--2g1d14o.xn--jti;	[V5];	[V5]
-T;	𑆀�񤧣．Ⴕ�\u200C\u0348;	[C1 P1 V5 V6];	[P1 V5 V6]	#	𑆀�.Ⴕ4͈
-N;	𑆀�񤧣．Ⴕ�\u200C\u0348;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	𑆀�.Ⴕ4͈
-T;	𑆀�񤧣.Ⴕ4\u200C\u0348;	[C1 P1 V5 V6];	[P1 V5 V6]	#	𑆀�.Ⴕ4͈
-N;	𑆀�񤧣.Ⴕ4\u200C\u0348;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	𑆀�.Ⴕ4͈
-T;	𑆀�񤧣.ⴕ4\u200C\u0348;	[C1 P1 V5 V6];	[P1 V5 V6]	#	𑆀�.ⴕ4͈
-N;	𑆀�񤧣.ⴕ4\u200C\u0348;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	𑆀�.ⴕ4͈
-B;	xn--1mnx647cg3x1b.xn--4-zfb5123a;	[V5 V6];	[V5 V6]	#	𑆀�.ⴕ4͈
-B;	xn--1mnx647cg3x1b.xn--4-zfb502tlsl;	[C1 V5 V6];	[C1 V5 V6]	#	𑆀�.ⴕ4͈
-B;	xn--1mnx647cg3x1b.xn--4-zfb324h;	[V5 V6];	[V5 V6]	#	𑆀�.Ⴕ4͈
-B;	xn--1mnx647cg3x1b.xn--4-zfb324h32o;	[C1 V5 V6];	[C1 V5 V6]	#	𑆀�.Ⴕ4͈
-T;	𑆀�񤧣．ⴕ�\u200C\u0348;	[C1 P1 V5 V6];	[P1 V5 V6]	#	𑆀�.ⴕ4͈
-N;	𑆀�񤧣．ⴕ�\u200C\u0348;	[C1 P1 V5 V6];	[C1 P1 V5 V6]	#	𑆀�.ⴕ4͈
-T;	憡\uDF1F\u200CႴ.�\u200D≠;	[C1 C2 P1 V6];	[P1 V6 A3]	#	憡Ⴔ.�≠
-N;	憡\uDF1F\u200CႴ.�\u200D≠;	[C1 C2 P1 V6];	[C1 C2 P1 V6 A3]	#	憡Ⴔ.�≠
-T;	憡\uDF1F\u200CႴ.�\u200D=\u0338;	[C1 C2 P1 V6];	[P1 V6 A3]	#	憡Ⴔ.�≠
-N;	憡\uDF1F\u200CႴ.�\u200D=\u0338;	[C1 C2 P1 V6];	[C1 C2 P1 V6 A3]	#	憡Ⴔ.�≠
-T;	憡\uDF1F\u200Cⴔ.�\u200D=\u0338;	[C1 C2 P1 V6];	[P1 V6 A3]	#	憡ⴔ.�≠
-N;	憡\uDF1F\u200Cⴔ.�\u200D=\u0338;	[C1 C2 P1 V6];	[C1 C2 P1 V6 A3]	#	憡ⴔ.�≠
-T;	憡\uDF1F\u200Cⴔ.�\u200D≠;	[C1 C2 P1 V6];	[P1 V6 A3]	#	憡ⴔ.�≠
-N;	憡\uDF1F\u200Cⴔ.�\u200D≠;	[C1 C2 P1 V6];	[C1 C2 P1 V6 A3]	#	憡ⴔ.�≠
-B;	憡\uDF1Fⴔ.xn--1chz659f;	[P1 V6];	[P1 V6 A3]	#	憡ⴔ.�≠
-B;	憡\uDF1FႴ.XN--1CHZ659F;	[P1 V6];	[P1 V6 A3]	#	憡Ⴔ.�≠
-B;	憡\uDF1FႴ.xn--1Chz659f;	[P1 V6];	[P1 V6 A3]	#	憡Ⴔ.�≠
-B;	憡\uDF1FႴ.xn--1chz659f;	[P1 V6];	[P1 V6 A3]	#	憡Ⴔ.�≠
-T;	憡\uDF1F\u200Cⴔ.xn--1ug73gl146a;	[C1 C2 P1 V6];	[C2 P1 V6 A3]	#	憡ⴔ.�≠
-N;	憡\uDF1F\u200Cⴔ.xn--1ug73gl146a;	[C1 C2 P1 V6];	[C1 C2 P1 V6 A3]	#	憡ⴔ.�≠
-T;	憡\uDF1F\u200CႴ.XN--1UG73GL146A;	[C1 C2 P1 V6];	[C2 P1 V6 A3]	#	憡Ⴔ.�≠
-N;	憡\uDF1F\u200CႴ.XN--1UG73GL146A;	[C1 C2 P1 V6];	[C1 C2 P1 V6 A3]	#	憡Ⴔ.�≠
-T;	憡\uDF1F\u200CႴ.xn--1Ug73gl146a;	[C1 C2 P1 V6];	[C2 P1 V6 A3]	#	憡Ⴔ.�≠
-N;	憡\uDF1F\u200CႴ.xn--1Ug73gl146a;	[C1 C2 P1 V6];	[C1 C2 P1 V6 A3]	#	憡Ⴔ.�≠
-B;	憡\uDF1FႴ.xn--1ug73gl146a;	[C2 P1 V6];	[C2 P1 V6 A3]	#	憡Ⴔ.�≠
-B;	憡\uDF1Fⴔ.xn--1ug73gl146a;	[C2 P1 V6];	[C2 P1 V6 A3]	#	憡ⴔ.�≠
-B;	憡\uDF1FႴ.XN--1UG73GL146A;	[C2 P1 V6];	[C2 P1 V6 A3]	#	憡Ⴔ.�≠
-B;	憡\uDF1FႴ.xn--1Ug73gl146a;	[C2 P1 V6];	[C2 P1 V6 A3]	#	憡Ⴔ.�≠
-T;	憡\uDF1F\u200CႴ.xn--1ug73gl146a;	[C1 C2 P1 V6];	[C2 P1 V6 A3]	#	憡Ⴔ.�≠
-N;	憡\uDF1F\u200CႴ.xn--1ug73gl146a;	[C1 C2 P1 V6];	[C1 C2 P1 V6 A3]	#	憡Ⴔ.�≠
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/IdnaTestV2.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/IdnaTestV2.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/IdnaTestV2.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/IdnaTestV2.txt	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6334 @@
+# IdnaTestV2.txt
+# Date: 2019-11-07, 13:47:27 GMT
+# © 2019 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Unicode IDNA Compatible Preprocessing for UTS #46
+# Version: 13.0.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr46
+#
+# Test cases for verifying UTS #46 conformance.
+#
+# FORMAT:
+#
+# This file is in UTF-8, where characters may be escaped using the \uXXXX or \x{XXXX}
+# convention where they could otherwise have a confusing display.
+# These characters include control codes and combining marks.
+# 
+# Columns (c1, c2,...) are separated by semicolons.
+# Leading and trailing spaces and tabs in each column are ignored.
+# Comments are indicated with hash marks.
+#
+# Column 1: source -          The source string to be tested
+# Column 2: toUnicode -       The result of applying toUnicode to the source,
+#                             with Transitional_Processing=false.
+#                             A blank value means the same as the source value.
+# Column 3: toUnicodeStatus - A set of status codes, each corresponding to a particular test.
+#                             A blank value means [] (no errors).
+# Column 4: toAsciiN -        The result of applying toASCII to the source,
+#                             with Transitional_Processing=false.
+#                             A blank value means the same as the toUnicode value.
+# Column 5: toAsciiNStatus -  A set of status codes, each corresponding to a particular test.
+#                             A blank value means the same as the toUnicodeStatus value.
+#                             An explicit [] means no errors.
+# Column 6: toAsciiT -        The result of applying toASCII to the source,
+#                             with Transitional_Processing=true.
+#                             A blank value means the same as the toAsciiN value.
+# Column 7: toAsciiTStatus -  A set of status codes, each corresponding to a particular test.
+#                             A blank value means the same as the toAsciiNStatus value.
+#                             An explicit [] means no errors.
+#
+# The line comments currently show visible characters that have been escaped. 
+# 
+# CONFORMANCE:
+#
+# To test for conformance to UTS #46, an implementation will perform the toUnicode, toAsciiN, and
+# toAsciiT operations on the source string, then verify the resulting strings and relevant status 
+# values.
+#
+# If the implementation converts illegal code points into U+FFFD (as per
+# http://www.unicode.org/reports/tr46/proposed.html#Processing) then the string comparisons need to
+# account for that by treating U+FFFD in the actual value as a wildcard when comparing to the 
+# expected value in the test file.
+#
+# A status in toUnicode, toAsciiN or toAsciiT is indicated by a value in square brackets,
+# such as "[B5 B6]". In such a case, the contents is a list of status codes based on the step 
+# numbers in UTS #46 and IDNA2008, with the following formats.
+#
+#   Pn for Section 4 Processing step n
+#   Vn for 4.1 Validity Criteria step n
+#   U1 for UseSTD3ASCIIRules
+#   An for 4.2 ToASCII step n
+#   Bn for Bidi (in IDNA2008)
+#   Cn for ContextJ (in IDNA2008)
+#   Xn for toUnicode issues (see below)
+#
+# Thus C1 = Appendix A.1. ZERO WIDTH NON-JOINER, and C2 = Appendix A.2. ZERO WIDTH JOINER. 
+# (The CONTEXTO tests are optional for client software, and not tested here.)
+#
+# Implementations that allow values of particular input flags to be false would ignore
+# the corresponding status codes listed in the table below when testing for errors.
+#
+# VerifyDnsLength:   P4
+# CheckHyphens:      V2, V3
+# CheckBidi:         V8
+# CheckJoiners:      V7
+# UseSTD3ASCIIRules: U1
+#
+# Implementations may be more strict than the default settings for UTS #46.
+# In particular, an implementation conformant to IDNA2008 would disallow the input for lines
+# marked with NV8.
+#
+# Implementations need only record that there is an error: they need not reproduce the
+# precise status codes (after removing the ignored status values).
+#
+# Compatibility errors
+#
+# The special error codes X3 and X4_2 are now returned where a toASCII error code
+# was formerly being generated in toUnicode due to an empty label.
+#
+# A3 was being generated in the following cases (in addition to its normal usage).
+#   • an empty label in toUnicode. In this case, it is replaced by X3.
+#
+# A4_2 was being generated in the following case (in addition to its normal usage).
+#   • an empty label in V8 (CheckBidi). In this case, it is being replaced by X4_2.
+# ============================================================================================
+fass.de; ; ; ; ; ;  # fass.de
+faß.de; ; ; xn--fa-hia.de; ; fass.de;  # faß.de
+Faß.de; faß.de; ; xn--fa-hia.de; ; fass.de;  # faß.de
+xn--fa-hia.de; faß.de; ; xn--fa-hia.de; ; ;  # faß.de
+
+# BIDI TESTS
+
+à�; ; [B5, B6]; xn--0ca24w; ; ;  # à�
+à�; à�; [B5, B6]; xn--0ca24w; ; ;  # à�
+À�; à�; [B5, B6]; xn--0ca24w; ; ;  # à�
+À�; à�; [B5, B6]; xn--0ca24w; ; ;  # à�
+xn--0ca24w; à�; [B5, B6]; xn--0ca24w; ; ;  # à�
+0à.�; ; [B1]; xn--0-sfa.xn--4db; ; ;  # 0à.�
+0à.�; 0à.�; [B1]; xn--0-sfa.xn--4db; ; ;  # 0à.�
+0À.�; 0à.�; [B1]; xn--0-sfa.xn--4db; ; ;  # 0à.�
+0À.�; 0à.�; [B1]; xn--0-sfa.xn--4db; ; ;  # 0à.�
+xn--0-sfa.xn--4db; 0à.�; [B1]; xn--0-sfa.xn--4db; ; ;  # 0à.�
+à.�̈; ; ; xn--0ca.xn--ssa73l; ; ;  # à.�̈
+à.�̈; à.�̈; ; xn--0ca.xn--ssa73l; ; ;  # à.�̈
+À.�̈; à.�̈; ; xn--0ca.xn--ssa73l; ; ;  # à.�̈
+À.�̈; à.�̈; ; xn--0ca.xn--ssa73l; ; ;  # à.�̈
+xn--0ca.xn--ssa73l; à.�̈; ; xn--0ca.xn--ssa73l; ; ;  # à.�̈
+à.�0٠�; ; [B4]; xn--0ca.xn--0-zhcb98c; ; ;  # à.�0٠�
+à.�0٠�; à.�0٠�; [B4]; xn--0ca.xn--0-zhcb98c; ; ;  # à.�0٠�
+À.�0٠�; à.�0٠�; [B4]; xn--0ca.xn--0-zhcb98c; ; ;  # à.�0٠�
+À.�0٠�; à.�0٠�; [B4]; xn--0ca.xn--0-zhcb98c; ; ;  # à.�0٠�
+xn--0ca.xn--0-zhcb98c; à.�0٠�; [B4]; xn--0ca.xn--0-zhcb98c; ; ;  # à.�0٠�
+̈.�; ; [B1, B3, B6, V5]; xn--ssa.xn--4db; ; ;  # ̈.�
+xn--ssa.xn--4db; ̈.�; [B1, B3, B6, V5]; xn--ssa.xn--4db; ; ;  # ̈.�
+à.�0٠; ; [B4]; xn--0ca.xn--0-zhc74b; ; ;  # à.�0٠
+à.�0٠; à.�0٠; [B4]; xn--0ca.xn--0-zhc74b; ; ;  # à.�0٠
+À.�0٠; à.�0٠; [B4]; xn--0ca.xn--0-zhc74b; ; ;  # à.�0٠
+À.�0٠; à.�0٠; [B4]; xn--0ca.xn--0-zhc74b; ; ;  # à.�0٠
+xn--0ca.xn--0-zhc74b; à.�0٠; [B4]; xn--0ca.xn--0-zhc74b; ; ;  # à.�0٠
+àˇ.�; ; [B6]; xn--0ca88g.xn--4db; ; ;  # àˇ.�
+àˇ.�; àˇ.�; [B6]; xn--0ca88g.xn--4db; ; ;  # àˇ.�
+Àˇ.�; àˇ.�; [B6]; xn--0ca88g.xn--4db; ; ;  # àˇ.�
+Àˇ.�; àˇ.�; [B6]; xn--0ca88g.xn--4db; ; ;  # àˇ.�
+xn--0ca88g.xn--4db; àˇ.�; [B6]; xn--0ca88g.xn--4db; ; ;  # àˇ.�
+à̈.�; ; ; xn--0ca81i.xn--4db; ; ;  # à̈.�
+à̈.�; à̈.�; ; xn--0ca81i.xn--4db; ; ;  # à̈.�
+À̈.�; à̈.�; ; xn--0ca81i.xn--4db; ; ;  # à̈.�
+À̈.�; à̈.�; ; xn--0ca81i.xn--4db; ; ;  # à̈.�
+xn--0ca81i.xn--4db; à̈.�; ; xn--0ca81i.xn--4db; ; ;  # à̈.�
+
+# CONTEXT TESTS
+
+a‌b; ; [C1]; xn--ab-j1t; ; ab; [] # ab
+A‌B; a‌b; [C1]; xn--ab-j1t; ; ab; [] # ab
+A‌b; a‌b; [C1]; xn--ab-j1t; ; ab; [] # ab
+ab; ; ; ; ; ;  # ab
+xn--ab-j1t; a‌b; [C1]; xn--ab-j1t; ; ;  # ab
+a�‌b; ; ; xn--ab-fsf604u; ; xn--ab-fsf;  # a�b
+A�‌B; a�‌b; ; xn--ab-fsf604u; ; xn--ab-fsf;  # a�b
+A�‌b; a�‌b; ; xn--ab-fsf604u; ; xn--ab-fsf;  # a�b
+xn--ab-fsf; a�b; ; xn--ab-fsf; ; ;  # a�b
+a�b; ; ; xn--ab-fsf; ; ;  # a�b
+A�B; a�b; ; xn--ab-fsf; ; ;  # a�b
+A�b; a�b; ; xn--ab-fsf; ; ;  # a�b
+xn--ab-fsf604u; a�‌b; ; xn--ab-fsf604u; ; ;  # a�b
+̈‌̈بb; ; [B1, C1, V5]; xn--b-bcba413a2w8b; ; xn--b-bcba413a; [B1, V5] # ̈̈بb
+̈‌̈بB; ̈‌̈بb; [B1, C1, V5]; xn--b-bcba413a2w8b; ; xn--b-bcba413a; [B1, V5] # ̈̈بb
+xn--b-bcba413a; ̈̈بb; [B1, V5]; xn--b-bcba413a; ; ;  # ̈̈بb
+xn--b-bcba413a2w8b; ̈‌̈بb; [B1, C1, V5]; xn--b-bcba413a2w8b; ; ;  # ̈̈بb
+aب̈‌̈; ; [B5, B6, C1]; xn--a-ccba213a5w8b; ; xn--a-ccba213a; [B5, B6] # aب̈̈
+Aب̈‌̈; aب̈‌̈; [B5, B6, C1]; xn--a-ccba213a5w8b; ; xn--a-ccba213a; [B5, B6] # aب̈̈
+xn--a-ccba213a; aب̈̈; [B5, B6]; xn--a-ccba213a; ; ;  # aب̈̈
+xn--a-ccba213a5w8b; aب̈‌̈; [B5, B6, C1]; xn--a-ccba213a5w8b; ; ;  # aب̈̈
+aب̈‌̈بb; ; [B5]; xn--ab-uuba211bca8057b; ; xn--ab-uuba211bca;  # aب̈̈بb
+Aب̈‌̈بB; aب̈‌̈بb; [B5]; xn--ab-uuba211bca8057b; ; xn--ab-uuba211bca;  # aب̈̈بb
+Aب̈‌̈بb; aب̈‌̈بb; [B5]; xn--ab-uuba211bca8057b; ; xn--ab-uuba211bca;  # aب̈̈بb
+xn--ab-uuba211bca; aب̈̈بb; [B5]; xn--ab-uuba211bca; ; ;  # aب̈̈بb
+xn--ab-uuba211bca8057b; aب̈‌̈بb; [B5]; xn--ab-uuba211bca8057b; ; ;  # aب̈̈بb
+a�b; ; [C2]; xn--ab-m1t; ; ab; [] # ab
+A�B; a�b; [C2]; xn--ab-m1t; ; ab; [] # ab
+A�b; a�b; [C2]; xn--ab-m1t; ; ab; [] # ab
+xn--ab-m1t; a�b; [C2]; xn--ab-m1t; ; ;  # ab
+a��b; ; ; xn--ab-fsf014u; ; xn--ab-fsf;  # a�b
+A��B; a��b; ; xn--ab-fsf014u; ; xn--ab-fsf;  # a�b
+A��b; a��b; ; xn--ab-fsf014u; ; xn--ab-fsf;  # a�b
+xn--ab-fsf014u; a��b; ; xn--ab-fsf014u; ; ;  # a�b
+̈�̈بb; ; [B1, C2, V5]; xn--b-bcba413a7w8b; ; xn--b-bcba413a; [B1, V5] # ̈̈بb
+̈�̈بB; ̈�̈بb; [B1, C2, V5]; xn--b-bcba413a7w8b; ; xn--b-bcba413a; [B1, V5] # ̈̈بb
+xn--b-bcba413a7w8b; ̈�̈بb; [B1, C2, V5]; xn--b-bcba413a7w8b; ; ;  # ̈̈بb
+aب̈�̈; ; [B5, B6, C2]; xn--a-ccba213abx8b; ; xn--a-ccba213a; [B5, B6] # aب̈̈
+Aب̈�̈; aب̈�̈; [B5, B6, C2]; xn--a-ccba213abx8b; ; xn--a-ccba213a; [B5, B6] # aب̈̈
+xn--a-ccba213abx8b; aب̈�̈; [B5, B6, C2]; xn--a-ccba213abx8b; ; ;  # aب̈̈
+aب̈�̈بb; ; [B5, C2]; xn--ab-uuba211bca5157b; ; xn--ab-uuba211bca; [B5] # aب̈̈بb
+Aب̈�̈بB; aب̈�̈بb; [B5, C2]; xn--ab-uuba211bca5157b; ; xn--ab-uuba211bca; [B5] # aب̈̈بb
+Aب̈�̈بb; aب̈�̈بb; [B5, C2]; xn--ab-uuba211bca5157b; ; xn--ab-uuba211bca; [B5] # aب̈̈بb
+xn--ab-uuba211bca5157b; aب̈�̈بb; [B5, C2]; xn--ab-uuba211bca5157b; ; ;  # aب̈̈بb
+
+# SELECTED TESTS
+
+¡; ; ; xn--7a; ; ;  # ¡
+xn--7a; ¡; ; xn--7a; ; ;  # ¡
+᧚; ; ; xn--pkf; ; ;  # ᧚
+xn--pkf; ᧚; ; xn--pkf; ; ;  # ᧚
+。; .; [X4_2]; ; [A4_2]; ;  # .
+.; ; [X4_2]; ; [A4_2]; ;  # .
+ê­ ; ; ; xn--3y9a; ; ;  # ê­ 
+xn--3y9a; ê­ ; ; xn--3y9a; ; ;  # ê­ 
+1234567890ä1234567890123456789012345678901234567890123456; ; ; xn--12345678901234567890123456789012345678901234567890123456-fxe; [A4_2]; ;  # 1234567890ä1234567890123456789012345678901234567890123456
+1234567890ä1234567890123456789012345678901234567890123456; 1234567890ä1234567890123456789012345678901234567890123456; ; xn--12345678901234567890123456789012345678901234567890123456-fxe; [A4_2]; ;  # 1234567890ä1234567890123456789012345678901234567890123456
+1234567890Ä1234567890123456789012345678901234567890123456; 1234567890ä1234567890123456789012345678901234567890123456; ; xn--12345678901234567890123456789012345678901234567890123456-fxe; [A4_2]; ;  # 1234567890ä1234567890123456789012345678901234567890123456
+1234567890Ä1234567890123456789012345678901234567890123456; 1234567890ä1234567890123456789012345678901234567890123456; ; xn--12345678901234567890123456789012345678901234567890123456-fxe; [A4_2]; ;  # 1234567890ä1234567890123456789012345678901234567890123456
+xn--12345678901234567890123456789012345678901234567890123456-fxe; 1234567890ä1234567890123456789012345678901234567890123456; ; xn--12345678901234567890123456789012345678901234567890123456-fxe; [A4_2]; ;  # 1234567890ä1234567890123456789012345678901234567890123456
+www.eXample.cOm; www.example.com; ; ; ; ;  # www.example.com
+Bücher.de; bücher.de; ; xn--bcher-kva.de; ; ;  # bücher.de
+Bücher.de; bücher.de; ; xn--bcher-kva.de; ; ;  # bücher.de
+bücher.de; bücher.de; ; xn--bcher-kva.de; ; ;  # bücher.de
+bücher.de; ; ; xn--bcher-kva.de; ; ;  # bücher.de
+BÜCHER.DE; bücher.de; ; xn--bcher-kva.de; ; ;  # bücher.de
+BÜCHER.DE; bücher.de; ; xn--bcher-kva.de; ; ;  # bücher.de
+xn--bcher-kva.de; bücher.de; ; xn--bcher-kva.de; ; ;  # bücher.de
+ÖBB; öbb; ; xn--bb-eka; ; ;  # öbb
+ÖBB; öbb; ; xn--bb-eka; ; ;  # öbb
+öbb; öbb; ; xn--bb-eka; ; ;  # öbb
+öbb; ; ; xn--bb-eka; ; ;  # öbb
+Öbb; öbb; ; xn--bb-eka; ; ;  # öbb
+Öbb; öbb; ; xn--bb-eka; ; ;  # öbb
+xn--bb-eka; öbb; ; xn--bb-eka; ; ;  # öbb
+βόλος.com; ; ; xn--nxasmm1c.com; ; xn--nxasmq6b.com;  # βόλος.com
+βο�λος.com; βόλος.com; ; xn--nxasmm1c.com; ; xn--nxasmq6b.com;  # βόλος.com
+ΒΟ�ΛΟΣ.COM; βόλοσ.com; ; xn--nxasmq6b.com; ; ;  # βόλοσ.com
+ΒΌΛΟΣ.COM; βόλοσ.com; ; xn--nxasmq6b.com; ; ;  # βόλοσ.com
+βόλοσ.com; ; ; xn--nxasmq6b.com; ; ;  # βόλοσ.com
+βο�λοσ.com; βόλοσ.com; ; xn--nxasmq6b.com; ; ;  # βόλοσ.com
+Βο�λοσ.com; βόλοσ.com; ; xn--nxasmq6b.com; ; ;  # βόλοσ.com
+Βόλοσ.com; βόλοσ.com; ; xn--nxasmq6b.com; ; ;  # βόλοσ.com
+xn--nxasmq6b.com; βόλοσ.com; ; xn--nxasmq6b.com; ; ;  # βόλοσ.com
+Βο�λος.com; βόλος.com; ; xn--nxasmm1c.com; ; xn--nxasmq6b.com;  # βόλος.com
+Βόλος.com; βόλος.com; ; xn--nxasmm1c.com; ; xn--nxasmq6b.com;  # βόλος.com
+xn--nxasmm1c.com; βόλος.com; ; xn--nxasmm1c.com; ; ;  # βόλος.com
+xn--nxasmm1c; βόλος; ; xn--nxasmm1c; ; ;  # βόλος
+βόλος; ; ; xn--nxasmm1c; ; xn--nxasmq6b;  # βόλος
+βο�λος; βόλος; ; xn--nxasmm1c; ; xn--nxasmq6b;  # βόλος
+ΒΟ�ΛΟΣ; βόλοσ; ; xn--nxasmq6b; ; ;  # βόλοσ
+ΒΌΛΟΣ; βόλοσ; ; xn--nxasmq6b; ; ;  # βόλοσ
+βόλοσ; ; ; xn--nxasmq6b; ; ;  # βόλοσ
+βο�λοσ; βόλοσ; ; xn--nxasmq6b; ; ;  # βόλοσ
+Βο�λοσ; βόλοσ; ; xn--nxasmq6b; ; ;  # βόλοσ
+Βόλοσ; βόλοσ; ; xn--nxasmq6b; ; ;  # βόλοσ
+xn--nxasmq6b; βόλοσ; ; xn--nxasmq6b; ; ;  # βόλοσ
+Βόλος; βόλος; ; xn--nxasmm1c; ; xn--nxasmq6b;  # βόλος
+Βο�λος; βόλος; ; xn--nxasmm1c; ; xn--nxasmq6b;  # βόλος
+www.�්�රී.com; ; ; www.xn--10cl1a0b660p.com; ; www.xn--10cl1a0b.com;  # www.�්රී.com
+WWW.�්�රී.COM; www.�්�රී.com; ; www.xn--10cl1a0b660p.com; ; www.xn--10cl1a0b.com;  # www.�්රී.com
+Www.�්�රී.com; www.�්�රී.com; ; www.xn--10cl1a0b660p.com; ; www.xn--10cl1a0b.com;  # www.�්රී.com
+www.xn--10cl1a0b.com; www.�්රී.com; ; www.xn--10cl1a0b.com; ; ;  # www.�්රී.com
+www.�්රී.com; ; ; www.xn--10cl1a0b.com; ; ;  # www.�්රී.com
+WWW.�්රී.COM; www.�්රී.com; ; www.xn--10cl1a0b.com; ; ;  # www.�්රී.com
+Www.�්රී.com; www.�්රී.com; ; www.xn--10cl1a0b.com; ; ;  # www.�්රී.com
+www.xn--10cl1a0b660p.com; www.�්�රී.com; ; www.xn--10cl1a0b660p.com; ; ;  # www.�්රී.com
+نامه‌ای; ; ; xn--mgba3gch31f060k; ; xn--mgba3gch31f;  # نامهای
+xn--mgba3gch31f; نامهای; ; xn--mgba3gch31f; ; ;  # نامهای
+نامهای; ; ; xn--mgba3gch31f; ; ;  # نامهای
+xn--mgba3gch31f060k; نامه‌ای; ; xn--mgba3gch31f060k; ; ;  # نامهای
+xn--mgba3gch31f060k.com; نامه‌ای.com; ; xn--mgba3gch31f060k.com; ; ;  # نامهای.com
+نامه‌ای.com; ; ; xn--mgba3gch31f060k.com; ; xn--mgba3gch31f.com;  # نامهای.com
+نامه‌ای.COM; نامه‌ای.com; ; xn--mgba3gch31f060k.com; ; xn--mgba3gch31f.com;  # نامهای.com
+xn--mgba3gch31f.com; نامهای.com; ; xn--mgba3gch31f.com; ; ;  # نامهای.com
+نامهای.com; ; ; xn--mgba3gch31f.com; ; ;  # نامهای.com
+نامهای.COM; نامهای.com; ; xn--mgba3gch31f.com; ; ;  # نامهای.com
+a.b．c。d｡; a.b.c.d.; ; ; ; ;  # a.b.c.d.
+a.b.c。d。; a.b.c.d.; ; ; ; ;  # a.b.c.d.
+A.B.C。D。; a.b.c.d.; ; ; ; ;  # a.b.c.d.
+A.b.c。D。; a.b.c.d.; ; ; ; ;  # a.b.c.d.
+a.b.c.d.; ; ; ; ; ;  # a.b.c.d.
+A.B．C。D｡; a.b.c.d.; ; ; ; ;  # a.b.c.d.
+A.b．c。D｡; a.b.c.d.; ; ; ; ;  # a.b.c.d.
+Ü.xn--tda; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.xn--tda; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+ü.xn--tda; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+ü.xn--tda; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.XN--TDA; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.XN--TDA; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.xn--Tda; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.xn--Tda; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+xn--tda.xn--tda; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+ü.ü; ; ; xn--tda.xn--tda; ; ;  # ü.ü
+ü.ü; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.Ü; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.Ü; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.ü; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+Ü.ü; ü.ü; ; xn--tda.xn--tda; ; ;  # ü.ü
+xn--u-ccb; ü; [V1]; xn--u-ccb; ; ;  # ü
+aâ’ˆcom; ; [P1, V6]; xn--acom-0w1b; ; ;  # aâ’ˆcom
+a1.com; ; ; ; ; ;  # a1.com
+Aâ’ˆCOM; aâ’ˆcom; [P1, V6]; xn--acom-0w1b; ; ;  # aâ’ˆcom
+Aâ’ˆCom; aâ’ˆcom; [P1, V6]; xn--acom-0w1b; ; ;  # aâ’ˆcom
+xn--acom-0w1b; aâ’ˆcom; [V6]; xn--acom-0w1b; ; ;  # aâ’ˆcom
+xn--a-ecp.ru; aâ’ˆ.ru; [V6]; xn--a-ecp.ru; ; ;  # aâ’ˆ.ru
+xn--0.pt; ; [P4]; ; ; ;  # xn--0.pt
+xn--a.pt; €.pt; [V6]; xn--a.pt; ; ;  # .pt
+xn--a-Ä.pt; xn--a-ä.pt; [P4]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+xn--a-Ä.pt; xn--a-ä.pt; [P4]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+xn--a-ä.pt; xn--a-ä.pt; [P4]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+xn--a-ä.pt; ; [P4]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+XN--A-Ä.PT; xn--a-ä.pt; [P4]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+XN--A-Ä.PT; xn--a-ä.pt; [P4]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+Xn--A-Ä.pt; xn--a-ä.pt; [P4]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+Xn--A-Ä.pt; xn--a-ä.pt; [P4]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+xn--xn--a--gua.pt; xn--a-ä.pt; [V2]; xn--xn--a--gua.pt; ; ;  # xn--a-ä.pt
+日本語。ＪＰ; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+日本語。JP; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+日本語。jp; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+日本語。Jp; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+xn--wgv71a119e.jp; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+日本語.jp; ; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+日本語.JP; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+日本語.Jp; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+日本語。ｊ�; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+日本語。Ｊ�; 日本語.jp; ; xn--wgv71a119e.jp; ; ;  # 日本語.jp
+☕; ; ; xn--53h; ; ;  # ☕
+xn--53h; ☕; ; xn--53h; ; ;  # ☕
+1.aß‌�b‌�cßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz; ; [C1, C2]; 1.xn--abcdexyz-qyacaaabaaaaaaabaaaaaaaaabaaaaaaaaabaaaaaaaa010ze2isb1140zba8cc; [C1, C2, A4_2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2] # 1.aßbcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz
+1.ASS‌�B‌�CSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSŜSSZ; 1.ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; [C1, C2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc; [C1, C2, A4_2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2] # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.ASS‌�B‌�CSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSŜSSZ; 1.ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; [C1, C2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc; [C1, C2, A4_2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2] # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; ; [C1, C2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc; [C1, C2, A4_2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2] # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssŝssz; 1.ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; [C1, C2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc; [C1, C2, A4_2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2] # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.Ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssŝssz; 1.ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; [C1, C2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc; [C1, C2, A4_2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2] # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.Ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; 1.ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; [C1, C2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc; [C1, C2, A4_2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2] # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; ; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2]; ;  # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; ; ; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2]; ;  # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssŝssz; 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; ; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2]; ;  # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.ASSBCSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSŜSSZ; 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; ; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2]; ;  # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.ASSBCSSSSSSSSDΣΣSSSSSSSSSSSSSSSSESSSSSSSSSSSSSSSSSSSSXSSSSSSSSSSSSSSSSSSSSYSSSSSSSSSSSSSSSŜSSZ; 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; ; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2]; ;  # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.Assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; ; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2]; ;  # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.Assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssŝssz; 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; ; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2]; ;  # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc; 1.ass‌�b‌�cssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz; [C1, C2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa69989dba9gc; [C1, C2, A4_2]; ;  # 1.assbcssssssssdσσssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssss�ssz
+1.Aß‌�b‌�cßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz; 1.aß‌�b‌�cßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz; [C1, C2]; 1.xn--abcdexyz-qyacaaabaaaaaaabaaaaaaaaabaaaaaaaaabaaaaaaaa010ze2isb1140zba8cc; [C1, C2, A4_2]; 1.xn--assbcssssssssdssssssssssssssssessssssssssssssssssssxssssssssssssssssssssysssssssssssssssssz-pxq1419aa; [A4_2] # 1.aßbcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz
+1.xn--abcdexyz-qyacaaabaaaaaaabaaaaaaaaabaaaaaaaaabaaaaaaaa010ze2isb1140zba8cc; 1.aß‌�b‌�cßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz; [C1, C2]; 1.xn--abcdexyz-qyacaaabaaaaaaabaaaaaaaaabaaaaaaaaabaaaaaaaa010ze2isb1140zba8cc; [C1, C2, A4_2]; ;  # 1.aßbcßßßßdςσßßßßßßßßeßßßßßßßßßßxßßßßßßßßßßyßßßßßßßß̂ßz
+‌x�n‌-�-bß; ; [C1, C2]; xn--xn--b-pqa5796ccahd; ; xn--bss; [] # xn--bß
+‌X�N‌-�-BSS; ‌x�n‌-�-bss; [C1, C2]; xn--xn--bss-7z6ccid; ; xn--bss; [] # xn--bss
+‌x�n‌-�-bss; ; [C1, C2]; xn--xn--bss-7z6ccid; ; xn--bss; [] # xn--bss
+‌X�n‌-�-Bss; ‌x�n‌-�-bss; [C1, C2]; xn--xn--bss-7z6ccid; ; xn--bss; [] # xn--bss
+xn--bss; 夙; ; xn--bss; ; ;  # 夙
+夙; ; ; xn--bss; ; ;  # 夙
+xn--xn--bss-7z6ccid; ‌x�n‌-�-bss; [C1, C2]; xn--xn--bss-7z6ccid; ; ;  # xn--bss
+‌X�n‌-�-Bß; ‌x�n‌-�-bß; [C1, C2]; xn--xn--b-pqa5796ccahd; ; xn--bss; [] # xn--bß
+xn--xn--b-pqa5796ccahd; ‌x�n‌-�-bß; [C1, C2]; xn--xn--b-pqa5796ccahd; ; ;  # xn--bß
+ˣ�ℕ​﹣­�᠌ℬ︀ſ��󠇯ffl; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+x�N​-­-᠌B︀s�s󠇯ffl; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+x�n​-­-᠌b︀s�s󠇯ffl; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+X�N​-­-᠌B︀S�S󠇯FFL; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+X�n​-­-᠌B︀s�s󠇯ffl; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+xn--bssffl; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+夡夞夜夙; ; ; xn--bssffl; ; ;  # 夡夞夜夙
+ˣ�ℕ​﹣­�᠌ℬ︀S��󠇯FFL; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+x�N​-­-᠌B︀S�s󠇯FFL; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+ˣ�ℕ​﹣­�᠌ℬ︀s��󠇯ffl; 夡夞夜夙; ; xn--bssffl; ; ;  # 夡夞夜夙
+123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ; ; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; ; ; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
+123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; ; ; ; [A4_1]; ;  # 123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012
+123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; ; ; ; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890
+123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; ; ; ; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.
+123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ; ; [A4_1, A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901234.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+ä1234567890123456789012345678901234567890123456789012345; ; ; xn--1234567890123456789012345678901234567890123456789012345-9te; ; ;  # ä1234567890123456789012345678901234567890123456789012345
+ä1234567890123456789012345678901234567890123456789012345; ä1234567890123456789012345678901234567890123456789012345; ; xn--1234567890123456789012345678901234567890123456789012345-9te; ; ;  # ä1234567890123456789012345678901234567890123456789012345
+Ä1234567890123456789012345678901234567890123456789012345; ä1234567890123456789012345678901234567890123456789012345; ; xn--1234567890123456789012345678901234567890123456789012345-9te; ; ;  # ä1234567890123456789012345678901234567890123456789012345
+Ä1234567890123456789012345678901234567890123456789012345; ä1234567890123456789012345678901234567890123456789012345; ; xn--1234567890123456789012345678901234567890123456789012345-9te; ; ;  # ä1234567890123456789012345678901234567890123456789012345
+xn--1234567890123456789012345678901234567890123456789012345-9te; ä1234567890123456789012345678901234567890123456789012345; ; xn--1234567890123456789012345678901234567890123456789012345-9te; ; ;  # ä1234567890123456789012345678901234567890123456789012345
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
+123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.; ; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901.
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; ; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; [A4_1]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; [A4_1]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; [A4_1]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; [A4_1]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012
+123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; ; 123456789012345678901234567890123456789012345678901234567890123.xn--1234567890123456789012345678901234567890123456789012345-kue.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012; [A4_1]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä123456789012345678901234567890123456789012345.123456789012345678901234567890123456789012345678901234567890123.12345678901234567890123456789012345678901234567890123456789012
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; ; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890
+123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; ; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.
+123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.; [A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890.
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; [A4_1, A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; [A4_1, A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; [A4_1, A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.1234567890Ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; [A4_1, A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; ; 123456789012345678901234567890123456789012345678901234567890123.xn--12345678901234567890123456789012345678901234567890123456-fxe.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901; [A4_1, A4_2]; ;  # 123456789012345678901234567890123456789012345678901234567890123.1234567890ä1234567890123456789012345678901234567890123456.123456789012345678901234567890123456789012345678901234567890123.1234567890123456789012345678901234567890123456789012345678901
+a.b..-q--a-.e; ; [V2, V3, X4_2]; ; [V2, V3, A4_2]; ;  # a.b..-q--a-.e
+a.b..-q--ä-.e; ; [V2, V3, X4_2]; a.b..xn---q----jra.e; [V2, V3, A4_2]; ;  # a.b..-q--ä-.e
+a.b..-q--ä-.e; a.b..-q--ä-.e; [V2, V3, X4_2]; a.b..xn---q----jra.e; [V2, V3, A4_2]; ;  # a.b..-q--ä-.e
+A.B..-Q--Ä-.E; a.b..-q--ä-.e; [V2, V3, X4_2]; a.b..xn---q----jra.e; [V2, V3, A4_2]; ;  # a.b..-q--ä-.e
+A.B..-Q--Ä-.E; a.b..-q--ä-.e; [V2, V3, X4_2]; a.b..xn---q----jra.e; [V2, V3, A4_2]; ;  # a.b..-q--ä-.e
+A.b..-Q--Ä-.E; a.b..-q--ä-.e; [V2, V3, X4_2]; a.b..xn---q----jra.e; [V2, V3, A4_2]; ;  # a.b..-q--ä-.e
+A.b..-Q--Ä-.E; a.b..-q--ä-.e; [V2, V3, X4_2]; a.b..xn---q----jra.e; [V2, V3, A4_2]; ;  # a.b..-q--ä-.e
+a.b..xn---q----jra.e; a.b..-q--ä-.e; [V2, V3, X4_2]; a.b..xn---q----jra.e; [V2, V3, A4_2]; ;  # a.b..-q--ä-.e
+a..c; ; [X4_2]; ; [A4_2]; ;  # a..c
+a.-b.; ; [V3]; ; ; ;  # a.-b.
+a.b-.c; ; [V3]; ; ; ;  # a.b-.c
+a.-.c; ; [V3]; ; ; ;  # a.-.c
+a.bc--de.f; ; [V2]; ; ; ;  # a.bc--de.f
+ä.­.c; ä..c; [X4_2]; xn--4ca..c; [A4_2]; ;  # ä..c
+ä.­.c; ä..c; [X4_2]; xn--4ca..c; [A4_2]; ;  # ä..c
+Ä.­.C; ä..c; [X4_2]; xn--4ca..c; [A4_2]; ;  # ä..c
+Ä.­.C; ä..c; [X4_2]; xn--4ca..c; [A4_2]; ;  # ä..c
+xn--4ca..c; ä..c; [X4_2]; xn--4ca..c; [A4_2]; ;  # ä..c
+ä.-b.; ; [V3]; xn--4ca.-b.; ; ;  # ä.-b.
+ä.-b.; ä.-b.; [V3]; xn--4ca.-b.; ; ;  # ä.-b.
+Ä.-B.; ä.-b.; [V3]; xn--4ca.-b.; ; ;  # ä.-b.
+Ä.-B.; ä.-b.; [V3]; xn--4ca.-b.; ; ;  # ä.-b.
+xn--4ca.-b.; ä.-b.; [V3]; xn--4ca.-b.; ; ;  # ä.-b.
+ä.b-.c; ; [V3]; xn--4ca.b-.c; ; ;  # ä.b-.c
+ä.b-.c; ä.b-.c; [V3]; xn--4ca.b-.c; ; ;  # ä.b-.c
+Ä.B-.C; ä.b-.c; [V3]; xn--4ca.b-.c; ; ;  # ä.b-.c
+Ä.B-.C; ä.b-.c; [V3]; xn--4ca.b-.c; ; ;  # ä.b-.c
+Ä.b-.C; ä.b-.c; [V3]; xn--4ca.b-.c; ; ;  # ä.b-.c
+Ä.b-.C; ä.b-.c; [V3]; xn--4ca.b-.c; ; ;  # ä.b-.c
+xn--4ca.b-.c; ä.b-.c; [V3]; xn--4ca.b-.c; ; ;  # ä.b-.c
+ä.-.c; ; [V3]; xn--4ca.-.c; ; ;  # ä.-.c
+ä.-.c; ä.-.c; [V3]; xn--4ca.-.c; ; ;  # ä.-.c
+Ä.-.C; ä.-.c; [V3]; xn--4ca.-.c; ; ;  # ä.-.c
+Ä.-.C; ä.-.c; [V3]; xn--4ca.-.c; ; ;  # ä.-.c
+xn--4ca.-.c; ä.-.c; [V3]; xn--4ca.-.c; ; ;  # ä.-.c
+ä.bc--de.f; ; [V2]; xn--4ca.bc--de.f; ; ;  # ä.bc--de.f
+ä.bc--de.f; ä.bc--de.f; [V2]; xn--4ca.bc--de.f; ; ;  # ä.bc--de.f
+Ä.BC--DE.F; ä.bc--de.f; [V2]; xn--4ca.bc--de.f; ; ;  # ä.bc--de.f
+Ä.BC--DE.F; ä.bc--de.f; [V2]; xn--4ca.bc--de.f; ; ;  # ä.bc--de.f
+Ä.bc--De.f; ä.bc--de.f; [V2]; xn--4ca.bc--de.f; ; ;  # ä.bc--de.f
+Ä.bc--De.f; ä.bc--de.f; [V2]; xn--4ca.bc--de.f; ; ;  # ä.bc--de.f
+xn--4ca.bc--de.f; ä.bc--de.f; [V2]; xn--4ca.bc--de.f; ; ;  # ä.bc--de.f
+a.b.̈c.d; ; [V5]; a.b.xn--c-bcb.d; ; ;  # a.b.̈c.d
+A.B.̈C.D; a.b.̈c.d; [V5]; a.b.xn--c-bcb.d; ; ;  # a.b.̈c.d
+A.b.̈c.d; a.b.̈c.d; [V5]; a.b.xn--c-bcb.d; ; ;  # a.b.̈c.d
+a.b.xn--c-bcb.d; a.b.̈c.d; [V5]; a.b.xn--c-bcb.d; ; ;  # a.b.̈c.d
+A0; a0; ; ; ; ;  # a0
+0A; 0a; ; ; ; ;  # 0a
+0A.�; 0a.�; [B1]; 0a.xn--4db; ; ;  # 0a.�
+0a.�; ; [B1]; 0a.xn--4db; ; ;  # 0a.�
+0a.xn--4db; 0a.�; [B1]; 0a.xn--4db; ; ;  # 0a.�
+c.xn--0-eha.xn--4db; c.0ü.�; [B1]; c.xn--0-eha.xn--4db; ; ;  # c.0ü.�
+b-.�; ; [B6, V3]; b-.xn--4db; ; ;  # b-.�
+B-.�; b-.�; [B6, V3]; b-.xn--4db; ; ;  # b-.�
+b-.xn--4db; b-.�; [B6, V3]; b-.xn--4db; ; ;  # b-.�
+d.xn----dha.xn--4db; d.ü-.�; [B6, V3]; d.xn----dha.xn--4db; ; ;  # d.ü-.�
+a�; ; [B5, B6]; xn--a-0hc; ; ;  # a�
+A�; a�; [B5, B6]; xn--a-0hc; ; ;  # a�
+xn--a-0hc; a�; [B5, B6]; xn--a-0hc; ; ;  # a�
+�ׇ; ; ; xn--vdbr; ; ;  # �ׇ
+xn--vdbr; �ׇ; ; xn--vdbr; ; ;  # �ׇ
+�9ׇ; ; ; xn--9-ihcz; ; ;  # �9ׇ
+xn--9-ihcz; �9ׇ; ; xn--9-ihcz; ; ;  # �9ׇ
+�aׇ; ; [B2, B3]; xn--a-ihcz; ; ;  # �aׇ
+�Aׇ; �aׇ; [B2, B3]; xn--a-ihcz; ; ;  # �aׇ
+xn--a-ihcz; �aׇ; [B2, B3]; xn--a-ihcz; ; ;  # �aׇ
+�ת; ; ; xn--4db6c; ; ;  # �ת
+xn--4db6c; �ת; ; xn--4db6c; ; ;  # �ת
+�׳ת; ; ; xn--4db6c0a; ; ;  # �׳ת
+xn--4db6c0a; �׳ת; ; xn--4db6c0a; ; ;  # �׳ת
+a�Tz; a�tz; [B5]; xn--atz-qpe; ; ;  # a�tz
+a�tz; ; [B5]; xn--atz-qpe; ; ;  # a�tz
+A�TZ; a�tz; [B5]; xn--atz-qpe; ; ;  # a�tz
+A�tz; a�tz; [B5]; xn--atz-qpe; ; ;  # a�tz
+xn--atz-qpe; a�tz; [B5]; xn--atz-qpe; ; ;  # a�tz
+�Tת; �tת; [B2]; xn--t-zhc3f; ; ;  # �tת
+�tת; ; [B2]; xn--t-zhc3f; ; ;  # �tת
+xn--t-zhc3f; �tת; [B2]; xn--t-zhc3f; ; ;  # �tת
+�7ת; ; ; xn--7-zhc3f; ; ;  # �7ת
+xn--7-zhc3f; �7ת; ; xn--7-zhc3f; ; ;  # �7ת
+�٧ת; ; ; xn--4db6c6t; ; ;  # �٧ת
+xn--4db6c6t; �٧ת; ; xn--4db6c6t; ; ;  # �٧ת
+a7Ù§z; ; [B5]; xn--a7z-06e; ; ;  # a7Ù§z
+A7Ù§Z; a7Ù§z; [B5]; xn--a7z-06e; ; ;  # a7Ù§z
+A7Ù§z; a7Ù§z; [B5]; xn--a7z-06e; ; ;  # a7Ù§z
+xn--a7z-06e; a7Ù§z; [B5]; xn--a7z-06e; ; ;  # a7Ù§z
+�7٧ת; ; [B4]; xn--7-zhc3fty; ; ;  # �7٧ת
+xn--7-zhc3fty; �7٧ת; [B4]; xn--7-zhc3fty; ; ;  # �7٧ת
+ஹ��; ; ; xn--dmc4b194h; ; xn--dmc4b;  # ஹ�
+xn--dmc4b; ஹ�; ; xn--dmc4b; ; ;  # ஹ�
+ஹ�; ; ; xn--dmc4b; ; ;  # ஹ�
+xn--dmc4b194h; ஹ��; ; xn--dmc4b194h; ; ;  # ஹ�
+ஹ�; ; [C2]; xn--dmc225h; ; xn--dmc; [] # ஹ
+xn--dmc; ஹ; ; xn--dmc; ; ;  # ஹ
+ஹ; ; ; xn--dmc; ; ;  # ஹ
+xn--dmc225h; ஹ�; [C2]; xn--dmc225h; ; ;  # ஹ
+�; ; [C2]; xn--1ug; ; ; [A4_2] # 
+; ; [X4_2]; ; [A4_2]; ;  # 
+xn--1ug; �; [C2]; xn--1ug; ; ;  # 
+ஹ�‌; ; ; xn--dmc4by94h; ; xn--dmc4b;  # ஹ�
+xn--dmc4by94h; ஹ�‌; ; xn--dmc4by94h; ; ;  # ஹ�
+ஹ‌; ; [C1]; xn--dmc025h; ; xn--dmc; [] # ஹ
+xn--dmc025h; ஹ‌; [C1]; xn--dmc025h; ; ;  # ஹ
+‌; ; [C1]; xn--0ug; ; ; [A4_2] # 
+xn--0ug; ‌; [C1]; xn--0ug; ; ;  # 
+لٰ‌ۭۯ; ; ; xn--ghb2gxqia7523a; ; xn--ghb2gxqia;  # لٰۭۯ
+xn--ghb2gxqia; لٰۭۯ; ; xn--ghb2gxqia; ; ;  # لٰۭۯ
+لٰۭۯ; ; ; xn--ghb2gxqia; ; ;  # لٰۭۯ
+xn--ghb2gxqia7523a; لٰ‌ۭۯ; ; xn--ghb2gxqia7523a; ; ;  # لٰۭۯ
+لٰ‌ۯ; ; ; xn--ghb2g3qq34f; ; xn--ghb2g3q;  # لٰۯ
+xn--ghb2g3q; لٰۯ; ; xn--ghb2g3q; ; ;  # لٰۯ
+لٰۯ; ; ; xn--ghb2g3q; ; ;  # لٰۯ
+xn--ghb2g3qq34f; لٰ‌ۯ; ; xn--ghb2g3qq34f; ; ;  # لٰۯ
+ل‌ۭۯ; ; ; xn--ghb25aga828w; ; xn--ghb25aga;  # لۭۯ
+xn--ghb25aga; Ù„Û­Û¯; ; xn--ghb25aga; ; ;  # Ù„Û­Û¯
+Ù„Û­Û¯; ; ; xn--ghb25aga; ; ;  # Ù„Û­Û¯
+xn--ghb25aga828w; ل‌ۭۯ; ; xn--ghb25aga828w; ; ;  # لۭۯ
+ل‌ۯ; ; ; xn--ghb65a953d; ; xn--ghb65a;  # لۯ
+xn--ghb65a; Ù„Û¯; ; xn--ghb65a; ; ;  # Ù„Û¯
+Ù„Û¯; ; ; xn--ghb65a; ; ;  # Ù„Û¯
+xn--ghb65a953d; ل‌ۯ; ; xn--ghb65a953d; ; ;  # لۯ
+لٰ‌ۭ; ; [B3, C1]; xn--ghb2gxqy34f; ; xn--ghb2gxq; [] # لٰۭ
+xn--ghb2gxq; لٰۭ; ; xn--ghb2gxq; ; ;  # لٰۭ
+لٰۭ; ; ; xn--ghb2gxq; ; ;  # لٰۭ
+xn--ghb2gxqy34f; لٰ‌ۭ; [B3, C1]; xn--ghb2gxqy34f; ; ;  # لٰۭ
+ۯ‌ۯ; ; [C1]; xn--cmba004q; ; xn--cmba; [] # ۯۯ
+xn--cmba; Û¯Û¯; ; xn--cmba; ; ;  # Û¯Û¯
+Û¯Û¯; ; ; xn--cmba; ; ;  # Û¯Û¯
+xn--cmba004q; ۯ‌ۯ; [C1]; xn--cmba004q; ; ;  # ۯۯ
+ل‌; ; [B3, C1]; xn--ghb413k; ; xn--ghb; [] # ل
+xn--ghb; Ù„; ; xn--ghb; ; ;  # Ù„
+Ù„; ; ; xn--ghb; ; ;  # Ù„
+xn--ghb413k; ل‌; [B3, C1]; xn--ghb413k; ; ;  # ل
+a。。b; a..b; [X4_2]; ; [A4_2]; ;  # a..b
+A。。B; a..b; [X4_2]; ; [A4_2]; ;  # a..b
+a..b; ; [X4_2]; ; [A4_2]; ;  # a..b
+�。。ڹ‌; �..ڹ‌; [B1, B3, C1, C2, X4_2]; xn--1ug..xn--skb080k; [B1, B3, C1, C2, A4_2]; ..xn--skb; [A4_2] # ..ڹ
+..xn--skb; ..Ú¹; [X4_2]; ..xn--skb; [A4_2]; ;  # ..Ú¹
+xn--1ug..xn--skb080k; �..ڹ‌; [B1, B3, C1, C2, X4_2]; xn--1ug..xn--skb080k; [B1, B3, C1, C2, A4_2]; ;  # ..ڹ
+�0٠; ; [B4]; xn--0-zhc74b; ; ;  # �0٠
+xn--0-zhc74b; �0٠; [B4]; xn--0-zhc74b; ; ;  # �0٠
+$; ; [P1, V6]; ; ; ;  # $
+
+# RANDOMIZED TESTS
+
+c.0ü.�; ; [B1]; c.xn--0-eha.xn--4db; ; ;  # c.0ü.�
+c.0ü.�; c.0ü.�; [B1]; c.xn--0-eha.xn--4db; ; ;  # c.0ü.�
+C.0Ü.�; c.0ü.�; [B1]; c.xn--0-eha.xn--4db; ; ;  # c.0ü.�
+C.0Ü.�; c.0ü.�; [B1]; c.xn--0-eha.xn--4db; ; ;  # c.0ü.�
+C.0ü.�; c.0ü.�; [B1]; c.xn--0-eha.xn--4db; ; ;  # c.0ü.�
+C.0ü.�; c.0ü.�; [B1]; c.xn--0-eha.xn--4db; ; ;  # c.0ü.�
+⒕�ٟ򓤦．-󠄯; ⒕�ٟ򓤦.-; [P1, V3, V6]; xn--7hb713lfwbi1311b.-; ; ;  # ⒕�ٟ.-
+14.�ٟ򓤦.-󠄯; 14.�ٟ򓤦.-; [P1, V3, V6]; 14.xn--7hb713l3v90n.-; ; ;  # 14.�ٟ.-
+14.xn--7hb713l3v90n.-; 14.�ٟ򓤦.-; [V3, V6]; 14.xn--7hb713l3v90n.-; ; ;  # 14.�ٟ.-
+xn--7hb713lfwbi1311b.-; ⒕�ٟ򓤦.-; [V3, V6]; xn--7hb713lfwbi1311b.-; ; ;  # ⒕�ٟ.-
+ꡣ.�; ; ; xn--8c9a.xn--qsb; ; ;  # ꡣ.�
+xn--8c9a.xn--qsb; ꡣ.�; ; xn--8c9a.xn--qsb; ; ;  # ꡣ.�
+≯؃｡-; ≯؃.-; [B1, P1, V3, V6]; xn--lfb566l.-; ; ;  # ≯.-
+≯؃｡-; ≯؃.-; [B1, P1, V3, V6]; xn--lfb566l.-; ; ;  # ≯.-
+≯؃。-; ≯؃.-; [B1, P1, V3, V6]; xn--lfb566l.-; ; ;  # ≯.-
+≯؃。-; ≯؃.-; [B1, P1, V3, V6]; xn--lfb566l.-; ; ;  # ≯.-
+xn--lfb566l.-; ≯؃.-; [B1, V3, V6]; xn--lfb566l.-; ; ;  # ≯.-
+⾛�⾕.ᅟ󠗰ςႭ; 走�谷.ᅟ󠗰ςႭ; [B5, P1, V6]; xn--6g3a1x434z.xn--3xa827dhpae6345i; ; xn--6g3a1x434z.xn--4xa627dhpae6345i;  # 走�谷.ςႭ
+走�谷.ᅟ󠗰ςႭ; ; [B5, P1, V6]; xn--6g3a1x434z.xn--3xa827dhpae6345i; ; xn--6g3a1x434z.xn--4xa627dhpae6345i;  # 走�谷.ςႭ
+走�谷.ᅟ󠗰ς�; ; [B5, P1, V6]; xn--6g3a1x434z.xn--3xa380eotvh7453a; ; xn--6g3a1x434z.xn--4xa180eotvh7453a;  # 走�谷.ς�
+走�谷.ᅟ󠗰ΣႭ; 走�谷.ᅟ󠗰σႭ; [B5, P1, V6]; xn--6g3a1x434z.xn--4xa627dhpae6345i; ; ;  # 走�谷.σႭ
+走�谷.ᅟ󠗰σ�; ; [B5, P1, V6]; xn--6g3a1x434z.xn--4xa180eotvh7453a; ; ;  # 走�谷.σ�
+走�谷.ᅟ󠗰Σ�; 走�谷.ᅟ󠗰σ�; [B5, P1, V6]; xn--6g3a1x434z.xn--4xa180eotvh7453a; ; ;  # 走�谷.σ�
+xn--6g3a1x434z.xn--4xa180eotvh7453a; 走�谷.ᅟ󠗰σ�; [B5, V6]; xn--6g3a1x434z.xn--4xa180eotvh7453a; ; ;  # 走�谷.σ�
+xn--6g3a1x434z.xn--4xa627dhpae6345i; 走�谷.ᅟ󠗰σႭ; [B5, V6]; xn--6g3a1x434z.xn--4xa627dhpae6345i; ; ;  # 走�谷.σႭ
+xn--6g3a1x434z.xn--3xa380eotvh7453a; 走�谷.ᅟ󠗰ς�; [B5, V6]; xn--6g3a1x434z.xn--3xa380eotvh7453a; ; ;  # 走�谷.ς�
+xn--6g3a1x434z.xn--3xa827dhpae6345i; 走�谷.ᅟ󠗰ςႭ; [B5, V6]; xn--6g3a1x434z.xn--3xa827dhpae6345i; ; ;  # 走�谷.ςႭ
+⾛�⾕.ᅟ󠗰ς�; 走�谷.ᅟ󠗰ς�; [B5, P1, V6]; xn--6g3a1x434z.xn--3xa380eotvh7453a; ; xn--6g3a1x434z.xn--4xa180eotvh7453a;  # 走�谷.ς�
+⾛�⾕.ᅟ󠗰ΣႭ; 走�谷.ᅟ󠗰σႭ; [B5, P1, V6]; xn--6g3a1x434z.xn--4xa627dhpae6345i; ; ;  # 走�谷.σႭ
+⾛�⾕.ᅟ󠗰σ�; 走�谷.ᅟ󠗰σ�; [B5, P1, V6]; xn--6g3a1x434z.xn--4xa180eotvh7453a; ; ;  # 走�谷.σ�
+⾛�⾕.ᅟ󠗰Σ�; 走�谷.ᅟ󠗰σ�; [B5, P1, V6]; xn--6g3a1x434z.xn--4xa180eotvh7453a; ; ;  # 走�谷.σ�
+�≠ᢙ≯.솣-ᡴႠ; ; [C2, P1, V6]; xn--jbf929a90b0b.xn----6zg521d196p; ; xn--jbf911clb.xn----6zg521d196p; [P1, V6] # ≠ᢙ≯.솣-ᡴႠ
+�≠ᢙ≯.솣-ᡴႠ; �≠ᢙ≯.솣-ᡴႠ; [C2, P1, V6]; xn--jbf929a90b0b.xn----6zg521d196p; ; xn--jbf911clb.xn----6zg521d196p; [P1, V6] # ≠ᢙ≯.솣-ᡴႠ
+�≠ᢙ≯.솣-ᡴⴀ; �≠ᢙ≯.솣-ᡴⴀ; [C2, P1, V6]; xn--jbf929a90b0b.xn----p9j493ivi4l; ; xn--jbf911clb.xn----p9j493ivi4l; [P1, V6] # ≠ᢙ≯.솣-ᡴⴀ
+�≠ᢙ≯.솣-ᡴⴀ; ; [C2, P1, V6]; xn--jbf929a90b0b.xn----p9j493ivi4l; ; xn--jbf911clb.xn----p9j493ivi4l; [P1, V6] # ≠ᢙ≯.솣-ᡴⴀ
+xn--jbf911clb.xn----p9j493ivi4l; ≠ᢙ≯.솣-ᡴⴀ; [V6]; xn--jbf911clb.xn----p9j493ivi4l; ; ;  # ≠ᢙ≯.솣-ᡴⴀ
+xn--jbf929a90b0b.xn----p9j493ivi4l; �≠ᢙ≯.솣-ᡴⴀ; [C2, V6]; xn--jbf929a90b0b.xn----p9j493ivi4l; ; ;  # ≠ᢙ≯.솣-ᡴⴀ
+xn--jbf911clb.xn----6zg521d196p; ≠ᢙ≯.솣-ᡴႠ; [V6]; xn--jbf911clb.xn----6zg521d196p; ; ;  # ≠ᢙ≯.솣-ᡴႠ
+xn--jbf929a90b0b.xn----6zg521d196p; �≠ᢙ≯.솣-ᡴႠ; [C2, V6]; xn--jbf929a90b0b.xn----6zg521d196p; ; ;  # ≠ᢙ≯.솣-ᡴႠ
+񯞜．�ྡྷݽ؀; 񯞜.�ྡྷݽ؀; [P1, V6]; xn--gw68a.xn--ifb57ev2psc6027m; ; ;  # .�ྡྷݽ
+񯞜．�ྡྷݽ؀; 񯞜.�ྡྷݽ؀; [P1, V6]; xn--gw68a.xn--ifb57ev2psc6027m; ; ;  # .�ྡྷݽ
+񯞜.�ྡྷݽ؀; ; [P1, V6]; xn--gw68a.xn--ifb57ev2psc6027m; ; ;  # .�ྡྷݽ
+xn--gw68a.xn--ifb57ev2psc6027m; 񯞜.�ྡྷݽ؀; [V6]; xn--gw68a.xn--ifb57ev2psc6027m; ; ;  # .�ྡྷݽ
+𣳔̃.𑓂; ; [V5]; xn--nsa95820a.xn--wz1d; ; ;  # 𣳔̃.𑓂
+xn--nsa95820a.xn--wz1d; 𣳔̃.𑓂; [V5]; xn--nsa95820a.xn--wz1d; ; ;  # 𣳔̃.𑓂
+𞤀𞥅�。󠄌Ⴣꡥ; 𞤢𞥅�.Ⴣꡥ; [B2, B3, P1, V6]; xn--9d6hgcy3556a.xn--7nd0578e; ; ;  # 𞤢𞥅.Ⴣꡥ
+𞤢𞥅�。󠄌ⴣꡥ; 𞤢𞥅�.ⴣꡥ; [B2, B3, P1, V6]; xn--9d6hgcy3556a.xn--rlju750b; ; ;  # 𞤢𞥅.ⴣꡥ
+xn--9d6hgcy3556a.xn--rlju750b; 𞤢𞥅�.ⴣꡥ; [B2, B3, V6]; xn--9d6hgcy3556a.xn--rlju750b; ; ;  # 𞤢𞥅.ⴣꡥ
+xn--9d6hgcy3556a.xn--7nd0578e; 𞤢𞥅�.Ⴣꡥ; [B2, B3, V6]; xn--9d6hgcy3556a.xn--7nd0578e; ; ;  # 𞤢𞥅.Ⴣꡥ
+𞤀𞥅�。󠄌ⴣꡥ; 𞤢𞥅�.ⴣꡥ; [B2, B3, P1, V6]; xn--9d6hgcy3556a.xn--rlju750b; ; ;  # 𞤢𞥅.ⴣꡥ
+࣢�ς𖬱。󠅡렧; ࣢�ς𖬱.렧; [B1, P1, V6]; xn--3xa73xp48ys2xc.xn--kn2b; ; xn--4xa53xp48ys2xc.xn--kn2b;  # �ς𖬱.렧
+࣢�ς𖬱。󠅡렧; ࣢�ς𖬱.렧; [B1, P1, V6]; xn--3xa73xp48ys2xc.xn--kn2b; ; xn--4xa53xp48ys2xc.xn--kn2b;  # �ς𖬱.렧
+࣢�Σ𖬱。󠅡렧; ࣢�σ𖬱.렧; [B1, P1, V6]; xn--4xa53xp48ys2xc.xn--kn2b; ; ;  # �σ𖬱.렧
+࣢�Σ𖬱。󠅡렧; ࣢�σ𖬱.렧; [B1, P1, V6]; xn--4xa53xp48ys2xc.xn--kn2b; ; ;  # �σ𖬱.렧
+࣢�σ𖬱。󠅡렧; ࣢�σ𖬱.렧; [B1, P1, V6]; xn--4xa53xp48ys2xc.xn--kn2b; ; ;  # �σ𖬱.렧
+࣢�σ𖬱。󠅡렧; ࣢�σ𖬱.렧; [B1, P1, V6]; xn--4xa53xp48ys2xc.xn--kn2b; ; ;  # �σ𖬱.렧
+xn--4xa53xp48ys2xc.xn--kn2b; ࣢�σ𖬱.렧; [B1, V6]; xn--4xa53xp48ys2xc.xn--kn2b; ; ;  # �σ𖬱.렧
+xn--3xa73xp48ys2xc.xn--kn2b; ࣢�ς𖬱.렧; [B1, V6]; xn--3xa73xp48ys2xc.xn--kn2b; ; ;  # �ς𖬱.렧
+-�。�‌�⒈; -�.𞤯‌�⒈; [B1, C1, C2, P1, V3, V6]; xn----ugn.xn--0ugc555aiv51d; ; -.xn--tsh3666n; [B1, P1, V3, V6] # -.𞤯⒈
+-�。�‌�1.; -�.𞤯‌�1.; [B1, C1, C2, V3]; xn----ugn.xn--1-rgnd61297b.; ; -.xn--1-0i8r.; [B1, V3] # -.𞤯1.
+-�。𞤯‌�1.; -�.𞤯‌�1.; [B1, C1, C2, V3]; xn----ugn.xn--1-rgnd61297b.; ; -.xn--1-0i8r.; [B1, V3] # -.𞤯1.
+-.xn--1-0i8r.; -.𞤯1.; [B1, V3]; -.xn--1-0i8r.; ; ;  # -.𞤯1.
+xn----ugn.xn--1-rgnd61297b.; -�.𞤯‌�1.; [B1, C1, C2, V3]; xn----ugn.xn--1-rgnd61297b.; ; ;  # -.𞤯1.
+-�。𞤯‌�⒈; -�.𞤯‌�⒈; [B1, C1, C2, P1, V3, V6]; xn----ugn.xn--0ugc555aiv51d; ; -.xn--tsh3666n; [B1, P1, V3, V6] # -.𞤯⒈
+-.xn--tsh3666n; -.𞤯⒈; [B1, V3, V6]; -.xn--tsh3666n; ; ;  # -.𞤯⒈
+xn----ugn.xn--0ugc555aiv51d; -�.𞤯‌�⒈; [B1, C1, C2, V3, V6]; xn----ugn.xn--0ugc555aiv51d; ; ;  # -.𞤯⒈
+‌򅎭.Ⴒ𑇀; ; [C1, P1, V6]; xn--0ug15083f.xn--qnd6272k; ; xn--bn95b.xn--qnd6272k; [P1, V6] # .Ⴒ𑇀
+‌򅎭.ⴒ𑇀; ; [C1, P1, V6]; xn--0ug15083f.xn--9kj2034e; ; xn--bn95b.xn--9kj2034e; [P1, V6] # .ⴒ𑇀
+xn--bn95b.xn--9kj2034e; 򅎭.ⴒ𑇀; [V6]; xn--bn95b.xn--9kj2034e; ; ;  # .ⴒ𑇀
+xn--0ug15083f.xn--9kj2034e; ‌򅎭.ⴒ𑇀; [C1, V6]; xn--0ug15083f.xn--9kj2034e; ; ;  # .ⴒ𑇀
+xn--bn95b.xn--qnd6272k; 򅎭.Ⴒ𑇀; [V6]; xn--bn95b.xn--qnd6272k; ; ;  # .Ⴒ𑇀
+xn--0ug15083f.xn--qnd6272k; ‌򅎭.Ⴒ𑇀; [C1, V6]; xn--0ug15083f.xn--qnd6272k; ; ;  # .Ⴒ𑇀
+繱𑖿�.８︒; 繱𑖿�.8︒; [P1, V6]; xn--1ug6928ac48e.xn--8-o89h; ; xn--gl0as212a.xn--8-o89h;  # 繱𑖿.8︒
+繱𑖿�.8。; 繱𑖿�.8.; ; xn--1ug6928ac48e.8.; ; xn--gl0as212a.8.;  # 繱𑖿.8.
+xn--gl0as212a.8.; 繱𑖿.8.; ; xn--gl0as212a.8.; ; ;  # 繱𑖿.8.
+繱𑖿.8.; ; ; xn--gl0as212a.8.; ; ;  # 繱𑖿.8.
+xn--1ug6928ac48e.8.; 繱𑖿�.8.; ; xn--1ug6928ac48e.8.; ; ;  # 繱𑖿.8.
+繱𑖿�.8.; ; ; xn--1ug6928ac48e.8.; ; xn--gl0as212a.8.;  # 繱𑖿.8.
+xn--gl0as212a.xn--8-o89h; 繱𑖿.8︒; [V6]; xn--gl0as212a.xn--8-o89h; ; ;  # 繱𑖿.8︒
+xn--1ug6928ac48e.xn--8-o89h; 繱𑖿�.8︒; [V6]; xn--1ug6928ac48e.xn--8-o89h; ; ;  # 繱𑖿.8︒
+󠆾．𞀈; .𞀈; [V5, X4_2]; .xn--ph4h; [V5, A4_2]; ;  # .𞀈
+󠆾.𞀈; .𞀈; [V5, X4_2]; .xn--ph4h; [V5, A4_2]; ;  # .𞀈
+.xn--ph4h; .𞀈; [V5, X4_2]; .xn--ph4h; [V5, A4_2]; ;  # .𞀈
+ß۫。�; ß۫.�; [C2]; xn--zca012a.xn--1ug; ; xn--ss-59d.; [] # ß۫.
+SS۫。�; ss۫.�; [C2]; xn--ss-59d.xn--1ug; ; xn--ss-59d.; [] # ss۫.
+ss۫。�; ss۫.�; [C2]; xn--ss-59d.xn--1ug; ; xn--ss-59d.; [] # ss۫.
+Ss۫。�; ss۫.�; [C2]; xn--ss-59d.xn--1ug; ; xn--ss-59d.; [] # ss۫.
+xn--ss-59d.; ssÛ«.; ; xn--ss-59d.; ; ;  # ssÛ«.
+ssÛ«.; ; ; xn--ss-59d.; ; ;  # ssÛ«.
+SSÛ«.; ssÛ«.; ; xn--ss-59d.; ; ;  # ssÛ«.
+SsÛ«.; ssÛ«.; ; xn--ss-59d.; ; ;  # ssÛ«.
+xn--ss-59d.xn--1ug; ss۫.�; [C2]; xn--ss-59d.xn--1ug; ; ;  # ss۫.
+xn--zca012a.xn--1ug; ß۫.�; [C2]; xn--zca012a.xn--1ug; ; ;  # ß۫.
+�‌⒈．󠎇; �‌⒈.󠎇; [C1, P1, V6]; xn--0ug88o47900b.xn--tv36e; ; xn--tshz2001k.xn--tv36e; [P1, V6] # ⒈.
+�‌1..󠎇; ; [C1, P1, V6, X4_2]; xn--1-rgn37671n..xn--tv36e; [C1, P1, V6, A4_2]; xn--1-bs31m..xn--tv36e; [P1, V6, A4_2] # 1..
+xn--1-bs31m..xn--tv36e; �1..󠎇; [V6, X4_2]; xn--1-bs31m..xn--tv36e; [V6, A4_2]; ;  # 1..
+xn--1-rgn37671n..xn--tv36e; �‌1..󠎇; [C1, V6, X4_2]; xn--1-rgn37671n..xn--tv36e; [C1, V6, A4_2]; ;  # 1..
+xn--tshz2001k.xn--tv36e; �⒈.󠎇; [V6]; xn--tshz2001k.xn--tv36e; ; ;  # ⒈.
+xn--0ug88o47900b.xn--tv36e; �‌⒈.󠎇; [C1, V6]; xn--0ug88o47900b.xn--tv36e; ; ;  # ⒈.
+󟈣ٟꪲß。󌓧; 󟈣ٟꪲß.󌓧; [P1, V6]; xn--zca92z0t7n5w96j.xn--bb79d; ; xn--ss-3xd2839nncy1m.xn--bb79d;  # ٟꪲß.
+󟈣ٟꪲSS。󌓧; 󟈣ٟꪲss.󌓧; [P1, V6]; xn--ss-3xd2839nncy1m.xn--bb79d; ; ;  # ٟꪲss.
+󟈣ٟꪲss。󌓧; 󟈣ٟꪲss.󌓧; [P1, V6]; xn--ss-3xd2839nncy1m.xn--bb79d; ; ;  # ٟꪲss.
+󟈣ٟꪲSs。󌓧; 󟈣ٟꪲss.󌓧; [P1, V6]; xn--ss-3xd2839nncy1m.xn--bb79d; ; ;  # ٟꪲss.
+xn--ss-3xd2839nncy1m.xn--bb79d; 󟈣ٟꪲss.󌓧; [V6]; xn--ss-3xd2839nncy1m.xn--bb79d; ; ;  # ٟꪲss.
+xn--zca92z0t7n5w96j.xn--bb79d; 󟈣ٟꪲß.󌓧; [V6]; xn--zca92z0t7n5w96j.xn--bb79d; ; ;  # ٟꪲß.
+ݴ‌𞤿。�䉜�񿤼; ݴ‌𞤿.�䉜�񿤼; [C1, C2, P1, V6]; xn--4pb607jjt73a.xn--1ug236ke314donv1a; ; xn--4pb2977v.xn--z0nt555ukbnv; [P1, V6] # ݴ𞤿.䉜
+ݴ‌�。�䉜�񿤼; ݴ‌𞤿.�䉜�񿤼; [C1, C2, P1, V6]; xn--4pb607jjt73a.xn--1ug236ke314donv1a; ; xn--4pb2977v.xn--z0nt555ukbnv; [P1, V6] # ݴ𞤿.䉜
+xn--4pb2977v.xn--z0nt555ukbnv; ݴ𞤿.�䉜񿤼; [V6]; xn--4pb2977v.xn--z0nt555ukbnv; ; ;  # ݴ𞤿.䉜
+xn--4pb607jjt73a.xn--1ug236ke314donv1a; ݴ‌𞤿.�䉜�񿤼; [C1, C2, V6]; xn--4pb607jjt73a.xn--1ug236ke314donv1a; ; ;  # ݴ𞤿.䉜
+򔭜ςᡱ⒈.≮𑄳��; ; [B1, P1, V6]; xn--3xa407hkzinr77u.xn--1ug85gn777ahze; ; xn--4xa207hkzinr77u.xn--gdh5392g6sd;  # ςᡱ⒈.≮𑄳�
+򔭜ςᡱ⒈.≮𑄳��; 򔭜ςᡱ⒈.≮𑄳��; [B1, P1, V6]; xn--3xa407hkzinr77u.xn--1ug85gn777ahze; ; xn--4xa207hkzinr77u.xn--gdh5392g6sd;  # ςᡱ⒈.≮𑄳�
+򔭜ςᡱ1..≮𑄳��; ; [B1, P1, V6, X4_2]; xn--1-xmb999meq63t..xn--1ug85gn777ahze; [B1, P1, V6, A4_2]; xn--1-zmb699meq63t..xn--gdh5392g6sd;  # ςᡱ1..≮𑄳�
+򔭜ςᡱ1..≮𑄳��; 򔭜ςᡱ1..≮𑄳��; [B1, P1, V6, X4_2]; xn--1-xmb999meq63t..xn--1ug85gn777ahze; [B1, P1, V6, A4_2]; xn--1-zmb699meq63t..xn--gdh5392g6sd;  # ςᡱ1..≮𑄳�
+򔭜Σᡱ1..≮𑄳��; 򔭜σᡱ1..≮𑄳��; [B1, P1, V6, X4_2]; xn--1-zmb699meq63t..xn--1ug85gn777ahze; [B1, P1, V6, A4_2]; xn--1-zmb699meq63t..xn--gdh5392g6sd;  # σᡱ1..≮𑄳�
+򔭜Σᡱ1..≮𑄳��; 򔭜σᡱ1..≮𑄳��; [B1, P1, V6, X4_2]; xn--1-zmb699meq63t..xn--1ug85gn777ahze; [B1, P1, V6, A4_2]; xn--1-zmb699meq63t..xn--gdh5392g6sd;  # σᡱ1..≮𑄳�
+򔭜σᡱ1..≮𑄳��; ; [B1, P1, V6, X4_2]; xn--1-zmb699meq63t..xn--1ug85gn777ahze; [B1, P1, V6, A4_2]; xn--1-zmb699meq63t..xn--gdh5392g6sd;  # σᡱ1..≮𑄳�
+򔭜σᡱ1..≮𑄳��; 򔭜σᡱ1..≮𑄳��; [B1, P1, V6, X4_2]; xn--1-zmb699meq63t..xn--1ug85gn777ahze; [B1, P1, V6, A4_2]; xn--1-zmb699meq63t..xn--gdh5392g6sd;  # σᡱ1..≮𑄳�
+xn--1-zmb699meq63t..xn--gdh5392g6sd; 򔭜σᡱ1..≮𑄳�; [B1, V6, X4_2]; xn--1-zmb699meq63t..xn--gdh5392g6sd; [B1, V6, A4_2]; ;  # σᡱ1..≮𑄳�
+xn--1-zmb699meq63t..xn--1ug85gn777ahze; 򔭜σᡱ1..≮𑄳��; [B1, V6, X4_2]; xn--1-zmb699meq63t..xn--1ug85gn777ahze; [B1, V6, A4_2]; ;  # σᡱ1..≮𑄳�
+xn--1-xmb999meq63t..xn--1ug85gn777ahze; 򔭜ςᡱ1..≮𑄳��; [B1, V6, X4_2]; xn--1-xmb999meq63t..xn--1ug85gn777ahze; [B1, V6, A4_2]; ;  # ςᡱ1..≮𑄳�
+򔭜Σᡱ⒈.≮𑄳��; 򔭜σᡱ⒈.≮𑄳��; [B1, P1, V6]; xn--4xa207hkzinr77u.xn--1ug85gn777ahze; ; xn--4xa207hkzinr77u.xn--gdh5392g6sd;  # σᡱ⒈.≮𑄳�
+򔭜Σᡱ⒈.≮𑄳��; 򔭜σᡱ⒈.≮𑄳��; [B1, P1, V6]; xn--4xa207hkzinr77u.xn--1ug85gn777ahze; ; xn--4xa207hkzinr77u.xn--gdh5392g6sd;  # σᡱ⒈.≮𑄳�
+򔭜σᡱ⒈.≮𑄳��; ; [B1, P1, V6]; xn--4xa207hkzinr77u.xn--1ug85gn777ahze; ; xn--4xa207hkzinr77u.xn--gdh5392g6sd;  # σᡱ⒈.≮𑄳�
+򔭜σᡱ⒈.≮𑄳��; 򔭜σᡱ⒈.≮𑄳��; [B1, P1, V6]; xn--4xa207hkzinr77u.xn--1ug85gn777ahze; ; xn--4xa207hkzinr77u.xn--gdh5392g6sd;  # σᡱ⒈.≮𑄳�
+xn--4xa207hkzinr77u.xn--gdh5392g6sd; 򔭜σᡱ⒈.≮𑄳�; [B1, V6]; xn--4xa207hkzinr77u.xn--gdh5392g6sd; ; ;  # σᡱ⒈.≮𑄳�
+xn--4xa207hkzinr77u.xn--1ug85gn777ahze; 򔭜σᡱ⒈.≮𑄳��; [B1, V6]; xn--4xa207hkzinr77u.xn--1ug85gn777ahze; ; ;  # σᡱ⒈.≮𑄳�
+xn--3xa407hkzinr77u.xn--1ug85gn777ahze; 򔭜ςᡱ⒈.≮𑄳��; [B1, V6]; xn--3xa407hkzinr77u.xn--1ug85gn777ahze; ; ;  # ςᡱ⒈.≮𑄳�
+ㅤ�Ⴀ�.᠋; ㅤ�Ⴀ�.; [P1, V6]; xn--n3b468azngju2a.; ; ;  # �Ⴀ�.
+ᅠ�Ⴀ�.᠋; ᅠ�Ⴀ�.; [P1, V6]; xn--n3b468aoqa89r.; ; ;  # �Ⴀ�.
+ᅠ�ⴀ�.᠋; ᅠ�ⴀ�.; [P1, V6]; xn--n3b742bkqf4ty.; ; ;  # �ⴀ�.
+xn--n3b742bkqf4ty.; ᅠ�ⴀ�.; [V6]; xn--n3b742bkqf4ty.; ; ;  # �ⴀ�.
+xn--n3b468aoqa89r.; ᅠ�Ⴀ�.; [V6]; xn--n3b468aoqa89r.; ; ;  # �Ⴀ�.
+ㅤ�ⴀ�.᠋; ㅤ�ⴀ�.; [P1, V6]; xn--n3b445e53po6d.; ; ;  # �ⴀ�.
+xn--n3b445e53po6d.; ㅤ�ⴀ�.; [V6]; xn--n3b445e53po6d.; ; ;  # �ⴀ�.
+xn--n3b468azngju2a.; ㅤ�Ⴀ�.; [V6]; xn--n3b468azngju2a.; ; ;  # �Ⴀ�.
+��．�𑰽ؒꤩ; ��.�𑰽ؒꤩ; [C2, V5]; xn--1ugy10a.xn--0fb32q3w7q2g4d; ; xn--pei.xn--0fb32q3w7q2g4d; [V5] # �.�𑰽ؒꤩ
+��.�𑰽ؒꤩ; ; [C2, V5]; xn--1ugy10a.xn--0fb32q3w7q2g4d; ; xn--pei.xn--0fb32q3w7q2g4d; [V5] # �.�𑰽ؒꤩ
+xn--pei.xn--0fb32q3w7q2g4d; �.�𑰽ؒꤩ; [V5]; xn--pei.xn--0fb32q3w7q2g4d; ; ;  # �.�𑰽ؒꤩ
+xn--1ugy10a.xn--0fb32q3w7q2g4d; ��.�𑰽ؒꤩ; [C2, V5]; xn--1ugy10a.xn--0fb32q3w7q2g4d; ; ;  # �.�𑰽ؒꤩ
+≮��.≯񪮸ꡅ; ; [B1, P1, V6]; xn--gdh7943gk2a.xn--hdh1383c5e36c; ; ;  # ≮�.≯ꡅ
+≮��.≯񪮸ꡅ; ≮��.≯񪮸ꡅ; [B1, P1, V6]; xn--gdh7943gk2a.xn--hdh1383c5e36c; ; ;  # ≮�.≯ꡅ
+xn--gdh7943gk2a.xn--hdh1383c5e36c; ≮��.≯񪮸ꡅ; [B1, V6]; xn--gdh7943gk2a.xn--hdh1383c5e36c; ; ;  # ≮�.≯ꡅ
+ೌ��󠲺｡�ᠦ; ೌ��󠲺.�ᠦ; [B1, P1, V5, V6]; xn--7tc6360ky5bn2732c.xn--8tc429c; ; ;  # ೌ��.�ᠦ
+ೌ��󠲺。�ᠦ; ೌ��󠲺.�ᠦ; [B1, P1, V5, V6]; xn--7tc6360ky5bn2732c.xn--8tc429c; ; ;  # ೌ��.�ᠦ
+ೌ��󠲺。�ᠦ; ೌ��󠲺.�ᠦ; [B1, P1, V5, V6]; xn--7tc6360ky5bn2732c.xn--8tc429c; ; ;  # ೌ��.�ᠦ
+xn--7tc6360ky5bn2732c.xn--8tc429c; ೌ��󠲺.�ᠦ; [B1, V5, V6]; xn--7tc6360ky5bn2732c.xn--8tc429c; ; ;  # ೌ��.�ᠦ
+ೌ��󠲺｡�ᠦ; ೌ��󠲺.�ᠦ; [B1, P1, V5, V6]; xn--7tc6360ky5bn2732c.xn--8tc429c; ; ;  # ೌ��.�ᠦ
+͉。𧡫; ͉.𧡫; [V5]; xn--nua.xn--bc6k; ; ;  # ͉.𧡫
+xn--nua.xn--bc6k; ͉.𧡫; [V5]; xn--nua.xn--bc6k; ; ;  # ͉.𧡫
+𑰿󠅦．ᅠ; 𑰿.ᅠ; [P1, V5, V6]; xn--ok3d.xn--psd; ; ;  # 𑰿.
+ð‘°¿ó …¦.á… ; ð‘°¿.á… ; [P1, V5, V6]; xn--ok3d.xn--psd; ; ;  # ð‘°¿.
+xn--ok3d.xn--psd; ð‘°¿.á… ; [V5, V6]; xn--ok3d.xn--psd; ; ;  # ð‘°¿.
+-𞤆�。󸼄𞳒; -𞤨�.󸼄𞳒; [B1, B5, B6, C2, P1, V3, V6]; xn----ugnx367r.xn--846h96596c; ; xn----ni8r.xn--846h96596c; [B1, B5, B6, P1, V3, V6] # -𞤨.
+-𞤨�。󸼄𞳒; -𞤨�.󸼄𞳒; [B1, B5, B6, C2, P1, V3, V6]; xn----ugnx367r.xn--846h96596c; ; xn----ni8r.xn--846h96596c; [B1, B5, B6, P1, V3, V6] # -𞤨.
+xn----ni8r.xn--846h96596c; -𞤨.󸼄𞳒; [B1, B5, B6, V3, V6]; xn----ni8r.xn--846h96596c; ; ;  # -𞤨.
+xn----ugnx367r.xn--846h96596c; -𞤨�.󸼄𞳒; [B1, B5, B6, C2, V3, V6]; xn----ugnx367r.xn--846h96596c; ; ;  # -𞤨.
+�󠇶≯𳾽。᷽⾇滸�; �󠇶≯𳾽.᷽舛滸�; [B1, P1, V5, V6]; xn--hdh7483cu6twwki8e.xn--yfg0765a58l0n6k; ; ;  # �≯.᷽舛滸�
+�󠇶≯𳾽。᷽⾇滸�; �󠇶≯𳾽.᷽舛滸�; [B1, P1, V5, V6]; xn--hdh7483cu6twwki8e.xn--yfg0765a58l0n6k; ; ;  # �≯.᷽舛滸�
+�󠇶≯𳾽。᷽舛滸�; �󠇶≯𳾽.᷽舛滸�; [B1, P1, V5, V6]; xn--hdh7483cu6twwki8e.xn--yfg0765a58l0n6k; ; ;  # �≯.᷽舛滸�
+�󠇶≯𳾽。᷽舛滸�; �󠇶≯𳾽.᷽舛滸�; [B1, P1, V5, V6]; xn--hdh7483cu6twwki8e.xn--yfg0765a58l0n6k; ; ;  # �≯.᷽舛滸�
+xn--hdh7483cu6twwki8e.xn--yfg0765a58l0n6k; �󠇶≯𳾽.᷽舛滸�; [B1, V5, V6]; xn--hdh7483cu6twwki8e.xn--yfg0765a58l0n6k; ; ;  # �≯.᷽舛滸�
+�｡𑰺; �.𑰺; [V5]; xn--uy1a.xn--jk3d; ; ;  # �.𑰺
+�。𑰺; �.𑰺; [V5]; xn--uy1a.xn--jk3d; ; ;  # �.𑰺
+xn--uy1a.xn--jk3d; �.𑰺; [V5]; xn--uy1a.xn--jk3d; ; ;  # �.𑰺
+��。󠄊; 9�.; [B1]; xn--9-rv5i.; ; ;  # 9�.
+9�。󠄊; 9�.; [B1]; xn--9-rv5i.; ; ;  # 9�.
+xn--9-rv5i.; 9�.; [B1]; xn--9-rv5i.; ; ;  # 9�.
+󟇇-䟖F。ߋ⒈٢; 󟇇-䟖f.ߋ⒈٢; [B4, P1, V6]; xn---f-mz8b08788k.xn--bib53ev44d; ; ;  # -䟖f.ߋ⒈٢
+󟇇-䟖F。ߋ1.٢; 󟇇-䟖f.ߋ1.٢; [B1, P1, V6]; xn---f-mz8b08788k.xn--1-ybd.xn--bib; ; ;  # -䟖f.ߋ1.٢
+󟇇-䟖f。ߋ1.٢; 󟇇-䟖f.ߋ1.٢; [B1, P1, V6]; xn---f-mz8b08788k.xn--1-ybd.xn--bib; ; ;  # -䟖f.ߋ1.٢
+xn---f-mz8b08788k.xn--1-ybd.xn--bib; 󟇇-䟖f.ߋ1.٢; [B1, V6]; xn---f-mz8b08788k.xn--1-ybd.xn--bib; ; ;  # -䟖f.ߋ1.٢
+󟇇-䟖f。ߋ⒈٢; 󟇇-䟖f.ߋ⒈٢; [B4, P1, V6]; xn---f-mz8b08788k.xn--bib53ev44d; ; ;  # -䟖f.ߋ⒈٢
+xn---f-mz8b08788k.xn--bib53ev44d; 󟇇-䟖f.ߋ⒈٢; [B4, V6]; xn---f-mz8b08788k.xn--bib53ev44d; ; ;  # -䟖f.ߋ⒈٢
+‌｡�; ‌.�; [B1, C1]; xn--0ug.xn--yo0d; ; .xn--yo0d; [B1, A4_2] # .�
+‌。�; ‌.�; [B1, C1]; xn--0ug.xn--yo0d; ; .xn--yo0d; [B1, A4_2] # .�
+.xn--yo0d; .�; [B1, X4_2]; .xn--yo0d; [B1, A4_2]; ;  # .�
+xn--0ug.xn--yo0d; ‌.�; [B1, C1]; xn--0ug.xn--yo0d; ; ;  # .�
+�.≯‌-𞥀; ; [B1, C1, P1, V6]; xn--le9c.xn----rgn40iy359e; ; xn--le9c.xn----ogo9956r; [B1, P1, V6] # �.≯-𞥀
+�.≯‌-𞥀; �.≯‌-𞥀; [B1, C1, P1, V6]; xn--le9c.xn----rgn40iy359e; ; xn--le9c.xn----ogo9956r; [B1, P1, V6] # �.≯-𞥀
+�.≯‌-𞤞; �.≯‌-𞥀; [B1, C1, P1, V6]; xn--le9c.xn----rgn40iy359e; ; xn--le9c.xn----ogo9956r; [B1, P1, V6] # �.≯-𞥀
+�.≯‌-𞤞; �.≯‌-𞥀; [B1, C1, P1, V6]; xn--le9c.xn----rgn40iy359e; ; xn--le9c.xn----ogo9956r; [B1, P1, V6] # �.≯-𞥀
+xn--le9c.xn----ogo9956r; �.≯-𞥀; [B1, V6]; xn--le9c.xn----ogo9956r; ; ;  # �.≯-𞥀
+xn--le9c.xn----rgn40iy359e; �.≯‌-𞥀; [B1, C1, V6]; xn--le9c.xn----rgn40iy359e; ; ;  # �.≯-𞥀
+�-。≠ﳗ; �-.≠هج; [B1, P1, V3, V6]; xn----f411m.xn--rgb7c611j; ; ;  # -.≠هج
+�-。≠ﳗ; �-.≠هج; [B1, P1, V3, V6]; xn----f411m.xn--rgb7c611j; ; ;  # -.≠هج
+�-。≠هج; �-.≠هج; [B1, P1, V3, V6]; xn----f411m.xn--rgb7c611j; ; ;  # -.≠هج
+�-。≠هج; �-.≠هج; [B1, P1, V3, V6]; xn----f411m.xn--rgb7c611j; ; ;  # -.≠هج
+xn----f411m.xn--rgb7c611j; �-.≠هج; [B1, V3, V6]; xn----f411m.xn--rgb7c611j; ; ;  # -.≠هج
+񻬹𑈵。�𞨶; 񻬹𑈵.�𞨶; [B1, C2, P1, V6]; xn--8g1d12120a.xn--1ug6651p; ; xn--8g1d12120a.xn--5l6h; [P1, V6] # 𑈵.
+xn--8g1d12120a.xn--5l6h; 񻬹𑈵.𞨶; [V6]; xn--8g1d12120a.xn--5l6h; ; ;  # 𑈵.
+xn--8g1d12120a.xn--1ug6651p; 񻬹𑈵.�𞨶; [B1, C2, V6]; xn--8g1d12120a.xn--1ug6651p; ; ;  # 𑈵.
+𑋧꧀2｡㧉򒖄; 𑋧꧀2.㧉򒖄; [P1, V5, V6]; xn--2-5z4eu89y.xn--97l02706d; ; ;  # 𑋧꧀2.㧉
+𑋧꧀2。㧉򒖄; 𑋧꧀2.㧉򒖄; [P1, V5, V6]; xn--2-5z4eu89y.xn--97l02706d; ; ;  # 𑋧꧀2.㧉
+xn--2-5z4eu89y.xn--97l02706d; 𑋧꧀2.㧉򒖄; [V5, V6]; xn--2-5z4eu89y.xn--97l02706d; ; ;  # 𑋧꧀2.㧉
+‌𽬄�𞩥。≯6; ‌𽬄�𞩥.≯6; [B1, C1, P1, V6]; xn--0ug7105gf5wfxepq.xn--6-ogo; ; xn--so0du768aim9m.xn--6-ogo; [B1, B5, B6, P1, V6] # �.≯6
+‌𽬄�𞩥。≯6; ‌𽬄�𞩥.≯6; [B1, C1, P1, V6]; xn--0ug7105gf5wfxepq.xn--6-ogo; ; xn--so0du768aim9m.xn--6-ogo; [B1, B5, B6, P1, V6] # �.≯6
+xn--so0du768aim9m.xn--6-ogo; 𽬄�𞩥.≯6; [B1, B5, B6, V6]; xn--so0du768aim9m.xn--6-ogo; ; ;  # �.≯6
+xn--0ug7105gf5wfxepq.xn--6-ogo; ‌𽬄�𞩥.≯6; [B1, C1, V6]; xn--0ug7105gf5wfxepq.xn--6-ogo; ; ;  # �.≯6
+�．�𻞵-�; �.�𻞵-�; [B1, B3, B6, C2, P1, V5, V6]; xn--q30d.xn----ugn1088hfsxv; ; xn--q30d.xn----i26i1299n; [B1, B3, B6, P1, V3, V5, V6] # �.�-
+�.�𻞵-�; ; [B1, B3, B6, C2, P1, V5, V6]; xn--q30d.xn----ugn1088hfsxv; ; xn--q30d.xn----i26i1299n; [B1, B3, B6, P1, V3, V5, V6] # �.�-
+xn--q30d.xn----i26i1299n; �.�𻞵-; [B1, B3, B6, V3, V5, V6]; xn--q30d.xn----i26i1299n; ; ;  # �.�-
+xn--q30d.xn----ugn1088hfsxv; �.�𻞵-�; [B1, B3, B6, C2, V5, V6]; xn--q30d.xn----ugn1088hfsxv; ; ;  # �.�-
+⤸ς𺱀｡ﾠ; ⤸ς𺱀.ﾠ; [P1, V6]; xn--3xa392qmp03d.xn--cl7c; ; xn--4xa192qmp03d.xn--cl7c;  # ⤸ς.
+⤸ς𺱀。ᅠ; ⤸ς𺱀.ᅠ; [P1, V6]; xn--3xa392qmp03d.xn--psd; ; xn--4xa192qmp03d.xn--psd;  # ⤸ς.
+⤸Σ𺱀。ᅠ; ⤸σ𺱀.ᅠ; [P1, V6]; xn--4xa192qmp03d.xn--psd; ; ;  # ⤸σ.
+⤸σ𺱀。ᅠ; ⤸σ𺱀.ᅠ; [P1, V6]; xn--4xa192qmp03d.xn--psd; ; ;  # ⤸σ.
+xn--4xa192qmp03d.xn--psd; ⤸σ𺱀.ᅠ; [V6]; xn--4xa192qmp03d.xn--psd; ; ;  # ⤸σ.
+xn--3xa392qmp03d.xn--psd; ⤸ς𺱀.ᅠ; [V6]; xn--3xa392qmp03d.xn--psd; ; ;  # ⤸ς.
+⤸Σ𺱀｡ﾠ; ⤸σ𺱀.ﾠ; [P1, V6]; xn--4xa192qmp03d.xn--cl7c; ; ;  # ⤸σ.
+⤸σ𺱀｡ﾠ; ⤸σ𺱀.ﾠ; [P1, V6]; xn--4xa192qmp03d.xn--cl7c; ; ;  # ⤸σ.
+xn--4xa192qmp03d.xn--cl7c; ⤸σ𺱀.ﾠ; [V6]; xn--4xa192qmp03d.xn--cl7c; ; ;  # ⤸σ.
+xn--3xa392qmp03d.xn--cl7c; ⤸ς𺱀.ﾠ; [V6]; xn--3xa392qmp03d.xn--cl7c; ; ;  # ⤸ς.
+ݥဵ�ە.�𑋪Ⴃ; ; [B2, B3, P1, V6]; xn--llb10as9tqp5y.xn--bnd9168j21f; ; ;  # ݥဵ�ە.�𑋪Ⴃ
+ݥဵ�ە.�𑋪ⴃ; ; [B2, B3]; xn--llb10as9tqp5y.xn--ukj7371e21f; ; ;  # ݥဵ�ە.�𑋪ⴃ
+xn--llb10as9tqp5y.xn--ukj7371e21f; ݥဵ�ە.�𑋪ⴃ; [B2, B3]; xn--llb10as9tqp5y.xn--ukj7371e21f; ; ;  # ݥဵ�ە.�𑋪ⴃ
+xn--llb10as9tqp5y.xn--bnd9168j21f; ݥဵ�ە.�𑋪Ⴃ; [B2, B3, V6]; xn--llb10as9tqp5y.xn--bnd9168j21f; ; ;  # ݥဵ�ە.�𑋪Ⴃ
+١᭄-킼.᮪ؖ٬≯; ; [B1, B5, B6, P1, V5, V6]; xn----9pc551nk39n.xn--4fb6o571degg; ; ;  # ١᭄-킼.᮪ؖ٬≯
+١᭄-�ᅵᆿ.᮪ؖ٬≯; ١᭄-킼.᮪ؖ٬≯; [B1, B5, B6, P1, V5, V6]; xn----9pc551nk39n.xn--4fb6o571degg; ; ;  # ١᭄-킼.᮪ؖ٬≯
+xn----9pc551nk39n.xn--4fb6o571degg; ١᭄-킼.᮪ؖ٬≯; [B1, B5, B6, V5, V6]; xn----9pc551nk39n.xn--4fb6o571degg; ; ;  # ١᭄-킼.᮪ؖ٬≯
+-。ۂ؄򅖡𑓂; -.ۂ؄򅖡𑓂; [B1, B2, B3, P1, V3, V6]; -.xn--mfb39a7208dzgs3d; ; ;  # -.ۂ𑓂
+-。�ٔ؄򅖡𑓂; -.ۂ؄򅖡𑓂; [B1, B2, B3, P1, V3, V6]; -.xn--mfb39a7208dzgs3d; ; ;  # -.ۂ𑓂
+-.xn--mfb39a7208dzgs3d; -.Û‚Ø„ò…–¡ð‘“‚; [B1, B2, B3, V3, V6]; -.xn--mfb39a7208dzgs3d; ; ;  # -.Û‚ð‘“‚
+�󯑖�．ֽ𙮰��; �󯑖�.ֽ𙮰��; [C2, P1, V5, V6]; xn--1ug66101lt8me.xn--ldb8734fg0qcyzzg; ; xn--b726ey18m.xn--ldb8734fg0qcyzzg; [P1, V5, V6] # .ֽ��
+�󯑖�.ֽ𙮰��; ; [C2, P1, V5, V6]; xn--1ug66101lt8me.xn--ldb8734fg0qcyzzg; ; xn--b726ey18m.xn--ldb8734fg0qcyzzg; [P1, V5, V6] # .ֽ��
+xn--b726ey18m.xn--ldb8734fg0qcyzzg; 󯑖�.ֽ𙮰��; [V5, V6]; xn--b726ey18m.xn--ldb8734fg0qcyzzg; ; ;  # .ֽ��
+xn--1ug66101lt8me.xn--ldb8734fg0qcyzzg; �󯑖�.ֽ𙮰��; [C2, V5, V6]; xn--1ug66101lt8me.xn--ldb8734fg0qcyzzg; ; ;  # .ֽ��
+︒􃈵ς񀠇｡�; ︒􃈵ς񀠇.�; [B1, P1, V6]; xn--3xa3729jwz5t7gl5f.xn--f29c; ; xn--4xa1729jwz5t7gl5f.xn--f29c;  # ︒ς.�
+。􃈵ς񀠇。�; .􃈵ς񀠇.�; [P1, V6, X4_2]; .xn--3xa88573c7n64d.xn--f29c; [P1, V6, A4_2]; .xn--4xa68573c7n64d.xn--f29c;  # .ς.�
+。􃈵Σ񀠇。�; .􃈵σ񀠇.�; [P1, V6, X4_2]; .xn--4xa68573c7n64d.xn--f29c; [P1, V6, A4_2]; ;  # .σ.�
+。􃈵σ񀠇。�; .􃈵σ񀠇.�; [P1, V6, X4_2]; .xn--4xa68573c7n64d.xn--f29c; [P1, V6, A4_2]; ;  # .σ.�
+.xn--4xa68573c7n64d.xn--f29c; .􃈵σ񀠇.�; [V6, X4_2]; .xn--4xa68573c7n64d.xn--f29c; [V6, A4_2]; ;  # .σ.�
+.xn--3xa88573c7n64d.xn--f29c; .􃈵ς񀠇.�; [V6, X4_2]; .xn--3xa88573c7n64d.xn--f29c; [V6, A4_2]; ;  # .ς.�
+︒􃈵Σ񀠇｡�; ︒􃈵σ񀠇.�; [B1, P1, V6]; xn--4xa1729jwz5t7gl5f.xn--f29c; ; ;  # ︒σ.�
+︒􃈵σ񀠇｡�; ︒􃈵σ񀠇.�; [B1, P1, V6]; xn--4xa1729jwz5t7gl5f.xn--f29c; ; ;  # ︒σ.�
+xn--4xa1729jwz5t7gl5f.xn--f29c; ︒􃈵σ񀠇.�; [B1, V6]; xn--4xa1729jwz5t7gl5f.xn--f29c; ; ;  # ︒σ.�
+xn--3xa3729jwz5t7gl5f.xn--f29c; ︒􃈵ς񀠇.�; [B1, V6]; xn--3xa3729jwz5t7gl5f.xn--f29c; ; ;  # ︒ς.�
+ߙ．ۮ󆾃≯󠅲; ߙ.ۮ󆾃≯; [B2, B3, P1, V6]; xn--0sb.xn--bmb691l0524t; ; ;  # ߙ.ۮ≯
+ߙ．ۮ󆾃≯󠅲; ߙ.ۮ󆾃≯; [B2, B3, P1, V6]; xn--0sb.xn--bmb691l0524t; ; ;  # ߙ.ۮ≯
+ߙ.ۮ󆾃≯󠅲; ߙ.ۮ󆾃≯; [B2, B3, P1, V6]; xn--0sb.xn--bmb691l0524t; ; ;  # ߙ.ۮ≯
+ߙ.ۮ󆾃≯󠅲; ߙ.ۮ󆾃≯; [B2, B3, P1, V6]; xn--0sb.xn--bmb691l0524t; ; ;  # ߙ.ۮ≯
+xn--0sb.xn--bmb691l0524t; ߙ.ۮ󆾃≯; [B2, B3, V6]; xn--0sb.xn--bmb691l0524t; ; ;  # ߙ.ۮ≯
+ᩳ󚙸.�; ; [B1, P1, V5, V6]; xn--2of22352n.xn--q09c; ; ;  # ᩳ.�
+xn--2of22352n.xn--q09c; ᩳ󚙸.�; [B1, V5, V6]; xn--2of22352n.xn--q09c; ; ;  # ᩳ.�
+⒉󠊓≠｡Ⴟ⬣Ⴈ; ⒉󠊓≠.Ⴟ⬣Ⴈ; [P1, V6]; xn--1ch07f91401d.xn--gnd9b297j; ; ;  # ⒉≠.Ⴟ⬣Ⴈ
+⒉󠊓≠｡Ⴟ⬣Ⴈ; ⒉󠊓≠.Ⴟ⬣Ⴈ; [P1, V6]; xn--1ch07f91401d.xn--gnd9b297j; ; ;  # ⒉≠.Ⴟ⬣Ⴈ
+2.󠊓≠。Ⴟ⬣Ⴈ; 2.󠊓≠.Ⴟ⬣Ⴈ; [P1, V6]; 2.xn--1chz4101l.xn--gnd9b297j; ; ;  # 2.≠.Ⴟ⬣Ⴈ
+2.󠊓≠。Ⴟ⬣Ⴈ; 2.󠊓≠.Ⴟ⬣Ⴈ; [P1, V6]; 2.xn--1chz4101l.xn--gnd9b297j; ; ;  # 2.≠.Ⴟ⬣Ⴈ
+2.󠊓≠。ⴟ⬣ⴈ; 2.󠊓≠.ⴟ⬣ⴈ; [P1, V6]; 2.xn--1chz4101l.xn--45iz7d6b; ; ;  # 2.≠.ⴟ⬣ⴈ
+2.󠊓≠。ⴟ⬣ⴈ; 2.󠊓≠.ⴟ⬣ⴈ; [P1, V6]; 2.xn--1chz4101l.xn--45iz7d6b; ; ;  # 2.≠.ⴟ⬣ⴈ
+2.xn--1chz4101l.xn--45iz7d6b; 2.󠊓≠.ⴟ⬣ⴈ; [V6]; 2.xn--1chz4101l.xn--45iz7d6b; ; ;  # 2.≠.ⴟ⬣ⴈ
+2.xn--1chz4101l.xn--gnd9b297j; 2.󠊓≠.Ⴟ⬣Ⴈ; [V6]; 2.xn--1chz4101l.xn--gnd9b297j; ; ;  # 2.≠.Ⴟ⬣Ⴈ
+⒉󠊓≠｡ⴟ⬣ⴈ; ⒉󠊓≠.ⴟ⬣ⴈ; [P1, V6]; xn--1ch07f91401d.xn--45iz7d6b; ; ;  # ⒉≠.ⴟ⬣ⴈ
+⒉󠊓≠｡ⴟ⬣ⴈ; ⒉󠊓≠.ⴟ⬣ⴈ; [P1, V6]; xn--1ch07f91401d.xn--45iz7d6b; ; ;  # ⒉≠.ⴟ⬣ⴈ
+xn--1ch07f91401d.xn--45iz7d6b; ⒉󠊓≠.ⴟ⬣ⴈ; [V6]; xn--1ch07f91401d.xn--45iz7d6b; ; ;  # ⒉≠.ⴟ⬣ⴈ
+xn--1ch07f91401d.xn--gnd9b297j; ⒉󠊓≠.Ⴟ⬣Ⴈ; [V6]; xn--1ch07f91401d.xn--gnd9b297j; ; ;  # ⒉≠.Ⴟ⬣Ⴈ
+-󠉱ྸჅ。-�ݴ𞣑; -󠉱ྸჅ.-�ݴ𞣑; [B1, P1, V3, V6]; xn----xmg12fm2555h.xn----05c4213ryr0g; ; ;  # -ྸჅ.-�ݴ𞣑
+-󠉱ྸⴥ。-�ݴ𞣑; -󠉱ྸⴥ.-�ݴ𞣑; [B1, P1, V3, V6]; xn----xmg317tgv352a.xn----05c4213ryr0g; ; ;  # -ྸⴥ.-�ݴ𞣑
+xn----xmg317tgv352a.xn----05c4213ryr0g; -󠉱ྸⴥ.-�ݴ𞣑; [B1, V3, V6]; xn----xmg317tgv352a.xn----05c4213ryr0g; ; ;  # -ྸⴥ.-�ݴ𞣑
+xn----xmg12fm2555h.xn----05c4213ryr0g; -󠉱ྸჅ.-�ݴ𞣑; [B1, V3, V6]; xn----xmg12fm2555h.xn----05c4213ryr0g; ; ;  # -ྸჅ.-�ݴ𞣑
+ٙ。𑄴︒ا�; ٙ.𑄴︒ا�; [B1, B3, B6, P1, V5, V6]; xn--1hb.xn--mgb09fp820c08pa; ; ;  # ٙ.𑄴︒ا�
+ٙ。𑄴。ا�; ٙ.𑄴.ا�; [B1, B3, B6, V5]; xn--1hb.xn--w80d.xn--mgb09f; ; ;  # ٙ.𑄴.ا�
+xn--1hb.xn--w80d.xn--mgb09f; ٙ.𑄴.ا�; [B1, B3, B6, V5]; xn--1hb.xn--w80d.xn--mgb09f; ; ;  # ٙ.𑄴.ا�
+xn--1hb.xn--mgb09fp820c08pa; ٙ.𑄴︒ا�; [B1, B3, B6, V5, V6]; xn--1hb.xn--mgb09fp820c08pa; ; ;  # ٙ.𑄴︒ا�
+Ⴙظ.󠆓�; Ⴙظ.�; [B1, B5, B6, C2, P1, V6]; xn--3gb194c.xn--1ug; ; xn--3gb194c.; [B5, B6, P1, V6] # Ⴙظ.
+ⴙظ.󠆓�; ⴙظ.�; [B1, B5, B6, C2]; xn--3gb910r.xn--1ug; ; xn--3gb910r.; [B5, B6] # ⴙظ.
+xn--3gb910r.; ⴙظ.; [B5, B6]; xn--3gb910r.; ; ;  # ⴙظ.
+xn--3gb910r.xn--1ug; ⴙظ.�; [B1, B5, B6, C2]; xn--3gb910r.xn--1ug; ; ;  # ⴙظ.
+xn--3gb194c.; Ⴙظ.; [B5, B6, V6]; xn--3gb194c.; ; ;  # Ⴙظ.
+xn--3gb194c.xn--1ug; Ⴙظ.�; [B1, B5, B6, C2, V6]; xn--3gb194c.xn--1ug; ; ;  # Ⴙظ.
+󠆸｡₆��ݖ; .60�ݖ; [B1, P1, V6, X4_2]; .xn--60-cke9470y; [B1, P1, V6, A4_2]; ;  # .60�ݖ
+󠆸。60�ݖ; .60�ݖ; [B1, P1, V6, X4_2]; .xn--60-cke9470y; [B1, P1, V6, A4_2]; ;  # .60�ݖ
+.xn--60-cke9470y; .60�ݖ; [B1, V6, X4_2]; .xn--60-cke9470y; [B1, V6, A4_2]; ;  # .60�ݖ
+6�｡-𑈴; 6�.-𑈴; [B1, V3]; xn--6-jjd.xn----6n8i; ; ;  # 6�.-𑈴
+6�。-𑈴; 6�.-𑈴; [B1, V3]; xn--6-jjd.xn----6n8i; ; ;  # 6�.-𑈴
+xn--6-jjd.xn----6n8i; 6�.-𑈴; [B1, V3]; xn--6-jjd.xn----6n8i; ; ;  # 6�.-𑈴
+�񋌿�｡�ς𞰎ࣖ; �񋌿�.�ς𞰎ࣖ; [B1, C2, P1, V5, V6]; xn--1ugx105gq26y.xn--3xa41xcwbfz15g; ; xn--oo0d1330n.xn--4xa21xcwbfz15g; [B1, B5, B6, P1, V5, V6] # �.�ςࣖ
+�񋌿�。�ς𞰎ࣖ; �񋌿�.�ς𞰎ࣖ; [B1, C2, P1, V5, V6]; xn--1ugx105gq26y.xn--3xa41xcwbfz15g; ; xn--oo0d1330n.xn--4xa21xcwbfz15g; [B1, B5, B6, P1, V5, V6] # �.�ςࣖ
+�񋌿�。�Σ𞰎ࣖ; �񋌿�.�σ𞰎ࣖ; [B1, C2, P1, V5, V6]; xn--1ugx105gq26y.xn--4xa21xcwbfz15g; ; xn--oo0d1330n.xn--4xa21xcwbfz15g; [B1, B5, B6, P1, V5, V6] # �.�σࣖ
+�񋌿�。�σ𞰎ࣖ; �񋌿�.�σ𞰎ࣖ; [B1, C2, P1, V5, V6]; xn--1ugx105gq26y.xn--4xa21xcwbfz15g; ; xn--oo0d1330n.xn--4xa21xcwbfz15g; [B1, B5, B6, P1, V5, V6] # �.�σࣖ
+xn--oo0d1330n.xn--4xa21xcwbfz15g; 񋌿�.�σ𞰎ࣖ; [B1, B5, B6, V5, V6]; xn--oo0d1330n.xn--4xa21xcwbfz15g; ; ;  # �.�σࣖ
+xn--1ugx105gq26y.xn--4xa21xcwbfz15g; �񋌿�.�σ𞰎ࣖ; [B1, C2, V5, V6]; xn--1ugx105gq26y.xn--4xa21xcwbfz15g; ; ;  # �.�σࣖ
+xn--1ugx105gq26y.xn--3xa41xcwbfz15g; �񋌿�.�ς𞰎ࣖ; [B1, C2, V5, V6]; xn--1ugx105gq26y.xn--3xa41xcwbfz15g; ; ;  # �.�ςࣖ
+�񋌿�｡�Σ𞰎ࣖ; �񋌿�.�σ𞰎ࣖ; [B1, C2, P1, V5, V6]; xn--1ugx105gq26y.xn--4xa21xcwbfz15g; ; xn--oo0d1330n.xn--4xa21xcwbfz15g; [B1, B5, B6, P1, V5, V6] # �.�σࣖ
+�񋌿�｡�σ𞰎ࣖ; �񋌿�.�σ𞰎ࣖ; [B1, C2, P1, V5, V6]; xn--1ugx105gq26y.xn--4xa21xcwbfz15g; ; xn--oo0d1330n.xn--4xa21xcwbfz15g; [B1, B5, B6, P1, V5, V6] # �.�σࣖ
+⒈񟄜Ⴓ⒪．්򘘶ࢋ�; ⒈񟄜Ⴓ⒪.්򘘶ࢋ�; [B1, P1, V5, V6]; xn--rnd762h7cx3027d.xn--3xb99xpx1yoes3e; ; ;  # ⒈Ⴓ⒪.්�
+1.񟄜Ⴓ(o).්򘘶ࢋ�; ; [B1, B6, P1, V5, V6]; 1.xn--(o)-7sn88849j.xn--3xb99xpx1yoes3e; ; ;  # 1.Ⴓ(o).්�
+1.񟄜ⴓ(o).්򘘶ࢋ�; ; [B1, B6, P1, V5, V6]; 1.xn--(o)-ej1bu5389e.xn--3xb99xpx1yoes3e; ; ;  # 1.ⴓ(o).්�
+1.񟄜Ⴓ(O).්򘘶ࢋ�; 1.񟄜Ⴓ(o).්򘘶ࢋ�; [B1, B6, P1, V5, V6]; 1.xn--(o)-7sn88849j.xn--3xb99xpx1yoes3e; ; ;  # 1.Ⴓ(o).්�
+1.xn--(o)-7sn88849j.xn--3xb99xpx1yoes3e; 1.񟄜Ⴓ(o).්򘘶ࢋ�; [B1, B6, P1, V5, V6]; 1.xn--(o)-7sn88849j.xn--3xb99xpx1yoes3e; ; ;  # 1.Ⴓ(o).්�
+1.xn--(o)-ej1bu5389e.xn--3xb99xpx1yoes3e; 1.񟄜ⴓ(o).්򘘶ࢋ�; [B1, B6, P1, V5, V6]; 1.xn--(o)-ej1bu5389e.xn--3xb99xpx1yoes3e; ; ;  # 1.ⴓ(o).්�
+⒈񟄜ⴓ⒪．්򘘶ࢋ�; ⒈񟄜ⴓ⒪.්򘘶ࢋ�; [B1, P1, V5, V6]; xn--tsh0ds63atl31n.xn--3xb99xpx1yoes3e; ; ;  # ⒈ⴓ⒪.්�
+xn--tsh0ds63atl31n.xn--3xb99xpx1yoes3e; ⒈񟄜ⴓ⒪.්򘘶ࢋ�; [B1, V5, V6]; xn--tsh0ds63atl31n.xn--3xb99xpx1yoes3e; ; ;  # ⒈ⴓ⒪.්�
+xn--rnd762h7cx3027d.xn--3xb99xpx1yoes3e; ⒈񟄜Ⴓ⒪.්򘘶ࢋ�; [B1, V5, V6]; xn--rnd762h7cx3027d.xn--3xb99xpx1yoes3e; ; ;  # ⒈Ⴓ⒪.්�
+𞤷.���ؤ; ; ; xn--ve6h.xn--jgb1694kz0b2176a; ; ;  # 𞤷.���ؤ
+𞤷.���ؤ; 𞤷.���ؤ; ; xn--ve6h.xn--jgb1694kz0b2176a; ; ;  # 𞤷.���ؤ
+𞤕.���ؤ; 𞤷.���ؤ; ; xn--ve6h.xn--jgb1694kz0b2176a; ; ;  # 𞤷.���ؤ
+𞤕.���ؤ; 𞤷.���ؤ; ; xn--ve6h.xn--jgb1694kz0b2176a; ; ;  # 𞤷.���ؤ
+xn--ve6h.xn--jgb1694kz0b2176a; 𞤷.���ؤ; ; xn--ve6h.xn--jgb1694kz0b2176a; ; ;  # 𞤷.���ؤ
+�-｡𑄳񢌻; �-.𑄳񢌻; [B1, B3, P1, V3, V5, V6]; xn----ue6i.xn--v80d6662t; ; ;  # �-.𑄳
+�-。𑄳񢌻; �-.𑄳񢌻; [B1, B3, P1, V3, V5, V6]; xn----ue6i.xn--v80d6662t; ; ;  # �-.𑄳
+�-。𑄳񢌻; �-.𑄳񢌻; [B1, B3, P1, V3, V5, V6]; xn----ue6i.xn--v80d6662t; ; ;  # �-.𑄳
+xn----ue6i.xn--v80d6662t; �-.𑄳񢌻; [B1, B3, V3, V5, V6]; xn----ue6i.xn--v80d6662t; ; ;  # �-.𑄳
+�-｡𑄳񢌻; �-.𑄳񢌻; [B1, B3, P1, V3, V5, V6]; xn----ue6i.xn--v80d6662t; ; ;  # �-.𑄳
+-󠉖ꡧ．󠊂񇆃🄉; -󠉖ꡧ.󠊂񇆃🄉; [P1, V3, V6]; xn----hg4ei0361g.xn--207ht163h7m94c; ; ;  # -ꡧ.🄉
+-󠉖ꡧ.󠊂񇆃8,; ; [P1, V3, V6]; xn----hg4ei0361g.xn--8,-k362evu488a; ; ;  # -ꡧ.8,
+xn----hg4ei0361g.xn--8,-k362evu488a; -󠉖ꡧ.󠊂񇆃8,; [P1, V3, V6]; xn----hg4ei0361g.xn--8,-k362evu488a; ; ;  # -ꡧ.8,
+xn----hg4ei0361g.xn--207ht163h7m94c; -󠉖ꡧ.󠊂񇆃🄉; [V3, V6]; xn----hg4ei0361g.xn--207ht163h7m94c; ; ;  # -ꡧ.🄉
+󠾛󠈴臯𧔤.ݨ�; 󠾛󠈴臯𧔤.ݨ5; [B1, P1, V6]; xn--zb1at733hm579ddhla.xn--5-b5c; ; ;  # 臯𧔤.ݨ5
+󠾛󠈴臯𧔤.ݨ5; ; [B1, P1, V6]; xn--zb1at733hm579ddhla.xn--5-b5c; ; ;  # 臯𧔤.ݨ5
+xn--zb1at733hm579ddhla.xn--5-b5c; 󠾛󠈴臯𧔤.ݨ5; [B1, V6]; xn--zb1at733hm579ddhla.xn--5-b5c; ; ;  # 臯𧔤.ݨ5
+≮�．�; ≮�.�; [B1, B3, B6, P1, V5, V6]; xn--gdh1504g.xn--e92h; ; ;  # ≮�.�
+≮�．�; ≮�.�; [B1, B3, B6, P1, V5, V6]; xn--gdh1504g.xn--e92h; ; ;  # ≮�.�
+≮�.�; ; [B1, B3, B6, P1, V5, V6]; xn--gdh1504g.xn--e92h; ; ;  # ≮�.�
+≮�.�; ≮�.�; [B1, B3, B6, P1, V5, V6]; xn--gdh1504g.xn--e92h; ; ;  # ≮�.�
+xn--gdh1504g.xn--e92h; ≮�.�; [B1, B3, B6, V5, V6]; xn--gdh1504g.xn--e92h; ; ;  # ≮�.�
+�ᯛ�｡脥; �ᯛ�.脥; [B1]; xn--ybc101g3m1p.xn--740a; ; ;  # �ᯛ�.脥
+�ᯛ�。脥; �ᯛ�.脥; [B1]; xn--ybc101g3m1p.xn--740a; ; ;  # �ᯛ�.脥
+xn--ybc101g3m1p.xn--740a; �ᯛ�.脥; [B1]; xn--ybc101g3m1p.xn--740a; ; ;  # �ᯛ�.脥
+᭄ᅟ𞷿�.-; ; [B1, B5, P1, V3, V5, V6]; xn--osd971cpx70btgt8b.-; ; ;  # ᭄.-
+xn--osd971cpx70btgt8b.-; ᭄ᅟ𞷿�.-; [B1, B5, V3, V5, V6]; xn--osd971cpx70btgt8b.-; ; ;  # ᭄.-
+‌｡͔; ‌.͔; [C1, V5]; xn--0ug.xn--yua; ; .xn--yua; [V5, A4_2] # .͔
+‌。͔; ‌.͔; [C1, V5]; xn--0ug.xn--yua; ; .xn--yua; [V5, A4_2] # .͔
+.xn--yua; .Í”; [V5, X4_2]; .xn--yua; [V5, A4_2]; ;  # .Í”
+xn--0ug.xn--yua; ‌.͔; [C1, V5]; xn--0ug.xn--yua; ; ;  # .͔
+𞤥󠅮．ᡄႮ; 𞤥.ᡄႮ; [P1, V6]; xn--de6h.xn--mnd799a; ; ;  # 𞤥.ᡄႮ
+𞤥󠅮.ᡄႮ; 𞤥.ᡄႮ; [P1, V6]; xn--de6h.xn--mnd799a; ; ;  # 𞤥.ᡄႮ
+𞤥󠅮.ᡄⴎ; 𞤥.ᡄⴎ; ; xn--de6h.xn--37e857h; ; ;  # 𞤥.ᡄⴎ
+𞤃󠅮.ᡄႮ; 𞤥.ᡄႮ; [P1, V6]; xn--de6h.xn--mnd799a; ; ;  # 𞤥.ᡄႮ
+𞤃󠅮.ᡄⴎ; 𞤥.ᡄⴎ; ; xn--de6h.xn--37e857h; ; ;  # 𞤥.ᡄⴎ
+xn--de6h.xn--37e857h; 𞤥.ᡄⴎ; ; xn--de6h.xn--37e857h; ; ;  # 𞤥.ᡄⴎ
+𞤥.ᡄⴎ; ; ; xn--de6h.xn--37e857h; ; ;  # 𞤥.ᡄⴎ
+𞤃.ᡄႮ; 𞤥.ᡄႮ; [P1, V6]; xn--de6h.xn--mnd799a; ; ;  # 𞤥.ᡄႮ
+𞤃.ᡄⴎ; 𞤥.ᡄⴎ; ; xn--de6h.xn--37e857h; ; ;  # 𞤥.ᡄⴎ
+xn--de6h.xn--mnd799a; 𞤥.ᡄႮ; [V6]; xn--de6h.xn--mnd799a; ; ;  # 𞤥.ᡄႮ
+𞤥󠅮．ᡄⴎ; 𞤥.ᡄⴎ; ; xn--de6h.xn--37e857h; ; ;  # 𞤥.ᡄⴎ
+𞤃󠅮．ᡄႮ; 𞤥.ᡄႮ; [P1, V6]; xn--de6h.xn--mnd799a; ; ;  # 𞤥.ᡄႮ
+𞤃󠅮．ᡄⴎ; 𞤥.ᡄⴎ; ; xn--de6h.xn--37e857h; ; ;  # 𞤥.ᡄⴎ
+𞤥.ᡄႮ; ; [P1, V6]; xn--de6h.xn--mnd799a; ; ;  # 𞤥.ᡄႮ
+𞤧�Ξ．�㛨�; 𞤧�ξ.�㛨�; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+𞤧�Ξ.�㛨�; 𞤧�ξ.�㛨�; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+𞤧�ξ.�㛨�; ; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+𞤅�Ξ.�㛨�; 𞤧�ξ.�㛨�; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+𞤅�ξ.�㛨�; 𞤧�ξ.�㛨�; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+xn--zxa5691vboja.xn--bfi293ci119b; 𞤧�ξ.�㛨�; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+𞤧�ξ．�㛨�; 𞤧�ξ.�㛨�; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+𞤅�Ξ．�㛨�; 𞤧�ξ.�㛨�; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+𞤅�ξ．�㛨�; 𞤧�ξ.�㛨�; [B2, B3, B6]; xn--zxa5691vboja.xn--bfi293ci119b; ; ;  # 𞤧�ξ.�㛨�
+᠆몆‌-｡Ⴛ�︒; ᠆몆‌-.Ⴛ�︒; [B1, B5, B6, C1, P1, V3, V6]; xn----e3j425bsk1o.xn--znd2362jhgh; ; xn----e3j6620g.xn--znd2362jhgh; [B1, B5, B6, P1, V3, V6] # ᠆몆-.Ⴛ�︒
+᠆몆‌-｡Ⴛ�︒; ᠆몆‌-.Ⴛ�︒; [B1, B5, B6, C1, P1, V3, V6]; xn----e3j425bsk1o.xn--znd2362jhgh; ; xn----e3j6620g.xn--znd2362jhgh; [B1, B5, B6, P1, V3, V6] # ᠆몆-.Ⴛ�︒
+᠆몆‌-。Ⴛ�。; ᠆몆‌-.Ⴛ�.; [B1, B5, B6, C1, P1, V3, V6]; xn----e3j425bsk1o.xn--znd4948j.; ; xn----e3j6620g.xn--znd4948j.; [B1, B5, B6, P1, V3, V6] # ᠆몆-.Ⴛ�.
+᠆몆‌-。Ⴛ�。; ᠆몆‌-.Ⴛ�.; [B1, B5, B6, C1, P1, V3, V6]; xn----e3j425bsk1o.xn--znd4948j.; ; xn----e3j6620g.xn--znd4948j.; [B1, B5, B6, P1, V3, V6] # ᠆몆-.Ⴛ�.
+᠆몆‌-。ⴛ�。; ᠆몆‌-.ⴛ�.; [B1, B5, B6, C1, P1, V3, V6]; xn----e3j425bsk1o.xn--jlju661e.; ; xn----e3j6620g.xn--jlju661e.; [B1, B5, B6, P1, V3, V6] # ᠆몆-.ⴛ�.
+᠆몆‌-。ⴛ�。; ᠆몆‌-.ⴛ�.; [B1, B5, B6, C1, P1, V3, V6]; xn----e3j425bsk1o.xn--jlju661e.; ; xn----e3j6620g.xn--jlju661e.; [B1, B5, B6, P1, V3, V6] # ᠆몆-.ⴛ�.
+xn----e3j6620g.xn--jlju661e.; ᠆몆-.ⴛ�.; [B1, B5, B6, V3, V6]; xn----e3j6620g.xn--jlju661e.; ; ;  # ᠆몆-.ⴛ�.
+xn----e3j425bsk1o.xn--jlju661e.; ᠆몆‌-.ⴛ�.; [B1, B5, B6, C1, V3, V6]; xn----e3j425bsk1o.xn--jlju661e.; ; ;  # ᠆몆-.ⴛ�.
+xn----e3j6620g.xn--znd4948j.; ᠆몆-.Ⴛ�.; [B1, B5, B6, V3, V6]; xn----e3j6620g.xn--znd4948j.; ; ;  # ᠆몆-.Ⴛ�.
+xn----e3j425bsk1o.xn--znd4948j.; ᠆몆‌-.Ⴛ�.; [B1, B5, B6, C1, V3, V6]; xn----e3j425bsk1o.xn--znd4948j.; ; ;  # ᠆몆-.Ⴛ�.
+᠆몆‌-｡ⴛ�︒; ᠆몆‌-.ⴛ�︒; [B1, B5, B6, C1, P1, V3, V6]; xn----e3j425bsk1o.xn--jlj4997dhgh; ; xn----e3j6620g.xn--jlj4997dhgh; [B1, B5, B6, P1, V3, V6] # ᠆몆-.ⴛ�︒
+᠆몆‌-｡ⴛ�︒; ᠆몆‌-.ⴛ�︒; [B1, B5, B6, C1, P1, V3, V6]; xn----e3j425bsk1o.xn--jlj4997dhgh; ; xn----e3j6620g.xn--jlj4997dhgh; [B1, B5, B6, P1, V3, V6] # ᠆몆-.ⴛ�︒
+xn----e3j6620g.xn--jlj4997dhgh; ᠆몆-.ⴛ�︒; [B1, B5, B6, V3, V6]; xn----e3j6620g.xn--jlj4997dhgh; ; ;  # ᠆몆-.ⴛ�︒
+xn----e3j425bsk1o.xn--jlj4997dhgh; ᠆몆‌-.ⴛ�︒; [B1, B5, B6, C1, V3, V6]; xn----e3j425bsk1o.xn--jlj4997dhgh; ; ;  # ᠆몆-.ⴛ�︒
+xn----e3j6620g.xn--znd2362jhgh; ᠆몆-.Ⴛ�︒; [B1, B5, B6, V3, V6]; xn----e3j6620g.xn--znd2362jhgh; ; ;  # ᠆몆-.Ⴛ�︒
+xn----e3j425bsk1o.xn--znd2362jhgh; ᠆몆‌-.Ⴛ�︒; [B1, B5, B6, C1, V3, V6]; xn----e3j425bsk1o.xn--znd2362jhgh; ; ;  # ᠆몆-.Ⴛ�︒
+󠾳.︒⥱‌�; ; [B1, C1, P1, V6]; xn--uf66e.xn--0ugz28axl3pqxna; ; xn--uf66e.xn--qtiz073e3ik; [B1, P1, V6] # .︒⥱�
+󠾳.。⥱‌�; 󠾳..⥱‌�; [B1, C1, P1, V6, X4_2]; xn--uf66e..xn--0ugz28as66q; [B1, C1, P1, V6, A4_2]; xn--uf66e..xn--qti2829e; [B1, P1, V6, A4_2] # ..⥱�
+xn--uf66e..xn--qti2829e; 󠾳..⥱�; [B1, V6, X4_2]; xn--uf66e..xn--qti2829e; [B1, V6, A4_2]; ;  # ..⥱�
+xn--uf66e..xn--0ugz28as66q; 󠾳..⥱‌�; [B1, C1, V6, X4_2]; xn--uf66e..xn--0ugz28as66q; [B1, C1, V6, A4_2]; ;  # ..⥱�
+xn--uf66e.xn--qtiz073e3ik; 󠾳.︒⥱�; [B1, V6]; xn--uf66e.xn--qtiz073e3ik; ; ;  # .︒⥱�
+xn--uf66e.xn--0ugz28axl3pqxna; 󠾳.︒⥱‌�; [B1, C1, V6]; xn--uf66e.xn--0ugz28axl3pqxna; ; ;  # .︒⥱�
+�.�Ⴑ񚇜�; ; [B1, P1, V6]; xn--n49c.xn--pnd4619jwicl862o; ; ;  # .�Ⴑ�
+�.�ⴑ񚇜�; ; [B1, P1, V6]; xn--n49c.xn--8kj8702ewicl862o; ; ;  # .�ⴑ�
+xn--n49c.xn--8kj8702ewicl862o; �.�ⴑ񚇜�; [B1, V6]; xn--n49c.xn--8kj8702ewicl862o; ; ;  # .�ⴑ�
+xn--n49c.xn--pnd4619jwicl862o; �.�Ⴑ񚇜�; [B1, V6]; xn--n49c.xn--pnd4619jwicl862o; ; ;  # .�Ⴑ�
+ྤ񱤯．�Ⴛ; ྤ񱤯.1Ⴛ; [P1, V5, V6]; xn--0fd40533g.xn--1-q1g; ; ;  # ྤ.1Ⴛ
+ྤ񱤯.1Ⴛ; ; [P1, V5, V6]; xn--0fd40533g.xn--1-q1g; ; ;  # ྤ.1Ⴛ
+ྤ񱤯.1ⴛ; ; [P1, V5, V6]; xn--0fd40533g.xn--1-tws; ; ;  # ྤ.1ⴛ
+xn--0fd40533g.xn--1-tws; ྤ񱤯.1ⴛ; [V5, V6]; xn--0fd40533g.xn--1-tws; ; ;  # ྤ.1ⴛ
+xn--0fd40533g.xn--1-q1g; ྤ񱤯.1Ⴛ; [V5, V6]; xn--0fd40533g.xn--1-q1g; ; ;  # ྤ.1Ⴛ
+ྤ񱤯．�ⴛ; ྤ񱤯.1ⴛ; [P1, V5, V6]; xn--0fd40533g.xn--1-tws; ; ;  # ྤ.1ⴛ
+-ࠦ齀。릿�; -ࠦ齀.릿�; [B1, B5, B6, P1, V3, V6]; xn----6gd0617i.xn--7y2bm55m; ; ;  # -ࠦ齀.릿
+-ࠦ齀。릿�; -ࠦ齀.릿�; [B1, B5, B6, P1, V3, V6]; xn----6gd0617i.xn--7y2bm55m; ; ;  # -ࠦ齀.릿
+xn----6gd0617i.xn--7y2bm55m; -ࠦ齀.릿�; [B1, B5, B6, V3, V6]; xn----6gd0617i.xn--7y2bm55m; ; ;  # -ࠦ齀.릿
+󠔊ܜ�꾗。����; 󠔊ܜ�꾗.����; [B1, B6, C2, P1, V6]; xn--mnb6558e91kyq533a.xn--1uga46zs309y; ; xn--mnb6558e91kyq533a.xn--6mh27269e; [B1, B6, P1, V6] # ܜ�꾗.�
+󠔊ܜ��ᅬᆾ。����; 󠔊ܜ�꾗.����; [B1, B6, C2, P1, V6]; xn--mnb6558e91kyq533a.xn--1uga46zs309y; ; xn--mnb6558e91kyq533a.xn--6mh27269e; [B1, B6, P1, V6] # ܜ�꾗.�
+xn--mnb6558e91kyq533a.xn--6mh27269e; 󠔊ܜ�꾗.��; [B1, B6, V6]; xn--mnb6558e91kyq533a.xn--6mh27269e; ; ;  # ܜ�꾗.�
+xn--mnb6558e91kyq533a.xn--1uga46zs309y; 󠔊ܜ�꾗.����; [B1, B6, C2, V6]; xn--mnb6558e91kyq533a.xn--1uga46zs309y; ; ;  # ܜ�꾗.�
+≮．-܈--; ≮.-܈--; [B1, P1, V2, V3, V6]; xn--gdh.xn------eqf; ; ;  # ≮.-܈--
+≮．-܈--; ≮.-܈--; [B1, P1, V2, V3, V6]; xn--gdh.xn------eqf; ; ;  # ≮.-܈--
+≮.-܈--; ; [B1, P1, V2, V3, V6]; xn--gdh.xn------eqf; ; ;  # ≮.-܈--
+≮.-܈--; ≮.-܈--; [B1, P1, V2, V3, V6]; xn--gdh.xn------eqf; ; ;  # ≮.-܈--
+xn--gdh.xn------eqf; ≮.-܈--; [B1, V2, V3, V6]; xn--gdh.xn------eqf; ; ;  # ≮.-܈--
+�󠋳。�ς�; �󠋳.�ς7; [B1, C2, P1, V6]; xn--wo0di5177c.xn--7-xmb248s; ; xn--wo0di5177c.xn--7-zmb; [B1, P1, V6] # �.ς7
+�󠋳。�ς7; �󠋳.�ς7; [B1, C2, P1, V6]; xn--wo0di5177c.xn--7-xmb248s; ; xn--wo0di5177c.xn--7-zmb; [B1, P1, V6] # �.ς7
+�󠋳。�Σ7; �󠋳.�σ7; [B1, C2, P1, V6]; xn--wo0di5177c.xn--7-zmb938s; ; xn--wo0di5177c.xn--7-zmb; [B1, P1, V6] # �.σ7
+�󠋳。�σ7; �󠋳.�σ7; [B1, C2, P1, V6]; xn--wo0di5177c.xn--7-zmb938s; ; xn--wo0di5177c.xn--7-zmb; [B1, P1, V6] # �.σ7
+xn--wo0di5177c.xn--7-zmb; �󠋳.σ7; [B1, V6]; xn--wo0di5177c.xn--7-zmb; ; ;  # �.σ7
+xn--wo0di5177c.xn--7-zmb938s; �󠋳.�σ7; [B1, C2, V6]; xn--wo0di5177c.xn--7-zmb938s; ; ;  # �.σ7
+xn--wo0di5177c.xn--7-xmb248s; �󠋳.�ς7; [B1, C2, V6]; xn--wo0di5177c.xn--7-xmb248s; ; ;  # �.ς7
+�󠋳。�Σ�; �󠋳.�σ7; [B1, C2, P1, V6]; xn--wo0di5177c.xn--7-zmb938s; ; xn--wo0di5177c.xn--7-zmb; [B1, P1, V6] # �.σ7
+�󠋳。�σ�; �󠋳.�σ7; [B1, C2, P1, V6]; xn--wo0di5177c.xn--7-zmb938s; ; xn--wo0di5177c.xn--7-zmb; [B1, P1, V6] # �.σ7
+ς򅜌８.𞭤; ς򅜌8.𞭤; [P1, V6]; xn--8-xmb44974n.xn--su6h; ; xn--8-zmb14974n.xn--su6h;  # ς8.
+ς򅜌8.𞭤; ; [P1, V6]; xn--8-xmb44974n.xn--su6h; ; xn--8-zmb14974n.xn--su6h;  # ς8.
+Σ򅜌8.𞭤; σ򅜌8.𞭤; [P1, V6]; xn--8-zmb14974n.xn--su6h; ; ;  # σ8.
+σ򅜌8.𞭤; ; [P1, V6]; xn--8-zmb14974n.xn--su6h; ; ;  # σ8.
+xn--8-zmb14974n.xn--su6h; σ򅜌8.𞭤; [V6]; xn--8-zmb14974n.xn--su6h; ; ;  # σ8.
+xn--8-xmb44974n.xn--su6h; ς򅜌8.𞭤; [V6]; xn--8-xmb44974n.xn--su6h; ; ;  # ς8.
+Σ򅜌８.𞭤; σ򅜌8.𞭤; [P1, V6]; xn--8-zmb14974n.xn--su6h; ; ;  # σ8.
+σ򅜌８.𞭤; σ򅜌8.𞭤; [P1, V6]; xn--8-zmb14974n.xn--su6h; ; ;  # σ8.
+‌ᡑ🄀ڄ．-�𑲤; ‌ᡑ🄀ڄ.-�𑲤; [B1, C1, P1, V3, V6]; xn--9ib722gvtfi563c.xn----ek5i065b; ; xn--9ib722gbw95a.xn----ek5i065b; [B1, B5, B6, P1, V3, V6] # ᡑ🄀ڄ.-�𑲤
+‌ᡑ0.ڄ.-�𑲤; ; [B1, C1, V3]; xn--0-o7j263b.xn--9ib.xn----ek5i065b; ; xn--0-o7j.xn--9ib.xn----ek5i065b; [B1, V3] # ᡑ0.ڄ.-�𑲤
+xn--0-o7j.xn--9ib.xn----ek5i065b; ᡑ0.ڄ.-�𑲤; [B1, V3]; xn--0-o7j.xn--9ib.xn----ek5i065b; ; ;  # ᡑ0.ڄ.-�𑲤
+xn--0-o7j263b.xn--9ib.xn----ek5i065b; ‌ᡑ0.ڄ.-�𑲤; [B1, C1, V3]; xn--0-o7j263b.xn--9ib.xn----ek5i065b; ; ;  # ᡑ0.ڄ.-�𑲤
+xn--9ib722gbw95a.xn----ek5i065b; ᡑ🄀ڄ.-�𑲤; [B1, B5, B6, V3, V6]; xn--9ib722gbw95a.xn----ek5i065b; ; ;  # ᡑ🄀ڄ.-�𑲤
+xn--9ib722gvtfi563c.xn----ek5i065b; ‌ᡑ🄀ڄ.-�𑲤; [B1, C1, V3, V6]; xn--9ib722gvtfi563c.xn----ek5i065b; ; ;  # ᡑ🄀ڄ.-�𑲤
+�。�넯򞵲; �.�넯򞵲; [B2, B3, P1, V6]; xn--4e9e.xn--l60bj21opd57g; ; ;  # �.넯
+�。�넯򞵲; �.�넯򞵲; [B2, B3, P1, V6]; xn--4e9e.xn--l60bj21opd57g; ; ;  # �.넯
+xn--4e9e.xn--l60bj21opd57g; �.�넯򞵲; [B2, B3, V6]; xn--4e9e.xn--l60bj21opd57g; ; ;  # �.넯
+᠇Ⴘ。؃Ⴈ�; ᠇Ⴘ.؃Ⴈ�; [B1, P1, V6]; xn--wnd558a.xn--lfb465c1v87a; ; ;  # ᠇Ⴘ.Ⴈ�
+᠇ⴘ。؃ⴈ�; ᠇ⴘ.؃ⴈ�; [B1, P1, V6]; xn--d6e009h.xn--lfb290rfu3z; ; ;  # ᠇ⴘ.ⴈ�
+xn--d6e009h.xn--lfb290rfu3z; ᠇ⴘ.؃ⴈ�; [B1, V6]; xn--d6e009h.xn--lfb290rfu3z; ; ;  # ᠇ⴘ.ⴈ�
+xn--wnd558a.xn--lfb465c1v87a; ᠇Ⴘ.؃Ⴈ�; [B1, V6]; xn--wnd558a.xn--lfb465c1v87a; ; ;  # ᠇Ⴘ.Ⴈ�
+⒚󠋑𞤰。牣٧Ⴜᣥ; ⒚󠋑𞤰.牣٧Ⴜᣥ; [B1, B5, P1, V6]; xn--cthy466n29j3e.xn--gib404ccxgh00h; ; ;  # ⒚𞤰.牣٧Ⴜᣥ
+19.󠋑𞤰。牣٧Ⴜᣥ; 19.󠋑𞤰.牣٧Ⴜᣥ; [B1, B5, P1, V6]; 19.xn--oe6h75760c.xn--gib404ccxgh00h; ; ;  # 19.𞤰.牣٧Ⴜᣥ
+19.󠋑𞤰。牣٧ⴜᣥ; 19.󠋑𞤰.牣٧ⴜᣥ; [B1, B5, P1, V6]; 19.xn--oe6h75760c.xn--gib285gtxo2l9d; ; ;  # 19.𞤰.牣٧ⴜᣥ
+19.󠋑𞤎。牣٧Ⴜᣥ; 19.󠋑𞤰.牣٧Ⴜᣥ; [B1, B5, P1, V6]; 19.xn--oe6h75760c.xn--gib404ccxgh00h; ; ;  # 19.𞤰.牣٧Ⴜᣥ
+19.󠋑𞤎。牣٧ⴜᣥ; 19.󠋑𞤰.牣٧ⴜᣥ; [B1, B5, P1, V6]; 19.xn--oe6h75760c.xn--gib285gtxo2l9d; ; ;  # 19.𞤰.牣٧ⴜᣥ
+19.xn--oe6h75760c.xn--gib285gtxo2l9d; 19.󠋑𞤰.牣٧ⴜᣥ; [B1, B5, V6]; 19.xn--oe6h75760c.xn--gib285gtxo2l9d; ; ;  # 19.𞤰.牣٧ⴜᣥ
+19.xn--oe6h75760c.xn--gib404ccxgh00h; 19.󠋑𞤰.牣٧Ⴜᣥ; [B1, B5, V6]; 19.xn--oe6h75760c.xn--gib404ccxgh00h; ; ;  # 19.𞤰.牣٧Ⴜᣥ
+⒚󠋑𞤰。牣٧ⴜᣥ; ⒚󠋑𞤰.牣٧ⴜᣥ; [B1, B5, P1, V6]; xn--cthy466n29j3e.xn--gib285gtxo2l9d; ; ;  # ⒚𞤰.牣٧ⴜᣥ
+⒚󠋑𞤎。牣٧Ⴜᣥ; ⒚󠋑𞤰.牣٧Ⴜᣥ; [B1, B5, P1, V6]; xn--cthy466n29j3e.xn--gib404ccxgh00h; ; ;  # ⒚𞤰.牣٧Ⴜᣥ
+⒚󠋑𞤎。牣٧ⴜᣥ; ⒚󠋑𞤰.牣٧ⴜᣥ; [B1, B5, P1, V6]; xn--cthy466n29j3e.xn--gib285gtxo2l9d; ; ;  # ⒚𞤰.牣٧ⴜᣥ
+xn--cthy466n29j3e.xn--gib285gtxo2l9d; ⒚󠋑𞤰.牣٧ⴜᣥ; [B1, B5, V6]; xn--cthy466n29j3e.xn--gib285gtxo2l9d; ; ;  # ⒚𞤰.牣٧ⴜᣥ
+xn--cthy466n29j3e.xn--gib404ccxgh00h; ⒚󠋑𞤰.牣٧Ⴜᣥ; [B1, B5, V6]; xn--cthy466n29j3e.xn--gib404ccxgh00h; ; ;  # ⒚𞤰.牣٧Ⴜᣥ
+-��⒈.Ⴓ; ; [B1, P1, V3, V6]; xn----ecp0206g90h.xn--rnd; ; ;  # -��⒈.Ⴓ
+-��1..Ⴓ; ; [B1, P1, V3, V6, X4_2]; xn---1-895nq11a..xn--rnd; [B1, P1, V3, V6, A4_2]; ;  # -��1..Ⴓ
+-��1..ⴓ; ; [B1, V3, X4_2]; xn---1-895nq11a..xn--blj; [B1, V3, A4_2]; ;  # -��1..ⴓ
+xn---1-895nq11a..xn--blj; -��1..ⴓ; [B1, V3, X4_2]; xn---1-895nq11a..xn--blj; [B1, V3, A4_2]; ;  # -��1..ⴓ
+xn---1-895nq11a..xn--rnd; -��1..Ⴓ; [B1, V3, V6, X4_2]; xn---1-895nq11a..xn--rnd; [B1, V3, V6, A4_2]; ;  # -��1..Ⴓ
+-��⒈.ⴓ; ; [B1, P1, V3, V6]; xn----ecp0206g90h.xn--blj; ; ;  # -��⒈.ⴓ
+xn----ecp0206g90h.xn--blj; -��⒈.ⴓ; [B1, V3, V6]; xn----ecp0206g90h.xn--blj; ; ;  # -��⒈.ⴓ
+xn----ecp0206g90h.xn--rnd; -��⒈.Ⴓ; [B1, V3, V6]; xn----ecp0206g90h.xn--rnd; ; ;  # -��⒈.Ⴓ
+‌긃.榶-; ; [C1, V3]; xn--0ug3307c.xn----d87b; ; xn--ej0b.xn----d87b; [V3] # 긃.榶-
+‌긃.榶-; ‌긃.榶-; [C1, V3]; xn--0ug3307c.xn----d87b; ; xn--ej0b.xn----d87b; [V3] # 긃.榶-
+xn--ej0b.xn----d87b; 긃.榶-; [V3]; xn--ej0b.xn----d87b; ; ;  # 긃.榶-
+xn--0ug3307c.xn----d87b; ‌긃.榶-; [C1, V3]; xn--0ug3307c.xn----d87b; ; ;  # 긃.榶-
+뉓泓𜵽.��; ; [P1, V5, V6]; xn--lwwp69lqs7m.xn--b7b605i; ; xn--lwwp69lqs7m.xn--b7b;  # 뉓泓.�
+뉓泓𜵽.��; 뉓泓𜵽.��; [P1, V5, V6]; xn--lwwp69lqs7m.xn--b7b605i; ; xn--lwwp69lqs7m.xn--b7b;  # 뉓泓.�
+xn--lwwp69lqs7m.xn--b7b; 뉓泓𜵽.�; [V5, V6]; xn--lwwp69lqs7m.xn--b7b; ; ;  # 뉓泓.�
+xn--lwwp69lqs7m.xn--b7b605i; 뉓泓𜵽.��; [V5, V6]; xn--lwwp69lqs7m.xn--b7b605i; ; ;  # 뉓泓.�
+��ß｡ິ⭵񪅌; ��ß.ິ⭵񪅌; [B1, C2, P1, V5, V6]; xn--zca770nip7n.xn--57c638l8774i; ; xn--ss-ti3o.xn--57c638l8774i; [B1, P1, V5, V6] # �ß.ິ
+��ß。ິ⭵񪅌; ��ß.ິ⭵񪅌; [B1, C2, P1, V5, V6]; xn--zca770nip7n.xn--57c638l8774i; ; xn--ss-ti3o.xn--57c638l8774i; [B1, P1, V5, V6] # �ß.ິ
+��SS。ິ⭵񪅌; ��ss.ິ⭵񪅌; [B1, C2, P1, V5, V6]; xn--ss-l1t5169j.xn--57c638l8774i; ; xn--ss-ti3o.xn--57c638l8774i; [B1, P1, V5, V6] # �ss.ິ
+��ss。ິ⭵񪅌; ��ss.ິ⭵񪅌; [B1, C2, P1, V5, V6]; xn--ss-l1t5169j.xn--57c638l8774i; ; xn--ss-ti3o.xn--57c638l8774i; [B1, P1, V5, V6] # �ss.ິ
+��Ss。ິ⭵񪅌; ��ss.ິ⭵񪅌; [B1, C2, P1, V5, V6]; xn--ss-l1t5169j.xn--57c638l8774i; ; xn--ss-ti3o.xn--57c638l8774i; [B1, P1, V5, V6] # �ss.ິ
+xn--ss-ti3o.xn--57c638l8774i; �ss.ິ⭵񪅌; [B1, V5, V6]; xn--ss-ti3o.xn--57c638l8774i; ; ;  # �ss.ິ
+xn--ss-l1t5169j.xn--57c638l8774i; ��ss.ິ⭵񪅌; [B1, C2, V5, V6]; xn--ss-l1t5169j.xn--57c638l8774i; ; ;  # �ss.ິ
+xn--zca770nip7n.xn--57c638l8774i; ��ß.ິ⭵񪅌; [B1, C2, V5, V6]; xn--zca770nip7n.xn--57c638l8774i; ; ;  # �ß.ິ
+��SS｡ິ⭵񪅌; ��ss.ິ⭵񪅌; [B1, C2, P1, V5, V6]; xn--ss-l1t5169j.xn--57c638l8774i; ; xn--ss-ti3o.xn--57c638l8774i; [B1, P1, V5, V6] # �ss.ິ
+��ss｡ິ⭵񪅌; ��ss.ິ⭵񪅌; [B1, C2, P1, V5, V6]; xn--ss-l1t5169j.xn--57c638l8774i; ; xn--ss-ti3o.xn--57c638l8774i; [B1, P1, V5, V6] # �ss.ິ
+��Ss｡ິ⭵񪅌; ��ss.ິ⭵񪅌; [B1, C2, P1, V5, V6]; xn--ss-l1t5169j.xn--57c638l8774i; ; xn--ss-ti3o.xn--57c638l8774i; [B1, P1, V5, V6] # �ss.ິ
+᭄．᮪-≮≠; ᭄.᮪-≮≠; [P1, V5, V6]; xn--1uf.xn----nmlz65aub; ; ;  # ᭄.᮪-≮≠
+᭄．᮪-≮≠; ᭄.᮪-≮≠; [P1, V5, V6]; xn--1uf.xn----nmlz65aub; ; ;  # ᭄.᮪-≮≠
+᭄.᮪-≮≠; ; [P1, V5, V6]; xn--1uf.xn----nmlz65aub; ; ;  # ᭄.᮪-≮≠
+᭄.᮪-≮≠; ᭄.᮪-≮≠; [P1, V5, V6]; xn--1uf.xn----nmlz65aub; ; ;  # ᭄.᮪-≮≠
+xn--1uf.xn----nmlz65aub; ᭄.᮪-≮≠; [V5, V6]; xn--1uf.xn----nmlz65aub; ; ;  # ᭄.᮪-≮≠
+᯳Ⴑᅟ．𑄴Ⅎ; ᯳Ⴑᅟ.𑄴Ⅎ; [P1, V5, V6]; xn--pnd26a55x.xn--f3g7465g; ; ;  # ᯳Ⴑ.𑄴Ⅎ
+᯳Ⴑᅟ.𑄴Ⅎ; ; [P1, V5, V6]; xn--pnd26a55x.xn--f3g7465g; ; ;  # ᯳Ⴑ.𑄴Ⅎ
+᯳ⴑᅟ.𑄴ⅎ; ; [P1, V5, V6]; xn--osd925cvyn.xn--73g3065g; ; ;  # ᯳ⴑ.𑄴ⅎ
+᯳Ⴑᅟ.𑄴ⅎ; ; [P1, V5, V6]; xn--pnd26a55x.xn--73g3065g; ; ;  # ᯳Ⴑ.𑄴ⅎ
+xn--pnd26a55x.xn--73g3065g; ᯳Ⴑᅟ.𑄴ⅎ; [V5, V6]; xn--pnd26a55x.xn--73g3065g; ; ;  # ᯳Ⴑ.𑄴ⅎ
+xn--osd925cvyn.xn--73g3065g; ᯳ⴑᅟ.𑄴ⅎ; [V5, V6]; xn--osd925cvyn.xn--73g3065g; ; ;  # ᯳ⴑ.𑄴ⅎ
+xn--pnd26a55x.xn--f3g7465g; ᯳Ⴑᅟ.𑄴Ⅎ; [V5, V6]; xn--pnd26a55x.xn--f3g7465g; ; ;  # ᯳Ⴑ.𑄴Ⅎ
+᯳ⴑᅟ．𑄴ⅎ; ᯳ⴑᅟ.𑄴ⅎ; [P1, V5, V6]; xn--osd925cvyn.xn--73g3065g; ; ;  # ᯳ⴑ.𑄴ⅎ
+᯳Ⴑᅟ．𑄴ⅎ; ᯳Ⴑᅟ.𑄴ⅎ; [P1, V5, V6]; xn--pnd26a55x.xn--73g3065g; ; ;  # ᯳Ⴑ.𑄴ⅎ
+𜉆。Ⴃ��똯; 𜉆.Ⴃ��똯; [B5, P1, V6]; xn--187g.xn--bnd4785f8r8bdeb; ; ;  # .Ⴃ��똯
+𜉆。Ⴃ��똯; 𜉆.Ⴃ��똯; [B5, P1, V6]; xn--187g.xn--bnd4785f8r8bdeb; ; ;  # .Ⴃ��똯
+𜉆。ⴃ��똯; 𜉆.ⴃ��똯; [B5, P1, V6]; xn--187g.xn--ukjy205b8rscdeb; ; ;  # .ⴃ��똯
+𜉆。ⴃ��똯; 𜉆.ⴃ��똯; [B5, P1, V6]; xn--187g.xn--ukjy205b8rscdeb; ; ;  # .ⴃ��똯
+xn--187g.xn--ukjy205b8rscdeb; 𜉆.ⴃ��똯; [B5, V6]; xn--187g.xn--ukjy205b8rscdeb; ; ;  # .ⴃ��똯
+xn--187g.xn--bnd4785f8r8bdeb; 𜉆.Ⴃ��똯; [B5, V6]; xn--187g.xn--bnd4785f8r8bdeb; ; ;  # .Ⴃ��똯
+�｡⳻󠙾󠄷ㅤ; �.⳻󠙾ㅤ; [B1, P1, V6]; xn--pw9c.xn--mkj83l4v899a; ; ;  # �.⳻
+�。⳻󠙾󠄷ᅠ; �.⳻󠙾ᅠ; [B1, P1, V6]; xn--pw9c.xn--psd742lxt32w; ; ;  # �.⳻
+xn--pw9c.xn--psd742lxt32w; �.⳻󠙾ᅠ; [B1, V6]; xn--pw9c.xn--psd742lxt32w; ; ;  # �.⳻
+xn--pw9c.xn--mkj83l4v899a; �.⳻󠙾ㅤ; [B1, V6]; xn--pw9c.xn--mkj83l4v899a; ; ;  # �.⳻
+ޚ⾇．ܞ-�; ޚ舛.ܞ-�; [B2, B3]; xn--7qb6383d.xn----20c3154q; ; ;  # ޚ舛.ܞ-�
+ޚ舛.ܞ-�; ; [B2, B3]; xn--7qb6383d.xn----20c3154q; ; ;  # ޚ舛.ܞ-�
+xn--7qb6383d.xn----20c3154q; ޚ舛.ܞ-�; [B2, B3]; xn--7qb6383d.xn----20c3154q; ; ;  # ޚ舛.ܞ-�
+Ⴉ猕󹛫≮．︒; Ⴉ猕󹛫≮.︒; [P1, V6]; xn--hnd212gz32d54x5r.xn--y86c; ; ;  # Ⴉ猕≮.︒
+Ⴉ猕󹛫≮．︒; Ⴉ猕󹛫≮.︒; [P1, V6]; xn--hnd212gz32d54x5r.xn--y86c; ; ;  # Ⴉ猕≮.︒
+Ⴉ猕󹛫≮.。; Ⴉ猕󹛫≮..; [P1, V6, X4_2]; xn--hnd212gz32d54x5r..; [P1, V6, A4_2]; ;  # Ⴉ猕≮..
+Ⴉ猕󹛫≮.。; Ⴉ猕󹛫≮..; [P1, V6, X4_2]; xn--hnd212gz32d54x5r..; [P1, V6, A4_2]; ;  # Ⴉ猕≮..
+ⴉ猕󹛫≮.。; ⴉ猕󹛫≮..; [P1, V6, X4_2]; xn--gdh892bbz0d5438s..; [P1, V6, A4_2]; ;  # ⴉ猕≮..
+ⴉ猕󹛫≮.。; ⴉ猕󹛫≮..; [P1, V6, X4_2]; xn--gdh892bbz0d5438s..; [P1, V6, A4_2]; ;  # ⴉ猕≮..
+xn--gdh892bbz0d5438s..; ⴉ猕󹛫≮..; [V6, X4_2]; xn--gdh892bbz0d5438s..; [V6, A4_2]; ;  # ⴉ猕≮..
+xn--hnd212gz32d54x5r..; Ⴉ猕󹛫≮..; [V6, X4_2]; xn--hnd212gz32d54x5r..; [V6, A4_2]; ;  # Ⴉ猕≮..
+ⴉ猕󹛫≮．︒; ⴉ猕󹛫≮.︒; [P1, V6]; xn--gdh892bbz0d5438s.xn--y86c; ; ;  # ⴉ猕≮.︒
+ⴉ猕󹛫≮．︒; ⴉ猕󹛫≮.︒; [P1, V6]; xn--gdh892bbz0d5438s.xn--y86c; ; ;  # ⴉ猕≮.︒
+xn--gdh892bbz0d5438s.xn--y86c; ⴉ猕󹛫≮.︒; [V6]; xn--gdh892bbz0d5438s.xn--y86c; ; ;  # ⴉ猕≮.︒
+xn--hnd212gz32d54x5r.xn--y86c; Ⴉ猕󹛫≮.︒; [V6]; xn--hnd212gz32d54x5r.xn--y86c; ; ;  # Ⴉ猕≮.︒
+�｡ث鳳ߢ󠅉; �.ث鳳ߢ; [B1, B2]; xn--8m8h.xn--qgb29f6z90a; ; ;  # �.ث鳳ߢ
+�。ث鳳ߢ󠅉; �.ث鳳ߢ; [B1, B2]; xn--8m8h.xn--qgb29f6z90a; ; ;  # �.ث鳳ߢ
+xn--8m8h.xn--qgb29f6z90a; �.ث鳳ߢ; [B1, B2]; xn--8m8h.xn--qgb29f6z90a; ; ;  # �.ث鳳ߢ
+��。ß; ��.ß; [B1, C2]; xn--1ug9105g.xn--zca; ; xn--uo0d.ss; [B1] # �.ß
+��。SS; ��.ss; [B1, C2]; xn--1ug9105g.ss; ; xn--uo0d.ss; [B1] # �.ss
+��。ss; ��.ss; [B1, C2]; xn--1ug9105g.ss; ; xn--uo0d.ss; [B1] # �.ss
+��。Ss; ��.ss; [B1, C2]; xn--1ug9105g.ss; ; xn--uo0d.ss; [B1] # �.ss
+xn--uo0d.ss; �.ss; [B1]; xn--uo0d.ss; ; ;  # �.ss
+xn--1ug9105g.ss; ��.ss; [B1, C2]; xn--1ug9105g.ss; ; ;  # �.ss
+xn--1ug9105g.xn--zca; ��.ß; [B1, C2]; xn--1ug9105g.xn--zca; ; ;  # �.ß
+Å둄-．‌; å둄-.‌; [C1, V3]; xn----1fa1788k.xn--0ug; ; xn----1fa1788k.; [V3] # å둄-.
+Å둄-．‌; å둄-.‌; [C1, V3]; xn----1fa1788k.xn--0ug; ; xn----1fa1788k.; [V3] # å둄-.
+Å둄-.‌; å둄-.‌; [C1, V3]; xn----1fa1788k.xn--0ug; ; xn----1fa1788k.; [V3] # å둄-.
+Å둄-.‌; å둄-.‌; [C1, V3]; xn----1fa1788k.xn--0ug; ; xn----1fa1788k.; [V3] # å둄-.
+å둄-.‌; å둄-.‌; [C1, V3]; xn----1fa1788k.xn--0ug; ; xn----1fa1788k.; [V3] # å둄-.
+å둄-.‌; ; [C1, V3]; xn----1fa1788k.xn--0ug; ; xn----1fa1788k.; [V3] # å둄-.
+xn----1fa1788k.; å둄-.; [V3]; xn----1fa1788k.; ; ;  # å둄-.
+xn----1fa1788k.xn--0ug; å둄-.‌; [C1, V3]; xn----1fa1788k.xn--0ug; ; ;  # å둄-.
+å둄-．‌; å둄-.‌; [C1, V3]; xn----1fa1788k.xn--0ug; ; xn----1fa1788k.; [V3] # å둄-.
+å둄-．‌; å둄-.‌; [C1, V3]; xn----1fa1788k.xn--0ug; ; xn----1fa1788k.; [V3] # å둄-.
+゙򬎑ᷗ𞤀.򱲢-॓; ゙򬎑ᷗ𞤢.򱲢-॓; [B1, B6, P1, V5, V6]; xn--veg121fwg63altj9d.xn----eyd92688s; ; ;  # ゙ᷗ𞤢.-॓
+゙򬎑ᷗ𞤢.򱲢-॓; ; [B1, B6, P1, V5, V6]; xn--veg121fwg63altj9d.xn----eyd92688s; ; ;  # ゙ᷗ𞤢.-॓
+xn--veg121fwg63altj9d.xn----eyd92688s; ゙򬎑ᷗ𞤢.򱲢-॓; [B1, B6, V5, V6]; xn--veg121fwg63altj9d.xn----eyd92688s; ; ;  # ゙ᷗ𞤢.-॓
+ς.ß񴱄�⵿; ; [B5, B6, P1, V6]; xn--3xa.xn--zca281az71b8x73m; ; xn--4xa.xn--ss-y8d4760biv60n;  # ς.ß⵿
+Σ.SS񴱄�⵿; σ.ss񴱄�⵿; [B5, B6, P1, V6]; xn--4xa.xn--ss-y8d4760biv60n; ; ;  # σ.ss⵿
+σ.ss񴱄�⵿; ; [B5, B6, P1, V6]; xn--4xa.xn--ss-y8d4760biv60n; ; ;  # σ.ss⵿
+Σ.ss񴱄�⵿; σ.ss񴱄�⵿; [B5, B6, P1, V6]; xn--4xa.xn--ss-y8d4760biv60n; ; ;  # σ.ss⵿
+xn--4xa.xn--ss-y8d4760biv60n; σ.ss񴱄�⵿; [B5, B6, V6]; xn--4xa.xn--ss-y8d4760biv60n; ; ;  # σ.ss⵿
+Σ.ß񴱄�⵿; σ.ß񴱄�⵿; [B5, B6, P1, V6]; xn--4xa.xn--zca281az71b8x73m; ; xn--4xa.xn--ss-y8d4760biv60n;  # σ.ß⵿
+σ.ß񴱄�⵿; ; [B5, B6, P1, V6]; xn--4xa.xn--zca281az71b8x73m; ; xn--4xa.xn--ss-y8d4760biv60n;  # σ.ß⵿
+xn--4xa.xn--zca281az71b8x73m; σ.ß񴱄�⵿; [B5, B6, V6]; xn--4xa.xn--zca281az71b8x73m; ; ;  # σ.ß⵿
+xn--3xa.xn--zca281az71b8x73m; ς.ß񴱄�⵿; [B5, B6, V6]; xn--3xa.xn--zca281az71b8x73m; ; ;  # ς.ß⵿
+ꡀ𞀟｡٫֙; ꡀ𞀟.٫֙; [B1]; xn--8b9a1720d.xn--kcb33b; ; ;  # ꡀ𞀟.٫֙
+ꡀ𞀟。٫֙; ꡀ𞀟.٫֙; [B1]; xn--8b9a1720d.xn--kcb33b; ; ;  # ꡀ𞀟.٫֙
+xn--8b9a1720d.xn--kcb33b; ꡀ𞀟.٫֙; [B1]; xn--8b9a1720d.xn--kcb33b; ; ;  # ꡀ𞀟.٫֙
+򈛉‌ࢩ｡⧅񘘡-�; 򈛉‌ࢩ.⧅񘘡-�; [B1, B5, B6, C1, P1, V6]; xn--yyb780jll63m.xn----zir1232guu71b; ; xn--yyb56242i.xn----zir1232guu71b; [B1, B5, B6, P1, V6] # ࢩ.⧅-�
+򈛉‌ࢩ。⧅񘘡-�; 򈛉‌ࢩ.⧅񘘡-�; [B1, B5, B6, C1, P1, V6]; xn--yyb780jll63m.xn----zir1232guu71b; ; xn--yyb56242i.xn----zir1232guu71b; [B1, B5, B6, P1, V6] # ࢩ.⧅-�
+xn--yyb56242i.xn----zir1232guu71b; 򈛉ࢩ.⧅񘘡-�; [B1, B5, B6, V6]; xn--yyb56242i.xn----zir1232guu71b; ; ;  # ࢩ.⧅-�
+xn--yyb780jll63m.xn----zir1232guu71b; 򈛉‌ࢩ.⧅񘘡-�; [B1, B5, B6, C1, V6]; xn--yyb780jll63m.xn----zir1232guu71b; ; ;  # ࢩ.⧅-�
+룱��‌。�︒; 룱��‌.�︒; [C1, C2, P1, V5, V6]; xn--0ugb3358ili2v.xn--y86cl899a; ; xn--ct2b0738h.xn--y86cl899a; [P1, V5, V6] # 룱�.�︒
+룱��‌。�︒; 룱��‌.�︒; [C1, C2, P1, V5, V6]; xn--0ugb3358ili2v.xn--y86cl899a; ; xn--ct2b0738h.xn--y86cl899a; [P1, V5, V6] # 룱�.�︒
+룱��‌。�。; 룱��‌.�.; [C1, C2, P1, V5, V6]; xn--0ugb3358ili2v.xn--772h.; ; xn--ct2b0738h.xn--772h.; [P1, V5, V6] # 룱�.�.
+룱��‌。�。; 룱��‌.�.; [C1, C2, P1, V5, V6]; xn--0ugb3358ili2v.xn--772h.; ; xn--ct2b0738h.xn--772h.; [P1, V5, V6] # 룱�.�.
+xn--ct2b0738h.xn--772h.; 룱�.�.; [V5, V6]; xn--ct2b0738h.xn--772h.; ; ;  # 룱�.�.
+xn--0ugb3358ili2v.xn--772h.; 룱��‌.�.; [C1, C2, V5, V6]; xn--0ugb3358ili2v.xn--772h.; ; ;  # 룱�.�.
+xn--ct2b0738h.xn--y86cl899a; 룱�.�︒; [V5, V6]; xn--ct2b0738h.xn--y86cl899a; ; ;  # 룱�.�︒
+xn--0ugb3358ili2v.xn--y86cl899a; 룱��‌.�︒; [C1, C2, V5, V6]; xn--0ugb3358ili2v.xn--y86cl899a; ; ;  # 룱�.�︒
+🄄．᳜⒈ß; 🄄.᳜⒈ß; [P1, V5, V6]; xn--x07h.xn--zca344lmif; ; xn--x07h.xn--ss-k1r094b;  # 🄄.᳜⒈ß
+3,.᳜1.ß; ; [P1, V5, V6]; 3,.xn--1-43l.xn--zca; ; 3,.xn--1-43l.ss;  # 3,.᳜1.ß
+3,.᳜1.SS; 3,.᳜1.ss; [P1, V5, V6]; 3,.xn--1-43l.ss; ; ;  # 3,.᳜1.ss
+3,.᳜1.ss; ; [P1, V5, V6]; 3,.xn--1-43l.ss; ; ;  # 3,.᳜1.ss
+3,.᳜1.Ss; 3,.᳜1.ss; [P1, V5, V6]; 3,.xn--1-43l.ss; ; ;  # 3,.᳜1.ss
+3,.xn--1-43l.ss; 3,.᳜1.ss; [P1, V5, V6]; 3,.xn--1-43l.ss; ; ;  # 3,.᳜1.ss
+3,.xn--1-43l.xn--zca; 3,.᳜1.ß; [P1, V5, V6]; 3,.xn--1-43l.xn--zca; ; ;  # 3,.᳜1.ß
+🄄．᳜⒈SS; 🄄.᳜⒈ss; [P1, V5, V6]; xn--x07h.xn--ss-k1r094b; ; ;  # 🄄.᳜⒈ss
+🄄．᳜⒈ss; 🄄.᳜⒈ss; [P1, V5, V6]; xn--x07h.xn--ss-k1r094b; ; ;  # 🄄.᳜⒈ss
+🄄．᳜⒈Ss; 🄄.᳜⒈ss; [P1, V5, V6]; xn--x07h.xn--ss-k1r094b; ; ;  # 🄄.᳜⒈ss
+xn--x07h.xn--ss-k1r094b; 🄄.᳜⒈ss; [V5, V6]; xn--x07h.xn--ss-k1r094b; ; ;  # 🄄.᳜⒈ss
+xn--x07h.xn--zca344lmif; 🄄.᳜⒈ß; [V5, V6]; xn--x07h.xn--zca344lmif; ; ;  # 🄄.᳜⒈ß
+�⵿｡𞼓򡄨�; �⵿.𞼓򡄨�; [B2, B3, P1, V6]; xn--eoj16016a.xn--0v1d3848a3lr0d; ; ;  # ⵿.�
+�⵿。𞼓򡄨�; �⵿.𞼓򡄨�; [B2, B3, P1, V6]; xn--eoj16016a.xn--0v1d3848a3lr0d; ; ;  # ⵿.�
+xn--eoj16016a.xn--0v1d3848a3lr0d; �⵿.𞼓򡄨�; [B2, B3, V6]; xn--eoj16016a.xn--0v1d3848a3lr0d; ; ;  # ⵿.�
+်᷽�．≠�㇛; ်�᷽.≠�㇛; [C2, P1, V5, V6]; xn--n3b956a9zm.xn--1ug63gz5w; ; xn--n3b956a9zm.xn--1ch912d; [P1, V5, V6] # ်�᷽.≠㇛
+်�᷽．≠�㇛; ်�᷽.≠�㇛; [C2, P1, V5, V6]; xn--n3b956a9zm.xn--1ug63gz5w; ; xn--n3b956a9zm.xn--1ch912d; [P1, V5, V6] # ်�᷽.≠㇛
+်�᷽．≠�㇛; ်�᷽.≠�㇛; [C2, P1, V5, V6]; xn--n3b956a9zm.xn--1ug63gz5w; ; xn--n3b956a9zm.xn--1ch912d; [P1, V5, V6] # ်�᷽.≠㇛
+်�᷽.≠�㇛; ; [C2, P1, V5, V6]; xn--n3b956a9zm.xn--1ug63gz5w; ; xn--n3b956a9zm.xn--1ch912d; [P1, V5, V6] # ်�᷽.≠㇛
+်�᷽.≠�㇛; ်�᷽.≠�㇛; [C2, P1, V5, V6]; xn--n3b956a9zm.xn--1ug63gz5w; ; xn--n3b956a9zm.xn--1ch912d; [P1, V5, V6] # ်�᷽.≠㇛
+xn--n3b956a9zm.xn--1ch912d; ်�᷽.≠㇛; [V5, V6]; xn--n3b956a9zm.xn--1ch912d; ; ;  # ်�᷽.≠㇛
+xn--n3b956a9zm.xn--1ug63gz5w; ်�᷽.≠�㇛; [C2, V5, V6]; xn--n3b956a9zm.xn--1ug63gz5w; ; ;  # ်�᷽.≠㇛
+Ⴁ�娤.�̼٢𑖿; ; [B1, C2, P1, V6]; xn--8md2578ag21g.xn--9ta62ngt6aou8t; ; xn--8md2578ag21g.xn--9ta62nrv36a; [B1, P1, V5, V6] # Ⴁ�娤.̼٢𑖿
+��娤.�̼٢𑖿; ; [B1, C2]; xn--skjw75lg29h.xn--9ta62ngt6aou8t; ; xn--skjw75lg29h.xn--9ta62nrv36a; [B1, V5] # ��娤.̼٢𑖿
+xn--skjw75lg29h.xn--9ta62nrv36a; ��娤.̼٢𑖿; [B1, V5]; xn--skjw75lg29h.xn--9ta62nrv36a; ; ;  # ��娤.̼٢𑖿
+xn--skjw75lg29h.xn--9ta62ngt6aou8t; ��娤.�̼٢𑖿; [B1, C2]; xn--skjw75lg29h.xn--9ta62ngt6aou8t; ; ;  # ��娤.̼٢𑖿
+xn--8md2578ag21g.xn--9ta62nrv36a; Ⴁ�娤.̼٢𑖿; [B1, V5, V6]; xn--8md2578ag21g.xn--9ta62nrv36a; ; ;  # Ⴁ�娤.̼٢𑖿
+xn--8md2578ag21g.xn--9ta62ngt6aou8t; Ⴁ�娤.�̼٢𑖿; [B1, C2, V6]; xn--8md2578ag21g.xn--9ta62ngt6aou8t; ; ;  # Ⴁ�娤.̼٢𑖿
+🄀Ⴄ٩ࠠ。⒈ྶß; 🄀Ⴄ٩ࠠ.⒈ྶß; [B1, P1, V6]; xn--iib29f26o6n43c.xn--zca117e3vp; ; xn--iib29f26o6n43c.xn--ss-1sj588o;  # 🄀Ⴄ٩ࠠ.⒈ྶß
+0.Ⴄ٩ࠠ。1.ྶß; 0.Ⴄ٩ࠠ.1.ྶß; [B1, B5, B6, P1, V5, V6]; 0.xn--iib29f26o.1.xn--zca117e; ; 0.xn--iib29f26o.1.xn--ss-1sj;  # 0.Ⴄ٩ࠠ.1.ྶß
+0.ⴄ٩ࠠ。1.ྶß; 0.ⴄ٩ࠠ.1.ྶß; [B1, B5, B6, V5]; 0.xn--iib29fp25e.1.xn--zca117e; ; 0.xn--iib29fp25e.1.xn--ss-1sj;  # 0.ⴄ٩ࠠ.1.ྶß
+0.Ⴄ٩ࠠ。1.ྶSS; 0.Ⴄ٩ࠠ.1.ྶss; [B1, B5, B6, P1, V5, V6]; 0.xn--iib29f26o.1.xn--ss-1sj; ; ;  # 0.Ⴄ٩ࠠ.1.ྶss
+0.ⴄ٩ࠠ。1.ྶss; 0.ⴄ٩ࠠ.1.ྶss; [B1, B5, B6, V5]; 0.xn--iib29fp25e.1.xn--ss-1sj; ; ;  # 0.ⴄ٩ࠠ.1.ྶss
+0.Ⴄ٩ࠠ。1.ྶSs; 0.Ⴄ٩ࠠ.1.ྶss; [B1, B5, B6, P1, V5, V6]; 0.xn--iib29f26o.1.xn--ss-1sj; ; ;  # 0.Ⴄ٩ࠠ.1.ྶss
+0.xn--iib29f26o.1.xn--ss-1sj; 0.Ⴄ٩ࠠ.1.ྶss; [B1, B5, B6, V5, V6]; 0.xn--iib29f26o.1.xn--ss-1sj; ; ;  # 0.Ⴄ٩ࠠ.1.ྶss
+0.xn--iib29fp25e.1.xn--ss-1sj; 0.ⴄ٩ࠠ.1.ྶss; [B1, B5, B6, V5]; 0.xn--iib29fp25e.1.xn--ss-1sj; ; ;  # 0.ⴄ٩ࠠ.1.ྶss
+0.xn--iib29fp25e.1.xn--zca117e; 0.ⴄ٩ࠠ.1.ྶß; [B1, B5, B6, V5]; 0.xn--iib29fp25e.1.xn--zca117e; ; ;  # 0.ⴄ٩ࠠ.1.ྶß
+0.xn--iib29f26o.1.xn--zca117e; 0.Ⴄ٩ࠠ.1.ྶß; [B1, B5, B6, V5, V6]; 0.xn--iib29f26o.1.xn--zca117e; ; ;  # 0.Ⴄ٩ࠠ.1.ྶß
+🄀ⴄ٩ࠠ。⒈ྶß; 🄀ⴄ٩ࠠ.⒈ྶß; [B1, P1, V6]; xn--iib29fp25e0219a.xn--zca117e3vp; ; xn--iib29fp25e0219a.xn--ss-1sj588o;  # 🄀ⴄ٩ࠠ.⒈ྶß
+🄀Ⴄ٩ࠠ。⒈ྶSS; 🄀Ⴄ٩ࠠ.⒈ྶss; [B1, P1, V6]; xn--iib29f26o6n43c.xn--ss-1sj588o; ; ;  # 🄀Ⴄ٩ࠠ.⒈ྶss
+🄀ⴄ٩ࠠ。⒈ྶss; 🄀ⴄ٩ࠠ.⒈ྶss; [B1, P1, V6]; xn--iib29fp25e0219a.xn--ss-1sj588o; ; ;  # 🄀ⴄ٩ࠠ.⒈ྶss
+🄀Ⴄ٩ࠠ。⒈ྶSs; 🄀Ⴄ٩ࠠ.⒈ྶss; [B1, P1, V6]; xn--iib29f26o6n43c.xn--ss-1sj588o; ; ;  # 🄀Ⴄ٩ࠠ.⒈ྶss
+xn--iib29f26o6n43c.xn--ss-1sj588o; 🄀Ⴄ٩ࠠ.⒈ྶss; [B1, V6]; xn--iib29f26o6n43c.xn--ss-1sj588o; ; ;  # 🄀Ⴄ٩ࠠ.⒈ྶss
+xn--iib29fp25e0219a.xn--ss-1sj588o; 🄀ⴄ٩ࠠ.⒈ྶss; [B1, V6]; xn--iib29fp25e0219a.xn--ss-1sj588o; ; ;  # 🄀ⴄ٩ࠠ.⒈ྶss
+xn--iib29fp25e0219a.xn--zca117e3vp; 🄀ⴄ٩ࠠ.⒈ྶß; [B1, V6]; xn--iib29fp25e0219a.xn--zca117e3vp; ; ;  # 🄀ⴄ٩ࠠ.⒈ྶß
+xn--iib29f26o6n43c.xn--zca117e3vp; 🄀Ⴄ٩ࠠ.⒈ྶß; [B1, V6]; xn--iib29f26o6n43c.xn--zca117e3vp; ; ;  # 🄀Ⴄ٩ࠠ.⒈ྶß
+≠.‌-٫; ; [B1, C1, P1, V6]; xn--1ch.xn----vqc597q; ; xn--1ch.xn----vqc; [B1, P1, V3, V6] # ≠.-٫
+≠.‌-٫; ≠.‌-٫; [B1, C1, P1, V6]; xn--1ch.xn----vqc597q; ; xn--1ch.xn----vqc; [B1, P1, V3, V6] # ≠.-٫
+xn--1ch.xn----vqc; ≠.-٫; [B1, V3, V6]; xn--1ch.xn----vqc; ; ;  # ≠.-٫
+xn--1ch.xn----vqc597q; ≠.‌-٫; [B1, C1, V6]; xn--1ch.xn----vqc597q; ; ;  # ≠.-٫
+٠۱｡󠳶�٥; ٠۱.󠳶�٥; [B1, P1, V6]; xn--8hb40a.xn--eib7967vner3e; ; ;  # ٠۱.�٥
+٠۱。󠳶�٥; ٠۱.󠳶�٥; [B1, P1, V6]; xn--8hb40a.xn--eib7967vner3e; ; ;  # ٠۱.�٥
+xn--8hb40a.xn--eib7967vner3e; ٠۱.󠳶�٥; [B1, V6]; xn--8hb40a.xn--eib7967vner3e; ; ;  # ٠۱.�٥
+‌٣⒖。󱅉𽷛᯳; ‌٣⒖.󱅉𽷛᯳; [B1, C1, P1, V6]; xn--cib152kwgd.xn--1zf13512buy41d; ; xn--cib675m.xn--1zf13512buy41d; [B1, P1, V6] # ٣⒖.᯳
+‌٣15.。󱅉𽷛᯳; ‌٣15..󱅉𽷛᯳; [B1, C1, P1, V6, X4_2]; xn--15-gyd983x..xn--1zf13512buy41d; [B1, C1, P1, V6, A4_2]; xn--15-gyd..xn--1zf13512buy41d; [B1, P1, V6, A4_2] # ٣15..᯳
+xn--15-gyd..xn--1zf13512buy41d; ٣15..󱅉𽷛᯳; [B1, V6, X4_2]; xn--15-gyd..xn--1zf13512buy41d; [B1, V6, A4_2]; ;  # ٣15..᯳
+xn--15-gyd983x..xn--1zf13512buy41d; ‌٣15..󱅉𽷛᯳; [B1, C1, V6, X4_2]; xn--15-gyd983x..xn--1zf13512buy41d; [B1, C1, V6, A4_2]; ;  # ٣15..᯳
+xn--cib675m.xn--1zf13512buy41d; ٣⒖.󱅉𽷛᯳; [B1, V6]; xn--cib675m.xn--1zf13512buy41d; ; ;  # ٣⒖.᯳
+xn--cib152kwgd.xn--1zf13512buy41d; ‌٣⒖.󱅉𽷛᯳; [B1, C1, V6]; xn--cib152kwgd.xn--1zf13512buy41d; ; ;  # ٣⒖.᯳
+᯳.-逋񳦭󙙮; ; [P1, V3, V5, V6]; xn--1zf.xn----483d46987byr50b; ; ;  # ᯳.-逋
+xn--1zf.xn----483d46987byr50b; ᯳.-逋񳦭󙙮; [V3, V5, V6]; xn--1zf.xn----483d46987byr50b; ; ;  # ᯳.-逋
+ݖ。ㅤ�ς; ݖ.ㅤ�ς; [C2, P1, V6]; xn--9ob.xn--3xa995lq2l; ; xn--9ob.xn--4xa574u; [P1, V6] # ݖ.ς
+ݖ。ᅠ�ς; ݖ.ᅠ�ς; [C2, P1, V6]; xn--9ob.xn--3xa580ebol; ; xn--9ob.xn--4xa380e; [P1, V6] # ݖ.ς
+ݖ。ᅠ�Σ; ݖ.ᅠ�σ; [C2, P1, V6]; xn--9ob.xn--4xa380ebol; ; xn--9ob.xn--4xa380e; [P1, V6] # ݖ.σ
+ݖ。ᅠ�σ; ݖ.ᅠ�σ; [C2, P1, V6]; xn--9ob.xn--4xa380ebol; ; xn--9ob.xn--4xa380e; [P1, V6] # ݖ.σ
+xn--9ob.xn--4xa380e; ݖ.ᅠσ; [V6]; xn--9ob.xn--4xa380e; ; ;  # ݖ.σ
+xn--9ob.xn--4xa380ebol; ݖ.ᅠ�σ; [C2, V6]; xn--9ob.xn--4xa380ebol; ; ;  # ݖ.σ
+xn--9ob.xn--3xa580ebol; ݖ.ᅠ�ς; [C2, V6]; xn--9ob.xn--3xa580ebol; ; ;  # ݖ.ς
+ݖ。ㅤ�Σ; ݖ.ㅤ�σ; [C2, P1, V6]; xn--9ob.xn--4xa795lq2l; ; xn--9ob.xn--4xa574u; [P1, V6] # ݖ.σ
+ݖ。ㅤ�σ; ݖ.ㅤ�σ; [C2, P1, V6]; xn--9ob.xn--4xa795lq2l; ; xn--9ob.xn--4xa574u; [P1, V6] # ݖ.σ
+xn--9ob.xn--4xa574u; ݖ.ㅤσ; [V6]; xn--9ob.xn--4xa574u; ; ;  # ݖ.σ
+xn--9ob.xn--4xa795lq2l; ݖ.ㅤ�σ; [C2, V6]; xn--9ob.xn--4xa795lq2l; ; ;  # ݖ.σ
+xn--9ob.xn--3xa995lq2l; ݖ.ㅤ�ς; [C2, V6]; xn--9ob.xn--3xa995lq2l; ; ;  # ݖ.ς
+ᡆႣ｡󞢧̕��; ᡆႣ.󞢧̕��; [C2, P1, V6]; xn--bnd320b.xn--5sa649la993427a; ; xn--bnd320b.xn--5sa98523p; [P1, V6] # ᡆႣ.̕
+ᡆႣ。󞢧̕��; ᡆႣ.󞢧̕��; [C2, P1, V6]; xn--bnd320b.xn--5sa649la993427a; ; xn--bnd320b.xn--5sa98523p; [P1, V6] # ᡆႣ.̕
+ᡆⴃ。󞢧̕��; ᡆⴃ.󞢧̕��; [C2, P1, V6]; xn--57e237h.xn--5sa649la993427a; ; xn--57e237h.xn--5sa98523p; [P1, V6] # ᡆⴃ.̕
+xn--57e237h.xn--5sa98523p; ᡆⴃ.󞢧̕; [V6]; xn--57e237h.xn--5sa98523p; ; ;  # ᡆⴃ.̕
+xn--57e237h.xn--5sa649la993427a; ᡆⴃ.󞢧̕��; [C2, V6]; xn--57e237h.xn--5sa649la993427a; ; ;  # ᡆⴃ.̕
+xn--bnd320b.xn--5sa98523p; ᡆႣ.󞢧̕; [V6]; xn--bnd320b.xn--5sa98523p; ; ;  # ᡆႣ.̕
+xn--bnd320b.xn--5sa649la993427a; ᡆႣ.󞢧̕��; [C2, V6]; xn--bnd320b.xn--5sa649la993427a; ; ;  # ᡆႣ.̕
+ᡆⴃ｡󞢧̕��; ᡆⴃ.󞢧̕��; [C2, P1, V6]; xn--57e237h.xn--5sa649la993427a; ; xn--57e237h.xn--5sa98523p; [P1, V6] # ᡆⴃ.̕
+㭄��𑚵．ς�‌�; 㭄��𑚵.ς�‌�; [B5, B6, C1, C2]; xn--ewb962jfitku4r.xn--3xa895lda6932v; ; xn--ewb302xhu1l.xn--4xa0426k; [B5, B6] # 㭄�𑚵.ς�
+㭄��𑚵.ς�‌�; ; [B5, B6, C1, C2]; xn--ewb962jfitku4r.xn--3xa895lda6932v; ; xn--ewb302xhu1l.xn--4xa0426k; [B5, B6] # 㭄�𑚵.ς�
+㭄��𑚵.Σ�‌�; 㭄��𑚵.σ�‌�; [B5, B6, C1, C2]; xn--ewb962jfitku4r.xn--4xa695lda6932v; ; xn--ewb302xhu1l.xn--4xa0426k; [B5, B6] # 㭄�𑚵.σ�
+㭄��𑚵.σ�‌�; ; [B5, B6, C1, C2]; xn--ewb962jfitku4r.xn--4xa695lda6932v; ; xn--ewb302xhu1l.xn--4xa0426k; [B5, B6] # 㭄�𑚵.σ�
+xn--ewb302xhu1l.xn--4xa0426k; 㭄�𑚵.σ�; [B5, B6]; xn--ewb302xhu1l.xn--4xa0426k; ; ;  # 㭄�𑚵.σ�
+xn--ewb962jfitku4r.xn--4xa695lda6932v; 㭄��𑚵.σ�‌�; [B5, B6, C1, C2]; xn--ewb962jfitku4r.xn--4xa695lda6932v; ; ;  # 㭄�𑚵.σ�
+xn--ewb962jfitku4r.xn--3xa895lda6932v; 㭄��𑚵.ς�‌�; [B5, B6, C1, C2]; xn--ewb962jfitku4r.xn--3xa895lda6932v; ; ;  # 㭄�𑚵.ς�
+㭄��𑚵．Σ�‌�; 㭄��𑚵.σ�‌�; [B5, B6, C1, C2]; xn--ewb962jfitku4r.xn--4xa695lda6932v; ; xn--ewb302xhu1l.xn--4xa0426k; [B5, B6] # 㭄�𑚵.σ�
+㭄��𑚵．σ�‌�; 㭄��𑚵.σ�‌�; [B5, B6, C1, C2]; xn--ewb962jfitku4r.xn--4xa695lda6932v; ; xn--ewb302xhu1l.xn--4xa0426k; [B5, B6] # 㭄�𑚵.σ�
+឵。𞯸ꡀ🄋; ឵.𞯸ꡀ🄋; [B1, B2, B3, B6, P1, V5, V6]; xn--03e.xn--8b9ar252dngd; ; ;  # .ꡀ🄋
+xn--03e.xn--8b9ar252dngd; ឵.𞯸ꡀ🄋; [B1, B2, B3, B6, V5, V6]; xn--03e.xn--8b9ar252dngd; ; ;  # .ꡀ🄋
+�暑．⾑٨; �暑.襾٨; [B5, B6, P1, V6]; xn--tlvq3513e.xn--hib9228d; ; ;  # 暑.襾٨
+�暑.襾٨; ; [B5, B6, P1, V6]; xn--tlvq3513e.xn--hib9228d; ; ;  # 暑.襾٨
+xn--tlvq3513e.xn--hib9228d; �暑.襾٨; [B5, B6, V6]; xn--tlvq3513e.xn--hib9228d; ; ;  # 暑.襾٨
+󠄚≯ꡢ。࢑᷿; ≯ꡢ.࢑᷿; [B1, P1, V6]; xn--hdh7783c.xn--9xb680i; ; ;  # ≯ꡢ.᷿
+󠄚≯ꡢ。࢑᷿; ≯ꡢ.࢑᷿; [B1, P1, V6]; xn--hdh7783c.xn--9xb680i; ; ;  # ≯ꡢ.᷿
+xn--hdh7783c.xn--9xb680i; ≯ꡢ.࢑᷿; [B1, V6]; xn--hdh7783c.xn--9xb680i; ; ;  # ≯ꡢ.᷿
+ﷃ���.�Ⴗ; كمم���.�Ⴗ; [B2, B3, P1, V6]; xn--fhbea662czx68a2tju.xn--vnd55511o; ; ;  # كمم���.Ⴗ
+كمم���.�Ⴗ; ; [B2, B3, P1, V6]; xn--fhbea662czx68a2tju.xn--vnd55511o; ; ;  # كمم���.Ⴗ
+كمم���.�ⴗ; ; [B2, B3, P1, V6]; xn--fhbea662czx68a2tju.xn--fljz2846h; ; ;  # كمم���.ⴗ
+xn--fhbea662czx68a2tju.xn--fljz2846h; كمم���.�ⴗ; [B2, B3, V6]; xn--fhbea662czx68a2tju.xn--fljz2846h; ; ;  # كمم���.ⴗ
+xn--fhbea662czx68a2tju.xn--vnd55511o; كمم���.�Ⴗ; [B2, B3, V6]; xn--fhbea662czx68a2tju.xn--vnd55511o; ; ;  # كمم���.Ⴗ
+ﷃ���.�ⴗ; كمم���.�ⴗ; [B2, B3, P1, V6]; xn--fhbea662czx68a2tju.xn--fljz2846h; ; ;  # كمم���.ⴗ
+𞀨｡᭄򡛨𞎇; 𞀨.᭄򡛨𞎇; [P1, V5, V6]; xn--mi4h.xn--1uf6843smg20c; ; ;  # 𞀨.᭄
+𞀨。᭄򡛨𞎇; 𞀨.᭄򡛨𞎇; [P1, V5, V6]; xn--mi4h.xn--1uf6843smg20c; ; ;  # 𞀨.᭄
+xn--mi4h.xn--1uf6843smg20c; 𞀨.᭄򡛨𞎇; [V5, V6]; xn--mi4h.xn--1uf6843smg20c; ; ;  # 𞀨.᭄
+󠣼‌．�‌ᡟ; 󠣼‌.�‌ᡟ; [B1, B2, B3, C1, P1, V6]; xn--0ug18531l.xn--v8e340bp21t; ; xn--q046e.xn--v8e7227j; [B1, B2, B3, P1, V6] # .�ᡟ
+󠣼‌.�‌ᡟ; ; [B1, B2, B3, C1, P1, V6]; xn--0ug18531l.xn--v8e340bp21t; ; xn--q046e.xn--v8e7227j; [B1, B2, B3, P1, V6] # .�ᡟ
+xn--q046e.xn--v8e7227j; 󠣼.�ᡟ; [B1, B2, B3, V6]; xn--q046e.xn--v8e7227j; ; ;  # .�ᡟ
+xn--0ug18531l.xn--v8e340bp21t; 󠣼‌.�‌ᡟ; [B1, B2, B3, C1, V6]; xn--0ug18531l.xn--v8e340bp21t; ; ;  # .�ᡟ
+ᢛ󨅟ß.ጧ; ; [P1, V6]; xn--zca562jc642x.xn--p5d; ; xn--ss-7dp66033t.xn--p5d;  # ᢛß.ጧ
+ᢛ󨅟SS.ጧ; ᢛ󨅟ss.ጧ; [P1, V6]; xn--ss-7dp66033t.xn--p5d; ; ;  # ᢛss.ጧ
+ᢛ󨅟ss.ጧ; ; [P1, V6]; xn--ss-7dp66033t.xn--p5d; ; ;  # ᢛss.ጧ
+ᢛ󨅟Ss.ጧ; ᢛ󨅟ss.ጧ; [P1, V6]; xn--ss-7dp66033t.xn--p5d; ; ;  # ᢛss.ጧ
+xn--ss-7dp66033t.xn--p5d; ᢛ󨅟ss.ጧ; [V6]; xn--ss-7dp66033t.xn--p5d; ; ;  # ᢛss.ጧ
+xn--zca562jc642x.xn--p5d; ᢛ󨅟ß.ጧ; [V6]; xn--zca562jc642x.xn--p5d; ; ;  # ᢛß.ጧ
+⮒‌.񒚗‌; ; [C1, P1, V6]; xn--0ugx66b.xn--0ugz2871c; ; xn--b9i.xn--5p9y; [P1, V6] # ⮒.
+xn--b9i.xn--5p9y; â®’.ñ’š—; [V6]; xn--b9i.xn--5p9y; ; ;  # â®’.
+xn--0ugx66b.xn--0ugz2871c; ⮒‌.񒚗‌; [C1, V6]; xn--0ugx66b.xn--0ugz2871c; ; ;  # ⮒.
+𞤂��。Ⴜ; 𞤤��.Ⴜ; [B2, P1, V6]; xn--no0dr648a51o3b.xn--0nd; ; ;  # 𞤤�.Ⴜ
+𞤤��。ⴜ; 𞤤��.ⴜ; [B2, P1, V6]; xn--no0dr648a51o3b.xn--klj; ; ;  # 𞤤�.ⴜ
+xn--no0dr648a51o3b.xn--klj; 𞤤��.ⴜ; [B2, V6]; xn--no0dr648a51o3b.xn--klj; ; ;  # 𞤤�.ⴜ
+xn--no0dr648a51o3b.xn--0nd; 𞤤��.Ⴜ; [B2, V6]; xn--no0dr648a51o3b.xn--0nd; ; ;  # 𞤤�.Ⴜ
+𞤂��。ⴜ; 𞤤��.ⴜ; [B2, P1, V6]; xn--no0dr648a51o3b.xn--klj; ; ;  # 𞤤�.ⴜ
+�⮣‌𑄰｡񷴿ﲷ; �⮣‌𑄰.񷴿ضم; [B1, B5, B6, C1, P1, V6]; xn--0ug586bcj8p7jc.xn--1gb4a66004i; ; xn--s9i5458e7yb.xn--1gb4a66004i; [B1, B5, B6, P1, V6] # �⮣𑄰.ضم
+�⮣‌𑄰。񷴿ضم; �⮣‌𑄰.񷴿ضم; [B1, B5, B6, C1, P1, V6]; xn--0ug586bcj8p7jc.xn--1gb4a66004i; ; xn--s9i5458e7yb.xn--1gb4a66004i; [B1, B5, B6, P1, V6] # �⮣𑄰.ضم
+xn--s9i5458e7yb.xn--1gb4a66004i; �⮣𑄰.񷴿ضم; [B1, B5, B6, V6]; xn--s9i5458e7yb.xn--1gb4a66004i; ; ;  # �⮣𑄰.ضم
+xn--0ug586bcj8p7jc.xn--1gb4a66004i; �⮣‌𑄰.񷴿ضم; [B1, B5, B6, C1, V6]; xn--0ug586bcj8p7jc.xn--1gb4a66004i; ; ;  # �⮣𑄰.ضم
+Ⴒ。デß𞤵�; Ⴒ.デß𞤵�; [B5, B6, P1, V6]; xn--qnd.xn--zca669cmr3a0f28a; ; xn--qnd.xn--ss-9nh3648ahh20b;  # Ⴒ.デß𞤵�
+Ⴒ。デß𞤵�; Ⴒ.デß𞤵�; [B5, B6, P1, V6]; xn--qnd.xn--zca669cmr3a0f28a; ; xn--qnd.xn--ss-9nh3648ahh20b;  # Ⴒ.デß𞤵�
+ⴒ。デß𞤵�; ⴒ.デß𞤵�; [B5, B6]; xn--9kj.xn--zca669cmr3a0f28a; ; xn--9kj.xn--ss-9nh3648ahh20b;  # ⴒ.デß𞤵�
+ⴒ。デß𞤵�; ⴒ.デß𞤵�; [B5, B6]; xn--9kj.xn--zca669cmr3a0f28a; ; xn--9kj.xn--ss-9nh3648ahh20b;  # ⴒ.デß𞤵�
+Ⴒ。デSS𞤓�; Ⴒ.デss𞤵�; [B5, B6, P1, V6]; xn--qnd.xn--ss-9nh3648ahh20b; ; ;  # Ⴒ.デss𞤵�
+Ⴒ。デSS𞤓�; Ⴒ.デss𞤵�; [B5, B6, P1, V6]; xn--qnd.xn--ss-9nh3648ahh20b; ; ;  # Ⴒ.デss𞤵�
+ⴒ。デss𞤵�; ⴒ.デss𞤵�; [B5, B6]; xn--9kj.xn--ss-9nh3648ahh20b; ; ;  # ⴒ.デss𞤵�
+ⴒ。デss𞤵�; ⴒ.デss𞤵�; [B5, B6]; xn--9kj.xn--ss-9nh3648ahh20b; ; ;  # ⴒ.デss𞤵�
+Ⴒ。デSs𞤵�; Ⴒ.デss𞤵�; [B5, B6, P1, V6]; xn--qnd.xn--ss-9nh3648ahh20b; ; ;  # Ⴒ.デss𞤵�
+Ⴒ。デSs𞤵�; Ⴒ.デss𞤵�; [B5, B6, P1, V6]; xn--qnd.xn--ss-9nh3648ahh20b; ; ;  # Ⴒ.デss𞤵�
+xn--qnd.xn--ss-9nh3648ahh20b; Ⴒ.デss𞤵�; [B5, B6, V6]; xn--qnd.xn--ss-9nh3648ahh20b; ; ;  # Ⴒ.デss𞤵�
+xn--9kj.xn--ss-9nh3648ahh20b; ⴒ.デss𞤵�; [B5, B6]; xn--9kj.xn--ss-9nh3648ahh20b; ; ;  # ⴒ.デss𞤵�
+xn--9kj.xn--zca669cmr3a0f28a; ⴒ.デß𞤵�; [B5, B6]; xn--9kj.xn--zca669cmr3a0f28a; ; ;  # ⴒ.デß𞤵�
+xn--qnd.xn--zca669cmr3a0f28a; Ⴒ.デß𞤵�; [B5, B6, V6]; xn--qnd.xn--zca669cmr3a0f28a; ; ;  # Ⴒ.デß𞤵�
+Ⴒ。デSS𞤵�; Ⴒ.デss𞤵�; [B5, B6, P1, V6]; xn--qnd.xn--ss-9nh3648ahh20b; ; ;  # Ⴒ.デss𞤵�
+Ⴒ。デSS𞤵�; Ⴒ.デss𞤵�; [B5, B6, P1, V6]; xn--qnd.xn--ss-9nh3648ahh20b; ; ;  # Ⴒ.デss𞤵�
+��．７-ߒ; ��.7-ߒ; [B1, B3, B6, V5]; xn--wxc1283k.xn--7--yue; ; ;  # ��.7-ߒ
+��.7-ߒ; ; [B1, B3, B6, V5]; xn--wxc1283k.xn--7--yue; ; ;  # ��.7-ߒ
+xn--wxc1283k.xn--7--yue; ��.7-ߒ; [B1, B3, B6, V5]; xn--wxc1283k.xn--7--yue; ; ;  # ��.7-ߒ
+≯𑜫󠭇.᜴񒞤�ᢧ; ; [P1, V5, V6]; xn--hdhx157g68o0g.xn--c0e65eu616c34o7a; ; ;  # ≯𑜫.᜴�ᢧ
+≯𑜫󠭇.᜴񒞤�ᢧ; ≯𑜫󠭇.᜴񒞤�ᢧ; [P1, V5, V6]; xn--hdhx157g68o0g.xn--c0e65eu616c34o7a; ; ;  # ≯𑜫.᜴�ᢧ
+xn--hdhx157g68o0g.xn--c0e65eu616c34o7a; ≯𑜫󠭇.᜴񒞤�ᢧ; [V5, V6]; xn--hdhx157g68o0g.xn--c0e65eu616c34o7a; ; ;  # ≯𑜫.᜴�ᢧ
+ᷛ�Ⴗ�。�; ᷛ�Ⴗ�.�; [B1, P1, V5, V6]; xn--vnd148d733ky6n9e.xn--iqb; ; ;  # ᷛႷ�.�
+ᷛ�Ⴗ쏔。�; ᷛ�Ⴗ�.�; [B1, P1, V5, V6]; xn--vnd148d733ky6n9e.xn--iqb; ; ;  # ᷛႷ�.�
+ᷛ�ⴗ쏔。�; ᷛ�ⴗ�.�; [B1, P1, V5, V6]; xn--zegy26dw47iy6w2f.xn--iqb; ; ;  # ᷛⴗ�.�
+ᷛ�ⴗ�。�; ᷛ�ⴗ�.�; [B1, P1, V5, V6]; xn--zegy26dw47iy6w2f.xn--iqb; ; ;  # ᷛⴗ�.�
+xn--zegy26dw47iy6w2f.xn--iqb; ᷛ�ⴗ�.�; [B1, V5, V6]; xn--zegy26dw47iy6w2f.xn--iqb; ; ;  # ᷛⴗ�.�
+xn--vnd148d733ky6n9e.xn--iqb; ᷛ�Ⴗ�.�; [B1, V5, V6]; xn--vnd148d733ky6n9e.xn--iqb; ; ;  # ᷛႷ�.�
+ß｡�Ⴌྸ; ß.�Ⴌྸ; [P1, V6]; xn--zca.xn--lgd10cu829c; ; ss.xn--lgd10cu829c;  # ß.�Ⴌྸ
+ß。�Ⴌྸ; ß.�Ⴌྸ; [P1, V6]; xn--zca.xn--lgd10cu829c; ; ss.xn--lgd10cu829c;  # ß.�Ⴌྸ
+ß。�ⴌྸ; ß.�ⴌྸ; ; xn--zca.xn--lgd921mvv0m; ; ss.xn--lgd921mvv0m;  # ß.�ⴌྸ
+SS。�Ⴌྸ; ss.�Ⴌྸ; [P1, V6]; ss.xn--lgd10cu829c; ; ;  # ss.�Ⴌྸ
+ss。�ⴌྸ; ss.�ⴌྸ; ; ss.xn--lgd921mvv0m; ; ;  # ss.�ⴌྸ
+Ss。�Ⴌྸ; ss.�Ⴌྸ; [P1, V6]; ss.xn--lgd10cu829c; ; ;  # ss.�Ⴌྸ
+ss.xn--lgd10cu829c; ss.�Ⴌྸ; [V6]; ss.xn--lgd10cu829c; ; ;  # ss.�Ⴌྸ
+ss.xn--lgd921mvv0m; ss.�ⴌྸ; ; ss.xn--lgd921mvv0m; ; ;  # ss.�ⴌྸ
+ss.�ⴌྸ; ; ; ss.xn--lgd921mvv0m; ; ;  # ss.�ⴌྸ
+SS.�Ⴌྸ; ss.�Ⴌྸ; [P1, V6]; ss.xn--lgd10cu829c; ; ;  # ss.�Ⴌྸ
+Ss.�Ⴌྸ; ss.�Ⴌྸ; [P1, V6]; ss.xn--lgd10cu829c; ; ;  # ss.�Ⴌྸ
+xn--zca.xn--lgd921mvv0m; ß.�ⴌྸ; ; xn--zca.xn--lgd921mvv0m; ; ;  # ß.�ⴌྸ
+ß.�ⴌྸ; ; ; xn--zca.xn--lgd921mvv0m; ; ss.xn--lgd921mvv0m;  # ß.�ⴌྸ
+xn--zca.xn--lgd10cu829c; ß.�Ⴌྸ; [V6]; xn--zca.xn--lgd10cu829c; ; ;  # ß.�Ⴌྸ
+ß｡�ⴌྸ; ß.�ⴌྸ; ; xn--zca.xn--lgd921mvv0m; ; ss.xn--lgd921mvv0m;  # ß.�ⴌྸ
+SS｡�Ⴌྸ; ss.�Ⴌྸ; [P1, V6]; ss.xn--lgd10cu829c; ; ;  # ss.�Ⴌྸ
+ss｡�ⴌྸ; ss.�ⴌྸ; ; ss.xn--lgd921mvv0m; ; ;  # ss.�ⴌྸ
+Ss｡�Ⴌྸ; ss.�Ⴌྸ; [P1, V6]; ss.xn--lgd10cu829c; ; ;  # ss.�Ⴌྸ
+-ڞ�.‌��; -ڞ�.‌身�; [B1, C1, P1, V3, V6]; xn----stc7013r.xn--b7b305imj2f; ; xn----stc7013r.xn--b7b1419d; [B1, P1, V3, V6] # -ڞ.身�
+-ڞ�.‌身�; ; [B1, C1, P1, V3, V6]; xn----stc7013r.xn--b7b305imj2f; ; xn----stc7013r.xn--b7b1419d; [B1, P1, V3, V6] # -ڞ.身�
+xn----stc7013r.xn--b7b1419d; -ڞ�.身�; [B1, V3, V6]; xn----stc7013r.xn--b7b1419d; ; ;  # -ڞ.身�
+xn----stc7013r.xn--b7b305imj2f; -ڞ�.‌身�; [B1, C1, V3, V6]; xn----stc7013r.xn--b7b305imj2f; ; ;  # -ڞ.身�
+😮ݤ𑈵𞀖.💅�; 😮ݤ𑈵𞀖.💅�; [B1, C2]; xn--opb4277kuc7elqsa.xn--1ug5265p; ; xn--opb4277kuc7elqsa.xn--kr8h; [B1] # 😮ݤ𑈵𞀖.💅
+😮ݤ𑈵𞀖.💅�; ; [B1, C2]; xn--opb4277kuc7elqsa.xn--1ug5265p; ; xn--opb4277kuc7elqsa.xn--kr8h; [B1] # 😮ݤ𑈵𞀖.💅
+xn--opb4277kuc7elqsa.xn--kr8h; 😮ݤ𑈵𞀖.💅; [B1]; xn--opb4277kuc7elqsa.xn--kr8h; ; ;  # 😮ݤ𑈵𞀖.💅
+xn--opb4277kuc7elqsa.xn--1ug5265p; 😮ݤ𑈵𞀖.💅�; [B1, C2]; xn--opb4277kuc7elqsa.xn--1ug5265p; ; ;  # 😮ݤ𑈵𞀖.💅
+ࣲ�꙳ܒ.�‌�; ; [B1, B6, C1, C2, P1, V5, V6]; xn--cnb37g904be26j.xn--89e849ax9363a; ; xn--cnb37gdy00a.xn--89e02253p; [B1, B6, P1, V5, V6] # ࣲ꙳ܒ.�
+xn--cnb37gdy00a.xn--89e02253p; ࣲ꙳ܒ.��; [B1, B6, V5, V6]; xn--cnb37gdy00a.xn--89e02253p; ; ;  # ࣲ꙳ܒ.�
+xn--cnb37g904be26j.xn--89e849ax9363a; ࣲ�꙳ܒ.�‌�; [B1, B6, C1, C2, V5, V6]; xn--cnb37g904be26j.xn--89e849ax9363a; ; ;  # ࣲ꙳ܒ.�
+Ⴑ．ڿ𞯓ᠲ; Ⴑ.ڿ𞯓ᠲ; [B2, B3, P1, V6]; xn--pnd.xn--ykb840gd555a; ; ;  # Ⴑ.ڿᠲ
+Ⴑ.ڿ𞯓ᠲ; ; [B2, B3, P1, V6]; xn--pnd.xn--ykb840gd555a; ; ;  # Ⴑ.ڿᠲ
+ⴑ.ڿ𞯓ᠲ; ; [B2, B3, P1, V6]; xn--8kj.xn--ykb840gd555a; ; ;  # ⴑ.ڿᠲ
+xn--8kj.xn--ykb840gd555a; ⴑ.ڿ𞯓ᠲ; [B2, B3, V6]; xn--8kj.xn--ykb840gd555a; ; ;  # ⴑ.ڿᠲ
+xn--pnd.xn--ykb840gd555a; Ⴑ.ڿ𞯓ᠲ; [B2, B3, V6]; xn--pnd.xn--ykb840gd555a; ; ;  # Ⴑ.ڿᠲ
+ⴑ．ڿ𞯓ᠲ; ⴑ.ڿ𞯓ᠲ; [B2, B3, P1, V6]; xn--8kj.xn--ykb840gd555a; ; ;  # ⴑ.ڿᠲ
+ᩚ��。��; ᩚ��.�9; [P1, V5, V6]; xn--lqc703ebm93a.xn--9-000p; ; ;  # ᩚ�.9
+ᩚ��。�9; ᩚ��.�9; [P1, V5, V6]; xn--lqc703ebm93a.xn--9-000p; ; ;  # ᩚ�.9
+xn--lqc703ebm93a.xn--9-000p; ᩚ��.�9; [V5, V6]; xn--lqc703ebm93a.xn--9-000p; ; ;  # ᩚ�.9
+‌ڠ𿺆�｡Ⴣ꒘��; ‌ڠ𿺆9.Ⴣ꒘مخ�; [B1, B5, C1, P1, V6]; xn--9-vtc736qts91g.xn--tgb9bz61cfn8mw3t2c; ; xn--9-vtc42319e.xn--tgb9bz61cfn8mw3t2c; [B2, B5, P1, V6] # ڠ9.Ⴣ꒘مخ
+‌ڠ𿺆9。Ⴣ꒘مخ�; ‌ڠ𿺆9.Ⴣ꒘مخ�; [B1, B5, C1, P1, V6]; xn--9-vtc736qts91g.xn--tgb9bz61cfn8mw3t2c; ; xn--9-vtc42319e.xn--tgb9bz61cfn8mw3t2c; [B2, B5, P1, V6] # ڠ9.Ⴣ꒘مخ
+‌ڠ𿺆9。ⴣ꒘مخ�; ‌ڠ𿺆9.ⴣ꒘مخ�; [B1, B5, C1, P1, V6]; xn--9-vtc736qts91g.xn--tgb9bz87p833hw316c; ; xn--9-vtc42319e.xn--tgb9bz87p833hw316c; [B2, B5, P1, V6] # ڠ9.ⴣ꒘مخ
+xn--9-vtc42319e.xn--tgb9bz87p833hw316c; ڠ𿺆9.ⴣ꒘مخ�; [B2, B5, V6]; xn--9-vtc42319e.xn--tgb9bz87p833hw316c; ; ;  # ڠ9.ⴣ꒘مخ
+xn--9-vtc736qts91g.xn--tgb9bz87p833hw316c; ‌ڠ𿺆9.ⴣ꒘مخ�; [B1, B5, C1, V6]; xn--9-vtc736qts91g.xn--tgb9bz87p833hw316c; ; ;  # ڠ9.ⴣ꒘مخ
+xn--9-vtc42319e.xn--tgb9bz61cfn8mw3t2c; ڠ𿺆9.Ⴣ꒘مخ�; [B2, B5, V6]; xn--9-vtc42319e.xn--tgb9bz61cfn8mw3t2c; ; ;  # ڠ9.Ⴣ꒘مخ
+xn--9-vtc736qts91g.xn--tgb9bz61cfn8mw3t2c; ‌ڠ𿺆9.Ⴣ꒘مخ�; [B1, B5, C1, V6]; xn--9-vtc736qts91g.xn--tgb9bz61cfn8mw3t2c; ; ;  # ڠ9.Ⴣ꒘مخ
+‌ڠ𿺆�｡ⴣ꒘��; ‌ڠ𿺆9.ⴣ꒘مخ�; [B1, B5, C1, P1, V6]; xn--9-vtc736qts91g.xn--tgb9bz87p833hw316c; ; xn--9-vtc42319e.xn--tgb9bz87p833hw316c; [B2, B5, P1, V6] # ڠ9.ⴣ꒘مخ
+ᡖ｡̟񗛨ஂ-; ᡖ.̟񗛨ஂ-; [P1, V3, V5, V6]; xn--m8e.xn----mdb555dkk71m; ; ;  # ᡖ.̟ஂ-
+ᡖ。̟񗛨ஂ-; ᡖ.̟񗛨ஂ-; [P1, V3, V5, V6]; xn--m8e.xn----mdb555dkk71m; ; ;  # ᡖ.̟ஂ-
+xn--m8e.xn----mdb555dkk71m; ᡖ.̟񗛨ஂ-; [V3, V5, V6]; xn--m8e.xn----mdb555dkk71m; ; ;  # ᡖ.̟ஂ-
+𞠠浘。絧𞀀; 𞠠浘.絧𞀀; [B2, B3]; xn--e0wp491f.xn--ud0a3573e; ; ;  # 𞠠浘.絧𞀀
+xn--e0wp491f.xn--ud0a3573e; 𞠠浘.絧𞀀; [B2, B3]; xn--e0wp491f.xn--ud0a3573e; ; ;  # 𞠠浘.絧𞀀
+֖Ⴋ．�≯︒︊; ֖Ⴋ.7≯︒; [P1, V5, V6]; xn--hcb887c.xn--7-pgoy530h; ; ;  # ֖Ⴋ.7≯︒
+֖Ⴋ．�≯︒︊; ֖Ⴋ.7≯︒; [P1, V5, V6]; xn--hcb887c.xn--7-pgoy530h; ; ;  # ֖Ⴋ.7≯︒
+֖Ⴋ.7≯。︊; ֖Ⴋ.7≯.; [P1, V5, V6]; xn--hcb887c.xn--7-pgo.; ; ;  # ֖Ⴋ.7≯.
+֖Ⴋ.7≯。︊; ֖Ⴋ.7≯.; [P1, V5, V6]; xn--hcb887c.xn--7-pgo.; ; ;  # ֖Ⴋ.7≯.
+֖ⴋ.7≯。︊; ֖ⴋ.7≯.; [P1, V5, V6]; xn--hcb613r.xn--7-pgo.; ; ;  # ֖ⴋ.7≯.
+֖ⴋ.7≯。︊; ֖ⴋ.7≯.; [P1, V5, V6]; xn--hcb613r.xn--7-pgo.; ; ;  # ֖ⴋ.7≯.
+xn--hcb613r.xn--7-pgo.; ֖ⴋ.7≯.; [V5, V6]; xn--hcb613r.xn--7-pgo.; ; ;  # ֖ⴋ.7≯.
+xn--hcb887c.xn--7-pgo.; ֖Ⴋ.7≯.; [V5, V6]; xn--hcb887c.xn--7-pgo.; ; ;  # ֖Ⴋ.7≯.
+֖ⴋ．�≯︒︊; ֖ⴋ.7≯︒; [P1, V5, V6]; xn--hcb613r.xn--7-pgoy530h; ; ;  # ֖ⴋ.7≯︒
+֖ⴋ．�≯︒︊; ֖ⴋ.7≯︒; [P1, V5, V6]; xn--hcb613r.xn--7-pgoy530h; ; ;  # ֖ⴋ.7≯︒
+xn--hcb613r.xn--7-pgoy530h; ֖ⴋ.7≯︒; [V5, V6]; xn--hcb613r.xn--7-pgoy530h; ; ;  # ֖ⴋ.7≯︒
+xn--hcb887c.xn--7-pgoy530h; ֖Ⴋ.7≯︒; [V5, V6]; xn--hcb887c.xn--7-pgoy530h; ; ;  # ֖Ⴋ.7≯︒
+�F𑓂。󠺨︒ݾ�; �f𑓂.󠺨︒ݾ�; [B1, C2, P1, V6]; xn--f-tgn9761i.xn--fqb1637j8hky9452a; ; xn--f-kq9i.xn--fqb1637j8hky9452a; [B1, P1, V6] # f𑓂.︒ݾ�
+�F𑓂。󠺨。ݾ�; �f𑓂.󠺨.ݾ�; [B1, C2, P1, V6]; xn--f-tgn9761i.xn--7656e.xn--fqb4175k; ; xn--f-kq9i.xn--7656e.xn--fqb4175k; [B1, P1, V6] # f𑓂..ݾ�
+�f𑓂。󠺨。ݾ�; �f𑓂.󠺨.ݾ�; [B1, C2, P1, V6]; xn--f-tgn9761i.xn--7656e.xn--fqb4175k; ; xn--f-kq9i.xn--7656e.xn--fqb4175k; [B1, P1, V6] # f𑓂..ݾ�
+xn--f-kq9i.xn--7656e.xn--fqb4175k; f𑓂.󠺨.ݾ�; [B1, V6]; xn--f-kq9i.xn--7656e.xn--fqb4175k; ; ;  # f𑓂..ݾ�
+xn--f-tgn9761i.xn--7656e.xn--fqb4175k; �f𑓂.󠺨.ݾ�; [B1, C2, V6]; xn--f-tgn9761i.xn--7656e.xn--fqb4175k; ; ;  # f𑓂..ݾ�
+�f𑓂。󠺨︒ݾ�; �f𑓂.󠺨︒ݾ�; [B1, C2, P1, V6]; xn--f-tgn9761i.xn--fqb1637j8hky9452a; ; xn--f-kq9i.xn--fqb1637j8hky9452a; [B1, P1, V6] # f𑓂.︒ݾ�
+xn--f-kq9i.xn--fqb1637j8hky9452a; f𑓂.󠺨︒ݾ�; [B1, V6]; xn--f-kq9i.xn--fqb1637j8hky9452a; ; ;  # f𑓂.︒ݾ�
+xn--f-tgn9761i.xn--fqb1637j8hky9452a; �f𑓂.󠺨︒ݾ�; [B1, C2, V6]; xn--f-tgn9761i.xn--fqb1637j8hky9452a; ; ;  # f𑓂.︒ݾ�
+ࡅ🄇�︒｡�𑜫; ࡅ🄇�︒.�𑜫; [B1, B3, P1, V6]; xn--3vb4696jpxkjh7s.xn--zo0di2m; ; ;  # ࡅ🄇�︒.�𑜫
+ࡅ6,�。。�𑜫; ࡅ6,�..�𑜫; [B1, P1, V6, X4_2]; xn--6,-r4e4420y..xn--zo0di2m; [B1, P1, V6, A4_2]; ;  # ࡅ6,�..�𑜫
+xn--6,-r4e4420y..xn--zo0di2m; ࡅ6,�..�𑜫; [B1, P1, V6, X4_2]; xn--6,-r4e4420y..xn--zo0di2m; [B1, P1, V6, A4_2]; ;  # ࡅ6,�..�𑜫
+xn--3vb4696jpxkjh7s.xn--zo0di2m; ࡅ🄇�︒.�𑜫; [B1, B3, V6]; xn--3vb4696jpxkjh7s.xn--zo0di2m; ; ;  # ࡅ🄇�︒.�𑜫
+�.᷀𑈱�; ; [B1, P1, V5, V6]; xn--jn0d.xn--7dg0871h3lf; ; ;  # .᷀𑈱�
+xn--jn0d.xn--7dg0871h3lf; �.᷀𑈱�; [B1, V5, V6]; xn--jn0d.xn--7dg0871h3lf; ; ;  # .᷀𑈱�
+Ⴂ䠺。𞤃�󙮦ړ; Ⴂ䠺.𞤥�󙮦ړ; [B2, P1, V6]; xn--9md875z.xn--pjb9818vg4xno967d; ; ;  # Ⴂ䠺.𞤥ړ
+ⴂ䠺。𞤥�󙮦ړ; ⴂ䠺.𞤥�󙮦ړ; [B2, P1, V6]; xn--tkj638f.xn--pjb9818vg4xno967d; ; ;  # ⴂ䠺.𞤥ړ
+xn--tkj638f.xn--pjb9818vg4xno967d; ⴂ䠺.𞤥�󙮦ړ; [B2, V6]; xn--tkj638f.xn--pjb9818vg4xno967d; ; ;  # ⴂ䠺.𞤥ړ
+xn--9md875z.xn--pjb9818vg4xno967d; Ⴂ䠺.𞤥�󙮦ړ; [B2, V6]; xn--9md875z.xn--pjb9818vg4xno967d; ; ;  # Ⴂ䠺.𞤥ړ
+ⴂ䠺。𞤃�󙮦ړ; ⴂ䠺.𞤥�󙮦ړ; [B2, P1, V6]; xn--tkj638f.xn--pjb9818vg4xno967d; ; ;  # ⴂ䠺.𞤥ړ
+🄇�︒.𜙚꣄; ; [P1, V6]; xn--woqs083bel0g.xn--0f9ao925c; ; ;  # 🄇�︒.꣄
+6,�。.𜙚꣄; 6,�..𜙚꣄; [P1, V6, X4_2]; xn--6,-7i3c..xn--0f9ao925c; [P1, V6, A4_2]; ;  # 6,�..꣄
+xn--6,-7i3c..xn--0f9ao925c; 6,�..𜙚꣄; [P1, V6, X4_2]; xn--6,-7i3c..xn--0f9ao925c; [P1, V6, A4_2]; ;  # 6,�..꣄
+xn--woqs083bel0g.xn--0f9ao925c; 🄇�︒.𜙚꣄; [V6]; xn--woqs083bel0g.xn--0f9ao925c; ; ;  # 🄇�︒.꣄
+��꯭。��Ⴚ𑂹; ��꯭.��Ⴚ𑂹; [B1, C2, P1, V6]; xn--1ugz126coy7bdbm.xn--ynd959evs1pv6e; ; xn--429az70n29i.xn--ynd3619jqyd; [B1, B2, B3, P1, V6] # �꯭.�Ⴚ𑂹
+��꯭。��ⴚ𑂹; ��꯭.��ⴚ𑂹; [B1, C2, P1, V6]; xn--1ugz126coy7bdbm.xn--1ug062chv7ov6e; ; xn--429az70n29i.xn--ilj7702eqyd; [B1, B2, B3, P1, V6] # �꯭.�ⴚ𑂹
+xn--429az70n29i.xn--ilj7702eqyd; �꯭.�ⴚ𑂹; [B1, B2, B3, V6]; xn--429az70n29i.xn--ilj7702eqyd; ; ;  # �꯭.�ⴚ𑂹
+xn--1ugz126coy7bdbm.xn--1ug062chv7ov6e; ��꯭.��ⴚ𑂹; [B1, C2, V6]; xn--1ugz126coy7bdbm.xn--1ug062chv7ov6e; ; ;  # �꯭.�ⴚ𑂹
+xn--429az70n29i.xn--ynd3619jqyd; �꯭.�Ⴚ𑂹; [B1, B2, B3, V6]; xn--429az70n29i.xn--ynd3619jqyd; ; ;  # �꯭.�Ⴚ𑂹
+xn--1ugz126coy7bdbm.xn--ynd959evs1pv6e; ��꯭.��Ⴚ𑂹; [B1, C2, V6]; xn--1ugz126coy7bdbm.xn--ynd959evs1pv6e; ; ;  # �꯭.�Ⴚ𑂹
+󠆠．�󌟈; .�󌟈; [P1, V6, X4_2]; .xn--rx21bhv12i; [P1, V6, A4_2]; ;  # .
+󠆠.�󌟈; .�󌟈; [P1, V6, X4_2]; .xn--rx21bhv12i; [P1, V6, A4_2]; ;  # .
+.xn--rx21bhv12i; .�󌟈; [V6, X4_2]; .xn--rx21bhv12i; [V6, A4_2]; ;  # .
+�‌Ⴆ.≠𞷙; ; [B1, B2, B3, C1, P1, V6]; xn--end799ekr1p.xn--1ch2802p; ; xn--end1719j.xn--1ch2802p; [B1, B2, B3, P1, V6] # �Ⴆ.≠
+�‌Ⴆ.≠𞷙; �‌Ⴆ.≠𞷙; [B1, B2, B3, C1, P1, V6]; xn--end799ekr1p.xn--1ch2802p; ; xn--end1719j.xn--1ch2802p; [B1, B2, B3, P1, V6] # �Ⴆ.≠
+�‌ⴆ.≠𞷙; �‌ⴆ.≠𞷙; [B1, B2, B3, C1, P1, V6]; xn--0ug132csv7o.xn--1ch2802p; ; xn--xkjz802e.xn--1ch2802p; [B1, B2, B3, P1, V6] # �ⴆ.≠
+�‌ⴆ.≠𞷙; ; [B1, B2, B3, C1, P1, V6]; xn--0ug132csv7o.xn--1ch2802p; ; xn--xkjz802e.xn--1ch2802p; [B1, B2, B3, P1, V6] # �ⴆ.≠
+xn--xkjz802e.xn--1ch2802p; �ⴆ.≠𞷙; [B1, B2, B3, V6]; xn--xkjz802e.xn--1ch2802p; ; ;  # �ⴆ.≠
+xn--0ug132csv7o.xn--1ch2802p; �‌ⴆ.≠𞷙; [B1, B2, B3, C1, V6]; xn--0ug132csv7o.xn--1ch2802p; ; ;  # �ⴆ.≠
+xn--end1719j.xn--1ch2802p; �Ⴆ.≠𞷙; [B1, B2, B3, V6]; xn--end1719j.xn--1ch2802p; ; ;  # �Ⴆ.≠
+xn--end799ekr1p.xn--1ch2802p; �‌Ⴆ.≠𞷙; [B1, B2, B3, C1, V6]; xn--end799ekr1p.xn--1ch2802p; ; ;  # �Ⴆ.≠
+�𙩢�ꘌ．�; �𙩢3ꘌ.�; [B1, P1, V6]; xn--3-0g3es485d8i15h.xn--zvb; ; ;  # 3ꘌ.�
+�𙩢3ꘌ.�; ; [B1, P1, V6]; xn--3-0g3es485d8i15h.xn--zvb; ; ;  # 3ꘌ.�
+xn--3-0g3es485d8i15h.xn--zvb; �𙩢3ꘌ.�; [B1, V6]; xn--3-0g3es485d8i15h.xn--zvb; ; ;  # 3ꘌ.�
+-.ᢆ󡲣-; ; [P1, V3, V5, V6]; -.xn----pbkx6497q; ; ;  # -.ᢆ-
+-.xn----pbkx6497q; -.ᢆ󡲣-; [V3, V5, V6]; -.xn----pbkx6497q; ; ;  # -.ᢆ-
+󲚗‌｡‌𞰆ς; 󲚗‌.‌𞰆ς; [B1, B6, C1, P1, V6]; xn--0ug76062m.xn--3xa795lhn92a; ; xn--qp42f.xn--4xa3011w; [B2, B3, P1, V6] # .ς
+󲚗‌。‌𞰆ς; 󲚗‌.‌𞰆ς; [B1, B6, C1, P1, V6]; xn--0ug76062m.xn--3xa795lhn92a; ; xn--qp42f.xn--4xa3011w; [B2, B3, P1, V6] # .ς
+󲚗‌。‌𞰆Σ; 󲚗‌.‌𞰆σ; [B1, B6, C1, P1, V6]; xn--0ug76062m.xn--4xa595lhn92a; ; xn--qp42f.xn--4xa3011w; [B2, B3, P1, V6] # .σ
+󲚗‌。‌𞰆σ; 󲚗‌.‌𞰆σ; [B1, B6, C1, P1, V6]; xn--0ug76062m.xn--4xa595lhn92a; ; xn--qp42f.xn--4xa3011w; [B2, B3, P1, V6] # .σ
+xn--qp42f.xn--4xa3011w; 󲚗.𞰆σ; [B2, B3, V6]; xn--qp42f.xn--4xa3011w; ; ;  # .σ
+xn--0ug76062m.xn--4xa595lhn92a; 󲚗‌.‌𞰆σ; [B1, B6, C1, V6]; xn--0ug76062m.xn--4xa595lhn92a; ; ;  # .σ
+xn--0ug76062m.xn--3xa795lhn92a; 󲚗‌.‌𞰆ς; [B1, B6, C1, V6]; xn--0ug76062m.xn--3xa795lhn92a; ; ;  # .ς
+󲚗‌｡‌𞰆Σ; 󲚗‌.‌𞰆σ; [B1, B6, C1, P1, V6]; xn--0ug76062m.xn--4xa595lhn92a; ; xn--qp42f.xn--4xa3011w; [B2, B3, P1, V6] # .σ
+󲚗‌｡‌𞰆σ; 󲚗‌.‌𞰆σ; [B1, B6, C1, P1, V6]; xn--0ug76062m.xn--4xa595lhn92a; ; xn--qp42f.xn--4xa3011w; [B2, B3, P1, V6] # .σ
+堕𑓂ᬂ。�𞤽‌-; 堕𑓂ᬂ.�𞤽‌-; [B3, C1, V3]; xn--5sf345zdk8h.xn----rgnt157hwl9g; ; xn--5sf345zdk8h.xn----iv5iw606c; [B3, V3] # 堕𑓂ᬂ.�𞤽-
+堕𑓂ᬂ。�𞤛‌-; 堕𑓂ᬂ.�𞤽‌-; [B3, C1, V3]; xn--5sf345zdk8h.xn----rgnt157hwl9g; ; xn--5sf345zdk8h.xn----iv5iw606c; [B3, V3] # 堕𑓂ᬂ.�𞤽-
+xn--5sf345zdk8h.xn----iv5iw606c; 堕𑓂ᬂ.�𞤽-; [B3, V3]; xn--5sf345zdk8h.xn----iv5iw606c; ; ;  # 堕𑓂ᬂ.�𞤽-
+xn--5sf345zdk8h.xn----rgnt157hwl9g; 堕𑓂ᬂ.�𞤽‌-; [B3, C1, V3]; xn--5sf345zdk8h.xn----rgnt157hwl9g; ; ;  # 堕𑓂ᬂ.�𞤽-
+��ᡕ𞤢｡ᡥςتς; ��ᡕ𞤢.ᡥςتς; [B1, B5]; xn--l8e1317j1ebz456b.xn--3xaa16plx4a; ; xn--l8e1317j1ebz456b.xn--4xaa85plx4a;  # ��ᡕ𞤢.ᡥςتς
+��ᡕ𞤢。ᡥςتς; ��ᡕ𞤢.ᡥςتς; [B1, B5]; xn--l8e1317j1ebz456b.xn--3xaa16plx4a; ; xn--l8e1317j1ebz456b.xn--4xaa85plx4a;  # ��ᡕ𞤢.ᡥςتς
+��ᡕ𞤀。ᡥΣتΣ; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+��ᡕ𞤢。ᡥσتσ; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+xn--l8e1317j1ebz456b.xn--3xaa16plx4a; ��ᡕ𞤢.ᡥςتς; [B1, B5]; xn--l8e1317j1ebz456b.xn--3xaa16plx4a; ; ;  # ��ᡕ𞤢.ᡥςتς
+��ᡕ𞤀｡ᡥΣتΣ; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+��ᡕ𞤢｡ᡥσتσ; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+��ᡕ𞤢。ᡥΣتΣ; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+��ᡕ𞤢。ᡥΣتσ; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+��ᡕ𞤢。ᡥΣتς; ��ᡕ𞤢.ᡥσتς; [B1, B5]; xn--l8e1317j1ebz456b.xn--3xab95plx4a; ; xn--l8e1317j1ebz456b.xn--4xaa85plx4a;  # ��ᡕ𞤢.ᡥσتς
+��ᡕ𞤢。ᡥσتς; ��ᡕ𞤢.ᡥσتς; [B1, B5]; xn--l8e1317j1ebz456b.xn--3xab95plx4a; ; xn--l8e1317j1ebz456b.xn--4xaa85plx4a;  # ��ᡕ𞤢.ᡥσتς
+xn--l8e1317j1ebz456b.xn--3xab95plx4a; ��ᡕ𞤢.ᡥσتς; [B1, B5]; xn--l8e1317j1ebz456b.xn--3xab95plx4a; ; ;  # ��ᡕ𞤢.ᡥσتς
+��ᡕ𞤢｡ᡥΣتΣ; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+��ᡕ𞤢｡ᡥΣتσ; ��ᡕ𞤢.ᡥσتσ; [B1, B5]; xn--l8e1317j1ebz456b.xn--4xaa85plx4a; ; ;  # ��ᡕ𞤢.ᡥσتσ
+��ᡕ𞤢｡ᡥΣتς; ��ᡕ𞤢.ᡥσتς; [B1, B5]; xn--l8e1317j1ebz456b.xn--3xab95plx4a; ; xn--l8e1317j1ebz456b.xn--4xaa85plx4a;  # ��ᡕ𞤢.ᡥσتς
+��ᡕ𞤢｡ᡥσتς; ��ᡕ𞤢.ᡥσتς; [B1, B5]; xn--l8e1317j1ebz456b.xn--3xab95plx4a; ; xn--l8e1317j1ebz456b.xn--4xaa85plx4a;  # ��ᡕ𞤢.ᡥσتς
+�．-�ß; �.-5ß; [P1, V3, V6]; xn--t960e.xn---5-hia; ; xn--t960e.-5ss;  # .-5ß
+�.-5ß; ; [P1, V3, V6]; xn--t960e.xn---5-hia; ; xn--t960e.-5ss;  # .-5ß
+ó�’°.-5SS; ó�’°.-5ss; [P1, V3, V6]; xn--t960e.-5ss; ; ;  # .-5ss
+ó�’°.-5ss; ; [P1, V3, V6]; xn--t960e.-5ss; ; ;  # .-5ss
+xn--t960e.-5ss; ó�’°.-5ss; [V3, V6]; xn--t960e.-5ss; ; ;  # .-5ss
+xn--t960e.xn---5-hia; �.-5ß; [V3, V6]; xn--t960e.xn---5-hia; ; ;  # .-5ß
+�．-�SS; �.-5ss; [P1, V3, V6]; xn--t960e.-5ss; ; ;  # .-5ss
+�．-�ss; �.-5ss; [P1, V3, V6]; xn--t960e.-5ss; ; ;  # .-5ss
+�．-�Ss; �.-5ss; [P1, V3, V6]; xn--t960e.-5ss; ; ;  # .-5ss
+ó�’°.-5Ss; ó�’°.-5ss; [P1, V3, V6]; xn--t960e.-5ss; ; ;  # .-5ss
+��.🤒Ⴥ򑮶; ; [C2, P1, V6]; xn--1ug9533g.xn--9nd3211w0gz4b; ; xn--0s9c.xn--9nd3211w0gz4b; [P1, V5, V6] # �.🤒Ⴥ
+��.🤒ⴥ򑮶; ; [C2, P1, V6]; xn--1ug9533g.xn--tljz038l0gz4b; ; xn--0s9c.xn--tljz038l0gz4b; [P1, V5, V6] # �.🤒ⴥ
+xn--0s9c.xn--tljz038l0gz4b; �.🤒ⴥ򑮶; [V5, V6]; xn--0s9c.xn--tljz038l0gz4b; ; ;  # �.🤒ⴥ
+xn--1ug9533g.xn--tljz038l0gz4b; ��.🤒ⴥ򑮶; [C2, V6]; xn--1ug9533g.xn--tljz038l0gz4b; ; ;  # �.🤒ⴥ
+xn--0s9c.xn--9nd3211w0gz4b; �.🤒Ⴥ򑮶; [V5, V6]; xn--0s9c.xn--9nd3211w0gz4b; ; ;  # �.🤒Ⴥ
+xn--1ug9533g.xn--9nd3211w0gz4b; ��.🤒Ⴥ򑮶; [C2, V6]; xn--1ug9533g.xn--9nd3211w0gz4b; ; ;  # �.🤒Ⴥ
+𵋅。ß𬵩�; 𵋅.ß𬵩�; [C2, P1, V6]; xn--ey1p.xn--zca870nz438b; ; xn--ey1p.xn--ss-eq36b; [P1, V6] # .ß𬵩
+𵋅。SS𬵩�; 𵋅.ss𬵩�; [C2, P1, V6]; xn--ey1p.xn--ss-n1tx0508a; ; xn--ey1p.xn--ss-eq36b; [P1, V6] # .ss𬵩
+𵋅。ss𬵩�; 𵋅.ss𬵩�; [C2, P1, V6]; xn--ey1p.xn--ss-n1tx0508a; ; xn--ey1p.xn--ss-eq36b; [P1, V6] # .ss𬵩
+𵋅。Ss𬵩�; 𵋅.ss𬵩�; [C2, P1, V6]; xn--ey1p.xn--ss-n1tx0508a; ; xn--ey1p.xn--ss-eq36b; [P1, V6] # .ss𬵩
+xn--ey1p.xn--ss-eq36b; 𵋅.ss𬵩; [V6]; xn--ey1p.xn--ss-eq36b; ; ;  # .ss𬵩
+xn--ey1p.xn--ss-n1tx0508a; 𵋅.ss𬵩�; [C2, V6]; xn--ey1p.xn--ss-n1tx0508a; ; ;  # .ss𬵩
+xn--ey1p.xn--zca870nz438b; 𵋅.ß𬵩�; [C2, V6]; xn--ey1p.xn--zca870nz438b; ; ;  # .ß𬵩
+‌�。߱�𞹻; ‌�.߱�غ; [B1, C1, V5]; xn--0ugy003y.xn--lsa46nuub; ; xn--634m.xn--lsa46nuub; [B1, V5] # �.߱�غ
+‌�。߱�غ; ‌�.߱�غ; [B1, C1, V5]; xn--0ugy003y.xn--lsa46nuub; ; xn--634m.xn--lsa46nuub; [B1, V5] # �.߱�غ
+xn--634m.xn--lsa46nuub; �.߱�غ; [B1, V5]; xn--634m.xn--lsa46nuub; ; ;  # �.߱�غ
+xn--0ugy003y.xn--lsa46nuub; ‌�.߱�غ; [B1, C1, V5]; xn--0ugy003y.xn--lsa46nuub; ; ;  # �.߱�غ
+𞼌‌𑈶。�; 𞼌‌𑈶.�; [B1, B3, C1, P1, V6]; xn--0ug7946gzpxf.xn--8n0d; ; xn--9g1d1288a.xn--8n0d; [B1, P1, V6] # 𑈶.�
+xn--9g1d1288a.xn--8n0d; 𞼌𑈶.�; [B1, V6]; xn--9g1d1288a.xn--8n0d; ; ;  # 𑈶.�
+xn--0ug7946gzpxf.xn--8n0d; 𞼌‌𑈶.�; [B1, B3, C1, V6]; xn--0ug7946gzpxf.xn--8n0d; ; ;  # 𑈶.�
+󠅯򇽭‌🜭｡𑖿᪻ς≠; 򇽭‌🜭.𑖿᪻ς≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--3xa578i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻ς≠
+󠅯򇽭‌🜭｡𑖿᪻ς≠; 򇽭‌🜭.𑖿᪻ς≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--3xa578i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻ς≠
+󠅯򇽭‌🜭。𑖿᪻ς≠; 򇽭‌🜭.𑖿᪻ς≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--3xa578i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻ς≠
+󠅯򇽭‌🜭。𑖿᪻ς≠; 򇽭‌🜭.𑖿᪻ς≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--3xa578i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻ς≠
+󠅯򇽭‌🜭。𑖿᪻Σ≠; 򇽭‌🜭.𑖿᪻σ≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻σ≠
+󠅯򇽭‌🜭。𑖿᪻Σ≠; 򇽭‌🜭.𑖿᪻σ≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻σ≠
+󠅯򇽭‌🜭。𑖿᪻σ≠; 򇽭‌🜭.𑖿᪻σ≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻σ≠
+󠅯򇽭‌🜭。𑖿᪻σ≠; 򇽭‌🜭.𑖿᪻σ≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻σ≠
+xn--zb9h5968x.xn--4xa378i1mfjw7y; 򇽭🜭.𑖿᪻σ≠; [V5, V6]; xn--zb9h5968x.xn--4xa378i1mfjw7y; ; ;  # 🜭.𑖿᪻σ≠
+xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; 򇽭‌🜭.𑖿᪻σ≠; [C1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; ;  # 🜭.𑖿᪻σ≠
+xn--0ug3766p5nm1b.xn--3xa578i1mfjw7y; 򇽭‌🜭.𑖿᪻ς≠; [C1, V5, V6]; xn--0ug3766p5nm1b.xn--3xa578i1mfjw7y; ; ;  # 🜭.𑖿᪻ς≠
+󠅯򇽭‌🜭｡𑖿᪻Σ≠; 򇽭‌🜭.𑖿᪻σ≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻σ≠
+󠅯򇽭‌🜭｡𑖿᪻Σ≠; 򇽭‌🜭.𑖿᪻σ≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻σ≠
+󠅯򇽭‌🜭｡𑖿᪻σ≠; 򇽭‌🜭.𑖿᪻σ≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻σ≠
+󠅯򇽭‌🜭｡𑖿᪻σ≠; 򇽭‌🜭.𑖿᪻σ≠; [C1, P1, V5, V6]; xn--0ug3766p5nm1b.xn--4xa378i1mfjw7y; ; xn--zb9h5968x.xn--4xa378i1mfjw7y; [P1, V5, V6] # 🜭.𑖿᪻σ≠
+⒋｡⒈�򳴢; ⒋.⒈�򳴢; [C2, P1, V6]; xn--wsh.xn--1ug58o74922a; ; xn--wsh.xn--tsh07994h; [P1, V6] # ⒋.⒈
+4.。1.�򳴢; 4..1.�򳴢; [C2, P1, V6, X4_2]; 4..1.xn--1ug64613i; [C2, P1, V6, A4_2]; 4..1.xn--sf51d; [P1, V6, A4_2] # 4..1.
+4..1.xn--sf51d; 4..1.ò³´¢; [V6, X4_2]; 4..1.xn--sf51d; [V6, A4_2]; ;  # 4..1.
+4..1.xn--1ug64613i; 4..1.�򳴢; [C2, V6, X4_2]; 4..1.xn--1ug64613i; [C2, V6, A4_2]; ;  # 4..1.
+xn--wsh.xn--tsh07994h; â’‹.â’ˆò³´¢; [V6]; xn--wsh.xn--tsh07994h; ; ;  # â’‹.â’ˆ
+xn--wsh.xn--1ug58o74922a; ⒋.⒈�򳴢; [C2, V6]; xn--wsh.xn--1ug58o74922a; ; ;  # ⒋.⒈
+لß｡�᩠򾅢𞤾; لß.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--zca57y.xn--jof2298hn83fln78f; ; xn--ss-svd.xn--jof2298hn83fln78f;  # لß.᩠�𞤾
+لß｡᩠�򾅢𞤾; لß.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--zca57y.xn--jof2298hn83fln78f; ; xn--ss-svd.xn--jof2298hn83fln78f;  # لß.᩠�𞤾
+لß。᩠�򾅢𞤾; لß.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--zca57y.xn--jof2298hn83fln78f; ; xn--ss-svd.xn--jof2298hn83fln78f;  # لß.᩠�𞤾
+لSS。᩠�򾅢𞤜; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لss。᩠�򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لss。᩠�򾅢𞤜; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+xn--ss-svd.xn--jof2298hn83fln78f; لss.᩠�򾅢𞤾; [B1, B2, B3, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لß。᩠�򾅢𞤜; لß.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--zca57y.xn--jof2298hn83fln78f; ; xn--ss-svd.xn--jof2298hn83fln78f;  # لß.᩠�𞤾
+xn--zca57y.xn--jof2298hn83fln78f; لß.᩠�򾅢𞤾; [B1, B2, B3, V5, V6]; xn--zca57y.xn--jof2298hn83fln78f; ; ;  # لß.᩠�𞤾
+لSS｡᩠�򾅢𞤜; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لss｡᩠�򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لss｡᩠�򾅢𞤜; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لß｡᩠�򾅢𞤜; لß.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--zca57y.xn--jof2298hn83fln78f; ; xn--ss-svd.xn--jof2298hn83fln78f;  # لß.᩠�𞤾
+لSS｡�᩠򾅢𞤜; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لss｡�᩠򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لss｡�᩠򾅢𞤜; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لß｡�᩠򾅢𞤜; لß.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--zca57y.xn--jof2298hn83fln78f; ; xn--ss-svd.xn--jof2298hn83fln78f;  # لß.᩠�𞤾
+لSS。᩠�򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لSs。᩠�򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لSS｡᩠�򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لSs｡᩠�򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لSS｡�᩠򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+لSs｡�᩠򾅢𞤾; لss.᩠�򾅢𞤾; [B1, B2, B3, P1, V5, V6]; xn--ss-svd.xn--jof2298hn83fln78f; ; ;  # لss.᩠�𞤾
+�𑄳񼜲.ᷟី꠆𑜫; ; [B1, B3, B6, P1, V5, V6]; xn--1o0di0c0652w.xn--33e362arr1l153d; ; ;  # �𑄳.ᷟី꠆𑜫
+xn--1o0di0c0652w.xn--33e362arr1l153d; �𑄳񼜲.ᷟី꠆𑜫; [B1, B3, B6, V5, V6]; xn--1o0di0c0652w.xn--33e362arr1l153d; ; ;  # �𑄳.ᷟី꠆𑜫
+Ⴓ𑜫�򗭓．ڧ𑰶; Ⴓ𑜫�򗭓.ڧ𑰶; [P1, V6]; xn--rnd479ep20q7x12e.xn--9jb4223l; ; xn--rnd8945ky009c.xn--9jb4223l;  # Ⴓ𑜫.ڧ𑰶
+Ⴓ𑜫�򗭓.ڧ𑰶; ; [P1, V6]; xn--rnd479ep20q7x12e.xn--9jb4223l; ; xn--rnd8945ky009c.xn--9jb4223l;  # Ⴓ𑜫.ڧ𑰶
+ⴓ𑜫�򗭓.ڧ𑰶; ; [P1, V6]; xn--1ugy52cym7p7xu5e.xn--9jb4223l; ; xn--blj6306ey091d.xn--9jb4223l;  # ⴓ𑜫.ڧ𑰶
+xn--blj6306ey091d.xn--9jb4223l; ⴓ𑜫򗭓.ڧ𑰶; [V6]; xn--blj6306ey091d.xn--9jb4223l; ; ;  # ⴓ𑜫.ڧ𑰶
+xn--1ugy52cym7p7xu5e.xn--9jb4223l; ⴓ𑜫�򗭓.ڧ𑰶; [V6]; xn--1ugy52cym7p7xu5e.xn--9jb4223l; ; ;  # ⴓ𑜫.ڧ𑰶
+xn--rnd8945ky009c.xn--9jb4223l; Ⴓ𑜫򗭓.ڧ𑰶; [V6]; xn--rnd8945ky009c.xn--9jb4223l; ; ;  # Ⴓ𑜫.ڧ𑰶
+xn--rnd479ep20q7x12e.xn--9jb4223l; Ⴓ𑜫�򗭓.ڧ𑰶; [V6]; xn--rnd479ep20q7x12e.xn--9jb4223l; ; ;  # Ⴓ𑜫.ڧ𑰶
+ⴓ𑜫�򗭓．ڧ𑰶; ⴓ𑜫�򗭓.ڧ𑰶; [P1, V6]; xn--1ugy52cym7p7xu5e.xn--9jb4223l; ; xn--blj6306ey091d.xn--9jb4223l;  # ⴓ𑜫.ڧ𑰶
+�.🄆—; ; [P1, V5, V6]; xn--0s9c.xn--8ug8324p; ; ;  # �.🄆—
+�.5,—; ; [P1, V5, V6]; xn--0s9c.xn--5,-81t; ; ;  # �.5,—
+xn--0s9c.xn--5,-81t; �.5,—; [P1, V5, V6]; xn--0s9c.xn--5,-81t; ; ;  # �.5,—
+xn--0s9c.xn--8ug8324p; �.🄆—; [V5, V6]; xn--0s9c.xn--8ug8324p; ; ;  # �.🄆—
+򔊱�۸。󠾭-; 򔊱�۸.󠾭-; [P1, V3, V6]; xn--lmb18944c0g2z.xn----2k81m; ; ;  # ۸.-
+xn--lmb18944c0g2z.xn----2k81m; 򔊱�۸.󠾭-; [V3, V6]; xn--lmb18944c0g2z.xn----2k81m; ; ;  # ۸.-
+𼗸��。�ᡎᠴ; 𼗸��.�ᡎᠴ; [B1, B5, B6, P1, V6]; xn--osb0855kcc2r.xn--tlb299fhc; ; ;  # ��.ᡎᠴ
+xn--osb0855kcc2r.xn--tlb299fhc; 𼗸��.�ᡎᠴ; [B1, B5, B6, V6]; xn--osb0855kcc2r.xn--tlb299fhc; ; ;  # ��.ᡎᠴ
+�ᠮႾ🄂.🚗�𮹌‌; ; [B1, C1, C2, P1, V6]; xn--2nd129ay2gnw71c.xn--zvb692j9664aic1g; ; xn--2nd129ai554b.xn--zvb3124wpkpf; [B1, P1, V6] # ᠮႾ🄂.🚗�
+�ᠮႾ1,.🚗�𮹌‌; ; [B1, C1, C2, P1, V6]; xn--1,-ogkx89c39j.xn--zvb692j9664aic1g; ; xn--1,-ogkx89c.xn--zvb3124wpkpf; [B1, B6, P1, V6] # ᠮႾ1,.🚗�
+�ᠮⴞ1,.🚗�𮹌‌; ; [B1, C1, C2, P1, V6]; xn--1,-v3o161c53q.xn--zvb692j9664aic1g; ; xn--1,-v3o625k.xn--zvb3124wpkpf; [B1, B6, P1, V6] # ᠮⴞ1,.🚗�
+xn--1,-v3o625k.xn--zvb3124wpkpf; ᠮⴞ1,.🚗�𮹌; [B1, B6, P1, V6]; xn--1,-v3o625k.xn--zvb3124wpkpf; ; ;  # ᠮⴞ1,.🚗�
+xn--1,-v3o161c53q.xn--zvb692j9664aic1g; �ᠮⴞ1,.🚗�𮹌‌; [B1, C1, C2, P1, V6]; xn--1,-v3o161c53q.xn--zvb692j9664aic1g; ; ;  # ᠮⴞ1,.🚗�
+xn--1,-ogkx89c.xn--zvb3124wpkpf; ᠮႾ1,.🚗�𮹌; [B1, B6, P1, V6]; xn--1,-ogkx89c.xn--zvb3124wpkpf; ; ;  # ᠮႾ1,.🚗�
+xn--1,-ogkx89c39j.xn--zvb692j9664aic1g; �ᠮႾ1,.🚗�𮹌‌; [B1, C1, C2, P1, V6]; xn--1,-ogkx89c39j.xn--zvb692j9664aic1g; ; ;  # ᠮႾ1,.🚗�
+�ᠮⴞ🄂.🚗�𮹌‌; ; [B1, C1, C2, P1, V6]; xn--h7e341b0wlbv45b.xn--zvb692j9664aic1g; ; xn--h7e438h1p44a.xn--zvb3124wpkpf; [B1, P1, V6] # ᠮⴞ🄂.🚗�
+xn--h7e438h1p44a.xn--zvb3124wpkpf; ᠮⴞ🄂.🚗�𮹌; [B1, V6]; xn--h7e438h1p44a.xn--zvb3124wpkpf; ; ;  # ᠮⴞ🄂.🚗�
+xn--h7e341b0wlbv45b.xn--zvb692j9664aic1g; �ᠮⴞ🄂.🚗�𮹌‌; [B1, C1, C2, V6]; xn--h7e341b0wlbv45b.xn--zvb692j9664aic1g; ; ;  # ᠮⴞ🄂.🚗�
+xn--2nd129ai554b.xn--zvb3124wpkpf; ᠮႾ🄂.🚗�𮹌; [B1, V6]; xn--2nd129ai554b.xn--zvb3124wpkpf; ; ;  # ᠮႾ🄂.🚗�
+xn--2nd129ay2gnw71c.xn--zvb692j9664aic1g; �ᠮႾ🄂.🚗�𮹌‌; [B1, C1, C2, V6]; xn--2nd129ay2gnw71c.xn--zvb692j9664aic1g; ; ;  # ᠮႾ🄂.🚗�
+�ڗ．𑚶񼡷⾆; �ڗ.𑚶񼡷舌; [B1, P1, V5, V6]; xn--jfb41a.xn--tc1ap851axo39c; ; ;  # ڗ.𑚶舌
+�ڗ.𑚶񼡷舌; ; [B1, P1, V5, V6]; xn--jfb41a.xn--tc1ap851axo39c; ; ;  # ڗ.𑚶舌
+xn--jfb41a.xn--tc1ap851axo39c; �ڗ.𑚶񼡷舌; [B1, V5, V6]; xn--jfb41a.xn--tc1ap851axo39c; ; ;  # ڗ.𑚶舌
+🞅󠳡�.񲖷; ; [P1, V6]; xn--ie9hi1349bqdlb.xn--oj69a; ; ;  # 🞅.
+xn--ie9hi1349bqdlb.xn--oj69a; 🞅󠳡�.񲖷; [V6]; xn--ie9hi1349bqdlb.xn--oj69a; ; ;  # 🞅.
+⃧񯡎-�.4Ⴄ‌; ; [C1, P1, V5, V6]; xn----9snu5320fi76w.xn--4-f0g649i; ; xn----9snu5320fi76w.xn--4-f0g; [P1, V5, V6] # ⃧-.4Ⴄ
+⃧񯡎-�.4ⴄ‌; ; [C1, P1, V5, V6]; xn----9snu5320fi76w.xn--4-sgn589c; ; xn----9snu5320fi76w.xn--4-ivs; [P1, V5, V6] # ⃧-.4ⴄ
+xn----9snu5320fi76w.xn--4-ivs; ⃧񯡎-�.4ⴄ; [V5, V6]; xn----9snu5320fi76w.xn--4-ivs; ; ;  # ⃧-.4ⴄ
+xn----9snu5320fi76w.xn--4-sgn589c; ⃧񯡎-�.4ⴄ‌; [C1, V5, V6]; xn----9snu5320fi76w.xn--4-sgn589c; ; ;  # ⃧-.4ⴄ
+xn----9snu5320fi76w.xn--4-f0g; ⃧񯡎-�.4Ⴄ; [V5, V6]; xn----9snu5320fi76w.xn--4-f0g; ; ;  # ⃧-.4Ⴄ
+xn----9snu5320fi76w.xn--4-f0g649i; ⃧񯡎-�.4Ⴄ‌; [C1, V5, V6]; xn----9snu5320fi76w.xn--4-f0g649i; ; ;  # ⃧-.4Ⴄ
+ᚭ｡�ß𖫱; ᚭ.�ß𖫱; ; xn--hwe.xn--zca4946pblnc; ; xn--hwe.xn--ss-ci1ub261a;  # ᚭ.�ß𖫱
+ᚭ。�ß𖫱; ᚭ.�ß𖫱; ; xn--hwe.xn--zca4946pblnc; ; xn--hwe.xn--ss-ci1ub261a;  # ᚭ.�ß𖫱
+ᚭ。�SS𖫱; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+ᚭ。�ss𖫱; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+ᚭ。�Ss𖫱; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+xn--hwe.xn--ss-ci1ub261a; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+ᚭ.�ss𖫱; ; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+ᚭ.�SS𖫱; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+ᚭ.�Ss𖫱; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+xn--hwe.xn--zca4946pblnc; ᚭ.�ß𖫱; ; xn--hwe.xn--zca4946pblnc; ; ;  # ᚭ.�ß𖫱
+ᚭ.�ß𖫱; ; ; xn--hwe.xn--zca4946pblnc; ; xn--hwe.xn--ss-ci1ub261a;  # ᚭ.�ß𖫱
+ᚭ｡�SS𖫱; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+ᚭ｡�ss𖫱; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+ᚭ｡�Ss𖫱; ᚭ.�ss𖫱; ; xn--hwe.xn--ss-ci1ub261a; ; ;  # ᚭ.�ss𖫱
+�｡𞤫ꡪ; 1.𞤫ꡪ; [B1, B2, B3]; 1.xn--gd9al691d; ; ;  # 1.𞤫ꡪ
+1。𞤫ꡪ; 1.𞤫ꡪ; [B1, B2, B3]; 1.xn--gd9al691d; ; ;  # 1.𞤫ꡪ
+1。𞤉ꡪ; 1.𞤫ꡪ; [B1, B2, B3]; 1.xn--gd9al691d; ; ;  # 1.𞤫ꡪ
+1.xn--gd9al691d; 1.𞤫ꡪ; [B1, B2, B3]; 1.xn--gd9al691d; ; ;  # 1.𞤫ꡪ
+�｡𞤉ꡪ; 1.𞤫ꡪ; [B1, B2, B3]; 1.xn--gd9al691d; ; ;  # 1.𞤫ꡪ
+𯻼‌.𞶞򻙤񥘇; ; [B2, B3, B6, C1, P1, V6]; xn--0ug27500a.xn--2b7hs861pl540a; ; xn--kg4n.xn--2b7hs861pl540a; [B2, B3, P1, V6] # .
+xn--kg4n.xn--2b7hs861pl540a; 𯻼.𞶞򻙤񥘇; [B2, B3, V6]; xn--kg4n.xn--2b7hs861pl540a; ; ;  # .
+xn--0ug27500a.xn--2b7hs861pl540a; 𯻼‌.𞶞򻙤񥘇; [B2, B3, B6, C1, V6]; xn--0ug27500a.xn--2b7hs861pl540a; ; ;  # .
+𑑄≯｡𑜤; 𑑄≯.𑜤; [P1, V5, V6]; xn--hdh5636g.xn--ci2d; ; ;  # 𑑄≯.𑜤
+𑑄≯｡𑜤; 𑑄≯.𑜤; [P1, V5, V6]; xn--hdh5636g.xn--ci2d; ; ;  # 𑑄≯.𑜤
+𑑄≯。𑜤; 𑑄≯.𑜤; [P1, V5, V6]; xn--hdh5636g.xn--ci2d; ; ;  # 𑑄≯.𑜤
+𑑄≯。𑜤; 𑑄≯.𑜤; [P1, V5, V6]; xn--hdh5636g.xn--ci2d; ; ;  # 𑑄≯.𑜤
+xn--hdh5636g.xn--ci2d; 𑑄≯.𑜤; [V5, V6]; xn--hdh5636g.xn--ci2d; ; ;  # 𑑄≯.𑜤
+Ⴋ≮𱲆。�ާ�; Ⴋ≮𱲆.�ާ�; [C2, P1, V6]; xn--jnd802gsm17c.xn--lrb506jqr4n; ; xn--jnd802gsm17c.xn--lrb6479j; [P1, V5, V6] # Ⴋ≮.ާ�
+Ⴋ≮𱲆。�ާ�; Ⴋ≮𱲆.�ާ�; [C2, P1, V6]; xn--jnd802gsm17c.xn--lrb506jqr4n; ; xn--jnd802gsm17c.xn--lrb6479j; [P1, V5, V6] # Ⴋ≮.ާ�
+ⴋ≮𱲆。�ާ�; ⴋ≮𱲆.�ާ�; [C2, P1, V6]; xn--gdhz03bxt42d.xn--lrb506jqr4n; ; xn--gdhz03bxt42d.xn--lrb6479j; [P1, V5, V6] # ⴋ≮.ާ�
+ⴋ≮𱲆。�ާ�; ⴋ≮𱲆.�ާ�; [C2, P1, V6]; xn--gdhz03bxt42d.xn--lrb506jqr4n; ; xn--gdhz03bxt42d.xn--lrb6479j; [P1, V5, V6] # ⴋ≮.ާ�
+xn--gdhz03bxt42d.xn--lrb6479j; ⴋ≮𱲆.ާ�; [V5, V6]; xn--gdhz03bxt42d.xn--lrb6479j; ; ;  # ⴋ≮.ާ�
+xn--gdhz03bxt42d.xn--lrb506jqr4n; ⴋ≮𱲆.�ާ�; [C2, V6]; xn--gdhz03bxt42d.xn--lrb506jqr4n; ; ;  # ⴋ≮.ާ�
+xn--jnd802gsm17c.xn--lrb6479j; Ⴋ≮𱲆.ާ�; [V5, V6]; xn--jnd802gsm17c.xn--lrb6479j; ; ;  # Ⴋ≮.ާ�
+xn--jnd802gsm17c.xn--lrb506jqr4n; Ⴋ≮𱲆.�ާ�; [C2, V6]; xn--jnd802gsm17c.xn--lrb506jqr4n; ; ;  # Ⴋ≮.ާ�
+្.򆽒≯; ; [P1, V5, V6]; xn--u4e.xn--hdhx0084f; ; ;  # ្.≯
+្.򆽒≯; ្.򆽒≯; [P1, V5, V6]; xn--u4e.xn--hdhx0084f; ; ;  # ្.≯
+xn--u4e.xn--hdhx0084f; ្.򆽒≯; [V5, V6]; xn--u4e.xn--hdhx0084f; ; ;  # ្.≯
+�᜴．�É⬓𑄴; �᜴.�é⬓𑄴; [P1, V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+�᜴．�E�⬓𑄴; �᜴.�é⬓𑄴; [P1, V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+�᜴.�É⬓𑄴; �᜴.�é⬓𑄴; [P1, V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+�᜴.�E�⬓𑄴; �᜴.�é⬓𑄴; [P1, V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+�᜴.�e�⬓𑄴; �᜴.�é⬓𑄴; [P1, V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+�᜴.�é⬓𑄴; ; [P1, V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+xn--c0e34564d.xn--9ca207st53lg3f; �᜴.�é⬓𑄴; [V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+�᜴．�e�⬓𑄴; �᜴.�é⬓𑄴; [P1, V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+�᜴．�é⬓𑄴; �᜴.�é⬓𑄴; [P1, V5, V6]; xn--c0e34564d.xn--9ca207st53lg3f; ; ;  # ᜴.�é⬓𑄴
+ᢇ�꣄｡︒𞤺; ᢇ�꣄.︒𞤺; [B1, B6, C2, P1, V6]; xn--09e669a6x8j.xn--y86cv562b; ; xn--09e4694e.xn--y86cv562b; [B1, P1, V6] # ᢇ꣄.︒𞤺
+ᢇ�꣄。。𞤺; ᢇ�꣄..𞤺; [B6, C2, X4_2]; xn--09e669a6x8j..xn--ye6h; [B6, C2, A4_2]; xn--09e4694e..xn--ye6h; [A4_2] # ᢇ꣄..𞤺
+ᢇ�꣄。。𞤘; ᢇ�꣄..𞤺; [B6, C2, X4_2]; xn--09e669a6x8j..xn--ye6h; [B6, C2, A4_2]; xn--09e4694e..xn--ye6h; [A4_2] # ᢇ꣄..𞤺
+xn--09e4694e..xn--ye6h; ᢇ꣄..𞤺; [X4_2]; xn--09e4694e..xn--ye6h; [A4_2]; ;  # ᢇ꣄..𞤺
+xn--09e669a6x8j..xn--ye6h; ᢇ�꣄..𞤺; [B6, C2, X4_2]; xn--09e669a6x8j..xn--ye6h; [B6, C2, A4_2]; ;  # ᢇ꣄..𞤺
+ᢇ�꣄｡︒𞤘; ᢇ�꣄.︒𞤺; [B1, B6, C2, P1, V6]; xn--09e669a6x8j.xn--y86cv562b; ; xn--09e4694e.xn--y86cv562b; [B1, P1, V6] # ᢇ꣄.︒𞤺
+xn--09e4694e.xn--y86cv562b; ᢇ꣄.︒𞤺; [B1, V6]; xn--09e4694e.xn--y86cv562b; ; ;  # ᢇ꣄.︒𞤺
+xn--09e669a6x8j.xn--y86cv562b; ᢇ�꣄.︒𞤺; [B1, B6, C2, V6]; xn--09e669a6x8j.xn--y86cv562b; ; ;  # ᢇ꣄.︒𞤺
+𞩬򖙱᜔‌｡رު≮; 𞩬򖙱᜔‌.رު≮; [B2, B3, P1, V6]; xn--fze607b9651bjwl7c.xn--wgb86el10d; ; xn--fze3930v7hz6b.xn--wgb86el10d;  # ᜔.رު≮
+𞩬򖙱᜔‌｡رު≮; 𞩬򖙱᜔‌.رު≮; [B2, B3, P1, V6]; xn--fze607b9651bjwl7c.xn--wgb86el10d; ; xn--fze3930v7hz6b.xn--wgb86el10d;  # ᜔.رު≮
+𞩬򖙱᜔‌。رު≮; 𞩬򖙱᜔‌.رު≮; [B2, B3, P1, V6]; xn--fze607b9651bjwl7c.xn--wgb86el10d; ; xn--fze3930v7hz6b.xn--wgb86el10d;  # ᜔.رު≮
+𞩬򖙱᜔‌。رު≮; 𞩬򖙱᜔‌.رު≮; [B2, B3, P1, V6]; xn--fze607b9651bjwl7c.xn--wgb86el10d; ; xn--fze3930v7hz6b.xn--wgb86el10d;  # ᜔.رު≮
+xn--fze3930v7hz6b.xn--wgb86el10d; 𞩬򖙱᜔.رު≮; [B2, B3, V6]; xn--fze3930v7hz6b.xn--wgb86el10d; ; ;  # ᜔.رު≮
+xn--fze607b9651bjwl7c.xn--wgb86el10d; 𞩬򖙱᜔‌.رު≮; [B2, B3, V6]; xn--fze607b9651bjwl7c.xn--wgb86el10d; ; ;  # ᜔.رު≮
+Ⴣ．ٓᢤ; Ⴣ.ٓᢤ; [P1, V5, V6]; xn--7nd.xn--vhb294g; ; ;  # Ⴣ.ٓᢤ
+Ⴣ.ٓᢤ; ; [P1, V5, V6]; xn--7nd.xn--vhb294g; ; ;  # Ⴣ.ٓᢤ
+ⴣ.ٓᢤ; ; [V5]; xn--rlj.xn--vhb294g; ; ;  # ⴣ.ٓᢤ
+xn--rlj.xn--vhb294g; ⴣ.ٓᢤ; [V5]; xn--rlj.xn--vhb294g; ; ;  # ⴣ.ٓᢤ
+xn--7nd.xn--vhb294g; Ⴣ.ٓᢤ; [V5, V6]; xn--7nd.xn--vhb294g; ; ;  # Ⴣ.ٓᢤ
+ⴣ．ٓᢤ; ⴣ.ٓᢤ; [V5]; xn--rlj.xn--vhb294g; ; ;  # ⴣ.ٓᢤ
+󠄈ࠓ．싉򄆻Ⴤ�; ࠓ.싉򄆻Ⴤ�; [P1, V6]; xn--oub.xn--8nd9522gpe69cviva; ; ;  # ࠓ.싉Ⴤ
+󠄈ࠓ．싉򄆻Ⴤ�; ࠓ.싉򄆻Ⴤ�; [P1, V6]; xn--oub.xn--8nd9522gpe69cviva; ; ;  # ࠓ.싉Ⴤ
+󠄈ࠓ.싉򄆻Ⴤ�; ࠓ.싉򄆻Ⴤ�; [P1, V6]; xn--oub.xn--8nd9522gpe69cviva; ; ;  # ࠓ.싉Ⴤ
+󠄈ࠓ.싉򄆻Ⴤ�; ࠓ.싉򄆻Ⴤ�; [P1, V6]; xn--oub.xn--8nd9522gpe69cviva; ; ;  # ࠓ.싉Ⴤ
+󠄈ࠓ.싉򄆻ⴤ�; ࠓ.싉򄆻ⴤ�; [P1, V6]; xn--oub.xn--sljz109bpe25dviva; ; ;  # ࠓ.싉ⴤ
+󠄈ࠓ.싉򄆻ⴤ�; ࠓ.싉򄆻ⴤ�; [P1, V6]; xn--oub.xn--sljz109bpe25dviva; ; ;  # ࠓ.싉ⴤ
+xn--oub.xn--sljz109bpe25dviva; ࠓ.싉򄆻ⴤ�; [V6]; xn--oub.xn--sljz109bpe25dviva; ; ;  # ࠓ.싉ⴤ
+xn--oub.xn--8nd9522gpe69cviva; ࠓ.싉򄆻Ⴤ�; [V6]; xn--oub.xn--8nd9522gpe69cviva; ; ;  # ࠓ.싉Ⴤ
+󠄈ࠓ．싉򄆻ⴤ�; ࠓ.싉򄆻ⴤ�; [P1, V6]; xn--oub.xn--sljz109bpe25dviva; ; ;  # ࠓ.싉ⴤ
+󠄈ࠓ．싉򄆻ⴤ�; ࠓ.싉򄆻ⴤ�; [P1, V6]; xn--oub.xn--sljz109bpe25dviva; ; ;  # ࠓ.싉ⴤ
+ꨬ𑲫≮．⤂; ꨬ𑲫≮.⤂; [P1, V5, V6]; xn--gdh1854cn19c.xn--kqi; ; ;  # ꨬ𑲫≮.⤂
+ꨬ𑲫≮．⤂; ꨬ𑲫≮.⤂; [P1, V5, V6]; xn--gdh1854cn19c.xn--kqi; ; ;  # ꨬ𑲫≮.⤂
+ꨬ𑲫≮.⤂; ; [P1, V5, V6]; xn--gdh1854cn19c.xn--kqi; ; ;  # ꨬ𑲫≮.⤂
+ꨬ𑲫≮.⤂; ꨬ𑲫≮.⤂; [P1, V5, V6]; xn--gdh1854cn19c.xn--kqi; ; ;  # ꨬ𑲫≮.⤂
+xn--gdh1854cn19c.xn--kqi; ꨬ𑲫≮.⤂; [V5, V6]; xn--gdh1854cn19c.xn--kqi; ; ;  # ꨬ𑲫≮.⤂
+؄�≮Ⴢ．Ⴃ; ؄�≮Ⴢ.Ⴃ; [B1, P1, V6]; xn--mfb416c0jox02t.xn--bnd; ; ;  # �≮Ⴢ.Ⴃ
+؄�≮Ⴢ．Ⴃ; ؄�≮Ⴢ.Ⴃ; [B1, P1, V6]; xn--mfb416c0jox02t.xn--bnd; ; ;  # �≮Ⴢ.Ⴃ
+؄�≮Ⴢ.Ⴃ; ; [B1, P1, V6]; xn--mfb416c0jox02t.xn--bnd; ; ;  # �≮Ⴢ.Ⴃ
+؄�≮Ⴢ.Ⴃ; ؄�≮Ⴢ.Ⴃ; [B1, P1, V6]; xn--mfb416c0jox02t.xn--bnd; ; ;  # �≮Ⴢ.Ⴃ
+؄�≮ⴢ.ⴃ; ؄�≮ⴢ.ⴃ; [B1, P1, V6]; xn--mfb266l4khr54u.xn--ukj; ; ;  # �≮ⴢ.ⴃ
+؄�≮ⴢ.ⴃ; ; [B1, P1, V6]; xn--mfb266l4khr54u.xn--ukj; ; ;  # �≮ⴢ.ⴃ
+؄�≮Ⴢ.ⴃ; ; [B1, P1, V6]; xn--mfb416c0jox02t.xn--ukj; ; ;  # �≮Ⴢ.ⴃ
+؄�≮Ⴢ.ⴃ; ؄�≮Ⴢ.ⴃ; [B1, P1, V6]; xn--mfb416c0jox02t.xn--ukj; ; ;  # �≮Ⴢ.ⴃ
+xn--mfb416c0jox02t.xn--ukj; ؄�≮Ⴢ.ⴃ; [B1, V6]; xn--mfb416c0jox02t.xn--ukj; ; ;  # �≮Ⴢ.ⴃ
+xn--mfb266l4khr54u.xn--ukj; ؄�≮ⴢ.ⴃ; [B1, V6]; xn--mfb266l4khr54u.xn--ukj; ; ;  # �≮ⴢ.ⴃ
+xn--mfb416c0jox02t.xn--bnd; ؄�≮Ⴢ.Ⴃ; [B1, V6]; xn--mfb416c0jox02t.xn--bnd; ; ;  # �≮Ⴢ.Ⴃ
+؄�≮ⴢ．ⴃ; ؄�≮ⴢ.ⴃ; [B1, P1, V6]; xn--mfb266l4khr54u.xn--ukj; ; ;  # �≮ⴢ.ⴃ
+؄�≮ⴢ．ⴃ; ؄�≮ⴢ.ⴃ; [B1, P1, V6]; xn--mfb266l4khr54u.xn--ukj; ; ;  # �≮ⴢ.ⴃ
+؄�≮Ⴢ．ⴃ; ؄�≮Ⴢ.ⴃ; [B1, P1, V6]; xn--mfb416c0jox02t.xn--ukj; ; ;  # �≮Ⴢ.ⴃ
+؄�≮Ⴢ．ⴃ; ؄�≮Ⴢ.ⴃ; [B1, P1, V6]; xn--mfb416c0jox02t.xn--ukj; ; ;  # �≮Ⴢ.ⴃ
+�。-; �.-; [V3, V5]; xn--210d.-; ; ;  # �.-
+xn--210d.-; �.-; [V3, V5]; xn--210d.-; ; ;  # �.-
+්򕸽󠧱｡饈≠٤; ්򕸽󠧱.饈≠٤; [B1, B5, B6, P1, V5, V6]; xn--h1c25913jfwov.xn--dib144ler5f; ; ;  # ්.饈≠٤
+්򕸽󠧱｡饈≠٤; ්򕸽󠧱.饈≠٤; [B1, B5, B6, P1, V5, V6]; xn--h1c25913jfwov.xn--dib144ler5f; ; ;  # ්.饈≠٤
+්򕸽󠧱。饈≠٤; ්򕸽󠧱.饈≠٤; [B1, B5, B6, P1, V5, V6]; xn--h1c25913jfwov.xn--dib144ler5f; ; ;  # ්.饈≠٤
+්򕸽󠧱。饈≠٤; ්򕸽󠧱.饈≠٤; [B1, B5, B6, P1, V5, V6]; xn--h1c25913jfwov.xn--dib144ler5f; ; ;  # ්.饈≠٤
+xn--h1c25913jfwov.xn--dib144ler5f; ්򕸽󠧱.饈≠٤; [B1, B5, B6, V5, V6]; xn--h1c25913jfwov.xn--dib144ler5f; ; ;  # ්.饈≠٤
+𞥃ᠠ�｡≯邅⬻4; 𞥃ᠠ7.≯邅⬻4; [B1, B2, P1, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+𞥃ᠠ�｡≯邅⬻4; 𞥃ᠠ7.≯邅⬻4; [B1, B2, P1, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+𞥃ᠠ7。≯邅⬻4; 𞥃ᠠ7.≯邅⬻4; [B1, B2, P1, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+𞥃ᠠ7。≯邅⬻4; 𞥃ᠠ7.≯邅⬻4; [B1, B2, P1, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+𞤡ᠠ7。≯邅⬻4; 𞥃ᠠ7.≯邅⬻4; [B1, B2, P1, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+𞤡ᠠ7。≯邅⬻4; 𞥃ᠠ7.≯邅⬻4; [B1, B2, P1, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+xn--7-v4j2826w.xn--4-ogoy01bou3i; 𞥃ᠠ7.≯邅⬻4; [B1, B2, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+𞤡ᠠ�｡≯邅⬻4; 𞥃ᠠ7.≯邅⬻4; [B1, B2, P1, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+𞤡ᠠ�｡≯邅⬻4; 𞥃ᠠ7.≯邅⬻4; [B1, B2, P1, V6]; xn--7-v4j2826w.xn--4-ogoy01bou3i; ; ;  # 𞥃ᠠ7.≯邅⬻4
+򠿯ᡳ-�.��؅󑎳; ; [B1, B6, P1, V6]; xn----m9j3429kxmy7e.xn--nfb7950kdihrp812a; ; ;  # ᡳ-�.��
+xn----m9j3429kxmy7e.xn--nfb7950kdihrp812a; 򠿯ᡳ-�.��؅󑎳; [B1, B6, V6]; xn----m9j3429kxmy7e.xn--nfb7950kdihrp812a; ; ;  # ᡳ-�.��
+򠶆ࡅੑ.넨-󶧈; ; [B5, B6, P1, V6]; xn--3vb26hb6834b.xn----i37ez0957g; ; ;  # ࡅੑ.넨-
+򠶆ࡅੑ.넨-󶧈; 򠶆ࡅੑ.넨-󶧈; [B5, B6, P1, V6]; xn--3vb26hb6834b.xn----i37ez0957g; ; ;  # ࡅੑ.넨-
+xn--3vb26hb6834b.xn----i37ez0957g; 򠶆ࡅੑ.넨-󶧈; [B5, B6, V6]; xn--3vb26hb6834b.xn----i37ez0957g; ; ;  # ࡅੑ.넨-
+ꡦᡑ�⒈。�-; ꡦᡑ�⒈.�-; [C2, P1, V3, V6]; xn--h8e470bl0d838o.xn----381i; ; xn--h8e863drj7h.xn----381i; [P1, V3, V6] # ꡦᡑ⒈.�-
+ꡦᡑ�1.。�-; ꡦᡑ�1..�-; [C2, V3, X4_2]; xn--1-o7j663bdl7m..xn----381i; [C2, V3, A4_2]; xn--1-o7j0610f..xn----381i; [V3, A4_2] # ꡦᡑ1..�-
+xn--1-o7j0610f..xn----381i; ꡦᡑ1..�-; [V3, X4_2]; xn--1-o7j0610f..xn----381i; [V3, A4_2]; ;  # ꡦᡑ1..�-
+xn--1-o7j663bdl7m..xn----381i; ꡦᡑ�1..�-; [C2, V3, X4_2]; xn--1-o7j663bdl7m..xn----381i; [C2, V3, A4_2]; ;  # ꡦᡑ1..�-
+xn--h8e863drj7h.xn----381i; ꡦᡑ⒈.�-; [V3, V6]; xn--h8e863drj7h.xn----381i; ; ;  # ꡦᡑ⒈.�-
+xn--h8e470bl0d838o.xn----381i; ꡦᡑ�⒈.�-; [C2, V3, V6]; xn--h8e470bl0d838o.xn----381i; ; ;  # ꡦᡑ⒈.�-
+Ⴌ。�ﭩ; Ⴌ.�ٹ; [B5, B6, P1, V6]; xn--knd.xn--yib19191t; ; ;  # Ⴌ.ٹ
+Ⴌ。�ٹ; Ⴌ.�ٹ; [B5, B6, P1, V6]; xn--knd.xn--yib19191t; ; ;  # Ⴌ.ٹ
+ⴌ。�ٹ; ⴌ.�ٹ; [B5, B6, P1, V6]; xn--3kj.xn--yib19191t; ; ;  # ⴌ.ٹ
+xn--3kj.xn--yib19191t; ⴌ.�ٹ; [B5, B6, V6]; xn--3kj.xn--yib19191t; ; ;  # ⴌ.ٹ
+xn--knd.xn--yib19191t; Ⴌ.�ٹ; [B5, B6, V6]; xn--knd.xn--yib19191t; ; ;  # Ⴌ.ٹ
+ⴌ。�ﭩ; ⴌ.�ٹ; [B5, B6, P1, V6]; xn--3kj.xn--yib19191t; ; ;  # ⴌ.ٹ
+��.྄�-ᳺ; ; [B1, V5]; xn--r19c5a.xn----xjg270ag3m; ; ;  # ��.྄�-ᳺ
+xn--r19c5a.xn----xjg270ag3m; ��.྄�-ᳺ; [B1, V5]; xn--r19c5a.xn----xjg270ag3m; ; ;  # ��.྄�-ᳺ
+⒈䰹�-。웈; ⒈䰹�-.웈; [C2, P1, V3, V6]; xn----tgnx5rjr6c.xn--kp5b; ; xn----dcp160o.xn--kp5b; [P1, V3, V6] # ⒈䰹-.웈
+⒈䰹�-。웈; ⒈䰹�-.웈; [C2, P1, V3, V6]; xn----tgnx5rjr6c.xn--kp5b; ; xn----dcp160o.xn--kp5b; [P1, V3, V6] # ⒈䰹-.웈
+1.䰹�-。웈; 1.䰹�-.웈; [C2, V3]; 1.xn----tgnz80r.xn--kp5b; ; 1.xn----zw5a.xn--kp5b; [V3] # 1.䰹-.웈
+1.䰹�-。웈; 1.䰹�-.웈; [C2, V3]; 1.xn----tgnz80r.xn--kp5b; ; 1.xn----zw5a.xn--kp5b; [V3] # 1.䰹-.웈
+1.xn----zw5a.xn--kp5b; 1.䰹-.웈; [V3]; 1.xn----zw5a.xn--kp5b; ; ;  # 1.䰹-.웈
+1.xn----tgnz80r.xn--kp5b; 1.䰹�-.웈; [C2, V3]; 1.xn----tgnz80r.xn--kp5b; ; ;  # 1.䰹-.웈
+xn----dcp160o.xn--kp5b; ⒈䰹-.웈; [V3, V6]; xn----dcp160o.xn--kp5b; ; ;  # ⒈䰹-.웈
+xn----tgnx5rjr6c.xn--kp5b; ⒈䰹�-.웈; [C2, V3, V6]; xn----tgnx5rjr6c.xn--kp5b; ; ;  # ⒈䰹-.웈
+�。‌󠳽߳; �.‌󠳽߳; [C1, P1, V6]; xn--m9j.xn--rtb154j9l73w; ; xn--m9j.xn--rtb10784p; [P1, V6] # �.߳
+xn--m9j.xn--rtb10784p; �.󠳽߳; [V6]; xn--m9j.xn--rtb10784p; ; ;  # �.߳
+xn--m9j.xn--rtb154j9l73w; �.‌󠳽߳; [C1, V6]; xn--m9j.xn--rtb154j9l73w; ; ;  # �.߳
+ς｡꧀ۧ; ς.꧀ۧ; [V5]; xn--3xa.xn--3lb1944f; ; xn--4xa.xn--3lb1944f;  # ς.꧀ۧ
+ς。꧀ۧ; ς.꧀ۧ; [V5]; xn--3xa.xn--3lb1944f; ; xn--4xa.xn--3lb1944f;  # ς.꧀ۧ
+Σ。꧀ۧ; σ.꧀ۧ; [V5]; xn--4xa.xn--3lb1944f; ; ;  # σ.꧀ۧ
+σ。꧀ۧ; σ.꧀ۧ; [V5]; xn--4xa.xn--3lb1944f; ; ;  # σ.꧀ۧ
+xn--4xa.xn--3lb1944f; σ.꧀ۧ; [V5]; xn--4xa.xn--3lb1944f; ; ;  # σ.꧀ۧ
+xn--3xa.xn--3lb1944f; ς.꧀ۧ; [V5]; xn--3xa.xn--3lb1944f; ; ;  # ς.꧀ۧ
+Σ｡꧀ۧ; σ.꧀ۧ; [V5]; xn--4xa.xn--3lb1944f; ; ;  # σ.꧀ۧ
+σ｡꧀ۧ; σ.꧀ۧ; [V5]; xn--4xa.xn--3lb1944f; ; ;  # σ.꧀ۧ
+�󥫅򌉑.ႢႵ; ; [P1, V5, V6]; xn--xmc83135idcxza.xn--9md2b; ; ;  # �.ႢႵ
+�󥫅򌉑.ⴂⴕ; ; [P1, V5, V6]; xn--xmc83135idcxza.xn--tkjwb; ; ;  # �.ⴂⴕ
+�󥫅򌉑.Ⴂⴕ; ; [P1, V5, V6]; xn--xmc83135idcxza.xn--9md086l; ; ;  # �.Ⴂⴕ
+xn--xmc83135idcxza.xn--9md086l; �󥫅򌉑.Ⴂⴕ; [V5, V6]; xn--xmc83135idcxza.xn--9md086l; ; ;  # �.Ⴂⴕ
+xn--xmc83135idcxza.xn--tkjwb; �󥫅򌉑.ⴂⴕ; [V5, V6]; xn--xmc83135idcxza.xn--tkjwb; ; ;  # �.ⴂⴕ
+xn--xmc83135idcxza.xn--9md2b; �󥫅򌉑.ႢႵ; [V5, V6]; xn--xmc83135idcxza.xn--9md2b; ; ;  # �.ႢႵ
+ᰲ🄈⾛֦．�򯥤߽; ᰲ🄈走֦.�򯥤߽; [C2, P1, V5, V6]; xn--xcb756i493fwi5o.xn--1tb334j1197q; ; xn--xcb756i493fwi5o.xn--1tb13454l; [P1, V5, V6] # ᰲ🄈走֦.߽
+ᰲ7,走֦.�򯥤߽; ; [C2, P1, V5, V6]; xn--7,-bid991urn3k.xn--1tb334j1197q; ; xn--7,-bid991urn3k.xn--1tb13454l; [P1, V5, V6] # ᰲ7,走֦.߽
+xn--7,-bid991urn3k.xn--1tb13454l; ᰲ7,走֦.򯥤߽; [P1, V5, V6]; xn--7,-bid991urn3k.xn--1tb13454l; ; ;  # ᰲ7,走֦.߽
+xn--7,-bid991urn3k.xn--1tb334j1197q; ᰲ7,走֦.�򯥤߽; [C2, P1, V5, V6]; xn--7,-bid991urn3k.xn--1tb334j1197q; ; ;  # ᰲ7,走֦.߽
+xn--xcb756i493fwi5o.xn--1tb13454l; ᰲ🄈走֦.򯥤߽; [V5, V6]; xn--xcb756i493fwi5o.xn--1tb13454l; ; ;  # ᰲ🄈走֦.߽
+xn--xcb756i493fwi5o.xn--1tb334j1197q; ᰲ🄈走֦.�򯥤߽; [C2, V5, V6]; xn--xcb756i493fwi5o.xn--1tb334j1197q; ; ;  # ᰲ🄈走֦.߽
+ᢗ｡Ӏ�; ᢗ.Ӏ�; [P1, V6]; xn--hbf.xn--d5a86117e; ; ;  # ᢗ.Ӏ
+ᢗ。Ӏ�; ᢗ.Ӏ�; [P1, V6]; xn--hbf.xn--d5a86117e; ; ;  # ᢗ.Ӏ
+ᢗ。��; ᢗ.��; [P1, V6]; xn--hbf.xn--s5a83117e; ; ;  # ᢗ.�
+xn--hbf.xn--s5a83117e; ᢗ.��; [V6]; xn--hbf.xn--s5a83117e; ; ;  # ᢗ.�
+xn--hbf.xn--d5a86117e; ᢗ.Ӏ�; [V6]; xn--hbf.xn--d5a86117e; ; ;  # ᢗ.Ӏ
+ᢗ｡��; ᢗ.��; [P1, V6]; xn--hbf.xn--s5a83117e; ; ;  # ᢗ.�
+٨-。��ᄾ; ٨-.��ᄾ; [B1, P1, V3, V6]; xn----oqc.xn--qrd1699v327w; ; ;  # ٨-.�ᄾ
+xn----oqc.xn--qrd1699v327w; ٨-.��ᄾ; [B1, V3, V6]; xn----oqc.xn--qrd1699v327w; ; ;  # ٨-.�ᄾ
+-�𖾑。󠆬; -�𖾑.; [V3]; xn----991iq40y.; ; ;  # -�𖾑.
+xn----991iq40y.; -�𖾑.; [V3]; xn----991iq40y.; ; ;  # -�𖾑.
+‌��멈.꯭�; ; [B1, C1, P1, V5, V6]; xn--0ug6681d406b7bwk.xn--429a8682s; ; xn--422b325mqb6i.xn--429a8682s; [B1, P1, V5, V6] # ��멈.꯭
+‌��멈.꯭�; ‌��멈.꯭�; [B1, C1, P1, V5, V6]; xn--0ug6681d406b7bwk.xn--429a8682s; ; xn--422b325mqb6i.xn--429a8682s; [B1, P1, V5, V6] # ��멈.꯭
+xn--422b325mqb6i.xn--429a8682s; ��멈.꯭�; [B1, V5, V6]; xn--422b325mqb6i.xn--429a8682s; ; ;  # ��멈.꯭
+xn--0ug6681d406b7bwk.xn--429a8682s; ‌��멈.꯭�; [B1, C1, V5, V6]; xn--0ug6681d406b7bwk.xn--429a8682s; ; ;  # ��멈.꯭
+≮.ݩ؃; ; [B1, P1, V6]; xn--gdh.xn--lfb92e; ; ;  # ≮.ݩ
+≮.ݩ؃; ≮.ݩ؃; [B1, P1, V6]; xn--gdh.xn--lfb92e; ; ;  # ≮.ݩ
+xn--gdh.xn--lfb92e; ≮.ݩ؃; [B1, V6]; xn--gdh.xn--lfb92e; ; ;  # ≮.ݩ
+�⾆｡‌𑚶򟱃𞰘; �舌.‌𑚶򟱃𞰘; [B1, B2, B3, C1, P1, V6]; xn--tc1ao37z.xn--0ugx728gi1nfwqz2e; ; xn--tc1ao37z.xn--6e2dw557azds2d; [B2, B3, B5, B6, P1, V5, V6] # 舌.𑚶
+�舌。‌𑚶򟱃𞰘; �舌.‌𑚶򟱃𞰘; [B1, B2, B3, C1, P1, V6]; xn--tc1ao37z.xn--0ugx728gi1nfwqz2e; ; xn--tc1ao37z.xn--6e2dw557azds2d; [B2, B3, B5, B6, P1, V5, V6] # 舌.𑚶
+xn--tc1ao37z.xn--6e2dw557azds2d; �舌.𑚶򟱃𞰘; [B2, B3, B5, B6, V5, V6]; xn--tc1ao37z.xn--6e2dw557azds2d; ; ;  # 舌.𑚶
+xn--tc1ao37z.xn--0ugx728gi1nfwqz2e; �舌.‌𑚶򟱃𞰘; [B1, B2, B3, C1, V6]; xn--tc1ao37z.xn--0ugx728gi1nfwqz2e; ; ;  # 舌.𑚶
+‌Ⴠ-.�ς𞴺ς; ‌Ⴠ-.1ς𞴺ς; [B1, C1, P1, V3, V6]; xn----z1g168i.xn--1-ymba92321c; ; xn----z1g.xn--1-0mba52321c; [B1, B6, P1, V3, V6] # Ⴠ-.1ς𞴺ς
+‌Ⴠ-.1ς𞴺ς; ; [B1, C1, P1, V3, V6]; xn----z1g168i.xn--1-ymba92321c; ; xn----z1g.xn--1-0mba52321c; [B1, B6, P1, V3, V6] # Ⴠ-.1ς𞴺ς
+‌ⴠ-.1ς𞴺ς; ; [B1, C1, V3]; xn----rgn530d.xn--1-ymba92321c; ; xn----2ws.xn--1-0mba52321c; [B1, B6, V3] # ⴠ-.1ς𞴺ς
+‌Ⴠ-.1Σ𞴺Σ; ‌Ⴠ-.1σ𞴺σ; [B1, C1, P1, V3, V6]; xn----z1g168i.xn--1-0mba52321c; ; xn----z1g.xn--1-0mba52321c; [B1, B6, P1, V3, V6] # Ⴠ-.1σ𞴺σ
+‌ⴠ-.1σ𞴺σ; ; [B1, C1, V3]; xn----rgn530d.xn--1-0mba52321c; ; xn----2ws.xn--1-0mba52321c; [B1, B6, V3] # ⴠ-.1σ𞴺σ
+‌Ⴠ-.1σ𞴺Σ; ‌Ⴠ-.1σ𞴺σ; [B1, C1, P1, V3, V6]; xn----z1g168i.xn--1-0mba52321c; ; xn----z1g.xn--1-0mba52321c; [B1, B6, P1, V3, V6] # Ⴠ-.1σ𞴺σ
+xn----z1g.xn--1-0mba52321c; Ⴠ-.1σ𞴺σ; [B1, B6, V3, V6]; xn----z1g.xn--1-0mba52321c; ; ;  # Ⴠ-.1σ𞴺σ
+xn----z1g168i.xn--1-0mba52321c; ‌Ⴠ-.1σ𞴺σ; [B1, C1, V3, V6]; xn----z1g168i.xn--1-0mba52321c; ; ;  # Ⴠ-.1σ𞴺σ
+xn----2ws.xn--1-0mba52321c; ⴠ-.1σ𞴺σ; [B1, B6, V3]; xn----2ws.xn--1-0mba52321c; ; ;  # ⴠ-.1σ𞴺σ
+xn----rgn530d.xn--1-0mba52321c; ‌ⴠ-.1σ𞴺σ; [B1, C1, V3]; xn----rgn530d.xn--1-0mba52321c; ; ;  # ⴠ-.1σ𞴺σ
+‌Ⴠ-.1ς𞴺Σ; ‌Ⴠ-.1ς𞴺σ; [B1, C1, P1, V3, V6]; xn----z1g168i.xn--1-ymbd52321c; ; xn----z1g.xn--1-0mba52321c; [B1, B6, P1, V3, V6] # Ⴠ-.1ς𞴺σ
+‌ⴠ-.1ς𞴺σ; ; [B1, C1, V3]; xn----rgn530d.xn--1-ymbd52321c; ; xn----2ws.xn--1-0mba52321c; [B1, B6, V3] # ⴠ-.1ς𞴺σ
+xn----rgn530d.xn--1-ymbd52321c; ‌ⴠ-.1ς𞴺σ; [B1, C1, V3]; xn----rgn530d.xn--1-ymbd52321c; ; ;  # ⴠ-.1ς𞴺σ
+xn----z1g168i.xn--1-ymbd52321c; ‌Ⴠ-.1ς𞴺σ; [B1, C1, V3, V6]; xn----z1g168i.xn--1-ymbd52321c; ; ;  # Ⴠ-.1ς𞴺σ
+xn----rgn530d.xn--1-ymba92321c; ‌ⴠ-.1ς𞴺ς; [B1, C1, V3]; xn----rgn530d.xn--1-ymba92321c; ; ;  # ⴠ-.1ς𞴺ς
+xn----z1g168i.xn--1-ymba92321c; ‌Ⴠ-.1ς𞴺ς; [B1, C1, V3, V6]; xn----z1g168i.xn--1-ymba92321c; ; ;  # Ⴠ-.1ς𞴺ς
+‌ⴠ-.�ς𞴺ς; ‌ⴠ-.1ς𞴺ς; [B1, C1, V3]; xn----rgn530d.xn--1-ymba92321c; ; xn----2ws.xn--1-0mba52321c; [B1, B6, V3] # ⴠ-.1ς𞴺ς
+‌Ⴠ-.�Σ𞴺Σ; ‌Ⴠ-.1σ𞴺σ; [B1, C1, P1, V3, V6]; xn----z1g168i.xn--1-0mba52321c; ; xn----z1g.xn--1-0mba52321c; [B1, B6, P1, V3, V6] # Ⴠ-.1σ𞴺σ
+‌ⴠ-.�σ𞴺σ; ‌ⴠ-.1σ𞴺σ; [B1, C1, V3]; xn----rgn530d.xn--1-0mba52321c; ; xn----2ws.xn--1-0mba52321c; [B1, B6, V3] # ⴠ-.1σ𞴺σ
+‌Ⴠ-.�σ𞴺Σ; ‌Ⴠ-.1σ𞴺σ; [B1, C1, P1, V3, V6]; xn----z1g168i.xn--1-0mba52321c; ; xn----z1g.xn--1-0mba52321c; [B1, B6, P1, V3, V6] # Ⴠ-.1σ𞴺σ
+‌Ⴠ-.�ς𞴺Σ; ‌Ⴠ-.1ς𞴺σ; [B1, C1, P1, V3, V6]; xn----z1g168i.xn--1-ymbd52321c; ; xn----z1g.xn--1-0mba52321c; [B1, B6, P1, V3, V6] # Ⴠ-.1ς𞴺σ
+‌ⴠ-.�ς𞴺σ; ‌ⴠ-.1ς𞴺σ; [B1, C1, V3]; xn----rgn530d.xn--1-ymbd52321c; ; xn----2ws.xn--1-0mba52321c; [B1, B6, V3] # ⴠ-.1ς𞴺σ
+𑲘󠄒𓑡｡�Ⴜ; 𑲘𓑡.8Ⴜ; [P1, V5, V6]; xn--7m3d291b.xn--8-s1g; ; ;  # 𑲘.8Ⴜ
+𑲘󠄒𓑡。8Ⴜ; 𑲘𓑡.8Ⴜ; [P1, V5, V6]; xn--7m3d291b.xn--8-s1g; ; ;  # 𑲘.8Ⴜ
+𑲘󠄒𓑡。8ⴜ; 𑲘𓑡.8ⴜ; [P1, V5, V6]; xn--7m3d291b.xn--8-vws; ; ;  # 𑲘.8ⴜ
+xn--7m3d291b.xn--8-vws; 𑲘𓑡.8ⴜ; [V5, V6]; xn--7m3d291b.xn--8-vws; ; ;  # 𑲘.8ⴜ
+xn--7m3d291b.xn--8-s1g; 𑲘𓑡.8Ⴜ; [V5, V6]; xn--7m3d291b.xn--8-s1g; ; ;  # 𑲘.8Ⴜ
+𑲘󠄒𓑡｡�ⴜ; 𑲘𓑡.8ⴜ; [P1, V5, V6]; xn--7m3d291b.xn--8-vws; ; ;  # 𑲘.8ⴜ
+�ګߠ�｡뭕�ឹ; �ګߠ�.뭕�ឹ; [B5, B6]; xn--ekb23dj4at01n.xn--43e96bh910b; ; ;  # �ګߠ�.뭕�ឹ
+�ګߠ�｡뭕�ឹ; �ګߠ�.뭕�ឹ; [B5, B6]; xn--ekb23dj4at01n.xn--43e96bh910b; ; ;  # �ګߠ�.뭕�ឹ
+�ګߠ�。뭕�ឹ; �ګߠ�.뭕�ឹ; [B5, B6]; xn--ekb23dj4at01n.xn--43e96bh910b; ; ;  # �ګߠ�.뭕�ឹ
+�ګߠ�。뭕�ឹ; �ګߠ�.뭕�ឹ; [B5, B6]; xn--ekb23dj4at01n.xn--43e96bh910b; ; ;  # �ګߠ�.뭕�ឹ
+xn--ekb23dj4at01n.xn--43e96bh910b; �ګߠ�.뭕�ឹ; [B5, B6]; xn--ekb23dj4at01n.xn--43e96bh910b; ; ;  # �ګߠ�.뭕�ឹ
+᮫｡🂉�; ᮫.🂉�; [P1, V5, V6]; xn--zxf.xn--fx7ho0250c; ; ;  # ᮫.🂉
+᮫。🂉�; ᮫.🂉�; [P1, V5, V6]; xn--zxf.xn--fx7ho0250c; ; ;  # ᮫.🂉
+xn--zxf.xn--fx7ho0250c; ᮫.🂉�; [V5, V6]; xn--zxf.xn--fx7ho0250c; ; ;  # ᮫.🂉
+󩎃ૄ。ς��𑈵; 󩎃ૄ.ς��𑈵; [B5, C2, P1, V6]; xn--dfc53161q.xn--3xa006lzo7nsfd; ; xn--dfc53161q.xn--4xa8467k5mc; [B5, P1, V6] # ૄ.ς�𑈵
+󩎃ૄ。Σ��𑈵; 󩎃ૄ.σ��𑈵; [B5, C2, P1, V6]; xn--dfc53161q.xn--4xa895lzo7nsfd; ; xn--dfc53161q.xn--4xa8467k5mc; [B5, P1, V6] # ૄ.σ�𑈵
+󩎃ૄ。σ��𑈵; 󩎃ૄ.σ��𑈵; [B5, C2, P1, V6]; xn--dfc53161q.xn--4xa895lzo7nsfd; ; xn--dfc53161q.xn--4xa8467k5mc; [B5, P1, V6] # ૄ.σ�𑈵
+xn--dfc53161q.xn--4xa8467k5mc; 󩎃ૄ.σ�𑈵; [B5, V6]; xn--dfc53161q.xn--4xa8467k5mc; ; ;  # ૄ.σ�𑈵
+xn--dfc53161q.xn--4xa895lzo7nsfd; 󩎃ૄ.σ��𑈵; [B5, C2, V6]; xn--dfc53161q.xn--4xa895lzo7nsfd; ; ;  # ૄ.σ�𑈵
+xn--dfc53161q.xn--3xa006lzo7nsfd; 󩎃ૄ.ς��𑈵; [B5, C2, V6]; xn--dfc53161q.xn--3xa006lzo7nsfd; ; ;  # ૄ.ς�𑈵
+�ᡂ𑜫．𑘿; �ᡂ𑜫.𑘿; [B1, B2, B3, B6, V5]; xn--17e9625js1h.xn--sb2d; ; ;  # �ᡂ𑜫.𑘿
+�ᡂ𑜫.𑘿; ; [B1, B2, B3, B6, V5]; xn--17e9625js1h.xn--sb2d; ; ;  # �ᡂ𑜫.𑘿
+xn--17e9625js1h.xn--sb2d; �ᡂ𑜫.𑘿; [B1, B2, B3, B6, V5]; xn--17e9625js1h.xn--sb2d; ; ;  # �ᡂ𑜫.𑘿
+󬚶󸋖򖩰-。‌; 󬚶󸋖򖩰-.‌; [C1, P1, V3, V6]; xn----7i12hu122k9ire.xn--0ug; ; xn----7i12hu122k9ire.; [P1, V3, V6] # -.
+xn----7i12hu122k9ire.; 󬚶󸋖򖩰-.; [V3, V6]; xn----7i12hu122k9ire.; ; ;  # -.
+xn----7i12hu122k9ire.xn--0ug; 󬚶󸋖򖩰-.‌; [C1, V3, V6]; xn----7i12hu122k9ire.xn--0ug; ; ;  # -.
+�．߂; �.߂; [B1]; xn--bo0d.xn--dsb; ; ;  # �.߂
+�.߂; ; [B1]; xn--bo0d.xn--dsb; ; ;  # �.߂
+xn--bo0d.xn--dsb; �.߂; [B1]; xn--bo0d.xn--dsb; ; ;  # �.߂
+-ߡ｡Ↄ; -ߡ.Ↄ; [B1, P1, V3, V6]; xn----8cd.xn--q5g; ; ;  # -ߡ.Ↄ
+-ߡ。Ↄ; -ߡ.Ↄ; [B1, P1, V3, V6]; xn----8cd.xn--q5g; ; ;  # -ߡ.Ↄ
+-ߡ。ↄ; -ߡ.ↄ; [B1, V3]; xn----8cd.xn--r5g; ; ;  # -ߡ.ↄ
+xn----8cd.xn--r5g; -ߡ.ↄ; [B1, V3]; xn----8cd.xn--r5g; ; ;  # -ߡ.ↄ
+xn----8cd.xn--q5g; -ߡ.Ↄ; [B1, V3, V6]; xn----8cd.xn--q5g; ; ;  # -ߡ.Ↄ
+-ߡ｡ↄ; -ߡ.ↄ; [B1, V3]; xn----8cd.xn--r5g; ; ;  # -ߡ.ↄ
+�-︒󠄄。ß哑‌�; �-︒.ß哑‌�; [B1, B5, B6, C1, C2, P1, V6]; xn----tgnt341h.xn--zca670n5f0binyk; ; xn----o89h.xn--ss-h46c5711e; [B1, B5, B6, P1, V3, V6] # -︒.ß哑
+�-。󠄄。ß哑‌�; �-..ß哑‌�; [B1, B5, B6, C1, C2, P1, V3, V6, X4_2]; xn----tgn..xn--zca670n5f0binyk; [B1, B5, B6, C1, C2, P1, V3, V6, A4_2]; -..xn--ss-h46c5711e; [B1, B5, B6, P1, V3, V6, A4_2] # -..ß哑
+�-。󠄄。SS哑‌�; �-..ss哑‌�; [B1, B5, B6, C1, C2, P1, V3, V6, X4_2]; xn----tgn..xn--ss-k1ts75zb8ym; [B1, B5, B6, C1, C2, P1, V3, V6, A4_2]; -..xn--ss-h46c5711e; [B1, B5, B6, P1, V3, V6, A4_2] # -..ss哑
+�-。󠄄。ss哑‌�; �-..ss哑‌�; [B1, B5, B6, C1, C2, P1, V3, V6, X4_2]; xn----tgn..xn--ss-k1ts75zb8ym; [B1, B5, B6, C1, C2, P1, V3, V6, A4_2]; -..xn--ss-h46c5711e; [B1, B5, B6, P1, V3, V6, A4_2] # -..ss哑
+�-。󠄄。Ss哑‌�; �-..ss哑‌�; [B1, B5, B6, C1, C2, P1, V3, V6, X4_2]; xn----tgn..xn--ss-k1ts75zb8ym; [B1, B5, B6, C1, C2, P1, V3, V6, A4_2]; -..xn--ss-h46c5711e; [B1, B5, B6, P1, V3, V6, A4_2] # -..ss哑
+-..xn--ss-h46c5711e; -..ss哑�; [B1, B5, B6, V3, V6, X4_2]; -..xn--ss-h46c5711e; [B1, B5, B6, V3, V6, A4_2]; ;  # -..ss哑
+xn----tgn..xn--ss-k1ts75zb8ym; �-..ss哑‌�; [B1, B5, B6, C1, C2, V3, V6, X4_2]; xn----tgn..xn--ss-k1ts75zb8ym; [B1, B5, B6, C1, C2, V3, V6, A4_2]; ;  # -..ss哑
+xn----tgn..xn--zca670n5f0binyk; �-..ß哑‌�; [B1, B5, B6, C1, C2, V3, V6, X4_2]; xn----tgn..xn--zca670n5f0binyk; [B1, B5, B6, C1, C2, V3, V6, A4_2]; ;  # -..ß哑
+�-︒󠄄。SS哑‌�; �-︒.ss哑‌�; [B1, B5, B6, C1, C2, P1, V6]; xn----tgnt341h.xn--ss-k1ts75zb8ym; ; xn----o89h.xn--ss-h46c5711e; [B1, B5, B6, P1, V3, V6] # -︒.ss哑
+�-︒󠄄。ss哑‌�; �-︒.ss哑‌�; [B1, B5, B6, C1, C2, P1, V6]; xn----tgnt341h.xn--ss-k1ts75zb8ym; ; xn----o89h.xn--ss-h46c5711e; [B1, B5, B6, P1, V3, V6] # -︒.ss哑
+�-︒󠄄。Ss哑‌�; �-︒.ss哑‌�; [B1, B5, B6, C1, C2, P1, V6]; xn----tgnt341h.xn--ss-k1ts75zb8ym; ; xn----o89h.xn--ss-h46c5711e; [B1, B5, B6, P1, V3, V6] # -︒.ss哑
+xn----o89h.xn--ss-h46c5711e; -︒.ss哑�; [B1, B5, B6, V3, V6]; xn----o89h.xn--ss-h46c5711e; ; ;  # -︒.ss哑
+xn----tgnt341h.xn--ss-k1ts75zb8ym; �-︒.ss哑‌�; [B1, B5, B6, C1, C2, V6]; xn----tgnt341h.xn--ss-k1ts75zb8ym; ; ;  # -︒.ss哑
+xn----tgnt341h.xn--zca670n5f0binyk; �-︒.ß哑‌�; [B1, B5, B6, C1, C2, V6]; xn----tgnt341h.xn--zca670n5f0binyk; ; ;  # -︒.ß哑
+︒．𑑂︯; ︒.𑑂︯; [P1, V5, V6]; xn--y86c.xn--s96cu30b; ; ;  # ︒.𑑂︯
+︒．𑑂︯; ︒.𑑂︯; [P1, V5, V6]; xn--y86c.xn--s96cu30b; ; ;  # ︒.𑑂︯
+。.𑑂︯; ..𑑂︯; [V5, X4_2]; ..xn--s96cu30b; [V5, A4_2]; ;  # ..𑑂︯
+..xn--s96cu30b; ..𑑂︯; [V5, X4_2]; ..xn--s96cu30b; [V5, A4_2]; ;  # ..𑑂︯
+xn--y86c.xn--s96cu30b; ︒.𑑂︯; [V5, V6]; xn--y86c.xn--s96cu30b; ; ;  # ︒.𑑂︯
+꤬。�; ꤬.�; [C2, V5]; xn--zi9a.xn--1ug; ; xn--zi9a.; [V5] # ꤬.
+xn--zi9a.; ꤬.; [V5]; xn--zi9a.; ; ;  # ꤬.
+xn--zi9a.xn--1ug; ꤬.�; [C2, V5]; xn--zi9a.xn--1ug; ; ;  # ꤬.
+�󠸡｡ﳗ; �󠸡.هج; [B1, C2, P1, V6]; xn--1ug80651l.xn--rgb7c; ; xn--d356e.xn--rgb7c; [B1, P1, V6] # .هج
+�󠸡。هج; �󠸡.هج; [B1, C2, P1, V6]; xn--1ug80651l.xn--rgb7c; ; xn--d356e.xn--rgb7c; [B1, P1, V6] # .هج
+xn--d356e.xn--rgb7c; 󠸡.هج; [B1, V6]; xn--d356e.xn--rgb7c; ; ;  # .هج
+xn--1ug80651l.xn--rgb7c; �󠸡.هج; [B1, C2, V6]; xn--1ug80651l.xn--rgb7c; ; ;  # .هج
+-Ⴄ�٣．�ς; -Ⴄ0٣.�ς; [B1, P1, V3, V5, V6]; xn---0-iyd216h.xn--3xa1220l; ; xn---0-iyd216h.xn--4xa9120l;  # -Ⴄ0٣.�ς
+-Ⴄ0٣.�ς; ; [B1, P1, V3, V5, V6]; xn---0-iyd216h.xn--3xa1220l; ; xn---0-iyd216h.xn--4xa9120l;  # -Ⴄ0٣.�ς
+-ⴄ0٣.�ς; ; [B1, V3, V5]; xn---0-iyd8660b.xn--3xa1220l; ; xn---0-iyd8660b.xn--4xa9120l;  # -ⴄ0٣.�ς
+-Ⴄ0٣.�Σ; -Ⴄ0٣.�σ; [B1, P1, V3, V5, V6]; xn---0-iyd216h.xn--4xa9120l; ; ;  # -Ⴄ0٣.�σ
+-ⴄ0٣.�σ; ; [B1, V3, V5]; xn---0-iyd8660b.xn--4xa9120l; ; ;  # -ⴄ0٣.�σ
+xn---0-iyd8660b.xn--4xa9120l; -ⴄ0٣.�σ; [B1, V3, V5]; xn---0-iyd8660b.xn--4xa9120l; ; ;  # -ⴄ0٣.�σ
+xn---0-iyd216h.xn--4xa9120l; -Ⴄ0٣.�σ; [B1, V3, V5, V6]; xn---0-iyd216h.xn--4xa9120l; ; ;  # -Ⴄ0٣.�σ
+xn---0-iyd8660b.xn--3xa1220l; -ⴄ0٣.�ς; [B1, V3, V5]; xn---0-iyd8660b.xn--3xa1220l; ; ;  # -ⴄ0٣.�ς
+xn---0-iyd216h.xn--3xa1220l; -Ⴄ0٣.�ς; [B1, V3, V5, V6]; xn---0-iyd216h.xn--3xa1220l; ; ;  # -Ⴄ0٣.�ς
+-ⴄ�٣．�ς; -ⴄ0٣.�ς; [B1, V3, V5]; xn---0-iyd8660b.xn--3xa1220l; ; xn---0-iyd8660b.xn--4xa9120l;  # -ⴄ0٣.�ς
+-Ⴄ�٣．�Σ; -Ⴄ0٣.�σ; [B1, P1, V3, V5, V6]; xn---0-iyd216h.xn--4xa9120l; ; ;  # -Ⴄ0٣.�σ
+-ⴄ�٣．�σ; -ⴄ0٣.�σ; [B1, V3, V5]; xn---0-iyd8660b.xn--4xa9120l; ; ;  # -ⴄ0٣.�σ
+󦈄。-; 󦈄.-; [P1, V3, V6]; xn--xm38e.-; ; ;  # .-
+xn--xm38e.-; 󦈄.-; [V3, V6]; xn--xm38e.-; ; ;  # .-
+⋠�．򶈮༘ß≯; ⋠�.򶈮༘ß≯; [P1, V6]; xn--pgh4639f.xn--zca593eo6oc013y; ; xn--pgh4639f.xn--ss-ifj426nle504a;  # ⋠�.༘ß≯
+⋠�．򶈮༘ß≯; ⋠�.򶈮༘ß≯; [P1, V6]; xn--pgh4639f.xn--zca593eo6oc013y; ; xn--pgh4639f.xn--ss-ifj426nle504a;  # ⋠�.༘ß≯
+⋠�.򶈮༘ß≯; ; [P1, V6]; xn--pgh4639f.xn--zca593eo6oc013y; ; xn--pgh4639f.xn--ss-ifj426nle504a;  # ⋠�.༘ß≯
+⋠�.򶈮༘ß≯; ⋠�.򶈮༘ß≯; [P1, V6]; xn--pgh4639f.xn--zca593eo6oc013y; ; xn--pgh4639f.xn--ss-ifj426nle504a;  # ⋠�.༘ß≯
+⋠�.򶈮༘SS≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�.򶈮༘SS≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�.򶈮༘ss≯; ; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�.򶈮༘ss≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�.򶈮༘Ss≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�.򶈮༘Ss≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+xn--pgh4639f.xn--ss-ifj426nle504a; ⋠�.򶈮༘ss≯; [V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+xn--pgh4639f.xn--zca593eo6oc013y; ⋠�.򶈮༘ß≯; [V6]; xn--pgh4639f.xn--zca593eo6oc013y; ; ;  # ⋠�.༘ß≯
+⋠�．򶈮༘SS≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�．򶈮༘SS≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�．򶈮༘ss≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�．򶈮༘ss≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�．򶈮༘Ss≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+⋠�．򶈮༘Ss≯; ⋠�.򶈮༘ss≯; [P1, V6]; xn--pgh4639f.xn--ss-ifj426nle504a; ; ;  # ⋠�.༘ss≯
+1�٤｡󠢮ﮤ�; 1�٤.󠢮ۀ�; [B1, P1, V6]; xn--1-hqc3905q.xn--zkb83268gqee4a; ; ;  # 1�٤.ۀ
+1�٤。󠢮ۀ�; 1�٤.󠢮ۀ�; [B1, P1, V6]; xn--1-hqc3905q.xn--zkb83268gqee4a; ; ;  # 1�٤.ۀ
+1�٤。󠢮ۀ�; 1�٤.󠢮ۀ�; [B1, P1, V6]; xn--1-hqc3905q.xn--zkb83268gqee4a; ; ;  # 1�٤.ۀ
+xn--1-hqc3905q.xn--zkb83268gqee4a; 1�٤.󠢮ۀ�; [B1, V6]; xn--1-hqc3905q.xn--zkb83268gqee4a; ; ;  # 1�٤.ۀ
+儭-｡�Ⴢ񥳠‌; 儭-.�Ⴢ񥳠‌; [B1, B6, C1, P1, V3, V6]; xn----gz7a.xn--6nd249ejl4pusr7b; ; xn----gz7a.xn--6nd5001kyw98a; [B1, B6, P1, V3, V6] # 儭-.�Ⴢ
+儭-。�Ⴢ񥳠‌; 儭-.�Ⴢ񥳠‌; [B1, B6, C1, P1, V3, V6]; xn----gz7a.xn--6nd249ejl4pusr7b; ; xn----gz7a.xn--6nd5001kyw98a; [B1, B6, P1, V3, V6] # 儭-.�Ⴢ
+儭-。�ⴢ񥳠‌; 儭-.�ⴢ񥳠‌; [B1, B6, C1, P1, V3, V6]; xn----gz7a.xn--0ug472cfq0pus98b; ; xn----gz7a.xn--qlj9223eywx0b; [B1, B6, P1, V3, V6] # 儭-.�ⴢ
+xn----gz7a.xn--qlj9223eywx0b; 儭-.�ⴢ񥳠; [B1, B6, V3, V6]; xn----gz7a.xn--qlj9223eywx0b; ; ;  # 儭-.�ⴢ
+xn----gz7a.xn--0ug472cfq0pus98b; 儭-.�ⴢ񥳠‌; [B1, B6, C1, V3, V6]; xn----gz7a.xn--0ug472cfq0pus98b; ; ;  # 儭-.�ⴢ
+xn----gz7a.xn--6nd5001kyw98a; 儭-.�Ⴢ񥳠; [B1, B6, V3, V6]; xn----gz7a.xn--6nd5001kyw98a; ; ;  # 儭-.�Ⴢ
+xn----gz7a.xn--6nd249ejl4pusr7b; 儭-.�Ⴢ񥳠‌; [B1, B6, C1, V3, V6]; xn----gz7a.xn--6nd249ejl4pusr7b; ; ;  # 儭-.�Ⴢ
+儭-｡�ⴢ񥳠‌; 儭-.�ⴢ񥳠‌; [B1, B6, C1, P1, V3, V6]; xn----gz7a.xn--0ug472cfq0pus98b; ; xn----gz7a.xn--qlj9223eywx0b; [B1, B6, P1, V3, V6] # 儭-.�ⴢ
+��ڹ．𞤭�; 4�ڹ.𞤭�; [B1, B2, B3, P1, V6]; xn--4-cvc5384q.xn--le6hi7322b; ; ;  # 4�ڹ.𞤭
+4�ڹ.𞤭�; ; [B1, B2, B3, P1, V6]; xn--4-cvc5384q.xn--le6hi7322b; ; ;  # 4�ڹ.𞤭
+4�ڹ.𞤋�; 4�ڹ.𞤭�; [B1, B2, B3, P1, V6]; xn--4-cvc5384q.xn--le6hi7322b; ; ;  # 4�ڹ.𞤭
+xn--4-cvc5384q.xn--le6hi7322b; 4�ڹ.𞤭�; [B1, B2, B3, V6]; xn--4-cvc5384q.xn--le6hi7322b; ; ;  # 4�ڹ.𞤭
+��ڹ．𞤋�; 4�ڹ.𞤭�; [B1, B2, B3, P1, V6]; xn--4-cvc5384q.xn--le6hi7322b; ; ;  # 4�ڹ.𞤭
+≯-ꡋ𑲣.⒈�; ; [B1, P1, V6]; xn----ogox061d5i8d.xn--tsh0666f; ; ;  # ≯-ꡋ𑲣.⒈�
+≯-ꡋ𑲣.⒈�; ≯-ꡋ𑲣.⒈�; [B1, P1, V6]; xn----ogox061d5i8d.xn--tsh0666f; ; ;  # ≯-ꡋ𑲣.⒈�
+≯-ꡋ𑲣.1.�; ; [B1, P1, V6]; xn----ogox061d5i8d.1.xn--lo0d; ; ;  # ≯-ꡋ𑲣.1.�
+≯-ꡋ𑲣.1.�; ≯-ꡋ𑲣.1.�; [B1, P1, V6]; xn----ogox061d5i8d.1.xn--lo0d; ; ;  # ≯-ꡋ𑲣.1.�
+xn----ogox061d5i8d.1.xn--lo0d; ≯-ꡋ𑲣.1.�; [B1, V6]; xn----ogox061d5i8d.1.xn--lo0d; ; ;  # ≯-ꡋ𑲣.1.�
+xn----ogox061d5i8d.xn--tsh0666f; ≯-ꡋ𑲣.⒈�; [B1, V6]; xn----ogox061d5i8d.xn--tsh0666f; ; ;  # ≯-ꡋ𑲣.⒈�
+̰．󰜱蚀; ̰.󰜱蚀; [P1, V5, V6]; xn--xta.xn--e91aw9417e; ; ;  # ̰.蚀
+̰.󰜱蚀; ; [P1, V5, V6]; xn--xta.xn--e91aw9417e; ; ;  # ̰.蚀
+xn--xta.xn--e91aw9417e; ̰.󰜱蚀; [V5, V6]; xn--xta.xn--e91aw9417e; ; ;  # ̰.蚀
+יּႸ.𞡼𑇀ß⃗; יּႸ.𞡼𑇀ß⃗; [B2, B3, P1, V6]; xn--kdb1d867b.xn--zca284nhg9nrrxg; ; xn--kdb1d867b.xn--ss-yju5690ken9h;  # יּႸ.𞡼𑇀ß⃗
+יּႸ.𞡼𑇀ß⃗; ; [B2, B3, P1, V6]; xn--kdb1d867b.xn--zca284nhg9nrrxg; ; xn--kdb1d867b.xn--ss-yju5690ken9h;  # יּႸ.𞡼𑇀ß⃗
+יּⴘ.𞡼𑇀ß⃗; ; [B2, B3]; xn--kdb1d278n.xn--zca284nhg9nrrxg; ; xn--kdb1d278n.xn--ss-yju5690ken9h;  # יּⴘ.𞡼𑇀ß⃗
+יּႸ.𞡼𑇀SS⃗; יּႸ.𞡼𑇀ss⃗; [B2, B3, P1, V6]; xn--kdb1d867b.xn--ss-yju5690ken9h; ; ;  # יּႸ.𞡼𑇀ss⃗
+יּⴘ.𞡼𑇀ss⃗; ; [B2, B3]; xn--kdb1d278n.xn--ss-yju5690ken9h; ; ;  # יּⴘ.𞡼𑇀ss⃗
+xn--kdb1d278n.xn--ss-yju5690ken9h; יּⴘ.𞡼𑇀ss⃗; [B2, B3]; xn--kdb1d278n.xn--ss-yju5690ken9h; ; ;  # יּⴘ.𞡼𑇀ss⃗
+xn--kdb1d867b.xn--ss-yju5690ken9h; יּႸ.𞡼𑇀ss⃗; [B2, B3, V6]; xn--kdb1d867b.xn--ss-yju5690ken9h; ; ;  # יּႸ.𞡼𑇀ss⃗
+xn--kdb1d278n.xn--zca284nhg9nrrxg; יּⴘ.𞡼𑇀ß⃗; [B2, B3]; xn--kdb1d278n.xn--zca284nhg9nrrxg; ; ;  # יּⴘ.𞡼𑇀ß⃗
+xn--kdb1d867b.xn--zca284nhg9nrrxg; יּႸ.𞡼𑇀ß⃗; [B2, B3, V6]; xn--kdb1d867b.xn--zca284nhg9nrrxg; ; ;  # יּႸ.𞡼𑇀ß⃗
+יּⴘ.𞡼𑇀ß⃗; יּⴘ.𞡼𑇀ß⃗; [B2, B3]; xn--kdb1d278n.xn--zca284nhg9nrrxg; ; xn--kdb1d278n.xn--ss-yju5690ken9h;  # יּⴘ.𞡼𑇀ß⃗
+יּႸ.𞡼𑇀SS⃗; יּႸ.𞡼𑇀ss⃗; [B2, B3, P1, V6]; xn--kdb1d867b.xn--ss-yju5690ken9h; ; ;  # יּႸ.𞡼𑇀ss⃗
+יּⴘ.𞡼𑇀ss⃗; יּⴘ.𞡼𑇀ss⃗; [B2, B3]; xn--kdb1d278n.xn--ss-yju5690ken9h; ; ;  # יּⴘ.𞡼𑇀ss⃗
+יּႸ.𞡼𑇀ss⃗; ; [B2, B3, P1, V6]; xn--kdb1d867b.xn--ss-yju5690ken9h; ; ;  # יּႸ.𞡼𑇀ss⃗
+יּႸ.𞡼𑇀ss⃗; יּႸ.𞡼𑇀ss⃗; [B2, B3, P1, V6]; xn--kdb1d867b.xn--ss-yju5690ken9h; ; ;  # יּႸ.𞡼𑇀ss⃗
+ᮣ��｡凬; ᮣ��.凬; [B1, P1, V5, V6]; xn--rxfz314ilg20c.xn--t9q; ; ;  # ᮣ�.凬
+ᮣ��。凬; ᮣ��.凬; [B1, P1, V5, V6]; xn--rxfz314ilg20c.xn--t9q; ; ;  # ᮣ�.凬
+xn--rxfz314ilg20c.xn--t9q; ᮣ��.凬; [B1, V5, V6]; xn--rxfz314ilg20c.xn--t9q; ; ;  # ᮣ�.凬
+🢟🄈�ꡎ｡྄; 🢟🄈�ꡎ.྄; [C2, P1, V5, V6]; xn--1ug4874cfd0kbmg.xn--3ed; ; xn--nc9aq743ds0e.xn--3ed; [P1, V5, V6] # 🢟🄈ꡎ.྄
+🢟7,�ꡎ。྄; 🢟7,�ꡎ.྄; [C2, P1, V5, V6]; xn--7,-n1t0654eqo3o.xn--3ed; ; xn--7,-gh9hg322i.xn--3ed; [P1, V5, V6] # 🢟7,ꡎ.྄
+xn--7,-gh9hg322i.xn--3ed; 🢟7,ꡎ.྄; [P1, V5, V6]; xn--7,-gh9hg322i.xn--3ed; ; ;  # 🢟7,ꡎ.྄
+xn--7,-n1t0654eqo3o.xn--3ed; 🢟7,�ꡎ.྄; [C2, P1, V5, V6]; xn--7,-n1t0654eqo3o.xn--3ed; ; ;  # 🢟7,ꡎ.྄
+xn--nc9aq743ds0e.xn--3ed; 🢟🄈ꡎ.྄; [V5, V6]; xn--nc9aq743ds0e.xn--3ed; ; ;  # 🢟🄈ꡎ.྄
+xn--1ug4874cfd0kbmg.xn--3ed; 🢟🄈�ꡎ.྄; [C2, V5, V6]; xn--1ug4874cfd0kbmg.xn--3ed; ; ;  # 🢟🄈ꡎ.྄
+ꡔ。္ᢇ; ꡔ.္ᢇ; [V5]; xn--tc9a.xn--9jd663b; ; ;  # ꡔ.္ᢇ
+xn--tc9a.xn--9jd663b; ꡔ.္ᢇ; [V5]; xn--tc9a.xn--9jd663b; ; ;  # ꡔ.္ᢇ
+⃫≮.�; ; [P1, V5, V6]; xn--e1g71d.xn--772h; ; ;  # ⃫≮.�
+⃫≮.�; ⃫≮.�; [P1, V5, V6]; xn--e1g71d.xn--772h; ; ;  # ⃫≮.�
+xn--e1g71d.xn--772h; ⃫≮.�; [V5, V6]; xn--e1g71d.xn--772h; ; ;  # ⃫≮.�
+Ⴢ≯褦．ᠪߪႾݧ; Ⴢ≯褦.ᠪߪႾݧ; [B5, B6, P1, V6]; xn--6nd461g478e.xn--rpb5x49td2h; ; ;  # Ⴢ≯褦.ᠪߪႾݧ
+Ⴢ≯褦．ᠪߪႾݧ; Ⴢ≯褦.ᠪߪႾݧ; [B5, B6, P1, V6]; xn--6nd461g478e.xn--rpb5x49td2h; ; ;  # Ⴢ≯褦.ᠪߪႾݧ
+Ⴢ≯褦.ᠪߪႾݧ; ; [B5, B6, P1, V6]; xn--6nd461g478e.xn--rpb5x49td2h; ; ;  # Ⴢ≯褦.ᠪߪႾݧ
+Ⴢ≯褦.ᠪߪႾݧ; Ⴢ≯褦.ᠪߪႾݧ; [B5, B6, P1, V6]; xn--6nd461g478e.xn--rpb5x49td2h; ; ;  # Ⴢ≯褦.ᠪߪႾݧ
+ⴢ≯褦.ᠪߪⴞݧ; ⴢ≯褦.ᠪߪⴞݧ; [B5, B6, P1, V6]; xn--hdh433bev8e.xn--rpb5x392bcyt; ; ;  # ⴢ≯褦.ᠪߪⴞݧ
+ⴢ≯褦.ᠪߪⴞݧ; ; [B5, B6, P1, V6]; xn--hdh433bev8e.xn--rpb5x392bcyt; ; ;  # ⴢ≯褦.ᠪߪⴞݧ
+Ⴢ≯褦.ᠪߪⴞݧ; ; [B5, B6, P1, V6]; xn--6nd461g478e.xn--rpb5x392bcyt; ; ;  # Ⴢ≯褦.ᠪߪⴞݧ
+Ⴢ≯褦.ᠪߪⴞݧ; Ⴢ≯褦.ᠪߪⴞݧ; [B5, B6, P1, V6]; xn--6nd461g478e.xn--rpb5x392bcyt; ; ;  # Ⴢ≯褦.ᠪߪⴞݧ
+xn--6nd461g478e.xn--rpb5x392bcyt; Ⴢ≯褦.ᠪߪⴞݧ; [B5, B6, V6]; xn--6nd461g478e.xn--rpb5x392bcyt; ; ;  # Ⴢ≯褦.ᠪߪⴞݧ
+xn--hdh433bev8e.xn--rpb5x392bcyt; ⴢ≯褦.ᠪߪⴞݧ; [B5, B6, V6]; xn--hdh433bev8e.xn--rpb5x392bcyt; ; ;  # ⴢ≯褦.ᠪߪⴞݧ
+xn--6nd461g478e.xn--rpb5x49td2h; Ⴢ≯褦.ᠪߪႾݧ; [B5, B6, V6]; xn--6nd461g478e.xn--rpb5x49td2h; ; ;  # Ⴢ≯褦.ᠪߪႾݧ
+ⴢ≯褦．ᠪߪⴞݧ; ⴢ≯褦.ᠪߪⴞݧ; [B5, B6, P1, V6]; xn--hdh433bev8e.xn--rpb5x392bcyt; ; ;  # ⴢ≯褦.ᠪߪⴞݧ
+ⴢ≯褦．ᠪߪⴞݧ; ⴢ≯褦.ᠪߪⴞݧ; [B5, B6, P1, V6]; xn--hdh433bev8e.xn--rpb5x392bcyt; ; ;  # ⴢ≯褦.ᠪߪⴞݧ
+Ⴢ≯褦．ᠪߪⴞݧ; Ⴢ≯褦.ᠪߪⴞݧ; [B5, B6, P1, V6]; xn--6nd461g478e.xn--rpb5x392bcyt; ; ;  # Ⴢ≯褦.ᠪߪⴞݧ
+Ⴢ≯褦．ᠪߪⴞݧ; Ⴢ≯褦.ᠪߪⴞݧ; [B5, B6, P1, V6]; xn--6nd461g478e.xn--rpb5x392bcyt; ; ;  # Ⴢ≯褦.ᠪߪⴞݧ
+򊉆󠆒‌꥓。𞤙ٻꡘ; 򊉆‌꥓.𞤻ٻꡘ; [B2, B3, C1, P1, V6]; xn--0ug8815chtz0e.xn--0ib8893fegvj; ; xn--3j9al6189a.xn--0ib8893fegvj; [B2, B3, P1, V6] # ꥓.𞤻ٻꡘ
+򊉆󠆒‌꥓。𞤻ٻꡘ; 򊉆‌꥓.𞤻ٻꡘ; [B2, B3, C1, P1, V6]; xn--0ug8815chtz0e.xn--0ib8893fegvj; ; xn--3j9al6189a.xn--0ib8893fegvj; [B2, B3, P1, V6] # ꥓.𞤻ٻꡘ
+xn--3j9al6189a.xn--0ib8893fegvj; 򊉆꥓.𞤻ٻꡘ; [B2, B3, V6]; xn--3j9al6189a.xn--0ib8893fegvj; ; ;  # ꥓.𞤻ٻꡘ
+xn--0ug8815chtz0e.xn--0ib8893fegvj; 򊉆‌꥓.𞤻ٻꡘ; [B2, B3, C1, V6]; xn--0ug8815chtz0e.xn--0ib8893fegvj; ; ;  # ꥓.𞤻ٻꡘ
+‌.≯; ; [C1, P1, V6]; xn--0ug.xn--hdh; ; .xn--hdh; [P1, V6, A4_2] # .≯
+‌.≯; ‌.≯; [C1, P1, V6]; xn--0ug.xn--hdh; ; .xn--hdh; [P1, V6, A4_2] # .≯
+.xn--hdh; .≯; [V6, X4_2]; .xn--hdh; [V6, A4_2]; ;  # .≯
+xn--0ug.xn--hdh; ‌.≯; [C1, V6]; xn--0ug.xn--hdh; ; ;  # .≯
+𰅧񣩠-．꯭-悜; 𰅧񣩠-.꯭-悜; [P1, V3, V5, V6]; xn----7m53aj640l.xn----8f4br83t; ; ;  # 𰅧-.꯭-悜
+𰅧񣩠-.꯭-悜; ; [P1, V3, V5, V6]; xn----7m53aj640l.xn----8f4br83t; ; ;  # 𰅧-.꯭-悜
+xn----7m53aj640l.xn----8f4br83t; 𰅧񣩠-.꯭-悜; [V3, V5, V6]; xn----7m53aj640l.xn----8f4br83t; ; ;  # 𰅧-.꯭-悜
+ᡉ𶓧⬞ᢜ.-�𞣑‮; ; [C2, P1, V3, V6]; xn--87e0ol04cdl39e.xn----ugn5e3763s; ; xn--87e0ol04cdl39e.xn----qinu247r; [P1, V3, V6] # ᡉ⬞ᢜ.-𞣑
+xn--87e0ol04cdl39e.xn----qinu247r; ᡉ𶓧⬞ᢜ.-𞣑‮; [V3, V6]; xn--87e0ol04cdl39e.xn----qinu247r; ; ;  # ᡉ⬞ᢜ.-𞣑
+xn--87e0ol04cdl39e.xn----ugn5e3763s; ᡉ𶓧⬞ᢜ.-�𞣑‮; [C2, V3, V6]; xn--87e0ol04cdl39e.xn----ugn5e3763s; ; ;  # ᡉ⬞ᢜ.-𞣑
+�‌衃Ⴝ.ڂႴ; ; [B1, B2, B3, C1, P1, V6]; xn--1nd159ecmd785k.xn--7ib433c; ; xn--1nd362hy16e.xn--7ib433c; [B1, B2, B3, P1, V6] # �衃Ⴝ.ڂႴ
+9.‌衃Ⴝ.ڂႴ; ; [B1, B2, B3, C1, P1, V6]; 9.xn--1nd159e1y2f.xn--7ib433c; ; 9.xn--1nd9032d.xn--7ib433c; [B1, B2, B3, P1, V6] # 9.衃Ⴝ.ڂႴ
+9.‌衃�.ڂⴔ; ; [B1, B2, B3, C1]; 9.xn--0ug862cbm5e.xn--7ib268q; ; 9.xn--llj1920a.xn--7ib268q; [B1, B2, B3] # 9.衃�.ڂⴔ
+9.‌衃Ⴝ.ڂⴔ; ; [B1, B2, B3, C1, P1, V6]; 9.xn--1nd159e1y2f.xn--7ib268q; ; 9.xn--1nd9032d.xn--7ib268q; [B1, B2, B3, P1, V6] # 9.衃Ⴝ.ڂⴔ
+9.xn--1nd9032d.xn--7ib268q; 9.衃Ⴝ.ڂⴔ; [B1, B2, B3, V6]; 9.xn--1nd9032d.xn--7ib268q; ; ;  # 9.衃Ⴝ.ڂⴔ
+9.xn--1nd159e1y2f.xn--7ib268q; 9.‌衃Ⴝ.ڂⴔ; [B1, B2, B3, C1, V6]; 9.xn--1nd159e1y2f.xn--7ib268q; ; ;  # 9.衃Ⴝ.ڂⴔ
+9.xn--llj1920a.xn--7ib268q; 9.衃�.ڂⴔ; [B1, B2, B3]; 9.xn--llj1920a.xn--7ib268q; ; ;  # 9.衃�.ڂⴔ
+9.xn--0ug862cbm5e.xn--7ib268q; 9.‌衃�.ڂⴔ; [B1, B2, B3, C1]; 9.xn--0ug862cbm5e.xn--7ib268q; ; ;  # 9.衃�.ڂⴔ
+9.xn--1nd9032d.xn--7ib433c; 9.衃Ⴝ.ڂႴ; [B1, B2, B3, V6]; 9.xn--1nd9032d.xn--7ib433c; ; ;  # 9.衃Ⴝ.ڂႴ
+9.xn--1nd159e1y2f.xn--7ib433c; 9.‌衃Ⴝ.ڂႴ; [B1, B2, B3, C1, V6]; 9.xn--1nd159e1y2f.xn--7ib433c; ; ;  # 9.衃Ⴝ.ڂႴ
+�‌衃�.ڂⴔ; ; [B1, B2, B3, C1, P1, V6]; xn--0ugx0px1izu2h.xn--7ib268q; ; xn--1shy52abz3f.xn--7ib268q; [B1, B2, B3, P1, V6] # �衃�.ڂⴔ
+�‌衃Ⴝ.ڂⴔ; ; [B1, B2, B3, C1, P1, V6]; xn--1nd159ecmd785k.xn--7ib268q; ; xn--1nd362hy16e.xn--7ib268q; [B1, B2, B3, P1, V6] # �衃Ⴝ.ڂⴔ
+xn--1nd362hy16e.xn--7ib268q; �衃Ⴝ.ڂⴔ; [B1, B2, B3, V6]; xn--1nd362hy16e.xn--7ib268q; ; ;  # �衃Ⴝ.ڂⴔ
+xn--1nd159ecmd785k.xn--7ib268q; �‌衃Ⴝ.ڂⴔ; [B1, B2, B3, C1, V6]; xn--1nd159ecmd785k.xn--7ib268q; ; ;  # �衃Ⴝ.ڂⴔ
+xn--1shy52abz3f.xn--7ib268q; �衃�.ڂⴔ; [B1, B2, B3, V6]; xn--1shy52abz3f.xn--7ib268q; ; ;  # �衃�.ڂⴔ
+xn--0ugx0px1izu2h.xn--7ib268q; �‌衃�.ڂⴔ; [B1, B2, B3, C1, V6]; xn--0ugx0px1izu2h.xn--7ib268q; ; ;  # �衃�.ڂⴔ
+xn--1nd362hy16e.xn--7ib433c; �衃Ⴝ.ڂႴ; [B1, B2, B3, V6]; xn--1nd362hy16e.xn--7ib433c; ; ;  # �衃Ⴝ.ڂႴ
+xn--1nd159ecmd785k.xn--7ib433c; �‌衃Ⴝ.ڂႴ; [B1, B2, B3, C1, V6]; xn--1nd159ecmd785k.xn--7ib433c; ; ;  # �衃Ⴝ.ڂႴ
+ߡ‌。--⸬; ߡ‌.--⸬; [B1, B3, C1, V3]; xn--8sb884j.xn-----iw2a; ; xn--8sb.xn-----iw2a; [B1, V3] # ߡ.--⸬
+xn--8sb.xn-----iw2a; ߡ.--⸬; [B1, V3]; xn--8sb.xn-----iw2a; ; ;  # ߡ.--⸬
+xn--8sb884j.xn-----iw2a; ߡ‌.--⸬; [B1, B3, C1, V3]; xn--8sb884j.xn-----iw2a; ; ;  # ߡ.--⸬
+𞥓．ܘ; 𞥓.ܘ; ; xn--of6h.xn--inb; ; ;  # 𞥓.ܘ
+𞥓.ܘ; ; ; xn--of6h.xn--inb; ; ;  # 𞥓.ܘ
+xn--of6h.xn--inb; 𞥓.ܘ; ; xn--of6h.xn--inb; ; ;  # 𞥓.ܘ
+󠄽-．-්; -.-්; [V3]; -.xn----ptf; ; ;  # -.-්
+ó „½-.-à·Š; -.-à·Š; [V3]; -.xn----ptf; ; ;  # -.-à·Š
+-.xn----ptf; -.-à·Š; [V3]; -.xn----ptf; ; ;  # -.-à·Š
+�ݛ-.ᤧ; ݛ-.ᤧ; [B1, B3, B6, V3, V5]; xn----k4c.xn--lff; ; ;  # ݛ-.ᤧ
+xn----k4c.xn--lff; ݛ-.ᤧ; [B1, B3, B6, V3, V5]; xn----k4c.xn--lff; ; ;  # ݛ-.ᤧ
+𞤴󠆹⦉�.꠆⒌󘤸; 𞤴⦉�.꠆⒌󘤸; [B1, P1, V5, V6]; xn--fuix729epewf.xn--xsh5029b6e77i; ; ;  # 𞤴⦉�.꠆⒌
+𞤴󠆹⦉�.꠆5.󘤸; 𞤴⦉�.꠆5.󘤸; [B1, P1, V5, V6]; xn--fuix729epewf.xn--5-w93e.xn--7b83e; ; ;  # 𞤴⦉�.꠆5.
+𞤒󠆹⦉�.꠆5.󘤸; 𞤴⦉�.꠆5.󘤸; [B1, P1, V5, V6]; xn--fuix729epewf.xn--5-w93e.xn--7b83e; ; ;  # 𞤴⦉�.꠆5.
+xn--fuix729epewf.xn--5-w93e.xn--7b83e; 𞤴⦉�.꠆5.󘤸; [B1, V5, V6]; xn--fuix729epewf.xn--5-w93e.xn--7b83e; ; ;  # 𞤴⦉�.꠆5.
+𞤒󠆹⦉�.꠆⒌󘤸; 𞤴⦉�.꠆⒌󘤸; [B1, P1, V5, V6]; xn--fuix729epewf.xn--xsh5029b6e77i; ; ;  # 𞤴⦉�.꠆⒌
+xn--fuix729epewf.xn--xsh5029b6e77i; 𞤴⦉�.꠆⒌󘤸; [B1, V5, V6]; xn--fuix729epewf.xn--xsh5029b6e77i; ; ;  # 𞤴⦉�.꠆⒌
+󠄸₀。𑖿‌��; 0.𑖿‌��; [B1, C2, V5]; 0.xn--0ugc8040p9hk; ; 0.xn--mn9cz2s; [B1, V5] # 0.𑖿�
+󠄸0。𑖿‌��; 0.𑖿‌��; [B1, C2, V5]; 0.xn--0ugc8040p9hk; ; 0.xn--mn9cz2s; [B1, V5] # 0.𑖿�
+0.xn--mn9cz2s; 0.𑖿�; [B1, V5]; 0.xn--mn9cz2s; ; ;  # 0.𑖿�
+0.xn--0ugc8040p9hk; 0.𑖿‌��; [B1, C2, V5]; 0.xn--0ugc8040p9hk; ; ;  # 0.𑖿�
+Ⴚ�󠄄。�ퟶ်; Ⴚ�.5ퟶ်; [P1, V6]; xn--ynd2415j.xn--5-dug9054m; ; ;  # Ⴚ�.5ퟶ်
+Ⴚ�󠄄。5ퟶ်; Ⴚ�.5ퟶ်; [P1, V6]; xn--ynd2415j.xn--5-dug9054m; ; ;  # Ⴚ�.5ퟶ်
+ⴚ�󠄄。5ퟶ်; ⴚ�.5ퟶ်; ; xn--ilj2659d.xn--5-dug9054m; ; ;  # ⴚ�.5ퟶ်
+xn--ilj2659d.xn--5-dug9054m; ⴚ�.5ퟶ်; ; xn--ilj2659d.xn--5-dug9054m; ; ;  # ⴚ�.5ퟶ်
+ⴚ�.5ퟶ်; ; ; xn--ilj2659d.xn--5-dug9054m; ; ;  # ⴚ�.5ퟶ်
+Ⴚ�.5ퟶ်; ; [P1, V6]; xn--ynd2415j.xn--5-dug9054m; ; ;  # Ⴚ�.5ퟶ်
+xn--ynd2415j.xn--5-dug9054m; Ⴚ�.5ퟶ်; [V6]; xn--ynd2415j.xn--5-dug9054m; ; ;  # Ⴚ�.5ퟶ်
+ⴚ�󠄄。�ퟶ်; ⴚ�.5ퟶ်; ; xn--ilj2659d.xn--5-dug9054m; ; ;  # ⴚ�.5ퟶ်
+�-ᠹ﹪.ᷡᤢ; ; [C2, P1, V5, V6]; xn----c6j614b1z4v.xn--gff52t; ; xn----c6jx047j.xn--gff52t; [P1, V3, V5, V6] # -ᠹ﹪.ᷡᤢ
+�-ᠹ%.ᷡᤢ; ; [C2, P1, V5, V6]; xn---%-u4oy48b.xn--gff52t; ; xn---%-u4o.xn--gff52t; [P1, V3, V5, V6] # -ᠹ%.ᷡᤢ
+xn---%-u4o.xn--gff52t; -ᠹ%.ᷡᤢ; [P1, V3, V5, V6]; xn---%-u4o.xn--gff52t; ; ;  # -ᠹ%.ᷡᤢ
+xn---%-u4oy48b.xn--gff52t; �-ᠹ%.ᷡᤢ; [C2, P1, V5, V6]; xn---%-u4oy48b.xn--gff52t; ; ;  # -ᠹ%.ᷡᤢ
+xn----c6jx047j.xn--gff52t; -ᠹ﹪.ᷡᤢ; [V3, V5, V6]; xn----c6jx047j.xn--gff52t; ; ;  # -ᠹ﹪.ᷡᤢ
+xn----c6j614b1z4v.xn--gff52t; �-ᠹ﹪.ᷡᤢ; [C2, V5, V6]; xn----c6j614b1z4v.xn--gff52t; ; ;  # -ᠹ﹪.ᷡᤢ
+≠.ᠿ; ; [P1, V6]; xn--1ch.xn--y7e; ; ;  # ≠.ᠿ
+≠.ᠿ; ≠.ᠿ; [P1, V6]; xn--1ch.xn--y7e; ; ;  # ≠.ᠿ
+xn--1ch.xn--y7e; ≠.ᠿ; [V6]; xn--1ch.xn--y7e; ; ;  # ≠.ᠿ
+ܣ֣｡㌪; ܣ֣.�イツ; ; xn--ucb18e.xn--eck4c5a; ; ;  # ܣ֣.�イツ
+ܣ֣。�イツ; ܣ֣.�イツ; ; xn--ucb18e.xn--eck4c5a; ; ;  # ܣ֣.�イツ
+xn--ucb18e.xn--eck4c5a; ܣ֣.�イツ; ; xn--ucb18e.xn--eck4c5a; ; ;  # ܣ֣.�イツ
+ܣ֣.�イツ; ; ; xn--ucb18e.xn--eck4c5a; ; ;  # ܣ֣.�イツ
+𞷥󠆀≮.⵿-; 𞷥≮.⵿-; [B1, B3, P1, V3, V5, V6]; xn--gdhx802p.xn----i2s; ; ;  # ≮.⵿-
+𞷥󠆀≮.⵿-; 𞷥≮.⵿-; [B1, B3, P1, V3, V5, V6]; xn--gdhx802p.xn----i2s; ; ;  # ≮.⵿-
+xn--gdhx802p.xn----i2s; 𞷥≮.⵿-; [B1, B3, V3, V5, V6]; xn--gdhx802p.xn----i2s; ; ;  # ≮.⵿-
+₆榎򦖎�｡𞤅ۭﱚ󠮨; 6榎򦖎�.𞤧ۭيي󠮨; [B1, B3, P1, V6]; xn--6-kmf4691ejv41j.xn--mhba10ch545mn8v8h; ; ;  # 6榎�.𞤧ۭيي
+6榎򦖎�。𞤅ۭيي󠮨; 6榎򦖎�.𞤧ۭيي󠮨; [B1, B3, P1, V6]; xn--6-kmf4691ejv41j.xn--mhba10ch545mn8v8h; ; ;  # 6榎�.𞤧ۭيي
+6榎򦖎�。𞤧ۭيي󠮨; 6榎򦖎�.𞤧ۭيي󠮨; [B1, B3, P1, V6]; xn--6-kmf4691ejv41j.xn--mhba10ch545mn8v8h; ; ;  # 6榎�.𞤧ۭيي
+xn--6-kmf4691ejv41j.xn--mhba10ch545mn8v8h; 6榎򦖎�.𞤧ۭيي󠮨; [B1, B3, V6]; xn--6-kmf4691ejv41j.xn--mhba10ch545mn8v8h; ; ;  # 6榎�.𞤧ۭيي
+₆榎򦖎�｡𞤧ۭﱚ󠮨; 6榎򦖎�.𞤧ۭيي󠮨; [B1, B3, P1, V6]; xn--6-kmf4691ejv41j.xn--mhba10ch545mn8v8h; ; ;  # 6榎�.𞤧ۭيي
+𣩫．򌑲; 𣩫.򌑲; [P1, V6]; xn--td3j.xn--4628b; ; ;  # 𣩫.
+𣩫.򌑲; ; [P1, V6]; xn--td3j.xn--4628b; ; ;  # 𣩫.
+xn--td3j.xn--4628b; 𣩫.򌑲; [V6]; xn--td3j.xn--4628b; ; ;  # 𣩫.
+�︒｡ڹ‌; �︒.ڹ‌; [B1, B3, C1, C2, P1, V6]; xn--1ug2658f.xn--skb080k; ; xn--y86c.xn--skb; [B1, P1, V6] # ︒.ڹ
+xn--y86c.xn--skb; ︒.ڹ; [B1, V6]; xn--y86c.xn--skb; ; ;  # ︒.ڹ
+xn--1ug2658f.xn--skb080k; �︒.ڹ‌; [B1, B3, C1, C2, V6]; xn--1ug2658f.xn--skb080k; ; ;  # ︒.ڹ
+xn--skb; Ú¹; ; xn--skb; ; ;  # Ú¹
+Ú¹; ; ; xn--skb; ; ;  # Ú¹
+�‌�。�; �‌�.�; [B1, C1, P1, V6]; xn--0ug4994goba.xn--sxg; ; xn--eo0d6a.xn--sxg; [B1, P1, V6] # ��.
+xn--eo0d6a.xn--sxg; ��.�; [B1, V6]; xn--eo0d6a.xn--sxg; ; ;  # ��.
+xn--0ug4994goba.xn--sxg; �‌�.�; [B1, C1, V6]; xn--0ug4994goba.xn--sxg; ; ;  # ��.
+��֩�。-𑜨; ��֩1.-𑜨; [V3, V5]; xn--1-rfc312cdp45c.xn----nq0j; ; ;  # ��֩1.-𑜨
+��֩1。-𑜨; ��֩1.-𑜨; [V3, V5]; xn--1-rfc312cdp45c.xn----nq0j; ; ;  # ��֩1.-𑜨
+xn--1-rfc312cdp45c.xn----nq0j; ��֩1.-𑜨; [V3, V5]; xn--1-rfc312cdp45c.xn----nq0j; ; ;  # ��֩1.-𑜨
+򣿈。�; 򣿈.�; [P1, V6]; xn--ph26c.xn--281b; ; ;  # .�
+򣿈。뙏; 򣿈.�; [P1, V6]; xn--ph26c.xn--281b; ; ;  # .�
+xn--ph26c.xn--281b; 򣿈.�; [V6]; xn--ph26c.xn--281b; ; ;  # .�
+񕨚󠄌󑽀ᡀ.ࢶ; 񕨚󑽀ᡀ.ࢶ; [P1, V6]; xn--z7e98100evc01b.xn--czb; ; ;  # ᡀ.ࢶ
+xn--z7e98100evc01b.xn--czb; 񕨚󑽀ᡀ.ࢶ; [V6]; xn--z7e98100evc01b.xn--czb; ; ;  # ᡀ.ࢶ
+�｡�; �.�; [C2, P1, V6]; xn--1ug.xn--6x4u; ; .xn--6x4u; [P1, V6, A4_2] # .
+�。�; �.�; [C2, P1, V6]; xn--1ug.xn--6x4u; ; .xn--6x4u; [P1, V6, A4_2] # .
+.xn--6x4u; .�; [V6, X4_2]; .xn--6x4u; [V6, A4_2]; ;  # .
+xn--1ug.xn--6x4u; �.�; [C2, V6]; xn--1ug.xn--6x4u; ; ;  # .
+ࡋ皥．-; ࡋ皥.-; [B1, B2, B3, V3]; xn--9vb4167c.-; ; ;  # ࡋ皥.-
+ࡋ皥.-; ; [B1, B2, B3, V3]; xn--9vb4167c.-; ; ;  # ࡋ皥.-
+xn--9vb4167c.-; ࡋ皥.-; [B1, B2, B3, V3]; xn--9vb4167c.-; ; ;  # ࡋ皥.-
+�̕�．⒈ꡦ; �̕�.⒈ꡦ; [B1, P1, V6]; xn--5sa9915kgvb.xn--tshw539b; ; ;  # ̕�.⒈ꡦ
+�̕�.1.ꡦ; ; [B1, P1, V6]; xn--5sa9915kgvb.1.xn--cd9a; ; ;  # ̕�.1.ꡦ
+xn--5sa9915kgvb.1.xn--cd9a; �̕�.1.ꡦ; [B1, V6]; xn--5sa9915kgvb.1.xn--cd9a; ; ;  # ̕�.1.ꡦ
+xn--5sa9915kgvb.xn--tshw539b; �̕�.⒈ꡦ; [B1, V6]; xn--5sa9915kgvb.xn--tshw539b; ; ;  # ̕�.⒈ꡦ
+Ⴛ‌֢�。ﾠ��; Ⴛ‌֢�.ﾠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb597cdmmfa.xn--yda9741khjj; ; xn--tcb597c.xn--yda9741khjj; [B5, B6, P1, V6] # Ⴛ֢.��
+Ⴛ‌֢�。ﾠā�; Ⴛ‌֢�.ﾠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb597cdmmfa.xn--yda9741khjj; ; xn--tcb597c.xn--yda9741khjj; [B5, B6, P1, V6] # Ⴛ֢.��
+Ⴛ‌֢�。ᅠ��; Ⴛ‌֢�.ᅠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb597cdmmfa.xn--yda594fdn5q; ; xn--tcb597c.xn--yda594fdn5q; [B5, B6, P1, V6] # Ⴛ֢.��
+Ⴛ‌֢�。ᅠā�; Ⴛ‌֢�.ᅠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb597cdmmfa.xn--yda594fdn5q; ; xn--tcb597c.xn--yda594fdn5q; [B5, B6, P1, V6] # Ⴛ֢.��
+ⴛ‌֢�。ᅠā�; ⴛ‌֢�.ᅠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb736kea974k.xn--yda594fdn5q; ; xn--tcb323r.xn--yda594fdn5q; [B5, B6, P1, V6] # ⴛ֢.��
+ⴛ‌֢�。ᅠ��; ⴛ‌֢�.ᅠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb736kea974k.xn--yda594fdn5q; ; xn--tcb323r.xn--yda594fdn5q; [B5, B6, P1, V6] # ⴛ֢.��
+Ⴛ‌֢�。ᅠĀ�; Ⴛ‌֢�.ᅠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb597cdmmfa.xn--yda594fdn5q; ; xn--tcb597c.xn--yda594fdn5q; [B5, B6, P1, V6] # Ⴛ֢.��
+Ⴛ‌֢�。ᅠĀ�; Ⴛ‌֢�.ᅠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb597cdmmfa.xn--yda594fdn5q; ; xn--tcb597c.xn--yda594fdn5q; [B5, B6, P1, V6] # Ⴛ֢.��
+xn--tcb597c.xn--yda594fdn5q; Ⴛ֢.ᅠ��; [B5, B6, V6]; xn--tcb597c.xn--yda594fdn5q; ; ;  # Ⴛ֢.��
+xn--tcb597cdmmfa.xn--yda594fdn5q; Ⴛ‌֢�.ᅠ��; [B5, B6, C1, C2, V6]; xn--tcb597cdmmfa.xn--yda594fdn5q; ; ;  # Ⴛ֢.��
+xn--tcb323r.xn--yda594fdn5q; ⴛ֢.ᅠ��; [B5, B6, V6]; xn--tcb323r.xn--yda594fdn5q; ; ;  # ⴛ֢.��
+xn--tcb736kea974k.xn--yda594fdn5q; ⴛ‌֢�.ᅠ��; [B5, B6, C1, C2, V6]; xn--tcb736kea974k.xn--yda594fdn5q; ; ;  # ⴛ֢.��
+ⴛ‌֢�。ﾠā�; ⴛ‌֢�.ﾠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb736kea974k.xn--yda9741khjj; ; xn--tcb323r.xn--yda9741khjj; [B5, B6, P1, V6] # ⴛ֢.��
+ⴛ‌֢�。ﾠ��; ⴛ‌֢�.ﾠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb736kea974k.xn--yda9741khjj; ; xn--tcb323r.xn--yda9741khjj; [B5, B6, P1, V6] # ⴛ֢.��
+Ⴛ‌֢�。ﾠĀ�; Ⴛ‌֢�.ﾠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb597cdmmfa.xn--yda9741khjj; ; xn--tcb597c.xn--yda9741khjj; [B5, B6, P1, V6] # Ⴛ֢.��
+Ⴛ‌֢�。ﾠĀ�; Ⴛ‌֢�.ﾠ��; [B5, B6, C1, C2, P1, V6]; xn--tcb597cdmmfa.xn--yda9741khjj; ; xn--tcb597c.xn--yda9741khjj; [B5, B6, P1, V6] # Ⴛ֢.��
+xn--tcb597c.xn--yda9741khjj; Ⴛ֢.ﾠ��; [B5, B6, V6]; xn--tcb597c.xn--yda9741khjj; ; ;  # Ⴛ֢.��
+xn--tcb597cdmmfa.xn--yda9741khjj; Ⴛ‌֢�.ﾠ��; [B5, B6, C1, C2, V6]; xn--tcb597cdmmfa.xn--yda9741khjj; ; ;  # Ⴛ֢.��
+xn--tcb323r.xn--yda9741khjj; ⴛ֢.ﾠ��; [B5, B6, V6]; xn--tcb323r.xn--yda9741khjj; ; ;  # ⴛ֢.��
+xn--tcb736kea974k.xn--yda9741khjj; ⴛ‌֢�.ﾠ��; [B5, B6, C1, C2, V6]; xn--tcb736kea974k.xn--yda9741khjj; ; ;  # ⴛ֢.��
+‌｡曳⾑�≯; ‌.曳襾�≯; [C1, P1, V6]; xn--0ug2139f.xn--hdh501y8wvfs5h; ; xn--vn7c.xn--hdh501y8wvfs5h; [P1, V6] # .曳襾�≯
+‌｡曳⾑�≯; ‌.曳襾�≯; [C1, P1, V6]; xn--0ug2139f.xn--hdh501y8wvfs5h; ; xn--vn7c.xn--hdh501y8wvfs5h; [P1, V6] # .曳襾�≯
+‌。曳襾�≯; ‌.曳襾�≯; [C1, P1, V6]; xn--0ug2139f.xn--hdh501y8wvfs5h; ; xn--vn7c.xn--hdh501y8wvfs5h; [P1, V6] # .曳襾�≯
+‌。曳襾�≯; ‌.曳襾�≯; [C1, P1, V6]; xn--0ug2139f.xn--hdh501y8wvfs5h; ; xn--vn7c.xn--hdh501y8wvfs5h; [P1, V6] # .曳襾�≯
+xn--vn7c.xn--hdh501y8wvfs5h; .曳襾�≯; [V6]; xn--vn7c.xn--hdh501y8wvfs5h; ; ;  # .曳襾�≯
+xn--0ug2139f.xn--hdh501y8wvfs5h; ‌.曳襾�≯; [C1, V6]; xn--0ug2139f.xn--hdh501y8wvfs5h; ; ;  # .曳襾�≯
+≯⒈。ß; ≯⒈.ß; [P1, V6]; xn--hdh84f.xn--zca; ; xn--hdh84f.ss;  # ≯⒈.ß
+≯⒈。ß; ≯⒈.ß; [P1, V6]; xn--hdh84f.xn--zca; ; xn--hdh84f.ss;  # ≯⒈.ß
+≯1.。ß; ≯1..ß; [P1, V6, X4_2]; xn--1-ogo..xn--zca; [P1, V6, A4_2]; xn--1-ogo..ss;  # ≯1..ß
+≯1.。ß; ≯1..ß; [P1, V6, X4_2]; xn--1-ogo..xn--zca; [P1, V6, A4_2]; xn--1-ogo..ss;  # ≯1..ß
+≯1.。SS; ≯1..ss; [P1, V6, X4_2]; xn--1-ogo..ss; [P1, V6, A4_2]; ;  # ≯1..ss
+≯1.。SS; ≯1..ss; [P1, V6, X4_2]; xn--1-ogo..ss; [P1, V6, A4_2]; ;  # ≯1..ss
+≯1.。ss; ≯1..ss; [P1, V6, X4_2]; xn--1-ogo..ss; [P1, V6, A4_2]; ;  # ≯1..ss
+≯1.。ss; ≯1..ss; [P1, V6, X4_2]; xn--1-ogo..ss; [P1, V6, A4_2]; ;  # ≯1..ss
+≯1.。Ss; ≯1..ss; [P1, V6, X4_2]; xn--1-ogo..ss; [P1, V6, A4_2]; ;  # ≯1..ss
+≯1.。Ss; ≯1..ss; [P1, V6, X4_2]; xn--1-ogo..ss; [P1, V6, A4_2]; ;  # ≯1..ss
+xn--1-ogo..ss; ≯1..ss; [V6, X4_2]; xn--1-ogo..ss; [V6, A4_2]; ;  # ≯1..ss
+xn--1-ogo..xn--zca; ≯1..ß; [V6, X4_2]; xn--1-ogo..xn--zca; [V6, A4_2]; ;  # ≯1..ß
+≯⒈。SS; ≯⒈.ss; [P1, V6]; xn--hdh84f.ss; ; ;  # ≯⒈.ss
+≯⒈。SS; ≯⒈.ss; [P1, V6]; xn--hdh84f.ss; ; ;  # ≯⒈.ss
+≯⒈。ss; ≯⒈.ss; [P1, V6]; xn--hdh84f.ss; ; ;  # ≯⒈.ss
+≯⒈。ss; ≯⒈.ss; [P1, V6]; xn--hdh84f.ss; ; ;  # ≯⒈.ss
+≯⒈。Ss; ≯⒈.ss; [P1, V6]; xn--hdh84f.ss; ; ;  # ≯⒈.ss
+≯⒈。Ss; ≯⒈.ss; [P1, V6]; xn--hdh84f.ss; ; ;  # ≯⒈.ss
+xn--hdh84f.ss; ≯⒈.ss; [V6]; xn--hdh84f.ss; ; ;  # ≯⒈.ss
+xn--hdh84f.xn--zca; ≯⒈.ß; [V6]; xn--hdh84f.xn--zca; ; ;  # ≯⒈.ß
+٧�ﮖ｡ߚ-₆Ⴙ; ٧�ڳ.ߚ-6Ⴙ; [B1, B2, B3, C2, P1, V6]; xn--gib6m343e.xn---6-lve002g; ; xn--gib6m.xn---6-lve002g; [B1, B2, B3, P1, V6] # ٧ڳ.ߚ-6Ⴙ
+٧�ڳ。ߚ-6Ⴙ; ٧�ڳ.ߚ-6Ⴙ; [B1, B2, B3, C2, P1, V6]; xn--gib6m343e.xn---6-lve002g; ; xn--gib6m.xn---6-lve002g; [B1, B2, B3, P1, V6] # ٧ڳ.ߚ-6Ⴙ
+٧�ڳ。ߚ-6ⴙ; ٧�ڳ.ߚ-6ⴙ; [B1, B2, B3, C2]; xn--gib6m343e.xn---6-lve6529a; ; xn--gib6m.xn---6-lve6529a; [B1, B2, B3] # ٧ڳ.ߚ-6ⴙ
+xn--gib6m.xn---6-lve6529a; Ù§Ú³.ßš-6â´™; [B1, B2, B3]; xn--gib6m.xn---6-lve6529a; ; ;  # Ù§Ú³.ßš-6â´™
+xn--gib6m343e.xn---6-lve6529a; ٧�ڳ.ߚ-6ⴙ; [B1, B2, B3, C2]; xn--gib6m343e.xn---6-lve6529a; ; ;  # ٧ڳ.ߚ-6ⴙ
+xn--gib6m.xn---6-lve002g; ٧ڳ.ߚ-6Ⴙ; [B1, B2, B3, V6]; xn--gib6m.xn---6-lve002g; ; ;  # ٧ڳ.ߚ-6Ⴙ
+xn--gib6m343e.xn---6-lve002g; ٧�ڳ.ߚ-6Ⴙ; [B1, B2, B3, C2, V6]; xn--gib6m343e.xn---6-lve002g; ; ;  # ٧ڳ.ߚ-6Ⴙ
+٧�ﮖ｡ߚ-₆ⴙ; ٧�ڳ.ߚ-6ⴙ; [B1, B2, B3, C2]; xn--gib6m343e.xn---6-lve6529a; ; xn--gib6m.xn---6-lve6529a; [B1, B2, B3] # ٧ڳ.ߚ-6ⴙ
+‌｡≠; ‌.≠; [C1, P1, V6]; xn--0ug.xn--1ch; ; .xn--1ch; [P1, V6, A4_2] # .≠
+‌｡≠; ‌.≠; [C1, P1, V6]; xn--0ug.xn--1ch; ; .xn--1ch; [P1, V6, A4_2] # .≠
+‌。≠; ‌.≠; [C1, P1, V6]; xn--0ug.xn--1ch; ; .xn--1ch; [P1, V6, A4_2] # .≠
+‌。≠; ‌.≠; [C1, P1, V6]; xn--0ug.xn--1ch; ; .xn--1ch; [P1, V6, A4_2] # .≠
+.xn--1ch; .≠; [V6, X4_2]; .xn--1ch; [V6, A4_2]; ;  # .≠
+xn--0ug.xn--1ch; ‌.≠; [C1, V6]; xn--0ug.xn--1ch; ; ;  # .≠
+𑖿�.ᡟ𑖿ᭂ‌; ; [C1, V5]; xn--461dw464a.xn--v8e29ldzfo952a; ; xn--461dw464a.xn--v8e29loy65a; [V5] # 𑖿�.ᡟ𑖿ᭂ
+xn--461dw464a.xn--v8e29loy65a; 𑖿�.ᡟ𑖿ᭂ; [V5]; xn--461dw464a.xn--v8e29loy65a; ; ;  # 𑖿�.ᡟ𑖿ᭂ
+xn--461dw464a.xn--v8e29ldzfo952a; 𑖿�.ᡟ𑖿ᭂ‌; [C1, V5]; xn--461dw464a.xn--v8e29ldzfo952a; ; ;  # 𑖿�.ᡟ𑖿ᭂ
+򔣳��.𖬴Ↄ≠-; ; [C2, P1, V3, V5, V6]; xn--1ug15151gkb5a.xn----61n81bt713h; ; xn--6j00chy9a.xn----61n81bt713h; [P1, V3, V5, V6] # .𖬴Ↄ≠-
+򔣳��.𖬴Ↄ≠-; 򔣳��.𖬴Ↄ≠-; [C2, P1, V3, V5, V6]; xn--1ug15151gkb5a.xn----61n81bt713h; ; xn--6j00chy9a.xn----61n81bt713h; [P1, V3, V5, V6] # .𖬴Ↄ≠-
+򔣳��.𖬴ↄ≠-; 򔣳��.𖬴ↄ≠-; [C2, P1, V3, V5, V6]; xn--1ug15151gkb5a.xn----81n51bt713h; ; xn--6j00chy9a.xn----81n51bt713h; [P1, V3, V5, V6] # .𖬴ↄ≠-
+򔣳��.𖬴ↄ≠-; ; [C2, P1, V3, V5, V6]; xn--1ug15151gkb5a.xn----81n51bt713h; ; xn--6j00chy9a.xn----81n51bt713h; [P1, V3, V5, V6] # .𖬴ↄ≠-
+xn--6j00chy9a.xn----81n51bt713h; 򔣳�.𖬴ↄ≠-; [V3, V5, V6]; xn--6j00chy9a.xn----81n51bt713h; ; ;  # .𖬴ↄ≠-
+xn--1ug15151gkb5a.xn----81n51bt713h; 򔣳��.𖬴ↄ≠-; [C2, V3, V5, V6]; xn--1ug15151gkb5a.xn----81n51bt713h; ; ;  # .𖬴ↄ≠-
+xn--6j00chy9a.xn----61n81bt713h; 򔣳�.𖬴Ↄ≠-; [V3, V5, V6]; xn--6j00chy9a.xn----61n81bt713h; ; ;  # .𖬴Ↄ≠-
+xn--1ug15151gkb5a.xn----61n81bt713h; 򔣳��.𖬴Ↄ≠-; [C2, V3, V5, V6]; xn--1ug15151gkb5a.xn----61n81bt713h; ; ;  # .𖬴Ↄ≠-
+ߢς��。蔑򛖢; ߢς�7.蔑򛖢; [B2, C2, P1, V6]; xn--7-xmb182aez5a.xn--wy1ao4929b; ; xn--7-zmb872a.xn--wy1ao4929b; [B2, P1, V6] # ߢς7.蔑
+ߢς�7。蔑򛖢; ߢς�7.蔑򛖢; [B2, C2, P1, V6]; xn--7-xmb182aez5a.xn--wy1ao4929b; ; xn--7-zmb872a.xn--wy1ao4929b; [B2, P1, V6] # ߢς7.蔑
+ߢΣ�7。蔑򛖢; ߢσ�7.蔑򛖢; [B2, C2, P1, V6]; xn--7-zmb872aez5a.xn--wy1ao4929b; ; xn--7-zmb872a.xn--wy1ao4929b; [B2, P1, V6] # ߢσ7.蔑
+ߢσ�7。蔑򛖢; ߢσ�7.蔑򛖢; [B2, C2, P1, V6]; xn--7-zmb872aez5a.xn--wy1ao4929b; ; xn--7-zmb872a.xn--wy1ao4929b; [B2, P1, V6] # ߢσ7.蔑
+xn--7-zmb872a.xn--wy1ao4929b; ߢσ7.蔑򛖢; [B2, V6]; xn--7-zmb872a.xn--wy1ao4929b; ; ;  # ߢσ7.蔑
+xn--7-zmb872aez5a.xn--wy1ao4929b; ߢσ�7.蔑򛖢; [B2, C2, V6]; xn--7-zmb872aez5a.xn--wy1ao4929b; ; ;  # ߢσ7.蔑
+xn--7-xmb182aez5a.xn--wy1ao4929b; ߢς�7.蔑򛖢; [B2, C2, V6]; xn--7-xmb182aez5a.xn--wy1ao4929b; ; ;  # ߢς7.蔑
+ߢΣ��。蔑򛖢; ߢσ�7.蔑򛖢; [B2, C2, P1, V6]; xn--7-zmb872aez5a.xn--wy1ao4929b; ; xn--7-zmb872a.xn--wy1ao4929b; [B2, P1, V6] # ߢσ7.蔑
+ߢσ��。蔑򛖢; ߢσ�7.蔑򛖢; [B2, C2, P1, V6]; xn--7-zmb872aez5a.xn--wy1ao4929b; ; xn--7-zmb872a.xn--wy1ao4929b; [B2, P1, V6] # ߢσ7.蔑
+�.؀; ; [B1, P1, V6]; xn--oo0d.xn--ifb; ; ;  # �.
+xn--oo0d.xn--ifb; �.؀; [B1, V6]; xn--oo0d.xn--ifb; ; ;  # �.
+-ࢨ.𱠖; ; [B1, P1, V3, V6]; xn----mod.xn--5o9n; ; ;  # -ࢨ.
+xn----mod.xn--5o9n; -ࢨ.𱠖; [B1, V3, V6]; xn----mod.xn--5o9n; ; ;  # -ࢨ.
+≯𞱸󠇀。誆⒈; ≯𞱸.誆⒈; [B1, P1, V6]; xn--hdh7151p.xn--tsh1248a; ; ;  # ≯𞱸.誆⒈
+≯𞱸󠇀。誆⒈; ≯𞱸.誆⒈; [B1, P1, V6]; xn--hdh7151p.xn--tsh1248a; ; ;  # ≯𞱸.誆⒈
+≯𞱸󠇀。誆1.; ≯𞱸.誆1.; [B1, P1, V6]; xn--hdh7151p.xn--1-dy1d.; ; ;  # ≯𞱸.誆1.
+≯𞱸󠇀。誆1.; ≯𞱸.誆1.; [B1, P1, V6]; xn--hdh7151p.xn--1-dy1d.; ; ;  # ≯𞱸.誆1.
+xn--hdh7151p.xn--1-dy1d.; ≯𞱸.誆1.; [B1, V6]; xn--hdh7151p.xn--1-dy1d.; ; ;  # ≯𞱸.誆1.
+xn--hdh7151p.xn--tsh1248a; ≯𞱸.誆⒈; [B1, V6]; xn--hdh7151p.xn--tsh1248a; ; ;  # ≯𞱸.誆⒈
+ؖ𞥙��．︒م↺ڜ; ؖ𞥙��.︒م↺ڜ; [B1, P1, V5, V6]; xn--4fb0j490qjg4x.xn--hhb8o948euo5r; ; ;  # ؖ𞥙��.︒م↺ڜ
+ؖ𞥙��.。م↺ڜ; ؖ𞥙��..م↺ڜ; [B1, V5, X4_2]; xn--4fb0j490qjg4x..xn--hhb8o948e; [B1, V5, A4_2]; ;  # ؖ𞥙��..م↺ڜ
+xn--4fb0j490qjg4x..xn--hhb8o948e; ؖ𞥙��..م↺ڜ; [B1, V5, X4_2]; xn--4fb0j490qjg4x..xn--hhb8o948e; [B1, V5, A4_2]; ;  # ؖ𞥙��..م↺ڜ
+xn--4fb0j490qjg4x.xn--hhb8o948euo5r; ؖ𞥙��.︒م↺ڜ; [B1, V5, V6]; xn--4fb0j490qjg4x.xn--hhb8o948euo5r; ; ;  # ؖ𞥙��.︒م↺ڜ
+퀬-?񶳒.‌ૅ󩸤۴; ; [C1, P1, V6]; 퀬-?񶳒.xn--hmb76q48y18505a; [C1, P1, V6, A3]; 퀬-?񶳒.xn--hmb76q74166b; [P1, V5, V6, A3] # 퀬-.ૅ۴
+�ᅰᆻ-?񶳒.‌ૅ󩸤۴; 퀬-?񶳒.‌ૅ󩸤۴; [C1, P1, V6]; 퀬-?񶳒.xn--hmb76q48y18505a; [C1, P1, V6, A3]; 퀬-?񶳒.xn--hmb76q74166b; [P1, V5, V6, A3] # 퀬-.ૅ۴
+퀬-?񶳒.xn--hmb76q74166b; 퀬-?񶳒.ૅ󩸤۴; [P1, V5, V6]; 퀬-?񶳒.xn--hmb76q74166b; [P1, V5, V6, A3]; ;  # 퀬-.ૅ۴
+�ᅰᆻ-?񶳒.xn--hmb76q74166b; 퀬-?񶳒.ૅ󩸤۴; [P1, V5, V6]; 퀬-?񶳒.xn--hmb76q74166b; [P1, V5, V6, A3]; ;  # 퀬-.ૅ۴
+�ᅰᆻ-?񶳒.XN--HMB76Q74166B; 퀬-?񶳒.ૅ󩸤۴; [P1, V5, V6]; 퀬-?񶳒.xn--hmb76q74166b; [P1, V5, V6, A3]; ;  # 퀬-.ૅ۴
+퀬-?񶳒.XN--HMB76Q74166B; 퀬-?񶳒.ૅ󩸤۴; [P1, V5, V6]; 퀬-?񶳒.xn--hmb76q74166b; [P1, V5, V6, A3]; ;  # 퀬-.ૅ۴
+퀬-?񶳒.Xn--Hmb76q74166b; 퀬-?񶳒.ૅ󩸤۴; [P1, V5, V6]; 퀬-?񶳒.xn--hmb76q74166b; [P1, V5, V6, A3]; ;  # 퀬-.ૅ۴
+�ᅰᆻ-?񶳒.Xn--Hmb76q74166b; 퀬-?񶳒.ૅ󩸤۴; [P1, V5, V6]; 퀬-?񶳒.xn--hmb76q74166b; [P1, V5, V6, A3]; ;  # 퀬-.ૅ۴
+퀬-?񶳒.xn--hmb76q48y18505a; 퀬-?񶳒.‌ૅ󩸤۴; [C1, P1, V6]; 퀬-?񶳒.xn--hmb76q48y18505a; [C1, P1, V6, A3]; ;  # 퀬-.ૅ۴
+�ᅰᆻ-?񶳒.xn--hmb76q48y18505a; 퀬-?񶳒.‌ૅ󩸤۴; [C1, P1, V6]; 퀬-?񶳒.xn--hmb76q48y18505a; [C1, P1, V6, A3]; ;  # 퀬-.ૅ۴
+�ᅰᆻ-?񶳒.XN--HMB76Q48Y18505A; 퀬-?񶳒.‌ૅ󩸤۴; [C1, P1, V6]; 퀬-?񶳒.xn--hmb76q48y18505a; [C1, P1, V6, A3]; ;  # 퀬-.ૅ۴
+퀬-?񶳒.XN--HMB76Q48Y18505A; 퀬-?񶳒.‌ૅ󩸤۴; [C1, P1, V6]; 퀬-?񶳒.xn--hmb76q48y18505a; [C1, P1, V6, A3]; ;  # 퀬-.ૅ۴
+퀬-?񶳒.Xn--Hmb76q48y18505a; 퀬-?񶳒.‌ૅ󩸤۴; [C1, P1, V6]; 퀬-?񶳒.xn--hmb76q48y18505a; [C1, P1, V6, A3]; ;  # 퀬-.ૅ۴
+�ᅰᆻ-?񶳒.Xn--Hmb76q48y18505a; 퀬-?񶳒.‌ૅ󩸤۴; [C1, P1, V6]; 퀬-?񶳒.xn--hmb76q48y18505a; [C1, P1, V6, A3]; ;  # 퀬-.ૅ۴
+Ⴌ.�︒�𞾄; ; [B1, P1, V6]; xn--knd.xn--y86c030a9ob6374b; ; ;  # Ⴌ.�︒�
+Ⴌ.�。�𞾄; Ⴌ.�.�𞾄; [B1, P1, V5, V6]; xn--knd.xn--2o0d.xn--q30dg029a; ; ;  # Ⴌ.�.�
+ⴌ.�。�𞾄; ⴌ.�.�𞾄; [B1, P1, V5, V6]; xn--3kj.xn--2o0d.xn--q30dg029a; ; ;  # ⴌ.�.�
+xn--3kj.xn--2o0d.xn--q30dg029a; ⴌ.�.�𞾄; [B1, V5, V6]; xn--3kj.xn--2o0d.xn--q30dg029a; ; ;  # ⴌ.�.�
+xn--knd.xn--2o0d.xn--q30dg029a; Ⴌ.�.�𞾄; [B1, V5, V6]; xn--knd.xn--2o0d.xn--q30dg029a; ; ;  # Ⴌ.�.�
+ⴌ.�︒�𞾄; ; [B1, P1, V6]; xn--3kj.xn--y86c030a9ob6374b; ; ;  # ⴌ.�︒�
+xn--3kj.xn--y86c030a9ob6374b; ⴌ.�︒�𞾄; [B1, V6]; xn--3kj.xn--y86c030a9ob6374b; ; ;  # ⴌ.�︒�
+xn--knd.xn--y86c030a9ob6374b; Ⴌ.�︒�𞾄; [B1, V6]; xn--knd.xn--y86c030a9ob6374b; ; ;  # Ⴌ.�︒�
+񧞿�。𞩕�; 񧞿�.𞩕�; [B3, B6, P1, V6]; xn--iyh90030d.xn--1m6hs0260c; ; ;  # �.
+xn--iyh90030d.xn--1m6hs0260c; 񧞿�.𞩕�; [B3, B6, V6]; xn--iyh90030d.xn--1m6hs0260c; ; ;  # �.
+�┮�．ఀ�᜴�; �┮.ఀ�᜴�; [C2, V5]; xn--1ug04r.xn--eoc8m432a40i; ; xn--kxh.xn--eoc8m432a; [V5] # ┮.ఀ�᜴
+�┮�.ఀ�᜴�; �┮.ఀ�᜴�; [C2, V5]; xn--1ug04r.xn--eoc8m432a40i; ; xn--kxh.xn--eoc8m432a; [V5] # ┮.ఀ�᜴
+xn--kxh.xn--eoc8m432a; ┮.ఀ�᜴; [V5]; xn--kxh.xn--eoc8m432a; ; ;  # ┮.ఀ�᜴
+xn--1ug04r.xn--eoc8m432a40i; �┮.ఀ�᜴�; [C2, V5]; xn--1ug04r.xn--eoc8m432a40i; ; ;  # ┮.ఀ�᜴
+򹚪｡🄂; 򹚪.🄂; [P1, V6]; xn--n433d.xn--v07h; ; ;  # .🄂
+򹚪。1,; 򹚪.1,; [P1, V6]; xn--n433d.1,; ; ;  # .1,
+xn--n433d.1,; 򹚪.1,; [P1, V6]; xn--n433d.1,; ; ;  # .1,
+xn--n433d.xn--v07h; 򹚪.🄂; [V6]; xn--n433d.xn--v07h; ; ;  # .🄂
+��.🛦; ; [V5]; xn--rbry728b.xn--y88h; ; ;  # ��.🛦
+xn--rbry728b.xn--y88h; ��.🛦; [V5]; xn--rbry728b.xn--y88h; ; ;  # ��.🛦
+�3｡ᯱ�; �3.ᯱ4; [P1, V5, V6]; xn--3-ib31m.xn--4-pql; ; ;  # 3.ᯱ4
+�3。ᯱ4; �3.ᯱ4; [P1, V5, V6]; xn--3-ib31m.xn--4-pql; ; ;  # 3.ᯱ4
+xn--3-ib31m.xn--4-pql; �3.ᯱ4; [V5, V6]; xn--3-ib31m.xn--4-pql; ; ;  # 3.ᯱ4
+ڇ６Ⴔ辘.ﴢڇ‌; ڇ6Ⴔ辘.صيڇ‌; [B2, B3, C1, P1, V6]; xn--6-gsc039eqq6k.xn--0gb6bxkx18g; ; xn--6-gsc039eqq6k.xn--0gb6bxk; [B2, B3, P1, V6] # ڇ6Ⴔ辘.صيڇ
+ڇ6Ⴔ辘.صيڇ‌; ; [B2, B3, C1, P1, V6]; xn--6-gsc039eqq6k.xn--0gb6bxkx18g; ; xn--6-gsc039eqq6k.xn--0gb6bxk; [B2, B3, P1, V6] # ڇ6Ⴔ辘.صيڇ
+ڇ6ⴔ辘.صيڇ‌; ; [B2, B3, C1]; xn--6-gsc2270akm6f.xn--0gb6bxkx18g; ; xn--6-gsc2270akm6f.xn--0gb6bxk; [B2, B3] # ڇ6ⴔ辘.صيڇ
+xn--6-gsc2270akm6f.xn--0gb6bxk; ڇ6ⴔ辘.صيڇ; [B2, B3]; xn--6-gsc2270akm6f.xn--0gb6bxk; ; ;  # ڇ6ⴔ辘.صيڇ
+xn--6-gsc2270akm6f.xn--0gb6bxkx18g; ڇ6ⴔ辘.صيڇ‌; [B2, B3, C1]; xn--6-gsc2270akm6f.xn--0gb6bxkx18g; ; ;  # ڇ6ⴔ辘.صيڇ
+xn--6-gsc039eqq6k.xn--0gb6bxk; ڇ6Ⴔ辘.صيڇ; [B2, B3, V6]; xn--6-gsc039eqq6k.xn--0gb6bxk; ; ;  # ڇ6Ⴔ辘.صيڇ
+xn--6-gsc039eqq6k.xn--0gb6bxkx18g; ڇ6Ⴔ辘.صيڇ‌; [B2, B3, C1, V6]; xn--6-gsc039eqq6k.xn--0gb6bxkx18g; ; ;  # ڇ6Ⴔ辘.صيڇ
+ڇ６ⴔ辘.ﴢڇ‌; ڇ6ⴔ辘.صيڇ‌; [B2, B3, C1]; xn--6-gsc2270akm6f.xn--0gb6bxkx18g; ; xn--6-gsc2270akm6f.xn--0gb6bxk; [B2, B3] # ڇ6ⴔ辘.صيڇ
+�.�𞰬򻫞۹; .�𞰬򻫞۹; [B2, P1, V6, X4_2]; .xn--mmb3954kd0uf1zx7f; [B2, P1, V6, A4_2]; ;  # .�۹
+.xn--mmb3954kd0uf1zx7f; .�𞰬򻫞۹; [B2, V6, X4_2]; .xn--mmb3954kd0uf1zx7f; [B2, V6, A4_2]; ;  # .�۹
+꡽≯．򻲀򒳄; ꡽≯.򻲀򒳄; [P1, V6]; xn--hdh8193c.xn--5z40cp629b; ; ;  # ≯.
+꡽≯．򻲀򒳄; ꡽≯.򻲀򒳄; [P1, V6]; xn--hdh8193c.xn--5z40cp629b; ; ;  # ≯.
+꡽≯.򻲀򒳄; ; [P1, V6]; xn--hdh8193c.xn--5z40cp629b; ; ;  # ≯.
+꡽≯.򻲀򒳄; ꡽≯.򻲀򒳄; [P1, V6]; xn--hdh8193c.xn--5z40cp629b; ; ;  # ≯.
+xn--hdh8193c.xn--5z40cp629b; ꡽≯.򻲀򒳄; [V6]; xn--hdh8193c.xn--5z40cp629b; ; ;  # ≯.
+ς�ٻ.ςܔ; ; [B5, B6]; xn--3xa80l26n.xn--3xa41o; ; xn--4xa60l26n.xn--4xa21o;  # ς�ٻ.ςܔ
+Σ�ٻ.Σܔ; σ�ٻ.σܔ; [B5, B6]; xn--4xa60l26n.xn--4xa21o; ; ;  # σ�ٻ.σܔ
+σ�ٻ.σܔ; ; [B5, B6]; xn--4xa60l26n.xn--4xa21o; ; ;  # σ�ٻ.σܔ
+Σ�ٻ.σܔ; σ�ٻ.σܔ; [B5, B6]; xn--4xa60l26n.xn--4xa21o; ; ;  # σ�ٻ.σܔ
+xn--4xa60l26n.xn--4xa21o; σ�ٻ.σܔ; [B5, B6]; xn--4xa60l26n.xn--4xa21o; ; ;  # σ�ٻ.σܔ
+Σ�ٻ.ςܔ; σ�ٻ.ςܔ; [B5, B6]; xn--4xa60l26n.xn--3xa41o; ; xn--4xa60l26n.xn--4xa21o;  # σ�ٻ.ςܔ
+σ�ٻ.ςܔ; ; [B5, B6]; xn--4xa60l26n.xn--3xa41o; ; xn--4xa60l26n.xn--4xa21o;  # σ�ٻ.ςܔ
+xn--4xa60l26n.xn--3xa41o; σ�ٻ.ςܔ; [B5, B6]; xn--4xa60l26n.xn--3xa41o; ; ;  # σ�ٻ.ςܔ
+xn--3xa80l26n.xn--3xa41o; ς�ٻ.ςܔ; [B5, B6]; xn--3xa80l26n.xn--3xa41o; ; ;  # ς�ٻ.ςܔ
+Σ�ٻ.Σܔ; σ�ٻ.σܔ; [B5, B6]; xn--4xa60l26n.xn--4xa21o; ; ;  # σ�ٻ.σܔ
+򄖚݈𠄯ݟ｡󠛩; 򄖚݈𠄯ݟ.󠛩; [B1, B5, B6, P1, V6]; xn--vob0c4369twfv8b.xn--kl46e; ; ;  # ݈𠄯ݟ.
+򄖚݈𠄯ݟ。󠛩; 򄖚݈𠄯ݟ.󠛩; [B1, B5, B6, P1, V6]; xn--vob0c4369twfv8b.xn--kl46e; ; ;  # ݈𠄯ݟ.
+xn--vob0c4369twfv8b.xn--kl46e; 򄖚݈𠄯ݟ.󠛩; [B1, B5, B6, V6]; xn--vob0c4369twfv8b.xn--kl46e; ; ;  # ݈𠄯ݟ.
+󠳛．�䤫≠Ⴞ; 󠳛.�䤫≠Ⴞ; [C2, P1, V6]; xn--1t56e.xn--2nd159e9vb743e; ; xn--1t56e.xn--2nd141ghl2a; [P1, V6] # .䤫≠Ⴞ
+󠳛．�䤫≠Ⴞ; 󠳛.�䤫≠Ⴞ; [C2, P1, V6]; xn--1t56e.xn--2nd159e9vb743e; ; xn--1t56e.xn--2nd141ghl2a; [P1, V6] # .䤫≠Ⴞ
+󠳛.�䤫≠Ⴞ; ; [C2, P1, V6]; xn--1t56e.xn--2nd159e9vb743e; ; xn--1t56e.xn--2nd141ghl2a; [P1, V6] # .䤫≠Ⴞ
+󠳛.�䤫≠Ⴞ; 󠳛.�䤫≠Ⴞ; [C2, P1, V6]; xn--1t56e.xn--2nd159e9vb743e; ; xn--1t56e.xn--2nd141ghl2a; [P1, V6] # .䤫≠Ⴞ
+󠳛.�䤫≠ⴞ; 󠳛.�䤫≠ⴞ; [C2, P1, V6]; xn--1t56e.xn--1ug73gzzpwi3a; ; xn--1t56e.xn--1ch153bqvw; [P1, V6] # .䤫≠ⴞ
+󠳛.�䤫≠ⴞ; ; [C2, P1, V6]; xn--1t56e.xn--1ug73gzzpwi3a; ; xn--1t56e.xn--1ch153bqvw; [P1, V6] # .䤫≠ⴞ
+xn--1t56e.xn--1ch153bqvw; 󠳛.䤫≠ⴞ; [V6]; xn--1t56e.xn--1ch153bqvw; ; ;  # .䤫≠ⴞ
+xn--1t56e.xn--1ug73gzzpwi3a; 󠳛.�䤫≠ⴞ; [C2, V6]; xn--1t56e.xn--1ug73gzzpwi3a; ; ;  # .䤫≠ⴞ
+xn--1t56e.xn--2nd141ghl2a; 󠳛.䤫≠Ⴞ; [V6]; xn--1t56e.xn--2nd141ghl2a; ; ;  # .䤫≠Ⴞ
+xn--1t56e.xn--2nd159e9vb743e; 󠳛.�䤫≠Ⴞ; [C2, V6]; xn--1t56e.xn--2nd159e9vb743e; ; ;  # .䤫≠Ⴞ
+󠳛．�䤫≠ⴞ; 󠳛.�䤫≠ⴞ; [C2, P1, V6]; xn--1t56e.xn--1ug73gzzpwi3a; ; xn--1t56e.xn--1ch153bqvw; [P1, V6] # .䤫≠ⴞ
+󠳛．�䤫≠ⴞ; 󠳛.�䤫≠ⴞ; [C2, P1, V6]; xn--1t56e.xn--1ug73gzzpwi3a; ; xn--1t56e.xn--1ch153bqvw; [P1, V6] # .䤫≠ⴞ
+�𑈵．�🕥; �𑈵.�🕥; [B1, B2, B3]; xn--bv0d02c.xn--bo0dq650b; ; ;  # �𑈵.�🕥
+�𑈵.�🕥; ; [B1, B2, B3]; xn--bv0d02c.xn--bo0dq650b; ; ;  # �𑈵.�🕥
+xn--bv0d02c.xn--bo0dq650b; �𑈵.�🕥; [B1, B2, B3]; xn--bv0d02c.xn--bo0dq650b; ; ;  # �𑈵.�🕥
+⒊⒈�。9; ⒊⒈�.9; [P1, V6]; xn--tshd3512p.9; ; ;  # ⒊⒈�.9
+3.1.�。9; 3.1.�.9; [V5]; 3.1.xn--110d.9; ; ;  # 3.1.�.9
+3.1.xn--110d.9; 3.1.�.9; [V5]; 3.1.xn--110d.9; ; ;  # 3.1.�.9
+xn--tshd3512p.9; ⒊⒈�.9; [V6]; xn--tshd3512p.9; ; ;  # ⒊⒈�.9
+-‌ⷱ≮．��4₉; -‌ⷱ≮.��49; [B1, C1, P1, V3, V6]; xn----sgn20i14s.xn--49-ki3om2611f; ; xn----ngo823c.xn--49-ki3om2611f; [B1, P1, V3, V6] # -ⷱ≮.�49
+-‌ⷱ≮．��4₉; -‌ⷱ≮.��49; [B1, C1, P1, V3, V6]; xn----sgn20i14s.xn--49-ki3om2611f; ; xn----ngo823c.xn--49-ki3om2611f; [B1, P1, V3, V6] # -ⷱ≮.�49
+-‌ⷱ≮.��49; ; [B1, C1, P1, V3, V6]; xn----sgn20i14s.xn--49-ki3om2611f; ; xn----ngo823c.xn--49-ki3om2611f; [B1, P1, V3, V6] # -ⷱ≮.�49
+-‌ⷱ≮.��49; -‌ⷱ≮.��49; [B1, C1, P1, V3, V6]; xn----sgn20i14s.xn--49-ki3om2611f; ; xn----ngo823c.xn--49-ki3om2611f; [B1, P1, V3, V6] # -ⷱ≮.�49
+xn----ngo823c.xn--49-ki3om2611f; -ⷱ≮.��49; [B1, V3, V6]; xn----ngo823c.xn--49-ki3om2611f; ; ;  # -ⷱ≮.�49
+xn----sgn20i14s.xn--49-ki3om2611f; -‌ⷱ≮.��49; [B1, C1, V3, V6]; xn----sgn20i14s.xn--49-ki3om2611f; ; ;  # -ⷱ≮.�49
+-≯딾｡ࡇ; -≯딾.ࡇ; [B1, P1, V3, V6]; xn----pgow547d.xn--5vb; ; ;  # -≯딾.ࡇ
+-≯딾｡ࡇ; -≯딾.ࡇ; [B1, P1, V3, V6]; xn----pgow547d.xn--5vb; ; ;  # -≯딾.ࡇ
+-≯딾。ࡇ; -≯딾.ࡇ; [B1, P1, V3, V6]; xn----pgow547d.xn--5vb; ; ;  # -≯딾.ࡇ
+-≯딾。ࡇ; -≯딾.ࡇ; [B1, P1, V3, V6]; xn----pgow547d.xn--5vb; ; ;  # -≯딾.ࡇ
+xn----pgow547d.xn--5vb; -≯딾.ࡇ; [B1, V3, V6]; xn----pgow547d.xn--5vb; ; ;  # -≯딾.ࡇ
+𑙢⒈�-｡�‌; 𑙢⒈�-.�‌; [B1, C1, P1, V3, V6]; xn----dcpy090hiyg.xn--0ug23321l; ; xn----dcpy090hiyg.xn--jd46e; [B1, P1, V3, V6] # 𑙢⒈�-.
+𑙢1.�-。�‌; 𑙢1.�-.�‌; [B1, C1, P1, V3, V6]; xn--1-bf0j.xn----516i.xn--0ug23321l; ; xn--1-bf0j.xn----516i.xn--jd46e; [B1, P1, V3, V6] # 𑙢1.�-.
+xn--1-bf0j.xn----516i.xn--jd46e; 𑙢1.�-.�; [B1, V3, V6]; xn--1-bf0j.xn----516i.xn--jd46e; ; ;  # 𑙢1.�-.
+xn--1-bf0j.xn----516i.xn--0ug23321l; 𑙢1.�-.�‌; [B1, C1, V3, V6]; xn--1-bf0j.xn----516i.xn--0ug23321l; ; ;  # 𑙢1.�-.
+xn----dcpy090hiyg.xn--jd46e; 𑙢⒈�-.�; [B1, V3, V6]; xn----dcpy090hiyg.xn--jd46e; ; ;  # 𑙢⒈�-.
+xn----dcpy090hiyg.xn--0ug23321l; 𑙢⒈�-.�‌; [B1, C1, V3, V6]; xn----dcpy090hiyg.xn--0ug23321l; ; ;  # 𑙢⒈�-.
+͊．�; ͊.�; [V5]; xn--oua.xn--mr9c; ; ;  # ͊.�
+͊.�; ; [V5]; xn--oua.xn--mr9c; ; ;  # ͊.�
+xn--oua.xn--mr9c; ͊.�; [V5]; xn--oua.xn--mr9c; ; ;  # ͊.�
+훉≮｡ิ; 훉≮.ิ; [P1, V5, V6]; xn--gdh2512e.xn--i4c; ; ;  # 훉≮.ิ
+훉≮｡ิ; 훉≮.ิ; [P1, V5, V6]; xn--gdh2512e.xn--i4c; ; ;  # 훉≮.ิ
+훉≮。ิ; 훉≮.ิ; [P1, V5, V6]; xn--gdh2512e.xn--i4c; ; ;  # 훉≮.ิ
+훉≮。ิ; 훉≮.ิ; [P1, V5, V6]; xn--gdh2512e.xn--i4c; ; ;  # 훉≮.ิ
+xn--gdh2512e.xn--i4c; 훉≮.ิ; [V5, V6]; xn--gdh2512e.xn--i4c; ; ;  # 훉≮.ิ
+ⷷ򞣉🃘．𴈇�ٙ𞤯; ⷷ򞣉🃘.𴈇2ٙ𞤯; [B1, B5, B6, P1, V5, V6]; xn--trj8045le6s9b.xn--2-upc23918acjsj; ; ;  # ⷷ🃘.2ٙ𞤯
+ⷷ򞣉🃘.𴈇2ٙ𞤯; ; [B1, B5, B6, P1, V5, V6]; xn--trj8045le6s9b.xn--2-upc23918acjsj; ; ;  # ⷷ🃘.2ٙ𞤯
+ⷷ򞣉🃘.𴈇2ٙ�; ⷷ򞣉🃘.𴈇2ٙ𞤯; [B1, B5, B6, P1, V5, V6]; xn--trj8045le6s9b.xn--2-upc23918acjsj; ; ;  # ⷷ🃘.2ٙ𞤯
+xn--trj8045le6s9b.xn--2-upc23918acjsj; ⷷ򞣉🃘.𴈇2ٙ𞤯; [B1, B5, B6, V5, V6]; xn--trj8045le6s9b.xn--2-upc23918acjsj; ; ;  # ⷷ🃘.2ٙ𞤯
+ⷷ򞣉🃘．𴈇�ٙ�; ⷷ򞣉🃘.𴈇2ٙ𞤯; [B1, B5, B6, P1, V5, V6]; xn--trj8045le6s9b.xn--2-upc23918acjsj; ; ;  # ⷷ🃘.2ٙ𞤯
+󗇩ßᢞ‌。٠𞷻ﳔ-; 󗇩ßᢞ‌.٠𞷻نخ-; [B1, B6, C1, P1, V3, V6]; xn--zca272jbif10059a.xn----dnc5e1er384z; ; xn--ss-jepz4596r.xn----dnc5e1er384z; [B1, P1, V3, V6] # ßᢞ.٠نخ-
+󗇩ßᢞ‌。٠𞷻نخ-; 󗇩ßᢞ‌.٠𞷻نخ-; [B1, B6, C1, P1, V3, V6]; xn--zca272jbif10059a.xn----dnc5e1er384z; ; xn--ss-jepz4596r.xn----dnc5e1er384z; [B1, P1, V3, V6] # ßᢞ.٠نخ-
+󗇩SSᢞ‌。٠𞷻نخ-; 󗇩ssᢞ‌.٠𞷻نخ-; [B1, B6, C1, P1, V3, V6]; xn--ss-jep006bqt765b.xn----dnc5e1er384z; ; xn--ss-jepz4596r.xn----dnc5e1er384z; [B1, P1, V3, V6] # ssᢞ.٠نخ-
+󗇩ssᢞ‌。٠𞷻نخ-; 󗇩ssᢞ‌.٠𞷻نخ-; [B1, B6, C1, P1, V3, V6]; xn--ss-jep006bqt765b.xn----dnc5e1er384z; ; xn--ss-jepz4596r.xn----dnc5e1er384z; [B1, P1, V3, V6] # ssᢞ.٠نخ-
+󗇩Ssᢞ‌。٠𞷻نخ-; 󗇩ssᢞ‌.٠𞷻نخ-; [B1, B6, C1, P1, V3, V6]; xn--ss-jep006bqt765b.xn----dnc5e1er384z; ; xn--ss-jepz4596r.xn----dnc5e1er384z; [B1, P1, V3, V6] # ssᢞ.٠نخ-
+xn--ss-jepz4596r.xn----dnc5e1er384z; 󗇩ssᢞ.٠𞷻نخ-; [B1, V3, V6]; xn--ss-jepz4596r.xn----dnc5e1er384z; ; ;  # ssᢞ.٠نخ-
+xn--ss-jep006bqt765b.xn----dnc5e1er384z; 󗇩ssᢞ‌.٠𞷻نخ-; [B1, B6, C1, V3, V6]; xn--ss-jep006bqt765b.xn----dnc5e1er384z; ; ;  # ssᢞ.٠نخ-
+xn--zca272jbif10059a.xn----dnc5e1er384z; 󗇩ßᢞ‌.٠𞷻نخ-; [B1, B6, C1, V3, V6]; xn--zca272jbif10059a.xn----dnc5e1er384z; ; ;  # ßᢞ.٠نخ-
+󗇩SSᢞ‌。٠𞷻ﳔ-; 󗇩ssᢞ‌.٠𞷻نخ-; [B1, B6, C1, P1, V3, V6]; xn--ss-jep006bqt765b.xn----dnc5e1er384z; ; xn--ss-jepz4596r.xn----dnc5e1er384z; [B1, P1, V3, V6] # ssᢞ.٠نخ-
+󗇩ssᢞ‌。٠𞷻ﳔ-; 󗇩ssᢞ‌.٠𞷻نخ-; [B1, B6, C1, P1, V3, V6]; xn--ss-jep006bqt765b.xn----dnc5e1er384z; ; xn--ss-jepz4596r.xn----dnc5e1er384z; [B1, P1, V3, V6] # ssᢞ.٠نخ-
+󗇩Ssᢞ‌。٠𞷻ﳔ-; 󗇩ssᢞ‌.٠𞷻نخ-; [B1, B6, C1, P1, V3, V6]; xn--ss-jep006bqt765b.xn----dnc5e1er384z; ; xn--ss-jepz4596r.xn----dnc5e1er384z; [B1, P1, V3, V6] # ssᢞ.٠نخ-
+ꡆ。Ↄྵ놮-; ꡆ.Ↄྵ놮-; [P1, V3, V6]; xn--fc9a.xn----qmg787k869k; ; ;  # ꡆ.Ↄྵ놮-
+ꡆ。Ↄྵ놔�-; ꡆ.Ↄྵ놮-; [P1, V3, V6]; xn--fc9a.xn----qmg787k869k; ; ;  # ꡆ.Ↄྵ놮-
+ꡆ。ↄྵ놔�-; ꡆ.ↄྵ놮-; [V3]; xn--fc9a.xn----qmg097k469k; ; ;  # ꡆ.ↄྵ놮-
+ꡆ。ↄྵ놮-; ꡆ.ↄྵ놮-; [V3]; xn--fc9a.xn----qmg097k469k; ; ;  # ꡆ.ↄྵ놮-
+xn--fc9a.xn----qmg097k469k; ꡆ.ↄྵ놮-; [V3]; xn--fc9a.xn----qmg097k469k; ; ;  # ꡆ.ↄྵ놮-
+xn--fc9a.xn----qmg787k869k; ꡆ.Ↄྵ놮-; [V3, V6]; xn--fc9a.xn----qmg787k869k; ; ;  # ꡆ.Ↄྵ놮-
+ﶭ�.񥰌ک; لمي�.񥰌ک; [B3, B5, B6, C2, P1, V6]; xn--ghbcp494x.xn--ckb36214f; ; xn--ghbcp.xn--ckb36214f; [B5, B6, P1, V6] # لمي.ک
+لمي�.񥰌ک; ; [B3, B5, B6, C2, P1, V6]; xn--ghbcp494x.xn--ckb36214f; ; xn--ghbcp.xn--ckb36214f; [B5, B6, P1, V6] # لمي.ک
+xn--ghbcp.xn--ckb36214f; لمي.񥰌ک; [B5, B6, V6]; xn--ghbcp.xn--ckb36214f; ; ;  # لمي.ک
+xn--ghbcp494x.xn--ckb36214f; لمي�.񥰌ک; [B3, B5, B6, C2, V6]; xn--ghbcp494x.xn--ckb36214f; ; ;  # لمي.ک
+Ⴜᰯ�≯。۠ᜲྺ; Ⴜᰯ�≯.۠ᜲྺ; [B1, B3, B5, B6, P1, V5, V6]; xn--0nd679cf3eq67y.xn--wlb646b4ng; ; ;  # Ⴜᰯ�≯.۠ᜲྺ
+Ⴜᰯ�≯。۠ᜲྺ; Ⴜᰯ�≯.۠ᜲྺ; [B1, B3, B5, B6, P1, V5, V6]; xn--0nd679cf3eq67y.xn--wlb646b4ng; ; ;  # Ⴜᰯ�≯.۠ᜲྺ
+ⴜᰯ�≯。۠ᜲྺ; ⴜᰯ�≯.۠ᜲྺ; [B1, B3, B5, B6, P1, V5, V6]; xn--r1f68xh1jgv7u.xn--wlb646b4ng; ; ;  # ⴜᰯ�≯.۠ᜲྺ
+ⴜᰯ�≯。۠ᜲྺ; ⴜᰯ�≯.۠ᜲྺ; [B1, B3, B5, B6, P1, V5, V6]; xn--r1f68xh1jgv7u.xn--wlb646b4ng; ; ;  # ⴜᰯ�≯.۠ᜲྺ
+Ⴜᰯ�≯。۠ᜲྺ; Ⴜᰯ�≯.۠ᜲྺ; [B1, B3, B5, B6, P1, V5, V6]; xn--0nd679cf3eq67y.xn--wlb646b4ng; ; ;  # Ⴜᰯ�≯.۠ᜲྺ
+Ⴜᰯ�≯。۠ᜲྺ; Ⴜᰯ�≯.۠ᜲྺ; [B1, B3, B5, B6, P1, V5, V6]; xn--0nd679cf3eq67y.xn--wlb646b4ng; ; ;  # Ⴜᰯ�≯.۠ᜲྺ
+xn--0nd679cf3eq67y.xn--wlb646b4ng; Ⴜᰯ�≯.۠ᜲྺ; [B1, B3, B5, B6, V5, V6]; xn--0nd679cf3eq67y.xn--wlb646b4ng; ; ;  # Ⴜᰯ�≯.۠ᜲྺ
+xn--r1f68xh1jgv7u.xn--wlb646b4ng; ⴜᰯ�≯.۠ᜲྺ; [B1, B3, B5, B6, V5, V6]; xn--r1f68xh1jgv7u.xn--wlb646b4ng; ; ;  # ⴜᰯ�≯.۠ᜲྺ
+�。ﳬ; �.كم; [B1]; xn--p97c.xn--fhbe; ; ;  # �.كم
+�。كم; �.كم; [B1]; xn--p97c.xn--fhbe; ; ;  # �.كم
+xn--p97c.xn--fhbe; �.كم; [B1]; xn--p97c.xn--fhbe; ; ;  # �.كم
+�.كم; ; [B1]; xn--p97c.xn--fhbe; ; ;  # �.كم
+≮�．�ꫬ⹈󰥭; ≮�.�ꫬ⹈󰥭; [P1, V6]; xn--gdh0880o.xn--4tjx101bsg00ds9pyc; ; ;  # ≮.ꫬ⹈
+≮�．�ꫬ⹈󰥭; ≮�.�ꫬ⹈󰥭; [P1, V6]; xn--gdh0880o.xn--4tjx101bsg00ds9pyc; ; ;  # ≮.ꫬ⹈
+≮�.�ꫬ⹈󰥭; ; [P1, V6]; xn--gdh0880o.xn--4tjx101bsg00ds9pyc; ; ;  # ≮.ꫬ⹈
+≮�.�ꫬ⹈󰥭; ≮�.�ꫬ⹈󰥭; [P1, V6]; xn--gdh0880o.xn--4tjx101bsg00ds9pyc; ; ;  # ≮.ꫬ⹈
+xn--gdh0880o.xn--4tjx101bsg00ds9pyc; ≮�.�ꫬ⹈󰥭; [V6]; xn--gdh0880o.xn--4tjx101bsg00ds9pyc; ; ;  # ≮.ꫬ⹈
+ⷰ͘ᢕ．͡��; ⷰ͘ᢕ.͡��; [B1, P1, V5, V6]; xn--2ua889htsp.xn--cva2687k2tv0g; ; ;  # ⷰ͘ᢕ.͡�
+ⷰ͘ᢕ.͡��; ; [B1, P1, V5, V6]; xn--2ua889htsp.xn--cva2687k2tv0g; ; ;  # ⷰ͘ᢕ.͡�
+xn--2ua889htsp.xn--cva2687k2tv0g; ⷰ͘ᢕ.͡��; [B1, V5, V6]; xn--2ua889htsp.xn--cva2687k2tv0g; ; ;  # ⷰ͘ᢕ.͡�
+ﵹ�‌ڭ．𑋪ׇ; غمم�‌ڭ.𑋪ׇ; [B1, B2, B3, B6, V5]; xn--5gbwa03bg24eptk.xn--vdb1198k; ; xn--5gbwa03bg24e.xn--vdb1198k;  # غمم�ڭ.𑋪ׇ
+غمم�‌ڭ.𑋪ׇ; ; [B1, B2, B3, B6, V5]; xn--5gbwa03bg24eptk.xn--vdb1198k; ; xn--5gbwa03bg24e.xn--vdb1198k;  # غمم�ڭ.𑋪ׇ
+xn--5gbwa03bg24e.xn--vdb1198k; غمم�ڭ.𑋪ׇ; [B1, B2, B3, B6, V5]; xn--5gbwa03bg24e.xn--vdb1198k; ; ;  # غمم�ڭ.𑋪ׇ
+xn--5gbwa03bg24eptk.xn--vdb1198k; غمم�‌ڭ.𑋪ׇ; [B1, B2, B3, B6, V5]; xn--5gbwa03bg24eptk.xn--vdb1198k; ; ;  # غمم�ڭ.𑋪ׇ
+𑑂｡�󥞀🞕�; 𑑂.�󥞀🞕�; [C2, P1, V5, V6]; xn--8v1d.xn--1ug1386plvx1cd8vya; ; xn--8v1d.xn--ye9h41035a2qqs; [P1, V5, V6] # 𑑂.🞕
+𑑂。�󥞀🞕�; 𑑂.�󥞀🞕�; [C2, P1, V5, V6]; xn--8v1d.xn--1ug1386plvx1cd8vya; ; xn--8v1d.xn--ye9h41035a2qqs; [P1, V5, V6] # 𑑂.🞕
+xn--8v1d.xn--ye9h41035a2qqs; 𑑂.󥞀🞕�; [V5, V6]; xn--8v1d.xn--ye9h41035a2qqs; ; ;  # 𑑂.🞕
+xn--8v1d.xn--1ug1386plvx1cd8vya; 𑑂.�󥞀🞕�; [C2, V5, V6]; xn--8v1d.xn--1ug1386plvx1cd8vya; ; ;  # 𑑂.🞕
+-ש。⒚; -ש.⒚; [B1, P1, V3, V6]; xn----gjc.xn--cth; ; ;  # -ש.⒚
+-ש。19.; -ש.19.; [B1, V3]; xn----gjc.19.; ; ;  # -ש.19.
+xn----gjc.19.; -ש.19.; [B1, V3]; xn----gjc.19.; ; ;  # -ש.19.
+xn----gjc.xn--cth; -ש.⒚; [B1, V3, V6]; xn----gjc.xn--cth; ; ;  # -ש.⒚
+􊾻ࡅ‌｡ᢎ�; 􊾻ࡅ‌.ᢎ�; [B5, B6, C1, C2, P1, V6]; xn--3vb882jz4411a.xn--79e259a; ; xn--3vb50049s.xn--79e; [B5, B6, P1, V6] # ࡅ.ᢎ
+􊾻ࡅ‌。ᢎ�; 􊾻ࡅ‌.ᢎ�; [B5, B6, C1, C2, P1, V6]; xn--3vb882jz4411a.xn--79e259a; ; xn--3vb50049s.xn--79e; [B5, B6, P1, V6] # ࡅ.ᢎ
+xn--3vb50049s.xn--79e; 􊾻ࡅ.ᢎ; [B5, B6, V6]; xn--3vb50049s.xn--79e; ; ;  # ࡅ.ᢎ
+xn--3vb882jz4411a.xn--79e259a; 􊾻ࡅ‌.ᢎ�; [B5, B6, C1, C2, V6]; xn--3vb882jz4411a.xn--79e259a; ; ;  # ࡅ.ᢎ
+ß�ᷭ。ؠ8₅; ß�ᷭ.ؠ85; ; xn--zca266bwrr.xn--85-psd; ; xn--ss-e2f077r.xn--85-psd;  # ß�ᷭ.ؠ85
+ß�ᷭ。ؠ85; ß�ᷭ.ؠ85; ; xn--zca266bwrr.xn--85-psd; ; xn--ss-e2f077r.xn--85-psd;  # ß�ᷭ.ؠ85
+SS�ᷭ。ؠ85; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+ss�ᷭ。ؠ85; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+Ss�ᷭ。ؠ85; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+xn--ss-e2f077r.xn--85-psd; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+ss�ᷭ.ؠ85; ; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+SS�ᷭ.ؠ85; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+Ss�ᷭ.ؠ85; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+xn--zca266bwrr.xn--85-psd; ß�ᷭ.ؠ85; ; xn--zca266bwrr.xn--85-psd; ; ;  # ß�ᷭ.ؠ85
+ß�ᷭ.ؠ85; ; ; xn--zca266bwrr.xn--85-psd; ; xn--ss-e2f077r.xn--85-psd;  # ß�ᷭ.ؠ85
+SS�ᷭ。ؠ8₅; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+ss�ᷭ。ؠ8₅; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+Ss�ᷭ。ؠ8₅; ss�ᷭ.ؠ85; ; xn--ss-e2f077r.xn--85-psd; ; ;  # ss�ᷭ.ؠ85
+�҄魅�．₃�ß; �҄魅1.3�ß; [B1, V5]; xn--1-0xb049b102o.xn--3-qfa7018r; ; xn--1-0xb049b102o.xn--3ss-nv9t;  # �҄魅1.3�ß
+�҄魅1.3�ß; ; [B1, V5]; xn--1-0xb049b102o.xn--3-qfa7018r; ; xn--1-0xb049b102o.xn--3ss-nv9t;  # �҄魅1.3�ß
+�҄魅1.3�SS; �҄魅1.3�ss; [B1, V5]; xn--1-0xb049b102o.xn--3ss-nv9t; ; ;  # �҄魅1.3�ss
+�҄魅1.3�ss; ; [B1, V5]; xn--1-0xb049b102o.xn--3ss-nv9t; ; ;  # �҄魅1.3�ss
+�҄魅1.3�Ss; �҄魅1.3�ss; [B1, V5]; xn--1-0xb049b102o.xn--3ss-nv9t; ; ;  # �҄魅1.3�ss
+xn--1-0xb049b102o.xn--3ss-nv9t; �҄魅1.3�ss; [B1, V5]; xn--1-0xb049b102o.xn--3ss-nv9t; ; ;  # �҄魅1.3�ss
+xn--1-0xb049b102o.xn--3-qfa7018r; �҄魅1.3�ß; [B1, V5]; xn--1-0xb049b102o.xn--3-qfa7018r; ; ;  # �҄魅1.3�ß
+�҄魅�．₃�SS; �҄魅1.3�ss; [B1, V5]; xn--1-0xb049b102o.xn--3ss-nv9t; ; ;  # �҄魅1.3�ss
+�҄魅�．₃�ss; �҄魅1.3�ss; [B1, V5]; xn--1-0xb049b102o.xn--3ss-nv9t; ; ;  # �҄魅1.3�ss
+�҄魅�．₃�Ss; �҄魅1.3�ss; [B1, V5]; xn--1-0xb049b102o.xn--3ss-nv9t; ; ;  # �҄魅1.3�ss
+ܫ｡𑓂⒈𑜫󠿻; ܫ.𑓂⒈𑜫󠿻; [B1, P1, V5, V6]; xn--1nb.xn--tsh7798f6rbrt828c; ; ;  # ܫ.𑓂⒈𑜫
+ܫ。𑓂1.𑜫󠿻; ܫ.𑓂1.𑜫󠿻; [B1, P1, V5, V6]; xn--1nb.xn--1-jq9i.xn--ji2dg9877c; ; ;  # ܫ.𑓂1.𑜫
+xn--1nb.xn--1-jq9i.xn--ji2dg9877c; ܫ.𑓂1.𑜫󠿻; [B1, V5, V6]; xn--1nb.xn--1-jq9i.xn--ji2dg9877c; ; ;  # ܫ.𑓂1.𑜫
+xn--1nb.xn--tsh7798f6rbrt828c; ܫ.𑓂⒈𑜫󠿻; [B1, V5, V6]; xn--1nb.xn--tsh7798f6rbrt828c; ; ;  # ܫ.𑓂⒈𑜫
+�છ。嵨; છ.嵨; ; xn--6dc.xn--tot; ; ;  # છ.嵨
+xn--6dc.xn--tot; છ.嵨; ; xn--6dc.xn--tot; ; ;  # છ.嵨
+છ.嵨; ; ; xn--6dc.xn--tot; ; ;  # છ.嵨
+Ⴔ≠Ⴀ.��; ; [B1, P1, V6]; xn--7md3b171g.xn--do0dwa; ; ;  # Ⴔ≠Ⴀ.��
+Ⴔ≠Ⴀ.��; Ⴔ≠Ⴀ.��; [B1, P1, V6]; xn--7md3b171g.xn--do0dwa; ; ;  # Ⴔ≠Ⴀ.��
+ⴔ≠ⴀ.��; ⴔ≠ⴀ.��; [B1, P1, V6]; xn--1ch603bxb.xn--do0dwa; ; ;  # ⴔ≠ⴀ.��
+ⴔ≠ⴀ.��; ; [B1, P1, V6]; xn--1ch603bxb.xn--do0dwa; ; ;  # ⴔ≠ⴀ.��
+xn--1ch603bxb.xn--do0dwa; ⴔ≠ⴀ.��; [B1, V6]; xn--1ch603bxb.xn--do0dwa; ; ;  # ⴔ≠ⴀ.��
+xn--7md3b171g.xn--do0dwa; Ⴔ≠Ⴀ.��; [B1, V6]; xn--7md3b171g.xn--do0dwa; ; ;  # Ⴔ≠Ⴀ.��
+-‌⒙�｡�; -‌⒙�.�; [C1, P1, V3, V5, V6]; xn----sgn18r3191a.xn--382h; ; xn----ddps939g.xn--382h; [P1, V3, V5, V6] # -⒙�.�
+-‌18.�。�; -‌18.�.�; [C1, V3, V5]; xn---18-9m0a.xn--rx9c.xn--382h; ; -18.xn--rx9c.xn--382h; [V3, V5] # -18.�.�
+-18.xn--rx9c.xn--382h; -18.�.�; [V3, V5]; -18.xn--rx9c.xn--382h; ; ;  # -18.�.�
+xn---18-9m0a.xn--rx9c.xn--382h; -‌18.�.�; [C1, V3, V5]; xn---18-9m0a.xn--rx9c.xn--382h; ; ;  # -18.�.�
+xn----ddps939g.xn--382h; -⒙�.�; [V3, V5, V6]; xn----ddps939g.xn--382h; ; ;  # -⒙�.�
+xn----sgn18r3191a.xn--382h; -‌⒙�.�; [C1, V3, V5, V6]; xn----sgn18r3191a.xn--382h; ; ;  # -⒙�.�
+︒.ʌᠣ-�; ; [B1, B5, B6, P1, V6]; xn--y86c.xn----73a596nuh9t; ; ;  # ︒.ʌᠣ-�
+。.ʌᠣ-�; ..ʌᠣ-�; [B5, B6, X4_2]; ..xn----73a596nuh9t; [B5, B6, A4_2]; ;  # ..ʌᠣ-�
+。.Ʌᠣ-�; ..ʌᠣ-�; [B5, B6, X4_2]; ..xn----73a596nuh9t; [B5, B6, A4_2]; ;  # ..ʌᠣ-�
+..xn----73a596nuh9t; ..ʌᠣ-�; [B5, B6, X4_2]; ..xn----73a596nuh9t; [B5, B6, A4_2]; ;  # ..ʌᠣ-�
+︒.Ʌᠣ-�; ︒.ʌᠣ-�; [B1, B5, B6, P1, V6]; xn--y86c.xn----73a596nuh9t; ; ;  # ︒.ʌᠣ-�
+xn--y86c.xn----73a596nuh9t; ︒.ʌᠣ-�; [B1, B5, B6, V6]; xn--y86c.xn----73a596nuh9t; ; ;  # ︒.ʌᠣ-�
+︅︒。𦀾᳠; ︒.𦀾᳠; [P1, V6]; xn--y86c.xn--t6f5138v; ; ;  # ︒.𦀾᳠
+︅。。𦀾᳠; ..𦀾᳠; [X4_2]; ..xn--t6f5138v; [A4_2]; ;  # ..𦀾᳠
+..xn--t6f5138v; ..𦀾᳠; [X4_2]; ..xn--t6f5138v; [A4_2]; ;  # ..𦀾᳠
+xn--y86c.xn--t6f5138v; ︒.𦀾᳠; [V6]; xn--y86c.xn--t6f5138v; ; ;  # ︒.𦀾᳠
+xn--t6f5138v; 𦀾᳠; ; xn--t6f5138v; ; ;  # 𦀾᳠
+𦀾᳠; ; ; xn--t6f5138v; ; ;  # 𦀾᳠
+𞮑ß�。�; 𞮑ß�.�; [B2, B3, P1, V6]; xn--zca9432wb989f.xn--07e; ; xn--ss-o412ac6305g.xn--07e;  # ß.�
+𞮑SS�。�; 𞮑ss�.�; [B2, B3, P1, V6]; xn--ss-o412ac6305g.xn--07e; ; ;  # ss.�
+𞮑ss�。�; 𞮑ss�.�; [B2, B3, P1, V6]; xn--ss-o412ac6305g.xn--07e; ; ;  # ss.�
+𞮑Ss�。�; 𞮑ss�.�; [B2, B3, P1, V6]; xn--ss-o412ac6305g.xn--07e; ; ;  # ss.�
+xn--ss-o412ac6305g.xn--07e; 𞮑ss�.�; [B2, B3, V6]; xn--ss-o412ac6305g.xn--07e; ; ;  # ss.�
+xn--zca9432wb989f.xn--07e; 𞮑ß�.�; [B2, B3, V6]; xn--zca9432wb989f.xn--07e; ; ;  # ß.�
+꥓�ج٬。𱆎󻡟‌󠅆; ꥓�ج٬.𱆎󻡟‌; [B5, B6, C1, P1, V5, V6]; xn--rgb2k500fhq9j.xn--0ug78870a5sp9d; ; xn--rgb2k6711c.xn--ec8nj3948b; [B5, B6, P1, V5, V6] # ꥓ج٬.𱆎
+xn--rgb2k6711c.xn--ec8nj3948b; ꥓ج٬.𱆎󻡟; [B5, B6, V5, V6]; xn--rgb2k6711c.xn--ec8nj3948b; ; ;  # ꥓ج٬.𱆎
+xn--rgb2k500fhq9j.xn--0ug78870a5sp9d; ꥓�ج٬.𱆎󻡟‌; [B5, B6, C1, V5, V6]; xn--rgb2k500fhq9j.xn--0ug78870a5sp9d; ; ;  # ꥓ج٬.𱆎
+�．-ß‌≠; �.-ß‌≠; [C1, P1, V3, V6]; xn--u836e.xn----qfa750ve7b; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ß≠
+�．-ß‌≠; �.-ß‌≠; [C1, P1, V3, V6]; xn--u836e.xn----qfa750ve7b; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ß≠
+�.-ß‌≠; ; [C1, P1, V3, V6]; xn--u836e.xn----qfa750ve7b; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ß≠
+�.-ß‌≠; �.-ß‌≠; [C1, P1, V3, V6]; xn--u836e.xn----qfa750ve7b; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ß≠
+�.-SS‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�.-SS‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�.-ss‌≠; ; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�.-ss‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�.-Ss‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�.-Ss‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+xn--u836e.xn---ss-gl2a; �.-ss≠; [V3, V6]; xn--u836e.xn---ss-gl2a; ; ;  # .-ss≠
+xn--u836e.xn---ss-cn0at5l; �.-ss‌≠; [C1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; ;  # .-ss≠
+xn--u836e.xn----qfa750ve7b; �.-ß‌≠; [C1, V3, V6]; xn--u836e.xn----qfa750ve7b; ; ;  # .-ß≠
+�．-SS‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�．-SS‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�．-ss‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�．-ss‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�．-Ss‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+�．-Ss‌≠; �.-ss‌≠; [C1, P1, V3, V6]; xn--u836e.xn---ss-cn0at5l; ; xn--u836e.xn---ss-gl2a; [P1, V3, V6] # .-ss≠
+ᡙ‌｡≯�≠; ᡙ‌.≯�≠; [C1, P1, V6]; xn--p8e650b.xn--1ch3a7084l; ; xn--p8e.xn--1ch3a7084l; [P1, V6] # ᡙ.≯�≠
+ᡙ‌｡≯�≠; ᡙ‌.≯�≠; [C1, P1, V6]; xn--p8e650b.xn--1ch3a7084l; ; xn--p8e.xn--1ch3a7084l; [P1, V6] # ᡙ.≯�≠
+ᡙ‌。≯�≠; ᡙ‌.≯�≠; [C1, P1, V6]; xn--p8e650b.xn--1ch3a7084l; ; xn--p8e.xn--1ch3a7084l; [P1, V6] # ᡙ.≯�≠
+ᡙ‌。≯�≠; ᡙ‌.≯�≠; [C1, P1, V6]; xn--p8e650b.xn--1ch3a7084l; ; xn--p8e.xn--1ch3a7084l; [P1, V6] # ᡙ.≯�≠
+xn--p8e.xn--1ch3a7084l; ᡙ.≯�≠; [V6]; xn--p8e.xn--1ch3a7084l; ; ;  # ᡙ.≯�≠
+xn--p8e650b.xn--1ch3a7084l; ᡙ‌.≯�≠; [C1, V6]; xn--p8e650b.xn--1ch3a7084l; ; ;  # ᡙ.≯�≠
+�𞲄�񆼩。͎🄀; �𞲄�񆼩.͎🄀; [B1, P1, V5, V6]; xn--fo0dw409aq58qrn69d.xn--sua6883w; ; ;  # �𞲄.͎🄀
+�𞲄�񆼩。͎0.; �𞲄�񆼩.͎0.; [B1, P1, V5, V6]; xn--fo0dw409aq58qrn69d.xn--0-bgb.; ; ;  # �𞲄.͎0.
+xn--fo0dw409aq58qrn69d.xn--0-bgb.; �𞲄�񆼩.͎0.; [B1, V5, V6]; xn--fo0dw409aq58qrn69d.xn--0-bgb.; ; ;  # �𞲄.͎0.
+xn--fo0dw409aq58qrn69d.xn--sua6883w; �𞲄�񆼩.͎🄀; [B1, V5, V6]; xn--fo0dw409aq58qrn69d.xn--sua6883w; ; ;  # �𞲄.͎🄀
+Ⴄ．�ܡ󻣋ς; Ⴄ.�ܡ󻣋ς; [B1, C2, P1, V6]; xn--cnd.xn--3xa93o3t5ajq467a; ; xn--cnd.xn--4xa73ob5892c; [B2, B3, P1, V6] # Ⴄ.ܡς
+Ⴄ.�ܡ󻣋ς; ; [B1, C2, P1, V6]; xn--cnd.xn--3xa93o3t5ajq467a; ; xn--cnd.xn--4xa73ob5892c; [B2, B3, P1, V6] # Ⴄ.ܡς
+ⴄ.�ܡ󻣋ς; ; [B1, C2, P1, V6]; xn--vkj.xn--3xa93o3t5ajq467a; ; xn--vkj.xn--4xa73ob5892c; [B2, B3, P1, V6] # ⴄ.ܡς
+Ⴄ.�ܡ󻣋Σ; Ⴄ.�ܡ󻣋σ; [B1, C2, P1, V6]; xn--cnd.xn--4xa73o3t5ajq467a; ; xn--cnd.xn--4xa73ob5892c; [B2, B3, P1, V6] # Ⴄ.ܡσ
+ⴄ.�ܡ󻣋σ; ; [B1, C2, P1, V6]; xn--vkj.xn--4xa73o3t5ajq467a; ; xn--vkj.xn--4xa73ob5892c; [B2, B3, P1, V6] # ⴄ.ܡσ
+xn--vkj.xn--4xa73ob5892c; ⴄ.ܡ󻣋σ; [B2, B3, V6]; xn--vkj.xn--4xa73ob5892c; ; ;  # ⴄ.ܡσ
+xn--vkj.xn--4xa73o3t5ajq467a; ⴄ.�ܡ󻣋σ; [B1, C2, V6]; xn--vkj.xn--4xa73o3t5ajq467a; ; ;  # ⴄ.ܡσ
+xn--cnd.xn--4xa73ob5892c; Ⴄ.ܡ󻣋σ; [B2, B3, V6]; xn--cnd.xn--4xa73ob5892c; ; ;  # Ⴄ.ܡσ
+xn--cnd.xn--4xa73o3t5ajq467a; Ⴄ.�ܡ󻣋σ; [B1, C2, V6]; xn--cnd.xn--4xa73o3t5ajq467a; ; ;  # Ⴄ.ܡσ
+xn--vkj.xn--3xa93o3t5ajq467a; ⴄ.�ܡ󻣋ς; [B1, C2, V6]; xn--vkj.xn--3xa93o3t5ajq467a; ; ;  # ⴄ.ܡς
+xn--cnd.xn--3xa93o3t5ajq467a; Ⴄ.�ܡ󻣋ς; [B1, C2, V6]; xn--cnd.xn--3xa93o3t5ajq467a; ; ;  # Ⴄ.ܡς
+ⴄ．�ܡ󻣋ς; ⴄ.�ܡ󻣋ς; [B1, C2, P1, V6]; xn--vkj.xn--3xa93o3t5ajq467a; ; xn--vkj.xn--4xa73ob5892c; [B2, B3, P1, V6] # ⴄ.ܡς
+Ⴄ．�ܡ󻣋Σ; Ⴄ.�ܡ󻣋σ; [B1, C2, P1, V6]; xn--cnd.xn--4xa73o3t5ajq467a; ; xn--cnd.xn--4xa73ob5892c; [B2, B3, P1, V6] # Ⴄ.ܡσ
+ⴄ．�ܡ󻣋σ; ⴄ.�ܡ󻣋σ; [B1, C2, P1, V6]; xn--vkj.xn--4xa73o3t5ajq467a; ; xn--vkj.xn--4xa73ob5892c; [B2, B3, P1, V6] # ⴄ.ܡσ
+򮵛ؓ.Ⴕ; ; [P1, V6]; xn--1fb94204l.xn--tnd; ; ;  # ؓ.Ⴕ
+򮵛ؓ.ⴕ; ; [P1, V6]; xn--1fb94204l.xn--dlj; ; ;  # ؓ.ⴕ
+xn--1fb94204l.xn--dlj; 򮵛ؓ.ⴕ; [V6]; xn--1fb94204l.xn--dlj; ; ;  # ؓ.ⴕ
+xn--1fb94204l.xn--tnd; 򮵛ؓ.Ⴕ; [V6]; xn--1fb94204l.xn--tnd; ; ;  # ؓ.Ⴕ
+≯ᷳ𞤥。‌꣄󠪉�; ≯ᷳ𞤥.‌꣄󠪉�; [B1, C1, C2, P1, V6]; xn--ofg13qyr21c.xn--0ugc0116hix29k; ; xn--ofg13qyr21c.xn--0f9au6706d; [B1, P1, V5, V6] # ≯ᷳ𞤥.꣄
+≯ᷳ𞤥。‌꣄󠪉�; ≯ᷳ𞤥.‌꣄󠪉�; [B1, C1, C2, P1, V6]; xn--ofg13qyr21c.xn--0ugc0116hix29k; ; xn--ofg13qyr21c.xn--0f9au6706d; [B1, P1, V5, V6] # ≯ᷳ𞤥.꣄
+≯ᷳ𞤃。‌꣄󠪉�; ≯ᷳ𞤥.‌꣄󠪉�; [B1, C1, C2, P1, V6]; xn--ofg13qyr21c.xn--0ugc0116hix29k; ; xn--ofg13qyr21c.xn--0f9au6706d; [B1, P1, V5, V6] # ≯ᷳ𞤥.꣄
+≯ᷳ𞤃。‌꣄󠪉�; ≯ᷳ𞤥.‌꣄󠪉�; [B1, C1, C2, P1, V6]; xn--ofg13qyr21c.xn--0ugc0116hix29k; ; xn--ofg13qyr21c.xn--0f9au6706d; [B1, P1, V5, V6] # ≯ᷳ𞤥.꣄
+xn--ofg13qyr21c.xn--0f9au6706d; ≯ᷳ𞤥.꣄󠪉; [B1, V5, V6]; xn--ofg13qyr21c.xn--0f9au6706d; ; ;  # ≯ᷳ𞤥.꣄
+xn--ofg13qyr21c.xn--0ugc0116hix29k; ≯ᷳ𞤥.‌꣄󠪉�; [B1, C1, C2, V6]; xn--ofg13qyr21c.xn--0ugc0116hix29k; ; ;  # ≯ᷳ𞤥.꣄
+‌󠄷｡�; ‌.�; [C1, P1, V6]; xn--0ug.xn--w720c; ; .xn--w720c; [P1, V6, A4_2] # .
+‌󠄷。�; ‌.�; [C1, P1, V6]; xn--0ug.xn--w720c; ; .xn--w720c; [P1, V6, A4_2] # .
+.xn--w720c; .�; [V6, X4_2]; .xn--w720c; [V6, A4_2]; ;  # .
+xn--0ug.xn--w720c; ‌.�; [C1, V6]; xn--0ug.xn--w720c; ; ;  # .
+⒈ූ焅.󗡙�ꡟ; ; [C2, P1, V6]; xn--t1c337io97c.xn--1ugz184c9lw7i; ; xn--t1c337io97c.xn--4c9a21133d; [P1, V6] # ⒈ූ焅.ꡟ
+1.ූ焅.󗡙�ꡟ; ; [C2, P1, V5, V6]; 1.xn--t1c6981c.xn--1ugz184c9lw7i; ; 1.xn--t1c6981c.xn--4c9a21133d; [P1, V5, V6] # 1.ූ焅.ꡟ
+1.xn--t1c6981c.xn--4c9a21133d; 1.ූ焅.󗡙ꡟ; [V5, V6]; 1.xn--t1c6981c.xn--4c9a21133d; ; ;  # 1.ූ焅.ꡟ
+1.xn--t1c6981c.xn--1ugz184c9lw7i; 1.ූ焅.󗡙�ꡟ; [C2, V5, V6]; 1.xn--t1c6981c.xn--1ugz184c9lw7i; ; ;  # 1.ූ焅.ꡟ
+xn--t1c337io97c.xn--4c9a21133d; ⒈ූ焅.󗡙ꡟ; [V6]; xn--t1c337io97c.xn--4c9a21133d; ; ;  # ⒈ූ焅.ꡟ
+xn--t1c337io97c.xn--1ugz184c9lw7i; ⒈ූ焅.󗡙�ꡟ; [C2, V6]; xn--t1c337io97c.xn--1ugz184c9lw7i; ; ;  # ⒈ූ焅.ꡟ
+�ς≮.ς�𞤕0; �ς≮.ς�𞤷0; [B1, B5, P1, V5, V6]; xn--3xa744kvid.xn--0-xmb85727aggma; ; xn--4xa544kvid.xn--0-zmb55727aggma;  # �ς≮.ς�𞤷0
+�ς≮.ς�𞤕0; �ς≮.ς�𞤷0; [B1, B5, P1, V5, V6]; xn--3xa744kvid.xn--0-xmb85727aggma; ; xn--4xa544kvid.xn--0-zmb55727aggma;  # �ς≮.ς�𞤷0
+�ς≮.ς�𞤷0; �ς≮.ς�𞤷0; [B1, B5, P1, V5, V6]; xn--3xa744kvid.xn--0-xmb85727aggma; ; xn--4xa544kvid.xn--0-zmb55727aggma;  # �ς≮.ς�𞤷0
+�ς≮.ς�𞤷0; ; [B1, B5, P1, V5, V6]; xn--3xa744kvid.xn--0-xmb85727aggma; ; xn--4xa544kvid.xn--0-zmb55727aggma;  # �ς≮.ς�𞤷0
+�Σ≮.Σ�𞤕0; �σ≮.σ�𞤷0; [B1, B5, P1, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+�Σ≮.Σ�𞤕0; �σ≮.σ�𞤷0; [B1, B5, P1, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+�σ≮.σ�𞤷0; �σ≮.σ�𞤷0; [B1, B5, P1, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+�σ≮.σ�𞤷0; ; [B1, B5, P1, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+�Σ≮.Σ�𞤷0; �σ≮.σ�𞤷0; [B1, B5, P1, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+�Σ≮.Σ�𞤷0; �σ≮.σ�𞤷0; [B1, B5, P1, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+xn--4xa544kvid.xn--0-zmb55727aggma; �σ≮.σ�𞤷0; [B1, B5, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+xn--3xa744kvid.xn--0-xmb85727aggma; �ς≮.ς�𞤷0; [B1, B5, V5, V6]; xn--3xa744kvid.xn--0-xmb85727aggma; ; ;  # �ς≮.ς�𞤷0
+�σ≮.σ�𞤕0; �σ≮.σ�𞤷0; [B1, B5, P1, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+�σ≮.σ�𞤕0; �σ≮.σ�𞤷0; [B1, B5, P1, V5, V6]; xn--4xa544kvid.xn--0-zmb55727aggma; ; ;  # �σ≮.σ�𞤷0
+򢦾ßֹ�.֭ࢡ; ; [B1, B5, B6, P1, V5, V6]; xn--zca89v339zj118e.xn--4cb62m; ; xn--ss-xjd6058xlz50g.xn--4cb62m;  # ßֹ�.֭ࢡ
+򢦾SSֹ�.֭ࢡ; 򢦾ssֹ�.֭ࢡ; [B1, B5, B6, P1, V5, V6]; xn--ss-xjd6058xlz50g.xn--4cb62m; ; ;  # ssֹ�.֭ࢡ
+򢦾ssֹ�.֭ࢡ; ; [B1, B5, B6, P1, V5, V6]; xn--ss-xjd6058xlz50g.xn--4cb62m; ; ;  # ssֹ�.֭ࢡ
+򢦾Ssֹ�.֭ࢡ; 򢦾ssֹ�.֭ࢡ; [B1, B5, B6, P1, V5, V6]; xn--ss-xjd6058xlz50g.xn--4cb62m; ; ;  # ssֹ�.֭ࢡ
+xn--ss-xjd6058xlz50g.xn--4cb62m; 򢦾ssֹ�.֭ࢡ; [B1, B5, B6, V5, V6]; xn--ss-xjd6058xlz50g.xn--4cb62m; ; ;  # ssֹ�.֭ࢡ
+xn--zca89v339zj118e.xn--4cb62m; 򢦾ßֹ�.֭ࢡ; [B1, B5, B6, V5, V6]; xn--zca89v339zj118e.xn--4cb62m; ; ;  # ßֹ�.֭ࢡ
+-𞣄｡⒈; -𞣄.⒈; [B1, P1, V3, V6]; xn----xc8r.xn--tsh; ; ;  # -𞣄.⒈
+-𞣄。1.; -𞣄.1.; [B1, V3]; xn----xc8r.1.; ; ;  # -𞣄.1.
+xn----xc8r.1.; -𞣄.1.; [B1, V3]; xn----xc8r.1.; ; ;  # -𞣄.1.
+xn----xc8r.xn--tsh; -𞣄.⒈; [B1, V3, V6]; xn----xc8r.xn--tsh; ; ;  # -𞣄.⒈
+񈠢��。ؾ𑘿; 񈠢�9.ؾ𑘿; [B5, P1, V6]; xn--9-el5iv442t.xn--9gb0830l; ; ;  # �9.ؾ𑘿
+񈠢�9。ؾ𑘿; 񈠢�9.ؾ𑘿; [B5, P1, V6]; xn--9-el5iv442t.xn--9gb0830l; ; ;  # �9.ؾ𑘿
+xn--9-el5iv442t.xn--9gb0830l; 񈠢�9.ؾ𑘿; [B5, V6]; xn--9-el5iv442t.xn--9gb0830l; ; ;  # �9.ؾ𑘿
+٨ﲌ٨�.�; ٨نم٨�.�; [B1, C2]; xn--hhbb5hc956w.xn--1ug; ; xn--hhbb5hc956w.; [B1] # ٨نم٨�.
+٨نم٨�.�; ; [B1, C2]; xn--hhbb5hc956w.xn--1ug; ; xn--hhbb5hc956w.; [B1] # ٨نم٨�.
+xn--hhbb5hc956w.; ٨نم٨�.; [B1]; xn--hhbb5hc956w.; ; ;  # ٨نم٨�.
+xn--hhbb5hc956w.xn--1ug; ٨نم٨�.�; [B1, C2]; xn--hhbb5hc956w.xn--1ug; ; ;  # ٨نم٨�.
+�．Ⴇ󀳑�񫃱; 0.Ⴇ󀳑تجم񫃱; [B1, B5, P1, V6]; 0.xn--pgbe9e344c2725svff8b; ; ;  # 0.Ⴇتجم
+0.Ⴇ󀳑تجم񫃱; ; [B1, B5, P1, V6]; 0.xn--pgbe9e344c2725svff8b; ; ;  # 0.Ⴇتجم
+0.ⴇ󀳑تجم񫃱; ; [B1, B5, P1, V6]; 0.xn--pgbe9ez79qd207lvff8b; ; ;  # 0.ⴇتجم
+0.xn--pgbe9ez79qd207lvff8b; 0.ⴇ󀳑تجم񫃱; [B1, B5, V6]; 0.xn--pgbe9ez79qd207lvff8b; ; ;  # 0.ⴇتجم
+0.xn--pgbe9e344c2725svff8b; 0.Ⴇ󀳑تجم񫃱; [B1, B5, V6]; 0.xn--pgbe9e344c2725svff8b; ; ;  # 0.Ⴇتجم
+�．ⴇ󀳑�񫃱; 0.ⴇ󀳑تجم񫃱; [B1, B5, P1, V6]; 0.xn--pgbe9ez79qd207lvff8b; ; ;  # 0.ⴇتجم
+𑇀�.�ᠰ; ; [V5]; xn--9zh3057f.xn--j7e103b; ; ;  # 𑇀�.�ᠰ
+xn--9zh3057f.xn--j7e103b; 𑇀�.�ᠰ; [V5]; xn--9zh3057f.xn--j7e103b; ; ;  # 𑇀�.�ᠰ
+�-ٺ.�; ; [B1, C2, P1, V6]; xn----qrc357q.xn--ts49b; ; xn----qrc.xn--ts49b; [B1, P1, V3, V6] # -ٺ.
+xn----qrc.xn--ts49b; -ٺ.�; [B1, V3, V6]; xn----qrc.xn--ts49b; ; ;  # -ٺ.
+xn----qrc357q.xn--ts49b; �-ٺ.�; [B1, C2, V6]; xn----qrc357q.xn--ts49b; ; ;  # -ٺ.
+ᠢ���｡‌≯✳; ᠢ���.‌≯✳; [B1, B5, C1, P1, V6]; xn--46e6675axzzhota.xn--0ug06gu8f; ; xn--46e6675axzzhota.xn--hdh99p; [B1, B5, P1, V6] # ᠢ���.≯✳
+ᠢ���｡‌≯✳; ᠢ���.‌≯✳; [B1, B5, C1, P1, V6]; xn--46e6675axzzhota.xn--0ug06gu8f; ; xn--46e6675axzzhota.xn--hdh99p; [B1, B5, P1, V6] # ᠢ���.≯✳
+ᠢ���。‌≯✳; ᠢ���.‌≯✳; [B1, B5, C1, P1, V6]; xn--46e6675axzzhota.xn--0ug06gu8f; ; xn--46e6675axzzhota.xn--hdh99p; [B1, B5, P1, V6] # ᠢ���.≯✳
+ᠢ���。‌≯✳; ᠢ���.‌≯✳; [B1, B5, C1, P1, V6]; xn--46e6675axzzhota.xn--0ug06gu8f; ; xn--46e6675axzzhota.xn--hdh99p; [B1, B5, P1, V6] # ᠢ���.≯✳
+xn--46e6675axzzhota.xn--hdh99p; ᠢ���.≯✳; [B1, B5, V6]; xn--46e6675axzzhota.xn--hdh99p; ; ;  # ᠢ���.≯✳
+xn--46e6675axzzhota.xn--0ug06gu8f; ᠢ���.‌≯✳; [B1, B5, C1, V6]; xn--46e6675axzzhota.xn--0ug06gu8f; ; ;  # ᠢ���.≯✳
+�｡󸲜ႺႴ𞨇; �.󸲜ႺႴ𞨇; [B1, B5, B6, C2, P1, V6]; xn--1ug.xn--sndl01647an3h1h; ; .xn--sndl01647an3h1h; [B5, B6, P1, V6, A4_2] # .ႺႴ
+�。󸲜ႺႴ𞨇; �.󸲜ႺႴ𞨇; [B1, B5, B6, C2, P1, V6]; xn--1ug.xn--sndl01647an3h1h; ; .xn--sndl01647an3h1h; [B5, B6, P1, V6, A4_2] # .ႺႴ
+�。󸲜ⴚⴔ𞨇; �.󸲜ⴚⴔ𞨇; [B1, B5, B6, C2, P1, V6]; xn--1ug.xn--cljl81825an3r4h; ; .xn--cljl81825an3r4h; [B5, B6, P1, V6, A4_2] # .ⴚⴔ
+�。󸲜Ⴚⴔ𞨇; �.󸲜Ⴚⴔ𞨇; [B1, B5, B6, C2, P1, V6]; xn--1ug.xn--ynd036lq981an3r4h; ; .xn--ynd036lq981an3r4h; [B5, B6, P1, V6, A4_2] # .Ⴚⴔ
+.xn--ynd036lq981an3r4h; .󸲜Ⴚⴔ𞨇; [B5, B6, V6, X4_2]; .xn--ynd036lq981an3r4h; [B5, B6, V6, A4_2]; ;  # .Ⴚⴔ
+xn--1ug.xn--ynd036lq981an3r4h; �.󸲜Ⴚⴔ𞨇; [B1, B5, B6, C2, V6]; xn--1ug.xn--ynd036lq981an3r4h; ; ;  # .Ⴚⴔ
+.xn--cljl81825an3r4h; .󸲜ⴚⴔ𞨇; [B5, B6, V6, X4_2]; .xn--cljl81825an3r4h; [B5, B6, V6, A4_2]; ;  # .ⴚⴔ
+xn--1ug.xn--cljl81825an3r4h; �.󸲜ⴚⴔ𞨇; [B1, B5, B6, C2, V6]; xn--1ug.xn--cljl81825an3r4h; ; ;  # .ⴚⴔ
+.xn--sndl01647an3h1h; .󸲜ႺႴ𞨇; [B5, B6, V6, X4_2]; .xn--sndl01647an3h1h; [B5, B6, V6, A4_2]; ;  # .ႺႴ
+xn--1ug.xn--sndl01647an3h1h; �.󸲜ႺႴ𞨇; [B1, B5, B6, C2, V6]; xn--1ug.xn--sndl01647an3h1h; ; ;  # .ႺႴ
+�｡󸲜ⴚⴔ𞨇; �.󸲜ⴚⴔ𞨇; [B1, B5, B6, C2, P1, V6]; xn--1ug.xn--cljl81825an3r4h; ; .xn--cljl81825an3r4h; [B5, B6, P1, V6, A4_2] # .ⴚⴔ
+�｡󸲜Ⴚⴔ𞨇; �.󸲜Ⴚⴔ𞨇; [B1, B5, B6, C2, P1, V6]; xn--1ug.xn--ynd036lq981an3r4h; ; .xn--ynd036lq981an3r4h; [B5, B6, P1, V6, A4_2] # .Ⴚⴔ
+-3.�ヌᢕ; ; [C2, V3]; -3.xn--fbf739aq5o; ; -3.xn--fbf115j; [V3] # -3.ヌᢕ
+-3.xn--fbf115j; -3.ヌᢕ; [V3]; -3.xn--fbf115j; ; ;  # -3.ヌᢕ
+-3.xn--fbf739aq5o; -3.�ヌᢕ; [C2, V3]; -3.xn--fbf739aq5o; ; ;  # -3.ヌᢕ
+🂃٦ß�。󠠂�𞩒-; 🂃٦ß�.󠠂�𞩒-; [B1, C2, P1, V3, V6]; xn--zca34z68yzu83b.xn----nz8rh7531csznt; ; xn--ss-pyd98921c.xn----nz8rh7531csznt; [B1, P1, V3, V6] # 🂃٦ß.-
+🂃٦SS�。󠠂�𞩒-; 🂃٦ss�.󠠂�𞩒-; [B1, C2, P1, V3, V6]; xn--ss-pyd483x5k99b.xn----nz8rh7531csznt; ; xn--ss-pyd98921c.xn----nz8rh7531csznt; [B1, P1, V3, V6] # 🂃٦ss.-
+🂃٦ss�。󠠂�𞩒-; 🂃٦ss�.󠠂�𞩒-; [B1, C2, P1, V3, V6]; xn--ss-pyd483x5k99b.xn----nz8rh7531csznt; ; xn--ss-pyd98921c.xn----nz8rh7531csznt; [B1, P1, V3, V6] # 🂃٦ss.-
+xn--ss-pyd98921c.xn----nz8rh7531csznt; 🂃٦ss.󠠂�𞩒-; [B1, V3, V6]; xn--ss-pyd98921c.xn----nz8rh7531csznt; ; ;  # 🂃٦ss.-
+xn--ss-pyd483x5k99b.xn----nz8rh7531csznt; 🂃٦ss�.󠠂�𞩒-; [B1, C2, V3, V6]; xn--ss-pyd483x5k99b.xn----nz8rh7531csznt; ; ;  # 🂃٦ss.-
+xn--zca34z68yzu83b.xn----nz8rh7531csznt; 🂃٦ß�.󠠂�𞩒-; [B1, C2, V3, V6]; xn--zca34z68yzu83b.xn----nz8rh7531csznt; ; ;  # 🂃٦ß.-
+🂃٦Ss�。󠠂�𞩒-; 🂃٦ss�.󠠂�𞩒-; [B1, C2, P1, V3, V6]; xn--ss-pyd483x5k99b.xn----nz8rh7531csznt; ; xn--ss-pyd98921c.xn----nz8rh7531csznt; [B1, P1, V3, V6] # 🂃٦ss.-
+ꇟ-�ڟ。򰀺‌; ꇟ-�ڟ.򰀺‌; [B5, B6, C1, P1, V6]; xn----utc4430jd3zd.xn--0ugx6670i; ; xn----utc4430jd3zd.xn--bp20d; [B5, B6, P1, V6] # ꇟ-�ڟ.
+xn----utc4430jd3zd.xn--bp20d; ꇟ-�ڟ.򰀺; [B5, B6, V6]; xn----utc4430jd3zd.xn--bp20d; ; ;  # ꇟ-�ڟ.
+xn----utc4430jd3zd.xn--0ugx6670i; ꇟ-�ڟ.򰀺‌; [B5, B6, C1, V6]; xn----utc4430jd3zd.xn--0ugx6670i; ; ;  # ꇟ-�ڟ.
+٥.҄��𴤃; ; [B1, P1, V5, V6]; xn--eib.xn--n3a0405kus8eft5l; ; ;  # ٥.҄��
+xn--eib.xn--n3a0405kus8eft5l; ٥.҄��𴤃; [B1, V5, V6]; xn--eib.xn--n3a0405kus8eft5l; ; ;  # ٥.҄��
+-.񱼓ى�; ; [B1, B5, B6, P1, V3, V6]; -.xn--lhb4124khbq4b; ; ;  # -.ى�
+-.xn--lhb4124khbq4b; -.񱼓ى�; [B1, B5, B6, V3, V6]; -.xn--lhb4124khbq4b; ; ;  # -.ى�
+󾬨ς.𞶙녫ß; ; [B2, B3, P1, V6]; xn--3xa96659r.xn--zca5051g4h4i; ; xn--4xa76659r.xn--ss-d64i8755h;  # ς.녫ß
+󾬨ς.𞶙녫ß; 󾬨ς.𞶙녫ß; [B2, B3, P1, V6]; xn--3xa96659r.xn--zca5051g4h4i; ; xn--4xa76659r.xn--ss-d64i8755h;  # ς.녫ß
+󾬨Σ.𞶙녫SS; 󾬨σ.𞶙녫ss; [B2, B3, P1, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+󾬨Σ.𞶙녫SS; 󾬨σ.𞶙녫ss; [B2, B3, P1, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+󾬨σ.𞶙녫ss; ; [B2, B3, P1, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+󾬨σ.𞶙녫ss; 󾬨σ.𞶙녫ss; [B2, B3, P1, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+󾬨Σ.𞶙녫ss; 󾬨σ.𞶙녫ss; [B2, B3, P1, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+󾬨Σ.𞶙녫ss; 󾬨σ.𞶙녫ss; [B2, B3, P1, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+󾬨Σ.𞶙녫Ss; 󾬨σ.𞶙녫ss; [B2, B3, P1, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+󾬨Σ.𞶙녫Ss; 󾬨σ.𞶙녫ss; [B2, B3, P1, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+xn--4xa76659r.xn--ss-d64i8755h; 󾬨σ.𞶙녫ss; [B2, B3, V6]; xn--4xa76659r.xn--ss-d64i8755h; ; ;  # σ.녫ss
+󾬨Σ.𞶙녫ß; 󾬨σ.𞶙녫ß; [B2, B3, P1, V6]; xn--4xa76659r.xn--zca5051g4h4i; ; xn--4xa76659r.xn--ss-d64i8755h;  # σ.녫ß
+󾬨Σ.𞶙녫ß; 󾬨σ.𞶙녫ß; [B2, B3, P1, V6]; xn--4xa76659r.xn--zca5051g4h4i; ; xn--4xa76659r.xn--ss-d64i8755h;  # σ.녫ß
+󾬨σ.𞶙녫ß; ; [B2, B3, P1, V6]; xn--4xa76659r.xn--zca5051g4h4i; ; xn--4xa76659r.xn--ss-d64i8755h;  # σ.녫ß
+󾬨σ.𞶙녫ß; 󾬨σ.𞶙녫ß; [B2, B3, P1, V6]; xn--4xa76659r.xn--zca5051g4h4i; ; xn--4xa76659r.xn--ss-d64i8755h;  # σ.녫ß
+xn--4xa76659r.xn--zca5051g4h4i; 󾬨σ.𞶙녫ß; [B2, B3, V6]; xn--4xa76659r.xn--zca5051g4h4i; ; ;  # σ.녫ß
+xn--3xa96659r.xn--zca5051g4h4i; 󾬨ς.𞶙녫ß; [B2, B3, V6]; xn--3xa96659r.xn--zca5051g4h4i; ; ;  # ς.녫ß
+Ⅎ្�｡≠�‌; Ⅎ្�.≠�‌; [C1, C2, P1, V6]; xn--u4e823bcza.xn--0ugb89o; ; xn--u4e319b.xn--1ch; [P1, V6] # Ⅎ្.≠
+Ⅎ្�｡≠�‌; Ⅎ្�.≠�‌; [C1, C2, P1, V6]; xn--u4e823bcza.xn--0ugb89o; ; xn--u4e319b.xn--1ch; [P1, V6] # Ⅎ្.≠
+Ⅎ្�。≠�‌; Ⅎ្�.≠�‌; [C1, C2, P1, V6]; xn--u4e823bcza.xn--0ugb89o; ; xn--u4e319b.xn--1ch; [P1, V6] # Ⅎ្.≠
+Ⅎ្�。≠�‌; Ⅎ្�.≠�‌; [C1, C2, P1, V6]; xn--u4e823bcza.xn--0ugb89o; ; xn--u4e319b.xn--1ch; [P1, V6] # Ⅎ្.≠
+ⅎ្�。≠�‌; ⅎ្�.≠�‌; [C1, C2, P1, V6]; xn--u4e823bq1a.xn--0ugb89o; ; xn--u4e969b.xn--1ch; [P1, V6] # ⅎ្.≠
+ⅎ្�。≠�‌; ⅎ្�.≠�‌; [C1, C2, P1, V6]; xn--u4e823bq1a.xn--0ugb89o; ; xn--u4e969b.xn--1ch; [P1, V6] # ⅎ្.≠
+xn--u4e969b.xn--1ch; ⅎ្.≠; [V6]; xn--u4e969b.xn--1ch; ; ;  # ⅎ្.≠
+xn--u4e823bq1a.xn--0ugb89o; ⅎ្�.≠�‌; [C1, C2, V6]; xn--u4e823bq1a.xn--0ugb89o; ; ;  # ⅎ្.≠
+xn--u4e319b.xn--1ch; Ⅎ្.≠; [V6]; xn--u4e319b.xn--1ch; ; ;  # Ⅎ្.≠
+xn--u4e823bcza.xn--0ugb89o; Ⅎ្�.≠�‌; [C1, C2, V6]; xn--u4e823bcza.xn--0ugb89o; ; ;  # Ⅎ្.≠
+ⅎ្�｡≠�‌; ⅎ្�.≠�‌; [C1, C2, P1, V6]; xn--u4e823bq1a.xn--0ugb89o; ; xn--u4e969b.xn--1ch; [P1, V6] # ⅎ្.≠
+ⅎ្�｡≠�‌; ⅎ្�.≠�‌; [C1, C2, P1, V6]; xn--u4e823bq1a.xn--0ugb89o; ; xn--u4e969b.xn--1ch; [P1, V6] # ⅎ្.≠
+�꫶꥓󧦉．‌᜔�; �꫶꥓󧦉.‌᜔�; [B1, C1, P1, V6]; xn--3j9a14ak27osbz2o.xn--ljb175f1wg; ; xn--3j9a14ak27osbz2o.xn--ljb175f; [B1, P1, V5, V6] # �꫶꥓.᜔�
+�꫶꥓󧦉.‌᜔�; ; [B1, C1, P1, V6]; xn--3j9a14ak27osbz2o.xn--ljb175f1wg; ; xn--3j9a14ak27osbz2o.xn--ljb175f; [B1, P1, V5, V6] # �꫶꥓.᜔�
+xn--3j9a14ak27osbz2o.xn--ljb175f; �꫶꥓󧦉.᜔�; [B1, V5, V6]; xn--3j9a14ak27osbz2o.xn--ljb175f; ; ;  # �꫶꥓.᜔�
+xn--3j9a14ak27osbz2o.xn--ljb175f1wg; �꫶꥓󧦉.‌᜔�; [B1, C1, V6]; xn--3j9a14ak27osbz2o.xn--ljb175f1wg; ; ;  # �꫶꥓.᜔�
+񺔯ྨ．≯; 񺔯ྨ.≯; [P1, V6]; xn--4fd57150h.xn--hdh; ; ;  # ྨ.≯
+񺔯ྨ．≯; 񺔯ྨ.≯; [P1, V6]; xn--4fd57150h.xn--hdh; ; ;  # ྨ.≯
+񺔯ྨ.≯; ; [P1, V6]; xn--4fd57150h.xn--hdh; ; ;  # ྨ.≯
+񺔯ྨ.≯; 񺔯ྨ.≯; [P1, V6]; xn--4fd57150h.xn--hdh; ; ;  # ྨ.≯
+xn--4fd57150h.xn--hdh; 񺔯ྨ.≯; [V6]; xn--4fd57150h.xn--hdh; ; ;  # ྨ.≯
+�𞡄Ⴓ．�; �𞡄Ⴓ.�; [B1, B3, B6, C2, P1, V5, V6]; xn--rnd379ex885a.xn--m27c; ; xn--rnd5552v.xn--m27c; [B1, B2, B3, B6, P1, V5, V6] # 𞡄Ⴓ.�
+�𞡄Ⴓ.�; ; [B1, B3, B6, C2, P1, V5, V6]; xn--rnd379ex885a.xn--m27c; ; xn--rnd5552v.xn--m27c; [B1, B2, B3, B6, P1, V5, V6] # 𞡄Ⴓ.�
+�𞡄ⴓ.�; ; [B1, B3, B6, C2, V5]; xn--1ugz52c4i16a.xn--m27c; ; xn--blj7492l.xn--m27c; [B1, B2, B3, B6, V5] # 𞡄ⴓ.�
+xn--blj7492l.xn--m27c; 𞡄ⴓ.�; [B1, B2, B3, B6, V5]; xn--blj7492l.xn--m27c; ; ;  # 𞡄ⴓ.�
+xn--1ugz52c4i16a.xn--m27c; �𞡄ⴓ.�; [B1, B3, B6, C2, V5]; xn--1ugz52c4i16a.xn--m27c; ; ;  # 𞡄ⴓ.�
+xn--rnd5552v.xn--m27c; 𞡄Ⴓ.�; [B1, B2, B3, B6, V5, V6]; xn--rnd5552v.xn--m27c; ; ;  # 𞡄Ⴓ.�
+xn--rnd379ex885a.xn--m27c; �𞡄Ⴓ.�; [B1, B3, B6, C2, V5, V6]; xn--rnd379ex885a.xn--m27c; ; ;  # 𞡄Ⴓ.�
+�𞡄ⴓ．�; �𞡄ⴓ.�; [B1, B3, B6, C2, V5]; xn--1ugz52c4i16a.xn--m27c; ; xn--blj7492l.xn--m27c; [B1, B2, B3, B6, V5] # 𞡄ⴓ.�
+�ß꣪．ᡤ; �ß꣪.ᡤ; [B2, B3]; xn--zca2517f2hvc.xn--08e; ; xn--ss-tu9hw933a.xn--08e;  # �ß꣪.ᡤ
+�ß꣪.ᡤ; ; [B2, B3]; xn--zca2517f2hvc.xn--08e; ; xn--ss-tu9hw933a.xn--08e;  # �ß꣪.ᡤ
+�SS꣪.ᡤ; �ss꣪.ᡤ; [B2, B3]; xn--ss-tu9hw933a.xn--08e; ; ;  # �ss꣪.ᡤ
+�ss꣪.ᡤ; ; [B2, B3]; xn--ss-tu9hw933a.xn--08e; ; ;  # �ss꣪.ᡤ
+xn--ss-tu9hw933a.xn--08e; �ss꣪.ᡤ; [B2, B3]; xn--ss-tu9hw933a.xn--08e; ; ;  # �ss꣪.ᡤ
+xn--zca2517f2hvc.xn--08e; �ß꣪.ᡤ; [B2, B3]; xn--zca2517f2hvc.xn--08e; ; ;  # �ß꣪.ᡤ
+�SS꣪．ᡤ; �ss꣪.ᡤ; [B2, B3]; xn--ss-tu9hw933a.xn--08e; ; ;  # �ss꣪.ᡤ
+�ss꣪．ᡤ; �ss꣪.ᡤ; [B2, B3]; xn--ss-tu9hw933a.xn--08e; ; ;  # �ss꣪.ᡤ
+�Ss꣪.ᡤ; �ss꣪.ᡤ; [B2, B3]; xn--ss-tu9hw933a.xn--08e; ; ;  # �ss꣪.ᡤ
+�Ss꣪．ᡤ; �ss꣪.ᡤ; [B2, B3]; xn--ss-tu9hw933a.xn--08e; ; ;  # �ss꣪.ᡤ
+�󠆌鸮𑚶.ς; �鸮𑚶.ς; [V5]; xn--l76a726rt2h.xn--3xa; ; xn--l76a726rt2h.xn--4xa;  # �鸮𑚶.ς
+�󠆌鸮𑚶.Σ; �鸮𑚶.σ; [V5]; xn--l76a726rt2h.xn--4xa; ; ;  # �鸮𑚶.σ
+�󠆌鸮𑚶.σ; �鸮𑚶.σ; [V5]; xn--l76a726rt2h.xn--4xa; ; ;  # �鸮𑚶.σ
+xn--l76a726rt2h.xn--4xa; �鸮𑚶.σ; [V5]; xn--l76a726rt2h.xn--4xa; ; ;  # �鸮𑚶.σ
+xn--l76a726rt2h.xn--3xa; �鸮𑚶.ς; [V5]; xn--l76a726rt2h.xn--3xa; ; ;  # �鸮𑚶.ς
+⒗𞤬。-𑚶; ⒗𞤬.-𑚶; [B1, P1, V3, V6]; xn--8shw466n.xn----4j0j; ; ;  # ⒗𞤬.-𑚶
+16.𞤬。-𑚶; 16.𞤬.-𑚶; [B1, V3]; 16.xn--ke6h.xn----4j0j; ; ;  # 16.𞤬.-𑚶
+16.𞤊。-𑚶; 16.𞤬.-𑚶; [B1, V3]; 16.xn--ke6h.xn----4j0j; ; ;  # 16.𞤬.-𑚶
+16.xn--ke6h.xn----4j0j; 16.𞤬.-𑚶; [B1, V3]; 16.xn--ke6h.xn----4j0j; ; ;  # 16.𞤬.-𑚶
+⒗𞤊。-𑚶; ⒗𞤬.-𑚶; [B1, P1, V3, V6]; xn--8shw466n.xn----4j0j; ; ;  # ⒗𞤬.-𑚶
+xn--8shw466n.xn----4j0j; ⒗𞤬.-𑚶; [B1, V3, V6]; xn--8shw466n.xn----4j0j; ; ;  # ⒗𞤬.-𑚶
+ࢳ𞤿⾫｡��⒈; ࢳ𞤿隹.��⒈; [B1, B2, B3, P1, V6]; xn--8yb0383efiwk.xn--ljb064mol4n; ; ;  # ࢳ𞤿隹.��⒈
+ࢳ𞤿隹。��1.; ࢳ𞤿隹.��1.; [B1, B2, B3]; xn--8yb0383efiwk.xn--1-wsc3373r.; ; ;  # ࢳ𞤿隹.��1.
+ࢳ�隹。��1.; ࢳ𞤿隹.��1.; [B1, B2, B3]; xn--8yb0383efiwk.xn--1-wsc3373r.; ; ;  # ࢳ𞤿隹.��1.
+xn--8yb0383efiwk.xn--1-wsc3373r.; ࢳ𞤿隹.��1.; [B1, B2, B3]; xn--8yb0383efiwk.xn--1-wsc3373r.; ; ;  # ࢳ𞤿隹.��1.
+ࢳ�⾫｡��⒈; ࢳ𞤿隹.��⒈; [B1, B2, B3, P1, V6]; xn--8yb0383efiwk.xn--ljb064mol4n; ; ;  # ࢳ𞤿隹.��⒈
+xn--8yb0383efiwk.xn--ljb064mol4n; ࢳ𞤿隹.��⒈; [B1, B2, B3, V6]; xn--8yb0383efiwk.xn--ljb064mol4n; ; ;  # ࢳ𞤿隹.��⒈
+�𚎛�١.ᡢ8ི؀; �𚎛5١.ᡢ8ི؀; [B5, B6, P1, V6]; xn--5-bqc410un435a.xn--8-rkc763epjj; ; ;  # 5١.ᡢ8ི
+�𚎛5١.ᡢ8ི؀; ; [B5, B6, P1, V6]; xn--5-bqc410un435a.xn--8-rkc763epjj; ; ;  # 5١.ᡢ8ི
+xn--5-bqc410un435a.xn--8-rkc763epjj; �𚎛5١.ᡢ8ི؀; [B5, B6, V6]; xn--5-bqc410un435a.xn--8-rkc763epjj; ; ;  # 5١.ᡢ8ི
+�.🄀⒒-󨰈; ; [B1, P1, V6]; xn--7n0d.xn----xcp9757q1s13g; ; ;  # �.🄀⒒-
+�.0.11.-󨰈; ; [B1, P1, V3, V6]; xn--7n0d.0.11.xn----8j07m; ; ;  # �.0.11.-
+xn--7n0d.0.11.xn----8j07m; �.0.11.-󨰈; [B1, V3, V6]; xn--7n0d.0.11.xn----8j07m; ; ;  # �.0.11.-
+xn--7n0d.xn----xcp9757q1s13g; �.🄀⒒-󨰈; [B1, V6]; xn--7n0d.xn----xcp9757q1s13g; ; ;  # �.🄀⒒-
+ς-。‌�-; ς-.‌1-; [C1, V3]; xn----xmb.xn--1--i1t; ; xn----zmb.1-; [V3] # ς-.1-
+ς-。‌1-; ς-.‌1-; [C1, V3]; xn----xmb.xn--1--i1t; ; xn----zmb.1-; [V3] # ς-.1-
+Σ-。‌1-; σ-.‌1-; [C1, V3]; xn----zmb.xn--1--i1t; ; xn----zmb.1-; [V3] # σ-.1-
+σ-。‌1-; σ-.‌1-; [C1, V3]; xn----zmb.xn--1--i1t; ; xn----zmb.1-; [V3] # σ-.1-
+xn----zmb.1-; σ-.1-; [V3]; xn----zmb.1-; ; ;  # σ-.1-
+xn----zmb.xn--1--i1t; σ-.‌1-; [C1, V3]; xn----zmb.xn--1--i1t; ; ;  # σ-.1-
+xn----xmb.xn--1--i1t; ς-.‌1-; [C1, V3]; xn----xmb.xn--1--i1t; ; ;  # ς-.1-
+Σ-。‌�-; σ-.‌1-; [C1, V3]; xn----zmb.xn--1--i1t; ; xn----zmb.1-; [V3] # σ-.1-
+σ-。‌�-; σ-.‌1-; [C1, V3]; xn----zmb.xn--1--i1t; ; xn----zmb.1-; [V3] # σ-.1-
+᜴-ೢ．󠄩Ⴄ; ᜴-ೢ.Ⴄ; [P1, V5, V6]; xn----ggf830f.xn--cnd; ; ;  # ᜴-ೢ.Ⴄ
+᜴-ೢ.󠄩Ⴄ; ᜴-ೢ.Ⴄ; [P1, V5, V6]; xn----ggf830f.xn--cnd; ; ;  # ᜴-ೢ.Ⴄ
+᜴-ೢ.󠄩ⴄ; ᜴-ೢ.ⴄ; [V5]; xn----ggf830f.xn--vkj; ; ;  # ᜴-ೢ.ⴄ
+xn----ggf830f.xn--vkj; ᜴-ೢ.ⴄ; [V5]; xn----ggf830f.xn--vkj; ; ;  # ᜴-ೢ.ⴄ
+xn----ggf830f.xn--cnd; ᜴-ೢ.Ⴄ; [V5, V6]; xn----ggf830f.xn--cnd; ; ;  # ᜴-ೢ.Ⴄ
+᜴-ೢ．󠄩ⴄ; ᜴-ೢ.ⴄ; [V5]; xn----ggf830f.xn--vkj; ; ;  # ᜴-ೢ.ⴄ
+򭈗♋ڻ�｡॔⒈; 򭈗♋ڻ�.॔⒈; [B1, B5, B6, P1, V5, V6]; xn--ukb372n129m3rs7f.xn--u3b240l; ; ;  # ♋ڻ�.॔⒈
+򭈗♋ڻ�。॔1.; 򭈗♋ڻ�.॔1.; [B1, B5, B6, P1, V5, V6]; xn--ukb372n129m3rs7f.xn--1-fyd.; ; ;  # ♋ڻ�.॔1.
+xn--ukb372n129m3rs7f.xn--1-fyd.; 򭈗♋ڻ�.॔1.; [B1, B5, B6, V5, V6]; xn--ukb372n129m3rs7f.xn--1-fyd.; ; ;  # ♋ڻ�.॔1.
+xn--ukb372n129m3rs7f.xn--u3b240l; 򭈗♋ڻ�.॔⒈; [B1, B5, B6, V5, V6]; xn--ukb372n129m3rs7f.xn--u3b240l; ; ;  # ♋ڻ�.॔⒈
+֤．�᪳‌; ֤.�᪳‌; [B1, B3, B6, C1, V5]; xn--vcb.xn--0kb623hm1d; ; xn--vcb.xn--0kb623h; [B1, B3, B6, V5] # ֤.�᪳
+֤.�᪳‌; ; [B1, B3, B6, C1, V5]; xn--vcb.xn--0kb623hm1d; ; xn--vcb.xn--0kb623h; [B1, B3, B6, V5] # ֤.�᪳
+xn--vcb.xn--0kb623h; ֤.�᪳; [B1, B3, B6, V5]; xn--vcb.xn--0kb623h; ; ;  # ֤.�᪳
+xn--vcb.xn--0kb623hm1d; ֤.�᪳‌; [B1, B3, B6, C1, V5]; xn--vcb.xn--0kb623hm1d; ; ;  # ֤.�᪳
+�ࡆ≮�．𞦊; �ࡆ≮�.𞦊; [B5, B6, P1, V6]; xn--4vb80kq29ayo62l.xn--8g6h; ; ;  # ࡆ≮�.
+�ࡆ≮�．𞦊; �ࡆ≮�.𞦊; [B5, B6, P1, V6]; xn--4vb80kq29ayo62l.xn--8g6h; ; ;  # ࡆ≮�.
+�ࡆ≮�.𞦊; ; [B5, B6, P1, V6]; xn--4vb80kq29ayo62l.xn--8g6h; ; ;  # ࡆ≮�.
+�ࡆ≮�.𞦊; �ࡆ≮�.𞦊; [B5, B6, P1, V6]; xn--4vb80kq29ayo62l.xn--8g6h; ; ;  # ࡆ≮�.
+xn--4vb80kq29ayo62l.xn--8g6h; �ࡆ≮�.𞦊; [B5, B6, V6]; xn--4vb80kq29ayo62l.xn--8g6h; ; ;  # ࡆ≮�.
+�。𞀘⒈�擉; �.𞀘⒈�擉; [C2, P1, V5, V6]; xn--1ug.xn--tsh026uql4bew9p; ; .xn--tsh026uql4bew9p; [P1, V5, V6, A4_2] # .𞀘⒈�擉
+�。𞀘1.�擉; �.𞀘1.�擉; [C2, V5]; xn--1ug.xn--1-1p4r.xn--s7uv61m; ; .xn--1-1p4r.xn--s7uv61m; [V5, A4_2] # .𞀘1.�擉
+.xn--1-1p4r.xn--s7uv61m; .𞀘1.�擉; [V5, X4_2]; .xn--1-1p4r.xn--s7uv61m; [V5, A4_2]; ;  # .𞀘1.�擉
+xn--1ug.xn--1-1p4r.xn--s7uv61m; �.𞀘1.�擉; [C2, V5]; xn--1ug.xn--1-1p4r.xn--s7uv61m; ; ;  # .𞀘1.�擉
+.xn--tsh026uql4bew9p; .𞀘⒈�擉; [V5, V6, X4_2]; .xn--tsh026uql4bew9p; [V5, V6, A4_2]; ;  # .𞀘⒈�擉
+xn--1ug.xn--tsh026uql4bew9p; �.𞀘⒈�擉; [C2, V5, V6]; xn--1ug.xn--tsh026uql4bew9p; ; ;  # .𞀘⒈�擉
+₈ߋ．ﭤ≠; 8ߋ.ٿ≠; [B1, B3, P1, V6]; xn--8-zbd.xn--4ib883l; ; ;  # 8ߋ.ٿ≠
+₈ߋ．ﭤ≠; 8ߋ.ٿ≠; [B1, B3, P1, V6]; xn--8-zbd.xn--4ib883l; ; ;  # 8ߋ.ٿ≠
+8ߋ.ٿ≠; ; [B1, B3, P1, V6]; xn--8-zbd.xn--4ib883l; ; ;  # 8ߋ.ٿ≠
+8ߋ.ٿ≠; 8ߋ.ٿ≠; [B1, B3, P1, V6]; xn--8-zbd.xn--4ib883l; ; ;  # 8ߋ.ٿ≠
+xn--8-zbd.xn--4ib883l; 8ߋ.ٿ≠; [B1, B3, V6]; xn--8-zbd.xn--4ib883l; ; ;  # 8ߋ.ٿ≠
+ᢡߞ�.⒒ق�; ; [B1, B5, P1, V6]; xn--5sb596fi873t.xn--ehb336mvy7n; ; ;  # ᢡߞ.⒒ق�
+ᢡߞ�.11.ق�; ; [B1, B5, P1, V6]; xn--5sb596fi873t.11.xn--ehb4198k; ; ;  # ᢡߞ.11.ق�
+xn--5sb596fi873t.11.xn--ehb4198k; ᢡߞ�.11.ق�; [B1, B5, V6]; xn--5sb596fi873t.11.xn--ehb4198k; ; ;  # ᢡߞ.11.ق�
+xn--5sb596fi873t.xn--ehb336mvy7n; ᢡߞ�.⒒ق�; [B1, B5, V6]; xn--5sb596fi873t.xn--ehb336mvy7n; ; ;  # ᢡߞ.⒒ق�
+่-��.ͣۡ�; ่-�4.ͣۡ�; [B1, P1, V5, V6]; xn---4-owiz479s.xn--eva20pjv9a; ; ;  # ่-�4.ͣۡ�
+่-�4.ͣۡ8.; ; [B1, V5]; xn---4-owiz479s.xn--8-ihb69x.; ; ;  # ่-�4.ͣۡ8.
+xn---4-owiz479s.xn--8-ihb69x.; ่-�4.ͣۡ8.; [B1, V5]; xn---4-owiz479s.xn--8-ihb69x.; ; ;  # ่-�4.ͣۡ8.
+xn---4-owiz479s.xn--eva20pjv9a; ่-�4.ͣۡ�; [B1, V5, V6]; xn---4-owiz479s.xn--eva20pjv9a; ; ;  # ่-�4.ͣۡ�
+�｡Ⴠ-�; �.Ⴠ-�; [P1, V6]; xn--r3i.xn----z1g58579u; ; ;  # �.Ⴠ-
+�。Ⴠ-�; �.Ⴠ-�; [P1, V6]; xn--r3i.xn----z1g58579u; ; ;  # �.Ⴠ-
+�。ⴠ-�; �.ⴠ-�; [P1, V6]; xn--r3i.xn----2wst7439i; ; ;  # �.ⴠ-
+xn--r3i.xn----2wst7439i; �.ⴠ-�; [V6]; xn--r3i.xn----2wst7439i; ; ;  # �.ⴠ-
+xn--r3i.xn----z1g58579u; �.Ⴠ-�; [V6]; xn--r3i.xn----z1g58579u; ; ;  # �.Ⴠ-
+�｡ⴠ-�; �.ⴠ-�; [P1, V6]; xn--r3i.xn----2wst7439i; ; ;  # �.ⴠ-
+𑑂◊．⦟∠; 𑑂◊.⦟∠; [V5]; xn--01h3338f.xn--79g270a; ; ;  # 𑑂◊.⦟∠
+𑑂◊.⦟∠; ; [V5]; xn--01h3338f.xn--79g270a; ; ;  # 𑑂◊.⦟∠
+xn--01h3338f.xn--79g270a; 𑑂◊.⦟∠; [V5]; xn--01h3338f.xn--79g270a; ; ;  # 𑑂◊.⦟∠
+𿌰-٢。󋸛ꡂ; 𿌰-٢.󋸛ꡂ; [B5, B6, P1, V6]; xn----dqc20828e.xn--bc9an2879c; ; ;  # -٢.ꡂ
+xn----dqc20828e.xn--bc9an2879c; 𿌰-٢.󋸛ꡂ; [B5, B6, V6]; xn----dqc20828e.xn--bc9an2879c; ; ;  # -٢.ꡂ
+ٸ。��𞪭�; يٴ.��𞪭�; [B1, P1, V6]; xn--mhb8f.xn--oob2585kfdsfsbo7h; ; ;  # يٴ.��
+يٴ。��𞪭�; يٴ.��𞪭�; [B1, P1, V6]; xn--mhb8f.xn--oob2585kfdsfsbo7h; ; ;  # يٴ.��
+xn--mhb8f.xn--oob2585kfdsfsbo7h; يٴ.��𞪭�; [B1, V6]; xn--mhb8f.xn--oob2585kfdsfsbo7h; ; ;  # يٴ.��
+�ꌄ｡�ᣬ; �ꌄ.�ᣬ; [B1, B2, B3, C2]; xn--y77ao18q.xn--wdf367a; ; xn--y77ao18q.xn--wdf; [B2, B3] # �ꌄ.ᣬ
+�ꌄ。�ᣬ; �ꌄ.�ᣬ; [B1, B2, B3, C2]; xn--y77ao18q.xn--wdf367a; ; xn--y77ao18q.xn--wdf; [B2, B3] # �ꌄ.ᣬ
+xn--y77ao18q.xn--wdf; �ꌄ.ᣬ; [B2, B3]; xn--y77ao18q.xn--wdf; ; ;  # �ꌄ.ᣬ
+xn--y77ao18q.xn--wdf367a; �ꌄ.�ᣬ; [B1, B2, B3, C2]; xn--y77ao18q.xn--wdf367a; ; ;  # �ꌄ.ᣬ
+₀٢。󅪞≯-; 0٢.󅪞≯-; [B1, B6, P1, V3, V6]; xn--0-dqc.xn----ogov3342l; ; ;  # 0٢.≯-
+₀٢。󅪞≯-; 0٢.󅪞≯-; [B1, B6, P1, V3, V6]; xn--0-dqc.xn----ogov3342l; ; ;  # 0٢.≯-
+0٢。󅪞≯-; 0٢.󅪞≯-; [B1, B6, P1, V3, V6]; xn--0-dqc.xn----ogov3342l; ; ;  # 0٢.≯-
+0٢。󅪞≯-; 0٢.󅪞≯-; [B1, B6, P1, V3, V6]; xn--0-dqc.xn----ogov3342l; ; ;  # 0٢.≯-
+xn--0-dqc.xn----ogov3342l; 0٢.󅪞≯-; [B1, B6, V3, V6]; xn--0-dqc.xn----ogov3342l; ; ;  # 0٢.≯-
+̜�-𞯃.�ࡅ; ; [B1, P1, V5, V6]; xn----gdb7046r692g.xn--3vb1349j; ; ;  # ̜�-.�ࡅ
+xn----gdb7046r692g.xn--3vb1349j; ̜�-𞯃.�ࡅ; [B1, V5, V6]; xn----gdb7046r692g.xn--3vb1349j; ; ;  # ̜�-.�ࡅ
+≠｡���֔; ≠.���֔; [B1, P1, V5, V6]; xn--1ch.xn--fcb538c649rypog; ; ;  # ≠.���֔
+≠｡���֔; ≠.���֔; [B1, P1, V5, V6]; xn--1ch.xn--fcb538c649rypog; ; ;  # ≠.���֔
+≠。���֔; ≠.���֔; [B1, P1, V5, V6]; xn--1ch.xn--fcb538c649rypog; ; ;  # ≠.���֔
+≠。���֔; ≠.���֔; [B1, P1, V5, V6]; xn--1ch.xn--fcb538c649rypog; ; ;  # ≠.���֔
+≠。��ⴡ֔; ≠.��ⴡ֔; [B1, P1, V5, V6]; xn--1ch.xn--fcb363rk03mypug; ; ;  # ≠.��ⴡ֔
+≠。��ⴡ֔; ≠.��ⴡ֔; [B1, P1, V5, V6]; xn--1ch.xn--fcb363rk03mypug; ; ;  # ≠.��ⴡ֔
+xn--1ch.xn--fcb363rk03mypug; ≠.��ⴡ֔; [B1, V5, V6]; xn--1ch.xn--fcb363rk03mypug; ; ;  # ≠.��ⴡ֔
+xn--1ch.xn--fcb538c649rypog; ≠.���֔; [B1, V5, V6]; xn--1ch.xn--fcb538c649rypog; ; ;  # ≠.���֔
+≠｡��ⴡ֔; ≠.��ⴡ֔; [B1, P1, V5, V6]; xn--1ch.xn--fcb363rk03mypug; ; ;  # ≠.��ⴡ֔
+≠｡��ⴡ֔; ≠.��ⴡ֔; [B1, P1, V5, V6]; xn--1ch.xn--fcb363rk03mypug; ; ;  # ≠.��ⴡ֔
+𖫳≠.Ⴀ�; ; [B1, B5, B6, P1, V5, V6]; xn--1ch9250k.xn--7md2659j; ; ;  # 𖫳≠.Ⴀ�
+𖫳≠.Ⴀ�; 𖫳≠.Ⴀ�; [B1, B5, B6, P1, V5, V6]; xn--1ch9250k.xn--7md2659j; ; ;  # 𖫳≠.Ⴀ�
+𖫳≠.ⴀ�; 𖫳≠.ⴀ�; [B1, B5, B6, P1, V5, V6]; xn--1ch9250k.xn--rkj6232e; ; ;  # 𖫳≠.ⴀ�
+𖫳≠.ⴀ�; ; [B1, B5, B6, P1, V5, V6]; xn--1ch9250k.xn--rkj6232e; ; ;  # 𖫳≠.ⴀ�
+xn--1ch9250k.xn--rkj6232e; 𖫳≠.ⴀ�; [B1, B5, B6, V5, V6]; xn--1ch9250k.xn--rkj6232e; ; ;  # 𖫳≠.ⴀ�
+xn--1ch9250k.xn--7md2659j; 𖫳≠.Ⴀ�; [B1, B5, B6, V5, V6]; xn--1ch9250k.xn--7md2659j; ; ;  # 𖫳≠.Ⴀ�
+󠅾ܶܦ．ᢚ閪࣢�; ܶܦ.ᢚ閪࣢�; [B1, B5, B6, P1, V5, V6]; xn--wnb5a.xn--l0b161fis8gbp5m; ; ;  # ܶܦ.ᢚ閪�
+󠅾ܶܦ.ᢚ閪࣢�; ܶܦ.ᢚ閪࣢�; [B1, B5, B6, P1, V5, V6]; xn--wnb5a.xn--l0b161fis8gbp5m; ; ;  # ܶܦ.ᢚ閪�
+xn--wnb5a.xn--l0b161fis8gbp5m; ܶܦ.ᢚ閪࣢�; [B1, B5, B6, V5, V6]; xn--wnb5a.xn--l0b161fis8gbp5m; ; ;  # ܶܦ.ᢚ閪�
+�󠇜ۋ꣩｡�ྰ-ᛟ; �ۋ꣩.�ྰ-ᛟ; [B1, C2, V5]; xn--blb540ke10h.xn----gmg236cj6k; ; xn--blb8114f.xn----gmg236cj6k; [B1, V5] # ۋ꣩.�ྰ-ᛟ
+�󠇜ۋ꣩。�ྰ-ᛟ; �ۋ꣩.�ྰ-ᛟ; [B1, C2, V5]; xn--blb540ke10h.xn----gmg236cj6k; ; xn--blb8114f.xn----gmg236cj6k; [B1, V5] # ۋ꣩.�ྰ-ᛟ
+xn--blb8114f.xn----gmg236cj6k; ۋ꣩.�ྰ-ᛟ; [B1, V5]; xn--blb8114f.xn----gmg236cj6k; ; ;  # ۋ꣩.�ྰ-ᛟ
+xn--blb540ke10h.xn----gmg236cj6k; �ۋ꣩.�ྰ-ᛟ; [B1, C2, V5]; xn--blb540ke10h.xn----gmg236cj6k; ; ;  # ۋ꣩.�ྰ-ᛟ
+�󘖙ฺ�。ں�; �󘖙ฺ�.ں4; [P1, V6]; xn--o4c1723h8g85gt4ya.xn--4-dvc; ; ;  # �ฺ.ں4
+헁󘖙ฺ�。ں�; �󘖙ฺ�.ں4; [P1, V6]; xn--o4c1723h8g85gt4ya.xn--4-dvc; ; ;  # �ฺ.ں4
+�󘖙ฺ�。ں4; �󘖙ฺ�.ں4; [P1, V6]; xn--o4c1723h8g85gt4ya.xn--4-dvc; ; ;  # �ฺ.ں4
+헁󘖙ฺ�。ں4; �󘖙ฺ�.ں4; [P1, V6]; xn--o4c1723h8g85gt4ya.xn--4-dvc; ; ;  # �ฺ.ں4
+xn--o4c1723h8g85gt4ya.xn--4-dvc; �󘖙ฺ�.ں4; [V6]; xn--o4c1723h8g85gt4ya.xn--4-dvc; ; ;  # �ฺ.ں4
+�｡󃱂‌Ⴞ; �.󃱂‌Ⴞ; [B1, C1, P1, V6]; xn--lo0d.xn--2nd949eqw95u; ; xn--lo0d.xn--2nd75260n; [B1, P1, V6] # �.Ⴞ
+�。󃱂‌Ⴞ; �.󃱂‌Ⴞ; [B1, C1, P1, V6]; xn--lo0d.xn--2nd949eqw95u; ; xn--lo0d.xn--2nd75260n; [B1, P1, V6] # �.Ⴞ
+�。󃱂‌ⴞ; �.󃱂‌ⴞ; [B1, C1, P1, V6]; xn--lo0d.xn--0ugx72cwi33v; ; xn--lo0d.xn--mljx1099g; [B1, P1, V6] # �.ⴞ
+xn--lo0d.xn--mljx1099g; �.󃱂ⴞ; [B1, V6]; xn--lo0d.xn--mljx1099g; ; ;  # �.ⴞ
+xn--lo0d.xn--0ugx72cwi33v; �.󃱂‌ⴞ; [B1, C1, V6]; xn--lo0d.xn--0ugx72cwi33v; ; ;  # �.ⴞ
+xn--lo0d.xn--2nd75260n; �.󃱂Ⴞ; [B1, V6]; xn--lo0d.xn--2nd75260n; ; ;  # �.Ⴞ
+xn--lo0d.xn--2nd949eqw95u; �.󃱂‌Ⴞ; [B1, C1, V6]; xn--lo0d.xn--2nd949eqw95u; ; ;  # �.Ⴞ
+�｡󃱂‌ⴞ; �.󃱂‌ⴞ; [B1, C1, P1, V6]; xn--lo0d.xn--0ugx72cwi33v; ; xn--lo0d.xn--mljx1099g; [B1, P1, V6] # �.ⴞ
+꥓.̽𑂽馋; ; [P1, V5, V6]; xn--3j9a.xn--bua0708eqzrd; ; ;  # ꥓.̽馋
+xn--3j9a.xn--bua0708eqzrd; ꥓.̽𑂽馋; [V5, V6]; xn--3j9a.xn--bua0708eqzrd; ; ;  # ꥓.̽馋
+�򪛸�｡䜖; �򪛸�.䜖; [C2, P1, V6]; xn--1ug30527h9mxi.xn--k0o; ; xn--g138cxw05a.xn--k0o; [P1, V6] # .䜖
+�򪛸�。䜖; �򪛸�.䜖; [C2, P1, V6]; xn--1ug30527h9mxi.xn--k0o; ; xn--g138cxw05a.xn--k0o; [P1, V6] # .䜖
+xn--g138cxw05a.xn--k0o; �򪛸.䜖; [V6]; xn--g138cxw05a.xn--k0o; ; ;  # .䜖
+xn--1ug30527h9mxi.xn--k0o; �򪛸�.䜖; [C2, V6]; xn--1ug30527h9mxi.xn--k0o; ; ;  # .䜖
+ᡯ⚉姶🄉．۷�🎪�; ᡯ⚉姶🄉.۷�🎪�; [C2, P1, V6]; xn--c9e433epi4b3j20a.xn--kmb859ja94998b; ; xn--c9e433epi4b3j20a.xn--kmb6733w; [P1, V6] # ᡯ⚉姶🄉.۷🎪
+ᡯ⚉姶8,.۷�🎪�; ; [C2, P1, V6]; xn--8,-g9oy26fzu4d.xn--kmb859ja94998b; ; xn--8,-g9oy26fzu4d.xn--kmb6733w; [P1, V6] # ᡯ⚉姶8,.۷🎪
+xn--8,-g9oy26fzu4d.xn--kmb6733w; ᡯ⚉姶8,.۷🎪; [P1, V6]; xn--8,-g9oy26fzu4d.xn--kmb6733w; ; ;  # ᡯ⚉姶8,.۷🎪
+xn--8,-g9oy26fzu4d.xn--kmb859ja94998b; ᡯ⚉姶8,.۷�🎪�; [C2, P1, V6]; xn--8,-g9oy26fzu4d.xn--kmb859ja94998b; ; ;  # ᡯ⚉姶8,.۷🎪
+xn--c9e433epi4b3j20a.xn--kmb6733w; ᡯ⚉姶🄉.۷🎪; [V6]; xn--c9e433epi4b3j20a.xn--kmb6733w; ; ;  # ᡯ⚉姶🄉.۷🎪
+xn--c9e433epi4b3j20a.xn--kmb859ja94998b; ᡯ⚉姶🄉.۷�🎪�; [C2, V6]; xn--c9e433epi4b3j20a.xn--kmb859ja94998b; ; ;  # ᡯ⚉姶🄉.۷🎪
+𞽀.�🚖ฺ; ; [B1, P1, V6]; xn--0n7h.xn--o4c9032klszf; ; ;  # .�🚖ฺ
+xn--0n7h.xn--o4c9032klszf; 𞽀.�🚖ฺ; [B1, V6]; xn--0n7h.xn--o4c9032klszf; ; ;  # .�🚖ฺ
+Ⴔᠵ｡�݇۹; Ⴔᠵ.�݇۹; [B1, P1, V6]; xn--snd659a.xn--mmb9ml895e; ; ;  # Ⴔᠵ.�݇۹
+Ⴔᠵ。�݇۹; Ⴔᠵ.�݇۹; [B1, P1, V6]; xn--snd659a.xn--mmb9ml895e; ; ;  # Ⴔᠵ.�݇۹
+ⴔᠵ。�݇۹; ⴔᠵ.�݇۹; [B1]; xn--o7e997h.xn--mmb9ml895e; ; ;  # ⴔᠵ.�݇۹
+xn--o7e997h.xn--mmb9ml895e; ⴔᠵ.�݇۹; [B1]; xn--o7e997h.xn--mmb9ml895e; ; ;  # ⴔᠵ.�݇۹
+xn--snd659a.xn--mmb9ml895e; Ⴔᠵ.�݇۹; [B1, V6]; xn--snd659a.xn--mmb9ml895e; ; ;  # Ⴔᠵ.�݇۹
+ⴔᠵ｡�݇۹; ⴔᠵ.�݇۹; [B1]; xn--o7e997h.xn--mmb9ml895e; ; ;  # ⴔᠵ.�݇۹
+�ᡈ‌．︒-�-; �ᡈ‌.︒-�-; [C1, P1, V3, V5, V6]; xn--b7d82wo4h.xn-----c82nz547a; ; xn--b7d82w.xn-----c82nz547a; [P1, V3, V5, V6] # �ᡈ.︒-�-
+�ᡈ‌.。-�-; �ᡈ‌..-�-; [C1, V3, V5, X4_2]; xn--b7d82wo4h..xn-----pe4u; [C1, V3, V5, A4_2]; xn--b7d82w..xn-----pe4u; [V3, V5, A4_2] # �ᡈ..-�-
+xn--b7d82w..xn-----pe4u; �ᡈ..-�-; [V3, V5, X4_2]; xn--b7d82w..xn-----pe4u; [V3, V5, A4_2]; ;  # �ᡈ..-�-
+xn--b7d82wo4h..xn-----pe4u; �ᡈ‌..-�-; [C1, V3, V5, X4_2]; xn--b7d82wo4h..xn-----pe4u; [C1, V3, V5, A4_2]; ;  # �ᡈ..-�-
+xn--b7d82w.xn-----c82nz547a; �ᡈ.︒-�-; [V3, V5, V6]; xn--b7d82w.xn-----c82nz547a; ; ;  # �ᡈ.︒-�-
+xn--b7d82wo4h.xn-----c82nz547a; �ᡈ‌.︒-�-; [C1, V3, V5, V6]; xn--b7d82wo4h.xn-----c82nz547a; ; ;  # �ᡈ.︒-�-
+⒈�⒖‌.ᷰߛ; ; [B1, C1, P1, V5, V6]; xn--jfb844kmfdwb.xn--2sb914i; ; xn--jfb347mib.xn--2sb914i; [B1, P1, V5, V6] # ⒈⒖.ᷰߛ
+1.�15.‌.ᷰߛ; ; [B1, C1, P1, V5, V6]; 1.xn--15-1pd.xn--0ug.xn--2sb914i; ; 1.xn--15-1pd..xn--2sb914i; [B1, P1, V5, V6, A4_2] # 1.15..ᷰߛ
+1.xn--15-1pd..xn--2sb914i; 1.�15..ᷰߛ; [B1, V5, V6, X4_2]; 1.xn--15-1pd..xn--2sb914i; [B1, V5, V6, A4_2]; ;  # 1.15..ᷰߛ
+1.xn--15-1pd.xn--0ug.xn--2sb914i; 1.�15.‌.ᷰߛ; [B1, C1, V5, V6]; 1.xn--15-1pd.xn--0ug.xn--2sb914i; ; ;  # 1.15..ᷰߛ
+xn--jfb347mib.xn--2sb914i; ⒈�⒖.ᷰߛ; [B1, V5, V6]; xn--jfb347mib.xn--2sb914i; ; ;  # ⒈⒖.ᷰߛ
+xn--jfb844kmfdwb.xn--2sb914i; ⒈�⒖‌.ᷰߛ; [B1, C1, V5, V6]; xn--jfb844kmfdwb.xn--2sb914i; ; ;  # ⒈⒖.ᷰߛ
+�。-�Ⴋ; �.-�Ⴋ; [P1, V3, V5, V6]; xn--792h.xn----bse632b; ; ;  # �.-�Ⴋ
+�。-�ⴋ; �.-�ⴋ; [V3, V5]; xn--792h.xn----bse820x; ; ;  # �.-�ⴋ
+xn--792h.xn----bse820x; �.-�ⴋ; [V3, V5]; xn--792h.xn----bse820x; ; ;  # �.-�ⴋ
+xn--792h.xn----bse632b; �.-�Ⴋ; [V3, V5, V6]; xn--792h.xn----bse632b; ; ;  # �.-�Ⴋ
+ßჀ.ؠ刯Ⴝ; ; [B2, B3, P1, V6]; xn--zca442f.xn--fgb845cb66c; ; xn--ss-wgk.xn--fgb845cb66c;  # ßჀ.ؠ刯Ⴝ
+ßⴠ.ؠ刯�; ; [B2, B3]; xn--zca277t.xn--fgb670rovy; ; xn--ss-j81a.xn--fgb670rovy;  # ßⴠ.ؠ刯�
+SSჀ.ؠ刯Ⴝ; ssჀ.ؠ刯Ⴝ; [B2, B3, P1, V6]; xn--ss-wgk.xn--fgb845cb66c; ; ;  # ssჀ.ؠ刯Ⴝ
+ssⴠ.ؠ刯�; ; [B2, B3]; xn--ss-j81a.xn--fgb670rovy; ; ;  # ssⴠ.ؠ刯�
+Ssⴠ.ؠ刯Ⴝ; ssⴠ.ؠ刯Ⴝ; [B2, B3, P1, V6]; xn--ss-j81a.xn--fgb845cb66c; ; ;  # ssⴠ.ؠ刯Ⴝ
+xn--ss-j81a.xn--fgb845cb66c; ssⴠ.ؠ刯Ⴝ; [B2, B3, V6]; xn--ss-j81a.xn--fgb845cb66c; ; ;  # ssⴠ.ؠ刯Ⴝ
+xn--ss-j81a.xn--fgb670rovy; ssⴠ.ؠ刯�; [B2, B3]; xn--ss-j81a.xn--fgb670rovy; ; ;  # ssⴠ.ؠ刯�
+xn--ss-wgk.xn--fgb845cb66c; ssჀ.ؠ刯Ⴝ; [B2, B3, V6]; xn--ss-wgk.xn--fgb845cb66c; ; ;  # ssჀ.ؠ刯Ⴝ
+xn--zca277t.xn--fgb670rovy; ßⴠ.ؠ刯�; [B2, B3]; xn--zca277t.xn--fgb670rovy; ; ;  # ßⴠ.ؠ刯�
+xn--zca442f.xn--fgb845cb66c; ßჀ.ؠ刯Ⴝ; [B2, B3, V6]; xn--zca442f.xn--fgb845cb66c; ; ;  # ßჀ.ؠ刯Ⴝ
+᮪ႣℲ｡ᠳ툻ٳ; ᮪ႣℲ.ᠳ툻ٳ; [B5, B6, P1, V5, V6]; xn--bnd957cone.xn--sib102gc69k; ; ;  # ᮪ႣℲ.ᠳ툻ٳ
+᮪ႣℲ｡ᠳ�ᅮᆶٳ; ᮪ႣℲ.ᠳ툻ٳ; [B5, B6, P1, V5, V6]; xn--bnd957cone.xn--sib102gc69k; ; ;  # ᮪ႣℲ.ᠳ툻ٳ
+᮪ႣℲ。ᠳ툻ٳ; ᮪ႣℲ.ᠳ툻ٳ; [B5, B6, P1, V5, V6]; xn--bnd957cone.xn--sib102gc69k; ; ;  # ᮪ႣℲ.ᠳ툻ٳ
+᮪ႣℲ。ᠳ�ᅮᆶٳ; ᮪ႣℲ.ᠳ툻ٳ; [B5, B6, P1, V5, V6]; xn--bnd957cone.xn--sib102gc69k; ; ;  # ᮪ႣℲ.ᠳ툻ٳ
+᮪ⴃⅎ。ᠳ�ᅮᆶٳ; ᮪ⴃⅎ.ᠳ툻ٳ; [B5, B6, V5]; xn--yxf24x4ol.xn--sib102gc69k; ; ;  # ᮪ⴃⅎ.ᠳ툻ٳ
+᮪ⴃⅎ。ᠳ툻ٳ; ᮪ⴃⅎ.ᠳ툻ٳ; [B5, B6, V5]; xn--yxf24x4ol.xn--sib102gc69k; ; ;  # ᮪ⴃⅎ.ᠳ툻ٳ
+᮪Ⴃⅎ。ᠳ툻ٳ; ᮪Ⴃⅎ.ᠳ툻ٳ; [B5, B6, P1, V5, V6]; xn--bnd957c2pe.xn--sib102gc69k; ; ;  # ᮪Ⴃⅎ.ᠳ툻ٳ
+᮪Ⴃⅎ。ᠳ�ᅮᆶٳ; ᮪Ⴃⅎ.ᠳ툻ٳ; [B5, B6, P1, V5, V6]; xn--bnd957c2pe.xn--sib102gc69k; ; ;  # ᮪Ⴃⅎ.ᠳ툻ٳ
+xn--bnd957c2pe.xn--sib102gc69k; ᮪Ⴃⅎ.ᠳ툻ٳ; [B5, B6, V5, V6]; xn--bnd957c2pe.xn--sib102gc69k; ; ;  # ᮪Ⴃⅎ.ᠳ툻ٳ
+xn--yxf24x4ol.xn--sib102gc69k; ᮪ⴃⅎ.ᠳ툻ٳ; [B5, B6, V5]; xn--yxf24x4ol.xn--sib102gc69k; ; ;  # ᮪ⴃⅎ.ᠳ툻ٳ
+xn--bnd957cone.xn--sib102gc69k; ᮪ႣℲ.ᠳ툻ٳ; [B5, B6, V5, V6]; xn--bnd957cone.xn--sib102gc69k; ; ;  # ᮪ႣℲ.ᠳ툻ٳ
+᮪ⴃⅎ｡ᠳ�ᅮᆶٳ; ᮪ⴃⅎ.ᠳ툻ٳ; [B5, B6, V5]; xn--yxf24x4ol.xn--sib102gc69k; ; ;  # ᮪ⴃⅎ.ᠳ툻ٳ
+᮪ⴃⅎ｡ᠳ툻ٳ; ᮪ⴃⅎ.ᠳ툻ٳ; [B5, B6, V5]; xn--yxf24x4ol.xn--sib102gc69k; ; ;  # ᮪ⴃⅎ.ᠳ툻ٳ
+᮪Ⴃⅎ｡ᠳ툻ٳ; ᮪Ⴃⅎ.ᠳ툻ٳ; [B5, B6, P1, V5, V6]; xn--bnd957c2pe.xn--sib102gc69k; ; ;  # ᮪Ⴃⅎ.ᠳ툻ٳ
+᮪Ⴃⅎ｡ᠳ�ᅮᆶٳ; ᮪Ⴃⅎ.ᠳ툻ٳ; [B5, B6, P1, V5, V6]; xn--bnd957c2pe.xn--sib102gc69k; ; ;  # ᮪Ⴃⅎ.ᠳ툻ٳ
+۬.ࢢ�ټ; ; [B1, B3, B6, V5]; xn--8lb.xn--1ib31ily45b; ; ;  # ۬.ࢢ�ټ
+xn--8lb.xn--1ib31ily45b; ۬.ࢢ�ټ; [B1, B3, B6, V5]; xn--8lb.xn--1ib31ily45b; ; ;  # ۬.ࢢ�ټ
+ڶ۟。₇꠆; ڶ۟.7꠆; [B1]; xn--pkb6f.xn--7-x93e; ; ;  # ڶ۟.7꠆
+ڶ۟。7꠆; ڶ۟.7꠆; [B1]; xn--pkb6f.xn--7-x93e; ; ;  # ڶ۟.7꠆
+xn--pkb6f.xn--7-x93e; Ú¶ÛŸ.7ê †; [B1]; xn--pkb6f.xn--7-x93e; ; ;  # Ú¶ÛŸ.7ê †
+Ú¶ÛŸ.7ê †; ; [B1]; xn--pkb6f.xn--7-x93e; ; ;  # Ú¶ÛŸ.7ê †
+Ⴣ�.‌�≮󠩉; ; [B1, B5, B6, C1, P1, V6]; xn--7nd8101k.xn--0ugy6gn120eb103g; ; xn--7nd8101k.xn--gdh4944ob3x3e; [B1, B5, B6, P1, V5, V6] # Ⴣ�.�≮
+Ⴣ�.‌�≮󠩉; Ⴣ�.‌�≮󠩉; [B1, B5, B6, C1, P1, V6]; xn--7nd8101k.xn--0ugy6gn120eb103g; ; xn--7nd8101k.xn--gdh4944ob3x3e; [B1, B5, B6, P1, V5, V6] # Ⴣ�.�≮
+ⴣ�.‌�≮󠩉; ⴣ�.‌�≮󠩉; [B1, B5, B6, C1, P1, V6]; xn--rlj6323e.xn--0ugy6gn120eb103g; ; xn--rlj6323e.xn--gdh4944ob3x3e; [B1, B5, B6, P1, V5, V6] # ⴣ�.�≮
+ⴣ�.‌�≮󠩉; ; [B1, B5, B6, C1, P1, V6]; xn--rlj6323e.xn--0ugy6gn120eb103g; ; xn--rlj6323e.xn--gdh4944ob3x3e; [B1, B5, B6, P1, V5, V6] # ⴣ�.�≮
+xn--rlj6323e.xn--gdh4944ob3x3e; ⴣ�.�≮󠩉; [B1, B5, B6, V5, V6]; xn--rlj6323e.xn--gdh4944ob3x3e; ; ;  # ⴣ�.�≮
+xn--rlj6323e.xn--0ugy6gn120eb103g; ⴣ�.‌�≮󠩉; [B1, B5, B6, C1, V6]; xn--rlj6323e.xn--0ugy6gn120eb103g; ; ;  # ⴣ�.�≮
+xn--7nd8101k.xn--gdh4944ob3x3e; Ⴣ�.�≮󠩉; [B1, B5, B6, V5, V6]; xn--7nd8101k.xn--gdh4944ob3x3e; ; ;  # Ⴣ�.�≮
+xn--7nd8101k.xn--0ugy6gn120eb103g; Ⴣ�.‌�≮󠩉; [B1, B5, B6, C1, V6]; xn--7nd8101k.xn--0ugy6gn120eb103g; ; ;  # Ⴣ�.�≮
+��⯮．�‌; 9�⯮.‌; [C1]; xn--9-mfs8024b.xn--0ug; ; xn--9-mfs8024b.; [] # 9�⯮.
+9�⯮.�‌; 9�⯮.‌; [C1]; xn--9-mfs8024b.xn--0ug; ; xn--9-mfs8024b.; [] # 9�⯮.
+xn--9-mfs8024b.; 9�⯮.; ; xn--9-mfs8024b.; ; ;  # 9�⯮.
+9�⯮.; ; ; xn--9-mfs8024b.; ; ;  # 9�⯮.
+xn--9-mfs8024b.xn--0ug; 9�⯮.‌; [C1]; xn--9-mfs8024b.xn--0ug; ; ;  # 9�⯮.
+��｡Ⴣ྄彦; ��.Ⴣ྄彦; [B1, P1, V6]; xn--0sh2466f.xn--3ed15dt93o; ; ;  # ��.Ⴣ྄彦
+8.�。Ⴣ྄彦; 8.�.Ⴣ྄彦; [B1, P1, V6]; 8.xn--fo0d.xn--3ed15dt93o; ; ;  # 8.�.Ⴣ྄彦
+8.�。ⴣ྄彦; 8.�.ⴣ྄彦; [B1]; 8.xn--fo0d.xn--3ed972m6o8a; ; ;  # 8.�.ⴣ྄彦
+8.xn--fo0d.xn--3ed972m6o8a; 8.�.ⴣ྄彦; [B1]; 8.xn--fo0d.xn--3ed972m6o8a; ; ;  # 8.�.ⴣ྄彦
+8.xn--fo0d.xn--3ed15dt93o; 8.�.Ⴣ྄彦; [B1, V6]; 8.xn--fo0d.xn--3ed15dt93o; ; ;  # 8.�.Ⴣ྄彦
+��｡ⴣ྄彦; ��.ⴣ྄彦; [B1, P1, V6]; xn--0sh2466f.xn--3ed972m6o8a; ; ;  # ��.ⴣ྄彦
+xn--0sh2466f.xn--3ed972m6o8a; ��.ⴣ྄彦; [B1, V6]; xn--0sh2466f.xn--3ed972m6o8a; ; ;  # ��.ⴣ྄彦
+xn--0sh2466f.xn--3ed15dt93o; ��.Ⴣ྄彦; [B1, V6]; xn--0sh2466f.xn--3ed15dt93o; ; ;  # ��.Ⴣ྄彦
+-问񬰔⒛。؄-񜗉橬; -问񬰔⒛.؄-񜗉橬; [B1, P1, V3, V6]; xn----hdpu849bhis3e.xn----ykc7228efm46d; ; ;  # -问⒛.-橬
+-问񬰔20.。؄-񜗉橬; -问񬰔20..؄-񜗉橬; [B1, P1, V3, V6, X4_2]; xn---20-658jx1776d..xn----ykc7228efm46d; [B1, P1, V3, V6, A4_2]; ;  # -问20..-橬
+xn---20-658jx1776d..xn----ykc7228efm46d; -问񬰔20..؄-񜗉橬; [B1, V3, V6, X4_2]; xn---20-658jx1776d..xn----ykc7228efm46d; [B1, V3, V6, A4_2]; ;  # -问20..-橬
+xn----hdpu849bhis3e.xn----ykc7228efm46d; -问񬰔⒛.؄-񜗉橬; [B1, V3, V6]; xn----hdpu849bhis3e.xn----ykc7228efm46d; ; ;  # -问⒛.-橬
+ᮬႬ‌̥。�; ᮬႬ‌̥.2; [C1, P1, V5, V6]; xn--mta930emribme.2; ; xn--mta930emri.2; [P1, V5, V6] # ᮬႬ̥.2
+ᮬႬ‌̥。2; ᮬႬ‌̥.2; [C1, P1, V5, V6]; xn--mta930emribme.2; ; xn--mta930emri.2; [P1, V5, V6] # ᮬႬ̥.2
+ᮬⴌ‌̥。2; ᮬⴌ‌̥.2; [C1, V5]; xn--mta176j97cl2q.2; ; xn--mta176jjjm.2; [V5] # ᮬⴌ̥.2
+xn--mta176jjjm.2; ᮬⴌ̥.2; [V5]; xn--mta176jjjm.2; ; ;  # ᮬⴌ̥.2
+xn--mta176j97cl2q.2; ᮬⴌ‌̥.2; [C1, V5]; xn--mta176j97cl2q.2; ; ;  # ᮬⴌ̥.2
+xn--mta930emri.2; ᮬႬ̥.2; [V5, V6]; xn--mta930emri.2; ; ;  # ᮬႬ̥.2
+xn--mta930emribme.2; ᮬႬ‌̥.2; [C1, V5, V6]; xn--mta930emribme.2; ; ;  # ᮬႬ̥.2
+ᮬⴌ‌̥。�; ᮬⴌ‌̥.2; [C1, V5]; xn--mta176j97cl2q.2; ; xn--mta176jjjm.2; [V5] # ᮬⴌ̥.2
+?。꠆٩󠒩; ?.꠆٩󠒩; [B1, P1, V5, V6]; ?.xn--iib9583fusy0i; [B1, P1, V5, V6, A3]; ;  # .꠆٩
+?.xn--iib9583fusy0i; ?.ê †Ù©ó ’©; [B1, P1, V5, V6]; ?.xn--iib9583fusy0i; [B1, P1, V5, V6, A3]; ;  # .ê †Ù©
+?.XN--IIB9583FUSY0I; ?.ê †Ù©ó ’©; [B1, P1, V5, V6]; ?.xn--iib9583fusy0i; [B1, P1, V5, V6, A3]; ;  # .ê †Ù©
+?.Xn--Iib9583fusy0i; ?.ê †Ù©ó ’©; [B1, P1, V5, V6]; ?.xn--iib9583fusy0i; [B1, P1, V5, V6, A3]; ;  # .ê †Ù©
+�͟⾶｡₇︒눇≮; ͟飛.7︒눇≮; [P1, V5, V6]; xn--9ua0567e.xn--7-ngou006d1ttc; ; ;  # ͟飛.7︒눇≮
+�͟⾶｡₇︒눇≮; ͟飛.7︒눇≮; [P1, V5, V6]; xn--9ua0567e.xn--7-ngou006d1ttc; ; ;  # ͟飛.7︒눇≮
+�͟飛。7。눇≮; ͟飛.7.눇≮; [P1, V5, V6]; xn--9ua0567e.7.xn--gdh6767c; ; ;  # ͟飛.7.눇≮
+�͟飛。7。눇≮; ͟飛.7.눇≮; [P1, V5, V6]; xn--9ua0567e.7.xn--gdh6767c; ; ;  # ͟飛.7.눇≮
+xn--9ua0567e.7.xn--gdh6767c; ͟飛.7.눇≮; [V5, V6]; xn--9ua0567e.7.xn--gdh6767c; ; ;  # ͟飛.7.눇≮
+xn--9ua0567e.xn--7-ngou006d1ttc; ͟飛.7︒눇≮; [V5, V6]; xn--9ua0567e.xn--7-ngou006d1ttc; ; ;  # ͟飛.7︒눇≮
+‌︉��．‌⿃; ‌��.‌鳥; [B1, C1, C2]; xn--0ugc6024p.xn--0ug1920c; ; xn--so0d.xn--6x6a; [B1] # �.鳥
+‌︉��.‌鳥; ‌��.‌鳥; [B1, C1, C2]; xn--0ugc6024p.xn--0ug1920c; ; xn--so0d.xn--6x6a; [B1] # �.鳥
+xn--so0d.xn--6x6a; �.鳥; [B1]; xn--so0d.xn--6x6a; ; ;  # �.鳥
+xn--0ugc6024p.xn--0ug1920c; ‌��.‌鳥; [B1, C1, C2]; xn--0ugc6024p.xn--0ug1920c; ; ;  # �.鳥
+�．�󠗒��; �.�󠗒��; [B1, C2, P1, V6]; xn--lj8h.xn--1ug6603gr1pfwq37h; ; xn--lj8h.xn--ln9ci476aqmr2g; [B1, P1, V6] # �.��
+�.�󠗒��; ; [B1, C2, P1, V6]; xn--lj8h.xn--1ug6603gr1pfwq37h; ; xn--lj8h.xn--ln9ci476aqmr2g; [B1, P1, V6] # �.��
+xn--lj8h.xn--ln9ci476aqmr2g; �.󠗒��; [B1, V6]; xn--lj8h.xn--ln9ci476aqmr2g; ; ;  # �.��
+xn--lj8h.xn--1ug6603gr1pfwq37h; �.�󠗒��; [B1, C2, V6]; xn--lj8h.xn--1ug6603gr1pfwq37h; ; ;  # �.��
+ٽृ.𞤓�; ٽृ.𞤵�; [B3, C2]; xn--2ib43l.xn--1ugy711p; ; xn--2ib43l.xn--te6h; [] # ٽृ.𞤵
+ٽृ.𞤵�; ; [B3, C2]; xn--2ib43l.xn--1ugy711p; ; xn--2ib43l.xn--te6h; [] # ٽृ.𞤵
+xn--2ib43l.xn--te6h; ٽृ.𞤵; ; xn--2ib43l.xn--te6h; ; ;  # ٽृ.𞤵
+ٽृ.𞤵; ; ; xn--2ib43l.xn--te6h; ; ;  # ٽृ.𞤵
+ٽृ.𞤓; ٽृ.𞤵; ; xn--2ib43l.xn--te6h; ; ;  # ٽृ.𞤵
+xn--2ib43l.xn--1ugy711p; ٽृ.𞤵�; [B3, C2]; xn--2ib43l.xn--1ugy711p; ; ;  # ٽृ.𞤵
+٤�-．󥜽္�; ٤�-.󥜽္�; [B1, P1, V3, V6]; xn----gqc711a.xn--9jd88234f3qm0b; ; ;  # ٤�-.္
+٤�-.󥜽္�; ; [B1, P1, V3, V6]; xn----gqc711a.xn--9jd88234f3qm0b; ; ;  # ٤�-.္
+xn----gqc711a.xn--9jd88234f3qm0b; ٤�-.󥜽္�; [B1, V3, V6]; xn----gqc711a.xn--9jd88234f3qm0b; ; ;  # ٤�-.္
+4်-�｡ꨩ‌�≮; 4်-�.ꨩ‌�≮; [B1, C1, P1, V5, V6]; xn--4--e4j7831r.xn--0ugy6gjy5sl3ud; ; xn--4--e4j7831r.xn--gdh8754cz40c; [B1, P1, V5, V6] # 4်-�.ꨩ�≮
+4်-�｡ꨩ‌�≮; 4်-�.ꨩ‌�≮; [B1, C1, P1, V5, V6]; xn--4--e4j7831r.xn--0ugy6gjy5sl3ud; ; xn--4--e4j7831r.xn--gdh8754cz40c; [B1, P1, V5, V6] # 4်-�.ꨩ�≮
+4်-�。ꨩ‌�≮; 4်-�.ꨩ‌�≮; [B1, C1, P1, V5, V6]; xn--4--e4j7831r.xn--0ugy6gjy5sl3ud; ; xn--4--e4j7831r.xn--gdh8754cz40c; [B1, P1, V5, V6] # 4်-�.ꨩ�≮
+4်-�。ꨩ‌�≮; 4်-�.ꨩ‌�≮; [B1, C1, P1, V5, V6]; xn--4--e4j7831r.xn--0ugy6gjy5sl3ud; ; xn--4--e4j7831r.xn--gdh8754cz40c; [B1, P1, V5, V6] # 4်-�.ꨩ�≮
+xn--4--e4j7831r.xn--gdh8754cz40c; 4်-�.ꨩ�≮; [B1, V5, V6]; xn--4--e4j7831r.xn--gdh8754cz40c; ; ;  # 4်-�.ꨩ�≮
+xn--4--e4j7831r.xn--0ugy6gjy5sl3ud; 4်-�.ꨩ‌�≮; [B1, C1, V5, V6]; xn--4--e4j7831r.xn--0ugy6gjy5sl3ud; ; ;  # 4်-�.ꨩ�≮
+‌。ﾠ྄ྖ; ‌.ﾠ྄ྖ; [C1, P1, V6]; xn--0ug.xn--3ed0by082k; ; .xn--3ed0by082k; [P1, V6, A4_2] # .྄ྖ
+‌。ᅠ྄ྖ; ‌.ᅠ྄ྖ; [C1, P1, V6]; xn--0ug.xn--3ed0b20h; ; .xn--3ed0b20h; [P1, V6, A4_2] # .྄ྖ
+.xn--3ed0b20h; .ᅠ྄ྖ; [V6, X4_2]; .xn--3ed0b20h; [V6, A4_2]; ;  # .྄ྖ
+xn--0ug.xn--3ed0b20h; ‌.ᅠ྄ྖ; [C1, V6]; xn--0ug.xn--3ed0b20h; ; ;  # .྄ྖ
+.xn--3ed0by082k; .ﾠ྄ྖ; [V6, X4_2]; .xn--3ed0by082k; [V6, A4_2]; ;  # .྄ྖ
+xn--0ug.xn--3ed0by082k; ‌.ﾠ྄ྖ; [C1, V6]; xn--0ug.xn--3ed0by082k; ; ;  # .྄ྖ
+≯�．��򲇛; ≯�.��򲇛; [C2, P1, V6]; xn--hdh84488f.xn--1ug8099fbjp4e; ; xn--hdh84488f.xn--xy7cw2886b; [P1, V6] # ≯.�
+≯�．��򲇛; ≯�.��򲇛; [C2, P1, V6]; xn--hdh84488f.xn--1ug8099fbjp4e; ; xn--hdh84488f.xn--xy7cw2886b; [P1, V6] # ≯.�
+≯�.��򲇛; ; [C2, P1, V6]; xn--hdh84488f.xn--1ug8099fbjp4e; ; xn--hdh84488f.xn--xy7cw2886b; [P1, V6] # ≯.�
+≯�.��򲇛; ≯�.��򲇛; [C2, P1, V6]; xn--hdh84488f.xn--1ug8099fbjp4e; ; xn--hdh84488f.xn--xy7cw2886b; [P1, V6] # ≯.�
+xn--hdh84488f.xn--xy7cw2886b; ≯�.�򲇛; [V6]; xn--hdh84488f.xn--xy7cw2886b; ; ;  # ≯.�
+xn--hdh84488f.xn--1ug8099fbjp4e; ≯�.��򲇛; [C2, V6]; xn--hdh84488f.xn--1ug8099fbjp4e; ; ;  # ≯.�
+�ß�｡��; �ß�.7�; [B1, B2]; xn--zca96ys96y.xn--7-mm5i; ; xn--ss-jvd2339x.xn--7-mm5i;  # �ß�.7�
+�ß�。7�; �ß�.7�; [B1, B2]; xn--zca96ys96y.xn--7-mm5i; ; xn--ss-jvd2339x.xn--7-mm5i;  # �ß�.7�
+�SS�。7�; �ss�.7�; [B1, B2]; xn--ss-jvd2339x.xn--7-mm5i; ; ;  # �ss�.7�
+�ss�。7�; �ss�.7�; [B1, B2]; xn--ss-jvd2339x.xn--7-mm5i; ; ;  # �ss�.7�
+xn--ss-jvd2339x.xn--7-mm5i; �ss�.7�; [B1, B2]; xn--ss-jvd2339x.xn--7-mm5i; ; ;  # �ss�.7�
+xn--zca96ys96y.xn--7-mm5i; ��.7�; [B1, B2]; xn--zca96ys96y.xn--7-mm5i; ; ;  # ��.7�
+�SS�｡��; �ss�.7�; [B1, B2]; xn--ss-jvd2339x.xn--7-mm5i; ; ;  # �ss�.7�
+�ss�｡��; �ss�.7�; [B1, B2]; xn--ss-jvd2339x.xn--7-mm5i; ; ;  # �ss�.7�
+�Ss�。7�; �ss�.7�; [B1, B2]; xn--ss-jvd2339x.xn--7-mm5i; ; ;  # �ss�.7�
+�Ss�｡��; �ss�.7�; [B1, B2]; xn--ss-jvd2339x.xn--7-mm5i; ; ;  # �ss�.7�
+ßެާࢱ。�􅮙�; ßެާࢱ.�􅮙�; [B2, B5, B6, P1, V6]; xn--zca685aoa95h.xn--e09co8cr9861c; ; xn--ss-9qet02k.xn--e09co8cr9861c;  # ßެާࢱ.��
+SSެާࢱ。�􅮙�; ssެާࢱ.�􅮙�; [B2, B5, B6, P1, V6]; xn--ss-9qet02k.xn--e09co8cr9861c; ; ;  # ssެާࢱ.��
+ssެާࢱ。�􅮙�; ssެާࢱ.�􅮙�; [B2, B5, B6, P1, V6]; xn--ss-9qet02k.xn--e09co8cr9861c; ; ;  # ssެާࢱ.��
+Ssެާࢱ。�􅮙�; ssެާࢱ.�􅮙�; [B2, B5, B6, P1, V6]; xn--ss-9qet02k.xn--e09co8cr9861c; ; ;  # ssެާࢱ.��
+xn--ss-9qet02k.xn--e09co8cr9861c; ssެާࢱ.�􅮙�; [B2, B5, B6, V6]; xn--ss-9qet02k.xn--e09co8cr9861c; ; ;  # ssެާࢱ.��
+xn--zca685aoa95h.xn--e09co8cr9861c; ßެާࢱ.�􅮙�; [B2, B5, B6, V6]; xn--zca685aoa95h.xn--e09co8cr9861c; ; ;  # ßެާࢱ.��
+-｡󠉗⒌𞯛; -.󠉗⒌𞯛; [B1, P1, V3, V6]; -.xn--xsh6367n1bi3e; ; ;  # -.⒌
+-。󠉗5.𞯛; -.󠉗5.𞯛; [B1, P1, V3, V6]; -.xn--5-zz21m.xn--6x6h; ; ;  # -.5.
+-.xn--5-zz21m.xn--6x6h; -.󠉗5.𞯛; [B1, V3, V6]; -.xn--5-zz21m.xn--6x6h; ; ;  # -.5.
+-.xn--xsh6367n1bi3e; -.󠉗⒌𞯛; [B1, V3, V6]; -.xn--xsh6367n1bi3e; ; ;  # -.⒌
+�ς．-≮ﲫ; �ς.-≮خج; [B1, P1, V3, V6]; xn--3xa13520c.xn----9mcf1400a; ; xn--4xa92520c.xn----9mcf1400a;  # ς.-≮خج
+�ς．-≮ﲫ; �ς.-≮خج; [B1, P1, V3, V6]; xn--3xa13520c.xn----9mcf1400a; ; xn--4xa92520c.xn----9mcf1400a;  # ς.-≮خج
+�ς.-≮خج; ; [B1, P1, V3, V6]; xn--3xa13520c.xn----9mcf1400a; ; xn--4xa92520c.xn----9mcf1400a;  # ς.-≮خج
+�ς.-≮خج; �ς.-≮خج; [B1, P1, V3, V6]; xn--3xa13520c.xn----9mcf1400a; ; xn--4xa92520c.xn----9mcf1400a;  # ς.-≮خج
+�Σ.-≮خج; �σ.-≮خج; [B1, P1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+�Σ.-≮خج; �σ.-≮خج; [B1, P1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+�σ.-≮خج; ; [B1, P1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+�σ.-≮خج; �σ.-≮خج; [B1, P1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+xn--4xa92520c.xn----9mcf1400a; �σ.-≮خج; [B1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+xn--3xa13520c.xn----9mcf1400a; �ς.-≮خج; [B1, V3, V6]; xn--3xa13520c.xn----9mcf1400a; ; ;  # ς.-≮خج
+�Σ．-≮ﲫ; �σ.-≮خج; [B1, P1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+�Σ．-≮ﲫ; �σ.-≮خج; [B1, P1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+�σ．-≮ﲫ; �σ.-≮خج; [B1, P1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+�σ．-≮ﲫ; �σ.-≮خج; [B1, P1, V3, V6]; xn--4xa92520c.xn----9mcf1400a; ; ;  # σ.-≮خج
+ꡗࢸܙ．񔤔󠛙�ﰾ; ꡗࢸܙ.񔤔󠛙�كي; [B5, B6, P1, V6]; xn--jnb34fs003a.xn--fhbo927bk128mpi24d; ; ;  # ꡗࢸܙ.�كي
+ꡗࢸܙ.񔤔󠛙�كي; ; [B5, B6, P1, V6]; xn--jnb34fs003a.xn--fhbo927bk128mpi24d; ; ;  # ꡗࢸܙ.�كي
+xn--jnb34fs003a.xn--fhbo927bk128mpi24d; ꡗࢸܙ.񔤔󠛙�كي; [B5, B6, V6]; xn--jnb34fs003a.xn--fhbo927bk128mpi24d; ; ;  # ꡗࢸܙ.�كي
+�ࢷ𞤌�。���; �ࢷ𞤮�.���; [B1]; xn--dzb5191kezbrw47a.xn--p4e3841jz9tf; ; ;  # �ࢷ𞤮�.���
+�ࢷ𞤮�。���; �ࢷ𞤮�.���; [B1]; xn--dzb5191kezbrw47a.xn--p4e3841jz9tf; ; ;  # �ࢷ𞤮�.���
+xn--dzb5191kezbrw47a.xn--p4e3841jz9tf; �ࢷ𞤮�.���; [B1]; xn--dzb5191kezbrw47a.xn--p4e3841jz9tf; ; ;  # �ࢷ𞤮�.���
+�ࢷ𞤮�.���; ; [B1]; xn--dzb5191kezbrw47a.xn--p4e3841jz9tf; ; ;  # �ࢷ𞤮�.���
+�ࢷ𞤌�.���; �ࢷ𞤮�.���; [B1]; xn--dzb5191kezbrw47a.xn--p4e3841jz9tf; ; ;  # �ࢷ𞤮�.���
+₂㘷--。ۓ‌�𑖿; 2㘷--.ۓ‌�𑖿; [B1, C1, V2, V3]; xn--2---u58b.xn--jlb820ku99nbgj; ; xn--2---u58b.xn--jlb8024k14g; [B1, V2, V3] # 2㘷--.ۓ�𑖿
+₂㘷--。ۓ‌�𑖿; 2㘷--.ۓ‌�𑖿; [B1, C1, V2, V3]; xn--2---u58b.xn--jlb820ku99nbgj; ; xn--2---u58b.xn--jlb8024k14g; [B1, V2, V3] # 2㘷--.ۓ�𑖿
+2㘷--。ۓ‌�𑖿; 2㘷--.ۓ‌�𑖿; [B1, C1, V2, V3]; xn--2---u58b.xn--jlb820ku99nbgj; ; xn--2---u58b.xn--jlb8024k14g; [B1, V2, V3] # 2㘷--.ۓ�𑖿
+2㘷--。ۓ‌�𑖿; 2㘷--.ۓ‌�𑖿; [B1, C1, V2, V3]; xn--2---u58b.xn--jlb820ku99nbgj; ; xn--2---u58b.xn--jlb8024k14g; [B1, V2, V3] # 2㘷--.ۓ�𑖿
+xn--2---u58b.xn--jlb8024k14g; 2㘷--.ۓ�𑖿; [B1, V2, V3]; xn--2---u58b.xn--jlb8024k14g; ; ;  # 2㘷--.ۓ�𑖿
+xn--2---u58b.xn--jlb820ku99nbgj; 2㘷--.ۓ‌�𑖿; [B1, C1, V2, V3]; xn--2---u58b.xn--jlb820ku99nbgj; ; ;  # 2㘷--.ۓ�𑖿
+-𘊻．ᡮح-; -𘊻.ᡮح-; [B1, B5, B6, V3]; xn----bp5n.xn----bnc231l; ; ;  # -𘊻.ᡮح-
+-𘊻.ᡮح-; ; [B1, B5, B6, V3]; xn----bp5n.xn----bnc231l; ; ;  # -𘊻.ᡮح-
+xn----bp5n.xn----bnc231l; -𘊻.ᡮح-; [B1, B5, B6, V3]; xn----bp5n.xn----bnc231l; ; ;  # -𘊻.ᡮح-
+‌-ß｡ᢣ�ؿ; ‌-ß.ᢣ�ؿ; [B1, B5, B6, C1]; xn----qfa550v.xn--bhb925glx3p; ; -ss.xn--bhb925glx3p; [B1, B5, B6, V3] # -ß.ᢣ�ؿ
+‌-ß。ᢣ�ؿ; ‌-ß.ᢣ�ؿ; [B1, B5, B6, C1]; xn----qfa550v.xn--bhb925glx3p; ; -ss.xn--bhb925glx3p; [B1, B5, B6, V3] # -ß.ᢣ�ؿ
+‌-SS。ᢣ�ؿ; ‌-ss.ᢣ�ؿ; [B1, B5, B6, C1]; xn---ss-8m0a.xn--bhb925glx3p; ; -ss.xn--bhb925glx3p; [B1, B5, B6, V3] # -ss.ᢣ�ؿ
+‌-ss。ᢣ�ؿ; ‌-ss.ᢣ�ؿ; [B1, B5, B6, C1]; xn---ss-8m0a.xn--bhb925glx3p; ; -ss.xn--bhb925glx3p; [B1, B5, B6, V3] # -ss.ᢣ�ؿ
+‌-Ss。ᢣ�ؿ; ‌-ss.ᢣ�ؿ; [B1, B5, B6, C1]; xn---ss-8m0a.xn--bhb925glx3p; ; -ss.xn--bhb925glx3p; [B1, B5, B6, V3] # -ss.ᢣ�ؿ
+-ss.xn--bhb925glx3p; -ss.ᢣ�ؿ; [B1, B5, B6, V3]; -ss.xn--bhb925glx3p; ; ;  # -ss.ᢣ�ؿ
+xn---ss-8m0a.xn--bhb925glx3p; ‌-ss.ᢣ�ؿ; [B1, B5, B6, C1]; xn---ss-8m0a.xn--bhb925glx3p; ; ;  # -ss.ᢣ�ؿ
+xn----qfa550v.xn--bhb925glx3p; ‌-ß.ᢣ�ؿ; [B1, B5, B6, C1]; xn----qfa550v.xn--bhb925glx3p; ; ;  # -ß.ᢣ�ؿ
+‌-SS｡ᢣ�ؿ; ‌-ss.ᢣ�ؿ; [B1, B5, B6, C1]; xn---ss-8m0a.xn--bhb925glx3p; ; -ss.xn--bhb925glx3p; [B1, B5, B6, V3] # -ss.ᢣ�ؿ
+‌-ss｡ᢣ�ؿ; ‌-ss.ᢣ�ؿ; [B1, B5, B6, C1]; xn---ss-8m0a.xn--bhb925glx3p; ; -ss.xn--bhb925glx3p; [B1, B5, B6, V3] # -ss.ᢣ�ؿ
+‌-Ss｡ᢣ�ؿ; ‌-ss.ᢣ�ؿ; [B1, B5, B6, C1]; xn---ss-8m0a.xn--bhb925glx3p; ; -ss.xn--bhb925glx3p; [B1, B5, B6, V3] # -ss.ᢣ�ؿ
+�Ӏ᮪ࣶ．눵; �Ӏ᮪ࣶ.눵; [P1, V6]; xn--d5a07sn4u297k.xn--2e1b; ; ;  # �Ӏ᮪ࣶ.눵
+�Ӏ᮪ࣶ．눵; �Ӏ᮪ࣶ.눵; [P1, V6]; xn--d5a07sn4u297k.xn--2e1b; ; ;  # �Ӏ᮪ࣶ.눵
+�Ӏ᮪ࣶ.눵; ; [P1, V6]; xn--d5a07sn4u297k.xn--2e1b; ; ;  # �Ӏ᮪ࣶ.눵
+�Ӏ᮪ࣶ.눵; �Ӏ᮪ࣶ.눵; [P1, V6]; xn--d5a07sn4u297k.xn--2e1b; ; ;  # �Ӏ᮪ࣶ.눵
+��᮪ࣶ.눵; ��᮪ࣶ.눵; ; xn--s5a04sn4u297k.xn--2e1b; ; ;  # ��᮪ࣶ.눵
+��᮪ࣶ.눵; ; ; xn--s5a04sn4u297k.xn--2e1b; ; ;  # ��᮪ࣶ.눵
+xn--s5a04sn4u297k.xn--2e1b; ��᮪ࣶ.눵; ; xn--s5a04sn4u297k.xn--2e1b; ; ;  # ��᮪ࣶ.눵
+xn--d5a07sn4u297k.xn--2e1b; �Ӏ᮪ࣶ.눵; [V6]; xn--d5a07sn4u297k.xn--2e1b; ; ;  # �Ӏ᮪ࣶ.눵
+��᮪ࣶ．눵; ��᮪ࣶ.눵; ; xn--s5a04sn4u297k.xn--2e1b; ; ;  # ��᮪ࣶ.눵
+��᮪ࣶ．눵; ��᮪ࣶ.눵; ; xn--s5a04sn4u297k.xn--2e1b; ; ;  # ��᮪ࣶ.눵
+꣪｡𖄿𑆾󠇗; ꣪.𖄿𑆾; [P1, V5, V6]; xn--3g9a.xn--ud1dz07k; ; ;  # ꣪.𑆾
+꣪。𖄿𑆾󠇗; ꣪.𖄿𑆾; [P1, V5, V6]; xn--3g9a.xn--ud1dz07k; ; ;  # ꣪.𑆾
+xn--3g9a.xn--ud1dz07k; ꣪.𖄿𑆾; [V5, V6]; xn--3g9a.xn--ud1dz07k; ; ;  # ꣪.𑆾
+󇓓𑚳。�≯⾇; 󇓓𑚳.�≯舛; [P1, V6]; xn--3e2d79770c.xn--hdh0088abyy1c; ; ;  # 𑚳.≯舛
+󇓓𑚳。�≯⾇; 󇓓𑚳.�≯舛; [P1, V6]; xn--3e2d79770c.xn--hdh0088abyy1c; ; ;  # 𑚳.≯舛
+󇓓𑚳。�≯舛; 󇓓𑚳.�≯舛; [P1, V6]; xn--3e2d79770c.xn--hdh0088abyy1c; ; ;  # 𑚳.≯舛
+󇓓𑚳。�≯舛; 󇓓𑚳.�≯舛; [P1, V6]; xn--3e2d79770c.xn--hdh0088abyy1c; ; ;  # 𑚳.≯舛
+xn--3e2d79770c.xn--hdh0088abyy1c; 󇓓𑚳.�≯舛; [V6]; xn--3e2d79770c.xn--hdh0088abyy1c; ; ;  # 𑚳.≯舛
+�١‌．�‌; �١‌.�‌; [B1, B3, C1, C2]; xn--9hb652kv99n.xn--0ugb; ; xn--9hb7344k.; [] # �١.
+�١‌.�‌; ; [B1, B3, C1, C2]; xn--9hb652kv99n.xn--0ugb; ; xn--9hb7344k.; [] # �١.
+xn--9hb7344k.; �١.; ; xn--9hb7344k.; ; ;  # �١.
+�١.; ; ; xn--9hb7344k.; ; ;  # �١.
+xn--9hb652kv99n.xn--0ugb; �١‌.�‌; [B1, B3, C1, C2]; xn--9hb652kv99n.xn--0ugb; ; ;  # �١.
+񡅈砪≯ᢑ｡≯�򓴔‌; 񡅈砪≯ᢑ.≯�򓴔‌; [C1, P1, V6]; xn--bbf561cf95e57y3e.xn--0ugz6gc910ejro8c; ; xn--bbf561cf95e57y3e.xn--hdh0834o7mj6b; [P1, V6] # 砪≯ᢑ.≯�
+񡅈砪≯ᢑ｡≯�򓴔‌; 񡅈砪≯ᢑ.≯�򓴔‌; [C1, P1, V6]; xn--bbf561cf95e57y3e.xn--0ugz6gc910ejro8c; ; xn--bbf561cf95e57y3e.xn--hdh0834o7mj6b; [P1, V6] # 砪≯ᢑ.≯�
+񡅈砪≯ᢑ。≯�򓴔‌; 񡅈砪≯ᢑ.≯�򓴔‌; [C1, P1, V6]; xn--bbf561cf95e57y3e.xn--0ugz6gc910ejro8c; ; xn--bbf561cf95e57y3e.xn--hdh0834o7mj6b; [P1, V6] # 砪≯ᢑ.≯�
+񡅈砪≯ᢑ。≯�򓴔‌; 񡅈砪≯ᢑ.≯�򓴔‌; [C1, P1, V6]; xn--bbf561cf95e57y3e.xn--0ugz6gc910ejro8c; ; xn--bbf561cf95e57y3e.xn--hdh0834o7mj6b; [P1, V6] # 砪≯ᢑ.≯�
+xn--bbf561cf95e57y3e.xn--hdh0834o7mj6b; 񡅈砪≯ᢑ.≯�򓴔; [V6]; xn--bbf561cf95e57y3e.xn--hdh0834o7mj6b; ; ;  # 砪≯ᢑ.≯�
+xn--bbf561cf95e57y3e.xn--0ugz6gc910ejro8c; 񡅈砪≯ᢑ.≯�򓴔‌; [C1, V6]; xn--bbf561cf95e57y3e.xn--0ugz6gc910ejro8c; ; ;  # 砪≯ᢑ.≯�
+Ⴥ.𑄳㊸; Ⴥ.𑄳43; [P1, V5, V6]; xn--9nd.xn--43-274o; ; ;  # Ⴥ.𑄳43
+Ⴥ.𑄳43; ; [P1, V5, V6]; xn--9nd.xn--43-274o; ; ;  # Ⴥ.𑄳43
+â´¥.ð‘„³43; ; [V5]; xn--tlj.xn--43-274o; ; ;  # â´¥.ð‘„³43
+xn--tlj.xn--43-274o; â´¥.ð‘„³43; [V5]; xn--tlj.xn--43-274o; ; ;  # â´¥.ð‘„³43
+xn--9nd.xn--43-274o; Ⴥ.𑄳43; [V5, V6]; xn--9nd.xn--43-274o; ; ;  # Ⴥ.𑄳43
+ⴥ.𑄳㊸; ⴥ.𑄳43; [V5]; xn--tlj.xn--43-274o; ; ;  # ⴥ.𑄳43
+�٣。Ⴒᡇࣲ�; 0٣.Ⴒᡇࣲ�; [B1, B5, B6, P1, V6]; xn--0-fqc.xn--10b180bnwgfy0z; ; ;  # 0٣.Ⴒᡇࣲ�
+0٣。Ⴒᡇࣲ�; 0٣.Ⴒᡇࣲ�; [B1, B5, B6, P1, V6]; xn--0-fqc.xn--10b180bnwgfy0z; ; ;  # 0٣.Ⴒᡇࣲ�
+0٣。ⴒᡇࣲ�; 0٣.ⴒᡇࣲ�; [B1, B5, B6]; xn--0-fqc.xn--10b369eivp359r; ; ;  # 0٣.ⴒᡇࣲ�
+xn--0-fqc.xn--10b369eivp359r; 0٣.ⴒᡇࣲ�; [B1, B5, B6]; xn--0-fqc.xn--10b369eivp359r; ; ;  # 0٣.ⴒᡇࣲ�
+xn--0-fqc.xn--10b180bnwgfy0z; 0٣.Ⴒᡇࣲ�; [B1, B5, B6, V6]; xn--0-fqc.xn--10b180bnwgfy0z; ; ;  # 0٣.Ⴒᡇࣲ�
+�٣。ⴒᡇࣲ�; 0٣.ⴒᡇࣲ�; [B1, B5, B6]; xn--0-fqc.xn--10b369eivp359r; ; ;  # 0٣.ⴒᡇࣲ�
+񗪨󠄉ﾠྷ.񸞰꥓; 񗪨ﾠྷ.񸞰꥓; [P1, V6]; xn--kgd7493jee34a.xn--3j9au7544a; ; ;  # ྷ.꥓
+񗪨󠄉ᅠྷ.񸞰꥓; 񗪨ᅠྷ.񸞰꥓; [P1, V6]; xn--kgd36f9z57y.xn--3j9au7544a; ; ;  # ྷ.꥓
+xn--kgd36f9z57y.xn--3j9au7544a; 񗪨ᅠྷ.񸞰꥓; [V6]; xn--kgd36f9z57y.xn--3j9au7544a; ; ;  # ྷ.꥓
+xn--kgd7493jee34a.xn--3j9au7544a; 񗪨ﾠྷ.񸞰꥓; [V6]; xn--kgd7493jee34a.xn--3j9au7544a; ; ;  # ྷ.꥓
+ؘ.۳‌꥓; ; [C1, V5]; xn--6fb.xn--gmb469jjf1h; ; xn--6fb.xn--gmb0524f; [V5] # ؘ.۳꥓
+xn--6fb.xn--gmb0524f; ؘ.۳꥓; [V5]; xn--6fb.xn--gmb0524f; ; ;  # ؘ.۳꥓
+xn--6fb.xn--gmb469jjf1h; ؘ.۳‌꥓; [C1, V5]; xn--6fb.xn--gmb469jjf1h; ; ;  # ؘ.۳꥓
+ᡌ．︒ᢑ; ᡌ.︒ᢑ; [P1, V6]; xn--c8e.xn--bbf9168i; ; ;  # ᡌ.︒ᢑ
+ᡌ.。ᢑ; ᡌ..ᢑ; [X4_2]; xn--c8e..xn--bbf; [A4_2]; ;  # ᡌ..ᢑ
+xn--c8e..xn--bbf; ᡌ..ᢑ; [X4_2]; xn--c8e..xn--bbf; [A4_2]; ;  # ᡌ..ᢑ
+xn--c8e.xn--bbf9168i; ᡌ.︒ᢑ; [V6]; xn--c8e.xn--bbf9168i; ; ;  # ᡌ.︒ᢑ
+𑋪�｡𞽧; 𑋪�.𞽧; [B1, B3, B6, P1, V5, V6]; xn--xld7443k.xn--4o7h; ; ;  # 𑋪�.
+𑋪�。𞽧; 𑋪�.𞽧; [B1, B3, B6, P1, V5, V6]; xn--xld7443k.xn--4o7h; ; ;  # 𑋪�.
+xn--xld7443k.xn--4o7h; 𑋪�.𞽧; [B1, B3, B6, V5, V6]; xn--xld7443k.xn--4o7h; ; ;  # 𑋪�.
+�。ᠢ򓘆; �.ᠢ򓘆; [P1, V6]; xn--hd7h.xn--46e66060j; ; ;  # .ᠢ
+xn--hd7h.xn--46e66060j; �.ᠢ򓘆; [V6]; xn--hd7h.xn--46e66060j; ; ;  # .ᠢ
+𑄳㴼．‌�⃫񫺦; 𑄳㴼.‌�⃫񫺦; [B1, C1, P1, V5, V6]; xn--iym9428c.xn--0ug46a7218cllv0c; ; xn--iym9428c.xn--e1g3464g08p3b; [B1, P1, V5, V6] # 𑄳㴼.�⃫
+𑄳㴼.‌�⃫񫺦; ; [B1, C1, P1, V5, V6]; xn--iym9428c.xn--0ug46a7218cllv0c; ; xn--iym9428c.xn--e1g3464g08p3b; [B1, P1, V5, V6] # 𑄳㴼.�⃫
+xn--iym9428c.xn--e1g3464g08p3b; 𑄳㴼.�⃫񫺦; [B1, V5, V6]; xn--iym9428c.xn--e1g3464g08p3b; ; ;  # 𑄳㴼.�⃫
+xn--iym9428c.xn--0ug46a7218cllv0c; 𑄳㴼.‌�⃫񫺦; [B1, C1, V5, V6]; xn--iym9428c.xn--0ug46a7218cllv0c; ; ;  # 𑄳㴼.�⃫
+񠻟�𑈯｡�; 񠻟�𑈯.�; [B1, B3, B5, B6, P1, V5, V6]; xn--ro0dw7dey96m.xn--eta; ; ;  # �𑈯.�
+񠻟�𑈯。�; 񠻟�𑈯.�; [B1, B3, B5, B6, P1, V5, V6]; xn--ro0dw7dey96m.xn--eta; ; ;  # �𑈯.�
+xn--ro0dw7dey96m.xn--eta; 񠻟�𑈯.�; [B1, B3, B5, B6, V5, V6]; xn--ro0dw7dey96m.xn--eta; ; ;  # �𑈯.�
+ᢊ뾜󠱴𑚶。��; ᢊ뾜󠱴𑚶.��; [P1, V6]; xn--39e4566fjv8bwmt6n.xn--myb6415k; ; ;  # ᢊ뾜𑚶.�
+ᢊ뾜󠱴𑚶。��; ᢊ뾜󠱴𑚶.��; [P1, V6]; xn--39e4566fjv8bwmt6n.xn--myb6415k; ; ;  # ᢊ뾜𑚶.�
+xn--39e4566fjv8bwmt6n.xn--myb6415k; ᢊ뾜󠱴𑚶.��; [V6]; xn--39e4566fjv8bwmt6n.xn--myb6415k; ; ;  # ᢊ뾜𑚶.�
+�≠｡�󠧠‌; �≠.�󠧠‌; [B1, C1, P1, V6]; xn--1ch6704g.xn--0ug3840g51u4g; ; xn--1ch6704g.xn--m97cw2999c; [B1, P1, V6] # �≠.�
+�≠｡�󠧠‌; �≠.�󠧠‌; [B1, C1, P1, V6]; xn--1ch6704g.xn--0ug3840g51u4g; ; xn--1ch6704g.xn--m97cw2999c; [B1, P1, V6] # �≠.�
+�≠。�󠧠‌; �≠.�󠧠‌; [B1, C1, P1, V6]; xn--1ch6704g.xn--0ug3840g51u4g; ; xn--1ch6704g.xn--m97cw2999c; [B1, P1, V6] # �≠.�
+�≠。�󠧠‌; �≠.�󠧠‌; [B1, C1, P1, V6]; xn--1ch6704g.xn--0ug3840g51u4g; ; xn--1ch6704g.xn--m97cw2999c; [B1, P1, V6] # �≠.�
+xn--1ch6704g.xn--m97cw2999c; �≠.�󠧠; [B1, V6]; xn--1ch6704g.xn--m97cw2999c; ; ;  # �≠.�
+xn--1ch6704g.xn--0ug3840g51u4g; �≠.�󠧠‌; [B1, C1, V6]; xn--1ch6704g.xn--0ug3840g51u4g; ; ;  # �≠.�
+ᅟ񙯠�．�꥓�; ᅟ񙯠�.�꥓�; [B1, C2, P1, V6]; xn--n3b542bb085j.xn--1ug6815co9wc; ; xn--n3b542bb085j.xn--3j9al95p; [B5, B6, P1, V5, V6] # �.꥓
+ᅟ񙯠�.�꥓�; ; [B1, C2, P1, V6]; xn--n3b542bb085j.xn--1ug6815co9wc; ; xn--n3b542bb085j.xn--3j9al95p; [B5, B6, P1, V5, V6] # �.꥓
+xn--n3b542bb085j.xn--3j9al95p; ᅟ񙯠�.꥓�; [B5, B6, V5, V6]; xn--n3b542bb085j.xn--3j9al95p; ; ;  # �.꥓
+xn--n3b542bb085j.xn--1ug6815co9wc; ᅟ񙯠�.�꥓�; [B1, C2, V6]; xn--n3b542bb085j.xn--1ug6815co9wc; ; ;  # �.꥓
+򌋔󠆎󠆗𑲕。≮; 򌋔𑲕.≮; [P1, V6]; xn--4m3dv4354a.xn--gdh; ; ;  # 𑲕.≮
+򌋔󠆎󠆗𑲕。≮; 򌋔𑲕.≮; [P1, V6]; xn--4m3dv4354a.xn--gdh; ; ;  # 𑲕.≮
+xn--4m3dv4354a.xn--gdh; 򌋔𑲕.≮; [V6]; xn--4m3dv4354a.xn--gdh; ; ;  # 𑲕.≮
+󠆦.ࣣ暀≠; .ࣣ暀≠; [P1, V5, V6, X4_2]; .xn--m0b461k3g2c; [P1, V5, V6, A4_2]; ;  # .ࣣ暀≠
+󠆦.ࣣ暀≠; .ࣣ暀≠; [P1, V5, V6, X4_2]; .xn--m0b461k3g2c; [P1, V5, V6, A4_2]; ;  # .ࣣ暀≠
+.xn--m0b461k3g2c; .ࣣ暀≠; [V5, V6, X4_2]; .xn--m0b461k3g2c; [V5, V6, A4_2]; ;  # .ࣣ暀≠
+�꯭｡ﴰ򜖅ᷰ; �꯭.شم򜖅ᷰ; [B2, B3, P1, V6]; xn--429ak76o.xn--zgb8a701kox37t; ; ;  # �꯭.شمᷰ
+�꯭。شم򜖅ᷰ; �꯭.شم򜖅ᷰ; [B2, B3, P1, V6]; xn--429ak76o.xn--zgb8a701kox37t; ; ;  # �꯭.شمᷰ
+xn--429ak76o.xn--zgb8a701kox37t; �꯭.شم򜖅ᷰ; [B2, B3, V6]; xn--429ak76o.xn--zgb8a701kox37t; ; ;  # �꯭.شمᷰ
+��⒈｡Ⴌ𞱓; ��⒈.Ⴌ𞱓; [B1, B5, B6, C2, P1, V5, V6]; xn--1ug68oq348b.xn--knd8464v; ; xn--tshz828m.xn--knd8464v; [B1, B5, B6, P1, V5, V6] # �⒈.Ⴌ
+��1.。Ⴌ𞱓; ��1..Ⴌ𞱓; [B1, B5, B6, C2, P1, V5, V6, X4_2]; xn--1-tgn9827q..xn--knd8464v; [B1, B5, B6, C2, P1, V5, V6, A4_2]; xn--1-px8q..xn--knd8464v; [B1, B5, B6, P1, V5, V6, A4_2] # �1..Ⴌ
+��1.。ⴌ𞱓; ��1..ⴌ𞱓; [B1, B5, B6, C2, P1, V5, V6, X4_2]; xn--1-tgn9827q..xn--3kj4524l; [B1, B5, B6, C2, P1, V5, V6, A4_2]; xn--1-px8q..xn--3kj4524l; [B1, B5, B6, P1, V5, V6, A4_2] # �1..ⴌ
+xn--1-px8q..xn--3kj4524l; �1..ⴌ𞱓; [B1, B5, B6, V5, V6, X4_2]; xn--1-px8q..xn--3kj4524l; [B1, B5, B6, V5, V6, A4_2]; ;  # �1..ⴌ
+xn--1-tgn9827q..xn--3kj4524l; ��1..ⴌ𞱓; [B1, B5, B6, C2, V5, V6, X4_2]; xn--1-tgn9827q..xn--3kj4524l; [B1, B5, B6, C2, V5, V6, A4_2]; ;  # �1..ⴌ
+xn--1-px8q..xn--knd8464v; �1..Ⴌ𞱓; [B1, B5, B6, V5, V6, X4_2]; xn--1-px8q..xn--knd8464v; [B1, B5, B6, V5, V6, A4_2]; ;  # �1..Ⴌ
+xn--1-tgn9827q..xn--knd8464v; ��1..Ⴌ𞱓; [B1, B5, B6, C2, V5, V6, X4_2]; xn--1-tgn9827q..xn--knd8464v; [B1, B5, B6, C2, V5, V6, A4_2]; ;  # �1..Ⴌ
+��⒈｡ⴌ𞱓; ��⒈.ⴌ𞱓; [B1, B5, B6, C2, P1, V5, V6]; xn--1ug68oq348b.xn--3kj4524l; ; xn--tshz828m.xn--3kj4524l; [B1, B5, B6, P1, V5, V6] # �⒈.ⴌ
+xn--tshz828m.xn--3kj4524l; �⒈.ⴌ𞱓; [B1, B5, B6, V5, V6]; xn--tshz828m.xn--3kj4524l; ; ;  # �⒈.ⴌ
+xn--1ug68oq348b.xn--3kj4524l; ��⒈.ⴌ𞱓; [B1, B5, B6, C2, V5, V6]; xn--1ug68oq348b.xn--3kj4524l; ; ;  # �⒈.ⴌ
+xn--tshz828m.xn--knd8464v; �⒈.Ⴌ𞱓; [B1, B5, B6, V5, V6]; xn--tshz828m.xn--knd8464v; ; ;  # �⒈.Ⴌ
+xn--1ug68oq348b.xn--knd8464v; ��⒈.Ⴌ𞱓; [B1, B5, B6, C2, V5, V6]; xn--1ug68oq348b.xn--knd8464v; ; ;  # �⒈.Ⴌ
+󠣙�𱫘𞤸.ς񵯞􈰔; ; [B1, P1, V6]; xn--ybc0236vjvxgt5q0g.xn--3xa03737giye6b; ; xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b;  # �𞤸.ς
+󠣙�𱫘𞤖.Σ񵯞􈰔; 󠣙�𱫘𞤸.σ񵯞􈰔; [B1, P1, V6]; xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b; ; ;  # �𞤸.σ
+󠣙�𱫘𞤸.σ񵯞􈰔; ; [B1, P1, V6]; xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b; ; ;  # �𞤸.σ
+󠣙�𱫘𞤖.σ񵯞􈰔; 󠣙�𱫘𞤸.σ񵯞􈰔; [B1, P1, V6]; xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b; ; ;  # �𞤸.σ
+xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b; 󠣙�𱫘𞤸.σ񵯞􈰔; [B1, V6]; xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b; ; ;  # �𞤸.σ
+󠣙�𱫘𞤖.ς񵯞􈰔; 󠣙�𱫘𞤸.ς񵯞􈰔; [B1, P1, V6]; xn--ybc0236vjvxgt5q0g.xn--3xa03737giye6b; ; xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b;  # �𞤸.ς
+xn--ybc0236vjvxgt5q0g.xn--3xa03737giye6b; 󠣙�𱫘𞤸.ς񵯞􈰔; [B1, V6]; xn--ybc0236vjvxgt5q0g.xn--3xa03737giye6b; ; ;  # �𞤸.ς
+󠣙�𱫘𞤸.Σ񵯞􈰔; 󠣙�𱫘𞤸.σ񵯞􈰔; [B1, P1, V6]; xn--ybc0236vjvxgt5q0g.xn--4xa82737giye6b; ; ;  # �𞤸.σ
+ߓ。‌�򞭱; ߓ.‌�򞭱; [B1, C1, P1, V6]; xn--usb.xn--0ug9553gm3v5d; ; xn--usb.xn--pw9ci1099a; [B2, B3, P1, V6] # ߓ.�
+xn--usb.xn--pw9ci1099a; ߓ.�򞭱; [B2, B3, V6]; xn--usb.xn--pw9ci1099a; ; ;  # ߓ.�
+xn--usb.xn--0ug9553gm3v5d; ߓ.‌�򞭱; [B1, C1, V6]; xn--usb.xn--0ug9553gm3v5d; ; ;  # ߓ.�
+ᰮ�.֦ꡟ𞤕󠆖; ᰮ�.֦ꡟ𞤷; [B1, B3, B6, V5]; xn--q1f4493q.xn--xcb8244fifvj; ; ;  # ᰮ�.֦ꡟ𞤷
+ᰮ�.֦ꡟ𞤷󠆖; ᰮ�.֦ꡟ𞤷; [B1, B3, B6, V5]; xn--q1f4493q.xn--xcb8244fifvj; ; ;  # ᰮ�.֦ꡟ𞤷
+xn--q1f4493q.xn--xcb8244fifvj; ᰮ�.֦ꡟ𞤷; [B1, B3, B6, V5]; xn--q1f4493q.xn--xcb8244fifvj; ; ;  # ᰮ�.֦ꡟ𞤷
+䂹󾖅�．�; 䂹󾖅�.�; [C2, P1, V6]; xn--0on3543c5981i.xn--1ug; ; xn--0on3543c5981i.; [P1, V6] # 䂹�.
+䂹󾖅�.�; ; [C2, P1, V6]; xn--0on3543c5981i.xn--1ug; ; xn--0on3543c5981i.; [P1, V6] # 䂹�.
+xn--0on3543c5981i.; 䂹󾖅�.; [V6]; xn--0on3543c5981i.; ; ;  # 䂹�.
+xn--0on3543c5981i.xn--1ug; 䂹󾖅�.�; [C2, V6]; xn--0on3543c5981i.xn--1ug; ; ;  # 䂹�.
+꧀‌�‌｡ݧ🄉; ꧀‌�‌.ݧ🄉; [B5, B6, C1, P1, V5, V6]; xn--0uga8686hdgvd.xn--rpb6081w; ; xn--7m9an32q.xn--rpb6081w; [B5, B6, P1, V5, V6] # ꧀�.ݧ🄉
+꧀‌�‌。ݧ8,; ꧀‌�‌.ݧ8,; [B3, B5, B6, C1, P1, V5, V6]; xn--0uga8686hdgvd.xn--8,-qle; ; xn--7m9an32q.xn--8,-qle; [B3, B5, B6, P1, V5, V6] # ꧀�.ݧ8,
+xn--7m9an32q.xn--8,-qle; ꧀�.ݧ8,; [B3, B5, B6, P1, V5, V6]; xn--7m9an32q.xn--8,-qle; ; ;  # ꧀�.ݧ8,
+xn--0uga8686hdgvd.xn--8,-qle; ꧀‌�‌.ݧ8,; [B3, B5, B6, C1, P1, V5, V6]; xn--0uga8686hdgvd.xn--8,-qle; ; ;  # ꧀�.ݧ8,
+xn--7m9an32q.xn--rpb6081w; ꧀�.ݧ🄉; [B5, B6, V5, V6]; xn--7m9an32q.xn--rpb6081w; ; ;  # ꧀�.ݧ🄉
+xn--0uga8686hdgvd.xn--rpb6081w; ꧀‌�‌.ݧ🄉; [B5, B6, C1, V5, V6]; xn--0uga8686hdgvd.xn--rpb6081w; ; ;  # ꧀�.ݧ🄉
+︒｡Ⴃ≯; ︒.Ⴃ≯; [P1, V6]; xn--y86c.xn--bnd622g; ; ;  # ︒.Ⴃ≯
+︒｡Ⴃ≯; ︒.Ⴃ≯; [P1, V6]; xn--y86c.xn--bnd622g; ; ;  # ︒.Ⴃ≯
+。。Ⴃ≯; ..Ⴃ≯; [P1, V6, X4_2]; ..xn--bnd622g; [P1, V6, A4_2]; ;  # ..Ⴃ≯
+。。Ⴃ≯; ..Ⴃ≯; [P1, V6, X4_2]; ..xn--bnd622g; [P1, V6, A4_2]; ;  # ..Ⴃ≯
+。。ⴃ≯; ..ⴃ≯; [P1, V6, X4_2]; ..xn--hdh782b; [P1, V6, A4_2]; ;  # ..ⴃ≯
+。。ⴃ≯; ..ⴃ≯; [P1, V6, X4_2]; ..xn--hdh782b; [P1, V6, A4_2]; ;  # ..ⴃ≯
+..xn--hdh782b; ..ⴃ≯; [V6, X4_2]; ..xn--hdh782b; [V6, A4_2]; ;  # ..ⴃ≯
+..xn--bnd622g; ..Ⴃ≯; [V6, X4_2]; ..xn--bnd622g; [V6, A4_2]; ;  # ..Ⴃ≯
+︒｡ⴃ≯; ︒.ⴃ≯; [P1, V6]; xn--y86c.xn--hdh782b; ; ;  # ︒.ⴃ≯
+︒｡ⴃ≯; ︒.ⴃ≯; [P1, V6]; xn--y86c.xn--hdh782b; ; ;  # ︒.ⴃ≯
+xn--y86c.xn--hdh782b; ︒.ⴃ≯; [V6]; xn--y86c.xn--hdh782b; ; ;  # ︒.ⴃ≯
+xn--y86c.xn--bnd622g; ︒.Ⴃ≯; [V6]; xn--y86c.xn--bnd622g; ; ;  # ︒.Ⴃ≯
+�｡󠢼�; �.󠢼�; [B1, C2, P1, V6]; xn--mo0d.xn--1ug18431l; ; xn--mo0d.xn--wy46e; [B1, P1, V6] # �.
+�。󠢼�; �.󠢼�; [B1, C2, P1, V6]; xn--mo0d.xn--1ug18431l; ; xn--mo0d.xn--wy46e; [B1, P1, V6] # �.
+xn--mo0d.xn--wy46e; �.󠢼; [B1, V6]; xn--mo0d.xn--wy46e; ; ;  # �.
+xn--mo0d.xn--1ug18431l; �.󠢼�; [B1, C2, V6]; xn--mo0d.xn--1ug18431l; ; ;  # �.
+Ⴞ�｡︒ݽ�Ⴏ; Ⴞ�.︒ݽ�Ⴏ; [B1, B5, B6, C2, P1, V6]; xn--2nd0990k.xn--eqb228bgzmvp0t; ; xn--2nd0990k.xn--eqb228b583r; [B1, B5, B6, P1, V6] # Ⴞ�.︒ݽႯ
+Ⴞ�。。ݽ�Ⴏ; Ⴞ�..ݽ�Ⴏ; [B2, B3, B5, B6, C2, P1, V6, X4_2]; xn--2nd0990k..xn--eqb228bgzm; [B2, B3, B5, B6, C2, P1, V6, A4_2]; xn--2nd0990k..xn--eqb228b; [B2, B3, B5, B6, P1, V6, A4_2] # Ⴞ�..ݽႯ
+ⴞ�。。ݽ��; ⴞ�..ݽ��; [B2, B3, B5, B6, C2, X4_2]; xn--mlju223e..xn--eqb096jpgj; [B2, B3, B5, B6, C2, A4_2]; xn--mlju223e..xn--eqb053q; [B2, B3, B5, B6, A4_2] # ⴞ�..ݽ�
+Ⴞ�。。ݽ��; Ⴞ�..ݽ��; [B2, B3, B5, B6, C2, P1, V6, X4_2]; xn--2nd0990k..xn--eqb096jpgj; [B2, B3, B5, B6, C2, P1, V6, A4_2]; xn--2nd0990k..xn--eqb053q; [B2, B3, B5, B6, P1, V6, A4_2] # Ⴞ�..ݽ�
+xn--2nd0990k..xn--eqb053q; Ⴞ�..ݽ�; [B2, B3, B5, B6, V6, X4_2]; xn--2nd0990k..xn--eqb053q; [B2, B3, B5, B6, V6, A4_2]; ;  # Ⴞ�..ݽ�
+xn--2nd0990k..xn--eqb096jpgj; Ⴞ�..ݽ��; [B2, B3, B5, B6, C2, V6, X4_2]; xn--2nd0990k..xn--eqb096jpgj; [B2, B3, B5, B6, C2, V6, A4_2]; ;  # Ⴞ�..ݽ�
+xn--mlju223e..xn--eqb053q; ⴞ�..ݽ�; [B2, B3, B5, B6, X4_2]; xn--mlju223e..xn--eqb053q; [B2, B3, B5, B6, A4_2]; ;  # ⴞ�..ݽ�
+xn--mlju223e..xn--eqb096jpgj; ⴞ�..ݽ��; [B2, B3, B5, B6, C2, X4_2]; xn--mlju223e..xn--eqb096jpgj; [B2, B3, B5, B6, C2, A4_2]; ;  # ⴞ�..ݽ�
+xn--2nd0990k..xn--eqb228b; Ⴞ�..ݽႯ; [B2, B3, B5, B6, V6, X4_2]; xn--2nd0990k..xn--eqb228b; [B2, B3, B5, B6, V6, A4_2]; ;  # Ⴞ�..ݽႯ
+xn--2nd0990k..xn--eqb228bgzm; Ⴞ�..ݽ�Ⴏ; [B2, B3, B5, B6, C2, V6, X4_2]; xn--2nd0990k..xn--eqb228bgzm; [B2, B3, B5, B6, C2, V6, A4_2]; ;  # Ⴞ�..ݽႯ
+ⴞ�｡︒ݽ��; ⴞ�.︒ݽ��; [B1, B5, B6, C2, P1, V6]; xn--mlju223e.xn--eqb096jpgj9y7r; ; xn--mlju223e.xn--eqb053qjk7l; [B1, B5, B6, P1, V6] # ⴞ�.︒ݽ�
+Ⴞ�｡︒ݽ��; Ⴞ�.︒ݽ��; [B1, B5, B6, C2, P1, V6]; xn--2nd0990k.xn--eqb096jpgj9y7r; ; xn--2nd0990k.xn--eqb053qjk7l; [B1, B5, B6, P1, V6] # Ⴞ�.︒ݽ�
+xn--2nd0990k.xn--eqb053qjk7l; Ⴞ�.︒ݽ�; [B1, B5, B6, V6]; xn--2nd0990k.xn--eqb053qjk7l; ; ;  # Ⴞ�.︒ݽ�
+xn--2nd0990k.xn--eqb096jpgj9y7r; Ⴞ�.︒ݽ��; [B1, B5, B6, C2, V6]; xn--2nd0990k.xn--eqb096jpgj9y7r; ; ;  # Ⴞ�.︒ݽ�
+xn--mlju223e.xn--eqb053qjk7l; ⴞ�.︒ݽ�; [B1, B5, B6, V6]; xn--mlju223e.xn--eqb053qjk7l; ; ;  # ⴞ�.︒ݽ�
+xn--mlju223e.xn--eqb096jpgj9y7r; ⴞ�.︒ݽ��; [B1, B5, B6, C2, V6]; xn--mlju223e.xn--eqb096jpgj9y7r; ; ;  # ⴞ�.︒ݽ�
+xn--2nd0990k.xn--eqb228b583r; Ⴞ�.︒ݽႯ; [B1, B5, B6, V6]; xn--2nd0990k.xn--eqb228b583r; ; ;  # Ⴞ�.︒ݽႯ
+xn--2nd0990k.xn--eqb228bgzmvp0t; Ⴞ�.︒ݽ�Ⴏ; [B1, B5, B6, C2, V6]; xn--2nd0990k.xn--eqb228bgzmvp0t; ; ;  # Ⴞ�.︒ݽႯ
+‌Ⴆ�。-⃒-ߑ; ‌Ⴆ3.-⃒-ߑ; [B1, C1, P1, V3, V6]; xn--3-i0g939i.xn-----vue617w; ; xn--3-i0g.xn-----vue617w; [B1, P1, V3, V6] # Ⴆ3.-⃒-ߑ
+‌Ⴆ3。-⃒-ߑ; ‌Ⴆ3.-⃒-ߑ; [B1, C1, P1, V3, V6]; xn--3-i0g939i.xn-----vue617w; ; xn--3-i0g.xn-----vue617w; [B1, P1, V3, V6] # Ⴆ3.-⃒-ߑ
+‌ⴆ3。-⃒-ߑ; ‌ⴆ3.-⃒-ߑ; [B1, C1, V3]; xn--3-rgnv99c.xn-----vue617w; ; xn--3-lvs.xn-----vue617w; [B1, V3] # ⴆ3.-⃒-ߑ
+xn--3-lvs.xn-----vue617w; ⴆ3.-⃒-ߑ; [B1, V3]; xn--3-lvs.xn-----vue617w; ; ;  # ⴆ3.-⃒-ߑ
+xn--3-rgnv99c.xn-----vue617w; ‌ⴆ3.-⃒-ߑ; [B1, C1, V3]; xn--3-rgnv99c.xn-----vue617w; ; ;  # ⴆ3.-⃒-ߑ
+xn--3-i0g.xn-----vue617w; Ⴆ3.-⃒-ߑ; [B1, V3, V6]; xn--3-i0g.xn-----vue617w; ; ;  # Ⴆ3.-⃒-ߑ
+xn--3-i0g939i.xn-----vue617w; ‌Ⴆ3.-⃒-ߑ; [B1, C1, V3, V6]; xn--3-i0g939i.xn-----vue617w; ; ;  # Ⴆ3.-⃒-ߑ
+‌ⴆ�。-⃒-ߑ; ‌ⴆ3.-⃒-ߑ; [B1, C1, V3]; xn--3-rgnv99c.xn-----vue617w; ; xn--3-lvs.xn-----vue617w; [B1, V3] # ⴆ3.-⃒-ߑ
+箃�-�｡≠-🤖; 箃�-�.≠-🤖; [P1, V6]; xn----11g3013fy8x5m.xn----tfot873s; ; ;  # 箃�-.≠-🤖
+箃�-�｡≠-🤖; 箃�-�.≠-🤖; [P1, V6]; xn----11g3013fy8x5m.xn----tfot873s; ; ;  # 箃�-.≠-🤖
+箃�-�。≠-🤖; 箃�-�.≠-🤖; [P1, V6]; xn----11g3013fy8x5m.xn----tfot873s; ; ;  # 箃�-.≠-🤖
+箃�-�。≠-🤖; 箃�-�.≠-🤖; [P1, V6]; xn----11g3013fy8x5m.xn----tfot873s; ; ;  # 箃�-.≠-🤖
+箃ⴡ-�。≠-🤖; 箃ⴡ-�.≠-🤖; [P1, V6]; xn----4wsr321ay823p.xn----tfot873s; ; ;  # 箃ⴡ-.≠-🤖
+箃ⴡ-�。≠-🤖; 箃ⴡ-�.≠-🤖; [P1, V6]; xn----4wsr321ay823p.xn----tfot873s; ; ;  # 箃ⴡ-.≠-🤖
+xn----4wsr321ay823p.xn----tfot873s; 箃ⴡ-�.≠-🤖; [V6]; xn----4wsr321ay823p.xn----tfot873s; ; ;  # 箃ⴡ-.≠-🤖
+xn----11g3013fy8x5m.xn----tfot873s; 箃�-�.≠-🤖; [V6]; xn----11g3013fy8x5m.xn----tfot873s; ; ;  # 箃�-.≠-🤖
+箃ⴡ-�｡≠-🤖; 箃ⴡ-�.≠-🤖; [P1, V6]; xn----4wsr321ay823p.xn----tfot873s; ; ;  # 箃ⴡ-.≠-🤖
+箃ⴡ-�｡≠-🤖; 箃ⴡ-�.≠-🤖; [P1, V6]; xn----4wsr321ay823p.xn----tfot873s; ; ;  # 箃ⴡ-.≠-🤖
+ߥ.ڵ; ; ; xn--dtb.xn--okb; ; ;  # ߥ.ڵ
+xn--dtb.xn--okb; ߥ.ڵ; ; xn--dtb.xn--okb; ; ;  # ߥ.ڵ
+‌�.𞤿; ; [B1, C1, C2]; xn--0ugc.xn--3e6h; ; .xn--3e6h; [A4_2] # .𞤿
+‌�.�; ‌�.𞤿; [B1, C1, C2]; xn--0ugc.xn--3e6h; ; .xn--3e6h; [A4_2] # .𞤿
+.xn--3e6h; .𞤿; [X4_2]; .xn--3e6h; [A4_2]; ;  # .𞤿
+xn--0ugc.xn--3e6h; ‌�.𞤿; [B1, C1, C2]; xn--0ugc.xn--3e6h; ; ;  # .𞤿
+xn--3e6h; 𞤿; ; xn--3e6h; ; ;  # 𞤿
+𞤿; ; ; xn--3e6h; ; ;  # 𞤿
+�; 𞤿; ; xn--3e6h; ; ;  # 𞤿
+🜑�ع.ς�蜹; ; [B1]; xn--4gb3736kk4zf.xn--3xa4248dy27d; ; xn--4gb3736kk4zf.xn--4xa2248dy27d;  # 🜑�ع.ς�蜹
+🜑�ع.Σ�蜹; 🜑�ع.σ�蜹; [B1]; xn--4gb3736kk4zf.xn--4xa2248dy27d; ; ;  # 🜑�ع.σ�蜹
+🜑�ع.σ�蜹; ; [B1]; xn--4gb3736kk4zf.xn--4xa2248dy27d; ; ;  # 🜑�ع.σ�蜹
+xn--4gb3736kk4zf.xn--4xa2248dy27d; 🜑�ع.σ�蜹; [B1]; xn--4gb3736kk4zf.xn--4xa2248dy27d; ; ;  # 🜑�ع.σ�蜹
+xn--4gb3736kk4zf.xn--3xa4248dy27d; 🜑�ع.ς�蜹; [B1]; xn--4gb3736kk4zf.xn--3xa4248dy27d; ; ;  # 🜑�ع.ς�蜹
+�ス􆟤٩．󚃟; �ス􆟤٩.󚃟; [B5, B6, P1, V6]; xn--iib777sp230oo708a.xn--7824e; ; ;  # ス٩.
+�ス􆟤٩.󚃟; ; [B5, B6, P1, V6]; xn--iib777sp230oo708a.xn--7824e; ; ;  # ス٩.
+xn--iib777sp230oo708a.xn--7824e; �ス􆟤٩.󚃟; [B5, B6, V6]; xn--iib777sp230oo708a.xn--7824e; ; ;  # ス٩.
+��．֚?ۂ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+��．֚?�ٔ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+��.֚?ۂ; ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+��.֚?�ٔ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+xn--8c3hu7971a.֚?ۂ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+xn--8c3hu7971a.֚?�ٔ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+XN--8C3HU7971A.֚?�ٔ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+XN--8C3HU7971A.֚?ۂ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+Xn--8c3hu7971a.֚?ۂ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+Xn--8c3hu7971a.֚?�ٔ; ��.֚?ۂ; [B1, P1, V5, V6]; xn--8c3hu7971a.֚?ۂ; [B1, P1, V5, V6, A3]; ;  # �.֚ۂ
+٠򪓵‌。ݗ; ٠򪓵‌.ݗ; [B1, C1, P1, V6]; xn--8hb852ke991q.xn--bpb; ; xn--8hb82030l.xn--bpb; [B1, P1, V6] # ٠.ݗ
+xn--8hb82030l.xn--bpb; ٠򪓵.ݗ; [B1, V6]; xn--8hb82030l.xn--bpb; ; ;  # ٠.ݗ
+xn--8hb852ke991q.xn--bpb; ٠򪓵‌.ݗ; [B1, C1, V6]; xn--8hb852ke991q.xn--bpb; ; ;  # ٠.ݗ
+်�‌。-‌; ်�‌.-‌; [C1, V3, V5]; xn--bkd412fca.xn----sgn; ; xn--bkd.-; [V3, V5] # ်.-
+xn--bkd.-; ်.-; [V3, V5]; xn--bkd.-; ; ;  # ်.-
+xn--bkd412fca.xn----sgn; ်�‌.-‌; [C1, V3, V5]; xn--bkd412fca.xn----sgn; ; ;  # ်.-
+︒｡᭄ᡉ; ︒.᭄ᡉ; [P1, V5, V6]; xn--y86c.xn--87e93m; ; ;  # ︒.᭄ᡉ
+。。᭄ᡉ; ..᭄ᡉ; [V5, X4_2]; ..xn--87e93m; [V5, A4_2]; ;  # ..᭄ᡉ
+..xn--87e93m; ..᭄ᡉ; [V5, X4_2]; ..xn--87e93m; [V5, A4_2]; ;  # ..᭄ᡉ
+xn--y86c.xn--87e93m; ︒.᭄ᡉ; [V5, V6]; xn--y86c.xn--87e93m; ; ;  # ︒.᭄ᡉ
+ݘß。ጫᢊݨ�; ݘß.ጫᢊݨ2; [B2, B3, B5]; xn--zca724a.xn--2-b5c641gfmf; ; xn--ss-gke.xn--2-b5c641gfmf;  # ݘß.ጫᢊݨ2
+ݘß。ጫᢊݨ2; ݘß.ጫᢊݨ2; [B2, B3, B5]; xn--zca724a.xn--2-b5c641gfmf; ; xn--ss-gke.xn--2-b5c641gfmf;  # ݘß.ጫᢊݨ2
+ݘSS。ጫᢊݨ2; ݘss.ጫᢊݨ2; [B2, B3, B5]; xn--ss-gke.xn--2-b5c641gfmf; ; ;  # ݘss.ጫᢊݨ2
+ݘss。ጫᢊݨ2; ݘss.ጫᢊݨ2; [B2, B3, B5]; xn--ss-gke.xn--2-b5c641gfmf; ; ;  # ݘss.ጫᢊݨ2
+xn--ss-gke.xn--2-b5c641gfmf; ݘss.ጫᢊݨ2; [B2, B3, B5]; xn--ss-gke.xn--2-b5c641gfmf; ; ;  # ݘss.ጫᢊݨ2
+xn--zca724a.xn--2-b5c641gfmf; ݘß.ጫᢊݨ2; [B2, B3, B5]; xn--zca724a.xn--2-b5c641gfmf; ; ;  # ݘß.ጫᢊݨ2
+ݘSS。ጫᢊݨ�; ݘss.ጫᢊݨ2; [B2, B3, B5]; xn--ss-gke.xn--2-b5c641gfmf; ; ;  # ݘss.ጫᢊݨ2
+ݘss。ጫᢊݨ�; ݘss.ጫᢊݨ2; [B2, B3, B5]; xn--ss-gke.xn--2-b5c641gfmf; ; ;  # ݘss.ጫᢊݨ2
+ݘSs。ጫᢊݨ2; ݘss.ጫᢊݨ2; [B2, B3, B5]; xn--ss-gke.xn--2-b5c641gfmf; ; ;  # ݘss.ጫᢊݨ2
+ݘSs。ጫᢊݨ�; ݘss.ጫᢊݨ2; [B2, B3, B5]; xn--ss-gke.xn--2-b5c641gfmf; ; ;  # ݘss.ጫᢊݨ2
+߃𞶇ᚲ.ं͓��; ߃𞶇ᚲ.ं͓2�; [B1, B2, B3, P1, V5, V6]; xn--esb067enh07a.xn--2-lgb874bjxa; ; ;  # ߃ᚲ.ं͓2�
+߃𞶇ᚲ.ं͓2�; ; [B1, B2, B3, P1, V5, V6]; xn--esb067enh07a.xn--2-lgb874bjxa; ; ;  # ߃ᚲ.ं͓2�
+xn--esb067enh07a.xn--2-lgb874bjxa; ߃𞶇ᚲ.ं͓2�; [B1, B2, B3, V5, V6]; xn--esb067enh07a.xn--2-lgb874bjxa; ; ;  # ߃ᚲ.ं͓2�
+-᮫︒�.񒶈񥹓; ; [C2, P1, V3, V6]; xn----qmlv7tw180a.xn--x50zy803a; ; xn----qml1407i.xn--x50zy803a; [P1, V3, V6] # -᮫︒.
+-᮫。�.񒶈񥹓; -᮫.�.񒶈񥹓; [C2, P1, V3, V6]; xn----qml.xn--1ug.xn--x50zy803a; ; xn----qml..xn--x50zy803a; [P1, V3, V6, A4_2] # -᮫..
+xn----qml..xn--x50zy803a; -᮫..񒶈񥹓; [V3, V6, X4_2]; xn----qml..xn--x50zy803a; [V3, V6, A4_2]; ;  # -᮫..
+xn----qml.xn--1ug.xn--x50zy803a; -᮫.�.񒶈񥹓; [C2, V3, V6]; xn----qml.xn--1ug.xn--x50zy803a; ; ;  # -᮫..
+xn----qml1407i.xn--x50zy803a; -᮫︒.񒶈񥹓; [V3, V6]; xn----qml1407i.xn--x50zy803a; ; ;  # -᮫︒.
+xn----qmlv7tw180a.xn--x50zy803a; -᮫︒�.񒶈񥹓; [C2, V3, V6]; xn----qmlv7tw180a.xn--x50zy803a; ; ;  # -᮫︒.
+󠦮.≯𞀆; ; [P1, V6]; xn--t546e.xn--hdh5166o; ; ;  # .≯𞀆
+󠦮.≯𞀆; 󠦮.≯𞀆; [P1, V6]; xn--t546e.xn--hdh5166o; ; ;  # .≯𞀆
+xn--t546e.xn--hdh5166o; 󠦮.≯𞀆; [V6]; xn--t546e.xn--hdh5166o; ; ;  # .≯𞀆
+-𑄳󠊗�。𞮱; -𑄳󠊗�.𞮱; [B1, P1, V3, V6]; xn----p26i72em2894c.xn--zw6h; ; ;  # -𑄳�.
+xn----p26i72em2894c.xn--zw6h; -𑄳󠊗�.𞮱; [B1, V3, V6]; xn----p26i72em2894c.xn--zw6h; ; ;  # -𑄳�.
+ڹ．ᡳᅟ; ڹ.ᡳᅟ; [P1, V6]; xn--skb.xn--osd737a; ; ;  # ڹ.ᡳ
+ڹ.ᡳᅟ; ; [P1, V6]; xn--skb.xn--osd737a; ; ;  # ڹ.ᡳ
+xn--skb.xn--osd737a; ڹ.ᡳᅟ; [V6]; xn--skb.xn--osd737a; ; ;  # ڹ.ᡳ
+㨛𘱎.︒��; 㨛𘱎.︒7�; [P1, V6]; xn--mbm8237g.xn--7-7hf1526p; ; ;  # 㨛𘱎.︒7�
+㨛𘱎.。7�; 㨛𘱎..7�; [P1, V6, X4_2]; xn--mbm8237g..xn--7-7hf; [P1, V6, A4_2]; ;  # 㨛𘱎..7�
+xn--mbm8237g..xn--7-7hf; 㨛𘱎..7�; [V6, X4_2]; xn--mbm8237g..xn--7-7hf; [V6, A4_2]; ;  # 㨛𘱎..7�
+xn--mbm8237g.xn--7-7hf1526p; 㨛𘱎.︒7�; [V6]; xn--mbm8237g.xn--7-7hf1526p; ; ;  # 㨛𘱎.︒7�
+�𻱧-｡��𞤣≮; �𻱧-.�𞤣≮; [B1, B3, P1, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+�𻱧-｡��𞤣≮; �𻱧-.�𞤣≮; [B1, B3, P1, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+�𻱧-。��𞤣≮; �𻱧-.�𞤣≮; [B1, B3, P1, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+�𻱧-。��𞤣≮; �𻱧-.�𞤣≮; [B1, B3, P1, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+�𻱧-。���≮; �𻱧-.�𞤣≮; [B1, B3, P1, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+�𻱧-。���≮; �𻱧-.�𞤣≮; [B1, B3, P1, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+xn----dxc06304e.xn--gdh5020pk5c; �𻱧-.�𞤣≮; [B1, B3, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+�𻱧-｡���≮; �𻱧-.�𞤣≮; [B1, B3, P1, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+�𻱧-｡���≮; �𻱧-.�𞤣≮; [B1, B3, P1, V3, V6]; xn----dxc06304e.xn--gdh5020pk5c; ; ;  # -.𞤣≮
+ß‌꫶ᢥ．⊶�Ⴖ; ß‌꫶ᢥ.⊶�Ⴖ; [C1, P1, V6]; xn--zca682johfi89m.xn--undv409k; ; xn--ss-4epx629f.xn--undv409k; [P1, V6] # ß꫶ᢥ.⊶�Ⴖ
+ß‌꫶ᢥ.⊶�Ⴖ; ; [C1, P1, V6]; xn--zca682johfi89m.xn--undv409k; ; xn--ss-4epx629f.xn--undv409k; [P1, V6] # ß꫶ᢥ.⊶�Ⴖ
+ß‌꫶ᢥ.⊶ⴡⴖ; ; [C1]; xn--zca682johfi89m.xn--ifh802b6a; ; xn--ss-4epx629f.xn--ifh802b6a; [] # ß꫶ᢥ.⊶ⴡⴖ
+SS‌꫶ᢥ.⊶�Ⴖ; ss‌꫶ᢥ.⊶�Ⴖ; [C1, P1, V6]; xn--ss-4ep585bkm5p.xn--undv409k; ; xn--ss-4epx629f.xn--undv409k; [P1, V6] # ss꫶ᢥ.⊶�Ⴖ
+ss‌꫶ᢥ.⊶ⴡⴖ; ; [C1]; xn--ss-4ep585bkm5p.xn--ifh802b6a; ; xn--ss-4epx629f.xn--ifh802b6a; [] # ss꫶ᢥ.⊶ⴡⴖ
+Ss‌꫶ᢥ.⊶�ⴖ; ss‌꫶ᢥ.⊶�ⴖ; [C1, P1, V6]; xn--ss-4ep585bkm5p.xn--5nd703gyrh; ; xn--ss-4epx629f.xn--5nd703gyrh; [P1, V6] # ss꫶ᢥ.⊶�ⴖ
+xn--ss-4epx629f.xn--5nd703gyrh; ss꫶ᢥ.⊶�ⴖ; [V6]; xn--ss-4epx629f.xn--5nd703gyrh; ; ;  # ss꫶ᢥ.⊶�ⴖ
+xn--ss-4ep585bkm5p.xn--5nd703gyrh; ss‌꫶ᢥ.⊶�ⴖ; [C1, V6]; xn--ss-4ep585bkm5p.xn--5nd703gyrh; ; ;  # ss꫶ᢥ.⊶�ⴖ
+xn--ss-4epx629f.xn--ifh802b6a; ss꫶ᢥ.⊶ⴡⴖ; ; xn--ss-4epx629f.xn--ifh802b6a; ; ;  # ss꫶ᢥ.⊶ⴡⴖ
+ss꫶ᢥ.⊶ⴡⴖ; ; ; xn--ss-4epx629f.xn--ifh802b6a; ; ;  # ss꫶ᢥ.⊶ⴡⴖ
+SS꫶ᢥ.⊶�Ⴖ; ss꫶ᢥ.⊶�Ⴖ; [P1, V6]; xn--ss-4epx629f.xn--undv409k; ; ;  # ss꫶ᢥ.⊶�Ⴖ
+Ss꫶ᢥ.⊶�ⴖ; ss꫶ᢥ.⊶�ⴖ; [P1, V6]; xn--ss-4epx629f.xn--5nd703gyrh; ; ;  # ss꫶ᢥ.⊶�ⴖ
+xn--ss-4epx629f.xn--undv409k; ss꫶ᢥ.⊶�Ⴖ; [V6]; xn--ss-4epx629f.xn--undv409k; ; ;  # ss꫶ᢥ.⊶�Ⴖ
+xn--ss-4ep585bkm5p.xn--ifh802b6a; ss‌꫶ᢥ.⊶ⴡⴖ; [C1]; xn--ss-4ep585bkm5p.xn--ifh802b6a; ; ;  # ss꫶ᢥ.⊶ⴡⴖ
+xn--ss-4ep585bkm5p.xn--undv409k; ss‌꫶ᢥ.⊶�Ⴖ; [C1, V6]; xn--ss-4ep585bkm5p.xn--undv409k; ; ;  # ss꫶ᢥ.⊶�Ⴖ
+xn--zca682johfi89m.xn--ifh802b6a; ß‌꫶ᢥ.⊶ⴡⴖ; [C1]; xn--zca682johfi89m.xn--ifh802b6a; ; ;  # ß꫶ᢥ.⊶ⴡⴖ
+xn--zca682johfi89m.xn--undv409k; ß‌꫶ᢥ.⊶�Ⴖ; [C1, V6]; xn--zca682johfi89m.xn--undv409k; ; ;  # ß꫶ᢥ.⊶�Ⴖ
+ß‌꫶ᢥ．⊶ⴡⴖ; ß‌꫶ᢥ.⊶ⴡⴖ; [C1]; xn--zca682johfi89m.xn--ifh802b6a; ; xn--ss-4epx629f.xn--ifh802b6a; [] # ß꫶ᢥ.⊶ⴡⴖ
+SS‌꫶ᢥ．⊶�Ⴖ; ss‌꫶ᢥ.⊶�Ⴖ; [C1, P1, V6]; xn--ss-4ep585bkm5p.xn--undv409k; ; xn--ss-4epx629f.xn--undv409k; [P1, V6] # ss꫶ᢥ.⊶�Ⴖ
+ss‌꫶ᢥ．⊶ⴡⴖ; ss‌꫶ᢥ.⊶ⴡⴖ; [C1]; xn--ss-4ep585bkm5p.xn--ifh802b6a; ; xn--ss-4epx629f.xn--ifh802b6a; [] # ss꫶ᢥ.⊶ⴡⴖ
+Ss‌꫶ᢥ．⊶�ⴖ; ss‌꫶ᢥ.⊶�ⴖ; [C1, P1, V6]; xn--ss-4ep585bkm5p.xn--5nd703gyrh; ; xn--ss-4epx629f.xn--5nd703gyrh; [P1, V6] # ss꫶ᢥ.⊶�ⴖ
+�。ς�; �.ς�; [C2, P1, V6]; xn--1ug.xn--3xa44344p; ; .xn--4xa24344p; [P1, V6, A4_2] # .ς
+�。Σ�; �.σ�; [C2, P1, V6]; xn--1ug.xn--4xa24344p; ; .xn--4xa24344p; [P1, V6, A4_2] # .σ
+�。σ�; �.σ�; [C2, P1, V6]; xn--1ug.xn--4xa24344p; ; .xn--4xa24344p; [P1, V6, A4_2] # .σ
+.xn--4xa24344p; .σ�; [V6, X4_2]; .xn--4xa24344p; [V6, A4_2]; ;  # .σ
+xn--1ug.xn--4xa24344p; �.σ�; [C2, V6]; xn--1ug.xn--4xa24344p; ; ;  # .σ
+xn--1ug.xn--3xa44344p; �.ς�; [C2, V6]; xn--1ug.xn--3xa44344p; ; ;  # .ς
+𞵑ß.ݑ�𞤛-; 𞵑ß.ݑ�𞤽-; [B2, B3, C2, P1, V3, V6]; xn--zca5423w.xn----z3c011q9513b; ; xn--ss-2722a.xn----z3c03218a; [B2, B3, P1, V3, V6] # ß.ݑ𞤽-
+𞵑ß.ݑ�𞤽-; ; [B2, B3, C2, P1, V3, V6]; xn--zca5423w.xn----z3c011q9513b; ; xn--ss-2722a.xn----z3c03218a; [B2, B3, P1, V3, V6] # ß.ݑ𞤽-
+𞵑SS.ݑ�𞤛-; 𞵑ss.ݑ�𞤽-; [B2, B3, C2, P1, V3, V6]; xn--ss-2722a.xn----z3c011q9513b; ; xn--ss-2722a.xn----z3c03218a; [B2, B3, P1, V3, V6] # ss.ݑ𞤽-
+𞵑ss.ݑ�𞤽-; ; [B2, B3, C2, P1, V3, V6]; xn--ss-2722a.xn----z3c011q9513b; ; xn--ss-2722a.xn----z3c03218a; [B2, B3, P1, V3, V6] # ss.ݑ𞤽-
+𞵑Ss.ݑ�𞤽-; 𞵑ss.ݑ�𞤽-; [B2, B3, C2, P1, V3, V6]; xn--ss-2722a.xn----z3c011q9513b; ; xn--ss-2722a.xn----z3c03218a; [B2, B3, P1, V3, V6] # ss.ݑ𞤽-
+xn--ss-2722a.xn----z3c03218a; 𞵑ss.ݑ𞤽-; [B2, B3, V3, V6]; xn--ss-2722a.xn----z3c03218a; ; ;  # ss.ݑ𞤽-
+xn--ss-2722a.xn----z3c011q9513b; 𞵑ss.ݑ�𞤽-; [B2, B3, C2, V3, V6]; xn--ss-2722a.xn----z3c011q9513b; ; ;  # ss.ݑ𞤽-
+xn--zca5423w.xn----z3c011q9513b; 𞵑ß.ݑ�𞤽-; [B2, B3, C2, V3, V6]; xn--zca5423w.xn----z3c011q9513b; ; ;  # ß.ݑ𞤽-
+𞵑ss.ݑ�𞤛-; 𞵑ss.ݑ�𞤽-; [B2, B3, C2, P1, V3, V6]; xn--ss-2722a.xn----z3c011q9513b; ; xn--ss-2722a.xn----z3c03218a; [B2, B3, P1, V3, V6] # ss.ݑ𞤽-
+𞵑Ss.ݑ�𞤛-; 𞵑ss.ݑ�𞤽-; [B2, B3, C2, P1, V3, V6]; xn--ss-2722a.xn----z3c011q9513b; ; xn--ss-2722a.xn----z3c03218a; [B2, B3, P1, V3, V6] # ss.ݑ𞤽-
+𑘽�𞤧．�󡦪-; 𑘽�𞤧.�󡦪-; [B1, C2, P1, V3, V5, V6]; xn--1ugz808gdimf.xn----k26iq1483f; ; xn--qb2ds317a.xn----k26iq1483f; [B1, P1, V3, V5, V6] # 𑘽𞤧.�-
+𑘽�𞤧.�󡦪-; ; [B1, C2, P1, V3, V5, V6]; xn--1ugz808gdimf.xn----k26iq1483f; ; xn--qb2ds317a.xn----k26iq1483f; [B1, P1, V3, V5, V6] # 𑘽𞤧.�-
+𑘽�𞤅.�󡦪-; 𑘽�𞤧.�󡦪-; [B1, C2, P1, V3, V5, V6]; xn--1ugz808gdimf.xn----k26iq1483f; ; xn--qb2ds317a.xn----k26iq1483f; [B1, P1, V3, V5, V6] # 𑘽𞤧.�-
+xn--qb2ds317a.xn----k26iq1483f; 𑘽𞤧.�󡦪-; [B1, V3, V5, V6]; xn--qb2ds317a.xn----k26iq1483f; ; ;  # 𑘽𞤧.�-
+xn--1ugz808gdimf.xn----k26iq1483f; 𑘽�𞤧.�󡦪-; [B1, C2, V3, V5, V6]; xn--1ugz808gdimf.xn----k26iq1483f; ; ;  # 𑘽𞤧.�-
+𑘽�𞤅．�󡦪-; 𑘽�𞤧.�󡦪-; [B1, C2, P1, V3, V5, V6]; xn--1ugz808gdimf.xn----k26iq1483f; ; xn--qb2ds317a.xn----k26iq1483f; [B1, P1, V3, V5, V6] # 𑘽𞤧.�-
+⒒򨘙򳳠𑓀.-󞡊; ; [P1, V3, V6]; xn--3shy698frsu9dt1me.xn----x310m; ; ;  # ⒒𑓀.-
+11.򨘙򳳠𑓀.-󞡊; ; [P1, V3, V6]; 11.xn--uz1d59632bxujd.xn----x310m; ; ;  # 11.𑓀.-
+11.xn--uz1d59632bxujd.xn----x310m; 11.򨘙򳳠𑓀.-󞡊; [V3, V6]; 11.xn--uz1d59632bxujd.xn----x310m; ; ;  # 11.𑓀.-
+xn--3shy698frsu9dt1me.xn----x310m; ⒒򨘙򳳠𑓀.-󞡊; [V3, V6]; xn--3shy698frsu9dt1me.xn----x310m; ; ;  # ⒒𑓀.-
+-｡�; -.�; [C2, V3]; -.xn--1ug; ; -.; [V3] # -.
+-。�; -.�; [C2, V3]; -.xn--1ug; ; -.; [V3] # -.
+-.; ; [V3]; ; ; ;  # -.
+-.xn--1ug; -.�; [C2, V3]; -.xn--1ug; ; ;  # -.
+≮ᡬ．ς¹-?; ≮ᡬ.ς1-?; [P1, V6]; xn--88e732c.ς1-?; [P1, V6, A3]; xn--88e732c.σ1-?;  # ≮ᡬ.ς1-
+≮ᡬ．ς¹-?; ≮ᡬ.ς1-?; [P1, V6]; xn--88e732c.ς1-?; [P1, V6, A3]; xn--88e732c.σ1-?;  # ≮ᡬ.ς1-
+≮ᡬ.ς1-?; ; [P1, V6]; xn--88e732c.ς1-?; [P1, V6, A3]; xn--88e732c.σ1-?;  # ≮ᡬ.ς1-
+≮ᡬ.ς1-?; ≮ᡬ.ς1-?; [P1, V6]; xn--88e732c.ς1-?; [P1, V6, A3]; xn--88e732c.σ1-?;  # ≮ᡬ.ς1-
+≮ᡬ.Σ1-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+≮ᡬ.Σ1-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+≮ᡬ.σ1-?; ; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+≮ᡬ.σ1-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+xn--88e732c.σ1-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+XN--88E732C.Σ1-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+xn--88e732c.ς1-?; ≮ᡬ.ς1-?; [P1, V6]; xn--88e732c.ς1-?; [P1, V6, A3]; xn--88e732c.σ1-?;  # ≮ᡬ.ς1-
+Xn--88e732c.ς1-?; ≮ᡬ.ς1-?; [P1, V6]; xn--88e732c.ς1-?; [P1, V6, A3]; xn--88e732c.σ1-?;  # ≮ᡬ.ς1-
+Xn--88e732c.σ1-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+≮ᡬ．Σ¹-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+≮ᡬ．Σ¹-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+≮ᡬ．σ¹-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+≮ᡬ．σ¹-?; ≮ᡬ.σ1-?; [P1, V6]; xn--88e732c.σ1-?; [P1, V6, A3]; ;  # ≮ᡬ.σ1-
+ቬ򔠼�｡��; ቬ򔠼�.�8; [P1, V6]; xn--d0d41273c887z.xn--8-ob5i; ; ;  # ቬ.�8
+ቬ򔠼�。�8; ቬ򔠼�.�8; [P1, V6]; xn--d0d41273c887z.xn--8-ob5i; ; ;  # ቬ.�8
+xn--d0d41273c887z.xn--8-ob5i; ቬ򔠼�.�8; [V6]; xn--d0d41273c887z.xn--8-ob5i; ; ;  # ቬ.�8
+�。蔫ݦ; �.蔫ݦ; [B5, B6, P1, V6]; xn--389c.xn--qpb7055d; ; ;  # .蔫ݦ
+xn--389c.xn--qpb7055d; �.蔫ݦ; [B5, B6, V6]; xn--389c.xn--qpb7055d; ; ;  # .蔫ݦ
+򒲧₃｡ꡚ𛇑󠄳ه; 򒲧3.ꡚ𛇑ه; [B5, B6, P1, V6]; xn--3-ep59g.xn--jhb5904fcp0h; ; ;  # 3.ꡚ𛇑ه
+򒲧3。ꡚ𛇑󠄳ه; 򒲧3.ꡚ𛇑ه; [B5, B6, P1, V6]; xn--3-ep59g.xn--jhb5904fcp0h; ; ;  # 3.ꡚ𛇑ه
+xn--3-ep59g.xn--jhb5904fcp0h; 򒲧3.ꡚ𛇑ه; [B5, B6, V6]; xn--3-ep59g.xn--jhb5904fcp0h; ; ;  # 3.ꡚ𛇑ه
+蓸ق≠.ß; ; [B5, B6, P1, V6]; xn--ehb015lnt1e.xn--zca; ; xn--ehb015lnt1e.ss;  # 蓸ق≠.ß
+蓸ق≠.ß; 蓸ق≠.ß; [B5, B6, P1, V6]; xn--ehb015lnt1e.xn--zca; ; xn--ehb015lnt1e.ss;  # 蓸ق≠.ß
+蓸ق≠.SS; 蓸ق≠.ss; [B5, B6, P1, V6]; xn--ehb015lnt1e.ss; ; ;  # 蓸ق≠.ss
+蓸ق≠.SS; 蓸ق≠.ss; [B5, B6, P1, V6]; xn--ehb015lnt1e.ss; ; ;  # 蓸ق≠.ss
+蓸ق≠.ss; ; [B5, B6, P1, V6]; xn--ehb015lnt1e.ss; ; ;  # 蓸ق≠.ss
+蓸ق≠.ss; 蓸ق≠.ss; [B5, B6, P1, V6]; xn--ehb015lnt1e.ss; ; ;  # 蓸ق≠.ss
+蓸ق≠.Ss; 蓸ق≠.ss; [B5, B6, P1, V6]; xn--ehb015lnt1e.ss; ; ;  # 蓸ق≠.ss
+蓸ق≠.Ss; 蓸ق≠.ss; [B5, B6, P1, V6]; xn--ehb015lnt1e.ss; ; ;  # 蓸ق≠.ss
+xn--ehb015lnt1e.ss; 蓸ق≠.ss; [B5, B6, V6]; xn--ehb015lnt1e.ss; ; ;  # 蓸ق≠.ss
+xn--ehb015lnt1e.xn--zca; 蓸ق≠.ß; [B5, B6, V6]; xn--ehb015lnt1e.xn--zca; ; ;  # 蓸ق≠.ß
+ࡎٺී⒊.�𞱩󠃪‌; ; [B1, C1, P1, V6]; xn--zib94gfziuq1a.xn--0ug3205g7eyf3c96h; ; xn--zib94gfziuq1a.xn--xo0dw109an237f; [B1, P1, V6] # ࡎٺී⒊.�
+ࡎٺී3..�𞱩󠃪‌; ; [B1, C1, P1, V6, X4_2]; xn--3-prc71ls9j..xn--0ug3205g7eyf3c96h; [B1, C1, P1, V6, A4_2]; xn--3-prc71ls9j..xn--xo0dw109an237f; [B1, P1, V6, A4_2] # ࡎٺී3..�
+xn--3-prc71ls9j..xn--xo0dw109an237f; ࡎٺී3..�𞱩󠃪; [B1, V6, X4_2]; xn--3-prc71ls9j..xn--xo0dw109an237f; [B1, V6, A4_2]; ;  # ࡎٺී3..�
+xn--3-prc71ls9j..xn--0ug3205g7eyf3c96h; ࡎٺී3..�𞱩󠃪‌; [B1, C1, V6, X4_2]; xn--3-prc71ls9j..xn--0ug3205g7eyf3c96h; [B1, C1, V6, A4_2]; ;  # ࡎٺී3..�
+xn--zib94gfziuq1a.xn--xo0dw109an237f; ࡎٺී⒊.�𞱩󠃪; [B1, V6]; xn--zib94gfziuq1a.xn--xo0dw109an237f; ; ;  # ࡎٺී⒊.�
+xn--zib94gfziuq1a.xn--0ug3205g7eyf3c96h; ࡎٺී⒊.�𞱩󠃪‌; [B1, C1, V6]; xn--zib94gfziuq1a.xn--0ug3205g7eyf3c96h; ; ;  # ࡎٺී⒊.�
+ς�-.Ⴣ𦟙; ; [C2, P1, V3, V6]; xn----xmb348s.xn--7nd64871a; ; xn----zmb.xn--7nd64871a; [P1, V3, V6] # ς-.Ⴣ𦟙
+ς�-.ⴣ𦟙; ; [C2, V3]; xn----xmb348s.xn--rlj2573p; ; xn----zmb.xn--rlj2573p; [V3] # ς-.ⴣ𦟙
+Σ�-.Ⴣ𦟙; σ�-.Ⴣ𦟙; [C2, P1, V3, V6]; xn----zmb048s.xn--7nd64871a; ; xn----zmb.xn--7nd64871a; [P1, V3, V6] # σ-.Ⴣ𦟙
+σ�-.ⴣ𦟙; ; [C2, V3]; xn----zmb048s.xn--rlj2573p; ; xn----zmb.xn--rlj2573p; [V3] # σ-.ⴣ𦟙
+xn----zmb.xn--rlj2573p; σ-.ⴣ𦟙; [V3]; xn----zmb.xn--rlj2573p; ; ;  # σ-.ⴣ𦟙
+xn----zmb048s.xn--rlj2573p; σ�-.ⴣ𦟙; [C2, V3]; xn----zmb048s.xn--rlj2573p; ; ;  # σ-.ⴣ𦟙
+xn----zmb.xn--7nd64871a; σ-.Ⴣ𦟙; [V3, V6]; xn----zmb.xn--7nd64871a; ; ;  # σ-.Ⴣ𦟙
+xn----zmb048s.xn--7nd64871a; σ�-.Ⴣ𦟙; [C2, V3, V6]; xn----zmb048s.xn--7nd64871a; ; ;  # σ-.Ⴣ𦟙
+xn----xmb348s.xn--rlj2573p; ς�-.ⴣ𦟙; [C2, V3]; xn----xmb348s.xn--rlj2573p; ; ;  # ς-.ⴣ𦟙
+xn----xmb348s.xn--7nd64871a; ς�-.Ⴣ𦟙; [C2, V3, V6]; xn----xmb348s.xn--7nd64871a; ; ;  # ς-.Ⴣ𦟙
+≠。🞳�; ≠.🞳6; [P1, V6]; xn--1ch.xn--6-dl4s; ; ;  # ≠.🞳6
+≠。🞳�; ≠.🞳6; [P1, V6]; xn--1ch.xn--6-dl4s; ; ;  # ≠.🞳6
+≠。🞳6; ≠.🞳6; [P1, V6]; xn--1ch.xn--6-dl4s; ; ;  # ≠.🞳6
+≠。🞳6; ≠.🞳6; [P1, V6]; xn--1ch.xn--6-dl4s; ; ;  # ≠.🞳6
+xn--1ch.xn--6-dl4s; ≠.🞳6; [V6]; xn--1ch.xn--6-dl4s; ; ;  # ≠.🞳6
+󅬽.蠔; ; [P1, V6]; xn--g747d.xn--xl2a; ; ;  # .蠔
+xn--g747d.xn--xl2a; 󅬽.蠔; [V6]; xn--g747d.xn--xl2a; ; ;  # .蠔
+ࣦ�．뼽; ࣦ�.뼽; [C2, V5]; xn--p0b869i.xn--e43b; ; xn--p0b.xn--e43b; [V5] # ࣦ.뼽
+ࣦ�．뼽; ࣦ�.뼽; [C2, V5]; xn--p0b869i.xn--e43b; ; xn--p0b.xn--e43b; [V5] # ࣦ.뼽
+ࣦ�.뼽; ; [C2, V5]; xn--p0b869i.xn--e43b; ; xn--p0b.xn--e43b; [V5] # ࣦ.뼽
+ࣦ�.뼽; ࣦ�.뼽; [C2, V5]; xn--p0b869i.xn--e43b; ; xn--p0b.xn--e43b; [V5] # ࣦ.뼽
+xn--p0b.xn--e43b; ࣦ.뼽; [V5]; xn--p0b.xn--e43b; ; ;  # ࣦ.뼽
+xn--p0b869i.xn--e43b; ࣦ�.뼽; [C2, V5]; xn--p0b869i.xn--e43b; ; ;  # ࣦ.뼽
+₇�􃂷ے。👖ٵ-𞪑; 7�􃂷ے.👖اٴ-𞪑; [B1, P1, V6]; xn--7-rwc839aj3073c.xn----ymc5uv818oghka; ; ;  # 7�ے.👖اٴ-
+7�􃂷ے。👖اٴ-𞪑; 7�􃂷ے.👖اٴ-𞪑; [B1, P1, V6]; xn--7-rwc839aj3073c.xn----ymc5uv818oghka; ; ;  # 7�ے.👖اٴ-
+xn--7-rwc839aj3073c.xn----ymc5uv818oghka; 7�􃂷ے.👖اٴ-𞪑; [B1, V6]; xn--7-rwc839aj3073c.xn----ymc5uv818oghka; ; ;  # 7�ے.👖اٴ-
+-｡ݻ; -.ݻ; [B1, V3]; -.xn--cqb; ; ;  # -.ݻ
+-。ݻ; -.ݻ; [B1, V3]; -.xn--cqb; ; ;  # -.ݻ
+-.xn--cqb; -.Ý»; [B1, V3]; -.xn--cqb; ; ;  # -.Ý»
+𑇌𵛓｡-⒈�ܫ; 𑇌𵛓.-⒈�ܫ; [B1, P1, V3, V5, V6]; xn--8d1dg030h.xn----u1c466tp10j; ; ;  # 𑇌.-⒈�ܫ
+𑇌𵛓。-1.�ܫ; 𑇌𵛓.-1.�ܫ; [B1, B5, B6, P1, V3, V5, V6]; xn--8d1dg030h.-1.xn--1nb7163f; ; ;  # 𑇌.-1.�ܫ
+xn--8d1dg030h.-1.xn--1nb7163f; 𑇌𵛓.-1.�ܫ; [B1, B5, B6, V3, V5, V6]; xn--8d1dg030h.-1.xn--1nb7163f; ; ;  # 𑇌.-1.�ܫ
+xn--8d1dg030h.xn----u1c466tp10j; 𑇌𵛓.-⒈�ܫ; [B1, V3, V5, V6]; xn--8d1dg030h.xn----u1c466tp10j; ; ;  # 𑇌.-⒈�ܫ
+璛᜴گ.-; ; [B1, B5, B6, V3]; xn--ikb175frt4e.-; ; ;  # 璛᜴گ.-
+xn--ikb175frt4e.-; 璛᜴گ.-; [B1, B5, B6, V3]; xn--ikb175frt4e.-; ; ;  # 璛᜴گ.-
+󠆰ࢡ�샕．��; ࢡ�샕.��; [B1, B2, B3]; xn--qyb07fj857a.xn--728bv72h; ; ;  # ࢡ�샕.��
+󠆰ࢡ�샕．�휁; ࢡ�샕.��; [B1, B2, B3]; xn--qyb07fj857a.xn--728bv72h; ; ;  # ࢡ�샕.��
+󠆰ࢡ�샕.��; ࢡ�샕.��; [B1, B2, B3]; xn--qyb07fj857a.xn--728bv72h; ; ;  # ࢡ�샕.��
+󠆰ࢡ�샕.�휁; ࢡ�샕.��; [B1, B2, B3]; xn--qyb07fj857a.xn--728bv72h; ; ;  # ࢡ�샕.��
+xn--qyb07fj857a.xn--728bv72h; ࢡ�샕.��; [B1, B2, B3]; xn--qyb07fj857a.xn--728bv72h; ; ;  # ࢡ�샕.��
+�．񋸕; �.񋸕; [P1, V6]; xn--pr3x.xn--rv7w; ; ;  # .
+�.񋸕; ; [P1, V6]; xn--pr3x.xn--rv7w; ; ;  # .
+xn--pr3x.xn--rv7w; �.񋸕; [V6]; xn--pr3x.xn--rv7w; ; ;  # .
+ٽ𞥕｡𑑂𞤶Ⴍ-; ٽ𞥕.𑑂𞤶Ⴍ-; [B1, P1, V3, V5, V6]; xn--2ib0338v.xn----w0g2740ro9vg; ; ;  # ٽ𞥕.𑑂𞤶Ⴍ-
+ٽ𞥕。𑑂𞤶Ⴍ-; ٽ𞥕.𑑂𞤶Ⴍ-; [B1, P1, V3, V5, V6]; xn--2ib0338v.xn----w0g2740ro9vg; ; ;  # ٽ𞥕.𑑂𞤶Ⴍ-
+ٽ𞥕。𑑂𞤶�-; ٽ𞥕.𑑂𞤶�-; [B1, V3, V5]; xn--2ib0338v.xn----zvs0199fo91g; ; ;  # ٽ𞥕.𑑂𞤶�-
+ٽ𞥕。𑑂𞤔Ⴍ-; ٽ𞥕.𑑂𞤶Ⴍ-; [B1, P1, V3, V5, V6]; xn--2ib0338v.xn----w0g2740ro9vg; ; ;  # ٽ𞥕.𑑂𞤶Ⴍ-
+ٽ𞥕。𑑂𞤔�-; ٽ𞥕.𑑂𞤶�-; [B1, V3, V5]; xn--2ib0338v.xn----zvs0199fo91g; ; ;  # ٽ𞥕.𑑂𞤶�-
+xn--2ib0338v.xn----zvs0199fo91g; ٽ𞥕.𑑂𞤶�-; [B1, V3, V5]; xn--2ib0338v.xn----zvs0199fo91g; ; ;  # ٽ𞥕.𑑂𞤶�-
+xn--2ib0338v.xn----w0g2740ro9vg; ٽ𞥕.𑑂𞤶Ⴍ-; [B1, V3, V5, V6]; xn--2ib0338v.xn----w0g2740ro9vg; ; ;  # ٽ𞥕.𑑂𞤶Ⴍ-
+ٽ𞥕｡𑑂𞤶�-; ٽ𞥕.𑑂𞤶�-; [B1, V3, V5]; xn--2ib0338v.xn----zvs0199fo91g; ; ;  # ٽ𞥕.𑑂𞤶�-
+ٽ𞥕｡𑑂𞤔Ⴍ-; ٽ𞥕.𑑂𞤶Ⴍ-; [B1, P1, V3, V5, V6]; xn--2ib0338v.xn----w0g2740ro9vg; ; ;  # ٽ𞥕.𑑂𞤶Ⴍ-
+ٽ𞥕｡𑑂𞤔�-; ٽ𞥕.𑑂𞤶�-; [B1, V3, V5]; xn--2ib0338v.xn----zvs0199fo91g; ; ;  # ٽ𞥕.𑑂𞤶�-
+���。񢚧₄Ⴋ񂹫; ���.񢚧4Ⴋ񂹫; [P1, V6]; xn--039c42bq865a.xn--4-t0g49302fnrzm; ; ;  # .4Ⴋ
+���。񢚧4Ⴋ񂹫; ���.񢚧4Ⴋ񂹫; [P1, V6]; xn--039c42bq865a.xn--4-t0g49302fnrzm; ; ;  # .4Ⴋ
+���。񢚧4ⴋ񂹫; ���.񢚧4ⴋ񂹫; [P1, V6]; xn--039c42bq865a.xn--4-wvs27840bnrzm; ; ;  # .4ⴋ
+xn--039c42bq865a.xn--4-wvs27840bnrzm; ���.񢚧4ⴋ񂹫; [V6]; xn--039c42bq865a.xn--4-wvs27840bnrzm; ; ;  # .4ⴋ
+xn--039c42bq865a.xn--4-t0g49302fnrzm; ���.񢚧4Ⴋ񂹫; [V6]; xn--039c42bq865a.xn--4-t0g49302fnrzm; ; ;  # .4Ⴋ
+���。񢚧₄ⴋ񂹫; ���.񢚧4ⴋ񂹫; [P1, V6]; xn--039c42bq865a.xn--4-wvs27840bnrzm; ; ;  # .4ⴋ
+4ڽ︒󠑥.≠; ; [B1, P1, V6]; xn--4-kvc5601q2h50i.xn--1ch; ; ;  # 4ڽ︒.≠
+4ڽ︒󠑥.≠; 4ڽ︒󠑥.≠; [B1, P1, V6]; xn--4-kvc5601q2h50i.xn--1ch; ; ;  # 4ڽ︒.≠
+4ڽ。󠑥.≠; 4ڽ.󠑥.≠; [B1, P1, V6]; xn--4-kvc.xn--5136e.xn--1ch; ; ;  # 4ڽ..≠
+4ڽ。󠑥.≠; 4ڽ.󠑥.≠; [B1, P1, V6]; xn--4-kvc.xn--5136e.xn--1ch; ; ;  # 4ڽ..≠
+xn--4-kvc.xn--5136e.xn--1ch; 4ڽ.󠑥.≠; [B1, V6]; xn--4-kvc.xn--5136e.xn--1ch; ; ;  # 4ڽ..≠
+xn--4-kvc5601q2h50i.xn--1ch; 4ڽ︒󠑥.≠; [B1, V6]; xn--4-kvc5601q2h50i.xn--1ch; ; ;  # 4ڽ︒.≠
+�。ۗ; 5.ۗ; [V5]; 5.xn--nlb; ; ;  # 5.ۗ
+5。ۗ; 5.ۗ; [V5]; 5.xn--nlb; ; ;  # 5.ۗ
+5.xn--nlb; 5.Û—; [V5]; 5.xn--nlb; ; ;  # 5.Û—
+‌򺸩.⾕; ‌򺸩.谷; [C1, P1, V6]; xn--0ug26167i.xn--6g3a; ; xn--i183d.xn--6g3a; [P1, V6] # .谷
+‌򺸩.谷; ; [C1, P1, V6]; xn--0ug26167i.xn--6g3a; ; xn--i183d.xn--6g3a; [P1, V6] # .谷
+xn--i183d.xn--6g3a; 򺸩.谷; [V6]; xn--i183d.xn--6g3a; ; ;  # .谷
+xn--0ug26167i.xn--6g3a; ‌򺸩.谷; [C1, V6]; xn--0ug26167i.xn--6g3a; ; ;  # .谷
+︒󎰇�.-ܼ‌; ; [C1, C2, P1, V3, V6]; xn--1ug1658ftw26f.xn----t2c071q; ; xn--y86c71305c.xn----t2c; [P1, V3, V6] # ︒.-ܼ
+。󎰇�.-ܼ‌; .󎰇�.-ܼ‌; [C1, C2, P1, V3, V6, X4_2]; .xn--1ug05310k.xn----t2c071q; [C1, C2, P1, V3, V6, A4_2]; .xn--hh50e.xn----t2c; [P1, V3, V6, A4_2] # ..-ܼ
+.xn--hh50e.xn----t2c; .󎰇.-ܼ; [V3, V6, X4_2]; .xn--hh50e.xn----t2c; [V3, V6, A4_2]; ;  # ..-ܼ
+.xn--1ug05310k.xn----t2c071q; .󎰇�.-ܼ‌; [C1, C2, V3, V6, X4_2]; .xn--1ug05310k.xn----t2c071q; [C1, C2, V3, V6, A4_2]; ;  # ..-ܼ
+xn--y86c71305c.xn----t2c; ︒󎰇.-ܼ; [V3, V6]; xn--y86c71305c.xn----t2c; ; ;  # ︒.-ܼ
+xn--1ug1658ftw26f.xn----t2c071q; ︒󎰇�.-ܼ‌; [C1, C2, V3, V6]; xn--1ug1658ftw26f.xn----t2c071q; ; ;  # ︒.-ܼ
+≯𞤟。ᡨ; ≯�.ᡨ; [B1, P1, V6]; xn--hdhz520p.xn--48e; ; ;  # ≯�.ᡨ
+≯𞤟。ᡨ; ≯�.ᡨ; [B1, P1, V6]; xn--hdhz520p.xn--48e; ; ;  # ≯�.ᡨ
+≯�。ᡨ; ≯�.ᡨ; [B1, P1, V6]; xn--hdhz520p.xn--48e; ; ;  # ≯�.ᡨ
+≯�。ᡨ; ≯�.ᡨ; [B1, P1, V6]; xn--hdhz520p.xn--48e; ; ;  # ≯�.ᡨ
+xn--hdhz520p.xn--48e; ≯�.ᡨ; [B1, V6]; xn--hdhz520p.xn--48e; ; ;  # ≯�.ᡨ
+ུ𫫰�。ܓ�; ུ𫫰�.ܓ�; [B1, V5]; xn--ned8985uo92e.xn--dnb6395k; ; ;  # ུ𫫰�.ܓ�
+xn--ned8985uo92e.xn--dnb6395k; ུ𫫰�.ܓ�; [B1, V5]; xn--ned8985uo92e.xn--dnb6395k; ; ;  # ུ𫫰�.ܓ�
+̼ߛ��｡�; ̼ߛ73.0; [B1, V5]; xn--73-9yb648b.0; ; ;  # ̼ߛ73.0
+̼ߛ73。0; ̼ߛ73.0; [B1, V5]; xn--73-9yb648b.0; ; ;  # ̼ߛ73.0
+xn--73-9yb648b.0; ̼ߛ73.0; [B1, V5]; xn--73-9yb648b.0; ; ;  # ̼ߛ73.0
+�．�; �.9; [C2]; xn--1ug.9; ; .9; [A4_2] # .9
+�.9; ; [C2]; xn--1ug.9; ; .9; [A4_2] # .9
+.9; ; [X4_2]; ; [A4_2]; ;  # .9
+xn--1ug.9; �.9; [C2]; xn--1ug.9; ; ;  # .9
+9; ; ; ; ; ;  # 9
+ݹᡭ𪕈。ڶࣙ; ݹᡭ𪕈.ڶࣙ; [B2, B3]; xn--9pb497fs270c.xn--pkb80i; ; ;  # ݹᡭ𪕈.ڶࣙ
+xn--9pb497fs270c.xn--pkb80i; ݹᡭ𪕈.ڶࣙ; [B2, B3]; xn--9pb497fs270c.xn--pkb80i; ; ;  # ݹᡭ𪕈.ڶࣙ
+ܦ５ߢ겙。᳴�; ܦ5ߢ겙.᳴�; [B1, B2, B3, P1, V5, V6]; xn--5-j1c97c2483c.xn--e7f2093h; ; ;  # ܦ5ߢ겙.᳴
+ܦ５ߢ겙。᳴�; ܦ5ߢ겙.᳴�; [B1, B2, B3, P1, V5, V6]; xn--5-j1c97c2483c.xn--e7f2093h; ; ;  # ܦ5ߢ겙.᳴
+ܦ5ߢ겙。᳴�; ܦ5ߢ겙.᳴�; [B1, B2, B3, P1, V5, V6]; xn--5-j1c97c2483c.xn--e7f2093h; ; ;  # ܦ5ߢ겙.᳴
+ܦ5ߢ겙。᳴�; ܦ5ߢ겙.᳴�; [B1, B2, B3, P1, V5, V6]; xn--5-j1c97c2483c.xn--e7f2093h; ; ;  # ܦ5ߢ겙.᳴
+xn--5-j1c97c2483c.xn--e7f2093h; ܦ5ߢ겙.᳴�; [B1, B2, B3, V5, V6]; xn--5-j1c97c2483c.xn--e7f2093h; ; ;  # ܦ5ߢ겙.᳴
+Ⴍ�ꡨ֮。Ⴞ‌‌; Ⴍ�ꡨ֮.Ⴞ‌‌; [C1, P1, V6]; xn--5cb347co96jug15a.xn--2nd059ea; ; xn--5cb347co96jug15a.xn--2nd; [P1, V6] # Ⴍꡨ֮.Ⴞ
+��ꡨ֮。ⴞ‌‌; ��ꡨ֮.ⴞ‌‌; [C1, P1, V6]; xn--5cb172r175fug38a.xn--0uga051h; ; xn--5cb172r175fug38a.xn--mlj; [P1, V6] # �ꡨ֮.ⴞ
+xn--5cb172r175fug38a.xn--mlj; ��ꡨ֮.ⴞ; [V6]; xn--5cb172r175fug38a.xn--mlj; ; ;  # �ꡨ֮.ⴞ
+xn--5cb172r175fug38a.xn--0uga051h; ��ꡨ֮.ⴞ‌‌; [C1, V6]; xn--5cb172r175fug38a.xn--0uga051h; ; ;  # �ꡨ֮.ⴞ
+xn--5cb347co96jug15a.xn--2nd; Ⴍ�ꡨ֮.Ⴞ; [V6]; xn--5cb347co96jug15a.xn--2nd; ; ;  # Ⴍꡨ֮.Ⴞ
+xn--5cb347co96jug15a.xn--2nd059ea; Ⴍ�ꡨ֮.Ⴞ‌‌; [C1, V6]; xn--5cb347co96jug15a.xn--2nd059ea; ; ;  # Ⴍꡨ֮.Ⴞ
+�。󑓱; �.󑓱; [P1, V6]; xn--k97c.xn--q031e; ; ;  # �.
+xn--k97c.xn--q031e; �.󑓱; [V6]; xn--k97c.xn--q031e; ; ;  # �.
+󡎦឴�.�; ; [B1, P1, V6]; xn--9ic364dho91z.xn--2o0d; ; ;  # �.�
+xn--9ic364dho91z.xn--2o0d; 󡎦឴�.�; [B1, V6]; xn--9ic364dho91z.xn--2o0d; ; ;  # �.�
+ࣟႫ𶿸귤．򠅼�휪ૣ; ࣟႫ𶿸귤.򠅼0휪ૣ; [P1, V5, V6]; xn--i0b601b6r7l2hs0a.xn--0-8le8997mulr5f; ; ;  # ࣟႫ귤.0휪ૣ
+ࣟႫ𶿸귤．򠅼�휪ૣ; ࣟႫ𶿸귤.򠅼0휪ૣ; [P1, V5, V6]; xn--i0b601b6r7l2hs0a.xn--0-8le8997mulr5f; ; ;  # ࣟႫ귤.0휪ૣ
+ࣟႫ𶿸귤.򠅼0휪ૣ; ; [P1, V5, V6]; xn--i0b601b6r7l2hs0a.xn--0-8le8997mulr5f; ; ;  # ࣟႫ귤.0휪ૣ
+ࣟႫ𶿸귤.򠅼0휪ૣ; ࣟႫ𶿸귤.򠅼0휪ૣ; [P1, V5, V6]; xn--i0b601b6r7l2hs0a.xn--0-8le8997mulr5f; ; ;  # ࣟႫ귤.0휪ૣ
+ࣟⴋ𶿸귤.򠅼0휪ૣ; ࣟⴋ𶿸귤.򠅼0휪ૣ; [P1, V5, V6]; xn--i0b436pkl2g2h42a.xn--0-8le8997mulr5f; ; ;  # ࣟⴋ귤.0휪ૣ
+ࣟⴋ𶿸귤.򠅼0휪ૣ; ; [P1, V5, V6]; xn--i0b436pkl2g2h42a.xn--0-8le8997mulr5f; ; ;  # ࣟⴋ귤.0휪ૣ
+xn--i0b436pkl2g2h42a.xn--0-8le8997mulr5f; ࣟⴋ𶿸귤.򠅼0휪ૣ; [V5, V6]; xn--i0b436pkl2g2h42a.xn--0-8le8997mulr5f; ; ;  # ࣟⴋ귤.0휪ૣ
+xn--i0b601b6r7l2hs0a.xn--0-8le8997mulr5f; ࣟႫ𶿸귤.򠅼0휪ૣ; [V5, V6]; xn--i0b601b6r7l2hs0a.xn--0-8le8997mulr5f; ; ;  # ࣟႫ귤.0휪ૣ
+ࣟⴋ𶿸귤．򠅼�휪ૣ; ࣟⴋ𶿸귤.򠅼0휪ૣ; [P1, V5, V6]; xn--i0b436pkl2g2h42a.xn--0-8le8997mulr5f; ; ;  # ࣟⴋ귤.0휪ૣ
+ࣟⴋ𶿸귤．򠅼�휪ૣ; ࣟⴋ𶿸귤.򠅼0휪ૣ; [P1, V5, V6]; xn--i0b436pkl2g2h42a.xn--0-8le8997mulr5f; ; ;  # ࣟⴋ귤.0휪ૣ
+ބ．��; ބ.��; [P1, V6]; xn--lqb.xn--jfb1808v; ; ;  # ބ.�
+ބ.��; ; [P1, V6]; xn--lqb.xn--jfb1808v; ; ;  # ބ.�
+xn--lqb.xn--jfb1808v; ބ.��; [V6]; xn--lqb.xn--jfb1808v; ; ;  # ބ.�
+�₃.8꣄�🃤; �3.8꣄�🃤; [V5]; xn--3-yke.xn--8-ugnv982dbkwm; ; xn--3-yke.xn--8-sl4et308f;  # �3.8꣄🃤
+�3.8꣄�🃤; ; [V5]; xn--3-yke.xn--8-ugnv982dbkwm; ; xn--3-yke.xn--8-sl4et308f;  # �3.8꣄🃤
+xn--3-yke.xn--8-sl4et308f; �3.8꣄🃤; [V5]; xn--3-yke.xn--8-sl4et308f; ; ;  # �3.8꣄🃤
+xn--3-yke.xn--8-ugnv982dbkwm; �3.8꣄�🃤; [V5]; xn--3-yke.xn--8-ugnv982dbkwm; ; ;  # �3.8꣄🃤
+℻⩷�。𞤠�᠌; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+FAX⩷�。𞤠�᠌; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+fax⩷�。𞥂�᠌; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+Fax⩷�。𞤠�᠌; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+xn--fax-4c9a1676t.xn--6e6h; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+℻⩷�。𞥂�᠌; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+FAX⩷�。𞥂�᠌; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+fax⩷�。𞤠�᠌; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+fax⩷�.𞥂; ; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+FAX⩷�.𞤠; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+Fax⩷�.𞤠; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+FAX⩷�.𞥂; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+Fax⩷�.𞥂; fax⩷�.𞥂; [B6]; xn--fax-4c9a1676t.xn--6e6h; ; ;  # fax⩷�.𞥂
+ꡕ≠�󮿱｡�󠄫ﾠ; ꡕ≠�󮿱.�ﾠ; [B2, B3, P1, V6]; xn--cld333gn31h0158l.xn--cl7c96v; ; ;  # ꡕ≠�.
+ꡕ≠�󮿱｡�󠄫ﾠ; ꡕ≠�󮿱.�ﾠ; [B2, B3, P1, V6]; xn--cld333gn31h0158l.xn--cl7c96v; ; ;  # ꡕ≠�.
+ꡕ≠�󮿱。�󠄫ᅠ; ꡕ≠�󮿱.�ᅠ; [B2, B3, P1, V6]; xn--cld333gn31h0158l.xn--psd1510k; ; ;  # ꡕ≠�.
+ꡕ≠�󮿱。�󠄫ᅠ; ꡕ≠�󮿱.�ᅠ; [B2, B3, P1, V6]; xn--cld333gn31h0158l.xn--psd1510k; ; ;  # ꡕ≠�.
+xn--cld333gn31h0158l.xn--psd1510k; ꡕ≠�󮿱.�ᅠ; [B2, B3, V6]; xn--cld333gn31h0158l.xn--psd1510k; ; ;  # ꡕ≠�.
+xn--cld333gn31h0158l.xn--cl7c96v; ꡕ≠�󮿱.�ﾠ; [B2, B3, V6]; xn--cld333gn31h0158l.xn--cl7c96v; ; ;  # ꡕ≠�.
+鱊。‌; 鱊.‌; [C1]; xn--rt6a.xn--0ug; ; xn--rt6a.; [] # 鱊.
+xn--rt6a.; 鱊.; ; xn--rt6a.; ; ;  # 鱊.
+鱊.; ; ; xn--rt6a.; ; ;  # 鱊.
+xn--rt6a.xn--0ug; 鱊.‌; [C1]; xn--rt6a.xn--0ug; ; ;  # 鱊.
+8�．�; 8�.�; [B1, B3, B6, V5]; xn--8-d26i.xn--0p1d; ; ;  # 8�.�
+8�.�; ; [B1, B3, B6, V5]; xn--8-d26i.xn--0p1d; ; ;  # 8�.�
+xn--8-d26i.xn--0p1d; 8�.�; [B1, B3, B6, V5]; xn--8-d26i.xn--0p1d; ; ;  # 8�.�
+��．�; ��.�; [B1]; xn--qoh9161g.xn--1x9c; ; ;  # ��.�
+��.�; ; [B1]; xn--qoh9161g.xn--1x9c; ; ;  # ��.�
+xn--qoh9161g.xn--1x9c; ��.�; [B1]; xn--qoh9161g.xn--1x9c; ; ;  # ��.�
+𞤺ߌ4．�; 𞤺ߌ4.�; [B1, C2]; xn--4-0bd15808a.xn--1ug; ; xn--4-0bd15808a.; [] # 𞤺ߌ4.
+𞤺ߌ4.�; ; [B1, C2]; xn--4-0bd15808a.xn--1ug; ; xn--4-0bd15808a.; [] # 𞤺ߌ4.
+𞤘ߌ4.�; 𞤺ߌ4.�; [B1, C2]; xn--4-0bd15808a.xn--1ug; ; xn--4-0bd15808a.; [] # 𞤺ߌ4.
+xn--4-0bd15808a.; 𞤺ߌ4.; ; xn--4-0bd15808a.; ; ;  # 𞤺ߌ4.
+𞤺ߌ4.; ; ; xn--4-0bd15808a.; ; ;  # 𞤺ߌ4.
+𞤘ߌ4.; 𞤺ߌ4.; ; xn--4-0bd15808a.; ; ;  # 𞤺ߌ4.
+xn--4-0bd15808a.xn--1ug; 𞤺ߌ4.�; [B1, C2]; xn--4-0bd15808a.xn--1ug; ; ;  # 𞤺ߌ4.
+𞤘ߌ4．�; 𞤺ߌ4.�; [B1, C2]; xn--4-0bd15808a.xn--1ug; ; xn--4-0bd15808a.; [] # 𞤺ߌ4.
+⒗�⃯-.࣢•; ; [B1, P1, V3, V6]; xn----z0d801p6kd.xn--l0b810j; ; ;  # ⒗�⃯-.•
+16.�⃯-.࣢•; ; [B1, P1, V3, V5, V6]; 16.xn----z0d801p.xn--l0b810j; ; ;  # 16.�⃯-.•
+16.xn----z0d801p.xn--l0b810j; 16.�⃯-.࣢•; [B1, V3, V5, V6]; 16.xn----z0d801p.xn--l0b810j; ; ;  # 16.�⃯-.•
+xn----z0d801p6kd.xn--l0b810j; ⒗�⃯-.࣢•; [B1, V3, V6]; xn----z0d801p6kd.xn--l0b810j; ; ;  # ⒗�⃯-.•
+-｡�; -.�; [V3]; -.xn--xco; ; ;  # -.�
+-。�; -.�; [V3]; -.xn--xco; ; ;  # -.�
+-.xn--xco; -.�; [V3]; -.xn--xco; ; ;  # -.�
+‌񒃠．�; ‌񒃠.�; [C1, C2, P1, V6]; xn--0ugz7551c.xn--1ug; ; xn--dj8y.; [P1, V6] # .
+‌񒃠.�; ; [C1, C2, P1, V6]; xn--0ugz7551c.xn--1ug; ; xn--dj8y.; [P1, V6] # .
+xn--dj8y.; ñ’ƒ .; [V6]; xn--dj8y.; ; ;  # .
+xn--0ugz7551c.xn--1ug; ‌񒃠.�; [C1, C2, V6]; xn--0ugz7551c.xn--1ug; ; ;  # .
+⒈⓰󥣇｡��򗷦Ⴕ; ⒈⓰󥣇.��򗷦Ⴕ; [B1, C2, P1, V6]; xn--tsh0nz9380h.xn--tnd969erj4psgl3e; ; xn--tsh0nz9380h.xn--tnd1990ke579c; [B1, P1, V6] # ⒈⓰.�Ⴕ
+1.⓰󥣇。��򗷦Ⴕ; 1.⓰󥣇.��򗷦Ⴕ; [B1, C2, P1, V6]; 1.xn--svh00804k.xn--tnd969erj4psgl3e; ; 1.xn--svh00804k.xn--tnd1990ke579c; [B1, P1, V6] # 1.⓰.�Ⴕ
+1.⓰󥣇。��򗷦ⴕ; 1.⓰󥣇.��򗷦ⴕ; [B1, C2, P1, V6]; 1.xn--svh00804k.xn--1ug352csp0psg45e; ; 1.xn--svh00804k.xn--dljv223ee5t2d; [B1, P1, V6] # 1.⓰.�ⴕ
+1.xn--svh00804k.xn--dljv223ee5t2d; 1.⓰󥣇.�򗷦ⴕ; [B1, V6]; 1.xn--svh00804k.xn--dljv223ee5t2d; ; ;  # 1.⓰.�ⴕ
+1.xn--svh00804k.xn--1ug352csp0psg45e; 1.⓰󥣇.��򗷦ⴕ; [B1, C2, V6]; 1.xn--svh00804k.xn--1ug352csp0psg45e; ; ;  # 1.⓰.�ⴕ
+1.xn--svh00804k.xn--tnd1990ke579c; 1.⓰󥣇.�򗷦Ⴕ; [B1, V6]; 1.xn--svh00804k.xn--tnd1990ke579c; ; ;  # 1.⓰.�Ⴕ
+1.xn--svh00804k.xn--tnd969erj4psgl3e; 1.⓰󥣇.��򗷦Ⴕ; [B1, C2, V6]; 1.xn--svh00804k.xn--tnd969erj4psgl3e; ; ;  # 1.⓰.�Ⴕ
+⒈⓰󥣇｡��򗷦ⴕ; ⒈⓰󥣇.��򗷦ⴕ; [B1, C2, P1, V6]; xn--tsh0nz9380h.xn--1ug352csp0psg45e; ; xn--tsh0nz9380h.xn--dljv223ee5t2d; [B1, P1, V6] # ⒈⓰.�ⴕ
+xn--tsh0nz9380h.xn--dljv223ee5t2d; ⒈⓰󥣇.�򗷦ⴕ; [B1, V6]; xn--tsh0nz9380h.xn--dljv223ee5t2d; ; ;  # ⒈⓰.�ⴕ
+xn--tsh0nz9380h.xn--1ug352csp0psg45e; ⒈⓰󥣇.��򗷦ⴕ; [B1, C2, V6]; xn--tsh0nz9380h.xn--1ug352csp0psg45e; ; ;  # ⒈⓰.�ⴕ
+xn--tsh0nz9380h.xn--tnd1990ke579c; ⒈⓰󥣇.�򗷦Ⴕ; [B1, V6]; xn--tsh0nz9380h.xn--tnd1990ke579c; ; ;  # ⒈⓰.�Ⴕ
+xn--tsh0nz9380h.xn--tnd969erj4psgl3e; ⒈⓰󥣇.��򗷦Ⴕ; [B1, C2, V6]; xn--tsh0nz9380h.xn--tnd969erj4psgl3e; ; ;  # ⒈⓰.�Ⴕ
+𞠊ᠮ-ß｡�効�𷣭; 𞠊ᠮ-ß.�効�𷣭; [B1, B2, B3, P1, V5, V6]; xn----qfa310pg973b.xn--jfb197i791bi6x4c; ; xn---ss-21t18904a.xn--jfb197i791bi6x4c;  # 𞠊ᠮ-ß.�効
+𞠊ᠮ-ß。�効�𷣭; 𞠊ᠮ-ß.�効�𷣭; [B1, B2, B3, P1, V5, V6]; xn----qfa310pg973b.xn--jfb197i791bi6x4c; ; xn---ss-21t18904a.xn--jfb197i791bi6x4c;  # 𞠊ᠮ-ß.�効
+𞠊ᠮ-SS。�効�𷣭; 𞠊ᠮ-ss.�効�𷣭; [B1, B2, B3, P1, V5, V6]; xn---ss-21t18904a.xn--jfb197i791bi6x4c; ; ;  # 𞠊ᠮ-ss.�効
+𞠊ᠮ-ss。�効�𷣭; 𞠊ᠮ-ss.�効�𷣭; [B1, B2, B3, P1, V5, V6]; xn---ss-21t18904a.xn--jfb197i791bi6x4c; ; ;  # 𞠊ᠮ-ss.�効
+𞠊ᠮ-Ss。�効�𷣭; 𞠊ᠮ-ss.�効�𷣭; [B1, B2, B3, P1, V5, V6]; xn---ss-21t18904a.xn--jfb197i791bi6x4c; ; ;  # 𞠊ᠮ-ss.�効
+xn---ss-21t18904a.xn--jfb197i791bi6x4c; 𞠊ᠮ-ss.�効�𷣭; [B1, B2, B3, V5, V6]; xn---ss-21t18904a.xn--jfb197i791bi6x4c; ; ;  # 𞠊ᠮ-ss.�効
+xn----qfa310pg973b.xn--jfb197i791bi6x4c; 𞠊ᠮ-ß.�効�𷣭; [B1, B2, B3, V5, V6]; xn----qfa310pg973b.xn--jfb197i791bi6x4c; ; ;  # 𞠊ᠮ-ß.�効
+𞠊ᠮ-SS｡�効�𷣭; 𞠊ᠮ-ss.�効�𷣭; [B1, B2, B3, P1, V5, V6]; xn---ss-21t18904a.xn--jfb197i791bi6x4c; ; ;  # 𞠊ᠮ-ss.�効
+𞠊ᠮ-ss｡�効�𷣭; 𞠊ᠮ-ss.�効�𷣭; [B1, B2, B3, P1, V5, V6]; xn---ss-21t18904a.xn--jfb197i791bi6x4c; ; ;  # 𞠊ᠮ-ss.�効
+𞠊ᠮ-Ss｡�効�𷣭; 𞠊ᠮ-ss.�効�𷣭; [B1, B2, B3, P1, V5, V6]; xn---ss-21t18904a.xn--jfb197i791bi6x4c; ; ;  # 𞠊ᠮ-ss.�効
+𑇀.󠨱; ; [P1, V5, V6]; xn--wd1d.xn--k946e; ; ;  # 𑇀.
+xn--wd1d.xn--k946e; 𑇀.󠨱; [V5, V6]; xn--wd1d.xn--k946e; ; ;  # 𑇀.
+�3ﮈ｡���; �3ڈ.0��; [B1, P1, V6]; xn--3-jsc897t.xn--0-sc5iy3h; ; ;  # �3ڈ.0�
+�3ڈ。0��; �3ڈ.0��; [B1, P1, V6]; xn--3-jsc897t.xn--0-sc5iy3h; ; ;  # �3ڈ.0�
+xn--3-jsc897t.xn--0-sc5iy3h; �3ڈ.0��; [B1, V6]; xn--3-jsc897t.xn--0-sc5iy3h; ; ;  # �3ڈ.0�
+ݫ６�ࢦ。ᷣ; ݫ6�ࢦ.ᷣ; [B1, B3, B6, V5]; xn--6-h5c06gj6c.xn--7eg; ; ;  # ݫ6�ࢦ.ᷣ
+ݫ6�ࢦ。ᷣ; ݫ6�ࢦ.ᷣ; [B1, B3, B6, V5]; xn--6-h5c06gj6c.xn--7eg; ; ;  # ݫ6�ࢦ.ᷣ
+xn--6-h5c06gj6c.xn--7eg; ݫ6�ࢦ.ᷣ; [B1, B3, B6, V5]; xn--6-h5c06gj6c.xn--7eg; ; ;  # ݫ6�ࢦ.ᷣ
+؅-𽤞Ⴂ。򅤶�; ؅-𽤞Ⴂ.򅤶�; [B1, B6, C2, P1, V6]; xn----0kc662fc152h.xn--1ugy3204f; ; xn----0kc662fc152h.xn--ss06b; [B1, P1, V6] # -Ⴂ.
+؅-𽤞ⴂ。򅤶�; ؅-𽤞ⴂ.򅤶�; [B1, B6, C2, P1, V6]; xn----0kc8501a5399e.xn--1ugy3204f; ; xn----0kc8501a5399e.xn--ss06b; [B1, P1, V6] # -ⴂ.
+xn----0kc8501a5399e.xn--ss06b; ؅-𽤞ⴂ.򅤶; [B1, V6]; xn----0kc8501a5399e.xn--ss06b; ; ;  # -ⴂ.
+xn----0kc8501a5399e.xn--1ugy3204f; ؅-𽤞ⴂ.򅤶�; [B1, B6, C2, V6]; xn----0kc8501a5399e.xn--1ugy3204f; ; ;  # -ⴂ.
+xn----0kc662fc152h.xn--ss06b; ؅-𽤞Ⴂ.򅤶; [B1, V6]; xn----0kc662fc152h.xn--ss06b; ; ;  # -Ⴂ.
+xn----0kc662fc152h.xn--1ugy3204f; ؅-𽤞Ⴂ.򅤶�; [B1, B6, C2, V6]; xn----0kc662fc152h.xn--1ugy3204f; ; ;  # -Ⴂ.
+⾆．ꡈ５≯ß; 舌.ꡈ5≯ß; [P1, V6]; xn--tc1a.xn--5-qfa988w745i; ; xn--tc1a.xn--5ss-3m2a5009e;  # 舌.ꡈ5≯ß
+⾆．ꡈ５≯ß; 舌.ꡈ5≯ß; [P1, V6]; xn--tc1a.xn--5-qfa988w745i; ; xn--tc1a.xn--5ss-3m2a5009e;  # 舌.ꡈ5≯ß
+舌.ꡈ5≯ß; ; [P1, V6]; xn--tc1a.xn--5-qfa988w745i; ; xn--tc1a.xn--5ss-3m2a5009e;  # 舌.ꡈ5≯ß
+舌.ꡈ5≯ß; 舌.ꡈ5≯ß; [P1, V6]; xn--tc1a.xn--5-qfa988w745i; ; xn--tc1a.xn--5ss-3m2a5009e;  # 舌.ꡈ5≯ß
+舌.ꡈ5≯SS; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+舌.ꡈ5≯SS; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+舌.ꡈ5≯ss; ; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+舌.ꡈ5≯ss; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+舌.ꡈ5≯Ss; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+舌.ꡈ5≯Ss; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+xn--tc1a.xn--5ss-3m2a5009e; 舌.ꡈ5≯ss; [V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+xn--tc1a.xn--5-qfa988w745i; 舌.ꡈ5≯ß; [V6]; xn--tc1a.xn--5-qfa988w745i; ; ;  # 舌.ꡈ5≯ß
+⾆．ꡈ５≯SS; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+⾆．ꡈ５≯SS; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+⾆．ꡈ５≯ss; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+⾆．ꡈ５≯ss; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+⾆．ꡈ５≯Ss; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+⾆．ꡈ５≯Ss; 舌.ꡈ5≯ss; [P1, V6]; xn--tc1a.xn--5ss-3m2a5009e; ; ;  # 舌.ꡈ5≯ss
+�8�．򾂈ݜ; �8�.򾂈ݜ; [B1, B5, B6, C2, P1, V5, V6]; xn--8-yke534n.xn--gpb79046m; ; xn--8-yke.xn--gpb79046m; [B1, B5, B6, P1, V5, V6] # �8.ݜ
+�8�.򾂈ݜ; ; [B1, B5, B6, C2, P1, V5, V6]; xn--8-yke534n.xn--gpb79046m; ; xn--8-yke.xn--gpb79046m; [B1, B5, B6, P1, V5, V6] # �8.ݜ
+xn--8-yke.xn--gpb79046m; �8.򾂈ݜ; [B1, B5, B6, V5, V6]; xn--8-yke.xn--gpb79046m; ; ;  # �8.ݜ
+xn--8-yke534n.xn--gpb79046m; �8�.򾂈ݜ; [B1, B5, B6, C2, V5, V6]; xn--8-yke534n.xn--gpb79046m; ; ;  # �8.ݜ
+򸷆ੰ≮򹓙．񞎧�󠯙ڶ; 򸷆ੰ≮򹓙.񞎧7󠯙ڶ; [B5, B6, P1, V6]; xn--ycc893jqh38rb6fa.xn--7-5uc53836ixt41c; ; ;  # ੰ≮.7ڶ
+򸷆ੰ≮򹓙．񞎧�󠯙ڶ; 򸷆ੰ≮򹓙.񞎧7󠯙ڶ; [B5, B6, P1, V6]; xn--ycc893jqh38rb6fa.xn--7-5uc53836ixt41c; ; ;  # ੰ≮.7ڶ
+򸷆ੰ≮򹓙.񞎧7󠯙ڶ; ; [B5, B6, P1, V6]; xn--ycc893jqh38rb6fa.xn--7-5uc53836ixt41c; ; ;  # ੰ≮.7ڶ
+򸷆ੰ≮򹓙.񞎧7󠯙ڶ; 򸷆ੰ≮򹓙.񞎧7󠯙ڶ; [B5, B6, P1, V6]; xn--ycc893jqh38rb6fa.xn--7-5uc53836ixt41c; ; ;  # ੰ≮.7ڶ
+xn--ycc893jqh38rb6fa.xn--7-5uc53836ixt41c; 򸷆ੰ≮򹓙.񞎧7󠯙ڶ; [B5, B6, V6]; xn--ycc893jqh38rb6fa.xn--7-5uc53836ixt41c; ; ;  # ੰ≮.7ڶ
+𞤪.ς; ; ; xn--ie6h.xn--3xa; ; xn--ie6h.xn--4xa;  # 𞤪.ς
+𞤈.Σ; 𞤪.σ; ; xn--ie6h.xn--4xa; ; ;  # 𞤪.σ
+𞤪.σ; ; ; xn--ie6h.xn--4xa; ; ;  # 𞤪.σ
+𞤈.σ; 𞤪.σ; ; xn--ie6h.xn--4xa; ; ;  # 𞤪.σ
+xn--ie6h.xn--4xa; 𞤪.σ; ; xn--ie6h.xn--4xa; ; ;  # 𞤪.σ
+𞤈.ς; 𞤪.ς; ; xn--ie6h.xn--3xa; ; xn--ie6h.xn--4xa;  # 𞤪.ς
+xn--ie6h.xn--3xa; 𞤪.ς; ; xn--ie6h.xn--3xa; ; ;  # 𞤪.ς
+𞤪.Σ; 𞤪.σ; ; xn--ie6h.xn--4xa; ; ;  # 𞤪.σ
+‌Ⴚ｡ς; ‌Ⴚ.ς; [C1, P1, V6]; xn--ynd759e.xn--3xa; ; xn--ynd.xn--4xa; [P1, V6] # Ⴚ.ς
+‌Ⴚ。ς; ‌Ⴚ.ς; [C1, P1, V6]; xn--ynd759e.xn--3xa; ; xn--ynd.xn--4xa; [P1, V6] # Ⴚ.ς
+‌ⴚ。ς; ‌ⴚ.ς; [C1]; xn--0ug262c.xn--3xa; ; xn--ilj.xn--4xa; [] # ⴚ.ς
+‌Ⴚ。Σ; ‌Ⴚ.σ; [C1, P1, V6]; xn--ynd759e.xn--4xa; ; xn--ynd.xn--4xa; [P1, V6] # Ⴚ.σ
+‌ⴚ。σ; ‌ⴚ.σ; [C1]; xn--0ug262c.xn--4xa; ; xn--ilj.xn--4xa; [] # ⴚ.σ
+xn--ilj.xn--4xa; ⴚ.σ; ; xn--ilj.xn--4xa; ; ;  # ⴚ.σ
+ⴚ.σ; ; ; xn--ilj.xn--4xa; ; ;  # ⴚ.σ
+Ⴚ.Σ; Ⴚ.σ; [P1, V6]; xn--ynd.xn--4xa; ; ;  # Ⴚ.σ
+â´š.Ï‚; ; ; xn--ilj.xn--3xa; ; xn--ilj.xn--4xa;  # â´š.Ï‚
+Ⴚ.ς; ; [P1, V6]; xn--ynd.xn--3xa; ; xn--ynd.xn--4xa;  # Ⴚ.ς
+xn--ynd.xn--4xa; Ⴚ.σ; [V6]; xn--ynd.xn--4xa; ; ;  # Ⴚ.σ
+xn--ynd.xn--3xa; Ⴚ.ς; [V6]; xn--ynd.xn--3xa; ; ;  # Ⴚ.ς
+xn--ilj.xn--3xa; â´š.Ï‚; ; xn--ilj.xn--3xa; ; ;  # â´š.Ï‚
+Ⴚ.σ; ; [P1, V6]; xn--ynd.xn--4xa; ; ;  # Ⴚ.σ
+xn--0ug262c.xn--4xa; ‌ⴚ.σ; [C1]; xn--0ug262c.xn--4xa; ; ;  # ⴚ.σ
+xn--ynd759e.xn--4xa; ‌Ⴚ.σ; [C1, V6]; xn--ynd759e.xn--4xa; ; ;  # Ⴚ.σ
+xn--0ug262c.xn--3xa; ‌ⴚ.ς; [C1]; xn--0ug262c.xn--3xa; ; ;  # ⴚ.ς
+xn--ynd759e.xn--3xa; ‌Ⴚ.ς; [C1, V6]; xn--ynd759e.xn--3xa; ; ;  # Ⴚ.ς
+‌ⴚ｡ς; ‌ⴚ.ς; [C1]; xn--0ug262c.xn--3xa; ; xn--ilj.xn--4xa; [] # ⴚ.ς
+‌Ⴚ｡Σ; ‌Ⴚ.σ; [C1, P1, V6]; xn--ynd759e.xn--4xa; ; xn--ynd.xn--4xa; [P1, V6] # Ⴚ.σ
+‌ⴚ｡σ; ‌ⴚ.σ; [C1]; xn--0ug262c.xn--4xa; ; xn--ilj.xn--4xa; [] # ⴚ.σ
+𞤃．�; 𞤥.�; [B1]; xn--de6h.xn--eo0d; ; ;  # 𞤥.�
+𞤃.�; 𞤥.�; [B1]; xn--de6h.xn--eo0d; ; ;  # 𞤥.�
+𞤥.�; ; [B1]; xn--de6h.xn--eo0d; ; ;  # 𞤥.�
+xn--de6h.xn--eo0d; 𞤥.�; [B1]; xn--de6h.xn--eo0d; ; ;  # 𞤥.�
+𞤥．�; 𞤥.�; [B1]; xn--de6h.xn--eo0d; ; ;  # 𞤥.�
+�⾕。‌�꥓ꡎ; �谷.‌꥓�ꡎ; [C1, C2]; xn--1ug0273b.xn--0sa359l6n7g13a; ; xn--6g3a.xn--0sa8175flwa; [V5] # 谷.꥓�ꡎ
+�⾕。‌꥓�ꡎ; �谷.‌꥓�ꡎ; [C1, C2]; xn--1ug0273b.xn--0sa359l6n7g13a; ; xn--6g3a.xn--0sa8175flwa; [V5] # 谷.꥓�ꡎ
+�谷。‌꥓�ꡎ; �谷.‌꥓�ꡎ; [C1, C2]; xn--1ug0273b.xn--0sa359l6n7g13a; ; xn--6g3a.xn--0sa8175flwa; [V5] # 谷.꥓�ꡎ
+xn--6g3a.xn--0sa8175flwa; 谷.꥓�ꡎ; [V5]; xn--6g3a.xn--0sa8175flwa; ; ;  # 谷.꥓�ꡎ
+xn--1ug0273b.xn--0sa359l6n7g13a; �谷.‌꥓�ꡎ; [C1, C2]; xn--1ug0273b.xn--0sa359l6n7g13a; ; ;  # 谷.꥓�ꡎ
+ڪ-뉔．�‌; ڪ-뉔.𞤲‌; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; xn----guc3592k.xn--qe6h; [B2, B3] # ڪ-뉔.𞤲
+ڪ-뉔．�‌; ڪ-뉔.𞤲‌; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; xn----guc3592k.xn--qe6h; [B2, B3] # ڪ-뉔.𞤲
+ڪ-뉔.�‌; ڪ-뉔.𞤲‌; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; xn----guc3592k.xn--qe6h; [B2, B3] # ڪ-뉔.𞤲
+ڪ-뉔.�‌; ڪ-뉔.𞤲‌; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; xn----guc3592k.xn--qe6h; [B2, B3] # ڪ-뉔.𞤲
+ڪ-뉔.𞤲‌; ڪ-뉔.𞤲‌; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; xn----guc3592k.xn--qe6h; [B2, B3] # ڪ-뉔.𞤲
+ڪ-뉔.𞤲‌; ; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; xn----guc3592k.xn--qe6h; [B2, B3] # ڪ-뉔.𞤲
+xn----guc3592k.xn--qe6h; ڪ-뉔.𞤲; [B2, B3]; xn----guc3592k.xn--qe6h; ; ;  # ڪ-뉔.𞤲
+xn----guc3592k.xn--0ug7611p; ڪ-뉔.𞤲‌; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; ;  # ڪ-뉔.𞤲
+ڪ-뉔．𞤲‌; ڪ-뉔.𞤲‌; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; xn----guc3592k.xn--qe6h; [B2, B3] # ڪ-뉔.𞤲
+ڪ-뉔．𞤲‌; ڪ-뉔.𞤲‌; [B2, B3, C1]; xn----guc3592k.xn--0ug7611p; ; xn----guc3592k.xn--qe6h; [B2, B3] # ڪ-뉔.𞤲
+񔲵５ᦛς.꣄ݻܸ᳒; 񔲵5ᦛς.꣄ݻܸ᳒; [B1, P1, V5, V6]; xn--5-ymb298ng603j.xn--fob7kk44dl41k; ; xn--5-0mb988ng603j.xn--fob7kk44dl41k;  # 5ᦛς.꣄ݻܸ᳒
+񔲵５ᦛς.꣄ݻܸ᳒; 񔲵5ᦛς.꣄ݻܸ᳒; [B1, P1, V5, V6]; xn--5-ymb298ng603j.xn--fob7kk44dl41k; ; xn--5-0mb988ng603j.xn--fob7kk44dl41k;  # 5ᦛς.꣄ݻܸ᳒
+񔲵5ᦛς.꣄ݻܸ᳒; ; [B1, P1, V5, V6]; xn--5-ymb298ng603j.xn--fob7kk44dl41k; ; xn--5-0mb988ng603j.xn--fob7kk44dl41k;  # 5ᦛς.꣄ݻܸ᳒
+񔲵5ᦛΣ.꣄ݻܸ᳒; 񔲵5ᦛσ.꣄ݻܸ᳒; [B1, P1, V5, V6]; xn--5-0mb988ng603j.xn--fob7kk44dl41k; ; ;  # 5ᦛσ.꣄ݻܸ᳒
+񔲵5ᦛσ.꣄ݻܸ᳒; ; [B1, P1, V5, V6]; xn--5-0mb988ng603j.xn--fob7kk44dl41k; ; ;  # 5ᦛσ.꣄ݻܸ᳒
+xn--5-0mb988ng603j.xn--fob7kk44dl41k; 񔲵5ᦛσ.꣄ݻܸ᳒; [B1, V5, V6]; xn--5-0mb988ng603j.xn--fob7kk44dl41k; ; ;  # 5ᦛσ.꣄ݻܸ᳒
+xn--5-ymb298ng603j.xn--fob7kk44dl41k; 񔲵5ᦛς.꣄ݻܸ᳒; [B1, V5, V6]; xn--5-ymb298ng603j.xn--fob7kk44dl41k; ; ;  # 5ᦛς.꣄ݻܸ᳒
+񔲵５ᦛΣ.꣄ݻܸ᳒; 񔲵5ᦛσ.꣄ݻܸ᳒; [B1, P1, V5, V6]; xn--5-0mb988ng603j.xn--fob7kk44dl41k; ; ;  # 5ᦛσ.꣄ݻܸ᳒
+񔲵５ᦛσ.꣄ݻܸ᳒; 񔲵5ᦛσ.꣄ݻܸ᳒; [B1, P1, V5, V6]; xn--5-0mb988ng603j.xn--fob7kk44dl41k; ; ;  # 5ᦛσ.꣄ݻܸ᳒
+񔲵５ᦛΣ.꣄ݻܸ᳒; 񔲵5ᦛσ.꣄ݻܸ᳒; [B1, P1, V5, V6]; xn--5-0mb988ng603j.xn--fob7kk44dl41k; ; ;  # 5ᦛσ.꣄ݻܸ᳒
+񔲵５ᦛσ.꣄ݻܸ᳒; 񔲵5ᦛσ.꣄ݻܸ᳒; [B1, P1, V5, V6]; xn--5-0mb988ng603j.xn--fob7kk44dl41k; ; ;  # 5ᦛσ.꣄ݻܸ᳒
+淽。ᠾ; 淽.ᠾ; ; xn--34w.xn--x7e; ; ;  # 淽.ᠾ
+xn--34w.xn--x7e; æ·½.á ¾; ; xn--34w.xn--x7e; ; ;  # æ·½.á ¾
+æ·½.á ¾; ; ; xn--34w.xn--x7e; ; ;  # æ·½.á ¾
+�𑘷。-; �𑘷.-; [B1, V3]; xn--so0do6k.-; ; ;  # �𑘷.-
+xn--so0do6k.-; �𑘷.-; [B1, V3]; xn--so0do6k.-; ; ;  # �𑘷.-
+򬨩Ⴓ�｡𑄨; 򬨩Ⴓ�.𑄨; [P1, V5, V6]; xn--rnd896i0j14q.xn--k80d; ; ;  # Ⴓ�.𑄨
+򬨩Ⴓ�。𑄨; 򬨩Ⴓ�.𑄨; [P1, V5, V6]; xn--rnd896i0j14q.xn--k80d; ; ;  # Ⴓ�.𑄨
+򬨩ⴓ�。𑄨; 򬨩ⴓ�.𑄨; [P1, V5, V6]; xn--8di78qvw32y.xn--k80d; ; ;  # ⴓ�.𑄨
+xn--8di78qvw32y.xn--k80d; 򬨩ⴓ�.𑄨; [V5, V6]; xn--8di78qvw32y.xn--k80d; ; ;  # ⴓ�.𑄨
+xn--rnd896i0j14q.xn--k80d; 򬨩Ⴓ�.𑄨; [V5, V6]; xn--rnd896i0j14q.xn--k80d; ; ;  # Ⴓ�.𑄨
+򬨩ⴓ�｡𑄨; 򬨩ⴓ�.𑄨; [P1, V5, V6]; xn--8di78qvw32y.xn--k80d; ; ;  # ⴓ�.𑄨
+‌�𞤌Ⴇ｡ßႣ; ‌�𞤮Ⴇ.ßႣ; [B1, C1, P1, V6]; xn--fnd599eyj4pr50g.xn--zca681f; ; xn--fnd1201kegrf.xn--ss-fek; [B1, P1, V6] # �𞤮Ⴇ.ßႣ
+‌�𞤌Ⴇ。ßႣ; ‌�𞤮Ⴇ.ßႣ; [B1, C1, P1, V6]; xn--fnd599eyj4pr50g.xn--zca681f; ; xn--fnd1201kegrf.xn--ss-fek; [B1, P1, V6] # �𞤮Ⴇ.ßႣ
+‌�𞤮ⴇ。ßⴃ; ‌�𞤮ⴇ.ßⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--zca417t; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ßⴃ
+‌�𞤌Ⴇ。SSႣ; ‌�𞤮Ⴇ.ssႣ; [B1, C1, P1, V6]; xn--fnd599eyj4pr50g.xn--ss-fek; ; xn--fnd1201kegrf.xn--ss-fek; [B1, P1, V6] # �𞤮Ⴇ.ssႣ
+‌�𞤮ⴇ。ssⴃ; ‌�𞤮ⴇ.ssⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--ss-151a; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ssⴃ
+‌�𞤌ⴇ。Ssⴃ; ‌�𞤮ⴇ.ssⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--ss-151a; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ssⴃ
+xn--ykj9323eegwf.xn--ss-151a; �𞤮ⴇ.ssⴃ; [B1]; xn--ykj9323eegwf.xn--ss-151a; ; ;  # �𞤮ⴇ.ssⴃ
+xn--0ug332c3q0pr56g.xn--ss-151a; ‌�𞤮ⴇ.ssⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--ss-151a; ; ;  # �𞤮ⴇ.ssⴃ
+xn--fnd1201kegrf.xn--ss-fek; �𞤮Ⴇ.ssႣ; [B1, V6]; xn--fnd1201kegrf.xn--ss-fek; ; ;  # �𞤮Ⴇ.ssႣ
+xn--fnd599eyj4pr50g.xn--ss-fek; ‌�𞤮Ⴇ.ssႣ; [B1, C1, V6]; xn--fnd599eyj4pr50g.xn--ss-fek; ; ;  # �𞤮Ⴇ.ssႣ
+xn--0ug332c3q0pr56g.xn--zca417t; ‌�𞤮ⴇ.ßⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--zca417t; ; ;  # �𞤮ⴇ.ßⴃ
+xn--fnd599eyj4pr50g.xn--zca681f; ‌�𞤮Ⴇ.ßႣ; [B1, C1, V6]; xn--fnd599eyj4pr50g.xn--zca681f; ; ;  # �𞤮Ⴇ.ßႣ
+‌�𞤮ⴇ｡ßⴃ; ‌�𞤮ⴇ.ßⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--zca417t; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ßⴃ
+‌�𞤌Ⴇ｡SSႣ; ‌�𞤮Ⴇ.ssႣ; [B1, C1, P1, V6]; xn--fnd599eyj4pr50g.xn--ss-fek; ; xn--fnd1201kegrf.xn--ss-fek; [B1, P1, V6] # �𞤮Ⴇ.ssႣ
+‌�𞤮ⴇ｡ssⴃ; ‌�𞤮ⴇ.ssⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--ss-151a; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ssⴃ
+‌�𞤌ⴇ｡Ssⴃ; ‌�𞤮ⴇ.ssⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--ss-151a; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ssⴃ
+‌�𞤌ⴇ。ßⴃ; ‌�𞤮ⴇ.ßⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--zca417t; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ßⴃ
+‌�𞤌ⴇ。ssⴃ; ‌�𞤮ⴇ.ssⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--ss-151a; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ssⴃ
+‌�𞤌Ⴇ。Ssⴃ; ‌�𞤮Ⴇ.ssⴃ; [B1, C1, P1, V6]; xn--fnd599eyj4pr50g.xn--ss-151a; ; xn--fnd1201kegrf.xn--ss-151a; [B1, P1, V6] # �𞤮Ⴇ.ssⴃ
+xn--fnd1201kegrf.xn--ss-151a; �𞤮Ⴇ.ssⴃ; [B1, V6]; xn--fnd1201kegrf.xn--ss-151a; ; ;  # �𞤮Ⴇ.ssⴃ
+xn--fnd599eyj4pr50g.xn--ss-151a; ‌�𞤮Ⴇ.ssⴃ; [B1, C1, V6]; xn--fnd599eyj4pr50g.xn--ss-151a; ; ;  # �𞤮Ⴇ.ssⴃ
+‌�𞤌ⴇ｡ßⴃ; ‌�𞤮ⴇ.ßⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--zca417t; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ßⴃ
+‌�𞤌ⴇ｡ssⴃ; ‌�𞤮ⴇ.ssⴃ; [B1, C1]; xn--0ug332c3q0pr56g.xn--ss-151a; ; xn--ykj9323eegwf.xn--ss-151a; [B1] # �𞤮ⴇ.ssⴃ
+‌�𞤌Ⴇ｡Ssⴃ; ‌�𞤮Ⴇ.ssⴃ; [B1, C1, P1, V6]; xn--fnd599eyj4pr50g.xn--ss-151a; ; xn--fnd1201kegrf.xn--ss-151a; [B1, P1, V6] # �𞤮Ⴇ.ssⴃ
+៿｡𞬳; ៿.𞬳; [P1, V6]; xn--45e.xn--et6h; ; ;  # .
+៿。𞬳; ៿.𞬳; [P1, V6]; xn--45e.xn--et6h; ; ;  # .
+xn--45e.xn--et6h; ៿.𞬳; [V6]; xn--45e.xn--et6h; ; ;  # .
+ْ�｡�𑚳; ْ�.�𑚳; [C2, V5]; xn--uhb882k.xn--8tc4527k; ; xn--uhb.xn--8tc4527k; [V5] # ْ.�𑚳
+ْ�。�𑚳; ْ�.�𑚳; [C2, V5]; xn--uhb882k.xn--8tc4527k; ; xn--uhb.xn--8tc4527k; [V5] # ْ.�𑚳
+xn--uhb.xn--8tc4527k; ْ.�𑚳; [V5]; xn--uhb.xn--8tc4527k; ; ;  # ْ.�𑚳
+xn--uhb882k.xn--8tc4527k; ْ�.�𑚳; [C2, V5]; xn--uhb882k.xn--8tc4527k; ; ;  # ْ.�𑚳
+-≠ᠻ．ݭ𞥃≮󟷺; -≠ᠻ.ݭ𞥃≮󟷺; [B1, B2, B3, P1, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+-≠ᠻ．ݭ𞥃≮󟷺; -≠ᠻ.ݭ𞥃≮󟷺; [B1, B2, B3, P1, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+-≠ᠻ.ݭ𞥃≮󟷺; ; [B1, B2, B3, P1, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+-≠ᠻ.ݭ𞥃≮󟷺; -≠ᠻ.ݭ𞥃≮󟷺; [B1, B2, B3, P1, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+-≠ᠻ.ݭ𞤡≮󟷺; -≠ᠻ.ݭ𞥃≮󟷺; [B1, B2, B3, P1, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+-≠ᠻ.ݭ𞤡≮󟷺; -≠ᠻ.ݭ𞥃≮󟷺; [B1, B2, B3, P1, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+xn----g6j886c.xn--xpb049kk353abj99f; -≠ᠻ.ݭ𞥃≮󟷺; [B1, B2, B3, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+-≠ᠻ．ݭ𞤡≮󟷺; -≠ᠻ.ݭ𞥃≮󟷺; [B1, B2, B3, P1, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+-≠ᠻ．ݭ𞤡≮󟷺; -≠ᠻ.ݭ𞥃≮󟷺; [B1, B2, B3, P1, V3, V6]; xn----g6j886c.xn--xpb049kk353abj99f; ; ;  # -≠ᠻ.ݭ𞥃≮
+󠰆≯޵�．򊥕≮�ࡌ; 󠰆≯޵�.򊥕≮�ࡌ; [B1, B5, B6, P1, V6]; xn--zrb797kdm1oes34i.xn--bwb394k8k2o25n6d; ; ;  # ≯.≮�ࡌ
+󠰆≯޵�．򊥕≮�ࡌ; 󠰆≯޵�.򊥕≮�ࡌ; [B1, B5, B6, P1, V6]; xn--zrb797kdm1oes34i.xn--bwb394k8k2o25n6d; ; ;  # ≯.≮�ࡌ
+󠰆≯޵�.򊥕≮�ࡌ; ; [B1, B5, B6, P1, V6]; xn--zrb797kdm1oes34i.xn--bwb394k8k2o25n6d; ; ;  # ≯.≮�ࡌ
+󠰆≯޵�.򊥕≮�ࡌ; 󠰆≯޵�.򊥕≮�ࡌ; [B1, B5, B6, P1, V6]; xn--zrb797kdm1oes34i.xn--bwb394k8k2o25n6d; ; ;  # ≯.≮�ࡌ
+xn--zrb797kdm1oes34i.xn--bwb394k8k2o25n6d; 󠰆≯޵�.򊥕≮�ࡌ; [B1, B5, B6, V6]; xn--zrb797kdm1oes34i.xn--bwb394k8k2o25n6d; ; ;  # ≯.≮�ࡌ
+≠󦋂.؀�-ڹ; ; [B1, P1, V6]; xn--1ch22084l.xn----qkc07co6n; ; ;  # ≠.�-ڹ
+≠󦋂.؀�-ڹ; ≠󦋂.؀�-ڹ; [B1, P1, V6]; xn--1ch22084l.xn----qkc07co6n; ; ;  # ≠.�-ڹ
+xn--1ch22084l.xn----qkc07co6n; ≠󦋂.؀�-ڹ; [B1, V6]; xn--1ch22084l.xn----qkc07co6n; ; ;  # ≠.�-ڹ
+��≠｡��; ��≠.��; [B1, P1, V5, V6]; xn--54e694cn389z.xn--787ct8r; ; ;  # �≠.��
+��≠｡��; ��≠.��; [B1, P1, V5, V6]; xn--54e694cn389z.xn--787ct8r; ; ;  # �≠.��
+��≠。��; ��≠.��; [B1, P1, V5, V6]; xn--54e694cn389z.xn--787ct8r; ; ;  # �≠.��
+��≠。��; ��≠.��; [B1, P1, V5, V6]; xn--54e694cn389z.xn--787ct8r; ; ;  # �≠.��
+xn--54e694cn389z.xn--787ct8r; ��≠.��; [B1, V5, V6]; xn--54e694cn389z.xn--787ct8r; ; ;  # �≠.��
+ß𰀻񆬗｡�🕮ß; ß𰀻񆬗.�🕮ß; [P1, V5, V6]; xn--zca20040bgrkh.xn--zca3653v86qa; ; xn--ss-jl59biy67d.xn--ss-4d11aw87d;  # ß𰀻.�🕮ß
+ß𰀻񆬗。�🕮ß; ß𰀻񆬗.�🕮ß; [P1, V5, V6]; xn--zca20040bgrkh.xn--zca3653v86qa; ; xn--ss-jl59biy67d.xn--ss-4d11aw87d;  # ß𰀻.�🕮ß
+SS𰀻񆬗。�🕮SS; ss𰀻񆬗.�🕮ss; [P1, V5, V6]; xn--ss-jl59biy67d.xn--ss-4d11aw87d; ; ;  # ss𰀻.�🕮ss
+ss𰀻񆬗。�🕮ss; ss𰀻񆬗.�🕮ss; [P1, V5, V6]; xn--ss-jl59biy67d.xn--ss-4d11aw87d; ; ;  # ss𰀻.�🕮ss
+Ss𰀻񆬗。�🕮Ss; ss𰀻񆬗.�🕮ss; [P1, V5, V6]; xn--ss-jl59biy67d.xn--ss-4d11aw87d; ; ;  # ss𰀻.�🕮ss
+xn--ss-jl59biy67d.xn--ss-4d11aw87d; ss𰀻񆬗.�🕮ss; [V5, V6]; xn--ss-jl59biy67d.xn--ss-4d11aw87d; ; ;  # ss𰀻.�🕮ss
+xn--zca20040bgrkh.xn--zca3653v86qa; ß𰀻񆬗.�🕮ß; [V5, V6]; xn--zca20040bgrkh.xn--zca3653v86qa; ; ;  # ß𰀻.�🕮ß
+SS𰀻񆬗｡�🕮SS; ss𰀻񆬗.�🕮ss; [P1, V5, V6]; xn--ss-jl59biy67d.xn--ss-4d11aw87d; ; ;  # ss𰀻.�🕮ss
+ss𰀻񆬗｡�🕮ss; ss𰀻񆬗.�🕮ss; [P1, V5, V6]; xn--ss-jl59biy67d.xn--ss-4d11aw87d; ; ;  # ss𰀻.�🕮ss
+Ss𰀻񆬗｡�🕮Ss; ss𰀻񆬗.�🕮ss; [P1, V5, V6]; xn--ss-jl59biy67d.xn--ss-4d11aw87d; ; ;  # ss𰀻.�🕮ss
+�。‌; �.‌; [C1, C2]; xn--1ug.xn--0ug; ; .; [A4_2] # .
+xn--1ug.xn--0ug; �.‌; [C1, C2]; xn--1ug.xn--0ug; ; ;  # .
+҃��.ឹ𞯌򟩚; ; [B1, C2, P1, V5, V6]; xn--m3a412lrr0o.xn--43e8670vmd79b; ; xn--m3a6965k.xn--43e8670vmd79b; [B1, P1, V5, V6] # ҃�.ឹ
+xn--m3a6965k.xn--43e8670vmd79b; ҃�.ឹ𞯌򟩚; [B1, V5, V6]; xn--m3a6965k.xn--43e8670vmd79b; ; ;  # ҃�.ឹ
+xn--m3a412lrr0o.xn--43e8670vmd79b; ҃��.ឹ𞯌򟩚; [B1, C2, V5, V6]; xn--m3a412lrr0o.xn--43e8670vmd79b; ; ;  # ҃�.ឹ
+‌�‌临。ꡢ򄷞��; ‌�‌临.ꡢ򄷞��; [B1, B5, B6, C1, P1, V6]; xn--0uga2656aop9k.xn--uojv340bk71c99u9f; ; xn--miq9646b.xn--uojv340bk71c99u9f; [B2, B3, B5, B6, P1, V6] # �临.ꡢ��
+xn--miq9646b.xn--uojv340bk71c99u9f; �临.ꡢ򄷞��; [B2, B3, B5, B6, V6]; xn--miq9646b.xn--uojv340bk71c99u9f; ; ;  # �临.ꡢ��
+xn--0uga2656aop9k.xn--uojv340bk71c99u9f; ‌�‌临.ꡢ򄷞��; [B1, B5, B6, C1, V6]; xn--0uga2656aop9k.xn--uojv340bk71c99u9f; ; ;  # �临.ꡢ��
+󠑘．󠄮; 󠑘.; [P1, V6]; xn--s136e.; ; ;  # .
+󠑘.󠄮; 󠑘.; [P1, V6]; xn--s136e.; ; ;  # .
+xn--s136e.; 󠑘.; [V6]; xn--s136e.; ; ;  # .
+��．꫶; ��.꫶; [B1, B3, B6, V5]; xn--wxc7880k.xn--2v9a; ; ;  # ��.꫶
+��.꫶; ; [B1, B3, B6, V5]; xn--wxc7880k.xn--2v9a; ; ;  # ��.꫶
+xn--wxc7880k.xn--2v9a; ��.꫶; [B1, B3, B6, V5]; xn--wxc7880k.xn--2v9a; ; ;  # ��.꫶
+ꦷ�멹。⒛󠨇; ꦷ�멹.⒛󠨇; [P1, V5, V6]; xn--ym9av13acp85w.xn--dth22121k; ; ;  # ꦷ멹.⒛
+ꦷ�멹。⒛󠨇; ꦷ�멹.⒛󠨇; [P1, V5, V6]; xn--ym9av13acp85w.xn--dth22121k; ; ;  # ꦷ멹.⒛
+ꦷ�멹。20.󠨇; ꦷ�멹.20.󠨇; [P1, V5, V6]; xn--ym9av13acp85w.20.xn--d846e; ; ;  # ꦷ멹.20.
+ꦷ�멹。20.󠨇; ꦷ�멹.20.󠨇; [P1, V5, V6]; xn--ym9av13acp85w.20.xn--d846e; ; ;  # ꦷ멹.20.
+xn--ym9av13acp85w.20.xn--d846e; ꦷ�멹.20.󠨇; [V5, V6]; xn--ym9av13acp85w.20.xn--d846e; ; ;  # ꦷ멹.20.
+xn--ym9av13acp85w.xn--dth22121k; ꦷ�멹.⒛󠨇; [V5, V6]; xn--ym9av13acp85w.xn--dth22121k; ; ;  # ꦷ멹.⒛
+Ⴅ󲬹릖󠶚.ݷ�⒊; ; [B4, B6, P1, V6]; xn--dnd2167fnet0io02g.xn--7pb000mwm4n; ; ;  # Ⴅ릖.ݷ�⒊
+Ⴅ󲬹릖󠶚.ݷ�⒊; Ⴅ󲬹릖󠶚.ݷ�⒊; [B4, B6, P1, V6]; xn--dnd2167fnet0io02g.xn--7pb000mwm4n; ; ;  # Ⴅ릖.ݷ�⒊
+Ⴅ󲬹릖󠶚.ݷ�3.; ; [B4, B6, P1, V6]; xn--dnd2167fnet0io02g.xn--3-55c6803r.; ; ;  # Ⴅ릖.ݷ�3.
+Ⴅ󲬹릖󠶚.ݷ�3.; Ⴅ󲬹릖󠶚.ݷ�3.; [B4, B6, P1, V6]; xn--dnd2167fnet0io02g.xn--3-55c6803r.; ; ;  # Ⴅ릖.ݷ�3.
+ⴅ󲬹릖󠶚.ݷ�3.; ⴅ󲬹릖󠶚.ݷ�3.; [B4, B6, P1, V6]; xn--wkj8016bne45io02g.xn--3-55c6803r.; ; ;  # ⴅ릖.ݷ�3.
+ⴅ󲬹릖󠶚.ݷ�3.; ; [B4, B6, P1, V6]; xn--wkj8016bne45io02g.xn--3-55c6803r.; ; ;  # ⴅ릖.ݷ�3.
+xn--wkj8016bne45io02g.xn--3-55c6803r.; ⴅ󲬹릖󠶚.ݷ�3.; [B4, B6, V6]; xn--wkj8016bne45io02g.xn--3-55c6803r.; ; ;  # ⴅ릖.ݷ�3.
+xn--dnd2167fnet0io02g.xn--3-55c6803r.; Ⴅ󲬹릖󠶚.ݷ�3.; [B4, B6, V6]; xn--dnd2167fnet0io02g.xn--3-55c6803r.; ; ;  # Ⴅ릖.ݷ�3.
+ⴅ󲬹릖󠶚.ݷ�⒊; ⴅ󲬹릖󠶚.ݷ�⒊; [B4, B6, P1, V6]; xn--wkj8016bne45io02g.xn--7pb000mwm4n; ; ;  # ⴅ릖.ݷ�⒊
+ⴅ󲬹릖󠶚.ݷ�⒊; ; [B4, B6, P1, V6]; xn--wkj8016bne45io02g.xn--7pb000mwm4n; ; ;  # ⴅ릖.ݷ�⒊
+xn--wkj8016bne45io02g.xn--7pb000mwm4n; ⴅ󲬹릖󠶚.ݷ�⒊; [B4, B6, V6]; xn--wkj8016bne45io02g.xn--7pb000mwm4n; ; ;  # ⴅ릖.ݷ�⒊
+xn--dnd2167fnet0io02g.xn--7pb000mwm4n; Ⴅ󲬹릖󠶚.ݷ�⒊; [B4, B6, V6]; xn--dnd2167fnet0io02g.xn--7pb000mwm4n; ; ;  # Ⴅ릖.ݷ�⒊
+‌｡︒; ‌.︒; [C1, P1, V6]; xn--0ug.xn--y86c; ; .xn--y86c; [P1, V6, A4_2] # .︒
+‌。。; ‌..; [C1, X4_2]; xn--0ug..; [C1, A4_2]; ..; [A4_2] # ..
+..; ; [X4_2]; ; [A4_2]; ;  # ..
+xn--0ug..; ‌..; [C1, X4_2]; xn--0ug..; [C1, A4_2]; ;  # ..
+.xn--y86c; .︒; [V6, X4_2]; .xn--y86c; [V6, A4_2]; ;  # .︒
+xn--0ug.xn--y86c; ‌.︒; [C1, V6]; xn--0ug.xn--y86c; ; ;  # .︒
+≯ݭ．₄; ≯ݭ.4; [B1, P1, V6]; xn--xpb149k.4; ; ;  # ≯ݭ.4
+≯ݭ．₄; ≯ݭ.4; [B1, P1, V6]; xn--xpb149k.4; ; ;  # ≯ݭ.4
+≯ݭ.4; ; [B1, P1, V6]; xn--xpb149k.4; ; ;  # ≯ݭ.4
+≯ݭ.4; ≯ݭ.4; [B1, P1, V6]; xn--xpb149k.4; ; ;  # ≯ݭ.4
+xn--xpb149k.4; ≯ݭ.4; [B1, V6]; xn--xpb149k.4; ; ;  # ≯ݭ.4
+ᡲ-�.ß-‌-; ᡲ-3.ß-‌-; [C1, V3]; xn---3-p9o.xn-----fia9303a; ; xn---3-p9o.ss--; [V2, V3] # ᡲ-3.ß--
+ᡲ-3.ß-‌-; ; [C1, V3]; xn---3-p9o.xn-----fia9303a; ; xn---3-p9o.ss--; [V2, V3] # ᡲ-3.ß--
+ᡲ-3.SS-‌-; ᡲ-3.ss-‌-; [C1, V3]; xn---3-p9o.xn--ss---276a; ; xn---3-p9o.ss--; [V2, V3] # ᡲ-3.ss--
+ᡲ-3.ss-‌-; ; [C1, V3]; xn---3-p9o.xn--ss---276a; ; xn---3-p9o.ss--; [V2, V3] # ᡲ-3.ss--
+ᡲ-3.Ss-‌-; ᡲ-3.ss-‌-; [C1, V3]; xn---3-p9o.xn--ss---276a; ; xn---3-p9o.ss--; [V2, V3] # ᡲ-3.ss--
+xn---3-p9o.ss--; ᡲ-3.ss--; [V2, V3]; xn---3-p9o.ss--; ; ;  # ᡲ-3.ss--
+xn---3-p9o.xn--ss---276a; ᡲ-3.ss-‌-; [C1, V3]; xn---3-p9o.xn--ss---276a; ; ;  # ᡲ-3.ss--
+xn---3-p9o.xn-----fia9303a; ᡲ-3.ß-‌-; [C1, V3]; xn---3-p9o.xn-----fia9303a; ; ;  # ᡲ-3.ß--
+ᡲ-�.SS-‌-; ᡲ-3.ss-‌-; [C1, V3]; xn---3-p9o.xn--ss---276a; ; xn---3-p9o.ss--; [V2, V3] # ᡲ-3.ss--
+ᡲ-�.ss-‌-; ᡲ-3.ss-‌-; [C1, V3]; xn---3-p9o.xn--ss---276a; ; xn---3-p9o.ss--; [V2, V3] # ᡲ-3.ss--
+ᡲ-�.Ss-‌-; ᡲ-3.ss-‌-; [C1, V3]; xn---3-p9o.xn--ss---276a; ; xn---3-p9o.ss--; [V2, V3] # ᡲ-3.ss--
+ﴈ�ه󎊯｡Ӏ; ضي4ه󎊯.Ӏ; [B2, B3, P1, V6]; xn--4-tnc6ck183523b.xn--d5a; ; ;  # ضي4ه.Ӏ
+ضي4ه󎊯。Ӏ; ضي4ه󎊯.Ӏ; [B2, B3, P1, V6]; xn--4-tnc6ck183523b.xn--d5a; ; ;  # ضي4ه.Ӏ
+ضي4ه󎊯。�; ضي4ه󎊯.�; [B2, B3, P1, V6]; xn--4-tnc6ck183523b.xn--s5a; ; ;  # ضي4ه.�
+xn--4-tnc6ck183523b.xn--s5a; ضي4ه󎊯.�; [B2, B3, V6]; xn--4-tnc6ck183523b.xn--s5a; ; ;  # ضي4ه.�
+xn--4-tnc6ck183523b.xn--d5a; ضي4ه󎊯.Ӏ; [B2, B3, V6]; xn--4-tnc6ck183523b.xn--d5a; ; ;  # ضي4ه.Ӏ
+ﴈ�ه󎊯｡�; ضي4ه󎊯.�; [B2, B3, P1, V6]; xn--4-tnc6ck183523b.xn--s5a; ; ;  # ضي4ه.�
+-.؂آ𑆾�; ; [B1, P1, V3, V6]; -.xn--kfb8dy983hgl7g; ; ;  # -.آ𑆾�
+-.؂آ𑆾�; -.؂آ𑆾�; [B1, P1, V3, V6]; -.xn--kfb8dy983hgl7g; ; ;  # -.آ𑆾�
+-.xn--kfb8dy983hgl7g; -.؂آ𑆾�; [B1, V3, V6]; -.xn--kfb8dy983hgl7g; ; ;  # -.آ𑆾�
+󙶜ᢘ。᩿⺢; 󙶜ᢘ.᩿⺢; [P1, V5, V6]; xn--ibf35138o.xn--fpfz94g; ; ;  # ᢘ.᩿⺢
+xn--ibf35138o.xn--fpfz94g; 󙶜ᢘ.᩿⺢; [V5, V6]; xn--ibf35138o.xn--fpfz94g; ; ;  # ᢘ.᩿⺢
+≠ႷᠤႫ｡?͌س觴; ≠ႷᠤႫ.?͌س觴; [B1, B5, P1, V6]; xn--jndx718cnnl.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ႷᠤႫ.͌س觴
+≠ႷᠤႫ｡?͌س觴; ≠ႷᠤႫ.?͌س觴; [B1, B5, P1, V6]; xn--jndx718cnnl.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ႷᠤႫ.͌س觴
+≠ႷᠤႫ。?͌س觴; ≠ႷᠤႫ.?͌س觴; [B1, B5, P1, V6]; xn--jndx718cnnl.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ႷᠤႫ.͌س觴
+≠ႷᠤႫ。?͌س觴; ≠ႷᠤႫ.?͌س觴; [B1, B5, P1, V6]; xn--jndx718cnnl.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ႷᠤႫ.͌س觴
+≠ⴗᠤⴋ。?͌س觴; ≠ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--66e353ce0ilb.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ⴗᠤⴋ.͌س觴
+≠ⴗᠤⴋ。?͌س觴; ≠ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--66e353ce0ilb.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ⴗᠤⴋ.͌س觴
+≠Ⴗᠤⴋ。?͌س觴; ≠Ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--vnd619as6ig6k.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠Ⴗᠤⴋ.͌س觴
+≠Ⴗᠤⴋ。?͌س觴; ≠Ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--vnd619as6ig6k.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠Ⴗᠤⴋ.͌س觴
+xn--vnd619as6ig6k.?͌س觴; ≠Ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--vnd619as6ig6k.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠Ⴗᠤⴋ.͌س觴
+XN--VND619AS6IG6K.?͌س觴; ≠Ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--vnd619as6ig6k.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠Ⴗᠤⴋ.͌س觴
+Xn--Vnd619as6ig6k.?͌س觴; ≠Ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--vnd619as6ig6k.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠Ⴗᠤⴋ.͌س觴
+xn--66e353ce0ilb.?͌س觴; ≠ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--66e353ce0ilb.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ⴗᠤⴋ.͌س觴
+XN--66E353CE0ILB.?͌س觴; ≠ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--66e353ce0ilb.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ⴗᠤⴋ.͌س觴
+Xn--66e353ce0ilb.?͌س觴; ≠ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--66e353ce0ilb.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ⴗᠤⴋ.͌س觴
+xn--jndx718cnnl.?͌س觴; ≠ႷᠤႫ.?͌س觴; [B1, B5, P1, V6]; xn--jndx718cnnl.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ႷᠤႫ.͌س觴
+XN--JNDX718CNNL.?͌س觴; ≠ႷᠤႫ.?͌س觴; [B1, B5, P1, V6]; xn--jndx718cnnl.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ႷᠤႫ.͌س觴
+Xn--Jndx718cnnl.?͌س觴; ≠ႷᠤႫ.?͌س觴; [B1, B5, P1, V6]; xn--jndx718cnnl.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ႷᠤႫ.͌س觴
+≠ⴗᠤⴋ｡?͌س觴; ≠ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--66e353ce0ilb.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ⴗᠤⴋ.͌س觴
+≠ⴗᠤⴋ｡?͌س觴; ≠ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--66e353ce0ilb.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠ⴗᠤⴋ.͌س觴
+≠Ⴗᠤⴋ｡?͌س觴; ≠Ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--vnd619as6ig6k.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠Ⴗᠤⴋ.͌س觴
+≠Ⴗᠤⴋ｡?͌س觴; ≠Ⴗᠤⴋ.?͌س觴; [B1, B5, P1, V6]; xn--vnd619as6ig6k.?͌س觴; [B1, B5, P1, V6, A3]; ;  # ≠Ⴗᠤⴋ.͌س觴
+٧.�; ; [B1, P1, V6]; xn--gib.xn--vm9c; ; ;  # ٧.
+xn--gib.xn--vm9c; ٧.�; [B1, V6]; xn--gib.xn--vm9c; ; ;  # ٧.
+꧀�｡�񼑥�᯳; ꧀3.�񼑥�᯳; [B1, C2, P1, V5, V6]; xn--3-5z4e.xn--1zf96ony8ygd68c; ; xn--3-5z4e.xn--1zfz754hncv8b; [B5, P1, V5, V6] # ꧀3.�᯳
+꧀3。�񼑥�᯳; ꧀3.�񼑥�᯳; [B1, C2, P1, V5, V6]; xn--3-5z4e.xn--1zf96ony8ygd68c; ; xn--3-5z4e.xn--1zfz754hncv8b; [B5, P1, V5, V6] # ꧀3.�᯳
+xn--3-5z4e.xn--1zfz754hncv8b; ꧀3.񼑥�᯳; [B5, V5, V6]; xn--3-5z4e.xn--1zfz754hncv8b; ; ;  # ꧀3.�᯳
+xn--3-5z4e.xn--1zf96ony8ygd68c; ꧀3.�񼑥�᯳; [B1, C2, V5, V6]; xn--3-5z4e.xn--1zf96ony8ygd68c; ; ;  # ꧀3.�᯳
+򣕄4񠖽.≯٤𑀾󠸌; ; [B1, P1, V6]; xn--4-fg85dl688i.xn--dib174li86ntdy0i; ; ;  # 4.≯٤𑀾
+򣕄4񠖽.≯٤𑀾󠸌; 򣕄4񠖽.≯٤𑀾󠸌; [B1, P1, V6]; xn--4-fg85dl688i.xn--dib174li86ntdy0i; ; ;  # 4.≯٤𑀾
+xn--4-fg85dl688i.xn--dib174li86ntdy0i; 򣕄4񠖽.≯٤𑀾󠸌; [B1, V6]; xn--4-fg85dl688i.xn--dib174li86ntdy0i; ; ;  # 4.≯٤𑀾
+򗆧�。⒈᩶�򠘌; 򗆧3.⒈᩶2򠘌; [P1, V6]; xn--3-rj42h.xn--2-13k746cq465x; ; ;  # 3.⒈᩶2
+򗆧3。1.᩶2򠘌; 򗆧3.1.᩶2򠘌; [P1, V5, V6]; xn--3-rj42h.1.xn--2-13k96240l; ; ;  # 3.1.᩶2
+xn--3-rj42h.1.xn--2-13k96240l; 򗆧3.1.᩶2򠘌; [V5, V6]; xn--3-rj42h.1.xn--2-13k96240l; ; ;  # 3.1.᩶2
+xn--3-rj42h.xn--2-13k746cq465x; 򗆧3.⒈᩶2򠘌; [V6]; xn--3-rj42h.xn--2-13k746cq465x; ; ;  # 3.⒈᩶2
+�₅⒈。≯��; �5⒈.≯8�; [C2, P1, V6]; xn--5-tgnz5r.xn--8-ugn00i; ; xn--5-ecp.xn--8-ogo; [P1, V6] # 5⒈.≯8
+�₅⒈。≯��; �5⒈.≯8�; [C2, P1, V6]; xn--5-tgnz5r.xn--8-ugn00i; ; xn--5-ecp.xn--8-ogo; [P1, V6] # 5⒈.≯8
+�51.。≯8�; �51..≯8�; [C2, P1, V6, X4_2]; xn--51-l1t..xn--8-ugn00i; [C2, P1, V6, A4_2]; 51..xn--8-ogo; [P1, V6, A4_2] # 51..≯8
+�51.。≯8�; �51..≯8�; [C2, P1, V6, X4_2]; xn--51-l1t..xn--8-ugn00i; [C2, P1, V6, A4_2]; 51..xn--8-ogo; [P1, V6, A4_2] # 51..≯8
+51..xn--8-ogo; 51..≯8; [V6, X4_2]; 51..xn--8-ogo; [V6, A4_2]; ;  # 51..≯8
+xn--51-l1t..xn--8-ugn00i; �51..≯8�; [C2, V6, X4_2]; xn--51-l1t..xn--8-ugn00i; [C2, V6, A4_2]; ;  # 51..≯8
+xn--5-ecp.xn--8-ogo; 5⒈.≯8; [V6]; xn--5-ecp.xn--8-ogo; ; ;  # 5⒈.≯8
+xn--5-tgnz5r.xn--8-ugn00i; �5⒈.≯8�; [C2, V6]; xn--5-tgnz5r.xn--8-ugn00i; ; ;  # 5⒈.≯8
+ꡰڗႆ．򪘙ܯ≠‌; ꡰڗႆ.򪘙ܯ≠‌; [B5, B6, C1, P1, V6]; xn--tjb002cn51k.xn--5nb448jcubcz547b; ; xn--tjb002cn51k.xn--5nb630lbj91q; [B5, B6, P1, V6] # ꡰڗႆ.ܯ≠
+ꡰڗႆ．򪘙ܯ≠‌; ꡰڗႆ.򪘙ܯ≠‌; [B5, B6, C1, P1, V6]; xn--tjb002cn51k.xn--5nb448jcubcz547b; ; xn--tjb002cn51k.xn--5nb630lbj91q; [B5, B6, P1, V6] # ꡰڗႆ.ܯ≠
+ꡰڗႆ.򪘙ܯ≠‌; ; [B5, B6, C1, P1, V6]; xn--tjb002cn51k.xn--5nb448jcubcz547b; ; xn--tjb002cn51k.xn--5nb630lbj91q; [B5, B6, P1, V6] # ꡰڗႆ.ܯ≠
+ꡰڗႆ.򪘙ܯ≠‌; ꡰڗႆ.򪘙ܯ≠‌; [B5, B6, C1, P1, V6]; xn--tjb002cn51k.xn--5nb448jcubcz547b; ; xn--tjb002cn51k.xn--5nb630lbj91q; [B5, B6, P1, V6] # ꡰڗႆ.ܯ≠
+xn--tjb002cn51k.xn--5nb630lbj91q; ꡰڗႆ.򪘙ܯ≠; [B5, B6, V6]; xn--tjb002cn51k.xn--5nb630lbj91q; ; ;  # ꡰڗႆ.ܯ≠
+xn--tjb002cn51k.xn--5nb448jcubcz547b; ꡰڗႆ.򪘙ܯ≠‌; [B5, B6, C1, V6]; xn--tjb002cn51k.xn--5nb448jcubcz547b; ; ;  # ꡰڗႆ.ܯ≠
+𑄱｡򪌿�; 𑄱.򪌿�; [B1, B3, B5, B6, P1, V5, V6]; xn--t80d.xn--to0d14792b; ; ;  # 𑄱.�
+𑄱。򪌿�; 𑄱.򪌿�; [B1, B3, B5, B6, P1, V5, V6]; xn--t80d.xn--to0d14792b; ; ;  # 𑄱.�
+xn--t80d.xn--to0d14792b; 𑄱.򪌿�; [B1, B3, B5, B6, V5, V6]; xn--t80d.xn--to0d14792b; ; ;  # 𑄱.�
+�؀。ܽ; 3؀.ܽ; [B1, B3, B6, P1, V5, V6]; xn--3-rkc.xn--kob; ; ;  # 3.ܽ
+3؀。ܽ; 3؀.ܽ; [B1, B3, B6, P1, V5, V6]; xn--3-rkc.xn--kob; ; ;  # 3.ܽ
+xn--3-rkc.xn--kob; 3؀.ܽ; [B1, B3, B6, V5, V6]; xn--3-rkc.xn--kob; ; ;  # 3.ܽ
+ط�٦.ݭ긷; ; [B2, B3]; xn--2gb8gu829f.xn--xpb0156f; ; ;  # ط�٦.ݭ긷
+ط�٦.ݭ긷; ط�٦.ݭ긷; [B2, B3]; xn--2gb8gu829f.xn--xpb0156f; ; ;  # ط�٦.ݭ긷
+xn--2gb8gu829f.xn--xpb0156f; ط�٦.ݭ긷; [B2, B3]; xn--2gb8gu829f.xn--xpb0156f; ; ;  # ط�٦.ݭ긷
+︒Ↄⷧ򾀃．Ⴗ�; ︒Ↄⷧ򾀃.Ⴗ�; [B1, B5, B6, P1, V6]; xn--q5g000c056n0226g.xn--vnd8618j; ; ;  # ︒Ↄⷧ.Ⴗ
+。Ↄⷧ򾀃.Ⴗ�; .Ↄⷧ򾀃.Ⴗ�; [B5, B6, P1, V6, X4_2]; .xn--q5g000cll06u.xn--vnd8618j; [B5, B6, P1, V6, A4_2]; ;  # .Ↄⷧ.Ⴗ
+。ↄⷧ򾀃.ⴗ�; .ↄⷧ򾀃.ⴗ�; [B5, B6, P1, V6, X4_2]; .xn--r5gy00cll06u.xn--flj4541e; [B5, B6, P1, V6, A4_2]; ;  # .ↄⷧ.ⴗ
+.xn--r5gy00cll06u.xn--flj4541e; .ↄⷧ򾀃.ⴗ�; [B5, B6, V6, X4_2]; .xn--r5gy00cll06u.xn--flj4541e; [B5, B6, V6, A4_2]; ;  # .ↄⷧ.ⴗ
+.xn--q5g000cll06u.xn--vnd8618j; .Ↄⷧ򾀃.Ⴗ�; [B5, B6, V6, X4_2]; .xn--q5g000cll06u.xn--vnd8618j; [B5, B6, V6, A4_2]; ;  # .Ↄⷧ.Ⴗ
+︒ↄⷧ򾀃．ⴗ�; ︒ↄⷧ򾀃.ⴗ�; [B1, B5, B6, P1, V6]; xn--r5gy00c056n0226g.xn--flj4541e; ; ;  # ︒ↄⷧ.ⴗ
+xn--r5gy00c056n0226g.xn--flj4541e; ︒ↄⷧ򾀃.ⴗ�; [B1, B5, B6, V6]; xn--r5gy00c056n0226g.xn--flj4541e; ; ;  # ︒ↄⷧ.ⴗ
+xn--q5g000c056n0226g.xn--vnd8618j; ︒Ↄⷧ򾀃.Ⴗ�; [B1, B5, B6, V6]; xn--q5g000c056n0226g.xn--vnd8618j; ; ;  # ︒Ↄⷧ.Ⴗ
+Ø€.Ö±; ; [B1, B3, B6, P1, V5, V6]; xn--ifb.xn--8cb; ; ;  # .Ö±
+xn--ifb.xn--8cb; ؀.ֱ; [B1, B3, B6, V5, V6]; xn--ifb.xn--8cb; ; ;  # .ֱ
+ς≯｡�; ς≯.�; [B1, B6, P1, V6]; xn--3xa028m.xn--1o0d; ; xn--4xa818m.xn--1o0d;  # ς≯.�
+ς≯｡�; ς≯.�; [B1, B6, P1, V6]; xn--3xa028m.xn--1o0d; ; xn--4xa818m.xn--1o0d;  # ς≯.�
+ς≯。�; ς≯.�; [B1, B6, P1, V6]; xn--3xa028m.xn--1o0d; ; xn--4xa818m.xn--1o0d;  # ς≯.�
+ς≯。�; ς≯.�; [B1, B6, P1, V6]; xn--3xa028m.xn--1o0d; ; xn--4xa818m.xn--1o0d;  # ς≯.�
+Σ≯。�; σ≯.�; [B1, B6, P1, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+Σ≯。�; σ≯.�; [B1, B6, P1, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+σ≯。�; σ≯.�; [B1, B6, P1, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+σ≯。�; σ≯.�; [B1, B6, P1, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+xn--4xa818m.xn--1o0d; σ≯.�; [B1, B6, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+xn--3xa028m.xn--1o0d; ς≯.�; [B1, B6, V6]; xn--3xa028m.xn--1o0d; ; ;  # ς≯.�
+Σ≯｡�; σ≯.�; [B1, B6, P1, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+Σ≯｡�; σ≯.�; [B1, B6, P1, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+σ≯｡�; σ≯.�; [B1, B6, P1, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+σ≯｡�; σ≯.�; [B1, B6, P1, V6]; xn--4xa818m.xn--1o0d; ; ;  # σ≯.�
+្�ݟ。�; ្�ݟ.�; [B1, V5]; xn--jpb535fv9f.xn--uo0d; ; xn--jpb535f.xn--uo0d;  # ្ݟ.�
+xn--jpb535f.xn--uo0d; ្ݟ.�; [B1, V5]; xn--jpb535f.xn--uo0d; ; ;  # ្ݟ.�
+xn--jpb535fv9f.xn--uo0d; ្�ݟ.�; [B1, V5]; xn--jpb535fv9f.xn--uo0d; ; ;  # ្ݟ.�
+𾷂ੂႪ񂂟.≮; ; [P1, V6]; xn--nbc493aro75ggskb.xn--gdh; ; ;  # ੂႪ.≮
+𾷂ੂႪ񂂟.≮; 𾷂ੂႪ񂂟.≮; [P1, V6]; xn--nbc493aro75ggskb.xn--gdh; ; ;  # ੂႪ.≮
+𾷂ੂⴊ񂂟.≮; 𾷂ੂⴊ񂂟.≮; [P1, V6]; xn--nbc229o4y27dgskb.xn--gdh; ; ;  # ੂⴊ.≮
+𾷂ੂⴊ񂂟.≮; ; [P1, V6]; xn--nbc229o4y27dgskb.xn--gdh; ; ;  # ੂⴊ.≮
+xn--nbc229o4y27dgskb.xn--gdh; 𾷂ੂⴊ񂂟.≮; [V6]; xn--nbc229o4y27dgskb.xn--gdh; ; ;  # ੂⴊ.≮
+xn--nbc493aro75ggskb.xn--gdh; 𾷂ੂႪ񂂟.≮; [V6]; xn--nbc493aro75ggskb.xn--gdh; ; ;  # ੂႪ.≮
+ꡠ．۲; ꡠ.۲; ; xn--5c9a.xn--fmb; ; ;  # ꡠ.۲
+ê¡ .Û²; ; ; xn--5c9a.xn--fmb; ; ;  # ê¡ .Û²
+xn--5c9a.xn--fmb; ê¡ .Û²; ; xn--5c9a.xn--fmb; ; ;  # ê¡ .Û²
+�񄷄｡ꡬ🄄; �񄷄.ꡬ🄄; [B1, P1, V6]; xn--bo0d0203l.xn--id9a4443d; ; ;  # �.ꡬ🄄
+�񄷄。ꡬ3,; �񄷄.ꡬ3,; [B1, B6, P1, V6]; xn--bo0d0203l.xn--3,-yj9h; ; ;  # �.ꡬ3,
+xn--bo0d0203l.xn--3,-yj9h; �񄷄.ꡬ3,; [B1, B6, P1, V6]; xn--bo0d0203l.xn--3,-yj9h; ; ;  # �.ꡬ3,
+xn--bo0d0203l.xn--id9a4443d; �񄷄.ꡬ🄄; [B1, V6]; xn--bo0d0203l.xn--id9a4443d; ; ;  # �.ꡬ🄄
+-�𞾀𑲓｡��; -�𞾀𑲓.��; [B1, C2, P1, V3, V6]; xn----x6e0220sclug.xn--wxc317g; ; xn----x6e0220sclug.xn--wxc; [B1, B3, B6, P1, V3, V5, V6] # -�𑲓.�
+-�𞾀𑲓。��; -�𞾀𑲓.��; [B1, C2, P1, V3, V6]; xn----x6e0220sclug.xn--wxc317g; ; xn----x6e0220sclug.xn--wxc; [B1, B3, B6, P1, V3, V5, V6] # -�𑲓.�
+xn----x6e0220sclug.xn--wxc; -�𞾀𑲓.�; [B1, B3, B6, V3, V5, V6]; xn----x6e0220sclug.xn--wxc; ; ;  # -�𑲓.�
+xn----x6e0220sclug.xn--wxc317g; -�𞾀𑲓.��; [B1, C2, V3, V6]; xn----x6e0220sclug.xn--wxc317g; ; ;  # -�𑲓.�
+꙽‌霣🄆｡‌��; ꙽‌霣🄆.‌��; [C1, P1, V5, V6]; xn--0ug4208b2vjuk63a.xn--4sf36u6u4w; ; xn--2q5a751a653w.xn--4sf0725i; [P1, V5, V6] # ꙽霣🄆.��
+꙽‌霣🄆｡‌��; ꙽‌霣🄆.‌��; [C1, P1, V5, V6]; xn--0ug4208b2vjuk63a.xn--4sf36u6u4w; ; xn--2q5a751a653w.xn--4sf0725i; [P1, V5, V6] # ꙽霣🄆.��
+꙽‌霣5,。‌��; ꙽‌霣5,.‌��; [C1, P1, V5, V6]; xn--5,-i1tz135dnbqa.xn--4sf36u6u4w; ; xn--5,-op8g373c.xn--4sf0725i; [P1, V5, V6] # ꙽霣5,.��
+xn--5,-op8g373c.xn--4sf0725i; ꙽霣5,.��; [P1, V5, V6]; xn--5,-op8g373c.xn--4sf0725i; ; ;  # ꙽霣5,.��
+xn--5,-i1tz135dnbqa.xn--4sf36u6u4w; ꙽‌霣5,.‌��; [C1, P1, V5, V6]; xn--5,-i1tz135dnbqa.xn--4sf36u6u4w; ; ;  # ꙽霣5,.��
+xn--2q5a751a653w.xn--4sf0725i; ꙽霣🄆.��; [V5, V6]; xn--2q5a751a653w.xn--4sf0725i; ; ;  # ꙽霣🄆.��
+xn--0ug4208b2vjuk63a.xn--4sf36u6u4w; ꙽‌霣🄆.‌��; [C1, V5, V6]; xn--0ug4208b2vjuk63a.xn--4sf36u6u4w; ; ;  # ꙽霣🄆.��
+兎｡ᠼ󠴜𑚶𑰿; 兎.ᠼ󠴜𑚶𑰿; [P1, V6]; xn--b5q.xn--v7e6041kqqd4m251b; ; ;  # 兎.ᠼ𑚶𑰿
+兎。ᠼ󠴜𑚶𑰿; 兎.ᠼ󠴜𑚶𑰿; [P1, V6]; xn--b5q.xn--v7e6041kqqd4m251b; ; ;  # 兎.ᠼ𑚶𑰿
+xn--b5q.xn--v7e6041kqqd4m251b; 兎.ᠼ󠴜𑚶𑰿; [V6]; xn--b5q.xn--v7e6041kqqd4m251b; ; ;  # 兎.ᠼ𑚶𑰿
+�｡����; 1.�2�7; [C2]; 1.xn--27-l1tb; ; 1.27; [] # 1.27
+1。�2�7; 1.�2�7; [C2]; 1.xn--27-l1tb; ; 1.27; [] # 1.27
+1.27; ; ; ; ; ;  # 1.27
+1.xn--27-l1tb; 1.�2�7; [C2]; 1.xn--27-l1tb; ; ;  # 1.27
+ᡨ-｡󠻋�; ᡨ-.󠻋1; [P1, V3, V6]; xn----z8j.xn--1-5671m; ; ;  # ᡨ-.1
+ᡨ-。󠻋1; ᡨ-.󠻋1; [P1, V3, V6]; xn----z8j.xn--1-5671m; ; ;  # ᡨ-.1
+xn----z8j.xn--1-5671m; ᡨ-.󠻋1; [V3, V6]; xn----z8j.xn--1-5671m; ; ;  # ᡨ-.1
+𑰻��．٨�; 𑰻��.٨9; [B1, P1, V5, V6]; xn--gx9cr01aul57i.xn--9-oqc; ; ;  # 𑰻�.٨9
+𑰻��.٨9; ; [B1, P1, V5, V6]; xn--gx9cr01aul57i.xn--9-oqc; ; ;  # 𑰻�.٨9
+xn--gx9cr01aul57i.xn--9-oqc; 𑰻��.٨9; [B1, V5, V6]; xn--gx9cr01aul57i.xn--9-oqc; ; ;  # 𑰻�.٨9
+Ⴜ򈷭ྀ⾇。Ⴏ♀‌‌; Ⴜ򈷭ྀ舛.Ⴏ♀‌‌; [C1, P1, V6]; xn--zed54dz10wo343g.xn--nnd089ea464d; ; xn--zed54dz10wo343g.xn--nnd651i; [P1, V6] # Ⴜྀ舛.Ⴏ♀
+Ⴜ򈷭ྀ舛。Ⴏ♀‌‌; Ⴜ򈷭ྀ舛.Ⴏ♀‌‌; [C1, P1, V6]; xn--zed54dz10wo343g.xn--nnd089ea464d; ; xn--zed54dz10wo343g.xn--nnd651i; [P1, V6] # Ⴜྀ舛.Ⴏ♀
+ⴜ򈷭ྀ舛。�♀‌‌; ⴜ򈷭ྀ舛.�♀‌‌; [C1, P1, V6]; xn--zed372mdj2do3v4h.xn--0uga678bgyh; ; xn--zed372mdj2do3v4h.xn--e5h11w; [P1, V6] # ⴜྀ舛.�♀
+xn--zed372mdj2do3v4h.xn--e5h11w; ⴜ򈷭ྀ舛.�♀; [V6]; xn--zed372mdj2do3v4h.xn--e5h11w; ; ;  # ⴜྀ舛.�♀
+xn--zed372mdj2do3v4h.xn--0uga678bgyh; ⴜ򈷭ྀ舛.�♀‌‌; [C1, V6]; xn--zed372mdj2do3v4h.xn--0uga678bgyh; ; ;  # ⴜྀ舛.�♀
+xn--zed54dz10wo343g.xn--nnd651i; Ⴜ򈷭ྀ舛.Ⴏ♀; [V6]; xn--zed54dz10wo343g.xn--nnd651i; ; ;  # Ⴜྀ舛.Ⴏ♀
+xn--zed54dz10wo343g.xn--nnd089ea464d; Ⴜ򈷭ྀ舛.Ⴏ♀‌‌; [C1, V6]; xn--zed54dz10wo343g.xn--nnd089ea464d; ; ;  # Ⴜྀ舛.Ⴏ♀
+ⴜ򈷭ྀ⾇。�♀‌‌; ⴜ򈷭ྀ舛.�♀‌‌; [C1, P1, V6]; xn--zed372mdj2do3v4h.xn--0uga678bgyh; ; xn--zed372mdj2do3v4h.xn--e5h11w; [P1, V6] # ⴜྀ舛.�♀
+��.�; �4.�; [C2, V5]; xn--4-xu7i.xn--1ug; ; xn--4-xu7i.; [V5] # �4.
+�4.�; ; [C2, V5]; xn--4-xu7i.xn--1ug; ; xn--4-xu7i.; [V5] # �4.
+xn--4-xu7i.; �4.; [V5]; xn--4-xu7i.; ; ;  # �4.
+xn--4-xu7i.xn--1ug; �4.�; [C2, V5]; xn--4-xu7i.xn--1ug; ; ;  # �4.
+񮴘Ⴞ癀｡𑘿�‌붼; 񮴘Ⴞ癀.𑘿�‌붼; [C1, P1, V5, V6]; xn--2nd6803c7q37d.xn--0ugb6122js83c; ; xn--2nd6803c7q37d.xn--et3bn23n; [P1, V5, V6] # Ⴞ癀.𑘿붼
+񮴘Ⴞ癀｡𑘿�‌붼; 񮴘Ⴞ癀.𑘿�‌붼; [C1, P1, V5, V6]; xn--2nd6803c7q37d.xn--0ugb6122js83c; ; xn--2nd6803c7q37d.xn--et3bn23n; [P1, V5, V6] # Ⴞ癀.𑘿붼
+񮴘Ⴞ癀。𑘿�‌붼; 񮴘Ⴞ癀.𑘿�‌붼; [C1, P1, V5, V6]; xn--2nd6803c7q37d.xn--0ugb6122js83c; ; xn--2nd6803c7q37d.xn--et3bn23n; [P1, V5, V6] # Ⴞ癀.𑘿붼
+񮴘Ⴞ癀。𑘿�‌붼; 񮴘Ⴞ癀.𑘿�‌붼; [C1, P1, V5, V6]; xn--2nd6803c7q37d.xn--0ugb6122js83c; ; xn--2nd6803c7q37d.xn--et3bn23n; [P1, V5, V6] # Ⴞ癀.𑘿붼
+񮴘ⴞ癀。𑘿�‌붼; 񮴘ⴞ癀.𑘿�‌붼; [C1, P1, V5, V6]; xn--mlju35u7qx2f.xn--0ugb6122js83c; ; xn--mlju35u7qx2f.xn--et3bn23n; [P1, V5, V6] # ⴞ癀.𑘿붼
+񮴘ⴞ癀。𑘿�‌붼; 񮴘ⴞ癀.𑘿�‌붼; [C1, P1, V5, V6]; xn--mlju35u7qx2f.xn--0ugb6122js83c; ; xn--mlju35u7qx2f.xn--et3bn23n; [P1, V5, V6] # ⴞ癀.𑘿붼
+xn--mlju35u7qx2f.xn--et3bn23n; 񮴘ⴞ癀.𑘿붼; [V5, V6]; xn--mlju35u7qx2f.xn--et3bn23n; ; ;  # ⴞ癀.𑘿붼
+xn--mlju35u7qx2f.xn--0ugb6122js83c; 񮴘ⴞ癀.𑘿�‌붼; [C1, V5, V6]; xn--mlju35u7qx2f.xn--0ugb6122js83c; ; ;  # ⴞ癀.𑘿붼
+xn--2nd6803c7q37d.xn--et3bn23n; 񮴘Ⴞ癀.𑘿붼; [V5, V6]; xn--2nd6803c7q37d.xn--et3bn23n; ; ;  # Ⴞ癀.𑘿붼
+xn--2nd6803c7q37d.xn--0ugb6122js83c; 񮴘Ⴞ癀.𑘿�‌붼; [C1, V5, V6]; xn--2nd6803c7q37d.xn--0ugb6122js83c; ; ;  # Ⴞ癀.𑘿붼
+񮴘ⴞ癀｡𑘿�‌붼; 񮴘ⴞ癀.𑘿�‌붼; [C1, P1, V5, V6]; xn--mlju35u7qx2f.xn--0ugb6122js83c; ; xn--mlju35u7qx2f.xn--et3bn23n; [P1, V5, V6] # ⴞ癀.𑘿붼
+񮴘ⴞ癀｡𑘿�‌붼; 񮴘ⴞ癀.𑘿�‌붼; [C1, P1, V5, V6]; xn--mlju35u7qx2f.xn--0ugb6122js83c; ; xn--mlju35u7qx2f.xn--et3bn23n; [P1, V5, V6] # ⴞ癀.𑘿붼
+󚀅-�。ڹ; 󚀅-�.ڹ; [B6, P1, V6]; xn----mze84808x.xn--skb; ; ;  # -�.ڹ
+xn----mze84808x.xn--skb; 󚀅-�.ڹ; [B6, V6]; xn----mze84808x.xn--skb; ; ;  # -�.ڹ
+ᡃ�≯ᠣ．���; ᡃ5≯ᠣ.���; [P1, V6]; xn--5-24jyf768b.xn--lqw213ime95g; ; ;  # ᡃ5≯ᠣ.��
+ᡃ�≯ᠣ．���; ᡃ5≯ᠣ.���; [P1, V6]; xn--5-24jyf768b.xn--lqw213ime95g; ; ;  # ᡃ5≯ᠣ.��
+ᡃ5≯ᠣ.���; ; [P1, V6]; xn--5-24jyf768b.xn--lqw213ime95g; ; ;  # ᡃ5≯ᠣ.��
+ᡃ5≯ᠣ.���; ᡃ5≯ᠣ.���; [P1, V6]; xn--5-24jyf768b.xn--lqw213ime95g; ; ;  # ᡃ5≯ᠣ.��
+xn--5-24jyf768b.xn--lqw213ime95g; ᡃ5≯ᠣ.���; [V6]; xn--5-24jyf768b.xn--lqw213ime95g; ; ;  # ᡃ5≯ᠣ.��
+��．ྲྀ; ��.ྲྀ; [B1, B3, B6, V5]; xn--ko0d8295a.xn--zed3h; ; ;  # ��.ྲྀ
+��．ྲྀ; ��.ྲྀ; [B1, B3, B6, V5]; xn--ko0d8295a.xn--zed3h; ; ;  # ��.ྲྀ
+��.ྲྀ; ; [B1, B3, B6, V5]; xn--ko0d8295a.xn--zed3h; ; ;  # ��.ྲྀ
+xn--ko0d8295a.xn--zed3h; ��.ྲྀ; [B1, B3, B6, V5]; xn--ko0d8295a.xn--zed3h; ; ;  # ��.ྲྀ
+-𑈶�．⒎𰛢󠎭; -𑈶�.⒎𰛢󠎭; [P1, V3, V6]; xn----scp6252h.xn--zshy411yzpx2d; ; ;  # -𑈶�.⒎𰛢
+-𑈶8..7.𰛢󠎭; ; [P1, V3, V6, X4_2]; xn---8-bv5o..7.xn--c35nf1622b; [P1, V3, V6, A4_2]; ;  # -𑈶8..7.𰛢
+xn---8-bv5o..7.xn--c35nf1622b; -𑈶8..7.𰛢󠎭; [V3, V6, X4_2]; xn---8-bv5o..7.xn--c35nf1622b; [V3, V6, A4_2]; ;  # -𑈶8..7.𰛢
+xn----scp6252h.xn--zshy411yzpx2d; -𑈶�.⒎𰛢󠎭; [V3, V6]; xn----scp6252h.xn--zshy411yzpx2d; ; ;  # -𑈶�.⒎𰛢
+‌Ⴁ��．≮; ‌Ⴁ��.≮; [C1, C2, P1, V6]; xn--8md700fea3748f.xn--gdh; ; xn--8md0962c.xn--gdh; [P1, V6] # Ⴁ�.≮
+‌Ⴁ��．≮; ‌Ⴁ��.≮; [C1, C2, P1, V6]; xn--8md700fea3748f.xn--gdh; ; xn--8md0962c.xn--gdh; [P1, V6] # Ⴁ�.≮
+‌Ⴁ��.≮; ; [C1, C2, P1, V6]; xn--8md700fea3748f.xn--gdh; ; xn--8md0962c.xn--gdh; [P1, V6] # Ⴁ�.≮
+‌Ⴁ��.≮; ‌Ⴁ��.≮; [C1, C2, P1, V6]; xn--8md700fea3748f.xn--gdh; ; xn--8md0962c.xn--gdh; [P1, V6] # Ⴁ�.≮
+‌���.≮; ‌���.≮; [C1, C2, P1, V6]; xn--0ugc160hb36e.xn--gdh; ; xn--skjy82u.xn--gdh; [P1, V6] # ��.≮
+‌���.≮; ; [C1, C2, P1, V6]; xn--0ugc160hb36e.xn--gdh; ; xn--skjy82u.xn--gdh; [P1, V6] # ��.≮
+xn--skjy82u.xn--gdh; ��.≮; [V6]; xn--skjy82u.xn--gdh; ; ;  # ��.≮
+xn--0ugc160hb36e.xn--gdh; ‌���.≮; [C1, C2, V6]; xn--0ugc160hb36e.xn--gdh; ; ;  # ��.≮
+xn--8md0962c.xn--gdh; Ⴁ�.≮; [V6]; xn--8md0962c.xn--gdh; ; ;  # Ⴁ�.≮
+xn--8md700fea3748f.xn--gdh; ‌Ⴁ��.≮; [C1, C2, V6]; xn--8md700fea3748f.xn--gdh; ; ;  # Ⴁ�.≮
+‌���．≮; ‌���.≮; [C1, C2, P1, V6]; xn--0ugc160hb36e.xn--gdh; ; xn--skjy82u.xn--gdh; [P1, V6] # ��.≮
+‌���．≮; ‌���.≮; [C1, C2, P1, V6]; xn--0ugc160hb36e.xn--gdh; ; xn--skjy82u.xn--gdh; [P1, V6] # ��.≮
+歷｡�≯󳛽�; 歷.�≯󳛽�; [B1, C2, P1, V6]; xn--nmw.xn--1ugx6gs128a1134j; ; xn--nmw.xn--hdh7804gdms2h; [B1, P1, V6] # 歷.�≯
+歷｡�≯󳛽�; 歷.�≯󳛽�; [B1, C2, P1, V6]; xn--nmw.xn--1ugx6gs128a1134j; ; xn--nmw.xn--hdh7804gdms2h; [B1, P1, V6] # 歷.�≯
+歷。�≯󳛽�; 歷.�≯󳛽�; [B1, C2, P1, V6]; xn--nmw.xn--1ugx6gs128a1134j; ; xn--nmw.xn--hdh7804gdms2h; [B1, P1, V6] # 歷.�≯
+歷。�≯󳛽�; 歷.�≯󳛽�; [B1, C2, P1, V6]; xn--nmw.xn--1ugx6gs128a1134j; ; xn--nmw.xn--hdh7804gdms2h; [B1, P1, V6] # 歷.�≯
+xn--nmw.xn--hdh7804gdms2h; 歷.�≯󳛽; [B1, V6]; xn--nmw.xn--hdh7804gdms2h; ; ;  # 歷.�≯
+xn--nmw.xn--1ugx6gs128a1134j; 歷.�≯󳛽�; [B1, C2, V6]; xn--nmw.xn--1ugx6gs128a1134j; ; ;  # 歷.�≯
+໋�．�󠰑; ໋�.�󠰑; [C2, P1, V5, V6]; xn--t8c059f.xn--iz4a43209d; ; xn--t8c.xn--iz4a43209d; [P1, V5, V6] # ໋.�
+໋�.�󠰑; ; [C2, P1, V5, V6]; xn--t8c059f.xn--iz4a43209d; ; xn--t8c.xn--iz4a43209d; [P1, V5, V6] # ໋.�
+xn--t8c.xn--iz4a43209d; ໋.�󠰑; [V5, V6]; xn--t8c.xn--iz4a43209d; ; ;  # ໋.�
+xn--t8c059f.xn--iz4a43209d; ໋�.�󠰑; [C2, V5, V6]; xn--t8c059f.xn--iz4a43209d; ; ;  # ໋.�
+�‌𞤀｡𱘅�; �‌𞤢.𱘅�; [B1, B5, B6, C1, C2, P1, V6]; xn--0ugb45126a.xn--wh0dj799f; ; xn--9d6h.xn--wh0dj799f; [B5, B6, P1, V6] # 𞤢.
+�‌𞤀。𱘅�; �‌𞤢.𱘅�; [B1, B5, B6, C1, C2, P1, V6]; xn--0ugb45126a.xn--wh0dj799f; ; xn--9d6h.xn--wh0dj799f; [B5, B6, P1, V6] # 𞤢.
+�‌𞤢。𱘅�; �‌𞤢.𱘅�; [B1, B5, B6, C1, C2, P1, V6]; xn--0ugb45126a.xn--wh0dj799f; ; xn--9d6h.xn--wh0dj799f; [B5, B6, P1, V6] # 𞤢.
+xn--9d6h.xn--wh0dj799f; 𞤢.𱘅�; [B5, B6, V6]; xn--9d6h.xn--wh0dj799f; ; ;  # 𞤢.
+xn--0ugb45126a.xn--wh0dj799f; �‌𞤢.𱘅�; [B1, B5, B6, C1, C2, V6]; xn--0ugb45126a.xn--wh0dj799f; ; ;  # 𞤢.
+�‌𞤢｡𱘅�; �‌𞤢.𱘅�; [B1, B5, B6, C1, C2, P1, V6]; xn--0ugb45126a.xn--wh0dj799f; ; xn--9d6h.xn--wh0dj799f; [B5, B6, P1, V6] # 𞤢.
+ب≠�-.ς��≠; ب≠9-.ς��≠; [B3, B5, B6, P1, V3, V6]; xn--9--etd0100a.xn--3xa097mzpbzz04b; ; xn--9--etd0100a.xn--4xa887mzpbzz04b;  # ب≠9-.ς��≠
+ب≠�-.ς��≠; ب≠9-.ς��≠; [B3, B5, B6, P1, V3, V6]; xn--9--etd0100a.xn--3xa097mzpbzz04b; ; xn--9--etd0100a.xn--4xa887mzpbzz04b;  # ب≠9-.ς��≠
+ب≠9-.ς6.�≠; ; [B1, B3, P1, V3, V6]; xn--9--etd0100a.xn--6-xmb.xn--1ch8704g; ; xn--9--etd0100a.xn--6-zmb.xn--1ch8704g;  # ب≠9-.ς6.�≠
+ب≠9-.ς6.�≠; ب≠9-.ς6.�≠; [B1, B3, P1, V3, V6]; xn--9--etd0100a.xn--6-xmb.xn--1ch8704g; ; xn--9--etd0100a.xn--6-zmb.xn--1ch8704g;  # ب≠9-.ς6.�≠
+ب≠9-.Σ6.�≠; ب≠9-.σ6.�≠; [B1, B3, P1, V3, V6]; xn--9--etd0100a.xn--6-zmb.xn--1ch8704g; ; ;  # ب≠9-.σ6.�≠
+ب≠9-.Σ6.�≠; ب≠9-.σ6.�≠; [B1, B3, P1, V3, V6]; xn--9--etd0100a.xn--6-zmb.xn--1ch8704g; ; ;  # ب≠9-.σ6.�≠
+ب≠9-.σ6.�≠; ; [B1, B3, P1, V3, V6]; xn--9--etd0100a.xn--6-zmb.xn--1ch8704g; ; ;  # ب≠9-.σ6.�≠
+ب≠9-.σ6.�≠; ب≠9-.σ6.�≠; [B1, B3, P1, V3, V6]; xn--9--etd0100a.xn--6-zmb.xn--1ch8704g; ; ;  # ب≠9-.σ6.�≠
+xn--9--etd0100a.xn--6-zmb.xn--1ch8704g; ب≠9-.σ6.�≠; [B1, B3, V3, V6]; xn--9--etd0100a.xn--6-zmb.xn--1ch8704g; ; ;  # ب≠9-.σ6.�≠
+xn--9--etd0100a.xn--6-xmb.xn--1ch8704g; ب≠9-.ς6.�≠; [B1, B3, V3, V6]; xn--9--etd0100a.xn--6-xmb.xn--1ch8704g; ; ;  # ب≠9-.ς6.�≠
+ب≠�-.Σ��≠; ب≠9-.σ��≠; [B3, B5, B6, P1, V3, V6]; xn--9--etd0100a.xn--4xa887mzpbzz04b; ; ;  # ب≠9-.σ��≠
+ب≠�-.Σ��≠; ب≠9-.σ��≠; [B3, B5, B6, P1, V3, V6]; xn--9--etd0100a.xn--4xa887mzpbzz04b; ; ;  # ب≠9-.σ��≠
+ب≠�-.σ��≠; ب≠9-.σ��≠; [B3, B5, B6, P1, V3, V6]; xn--9--etd0100a.xn--4xa887mzpbzz04b; ; ;  # ب≠9-.σ��≠
+ب≠�-.σ��≠; ب≠9-.σ��≠; [B3, B5, B6, P1, V3, V6]; xn--9--etd0100a.xn--4xa887mzpbzz04b; ; ;  # ب≠9-.σ��≠
+xn--9--etd0100a.xn--4xa887mzpbzz04b; ب≠9-.σ��≠; [B3, B5, B6, V3, V6]; xn--9--etd0100a.xn--4xa887mzpbzz04b; ; ;  # ب≠9-.σ��≠
+xn--9--etd0100a.xn--3xa097mzpbzz04b; ب≠9-.ς��≠; [B3, B5, B6, V3, V6]; xn--9--etd0100a.xn--3xa097mzpbzz04b; ; ;  # ب≠9-.ς��≠
+򉛴.-ᡢ֒�; ; [P1, V3, V6]; xn--ep37b.xn----hec165lho83b; ; ;  # .-ᡢ֒�
+xn--ep37b.xn----hec165lho83b; 򉛴.-ᡢ֒�; [V3, V6]; xn--ep37b.xn----hec165lho83b; ; ;  # .-ᡢ֒�
+ۋ⒈ß󠄽。�-; ۋ⒈ß.�-; [B2, B3, B6, P1, V3, V6]; xn--zca541ato3a.xn----q001f; ; xn--ss-d7d6651a.xn----q001f;  # ۋ⒈ß.-
+ۋ1.ß󠄽。�-; ۋ1.ß.�-; [B6, P1, V3, V6]; xn--1-cwc.xn--zca.xn----q001f; ; xn--1-cwc.ss.xn----q001f;  # ۋ1.ß.-
+ۋ1.SS󠄽。�-; ۋ1.ss.�-; [B6, P1, V3, V6]; xn--1-cwc.ss.xn----q001f; ; ;  # ۋ1.ss.-
+ۋ1.ss󠄽。�-; ۋ1.ss.�-; [B6, P1, V3, V6]; xn--1-cwc.ss.xn----q001f; ; ;  # ۋ1.ss.-
+ۋ1.Ss󠄽。�-; ۋ1.ss.�-; [B6, P1, V3, V6]; xn--1-cwc.ss.xn----q001f; ; ;  # ۋ1.ss.-
+xn--1-cwc.ss.xn----q001f; ۋ1.ss.�-; [B6, V3, V6]; xn--1-cwc.ss.xn----q001f; ; ;  # ۋ1.ss.-
+xn--1-cwc.xn--zca.xn----q001f; ۋ1.ß.�-; [B6, V3, V6]; xn--1-cwc.xn--zca.xn----q001f; ; ;  # ۋ1.ß.-
+ۋ⒈SS󠄽。�-; ۋ⒈ss.�-; [B2, B3, B6, P1, V3, V6]; xn--ss-d7d6651a.xn----q001f; ; ;  # ۋ⒈ss.-
+ۋ⒈ss󠄽。�-; ۋ⒈ss.�-; [B2, B3, B6, P1, V3, V6]; xn--ss-d7d6651a.xn----q001f; ; ;  # ۋ⒈ss.-
+ۋ⒈Ss󠄽。�-; ۋ⒈ss.�-; [B2, B3, B6, P1, V3, V6]; xn--ss-d7d6651a.xn----q001f; ; ;  # ۋ⒈ss.-
+xn--ss-d7d6651a.xn----q001f; ۋ⒈ss.�-; [B2, B3, B6, V3, V6]; xn--ss-d7d6651a.xn----q001f; ; ;  # ۋ⒈ss.-
+xn--zca541ato3a.xn----q001f; ۋ⒈ß.�-; [B2, B3, B6, V3, V6]; xn--zca541ato3a.xn----q001f; ; ;  # ۋ⒈ß.-
+𿀫．᮪ςႦ�; 𿀫.᮪ςႦ�; [C2, P1, V5, V6]; xn--nu4s.xn--3xa417dxriome; ; xn--nu4s.xn--4xa217dxri; [P1, V5, V6] # .᮪ςႦ
+𿀫.᮪ςႦ�; ; [C2, P1, V5, V6]; xn--nu4s.xn--3xa417dxriome; ; xn--nu4s.xn--4xa217dxri; [P1, V5, V6] # .᮪ςႦ
+𿀫.᮪ςⴆ�; ; [C2, P1, V5, V6]; xn--nu4s.xn--3xa353jk8cs1q; ; xn--nu4s.xn--4xa153j7im; [P1, V5, V6] # .᮪ςⴆ
+𿀫.᮪ΣႦ�; 𿀫.᮪σႦ�; [C2, P1, V5, V6]; xn--nu4s.xn--4xa217dxriome; ; xn--nu4s.xn--4xa217dxri; [P1, V5, V6] # .᮪σႦ
+𿀫.᮪σⴆ�; ; [C2, P1, V5, V6]; xn--nu4s.xn--4xa153jk8cs1q; ; xn--nu4s.xn--4xa153j7im; [P1, V5, V6] # .᮪σⴆ
+𿀫.᮪Σⴆ�; 𿀫.᮪σⴆ�; [C2, P1, V5, V6]; xn--nu4s.xn--4xa153jk8cs1q; ; xn--nu4s.xn--4xa153j7im; [P1, V5, V6] # .᮪σⴆ
+xn--nu4s.xn--4xa153j7im; 𿀫.᮪σⴆ; [V5, V6]; xn--nu4s.xn--4xa153j7im; ; ;  # .᮪σⴆ
+xn--nu4s.xn--4xa153jk8cs1q; 𿀫.᮪σⴆ�; [C2, V5, V6]; xn--nu4s.xn--4xa153jk8cs1q; ; ;  # .᮪σⴆ
+xn--nu4s.xn--4xa217dxri; 𿀫.᮪σႦ; [V5, V6]; xn--nu4s.xn--4xa217dxri; ; ;  # .᮪σႦ
+xn--nu4s.xn--4xa217dxriome; 𿀫.᮪σႦ�; [C2, V5, V6]; xn--nu4s.xn--4xa217dxriome; ; ;  # .᮪σႦ
+xn--nu4s.xn--3xa353jk8cs1q; 𿀫.᮪ςⴆ�; [C2, V5, V6]; xn--nu4s.xn--3xa353jk8cs1q; ; ;  # .᮪ςⴆ
+xn--nu4s.xn--3xa417dxriome; 𿀫.᮪ςႦ�; [C2, V5, V6]; xn--nu4s.xn--3xa417dxriome; ; ;  # .᮪ςႦ
+𿀫．᮪ςⴆ�; 𿀫.᮪ςⴆ�; [C2, P1, V5, V6]; xn--nu4s.xn--3xa353jk8cs1q; ; xn--nu4s.xn--4xa153j7im; [P1, V5, V6] # .᮪ςⴆ
+𿀫．᮪ΣႦ�; 𿀫.᮪σႦ�; [C2, P1, V5, V6]; xn--nu4s.xn--4xa217dxriome; ; xn--nu4s.xn--4xa217dxri; [P1, V5, V6] # .᮪σႦ
+𿀫．᮪σⴆ�; 𿀫.᮪σⴆ�; [C2, P1, V5, V6]; xn--nu4s.xn--4xa153jk8cs1q; ; xn--nu4s.xn--4xa153j7im; [P1, V5, V6] # .᮪σⴆ
+𿀫．᮪Σⴆ�; 𿀫.᮪σⴆ�; [C2, P1, V5, V6]; xn--nu4s.xn--4xa153jk8cs1q; ; xn--nu4s.xn--4xa153j7im; [P1, V5, V6] # .᮪σⴆ
+⾆࣢.�; 舌࣢.�; [B1, B5, B6, P1, V6]; xn--l0b9413d.xn--kl1h; ; ;  # 舌.�
+舌࣢.�; ; [B1, B5, B6, P1, V6]; xn--l0b9413d.xn--kl1h; ; ;  # 舌.�
+xn--l0b9413d.xn--kl1h; 舌࣢.�; [B1, B5, B6, V6]; xn--l0b9413d.xn--kl1h; ; ;  # 舌.�
+⫞�𖫴。⭠⒈; ⫞�𖫴.⭠⒈; [B1, P1, V6]; xn--53ix188et88b.xn--tsh52w; ; ;  # ⫞�𖫴.⭠⒈
+⫞�𖫴。⭠1.; ⫞�𖫴.⭠1.; [B1]; xn--53ix188et88b.xn--1-h6r.; ; ;  # ⫞�𖫴.⭠1.
+xn--53ix188et88b.xn--1-h6r.; ⫞�𖫴.⭠1.; [B1]; xn--53ix188et88b.xn--1-h6r.; ; ;  # ⫞�𖫴.⭠1.
+xn--53ix188et88b.xn--tsh52w; ⫞�𖫴.⭠⒈; [B1, V6]; xn--53ix188et88b.xn--tsh52w; ; ;  # ⫞�𖫴.⭠⒈
+⒈‌ꫬ︒．�; ⒈‌ꫬ︒.�; [C1, P1, V5, V6]; xn--0ug78o720myr1c.xn--mfc; ; xn--tsh0720cse8b.xn--mfc; [P1, V5, V6] # ⒈ꫬ︒.�
+1.‌ꫬ。.�; 1.‌ꫬ..�; [C1, V5, X4_2]; 1.xn--0ug7185c..xn--mfc; [C1, V5, A4_2]; 1.xn--sv9a..xn--mfc; [V5, A4_2] # 1.ꫬ..�
+1.xn--sv9a..xn--mfc; 1.ꫬ..�; [V5, X4_2]; 1.xn--sv9a..xn--mfc; [V5, A4_2]; ;  # 1.ꫬ..�
+1.xn--0ug7185c..xn--mfc; 1.‌ꫬ..�; [C1, V5, X4_2]; 1.xn--0ug7185c..xn--mfc; [C1, V5, A4_2]; ;  # 1.ꫬ..�
+xn--tsh0720cse8b.xn--mfc; ⒈ꫬ︒.�; [V5, V6]; xn--tsh0720cse8b.xn--mfc; ; ;  # ⒈ꫬ︒.�
+xn--0ug78o720myr1c.xn--mfc; ⒈‌ꫬ︒.�; [C1, V5, V6]; xn--0ug78o720myr1c.xn--mfc; ; ;  # ⒈ꫬ︒.�
+ె。䰀٨𞭅󠅼; ె.䰀٨𞭅; [B1, B3, B5, B6, P1, V5, V6]; xn--eqc.xn--hib5476aim6t; ; ;  # ె.䰀٨
+xn--eqc.xn--hib5476aim6t; ె.䰀٨𞭅; [B1, B3, B5, B6, V5, V6]; xn--eqc.xn--hib5476aim6t; ; ;  # ె.䰀٨
+ß�.᯲񄾼; ; [C2, P1, V5, V6]; xn--zca870n.xn--0zf22107b; ; ss.xn--0zf22107b; [P1, V5, V6] # ß.᯲
+SS�.᯲񄾼; ss�.᯲񄾼; [C2, P1, V5, V6]; xn--ss-n1t.xn--0zf22107b; ; ss.xn--0zf22107b; [P1, V5, V6] # ss.᯲
+ss�.᯲񄾼; ; [C2, P1, V5, V6]; xn--ss-n1t.xn--0zf22107b; ; ss.xn--0zf22107b; [P1, V5, V6] # ss.᯲
+Ss�.᯲񄾼; ss�.᯲񄾼; [C2, P1, V5, V6]; xn--ss-n1t.xn--0zf22107b; ; ss.xn--0zf22107b; [P1, V5, V6] # ss.᯲
+ss.xn--0zf22107b; ss.᯲񄾼; [V5, V6]; ss.xn--0zf22107b; ; ;  # ss.᯲
+xn--ss-n1t.xn--0zf22107b; ss�.᯲񄾼; [C2, V5, V6]; xn--ss-n1t.xn--0zf22107b; ; ;  # ss.᯲
+xn--zca870n.xn--0zf22107b; ß�.᯲񄾼; [C2, V5, V6]; xn--zca870n.xn--0zf22107b; ; ;  # ß.᯲
+𑓂‌≮.≮; ; [P1, V5, V6]; xn--0ugy6glz29a.xn--gdh; ; xn--gdhz656g.xn--gdh;  # 𑓂≮.≮
+𑓂‌≮.≮; 𑓂‌≮.≮; [P1, V5, V6]; xn--0ugy6glz29a.xn--gdh; ; xn--gdhz656g.xn--gdh;  # 𑓂≮.≮
+xn--gdhz656g.xn--gdh; 𑓂≮.≮; [V5, V6]; xn--gdhz656g.xn--gdh; ; ;  # 𑓂≮.≮
+xn--0ugy6glz29a.xn--gdh; 𑓂‌≮.≮; [V5, V6]; xn--0ugy6glz29a.xn--gdh; ; ;  # 𑓂≮.≮
+🕼．ﾠ; 🕼.ﾠ; [P1, V6]; xn--my8h.xn--cl7c; ; ;  # 🕼.
+🕼.ᅠ; ; [P1, V6]; xn--my8h.xn--psd; ; ;  # 🕼.
+xn--my8h.xn--psd; 🕼.ᅠ; [V6]; xn--my8h.xn--psd; ; ;  # 🕼.
+xn--my8h.xn--cl7c; 🕼.ﾠ; [V6]; xn--my8h.xn--cl7c; ; ;  # 🕼.
+ᡔﶂ。񷘎; ᡔلحى.񷘎; [B5, B6, P1, V6]; xn--sgb9bq785p.xn--bc31b; ; ;  # ᡔلحى.
+ᡔلحى。񷘎; ᡔلحى.񷘎; [B5, B6, P1, V6]; xn--sgb9bq785p.xn--bc31b; ; ;  # ᡔلحى.
+xn--sgb9bq785p.xn--bc31b; ᡔلحى.񷘎; [B5, B6, V6]; xn--sgb9bq785p.xn--bc31b; ; ;  # ᡔلحى.
+爕򳙑．�気; 爕򳙑.4気; [P1, V6]; xn--1zxq3199c.xn--4-678b; ; ;  # 爕.4気
+爕򳙑.4気; ; [P1, V6]; xn--1zxq3199c.xn--4-678b; ; ;  # 爕.4気
+xn--1zxq3199c.xn--4-678b; 爕򳙑.4気; [V6]; xn--1zxq3199c.xn--4-678b; ; ;  # 爕.4気
+⒋�Ⴝ-．𞬪්ֵ; ⒋�Ⴝ-.𞬪්ֵ; [B1, P1, V3, V6]; xn----t1g323mnk9t.xn--ddb152b7y23b; ; ;  # ⒋�Ⴝ-.්ֵ
+4.�Ⴝ-.𞬪්ֵ; ; [B1, B6, P1, V3, V5, V6]; 4.xn----t1g9869q.xn--ddb152b7y23b; ; ;  # 4.�Ⴝ-.්ֵ
+4.��-.𞬪්ֵ; ; [B1, B6, P1, V3, V5, V6]; 4.xn----wwsx259f.xn--ddb152b7y23b; ; ;  # 4.��-.්ֵ
+4.xn----wwsx259f.xn--ddb152b7y23b; 4.��-.𞬪්ֵ; [B1, B6, V3, V5, V6]; 4.xn----wwsx259f.xn--ddb152b7y23b; ; ;  # 4.��-.්ֵ
+4.xn----t1g9869q.xn--ddb152b7y23b; 4.�Ⴝ-.𞬪්ֵ; [B1, B6, V3, V5, V6]; 4.xn----t1g9869q.xn--ddb152b7y23b; ; ;  # 4.�Ⴝ-.්ֵ
+⒋��-．𞬪්ֵ; ⒋��-.𞬪්ֵ; [B1, P1, V3, V6]; xn----jcp487avl3w.xn--ddb152b7y23b; ; ;  # ⒋��-.්ֵ
+xn----jcp487avl3w.xn--ddb152b7y23b; ⒋��-.𞬪්ֵ; [B1, V3, V6]; xn----jcp487avl3w.xn--ddb152b7y23b; ; ;  # ⒋��-.්ֵ
+xn----t1g323mnk9t.xn--ddb152b7y23b; ⒋�Ⴝ-.𞬪්ֵ; [B1, V3, V6]; xn----t1g323mnk9t.xn--ddb152b7y23b; ; ;  # ⒋�Ⴝ-.්ֵ
+�。򑆃񉢗--; �.򑆃񉢗--; [P1, V2, V3, V6]; xn--2y75e.xn-----1l15eer88n; ; ;  # .--
+xn--2y75e.xn-----1l15eer88n; �.򑆃񉢗--; [V2, V3, V6]; xn--2y75e.xn-----1l15eer88n; ; ;  # .--
+�ߟ｡‌꯭; �ߟ.‌꯭; [B1, C1, C2]; xn--6sb394j.xn--0ug1126c; ; xn--6sb.xn--429a; [B1, B3, B6, V5] # ߟ.꯭
+�ߟ。‌꯭; �ߟ.‌꯭; [B1, C1, C2]; xn--6sb394j.xn--0ug1126c; ; xn--6sb.xn--429a; [B1, B3, B6, V5] # ߟ.꯭
+xn--6sb.xn--429a; ߟ.꯭; [B1, B3, B6, V5]; xn--6sb.xn--429a; ; ;  # ߟ.꯭
+xn--6sb394j.xn--0ug1126c; �ߟ.‌꯭; [B1, C1, C2]; xn--6sb394j.xn--0ug1126c; ; ;  # ߟ.꯭
+𞮽߿ࡎ｡���; 𞮽߿ࡎ.���; [B5, B6, P1, V6]; xn--3tb2nz468k.xn--69e8615j5rn5d; ; ;  # ߿ࡎ.��
+𞮽߿ࡎ。���; 𞮽߿ࡎ.���; [B5, B6, P1, V6]; xn--3tb2nz468k.xn--69e8615j5rn5d; ; ;  # ߿ࡎ.��
+xn--3tb2nz468k.xn--69e8615j5rn5d; 𞮽߿ࡎ.���; [B5, B6, V6]; xn--3tb2nz468k.xn--69e8615j5rn5d; ; ;  # ߿ࡎ.��
+ۭ𞺌𑄚᜔.ꡞࢷ; ۭم𑄚᜔.ꡞࢷ; [B1, B5, B6, V5]; xn--hhb94ag41b739u.xn--dzb5582f; ; ;  # ۭم𑄚᜔.ꡞࢷ
+ۭم𑄚᜔.ꡞࢷ; ; [B1, B5, B6, V5]; xn--hhb94ag41b739u.xn--dzb5582f; ; ;  # ۭم𑄚᜔.ꡞࢷ
+xn--hhb94ag41b739u.xn--dzb5582f; ۭم𑄚᜔.ꡞࢷ; [B1, B5, B6, V5]; xn--hhb94ag41b739u.xn--dzb5582f; ; ;  # ۭم𑄚᜔.ꡞࢷ
+񻂵킃𑘶ߜ｡ςؼς; 񻂵킃𑘶ߜ.ςؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xaa51q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.ςؼς
+񻂵�ᅳᆾ𑘶ߜ｡ςؼς; 񻂵킃𑘶ߜ.ςؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xaa51q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.ςؼς
+񻂵킃𑘶ߜ。ςؼς; 񻂵킃𑘶ߜ.ςؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xaa51q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.ςؼς
+񻂵�ᅳᆾ𑘶ߜ。ςؼς; 񻂵킃𑘶ߜ.ςؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xaa51q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.ςؼς
+񻂵�ᅳᆾ𑘶ߜ。ΣؼΣ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵킃𑘶ߜ。ΣؼΣ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵킃𑘶ߜ。σؼσ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵�ᅳᆾ𑘶ߜ。σؼσ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵�ᅳᆾ𑘶ߜ。Σؼσ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵킃𑘶ߜ。Σؼσ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+xn--3sb7483hoyvbbe76g.xn--4xaa21q; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵�ᅳᆾ𑘶ߜ。Σؼς; 񻂵킃𑘶ߜ.σؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.σؼς
+񻂵킃𑘶ߜ。Σؼς; 񻂵킃𑘶ߜ.σؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.σؼς
+񻂵킃𑘶ߜ。σؼς; 񻂵킃𑘶ߜ.σؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.σؼς
+񻂵�ᅳᆾ𑘶ߜ。σؼς; 񻂵킃𑘶ߜ.σؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.σؼς
+xn--3sb7483hoyvbbe76g.xn--3xab31q; 񻂵킃𑘶ߜ.σؼς; [B5, B6, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; ;  # 킃𑘶ߜ.σؼς
+xn--3sb7483hoyvbbe76g.xn--3xaa51q; 񻂵킃𑘶ߜ.ςؼς; [B5, B6, V6]; xn--3sb7483hoyvbbe76g.xn--3xaa51q; ; ;  # 킃𑘶ߜ.ςؼς
+񻂵�ᅳᆾ𑘶ߜ｡ΣؼΣ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵킃𑘶ߜ｡ΣؼΣ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵킃𑘶ߜ｡σؼσ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵�ᅳᆾ𑘶ߜ｡σؼσ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵�ᅳᆾ𑘶ߜ｡Σؼσ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵킃𑘶ߜ｡Σؼσ; 񻂵킃𑘶ߜ.σؼσ; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--4xaa21q; ; ;  # 킃𑘶ߜ.σؼσ
+񻂵�ᅳᆾ𑘶ߜ｡Σؼς; 񻂵킃𑘶ߜ.σؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.σؼς
+񻂵킃𑘶ߜ｡Σؼς; 񻂵킃𑘶ߜ.σؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.σؼς
+񻂵킃𑘶ߜ｡σؼς; 񻂵킃𑘶ߜ.σؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.σؼς
+񻂵�ᅳᆾ𑘶ߜ｡σؼς; 񻂵킃𑘶ߜ.σؼς; [B5, B6, P1, V6]; xn--3sb7483hoyvbbe76g.xn--3xab31q; ; xn--3sb7483hoyvbbe76g.xn--4xaa21q;  # 킃𑘶ߜ.σؼς
+蔰。��-𑈵; 蔰.��-𑈵; [P1, V6]; xn--sz1a.xn----mrd9984r3dl0i; ; ;  # 蔰.�-𑈵
+xn--sz1a.xn----mrd9984r3dl0i; 蔰.��-𑈵; [V6]; xn--sz1a.xn----mrd9984r3dl0i; ; ;  # 蔰.�-𑈵
+ςჅ。ݚ; ςჅ.ݚ; [P1, V6]; xn--3xa677d.xn--epb; ; xn--4xa477d.xn--epb;  # ςჅ.ݚ
+ςⴥ。ݚ; ςⴥ.ݚ; ; xn--3xa403s.xn--epb; ; xn--4xa203s.xn--epb;  # ςⴥ.ݚ
+ΣჅ。ݚ; σჅ.ݚ; [P1, V6]; xn--4xa477d.xn--epb; ; ;  # σჅ.ݚ
+σⴥ。ݚ; σⴥ.ݚ; ; xn--4xa203s.xn--epb; ; ;  # σⴥ.ݚ
+Σⴥ。ݚ; σⴥ.ݚ; ; xn--4xa203s.xn--epb; ; ;  # σⴥ.ݚ
+xn--4xa203s.xn--epb; σⴥ.ݚ; ; xn--4xa203s.xn--epb; ; ;  # σⴥ.ݚ
+σⴥ.ݚ; ; ; xn--4xa203s.xn--epb; ; ;  # σⴥ.ݚ
+ΣჅ.ݚ; σჅ.ݚ; [P1, V6]; xn--4xa477d.xn--epb; ; ;  # σჅ.ݚ
+Σⴥ.ݚ; σⴥ.ݚ; ; xn--4xa203s.xn--epb; ; ;  # σⴥ.ݚ
+xn--4xa477d.xn--epb; σჅ.ݚ; [V6]; xn--4xa477d.xn--epb; ; ;  # σჅ.ݚ
+xn--3xa403s.xn--epb; Ï‚â´¥.Ýš; ; xn--3xa403s.xn--epb; ; ;  # Ï‚â´¥.Ýš
+Ï‚â´¥.Ýš; ; ; xn--3xa403s.xn--epb; ; xn--4xa203s.xn--epb;  # Ï‚â´¥.Ýš
+xn--3xa677d.xn--epb; ςჅ.ݚ; [V6]; xn--3xa677d.xn--epb; ; ;  # ςჅ.ݚ
+�Ⴉ𞰓．᭲; �Ⴉ𞰓.᭲; [B1, B3, B6, P1, V5, V6]; xn--lqc64t7t26c.xn--dwf; ; ;  # �Ⴉ.᭲
+�Ⴉ𞰓.᭲; ; [B1, B3, B6, P1, V5, V6]; xn--lqc64t7t26c.xn--dwf; ; ;  # �Ⴉ.᭲
+�ⴉ𞰓.᭲; ; [B1, B3, B6, P1, V5, V6]; xn--lqc478nlr02a.xn--dwf; ; ;  # �ⴉ.᭲
+xn--lqc478nlr02a.xn--dwf; �ⴉ𞰓.᭲; [B1, B3, B6, V5, V6]; xn--lqc478nlr02a.xn--dwf; ; ;  # �ⴉ.᭲
+xn--lqc64t7t26c.xn--dwf; �Ⴉ𞰓.᭲; [B1, B3, B6, V5, V6]; xn--lqc64t7t26c.xn--dwf; ; ;  # �Ⴉ.᭲
+�ⴉ𞰓．᭲; �ⴉ𞰓.᭲; [B1, B3, B6, P1, V5, V6]; xn--lqc478nlr02a.xn--dwf; ; ;  # �ⴉ.᭲
+⮷≮񎈴󠄟。�; ⮷≮񎈴.�; [B1, P1, V6]; xn--gdh877a3513h.xn--pc9c; ; ;  # ⮷≮.�
+⮷≮񎈴󠄟。�; ⮷≮񎈴.�; [B1, P1, V6]; xn--gdh877a3513h.xn--pc9c; ; ;  # ⮷≮.�
+xn--gdh877a3513h.xn--pc9c; ⮷≮񎈴.�; [B1, V6]; xn--gdh877a3513h.xn--pc9c; ; ;  # ⮷≮.�
+ڼ｡��‌ᡤ; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; xn--vkb.xn--08e172a; [] # ڼ.�ᡤ
+ڼ｡�ẏ‌ᡤ; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; xn--vkb.xn--08e172a; [] # ڼ.�ᡤ
+ڼ。��‌ᡤ; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; xn--vkb.xn--08e172a; [] # ڼ.�ᡤ
+ڼ。�ẏ‌ᡤ; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; xn--vkb.xn--08e172a; [] # ڼ.�ᡤ
+ڼ。�Ẏ‌ᡤ; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; xn--vkb.xn--08e172a; [] # ڼ.�ᡤ
+ڼ。�Ẏ‌ᡤ; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; xn--vkb.xn--08e172a; [] # ڼ.�ᡤ
+xn--vkb.xn--08e172a; ڼ.�ᡤ; ; xn--vkb.xn--08e172a; ; ;  # ڼ.�ᡤ
+ڼ.�ᡤ; ; ; xn--vkb.xn--08e172a; ; ;  # ڼ.�ᡤ
+ڼ.ẏᡤ; ڼ.�ᡤ; ; xn--vkb.xn--08e172a; ; ;  # ڼ.�ᡤ
+ڼ.Ẏᡤ; ڼ.�ᡤ; ; xn--vkb.xn--08e172a; ; ;  # ڼ.�ᡤ
+ڼ.Ẏᡤ; ڼ.�ᡤ; ; xn--vkb.xn--08e172a; ; ;  # ڼ.�ᡤ
+xn--vkb.xn--08e172ax6aca; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; ;  # ڼ.�ᡤ
+ڼ｡�Ẏ‌ᡤ; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; xn--vkb.xn--08e172a; [] # ڼ.�ᡤ
+ڼ｡�Ẏ‌ᡤ; ڼ.��‌ᡤ; [B1, C1, C2]; xn--vkb.xn--08e172ax6aca; ; xn--vkb.xn--08e172a; [] # ڼ.�ᡤ
+�𑲛。�්; �𑲛.�්; [B1, P1, V6]; xn--xo0dg5v.xn--h1c39876d; ; ;  # �𑲛.්
+xn--xo0dg5v.xn--h1c39876d; �𑲛.�්; [B1, V6]; xn--xo0dg5v.xn--h1c39876d; ; ;  # �𑲛.්
+-≠𑈵｡嵕ﻱ۴꥓; -≠𑈵.嵕ي۴꥓; [B1, B5, P1, V3, V6]; xn----ufo4749h.xn--mhb45a235sns3c; ; ;  # -≠𑈵.嵕ي۴꥓
+-≠𑈵｡嵕ﻱ۴꥓; -≠𑈵.嵕ي۴꥓; [B1, B5, P1, V3, V6]; xn----ufo4749h.xn--mhb45a235sns3c; ; ;  # -≠𑈵.嵕ي۴꥓
+-≠𑈵。嵕ي۴꥓; -≠𑈵.嵕ي۴꥓; [B1, B5, P1, V3, V6]; xn----ufo4749h.xn--mhb45a235sns3c; ; ;  # -≠𑈵.嵕ي۴꥓
+-≠𑈵。嵕ي۴꥓; -≠𑈵.嵕ي۴꥓; [B1, B5, P1, V3, V6]; xn----ufo4749h.xn--mhb45a235sns3c; ; ;  # -≠𑈵.嵕ي۴꥓
+xn----ufo4749h.xn--mhb45a235sns3c; -≠𑈵.嵕ي۴꥓; [B1, B5, V3, V6]; xn----ufo4749h.xn--mhb45a235sns3c; ; ;  # -≠𑈵.嵕ي۴꥓
+‌��ݮ．��≯�; ‌��ݮ.��≯�; [B1, B3, C1, C2, P1, V6]; xn--ypb717jrx2o7v94a.xn--0kb660ka35v; ; xn--ypb5875khz9y.xn--0kb682l; [B3, B5, B6, P1, V6] # �ݮ.�≯
+‌��ݮ．��≯�; ‌��ݮ.��≯�; [B1, B3, C1, C2, P1, V6]; xn--ypb717jrx2o7v94a.xn--0kb660ka35v; ; xn--ypb5875khz9y.xn--0kb682l; [B3, B5, B6, P1, V6] # �ݮ.�≯
+‌��ݮ.��≯�; ; [B1, B3, C1, C2, P1, V6]; xn--ypb717jrx2o7v94a.xn--0kb660ka35v; ; xn--ypb5875khz9y.xn--0kb682l; [B3, B5, B6, P1, V6] # �ݮ.�≯
+‌��ݮ.��≯�; ‌��ݮ.��≯�; [B1, B3, C1, C2, P1, V6]; xn--ypb717jrx2o7v94a.xn--0kb660ka35v; ; xn--ypb5875khz9y.xn--0kb682l; [B3, B5, B6, P1, V6] # �ݮ.�≯
+xn--ypb5875khz9y.xn--0kb682l; ��ݮ.�≯; [B3, B5, B6, V6]; xn--ypb5875khz9y.xn--0kb682l; ; ;  # �ݮ.�≯
+xn--ypb717jrx2o7v94a.xn--0kb660ka35v; ‌��ݮ.��≯�; [B1, B3, C1, C2, V6]; xn--ypb717jrx2o7v94a.xn--0kb660ka35v; ; ;  # �ݮ.�≯
+≮．឵ࡕ�; ≮.឵ࡕ�; [B1, P1, V5, V6]; xn--gdh.xn--kwb589e217p; ; ;  # ≮.ࡕ�
+≮．឵ࡕ�; ≮.឵ࡕ�; [B1, P1, V5, V6]; xn--gdh.xn--kwb589e217p; ; ;  # ≮.ࡕ�
+≮.឵ࡕ�; ; [B1, P1, V5, V6]; xn--gdh.xn--kwb589e217p; ; ;  # ≮.ࡕ�
+≮.឵ࡕ�; ≮.឵ࡕ�; [B1, P1, V5, V6]; xn--gdh.xn--kwb589e217p; ; ;  # ≮.ࡕ�
+xn--gdh.xn--kwb589e217p; ≮.឵ࡕ�; [B1, V5, V6]; xn--gdh.xn--kwb589e217p; ; ;  # ≮.ࡕ�
+��｡ႩႵ; ��.ႩႵ; [B3, C2, P1, V6]; xn--1ug4933g.xn--hndy; ; xn--pt9c.xn--hndy; [P1, V6] # �.ႩႵ
+��。ႩႵ; ��.ႩႵ; [B3, C2, P1, V6]; xn--1ug4933g.xn--hndy; ; xn--pt9c.xn--hndy; [P1, V6] # �.ႩႵ
+��。ⴉⴕ; ��.ⴉⴕ; [B3, C2]; xn--1ug4933g.xn--0kjya; ; xn--pt9c.xn--0kjya; [] # �.ⴉⴕ
+��。Ⴉⴕ; ��.Ⴉⴕ; [B3, C2, P1, V6]; xn--1ug4933g.xn--hnd666l; ; xn--pt9c.xn--hnd666l; [P1, V6] # �.Ⴉⴕ
+xn--pt9c.xn--hnd666l; �.Ⴉⴕ; [V6]; xn--pt9c.xn--hnd666l; ; ;  # �.Ⴉⴕ
+xn--1ug4933g.xn--hnd666l; ��.Ⴉⴕ; [B3, C2, V6]; xn--1ug4933g.xn--hnd666l; ; ;  # �.Ⴉⴕ
+xn--pt9c.xn--0kjya; �.ⴉⴕ; ; xn--pt9c.xn--0kjya; ; ;  # �.ⴉⴕ
+�.ⴉⴕ; ; ; xn--pt9c.xn--0kjya; ; ;  # �.ⴉⴕ
+�.ႩႵ; ; [P1, V6]; xn--pt9c.xn--hndy; ; ;  # �.ႩႵ
+�.Ⴉⴕ; ; [P1, V6]; xn--pt9c.xn--hnd666l; ; ;  # �.Ⴉⴕ
+xn--pt9c.xn--hndy; �.ႩႵ; [V6]; xn--pt9c.xn--hndy; ; ;  # �.ႩႵ
+xn--1ug4933g.xn--0kjya; ��.ⴉⴕ; [B3, C2]; xn--1ug4933g.xn--0kjya; ; ;  # �.ⴉⴕ
+xn--1ug4933g.xn--hndy; ��.ႩႵ; [B3, C2, V6]; xn--1ug4933g.xn--hndy; ; ;  # �.ႩႵ
+��｡ⴉⴕ; ��.ⴉⴕ; [B3, C2]; xn--1ug4933g.xn--0kjya; ; xn--pt9c.xn--0kjya; [] # �.ⴉⴕ
+��｡Ⴉⴕ; ��.Ⴉⴕ; [B3, C2, P1, V6]; xn--1ug4933g.xn--hnd666l; ; xn--pt9c.xn--hnd666l; [P1, V6] # �.Ⴉⴕ
+‌‌ㄤ．̮󕨑ূ; ‌‌ㄤ.̮󕨑ূ; [C1, P1, V5, V6]; xn--0uga242k.xn--vta284a9o563a; ; xn--1fk.xn--vta284a9o563a; [P1, V5, V6] # ㄤ.̮ূ
+‌‌ㄤ.̮󕨑ূ; ; [C1, P1, V5, V6]; xn--0uga242k.xn--vta284a9o563a; ; xn--1fk.xn--vta284a9o563a; [P1, V5, V6] # ㄤ.̮ূ
+xn--1fk.xn--vta284a9o563a; ㄤ.̮󕨑ূ; [V5, V6]; xn--1fk.xn--vta284a9o563a; ; ;  # ㄤ.̮ূ
+xn--0uga242k.xn--vta284a9o563a; ‌‌ㄤ.̮󕨑ূ; [C1, V5, V6]; xn--0uga242k.xn--vta284a9o563a; ; ;  # ㄤ.̮ূ
+�｡-‌�Ⴗ; �.-‌�Ⴗ; [B1, C1, P1, V3, V6]; xn--v97c.xn----i1g888ih12u; ; xn--v97c.xn----i1g2513q; [B1, P1, V3, V6] # �.-�Ⴗ
+�。-‌�Ⴗ; �.-‌�Ⴗ; [B1, C1, P1, V3, V6]; xn--v97c.xn----i1g888ih12u; ; xn--v97c.xn----i1g2513q; [B1, P1, V3, V6] # �.-�Ⴗ
+�。-‌�ⴗ; �.-‌�ⴗ; [B1, C1, V3]; xn--v97c.xn----sgnv20du99s; ; xn--v97c.xn----lws0526f; [B1, V3] # �.-�ⴗ
+xn--v97c.xn----lws0526f; �.-�ⴗ; [B1, V3]; xn--v97c.xn----lws0526f; ; ;  # �.-�ⴗ
+xn--v97c.xn----sgnv20du99s; �.-‌�ⴗ; [B1, C1, V3]; xn--v97c.xn----sgnv20du99s; ; ;  # �.-�ⴗ
+xn--v97c.xn----i1g2513q; �.-�Ⴗ; [B1, V3, V6]; xn--v97c.xn----i1g2513q; ; ;  # �.-�Ⴗ
+xn--v97c.xn----i1g888ih12u; �.-‌�Ⴗ; [B1, C1, V3, V6]; xn--v97c.xn----i1g888ih12u; ; ;  # �.-�Ⴗ
+�｡-‌�ⴗ; �.-‌�ⴗ; [B1, C1, V3]; xn--v97c.xn----sgnv20du99s; ; xn--v97c.xn----lws0526f; [B1, V3] # �.-�ⴗ
+🙑�．≠‌; 🙑�.≠‌; [B1, C1, P1, V6]; xn--bl0dh970b.xn--0ug83g; ; xn--bl0dh970b.xn--1ch; [B1, P1, V6] # 🙑.≠
+🙑�．≠‌; 🙑�.≠‌; [B1, C1, P1, V6]; xn--bl0dh970b.xn--0ug83g; ; xn--bl0dh970b.xn--1ch; [B1, P1, V6] # 🙑.≠
+🙑�.≠‌; ; [B1, C1, P1, V6]; xn--bl0dh970b.xn--0ug83g; ; xn--bl0dh970b.xn--1ch; [B1, P1, V6] # 🙑.≠
+🙑�.≠‌; 🙑�.≠‌; [B1, C1, P1, V6]; xn--bl0dh970b.xn--0ug83g; ; xn--bl0dh970b.xn--1ch; [B1, P1, V6] # 🙑.≠
+xn--bl0dh970b.xn--1ch; 🙑�.≠; [B1, V6]; xn--bl0dh970b.xn--1ch; ; ;  # 🙑.≠
+xn--bl0dh970b.xn--0ug83g; 🙑�.≠‌; [B1, C1, V6]; xn--bl0dh970b.xn--0ug83g; ; ;  # 🙑.≠
+ٌ᳒｡𞮞⵿⧎; ٌ᳒.𞮞⵿⧎; [B1, B3, B6, P1, V5, V6]; xn--ohb646i.xn--ewi38jf765c; ; ;  # ٌ᳒.⵿⧎
+ٌ᳒。𞮞⵿⧎; ٌ᳒.𞮞⵿⧎; [B1, B3, B6, P1, V5, V6]; xn--ohb646i.xn--ewi38jf765c; ; ;  # ٌ᳒.⵿⧎
+xn--ohb646i.xn--ewi38jf765c; ٌ᳒.𞮞⵿⧎; [B1, B3, B6, V5, V6]; xn--ohb646i.xn--ewi38jf765c; ; ;  # ٌ᳒.⵿⧎
+Ⴔ�₃�．�𑂹ஂ; Ⴔ�3�.7𑂹ஂ; [P1, V6]; xn--3-b1g83426a35t0g.xn--7-cve6271r; ; ;  # Ⴔ�3.7𑂹ஂ
+Ⴔ�3�.7𑂹ஂ; ; [P1, V6]; xn--3-b1g83426a35t0g.xn--7-cve6271r; ; ;  # Ⴔ�3.7𑂹ஂ
+ⴔ�3�.7𑂹ஂ; ; [P1, V6]; xn--3-ews6985n35s3g.xn--7-cve6271r; ; ;  # ⴔ�3.7𑂹ஂ
+xn--3-ews6985n35s3g.xn--7-cve6271r; ⴔ�3�.7𑂹ஂ; [V6]; xn--3-ews6985n35s3g.xn--7-cve6271r; ; ;  # ⴔ�3.7𑂹ஂ
+xn--3-b1g83426a35t0g.xn--7-cve6271r; Ⴔ�3�.7𑂹ஂ; [V6]; xn--3-b1g83426a35t0g.xn--7-cve6271r; ; ;  # Ⴔ�3.7𑂹ஂ
+ⴔ�₃�．�𑂹ஂ; ⴔ�3�.7𑂹ஂ; [P1, V6]; xn--3-ews6985n35s3g.xn--7-cve6271r; ; ;  # ⴔ�3.7𑂹ஂ
+�‌。‌⒈񱢕; �‌.‌⒈񱢕; [C1, P1, V6]; xn--0ug491l.xn--0ug88oot66q; ; xn--eco.xn--tsh21126d; [P1, V6] # �.⒈
+�‌。‌1.񱢕; �‌.‌1.񱢕; [C1, P1, V6]; xn--0ug491l.xn--1-rgn.xn--ms39a; ; xn--eco.1.xn--ms39a; [P1, V6] # �.1.
+xn--eco.1.xn--ms39a; �.1.񱢕; [V6]; xn--eco.1.xn--ms39a; ; ;  # �.1.
+xn--0ug491l.xn--1-rgn.xn--ms39a; �‌.‌1.񱢕; [C1, V6]; xn--0ug491l.xn--1-rgn.xn--ms39a; ; ;  # �.1.
+xn--eco.xn--tsh21126d; �.⒈񱢕; [V6]; xn--eco.xn--tsh21126d; ; ;  # �.⒈
+xn--0ug491l.xn--0ug88oot66q; �‌.‌⒈񱢕; [C1, V6]; xn--0ug491l.xn--0ug88oot66q; ; ;  # �.⒈
+１꫶ß𑲥｡ᷘ; 1꫶ß𑲥.ᷘ; [V5]; xn--1-qfa2471kdb0d.xn--weg; ; xn--1ss-ir6ln166b.xn--weg;  # 1꫶ß𑲥.ᷘ
+1꫶ß𑲥。ᷘ; 1꫶ß𑲥.ᷘ; [V5]; xn--1-qfa2471kdb0d.xn--weg; ; xn--1ss-ir6ln166b.xn--weg;  # 1꫶ß𑲥.ᷘ
+1꫶SS𑲥。ᷘ; 1꫶ss𑲥.ᷘ; [V5]; xn--1ss-ir6ln166b.xn--weg; ; ;  # 1꫶ss𑲥.ᷘ
+1꫶ss𑲥。ᷘ; 1꫶ss𑲥.ᷘ; [V5]; xn--1ss-ir6ln166b.xn--weg; ; ;  # 1꫶ss𑲥.ᷘ
+xn--1ss-ir6ln166b.xn--weg; 1꫶ss𑲥.ᷘ; [V5]; xn--1ss-ir6ln166b.xn--weg; ; ;  # 1꫶ss𑲥.ᷘ
+xn--1-qfa2471kdb0d.xn--weg; 1꫶ß𑲥.ᷘ; [V5]; xn--1-qfa2471kdb0d.xn--weg; ; ;  # 1꫶ß𑲥.ᷘ
+１꫶SS𑲥｡ᷘ; 1꫶ss𑲥.ᷘ; [V5]; xn--1ss-ir6ln166b.xn--weg; ; ;  # 1꫶ss𑲥.ᷘ
+１꫶ss𑲥｡ᷘ; 1꫶ss𑲥.ᷘ; [V5]; xn--1ss-ir6ln166b.xn--weg; ; ;  # 1꫶ss𑲥.ᷘ
+1꫶Ss𑲥。ᷘ; 1꫶ss𑲥.ᷘ; [V5]; xn--1ss-ir6ln166b.xn--weg; ; ;  # 1꫶ss𑲥.ᷘ
+１꫶Ss𑲥｡ᷘ; 1꫶ss𑲥.ᷘ; [V5]; xn--1ss-ir6ln166b.xn--weg; ; ;  # 1꫶ss𑲥.ᷘ
+�񫶩𞪯�｡ݼ⒈; �񫶩𞪯�.ݼ⒈; [B1, C2, P1, V6]; xn--8tc969gzn94a4lm8a.xn--dqb689l; ; xn--8tc9875v5is1a.xn--dqb689l; [B5, B6, P1, V6] # �.ݼ⒈
+�񫶩𞪯�。ݼ1.; �񫶩𞪯�.ݼ1.; [B1, C2, P1, V6]; xn--8tc969gzn94a4lm8a.xn--1-g6c.; ; xn--8tc9875v5is1a.xn--1-g6c.; [B5, B6, P1, V6] # �.ݼ1.
+xn--8tc9875v5is1a.xn--1-g6c.; 񫶩𞪯�.ݼ1.; [B5, B6, V6]; xn--8tc9875v5is1a.xn--1-g6c.; ; ;  # �.ݼ1.
+xn--8tc969gzn94a4lm8a.xn--1-g6c.; �񫶩𞪯�.ݼ1.; [B1, C2, V6]; xn--8tc969gzn94a4lm8a.xn--1-g6c.; ; ;  # �.ݼ1.
+xn--8tc9875v5is1a.xn--dqb689l; 񫶩𞪯�.ݼ⒈; [B5, B6, V6]; xn--8tc9875v5is1a.xn--dqb689l; ; ;  # �.ݼ⒈
+xn--8tc969gzn94a4lm8a.xn--dqb689l; �񫶩𞪯�.ݼ⒈; [B1, C2, V6]; xn--8tc969gzn94a4lm8a.xn--dqb689l; ; ;  # �.ݼ⒈
+᪶．𞤳򓢖򻉒ߗ; ᪶.𞤳򓢖򻉒ߗ; [B1, B2, B3, B6, P1, V5, V6]; xn--zqf.xn--ysb9657vuiz5bj0ep; ; ;  # ᪶.𞤳ߗ
+᪶.𞤳򓢖򻉒ߗ; ; [B1, B2, B3, B6, P1, V5, V6]; xn--zqf.xn--ysb9657vuiz5bj0ep; ; ;  # ᪶.𞤳ߗ
+᪶.𞤑򓢖򻉒ߗ; ᪶.𞤳򓢖򻉒ߗ; [B1, B2, B3, B6, P1, V5, V6]; xn--zqf.xn--ysb9657vuiz5bj0ep; ; ;  # ᪶.𞤳ߗ
+xn--zqf.xn--ysb9657vuiz5bj0ep; ᪶.𞤳򓢖򻉒ߗ; [B1, B2, B3, B6, V5, V6]; xn--zqf.xn--ysb9657vuiz5bj0ep; ; ;  # ᪶.𞤳ߗ
+᪶．𞤑򓢖򻉒ߗ; ᪶.𞤳򓢖򻉒ߗ; [B1, B2, B3, B6, P1, V5, V6]; xn--zqf.xn--ysb9657vuiz5bj0ep; ; ;  # ᪶.𞤳ߗ
+ࡂ𞩚⒈．󠬌８�ݰ; ࡂ𞩚⒈.󠬌8�ݰ; [B1, P1, V6]; xn--0vb095ldg52a.xn--8-s5c22427ox454a; ; ;  # ࡂ⒈.8ݰ
+ࡂ𞩚1..󠬌8�ݰ; ; [B1, P1, V6, X4_2]; xn--1-rid26318a..xn--8-s5c22427ox454a; [B1, P1, V6, A4_2]; ;  # ࡂ1..8ݰ
+xn--1-rid26318a..xn--8-s5c22427ox454a; ࡂ𞩚1..󠬌8�ݰ; [B1, V6, X4_2]; xn--1-rid26318a..xn--8-s5c22427ox454a; [B1, V6, A4_2]; ;  # ࡂ1..8ݰ
+xn--0vb095ldg52a.xn--8-s5c22427ox454a; ࡂ𞩚⒈.󠬌8�ݰ; [B1, V6]; xn--0vb095ldg52a.xn--8-s5c22427ox454a; ; ;  # ࡂ⒈.8ݰ
+͡�ͩᡷ。-󠰛鞰; ͡�ͩᡷ.-󠰛鞰; [B1, P1, V3, V5, V6]; xn--cvaq482npv5t.xn----yg7dt1332g; ; ;  # ͡�ͩᡷ.-鞰
+xn--cvaq482npv5t.xn----yg7dt1332g; ͡�ͩᡷ.-󠰛鞰; [B1, V3, V5, V6]; xn--cvaq482npv5t.xn----yg7dt1332g; ; ;  # ͡�ͩᡷ.-鞰
+-.�剘ß�; ; [B1, V3, V5]; -.xn--zca791c493duf8i; ; -.xn--ss-bqg4734erywk;  # -.�剘ß�
+-.�剘SS�; -.�剘ss�; [B1, V3, V5]; -.xn--ss-bqg4734erywk; ; ;  # -.�剘ss�
+-.�剘ss�; ; [B1, V3, V5]; -.xn--ss-bqg4734erywk; ; ;  # -.�剘ss�
+-.�剘Ss�; -.�剘ss�; [B1, V3, V5]; -.xn--ss-bqg4734erywk; ; ;  # -.�剘ss�
+-.xn--ss-bqg4734erywk; -.�剘ss�; [B1, V3, V5]; -.xn--ss-bqg4734erywk; ; ;  # -.�剘ss�
+-.xn--zca791c493duf8i; -.�剘ß�; [B1, V3, V5]; -.xn--zca791c493duf8i; ; ;  # -.�剘ß�
+ࣻ𞵸｡-; ࣻ𞵸.-; [B1, P1, V3, V5, V6]; xn--b1b2719v.-; ; ;  # ࣻ.-
+ࣻ𞵸。-; ࣻ𞵸.-; [B1, P1, V3, V5, V6]; xn--b1b2719v.-; ; ;  # ࣻ.-
+xn--b1b2719v.-; ࣻ𞵸.-; [B1, V3, V5, V6]; xn--b1b2719v.-; ; ;  # ࣻ.-
+⒈󠈻�｡≠؃�; ⒈󠈻�.≠؃�; [B1, P1, V6]; xn--tshw766f1153g.xn--lfb536lb35n; ; ;  # ⒈�.≠�
+⒈󠈻�｡≠؃�; ⒈󠈻�.≠؃�; [B1, P1, V6]; xn--tshw766f1153g.xn--lfb536lb35n; ; ;  # ⒈�.≠�
+1.󠈻�。≠؃�; 1.󠈻�.≠؃�; [B1, P1, V6]; 1.xn--qo0dl3077c.xn--lfb536lb35n; ; ;  # 1.�.≠�
+1.󠈻�。≠؃�; 1.󠈻�.≠؃�; [B1, P1, V6]; 1.xn--qo0dl3077c.xn--lfb536lb35n; ; ;  # 1.�.≠�
+1.xn--qo0dl3077c.xn--lfb536lb35n; 1.󠈻�.≠؃�; [B1, V6]; 1.xn--qo0dl3077c.xn--lfb536lb35n; ; ;  # 1.�.≠�
+xn--tshw766f1153g.xn--lfb536lb35n; ⒈󠈻�.≠؃�; [B1, V6]; xn--tshw766f1153g.xn--lfb536lb35n; ; ;  # ⒈�.≠�
+�󠈚Ⴎ‌.㖾�; ; [B1, B5, B6, C1, P1, V6]; xn--mnd289ezj4pqxp0i.xn--pelu572d; ; xn--mnd9001km0o0g.xn--pelu572d; [B1, B5, B6, P1, V6] # �Ⴎ.㖾�
+�󠈚ⴎ‌.㖾�; ; [B1, B5, B6, C1, P1, V6]; xn--0ug342clq0pqxv4i.xn--pelu572d; ; xn--5kjx323em053g.xn--pelu572d; [B1, B5, B6, P1, V6] # �ⴎ.㖾�
+xn--5kjx323em053g.xn--pelu572d; �󠈚ⴎ.㖾�; [B1, B5, B6, V6]; xn--5kjx323em053g.xn--pelu572d; ; ;  # �ⴎ.㖾�
+xn--0ug342clq0pqxv4i.xn--pelu572d; �󠈚ⴎ‌.㖾�; [B1, B5, B6, C1, V6]; xn--0ug342clq0pqxv4i.xn--pelu572d; ; ;  # �ⴎ.㖾�
+xn--mnd9001km0o0g.xn--pelu572d; �󠈚Ⴎ.㖾�; [B1, B5, B6, V6]; xn--mnd9001km0o0g.xn--pelu572d; ; ;  # �Ⴎ.㖾�
+xn--mnd289ezj4pqxp0i.xn--pelu572d; �󠈚Ⴎ‌.㖾�; [B1, B5, B6, C1, V6]; xn--mnd289ezj4pqxp0i.xn--pelu572d; ; ;  # �Ⴎ.㖾�
+򩼗．߇ᡖႳႧ; 򩼗.߇ᡖႳႧ; [B2, B3, P1, V6]; xn--te28c.xn--isb856b9a631d; ; ;  # .߇ᡖႳႧ
+򩼗.߇ᡖႳႧ; ; [B2, B3, P1, V6]; xn--te28c.xn--isb856b9a631d; ; ;  # .߇ᡖႳႧ
+򩼗.߇ᡖⴓⴇ; ; [B2, B3, P1, V6]; xn--te28c.xn--isb295fbtpmb; ; ;  # .߇ᡖⴓⴇ
+xn--te28c.xn--isb295fbtpmb; 򩼗.߇ᡖⴓⴇ; [B2, B3, V6]; xn--te28c.xn--isb295fbtpmb; ; ;  # .߇ᡖⴓⴇ
+xn--te28c.xn--isb856b9a631d; 򩼗.߇ᡖႳႧ; [B2, B3, V6]; xn--te28c.xn--isb856b9a631d; ; ;  # .߇ᡖႳႧ
+򩼗．߇ᡖⴓⴇ; 򩼗.߇ᡖⴓⴇ; [B2, B3, P1, V6]; xn--te28c.xn--isb295fbtpmb; ; ;  # .߇ᡖⴓⴇ
+򩼗.߇ᡖႳⴇ; ; [B2, B3, P1, V6]; xn--te28c.xn--isb286btrgo7w; ; ;  # .߇ᡖႳⴇ
+xn--te28c.xn--isb286btrgo7w; 򩼗.߇ᡖႳⴇ; [B2, B3, V6]; xn--te28c.xn--isb286btrgo7w; ; ;  # .߇ᡖႳⴇ
+򩼗．߇ᡖႳⴇ; 򩼗.߇ᡖႳⴇ; [B2, B3, P1, V6]; xn--te28c.xn--isb286btrgo7w; ; ;  # .߇ᡖႳⴇ
+��.ڳݵ; ; [B1, C2, P1, V6]; xn--1ug39444n.xn--mkb20b; ; xn--3j78f.xn--mkb20b; [P1, V6] # .ڳݵ
+xn--3j78f.xn--mkb20b; �.ڳݵ; [V6]; xn--3j78f.xn--mkb20b; ; ;  # .ڳݵ
+xn--1ug39444n.xn--mkb20b; ��.ڳݵ; [B1, C2, V6]; xn--1ug39444n.xn--mkb20b; ; ;  # .ڳݵ
+𲤱⒛⾳．ꡦ⒈; 𲤱⒛音.ꡦ⒈; [P1, V6]; xn--dth6033bzbvx.xn--tsh9439b; ; ;  # ⒛音.ꡦ⒈
+𲤱20.音.ꡦ1.; ; [P1, V6]; xn--20-9802c.xn--0w5a.xn--1-eg4e.; ; ;  # 20.音.ꡦ1.
+xn--20-9802c.xn--0w5a.xn--1-eg4e.; 𲤱20.音.ꡦ1.; [V6]; xn--20-9802c.xn--0w5a.xn--1-eg4e.; ; ;  # 20.音.ꡦ1.
+xn--dth6033bzbvx.xn--tsh9439b; 𲤱⒛音.ꡦ⒈; [V6]; xn--dth6033bzbvx.xn--tsh9439b; ; ;  # ⒛音.ꡦ⒈
+ߜ８񳦓-｡򞲙���; ߜ8񳦓-.򞲙���; [B2, B3, B5, B6, P1, V3, V6]; xn--8--rve13079p.xn--b7b9842k42df776x; ; ;  # ߜ8-.���
+ߜ8񳦓-。򞲙���; ߜ8񳦓-.򞲙���; [B2, B3, B5, B6, P1, V3, V6]; xn--8--rve13079p.xn--b7b9842k42df776x; ; ;  # ߜ8-.���
+xn--8--rve13079p.xn--b7b9842k42df776x; ߜ8񳦓-.򞲙���; [B2, B3, B5, B6, V3, V6]; xn--8--rve13079p.xn--b7b9842k42df776x; ; ;  # ߜ8-.���
+Ⴕ。۰≮ß݅; Ⴕ.۰≮ß݅; [P1, V6]; xn--tnd.xn--zca912alh227g; ; xn--tnd.xn--ss-jbe65aw27i;  # Ⴕ.۰≮ß݅
+Ⴕ。۰≮ß݅; Ⴕ.۰≮ß݅; [P1, V6]; xn--tnd.xn--zca912alh227g; ; xn--tnd.xn--ss-jbe65aw27i;  # Ⴕ.۰≮ß݅
+ⴕ。۰≮ß݅; ⴕ.۰≮ß݅; [P1, V6]; xn--dlj.xn--zca912alh227g; ; xn--dlj.xn--ss-jbe65aw27i;  # ⴕ.۰≮ß݅
+ⴕ。۰≮ß݅; ⴕ.۰≮ß݅; [P1, V6]; xn--dlj.xn--zca912alh227g; ; xn--dlj.xn--ss-jbe65aw27i;  # ⴕ.۰≮ß݅
+Ⴕ。۰≮SS݅; Ⴕ.۰≮ss݅; [P1, V6]; xn--tnd.xn--ss-jbe65aw27i; ; ;  # Ⴕ.۰≮ss݅
+Ⴕ。۰≮SS݅; Ⴕ.۰≮ss݅; [P1, V6]; xn--tnd.xn--ss-jbe65aw27i; ; ;  # Ⴕ.۰≮ss݅
+ⴕ。۰≮ss݅; ⴕ.۰≮ss݅; [P1, V6]; xn--dlj.xn--ss-jbe65aw27i; ; ;  # ⴕ.۰≮ss݅
+ⴕ。۰≮ss݅; ⴕ.۰≮ss݅; [P1, V6]; xn--dlj.xn--ss-jbe65aw27i; ; ;  # ⴕ.۰≮ss݅
+Ⴕ。۰≮Ss݅; Ⴕ.۰≮ss݅; [P1, V6]; xn--tnd.xn--ss-jbe65aw27i; ; ;  # Ⴕ.۰≮ss݅
+Ⴕ。۰≮Ss݅; Ⴕ.۰≮ss݅; [P1, V6]; xn--tnd.xn--ss-jbe65aw27i; ; ;  # Ⴕ.۰≮ss݅
+xn--tnd.xn--ss-jbe65aw27i; Ⴕ.۰≮ss݅; [V6]; xn--tnd.xn--ss-jbe65aw27i; ; ;  # Ⴕ.۰≮ss݅
+xn--dlj.xn--ss-jbe65aw27i; ⴕ.۰≮ss݅; [V6]; xn--dlj.xn--ss-jbe65aw27i; ; ;  # ⴕ.۰≮ss݅
+xn--dlj.xn--zca912alh227g; ⴕ.۰≮ß݅; [V6]; xn--dlj.xn--zca912alh227g; ; ;  # ⴕ.۰≮ß݅
+xn--tnd.xn--zca912alh227g; Ⴕ.۰≮ß݅; [V6]; xn--tnd.xn--zca912alh227g; ; ;  # Ⴕ.۰≮ß݅
+ߩ-.�꒱᭲; ; [B1, B3, V3, V5]; xn----odd.xn--dwf8994dc8wj; ; ;  # ߩ-.�꒱᭲
+xn----odd.xn--dwf8994dc8wj; ߩ-.�꒱᭲; [B1, B3, V3, V5]; xn----odd.xn--dwf8994dc8wj; ; ;  # ߩ-.�꒱᭲
+𞼸‌.≯䕵⫧; ; [B1, B3, C1, P1, V6]; xn--0ugx453p.xn--hdh754ax6w; ; xn--sn7h.xn--hdh754ax6w; [B1, P1, V6] # .≯䕵⫧
+𞼸‌.≯䕵⫧; 𞼸‌.≯䕵⫧; [B1, B3, C1, P1, V6]; xn--0ugx453p.xn--hdh754ax6w; ; xn--sn7h.xn--hdh754ax6w; [B1, P1, V6] # .≯䕵⫧
+xn--sn7h.xn--hdh754ax6w; 𞼸.≯䕵⫧; [B1, V6]; xn--sn7h.xn--hdh754ax6w; ; ;  # .≯䕵⫧
+xn--0ugx453p.xn--hdh754ax6w; 𞼸‌.≯䕵⫧; [B1, B3, C1, V6]; xn--0ugx453p.xn--hdh754ax6w; ; ;  # .≯䕵⫧
+�ßﱗ.ڬ۳︒; �ßيخ.ڬ۳︒; [B1, B3, P1, V5, V6]; xn--zca23yncs877j.xn--fkb6lp314e; ; xn--ss-ytd5i7765l.xn--fkb6lp314e;  # �ßيخ.ڬ۳︒
+�ßيخ.ڬ۳。; �ßيخ.ڬ۳.; [B1, V5]; xn--zca23yncs877j.xn--fkb6l.; ; xn--ss-ytd5i7765l.xn--fkb6l.;  # �ßيخ.ڬ۳.
+�SSيخ.ڬ۳。; �ssيخ.ڬ۳.; [B1, V5]; xn--ss-ytd5i7765l.xn--fkb6l.; ; ;  # �ssيخ.ڬ۳.
+�ssيخ.ڬ۳。; �ssيخ.ڬ۳.; [B1, V5]; xn--ss-ytd5i7765l.xn--fkb6l.; ; ;  # �ssيخ.ڬ۳.
+�Ssيخ.ڬ۳。; �ssيخ.ڬ۳.; [B1, V5]; xn--ss-ytd5i7765l.xn--fkb6l.; ; ;  # �ssيخ.ڬ۳.
+xn--ss-ytd5i7765l.xn--fkb6l.; �ssيخ.ڬ۳.; [B1, V5]; xn--ss-ytd5i7765l.xn--fkb6l.; ; ;  # �ssيخ.ڬ۳.
+xn--zca23yncs877j.xn--fkb6l.; �ßيخ.ڬ۳.; [B1, V5]; xn--zca23yncs877j.xn--fkb6l.; ; ;  # �ßيخ.ڬ۳.
+�SSﱗ.ڬ۳︒; �ssيخ.ڬ۳︒; [B1, B3, P1, V5, V6]; xn--ss-ytd5i7765l.xn--fkb6lp314e; ; ;  # �ssيخ.ڬ۳︒
+�ssﱗ.ڬ۳︒; �ssيخ.ڬ۳︒; [B1, B3, P1, V5, V6]; xn--ss-ytd5i7765l.xn--fkb6lp314e; ; ;  # �ssيخ.ڬ۳︒
+�Ssﱗ.ڬ۳︒; �ssيخ.ڬ۳︒; [B1, B3, P1, V5, V6]; xn--ss-ytd5i7765l.xn--fkb6lp314e; ; ;  # �ssيخ.ڬ۳︒
+xn--ss-ytd5i7765l.xn--fkb6lp314e; �ssيخ.ڬ۳︒; [B1, B3, V5, V6]; xn--ss-ytd5i7765l.xn--fkb6lp314e; ; ;  # �ssيخ.ڬ۳︒
+xn--zca23yncs877j.xn--fkb6lp314e; �ßيخ.ڬ۳︒; [B1, B3, V5, V6]; xn--zca23yncs877j.xn--fkb6lp314e; ; ;  # �ßيخ.ڬ۳︒
+-≮🡒᳭.�Ⴁܔ; ; [B1, P1, V3, V6]; xn----44l04zxt68c.xn--enb300c1597h; ; ;  # -≮🡒᳭.Ⴁܔ
+-≮🡒᳭.�Ⴁܔ; -≮🡒᳭.�Ⴁܔ; [B1, P1, V3, V6]; xn----44l04zxt68c.xn--enb300c1597h; ; ;  # -≮🡒᳭.Ⴁܔ
+-≮🡒᳭.��ܔ; -≮🡒᳭.��ܔ; [B1, P1, V3, V6]; xn----44l04zxt68c.xn--enb135qf106f; ; ;  # -≮🡒᳭.�ܔ
+-≮🡒᳭.��ܔ; ; [B1, P1, V3, V6]; xn----44l04zxt68c.xn--enb135qf106f; ; ;  # -≮🡒᳭.�ܔ
+xn----44l04zxt68c.xn--enb135qf106f; -≮🡒᳭.��ܔ; [B1, V3, V6]; xn----44l04zxt68c.xn--enb135qf106f; ; ;  # -≮🡒᳭.�ܔ
+xn----44l04zxt68c.xn--enb300c1597h; -≮🡒᳭.�Ⴁܔ; [B1, V3, V6]; xn----44l04zxt68c.xn--enb300c1597h; ; ;  # -≮🡒᳭.Ⴁܔ
+𞤨｡��‌; 𞤨.��‌; [B6, C1, C2]; xn--ge6h.xn--0ugb9575h; ; xn--ge6h.xn--oc9a; [] # 𞤨.�
+𞤨。��‌; 𞤨.��‌; [B6, C1, C2]; xn--ge6h.xn--0ugb9575h; ; xn--ge6h.xn--oc9a; [] # 𞤨.�
+𞤆。��‌; 𞤨.��‌; [B6, C1, C2]; xn--ge6h.xn--0ugb9575h; ; xn--ge6h.xn--oc9a; [] # 𞤨.�
+xn--ge6h.xn--oc9a; 𞤨.�; ; xn--ge6h.xn--oc9a; ; ;  # 𞤨.�
+𞤨.�; ; ; xn--ge6h.xn--oc9a; ; ;  # 𞤨.�
+𞤆.�; 𞤨.�; ; xn--ge6h.xn--oc9a; ; ;  # 𞤨.�
+xn--ge6h.xn--0ugb9575h; 𞤨.��‌; [B6, C1, C2]; xn--ge6h.xn--0ugb9575h; ; ;  # 𞤨.�
+𞤆｡��‌; 𞤨.��‌; [B6, C1, C2]; xn--ge6h.xn--0ugb9575h; ; xn--ge6h.xn--oc9a; [] # 𞤨.�
+󠅹𑂶．ᢌ𑂹٩; 𑂶.ᢌ𑂹٩; [B1, B3, B5, B6, V5]; xn--b50d.xn--iib993gyp5p; ; ;  # 𑂶.ᢌ𑂹٩
+󠅹𑂶.ᢌ𑂹٩; 𑂶.ᢌ𑂹٩; [B1, B3, B5, B6, V5]; xn--b50d.xn--iib993gyp5p; ; ;  # 𑂶.ᢌ𑂹٩
+xn--b50d.xn--iib993gyp5p; 𑂶.ᢌ𑂹٩; [B1, B3, B5, B6, V5]; xn--b50d.xn--iib993gyp5p; ; ;  # 𑂶.ᢌ𑂹٩
+Ⅎ󠅺�。≯⾑; Ⅎ�.≯襾; [P1, V6]; xn--f3g73398c.xn--hdhz171b; ; ;  # Ⅎ.≯襾
+Ⅎ󠅺�。≯⾑; Ⅎ�.≯襾; [P1, V6]; xn--f3g73398c.xn--hdhz171b; ; ;  # Ⅎ.≯襾
+Ⅎ󠅺�。≯襾; Ⅎ�.≯襾; [P1, V6]; xn--f3g73398c.xn--hdhz171b; ; ;  # Ⅎ.≯襾
+Ⅎ󠅺�。≯襾; Ⅎ�.≯襾; [P1, V6]; xn--f3g73398c.xn--hdhz171b; ; ;  # Ⅎ.≯襾
+ⅎ󠅺�。≯襾; ⅎ�.≯襾; [P1, V6]; xn--73g39298c.xn--hdhz171b; ; ;  # ⅎ.≯襾
+ⅎ󠅺�。≯襾; ⅎ�.≯襾; [P1, V6]; xn--73g39298c.xn--hdhz171b; ; ;  # ⅎ.≯襾
+xn--73g39298c.xn--hdhz171b; ⅎ�.≯襾; [V6]; xn--73g39298c.xn--hdhz171b; ; ;  # ⅎ.≯襾
+xn--f3g73398c.xn--hdhz171b; Ⅎ�.≯襾; [V6]; xn--f3g73398c.xn--hdhz171b; ; ;  # Ⅎ.≯襾
+ⅎ󠅺�。≯⾑; ⅎ�.≯襾; [P1, V6]; xn--73g39298c.xn--hdhz171b; ; ;  # ⅎ.≯襾
+ⅎ󠅺�。≯⾑; ⅎ�.≯襾; [P1, V6]; xn--73g39298c.xn--hdhz171b; ; ;  # ⅎ.≯襾
+ς�ු٠｡-; ς�ු٠.-; [B1, B5, B6, C2, V3]; xn--3xa45ks2jenu.-; ; xn--4xa25ks2j.-; [B1, B5, B6, V3] # ςු٠.-
+ς�ු٠。-; ς�ු٠.-; [B1, B5, B6, C2, V3]; xn--3xa45ks2jenu.-; ; xn--4xa25ks2j.-; [B1, B5, B6, V3] # ςු٠.-
+Σ�ු٠。-; σ�ු٠.-; [B1, B5, B6, C2, V3]; xn--4xa25ks2jenu.-; ; xn--4xa25ks2j.-; [B1, B5, B6, V3] # σු٠.-
+σ�ු٠。-; σ�ු٠.-; [B1, B5, B6, C2, V3]; xn--4xa25ks2jenu.-; ; xn--4xa25ks2j.-; [B1, B5, B6, V3] # σු٠.-
+xn--4xa25ks2j.-; σු٠.-; [B1, B5, B6, V3]; xn--4xa25ks2j.-; ; ;  # σු٠.-
+xn--4xa25ks2jenu.-; σ�ු٠.-; [B1, B5, B6, C2, V3]; xn--4xa25ks2jenu.-; ; ;  # σු٠.-
+xn--3xa45ks2jenu.-; ς�ු٠.-; [B1, B5, B6, C2, V3]; xn--3xa45ks2jenu.-; ; ;  # ςු٠.-
+Σ�ු٠｡-; σ�ු٠.-; [B1, B5, B6, C2, V3]; xn--4xa25ks2jenu.-; ; xn--4xa25ks2j.-; [B1, B5, B6, V3] # σු٠.-
+σ�ු٠｡-; σ�ු٠.-; [B1, B5, B6, C2, V3]; xn--4xa25ks2jenu.-; ; xn--4xa25ks2j.-; [B1, B5, B6, V3] # σු٠.-
+‌.ßႩ-; ; [C1, P1, V3, V6]; xn--0ug.xn----pfa042j; ; .xn--ss--4rn; [P1, V3, V6, A4_2] # .ßႩ-
+‌.ßⴉ-; ; [C1, V3]; xn--0ug.xn----pfa2305a; ; .xn--ss--bi1b; [V3, A4_2] # .ßⴉ-
+‌.SSႩ-; ‌.ssႩ-; [C1, P1, V3, V6]; xn--0ug.xn--ss--4rn; ; .xn--ss--4rn; [P1, V3, V6, A4_2] # .ssႩ-
+‌.ssⴉ-; ; [C1, V3]; xn--0ug.xn--ss--bi1b; ; .xn--ss--bi1b; [V3, A4_2] # .ssⴉ-
+‌.Ssⴉ-; ‌.ssⴉ-; [C1, V3]; xn--0ug.xn--ss--bi1b; ; .xn--ss--bi1b; [V3, A4_2] # .ssⴉ-
+.xn--ss--bi1b; .ssâ´‰-; [V3, X4_2]; .xn--ss--bi1b; [V3, A4_2]; ;  # .ssâ´‰-
+xn--0ug.xn--ss--bi1b; ‌.ssⴉ-; [C1, V3]; xn--0ug.xn--ss--bi1b; ; ;  # .ssⴉ-
+.xn--ss--4rn; .ssá‚©-; [V3, V6, X4_2]; .xn--ss--4rn; [V3, V6, A4_2]; ;  # .ssá‚©-
+xn--0ug.xn--ss--4rn; ‌.ssႩ-; [C1, V3, V6]; xn--0ug.xn--ss--4rn; ; ;  # .ssႩ-
+xn--0ug.xn----pfa2305a; ‌.ßⴉ-; [C1, V3]; xn--0ug.xn----pfa2305a; ; ;  # .ßⴉ-
+xn--0ug.xn----pfa042j; ‌.ßႩ-; [C1, V3, V6]; xn--0ug.xn----pfa042j; ; ;  # .ßႩ-
+��㓱。⾑; ��㓱.襾; [B5, P1, V6]; xn--u7kt691dlj09f.xn--9v2a; ; ;  # �㓱.襾
+��㓱。襾; ��㓱.襾; [B5, P1, V6]; xn--u7kt691dlj09f.xn--9v2a; ; ;  # �㓱.襾
+xn--u7kt691dlj09f.xn--9v2a; ��㓱.襾; [B5, V6]; xn--u7kt691dlj09f.xn--9v2a; ; ;  # �㓱.襾
+ڠ��≮。≯󠦗�; ڠ��≮.≯󠦗�; [B1, B3, C2, P1, V6]; xn--2jb053lf13nyoc.xn--1ugx6gc8096c; ; xn--2jb053lf13nyoc.xn--hdh08821l; [B1, B3, P1, V6] # ڠ��≮.≯
+ڠ��≮。≯󠦗�; ڠ��≮.≯󠦗�; [B1, B3, C2, P1, V6]; xn--2jb053lf13nyoc.xn--1ugx6gc8096c; ; xn--2jb053lf13nyoc.xn--hdh08821l; [B1, B3, P1, V6] # ڠ��≮.≯
+xn--2jb053lf13nyoc.xn--hdh08821l; ڠ��≮.≯󠦗; [B1, B3, V6]; xn--2jb053lf13nyoc.xn--hdh08821l; ; ;  # ڠ��≮.≯
+xn--2jb053lf13nyoc.xn--1ugx6gc8096c; ڠ��≮.≯󠦗�; [B1, B3, C2, V6]; xn--2jb053lf13nyoc.xn--1ugx6gc8096c; ; ;  # ڠ��≮.≯
+�｡񃰶ݷࢰ⩋; 6.񃰶ݷࢰ⩋; [B1, B5, B6, P1, V6]; 6.xn--7pb04do15eq748f; ; ;  # 6.ݷࢰ⩋
+6。񃰶ݷࢰ⩋; 6.񃰶ݷࢰ⩋; [B1, B5, B6, P1, V6]; 6.xn--7pb04do15eq748f; ; ;  # 6.ݷࢰ⩋
+6.xn--7pb04do15eq748f; 6.񃰶ݷࢰ⩋; [B1, B5, B6, V6]; 6.xn--7pb04do15eq748f; ; ;  # 6.ݷࢰ⩋
+-ﳽ。�𑇀; -شى.𑇀�; [B1, V3, V5]; xn----qnc7d.xn--wd1d62a; ; ;  # -شى.𑇀�
+-ﳽ。𑇀�; -شى.𑇀�; [B1, V3, V5]; xn----qnc7d.xn--wd1d62a; ; ;  # -شى.𑇀�
+-شى。𑇀�; -شى.𑇀�; [B1, V3, V5]; xn----qnc7d.xn--wd1d62a; ; ;  # -شى.𑇀�
+xn----qnc7d.xn--wd1d62a; -شى.𑇀�; [B1, V3, V5]; xn----qnc7d.xn--wd1d62a; ; ;  # -شى.𑇀�
+‌󠊶�.ൃ��󊓶; ‌󠊶1.ൃ��󊓶; [B1, C1, P1, V5, V6]; xn--1-rgnu0071n.xn--mxc0872kcu37dnmem; ; xn--1-f521m.xn--mxc0872kcu37dnmem; [B1, P1, V5, V6] # 1.ൃ�
+‌󠊶1.ൃ��󊓶; ; [B1, C1, P1, V5, V6]; xn--1-rgnu0071n.xn--mxc0872kcu37dnmem; ; xn--1-f521m.xn--mxc0872kcu37dnmem; [B1, P1, V5, V6] # 1.ൃ�
+xn--1-f521m.xn--mxc0872kcu37dnmem; 󠊶1.ൃ��󊓶; [B1, V5, V6]; xn--1-f521m.xn--mxc0872kcu37dnmem; ; ;  # 1.ൃ�
+xn--1-rgnu0071n.xn--mxc0872kcu37dnmem; ‌󠊶1.ൃ��󊓶; [B1, C1, V5, V6]; xn--1-rgnu0071n.xn--mxc0872kcu37dnmem; ; ;  # 1.ൃ�
+齙--�.ß; 齙--4.ß; ; xn----4-p16k.xn--zca; ; xn----4-p16k.ss;  # 齙--4.ß
+齙--4.ß; ; ; xn----4-p16k.xn--zca; ; xn----4-p16k.ss;  # 齙--4.ß
+é½™--4.SS; é½™--4.ss; ; xn----4-p16k.ss; ; ;  # é½™--4.ss
+é½™--4.ss; ; ; xn----4-p16k.ss; ; ;  # é½™--4.ss
+é½™--4.Ss; é½™--4.ss; ; xn----4-p16k.ss; ; ;  # é½™--4.ss
+xn----4-p16k.ss; é½™--4.ss; ; xn----4-p16k.ss; ; ;  # é½™--4.ss
+xn----4-p16k.xn--zca; 齙--4.ß; ; xn----4-p16k.xn--zca; ; ;  # 齙--4.ß
+齙--�.SS; 齙--4.ss; ; xn----4-p16k.ss; ; ;  # 齙--4.ss
+齙--�.ss; 齙--4.ss; ; xn----4-p16k.ss; ; ;  # 齙--4.ss
+齙--�.Ss; 齙--4.ss; ; xn----4-p16k.ss; ; ;  # 齙--4.ss
+᯲.�𞀖‌; ; [B1, C1, V5]; xn--0zf.xn--0ug9894grqqf; ; xn--0zf.xn--9n0d2296a; [B1, V5] # ᯲.�𞀖
+xn--0zf.xn--9n0d2296a; ᯲.�𞀖; [B1, V5]; xn--0zf.xn--9n0d2296a; ; ;  # ᯲.�𞀖
+xn--0zf.xn--0ug9894grqqf; ᯲.�𞀖‌; [B1, C1, V5]; xn--0zf.xn--0ug9894grqqf; ; ;  # ᯲.�𞀖
+󃲙󠋘｡?-�; 󃲙󠋘.?-�; [C2, P1, V6]; xn--ct86d8w51a.?-�; [C2, P1, V6, A3]; xn--ct86d8w51a.?-; [P1, V3, V6, A3] # .-
+󃲙󠋘。?-�; 󃲙󠋘.?-�; [C2, P1, V6]; xn--ct86d8w51a.?-�; [C2, P1, V6, A3]; xn--ct86d8w51a.?-; [P1, V3, V6, A3] # .-
+xn--ct86d8w51a.?-; 󃲙󠋘.?-; [P1, V3, V6]; xn--ct86d8w51a.?-; [P1, V3, V6, A3]; ;  # .-
+XN--CT86D8W51A.?-; 󃲙󠋘.?-; [P1, V3, V6]; xn--ct86d8w51a.?-; [P1, V3, V6, A3]; ;  # .-
+Xn--Ct86d8w51a.?-; 󃲙󠋘.?-; [P1, V3, V6]; xn--ct86d8w51a.?-; [P1, V3, V6, A3]; ;  # .-
+xn--ct86d8w51a.?-�; 󃲙󠋘.?-�; [C2, P1, V6]; xn--ct86d8w51a.?-�; [C2, P1, V6, A3]; xn--ct86d8w51a.?-; [P1, V3, V6, A3] # .-
+XN--CT86D8W51A.?-�; 󃲙󠋘.?-�; [C2, P1, V6]; xn--ct86d8w51a.?-�; [C2, P1, V6, A3]; xn--ct86d8w51a.?-; [P1, V3, V6, A3] # .-
+Xn--Ct86d8w51a.?-�; 󃲙󠋘.?-�; [C2, P1, V6]; xn--ct86d8w51a.?-�; [C2, P1, V6, A3]; xn--ct86d8w51a.?-; [P1, V3, V6, A3] # .-
+᩠．𞵷-�悎; ᩠.𞵷-�悎; [B1, B2, B3, B6, P1, V5, V6]; xn--jof.xn----gf4bq282iezpa; ; ;  # ᩠.-�悎
+᩠.𞵷-�悎; ; [B1, B2, B3, B6, P1, V5, V6]; xn--jof.xn----gf4bq282iezpa; ; ;  # ᩠.-�悎
+xn--jof.xn----gf4bq282iezpa; ᩠.𞵷-�悎; [B1, B2, B3, B6, V5, V6]; xn--jof.xn----gf4bq282iezpa; ; ;  # ᩠.-�悎
+𛜯󠊛．𞤳�; 𛜯󠊛.𞤳�; [B2, B3, B6, P1, V6]; xn--xx5gy2741c.xn--re6hw266j; ; ;  # .𞤳
+𛜯󠊛.𞤳�; ; [B2, B3, B6, P1, V6]; xn--xx5gy2741c.xn--re6hw266j; ; ;  # .𞤳
+𛜯󠊛.𞤑�; 𛜯󠊛.𞤳�; [B2, B3, B6, P1, V6]; xn--xx5gy2741c.xn--re6hw266j; ; ;  # .𞤳
+xn--xx5gy2741c.xn--re6hw266j; 𛜯󠊛.𞤳�; [B2, B3, B6, V6]; xn--xx5gy2741c.xn--re6hw266j; ; ;  # .𞤳
+𛜯󠊛．𞤑�; 𛜯󠊛.𞤳�; [B2, B3, B6, P1, V6]; xn--xx5gy2741c.xn--re6hw266j; ; ;  # .𞤳
+ܜ�خ.�; ; [B1]; xn--tgb98b8643d.xn--m97c; ; ;  # ܜ�خ.�
+xn--tgb98b8643d.xn--m97c; ܜ�خ.�; [B1]; xn--tgb98b8643d.xn--m97c; ; ;  # ܜ�خ.�
+�𞤓ط࣢.?; �𞤵ط࣢.?; [P1, V6]; xn--2gb08k9w69agm0g.?; [P1, V6, A3]; ;  # �𞤵ط.
+�𞤵ط࣢.?; ; [P1, V6]; xn--2gb08k9w69agm0g.?; [P1, V6, A3]; ;  # �𞤵ط.
+xn--2gb08k9w69agm0g.?; �𞤵ط࣢.?; [P1, V6]; xn--2gb08k9w69agm0g.?; [P1, V6, A3]; ;  # �𞤵ط.
+XN--2GB08K9W69AGM0G.?; �𞤵ط࣢.?; [P1, V6]; xn--2gb08k9w69agm0g.?; [P1, V6, A3]; ;  # �𞤵ط.
+Xn--2gb08k9w69agm0g.?; �𞤵ط࣢.?; [P1, V6]; xn--2gb08k9w69agm0g.?; [P1, V6, A3]; ;  # �𞤵ط.
+Ↄ。�᳔𞷣; Ↄ.᳔�𞷣; [B1, P1, V5, V6]; xn--q5g.xn--ybc995g0835a; ; ;  # Ↄ.᳔�
+Ↄ。᳔�𞷣; Ↄ.᳔�𞷣; [B1, P1, V5, V6]; xn--q5g.xn--ybc995g0835a; ; ;  # Ↄ.᳔�
+ↄ。᳔�𞷣; ↄ.᳔�𞷣; [B1, P1, V5, V6]; xn--r5g.xn--ybc995g0835a; ; ;  # ↄ.᳔�
+xn--r5g.xn--ybc995g0835a; ↄ.᳔�𞷣; [B1, V5, V6]; xn--r5g.xn--ybc995g0835a; ; ;  # ↄ.᳔�
+xn--q5g.xn--ybc995g0835a; Ↄ.᳔�𞷣; [B1, V5, V6]; xn--q5g.xn--ybc995g0835a; ; ;  # Ↄ.᳔�
+ↄ。�᳔𞷣; ↄ.᳔�𞷣; [B1, P1, V5, V6]; xn--r5g.xn--ybc995g0835a; ; ;  # ↄ.᳔�
+󠪢-。�≮𑜫; 󠪢-.�≮𑜫; [P1, V3, V6]; xn----bh61m.xn--gdhz157g0em1d; ; ;  # -.≮𑜫
+󠪢-。�≮𑜫; 󠪢-.�≮𑜫; [P1, V3, V6]; xn----bh61m.xn--gdhz157g0em1d; ; ;  # -.≮𑜫
+xn----bh61m.xn--gdhz157g0em1d; 󠪢-.�≮𑜫; [V3, V6]; xn----bh61m.xn--gdhz157g0em1d; ; ;  # -.≮𑜫
+‌󠉹�。򌿧≮Ⴉ; ‌󠉹�.򌿧≮Ⴉ; [C1, C2, P1, V6]; xn--0ugc90904y.xn--hnd112gpz83n; ; xn--3n36e.xn--hnd112gpz83n; [P1, V6] # .≮Ⴉ
+‌󠉹�。򌿧≮Ⴉ; ‌󠉹�.򌿧≮Ⴉ; [C1, C2, P1, V6]; xn--0ugc90904y.xn--hnd112gpz83n; ; xn--3n36e.xn--hnd112gpz83n; [P1, V6] # .≮Ⴉ
+‌󠉹�。򌿧≮ⴉ; ‌󠉹�.򌿧≮ⴉ; [C1, C2, P1, V6]; xn--0ugc90904y.xn--gdh992byu01p; ; xn--3n36e.xn--gdh992byu01p; [P1, V6] # .≮ⴉ
+‌󠉹�。򌿧≮ⴉ; ‌󠉹�.򌿧≮ⴉ; [C1, C2, P1, V6]; xn--0ugc90904y.xn--gdh992byu01p; ; xn--3n36e.xn--gdh992byu01p; [P1, V6] # .≮ⴉ
+xn--3n36e.xn--gdh992byu01p; 󠉹.򌿧≮ⴉ; [V6]; xn--3n36e.xn--gdh992byu01p; ; ;  # .≮ⴉ
+xn--0ugc90904y.xn--gdh992byu01p; ‌󠉹�.򌿧≮ⴉ; [C1, C2, V6]; xn--0ugc90904y.xn--gdh992byu01p; ; ;  # .≮ⴉ
+xn--3n36e.xn--hnd112gpz83n; 󠉹.򌿧≮Ⴉ; [V6]; xn--3n36e.xn--hnd112gpz83n; ; ;  # .≮Ⴉ
+xn--0ugc90904y.xn--hnd112gpz83n; ‌󠉹�.򌿧≮Ⴉ; [C1, C2, V6]; xn--0ugc90904y.xn--hnd112gpz83n; ; ;  # .≮Ⴉ
+�-𑄴ࢼ。︒�⾆; �-𑄴ࢼ.︒�舌; [B1, P1, V6]; xn----rpd7902rclc.xn--fpo216mn07e; ; ;  # �-𑄴ࢼ.︒�舌
+�-𑄴ࢼ。。�舌; �-𑄴ࢼ..�舌; [B1, X4_2]; xn----rpd7902rclc..xn--fpo216m; [B1, A4_2]; ;  # �-𑄴ࢼ..�舌
+xn----rpd7902rclc..xn--fpo216m; �-𑄴ࢼ..�舌; [B1, X4_2]; xn----rpd7902rclc..xn--fpo216m; [B1, A4_2]; ;  # �-𑄴ࢼ..�舌
+xn----rpd7902rclc.xn--fpo216mn07e; �-𑄴ࢼ.︒�舌; [B1, V6]; xn----rpd7902rclc.xn--fpo216mn07e; ; ;  # �-𑄴ࢼ.︒�舌
+�Ⴐ｡쪡; �Ⴐ.쪡; [P1, V5, V6]; xn--ond3755u.xn--pi6b; ; ;  # �Ⴐ.쪡
+�Ⴐ｡�ᅨᆨ; �Ⴐ.쪡; [P1, V5, V6]; xn--ond3755u.xn--pi6b; ; ;  # �Ⴐ.쪡
+�Ⴐ。쪡; �Ⴐ.쪡; [P1, V5, V6]; xn--ond3755u.xn--pi6b; ; ;  # �Ⴐ.쪡
+�Ⴐ。�ᅨᆨ; �Ⴐ.쪡; [P1, V5, V6]; xn--ond3755u.xn--pi6b; ; ;  # �Ⴐ.쪡
+��。�ᅨᆨ; ��.쪡; [V5]; xn--7kj1858k.xn--pi6b; ; ;  # ��.쪡
+��。쪡; ��.쪡; [V5]; xn--7kj1858k.xn--pi6b; ; ;  # ��.쪡
+xn--7kj1858k.xn--pi6b; ��.쪡; [V5]; xn--7kj1858k.xn--pi6b; ; ;  # ��.쪡
+xn--ond3755u.xn--pi6b; �Ⴐ.쪡; [V5, V6]; xn--ond3755u.xn--pi6b; ; ;  # �Ⴐ.쪡
+��｡�ᅨᆨ; ��.쪡; [V5]; xn--7kj1858k.xn--pi6b; ; ;  # ��.쪡
+��｡쪡; ��.쪡; [V5]; xn--7kj1858k.xn--pi6b; ; ;  # ��.쪡
+ฺ��.􋉳; ; [B1, P1, V5, V6]; xn--o4c4837g2zvb.xn--5f70g; ; ;  # ฺ��.
+ฺ�ᅤᆸ�.􋉳; ฺ��.􋉳; [B1, P1, V5, V6]; xn--o4c4837g2zvb.xn--5f70g; ; ;  # ฺ��.
+xn--o4c4837g2zvb.xn--5f70g; ฺ��.􋉳; [B1, V5, V6]; xn--o4c4837g2zvb.xn--5f70g; ; ;  # ฺ��.
+ᡅ�‌｡⎢󤨄; ᡅ0‌.⎢󤨄; [C1, P1, V6]; xn--0-z6jy93b.xn--8lh28773l; ; xn--0-z6j.xn--8lh28773l; [P1, V6] # ᡅ0.⎢
+ᡅ0‌。⎢󤨄; ᡅ0‌.⎢󤨄; [C1, P1, V6]; xn--0-z6jy93b.xn--8lh28773l; ; xn--0-z6j.xn--8lh28773l; [P1, V6] # ᡅ0.⎢
+xn--0-z6j.xn--8lh28773l; ᡅ0.⎢󤨄; [V6]; xn--0-z6j.xn--8lh28773l; ; ;  # ᡅ0.⎢
+xn--0-z6jy93b.xn--8lh28773l; ᡅ0‌.⎢󤨄; [C1, V6]; xn--0-z6jy93b.xn--8lh28773l; ; ;  # ᡅ0.⎢
+𲮚９�៓．�ß; 𲮚9�៓.�ß; [C2, P1, V6]; xn--9-i0j5967eg3qz.xn--zca770n; ; xn--9-i0j5967eg3qz.ss; [P1, V6] # 9�៓.ß
+𲮚9�៓.�ß; ; [C2, P1, V6]; xn--9-i0j5967eg3qz.xn--zca770n; ; xn--9-i0j5967eg3qz.ss; [P1, V6] # 9�៓.ß
+𲮚9�៓.�SS; 𲮚9�៓.�ss; [C2, P1, V6]; xn--9-i0j5967eg3qz.xn--ss-l1t; ; xn--9-i0j5967eg3qz.ss; [P1, V6] # 9�៓.ss
+𲮚9�៓.�ss; ; [C2, P1, V6]; xn--9-i0j5967eg3qz.xn--ss-l1t; ; xn--9-i0j5967eg3qz.ss; [P1, V6] # 9�៓.ss
+xn--9-i0j5967eg3qz.ss; 𲮚9�៓.ss; [V6]; xn--9-i0j5967eg3qz.ss; ; ;  # 9�៓.ss
+xn--9-i0j5967eg3qz.xn--ss-l1t; 𲮚9�៓.�ss; [C2, V6]; xn--9-i0j5967eg3qz.xn--ss-l1t; ; ;  # 9�៓.ss
+xn--9-i0j5967eg3qz.xn--zca770n; 𲮚9�៓.�ß; [C2, V6]; xn--9-i0j5967eg3qz.xn--zca770n; ; ;  # 9�៓.ß
+𲮚９�៓．�SS; 𲮚9�៓.�ss; [C2, P1, V6]; xn--9-i0j5967eg3qz.xn--ss-l1t; ; xn--9-i0j5967eg3qz.ss; [P1, V6] # 9�៓.ss
+𲮚９�៓．�ss; 𲮚9�៓.�ss; [C2, P1, V6]; xn--9-i0j5967eg3qz.xn--ss-l1t; ; xn--9-i0j5967eg3qz.ss; [P1, V6] # 9�៓.ss
+𲮚9�៓.�Ss; 𲮚9�៓.�ss; [C2, P1, V6]; xn--9-i0j5967eg3qz.xn--ss-l1t; ; xn--9-i0j5967eg3qz.ss; [P1, V6] # 9�៓.ss
+𲮚９�៓．�Ss; 𲮚9�៓.�ss; [C2, P1, V6]; xn--9-i0j5967eg3qz.xn--ss-l1t; ; xn--9-i0j5967eg3qz.ss; [P1, V6] # 9�៓.ss
+ꗷ𑆀.��; ; ; xn--ju8a625r.xn--hpb0073k; ; ;  # ꗷ𑆀.��
+xn--ju8a625r.xn--hpb0073k; ꗷ𑆀.��; ; xn--ju8a625r.xn--hpb0073k; ; ;  # ꗷ𑆀.��
+�≯-。︒򩑣-񞛠; �≯-.︒򩑣-񞛠; [P1, V3, V6]; xn----ogot9g.xn----n89hl0522az9u2a; ; ;  # �≯-.︒-
+�≯-。︒򩑣-񞛠; �≯-.︒򩑣-񞛠; [P1, V3, V6]; xn----ogot9g.xn----n89hl0522az9u2a; ; ;  # �≯-.︒-
+9.≯-。。򩑣-񞛠; 9.≯-..򩑣-񞛠; [P1, V3, V6, X4_2]; 9.xn----ogo..xn----xj54d1s69k; [P1, V3, V6, A4_2]; ;  # 9.≯-..-
+9.≯-。。򩑣-񞛠; 9.≯-..򩑣-񞛠; [P1, V3, V6, X4_2]; 9.xn----ogo..xn----xj54d1s69k; [P1, V3, V6, A4_2]; ;  # 9.≯-..-
+9.xn----ogo..xn----xj54d1s69k; 9.≯-..򩑣-񞛠; [V3, V6, X4_2]; 9.xn----ogo..xn----xj54d1s69k; [V3, V6, A4_2]; ;  # 9.≯-..-
+xn----ogot9g.xn----n89hl0522az9u2a; �≯-.︒򩑣-񞛠; [V3, V6]; xn----ogot9g.xn----n89hl0522az9u2a; ; ;  # �≯-.︒-
+򈪚ೣ��．�; 򈪚ೣ��.�; [B6, P1, V6]; xn--vuc49qvu85xmju7a.xn--cgb; ; ;  # ೣ�.
+򈪚ೣ��.�; ; [B6, P1, V6]; xn--vuc49qvu85xmju7a.xn--cgb; ; ;  # ೣ�.
+򈪚ೣⴡ�.�; ; [B6, P1, V6]; xn--vuc226n8n28lmju7a.xn--cgb; ; ;  # ೣⴡ.
+xn--vuc226n8n28lmju7a.xn--cgb; 򈪚ೣⴡ�.�; [B6, V6]; xn--vuc226n8n28lmju7a.xn--cgb; ; ;  # ೣⴡ.
+xn--vuc49qvu85xmju7a.xn--cgb; 򈪚ೣ��.�; [B6, V6]; xn--vuc49qvu85xmju7a.xn--cgb; ; ;  # ೣ�.
+򈪚ೣⴡ�．�; 򈪚ೣⴡ�.�; [B6, P1, V6]; xn--vuc226n8n28lmju7a.xn--cgb; ; ;  # ೣⴡ.
+ᷫ。�ظ-�; ᷫ.�ظ-�; [B1, B3, B6, V5]; xn--gfg.xn----xnc0815qyyg; ; ;  # ᷫ.�ظ-�
+xn--gfg.xn----xnc0815qyyg; ᷫ.�ظ-�; [B1, B3, B6, V5]; xn--gfg.xn----xnc0815qyyg; ; ;  # ᷫ.�ظ-�
+싇。⾇�Ⴝ; 싇.舛�Ⴝ; [B5, P1, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。⾇�Ⴝ; 싇.舛�Ⴝ; [B5, P1, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。舛�Ⴝ; 싇.舛�Ⴝ; [B5, P1, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。舛�Ⴝ; 싇.舛�Ⴝ; [B5, P1, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。舛��; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+싇。舛��; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+싇。舛�Ⴝ; 싇.舛�Ⴝ; [B5, P1, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。舛�Ⴝ; 싇.舛�Ⴝ; [B5, P1, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。舛��; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+싇。舛��; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+xn--9u4b.xn--llj123yh74e; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+xn--9u4b.xn--1nd7519ch79d; 싇.舛�Ⴝ; [B5, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。⾇��; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+싇。⾇��; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+싇。⾇�Ⴝ; 싇.舛�Ⴝ; [B5, P1, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。⾇�Ⴝ; 싇.舛�Ⴝ; [B5, P1, V6]; xn--9u4b.xn--1nd7519ch79d; ; ;  # 싇.舛�Ⴝ
+싇。⾇��; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+싇。⾇��; 싇.舛��; [B5]; xn--9u4b.xn--llj123yh74e; ; ;  # 싇.舛��
+�ς。‌ڿჀ; �ς.‌ڿჀ; [B1, C1, P1, V6]; xn--3xa1267k.xn--ykb632cvxm; ; xn--4xa9167k.xn--ykb632c; [B1, B2, B3, P1, V6] # �ς.ڿჀ
+�ς。‌ڿⴠ; �ς.‌ڿⴠ; [B1, C1]; xn--3xa1267k.xn--ykb760k9hj; ; xn--4xa9167k.xn--ykb467q; [B1, B2, B3] # �ς.ڿⴠ
+�Σ。‌ڿჀ; �σ.‌ڿჀ; [B1, C1, P1, V6]; xn--4xa9167k.xn--ykb632cvxm; ; xn--4xa9167k.xn--ykb632c; [B1, B2, B3, P1, V6] # �σ.ڿჀ
+�σ。‌ڿⴠ; �σ.‌ڿⴠ; [B1, C1]; xn--4xa9167k.xn--ykb760k9hj; ; xn--4xa9167k.xn--ykb467q; [B1, B2, B3] # �σ.ڿⴠ
+�Σ。‌ڿⴠ; �σ.‌ڿⴠ; [B1, C1]; xn--4xa9167k.xn--ykb760k9hj; ; xn--4xa9167k.xn--ykb467q; [B1, B2, B3] # �σ.ڿⴠ
+xn--4xa9167k.xn--ykb467q; �σ.ڿⴠ; [B1, B2, B3]; xn--4xa9167k.xn--ykb467q; ; ;  # �σ.ڿⴠ
+xn--4xa9167k.xn--ykb760k9hj; �σ.‌ڿⴠ; [B1, C1]; xn--4xa9167k.xn--ykb760k9hj; ; ;  # �σ.ڿⴠ
+xn--4xa9167k.xn--ykb632c; �σ.ڿჀ; [B1, B2, B3, V6]; xn--4xa9167k.xn--ykb632c; ; ;  # �σ.ڿჀ
+xn--4xa9167k.xn--ykb632cvxm; �σ.‌ڿჀ; [B1, C1, V6]; xn--4xa9167k.xn--ykb632cvxm; ; ;  # �σ.ڿჀ
+xn--3xa1267k.xn--ykb760k9hj; �ς.‌ڿⴠ; [B1, C1]; xn--3xa1267k.xn--ykb760k9hj; ; ;  # �ς.ڿⴠ
+xn--3xa1267k.xn--ykb632cvxm; �ς.‌ڿჀ; [B1, C1, V6]; xn--3xa1267k.xn--ykb632cvxm; ; ;  # �ς.ڿჀ
+�‌؄.ښ-ß; ; [B2, B3, B5, B6, C1, P1, V6]; xn--mfb144kqo32m.xn----qfa315b; ; xn--mfb98261i.xn---ss-sdf; [B2, B3, B5, B6, P1, V6] # .ښ-ß
+�‌؄.ښ-SS; �‌؄.ښ-ss; [B2, B3, B5, B6, C1, P1, V6]; xn--mfb144kqo32m.xn---ss-sdf; ; xn--mfb98261i.xn---ss-sdf; [B2, B3, B5, B6, P1, V6] # .ښ-ss
+�‌؄.ښ-ss; ; [B2, B3, B5, B6, C1, P1, V6]; xn--mfb144kqo32m.xn---ss-sdf; ; xn--mfb98261i.xn---ss-sdf; [B2, B3, B5, B6, P1, V6] # .ښ-ss
+�‌؄.ښ-Ss; �‌؄.ښ-ss; [B2, B3, B5, B6, C1, P1, V6]; xn--mfb144kqo32m.xn---ss-sdf; ; xn--mfb98261i.xn---ss-sdf; [B2, B3, B5, B6, P1, V6] # .ښ-ss
+xn--mfb98261i.xn---ss-sdf; �؄.ښ-ss; [B2, B3, B5, B6, V6]; xn--mfb98261i.xn---ss-sdf; ; ;  # .ښ-ss
+xn--mfb144kqo32m.xn---ss-sdf; �‌؄.ښ-ss; [B2, B3, B5, B6, C1, V6]; xn--mfb144kqo32m.xn---ss-sdf; ; ;  # .ښ-ss
+xn--mfb144kqo32m.xn----qfa315b; �‌؄.ښ-ß; [B2, B3, B5, B6, C1, V6]; xn--mfb144kqo32m.xn----qfa315b; ; ;  # .ښ-ß
+‌�឵ٺ.-ﮰ󅄞�; ‌�឵ٺ.-ۓ󅄞�; [B1, C1, C2, P1, V3, V6]; xn--zib539f8igea.xn----twc1133r17r6g; ; xn--zib539f.xn----twc1133r17r6g; [B1, P1, V3, V5, V6] # ٺ.-ۓ
+‌�឵ٺ.-ۓ󅄞�; ; [B1, C1, C2, P1, V3, V6]; xn--zib539f8igea.xn----twc1133r17r6g; ; xn--zib539f.xn----twc1133r17r6g; [B1, P1, V3, V5, V6] # ٺ.-ۓ
+‌�឵ٺ.-ۓ󅄞�; ‌�឵ٺ.-ۓ󅄞�; [B1, C1, C2, P1, V3, V6]; xn--zib539f8igea.xn----twc1133r17r6g; ; xn--zib539f.xn----twc1133r17r6g; [B1, P1, V3, V5, V6] # ٺ.-ۓ
+xn--zib539f.xn----twc1133r17r6g; ឵ٺ.-ۓ󅄞�; [B1, V3, V5, V6]; xn--zib539f.xn----twc1133r17r6g; ; ;  # ٺ.-ۓ
+xn--zib539f8igea.xn----twc1133r17r6g; ‌�឵ٺ.-ۓ󅄞�; [B1, C1, C2, V3, V6]; xn--zib539f8igea.xn----twc1133r17r6g; ; ;  # ٺ.-ۓ
+򡶱｡�≠; 򡶱.�≠; [B3, P1, V6]; xn--dd55c.xn--1ch3003g; ; ;  # .�≠
+򡶱｡�≠; 򡶱.�≠; [B3, P1, V6]; xn--dd55c.xn--1ch3003g; ; ;  # .�≠
+򡶱。�≠; 򡶱.�≠; [B3, P1, V6]; xn--dd55c.xn--1ch3003g; ; ;  # .�≠
+򡶱。�≠; 򡶱.�≠; [B3, P1, V6]; xn--dd55c.xn--1ch3003g; ; ;  # .�≠
+xn--dd55c.xn--1ch3003g; 򡶱.�≠; [B3, V6]; xn--dd55c.xn--1ch3003g; ; ;  # .�≠
+ྲ𞶅｡���۵; ྲ𞶅.���۵; [B1, P1, V5, V6]; xn--fgd0675v.xn--imb5839fidpcbba; ; ;  # ྲ.���۵
+ྲ𞶅｡��덝۵; ྲ𞶅.���۵; [B1, P1, V5, V6]; xn--fgd0675v.xn--imb5839fidpcbba; ; ;  # ྲ.���۵
+ྲ𞶅。���۵; ྲ𞶅.���۵; [B1, P1, V5, V6]; xn--fgd0675v.xn--imb5839fidpcbba; ; ;  # ྲ.���۵
+ྲ𞶅。��덝۵; ྲ𞶅.���۵; [B1, P1, V5, V6]; xn--fgd0675v.xn--imb5839fidpcbba; ; ;  # ྲ.���۵
+xn--fgd0675v.xn--imb5839fidpcbba; ྲ𞶅.���۵; [B1, V5, V6]; xn--fgd0675v.xn--imb5839fidpcbba; ; ;  # ྲ.���۵
+Ⴏ󠅋-．�Ⴉ; Ⴏ-.�Ⴉ; [C2, P1, V3, V6]; xn----00g.xn--hnd399e; ; xn----00g.xn--hnd; [P1, V3, V6] # Ⴏ-.Ⴉ
+Ⴏ󠅋-.�Ⴉ; Ⴏ-.�Ⴉ; [C2, P1, V3, V6]; xn----00g.xn--hnd399e; ; xn----00g.xn--hnd; [P1, V3, V6] # Ⴏ-.Ⴉ
+�󠅋-.�ⴉ; �-.�ⴉ; [C2, V3]; xn----3vs.xn--1ug532c; ; xn----3vs.xn--0kj; [V3] # �-.ⴉ
+xn----3vs.xn--0kj; â´�-.â´‰; [V3]; xn----3vs.xn--0kj; ; ;  # â´�-.â´‰
+xn----3vs.xn--1ug532c; �-.�ⴉ; [C2, V3]; xn----3vs.xn--1ug532c; ; ;  # �-.ⴉ
+xn----00g.xn--hnd; Ⴏ-.Ⴉ; [V3, V6]; xn----00g.xn--hnd; ; ;  # Ⴏ-.Ⴉ
+xn----00g.xn--hnd399e; Ⴏ-.�Ⴉ; [C2, V3, V6]; xn----00g.xn--hnd399e; ; ;  # Ⴏ-.Ⴉ
+�󠅋-．�ⴉ; �-.�ⴉ; [C2, V3]; xn----3vs.xn--1ug532c; ; xn----3vs.xn--0kj; [V3] # �-.ⴉ
+⇧�󠾈󯶅。؀󠈵󠆉; ⇧�󠾈󯶅.؀󠈵; [B1, P1, V6]; xn--l8g5552g64t4g46xf.xn--ifb08144p; ; ;  # ⇧�.
+xn--l8g5552g64t4g46xf.xn--ifb08144p; ⇧�󠾈󯶅.؀󠈵; [B1, V6]; xn--l8g5552g64t4g46xf.xn--ifb08144p; ; ;  # ⇧�.
+≠�.↑🄇⒈; ; [B1, P1, V6]; xn--1chy492g.xn--45gx9iuy44d; ; ;  # ≠�.↑🄇⒈
+≠�.↑🄇⒈; ≠�.↑🄇⒈; [B1, P1, V6]; xn--1chy492g.xn--45gx9iuy44d; ; ;  # ≠�.↑🄇⒈
+≠�.↑6,1.; ; [B1, P1, V6]; xn--1chy492g.xn--6,1-pw1a.; ; ;  # ≠�.↑6,1.
+≠�.↑6,1.; ≠�.↑6,1.; [B1, P1, V6]; xn--1chy492g.xn--6,1-pw1a.; ; ;  # ≠�.↑6,1.
+xn--1chy492g.xn--6,1-pw1a.; ≠�.↑6,1.; [B1, P1, V6]; xn--1chy492g.xn--6,1-pw1a.; ; ;  # ≠�.↑6,1.
+xn--1chy492g.xn--45gx9iuy44d; ≠�.↑🄇⒈; [B1, V6]; xn--1chy492g.xn--45gx9iuy44d; ; ;  # ≠�.↑🄇⒈
+�󠲉ß.ᢤ򄦌‌�; ; [B1, B5, B6, C1, P1, V5, V6]; xn--zca3153vupz3e.xn--ubf609atw1tynn3d; ; xn--ss-zb11ap1427e.xn--ubf2596jbt61c; [B1, B5, B6, P1, V5, V6] # �ß.ᢤ�
+�󠲉SS.ᢤ򄦌‌�; �󠲉ss.ᢤ򄦌‌�; [B1, B5, B6, C1, P1, V5, V6]; xn--ss-zb11ap1427e.xn--ubf609atw1tynn3d; ; xn--ss-zb11ap1427e.xn--ubf2596jbt61c; [B1, B5, B6, P1, V5, V6] # �ss.ᢤ�
+�󠲉ss.ᢤ򄦌‌�; ; [B1, B5, B6, C1, P1, V5, V6]; xn--ss-zb11ap1427e.xn--ubf609atw1tynn3d; ; xn--ss-zb11ap1427e.xn--ubf2596jbt61c; [B1, B5, B6, P1, V5, V6] # �ss.ᢤ�
+�󠲉Ss.ᢤ򄦌‌�; �󠲉ss.ᢤ򄦌‌�; [B1, B5, B6, C1, P1, V5, V6]; xn--ss-zb11ap1427e.xn--ubf609atw1tynn3d; ; xn--ss-zb11ap1427e.xn--ubf2596jbt61c; [B1, B5, B6, P1, V5, V6] # �ss.ᢤ�
+xn--ss-zb11ap1427e.xn--ubf2596jbt61c; �󠲉ss.ᢤ򄦌�; [B1, B5, B6, V5, V6]; xn--ss-zb11ap1427e.xn--ubf2596jbt61c; ; ;  # �ss.ᢤ�
+xn--ss-zb11ap1427e.xn--ubf609atw1tynn3d; �󠲉ss.ᢤ򄦌‌�; [B1, B5, B6, C1, V5, V6]; xn--ss-zb11ap1427e.xn--ubf609atw1tynn3d; ; ;  # �ss.ᢤ�
+xn--zca3153vupz3e.xn--ubf609atw1tynn3d; �󠲉ß.ᢤ򄦌‌�; [B1, B5, B6, C1, V5, V6]; xn--zca3153vupz3e.xn--ubf609atw1tynn3d; ; ;  # �ß.ᢤ�
+ß��Ⴇ｡ꙺ; ß��Ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--zca491fci5qkn79a.xn--9x8a; ; xn--ss-rek7420r4hs7b.xn--9x8a;  # ßႧ.ꙺ
+ß��Ⴇ。ꙺ; ß��Ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--zca491fci5qkn79a.xn--9x8a; ; xn--ss-rek7420r4hs7b.xn--9x8a;  # ßႧ.ꙺ
+ß��ⴇ。ꙺ; ß��ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--zca227tpy4lkns1b.xn--9x8a; ; xn--ss-e61ar955h4hs7b.xn--9x8a;  # ßⴇ.ꙺ
+SS��Ⴇ。ꙺ; ss��Ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--ss-rek7420r4hs7b.xn--9x8a; ; ;  # ssႧ.ꙺ
+ss��ⴇ。ꙺ; ss��ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--ss-e61ar955h4hs7b.xn--9x8a; ; ;  # ssⴇ.ꙺ
+Ss��Ⴇ。ꙺ; ss��Ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--ss-rek7420r4hs7b.xn--9x8a; ; ;  # ssႧ.ꙺ
+xn--ss-rek7420r4hs7b.xn--9x8a; ss��Ⴇ.ꙺ; [B1, B3, B5, B6, V5, V6]; xn--ss-rek7420r4hs7b.xn--9x8a; ; ;  # ssႧ.ꙺ
+xn--ss-e61ar955h4hs7b.xn--9x8a; ss��ⴇ.ꙺ; [B1, B3, B5, B6, V5, V6]; xn--ss-e61ar955h4hs7b.xn--9x8a; ; ;  # ssⴇ.ꙺ
+xn--zca227tpy4lkns1b.xn--9x8a; ß��ⴇ.ꙺ; [B1, B3, B5, B6, V5, V6]; xn--zca227tpy4lkns1b.xn--9x8a; ; ;  # ßⴇ.ꙺ
+xn--zca491fci5qkn79a.xn--9x8a; ß��Ⴇ.ꙺ; [B1, B3, B5, B6, V5, V6]; xn--zca491fci5qkn79a.xn--9x8a; ; ;  # ßႧ.ꙺ
+ß��ⴇ｡ꙺ; ß��ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--zca227tpy4lkns1b.xn--9x8a; ; xn--ss-e61ar955h4hs7b.xn--9x8a;  # ßⴇ.ꙺ
+SS��Ⴇ｡ꙺ; ss��Ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--ss-rek7420r4hs7b.xn--9x8a; ; ;  # ssႧ.ꙺ
+ss��ⴇ｡ꙺ; ss��ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--ss-e61ar955h4hs7b.xn--9x8a; ; ;  # ssⴇ.ꙺ
+Ss��Ⴇ｡ꙺ; ss��Ⴇ.ꙺ; [B1, B3, B5, B6, P1, V5, V6]; xn--ss-rek7420r4hs7b.xn--9x8a; ; ;  # ssႧ.ꙺ
+᜔。󠆣-𑋪; ᜔.-𑋪; [V3, V5]; xn--fze.xn----ly8i; ; ;  # ᜔.-𑋪
+xn--fze.xn----ly8i; ᜔.-𑋪; [V3, V5]; xn--fze.xn----ly8i; ; ;  # ᜔.-𑋪
+ꯨ-．�ֽß; ꯨ-.�ֽß; [P1, V3, V5, V6]; xn----pw5e.xn--zca50wfv060a; ; xn----pw5e.xn--ss-7jd10716y;  # ꯨ-.ֽß
+ꯨ-.�ֽß; ; [P1, V3, V5, V6]; xn----pw5e.xn--zca50wfv060a; ; xn----pw5e.xn--ss-7jd10716y;  # ꯨ-.ֽß
+ꯨ-.�ֽSS; ꯨ-.�ֽss; [P1, V3, V5, V6]; xn----pw5e.xn--ss-7jd10716y; ; ;  # ꯨ-.ֽss
+ꯨ-.�ֽss; ; [P1, V3, V5, V6]; xn----pw5e.xn--ss-7jd10716y; ; ;  # ꯨ-.ֽss
+ꯨ-.�ֽSs; ꯨ-.�ֽss; [P1, V3, V5, V6]; xn----pw5e.xn--ss-7jd10716y; ; ;  # ꯨ-.ֽss
+xn----pw5e.xn--ss-7jd10716y; ꯨ-.�ֽss; [V3, V5, V6]; xn----pw5e.xn--ss-7jd10716y; ; ;  # ꯨ-.ֽss
+xn----pw5e.xn--zca50wfv060a; ꯨ-.�ֽß; [V3, V5, V6]; xn----pw5e.xn--zca50wfv060a; ; ;  # ꯨ-.ֽß
+ꯨ-．�ֽSS; ꯨ-.�ֽss; [P1, V3, V5, V6]; xn----pw5e.xn--ss-7jd10716y; ; ;  # ꯨ-.ֽss
+ꯨ-．�ֽss; ꯨ-.�ֽss; [P1, V3, V5, V6]; xn----pw5e.xn--ss-7jd10716y; ; ;  # ꯨ-.ֽss
+ꯨ-．�ֽSs; ꯨ-.�ֽss; [P1, V3, V5, V6]; xn----pw5e.xn--ss-7jd10716y; ; ;  # ꯨ-.ֽss
+ᡓ-≮。٫󠅱ᡄ; ᡓ-≮.٫ᡄ; [B1, B6, P1, V6]; xn----s7j866c.xn--kib252g; ; ;  # ᡓ-≮.٫ᡄ
+ᡓ-≮。٫󠅱ᡄ; ᡓ-≮.٫ᡄ; [B1, B6, P1, V6]; xn----s7j866c.xn--kib252g; ; ;  # ᡓ-≮.٫ᡄ
+xn----s7j866c.xn--kib252g; ᡓ-≮.٫ᡄ; [B1, B6, V6]; xn----s7j866c.xn--kib252g; ; ;  # ᡓ-≮.٫ᡄ
+�♮𑜫࣭．្𑜫8�; 3♮𑜫࣭.្𑜫8; [V5]; xn--3-ksd277tlo7s.xn--8-f0jx021l; ; ;  # 3♮𑜫࣭.្𑜫8
+3♮𑜫࣭.្𑜫8�; 3♮𑜫࣭.្𑜫8; [V5]; xn--3-ksd277tlo7s.xn--8-f0jx021l; ; ;  # 3♮𑜫࣭.្𑜫8
+xn--3-ksd277tlo7s.xn--8-f0jx021l; 3♮𑜫࣭.្𑜫8; [V5]; xn--3-ksd277tlo7s.xn--8-f0jx021l; ; ;  # 3♮𑜫࣭.្𑜫8
+-｡򕌀��; -.򕌀��; [C2, P1, V3, V6]; -.xn--1ug800aq795s; ; -.xn--nei54421f; [P1, V3, V6] # -.�
+-。򕌀��; -.򕌀��; [C2, P1, V3, V6]; -.xn--1ug800aq795s; ; -.xn--nei54421f; [P1, V3, V6] # -.�
+-.xn--nei54421f; -.򕌀�; [V3, V6]; -.xn--nei54421f; ; ;  # -.�
+-.xn--1ug800aq795s; -.򕌀��; [C2, V3, V6]; -.xn--1ug800aq795s; ; ;  # -.�
+�☱�򥰵｡��; 5☱2򥰵.��; [P1, V5, V6]; xn--52-dwx47758j.xn--kd3hk431k; ; ;  # 5☱2.�
+5☱2򥰵。��; 5☱2򥰵.��; [P1, V5, V6]; xn--52-dwx47758j.xn--kd3hk431k; ; ;  # 5☱2.�
+xn--52-dwx47758j.xn--kd3hk431k; 5☱2򥰵.��; [V5, V6]; xn--52-dwx47758j.xn--kd3hk431k; ; ;  # 5☱2.�
+-.-├򖦣; ; [P1, V3, V6]; -.xn----ukp70432h; ; ;  # -.-├
+-.xn----ukp70432h; -.-├򖦣; [V3, V6]; -.xn----ukp70432h; ; ;  # -.-├
+֥ݭ｡�󠀘; ֥ݭ.�󠀘; [B1, C2, P1, V5, V6]; xn--wcb62g.xn--1ugy8001l; ; xn--wcb62g.xn--p526e; [B1, P1, V5, V6] # ֥ݭ.
+֥ݭ。�󠀘; ֥ݭ.�󠀘; [B1, C2, P1, V5, V6]; xn--wcb62g.xn--1ugy8001l; ; xn--wcb62g.xn--p526e; [B1, P1, V5, V6] # ֥ݭ.
+xn--wcb62g.xn--p526e; ֥ݭ.󠀘; [B1, V5, V6]; xn--wcb62g.xn--p526e; ; ;  # ֥ݭ.
+xn--wcb62g.xn--1ugy8001l; ֥ݭ.�󠀘; [B1, C2, V5, V6]; xn--wcb62g.xn--1ugy8001l; ; ;  # ֥ݭ.
+쥥�Ⴎ．‌⒈⒈�; 쥥�Ⴎ.‌⒈⒈�; [B1, C1, P1, V6]; xn--mnd7865gcy28g.xn--0ug88oa0396u; ; xn--mnd7865gcy28g.xn--tsha6797o; [B1, P1, V6] # 쥥Ⴎ.⒈⒈�
+쥥�Ⴎ．‌⒈⒈�; 쥥�Ⴎ.‌⒈⒈�; [B1, C1, P1, V6]; xn--mnd7865gcy28g.xn--0ug88oa0396u; ; xn--mnd7865gcy28g.xn--tsha6797o; [B1, P1, V6] # 쥥Ⴎ.⒈⒈�
+쥥�Ⴎ.‌1.1.�; ; [B1, C1, P1, V6]; xn--mnd7865gcy28g.xn--1-rgn.1.xn--7w9c; ; xn--mnd7865gcy28g.1.1.xn--7w9c; [B1, P1, V6] # 쥥Ⴎ.1.1.�
+쥥�Ⴎ.‌1.1.�; 쥥�Ⴎ.‌1.1.�; [B1, C1, P1, V6]; xn--mnd7865gcy28g.xn--1-rgn.1.xn--7w9c; ; xn--mnd7865gcy28g.1.1.xn--7w9c; [B1, P1, V6] # 쥥Ⴎ.1.1.�
+쥥�ⴎ.‌1.1.�; 쥥�ⴎ.‌1.1.�; [B1, C1, P1, V6]; xn--5kj3511ccyw3h.xn--1-rgn.1.xn--7w9c; ; xn--5kj3511ccyw3h.1.1.xn--7w9c; [B1, P1, V6] # 쥥ⴎ.1.1.�
+쥥�ⴎ.‌1.1.�; ; [B1, C1, P1, V6]; xn--5kj3511ccyw3h.xn--1-rgn.1.xn--7w9c; ; xn--5kj3511ccyw3h.1.1.xn--7w9c; [B1, P1, V6] # 쥥ⴎ.1.1.�
+xn--5kj3511ccyw3h.1.1.xn--7w9c; 쥥�ⴎ.1.1.�; [B1, V6]; xn--5kj3511ccyw3h.1.1.xn--7w9c; ; ;  # 쥥ⴎ.1.1.�
+xn--5kj3511ccyw3h.xn--1-rgn.1.xn--7w9c; 쥥�ⴎ.‌1.1.�; [B1, C1, V6]; xn--5kj3511ccyw3h.xn--1-rgn.1.xn--7w9c; ; ;  # 쥥ⴎ.1.1.�
+xn--mnd7865gcy28g.1.1.xn--7w9c; 쥥�Ⴎ.1.1.�; [B1, V6]; xn--mnd7865gcy28g.1.1.xn--7w9c; ; ;  # 쥥Ⴎ.1.1.�
+xn--mnd7865gcy28g.xn--1-rgn.1.xn--7w9c; 쥥�Ⴎ.‌1.1.�; [B1, C1, V6]; xn--mnd7865gcy28g.xn--1-rgn.1.xn--7w9c; ; ;  # 쥥Ⴎ.1.1.�
+쥥�ⴎ．‌⒈⒈�; 쥥�ⴎ.‌⒈⒈�; [B1, C1, P1, V6]; xn--5kj3511ccyw3h.xn--0ug88oa0396u; ; xn--5kj3511ccyw3h.xn--tsha6797o; [B1, P1, V6] # 쥥ⴎ.⒈⒈�
+쥥�ⴎ．‌⒈⒈�; 쥥�ⴎ.‌⒈⒈�; [B1, C1, P1, V6]; xn--5kj3511ccyw3h.xn--0ug88oa0396u; ; xn--5kj3511ccyw3h.xn--tsha6797o; [B1, P1, V6] # 쥥ⴎ.⒈⒈�
+xn--5kj3511ccyw3h.xn--tsha6797o; 쥥�ⴎ.⒈⒈�; [B1, V6]; xn--5kj3511ccyw3h.xn--tsha6797o; ; ;  # 쥥ⴎ.⒈⒈�
+xn--5kj3511ccyw3h.xn--0ug88oa0396u; 쥥�ⴎ.‌⒈⒈�; [B1, C1, V6]; xn--5kj3511ccyw3h.xn--0ug88oa0396u; ; ;  # 쥥ⴎ.⒈⒈�
+xn--mnd7865gcy28g.xn--tsha6797o; 쥥�Ⴎ.⒈⒈�; [B1, V6]; xn--mnd7865gcy28g.xn--tsha6797o; ; ;  # 쥥Ⴎ.⒈⒈�
+xn--mnd7865gcy28g.xn--0ug88oa0396u; 쥥�Ⴎ.‌⒈⒈�; [B1, C1, V6]; xn--mnd7865gcy28g.xn--0ug88oa0396u; ; ;  # 쥥Ⴎ.⒈⒈�
+ࠧ�ڠ-。𑄳; ࠧ0ڠ-.𑄳; [B1, B3, B6, V3, V5]; xn--0--p3d67m.xn--v80d; ; ;  # ࠧ0ڠ-.𑄳
+ࠧ0ڠ-。𑄳; ࠧ0ڠ-.𑄳; [B1, B3, B6, V3, V5]; xn--0--p3d67m.xn--v80d; ; ;  # ࠧ0ڠ-.𑄳
+xn--0--p3d67m.xn--v80d; à §0Ú -.ð‘„³; [B1, B3, B6, V3, V5]; xn--0--p3d67m.xn--v80d; ; ;  # à §0Ú -.ð‘„³
+ς．�🞛⒈; ς.�مي🞛⒈; [P1, V6]; xn--3xa.xn--dhbip2802atb20c; ; xn--4xa.xn--dhbip2802atb20c;  # ς.�مي🞛⒈
+ς.�مي🞛1.; ; ; xn--3xa.xn--1-gocmu97674d.; ; xn--4xa.xn--1-gocmu97674d.;  # ς.�مي🞛1.
+Σ.�مي🞛1.; σ.�مي🞛1.; ; xn--4xa.xn--1-gocmu97674d.; ; ;  # σ.�مي🞛1.
+σ.�مي🞛1.; ; ; xn--4xa.xn--1-gocmu97674d.; ; ;  # σ.�مي🞛1.
+xn--4xa.xn--1-gocmu97674d.; σ.�مي🞛1.; ; xn--4xa.xn--1-gocmu97674d.; ; ;  # σ.�مي🞛1.
+xn--3xa.xn--1-gocmu97674d.; ς.�مي🞛1.; ; xn--3xa.xn--1-gocmu97674d.; ; ;  # ς.�مي🞛1.
+Σ．�🞛⒈; σ.�مي🞛⒈; [P1, V6]; xn--4xa.xn--dhbip2802atb20c; ; ;  # σ.�مي🞛⒈
+σ．�🞛⒈; σ.�مي🞛⒈; [P1, V6]; xn--4xa.xn--dhbip2802atb20c; ; ;  # σ.�مي🞛⒈
+xn--4xa.xn--dhbip2802atb20c; σ.�مي🞛⒈; [V6]; xn--4xa.xn--dhbip2802atb20c; ; ;  # σ.�مي🞛⒈
+xn--3xa.xn--dhbip2802atb20c; ς.�مي🞛⒈; [V6]; xn--3xa.xn--dhbip2802atb20c; ; ;  # ς.�مي🞛⒈
+🗩-｡��񥉮; 🗩-.��񥉮; [B1, P1, V3, V6]; xn----6t3s.xn--zo0d4811u6ru6a; ; ;  # 🗩-.�
+🗩-。��񥉮; 🗩-.��񥉮; [B1, P1, V3, V6]; xn----6t3s.xn--zo0d4811u6ru6a; ; ;  # 🗩-.�
+xn----6t3s.xn--zo0d4811u6ru6a; 🗩-.��񥉮; [B1, V3, V6]; xn----6t3s.xn--zo0d4811u6ru6a; ; ;  # 🗩-.�
+�-🔪｡�‌�; �-🔪.5‌�; [B1, B3, C1, P1, V6]; xn----5j4iv089c.xn--5-sgn7149h; ; xn----5j4iv089c.xn--5-bn7i; [B1, B3, P1, V6] # �-🔪.5�
+�-🔪。5‌�; �-🔪.5‌�; [B1, B3, C1, P1, V6]; xn----5j4iv089c.xn--5-sgn7149h; ; xn----5j4iv089c.xn--5-bn7i; [B1, B3, P1, V6] # �-🔪.5�
+xn----5j4iv089c.xn--5-bn7i; �-🔪.5�; [B1, B3, V6]; xn----5j4iv089c.xn--5-bn7i; ; ;  # �-🔪.5�
+xn----5j4iv089c.xn--5-sgn7149h; �-🔪.5‌�; [B1, B3, C1, V6]; xn----5j4iv089c.xn--5-sgn7149h; ; ;  # �-🔪.5�
+�늿�ß．�0ּ; �늿�ß.�0ּ; [B1, C2]; xn--zca770n5s4hev6c.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ß.�0ּ
+�늿�ß．�0ּ; �늿�ß.�0ּ; [B1, C2]; xn--zca770n5s4hev6c.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ß.�0ּ
+�늿�ß.�0ּ; ; [B1, C2]; xn--zca770n5s4hev6c.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ß.�0ּ
+�늿�ß.�0ּ; �늿�ß.�0ּ; [B1, C2]; xn--zca770n5s4hev6c.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ß.�0ּ
+�늿�SS.�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�SS.�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�ss.�0ּ; ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�ss.�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+xn--ss-i05i7041a.xn--0-vgc50n; �늿ss.�0ּ; [B1]; xn--ss-i05i7041a.xn--0-vgc50n; ; ;  # �늿ss.�0ּ
+xn--ss-l1tu910fo0xd.xn--0-vgc50n; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; ;  # �늿ss.�0ּ
+�늿�Ss.�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�Ss.�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+xn--zca770n5s4hev6c.xn--0-vgc50n; �늿�ß.�0ּ; [B1, C2]; xn--zca770n5s4hev6c.xn--0-vgc50n; ; ;  # �늿ß.�0ּ
+�늿�SS．�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�SS．�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�ss．�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�ss．�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�Ss．�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+�늿�Ss．�0ּ; �늿�ss.�0ּ; [B1, C2]; xn--ss-l1tu910fo0xd.xn--0-vgc50n; ; xn--ss-i05i7041a.xn--0-vgc50n; [B1] # �늿ss.�0ּ
+9󠇥．󪴴ᢓ; 9.󪴴ᢓ; [P1, V6]; 9.xn--dbf91222q; ; ;  # 9.ᢓ
+9󠇥.󪴴ᢓ; 9.󪴴ᢓ; [P1, V6]; 9.xn--dbf91222q; ; ;  # 9.ᢓ
+9.xn--dbf91222q; 9.󪴴ᢓ; [V6]; 9.xn--dbf91222q; ; ;  # 9.ᢓ
+‌ﾠ.�🠗ß⽟; ‌ﾠ.�🠗ß玉; [B1, B2, B3, C1, P1, V6]; xn--0ug7719f.xn--zca2289c550e0iwi; ; xn--cl7c.xn--ss-je6eq954cp25j; [B2, B3, P1, V6] # .�🠗ß玉
+‌ᅠ.�🠗ß玉; ; [B1, B2, B3, C1, P1, V6]; xn--psd526e.xn--zca2289c550e0iwi; ; xn--psd.xn--ss-je6eq954cp25j; [B2, B3, P1, V6] # .�🠗ß玉
+‌ᅠ.�🠗SS玉; ‌ᅠ.�🠗ss玉; [B1, B2, B3, C1, P1, V6]; xn--psd526e.xn--ss-je6eq954cp25j; ; xn--psd.xn--ss-je6eq954cp25j; [B2, B3, P1, V6] # .�🠗ss玉
+‌ᅠ.�🠗ss玉; ; [B1, B2, B3, C1, P1, V6]; xn--psd526e.xn--ss-je6eq954cp25j; ; xn--psd.xn--ss-je6eq954cp25j; [B2, B3, P1, V6] # .�🠗ss玉
+‌ᅠ.�🠗Ss玉; ‌ᅠ.�🠗ss玉; [B1, B2, B3, C1, P1, V6]; xn--psd526e.xn--ss-je6eq954cp25j; ; xn--psd.xn--ss-je6eq954cp25j; [B2, B3, P1, V6] # .�🠗ss玉
+xn--psd.xn--ss-je6eq954cp25j; ᅠ.�🠗ss玉; [B2, B3, V6]; xn--psd.xn--ss-je6eq954cp25j; ; ;  # .�🠗ss玉
+xn--psd526e.xn--ss-je6eq954cp25j; ‌ᅠ.�🠗ss玉; [B1, B2, B3, C1, V6]; xn--psd526e.xn--ss-je6eq954cp25j; ; ;  # .�🠗ss玉
+xn--psd526e.xn--zca2289c550e0iwi; ‌ᅠ.�🠗ß玉; [B1, B2, B3, C1, V6]; xn--psd526e.xn--zca2289c550e0iwi; ; ;  # .�🠗ß玉
+‌ﾠ.�🠗SS⽟; ‌ﾠ.�🠗ss玉; [B1, B2, B3, C1, P1, V6]; xn--0ug7719f.xn--ss-je6eq954cp25j; ; xn--cl7c.xn--ss-je6eq954cp25j; [B2, B3, P1, V6] # .�🠗ss玉
+‌ﾠ.�🠗ss⽟; ‌ﾠ.�🠗ss玉; [B1, B2, B3, C1, P1, V6]; xn--0ug7719f.xn--ss-je6eq954cp25j; ; xn--cl7c.xn--ss-je6eq954cp25j; [B2, B3, P1, V6] # .�🠗ss玉
+‌ﾠ.�🠗Ss⽟; ‌ﾠ.�🠗ss玉; [B1, B2, B3, C1, P1, V6]; xn--0ug7719f.xn--ss-je6eq954cp25j; ; xn--cl7c.xn--ss-je6eq954cp25j; [B2, B3, P1, V6] # .�🠗ss玉
+xn--cl7c.xn--ss-je6eq954cp25j; ﾠ.�🠗ss玉; [B2, B3, V6]; xn--cl7c.xn--ss-je6eq954cp25j; ; ;  # .�🠗ss玉
+xn--0ug7719f.xn--ss-je6eq954cp25j; ‌ﾠ.�🠗ss玉; [B1, B2, B3, C1, V6]; xn--0ug7719f.xn--ss-je6eq954cp25j; ; ;  # .�🠗ss玉
+xn--0ug7719f.xn--zca2289c550e0iwi; ‌ﾠ.�🠗ß玉; [B1, B2, B3, C1, V6]; xn--0ug7719f.xn--zca2289c550e0iwi; ; ;  # .�🠗ß玉
+︒Ⴖͦ．‌; ︒Ⴖͦ.‌; [C1, P1, V6]; xn--hva929dl29p.xn--0ug; ; xn--hva929dl29p.; [P1, V6] # ︒Ⴖͦ.
+。Ⴖͦ.‌; .Ⴖͦ.‌; [C1, P1, V6, X4_2]; .xn--hva929d.xn--0ug; [C1, P1, V6, A4_2]; .xn--hva929d.; [P1, V6, A4_2] # .Ⴖͦ.
+。ⴖͦ.‌; .ⴖͦ.‌; [C1, X4_2]; .xn--hva754s.xn--0ug; [C1, A4_2]; .xn--hva754s.; [A4_2] # .ⴖͦ.
+.xn--hva754s.; .ⴖͦ.; [X4_2]; .xn--hva754s.; [A4_2]; ;  # .ⴖͦ.
+.xn--hva754s.xn--0ug; .ⴖͦ.‌; [C1, X4_2]; .xn--hva754s.xn--0ug; [C1, A4_2]; ;  # .ⴖͦ.
+.xn--hva929d.; .Ⴖͦ.; [V6, X4_2]; .xn--hva929d.; [V6, A4_2]; ;  # .Ⴖͦ.
+.xn--hva929d.xn--0ug; .Ⴖͦ.‌; [C1, V6, X4_2]; .xn--hva929d.xn--0ug; [C1, V6, A4_2]; ;  # .Ⴖͦ.
+︒ⴖͦ．‌; ︒ⴖͦ.‌; [C1, P1, V6]; xn--hva754sy94k.xn--0ug; ; xn--hva754sy94k.; [P1, V6] # ︒ⴖͦ.
+xn--hva754sy94k.; ︒ⴖͦ.; [V6]; xn--hva754sy94k.; ; ;  # ︒ⴖͦ.
+xn--hva754sy94k.xn--0ug; ︒ⴖͦ.‌; [C1, V6]; xn--hva754sy94k.xn--0ug; ; ;  # ︒ⴖͦ.
+xn--hva929dl29p.; ︒Ⴖͦ.; [V6]; xn--hva929dl29p.; ; ;  # ︒Ⴖͦ.
+xn--hva929dl29p.xn--0ug; ︒Ⴖͦ.‌; [C1, V6]; xn--hva929dl29p.xn--0ug; ; ;  # ︒Ⴖͦ.
+xn--hva754s.; ⴖͦ.; ; xn--hva754s.; ; ;  # ⴖͦ.
+ⴖͦ.; ; ; xn--hva754s.; ; ;  # ⴖͦ.
+Ⴖͦ.; ; [P1, V6]; xn--hva929d.; ; ;  # Ⴖͦ.
+xn--hva929d.; Ⴖͦ.; [V6]; xn--hva929d.; ; ;  # Ⴖͦ.
+ࢻ．‌Ⴃ𞀒; ࢻ.‌Ⴃ𞀒; [B1, C1, P1, V6]; xn--hzb.xn--bnd300f7225a; ; xn--hzb.xn--bnd2938u; [P1, V6] # ࢻ.Ⴃ𞀒
+ࢻ.‌Ⴃ𞀒; ; [B1, C1, P1, V6]; xn--hzb.xn--bnd300f7225a; ; xn--hzb.xn--bnd2938u; [P1, V6] # ࢻ.Ⴃ𞀒
+ࢻ.‌ⴃ𞀒; ; [B1, C1]; xn--hzb.xn--0ug822cp045a; ; xn--hzb.xn--ukj4430l; [] # ࢻ.ⴃ𞀒
+xn--hzb.xn--ukj4430l; ࢻ.ⴃ𞀒; ; xn--hzb.xn--ukj4430l; ; ;  # ࢻ.ⴃ𞀒
+ࢻ.ⴃ𞀒; ; ; xn--hzb.xn--ukj4430l; ; ;  # ࢻ.ⴃ𞀒
+ࢻ.Ⴃ𞀒; ; [P1, V6]; xn--hzb.xn--bnd2938u; ; ;  # ࢻ.Ⴃ𞀒
+xn--hzb.xn--bnd2938u; ࢻ.Ⴃ𞀒; [V6]; xn--hzb.xn--bnd2938u; ; ;  # ࢻ.Ⴃ𞀒
+xn--hzb.xn--0ug822cp045a; ࢻ.‌ⴃ𞀒; [B1, C1]; xn--hzb.xn--0ug822cp045a; ; ;  # ࢻ.ⴃ𞀒
+xn--hzb.xn--bnd300f7225a; ࢻ.‌Ⴃ𞀒; [B1, C1, V6]; xn--hzb.xn--bnd300f7225a; ; ;  # ࢻ.Ⴃ𞀒
+ࢻ．‌ⴃ𞀒; ࢻ.‌ⴃ𞀒; [B1, C1]; xn--hzb.xn--0ug822cp045a; ; xn--hzb.xn--ukj4430l; [] # ࢻ.ⴃ𞀒
+�‌。２䫷󠧷; �‌.2䫷󠧷; [C1, C2, P1, V6]; xn--0ugb.xn--2-me5ay1273i; ; .xn--2-me5ay1273i; [P1, V6, A4_2] # .2䫷
+�‌。2䫷󠧷; �‌.2䫷󠧷; [C1, C2, P1, V6]; xn--0ugb.xn--2-me5ay1273i; ; .xn--2-me5ay1273i; [P1, V6, A4_2] # .2䫷
+.xn--2-me5ay1273i; .2ä«·ó §·; [V6, X4_2]; .xn--2-me5ay1273i; [V6, A4_2]; ;  # .2ä«·
+xn--0ugb.xn--2-me5ay1273i; �‌.2䫷󠧷; [C1, C2, V6]; xn--0ugb.xn--2-me5ay1273i; ; ;  # .2䫷
+-𞀤�。򈬖; -𞀤�.򈬖; [P1, V3, V6]; xn----rq4re4997d.xn--l707b; ; ;  # -𞀤.
+xn----rq4re4997d.xn--l707b; -𞀤�.򈬖; [V3, V6]; xn----rq4re4997d.xn--l707b; ; ;  # -𞀤.
+󳛂︒‌㟀．ؤ⒈; 󳛂︒‌㟀.ؤ⒈; [C1, P1, V6]; xn--0ug754gxl4ldlt0k.xn--jgb476m; ; xn--etlt457ccrq7h.xn--jgb476m; [P1, V6] # ︒㟀.ؤ⒈
+󳛂︒‌㟀．ؤ⒈; 󳛂︒‌㟀.ؤ⒈; [C1, P1, V6]; xn--0ug754gxl4ldlt0k.xn--jgb476m; ; xn--etlt457ccrq7h.xn--jgb476m; [P1, V6] # ︒㟀.ؤ⒈
+󳛂。‌㟀.ؤ1.; 󳛂.‌㟀.ؤ1.; [B1, C1, P1, V6]; xn--z272f.xn--0ug754g.xn--1-smc.; ; xn--z272f.xn--etl.xn--1-smc.; [P1, V6] # .㟀.ؤ1.
+󳛂。‌㟀.ؤ1.; 󳛂.‌㟀.ؤ1.; [B1, C1, P1, V6]; xn--z272f.xn--0ug754g.xn--1-smc.; ; xn--z272f.xn--etl.xn--1-smc.; [P1, V6] # .㟀.ؤ1.
+xn--z272f.xn--etl.xn--1-smc.; 󳛂.㟀.ؤ1.; [V6]; xn--z272f.xn--etl.xn--1-smc.; ; ;  # .㟀.ؤ1.
+xn--z272f.xn--0ug754g.xn--1-smc.; 󳛂.‌㟀.ؤ1.; [B1, C1, V6]; xn--z272f.xn--0ug754g.xn--1-smc.; ; ;  # .㟀.ؤ1.
+xn--etlt457ccrq7h.xn--jgb476m; 󳛂︒㟀.ؤ⒈; [V6]; xn--etlt457ccrq7h.xn--jgb476m; ; ;  # ︒㟀.ؤ⒈
+xn--0ug754gxl4ldlt0k.xn--jgb476m; 󳛂︒‌㟀.ؤ⒈; [C1, V6]; xn--0ug754gxl4ldlt0k.xn--jgb476m; ; ;  # ︒㟀.ؤ⒈
+𑲜ߊ�。-�; 𑲜ߊ�.-�; [B1, C2, V3, V5]; xn--lsb5482l7nre.xn----ugn; ; xn--lsb5482l7nre.-; [B1, V3, V5] # 𑲜ߊ�.-
+xn--lsb5482l7nre.-; 𑲜ߊ�.-; [B1, V3, V5]; xn--lsb5482l7nre.-; ; ;  # 𑲜ߊ�.-
+xn--lsb5482l7nre.xn----ugn; 𑲜ߊ�.-�; [B1, C2, V3, V5]; xn--lsb5482l7nre.xn----ugn; ; ;  # 𑲜ߊ�.-
+‌．Ⴉ≠�; ‌.Ⴉ≠�; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--hnd481gv73o; ; .xn--hnd481gv73o; [B5, B6, P1, V6, A4_2] # .Ⴉ≠�
+‌．Ⴉ≠�; ‌.Ⴉ≠�; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--hnd481gv73o; ; .xn--hnd481gv73o; [B5, B6, P1, V6, A4_2] # .Ⴉ≠�
+‌.Ⴉ≠�; ; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--hnd481gv73o; ; .xn--hnd481gv73o; [B5, B6, P1, V6, A4_2] # .Ⴉ≠�
+‌.Ⴉ≠�; ‌.Ⴉ≠�; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--hnd481gv73o; ; .xn--hnd481gv73o; [B5, B6, P1, V6, A4_2] # .Ⴉ≠�
+‌.ⴉ≠�; ‌.ⴉ≠�; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--1chx23bzj4p; ; .xn--1chx23bzj4p; [B5, B6, P1, V6, A4_2] # .ⴉ≠�
+‌.ⴉ≠�; ; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--1chx23bzj4p; ; .xn--1chx23bzj4p; [B5, B6, P1, V6, A4_2] # .ⴉ≠�
+.xn--1chx23bzj4p; .ⴉ≠�; [B5, B6, V6, X4_2]; .xn--1chx23bzj4p; [B5, B6, V6, A4_2]; ;  # .ⴉ≠�
+xn--0ug.xn--1chx23bzj4p; ‌.ⴉ≠�; [B1, B5, B6, C1, V6]; xn--0ug.xn--1chx23bzj4p; ; ;  # .ⴉ≠�
+.xn--hnd481gv73o; .Ⴉ≠�; [B5, B6, V6, X4_2]; .xn--hnd481gv73o; [B5, B6, V6, A4_2]; ;  # .Ⴉ≠�
+xn--0ug.xn--hnd481gv73o; ‌.Ⴉ≠�; [B1, B5, B6, C1, V6]; xn--0ug.xn--hnd481gv73o; ; ;  # .Ⴉ≠�
+‌．ⴉ≠�; ‌.ⴉ≠�; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--1chx23bzj4p; ; .xn--1chx23bzj4p; [B5, B6, P1, V6, A4_2] # .ⴉ≠�
+‌．ⴉ≠�; ‌.ⴉ≠�; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--1chx23bzj4p; ; .xn--1chx23bzj4p; [B5, B6, P1, V6, A4_2] # .ⴉ≠�
+�。≯ς; �.≯ς; [B1, P1, V6]; xn--3ob.xn--3xa918m; ; xn--3ob.xn--4xa718m;  # �.≯ς
+�。≯ς; �.≯ς; [B1, P1, V6]; xn--3ob.xn--3xa918m; ; xn--3ob.xn--4xa718m;  # �.≯ς
+�。≯Σ; �.≯σ; [B1, P1, V6]; xn--3ob.xn--4xa718m; ; ;  # �.≯σ
+�。≯Σ; �.≯σ; [B1, P1, V6]; xn--3ob.xn--4xa718m; ; ;  # �.≯σ
+�。≯σ; �.≯σ; [B1, P1, V6]; xn--3ob.xn--4xa718m; ; ;  # �.≯σ
+�。≯σ; �.≯σ; [B1, P1, V6]; xn--3ob.xn--4xa718m; ; ;  # �.≯σ
+xn--3ob.xn--4xa718m; �.≯σ; [B1, V6]; xn--3ob.xn--4xa718m; ; ;  # �.≯σ
+xn--3ob.xn--3xa918m; �.≯ς; [B1, V6]; xn--3ob.xn--3xa918m; ; ;  # �.≯ς
+߼�.�︒񊨩Ⴐ; ; [P1, V6]; xn--0tb8725k.xn--ond3562jt18a7py9c; ; ;  # .︒Ⴐ
+߼�.�。񊨩Ⴐ; ߼�.�.񊨩Ⴐ; [P1, V6]; xn--0tb8725k.xn--tu8d.xn--ond97931d; ; ;  # ..Ⴐ
+߼�.�。񊨩�; ߼�.�.񊨩�; [P1, V6]; xn--0tb8725k.xn--tu8d.xn--7kj73887a; ; ;  # ..�
+xn--0tb8725k.xn--tu8d.xn--7kj73887a; ߼�.�.񊨩�; [V6]; xn--0tb8725k.xn--tu8d.xn--7kj73887a; ; ;  # ..�
+xn--0tb8725k.xn--tu8d.xn--ond97931d; ߼�.�.񊨩Ⴐ; [V6]; xn--0tb8725k.xn--tu8d.xn--ond97931d; ; ;  # ..Ⴐ
+߼�.�︒񊨩�; ; [P1, V6]; xn--0tb8725k.xn--7kj9008dt18a7py9c; ; ;  # .︒�
+xn--0tb8725k.xn--7kj9008dt18a7py9c; ߼�.�︒񊨩�; [V6]; xn--0tb8725k.xn--7kj9008dt18a7py9c; ; ;  # .︒�
+xn--0tb8725k.xn--ond3562jt18a7py9c; ߼�.�︒񊨩Ⴐ; [V6]; xn--0tb8725k.xn--ond3562jt18a7py9c; ; ;  # .︒Ⴐ
+Ⴥ⚭󠖫⋃｡𑌼; Ⴥ⚭󠖫⋃.𑌼; [P1, V5, V6]; xn--9nd623g4zc5z060c.xn--ro1d; ; ;  # Ⴥ⚭⋃.𑌼
+Ⴥ⚭󠖫⋃。𑌼; Ⴥ⚭󠖫⋃.𑌼; [P1, V5, V6]; xn--9nd623g4zc5z060c.xn--ro1d; ; ;  # Ⴥ⚭⋃.𑌼
+ⴥ⚭󠖫⋃。𑌼; ⴥ⚭󠖫⋃.𑌼; [P1, V5, V6]; xn--vfh16m67gx1162b.xn--ro1d; ; ;  # ⴥ⚭⋃.𑌼
+xn--vfh16m67gx1162b.xn--ro1d; ⴥ⚭󠖫⋃.𑌼; [V5, V6]; xn--vfh16m67gx1162b.xn--ro1d; ; ;  # ⴥ⚭⋃.𑌼
+xn--9nd623g4zc5z060c.xn--ro1d; Ⴥ⚭󠖫⋃.𑌼; [V5, V6]; xn--9nd623g4zc5z060c.xn--ro1d; ; ;  # Ⴥ⚭⋃.𑌼
+ⴥ⚭󠖫⋃｡𑌼; ⴥ⚭󠖫⋃.𑌼; [P1, V5, V6]; xn--vfh16m67gx1162b.xn--ro1d; ; ;  # ⴥ⚭⋃.𑌼
+🄈。󠷳ࡄ; 🄈.󠷳ࡄ; [B1, P1, V6]; xn--107h.xn--2vb13094p; ; ;  # 🄈.ࡄ
+7,。󠷳ࡄ; 7,.󠷳ࡄ; [B1, P1, V6]; 7,.xn--2vb13094p; ; ;  # 7,.ࡄ
+7,.xn--2vb13094p; 7,.󠷳ࡄ; [B1, P1, V6]; 7,.xn--2vb13094p; ; ;  # 7,.ࡄ
+xn--107h.xn--2vb13094p; 🄈.󠷳ࡄ; [B1, V6]; xn--107h.xn--2vb13094p; ; ;  # 🄈.ࡄ
+≮ࡆ。섖쮖ß; ≮ࡆ.섖쮖ß; [B1, P1, V6]; xn--4vb505k.xn--zca7259goug; ; xn--4vb505k.xn--ss-5z4j006a;  # ≮ࡆ.섖쮖ß
+≮ࡆ。섖�ᅰᆽß; ≮ࡆ.섖쮖ß; [B1, P1, V6]; xn--4vb505k.xn--zca7259goug; ; xn--4vb505k.xn--ss-5z4j006a;  # ≮ࡆ.섖쮖ß
+≮ࡆ。섖�ᅰᆽSS; ≮ࡆ.섖쮖ss; [B1, P1, V6]; xn--4vb505k.xn--ss-5z4j006a; ; ;  # ≮ࡆ.섖쮖ss
+≮ࡆ。섖쮖SS; ≮ࡆ.섖쮖ss; [B1, P1, V6]; xn--4vb505k.xn--ss-5z4j006a; ; ;  # ≮ࡆ.섖쮖ss
+≮ࡆ。섖쮖ss; ≮ࡆ.섖쮖ss; [B1, P1, V6]; xn--4vb505k.xn--ss-5z4j006a; ; ;  # ≮ࡆ.섖쮖ss
+≮ࡆ。섖�ᅰᆽss; ≮ࡆ.섖쮖ss; [B1, P1, V6]; xn--4vb505k.xn--ss-5z4j006a; ; ;  # ≮ࡆ.섖쮖ss
+xn--4vb505k.xn--ss-5z4j006a; ≮ࡆ.섖쮖ss; [B1, V6]; xn--4vb505k.xn--ss-5z4j006a; ; ;  # ≮ࡆ.섖쮖ss
+≮ࡆ。섖쮖Ss; ≮ࡆ.섖쮖ss; [B1, P1, V6]; xn--4vb505k.xn--ss-5z4j006a; ; ;  # ≮ࡆ.섖쮖ss
+≮ࡆ。섖�ᅰᆽSs; ≮ࡆ.섖쮖ss; [B1, P1, V6]; xn--4vb505k.xn--ss-5z4j006a; ; ;  # ≮ࡆ.섖쮖ss
+xn--4vb505k.xn--zca7259goug; ≮ࡆ.섖쮖ß; [B1, V6]; xn--4vb505k.xn--zca7259goug; ; ;  # ≮ࡆ.섖쮖ß
+󠆓�-。ꡒ; �-.ꡒ; [V3]; xn----o9p.xn--rc9a; ; ;  # �-.ꡒ
+xn----o9p.xn--rc9a; �-.ꡒ; [V3]; xn----o9p.xn--rc9a; ; ;  # �-.ꡒ
+޻�ئ�。ࢧڰ‌ᢒ; ޻�ئ�.ࢧڰ‌ᢒ; [B2, B3, P1, V6]; xn--lgb32f2753cosb.xn--jkb91hlz1azih; ; xn--lgb32f2753cosb.xn--jkb91hlz1a;  # �ئ�.ࢧڰᢒ
+޻�ي�ٔ。ࢧڰ‌ᢒ; ޻�ئ�.ࢧڰ‌ᢒ; [B2, B3, P1, V6]; xn--lgb32f2753cosb.xn--jkb91hlz1azih; ; xn--lgb32f2753cosb.xn--jkb91hlz1a;  # �ئ�.ࢧڰᢒ
+xn--lgb32f2753cosb.xn--jkb91hlz1a; ޻�ئ�.ࢧڰᢒ; [B2, B3, V6]; xn--lgb32f2753cosb.xn--jkb91hlz1a; ; ;  # �ئ�.ࢧڰᢒ
+xn--lgb32f2753cosb.xn--jkb91hlz1azih; ޻�ئ�.ࢧڰ‌ᢒ; [B2, B3, V6]; xn--lgb32f2753cosb.xn--jkb91hlz1azih; ; ;  # �ئ�.ࢧڰᢒ
+ࠖ.�𚚕; ; [B1, B2, B3, B6, P1, V5, V6]; xn--rub.xn--tr9c248x; ; ;  # ࠖ.�
+xn--rub.xn--tr9c248x; ࠖ.�𚚕; [B1, B2, B3, B6, V5, V6]; xn--rub.xn--tr9c248x; ; ;  # ࠖ.�
+--。𽊆ݧ�𞠬; --.𽊆ݧ�𞠬; [B1, B5, B6, P1, V3, V6]; --.xn--rpb6226k77pfh58p; ; ;  # --.ݧ�𞠬
+--.xn--rpb6226k77pfh58p; --.𽊆ݧ�𞠬; [B1, B5, B6, V3, V6]; --.xn--rpb6226k77pfh58p; ; ;  # --.ݧ�𞠬
+򛭦��.≯ࢰࢦ󔛣; ; [B1, P1, V6]; xn--887c2298i5mv6a.xn--vybt688qm8981a; ; ;  # �.≯ࢰࢦ
+򛭦��.≯ࢰࢦ󔛣; 򛭦��.≯ࢰࢦ󔛣; [B1, P1, V6]; xn--887c2298i5mv6a.xn--vybt688qm8981a; ; ;  # �.≯ࢰࢦ
+xn--887c2298i5mv6a.xn--vybt688qm8981a; 򛭦��.≯ࢰࢦ󔛣; [B1, V6]; xn--887c2298i5mv6a.xn--vybt688qm8981a; ; ;  # �.≯ࢰࢦ
+䔛󠇒򤸞�．-䤷; 䔛򤸞�.-䤷; [B1, B5, B6, P1, V3, V6]; xn--2loy662coo60e.xn----0n4a; ; ;  # 䔛�.-䤷
+䔛󠇒򤸞�.-䤷; 䔛򤸞�.-䤷; [B1, B5, B6, P1, V3, V6]; xn--2loy662coo60e.xn----0n4a; ; ;  # 䔛�.-䤷
+xn--2loy662coo60e.xn----0n4a; 䔛򤸞�.-䤷; [B1, B5, B6, V3, V6]; xn--2loy662coo60e.xn----0n4a; ; ;  # 䔛�.-䤷
+�．�-; �.�-; [B1, C2, V3]; xn--ho0d.xn----tgn; ; xn--ho0d.-; [B1, V3] # �.-
+�.�-; ; [B1, C2, V3]; xn--ho0d.xn----tgn; ; xn--ho0d.-; [B1, V3] # �.-
+xn--ho0d.-; �.-; [B1, V3]; xn--ho0d.-; ; ;  # �.-
+xn--ho0d.xn----tgn; �.�-; [B1, C2, V3]; xn--ho0d.xn----tgn; ; ;  # �.-
+񂈦帷｡≯�᷈-; 񂈦帷.≯�᷈-; [P1, V3, V6]; xn--qutw175s.xn----mimu6tf67j; ; ;  # 帷.≯�᷈-
+񂈦帷｡≯�᷈-; 񂈦帷.≯�᷈-; [P1, V3, V6]; xn--qutw175s.xn----mimu6tf67j; ; ;  # 帷.≯�᷈-
+񂈦帷。≯�᷈-; 񂈦帷.≯�᷈-; [P1, V3, V6]; xn--qutw175s.xn----mimu6tf67j; ; ;  # 帷.≯�᷈-
+񂈦帷。≯�᷈-; 񂈦帷.≯�᷈-; [P1, V3, V6]; xn--qutw175s.xn----mimu6tf67j; ; ;  # 帷.≯�᷈-
+xn--qutw175s.xn----mimu6tf67j; 񂈦帷.≯�᷈-; [V3, V6]; xn--qutw175s.xn----mimu6tf67j; ; ;  # 帷.≯�᷈-
+�攌꯭。ᢖ-Ⴘ; �攌꯭.ᢖ-Ⴘ; [C2, P1, V6]; xn--1ug592ykp6b.xn----k1g451d; ; xn--p9ut19m.xn----k1g451d; [P1, V6] # 攌꯭.ᢖ-Ⴘ
+�攌꯭。ᢖ-ⴘ; �攌꯭.ᢖ-ⴘ; [C2]; xn--1ug592ykp6b.xn----mck373i; ; xn--p9ut19m.xn----mck373i; [] # 攌꯭.ᢖ-ⴘ
+xn--p9ut19m.xn----mck373i; 攌꯭.ᢖ-ⴘ; ; xn--p9ut19m.xn----mck373i; ; ;  # 攌꯭.ᢖ-ⴘ
+攌꯭.ᢖ-ⴘ; ; ; xn--p9ut19m.xn----mck373i; ; ;  # 攌꯭.ᢖ-ⴘ
+攌꯭.ᢖ-Ⴘ; ; [P1, V6]; xn--p9ut19m.xn----k1g451d; ; ;  # 攌꯭.ᢖ-Ⴘ
+xn--p9ut19m.xn----k1g451d; 攌꯭.ᢖ-Ⴘ; [V6]; xn--p9ut19m.xn----k1g451d; ; ;  # 攌꯭.ᢖ-Ⴘ
+xn--1ug592ykp6b.xn----mck373i; �攌꯭.ᢖ-ⴘ; [C2]; xn--1ug592ykp6b.xn----mck373i; ; ;  # 攌꯭.ᢖ-ⴘ
+xn--1ug592ykp6b.xn----k1g451d; �攌꯭.ᢖ-Ⴘ; [C2, V6]; xn--1ug592ykp6b.xn----k1g451d; ; ;  # 攌꯭.ᢖ-Ⴘ
+‌ꖨ．⒗３툒۳; ‌ꖨ.⒗3툒۳; [C1, P1, V6]; xn--0ug2473c.xn--3-nyc678tu07m; ; xn--9r8a.xn--3-nyc678tu07m; [P1, V6] # ꖨ.⒗3툒۳
+‌ꖨ．⒗３�ᅭᆩ۳; ‌ꖨ.⒗3툒۳; [C1, P1, V6]; xn--0ug2473c.xn--3-nyc678tu07m; ; xn--9r8a.xn--3-nyc678tu07m; [P1, V6] # ꖨ.⒗3툒۳
+‌ꖨ.16.3툒۳; ; [C1]; xn--0ug2473c.16.xn--3-nyc0117m; ; xn--9r8a.16.xn--3-nyc0117m; [] # ꖨ.16.3툒۳
+‌ꖨ.16.3�ᅭᆩ۳; ‌ꖨ.16.3툒۳; [C1]; xn--0ug2473c.16.xn--3-nyc0117m; ; xn--9r8a.16.xn--3-nyc0117m; [] # ꖨ.16.3툒۳
+xn--9r8a.16.xn--3-nyc0117m; ꖨ.16.3툒۳; ; xn--9r8a.16.xn--3-nyc0117m; ; ;  # ꖨ.16.3툒۳
+ꖨ.16.3툒۳; ; ; xn--9r8a.16.xn--3-nyc0117m; ; ;  # ꖨ.16.3툒۳
+ꖨ.16.3�ᅭᆩ۳; ꖨ.16.3툒۳; ; xn--9r8a.16.xn--3-nyc0117m; ; ;  # ꖨ.16.3툒۳
+xn--0ug2473c.16.xn--3-nyc0117m; ‌ꖨ.16.3툒۳; [C1]; xn--0ug2473c.16.xn--3-nyc0117m; ; ;  # ꖨ.16.3툒۳
+xn--9r8a.xn--3-nyc678tu07m; ꖨ.⒗3툒۳; [V6]; xn--9r8a.xn--3-nyc678tu07m; ; ;  # ꖨ.⒗3툒۳
+xn--0ug2473c.xn--3-nyc678tu07m; ‌ꖨ.⒗3툒۳; [C1, V6]; xn--0ug2473c.xn--3-nyc678tu07m; ; ;  # ꖨ.⒗3툒۳
+⒈걾6.��; ; [B1, P1, V6]; xn--6-dcps419c.xn--glb1794k; ; ;  # ⒈걾6.��
+⒈걾6.��; ⒈걾6.��; [B1, P1, V6]; xn--6-dcps419c.xn--glb1794k; ; ;  # ⒈걾6.��
+1.걾6.��; ; [B1]; 1.xn--6-945e.xn--glb1794k; ; ;  # 1.걾6.��
+1.걾6.��; 1.걾6.��; [B1]; 1.xn--6-945e.xn--glb1794k; ; ;  # 1.걾6.��
+1.xn--6-945e.xn--glb1794k; 1.걾6.��; [B1]; 1.xn--6-945e.xn--glb1794k; ; ;  # 1.걾6.��
+xn--6-dcps419c.xn--glb1794k; ⒈걾6.��; [B1, V6]; xn--6-dcps419c.xn--glb1794k; ; ;  # ⒈걾6.��
+��≮≮.󠀧ع; �0≮≮.󠀧ع; [B1, B3, P1, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+��≮≮.󠀧ع; �0≮≮.󠀧ع; [B1, B3, P1, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+�0≮≮.󠀧ع; �0≮≮.󠀧ع; [B1, B3, P1, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+�0≮≮.󠀧ع; �0≮≮.󠀧ع; [B1, B3, P1, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+�0≮≮.󠀧ع; �0≮≮.󠀧ع; [B1, B3, P1, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+�0≮≮.󠀧ع; ; [B1, B3, P1, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+xn--0-ngoa5711v.xn--4gb31034p; �0≮≮.󠀧ع; [B1, B3, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+��≮≮.󠀧ع; �0≮≮.󠀧ع; [B1, B3, P1, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+��≮≮.󠀧ع; �0≮≮.󠀧ع; [B1, B3, P1, V6]; xn--0-ngoa5711v.xn--4gb31034p; ; ;  # �0≮≮.ع
+ૣ.�ᅟ; ; [B1, B3, B6, P1, V5, V6]; xn--8fc.xn--osd3070k; ; ;  # ૣ.�
+xn--8fc.xn--osd3070k; ૣ.�ᅟ; [B1, B3, B6, V5, V6]; xn--8fc.xn--osd3070k; ; ;  # ૣ.�
+��⸖.�; 1�⸖.�; [C2]; xn--1-5bt6845n.xn--1ug; ; xn--1-5bt6845n.; [] # 1�⸖.
+1�⸖.�; ; [C2]; xn--1-5bt6845n.xn--1ug; ; xn--1-5bt6845n.; [] # 1�⸖.
+xn--1-5bt6845n.; 1�⸖.; ; xn--1-5bt6845n.; ; ;  # 1�⸖.
+1�⸖.; ; ; xn--1-5bt6845n.; ; ;  # 1�⸖.
+xn--1-5bt6845n.xn--1ug; 1�⸖.�; [C2]; xn--1-5bt6845n.xn--1ug; ; ;  # 1�⸖.
+�≠ܦ᩠｡-‌ߕ; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, P1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; xn--wnb859grzfzw60c.xn----kcd; [B1, P1, V3, V6] # 𞤲≠ܦ᩠.-ߕ
+�≠ܦ᩠｡-‌ߕ; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, P1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; xn--wnb859grzfzw60c.xn----kcd; [B1, P1, V3, V6] # 𞤲≠ܦ᩠.-ߕ
+�≠ܦ᩠。-‌ߕ; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, P1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; xn--wnb859grzfzw60c.xn----kcd; [B1, P1, V3, V6] # 𞤲≠ܦ᩠.-ߕ
+�≠ܦ᩠。-‌ߕ; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, P1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; xn--wnb859grzfzw60c.xn----kcd; [B1, P1, V3, V6] # 𞤲≠ܦ᩠.-ߕ
+𞤲≠ܦ᩠。-‌ߕ; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, P1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; xn--wnb859grzfzw60c.xn----kcd; [B1, P1, V3, V6] # 𞤲≠ܦ᩠.-ߕ
+𞤲≠ܦ᩠。-‌ߕ; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, P1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; xn--wnb859grzfzw60c.xn----kcd; [B1, P1, V3, V6] # 𞤲≠ܦ᩠.-ߕ
+xn--wnb859grzfzw60c.xn----kcd; 𞤲≠ܦ᩠.-ߕ; [B1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd; ; ;  # 𞤲≠ܦ᩠.-ߕ
+xn--wnb859grzfzw60c.xn----kcd017p; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; ;  # 𞤲≠ܦ᩠.-ߕ
+𞤲≠ܦ᩠｡-‌ߕ; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, P1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; xn--wnb859grzfzw60c.xn----kcd; [B1, P1, V3, V6] # 𞤲≠ܦ᩠.-ߕ
+𞤲≠ܦ᩠｡-‌ߕ; 𞤲≠ܦ᩠.-‌ߕ; [B1, C1, P1, V3, V6]; xn--wnb859grzfzw60c.xn----kcd017p; ; xn--wnb859grzfzw60c.xn----kcd; [B1, P1, V3, V6] # 𞤲≠ܦ᩠.-ߕ
+�ͨ-ꡧ｡ٵ; �ͨ-ꡧ.اٴ; [B1]; xn----shb2387jgkqd.xn--mgb8m; ; ;  # �ͨ-ꡧ.اٴ
+�ͨ-ꡧ。اٴ; �ͨ-ꡧ.اٴ; [B1]; xn----shb2387jgkqd.xn--mgb8m; ; ;  # �ͨ-ꡧ.اٴ
+xn----shb2387jgkqd.xn--mgb8m; �ͨ-ꡧ.اٴ; [B1]; xn----shb2387jgkqd.xn--mgb8m; ; ;  # �ͨ-ꡧ.اٴ
+F󠅟｡�♚; f.�♚; [P1, V6]; f.xn--45hz6953f; ; ;  # f.♚
+F󠅟。�♚; f.�♚; [P1, V6]; f.xn--45hz6953f; ; ;  # f.♚
+f󠅟。�♚; f.�♚; [P1, V6]; f.xn--45hz6953f; ; ;  # f.♚
+f.xn--45hz6953f; f.�♚; [V6]; f.xn--45hz6953f; ; ;  # f.♚
+f󠅟｡�♚; f.�♚; [P1, V6]; f.xn--45hz6953f; ; ;  # f.♚
+�𑄴ᷩ。�Ⴘ𞀨񃥇; �𑄴ᷩ.2Ⴘ𞀨񃥇; [P1, V5, V6]; xn--9ic246gs21p.xn--2-k1g43076adrwq; ; ;  # �𑄴ᷩ.2Ⴘ𞀨
+�𑄴ᷩ。2Ⴘ𞀨񃥇; �𑄴ᷩ.2Ⴘ𞀨񃥇; [P1, V5, V6]; xn--9ic246gs21p.xn--2-k1g43076adrwq; ; ;  # �𑄴ᷩ.2Ⴘ𞀨
+�𑄴ᷩ。2ⴘ𞀨񃥇; �𑄴ᷩ.2ⴘ𞀨񃥇; [P1, V5, V6]; xn--9ic246gs21p.xn--2-nws2918ndrjr; ; ;  # �𑄴ᷩ.2ⴘ𞀨
+xn--9ic246gs21p.xn--2-nws2918ndrjr; �𑄴ᷩ.2ⴘ𞀨񃥇; [V5, V6]; xn--9ic246gs21p.xn--2-nws2918ndrjr; ; ;  # �𑄴ᷩ.2ⴘ𞀨
+xn--9ic246gs21p.xn--2-k1g43076adrwq; �𑄴ᷩ.2Ⴘ𞀨񃥇; [V5, V6]; xn--9ic246gs21p.xn--2-k1g43076adrwq; ; ;  # �𑄴ᷩ.2Ⴘ𞀨
+�𑄴ᷩ。�ⴘ𞀨񃥇; �𑄴ᷩ.2ⴘ𞀨񃥇; [P1, V5, V6]; xn--9ic246gs21p.xn--2-nws2918ndrjr; ; ;  # �𑄴ᷩ.2ⴘ𞀨
+򓠭‌‌⒈。勉�; 򓠭‌‌⒈.勉�; [C1, P1, V6]; xn--0uga855aez302a.xn--4grs325b; ; xn--tsh11906f.xn--4grs325b; [P1, V6] # ⒈.勉�
+򓠭‌‌1.。勉�; 򓠭‌‌1..勉�; [C1, P1, V6, X4_2]; xn--1-rgna61159u..xn--4grs325b; [C1, P1, V6, A4_2]; xn--1-yi00h..xn--4grs325b; [P1, V6, A4_2] # 1..勉�
+xn--1-yi00h..xn--4grs325b; 򓠭1..勉�; [V6, X4_2]; xn--1-yi00h..xn--4grs325b; [V6, A4_2]; ;  # 1..勉�
+xn--1-rgna61159u..xn--4grs325b; 򓠭‌‌1..勉�; [C1, V6, X4_2]; xn--1-rgna61159u..xn--4grs325b; [C1, V6, A4_2]; ;  # 1..勉�
+xn--tsh11906f.xn--4grs325b; 򓠭⒈.勉�; [V6]; xn--tsh11906f.xn--4grs325b; ; ;  # ⒈.勉�
+xn--0uga855aez302a.xn--4grs325b; 򓠭‌‌⒈.勉�; [C1, V6]; xn--0uga855aez302a.xn--4grs325b; ; ;  # ⒈.勉�
+ᡃ.玿񫈜�; ; [P1, V6]; xn--27e.xn--7cy81125a0yq4a; ; ;  # ᡃ.玿
+xn--27e.xn--7cy81125a0yq4a; ᡃ.玿񫈜�; [V6]; xn--27e.xn--7cy81125a0yq4a; ; ;  # ᡃ.玿
+‌‌｡⒈≯�; ‌‌.⒈≯9; [C1, P1, V6]; xn--0uga.xn--9-ogo37g; ; .xn--9-ogo37g; [P1, V6, A4_2] # .⒈≯9
+‌‌｡⒈≯�; ‌‌.⒈≯9; [C1, P1, V6]; xn--0uga.xn--9-ogo37g; ; .xn--9-ogo37g; [P1, V6, A4_2] # .⒈≯9
+‌‌。1.≯9; ‌‌.1.≯9; [C1, P1, V6]; xn--0uga.1.xn--9-ogo; ; .1.xn--9-ogo; [P1, V6, A4_2] # .1.≯9
+‌‌。1.≯9; ‌‌.1.≯9; [C1, P1, V6]; xn--0uga.1.xn--9-ogo; ; .1.xn--9-ogo; [P1, V6, A4_2] # .1.≯9
+.1.xn--9-ogo; .1.≯9; [V6, X4_2]; .1.xn--9-ogo; [V6, A4_2]; ;  # .1.≯9
+xn--0uga.1.xn--9-ogo; ‌‌.1.≯9; [C1, V6]; xn--0uga.1.xn--9-ogo; ; ;  # .1.≯9
+.xn--9-ogo37g; .⒈≯9; [V6, X4_2]; .xn--9-ogo37g; [V6, A4_2]; ;  # .⒈≯9
+xn--0uga.xn--9-ogo37g; ‌‌.⒈≯9; [C1, V6]; xn--0uga.xn--9-ogo37g; ; ;  # .⒈≯9
+ᅟᷠ�.𺻆≯�; ; [B5, B6, P1, V6]; xn--osd615d5659o.xn--hdh5192gkm6r; ; ;  # ᷠ.≯�
+ᅟᷠ�.𺻆≯�; ᅟᷠ�.𺻆≯�; [B5, B6, P1, V6]; xn--osd615d5659o.xn--hdh5192gkm6r; ; ;  # ᷠ.≯�
+xn--osd615d5659o.xn--hdh5192gkm6r; ᅟᷠ�.𺻆≯�; [B5, B6, V6]; xn--osd615d5659o.xn--hdh5192gkm6r; ; ;  # ᷠ.≯�
+󠄫��ؾ.�-ࠞ󑼩; ��ؾ.�-ࠞ󑼩; [B1, C2, P1, V5, V6]; xn--9gb723kg862a.xn----qgd52296avol4f; ; xn--9gb5080v.xn----qgd52296avol4f; [B1, P1, V5, V6] # �ؾ.�-ࠞ
+xn--9gb5080v.xn----qgd52296avol4f; �ؾ.�-ࠞ󑼩; [B1, V5, V6]; xn--9gb5080v.xn----qgd52296avol4f; ; ;  # �ؾ.�-ࠞ
+xn--9gb723kg862a.xn----qgd52296avol4f; ��ؾ.�-ࠞ󑼩; [B1, C2, V5, V6]; xn--9gb723kg862a.xn----qgd52296avol4f; ; ;  # �ؾ.�-ࠞ
+⃚．𑘿-; ⃚.𑘿-; [V3, V5]; xn--w0g.xn----bd0j; ; ;  # ⃚.𑘿-
+⃚.𑘿-; ; [V3, V5]; xn--w0g.xn----bd0j; ; ;  # ⃚.𑘿-
+xn--w0g.xn----bd0j; ⃚.𑘿-; [V3, V5]; xn--w0g.xn----bd0j; ; ;  # ⃚.𑘿-
+䮸ß.󠵟󠭎紙ࢨ; ; [B1, P1, V6]; xn--zca5349a.xn--xyb1370div70kpzba; ; xn--ss-sf1c.xn--xyb1370div70kpzba;  # 䮸ß.紙ࢨ
+䮸SS.󠵟󠭎紙ࢨ; 䮸ss.󠵟󠭎紙ࢨ; [B1, P1, V6]; xn--ss-sf1c.xn--xyb1370div70kpzba; ; ;  # 䮸ss.紙ࢨ
+䮸ss.󠵟󠭎紙ࢨ; ; [B1, P1, V6]; xn--ss-sf1c.xn--xyb1370div70kpzba; ; ;  # 䮸ss.紙ࢨ
+䮸Ss.󠵟󠭎紙ࢨ; 䮸ss.󠵟󠭎紙ࢨ; [B1, P1, V6]; xn--ss-sf1c.xn--xyb1370div70kpzba; ; ;  # 䮸ss.紙ࢨ
+xn--ss-sf1c.xn--xyb1370div70kpzba; 䮸ss.󠵟󠭎紙ࢨ; [B1, V6]; xn--ss-sf1c.xn--xyb1370div70kpzba; ; ;  # 䮸ss.紙ࢨ
+xn--zca5349a.xn--xyb1370div70kpzba; 䮸ß.󠵟󠭎紙ࢨ; [B1, V6]; xn--zca5349a.xn--xyb1370div70kpzba; ; ;  # 䮸ß.紙ࢨ
+-Ⴞ.-�⅔�; -Ⴞ.-�2�3�; [B1, P1, V3, V6]; xn----w1g.xn---23-pt0a0433lk3jj; ; ;  # -Ⴞ.-�2�3�
+-Ⴞ.-�2�3�; ; [B1, P1, V3, V6]; xn----w1g.xn---23-pt0a0433lk3jj; ; ;  # -Ⴞ.-�2�3�
+-ⴞ.-�2�3�; ; [B1, V3]; xn----zws.xn---23-pt0a0433lk3jj; ; ;  # -ⴞ.-�2�3�
+xn----zws.xn---23-pt0a0433lk3jj; -ⴞ.-�2�3�; [B1, V3]; xn----zws.xn---23-pt0a0433lk3jj; ; ;  # -ⴞ.-�2�3�
+xn----w1g.xn---23-pt0a0433lk3jj; -Ⴞ.-�2�3�; [B1, V3, V6]; xn----w1g.xn---23-pt0a0433lk3jj; ; ;  # -Ⴞ.-�2�3�
+-ⴞ.-�⅔�; -ⴞ.-�2�3�; [B1, V3]; xn----zws.xn---23-pt0a0433lk3jj; ; ;  # -ⴞ.-�2�3�
+󧈯�ૂ｡򖢨�񇼖ᡂ; 󧈯�ૂ.򖢨�񇼖ᡂ; [B5, B6, P1, V6]; xn--bfc7604kv8m3g.xn--17e5565jl7zw4h16a; ; ;  # �ૂ.�ᡂ
+󧈯�ૂ。򖢨�񇼖ᡂ; 󧈯�ૂ.򖢨�񇼖ᡂ; [B5, B6, P1, V6]; xn--bfc7604kv8m3g.xn--17e5565jl7zw4h16a; ; ;  # �ૂ.�ᡂ
+xn--bfc7604kv8m3g.xn--17e5565jl7zw4h16a; 󧈯�ૂ.򖢨�񇼖ᡂ; [B5, B6, V6]; xn--bfc7604kv8m3g.xn--17e5565jl7zw4h16a; ; ;  # �ૂ.�ᡂ
+ႂ-�꣪．ꡊ�񼸳; ႂ-�꣪.ꡊ�񼸳; [C2, P1, V5, V6]; xn----gyg250jio7k.xn--1ug8774cri56d; ; xn----gyg3618i.xn--jc9ao4185a; [P1, V5, V6] # ႂ-꣪.ꡊ
+ႂ-�꣪.ꡊ�񼸳; ; [C2, P1, V5, V6]; xn----gyg250jio7k.xn--1ug8774cri56d; ; xn----gyg3618i.xn--jc9ao4185a; [P1, V5, V6] # ႂ-꣪.ꡊ
+xn----gyg3618i.xn--jc9ao4185a; ႂ-꣪.ꡊ񼸳; [V5, V6]; xn----gyg3618i.xn--jc9ao4185a; ; ;  # ႂ-꣪.ꡊ
+xn----gyg250jio7k.xn--1ug8774cri56d; ႂ-�꣪.ꡊ�񼸳; [C2, V5, V6]; xn----gyg250jio7k.xn--1ug8774cri56d; ; ;  # ႂ-꣪.ꡊ
+۱。≠٨; ۱.≠٨; [B1, P1, V6]; xn--emb.xn--hib334l; ; ;  # ۱.≠٨
+۱。≠٨; ۱.≠٨; [B1, P1, V6]; xn--emb.xn--hib334l; ; ;  # ۱.≠٨
+xn--emb.xn--hib334l; ۱.≠٨; [B1, V6]; xn--emb.xn--hib334l; ; ;  # ۱.≠٨
+𑈵廊.�; ; [V5]; xn--xytw701b.xn--yc9c; ; ;  # 𑈵廊.�
+xn--xytw701b.xn--yc9c; 𑈵廊.�; [V5]; xn--xytw701b.xn--yc9c; ; ;  # 𑈵廊.�
+�͖-．-Ⴐ١; �͖-.-Ⴐ١; [B1, C2, P1, V3, V6]; xn----rgb661t.xn----bqc030f; ; xn----rgb.xn----bqc030f; [B1, P1, V3, V5, V6] # ͖-.-Ⴐ١
+�͖-.-Ⴐ١; ; [B1, C2, P1, V3, V6]; xn----rgb661t.xn----bqc030f; ; xn----rgb.xn----bqc030f; [B1, P1, V3, V5, V6] # ͖-.-Ⴐ١
+�͖-.-�١; ; [B1, C2, V3]; xn----rgb661t.xn----bqc2280a; ; xn----rgb.xn----bqc2280a; [B1, V3, V5] # ͖-.-�١
+xn----rgb.xn----bqc2280a; Í–-.-â´�Ù¡; [B1, V3, V5]; xn----rgb.xn----bqc2280a; ; ;  # Í–-.-â´�Ù¡
+xn----rgb661t.xn----bqc2280a; �͖-.-�١; [B1, C2, V3]; xn----rgb661t.xn----bqc2280a; ; ;  # ͖-.-�١
+xn----rgb.xn----bqc030f; Í–-.-á‚°Ù¡; [B1, V3, V5, V6]; xn----rgb.xn----bqc030f; ; ;  # Í–-.-á‚°Ù¡
+xn----rgb661t.xn----bqc030f; �͖-.-Ⴐ١; [B1, C2, V3, V6]; xn----rgb661t.xn----bqc030f; ; ;  # ͖-.-Ⴐ١
+�͖-．-�١; �͖-.-�١; [B1, C2, V3]; xn----rgb661t.xn----bqc2280a; ; xn----rgb.xn----bqc2280a; [B1, V3, V5] # ͖-.-�١
+غ١��.-; ; [B1, B2, B3, P1, V3, V6]; xn--5gb2f4205aqi47p.-; ; ;  # غ١�.-
+xn--5gb2f4205aqi47p.-; غ١��.-; [B1, B2, B3, V3, V6]; xn--5gb2f4205aqi47p.-; ; ;  # غ١�.-
+ۯ｡�𞤽; ۯ.�𞤽; [B1]; xn--cmb.xn--fo0dy848a; ; ;  # ۯ.�𞤽
+ۯ。�𞤽; ۯ.�𞤽; [B1]; xn--cmb.xn--fo0dy848a; ; ;  # ۯ.�𞤽
+ۯ。�𞤛; ۯ.�𞤽; [B1]; xn--cmb.xn--fo0dy848a; ; ;  # ۯ.�𞤽
+xn--cmb.xn--fo0dy848a; ۯ.�𞤽; [B1]; xn--cmb.xn--fo0dy848a; ; ;  # ۯ.�𞤽
+ۯ｡�𞤛; ۯ.�𞤽; [B1]; xn--cmb.xn--fo0dy848a; ; ;  # ۯ.�𞤽
+Ⴞ𶛀𛗻．ᢗ릫; Ⴞ𶛀𛗻.ᢗ릫; [P1, V6]; xn--2nd8876sgl2j.xn--hbf6853f; ; ;  # Ⴞ.ᢗ릫
+Ⴞ𶛀𛗻．ᢗ릫; Ⴞ𶛀𛗻.ᢗ릫; [P1, V6]; xn--2nd8876sgl2j.xn--hbf6853f; ; ;  # Ⴞ.ᢗ릫
+Ⴞ𶛀𛗻.ᢗ릫; ; [P1, V6]; xn--2nd8876sgl2j.xn--hbf6853f; ; ;  # Ⴞ.ᢗ릫
+Ⴞ𶛀𛗻.ᢗ릫; Ⴞ𶛀𛗻.ᢗ릫; [P1, V6]; xn--2nd8876sgl2j.xn--hbf6853f; ; ;  # Ⴞ.ᢗ릫
+ⴞ𶛀𛗻.ᢗ릫; ⴞ𶛀𛗻.ᢗ릫; [P1, V6]; xn--mlj0486jgl2j.xn--hbf6853f; ; ;  # ⴞ.ᢗ릫
+ⴞ𶛀𛗻.ᢗ릫; ; [P1, V6]; xn--mlj0486jgl2j.xn--hbf6853f; ; ;  # ⴞ.ᢗ릫
+xn--mlj0486jgl2j.xn--hbf6853f; ⴞ𶛀𛗻.ᢗ릫; [V6]; xn--mlj0486jgl2j.xn--hbf6853f; ; ;  # ⴞ.ᢗ릫
+xn--2nd8876sgl2j.xn--hbf6853f; Ⴞ𶛀𛗻.ᢗ릫; [V6]; xn--2nd8876sgl2j.xn--hbf6853f; ; ;  # Ⴞ.ᢗ릫
+ⴞ𶛀𛗻．ᢗ릫; ⴞ𶛀𛗻.ᢗ릫; [P1, V6]; xn--mlj0486jgl2j.xn--hbf6853f; ; ;  # ⴞ.ᢗ릫
+ⴞ𶛀𛗻．ᢗ릫; ⴞ𶛀𛗻.ᢗ릫; [P1, V6]; xn--mlj0486jgl2j.xn--hbf6853f; ; ;  # ⴞ.ᢗ릫
+󠎃󗭞ڷ�｡≯‌᷾; 󠎃󗭞ڷ�.≯‌᷾; [B1, C1, P1, V6]; xn--qkb4516kbi06fg2id.xn--zfg59fm0c; ; xn--qkb4516kbi06fg2id.xn--zfg31q; [B1, P1, V6] # ڷ�.≯᷾
+󠎃󗭞ڷ�｡≯‌᷾; 󠎃󗭞ڷ�.≯‌᷾; [B1, C1, P1, V6]; xn--qkb4516kbi06fg2id.xn--zfg59fm0c; ; xn--qkb4516kbi06fg2id.xn--zfg31q; [B1, P1, V6] # ڷ�.≯᷾
+󠎃󗭞ڷ�。≯‌᷾; 󠎃󗭞ڷ�.≯‌᷾; [B1, C1, P1, V6]; xn--qkb4516kbi06fg2id.xn--zfg59fm0c; ; xn--qkb4516kbi06fg2id.xn--zfg31q; [B1, P1, V6] # ڷ�.≯᷾
+󠎃󗭞ڷ�。≯‌᷾; 󠎃󗭞ڷ�.≯‌᷾; [B1, C1, P1, V6]; xn--qkb4516kbi06fg2id.xn--zfg59fm0c; ; xn--qkb4516kbi06fg2id.xn--zfg31q; [B1, P1, V6] # ڷ�.≯᷾
+xn--qkb4516kbi06fg2id.xn--zfg31q; 󠎃󗭞ڷ�.≯᷾; [B1, V6]; xn--qkb4516kbi06fg2id.xn--zfg31q; ; ;  # ڷ�.≯᷾
+xn--qkb4516kbi06fg2id.xn--zfg59fm0c; 󠎃󗭞ڷ�.≯‌᷾; [B1, C1, V6]; xn--qkb4516kbi06fg2id.xn--zfg59fm0c; ; ;  # ڷ�.≯᷾
+ᛎ���｡���-; ᛎ��.���-; [B1, B6, C2, P1, V3, V6]; xn--fxe848bq3411a.xn----q26i2bvu; ; xn--fxe63563p.xn----q26i2bvu; [B1, B6, P1, V3, V6] # ᛎ.��-
+ᛎ���。���-; ᛎ��.���-; [B1, B6, C2, P1, V3, V6]; xn--fxe848bq3411a.xn----q26i2bvu; ; xn--fxe63563p.xn----q26i2bvu; [B1, B6, P1, V3, V6] # ᛎ.��-
+xn--fxe63563p.xn----q26i2bvu; ᛎ�.���-; [B1, B6, V3, V6]; xn--fxe63563p.xn----q26i2bvu; ; ;  # ᛎ.��-
+xn--fxe848bq3411a.xn----q26i2bvu; ᛎ��.���-; [B1, B6, C2, V3, V6]; xn--fxe848bq3411a.xn----q26i2bvu; ; ;  # ᛎ.��-
+�.�; ; [B1]; xn--uo0d.xn--rw9c; ; ;  # �.�
+xn--uo0d.xn--rw9c; �.�; [B1]; xn--uo0d.xn--rw9c; ; ;  # �.�
+ß�်｡⒈; ß�်.⒈; [C2, P1, V6]; xn--zca679eh2l.xn--tsh; ; xn--ss-f4j.xn--tsh; [P1, V6] # ß်.⒈
+ß�်。1.; ß�်.1.; [C2]; xn--zca679eh2l.1.; ; xn--ss-f4j.1.; [] # ß်.1.
+SS�်。1.; ss�်.1.; [C2]; xn--ss-f4j585j.1.; ; xn--ss-f4j.1.; [] # ss်.1.
+ss�်。1.; ss�်.1.; [C2]; xn--ss-f4j585j.1.; ; xn--ss-f4j.1.; [] # ss်.1.
+Ss�်。1.; ss�်.1.; [C2]; xn--ss-f4j585j.1.; ; xn--ss-f4j.1.; [] # ss်.1.
+xn--ss-f4j.1.; ss်.1.; ; xn--ss-f4j.1.; ; ;  # ss်.1.
+ss်.1.; ; ; xn--ss-f4j.1.; ; ;  # ss်.1.
+SS်.1.; ss်.1.; ; xn--ss-f4j.1.; ; ;  # ss်.1.
+Ss်.1.; ss်.1.; ; xn--ss-f4j.1.; ; ;  # ss်.1.
+xn--ss-f4j585j.1.; ss�်.1.; [C2]; xn--ss-f4j585j.1.; ; ;  # ss်.1.
+xn--zca679eh2l.1.; ß�်.1.; [C2]; xn--zca679eh2l.1.; ; ;  # ß်.1.
+SS�်｡⒈; ss�်.⒈; [C2, P1, V6]; xn--ss-f4j585j.xn--tsh; ; xn--ss-f4j.xn--tsh; [P1, V6] # ss်.⒈
+ss�်｡⒈; ss�်.⒈; [C2, P1, V6]; xn--ss-f4j585j.xn--tsh; ; xn--ss-f4j.xn--tsh; [P1, V6] # ss်.⒈
+Ss�်｡⒈; ss�်.⒈; [C2, P1, V6]; xn--ss-f4j585j.xn--tsh; ; xn--ss-f4j.xn--tsh; [P1, V6] # ss်.⒈
+xn--ss-f4j.xn--tsh; ss်.⒈; [V6]; xn--ss-f4j.xn--tsh; ; ;  # ss်.⒈
+xn--ss-f4j585j.xn--tsh; ss�်.⒈; [C2, V6]; xn--ss-f4j585j.xn--tsh; ; ;  # ss်.⒈
+xn--zca679eh2l.xn--tsh; ß�်.⒈; [C2, V6]; xn--zca679eh2l.xn--tsh; ; ;  # ß်.⒈
+�‌𙶵𞻘。�; �‌𙶵𞻘.�; [B1, C2, P1, V5, V6]; xn--9ic637hz82z32jc.xn--1ug; ; xn--9ic6417rn4xb.; [B1, P1, V5, V6] # �.
+xn--9ic6417rn4xb.; �𙶵𞻘.; [B1, V5, V6]; xn--9ic6417rn4xb.; ; ;  # �.
+xn--9ic637hz82z32jc.xn--1ug; �‌𙶵𞻘.�; [B1, C2, V5, V6]; xn--9ic637hz82z32jc.xn--1ug; ; ;  # �.
+�｡ڼ�; �.ڼ�; [B3]; xn--c29c.xn--vkb8871w; ; ;  # �.ڼ�
+�。ڼ�; �.ڼ�; [B3]; xn--c29c.xn--vkb8871w; ; ;  # �.ڼ�
+xn--c29c.xn--vkb8871w; �.ڼ�; [B3]; xn--c29c.xn--vkb8871w; ; ;  # �.ڼ�
+ؠ្。�󠀧‌𑈵; ؠ្.�󠀧‌𑈵; [B2, B3, C1, P1, V6]; xn--fgb471g.xn--0ug9853g7verp838a; ; xn--fgb471g.xn--9w9c29jw3931a; [B2, B3, P1, V6] # ؠ្.�𑈵
+xn--fgb471g.xn--9w9c29jw3931a; ؠ្.�󠀧𑈵; [B2, B3, V6]; xn--fgb471g.xn--9w9c29jw3931a; ; ;  # ؠ្.�𑈵
+xn--fgb471g.xn--0ug9853g7verp838a; ؠ្.�󠀧‌𑈵; [B2, B3, C1, V6]; xn--fgb471g.xn--0ug9853g7verp838a; ; ;  # ؠ្.�𑈵
+񋉕.𞣕𞤊; 񋉕.𞣕𞤬; [B1, P1, V5, V6]; xn--tf5w.xn--2b6hof; ; ;  # .𞣕𞤬
+񋉕.𞣕𞤬; ; [B1, P1, V5, V6]; xn--tf5w.xn--2b6hof; ; ;  # .𞣕𞤬
+xn--tf5w.xn--2b6hof; 񋉕.𞣕𞤬; [B1, V5, V6]; xn--tf5w.xn--2b6hof; ; ;  # .𞣕𞤬
+ی�．ß྄�; ی�.ß྄�; ; xn--clb2593k.xn--zca216edt0r; ; xn--clb2593k.xn--ss-toj6092t;  # ی�.ß྄�
+ی�.ß྄�; ; ; xn--clb2593k.xn--zca216edt0r; ; xn--clb2593k.xn--ss-toj6092t;  # ی�.ß྄�
+ی�.SS྄�; ی�.ss྄�; ; xn--clb2593k.xn--ss-toj6092t; ; ;  # ی�.ss྄�
+ی�.ss྄�; ; ; xn--clb2593k.xn--ss-toj6092t; ; ;  # ی�.ss྄�
+xn--clb2593k.xn--ss-toj6092t; ی�.ss྄�; ; xn--clb2593k.xn--ss-toj6092t; ; ;  # ی�.ss྄�
+xn--clb2593k.xn--zca216edt0r; ی�.ß྄�; ; xn--clb2593k.xn--zca216edt0r; ; ;  # ی�.ß྄�
+ی�．SS྄�; ی�.ss྄�; ; xn--clb2593k.xn--ss-toj6092t; ; ;  # ی�.ss྄�
+ی�．ss྄�; ی�.ss྄�; ; xn--clb2593k.xn--ss-toj6092t; ; ;  # ی�.ss྄�
+ی�.Ss྄�; ی�.ss྄�; ; xn--clb2593k.xn--ss-toj6092t; ; ;  # ی�.ss྄�
+ی�．Ss྄�; ی�.ss྄�; ; xn--clb2593k.xn--ss-toj6092t; ; ;  # ی�.ss྄�
+�≮‌｡󠅱឴; 8≮‌.឴; [C1, P1, V5, V6]; xn--8-sgn10i.xn--z3e; ; xn--8-ngo.xn--z3e; [P1, V5, V6] # 8≮.
+�≮‌｡󠅱឴; 8≮‌.឴; [C1, P1, V5, V6]; xn--8-sgn10i.xn--z3e; ; xn--8-ngo.xn--z3e; [P1, V5, V6] # 8≮.
+8≮‌。󠅱឴; 8≮‌.឴; [C1, P1, V5, V6]; xn--8-sgn10i.xn--z3e; ; xn--8-ngo.xn--z3e; [P1, V5, V6] # 8≮.
+8≮‌。󠅱឴; 8≮‌.឴; [C1, P1, V5, V6]; xn--8-sgn10i.xn--z3e; ; xn--8-ngo.xn--z3e; [P1, V5, V6] # 8≮.
+xn--8-ngo.xn--z3e; 8≮.឴; [V5, V6]; xn--8-ngo.xn--z3e; ; ;  # 8≮.
+xn--8-sgn10i.xn--z3e; 8≮‌.឴; [C1, V5, V6]; xn--8-sgn10i.xn--z3e; ; ;  # 8≮.
+ᢕ≯︒񄂯．Ⴀ; ᢕ≯︒񄂯.Ⴀ; [P1, V6]; xn--fbf851cq98poxw1a.xn--7md; ; ;  # ᢕ≯︒.Ⴀ
+ᢕ≯︒񄂯．Ⴀ; ᢕ≯︒񄂯.Ⴀ; [P1, V6]; xn--fbf851cq98poxw1a.xn--7md; ; ;  # ᢕ≯︒.Ⴀ
+ᢕ≯。񄂯.Ⴀ; ᢕ≯.񄂯.Ⴀ; [P1, V6]; xn--fbf851c.xn--ko1u.xn--7md; ; ;  # ᢕ≯..Ⴀ
+ᢕ≯。񄂯.Ⴀ; ᢕ≯.񄂯.Ⴀ; [P1, V6]; xn--fbf851c.xn--ko1u.xn--7md; ; ;  # ᢕ≯..Ⴀ
+ᢕ≯。񄂯.ⴀ; ᢕ≯.񄂯.ⴀ; [P1, V6]; xn--fbf851c.xn--ko1u.xn--rkj; ; ;  # ᢕ≯..ⴀ
+ᢕ≯。񄂯.ⴀ; ᢕ≯.񄂯.ⴀ; [P1, V6]; xn--fbf851c.xn--ko1u.xn--rkj; ; ;  # ᢕ≯..ⴀ
+xn--fbf851c.xn--ko1u.xn--rkj; ᢕ≯.񄂯.ⴀ; [V6]; xn--fbf851c.xn--ko1u.xn--rkj; ; ;  # ᢕ≯..ⴀ
+xn--fbf851c.xn--ko1u.xn--7md; ᢕ≯.񄂯.Ⴀ; [V6]; xn--fbf851c.xn--ko1u.xn--7md; ; ;  # ᢕ≯..Ⴀ
+ᢕ≯︒񄂯．ⴀ; ᢕ≯︒񄂯.ⴀ; [P1, V6]; xn--fbf851cq98poxw1a.xn--rkj; ; ;  # ᢕ≯︒.ⴀ
+ᢕ≯︒񄂯．ⴀ; ᢕ≯︒񄂯.ⴀ; [P1, V6]; xn--fbf851cq98poxw1a.xn--rkj; ; ;  # ᢕ≯︒.ⴀ
+xn--fbf851cq98poxw1a.xn--rkj; ᢕ≯︒񄂯.ⴀ; [V6]; xn--fbf851cq98poxw1a.xn--rkj; ; ;  # ᢕ≯︒.ⴀ
+xn--fbf851cq98poxw1a.xn--7md; ᢕ≯︒񄂯.Ⴀ; [V6]; xn--fbf851cq98poxw1a.xn--7md; ; ;  # ᢕ≯︒.Ⴀ
+ྟ．-ࠪ; ྟ.-ࠪ; [V3, V5]; xn--vfd.xn----fhd; ; ;  # ྟ.-ࠪ
+ྟ.-ࠪ; ; [V3, V5]; xn--vfd.xn----fhd; ; ;  # ྟ.-ࠪ
+xn--vfd.xn----fhd; ྟ.-ࠪ; [V3, V5]; xn--vfd.xn----fhd; ; ;  # ྟ.-ࠪ
+ᵬ󠆠．핒⒒⒈􈄦; ᵬ.핒⒒⒈􈄦; [P1, V6]; xn--tbg.xn--tsht7586kyts9l; ; ;  # ᵬ.핒⒒⒈
+ᵬ󠆠．핒⒒⒈􈄦; ᵬ.핒⒒⒈􈄦; [P1, V6]; xn--tbg.xn--tsht7586kyts9l; ; ;  # ᵬ.핒⒒⒈
+ᵬ󠆠.핒11.1.􈄦; ᵬ.핒11.1.􈄦; [P1, V6]; xn--tbg.xn--11-5o7k.1.xn--k469f; ; ;  # ᵬ.핒11.1.
+ᵬ󠆠.핒11.1.􈄦; ᵬ.핒11.1.􈄦; [P1, V6]; xn--tbg.xn--11-5o7k.1.xn--k469f; ; ;  # ᵬ.핒11.1.
+xn--tbg.xn--11-5o7k.1.xn--k469f; ᵬ.핒11.1.􈄦; [V6]; xn--tbg.xn--11-5o7k.1.xn--k469f; ; ;  # ᵬ.핒11.1.
+xn--tbg.xn--tsht7586kyts9l; ᵬ.핒⒒⒈􈄦; [V6]; xn--tbg.xn--tsht7586kyts9l; ; ;  # ᵬ.핒⒒⒈
+ς𑓂�．٨; ς𑓂�.٨; [B1]; xn--3xa8371khhl.xn--hib; ; xn--4xa6371khhl.xn--hib;  # ς𑓂�.٨
+ς𑓂�.٨; ; [B1]; xn--3xa8371khhl.xn--hib; ; xn--4xa6371khhl.xn--hib;  # ς𑓂�.٨
+Σ𑓂�.٨; σ𑓂�.٨; [B1]; xn--4xa6371khhl.xn--hib; ; ;  # σ𑓂�.٨
+σ𑓂�.٨; ; [B1]; xn--4xa6371khhl.xn--hib; ; ;  # σ𑓂�.٨
+xn--4xa6371khhl.xn--hib; σ𑓂�.٨; [B1]; xn--4xa6371khhl.xn--hib; ; ;  # σ𑓂�.٨
+xn--3xa8371khhl.xn--hib; ς𑓂�.٨; [B1]; xn--3xa8371khhl.xn--hib; ; ;  # ς𑓂�.٨
+Σ𑓂�．٨; σ𑓂�.٨; [B1]; xn--4xa6371khhl.xn--hib; ; ;  # σ𑓂�.٨
+σ𑓂�．٨; σ𑓂�.٨; [B1]; xn--4xa6371khhl.xn--hib; ; ;  # σ𑓂�.٨
+꥓‌��.ⷸ𞿄�; ; [B1, B6, C2, P1, V5, V6]; xn--0ugc8356he76c.xn--urju692efj0f; ; xn--3j9a531o.xn--urju692efj0f; [B1, P1, V5, V6] # ꥓�.ⷸ�
+xn--3j9a531o.xn--urju692efj0f; ꥓�.ⷸ𞿄�; [B1, V5, V6]; xn--3j9a531o.xn--urju692efj0f; ; ;  # ꥓�.ⷸ�
+xn--0ugc8356he76c.xn--urju692efj0f; ꥓‌��.ⷸ𞿄�; [B1, B6, C2, V5, V6]; xn--0ugc8356he76c.xn--urju692efj0f; ; ;  # ꥓�.ⷸ�
+⊼。񪧖ڕ; ⊼.񪧖ڕ; [B1, B5, B6, P1, V6]; xn--ofh.xn--rjb13118f; ; ;  # ⊼.ڕ
+xn--ofh.xn--rjb13118f; ⊼.񪧖ڕ; [B1, B5, B6, V6]; xn--ofh.xn--rjb13118f; ; ;  # ⊼.ڕ
+�񖋔。󜳥; �񖋔.󜳥; [B2, B3, P1, V6]; xn--949co370q.xn--7g25e; ; ;  # .
+xn--949co370q.xn--7g25e; �񖋔.󜳥; [B2, B3, V6]; xn--949co370q.xn--7g25e; ; ;  # .
+���。ς�🀞឵; ���.ς�🀞឵; [B1, B6, P1, V6]; xn--jfb66gt010c.xn--3xa823h9p95ars26d; ; xn--jfb66gt010c.xn--4xa623h9p95ars26d;  # ��.ς🀞
+���。Σ�🀞឵; ���.σ�🀞឵; [B1, B6, P1, V6]; xn--jfb66gt010c.xn--4xa623h9p95ars26d; ; ;  # ��.σ🀞
+���。σ�🀞឵; ���.σ�🀞឵; [B1, B6, P1, V6]; xn--jfb66gt010c.xn--4xa623h9p95ars26d; ; ;  # ��.σ🀞
+xn--jfb66gt010c.xn--4xa623h9p95ars26d; ���.σ�🀞឵; [B1, B6, V6]; xn--jfb66gt010c.xn--4xa623h9p95ars26d; ; ;  # ��.σ🀞
+xn--jfb66gt010c.xn--3xa823h9p95ars26d; ���.ς�🀞឵; [B1, B6, V6]; xn--jfb66gt010c.xn--3xa823h9p95ars26d; ; ;  # ��.ς🀞
+-�ن�。꯭�; -�ن�.꯭3; [B1, P1, V3, V5, V6]; xn----roc5482rek10i.xn--3-zw5e; ; ;  # -�ن.꯭3
+-�ن�。꯭3; -�ن�.꯭3; [B1, P1, V3, V5, V6]; xn----roc5482rek10i.xn--3-zw5e; ; ;  # -�ن.꯭3
+-�ن�。꯭3; -�ن�.꯭3; [B1, P1, V3, V5, V6]; xn----roc5482rek10i.xn--3-zw5e; ; ;  # -�ن.꯭3
+xn----roc5482rek10i.xn--3-zw5e; -�ن�.꯭3; [B1, V3, V5, V6]; xn----roc5482rek10i.xn--3-zw5e; ; ;  # -�ن.꯭3
+-�ن�。꯭�; -�ن�.꯭3; [B1, P1, V3, V5, V6]; xn----roc5482rek10i.xn--3-zw5e; ; ;  # -�ن.꯭3
+‌󠴦｡񲨕≮�; ‌󠴦.񲨕≮�; [B1, B5, B6, C1, P1, V6]; xn--0ug22251l.xn--gdhz712gzlr6b; ; xn--6v56e.xn--gdhz712gzlr6b; [B1, B5, B6, P1, V6] # .≮�
+‌󠴦｡񲨕≮�; ‌󠴦.񲨕≮�; [B1, B5, B6, C1, P1, V6]; xn--0ug22251l.xn--gdhz712gzlr6b; ; xn--6v56e.xn--gdhz712gzlr6b; [B1, B5, B6, P1, V6] # .≮�
+‌󠴦。񲨕≮�; ‌󠴦.񲨕≮�; [B1, B5, B6, C1, P1, V6]; xn--0ug22251l.xn--gdhz712gzlr6b; ; xn--6v56e.xn--gdhz712gzlr6b; [B1, B5, B6, P1, V6] # .≮�
+‌󠴦。񲨕≮�; ‌󠴦.񲨕≮�; [B1, B5, B6, C1, P1, V6]; xn--0ug22251l.xn--gdhz712gzlr6b; ; xn--6v56e.xn--gdhz712gzlr6b; [B1, B5, B6, P1, V6] # .≮�
+xn--6v56e.xn--gdhz712gzlr6b; 󠴦.񲨕≮�; [B1, B5, B6, V6]; xn--6v56e.xn--gdhz712gzlr6b; ; ;  # .≮�
+xn--0ug22251l.xn--gdhz712gzlr6b; ‌󠴦.񲨕≮�; [B1, B5, B6, C1, V6]; xn--0ug22251l.xn--gdhz712gzlr6b; ; ;  # .≮�
+⒈✌򟬟．�񠱣; ⒈✌򟬟.9񠱣; [P1, V6]; xn--tsh24g49550b.xn--9-o706d; ; ;  # ⒈✌.9
+1.✌򟬟.9񠱣; ; [P1, V6]; 1.xn--7bi44996f.xn--9-o706d; ; ;  # 1.✌.9
+1.xn--7bi44996f.xn--9-o706d; 1.✌򟬟.9񠱣; [V6]; 1.xn--7bi44996f.xn--9-o706d; ; ;  # 1.✌.9
+xn--tsh24g49550b.xn--9-o706d; ⒈✌򟬟.9񠱣; [V6]; xn--tsh24g49550b.xn--9-o706d; ; ;  # ⒈✌.9
+𑆾𞤬�.٦ᷔ; ; [B1, V5]; xn--d29c79hf98r.xn--fib011j; ; ;  # 𑆾𞤬�.٦ᷔ
+𑆾𞤊�.٦ᷔ; 𑆾𞤬�.٦ᷔ; [B1, V5]; xn--d29c79hf98r.xn--fib011j; ; ;  # 𑆾𞤬�.٦ᷔ
+xn--d29c79hf98r.xn--fib011j; 𑆾𞤬�.٦ᷔ; [B1, V5]; xn--d29c79hf98r.xn--fib011j; ; ;  # 𑆾𞤬�.٦ᷔ
+ς．꧀꣄; ς.꧀꣄; [V5]; xn--3xa.xn--0f9ars; ; xn--4xa.xn--0f9ars;  # ς.꧀꣄
+ς.꧀꣄; ; [V5]; xn--3xa.xn--0f9ars; ; xn--4xa.xn--0f9ars;  # ς.꧀꣄
+Σ.꧀꣄; σ.꧀꣄; [V5]; xn--4xa.xn--0f9ars; ; ;  # σ.꧀꣄
+σ.꧀꣄; ; [V5]; xn--4xa.xn--0f9ars; ; ;  # σ.꧀꣄
+xn--4xa.xn--0f9ars; σ.꧀꣄; [V5]; xn--4xa.xn--0f9ars; ; ;  # σ.꧀꣄
+xn--3xa.xn--0f9ars; ς.꧀꣄; [V5]; xn--3xa.xn--0f9ars; ; ;  # ς.꧀꣄
+Σ．꧀꣄; σ.꧀꣄; [V5]; xn--4xa.xn--0f9ars; ; ;  # σ.꧀꣄
+σ．꧀꣄; σ.꧀꣄; [V5]; xn--4xa.xn--0f9ars; ; ;  # σ.꧀꣄
+𑰶‌≯�．࡛; 𑰶‌≯�.࡛; [B1, B3, B6, C1, P1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; xn--hdhz343g3wj.xn--qwb; [B1, B3, B6, P1, V5, V6] # 𑰶≯�.࡛
+𑰶‌≯�．࡛; 𑰶‌≯�.࡛; [B1, B3, B6, C1, P1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; xn--hdhz343g3wj.xn--qwb; [B1, B3, B6, P1, V5, V6] # 𑰶≯�.࡛
+𑰶‌≯�.࡛; ; [B1, B3, B6, C1, P1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; xn--hdhz343g3wj.xn--qwb; [B1, B3, B6, P1, V5, V6] # 𑰶≯�.࡛
+𑰶‌≯�.࡛; 𑰶‌≯�.࡛; [B1, B3, B6, C1, P1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; xn--hdhz343g3wj.xn--qwb; [B1, B3, B6, P1, V5, V6] # 𑰶≯�.࡛
+𑰶‌≯�.࡛; 𑰶‌≯�.࡛; [B1, B3, B6, C1, P1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; xn--hdhz343g3wj.xn--qwb; [B1, B3, B6, P1, V5, V6] # 𑰶≯�.࡛
+𑰶‌≯�.࡛; 𑰶‌≯�.࡛; [B1, B3, B6, C1, P1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; xn--hdhz343g3wj.xn--qwb; [B1, B3, B6, P1, V5, V6] # 𑰶≯�.࡛
+xn--hdhz343g3wj.xn--qwb; 𑰶≯�.࡛; [B1, B3, B6, V5, V6]; xn--hdhz343g3wj.xn--qwb; ; ;  # 𑰶≯�.࡛
+xn--0ug06g7697ap4ma.xn--qwb; 𑰶‌≯�.࡛; [B1, B3, B6, C1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; ;  # 𑰶≯�.࡛
+𑰶‌≯�．࡛; 𑰶‌≯�.࡛; [B1, B3, B6, C1, P1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; xn--hdhz343g3wj.xn--qwb; [B1, B3, B6, P1, V5, V6] # 𑰶≯�.࡛
+𑰶‌≯�．࡛; 𑰶‌≯�.࡛; [B1, B3, B6, C1, P1, V5, V6]; xn--0ug06g7697ap4ma.xn--qwb; ; xn--hdhz343g3wj.xn--qwb; [B1, B3, B6, P1, V5, V6] # 𑰶≯�.࡛
+羚｡≯; 羚.≯; [P1, V6]; xn--xt0a.xn--hdh; ; ;  # 羚.≯
+羚｡≯; 羚.≯; [P1, V6]; xn--xt0a.xn--hdh; ; ;  # 羚.≯
+羚。≯; 羚.≯; [P1, V6]; xn--xt0a.xn--hdh; ; ;  # 羚.≯
+羚。≯; 羚.≯; [P1, V6]; xn--xt0a.xn--hdh; ; ;  # 羚.≯
+xn--xt0a.xn--hdh; 羚.≯; [V6]; xn--xt0a.xn--hdh; ; ;  # 羚.≯
+𑓂�．ࢨ; 𑓂�.ࢨ; [B1, P1, V5, V6]; xn--e1e9580k.xn--xyb; ; ;  # 𑓂.ࢨ
+𑓂�.ࢨ; ; [B1, P1, V5, V6]; xn--e1e9580k.xn--xyb; ; ;  # 𑓂.ࢨ
+xn--e1e9580k.xn--xyb; 𑓂�.ࢨ; [B1, V5, V6]; xn--e1e9580k.xn--xyb; ; ;  # 𑓂.ࢨ
+󨣿󠇀�｡٣ҠჀ�; 󨣿�.٣ҡჀ3; [B1, B6, C2, P1, V6]; xn--1ug89936l.xn--3-ozb36kixu; ; xn--1r19e.xn--3-ozb36kixu; [B1, P1, V6] # .٣ҡჀ3
+󨣿󠇀�。٣ҠჀ3; 󨣿�.٣ҡჀ3; [B1, B6, C2, P1, V6]; xn--1ug89936l.xn--3-ozb36kixu; ; xn--1r19e.xn--3-ozb36kixu; [B1, P1, V6] # .٣ҡჀ3
+󨣿󠇀�。٣ҡⴠ3; 󨣿�.٣ҡⴠ3; [B1, B6, C2, P1, V6]; xn--1ug89936l.xn--3-ozb36ko13f; ; xn--1r19e.xn--3-ozb36ko13f; [B1, P1, V6] # .٣ҡⴠ3
+xn--1r19e.xn--3-ozb36ko13f; 󨣿.٣ҡⴠ3; [B1, V6]; xn--1r19e.xn--3-ozb36ko13f; ; ;  # .٣ҡⴠ3
+xn--1ug89936l.xn--3-ozb36ko13f; 󨣿�.٣ҡⴠ3; [B1, B6, C2, V6]; xn--1ug89936l.xn--3-ozb36ko13f; ; ;  # .٣ҡⴠ3
+xn--1r19e.xn--3-ozb36kixu; 󨣿.٣ҡჀ3; [B1, V6]; xn--1r19e.xn--3-ozb36kixu; ; ;  # .٣ҡჀ3
+xn--1ug89936l.xn--3-ozb36kixu; 󨣿�.٣ҡჀ3; [B1, B6, C2, V6]; xn--1ug89936l.xn--3-ozb36kixu; ; ;  # .٣ҡჀ3
+󨣿󠇀�｡٣ҡⴠ�; 󨣿�.٣ҡⴠ3; [B1, B6, C2, P1, V6]; xn--1ug89936l.xn--3-ozb36ko13f; ; xn--1r19e.xn--3-ozb36ko13f; [B1, P1, V6] # .٣ҡⴠ3
+󨣿󠇀�。٣Ҡⴠ3; 󨣿�.٣ҡⴠ3; [B1, B6, C2, P1, V6]; xn--1ug89936l.xn--3-ozb36ko13f; ; xn--1r19e.xn--3-ozb36ko13f; [B1, P1, V6] # .٣ҡⴠ3
+󨣿󠇀�｡٣Ҡⴠ�; 󨣿�.٣ҡⴠ3; [B1, B6, C2, P1, V6]; xn--1ug89936l.xn--3-ozb36ko13f; ; xn--1r19e.xn--3-ozb36ko13f; [B1, P1, V6] # .٣ҡⴠ3
+ᡷ。�࣠; ᡷ.�࣠; [B1]; xn--k9e.xn--j0b5005k; ; ;  # ᡷ.�࣠
+xn--k9e.xn--j0b5005k; ᡷ.�࣠; [B1]; xn--k9e.xn--j0b5005k; ; ;  # ᡷ.�࣠
+򕮇᯳｡٦񗜼្ß; 򕮇᯳.٦񗜼្ß; [B1, P1, V6]; xn--1zf58212h.xn--zca34zk4qx711k; ; xn--1zf58212h.xn--ss-pyd459o3258m;  # ᯳.٦្ß
+򕮇᯳。٦񗜼្ß; 򕮇᯳.٦񗜼្ß; [B1, P1, V6]; xn--1zf58212h.xn--zca34zk4qx711k; ; xn--1zf58212h.xn--ss-pyd459o3258m;  # ᯳.٦្ß
+򕮇᯳。٦񗜼្SS; 򕮇᯳.٦񗜼្ss; [B1, P1, V6]; xn--1zf58212h.xn--ss-pyd459o3258m; ; ;  # ᯳.٦្ss
+򕮇᯳。٦񗜼្ss; 򕮇᯳.٦񗜼្ss; [B1, P1, V6]; xn--1zf58212h.xn--ss-pyd459o3258m; ; ;  # ᯳.٦្ss
+򕮇᯳。٦񗜼្Ss; 򕮇᯳.٦񗜼្ss; [B1, P1, V6]; xn--1zf58212h.xn--ss-pyd459o3258m; ; ;  # ᯳.٦្ss
+xn--1zf58212h.xn--ss-pyd459o3258m; 򕮇᯳.٦񗜼្ss; [B1, V6]; xn--1zf58212h.xn--ss-pyd459o3258m; ; ;  # ᯳.٦្ss
+xn--1zf58212h.xn--zca34zk4qx711k; 򕮇᯳.٦񗜼្ß; [B1, V6]; xn--1zf58212h.xn--zca34zk4qx711k; ; ;  # ᯳.٦្ß
+򕮇᯳｡٦񗜼្SS; 򕮇᯳.٦񗜼្ss; [B1, P1, V6]; xn--1zf58212h.xn--ss-pyd459o3258m; ; ;  # ᯳.٦្ss
+򕮇᯳｡٦񗜼្ss; 򕮇᯳.٦񗜼្ss; [B1, P1, V6]; xn--1zf58212h.xn--ss-pyd459o3258m; ; ;  # ᯳.٦្ss
+򕮇᯳｡٦񗜼្Ss; 򕮇᯳.٦񗜼្ss; [B1, P1, V6]; xn--1zf58212h.xn--ss-pyd459o3258m; ; ;  # ᯳.٦្ss
+٤򤽎𑲛.󠔢︒≠; ; [B1, P1, V6]; xn--dib0653l2i02d.xn--1ch7467f14u4g; ; ;  # ٤𑲛.︒≠
+٤򤽎𑲛.󠔢︒≠; ٤򤽎𑲛.󠔢︒≠; [B1, P1, V6]; xn--dib0653l2i02d.xn--1ch7467f14u4g; ; ;  # ٤𑲛.︒≠
+٤򤽎𑲛.󠔢。≠; ٤򤽎𑲛.󠔢.≠; [B1, P1, V6]; xn--dib0653l2i02d.xn--k736e.xn--1ch; ; ;  # ٤𑲛..≠
+٤򤽎𑲛.󠔢。≠; ٤򤽎𑲛.󠔢.≠; [B1, P1, V6]; xn--dib0653l2i02d.xn--k736e.xn--1ch; ; ;  # ٤𑲛..≠
+xn--dib0653l2i02d.xn--k736e.xn--1ch; ٤򤽎𑲛.󠔢.≠; [B1, V6]; xn--dib0653l2i02d.xn--k736e.xn--1ch; ; ;  # ٤𑲛..≠
+xn--dib0653l2i02d.xn--1ch7467f14u4g; ٤򤽎𑲛.󠔢︒≠; [B1, V6]; xn--dib0653l2i02d.xn--1ch7467f14u4g; ; ;  # ٤𑲛.︒≠
+➆񷧕ỗ⒈．򑬒񡘮࡛�; ➆񷧕ỗ⒈.򑬒񡘮࡛9; [P1, V6]; xn--6lg26tvvc6v99z.xn--9-6jd87310jtcqs; ; ;  # ➆ỗ⒈.࡛9
+➆񷧕ỗ⒈．򑬒񡘮࡛�; ➆񷧕ỗ⒈.򑬒񡘮࡛9; [P1, V6]; xn--6lg26tvvc6v99z.xn--9-6jd87310jtcqs; ; ;  # ➆ỗ⒈.࡛9
+➆񷧕ỗ1..򑬒񡘮࡛9; ; [P1, V6, X4_2]; xn--1-3xm292b6044r..xn--9-6jd87310jtcqs; [P1, V6, A4_2]; ;  # ➆ỗ1..࡛9
+➆񷧕ỗ1..򑬒񡘮࡛9; ➆񷧕ỗ1..򑬒񡘮࡛9; [P1, V6, X4_2]; xn--1-3xm292b6044r..xn--9-6jd87310jtcqs; [P1, V6, A4_2]; ;  # ➆ỗ1..࡛9
+➆񷧕Ỗ1..򑬒񡘮࡛9; ➆񷧕ỗ1..򑬒񡘮࡛9; [P1, V6, X4_2]; xn--1-3xm292b6044r..xn--9-6jd87310jtcqs; [P1, V6, A4_2]; ;  # ➆ỗ1..࡛9
+➆񷧕Ỗ1..򑬒񡘮࡛9; ➆񷧕ỗ1..򑬒񡘮࡛9; [P1, V6, X4_2]; xn--1-3xm292b6044r..xn--9-6jd87310jtcqs; [P1, V6, A4_2]; ;  # ➆ỗ1..࡛9
+xn--1-3xm292b6044r..xn--9-6jd87310jtcqs; ➆񷧕ỗ1..򑬒񡘮࡛9; [V6, X4_2]; xn--1-3xm292b6044r..xn--9-6jd87310jtcqs; [V6, A4_2]; ;  # ➆ỗ1..࡛9
+➆񷧕Ỗ⒈．򑬒񡘮࡛�; ➆񷧕ỗ⒈.򑬒񡘮࡛9; [P1, V6]; xn--6lg26tvvc6v99z.xn--9-6jd87310jtcqs; ; ;  # ➆ỗ⒈.࡛9
+➆񷧕Ỗ⒈．򑬒񡘮࡛�; ➆񷧕ỗ⒈.򑬒񡘮࡛9; [P1, V6]; xn--6lg26tvvc6v99z.xn--9-6jd87310jtcqs; ; ;  # ➆ỗ⒈.࡛9
+xn--6lg26tvvc6v99z.xn--9-6jd87310jtcqs; ➆񷧕ỗ⒈.򑬒񡘮࡛9; [V6]; xn--6lg26tvvc6v99z.xn--9-6jd87310jtcqs; ; ;  # ➆ỗ⒈.࡛9
+�｡𞤘; �.𞤺; [B1, C2]; xn--1ug.xn--ye6h; ; .xn--ye6h; [A4_2] # .𞤺
+�。𞤘; �.𞤺; [B1, C2]; xn--1ug.xn--ye6h; ; .xn--ye6h; [A4_2] # .𞤺
+�。𞤺; �.𞤺; [B1, C2]; xn--1ug.xn--ye6h; ; .xn--ye6h; [A4_2] # .𞤺
+.xn--ye6h; .𞤺; [X4_2]; .xn--ye6h; [A4_2]; ;  # .𞤺
+xn--1ug.xn--ye6h; �.𞤺; [B1, C2]; xn--1ug.xn--ye6h; ; ;  # .𞤺
+�｡𞤺; �.𞤺; [B1, C2]; xn--1ug.xn--ye6h; ; .xn--ye6h; [A4_2] # .𞤺
+xn--ye6h; 𞤺; ; xn--ye6h; ; ;  # 𞤺
+𞤺; ; ; xn--ye6h; ; ;  # 𞤺
+𞤘; 𞤺; ; xn--ye6h; ; ;  # 𞤺
+ࠩܤ.ᢣ; ; [B1, V5]; xn--unb53c.xn--tbf; ; ;  # ࠩܤ.ᢣ
+xn--unb53c.xn--tbf; ࠩܤ.ᢣ; [B1, V5]; xn--unb53c.xn--tbf; ; ;  # ࠩܤ.ᢣ
+ܼ‌-。�ß; ܼ‌-.�ß; [C1, P1, V3, V5, V6]; xn----s2c071q.xn--zca7848m; ; xn----s2c.xn--ss-066q; [P1, V3, V5, V6] # ܼ-.ß
+ܼ‌-。�SS; ܼ‌-.�ss; [C1, P1, V3, V5, V6]; xn----s2c071q.xn--ss-066q; ; xn----s2c.xn--ss-066q; [P1, V3, V5, V6] # ܼ-.ss
+ܼ‌-。�ss; ܼ‌-.�ss; [C1, P1, V3, V5, V6]; xn----s2c071q.xn--ss-066q; ; xn----s2c.xn--ss-066q; [P1, V3, V5, V6] # ܼ-.ss
+ܼ‌-。�Ss; ܼ‌-.�ss; [C1, P1, V3, V5, V6]; xn----s2c071q.xn--ss-066q; ; xn----s2c.xn--ss-066q; [P1, V3, V5, V6] # ܼ-.ss
+xn----s2c.xn--ss-066q; ܼ-.�ss; [V3, V5, V6]; xn----s2c.xn--ss-066q; ; ;  # ܼ-.ss
+xn----s2c071q.xn--ss-066q; ܼ‌-.�ss; [C1, V3, V5, V6]; xn----s2c071q.xn--ss-066q; ; ;  # ܼ-.ss
+xn----s2c071q.xn--zca7848m; ܼ‌-.�ß; [C1, V3, V5, V6]; xn----s2c071q.xn--zca7848m; ; ;  # ܼ-.ß
+‌ς🃡⒗.ೆ仧ݖ; ; [B1, B5, B6, C1, P1, V5, V6]; xn--3xa795lz9czy52d.xn--9ob79ycx2e; ; xn--4xa229nbu92a.xn--9ob79ycx2e; [B5, B6, P1, V5, V6] # ς🃡⒗.ೆ仧ݖ
+‌ς🃡16..ೆ仧ݖ; ; [B1, B5, B6, C1, V5, X4_2]; xn--16-rbc1800avy99b..xn--9ob79ycx2e; [B1, B5, B6, C1, V5, A4_2]; xn--16-ubc66061c..xn--9ob79ycx2e; [B5, B6, V5, A4_2] # ς🃡16..ೆ仧ݖ
+‌Σ🃡16..ೆ仧ݖ; ‌σ🃡16..ೆ仧ݖ; [B1, B5, B6, C1, V5, X4_2]; xn--16-ubc7700avy99b..xn--9ob79ycx2e; [B1, B5, B6, C1, V5, A4_2]; xn--16-ubc66061c..xn--9ob79ycx2e; [B5, B6, V5, A4_2] # σ🃡16..ೆ仧ݖ
+‌σ🃡16..ೆ仧ݖ; ; [B1, B5, B6, C1, V5, X4_2]; xn--16-ubc7700avy99b..xn--9ob79ycx2e; [B1, B5, B6, C1, V5, A4_2]; xn--16-ubc66061c..xn--9ob79ycx2e; [B5, B6, V5, A4_2] # σ🃡16..ೆ仧ݖ
+xn--16-ubc66061c..xn--9ob79ycx2e; σ🃡16..ೆ仧ݖ; [B5, B6, V5, X4_2]; xn--16-ubc66061c..xn--9ob79ycx2e; [B5, B6, V5, A4_2]; ;  # σ🃡16..ೆ仧ݖ
+xn--16-ubc7700avy99b..xn--9ob79ycx2e; ‌σ🃡16..ೆ仧ݖ; [B1, B5, B6, C1, V5, X4_2]; xn--16-ubc7700avy99b..xn--9ob79ycx2e; [B1, B5, B6, C1, V5, A4_2]; ;  # σ🃡16..ೆ仧ݖ
+xn--16-rbc1800avy99b..xn--9ob79ycx2e; ‌ς🃡16..ೆ仧ݖ; [B1, B5, B6, C1, V5, X4_2]; xn--16-rbc1800avy99b..xn--9ob79ycx2e; [B1, B5, B6, C1, V5, A4_2]; ;  # ς🃡16..ೆ仧ݖ
+‌Σ🃡⒗.ೆ仧ݖ; ‌σ🃡⒗.ೆ仧ݖ; [B1, B5, B6, C1, P1, V5, V6]; xn--4xa595lz9czy52d.xn--9ob79ycx2e; ; xn--4xa229nbu92a.xn--9ob79ycx2e; [B5, B6, P1, V5, V6] # σ🃡⒗.ೆ仧ݖ
+‌σ🃡⒗.ೆ仧ݖ; ; [B1, B5, B6, C1, P1, V5, V6]; xn--4xa595lz9czy52d.xn--9ob79ycx2e; ; xn--4xa229nbu92a.xn--9ob79ycx2e; [B5, B6, P1, V5, V6] # σ🃡⒗.ೆ仧ݖ
+xn--4xa229nbu92a.xn--9ob79ycx2e; σ🃡⒗.ೆ仧ݖ; [B5, B6, V5, V6]; xn--4xa229nbu92a.xn--9ob79ycx2e; ; ;  # σ🃡⒗.ೆ仧ݖ
+xn--4xa595lz9czy52d.xn--9ob79ycx2e; ‌σ🃡⒗.ೆ仧ݖ; [B1, B5, B6, C1, V5, V6]; xn--4xa595lz9czy52d.xn--9ob79ycx2e; ; ;  # σ🃡⒗.ೆ仧ݖ
+xn--3xa795lz9czy52d.xn--9ob79ycx2e; ‌ς🃡⒗.ೆ仧ݖ; [B1, B5, B6, C1, V5, V6]; xn--3xa795lz9czy52d.xn--9ob79ycx2e; ; ;  # ς🃡⒗.ೆ仧ݖ
+-.𞸚; -.ظ; [B1, V3]; -.xn--3gb; ; ;  # -.ظ
+-.ظ; ; [B1, V3]; -.xn--3gb; ; ;  # -.ظ
+-.xn--3gb; -.ظ; [B1, V3]; -.xn--3gb; ; ;  # -.ظ
+�ڃ.ཾش; ; [B1, B5, B6, P1, V5, V6]; xn--8ib92728i.xn--zgb968b; ; ;  # ڃ.ཾش
+xn--8ib92728i.xn--zgb968b; �ڃ.ཾش; [B1, B5, B6, V5, V6]; xn--8ib92728i.xn--zgb968b; ; ;  # ڃ.ཾش
+࿦ࡃ񽶬.�; ; [B5, P1, V6]; xn--1vb320b5m04p.xn--m29c; ; ;  # ࡃ.�
+xn--1vb320b5m04p.xn--m29c; ࿦ࡃ񽶬.�; [B5, V6]; xn--1vb320b5m04p.xn--m29c; ; ;  # ࡃ.�
+2񎨠ߋß。ᠽ; 2񎨠ߋß.ᠽ; [B1, P1, V6]; xn--2-qfa924cez02l.xn--w7e; ; xn--2ss-odg83511n.xn--w7e;  # 2ߋß.ᠽ
+2񎨠ߋSS。ᠽ; 2񎨠ߋss.ᠽ; [B1, P1, V6]; xn--2ss-odg83511n.xn--w7e; ; ;  # 2ߋss.ᠽ
+2񎨠ߋss。ᠽ; 2񎨠ߋss.ᠽ; [B1, P1, V6]; xn--2ss-odg83511n.xn--w7e; ; ;  # 2ߋss.ᠽ
+xn--2ss-odg83511n.xn--w7e; 2񎨠ߋss.ᠽ; [B1, V6]; xn--2ss-odg83511n.xn--w7e; ; ;  # 2ߋss.ᠽ
+xn--2-qfa924cez02l.xn--w7e; 2񎨠ߋß.ᠽ; [B1, V6]; xn--2-qfa924cez02l.xn--w7e; ; ;  # 2ߋß.ᠽ
+2񎨠ߋSs。ᠽ; 2񎨠ߋss.ᠽ; [B1, P1, V6]; xn--2ss-odg83511n.xn--w7e; ; ;  # 2ߋss.ᠽ
+㸳ߊ≮．ێß-�; 㸳ߊ≮.ێß-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn----pfa076bys4a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێß-
+㸳ߊ≮．ێß-�; 㸳ߊ≮.ێß-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn----pfa076bys4a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێß-
+㸳ߊ≮.ێß-�; ; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn----pfa076bys4a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێß-
+㸳ߊ≮.ێß-�; 㸳ߊ≮.ێß-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn----pfa076bys4a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێß-
+㸳ߊ≮.ێSS-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮.ێSS-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮.ێss-�; ; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮.ێss-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+xn--lsb457kkut.xn--ss--qjf; 㸳ߊ≮.ێss-; [B2, B3, B5, B6, V3, V6]; xn--lsb457kkut.xn--ss--qjf; ; ;  # 㸳ߊ≮.ێss-
+xn--lsb457kkut.xn--ss--qjf2343a; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; ;  # 㸳ߊ≮.ێss-
+xn--lsb457kkut.xn----pfa076bys4a; 㸳ߊ≮.ێß-�; [B2, B3, B5, B6, C2, V6]; xn--lsb457kkut.xn----pfa076bys4a; ; ;  # 㸳ߊ≮.ێß-
+㸳ߊ≮．ێSS-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮．ێSS-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮．ێss-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮．ێss-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮.ێSs-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮.ێSs-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮．ێSs-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+㸳ߊ≮．ێSs-�; 㸳ߊ≮.ێss-�; [B2, B3, B5, B6, C2, P1, V6]; xn--lsb457kkut.xn--ss--qjf2343a; ; xn--lsb457kkut.xn--ss--qjf; [B2, B3, B5, B6, P1, V3, V6] # 㸳ߊ≮.ێss-
+-��𑜧.ᷫ-︒; ; [P1, V3, V5, V6]; xn----b5h1837n2ok9f.xn----mkmw278h; ; ;  # -�𑜧.ᷫ-︒
+-��𑜧.ᷫ-。; -��𑜧.ᷫ-.; [P1, V3, V5, V6]; xn----b5h1837n2ok9f.xn----mkm.; ; ;  # -�𑜧.ᷫ-.
+xn----b5h1837n2ok9f.xn----mkm.; -��𑜧.ᷫ-.; [V3, V5, V6]; xn----b5h1837n2ok9f.xn----mkm.; ; ;  # -�𑜧.ᷫ-.
+xn----b5h1837n2ok9f.xn----mkmw278h; -��𑜧.ᷫ-︒; [V3, V5, V6]; xn----b5h1837n2ok9f.xn----mkmw278h; ; ;  # -�𑜧.ᷫ-︒
+︒.򚠡ᩙ; ; [P1, V6]; xn--y86c.xn--cof61594i; ; ;  # ︒.ᩙ
+。.򚠡ᩙ; ..򚠡ᩙ; [P1, V6, X4_2]; ..xn--cof61594i; [P1, V6, A4_2]; ;  # ..ᩙ
+..xn--cof61594i; ..òš ¡á©™; [V6, X4_2]; ..xn--cof61594i; [V6, A4_2]; ;  # ..á©™
+xn--y86c.xn--cof61594i; ︒.򚠡ᩙ; [V6]; xn--y86c.xn--cof61594i; ; ;  # ︒.ᩙ
+̣ⷡ。‌⓾‌ڹ; ̣ⷡ.‌⓾‌ڹ; [B1, B3, B6, C1, V5]; xn--kta899s.xn--skb970ka771c; ; xn--kta899s.xn--skb116m; [B1, B3, B6, V5] # ̣ⷡ.⓾ڹ
+xn--kta899s.xn--skb116m; ̣ⷡ.⓾ڹ; [B1, B3, B6, V5]; xn--kta899s.xn--skb116m; ; ;  # ̣ⷡ.⓾ڹ
+xn--kta899s.xn--skb970ka771c; ̣ⷡ.‌⓾‌ڹ; [B1, B3, B6, C1, V5]; xn--kta899s.xn--skb970ka771c; ; ;  # ̣ⷡ.⓾ڹ
+𞠶ᠴ�｡�𞤵󠅦; 𞠶ᠴ�.�𞤵; [B1, B2, P1, V5, V6]; xn--tlb199fwl35a.xn--yld4613v; ; ;  # 𞠶ᠴ.�𞤵
+𞠶ᠴ�。�𞤵󠅦; 𞠶ᠴ�.�𞤵; [B1, B2, P1, V5, V6]; xn--tlb199fwl35a.xn--yld4613v; ; ;  # 𞠶ᠴ.�𞤵
+𞠶ᠴ�。�𞤓󠅦; 𞠶ᠴ�.�𞤵; [B1, B2, P1, V5, V6]; xn--tlb199fwl35a.xn--yld4613v; ; ;  # 𞠶ᠴ.�𞤵
+xn--tlb199fwl35a.xn--yld4613v; 𞠶ᠴ�.�𞤵; [B1, B2, V5, V6]; xn--tlb199fwl35a.xn--yld4613v; ; ;  # 𞠶ᠴ.�𞤵
+𞠶ᠴ�｡�𞤓󠅦; 𞠶ᠴ�.�𞤵; [B1, B2, P1, V5, V6]; xn--tlb199fwl35a.xn--yld4613v; ; ;  # 𞠶ᠴ.�𞤵
+𑰺.-�; ; [P1, V3, V5, V6]; xn--jk3d.xn----iz68g; ; ;  # 𑰺.-
+xn--jk3d.xn----iz68g; 𑰺.-�; [V3, V5, V6]; xn--jk3d.xn----iz68g; ; ;  # 𑰺.-
+󠻩．�; 󠻩.�; [P1, V6]; xn--2856e.xn--6o3a; ; ;  # .�
+󠻩.�; ; [P1, V6]; xn--2856e.xn--6o3a; ; ;  # .�
+xn--2856e.xn--6o3a; 󠻩.�; [V6]; xn--2856e.xn--6o3a; ; ;  # .�
+ڰᠡ｡Ⴁ; ڰᠡ.Ⴁ; [B2, B3, P1, V6]; xn--jkb440g.xn--8md; ; ;  # ڰᠡ.Ⴁ
+ڰᠡ。Ⴁ; ڰᠡ.Ⴁ; [B2, B3, P1, V6]; xn--jkb440g.xn--8md; ; ;  # ڰᠡ.Ⴁ
+ڰᠡ。�; ڰᠡ.�; [B2, B3]; xn--jkb440g.xn--skj; ; ;  # ڰᠡ.�
+xn--jkb440g.xn--skj; Ú°á ¡.â´�; [B2, B3]; xn--jkb440g.xn--skj; ; ;  # Ú°á ¡.â´�
+xn--jkb440g.xn--8md; Ú°á ¡.á‚¡; [B2, B3, V6]; xn--jkb440g.xn--8md; ; ;  # Ú°á ¡.á‚¡
+ڰᠡ｡�; ڰᠡ.�; [B2, B3]; xn--jkb440g.xn--skj; ; ;  # ڰᠡ.�
+⃞Ⴊڻς｡-; ⃞Ⴊڻς.-; [B1, P1, V3, V5, V6]; xn--3xa53m7zmb0q.-; ; xn--4xa33m7zmb0q.-;  # ⃞Ⴊڻς.-
+⃞Ⴊڻς。-; ⃞Ⴊڻς.-; [B1, P1, V3, V5, V6]; xn--3xa53m7zmb0q.-; ; xn--4xa33m7zmb0q.-;  # ⃞Ⴊڻς.-
+⃞ⴊڻς。-; ⃞ⴊڻς.-; [B1, V3, V5]; xn--3xa53mr38aeel.-; ; xn--4xa33mr38aeel.-;  # ⃞ⴊڻς.-
+⃞ႪڻΣ。-; ⃞Ⴊڻσ.-; [B1, P1, V3, V5, V6]; xn--4xa33m7zmb0q.-; ; ;  # ⃞Ⴊڻσ.-
+⃞ⴊڻσ。-; ⃞ⴊڻσ.-; [B1, V3, V5]; xn--4xa33mr38aeel.-; ; ;  # ⃞ⴊڻσ.-
+⃞Ⴊڻσ。-; ⃞Ⴊڻσ.-; [B1, P1, V3, V5, V6]; xn--4xa33m7zmb0q.-; ; ;  # ⃞Ⴊڻσ.-
+xn--4xa33m7zmb0q.-; ⃞Ⴊڻσ.-; [B1, V3, V5, V6]; xn--4xa33m7zmb0q.-; ; ;  # ⃞Ⴊڻσ.-
+xn--4xa33mr38aeel.-; ⃞ⴊڻσ.-; [B1, V3, V5]; xn--4xa33mr38aeel.-; ; ;  # ⃞ⴊڻσ.-
+xn--3xa53mr38aeel.-; ⃞ⴊڻς.-; [B1, V3, V5]; xn--3xa53mr38aeel.-; ; ;  # ⃞ⴊڻς.-
+xn--3xa53m7zmb0q.-; ⃞Ⴊڻς.-; [B1, V3, V5, V6]; xn--3xa53m7zmb0q.-; ; ;  # ⃞Ⴊڻς.-
+⃞ⴊڻς｡-; ⃞ⴊڻς.-; [B1, V3, V5]; xn--3xa53mr38aeel.-; ; xn--4xa33mr38aeel.-;  # ⃞ⴊڻς.-
+⃞ႪڻΣ｡-; ⃞Ⴊڻσ.-; [B1, P1, V3, V5, V6]; xn--4xa33m7zmb0q.-; ; ;  # ⃞Ⴊڻσ.-
+⃞ⴊڻσ｡-; ⃞ⴊڻσ.-; [B1, V3, V5]; xn--4xa33mr38aeel.-; ; ;  # ⃞ⴊڻσ.-
+⃞Ⴊڻσ｡-; ⃞Ⴊڻσ.-; [B1, P1, V3, V5, V6]; xn--4xa33m7zmb0q.-; ; ;  # ⃞Ⴊڻσ.-
+Ⴍ．�‌; Ⴍ.�‌; [C1, P1, V6]; xn--lnd.xn--0ug56448b; ; xn--lnd.xn--p01x; [P1, V6] # Ⴍ.
+Ⴍ.�‌; ; [C1, P1, V6]; xn--lnd.xn--0ug56448b; ; xn--lnd.xn--p01x; [P1, V6] # Ⴍ.
+�.�‌; ; [C1, P1, V6]; xn--4kj.xn--0ug56448b; ; xn--4kj.xn--p01x; [P1, V6] # �.
+xn--4kj.xn--p01x; �.�; [V6]; xn--4kj.xn--p01x; ; ;  # �.
+xn--4kj.xn--0ug56448b; �.�‌; [C1, V6]; xn--4kj.xn--0ug56448b; ; ;  # �.
+xn--lnd.xn--p01x; Ⴍ.�; [V6]; xn--lnd.xn--p01x; ; ;  # Ⴍ.
+xn--lnd.xn--0ug56448b; Ⴍ.�‌; [C1, V6]; xn--lnd.xn--0ug56448b; ; ;  # Ⴍ.
+�．�‌; �.�‌; [C1, P1, V6]; xn--4kj.xn--0ug56448b; ; xn--4kj.xn--p01x; [P1, V6] # �.
+򉟂󠵣.�᩠󴺖᭄; ; [B2, B3, B6, P1, V6]; xn--9u37blu98h.xn--jof13bt568cork1j; ; ;  # .�᩠᭄
+xn--9u37blu98h.xn--jof13bt568cork1j; 򉟂󠵣.�᩠󴺖᭄; [B2, B3, B6, V6]; xn--9u37blu98h.xn--jof13bt568cork1j; ; ;  # .�᩠᭄
+≯�ᠯ｡�⺨; ≯�ᠯ.�⺨; [B1, P1, V6]; xn--i7e163ct2d.xn--vwj7372e; ; ;  # ≯�ᠯ.�⺨
+≯�ᠯ｡�⺨; ≯�ᠯ.�⺨; [B1, P1, V6]; xn--i7e163ct2d.xn--vwj7372e; ; ;  # ≯�ᠯ.�⺨
+≯�ᠯ。�⺨; ≯�ᠯ.�⺨; [B1, P1, V6]; xn--i7e163ct2d.xn--vwj7372e; ; ;  # ≯�ᠯ.�⺨
+≯�ᠯ。�⺨; ≯�ᠯ.�⺨; [B1, P1, V6]; xn--i7e163ct2d.xn--vwj7372e; ; ;  # ≯�ᠯ.�⺨
+xn--i7e163ct2d.xn--vwj7372e; ≯�ᠯ.�⺨; [B1, V6]; xn--i7e163ct2d.xn--vwj7372e; ; ;  # ≯�ᠯ.�⺨
+����。Ⴈ�Ⴏ; ����.Ⴈ�Ⴏ; [B5, B6, P1, V6]; xn--fo0de1270ope54j.xn--gndo2033q; ; ;  # ��.Ⴈ�Ⴏ
+����。ⴈ��; ����.ⴈ��; [B5, B6, P1, V6]; xn--fo0de1270ope54j.xn--zkjo0151o; ; ;  # ��.ⴈ��
+xn--fo0de1270ope54j.xn--zkjo0151o; ����.ⴈ��; [B5, B6, V6]; xn--fo0de1270ope54j.xn--zkjo0151o; ; ;  # ��.ⴈ��
+xn--fo0de1270ope54j.xn--gndo2033q; ����.Ⴈ�Ⴏ; [B5, B6, V6]; xn--fo0de1270ope54j.xn--gndo2033q; ; ;  # ��.Ⴈ�Ⴏ
+𞠂。ꤦ; 𞠂.ꤦ; [B1, B3, B6, V5]; xn--145h.xn--ti9a; ; ;  # 𞠂.ꤦ
+xn--145h.xn--ti9a; 𞠂.ꤦ; [B1, B3, B6, V5]; xn--145h.xn--ti9a; ; ;  # 𞠂.ꤦ
+��．့ܳ９ꡇ; 6�.့ܳ9ꡇ; [B1, V5]; xn--6-t26i.xn--9-91c730e8u8n; ; ;  # 6�.့ܳ9ꡇ
+��．့ܳ９ꡇ; 6�.့ܳ9ꡇ; [B1, V5]; xn--6-t26i.xn--9-91c730e8u8n; ; ;  # 6�.့ܳ9ꡇ
+6�.့ܳ9ꡇ; ; [B1, V5]; xn--6-t26i.xn--9-91c730e8u8n; ; ;  # 6�.့ܳ9ꡇ
+xn--6-t26i.xn--9-91c730e8u8n; 6�.့ܳ9ꡇ; [B1, V5]; xn--6-t26i.xn--9-91c730e8u8n; ; ;  # 6�.့ܳ9ꡇ
+ܤ؃𞲶．ۘ; ܤ؃𞲶.ۘ; [B1, B3, B6, P1, V5, V6]; xn--lfb19ct414i.xn--olb; ; ;  # ܤ.ۘ
+ܤ؃𞲶.ۘ; ; [B1, B3, B6, P1, V5, V6]; xn--lfb19ct414i.xn--olb; ; ;  # ܤ.ۘ
+xn--lfb19ct414i.xn--olb; ܤ؃𞲶.ۘ; [B1, B3, B6, V5, V6]; xn--lfb19ct414i.xn--olb; ; ;  # ܤ.ۘ
+✆񱔩ꡋ．ز�𞣴; ✆񱔩ꡋ.ز�𞣴; [B1, C2, P1, V6]; xn--1biv525bcix0d.xn--xgb253k0m73a; ; xn--1biv525bcix0d.xn--xgb6828v; [B1, P1, V6] # ✆ꡋ.ز
+✆񱔩ꡋ.ز�𞣴; ; [B1, C2, P1, V6]; xn--1biv525bcix0d.xn--xgb253k0m73a; ; xn--1biv525bcix0d.xn--xgb6828v; [B1, P1, V6] # ✆ꡋ.ز
+xn--1biv525bcix0d.xn--xgb6828v; ✆񱔩ꡋ.ز𞣴; [B1, V6]; xn--1biv525bcix0d.xn--xgb6828v; ; ;  # ✆ꡋ.ز
+xn--1biv525bcix0d.xn--xgb253k0m73a; ✆񱔩ꡋ.ز�𞣴; [B1, C2, V6]; xn--1biv525bcix0d.xn--xgb253k0m73a; ; ;  # ✆ꡋ.ز
+ࡅ񃾰�-．≠�𑋪; ࡅ񃾰ن-.≠�𑋪; [B1, B2, B3, P1, V3, V6]; xn----qoc64my971s.xn--1ch7585g76o3c; ; ;  # ࡅن-.≠𑋪
+ࡅ񃾰�-．≠�𑋪; ࡅ񃾰ن-.≠�𑋪; [B1, B2, B3, P1, V3, V6]; xn----qoc64my971s.xn--1ch7585g76o3c; ; ;  # ࡅن-.≠𑋪
+ࡅ񃾰ن-.≠�𑋪; ; [B1, B2, B3, P1, V3, V6]; xn----qoc64my971s.xn--1ch7585g76o3c; ; ;  # ࡅن-.≠𑋪
+ࡅ񃾰ن-.≠�𑋪; ࡅ񃾰ن-.≠�𑋪; [B1, B2, B3, P1, V3, V6]; xn----qoc64my971s.xn--1ch7585g76o3c; ; ;  # ࡅن-.≠𑋪
+xn----qoc64my971s.xn--1ch7585g76o3c; ࡅ񃾰ن-.≠�𑋪; [B1, B2, B3, V3, V6]; xn----qoc64my971s.xn--1ch7585g76o3c; ; ;  # ࡅن-.≠𑋪
+�．笠; 3.笠; ; 3.xn--6vz; ; ;  # 3.笠
+�．笠; 3.笠; ; 3.xn--6vz; ; ;  # 3.笠
+3.笠; ; ; 3.xn--6vz; ; ;  # 3.笠
+3.xn--6vz; 3.笠; ; 3.xn--6vz; ; ;  # 3.笠
+-�.Ⴞ�; ; [C2, P1, V3, V6]; xn----ugn.xn--2nd2315j; ; -.xn--2nd2315j; [P1, V3, V6] # -.Ⴞ�
+-�.ⴞ�; ; [C2, V3]; xn----ugn.xn--mlj8559d; ; -.xn--mlj8559d; [V3] # -.ⴞ�
+-.xn--mlj8559d; -.ⴞ�; [V3]; -.xn--mlj8559d; ; ;  # -.ⴞ�
+xn----ugn.xn--mlj8559d; -�.ⴞ�; [C2, V3]; xn----ugn.xn--mlj8559d; ; ;  # -.ⴞ�
+-.xn--2nd2315j; -.Ⴞ�; [V3, V6]; -.xn--2nd2315j; ; ;  # -.Ⴞ�
+xn----ugn.xn--2nd2315j; -�.Ⴞ�; [C2, V3, V6]; xn----ugn.xn--2nd2315j; ; ;  # -.Ⴞ�
+�ςßܱ．�; �ςßܱ.�; [C2, V5]; xn--zca19ln1di19a.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # ςßܱ.�
+�ςßܱ.�; ; [C2, V5]; xn--zca19ln1di19a.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # ςßܱ.�
+�ΣSSܱ.�; �σssܱ.�; [C2, V5]; xn--ss-ubc826ab34b.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σssܱ.�
+�σssܱ.�; ; [C2, V5]; xn--ss-ubc826ab34b.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σssܱ.�
+�Σssܱ.�; �σssܱ.�; [C2, V5]; xn--ss-ubc826ab34b.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σssܱ.�
+xn--ss-ubc826a.xn--xmc; σssܱ.�; [V5]; xn--ss-ubc826a.xn--xmc; ; ;  # σssܱ.�
+xn--ss-ubc826ab34b.xn--xmc; �σssܱ.�; [C2, V5]; xn--ss-ubc826ab34b.xn--xmc; ; ;  # σssܱ.�
+�Σßܱ.�; �σßܱ.�; [C2, V5]; xn--zca39lk1di19a.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σßܱ.�
+�σßܱ.�; ; [C2, V5]; xn--zca39lk1di19a.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σßܱ.�
+xn--zca39lk1di19a.xn--xmc; �σßܱ.�; [C2, V5]; xn--zca39lk1di19a.xn--xmc; ; ;  # σßܱ.�
+xn--zca19ln1di19a.xn--xmc; �ςßܱ.�; [C2, V5]; xn--zca19ln1di19a.xn--xmc; ; ;  # ςßܱ.�
+�ΣSSܱ．�; �σssܱ.�; [C2, V5]; xn--ss-ubc826ab34b.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σssܱ.�
+�σssܱ．�; �σssܱ.�; [C2, V5]; xn--ss-ubc826ab34b.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σssܱ.�
+�Σssܱ．�; �σssܱ.�; [C2, V5]; xn--ss-ubc826ab34b.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σssܱ.�
+�Σßܱ．�; �σßܱ.�; [C2, V5]; xn--zca39lk1di19a.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σßܱ.�
+�σßܱ．�; �σßܱ.�; [C2, V5]; xn--zca39lk1di19a.xn--xmc; ; xn--ss-ubc826a.xn--xmc; [V5] # σßܱ.�
+≠．�; ≠.�; [C2, P1, V6]; xn--1ch.xn--1ug; ; xn--1ch.; [P1, V6] # ≠.
+≠．�; ≠.�; [C2, P1, V6]; xn--1ch.xn--1ug; ; xn--1ch.; [P1, V6] # ≠.
+≠.�; ; [C2, P1, V6]; xn--1ch.xn--1ug; ; xn--1ch.; [P1, V6] # ≠.
+≠.�; ≠.�; [C2, P1, V6]; xn--1ch.xn--1ug; ; xn--1ch.; [P1, V6] # ≠.
+xn--1ch.; ≠.; [V6]; xn--1ch.; ; ;  # ≠.
+xn--1ch.xn--1ug; ≠.�; [C2, V6]; xn--1ch.xn--1ug; ; ;  # ≠.
+�｡�ᠼ▗�; ئح.�ᠼ▗�; [B1, P1, V5, V6]; xn--lgbo.xn--2rc021dcxkrx55t; ; ;  # ئح.�ᠼ▗
+ئح。�ᠼ▗�; ئح.�ᠼ▗�; [B1, P1, V5, V6]; xn--lgbo.xn--2rc021dcxkrx55t; ; ;  # ئح.�ᠼ▗
+ئح。�ᠼ▗�; ئح.�ᠼ▗�; [B1, P1, V5, V6]; xn--lgbo.xn--2rc021dcxkrx55t; ; ;  # ئح.�ᠼ▗
+xn--lgbo.xn--2rc021dcxkrx55t; ئح.�ᠼ▗�; [B1, V5, V6]; xn--lgbo.xn--2rc021dcxkrx55t; ; ;  # ئح.�ᠼ▗
+󧋵�ς．ς�; 󧋵�ς.ς�; [P1, V6]; xn--3xa702av8297a.xn--3xa8055k; ; xn--4xa502av8297a.xn--4xa6055k;  # �ς.ς�
+󧋵�ς.ς�; ; [P1, V6]; xn--3xa702av8297a.xn--3xa8055k; ; xn--4xa502av8297a.xn--4xa6055k;  # �ς.ς�
+󧋵�Σ.Σ�; 󧋵�σ.σ�; [P1, V6]; xn--4xa502av8297a.xn--4xa6055k; ; ;  # �σ.σ�
+󧋵�σ.ς�; ; [P1, V6]; xn--4xa502av8297a.xn--3xa8055k; ; xn--4xa502av8297a.xn--4xa6055k;  # �σ.ς�
+󧋵�σ.σ�; ; [P1, V6]; xn--4xa502av8297a.xn--4xa6055k; ; ;  # �σ.σ�
+󧋵�Σ.σ�; 󧋵�σ.σ�; [P1, V6]; xn--4xa502av8297a.xn--4xa6055k; ; ;  # �σ.σ�
+xn--4xa502av8297a.xn--4xa6055k; 󧋵�σ.σ�; [V6]; xn--4xa502av8297a.xn--4xa6055k; ; ;  # �σ.σ�
+󧋵�Σ.ς�; 󧋵�σ.ς�; [P1, V6]; xn--4xa502av8297a.xn--3xa8055k; ; xn--4xa502av8297a.xn--4xa6055k;  # �σ.ς�
+xn--4xa502av8297a.xn--3xa8055k; 󧋵�σ.ς�; [V6]; xn--4xa502av8297a.xn--3xa8055k; ; ;  # �σ.ς�
+xn--3xa702av8297a.xn--3xa8055k; 󧋵�ς.ς�; [V6]; xn--3xa702av8297a.xn--3xa8055k; ; ;  # �ς.ς�
+󧋵�Σ．Σ�; 󧋵�σ.σ�; [P1, V6]; xn--4xa502av8297a.xn--4xa6055k; ; ;  # �σ.σ�
+󧋵�σ．ς�; 󧋵�σ.ς�; [P1, V6]; xn--4xa502av8297a.xn--3xa8055k; ; xn--4xa502av8297a.xn--4xa6055k;  # �σ.ς�
+󧋵�σ．σ�; 󧋵�σ.σ�; [P1, V6]; xn--4xa502av8297a.xn--4xa6055k; ; ;  # �σ.σ�
+󧋵�Σ．σ�; 󧋵�σ.σ�; [P1, V6]; xn--4xa502av8297a.xn--4xa6055k; ; ;  # �σ.σ�
+󧋵�Σ．ς�; 󧋵�σ.ς�; [P1, V6]; xn--4xa502av8297a.xn--3xa8055k; ; xn--4xa502av8297a.xn--4xa6055k;  # �σ.ς�
+�ߘ牅ࣸ｡𞦤ᨗ�Ⴙ; �ߘ牅ࣸ.𞦤ᨗ�Ⴙ; [B2, B3, P1, V6]; xn--zsb09cu46vjs6f.xn--xnd909bv540bm5k9d; ; ;  # �ߘ牅ࣸ.ᨗႹ
+�ߘ牅ࣸ。𞦤ᨗ�Ⴙ; �ߘ牅ࣸ.𞦤ᨗ�Ⴙ; [B2, B3, P1, V6]; xn--zsb09cu46vjs6f.xn--xnd909bv540bm5k9d; ; ;  # �ߘ牅ࣸ.ᨗႹ
+�ߘ牅ࣸ。𞦤ᨗ�ⴙ; �ߘ牅ࣸ.𞦤ᨗ�ⴙ; [B2, B3, P1, V6]; xn--zsb09cu46vjs6f.xn--gmf469fr883am5r1e; ; ;  # �ߘ牅ࣸ.ᨗⴙ
+xn--zsb09cu46vjs6f.xn--gmf469fr883am5r1e; �ߘ牅ࣸ.𞦤ᨗ�ⴙ; [B2, B3, V6]; xn--zsb09cu46vjs6f.xn--gmf469fr883am5r1e; ; ;  # �ߘ牅ࣸ.ᨗⴙ
+xn--zsb09cu46vjs6f.xn--xnd909bv540bm5k9d; �ߘ牅ࣸ.𞦤ᨗ�Ⴙ; [B2, B3, V6]; xn--zsb09cu46vjs6f.xn--xnd909bv540bm5k9d; ; ;  # �ߘ牅ࣸ.ᨗႹ
+�ߘ牅ࣸ｡𞦤ᨗ�ⴙ; �ߘ牅ࣸ.𞦤ᨗ�ⴙ; [B2, B3, P1, V6]; xn--zsb09cu46vjs6f.xn--gmf469fr883am5r1e; ; ;  # �ߘ牅ࣸ.ᨗⴙ
+񣤒｡륧; 񣤒.륧; [P1, V6]; xn--s264a.xn--pw2b; ; ;  # .륧
+񣤒｡륧; 񣤒.륧; [P1, V6]; xn--s264a.xn--pw2b; ; ;  # .륧
+񣤒。륧; 񣤒.륧; [P1, V6]; xn--s264a.xn--pw2b; ; ;  # .륧
+񣤒。륧; 񣤒.륧; [P1, V6]; xn--s264a.xn--pw2b; ; ;  # .륧
+xn--s264a.xn--pw2b; 񣤒.륧; [V6]; xn--s264a.xn--pw2b; ; ;  # .륧
+��。󉵢; ��.󉵢; [B1, C2, P1, V6]; xn--1ugx205g.xn--8088d; ; xn--vo0d.xn--8088d; [B1, P1, V6] # �.
+xn--vo0d.xn--8088d; �.󉵢; [B1, V6]; xn--vo0d.xn--8088d; ; ;  # �.
+xn--1ugx205g.xn--8088d; ��.󉵢; [B1, C2, V6]; xn--1ugx205g.xn--8088d; ; ;  # �.
+Ⴘۂ𑲭｡-; Ⴘۂ𑲭.-; [B1, B5, B6, P1, V3, V6]; xn--1kb312c139t.-; ; ;  # Ⴘۂ𑲭.-
+Ⴘ�ٔ𑲭｡-; Ⴘۂ𑲭.-; [B1, B5, B6, P1, V3, V6]; xn--1kb312c139t.-; ; ;  # Ⴘۂ𑲭.-
+Ⴘۂ𑲭。-; Ⴘۂ𑲭.-; [B1, B5, B6, P1, V3, V6]; xn--1kb312c139t.-; ; ;  # Ⴘۂ𑲭.-
+Ⴘ�ٔ𑲭。-; Ⴘۂ𑲭.-; [B1, B5, B6, P1, V3, V6]; xn--1kb312c139t.-; ; ;  # Ⴘۂ𑲭.-
+ⴘ�ٔ𑲭。-; ⴘۂ𑲭.-; [B1, B5, B6, V3]; xn--1kb147qfk3n.-; ; ;  # ⴘۂ𑲭.-
+ⴘۂ𑲭。-; ⴘۂ𑲭.-; [B1, B5, B6, V3]; xn--1kb147qfk3n.-; ; ;  # ⴘۂ𑲭.-
+xn--1kb147qfk3n.-; ⴘۂ𑲭.-; [B1, B5, B6, V3]; xn--1kb147qfk3n.-; ; ;  # ⴘۂ𑲭.-
+xn--1kb312c139t.-; Ⴘۂ𑲭.-; [B1, B5, B6, V3, V6]; xn--1kb312c139t.-; ; ;  # Ⴘۂ𑲭.-
+ⴘ�ٔ𑲭｡-; ⴘۂ𑲭.-; [B1, B5, B6, V3]; xn--1kb147qfk3n.-; ; ;  # ⴘۂ𑲭.-
+ⴘۂ𑲭｡-; ⴘۂ𑲭.-; [B1, B5, B6, V3]; xn--1kb147qfk3n.-; ; ;  # ⴘۂ𑲭.-
+꠆ٻ₆�。🛇�; ꠆ٻ6�.🛇يم; [B1, V5]; xn--6-rrc018krt9k.xn--hhbj61429a; ; ;  # ꠆ٻ6�.🛇يم
+꠆ٻ6�。🛇يم; ꠆ٻ6�.🛇يم; [B1, V5]; xn--6-rrc018krt9k.xn--hhbj61429a; ; ;  # ꠆ٻ6�.🛇يم
+xn--6-rrc018krt9k.xn--hhbj61429a; ꠆ٻ6�.🛇يم; [B1, V5]; xn--6-rrc018krt9k.xn--hhbj61429a; ; ;  # ꠆ٻ6�.🛇يم
+�.㇄ᡟ�آ; ; [B1, P1, V6]; xn--p292d.xn--hgb154ghrsvm2r; ; ;  # .㇄ᡟ�آ
+�.㇄ᡟ�آ; �.㇄ᡟ�آ; [B1, P1, V6]; xn--p292d.xn--hgb154ghrsvm2r; ; ;  # .㇄ᡟ�آ
+xn--p292d.xn--hgb154ghrsvm2r; �.㇄ᡟ�آ; [B1, V6]; xn--p292d.xn--hgb154ghrsvm2r; ; ;  # .㇄ᡟ�آ
+ߟ򵚌。-ߩ; ߟ򵚌.-ߩ; [B1, B2, B3, P1, V3, V6]; xn--6sb88139l.xn----pdd; ; ;  # ߟ.-ߩ
+xn--6sb88139l.xn----pdd; ߟ򵚌.-ߩ; [B1, B2, B3, V3, V6]; xn--6sb88139l.xn----pdd; ; ;  # ߟ.-ߩ
+ςك⾑．‌ᢟ‌⒈; ςك襾.‌ᢟ‌⒈; [B1, B5, C1, P1, V6]; xn--3xa69jux8r.xn--pbf519aba607b; ; xn--4xa49jux8r.xn--pbf212d; [B5, P1, V6] # ςك襾.ᢟ⒈
+ςك襾.‌ᢟ‌1.; ; [B1, B5, C1]; xn--3xa69jux8r.xn--1-4ck691bba.; ; xn--4xa49jux8r.xn--1-4ck.; [B5] # ςك襾.ᢟ1.
+Σك襾.‌ᢟ‌1.; σك襾.‌ᢟ‌1.; [B1, B5, C1]; xn--4xa49jux8r.xn--1-4ck691bba.; ; xn--4xa49jux8r.xn--1-4ck.; [B5] # σك襾.ᢟ1.
+σك襾.‌ᢟ‌1.; ; [B1, B5, C1]; xn--4xa49jux8r.xn--1-4ck691bba.; ; xn--4xa49jux8r.xn--1-4ck.; [B5] # σك襾.ᢟ1.
+xn--4xa49jux8r.xn--1-4ck.; σك襾.ᢟ1.; [B5]; xn--4xa49jux8r.xn--1-4ck.; ; ;  # σك襾.ᢟ1.
+xn--4xa49jux8r.xn--1-4ck691bba.; σك襾.‌ᢟ‌1.; [B1, B5, C1]; xn--4xa49jux8r.xn--1-4ck691bba.; ; ;  # σك襾.ᢟ1.
+xn--3xa69jux8r.xn--1-4ck691bba.; ςك襾.‌ᢟ‌1.; [B1, B5, C1]; xn--3xa69jux8r.xn--1-4ck691bba.; ; ;  # ςك襾.ᢟ1.
+Σك⾑．‌ᢟ‌⒈; σك襾.‌ᢟ‌⒈; [B1, B5, C1, P1, V6]; xn--4xa49jux8r.xn--pbf519aba607b; ; xn--4xa49jux8r.xn--pbf212d; [B5, P1, V6] # σك襾.ᢟ⒈
+σك⾑．‌ᢟ‌⒈; σك襾.‌ᢟ‌⒈; [B1, B5, C1, P1, V6]; xn--4xa49jux8r.xn--pbf519aba607b; ; xn--4xa49jux8r.xn--pbf212d; [B5, P1, V6] # σك襾.ᢟ⒈
+xn--4xa49jux8r.xn--pbf212d; σك襾.ᢟ⒈; [B5, V6]; xn--4xa49jux8r.xn--pbf212d; ; ;  # σك襾.ᢟ⒈
+xn--4xa49jux8r.xn--pbf519aba607b; σك襾.‌ᢟ‌⒈; [B1, B5, C1, V6]; xn--4xa49jux8r.xn--pbf519aba607b; ; ;  # σك襾.ᢟ⒈
+xn--3xa69jux8r.xn--pbf519aba607b; ςك襾.‌ᢟ‌⒈; [B1, B5, C1, V6]; xn--3xa69jux8r.xn--pbf519aba607b; ; ;  # ςك襾.ᢟ⒈
+ᡆ�．𞵆; ᡆ�.𞵆; [P1, V6]; xn--57e0440k.xn--k86h; ; ;  # ᡆ.
+ᡆ�.𞵆; ; [P1, V6]; xn--57e0440k.xn--k86h; ; ;  # ᡆ.
+xn--57e0440k.xn--k86h; ᡆ�.𞵆; [V6]; xn--57e0440k.xn--k86h; ; ;  # ᡆ.
+��ᷮ｡‌ࢽ�; ��ᷮ.‌ࢽ�; [B1, C1, P1, V5, V6]; xn--ybc461hph93b.xn--jzb740j1y45h; ; xn--ybc461hph93b.xn--jzb29857e; [B1, B2, B3, P1, V5, V6] # ��ᷮ.ࢽ
+��ᷮ。‌ࢽ�; ��ᷮ.‌ࢽ�; [B1, C1, P1, V5, V6]; xn--ybc461hph93b.xn--jzb740j1y45h; ; xn--ybc461hph93b.xn--jzb29857e; [B1, B2, B3, P1, V5, V6] # ��ᷮ.ࢽ
+xn--ybc461hph93b.xn--jzb29857e; ��ᷮ.ࢽ�; [B1, B2, B3, V5, V6]; xn--ybc461hph93b.xn--jzb29857e; ; ;  # ��ᷮ.ࢽ
+xn--ybc461hph93b.xn--jzb740j1y45h; ��ᷮ.‌ࢽ�; [B1, C1, V5, V6]; xn--ybc461hph93b.xn--jzb740j1y45h; ; ;  # ��ᷮ.ࢽ
+خ݈񅪪-．‌먿; خ݈񅪪-.‌먿; [B1, B2, B3, C1, P1, V3, V6]; xn----dnc06f42153a.xn--0ug1581d; ; xn----dnc06f42153a.xn--v22b; [B2, B3, P1, V3, V6] # خ݈-.먿
+خ݈񅪪-．‌먿; خ݈񅪪-.‌먿; [B1, B2, B3, C1, P1, V3, V6]; xn----dnc06f42153a.xn--0ug1581d; ; xn----dnc06f42153a.xn--v22b; [B2, B3, P1, V3, V6] # خ݈-.먿
+خ݈񅪪-.‌먿; ; [B1, B2, B3, C1, P1, V3, V6]; xn----dnc06f42153a.xn--0ug1581d; ; xn----dnc06f42153a.xn--v22b; [B2, B3, P1, V3, V6] # خ݈-.먿
+خ݈񅪪-.‌먿; خ݈񅪪-.‌먿; [B1, B2, B3, C1, P1, V3, V6]; xn----dnc06f42153a.xn--0ug1581d; ; xn----dnc06f42153a.xn--v22b; [B2, B3, P1, V3, V6] # خ݈-.먿
+xn----dnc06f42153a.xn--v22b; خ݈񅪪-.먿; [B2, B3, V3, V6]; xn----dnc06f42153a.xn--v22b; ; ;  # خ݈-.먿
+xn----dnc06f42153a.xn--0ug1581d; خ݈񅪪-.‌먿; [B1, B2, B3, C1, V3, V6]; xn----dnc06f42153a.xn--0ug1581d; ; ;  # خ݈-.먿
+􋿦｡ᠽ; 􋿦.ᠽ; [P1, V6]; xn--j890g.xn--w7e; ; ;  # .ᠽ
+􋿦。ᠽ; 􋿦.ᠽ; [P1, V6]; xn--j890g.xn--w7e; ; ;  # .ᠽ
+xn--j890g.xn--w7e; 􋿦.ᠽ; [V6]; xn--j890g.xn--w7e; ; ;  # .ᠽ
+嬃�．�ୄ; 嬃�.�ୄ; [C2]; xn--b6s0078f.xn--0ic557h; ; xn--b6s0078f.xn--0ic; [V5] # 嬃�.ୄ
+嬃�.�ୄ; ; [C2]; xn--b6s0078f.xn--0ic557h; ; xn--b6s0078f.xn--0ic; [V5] # 嬃�.ୄ
+xn--b6s0078f.xn--0ic; 嬃�.ୄ; [V5]; xn--b6s0078f.xn--0ic; ; ;  # 嬃�.ୄ
+xn--b6s0078f.xn--0ic557h; 嬃�.�ୄ; [C2]; xn--b6s0078f.xn--0ic557h; ; ;  # 嬃�.ୄ
+؂�≯．𚋲�; ؂�≯.𚋲�; [B1, P1, V6]; xn--kfb866llx01a.xn--wp1gm3570b; ; ;  # �≯.
+؂�≯．𚋲�; ؂�≯.𚋲�; [B1, P1, V6]; xn--kfb866llx01a.xn--wp1gm3570b; ; ;  # �≯.
+؂�≯.𚋲�; ; [B1, P1, V6]; xn--kfb866llx01a.xn--wp1gm3570b; ; ;  # �≯.
+؂�≯.𚋲�; ؂�≯.𚋲�; [B1, P1, V6]; xn--kfb866llx01a.xn--wp1gm3570b; ; ;  # �≯.
+xn--kfb866llx01a.xn--wp1gm3570b; ؂�≯.𚋲�; [B1, V6]; xn--kfb866llx01a.xn--wp1gm3570b; ; ;  # �≯.
+򫾥ࢷ៌꧀.𞼠; ; [B5, P1, V6]; xn--dzb638ewm4i1iy1h.xn--3m7h; ; ;  # ࢷ៌꧀.
+xn--dzb638ewm4i1iy1h.xn--3m7h; 򫾥ࢷ៌꧀.𞼠; [B5, V6]; xn--dzb638ewm4i1iy1h.xn--3m7h; ; ;  # ࢷ៌꧀.
+‌.񟛤; ; [C1, P1, V6]; xn--0ug.xn--q823a; ; .xn--q823a; [P1, V6, A4_2] # .
+.xn--q823a; .񟛤; [V6, X4_2]; .xn--q823a; [V6, A4_2]; ;  # .
+xn--0ug.xn--q823a; ‌.񟛤; [C1, V6]; xn--0ug.xn--q823a; ; ;  # .
+򺛕Ⴃ䠅．�; 򺛕Ⴃ䠅.�; [P1, V6]; xn--bnd074zr557n.xn--yl0d; ; ;  # Ⴃ䠅.
+򺛕Ⴃ䠅.�; ; [P1, V6]; xn--bnd074zr557n.xn--yl0d; ; ;  # Ⴃ䠅.
+򺛕ⴃ䠅.�; ; [P1, V6]; xn--ukju77frl47r.xn--yl0d; ; ;  # ⴃ䠅.
+xn--ukju77frl47r.xn--yl0d; 򺛕ⴃ䠅.�; [V6]; xn--ukju77frl47r.xn--yl0d; ; ;  # ⴃ䠅.
+xn--bnd074zr557n.xn--yl0d; 򺛕Ⴃ䠅.�; [V6]; xn--bnd074zr557n.xn--yl0d; ; ;  # Ⴃ䠅.
+򺛕ⴃ䠅．�; 򺛕ⴃ䠅.�; [P1, V6]; xn--ukju77frl47r.xn--yl0d; ; ;  # ⴃ䠅.
+ᯱ��𞤚｡�Ⴅ; ᯱ��𞤼.6Ⴅ; [B1, P1, V5, V6]; xn--zzfy954hga2415t.xn--6-h0g; ; ;  # ᯱ��𞤼.6Ⴅ
+ᯱ��𞤚。6Ⴅ; ᯱ��𞤼.6Ⴅ; [B1, P1, V5, V6]; xn--zzfy954hga2415t.xn--6-h0g; ; ;  # ᯱ��𞤼.6Ⴅ
+ᯱ��𞤼。6ⴅ; ᯱ��𞤼.6ⴅ; [B1, V5]; xn--zzfy954hga2415t.xn--6-kvs; ; ;  # ᯱ��𞤼.6ⴅ
+ᯱ��𞤚。6ⴅ; ᯱ��𞤼.6ⴅ; [B1, V5]; xn--zzfy954hga2415t.xn--6-kvs; ; ;  # ᯱ��𞤼.6ⴅ
+xn--zzfy954hga2415t.xn--6-kvs; ᯱ��𞤼.6ⴅ; [B1, V5]; xn--zzfy954hga2415t.xn--6-kvs; ; ;  # ᯱ��𞤼.6ⴅ
+xn--zzfy954hga2415t.xn--6-h0g; ᯱ��𞤼.6Ⴅ; [B1, V5, V6]; xn--zzfy954hga2415t.xn--6-h0g; ; ;  # ᯱ��𞤼.6Ⴅ
+ᯱ��𞤼｡�ⴅ; ᯱ��𞤼.6ⴅ; [B1, V5]; xn--zzfy954hga2415t.xn--6-kvs; ; ;  # ᯱ��𞤼.6ⴅ
+ᯱ��𞤚｡�ⴅ; ᯱ��𞤼.6ⴅ; [B1, V5]; xn--zzfy954hga2415t.xn--6-kvs; ; ;  # ᯱ��𞤼.6ⴅ
+-｡︒; -.︒; [P1, V3, V6]; -.xn--y86c; ; ;  # -.︒
+-。。; -..; [V3, X4_2]; ; [V3, A4_2]; ;  # -..
+-..; ; [V3, X4_2]; ; [V3, A4_2]; ;  # -..
+-.xn--y86c; -.︒; [V3, V6]; -.xn--y86c; ; ;  # -.︒
+ߛჀ｡-�--; ߛჀ.-5--; [B1, B2, B3, P1, V2, V3, V6]; xn--2sb866b.-5--; ; ;  # ߛჀ.-5--
+ߛჀ。-5--; ߛჀ.-5--; [B1, B2, B3, P1, V2, V3, V6]; xn--2sb866b.-5--; ; ;  # ߛჀ.-5--
+ߛⴠ。-5--; ߛⴠ.-5--; [B1, B2, B3, V2, V3]; xn--2sb691q.-5--; ; ;  # ߛⴠ.-5--
+xn--2sb691q.-5--; ߛⴠ.-5--; [B1, B2, B3, V2, V3]; xn--2sb691q.-5--; ; ;  # ߛⴠ.-5--
+xn--2sb866b.-5--; ߛჀ.-5--; [B1, B2, B3, V2, V3, V6]; xn--2sb866b.-5--; ; ;  # ߛჀ.-5--
+ߛⴠ｡-�--; ߛⴠ.-5--; [B1, B2, B3, V2, V3]; xn--2sb691q.-5--; ; ;  # ߛⴠ.-5--
+≯?󠑕｡��≯�; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕｡��≯�; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕。��≯�; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕。��≯�; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕.xn--hdh8283gdoaqa; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕.xn--hdh8283gdoaqa; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕.XN--HDH8283GDOAQA; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕.XN--HDH8283GDOAQA; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕.Xn--Hdh8283gdoaqa; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+≯?󠑕.Xn--Hdh8283gdoaqa; ≯?󠑕.��≯�; [B1, P1, V6]; ≯?󠑕.xn--hdh8283gdoaqa; [B1, P1, V6, A3]; ;  # ≯.��≯
+�ࣦݼ�。͆��؄; ルーブルࣦݼ�.͆��؄; [B1, B5, B6, C2, P1, V5, V6]; xn--dqb73ec22c9kp8cb1j.xn--kua81ls548d3608b; ; xn--dqb73el09fncab4h.xn--kua81ls548d3608b; [B1, B5, B6, P1, V5, V6] # ルーブルࣦݼ.͆
+ルーブルࣦݼ�。͆��؄; ルーブルࣦݼ�.͆��؄; [B1, B5, B6, C2, P1, V5, V6]; xn--dqb73ec22c9kp8cb1j.xn--kua81ls548d3608b; ; xn--dqb73el09fncab4h.xn--kua81ls548d3608b; [B1, B5, B6, P1, V5, V6] # ルーブルࣦݼ.͆
+ルーブルࣦݼ�。͆��؄; ルーブルࣦݼ�.͆��؄; [B1, B5, B6, C2, P1, V5, V6]; xn--dqb73ec22c9kp8cb1j.xn--kua81ls548d3608b; ; xn--dqb73el09fncab4h.xn--kua81ls548d3608b; [B1, B5, B6, P1, V5, V6] # ルーブルࣦݼ.͆
+xn--dqb73el09fncab4h.xn--kua81ls548d3608b; ルーブルࣦݼ.͆��؄; [B1, B5, B6, V5, V6]; xn--dqb73el09fncab4h.xn--kua81ls548d3608b; ; ;  # ルーブルࣦݼ.͆
+xn--dqb73ec22c9kp8cb1j.xn--kua81ls548d3608b; ルーブルࣦݼ�.͆��؄; [B1, B5, B6, C2, V5, V6]; xn--dqb73ec22c9kp8cb1j.xn--kua81ls548d3608b; ; ;  # ルーブルࣦݼ.͆
+�.F; �.f; [C2]; xn--1ug.f; ; .f; [A4_2] # .f
+�.f; ; [C2]; xn--1ug.f; ; .f; [A4_2] # .f
+.f; ; [X4_2]; ; [A4_2]; ;  # .f
+xn--1ug.f; �.f; [C2]; xn--1ug.f; ; ;  # .f
+f; ; ; ; ; ;  # f
+�㨲｡ß; �㨲.ß; [C2]; xn--1ug914h.xn--zca; ; xn--9bm.ss; [] # 㨲.ß
+�㨲。ß; �㨲.ß; [C2]; xn--1ug914h.xn--zca; ; xn--9bm.ss; [] # 㨲.ß
+�㨲。SS; �㨲.ss; [C2]; xn--1ug914h.ss; ; xn--9bm.ss; [] # 㨲.ss
+�㨲。ss; �㨲.ss; [C2]; xn--1ug914h.ss; ; xn--9bm.ss; [] # 㨲.ss
+�㨲。Ss; �㨲.ss; [C2]; xn--1ug914h.ss; ; xn--9bm.ss; [] # 㨲.ss
+xn--9bm.ss; 㨲.ss; ; xn--9bm.ss; ; ;  # 㨲.ss
+㨲.ss; ; ; xn--9bm.ss; ; ;  # 㨲.ss
+㨲.SS; 㨲.ss; ; xn--9bm.ss; ; ;  # 㨲.ss
+㨲.Ss; 㨲.ss; ; xn--9bm.ss; ; ;  # 㨲.ss
+xn--1ug914h.ss; �㨲.ss; [C2]; xn--1ug914h.ss; ; ;  # 㨲.ss
+xn--1ug914h.xn--zca; �㨲.ß; [C2]; xn--1ug914h.xn--zca; ; ;  # 㨲.ß
+�㨲｡SS; �㨲.ss; [C2]; xn--1ug914h.ss; ; xn--9bm.ss; [] # 㨲.ss
+�㨲｡ss; �㨲.ss; [C2]; xn--1ug914h.ss; ; xn--9bm.ss; [] # 㨲.ss
+�㨲｡Ss; �㨲.ss; [C2]; xn--1ug914h.ss; ; xn--9bm.ss; [] # 㨲.ss
+؅پ｡ࢨ; ؅پ.ࢨ; [B1, P1, V6]; xn--nfb6v.xn--xyb; ; ;  # پ.ࢨ
+؅پ。ࢨ; ؅پ.ࢨ; [B1, P1, V6]; xn--nfb6v.xn--xyb; ; ;  # پ.ࢨ
+xn--nfb6v.xn--xyb; ؅پ.ࢨ; [B1, V6]; xn--nfb6v.xn--xyb; ; ;  # پ.ࢨ
+⾑ݓ�。�ڂ; 襾ݓ𞤣.�ڂ; [B1, B5, B6]; xn--6ob9577deqwl.xn--7ib5526k; ; ;  # 襾ݓ𞤣.�ڂ
+襾ݓ�。�ڂ; 襾ݓ𞤣.�ڂ; [B1, B5, B6]; xn--6ob9577deqwl.xn--7ib5526k; ; ;  # 襾ݓ𞤣.�ڂ
+襾ݓ𞤣。�ڂ; 襾ݓ𞤣.�ڂ; [B1, B5, B6]; xn--6ob9577deqwl.xn--7ib5526k; ; ;  # 襾ݓ𞤣.�ڂ
+xn--6ob9577deqwl.xn--7ib5526k; 襾ݓ𞤣.�ڂ; [B1, B5, B6]; xn--6ob9577deqwl.xn--7ib5526k; ; ;  # 襾ݓ𞤣.�ڂ
+⾑ݓ𞤣。�ڂ; 襾ݓ𞤣.�ڂ; [B1, B5, B6]; xn--6ob9577deqwl.xn--7ib5526k; ; ;  # 襾ݓ𞤣.�ڂ
+񦴻ς-⃫｡ݔ-ꡛ; 񦴻ς-⃫.ݔ-ꡛ; [B2, B3, B6, P1, V6]; xn----xmb015tuo34l.xn----53c4874j; ; xn----zmb705tuo34l.xn----53c4874j;  # ς-⃫.ݔ-ꡛ
+񦴻ς-⃫。ݔ-ꡛ; 񦴻ς-⃫.ݔ-ꡛ; [B2, B3, B6, P1, V6]; xn----xmb015tuo34l.xn----53c4874j; ; xn----zmb705tuo34l.xn----53c4874j;  # ς-⃫.ݔ-ꡛ
+񦴻Σ-⃫。ݔ-ꡛ; 񦴻σ-⃫.ݔ-ꡛ; [B2, B3, B6, P1, V6]; xn----zmb705tuo34l.xn----53c4874j; ; ;  # σ-⃫.ݔ-ꡛ
+񦴻σ-⃫。ݔ-ꡛ; 񦴻σ-⃫.ݔ-ꡛ; [B2, B3, B6, P1, V6]; xn----zmb705tuo34l.xn----53c4874j; ; ;  # σ-⃫.ݔ-ꡛ
+xn----zmb705tuo34l.xn----53c4874j; 񦴻σ-⃫.ݔ-ꡛ; [B2, B3, B6, V6]; xn----zmb705tuo34l.xn----53c4874j; ; ;  # σ-⃫.ݔ-ꡛ
+xn----xmb015tuo34l.xn----53c4874j; 񦴻ς-⃫.ݔ-ꡛ; [B2, B3, B6, V6]; xn----xmb015tuo34l.xn----53c4874j; ; ;  # ς-⃫.ݔ-ꡛ
+񦴻Σ-⃫｡ݔ-ꡛ; 񦴻σ-⃫.ݔ-ꡛ; [B2, B3, B6, P1, V6]; xn----zmb705tuo34l.xn----53c4874j; ; ;  # σ-⃫.ݔ-ꡛ
+񦴻σ-⃫｡ݔ-ꡛ; 񦴻σ-⃫.ݔ-ꡛ; [B2, B3, B6, P1, V6]; xn----zmb705tuo34l.xn----53c4874j; ; ;  # σ-⃫.ݔ-ꡛ
+�．􀸨; �.􀸨; [C2, P1, V6]; xn--1ug.xn--h327f; ; .xn--h327f; [P1, V6, A4_2] # .
+�.􀸨; ; [C2, P1, V6]; xn--1ug.xn--h327f; ; .xn--h327f; [P1, V6, A4_2] # .
+.xn--h327f; .􀸨; [V6, X4_2]; .xn--h327f; [V6, A4_2]; ;  # .
+xn--1ug.xn--h327f; �.􀸨; [C2, V6]; xn--1ug.xn--h327f; ; ;  # .
+񣭻�｡≠�; 񣭻�.≠6; [P1, V6]; xn--h79w4z99a.xn--6-tfo; ; ;  # .≠6
+񣭻�｡≠�; 񣭻�.≠6; [P1, V6]; xn--h79w4z99a.xn--6-tfo; ; ;  # .≠6
+񣭻�。≠6; 񣭻�.≠6; [P1, V6]; xn--h79w4z99a.xn--6-tfo; ; ;  # .≠6
+񣭻�。≠6; 񣭻�.≠6; [P1, V6]; xn--h79w4z99a.xn--6-tfo; ; ;  # .≠6
+xn--h79w4z99a.xn--6-tfo; 񣭻�.≠6; [V6]; xn--h79w4z99a.xn--6-tfo; ; ;  # .≠6
+󠅊ᡭ�.�; ᡭ�.�; [B6, C2, P1, V6]; xn--98e810b.xn--om9c; ; xn--98e.xn--om9c; [P1, V6] # ᡭ.
+xn--98e.xn--om9c; ᡭ.�; [V6]; xn--98e.xn--om9c; ; ;  # ᡭ.
+xn--98e810b.xn--om9c; ᡭ�.�; [B6, C2, V6]; xn--98e810b.xn--om9c; ; ;  # ᡭ.
+ీࡕ�𑄴．󭰵; ీࡕ�𑄴.󭰵; [B1, P1, V5, V6]; xn--kwb91r5112avtg.xn--o580f; ; ;  # ీࡕ𑄴.
+ీࡕ�𑄴.󭰵; ; [B1, P1, V5, V6]; xn--kwb91r5112avtg.xn--o580f; ; ;  # ీࡕ𑄴.
+xn--kwb91r5112avtg.xn--o580f; ీࡕ�𑄴.󭰵; [B1, V5, V6]; xn--kwb91r5112avtg.xn--o580f; ; ;  # ీࡕ𑄴.
+𞤮。𑇊‌≯᳦; 𞤮.𑇊‌≯᳦; [B1, C1, P1, V5, V6]; xn--me6h.xn--z6f16kn9b2642b; ; xn--me6h.xn--z6fz8ueq2v; [B1, P1, V5, V6] # 𞤮.𑇊≯᳦
+𞤮。𑇊‌≯᳦; 𞤮.𑇊‌≯᳦; [B1, C1, P1, V5, V6]; xn--me6h.xn--z6f16kn9b2642b; ; xn--me6h.xn--z6fz8ueq2v; [B1, P1, V5, V6] # 𞤮.𑇊≯᳦
+𞤌。𑇊‌≯᳦; 𞤮.𑇊‌≯᳦; [B1, C1, P1, V5, V6]; xn--me6h.xn--z6f16kn9b2642b; ; xn--me6h.xn--z6fz8ueq2v; [B1, P1, V5, V6] # 𞤮.𑇊≯᳦
+𞤌。𑇊‌≯᳦; 𞤮.𑇊‌≯᳦; [B1, C1, P1, V5, V6]; xn--me6h.xn--z6f16kn9b2642b; ; xn--me6h.xn--z6fz8ueq2v; [B1, P1, V5, V6] # 𞤮.𑇊≯᳦
+xn--me6h.xn--z6fz8ueq2v; 𞤮.𑇊≯᳦; [B1, V5, V6]; xn--me6h.xn--z6fz8ueq2v; ; ;  # 𞤮.𑇊≯᳦
+xn--me6h.xn--z6f16kn9b2642b; 𞤮.𑇊‌≯᳦; [B1, C1, V5, V6]; xn--me6h.xn--z6f16kn9b2642b; ; ;  # 𞤮.𑇊≯᳦
+󠄀�.𞤌񛗓Ⴉ; 7.𞤮񛗓Ⴉ; [B1, B2, B3, P1, V6]; 7.xn--hnd3403vv1vv; ; ;  # 7.𞤮Ⴉ
+󠄀7.𞤌񛗓Ⴉ; 7.𞤮񛗓Ⴉ; [B1, B2, B3, P1, V6]; 7.xn--hnd3403vv1vv; ; ;  # 7.𞤮Ⴉ
+󠄀7.𞤮񛗓ⴉ; 7.𞤮񛗓ⴉ; [B1, B2, B3, P1, V6]; 7.xn--0kjz523lv1vv; ; ;  # 7.𞤮ⴉ
+7.xn--0kjz523lv1vv; 7.𞤮񛗓ⴉ; [B1, B2, B3, V6]; 7.xn--0kjz523lv1vv; ; ;  # 7.𞤮ⴉ
+7.xn--hnd3403vv1vv; 7.𞤮񛗓Ⴉ; [B1, B2, B3, V6]; 7.xn--hnd3403vv1vv; ; ;  # 7.𞤮Ⴉ
+󠄀�.𞤮񛗓ⴉ; 7.𞤮񛗓ⴉ; [B1, B2, B3, P1, V6]; 7.xn--0kjz523lv1vv; ; ;  # 7.𞤮ⴉ
+󠄀7.𞤌񛗓ⴉ; 7.𞤮񛗓ⴉ; [B1, B2, B3, P1, V6]; 7.xn--0kjz523lv1vv; ; ;  # 7.𞤮ⴉ
+󠄀�.𞤌񛗓ⴉ; 7.𞤮񛗓ⴉ; [B1, B2, B3, P1, V6]; 7.xn--0kjz523lv1vv; ; ;  # 7.𞤮ⴉ
+閃9�。Ↄ٩ࢱ�; 閃9�.Ↄ٩ࢱ�; [B5, B6, P1, V6]; xn--9-3j6dk517f.xn--iib28ij3c0t9a; ; ;  # 閃9�.Ↄ٩ࢱ�
+閃9�。ↄ٩ࢱ�; 閃9�.ↄ٩ࢱ�; [B5, B6]; xn--9-3j6dk517f.xn--iib28ij3c4t9a; ; ;  # 閃9�.ↄ٩ࢱ�
+xn--9-3j6dk517f.xn--iib28ij3c4t9a; 閃9�.ↄ٩ࢱ�; [B5, B6]; xn--9-3j6dk517f.xn--iib28ij3c4t9a; ; ;  # 閃9�.ↄ٩ࢱ�
+xn--9-3j6dk517f.xn--iib28ij3c0t9a; 閃9�.Ↄ٩ࢱ�; [B5, B6, V6]; xn--9-3j6dk517f.xn--iib28ij3c0t9a; ; ;  # 閃9�.Ↄ٩ࢱ�
+꫶�ฺ２.�݅ྟ︒; ꫶�ฺ2.�݅ྟ︒; [P1, V5, V6]; xn--2-2zf840fk16m.xn--sob093bj62sz9d; ; ;  # ꫶�ฺ2.�݅ྟ︒
+꫶�ฺ2.�݅ྟ。; ꫶�ฺ2.�݅ྟ.; [V5]; xn--2-2zf840fk16m.xn--sob093b2m7s.; ; ;  # ꫶�ฺ2.�݅ྟ.
+xn--2-2zf840fk16m.xn--sob093b2m7s.; ꫶�ฺ2.�݅ྟ.; [V5]; xn--2-2zf840fk16m.xn--sob093b2m7s.; ; ;  # ꫶�ฺ2.�݅ྟ.
+xn--2-2zf840fk16m.xn--sob093bj62sz9d; ꫶�ฺ2.�݅ྟ︒; [V5, V6]; xn--2-2zf840fk16m.xn--sob093bj62sz9d; ; ;  # ꫶�ฺ2.�݅ྟ︒
+󅴧｡≠-󠙄⾛; 󅴧.≠-󠙄走; [P1, V6]; xn--gm57d.xn----tfo4949b3664m; ; ;  # .≠-走
+󅴧｡≠-󠙄⾛; 󅴧.≠-󠙄走; [P1, V6]; xn--gm57d.xn----tfo4949b3664m; ; ;  # .≠-走
+󅴧。≠-󠙄走; 󅴧.≠-󠙄走; [P1, V6]; xn--gm57d.xn----tfo4949b3664m; ; ;  # .≠-走
+󅴧。≠-󠙄走; 󅴧.≠-󠙄走; [P1, V6]; xn--gm57d.xn----tfo4949b3664m; ; ;  # .≠-走
+xn--gm57d.xn----tfo4949b3664m; 󅴧.≠-󠙄走; [V6]; xn--gm57d.xn----tfo4949b3664m; ; ;  # .≠-走
+ݮ؄Ⴊ。-≠ᅠ; ݮ؄Ⴊ.-≠ᅠ; [B1, B2, B3, P1, V3, V6]; xn--mfb73ex6r.xn----5bh589i; ; ;  # ݮႪ.-≠
+ݮ؄Ⴊ。-≠ᅠ; ݮ؄Ⴊ.-≠ᅠ; [B1, B2, B3, P1, V3, V6]; xn--mfb73ex6r.xn----5bh589i; ; ;  # ݮႪ.-≠
+ݮ؄ⴊ。-≠ᅠ; ݮ؄ⴊ.-≠ᅠ; [B1, B2, B3, P1, V3, V6]; xn--mfb73ek93f.xn----5bh589i; ; ;  # ݮⴊ.-≠
+ݮ؄ⴊ。-≠ᅠ; ݮ؄ⴊ.-≠ᅠ; [B1, B2, B3, P1, V3, V6]; xn--mfb73ek93f.xn----5bh589i; ; ;  # ݮⴊ.-≠
+xn--mfb73ek93f.xn----5bh589i; ݮ؄ⴊ.-≠ᅠ; [B1, B2, B3, V3, V6]; xn--mfb73ek93f.xn----5bh589i; ; ;  # ݮⴊ.-≠
+xn--mfb73ex6r.xn----5bh589i; ݮ؄Ⴊ.-≠ᅠ; [B1, B2, B3, V3, V6]; xn--mfb73ex6r.xn----5bh589i; ; ;  # ݮႪ.-≠
+���≯｡‌; �ל�4≯.‌; [B1, B3, B4, C1, P1, V6]; xn--4-zhc0by36txt0w.xn--0ug; ; xn--4-zhc0by36txt0w.; [B3, B4, P1, V6] # �ל�4≯.
+���≯｡‌; �ל�4≯.‌; [B1, B3, B4, C1, P1, V6]; xn--4-zhc0by36txt0w.xn--0ug; ; xn--4-zhc0by36txt0w.; [B3, B4, P1, V6] # �ל�4≯.
+�ל�4≯。‌; �ל�4≯.‌; [B1, B3, B4, C1, P1, V6]; xn--4-zhc0by36txt0w.xn--0ug; ; xn--4-zhc0by36txt0w.; [B3, B4, P1, V6] # �ל�4≯.
+�ל�4≯。‌; �ל�4≯.‌; [B1, B3, B4, C1, P1, V6]; xn--4-zhc0by36txt0w.xn--0ug; ; xn--4-zhc0by36txt0w.; [B3, B4, P1, V6] # �ל�4≯.
+xn--4-zhc0by36txt0w.; �ל�4≯.; [B3, B4, V6]; xn--4-zhc0by36txt0w.; ; ;  # �ל�4≯.
+xn--4-zhc0by36txt0w.xn--0ug; �ל�4≯.‌; [B1, B3, B4, C1, V6]; xn--4-zhc0by36txt0w.xn--0ug; ; ;  # �ל�4≯.
+�。甯; 0.甯; ; 0.xn--qny; ; ;  # 0.甯
+0。甯; 0.甯; ; 0.xn--qny; ; ;  # 0.甯
+0.xn--qny; 0.甯; ; 0.xn--qny; ; ;  # 0.甯
+0.甯; ; ; 0.xn--qny; ; ;  # 0.甯
+-⾆．꫶; -舌.꫶; [V3, V5]; xn----ef8c.xn--2v9a; ; ;  # -舌.꫶
+-舌.꫶; ; [V3, V5]; xn----ef8c.xn--2v9a; ; ;  # -舌.꫶
+xn----ef8c.xn--2v9a; -舌.꫶; [V3, V5]; xn----ef8c.xn--2v9a; ; ;  # -舌.꫶
+-｡ᢘ; -.ᢘ; [V3]; -.xn--ibf; ; ;  # -.ᢘ
+-。ᢘ; -.ᢘ; [V3]; -.xn--ibf; ; ;  # -.ᢘ
+-.xn--ibf; -.ᢘ; [V3]; -.xn--ibf; ; ;  # -.ᢘ
+🂴Ⴋ.≮; ; [P1, V6]; xn--jnd1986v.xn--gdh; ; ;  # 🂴Ⴋ.≮
+🂴Ⴋ.≮; 🂴Ⴋ.≮; [P1, V6]; xn--jnd1986v.xn--gdh; ; ;  # 🂴Ⴋ.≮
+🂴ⴋ.≮; 🂴ⴋ.≮; [P1, V6]; xn--2kj7565l.xn--gdh; ; ;  # 🂴ⴋ.≮
+🂴ⴋ.≮; ; [P1, V6]; xn--2kj7565l.xn--gdh; ; ;  # 🂴ⴋ.≮
+xn--2kj7565l.xn--gdh; 🂴ⴋ.≮; [V6]; xn--2kj7565l.xn--gdh; ; ;  # 🂴ⴋ.≮
+xn--jnd1986v.xn--gdh; 🂴Ⴋ.≮; [V6]; xn--jnd1986v.xn--gdh; ; ;  # 🂴Ⴋ.≮
+璼�｡‌󠇟; 璼�.‌; [C1]; xn--gky8837e.xn--0ug; ; xn--gky8837e.; [] # 璼�.
+璼�。‌󠇟; 璼�.‌; [C1]; xn--gky8837e.xn--0ug; ; xn--gky8837e.; [] # 璼�.
+xn--gky8837e.; 璼�.; ; xn--gky8837e.; ; ;  # 璼�.
+璼�.; ; ; xn--gky8837e.; ; ;  # 璼�.
+xn--gky8837e.xn--0ug; 璼�.‌; [C1]; xn--gky8837e.xn--0ug; ; ;  # 璼�.
+٩8�｡-5🞥; ٩8�.-5🞥; [B1, P1, V3, V6]; xn--8-qqc97891f.xn---5-rp92a; ; ;  # ٩8.-5🞥
+٩8�。-5🞥; ٩8�.-5🞥; [B1, P1, V3, V6]; xn--8-qqc97891f.xn---5-rp92a; ; ;  # ٩8.-5🞥
+xn--8-qqc97891f.xn---5-rp92a; ٩8�.-5🞥; [B1, V3, V6]; xn--8-qqc97891f.xn---5-rp92a; ; ;  # ٩8.-5🞥
+‌.‌; ; [C1]; xn--0ug.xn--0ug; ; .; [A4_2] # .
+xn--0ug.xn--0ug; ‌.‌; [C1]; xn--0ug.xn--0ug; ; ;  # .
+�튛.ܖ; ; [B1, C2]; xn--1ug4441e.xn--gnb; ; xn--157b.xn--gnb; [] # 튛.ܖ
+��ᅱᇂ.ܖ; �튛.ܖ; [B1, C2]; xn--1ug4441e.xn--gnb; ; xn--157b.xn--gnb; [] # 튛.ܖ
+xn--157b.xn--gnb; 튛.ܖ; ; xn--157b.xn--gnb; ; ;  # 튛.ܖ
+튛.ܖ; ; ; xn--157b.xn--gnb; ; ;  # 튛.ܖ
+�ᅱᇂ.ܖ; 튛.ܖ; ; xn--157b.xn--gnb; ; ;  # 튛.ܖ
+xn--1ug4441e.xn--gnb; �튛.ܖ; [B1, C2]; xn--1ug4441e.xn--gnb; ; ;  # 튛.ܖ
+ᡋ�𞽳.ݹⴞ; ; [B2, B3, B5, B6, P1, V6]; xn--b8e0417jocvf.xn--9pb883q; ; ;  # ᡋ�.ݹⴞ
+ᡋ�𞽳.ݹႾ; ; [B2, B3, B5, B6, P1, V6]; xn--b8e0417jocvf.xn--9pb068b; ; ;  # ᡋ�.ݹႾ
+xn--b8e0417jocvf.xn--9pb068b; ᡋ�𞽳.ݹႾ; [B2, B3, B5, B6, V6]; xn--b8e0417jocvf.xn--9pb068b; ; ;  # ᡋ�.ݹႾ
+xn--b8e0417jocvf.xn--9pb883q; ᡋ�𞽳.ݹⴞ; [B2, B3, B5, B6, V6]; xn--b8e0417jocvf.xn--9pb883q; ; ;  # ᡋ�.ݹⴞ
+�٢��．��Ⴇ; �٢�5.��Ⴇ; [B1, B4, P1, V6]; xn--5-cqc8833rhv7f.xn--fnd3401kfa; ; ;  # ٢�5.��Ⴇ
+�٢�5.��Ⴇ; ; [B1, B4, P1, V6]; xn--5-cqc8833rhv7f.xn--fnd3401kfa; ; ;  # ٢�5.��Ⴇ
+�٢�5.��ⴇ; ; [B1, B4, P1, V6]; xn--5-cqc8833rhv7f.xn--ykjz523efa; ; ;  # ٢�5.��ⴇ
+xn--5-cqc8833rhv7f.xn--ykjz523efa; �٢�5.��ⴇ; [B1, B4, V6]; xn--5-cqc8833rhv7f.xn--ykjz523efa; ; ;  # ٢�5.��ⴇ
+xn--5-cqc8833rhv7f.xn--fnd3401kfa; �٢�5.��Ⴇ; [B1, B4, V6]; xn--5-cqc8833rhv7f.xn--fnd3401kfa; ; ;  # ٢�5.��Ⴇ
+�٢��．��ⴇ; �٢�5.��ⴇ; [B1, B4, P1, V6]; xn--5-cqc8833rhv7f.xn--ykjz523efa; ; ;  # ٢�5.��ⴇ
+Ⴗ．𑄴ׂꦷ񘃨; Ⴗ.𑄴ׂꦷ񘃨; [P1, V5, V6]; xn--vnd.xn--qdb0605f14ycrms3c; ; ;  # Ⴗ.𑄴ׂꦷ
+Ⴗ．𑄴ׂꦷ񘃨; Ⴗ.𑄴ׂꦷ񘃨; [P1, V5, V6]; xn--vnd.xn--qdb0605f14ycrms3c; ; ;  # Ⴗ.𑄴ׂꦷ
+Ⴗ.𑄴ׂꦷ񘃨; ; [P1, V5, V6]; xn--vnd.xn--qdb0605f14ycrms3c; ; ;  # Ⴗ.𑄴ׂꦷ
+ⴗ.𑄴ׂꦷ񘃨; ; [P1, V5, V6]; xn--flj.xn--qdb0605f14ycrms3c; ; ;  # ⴗ.𑄴ׂꦷ
+xn--flj.xn--qdb0605f14ycrms3c; ⴗ.𑄴ׂꦷ񘃨; [V5, V6]; xn--flj.xn--qdb0605f14ycrms3c; ; ;  # ⴗ.𑄴ׂꦷ
+xn--vnd.xn--qdb0605f14ycrms3c; Ⴗ.𑄴ׂꦷ񘃨; [V5, V6]; xn--vnd.xn--qdb0605f14ycrms3c; ; ;  # Ⴗ.𑄴ׂꦷ
+ⴗ．𑄴ׂꦷ񘃨; ⴗ.𑄴ׂꦷ񘃨; [P1, V5, V6]; xn--flj.xn--qdb0605f14ycrms3c; ; ;  # ⴗ.𑄴ׂꦷ
+ⴗ．𑄴ׂꦷ񘃨; ⴗ.𑄴ׂꦷ񘃨; [P1, V5, V6]; xn--flj.xn--qdb0605f14ycrms3c; ; ;  # ⴗ.𑄴ׂꦷ
+�𾤘．򇕛٬; 8𾤘.򇕛٬; [B1, B5, B6, P1, V6]; xn--8-kh23b.xn--lib78461i; ; ;  # 8.٬
+8𾤘.򇕛٬; ; [B1, B5, B6, P1, V6]; xn--8-kh23b.xn--lib78461i; ; ;  # 8.٬
+xn--8-kh23b.xn--lib78461i; 8𾤘.򇕛٬; [B1, B5, B6, V6]; xn--8-kh23b.xn--lib78461i; ; ;  # 8.٬
+⒈酫︒。ࣖ; ⒈酫︒.ࣖ; [P1, V5, V6]; xn--tsh4490bfe8c.xn--8zb; ; ;  # ⒈酫︒.ࣖ
+1.酫。。ࣖ; 1.酫..ࣖ; [V5, X4_2]; 1.xn--8j4a..xn--8zb; [V5, A4_2]; ;  # 1.酫..ࣖ
+1.xn--8j4a..xn--8zb; 1.酫..ࣖ; [V5, X4_2]; 1.xn--8j4a..xn--8zb; [V5, A4_2]; ;  # 1.酫..ࣖ
+xn--tsh4490bfe8c.xn--8zb; ⒈酫︒.ࣖ; [V5, V6]; xn--tsh4490bfe8c.xn--8zb; ; ;  # ⒈酫︒.ࣖ
+ⷣ‌≮ᩫ.‌ฺ; ; [C1, P1, V5, V6]; xn--uof63xk4bf3s.xn--o4c732g; ; xn--uof548an0j.xn--o4c; [P1, V5, V6] # ⷣ≮ᩫ.ฺ
+ⷣ‌≮ᩫ.‌ฺ; ⷣ‌≮ᩫ.‌ฺ; [C1, P1, V5, V6]; xn--uof63xk4bf3s.xn--o4c732g; ; xn--uof548an0j.xn--o4c; [P1, V5, V6] # ⷣ≮ᩫ.ฺ
+xn--uof548an0j.xn--o4c; ⷣ≮ᩫ.ฺ; [V5, V6]; xn--uof548an0j.xn--o4c; ; ;  # ⷣ≮ᩫ.ฺ
+xn--uof63xk4bf3s.xn--o4c732g; ⷣ‌≮ᩫ.‌ฺ; [C1, V5, V6]; xn--uof63xk4bf3s.xn--o4c732g; ; ;  # ⷣ≮ᩫ.ฺ
+𞪂。ႷႽ¹�; 𞪂.ႷႽ1�; [B6, C2, P1, V6]; xn--co6h.xn--1-h1gs597m; ; xn--co6h.xn--1-h1gs; [P1, V6] # .ႷႽ1
+𞪂。ႷႽ1�; 𞪂.ႷႽ1�; [B6, C2, P1, V6]; xn--co6h.xn--1-h1gs597m; ; xn--co6h.xn--1-h1gs; [P1, V6] # .ႷႽ1
+𞪂。ⴗ�1�; 𞪂.ⴗ�1�; [B6, C2, P1, V6]; xn--co6h.xn--1-ugn710dya; ; xn--co6h.xn--1-kwssa; [P1, V6] # .ⴗ�1
+𞪂。Ⴗ�1�; 𞪂.Ⴗ�1�; [B6, C2, P1, V6]; xn--co6h.xn--1-h1g398iewm; ; xn--co6h.xn--1-h1g429s; [P1, V6] # .Ⴗ�1
+xn--co6h.xn--1-h1g429s; 𞪂.Ⴗ�1; [V6]; xn--co6h.xn--1-h1g429s; ; ;  # .Ⴗ�1
+xn--co6h.xn--1-h1g398iewm; 𞪂.Ⴗ�1�; [B6, C2, V6]; xn--co6h.xn--1-h1g398iewm; ; ;  # .Ⴗ�1
+xn--co6h.xn--1-kwssa; 𞪂.ⴗ�1; [V6]; xn--co6h.xn--1-kwssa; ; ;  # .ⴗ�1
+xn--co6h.xn--1-ugn710dya; 𞪂.ⴗ�1�; [B6, C2, V6]; xn--co6h.xn--1-ugn710dya; ; ;  # .ⴗ�1
+xn--co6h.xn--1-h1gs; 𞪂.ႷႽ1; [V6]; xn--co6h.xn--1-h1gs; ; ;  # .ႷႽ1
+xn--co6h.xn--1-h1gs597m; 𞪂.ႷႽ1�; [B6, C2, V6]; xn--co6h.xn--1-h1gs597m; ; ;  # .ႷႽ1
+𞪂。ⴗ�¹�; 𞪂.ⴗ�1�; [B6, C2, P1, V6]; xn--co6h.xn--1-ugn710dya; ; xn--co6h.xn--1-kwssa; [P1, V6] # .ⴗ�1
+𞪂。Ⴗ�¹�; 𞪂.Ⴗ�1�; [B6, C2, P1, V6]; xn--co6h.xn--1-h1g398iewm; ; xn--co6h.xn--1-h1g429s; [P1, V6] # .Ⴗ�1
+𑄴𑄳2.𞳿󠀳-; ; [B1, B3, P1, V3, V5, V6]; xn--2-h87ic.xn----s39r33498d; ; ;  # 𑄴𑄳2.-
+xn--2-h87ic.xn----s39r33498d; 𑄴𑄳2.𞳿󠀳-; [B1, B3, V3, V5, V6]; xn--2-h87ic.xn----s39r33498d; ; ;  # 𑄴𑄳2.-
+󠕲󟶶٥｡�𑄳𞤃�; 󠕲󟶶٥.�𑄳𞤥�; [B1, B5, B6, P1, V6]; xn--eib57614py3ea.xn--9mb5737kqnpfzkwr; ; ;  # ٥.𑄳𞤥�
+󠕲󟶶٥。�𑄳𞤃�; 󠕲󟶶٥.�𑄳𞤥�; [B1, B5, B6, P1, V6]; xn--eib57614py3ea.xn--9mb5737kqnpfzkwr; ; ;  # ٥.𑄳𞤥�
+󠕲󟶶٥。�𑄳𞤥�; 󠕲󟶶٥.�𑄳𞤥�; [B1, B5, B6, P1, V6]; xn--eib57614py3ea.xn--9mb5737kqnpfzkwr; ; ;  # ٥.𑄳𞤥�
+xn--eib57614py3ea.xn--9mb5737kqnpfzkwr; 󠕲󟶶٥.�𑄳𞤥�; [B1, B5, B6, V6]; xn--eib57614py3ea.xn--9mb5737kqnpfzkwr; ; ;  # ٥.𑄳𞤥�
+󠕲󟶶٥｡�𑄳𞤥�; 󠕲󟶶٥.�𑄳𞤥�; [B1, B5, B6, P1, V6]; xn--eib57614py3ea.xn--9mb5737kqnpfzkwr; ; ;  # ٥.𑄳𞤥�
+ܠ򲠽�ុ｡ςᢈ�‌; ܠ򲠽�ុ.ςᢈ�‌; [B2, B6, C1, P1, V6]; xn--qnb616fis0qzt36f.xn--3xa057h6ofgl44c; ; xn--qnb616fis0qzt36f.xn--4xa847hli46a; [B2, B6, P1, V6] # ܠ�ុ.ςᢈ�
+ܠ򲠽�ុ。ςᢈ�‌; ܠ򲠽�ុ.ςᢈ�‌; [B2, B6, C1, P1, V6]; xn--qnb616fis0qzt36f.xn--3xa057h6ofgl44c; ; xn--qnb616fis0qzt36f.xn--4xa847hli46a; [B2, B6, P1, V6] # ܠ�ុ.ςᢈ�
+ܠ򲠽�ុ。Σᢈ�‌; ܠ򲠽�ុ.σᢈ�‌; [B2, B6, C1, P1, V6]; xn--qnb616fis0qzt36f.xn--4xa847h6ofgl44c; ; xn--qnb616fis0qzt36f.xn--4xa847hli46a; [B2, B6, P1, V6] # ܠ�ុ.σᢈ�
+ܠ򲠽�ុ。σᢈ�‌; ܠ򲠽�ុ.σᢈ�‌; [B2, B6, C1, P1, V6]; xn--qnb616fis0qzt36f.xn--4xa847h6ofgl44c; ; xn--qnb616fis0qzt36f.xn--4xa847hli46a; [B2, B6, P1, V6] # ܠ�ុ.σᢈ�
+xn--qnb616fis0qzt36f.xn--4xa847hli46a; ܠ򲠽�ុ.σᢈ�; [B2, B6, V6]; xn--qnb616fis0qzt36f.xn--4xa847hli46a; ; ;  # ܠ�ុ.σᢈ�
+xn--qnb616fis0qzt36f.xn--4xa847h6ofgl44c; ܠ򲠽�ុ.σᢈ�‌; [B2, B6, C1, V6]; xn--qnb616fis0qzt36f.xn--4xa847h6ofgl44c; ; ;  # ܠ�ុ.σᢈ�
+xn--qnb616fis0qzt36f.xn--3xa057h6ofgl44c; ܠ򲠽�ុ.ςᢈ�‌; [B2, B6, C1, V6]; xn--qnb616fis0qzt36f.xn--3xa057h6ofgl44c; ; ;  # ܠ�ុ.ςᢈ�
+ܠ򲠽�ុ｡Σᢈ�‌; ܠ򲠽�ុ.σᢈ�‌; [B2, B6, C1, P1, V6]; xn--qnb616fis0qzt36f.xn--4xa847h6ofgl44c; ; xn--qnb616fis0qzt36f.xn--4xa847hli46a; [B2, B6, P1, V6] # ܠ�ុ.σᢈ�
+ܠ򲠽�ុ｡σᢈ�‌; ܠ򲠽�ុ.σᢈ�‌; [B2, B6, C1, P1, V6]; xn--qnb616fis0qzt36f.xn--4xa847h6ofgl44c; ; xn--qnb616fis0qzt36f.xn--4xa847hli46a; [B2, B6, P1, V6] # ܠ�ុ.σᢈ�
+�--≮。�; �--≮.�; [B1, C2, P1, V6]; xn-----l1tz1k.xn--fo0d; ; xn-----ujv.xn--fo0d; [B1, P1, V3, V6] # --≮.�
+�--≮。�; �--≮.�; [B1, C2, P1, V6]; xn-----l1tz1k.xn--fo0d; ; xn-----ujv.xn--fo0d; [B1, P1, V3, V6] # --≮.�
+xn-----ujv.xn--fo0d; --≮.�; [B1, V3, V6]; xn-----ujv.xn--fo0d; ; ;  # --≮.�
+xn-----l1tz1k.xn--fo0d; �--≮.�; [B1, C2, V6]; xn-----l1tz1k.xn--fo0d; ; ;  # --≮.�
+꠆。�ྰ⒕; ꠆.�ྰ⒕; [P1, V5, V6]; xn--l98a.xn--dgd218hhp28d; ; ;  # ꠆.ྰ⒕
+꠆。�ྰ14.; ꠆.�ྰ14.; [P1, V5, V6]; xn--l98a.xn--14-jsj57880f.; ; ;  # ꠆.ྰ14.
+xn--l98a.xn--14-jsj57880f.; ꠆.�ྰ14.; [V5, V6]; xn--l98a.xn--14-jsj57880f.; ; ;  # ꠆.ྰ14.
+xn--l98a.xn--dgd218hhp28d; ꠆.�ྰ⒕; [V5, V6]; xn--l98a.xn--dgd218hhp28d; ; ;  # ꠆.ྰ⒕
+򮉂ڼ．𑆺٩; 򮉂ڼ.𑆺٩; [B1, B5, B6, P1, V5, V6]; xn--vkb92243l.xn--iib9797k; ; ;  # ڼ.𑆺٩
+򮉂ڼ.𑆺٩; ; [B1, B5, B6, P1, V5, V6]; xn--vkb92243l.xn--iib9797k; ; ;  # ڼ.𑆺٩
+xn--vkb92243l.xn--iib9797k; 򮉂ڼ.𑆺٩; [B1, B5, B6, V5, V6]; xn--vkb92243l.xn--iib9797k; ; ;  # ڼ.𑆺٩
+��-。𞤴; ��-.𞤴; [B1, P1, V3, V6]; xn----mwc72685y.xn--se6h; ; ;  # �-.𞤴
+��-。𞤒; ��-.𞤴; [B1, P1, V3, V6]; xn----mwc72685y.xn--se6h; ; ;  # �-.𞤴
+xn----mwc72685y.xn--se6h; ��-.𞤴; [B1, V3, V6]; xn----mwc72685y.xn--se6h; ; ;  # �-.𞤴
+�4󠇗�．��⛧�; 84�.��⛧�; [C2]; xn--84-s850a.xn--1uga573cfq1w; ; xn--84-s850a.xn--59h6326e; [] # 84�.�⛧
+84󠇗�.��⛧�; 84�.��⛧�; [C2]; xn--84-s850a.xn--1uga573cfq1w; ; xn--84-s850a.xn--59h6326e; [] # 84�.�⛧
+xn--84-s850a.xn--59h6326e; 84�.�⛧; ; xn--84-s850a.xn--59h6326e; ; ;  # 84�.�⛧
+84�.�⛧; ; ; xn--84-s850a.xn--59h6326e; ; ;  # 84�.�⛧
+xn--84-s850a.xn--1uga573cfq1w; 84�.��⛧�; [C2]; xn--84-s850a.xn--1uga573cfq1w; ; ;  # 84�.�⛧
+-�｡ᡪ; -�.ᡪ; [B1, P1, V3, V6]; xn----tkc.xn--68e; ; ;  # -.ᡪ
+-�。ᡪ; -�.ᡪ; [B1, P1, V3, V6]; xn----tkc.xn--68e; ; ;  # -.ᡪ
+xn----tkc.xn--68e; -�.ᡪ; [B1, V3, V6]; xn----tkc.xn--68e; ; ;  # -.ᡪ
+≮�．謖ß≯; ≮7.謖ß≯; [P1, V6]; xn--7-mgo.xn--zca892oly5e; ; xn--7-mgo.xn--ss-xjvv174c;  # ≮7.謖ß≯
+≮�．謖ß≯; ≮7.謖ß≯; [P1, V6]; xn--7-mgo.xn--zca892oly5e; ; xn--7-mgo.xn--ss-xjvv174c;  # ≮7.謖ß≯
+≮7.謖ß≯; ; [P1, V6]; xn--7-mgo.xn--zca892oly5e; ; xn--7-mgo.xn--ss-xjvv174c;  # ≮7.謖ß≯
+≮7.謖ß≯; ≮7.謖ß≯; [P1, V6]; xn--7-mgo.xn--zca892oly5e; ; xn--7-mgo.xn--ss-xjvv174c;  # ≮7.謖ß≯
+≮7.謖SS≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮7.謖SS≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮7.謖ss≯; ; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮7.謖ss≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮7.謖Ss≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮7.謖Ss≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+xn--7-mgo.xn--ss-xjvv174c; ≮7.謖ss≯; [V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+xn--7-mgo.xn--zca892oly5e; ≮7.謖ß≯; [V6]; xn--7-mgo.xn--zca892oly5e; ; ;  # ≮7.謖ß≯
+≮�．謖SS≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮�．謖SS≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮�．謖ss≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮�．謖ss≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮�．謖Ss≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+≮�．謖Ss≯; ≮7.謖ss≯; [P1, V6]; xn--7-mgo.xn--ss-xjvv174c; ; ;  # ≮7.謖ss≯
+朶Ⴉ𞪡.�ࠥ📻-; ; [B1, B5, B6, P1, V3, V5, V6]; xn--hnd7245bd56p.xn----3gd37096apmwa; ; ;  # 朶Ⴉ.�ࠥ📻-
+朶ⴉ𞪡.�ࠥ📻-; ; [B1, B5, B6, P1, V3, V5, V6]; xn--0kjz47pd57t.xn----3gd37096apmwa; ; ;  # 朶ⴉ.�ࠥ📻-
+xn--0kjz47pd57t.xn----3gd37096apmwa; 朶ⴉ𞪡.�ࠥ📻-; [B1, B5, B6, V3, V5, V6]; xn--0kjz47pd57t.xn----3gd37096apmwa; ; ;  # 朶ⴉ.�ࠥ📻-
+xn--hnd7245bd56p.xn----3gd37096apmwa; 朶Ⴉ𞪡.�ࠥ📻-; [B1, B5, B6, V3, V5, V6]; xn--hnd7245bd56p.xn----3gd37096apmwa; ; ;  # 朶Ⴉ.�ࠥ📻-
+�。󑿰‌≮�; �.󑿰‌≮�; [B6, C1, C2, P1, V6]; xn--bk9c.xn--0ugc04p2u638c; ; xn--bk9c.xn--gdhx6802k; [B6, P1, V6] # �.≮
+�。󑿰‌≮�; �.󑿰‌≮�; [B6, C1, C2, P1, V6]; xn--bk9c.xn--0ugc04p2u638c; ; xn--bk9c.xn--gdhx6802k; [B6, P1, V6] # �.≮
+xn--bk9c.xn--gdhx6802k; �.󑿰≮; [B6, V6]; xn--bk9c.xn--gdhx6802k; ; ;  # �.≮
+xn--bk9c.xn--0ugc04p2u638c; �.󑿰‌≮�; [B6, C1, C2, V6]; xn--bk9c.xn--0ugc04p2u638c; ; ;  # �.≮
+񭜎⒈｡‌�; 񭜎⒈.‌2; [C1, P1, V6]; xn--tsh94183d.xn--2-rgn; ; xn--tsh94183d.2; [P1, V6] # ⒈.2
+񭜎1.。‌2; 񭜎1..‌2; [C1, P1, V6, X4_2]; xn--1-ex54e..xn--2-rgn; [C1, P1, V6, A4_2]; xn--1-ex54e..2; [P1, V6, A4_2] # 1..2
+xn--1-ex54e..2; 񭜎1..2; [V6, X4_2]; xn--1-ex54e..2; [V6, A4_2]; ;  # 1..2
+xn--1-ex54e..xn--2-rgn; 񭜎1..‌2; [C1, V6, X4_2]; xn--1-ex54e..xn--2-rgn; [C1, V6, A4_2]; ;  # 1..2
+xn--tsh94183d.2; 񭜎⒈.2; [V6]; xn--tsh94183d.2; ; ;  # ⒈.2
+xn--tsh94183d.xn--2-rgn; 񭜎⒈.‌2; [C1, V6]; xn--tsh94183d.xn--2-rgn; ; ;  # ⒈.2
+󠟊��．�󙄵�; 󠟊��.�󙄵�; [B1, C2, P1, V6]; xn--1ugy994g7k93g.xn--ro0dga22807v; ; xn--co0d98977c.xn--ro0dga22807v; [B1, P1, V6] # �.��
+󠟊��.�󙄵�; ; [B1, C2, P1, V6]; xn--1ugy994g7k93g.xn--ro0dga22807v; ; xn--co0d98977c.xn--ro0dga22807v; [B1, P1, V6] # �.��
+xn--co0d98977c.xn--ro0dga22807v; 󠟊�.�󙄵�; [B1, V6]; xn--co0d98977c.xn--ro0dga22807v; ; ;  # �.��
+xn--1ugy994g7k93g.xn--ro0dga22807v; 󠟊��.�󙄵�; [B1, C2, V6]; xn--1ugy994g7k93g.xn--ro0dga22807v; ; ;  # �.��
+𞤴�𑓂�．�︇􉛯; 𞤴�𑓂�.�􉛯; [B1, P1, V5, V6]; xn--609c96c09grp2w.xn--n3b28708s; ; ;  # 𞤴�𑓂�.�
+𞤴�𑓂�.�︇􉛯; 𞤴�𑓂�.�􉛯; [B1, P1, V5, V6]; xn--609c96c09grp2w.xn--n3b28708s; ; ;  # 𞤴�𑓂�.�
+𞤒�𑓂�.�︇􉛯; 𞤴�𑓂�.�􉛯; [B1, P1, V5, V6]; xn--609c96c09grp2w.xn--n3b28708s; ; ;  # 𞤴�𑓂�.�
+xn--609c96c09grp2w.xn--n3b28708s; 𞤴�𑓂�.�􉛯; [B1, V5, V6]; xn--609c96c09grp2w.xn--n3b28708s; ; ;  # 𞤴�𑓂�.�
+𞤒�𑓂�．�︇􉛯; 𞤴�𑓂�.�􉛯; [B1, P1, V5, V6]; xn--609c96c09grp2w.xn--n3b28708s; ; ;  # 𞤴�𑓂�.�
+٨｡��񗮶; ٨.��񗮶; [B1, P1, V6]; xn--hib.xn--7n0d2bu9196b; ; ;  # ٨.��
+٨。��񗮶; ٨.��񗮶; [B1, P1, V6]; xn--hib.xn--7n0d2bu9196b; ; ;  # ٨.��
+xn--hib.xn--7n0d2bu9196b; ٨.��񗮶; [B1, V6]; xn--hib.xn--7n0d2bu9196b; ; ;  # ٨.��
+ᅠ�.8򶾵ڜ; ; [B1, P1, V6]; xn--psd85033d.xn--8-otc61545t; ; ;  # .8ڜ
+xn--psd85033d.xn--8-otc61545t; ᅠ�.8򶾵ڜ; [B1, V6]; xn--psd85033d.xn--8-otc61545t; ; ;  # .8ڜ
+�‌󠆪｡ß𑓃; �‌.ß𑓃; [C1, C2]; xn--0ugb.xn--zca0732l; ; .xn--ss-bh7o; [A4_2] # .ß𑓃
+�‌󠆪。ß𑓃; �‌.ß𑓃; [C1, C2]; xn--0ugb.xn--zca0732l; ; .xn--ss-bh7o; [A4_2] # .ß𑓃
+�‌󠆪。SS𑓃; �‌.ss𑓃; [C1, C2]; xn--0ugb.xn--ss-bh7o; ; .xn--ss-bh7o; [A4_2] # .ss𑓃
+�‌󠆪。ss𑓃; �‌.ss𑓃; [C1, C2]; xn--0ugb.xn--ss-bh7o; ; .xn--ss-bh7o; [A4_2] # .ss𑓃
+�‌󠆪。Ss𑓃; �‌.ss𑓃; [C1, C2]; xn--0ugb.xn--ss-bh7o; ; .xn--ss-bh7o; [A4_2] # .ss𑓃
+.xn--ss-bh7o; .ss𑓃; [X4_2]; .xn--ss-bh7o; [A4_2]; ;  # .ss𑓃
+xn--0ugb.xn--ss-bh7o; �‌.ss𑓃; [C1, C2]; xn--0ugb.xn--ss-bh7o; ; ;  # .ss𑓃
+xn--0ugb.xn--zca0732l; �‌.ß𑓃; [C1, C2]; xn--0ugb.xn--zca0732l; ; ;  # .ß𑓃
+�‌󠆪｡SS𑓃; �‌.ss𑓃; [C1, C2]; xn--0ugb.xn--ss-bh7o; ; .xn--ss-bh7o; [A4_2] # .ss𑓃
+�‌󠆪｡ss𑓃; �‌.ss𑓃; [C1, C2]; xn--0ugb.xn--ss-bh7o; ; .xn--ss-bh7o; [A4_2] # .ss𑓃
+�‌󠆪｡Ss𑓃; �‌.ss𑓃; [C1, C2]; xn--0ugb.xn--ss-bh7o; ; .xn--ss-bh7o; [A4_2] # .ss𑓃
+xn--ss-bh7o; ss𑓃; ; xn--ss-bh7o; ; ;  # ss𑓃
+ss𑓃; ; ; xn--ss-bh7o; ; ;  # ss𑓃
+SS𑓃; ss𑓃; ; xn--ss-bh7o; ; ;  # ss𑓃
+Ss𑓃; ss𑓃; ; xn--ss-bh7o; ; ;  # ss𑓃
+︒‌ヶ䒩.ꡪ; ; [C1, P1, V6]; xn--0ug287dj0or48o.xn--gd9a; ; xn--qekw60dns9k.xn--gd9a; [P1, V6] # ︒ヶ䒩.ꡪ
+。‌ヶ䒩.ꡪ; .‌ヶ䒩.ꡪ; [C1, X4_2]; .xn--0ug287dj0o.xn--gd9a; [C1, A4_2]; .xn--qekw60d.xn--gd9a; [A4_2] # .ヶ䒩.ꡪ
+.xn--qekw60d.xn--gd9a; .ヶ䒩.ꡪ; [X4_2]; .xn--qekw60d.xn--gd9a; [A4_2]; ;  # .ヶ䒩.ꡪ
+.xn--0ug287dj0o.xn--gd9a; .‌ヶ䒩.ꡪ; [C1, X4_2]; .xn--0ug287dj0o.xn--gd9a; [C1, A4_2]; ;  # .ヶ䒩.ꡪ
+xn--qekw60dns9k.xn--gd9a; ︒ヶ䒩.ꡪ; [V6]; xn--qekw60dns9k.xn--gd9a; ; ;  # ︒ヶ䒩.ꡪ
+xn--0ug287dj0or48o.xn--gd9a; ︒‌ヶ䒩.ꡪ; [C1, V6]; xn--0ug287dj0or48o.xn--gd9a; ; ;  # ︒ヶ䒩.ꡪ
+xn--qekw60d.xn--gd9a; ヶ䒩.ꡪ; ; xn--qekw60d.xn--gd9a; ; ;  # ヶ䒩.ꡪ
+ヶ䒩.ꡪ; ; ; xn--qekw60d.xn--gd9a; ; ;  # ヶ䒩.ꡪ
+‌⒈�.󢓋᩠; ; [C1, P1, V6]; xn--0ug88o7471d.xn--jof45148n; ; xn--tshw462r.xn--jof45148n; [P1, V6] # ⒈�.᩠
+‌1.�.󢓋᩠; ; [C1, P1, V6]; xn--1-rgn.xn--4x6j.xn--jof45148n; ; 1.xn--4x6j.xn--jof45148n; [P1, V6] # 1.�.᩠
+1.xn--4x6j.xn--jof45148n; 1.�.󢓋᩠; [V6]; 1.xn--4x6j.xn--jof45148n; ; ;  # 1.�.᩠
+xn--1-rgn.xn--4x6j.xn--jof45148n; ‌1.�.󢓋᩠; [C1, V6]; xn--1-rgn.xn--4x6j.xn--jof45148n; ; ;  # 1.�.᩠
+xn--tshw462r.xn--jof45148n; ⒈�.󢓋᩠; [V6]; xn--tshw462r.xn--jof45148n; ; ;  # ⒈�.᩠
+xn--0ug88o7471d.xn--jof45148n; ‌⒈�.󢓋᩠; [C1, V6]; xn--0ug88o7471d.xn--jof45148n; ; ;  # ⒈�.᩠
+⒈‌�󠀺。᩠񤰵�; ⒈‌�󠀺.᩠񤰵�; [B1, C1, C2, P1, V5, V6]; xn--0ug78ol75wzcx4i.xn--jof95xex98m; ; xn--tsh4435fk263g.xn--jofz5294e; [B1, P1, V5, V6] # ⒈�.᩠
+1.‌�󠀺。᩠񤰵�; 1.‌�󠀺.᩠񤰵�; [B1, C1, C2, P1, V5, V6]; 1.xn--0ug8853gk263g.xn--jof95xex98m; ; 1.xn--8w9c40377c.xn--jofz5294e; [B1, B3, P1, V5, V6] # 1.�.᩠
+1.xn--8w9c40377c.xn--jofz5294e; 1.�󠀺.᩠񤰵; [B1, B3, V5, V6]; 1.xn--8w9c40377c.xn--jofz5294e; ; ;  # 1.�.᩠
+1.xn--0ug8853gk263g.xn--jof95xex98m; 1.‌�󠀺.᩠񤰵�; [B1, C1, C2, V5, V6]; 1.xn--0ug8853gk263g.xn--jof95xex98m; ; ;  # 1.�.᩠
+xn--tsh4435fk263g.xn--jofz5294e; ⒈�󠀺.᩠񤰵; [B1, V5, V6]; xn--tsh4435fk263g.xn--jofz5294e; ; ;  # ⒈�.᩠
+xn--0ug78ol75wzcx4i.xn--jof95xex98m; ⒈‌�󠀺.᩠񤰵�; [B1, C1, C2, V5, V6]; xn--0ug78ol75wzcx4i.xn--jof95xex98m; ; ;  # ⒈�.᩠
+�｡�𞀈䬺⒈; �.9𞀈䬺⒈; [P1, V6]; xn--3f1h.xn--9-ecp936non25a; ; ;  # .9𞀈䬺⒈
+�。9𞀈䬺1.; �.9𞀈䬺1.; [P1, V6]; xn--3f1h.xn--91-030c1650n.; ; ;  # .9𞀈䬺1.
+xn--3f1h.xn--91-030c1650n.; �.9𞀈䬺1.; [V6]; xn--3f1h.xn--91-030c1650n.; ; ;  # .9𞀈䬺1.
+xn--3f1h.xn--9-ecp936non25a; �.9𞀈䬺⒈; [V6]; xn--3f1h.xn--9-ecp936non25a; ; ;  # .9𞀈䬺⒈
+򡼺≯。盚ص; 򡼺≯.盚ص; [B5, B6, P1, V6]; xn--hdh30181h.xn--0gb7878c; ; ;  # ≯.盚ص
+򡼺≯。盚ص; 򡼺≯.盚ص; [B5, B6, P1, V6]; xn--hdh30181h.xn--0gb7878c; ; ;  # ≯.盚ص
+xn--hdh30181h.xn--0gb7878c; 򡼺≯.盚ص; [B5, B6, V6]; xn--hdh30181h.xn--0gb7878c; ; ;  # ≯.盚ص
+-񿰭ִ。-��≯; -񿰭ִ.-��≯; [B1, P1, V3, V6]; xn----fgc06667m.xn----pgoy615he5y4i; ; ;  # -ִ.-≯
+-񿰭ִ。-��≯; -񿰭ִ.-��≯; [B1, P1, V3, V6]; xn----fgc06667m.xn----pgoy615he5y4i; ; ;  # -ִ.-≯
+xn----fgc06667m.xn----pgoy615he5y4i; -񿰭ִ.-��≯; [B1, V3, V6]; xn----fgc06667m.xn----pgoy615he5y4i; ; ;  # -ִ.-≯
+󿭓᭄‌�．�񳋔; 󿭓᭄‌�.�񳋔; [B2, B3, B6, P1, V6]; xn--ybc997f6rd2n772c.xn--409c6100y; ; xn--ybc997fb5881a.xn--409c6100y; [B2, B3, P1, V6] # ᭄�.�
+󿭓᭄‌�.�񳋔; ; [B2, B3, B6, P1, V6]; xn--ybc997f6rd2n772c.xn--409c6100y; ; xn--ybc997fb5881a.xn--409c6100y; [B2, B3, P1, V6] # ᭄�.�
+xn--ybc997fb5881a.xn--409c6100y; 󿭓᭄�.�񳋔; [B2, B3, V6]; xn--ybc997fb5881a.xn--409c6100y; ; ;  # ᭄�.�
+xn--ybc997f6rd2n772c.xn--409c6100y; 󿭓᭄‌�.�񳋔; [B2, B3, B6, V6]; xn--ybc997f6rd2n772c.xn--409c6100y; ; ;  # ᭄�.�
+⾇.ٽ𞤴ڻ�; 舛.ٽ𞤴ڻ�; [B3, C2]; xn--8c1a.xn--2ib8jv19e6413b; ; xn--8c1a.xn--2ib8jn539l; [] # 舛.ٽ𞤴ڻ
+舛.ٽ𞤴ڻ�; ; [B3, C2]; xn--8c1a.xn--2ib8jv19e6413b; ; xn--8c1a.xn--2ib8jn539l; [] # 舛.ٽ𞤴ڻ
+舛.ٽ𞤒ڻ�; 舛.ٽ𞤴ڻ�; [B3, C2]; xn--8c1a.xn--2ib8jv19e6413b; ; xn--8c1a.xn--2ib8jn539l; [] # 舛.ٽ𞤴ڻ
+xn--8c1a.xn--2ib8jn539l; 舛.ٽ𞤴ڻ; ; xn--8c1a.xn--2ib8jn539l; ; ;  # 舛.ٽ𞤴ڻ
+舛.ٽ𞤴ڻ; ; ; xn--8c1a.xn--2ib8jn539l; ; ;  # 舛.ٽ𞤴ڻ
+舛.ٽ𞤒ڻ; 舛.ٽ𞤴ڻ; ; xn--8c1a.xn--2ib8jn539l; ; ;  # 舛.ٽ𞤴ڻ
+xn--8c1a.xn--2ib8jv19e6413b; 舛.ٽ𞤴ڻ�; [B3, C2]; xn--8c1a.xn--2ib8jv19e6413b; ; ;  # 舛.ٽ𞤴ڻ
+⾇.ٽ𞤒ڻ�; 舛.ٽ𞤴ڻ�; [B3, C2]; xn--8c1a.xn--2ib8jv19e6413b; ; xn--8c1a.xn--2ib8jn539l; [] # 舛.ٽ𞤴ڻ
+4򭆥。ݧ≯; 4򭆥.ݧ≯; [B1, B3, P1, V6]; xn--4-xn17i.xn--rpb459k; ; ;  # 4.ݧ≯
+4򭆥。ݧ≯; 4򭆥.ݧ≯; [B1, B3, P1, V6]; xn--4-xn17i.xn--rpb459k; ; ;  # 4.ݧ≯
+xn--4-xn17i.xn--rpb459k; 4򭆥.ݧ≯; [B1, B3, V6]; xn--4-xn17i.xn--rpb459k; ; ;  # 4.ݧ≯
+�𞫨񺿂硲．ڭ; �𞫨񺿂硲.ڭ; [B5, P1, V6]; xn--lcz1610fn78gk609a.xn--gkb; ; ;  # 硲.ڭ
+�𞫨񺿂硲.ڭ; ; [B5, P1, V6]; xn--lcz1610fn78gk609a.xn--gkb; ; ;  # 硲.ڭ
+xn--lcz1610fn78gk609a.xn--gkb; �𞫨񺿂硲.ڭ; [B5, V6]; xn--lcz1610fn78gk609a.xn--gkb; ; ;  # 硲.ڭ
+‌.︈٦Ⴆ℮; ‌.٦Ⴆ℮; [B1, C1, P1, V6]; xn--0ug.xn--fib263c0yn; ; .xn--fib263c0yn; [B1, P1, V6, A4_2] # .٦Ⴆ℮
+‌.︈٦ⴆ℮; ‌.٦ⴆ℮; [B1, C1]; xn--0ug.xn--fib628k4li; ; .xn--fib628k4li; [B1, A4_2] # .٦ⴆ℮
+.xn--fib628k4li; .٦ⴆ℮; [B1, X4_2]; .xn--fib628k4li; [B1, A4_2]; ;  # .٦ⴆ℮
+xn--0ug.xn--fib628k4li; ‌.٦ⴆ℮; [B1, C1]; xn--0ug.xn--fib628k4li; ; ;  # .٦ⴆ℮
+.xn--fib263c0yn; .٦Ⴆ℮; [B1, V6, X4_2]; .xn--fib263c0yn; [B1, V6, A4_2]; ;  # .٦Ⴆ℮
+xn--0ug.xn--fib263c0yn; ‌.٦Ⴆ℮; [B1, C1, V6]; xn--0ug.xn--fib263c0yn; ; ;  # .٦Ⴆ℮
+ڣ．��Ϟ; ڣ.��ϟ; [B1, V5]; xn--5jb.xn--xya149bpvp; ; xn--5jb.xn--xya149b;  # ڣ.�ϟ
+ڣ.��Ϟ; ڣ.��ϟ; [B1, V5]; xn--5jb.xn--xya149bpvp; ; xn--5jb.xn--xya149b;  # ڣ.�ϟ
+ڣ.��ϟ; ; [B1, V5]; xn--5jb.xn--xya149bpvp; ; xn--5jb.xn--xya149b;  # ڣ.�ϟ
+xn--5jb.xn--xya149b; ڣ.�ϟ; [B1, V5]; xn--5jb.xn--xya149b; ; ;  # ڣ.�ϟ
+xn--5jb.xn--xya149bpvp; ڣ.��ϟ; [B1, V5]; xn--5jb.xn--xya149bpvp; ; ;  # ڣ.�ϟ
+ڣ．��ϟ; ڣ.��ϟ; [B1, V5]; xn--5jb.xn--xya149bpvp; ; xn--5jb.xn--xya149b;  # ڣ.�ϟ
+‌𞸇𑘿。أ�-�; ‌ح𑘿.أ�-�; [B1, B2, B3, C1]; xn--sgb953kmi8o.xn----qmc5075grs9e; ; xn--sgb4140l.xn----qmc5075grs9e; [B2, B3] # ح𑘿.أ�-�
+‌𞸇𑘿。أ�-�; ‌ح𑘿.أ�-�; [B1, B2, B3, C1]; xn--sgb953kmi8o.xn----qmc5075grs9e; ; xn--sgb4140l.xn----qmc5075grs9e; [B2, B3] # ح𑘿.أ�-�
+‌ح𑘿。أ�-�; ‌ح𑘿.أ�-�; [B1, B2, B3, C1]; xn--sgb953kmi8o.xn----qmc5075grs9e; ; xn--sgb4140l.xn----qmc5075grs9e; [B2, B3] # ح𑘿.أ�-�
+‌ح𑘿。أ�-�; ‌ح𑘿.أ�-�; [B1, B2, B3, C1]; xn--sgb953kmi8o.xn----qmc5075grs9e; ; xn--sgb4140l.xn----qmc5075grs9e; [B2, B3] # ح𑘿.أ�-�
+xn--sgb4140l.xn----qmc5075grs9e; ح𑘿.أ�-�; [B2, B3]; xn--sgb4140l.xn----qmc5075grs9e; ; ;  # ح𑘿.أ�-�
+xn--sgb953kmi8o.xn----qmc5075grs9e; ‌ح𑘿.أ�-�; [B1, B2, B3, C1]; xn--sgb953kmi8o.xn----qmc5075grs9e; ; ;  # ح𑘿.أ�-�
+-򭷙٫纛｡�񭤇🄅; -򭷙٫纛.3񭤇🄅; [B1, P1, V3, V6]; xn----vqc8143g0tt4i.xn--3-os1sn476y; ; ;  # -٫纛.3🄅
+-򭷙٫纛。3񭤇4,; -򭷙٫纛.3񭤇4,; [B1, P1, V3, V6]; xn----vqc8143g0tt4i.xn--34,-8787l; ; ;  # -٫纛.34,
+xn----vqc8143g0tt4i.xn--34,-8787l; -򭷙٫纛.3񭤇4,; [B1, P1, V3, V6]; xn----vqc8143g0tt4i.xn--34,-8787l; ; ;  # -٫纛.34,
+xn----vqc8143g0tt4i.xn--3-os1sn476y; -򭷙٫纛.3񭤇🄅; [B1, V3, V6]; xn----vqc8143g0tt4i.xn--3-os1sn476y; ; ;  # -٫纛.3🄅
+🔔．Ⴂߌ��; 🔔.Ⴂߌ��; [B1, B5, P1, V6]; xn--nv8h.xn--nsb46r83e8112a; ; ;  # 🔔.Ⴂߌ��
+🔔.Ⴂߌ��; ; [B1, B5, P1, V6]; xn--nv8h.xn--nsb46r83e8112a; ; ;  # 🔔.Ⴂߌ��
+🔔.ⴂߌ��; ; [B1, B5]; xn--nv8h.xn--nsb46rvz1b222p; ; ;  # 🔔.ⴂߌ��
+xn--nv8h.xn--nsb46rvz1b222p; 🔔.ⴂߌ��; [B1, B5]; xn--nv8h.xn--nsb46rvz1b222p; ; ;  # 🔔.ⴂߌ��
+xn--nv8h.xn--nsb46r83e8112a; 🔔.Ⴂߌ��; [B1, B5, V6]; xn--nv8h.xn--nsb46r83e8112a; ; ;  # 🔔.Ⴂߌ��
+🔔．ⴂߌ��; 🔔.ⴂߌ��; [B1, B5]; xn--nv8h.xn--nsb46rvz1b222p; ; ;  # 🔔.ⴂߌ��
+軥ڳ.-𖬵; ; [B1, B5, B6, V3]; xn--mkb5480e.xn----6u5m; ; ;  # 軥ڳ.-𖬵
+xn--mkb5480e.xn----6u5m; 軥ڳ.-𖬵; [B1, B5, B6, V3]; xn--mkb5480e.xn----6u5m; ; ;  # 軥ڳ.-𖬵
+�ߊڶ.�-; ; [B1, V3, V5]; xn--pkb56cn614d.xn----974i; ; ;  # �ߊڶ.�-
+xn--pkb56cn614d.xn----974i; �ߊڶ.�-; [B1, V3, V5]; xn--pkb56cn614d.xn----974i; ; ;  # �ߊڶ.�-
+-󠅱0｡�᷽톇십; -0.�᷽톇십; [V3, V5]; -0.xn--r4e872ah77nghm; ; ;  # -0.�᷽톇십
+-󠅱0｡�᷽�ᅨᆪ십; -0.�᷽톇십; [V3, V5]; -0.xn--r4e872ah77nghm; ; ;  # -0.�᷽톇십
+-󠅱0。�᷽톇십; -0.�᷽톇십; [V3, V5]; -0.xn--r4e872ah77nghm; ; ;  # -0.�᷽톇십
+-󠅱0。�᷽�ᅨᆪ십; -0.�᷽톇십; [V3, V5]; -0.xn--r4e872ah77nghm; ; ;  # -0.�᷽톇십
+-0.xn--r4e872ah77nghm; -0.�᷽톇십; [V3, V5]; -0.xn--r4e872ah77nghm; ; ;  # -0.�᷽톇십
+ꡰ︒--｡៌��񘳮; ꡰ︒--.៌��񘳮; [B1, B6, P1, V2, V3, V5, V6]; xn-----bk9hu24z.xn--o4e6836dpxudz0v1c; ; ;  # ꡰ︒--.៌��
+ꡰ。--。៌��񘳮; ꡰ.--.៌��񘳮; [B1, P1, V3, V5, V6]; xn--md9a.--.xn--o4e6836dpxudz0v1c; ; ;  # ꡰ.--.៌��
+xn--md9a.--.xn--o4e6836dpxudz0v1c; ꡰ.--.៌��񘳮; [B1, V3, V5, V6]; xn--md9a.--.xn--o4e6836dpxudz0v1c; ; ;  # ꡰ.--.៌��
+xn-----bk9hu24z.xn--o4e6836dpxudz0v1c; ꡰ︒--.៌��񘳮; [B1, B6, V2, V3, V5, V6]; xn-----bk9hu24z.xn--o4e6836dpxudz0v1c; ; ;  # ꡰ︒--.៌��
+ᅟႿႵრ｡�; ᅟႿႵრ.�; [P1, V5, V6]; xn--tndt4hvw.xn--9ic; ; ;  # ႿႵრ.�
+ᅟႿႵრ。�; ᅟႿႵრ.�; [P1, V5, V6]; xn--tndt4hvw.xn--9ic; ; ;  # ႿႵრ.�
+ᅟⴟⴕრ。�; ᅟⴟⴕრ.�; [P1, V5, V6]; xn--1od7wz74eeb.xn--9ic; ; ;  # ⴟⴕრ.�
+ᅟႿႵᲠ。�; ᅟႿႵრ.�; [P1, V5, V6]; xn--tndt4hvw.xn--9ic; ; ;  # ႿႵრ.�
+xn--tndt4hvw.xn--9ic; ᅟႿႵრ.�; [V5, V6]; xn--tndt4hvw.xn--9ic; ; ;  # ႿႵრ.�
+xn--1od7wz74eeb.xn--9ic; ᅟⴟⴕრ.�; [V5, V6]; xn--1od7wz74eeb.xn--9ic; ; ;  # ⴟⴕრ.�
+ᅟⴟⴕრ｡�; ᅟⴟⴕრ.�; [P1, V5, V6]; xn--1od7wz74eeb.xn--9ic; ; ;  # ⴟⴕრ.�
+ᅟႿႵᲠ｡�; ᅟႿႵრ.�; [P1, V5, V6]; xn--tndt4hvw.xn--9ic; ; ;  # ႿႵრ.�
+ᅟႿⴕრ。�; ᅟႿⴕრ.�; [P1, V5, V6]; xn--3nd0etsm92g.xn--9ic; ; ;  # Ⴟⴕრ.�
+xn--3nd0etsm92g.xn--9ic; ᅟႿⴕრ.�; [V5, V6]; xn--3nd0etsm92g.xn--9ic; ; ;  # Ⴟⴕრ.�
+ᅟႿⴕრ｡�; ᅟႿⴕრ.�; [P1, V5, V6]; xn--3nd0etsm92g.xn--9ic; ; ;  # Ⴟⴕრ.�
+🄃�.٤󠅇; 🄃�.٤; [B1, P1, V6]; xn--7n0d1189a.xn--dib; ; ;  # 🄃�.٤
+2,�.٤󠅇; 2,�.٤; [B1, P1, V6]; xn--2,-5g3o.xn--dib; ; ;  # 2,�.٤
+xn--2,-5g3o.xn--dib; 2,�.٤; [B1, P1, V6]; xn--2,-5g3o.xn--dib; ; ;  # 2,�.٤
+xn--7n0d1189a.xn--dib; 🄃�.٤; [B1, V6]; xn--7n0d1189a.xn--dib; ; ;  # 🄃�.٤
+򻲼‌ﱛ．ߒࡈ᯳; 򻲼‌ذٰ.ߒࡈ᯳; [B2, B3, B5, B6, C1, P1, V6]; xn--vgb2kq00fl213y.xn--tsb0vz43c; ; xn--vgb2kp1223g.xn--tsb0vz43c; [B2, B3, B5, B6, P1, V6] # ذٰ.ߒࡈ᯳
+򻲼‌ذٰ.ߒࡈ᯳; ; [B2, B3, B5, B6, C1, P1, V6]; xn--vgb2kq00fl213y.xn--tsb0vz43c; ; xn--vgb2kp1223g.xn--tsb0vz43c; [B2, B3, B5, B6, P1, V6] # ذٰ.ߒࡈ᯳
+xn--vgb2kp1223g.xn--tsb0vz43c; 򻲼ذٰ.ߒࡈ᯳; [B2, B3, B5, B6, V6]; xn--vgb2kp1223g.xn--tsb0vz43c; ; ;  # ذٰ.ߒࡈ᯳
+xn--vgb2kq00fl213y.xn--tsb0vz43c; 򻲼‌ذٰ.ߒࡈ᯳; [B2, B3, B5, B6, C1, V6]; xn--vgb2kq00fl213y.xn--tsb0vz43c; ; ;  # ذٰ.ߒࡈ᯳
+��𞵪‌。ᡘ𑲭឵; ��𞵪‌.ᡘ𑲭឵; [B1, C1, C2, P1, V6]; xn--0ugba05538b.xn--03e93aq365d; ; xn--l96h.xn--03e93aq365d; [P1, V6] # .ᡘ𑲭
+xn--l96h.xn--03e93aq365d; 𞵪.ᡘ𑲭឵; [V6]; xn--l96h.xn--03e93aq365d; ; ;  # .ᡘ𑲭
+xn--0ugba05538b.xn--03e93aq365d; ��𞵪‌.ᡘ𑲭឵; [B1, C1, C2, V6]; xn--0ugba05538b.xn--03e93aq365d; ; ;  # .ᡘ𑲭
+𞷻。⚄񗑇�; 𞷻.⚄񗑇�; [B1, P1, V6]; xn--qe7h.xn--c7h2966f7so4a; ; ;  # .⚄�
+xn--qe7h.xn--c7h2966f7so4a; 𞷻.⚄񗑇�; [B1, V6]; xn--qe7h.xn--c7h2966f7so4a; ; ;  # .⚄�
+꣄≠．𞠨٧; ꣄≠.𞠨٧; [B1, P1, V5, V6]; xn--1chy504c.xn--gib1777v; ; ;  # ꣄≠.𞠨٧
+꣄≠．𞠨٧; ꣄≠.𞠨٧; [B1, P1, V5, V6]; xn--1chy504c.xn--gib1777v; ; ;  # ꣄≠.𞠨٧
+꣄≠.𞠨٧; ; [B1, P1, V5, V6]; xn--1chy504c.xn--gib1777v; ; ;  # ꣄≠.𞠨٧
+꣄≠.𞠨٧; ꣄≠.𞠨٧; [B1, P1, V5, V6]; xn--1chy504c.xn--gib1777v; ; ;  # ꣄≠.𞠨٧
+xn--1chy504c.xn--gib1777v; ꣄≠.𞠨٧; [B1, V5, V6]; xn--1chy504c.xn--gib1777v; ; ;  # ꣄≠.𞠨٧
+��꣄｡꣪-; 3꣄�.꣪-; [V3, V5]; xn--3-sl4eu679e.xn----xn4e; ; ;  # 3꣄�.꣪-
+�꣄�｡꣪-; 3꣄�.꣪-; [V3, V5]; xn--3-sl4eu679e.xn----xn4e; ; ;  # 3꣄�.꣪-
+3꣄�。꣪-; 3꣄�.꣪-; [V3, V5]; xn--3-sl4eu679e.xn----xn4e; ; ;  # 3꣄�.꣪-
+xn--3-sl4eu679e.xn----xn4e; 3꣄�.꣪-; [V3, V5]; xn--3-sl4eu679e.xn----xn4e; ; ;  # 3꣄�.꣪-
+ݟᮢ်Ⴇ.4; ; [B1, B2, B3, P1, V6]; xn--jpb846bmjw88a.4; ; ;  # ݟᮢ်Ⴇ.4
+ݟᮢ်ⴇ.4; ; [B1, B2, B3]; xn--jpb846bjzj7pr.4; ; ;  # ݟᮢ်ⴇ.4
+xn--jpb846bjzj7pr.4; ݟᮢ်ⴇ.4; [B1, B2, B3]; xn--jpb846bjzj7pr.4; ; ;  # ݟᮢ်ⴇ.4
+xn--jpb846bmjw88a.4; ݟᮢ်Ⴇ.4; [B1, B2, B3, V6]; xn--jpb846bmjw88a.4; ; ;  # ݟᮢ်Ⴇ.4
+ᄹ｡໊򠯤󠄞; ᄹ.໊򠯤; [P1, V5, V6]; xn--lrd.xn--s8c05302k; ; ;  # ᄹ.໊
+ᄹ。໊򠯤󠄞; ᄹ.໊򠯤; [P1, V5, V6]; xn--lrd.xn--s8c05302k; ; ;  # ᄹ.໊
+xn--lrd.xn--s8c05302k; ᄹ.໊򠯤; [V5, V6]; xn--lrd.xn--s8c05302k; ; ;  # ᄹ.໊
+Ⴆ򻢩．󠆡︉�; Ⴆ򻢩.𞤯; [P1, V6]; xn--end82983m.xn--ne6h; ; ;  # Ⴆ.𞤯
+Ⴆ򻢩.󠆡︉�; Ⴆ򻢩.𞤯; [P1, V6]; xn--end82983m.xn--ne6h; ; ;  # Ⴆ.𞤯
+ⴆ򻢩.󠆡︉𞤯; ⴆ򻢩.𞤯; [P1, V6]; xn--xkjw3965g.xn--ne6h; ; ;  # ⴆ.𞤯
+xn--xkjw3965g.xn--ne6h; ⴆ򻢩.𞤯; [V6]; xn--xkjw3965g.xn--ne6h; ; ;  # ⴆ.𞤯
+xn--end82983m.xn--ne6h; Ⴆ򻢩.𞤯; [V6]; xn--end82983m.xn--ne6h; ; ;  # Ⴆ.𞤯
+ⴆ򻢩．󠆡︉𞤯; ⴆ򻢩.𞤯; [P1, V6]; xn--xkjw3965g.xn--ne6h; ; ;  # ⴆ.𞤯
+ⴆ򻢩.󠆡︉�; ⴆ򻢩.𞤯; [P1, V6]; xn--xkjw3965g.xn--ne6h; ; ;  # ⴆ.𞤯
+ⴆ򻢩．󠆡︉�; ⴆ򻢩.𞤯; [P1, V6]; xn--xkjw3965g.xn--ne6h; ; ;  # ⴆ.𞤯
+ßࠋ︒ٻ．帼F∬‌; ßࠋ︒ٻ.帼f∫∫‌; [B5, B6, C1, P1, V6]; xn--zca68zj8ac956c.xn--f-sgn48ga6997e; ; xn--ss-k0d31nu121d.xn--f-tcoa9162d; [B5, B6, P1, V6] # ßࠋ︒ٻ.帼f∫∫
+ßࠋ。ٻ.帼F∫∫‌; ßࠋ.ٻ.帼f∫∫‌; [B5, B6, C1]; xn--zca687a.xn--0ib.xn--f-sgn48ga6997e; ; xn--ss-uze.xn--0ib.xn--f-tcoa9162d; [B5, B6] # ßࠋ.ٻ.帼f∫∫
+ßࠋ。ٻ.帼f∫∫‌; ßࠋ.ٻ.帼f∫∫‌; [B5, B6, C1]; xn--zca687a.xn--0ib.xn--f-sgn48ga6997e; ; xn--ss-uze.xn--0ib.xn--f-tcoa9162d; [B5, B6] # ßࠋ.ٻ.帼f∫∫
+SSࠋ。ٻ.帼F∫∫‌; ssࠋ.ٻ.帼f∫∫‌; [B5, B6, C1]; xn--ss-uze.xn--0ib.xn--f-sgn48ga6997e; ; xn--ss-uze.xn--0ib.xn--f-tcoa9162d; [B5, B6] # ssࠋ.ٻ.帼f∫∫
+ssࠋ。ٻ.帼f∫∫‌; ssࠋ.ٻ.帼f∫∫‌; [B5, B6, C1]; xn--ss-uze.xn--0ib.xn--f-sgn48ga6997e; ; xn--ss-uze.xn--0ib.xn--f-tcoa9162d; [B5, B6] # ssࠋ.ٻ.帼f∫∫
+Ssࠋ。ٻ.帼F∫∫‌; ssࠋ.ٻ.帼f∫∫‌; [B5, B6, C1]; xn--ss-uze.xn--0ib.xn--f-sgn48ga6997e; ; xn--ss-uze.xn--0ib.xn--f-tcoa9162d; [B5, B6] # ssࠋ.ٻ.帼f∫∫
+xn--ss-uze.xn--0ib.xn--f-tcoa9162d; ssࠋ.ٻ.帼f∫∫; [B5, B6]; xn--ss-uze.xn--0ib.xn--f-tcoa9162d; ; ;  # ssࠋ.ٻ.帼f∫∫
+xn--ss-uze.xn--0ib.xn--f-sgn48ga6997e; ssࠋ.ٻ.帼f∫∫‌; [B5, B6, C1]; xn--ss-uze.xn--0ib.xn--f-sgn48ga6997e; ; ;  # ssࠋ.ٻ.帼f∫∫
+xn--zca687a.xn--0ib.xn--f-sgn48ga6997e; ßࠋ.ٻ.帼f∫∫‌; [B5, B6, C1]; xn--zca687a.xn--0ib.xn--f-sgn48ga6997e; ; ;  # ßࠋ.ٻ.帼f∫∫
+ßࠋ︒ٻ．帼f∬‌; ßࠋ︒ٻ.帼f∫∫‌; [B5, B6, C1, P1, V6]; xn--zca68zj8ac956c.xn--f-sgn48ga6997e; ; xn--ss-k0d31nu121d.xn--f-tcoa9162d; [B5, B6, P1, V6] # ßࠋ︒ٻ.帼f∫∫
+SSࠋ︒ٻ．帼F∬‌; ssࠋ︒ٻ.帼f∫∫‌; [B5, B6, C1, P1, V6]; xn--ss-k0d31nu121d.xn--f-sgn48ga6997e; ; xn--ss-k0d31nu121d.xn--f-tcoa9162d; [B5, B6, P1, V6] # ssࠋ︒ٻ.帼f∫∫
+ssࠋ︒ٻ．帼f∬‌; ssࠋ︒ٻ.帼f∫∫‌; [B5, B6, C1, P1, V6]; xn--ss-k0d31nu121d.xn--f-sgn48ga6997e; ; xn--ss-k0d31nu121d.xn--f-tcoa9162d; [B5, B6, P1, V6] # ssࠋ︒ٻ.帼f∫∫
+Ssࠋ︒ٻ．帼F∬‌; ssࠋ︒ٻ.帼f∫∫‌; [B5, B6, C1, P1, V6]; xn--ss-k0d31nu121d.xn--f-sgn48ga6997e; ; xn--ss-k0d31nu121d.xn--f-tcoa9162d; [B5, B6, P1, V6] # ssࠋ︒ٻ.帼f∫∫
+xn--ss-k0d31nu121d.xn--f-tcoa9162d; ssࠋ︒ٻ.帼f∫∫; [B5, B6, V6]; xn--ss-k0d31nu121d.xn--f-tcoa9162d; ; ;  # ssࠋ︒ٻ.帼f∫∫
+xn--ss-k0d31nu121d.xn--f-sgn48ga6997e; ssࠋ︒ٻ.帼f∫∫‌; [B5, B6, C1, V6]; xn--ss-k0d31nu121d.xn--f-sgn48ga6997e; ; ;  # ssࠋ︒ٻ.帼f∫∫
+xn--zca68zj8ac956c.xn--f-sgn48ga6997e; ßࠋ︒ٻ.帼f∫∫‌; [B5, B6, C1, V6]; xn--zca68zj8ac956c.xn--f-sgn48ga6997e; ; ;  # ßࠋ︒ٻ.帼f∫∫
+󘪗｡�𞨌�; 󘪗.�𞨌�; [B1, C2, P1, V6]; xn--8l83e.xn--1ug4105gsxwf; ; xn--8l83e.xn--so0dw168a; [B1, P1, V6] # .�
+󘪗。�𞨌�; 󘪗.�𞨌�; [B1, C2, P1, V6]; xn--8l83e.xn--1ug4105gsxwf; ; xn--8l83e.xn--so0dw168a; [B1, P1, V6] # .�
+xn--8l83e.xn--so0dw168a; 󘪗.�𞨌; [B1, V6]; xn--8l83e.xn--so0dw168a; ; ;  # .�
+xn--8l83e.xn--1ug4105gsxwf; 󘪗.�𞨌�; [B1, C2, V6]; xn--8l83e.xn--1ug4105gsxwf; ; ;  # .�
+񗛨.򅟢�꣄; 񗛨.򅟢6꣄; [P1, V6]; xn--mi60a.xn--6-sl4es8023c; ; ;  # .6꣄
+񗛨.򅟢6꣄; ; [P1, V6]; xn--mi60a.xn--6-sl4es8023c; ; ;  # .6꣄
+xn--mi60a.xn--6-sl4es8023c; 񗛨.򅟢6꣄; [V6]; xn--mi60a.xn--6-sl4es8023c; ; ;  # .6꣄
+᪲ﶎ。-۹ႱႨ; ᪲مخج.-۹ႱႨ; [B1, P1, V3, V5, V6]; xn--rgbd2e831i.xn----zyc155e9a; ; ;  # ᪲مخج.-۹ႱႨ
+᪲مخج。-۹ႱႨ; ᪲مخج.-۹ႱႨ; [B1, P1, V3, V5, V6]; xn--rgbd2e831i.xn----zyc155e9a; ; ;  # ᪲مخج.-۹ႱႨ
+᪲مخج。-۹ⴑⴈ; ᪲مخج.-۹ⴑⴈ; [B1, V3, V5]; xn--rgbd2e831i.xn----zyc3430a9a; ; ;  # ᪲مخج.-۹ⴑⴈ
+xn--rgbd2e831i.xn----zyc3430a9a; ᪲مخج.-۹ⴑⴈ; [B1, V3, V5]; xn--rgbd2e831i.xn----zyc3430a9a; ; ;  # ᪲مخج.-۹ⴑⴈ
+xn--rgbd2e831i.xn----zyc155e9a; ᪲مخج.-۹ႱႨ; [B1, V3, V5, V6]; xn--rgbd2e831i.xn----zyc155e9a; ; ;  # ᪲مخج.-۹ႱႨ
+᪲ﶎ。-۹ⴑⴈ; ᪲مخج.-۹ⴑⴈ; [B1, V3, V5]; xn--rgbd2e831i.xn----zyc3430a9a; ; ;  # ᪲مخج.-۹ⴑⴈ
+᪲مخج。-۹Ⴑⴈ; ᪲مخج.-۹Ⴑⴈ; [B1, P1, V3, V5, V6]; xn--rgbd2e831i.xn----zyc875efr3a; ; ;  # ᪲مخج.-۹Ⴑⴈ
+xn--rgbd2e831i.xn----zyc875efr3a; ᪲مخج.-۹Ⴑⴈ; [B1, V3, V5, V6]; xn--rgbd2e831i.xn----zyc875efr3a; ; ;  # ᪲مخج.-۹Ⴑⴈ
+᪲ﶎ。-۹Ⴑⴈ; ᪲مخج.-۹Ⴑⴈ; [B1, P1, V3, V5, V6]; xn--rgbd2e831i.xn----zyc875efr3a; ; ;  # ᪲مخج.-۹Ⴑⴈ
+𞤤．-ࢣ︒; 𞤤.-ࢣ︒; [B1, P1, V3, V6]; xn--ce6h.xn----cod7069p; ; ;  # 𞤤.-ࢣ︒
+𞤤.-ࢣ。; 𞤤.-ࢣ.; [B1, V3]; xn--ce6h.xn----cod.; ; ;  # 𞤤.-ࢣ.
+𞤂.-ࢣ。; 𞤤.-ࢣ.; [B1, V3]; xn--ce6h.xn----cod.; ; ;  # 𞤤.-ࢣ.
+xn--ce6h.xn----cod.; 𞤤.-ࢣ.; [B1, V3]; xn--ce6h.xn----cod.; ; ;  # 𞤤.-ࢣ.
+𞤂．-ࢣ︒; 𞤤.-ࢣ︒; [B1, P1, V3, V6]; xn--ce6h.xn----cod7069p; ; ;  # 𞤤.-ࢣ︒
+xn--ce6h.xn----cod7069p; 𞤤.-ࢣ︒; [B1, V3, V6]; xn--ce6h.xn----cod7069p; ; ;  # 𞤤.-ࢣ︒
+‌�.࡙--; ; [B1, C1, P1, V3, V5, V6]; xn--0ug7905g.xn-----h6e; ; xn--9p0d.xn-----h6e; [B1, P1, V3, V5, V6] # �.࡙--
+xn--9p0d.xn-----h6e; �.࡙--; [B1, V3, V5, V6]; xn--9p0d.xn-----h6e; ; ;  # �.࡙--
+xn--0ug7905g.xn-----h6e; ‌�.࡙--; [B1, C1, V3, V5, V6]; xn--0ug7905g.xn-----h6e; ; ;  # �.࡙--
+�󮘋Ⴢ.Ⴁ; ; [P1, V6]; xn--6nd5215jr2u0h.xn--8md; ; ;  # �Ⴢ.Ⴁ
+�󮘋ⴢ.�; ; [P1, V6]; xn--qlj1559dr224h.xn--skj; ; ;  # �ⴢ.�
+�󮘋Ⴢ.�; ; [P1, V6]; xn--6nd5215jr2u0h.xn--skj; ; ;  # �Ⴢ.�
+xn--6nd5215jr2u0h.xn--skj; �󮘋Ⴢ.�; [V6]; xn--6nd5215jr2u0h.xn--skj; ; ;  # �Ⴢ.�
+xn--qlj1559dr224h.xn--skj; �󮘋ⴢ.�; [V6]; xn--qlj1559dr224h.xn--skj; ; ;  # �ⴢ.�
+xn--6nd5215jr2u0h.xn--8md; �󮘋Ⴢ.Ⴁ; [V6]; xn--6nd5215jr2u0h.xn--8md; ; ;  # �Ⴢ.Ⴁ
+񗑿꠆₄򩞆｡𲩧󠒹ς; 񗑿꠆4򩞆.𲩧󠒹ς; [P1, V6]; xn--4-w93ej7463a9io5a.xn--3xa51142bk3f0d; ; xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d;  # ꠆4.ς
+񗑿꠆4򩞆。𲩧󠒹ς; 񗑿꠆4򩞆.𲩧󠒹ς; [P1, V6]; xn--4-w93ej7463a9io5a.xn--3xa51142bk3f0d; ; xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d;  # ꠆4.ς
+񗑿꠆4򩞆。𲩧󠒹Σ; 񗑿꠆4򩞆.𲩧󠒹σ; [P1, V6]; xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d; ; ;  # ꠆4.σ
+񗑿꠆4򩞆。𲩧󠒹σ; 񗑿꠆4򩞆.𲩧󠒹σ; [P1, V6]; xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d; ; ;  # ꠆4.σ
+xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d; 񗑿꠆4򩞆.𲩧󠒹σ; [V6]; xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d; ; ;  # ꠆4.σ
+xn--4-w93ej7463a9io5a.xn--3xa51142bk3f0d; 񗑿꠆4򩞆.𲩧󠒹ς; [V6]; xn--4-w93ej7463a9io5a.xn--3xa51142bk3f0d; ; ;  # ꠆4.ς
+񗑿꠆₄򩞆｡𲩧󠒹Σ; 񗑿꠆4򩞆.𲩧󠒹σ; [P1, V6]; xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d; ; ;  # ꠆4.σ
+񗑿꠆₄򩞆｡𲩧󠒹σ; 񗑿꠆4򩞆.𲩧󠒹σ; [P1, V6]; xn--4-w93ej7463a9io5a.xn--4xa31142bk3f0d; ; ;  # ꠆4.σ
+󠆀ܣ。ᷴݵ; ܣ.ᷴݵ; [B1, V5]; xn--tnb.xn--5pb136i; ; ;  # ܣ.ᷴݵ
+xn--tnb.xn--5pb136i; ܣ.ᷴݵ; [B1, V5]; xn--tnb.xn--5pb136i; ; ;  # ܣ.ᷴݵ
+�ࡂ�｡𬼖Ⴑ�; �ࡂ�.𬼖Ⴑ�; [B1, B6, C2, P1, V6]; xn--0vb1535kdb6e.xn--pnd879eqy33c; ; xn--0vb1535kdb6e.xn--pnd93707a; [B1, P1, V6] # �ࡂ�.𬼖Ⴑ
+�ࡂ�。𬼖Ⴑ�; �ࡂ�.𬼖Ⴑ�; [B1, B6, C2, P1, V6]; xn--0vb1535kdb6e.xn--pnd879eqy33c; ; xn--0vb1535kdb6e.xn--pnd93707a; [B1, P1, V6] # �ࡂ�.𬼖Ⴑ
+�ࡂ�。𬼖ⴑ�; �ࡂ�.𬼖ⴑ�; [B1, B6, C2]; xn--0vb1535kdb6e.xn--1ug742c5714c; ; xn--0vb1535kdb6e.xn--8kjz186s; [B1] # �ࡂ�.𬼖ⴑ
+xn--0vb1535kdb6e.xn--8kjz186s; �ࡂ�.𬼖ⴑ; [B1]; xn--0vb1535kdb6e.xn--8kjz186s; ; ;  # �ࡂ�.𬼖ⴑ
+xn--0vb1535kdb6e.xn--1ug742c5714c; �ࡂ�.𬼖ⴑ�; [B1, B6, C2]; xn--0vb1535kdb6e.xn--1ug742c5714c; ; ;  # �ࡂ�.𬼖ⴑ
+xn--0vb1535kdb6e.xn--pnd93707a; �ࡂ�.𬼖Ⴑ; [B1, V6]; xn--0vb1535kdb6e.xn--pnd93707a; ; ;  # �ࡂ�.𬼖Ⴑ
+xn--0vb1535kdb6e.xn--pnd879eqy33c; �ࡂ�.𬼖Ⴑ�; [B1, B6, C2, V6]; xn--0vb1535kdb6e.xn--pnd879eqy33c; ; ;  # �ࡂ�.𬼖Ⴑ
+�ࡂ�｡𬼖ⴑ�; �ࡂ�.𬼖ⴑ�; [B1, B6, C2]; xn--0vb1535kdb6e.xn--1ug742c5714c; ; xn--0vb1535kdb6e.xn--8kjz186s; [B1] # �ࡂ�.𬼖ⴑ
+᜔�󠙘�｡-�; ᜔�󠙘�.-�; [B1, C2, P1, V3, V5, V6]; xn--fze807bso0spy14i.xn----c36i; ; xn--fze4126jujt0g.xn----c36i; [B1, P1, V3, V5, V6] # ᜔�.-�
+᜔�󠙘�。-�; ᜔�󠙘�.-�; [B1, C2, P1, V3, V5, V6]; xn--fze807bso0spy14i.xn----c36i; ; xn--fze4126jujt0g.xn----c36i; [B1, P1, V3, V5, V6] # ᜔�.-�
+xn--fze4126jujt0g.xn----c36i; ᜔�󠙘.-�; [B1, V3, V5, V6]; xn--fze4126jujt0g.xn----c36i; ; ;  # ᜔�.-�
+xn--fze807bso0spy14i.xn----c36i; ᜔�󠙘�.-�; [B1, C2, V3, V5, V6]; xn--fze807bso0spy14i.xn----c36i; ; ;  # ᜔�.-�
+𾢬｡ܩ︒쯙�; 𾢬.ܩ︒쯙5; [B2, P1, V6]; xn--t92s.xn--5-p1c0712mm8rb; ; ;  # .ܩ︒쯙5
+𾢬｡ܩ︒�ᅳᆬ�; 𾢬.ܩ︒쯙5; [B2, P1, V6]; xn--t92s.xn--5-p1c0712mm8rb; ; ;  # .ܩ︒쯙5
+𾢬。ܩ。쯙5; 𾢬.ܩ.쯙5; [P1, V6]; xn--t92s.xn--znb.xn--5-y88f; ; ;  # .ܩ.쯙5
+𾢬。ܩ。�ᅳᆬ5; 𾢬.ܩ.쯙5; [P1, V6]; xn--t92s.xn--znb.xn--5-y88f; ; ;  # .ܩ.쯙5
+xn--t92s.xn--znb.xn--5-y88f; 𾢬.ܩ.쯙5; [V6]; xn--t92s.xn--znb.xn--5-y88f; ; ;  # .ܩ.쯙5
+xn--t92s.xn--5-p1c0712mm8rb; 𾢬.ܩ︒쯙5; [B2, V6]; xn--t92s.xn--5-p1c0712mm8rb; ; ;  # .ܩ︒쯙5
+𞤟-。ݢ≮�; �-.ݢ≮�; [B2, B3, P1, V3, V6]; xn----1j8r.xn--mpb269krv4i; ; ;  # �-.ݢ≮�
+𞤟-。ݢ≮뻐; �-.ݢ≮�; [B2, B3, P1, V3, V6]; xn----1j8r.xn--mpb269krv4i; ; ;  # �-.ݢ≮�
+�-。ݢ≮뻐; �-.ݢ≮�; [B2, B3, P1, V3, V6]; xn----1j8r.xn--mpb269krv4i; ; ;  # �-.ݢ≮�
+�-。ݢ≮�; �-.ݢ≮�; [B2, B3, P1, V3, V6]; xn----1j8r.xn--mpb269krv4i; ; ;  # �-.ݢ≮�
+xn----1j8r.xn--mpb269krv4i; �-.ݢ≮�; [B2, B3, V3, V6]; xn----1j8r.xn--mpb269krv4i; ; ;  # �-.ݢ≮�
+𞥩-򊫠．ࢴ≠; 𞥩-򊫠.ࢴ≠; [B2, B3, P1, V6]; xn----cm8rp3609a.xn--9yb852k; ; ;  # -.ࢴ≠
+𞥩-򊫠．ࢴ≠; 𞥩-򊫠.ࢴ≠; [B2, B3, P1, V6]; xn----cm8rp3609a.xn--9yb852k; ; ;  # -.ࢴ≠
+𞥩-򊫠.ࢴ≠; ; [B2, B3, P1, V6]; xn----cm8rp3609a.xn--9yb852k; ; ;  # -.ࢴ≠
+𞥩-򊫠.ࢴ≠; 𞥩-򊫠.ࢴ≠; [B2, B3, P1, V6]; xn----cm8rp3609a.xn--9yb852k; ; ;  # -.ࢴ≠
+xn----cm8rp3609a.xn--9yb852k; 𞥩-򊫠.ࢴ≠; [B2, B3, V6]; xn----cm8rp3609a.xn--9yb852k; ; ;  # -.ࢴ≠
+-�ςႼ．١; -�ςႼ.١; [B1, P1, V3, V6]; xn----ymb080hun11i.xn--9hb; ; xn----0mb770hun11i.xn--9hb;  # -ςႼ.١
+-�ςႼ.١; ; [B1, P1, V3, V6]; xn----ymb080hun11i.xn--9hb; ; xn----0mb770hun11i.xn--9hb;  # -ςႼ.١
+-�ςⴜ.١; ; [B1, P1, V3, V6]; xn----ymb2782aov12f.xn--9hb; ; xn----0mb9682aov12f.xn--9hb;  # -ςⴜ.١
+-�ΣႼ.١; -�σႼ.١; [B1, P1, V3, V6]; xn----0mb770hun11i.xn--9hb; ; ;  # -σႼ.١
+-�σⴜ.١; ; [B1, P1, V3, V6]; xn----0mb9682aov12f.xn--9hb; ; ;  # -σⴜ.١
+-�Σⴜ.١; -�σⴜ.١; [B1, P1, V3, V6]; xn----0mb9682aov12f.xn--9hb; ; ;  # -σⴜ.١
+xn----0mb9682aov12f.xn--9hb; -�σⴜ.١; [B1, V3, V6]; xn----0mb9682aov12f.xn--9hb; ; ;  # -σⴜ.١
+xn----0mb770hun11i.xn--9hb; -�σႼ.١; [B1, V3, V6]; xn----0mb770hun11i.xn--9hb; ; ;  # -σႼ.١
+xn----ymb2782aov12f.xn--9hb; -�ςⴜ.١; [B1, V3, V6]; xn----ymb2782aov12f.xn--9hb; ; ;  # -ςⴜ.١
+xn----ymb080hun11i.xn--9hb; -�ςႼ.١; [B1, V3, V6]; xn----ymb080hun11i.xn--9hb; ; ;  # -ςႼ.١
+-�ςⴜ．١; -�ςⴜ.١; [B1, P1, V3, V6]; xn----ymb2782aov12f.xn--9hb; ; xn----0mb9682aov12f.xn--9hb;  # -ςⴜ.١
+-�ΣႼ．١; -�σႼ.١; [B1, P1, V3, V6]; xn----0mb770hun11i.xn--9hb; ; ;  # -σႼ.١
+-�σⴜ．١; -�σⴜ.١; [B1, P1, V3, V6]; xn----0mb9682aov12f.xn--9hb; ; ;  # -σⴜ.١
+-�Σⴜ．١; -�σⴜ.١; [B1, P1, V3, V6]; xn----0mb9682aov12f.xn--9hb; ; ;  # -σⴜ.١
+៊.��𑀿; ៊.�2𑀿; [C2, V5]; xn--m4e.xn--2-tgnv469h; ; xn--m4e.xn--2-ku7i; [V5] # ៊.2𑀿
+៊.�2𑀿; ; [C2, V5]; xn--m4e.xn--2-tgnv469h; ; xn--m4e.xn--2-ku7i; [V5] # ៊.2𑀿
+xn--m4e.xn--2-ku7i; ៊.2𑀿; [V5]; xn--m4e.xn--2-ku7i; ; ;  # ៊.2𑀿
+xn--m4e.xn--2-tgnv469h; ៊.�2𑀿; [C2, V5]; xn--m4e.xn--2-tgnv469h; ; ;  # ៊.2𑀿
+≯�｡᩠�򟇑; ≯8.᩠�򟇑; [B1, P1, V5, V6]; xn--8-ogo.xn--jof5303iv1z5d; ; ;  # ≯8.᩠�
+≯�｡᩠�򟇑; ≯8.᩠�򟇑; [B1, P1, V5, V6]; xn--8-ogo.xn--jof5303iv1z5d; ; ;  # ≯8.᩠�
+≯8。᩠�򟇑; ≯8.᩠�򟇑; [B1, P1, V5, V6]; xn--8-ogo.xn--jof5303iv1z5d; ; ;  # ≯8.᩠�
+≯8。᩠�򟇑; ≯8.᩠�򟇑; [B1, P1, V5, V6]; xn--8-ogo.xn--jof5303iv1z5d; ; ;  # ≯8.᩠�
+xn--8-ogo.xn--jof5303iv1z5d; ≯8.᩠�򟇑; [B1, V5, V6]; xn--8-ogo.xn--jof5303iv1z5d; ; ;  # ≯8.᩠�
+𑲫Ↄ٤｡‌; 𑲫Ↄ٤.‌; [B1, C1, P1, V5, V6]; xn--dib999kcy1p.xn--0ug; ; xn--dib999kcy1p.; [B1, P1, V5, V6] # 𑲫Ↄ٤.
+𑲫Ↄ٤。‌; 𑲫Ↄ٤.‌; [B1, C1, P1, V5, V6]; xn--dib999kcy1p.xn--0ug; ; xn--dib999kcy1p.; [B1, P1, V5, V6] # 𑲫Ↄ٤.
+𑲫ↄ٤。‌; 𑲫ↄ٤.‌; [B1, C1, V5]; xn--dib100l8x1p.xn--0ug; ; xn--dib100l8x1p.; [B1, V5] # 𑲫ↄ٤.
+xn--dib100l8x1p.; 𑲫ↄ٤.; [B1, V5]; xn--dib100l8x1p.; ; ;  # 𑲫ↄ٤.
+xn--dib100l8x1p.xn--0ug; 𑲫ↄ٤.‌; [B1, C1, V5]; xn--dib100l8x1p.xn--0ug; ; ;  # 𑲫ↄ٤.
+xn--dib999kcy1p.; 𑲫Ↄ٤.; [B1, V5, V6]; xn--dib999kcy1p.; ; ;  # 𑲫Ↄ٤.
+xn--dib999kcy1p.xn--0ug; 𑲫Ↄ٤.‌; [B1, C1, V5, V6]; xn--dib999kcy1p.xn--0ug; ; ;  # 𑲫Ↄ٤.
+𑲫ↄ٤｡‌; 𑲫ↄ٤.‌; [B1, C1, V5]; xn--dib100l8x1p.xn--0ug; ; xn--dib100l8x1p.; [B1, V5] # 𑲫ↄ٤.
+ఀ���.��⒈; ఀ9�بح.��⒈; [B1, C2, P1, V5, V6]; xn--9-1mcp570dl51a.xn--3ob977jmfd; ; xn--9-1mcp570d.xn--3ob470m; [B1, P1, V5, V6] # ఀ9بح.�⒈
+ఀ9�بح.��1.; ; [B1, C2, V5]; xn--9-1mcp570dl51a.xn--1-x3c211q.; ; xn--9-1mcp570d.xn--1-x3c.; [B1, V5] # ఀ9بح.�1.
+xn--9-1mcp570d.xn--1-x3c.; ఀ9بح.�1.; [B1, V5]; xn--9-1mcp570d.xn--1-x3c.; ; ;  # ఀ9بح.�1.
+xn--9-1mcp570dl51a.xn--1-x3c211q.; ఀ9�بح.��1.; [B1, C2, V5]; xn--9-1mcp570dl51a.xn--1-x3c211q.; ; ;  # ఀ9بح.�1.
+xn--9-1mcp570d.xn--3ob470m; ఀ9بح.�⒈; [B1, V5, V6]; xn--9-1mcp570d.xn--3ob470m; ; ;  # ఀ9بح.�⒈
+xn--9-1mcp570dl51a.xn--3ob977jmfd; ఀ9�بح.��⒈; [B1, C2, V5, V6]; xn--9-1mcp570dl51a.xn--3ob977jmfd; ; ;  # ఀ9بح.�⒈
+꫶。嬶ß葽; ꫶.嬶ß葽; [V5]; xn--2v9a.xn--zca7637b14za; ; xn--2v9a.xn--ss-q40dp97m;  # ꫶.嬶ß葽
+꫶。嬶SS葽; ꫶.嬶ss葽; [V5]; xn--2v9a.xn--ss-q40dp97m; ; ;  # ꫶.嬶ss葽
+꫶。嬶ss葽; ꫶.嬶ss葽; [V5]; xn--2v9a.xn--ss-q40dp97m; ; ;  # ꫶.嬶ss葽
+꫶。嬶Ss葽; ꫶.嬶ss葽; [V5]; xn--2v9a.xn--ss-q40dp97m; ; ;  # ꫶.嬶ss葽
+xn--2v9a.xn--ss-q40dp97m; ꫶.嬶ss葽; [V5]; xn--2v9a.xn--ss-q40dp97m; ; ;  # ꫶.嬶ss葽
+xn--2v9a.xn--zca7637b14za; ꫶.嬶ß葽; [V5]; xn--2v9a.xn--zca7637b14za; ; ;  # ꫶.嬶ß葽
+𑚶⒈。񞻡�; 𑚶⒈.񞻡�; [B5, B6, P1, V5, V6]; xn--tshz969f.xn--yo0d5914s; ; ;  # 𑚶⒈.�
+𑚶1.。񞻡�; 𑚶1..񞻡�; [B5, B6, P1, V5, V6, X4_2]; xn--1-3j0j..xn--yo0d5914s; [B5, B6, P1, V5, V6, A4_2]; ;  # 𑚶1..�
+xn--1-3j0j..xn--yo0d5914s; 𑚶1..񞻡�; [B5, B6, V5, V6, X4_2]; xn--1-3j0j..xn--yo0d5914s; [B5, B6, V5, V6, A4_2]; ;  # 𑚶1..�
+xn--tshz969f.xn--yo0d5914s; 𑚶⒈.񞻡�; [B5, B6, V5, V6]; xn--tshz969f.xn--yo0d5914s; ; ;  # 𑚶⒈.�
+𑜤︒≮．񚕽ט𞾩; 𑜤︒≮.񚕽ט𞾩; [B1, B5, B6, P1, V5, V6]; xn--gdh5267fdzpa.xn--deb0091w5q9u; ; ;  # 𑜤︒≮.ט
+𑜤︒≮．񚕽ט𞾩; 𑜤︒≮.񚕽ט𞾩; [B1, B5, B6, P1, V5, V6]; xn--gdh5267fdzpa.xn--deb0091w5q9u; ; ;  # 𑜤︒≮.ט
+𑜤。≮.񚕽ט𞾩; 𑜤.≮.񚕽ט𞾩; [B1, B3, B5, B6, P1, V5, V6]; xn--ci2d.xn--gdh.xn--deb0091w5q9u; ; ;  # 𑜤.≮.ט
+𑜤。≮.񚕽ט𞾩; 𑜤.≮.񚕽ט𞾩; [B1, B3, B5, B6, P1, V5, V6]; xn--ci2d.xn--gdh.xn--deb0091w5q9u; ; ;  # 𑜤.≮.ט
+xn--ci2d.xn--gdh.xn--deb0091w5q9u; 𑜤.≮.񚕽ט𞾩; [B1, B3, B5, B6, V5, V6]; xn--ci2d.xn--gdh.xn--deb0091w5q9u; ; ;  # 𑜤.≮.ט
+xn--gdh5267fdzpa.xn--deb0091w5q9u; 𑜤︒≮.񚕽ט𞾩; [B1, B5, B6, V5, V6]; xn--gdh5267fdzpa.xn--deb0091w5q9u; ; ;  # 𑜤︒≮.ט
+󠆋؃�.�ς�򺇥; ؃�.�ς�򺇥; [B1, P1, V6]; xn--lfb04106d.xn--3xa174mxv16m8moq; ; xn--lfb04106d.xn--4xa964mxv16m8moq;  # .�ς
+󠆋؃�.�Σ�򺇥; ؃�.�σ�򺇥; [B1, P1, V6]; xn--lfb04106d.xn--4xa964mxv16m8moq; ; ;  # .�σ
+󠆋؃�.�σ�򺇥; ؃�.�σ�򺇥; [B1, P1, V6]; xn--lfb04106d.xn--4xa964mxv16m8moq; ; ;  # .�σ
+xn--lfb04106d.xn--4xa964mxv16m8moq; ؃�.�σ�򺇥; [B1, V6]; xn--lfb04106d.xn--4xa964mxv16m8moq; ; ;  # .�σ
+xn--lfb04106d.xn--3xa174mxv16m8moq; ؃�.�ς�򺇥; [B1, V6]; xn--lfb04106d.xn--3xa174mxv16m8moq; ; ;  # .�ς
+ς�𵢈𑜫｡𞬩‌�; ς�𵢈𑜫.𞬩‌�; [C1, P1, V6]; xn--3xa4260lk3b8z15g.xn--0ug4653g2xzf; ; xn--4xa2260lk3b8z15g.xn--tw9ct349a; [P1, V6] # ς�𑜫.�
+ς�𵢈𑜫。𞬩‌�; ς�𵢈𑜫.𞬩‌�; [C1, P1, V6]; xn--3xa4260lk3b8z15g.xn--0ug4653g2xzf; ; xn--4xa2260lk3b8z15g.xn--tw9ct349a; [P1, V6] # ς�𑜫.�
+Σ�𵢈𑜫。𞬩‌�; σ�𵢈𑜫.𞬩‌�; [C1, P1, V6]; xn--4xa2260lk3b8z15g.xn--0ug4653g2xzf; ; xn--4xa2260lk3b8z15g.xn--tw9ct349a; [P1, V6] # σ�𑜫.�
+σ�𵢈𑜫。𞬩‌�; σ�𵢈𑜫.𞬩‌�; [C1, P1, V6]; xn--4xa2260lk3b8z15g.xn--0ug4653g2xzf; ; xn--4xa2260lk3b8z15g.xn--tw9ct349a; [P1, V6] # σ�𑜫.�
+xn--4xa2260lk3b8z15g.xn--tw9ct349a; σ�𵢈𑜫.𞬩�; [V6]; xn--4xa2260lk3b8z15g.xn--tw9ct349a; ; ;  # σ�𑜫.�
+xn--4xa2260lk3b8z15g.xn--0ug4653g2xzf; σ�𵢈𑜫.𞬩‌�; [C1, V6]; xn--4xa2260lk3b8z15g.xn--0ug4653g2xzf; ; ;  # σ�𑜫.�
+xn--3xa4260lk3b8z15g.xn--0ug4653g2xzf; ς�𵢈𑜫.𞬩‌�; [C1, V6]; xn--3xa4260lk3b8z15g.xn--0ug4653g2xzf; ; ;  # ς�𑜫.�
+Σ�𵢈𑜫｡𞬩‌�; σ�𵢈𑜫.𞬩‌�; [C1, P1, V6]; xn--4xa2260lk3b8z15g.xn--0ug4653g2xzf; ; xn--4xa2260lk3b8z15g.xn--tw9ct349a; [P1, V6] # σ�𑜫.�
+σ�𵢈𑜫｡𞬩‌�; σ�𵢈𑜫.𞬩‌�; [C1, P1, V6]; xn--4xa2260lk3b8z15g.xn--0ug4653g2xzf; ; xn--4xa2260lk3b8z15g.xn--tw9ct349a; [P1, V6] # σ�𑜫.�
+-�｡-ﱌݛ; -�.-نحݛ; [B1, P1, V3, V6]; xn----o452j.xn----cnc8e38c; ; ;  # -.-نحݛ
+-�。-نحݛ; -�.-نحݛ; [B1, P1, V3, V6]; xn----o452j.xn----cnc8e38c; ; ;  # -.-نحݛ
+xn----o452j.xn----cnc8e38c; -�.-نحݛ; [B1, V3, V6]; xn----o452j.xn----cnc8e38c; ; ;  # -.-نحݛ
+⺢򇺅�｡�🚷; ⺢򇺅2.�🚷; [C2, P1, V6]; xn--2-4jtr4282f.xn--1ugz946p; ; xn--2-4jtr4282f.xn--m78h; [P1, V6] # ⺢2.🚷
+⺢򇺅2。�🚷; ⺢򇺅2.�🚷; [C2, P1, V6]; xn--2-4jtr4282f.xn--1ugz946p; ; xn--2-4jtr4282f.xn--m78h; [P1, V6] # ⺢2.🚷
+xn--2-4jtr4282f.xn--m78h; ⺢򇺅2.🚷; [V6]; xn--2-4jtr4282f.xn--m78h; ; ;  # ⺢2.🚷
+xn--2-4jtr4282f.xn--1ugz946p; ⺢򇺅2.�🚷; [C2, V6]; xn--2-4jtr4282f.xn--1ugz946p; ; ;  # ⺢2.🚷
+೸�ⷾ�｡�; ೸�ⷾ�.�; [B5, B6, C2, P1, V6]; xn--hvc488g69j402t.xn--3e36c; ; xn--hvc220of37m.xn--3e36c; [B5, B6, P1, V6] # ⷾ�.
+೸�ⷾ�。�; ೸�ⷾ�.�; [B5, B6, C2, P1, V6]; xn--hvc488g69j402t.xn--3e36c; ; xn--hvc220of37m.xn--3e36c; [B5, B6, P1, V6] # ⷾ�.
+xn--hvc220of37m.xn--3e36c; ೸ⷾ�.�; [B5, B6, V6]; xn--hvc220of37m.xn--3e36c; ; ;  # ⷾ�.
+xn--hvc488g69j402t.xn--3e36c; ೸�ⷾ�.�; [B5, B6, C2, V6]; xn--hvc488g69j402t.xn--3e36c; ; ;  # ⷾ�.
+�．Ⴍ₉�; �.Ⴍ98; [B1, P1, V6]; xn--9n0d.xn--98-7ek; ; ;  # �.Ⴍ98
+�.Ⴍ98; ; [B1, P1, V6]; xn--9n0d.xn--98-7ek; ; ;  # �.Ⴍ98
+�.�98; ; [B1]; xn--9n0d.xn--98-u61a; ; ;  # �.�98
+xn--9n0d.xn--98-u61a; �.�98; [B1]; xn--9n0d.xn--98-u61a; ; ;  # �.�98
+xn--9n0d.xn--98-7ek; �.Ⴍ98; [B1, V6]; xn--9n0d.xn--98-7ek; ; ;  # �.Ⴍ98
+�．�₉�; �.�98; [B1]; xn--9n0d.xn--98-u61a; ; ;  # �.�98
+‌�｡ß࣢⒚≯; ‌.ß࣢⒚≯; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--zca612bx9vo5b; ; .xn--ss-9if872xjjc; [B5, B6, P1, V6, A4_2] # .ß⒚≯
+‌�｡ß࣢⒚≯; ‌.ß࣢⒚≯; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--zca612bx9vo5b; ; .xn--ss-9if872xjjc; [B5, B6, P1, V6, A4_2] # .ß⒚≯
+‌�。ß࣢19.≯; ‌.ß࣢19.≯; [B1, B5, C1, P1, V6]; xn--0ug.xn--19-fia813f.xn--hdh; ; .xn--ss19-w0i.xn--hdh; [B1, B5, P1, V6, A4_2] # .ß19.≯
+‌�。ß࣢19.≯; ‌.ß࣢19.≯; [B1, B5, C1, P1, V6]; xn--0ug.xn--19-fia813f.xn--hdh; ; .xn--ss19-w0i.xn--hdh; [B1, B5, P1, V6, A4_2] # .ß19.≯
+‌�。SS࣢19.≯; ‌.ss࣢19.≯; [B1, B5, C1, P1, V6]; xn--0ug.xn--ss19-w0i.xn--hdh; ; .xn--ss19-w0i.xn--hdh; [B1, B5, P1, V6, A4_2] # .ss19.≯
+‌�。SS࣢19.≯; ‌.ss࣢19.≯; [B1, B5, C1, P1, V6]; xn--0ug.xn--ss19-w0i.xn--hdh; ; .xn--ss19-w0i.xn--hdh; [B1, B5, P1, V6, A4_2] # .ss19.≯
+‌�。ss࣢19.≯; ‌.ss࣢19.≯; [B1, B5, C1, P1, V6]; xn--0ug.xn--ss19-w0i.xn--hdh; ; .xn--ss19-w0i.xn--hdh; [B1, B5, P1, V6, A4_2] # .ss19.≯
+‌�。ss࣢19.≯; ‌.ss࣢19.≯; [B1, B5, C1, P1, V6]; xn--0ug.xn--ss19-w0i.xn--hdh; ; .xn--ss19-w0i.xn--hdh; [B1, B5, P1, V6, A4_2] # .ss19.≯
+‌�。Ss࣢19.≯; ‌.ss࣢19.≯; [B1, B5, C1, P1, V6]; xn--0ug.xn--ss19-w0i.xn--hdh; ; .xn--ss19-w0i.xn--hdh; [B1, B5, P1, V6, A4_2] # .ss19.≯
+‌�。Ss࣢19.≯; ‌.ss࣢19.≯; [B1, B5, C1, P1, V6]; xn--0ug.xn--ss19-w0i.xn--hdh; ; .xn--ss19-w0i.xn--hdh; [B1, B5, P1, V6, A4_2] # .ss19.≯
+.xn--ss19-w0i.xn--hdh; .ss࣢19.≯; [B1, B5, V6, X4_2]; .xn--ss19-w0i.xn--hdh; [B1, B5, V6, A4_2]; ;  # .ss19.≯
+xn--0ug.xn--ss19-w0i.xn--hdh; ‌.ss࣢19.≯; [B1, B5, C1, V6]; xn--0ug.xn--ss19-w0i.xn--hdh; ; ;  # .ss19.≯
+xn--0ug.xn--19-fia813f.xn--hdh; ‌.ß࣢19.≯; [B1, B5, C1, V6]; xn--0ug.xn--19-fia813f.xn--hdh; ; ;  # .ß19.≯
+‌�｡SS࣢⒚≯; ‌.ss࣢⒚≯; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--ss-9if872xjjc; ; .xn--ss-9if872xjjc; [B5, B6, P1, V6, A4_2] # .ss⒚≯
+‌�｡SS࣢⒚≯; ‌.ss࣢⒚≯; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--ss-9if872xjjc; ; .xn--ss-9if872xjjc; [B5, B6, P1, V6, A4_2] # .ss⒚≯
+‌�｡ss࣢⒚≯; ‌.ss࣢⒚≯; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--ss-9if872xjjc; ; .xn--ss-9if872xjjc; [B5, B6, P1, V6, A4_2] # .ss⒚≯
+‌�｡ss࣢⒚≯; ‌.ss࣢⒚≯; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--ss-9if872xjjc; ; .xn--ss-9if872xjjc; [B5, B6, P1, V6, A4_2] # .ss⒚≯
+‌�｡Ss࣢⒚≯; ‌.ss࣢⒚≯; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--ss-9if872xjjc; ; .xn--ss-9if872xjjc; [B5, B6, P1, V6, A4_2] # .ss⒚≯
+‌�｡Ss࣢⒚≯; ‌.ss࣢⒚≯; [B1, B5, B6, C1, P1, V6]; xn--0ug.xn--ss-9if872xjjc; ; .xn--ss-9if872xjjc; [B5, B6, P1, V6, A4_2] # .ss⒚≯
+.xn--ss-9if872xjjc; .ss࣢⒚≯; [B5, B6, V6, X4_2]; .xn--ss-9if872xjjc; [B5, B6, V6, A4_2]; ;  # .ss⒚≯
+xn--0ug.xn--ss-9if872xjjc; ‌.ss࣢⒚≯; [B1, B5, B6, C1, V6]; xn--0ug.xn--ss-9if872xjjc; ; ;  # .ss⒚≯
+xn--0ug.xn--zca612bx9vo5b; ‌.ß࣢⒚≯; [B1, B5, B6, C1, V6]; xn--0ug.xn--zca612bx9vo5b; ; ;  # .ß⒚≯
+‌�ᡌ．𣃔; ‌�ᡌ.𣃔; [B1, C1, P1, V6]; xn--c8e180bqz13b.xn--od1j; ; xn--c8e5919u.xn--od1j; [B2, B3, P1, V6] # ᡌ.𣃔
+‌�ᡌ.𣃔; ; [B1, C1, P1, V6]; xn--c8e180bqz13b.xn--od1j; ; xn--c8e5919u.xn--od1j; [B2, B3, P1, V6] # ᡌ.𣃔
+xn--c8e5919u.xn--od1j; �ᡌ.𣃔; [B2, B3, V6]; xn--c8e5919u.xn--od1j; ; ;  # ᡌ.𣃔
+xn--c8e180bqz13b.xn--od1j; ‌�ᡌ.𣃔; [B1, C1, V6]; xn--c8e180bqz13b.xn--od1j; ; ;  # ᡌ.𣃔
+��-񡢬。ྠႻ��; ��-񡢬.ྠႻ��; [B1, B2, B3, P1, V5, V6]; xn----8bd11730jefvw.xn--wfd08cd265hgsxa; ; ;  # �-.ྠႻ�
+��-񡢬。ྠⴛ��; ��-񡢬.ྠⴛ��; [B1, B2, B3, P1, V5, V6]; xn----8bd11730jefvw.xn--wfd802mpm20agsxa; ; ;  # �-.ྠⴛ�
+xn----8bd11730jefvw.xn--wfd802mpm20agsxa; ��-񡢬.ྠⴛ��; [B1, B2, B3, V5, V6]; xn----8bd11730jefvw.xn--wfd802mpm20agsxa; ; ;  # �-.ྠⴛ�
+xn----8bd11730jefvw.xn--wfd08cd265hgsxa; ��-񡢬.ྠႻ��; [B1, B2, B3, V5, V6]; xn----8bd11730jefvw.xn--wfd08cd265hgsxa; ; ;  # �-.ྠႻ�
+�。⫟𑈾; �.⫟𑈾; [V5]; xn--n82h.xn--63iw010f; ; ;  # �.⫟𑈾
+xn--n82h.xn--63iw010f; �.⫟𑈾; [V5]; xn--n82h.xn--63iw010f; ; ;  # �.⫟𑈾
+⾛ݓ.Ⴕ𞠬؄�; 走ݓ.Ⴕ𞠬؄�; [B5, B6, C2, P1, V6]; xn--6ob9779d.xn--mfb785czmm0y85b; ; xn--6ob9779d.xn--mfb785ck569a; [B5, B6, P1, V6] # 走ݓ.Ⴕ𞠬
+走ݓ.Ⴕ𞠬؄�; ; [B5, B6, C2, P1, V6]; xn--6ob9779d.xn--mfb785czmm0y85b; ; xn--6ob9779d.xn--mfb785ck569a; [B5, B6, P1, V6] # 走ݓ.Ⴕ𞠬
+走ݓ.ⴕ𞠬؄�; ; [B5, B6, C2, P1, V6]; xn--6ob9779d.xn--mfb444k5gjt754b; ; xn--6ob9779d.xn--mfb511rxu80a; [B5, B6, P1, V6] # 走ݓ.ⴕ𞠬
+xn--6ob9779d.xn--mfb511rxu80a; 走ݓ.ⴕ𞠬؄; [B5, B6, V6]; xn--6ob9779d.xn--mfb511rxu80a; ; ;  # 走ݓ.ⴕ𞠬
+xn--6ob9779d.xn--mfb444k5gjt754b; 走ݓ.ⴕ𞠬؄�; [B5, B6, C2, V6]; xn--6ob9779d.xn--mfb444k5gjt754b; ; ;  # 走ݓ.ⴕ𞠬
+xn--6ob9779d.xn--mfb785ck569a; 走ݓ.Ⴕ𞠬؄; [B5, B6, V6]; xn--6ob9779d.xn--mfb785ck569a; ; ;  # 走ݓ.Ⴕ𞠬
+xn--6ob9779d.xn--mfb785czmm0y85b; 走ݓ.Ⴕ𞠬؄�; [B5, B6, C2, V6]; xn--6ob9779d.xn--mfb785czmm0y85b; ; ;  # 走ݓ.Ⴕ𞠬
+⾛ݓ.ⴕ𞠬؄�; 走ݓ.ⴕ𞠬؄�; [B5, B6, C2, P1, V6]; xn--6ob9779d.xn--mfb444k5gjt754b; ; xn--6ob9779d.xn--mfb511rxu80a; [B5, B6, P1, V6] # 走ݓ.ⴕ𞠬
+-ᢗ‌🄄.𑜢; ; [C1, P1, V3, V5, V6]; xn----pck312bx563c.xn--9h2d; ; xn----pck1820x.xn--9h2d; [P1, V3, V5, V6] # -ᢗ🄄.𑜢
+-ᢗ‌3,.𑜢; ; [C1, P1, V3, V5, V6]; xn---3,-3eu051c.xn--9h2d; ; xn---3,-3eu.xn--9h2d; [P1, V3, V5, V6] # -ᢗ3,.𑜢
+xn---3,-3eu.xn--9h2d; -ᢗ3,.𑜢; [P1, V3, V5, V6]; xn---3,-3eu.xn--9h2d; ; ;  # -ᢗ3,.𑜢
+xn---3,-3eu051c.xn--9h2d; -ᢗ‌3,.𑜢; [C1, P1, V3, V5, V6]; xn---3,-3eu051c.xn--9h2d; ; ;  # -ᢗ3,.𑜢
+xn----pck1820x.xn--9h2d; -ᢗ🄄.𑜢; [V3, V5, V6]; xn----pck1820x.xn--9h2d; ; ;  # -ᢗ🄄.𑜢
+xn----pck312bx563c.xn--9h2d; -ᢗ‌🄄.𑜢; [C1, V3, V5, V6]; xn----pck312bx563c.xn--9h2d; ; ;  # -ᢗ🄄.𑜢
+≠��‌.Ⴚ򳄠; ; [B1, C1, P1, V6]; xn--0ug83gn618a21ov.xn--ynd49496l; ; xn--1ch2293gv3nr.xn--ynd49496l; [B1, P1, V6] # ≠.Ⴚ
+≠��‌.Ⴚ򳄠; ≠��‌.Ⴚ򳄠; [B1, C1, P1, V6]; xn--0ug83gn618a21ov.xn--ynd49496l; ; xn--1ch2293gv3nr.xn--ynd49496l; [B1, P1, V6] # ≠.Ⴚ
+≠��‌.ⴚ򳄠; ≠��‌.ⴚ򳄠; [B1, C1, P1, V6]; xn--0ug83gn618a21ov.xn--ilj23531g; ; xn--1ch2293gv3nr.xn--ilj23531g; [B1, P1, V6] # ≠.ⴚ
+≠��‌.ⴚ򳄠; ; [B1, C1, P1, V6]; xn--0ug83gn618a21ov.xn--ilj23531g; ; xn--1ch2293gv3nr.xn--ilj23531g; [B1, P1, V6] # ≠.ⴚ
+xn--1ch2293gv3nr.xn--ilj23531g; ≠��.ⴚ򳄠; [B1, V6]; xn--1ch2293gv3nr.xn--ilj23531g; ; ;  # ≠.ⴚ
+xn--0ug83gn618a21ov.xn--ilj23531g; ≠��‌.ⴚ򳄠; [B1, C1, V6]; xn--0ug83gn618a21ov.xn--ilj23531g; ; ;  # ≠.ⴚ
+xn--1ch2293gv3nr.xn--ynd49496l; ≠��.Ⴚ򳄠; [B1, V6]; xn--1ch2293gv3nr.xn--ynd49496l; ; ;  # ≠.Ⴚ
+xn--0ug83gn618a21ov.xn--ynd49496l; ≠��‌.Ⴚ򳄠; [B1, C1, V6]; xn--0ug83gn618a21ov.xn--ynd49496l; ; ;  # ≠.Ⴚ
+٩｡󠇀𑇊; ٩.𑇊; [B1, B3, B6, V5]; xn--iib.xn--6d1d; ; ;  # ٩.𑇊
+٩。󠇀𑇊; ٩.𑇊; [B1, B3, B6, V5]; xn--iib.xn--6d1d; ; ;  # ٩.𑇊
+xn--iib.xn--6d1d; ٩.𑇊; [B1, B3, B6, V5]; xn--iib.xn--6d1d; ; ;  # ٩.𑇊
+ႆ𞶀≯�。-; ႆ𞶀≯�.-; [B1, P1, V3, V5, V6]; xn--hmd482gqqb8730g.-; ; ;  # ႆ≯�.-
+ႆ𞶀≯�。-; ႆ𞶀≯�.-; [B1, P1, V3, V5, V6]; xn--hmd482gqqb8730g.-; ; ;  # ႆ≯�.-
+ႆ𞶀≯6.。-; ႆ𞶀≯6..-; [B1, P1, V3, V5, V6, X4_2]; xn--6-oyg968k7h74b..-; [B1, P1, V3, V5, V6, A4_2]; ;  # ႆ≯6..-
+ႆ𞶀≯6.。-; ႆ𞶀≯6..-; [B1, P1, V3, V5, V6, X4_2]; xn--6-oyg968k7h74b..-; [B1, P1, V3, V5, V6, A4_2]; ;  # ႆ≯6..-
+xn--6-oyg968k7h74b..-; ႆ𞶀≯6..-; [B1, V3, V5, V6, X4_2]; xn--6-oyg968k7h74b..-; [B1, V3, V5, V6, A4_2]; ;  # ႆ≯6..-
+xn--hmd482gqqb8730g.-; ႆ𞶀≯�.-; [B1, V3, V5, V6]; xn--hmd482gqqb8730g.-; ; ;  # ႆ≯�.-
+឴.쮇-; ; [P1, V3, V5, V6]; xn--z3e.xn----938f; ; ;  # .쮇-
+឴.�ᅰᆮ-; ឴.쮇-; [P1, V3, V5, V6]; xn--z3e.xn----938f; ; ;  # .쮇-
+xn--z3e.xn----938f; ឴.쮇-; [V3, V5, V6]; xn--z3e.xn----938f; ; ;  # .쮇-
+‌𑓂。⒈-􀪛; ‌𑓂.⒈-􀪛; [C1, P1, V6]; xn--0ugy057g.xn----dcp29674o; ; xn--wz1d.xn----dcp29674o; [P1, V5, V6] # 𑓂.⒈-
+‌𑓂。1.-􀪛; ‌𑓂.1.-􀪛; [C1, P1, V3, V6]; xn--0ugy057g.1.xn----rg03o; ; xn--wz1d.1.xn----rg03o; [P1, V3, V5, V6] # 𑓂.1.-
+xn--wz1d.1.xn----rg03o; 𑓂.1.-􀪛; [V3, V5, V6]; xn--wz1d.1.xn----rg03o; ; ;  # 𑓂.1.-
+xn--0ugy057g.1.xn----rg03o; ‌𑓂.1.-􀪛; [C1, V3, V6]; xn--0ugy057g.1.xn----rg03o; ; ;  # 𑓂.1.-
+xn--wz1d.xn----dcp29674o; 𑓂.⒈-􀪛; [V5, V6]; xn--wz1d.xn----dcp29674o; ; ;  # 𑓂.⒈-
+xn--0ugy057g.xn----dcp29674o; ‌𑓂.⒈-􀪛; [C1, V6]; xn--0ugy057g.xn----dcp29674o; ; ;  # 𑓂.⒈-
+⒈ﺮ‌。⃩🖞‌𖬴; ⒈ر‌.⃩🖞‌𖬴; [B1, C1, P1, V5, V6]; xn--wgb253kmfd.xn--0ugz6a8040fty5d; ; xn--wgb746m.xn--c1g6021kg18c; [B1, P1, V5, V6] # ⒈ر.⃩🖞𖬴
+1.ر‌。⃩🖞‌𖬴; 1.ر‌.⃩🖞‌𖬴; [B1, B3, C1, V5]; 1.xn--wgb253k.xn--0ugz6a8040fty5d; ; 1.xn--wgb.xn--c1g6021kg18c; [B1, V5] # 1.ر.⃩🖞𖬴
+1.xn--wgb.xn--c1g6021kg18c; 1.ر.⃩🖞𖬴; [B1, V5]; 1.xn--wgb.xn--c1g6021kg18c; ; ;  # 1.ر.⃩🖞𖬴
+1.xn--wgb253k.xn--0ugz6a8040fty5d; 1.ر‌.⃩🖞‌𖬴; [B1, B3, C1, V5]; 1.xn--wgb253k.xn--0ugz6a8040fty5d; ; ;  # 1.ر.⃩🖞𖬴
+xn--wgb746m.xn--c1g6021kg18c; ⒈ر.⃩🖞𖬴; [B1, V5, V6]; xn--wgb746m.xn--c1g6021kg18c; ; ;  # ⒈ر.⃩🖞𖬴
+xn--wgb253kmfd.xn--0ugz6a8040fty5d; ⒈ر‌.⃩🖞‌𖬴; [B1, C1, V5, V6]; xn--wgb253kmfd.xn--0ugz6a8040fty5d; ; ;  # ⒈ر.⃩🖞𖬴
+󌭇｡�ᮨߔ; 󌭇.2ᮨߔ; [B1, P1, V6]; xn--xm89d.xn--2-icd143m; ; ;  # .2ᮨߔ
+󌭇。2ᮨߔ; 󌭇.2ᮨߔ; [B1, P1, V6]; xn--xm89d.xn--2-icd143m; ; ;  # .2ᮨߔ
+xn--xm89d.xn--2-icd143m; 󌭇.2ᮨߔ; [B1, V6]; xn--xm89d.xn--2-icd143m; ; ;  # .2ᮨߔ
+�򫳺.ς��; مخم򫳺.ς��; [B2, B3, B5, B6, C2, P1, V6]; xn--tgb9bb64691z.xn--3xa006lrp7n; ; xn--tgb9bb64691z.xn--4xa6667k; [B2, B3, B5, B6, P1, V6] # مخم.ς�
+مخم򫳺.ς��; ; [B2, B3, B5, B6, C2, P1, V6]; xn--tgb9bb64691z.xn--3xa006lrp7n; ; xn--tgb9bb64691z.xn--4xa6667k; [B2, B3, B5, B6, P1, V6] # مخم.ς�
+مخم򫳺.Σ��; مخم򫳺.σ��; [B2, B3, B5, B6, C2, P1, V6]; xn--tgb9bb64691z.xn--4xa895lrp7n; ; xn--tgb9bb64691z.xn--4xa6667k; [B2, B3, B5, B6, P1, V6] # مخم.σ�
+مخم򫳺.σ��; ; [B2, B3, B5, B6, C2, P1, V6]; xn--tgb9bb64691z.xn--4xa895lrp7n; ; xn--tgb9bb64691z.xn--4xa6667k; [B2, B3, B5, B6, P1, V6] # مخم.σ�
+xn--tgb9bb64691z.xn--4xa6667k; مخم򫳺.σ�; [B2, B3, B5, B6, V6]; xn--tgb9bb64691z.xn--4xa6667k; ; ;  # مخم.σ�
+xn--tgb9bb64691z.xn--4xa895lrp7n; مخم򫳺.σ��; [B2, B3, B5, B6, C2, V6]; xn--tgb9bb64691z.xn--4xa895lrp7n; ; ;  # مخم.σ�
+xn--tgb9bb64691z.xn--3xa006lrp7n; مخم򫳺.ς��; [B2, B3, B5, B6, C2, V6]; xn--tgb9bb64691z.xn--3xa006lrp7n; ; ;  # مخم.ς�
+�򫳺.Σ��; مخم򫳺.σ��; [B2, B3, B5, B6, C2, P1, V6]; xn--tgb9bb64691z.xn--4xa895lrp7n; ; xn--tgb9bb64691z.xn--4xa6667k; [B2, B3, B5, B6, P1, V6] # مخم.σ�
+�򫳺.σ��; مخم򫳺.σ��; [B2, B3, B5, B6, C2, P1, V6]; xn--tgb9bb64691z.xn--4xa895lrp7n; ; xn--tgb9bb64691z.xn--4xa6667k; [B2, B3, B5, B6, P1, V6] # مخم.σ�
+⒎�؅｡꫶۵�; ⒎�؅.꫶۵�; [B1, P1, V5, V6]; xn--nfb98ai25e.xn--imb3805fxt8b; ; ;  # ⒎�.꫶۵�
+7.�؅。꫶۵�; 7.�؅.꫶۵�; [B1, P1, V5, V6]; 7.xn--nfb98a.xn--imb3805fxt8b; ; ;  # 7.�.꫶۵�
+7.xn--nfb98a.xn--imb3805fxt8b; 7.�؅.꫶۵�; [B1, V5, V6]; 7.xn--nfb98a.xn--imb3805fxt8b; ; ;  # 7.�.꫶۵�
+xn--nfb98ai25e.xn--imb3805fxt8b; ⒎�؅.꫶۵�; [B1, V5, V6]; xn--nfb98ai25e.xn--imb3805fxt8b; ; ;  # ⒎�.꫶۵�
+-ᡥ᠆�。؅��; -ᡥ᠆�.؅��; [B1, P1, V3, V6]; xn----f3j6s87156i.xn--nfb035hoo2p; ; ;  # -ᡥ᠆.��
+xn----f3j6s87156i.xn--nfb035hoo2p; -ᡥ᠆�.؅��; [B1, V3, V6]; xn----f3j6s87156i.xn--nfb035hoo2p; ; ;  # -ᡥ᠆.��
+�.ڽ٣֖; ; [B1, C2]; xn--1ug.xn--hcb32bni; ; .xn--hcb32bni; [A4_2] # .ڽ٣֖
+.xn--hcb32bni; .Ú½Ù£Ö–; [X4_2]; .xn--hcb32bni; [A4_2]; ;  # .Ú½Ù£Ö–
+xn--1ug.xn--hcb32bni; �.ڽ٣֖; [B1, C2]; xn--1ug.xn--hcb32bni; ; ;  # .ڽ٣֖
+xn--hcb32bni; Ú½Ù£Ö–; ; xn--hcb32bni; ; ;  # Ú½Ù£Ö–
+Ú½Ù£Ö–; ; ; xn--hcb32bni; ; ;  # Ú½Ù£Ö–
+㒧۱.Ⴚٸ�; 㒧۱.Ⴚيٴ�; [B5, B6, C2, P1, V6]; xn--emb715u.xn--mhb8f817ao2p; ; xn--emb715u.xn--mhb8f817a; [B5, B6, P1, V6] # 㒧۱.Ⴚيٴ
+㒧۱.Ⴚيٴ�; ; [B5, B6, C2, P1, V6]; xn--emb715u.xn--mhb8f817ao2p; ; xn--emb715u.xn--mhb8f817a; [B5, B6, P1, V6] # 㒧۱.Ⴚيٴ
+㒧۱.ⴚيٴ�; ; [B5, B6, C2]; xn--emb715u.xn--mhb8f960g03l; ; xn--emb715u.xn--mhb8fy26k; [B5, B6] # 㒧۱.ⴚيٴ
+xn--emb715u.xn--mhb8fy26k; 㒧۱.ⴚيٴ; [B5, B6]; xn--emb715u.xn--mhb8fy26k; ; ;  # 㒧۱.ⴚيٴ
+xn--emb715u.xn--mhb8f960g03l; 㒧۱.ⴚيٴ�; [B5, B6, C2]; xn--emb715u.xn--mhb8f960g03l; ; ;  # 㒧۱.ⴚيٴ
+xn--emb715u.xn--mhb8f817a; 㒧۱.Ⴚيٴ; [B5, B6, V6]; xn--emb715u.xn--mhb8f817a; ; ;  # 㒧۱.Ⴚيٴ
+xn--emb715u.xn--mhb8f817ao2p; 㒧۱.Ⴚيٴ�; [B5, B6, C2, V6]; xn--emb715u.xn--mhb8f817ao2p; ; ;  # 㒧۱.Ⴚيٴ
+㒧۱.ⴚٸ�; 㒧۱.ⴚيٴ�; [B5, B6, C2]; xn--emb715u.xn--mhb8f960g03l; ; xn--emb715u.xn--mhb8fy26k; [B5, B6] # 㒧۱.ⴚيٴ
+ྔꡋ-．-𖬴; ྔꡋ-.-𖬴; [V3, V5]; xn----ukg9938i.xn----4u5m; ; ;  # ྔꡋ-.-𖬴
+ྔꡋ-.-𖬴; ; [V3, V5]; xn----ukg9938i.xn----4u5m; ; ;  # ྔꡋ-.-𖬴
+xn----ukg9938i.xn----4u5m; ྔꡋ-.-𖬴; [V3, V5]; xn----ukg9938i.xn----4u5m; ; ;  # ྔꡋ-.-𖬴
+񿒳-⋢‌．标-; 񿒳-⋢‌.标-; [C1, P1, V3, V6]; xn----sgn90kn5663a.xn----qj7b; ; xn----9mo67451g.xn----qj7b; [P1, V3, V6] # -⋢.标-
+񿒳-⋢‌．标-; 񿒳-⋢‌.标-; [C1, P1, V3, V6]; xn----sgn90kn5663a.xn----qj7b; ; xn----9mo67451g.xn----qj7b; [P1, V3, V6] # -⋢.标-
+񿒳-⋢‌.标-; ; [C1, P1, V3, V6]; xn----sgn90kn5663a.xn----qj7b; ; xn----9mo67451g.xn----qj7b; [P1, V3, V6] # -⋢.标-
+񿒳-⋢‌.标-; 񿒳-⋢‌.标-; [C1, P1, V3, V6]; xn----sgn90kn5663a.xn----qj7b; ; xn----9mo67451g.xn----qj7b; [P1, V3, V6] # -⋢.标-
+xn----9mo67451g.xn----qj7b; ñ¿’³-â‹¢.æ ‡-; [V3, V6]; xn----9mo67451g.xn----qj7b; ; ;  # -â‹¢.æ ‡-
+xn----sgn90kn5663a.xn----qj7b; 񿒳-⋢‌.标-; [C1, V3, V6]; xn----sgn90kn5663a.xn----qj7b; ; ;  # -⋢.标-
+ٱ．ςߜ; ٱ.ςߜ; [B5, B6]; xn--qib.xn--3xa41s; ; xn--qib.xn--4xa21s;  # ٱ.ςߜ
+ٱ.ςߜ; ; [B5, B6]; xn--qib.xn--3xa41s; ; xn--qib.xn--4xa21s;  # ٱ.ςߜ
+ٱ.Σߜ; ٱ.σߜ; [B5, B6]; xn--qib.xn--4xa21s; ; ;  # ٱ.σߜ
+ٱ.σߜ; ; [B5, B6]; xn--qib.xn--4xa21s; ; ;  # ٱ.σߜ
+xn--qib.xn--4xa21s; ٱ.σߜ; [B5, B6]; xn--qib.xn--4xa21s; ; ;  # ٱ.σߜ
+xn--qib.xn--3xa41s; ٱ.ςߜ; [B5, B6]; xn--qib.xn--3xa41s; ; ;  # ٱ.ςߜ
+ٱ．Σߜ; ٱ.σߜ; [B5, B6]; xn--qib.xn--4xa21s; ; ;  # ٱ.σߜ
+ٱ．σߜ; ٱ.σߜ; [B5, B6]; xn--qib.xn--4xa21s; ; ;  # ٱ.σߜ
+񼈶؅．��𑑂𱼱; 񼈶؅.��𑑂𱼱; [B2, B3, B5, B6, C2, P1, V6]; xn--nfb17942h.xn--nzb240jv06otevq; ; xn--nfb17942h.xn--nzb6708kx3pn; [B2, B3, B5, B6, P1, V6] # .�𑑂
+񼈶؅.��𑑂𱼱; ; [B2, B3, B5, B6, C2, P1, V6]; xn--nfb17942h.xn--nzb240jv06otevq; ; xn--nfb17942h.xn--nzb6708kx3pn; [B2, B3, B5, B6, P1, V6] # .�𑑂
+xn--nfb17942h.xn--nzb6708kx3pn; 񼈶؅.�𑑂𱼱; [B2, B3, B5, B6, V6]; xn--nfb17942h.xn--nzb6708kx3pn; ; ;  # .�𑑂
+xn--nfb17942h.xn--nzb240jv06otevq; 񼈶؅.��𑑂𱼱; [B2, B3, B5, B6, C2, V6]; xn--nfb17942h.xn--nzb240jv06otevq; ; ;  # .�𑑂
+��𞵜｡᯲; ��𞵜.᯲; [B1, P1, V5, V6]; xn--d97cn8rn44p.xn--0zf; ; ;  # ��.᯲
+��𞵜。᯲; ��𞵜.᯲; [B1, P1, V5, V6]; xn--d97cn8rn44p.xn--0zf; ; ;  # ��.᯲
+xn--d97cn8rn44p.xn--0zf; ��𞵜.᯲; [B1, V5, V6]; xn--d97cn8rn44p.xn--0zf; ; ;  # ��.᯲
+6ᅠᰳ󠸧.򟜊锰ܬς; ; [B1, B5, P1, V6]; xn--6-5bh476ewr517a.xn--3xa16ohw6pk078g; ; xn--6-5bh476ewr517a.xn--4xa95ohw6pk078g;  # 6ᰳ.锰ܬς
+6ᅠᰳ󠸧.򟜊锰ܬΣ; 6ᅠᰳ󠸧.򟜊锰ܬσ; [B1, B5, P1, V6]; xn--6-5bh476ewr517a.xn--4xa95ohw6pk078g; ; ;  # 6ᰳ.锰ܬσ
+6ᅠᰳ󠸧.򟜊锰ܬσ; ; [B1, B5, P1, V6]; xn--6-5bh476ewr517a.xn--4xa95ohw6pk078g; ; ;  # 6ᰳ.锰ܬσ
+xn--6-5bh476ewr517a.xn--4xa95ohw6pk078g; 6ᅠᰳ󠸧.򟜊锰ܬσ; [B1, B5, V6]; xn--6-5bh476ewr517a.xn--4xa95ohw6pk078g; ; ;  # 6ᰳ.锰ܬσ
+xn--6-5bh476ewr517a.xn--3xa16ohw6pk078g; 6ᅠᰳ󠸧.򟜊锰ܬς; [B1, B5, V6]; xn--6-5bh476ewr517a.xn--3xa16ohw6pk078g; ; ;  # 6ᰳ.锰ܬς
+ڳ︄񅎦�｡�; ڳ񅎦7.�; [B1, B2, P1, V6]; xn--7-yuc34665f.xn--1o0d; ; ;  # ڳ7.�
+ڳ︄񅎦7。�; ڳ񅎦7.�; [B1, B2, P1, V6]; xn--7-yuc34665f.xn--1o0d; ; ;  # ڳ7.�
+xn--7-yuc34665f.xn--1o0d; ڳ񅎦7.�; [B1, B2, V6]; xn--7-yuc34665f.xn--1o0d; ; ;  # ڳ7.�
+𞮧．‌⫞; 𞮧.‌⫞; [B1, C1, P1, V6]; xn--pw6h.xn--0ug283b; ; xn--pw6h.xn--53i; [B1, P1, V6] # .⫞
+𞮧.‌⫞; ; [B1, C1, P1, V6]; xn--pw6h.xn--0ug283b; ; xn--pw6h.xn--53i; [B1, P1, V6] # .⫞
+xn--pw6h.xn--53i; 𞮧.⫞; [B1, V6]; xn--pw6h.xn--53i; ; ;  # .⫞
+xn--pw6h.xn--0ug283b; 𞮧.‌⫞; [B1, C1, V6]; xn--pw6h.xn--0ug283b; ; ;  # .⫞
+-񕉴.۠ᢚ-; ; [P1, V3, V5, V6]; xn----qi38c.xn----jxc827k; ; ;  # -.۠ᢚ-
+xn----qi38c.xn----jxc827k; -񕉴.۠ᢚ-; [V3, V5, V6]; xn----qi38c.xn----jxc827k; ; ;  # -.۠ᢚ-
+��𑄴．‌�٬; ��𑄴.‌7٬; [B1, C1, C2]; xn--1ug38i2093a.xn--7-xqc297q; ; xn--nhh5394g.xn--7-xqc; [B1] # �𑄴.7٬
+��𑄴.‌7٬; ; [B1, C1, C2]; xn--1ug38i2093a.xn--7-xqc297q; ; xn--nhh5394g.xn--7-xqc; [B1] # �𑄴.7٬
+xn--nhh5394g.xn--7-xqc; �𑄴.7٬; [B1]; xn--nhh5394g.xn--7-xqc; ; ;  # �𑄴.7٬
+xn--1ug38i2093a.xn--7-xqc297q; ��𑄴.‌7٬; [B1, C1, C2]; xn--1ug38i2093a.xn--7-xqc297q; ; ;  # �𑄴.7٬
+︒ﴅืﻼ。岓᯲󠾃ᡂ; ︒صىืلا.岓᯲󠾃ᡂ; [B1, P1, V6]; xn--mgb1a7bt462hf267a.xn--17e10qe61f9r71s; ; ;  # ︒صىืلا.岓᯲ᡂ
+。صىืلا。岓᯲󠾃ᡂ; .صىืلا.岓᯲󠾃ᡂ; [P1, V6, X4_2]; .xn--mgb1a7bt462h.xn--17e10qe61f9r71s; [P1, V6, A4_2]; ;  # .صىืلا.岓᯲ᡂ
+.xn--mgb1a7bt462h.xn--17e10qe61f9r71s; .صىืلا.岓᯲󠾃ᡂ; [V6, X4_2]; .xn--mgb1a7bt462h.xn--17e10qe61f9r71s; [V6, A4_2]; ;  # .صىืلا.岓᯲ᡂ
+xn--mgb1a7bt462hf267a.xn--17e10qe61f9r71s; ︒صىืلا.岓᯲󠾃ᡂ; [B1, V6]; xn--mgb1a7bt462hf267a.xn--17e10qe61f9r71s; ; ;  # ︒صىืلا.岓᯲ᡂ
+�。8�; �.8�; [B1]; xn--go0d.xn--8-yu7i; ; ;  # �.8�
+xn--go0d.xn--8-yu7i; �.8�; [B1]; xn--go0d.xn--8-yu7i; ; ;  # �.8�
+𞀕ൃ．ꡚࣺ�ൄ; 𞀕ൃ.ꡚࣺ�ൄ; [B1, B3, B5, B6, V5]; xn--mxc5210v.xn--90b01t8u2p1ltd; ; ;  # 𞀕ൃ.ꡚࣺ�ൄ
+𞀕ൃ.ꡚࣺ�ൄ; ; [B1, B3, B5, B6, V5]; xn--mxc5210v.xn--90b01t8u2p1ltd; ; ;  # 𞀕ൃ.ꡚࣺ�ൄ
+xn--mxc5210v.xn--90b01t8u2p1ltd; 𞀕ൃ.ꡚࣺ�ൄ; [B1, B3, B5, B6, V5]; xn--mxc5210v.xn--90b01t8u2p1ltd; ; ;  # 𞀕ൃ.ꡚࣺ�ൄ
+��̃｡�; ��̃.�; [B1, B5, B6, P1, V6]; xn--nsa1265kp9z9e.xn--xt36e; ; ;  # ̃.
+��̃。�; ��̃.�; [B1, B5, B6, P1, V6]; xn--nsa1265kp9z9e.xn--xt36e; ; ;  # ̃.
+xn--nsa1265kp9z9e.xn--xt36e; ��̃.�; [B1, B5, B6, V6]; xn--nsa1265kp9z9e.xn--xt36e; ; ;  # ̃.
+ᢌ．-࡚; ᢌ.-࡚; [V3]; xn--59e.xn----5jd; ; ;  # ᢌ.-࡚
+ᢌ.-࡚; ; [V3]; xn--59e.xn----5jd; ; ;  # ᢌ.-࡚
+xn--59e.xn----5jd; ᢌ.-࡚; [V3]; xn--59e.xn----5jd; ; ;  # ᢌ.-࡚
+𥛛𑘶｡���; 𥛛𑘶.���; [B1, P1, V6]; xn--jb2dj685c.xn--xmc5562kmcb; ; ;  # 𥛛𑘶.��
+𥛛𑘶。���; 𥛛𑘶.���; [B1, P1, V6]; xn--jb2dj685c.xn--xmc5562kmcb; ; ;  # 𥛛𑘶.��
+xn--jb2dj685c.xn--xmc5562kmcb; 𥛛𑘶.���; [B1, V6]; xn--jb2dj685c.xn--xmc5562kmcb; ; ;  # 𥛛𑘶.��
+Ⴐݿ．‌; Ⴐݿ.‌; [B1, B5, B6, C1, P1, V6]; xn--gqb918b.xn--0ug; ; xn--gqb918b.; [B5, B6, P1, V6] # Ⴐݿ.
+Ⴐݿ.‌; ; [B1, B5, B6, C1, P1, V6]; xn--gqb918b.xn--0ug; ; xn--gqb918b.; [B5, B6, P1, V6] # Ⴐݿ.
+�ݿ.‌; ; [B1, B5, B6, C1]; xn--gqb743q.xn--0ug; ; xn--gqb743q.; [B5, B6] # �ݿ.
+xn--gqb743q.; �ݿ.; [B5, B6]; xn--gqb743q.; ; ;  # �ݿ.
+xn--gqb743q.xn--0ug; �ݿ.‌; [B1, B5, B6, C1]; xn--gqb743q.xn--0ug; ; ;  # �ݿ.
+xn--gqb918b.; á‚°Ý¿.; [B5, B6, V6]; xn--gqb918b.; ; ;  # á‚°Ý¿.
+xn--gqb918b.xn--0ug; Ⴐݿ.‌; [B1, B5, B6, C1, V6]; xn--gqb918b.xn--0ug; ; ;  # Ⴐݿ.
+�ݿ．‌; �ݿ.‌; [B1, B5, B6, C1]; xn--gqb743q.xn--0ug; ; xn--gqb743q.; [B5, B6] # �ݿ.
+🄅𑲞-⒈。�ᠩڥ; 🄅𑲞-⒈.�ᠩڥ; [B1, C2, P1, V6]; xn----ecp8796hjtvg.xn--7jb180gexf; ; xn----ecp8796hjtvg.xn--7jb180g; [B1, B5, B6, P1, V6] # 🄅𑲞-⒈.ᠩڥ
+4,𑲞-1.。�ᠩڥ; 4,𑲞-1..�ᠩڥ; [B1, C2, P1, V6, X4_2]; xn--4,-1-w401a..xn--7jb180gexf; [B1, C2, P1, V6, A4_2]; xn--4,-1-w401a..xn--7jb180g; [B1, B5, B6, P1, V6, A4_2] # 4,𑲞-1..ᠩڥ
+xn--4,-1-w401a..xn--7jb180g; 4,𑲞-1..ᠩڥ; [B1, B5, B6, P1, V6, X4_2]; xn--4,-1-w401a..xn--7jb180g; [B1, B5, B6, P1, V6, A4_2]; ;  # 4,𑲞-1..ᠩڥ
+xn--4,-1-w401a..xn--7jb180gexf; 4,𑲞-1..�ᠩڥ; [B1, C2, P1, V6, X4_2]; xn--4,-1-w401a..xn--7jb180gexf; [B1, C2, P1, V6, A4_2]; ;  # 4,𑲞-1..ᠩڥ
+xn----ecp8796hjtvg.xn--7jb180g; 🄅𑲞-⒈.ᠩڥ; [B1, B5, B6, V6]; xn----ecp8796hjtvg.xn--7jb180g; ; ;  # 🄅𑲞-⒈.ᠩڥ
+xn----ecp8796hjtvg.xn--7jb180gexf; 🄅𑲞-⒈.�ᠩڥ; [B1, C2, V6]; xn----ecp8796hjtvg.xn--7jb180gexf; ; ;  # 🄅𑲞-⒈.ᠩڥ
+񗀤。𞤪򮿋; 񗀤.𞤪򮿋; [B2, B3, P1, V6]; xn--4240a.xn--ie6h83808a; ; ;  # .𞤪
+񗀤。𞤈򮿋; 񗀤.𞤪򮿋; [B2, B3, P1, V6]; xn--4240a.xn--ie6h83808a; ; ;  # .𞤪
+xn--4240a.xn--ie6h83808a; 񗀤.𞤪򮿋; [B2, B3, V6]; xn--4240a.xn--ie6h83808a; ; ;  # .𞤪
+�۲｡�٬�鄨; �۲.�٬�鄨; [B1, B2, B3, V5]; xn--pdb42d.xn--lib6412enztdwv6h; ; ;  # �۲.�٬�鄨
+�۲。�٬�鄨; �۲.�٬�鄨; [B1, B2, B3, V5]; xn--pdb42d.xn--lib6412enztdwv6h; ; ;  # �۲.�٬�鄨
+xn--pdb42d.xn--lib6412enztdwv6h; �۲.�٬�鄨; [B1, B2, B3, V5]; xn--pdb42d.xn--lib6412enztdwv6h; ; ;  # �۲.�٬�鄨
+𞭳-�。ᩩ�-; 𞭳-�.ᩩ�-; [B1, B2, B3, P1, V3, V5, V6]; xn----be4e4276f.xn----lze333i; ; ;  # -�.ᩩ�-
+xn----be4e4276f.xn----lze333i; 𞭳-�.ᩩ�-; [B1, B2, B3, V3, V5, V6]; xn----be4e4276f.xn----lze333i; ; ;  # -�.ᩩ�-
+္-𚮭🞢．ß; ္-𚮭🞢.ß; [P1, V5, V6]; xn----9tg11172akr8b.xn--zca; ; xn----9tg11172akr8b.ss;  # ္-🞢.ß
+္-𚮭🞢.ß; ; [P1, V5, V6]; xn----9tg11172akr8b.xn--zca; ; xn----9tg11172akr8b.ss;  # ္-🞢.ß
+္-𚮭🞢.SS; ္-𚮭🞢.ss; [P1, V5, V6]; xn----9tg11172akr8b.ss; ; ;  # ္-🞢.ss
+္-𚮭🞢.ss; ; [P1, V5, V6]; xn----9tg11172akr8b.ss; ; ;  # ္-🞢.ss
+္-𚮭🞢.Ss; ္-𚮭🞢.ss; [P1, V5, V6]; xn----9tg11172akr8b.ss; ; ;  # ္-🞢.ss
+xn----9tg11172akr8b.ss; ္-𚮭🞢.ss; [V5, V6]; xn----9tg11172akr8b.ss; ; ;  # ္-🞢.ss
+xn----9tg11172akr8b.xn--zca; ္-𚮭🞢.ß; [V5, V6]; xn----9tg11172akr8b.xn--zca; ; ;  # ္-🞢.ß
+္-𚮭🞢．SS; ္-𚮭🞢.ss; [P1, V5, V6]; xn----9tg11172akr8b.ss; ; ;  # ္-🞢.ss
+္-𚮭🞢．ss; ္-𚮭🞢.ss; [P1, V5, V6]; xn----9tg11172akr8b.ss; ; ;  # ္-🞢.ss
+္-𚮭🞢．Ss; ္-𚮭🞢.ss; [P1, V5, V6]; xn----9tg11172akr8b.ss; ; ;  # ္-🞢.ss
+ﳲ-‌｡Ⴟ‌�; ـَّ-‌.Ⴟ‌�; [B3, B6, C1, P1, V6]; xn----eoc6bm0504a.xn--3nd849e05c; ; xn----eoc6bm.xn--3nd240h; [B3, B6, P1, V3, V6] # ـَّ-.Ⴟ�
+ـَّ-‌。Ⴟ‌�; ـَّ-‌.Ⴟ‌�; [B3, B6, C1, P1, V6]; xn----eoc6bm0504a.xn--3nd849e05c; ; xn----eoc6bm.xn--3nd240h; [B3, B6, P1, V3, V6] # ـَّ-.Ⴟ�
+ـَّ-‌。ⴟ‌�; ـَّ-‌.ⴟ‌�; [B3, B6, C1]; xn----eoc6bm0504a.xn--0ug13nd0j; ; xn----eoc6bm.xn--xph904a; [B3, B6, V3] # ـَّ-.ⴟ�
+xn----eoc6bm.xn--xph904a; ـَّ-.ⴟ�; [B3, B6, V3]; xn----eoc6bm.xn--xph904a; ; ;  # ـَّ-.ⴟ�
+xn----eoc6bm0504a.xn--0ug13nd0j; ـَّ-‌.ⴟ‌�; [B3, B6, C1]; xn----eoc6bm0504a.xn--0ug13nd0j; ; ;  # ـَّ-.ⴟ�
+xn----eoc6bm.xn--3nd240h; ـَّ-.Ⴟ�; [B3, B6, V3, V6]; xn----eoc6bm.xn--3nd240h; ; ;  # ـَّ-.Ⴟ�
+xn----eoc6bm0504a.xn--3nd849e05c; ـَّ-‌.Ⴟ‌�; [B3, B6, C1, V6]; xn----eoc6bm0504a.xn--3nd849e05c; ; ;  # ـَّ-.Ⴟ�
+ﳲ-‌｡ⴟ‌�; ـَّ-‌.ⴟ‌�; [B3, B6, C1]; xn----eoc6bm0504a.xn--0ug13nd0j; ; xn----eoc6bm.xn--xph904a; [B3, B6, V3] # ـَّ-.ⴟ�
+�-�‌｡񥞧₅≠; �-�‌.񥞧5≠; [C1, C2, P1, V5, V6]; xn----jmf215lda.xn--5-ufo50192e; ; xn----jmf.xn--5-ufo50192e; [P1, V3, V5, V6] # �-.5≠
+�-�‌｡񥞧₅≠; �-�‌.񥞧5≠; [C1, C2, P1, V5, V6]; xn----jmf215lda.xn--5-ufo50192e; ; xn----jmf.xn--5-ufo50192e; [P1, V3, V5, V6] # �-.5≠
+�-�‌。񥞧5≠; �-�‌.񥞧5≠; [C1, C2, P1, V5, V6]; xn----jmf215lda.xn--5-ufo50192e; ; xn----jmf.xn--5-ufo50192e; [P1, V3, V5, V6] # �-.5≠
+�-�‌。񥞧5≠; �-�‌.񥞧5≠; [C1, C2, P1, V5, V6]; xn----jmf215lda.xn--5-ufo50192e; ; xn----jmf.xn--5-ufo50192e; [P1, V3, V5, V6] # �-.5≠
+xn----jmf.xn--5-ufo50192e; �-.񥞧5≠; [V3, V5, V6]; xn----jmf.xn--5-ufo50192e; ; ;  # �-.5≠
+xn----jmf215lda.xn--5-ufo50192e; �-�‌.񥞧5≠; [C1, C2, V5, V6]; xn----jmf215lda.xn--5-ufo50192e; ; ;  # �-.5≠
+锣。�󠘻󠚆; 锣.�󠘻󠚆; [P1, V5, V6]; xn--gc5a.xn--ybc83044ppga; ; ;  # 锣.�
+xn--gc5a.xn--ybc83044ppga; 锣.�󠘻󠚆; [V5, V6]; xn--gc5a.xn--ybc83044ppga; ; ;  # 锣.�
+ؽ𑈾．ى�꤫; ؽ𑈾.ى�꤫; [B3, C2]; xn--8gb2338k.xn--lhb603k060h; ; xn--8gb2338k.xn--lhb0154f; [] # ؽ𑈾.ى꤫
+ؽ𑈾.ى�꤫; ; [B3, C2]; xn--8gb2338k.xn--lhb603k060h; ; xn--8gb2338k.xn--lhb0154f; [] # ؽ𑈾.ى꤫
+xn--8gb2338k.xn--lhb0154f; ؽ𑈾.ى꤫; ; xn--8gb2338k.xn--lhb0154f; ; ;  # ؽ𑈾.ى꤫
+ؽ𑈾.ى꤫; ; ; xn--8gb2338k.xn--lhb0154f; ; ;  # ؽ𑈾.ى꤫
+xn--8gb2338k.xn--lhb603k060h; ؽ𑈾.ى�꤫; [B3, C2]; xn--8gb2338k.xn--lhb603k060h; ; ;  # ؽ𑈾.ى꤫
+٦�Ⴅ．ࢽ‌; ٦4Ⴅ.ࢽ‌; [B1, B3, C1, P1, V6]; xn--4-kqc489e.xn--jzb840j; ; xn--4-kqc489e.xn--jzb; [B1, P1, V6] # ٦4Ⴅ.ࢽ
+٦4Ⴅ.ࢽ‌; ; [B1, B3, C1, P1, V6]; xn--4-kqc489e.xn--jzb840j; ; xn--4-kqc489e.xn--jzb; [B1, P1, V6] # ٦4Ⴅ.ࢽ
+٦4ⴅ.ࢽ‌; ; [B1, B3, C1]; xn--4-kqc6770a.xn--jzb840j; ; xn--4-kqc6770a.xn--jzb; [B1] # ٦4ⴅ.ࢽ
+xn--4-kqc6770a.xn--jzb; ٦4ⴅ.ࢽ; [B1]; xn--4-kqc6770a.xn--jzb; ; ;  # ٦4ⴅ.ࢽ
+xn--4-kqc6770a.xn--jzb840j; ٦4ⴅ.ࢽ‌; [B1, B3, C1]; xn--4-kqc6770a.xn--jzb840j; ; ;  # ٦4ⴅ.ࢽ
+xn--4-kqc489e.xn--jzb; ٦4Ⴅ.ࢽ; [B1, V6]; xn--4-kqc489e.xn--jzb; ; ;  # ٦4Ⴅ.ࢽ
+xn--4-kqc489e.xn--jzb840j; ٦4Ⴅ.ࢽ‌; [B1, B3, C1, V6]; xn--4-kqc489e.xn--jzb840j; ; ;  # ٦4Ⴅ.ࢽ
+٦�ⴅ．ࢽ‌; ٦4ⴅ.ࢽ‌; [B1, B3, C1]; xn--4-kqc6770a.xn--jzb840j; ; xn--4-kqc6770a.xn--jzb; [B1] # ٦4ⴅ.ࢽ
+�Ⴑ6̘。ßᬃ; �Ⴑ6̘.ßᬃ; [P1, V6]; xn--6-8cb555h2b.xn--zca894k; ; xn--6-8cb555h2b.xn--ss-2vq;  # �Ⴑ6̘.ßᬃ
+ⴡⴑ6̘。ßᬃ; ⴡⴑ6̘.ßᬃ; ; xn--6-8cb7433a2ba.xn--zca894k; ; xn--6-8cb7433a2ba.xn--ss-2vq;  # ⴡⴑ6̘.ßᬃ
+�Ⴑ6̘。SSᬃ; �Ⴑ6̘.ssᬃ; [P1, V6]; xn--6-8cb555h2b.xn--ss-2vq; ; ;  # �Ⴑ6̘.ssᬃ
+ⴡⴑ6̘。ssᬃ; ⴡⴑ6̘.ssᬃ; ; xn--6-8cb7433a2ba.xn--ss-2vq; ; ;  # ⴡⴑ6̘.ssᬃ
+�ⴑ6̘。Ssᬃ; �ⴑ6̘.ssᬃ; [P1, V6]; xn--6-8cb306hms1a.xn--ss-2vq; ; ;  # �ⴑ6̘.ssᬃ
+xn--6-8cb306hms1a.xn--ss-2vq; �ⴑ6̘.ssᬃ; [V6]; xn--6-8cb306hms1a.xn--ss-2vq; ; ;  # �ⴑ6̘.ssᬃ
+xn--6-8cb7433a2ba.xn--ss-2vq; ⴡⴑ6̘.ssᬃ; ; xn--6-8cb7433a2ba.xn--ss-2vq; ; ;  # ⴡⴑ6̘.ssᬃ
+ⴡⴑ6̘.ssᬃ; ; ; xn--6-8cb7433a2ba.xn--ss-2vq; ; ;  # ⴡⴑ6̘.ssᬃ
+�Ⴑ6̘.SSᬃ; �Ⴑ6̘.ssᬃ; [P1, V6]; xn--6-8cb555h2b.xn--ss-2vq; ; ;  # �Ⴑ6̘.ssᬃ
+�ⴑ6̘.Ssᬃ; �ⴑ6̘.ssᬃ; [P1, V6]; xn--6-8cb306hms1a.xn--ss-2vq; ; ;  # �ⴑ6̘.ssᬃ
+xn--6-8cb555h2b.xn--ss-2vq; �Ⴑ6̘.ssᬃ; [V6]; xn--6-8cb555h2b.xn--ss-2vq; ; ;  # �Ⴑ6̘.ssᬃ
+xn--6-8cb7433a2ba.xn--zca894k; ⴡⴑ6̘.ßᬃ; ; xn--6-8cb7433a2ba.xn--zca894k; ; ;  # ⴡⴑ6̘.ßᬃ
+ⴡⴑ6̘.ßᬃ; ; ; xn--6-8cb7433a2ba.xn--zca894k; ; xn--6-8cb7433a2ba.xn--ss-2vq;  # ⴡⴑ6̘.ßᬃ
+xn--6-8cb555h2b.xn--zca894k; �Ⴑ6̘.ßᬃ; [V6]; xn--6-8cb555h2b.xn--zca894k; ; ;  # �Ⴑ6̘.ßᬃ
+�｡≯𑋪; �.≯𑋪; [P1, V6]; xn--eo08b.xn--hdh3385g; ; ;  # .≯𑋪
+�｡≯𑋪; �.≯𑋪; [P1, V6]; xn--eo08b.xn--hdh3385g; ; ;  # .≯𑋪
+�。≯𑋪; �.≯𑋪; [P1, V6]; xn--eo08b.xn--hdh3385g; ; ;  # .≯𑋪
+�。≯𑋪; �.≯𑋪; [P1, V6]; xn--eo08b.xn--hdh3385g; ; ;  # .≯𑋪
+xn--eo08b.xn--hdh3385g; �.≯𑋪; [V6]; xn--eo08b.xn--hdh3385g; ; ;  # .≯𑋪
+ٚ۲。‌-᯳࣢; ٚ۲.‌-᯳࣢; [B1, C1, P1, V5, V6]; xn--2hb81a.xn----xrd657l30d; ; xn--2hb81a.xn----xrd657l; [B1, P1, V3, V5, V6] # ٚ۲.-᯳
+xn--2hb81a.xn----xrd657l; ٚ۲.-᯳࣢; [B1, V3, V5, V6]; xn--2hb81a.xn----xrd657l; ; ;  # ٚ۲.-᯳
+xn--2hb81a.xn----xrd657l30d; ٚ۲.‌-᯳࣢; [B1, C1, V5, V6]; xn--2hb81a.xn----xrd657l30d; ; ;  # ٚ۲.-᯳
+�𖬴󠲽｡ﾠ; 𖬴󠲽.ﾠ; [P1, V5, V6]; xn--619ep9154c.xn--cl7c; ; ;  # 𖬴.
+�𖬴󠲽。ᅠ; 𖬴󠲽.ᅠ; [P1, V5, V6]; xn--619ep9154c.xn--psd; ; ;  # 𖬴.
+xn--619ep9154c.xn--psd; ð–¬´ó ²½.á… ; [V5, V6]; xn--619ep9154c.xn--psd; ; ;  # ð–¬´.
+xn--619ep9154c.xn--cl7c; ð–¬´ó ²½.ï¾ ; [V5, V6]; xn--619ep9154c.xn--cl7c; ; ;  # ð–¬´.
+ß⒈ݠ힮．􉖲󠅄؅򉔯; ß⒈ݠ힮.􉖲؅򉔯; [B5, P1, V6]; xn--zca444a0s1ao12n.xn--nfb09923ifkyyb; ; xn--ss-6ke9690a0g1q.xn--nfb09923ifkyyb;  # ß⒈ݠ.
+ß1.ݠ힮.􉖲󠅄؅򉔯; ß1.ݠ힮.􉖲؅򉔯; [B2, B3, B5, P1, V6]; xn--1-pfa.xn--kpb6677h.xn--nfb09923ifkyyb; ; ss1.xn--kpb6677h.xn--nfb09923ifkyyb;  # ß1.ݠ.
+SS1.ݠ힮.􉖲󠅄؅򉔯; ss1.ݠ힮.􉖲؅򉔯; [B2, B3, B5, P1, V6]; ss1.xn--kpb6677h.xn--nfb09923ifkyyb; ; ;  # ss1.ݠ.
+ss1.ݠ힮.􉖲󠅄؅򉔯; ss1.ݠ힮.􉖲؅򉔯; [B2, B3, B5, P1, V6]; ss1.xn--kpb6677h.xn--nfb09923ifkyyb; ; ;  # ss1.ݠ.
+Ss1.ݠ힮.􉖲󠅄؅򉔯; ss1.ݠ힮.􉖲؅򉔯; [B2, B3, B5, P1, V6]; ss1.xn--kpb6677h.xn--nfb09923ifkyyb; ; ;  # ss1.ݠ.
+ss1.xn--kpb6677h.xn--nfb09923ifkyyb; ss1.ݠ힮.􉖲؅򉔯; [B2, B3, B5, V6]; ss1.xn--kpb6677h.xn--nfb09923ifkyyb; ; ;  # ss1.ݠ.
+xn--1-pfa.xn--kpb6677h.xn--nfb09923ifkyyb; ß1.ݠ힮.􉖲؅򉔯; [B2, B3, B5, V6]; xn--1-pfa.xn--kpb6677h.xn--nfb09923ifkyyb; ; ;  # ß1.ݠ.
+SS⒈ݠ힮．􉖲󠅄؅򉔯; ss⒈ݠ힮.􉖲؅򉔯; [B5, P1, V6]; xn--ss-6ke9690a0g1q.xn--nfb09923ifkyyb; ; ;  # ss⒈ݠ.
+ss⒈ݠ힮．􉖲󠅄؅򉔯; ss⒈ݠ힮.􉖲؅򉔯; [B5, P1, V6]; xn--ss-6ke9690a0g1q.xn--nfb09923ifkyyb; ; ;  # ss⒈ݠ.
+Ss⒈ݠ힮．􉖲󠅄؅򉔯; ss⒈ݠ힮.􉖲؅򉔯; [B5, P1, V6]; xn--ss-6ke9690a0g1q.xn--nfb09923ifkyyb; ; ;  # ss⒈ݠ.
+xn--ss-6ke9690a0g1q.xn--nfb09923ifkyyb; ss⒈ݠ힮.􉖲؅򉔯; [B5, V6]; xn--ss-6ke9690a0g1q.xn--nfb09923ifkyyb; ; ;  # ss⒈ݠ.
+xn--zca444a0s1ao12n.xn--nfb09923ifkyyb; ß⒈ݠ힮.􉖲؅򉔯; [B5, V6]; xn--zca444a0s1ao12n.xn--nfb09923ifkyyb; ; ;  # ß⒈ݠ.
+󠭔.�₂; 󠭔.�2; [P1, V6]; xn--vi56e.xn--2-w91i; ; ;  # .�2
+󠭔.�2; ; [P1, V6]; xn--vi56e.xn--2-w91i; ; ;  # .�2
+xn--vi56e.xn--2-w91i; 󠭔.�2; [V6]; xn--vi56e.xn--2-w91i; ; ;  # .�2
+ܖे。-ßڥ‌; ܖे.-ßڥ‌; [B1, C1, V3]; xn--gnb63i.xn----qfa845bhx4a; ; xn--gnb63i.xn---ss-4ef; [B1, V3] # ܖे.-ßڥ
+ܖे。-SSڥ‌; ܖे.-ssڥ‌; [B1, C1, V3]; xn--gnb63i.xn---ss-4ef9263a; ; xn--gnb63i.xn---ss-4ef; [B1, V3] # ܖे.-ssڥ
+ܖे。-ssڥ‌; ܖे.-ssڥ‌; [B1, C1, V3]; xn--gnb63i.xn---ss-4ef9263a; ; xn--gnb63i.xn---ss-4ef; [B1, V3] # ܖे.-ssڥ
+ܖे。-Ssڥ‌; ܖे.-ssڥ‌; [B1, C1, V3]; xn--gnb63i.xn---ss-4ef9263a; ; xn--gnb63i.xn---ss-4ef; [B1, V3] # ܖे.-ssڥ
+xn--gnb63i.xn---ss-4ef; ܖे.-ssڥ; [B1, V3]; xn--gnb63i.xn---ss-4ef; ; ;  # ܖे.-ssڥ
+xn--gnb63i.xn---ss-4ef9263a; ܖे.-ssڥ‌; [B1, C1, V3]; xn--gnb63i.xn---ss-4ef9263a; ; ;  # ܖे.-ssڥ
+xn--gnb63i.xn----qfa845bhx4a; ܖे.-ßڥ‌; [B1, C1, V3]; xn--gnb63i.xn----qfa845bhx4a; ; ;  # ܖे.-ßڥ
+ᮩ�ت񡚈．᳕䷉�; ᮩ�ت񡚈.᳕䷉�; [B1, C2, P1, V5, V6]; xn--pgb911imgdrw34r.xn--5nd792dgv3b; ; xn--pgb911izv33i.xn--5nd792dgv3b; [B1, P1, V5, V6] # ᮩت.᳕䷉�
+ᮩ�ت񡚈.᳕䷉�; ; [B1, C2, P1, V5, V6]; xn--pgb911imgdrw34r.xn--5nd792dgv3b; ; xn--pgb911izv33i.xn--5nd792dgv3b; [B1, P1, V5, V6] # ᮩت.᳕䷉�
+ᮩ�ت񡚈.᳕䷉ⴡ; ; [B1, C2, P1, V5, V6]; xn--pgb911imgdrw34r.xn--i6f270etuy; ; xn--pgb911izv33i.xn--i6f270etuy; [B1, P1, V5, V6] # ᮩت.᳕䷉ⴡ
+xn--pgb911izv33i.xn--i6f270etuy; ᮩت񡚈.᳕䷉ⴡ; [B1, V5, V6]; xn--pgb911izv33i.xn--i6f270etuy; ; ;  # ᮩت.᳕䷉ⴡ
+xn--pgb911imgdrw34r.xn--i6f270etuy; ᮩ�ت񡚈.᳕䷉ⴡ; [B1, C2, V5, V6]; xn--pgb911imgdrw34r.xn--i6f270etuy; ; ;  # ᮩت.᳕䷉ⴡ
+xn--pgb911izv33i.xn--5nd792dgv3b; ᮩت񡚈.᳕䷉�; [B1, V5, V6]; xn--pgb911izv33i.xn--5nd792dgv3b; ; ;  # ᮩت.᳕䷉�
+xn--pgb911imgdrw34r.xn--5nd792dgv3b; ᮩ�ت񡚈.᳕䷉�; [B1, C2, V5, V6]; xn--pgb911imgdrw34r.xn--5nd792dgv3b; ; ;  # ᮩت.᳕䷉�
+ᮩ�ت񡚈．᳕䷉ⴡ; ᮩ�ت񡚈.᳕䷉ⴡ; [B1, C2, P1, V5, V6]; xn--pgb911imgdrw34r.xn--i6f270etuy; ; xn--pgb911izv33i.xn--i6f270etuy; [B1, P1, V5, V6] # ᮩت.᳕䷉ⴡ
+⶿.ß�; ; [C2, P1, V6]; xn--7pj.xn--zca870n; ; xn--7pj.ss; [P1, V6] # .ß
+⶿.SS�; ⶿.ss�; [C2, P1, V6]; xn--7pj.xn--ss-n1t; ; xn--7pj.ss; [P1, V6] # .ss
+⶿.ss�; ; [C2, P1, V6]; xn--7pj.xn--ss-n1t; ; xn--7pj.ss; [P1, V6] # .ss
+⶿.Ss�; ⶿.ss�; [C2, P1, V6]; xn--7pj.xn--ss-n1t; ; xn--7pj.ss; [P1, V6] # .ss
+xn--7pj.ss; ⶿.ss; [V6]; xn--7pj.ss; ; ;  # .ss
+xn--7pj.xn--ss-n1t; ⶿.ss�; [C2, V6]; xn--7pj.xn--ss-n1t; ; ;  # .ss
+xn--7pj.xn--zca870n; ⶿.ß�; [C2, V6]; xn--7pj.xn--zca870n; ; ;  # .ß
+᯳︒.ت≯ꡂ; ; [B2, B3, B6, P1, V5, V6]; xn--1zf8957g.xn--pgb885lry5g; ; ;  # ᯳︒.ت≯ꡂ
+᯳︒.ت≯ꡂ; ᯳︒.ت≯ꡂ; [B2, B3, B6, P1, V5, V6]; xn--1zf8957g.xn--pgb885lry5g; ; ;  # ᯳︒.ت≯ꡂ
+᯳。.ت≯ꡂ; ᯳..ت≯ꡂ; [B2, B3, P1, V5, V6, X4_2]; xn--1zf..xn--pgb885lry5g; [B2, B3, P1, V5, V6, A4_2]; ;  # ᯳..ت≯ꡂ
+᯳。.ت≯ꡂ; ᯳..ت≯ꡂ; [B2, B3, P1, V5, V6, X4_2]; xn--1zf..xn--pgb885lry5g; [B2, B3, P1, V5, V6, A4_2]; ;  # ᯳..ت≯ꡂ
+xn--1zf..xn--pgb885lry5g; ᯳..ت≯ꡂ; [B2, B3, V5, V6, X4_2]; xn--1zf..xn--pgb885lry5g; [B2, B3, V5, V6, A4_2]; ;  # ᯳..ت≯ꡂ
+xn--1zf8957g.xn--pgb885lry5g; ᯳︒.ت≯ꡂ; [B2, B3, B6, V5, V6]; xn--1zf8957g.xn--pgb885lry5g; ; ;  # ᯳︒.ت≯ꡂ
+≮≠�｡-𫠆ڷ�; ≮≠�.-𫠆ڷ�; [B1, P1, V3, V6]; xn--1ch1a29470f.xn----7uc5363rc1rn; ; ;  # ≮≠.-𫠆ڷ�
+≮≠�｡-𫠆ڷ�; ≮≠�.-𫠆ڷ�; [B1, P1, V3, V6]; xn--1ch1a29470f.xn----7uc5363rc1rn; ; ;  # ≮≠.-𫠆ڷ�
+≮≠�。-𫠆ڷ�; ≮≠�.-𫠆ڷ�; [B1, P1, V3, V6]; xn--1ch1a29470f.xn----7uc5363rc1rn; ; ;  # ≮≠.-𫠆ڷ�
+≮≠�。-𫠆ڷ�; ≮≠�.-𫠆ڷ�; [B1, P1, V3, V6]; xn--1ch1a29470f.xn----7uc5363rc1rn; ; ;  # ≮≠.-𫠆ڷ�
+xn--1ch1a29470f.xn----7uc5363rc1rn; ≮≠�.-𫠆ڷ�; [B1, V3, V6]; xn--1ch1a29470f.xn----7uc5363rc1rn; ; ;  # ≮≠.-𫠆ڷ�
+�ݷ。ꡂ; �ݷ.ꡂ; [B1]; xn--7pb5275k.xn--bc9a; ; ;  # �ݷ.ꡂ
+xn--7pb5275k.xn--bc9a; �ݷ.ꡂ; [B1]; xn--7pb5275k.xn--bc9a; ; ;  # �ݷ.ꡂ
+Ⴉ�񔻅ؙ.ß��ݵ; ; [B5, B6, P1, V6]; xn--7fb125cjv87a7xvz.xn--zca684a699vf2d; ; xn--7fb125cjv87a7xvz.xn--ss-zme7575xp0e;  # Ⴉ�ؙ.ß��ݵ
+ⴉ�񔻅ؙ.ß��ݵ; ; [B5, B6, P1, V6]; xn--7fb940rwt3z7xvz.xn--zca684a699vf2d; ; xn--7fb940rwt3z7xvz.xn--ss-zme7575xp0e;  # ⴉ�ؙ.ß��ݵ
+Ⴉ�񔻅ؙ.SS��ݵ; Ⴉ�񔻅ؙ.ss��ݵ; [B5, B6, P1, V6]; xn--7fb125cjv87a7xvz.xn--ss-zme7575xp0e; ; ;  # Ⴉ�ؙ.ss��ݵ
+ⴉ�񔻅ؙ.ss��ݵ; ; [B5, B6, P1, V6]; xn--7fb940rwt3z7xvz.xn--ss-zme7575xp0e; ; ;  # ⴉ�ؙ.ss��ݵ
+Ⴉ�񔻅ؙ.Ss��ݵ; Ⴉ�񔻅ؙ.ss��ݵ; [B5, B6, P1, V6]; xn--7fb125cjv87a7xvz.xn--ss-zme7575xp0e; ; ;  # Ⴉ�ؙ.ss��ݵ
+xn--7fb125cjv87a7xvz.xn--ss-zme7575xp0e; Ⴉ�񔻅ؙ.ss��ݵ; [B5, B6, V6]; xn--7fb125cjv87a7xvz.xn--ss-zme7575xp0e; ; ;  # Ⴉ�ؙ.ss��ݵ
+xn--7fb940rwt3z7xvz.xn--ss-zme7575xp0e; ⴉ�񔻅ؙ.ss��ݵ; [B5, B6, V6]; xn--7fb940rwt3z7xvz.xn--ss-zme7575xp0e; ; ;  # ⴉ�ؙ.ss��ݵ
+xn--7fb940rwt3z7xvz.xn--zca684a699vf2d; ⴉ�񔻅ؙ.ß��ݵ; [B5, B6, V6]; xn--7fb940rwt3z7xvz.xn--zca684a699vf2d; ; ;  # ⴉ�ؙ.ß��ݵ
+xn--7fb125cjv87a7xvz.xn--zca684a699vf2d; Ⴉ�񔻅ؙ.ß��ݵ; [B5, B6, V6]; xn--7fb125cjv87a7xvz.xn--zca684a699vf2d; ; ;  # Ⴉ�ؙ.ß��ݵ
+�ك�↙.񊽡; ; [B1, C2, P1, V6]; xn--fhb713k87ag053c.xn--7s4w; ; xn--fhb011lnp8n.xn--7s4w; [B3, P1, V6] # ك�↙.
+xn--fhb011lnp8n.xn--7s4w; ك�↙.񊽡; [B3, V6]; xn--fhb011lnp8n.xn--7s4w; ; ;  # ك�↙.
+xn--fhb713k87ag053c.xn--7s4w; �ك�↙.񊽡; [B1, C2, V6]; xn--fhb713k87ag053c.xn--7s4w; ; ;  # ك�↙.
+梉。‌; 梉.‌; [C1]; xn--7zv.xn--0ug; ; xn--7zv.; [] # 梉.
+xn--7zv.; 梉.; ; xn--7zv.; ; ;  # 梉.
+梉.; ; ; xn--7zv.; ; ;  # 梉.
+xn--7zv.xn--0ug; 梉.‌; [C1]; xn--7zv.xn--0ug; ; ;  # 梉.
+ꡣ-≠.�𞤗�Ↄ; ꡣ-≠.�𞤹�Ↄ; [B1, B6, C2, P1, V6]; xn----ufo9661d.xn--1ug79cm620c71sh; ; xn----ufo9661d.xn--q5g0929fhm4f; [B2, B3, B6, P1, V6] # ꡣ-≠.𞤹�Ↄ
+ꡣ-≠.�𞤗�Ↄ; ꡣ-≠.�𞤹�Ↄ; [B1, B6, C2, P1, V6]; xn----ufo9661d.xn--1ug79cm620c71sh; ; xn----ufo9661d.xn--q5g0929fhm4f; [B2, B3, B6, P1, V6] # ꡣ-≠.𞤹�Ↄ
+ꡣ-≠.�𞤹�ↄ; ꡣ-≠.�𞤹�ↄ; [B1, B6, C2, P1, V6]; xn----ufo9661d.xn--1ug99cj620c71sh; ; xn----ufo9661d.xn--r5gy929fhm4f; [B2, B3, B6, P1, V6] # ꡣ-≠.𞤹�ↄ
+ꡣ-≠.�𞤹�ↄ; ; [B1, B6, C2, P1, V6]; xn----ufo9661d.xn--1ug99cj620c71sh; ; xn----ufo9661d.xn--r5gy929fhm4f; [B2, B3, B6, P1, V6] # ꡣ-≠.𞤹�ↄ
+ꡣ-≠.�𞤗�ↄ; ꡣ-≠.�𞤹�ↄ; [B1, B6, C2, P1, V6]; xn----ufo9661d.xn--1ug99cj620c71sh; ; xn----ufo9661d.xn--r5gy929fhm4f; [B2, B3, B6, P1, V6] # ꡣ-≠.𞤹�ↄ
+ꡣ-≠.�𞤗�ↄ; ꡣ-≠.�𞤹�ↄ; [B1, B6, C2, P1, V6]; xn----ufo9661d.xn--1ug99cj620c71sh; ; xn----ufo9661d.xn--r5gy929fhm4f; [B2, B3, B6, P1, V6] # ꡣ-≠.𞤹�ↄ
+xn----ufo9661d.xn--r5gy929fhm4f; ꡣ-≠.𞤹�ↄ; [B2, B3, B6, V6]; xn----ufo9661d.xn--r5gy929fhm4f; ; ;  # ꡣ-≠.𞤹�ↄ
+xn----ufo9661d.xn--1ug99cj620c71sh; ꡣ-≠.�𞤹�ↄ; [B1, B6, C2, V6]; xn----ufo9661d.xn--1ug99cj620c71sh; ; ;  # ꡣ-≠.𞤹�ↄ
+xn----ufo9661d.xn--q5g0929fhm4f; ꡣ-≠.𞤹�Ↄ; [B2, B3, B6, V6]; xn----ufo9661d.xn--q5g0929fhm4f; ; ;  # ꡣ-≠.𞤹�Ↄ
+xn----ufo9661d.xn--1ug79cm620c71sh; ꡣ-≠.�𞤹�Ↄ; [B1, B6, C2, V6]; xn----ufo9661d.xn--1ug79cm620c71sh; ; ;  # ꡣ-≠.𞤹�Ↄ
+ς��⸵｡�🄊�; ς��⸵.�🄊7; [B6, P1, V6]; xn--3xa019nwtghi25b.xn--7-075iy877c; ; xn--4xa809nwtghi25b.xn--7-075iy877c;  # ς��⸵.🄊7
+ς9.�⸵。�9,7; ς9.�⸵.�9,7; [B1, P1, V5, V6]; xn--9-xmb.xn--ltj1535k.xn--9,7-r67t; ; xn--9-zmb.xn--ltj1535k.xn--9,7-r67t;  # ς9.�⸵.9,7
+Σ9.�⸵。�9,7; σ9.�⸵.�9,7; [B1, P1, V5, V6]; xn--9-zmb.xn--ltj1535k.xn--9,7-r67t; ; ;  # σ9.�⸵.9,7
+σ9.�⸵。�9,7; σ9.�⸵.�9,7; [B1, P1, V5, V6]; xn--9-zmb.xn--ltj1535k.xn--9,7-r67t; ; ;  # σ9.�⸵.9,7
+xn--9-zmb.xn--ltj1535k.xn--9,7-r67t; σ9.�⸵.�9,7; [B1, P1, V5, V6]; xn--9-zmb.xn--ltj1535k.xn--9,7-r67t; ; ;  # σ9.�⸵.9,7
+xn--9-xmb.xn--ltj1535k.xn--9,7-r67t; ς9.�⸵.�9,7; [B1, P1, V5, V6]; xn--9-xmb.xn--ltj1535k.xn--9,7-r67t; ; ;  # ς9.�⸵.9,7
+Σ��⸵｡�🄊�; σ��⸵.�🄊7; [B6, P1, V6]; xn--4xa809nwtghi25b.xn--7-075iy877c; ; ;  # σ��⸵.🄊7
+σ��⸵｡�🄊�; σ��⸵.�🄊7; [B6, P1, V6]; xn--4xa809nwtghi25b.xn--7-075iy877c; ; ;  # σ��⸵.🄊7
+xn--4xa809nwtghi25b.xn--7-075iy877c; σ��⸵.�🄊7; [B6, V6]; xn--4xa809nwtghi25b.xn--7-075iy877c; ; ;  # σ��⸵.🄊7
+xn--3xa019nwtghi25b.xn--7-075iy877c; ς��⸵.�🄊7; [B6, V6]; xn--3xa019nwtghi25b.xn--7-075iy877c; ; ;  # ς��⸵.🄊7
+ࡓ．‌ß; ࡓ.‌ß; [B1, C1]; xn--iwb.xn--zca570n; ; xn--iwb.ss; [] # ࡓ.ß
+ࡓ.‌ß; ; [B1, C1]; xn--iwb.xn--zca570n; ; xn--iwb.ss; [] # ࡓ.ß
+ࡓ.‌SS; ࡓ.‌ss; [B1, C1]; xn--iwb.xn--ss-i1t; ; xn--iwb.ss; [] # ࡓ.ss
+ࡓ.‌ss; ; [B1, C1]; xn--iwb.xn--ss-i1t; ; xn--iwb.ss; [] # ࡓ.ss
+xn--iwb.ss; à¡“.ss; ; xn--iwb.ss; ; ;  # à¡“.ss
+à¡“.ss; ; ; xn--iwb.ss; ; ;  # à¡“.ss
+à¡“.SS; à¡“.ss; ; xn--iwb.ss; ; ;  # à¡“.ss
+xn--iwb.xn--ss-i1t; ࡓ.‌ss; [B1, C1]; xn--iwb.xn--ss-i1t; ; ;  # ࡓ.ss
+xn--iwb.xn--zca570n; ࡓ.‌ß; [B1, C1]; xn--iwb.xn--zca570n; ; ;  # ࡓ.ß
+ࡓ．‌SS; ࡓ.‌ss; [B1, C1]; xn--iwb.xn--ss-i1t; ; xn--iwb.ss; [] # ࡓ.ss
+ࡓ．‌ss; ࡓ.‌ss; [B1, C1]; xn--iwb.xn--ss-i1t; ; xn--iwb.ss; [] # ࡓ.ss
+ࡓ.‌Ss; ࡓ.‌ss; [B1, C1]; xn--iwb.xn--ss-i1t; ; xn--iwb.ss; [] # ࡓ.ss
+ࡓ．‌Ss; ࡓ.‌ss; [B1, C1]; xn--iwb.xn--ss-i1t; ; xn--iwb.ss; [] # ࡓ.ss
+񯶣-.�ݎ�󠻨; ; [B1, B6, C2, P1, V3, V6]; xn----s116e.xn--1ob387jy90hq459k; ; xn----s116e.xn--1ob6504fmf40i; [B3, B6, P1, V3, V6] # -.ݎ�
+xn----s116e.xn--1ob6504fmf40i; 񯶣-.ݎ�󠻨; [B3, B6, V3, V6]; xn----s116e.xn--1ob6504fmf40i; ; ;  # -.ݎ�
+xn----s116e.xn--1ob387jy90hq459k; 񯶣-.�ݎ�󠻨; [B1, B6, C2, V3, V6]; xn----s116e.xn--1ob387jy90hq459k; ; ;  # -.ݎ�
+䃚蟥-。-񽒘⒈; 䃚蟥-.-񽒘⒈; [P1, V3, V6]; xn----n50a258u.xn----ecp33805f; ; ;  # 䃚蟥-.-⒈
+䃚蟥-。-񽒘1.; 䃚蟥-.-񽒘1.; [P1, V3, V6]; xn----n50a258u.xn---1-up07j.; ; ;  # 䃚蟥-.-1.
+xn----n50a258u.xn---1-up07j.; 䃚蟥-.-񽒘1.; [V3, V6]; xn----n50a258u.xn---1-up07j.; ; ;  # 䃚蟥-.-1.
+xn----n50a258u.xn----ecp33805f; 䃚蟥-.-񽒘⒈; [V3, V6]; xn----n50a258u.xn----ecp33805f; ; ;  # 䃚蟥-.-⒈
+�䚵-ꡡ。⺇; �䚵-ꡡ.⺇; [B1]; xn----bm3an932a1l5d.xn--xvj; ; ;  # �䚵-ꡡ.⺇
+xn----bm3an932a1l5d.xn--xvj; �䚵-ꡡ.⺇; [B1]; xn----bm3an932a1l5d.xn--xvj; ; ;  # �䚵-ꡡ.⺇
+𑄳。᫜�; 𑄳.᫜�; [B1, B3, B5, B6, P1, V5, V6]; xn--v80d.xn--2rf1154i; ; ;  # 𑄳.�
+xn--v80d.xn--2rf1154i; 𑄳.᫜�; [B1, B3, B5, B6, V5, V6]; xn--v80d.xn--2rf1154i; ; ;  # 𑄳.�
+≮�.⒎𑂵ں؂; ; [B1, P1, V6]; xn--gdhx904g.xn--kfb18a325efm3s; ; ;  # ≮�.⒎𑂵ں
+≮�.⒎𑂵ں؂; ≮�.⒎𑂵ں؂; [B1, P1, V6]; xn--gdhx904g.xn--kfb18a325efm3s; ; ;  # ≮�.⒎𑂵ں
+≮�.7.𑂵ں؂; ; [B1, P1, V5, V6]; xn--gdhx904g.7.xn--kfb18an307d; ; ;  # ≮�.7.𑂵ں
+≮�.7.𑂵ں؂; ≮�.7.𑂵ں؂; [B1, P1, V5, V6]; xn--gdhx904g.7.xn--kfb18an307d; ; ;  # ≮�.7.𑂵ں
+xn--gdhx904g.7.xn--kfb18an307d; ≮�.7.𑂵ں؂; [B1, V5, V6]; xn--gdhx904g.7.xn--kfb18an307d; ; ;  # ≮�.7.𑂵ں
+xn--gdhx904g.xn--kfb18a325efm3s; ≮�.⒎𑂵ں؂; [B1, V6]; xn--gdhx904g.xn--kfb18a325efm3s; ; ;  # ≮�.⒎𑂵ں
+ᢔ≠􋉂.��; ; [C2, P1, V6]; xn--ebf031cf7196a.xn--1ug9540g; ; xn--ebf031cf7196a.xn--587c; [P1, V6] # ᢔ≠.�
+ᢔ≠􋉂.��; ᢔ≠􋉂.��; [C2, P1, V6]; xn--ebf031cf7196a.xn--1ug9540g; ; xn--ebf031cf7196a.xn--587c; [P1, V6] # ᢔ≠.�
+xn--ebf031cf7196a.xn--587c; ᢔ≠􋉂.�; [V6]; xn--ebf031cf7196a.xn--587c; ; ;  # ᢔ≠.�
+xn--ebf031cf7196a.xn--1ug9540g; ᢔ≠􋉂.��; [C2, V6]; xn--ebf031cf7196a.xn--1ug9540g; ; ;  # ᢔ≠.�
+�≮񣊛≯．٬𞵕⳿; �≮񣊛≯.٬𞵕⳿; [B1, B2, B3, P1, V6]; xn--gdhc0519o0y27b.xn--lib468q0d21a; ; ;  # �≮≯.٬⳿
+�≮񣊛≯．٬𞵕⳿; �≮񣊛≯.٬𞵕⳿; [B1, B2, B3, P1, V6]; xn--gdhc0519o0y27b.xn--lib468q0d21a; ; ;  # �≮≯.٬⳿
+�≮񣊛≯.٬𞵕⳿; ; [B1, B2, B3, P1, V6]; xn--gdhc0519o0y27b.xn--lib468q0d21a; ; ;  # �≮≯.٬⳿
+�≮񣊛≯.٬𞵕⳿; �≮񣊛≯.٬𞵕⳿; [B1, B2, B3, P1, V6]; xn--gdhc0519o0y27b.xn--lib468q0d21a; ; ;  # �≮≯.٬⳿
+xn--gdhc0519o0y27b.xn--lib468q0d21a; �≮񣊛≯.٬𞵕⳿; [B1, B2, B3, V6]; xn--gdhc0519o0y27b.xn--lib468q0d21a; ; ;  # �≮≯.٬⳿
+-｡�; -.�; [V3]; -.xn--6vj; ; ;  # -.�
+-。�; -.�; [V3]; -.xn--6vj; ; ;  # -.�
+-.xn--6vj; -.�; [V3]; -.xn--6vj; ; ;  # -.�
+󠰩𑲬．ٜ; 󠰩𑲬.ٜ; [P1, V5, V6]; xn--sn3d59267c.xn--4hb; ; ;  # 𑲬.ٜ
+󠰩𑲬.ٜ; ; [P1, V5, V6]; xn--sn3d59267c.xn--4hb; ; ;  # 𑲬.ٜ
+xn--sn3d59267c.xn--4hb; 󠰩𑲬.ٜ; [V5, V6]; xn--sn3d59267c.xn--4hb; ; ;  # 𑲬.ٜ
+�.񚇃‌; ; [C1, P1, V5, V6]; xn--ie8c.xn--0ug03366c; ; xn--ie8c.xn--2g51a; [P1, V5, V6] # �.
+xn--ie8c.xn--2g51a; �.񚇃; [V5, V6]; xn--ie8c.xn--2g51a; ; ;  # �.
+xn--ie8c.xn--0ug03366c; �.񚇃‌; [C1, V5, V6]; xn--ie8c.xn--0ug03366c; ; ;  # �.
+ؽۣ.�; ; [B1, B3, B6, V5]; xn--8gb64a.xn--mr9c; ; ;  # ؽۣ.�
+xn--8gb64a.xn--mr9c; ؽۣ.�; [B1, B3, B6, V5]; xn--8gb64a.xn--mr9c; ; ;  # ؽۣ.�
+漦Ⴙς.񡻀�; ; [B5, B6, P1, V6]; xn--3xa157d717e.xn--9d0d3162t; ; xn--4xa947d717e.xn--9d0d3162t;  # 漦Ⴙς.�
+漦ⴙς.񡻀�; ; [B5, B6, P1, V6]; xn--3xa972sl47b.xn--9d0d3162t; ; xn--4xa772sl47b.xn--9d0d3162t;  # 漦ⴙς.�
+漦ႹΣ.񡻀�; 漦Ⴙσ.񡻀�; [B5, B6, P1, V6]; xn--4xa947d717e.xn--9d0d3162t; ; ;  # 漦Ⴙσ.�
+漦ⴙσ.񡻀�; ; [B5, B6, P1, V6]; xn--4xa772sl47b.xn--9d0d3162t; ; ;  # 漦ⴙσ.�
+漦Ⴙσ.񡻀�; ; [B5, B6, P1, V6]; xn--4xa947d717e.xn--9d0d3162t; ; ;  # 漦Ⴙσ.�
+xn--4xa947d717e.xn--9d0d3162t; 漦Ⴙσ.񡻀�; [B5, B6, V6]; xn--4xa947d717e.xn--9d0d3162t; ; ;  # 漦Ⴙσ.�
+xn--4xa772sl47b.xn--9d0d3162t; 漦ⴙσ.񡻀�; [B5, B6, V6]; xn--4xa772sl47b.xn--9d0d3162t; ; ;  # 漦ⴙσ.�
+xn--3xa972sl47b.xn--9d0d3162t; 漦ⴙς.񡻀�; [B5, B6, V6]; xn--3xa972sl47b.xn--9d0d3162t; ; ;  # 漦ⴙς.�
+xn--3xa157d717e.xn--9d0d3162t; 漦Ⴙς.񡻀�; [B5, B6, V6]; xn--3xa157d717e.xn--9d0d3162t; ; ;  # 漦Ⴙς.�
+�踧�򫚇.󜀃⒈�; ; [B1, P1, V6]; xn--8tc1437dro0d6q06h.xn--tsh2611ncu71e; ; ;  # �踧�.⒈�
+�踧�򫚇.󜀃1.�; ; [B1, B3, B6, P1, V5, V6]; xn--8tc1437dro0d6q06h.xn--1-p948l.xn--m82h; ; ;  # �踧�.1.�
+xn--8tc1437dro0d6q06h.xn--1-p948l.xn--m82h; �踧�򫚇.󜀃1.�; [B1, B3, B6, V5, V6]; xn--8tc1437dro0d6q06h.xn--1-p948l.xn--m82h; ; ;  # �踧�.1.�
+xn--8tc1437dro0d6q06h.xn--tsh2611ncu71e; �踧�򫚇.󜀃⒈�; [B1, V6]; xn--8tc1437dro0d6q06h.xn--tsh2611ncu71e; ; ;  # �踧�.⒈�
+�≮．󠟪�-; �≮.󠟪�-; [C2, P1, V3, V6]; xn--1ug95g.xn----cr99a1w710b; ; xn--gdh.xn----cr99a1w710b; [P1, V3, V6] # ≮.-
+�≮．󠟪�-; �≮.󠟪�-; [C2, P1, V3, V6]; xn--1ug95g.xn----cr99a1w710b; ; xn--gdh.xn----cr99a1w710b; [P1, V3, V6] # ≮.-
+�≮.󠟪�-; ; [C2, P1, V3, V6]; xn--1ug95g.xn----cr99a1w710b; ; xn--gdh.xn----cr99a1w710b; [P1, V3, V6] # ≮.-
+�≮.󠟪�-; �≮.󠟪�-; [C2, P1, V3, V6]; xn--1ug95g.xn----cr99a1w710b; ; xn--gdh.xn----cr99a1w710b; [P1, V3, V6] # ≮.-
+xn--gdh.xn----cr99a1w710b; ≮.󠟪�-; [V3, V6]; xn--gdh.xn----cr99a1w710b; ; ;  # ≮.-
+xn--1ug95g.xn----cr99a1w710b; �≮.󠟪�-; [C2, V3, V6]; xn--1ug95g.xn----cr99a1w710b; ; ;  # ≮.-
+��襔。Ⴜ5ꡮ�; ��襔.Ⴜ5ꡮ�; [C2, P1, V6]; xn--1uga7691f.xn--5-r1g7167ipfw8d; ; xn--2u2a.xn--5-r1g7167ipfw8d; [P1, V6] # 襔.Ⴜ5ꡮ
+��襔。ⴜ5ꡮ�; ��襔.ⴜ5ꡮ�; [C2, P1, V6]; xn--1uga7691f.xn--5-uws5848bpf44e; ; xn--2u2a.xn--5-uws5848bpf44e; [P1, V6] # 襔.ⴜ5ꡮ
+xn--2u2a.xn--5-uws5848bpf44e; 襔.ⴜ5ꡮ�; [V6]; xn--2u2a.xn--5-uws5848bpf44e; ; ;  # 襔.ⴜ5ꡮ
+xn--1uga7691f.xn--5-uws5848bpf44e; ��襔.ⴜ5ꡮ�; [C2, V6]; xn--1uga7691f.xn--5-uws5848bpf44e; ; ;  # 襔.ⴜ5ꡮ
+xn--2u2a.xn--5-r1g7167ipfw8d; 襔.Ⴜ5ꡮ�; [V6]; xn--2u2a.xn--5-r1g7167ipfw8d; ; ;  # 襔.Ⴜ5ꡮ
+xn--1uga7691f.xn--5-r1g7167ipfw8d; ��襔.Ⴜ5ꡮ�; [C2, V6]; xn--1uga7691f.xn--5-r1g7167ipfw8d; ; ;  # 襔.Ⴜ5ꡮ
+�𑌼�．婀; �𑌼�.婀; [B3, C2]; xn--1ugx063g1if.xn--q0s; ; xn--ix9c26l.xn--q0s; [] # �𑌼.婀
+�𑌼�.婀; ; [B3, C2]; xn--1ugx063g1if.xn--q0s; ; xn--ix9c26l.xn--q0s; [] # �𑌼.婀
+xn--ix9c26l.xn--q0s; �𑌼.婀; ; xn--ix9c26l.xn--q0s; ; ;  # �𑌼.婀
+�𑌼.婀; ; ; xn--ix9c26l.xn--q0s; ; ;  # �𑌼.婀
+xn--1ugx063g1if.xn--q0s; �𑌼�.婀; [B3, C2]; xn--1ugx063g1if.xn--q0s; ; ;  # �𑌼.婀
+󠅽︒︒�｡⬳᩸; ︒︒�.⬳᩸; [B1, P1, V6]; xn--y86ca186j.xn--7of309e; ; ;  # ︒︒�.⬳᩸
+󠅽。。�。⬳᩸; ..�.⬳᩸; [B1, X4_2]; ..xn--no0d.xn--7of309e; [B1, A4_2]; ;  # ..�.⬳᩸
+..xn--no0d.xn--7of309e; ..�.⬳᩸; [B1, X4_2]; ..xn--no0d.xn--7of309e; [B1, A4_2]; ;  # ..�.⬳᩸
+xn--y86ca186j.xn--7of309e; ︒︒�.⬳᩸; [B1, V6]; xn--y86ca186j.xn--7of309e; ; ;  # ︒︒�.⬳᩸
+�ß．�-?Ⴏ; 8ß.-?Ⴏ; [P1, V3, V6]; xn--8-qfa.-?Ⴏ; [P1, V3, V6, A3]; 8ss.-?Ⴏ;  # 8ß.-Ⴏ
+8ß.�-?Ⴏ; 8ß.-?Ⴏ; [P1, V3, V6]; xn--8-qfa.-?Ⴏ; [P1, V3, V6, A3]; 8ss.-?Ⴏ;  # 8ß.-Ⴏ
+8ß.�-?�; 8ß.-?�; [P1, V3, V6]; xn--8-qfa.-?�; [P1, V3, V6, A3]; 8ss.-?�;  # 8ß.-�
+8SS.�-?Ⴏ; 8ss.-?Ⴏ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-Ⴏ
+8ss.�-?�; 8ss.-?�; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-�
+8ss.�-?Ⴏ; 8ss.-?Ⴏ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-Ⴏ
+8ss.-?Ⴏ; ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-Ⴏ
+8ss.-?â´�; ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-â´�
+8SS.-?Ⴏ; 8ss.-?Ⴏ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-Ⴏ
+xn--8-qfa.-?�; 8ß.-?�; [P1, V3, V6]; xn--8-qfa.-?�; [P1, V3, V6, A3]; ;  # 8ß.-�
+XN--8-QFA.-?Ⴏ; 8ß.-?Ⴏ; [P1, V3, V6]; xn--8-qfa.-?Ⴏ; [P1, V3, V6, A3]; ;  # 8ß.-Ⴏ
+Xn--8-Qfa.-?Ⴏ; 8ß.-?Ⴏ; [P1, V3, V6]; xn--8-qfa.-?Ⴏ; [P1, V3, V6, A3]; ;  # 8ß.-Ⴏ
+xn--8-qfa.-?Ⴏ; 8ß.-?Ⴏ; [P1, V3, V6]; xn--8-qfa.-?Ⴏ; [P1, V3, V6, A3]; ;  # 8ß.-Ⴏ
+�ß．�-?�; 8ß.-?�; [P1, V3, V6]; xn--8-qfa.-?�; [P1, V3, V6, A3]; 8ss.-?�;  # 8ß.-�
+�SS．�-?Ⴏ; 8ss.-?Ⴏ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-Ⴏ
+�ss．�-?�; 8ss.-?�; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-�
+�ss．�-?Ⴏ; 8ss.-?Ⴏ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-Ⴏ
+�Ss．�-?Ⴏ; 8ss.-?Ⴏ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-Ⴏ
+8Ss.�-?Ⴏ; 8ss.-?Ⴏ; [P1, V3, V6]; ; [P1, V3, V6, A3]; ;  # 8ss.-Ⴏ
+-�󠋟.‌�Ⴅ; ; [B1, C1, C2, P1, V3, V6]; xn----ugnv7071n.xn--dnd999e4j4p; ; xn----s721m.xn--dnd9201k; [B1, P1, V3, V6] # -.�Ⴅ
+-�󠋟.‌�ⴅ; ; [B1, C1, C2, P1, V3, V6]; xn----ugnv7071n.xn--0ugz32cgr0p; ; xn----s721m.xn--wkj1423e; [B1, P1, V3, V6] # -.�ⴅ
+xn----s721m.xn--wkj1423e; -󠋟.�ⴅ; [B1, V3, V6]; xn----s721m.xn--wkj1423e; ; ;  # -.�ⴅ
+xn----ugnv7071n.xn--0ugz32cgr0p; -�󠋟.‌�ⴅ; [B1, C1, C2, V3, V6]; xn----ugnv7071n.xn--0ugz32cgr0p; ; ;  # -.�ⴅ
+xn----s721m.xn--dnd9201k; -󠋟.�Ⴅ; [B1, V3, V6]; xn----s721m.xn--dnd9201k; ; ;  # -.�Ⴅ
+xn----ugnv7071n.xn--dnd999e4j4p; -�󠋟.‌�Ⴅ; [B1, C1, C2, V3, V6]; xn----ugnv7071n.xn--dnd999e4j4p; ; ;  # -.�Ⴅ
+ꦹ��𻶡｡₂; ꦹ��𻶡.2; [C2, P1, V5, V6]; xn--1ug1435cfkyaoi04d.2; ; xn--0m9as84e2e21c.2; [P1, V5, V6] # ꦹ�.2
+ꦹ��ᅳᆲ𻶡｡₂; ꦹ��𻶡.2; [C2, P1, V5, V6]; xn--1ug1435cfkyaoi04d.2; ; xn--0m9as84e2e21c.2; [P1, V5, V6] # ꦹ�.2
+ꦹ��𻶡。2; ꦹ��𻶡.2; [C2, P1, V5, V6]; xn--1ug1435cfkyaoi04d.2; ; xn--0m9as84e2e21c.2; [P1, V5, V6] # ꦹ�.2
+ꦹ��ᅳᆲ𻶡。2; ꦹ��𻶡.2; [C2, P1, V5, V6]; xn--1ug1435cfkyaoi04d.2; ; xn--0m9as84e2e21c.2; [P1, V5, V6] # ꦹ�.2
+xn--0m9as84e2e21c.2; ꦹ�𻶡.2; [V5, V6]; xn--0m9as84e2e21c.2; ; ;  # ꦹ�.2
+xn--1ug1435cfkyaoi04d.2; ꦹ��𻶡.2; [C2, V5, V6]; xn--1ug1435cfkyaoi04d.2; ; ;  # ꦹ�.2
+?.🄄𞯘; ; [B1, P1, V6]; ?.xn--3x6hx6f; [B1, P1, V6, A3]; ;  # .🄄
+?.3,𞯘; ; [B1, P1, V6]; ?.xn--3,-tb22a; [B1, P1, V6, A3]; ;  # .3,
+?.xn--3,-tb22a; ?.3,𞯘; [B1, P1, V6]; ?.xn--3,-tb22a; [B1, P1, V6, A3]; ;  # .3,
+?.XN--3,-TB22A; ?.3,𞯘; [B1, P1, V6]; ?.xn--3,-tb22a; [B1, P1, V6, A3]; ;  # .3,
+?.Xn--3,-Tb22a; ?.3,𞯘; [B1, P1, V6]; ?.xn--3,-tb22a; [B1, P1, V6, A3]; ;  # .3,
+?.xn--3x6hx6f; ?.🄄𞯘; [B1, P1, V6]; ?.xn--3x6hx6f; [B1, P1, V6, A3]; ;  # .🄄
+?.XN--3X6HX6F; ?.🄄𞯘; [B1, P1, V6]; ?.xn--3x6hx6f; [B1, P1, V6, A3]; ;  # .🄄
+?.Xn--3x6hx6f; ?.🄄𞯘; [B1, P1, V6]; ?.xn--3x6hx6f; [B1, P1, V6, A3]; ;  # .🄄
+��。�󀡶ꣅ⒈; ��.�󀡶ꣅ⒈; [B1, P1, V5, V6]; xn--rt9cl956a.xn--tlb403mxv4g06s9i; ; ;  # �.ꣅ⒈
+��。�󀡶ꣅ1.; ��.�󀡶ꣅ1.; [B1, P1, V5, V6]; xn--rt9cl956a.xn--1-dxc8545j0693i.; ; ;  # �.ꣅ1.
+xn--rt9cl956a.xn--1-dxc8545j0693i.; ��.�󀡶ꣅ1.; [B1, V5, V6]; xn--rt9cl956a.xn--1-dxc8545j0693i.; ; ;  # �.ꣅ1.
+xn--rt9cl956a.xn--tlb403mxv4g06s9i; ��.�󀡶ꣅ⒈; [B1, V5, V6]; xn--rt9cl956a.xn--tlb403mxv4g06s9i; ; ;  # �.ꣅ⒈
+򒈣סڸ。Ⴈ�; 򒈣סڸ.Ⴈ�; [B5, B6, C2, P1, V6]; xn--meb44b57607c.xn--gnd699e; ; xn--meb44b57607c.xn--gnd; [B5, B6, P1, V6] # סڸ.Ⴈ
+򒈣סڸ。ⴈ�; 򒈣סڸ.ⴈ�; [B5, B6, C2, P1, V6]; xn--meb44b57607c.xn--1ug232c; ; xn--meb44b57607c.xn--zkj; [B5, B6, P1, V6] # סڸ.ⴈ
+xn--meb44b57607c.xn--zkj; 򒈣סڸ.ⴈ; [B5, B6, V6]; xn--meb44b57607c.xn--zkj; ; ;  # סڸ.ⴈ
+xn--meb44b57607c.xn--1ug232c; 򒈣סڸ.ⴈ�; [B5, B6, C2, V6]; xn--meb44b57607c.xn--1ug232c; ; ;  # סڸ.ⴈ
+xn--meb44b57607c.xn--gnd; 򒈣סڸ.Ⴈ; [B5, B6, V6]; xn--meb44b57607c.xn--gnd; ; ;  # סڸ.Ⴈ
+xn--meb44b57607c.xn--gnd699e; 򒈣סڸ.Ⴈ�; [B5, B6, C2, V6]; xn--meb44b57607c.xn--gnd699e; ; ;  # סڸ.Ⴈ
+󀚶�ߦ⒈．�髯‌; 󀚶�ߦ⒈.�髯‌; [B1, B5, C1, P1, V5, V6]; xn--etb477lq931a1f58e.xn--0ugx259bocxd; ; xn--etb477lq931a1f58e.xn--uj6at43v; [B1, B5, P1, V5, V6] # �ߦ⒈.�髯
+󀚶�ߦ1..�髯‌; ; [B1, B5, C1, P1, V5, V6, X4_2]; xn--1-idd62296a1fr6e..xn--0ugx259bocxd; [B1, B5, C1, P1, V5, V6, A4_2]; xn--1-idd62296a1fr6e..xn--uj6at43v; [B1, B5, P1, V5, V6, A4_2] # �ߦ1..�髯
+xn--1-idd62296a1fr6e..xn--uj6at43v; 󀚶�ߦ1..�髯; [B1, B5, V5, V6, X4_2]; xn--1-idd62296a1fr6e..xn--uj6at43v; [B1, B5, V5, V6, A4_2]; ;  # �ߦ1..�髯
+xn--1-idd62296a1fr6e..xn--0ugx259bocxd; 󀚶�ߦ1..�髯‌; [B1, B5, C1, V5, V6, X4_2]; xn--1-idd62296a1fr6e..xn--0ugx259bocxd; [B1, B5, C1, V5, V6, A4_2]; ;  # �ߦ1..�髯
+xn--etb477lq931a1f58e.xn--uj6at43v; 󀚶�ߦ⒈.�髯; [B1, B5, V5, V6]; xn--etb477lq931a1f58e.xn--uj6at43v; ; ;  # �ߦ⒈.�髯
+xn--etb477lq931a1f58e.xn--0ugx259bocxd; 󀚶�ߦ⒈.�髯‌; [B1, B5, C1, V5, V6]; xn--etb477lq931a1f58e.xn--0ugx259bocxd; ; ;  # �ߦ⒈.�髯
+�．ډ𑌀; �.ډ𑌀; ; xn--pw9c.xn--fjb8658k; ; ;  # �.ډ𑌀
+�.ډ𑌀; ; ; xn--pw9c.xn--fjb8658k; ; ;  # �.ډ𑌀
+xn--pw9c.xn--fjb8658k; �.ډ𑌀; ; xn--pw9c.xn--fjb8658k; ; ;  # �.ډ𑌀
+𑋪．�; 𑋪.�; [B1, B3, B6, V5]; xn--fm1d.xn--5c0d; ; ;  # 𑋪.�
+𑋪.�; ; [B1, B3, B6, V5]; xn--fm1d.xn--5c0d; ; ;  # 𑋪.�
+𑋪.�; 𑋪.�; [B1, B3, B6, V5]; xn--fm1d.xn--5c0d; ; ;  # 𑋪.�
+xn--fm1d.xn--5c0d; 𑋪.�; [B1, B3, B6, V5]; xn--fm1d.xn--5c0d; ; ;  # 𑋪.�
+𑋪．�; 𑋪.�; [B1, B3, B6, V5]; xn--fm1d.xn--5c0d; ; ;  # 𑋪.�
+≠膣。ྃ; ≠膣.ྃ; [P1, V5, V6]; xn--1chy468a.xn--2ed; ; ;  # ≠膣.ྃ
+≠膣。ྃ; ≠膣.ྃ; [P1, V5, V6]; xn--1chy468a.xn--2ed; ; ;  # ≠膣.ྃ
+xn--1chy468a.xn--2ed; ≠膣.ྃ; [V5, V6]; xn--1chy468a.xn--2ed; ; ;  # ≠膣.ྃ
+񰀎-ݽ｡ß; 񰀎-ݽ.ß; [B5, B6, P1, V6]; xn----j6c95618k.xn--zca; ; xn----j6c95618k.ss;  # -ݽ.ß
+񰀎-ݽ。ß; 񰀎-ݽ.ß; [B5, B6, P1, V6]; xn----j6c95618k.xn--zca; ; xn----j6c95618k.ss;  # -ݽ.ß
+񰀎-ݽ。SS; 񰀎-ݽ.ss; [B5, B6, P1, V6]; xn----j6c95618k.ss; ; ;  # -ݽ.ss
+񰀎-ݽ。ss; 񰀎-ݽ.ss; [B5, B6, P1, V6]; xn----j6c95618k.ss; ; ;  # -ݽ.ss
+񰀎-ݽ。Ss; 񰀎-ݽ.ss; [B5, B6, P1, V6]; xn----j6c95618k.ss; ; ;  # -ݽ.ss
+xn----j6c95618k.ss; 񰀎-ݽ.ss; [B5, B6, V6]; xn----j6c95618k.ss; ; ;  # -ݽ.ss
+xn----j6c95618k.xn--zca; 񰀎-ݽ.ß; [B5, B6, V6]; xn----j6c95618k.xn--zca; ; ;  # -ݽ.ß
+񰀎-ݽ｡SS; 񰀎-ݽ.ss; [B5, B6, P1, V6]; xn----j6c95618k.ss; ; ;  # -ݽ.ss
+񰀎-ݽ｡ss; 񰀎-ݽ.ss; [B5, B6, P1, V6]; xn----j6c95618k.ss; ; ;  # -ݽ.ss
+񰀎-ݽ｡Ss; 񰀎-ݽ.ss; [B5, B6, P1, V6]; xn----j6c95618k.ss; ; ;  # -ݽ.ss
+ς�ᡚ𑄳．⾭���; ς�ᡚ𑄳.����; [B5, B6, P1, V6]; xn--3xa856hp23pxmc.xn--es5a888tvjc2u15h; ; xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h;  # ς�ᡚ𑄳.���
+ς�ᡚ𑄳.����; ; [B5, B6, P1, V6]; xn--3xa856hp23pxmc.xn--es5a888tvjc2u15h; ; xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h;  # ς�ᡚ𑄳.���
+Σ�ᡚ𑄳.����; σ�ᡚ𑄳.����; [B5, B6, P1, V6]; xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h; ; ;  # σ�ᡚ𑄳.���
+σ�ᡚ𑄳.����; ; [B5, B6, P1, V6]; xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h; ; ;  # σ�ᡚ𑄳.���
+xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h; σ�ᡚ𑄳.����; [B5, B6, V6]; xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h; ; ;  # σ�ᡚ𑄳.���
+xn--3xa856hp23pxmc.xn--es5a888tvjc2u15h; ς�ᡚ𑄳.����; [B5, B6, V6]; xn--3xa856hp23pxmc.xn--es5a888tvjc2u15h; ; ;  # ς�ᡚ𑄳.���
+Σ�ᡚ𑄳．⾭���; σ�ᡚ𑄳.����; [B5, B6, P1, V6]; xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h; ; ;  # σ�ᡚ𑄳.���
+σ�ᡚ𑄳．⾭���; σ�ᡚ𑄳.����; [B5, B6, P1, V6]; xn--4xa656hp23pxmc.xn--es5a888tvjc2u15h; ; ;  # σ�ᡚ𑄳.���
+�。�; �.�; [C2]; xn--r97c.xn--1ug; ; xn--r97c.; [] # �.
+xn--r97c.; �.; ; xn--r97c.; ; ;  # �.
+�.; ; ; xn--r97c.; ; ;  # �.
+xn--r97c.xn--1ug; �.�; [C2]; xn--r97c.xn--1ug; ; ;  # �.
+𑰳𑈯。⥪; 𑰳𑈯.⥪; [V5]; xn--2g1d14o.xn--jti; ; ;  # 𑰳𑈯.⥪
+xn--2g1d14o.xn--jti; 𑰳𑈯.⥪; [V5]; xn--2g1d14o.xn--jti; ; ;  # 𑰳𑈯.⥪
+𑆀�񤧣．Ⴕ�‌͈; 𑆀�񤧣.Ⴕ4‌͈; [C1, P1, V5, V6]; xn--1mnx647cg3x1b.xn--4-zfb324h32o; ; xn--1mnx647cg3x1b.xn--4-zfb324h; [P1, V5, V6] # 𑆀�.Ⴕ4͈
+𑆀�񤧣.Ⴕ4‌͈; ; [C1, P1, V5, V6]; xn--1mnx647cg3x1b.xn--4-zfb324h32o; ; xn--1mnx647cg3x1b.xn--4-zfb324h; [P1, V5, V6] # 𑆀�.Ⴕ4͈
+𑆀�񤧣.ⴕ4‌͈; ; [C1, P1, V5, V6]; xn--1mnx647cg3x1b.xn--4-zfb502tlsl; ; xn--1mnx647cg3x1b.xn--4-zfb5123a; [P1, V5, V6] # 𑆀�.ⴕ4͈
+xn--1mnx647cg3x1b.xn--4-zfb5123a; 𑆀�񤧣.ⴕ4͈; [V5, V6]; xn--1mnx647cg3x1b.xn--4-zfb5123a; ; ;  # 𑆀�.ⴕ4͈
+xn--1mnx647cg3x1b.xn--4-zfb502tlsl; 𑆀�񤧣.ⴕ4‌͈; [C1, V5, V6]; xn--1mnx647cg3x1b.xn--4-zfb502tlsl; ; ;  # 𑆀�.ⴕ4͈
+xn--1mnx647cg3x1b.xn--4-zfb324h; 𑆀�񤧣.Ⴕ4͈; [V5, V6]; xn--1mnx647cg3x1b.xn--4-zfb324h; ; ;  # 𑆀�.Ⴕ4͈
+xn--1mnx647cg3x1b.xn--4-zfb324h32o; 𑆀�񤧣.Ⴕ4‌͈; [C1, V5, V6]; xn--1mnx647cg3x1b.xn--4-zfb324h32o; ; ;  # 𑆀�.Ⴕ4͈
+𑆀�񤧣．ⴕ�‌͈; 𑆀�񤧣.ⴕ4‌͈; [C1, P1, V5, V6]; xn--1mnx647cg3x1b.xn--4-zfb502tlsl; ; xn--1mnx647cg3x1b.xn--4-zfb5123a; [P1, V5, V6] # 𑆀�.ⴕ4͈
+憡?‌Ⴔ.��≠; ; [C1, C2, P1, V6]; 憡?‌Ⴔ.xn--1ug73gl146a; [C1, C2, P1, V6, A3]; 憡?Ⴔ.xn--1chz659f; [P1, V6, A3] # 憡Ⴔ.�≠
+憡?‌Ⴔ.��≠; 憡?‌Ⴔ.��≠; [C1, C2, P1, V6]; 憡?‌Ⴔ.xn--1ug73gl146a; [C1, C2, P1, V6, A3]; 憡?Ⴔ.xn--1chz659f; [P1, V6, A3] # 憡Ⴔ.�≠
+憡?‌ⴔ.��≠; 憡?‌ⴔ.��≠; [C1, C2, P1, V6]; 憡?‌ⴔ.xn--1ug73gl146a; [C1, C2, P1, V6, A3]; 憡?ⴔ.xn--1chz659f; [P1, V6, A3] # 憡ⴔ.�≠
+憡?‌ⴔ.��≠; ; [C1, C2, P1, V6]; 憡?‌ⴔ.xn--1ug73gl146a; [C1, C2, P1, V6, A3]; 憡?ⴔ.xn--1chz659f; [P1, V6, A3] # 憡ⴔ.�≠
+憡?ⴔ.xn--1chz659f; 憡?ⴔ.�≠; [P1, V6]; 憡?ⴔ.xn--1chz659f; [P1, V6, A3]; ;  # 憡ⴔ.�≠
+憡?Ⴔ.XN--1CHZ659F; 憡?Ⴔ.�≠; [P1, V6]; 憡?Ⴔ.xn--1chz659f; [P1, V6, A3]; ;  # 憡Ⴔ.�≠
+憡?Ⴔ.xn--1chz659f; 憡?Ⴔ.�≠; [P1, V6]; 憡?Ⴔ.xn--1chz659f; [P1, V6, A3]; ;  # 憡Ⴔ.�≠
+憡?‌ⴔ.xn--1ug73gl146a; 憡?‌ⴔ.��≠; [C1, C2, P1, V6]; 憡?‌ⴔ.xn--1ug73gl146a; [C1, C2, P1, V6, A3]; 憡?ⴔ.xn--1ug73gl146a; [C2, P1, V6, A3] # 憡ⴔ.�≠
+憡?‌Ⴔ.XN--1UG73GL146A; 憡?‌Ⴔ.��≠; [C1, C2, P1, V6]; 憡?‌Ⴔ.xn--1ug73gl146a; [C1, C2, P1, V6, A3]; 憡?Ⴔ.xn--1ug73gl146a; [C2, P1, V6, A3] # 憡Ⴔ.�≠
+憡?‌Ⴔ.xn--1ug73gl146a; 憡?‌Ⴔ.��≠; [C1, C2, P1, V6]; 憡?‌Ⴔ.xn--1ug73gl146a; [C1, C2, P1, V6, A3]; 憡?Ⴔ.xn--1ug73gl146a; [C2, P1, V6, A3] # 憡Ⴔ.�≠
+憡?Ⴔ.xn--1ug73gl146a; 憡?Ⴔ.��≠; [C2, P1, V6]; 憡?Ⴔ.xn--1ug73gl146a; [C2, P1, V6, A3]; ;  # 憡Ⴔ.�≠
+憡?ⴔ.xn--1ug73gl146a; 憡?ⴔ.��≠; [C2, P1, V6]; 憡?ⴔ.xn--1ug73gl146a; [C2, P1, V6, A3]; ;  # 憡ⴔ.�≠
+憡?Ⴔ.XN--1UG73GL146A; 憡?Ⴔ.��≠; [C2, P1, V6]; 憡?Ⴔ.xn--1ug73gl146a; [C2, P1, V6, A3]; ;  # 憡Ⴔ.�≠
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/punycode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/punycode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/punycode.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/punycode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,11 +6,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use crate::test::TestFn;
 use idna::punycode::{decode, encode_str};
-use serde_json::Value;
 use serde_json::map::Map;
+use serde_json::Value;
 use std::str::FromStr;
-use test::TestFn;
 
 fn one_test(decoded: &str, encoded: &str) {
     match decode(encoded) {
@@ -19,10 +19,10 @@
             let result = result.into_iter().collect::<String>();
             assert!(
                 result == decoded,
-                format!(
-                    "Incorrect decoding of \"{}\":\n   \"{}\"\n!= \"{}\"\n",
-                    encoded, result, decoded
-                )
+                "Incorrect decoding of \"{}\":\n   \"{}\"\n!= \"{}\"\n",
+                encoded,
+                result,
+                decoded
             )
         }
     }
@@ -31,10 +31,10 @@
         None => panic!("Encoding {} failed.", decoded),
         Some(result) => assert!(
             result == encoded,
-            format!(
-                "Incorrect encoding of \"{}\":\n   \"{}\"\n!= \"{}\"\n",
-                decoded, result, encoded
-            )
+            "Incorrect encoding of \"{}\":\n   \"{}\"\n!= \"{}\"\n",
+            decoded,
+            result,
+            encoded
         ),
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,4 @@
-extern crate idna;
-extern crate serde_json;
-extern crate rustc_test as test;
+use rustc_test as test;
 
 mod punycode;
 mod uts46;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/unit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/unit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/unit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/unit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,40 +1,139 @@
-extern crate idna;
-extern crate unicode_normalization;
-
+use assert_matches::assert_matches;
 use unicode_normalization::char::is_combining_mark;
 
-fn _to_ascii(domain: &str) -> Result<String, idna::Errors> {
-    idna::Config::default()
+/// https://github.com/servo/rust-url/issues/373
+#[test]
+fn test_punycode_prefix_with_length_check() {
+    let config = idna::Config::default()
         .verify_dns_length(true)
-        .use_std3_ascii_rules(true)
-        .to_ascii(domain)
+        .check_hyphens(true)
+        .use_std3_ascii_rules(true);
+
+    assert!(config.to_ascii("xn--").is_err());
+    assert!(config.to_ascii("xn---").is_err());
+    assert!(config.to_ascii("xn-----").is_err());
+    assert!(config.to_ascii("xn--.").is_err());
+    assert!(config.to_ascii("xn--...").is_err());
+    assert!(config.to_ascii(".xn--").is_err());
+    assert!(config.to_ascii("...xn--").is_err());
+    assert!(config.to_ascii("xn--.xn--").is_err());
+    assert!(config.to_ascii("xn--.example.org").is_err());
+}
+
+/// https://github.com/servo/rust-url/issues/373
+#[test]
+fn test_punycode_prefix_without_length_check() {
+    let config = idna::Config::default()
+        .verify_dns_length(false)
+        .check_hyphens(true)
+        .use_std3_ascii_rules(true);
+
+    assert_eq!(config.to_ascii("xn--").unwrap(), "");
+    assert!(config.to_ascii("xn---").is_err());
+    assert!(config.to_ascii("xn-----").is_err());
+    assert_eq!(config.to_ascii("xn--.").unwrap(), ".");
+    assert_eq!(config.to_ascii("xn--...").unwrap(), "...");
+    assert_eq!(config.to_ascii(".xn--").unwrap(), ".");
+    assert_eq!(config.to_ascii("...xn--").unwrap(), "...");
+    assert_eq!(config.to_ascii("xn--.xn--").unwrap(), ".");
+    assert_eq!(config.to_ascii("xn--.example.org").unwrap(), ".example.org");
+}
+
+// http://www.unicode.org/reports/tr46/#Table_Example_Processing
+#[test]
+fn test_examples() {
+    let mut codec = idna::Idna::default();
+    let mut out = String::new();
+
+    assert_matches!(codec.to_unicode("Bloß.de", &mut out), Ok(()));
+    assert_eq!(out, "bloß.de");
+
+    out.clear();
+    assert_matches!(codec.to_unicode("xn--blo-7ka.de", &mut out), Ok(()));
+    assert_eq!(out, "bloß.de");
+
+    out.clear();
+    assert_matches!(codec.to_unicode("u\u{308}.com", &mut out), Ok(()));
+    assert_eq!(out, "ü.com");
+
+    out.clear();
+    assert_matches!(codec.to_unicode("xn--tda.com", &mut out), Ok(()));
+    assert_eq!(out, "ü.com");
+
+    out.clear();
+    assert_matches!(codec.to_unicode("xn--u-ccb.com", &mut out), Err(_));
+
+    out.clear();
+    assert_matches!(codec.to_unicode("aâ’ˆcom", &mut out), Err(_));
+
+    out.clear();
+    assert_matches!(codec.to_unicode("xn--a-ecp.ru", &mut out), Err(_));
+
+    out.clear();
+    assert_matches!(codec.to_unicode("xn--0.pt", &mut out), Err(_));
+
+    out.clear();
+    assert_matches!(codec.to_unicode("日本語。ＪＰ", &mut out), Ok(()));
+    assert_eq!(out, "日本語.jp");
+
+    out.clear();
+    assert_matches!(codec.to_unicode("☕.us", &mut out), Ok(()));
+    assert_eq!(out, "☕.us");
 }
 
 #[test]
 fn test_v5() {
+    let config = idna::Config::default()
+        .verify_dns_length(true)
+        .use_std3_ascii_rules(true);
+
     // IdnaTest:784 �｡𑰺
     assert!(is_combining_mark('\u{11C3A}'));
-    assert!(_to_ascii("\u{11C3A}").is_err());
-    assert!(_to_ascii("\u{850f}.\u{11C3A}").is_err());
-    assert!(_to_ascii("\u{850f}\u{ff61}\u{11C3A}").is_err());
+    assert!(config.to_ascii("\u{11C3A}").is_err());
+    assert!(config.to_ascii("\u{850f}.\u{11C3A}").is_err());
+    assert!(config.to_ascii("\u{850f}\u{ff61}\u{11C3A}").is_err());
 }
 
 #[test]
 fn test_v8_bidi_rules() {
-    assert_eq!(_to_ascii("abc").unwrap(), "abc");
-    assert_eq!(_to_ascii("123").unwrap(), "123");
-    assert_eq!(_to_ascii("�בּג").unwrap(), "xn--kdb3bdf");
-    assert_eq!(_to_ascii("ابج").unwrap(), "xn--mgbcm");
-    assert_eq!(_to_ascii("abc.ابج").unwrap(), "abc.xn--mgbcm");
-    assert_eq!(
-        _to_ascii("�בּג.ابج").unwrap(),
-        "xn--kdb3bdf.xn--mgbcm"
-    );
+    let config = idna::Config::default()
+        .verify_dns_length(true)
+        .use_std3_ascii_rules(true);
+
+    assert_eq!(config.to_ascii("abc").unwrap(), "abc");
+    assert_eq!(config.to_ascii("123").unwrap(), "123");
+    assert_eq!(config.to_ascii("�בּג").unwrap(), "xn--kdb3bdf");
+    assert_eq!(config.to_ascii("ابج").unwrap(), "xn--mgbcm");
+    assert_eq!(config.to_ascii("abc.ابج").unwrap(), "abc.xn--mgbcm");
+    assert_eq!(config.to_ascii("�בּג.ابج").unwrap(), "xn--kdb3bdf.xn--mgbcm");
 
     // Bidi domain names cannot start with digits
-    assert!(_to_ascii("0a.\u{05D0}").is_err());
-    assert!(_to_ascii("0à.\u{05D0}").is_err());
+    assert!(config.to_ascii("0a.\u{05D0}").is_err());
+    assert!(config.to_ascii("0à.\u{05D0}").is_err());
 
     // Bidi chars may be punycode-encoded
-    assert!(_to_ascii("xn--0ca24w").is_err());
+    assert!(config.to_ascii("xn--0ca24w").is_err());
+}
+
+#[test]
+fn emoji_domains() {
+    // HOT BEVERAGE is allowed here...
+    let config = idna::Config::default()
+        .verify_dns_length(true)
+        .use_std3_ascii_rules(true);
+    assert_eq!(config.to_ascii("☕.com").unwrap(), "xn--53h.com");
+
+    // ... but not here
+    let config = idna::Config::default()
+        .verify_dns_length(true)
+        .use_std3_ascii_rules(true)
+        .use_idna_2008_rules(true);
+    let error = format!("{:?}", config.to_ascii("☕.com").unwrap_err());
+    assert!(error.contains("disallowed_in_idna_2008"));
+}
+
+#[test]
+fn unicode_before_delimiter() {
+    let config = idna::Config::default();
+    assert!(config.to_ascii("xn--f\u{34a}-PTP").is_err());
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/uts46.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/uts46.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/idna/tests/uts46.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/idna/tests/uts46.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,116 +6,142 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use crate::test::TestFn;
 use std::char;
-use test::TestFn;
+
+use idna::Errors;
 
 pub fn collect_tests<F: FnMut(String, TestFn)>(add_test: &mut F) {
-    // http://www.unicode.org/Public/idna/latest/IdnaTest.txt
-    for (i, line) in include_str!("IdnaTest.txt").lines().enumerate() {
-        if line == "" || line.starts_with("#") {
+    // https://www.unicode.org/Public/idna/13.0.0/IdnaTestV2.txt
+    for (i, line) in include_str!("IdnaTestV2.txt").lines().enumerate() {
+        if line.is_empty() || line.starts_with('#') {
             continue;
         }
+
         // Remove comments
-        let mut line = match line.find("#") {
+        let line = match line.find('#') {
             Some(index) => &line[0..index],
             None => line,
         };
 
-        let mut expected_failure = false;
-        if line.starts_with("XFAIL") {
-            expected_failure = true;
-            line = &line[5..line.len()];
-        };
-
         let mut pieces = line.split(';').map(|x| x.trim()).collect::<Vec<&str>>();
+        let source = unescape(&pieces.remove(0));
 
-        let test_type = pieces.remove(0);
-        let original = pieces.remove(0);
-        let source = unescape(original);
-        let to_unicode = pieces.remove(0);
-        let to_ascii = pieces.remove(0);
-        let nv8 = if pieces.len() > 0 {
-            pieces.remove(0)
+        // ToUnicode
+        let mut to_unicode = unescape(&pieces.remove(0));
+        if to_unicode.is_empty() {
+            to_unicode = source.clone();
+        }
+        let to_unicode_status = status(pieces.remove(0));
+
+        // ToAsciiN
+        let to_ascii_n = pieces.remove(0);
+        let to_ascii_n = if to_ascii_n.is_empty() {
+            to_unicode.clone()
+        } else {
+            to_ascii_n.to_owned()
+        };
+        let to_ascii_n_status = pieces.remove(0);
+        let to_ascii_n_status = if to_ascii_n_status.is_empty() {
+            to_unicode_status.clone()
         } else {
-            ""
+            status(to_ascii_n_status)
         };
 
-        if expected_failure {
-            continue;
-        }
+        // ToAsciiT
+        let to_ascii_t = pieces.remove(0);
+        let to_ascii_t = if to_ascii_t.is_empty() {
+            to_ascii_n.clone()
+        } else {
+            to_ascii_t.to_owned()
+        };
+        let to_ascii_t_status = pieces.remove(0);
+        let to_ascii_t_status = if to_ascii_t_status.is_empty() {
+            to_ascii_n_status.clone()
+        } else {
+            status(to_ascii_t_status)
+        };
 
         let test_name = format!("UTS #46 line {}", i + 1);
         add_test(
             test_name,
             TestFn::dyn_test_fn(move || {
-                let result = idna::Config::default()
+                let config = idna::Config::default()
                     .use_std3_ascii_rules(true)
                     .verify_dns_length(true)
-                    .check_hyphens(true)
-                    .transitional_processing(test_type == "T")
-                    .to_ascii(&source);
-
-                if to_ascii.starts_with("[") {
-                    if to_ascii.starts_with("[C") {
-                        // http://unicode.org/reports/tr46/#Deviations
-                        // applications that perform IDNA2008 lookup are not required to check
-                        // for these contexts
-                        return;
-                    }
-                    if to_ascii == "[V2]" {
-                        // Everybody ignores V2
-                        // https://github.com/servo/rust-url/pull/240
-                        // https://github.com/whatwg/url/issues/53#issuecomment-181528158
-                        // http://www.unicode.org/review/pri317/
-                        return;
-                    }
-                    let res = result.ok();
-                    assert!(
-                        res == None,
-                        "Expected error. result: {} | original: {} | source: {}",
-                        res.unwrap(),
-                        original,
-                        source
-                    );
-                    return;
-                }
-
-                let to_ascii = if to_ascii.len() > 0 {
-                    to_ascii.to_string()
-                } else {
-                    if to_unicode.len() > 0 {
-                        to_unicode.to_string()
-                    } else {
-                        source.clone()
-                    }
-                };
+                    .check_hyphens(true);
 
-                if nv8 == "NV8" {
-                    // This result isn't valid under IDNA2008. Skip it
-                    return;
-                }
+                // http://unicode.org/reports/tr46/#Deviations
+                // applications that perform IDNA2008 lookup are not required to check
+                // for these contexts, so we skip all tests annotated with C*
+
+                // Everybody ignores V2
+                // https://github.com/servo/rust-url/pull/240
+                // https://github.com/whatwg/url/issues/53#issuecomment-181528158
+                // http://www.unicode.org/review/pri317/
+
+                // "The special error codes X3 and X4_2 are now returned where a toASCII error code
+                // was formerly being generated in toUnicode due to an empty label."
+                // This is not implemented yet, so we skip toUnicode X4_2 tests for now, too.
+
+                let (to_unicode_value, to_unicode_result) =
+                    config.transitional_processing(false).to_unicode(&source);
+                let to_unicode_result = to_unicode_result.map(|()| to_unicode_value);
+                check(
+                    &source,
+                    (&to_unicode, &to_unicode_status),
+                    to_unicode_result,
+                    |e| e.starts_with('C') || e == "V2" || e == "X4_2",
+                );
 
-                assert!(
-                    result.is_ok(),
-                    "Couldn't parse {} | original: {} | error: {:?}",
-                    source,
-                    original,
-                    result.err()
+                let to_ascii_n_result = config.transitional_processing(false).to_ascii(&source);
+                check(
+                    &source,
+                    (&to_ascii_n, &to_ascii_n_status),
+                    to_ascii_n_result,
+                    |e| e.starts_with('C') || e == "V2",
                 );
-                let output = result.ok().unwrap();
-                assert!(
-                    output == to_ascii,
-                    "result: {} | expected: {} | original: {} | source: {}",
-                    output,
-                    to_ascii,
-                    original,
-                    source
+
+                let to_ascii_t_result = config.transitional_processing(true).to_ascii(&source);
+                check(
+                    &source,
+                    (&to_ascii_t, &to_ascii_t_status),
+                    to_ascii_t_result,
+                    |e| e.starts_with('C') || e == "V2",
                 );
             }),
         )
     }
 }
 
+#[allow(clippy::redundant_clone)]
+fn check<F>(source: &str, expected: (&str, &[&str]), actual: Result<String, Errors>, ignore: F)
+where
+    F: Fn(&str) -> bool,
+{
+    if !expected.1.is_empty() {
+        if !expected.1.iter().copied().any(ignore) {
+            let res = actual.ok();
+            assert_eq!(
+                res.clone(),
+                None,
+                "Expected error {:?}. result: {} | source: {}",
+                expected.1,
+                res.unwrap(),
+                source,
+            );
+        }
+    } else {
+        assert!(
+            actual.is_ok(),
+            "Couldn't parse {} | error: {:?}",
+            source,
+            actual.err().unwrap(),
+        );
+        assert_eq!(actual.unwrap(), expected.0, "source: {}", source);
+    }
+}
+
 fn unescape(input: &str) -> String {
     let mut output = String::new();
     let mut chars = input.chars();
@@ -148,3 +174,20 @@
         }
     }
 }
+
+fn status(status: &str) -> Vec<&str> {
+    if status.is_empty() || status == "[]" {
+        return Vec::new();
+    }
+
+    let mut result = status.split(", ").collect::<Vec<_>>();
+    assert!(result[0].starts_with('['));
+    result[0] = &result[0][1..];
+
+    let idx = result.len() - 1;
+    let last = &mut result[idx];
+    assert!(last.ends_with(']'));
+    *last = &last[..last.len() - 1];
+
+    result
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"7b211fe44e5f6004a274108fb9a7dbb083be6fe25af0cf741ca51590156879aa","Cargo.toml":"baeac8302f3ebfcbaea49232b8f0b4c38035ec721ad4b3809b3a1c497ca15cf6","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"a42880c68362743c4c7ab126f67105616de2a0f9acfad78f97b5b75500b16012","src/fmt.rs":"973793c374287441efc76efdfca7a793f5b3b350d38e4ad173b263a4b6fb542c","src/indentable.rs":"c848d4b56b83e6979329a9991746079c6764caa16b665a80b675737ae66b295b","src/io.rs":"27a47d13fad1c92ed5336ecd5d6c45c9cb5a4f76c560d336b1ef0922874b4d86","src/lib.rs":"1040996597368485cb9a881d767b555309a456f453a0ecef02bd5dcd1b3e5938","tests/fmt.rs":"95e29009223fb64a5bfefe57a6282b6d3f1a8894b5e9a8f1d2b10c72c132ea62","tests/io.rs":"912161512f968dfe2ad690bbaef8bcd9baa997d14d1c0bf39d98cb5270f8fd4c"},"package":"0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "indent_write"
+version = "2.2.0"
+authors = ["Nathan West <Lucretiel@gmail.com>"]
+description = "Simple Write adapters to add line indentation"
+readme = "README.md"
+license = "MPL-2.0"
+repository = "https://github.com/Lucretiel/indent-write"
+
+[dependencies]
+
+[features]
+default = ["std"]
+std = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+# Changelog
+
+## 2.2.0
+
+### Added
+
+- Added `indentable` module, which contains utilities for indenting objects via `Display`, rather than adapting writers.
+- Add `std` feature, which is enabled by default. When disabled, `indent-write` operates in `no_std` mode.
+
+## 2.1.0
+
+### Added
+
+- Added a new constructor, `new_skip_indent`, to `fmt::IndentWriter` and `io::IndentWriter`. This constructor configures the write to omit the indent on the initial line.
+
+## 2.0.0
+
+### Removed
+
+- Removed `IndentedWrite`, which was left over from a previous (unreleased) version of `indent-write` which I simply forgot to delete from the code before releasing
+
+## 1.0.0
+
+Initial release!
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2 @@
+# indent-write
+Nestable wrappers for `fmt::Write` and `io::Write` that perform indentation for you
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/src/fmt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/src/fmt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/src/fmt.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/src/fmt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,147 @@
+use core::fmt;
+/// Adapter for writers to indent each line
+///
+/// An `IndentWriter` adapts a [`fmt::Write`] object to insert an indent before
+/// each non-empty line. Specifically, this means it will insert an indent
+/// between each newline when followed by a non-newline.
+///
+/// These writers can be nested to provide increasing levels of indentation.
+///
+/// # Example
+///
+/// ```
+/// # use std::fmt::Write;
+/// use indent_write::fmt::IndentWriter;
+///
+/// let output = String::new();
+///
+/// let mut indented = IndentWriter::new("\t", output);
+///
+/// // Lines will be indented
+/// write!(indented, "Line 1\nLine 2\n");
+///
+/// // Empty lines will not be indented
+/// write!(indented, "\n\nLine 3\n\n");
+///
+/// assert_eq!(indented.get_ref(), "\tLine 1\n\tLine 2\n\n\n\tLine 3\n\n");
+/// ```
+#[derive(Debug, Clone)]
+pub struct IndentWriter<'i, W> {
+    writer: W,
+    indent: &'i str,
+    need_indent: bool,
+}
+
+impl<'i, W: fmt::Write> IndentWriter<'i, W> {
+    /// Create a new [`IndentWriter`].
+    #[inline]
+    pub fn new(indent: &'i str, writer: W) -> Self {
+        Self {
+            writer,
+            indent,
+            need_indent: true,
+        }
+    }
+
+    /// Create a new [`IndentWriter`] which will not add an indent to the first
+    /// written line.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use std::fmt::Write;
+    /// use indent_write::fmt::IndentWriter;
+    ///
+    /// let mut buffer = String::new();
+    /// let mut writer = IndentWriter::new_skip_initial("    ", &mut buffer);
+    ///
+    /// writeln!(writer, "Line 1").unwrap();
+    /// writeln!(writer, "Line 2").unwrap();
+    /// writeln!(writer, "Line 3").unwrap();
+    ///
+    /// assert_eq!(buffer, "Line 1\n    Line 2\n    Line 3\n")
+    /// ```
+    #[inline]
+    pub fn new_skip_initial(indent: &'i str, writer: W) -> Self {
+        Self {
+            writer,
+            indent,
+            need_indent: false,
+        }
+    }
+
+    /// Extract the writer from the `IndentWriter`, discarding any in-progress
+    /// indent state.
+    #[inline]
+    pub fn into_inner(self) -> W {
+        self.writer
+    }
+
+    /// Get a reference to the wrapped writer
+    #[inline]
+    pub fn get_ref(&self) -> &W {
+        &self.writer
+    }
+
+    /// Get the string being used as an indent for each line
+    #[inline]
+    pub fn indent(&self) -> &'i str {
+        self.indent
+    }
+}
+
+impl<'i, W: fmt::Write> fmt::Write for IndentWriter<'i, W> {
+    fn write_str(&mut self, mut s: &str) -> fmt::Result {
+        loop {
+            match self.need_indent {
+                // We don't need an indent. Scan for the end of the line
+                false => match s.as_bytes().iter().position(|&b| b == b'\n') {
+                    // No end of line in the input; write the entire string
+                    None => break self.writer.write_str(s),
+
+                    // We can see the end of the line. Write up to and including
+                    // that newline, then request an indent
+                    Some(len) => {
+                        let (head, tail) = s.split_at(len + 1);
+                        self.writer.write_str(head)?;
+                        self.need_indent = true;
+                        s = tail;
+                    }
+                },
+                // We need an indent. Scan for the beginning of the next
+                // non-empty line.
+                true => match s.as_bytes().iter().position(|&b| b != b'\n') {
+                    // No non-empty lines in input, write the entire string
+                    None => break self.writer.write_str(s),
+
+                    // We can see the next non-empty line. Write up to the
+                    // beginning of that line, then insert an indent, then
+                    // continue.
+                    Some(len) => {
+                        let (head, tail) = s.split_at(len);
+                        self.writer.write_str(head)?;
+                        self.writer.write_str(self.indent)?;
+                        self.need_indent = false;
+                        s = tail;
+                    }
+                },
+            }
+        }
+    }
+
+    fn write_char(&mut self, c: char) -> fmt::Result {
+        // We need an indent, and this is the start of a non-empty line.
+        // Insert the indent.
+        if self.need_indent && c != '\n' {
+            self.writer.write_str(self.indent)?;
+            self.need_indent = false;
+        }
+
+        // This is the end of a non-empty line. Request an indent.
+        if !self.need_indent && c == '\n' {
+            self.need_indent = true;
+        }
+
+        self.writer.write_char(c)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/src/indentable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/src/indentable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/src/indentable.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/src/indentable.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,94 @@
+use core::fmt::{self, Display, Formatter, Write};
+
+use crate::fmt::IndentWriter;
+
+/// Methods for adapting [`Display`] objects to indent themselves when printed.
+pub trait Indentable: Sized + Display {
+    /// Wrap this object so that its [`Display`] representation is indented
+    /// with the given `indent`. Each non-empty line of the formatted output
+    /// will be prefixed with the indent.
+    ///
+    /// # Example:
+    ///
+    /// ```
+    /// use indent_write::indentable::Indentable;
+    ///
+    /// let content = "Line 1\nLine 2\n\nLine 3\n";
+    /// let indented = content.indented("    ");
+    /// let result = indented.to_string();
+    ///
+    /// assert_eq!(result, "    Line 1\n    Line 2\n\n    Line 3\n");
+    /// ```
+    #[must_use = "Indentables do nothing unless used"]
+    fn indented(self, indent: &str) -> Indented<'_, Self> {
+        Indented { item: self, indent }
+    }
+
+    /// Wrap this object so that its [`Display`] representation is indented
+    /// with the given `indent`. Each non-empty line *except for the first*
+    /// of the formatted output will be prefixed with the indent.
+    ///
+    /// # Example:
+    ///
+    /// ```
+    /// use indent_write::indentable::Indentable;
+    ///
+    /// let content = "Line 1\nLine 2\n\nLine 3\n";
+    /// let indented = content.indented_skip_initial("    ");
+    /// let result = indented.to_string();
+    ///
+    /// assert_eq!(result, "Line 1\n    Line 2\n\n    Line 3\n");
+    /// ```
+    #[must_use = "Indentables do nothing unless used"]
+    fn indented_skip_initial(self, indent: &str) -> IndentedSkipIntial<'_, Self> {
+        IndentedSkipIntial { item: self, indent }
+    }
+}
+
+impl<T: Display> Indentable for T {}
+
+/// Wrapper struct that indents the [`Display`] representation of an item. When
+/// printed with [`Display`], it will insert [`indent`][Self::indent] before
+/// each non-empty line of the underlying [`item`][Self::item]'s [`Display`]
+/// output.
+///
+/// Created with [`Indentable::indented`]; see its documentation for an example.
+#[derive(Debug, Clone, Copy)]
+pub struct Indented<'i, T: Display> {
+    /// The item to indent.
+    pub item: T,
+
+    /// The indentation to insert before each non-empty line.
+    pub indent: &'i str,
+}
+
+impl<T: Display> Display for Indented<'_, T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(IndentWriter::new(self.indent, f), "{}", self.item)
+    }
+}
+
+/// Wrapper struct that indents the [`Display`] representation of an item. When
+/// printed with [`Display`], it will insert [`indent`][Self::indent] before
+/// each non-empty line _after the first_ of the underlying
+/// [`item`][Self::item]'s [`Display`] output.
+///
+/// Created with [`Indentable::indented`]; see its documentation for an example.
+#[derive(Debug, Clone, Copy)]
+pub struct IndentedSkipIntial<'i, T: Display> {
+    /// The item to indent.
+    pub item: T,
+
+    /// The indentation to insert before each non-empty line.
+    pub indent: &'i str,
+}
+
+impl<T: Display> Display for IndentedSkipIntial<'_, T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(
+            IndentWriter::new_skip_initial(self.indent, f),
+            "{}",
+            self.item
+        )
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/src/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/src/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/src/io.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/src/io.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,200 @@
+use std::io;
+
+use super::Inspect;
+
+#[derive(Debug, Copy, Clone)]
+enum IndentState<'a> {
+    // We are currently writing a line. Forward writes until the end of the
+    // line.
+    MidLine,
+
+    // An indent has been requested. Write empty lines, then write an indent
+    // before the next non empty line.
+    NeedIndent,
+
+    // We are currently writing an indent.
+    WritingIndent(&'a [u8]),
+}
+
+use IndentState::*;
+
+/// Adapter for writers to indent each line
+///
+/// An `IndentWriter` adapts an [`io::Write`] object to insert an indent before
+/// each non-empty line. Specifically, this means it will insert an indent
+/// between each newline when followed by a non-newline.
+///
+/// These writers can be nested to provide increasing levels of indentation.
+///
+/// # Example
+///
+/// ```
+/// # use std::io::Write;
+/// use indent_write::io::IndentWriter;
+///
+/// let output = Vec::new();
+///
+/// let mut indented = IndentWriter::new("\t", output);
+///
+/// // Lines will be indented
+/// write!(indented, "Line 1\nLine 2\n");
+///
+/// // Empty lines will not be indented
+/// write!(indented, "\n\nLine 3\n\n");
+///
+/// assert_eq!(indented.get_ref(), b"\tLine 1\n\tLine 2\n\n\n\tLine 3\n\n");
+/// ```
+#[derive(Debug, Clone)]
+pub struct IndentWriter<'i, W> {
+    writer: W,
+    indent: &'i str,
+    state: IndentState<'i>,
+}
+
+impl<'i, W: io::Write> IndentWriter<'i, W> {
+    /// Create a new [`IndentWriter`].
+    pub fn new(indent: &'i str, writer: W) -> Self {
+        Self {
+            writer,
+            indent,
+            state: NeedIndent,
+        }
+    }
+
+    /// Create a new [`IndentWriter`] which will not add an indent to the first
+    /// written line.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use std::io::Write;
+    /// use indent_write::io::IndentWriter;
+    ///
+    /// let mut buffer = Vec::new();
+    /// let mut writer = IndentWriter::new_skip_initial("    ", &mut buffer);
+    ///
+    /// writeln!(writer, "Line 1").unwrap();
+    /// writeln!(writer, "Line 2").unwrap();
+    /// writeln!(writer, "Line 3").unwrap();
+    ///
+    /// assert_eq!(buffer, b"Line 1\n    Line 2\n    Line 3\n")
+    /// ```
+    #[inline]
+    pub fn new_skip_initial(indent: &'i str, writer: W) -> Self {
+        Self {
+            writer,
+            indent,
+            state: MidLine,
+        }
+    }
+
+    /// Extract the writer from the [`IndentWriter`], discarding any in-progress
+    /// indent state.
+    #[inline]
+    pub fn into_inner(self) -> W {
+        self.writer
+    }
+
+    /// Get a reference to the wrapped writer
+    #[inline]
+    pub fn get_ref(&self) -> &W {
+        &self.writer
+    }
+
+    /// Get the string being used as an indent for each line
+    #[inline]
+    pub fn indent(&self) -> &'i str {
+        self.indent
+    }
+}
+
+impl<'i, W: io::Write> io::Write for IndentWriter<'i, W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        loop {
+            match self.state {
+                // We're currently writing a line. Scan for the end of the line.
+                IndentState::MidLine => match buf.iter().position(|&b| b == b'\n') {
+                    // No newlines in the input buffer, so write the entire thing.
+                    None => break self.writer.write(buf),
+
+                    // We are at a newline presently. Request an indent be
+                    // written at the front of the next non-empty line, then
+                    // continue looping (since we haven't yet attempted to
+                    // write user data).
+                    Some(0) => self.state = NeedIndent,
+
+                    // There's an upcoming newline. Write out the remainder of
+                    // this line, plus its newline. If the entire line was
+                    // written, request an indent on the subsequent call to
+                    // write.
+                    Some(len) => {
+                        break self.writer.write(&buf[..len + 1]).inspect(|&n| {
+                            if n >= len {
+                                self.state = NeedIndent;
+                            }
+                        })
+                    }
+                },
+
+                // We need an indent. Scan for the next non-empty line.
+                IndentState::NeedIndent => match buf.iter().position(|&b| b != b'\n') {
+                    // No non-empty lines in the input buffer, so write the entire thing
+                    None => break self.writer.write(buf),
+
+                    // We are at the beginning of a non-empty line presently.
+                    // Begin inserting an indent now, then continue looping
+                    // (since we haven't yet attempted to write user data)
+                    Some(0) => self.state = WritingIndent(self.indent.as_bytes()),
+
+                    // There's an upcoming non-empty line. Write out the
+                    // remainder of the empty lines. If all the empty lines
+                    // were written, force an indent on the subsequent call to
+                    // write.
+                    Some(len) => {
+                        break self.writer.write(&buf[..len]).inspect(|&n| {
+                            if n >= len {
+                                self.state = IndentState::WritingIndent(self.indent.as_bytes())
+                            }
+                        })
+                    }
+                },
+
+                // We are writing an indent unconditionally. If we're in this
+                // state, the input buffer is known to be the start of a non-
+                // empty line.
+                IndentState::WritingIndent(indent) => match self.writer.write(indent)? {
+                    // We successfully wrote the entire indent. Continue with
+                    // writing the input buffer.
+                    n if n >= indent.len() => self.state = MidLine,
+
+                    // Eof; stop work immediately
+                    0 => break Ok(0),
+
+                    // Only a part of the indent was written. Continue
+                    // trying to write the rest of it, but update our state
+                    // to keep it consistent in case the next write is an
+                    // error
+                    n => self.state = WritingIndent(&indent[n..]),
+                },
+            }
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        // If we're currently in the middle of writing an indent, flush it
+        while let WritingIndent(ref mut indent) = self.state {
+            match self.writer.write(*indent)? {
+                // We wrote the entire indent. Proceed with the flush
+                len if len >= indent.len() => self.state = MidLine,
+
+                // EoF; return an error
+                0 => return Err(io::ErrorKind::WriteZero.into()),
+
+                // Partial write, continue writing.
+                len => *indent = &indent[len..],
+            }
+        }
+
+        self.writer.flush()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+//! Simple indentation adapters for [`io::Write`][std::io::Write],
+//! [`fmt::Write`][std::fmt::Write], and [`Display`][std::fmt::Display]. Each
+//! adapter wraps a writer or writable object, and inserts an indentation at
+//! the front of each non-empty line.
+//!
+//! See [`fmt::IndentWriter`], [`io::IndentWriter`], and
+//! [`indentable::Indentable`] for examples.
+
+pub mod fmt;
+pub mod indentable;
+
+#[cfg(feature = "std")]
+pub mod io;
+
+trait Inspect<T> {
+    fn inspect(self, func: impl FnOnce(&T)) -> Self;
+}
+
+impl<T> Inspect<T> for Option<T> {
+    #[inline]
+    fn inspect(self, func: impl FnOnce(&T)) -> Self {
+        if let Some(ref value) = self {
+            func(value)
+        }
+
+        self
+    }
+}
+
+impl<T, E> Inspect<T> for Result<T, E> {
+    #[inline]
+    fn inspect(self, func: impl FnOnce(&T)) -> Self {
+        if let Ok(ref value) = self {
+            func(value)
+        }
+
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/tests/fmt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/tests/fmt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/tests/fmt.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/tests/fmt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,138 @@
+use std::fmt::{self, Write};
+
+use indent_write::fmt::IndentWriter;
+
+// This is a wrapper for fmt::Write that only writes one char at a time, to test
+// the invariants of IndentableWrite
+#[derive(Debug, Clone)]
+struct OneByteAtATime<W>(W);
+
+impl<W: Write> Write for OneByteAtATime<W> {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        s.chars().try_for_each(|c| self.0.write_char(c))
+    }
+
+    fn write_char(&mut self, c: char) -> fmt::Result {
+        self.0.write_char(c)
+    }
+}
+
+const CONTENT: &'static [&'static str] = &["\t😀 😀 😀", "\t\t😀 😀 😀", "\t😀 😀 😀"];
+
+// Using a function to wrap a writer, run a standard test and check against expected
+macro_rules! test_harness {
+    ($target:ident => $transform:expr, expect: $result:expr) => {{
+        let mut dest = String::new();
+
+        {
+            let $target = &mut dest;
+            let mut indented_dest = $transform;
+            for line in CONTENT {
+                write!(&mut indented_dest, "{}\n", line).unwrap();
+            }
+        }
+
+        assert_eq!(dest, $result);
+    }};
+}
+
+#[test]
+fn basic_test() {
+    let mut dest = String::new();
+
+    {
+        let mut writer = IndentWriter::new("\t", &mut dest);
+        for line in CONTENT {
+            writeln!(writer, "{}", line).unwrap();
+        }
+    }
+
+    assert_eq!(dest, "\t\t😀 😀 😀\n\t\t\t😀 😀 😀\n\t\t😀 😀 😀\n");
+}
+
+#[test]
+fn test_prefix() {
+    test_harness!(w => IndentWriter::new("    ", w), expect: "    \t😀 😀 😀\n    \t\t😀 😀 😀\n    \t😀 😀 😀\n")
+}
+
+#[test]
+fn test_multi_indent() {
+    let mut dest = String::new();
+
+    writeln!(dest, "{}", "😀 😀 😀").unwrap();
+    {
+        let mut indent1 = IndentWriter::new("\t", &mut dest);
+        writeln!(indent1, "{}", "😀 😀 😀").unwrap();
+        {
+            let mut indent2 = IndentWriter::new("\t", &mut indent1);
+            writeln!(indent2, "{}", "😀 😀 😀").unwrap();
+            {
+                let mut indent3 = IndentWriter::new("\t", &mut indent2);
+                writeln!(indent3, "{}", "😀 😀 😀").unwrap();
+                writeln!(indent3, "").unwrap();
+            }
+            writeln!(indent2, "{}", "😀 😀 😀").unwrap();
+        }
+        writeln!(indent1, "{}", "😀 😀 😀").unwrap();
+    }
+
+    assert_eq!(
+        dest,
+        "😀 😀 😀
+\t😀 😀 😀
+\t\t😀 😀 😀
+\t\t\t😀 😀 😀
+
+\t\t😀 😀 😀
+\t😀 😀 😀\n"
+    )
+}
+
+// Technically this doesn't test anything in the crate, it just ensures that OneByteAtATime works
+#[test]
+fn test_partial_writes() {
+    let mut dest = String::new();
+    {
+        let mut partial_writer = OneByteAtATime(&mut dest);
+        write!(partial_writer, "Hello, {}!", "World").unwrap();
+    }
+    assert_eq!(dest, "Hello, World!");
+}
+
+#[test]
+fn test_partial_simple_indent_writes() {
+    let mut dest = String::new();
+    {
+        let writer = OneByteAtATime(&mut dest);
+        let mut writer = IndentWriter::new("\t", writer);
+        writeln!(writer, "{}", "Hello, World").unwrap();
+        writeln!(writer, "{}", "😀 😀 😀\n😀 😀 😀").unwrap();
+    }
+    assert_eq!(dest, "\tHello, World\n\t😀 😀 😀\n\t😀 😀 😀\n");
+}
+
+#[test]
+fn test_partial_simple_indent_writes_inverted() {
+    let mut dest = String::new();
+    {
+        let writer = IndentWriter::new("\t", &mut dest);
+        let mut writer = OneByteAtATime(writer);
+        writeln!(writer, "{}", "Hello, World").unwrap();
+        writeln!(writer, "{}", "😀 😀 😀\n😀 😀 😀").unwrap();
+    }
+    assert_eq!(dest, "\tHello, World\n\t😀 😀 😀\n\t😀 😀 😀\n");
+}
+
+#[test]
+fn test_partial_writes_combined() {
+    let mut dest = String::new();
+    {
+        let writer = OneByteAtATime(&mut dest);
+        let writer = IndentWriter::new("    ", writer);
+        let mut writer = OneByteAtATime(writer);
+
+        writeln!(writer, "{}", "Hello, World").unwrap();
+        writeln!(writer, "{}", "😀 😀 😀\n😀 😀 😀").unwrap();
+    }
+    assert_eq!(dest, "    Hello, World\n    😀 😀 😀\n    😀 😀 😀\n");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/tests/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/tests/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indent_write/tests/io.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indent_write/tests/io.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,155 @@
+#![cfg(feature = "std")]
+
+use std::io::{self, Write};
+use std::str::from_utf8;
+
+use indent_write::io::IndentWriter;
+
+// This is a wrapper for io::Write that only writes one byte at a time, to test
+// the invariants of IndentableWrite
+#[derive(Debug, Clone)]
+struct OneByteAtATime<W>(W);
+
+impl<W: Write> Write for OneByteAtATime<W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        match *buf {
+            [] => Ok(0),
+            [b, ..] => self.0.write(&[b]),
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.0.flush()
+    }
+}
+
+const CONTENT: &'static [&'static str] = &["\t😀 😀 😀", "\t\t😀 😀 😀", "\t😀 😀 😀"];
+
+// Using a function to wrap a writer, run a standard test and check against expected
+macro_rules! test_harness {
+    ($target:ident => $transform:expr, expect: $result:expr) => {{
+        let mut dest = Vec::new();
+
+        {
+            let $target = &mut dest;
+            let mut indented_dest = $transform;
+            for line in CONTENT {
+                write!(&mut indented_dest, "{}\n", line).unwrap();
+            }
+        }
+
+        let result = from_utf8(&dest).expect("Wrote invalid utf8 to dest");
+        assert_eq!(result, $result);
+    }};
+}
+
+#[test]
+fn basic_test() {
+    let mut dest = Vec::new();
+
+    {
+        let mut writer = IndentWriter::new("\t", &mut dest);
+        for line in CONTENT {
+            writeln!(writer, "{}", line).unwrap();
+        }
+    }
+
+    let result = from_utf8(&dest).expect("Wrote invalid utf8 to dest");
+    assert_eq!(result, "\t\t😀 😀 😀\n\t\t\t😀 😀 😀\n\t\t😀 😀 😀\n");
+}
+
+#[test]
+fn test_prefix() {
+    test_harness!(w => IndentWriter::new("    ", w), expect: "    \t😀 😀 😀\n    \t\t😀 😀 😀\n    \t😀 😀 😀\n")
+}
+
+#[test]
+fn test_multi_indent() {
+    let mut dest = Vec::new();
+    writeln!(dest, "{}", "😀 😀 😀").unwrap();
+    {
+        let mut indent1 = IndentWriter::new("\t", &mut dest);
+        writeln!(indent1, "{}", "😀 😀 😀").unwrap();
+        {
+            let mut indent2 = IndentWriter::new("\t", &mut indent1);
+            writeln!(indent2, "{}", "😀 😀 😀").unwrap();
+            {
+                let mut indent3 = IndentWriter::new("\t", &mut indent2);
+                writeln!(indent3, "{}", "😀 😀 😀").unwrap();
+                writeln!(indent3, "").unwrap();
+            }
+            writeln!(indent2, "{}", "😀 😀 😀").unwrap();
+        }
+        writeln!(indent1, "{}", "😀 😀 😀").unwrap();
+    }
+
+    let result = from_utf8(&dest).expect("Wrote invalid utf8 to dest");
+    assert_eq!(
+        result,
+        "😀 😀 😀
+\t😀 😀 😀
+\t\t😀 😀 😀
+\t\t\t😀 😀 😀
+
+\t\t😀 😀 😀
+\t😀 😀 😀\n"
+    )
+}
+
+// Technically this doesn't test anything in the crate, it just ensures that OneByteAtATime works
+#[test]
+fn test_partial_writes() {
+    let mut dest = Vec::new();
+    {
+        let mut partial_writer = OneByteAtATime(&mut dest);
+        write!(partial_writer, "Hello, {}!", "World").unwrap();
+    }
+    assert_eq!(from_utf8(&dest), Ok("Hello, World!"));
+}
+
+#[test]
+fn test_partial_simple_indent_writes() {
+    let mut dest = Vec::new();
+    {
+        let writer = OneByteAtATime(&mut dest);
+        let mut writer = IndentWriter::new("\t", writer);
+        write!(writer, "{}\n", "Hello, World").unwrap();
+        write!(writer, "{}\n", "😀 😀 😀\n😀 😀 😀").unwrap();
+    }
+    assert_eq!(
+        from_utf8(&dest),
+        Ok("\tHello, World\n\t😀 😀 😀\n\t😀 😀 😀\n")
+    );
+}
+
+#[test]
+fn test_partial_simple_indent_writes_inverted() {
+    let mut dest = Vec::new();
+    {
+        let writer = IndentWriter::new("\t", &mut dest);
+        let mut writer = OneByteAtATime(writer);
+        write!(writer, "{}\n", "Hello, World").unwrap();
+        write!(writer, "{}\n", "😀 😀 😀\n😀 😀 😀").unwrap();
+    }
+    assert_eq!(
+        from_utf8(&dest),
+        Ok("\tHello, World\n\t😀 😀 😀\n\t😀 😀 😀\n")
+    );
+}
+
+#[test]
+fn test_partial_writes_combined() {
+    let mut dest = Vec::new();
+    {
+        let writer = OneByteAtATime(&mut dest);
+        let writer = IndentWriter::new("    ", writer);
+        let mut writer = OneByteAtATime(writer);
+
+        write!(writer, "{}\n", "Hello, World").unwrap();
+        write!(writer, "{}\n", "😀 😀 😀\n😀 😀 😀").unwrap();
+    }
+    assert_eq!(
+        from_utf8(&dest),
+        Ok("    Hello, World\n    😀 😀 😀\n    😀 😀 😀\n")
+    );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/benches/bench.rs	2021-12-09 12:01:26.000000000 +0000
@@ -561,7 +561,7 @@
 #[bench]
 fn swap_remove_indexmap_100_000(b: &mut Bencher) {
     let map = IMAP_100K.clone();
-    let mut keys = Vec::from_iter(map.keys().cloned());
+    let mut keys = Vec::from_iter(map.keys().copied());
     let mut rng = small_rng();
     keys.shuffle(&mut rng);
 
@@ -578,7 +578,7 @@
 #[bench]
 fn shift_remove_indexmap_100_000_few(b: &mut Bencher) {
     let map = IMAP_100K.clone();
-    let mut keys = Vec::from_iter(map.keys().cloned());
+    let mut keys = Vec::from_iter(map.keys().copied());
     let mut rng = small_rng();
     keys.shuffle(&mut rng);
     keys.truncate(50);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"6733910b84cfce6c8df883257d56d296e94d22c22a292f405493e05c93a62d7a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ecc269ef87fd38a1d98e30bfac9ba964a9dbd9315c3770fed98d4d7cb5882055","README.rst":"3e2c46144d88c90a36330e6c4b7b1753294276fcb6935d9118137276019d4068","benches/bench.rs":"dda3c7e3cd68b8f5c74dbd60189e89f0e43339cdc25dae7b1e5a9d25b1fb80a9","benches/faststring.rs":"2472b9d0d52031988cd31401357908fd850d15f1efa9f9761aa6b6779aad1889","build.rs":"558b4d0b9e9b3a44f7e1a2b69f7a7567ea721cd45cb54f4e458e850bf702f35c","src/equivalent.rs":"2e6ae24ef09a09b917f4e2b0f6288f901878e42f5080f61b1bd1afdcc90aba87","src/lib.rs":"a5f52cf1441511f3e71f1cbe8137410ecdbba96f95a61d039858c8f63768c36d","src/macros.rs":"cb2e9742b7e2bcadc4eb356a4ca4eb3317d1a80e293f37a3cd5a0155c5347c50","src/map.rs":"fe02d7a6c101813a8e2d20daef4a433e72f1121bb16acbc2cdb2295f1e0295ca","src/map/core.rs":"1cda3fc31a6b7ad59898b6a14b9f011c6e89cc87dd096f56e103303df9d95456","src/map/core/raw.rs":"074c97b81b9273a01241ac2e2e7640edc279b744a382c0dd11aad591aaac5333","src/mutable_keys.rs":"99fdec7c0182902ba19524f342c220b51475bcd41c44c2cb2c3f62eacb029335","src/rayon/map.rs":"cdbe6cad8e5753aca3f07b621d2bb3b480f1ae3e10697568b8c16aeb865de65b","src/rayon/mod.rs":"bf2b0fc074f20135a6734db600b04828e88dd263b3e361606be4efe8e916eafc","src/rayon/set.rs":"789efd10d41f03fa73268bae8afdc3b6582767420218a4b28f3c83c528ef726c","src/serde.rs":"d45ec8fb9c02594ca6f2e9b20764778b2b4193a24a52f1e233160a33efc6e683","src/serde_seq.rs":"c54a52fa607b6ccddda1e76e829778ca304c49b5f434edc5e582a5386c35d662","src/set.rs":"de3b76a5485061d3f7ccb1e72b86f9a98e0ffa8799a5f5eb9120c063d80f3ef5","src/util.rs":"c415261cff9f610d7331192feba0839cb05e04d3d375a5fa2f8190a29661994e","tests/equivalent_trait.rs":"efe9393069e3cfc893d2c9c0343679979578e437fdb98a10baefeced027ba310","tests/macros_full_path.rs":"c33c86d7341581fdd08e2e6375a4afca507fa603540c54a3b9e51c4cd011cd71","tests/quick.rs":"6efe8c6dfa5bdd466b3f5c491d9dfbf57fd730301849a710abff9358968218c5","tests/tests.rs":"f6dbeeb0e2950402b0e66ac52bf74c9e4197d3c5d9c0dde64a7998a2ef74d327"},"package":"4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"}
\ No newline at end of file
+{"files":{"Cargo.toml":"ccac3c521edb40305973b59bd641a812846c844afa2ba67b7055541c1760e0bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ecc269ef87fd38a1d98e30bfac9ba964a9dbd9315c3770fed98d4d7cb5882055","README.rst":"1c48fc54d2ff77dcbecf26a8458b9abe6fe293a37f678521fb741d52af47df98","benches/bench.rs":"7fb78f4a64dda6b49d68d54f502260dfb9b3834c83c497eae674dd05c604a4cb","benches/faststring.rs":"2472b9d0d52031988cd31401357908fd850d15f1efa9f9761aa6b6779aad1889","build.rs":"558b4d0b9e9b3a44f7e1a2b69f7a7567ea721cd45cb54f4e458e850bf702f35c","src/equivalent.rs":"2e6ae24ef09a09b917f4e2b0f6288f901878e42f5080f61b1bd1afdcc90aba87","src/lib.rs":"7156153ea0c775e3126ad22e682804847fdfb02ddf581f4c8c993e73d3a2a1cf","src/macros.rs":"cb2e9742b7e2bcadc4eb356a4ca4eb3317d1a80e293f37a3cd5a0155c5347c50","src/map.rs":"a8b5d0e7152ebb125a8224ad62a5d391d135597efba76d1df43f462544d441f4","src/map/core.rs":"7126a8ebc18b18e0349db01e0fbe24c3f6f40acd2346189306789dbeaaced3e0","src/map/core/raw.rs":"ef1337b6ba2820d96e34c696eeaf84c3b83cd064c2cca8f60fe9866b5caa45e6","src/mutable_keys.rs":"99fdec7c0182902ba19524f342c220b51475bcd41c44c2cb2c3f62eacb029335","src/rayon/map.rs":"841e8f99388860596187329ccbf9563978dd50124bda817e6727263ede31d904","src/rayon/mod.rs":"d2764c1e854eaf40b562e0e2090ef7d5d979f4407b0c0e76c54091dcf72f3e28","src/rayon/set.rs":"a6aea27ec78be8cf2ec1f339c4226bc9d54762bce90ee6ff4fd0f7a98196d4a9","src/serde.rs":"d45ec8fb9c02594ca6f2e9b20764778b2b4193a24a52f1e233160a33efc6e683","src/serde_seq.rs":"c54a52fa607b6ccddda1e76e829778ca304c49b5f434edc5e582a5386c35d662","src/set.rs":"c626c64c354ac8209157b387a217888895b7da62a7da2c7a9c731e8d7e3fbf95","src/util.rs":"c415261cff9f610d7331192feba0839cb05e04d3d375a5fa2f8190a29661994e","tests/equivalent_trait.rs":"efe9393069e3cfc893d2c9c0343679979578e437fdb98a10baefeced027ba310","tests/macros_full_path.rs":"c33c86d7341581fdd08e2e6375a4afca507fa603540c54a3b9e51c4cd011cd71","tests/quick.rs":"60525d0b4eb9ac3054a52158f3c75695772d93e22b5f38a8e761c08f8d82d3db","tests/tests.rs":"f6dbeeb0e2950402b0e66ac52bf74c9e4197d3c5d9c0dde64a7998a2ef74d327"},"package":"bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "indexmap"
-version = "1.6.1"
+version = "1.7.0"
 authors = ["bluss", "Josh Stone <cuviper@gmail.com>"]
 build = "build.rs"
 description = "A hash table with consistent order and fast iteration.\n\nThe indexmap is a hash table where the iteration order of the key-value\npairs is independent of the hash values of the keys. It has the usual\nhash table functionality, it preserves insertion order except after\nremovals, and it allows lookup of its elements by either hash table key\nor numerical index. A corresponding hash set type is also provided.\n\nThis crate was initially published under the name ordermap, but it was renamed to\nindexmap.\n"
@@ -34,12 +34,12 @@
 [lib]
 bench = false
 [dependencies.hashbrown]
-version = "0.9.1"
+version = "0.11"
 features = ["raw"]
 default-features = false
 
 [dependencies.rayon]
-version = "1.0"
+version = "1.2"
 optional = true
 
 [dependencies.serde]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/README.rst thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/README.rst
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/README.rst	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/README.rst	2021-12-09 12:01:26.000000000 +0000
@@ -12,8 +12,8 @@
 .. |docs| image:: https://docs.rs/indexmap/badge.svg
 .. _docs: https://docs.rs/indexmap
 
-.. |rustc| image:: https://img.shields.io/badge/rust-1.36%2B-orange.svg
-.. _rustc: https://img.shields.io/badge/rust-1.36%2B-orange.svg
+.. |rustc| image:: https://img.shields.io/badge/rust-1.49%2B-orange.svg
+.. _rustc: https://img.shields.io/badge/rust-1.49%2B-orange.svg
 
 A pure-Rust hash table which preserves (in a limited sense) insertion order.
 
@@ -66,6 +66,23 @@
 Recent Changes
 ==============
 
+- 1.7.0
+
+  - **MSRV**: Rust 1.49 or later is now required.
+
+  - The ``hashbrown`` dependency has been updated to version 0.11.
+
+- 1.6.2
+
+  - Fixed to match ``std`` behavior, ``OccupiedEntry::key`` now references the
+    existing key in the map instead of the lookup key, by @cuviper in PR 170_.
+
+  - The new ``Entry::or_insert_with_key`` matches Rust 1.50's ``Entry`` method,
+    passing ``&K`` to the callback to create a value, by @cuviper in PR 175_.
+
+.. _170: https://github.com/bluss/indexmap/pull/170
+.. _175: https://github.com/bluss/indexmap/pull/175
+
 - 1.6.1
 
   - The new ``serde_seq`` module implements ``IndexMap`` serialization as a
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -53,7 +53,7 @@
 //!
 //! ### Rust Version
 //!
-//! This version of indexmap requires Rust 1.36 or later.
+//! This version of indexmap requires Rust 1.49 or later.
 //!
 //! The indexmap 1.x release series will use a carefully considered version
 //! upgrade policy, where in a later 1.x version, we will raise the minimum
@@ -77,19 +77,14 @@
 //!
 //! [def]: map/struct.IndexMap.html#impl-Default
 
-#[cfg(not(has_std))]
 extern crate alloc;
 
 #[cfg(has_std)]
 #[macro_use]
 extern crate std;
 
-#[cfg(not(has_std))]
 use alloc::vec::{self, Vec};
 
-#[cfg(has_std)]
-use std::vec::{self, Vec};
-
 #[macro_use]
 mod macros;
 mod equivalent;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/map/core/raw.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/map/core/raw.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/map/core/raw.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/map/core/raw.rs	2021-12-09 12:01:26.000000000 +0000
@@ -104,14 +104,24 @@
 
 // The parent module also adds methods that don't threaten the unsafe encapsulation.
 impl<'a, K, V> OccupiedEntry<'a, K, V> {
+    /// Gets a reference to the entry's key in the map.
+    ///
+    /// Note that this is not the key that was used to find the entry. There may be an observable
+    /// difference if the key type has any distinguishing features outside of `Hash` and `Eq`, like
+    /// extra fields or the memory address of an allocation.
     pub fn key(&self) -> &K {
-        &self.key
+        &self.map.entries[self.index()].key
     }
 
+    /// Gets a reference to the entry's value in the map.
     pub fn get(&self) -> &V {
         &self.map.entries[self.index()].value
     }
 
+    /// Gets a mutable reference to the entry's value in the map.
+    ///
+    /// If you need a reference which may outlive the destruction of the
+    /// `Entry` value, see `into_mut`.
     pub fn get_mut(&mut self) -> &mut V {
         let index = self.index();
         &mut self.map.entries[index].value
@@ -131,6 +141,8 @@
         unsafe { self.raw_bucket.read() }
     }
 
+    /// Converts into a mutable reference to the entry's value in the map,
+    /// with a lifetime bound to the map itself.
     pub fn into_mut(self) -> &'a mut V {
         let index = self.index();
         &mut self.map.entries[index].value
@@ -140,7 +152,7 @@
     ///
     /// Like `Vec::swap_remove`, the pair is removed by swapping it with the
     /// last element of the map and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Computes in **O(1)** time (average).
     pub fn swap_remove_entry(self) -> (K, V) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/map/core.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/map/core.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/map/core.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/map/core.rs	2021-12-09 12:01:26.000000000 +0000
@@ -445,6 +445,9 @@
 }
 
 impl<'a, K, V> Entry<'a, K, V> {
+    /// Inserts the given default value in the entry if it is vacant and returns a mutable
+    /// reference to it. Otherwise a mutable reference to an already existent value is returned.
+    ///
     /// Computes in **O(1)** time (amortized average).
     pub fn or_insert(self, default: V) -> &'a mut V {
         match self {
@@ -453,6 +456,9 @@
         }
     }
 
+    /// Inserts the result of the `call` function in the entry if it is vacant and returns a mutable
+    /// reference to it. Otherwise a mutable reference to an already existent value is returned.
+    ///
     /// Computes in **O(1)** time (amortized average).
     pub fn or_insert_with<F>(self, call: F) -> &'a mut V
     where
@@ -464,6 +470,26 @@
         }
     }
 
+    /// Inserts the result of the `call` function with a reference to the entry's key if it is
+    /// vacant, and returns a mutable reference to the new value. Otherwise a mutable reference to
+    /// an already existent value is returned.
+    ///
+    /// Computes in **O(1)** time (amortized average).
+    pub fn or_insert_with_key<F>(self, call: F) -> &'a mut V
+    where
+        F: FnOnce(&K) -> V,
+    {
+        match self {
+            Entry::Occupied(entry) => entry.into_mut(),
+            Entry::Vacant(entry) => {
+                let value = call(&entry.key);
+                entry.insert(value)
+            }
+        }
+    }
+
+    /// Gets a reference to the entry's key, either within the map if occupied,
+    /// or else the new key that was used to find the entry.
     pub fn key(&self) -> &K {
         match *self {
             Entry::Occupied(ref entry) => entry.key(),
@@ -537,7 +563,7 @@
     ///
     /// Like `Vec::swap_remove`, the pair is removed by swapping it with the
     /// last element of the map and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Computes in **O(1)** time (average).
     pub fn swap_remove(self) -> V {
@@ -583,10 +609,12 @@
 }
 
 impl<'a, K, V> VacantEntry<'a, K, V> {
+    /// Gets a reference to the key that was used to find the entry.
     pub fn key(&self) -> &K {
         &self.key
     }
 
+    /// Takes ownership of the key, leaving the entry vacant.
     pub fn into_key(self) -> K {
         self.key
     }
@@ -596,6 +624,8 @@
         self.map.len()
     }
 
+    /// Inserts the entry's key and the given value into the map, and returns a mutable reference
+    /// to the value.
     pub fn insert(self, value: V) -> &'a mut V {
         let i = self.map.push(self.hash, self.key, value);
         &mut self.map.entries[i].value
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -237,7 +237,7 @@
         }
     }
 
-    /// Return an iterator over mutable references to the the values of the map,
+    /// Return an iterator over mutable references to the values of the map,
     /// in their order
     pub fn values_mut(&mut self) -> ValuesMut<'_, K, V> {
         ValuesMut {
@@ -424,6 +424,8 @@
     }
 
     /// Return item index, if it exists in the map
+    ///
+    /// Computes in **O(1)** time (average).
     pub fn get_index_of<Q: ?Sized>(&self, key: &Q) -> Option<usize>
     where
         Q: Hash + Equivalent<K>,
@@ -509,7 +511,7 @@
     ///
     /// Like `Vec::swap_remove`, the pair is removed by swapping it with the
     /// last element of the map and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `None` if `key` is not in map.
     ///
@@ -525,7 +527,7 @@
     ///
     /// Like `Vec::swap_remove`, the pair is removed by swapping it with the
     /// last element of the map and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `None` if `key` is not in map.
     ///
@@ -545,7 +547,7 @@
     ///
     /// Like `Vec::swap_remove`, the pair is removed by swapping it with the
     /// last element of the map and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `None` if `key` is not in map.
     ///
@@ -751,7 +753,7 @@
     ///
     /// Like `Vec::swap_remove`, the pair is removed by swapping it with the
     /// last element of the map and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Computes in **O(1)** time (average).
     pub fn swap_remove_index(&mut self, index: usize) -> Option<(K, V)> {
@@ -1649,10 +1651,32 @@
     }
 
     #[test]
+    fn occupied_entry_key() {
+        // These keys match hash and equality, but their addresses are distinct.
+        let (k1, k2) = (&mut 1, &mut 1);
+        let k1_ptr = k1 as *const i32;
+        let k2_ptr = k2 as *const i32;
+        assert_ne!(k1_ptr, k2_ptr);
+
+        let mut map = IndexMap::new();
+        map.insert(k1, "value");
+        match map.entry(k2) {
+            Entry::Occupied(ref e) => {
+                // `OccupiedEntry::key` should reference the key in the map,
+                // not the key that was used to find the entry.
+                let ptr = *e.key() as *const i32;
+                assert_eq!(ptr, k1_ptr);
+                assert_ne!(ptr, k2_ptr);
+            }
+            Entry::Vacant(_) => panic!(),
+        }
+    }
+
+    #[test]
     fn keys() {
         let vec = vec![(1, 'a'), (2, 'b'), (3, 'c')];
         let map: IndexMap<_, _> = vec.into_iter().collect();
-        let keys: Vec<_> = map.keys().cloned().collect();
+        let keys: Vec<_> = map.keys().copied().collect();
         assert_eq!(keys.len(), 3);
         assert!(keys.contains(&1));
         assert!(keys.contains(&2));
@@ -1663,7 +1687,7 @@
     fn values() {
         let vec = vec![(1, 'a'), (2, 'b'), (3, 'c')];
         let map: IndexMap<_, _> = vec.into_iter().collect();
-        let values: Vec<_> = map.values().cloned().collect();
+        let values: Vec<_> = map.values().copied().collect();
         assert_eq!(values.len(), 3);
         assert!(values.contains(&'a'));
         assert!(values.contains(&'b'));
@@ -1677,7 +1701,7 @@
         for value in map.values_mut() {
             *value *= 2
         }
-        let values: Vec<_> = map.values().cloned().collect();
+        let values: Vec<_> = map.values().copied().collect();
         assert_eq!(values.len(), 3);
         assert!(values.contains(&2));
         assert!(values.contains(&4));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/rayon/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/rayon/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/rayon/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/rayon/map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -275,7 +275,7 @@
     K: Send,
     V: Send,
 {
-    /// Return a parallel iterator over mutable references to the the values of the map
+    /// Return a parallel iterator over mutable references to the values of the map
     ///
     /// While parallel iterators can process items in any order, their relative order
     /// in the map is still preserved for operations like `reduce` and `collect`.
@@ -464,7 +464,7 @@
     fn keys() {
         let vec = vec![(1, 'a'), (2, 'b'), (3, 'c')];
         let map: IndexMap<_, _> = vec.into_par_iter().collect();
-        let keys: Vec<_> = map.par_keys().cloned().collect();
+        let keys: Vec<_> = map.par_keys().copied().collect();
         assert_eq!(keys.len(), 3);
         assert!(keys.contains(&1));
         assert!(keys.contains(&2));
@@ -475,7 +475,7 @@
     fn values() {
         let vec = vec![(1, 'a'), (2, 'b'), (3, 'c')];
         let map: IndexMap<_, _> = vec.into_par_iter().collect();
-        let values: Vec<_> = map.par_values().cloned().collect();
+        let values: Vec<_> = map.par_values().copied().collect();
         assert_eq!(values.len(), 3);
         assert!(values.contains(&'a'));
         assert!(values.contains(&'b'));
@@ -487,7 +487,7 @@
         let vec = vec![(1, 1), (2, 2), (3, 3)];
         let mut map: IndexMap<_, _> = vec.into_par_iter().collect();
         map.par_values_mut().for_each(|value| *value *= 2);
-        let values: Vec<_> = map.par_values().cloned().collect();
+        let values: Vec<_> = map.par_values().copied().collect();
         assert_eq!(values.len(), 3);
         assert!(values.contains(&2));
         assert!(values.contains(&4));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/rayon/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/rayon/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/rayon/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/rayon/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,7 @@
 use rayon::prelude::*;
 
-#[cfg(not(has_std))]
 use alloc::collections::LinkedList;
 
-#[cfg(has_std)]
-use std::collections::LinkedList;
-
 use crate::vec::Vec;
 
 // generate `ParallelIterator` methods by just forwarding to the underlying
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/rayon/set.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/rayon/set.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/rayon/set.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/rayon/set.rs	2021-12-09 12:01:26.000000000 +0000
@@ -622,7 +622,7 @@
             I1: ParallelIterator<Item = &'a i32>,
             I2: Iterator<Item = i32>,
         {
-            let v1: Vec<_> = iter1.cloned().collect();
+            let v1: Vec<_> = iter1.copied().collect();
             let v2: Vec<_> = iter2.collect();
             assert_eq!(v1, v2);
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/set.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/set.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/src/set.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/src/set.rs	2021-12-09 12:01:26.000000000 +0000
@@ -425,7 +425,7 @@
     ///
     /// Like `Vec::swap_remove`, the value is removed by swapping it with the
     /// last element of the set and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `false` if `value` was not in the set.
     ///
@@ -473,7 +473,7 @@
     ///
     /// Like `Vec::swap_remove`, the value is removed by swapping it with the
     /// last element of the set and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `None` if `value` was not in the set.
     ///
@@ -506,7 +506,7 @@
     ///
     /// Like `Vec::swap_remove`, the value is removed by swapping it with the
     /// last element of the set and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `None` if `value` was not in the set.
     pub fn swap_remove_full<Q: ?Sized>(&mut self, value: &Q) -> Option<(usize, T)>
@@ -622,7 +622,7 @@
     ///
     /// Like `Vec::swap_remove`, the value is removed by swapping it with the
     /// last element of the set and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Computes in **O(1)** time (average).
     pub fn swap_remove_index(&mut self, index: usize) -> Option<T> {
@@ -840,7 +840,7 @@
     S: BuildHasher,
 {
     fn extend<I: IntoIterator<Item = &'a T>>(&mut self, iterable: I) {
-        let iter = iterable.into_iter().cloned(); // FIXME: use `copied` in Rust 1.36
+        let iter = iterable.into_iter().copied();
         self.extend(iter);
     }
 }
@@ -1560,7 +1560,7 @@
             I1: Iterator<Item = &'a i32>,
             I2: Iterator<Item = i32>,
         {
-            assert!(iter1.cloned().eq(iter2));
+            assert!(iter1.copied().eq(iter2));
         }
 
         let set_a: IndexSet<_> = (0..3).collect();
@@ -1612,8 +1612,7 @@
         let set_c: IndexSet<_> = (0..6).collect();
         let set_d: IndexSet<_> = (3..9).rev().collect();
 
-        // FIXME: #[allow(clippy::eq_op)] in Rust 1.31
-        #[cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints, eq_op))]
+        #[allow(clippy::eq_op)]
         {
             assert_eq!(&set_a & &set_a, set_a);
             assert_eq!(&set_a | &set_a, set_a);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/tests/quick.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/tests/quick.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/indexmap/tests/quick.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/indexmap/tests/quick.rs	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,7 @@
     I: IntoIterator<Item = &'a T>,
     T: Copy + Hash + Eq,
 {
-    iter.into_iter().cloned().collect()
+    iter.into_iter().copied().collect()
 }
 
 fn indexmap<'a, T: 'a, I>(iter: I) -> IndexMap<T, ()>
@@ -38,7 +38,7 @@
     I: IntoIterator<Item = &'a T>,
     T: Copy + Hash + Eq,
 {
-    IndexMap::from_iter(iter.into_iter().cloned().map(|k| (k, ())))
+    IndexMap::from_iter(iter.into_iter().copied().map(|k| (k, ())))
 }
 
 quickcheck! {
@@ -123,7 +123,7 @@
 
         // First see if `Vec::drain` is happy with this range.
         let result = std::panic::catch_unwind(|| {
-            let mut keys: Vec<u8> = map.keys().cloned().collect();
+            let mut keys: Vec<u8> = map.keys().copied().collect();
             keys.drain(range);
             keys
         });
@@ -155,7 +155,7 @@
         let mut iter = map.keys();
         for &key in insert.iter().unique() {
             if elements.contains(&key) {
-                assert_eq!(Some(key), iter.next().cloned());
+                assert_eq!(Some(&key), iter.next());
             }
         }
 
@@ -165,7 +165,7 @@
 
     fn indexing(insert: Vec<u8>) -> bool {
         let mut map: IndexMap<_, _> = insert.into_iter().map(|x| (x, x)).collect();
-        let set: IndexSet<_> = map.keys().cloned().collect();
+        let set: IndexSet<_> = map.keys().copied().collect();
         assert_eq!(map.len(), set.len());
 
         for (i, &key) in set.iter().enumerate() {
@@ -295,7 +295,7 @@
         let mut reference = HashMap::new();
         do_ops(&ops, &mut map, &mut reference);
         let mut visit = IndexMap::new();
-        let keys = Vec::from_iter(map.keys().cloned());
+        let keys = Vec::from_iter(map.keys().copied());
         for (k, v) in keys.iter().zip(map.values_mut()) {
             assert_eq!(&reference[k], v);
             assert!(!visit.contains_key(k));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/instant/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/instant/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/instant/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/instant/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"AUTHORS":"8bd4ba3271fa2f69d6897a0b14467b525adaecc4d7515698c801d07f32692c25","Cargo.toml":"54456981225ca597c8cfba9165fbedec8da91c24e37f874d32d19802512fc5ef","LICENSE":"cafd574024390a2f68d29f16725abee480a0b8eba39ecd8dc78014182451894f","README.md":"a92cd334a410a4d382bc1ae6d5b97cabb7a903303942890667f5758f1f7e66af","src/lib.rs":"b74e05f72b3e5bd6ac0836e837991f83566e28d42602d9aa5fe7e35f5f60fc09","src/native.rs":"5c27a81932328b6c3ba4cbb86b754502fa91a38d1592e43e0219bc0c5a2fde8f","src/wasm.rs":"e9fbb4084d4265c5658a20011110bfb2082c224fb53a2eae0b46fc75374a1d39","tests/wasm.rs":"3d9f0a04179bb8514dd3df52f148d15ab201dd206fc065fdcef6d9cb0a27a0d3"},"package":"61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"}
\ No newline at end of file
+{"files":{"AUTHORS":"8bd4ba3271fa2f69d6897a0b14467b525adaecc4d7515698c801d07f32692c25","Cargo.toml":"588b05c8f9ab9bb66d69000d56cf7eba81a255c41e93cebc591d5a8fab216565","LICENSE":"cafd574024390a2f68d29f16725abee480a0b8eba39ecd8dc78014182451894f","README.md":"a92cd334a410a4d382bc1ae6d5b97cabb7a903303942890667f5758f1f7e66af","src/lib.rs":"b74e05f72b3e5bd6ac0836e837991f83566e28d42602d9aa5fe7e35f5f60fc09","src/native.rs":"5c27a81932328b6c3ba4cbb86b754502fa91a38d1592e43e0219bc0c5a2fde8f","src/wasm.rs":"ed7a0240e5d245aa0748e872e14fbdb8195f3c04b18761f6b4b20bdb4e5fe059","tests/wasm.rs":"3d9f0a04179bb8514dd3df52f148d15ab201dd206fc065fdcef6d9cb0a27a0d3"},"package":"bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/instant/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/instant/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/instant/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/instant/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "instant"
-version = "0.1.9"
+version = "0.1.10"
 authors = ["sebcrozet <developer@crozet.re>"]
 description = "A partial replacement for std::time::Instant that works on WASM too."
 readme = "README.md"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/instant/src/wasm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/instant/src/wasm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/instant/src/wasm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/instant/src/wasm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -128,11 +128,17 @@
 #[cfg(not(any(feature = "wasm-bindgen", feature = "stdweb")))]
 mod js {
     extern "C" {
+        #[cfg(not(target_os = "emscripten"))]
         pub fn now() -> f64;
+        #[cfg(target_os = "emscripten")]
+        pub fn _emscripten_get_now() -> f64;
     }
 }
 // Make the unsafe extern function "safe" so it can be called like the other 'now' functions
 #[cfg(not(any(feature = "wasm-bindgen", feature = "stdweb")))]
 pub fn now() -> f64 {
-    unsafe { js::now() }
+    #[cfg(not(target_os = "emscripten"))]
+    return unsafe { js::now() };
+    #[cfg(target_os = "emscripten")]
+    return unsafe { js::_emscripten_get_now() };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/appveyor.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/appveyor.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/appveyor.yml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-
-install:
-  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-  - rustup-init.exe -y --default-host %TARGET%
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo build
-  - cargo test
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"28f825c00e2df6acf0bf80a327ee9f7f7fdec57e4c09072deb6c6ac48ad2c3be","Cargo.toml":"29f5cef61141b8926a4c84769ad2fcf06cf047c260043fe9bcc9c92b9ca4e696","LICENSE-APACHE":"01b5abb4a95cc87b220efbd67a1e99c74bef3d744806dd44b4d57e81db814962","LICENSE-MIT":"d4784f55731ba75b77ad73a52808914b26b2f93b69dd4c03249528a75afbd946","README.md":"247302d4c1dc621f150bc06fc0d37f7ad5a4f2dcf1aafe25f8dfe8eb4fe35921","appveyor.yml":"8c309c2779904317005c7f7404470daf2aad344571168a37da214e37833be2a9","src/lib.rs":"c27782fe0b3d5091d69d6153f8cbf934bcf091612c569127f0ea3bd2058d11e7","src/sys/mod.rs":"b19af7b93fd8d7a6f46234e0bb93ddbb12b175e57eff9cb0c0c195ea89ec56b4","src/sys/unix.rs":"8265b65eee3672c96460f4aae8b7b61179e17c8ca80646be3994bc05951228ae","src/sys/unknown.rs":"5057c208dcb309ec1b46a76b922948358ceb727958fb8bde4908948a3890057d","src/sys/windows.rs":"44abddcddf40a755dfdde6d5c68b972ed8417dc31ba4931d14eeccc32a0bb701","src/unix.rs":"76e76333e31dd53d1ea6704a880f4188014af09fe8be3cecd5239003b2a1fe7c","src/windows.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"},"package":"b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "iovec"
-version = "0.1.4"
-authors = ["Carl Lerche <me@carllerche.com>"]
-description = "Portable buffer type for scatter/gather I/O operations\n"
-homepage = "https://github.com/carllerche/iovec"
-documentation = "https://docs.rs/iovec"
-readme = "README.md"
-keywords = ["scatter", "gather", "vectored", "io", "networking"]
-categories = ["network-programming", "api-bindings"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/carllerche/iovec"
-[target."cfg(unix)".dependencies.libc]
-version = "0.2"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-# 0.1.4 (October 9, 2019)
-
-* Add missing `repr(C)`.
-
-# 0.1.3 (yanked) (October 8, 2019)
-
-* Remove dependency on old winapi 0.2 (#16)
-
-# 0.1.2 (January 26th, 2018)
-
-* Add support for non-windows/unix targets (#10)
-
-# 0.1.1 (October 5th, 2017)
-
-* Fix soundness bug: Assert slice lengths are always > 0 (#5)
-
-# 0.1.0 (March 14th, 2017)
-
-* Initial release
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright 2017 Carl Lerche
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2017 Carl Lerche
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-# IoVec
-
-A specialized byte slice type for performing vectored I/O operations.
-
-[![Crates.io](https://img.shields.io/crates/v/iovec.svg?maxAge=2592000)](https://crates.io/crates/iovec)
-[![Build Status](https://travis-ci.org/carllerche/iovec.svg?branch=master)](https://travis-ci.org/carllerche/iovec)
-
-[Documentation](https://docs.rs/iovec)
-
-## Usage
-
-To use `iovec`, first add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-iovec = "0.1"
-```
-
-Next, add this to your crate:
-
-```rust
-extern crate iovec;
-
-use iovec::IoVec;
-```
-
-For more detail, see [documentation](https://docs.rs/iovec).
-
-# License
-
-`iovec` is primarily distributed under the terms of both the MIT license and the
-Apache License (Version 2.0), with portions covered by various BSD-like
-licenses.
-
-See LICENSE-APACHE, and LICENSE-MIT for details.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-//! A specialized byte slice type for performing vectored I/O operations.
-//!
-//! For more detail, see [`IoVec`] documentation.
-//!
-//! [`IoVec`]: struct.IoVec.html
-
-#[cfg(unix)]
-extern crate libc;
-
-mod sys;
-
-use std::{ops, mem};
-
-#[cfg(unix)]
-pub mod unix;
-
-/// Max length of an `IoVec` slice.
-///
-/// Attempts to convert slices longer than this value will result in a panic.
-pub const MAX_LENGTH: usize = sys::MAX_LENGTH;
-
-/// A specialized byte slice type for performing vectored I/O operations.
-///
-/// On all systems, the types needed to perform vectored I/O systems have the
-/// same size as Rust's [`slice`]. However, the layout is not necessarily the
-/// same. `IoVec` provides a portable compatibility layer.
-///
-/// The `IoVec` behaves like a Rust [`slice`], providing the same functions.
-/// It also provides conversion functions to and from the OS specific vectored
-/// types.
-///
-/// [`slice`]: https://doc.rust-lang.org/std/primitive.slice.html
-///
-/// # Examples
-///
-/// ```
-/// use iovec::IoVec;
-///
-/// let mut data = vec![];
-/// data.extend_from_slice(b"hello");
-///
-/// let iovec: &IoVec = data.as_slice().into();
-///
-/// assert_eq!(&iovec[..], &b"hello"[..]);
-/// ```
-///
-/// # Panics
-///
-/// Attempting to convert a zero-length slice or a slice longer than
-/// [`MAX_LENGTH`] to an `IoVec` will result in a panic.
-///
-/// [`MAX_LENGTH`]: constant.MAX_LENGTH.html
-pub struct IoVec {
-    sys: sys::IoVec,
-}
-
-impl IoVec {
-    pub fn from_bytes(slice: &[u8]) -> Option<&IoVec> {
-        if slice.len() == 0 {
-            return None
-        }
-        unsafe {
-            let iovec: &sys::IoVec = slice.into();
-            Some(mem::transmute(iovec))
-        }
-    }
-
-    pub fn from_bytes_mut(slice: &mut [u8]) -> Option<&mut IoVec> {
-        if slice.len() == 0 {
-            return None
-        }
-        unsafe {
-            let iovec: &mut sys::IoVec = slice.into();
-            Some(mem::transmute(iovec))
-        }
-    }
-
-    #[deprecated(since = "0.1.0", note = "deref instead")]
-    #[doc(hidden)]
-    pub fn as_bytes(&self) -> &[u8] {
-        &**self
-    }
-
-    #[deprecated(since = "0.1.0", note = "deref instead")]
-    #[doc(hidden)]
-    pub fn as_mut_bytes(&mut self) -> &mut [u8] {
-        &mut **self
-    }
-}
-
-impl ops::Deref for IoVec {
-    type Target = [u8];
-
-    fn deref(&self) -> &[u8] {
-        &self.sys.as_ref()
-    }
-}
-
-impl ops::DerefMut for IoVec {
-    fn deref_mut(&mut self) -> &mut [u8] {
-        self.sys.as_mut()
-    }
-}
-
-#[doc(hidden)]
-impl<'a> From<&'a [u8]> for &'a IoVec {
-    fn from(bytes: &'a [u8]) -> &'a IoVec {
-        IoVec::from_bytes(bytes)
-            .expect("this crate accidentally accepted 0-sized slices \
-                     originally but this was since discovered as a soundness \
-                     hole, it's recommended to use the `from_bytes` \
-                     function instead")
-    }
-}
-
-#[doc(hidden)]
-impl<'a> From<&'a mut [u8]> for &'a mut IoVec {
-    fn from(bytes: &'a mut [u8]) -> &'a mut IoVec {
-        IoVec::from_bytes_mut(bytes)
-            .expect("this crate accidentally accepted 0-sized slices \
-                     originally but this was since discovered as a soundness \
-                     hole, it's recommended to use the `from_bytes_mut` \
-                     function instead")
-    }
-}
-
-#[doc(hidden)]
-impl<'a> Default for &'a IoVec {
-    fn default() -> Self {
-        panic!("this implementation was accidentally provided but is \
-                unfortunately unsound, it's recommended to stop using \
-                `IoVec::default` or construct a vector with a nonzero length");
-    }
-}
-
-#[doc(hidden)]
-impl<'a> Default for &'a mut IoVec {
-    fn default() -> Self {
-        panic!("this implementation was accidentally provided but is \
-                unfortunately unsound, it's recommended to stop using \
-                `IoVec::default` or construct a vector with a nonzero length");
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::IoVec;
-
-    #[test]
-    fn convert_ref() {
-        let buf: &IoVec = (&b"hello world"[..]).into();
-        assert_eq!(buf[..], b"hello world"[..]);
-    }
-
-    #[test]
-    fn convert_mut() {
-        let mut buf: Vec<u8> = b"hello world".to_vec();
-        let buf: &mut IoVec = (&mut buf[..]).into();
-        assert_eq!(buf[..], b"hello world"[..]);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/sys/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/sys/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/sys/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/sys/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#[cfg(unix)]
-mod unix;
-
-#[cfg(unix)]
-pub use self::unix::{
-    IoVec,
-    MAX_LENGTH,
-};
-
-#[cfg(windows)]
-mod windows;
-
-#[cfg(windows)]
-pub use self::windows::{
-    IoVec,
-    MAX_LENGTH,
-};
-
-#[cfg(not(any(windows, unix)))]
-mod unknown;
-
-#[cfg(not(any(windows, unix)))]
-pub use self::unknown::{
-    IoVec,
-    MAX_LENGTH,
-};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/sys/unix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/sys/unix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/sys/unix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/sys/unix.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-use libc;
-use std::{mem, slice, usize};
-
-pub struct IoVec {
-    inner: [u8],
-}
-
-pub const MAX_LENGTH: usize = usize::MAX;
-
-impl IoVec {
-    pub fn as_ref(&self) -> &[u8] {
-        unsafe {
-            let vec = self.iovec();
-            slice::from_raw_parts(vec.iov_base as *const u8, vec.iov_len)
-        }
-    }
-
-    pub fn as_mut(&mut self) -> &mut [u8] {
-        unsafe {
-            let vec = self.iovec();
-            slice::from_raw_parts_mut(vec.iov_base as *mut u8, vec.iov_len)
-        }
-    }
-
-    unsafe fn iovec(&self) -> libc::iovec {
-        mem::transmute(&self.inner)
-    }
-}
-
-impl<'a> From<&'a [u8]> for &'a IoVec {
-    fn from(src: &'a [u8]) -> Self {
-        assert!(src.len() > 0);
-        unsafe {
-            mem::transmute(libc::iovec {
-                iov_base: src.as_ptr() as *mut _,
-                iov_len: src.len(),
-            })
-        }
-    }
-}
-
-impl<'a> From<&'a mut [u8]> for &'a mut IoVec {
-    fn from(src: &'a mut [u8]) -> Self {
-        assert!(src.len() > 0);
-        unsafe {
-            mem::transmute(libc::iovec {
-                iov_base: src.as_ptr() as *mut _,
-                iov_len: src.len(),
-            })
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/sys/unknown.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/sys/unknown.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/sys/unknown.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/sys/unknown.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-use std::{mem, slice, usize};
-
-#[derive(Clone)]
-pub struct WasmIoVec {
-    ptr: *const u8,
-    len: usize,
-}
-
-pub struct IoVec {
-    inner: [u8],
-}
-
-pub const MAX_LENGTH: usize = usize::MAX;
-
-impl IoVec {
-    pub fn as_ref(&self) -> &[u8] {
-        unsafe {
-            let vec = self.iovec();
-            slice::from_raw_parts(vec.ptr as *const u8, vec.len)
-        }
-    }
-
-    pub fn as_mut(&mut self) -> &mut [u8] {
-        unsafe {
-            let vec = self.iovec();
-            slice::from_raw_parts_mut(vec.ptr as *mut u8, vec.len)
-        }
-    }
-
-    unsafe fn iovec(&self) -> WasmIoVec {
-        mem::transmute(&self.inner)
-    }
-}
-
-impl<'a> From<&'a [u8]> for &'a IoVec {
-    fn from(src: &'a [u8]) -> Self {
-        assert!(src.len() > 0);
-        unsafe {
-            mem::transmute(WasmIoVec {
-                ptr: src.as_ptr() as *mut _,
-                len: src.len(),
-            })
-        }
-    }
-}
-
-impl<'a> From<&'a mut [u8]> for &'a mut IoVec {
-    fn from(src: &'a mut [u8]) -> Self {
-        assert!(src.len() > 0);
-        unsafe {
-            mem::transmute(WasmIoVec {
-                ptr: src.as_ptr() as *mut _,
-                len: src.len(),
-            })
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/sys/windows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/sys/windows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/sys/windows.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/sys/windows.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-use std::{mem, slice, u32};
-
-// declare the types we need directly here to avoid bringing
-// in the old and slow winapi 0.2 dependency.
-
-type DWORD = u32;
-type ULONG = u32;
-type CHAR = i8;
-
-#[repr(C)]
-struct WSABUF {
-    pub len: ULONG,
-    pub buf: *mut CHAR,
-}
-
-pub struct IoVec {
-    inner: [u8],
-}
-
-pub const MAX_LENGTH: usize = u32::MAX as usize;
-
-impl IoVec {
-    pub fn as_ref(&self) -> &[u8] {
-        unsafe {
-            let vec = self.wsabuf();
-            slice::from_raw_parts(vec.buf as *const u8, vec.len as usize)
-        }
-    }
-
-    pub fn as_mut(&mut self) -> &mut [u8] {
-        unsafe {
-            let vec = self.wsabuf();
-            slice::from_raw_parts_mut(vec.buf as *mut u8, vec.len as usize)
-        }
-    }
-
-    unsafe fn wsabuf(&self) -> WSABUF {
-        mem::transmute(&self.inner)
-    }
-}
-
-impl<'a> From<&'a [u8]> for &'a IoVec {
-    fn from(src: &'a [u8]) -> Self {
-        assert!(src.len() > 0);
-        assert!(src.len() <= MAX_LENGTH);
-
-        unsafe {
-            mem::transmute(WSABUF {
-                buf: src.as_ptr() as *mut _,
-                len: src.len() as DWORD,
-            })
-        }
-    }
-}
-
-impl<'a> From<&'a mut [u8]> for &'a mut IoVec {
-    fn from(src: &'a mut [u8]) -> Self {
-        assert!(src.len() > 0);
-        assert!(src.len() <= MAX_LENGTH);
-
-        unsafe {
-            mem::transmute(WSABUF {
-                buf: src.as_ptr() as *mut _,
-                len: src.len() as DWORD,
-            })
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/unix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/unix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/iovec/src/unix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/iovec/src/unix.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-//! IoVec extensions for Unix platforms.
-//!
-//! These functions provide conversions to unix specific representations of the
-//! vectored data.
-//!
-//! # Examples
-//!
-//! ```
-//! use iovec::IoVec;
-//! use iovec::unix;
-//!
-//! let a = b"hello".to_vec();
-//! let b = b"world".to_vec();
-//!
-//! let bufs: &[&IoVec] = &[(&a[..]).into(), (&b[..]).into()];
-//! let os_bufs = unix::as_os_slice(&bufs[..]);
-//!
-//! // Use the `os_bufs` slice with `writev`.
-//! ```
-
-use IoVec;
-use libc;
-
-use std::mem;
-
-/// Convert a slice of `IoVec` refs to a slice of `libc::iovec`.
-///
-/// The return value can be passed to `writev` bindings.
-///
-/// # Examples
-///
-/// ```
-/// use iovec::IoVec;
-/// use iovec::unix;
-///
-/// let a = b"hello".to_vec();
-/// let b = b"world".to_vec();
-///
-/// let bufs: &[&IoVec] = &[a[..].into(), b[..].into()];
-/// let os_bufs = unix::as_os_slice(bufs);
-///
-/// // Use the `os_bufs` slice with `writev`.
-/// ```
-pub fn as_os_slice<'a>(iov: &'a [&IoVec]) -> &'a [libc::iovec] {
-    unsafe { mem::transmute(iov) }
-}
-
-/// Convert a mutable slice of `IoVec` refs to a mutable slice of `libc::iovec`.
-///
-/// The return value can be passed to `readv` bindings.
-///
-/// # Examples
-///
-/// ```
-/// use iovec::IoVec;
-/// use iovec::unix;
-///
-/// let mut a = [0; 10];
-/// let mut b = [0; 10];
-///
-/// let bufs: &mut [&mut IoVec] = &mut [(&mut a[..]).into(), (&mut b[..]).into()];
-/// let os_bufs = unix::as_os_slice_mut(bufs);
-///
-/// // Use the `os_bufs` slice with `readv`.
-/// ```
-pub fn as_os_slice_mut<'a>(iov: &'a mut [&mut IoVec]) -> &'a mut [libc::iovec] {
-    unsafe { mem::transmute(iov) }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"863c4ba956c08b8c4166da60cc4ecb573909816193281bb6d9fc8ab65786e311","LICENSE-APACHE":"87d9feb9238c6bd8e0024fc4733b06cff036f89f36d93b7df1c8a0549bbb7a5b","LICENSE-MIT":"47dc9ff29128ddfb4d6a0435383c9f89120bc374dbcc1dd00b933a0b28aa7865","README.md":"2dd9afaece57325e7db80d4b112032b6842a96ed5609e18e2915e09925b29cdd","RELEASES.md":"8cb9eacf6e63c5fdcc8d7c98fc191de0b080dcd90d2e587de0527084d1c918d6","src/ipext.rs":"7b9b70558a626df5ec13c89751f1432009dfd2306838f829a4238d2e13a85df5","src/ipnet.rs":"561702f1295e72f3708eba94f01d692ce5674a5d8e0cf7809ccc95671b1982af","src/ipnet_serde.rs":"fb40378d69cca4ba26537f2ef5f80fcb00f04f3a9e4c23b5bfc688c259a01a91","src/lib.rs":"c682197f7706512aeca1cf43ec29c32d0fe2342e3b9b9b0e45f4c00bad5aac5b","src/parser.rs":"db70cdc2a42edc8834885eb98279791d9ff8f9325a85c6f1844723a2d01ad966"},"package":"47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"}
\ No newline at end of file
+{"files":{"Cargo.toml":"99fe74003764ee083fb95b45655d010762d8a9cccb5ad103cce9486638728963","LICENSE-APACHE":"87d9feb9238c6bd8e0024fc4733b06cff036f89f36d93b7df1c8a0549bbb7a5b","LICENSE-MIT":"47dc9ff29128ddfb4d6a0435383c9f89120bc374dbcc1dd00b933a0b28aa7865","README.md":"2dd9afaece57325e7db80d4b112032b6842a96ed5609e18e2915e09925b29cdd","RELEASES.md":"64a3c8381c0515d568027b744d5a4f7c06c53539ebfb98e01cf80780120fb47e","src/ipext.rs":"7b9b70558a626df5ec13c89751f1432009dfd2306838f829a4238d2e13a85df5","src/ipnet.rs":"a4fba4463573743dbd991e106b15dffdd2eb21a333c17ed7214506facbf7da09","src/ipnet_serde.rs":"fb40378d69cca4ba26537f2ef5f80fcb00f04f3a9e4c23b5bfc688c259a01a91","src/lib.rs":"afd581f1693fe88286ff7b33c62fe7ba3eca04f3380dfd4ca00e6a347133a5e1","src/parser.rs":"6912282eaf32754d98f8b3b62116bea7ca1dea57fb47fb217995f7e2d7737424"},"package":"68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "ipnet"
-version = "2.3.0"
+version = "2.3.1"
 authors = ["Kris Price <kris@krisprice.nz>"]
 description = "Provides types and useful methods for working with IPv4 and IPv6 network addresses, commonly called IP prefixes. The new `IpNet`, `Ipv4Net`, and `Ipv6Net` types build on the existing `IpAddr`, `Ipv4Addr`, and `Ipv6Addr` types already provided in Rust's standard library and align to their design to stay consistent. The module also provides useful traits that extend `Ipv4Addr` and `Ipv6Addr` with methods for `Add`, `Sub`, `BitAnd`, and `BitOr` operations. The module only uses stable feature so it is guaranteed to compile using the stable toolchain."
 documentation = "https://docs.rs/ipnet"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/RELEASES.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/RELEASES.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/RELEASES.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/RELEASES.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,9 @@
 # Releases
 
+## Version 2.3.1 (2020-06-15)
+
+* Merge Fix Error::description() deprecation warning #28.
+
 ## Version 2.3.0 (2020-03-15)
 
 * Merge @imp's `Default` implementation. See #18. `Ipv4Net` and `Ipv6Net` now default to 0.0.0.0/0 and ::/0 respectively. `IpNet` defaults to the 0/0 `Ipv4Net`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/src/ipnet.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/src/ipnet.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/src/ipnet.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/src/ipnet.rs	2021-12-09 12:01:26.000000000 +0000
@@ -113,15 +113,11 @@
 
 impl fmt::Display for PrefixLenError {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str(self.description())
+        fmt.write_str("invalid IP prefix length")
     }
 }
 
-impl Error for PrefixLenError {
-    fn description(&self) -> &str {
-        "invalid IP prefix length"
-    }
-}
+impl Error for PrefixLenError {}
 
 impl IpNet {
     /// Returns a copy of the network with the address truncated to the
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/ipnet/2.3.0")]
+#![doc(html_root_url = "https://docs.rs/ipnet/2.3.1")]
 //! Types for IPv4 and IPv6 network addresses.
 //!
 //! This module provides types and useful methods for working with IPv4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/src/parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/src/parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ipnet/src/parser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ipnet/src/parser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -338,12 +338,8 @@
 
 impl fmt::Display for AddrParseError {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str(self.description())
+        fmt.write_str("invalid IP address syntax")
     }
 }
 
-impl Error for AddrParseError {
-    fn description(&self) -> &str {
-        "invalid IP address syntax"
-    }
-}
\ No newline at end of file
+impl Error for AddrParseError {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/benches/bench.rs	2021-12-09 12:01:26.000000000 +0000
@@ -68,7 +68,7 @@
     }
 }
 
-benches!{
+benches! {
     bench_u64_0(0u64),
     bench_u64_half(<u32>::max_value() as u64),
     bench_u64_max(<u64>::max_value()),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"237b2f98d385550ae95b14448b2c7c16182004e568f26d3877d8fa0e28838a93","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5eac563c0123003363f4706f36927cf4d3b118965e35b51bc515343ce6a711ae","benches/bench.rs":"65020d3ef575c4f9aa9f09ab28dc4164d98207515301d7d16b57c3e48d84049d","src/lib.rs":"318cb37cdd4699c54d4ea4ca1d65b4c27684197b48597842676aadebfbcf373e","src/udiv128.rs":"16c27cc61f69ca79eca3ac624d6baceaccdbf27cfa43c85c7e065c1ff1481748","tests/test.rs":"428d30ab57b412211a6a0faa7ac36b359e37572b259cd05ac56f4dff6078e896"},"package":"dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"}
\ No newline at end of file
+{"files":{"Cargo.toml":"46f2cf3006d59c73bed95c276f43ddab1a9a9fa177ea0142777b7471c753f558","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5eac563c0123003363f4706f36927cf4d3b118965e35b51bc515343ce6a711ae","benches/bench.rs":"fc009678431563bfb1b51698fb5b83f5309a3cdab90dc7365800f4e32bc287be","src/lib.rs":"a7b37eab3872193cf666c1d7d4db8d7e82c6dc6d8121fc762b5f69ddb4df3b01","src/udiv128.rs":"1c9c374680162e12c734d369d1494ee8c91e11eb4b05500e96e6303155bdc623","tests/test.rs":"c9b124462b75078e2407e0239222edd7859c3112d65a114742dbb8c47dafc07c"},"package":"b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,20 +3,19 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.8"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 exclude = ["performance.png"]
 description = "Fast functions for printing integer primitives to an io::Write"
-documentation = "https://github.com/dtolnay/itoa"
+documentation = "https://docs.rs/itoa"
 readme = "README.md"
 categories = ["value-formatting"]
 license = "MIT OR Apache-2.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -56,12 +56,17 @@
 //! }
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/itoa/0.4.6")]
+#![doc(html_root_url = "https://docs.rs/itoa/0.4.8")]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(
     feature = "cargo-clippy",
-    allow(const_static_lifetime, transmute_ptr_to_ptr),
+    allow(
+        expl_impl_clone_on_copy,
+        missing_errors_doc,
+        must_use_candidate,
+        transmute_ptr_to_ptr
+    )
 )]
 
 #[cfg(feature = "i128")]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/src/udiv128.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/src/udiv128.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/src/udiv128.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/src/udiv128.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,61 +1,45 @@
-// The code in this file is based on Rust's compiler-builtins crate. The Rust
-// compiler automatically links programs against this crate for target-specific
-// runtime support. We have copied the implementation of `__udivmodti4()` which
-// is an intrinsic implementing division with remainder for architectures
-// without 128-bit integers. This implementation works around some poor codegen
-// by LLVM (https://github.com/rust-lang/rust/issues/44545) and allows for
-// inlining which does not happen with the intrinsic.
-//
-// The compiler-builtins crate carries the following license, which is available
-// in full at:
-// https://github.com/rust-lang-nursery/compiler-builtins/blob/master/LICENSE.TXT
-//
-// ---
-//
-// Copyright 2009-2016 compiler-builtins Developers
-//
-// The compiler-builtins crate is dual licensed under both the University of
-// Illinois "BSD-Like" license and the MIT license. As a user of this code you
-// may choose to use it under either license. As a contributor, you agree to
-// allow your code to be used under both.
+/// Multiply unsigned 128 bit integers, return upper 128 bits of the result
+#[inline]
+fn u128_mulhi(x: u128, y: u128) -> u128 {
+    let x_lo = x as u64;
+    let x_hi = (x >> 64) as u64;
+    let y_lo = y as u64;
+    let y_hi = (y >> 64) as u64;
+
+    // handle possibility of overflow
+    let carry = (x_lo as u128 * y_lo as u128) >> 64;
+    let m = x_lo as u128 * y_hi as u128 + carry;
+    let high1 = m >> 64;
+
+    let m_lo = m as u64;
+    let high2 = x_hi as u128 * y_lo as u128 + m_lo as u128 >> 64;
+
+    x_hi as u128 * y_hi as u128 + high1 + high2
+}
 
+/// Divide `n` by 1e19 and return quotient and remainder
+///
+/// Integer division algorithm is based on the following paper:
+///
+///   T. Granlund and P. Montgomery, “Division by Invariant Integers Using Multiplication�
+///   in Proc. of the SIGPLAN94 Conference on Programming Language Design and
+///   Implementation, 1994, pp. 61–72
+///
 #[inline]
 pub fn udivmod_1e19(n: u128) -> (u128, u64) {
     let d = 10_000_000_000_000_000_000_u64; // 10^19
 
-    let high = (n >> 64) as u64;
-    if high == 0 {
-        let low = n as u64;
-        return ((low / d) as u128, low % d);
-    }
-
-    let sr = 65 - high.leading_zeros();
-
-    // 2 <= sr <= 65
-    let mut q: u128 = n << (128 - sr);
-    let mut r: u128 = n >> sr;
-    let mut carry: u64 = 0;
-
-    // Don't use a range because they may generate references to memcpy in unoptimized code
-    //
-    // Loop invariants:  r < d; carry is 0 or 1
-    let mut i = 0;
-    while i < sr {
-        i += 1;
-
-        // r:q = ((r:q) << 1) | carry
-        r = (r << 1) | (q >> 127);
-        q = (q << 1) | carry as u128;
-
-        // carry = 0
-        // if r >= d {
-        //     r -= d;
-        //     carry = 1;
-        // }
-        let s = (d as u128).wrapping_sub(r).wrapping_sub(1) as i128 >> 127;
-        carry = (s & 1) as u64;
-        r -= (d as u128) & s as u128;
-    }
+    let quot = if n < 1 << 83 {
+        ((n >> 19) as u64 / (d >> 19)) as u128
+    } else {
+        let factor =
+            (8507059173023461586_u64 as u128) << 64 | 10779635027931437427 as u128;
+        u128_mulhi(n, factor) >> 62
+    };
+
+    let rem = (n - quot * d as u128) as u64;
+    debug_assert_eq!(quot, n / d as u128);
+    debug_assert_eq!(rem as u128, n % d as u128);
 
-    ((q << 1) | carry as u128, r as u64)
+    (quot, rem)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/tests/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/tests/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/itoa/tests/test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/itoa/tests/test.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,4 @@
-#![cfg_attr(
-    feature = "cargo-clippy",
-    allow(cast_lossless, string_lit_as_bytes)
-)]
+#![cfg_attr(feature = "cargo-clippy", allow(cast_lossless, string_lit_as_bytes))]
 #![allow(non_snake_case)]
 
 extern crate itoa;
@@ -32,7 +29,7 @@
     }
 }
 
-test!{
+test! {
     test_u64_0(0u64, "0"),
     test_u64_half(<u32>::max_value() as u64, "4294967295"),
     test_u64_max(<u64>::max_value(), "18446744073709551615"),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"649c3364426ce43e5e3984b5d7ad1d162ab570d4f0933693b732fc8bed4ed996","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"a9adb9dd4cfca03543232305d4ffab615795e7c04e82c67880fc3802eb1531d5","src/lib.rs":"a11a35e242a379fa1bad686dbe329cbc0cf003d38976c5c3cc999a5ff1478229","src/unix.rs":"aba4305675501da5f14231d836c065c4b2102ba27919fd9eeda6623fddc07ff3","src/wasm.rs":"bb67f97bccd0b0c1762917de342d721e319a3a204604ab1517285c59b5e2a369","src/windows.rs":"f886175abbf75ff45ea3fc09396bbcc3048e7daf732ed78149377f7b8e9148b2","tests/client-of-myself.rs":"09aa82b78b33c09c98fa4eb011af58455972b6a32fa40a2c6631af53e08a1d99","tests/client.rs":"8b0e2cd7ec0cf0de3e7f06342d8cdbd482a29351e8bf3181030e03e76a4c175d","tests/helper.rs":"802ae3eb69c3d787acef2930f9eebe16ad4fc5a2a67b39bb4482d84e2315287a","tests/make-as-a-client.rs":"d8358590a86e6b725a86d0f1b8917f0b051839630a9557d820e4fdcbf99985ec","tests/server.rs":"8f08fe8ed6b3a260de9bf8ee1a7820fadfce8e54ff4fb7bec18e628d092adafb"},"package":"5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"}
\ No newline at end of file
+{"files":{"Cargo.toml":"9d5e9bc3aa927124431914287d2830ff03ca5a80931a3b44b3f057b92d09e850","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"07d8d79f8f6b6a94321fe8db78d26ed409de47cee49290947bd6bbfa29d05e9c","src/lib.rs":"891d9c9cf2d75eee30c02ffa8ae7fa8fb1f7675dccddb0cc79a067e1a87a9850","src/unix.rs":"5802f031e80295c5498a2ddb95b5ee6e39b7294f25b35075302fb978b8d4c409","src/wasm.rs":"bb67f97bccd0b0c1762917de342d721e319a3a204604ab1517285c59b5e2a369","src/windows.rs":"f886175abbf75ff45ea3fc09396bbcc3048e7daf732ed78149377f7b8e9148b2","tests/client-of-myself.rs":"ca09bf398f69df4bac1730999e954dbbc3faf3c6512678c136e0938e7e9cd0ab","tests/client.rs":"64547b780edce5ebcd397db1160fd86baab030c530c6976fa013bca9f07a85ff","tests/helper.rs":"c0e6c00eaf849295d8ec23e374690b6645c0f7d993e91abf7ad53ac960f71762","tests/make-as-a-client.rs":"ec09a7cdbf78d6c3b16f26de15766c4bd62d44a913ada6b86b66e067e6c484ba","tests/server.rs":"9a260f1302ae4908479df0bd34b46edb9d2b8b9b3dbc3e2b6666296d9e1b2b84"},"package":"af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "jobserver"
-version = "0.1.21"
+version = "0.1.24"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "An implementation of the GNU make jobserver for Rust\n"
 homepage = "https://github.com/alexcrichton/jobserver-rs"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -35,5 +35,5 @@
 ### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
+for inclusion in jobserver-rs by you, as defined in the Apache-2.0 license, shall be
 dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -226,8 +226,8 @@
     /// any number of times.
     pub unsafe fn from_env() -> Option<Client> {
         let var = match env::var("CARGO_MAKEFLAGS")
-            .or(env::var("MAKEFLAGS"))
-            .or(env::var("MFLAGS"))
+            .or_else(|_| env::var("MAKEFLAGS"))
+            .or_else(|_| env::var("MFLAGS"))
         {
             Ok(s) => s,
             Err(_) => return None,
@@ -268,7 +268,7 @@
         let data = self.inner.acquire()?;
         Ok(Acquired {
             client: self.inner.clone(),
-            data: data,
+            data,
             disabled: false,
         })
     }
@@ -294,7 +294,7 @@
         // Older implementations of make use `--jobserver-fds` and newer
         // implementations use `--jobserver-auth`, pass both to try to catch
         // both implementations.
-        let value = format!("--jobserver-fds={0} --jobserver-auth={0}", arg);
+        let value = format!("-j --jobserver-fds={0} --jobserver-auth={0}", arg);
         cmd.env("CARGO_MAKEFLAGS", &value);
         self.inner.configure(cmd);
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/src/unix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/src/unix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/src/unix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/src/unix.rs	2021-12-09 12:01:26.000000000 +0000
@@ -26,7 +26,7 @@
         // I don't think the character written here matters, but I could be
         // wrong!
         for _ in 0..limit {
-            (&client.write).write(&[b'|'])?;
+            (&client.write).write_all(&[b'|'])?;
         }
         Ok(client)
     }
@@ -122,10 +122,11 @@
         // fds are set to nonblocking and combined with `pselect`
         // internally.
         //
-        // Here we try to be compatible with both strategies. We
-        // unconditionally expect the file descriptor to be in nonblocking
-        // mode and if it happens to be in blocking mode then most of this
-        // won't end up actually being necessary!
+        // Here we try to be compatible with both strategies. We optimistically
+        // try to read from the file descriptor which then may block, return
+        // a token or indicate that polling is needed.
+        // Blocking reads (if possible) allows the kernel to be more selective
+        // about which readers to wake up when a token is written to the pipe.
         //
         // We use `poll` here to block this thread waiting for read
         // readiness, and then afterwards we perform the `read` itself. If
@@ -139,17 +140,6 @@
             fd.fd = self.read.as_raw_fd();
             fd.events = libc::POLLIN;
             loop {
-                fd.revents = 0;
-                if libc::poll(&mut fd, 1, -1) == -1 {
-                    let e = io::Error::last_os_error();
-                    match e.kind() {
-                        io::ErrorKind::Interrupted => return Ok(None),
-                        _ => return Err(e),
-                    }
-                }
-                if fd.revents == 0 {
-                    continue;
-                }
                 let mut buf = [0];
                 match (&self.read).read(&mut buf) {
                     Ok(1) => return Ok(Some(Acquired { byte: buf[0] })),
@@ -160,10 +150,25 @@
                         ))
                     }
                     Err(e) => match e.kind() {
-                        io::ErrorKind::WouldBlock | io::ErrorKind::Interrupted => return Ok(None),
+                        io::ErrorKind::WouldBlock => { /* fall through to polling */ }
+                        io::ErrorKind::Interrupted => return Ok(None),
                         _ => return Err(e),
                     },
                 }
+
+                loop {
+                    fd.revents = 0;
+                    if libc::poll(&mut fd, 1, -1) == -1 {
+                        let e = io::Error::last_os_error();
+                        return match e.kind() {
+                            io::ErrorKind::Interrupted => Ok(None),
+                            _ => Err(e),
+                        };
+                    }
+                    if fd.revents != 0 {
+                        break;
+                    }
+                }
             }
         }
     }
@@ -184,7 +189,7 @@
     }
 
     pub fn string_arg(&self) -> String {
-        format!("{},{} -j", self.read.as_raw_fd(), self.write.as_raw_fd())
+        format!("{},{}", self.read.as_raw_fd(), self.write.as_raw_fd())
     }
 
     pub fn configure(&self, cmd: &mut Command) {
@@ -299,9 +304,7 @@
 }
 
 fn is_valid_fd(fd: c_int) -> bool {
-    unsafe {
-        return libc::fcntl(fd, libc::F_GETFD) != -1;
-    }
+    unsafe { libc::fcntl(fd, libc::F_GETFD) != -1 }
 }
 
 fn set_cloexec(fd: c_int, set: bool) -> io::Result<()> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/client-of-myself.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/client-of-myself.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/client-of-myself.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/client-of-myself.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,3 @@
-extern crate jobserver;
-
 use std::env;
 use std::io::prelude::*;
 use std::io::BufReader;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,3 @@
-extern crate futures;
-extern crate jobserver;
-extern crate num_cpus;
-extern crate tempdir;
-extern crate tokio_core;
-extern crate tokio_process;
-
 use std::env;
 use std::fs::File;
 use std::io::Write;
@@ -41,7 +34,7 @@
     Test {
         name: "no j args",
         make_args: &[],
-        rule: &|me| format!("{}", me),
+        rule: &|me| me.to_string(),
         f: &|| {
             assert!(unsafe { Client::from_env().is_none() });
         },
@@ -124,7 +117,7 @@
 
     let me = t!(env::current_exe());
     let me = me.to_str().unwrap();
-    let filter = env::args().skip(1).next();
+    let filter = env::args().nth(1);
 
     let mut core = t!(Core::new());
 
@@ -146,7 +139,7 @@
                 (test.rule)(me)
             );
             t!(t!(File::create(td.path().join("Makefile"))).write_all(makefile.as_bytes()));
-            let prog = env::var("MAKE").unwrap_or("make".to_string());
+            let prog = env::var("MAKE").unwrap_or_else(|_| "make".to_string());
             let mut cmd = Command::new(prog);
             cmd.args(test.make_args);
             cmd.current_dir(td.path());
@@ -174,7 +167,7 @@
         Ok(())
     })));
 
-    if failures.len() == 0 {
+    if failures.is_empty() {
         println!("\ntest result: ok\n");
         return;
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/helper.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/helper.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/helper.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/helper.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
     drop(client.clone().into_helper_thread(|_| ()).unwrap());
     drop(client.clone().into_helper_thread(|_| ()).unwrap());
     drop(client.clone().into_helper_thread(|_| ()).unwrap());
-    drop(client.clone().into_helper_thread(|_| ()).unwrap());
+    drop(client.into_helper_thread(|_| ()).unwrap());
 }
 
 #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/make-as-a-client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/make-as-a-client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/make-as-a-client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/make-as-a-client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,3 @@
-extern crate jobserver;
-extern crate tempdir;
-
 use std::env;
 use std::fs::File;
 use std::io::prelude::*;
@@ -42,7 +39,7 @@
     let c = t!(Client::new(1));
     let td = TempDir::new("foo").unwrap();
 
-    let prog = env::var("MAKE").unwrap_or("make".to_string());
+    let prog = env::var("MAKE").unwrap_or_else(|_| "make".to_string());
 
     let me = t!(env::current_exe());
     let me = me.to_str().unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/jobserver/tests/server.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/jobserver/tests/server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,3 @@
-extern crate jobserver;
-extern crate tempdir;
-
 use std::env;
 use std::fs::File;
 use std::io::prelude::*;
@@ -61,7 +58,7 @@
     let c = t!(Client::new(1));
     let td = TempDir::new("foo").unwrap();
 
-    let prog = env::var("MAKE").unwrap_or("make".to_string());
+    let prog = env::var("MAKE").unwrap_or_else(|_| "make".to_string());
     let mut cmd = Command::new(prog);
     cmd.current_dir(td.path());
 
@@ -115,7 +112,7 @@
     let c = t!(Client::new(1));
     let td = TempDir::new("foo").unwrap();
 
-    let prog = env::var("MAKE").unwrap_or("make".to_string());
+    let prog = env::var("MAKE").unwrap_or_else(|_| "make".to_string());
     let mut cmd = Command::new(prog);
     cmd.current_dir(td.path());
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"593270eceb13c00402215a6e11bb16aaa55fe4cf94792326cc56af22b9a52bfb","Cargo.toml":"4c022bc29a5529c60672e50f5361c8dda0e446814becd63bb1527f896145092f","LICENSE":"e3243ad298fc7b8961902235ce0896d9b567d36e6c20dc6f3b4666aeca39b355","README.md":"81bf4bc764990ed8b67dbb7d0d06ce284b1d400652d2c5ac3047f46c8fee6903","joinery.sublime-project":"145d5f94f35877615a49e2fe96be81490de00167a22e983d8a2f26d11e599579","src/iter.rs":"5718afad77b5a1fd9dfb0c6384ba3614f762f54288f4b6e2362c505bab65f78b","src/join.rs":"88795b64c04332e868c65fb58014978f5e66a2b55494a0ae37d516c31fe7d8dc","src/lib.rs":"c9697c63934b7c6ffb99726514dbf6dd668d4b8a4dd4db0cb6acf2a3da6eed0b","src/separators.rs":"47aaa359f3d70cf875ed5c8ad8ca559abc55382787bdd1502200f5464101f9b9"},"package":"72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "joinery"
+version = "2.1.0"
+authors = ["Nathan West <Lucretiel@gmail.com>"]
+description = "A small crate for generically joining iterators with a separator"
+readme = "README.md"
+categories = ["no-std", "rust-patterns", "value-formatting"]
+license = "MIT"
+repository = "https://github.com/Lucretiel/joinery"
+[package.metadata.docs.rs]
+all-features = true
+[dependencies.proc-macro2]
+version = "1.0.27"
+optional = true
+default-features = false
+
+[dependencies.quote]
+version = "1.0.9"
+optional = true
+default-features = false
+
+[dependencies.syn]
+version = "1.0.72"
+features = ["printing"]
+optional = true
+default-features = false
+
+[features]
+nightly = []
+token-stream = ["quote", "proc-macro2", "syn"]
+[badges.maintenance]
+status = "actively-developed"
+
+[badges.travis-ci]
+repository = "Lucretiel/joinery"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,116 @@
+# Changelog
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html).
+
+This changelog was added after the release of 1.0.0; changes before that are left undocumented.
+
+## Unreleased
+
+## 2.1.0
+
+### Added
+
+- Added `token-stream` feature which, when enabled, provides a `ToTokens` implementation to `Join`. This allows `Join` objects to be used as lazy token streams in `quote`.
+- 0-size `Display` type for `Newline` in `separators`.
+
+## 2.0.0
+
+2019-02-10
+
+Major redesign of library. Most idiomatic joinery code should continue to work, but most of the library's traits and structs have been completely redesigned. The most significant change is that joinery is no longer primarily based on cloneable iterators, but rather on referentially iterable collections; that is, types for which `&'a Container: IntoIterator`. This means that we can get rid of a lot of the weird cruft related to `partial_clone`, etc.
+
+### Design notes:
+
+- Iterators and collections are now treated separately. The `Join` struct is now based on collections, which are types which implement referential iteration (that is, for which `&T: IntoIterator`).
+- Iterators can be adapted into `Join` instances via the `CloneIterator` adapter, which adds `&T: IntoIterator` to types that are `T: Clone + Iterator`.
+- While the types have drastically changed, idiomatic code (which imports the prelude and uses mainly the `join_with` method) should continue to function
+  correctly.
+
+### Changed
+
+- Split the library into various modules for the different functionality.
+  - `join` contains the `Join` type and related traits.
+  - `iter` contains the `JoinIter` type and related traits and structs.
+  - `separators` contains various convenient 0-size `Display` types for common separators, like `Comma` and `Space`.
+
+### Added
+
+- `JoinableIterator` trait, which allows joining iterators directly via `iter_join_with`, or adapting them into `Join` structs via `join_with`
+- Added numerous extra 0-size separator types, like `Comma` and `Space`, for common separators.
+- Advanced to Rust 2018 Edition.
+
+### Removed
+
+- `NoSeparator` removed from the prelude, since it's generally preferable to use `join_concat`
+- Many methods on `Join` were deemed too niche and removed as part of the redesign, such as `partial_clone` and `consume_fmt`.
+
+## 1.2.2
+
+2018-09-15
+
+### Minor
+
+- Various optimizations and simplifications
+- Extra test
+- Added cargo categories
+
+## 1.2.1
+
+2018-09-10
+
+### Minor
+
+- Fixed broken documentation links
+
+## 1.2.0
+
+2018-09-10
+
+### Changed
+
+- Joinery is now `#![no_std]`
+
+## 1.1.2
+
+2018-08-23
+
+### Minor
+
+- Fixed broken link in docs
+
+## 1.1.1
+
+2018-08-23
+
+### Minor
+
+- Cleaned up the README badges
+
+## 1.1.0
+
+2018-08-23
+
+### Added
+
+- Empty separators:
+  - Added `NoSeparator`, a zero-size type which allows users to idiomatically join an iterator without any separator.
+  - Added `join_concat`, a helper method for separator-free joins.
+
+### Removed
+
+- Removed `try_fold` after discovering serious implementation bug.
+  - Added test demonstrating this bug
+  - Would like to re-add someday, but seems difficult or impossible.
+  - Note that Iterator still provides `try_fold`; the only thing being removed is the specialized implementation.
+
+### Minor
+
+- Small documentation fix (#12)
+- Added README badges
+
+## 1.0.0
+
+2018-08-10
+
+First major release.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/joinery.sublime-project thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/joinery.sublime-project
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/joinery.sublime-project	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/joinery.sublime-project	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"folder_exclude_patterns": [
+				"target"
+			],
+			"path": "."
+		}
+	]
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Nathan West
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,82 @@
+[![Travis (.com)](https://img.shields.io/travis/com/Lucretiel/joinery.svg?logo=travis)](https://travis-ci.com/Lucretiel/joinery/) [![GitHub stars](https://img.shields.io/github/stars/Lucretiel/joinery.svg?label=stars&logo=github&logoColor=white)](https://github.com/Lucretiel/joinery) [![Crates.io](https://img.shields.io/crates/d/joinery.svg?logo=rust&logoColor=white&label=crates.io)](https://crates.io/crates/joinery) [![docs.rs](https://docs.rs/joinery/badge.svg)](https://docs.rs/joinery) [![Github commits (since latest release)](https://img.shields.io/github/commits-since/Lucretiel/joinery/release.svg?label=commits%20since%20last%20release)](https://github.com/Lucretiel/joinery/compare/release...master) [![license](https://img.shields.io/github/license/Lucretiel/joinery.svg)](https://crates.io/crates/joinery/)
+
+# joinery
+A Rust library for generically joining iterables with a separator. Provides the tragically missing string join functionality to rust.
+
+```rust
+extern crate joinery;
+
+use std::env;
+
+// Or use joinery::prelude::*;
+use joinery::Joinable;
+
+fn main() {
+	// Join things!
+	println!("{}", ["Hello", "World!"].iter().join_with(", "));
+
+	// Join things of different types!
+	println!("{}", ["Hello", "World!"].iter().join_with(' '));
+	println!("{}", (0..10).join_with(' '));
+}
+```
+
+## Installation
+
+Add joinery to your `Cargo.toml`:
+
+```toml
+[dependencies]
+joinery = "2.0.0"
+```
+
+### Nightly-only features
+
+joinery supports various nightly-only optimization features, such as `iter::TrustedLen`. These features are enabled with the `"nightly"` cargo feature:
+
+```toml
+[dependencies.joinery]
+version = "2.0.0"
+features = ["nightly"]
+```
+
+Note that, because nightly-only features are unstable, joinery can't make any stability guarentees about their continued presence or interface consistency between versions. While we'll do our best to preserve compatibility, we only guarentee semver compatibility for the non-nightly interface.
+
+## Overview
+
+Joinery provides joins over iterators. Put simply, a join is a combination of an iterator and a separator. The join then conceptually represents all the elements of the iterator, with the separator between each one.
+
+You can create a join with the `join_with` method, which is defined for all `IntoIterator` types via the `Joinable` trait:
+
+```rust
+use joinery::prelude::*;
+
+let content = vec![1, 2, 3, 4, 5];
+
+let join = content.iter().join_with(", ");
+```
+
+Joins implement `Display`, so they can be written to writers or converted into strings. Joins are stateless, so they can be reused, assuming that the underlying iterator is cloneable:
+
+```rust
+println!("Comma-separated numbers: {}", join);
+
+let mut result = String::new();
+write!(&mut result, "{}", join);
+
+// Don't forget that `Display` gives you `ToString` for free!
+let result2 = join.to_string();
+```
+
+Joins are also iterable. You can use `.iter()` to iterate over references to the underlying iterator, or `into_iter()` to convert the join into an iterator. Join iterators use an item type called `JoinItem`, which distinguishes between separators and elements of the underlying iterator:
+
+```rust
+use joinery::JoinItem;
+let mut iter = join.iter();
+
+assert_eq!(iter.next(), Some(JoinItem::Element(&1)));
+assert_eq!(iter.next(), Some(JoinItem::Separator(&", ")));
+assert_eq!(iter.next(), Some(JoinItem::Element(&2)));
+assert_eq!(iter.next(), Some(JoinItem::Separator(&", ")));
+assert_eq!(iter.next(), Some(JoinItem::Element(&3)));
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/src/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/src/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/src/iter.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/src/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,593 @@
+//! Joinery iterator and related types and traits
+
+use core::fmt::{self, Debug, Display, Formatter};
+use core::iter::{FusedIterator, Peekable};
+
+#[cfg(feature = "nightly")]
+use core::iter::TrustedLen;
+
+use crate::join::{Join, Joinable};
+use crate::separators::NoSeparator;
+
+/// Specialized helper struct to allow adapting any [`Iterator`] into a [`Join`].
+///
+/// [`Join`] requires the underlying object to be `&T: IntoIterator`, so that
+/// it can be iterated over when formatting via [`Display`]. This works fine for
+/// collection types like [`Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html),
+/// but it doesn't work for arbitrary iterators. However, because many iterators
+/// are cheaply clonable (because they often just contain a reference to the
+/// underlying sequence), we can use this adapter to create an `&T: IntoIterator`
+/// type which can be displayed by `Join`.
+#[derive(Debug, Clone, Eq, PartialEq)]
+#[repr(transparent)]
+pub struct CloneIterator<I>(I);
+
+impl<I: Iterator> IntoIterator for CloneIterator<I> {
+    type IntoIter = I;
+    type Item = I::Item;
+
+    /// Convert the adapter back into the underlying iterator.
+    fn into_iter(self) -> Self::IntoIter {
+        self.0
+    }
+}
+
+impl<'a, I: Iterator + Clone> IntoIterator for &'a CloneIterator<I> {
+    type IntoIter = I;
+    type Item = I::Item;
+
+    /// Create a referential iterator by cloning the underlying iterator. Note
+    /// that this will have the same `Item` type as the underlying iterator,
+    /// rather than references to those items.
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.clone()
+    }
+}
+
+/// A trait for converting [`Iterator`]s into [`Join`] instances or [`JoinIter`]
+/// iterators.
+///
+/// This trait serves the same purpose as [`Joinable`], but is implemented for `Iterator`
+/// types. The main difference between [`JoinableIterator`] and [`Joinable`] is that,
+/// because iterators generally don't implement `&T: IntoIterator`, we need a different
+/// mechanism to allow for immutably iterating (which is required for [`Join`]'s implementation
+/// of [`Display`]).
+pub trait JoinableIterator: Iterator + Sized {
+    /// Convert a cloneable iterator into a [`Join`] instance. Whenever the [`Join`]
+    /// needs to immutabley iterate over the underlying iterator (for instance, when
+    /// formatting it with [`Display`]), the underlying iterator is cloned. For most
+    /// iterator types this is a cheap operation, because the iterator contains just
+    /// a reference to the underlying collection.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use joinery::JoinableIterator;
+    ///
+    /// let result = (0..4).map(|x| x * 2).join_with(", ").to_string();
+    ///
+    /// assert_eq!(result, "0, 2, 4, 6");
+    /// ```
+    fn join_with<S>(self, sep: S) -> Join<CloneIterator<Self>, S>
+    where
+        Self: Clone,
+    {
+        CloneIterator(self).join_with(sep)
+    }
+
+    /// Convert a [cloneable][Clone] iterator into a [`Join`] instance with no separator.
+    /// When formatted with [`Display`], the elements of the iterator will be directly
+    /// concatenated.
+    /// # Examples
+    ///
+    /// ```
+    /// use joinery::JoinableIterator;
+    ///
+    /// let result = (0..4).map(|x| x * 2).join_concat().to_string();
+    ///
+    /// assert_eq!(result, "0246");
+    /// ```
+    fn join_concat(self) -> Join<CloneIterator<Self>, NoSeparator>
+    where
+        Self: Clone,
+    {
+        self.join_with(NoSeparator)
+    }
+
+    /// Create an iterator which interspeses the elements of this iterator with
+    /// a separator. See [`JoinIter`] for more details.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use joinery::{JoinableIterator, JoinItem};
+    ///
+    /// let mut iter = (0..3).map(|x| x * 2).iter_join_with(", ");
+    ///
+    /// assert_eq!(iter.next(), Some(JoinItem::Element(0)));
+    /// assert_eq!(iter.next(), Some(JoinItem::Separator(", ")));
+    /// assert_eq!(iter.next(), Some(JoinItem::Element(2)));
+    /// assert_eq!(iter.next(), Some(JoinItem::Separator(", ")));
+    /// assert_eq!(iter.next(), Some(JoinItem::Element(4)));
+    /// assert_eq!(iter.next(), None);
+    /// ```
+    fn iter_join_with<S>(self, sep: S) -> JoinIter<Self, S> {
+        JoinIter::new(self, sep)
+    }
+}
+
+impl<T: Iterator> JoinableIterator for T {}
+
+/// Enum representing the elements of a [`JoinIter`].
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum JoinItem<T, S> {
+    /// An element from the underlying iterator
+    Element(T),
+    /// A separator between two elements
+    Separator(S),
+}
+
+impl<T, S> JoinItem<T, S> {
+    /// Convert a [`JoinItem`] into a common type `R`, in the case where both
+    /// `T` and `S` can be converted to `R`. Unfortunately, due to potentially
+    /// conflicting implementations, we can't implement [`Into<R>`][Into] for
+    /// [`JoinItem`].
+    pub fn into<R>(self) -> R
+    where
+        T: Into<R>,
+        S: Into<R>,
+    {
+        match self {
+            JoinItem::Element(el) => el.into(),
+            JoinItem::Separator(sep) => sep.into(),
+        }
+    }
+}
+
+impl<R, T: AsRef<R>, S: AsRef<R>> AsRef<R> for JoinItem<T, S> {
+    /// Get a reference to a common type `R` from a [`JoinItem`], in the case where
+    /// both `T` and `S` implement [`AsRef<R>`][AsRef]
+    fn as_ref(&self) -> &R {
+        match self {
+            JoinItem::Element(el) => el.as_ref(),
+            JoinItem::Separator(sep) => sep.as_ref(),
+        }
+    }
+}
+
+impl<R, T: AsMut<R>, S: AsMut<R>> AsMut<R> for JoinItem<T, S> {
+    /// Get a mutable reference to a common type `R` from a [`JoinItem`], in the
+    /// case where both `T` and `S` implement [`AsMut<R>`][AsMut]
+    fn as_mut(&mut self) -> &mut R {
+        match self {
+            JoinItem::Element(el) => el.as_mut(),
+            JoinItem::Separator(sep) => sep.as_mut(),
+        }
+    }
+}
+
+impl<T: Display, S: Display> Display for JoinItem<T, S> {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        match self {
+            JoinItem::Element(el) => el.fmt(f),
+            JoinItem::Separator(sep) => sep.fmt(f),
+        }
+    }
+}
+
+/// An iterator for a [`Join`].
+///
+/// Emits the elements of the [`Join`]'s underlying iterator, interspersed with
+/// its separator. Note that it uses [`clone`][Clone::clone] to generate copies
+/// of the separator while iterating, but also keep in mind that in most cases
+/// the [`JoinItem`] instance will have a trivially cloneable separator, such
+/// as [`&`](https://doc.rust-lang.org/std/primitive.reference.html)[`str`][str]
+/// or [`char`].
+///
+/// # Examples
+///
+/// Via [`IntoIterator`]:
+///
+/// ```
+/// use joinery::{Joinable, JoinItem};
+///
+/// let join = vec![1, 2, 3].join_with(" ");
+/// let mut join_iter = join.into_iter();
+///
+/// assert_eq!(join_iter.next(), Some(JoinItem::Element(1)));
+/// assert_eq!(join_iter.next(), Some(JoinItem::Separator(" ")));
+/// assert_eq!(join_iter.next(), Some(JoinItem::Element(2)));
+/// assert_eq!(join_iter.next(), Some(JoinItem::Separator(" ")));
+/// assert_eq!(join_iter.next(), Some(JoinItem::Element(3)));
+/// assert_eq!(join_iter.next(), None);
+/// ```
+///
+/// Via [`iter_join_with`][JoinableIterator::iter_join_with]:
+///
+/// ```
+/// use joinery::{JoinableIterator, JoinItem};
+///
+/// let mut iter = (0..6)
+///     .filter(|x| x % 2 == 0)
+///     .map(|x| x * 2)
+///     .iter_join_with(", ");
+///
+/// assert_eq!(iter.next(), Some(JoinItem::Element(0)));
+/// assert_eq!(iter.next(), Some(JoinItem::Separator(", ")));
+/// assert_eq!(iter.next(), Some(JoinItem::Element(4)));
+/// assert_eq!(iter.next(), Some(JoinItem::Separator(", ")));
+/// assert_eq!(iter.next(), Some(JoinItem::Element(8)));
+/// assert_eq!(iter.next(), None);
+/// ```
+#[must_use]
+pub struct JoinIter<Iter: Iterator, Sep> {
+    iter: Peekable<Iter>,
+    sep: Sep,
+    next_sep: bool,
+}
+
+impl<I: Iterator, S> JoinIter<I, S> {
+    /// Construct a new [`JoinIter`] using an iterator and a separator
+    fn new(iter: I, sep: S) -> Self {
+        JoinIter {
+            iter: iter.peekable(),
+            sep,
+            next_sep: false,
+        }
+    }
+}
+
+impl<I: Iterator, S> JoinIter<I, S> {
+    /// Check if the next iteration of this iterator will (try to) return a
+    /// separator. Note that this does not check if the underlying iterator is
+    /// empty, so the next `next` call could still return `None`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use joinery::{JoinableIterator, JoinItem};
+    ///
+    /// let mut join_iter = (0..3).join_with(", ").into_iter();
+    ///
+    /// assert_eq!(join_iter.is_sep_next(), false);
+    /// join_iter.next();
+    /// assert_eq!(join_iter.is_sep_next(), true);
+    /// join_iter.next();
+    /// assert_eq!(join_iter.is_sep_next(), false);
+    /// ```
+    #[inline]
+    pub fn is_sep_next(&self) -> bool {
+        self.next_sep
+    }
+
+    /// Get a reference to the separator.
+    #[inline]
+    pub fn sep(&self) -> &S {
+        &self.sep
+    }
+
+    /// Peek at what the next item in the iterator will be without consuming
+    /// it. Note that this interface is similar, but not identical, to
+    /// [`Peekable::peek`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use joinery::{JoinableIterator, JoinItem};
+    ///
+    /// let mut join_iter = (0..3).join_with(", ").into_iter();
+    ///
+    /// assert_eq!(join_iter.peek(), Some(JoinItem::Element(&0)));
+    /// assert_eq!(join_iter.next(), Some(JoinItem::Element(0)));
+    /// assert_eq!(join_iter.peek(), Some(JoinItem::Separator(&", ")));
+    /// assert_eq!(join_iter.next(), Some(JoinItem::Separator(", ")));
+    /// assert_eq!(join_iter.peek(), Some(JoinItem::Element(&1)));
+    /// assert_eq!(join_iter.next(), Some(JoinItem::Element(1)));
+    /// ```
+    pub fn peek(&mut self) -> Option<JoinItem<&I::Item, &S>> {
+        let sep = &self.sep;
+        let next_sep = self.next_sep;
+
+        self.iter.peek().map(move |element| {
+            if next_sep {
+                JoinItem::Separator(sep)
+            } else {
+                JoinItem::Element(element)
+            }
+        })
+    }
+
+    /// Peek at what the next non-separator item in the iterator will be
+    /// without consuming it.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use joinery::{Joinable, JoinItem};
+    ///
+    /// let mut join_iter = vec!["This", "is", "a", "sentence"].join_with(' ').into_iter();
+    ///
+    /// assert_eq!(join_iter.peek_element(), Some(&"This"));
+    /// assert_eq!(join_iter.peek(), Some(JoinItem::Element(&"This")));
+    /// assert_eq!(join_iter.next(), Some(JoinItem::Element("This")));
+    ///
+    /// assert_eq!(join_iter.peek_element(), Some(&"is"));
+    /// assert_eq!(join_iter.peek(), Some(JoinItem::Separator(&' ')));
+    /// assert_eq!(join_iter.next(), Some(JoinItem::Separator(' ')));
+    ///
+    /// assert_eq!(join_iter.peek_element(), Some(&"is"));
+    /// assert_eq!(join_iter.peek(), Some(JoinItem::Element(&"is")));
+    /// assert_eq!(join_iter.next(), Some(JoinItem::Element("is")));
+    /// ```
+    pub fn peek_element(&mut self) -> Option<&I::Item> {
+        self.iter.peek()
+    }
+}
+
+impl<I: Debug + Iterator, S: Debug> Debug for JoinIter<I, S>
+where
+    I::Item: Debug,
+{
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        f.debug_struct("JoinIter")
+            .field("iter", &self.iter)
+            .field("sep", &self.sep)
+            .field("next_sep", &self.next_sep)
+            .finish()
+    }
+}
+
+impl<I: Clone + Iterator, S: Clone> Clone for JoinIter<I, S>
+where
+    I::Item: Clone, // Needed because we use a peekable iterator
+{
+    fn clone(&self) -> Self {
+        JoinIter {
+            iter: self.iter.clone(),
+            sep: self.sep.clone(),
+            next_sep: self.next_sep,
+        }
+    }
+
+    fn clone_from(&mut self, source: &Self) {
+        self.iter.clone_from(&source.iter);
+        self.sep.clone_from(&source.sep);
+        self.next_sep = source.next_sep;
+    }
+}
+
+/// Get the size of a [`JoinIter`], given the size of the underlying iterator. If
+/// next_sep is true, the next element in the [`JoinIter`] will be the separator.
+/// Return None in the event of an overflow. This logic is provided as a separate
+/// function in the hopes that it will aid compiler optimization, and also with
+/// the intention that in the future it will be a `const fn`.
+#[inline]
+fn join_size(iter_size: usize, next_sep: bool) -> Option<usize> {
+    if iter_size == 0 {
+        Some(0)
+    } else if next_sep {
+        iter_size.checked_mul(2)
+    } else {
+        // TODO: this might be faster with wrapping operations and explicit checks
+        // Interestingly, If checked_mul didn't overflow, then the +1 is also
+        // guarenteed to not overflow.
+        (iter_size - 1).checked_mul(2).map(|val| val + 1)
+    }
+}
+
+impl<I: Iterator, S: Clone> Iterator for JoinIter<I, S> {
+    type Item = JoinItem<I::Item, S>;
+
+    /// Advance to the next item in the Join. This will either be the next
+    /// element in the underlying iterator, or a clone of the separator.
+    // We tag it inline in the hopes that the compiler can optimize loops into
+    // (mostly) branchless versions, similar to `(Join as Display)::fmt`
+    #[inline]
+    fn next(&mut self) -> Option<Self::Item> {
+        let sep = &self.sep;
+        let next_sep = &mut self.next_sep;
+
+        if *next_sep {
+            self.iter.peek().map(|_| {
+                *next_sep = false;
+                JoinItem::Separator(sep.clone())
+            })
+        } else {
+            self.iter.next().map(|element| {
+                *next_sep = true;
+                JoinItem::Element(element)
+            })
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let (min, max) = self.iter.size_hint();
+
+        let min = join_size(min, self.next_sep).unwrap_or(core::usize::MAX);
+        let max = max.and_then(|max| join_size(max, self.next_sep));
+
+        (min, max)
+    }
+
+    fn fold<B, F>(self, init: B, mut func: F) -> B
+    where
+        F: FnMut(B, Self::Item) -> B,
+    {
+        let mut iter = self.iter.map(JoinItem::Element);
+        let sep = self.sep;
+
+        let accum = if self.next_sep {
+            init
+        } else {
+            match iter.next() {
+                None => return init,
+                Some(element) => func(init, element),
+            }
+        };
+
+        iter.fold(accum, move |accum, element| {
+            let accum = func(accum, JoinItem::Separator(sep.clone()));
+            func(accum, element)
+        })
+    }
+
+    // TODO: Add try_fold implementation based on self.iter.try_fold.
+    // Unfortunately, this will be difficult (and probably impossible), because
+    // when the reducer function is called, it has to process both the element
+    // and the separator, either of which could result in an early return.
+}
+
+impl<I: FusedIterator, S: Clone> FusedIterator for JoinIter<I, S> {}
+
+#[cfg(feature = "nightly")]
+unsafe impl<I: TrustedLen, S: Clone> TrustedLen for JoinIter<I, S> {}
+
+#[cfg(test)]
+mod tests {
+    use super::JoinItem::*;
+    use super::JoinableIterator;
+
+    #[test]
+    fn empty_iter() {
+        let mut join_iter = (0..0).iter_join_with(", ");
+
+        assert_eq!(join_iter.next(), None);
+        assert_eq!(join_iter.next(), None);
+    }
+
+    #[test]
+    fn single() {
+        let mut join_iter = (0..1).iter_join_with(", ");
+
+        assert_eq!(join_iter.next(), Some(Element(0)));
+        assert_eq!(join_iter.next(), None);
+        assert_eq!(join_iter.next(), None);
+    }
+
+    #[test]
+    fn few() {
+        let mut join_iter = (0..3).iter_join_with(", ");
+
+        assert_eq!(join_iter.next(), Some(Element(0)));
+        assert_eq!(join_iter.next(), Some(Separator(", ")));
+        assert_eq!(join_iter.next(), Some(Element(1)));
+        assert_eq!(join_iter.next(), Some(Separator(", ")));
+        assert_eq!(join_iter.next(), Some(Element(2)));
+        assert_eq!(join_iter.next(), None);
+        assert_eq!(join_iter.next(), None);
+    }
+
+    #[test]
+    fn regular_size_hint() {
+        let mut join_iter = (0..10).iter_join_with(", ");
+
+        for size in (0..=19).rev() {
+            assert_eq!(join_iter.size_hint(), (size, Some(size)));
+            join_iter.next();
+        }
+
+        assert_eq!(join_iter.size_hint(), (0, Some(0)));
+        join_iter.next();
+        assert_eq!(join_iter.size_hint(), (0, Some(0)));
+    }
+
+    #[test]
+    fn large_size_hint() {
+        let join_iter = (0..usize::max_value() - 10).iter_join_with(", ");
+        assert_eq!(join_iter.size_hint(), (usize::max_value(), None));
+    }
+
+    #[test]
+    fn threshold_size_hint() {
+        use core::usize::MAX as usize_max;
+        let usize_threshold = (usize_max / 2) + 1;
+
+        let mut join_iter = (0..usize_threshold + 1).iter_join_with(", ");
+        assert_eq!(join_iter.size_hint(), (usize_max, None));
+
+        join_iter.next();
+        assert_eq!(join_iter.size_hint(), (usize_max, None));
+
+        join_iter.next();
+        assert_eq!(join_iter.size_hint(), (usize_max, Some(usize_max)));
+
+        join_iter.next();
+        assert_eq!(join_iter.size_hint(), (usize_max - 1, Some(usize_max - 1)));
+    }
+
+    #[test]
+    fn partial_iteration() {
+        use std::vec::Vec;
+
+        let mut join_iter = (0..3).iter_join_with(' ');
+
+        join_iter.next();
+
+        let rest: Vec<_> = join_iter.collect();
+        assert_eq!(
+            rest,
+            [Separator(' '), Element(1), Separator(' '), Element(2),]
+        );
+    }
+
+    #[test]
+    fn fold() {
+        let content = [1, 2, 3];
+        let join_iter = content.iter().iter_join_with(4);
+
+        let sum = join_iter.fold(0, |accum, next| match next {
+            Element(el) => accum + el,
+            Separator(sep) => accum + sep,
+        });
+
+        assert_eq!(sum, 14);
+    }
+
+    #[test]
+    fn partial_fold() {
+        let content = [1, 2, 3, 4];
+        let mut join_iter = content.iter().iter_join_with(1);
+
+        join_iter.next();
+        join_iter.next();
+        join_iter.next();
+
+        let sum = join_iter.fold(0, |accum, next| match next {
+            Element(el) => accum + el,
+            Separator(sep) => accum + sep,
+        });
+
+        assert_eq!(sum, 9);
+    }
+
+    #[test]
+    fn try_fold() {
+        let content = [1, 2, 0, 3];
+        let mut join_iter = content.iter().iter_join_with(1);
+
+        let result = join_iter.try_fold(0, |accum, next| match next {
+            Separator(sep) => Ok(accum + sep),
+            Element(el) if *el == 0 => Err(accum),
+            Element(el) => Ok(accum + el),
+        });
+
+        assert_eq!(result, Err(5));
+    }
+
+    // This test exists because implementing JoinIter::try_fold in terms of
+    // JoinIter.iter::try_fold is non trivial, and the naive (incorrect) implementation
+    // fails this test.
+    #[test]
+    fn partial_try_fold() {
+        let content = [1, 2, 3];
+        let mut join_iter = content.iter().iter_join_with(1);
+
+        let _ = join_iter.try_fold(1, |_, next| match next {
+            Element(_) => Some(1),
+            Separator(_) => None,
+        });
+
+        // At this point, the remaining elements in the iterator SHOULD be E(2), S(1), E(3)
+        assert_eq!(join_iter.count(), 3);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/src/join.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/src/join.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/src/join.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/src/join.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,362 @@
+//! Core join type and related traits
+
+use core::fmt::{self, Display, Formatter};
+
+#[cfg(feature = "token-stream")]
+use {proc_macro2::TokenStream, quote::ToTokens};
+
+use crate::{
+    iter::{JoinItem, JoinIter, JoinableIterator},
+    separators::NoSeparator,
+};
+
+/// A trait for converting collections into [`Join`] instances.
+///
+/// This trait is implemented for all referentially iterable types; that is,
+/// for all types for which `&T: IntoIterator`. See [`join_with`][Joinable::join_with]
+/// for an example of its usage.
+pub trait Joinable: Sized {
+    type Collection;
+    /// Combine this object with a separator to create a new [`Join`] instance.
+    /// Note that the separator does not have to share the same type as the
+    /// iterator's values.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use joinery::Joinable;
+    ///
+    /// let parts = vec!["this", "is", "a", "sentence"];
+    /// let join = parts.join_with(' ');
+    /// assert_eq!(join.to_string(), "this is a sentence");
+    /// ```
+    fn join_with<S>(self, sep: S) -> Join<Self::Collection, S>;
+
+    /// Join this object with an [empty separator](NoSeparator). When rendered
+    /// with [`Display`], the underlying elements will be directly concatenated.
+    /// Note that the separator, while empty, is still present, and will show
+    /// up if you iterate this instance.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use joinery::Joinable;
+    ///
+    /// let parts = vec!['a', 'b', 'c', 'd', 'e'];
+    /// let join = parts.join_concat();
+    /// assert_eq!(join.to_string(), "abcde");
+    /// ```
+    fn join_concat(self) -> Join<Self::Collection, NoSeparator> {
+        self.join_with(NoSeparator)
+    }
+}
+
+impl<T> Joinable for T
+where
+    for<'a> &'a T: IntoIterator,
+{
+    type Collection = Self;
+
+    fn join_with<S>(self, sep: S) -> Join<Self, S> {
+        Join {
+            collection: self,
+            sep,
+        }
+    }
+}
+
+/// A trait for using a separator to produce a [`Join`].
+///
+/// This trait provides a more python-style interface for performing joins.
+/// Rather use [`collection.join_with`][Joinable::join_with], you can instead
+/// use:
+///
+/// ```
+/// use joinery::Separator;
+///
+/// let join = ", ".separate([1, 2, 3, 4]);
+/// assert_eq!(join.to_string(), "1, 2, 3, 4");
+/// ```
+///
+/// By default, [`Separator`] is implemented for [`char`] and [`&str`][str], as
+/// well as all the separator types in `separators`.
+///
+/// Note that any type can be used as a separator in a [`Join`] when
+/// creating one via [`Joinable::join_with`]. The [`Separator`] trait and its
+/// implementations on [`char`] and [`&str`][str] are provided simply as
+/// a convenience.
+pub trait Separator: Sized {
+    fn separate<T: Joinable>(self, collection: T) -> Join<T::Collection, Self> {
+        collection.join_with(self)
+    }
+}
+
+impl Separator for char {}
+impl<'a> Separator for &'a str {}
+
+/// The primary data structure for representing a joined sequence.
+///
+/// It contains a collection and a separator, and represents the elements of the
+/// collection with the separator dividing each element. A collection is defined
+/// as any type for which `&T: IntoIterator`; that is, any time for which references
+/// to the type are iterable.
+///
+/// A [`Join`] is created with [`Joinable::join_with`], [`Separator::separate`], or
+/// [`JoinableIterator::join_with`]. Its main use is an implementation of [`Display`],
+/// which writes out the elements of the underlying collection, separated by the
+/// separator. It also implements [`IntoIterator`], using a [`JoinIter`].
+///
+/// # Examples
+///
+/// Writing via [`Display`]:
+///
+/// ```
+/// use joinery::Joinable;
+/// use std::fmt::Write;
+///
+/// let content = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+/// let join = content.join_with(", ");
+///
+/// let mut buffer = String::new();
+/// write!(buffer, "Numbers: {}", join);
+///
+/// assert_eq!(buffer, "Numbers: 1, 2, 3, 4, 5, 6, 7, 8, 9");
+///
+/// // Don't forget that `Display` gives to `ToString` for free!
+/// assert_eq!(join.to_string(), "1, 2, 3, 4, 5, 6, 7, 8, 9")
+/// ```
+///
+/// Iterating via [`IntoIterator`]:
+///
+/// ```
+/// use joinery::{Separator, JoinItem};
+///
+/// let content = [0, 1, 2];
+/// let join = ", ".separate(content);
+/// let mut join_iter = (&join).into_iter();
+///
+/// assert_eq!(join_iter.next(), Some(JoinItem::Element(&0)));
+/// assert_eq!(join_iter.next(), Some(JoinItem::Separator(&", ")));
+/// assert_eq!(join_iter.next(), Some(JoinItem::Element(&1)));
+/// assert_eq!(join_iter.next(), Some(JoinItem::Separator(&", ")));
+/// assert_eq!(join_iter.next(), Some(JoinItem::Element(&2)));
+/// assert_eq!(join_iter.next(), None);
+/// ```
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[must_use]
+pub struct Join<C, S> {
+    collection: C,
+    sep: S,
+}
+
+impl<C, S> Join<C, S> {
+    /// Get a reference to the separator.
+    pub fn sep(&self) -> &S {
+        &self.sep
+    }
+
+    /// Get a reference to the underlying collection.
+    pub fn collection(&self) -> &C {
+        &self.collection
+    }
+
+    /// Get a mutable reference to the underlying collection
+    pub fn collection_mut(&mut self) -> &mut C {
+        &mut self.collection
+    }
+
+    /// Consume the join, and return the underlying collection.
+    pub fn into_collection(self) -> C {
+        self.collection
+    }
+
+    /// Consume `self` and return underlying collection and separator.
+    pub fn into_parts(self) -> (C, S) {
+        (self.collection, self.sep)
+    }
+}
+
+mod private {
+    use core::fmt;
+
+    /// This variant Display trait includes a lifetime bound, which is (for
+    /// some reason) required in order to make the trait bounds work when implementing
+    /// [`Display`] for [`Join`]. See https://stackoverflow.com/q/53364798/864406
+    /// for details.
+    pub trait Display<'a>: fmt::Display {}
+    impl<'a, T: fmt::Display> Display<'a> for T {}
+
+    #[cfg(feature = "token-stream")]
+    pub trait ToTokens<'a>: quote::ToTokens {}
+
+    #[cfg(feature = "token-stream")]
+    impl<'a, T: quote::ToTokens> ToTokens<'a> for T {}
+}
+
+impl<C, S: Display> Display for Join<C, S>
+where
+    for<'a> &'a C: IntoIterator,
+    for<'a> <&'a C as IntoIterator>::Item: private::Display<'a>,
+{
+    /// Format the joined collection, by writing out each element of the
+    /// collection, separated by the separator.
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        let mut iter = self.collection.into_iter();
+
+        match iter.next() {
+            None => Ok(()),
+            Some(first) => {
+                first.fmt(f)?;
+
+                iter.try_for_each(move |element| {
+                    self.sep.fmt(f)?;
+                    element.fmt(f)
+                })
+            }
+        }
+    }
+}
+
+impl<C: IntoIterator, S: Clone> IntoIterator for Join<C, S> {
+    type IntoIter = JoinIter<C::IntoIter, S>;
+    type Item = JoinItem<C::Item, S>;
+
+    /// Create a consuming iterator from a `Join`. This iterator consumes the
+    /// elements of the underlying collection, and intersperses them with clones
+    /// of the separator. See the [`JoinIter`] documentation for more details.
+    fn into_iter(self) -> Self::IntoIter {
+        self.collection.into_iter().iter_join_with(self.sep)
+    }
+}
+
+impl<'a, C, S> IntoIterator for &'a Join<C, S>
+where
+    &'a C: IntoIterator,
+{
+    type IntoIter = JoinIter<<&'a C as IntoIterator>::IntoIter, &'a S>;
+    type Item = JoinItem<<&'a C as IntoIterator>::Item, &'a S>;
+
+    /// Create a referential iterator over the join. This iterator iterates
+    /// over references to the underlying collection, interspersed with references
+    /// to the separator. See the [`JoinIter`] documentation for more details.
+    fn into_iter(self) -> Self::IntoIter {
+        self.collection.into_iter().iter_join_with(&self.sep)
+    }
+}
+
+#[cfg(feature = "token-stream")]
+impl<C, S> ToTokens for Join<C, S>
+where
+    for<'a> &'a C: IntoIterator,
+    for<'a> <&'a C as IntoIterator>::Item: private::ToTokens<'a>,
+    S: ToTokens,
+{
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let mut iter = self.collection.into_iter();
+        if let Some(first) = iter.next() {
+            first.to_tokens(tokens);
+
+            iter.for_each(move |item| {
+                self.sep.to_tokens(tokens);
+                item.to_tokens(tokens);
+            })
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::{Joinable, Separator};
+
+    #[test]
+    fn empty() {
+        let data: Vec<String> = Vec::new();
+        let join = data.join_with(", ");
+        let result = join.to_string();
+
+        assert_eq!(result, "");
+    }
+
+    #[test]
+    fn single() {
+        let data = vec!["Hello"];
+        let join = data.join_with(", ");
+        let result = join.to_string();
+
+        assert_eq!(result, "Hello");
+    }
+
+    #[test]
+    fn simple_join() {
+        let data = vec!["This", "is", "a", "sentence"];
+        let join = data.join_with(' ');
+        let result = join.to_string();
+
+        assert_eq!(result, "This is a sentence");
+    }
+
+    #[test]
+    fn join_via_separator() {
+        let data = vec!["This", "is", "a", "sentence"];
+        let join = ' '.separate(data);
+        let result = join.to_string();
+
+        assert_eq!(result, "This is a sentence");
+    }
+
+    #[test]
+    fn iter() {
+        use crate::iter::JoinItem;
+
+        let data = vec!["Hello", "World"];
+        let join = data.join_with(' ');
+        let mut iter = join.into_iter();
+
+        assert_eq!(iter.next(), Some(JoinItem::Element("Hello")));
+        assert_eq!(iter.next(), Some(JoinItem::Separator(' ')));
+        assert_eq!(iter.next(), Some(JoinItem::Element("World")));
+        assert_eq!(iter.next(), None);
+        assert_eq!(iter.next(), None);
+    }
+
+    #[test]
+    fn ref_iter() {
+        use crate::iter::JoinItem;
+
+        let data = vec!["Hello", "World"];
+        let join = data.join_with(' ');
+        let mut iter = (&join).into_iter();
+
+        assert_eq!(iter.next(), Some(JoinItem::Element(&"Hello")));
+        assert_eq!(iter.next(), Some(JoinItem::Separator(&' ')));
+        assert_eq!(iter.next(), Some(JoinItem::Element(&"World")));
+        assert_eq!(iter.next(), None);
+        assert_eq!(iter.next(), None);
+    }
+
+    #[cfg(feature = "token-stream")]
+    #[test]
+    fn to_tokens() {
+        use crate::separators::NoSeparator;
+        use quote::quote;
+
+        let functions = vec![
+            quote! {
+                fn test1() {}
+            },
+            quote! {
+                fn test2() {}
+            },
+        ];
+        let join = functions.join_with(NoSeparator);
+
+        let result = quote! { #join };
+        let target = quote! {
+            fn test1() {}
+            fn test2() {}
+        };
+
+        assert_eq!(result.to_string(), target.to_string());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,99 @@
+#![cfg_attr(not(test), no_std)]
+#![cfg_attr(feature = "nightly", feature(trusted_len))]
+
+//! Joinery provides generic joining of iterables with separators. While it is
+//! primarily designed the typical use case of writing to a [writer][core::fmt::Write]
+//! or creating a `String` by joining a list of data with some kind of string
+//! separator (such as `", "`),  it is fully generic and can be used to combine
+//! any iterator or collection with any separator. In this way it is intended
+//! to supercede the existing `SliceConcatExt::join` method, which only works
+//! on slices and can only join with a matching type.
+//!
+//! # Examples
+//!
+//! Create a comma separated list:
+//!
+//! ```
+//! use joinery::Joinable;
+//!
+//! let result = vec![1, 2, 3, 4].join_with(", ").to_string();
+//! assert_eq!(result, "1, 2, 3, 4")
+//! ```
+//!
+//! `write!` a comma-separated list:
+//!
+//! ```
+//! use joinery::Joinable;
+//! use std::fmt::Write;
+//!
+//! let join = vec![1, 2, 3, 4, 5].join_with(", ");
+//!
+//! let mut result = String::new();
+//!
+//! write!(&mut result, "Numbers: {}", join);
+//! assert_eq!(result, "Numbers: 1, 2, 3, 4, 5");
+//!
+//! // Note that joins are stateless; they can be reused after writing
+//! let result2 = join.to_string();
+//! assert_eq!(result2, "1, 2, 3, 4, 5");
+//! ```
+//!
+//! Join any iterator:
+//!
+//! ```
+//! use joinery::JoinableIterator;
+//!
+//! let join = (0..10)
+//!     .filter(|x| *x % 2 == 0)
+//!     .map(|x: i32| x.pow(2))
+//!     .join_with(", ");
+//!
+//! let result = join.to_string();
+//! assert_eq!(result, "0, 4, 16, 36, 64")
+//! ```
+//!
+//! Iterate over joins:
+//!
+//! ```
+//! use joinery::{Joinable, JoinItem};
+//!
+//! // Note that the collection values and the separator can be different types
+//! let join = ["some", "sample", "text"].join_with(' ');
+//! let mut join_iter = (&join).into_iter();
+//!
+//! assert_eq!(join_iter.next(), Some(JoinItem::Element(&"some")));
+//! assert_eq!(join_iter.next(), Some(JoinItem::Separator(&' ')));
+//! assert_eq!(join_iter.next(), Some(JoinItem::Element(&"sample")));
+//! assert_eq!(join_iter.next(), Some(JoinItem::Separator(&' ')));
+//! assert_eq!(join_iter.next(), Some(JoinItem::Element(&"text")));
+//! assert_eq!(join_iter.next(), None);
+//! ```
+//!
+//! Display the first 5 consecutive multiples of 1-5 on separate lines:
+//!
+//! ```
+//! use joinery::{Joinable, JoinableIterator};
+//! let multiples = 1..=5;
+//! let ranges = multiples.map(|m| (1..=5).map(move |n| n * m));
+//!
+//! let lines = ranges.map(|range| range.join_with(", "));
+//! let result = lines.join_with('\n').to_string();
+//! assert_eq!(result, "1, 2, 3, 4, 5\n\
+//!                     2, 4, 6, 8, 10\n\
+//!                     3, 6, 9, 12, 15\n\
+//!                     4, 8, 12, 16, 20\n\
+//!                     5, 10, 15, 20, 25");
+//! ```
+
+pub mod iter;
+pub mod join;
+pub mod separators;
+
+pub use crate::iter::{JoinItem, JoinIter, JoinableIterator};
+pub use crate::join::{Join, Joinable, Separator};
+
+/// The joinery prelude
+pub mod prelude {
+    pub use crate::iter::JoinableIterator;
+    pub use crate::join::Joinable;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/src/separators.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/src/separators.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/joinery/src/separators.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/joinery/src/separators.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,144 @@
+//! 0-size types for common separators
+//!
+//! This modules provides [`Display`](https://doc.rust-lang.org/std/fmt/trait.Display.html)-implementing
+//! types for common separators. These types are 0-size, with fixed `Display` implementations,
+//! intended to aid with compiler optimization.
+
+// NOTE: we hope that the compiler will detect that most operations on NoSeparator
+// are no-ops, and optimize heavily, because I'd rather not implement a separate
+// type for empty-separator-joins.
+
+use core::fmt::{self, Display, Formatter};
+
+#[cfg(feature = "token-stream")]
+use {quote::ToTokens, syn::Token};
+
+use crate::join::Separator;
+
+/// Zero-size type representing the empty separator.
+///
+/// This struct can be used as a separator in cases where you simply want to
+/// join the elements of a separator without any elements between them.
+///
+/// See also the [`join_concat`](crate::Joinable::join_concat) method.
+///
+/// # Examples
+///
+/// ```
+/// use joinery::JoinableIterator;
+/// use joinery::separators::NoSeparator;
+///
+/// let parts = (0..10);
+/// let join = parts.join_with(NoSeparator);
+/// assert_eq!(join.to_string(), "0123456789");
+/// ```
+///
+/// *New in 1.1.0*
+#[derive(Debug, Clone, Copy, Default)]
+#[must_use]
+pub struct NoSeparator;
+
+impl Display for NoSeparator {
+    #[inline(always)]
+    fn fmt(&self, _f: &mut Formatter) -> fmt::Result {
+        Ok(())
+    }
+}
+
+impl Separator for NoSeparator {}
+
+#[cfg(feature = "token-stream")]
+impl ToTokens for NoSeparator {
+    fn to_tokens(&self, _tokens: &mut proc_macro2::TokenStream) {}
+}
+
+#[cfg(test)]
+#[test]
+fn test_no_separator() {
+    use crate::join::Joinable;
+    use crate::separators::NoSeparator;
+
+    let data = [1, 2, 3, 4, 5];
+    let join = data.join_with(NoSeparator);
+    let result = join.to_string();
+
+    assert_eq!(result, "12345");
+}
+
+macro_rules! const_separator {
+    ($($Name:ident(sep: $sep:expr, repr: $repr:expr, test: $test_name:ident $(, token: $($token:tt)?)? ))+) => {$(
+        #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash)]
+        #[must_use]
+        #[doc = "Zero size type representing the "]
+        #[doc = $repr]
+        #[doc = " separator."]
+        pub struct $Name;
+
+        impl Display for $Name {
+            #[inline]
+            fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+                $sep.fmt(f)
+            }
+        }
+
+        impl Separator for $Name {}
+
+        $(
+            #[cfg(feature="token-stream")]
+            impl ToTokens for $Name {
+                fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+                    $(
+                        let punct: Token![$token] = Default::default();
+                        punct.to_tokens(tokens);
+                    )?
+                    let _tokens = tokens;
+                }
+            }
+        )?
+
+        #[cfg(test)]
+        mod $test_name {
+            use crate::separators::$Name;
+            use crate::join::Joinable;
+
+            #[test]
+            fn separator() {
+                let data = [1, 2, 3];
+                let join = data.join_with($Name);
+                let result = join.to_string();
+
+                assert_eq!(result, concat!(1, $sep, 2, $sep, 3));
+            }
+
+            $(
+                #[cfg(feature="token-stream")]
+                #[test]
+                fn to_tokens() {
+                    use quote::{ToTokens, quote};
+
+                    let data = [1, 2, 3];
+                    let join = data.join_with($Name);
+                    let result = join.into_token_stream();
+
+                    let target = quote! {
+                        1i32 $($token)? 2i32 $($token)? 3i32
+                    };
+
+                    assert_eq!(result.to_string(), target.to_string());
+                }
+            )?
+        }
+    )+}
+}
+
+const_separator! {
+    Newline(sep: '\n', repr: "newline", test: test_newline, token: )
+    Space(sep: ' ', repr:"space", test: test_space, token: )
+    Comma(sep: ',', repr: "`,`", test: test_comma, token: ,)
+    CommaSpace(sep: ", ", repr: "comma followed by space", test: test_comma_space, token: ,)
+    Dot(sep: '.', repr: "`.`", test: test_dot, token: .)
+    Slash(sep: '/', repr: "`/`", test: test_slash, token: /)
+    Underscore(sep: '_', repr: "`_`", test: test_underscore)
+    Dash(sep: '-', repr: "`-`", test: test_dash, token: -)
+    Tab(sep: '\t', repr: "tab", test: test_tab, token: )
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/js-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/js-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/js-sys/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/js-sys/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"3441ebc3918099baefa15652602bb1b2a06e1fc1de9d95e23079ef7b22832fdc","Cargo.toml":"4726426469e6c35f78a9db4c9b155731b1345b3b15225db221b5023053805540","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"de73c6d7a9d9eac0674770fde362175700676be0dfaee0b22d4c75fdc28b068e","src/lib.rs":"2df99a4d00e5e6689d9599fd598e0566535a1193b3e67f41e4a476f9000a0459","tests/headless.js":"dc0fdafb377cd6aa1415897083bbbf3d53c0ca39fc1691cc1f1fa7c528190491","tests/headless.rs":"f9eb68e88cc40fc81b7afad881fbdf2243d574f4417705226aa2102a71187e60","tests/wasm/Array.js":"f5797e6197f8bbb175cc155f7d22f4b43f3616055e35ec1fcbf6d83921c83622","tests/wasm/Array.rs":"0ce91eb42797305961c55fa2d43614a91dd7afa4a5165dd97c413ccdd5c51c20","tests/wasm/ArrayBuffer.rs":"a465e7cf7114e7466eb843f6612e22f00eb070dda15759bf8c62a1a3147a8c8d","tests/wasm/ArrayIterator.rs":"d849e50fbb8ebf6979e962c89210cf278176b15198c37f59cb15337e9c30ffa0","tests/wasm/Boolean.rs":"6091385e24f292a7e65809fa9cf3d328d8e65ad01fb976aef5daa2b5143224c3","tests/wasm/DataView.rs":"b1bea4a6235c406ca1df0e12daec95158c5fb663f3733a8cf986038770ae23a7","tests/wasm/Date.rs":"8e8cebf863eacbd07a73b4755e2c191a6cdb0c0e914eff31dbe8460c009d71a1","tests/wasm/Error.rs":"6d2a6a0db536727f05d8348e5510c694d7dc64df22f2089a86c90c6111cfa9c5","tests/wasm/EvalError.rs":"638641bdd06bb43cffee89d37cd39ee615fe98d44d4c8278756a798a6593111f","tests/wasm/Function.js":"6c5876f74cf2838823470c4c007089baa17e2b28e4f602b65a4b2bc67073b9d7","tests/wasm/Function.rs":"2ccfd94e301b569d70face86d31843d095380973673a811302fb67d8d58378fe","tests/wasm/Generator.js":"7be85b1acbc2de5c3d9d8d64a396baf8c5a5b111905759315b3b395a22ea49e2","tests/wasm/Generator.rs":"860e51ccd01a06076b713445a2eff27244f5b349211a322aa9e3e8df2e76c8ce","tests/wasm/Intl.rs":"7da28d28423f925e9de5270d5c0e7bc4382a587c3c72864d142e15c2e6c7dc30","tests/wasm/Iterator.js":"525d29257a508e0cfcf4aa01dddd522d1dda6f8f968f271802ebd703e6f347d6","tests/wasm/Iterator.rs":"b2ac023d150179c0c3cd54f27f9b2775f62ad519111dc233e9ebbad5e9983193","tests/wasm/JSON.rs":"bc78a06047550271e38fa412fcb1220e49208933af6e136d7f99294240807da4","tests/wasm/JsString.js":"931aedd837c316bd7e1e2d52142a92d663e36b79995e2dde6d91c9d762095c13","tests/wasm/JsString.rs":"9cd30fa8c39f5caa6288ec1c32ae8a983b681a827a7a49cfc6f375b98417cb0d","tests/wasm/Map.rs":"022b4c26387190e36726b493615f9852ce40ed0c86a97db85bcf06e9086925f2","tests/wasm/MapIterator.rs":"ed0405dbc9a74885fc3c3614d08d5b7c9da2ad14e4b8d3c5f392ad03e12c61cc","tests/wasm/Math.rs":"0604f28481ac122ee88a5198c2b4f234e3f25e266f73c8e455973d486bcf4768","tests/wasm/Number.js":"a0b161084686deee75588a01834dea2bc12fde317d96bd3a0b73c825db71180f","tests/wasm/Number.rs":"ec02a3c8a39b7148b685b9b7d8bb8dd99cc33640c7e105b133c9de53eee71e10","tests/wasm/Object.js":"a8ab74505388012de784b2f62f00a57058632e02a3e4bf70f33fa0e5332ff384","tests/wasm/Object.rs":"e1ac528f1882df5676003085e02651ad04c8d21e7e26446b9719088247c27a9c","tests/wasm/Promise.rs":"8c62a5c08cb43c60391f94e2d697d8925ba47069e19318a30fa64062ef372c8b","tests/wasm/Proxy.js":"63baac7050190339ed772fed09e4bd1845f34bcc36d7aa40ab2ecf93e9db786a","tests/wasm/Proxy.rs":"02d5ec8e5b781e12cdd96b38e643a4d0f6b725c0c904cc614bc83d829d501035","tests/wasm/RangeError.rs":"00a75d29880f53704c1ede81fb0f5c80efa8528a7c9f75b9f64d25234f74c3a4","tests/wasm/ReferenceError.rs":"47b60df993231f4631de2b9317bc1ac0a968976747f05d9b655dc61bcf2a58b4","tests/wasm/Reflect.js":"e5c43d410802ed45f38bffe60d0313dfcb978ac29a748258e889fbb3efa6d64a","tests/wasm/Reflect.rs":"f8bd8876b6bc1740652d51b6bad948eac7eb49541a08e2fe32a85043f9e0aa65","tests/wasm/RegExp.rs":"f91a9c838921832299185582900df6132dd5263fdcce4cc5342b6a1575d727b7","tests/wasm/Set.rs":"c22ca4651d472eedaadcfb03cfbb5c7d37f449cc073586db8ea97299f5d40b63","tests/wasm/SetIterator.rs":"0ad63f4852adcd91a40ffc1d95bb269e23bc338666acdc85a9516c492d5e1561","tests/wasm/SharedArrayBuffer.js":"6d30cec14dfc5890c8303cd1b81da235bce8a37d730232fc8b0d050f0e1db1b2","tests/wasm/SharedArrayBuffer.rs":"1cbf97431f693297d86de8477b3eb5c2f6e36111c0723d3de51ba9c677c5e289","tests/wasm/Symbol.js":"76c6c15f9fd34ffb7efddc90e898e12be074e9c98e066076a2b46f0554754de2","tests/wasm/Symbol.rs":"ae91d396b867bdfd9fd0c66b8863fb8e5c569886eeec98ae6cbd0ffad1a952a8","tests/wasm/SyntaxError.rs":"526ae9168f4979594e9d44f456e6b2816e38860ebf5937c2c905577aae5be7c0","tests/wasm/TypeError.rs":"618530b6556daad348106bd1c48c6dd808f54fe4efb344b15238db4ec3254d9f","tests/wasm/TypedArray.rs":"ee3bcae4c12e6aecb35bf1474b2ba3e27791e0827c59da9fcc11b9d25e9187a2","tests/wasm/UriError.rs":"2e695b4823e8875aa72c41aa6679e4d3f924adf47b763cb4462cf96ecdacfda6","tests/wasm/WeakMap.rs":"300bf589a0cfb0b0d3c3534222c949406bb3b9b408bc44cd54a72e3642987782","tests/wasm/WeakSet.rs":"321e780b427e4e4779c69839e6731840b1869d18ece0d71994ae1ef1fd804a8f","tests/wasm/WebAssembly.js":"5870c3811c8c17bab0b0e14c5ed62af987b8fa52382572a27cf704cded30f061","tests/wasm/WebAssembly.rs":"a95d2c3d1dd64f242032cbe7e861e7c0234b032a0cb388c09e197b6fdcd5b85f","tests/wasm/global_fns.rs":"34e12bfd548b8710297087920599d97e31971d142a8b0c4acb5712f71f1213d3","tests/wasm/main.rs":"d941a14b75616bbfc578c7066527427fc08ebd4886dccd37cdaedf23c33a6424"},"package":"cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"3441ebc3918099baefa15652602bb1b2a06e1fc1de9d95e23079ef7b22832fdc","Cargo.toml":"f3c4176d00e6f5944b1f11af6be7a5425b9729e41501a616c4249b719c48463f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"de73c6d7a9d9eac0674770fde362175700676be0dfaee0b22d4c75fdc28b068e","src/lib.rs":"1bdc6937e1972d1b66fd1c1c812b87bf8364f3e32f37491d0748aff864a65c0b","tests/headless.js":"dc0fdafb377cd6aa1415897083bbbf3d53c0ca39fc1691cc1f1fa7c528190491","tests/headless.rs":"f9eb68e88cc40fc81b7afad881fbdf2243d574f4417705226aa2102a71187e60","tests/wasm/Array.js":"f5797e6197f8bbb175cc155f7d22f4b43f3616055e35ec1fcbf6d83921c83622","tests/wasm/Array.rs":"0ce91eb42797305961c55fa2d43614a91dd7afa4a5165dd97c413ccdd5c51c20","tests/wasm/ArrayBuffer.rs":"a465e7cf7114e7466eb843f6612e22f00eb070dda15759bf8c62a1a3147a8c8d","tests/wasm/ArrayIterator.rs":"d849e50fbb8ebf6979e962c89210cf278176b15198c37f59cb15337e9c30ffa0","tests/wasm/Boolean.rs":"6091385e24f292a7e65809fa9cf3d328d8e65ad01fb976aef5daa2b5143224c3","tests/wasm/DataView.rs":"b1bea4a6235c406ca1df0e12daec95158c5fb663f3733a8cf986038770ae23a7","tests/wasm/Date.rs":"8e8cebf863eacbd07a73b4755e2c191a6cdb0c0e914eff31dbe8460c009d71a1","tests/wasm/Error.rs":"6d2a6a0db536727f05d8348e5510c694d7dc64df22f2089a86c90c6111cfa9c5","tests/wasm/EvalError.rs":"638641bdd06bb43cffee89d37cd39ee615fe98d44d4c8278756a798a6593111f","tests/wasm/Function.js":"6c5876f74cf2838823470c4c007089baa17e2b28e4f602b65a4b2bc67073b9d7","tests/wasm/Function.rs":"2ccfd94e301b569d70face86d31843d095380973673a811302fb67d8d58378fe","tests/wasm/Generator.js":"7be85b1acbc2de5c3d9d8d64a396baf8c5a5b111905759315b3b395a22ea49e2","tests/wasm/Generator.rs":"860e51ccd01a06076b713445a2eff27244f5b349211a322aa9e3e8df2e76c8ce","tests/wasm/Intl.rs":"7da28d28423f925e9de5270d5c0e7bc4382a587c3c72864d142e15c2e6c7dc30","tests/wasm/Iterator.js":"525d29257a508e0cfcf4aa01dddd522d1dda6f8f968f271802ebd703e6f347d6","tests/wasm/Iterator.rs":"b2ac023d150179c0c3cd54f27f9b2775f62ad519111dc233e9ebbad5e9983193","tests/wasm/JSON.rs":"bc78a06047550271e38fa412fcb1220e49208933af6e136d7f99294240807da4","tests/wasm/JsString.js":"931aedd837c316bd7e1e2d52142a92d663e36b79995e2dde6d91c9d762095c13","tests/wasm/JsString.rs":"9cd30fa8c39f5caa6288ec1c32ae8a983b681a827a7a49cfc6f375b98417cb0d","tests/wasm/Map.rs":"022b4c26387190e36726b493615f9852ce40ed0c86a97db85bcf06e9086925f2","tests/wasm/MapIterator.rs":"ed0405dbc9a74885fc3c3614d08d5b7c9da2ad14e4b8d3c5f392ad03e12c61cc","tests/wasm/Math.rs":"0604f28481ac122ee88a5198c2b4f234e3f25e266f73c8e455973d486bcf4768","tests/wasm/Number.js":"a0b161084686deee75588a01834dea2bc12fde317d96bd3a0b73c825db71180f","tests/wasm/Number.rs":"ec02a3c8a39b7148b685b9b7d8bb8dd99cc33640c7e105b133c9de53eee71e10","tests/wasm/Object.js":"a8ab74505388012de784b2f62f00a57058632e02a3e4bf70f33fa0e5332ff384","tests/wasm/Object.rs":"e1ac528f1882df5676003085e02651ad04c8d21e7e26446b9719088247c27a9c","tests/wasm/Promise.rs":"8c62a5c08cb43c60391f94e2d697d8925ba47069e19318a30fa64062ef372c8b","tests/wasm/Proxy.js":"63baac7050190339ed772fed09e4bd1845f34bcc36d7aa40ab2ecf93e9db786a","tests/wasm/Proxy.rs":"02d5ec8e5b781e12cdd96b38e643a4d0f6b725c0c904cc614bc83d829d501035","tests/wasm/RangeError.rs":"00a75d29880f53704c1ede81fb0f5c80efa8528a7c9f75b9f64d25234f74c3a4","tests/wasm/ReferenceError.rs":"47b60df993231f4631de2b9317bc1ac0a968976747f05d9b655dc61bcf2a58b4","tests/wasm/Reflect.js":"e5c43d410802ed45f38bffe60d0313dfcb978ac29a748258e889fbb3efa6d64a","tests/wasm/Reflect.rs":"f8bd8876b6bc1740652d51b6bad948eac7eb49541a08e2fe32a85043f9e0aa65","tests/wasm/RegExp.rs":"f91a9c838921832299185582900df6132dd5263fdcce4cc5342b6a1575d727b7","tests/wasm/Set.rs":"c22ca4651d472eedaadcfb03cfbb5c7d37f449cc073586db8ea97299f5d40b63","tests/wasm/SetIterator.rs":"0ad63f4852adcd91a40ffc1d95bb269e23bc338666acdc85a9516c492d5e1561","tests/wasm/SharedArrayBuffer.js":"6d30cec14dfc5890c8303cd1b81da235bce8a37d730232fc8b0d050f0e1db1b2","tests/wasm/SharedArrayBuffer.rs":"1cbf97431f693297d86de8477b3eb5c2f6e36111c0723d3de51ba9c677c5e289","tests/wasm/Symbol.js":"76c6c15f9fd34ffb7efddc90e898e12be074e9c98e066076a2b46f0554754de2","tests/wasm/Symbol.rs":"ae91d396b867bdfd9fd0c66b8863fb8e5c569886eeec98ae6cbd0ffad1a952a8","tests/wasm/SyntaxError.rs":"526ae9168f4979594e9d44f456e6b2816e38860ebf5937c2c905577aae5be7c0","tests/wasm/TypeError.rs":"618530b6556daad348106bd1c48c6dd808f54fe4efb344b15238db4ec3254d9f","tests/wasm/TypedArray.rs":"1da5c223b3902191af288392daa6a7b60e064fb8dead82d14f58d39bae152143","tests/wasm/UriError.rs":"2e695b4823e8875aa72c41aa6679e4d3f924adf47b763cb4462cf96ecdacfda6","tests/wasm/WeakMap.rs":"300bf589a0cfb0b0d3c3534222c949406bb3b9b408bc44cd54a72e3642987782","tests/wasm/WeakSet.rs":"321e780b427e4e4779c69839e6731840b1869d18ece0d71994ae1ef1fd804a8f","tests/wasm/WebAssembly.js":"5870c3811c8c17bab0b0e14c5ed62af987b8fa52382572a27cf704cded30f061","tests/wasm/WebAssembly.rs":"a95d2c3d1dd64f242032cbe7e861e7c0234b032a0cb388c09e197b6fdcd5b85f","tests/wasm/global_fns.rs":"34e12bfd548b8710297087920599d97e31971d142a8b0c4acb5712f71f1213d3","tests/wasm/main.rs":"d941a14b75616bbfc578c7066527427fc08ebd4886dccd37cdaedf23c33a6424"},"package":"e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/js-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/js-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/js-sys/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/js-sys/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "js-sys"
-version = "0.3.46"
+version = "0.3.53"
 authors = ["The wasm-bindgen Developers"]
 description = "Bindings for all JS global objects and functions in all JS environments like\nNode.js and browsers, built on `#[wasm_bindgen]` using the `wasm-bindgen` crate.\n"
 homepage = "https://rustwasm.github.io/wasm-bindgen/"
@@ -27,9 +27,9 @@
 test = false
 doctest = false
 [dependencies.wasm-bindgen]
-version = "0.2.69"
+version = "0.2.76"
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-futures]
-version = "0.4.19"
+version = "0.4.26"
 
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
-version = "=0.3.19"
+version = "=0.3.26"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/js-sys/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/js-sys/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/js-sys/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/js-sys/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,9 +18,11 @@
 
 #![doc(html_root_url = "https://docs.rs/js-sys/0.2")]
 
+use std::convert;
 use std::f64;
 use std::fmt;
 use std::mem;
+use std::str;
 
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
@@ -500,6 +502,12 @@
     }
 }
 
+impl Default for Array {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 // ArrayBuffer
 #[wasm_bindgen]
 extern "C" {
@@ -815,6 +823,12 @@
     }
 }
 
+impl Default for Boolean {
+    fn default() -> Self {
+        Self::from(bool::default())
+    }
+}
+
 // DataView
 #[wasm_bindgen]
 extern "C" {
@@ -1251,6 +1265,12 @@
     }
 }
 
+impl Default for Function {
+    fn default() -> Self {
+        Self::new_no_args("")
+    }
+}
+
 // Generator
 #[wasm_bindgen]
 extern "C" {
@@ -1348,6 +1368,12 @@
     pub fn size(this: &Map) -> u32;
 }
 
+impl Default for Map {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 // Map Iterator
 #[wasm_bindgen]
 extern "C" {
@@ -1980,6 +2006,12 @@
     }
 }
 
+impl Default for Number {
+    fn default() -> Self {
+        Self::from(f64::default())
+    }
+}
+
 // Date.
 #[wasm_bindgen]
 extern "C" {
@@ -2690,6 +2722,12 @@
 
 impl Eq for Object {}
 
+impl Default for Object {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 // Proxy
 #[wasm_bindgen]
 extern "C" {
@@ -3160,6 +3198,12 @@
     pub fn size(this: &Set) -> u32;
 }
 
+impl Default for Set {
+    fn default() -> Self {
+        Self::new(&JsValue::UNDEFINED)
+    }
+}
+
 // SetIterator
 #[wasm_bindgen]
 extern "C" {
@@ -3292,6 +3336,12 @@
     pub fn delete(this: &WeakMap, key: &Object) -> bool;
 }
 
+impl Default for WeakMap {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 // WeakSet
 #[wasm_bindgen]
 extern "C" {
@@ -3326,6 +3376,12 @@
     pub fn delete(this: &WeakSet, value: &Object) -> bool;
 }
 
+impl Default for WeakSet {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[allow(non_snake_case)]
 pub mod WebAssembly {
     use super::*;
@@ -3561,6 +3617,34 @@
         pub fn set(this: &Table, index: u32, function: &Function) -> Result<(), JsValue>;
     }
 
+    // WebAssembly.Global
+    #[wasm_bindgen]
+    extern "C" {
+        /// The `WebAssembly.Global()` constructor creates a new `Global` object
+        /// of the given type and value.
+        ///
+        /// [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global)
+        #[wasm_bindgen(js_namespace = WebAssembly, extends = Object, typescript_type = "WebAssembly.Global")]
+        #[derive(Clone, Debug, PartialEq, Eq)]
+        pub type Global;
+
+        /// The `WebAssembly.Global()` constructor creates a new `Global` object
+        /// of the given type and value.
+        ///
+        /// [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global)
+        #[wasm_bindgen(constructor, js_namespace = WebAssembly, catch)]
+        pub fn new(global_descriptor: &Object, value: &JsValue) -> Result<Global, JsValue>;
+
+        /// The value prototype property of the `WebAssembly.Global` object
+        /// returns the value of the global.
+        ///
+        /// [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global)
+        #[wasm_bindgen(method, getter, structural, js_namespace = WebAssembly)]
+        pub fn value(this: &Global) -> JsValue;
+        #[wasm_bindgen(method, setter = value, structural, js_namespace = WebAssembly)]
+        pub fn set_value(this: &Global, value: &JsValue);
+    }
+
     // WebAssembly.Memory
     #[wasm_bindgen]
     extern "C" {
@@ -4269,6 +4353,13 @@
     }
 }
 
+impl str::FromStr for JsString {
+    type Err = convert::Infallible;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(JsString::from(s))
+    }
+}
+
 // Symbol
 #[wasm_bindgen]
 extern "C" {
@@ -4465,6 +4556,15 @@
         pub fn supported_locales_of(locales: &Array, options: &Object) -> Array;
     }
 
+    impl Default for Collator {
+        fn default() -> Self {
+            Self::new(
+                &JsValue::UNDEFINED.unchecked_into(),
+                &JsValue::UNDEFINED.unchecked_into(),
+            )
+        }
+    }
+
     // Intl.DateTimeFormat
     #[wasm_bindgen]
     extern "C" {
@@ -4516,6 +4616,15 @@
         pub fn supported_locales_of(locales: &Array, options: &Object) -> Array;
     }
 
+    impl Default for DateTimeFormat {
+        fn default() -> Self {
+            Self::new(
+                &JsValue::UNDEFINED.unchecked_into(),
+                &JsValue::UNDEFINED.unchecked_into(),
+            )
+        }
+    }
+
     // Intl.NumberFormat
     #[wasm_bindgen]
     extern "C" {
@@ -4566,6 +4675,15 @@
         pub fn supported_locales_of(locales: &Array, options: &Object) -> Array;
     }
 
+    impl Default for NumberFormat {
+        fn default() -> Self {
+            Self::new(
+                &JsValue::UNDEFINED.unchecked_into(),
+                &JsValue::UNDEFINED.unchecked_into(),
+            )
+        }
+    }
+
     // Intl.PluralRules
     #[wasm_bindgen]
     extern "C" {
@@ -4607,6 +4725,15 @@
         #[wasm_bindgen(static_method_of = PluralRules, js_namespace = Intl, js_name = supportedLocalesOf)]
         pub fn supported_locales_of(locales: &Array, options: &Object) -> Array;
     }
+
+    impl Default for PluralRules {
+        fn default() -> Self {
+            Self::new(
+                &JsValue::UNDEFINED.unchecked_into(),
+                &JsValue::UNDEFINED.unchecked_into(),
+            )
+        }
+    }
 }
 
 // Promise
@@ -4963,11 +5090,23 @@
                 )
             }
 
-            fn raw_copy_to(&self, dst: &mut [$ty]) {
+
+            /// Copy the contents of this JS typed array into the destination
+            /// Rust pointer.
+            ///
+            /// This function will efficiently copy the memory from a typed
+            /// array into this wasm module's own linear memory, initializing
+            /// the memory destination provided.
+            ///
+            /// # Unsafety
+            ///
+            /// This function requires `dst` to point to a buffer
+            /// large enough to fit this array's contents.
+            pub unsafe fn raw_copy_to_ptr(&self, dst: *mut $ty) {
                 let buf = wasm_bindgen::memory();
                 let mem = buf.unchecked_ref::<WebAssembly::Memory>();
                 let all_wasm_memory = $name::new(&mem.buffer());
-                let offset = dst.as_ptr() as usize / mem::size_of::<$ty>();
+                let offset = dst as usize / mem::size_of::<$ty>();
                 all_wasm_memory.set(self, offset as u32);
             }
 
@@ -4984,13 +5123,32 @@
             /// different than the length of the provided `dst` array.
             pub fn copy_to(&self, dst: &mut [$ty]) {
                 assert_eq!(self.length() as usize, dst.len());
-                self.raw_copy_to(dst);
+                unsafe { self.raw_copy_to_ptr(dst.as_mut_ptr()); }
+            }
+
+            /// Copy the contents of the source Rust slice into this
+            /// JS typed array.
+            ///
+            /// This function will efficiently copy the memory from within
+            /// the wasm module's own linear memory to this typed array.
+            ///
+            /// # Panics
+            ///
+            /// This function will panic if this typed array's length is
+            /// different than the length of the provided `src` array.
+            pub fn copy_from(&self, src: &[$ty]) {
+                assert_eq!(self.length() as usize, src.len());
+                // This is safe because the `set` function copies from its TypedArray argument
+                unsafe { self.set(&$name::view(src), 0) }
             }
 
             /// Efficiently copies the contents of this JS typed array into a new Vec.
             pub fn to_vec(&self) -> Vec<$ty> {
-                let mut output = vec![$ty::default(); self.length() as usize];
-                self.raw_copy_to(&mut output);
+                let mut output = Vec::with_capacity(self.length() as usize);
+                unsafe {
+                    self.raw_copy_to_ptr(output.as_mut_ptr());
+                    output.set_len(self.length() as usize);
+                }
                 output
             }
         }
@@ -5002,6 +5160,12 @@
                 unsafe { $name::new(&$name::view(slice)) }
             }
         }
+
+        impl Default for $name {
+            fn default() -> Self {
+                Self::new(&JsValue::UNDEFINED.unchecked_into())
+            }
+        }
     )*);
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/js-sys/tests/wasm/TypedArray.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/js-sys/tests/wasm/TypedArray.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/js-sys/tests/wasm/TypedArray.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/js-sys/tests/wasm/TypedArray.rs	2021-12-09 12:01:26.000000000 +0000
@@ -146,6 +146,16 @@
 }
 
 #[wasm_bindgen_test]
+fn copy_from() {
+    let x = [1, 2, 3];
+    let array = Int32Array::new(&3.into());
+    array.copy_from(&x);
+    array.for_each(&mut |x, i, _| {
+        assert_eq!(x, (i + 1) as i32);
+    });
+}
+
+#[wasm_bindgen_test]
 fn to_vec() {
     let array = Int32Array::new(&10.into());
     array.fill(5, 0, 10);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-extern crate build;
-fn main() {
-    build::link("kernel32", false)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"79c920ca9323e28acd5f5a80f2ce0ab81aa6227584397a9f742e78dce36a2117","README.md":"00afb50f0a5a7d548e40feb1f09ce8fa678b46e04c9a72d909fa36fb85fb2200","build.rs":"89e77c6e9e79dcd782fd006431b948d093ec4aeda3b69a280ec857077b7f2020","src/lib.rs":"ab0a8a104a6f747f6389a70d26a62e156ab97cc7c8f4daf1de99b820024da993"},"package":"7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-[package]
-name = "kernel32-sys"
-version = "0.2.2"
-authors = ["Peter Atashian <retep998@gmail.com>"]
-description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants."
-documentation = "https://retep998.github.io/doc/kernel32/"
-repository = "https://github.com/retep998/winapi-rs"
-readme = "README.md"
-keywords = ["windows", "ffi", "win32"]
-license = "MIT"
-build = "build.rs"
-[lib]
-name = "kernel32"
-[dependencies]
-winapi = { version = "0.2.5", path = "../.." }
-[build-dependencies]
-winapi-build = { version = "0.1.1", path = "../../build" }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-# kernel32 #
-Contains function definitions for the Windows API library kernel32. See winapi for types and constants.
-
-```toml
-[dependencies]
-kernel32-sys = "0.2.1"
-```
-
-```rust
-extern crate kernel32;
-```
-
-[Documentation](https://retep998.github.io/doc/kernel32/)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/kernel32-sys/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/kernel32-sys/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2754 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! FFI bindings to kernel32.
-#![cfg(windows)]
-extern crate winapi;
-use winapi::*;
-extern "system" {
-    pub fn AcquireSRWLockExclusive(SRWLock: PSRWLOCK);
-    pub fn AcquireSRWLockShared(SRWLock: PSRWLOCK);
-    pub fn ActivateActCtx(hActCtx: HANDLE, lpCookie: *mut ULONG_PTR) -> BOOL;
-    pub fn AddAtomA(lpString: LPCSTR) -> ATOM;
-    pub fn AddAtomW(lpString: LPCWSTR) -> ATOM;
-    pub fn AddConsoleAliasA(Source: LPSTR, Target: LPSTR, ExeName: LPSTR) -> BOOL;
-    pub fn AddConsoleAliasW(Source: LPWSTR, Target: LPWSTR, ExeName: LPWSTR) -> BOOL;
-    pub fn AddDllDirectory(NewDirectory: PCWSTR) -> DLL_DIRECTORY_COOKIE;
-    pub fn AddIntegrityLabelToBoundaryDescriptor(
-        BoundaryDescriptor: *mut HANDLE, IntegrityLabel: PSID,
-    ) -> BOOL;
-    // pub fn AddLocalAlternateComputerNameA();
-    // pub fn AddLocalAlternateComputerNameW();
-    pub fn AddRefActCtx(hActCtx: HANDLE);
-    pub fn AddResourceAttributeAce(
-        pAcl: PACL, dwAceRevision: DWORD, AceFlags: DWORD, AccessMask: DWORD, pSid: PSID,
-        pAttributeInfo: PCLAIM_SECURITY_ATTRIBUTES_INFORMATION, pReturnLength: PDWORD,
-    ) -> BOOL;
-    pub fn AddSIDToBoundaryDescriptor(BoundaryDescriptor: *mut HANDLE, RequiredSid: PSID) -> BOOL;
-    pub fn AddScopedPolicyIDAce(
-        pAcl: PACL, dwAceRevision: DWORD, AceFlags: DWORD, AccessMask: DWORD, pSid: PSID,
-    ) -> BOOL;
-    pub fn AddSecureMemoryCacheCallback(pfnCallBack: PSECURE_MEMORY_CACHE_CALLBACK) -> BOOL;
-    pub fn AddVectoredContinueHandler(First: ULONG, Handler: PVECTORED_EXCEPTION_HANDLER) -> PVOID;
-    pub fn AddVectoredExceptionHandler(
-        First: ULONG, Handler: PVECTORED_EXCEPTION_HANDLER,
-    ) -> PVOID;
-    pub fn AllocConsole() -> BOOL;
-    pub fn AllocateUserPhysicalPages(
-        hProcess: HANDLE, NumberOfPages: PULONG_PTR, PageArray: PULONG_PTR,
-    ) -> BOOL;
-    pub fn AllocateUserPhysicalPagesNuma(
-        hProcess: HANDLE, NumberOfPages: PULONG_PTR, PageArray: PULONG_PTR, nndPreferred: DWORD,
-    ) -> BOOL;
-    // pub fn AppXGetOSMaxVersionTested();
-    pub fn ApplicationRecoveryFinished(bSuccess: BOOL);
-    pub fn ApplicationRecoveryInProgress(pbCancelled: PBOOL) -> HRESULT;
-    pub fn AreFileApisANSI() -> BOOL;
-    pub fn AssignProcessToJobObject(hJob: HANDLE, hProcess: HANDLE) -> BOOL;
-    pub fn AttachConsole(dwProcessId: DWORD) -> BOOL;
-    pub fn BackupRead(
-        hFile: HANDLE, lpBuffer: LPBYTE, nNumberOfBytesToRead: DWORD, lpNumberOfBytesRead: LPDWORD,
-        bAbort: BOOL, bProcessSecurity: BOOL, lpContext: *mut LPVOID,
-    ) -> BOOL;
-    pub fn BackupSeek(
-        hFile: HANDLE, dwLowBytesToSeek: DWORD, dwHighBytesToSeek: DWORD,
-        lpdwLowByteSeeked: LPDWORD, lpdwHighByteSeeked: LPDWORD, lpContext: *mut LPVOID,
-    ) -> BOOL;
-    pub fn BackupWrite(
-        hFile: HANDLE, lpBuffer: LPBYTE, nNumberOfBytesToWrite: DWORD,
-        lpNumberOfBytesWritten: LPDWORD, bAbort: BOOL, bProcessSecurity: BOOL,
-        lpContext: *mut LPVOID,
-    ) -> BOOL;
-    // pub fn BaseSetLastNTError();
-    pub fn Beep(dwFreq: DWORD, dwDuration: DWORD) -> BOOL;
-    pub fn BeginUpdateResourceA(pFileName: LPCSTR, bDeleteExistingResources: BOOL) -> HANDLE;
-    pub fn BeginUpdateResourceW(pFileName: LPCWSTR, bDeleteExistingResources: BOOL) -> HANDLE;
-    pub fn BindIoCompletionCallback(
-        FileHandle: HANDLE, Function: LPOVERLAPPED_COMPLETION_ROUTINE, Flags: ULONG,
-    ) -> BOOL;
-    pub fn BuildCommDCBA(lpDef: LPCSTR, lpDCB: LPDCB) -> BOOL;
-    pub fn BuildCommDCBAndTimeoutsA(
-        lpDef: LPCSTR, lpDCB: LPDCB, lpCommTimeouts: LPCOMMTIMEOUTS,
-    ) -> BOOL;
-    pub fn BuildCommDCBAndTimeoutsW(
-        lpDef: LPCWSTR, lpDCB: LPDCB, lpCommTimeouts: LPCOMMTIMEOUTS,
-    ) -> BOOL;
-    pub fn BuildCommDCBW(lpDef: LPCWSTR, lpDCB: LPDCB) -> BOOL;
-    pub fn CallNamedPipeA(
-        lpNamedPipeName: LPCSTR, lpInBuffer: LPVOID, nInBufferSize: DWORD, lpOutBuffer: LPVOID,
-        nOutBufferSize: DWORD, lpBytesRead: LPDWORD, nTimeOut: DWORD,
-    ) -> BOOL;
-    pub fn CallNamedPipeW(
-        lpNamedPipeName: LPCWSTR, lpInBuffer: LPVOID, nInBufferSize: DWORD, lpOutBuffer: LPVOID,
-        nOutBufferSize: DWORD, lpBytesRead: LPDWORD, nTimeOut: DWORD,
-    ) -> BOOL;
-    pub fn CallbackMayRunLong(pci: PTP_CALLBACK_INSTANCE) -> BOOL;
-    pub fn CalloutOnFiberStack(
-        lpFiber: PVOID, lpStartAddress: PFIBER_CALLOUT_ROUTINE, lpParameter: PVOID,
-    ) -> PVOID;
-    pub fn CancelDeviceWakeupRequest(hDevice: HANDLE) -> BOOL;
-    pub fn CancelIo(hFile: HANDLE) -> BOOL;
-    pub fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVERLAPPED) -> BOOL;
-    pub fn CancelSynchronousIo(hThread: HANDLE) -> BOOL;
-    pub fn CancelThreadpoolIo(pio: PTP_IO);
-    pub fn CancelTimerQueueTimer(TimerQueue: HANDLE, Timer: HANDLE) -> BOOL;
-    pub fn CancelWaitableTimer(hTimer: HANDLE) -> BOOL;
-    pub fn CeipIsOptedIn() -> BOOL;
-    pub fn ChangeTimerQueueTimer(
-        TimerQueue: HANDLE, Timer: HANDLE, DueTime: ULONG, Period: ULONG,
-    ) -> BOOL;
-    // pub fn CheckElevation();
-    // pub fn CheckElevationEnabled();
-    pub fn CheckNameLegalDOS8Dot3A(
-        lpName: LPCSTR, lpOemName: LPSTR, OemNameSize: DWORD, pbNameContainsSpaces: PBOOL,
-        pbNameLegal: PBOOL,
-    ) -> BOOL;
-    pub fn CheckNameLegalDOS8Dot3W(
-        lpName: LPCWSTR, lpOemName: LPSTR, OemNameSize: DWORD, pbNameContainsSpaces: PBOOL,
-        pbNameLegal: PBOOL,
-    ) -> BOOL;
-    pub fn CheckRemoteDebuggerPresent(hProcess: HANDLE, pbDebuggerPresent: PBOOL) -> BOOL;
-    pub fn CheckTokenCapability(
-        TokenHandle: HANDLE, CapabilitySidToCheck: PSID, HasCapability: PBOOL,
-    ) -> BOOL;
-    pub fn CheckTokenMembershipEx(
-        TokenHandle: HANDLE, SidToCheck: PSID, Flags: DWORD, IsMember: PBOOL,
-    ) -> BOOL;
-    pub fn ClearCommBreak(hFile: HANDLE) -> BOOL;
-    pub fn ClearCommError(hFile: HANDLE, lpErrors: LPDWORD, lpStat: LPCOMSTAT) -> BOOL;
-    pub fn CloseHandle(hObject: HANDLE) -> BOOL;
-    // pub fn ClosePackageInfo();
-    pub fn ClosePrivateNamespace(Handle: HANDLE, Flags: ULONG) -> BOOLEAN;
-    // pub fn CloseState();
-    pub fn CloseThreadpool(ptpp: PTP_POOL);
-    pub fn CloseThreadpoolCleanupGroup(ptpcg: PTP_CLEANUP_GROUP);
-    pub fn CloseThreadpoolCleanupGroupMembers(
-        ptpcg: PTP_CLEANUP_GROUP, fCancelPendingCallbacks: BOOL, pvCleanupContext: PVOID,
-    );
-    pub fn CloseThreadpoolIo(pio: PTP_IO);
-    pub fn CloseThreadpoolTimer(pti: PTP_TIMER);
-    pub fn CloseThreadpoolWait(pwa: PTP_WAIT);
-    pub fn CloseThreadpoolWork(pwk: PTP_WORK);
-    pub fn CommConfigDialogA(lpszName: LPCSTR, hWnd: HWND, lpCC: LPCOMMCONFIG) -> BOOL;
-    pub fn CommConfigDialogW(lpszName: LPCWSTR, hWnd: HWND, lpCC: LPCOMMCONFIG) -> BOOL;
-    pub fn CompareFileTime(lpFileTime1: *const FILETIME, lpFileTime2: *const FILETIME) -> LONG;
-    pub fn CompareStringA(
-        Locale: LCID, dwCmpFlags: DWORD, lpString1: PCNZCH, cchCount1: c_int, lpString2: PCNZCH,
-        cchCount2: c_int,
-    ) -> c_int;
-    pub fn CompareStringEx(
-        lpLocaleName: LPCWSTR, dwCmpFlags: DWORD, lpString1: LPCWCH, cchCount1: c_int,
-        lpString2: LPCWCH, cchCount2: c_int, lpVersionInformation: LPNLSVERSIONINFO,
-        lpReserved: LPVOID, lParam: LPARAM,
-    ) -> c_int;
-    pub fn CompareStringOrdinal(
-        lpString1: LPCWCH, cchCount1: c_int, lpString2: LPCWCH, cchCount2: c_int, bIgnoreCase: BOOL,
-    ) -> c_int;
-    pub fn CompareStringW(
-        Locale: LCID, dwCmpFlags: DWORD, lpString1: PCNZWCH, cchCount1: c_int, lpString2: PCNZWCH,
-        cchCount2: c_int,
-    ) -> c_int;
-    pub fn ConnectNamedPipe(hNamedPipe: HANDLE, lpOverlapped: LPOVERLAPPED) -> BOOL;
-    pub fn ContinueDebugEvent(
-        dwProcessId: DWORD, dwThreadId: DWORD, dwContinueStatus: DWORD,
-    ) -> BOOL;
-    pub fn ConvertDefaultLocale(Locale: LCID) -> LCID;
-    pub fn ConvertFiberToThread() -> BOOL;
-    pub fn ConvertThreadToFiber(lpParameter: LPVOID) -> LPVOID;
-    pub fn ConvertThreadToFiberEx(lpParameter: LPVOID, dwFlags: DWORD) -> LPVOID;
-    pub fn CopyContext(Destination: PCONTEXT, ContextFlags: DWORD, Source: PCONTEXT) -> BOOL;
-    pub fn CopyFile2(
-        pwszExistingFileName: PCWSTR, pwszNewFileName: PCWSTR,
-        pExtendedParameters: *mut COPYFILE2_EXTENDED_PARAMETERS,
-    ) -> HRESULT;
-    pub fn CopyFileA(
-        lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, bFailIfExists: BOOL
-    ) -> BOOL;
-    pub fn CopyFileExA(
-        lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, pbCancel: LPBOOL, dwCopyFlags: DWORD,
-    ) -> BOOL;
-    pub fn CopyFileExW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, pbCancel: LPBOOL, dwCopyFlags: DWORD,
-    ) -> BOOL;
-    pub fn CopyFileTransactedA(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, pbCancel: LPBOOL, dwCopyFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CopyFileTransactedW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, pbCancel: LPBOOL, dwCopyFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CopyFileW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, bFailIfExists: BOOL
-    ) -> BOOL;
-    pub fn CreateActCtxA(pActCtx: PCACTCTXA) -> HANDLE;
-    pub fn CreateActCtxW(pActCtx: PCACTCTXW) -> HANDLE;
-    pub fn CreateBoundaryDescriptorA(Name: LPCSTR, Flags: ULONG) -> HANDLE;
-    pub fn CreateBoundaryDescriptorW(Name: LPCWSTR, Flags: ULONG) -> HANDLE;
-    pub fn CreateConsoleScreenBuffer(
-        dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: *const SECURITY_ATTRIBUTES, dwFlags: DWORD,
-        lpScreenBufferData: LPVOID,
-    ) -> HANDLE;
-    pub fn CreateDirectoryA(
-        lpPathName: LPCSTR, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateDirectoryExA(
-        lpTemplateDirectory: LPCSTR, lpNewDirectory: LPCSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateDirectoryExW(
-        lpTemplateDirectory: LPCWSTR, lpNewDirectory: LPCWSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateDirectoryTransactedA(
-        lpTemplateDirectory: LPCSTR, lpNewDirectory: LPCSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CreateDirectoryTransactedW(
-        lpTemplateDirectory: LPCWSTR, lpNewDirectory: LPCWSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CreateDirectoryW(
-        lpPathName: LPCWSTR, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateEventA(
-        lpEventAttributes: LPSECURITY_ATTRIBUTES, bManualReset: BOOL, bInitialState: BOOL,
-        lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateEventW(
-        lpEventAttributes: LPSECURITY_ATTRIBUTES, bManualReset: BOOL, bInitialState: BOOL,
-        lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateEventExA(
-        lpEventAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateEventExW(
-        lpEventAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCWSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateFiber(
-        dwStackSize: SIZE_T, lpStartAddress: LPFIBER_START_ROUTINE, lpParameter: LPVOID,
-    ) -> LPVOID;
-    pub fn CreateFiberEx(
-        dwStackCommitSize: SIZE_T, dwStackReserveSize: SIZE_T, dwFlags: DWORD,
-        lpStartAddress: LPFIBER_START_ROUTINE, lpParameter: LPVOID,
-    ) -> LPVOID;
-    pub fn CreateFile2(
-        lpFileName: LPCWSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        dwCreationDisposition: DWORD, pCreateExParams: LPCREATEFILE2_EXTENDED_PARAMETERS,
-    ) -> HANDLE;
-    pub fn CreateFileA(
-        lpFileName: LPCSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
-        dwFlagsAndAttributes: DWORD, hTemplateFile: HANDLE,
-    ) -> HANDLE;
-    pub fn CreateFileMappingA(
-        hFile: HANDLE, lpAttributes: LPSECURITY_ATTRIBUTES, flProtect: DWORD,
-        dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateFileMappingFromApp(
-        hFile: HANDLE, SecurityAttributes: PSECURITY_ATTRIBUTES, PageProtection: ULONG,
-        MaximumSize: ULONG64, Name: PCWSTR,
-    ) -> HANDLE;
-    pub fn CreateFileMappingNumaA(
-        hFile: HANDLE, lpFileMappingAttributes: LPSECURITY_ATTRIBUTES, flProtect: DWORD,
-        dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, lpName: LPCSTR, nndPreferred: DWORD,
-    ) -> HANDLE;
-    pub fn CreateFileMappingNumaW(
-        hFile: HANDLE, lpFileMappingAttributes: LPSECURITY_ATTRIBUTES, flProtect: DWORD,
-        dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, lpName: LPCWSTR, nndPreferred: DWORD,
-    ) -> HANDLE;
-    pub fn CreateFileMappingW(
-        hFile: HANDLE, lpAttributes: LPSECURITY_ATTRIBUTES, flProtect: DWORD,
-        dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateFileTransactedA(
-        lpFileName: LPCSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
-        dwFlagsAndAttributes: DWORD, hTemplateFile: HANDLE, hTransaction: HANDLE,
-        pusMiniVersion: PUSHORT, lpExtendedParameter: PVOID,
-    ) -> HANDLE;
-    pub fn CreateFileTransactedW(
-        lpFileName: LPCWSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
-        dwFlagsAndAttributes: DWORD, hTemplateFile: HANDLE, hTransaction: HANDLE,
-        pusMiniVersion: PUSHORT, lpExtendedParameter: PVOID,
-    ) -> HANDLE;
-    pub fn CreateFileW(
-        lpFileName: LPCWSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
-        dwFlagsAndAttributes: DWORD, hTemplateFile: HANDLE,
-    ) -> HANDLE;
-    pub fn CreateHardLinkA(
-        lpFileName: LPCSTR, lpExistingFileName: LPCSTR, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateHardLinkTransactedA(
-        lpFileName: LPCSTR, lpExistingFileName: LPCSTR, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-        hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CreateHardLinkTransactedW(
-        lpFileName: LPCWSTR, lpExistingFileName: LPCWSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, hTransaction: HANDLE,
-    );
-    pub fn CreateHardLinkW(
-        lpFileName: LPCWSTR, lpExistingFileName: LPCWSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateIoCompletionPort(
-        FileHandle: HANDLE, ExistingCompletionPort: HANDLE, CompletionKey: ULONG_PTR,
-        NumberOfConcurrentThreads: DWORD,
-    ) -> HANDLE;
-    pub fn CreateJobObjectA(lpJobAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCSTR) -> HANDLE;
-    pub fn CreateJobObjectW(lpJobAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCWSTR) -> HANDLE;
-    pub fn CreateJobSet(NumJob: ULONG, UserJobSet: PJOB_SET_ARRAY, Flags: ULONG) -> BOOL;
-    pub fn CreateMailslotA(
-        lpName: LPCSTR, nMaxMessageSize: DWORD, lReadTimeout: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> HANDLE;
-    pub fn CreateMailslotW(
-        lpName: LPCWSTR, nMaxMessageSize: DWORD, lReadTimeout: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> HANDLE;
-    pub fn CreateMemoryResourceNotification(
-        NotificationType: MEMORY_RESOURCE_NOTIFICATION_TYPE,
-    ) -> HANDLE;
-    pub fn CreateMutexA(
-        lpMutexAttributes: LPSECURITY_ATTRIBUTES, bInitialOwner: BOOL, lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateMutexExA(
-        lpMutexAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateMutexExW(
-        lpMutexAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCWSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateMutexW(
-        lpMutexAttributes: LPSECURITY_ATTRIBUTES, bInitialOwner: BOOL, lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateNamedPipeA(
-        lpName: LPCSTR, dwOpenMode: DWORD, dwPipeMode: DWORD, nMaxInstances: DWORD,
-        nOutBufferSize: DWORD, nInBufferSize: DWORD, nDefaultTimeOut: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> HANDLE;
-    pub fn CreateNamedPipeW(
-        lpName: LPCWSTR, dwOpenMode: DWORD, dwPipeMode: DWORD, nMaxInstances: DWORD,
-        nOutBufferSize: DWORD, nInBufferSize: DWORD, nDefaultTimeOut: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> HANDLE;
-    pub fn CreatePipe(
-        hReadPipe: PHANDLE, hWritePipe: PHANDLE, lpPipeAttributes: LPSECURITY_ATTRIBUTES,
-        nSize: DWORD,
-    ) -> BOOL;
-    pub fn CreatePrivateNamespaceA(
-        lpPrivateNamespaceAttributes: LPSECURITY_ATTRIBUTES, lpBoundaryDescriptor: LPVOID,
-        lpAliasPrefix: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreatePrivateNamespaceW(
-        lpPrivateNamespaceAttributes: LPSECURITY_ATTRIBUTES, lpBoundaryDescriptor: LPVOID,
-        lpAliasPrefix: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateProcessA(
-        lpApplicationName: LPCSTR, lpCommandLine: LPSTR, lpProcessAttributes: LPSECURITY_ATTRIBUTES,
-        lpThreadAttributes: LPSECURITY_ATTRIBUTES, bInheritHandles: BOOL, dwCreationFlags: DWORD,
-        lpEnvironment: LPVOID, lpCurrentDirectory: LPCSTR, lpStartupInfo: LPSTARTUPINFOA,
-        lpProcessInformation: LPPROCESS_INFORMATION,
-    ) -> BOOL;
-    pub fn CreateProcessW(
-        lpApplicationName: LPCWSTR, lpCommandLine: LPWSTR,
-        lpProcessAttributes: LPSECURITY_ATTRIBUTES, lpThreadAttributes: LPSECURITY_ATTRIBUTES,
-        bInheritHandles: BOOL, dwCreationFlags: DWORD, lpEnvironment: LPVOID,
-        lpCurrentDirectory: LPCWSTR, lpStartupInfo: LPSTARTUPINFOW,
-        lpProcessInformation: LPPROCESS_INFORMATION,
-    ) -> BOOL;
-    pub fn CreateRemoteThread(
-        hProcess: HANDLE, lpThreadAttributes: LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T,
-        lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: LPVOID, dwCreationFlags: DWORD,
-        lpThreadId: LPDWORD,
-    ) -> HANDLE;
-    pub fn CreateRemoteThreadEx(
-        hProcess: HANDLE, lpThreadAttributes: LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T,
-        lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: LPVOID, dwCreationFlags: DWORD,
-        lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST, lpThreadId: LPDWORD,
-    ) -> HANDLE;
-    pub fn CreateSemaphoreA(
-        lpSemaphoreAttributes: LPSECURITY_ATTRIBUTES, lInitialCount: LONG, lMaximumCount: LONG,
-        lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateSemaphoreExA(
-        lpSemaphoreAttributes: LPSECURITY_ATTRIBUTES, lInitialCount: LONG, lMaximumCount: LONG,
-        lpName: LPCSTR, dwFlags: DWORD, dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateSemaphoreExW(
-        lpSemaphoreAttributes: LPSECURITY_ATTRIBUTES, lInitialCount: LONG, lMaximumCount: LONG,
-        lpName: LPCWSTR, dwFlags: DWORD, dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateSemaphoreW(
-        lpSemaphoreAttributes: LPSECURITY_ATTRIBUTES, lInitialCount: LONG, lMaximumCount: LONG,
-        lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateSymbolicLinkA(
-        lpSymlinkFileName: LPCSTR, lpTargetFileName: LPCSTR, dwFlags: DWORD,
-    ) -> BOOLEAN;
-    pub fn CreateSymbolicLinkTransactedA(
-        lpSymlinkFileName: LPCSTR, lpTargetFileName: LPCSTR, dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOLEAN;
-    pub fn CreateSymbolicLinkTransactedW(
-        lpSymlinkFileName: LPCWSTR, lpTargetFileName: LPCWSTR, dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOLEAN;
-    pub fn CreateSymbolicLinkW(
-        lpSymlinkFileName: LPCWSTR, lpTargetFileName: LPCWSTR, dwFlags: DWORD,
-    ) -> BOOLEAN;
-    pub fn CreateTapePartition(
-        hDevice: HANDLE, dwPartitionMethod: DWORD, dwCount: DWORD, dwSize: DWORD,
-    ) -> DWORD;
-    pub fn CreateThread(
-        lpThreadAttributes: LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T,
-        lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: LPVOID, dwCreationFlags: DWORD,
-        lpThreadId: LPDWORD,
-    ) -> HANDLE;
-    pub fn CreateThreadpool(reserved: PVOID) -> PTP_POOL;
-    pub fn CreateThreadpoolCleanupGroup() -> PTP_CLEANUP_GROUP;
-    pub fn CreateThreadpoolIo(
-        fl: HANDLE, pfnio: PTP_WIN32_IO_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> PTP_IO;
-    pub fn CreateThreadpoolTimer(
-        pfnti: PTP_TIMER_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> PTP_TIMER;
-    pub fn CreateThreadpoolWait(
-        pfnwa: PTP_WAIT_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> PTP_WAIT;
-    pub fn CreateThreadpoolWork(
-        pfnwk: PTP_WORK_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> PTP_WORK;
-    pub fn CreateTimerQueue() -> HANDLE;
-    pub fn CreateTimerQueueTimer(
-        phNewTimer: PHANDLE, TimerQueue: HANDLE, Callback: WAITORTIMERCALLBACK, Parameter: PVOID,
-        DueTime: DWORD, Period: DWORD, Flags: ULONG,
-    ) -> BOOL;
-    pub fn CreateToolhelp32Snapshot(dwFlags: DWORD, th32ProcessID: DWORD) -> HANDLE;
-    #[cfg(target_arch = "x86_64")]
-    pub fn CreateUmsCompletionList(UmsCompletionList: *mut PUMS_COMPLETION_LIST) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn CreateUmsThreadContext(lpUmsThread: *mut PUMS_CONTEXT) -> BOOL;
-    pub fn CreateWaitableTimerA(
-        lpTimerAttributes: LPSECURITY_ATTRIBUTES, bManualReset: BOOL, lpTimerName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateWaitableTimerExA(
-        lpTimerAttributes: LPSECURITY_ATTRIBUTES, lpTimerName: LPCSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateWaitableTimerExW(
-        lpTimerAttributes: LPSECURITY_ATTRIBUTES, lpTimerName: LPCWSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateWaitableTimerW(
-        lpTimerAttributes: LPSECURITY_ATTRIBUTES, bManualReset: BOOL, lpTimerName: LPCWSTR,
-    ) -> HANDLE;
-    // pub fn CtrlRoutine();
-    pub fn DeactivateActCtx(dwFlags: DWORD, ulCookie: ULONG_PTR) -> BOOL;
-    pub fn DebugActiveProcess(dwProcessId: DWORD) -> BOOL;
-    pub fn DebugActiveProcessStop(dwProcessId: DWORD) -> BOOL;
-    pub fn DebugBreak();
-    pub fn DebugBreakProcess(Process: HANDLE) -> BOOL;
-    pub fn DebugSetProcessKillOnExit(KillOnExit: BOOL) -> BOOL;
-    pub fn DecodePointer(Ptr: PVOID) -> PVOID;
-    pub fn DecodeSystemPointer(Ptr: PVOID) -> PVOID;
-    pub fn DefineDosDeviceA(dwFlags: DWORD, lpDeviceName: LPCSTR, lpTargetPath: LPCSTR) -> BOOL;
-    pub fn DefineDosDeviceW(dwFlags: DWORD, lpDeviceName: LPCWSTR, lpTargetPath: LPCWSTR) -> BOOL;
-    pub fn DelayLoadFailureHook(pszDllName: LPCSTR, pszProcName: LPCSTR) -> FARPROC;
-    pub fn DeleteAtom(nAtom: ATOM) -> ATOM;
-    pub fn DeleteBoundaryDescriptor(BoundaryDescriptor: HANDLE);
-    pub fn DeleteCriticalSection(lpCriticalSection: LPCRITICAL_SECTION);
-    pub fn DeleteFiber(lpFiber: LPVOID);
-    pub fn DeleteFileA(lpFileName: LPCSTR) -> BOOL;
-    pub fn DeleteFileTransactedA(lpFileName: LPCSTR, hTransaction: HANDLE) -> BOOL;
-    pub fn DeleteFileTransactedW(lpFileName: LPCWSTR, hTransaction: HANDLE) -> BOOL;
-    pub fn DeleteFileW(lpFileName: LPCWSTR) -> BOOL;
-    pub fn DeleteProcThreadAttributeList(lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST);
-    pub fn DeleteSynchronizationBarrier(lpBarrier: LPSYNCHRONIZATION_BARRIER) -> BOOL;
-    pub fn DeleteTimerQueue(TimerQueue: HANDLE) -> BOOL;
-    pub fn DeleteTimerQueueEx(TimerQueue: HANDLE, CompletionEvent: HANDLE) -> BOOL;
-    pub fn DeleteTimerQueueTimer(
-        TimerQueue: HANDLE, Timer: HANDLE, CompletionEvent: HANDLE,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn DeleteUmsCompletionList(UmsCompletionList: PUMS_COMPLETION_LIST) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn DeleteUmsThreadContext(UmsThread: PUMS_CONTEXT) -> BOOL;
-    pub fn DeleteVolumeMountPointA(lpszVolumeMountPoint: LPCSTR) -> BOOL;
-    pub fn DeleteVolumeMountPointW(lpszVolumeMountPoint: LPCWSTR) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn DequeueUmsCompletionListItems(
-        UmsCompletionList: PUMS_COMPLETION_LIST, WaitTimeOut: DWORD,
-        UmsThreadList: *mut PUMS_CONTEXT,
-    ) -> BOOL;
-    pub fn DeviceIoControl(
-        hDevice: HANDLE, dwIoControlCode: DWORD, lpInBuffer: LPVOID, nInBufferSize: DWORD,
-        lpOutBuffer: LPVOID, nOutBufferSize: DWORD, lpBytesReturned: LPDWORD,
-        lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn DisableThreadLibraryCalls(hLibModule: HMODULE) -> BOOL;
-    pub fn DisableThreadProfiling(PerformanceDataHandle: HANDLE) -> DWORD;
-    pub fn DisassociateCurrentThreadFromCallback(pci: PTP_CALLBACK_INSTANCE);
-    pub fn DisconnectNamedPipe(hNamedPipe: HANDLE) -> BOOL;
-    pub fn DnsHostnameToComputerNameA(
-        Hostname: LPCSTR, ComputerName: LPCSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn DnsHostnameToComputerNameExW(
-        Hostname: LPCWSTR, ComputerName: LPWSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn DnsHostnameToComputerNameW(
-        Hostname: LPCWSTR, ComputerName: LPWSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn DosDateTimeToFileTime(wFatDate: WORD, wFatTime: WORD, lpFileTime: LPFILETIME) -> BOOL;
-    // pub fn DosPathToSessionPathW();
-    pub fn DuplicateHandle(
-        hSourceProcessHandle: HANDLE, hSourceHandle: HANDLE, hTargetProcessHandle: HANDLE,
-        lpTargetHandle: LPHANDLE, dwDesiredAccess: DWORD, bInheritHandle: BOOL, dwOptions: DWORD,
-    ) -> BOOL;
-    pub fn EnableThreadProfiling(
-        ThreadHandle: HANDLE, Flags: DWORD, HardwareCounters: DWORD64,
-        PerformanceDataHandle: *mut HANDLE,
-    ) -> BOOL;
-    pub fn EncodePointer(Ptr: PVOID) -> PVOID;
-    pub fn EncodeSystemPointer(Ptr: PVOID) -> PVOID;
-    pub fn EndUpdateResourceA(hUpdate: HANDLE, fDiscard: BOOL) -> BOOL;
-    pub fn EndUpdateResourceW(hUpdate: HANDLE, fDiscard: BOOL) -> BOOL;
-    pub fn EnterCriticalSection(lpCriticalSection: LPCRITICAL_SECTION);
-    pub fn EnterSynchronizationBarrier(
-        lpBarrier: LPSYNCHRONIZATION_BARRIER, dwFlags: DWORD,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn EnterUmsSchedulingMode(SchedulerStartupInfo: PUMS_SCHEDULER_STARTUP_INFO) -> BOOL;
-    pub fn EnumCalendarInfoA(
-        lpCalInfoEnumProc: CALINFO_ENUMPROCA, Locale: LCID, Calendar: CALID, CalType: CALTYPE,
-    ) -> BOOL;
-    pub fn EnumCalendarInfoExA(
-        lpCalInfoEnumProcEx: CALINFO_ENUMPROCEXA, Locale: LCID, Calendar: CALID, CalType: CALTYPE,
-    ) -> BOOL;
-    pub fn EnumCalendarInfoExEx(
-        pCalInfoEnumProcExEx: CALINFO_ENUMPROCEXEX, lpLocaleName: LPCWSTR, Calendar: CALID,
-        lpReserved: LPCWSTR, CalType: CALTYPE, lParam: LPARAM,
-    ) -> BOOL;
-    pub fn EnumCalendarInfoExW(
-        lpCalInfoEnumProcEx: CALINFO_ENUMPROCEXW, Locale: LCID, Calendar: CALID, CalType: CALTYPE,
-    ) -> BOOL;
-    pub fn EnumCalendarInfoW(
-        lpCalInfoEnumProc: CALINFO_ENUMPROCW, Locale: LCID, Calendar: CALID, CalType: CALTYPE,
-    ) -> BOOL;
-    pub fn EnumDateFormatsA(
-        lpDateFmtEnumProc: DATEFMT_ENUMPROCA, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumDateFormatsExA(
-        lpDateFmtEnumProcEx: DATEFMT_ENUMPROCEXA, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumDateFormatsExEx(
-        lpDateFmtEnumProcExEx: DATEFMT_ENUMPROCEXEX, lpLocaleName: LPCWSTR, dwFlags: DWORD,
-        lParam: LPARAM,
-    ) -> BOOL;
-    pub fn EnumDateFormatsExW(
-        lpDateFmtEnumProcEx: DATEFMT_ENUMPROCEXW, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumDateFormatsW(
-        lpDateFmtEnumProc: DATEFMT_ENUMPROCW, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumLanguageGroupLocalesA(
-        lpLangGroupLocaleEnumProc: LANGGROUPLOCALE_ENUMPROCA, LanguageGroup: LGRPID, dwFlags: DWORD,
-        lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumLanguageGroupLocalesW(
-        lpLangGroupLocaleEnumProc: LANGGROUPLOCALE_ENUMPROCW, LanguageGroup: LGRPID, dwFlags: DWORD,
-        lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceLanguagesA(
-        hModule: HMODULE, lpType: LPCSTR, lpName: LPCSTR, lpEnumFunc: ENUMRESLANGPROCA,
-        lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceLanguagesExA(
-        hModule: HMODULE, lpType: LPCSTR, lpName: LPCSTR, lpEnumFunc: ENUMRESLANGPROCA,
-        lParam: LONG_PTR, dwFlags: DWORD, LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceLanguagesExW(
-        hModule: HMODULE, lpType: LPCWSTR, lpName: LPCWSTR, lpEnumFunc: ENUMRESLANGPROCW,
-        lParam: LONG_PTR, dwFlags: DWORD, LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceLanguagesW(
-        hModule: HMODULE, lpType: LPCWSTR, lpName: LPCWSTR, lpEnumFunc: ENUMRESLANGPROCW,
-        lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceNamesA(
-        hModule: HMODULE, lpType: LPCSTR, lpEnumFunc: ENUMRESNAMEPROCA, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceNamesExA(
-        hModule: HMODULE, lpType: LPCSTR, lpEnumFunc: ENUMRESNAMEPROCA, lParam: LONG_PTR,
-        dwFlags: DWORD, LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceNamesExW(
-        hModule: HMODULE, lpType: LPCWSTR, lpEnumFunc: ENUMRESNAMEPROCW, lParam: LONG_PTR,
-        dwFlags: DWORD, LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceNamesW(
-        hModule: HMODULE, lpType: LPCWSTR, lpEnumFunc: ENUMRESNAMEPROCW, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceTypesA(
-        hModule: HMODULE, lpEnumFunc: ENUMRESTYPEPROCA, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceTypesExA(
-        hModule: HMODULE, lpEnumFunc: ENUMRESTYPEPROCA, lParam: LONG_PTR, dwFlags: DWORD,
-        LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceTypesExW(
-        hModule: HMODULE, lpEnumFunc: ENUMRESTYPEPROCW, lParam: LONG_PTR, dwFlags: DWORD,
-        LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceTypesW(
-        hModule: HMODULE, lpEnumFunc: ENUMRESTYPEPROCW, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumSystemCodePagesA(lpCodePageEnumProc: CODEPAGE_ENUMPROCA, dwFlags: DWORD) -> BOOL;
-    pub fn EnumSystemCodePagesW(lpCodePageEnumProc: CODEPAGE_ENUMPROCW, dwFlags: DWORD) -> BOOL;
-    pub fn EnumSystemFirmwareTables(
-        FirmwareTableProviderSignature: DWORD, pFirmwareTableEnumBuffer: PVOID, BufferSize: DWORD,
-    ) -> UINT;
-    pub fn EnumSystemGeoID(
-        GeoClass: GEOCLASS, ParentGeoId: GEOID, lpGeoEnumProc: GEO_ENUMPROC,
-    ) -> BOOL;
-    pub fn EnumSystemLanguageGroupsA(
-        lpLanguageGroupEnumProc: LANGUAGEGROUP_ENUMPROCA, dwFlags: DWORD, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumSystemLanguageGroupsW(
-        lpLanguageGroupEnumProc: LANGUAGEGROUP_ENUMPROCW, dwFlags: DWORD, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumSystemLocalesA(lpLocaleEnumProc: LOCALE_ENUMPROCA, dwFlags: DWORD) -> BOOL;
-    pub fn EnumSystemLocalesEx(
-        lpLocaleEnumProcEx: LOCALE_ENUMPROCEX, dwFlags: DWORD, lParam: LPARAM, lpReserved: LPVOID,
-    ) -> BOOL;
-    pub fn EnumSystemLocalesW(lpLocaleEnumProc: LOCALE_ENUMPROCW, dwFlags: DWORD) -> BOOL;
-    pub fn EnumTimeFormatsA(
-        lpTimeFmtEnumProc: TIMEFMT_ENUMPROCA, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumTimeFormatsEx(
-        lpTimeFmtEnumProcEx: TIMEFMT_ENUMPROCEX, lpLocaleName: LPCWSTR, dwFlags: DWORD,
-        lParam: LPARAM,
-    ) -> BOOL;
-    pub fn EnumTimeFormatsW(
-        lpTimeFmtEnumProc: TIMEFMT_ENUMPROCW, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumUILanguagesA(
-        lpUILanguageEnumProc: UILANGUAGE_ENUMPROCA, dwFlags: DWORD, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumUILanguagesW(
-        lpUILanguageEnumProc: UILANGUAGE_ENUMPROCW, dwFlags: DWORD, lParam: LONG_PTR,
-    ) -> BOOL;
-    // pub fn EnumerateLocalComputerNamesA();
-    // pub fn EnumerateLocalComputerNamesW();
-    pub fn EraseTape(hDevice: HANDLE, dwEraseType: DWORD, bImmediate: BOOL) -> DWORD;
-    pub fn EscapeCommFunction(hFile: HANDLE, dwFunc: DWORD) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn ExecuteUmsThread(UmsThread: PUMS_CONTEXT) -> BOOL;
-    pub fn ExitProcess(uExitCode: UINT);
-    pub fn ExitThread(dwExitCode: DWORD);
-    pub fn ExpandEnvironmentStringsA(lpSrc: LPCSTR, lpDst: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn ExpandEnvironmentStringsW(lpSrc: LPCWSTR, lpDst: LPWSTR, nSize: DWORD) -> DWORD;
-    pub fn FatalAppExitA(uAction: UINT, lpMessageText: LPCSTR);
-    pub fn FatalAppExitW(uAction: UINT, lpMessageText: LPCWSTR);
-    pub fn FatalExit(ExitCode: c_int);
-    pub fn FileTimeToDosDateTime(
-        lpFileTime: *const FILETIME, lpFatDate: LPWORD, lpFatTime: LPWORD,
-    ) -> BOOL;
-    pub fn FileTimeToLocalFileTime(
-        lpFileTime: *const FILETIME, lpLocalFileTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn FileTimeToSystemTime(
-        lpFileTime: *const FILETIME, lpSystemTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    pub fn FillConsoleOutputAttribute(
-        hConsoleOutput: HANDLE, wAttribute: WORD, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfAttrsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn FillConsoleOutputCharacterA(
-        hConsoleOutput: HANDLE, cCharacter: CHAR, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfCharsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn FillConsoleOutputCharacterW(
-        hConsoleOutput: HANDLE, cCharacter: WCHAR, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfCharsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn FindActCtxSectionGuid(
-        dwFlags: DWORD, lpExtensionGuid: *const GUID, ulSectionId: ULONG, lpGuidToFind: *const GUID,
-        ReturnedData: PACTCTX_SECTION_KEYED_DATA,
-    ) -> BOOL;
-    pub fn FindActCtxSectionStringA(
-        dwFlags: DWORD, lpExtensionGuid: *const GUID, ulSectionId: ULONG, lpStringToFind: LPCSTR,
-        ReturnedData: PACTCTX_SECTION_KEYED_DATA,
-    ) -> BOOL;
-    pub fn FindActCtxSectionStringW(
-        dwFlags: DWORD, lpExtensionGuid: *const GUID, ulSectionId: ULONG, lpStringToFind: LPCWSTR,
-        ReturnedData: PACTCTX_SECTION_KEYED_DATA,
-    ) -> BOOL;
-    pub fn FindAtomA(lpString: LPCSTR) -> ATOM;
-    pub fn FindAtomW(lpString: LPCWSTR) -> ATOM;
-    pub fn FindClose(hFindFile: HANDLE) -> BOOL;
-    pub fn FindCloseChangeNotification(hChangeHandle: HANDLE) -> BOOL;
-    pub fn FindFirstChangeNotificationA(
-        lpPathName: LPCSTR, bWatchSubtree: BOOL, dwNotifyFilter: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstChangeNotificationW(
-        lpPathName: LPCWSTR, bWatchSubtree: BOOL, dwNotifyFilter: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstFileA(lpFileName: LPCSTR, lpFindFileData: LPWIN32_FIND_DATAA) -> HANDLE;
-    pub fn FindFirstFileExA(
-        lpFileName: LPCSTR, fInfoLevelId: FINDEX_INFO_LEVELS, lpFindFileData: LPVOID,
-        fSearchOp: FINDEX_SEARCH_OPS, lpSearchFilter: LPVOID, dwAdditionalFlags: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstFileExW(
-        lpFileName: LPCWSTR, fInfoLevelId: FINDEX_INFO_LEVELS, lpFindFileData: LPVOID,
-        fSearchOp: FINDEX_SEARCH_OPS, lpSearchFilter: LPVOID, dwAdditionalFlags: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstFileNameTransactedW(
-        lpFileName: LPCWSTR, dwFlags: DWORD, StringLength: LPDWORD, LinkName: PWSTR,
-        hTransaction: HANDLE,
-    ) -> HANDLE;
-    pub fn FindFirstFileNameW(
-        lpFileName: LPCWSTR, dwFlags: DWORD, StringLength: LPDWORD, LinkName: PWSTR,
-    ) -> HANDLE;
-    pub fn FindFirstFileTransactedA(
-        lpFileName: LPCSTR, fInfoLevelId: FINDEX_INFO_LEVELS, lpFindFileData: LPVOID,
-        fSearchOp: FINDEX_SEARCH_OPS, lpSearchFilter: LPVOID, dwAdditionalFlags: DWORD,
-        hTransaction: HANDLE,
-    ) -> HANDLE;
-    pub fn FindFirstFileTransactedW(
-        lpFileName: LPCWSTR, fInfoLevelId: FINDEX_INFO_LEVELS, lpFindFileData: LPVOID,
-        fSearchOp: FINDEX_SEARCH_OPS, lpSearchFilter: LPVOID, dwAdditionalFlags: DWORD,
-        hTransaction: HANDLE,
-    ) -> HANDLE;
-    pub fn FindFirstFileW(lpFileName: LPCWSTR, lpFindFileData: LPWIN32_FIND_DATAW) -> HANDLE;
-    pub fn FindFirstStreamTransactedW(
-        lpFileName: LPCWSTR, InfoLevel: STREAM_INFO_LEVELS, lpFindStreamData: LPVOID,
-        dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> HANDLE;
-    pub fn FindFirstStreamW(
-        lpFileName: LPCWSTR, InfoLevel: STREAM_INFO_LEVELS, lpFindStreamData: LPVOID,
-        dwFlags: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstVolumeA(lpszVolumeName: LPSTR, cchBufferLength: DWORD) -> HANDLE;
-    pub fn FindFirstVolumeMountPointA(
-        lpszRootPathName: LPCSTR, lpszVolumeMountPoint: LPSTR, cchBufferLength: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstVolumeMountPointW(
-        lpszRootPathName: LPCWSTR, lpszVolumeMountPoint: LPWSTR, cchBufferLength: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstVolumeW(lpszVolumeName: LPWSTR, cchBufferLength: DWORD) -> HANDLE;
-    pub fn FindNLSString(
-        Locale: LCID, dwFindNLSStringFlags: DWORD, lpStringSource: LPCWSTR, cchSource: c_int,
-        lpStringValue: LPCWSTR, cchValue: c_int, pcchFound: LPINT,
-    ) -> c_int;
-    pub fn FindNLSStringEx(
-        lpLocaleName: LPCWSTR, dwFindNLSStringFlags: DWORD, lpStringSource: LPCWSTR,
-        cchSource: c_int, lpStringValue: LPCWSTR, cchValue: c_int, pcchFound: LPINT,
-        lpVersionInformation: LPNLSVERSIONINFO, lpReserved: LPVOID, sortHandle: LPARAM,
-    ) -> c_int;
-    pub fn FindNextChangeNotification(hChangeHandle: HANDLE) -> BOOL;
-    pub fn FindNextFileA(hFindFile: HANDLE, lpFindFileData: LPWIN32_FIND_DATAA) -> BOOL;
-    pub fn FindNextFileNameW(hFindStream: HANDLE, StringLength: LPDWORD, LinkName: PWSTR) -> BOOL;
-    pub fn FindNextFileW(hFindFile: HANDLE, lpFindFileData: LPWIN32_FIND_DATAW) -> BOOL;
-    pub fn FindNextStreamW(hFindStream: HANDLE, lpFindStreamData: LPVOID) -> BOOL;
-    pub fn FindNextVolumeA(
-        hFindVolume: HANDLE, lpszVolumeName: LPSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn FindNextVolumeMountPointA(
-        hFindVolumeMountPoint: HANDLE, lpszVolumeMountPoint: LPSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn FindNextVolumeMountPointW(
-        hFindVolumeMountPoint: HANDLE, lpszVolumeMountPoint: LPWSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn FindNextVolumeW(
-        hFindVolume: HANDLE, lpszVolumeName: LPWSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    // pub fn FindPackagesByPackageFamily();
-    pub fn FindResourceA(hModule: HMODULE, lpName: LPCSTR, lpType: LPCSTR) -> HRSRC;
-    pub fn FindResourceExA(
-        hModule: HMODULE, lpName: LPCSTR, lpType: LPCSTR, wLanguage: WORD,
-    ) -> HRSRC;
-    pub fn FindResourceExW(
-        hModule: HMODULE, lpName: LPCWSTR, lpType: LPCWSTR, wLanguage: WORD,
-    ) -> HRSRC;
-    pub fn FindResourceW(hModule: HMODULE, lpName: LPCWSTR, lpType: LPCWSTR) -> HRSRC;
-    pub fn FindStringOrdinal(
-        dwFindStringOrdinalFlags: DWORD, lpStringSource: LPCWSTR, cchSource: c_int,
-        lpStringValue: LPCWSTR, cchValue: c_int, bIgnoreCase: BOOL,
-    ) -> c_int;
-    pub fn FindVolumeClose(hFindVolume: HANDLE) -> BOOL;
-    pub fn FindVolumeMountPointClose(hFindVolumeMountPoint: HANDLE) -> BOOL;
-    pub fn FlsAlloc(lpCallback: PFLS_CALLBACK_FUNCTION) -> DWORD;
-    pub fn FlsFree(dwFlsIndex: DWORD) -> BOOL;
-    pub fn FlsGetValue(dwFlsIndex: DWORD) -> PVOID;
-    pub fn FlsSetValue(dwFlsIndex: DWORD, lpFlsData: PVOID) -> BOOL;
-    pub fn FlushConsoleInputBuffer(hConsoleInput: HANDLE) -> BOOL;
-    pub fn FlushFileBuffers(hFile: HANDLE) -> BOOL;
-    pub fn FlushInstructionCache(hProcess: HANDLE, lpBaseAddress: LPCVOID, dwSize: SIZE_T) -> BOOL;
-    pub fn FlushProcessWriteBuffers();
-    pub fn FlushViewOfFile(lpBaseAddress: LPCVOID, dwNumberOfBytesToFlush: SIZE_T) -> BOOL;
-    pub fn FoldStringA(
-        dwMapFlags: DWORD, lpSrcStr: LPCSTR, cchSrc: c_int, lpDestStr: LPSTR, cchDest: c_int,
-    ) -> c_int;
-    pub fn FoldStringW(
-        dwMapFlags: DWORD, lpSrcStr: LPCWCH, cchSrc: c_int, lpDestStr: LPWSTR, cchDest: c_int,
-    ) -> c_int;
-    // pub fn FormatApplicationUserModelId();
-    pub fn FormatMessageA(
-        dwFlags: DWORD, lpSource: LPCVOID, dwMessageId: DWORD, dwLanguageId: DWORD,
-        lpBuffer: LPSTR, nSize: DWORD, Arguments: *mut va_list,
-    ) -> DWORD;
-    pub fn FormatMessageW(
-        dwFlags: DWORD, lpSource: LPCVOID, dwMessageId: DWORD, dwLanguageId: DWORD,
-        lpBuffer: LPWSTR, nSize: DWORD, Arguments: *mut va_list,
-    ) -> DWORD;
-    pub fn FreeConsole() -> BOOL;
-    pub fn FreeEnvironmentStringsA(penv: LPCH) -> BOOL;
-    pub fn FreeEnvironmentStringsW(penv: LPWCH) -> BOOL;
-    pub fn FreeLibrary(hLibModule: HMODULE) -> BOOL;
-    pub fn FreeLibraryAndExitThread(hLibModule: HMODULE, dwExitCode: DWORD);
-    pub fn FreeLibraryWhenCallbackReturns(pci: PTP_CALLBACK_INSTANCE, module: HMODULE);
-    pub fn FreeResource(hResData: HGLOBAL) -> BOOL;
-    pub fn FreeUserPhysicalPages(
-        hProcess: HANDLE, NumberOfPages: PULONG_PTR, PageArray: PULONG_PTR,
-    ) -> BOOL;
-    pub fn GenerateConsoleCtrlEvent(dwCtrlEvent: DWORD, dwProcessGroupId: DWORD) -> BOOL;
-    pub fn GetACP() -> UINT;
-    pub fn GetActiveProcessorCount(GroupNumber: WORD) -> DWORD;
-    pub fn GetActiveProcessorGroupCount() -> WORD;
-    pub fn GetAppContainerAce(
-        Acl: PACL, StartingAceIndex: DWORD, AppContainerAce: *mut PVOID,
-        AppContainerAceIndex: *mut DWORD,
-    ) -> BOOL;
-    pub fn GetAppContainerNamedObjectPath(
-        Token: HANDLE, AppContainerSid: PSID, ObjectPathLength: ULONG, ObjectPath: LPWSTR,
-        ReturnLength: PULONG,
-    ) -> BOOL;
-    pub fn GetApplicationRecoveryCallback(
-        hProcess: HANDLE, pRecoveryCallback: *mut APPLICATION_RECOVERY_CALLBACK,
-        ppvParameter: *mut PVOID, pdwPingInterval: PDWORD, pdwFlags: PDWORD,
-    ) -> HRESULT;
-    pub fn GetApplicationRestartSettings(
-        hProcess: HANDLE, pwzCommandline: PWSTR, pcchSize: PDWORD, pdwFlags: PDWORD,
-    ) -> HRESULT;
-    // pub fn GetApplicationUserModelId();
-    pub fn GetAtomNameA(nAtom: ATOM, lpBuffer: LPSTR, nSize: c_int) -> UINT;
-    pub fn GetAtomNameW(nAtom: ATOM, lpBuffer: LPWSTR, nSize: c_int) -> UINT;
-    pub fn GetBinaryTypeA(lpApplicationName: LPCSTR, lpBinaryType: LPDWORD) -> BOOL;
-    pub fn GetBinaryTypeW(lpApplicationName: LPCWSTR, lpBinaryType: LPDWORD) -> BOOL;
-    pub fn GetCPInfo(CodePage: UINT, lpCPInfo: LPCPINFO) -> BOOL;
-    pub fn GetCPInfoExA(CodePage: UINT, dwFlags: DWORD, lpCPInfoEx: LPCPINFOEXA) -> BOOL;
-    pub fn GetCPInfoExW(CodePage: UINT, dwFlags: DWORD, lpCPInfoEx: LPCPINFOEXW) -> BOOL;
-    pub fn GetCachedSigningLevel(
-        File: HANDLE, Flags: PULONG, SigningLevel: PULONG, Thumbprint: PUCHAR,
-        ThumbprintSize: PULONG, ThumbprintAlgorithm: PULONG,
-    ) -> BOOL;
-    pub fn GetCalendarInfoA(
-        Locale: LCID, Calendar: CALID, CalType: CALTYPE, lpCalData: LPSTR, cchData: c_int,
-        lpValue: LPDWORD,
-    ) -> c_int;
-    pub fn GetCalendarInfoEx(
-        lpLocaleName: LPCWSTR, Calendar: CALID, lpReserved: LPCWSTR, CalType: CALTYPE,
-        lpCalData: LPWSTR, cchData: c_int, lpValue: LPDWORD,
-    ) -> c_int;
-    pub fn GetCalendarInfoW(
-        Locale: LCID, Calendar: CALID, CalType: CALTYPE, lpCalData: LPWSTR, cchData: c_int,
-        lpValue: LPDWORD,
-    ) -> c_int;
-    pub fn GetCommConfig(hCommDev: HANDLE, lpCC: LPCOMMCONFIG, lpdwSize: LPDWORD) -> BOOL;
-    pub fn GetCommMask(hFile: HANDLE, lpEvtMask: LPDWORD) -> BOOL;
-    pub fn GetCommModemStatus(hFile: HANDLE, lpModemStat: LPDWORD) -> BOOL;
-    pub fn GetCommProperties(hFile: HANDLE, lpCommProp: LPCOMMPROP) -> BOOL;
-    pub fn GetCommState(hFile: HANDLE, lpDCB: LPDCB) -> BOOL;
-    pub fn GetCommTimeouts(hFile: HANDLE, lpCommTimeouts: LPCOMMTIMEOUTS) -> BOOL;
-    pub fn GetCommandLineA() -> LPSTR;
-    pub fn GetCommandLineW() -> LPWSTR;
-    pub fn GetCompressedFileSizeA(lpFileName: LPCSTR, lpFileSizeHigh: LPDWORD) -> DWORD;
-    pub fn GetCompressedFileSizeTransactedA(
-        lpFileName: LPCSTR, lpFileSizeHigh: LPDWORD, hTransaction: HANDLE,
-    ) -> DWORD;
-    pub fn GetCompressedFileSizeTransactedW(
-        lpFileName: LPCWSTR, lpFileSizeHigh: LPDWORD, hTransaction: HANDLE,
-    );
-    pub fn GetCompressedFileSizeW(lpFileName: LPCWSTR, lpFileSizeHigh: LPDWORD) -> DWORD;
-    pub fn GetComputerNameA(lpBuffer: LPSTR, nSize: LPDWORD) -> BOOL;
-    pub fn GetComputerNameExA(
-        NameType: COMPUTER_NAME_FORMAT, lpBuffer: LPSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn GetComputerNameExW(
-        NameType: COMPUTER_NAME_FORMAT, lpBuffer: LPWSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn GetComputerNameW(lpBuffer: LPWSTR, nSize: LPDWORD) -> BOOL;
-    pub fn GetConsoleAliasA(
-        Source: LPSTR, TargetBuffer: LPSTR, TargetBufferLength: DWORD, ExeName: LPSTR,
-    ) -> DWORD;
-    pub fn GetConsoleAliasExesA(ExeNameBuffer: LPSTR, ExeNameBufferLength: DWORD) -> DWORD;
-    pub fn GetConsoleAliasExesLengthA() -> DWORD;
-    pub fn GetConsoleAliasExesLengthW() -> DWORD;
-    pub fn GetConsoleAliasExesW(ExeNameBuffer: LPWSTR, ExeNameBufferLength: DWORD) -> DWORD;
-    pub fn GetConsoleAliasW(
-        Source: LPWSTR, TargetBuffer: LPWSTR, TargetBufferLength: DWORD, ExeName: LPWSTR,
-    ) -> DWORD;
-    pub fn GetConsoleAliasesA(
-        AliasBuffer: LPSTR, AliasBufferLength: DWORD, ExeName: LPSTR,
-    ) -> DWORD;
-    pub fn GetConsoleAliasesLengthA(ExeName: LPSTR) -> DWORD;
-    pub fn GetConsoleAliasesLengthW(ExeName: LPWSTR) -> DWORD;
-    pub fn GetConsoleAliasesW(
-        AliasBuffer: LPWSTR, AliasBufferLength: DWORD, ExeName: LPWSTR,
-    ) -> DWORD;
-    pub fn GetConsoleCP() -> UINT;
-    pub fn GetConsoleCursorInfo(
-        hConsoleOutput: HANDLE, lpConsoleCursorInfo: PCONSOLE_CURSOR_INFO,
-    ) -> BOOL;
-    pub fn GetConsoleDisplayMode(lpModeFlags: LPDWORD) -> BOOL;
-    pub fn GetConsoleFontSize(hConsoleOutput: HANDLE, nFont: DWORD) -> COORD;
-    pub fn GetConsoleHistoryInfo(lpConsoleHistoryInfo: PCONSOLE_HISTORY_INFO) -> BOOL;
-    pub fn GetConsoleMode(hConsoleHandle: HANDLE, lpMode: LPDWORD) -> BOOL;
-    pub fn GetConsoleOriginalTitleA(lpConsoleTitle: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn GetConsoleOriginalTitleW(lpConsoleTitle: LPWSTR, nSize: DWORD) -> DWORD;
-    pub fn GetConsoleOutputCP() -> UINT;
-    pub fn GetConsoleProcessList(lpdwProcessList: LPDWORD, dwProcessCount: DWORD) -> DWORD;
-    pub fn GetConsoleScreenBufferInfo(
-        hConsoleOutput: HANDLE, lpConsoleScreenBufferInfo: PCONSOLE_SCREEN_BUFFER_INFO,
-    ) -> BOOL;
-    pub fn GetConsoleScreenBufferInfoEx(
-        hConsoleOutput: HANDLE, lpConsoleScreenBufferInfoEx: PCONSOLE_SCREEN_BUFFER_INFOEX,
-    ) -> BOOL;
-    pub fn GetConsoleSelectionInfo(lpConsoleSelectionInfo: PCONSOLE_SELECTION_INFO) -> BOOL;
-    pub fn GetConsoleTitleA(lpConsoleTitle: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn GetConsoleTitleW(lpConsoleTitle: LPWSTR, nSize: DWORD) -> DWORD;
-    pub fn GetConsoleWindow() -> HWND;
-    pub fn GetCurrencyFormatA(
-        Locale: LCID, dwFlags: DWORD, lpValue: LPCSTR, lpFormat: *const CURRENCYFMTA,
-        lpCurrencyStr: LPSTR, cchCurrency: c_int,
-    ) -> c_int;
-    pub fn GetCurrencyFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpValue: LPCWSTR, lpFormat: *const CURRENCYFMTW,
-        lpCurrencyStr: LPWSTR, cchCurrency: c_int,
-    ) -> c_int;
-    pub fn GetCurrencyFormatW(
-        Locale: LCID, dwFlags: DWORD, lpValue: LPCWSTR, lpFormat: *const CURRENCYFMTW,
-        lpCurrencyStr: LPWSTR, cchCurrency: c_int,
-    ) -> c_int;
-    pub fn GetCurrentActCtx(lphActCtx: *mut HANDLE) -> BOOL;
-    // pub fn GetCurrentApplicationUserModelId();
-    pub fn GetCurrentConsoleFont(
-        hConsoleOutput: HANDLE, bMaximumWindow: BOOL, lpConsoleCurrentFont: PCONSOLE_FONT_INFO,
-    ) -> BOOL;
-    pub fn GetCurrentConsoleFontEx(
-        hConsoleOutput: HANDLE, bMaximumWindow: BOOL, lpConsoleCurrentFontEx: PCONSOLE_FONT_INFOEX,
-    ) -> BOOL;
-    pub fn GetCurrentDirectoryA(nBufferLength: DWORD, lpBuffer: LPSTR) -> DWORD;
-    pub fn GetCurrentDirectoryW(nBufferLength: DWORD, lpBuffer: LPWSTR) -> DWORD;
-    // pub fn GetCurrentPackageFamilyName();
-    // pub fn GetCurrentPackageFullName();
-    // pub fn GetCurrentPackageId();
-    // pub fn GetCurrentPackageInfo();
-    // pub fn GetCurrentPackagePath();
-    pub fn GetCurrentProcess() -> HANDLE;
-    pub fn GetCurrentProcessId() -> DWORD;
-    pub fn GetCurrentProcessorNumber() -> DWORD;
-    pub fn GetCurrentProcessorNumberEx(ProcNumber: PPROCESSOR_NUMBER);
-    pub fn GetCurrentThread() -> HANDLE;
-    pub fn GetCurrentThreadId() -> DWORD;
-    pub fn GetCurrentThreadStackLimits(LowLimit: PULONG_PTR, HighLimit: PULONG_PTR);
-    #[cfg(target_arch = "x86_64")]
-    pub fn GetCurrentUmsThread() -> PUMS_CONTEXT;
-    pub fn GetDateFormatA(
-        Locale: LCID, dwFlags: DWORD, lpDate: *const SYSTEMTIME, lpFormat: LPCSTR, lpDateStr: LPSTR,
-        cchDate: c_int,
-    ) -> c_int;
-    pub fn GetDateFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpDate: *const SYSTEMTIME, lpFormat: LPCWSTR,
-        lpDateStr: LPWSTR, cchDate: c_int, lpCalendar: LPCWSTR,
-    ) -> c_int;
-    pub fn GetDateFormatW(
-        Locale: LCID, dwFlags: DWORD, lpDate: *const SYSTEMTIME, lpFormat: LPCWSTR,
-        lpDateStr: LPWSTR, cchDate: c_int,
-    ) -> c_int;
-    pub fn GetDefaultCommConfigA(lpszName: LPCSTR, lpCC: LPCOMMCONFIG, lpdwSize: LPDWORD) -> BOOL;
-    pub fn GetDefaultCommConfigW(lpszName: LPCWSTR, lpCC: LPCOMMCONFIG, lpdwSize: LPDWORD) -> BOOL;
-    pub fn GetDevicePowerState(hDevice: HANDLE, pfOn: *mut BOOL) -> BOOL;
-    pub fn GetDiskFreeSpaceA(
-        lpRootPathName: LPCSTR, lpSectorsPerCluster: LPDWORD, lpBytesPerSector: LPDWORD,
-        lpNumberOfFreeClusters: LPDWORD, lpTotalNumberOfClusters: LPDWORD,
-    ) -> BOOL;
-    pub fn GetDiskFreeSpaceExA(
-        lpDirectoryName: LPCSTR, lpFreeBytesAvailableToCaller: PULARGE_INTEGER,
-        lpTotalNumberOfBytes: PULARGE_INTEGER, lpTotalNumberOfFreeBytes: PULARGE_INTEGER,
-    ) -> BOOL;
-    pub fn GetDiskFreeSpaceExW(
-        lpDirectoryName: LPCWSTR, lpFreeBytesAvailableToCaller: PULARGE_INTEGER,
-        lpTotalNumberOfBytes: PULARGE_INTEGER, lpTotalNumberOfFreeBytes: PULARGE_INTEGER,
-    ) -> BOOL;
-    pub fn GetDiskFreeSpaceW(
-        lpRootPathName: LPCWSTR, lpSectorsPerCluster: LPDWORD, lpBytesPerSector: LPDWORD,
-        lpNumberOfFreeClusters: LPDWORD, lpTotalNumberOfClusters: LPDWORD,
-    ) -> BOOL;
-    pub fn GetDllDirectoryA(nBufferLength: DWORD, lpBuffer: LPSTR) -> DWORD;
-    pub fn GetDllDirectoryW(nBufferLength: DWORD, lpBuffer: LPWSTR) -> DWORD;
-    pub fn GetDriveTypeA(lpRootPathName: LPCSTR) -> UINT;
-    pub fn GetDriveTypeW(lpRootPathName: LPCWSTR) -> UINT;
-    pub fn GetDurationFormat(
-        Locale: LCID, dwFlags: DWORD, lpDuration: *const SYSTEMTIME, ullDuration: ULONGLONG,
-        lpFormat: LPCWSTR, lpDurationStr: LPWSTR, cchDuration: c_int,
-    ) -> c_int;
-    pub fn GetDurationFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpDuration: *const SYSTEMTIME,
-        ullDuration: ULONGLONG, lpFormat: LPCWSTR, lpDurationStr: LPWSTR, cchDuration: c_int,
-    ) -> c_int;
-    pub fn GetDynamicTimeZoneInformation(
-        pTimeZoneInformation: PDYNAMIC_TIME_ZONE_INFORMATION,
-    ) -> DWORD;
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn GetEnabledXStateFeatures() -> DWORD64;
-    pub fn GetEnvironmentStrings() -> LPCH;
-    pub fn GetEnvironmentStringsW() -> LPWCH;
-    pub fn GetEnvironmentVariableA(lpName: LPCSTR, lpBuffer: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn GetEnvironmentVariableW(lpName: LPCWSTR, lpBuffer: LPWSTR, nSize: DWORD) -> DWORD;
-    // pub fn GetEraNameCountedString();
-    pub fn GetErrorMode() -> UINT;
-    pub fn GetExitCodeProcess(hProcess: HANDLE, lpExitCode: LPDWORD) -> BOOL;
-    pub fn GetExitCodeThread(hThread: HANDLE, lpExitCode: LPDWORD) -> BOOL;
-    pub fn GetFileAttributesA(lpFileName: LPCSTR) -> DWORD;
-    pub fn GetFileAttributesExA(
-        lpFileName: LPCSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID,
-    ) -> BOOL;
-    pub fn GetFileAttributesExW(
-        lpFileName: LPCWSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID,
-    ) -> BOOL;
-    pub fn GetFileAttributesTransactedA(
-        lpFileName: LPCSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID,
-        hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn GetFileAttributesTransactedW(
-        lpFileName: LPCWSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID,
-        hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn GetFileAttributesW(lpFileName: LPCWSTR) -> DWORD;
-    pub fn GetFileBandwidthReservation(
-        hFile: HANDLE, lpPeriodMilliseconds: LPDWORD, lpBytesPerPeriod: LPDWORD,
-        pDiscardable: LPBOOL, lpTransferSize: LPDWORD, lpNumOutstandingRequests: LPDWORD,
-    ) -> BOOL;
-    pub fn GetFileInformationByHandle(
-        hFile: HANDLE, lpFileInformation: LPBY_HANDLE_FILE_INFORMATION,
-    ) -> BOOL;
-    pub fn GetFileInformationByHandleEx(
-        hFile: HANDLE, FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, lpFileInformation: LPVOID,
-        dwBufferSize: DWORD,
-    ) -> BOOL;
-    pub fn GetFileMUIInfo(
-        dwFlags: DWORD, pcwszFilePath: PCWSTR, pFileMUIInfo: PFILEMUIINFO,
-        pcbFileMUIInfo: *mut DWORD,
-    ) -> BOOL;
-    pub fn GetFileMUIPath(
-        dwFlags: DWORD, pcwszFilePath: PCWSTR, pwszLanguage: PWSTR, pcchLanguage: PULONG,
-        pwszFileMUIPath: PWSTR, pcchFileMUIPath: PULONG, pululEnumerator: PULONGLONG,
-    ) -> BOOL;
-    pub fn GetFileSize(hFile: HANDLE, lpFileSizeHigh: LPDWORD) -> DWORD;
-    pub fn GetFileSizeEx(hFile: HANDLE, lpFileSize: PLARGE_INTEGER) -> BOOL;
-    pub fn GetFileTime(
-        hFile: HANDLE, lpCreationTime: LPFILETIME, lpLastAccessTime: LPFILETIME,
-        lpLastWriteTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn GetFileType(hFile: HANDLE) -> DWORD;
-    pub fn GetFinalPathNameByHandleA(
-        hFile: HANDLE, lpszFilePath: LPSTR, cchFilePath: DWORD, dwFlags: DWORD,
-    ) -> DWORD;
-    pub fn GetFinalPathNameByHandleW(
-        hFile: HANDLE, lpszFilePath: LPWSTR, cchFilePath: DWORD, dwFlags: DWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareEnvironmentVariableA(
-        lpName: LPCSTR, lpGuid: LPCSTR, pBuffer: PVOID, nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareEnvironmentVariableExA(
-        lpName: LPCSTR, lpGuid: LPCSTR, pBuffer: PVOID, nSize: DWORD, pdwAttribubutes: PDWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareEnvironmentVariableExW(
-        lpName: LPCWSTR, lpGuid: LPCWSTR, pBuffer: PVOID, nSize: DWORD, pdwAttribubutes: PDWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareEnvironmentVariableW(
-        lpName: LPCWSTR, lpGuid: LPCWSTR, pBuffer: PVOID, nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareType(FirmwareType: PFIRMWARE_TYPE) -> BOOL;
-    pub fn GetFullPathNameA(
-        lpFileName: LPCSTR, nBufferLength: DWORD, lpBuffer: LPSTR, lpFilePart: *mut LPSTR,
-    ) -> DWORD;
-    pub fn GetFullPathNameTransactedA(
-        lpFileName: LPCSTR, nBufferLength: DWORD, lpBuffer: LPSTR, lpFilePart: *mut LPSTR,
-        hTransaction: HANDLE,
-    ) -> DWORD;
-    pub fn GetFullPathNameTransactedW(
-        lpFileName: LPCWSTR, nBufferLength: DWORD, lpBuffer: LPWSTR, lpFilePart: *mut LPWSTR,
-        hTransaction: HANDLE,
-    );
-    pub fn GetFullPathNameW(
-        lpFileName: LPCWSTR, nBufferLength: DWORD, lpBuffer: LPWSTR, lpFilePart: *mut LPWSTR,
-    ) -> DWORD;
-    pub fn GetGeoInfoA(
-        Location: GEOID, GeoType: GEOTYPE, lpGeoData: LPSTR, cchData: c_int, LangId: LANGID,
-    ) -> c_int;
-    pub fn GetGeoInfoW(
-        Location: GEOID, GeoType: GEOTYPE, lpGeoData: LPWSTR, cchData: c_int, LangId: LANGID,
-    ) -> c_int;
-    pub fn GetHandleInformation(hObject: HANDLE, lpdwFlags: LPDWORD) -> BOOL;
-    pub fn GetLargePageMinimum() -> SIZE_T;
-    pub fn GetLargestConsoleWindowSize(hConsoleOutput: HANDLE) -> COORD;
-    pub fn GetLastError() -> DWORD;
-    pub fn GetLocalTime(lpSystemTime: LPSYSTEMTIME);
-    pub fn GetLocaleInfoA(
-        Locale: LCID, LCType: LCTYPE, lpLCData: LPSTR, cchData: c_int,
-    ) -> c_int;
-    pub fn GetLocaleInfoEx(
-        lpLocaleName: LPCWSTR, LCType: LCTYPE, lpLCData: LPWSTR, cchData: c_int,
-    ) -> c_int;
-    pub fn GetLocaleInfoW(
-        Locale: LCID, LCType: LCTYPE, lpLCData: LPWSTR, cchData: c_int,
-    ) -> c_int;
-    pub fn GetLogicalDriveStringsA(nBufferLength: DWORD, lpBuffer: LPSTR) -> DWORD;
-    pub fn GetLogicalDriveStringsW(nBufferLength: DWORD, lpBuffer: LPWSTR) -> DWORD;
-    pub fn GetLogicalDrives() -> DWORD;
-    pub fn GetLogicalProcessorInformation(
-        Buffer: PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, ReturnedLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetLogicalProcessorInformationEx(
-        RelationshipType: LOGICAL_PROCESSOR_RELATIONSHIP,
-        Buffer: PSYSTEM_LOGICAL_PROCESSOR_INFORMATION,
-        ReturnedLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetLongPathNameA(lpszShortPath: LPCSTR, lpszLongPath: LPSTR, cchBuffer: DWORD) -> DWORD;
-    pub fn GetLongPathNameTransactedA(
-        lpszShortPath: LPCSTR, lpszLongPath: LPSTR, cchBuffer: DWORD, hTransaction: HANDLE,
-    ) -> DWORD;
-    pub fn GetLongPathNameTransactedW(
-        lpszShortPath: LPCWSTR, lpszLongPath: LPWSTR, cchBuffer: DWORD, hTransaction: HANDLE,
-    ) -> DWORD;
-    pub fn GetLongPathNameW(
-        lpszShortPath: LPCWSTR, lpszLongPath: LPWSTR, cchBuffer: DWORD,
-    ) -> DWORD;
-    pub fn GetMailslotInfo(
-        hMailslot: HANDLE, lpMaxMessageSize: LPDWORD, lpNextSize: LPDWORD, lpMessageCount: LPDWORD,
-        lpReadTimeout: LPDWORD,
-    ) -> BOOL;
-    pub fn GetMaximumProcessorCount(GroupNumber: WORD) -> DWORD;
-    pub fn GetMaximumProcessorGroupCount() -> WORD;
-    pub fn GetMemoryErrorHandlingCapabilities(Capabilities: PULONG) -> BOOL;
-    pub fn GetModuleFileNameA(
-        hModule: HMODULE, lpFilename: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetModuleFileNameW(
-        hModule: HMODULE, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetModuleHandleA(lpModuleName: LPCSTR) -> HMODULE;
-    pub fn GetModuleHandleExA(
-        dwFlags: DWORD, lpModuleName: LPCSTR, phModule: *mut HMODULE,
-    ) -> BOOL;
-    pub fn GetModuleHandleExW(
-        dwFlags: DWORD, lpModuleName: LPCWSTR, phModule: *mut HMODULE,
-    ) -> BOOL;
-    pub fn GetModuleHandleW(lpModuleName: LPCWSTR) -> HMODULE;
-    pub fn GetNLSVersion(
-        Function: NLS_FUNCTION, Locale: LCID, lpVersionInformation: LPNLSVERSIONINFO,
-    ) -> BOOL;
-    pub fn GetNLSVersionEx(
-        function: NLS_FUNCTION, lpLocaleName: LPCWSTR, lpVersionInformation: LPNLSVERSIONINFOEX,
-    ) -> BOOL;
-    // pub fn GetNamedPipeAttribute();
-    pub fn GetNamedPipeClientComputerNameA(
-        Pipe: HANDLE, ClientComputerName: LPSTR, ClientComputerNameLength: ULONG,
-    ) -> BOOL;
-    pub fn GetNamedPipeClientComputerNameW(
-        Pipe: HANDLE, ClientComputerName: LPWSTR, ClientComputerNameLength: ULONG,
-    ) -> BOOL;
-    pub fn GetNamedPipeClientProcessId(Pipe: HANDLE, ClientProcessId: PULONG) -> BOOL;
-    pub fn GetNamedPipeClientSessionId(Pipe: HANDLE, ClientSessionId: PULONG) -> BOOL;
-    pub fn GetNamedPipeHandleStateA(
-        hNamedPipe: HANDLE, lpState: LPDWORD, lpCurInstances: LPDWORD,
-        lpMaxCollectionCount: LPDWORD, lpCollectDataTimeout: LPDWORD, lpUserName: LPSTR,
-        nMaxUserNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetNamedPipeHandleStateW(
-        hNamedPipe: HANDLE, lpState: LPDWORD, lpCurInstances: LPDWORD,
-        lpMaxCollectionCount: LPDWORD, lpCollectDataTimeout: LPDWORD, lpUserName: LPWSTR,
-        nMaxUserNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetNamedPipeInfo(
-        hNamedPipe: HANDLE, lpFlags: LPDWORD, lpOutBufferSize: LPDWORD, lpInBufferSize: LPDWORD,
-        lpMaxInstances: LPDWORD,
-    ) -> BOOL;
-    pub fn GetNamedPipeServerProcessId(Pipe: HANDLE, ServerProcessId: PULONG) -> BOOL;
-    pub fn GetNamedPipeServerSessionId(Pipe: HANDLE, ServerSessionId: PULONG) -> BOOL;
-    pub fn GetNativeSystemInfo(lpSystemInfo: LPSYSTEM_INFO);
-    #[cfg(target_arch = "x86_64")]
-    pub fn GetNextUmsListItem(UmsContext: PUMS_CONTEXT) -> PUMS_CONTEXT;
-    pub fn GetNumaAvailableMemoryNode(Node: UCHAR, AvailableBytes: PULONGLONG) -> BOOL;
-    pub fn GetNumaAvailableMemoryNodeEx(Node: USHORT, AvailableBytes: PULONGLONG) -> BOOL;
-    pub fn GetNumaHighestNodeNumber(HighestNodeNumber: PULONG) -> BOOL;
-    pub fn GetNumaNodeNumberFromHandle(hFile: HANDLE, NodeNumber: PUSHORT) -> BOOL;
-    pub fn GetNumaNodeProcessorMask(Node: UCHAR, ProcessorMask: PULONGLONG) -> BOOL;
-    pub fn GetNumaNodeProcessorMaskEx(Node: USHORT, ProcessorMask: PGROUP_AFFINITY) -> BOOL;
-    pub fn GetNumaProcessorNode(Processor: UCHAR, NodeNumber: PUCHAR) -> BOOL;
-    pub fn GetNumaProcessorNodeEx(Processor: PPROCESSOR_NUMBER, NodeNumber: PUSHORT) -> BOOL;
-    pub fn GetNumaProximityNode(ProximityId: ULONG, NodeNumber: PUCHAR) -> BOOL;
-    pub fn GetNumaProximityNodeEx(ProximityId: ULONG, NodeNumber: PUSHORT) -> BOOL;
-    pub fn GetNumberFormatA(
-        Locale: LCID, dwFlags: DWORD, lpValue: LPCSTR, lpFormat: *const NUMBERFMTA,
-        lpNumberStr: LPSTR, cchNumber: c_int,
-    ) -> c_int;
-    pub fn GetNumberFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpValue: LPCWSTR, lpFormat: *const NUMBERFMTW,
-        lpNumberStr: LPWSTR, cchNumber: c_int,
-    ) -> c_int;
-    pub fn GetNumberFormatW(
-        Locale: LCID, dwFlags: DWORD, lpValue: LPCWSTR, lpFormat: *const NUMBERFMTW,
-        lpNumberStr: LPWSTR, cchNumber: c_int,
-    ) -> c_int;
-    pub fn GetNumberOfConsoleInputEvents(hConsoleInput: HANDLE, lpNumberOfEvents: LPDWORD) -> BOOL;
-    pub fn GetNumberOfConsoleMouseButtons(lpNumberOfMouseButtons: LPDWORD) -> BOOL;
-    pub fn GetOEMCP() -> UINT;
-    pub fn GetOverlappedResult(
-        hFile: HANDLE, lpOverlapped: LPOVERLAPPED, lpNumberOfBytesTransferred: LPDWORD, bWait: BOOL,
-    ) -> BOOL;
-    pub fn GetOverlappedResultEx(
-        hFile: HANDLE, lpOverlapped: LPOVERLAPPED, lpNumberOfBytesTransferred: LPDWORD,
-        dwMilliseconds: DWORD, bAlertable: BOOL,
-    ) -> BOOL;
-    // pub fn GetPackageApplicationIds();
-    // pub fn GetPackageFamilyName();
-    // pub fn GetPackageFullName();
-    // pub fn GetPackageId();
-    // pub fn GetPackageInfo();
-    // pub fn GetPackagePath();
-    // pub fn GetPackagePathByFullName();
-    // pub fn GetPackagesByPackageFamily();
-    pub fn GetPhysicallyInstalledSystemMemory(TotalMemoryInKilobytes: PULONGLONG) -> BOOL;
-    pub fn GetPriorityClass(hProcess: HANDLE) -> DWORD;
-    pub fn GetPrivateProfileIntA(
-        lpAppName: LPCSTR, lpKeyName: LPCSTR, nDefault: INT, lpFileName: LPCSTR,
-    ) -> UINT;
-    pub fn GetPrivateProfileIntW(
-        lpAppName: LPCWSTR, lpKeyName: LPCWSTR, nDefault: INT, lpFileName: LPCWSTR,
-    ) -> UINT;
-    pub fn GetPrivateProfileSectionA(
-        lpAppName: LPCSTR, lpReturnedString: LPSTR, nSize: DWORD, lpFileName: LPCSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileSectionNamesA(
-        lpszReturnBuffer: LPSTR, nSize: DWORD, lpFileName: LPCSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileSectionNamesW(
-        lpszReturnBuffer: LPWSTR, nSize: DWORD, lpFileName: LPCWSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileSectionW(
-        lpAppName: LPCWSTR, lpReturnedString: LPWSTR, nSize: DWORD, lpFileName: LPCWSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileStringA(
-        lpAppName: LPCSTR, lpKeyName: LPCSTR, lpDefault: LPCSTR, lpReturnedString: LPSTR,
-        nSize: DWORD, lpFileName: LPCSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileStringW(
-        lpAppName: LPCWSTR, lpKeyName: LPCWSTR, lpDefault: LPCWSTR, lpReturnedString: LPWSTR,
-        nSize: DWORD, lpFileName: LPCWSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileStructA(
-        lpszSection: LPCSTR, lpszKey: LPCSTR, lpStruct: LPVOID, uSizeStruct: UINT, szFile: LPCSTR,
-    ) -> BOOL;
-    pub fn GetPrivateProfileStructW(
-        lpszSection: LPCWSTR, lpszKey: LPCWSTR, lpStruct: LPVOID, uSizeStruct: UINT,
-        szFile: LPCWSTR,
-    ) -> BOOL;
-    pub fn GetProcAddress(hModule: HMODULE, lpProcName: LPCSTR) -> FARPROC;
-    pub fn GetProcessAffinityMask(
-        hProcess: HANDLE, lpProcessAffinityMask: PDWORD_PTR, lpSystemAffinityMask: PDWORD_PTR,
-    ) -> BOOL;
-    pub fn GetProcessDEPPolicy(hProcess: HANDLE, lpFlags: LPDWORD, lpPermanent: PBOOL) -> BOOL;
-    pub fn GetProcessGroupAffinity(
-        hProcess: HANDLE, GroupCount: PUSHORT, GroupArray: PUSHORT,
-    ) -> BOOL;
-    pub fn GetProcessHandleCount(hProcess: HANDLE, pdwHandleCount: PDWORD) -> BOOL;
-    pub fn GetProcessHeap() -> HANDLE;
-    pub fn GetProcessHeaps(NumberOfHeaps: DWORD, ProcessHeaps: PHANDLE) -> DWORD;
-    pub fn GetProcessId(Process: HANDLE) -> DWORD;
-    pub fn GetProcessIdOfThread(Thread: HANDLE) -> DWORD;
-    pub fn GetProcessInformation(
-        hProcess: HANDLE, ProcessInformationClass: PROCESS_INFORMATION_CLASS,
-        ProcessInformation: LPVOID, ProcessInformationSize: DWORD,
-    ) -> BOOL;
-    pub fn GetProcessIoCounters(hProcess: HANDLE, lpIoCounters: PIO_COUNTERS) -> BOOL;
-    pub fn GetProcessMitigationPolicy(
-        hProcess: HANDLE, MitigationPolicy: PROCESS_MITIGATION_POLICY, lpBuffer: PVOID,
-        dwLength: SIZE_T,
-    ) -> BOOL;
-    pub fn GetProcessPreferredUILanguages(
-        dwFlags: DWORD, pulNumLanguages: PULONG, pwszLanguagesBuffer: PZZWSTR,
-        pcchLanguagesBuffer: PULONG,
-    ) -> BOOL;
-    pub fn GetProcessPriorityBoost(hProcess: HANDLE, pDisablePriorityBoost: PBOOL) -> BOOL;
-    pub fn GetProcessShutdownParameters(lpdwLevel: LPDWORD, lpdwFlags: LPDWORD) -> BOOL;
-    pub fn GetProcessTimes(
-        hProcess: HANDLE, lpCreationTime: LPFILETIME, lpExitTime: LPFILETIME,
-        lpKernelTime: LPFILETIME, lpUserTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn GetProcessVersion(ProcessId: DWORD) -> DWORD;
-    pub fn GetProcessWorkingSetSize(
-        hProcess: HANDLE, lpMinimumWorkingSetSize: PSIZE_T, lpMaximumWorkingSetSize: PSIZE_T,
-    ) -> BOOL;
-    pub fn GetProcessWorkingSetSizeEx(
-        hProcess: HANDLE, lpMinimumWorkingSetSize: PSIZE_T, lpMaximumWorkingSetSize: PSIZE_T,
-        Flags: PDWORD,
-    ) -> BOOL;
-    pub fn GetProcessorSystemCycleTime(
-        Group: USHORT, Buffer: PSYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION, ReturnedLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetProductInfo(
-        dwOSMajorVersion: DWORD, dwOSMinorVersion: DWORD, dwSpMajorVersion: DWORD,
-        dwSpMinorVersion: DWORD, pdwReturnedProductType: PDWORD,
-    ) -> BOOL;
-    pub fn GetProfileIntA(lpAppName: LPCSTR, lpKeyName: LPCSTR, nDefault: INT) -> UINT;
-    pub fn GetProfileIntW(lpAppName: LPCWSTR, lpKeyName: LPCWSTR, nDefault: INT) -> UINT;
-    pub fn GetProfileSectionA(lpAppName: LPCSTR, lpReturnedString: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn GetProfileSectionW(lpAppName: LPCWSTR, lpReturnedString: LPWSTR, nSize: DWORD) -> DWORD;
-    pub fn GetProfileStringA(
-        lpAppName: LPCSTR, lpKeyName: LPCSTR, lpDefault: LPCSTR, lpReturnedString: LPSTR,
-        nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetProfileStringW(
-        lpAppName: LPCWSTR, lpKeyName: LPCWSTR, lpDefault: LPCWSTR, lpReturnedString: LPWSTR,
-        nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetQueuedCompletionStatus(
-        CompletionPort: HANDLE, lpNumberOfBytesTransferred: LPDWORD, lpCompletionKey: PULONG_PTR,
-        lpOverlapped: *mut LPOVERLAPPED, dwMilliseconds: DWORD,
-    ) -> BOOL;
-    pub fn GetQueuedCompletionStatusEx(
-        CompletionPort: HANDLE, lpCompletionPortEntries: LPOVERLAPPED_ENTRY, ulCount: ULONG,
-        ulNumEntriesRemoved: PULONG, dwMilliseconds: DWORD, fAlertable: BOOL,
-    ) -> BOOL;
-    pub fn GetShortPathNameA(
-        lpszLongPath: LPCSTR, lpszShortPath: LPSTR, cchBuffer: DWORD,
-    ) -> DWORD;
-    pub fn GetShortPathNameW(
-        lpszLongPath: LPCWSTR, lpszShortPath: LPWSTR, cchBuffer: DWORD,
-    ) -> DWORD;
-    // pub fn GetStagedPackagePathByFullName();
-    pub fn GetStartupInfoA(lpStartupInfo: LPSTARTUPINFOA);
-    pub fn GetStartupInfoW(lpStartupInfo: LPSTARTUPINFOW);
-    // pub fn GetStateFolder();
-    pub fn GetStdHandle(nStdHandle: DWORD) -> HANDLE;
-    pub fn GetStringScripts(
-        dwFlags: DWORD, lpString: LPCWSTR, cchString: c_int, lpScripts: LPWSTR, cchScripts: c_int,
-    ) -> c_int;
-    pub fn GetStringTypeA(
-        Locale: LCID, dwInfoType: DWORD, lpSrcStr: LPCSTR, cchSrc: c_int, lpCharType: LPWORD,
-    ) -> BOOL;
-    pub fn GetStringTypeExA(
-        Locale: LCID, dwInfoType: DWORD, lpSrcStr: LPCSTR, cchSrc: c_int, lpCharType: LPWORD,
-    ) -> BOOL;
-    pub fn GetStringTypeExW(
-        Locale: LCID, dwInfoType: DWORD, lpSrcStr: LPCWCH, cchSrc: c_int, lpCharType: LPWORD,
-    ) -> BOOL;
-    pub fn GetStringTypeW(
-        dwInfoType: DWORD, lpSrcStr: LPCWCH, cchSrc: c_int, lpCharType: LPWORD,
-    ) -> BOOL;
-    // pub fn GetSystemAppDataKey();
-    pub fn GetSystemDEPPolicy() -> DEP_SYSTEM_POLICY_TYPE;
-    pub fn GetSystemDefaultLCID() -> LCID;
-    pub fn GetSystemDefaultLangID() -> LANGID;
-    pub fn GetSystemDefaultLocaleName(lpLocaleName: LPWSTR, cchLocaleName: c_int) -> c_int;
-    pub fn GetSystemDefaultUILanguage() -> LANGID;
-    pub fn GetSystemDirectoryA(lpBuffer: LPSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemDirectoryW(lpBuffer: LPWSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemFileCacheSize(
-        lpMinimumFileCacheSize: PSIZE_T, lpMaximumFileCacheSize: PSIZE_T, lpFlags: PDWORD,
-    ) -> BOOL;
-    pub fn GetSystemFirmwareTable(
-        FirmwareTableProviderSignature: DWORD, FirmwareTableID: DWORD, pFirmwareTableBuffer: PVOID,
-        BufferSize: DWORD,
-    ) -> UINT;
-    pub fn GetSystemInfo(lpSystemInfo: LPSYSTEM_INFO);
-    pub fn GetSystemPowerStatus(lpSystemPowerStatus: LPSYSTEM_POWER_STATUS) -> BOOL;
-    pub fn GetSystemPreferredUILanguages(
-        dwFlags: DWORD, pulNumLanguages: PULONG, pwszLanguagesBuffer: PZZWSTR,
-        pcchLanguagesBuffer: PULONG,
-    ) -> BOOL;
-    pub fn GetSystemRegistryQuota(pdwQuotaAllowed: PDWORD, pdwQuotaUsed: PDWORD) -> BOOL;
-    pub fn GetSystemTime(lpSystemTime: LPSYSTEMTIME);
-    pub fn GetSystemTimeAdjustment(
-        lpTimeAdjustment: PDWORD, lpTimeIncrement: PDWORD, lpTimeAdjustmentDisabled: PBOOL,
-    ) -> BOOL;
-    pub fn GetSystemTimeAsFileTime(lpSystemTimeAsFileTime: LPFILETIME);
-    pub fn GetSystemTimePreciseAsFileTime(lpSystemTimeAsFileTime: LPFILETIME);
-    pub fn GetSystemTimes(
-        lpIdleTime: LPFILETIME, lpKernelTime: LPFILETIME, lpUserTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn GetSystemWindowsDirectoryA(lpBuffer: LPSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemWindowsDirectoryW(lpBuffer: LPWSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemWow64DirectoryA(lpBuffer: LPSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemWow64DirectoryW(lpBuffer: LPWSTR, uSize: UINT) -> UINT;
-    pub fn GetTapeParameters(
-        hDevice: HANDLE, dwOperation: DWORD, lpdwSize: LPDWORD, lpTapeInformation: LPVOID
-    ) -> DWORD;
-    pub fn GetTapePosition(
-        hDevice: HANDLE, dwPositionType: DWORD, lpdwPartition: LPDWORD,
-        lpdwOffsetLow: LPDWORD, lpdwOffsetHigh: LPDWORD
-    ) -> DWORD;
-    pub fn GetTapeStatus(hDevice: HANDLE) -> DWORD;
-    pub fn GetTempFileNameA(
-        lpPathName: LPCSTR, lpPrefixString: LPCSTR, uUnique: UINT, lpTempFileName: LPSTR,
-    ) -> UINT;
-    pub fn GetTempFileNameW(
-        lpPathName: LPCWSTR, lpPrefixString: LPCWSTR, uUnique: UINT, lpTempFileName: LPWSTR,
-    ) -> UINT;
-    pub fn GetTempPathA(nBufferLength: DWORD, lpBuffer: LPSTR) -> DWORD;
-    pub fn GetTempPathW(nBufferLength: DWORD, lpBuffer: LPWSTR) -> DWORD;
-    pub fn GetThreadContext(hThread: HANDLE, lpContext: LPCONTEXT) -> BOOL;
-    pub fn GetThreadErrorMode() -> DWORD;
-    pub fn GetThreadGroupAffinity(hThread: HANDLE, GroupAffinity: PGROUP_AFFINITY) -> BOOL;
-    pub fn GetThreadIOPendingFlag(hThread: HANDLE, lpIOIsPending: PBOOL) -> BOOL;
-    pub fn GetThreadId(Thread: HANDLE) -> DWORD;
-    pub fn GetThreadIdealProcessorEx(hThread: HANDLE, lpIdealProcessor: PPROCESSOR_NUMBER) -> BOOL;
-    pub fn GetThreadInformation(
-        hThread: HANDLE, ThreadInformationClass: THREAD_INFORMATION_CLASS,
-        ThreadInformation: LPVOID, ThreadInformationSize: DWORD,
-    ) -> BOOL;
-    pub fn GetThreadLocale() -> LCID;
-    pub fn GetThreadPreferredUILanguages(
-        dwFlags: DWORD, pulNumLanguages: PULONG, pwszLanguagesBuffer: PZZWSTR,
-        pcchLanguagesBuffer: PULONG,
-    ) -> BOOL;
-    pub fn GetThreadPriority(hThread: HANDLE) -> c_int;
-    pub fn GetThreadPriorityBoost(hThread: HANDLE, pDisablePriorityBoost: PBOOL) -> BOOL;
-    pub fn GetThreadSelectorEntry(
-        hThread: HANDLE, dwSelector: DWORD, lpSelectorEntry: LPLDT_ENTRY,
-    ) -> BOOL;
-    pub fn GetThreadTimes(
-        hThread: HANDLE, lpCreationTime: LPFILETIME, lpExitTime: LPFILETIME,
-        lpKernelTime: LPFILETIME, lpUserTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn GetThreadUILanguage() -> LANGID;
-    pub fn GetTickCount() -> DWORD;
-    pub fn GetTickCount64() -> ULONGLONG;
-    pub fn GetTimeFormatA(
-        Locale: LCID, dwFlags: DWORD, lpTime: *const SYSTEMTIME, lpFormat: LPCSTR,
-        lpTimeStr: LPSTR, cchTime: c_int,
-    ) -> c_int;
-    pub fn GetTimeFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpTime: *const SYSTEMTIME, lpFormat: LPCWSTR,
-        lpTimeStr: LPWSTR, cchTime: c_int,
-    ) -> c_int;
-    pub fn GetTimeFormatW(
-        Locale: LCID, dwFlags: DWORD, lpTime: *const SYSTEMTIME, lpFormat: LPCWSTR,
-        lpTimeStr: LPWSTR, cchTime: c_int,
-    ) -> c_int;
-    pub fn GetTimeZoneInformation(lpTimeZoneInformation: LPTIME_ZONE_INFORMATION) -> DWORD;
-    pub fn GetTimeZoneInformationForYear(
-        wYear: USHORT, pdtzi: PDYNAMIC_TIME_ZONE_INFORMATION, ptzi: LPTIME_ZONE_INFORMATION,
-    ) -> BOOL;
-    pub fn GetUILanguageInfo(
-        dwFlags: DWORD, pwmszLanguage: PCZZWSTR, pwszFallbackLanguages: PZZWSTR,
-        pcchFallbackLanguages: PDWORD, pAttributes: PDWORD,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn GetUmsCompletionListEvent(
-        UmsCompletionList: PUMS_COMPLETION_LIST, UmsCompletionEvent: PHANDLE,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn GetUmsSystemThreadInformation(
-        ThreadHandle: HANDLE, SystemThreadInfo: PUMS_SYSTEM_THREAD_INFORMATION,
-    ) -> BOOL;
-    pub fn GetUserDefaultLCID() -> LCID;
-    pub fn GetUserDefaultLangID() -> LANGID;
-    pub fn GetUserDefaultLocaleName(lpLocaleName: LPWSTR, cchLocaleName: c_int) -> c_int;
-    pub fn GetUserDefaultUILanguage() -> LANGID;
-    pub fn GetUserGeoID(GeoClass: GEOCLASS) -> GEOID;
-    pub fn GetUserPreferredUILanguages(
-        dwFlags: DWORD, pulNumLanguages: PULONG, pwszLanguagesBuffer: PZZWSTR,
-        pcchLanguagesBuffer: PULONG,
-    ) -> BOOL;
-    pub fn GetVersion() -> DWORD;
-    pub fn GetVersionExA(lpVersionInformation: LPOSVERSIONINFOA) -> BOOL;
-    pub fn GetVersionExW(lpVersionInformation: LPOSVERSIONINFOW) -> BOOL;
-    pub fn GetVolumeInformationA(
-        lpRootPathName: LPCSTR, lpVolumeNameBuffer: LPSTR, nVolumeNameSize: DWORD,
-        lpVolumeSerialNumber: LPDWORD, lpMaximumComponentLength: LPDWORD,
-        lpFileSystemFlags: LPDWORD, lpFileSystemNameBuffer: LPSTR, nFileSystemNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumeInformationByHandleW(
-        hFile: HANDLE, lpVolumeNameBuffer: LPWSTR, nVolumeNameSize: DWORD,
-        lpVolumeSerialNumber: LPDWORD, lpMaximumComponentLength: LPDWORD,
-        lpFileSystemFlags: LPDWORD, lpFileSystemNameBuffer: LPWSTR, nFileSystemNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumeInformationW(
-        lpRootPathName: LPCWSTR, lpVolumeNameBuffer: LPWSTR, nVolumeNameSize: DWORD,
-        lpVolumeSerialNumber: LPDWORD, lpMaximumComponentLength: LPDWORD,
-        lpFileSystemFlags: LPDWORD, lpFileSystemNameBuffer: LPWSTR, nFileSystemNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumeNameForVolumeMountPointA(
-        lpszVolumeMountPoint: LPCSTR, lpszVolumeName: LPSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumeNameForVolumeMountPointW(
-        lpszVolumeMountPoint: LPCWSTR, lpszVolumeName: LPWSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumePathNameA(
-        lpszFileName: LPCSTR, lpszVolumePathName: LPSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumePathNameW(
-        lpszFileName: LPCWSTR, lpszVolumePathName: LPWSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumePathNamesForVolumeNameA(
-        lpszVolumeName: LPCSTR, lpszVolumePathNames: LPCH, cchBufferLength: DWORD,
-        lpcchReturnLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetVolumePathNamesForVolumeNameW(
-        lpszVolumeName: LPCWSTR, lpszVolumePathNames: LPWCH, cchBufferLength: DWORD,
-        lpcchReturnLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetWindowsDirectoryA(lpBuffer: LPSTR, uSize: UINT) -> UINT;
-    pub fn GetWindowsDirectoryW(lpBuffer: LPWSTR, uSize: UINT) -> UINT;
-    pub fn GetWriteWatch(
-        dwFlags: DWORD, lpBaseAddress: PVOID, dwRegionSize: SIZE_T, lpAddresses: *mut PVOID,
-        lpdwCount: *mut ULONG_PTR, lpdwGranularity: LPDWORD,
-    ) -> UINT;
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn GetXStateFeaturesMask(Context: PCONTEXT, FeatureMask: PDWORD64) -> BOOL;
-    pub fn GlobalAddAtomA(lpString: LPCSTR) -> ATOM;
-    pub fn GlobalAddAtomExA(lpString: LPCSTR, Flags: DWORD) -> ATOM;
-    pub fn GlobalAddAtomExW(lpString: LPCWSTR, Flags: DWORD) -> ATOM;
-    pub fn GlobalAddAtomW(lpString: LPCWSTR) -> ATOM;
-    pub fn GlobalAlloc(uFlags: UINT, dwBytes: SIZE_T) -> HGLOBAL;
-    pub fn GlobalCompact(dwMinFree: DWORD) -> SIZE_T;
-    pub fn GlobalDeleteAtom(nAtom: ATOM) -> ATOM;
-    pub fn GlobalFindAtomA(lpString: LPCSTR) -> ATOM;
-    pub fn GlobalFindAtomW(lpString: LPCWSTR) -> ATOM;
-    pub fn GlobalFix(hMem: HGLOBAL);
-    pub fn GlobalFlags(hMem: HGLOBAL) -> UINT;
-    pub fn GlobalFree(hMem: HGLOBAL) -> HGLOBAL;
-    pub fn GlobalGetAtomNameA(nAtom: ATOM, lpBuffer: LPSTR, nSize: c_int) -> UINT;
-    pub fn GlobalGetAtomNameW(nAtom: ATOM, lpBuffer: LPWSTR, nSize: c_int) -> UINT;
-    pub fn GlobalHandle(pMem: LPCVOID) -> HGLOBAL;
-    pub fn GlobalLock(hMem: HGLOBAL) -> LPVOID;
-    pub fn GlobalMemoryStatus(lpBuffer: LPMEMORYSTATUS);
-    pub fn GlobalMemoryStatusEx(lpBuffer: LPMEMORYSTATUSEX) -> BOOL;
-    pub fn GlobalReAlloc(hMem: HGLOBAL, dwBytes: SIZE_T, uFlags: UINT) -> HGLOBAL;
-    pub fn GlobalSize(hMem: HGLOBAL) -> SIZE_T;
-    pub fn GlobalUnWire(hMem: HGLOBAL) -> BOOL;
-    pub fn GlobalUnfix(hMem: HGLOBAL);
-    pub fn GlobalUnlock(hMem: HGLOBAL) -> BOOL;
-    pub fn GlobalWire(hMem: HGLOBAL) -> LPVOID;
-    pub fn Heap32First(lphe: LPHEAPENTRY32, th32ProcessID: DWORD, th32HeapID: ULONG_PTR) -> BOOL;
-    pub fn Heap32ListFirst(hSnapshot: HANDLE, lphl: LPHEAPLIST32) -> BOOL;
-    pub fn Heap32ListNext(hSnapshot: HANDLE, lphl: LPHEAPLIST32) -> BOOL;
-    pub fn Heap32Next(lphe: LPHEAPENTRY32) -> BOOL;
-    pub fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) -> LPVOID;
-    pub fn HeapCompact(hHeap: HANDLE, dwFlags: DWORD) -> SIZE_T;
-    pub fn HeapCreate(flOptions: DWORD, dwInitialSize: SIZE_T, dwMaximumSize: SIZE_T) -> HANDLE;
-    pub fn HeapDestroy(hHeap: HANDLE) -> BOOL;
-    pub fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID) -> BOOL;
-    pub fn HeapLock(hHeap: HANDLE) -> BOOL;
-    pub fn HeapQueryInformation(
-        HeapHandle: HANDLE, HeapInformationClass: HEAP_INFORMATION_CLASS, HeapInformation: PVOID,
-        HeapInformationLength: SIZE_T, ReturnLength: PSIZE_T,
-    ) -> BOOL;
-    pub fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID, dwBytes: SIZE_T) -> LPVOID;
-    pub fn HeapSetInformation(
-        HeapHandle: HANDLE, HeapInformationClass: HEAP_INFORMATION_CLASS, HeapInformation: PVOID,
-        HeapInformationLength: SIZE_T,
-    ) -> BOOL;
-    pub fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPCVOID) -> SIZE_T;
-    pub fn HeapSummary(hHeap: HANDLE, dwFlags: DWORD, lpSummary: LPHEAP_SUMMARY) -> BOOL;
-    pub fn HeapUnlock(hHeap: HANDLE) -> BOOL;
-    pub fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPCVOID) -> BOOL;
-    pub fn HeapWalk(hHeap: HANDLE, lpEntry: LPPROCESS_HEAP_ENTRY) -> BOOL;
-    pub fn InitAtomTable(nSize: DWORD) -> BOOL;
-    pub fn InitOnceBeginInitialize(
-        lpInitOnce: LPINIT_ONCE, dwFlags: DWORD, fPending: PBOOL, lpContext: *mut LPVOID,
-    ) -> BOOL;
-    pub fn InitOnceComplete(
-        lpInitOnce: LPINIT_ONCE, dwFlags: DWORD, lpContext: LPVOID,
-    ) -> BOOL;
-    pub fn InitOnceExecuteOnce(
-        InitOnce: PINIT_ONCE, InitFn: PINIT_ONCE_FN, Parameter: PVOID, Context: *mut LPVOID,
-    ) -> BOOL;
-    pub fn InitOnceInitialize(InitOnce: PINIT_ONCE);
-    pub fn InitializeConditionVariable(ConditionVariable: PCONDITION_VARIABLE);
-    pub fn InitializeContext(
-        Buffer: PVOID, ContextFlags: DWORD, Context: *mut PCONTEXT, ContextLength: PDWORD,
-    ) -> BOOL;
-    pub fn InitializeCriticalSection(lpCriticalSection: LPCRITICAL_SECTION);
-    pub fn InitializeCriticalSectionAndSpinCount(
-        lpCriticalSection: LPCRITICAL_SECTION, dwSpinCount: DWORD,
-    ) -> BOOL;
-    pub fn InitializeCriticalSectionEx(
-        lpCriticalSection: LPCRITICAL_SECTION, dwSpinCount: DWORD, Flags: DWORD,
-    ) -> BOOL;
-    pub fn InitializeProcThreadAttributeList(
-        lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST, dwAttributeCount: DWORD, dwFlags: DWORD,
-        lpSize: PSIZE_T,
-    ) -> BOOL;
-    pub fn InitializeSListHead(ListHead: PSLIST_HEADER);
-    pub fn InitializeSRWLock(SRWLock: PSRWLOCK);
-    pub fn InitializeSynchronizationBarrier(
-        lpBarrier: LPSYNCHRONIZATION_BARRIER, lTotalThreads: LONG, lSpinCount: LONG,
-    ) -> BOOL;
-    pub fn InstallELAMCertificateInfo(ELAMFile: HANDLE) -> BOOL;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedCompareExchange(
-        Destination: *mut LONG, ExChange: LONG, Comperand: LONG,
-    ) -> LONG;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedCompareExchange64(
-        Destination: *mut LONG64, ExChange: LONG64, Comperand: LONG64,
-    ) -> LONG64;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedDecrement(Addend: *mut LONG) -> LONG;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedExchange(Target: *mut LONG, Value: LONG) -> LONG;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedExchangeAdd(Addend: *mut LONG, Value: LONG) -> LONG;
-    pub fn InterlockedFlushSList(ListHead: PSLIST_HEADER) -> PSLIST_ENTRY;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedIncrement(Addend: *mut LONG) -> LONG;
-    pub fn InterlockedPopEntrySList(ListHead: PSLIST_HEADER) -> PSLIST_ENTRY;
-    pub fn InterlockedPushEntrySList(
-        ListHead: PSLIST_HEADER, ListEntry: PSLIST_ENTRY,
-    ) -> PSLIST_ENTRY;
-    pub fn InterlockedPushListSListEx(
-        ListHead: PSLIST_HEADER, List: PSLIST_ENTRY, ListEnd: PSLIST_ENTRY, Count: ULONG,
-    ) -> PSLIST_ENTRY;
-    pub fn IsBadCodePtr(lpfn: FARPROC) -> BOOL;
-    pub fn IsBadHugeReadPtr(lp: *const VOID, ucb: UINT_PTR) -> BOOL;
-    pub fn IsBadHugeWritePtr(lp: LPVOID, ucb: UINT_PTR) -> BOOL;
-    pub fn IsBadReadPtr(lp: *const VOID, ucb: UINT_PTR) -> BOOL;
-    pub fn IsBadStringPtrA(lpsz: LPCSTR, ucchMax: UINT_PTR) -> BOOL;
-    pub fn IsBadStringPtrW(lpsz: LPCWSTR, ucchMax: UINT_PTR) -> BOOL;
-    pub fn IsBadWritePtr(lp: LPVOID, ucb: UINT_PTR) -> BOOL;
-    pub fn IsDBCSLeadByte(TestChar: BYTE) -> BOOL;
-    pub fn IsDBCSLeadByteEx(CodePage: UINT, TestChar: BYTE) -> BOOL;
-    pub fn IsDebuggerPresent() -> BOOL;
-    pub fn IsNLSDefinedString(
-        Function: NLS_FUNCTION, dwFlags: DWORD, lpVersionInformation: LPNLSVERSIONINFO,
-        lpString: LPCWSTR, cchStr: INT,
-    ) -> BOOL;
-    pub fn IsNativeVhdBoot(NativeVhdBoot: PBOOL) -> BOOL;
-    pub fn IsNormalizedString(NormForm: NORM_FORM, lpString: LPCWSTR, cwLength: c_int) -> BOOL;
-    pub fn IsProcessCritical(hProcess: HANDLE, Critical: PBOOL) -> BOOL;
-    pub fn IsProcessInJob(ProcessHandle: HANDLE, JobHandle: HANDLE, Result: PBOOL) -> BOOL;
-    pub fn IsProcessorFeaturePresent(ProcessorFeature: DWORD) -> BOOL;
-    pub fn IsSystemResumeAutomatic() -> BOOL;
-    pub fn IsThreadAFiber() -> BOOL;
-    pub fn IsThreadpoolTimerSet(pti: PTP_TIMER) -> BOOL;
-    pub fn IsValidCodePage(CodePage: UINT) -> BOOL;
-    pub fn IsValidLanguageGroup(LanguageGroup: LGRPID, dwFlags: DWORD) -> BOOL;
-    pub fn IsValidLocale(Locale: LCID, dwFlags: DWORD) -> BOOL;
-    pub fn IsValidLocaleName(lpLocaleName: LPCWSTR) -> BOOL;
-    pub fn IsValidNLSVersion(
-        function: NLS_FUNCTION, lpLocaleName: LPCWSTR, lpVersionInformation: LPNLSVERSIONINFOEX,
-    ) -> BOOL;
-    pub fn IsWow64Process(hProcess: HANDLE, Wow64Process: PBOOL) -> BOOL;
-    pub fn K32EmptyWorkingSet(hProcess: HANDLE) -> BOOL;
-    pub fn K32EnumDeviceDrivers(lpImageBase: *mut LPVOID, cb: DWORD, lpcbNeeded: LPDWORD) -> BOOL;
-    pub fn K32EnumPageFilesA(
-        pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKA, pContext: LPVOID,
-    ) -> BOOL;
-    pub fn K32EnumPageFilesW(
-        pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKW, pContext: LPVOID,
-    ) -> BOOL;
-    pub fn K32EnumProcessModules(
-        hProcess: HANDLE, lphModule: *mut HMODULE, cb: DWORD, lpcbNeeded: LPDWORD,
-    ) -> BOOL;
-    pub fn K32EnumProcessModulesEx(
-        hProcess: HANDLE, lphModule: *mut HMODULE, cb: DWORD, lpcbNeeded: LPDWORD,
-        dwFilterFlag: DWORD,
-    ) -> BOOL;
-    pub fn K32EnumProcesses(
-        lpidProcess: *mut DWORD, cb: DWORD, lpcbNeeded: LPDWORD,
-    ) -> BOOL;
-    pub fn K32GetDeviceDriverBaseNameA(ImageBase: LPVOID, lpFilename: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn K32GetDeviceDriverBaseNameW(
-        ImageBase: LPVOID, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetDeviceDriverFileNameA(ImageBase: LPVOID, lpFilename: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn K32GetDeviceDriverFileNameW(
-        ImageBase: LPVOID, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetMappedFileNameA(
-        hProcess: HANDLE, lpv: LPVOID, lpFilename: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetMappedFileNameW(
-        hProcess: HANDLE, lpv: LPVOID, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleBaseNameA(
-        hProcess: HANDLE, hModule: HMODULE, lpBaseName: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleBaseNameW(
-        hProcess: HANDLE, hModule: HMODULE, lpBaseName: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleFileNameExA(
-        hProcess: HANDLE, hModule: HMODULE, lpFilename: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleFileNameExW(
-        hProcess: HANDLE, hModule: HMODULE, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleInformation(
-        hProcess: HANDLE, hModule: HMODULE, lpmodinfo: LPMODULEINFO, cb: DWORD,
-    ) -> BOOL;
-    pub fn K32GetPerformanceInfo(
-        pPerformanceInformation: PPERFORMANCE_INFORMATION, cb: DWORD,
-    ) -> BOOL;
-    pub fn K32GetProcessImageFileNameA(
-        hProcess: HANDLE, lpImageFileName: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetProcessImageFileNameW(
-        hProcess: HANDLE, lpImageFileName: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetProcessMemoryInfo(
-        Process: HANDLE, ppsmemCounters: PPROCESS_MEMORY_COUNTERS, cb: DWORD,
-    ) -> BOOL;
-    pub fn K32GetWsChanges(
-        hProcess: HANDLE, lpWatchInfo: PPSAPI_WS_WATCH_INFORMATION, cb: DWORD,
-    ) -> BOOL;
-    pub fn K32GetWsChangesEx(
-        hProcess: HANDLE, lpWatchInfoEx: PPSAPI_WS_WATCH_INFORMATION_EX, cb: PDWORD,
-    ) -> BOOL;
-    pub fn K32InitializeProcessForWsWatch(hProcess: HANDLE) -> BOOL;
-    pub fn K32QueryWorkingSet(hProcess: HANDLE, pv: PVOID, cb: DWORD) -> BOOL;
-    pub fn K32QueryWorkingSetEx(hProcess: HANDLE, pv: PVOID, cb: DWORD) -> BOOL;
-    pub fn LCIDToLocaleName(Locale: LCID, lpName: LPWSTR, cchName: c_int, dwFlags: DWORD) -> c_int;
-    pub fn LCMapStringA(
-        Locale: LCID, dwMapFlags: DWORD, lpSrcStr: LPCSTR, cchSrc: c_int, lpDestStr: LPSTR,
-        cchDest: c_int,
-    ) -> c_int;
-    pub fn LCMapStringEx(
-        lpLocaleName: LPCWSTR, dwMapFlags: DWORD, lpSrcStr: LPCWSTR, cchSrc: c_int,
-        lpDestStr: LPWSTR, cchDest: c_int, lpVersionInformation: LPNLSVERSIONINFO,
-        lpReserved: LPVOID, sortHandle: LPARAM,
-    ) -> c_int;
-    pub fn LCMapStringW(
-        Locale: LCID, dwMapFlags: DWORD, lpSrcStr: LPCWSTR, cchSrc: c_int, lpDestStr: LPWSTR,
-        cchDest: c_int,
-    ) -> c_int;
-    pub fn LeaveCriticalSection(lpCriticalSection: LPCRITICAL_SECTION);
-    pub fn LeaveCriticalSectionWhenCallbackReturns(
-        pci: PTP_CALLBACK_INSTANCE, pcs: PCRITICAL_SECTION,
-    );
-    // pub fn LoadAppInitDlls();
-    pub fn LoadLibraryA(lpFileName: LPCSTR) -> HMODULE;
-    pub fn LoadLibraryExA(lpLibFileName: LPCSTR, hFile: HANDLE, dwFlags: DWORD) -> HMODULE;
-    pub fn LoadLibraryExW(lpLibFileName: LPCWSTR, hFile: HANDLE, dwFlags: DWORD) -> HMODULE;
-    pub fn LoadLibraryW(lpFileName: LPCWSTR) -> HMODULE;
-    pub fn LoadModule(lpModuleName: LPCSTR, lpParameterBlock: LPVOID) -> DWORD;
-    pub fn LoadPackagedLibrary(lpwLibFileName: LPCWSTR, Reserved: DWORD) -> HMODULE;
-    pub fn LoadResource(hModule: HMODULE, hResInfo: HRSRC) -> HGLOBAL;
-    // pub fn LoadStringBaseExW();
-    // pub fn LoadStringBaseW();
-    pub fn LocalAlloc(uFlags: UINT, uBytes: SIZE_T) -> HLOCAL;
-    pub fn LocalCompact(uMinFree: UINT) -> SIZE_T;
-    pub fn LocalFileTimeToFileTime(
-        lpLocalFileTime: *const FILETIME, lpFileTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn LocalFlags(hMem: HLOCAL) -> UINT;
-    pub fn LocalFree(hMem: HLOCAL) -> HLOCAL;
-    pub fn LocalHandle(pMem: LPCVOID) -> HLOCAL;
-    pub fn LocalLock(hMem: HLOCAL) -> LPVOID;
-    pub fn LocalReAlloc(hMem: HLOCAL, uBytes: SIZE_T, uFlags: UINT) -> HLOCAL;
-    pub fn LocalShrink(hMem: HLOCAL, cbNewSize: UINT) -> SIZE_T;
-    pub fn LocalSize(hMem: HLOCAL) -> SIZE_T;
-    pub fn LocalUnlock(hMem: HLOCAL) -> BOOL;
-    pub fn LocaleNameToLCID(lpName: LPCWSTR, dwFlags: DWORD) -> LCID;
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn LocateXStateFeature(Context: PCONTEXT, FeatureId: DWORD, Length: PDWORD) -> PVOID;
-    pub fn LockFile(
-        hFile: HANDLE, dwFileOffsetLow: DWORD, dwFileOffsetHigh: DWORD,
-        nNumberOfBytesToLockLow: DWORD, nNumberOfBytesToLockHigh: DWORD,
-    ) -> BOOL;
-    pub fn LockFileEx(
-        hFile: HANDLE, dwFlags: DWORD, dwReserved: DWORD, nNumberOfBytesToLockLow: DWORD,
-        nNumberOfBytesToLockHigh: DWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn LockResource(hResData: HGLOBAL) -> LPVOID;
-    pub fn MapUserPhysicalPages(
-        VirtualAddress: PVOID, NumberOfPages: ULONG_PTR, PageArray: PULONG_PTR,
-    ) -> BOOL;
-    pub fn MapUserPhysicalPagesScatter(
-        VirtualAddresses: *mut PVOID, NumberOfPages: ULONG_PTR, PageArray: PULONG_PTR,
-    ) -> BOOL;
-    pub fn MapViewOfFile(
-        hFileMappingObject: HANDLE, dwDesiredAccess: DWORD, dwFileOffsetHigh: DWORD,
-        dwFileOffsetLow: DWORD, dwNumberOfBytesToMap: SIZE_T,
-    ) -> LPVOID;
-    pub fn MapViewOfFileEx(
-        hFileMappingObject: HANDLE, dwDesiredAccess: DWORD, dwFileOffsetHigh: DWORD,
-        dwFileOffsetLow: DWORD, dwNumberOfBytesToMap: SIZE_T, lpBaseAddress: LPVOID,
-    ) -> LPVOID;
-    pub fn MapViewOfFileExNuma(
-        hFileMappingObject: HANDLE, dwDesiredAccess: DWORD, dwFileOffsetHigh: DWORD,
-        dwFileOffsetLow: DWORD, dwNumberOfBytesToMap: SIZE_T, lpBaseAddress: LPVOID,
-        nndPreferred: DWORD,
-    ) -> LPVOID;
-    pub fn MapViewOfFileFromApp(
-        hFileMappingObject: HANDLE, DesiredAccess: ULONG, FileOffset: ULONG64,
-        NumberOfBytesToMap: SIZE_T,
-    ) -> PVOID;
-    pub fn Module32First(hSnapshot: HANDLE, lpme: LPMODULEENTRY32) -> BOOL;
-    pub fn Module32FirstW(hSnapshot: HANDLE, lpme: LPMODULEENTRY32W) -> BOOL;
-    pub fn Module32Next(hSnapshot: HANDLE, lpme: LPMODULEENTRY32) -> BOOL;
-    pub fn Module32NextW(hSnapshot: HANDLE, lpme: LPMODULEENTRY32W) -> BOOL;
-    pub fn MoveFileA(lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR) -> BOOL;
-    pub fn MoveFileExA(lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, dwFlags: DWORD) -> BOOL;
-    pub fn MoveFileExW(lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, dwFlags: DWORD) -> BOOL;
-    pub fn MoveFileTransactedA(
-        lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn MoveFileTransactedW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn MoveFileW(lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR) -> BOOL;
-    pub fn MoveFileWithProgressA(
-        lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn MoveFileWithProgressW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn MulDiv(nNumber: c_int, nNumerator: c_int, nDenominator: c_int) -> c_int;
-    pub fn MultiByteToWideChar(
-        CodePage: UINT, dwFlags: DWORD, lpMultiByteStr: LPCSTR, cbMultiByte: c_int,
-        lpWideCharStr: LPWSTR, cchWideChar: c_int,
-    ) -> c_int;
-    pub fn NeedCurrentDirectoryForExePathA(ExeName: LPCSTR) -> BOOL;
-    pub fn NeedCurrentDirectoryForExePathW(ExeName: LPCWSTR) -> BOOL;
-    pub fn NormalizeString(
-        NormForm: NORM_FORM, lpSrcString: LPCWSTR, cwSrcLength: c_int, lpDstString: LPWSTR,
-        cwDstLength: c_int,
-    ) -> c_int;
-    // pub fn NotifyMountMgr();
-    pub fn NotifyUILanguageChange(
-        dwFlags: DWORD, pcwstrNewLanguage: PCWSTR, pcwstrPreviousLanguage: PCWSTR,
-        dwReserved: DWORD, pdwStatusRtrn: PDWORD,
-    ) -> BOOL;
-    // pub fn OOBEComplete();
-    pub fn OpenEventA(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR) -> HANDLE;
-    pub fn OpenEventW(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR) -> HANDLE;
-    pub fn OpenFile(lpFileName: LPCSTR, lpReOpenBuff: LPOFSTRUCT, uStyle: UINT) -> HFILE;
-    pub fn OpenFileById(
-        hVolumeHint: HANDLE, lpFileId: LPFILE_ID_DESCRIPTOR, dwDesiredAccess: DWORD,
-        dwShareMode: DWORD, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-        dwFlagsAndAttributes: DWORD,
-    ) -> HANDLE;
-    pub fn OpenFileMappingA(
-        dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn OpenFileMappingW(
-        dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn OpenJobObjectA(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR) -> HANDLE;
-    pub fn OpenJobObjectW(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR) -> HANDLE;
-    pub fn OpenMutexA(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR) -> HANDLE;
-    pub fn OpenMutexW(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR) -> HANDLE;
-    // pub fn OpenPackageInfoByFullName();
-    pub fn OpenPrivateNamespaceA(lpBoundaryDescriptor: LPVOID, lpAliasPrefix: LPCSTR) -> HANDLE;
-    pub fn OpenPrivateNamespaceW(lpBoundaryDescriptor: LPVOID, lpAliasPrefix: LPCWSTR) -> HANDLE;
-    pub fn OpenProcess(dwDesiredAccess: DWORD, bInheritHandle: BOOL, dwProcessId: DWORD) -> HANDLE;
-    pub fn OpenSemaphoreA(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR) -> HANDLE;
-    pub fn OpenSemaphoreW(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR) -> HANDLE;
-    // pub fn OpenState();
-    // pub fn OpenStateExplicit();
-    pub fn OpenThread(dwDesiredAccess: DWORD, bInheritHandle: BOOL, dwThreadId: DWORD) -> HANDLE;
-    pub fn OpenWaitableTimerA(
-        dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpTimerName: LPCSTR,
-    ) -> HANDLE;
-    pub fn OpenWaitableTimerW(
-        dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpTimerName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn OutputDebugStringA(lpOutputString: LPCSTR);
-    pub fn OutputDebugStringW(lpOutputString: LPCWSTR);
-    // pub fn PackageFamilyNameFromFullName();
-    // pub fn PackageFamilyNameFromId();
-    // pub fn PackageFullNameFromId();
-    // pub fn PackageIdFromFullName();
-    // pub fn PackageNameAndPublisherIdFromFamilyName();
-    // pub fn ParseApplicationUserModelId();
-    pub fn PeekConsoleInputA(
-        hConsoleInput: HANDLE, lpBuffer: PINPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn PeekConsoleInputW(
-        hConsoleInput: HANDLE, lpBuffer: PINPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn PeekNamedPipe(
-        hNamedPipe: HANDLE, lpBuffer: LPVOID, nBufferSize: DWORD, lpBytesRead: LPDWORD,
-        lpTotalBytesAvail: LPDWORD, lpBytesLeftThisMessage: LPDWORD,
-    ) -> BOOL;
-    pub fn PostQueuedCompletionStatus(
-        CompletionPort: HANDLE, dwNumberOfBytesTransferred: DWORD, dwCompletionKey: ULONG_PTR,
-        lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn PowerClearRequest(PowerRequest: HANDLE, RequestType: POWER_REQUEST_TYPE) -> BOOL;
-    pub fn PowerCreateRequest(Context: PREASON_CONTEXT) -> HANDLE;
-    pub fn PowerSetRequest(PowerRequest: HANDLE, RequestType: POWER_REQUEST_TYPE) -> BOOL;
-    pub fn PrefetchVirtualMemory(
-        hProcess: HANDLE, NumberOfEntries: ULONG_PTR, VirtualAddresses: PWIN32_MEMORY_RANGE_ENTRY,
-        Flags: ULONG,
-    ) -> BOOL;
-    pub fn PrepareTape(hDevice: HANDLE, dwOperation: DWORD, bImmediate: BOOL) -> DWORD;
-    pub fn Process32First(hSnapshot: HANDLE, lppe: LPPROCESSENTRY32) -> BOOL;
-    pub fn Process32FirstW(hSnapshot: HANDLE, lppe: LPPROCESSENTRY32W) -> BOOL;
-    pub fn Process32Next(hSnapshot: HANDLE, lppe: LPPROCESSENTRY32) -> BOOL;
-    pub fn Process32NextW(hSnapshot: HANDLE, lppe: LPPROCESSENTRY32W) -> BOOL;
-    pub fn ProcessIdToSessionId(dwProcessId: DWORD, pSessionId: *mut DWORD) -> BOOL;
-    pub fn PssCaptureSnapshot(
-        ProcessHandle: HANDLE, CaptureFlags: PSS_CAPTURE_FLAGS, ThreadContextFlags: DWORD,
-        SnapshotHandle: *mut HPSS,
-    ) -> DWORD;
-    pub fn PssDuplicateSnapshot(
-        SourceProcessHandle: HANDLE, SnapshotHandle: HPSS, TargetProcessHandle: HANDLE,
-        TargetSnapshotHandle: *mut HPSS, Flags: PSS_DUPLICATE_FLAGS,
-    ) -> DWORD;
-    pub fn PssFreeSnapshot(ProcessHandle: HANDLE, SnapshotHandle: HPSS) -> DWORD;
-    pub fn PssQuerySnapshot(
-        SnapshotHandle: HPSS, InformationClass: PSS_QUERY_INFORMATION_CLASS, Buffer: *mut c_void,
-        BufferLength: DWORD,
-    ) -> DWORD;
-    pub fn PssWalkMarkerCreate(
-        Allocator: *const PSS_ALLOCATOR, WalkMarkerHandle: *mut HPSSWALK,
-    ) -> DWORD;
-    pub fn PssWalkMarkerFree(WalkMarkerHandle: HPSSWALK) -> DWORD;
-    pub fn PssWalkMarkerGetPosition(WalkMarkerHandle: HPSSWALK, Position: *mut ULONG_PTR) -> DWORD;
-    // pub fn PssWalkMarkerRewind();
-    // pub fn PssWalkMarkerSeek();
-    pub fn PssWalkMarkerSeekToBeginning(WalkMarkerHandle: HPSS) -> DWORD;
-    pub fn PssWalkMarkerSetPosition(WalkMarkerHandle: HPSSWALK, Position: ULONG_PTR) -> DWORD;
-    // pub fn PssWalkMarkerTell();
-    pub fn PssWalkSnapshot(
-        SnapshotHandle: HPSS, InformationClass: PSS_WALK_INFORMATION_CLASS,
-        WalkMarkerHandle: HPSSWALK, Buffer: *mut c_void, BufferLength: DWORD,
-    ) -> DWORD;
-    pub fn PulseEvent(hEvent: HANDLE) -> BOOL;
-    pub fn PurgeComm(hFile: HANDLE, dwFlags: DWORD) -> BOOL;
-    pub fn QueryActCtxSettingsW(
-        dwFlags: DWORD, hActCtx: HANDLE, settingsNameSpace: PCWSTR, settingName: PCWSTR,
-        pvBuffer: PWSTR, dwBuffer: SIZE_T, pdwWrittenOrRequired: *mut SIZE_T,
-    ) -> BOOL;
-    pub fn QueryActCtxW(
-        dwFlags: DWORD, hActCtx: HANDLE, pvSubInstance: PVOID, ulInfoClass: ULONG, pvBuffer: PVOID,
-        cbBuffer: SIZE_T, pcbWrittenOrRequired: *mut SIZE_T,
-    ) -> BOOL;
-    pub fn QueryDepthSList(ListHead: PSLIST_HEADER) -> USHORT;
-    pub fn QueryDosDeviceA(lpDeviceName: LPCSTR, lpTargetPath: LPSTR, ucchMax: DWORD) -> DWORD;
-    pub fn QueryDosDeviceW(lpDeviceName: LPCWSTR, lpTargetPath: LPWSTR, ucchMax: DWORD) -> DWORD;
-    pub fn QueryFullProcessImageNameA(
-        hProcess: HANDLE, dwFlags: DWORD, lpExeName: LPSTR, lpdwSize: PDWORD,
-    ) -> BOOL;
-    pub fn QueryFullProcessImageNameW(
-        hProcess: HANDLE, dwFlags: DWORD, lpExeName: LPWSTR, lpdwSize: PDWORD,
-    ) -> BOOL;
-    pub fn QueryIdleProcessorCycleTime(
-        BufferLength: PULONG, ProcessorIdleCycleTime: PULONG64,
-    ) -> BOOL;
-    pub fn QueryIdleProcessorCycleTimeEx(
-        Group: USHORT, BufferLength: PULONG, ProcessorIdleCycleTime: PULONG64,
-    ) -> BOOL;
-    pub fn QueryInformationJobObject(
-        hJob: HANDLE, JobObjectInformationClass: JOBOBJECTINFOCLASS,
-        lpJobObjectInformation: LPVOID, cbJobObjectInformationLength: DWORD,
-        lpReturnLength: LPDWORD,
-    ) -> BOOL;
-    pub fn QueryMemoryResourceNotification(
-        ResourceNotificationHandle: HANDLE, ResourceState: PBOOL,
-    ) -> BOOL;
-    pub fn QueryPerformanceCounter(lpPerformanceCount: *mut LARGE_INTEGER) -> BOOL;
-    pub fn QueryPerformanceFrequency(lpFrequency: *mut LARGE_INTEGER) -> BOOL;
-    pub fn QueryProcessAffinityUpdateMode(hProcess: HANDLE, lpdwFlags: LPDWORD) -> BOOL;
-    pub fn QueryProcessCycleTime(ProcessHandle: HANDLE, CycleTime: PULONG64) -> BOOL;
-    pub fn QueryProtectedPolicy(PolicyGuid: LPCGUID, PolicyValue: PULONG_PTR) -> BOOL;
-    pub fn QueryThreadCycleTime(ThreadHandle: HANDLE, CycleTime: PULONG64) -> BOOL;
-    pub fn QueryThreadProfiling(ThreadHandle: HANDLE, Enabled: PBOOLEAN) -> DWORD;
-    pub fn QueryThreadpoolStackInformation(
-        ptpp: PTP_POOL, ptpsi: PTP_POOL_STACK_INFORMATION,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn QueryUmsThreadInformation(
-        UmsThread: PUMS_CONTEXT, UmsThreadInfoClass: UMS_THREAD_INFO_CLASS,
-        UmsThreadInformation: PVOID, UmsThreadInformationLength: ULONG, ReturnLength: PULONG,
-    ) -> BOOL;
-    pub fn QueryUnbiasedInterruptTime(UnbiasedTime: PULONGLONG) -> BOOL;
-    pub fn QueueUserAPC(pfnAPC: PAPCFUNC, hThread: HANDLE, dwData: ULONG_PTR) -> DWORD;
-    pub fn QueueUserWorkItem(
-        Function: LPTHREAD_START_ROUTINE, Context: PVOID, Flags: ULONG,
-    ) -> BOOL;
-    pub fn RaiseException(
-        dwExceptionCode: DWORD, dwExceptionFlags: DWORD, nNumberOfArguments: DWORD,
-        lpArguments: *const ULONG_PTR,
-    );
-    pub fn RaiseFailFastException(
-        pExceptionRecord: PEXCEPTION_RECORD, pContextRecord: PCONTEXT, dwFlags: DWORD,
-    );
-    pub fn ReOpenFile(
-        hOriginalFile: HANDLE, dwDesiredAccess: DWORD, dwShareMode: DWORD, dwFlags: DWORD,
-    ) -> HANDLE;
-    pub fn ReadConsoleA(
-        hConsoleInput: HANDLE, lpBuffer: LPVOID, nNumberOfCharsToRead: DWORD,
-        lpNumberOfCharsRead: LPDWORD, pInputControl: PCONSOLE_READCONSOLE_CONTROL,
-    ) -> BOOL;
-    pub fn ReadConsoleInputA(
-        hConsoleInput: HANDLE, lpBuffer: PINPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleInputW(
-        hConsoleInput: HANDLE, lpBuffer: PINPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputA(
-        hConsoleOutput: HANDLE, lpBuffer: PCHAR_INFO, dwBufferSize: COORD, dwBufferCoord: COORD,
-        lpReadRegion: PSMALL_RECT,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputAttribute(
-        hConsoleOutput: HANDLE, lpAttribute: LPWORD, nLength: DWORD, dwReadCoord: COORD,
-        lpNumberOfAttrsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputCharacterA(
-        hConsoleOutput: HANDLE, lpCharacter: LPSTR, nLength: DWORD, dwReadCoord: COORD,
-        lpNumberOfCharsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputCharacterW(
-        hConsoleOutput: HANDLE, lpCharacter: LPWSTR, nLength: DWORD, dwReadCoord: COORD,
-        lpNumberOfCharsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputW(
-        hConsoleOutput: HANDLE, lpBuffer: PCHAR_INFO, dwBufferSize: COORD, dwBufferCoord: COORD,
-        lpReadRegion: PSMALL_RECT,
-    ) -> BOOL;
-    pub fn ReadConsoleW(
-        hConsoleInput: HANDLE, lpBuffer: LPVOID, nNumberOfCharsToRead: DWORD,
-        lpNumberOfCharsRead: LPDWORD, pInputControl: PCONSOLE_READCONSOLE_CONTROL,
-    ) -> BOOL;
-    pub fn ReadDirectoryChangesW(
-        hDirectory: HANDLE, lpBuffer: LPVOID, nBufferLength: DWORD, bWatchSubtree: BOOL,
-        dwNotifyFilter: DWORD, lpBytesReturned: LPDWORD, lpOverlapped: LPOVERLAPPED,
-        lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> BOOL;
-    pub fn ReadFile(
-        hFile: HANDLE, lpBuffer: LPVOID, nNumberOfBytesToRead: DWORD, lpNumberOfBytesRead: LPDWORD,
-        lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn ReadFileEx(
-        hFile: HANDLE, lpBuffer: LPVOID, nNumberOfBytesToRead: DWORD, lpOverlapped: LPOVERLAPPED,
-        lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> BOOL;
-    pub fn ReadFileScatter(
-        hFile: HANDLE, aSegmentArray: *mut FILE_SEGMENT_ELEMENT, nNumberOfBytesToRead: DWORD,
-        lpReserved: LPDWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn ReadProcessMemory(
-        hProcess: HANDLE, lpBaseAddress: LPCVOID, lpBuffer: LPVOID, nSize: SIZE_T,
-        lpNumberOfBytesRead: *mut SIZE_T,
-    ) -> BOOL;
-    pub fn ReadThreadProfilingData(
-        PerformanceDataHandle: HANDLE, Flags: DWORD, PerformanceData: PPERFORMANCE_DATA,
-    ) -> DWORD;
-    pub fn RegisterApplicationRecoveryCallback(
-        pRecoveyCallback: APPLICATION_RECOVERY_CALLBACK, pvParameter: PVOID, dwPingInterval: DWORD,
-        dwFlags: DWORD,
-    ) -> HRESULT;
-    pub fn RegisterApplicationRestart(pwzCommandline: PCWSTR, dwFlags: DWORD) -> HRESULT;
-    pub fn RegisterBadMemoryNotification(Callback: PBAD_MEMORY_CALLBACK_ROUTINE) -> PVOID;
-    // pub fn RegisterWaitForInputIdle();
-    pub fn RegisterWaitForSingleObject(
-        phNewWaitObject: PHANDLE, hObject: HANDLE, Callback: WAITORTIMERCALLBACK, Context: PVOID,
-        dwMilliseconds: ULONG, dwFlags: ULONG,
-    ) -> BOOL;
-    pub fn RegisterWaitForSingleObjectEx(
-        hObject: HANDLE, Callback: WAITORTIMERCALLBACK, Context: PVOID, dwMilliseconds: ULONG,
-        dwFlags: ULONG,
-    ) -> HANDLE;
-    // pub fn RegisterWaitUntilOOBECompleted();
-    pub fn ReleaseActCtx(hActCtx: HANDLE);
-    pub fn ReleaseMutex(hMutex: HANDLE) -> BOOL;
-    pub fn ReleaseMutexWhenCallbackReturns(pci: PTP_CALLBACK_INSTANCE, mutex: HANDLE);
-    pub fn ReleaseSRWLockExclusive(SRWLock: PSRWLOCK);
-    pub fn ReleaseSRWLockShared(SRWLock: PSRWLOCK);
-    pub fn ReleaseSemaphore(
-        hSemaphore: HANDLE, lReleaseCount: LONG, lpPreviousCount: LPLONG,
-    ) -> BOOL;
-    pub fn ReleaseSemaphoreWhenCallbackReturns(
-        pci: PTP_CALLBACK_INSTANCE, sem: HANDLE, crel: DWORD,
-    );
-    pub fn RemoveDirectoryA(lpPathName: LPCSTR) -> BOOL;
-    pub fn RemoveDirectoryTransactedA(lpPathName: LPCSTR, hTransaction: HANDLE) -> BOOL;
-    pub fn RemoveDirectoryTransactedW(lpPathName: LPCWSTR, hTransaction: HANDLE) -> BOOL;
-    pub fn RemoveDirectoryW(lpPathName: LPCWSTR) -> BOOL;
-    pub fn RemoveDllDirectory(Cookie: DLL_DIRECTORY_COOKIE) -> BOOL;
-    // pub fn RemoveLocalAlternateComputerNameA();
-    // pub fn RemoveLocalAlternateComputerNameW();
-    pub fn RemoveSecureMemoryCacheCallback(pfnCallBack: PSECURE_MEMORY_CACHE_CALLBACK) -> BOOL;
-    pub fn RemoveVectoredContinueHandler(Handle: PVOID) -> ULONG;
-    pub fn RemoveVectoredExceptionHandler(Handle: PVOID) -> ULONG;
-    pub fn ReplaceFileA(
-        lpReplacedFileName: LPCSTR, lpReplacementFileName: LPCSTR, lpBackupFileName: LPCSTR,
-        dwReplaceFlags: DWORD, lpExclude: LPVOID, lpReserved: LPVOID,
-    );
-    pub fn ReplaceFileW(
-        lpReplacedFileName: LPCWSTR, lpReplacementFileName: LPCWSTR, lpBackupFileName: LPCWSTR,
-        dwReplaceFlags: DWORD, lpExclude: LPVOID, lpReserved: LPVOID,
-    );
-    pub fn ReplacePartitionUnit(
-        TargetPartition: PWSTR, SparePartition: PWSTR, Flags: ULONG,
-    ) -> BOOL;
-    pub fn RequestDeviceWakeup(hDevice: HANDLE) -> BOOL;
-    pub fn RequestWakeupLatency(latency: LATENCY_TIME) -> BOOL;
-    pub fn ResetEvent(hEvent: HANDLE) -> BOOL;
-    pub fn ResetWriteWatch(lpBaseAddress: LPVOID, dwRegionSize: SIZE_T) -> UINT;
-    // pub fn ResolveDelayLoadedAPI();
-    // pub fn ResolveDelayLoadsFromDll();
-    pub fn ResolveLocaleName(
-        lpNameToResolve: LPCWSTR, lpLocaleName: LPWSTR, cchLocaleName: c_int,
-    ) -> c_int;
-    pub fn RestoreLastError(dwErrCode: DWORD);
-    pub fn ResumeThread(hThread: HANDLE) -> DWORD;
-    #[cfg(target_arch = "arm")]
-    pub fn RtlAddFunctionTable(
-        FunctionTable: PRUNTIME_FUNCTION, EntryCount: DWORD, BaseAddress: DWORD,
-    ) -> BOOLEAN;
-    #[cfg(target_arch = "x86_64")]
-    pub fn RtlAddFunctionTable(
-        FunctionTable: PRUNTIME_FUNCTION, EntryCount: DWORD, BaseAddress: DWORD64,
-    ) -> BOOLEAN;
-    pub fn RtlCaptureContext(ContextRecord: PCONTEXT);
-    pub fn RtlCaptureStackBackTrace(
-        FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: *mut PVOID, BackTraceHash: PDWORD,
-    ) -> WORD;
-    // #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlCompareMemory(Source1: *const VOID, Source2: *const VOID, Length: SIZE_T) -> SIZE_T;
-    // #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlCopyMemory(Destination: PVOID, Source: *const VOID, Length: SIZE_T);
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlDeleteFunctionTable(FunctionTable: PRUNTIME_FUNCTION) -> BOOLEAN;
-    // pub fn RtlFillMemory();
-    #[cfg(target_arch = "arm")]
-    pub fn RtlInstallFunctionTableCallback(
-        TableIdentifier: DWORD, BaseAddress: DWORD, Length: DWORD,
-        Callback: PGET_RUNTIME_FUNCTION_CALLBACK, Context: PVOID, OutOfProcessCallbackDll: PCWSTR,
-    ) -> BOOLEAN;
-    #[cfg(target_arch = "x86_64")]
-    pub fn RtlInstallFunctionTableCallback(
-        TableIdentifier: DWORD64, BaseAddress: DWORD64, Length: DWORD,
-        Callback: PGET_RUNTIME_FUNCTION_CALLBACK, Context: PVOID, OutOfProcessCallbackDll: PCWSTR,
-    ) -> BOOLEAN;
-    #[cfg(target_arch = "arm")]
-    pub fn RtlLookupFunctionEntry(
-        ControlPc: ULONG_PTR, ImageBase: PDWORD, HistoryTable: PUNWIND_HISTORY_TABLE,
-    ) -> PRUNTIME_FUNCTION;
-    #[cfg(target_arch = "x86_64")]
-    pub fn RtlLookupFunctionEntry(
-        ControlPc: DWORD64, ImageBase: PDWORD64, HistoryTable: PUNWIND_HISTORY_TABLE,
-    ) -> PRUNTIME_FUNCTION;
-    // pub fn RtlMoveMemory();
-    // #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlPcToFileHeader(PcValue: PVOID, BaseOfImage: *mut PVOID) -> PVOID;
-    // #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    // pub fn RtlRaiseException();
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlRestoreContext(ContextRecord: PCONTEXT, ExceptionRecord: *mut EXCEPTION_RECORD);
-    pub fn RtlUnwind(
-        TargetFrame: PVOID, TargetIp: PVOID, ExceptionRecord: PEXCEPTION_RECORD, ReturnValue: PVOID,
-    );
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlUnwindEx(
-        TargetFrame: PVOID, TargetIp: PVOID, ExceptionRecord: PEXCEPTION_RECORD, ReturnValue: PVOID,
-        ContextRecord: PCONTEXT, HistoryTable: PUNWIND_HISTORY_TABLE,
-    );
-    #[cfg(target_arch = "arm")]
-    pub fn RtlVirtualUnwind(
-        HandlerType: DWORD, ImageBase: DWORD, ControlPc: DWORD, FunctionEntry: PRUNTIME_FUNCTION,
-        ContextRecord: PCONTEXT, HandlerData: *mut PVOID, EstablisherFrame: PDWORD,
-        ContextPointers: PKNONVOLATILE_CONTEXT_POINTERS,
-    ) -> PEXCEPTION_ROUTINE;
-    #[cfg(target_arch = "x86_64")]
-    pub fn RtlVirtualUnwind(
-        HandlerType: DWORD, ImageBase: DWORD64, ControlPc: DWORD64,
-        FunctionEntry: PRUNTIME_FUNCTION, ContextRecord: PCONTEXT, HandlerData: *mut PVOID,
-        EstablisherFrame: PDWORD64, ContextPointers: PKNONVOLATILE_CONTEXT_POINTERS,
-    ) -> PEXCEPTION_ROUTINE;
-    // pub fn RtlZeroMemory();
-    pub fn ScrollConsoleScreenBufferA(
-        hConsoleOutput: HANDLE, lpScrollRectangle: *const SMALL_RECT,
-        lpClipRectangle: *const SMALL_RECT, dwDestinationOrigin: COORD, lpFill: *const CHAR_INFO,
-    ) -> BOOL;
-    pub fn ScrollConsoleScreenBufferW(
-        hConsoleOutput: HANDLE, lpScrollRectangle: *const SMALL_RECT,
-        lpClipRectangle: *const SMALL_RECT, dwDestinationOrigin: COORD, lpFill: *const CHAR_INFO,
-    ) -> BOOL;
-    pub fn SearchPathA(
-        lpPath: LPCSTR, lpFileName: LPCSTR, lpExtension: LPCSTR, nBufferLength: DWORD,
-        lpBuffer: LPSTR, lpFilePart: *mut LPSTR,
-    ) -> DWORD;
-    pub fn SearchPathW(
-        lpPath: LPCWSTR, lpFileName: LPCWSTR, lpExtension: LPCWSTR, nBufferLength: DWORD,
-        lpBuffer: LPWSTR, lpFilePart: *mut LPWSTR,
-    ) -> DWORD;
-    pub fn SetCachedSigningLevel(
-        SourceFiles: PHANDLE, SourceFileCount: ULONG, Flags: ULONG, TargetFile: HANDLE,
-    ) -> BOOL;
-    pub fn SetCalendarInfoA(
-        Locale: LCID, Calendar: CALID, CalType: CALTYPE, lpCalData: LPCSTR,
-    ) -> BOOL;
-    pub fn SetCalendarInfoW(
-        Locale: LCID, Calendar: CALID, CalType: CALTYPE, lpCalData: LPCWSTR,
-    ) -> BOOL;
-    pub fn SetCommBreak(hFile: HANDLE) -> BOOL;
-    pub fn SetCommConfig(hCommDev: HANDLE, lpCC: LPCOMMCONFIG, dwSize: DWORD) -> BOOL;
-    pub fn SetCommMask(hFile: HANDLE, dwEvtMask: DWORD) -> BOOL;
-    pub fn SetCommState(hFile: HANDLE, lpDCB: LPDCB) -> BOOL;
-    pub fn SetCommTimeouts(hFile: HANDLE, lpCommTimeouts: LPCOMMTIMEOUTS) -> BOOL;
-    pub fn SetComputerNameA(lpComputerName: LPCSTR) -> BOOL;
-    pub fn SetComputerNameEx2W(
-        NameType: COMPUTER_NAME_FORMAT, Flags: DWORD, lpBuffer: LPCWSTR,
-    ) -> BOOL;
-    pub fn SetComputerNameExA(NameType: COMPUTER_NAME_FORMAT, lpBuffer: LPCSTR) -> BOOL;
-    pub fn SetComputerNameExW(NameType: COMPUTER_NAME_FORMAT, lpBuffer: LPCWSTR) -> BOOL;
-    pub fn SetComputerNameW(lpComputerName: LPCWSTR) -> BOOL;
-    pub fn SetConsoleActiveScreenBuffer(hConsoleOutput: HANDLE) -> BOOL;
-    pub fn SetConsoleCP(wCodePageID: UINT) -> BOOL;
-    pub fn SetConsoleCtrlHandler(HandlerRoutine: PHANDLER_ROUTINE, Add: BOOL) -> BOOL;
-    // pub fn SetConsoleCursor();
-    pub fn SetConsoleCursorInfo(
-        hConsoleOutput: HANDLE, lpConsoleCursorInfo: *const CONSOLE_CURSOR_INFO,
-    ) -> BOOL;
-    pub fn SetConsoleCursorPosition(hConsoleOutput: HANDLE, dwCursorPosition: COORD) -> BOOL;
-    pub fn SetConsoleDisplayMode(
-        hConsoleOutput: HANDLE, dwFlags: DWORD, lpNewScreenBufferDimensions: PCOORD,
-    ) -> BOOL;
-    pub fn SetConsoleHistoryInfo(lpConsoleHistoryInfo: PCONSOLE_HISTORY_INFO) -> BOOL;
-    pub fn SetConsoleMode(hConsoleHandle: HANDLE, dwMode: DWORD) -> BOOL;
-    pub fn SetConsoleOutputCP(wCodePageID: UINT) -> BOOL;
-    pub fn SetConsoleScreenBufferInfoEx(
-        hConsoleOutput: HANDLE, lpConsoleScreenBufferInfoEx: PCONSOLE_SCREEN_BUFFER_INFOEX,
-    ) -> BOOL;
-    pub fn SetConsoleScreenBufferSize(hConsoleOutput: HANDLE, dwSize: COORD) -> BOOL;
-    pub fn SetConsoleTextAttribute(hConsoleOutput: HANDLE, wAttributes: WORD) -> BOOL;
-    pub fn SetConsoleTitleA(lpConsoleTitle: LPCSTR) -> BOOL;
-    pub fn SetConsoleTitleW(lpConsoleTitle: LPCWSTR) -> BOOL;
-    pub fn SetConsoleWindowInfo(
-        hConsoleOutput: HANDLE, bAbsolute: BOOL, lpConsoleWindow: *const SMALL_RECT,
-    ) -> BOOL;
-    pub fn SetCriticalSectionSpinCount(
-        lpCriticalSection: LPCRITICAL_SECTION, dwSpinCount: DWORD,
-    ) -> DWORD;
-    pub fn SetCurrentConsoleFontEx(
-        hConsoleOutput: HANDLE, bMaximumWindow: BOOL, lpConsoleCurrentFontEx: PCONSOLE_FONT_INFOEX,
-    ) -> BOOL;
-    pub fn SetCurrentDirectoryA(lpPathName: LPCSTR) -> BOOL;
-    pub fn SetCurrentDirectoryW(lpPathName: LPCWSTR) -> BOOL;
-    pub fn SetDefaultCommConfigA(lpszName: LPCSTR, lpCC: LPCOMMCONFIG, dwSize: DWORD) -> BOOL;
-    pub fn SetDefaultCommConfigW(lpszName: LPCWSTR, lpCC: LPCOMMCONFIG, dwSize: DWORD) -> BOOL;
-    pub fn SetDefaultDllDirectories(DirectoryFlags: DWORD) -> BOOL;
-    pub fn SetDllDirectoryA(lpPathName: LPCSTR) -> BOOL;
-    pub fn SetDllDirectoryW(lpPathName: LPCWSTR) -> BOOL;
-    pub fn SetDynamicTimeZoneInformation(
-        lpTimeZoneInformation: *const DYNAMIC_TIME_ZONE_INFORMATION,
-    ) -> BOOL;
-    pub fn SetEndOfFile(hFile: HANDLE) -> BOOL;
-    pub fn SetEnvironmentStringsA(NewEnvironment: LPCH) -> BOOL;
-    pub fn SetEnvironmentStringsW(NewEnvironment: LPWCH) -> BOOL;
-    pub fn SetEnvironmentVariableA(lpName: LPCSTR, lpValue: LPCSTR) -> BOOL;
-    pub fn SetEnvironmentVariableW(lpName: LPCWSTR, lpValue: LPCWSTR) -> BOOL;
-    pub fn SetErrorMode(uMode: UINT) -> UINT;
-    pub fn SetEvent(hEvent: HANDLE) -> BOOL;
-    pub fn SetEventWhenCallbackReturns(pci: PTP_CALLBACK_INSTANCE, evt: HANDLE);
-    pub fn SetFileApisToANSI();
-    pub fn SetFileApisToOEM();
-    pub fn SetFileAttributesA(lpFileName: LPCSTR, dwFileAttributes: DWORD) -> BOOL;
-    pub fn SetFileAttributesTransactedA(
-        lpFileName: LPCSTR, dwFileAttributes: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn SetFileAttributesTransactedW(
-        lpFileName: LPCWSTR, dwFileAttributes: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn SetFileAttributesW(lpFileName: LPCWSTR, dwFileAttributes: DWORD) -> BOOL;
-    pub fn SetFileBandwidthReservation(
-        hFile: HANDLE, nPeriodMilliseconds: DWORD, nBytesPerPeriod: DWORD, bDiscardable: BOOL,
-        lpTransferSize: LPDWORD, lpNumOutstandingRequests: LPDWORD,
-    ) -> BOOL;
-    pub fn SetFileCompletionNotificationModes(FileHandle: HANDLE, Flags: UCHAR) -> BOOL;
-    pub fn SetFileInformationByHandle(
-        hFile: HANDLE, FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, lpFileInformation: LPVOID,
-        dwBufferSize: DWORD,
-    ) -> BOOL;
-    pub fn SetFileIoOverlappedRange(
-        FileHandle: HANDLE, OverlappedRangeStart: PUCHAR, Length: ULONG,
-    ) -> BOOL;
-    pub fn SetFilePointer(
-        hFile: HANDLE, lDistanceToMove: LONG, lpDistanceToMoveHigh: PLONG, dwMoveMethod: DWORD,
-    ) -> DWORD;
-    pub fn SetFilePointerEx(
-        hFile: HANDLE, liDistanceToMove: LARGE_INTEGER, lpNewFilePointer: PLARGE_INTEGER,
-        dwMoveMethod: DWORD,
-    ) -> BOOL;
-    pub fn SetFileShortNameA(hFile: HANDLE, lpShortName: LPCSTR) -> BOOL;
-    pub fn SetFileShortNameW(hFile: HANDLE, lpShortName: LPCWSTR) -> BOOL;
-    pub fn SetFileTime(
-        hFile: HANDLE, lpCreationTime: *const FILETIME, lpLastAccessTime: *const FILETIME,
-        lpLastWriteTime: *const FILETIME,
-    ) -> BOOL;
-    pub fn SetFileValidData(hFile: HANDLE, ValidDataLength: LONGLONG) -> BOOL;
-    pub fn SetFirmwareEnvironmentVariableA(
-        lpName: LPCSTR, lpGuid: LPCSTR, pValue: PVOID, nSize: DWORD,
-    ) -> BOOL;
-    pub fn SetFirmwareEnvironmentVariableExA(
-        lpName: LPCSTR, lpGuid: LPCSTR, pValue: PVOID, nSize: DWORD, dwAttributes: DWORD,
-    ) -> BOOL;
-    pub fn SetFirmwareEnvironmentVariableExW(
-        lpName: LPCWSTR, lpGuid: LPCWSTR, pValue: PVOID, nSize: DWORD, dwAttributes: DWORD,
-    ) -> BOOL;
-    pub fn SetFirmwareEnvironmentVariableW(
-        lpName: LPCWSTR, lpGuid: LPCWSTR, pValue: PVOID, nSize: DWORD,
-    ) -> BOOL;
-    pub fn SetHandleCount(uNumber: UINT) -> UINT;
-    pub fn SetHandleInformation(hObject: HANDLE, dwMask: DWORD, dwFlags: DWORD) -> BOOL;
-    pub fn SetInformationJobObject(
-        hJob: HANDLE, JobObjectInformationClass: JOBOBJECTINFOCLASS,
-        lpJobObjectInformation: LPVOID, cbJobObjectInformationLength: DWORD,
-    ) -> BOOL;
-    pub fn SetLastError(dwErrCode: DWORD);
-    // pub fn SetLocalPrimaryComputerNameA();
-    // pub fn SetLocalPrimaryComputerNameW();
-    pub fn SetLocalTime(lpSystemTime: *const SYSTEMTIME) -> BOOL;
-    pub fn SetLocaleInfoA(Locale: LCID, LCType: LCTYPE, lpLCData: LPCSTR) -> BOOL;
-    pub fn SetLocaleInfoW(Locale: LCID, LCType: LCTYPE, lpLCData: LPCWSTR) -> BOOL;
-    pub fn SetMailslotInfo(hMailslot: HANDLE, lReadTimeout: DWORD) -> BOOL;
-    pub fn SetMessageWaitingIndicator(hMsgIndicator: HANDLE, ulMsgCount: ULONG) -> BOOL;
-    pub fn SetNamedPipeAttribute(
-        Pipe: HANDLE, AttributeType: PIPE_ATTRIBUTE_TYPE, AttributeName: PSTR,
-        AttributeValue: PVOID, AttributeValueLength: SIZE_T,
-    ) -> BOOL;
-    pub fn SetNamedPipeHandleState(
-        hNamedPipe: HANDLE, lpMode: LPDWORD, lpMaxCollectionCount: LPDWORD,
-        lpCollectDataTimeout: LPDWORD,
-    ) -> BOOL;
-    pub fn SetPriorityClass(hProcess: HANDLE, dwPriorityClass: DWORD) -> BOOL;
-    pub fn SetProcessAffinityMask(hProcess: HANDLE, dwProcessAffinityMask: DWORD) -> BOOL;
-    pub fn SetProcessAffinityUpdateMode(hProcess: HANDLE, dwFlags: DWORD) -> BOOL;
-    pub fn SetProcessDEPPolicy(dwFlags: DWORD) -> BOOL;
-    pub fn SetProcessInformation(
-        hProcess: HANDLE, ProcessInformationClass: PROCESS_INFORMATION_CLASS,
-        ProcessInformation: LPVOID, ProcessInformationSize: DWORD,
-    ) -> BOOL;
-    pub fn SetProcessMitigationPolicy(
-        MitigationPolicy: PROCESS_MITIGATION_POLICY, lpBuffer: PVOID, dwLength: SIZE_T,
-    ) -> BOOL;
-    pub fn SetProcessPreferredUILanguages(
-        dwFlags: DWORD, pwszLanguagesBuffer: PCZZWSTR, pulNumLanguages: PULONG,
-    ) -> BOOL;
-    pub fn SetProcessPriorityBoost(hProcess: HANDLE, bDisablePriorityBoost: BOOL) -> BOOL;
-    pub fn SetProcessShutdownParameters(dwLevel: DWORD, dwFlags: DWORD) -> BOOL;
-    pub fn SetProcessWorkingSetSize(
-        hProcess: HANDLE, dwMinimumWorkingSetSize: SIZE_T, dwMaximumWorkingSetSize: SIZE_T,
-    ) -> BOOL;
-    pub fn SetProcessWorkingSetSizeEx(
-        hProcess: HANDLE, dwMinimumWorkingSetSize: SIZE_T, dwMaximumWorkingSetSize: SIZE_T,
-        Flags: DWORD,
-    ) -> BOOL;
-    pub fn SetProtectedPolicy(
-        PolicyGuid: LPCGUID, PolicyValue: ULONG_PTR, OldPolicyValue: PULONG_PTR,
-    ) -> BOOL;
-    pub fn SetSearchPathMode(Flags: DWORD) -> BOOL;
-    pub fn SetStdHandle(nStdHandle: DWORD, hHandle: HANDLE) -> BOOL;
-    pub fn SetStdHandleEx(nStdHandle: DWORD, hHandle: HANDLE, phPrevValue: PHANDLE) -> BOOL;
-    pub fn SetSystemFileCacheSize(
-        MinimumFileCacheSize: SIZE_T, MaximumFileCacheSize: SIZE_T, Flags: DWORD,
-    ) -> BOOL;
-    pub fn SetSystemPowerState(fSuspend: BOOL, fForce: BOOL) -> BOOL;
-    pub fn SetSystemTime(lpSystemTime: *const SYSTEMTIME) -> BOOL;
-    pub fn SetSystemTimeAdjustment(dwTimeAdjustment: DWORD, bTimeAdjustmentDisabled: BOOL) -> BOOL;
-    pub fn SetTapeParameters(
-        hDevice: HANDLE, dwOperation: DWORD, lpTapeInformation: LPVOID,
-    ) -> DWORD;
-    pub fn SetTapePosition(
-        hDevice: HANDLE, dwPositionMethod: DWORD, dwPartition: DWORD,
-        dwOffsetLow: DWORD, dwOffsetHigh: DWORD, bImmediate: BOOL
-    ) -> DWORD;
-    pub fn SetThreadAffinityMask(hThread: HANDLE, dwThreadAffinityMask: DWORD_PTR) -> DWORD_PTR;
-    pub fn SetThreadContext(hThread: HANDLE, lpContext: *const CONTEXT) -> BOOL;
-    pub fn SetThreadErrorMode(dwNewMode: DWORD, lpOldMode: LPDWORD) -> BOOL;
-    pub fn SetThreadExecutionState(esFlags: EXECUTION_STATE) -> EXECUTION_STATE;
-    pub fn SetThreadGroupAffinity(
-        hThread: HANDLE, GroupAffinity: *const GROUP_AFFINITY,
-        PreviousGroupAffinity: PGROUP_AFFINITY,
-    ) -> BOOL;
-    pub fn SetThreadIdealProcessor(hThread: HANDLE, dwIdealProcessor: DWORD) -> DWORD;
-    pub fn SetThreadIdealProcessorEx(
-        hThread: HANDLE, lpIdealProcessor: PPROCESSOR_NUMBER,
-        lpPreviousIdealProcessor: PPROCESSOR_NUMBER,
-    ) -> BOOL;
-    pub fn SetThreadInformation(
-        hThread: HANDLE, ThreadInformationClass: THREAD_INFORMATION_CLASS,
-        ThreadInformation: LPVOID, ThreadInformationSize: DWORD,
-    );
-    pub fn SetThreadLocale(Locale: LCID) -> BOOL;
-    pub fn SetThreadPreferredUILanguages(
-        dwFlags: DWORD, pwszLanguagesBuffer: PCZZWSTR, pulNumLanguages: PULONG,
-    ) -> BOOL;
-    pub fn SetThreadPriority(hThread: HANDLE, nPriority: c_int) -> BOOL;
-    pub fn SetThreadPriorityBoost(hThread: HANDLE, bDisablePriorityBoost: BOOL) -> BOOL;
-    pub fn SetThreadStackGuarantee(StackSizeInBytes: PULONG) -> BOOL;
-    pub fn SetThreadUILanguage(LangId: LANGID) -> LANGID;
-    pub fn SetThreadpoolStackInformation(
-        ptpp: PTP_POOL, ptpsi: PTP_POOL_STACK_INFORMATION,
-    ) -> BOOL;
-    pub fn SetThreadpoolThreadMaximum(ptpp: PTP_POOL, cthrdMost: DWORD);
-    pub fn SetThreadpoolThreadMinimum(ptpp: PTP_POOL, cthrdMic: DWORD) -> BOOL;
-    pub fn SetThreadpoolTimer(
-        pti: PTP_TIMER, pftDueTime: PFILETIME, msPeriod: DWORD, msWindowLength: DWORD,
-    );
-    pub fn SetThreadpoolTimerEx(
-        pti: PTP_TIMER, pftDueTime: PFILETIME, msPeriod: DWORD, msWindowLength: DWORD,
-    ) -> BOOL;
-    pub fn SetThreadpoolWait(pwa: PTP_WAIT, h: HANDLE, pftTimeout: PFILETIME);
-    pub fn SetThreadpoolWaitEx(
-        pwa: PTP_WAIT, h: HANDLE, pftTimeout: PFILETIME, Reserved: PVOID,
-    ) -> BOOL;
-    pub fn SetTimeZoneInformation(lpTimeZoneInformation: *const TIME_ZONE_INFORMATION) -> BOOL;
-    pub fn SetTimerQueueTimer(
-        TimerQueue: HANDLE, Callback: WAITORTIMERCALLBACK, Parameter: PVOID, DueTime: DWORD,
-        Period: DWORD, PreferIo: BOOL,
-    ) -> HANDLE;
-    #[cfg(target_arch = "x86_64")]
-    pub fn SetUmsThreadInformation(
-        UmsThread: PUMS_CONTEXT, UmsThreadInfoClass: UMS_THREAD_INFO_CLASS,
-        UmsThreadInformation: PVOID, UmsThreadInformationLength: ULONG,
-    ) -> BOOL;
-    pub fn SetUnhandledExceptionFilter(
-        lpTopLevelExceptionFilter: LPTOP_LEVEL_EXCEPTION_FILTER,
-    ) -> LPTOP_LEVEL_EXCEPTION_FILTER;
-    pub fn SetUserGeoID(GeoId: GEOID) -> BOOL;
-    pub fn SetVolumeLabelA(lpRootPathName: LPCSTR, lpVolumeName: LPCSTR) -> BOOL;
-    pub fn SetVolumeLabelW(lpRootPathName: LPCWSTR, lpVolumeName: LPCWSTR) -> BOOL;
-    pub fn SetVolumeMountPointA(lpszVolumeMountPoint: LPCSTR, lpszVolumeName: LPCSTR) -> BOOL;
-    pub fn SetVolumeMountPointW(lpszVolumeMountPoint: LPCWSTR, lpszVolumeName: LPCWSTR) -> BOOL;
-    pub fn SetWaitableTimer(
-        hTimer: HANDLE, lpDueTime: *const LARGE_INTEGER, lPeriod: LONG,
-        pfnCompletionRoutine: PTIMERAPCROUTINE, lpArgToCompletionRoutine: LPVOID, fResume: BOOL,
-    ) -> BOOL;
-    pub fn SetWaitableTimerEx(
-        hTimer: HANDLE, lpDueTime: *const LARGE_INTEGER, lPeriod: LONG,
-        pfnCompletionRoutine: PTIMERAPCROUTINE, lpArgToCompletionRoutine: LPVOID,
-        WakeContext: PREASON_CONTEXT, TolerableDelay: ULONG,
-    ) -> BOOL;
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn SetXStateFeaturesMask(Context: PCONTEXT, FeatureMask: DWORD64) -> BOOL;
-    pub fn SetupComm(hFile: HANDLE, dwInQueue: DWORD, dwOutQueue: DWORD) -> BOOL;
-    pub fn SignalObjectAndWait(
-        hObjectToSignal: HANDLE, hObjectToWaitOn: HANDLE, dwMilliseconds: DWORD, bAlertable: BOOL,
-    ) -> DWORD;
-    pub fn SizeofResource(hModule: HMODULE, hResInfo: HRSRC) -> DWORD;
-    pub fn Sleep(dwMilliseconds: DWORD);
-    pub fn SleepConditionVariableCS(
-        ConditionVariable: PCONDITION_VARIABLE, CriticalSection: PCRITICAL_SECTION,
-        dwMilliseconds: DWORD,
-    ) -> BOOL;
-    pub fn SleepConditionVariableSRW(
-        ConditionVariable: PCONDITION_VARIABLE, SRWLock: PSRWLOCK, dwMilliseconds: DWORD,
-        Flags: ULONG,
-    ) -> BOOL;
-    pub fn SleepEx(dwMilliseconds: DWORD, bAlertable: BOOL) -> DWORD;
-    pub fn StartThreadpoolIo(pio: PTP_IO);
-    pub fn SubmitThreadpoolWork(pwk: PTP_WORK);
-    pub fn SuspendThread(hThread: HANDLE) -> DWORD;
-    pub fn SwitchToFiber(lpFiber: LPVOID);
-    pub fn SwitchToThread() -> BOOL;
-    pub fn SystemTimeToFileTime(lpSystemTime: *const SYSTEMTIME, lpFileTime: LPFILETIME) -> BOOL;
-    pub fn SystemTimeToTzSpecificLocalTime(
-        lpTimeZoneInformation: *const TIME_ZONE_INFORMATION, lpUniversalTime: *const SYSTEMTIME,
-        lpLocalTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    pub fn SystemTimeToTzSpecificLocalTimeEx(
-        lpTimeZoneInformation: *const DYNAMIC_TIME_ZONE_INFORMATION,
-        lpUniversalTime: *const SYSTEMTIME, lpLocalTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    pub fn TerminateJobObject(hJob: HANDLE, uExitCode: UINT) -> BOOL;
-    pub fn TerminateProcess(hProcess: HANDLE, uExitCode: UINT) -> BOOL;
-    pub fn TerminateThread(hThread: HANDLE, dwExitCode: DWORD) -> BOOL;
-    pub fn Thread32First(hSnapshot: HANDLE, lpte: LPTHREADENTRY32) -> BOOL;
-    pub fn Thread32Next(hSnapshot: HANDLE, lpte: LPTHREADENTRY32) -> BOOL;
-    pub fn TlsAlloc() -> DWORD;
-    pub fn TlsFree(dwTlsIndex: DWORD) -> BOOL;
-    pub fn TlsGetValue(dwTlsIndex: DWORD) -> LPVOID;
-    pub fn TlsSetValue(dwTlsIndex: DWORD, lpTlsValue: LPVOID) -> BOOL;
-    pub fn Toolhelp32ReadProcessMemory(th32ProcessID: DWORD, lpBaseAddress: LPCVOID,
-        lpBuffer: LPVOID, cbRead: SIZE_T, lpNumberOfBytesRead: *mut SIZE_T
-    ) -> BOOL;
-    pub fn TransactNamedPipe(
-        hNamedPipe: HANDLE, lpInBuffer: LPVOID, nInBufferSize: DWORD, lpOutBuffer: LPVOID,
-        nOutBufferSize: DWORD, lpBytesRead: LPDWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn TransmitCommChar(hFile: HANDLE, cChar: c_char) -> BOOL;
-    pub fn TryAcquireSRWLockExclusive(SRWLock: PSRWLOCK) -> BOOLEAN;
-    pub fn TryAcquireSRWLockShared(SRWLock: PSRWLOCK) -> BOOLEAN;
-    pub fn TryEnterCriticalSection(lpCriticalSection: LPCRITICAL_SECTION) -> BOOL;
-    pub fn TrySubmitThreadpoolCallback(
-        pfns: PTP_SIMPLE_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> BOOL;
-    pub fn TzSpecificLocalTimeToSystemTime(
-        lpTimeZoneInformation: *const TIME_ZONE_INFORMATION, lpLocalTime: *const SYSTEMTIME,
-        lpUniversalTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    pub fn TzSpecificLocalTimeToSystemTimeEx(
-        lpTimeZoneInformation: *const DYNAMIC_TIME_ZONE_INFORMATION,
-        lpLocalTime: *const SYSTEMTIME, lpUniversalTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn UmsThreadYield(SchedulerParam: PVOID) -> BOOL;
-    pub fn UnhandledExceptionFilter(ExceptionInfo: *mut EXCEPTION_POINTERS) -> LONG;
-    pub fn UnlockFile(
-        hFile: HANDLE, dwFileOffsetLow: DWORD, dwFileOffsetHigh: DWORD,
-        nNumberOfBytesToUnlockLow: DWORD, nNumberOfBytesToUnlockHigh: DWORD,
-    ) -> BOOL;
-    pub fn UnlockFileEx(
-        hFile: HANDLE, dwReserved: DWORD, nNumberOfBytesToUnlockLow: DWORD,
-        nNumberOfBytesToUnlockHigh: DWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn UnmapViewOfFile(lpBaseAddress: LPCVOID) -> BOOL;
-    pub fn UnregisterApplicationRecoveryCallback() -> HRESULT;
-    pub fn UnregisterApplicationRestart() -> HRESULT;
-    pub fn UnregisterBadMemoryNotification(RegistrationHandle: PVOID) -> BOOL;
-    pub fn UnregisterWait(WaitHandle: HANDLE) -> BOOL;
-    pub fn UnregisterWaitEx(WaitHandle: HANDLE, CompletionEvent: HANDLE) -> BOOL;
-    // pub fn UnregisterWaitUntilOOBECompleted();
-    pub fn UpdateProcThreadAttribute(
-        lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST, dwFlags: DWORD, Attribute: DWORD_PTR,
-        lpValue: PVOID, cbSize: SIZE_T, lpPreviousValue: PVOID, lpReturnSize: PSIZE_T,
-    ) -> BOOL;
-    pub fn UpdateResourceA(
-        hUpdate: HANDLE, lpType: LPCSTR, lpName: LPCSTR, wLanguage: WORD, lpData: LPVOID, cb: DWORD,
-    ) -> BOOL;
-    pub fn UpdateResourceW(
-        hUpdate: HANDLE, lpType: LPCWSTR, lpName: LPCWSTR, wLanguage: WORD, lpData: LPVOID,
-        cb: DWORD,
-    ) -> BOOL;
-    pub fn VerLanguageNameA(wLang: DWORD, szLang: LPSTR, cchLang: DWORD) -> DWORD;
-    pub fn VerLanguageNameW(wLang: DWORD, szLang: LPWSTR, cchLang: DWORD) -> DWORD;
-    pub fn VerSetConditionMask(
-        ConditionMask: ULONGLONG, TypeMask: DWORD, Condition: BYTE,
-    ) -> ULONGLONG;
-    pub fn VerifyScripts(
-        dwFlags: DWORD, lpLocaleScripts: LPCWSTR, cchLocaleScripts: c_int, lpTestScripts: LPCWSTR,
-        cchTestScripts: c_int,
-    ) -> BOOL;
-    pub fn VerifyVersionInfoA(
-        lpVersionInformation: LPOSVERSIONINFOEXA, dwTypeMask: DWORD, dwlConditionMask: DWORDLONG,
-    ) -> BOOL;
-    pub fn VerifyVersionInfoW(
-        lpVersionInformation: LPOSVERSIONINFOEXW, dwTypeMask: DWORD, dwlConditionMask: DWORDLONG,
-    ) -> BOOL;
-    pub fn VirtualAlloc(
-        lpAddress: LPVOID, dwSize: SIZE_T, flAllocationType: DWORD, flProtect: DWORD,
-    ) -> LPVOID;
-    pub fn VirtualAllocEx(
-        hProcess: HANDLE, lpAddress: LPVOID, dwSize: SIZE_T, flAllocationType: DWORD,
-        flProtect: DWORD,
-    ) -> LPVOID;
-    pub fn VirtualAllocExNuma(
-        hProcess: HANDLE, lpAddress: LPVOID, dwSize: SIZE_T, flAllocationType: DWORD,
-        flProtect: DWORD, nndPreferred: DWORD,
-    ) -> LPVOID;
-    pub fn VirtualFree(lpAddress: LPVOID, dwSize: SIZE_T, dwFreeType: DWORD) -> BOOL;
-    pub fn VirtualFreeEx(
-        hProcess: HANDLE, lpAddress: LPVOID, dwSize: SIZE_T, dwFreeType: DWORD,
-    ) -> BOOL;
-    pub fn VirtualLock(lpAddress: LPVOID, dwSize: SIZE_T) -> BOOL;
-    pub fn VirtualProtect(
-        lpAddress: LPVOID, dwSize: SIZE_T, flNewProtect: DWORD, lpflOldProtect: PDWORD,
-    ) -> BOOL;
-    pub fn VirtualProtectEx(
-        hProcess: HANDLE, lpAddress: LPVOID, dwSize: SIZE_T, flNewProtect: DWORD,
-        lpflOldProtect: DWORD,
-    ) -> BOOL;
-    pub fn VirtualQuery(
-        lpAddress: LPCVOID, lpBuffer: PMEMORY_BASIC_INFORMATION, dwLength: SIZE_T,
-    ) -> SIZE_T;
-    pub fn VirtualQueryEx(
-        hProcess: HANDLE, lpAddress: LPCVOID, lpBuffer: PMEMORY_BASIC_INFORMATION, dwLength: SIZE_T,
-    ) -> SIZE_T;
-    pub fn VirtualUnlock(lpAddress: LPVOID, dwSize: SIZE_T) -> BOOL;
-    pub fn WTSGetActiveConsoleSessionId() -> DWORD;
-    pub fn WaitCommEvent(hFile: HANDLE, lpEvtMask: LPDWORD, lpOverlapped: LPOVERLAPPED) -> BOOL;
-    pub fn WaitForDebugEvent(lpDebugEvent: LPDEBUG_EVENT, dwMilliseconds: DWORD) -> BOOL;
-    pub fn WaitForMultipleObjects(
-        nCount: DWORD, lpHandles: *const HANDLE, bWaitAll: BOOL, dwMilliseconds: DWORD,
-    ) -> DWORD;
-    pub fn WaitForMultipleObjectsEx(
-        nCount: DWORD, lpHandles: *const HANDLE, bWaitAll: BOOL, dwMilliseconds: DWORD,
-        bAlertable: BOOL,
-    ) -> DWORD;
-    pub fn WaitForSingleObject(hHandle: HANDLE, dwMilliseconds: DWORD) -> DWORD;
-    pub fn WaitForSingleObjectEx(
-        hHandle: HANDLE, dwMilliseconds: DWORD, bAlertable: BOOL,
-    ) -> DWORD;
-    pub fn WaitForThreadpoolIoCallbacks(pio: PTP_IO, fCancelPendingCallbacks: BOOL);
-    pub fn WaitForThreadpoolTimerCallbacks(pti: PTP_TIMER, fCancelPendingCallbacks: BOOL);
-    pub fn WaitForThreadpoolWaitCallbacks(pwa: PTP_WAIT, fCancelPendingCallbacks: BOOL);
-    pub fn WaitForThreadpoolWorkCallbacks(pwk: PTP_WORK, fCancelPendingCallbacks: BOOL);
-    pub fn WaitNamedPipeA(lpNamedPipeName: LPCSTR, nTimeOut: DWORD) -> BOOL;
-    pub fn WaitNamedPipeW(lpNamedPipeName: LPCWSTR, nTimeOut: DWORD) -> BOOL;
-    pub fn WakeAllConditionVariable(ConditionVariable: PCONDITION_VARIABLE);
-    pub fn WakeConditionVariable(ConditionVariable: PCONDITION_VARIABLE);
-    pub fn WerGetFlags(hProcess: HANDLE, pdwFlags: PDWORD) -> HRESULT;
-    pub fn WerRegisterFile(
-        pwzFile: PCWSTR, regFileType: WER_REGISTER_FILE_TYPE, dwFlags: DWORD,
-    ) -> HRESULT;
-    pub fn WerRegisterMemoryBlock(pvAddress: PVOID, dwSize: DWORD) -> HRESULT;
-    pub fn WerRegisterRuntimeExceptionModule(
-        pwszOutOfProcessCallbackDll: PCWSTR, pContext: PVOID,
-    ) -> HRESULT;
-    pub fn WerSetFlags(dwFlags: DWORD) -> HRESULT;
-    pub fn WerUnregisterFile(pwzFilePath: PCWSTR) -> HRESULT;
-    pub fn WerUnregisterMemoryBlock(pvAddress: PVOID) -> HRESULT;
-    pub fn WerUnregisterRuntimeExceptionModule(
-        pwszOutOfProcessCallbackDll: PCWSTR, pContext: PVOID,
-    ) -> HRESULT;
-    // pub fn WerpInitiateRemoteRecovery();
-    pub fn WideCharToMultiByte(
-      CodePage: UINT, dwFlags: DWORD, lpWideCharStr: LPCWSTR, cchWideChar: c_int,
-      lpMultiByteStr: LPSTR, cbMultiByte: c_int, lpDefaultChar: LPCSTR, lpUsedDefaultChar: LPBOOL,
-    ) -> c_int;
-    pub fn WinExec(lpCmdLine: LPCSTR, uCmdShow: UINT) -> UINT;
-    pub fn Wow64DisableWow64FsRedirection(OldValue: *mut PVOID) -> BOOL;
-    pub fn Wow64EnableWow64FsRedirection(Wow64FsEnableRedirection: BOOLEAN) -> BOOLEAN;
-    pub fn Wow64GetThreadContext(hThread: HANDLE, lpContext: PWOW64_CONTEXT) -> BOOL;
-    pub fn Wow64GetThreadSelectorEntry(
-        hThread: HANDLE, dwSelector: DWORD, lpSelectorEntry: PWOW64_LDT_ENTRY,
-    ) -> BOOL;
-    pub fn Wow64RevertWow64FsRedirection(OlValue: PVOID) -> BOOL;
-    pub fn Wow64SetThreadContext(hThread: HANDLE, lpContext: *const WOW64_CONTEXT) -> BOOL;
-    pub fn Wow64SuspendThread(hThread: HANDLE) -> DWORD;
-    pub fn WriteConsoleA(
-        hConsoleOutput: HANDLE, lpBuffer: *const VOID, nNumberOfCharsToWrite: DWORD,
-        lpNumberOfCharsWritten: LPDWORD, lpReserved: LPVOID,
-    ) -> BOOL;
-    pub fn WriteConsoleInputA(
-        hConsoleInput: HANDLE, lpBuffer: *const INPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleInputW(
-        hConsoleInput: HANDLE, lpBuffer: *const INPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputA(
-        hConsoleOutput: HANDLE, lpBuffer: *const CHAR_INFO, dwBufferSize: COORD,
-        dwBufferCoord: COORD, lpWriteRegion: PSMALL_RECT,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputAttribute(
-        hConsoleOutput: HANDLE, lpAttribute: *const WORD, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfAttrsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputCharacterA(
-        hConsoleOutput: HANDLE, lpCharacter: LPCSTR, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfCharsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputCharacterW(
-        hConsoleOutput: HANDLE, lpCharacter: LPCWSTR, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfCharsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputW(
-        hConsoleOutput: HANDLE, lpBuffer: *const CHAR_INFO, dwBufferSize: COORD,
-        dwBufferCoord: COORD, lpWriteRegion: PSMALL_RECT,
-    ) -> BOOL;
-    pub fn WriteConsoleW(
-        hConsoleOutput: HANDLE, lpBuffer: *const VOID, nNumberOfCharsToWrite: DWORD,
-        lpNumberOfCharsWritten: LPDWORD, lpReserved: LPVOID,
-    ) -> BOOL;
-    pub fn WriteFile(
-        hFile: HANDLE, lpBuffer: LPCVOID, nNumberOfBytesToWrite: DWORD,
-        lpNumberOfBytesWritten: LPDWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn WriteFileEx(
-        hFile: HANDLE, lpBuffer: LPCVOID, nNumberOfBytesToWrite: DWORD, lpOverlapped: LPOVERLAPPED,
-        lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> BOOL;
-    pub fn WriteFileGather(
-        hFile: HANDLE, aSegmentArray: *mut FILE_SEGMENT_ELEMENT, nNumberOfBytesToWrite: DWORD,
-        lpReserved: LPDWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn WritePrivateProfileSectionA(
-        lpAppName: LPCSTR, lpString: LPCSTR, lpFileName: LPCSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileSectionW(
-        lpAppName: LPCWSTR, lpString: LPCWSTR, lpFileName: LPCWSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileStringA(
-        lpAppName: LPCSTR, lpKeyName: LPCSTR, lpString: LPCSTR, lpFileName: LPCSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileStringW(
-        lpAppName: LPCWSTR, lpKeyName: LPCWSTR, lpString: LPCWSTR, lpFileName: LPCWSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileStructA(
-        lpszSection: LPCSTR, lpszKey: LPCSTR, lpStruct: LPVOID, uSizeStruct: UINT, szFile: LPCSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileStructW(
-        lpszSection: LPCWSTR, lpszKey: LPCWSTR, lpStruct: LPVOID, uSizeStruct: UINT,
-        szFile: LPCWSTR,
-    ) -> BOOL;
-    pub fn WriteProcessMemory(
-        hProcess: HANDLE, lpBaseAddress: LPVOID, lpBuffer: LPCVOID, nSize: SIZE_T,
-        lpNumberOfBytesWritten: *mut SIZE_T,
-    ) -> BOOL;
-    pub fn WriteProfileSectionA(lpAppName: LPCSTR, lpString: LPCSTR) -> BOOL;
-    pub fn WriteProfileSectionW(lpAppName: LPCWSTR, lpString: LPCWSTR) -> BOOL;
-    pub fn WriteProfileStringA(lpAppName: LPCSTR, lpKeyName: LPCSTR, lpString: LPCSTR) -> BOOL;
-    pub fn WriteProfileStringW(lpAppName: LPCWSTR, lpKeyName: LPCWSTR, lpString: LPCWSTR) -> BOOL;
-    pub fn WriteTapemark(
-        hDevice: HANDLE, dwTapemarkType: DWORD, dwTapemarkCount: DWORD, bImmediate: BOOL,
-    ) -> DWORD;
-    pub fn ZombifyActCtx(hActCtx: HANDLE) -> BOOL;
-    pub fn _hread(hFile: HFILE, lpBuffer: LPVOID, lBytes: c_long) -> c_long;
-    pub fn _hwrite(hFile: HFILE, lpBuffer: LPCCH, lBytes: c_long) -> c_long;
-    pub fn _lclose(hFile: HFILE) -> HFILE;
-    pub fn _lcreat(lpPathName: LPCSTR, iAttrubute: c_int) -> HFILE;
-    pub fn _llseek(hFile: HFILE, lOffset: LONG, iOrigin: c_int) -> LONG;
-    pub fn _lopen(lpPathName: LPCSTR, iReadWrite: c_int) -> HFILE;
-    pub fn _lread(hFile: HFILE, lpBuffer: LPVOID, uBytes: UINT) -> UINT;
-    pub fn _lwrite(hFile: HFILE, lpBuffer: LPCCH, uBytes: UINT) -> UINT;
-    pub fn lstrcat(lpString1: LPSTR, lpString2: LPCSTR) -> LPSTR;
-    pub fn lstrcatA(lpString1: LPSTR, lpString2: LPCSTR) -> LPSTR;
-    pub fn lstrcatW(lpString1: LPWSTR, lpString2: LPCWSTR) -> LPSTR;
-    pub fn lstrcmp(lpString1: LPCSTR, lpString2: LPCSTR) -> c_int;
-    pub fn lstrcmpA(lpString1: LPCSTR, lpString2: LPCSTR) -> c_int;
-    pub fn lstrcmpW(lpString1: LPCWSTR, lpString2: LPCWSTR) -> c_int;
-    pub fn lstrcmpi(lpString1: LPCSTR, lpString2: LPCSTR) -> c_int;
-    pub fn lstrcmpiA(lpString1: LPCSTR, lpString2: LPCSTR) -> c_int;
-    pub fn lstrcmpiW(lpString1: LPCWSTR, lpString2: LPCWSTR) -> c_int;
-    pub fn lstrcpy(lpString1: LPSTR, lpString2: LPCSTR) -> LPSTR;
-    pub fn lstrcpyA(lpString1: LPSTR, lpString2: LPCSTR) -> LPSTR;
-    pub fn lstrcpyW(lpString1: LPWSTR, lpString2: LPCWSTR) -> LPSTR;
-    pub fn lstrcpyn(lpString1: LPSTR, lpString2: LPCSTR, iMaxLength: c_int) -> LPSTR;
-    pub fn lstrcpynA(lpString1: LPSTR, lpString2: LPCSTR, iMaxLength: c_int) -> LPSTR;
-    pub fn lstrcpynW(lpString1: LPWSTR, lpString2: LPCWSTR, iMaxLength: c_int) -> LPSTR;
-    pub fn lstrlen(lpString: LPCSTR) -> c_int;
-    pub fn lstrlenA(lpString: LPCSTR) -> c_int;
-    pub fn lstrlenW(lpString: LPCWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_lstrcmpW(String1: PCUWSTR, String2: PCUWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_lstrcmpiW(String1: PCUWSTR, String2: PCUWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_lstrlenW(String: LPCUWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcschr(String: PCUWSTR, Character: WCHAR) -> PUWSTR;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcscpy(Destination: PUWSTR, Source: PCUWSTR) -> PUWSTR;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcsicmp(String1: PCUWSTR, String2: PCUWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcslen(String: PCUWSTR) -> size_t;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcsrchr(String: PCUWSTR, Character: WCHAR) -> PUWSTR;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+fn main() {
+    // TARGET
+    // ------
+
+    // We need to optimize limb size for performance.
+    // Only have optimized 64-bit instructions on certain architectures.
+    // See `lexical-core/src/atof/algorithm/math.rs` for detailed
+    // instructions of architecture instruction support for 64-bit
+    // mathematical operations.
+
+    // https://github.com/rust-lang/cargo/issues/4302#issuecomment-316482399
+    let limb_64_archs = ["aarch64", "mips64", "powerpc64", "x86_64"];
+    let limb_width_64 = match std::env::var("CARGO_CFG_TARGET_ARCH") {
+        Ok(arch) => limb_64_archs.contains(&&*arch),
+        _ => false,
+    };
+    if limb_width_64 {
+        println!("cargo:rustc-cfg=limb_width_64");
+    } else {
+        println!("cargo:rustc-cfg=limb_width_32");
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG":"88b738e4a16248cceb7ca0ffc58d8dcb14b9af7caf923127580e60a074562d0d","Cargo.toml":"598b6135f24c7e1d8c15322510e085df7bc7218feb4a51fd3c38f2092bbedd00","LICENSE-APACHE":"8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f4c59286809fcd405fd1b43e1b30c1ba6049e536cb005a2b31f2664af72471d1","build.rs":"164dc49045501f770cf47269f75ff26794c2d3603c7ac5276d52a22049afed01","src/atof/algorithm/alias.rs":"c185ec1bbf495e4fc7c221b5887e7444cd6e90d1e6515273c61476cfdd51e9f6","src/atof/algorithm/bhcomp.rs":"d418a6126b0754c87bc694c2cb63f63a48b49185cf97d0108f234671e5871322","src/atof/algorithm/bigcomp.rs":"99971c9f4e32c65464bf46dd59d0390c2b64cf5fb751d56a5b5a7555f3a38ff9","src/atof/algorithm/bignum.rs":"3f75432282850b13a2ba94468bae163a6f5ef388d10c56d3eaa9afd828ec1419","src/atof/algorithm/cached.rs":"5dc6b2362db4aea51f271831d5a4ba883975f70c28e43ed715143c777e2efbe6","src/atof/algorithm/cached_float160.rs":"ed196d7a8b3435739b4d13d91898c6af7b2b70393e5e2bb27834920a632a6f3f","src/atof/algorithm/cached_float80.rs":"2c998a3487e8d2c4924a04eb8edc5de4ca89d68c9a7d4d2f73dd105d1628c5e6","src/atof/algorithm/correct.rs":"a9d5c5fc3b7ab8d2caa8ea5e0943c21fb913ff12e24b7ca6f7c2a395bedf8e5c","src/atof/algorithm/errors.rs":"48e0930a1089c9330241be4ac22ad38260d2d23554e26d8ef379025494eb986c","src/atof/algorithm/format/exponent.rs":"5c51439f3218fcdeb3c5a759324ca6cceeb0905638c052ad59ef8d23ceeb8c4f","src/atof/algorithm/format/generic.rs":"50b0cd633f22ff1d37132062cb4447e51ab6776ae19740840cda49e5d8774454","src/atof/algorithm/format/ignore.rs":"069b2e398f1e502914f43e0a05f0d98fdb5da6d4dc19f261dd08493bf763d082","src/atof/algorithm/format/interface.rs":"baa1120664d88ae9551b8ffd892c712e0da8757815d53db0b51f5dd974d30d97","src/atof/algorithm/format/mod.rs":"7bd613f450487c0e7eb6ecc5856bbbaa3e68b37bbe518023cfcc9951acc611ba","src/atof/algorithm/format/permissive.rs":"b67b47a026778b13ffc6d5361807c6daec8d85c5d275653f6c775b63167ba7f6","src/atof/algorithm/format/standard.rs":"c4aeb3f45ea2a0cd2fe00f1b8ca188b78428e5172d0f2f206ddca9312bcae2d5","src/atof/algorithm/format/traits.rs":"a522b4e2e4f7d6cd40e9fc36ede7f793e544b35bee37d6f84da2919165b384a3","src/atof/algorithm/format/trim.rs":"725d34cf6bb145711c07585b8fe39c83f12af9133c1df4d523e88ba062da0047","src/atof/algorithm/format/validate.rs":"8341055d7ecda9edd929ca2077afdedc2f1bd1c8219af1d32f3b67c479d9f2a6","src/atof/algorithm/incorrect.rs":"e63c95d1c0a939dc3db1011e3a8effca2c505a1e243243aba3e22d3459dc8a33","src/atof/algorithm/large_powers.rs":"73ca077b2a144d2937075ef76a310a351c2bd9c1d56fba7c6ee600ca61c99033","src/atof/algorithm/large_powers_32.rs":"f1c191113cf80d922adbfcf7811450508aff06074b456eada8ece00106c95486","src/atof/algorithm/large_powers_64.rs":"644b40cd84f81964c241085720b631cfd41a026f95aee27328d6ef12069673ab","src/atof/algorithm/math.rs":"13914a252810deead96119f6e8e43072eb46c2f445100b8d928a0af94f9e34b5","src/atof/algorithm/mod.rs":"48ae8d33a54c6c74091562e7270a1a7173c8140201b5beb589b08cad0b6b7e2a","src/atof/algorithm/small_powers.rs":"fbfc883c39a0697503f720f51a908e289386f5981f253ba1499b977e16213eb5","src/atof/algorithm/small_powers_32.rs":"5b974d3ea5ee4a5c459b32206bb1a6949b4831af299d7ea0122a6142b8c7f153","src/atof/algorithm/small_powers_64.rs":"16f260763b9e6a7b6365f9ae120305b43a4e2676ba7b62fff5a44e868d2637d0","src/atof/api.rs":"9ad424f935f799bb13783159b11681b1eff4e86a5f29593f971fd937c8590543","src/atof/mod.rs":"4ea3fb2ecc03484da240ab78960d20577e095605a81364c4edc1a975f4337aae","src/atoi/api.rs":"c269ccde918c1d609901332eaeb8c941eee22f54bead8cf33462a6cad77c912f","src/atoi/exponent.rs":"f0ec22c6dc4ad4b63a0a6b216458691baabc03f107f3671ef22c2909722fafda","src/atoi/generic.rs":"677ff040c11586895433c4c17be69c0b24effa437de40841473a0fb393db3c5a","src/atoi/mantissa.rs":"26463953bb50f459b2d6668a85d2849dc4c0c2f314ec6bfc6f32ff3ce3b37daa","src/atoi/mod.rs":"68c2c460b56398c495e42024243c4f114c47f2c96273c1ce8274edc7a8ac3fda","src/atoi/shared.rs":"2b16aac68034dd5733b768e95571a62a57e6d304c83786fec8760c9c21e1f8db","src/float/convert.rs":"8d6188371e37010ea82c6e0185f6126eccf461a9be975bfc4b3d1164697da308","src/float/float.rs":"4ba31530be35d4576d2457aac9a4b11c86f074ff21c9507c76090078512e0ac3","src/float/mantissa.rs":"d588138a7d4f28cfbe57763d2a6b982de3c847527cb1fde9777efc042b6ef52d","src/float/mod.rs":"0c1e031dd26fbb8a232d8299317dfb4530e42e5304671009d533ee9421575476","src/float/rounding.rs":"f2e79296da67105a29779a0dbfe3a1342cb2661d5626bc174d27ed78824e10d9","src/float/shift.rs":"1e71a3f8e6f176c1dceec45be14e033c442b524c47e183f5e8e96f967f63db75","src/ftoa/api.rs":"46e9411704d4af526747c21d552a4e5fce8f47aa2149f70fa126a4019c5b6251","src/ftoa/grisu2.rs":"1ddd387079b519903700def49a116432d29675aaa4c35b1d5661e60b80a830b0","src/ftoa/grisu3.rs":"41adfe1874a791514250bff8473f4e287c05e3dd5a32b64b64510e39e4a3cd39","src/ftoa/mod.rs":"9609a66efc47f8ca474a3f993ebb98117cd91c1c1dc27ba5b23440d6b3f1471b","src/ftoa/radix.rs":"0fae65ce95f369b63712ce17a663e3ae46b05269b6928d9d602586a1cc823ecd","src/ftoa/ryu.rs":"3433b7d05321a1aa18d87199ca2291aa543c1b570b3b2c4d782f5964b7b2a5e7","src/itoa/api.rs":"1758aab9120e8942548f88351886a2bda6b52b16edb23f8a0d8ce8c43ff9c4d8","src/itoa/decimal.rs":"3ddccf273b240fa9b762116d8a396a4832223f5e533a9cbd42c11d08f1cad6f2","src/itoa/generic.rs":"66104c6f131e20eb0d413f2c1f90b1bd2f66c1b7691e16cbbd889719c4999cd1","src/itoa/mod.rs":"9b7e96338a0003a9d3176b91387c7cc0590c3c4c799b2bc1478e553515bbc9bd","src/itoa/naive.rs":"be3bda98561212615a8c561e87340230f49aeda1158958fce4225a792ea9e46a","src/lib.rs":"4c72c7a272a9ce6f01f5c5699d7d8b088d53b6c8af4e2d4289e7183ac4a75bd7","src/util/algorithm.rs":"8def15c0d72638301e0062d8afb464a753a825b6bed30d90d8da3da614c8fe80","src/util/assert.rs":"668ff920c1724105055f565948c1674f858e74634432ab8d4514b8bf2ed688f1","src/util/cast.rs":"7377df8cff32830236ad273b0c0e6e0010aecab1fc5a2c637a5645861eb5c8ba","src/util/config.rs":"74fc75e02c05ad6260bcd7bbe9304be5fae8c0d1ae8e603a737f800729378661","src/util/consume.rs":"f77aa421bbb54c58d46c3a35ef9401529e8a0f079d0b1a38da1be43cac312b12","src/util/div128.rs":"5dc16ac666016b9c2791f72c013fbad635f19082237fbda11151d3ab0e9e1125","src/util/error.rs":"ecc7e1d9a7d8092a47527e087ff27e75b38e129319e17078af057a4322fbcb76","src/util/format.rs":"59e2c27fa01ce3649cea57d8423f9cf8ff969159866e6ab75679aaf7568d90fd","src/util/format/feature_format.rs":"5a1741299588757cd1542607d96c0640d0290ce0fb52136bf70858433a0a1775","src/util/format/not_feature_format.rs":"7541f65051e0e2a91c94eff3b626a5b8c03f50b62e5fc65f38965c35a4fc1fdf","src/util/index.rs":"eadc46ee24b008f766f9f70d44e3e9b475c38154351cae3eefd49c0218f66400","src/util/iterator.rs":"2a67298fa46774b16d1533aaee02d4644b1d50005db8add097812c0bc006a354","src/util/mask.rs":"c9c4955fb9b6ae54a7c928715e3b78c41c87e95e2a523747a0738c62d0cc1901","src/util/mod.rs":"51a61411293696783e33ff087911bb94e9a3183633ffe82086549f5fe53fdc94","src/util/num.rs":"c46ecbd7b5c2a13d2c4fd4245ebcd5795d435fefa9c437a1f57ea2729e805c8d","src/util/perftools.rs":"3dde4045fe630543474e1b70c7eecf73efb7a8c474bfee7f1b2ef619fafe265e","src/util/pow.rs":"c3cbc3c5a159ca092a1c4e00da46078cc30b89e675129bc61b5b83cd831b249b","src/util/primitive.rs":"7478fa9520176f773f72e5ce9e07bb275de3803a33ae16b40e0f84d94082f49b","src/util/result.rs":"654d89e87b3339721fabd268b2ad7450c48610cce8234e4d16d26011ea3f287f","src/util/rounding.rs":"be2e3d282ffcb176ee6530d42a67bc57474b3fc9e16de6989ffa43d5997d4670","src/util/sequence.rs":"01db8bf9d6d6599682cb3b49f33c2e12b8c80b3c328c1358b7ba8c9c5f57bdca","src/util/sign.rs":"840e436cca2db2f35a1e942bc4fc2944f8490dec2785150b3a50f4827c1836e0","src/util/skip_value.rs":"aeb08494abda7c2ccd72941cea0349c773d29e960992cc0d0f89e3287e6cae85","src/util/table.rs":"966080b1f2497ca6d8fe372422a49daa2eae0acc5851930af65142f7881843ad","src/util/test.rs":"52bc9cd6baca6820a7902d5c43357017c7a7435999928193f600b8b8d826927c","src/util/traits.rs":"d8f10a673e63738254b0403929e384538182b81098b4b2819081c5d28fb63fbb","src/util/wrapped.rs":"f6de7f6d6f0363bb1fb201a3671ccf63965b5db6124e4ebc06d70fc45fae69ae"},"package":"6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,90 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "lexical-core"
+version = "0.7.6"
+authors = ["Alex Huszagh <ahuszagh@gmail.com>"]
+build = "build.rs"
+exclude = ["fuzz/*", "scripts/*", "ffi/*"]
+autobenches = false
+description = "Lexical, to- and from-string conversion routines."
+documentation = "https://docs.rs/lexical-core"
+readme = "README.md"
+keywords = ["parsing", "lexical", "encoding", "no_std"]
+categories = ["parsing", "encoding", "no-std", "value-formatting"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/Alexhuszagh/rust-lexical/tree/master/lexical-core"
+[profile.dev]
+opt-level = 0
+lto = false
+debug = true
+
+[profile.release]
+opt-level = 3
+lto = true
+debug = false
+debug-assertions = false
+[dependencies.arrayvec]
+version = "0.5"
+features = ["array-sizes-33-128"]
+optional = true
+default-features = false
+
+[dependencies.bitflags]
+version = "1.2"
+
+[dependencies.cfg-if]
+version = "1.0"
+
+[dependencies.dtoa]
+version = "0.4"
+optional = true
+
+[dependencies.libm]
+version = "0.2.1"
+optional = true
+
+[dependencies.proptest]
+version = "0.10.1"
+optional = true
+
+[dependencies.quickcheck]
+version = "1.0.3"
+optional = true
+
+[dependencies.ryu]
+version = "1.0"
+optional = true
+
+[dependencies.static_assertions]
+version = "1"
+optional = true
+[dev-dependencies.approx]
+version = "0.4.0"
+
+[features]
+correct = ["arrayvec", "static_assertions", "table"]
+default = ["correct", "ryu", "std"]
+format = ["static_assertions"]
+grisu3 = ["dtoa"]
+noinline = []
+property_tests = ["quickcheck", "proptest"]
+radix = []
+rounding = []
+std = []
+table = []
+trim_floats = []
+unchecked_index = []
+[badges.travis-ci]
+repository = "Alexhuszagh/rust-lexical"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/CHANGELOG thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/CHANGELOG
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/CHANGELOG	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/CHANGELOG	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,122 @@
+# Changelog
+
+Notes significant changes to lexical-core.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+- Updated cfg_if version.
+- Downgraded rand to fix proptests.
+- Fixed a bug on newer Rustc versions where `slice::sort` is not present in `no_std`.
+- Added a feature `libm` which enables stable `no_std` use.
+- Patched an implementation of insert_many due to a security advisory which does not affect lexical.
+
+## [0.7.5] 2021-02-21
+### Changed
+- Fixed issue with `integer::BITS` conflicting with new compilers.
+
+## [0.7.4] 2020-01-27
+### Changed
+- Changed NumberFormat to use 64-bit flags.
+- Added `NO_INTEGER_LEADING_ZEROS` and `NO_FLOAT_LEADING_ZEROS` NumberFormat flags.
+- Added `InvalidLeadingZeros` to ErrorCode enum.
+- Added `validate_no_leading_zeros` to reject invalid inputs.
+- Added new leading zero checks to all pre-defined NumberFormat constants.
+
+## [0.7.3] 2020-01-26
+### Changed
+- Updated the format bitflags to make matches more efficient, allowing jumptables to be used for most situations.
+
+## [0.7.2] 2020-01-25
+### Changed
+- Fixed a regression in parsing special values.
+
+## [0.7.1] 2020-01-23
+### Added
+- Added `format` feature to control parsing integers and floats from number specifications.
+- Added the `NumberFormat` bitflags to control Number format specifications. These flags control how a number is parsed, including enabling the use of digit separators, requiring integer or fraction digits, and more.
+- Added pre-defined constants for `NumberFormat` (`RUST_STRING`, `PYTHON_LITERAL`) to avoid compiling formats when not needed.
+- Added the `FromLexicalFormat` and `FromLexicalLossyFormat` traits with the `format` feature, which enable you to specify the number format during parsing.
+- Implemented algorithms in terms of generic iterators, to allow skipping digit separators.
+- Implemented data interfaces to simplify parsing and validating number format.
+- Added more values to `ErrorCode` to signify more parse failures.
+
+### Changed
+- Changed `ErrorCode::MissingFraction` to be `ErrorCode::MissingMantissa`, to differentiate between missing integers, missing fractions, and missing significant digits (mantissa).
+- Remove `RawFloatState` and `FloatState` and replaced it logically with `FastDataInterface` and `SlowDataInterface`, allowing format-defined parsing.
+
+## [0.7.0] - 2020-01-07
+### Changed
+- Updated `arrayvec` and `static-assertions` versions.
+- Removed support for Rustc versions below 1.37.0.
+
+## [0.6.3] - 2019-10-08
+### Changed
+- Forced version `0.1.9` for cfg-if to support older Rustc versions.
+- Documented dependency versioning and upgrade procedure.
+
+## [0.6.2] - 2019-09-22
+### Changed
+- Fixed a bug causing compilation issues on MSVC.
+
+## [0.6.1] - 2019-09-16
+### Changed
+- Removed panic handler, allowing use in `no_std` environments.
+
+## [0.6.0] - 2019-09-08
+### Added
+- Added `get/set_exponent_default_char`, `get/set_exponent_backup_char`, and `get/set_float_rounding`, to allow validation logic for config variables.
+- Added the `write*` functions, which replace the `*toa` methods.
+- Added `parse*` functions, which replace the `ato*` methods.
+- Added tests to ensure lexical-core works with proc-macros.
+- Substituted rust-stackvector with arrayvec, which has better support.
+
+### Removed
+- Removed `EXPONENT_DEFAULT_CHAR`, `EXPONENT_BACKUP_CHAR`, and `FLOAT_ROUNDING`.
+- Removed all expanded API signatures for `ato*` to `*toa`, since these were for compatibility with the C-API and were therefore redundant.
+- Removed the FFI submodule, and moved all functionality to the `lexical-capi` crate.
+
+## [0.5.0] - 2019-08-20
+### Added
+- Added ffi::Result, an FFI-compatible tagged union, to store results for FFI-compatible functions.
+- Added `MAX_*_SIZE_BASE10` constants, to determine the maximum size in bytes a formatted type will take in base 10.
+- Added `ato*_partial` functions, which parse until an invalid digit is found, returning the value and number of processed digits.
+
+### Changed
+- Improved code generation and reduced binary bloat. There are a few algorithmic differences that make this possible, but the parsers now generally extract the float subcomponents first, then parsed known-good data after for enhanced performance.
+- Updated the benchmarks and benchmark results.
+- Add variants for lexical_core::ErrorCode. Added `Underflow`, to detect numerical underflow, `EmptyFraction`, to detect floats with an empty integer and fraction components, and `EmptyExponent`, to detect floats with no value following the exponent character.
+- Changed Result to use `std::result::Result`.
+- Fixed proptests and added more comprehensive proptests thanks to @dangrabcad.
+- Moved FFI-compatible code to the public `ffi` module.
+- Removed `*_slice` from functions in the public API, since there is no naming conflict with FFI code.
+- Removed `*_ffi` and `*_FFI` from public functions and constants.
+- Optimized the itoa exporters using specialized optimizations for the type size and number of digits. The resulting performance excels for all values, providing 2-3x performance improvements, with exceptional performance for values with a small number of digits.
+- Optimized integer division algorithm based off the compiler-builtins crate to avoid redundant calls to an expensive compiler intrinsic (`__udivmodti4`).
+- Optimized the atoi algorithm for 128-bit integers by using intermediary 64-bit integers, leading to performance boosts of up to 30x.
+
+### Removed
+- Removed the unchecked parsers from the public API. `try_parse*` has been replaced with `parse*`.
+- Removed ErrorCode::Success, since with the new result types it was redundant.
+
+## [0.4.3] - 2019-06-26
+- Fixed a bug (issue #20) leading to incorrect float parsing (1 ULP error) for slow-path algorithms containing floats with a trailing 0-digit in the fraction component (discovery by @dangrabcad). Added in comprehensive unittests to avoid future regressions.
+- Fixed CI for older Rustc versions due to issues with the `edition` keyword.
+- Updated dependencies (credit to @junhoo).
+- Updated the benchmarks for float and integer formatting to use `Write::write_fmt` rather than `to_string` to avoid heap allocation leading to misleading results (credit to @RazrFalcon).
+
+## [0.4.2] - 2019-06-24
+### Added
+- Comprehensive continuous integration unittests for numerous platforms, based off the [trust](https://github.com/japaric/trust) templates.
+- Added known issue for a non-default, lossy setting on armv6 architectures.
+
+### Changed
+- Bug fix for 32-bit targets.
+
+## [0.4.1] - 2019-06-20
+### Added
+- Backwards compatible support for Rustc 1.24.0.
+
+### Changed
+- Worked around a bug in the internal float formatter where `&arr[idx]` creates a local copy in Rust versions before 1.28.0, creating a dangling reference after the scope ends. For more details, see `cached_grisu_power` in `/lexical-core/src/ftoa/grisu2.rs` .
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,478 @@
+lexical-core
+============
+
+[![Build Status](https://api.travis-ci.org/Alexhuszagh/rust-lexical.svg?branch=master)](https://travis-ci.org/Alexhuszagh/rust-lexical)
+[![Latest Version](https://img.shields.io/crates/v/lexical-core.svg)](https://crates.io/crates/lexical-core)
+[![Rustc Version 1.37+](https://img.shields.io/badge/rustc-1.37+-lightgray.svg)](https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html)
+
+Low-level, lexical conversion routines for use in a `no_std` context. This crate by default does not use the Rust standard library.
+
+- [Getting Started](#getting-started)
+- [Features](#features)
+  - [Format](#format)
+- [Configuration](#configuration)
+- [Constants](#constants)
+- [Documentation](#documentation)
+- [Validation](#validation)
+- [Implementation Details](#implementation-details)
+  - [Float to String](#float-to-string)
+  - [String to Float](#string-to-float)
+  - [Arbitrary-Precision Arithmetic](#arbitrary-precision-arithmetic)
+  - [Algorithm Background and Comparison](#algorithm-background-and-comparison)
+- [Known Issues](#known-issues)
+- [Versioning and Version Support](#versioning-and-version-support)
+- [Changelog](#changelog)
+- [License](#license)
+- [Contributing](#contributing)
+
+# Getting Started
+
+lexical-core is a low-level API for number-to-string and string-to-number conversions, without requiring a system allocator. If you would like to use a convenient, high-level API, please look at [lexical](../lexical) instead.
+
+Add lexical-core to your `Cargo.toml`:
+
+```toml
+[dependencies]
+lexical-core = "^0.7.1"
+```
+
+And an introduction through use:
+
+```rust
+extern crate lexical_core;
+
+// String to number using Rust slices.
+// The argument is the byte string parsed.
+let f: f32 = lexical_core::parse(b"3.5").unwrap();   // 3.5
+let i: i32 = lexical_core::parse(b"15").unwrap();    // 15
+
+// All lexical_core parsers are checked, they validate the
+// input data is entirely correct, and stop parsing when invalid data
+// is found, or upon numerical overflow.
+let r = lexical_core::parse::<u8>(b"256"); // Err(ErrorCode::Overflow.into())
+let r = lexical_core::parse::<u8>(b"1a5"); // Err(ErrorCode::InvalidDigit.into())
+
+// In order to extract and parse a number from a substring of the input
+// data, use `parse_partial`. These functions return the parsed value and
+// the number of processed digits, allowing you to extract and parse the
+// number in a single pass.
+let r = lexical_core::parse_partial::<i8>(b"3a5"); // Ok((3, 1))
+
+// If an insufficiently long buffer is passed, the serializer will panic.
+// PANICS
+let mut buf = [b'0'; 1];
+//let slc = lexical_core::write::<i64>(15, &mut buf);
+
+// In order to guarantee the buffer is long enough, always ensure there
+// are at least `T::FORMATTED_SIZE` bytes, which requires the
+// `lexical_core::Number` trait to be in scope.
+use lexical_core::Number;
+let mut buf = [b'0'; f64::FORMATTED_SIZE];
+let slc = lexical_core::write::<f64>(15.1, &mut buf);
+assert_eq!(slc, b"15.1");
+
+// When the `radix` feature is enabled, for decimal floats, using
+// `T::FORMATTED_SIZE` may significantly overestimate the space
+// required to format the number. Therefore, the
+// `T::FORMATTED_SIZE_DECIMAL` constants allow you to get a much
+// tighter bound on the space required.
+let mut buf = [b'0'; f64::FORMATTED_SIZE_DECIMAL];
+let slc = lexical_core::write::<f64>(15.1, &mut buf);
+assert_eq!(slc, b"15.1");
+```
+
+# Features
+
+- **correct** Use a correct string-to-float parser.
+    <blockquote>Enabled by default, and may be turned off by setting <code>default-features = false</code>. If neither <code>algorithm_m</code> nor <code>bhcomp</code> is enabled while <code>correct</code> is enabled, lexical uses the <code>bigcomp</code> algorithm.</blockquote>
+- **trim_floats** Export floats without a fraction as an integer.
+    <blockquote>For example, <code>0.0f64</code> will be serialized to "0" and not "0.0", and <code>-0.0</code> as "0" and not "-0.0".</blockquote>
+- **radix** Allow conversions to and from non-decimal strings.
+    <blockquote>With radix enabled, any radix from 2 to 36 (inclusive) is valid, otherwise, only 10 is valid.</blockquote>
+- **format** Customize accepted inputs for number parsing.
+    <blockquote>With format enabled, the number format is dictated through the <code>NumberFormat</code> bitflags, which allow you to toggle how to parse a string into a number. Various flags including enabling digit separators, requiring integer or fraction digits, and toggling special values.</blockquote>
+- **rounding** Enable custom rounding for IEEE754 floats.
+    <blockquote>By default, lexical uses round-nearest, tie-even for float rounding (recommended by IEE754).</blockquote>
+- **ryu** Use dtolnay's [ryu](https://github.com/dtolnay/ryu/) library for float-to-string conversions.
+    <blockquote>Enabled by default, and may be turned off by setting <code>default-features = false</code>. Ryu is ~2x as fast as other float formatters.</blockquote>
+- **libm** Enable use of the [libm](https://github.com/rust-lang/libm) library for stable `no_std` support.
+
+
+## Format
+
+Every language has competing specifications for valid numerical input, meaning a number parser for Rust will incorrectly accept or reject input for different programming or data languages. For example:
+
+```rust
+extern crate lexical_core;
+
+use lexical_core::*;
+
+// Valid in Rust strings.
+// Not valid in JSON.
+let f: f64 = parse(b"3.e7").unwrap();                       // 3e7
+
+// Let's only accept JSON floats.
+let format = NumberFormat::JSON;
+let f: f64 = parse_format(b"3.0e7", format).unwrap();       // 3e7
+let f: f64 = parse_format(b"3.e7", format).unwrap();        // Panics!
+
+// We can also allow digit separators, for example.
+// OCaml, a programming language that inspired Rust,
+// accepts digit separators pretty much anywhere.
+let format = NumberFormat::OCAML_STRING;
+let f: f64 = parse(b"3_4.__0_1").unwrap();                  // Panics!
+let f: f64 = parse_format(b"3_4.__0_1", format).unwrap();   // 34.01
+```
+
+The parsing specification is defined by `NumberFormat`, which provides pre-defined constants for over 40 programming and data languages. However, it also allows you to create your own specification, to dictate parsing.
+
+```rust
+extern crate lexical_core;
+
+use lexical_core::*;
+
+// Let's use the standard, Rust grammar.
+let format = NumberFormat::standard().unwrap();
+
+// Let's use a permissive grammar, one that allows anything besides
+// digit separators.
+let format = NumberFormat::permissive().unwrap();
+
+// Let's ignore digit separators and have an otherwise permissive grammar.
+let format = NumberFormat::ignore(b'_').unwrap();
+
+// Create our own grammar.
+// A NumberFormat is compiled from options into binary flags, each
+// taking 1-bit, allowing high-performance, customizable parsing
+// once they're compiled. Each flag will be explained while defining it.
+
+// The '_' character will be used as a digit separator.
+let digit_separator = b'_';
+
+// Require digits in the integer component of a float.
+// `0.1` is valid, but `.1` is not.
+let required_integer_digits = false;
+
+// Require digits in the fraction component of a float.
+// `1.0` is valid, but `1.` and `1` are not.
+let required_fraction_digits = false;
+
+// Require digits in the exponent component of a float.
+// `1.0` and `1.0e7` is valid, but `1.0e` is not.
+let required_exponent_digits = false;
+
+// Do not allow a positive sign before the mantissa.
+// `1.0` and `-1.0` are valid, but `+1.0` is not.
+let no_positive_mantissa_sign = false;
+
+// Require a sign before the mantissa.
+// `+1.0` and `-1.0` are valid, but `1.0` is not.
+let required_mantissa_sign = false;
+
+// Do not allow the use of exponents.
+// `300.0` is valid, but `3.0e2` is not.
+let no_exponent_notation = false;
+
+// Do not allow a positive sign before the exponent.
+// `3.0e2` and 3.0e-2` are valid, but `3.0e+2` is not.
+let no_positive_exponent_sign = false;
+
+// Require a sign before the exponent.
+// `3.0e+2` and `3.0e-2` are valid, but `3.0e2` is not.
+let required_exponent_sign = false;
+
+// Do not allow an exponent without fraction digits.
+// `3.0e7` is valid, but `3e7` and `3.e7` are not.
+let no_exponent_without_fraction = false;
+
+// Do not allow special values.
+// `1.0` is valid, but `NaN` and `inf` are not.
+let no_special = false;
+
+// Use case-sensitive matching when parsing special values.
+// `NaN` is valid, but `nan` and `NAN` are not.
+let case_sensitive_special = false;
+
+// Allow digit separators between digits in the integer component.
+// `3_4.01` is valid, but `_34.01`, `34_.01` and `34.0_1` are not.
+let integer_internal_digit_separator = false;
+
+// Allow digit separators between digits in the fraction component.
+// `34.0_1` is valid, but `34._01`, `34.01_` and `3_4.01` are not.
+let fraction_internal_digit_separator = false;
+
+// Allow digit separators between digits in the exponent component.
+// `1.0e6_7` is valid, but `1.0e_67`, `1.0e67_` and `1_2.0e67` are not.
+let exponent_internal_digit_separator = false;
+
+// Allow digit separators before any digits in the integer component.
+// These digit separators may occur before or after the sign, as long
+// as they occur before any digits.
+// `_34.01` is valid, but `3_4.01`, `34_.01` and `34._01` are not.
+let integer_leading_digit_separator = false;
+
+// Allow digit separators before any digits in the fraction component.
+// `34._01` is valid, but `34.0_1`, `34.01_` and `_34.01` are not.
+let fraction_leading_digit_separator = false;
+
+// Allow digit separators before any digits in the exponent component.
+// These digit separators may occur before or after the sign, as long
+// as they occur before any digits.
+// `1.0e_67` is valid, but `1.0e6_7`, `1.0e67_` and `_1.0e67` are not.
+let exponent_leading_digit_separator = false;
+
+// Allow digit separators after any digits in the integer component.
+// If `required_integer_digits` is not set, `_.01` is valid.
+// `34_.01` is valid, but `3_4.01`, `_34.01` and `34.01_` are not.
+let integer_trailing_digit_separator = false;
+
+// Allow digit separators after any digits in the fraction component.
+// If `required_fraction_digits` is not set, `1._` is valid.
+// `34.01_` is valid, but `34.0_1`, `34._01` and `34_.01` are not.
+let fraction_trailing_digit_separator = false;
+
+// Allow digit separators after any digits in the exponent component.
+// If `required_exponent_digits` is not set, `1.0e_` is valid.
+// `1.0e67_` is valid, but `1.0e6_7`, `1.0e_67` and `1.0_e67` are not.
+let exponent_trailing_digit_separator = false;
+
+// Allow consecutive separators in the integer component.
+// This requires another integer digit separator flag to be set.
+// For example, if `integer_internal_digit_separator` and this flag are set,
+// `3__4.01` is valid, but `__34.01`, `34__.01` and `34.0__1` are not.
+let integer_consecutive_digit_separator = false;
+
+// Allow consecutive separators in the fraction component.
+// This requires another fraction digit separator flag to be set.
+// For example, if `fraction_internal_digit_separator` and this flag are set,
+// `34.0__1` is valid, but `34.__01`, `34.01__` and `3__4.01` are not.
+let fraction_consecutive_digit_separator = false;
+
+// Allow consecutive separators in the exponent component.
+// This requires another exponent digit separator flag to be set.
+// For example, if `exponent_internal_digit_separator` and this flag are set,
+// `1.0e6__7` is valid, but `1.0e__67`, `1.0e67__` and `1__2.0e67` are not.
+let exponent_consecutive_digit_separator = false;
+
+// Allow digit separators in special values.
+// If set, allow digit separators in special values will be ignored.
+// `N_a_N__` is valid, but `i_n_f_e` is not.
+let special_digit_separator = false;
+
+// Compile the grammar.
+let format = NumberFormat::compile(
+    digit_separator,
+    required_integer_digits,
+    required_fraction_digits,
+    required_exponent_digits,
+    no_positive_mantissa_sign,
+    required_mantissa_sign,
+    no_exponent_notation,
+    no_positive_exponent_sign,
+    required_exponent_sign,
+    no_exponent_without_fraction,
+    no_special,
+    case_sensitive_special,
+    integer_internal_digit_separator,
+    fraction_internal_digit_separator,
+    exponent_internal_digit_separator,
+    integer_leading_digit_separator,
+    fraction_leading_digit_separator,
+    exponent_leading_digit_separator,
+    integer_trailing_digit_separator,
+    fraction_trailing_digit_separator,
+    exponent_trailing_digit_separator,
+    integer_consecutive_digit_separator,
+    fraction_consecutive_digit_separator,
+    exponent_consecutive_digit_separator,
+    special_digit_separator
+).unwrap();
+```
+
+# Configuration
+
+Lexical-core also includes configuration options that allow you to configure float processing and formatting. These are provided as getters and setters, so lexical-core can validate the input.
+
+- **NaN**
+    - `get_nan_string`
+    - `set_nan_string`
+    <blockquote>The representation of Not a Number (NaN) as a string (default <code>b"NaN"</code>). For float parsing, lexical-core uses case-insensitive comparisons. This string <b>must</b> start with an <code>'N'</code> or <code>'n'</code>.</blockquote>
+- **Short Infinity**
+    - `get_inf_string`
+    - `set_inf_string`
+    <blockquote>The short, default representation of infinity as a string (default <code>b"inf"</code>). For float parsing, lexical-core uses case-insensitive comparisons. This string **must** start with an <code>'I'</code> or <code>'i'</code>.</blockquote>
+- **Long Infinity**
+    - `get_infinity_string`
+    - `set_infinity_string`
+    <blockquote>The long, backup representation of infinity as a string (default <code>b"infinity"</code>). The long infinity must be at least as long as the short infinity, and will only be used during float parsing (and is case-insensitive). This string **must** start with an <code>'I'</code> or <code>'i'</code>.</blockquote>
+- **Exponent Default Character**
+    - `get_exponent_default_char`
+    - `set_exponent_default_char`
+    <blockquote>The default character designating the exponent component of a float (default <code>b'e'</code>) for strings with a radix less than 15 (including decimal strings). For float parsing, lexical-core uses case-insensitive comparisons. This value should be not be in character set <code>[0-9a-eA-E.+\-]</code>.</blockquote>
+- **Exponent Backup Character** (radix only)
+    - `get_exponent_backup_char`
+    - `set_exponent_backup_char`
+    <blockquote>The backup character designating the exponent component of a float (default <code>b'^'</code>) for strings with a radix greater than or equal to 15. This value should be not be in character set <code>[0-9a-zA-Z.+\-]</code>.</blockquote>
+- **Float Rounding** (rounding only)
+    - `get_float_rounding`
+    - `set_float_rounding`
+    <blockquote>The IEEE754 float-rounding scheme to be used during float parsing. In almost every case, this should be set to <code>RoundingKind::NearestTieEven</code>.</blockquote>
+
+# Constants
+
+Lexical-core also includes a few constants to simplify interfacing with number-to-string code, and are implemented for the `lexical_core::Number` trait, which is required by `ToLexical`.
+
+- **FORMATTED_SIZE** The maximum number of bytes a formatter may write.
+    <blockquote>For example, <code>lexical_core::write_radix::&lt;i32&gt;</code> may write up to <code>i32::FORMATTED_SIZE</code> characters. This constant may significantly overestimate the number of characters required for decimal strings when the radix feature is enabled.</blockquote>
+- **FORMATTED_SIZE_DECIMAL** The maximum number of bytes a formatter may write in decimal (base 10).
+    <blockquote>For example, <code>lexical_core::write::&lt;i32&gt;</code> may write up to <code>i32::FORMATTED_SIZE_DECIMAL</code> characters.</blockquote>
+
+These are provided as Rust constants so they may be used as the size element in arrays.
+
+# Documentation
+
+Lexical-core's documentation can be found on [docs.rs](https://docs.rs/lexical-core).
+
+# Validation
+
+Float parsing is difficult to do correctly, and major bugs have been found in implementations from [libstdc++'s strtod](https://www.exploringbinary.com/glibc-strtod-incorrectly-converts-2-to-the-negative-1075/) to [Python](https://bugs.python.org/issue7632). In order to validate the accuracy of the lexical, we employ the following external tests:
+
+1. Hrvoje Abraham's [strtod](https://github.com/ahrvoje/numerics/tree/master/strtod) test cases.
+2. Rust's [test-float-parse](https://github.com/rust-lang/rust/tree/64185f205dcbd8db255ad6674e43c63423f2369a/src/etc/test-float-parse) unittests.
+3. Testbase's [stress tests](https://www.icir.org/vern/papers/testbase-report.pdf) for converting from decimal to binary.
+4. [Various](https://www.exploringbinary.com/glibc-strtod-incorrectly-converts-2-to-the-negative-1075/) [difficult](https://www.exploringbinary.com/how-glibc-strtod-works/) [cases](https://www.exploringbinary.com/how-strtod-works-and-sometimes-doesnt/) reported on blogs.
+
+Although lexical may contain bugs leading to rounding error, it is tested against a comprehensive suite of random-data and near-halfway representations, and should be fast and correct for the vast majority of use-cases.
+
+# Implementation Details
+
+## Float to String
+
+For more information on the Grisu2 and Grisu3 algorithms, see [Printing Floating-Point Numbers Quickly and Accurately with Integers](https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf).
+
+For more information on the Ryu algorithm, see [Ryū: fast float-to-string conversion](https://dl.acm.org/citation.cfm?id=3192369).
+
+## String to Float
+
+In order to implement an efficient parser in Rust, lexical uses the following steps:
+
+1. We ignore the sign until the end, and merely toggle the sign bit after creating a correct representation of the positive float.
+2. We handle special floats, such as "NaN", "inf", "Infinity". If we do not have a special float, we continue to the next step.
+3. We parse up to 64-bits from the string for the mantissa, ignoring any trailing digits, and parse the exponent (if present) as a signed 32-bit integer. If the exponent overflows or underflows, we set the value to i32::max_value() or i32::min_value(), respectively.
+4. **Fast Path** We then try to create an exact representation of a native binary float from parsed mantissa and exponent. If both can be exactly represented, we multiply the two to create an exact representation, since IEEE754 floats mandate the use of guard digits to minimizing rounding error. If either component cannot be exactly represented as the native float, we continue to the next step.
+5. **Moderate Path** We create an approximate, extended, 80-bit float type (64-bits for the mantissa, 16-bits for the exponent) from both components, and multiplies them together. This minimizes the rounding error, through guard digits. We then estimate the error from the parsing and multiplication steps, and if the float +/- the error differs significantly from b+h, we return the correct representation (b or b+u). If we cannot unambiguously determine the correct floating-point representation, we continue to the next step.
+6. **Fallback Moderate Path** Next, we create a 128-bit representation of the numerator and denominator for b+h, to disambiguate b from b+u by comparing the actual digits in the input to theoretical digits generated from b+h. This is accurate for ~36 significant digits from a 128-bit approximation with decimal float strings. If the input is less than or equal to 36 digits, we return the value from this step. Otherwise, we continue to the next step.
+7. **Slow Path** We use arbitrary-precision arithmetic to disambiguate the correct representation without any rounding error. We create an exact representation of the input digits as a big integer, to determine how to round the top 53 bits for the mantissa. If there is a fraction or a negative exponent, we create a representation of the significant digits for `b+h` and scale the input digits by the binary exponent in `b+h`, and scale the significant digits in `b+h` by the decimal exponent, and compare the two to determine if we need to round up or down.
+
+Since arbitrary-precision arithmetic is slow and scales poorly for decimal strings with many digits or exponents of high magnitude, lexical also supports a lossy algorithm, which returns the result from the moderate path. The result from the lossy parser should be accurate to within 1 ULP.
+
+## Arbitrary-Precision Arithmetic
+
+Lexical uses arbitrary-precision arithmetic to exactly represent strings between two floating-point representations, and is highly optimized for performance. The following section is a comparison of different algorithms to determine the correct float representation. The arbitrary-precision arithmetic logic is not dependent on memory allocation: it only uses the heap when the `radix` feature is enabled.
+
+## Algorithm Background and Comparison
+
+For close-to-halfway representations of a decimal string `s`, where `s` is close between two representations, `b` and the next float `b+u`, arbitrary-precision arithmetic is used to determine the correct representation. This means `s` is close to `b+h`, where `h` is the halfway point between `b` and `b+u`.
+
+For the following example, we will use the following values for our test case:
+
+* `s = 2.4703282292062327208828439643411068618252990130716238221279284125033775363510437593264991818081799618989828234772285886546332835517796989819938739800539093906315035659515570226392290858392449105184435931802849936536152500319370457678249219365623669863658480757001585769269903706311928279558551332927834338409351978015531246597263579574622766465272827220056374006485499977096599470454020828166226237857393450736339007967761930577506740176324673600968951340535537458516661134223766678604162159680461914467291840300530057530849048765391711386591646239524912623653881879636239373280423891018672348497668235089863388587925628302755995657524455507255189313690836254779186948667994968324049705821028513185451396213837722826145437693412532098591327667236328125001e-324`
+* `b = 0.0`
+* `b+h = 2.4703282292062327208828439643411068618252990130716238221279284125033775363510437593264991818081799618989828234772285886546332835517796989819938739800539093906315035659515570226392290858392449105184435931802849936536152500319370457678249219365623669863658480757001585769269903706311928279558551332927834338409351978015531246597263579574622766465272827220056374006485499977096599470454020828166226237857393450736339007967761930577506740176324673600968951340535537458516661134223766678604162159680461914467291840300530057530849048765391711386591646239524912623653881879636239373280423891018672348497668235089863388587925628302755995657524455507255189313690836254779186948667994968324049705821028513185451396213837722826145437693412532098591327667236328125e-324`
+* `b+u = 5e-324`
+
+**Algorithm M**
+
+Algorithm M represents the significant digits of a float as a fraction of arbitrary-precision integers (a more in-depth description can be found [here](https://www.exploringbinary.com/correct-decimal-to-floating-point-using-big-integers/)). For example, 1.23 would be 123/100, while 314.159 would be 314159/1000. We then scale the numerator and denominator by powers of 2 until the quotient is in the range `[2^52, 2^53)`, generating the correct significant digits of the mantissa.
+
+A naive implementation, in Python, is as follows:
+
+```python
+def algorithm_m(num, b):
+    # Ensure numerator >= 2**52
+    bits = int(math.ceil(math.log2(num)))
+    if bits <= 53:
+        num <<= 53
+        b -= 53
+
+    # Track number of steps required (optional).
+    steps = 0
+    while True:
+        steps += 1
+        c = num//b
+        if c < 2**52:
+            b //= 2
+        elif c >= 2**53:
+            b *= 2
+        else:
+            break
+
+    return (num, b, steps-1)
+```
+
+**bigcomp**
+
+Bigcomp is the canonical string-to-float parser, which creates an exact representation of `b+h` as a big integer, and compares the theoretical digits from `b+h` scaled into the range `[1, 10)` by a power of 10 to the actual digits in the input string (a more in-depth description can be found [here](https://www.exploringbinary.com/bigcomp-deciding-truncated-near-halfway-conversions/)). A maximum of 768 digits need to be compared to determine the correct representation, and the size of the big integers in the ratio does not depend on the number of digits in the input string.
+
+Bigcomp is used as a fallback algorithm for lexical-core when the radix feature is enabled, since the radix-representation of a binary float may never terminate if the radix is not divisible by 2. Since bigcomp uses constant memory, it is used as the default algorithm if more than `2^15` digits are passed and the representation is potentially non-terminating.
+
+**bhcomp**
+
+Bhcomp is a simple, performant algorithm that compared the significant digits to the theoretical significant digits for `b+h`. Simply, the significant digits from the string are parsed, creating a ratio. A ratio is generated for `b+h`, and these two ratios are scaled using the binary and radix exponents.
+
+For example, "2.470328e-324" produces a ratio of `2470328/10^329`, while `b+h` produces a binary ratio of `1/2^1075`. We're looking to compare these ratios, so we need to scale them using common factors. Here, we convert this to `(2470328*5^329*2^1075)/10^329` and `(1*5^329*2^1075)/2^1075`, which converts to `2470328*2^746` and `1*5^329`.
+
+Our significant digits (real_digits) and `b+h` (bh_digits) therefore start like:
+```
+real_digits = 91438982...
+bh_digits   = 91438991...
+```
+
+Since our real digits are below the theoretical halfway point, we know we need to round-down, meaning our literal value is `b`, or `0.0`. This approach allows us to calculate whether we need to round-up or down with a single comparison step, without any native divisions required. This is the default algorithm lexical-core uses.
+
+**Other Optimizations**
+
+1. We remove powers of 2 during exponentiation in bhcomp.
+2. We limit the number of parsed digits to the theoretical max number of digits produced by `b+h` (768 for decimal strings), and merely compare any trailing digits to '0'. This provides an upper-bound on the computation cost.
+3. We use fast exponentiation and multiplication algorithms to scale the significant digits for comparison.
+4. For the fallback bigcomp algorithm, we use a division algorithm optimized for the generation of a single digit from a given radix, by setting the leading bit in the denominator 4 below the most-significant bit (in decimal strings). This requires only 1 native division per digit generated.
+4. The individual "limbs" of the big integers are optimized to the architecture we compile on, for example, u32 on x86 and u64 on x86-64, minimizing the number of native operations required. Currently, 64-bit limbs are used on target architectures `aarch64`, `powerpc64`, `mips64`, and `x86_64`.
+
+# Known Issues
+
+On the ARMVv6 architecture, the stable exponentiation for the fast, incorrect float parser is not fully stable. For example, `1e-300` is correct, while `5e-324` rounds to `0`, leading to "5e-324" being incorrectly parsed as `0`. This does not affect the default, correct float parser, nor ARMVv7 or ARMVv8 (aarch64) architectures. This bug can compound errors in the incorrect parser (feature-gated by disabling the `correct` feature`). It is not known if this bug is an artifact of Qemu emulation of ARMv6, or is actually representative the hardware.
+
+Versions of lexical-core prior to 0.4.3 could round parsed floating-point numbers with an error of up to 1 ULP. This occurred for strings with 16 or more digits and a trailing 0 in the fraction, the `b+h` comparison in the slow-path algorithm incorrectly scales the the theoretical digits due to an over-calculated real exponent. This affects a very small percentage of inputs, however, it is recommended to update immediately.
+
+# Versioning and Version Support
+
+**Version Support**
+
+The currently supported versions are:
+- v0.7.x
+- v0.6.x (Maintenace)
+
+**Rustc Compatibility**
+
+v0.7.x supports 1.37+, including stable, beta, and nightly.
+v0.6.x supports Rustc 1.24+, including stable, beta, and nightly.
+
+Please report any errors compiling a supported lexical-core version on a compatible Rustc version.
+
+**Versioning**
+
+Lexical-core uses [semantic versioning](https://semver.org/). Removing support for Rustc versions newer than the latest stable Debian or Ubuntu version is considered an incompatible API change, requiring a major version change.
+
+# Changelog
+
+All changes since 0.4.1 are documented in [CHANGELOG](CHANGELOG).
+
+# License
+
+Lexical-core is dual licensed under the Apache 2.0 license as well as the MIT license. See the LICENCE-MIT and the LICENCE-APACHE files for the licenses.
+
+Lexical-core also ports some code from [rust](https://github.com/rust-lang/rust) (for backwards compatibility), [V8](https://github.com/v8/v8), [libgo](https://golang.org/src) and [fpconv](https://github.com/night-shift/fpconv), and therefore might be subject to the terms of a 3-clause BSD license or BSD-like license.
+
+# Contributing
+
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in lexical by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/alias.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/alias.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/alias.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/alias.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,98 @@
+//! Aliases and traits to simplify float-parsing.
+
+use crate::float::*;
+use crate::util::*;
+use super::bignum::ToBigfloat;
+use super::errors::FloatErrors;
+
+// TRAITS
+
+/// Trait to simplify type signatures for atof.
+pub(super) trait FloatType:
+    FloatRounding<u64> +
+    FloatRounding<u128> +
+    StablePower
+{
+    type Mantissa: Mantissa;
+    type ExtendedFloat: ExtendedFloatType<Self>;
+}
+
+impl FloatType for f32 {
+    type Mantissa = Self::Unsigned;
+    type ExtendedFloat = ExtendedFloat<Self::Mantissa>;
+}
+
+impl FloatType for f64 {
+    type Mantissa = Self::Unsigned;
+    type ExtendedFloat = ExtendedFloat<Self::Mantissa>;
+}
+
+/// Trait for a useable mantissa.
+pub(super) trait MantissaType:
+    Mantissa +
+    FloatErrors
+{}
+
+impl MantissaType for u64 {
+}
+
+impl MantissaType for u128 {
+}
+
+/// Trait for extended-float types.
+pub(super) trait ExtendedFloatType<F: FloatType>:
+    ToBigfloat<F::Mantissa> +
+    From<F>
+{
+    // I really wish I had any other choice **other** than getters and setters,
+    // but since we can't specify fields in traits, and we can't use properties...
+    // C'est la vie.
+    fn mant(&self) -> F::Mantissa;
+    fn exp(&self) -> i32;
+    fn set_mant(&mut self, mant: F::Mantissa);
+    fn set_exp(&mut self, exp: i32);
+}
+
+impl ExtendedFloatType<f32> for ExtendedFloat<u32> {
+    perftools_inline!{
+    fn mant(&self) -> u32 {
+        self.mant
+    }}
+
+    perftools_inline!{
+    fn exp(&self) -> i32 {
+        self.exp
+    }}
+
+    perftools_inline!{
+    fn set_mant(&mut self, mant: u32) {
+        self.mant = mant;
+    }}
+
+    perftools_inline!{
+    fn set_exp(&mut self, exp: i32) {
+        self.exp = exp;
+    }}
+}
+
+impl ExtendedFloatType<f64> for ExtendedFloat<u64> {
+    perftools_inline!{
+    fn mant(&self) -> u64 {
+        self.mant
+    }}
+
+    perftools_inline!{
+    fn exp(&self) -> i32 {
+        self.exp
+    }}
+
+    perftools_inline!{
+    fn set_mant(&mut self, mant: u64) {
+        self.mant = mant;
+    }}
+
+    perftools_inline!{
+    fn set_exp(&mut self, exp: i32) {
+        self.exp = exp;
+    }}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bhcomp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bhcomp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bhcomp.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bhcomp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,377 @@
+//! Compare the mantissa to the halfway representation of the float.
+//!
+//! Compares the actual significant digits of the mantissa to the
+//! theoretical digits from `b+h`, scaled into the proper range.
+
+use crate::float::*;
+use crate::float::convert::*;
+use crate::float::rounding::*;
+use crate::util::*;
+use super::alias::*;
+use super::bigcomp;
+use super::bignum::*;
+use super::format::*;
+use super::math::*;
+
+// Export a character to digit.
+macro_rules! to_digit {
+    ($c:expr, $radix:ident) => (($c as char).to_digit($radix));
+}
+
+// PARSE MANTISSA
+
+/// Iteratively add small digits to the mantissa and increment the counter.
+macro_rules! add_digits {
+    (
+        $iter:expr, $result:ident, $value:ident, $i:ident,
+        $counter:ident, $step:ident, $small_powers:ident,
+        $base:ident, $radix:ident, $max_digits:ident
+    ) => {
+        while let Some(&digit) = $iter.next() {
+            // We've parsed the max digits using small values, add to bignum
+            if $counter == $step {
+                $result.imul_small($small_powers[$counter]);
+                $result.iadd_small($value);
+                $counter = 0;
+                $value = 0;
+            }
+
+            $value *= $base;
+            $value += as_limb(to_digit!(digit, $radix).unwrap());
+
+            // Check if we've parsed all our possible digits.
+            $i += 1;
+            $counter += 1;
+            if $i == $max_digits {
+                break;
+            }
+        }
+    };
+}
+
+/// Parse the full mantissa into a big integer.
+///
+/// Max digits is the maximum number of digits plus one.
+pub(super) fn parse_mantissa<'a, Data>(data: Data, radix: u32, max_digits: usize)
+    -> Bigint
+    where Data: SlowDataInterface<'a>
+{
+    let small_powers = Bigint::small_powers(radix);
+    let count = data.mantissa_digits();
+    let bits = count / integral_binary_factor(radix).as_usize();
+    let bytes = bits / <Limb as Integer>::BITS;
+
+    // Main loop
+    let step = small_powers.len() - 2;
+    let base = as_limb(radix);
+    let max_digits = max_digits - 1;
+    let mut counter = 0;
+    let mut value: Limb = 0;
+    let mut i: usize = 0;
+    let mut result = Bigint::default();
+    result.data.reserve(bytes);
+
+    // Iteratively process all the data in the mantissa.
+    let mut integer_iter = data.integer_iter();
+    let mut fraction_iter = data.significant_fraction_iter();
+    add_digits!(integer_iter, result, value, i, counter, step, small_powers, base, radix, max_digits);
+    if integer_iter.consumed() {
+        // Continue if we haven't already processed the max digits.
+        add_digits!(fraction_iter, result, value, i, counter, step, small_powers, base, radix, max_digits);
+    }
+
+    // We will always have a remainder, as long as we entered the loop
+    // once, or counter % step is 0.
+    if counter != 0 {
+        result.imul_small(small_powers[counter]);
+        result.iadd_small(value);
+    }
+
+    // If we have any remaining digits after the last value, we need
+    // to add a 1 after the rest of the array, it doesn't matter where,
+    // just move it up. This is good for the worst-possible float
+    // representation. We also need to return an index.
+    // Since we already trimmed trailing zeros, we know there has
+    // to be a non-zero digit if there are any left.
+    let is_consumed = integer_iter.consumed() && fraction_iter.consumed();
+    if !is_consumed {
+        result.imul_small(base);
+        result.iadd_small(1);
+    }
+
+    result
+}
+
+perftools_inline!{
+/// Implied method to calculate the number of digits from a 32-bit float.
+fn max_digits_f32(radix: u32) -> Option<usize> {
+    match radix {
+        6  => Some(103),
+        10 => Some(114),
+        12 => Some(117),
+        14 => Some(119),
+        18 => Some(122),
+        20 => Some(123),
+        22 => Some(123),
+        24 => Some(124),
+        26 => Some(125),
+        28 => Some(125),
+        30 => Some(126),
+        34 => Some(127),
+        36 => Some(127),
+        // Powers of two and odd numbers should be unreachable
+        _  => None,
+    }
+}}
+
+perftools_inline!{
+/// Implied method to calculate the number of digits from a 64-bit float.
+fn max_digits_f64(radix: u32) -> Option<usize> {
+    match radix {
+        6  => Some(682),
+        10 => Some(769),
+        12 => Some(792),
+        14 => Some(808),
+        18 => Some(832),
+        20 => Some(840),
+        22 => Some(848),
+        24 => Some(854),
+        26 => Some(859),
+        28 => Some(864),
+        30 => Some(868),
+        34 => Some(876),
+        36 => Some(879),
+        // Powers of two and odd numbers should be unreachable
+        _  => None,
+    }
+}}
+
+perftools_inline!{
+/// Calculate the maximum number of digits possible in the mantissa.
+///
+/// Returns the maximum number of digits plus one.
+///
+/// We can exactly represent a float in radix `b` from radix 2 if
+/// `b` is divisible by 2. This function calculates the exact number of
+/// digits required to exactly represent that float.
+///
+/// According to the "Handbook of Floating Point Arithmetic",
+/// for IEEE754, with emin being the min exponent, p2 being the
+/// precision, and b being the radix, the number of digits follows as:
+///
+/// `−emin + p2 + ⌊(emin + 1) log(2, b) − log(1 − 2^(−p2), b)⌋`
+///
+/// For f32, this follows as:
+///     emin = -126
+///     p2 = 24
+///
+/// For f64, this follows as:
+///     emin = -1022
+///     p2 = 53
+///
+/// In Python:
+///     `-emin + p2 + math.floor((emin+1)*math.log(2, b) - math.log(1-2**(-p2), b))`
+///
+/// This was used to calculate the maximum number of digits for [2, 36].
+pub(super) fn max_digits<F>(radix: u32)
+    -> Option<usize>
+    where F: Float
+{
+    match F::BITS {
+        32 => max_digits_f32(radix),
+        64 => max_digits_f64(radix),
+        _  => unreachable!(),
+    }
+}}
+
+// ROUNDING
+
+/// Custom rounding for round-nearest algorithms.
+macro_rules! nearest_cb {
+    ($m:tt, $is_truncated:ident, $cb:ident) => {
+        // Create our wrapper for round_nearest_tie_*.
+        // If there are truncated bits, and we are exactly halfway,
+        // then we need to set above to true and halfway to false.
+        move | f: &mut ExtendedFloat<$m>, shift: i32 | {
+            let (mut is_above, mut is_halfway) = round_nearest(f, shift);
+            if is_halfway && $is_truncated {
+                is_above = true;
+                is_halfway = false;
+            }
+            $cb::<$m>(f, is_above, is_halfway);
+        }
+    };
+}
+
+/// Custom rounding for round-toward algorithms.
+#[cfg(feature = "rounding")]
+macro_rules! toward_cb {
+    ($m:tt, $is_truncated:ident, $cb:ident) => {
+        // Create our wrapper for round_towards_tie_*.
+        // If there are truncated bits, and truncated is not set, set it.
+        move | f: &mut ExtendedFloat<$m>, shift: i32 | {
+            let truncated = round_toward(f, shift);
+            $cb::<$m>(f, $is_truncated | truncated);
+        }
+    };
+}
+
+perftools_inline!{
+/// Custom rounding for truncated mantissa.
+///
+/// Respect rounding rules in the config file.
+#[allow(unused_variables)]
+pub(super) fn round_to_native<F>(fp: &mut ExtendedFloat80, is_truncated: bool, kind: RoundingKind)
+    where F: FloatType
+{
+    type M = u64;
+
+    // Define a simplified function, since we can't store the callback to
+    // a variable without `impl Trait`, which requires 1.26.0.
+    #[inline(always)]
+    fn round<F, Cb>(fp: &mut ExtendedFloat80, cb: Cb)
+        where F: FloatRounding<M>,
+              Cb: FnOnce(&mut ExtendedFloat<M>, i32)
+    {
+        fp.round_to_native::<F, _>(cb);
+    }
+
+    #[cfg(feature = "rounding")]
+    match kind {
+        RoundingKind::NearestTieEven     => round::<F, _>(fp, nearest_cb!(M, is_truncated, tie_even)),
+        RoundingKind::NearestTieAwayZero => round::<F, _>(fp, nearest_cb!(M, is_truncated, tie_away_zero)),
+        RoundingKind::Upward             => round::<F, _>(fp, toward_cb!(M, is_truncated, upward)),
+        RoundingKind::Downward           => round::<F, _>(fp, toward_cb!(M, is_truncated, downard)),
+        _                                => unreachable!(),
+    };
+
+    #[cfg(not(feature = "rounding"))]
+    round::<F, _>(fp, nearest_cb!(M, is_truncated, tie_even));
+}}
+
+/// BIGCOMP PATH
+
+/// Maximum number of digits before reverting to bigcomp.
+const LARGE_POWER_MAX: usize = 1 << 15;
+
+perftools_inline!{
+/// Check if we need to use bigcomp.
+pub(super) fn use_bigcomp(radix: u32, count: usize)
+    -> bool
+{
+    // When we have extremely large values, it makes a lot more sense to
+    // use am algorithm that scales linearly with input size. We
+    // only precompute exponent up to 2^15 anyway for a given radix, so
+    // use it. If the radix is not odd, we know the finite number of digits
+    // for the worst-case representation, so we can create a valid ratio
+    // and ignore the remaining digits.
+    radix.is_odd() && count > LARGE_POWER_MAX
+}}
+
+/// Calculate the mantissa for a big integer with a positive exponent.
+pub(super) fn large_atof<'a, F, Data>(data: Data, radix: u32, max_digits: usize, exponent: i32, kind: RoundingKind)
+    -> F
+    where F: FloatType,
+          Data: SlowDataInterface<'a>
+{
+    // Simple, we just need to multiply by the power of the radix.
+    // Now, we can calculate the mantissa and the exponent from this.
+    // The binary exponent is the binary exponent for the mantissa
+    // shifted to the hidden bit.
+    let mut bigmant = parse_mantissa(data, radix, max_digits);
+    bigmant.imul_power(radix, exponent.as_u32());
+
+    // Get the exact representation of the float from the big integer.
+    let (mant, is_truncated) = bigmant.hi64();
+    let exp = bigmant.bit_length().as_i32() - <u64 as Integer>::BITS.as_i32();
+    let mut fp = ExtendedFloat { mant: mant, exp: exp };
+    round_to_native::<F>(&mut fp, is_truncated, kind);
+    into_float(fp)
+}
+
+// BHCOMP
+
+/// Calculate the mantissa for a big integer with a negative exponent.
+///
+/// This invokes the comparison with `b+h`.
+pub(super) fn small_atof<'a, F, Data>(data: Data, radix: u32, max_digits: usize, exponent: i32, f: F, kind: RoundingKind)
+    -> F
+    where F: FloatType,
+          Data: SlowDataInterface<'a>
+{
+    // Get the significant digits and radix exponent for the real digits.
+    let mut real_digits = parse_mantissa(data, radix, max_digits);
+    let real_exp = exponent;
+    debug_assert!(real_exp < 0);
+
+    // Get the significant digits and the binary exponent for `b+h`.
+    let theor = bigcomp::theoretical_float(f, kind);
+    let mut theor_digits = Bigint::from_u64(theor.mant().as_u64());
+    let theor_exp = theor.exp();
+
+    // We need to scale the real digits and `b+h` digits to be the same
+    // order. We currently have `real_exp`, in `radix`, that needs to be
+    // shifted to `theor_digits` (since it is negative), and `theor_exp`
+    // to either `theor_digits` or `real_digits` as a power of 2 (since it
+    // may be positive or negative). Try to remove as many powers of 2
+    // as possible. All values are relative to `theor_digits`, that is,
+    // reflect the power you need to multiply `theor_digits` by.
+    let (binary_exp, halfradix_exp, radix_exp) = match radix.is_even() {
+        // Can remove a power-of-two.
+        // Both are on opposite-sides of equation, can factor out a
+        // power of two.
+        //
+        // Example: 10^-10, 2^-10   -> ( 0, 10, 0)
+        // Example: 10^-10, 2^-15   -> (-5, 10, 0)
+        // Example: 10^-10, 2^-5    -> ( 5, 10, 0)
+        // Example: 10^-10, 2^5 -> (15, 10, 0)
+        true  => (theor_exp - real_exp, -real_exp, 0),
+        // Cannot remove a power-of-two.
+        false => (theor_exp, 0, -real_exp),
+    };
+
+    // Carry out our multiplication.
+    if halfradix_exp != 0 {
+        theor_digits.imul_power(radix / 2, halfradix_exp.as_u32());
+    }
+    if radix_exp != 0 {
+        theor_digits.imul_power(radix, radix_exp.as_u32());
+    }
+    if binary_exp > 0 {
+        theor_digits.imul_power(2, binary_exp.as_u32());
+    } else if binary_exp < 0 {
+        real_digits.imul_power(2, (-binary_exp).as_u32());
+    }
+
+    bigcomp::round_to_native(f, real_digits.compare(&theor_digits), kind)
+}
+
+/// Calculate the exact value of the float.
+///
+/// Notes:
+///     The digits iterator must not have any trailing zeros (true for
+///     `FloatState2`).
+///     sci_exponent and digits.size_hint() must not overflow i32.
+pub(super) fn atof<'a, F, Data>(data: Data, radix: u32, f: F, kind: RoundingKind)
+    -> F
+    where F: FloatType,
+          Data: SlowDataInterface<'a>
+{
+    // We have a finite conversions number of digits for base10.
+    // In order for a float in radix `b` with a finite number of digits
+    // to have a finite representation in radix `y`, `b` should divide
+    // an integer power of `y`. This means for binary, all even radixes
+    // have finite representations, and all odd ones do not.
+    let max_digits = unwrap_or_max(max_digits::<F>(radix));
+    let count = max_digits.min(data.mantissa_digits());
+    let exponent = data.scientific_exponent() + 1 - count.as_i32();
+
+    if cfg!(feature = "radix") && use_bigcomp(radix, count) {
+        // Use the slower algorithm for giant data, since we use a lot less memory.
+        bigcomp::atof(data, radix, f, kind)
+    } else if exponent >= 0 {
+        large_atof(data, radix, max_digits, exponent, kind)
+    } else {
+        small_atof(data, radix, max_digits, exponent, f, kind)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bigcomp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bigcomp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bigcomp.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bigcomp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,391 @@
+//! An implementation of bigcomp for Rust.
+//!
+//! Compares the known string to theoretical digits generated on the
+//! fly for `b+h`, where a string representation of a float is between
+//! `b` and `b+u`, where `b+u` is 1 unit in the least-precision. Therefore,
+//! the string must be close to `b+h`.
+//!
+//! Adapted from:
+//!     https://www.exploringbinary.com/bigcomp-deciding-truncated-near-halfway-conversions/
+
+use crate::lib::cmp;
+use crate::util::*;
+use super::alias::*;
+use super::bignum::*;
+use super::format::*;
+use super::math::*;
+
+// ROUNDING
+
+/// Custom rounding for the ratio.
+#[allow(unused_variables)]
+pub(super) fn round_to_native<F>(f: F, order: cmp::Ordering, kind: RoundingKind)
+    -> F
+    where F: FloatType
+{
+    #[cfg(not(feature = "rounding"))] {
+        match order {
+            cmp::Ordering::Greater  => f.next_positive(),
+            cmp::Ordering::Less     => f,
+            cmp::Ordering::Equal    => f.round_positive_even(),
+        }
+    }
+
+    // Compare the actual digits to the round-down or halfway point.
+    #[cfg(feature = "rounding")] {
+        match order {
+            cmp::Ordering::Greater  => match kind {
+                // Comparison with `b+h`, above. Round-up.
+                RoundingKind::NearestTieEven     => f.next_positive(),
+                RoundingKind::NearestTieAwayZero => f.next_positive(),
+                // Comparison with `b`, above. Truncated digits.
+                RoundingKind::Upward             => f.next_positive(),
+                RoundingKind::Downward           => f,
+                _                                => unimplemented!(),
+            },
+            // This cannot happen for RoundingKind Upward or Downward.
+            // For round-nearest algorithms, we are below `b+h` so round-down.
+            cmp::Ordering::Less     => match kind {
+                // Comparison with `b+h`, below. Stay put.
+                RoundingKind::NearestTieEven     => f,
+                RoundingKind::NearestTieAwayZero => f,
+                // Comparison with `b`, below. Truncated digits, but below our
+                // estimate `b`.
+                RoundingKind::Upward             => f,
+                RoundingKind::Downward           => f.prev_positive(),
+                _                                => unimplemented!(),
+            },
+            cmp::Ordering::Equal    => match kind {
+                // Only round-up if the mantissa is odd.
+                RoundingKind::NearestTieEven     => f.round_positive_even(),
+                // Always round-up, we want to go away from 0.
+                RoundingKind::NearestTieAwayZero => f.next_positive(),
+                // Comparison with `b`, equal. No truncated digits.
+                RoundingKind::Upward             => f,
+                RoundingKind::Downward           => f,
+                _                                => unimplemented!(),
+            },
+        }
+    }
+}
+
+// SHARED
+
+perftools_inline!{
+/// Calculate `b` from a a representation of `b` as a float.
+pub(super) fn b<F: FloatType>(f: F) -> F::ExtendedFloat {
+    f.into()
+}}
+
+perftools_inline!{
+/// Calculate `b+h` from a a representation of `b` as a float.
+pub(super) fn bh<F: FloatType>(f: F) -> F::ExtendedFloat {
+    // None of these can overflow.
+    let mut b = b(f);
+    let mant = (b.mant() << 1) + as_cast(1);
+    let exp = b.exp() - 1;
+    b.set_mant(mant);
+    b.set_exp(exp);
+    b
+}}
+
+perftools_inline!{
+/// Generate the theoretical float type for the rounding kind.
+#[allow(unused_variables)]
+pub(super) fn theoretical_float<F>(f: F, kind: RoundingKind)
+    -> F::ExtendedFloat
+    where F: FloatType
+{
+    #[cfg(not(feature = "rounding"))] {
+        bh(f)
+    }
+
+    #[cfg(feature = "rounding")] {
+        match is_nearest(kind) {
+            // We need to check if we're close to halfway, so use `b+h`.
+            true  => bh(f),
+            // Just care if there are any truncated digits, use `b`.
+            false => b(f),
+        }
+    }
+}}
+
+// BIGCOMP
+
+perftools_inline!{
+/// Get the appropriate scaling factor from the digit count.
+///
+/// * `radix`           - Radix for the number parsing.
+/// * `sci_exponent`    - Exponent of basen string in scientific notation.
+pub fn scaling_factor(radix: u32, sci_exponent: u32)
+    -> Bigfloat
+{
+    let mut factor = Bigfloat { data: arrvec![1], exp: 0 };
+    factor.imul_power(radix, sci_exponent);
+    factor
+}}
+
+/// Make a ratio for the numerator and denominator.
+///
+/// * `radix`           - Radix for the number parsing.
+/// * `sci_exponent`    - Exponent of basen string in scientific notation.
+/// * `f`               - Sub-halfway (`b`) float.
+pub(super) fn make_ratio<F: Float>(radix: u32, sci_exponent: i32, f: F, kind: RoundingKind)
+    -> (Bigfloat, Bigfloat)
+    where F: FloatType
+{
+    let theor = theoretical_float(f, kind).to_bigfloat();
+    let factor = scaling_factor(radix, sci_exponent.abs().as_u32());
+    let mut num: Bigfloat;
+    let mut den: Bigfloat;
+
+    if sci_exponent < 0 {
+        // Need to have the basen factor be the numerator, and the fp
+        // be the denominator. Since we assumed that theor was the numerator,
+        // if it's the denominator, we need to multiply it into the numerator.
+        num = factor;
+        num.imul_large(&theor);
+        den = Bigfloat { data: arrvec![1], exp: -theor.exp };
+    } else {
+        num = theor;
+        den = factor;
+    }
+
+    // Scale the denominator so it has the number of bits
+    // in the radix as the number of leading zeros.
+    let wlz = integral_binary_factor(radix).as_usize();
+    let nlz = den.leading_zeros().wrapping_sub(wlz) & (<u32 as Integer>::BITS - 1);
+    small::ishl_bits(den.data_mut(), nlz);
+    den.exp -= nlz.as_i32();
+
+    // Need to scale the numerator or denominator to the same value.
+    // We don't want to shift the denominator, so...
+    let diff = den.exp - num.exp;
+    let shift = diff.abs().as_usize();
+    if diff < 0 {
+        // Need to shift the numerator left.
+        small::ishl(num.data_mut(), shift);
+        num.exp -= shift.as_i32()
+    } else if diff > 0 {
+        // Need to shift denominator left, go by a power of <Limb as Integer>::BITS.
+        // After this, the numerator will be non-normalized, and the
+        // denominator will be normalized.
+        // We need to add one to the quotient,since we're calculating the
+        // ceiling of the divmod.
+        let (q, r) = shift.ceil_divmod(<Limb as Integer>::BITS);
+        // Since we're using a power from the denominator to the
+        // numerator, we to invert r, not add u32::BITS.
+        let r = -r;
+        small::ishl_bits(num.data_mut(), r.as_usize());
+        num.exp -= r;
+        if !q.is_zero() {
+            den.pad_zero_digits(q);
+            den.exp -= <Limb as Integer>::BITS.as_i32() * q.as_i32();
+        }
+    }
+
+    (num, den)
+}
+
+// Compare digits in BigFloat with a given iterator.
+macro_rules! compare_digits {
+    ($iter:ident, $radix:ident, $num:ident, $den:ident) => {
+        while !$num.data.is_empty() {
+            let actual = match $iter.next() {
+                Some(&v) => v,
+                None    => return cmp::Ordering::Less,
+            };
+            let expected = digit_to_char($num.quorem(&$den));
+            $num.imul_small($radix);
+            if actual < expected {
+                return cmp::Ordering::Less;
+            } else if actual > expected {
+                return cmp::Ordering::Greater;
+            }
+        }
+    };
+}
+
+/// Compare digits between the generated values the ratio and the actual view.
+///
+/// * `integer`     - Digits from the integer component of the mantissa.
+/// * `fraction`    - Digits from the fraction component of the mantissa.
+/// * `radix`       - Radix for the number parsing.
+/// * `num`         - Numerator for the fraction.
+/// * `denm`        - Denominator for the fraction.
+pub(super) fn compare_digits<'a, Iter1, Iter2>(
+    integer: Iter1,
+    fraction: Iter2,
+    radix: u32,
+    mut num: Bigfloat,
+    den: Bigfloat
+)
+    -> cmp::Ordering
+    where Iter1: Iterator<Item=&'a u8>,
+          Iter2: Iterator<Item=&'a u8>
+{
+    // Iterate until we get a difference in the generated digits.
+    // If we run out,return Equal.
+    let radix = as_limb(radix);
+    let mut iter = integer.chain(fraction);
+    compare_digits!(iter, radix, num, den);
+
+    // We cannot have any trailing zeros, so if there any remaining digits,
+    // we're >= to the value. We've already exhausted num.data here,
+    // so need to check if integer and fraction don't have data.
+    let is_none = iter.next().is_none();
+    match is_none {
+        true  => cmp::Ordering::Equal,
+        false => cmp::Ordering::Greater,
+    }
+}
+
+/// Generate the correct representation from a halfway representation.
+///
+/// The digits iterator must not have any trailing zeros (true for
+/// `SlowDataInterface`).
+///
+/// * `digits`          - Actual digits from the mantissa.
+/// * `radix`           - Radix for the number parsing.
+/// * `sci_exponent`    - Exponent of basen string in scientific notation.
+/// * `f`               - Sub-halfway (`b`) float.
+pub(super) fn atof<'a, F, Data>(data: Data, radix: u32, f: F, kind: RoundingKind)
+    -> F
+    where F: FloatType,
+          Data: SlowDataInterface<'a>
+{
+    // This works when we're doing, like, round-even.
+    let (num, den) = make_ratio(radix, data.scientific_exponent(), f, kind);
+    let integer_iter = data.integer_iter();
+    let fraction_iter = data.significant_fraction_iter();
+    let order = compare_digits(integer_iter, fraction_iter, radix, num, den);
+    round_to_native(f, order, kind)
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::test::*;
+    use super::*;
+
+    #[test]
+    fn b_test() {
+        assert_eq!(b(1e-45_f32), (1, -149).into());
+        assert_eq!(b(5e-324_f64), (1, -1074).into());
+        assert_eq!(b(1e-323_f64), (2, -1074).into());
+        assert_eq!(b(2e-323_f64), (4, -1074).into());
+        assert_eq!(b(3e-323_f64), (6, -1074).into());
+        assert_eq!(b(4e-323_f64), (8, -1074).into());
+        assert_eq!(b(5e-323_f64), (10, -1074).into());
+        assert_eq!(b(6e-323_f64), (12, -1074).into());
+        assert_eq!(b(7e-323_f64), (14, -1074).into());
+        assert_eq!(b(8e-323_f64), (16, -1074).into());
+        assert_eq!(b(9e-323_f64), (18, -1074).into());
+        assert_eq!(b(1_f32), (8388608, -23).into());
+        assert_eq!(b(1_f64), (4503599627370496, -52).into());
+        assert_eq!(b(1e38_f32), (9860761, 103).into());
+        assert_eq!(b(1e308_f64), (5010420900022432, 971).into());
+    }
+
+    #[test]
+    fn bh_test() {
+        assert_eq!(bh(1e-45_f32), (3, -150).into());
+        assert_eq!(bh(5e-324_f64), (3, -1075).into());
+        assert_eq!(bh(1_f32), (16777217, -24).into());
+        assert_eq!(bh(1_f64), (9007199254740993, -53).into());
+        assert_eq!(bh(1e38_f32), (19721523, 102).into());
+        assert_eq!(bh(1e308_f64), (10020841800044865, 970).into());
+    }
+
+    // SLOW PATH
+
+    #[test]
+    fn scaling_factor_test() {
+        assert_eq!(scaling_factor(10, 0), Bigfloat { data: deduce_from_u32(&[1]), exp: 0 });
+        assert_eq!(scaling_factor(10, 20), Bigfloat { data: deduce_from_u32(&[1977800241, 22204]), exp: 20 });
+        assert_eq!(scaling_factor(10, 300), Bigfloat { data: deduce_from_u32(&[2502905297, 773182544, 1122691908, 922368819, 2799959258, 2138784391, 2365897751, 2382789932, 3061508751, 1799019667, 3501640837, 269048281, 2748691596, 1866771432, 2228563347, 475471294, 278892994, 2258936920, 3352132269, 1505791508, 2147965370, 25052104]), exp: 300 });
+    }
+
+    #[test]
+    fn make_ratio_test() {
+        let (num1, den1) = make_ratio(10, -324, 0f64, RoundingKind::NearestTieEven);
+        let (num2, den2) = make_ratio(10, -324, 5e-324f64, RoundingKind::NearestTieEven);
+        let (num3, den3) = make_ratio(10, 307, 8.98846567431158e+307f64, RoundingKind::NearestTieEven);
+
+        #[cfg(limb_width_32)] {
+            assert_eq!(num1, Bigfloat { data: arrvec![1725370368, 1252154597, 1017462556, 675087593, 2805901938, 1401824593, 1124332496, 2380663002, 1612846757, 4128923878, 1492915356, 437569744, 2975325085, 3331531962, 3367627909, 730662168, 2699172281, 1440714968, 2778340312, 690527038, 1297115354, 763425880, 1453089653, 331561842], exp: 312 });
+            assert_eq!(den1, Bigfloat { data: arrvec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134217728], exp: 312 });
+
+            assert_eq!(num2, Bigfloat { data: arrvec![881143808, 3756463792, 3052387668, 2025262779, 4122738518, 4205473780, 3372997488, 2847021710, 543572976, 3796837043, 183778774, 1312709233, 336040663, 1404661296, 1512949137, 2191986506, 3802549547, 27177609, 4040053641, 2071581115, 3891346062, 2290277640, 64301663, 994685527], exp: 312 });
+            assert_eq!(den2, Bigfloat { data: arrvec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134217728], exp: 312 });
+
+            assert_eq!(num3, Bigfloat { data: arrvec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1024, 2147483648], exp: 288 });
+            assert_eq!(den3, Bigfloat { data: arrvec![1978138624, 2671552565, 2938166866, 3588566204, 1860064291, 2104472219, 2014975858, 2797301608, 462262832, 318515330, 1101517094, 1738264167, 3721375114, 414401884, 1406861075, 3053102637, 387329537, 2051556775, 1867945454, 3717689914, 1434550525, 1446648206, 238915486], exp: 288 });
+        }
+
+        #[cfg(limb_width_64)] {
+            assert_eq!(num1, Bigfloat { data: arrvec![7410409304047484928, 4369968404176723173, 12051257060168107241, 4828971301551875409, 6927124077155322074, 6412022633845121254, 12778923935480989904, 14463851737583396026, 11592856673895384344, 11932880778639151320, 5571068025259989822, 6240972538554414168, 331561842], exp: 280 });
+            assert_eq!(den1, Bigfloat { data: arrvec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134217728], exp: 280 });
+
+            assert_eq!(num2, Bigfloat { data: arrvec![3784483838432903168, 13109905212530169520, 17707027106794770107, 14486913904655626228, 2334628157756414606, 789323827825812147, 1443283659023866481, 6498067065331084848, 16331825947976601418, 17351898262207902345, 16713204075779969467, 276173541953690888, 994685527], exp: 280 });
+            assert_eq!(den2, Bigfloat { data: arrvec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134217728], exp: 280 });
+
+            assert_eq!(num3, Bigfloat { data: arrvec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4398046511104, 2147483648], exp: 288 });
+            assert_eq!(den3, Bigfloat { data: arrvec![11474230898198052864, 15412774488649031250, 9038639357805614115, 12014318925423187826, 1368012926086910512, 7465787750175199526, 1779842542902160778, 13112975978653220627, 8811369254899559937, 15967356599166997998, 6213306735021621501, 238915486], exp: 288 });
+        }
+    }
+
+    #[test]
+    fn compare_digits_test() {
+        // 2^-1074
+        let num = Bigfloat { data: deduce_from_u32(&[1725370368, 1252154597, 1017462556, 675087593, 2805901938, 1401824593, 1124332496, 2380663002, 1612846757, 4128923878, 1492915356, 437569744, 2975325085, 3331531962, 3367627909, 730662168, 2699172281, 1440714968, 2778340312, 690527038, 1297115354, 763425880, 1453089653, 331561842]), exp: 312 };
+        let den = Bigfloat { data: deduce_from_u32(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134217728]), exp: 312 };
+
+        // Below halfway
+        let digits = b"24703282292062327208828439643411068618252990130716238221279284125033775363510437593264991818081799618989828234772285886546332835517796989819938739800539093906315035659515570226392290858392449105184435931802849936536152500319370457678249219365623669863658480757001585769269903706311928279558551332927834338409351978015531246597263579574622766465272827220056374006485499977096599470454020828166226237857393450736339007967761930577506740176324673600968951340535537458516661134223766678604162159680461914467291840300530057530849048765391711386591646239524912623653881879636239373280423891018672348497668235089863388587925628302755995657524455507255189313690836254779186948667994968324049705821028513185451396213837722826145437693412532098591327667236328124999";
+        let empty = b"";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Less);
+
+        // Exactly halfway.
+        let digits = b"24703282292062327208828439643411068618252990130716238221279284125033775363510437593264991818081799618989828234772285886546332835517796989819938739800539093906315035659515570226392290858392449105184435931802849936536152500319370457678249219365623669863658480757001585769269903706311928279558551332927834338409351978015531246597263579574622766465272827220056374006485499977096599470454020828166226237857393450736339007967761930577506740176324673600968951340535537458516661134223766678604162159680461914467291840300530057530849048765391711386591646239524912623653881879636239373280423891018672348497668235089863388587925628302755995657524455507255189313690836254779186948667994968324049705821028513185451396213837722826145437693412532098591327667236328125";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Equal);
+
+        // Above halfway.
+        let digits = b"24703282292062327208828439643411068618252990130716238221279284125033775363510437593264991818081799618989828234772285886546332835517796989819938739800539093906315035659515570226392290858392449105184435931802849936536152500319370457678249219365623669863658480757001585769269903706311928279558551332927834338409351978015531246597263579574622766465272827220056374006485499977096599470454020828166226237857393450736339007967761930577506740176324673600968951340535537458516661134223766678604162159680461914467291840300530057530849048765391711386591646239524912623653881879636239373280423891018672348497668235089863388587925628302755995657524455507255189313690836254779186948667994968324049705821028513185451396213837722826145437693412532098591327667236328125001";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Greater);
+
+        // 2*2^-1074
+        let num = Bigfloat { data: deduce_from_u32(&[881143808, 3756463792, 3052387668, 2025262779, 4122738518, 4205473780, 3372997488, 2847021710, 543572976, 3796837043, 183778774, 1312709233, 336040663, 1404661296, 1512949137, 2191986506, 3802549547, 27177609, 4040053641, 2071581115, 3891346062, 2290277640, 64301663, 994685527]), exp: 312 };
+        let den = Bigfloat { data: deduce_from_u32(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134217728]), exp: 312 };
+
+        // Below halfway
+        let digits = b"74109846876186981626485318930233205854758970392148714663837852375101326090531312779794975454245398856969484704316857659638998506553390969459816219401617281718945106978546710679176872575177347315553307795408549809608457500958111373034747658096871009590975442271004757307809711118935784838675653998783503015228055934046593739791790738723868299395818481660169122019456499931289798411362062484498678713572180352209017023903285791732520220528974020802906854021606612375549983402671300035812486479041385743401875520901590172592547146296175134159774938718574737870961645638908718119841271673056017045493004705269590165763776884908267986972573366521765567941072508764337560846003984904972149117463085539556354188641513168478436313080237596295773983001708984374999";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Less);
+
+        // Exactly halfway.
+        let digits = b"74109846876186981626485318930233205854758970392148714663837852375101326090531312779794975454245398856969484704316857659638998506553390969459816219401617281718945106978546710679176872575177347315553307795408549809608457500958111373034747658096871009590975442271004757307809711118935784838675653998783503015228055934046593739791790738723868299395818481660169122019456499931289798411362062484498678713572180352209017023903285791732520220528974020802906854021606612375549983402671300035812486479041385743401875520901590172592547146296175134159774938718574737870961645638908718119841271673056017045493004705269590165763776884908267986972573366521765567941072508764337560846003984904972149117463085539556354188641513168478436313080237596295773983001708984375";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Equal);
+
+        // Above halfway.
+        let digits = b"74109846876186981626485318930233205854758970392148714663837852375101326090531312779794975454245398856969484704316857659638998506553390969459816219401617281718945106978546710679176872575177347315553307795408549809608457500958111373034747658096871009590975442271004757307809711118935784838675653998783503015228055934046593739791790738723868299395818481660169122019456499931289798411362062484498678713572180352209017023903285791732520220528974020802906854021606612375549983402671300035812486479041385743401875520901590172592547146296175134159774938718574737870961645638908718119841271673056017045493004705269590165763776884908267986972573366521765567941072508764337560846003984904972149117463085539556354188641513168478436313080237596295773983001708984375001";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Greater);
+
+        // 4503599627370496*2^971
+        let num = Bigfloat { data: deduce_from_u32(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1024, 2147483648]), exp: 288 };
+        let den = Bigfloat { data: deduce_from_u32(&[1978138624, 2671552565, 2938166866, 3588566204, 1860064291, 2104472219, 2014975858, 2797301608, 462262832, 318515330, 1101517094, 1738264167, 3721375114, 414401884, 1406861075, 3053102637, 387329537, 2051556775, 1867945454, 3717689914, 1434550525, 1446648206, 238915486]), exp: 288 };
+
+        // Below halfway
+        let digits = b"89884656743115805365666807213050294962762414131308158973971342756154045415486693752413698006024096935349884403114202125541629105369684531108613657287705365884742938136589844238179474556051429647415148697857438797685859063890851407391008830874765563025951597582513936655578157348020066364210154316532161708031999";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Less);
+
+        // Exactly halfway.
+        let digits = b"89884656743115805365666807213050294962762414131308158973971342756154045415486693752413698006024096935349884403114202125541629105369684531108613657287705365884742938136589844238179474556051429647415148697857438797685859063890851407391008830874765563025951597582513936655578157348020066364210154316532161708032";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Equal);
+
+        // Above halfway.
+        let digits = b"89884656743115805365666807213050294962762414131308158973971342756154045415486693752413698006024096935349884403114202125541629105369684531108613657287705365884742938136589844238179474556051429648741514697857438797685859063890851407391008830874765563025951597582513936655578157348020066364210154316532161708032001";
+        assert_eq!(compare_digits(digits.iter(), empty.iter(), 10, num.clone(), den.clone()), cmp::Ordering::Greater);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bignum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bignum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bignum.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/bignum.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,223 @@
+//! Big integer type definition.
+
+use crate::float::*;
+use crate::util::*;
+use super::math::*;
+
+// DATA TYPE
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+    use crate::lib::Vec;
+    type IntStorageType = Vec<Limb>;
+} else {
+    // Maximum denominator is 767 mantissa digits + 324 exponent,
+    // or 1091 digits, or approximately 3600 bits (round up to 4k).
+    #[cfg(limb_width_32)]
+    type IntStorageType = arrayvec::ArrayVec<[Limb; 128]>;
+
+    #[cfg(limb_width_64)]
+    type IntStorageType = arrayvec::ArrayVec<[Limb; 64]>;
+}}  // cfg_if
+
+perftools_inline!{
+/// Calculate the integral ceiling of the binary factor from a basen number.
+pub(super) fn integral_binary_factor(radix: u32)
+    -> u32
+{
+    debug_assert_radix!(radix);
+
+    #[cfg(not(feature = "radix"))] {
+        4
+    }
+
+    #[cfg(feature = "radix")] {
+        match radix.as_i32() {
+            2  => 1,
+            3  => 2,
+            4  => 2,
+            5  => 3,
+            6  => 3,
+            7  => 3,
+            8  => 3,
+            9  => 4,
+            10 => 4,
+            11 => 4,
+            12 => 4,
+            13 => 4,
+            14 => 4,
+            15 => 4,
+            16 => 4,
+            17 => 5,
+            18 => 5,
+            19 => 5,
+            20 => 5,
+            21 => 5,
+            22 => 5,
+            23 => 5,
+            24 => 5,
+            25 => 5,
+            26 => 5,
+            27 => 5,
+            28 => 5,
+            29 => 5,
+            30 => 5,
+            31 => 5,
+            32 => 5,
+            33 => 6,
+            34 => 6,
+            35 => 6,
+            36 => 6,
+            // Invalid radix
+            _  => unreachable!(),
+        }
+    }
+}}
+
+// BIGINT
+
+/// Storage for a big integer type.
+#[derive(Clone, PartialEq, Eq)]
+#[cfg_attr(test, derive(Debug))]
+pub(crate) struct Bigint {
+    /// Internal storage for the Bigint, in little-endian order.
+    pub(crate) data: IntStorageType,
+}
+
+impl Default for Bigint {
+    fn default() -> Self {
+        // We want to avoid lower-order
+        let mut bigint = Bigint { data: IntStorageType::default() };
+        bigint.data.reserve(20);
+        bigint
+    }
+}
+
+impl SharedOps for Bigint {
+    type StorageType = IntStorageType;
+
+    perftools_inline_always!{
+    fn data<'a>(&'a self) -> &'a Self::StorageType {
+        &self.data
+    }}
+
+    perftools_inline_always!{
+    fn data_mut<'a>(&'a mut self) -> &'a mut Self::StorageType {
+        &mut self.data
+    }}
+}
+
+impl SmallOps for Bigint {
+}
+
+impl LargeOps for Bigint {
+}
+
+// BIGFLOAT
+
+// Adjust the storage capacity for the underlying array.
+cfg_if! {
+if #[cfg(limb_width_64)] {
+    type FloatStorageType = arrayvec::ArrayVec<[Limb; 20]>;
+} else {
+    type FloatStorageType = arrayvec::ArrayVec<[Limb; 36]>;
+}}   // cfg_if
+
+/// Storage for a big floating-point type.
+#[derive(Clone, PartialEq, Eq)]
+#[cfg_attr(test, derive(Debug))]
+pub struct Bigfloat {
+    /// Internal storage for the Bigint, in little-endian order.
+    ///
+    /// Enough storage for up to 10^345, which is 2^1146, or more than
+    /// the max for f64.
+    pub(crate) data: FloatStorageType,
+    /// It also makes sense to store an exponent, since this simplifies
+    /// normalizing and powers of 2.
+    pub(crate) exp: i32,
+}
+
+impl Default for Bigfloat {
+    perftools_inline!{
+    fn default() -> Self {
+        // We want to avoid lower-order
+        let mut bigfloat = Bigfloat { data: FloatStorageType::default(), exp: 0 };
+        bigfloat.data.reserve(10);
+        bigfloat
+    }}
+}
+
+impl SharedOps for Bigfloat {
+    type StorageType = FloatStorageType;
+
+    perftools_inline_always!{
+    fn data<'a>(&'a self) -> &'a Self::StorageType {
+        &self.data
+    }}
+
+    perftools_inline_always!{
+    fn data_mut<'a>(&'a mut self) -> &'a mut Self::StorageType {
+        &mut self.data
+    }}
+}
+
+impl SmallOps for Bigfloat {
+    perftools_inline!{
+    fn imul_pow2(&mut self, n: u32) {
+        // Increment exponent to simulate actual multiplication.
+        self.exp += n.as_i32();
+    }}
+}
+
+impl LargeOps for Bigfloat {
+}
+
+// TO BIGFLOAT
+
+/// Simple overloads to allow conversions of extended floats to big integers.
+pub trait ToBigfloat<M: Mantissa> {
+    fn to_bigfloat(&self) -> Bigfloat;
+}
+
+impl ToBigfloat<u32> for ExtendedFloat<u32> {
+    perftools_inline!{
+    fn to_bigfloat(&self) -> Bigfloat {
+        let mut bigfloat = Bigfloat::from_u32(self.mant);
+        bigfloat.exp = self.exp;
+        bigfloat
+    }}
+}
+
+impl ToBigfloat<u64> for ExtendedFloat<u64> {
+    perftools_inline!{
+    fn to_bigfloat(&self) -> Bigfloat {
+        let mut bigfloat = Bigfloat::from_u64(self.mant);
+        bigfloat.exp = self.exp;
+        bigfloat
+    }}
+}
+
+impl ToBigfloat<u128> for ExtendedFloat<u128> {
+    perftools_inline!{
+    fn to_bigfloat(&self) -> Bigfloat {
+        let mut bigfloat = Bigfloat::from_u128(self.mant);
+        bigfloat.exp = self.exp;
+        bigfloat
+    }}
+}
+
+// TESTS
+// -----
+
+#[cfg(all(test, feature = "correct", feature = "radix"))]
+mod test {
+    use super::*;
+
+    #[test]
+    fn integral_binary_factor_test() {
+        const TABLE: [u32; 35] = [1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6];
+        for (idx, base) in (2..37).enumerate() {
+            assert_eq!(integral_binary_factor(base), TABLE[idx]);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached_float160.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached_float160.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached_float160.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached_float160.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5669 @@
+//! Cached exponents for basen values with 160-bit extended floats.
+//!
+//! Exact versions of base**n as an extended-precision float, with both
+//! large and small powers. Use the large powers to minimize the amount
+//! of compounded error.
+//!
+//! These values were calculated using Python, using the arbitrary-precision
+//! integer to calculate exact extended-representation of each value.
+//! These values are all normalized.
+//!
+//! This files takes ~ 44KB of storage.
+//!
+//! This file is mostly automatically generated, do not change values
+//! manually, unless you know what you are doing. The script to generate
+//! the values is as follows:
+//!
+//! ```text
+//! import math
+//! from collections import deque
+//!
+//! STEP_STR = "const BASE{0}_STEP: i32 = {1};"
+//! SMALL_MANTISSA_STR = "const BASE{0}_SMALL_MANTISSA: [u128; {1}] = ["
+//! SMALL_EXPONENT_STR = "const BASE{0}_SMALL_EXPONENT: [i32; {1}] = ["
+//! LARGE_MANTISSA_STR = "const BASE{0}_LARGE_MANTISSA: [u128; {1}] = ["
+//! LARGE_EXPONENT_STR = "const BASE{0}_LARGE_EXPONENT: [i32; {1}] = ["
+//! SMALL_INT_STR = "const BASE{0}_SMALL_INT_POWERS: [u128; {1}] = {2};"
+//! BIAS_STR = "const BASE{0}_BIAS: i32 = {1};"
+//! EXP_STR = "// {}^{}"
+//! POWER_STR = """pub(crate) const BASE{0}_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {{
+//!     small: ExtendedFloatArray {{ mant: &BASE{0}_SMALL_MANTISSA, exp: &BASE{0}_SMALL_EXPONENT }},
+//!     large: ExtendedFloatArray {{ mant: &BASE{0}_LARGE_MANTISSA, exp: &BASE{0}_LARGE_EXPONENT }},
+//!     small_int: &BASE{0}_SMALL_INT_POWERS,
+//!     step: BASE{0}_STEP,
+//!     bias: BASE{0}_BIAS,
+//! }};\n"""
+//!
+//! def calculate_bitshift(base, exponent):
+//!     '''
+//!     Calculate the bitshift required for a given base. The exponent
+//!     is the absolute value of the max exponent (log distance from 1.)
+//!     '''
+//!
+//!     return 127 + math.ceil(math.log2(base**exponent))
+//!
+//!
+//! def next_fp(fp, base, step = 1):
+//!     '''Generate the next extended-floating point value.'''
+//!
+//!     return (fp[0] * (base**step), fp[1])
+//!
+//!
+//! def prev_fp(fp, base, step = 1):
+//!     '''Generate the previous extended-floating point value.'''
+//!
+//!     return (fp[0] // (base**step), fp[1])
+//!
+//!
+//! def normalize_fp(fp):
+//!     '''Normalize a extended-float so the MSB is the 128th bit'''
+//!
+//!     while fp[0] >> 128 != 0:
+//!         fp = (fp[0] >> 1, fp[1] + 1)
+//!     return fp
+//!
+//!
+//! def generate_small(base, count):
+//!     '''Generate the small powers for a given base'''
+//!
+//!     bitshift = calculate_bitshift(base, count)
+//!     fps = []
+//!     fp = (1 << bitshift, -bitshift)
+//!     for exp in range(count):
+//!         fps.append((normalize_fp(fp), exp))
+//!         fp = next_fp(fp, base)
+//!
+//!     # Print the small powers as integers.
+//!     ints = [base**i for _, i in fps]
+//!
+//!     return fps, ints
+//!
+//!
+//! def generate_large(base, step):
+//!     '''Generate the large powers for a given base.'''
+//!
+//!     # Get our starting parameters
+//!     min_exp = math.floor(math.log(5e-324, base) - math.log(0xFFFFFFFFFFFFFFFF, base))
+//!     max_exp = math.ceil(math.log(1.7976931348623157e+308, base))
+//!     bitshift = calculate_bitshift(base, abs(min_exp - step))
+//!     fps = deque()
+//!
+//!     # Add negative exponents
+//!     # We need to go below the minimum exponent, since we need
+//!     # all resulting exponents to be positive.
+//!     fp = (1 << bitshift, -bitshift)
+//!     for exp in range(-step, min_exp-step, -step):
+//!         fp = prev_fp(fp, base, step)
+//!         fps.appendleft((normalize_fp(fp), exp))
+//!
+//!     # Add positive exponents
+//!     fp = (1 << bitshift, -bitshift)
+//!     fps.append((normalize_fp(fp), 0))
+//!     for exp in range(step, max_exp, step):
+//!         fp = next_fp(fp, base, step)
+//!         fps.append((normalize_fp(fp), exp))
+//!
+//!     # Return the smallest exp, AKA, the bias
+//!     return fps, -fps[0][1]
+//!
+//!
+//! def print_array(base, string, fps, index):
+//!     '''Print an entire array'''
+//!
+//!     print(string.format(base, len(fps)))
+//!     for fp, exp in fps:
+//!         value = "    {},".format(fp[index])
+//!         exp = EXP_STR.format(base, exp)
+//!         print(value.ljust(56, " ") + exp)
+//!     print("];")
+//!
+//!
+//! def generate_base(base):
+//!     '''Generate all powers and variables.'''
+//!
+//!     step = math.floor(math.log(1e10, base))
+//!     small, ints = generate_small(base, step)
+//!     large, bias = generate_large(base, step)
+//!
+//!     print_array(base, SMALL_MANTISSA_STR, small, 0)
+//!     print_array(base, SMALL_EXPONENT_STR, small, 1)
+//!     print_array(base, LARGE_MANTISSA_STR, large, 0)
+//!     print_array(base, LARGE_EXPONENT_STR, large, 1)
+//!     print(SMALL_INT_STR.format(base, len(ints), ints))
+//!     print(STEP_STR.format(base, step))
+//!     print(BIAS_STR.format(base, bias))
+//!
+//!
+//! def generate():
+//!     '''Generate all bases.'''
+//!
+//!     bases = [
+//!         3, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 21,
+//!         22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 33, 34, 35, 36
+//!     ]
+//!
+//!     for base in bases:
+//!         print("// BASE{}\n".format(base))
+//!         generate_base(base)
+//!         print("")
+//!
+//!     print("// HIGH LEVEL\n// ----------\n")
+//!
+//!     for base in bases:
+//!         print(POWER_STR.format(base))
+//!
+//!
+//! if __name__ == '__main__':
+//!     generate()
+//! ```
+
+use crate::util::*;
+use super::cached::{ExtendedFloatArray, ModeratePathPowers};
+
+// LOW-LEVEL
+// ---------
+
+// BASE10
+
+const BASE10_SMALL_MANTISSA: [u128; 10] = [
+    170141183460469231731687303715884105728,            // 10^0
+    212676479325586539664609129644855132160,            // 10^1
+    265845599156983174580761412056068915200,            // 10^2
+    332306998946228968225951765070086144000,            // 10^3
+    207691874341393105141219853168803840000,            // 10^4
+    259614842926741381426524816461004800000,            // 10^5
+    324518553658426726783156020576256000000,            // 10^6
+    202824096036516704239472512860160000000,            // 10^7
+    253530120045645880299340641075200000000,            // 10^8
+    316912650057057350374175801344000000000,            // 10^9
+];
+const BASE10_SMALL_EXPONENT: [i32; 10] = [
+    -127,                                               // 10^0
+    -124,                                               // 10^1
+    -121,                                               // 10^2
+    -118,                                               // 10^3
+    -114,                                               // 10^4
+    -111,                                               // 10^5
+    -108,                                               // 10^6
+    -104,                                               // 10^7
+    -101,                                               // 10^8
+    -98,                                                // 10^9
+];
+const BASE10_LARGE_MANTISSA: [u128; 66] = [
+    213154451346726893197828921904416471830,            // 10^-350
+    248144440523729302452212341484167231049,            // 10^-340
+    288878149031346317441449898160257412877,            // 10^-330
+    336298426882534191759128470626028036788,            // 10^-320
+    195751447977110622310503659901458325789,            // 10^-310
+    227884678143438210606695688214919443462,            // 10^-300
+    265292681454958173686982700851419292695,            // 10^-290
+    308841328899094571460716776609676066664,            // 10^-280
+    179769313486231590772930519078902473361,            // 10^-270
+    209279024841067836122739267394531603625,            // 10^-260
+    243632850284999977008834559696879707771,            // 10^-250
+    283625966735416996535885333662014114404,            // 10^-240
+    330184081959790778970212365572822879074,            // 10^-230
+    192192430817400325887261637005036975649,            // 10^-220
+    223741436863085634409521749481834675708,            // 10^-210
+    260469313784369307581244210575049132700,            // 10^-200
+    303226189902482213896285056340332530323,            // 10^-190
+    176500872419263593559319302637789241459,            // 10^-180
+    205474058654233340126601167300005025998,            // 10^-170
+    239203286653190548679094257880939433814,            // 10^-160
+    278469275977917188637766821636980671685,            // 10^-150
+    324180903818827574883781864350871964922,            // 10^-140
+    188698121241077067612077729049413444545,            // 10^-130
+    219673525124179510879420825570604582952,            // 10^-120
+    255733641241886083594780445064656183766,            // 10^-110
+    297713141471480582369003031710926657271,            // 10^-100
+    173291855882550928723650886508942731464,            // 10^-90
+    201738271725539733566868685312735302682,            // 10^-80
+    234854258277383322788948059678933702737,            // 10^-70
+    273406340597876490546562778389702670669,            // 10^-60
+    318286871302263450979444638813965337664,            // 10^-50
+    185267342779705912677713576013900652565,            // 10^-40
+    215679573337205118357336120696157045389,            // 10^-30
+    251084069415467230553431576928306656644,            // 10^-20
+    292300327466180583640736966543256603931,            // 10^-10
+    170141183460469231731687303715884105728,            // 10^0
+    198070406285660843983859875840000000000,            // 10^10
+    230584300921369395200000000000000000000,            // 10^20
+    268435456000000000000000000000000000000,            // 10^30
+    312500000000000000000000000000000000000,            // 10^40
+    181898940354585647583007812500000000000,            // 10^50
+    211758236813575084767080625169910490512,            // 10^60
+    246519032881566189191165176650870696772,            // 10^70
+    286985925493722536125179818657774823686,            // 10^80
+    334095588761524455767567058393935234851,            // 10^90
+    194469227433160678348252001680628882518,            // 10^100
+    226391976970667809187727982272194794517,            // 10^110
+    263554948580763080608714351281750475192,            // 10^120
+    306818341581107909568485747186642227685,            // 10^130
+    178591779887855465971216179422709524914,            // 10^140
+    207908195312897984370608091613638127355,            // 10^150
+    242036994678082392051126914580396990473,            // 10^160
+    281768146294730706199918541335962934504,            // 10^170
+    328021294314799255458543241647960309061,            // 10^180
+    190933522718725292628248712075851106236,            // 10^190
+    222275874948507748344271341427056009691,            // 10^200
+    258763175164940474024358370140027266101,            // 10^210
+    301239983137860514717593754339063617053,            // 10^220
+    175344747920672243180215448571289666610,            // 10^230
+    204128152598478183127259193653345185577,            // 10^240
+    237636445786894977939384050729387888658,            // 10^250
+    276645233140903266541874095249674153349,            // 10^260
+    322057438479856665411351825168442625260,            // 10^270
+    187462101736953869352205554703508169192,            // 10^280
+    218234609040610805796698614376955862613,            // 10^290
+    254058522452380049271391022923583936195,            // 10^300
+];
+const BASE10_LARGE_EXPONENT: [i32; 66] = [
+    -1290,                                              // 10^-350
+    -1257,                                              // 10^-340
+    -1224,                                              // 10^-330
+    -1191,                                              // 10^-320
+    -1157,                                              // 10^-310
+    -1124,                                              // 10^-300
+    -1091,                                              // 10^-290
+    -1058,                                              // 10^-280
+    -1024,                                              // 10^-270
+    -991,                                               // 10^-260
+    -958,                                               // 10^-250
+    -925,                                               // 10^-240
+    -892,                                               // 10^-230
+    -858,                                               // 10^-220
+    -825,                                               // 10^-210
+    -792,                                               // 10^-200
+    -759,                                               // 10^-190
+    -725,                                               // 10^-180
+    -692,                                               // 10^-170
+    -659,                                               // 10^-160
+    -626,                                               // 10^-150
+    -593,                                               // 10^-140
+    -559,                                               // 10^-130
+    -526,                                               // 10^-120
+    -493,                                               // 10^-110
+    -460,                                               // 10^-100
+    -426,                                               // 10^-90
+    -393,                                               // 10^-80
+    -360,                                               // 10^-70
+    -327,                                               // 10^-60
+    -294,                                               // 10^-50
+    -260,                                               // 10^-40
+    -227,                                               // 10^-30
+    -194,                                               // 10^-20
+    -161,                                               // 10^-10
+    -127,                                               // 10^0
+    -94,                                                // 10^10
+    -61,                                                // 10^20
+    -28,                                                // 10^30
+    5,                                                  // 10^40
+    39,                                                 // 10^50
+    72,                                                 // 10^60
+    105,                                                // 10^70
+    138,                                                // 10^80
+    171,                                                // 10^90
+    205,                                                // 10^100
+    238,                                                // 10^110
+    271,                                                // 10^120
+    304,                                                // 10^130
+    338,                                                // 10^140
+    371,                                                // 10^150
+    404,                                                // 10^160
+    437,                                                // 10^170
+    470,                                                // 10^180
+    504,                                                // 10^190
+    537,                                                // 10^200
+    570,                                                // 10^210
+    603,                                                // 10^220
+    637,                                                // 10^230
+    670,                                                // 10^240
+    703,                                                // 10^250
+    736,                                                // 10^260
+    769,                                                // 10^270
+    803,                                                // 10^280
+    836,                                                // 10^290
+    869,                                                // 10^300
+];
+const BASE10_SMALL_INT_POWERS: [u128; 10] = [1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000];
+const BASE10_STEP: i32 = 10;
+const BASE10_BIAS: i32 = 350;
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+// BASE3
+
+const BASE3_SMALL_MANTISSA: [u128; 20] = [
+    170141183460469231731687303715884105728,            // 3^0
+    255211775190703847597530955573826158592,            // 3^1
+    191408831393027885698148216680369618944,            // 3^2
+    287113247089541828547222325020554428416,            // 3^3
+    215334935317156371410416743765415821312,            // 3^4
+    323002402975734557115625115648123731968,            // 3^5
+    242251802231800917836718836736092798976,            // 3^6
+    181688851673850688377539127552069599232,            // 3^7
+    272533277510776032566308691328104398848,            // 3^8
+    204399958133082024424731518496078299136,            // 3^9
+    306599937199623036637097277744117448704,            // 3^10
+    229949952899717277477822958308088086528,            // 3^11
+    172462464674787958108367218731066064896,            // 3^12
+    258693697012181937162550828096599097344,            // 3^13
+    194020272759136452871913121072449323008,            // 3^14
+    291030409138704679307869681608673984512,            // 3^15
+    218272806854028509480902261206505488384,            // 3^16
+    327409210281042764221353391809758232576,            // 3^17
+    245556907710782073166015043857318674432,            // 3^18
+    184167680783086554874511282892989005824,            // 3^19
+];
+const BASE3_SMALL_EXPONENT: [i32; 20] = [
+    -127,                                               // 3^0
+    -126,                                               // 3^1
+    -124,                                               // 3^2
+    -123,                                               // 3^3
+    -121,                                               // 3^4
+    -120,                                               // 3^5
+    -118,                                               // 3^6
+    -116,                                               // 3^7
+    -115,                                               // 3^8
+    -113,                                               // 3^9
+    -112,                                               // 3^10
+    -110,                                               // 3^11
+    -108,                                               // 3^12
+    -107,                                               // 3^13
+    -105,                                               // 3^14
+    -104,                                               // 3^15
+    -102,                                               // 3^16
+    -101,                                               // 3^17
+    -99,                                                // 3^18
+    -97,                                                // 3^19
+];
+const BASE3_LARGE_MANTISSA: [u128; 69] = [
+    301829093537629265639465570217176944359,            // 3^-720
+    245033990385703656345786023933864839340,            // 3^-700
+    198926007233479871031630637668169238011,            // 3^-680
+    322988302900880006728964617948539328448,            // 3^-660
+    262211676747596696167096696967233799204,            // 3^-640
+    212871372756449173771443137071089544143,            // 3^-620
+    172815421118085121562612771428651141606,            // 3^-600
+    280593575260967566098415738074481154338,            // 3^-580
+    227794354139073103116567345878808448350,            // 3^-560
+    184930348919702200346046943747485274024,            // 3^-540
+    300264105147079021545114594266031000970,            // 3^-520
+    243763485459391712918376663011554847091,            // 3^-500
+    197894572893436379626501802082900685163,            // 3^-480
+    321313603691473325606249593990411338331,            // 3^-460
+    260852105259086286749566195634740776863,            // 3^-440
+    211767631486382365261996259087726574961,            // 3^-420
+    171919370559843833352674924374427532806,            // 3^-400
+    279138693352137745884317186629683060895,            // 3^-380
+    226613236986043931067161987739751269180,            // 3^-360
+    183971482278558945643179980616811190964,            // 3^-340
+    298707231244876640116631457791747347925,            // 3^-320
+    242499568120235502703106353919523432682,            // 3^-300
+    196868486555962367745019627988939060464,            // 3^-280
+    319647587822660709450189016904055940251,            // 3^-260
+    259499583169196479959998361450291137700,            // 3^-240
+    210669613131404954481085620515615417585,            // 3^-220
+    171027966037226738058674240289082148799,            // 3^-200
+    277691355027891684120101092281051616669,            // 3^-180
+    225438243943221318560556485110109738278,            // 3^-160
+    183017587375374702561553597022155160742,            // 3^-140
+    297158429757277967604640789526650060843,            // 3^-120
+    241242204211496523037749538228345943134,            // 3^-100
+    195847720491584060106836777189641681162,            // 3^-80
+    317990210271190550439415903835536554761,            // 3^-60
+    258154073926689380540223575440483383976,            // 3^-40
+    209577288018116110386327960504760073299,            // 3^-20
+    170141183460469231731687303715884105728,            // 3^0
+    276251521174629832311766924339483508736,            // 3^20
+    224269343257001716702690972139746492416,            // 3^40
+    182068638431613361423174859113151594496,            // 3^60
+    295617658828691846632166420412766595202,            // 3^80
+    239991359753539474232337032335634004651,            // 3^100
+    194832247114605420104007752175098574688,            // 3^120
+    316341426247257477645159711999449660471,            // 3^140
+    256815541169845811576524073480007610450,            // 3^160
+    208490626626972031635281014538153149532,            // 3^180
+    338517997729425004575949331160209430911,            // 3^200
+    274819152881557244028610584245948464515,            // 3^220
+    223106503338424488684979682521025988628,            // 3^240
+    181124609802400910077427551154104473922,            // 3^260
+    294084876820548989626661915132664622178,            // 3^280
+    238747000942913976797497733353022683918,            // 3^300
+    193822038982362660063056049982127016523,            // 3^320
+    314701191193291934781116205950433765545,            // 3^340
+    255483948725482657093998355855298189652,            // 3^360
+    207409599591488195571905341445445255582,            // 3^380
+    336762776818711782198286065086981891498,            // 3^400
+    273394211439632029990640781047045990695,            // 3^420
+    221949692762318233808346663450192754968,            // 3^440
+    180185475975832393914650652957737664335,            // 3^460
+    292560042310176717160312096633717510967,            // 3^480
+    237509094151441049982785534773499431992,            // 3^500
+    192817068794482616882547252154136283242,            // 3^520
+    313069460782756034010893203297842312622,            // 3^540
+    254159260607975299744356396919078736707,            // 3^560
+    206334177697445743564032291193028958152,            // 3^580
+    335016656754825225194410391893304442626,            // 3^600
+    271976658340519265432186039827268288213,            // 3^620
+    220798880266451537830039115389735391778,            // 3^640
+];
+const BASE3_LARGE_EXPONENT: [i32; 69] = [
+    -1269,                                              // 3^-720
+    -1237,                                              // 3^-700
+    -1205,                                              // 3^-680
+    -1174,                                              // 3^-660
+    -1142,                                              // 3^-640
+    -1110,                                              // 3^-620
+    -1078,                                              // 3^-600
+    -1047,                                              // 3^-580
+    -1015,                                              // 3^-560
+    -983,                                               // 3^-540
+    -952,                                               // 3^-520
+    -920,                                               // 3^-500
+    -888,                                               // 3^-480
+    -857,                                               // 3^-460
+    -825,                                               // 3^-440
+    -793,                                               // 3^-420
+    -761,                                               // 3^-400
+    -730,                                               // 3^-380
+    -698,                                               // 3^-360
+    -666,                                               // 3^-340
+    -635,                                               // 3^-320
+    -603,                                               // 3^-300
+    -571,                                               // 3^-280
+    -540,                                               // 3^-260
+    -508,                                               // 3^-240
+    -476,                                               // 3^-220
+    -444,                                               // 3^-200
+    -413,                                               // 3^-180
+    -381,                                               // 3^-160
+    -349,                                               // 3^-140
+    -318,                                               // 3^-120
+    -286,                                               // 3^-100
+    -254,                                               // 3^-80
+    -223,                                               // 3^-60
+    -191,                                               // 3^-40
+    -159,                                               // 3^-20
+    -127,                                               // 3^0
+    -96,                                                // 3^20
+    -64,                                                // 3^40
+    -32,                                                // 3^60
+    -1,                                                 // 3^80
+    31,                                                 // 3^100
+    63,                                                 // 3^120
+    94,                                                 // 3^140
+    126,                                                // 3^160
+    158,                                                // 3^180
+    189,                                                // 3^200
+    221,                                                // 3^220
+    253,                                                // 3^240
+    285,                                                // 3^260
+    316,                                                // 3^280
+    348,                                                // 3^300
+    380,                                                // 3^320
+    411,                                                // 3^340
+    443,                                                // 3^360
+    475,                                                // 3^380
+    506,                                                // 3^400
+    538,                                                // 3^420
+    570,                                                // 3^440
+    602,                                                // 3^460
+    633,                                                // 3^480
+    665,                                                // 3^500
+    697,                                                // 3^520
+    728,                                                // 3^540
+    760,                                                // 3^560
+    792,                                                // 3^580
+    823,                                                // 3^600
+    855,                                                // 3^620
+    887,                                                // 3^640
+];
+const BASE3_SMALL_INT_POWERS: [u128; 20] = [1, 3, 9, 27, 81, 243, 729, 2187, 6561, 19683, 59049, 177147, 531441, 1594323, 4782969, 14348907, 43046721, 129140163, 387420489, 1162261467];
+const BASE3_STEP: i32 = 20;
+const BASE3_BIAS: i32 = 720;
+
+// BASE5
+
+const BASE5_SMALL_MANTISSA: [u128; 14] = [
+    170141183460469231731687303715884105728,            // 5^0
+    212676479325586539664609129644855132160,            // 5^1
+    265845599156983174580761412056068915200,            // 5^2
+    332306998946228968225951765070086144000,            // 5^3
+    207691874341393105141219853168803840000,            // 5^4
+    259614842926741381426524816461004800000,            // 5^5
+    324518553658426726783156020576256000000,            // 5^6
+    202824096036516704239472512860160000000,            // 5^7
+    253530120045645880299340641075200000000,            // 5^8
+    316912650057057350374175801344000000000,            // 5^9
+    198070406285660843983859875840000000000,            // 5^10
+    247588007857076054979824844800000000000,            // 5^11
+    309485009821345068724781056000000000000,            // 5^12
+    193428131138340667952988160000000000000,            // 5^13
+];
+const BASE5_SMALL_EXPONENT: [i32; 14] = [
+    -127,                                               // 5^0
+    -125,                                               // 5^1
+    -123,                                               // 5^2
+    -121,                                               // 5^3
+    -118,                                               // 5^4
+    -116,                                               // 5^5
+    -114,                                               // 5^6
+    -111,                                               // 5^7
+    -109,                                               // 5^8
+    -107,                                               // 5^9
+    -104,                                               // 5^10
+    -102,                                               // 5^11
+    -100,                                               // 5^12
+    -97,                                                // 5^13
+];
+const BASE5_LARGE_MANTISSA: [u128; 68] = [
+    285793394306920833441610418092098634655,            // 5^-504
+    203068420253004570555511362849258201390,            // 5^-490
+    288577581746103207017755725657449092679,            // 5^-476
+    205046704412910121830119952091883627559,            // 5^-462
+    291388892624283530821742192659774598780,            // 5^-448
+    207044260935364498850036477975162511299,            // 5^-434
+    294227591176883860910658765384315687611,            // 5^-420
+    209061277570927374050781655074839937648,            // 5^-406
+    297093944213496817569054052050375869453,            // 5^-392
+    211097943899216614887176072592734406508,            // 5^-378
+    299988221142963048588365030287739055137,            // 5^-364
+    213154451346726893197828921904416471830,            // 5^-350
+    302910693998692996157485768413290076965,            // 5^-336
+    215230993204821882725842221200657943544,            // 5^-322
+    305861637464235347360161968596028634045,            // 5^-308
+    217327764647901735884376228537482684576,            // 5^-294
+    308841328899094571460716776609676066664,            // 5^-280
+    219444962751747547330237450047488370802,            // 5^-266
+    311850048364799970571308236412006025948,            // 5^-252
+    221582786512044528543660416923448526878,            // 5^-238
+    314888078651228693933689466069052580904,            // 5^-224
+    223741436863085634409521749481834675708,            // 5^-210
+    317955705303185189918510999237120523316,            // 5^-196
+    225921116696657399755928707376370229068,            // 5^-182
+    321053216647239593947814323906257853121,            // 5^-168
+    228122030881109760932058580285014566244,            // 5^-154
+    324180903818827574883781864350871964922,            // 5^-140
+    230344386280611654799899571593522271174,            // 5^-126
+    327339060789614187001318969682759915221,            // 5^-112
+    232588391774594204975783618524161450993,            // 5^-98
+    330527984395124299475957654016385519914,            // 5^-84
+    234854258277383322788948059678933702737,            // 5^-70
+    333747974362642200374222141588992517906,            // 5^-56
+    237142198758023568227473377297792835283,            // 5^-42
+    336999333339382997433337688587745383420,            // 5^-28
+    239452428260295134118491722992235809940,            // 5^-14
+    170141183460469231731687303715884105728,            // 5^0
+    241785163922925834941235200000000000000,            // 5^14
+    171798691840000000000000000000000000000,            // 5^28
+    244140625000000000000000000000000000000,            // 5^42
+    173472347597680709441192448139190673828,            // 5^56
+    246519032881566189191165176650870696772,            // 5^70
+    175162308040602133865466197911239516410,            // 5^84
+    248920611114445668285762562151204969623,            // 5^98
+    176868732008334225927912486150152183216,            // 5^112
+    251345585423243599518503524095297312920,            // 5^126
+    178591779887855465971216179422709524914,            // 5^140
+    253794183731564922327402455583054354682,            // 5^154
+    180331613628627651967947866455016278082,            // 5^168
+    256266636183436918326986907537468991453,            // 5^182
+    182088396757817547443627082897044283139,            // 5^196
+    258763175164940474024358370140027266101,            // 5^210
+    183862294395666818064937594201088633455,            // 5^224
+    261284035326052074402891767876281837538,            // 5^238
+    185653473271011701515143789632334288014,            // 5^252
+    263829453602698580304979415177988198613,            // 5^266
+    187462101736953869352205554703508169192,            // 5^280
+    266399669239026862544798113253119949479,            // 5^294
+    189288349786683953755640255602884245064,            // 5^308
+    268994923809890385876486015494726082500,            // 5^322
+    191132389069459226417170338759437756337,            // 5^336
+    271615461243554856334256923502490730495,            // 5^350
+    192994392906736931318972184714148973580,            // 5^364
+    274261527844625066050770363850331497104,            // 5^378
+    194874536308464787773268059716493991903,            // 5^392
+    276933372317195090450451374005771742621,            // 5^406
+    196772995989530194869453349330805553038,            // 5^420
+    279631245788224013707368483964622716141,            // 5^434
+];
+const BASE5_LARGE_EXPONENT: [i32; 68] = [
+    -1298,                                              // 5^-504
+    -1265,                                              // 5^-490
+    -1233,                                              // 5^-476
+    -1200,                                              // 5^-462
+    -1168,                                              // 5^-448
+    -1135,                                              // 5^-434
+    -1103,                                              // 5^-420
+    -1070,                                              // 5^-406
+    -1038,                                              // 5^-392
+    -1005,                                              // 5^-378
+    -973,                                               // 5^-364
+    -940,                                               // 5^-350
+    -908,                                               // 5^-336
+    -875,                                               // 5^-322
+    -843,                                               // 5^-308
+    -810,                                               // 5^-294
+    -778,                                               // 5^-280
+    -745,                                               // 5^-266
+    -713,                                               // 5^-252
+    -680,                                               // 5^-238
+    -648,                                               // 5^-224
+    -615,                                               // 5^-210
+    -583,                                               // 5^-196
+    -550,                                               // 5^-182
+    -518,                                               // 5^-168
+    -485,                                               // 5^-154
+    -453,                                               // 5^-140
+    -420,                                               // 5^-126
+    -388,                                               // 5^-112
+    -355,                                               // 5^-98
+    -323,                                               // 5^-84
+    -290,                                               // 5^-70
+    -258,                                               // 5^-56
+    -225,                                               // 5^-42
+    -193,                                               // 5^-28
+    -160,                                               // 5^-14
+    -127,                                               // 5^0
+    -95,                                                // 5^14
+    -62,                                                // 5^28
+    -30,                                                // 5^42
+    3,                                                  // 5^56
+    35,                                                 // 5^70
+    68,                                                 // 5^84
+    100,                                                // 5^98
+    133,                                                // 5^112
+    165,                                                // 5^126
+    198,                                                // 5^140
+    230,                                                // 5^154
+    263,                                                // 5^168
+    295,                                                // 5^182
+    328,                                                // 5^196
+    360,                                                // 5^210
+    393,                                                // 5^224
+    425,                                                // 5^238
+    458,                                                // 5^252
+    490,                                                // 5^266
+    523,                                                // 5^280
+    555,                                                // 5^294
+    588,                                                // 5^308
+    620,                                                // 5^322
+    653,                                                // 5^336
+    685,                                                // 5^350
+    718,                                                // 5^364
+    750,                                                // 5^378
+    783,                                                // 5^392
+    815,                                                // 5^406
+    848,                                                // 5^420
+    880,                                                // 5^434
+];
+const BASE5_SMALL_INT_POWERS: [u128; 14] = [1, 5, 25, 125, 625, 3125, 15625, 78125, 390625, 1953125, 9765625, 48828125, 244140625, 1220703125];
+const BASE5_STEP: i32 = 14;
+const BASE5_BIAS: i32 = 504;
+
+// BASE6
+
+const BASE6_SMALL_MANTISSA: [u128; 12] = [
+    170141183460469231731687303715884105728,            // 6^0
+    255211775190703847597530955573826158592,            // 6^1
+    191408831393027885698148216680369618944,            // 6^2
+    287113247089541828547222325020554428416,            // 6^3
+    215334935317156371410416743765415821312,            // 6^4
+    323002402975734557115625115648123731968,            // 6^5
+    242251802231800917836718836736092798976,            // 6^6
+    181688851673850688377539127552069599232,            // 6^7
+    272533277510776032566308691328104398848,            // 6^8
+    204399958133082024424731518496078299136,            // 6^9
+    306599937199623036637097277744117448704,            // 6^10
+    229949952899717277477822958308088086528,            // 6^11
+];
+const BASE6_SMALL_EXPONENT: [i32; 12] = [
+    -127,                                               // 6^0
+    -125,                                               // 6^1
+    -122,                                               // 6^2
+    -120,                                               // 6^3
+    -117,                                               // 6^4
+    -115,                                               // 6^5
+    -112,                                               // 6^6
+    -109,                                               // 6^7
+    -107,                                               // 6^8
+    -104,                                               // 6^9
+    -102,                                               // 6^10
+    -99,                                                // 6^11
+];
+const BASE6_LARGE_MANTISSA: [u128; 71] = [
+    206105367118290399407064648402758144682,            // 6^-444
+    208917317212507950117664039252872831665,            // 6^-432
+    211767631486382365261996259087726574961,            // 6^-420
+    214656833352574406771088703014069554755,            // 6^-408
+    217585453364802351586979201161384846208,            // 6^-396
+    220554029315269330081435801781477974040,            // 6^-384
+    223563106333419891448609016293621894840,            // 6^-372
+    226613236986043931067161987739751269180,            // 6^-360
+    229704981378746362247969882824709232796,            // 6^-348
+    232838907258801165579649662968151663564,            // 6^-336
+    236015590119408703302029793810763336632,            // 6^-324
+    239235613305375443823879271798297650114,            // 6^-312
+    242499568120235502703106353919523432682,            // 6^-300
+    245808053934833671173174941698733239342,            // 6^-288
+    249161678297389871677290466673500998400,            // 6^-276
+    252561057045065251911260457800735557729,            // 6^-264
+    256006814417050404626793229969178591795,            // 6^-252
+    259499583169196479959998361450291137700,            // 6^-240
+    263040004690210240376322725691803307553,            // 6^-228
+    266628729119434395515123988465075762881,            // 6^-216
+    270266415466234845327287688358055741312,            // 6^-204
+    273953731731016754981191818978678705632,            // 6^-192
+    277691355027891684120101092281051616669,            // 6^-180
+    281479971709018296242657937208050445965,            // 6^-168
+    285320277490639481303204301467482637509,            // 6^-156
+    289212977580839036146652597763405686112,            // 6^-144
+    293158786809041363160730749526943361727,            // 6^-132
+    297158429757277967604640789526650060843,            // 6^-120
+    301212640893244858516269504216828222245,            // 6^-108
+    305322164705175286969651759320250334279,            // 6^-96
+    309487755838552588810803796052767101096,            // 6^-84
+    313710179234688236904530296665341569850,            // 6^-72
+    317990210271190550439415903835536554761,            // 6^-60
+    322328634904349856025836233807108654402,            // 6^-48
+    326726249813466247246220462666861782844,            // 6^-36
+    331183862547146446042592332649497399781,            // 6^-24
+    335702291671596630919115661345637412333,            // 6^-12
+    170141183460469231731687303715884105728,            // 6^0
+    172462464674787958108367218731066064896,            // 6^12
+    174815415743320440759790006808579407872,            // 6^24
+    177200468746272961345336076752392290304,            // 6^36
+    179618061658836457920697688990341398528,            // 6^48
+    182068638431613361423174859113151594496,            // 6^60
+    184552649072141716781794491390137475072,            // 6^72
+    187070549727531559196917812917453861026,            // 6^84
+    189622802768228720381105803326920695033,            // 6^96
+    192209876872921446586714266254161951235,            // 6^108
+    194832247114605420104007752175098574688,            // 6^120
+    197490395047822988635051696441052554380,            // 6^132
+    200184808797092622572327630249651738267,            // 6^144
+    202915983146544838776512848181734408257,            // 6^156
+    205684419630781050995309380627725821797,            // 6^168
+    208490626626972031635281014538153149532,            // 6^180
+    211335119448212897232599978727666183358,            // 6^192
+    214218420438151760708217936124820030498,            // 6^204
+    217141059066909427380630585083218539864,            // 6^216
+    220103572028307748788051030668660629356,            // 6^228
+    223106503338424488684979682521025988628,            // 6^240
+    226150404435492799169987273137391228527,            // 6^252
+    229235834281163651816744244429413474808,            // 6^264
+    232363359463149818964276081092475750857,            // 6^276
+    235533554299270254021060647605641184828,            // 6^288
+    238747000942913976797497733353022683918,            // 6^300
+    242004289489942830549695955106475311593,            // 6^312
+    245306018087052741642305313258629505287,            // 6^324
+    248652793041613380567795520750960012282,            // 6^336
+    252045228933006394543323172270604972624,            // 6^348
+    255483948725482657093998355855298189652,            // 6^360
+    258969583882559258973487053363982248701,            // 6^372
+    262502774482977247520692697766891651596,            // 6^384
+    266084169338241408156670471179837543899,            // 6^396
+];
+const BASE6_LARGE_EXPONENT: [i32; 71] = [
+    -1275,                                              // 6^-444
+    -1244,                                              // 6^-432
+    -1213,                                              // 6^-420
+    -1182,                                              // 6^-408
+    -1151,                                              // 6^-396
+    -1120,                                              // 6^-384
+    -1089,                                              // 6^-372
+    -1058,                                              // 6^-360
+    -1027,                                              // 6^-348
+    -996,                                               // 6^-336
+    -965,                                               // 6^-324
+    -934,                                               // 6^-312
+    -903,                                               // 6^-300
+    -872,                                               // 6^-288
+    -841,                                               // 6^-276
+    -810,                                               // 6^-264
+    -779,                                               // 6^-252
+    -748,                                               // 6^-240
+    -717,                                               // 6^-228
+    -686,                                               // 6^-216
+    -655,                                               // 6^-204
+    -624,                                               // 6^-192
+    -593,                                               // 6^-180
+    -562,                                               // 6^-168
+    -531,                                               // 6^-156
+    -500,                                               // 6^-144
+    -469,                                               // 6^-132
+    -438,                                               // 6^-120
+    -407,                                               // 6^-108
+    -376,                                               // 6^-96
+    -345,                                               // 6^-84
+    -314,                                               // 6^-72
+    -283,                                               // 6^-60
+    -252,                                               // 6^-48
+    -221,                                               // 6^-36
+    -190,                                               // 6^-24
+    -159,                                               // 6^-12
+    -127,                                               // 6^0
+    -96,                                                // 6^12
+    -65,                                                // 6^24
+    -34,                                                // 6^36
+    -3,                                                 // 6^48
+    28,                                                 // 6^60
+    59,                                                 // 6^72
+    90,                                                 // 6^84
+    121,                                                // 6^96
+    152,                                                // 6^108
+    183,                                                // 6^120
+    214,                                                // 6^132
+    245,                                                // 6^144
+    276,                                                // 6^156
+    307,                                                // 6^168
+    338,                                                // 6^180
+    369,                                                // 6^192
+    400,                                                // 6^204
+    431,                                                // 6^216
+    462,                                                // 6^228
+    493,                                                // 6^240
+    524,                                                // 6^252
+    555,                                                // 6^264
+    586,                                                // 6^276
+    617,                                                // 6^288
+    648,                                                // 6^300
+    679,                                                // 6^312
+    710,                                                // 6^324
+    741,                                                // 6^336
+    772,                                                // 6^348
+    803,                                                // 6^360
+    834,                                                // 6^372
+    865,                                                // 6^384
+    896,                                                // 6^396
+];
+const BASE6_SMALL_INT_POWERS: [u128; 12] = [1, 6, 36, 216, 1296, 7776, 46656, 279936, 1679616, 10077696, 60466176, 362797056];
+const BASE6_STEP: i32 = 12;
+const BASE6_BIAS: i32 = 444;
+
+// BASE7
+
+const BASE7_SMALL_MANTISSA: [u128; 11] = [
+    170141183460469231731687303715884105728,            // 7^0
+    297747071055821155530452781502797185024,            // 7^1
+    260528687173843511089146183814947536896,            // 7^2
+    227962601277113072203002910838079094784,            // 7^3
+    199467276117473938177627546983319207936,            // 7^4
+    174533866602789695905424103610404306944,            // 7^5
+    305434266554881967834492181318207537152,            // 7^6
+    267254983235521721855180658653431595008,            // 7^7
+    233848110331081506623283076321752645632,            // 7^8
+    204617096539696318295372691781533564928,            // 7^9
+    179039959472234278508451105308841869312,            // 7^10
+];
+const BASE7_SMALL_EXPONENT: [i32; 11] = [
+    -127,                                               // 7^0
+    -125,                                               // 7^1
+    -122,                                               // 7^2
+    -119,                                               // 7^3
+    -116,                                               // 7^4
+    -113,                                               // 7^5
+    -111,                                               // 7^6
+    -108,                                               // 7^7
+    -105,                                               // 7^8
+    -102,                                               // 7^9
+    -99,                                                // 7^10
+];
+const BASE7_LARGE_MANTISSA: [u128; 71] = [
+    225523710066019267908218449093892378358,            // 7^-407
+    207654229874777697952558290622819921790,            // 7^-396
+    191200646585071218824745087565327043379,            // 7^-385
+    176050770921424471559828841966017113260,            // 7^-374
+    324202605959679334675793064499391555083,            // 7^-363
+    298514255748300407155832676761118149894,            // 7^-352
+    274861334384351909098688755274300249465,            // 7^-341
+    253082563679127241756740166823033329043,            // 7^-330
+    233029444399168140266755890269514708731,            // 7^-319
+    214565243719567885018434177936373702812,            // 7^-308
+    197564062906901525077828647577582055243,            // 7^-297
+    181909978874749832229630901118123515094,            // 7^-286
+    334992507516972618831705765612473924060,            // 7^-275
+    308449214239576126269380201889590576494,            // 7^-264
+    284009091636748185128341566413187692045,            // 7^-253
+    261505493963360706349361998265286260917,            // 7^-242
+    240784979730461811097321743219099069136,            // 7^-231
+    221706265459654420066135217688280855198,            // 7^-220
+    204139262337252438224351496710052887294,            // 7^-209
+    187964189199610581269006081054389519147,            // 7^-198
+    173070755801490399767170008783447571912,            // 7^-187
+    318714821597104302344272129046782646031,            // 7^-176
+    293461298632634947256039303556899737616,            // 7^-165
+    270208750768480083796084384984407980627,            // 7^-154
+    248798629775241702400557051000361115726,            // 7^-143
+    229084950069124576377435007616984162844,            // 7^-132
+    210933293304638808346189699277966975327,            // 7^-121
+    194219891838880796776419735762035423417,            // 7^-110
+    178830784817964977889863278397948540205,            // 7^-99
+    329322082262710237520775170056072850605,            // 7^-88
+    303228087871569629902816732340606701122,            // 7^-77
+    279201663740542055384000770694089408486,            // 7^-66
+    257078984940548995242906668328695771951,            // 7^-55
+    236709207289964795762477040448859922676,            // 7^-44
+    217953438818817001855782665313698094789,            // 7^-33
+    200683792729517998822275406364627986706,            // 7^-22
+    184782515396710906443711214287193178833,            // 7^-11
+    170141183460469231731687303715884105728,            // 7^0
+    313319929076409987389789434290473271296,            // 7^11
+    288493873028852398739253829029106548736,            // 7^22
+    265634921533798919351224824788236107776,            // 7^33
+    244587210111081219100242972308429222416,            // 7^44
+    225207224277966141315155116349116687572,            // 7^55
+    207362820991138609531788808643065835705,            // 7^66
+    190932327625202079604864455739987836428,            // 7^77
+    175803712344053086257499345217280929659,            // 7^88
+    323747640416561983962207324433251030705,            // 7^99
+    298095339619934405668456872884344580325,            // 7^110
+    274475611277932187651307585787198545738,            // 7^121
+    252727403529513497084111370284014563793,            // 7^132
+    232702425535702904483240997815950541938,            // 7^143
+    214264136353838934720254978302625752306,            // 7^154
+    197286813928859418414994791325492154413,            // 7^165
+    181654697853512422889189735564216996803,            // 7^176
+    334522400104752565046325502667785120787,            // 7^187
+    308016356015425756696586706818979868623,            // 7^198
+    283610531143243549972387138852602501496,            // 7^209
+    261138513603233655506120063924465915820,            // 7^220
+    240447077236577495145565086308268824286,            // 7^231
+    221395136833224081873557773886454798418,            // 7^242
+    203852786137945162132478938839041683065,            // 7^253
+    187700412080445632409314398956810353518,            // 7^264
+    172827879189879361689316520165778889316,            // 7^275
+    318267557265350256871483486812089934265,            // 7^286
+    293049473506426909088112326597996634777,            // 7^297
+    269829556805234360375792834335085449819,            // 7^308
+    248449481428986202531286841797890645972,            // 7^319
+    228763466660872229208763580066607974130,            // 7^330
+    210637282789652967136592584117374228567,            // 7^341
+    193947335860149215724544902551342320202,            // 7^352
+    178579824943969003959847035500732297209,            // 7^363
+];
+const BASE7_LARGE_EXPONENT: [i32; 71] = [
+    -1270,                                              // 7^-407
+    -1239,                                              // 7^-396
+    -1208,                                              // 7^-385
+    -1177,                                              // 7^-374
+    -1147,                                              // 7^-363
+    -1116,                                              // 7^-352
+    -1085,                                              // 7^-341
+    -1054,                                              // 7^-330
+    -1023,                                              // 7^-319
+    -992,                                               // 7^-308
+    -961,                                               // 7^-297
+    -930,                                               // 7^-286
+    -900,                                               // 7^-275
+    -869,                                               // 7^-264
+    -838,                                               // 7^-253
+    -807,                                               // 7^-242
+    -776,                                               // 7^-231
+    -745,                                               // 7^-220
+    -714,                                               // 7^-209
+    -683,                                               // 7^-198
+    -652,                                               // 7^-187
+    -622,                                               // 7^-176
+    -591,                                               // 7^-165
+    -560,                                               // 7^-154
+    -529,                                               // 7^-143
+    -498,                                               // 7^-132
+    -467,                                               // 7^-121
+    -436,                                               // 7^-110
+    -405,                                               // 7^-99
+    -375,                                               // 7^-88
+    -344,                                               // 7^-77
+    -313,                                               // 7^-66
+    -282,                                               // 7^-55
+    -251,                                               // 7^-44
+    -220,                                               // 7^-33
+    -189,                                               // 7^-22
+    -158,                                               // 7^-11
+    -127,                                               // 7^0
+    -97,                                                // 7^11
+    -66,                                                // 7^22
+    -35,                                                // 7^33
+    -4,                                                 // 7^44
+    27,                                                 // 7^55
+    58,                                                 // 7^66
+    89,                                                 // 7^77
+    120,                                                // 7^88
+    150,                                                // 7^99
+    181,                                                // 7^110
+    212,                                                // 7^121
+    243,                                                // 7^132
+    274,                                                // 7^143
+    305,                                                // 7^154
+    336,                                                // 7^165
+    367,                                                // 7^176
+    397,                                                // 7^187
+    428,                                                // 7^198
+    459,                                                // 7^209
+    490,                                                // 7^220
+    521,                                                // 7^231
+    552,                                                // 7^242
+    583,                                                // 7^253
+    614,                                                // 7^264
+    645,                                                // 7^275
+    675,                                                // 7^286
+    706,                                                // 7^297
+    737,                                                // 7^308
+    768,                                                // 7^319
+    799,                                                // 7^330
+    830,                                                // 7^341
+    861,                                                // 7^352
+    892,                                                // 7^363
+];
+const BASE7_SMALL_INT_POWERS: [u128; 11] = [1, 7, 49, 343, 2401, 16807, 117649, 823543, 5764801, 40353607, 282475249];
+const BASE7_STEP: i32 = 11;
+const BASE7_BIAS: i32 = 407;
+
+// BASE9
+
+const BASE9_SMALL_MANTISSA: [u128; 10] = [
+    170141183460469231731687303715884105728,            // 9^0
+    191408831393027885698148216680369618944,            // 9^1
+    215334935317156371410416743765415821312,            // 9^2
+    242251802231800917836718836736092798976,            // 9^3
+    272533277510776032566308691328104398848,            // 9^4
+    306599937199623036637097277744117448704,            // 9^5
+    172462464674787958108367218731066064896,            // 9^6
+    194020272759136452871913121072449323008,            // 9^7
+    218272806854028509480902261206505488384,            // 9^8
+    245556907710782073166015043857318674432,            // 9^9
+];
+const BASE9_SMALL_EXPONENT: [i32; 10] = [
+    -127,                                               // 9^0
+    -124,                                               // 9^1
+    -121,                                               // 9^2
+    -118,                                               // 9^3
+    -115,                                               // 9^4
+    -112,                                               // 9^5
+    -108,                                               // 9^6
+    -105,                                               // 9^7
+    -102,                                               // 9^8
+    -99,                                                // 9^9
+];
+const BASE9_LARGE_MANTISSA: [u128; 69] = [
+    301829093537629265639465570217176944359,            // 9^-360
+    245033990385703656345786023933864839340,            // 9^-350
+    198926007233479871031630637668169238011,            // 9^-340
+    322988302900880006728964617948539328448,            // 9^-330
+    262211676747596696167096696967233799204,            // 9^-320
+    212871372756449173771443137071089544143,            // 9^-310
+    172815421118085121562612771428651141606,            // 9^-300
+    280593575260967566098415738074481154338,            // 9^-290
+    227794354139073103116567345878808448350,            // 9^-280
+    184930348919702200346046943747485274024,            // 9^-270
+    300264105147079021545114594266031000970,            // 9^-260
+    243763485459391712918376663011554847091,            // 9^-250
+    197894572893436379626501802082900685163,            // 9^-240
+    321313603691473325606249593990411338331,            // 9^-230
+    260852105259086286749566195634740776863,            // 9^-220
+    211767631486382365261996259087726574961,            // 9^-210
+    171919370559843833352674924374427532806,            // 9^-200
+    279138693352137745884317186629683060895,            // 9^-190
+    226613236986043931067161987739751269180,            // 9^-180
+    183971482278558945643179980616811190964,            // 9^-170
+    298707231244876640116631457791747347925,            // 9^-160
+    242499568120235502703106353919523432682,            // 9^-150
+    196868486555962367745019627988939060464,            // 9^-140
+    319647587822660709450189016904055940251,            // 9^-130
+    259499583169196479959998361450291137700,            // 9^-120
+    210669613131404954481085620515615417585,            // 9^-110
+    171027966037226738058674240289082148799,            // 9^-100
+    277691355027891684120101092281051616669,            // 9^-90
+    225438243943221318560556485110109738278,            // 9^-80
+    183017587375374702561553597022155160742,            // 9^-70
+    297158429757277967604640789526650060843,            // 9^-60
+    241242204211496523037749538228345943134,            // 9^-50
+    195847720491584060106836777189641681162,            // 9^-40
+    317990210271190550439415903835536554761,            // 9^-30
+    258154073926689380540223575440483383976,            // 9^-20
+    209577288018116110386327960504760073299,            // 9^-10
+    170141183460469231731687303715884105728,            // 9^0
+    276251521174629832311766924339483508736,            // 9^10
+    224269343257001716702690972139746492416,            // 9^20
+    182068638431613361423174859113151594496,            // 9^30
+    295617658828691846632166420412766595202,            // 9^40
+    239991359753539474232337032335634004651,            // 9^50
+    194832247114605420104007752175098574688,            // 9^60
+    316341426247257477645159711999449660471,            // 9^70
+    256815541169845811576524073480007610450,            // 9^80
+    208490626626972031635281014538153149532,            // 9^90
+    338517997729425004575949331160209430911,            // 9^100
+    274819152881557244028610584245948464515,            // 9^110
+    223106503338424488684979682521025988628,            // 9^120
+    181124609802400910077427551154104473922,            // 9^130
+    294084876820548989626661915132664622178,            // 9^140
+    238747000942913976797497733353022683918,            // 9^150
+    193822038982362660063056049982127016523,            // 9^160
+    314701191193291934781116205950433765545,            // 9^170
+    255483948725482657093998355855298189652,            // 9^180
+    207409599591488195571905341445445255582,            // 9^190
+    336762776818711782198286065086981891498,            // 9^200
+    273394211439632029990640781047045990695,            // 9^210
+    221949692762318233808346663450192754968,            // 9^220
+    180185475975832393914650652957737664335,            // 9^230
+    292560042310176717160312096633717510967,            // 9^240
+    237509094151441049982785534773499431992,            // 9^250
+    192817068794482616882547252154136283242,            // 9^260
+    313069460782756034010893203297842312622,            // 9^270
+    254159260607975299744356396919078736707,            // 9^280
+    206334177697445743564032291193028958152,            // 9^290
+    335016656754825225194410391893304442626,            // 9^300
+    271976658340519265432186039827268288213,            // 9^310
+    220798880266451537830039115389735391778,            // 9^320
+];
+const BASE9_LARGE_EXPONENT: [i32; 69] = [
+    -1269,                                              // 9^-360
+    -1237,                                              // 9^-350
+    -1205,                                              // 9^-340
+    -1174,                                              // 9^-330
+    -1142,                                              // 9^-320
+    -1110,                                              // 9^-310
+    -1078,                                              // 9^-300
+    -1047,                                              // 9^-290
+    -1015,                                              // 9^-280
+    -983,                                               // 9^-270
+    -952,                                               // 9^-260
+    -920,                                               // 9^-250
+    -888,                                               // 9^-240
+    -857,                                               // 9^-230
+    -825,                                               // 9^-220
+    -793,                                               // 9^-210
+    -761,                                               // 9^-200
+    -730,                                               // 9^-190
+    -698,                                               // 9^-180
+    -666,                                               // 9^-170
+    -635,                                               // 9^-160
+    -603,                                               // 9^-150
+    -571,                                               // 9^-140
+    -540,                                               // 9^-130
+    -508,                                               // 9^-120
+    -476,                                               // 9^-110
+    -444,                                               // 9^-100
+    -413,                                               // 9^-90
+    -381,                                               // 9^-80
+    -349,                                               // 9^-70
+    -318,                                               // 9^-60
+    -286,                                               // 9^-50
+    -254,                                               // 9^-40
+    -223,                                               // 9^-30
+    -191,                                               // 9^-20
+    -159,                                               // 9^-10
+    -127,                                               // 9^0
+    -96,                                                // 9^10
+    -64,                                                // 9^20
+    -32,                                                // 9^30
+    -1,                                                 // 9^40
+    31,                                                 // 9^50
+    63,                                                 // 9^60
+    94,                                                 // 9^70
+    126,                                                // 9^80
+    158,                                                // 9^90
+    189,                                                // 9^100
+    221,                                                // 9^110
+    253,                                                // 9^120
+    285,                                                // 9^130
+    316,                                                // 9^140
+    348,                                                // 9^150
+    380,                                                // 9^160
+    411,                                                // 9^170
+    443,                                                // 9^180
+    475,                                                // 9^190
+    506,                                                // 9^200
+    538,                                                // 9^210
+    570,                                                // 9^220
+    602,                                                // 9^230
+    633,                                                // 9^240
+    665,                                                // 9^250
+    697,                                                // 9^260
+    728,                                                // 9^270
+    760,                                                // 9^280
+    792,                                                // 9^290
+    823,                                                // 9^300
+    855,                                                // 9^310
+    887,                                                // 9^320
+];
+const BASE9_SMALL_INT_POWERS: [u128; 10] = [1, 9, 81, 729, 6561, 59049, 531441, 4782969, 43046721, 387420489];
+const BASE9_STEP: i32 = 10;
+const BASE9_BIAS: i32 = 360;
+
+// BASE11
+
+const BASE11_SMALL_MANTISSA: [u128; 9] = [
+    170141183460469231731687303715884105728,            // 11^0
+    233944127258145193631070042609340645376,            // 11^1
+    321673174979949641242721308587843387392,            // 11^2
+    221150307798715378354370899654142328832,            // 11^3
+    304081673223233645237259987024445702144,            // 11^4
+    209056150340973131100616241079306420224,            // 11^5
+    287452206718838055263347331484046327808,            // 11^6
+    197623392119201162993551290395281850368,            // 11^7
+    271732164163901599116133024293512544256,            // 11^8
+];
+const BASE11_SMALL_EXPONENT: [i32; 9] = [
+    -127,                                               // 11^0
+    -124,                                               // 11^1
+    -121,                                               // 11^2
+    -117,                                               // 11^3
+    -114,                                               // 11^4
+    -110,                                               // 11^5
+    -107,                                               // 11^6
+    -103,                                               // 11^7
+    -100,                                               // 11^8
+];
+const BASE11_LARGE_MANTISSA: [u128; 70] = [
+    171238059048456285069153007806767780751,            // 11^-333
+    188020237695718721716314139814895141308,            // 11^-324
+    206447153042951189194086232691622882083,            // 11^-315
+    226679997440031906769564274339983654138,            // 11^-306
+    248895760886189129917706060109685643694,            // 11^-297
+    273288779277949488106534827711219187027,            // 11^-288
+    300072434393060227248554937081761703289,            // 11^-279
+    329481020481262984343182946079685486146,            // 11^-270
+    180885896895108223589085363619768036079,            // 11^-261
+    198613611477559667549559644399735817047,            // 11^-252
+    218078729968836026458633966547967004969,            // 11^-243
+    239451526564652757041971603611460905574,            // 11^-234
+    262918963175987885652063848834117643272,            // 11^-225
+    288686324907902004950333378158035100892,            // 11^-216
+    316979015823390018300576675081611005238,            // 11^-207
+    174022265350496153683469750680295263035,            // 11^-198
+    191077310017213090920037889613280023761,            // 11^-189
+    209803833606456768694276179860414245615,            // 11^-180
+    230365649338482385703357683130616542302,            // 11^-171
+    252942624941184287338239913752743474826,            // 11^-162
+    277732256071429933018369293137137136134,            // 11^-153
+    304951393939484349279174830456271141999,            // 11^-144
+    334838142249192351062534286575243350001,            // 11^-135
+    183826970023851061892407973678416422311,            // 11^-126
+    201842924352393404728314593418040675821,            // 11^-117
+    221624531513738305774870271734740961947,            // 11^-108
+    243344834238186465986122993315325591576,            // 11^-99
+    267193834301414676708834595107417746247,            // 11^-90
+    293380154594991977782504639045547494542,            // 11^-81
+    322132864088045607402818330486415493575,            // 11^-72
+    176851740822108453297561032060281913714,            // 11^-63
+    194184088111306107232610402385759498575,            // 11^-54
+    213215091354676888577329040601887973466,            // 11^-45
+    234111227256299197427917870802090967668,            // 11^-36
+    257055288062508663991611489278928709768,            // 11^-27
+    282247980565918687696808555402942563478,            // 11^-18
+    309909681819761564465444461107912469729,            // 11^-9
+    170141183460469231731687303715884105728,            // 11^0
+    186815862862682349392341454201789874176,            // 11^9
+    205124743505955904636591107127579246592,            // 11^18
+    225227985212968648451224991661780107264,            // 11^27
+    247301444262965381085386823495099626888,            // 11^36
+    271538211722310826714720080747313199115,            // 11^45
+    298150302539063592923933328180322755271,            // 11^54
+    327370510177191550022527822209865447333,            // 11^63
+    179727221507067050840782578187764330990,            // 11^72
+    197341380157710189331417385894277071911,            // 11^81
+    216681813672942089280666997109850212851,            // 11^90
+    237917705546974217796728292841033536358,            // 11^99
+    261234820095126400184969690376374338338,            // 11^108
+    286837127456489808703442688252756740915,            // 11^117
+    314948587854906379895896832699151980516,            // 11^126
+    172907555363184572545974225978641470455,            // 11^135
+    189853352925309785288573204303090400331,            // 11^144
+    208459922652152508348644224820166488004,            // 11^153
+    228890028448627145607277691781146666326,            // 11^162
+    251322385889182188596856419989450117198,            // 11^171
+    275953225560490099471194727985491113834,            // 11^180
+    302998009619470597652934458975103615488,            // 11^189
+    332693316582509542060143699364121908613,            // 11^198
+    182649455416682266091504883729813020363,            // 11^207
+    200550007476552106538373760555841065584,            // 11^216
+    220204902374823007850602460837751774656,            // 11^225
+    241786074406278472344858080843135119733,            // 11^234
+    265482308278902675848717553283442644763,            // 11^243
+    291500890537904924029114199837605959154,            // 11^252
+    320069422837484936971208194402230692262,            // 11^261
+    175718906461109937023963056381563419957,            // 11^270
+    192940230367248485471498733602562118815,            // 11^279
+    211849329385655768374338506351963365331,            // 11^288
+];
+const BASE11_LARGE_EXPONENT: [i32; 70] = [
+    -1279,                                              // 11^-333
+    -1248,                                              // 11^-324
+    -1217,                                              // 11^-315
+    -1186,                                              // 11^-306
+    -1155,                                              // 11^-297
+    -1124,                                              // 11^-288
+    -1093,                                              // 11^-279
+    -1062,                                              // 11^-270
+    -1030,                                              // 11^-261
+    -999,                                               // 11^-252
+    -968,                                               // 11^-243
+    -937,                                               // 11^-234
+    -906,                                               // 11^-225
+    -875,                                               // 11^-216
+    -844,                                               // 11^-207
+    -812,                                               // 11^-198
+    -781,                                               // 11^-189
+    -750,                                               // 11^-180
+    -719,                                               // 11^-171
+    -688,                                               // 11^-162
+    -657,                                               // 11^-153
+    -626,                                               // 11^-144
+    -595,                                               // 11^-135
+    -563,                                               // 11^-126
+    -532,                                               // 11^-117
+    -501,                                               // 11^-108
+    -470,                                               // 11^-99
+    -439,                                               // 11^-90
+    -408,                                               // 11^-81
+    -377,                                               // 11^-72
+    -345,                                               // 11^-63
+    -314,                                               // 11^-54
+    -283,                                               // 11^-45
+    -252,                                               // 11^-36
+    -221,                                               // 11^-27
+    -190,                                               // 11^-18
+    -159,                                               // 11^-9
+    -127,                                               // 11^0
+    -96,                                                // 11^9
+    -65,                                                // 11^18
+    -34,                                                // 11^27
+    -3,                                                 // 11^36
+    28,                                                 // 11^45
+    59,                                                 // 11^54
+    90,                                                 // 11^63
+    122,                                                // 11^72
+    153,                                                // 11^81
+    184,                                                // 11^90
+    215,                                                // 11^99
+    246,                                                // 11^108
+    277,                                                // 11^117
+    308,                                                // 11^126
+    340,                                                // 11^135
+    371,                                                // 11^144
+    402,                                                // 11^153
+    433,                                                // 11^162
+    464,                                                // 11^171
+    495,                                                // 11^180
+    526,                                                // 11^189
+    557,                                                // 11^198
+    589,                                                // 11^207
+    620,                                                // 11^216
+    651,                                                // 11^225
+    682,                                                // 11^234
+    713,                                                // 11^243
+    744,                                                // 11^252
+    775,                                                // 11^261
+    807,                                                // 11^270
+    838,                                                // 11^279
+    869,                                                // 11^288
+];
+const BASE11_SMALL_INT_POWERS: [u128; 9] = [1, 11, 121, 1331, 14641, 161051, 1771561, 19487171, 214358881];
+const BASE11_STEP: i32 = 9;
+const BASE11_BIAS: i32 = 333;
+
+// BASE12
+
+const BASE12_SMALL_MANTISSA: [u128; 9] = [
+    170141183460469231731687303715884105728,            // 12^0
+    255211775190703847597530955573826158592,            // 12^1
+    191408831393027885698148216680369618944,            // 12^2
+    287113247089541828547222325020554428416,            // 12^3
+    215334935317156371410416743765415821312,            // 12^4
+    323002402975734557115625115648123731968,            // 12^5
+    242251802231800917836718836736092798976,            // 12^6
+    181688851673850688377539127552069599232,            // 12^7
+    272533277510776032566308691328104398848,            // 12^8
+];
+const BASE12_SMALL_EXPONENT: [i32; 9] = [
+    -127,                                               // 12^0
+    -124,                                               // 12^1
+    -120,                                               // 12^2
+    -117,                                               // 12^3
+    -113,                                               // 12^4
+    -110,                                               // 12^5
+    -106,                                               // 12^6
+    -102,                                               // 12^7
+    -99,                                                // 12^8
+];
+const BASE12_LARGE_MANTISSA: [u128; 68] = [
+    236015590119408703302029793810763336632,            // 12^-324
+    283538504658222748235708766575760177913,            // 12^-315
+    170315197362908885300398426895467760677,            // 12^-306
+    204609010601448705405745986119597896326,            // 12^-297
+    245808053934833671173174941698733239342,            // 12^-288
+    295302729833943551617529441983408590696,            // 12^-279
+    177381702616012906692133545122052956869,            // 12^-270
+    213098391881773806300126011269370626834,            // 12^-261
+    256006814417050404626793229969178591795,            // 12^-252
+    307555061533862494767405465422567274311,            // 12^-243
+    184741402471039290909022270993420155647,            // 12^-234
+    221940003957364890317522299802459040748,            // 12^-225
+    266628729119434395515123988465075762881,            // 12^-216
+    320315751663685742610118741757695693407,            // 12^-207
+    192406461791880080316008520325217417399,            // 12^-198
+    231148461148045387015380597263260157877,            // 12^-189
+    277691355027891684120101092281051616669,            // 12^-180
+    333605892395873536287594592246578306329,            // 12^-171
+    200389550171752283164939097875653100692,            // 12^-162
+    240738984132727062349578629363188475398,            // 12^-153
+    289212977580839036146652597763405686112,            // 12^-144
+    173723725516468955947099703423373843986,            // 12^-135
+    208703862874796048578293668364396201854,            // 12^-126
+    250727425107703285166415666163110988836,            // 12^-117
+    301212640893244858516269504216828222245,            // 12^-108
+    180931653158622392278312153671259457350,            // 12^-99
+    217363142646555453321168098187951653993,            // 12^-90
+    261130293988778746809115702919522241550,            // 12^-81
+    313710179234688236904530296665341569850,            // 12^-72
+    188438643123668474334468683754392032451,            // 12^-63
+    226381702429392491474935736226666160567,            // 12^-54
+    271964785700545191021799322274747927151,            // 12^-45
+    326726249813466247246220462666861782844,            // 12^-36
+    196257103731642338395610271199702162833,            // 12^-27
+    235774449020380624184618955567855082461,            // 12^-18
+    283248808597909657338003839260381566656,            // 12^-9
+    170141183460469231731687303715884105728,            // 12^0
+    204399958133082024424731518496078299136,            // 12^9
+    245556907710782073166015043857318674432,            // 12^18
+    295001014066853243782145636489477750784,            // 12^27
+    177200468746272961345336076752392290304,            // 12^36
+    212880665669732098276382446210774990848,            // 12^45
+    255745247947835503562868389206950936576,            // 12^54
+    307240827353347547401607574753443315712,            // 12^63
+    184552649072141716781794491390137475072,            // 12^72
+    221713244121518884974124815309574946401,            // 12^81
+    266356310061270520809673995345359110719,            // 12^90
+    319988479671385965643116043114178672868,            // 12^99
+    192209876872921446586714266254161951235,            // 12^108
+    230912292876569386789935113689005718149,            // 12^117
+    277407633098725295421526662764935275289,            // 12^126
+    333265041643201293321649737744276185517,            // 12^135
+    200184808797092622572327630249651738267,            // 12^144
+    240493017062571660772163375622796335712,            // 12^153
+    288917483816076538023589582665008561757,            // 12^162
+    173546229063471511777292289904643662141,            // 12^171
+    208490626626972031635281014538153149532,            // 12^180
+    250471252679363433757155530343900661758,            // 12^189
+    300904886870600004067510516586852827477,            // 12^198
+    180746792244690548097558883605316900733,            // 12^207
+    217141059066909427380630585083218539864,            // 12^216
+    260863492774290665230282703014708894052,            // 12^225
+    313389656266867868879861721401276560157,            // 12^234
+    188246112191795662327951607127115677904,            // 12^243
+    226150404435492799169987273137391228527,            // 12^252
+    271686914703601365116141326731156710883,            // 12^261
+    326392428107359965184387801150473482685,            // 12^270
+    196056584547032659751107943421776414785,            // 12^279
+];
+const BASE12_LARGE_EXPONENT: [i32; 68] = [
+    -1289,                                              // 12^-324
+    -1257,                                              // 12^-315
+    -1224,                                              // 12^-306
+    -1192,                                              // 12^-297
+    -1160,                                              // 12^-288
+    -1128,                                              // 12^-279
+    -1095,                                              // 12^-270
+    -1063,                                              // 12^-261
+    -1031,                                              // 12^-252
+    -999,                                               // 12^-243
+    -966,                                               // 12^-234
+    -934,                                               // 12^-225
+    -902,                                               // 12^-216
+    -870,                                               // 12^-207
+    -837,                                               // 12^-198
+    -805,                                               // 12^-189
+    -773,                                               // 12^-180
+    -741,                                               // 12^-171
+    -708,                                               // 12^-162
+    -676,                                               // 12^-153
+    -644,                                               // 12^-144
+    -611,                                               // 12^-135
+    -579,                                               // 12^-126
+    -547,                                               // 12^-117
+    -515,                                               // 12^-108
+    -482,                                               // 12^-99
+    -450,                                               // 12^-90
+    -418,                                               // 12^-81
+    -386,                                               // 12^-72
+    -353,                                               // 12^-63
+    -321,                                               // 12^-54
+    -289,                                               // 12^-45
+    -257,                                               // 12^-36
+    -224,                                               // 12^-27
+    -192,                                               // 12^-18
+    -160,                                               // 12^-9
+    -127,                                               // 12^0
+    -95,                                                // 12^9
+    -63,                                                // 12^18
+    -31,                                                // 12^27
+    2,                                                  // 12^36
+    34,                                                 // 12^45
+    66,                                                 // 12^54
+    98,                                                 // 12^63
+    131,                                                // 12^72
+    163,                                                // 12^81
+    195,                                                // 12^90
+    227,                                                // 12^99
+    260,                                                // 12^108
+    292,                                                // 12^117
+    324,                                                // 12^126
+    356,                                                // 12^135
+    389,                                                // 12^144
+    421,                                                // 12^153
+    453,                                                // 12^162
+    486,                                                // 12^171
+    518,                                                // 12^180
+    550,                                                // 12^189
+    582,                                                // 12^198
+    615,                                                // 12^207
+    647,                                                // 12^216
+    679,                                                // 12^225
+    711,                                                // 12^234
+    744,                                                // 12^243
+    776,                                                // 12^252
+    808,                                                // 12^261
+    840,                                                // 12^270
+    873,                                                // 12^279
+];
+const BASE12_SMALL_INT_POWERS: [u128; 9] = [1, 12, 144, 1728, 20736, 248832, 2985984, 35831808, 429981696];
+const BASE12_STEP: i32 = 9;
+const BASE12_BIAS: i32 = 324;
+
+// BASE13
+
+const BASE13_SMALL_MANTISSA: [u128; 8] = [
+    170141183460469231731687303715884105728,            // 13^0
+    276479423123262501563991868538311671808,            // 13^1
+    224639531287650782520743393187378233344,            // 13^2
+    182519619171216260798104006964744814592,            // 13^3
+    296594381153226423796919011317710323712,            // 13^4
+    240982934686996469334996696695639638016,            // 13^5
+    195798634433184631334684816065207205888,            // 13^6
+    318172780953925025918862826105961709568,            // 13^7
+];
+const BASE13_SMALL_EXPONENT: [i32; 8] = [
+    -127,                                               // 13^0
+    -124,                                               // 13^1
+    -120,                                               // 13^2
+    -116,                                               // 13^3
+    -113,                                               // 13^4
+    -109,                                               // 13^5
+    -105,                                               // 13^6
+    -102,                                               // 13^7
+];
+const BASE13_LARGE_MANTISSA: [u128; 74] = [
+    234492264952419818661296823055466035238,            // 13^-312
+    178145751691013993109826848158654507171,            // 13^-304
+    270677660536016922109887166011364690074,            // 13^-296
+    205636101949623162244352604410701629545,            // 13^-288
+    312446962496257587924386799659895562352,            // 13^-280
+    237368592984352411701605597109952160960,            // 13^-272
+    180330922359490147340520816471555077038,            // 13^-264
+    273997845714729128559081401928980460360,            // 13^-256
+    208158474636564731932432542641850208607,            // 13^-248
+    316279498110609430339960234785638219567,            // 13^-240
+    240280202619066059925234911435300433349,            // 13^-232
+    182542896759209079117924981191278218615,            // 13^-224
+    277358756934885281135534847026826478882,            // 13^-216
+    210711787240726612911538723377341283448,            // 13^-208
+    320159044357159213189440578296814412270,            // 13^-200
+    243227526627608078053980201967728671175,            // 13^-192
+    184782003669985976085437039910686134984,            // 13^-184
+    280760893750083272032555777889582843511,            // 13^-176
+    213296419277190995686832685182416132955,            // 13^-168
+    324086177877525444638594829459150002632,            // 13^-160
+    246211003089480177174216643591955743445,            // 13^-152
+    187048575904513609075482455349961378053,            // 13^-144
+    284204761841543230201034707437221523825,            // 13^-136
+    215912754916246372204794564138901211197,            // 13^-128
+    328061482386525623150638173263346085618,            // 13^-120
+    249231075457753005677502945704601914895,            // 13^-112
+    189342950357830398121128390896356453239,            // 13^-104
+    287690873093270135400938070638952191684,            // 13^-96
+    218561183040489207765436578950529361150,            // 13^-88
+    332085548758937481126223466223271077691,            // 13^-80
+    252288192624979397908801362020362227394,            // 13^-72
+    191665468057395263450492571375008762286,            // 13^-64
+    291219745668138391592456499213129019442,            // 13^-56
+    221242097302626033221832363181059870585,            // 13^-48
+    336158975117324458944453423021025623710,            // 13^-40
+    255382808989916127627430380985009698372,            // 13^-32
+    194016474213776704407345321083633835842,            // 13^-24
+    294791904084909668600573533146696407742,            // 13^-16
+    223955896183984548959338021657683010637,            // 13^-8
+    170141183460469231731687303715884105728,            // 13^0
+    258515384525064083559076046211093889024,            // 13^8
+    196396318271963640537903969427202768896,            // 13^16
+    298407879296195459704416306334760173568,            // 13^24
+    226702983053742437531808354380178063872,            // 13^32
+    172228168527856562581024588413877561828,            // 13^40
+    261686384845036905964465455013477410965,            // 13^48
+    198805353963305641500281734389939339052,            // 13^56
+    302068208767375943221882620634577632307,            // 13^64
+    229483766228882688509711411881831930515,            // 13^72
+    174340752962680465097022527378326959423,            // 13^80
+    264896281275768246289732905498826672107,            // 13^88
+    201243939358090266003114541899396801267,            // 13^96
+    305773436556486878301580275426022079145,            // 13^104
+    232298659034884347081172590621418853088,            // 13^112
+    176479250771793883849064971202097683281,            // 13^120
+    268145550924567936613388404500729180677,            // 13^128
+    203712436918765324677453955129179600235,            // 13^136
+    309524113395086409019191949184662333574,            // 13^144
+    235148079867157707257686510259099274415,            // 13^152
+    178643979813719299400243488890704650366,            // 13^160
+    271434676751037481783657313824389119896,            // 13^168
+    206211213553813977645157972930830162165,            // 13^176
+    313320796770113796525378889251061848013,            // 13^184
+    238032452253233081187768481790039531230,            // 13^192
+    180835261845894060934288352757379708280,            // 13^200
+    274764147638855414866553566635921015415,            // 13^208
+    208740640672290674581982064710037218783,            // 13^216
+    317164051006752246428908041221997358677,            // 13^224
+    240952204915712388090624317255539471706,            // 13^232
+    183053422572495239382420468754129441919,            // 13^240
+    278134458468443185818361944895170594350,            // 13^248
+    211301094239026043298793364640604498188,            // 13^256
+    321054447352308147843744474962905446408,            // 13^264
+    243907771835992919704646129069158162971,            // 13^272
+];
+const BASE13_LARGE_EXPONENT: [i32; 74] = [
+    -1282,                                              // 13^-312
+    -1252,                                              // 13^-304
+    -1223,                                              // 13^-296
+    -1193,                                              // 13^-288
+    -1164,                                              // 13^-280
+    -1134,                                              // 13^-272
+    -1104,                                              // 13^-264
+    -1075,                                              // 13^-256
+    -1045,                                              // 13^-248
+    -1016,                                              // 13^-240
+    -986,                                               // 13^-232
+    -956,                                               // 13^-224
+    -927,                                               // 13^-216
+    -897,                                               // 13^-208
+    -868,                                               // 13^-200
+    -838,                                               // 13^-192
+    -808,                                               // 13^-184
+    -779,                                               // 13^-176
+    -749,                                               // 13^-168
+    -720,                                               // 13^-160
+    -690,                                               // 13^-152
+    -660,                                               // 13^-144
+    -631,                                               // 13^-136
+    -601,                                               // 13^-128
+    -572,                                               // 13^-120
+    -542,                                               // 13^-112
+    -512,                                               // 13^-104
+    -483,                                               // 13^-96
+    -453,                                               // 13^-88
+    -424,                                               // 13^-80
+    -394,                                               // 13^-72
+    -364,                                               // 13^-64
+    -335,                                               // 13^-56
+    -305,                                               // 13^-48
+    -276,                                               // 13^-40
+    -246,                                               // 13^-32
+    -216,                                               // 13^-24
+    -187,                                               // 13^-16
+    -157,                                               // 13^-8
+    -127,                                               // 13^0
+    -98,                                                // 13^8
+    -68,                                                // 13^16
+    -39,                                                // 13^24
+    -9,                                                 // 13^32
+    21,                                                 // 13^40
+    50,                                                 // 13^48
+    80,                                                 // 13^56
+    109,                                                // 13^64
+    139,                                                // 13^72
+    169,                                                // 13^80
+    198,                                                // 13^88
+    228,                                                // 13^96
+    257,                                                // 13^104
+    287,                                                // 13^112
+    317,                                                // 13^120
+    346,                                                // 13^128
+    376,                                                // 13^136
+    405,                                                // 13^144
+    435,                                                // 13^152
+    465,                                                // 13^160
+    494,                                                // 13^168
+    524,                                                // 13^176
+    553,                                                // 13^184
+    583,                                                // 13^192
+    613,                                                // 13^200
+    642,                                                // 13^208
+    672,                                                // 13^216
+    701,                                                // 13^224
+    731,                                                // 13^232
+    761,                                                // 13^240
+    790,                                                // 13^248
+    820,                                                // 13^256
+    849,                                                // 13^264
+    879,                                                // 13^272
+];
+const BASE13_SMALL_INT_POWERS: [u128; 8] = [1, 13, 169, 2197, 28561, 371293, 4826809, 62748517];
+const BASE13_STEP: i32 = 8;
+const BASE13_BIAS: i32 = 312;
+
+// BASE14
+
+const BASE14_SMALL_MANTISSA: [u128; 8] = [
+    170141183460469231731687303715884105728,            // 14^0
+    297747071055821155530452781502797185024,            // 14^1
+    260528687173843511089146183814947536896,            // 14^2
+    227962601277113072203002910838079094784,            // 14^3
+    199467276117473938177627546983319207936,            // 14^4
+    174533866602789695905424103610404306944,            // 14^5
+    305434266554881967834492181318207537152,            // 14^6
+    267254983235521721855180658653431595008,            // 14^7
+];
+const BASE14_SMALL_EXPONENT: [i32; 8] = [
+    -127,                                               // 14^0
+    -124,                                               // 14^1
+    -120,                                               // 14^2
+    -116,                                               // 14^3
+    -112,                                               // 14^4
+    -108,                                               // 14^5
+    -105,                                               // 14^6
+    -101,                                               // 14^7
+];
+const BASE14_LARGE_MANTISSA: [u128; 72] = [
+    251548413169278560512334209582633427955,            // 14^-304
+    172868555043538834443100066630384298338,            // 14^-296
+    237596707101714066585640360644079693184,            // 14^-288
+    326561387705008590881101164026582541311,            // 14^-280
+    224418808746721891131396635947419054595,            // 14^-272
+    308449214239576126269380201889590576494,            // 14^-264
+    211971800172033630882960469392933087940,            // 14^-256
+    291341601754078780972414349774563326428,            // 14^-248
+    200215143815698040798730279921859793515,            // 14^-240
+    275182833977670641254081992250398936156,            // 14^-232
+    189110550462878905579110756278883461660,            // 14^-224
+    259920284847963995399800125815215983072,            // 14^-216
+    178621854545095883446307559621296276382,            // 14^-208
+    245504247117858718392171207907774065824,            // 14^-200
+    337429792711562885676838629607664070711,            // 14^-192
+    231887770468403152813044191455947332680,            // 14^-184
+    318714821597104302344272129046782646031,            // 14^-176
+    219026508600450572879143037057044702127,            // 14^-168
+    301037844611736789461197056572315300910,            // 14^-160
+    206878574807117564156377107253687360168,            // 14^-152
+    284341291171704802743493772571841275116,            // 14^-144
+    195404405556671025581418948604574579552,            // 14^-136
+    268570783748031302676865943988466296381,            // 14^-128
+    184566631641558957302915986868221103411,            // 14^-120
+    253674960769150428442670675281025859157,            // 14^-112
+    174329956473941702727882427159635204541,            // 14^-104
+    239605309345945263344621501916001364416,            // 14^-96
+    329322082262710237520775170056072850605,            // 14^-88
+    226316007274407653805017736090948441653,            // 14^-80
+    311056791556242112413125050076207081650,            // 14^-72
+    213763773801352511153375590062662203372,            // 14^-64
+    293804554217770280277607620947080882230,            // 14^-56
+    201907728667158642949418150287074186439,            // 14^-48
+    277509182960549548157083678768414391770,            // 14^-40
+    190709258966464876623809832149485832940,            // 14^-32
+    262117606830390855604604612394616145902,            // 14^-24
+    180131893393211845729384454981934494079,            // 14^-16
+    247579698363561878555441197267606485702,            // 14^-8
+    170141183460469231731687303715884105728,            // 14^0
+    233848110331081506623283076321752645632,            // 14^8
+    321409182616407632938244080939940446208,            // 14^16
+    220878121537715117784741212850409701376,            // 14^24
+    303582767467198764972828371186555551744,            // 14^32
+    208627491173467029036775346642092064768,            // 14^40
+    286745064197610355009611023687762970225,            // 14^48
+    197056321243220373650760726805477101625,            // 14^56
+    270841235580262673674173137819514560921,            // 14^64
+    186126926626483659918254253754028720893,            // 14^72
+    255819485841579348845580110620374327715,            // 14^80
+    175803712344053086257499345217280929659,            // 14^88
+    241630891972710985114650364591580944199,            // 14^96
+    332106115263742508816700348007180790592,            // 14^104
+    228229244396512279339912293302076319311,            // 14^112
+    313686412889065357315780098042512623701,            // 14^120
+    215570896471654994597359469530054904893,            // 14^128
+    296288328063653274657691113306601058431,            // 14^136
+    203614622343740041422835873088956724196,            // 14^144
+    279855198502973302491761604313633635665,            // 14^152
+    192321482680456518790460799730877816261,            // 14^160
+    264333504599995236391965677440014878764,            // 14^168
+    181654697853512422889189735564216996803,            // 14^176
+    249672695121914450880056351845343996855,            // 14^184
+    171579528154314464133715598246382584383,            // 14^192
+    235825022574310344970824197408281461914,            // 14^200
+    324126321306564057111299587260117144567,            // 14^208
+    222745387696552489161405202381218740358,            // 14^216
+    306149204668634768979587047598946613225,            // 14^224
+    210391192582005308252369450519735221250,            // 14^232
+    289169158312782474283830561810879736710,            // 14^240
+    198722201944671478335130298919429936059,            // 14^248
+    273130881427012463325938578210122255044,            // 14^256
+    187700412080445632409314398956810353518,            // 14^264
+];
+const BASE14_LARGE_EXPONENT: [i32; 72] = [
+    -1285,                                              // 14^-304
+    -1254,                                              // 14^-296
+    -1224,                                              // 14^-288
+    -1194,                                              // 14^-280
+    -1163,                                              // 14^-272
+    -1133,                                              // 14^-264
+    -1102,                                              // 14^-256
+    -1072,                                              // 14^-248
+    -1041,                                              // 14^-240
+    -1011,                                              // 14^-232
+    -980,                                               // 14^-224
+    -950,                                               // 14^-216
+    -919,                                               // 14^-208
+    -889,                                               // 14^-200
+    -859,                                               // 14^-192
+    -828,                                               // 14^-184
+    -798,                                               // 14^-176
+    -767,                                               // 14^-168
+    -737,                                               // 14^-160
+    -706,                                               // 14^-152
+    -676,                                               // 14^-144
+    -645,                                               // 14^-136
+    -615,                                               // 14^-128
+    -584,                                               // 14^-120
+    -554,                                               // 14^-112
+    -523,                                               // 14^-104
+    -493,                                               // 14^-96
+    -463,                                               // 14^-88
+    -432,                                               // 14^-80
+    -402,                                               // 14^-72
+    -371,                                               // 14^-64
+    -341,                                               // 14^-56
+    -310,                                               // 14^-48
+    -280,                                               // 14^-40
+    -249,                                               // 14^-32
+    -219,                                               // 14^-24
+    -188,                                               // 14^-16
+    -158,                                               // 14^-8
+    -127,                                               // 14^0
+    -97,                                                // 14^8
+    -67,                                                // 14^16
+    -36,                                                // 14^24
+    -6,                                                 // 14^32
+    25,                                                 // 14^40
+    55,                                                 // 14^48
+    86,                                                 // 14^56
+    116,                                                // 14^64
+    147,                                                // 14^72
+    177,                                                // 14^80
+    208,                                                // 14^88
+    238,                                                // 14^96
+    268,                                                // 14^104
+    299,                                                // 14^112
+    329,                                                // 14^120
+    360,                                                // 14^128
+    390,                                                // 14^136
+    421,                                                // 14^144
+    451,                                                // 14^152
+    482,                                                // 14^160
+    512,                                                // 14^168
+    543,                                                // 14^176
+    573,                                                // 14^184
+    604,                                                // 14^192
+    634,                                                // 14^200
+    664,                                                // 14^208
+    695,                                                // 14^216
+    725,                                                // 14^224
+    756,                                                // 14^232
+    786,                                                // 14^240
+    817,                                                // 14^248
+    847,                                                // 14^256
+    878,                                                // 14^264
+];
+const BASE14_SMALL_INT_POWERS: [u128; 8] = [1, 14, 196, 2744, 38416, 537824, 7529536, 105413504];
+const BASE14_STEP: i32 = 8;
+const BASE14_BIAS: i32 = 304;
+
+// BASE15
+
+const BASE15_SMALL_MANTISSA: [u128; 8] = [
+    170141183460469231731687303715884105728,            // 15^0
+    319014718988379809496913694467282698240,            // 15^1
+    299076299051606071403356588563077529600,            // 15^2
+    280384030360880691940646801777885184000,            // 15^3
+    262860028463325648694356376666767360000,            // 15^4
+    246431276684367795650959103125094400000,            // 15^5
+    231029321891594808422774159179776000000,            // 15^6
+    216589989273370132896350774231040000000,            // 15^7
+];
+const BASE15_SMALL_EXPONENT: [i32; 8] = [
+    -127,                                               // 15^0
+    -124,                                               // 15^1
+    -120,                                               // 15^2
+    -116,                                               // 15^3
+    -112,                                               // 15^4
+    -108,                                               // 15^5
+    -104,                                               // 15^6
+    -100,                                               // 15^7
+];
+const BASE15_LARGE_MANTISSA: [u128; 70] = [
+    250900630150587280377850342682701393565,            // 15^-296
+    299434584015762656519487081521438784545,            // 15^-288
+    178678447421354466262014715708770369510,            // 15^-280
+    213241818261213966824485132704511196490,            // 15^-272
+    254491091184140684406056053498886823977,            // 15^-264
+    303719580053283976738045342609656736770,            // 15^-256
+    181235388002241613446887230826356048960,            // 15^-248
+    216293370737313530448778168911616746705,            // 15^-240
+    258132932759965856034693127408739651425,            // 15^-232
+    308065895631104646134849028190499821539,            // 15^-224
+    183828919146951883093674448351327494412,            // 15^-216
+    219388591817396682923135459647357436704,            // 15^-208
+    261826890148575264294539329193196343516,            // 15^-200
+    312474408249691315911417866816293319027,            // 15^-192
+    186459564477102023710796186076704586060,            // 15^-184
+    222528106411894691985532295229724475420,            // 15^-176
+    265573709142416387133758214804806317848,            // 15^-168
+    316946007966797681726272939583274683428,            // 15^-160
+    189127855107486501747742000280219617523,            // 15^-152
+    225712548373888955751123878842649157480,            // 15^-144
+    269374146206443663446975509775551676690,            // 15^-136
+    321481597577162915672598741300570427622,            // 15^-128
+    191834329753307055373436045708607941890,            // 15^-120
+    228942560627082928532238637834630336646,            // 15^-112
+    273228968630845173556739192069109710925,            // 15^-104
+    326082092794781635112624979076905003855,            // 15^-96
+    194579534838936734374686465136944546456,            // 15^-88
+    232218795295605362158733969001967701715,            // 15^-80
+    277138954685954882938577351637270128950,            // 15^-72
+    330748422437782207809506145002547658085,            // 15^-64
+    197364024608240385117657735223630441823,            // 15^-56
+    235541913835671069456466721167496749113,            // 15^-48
+    281104893779381725235703590002221275596,            // 15^-40
+    335481528615950719408183659471355674975,            // 15^-32
+    200188361236473853754168248068850933442,            // 15^-24
+    238912587169125791566529710613345919103,            // 15^-16
+    285127586615387248178740525206042107172,            // 15^-8
+    170141183460469231731687303715884105728,            // 15^0
+    203053114943784499590328850841600000000,            // 15^8
+    242331495818902131179520000000000000000,            // 15^16
+    289207845356544000000000000000000000000,            // 15^24
+    172575953309595678001642227172851562500,            // 15^32
+    205958864110335933831952325359648803271,            // 15^40
+    245799330046413899594233809090775284541,            // 15^48
+    293346493787707294402529081970820087350,            // 15^56
+    175045565423820113080636775231191731391,            // 15^64
+    208906195393080226844550976655564036201,            // 15^72
+    249316789990916616866725045444974174010,            // 15^80
+    297544367482333459204270734183314844936,            // 15^88
+    177550518406095745907734479894927853604,            // 15^96
+    211895703844201159681805788312089434384,            // 15^104
+    252884585810862301272632571838697691236,            // 15^112
+    301802313971178147521594347169174498450,            // 15^120
+    180091317994529147280371081412973024665,            // 15^128
+    214927993031252433012289596290523334542,            // 15^136
+    256503437827277086943219190518379691262,            // 15^144
+    306121192913408770879770801728425641044,            // 15^152
+    182668477164486370906358954938714362551,            // 15^160
+    218003675159015088778073023304915283497,            // 15^168
+    260174076669190616934963528529542450091,            // 15^176
+    310501876270165601037714752361776484586,            // 15^184
+    185282516232160242762660936045505469826,            // 15^192
+    221123371193098747019724833334214306438,            // 15^200
+    263897243421146573236258451562349376134,            // 15^208
+    314945248480606581688897076801472259251,            // 15^216
+    187933962959619728504626775329093970226,            // 15^224
+    224287710985311612370215929865332425589,            // 15^232
+    267673689772824125386430153566188172461,            // 15^240
+    319452206640471392649554807130291119305,            // 15^248
+    190623352661362587893902772482928415571,            // 15^256
+];
+const BASE15_LARGE_EXPONENT: [i32; 70] = [
+    -1284,                                              // 15^-296
+    -1253,                                              // 15^-288
+    -1221,                                              // 15^-280
+    -1190,                                              // 15^-272
+    -1159,                                              // 15^-264
+    -1128,                                              // 15^-256
+    -1096,                                              // 15^-248
+    -1065,                                              // 15^-240
+    -1034,                                              // 15^-232
+    -1003,                                              // 15^-224
+    -971,                                               // 15^-216
+    -940,                                               // 15^-208
+    -909,                                               // 15^-200
+    -878,                                               // 15^-192
+    -846,                                               // 15^-184
+    -815,                                               // 15^-176
+    -784,                                               // 15^-168
+    -753,                                               // 15^-160
+    -721,                                               // 15^-152
+    -690,                                               // 15^-144
+    -659,                                               // 15^-136
+    -628,                                               // 15^-128
+    -596,                                               // 15^-120
+    -565,                                               // 15^-112
+    -534,                                               // 15^-104
+    -503,                                               // 15^-96
+    -471,                                               // 15^-88
+    -440,                                               // 15^-80
+    -409,                                               // 15^-72
+    -378,                                               // 15^-64
+    -346,                                               // 15^-56
+    -315,                                               // 15^-48
+    -284,                                               // 15^-40
+    -253,                                               // 15^-32
+    -221,                                               // 15^-24
+    -190,                                               // 15^-16
+    -159,                                               // 15^-8
+    -127,                                               // 15^0
+    -96,                                                // 15^8
+    -65,                                                // 15^16
+    -34,                                                // 15^24
+    -2,                                                 // 15^32
+    29,                                                 // 15^40
+    60,                                                 // 15^48
+    91,                                                 // 15^56
+    123,                                                // 15^64
+    154,                                                // 15^72
+    185,                                                // 15^80
+    216,                                                // 15^88
+    248,                                                // 15^96
+    279,                                                // 15^104
+    310,                                                // 15^112
+    341,                                                // 15^120
+    373,                                                // 15^128
+    404,                                                // 15^136
+    435,                                                // 15^144
+    466,                                                // 15^152
+    498,                                                // 15^160
+    529,                                                // 15^168
+    560,                                                // 15^176
+    591,                                                // 15^184
+    623,                                                // 15^192
+    654,                                                // 15^200
+    685,                                                // 15^208
+    716,                                                // 15^216
+    748,                                                // 15^224
+    779,                                                // 15^232
+    810,                                                // 15^240
+    841,                                                // 15^248
+    873,                                                // 15^256
+];
+const BASE15_SMALL_INT_POWERS: [u128; 8] = [1, 15, 225, 3375, 50625, 759375, 11390625, 170859375];
+const BASE15_STEP: i32 = 8;
+const BASE15_BIAS: i32 = 296;
+
+// BASE17
+
+const BASE17_SMALL_MANTISSA: [u128; 8] = [
+    170141183460469231731687303715884105728,            // 17^0
+    180775007426748558714917760198126862336,            // 17^1
+    192073445390920343634600120210509791232,            // 17^2
+    204078035727852865111762627723666653184,            // 17^3
+    216832912960843669181247791956395819008,            // 17^4
+    230384970020896398505075778953670557696,            // 17^5
+    244784030647202423411643015138274967552,            // 17^6
+    260083032562652574874870703584417153024,            // 17^7
+];
+const BASE17_SMALL_EXPONENT: [i32; 8] = [
+    -127,                                               // 17^0
+    -123,                                               // 17^1
+    -119,                                               // 17^2
+    -115,                                               // 17^3
+    -111,                                               // 17^4
+    -107,                                               // 17^5
+    -103,                                               // 17^6
+    -99,                                                // 17^7
+];
+const BASE17_LARGE_MANTISSA: [u128; 67] = [
+    242357519372662728375060373498171096966,            // 17^-280
+    196814917627041423628769027913700117445,            // 17^-272
+    319660903452112403161269325795427500295,            // 17^-264
+    259591839957616255097162958982226744872,            // 17^-256
+    210810651677570156300974624360660789801,            // 17^-248
+    171196178077006380843936555487576333355,            // 17^-240
+    278051712804343163076920967240438328697,            // 17^-232
+    225801638394791143591435147984466155468,            // 17^-224
+    183370134237042583472660416437030762483,            // 17^-216
+    297824288336843871393537735572731133862,            // 17^-208
+    241858651334916724628852435647948831754,            // 17^-200
+    196409794352921881357331916371145369426,            // 17^-192
+    319002914345514633220184430371226516661,            // 17^-184
+    259057496842743054458415989246502258570,            // 17^-176
+    210376719623757394611528557965027181599,            // 17^-168
+    170843788344482468189688357828247614648,            // 17^-160
+    277479371939006412580670873073737346072,            // 17^-152
+    225336848935989032116058614991615739830,            // 17^-144
+    182992685667322765043701960137104341962,            // 17^-136
+    297211247657519026846228781764556419486,            // 17^-128
+    241360810165739638162969982622013142483,            // 17^-120
+    196005504983412884662857445298594989473,            // 17^-112
+    318346279641847361755138868550752397781,            // 17^-104
+    258524253618237975606418771469177669493,            // 17^-96
+    209943680774466452613153056292584472116,            // 17^-88
+    170492123969995067410761994182235561833,            // 17^-80
+    276908209178500704519431941303594138118,            // 17^-72
+    224873016198504574919954139464723650485,            // 17^-64
+    182616014036679619640392724861134514431,            // 17^-56
+    296599468859408121472112670217716316867,            // 17^-48
+    240863993751428088431121063565557553364,            // 17^-40
+    195602047802007523394399179976814437447,            // 17^-32
+    317690996553211397504541477525504659745,            // 17^-24
+    257992108020089771434235624403421929746,            // 17^-16
+    209511533291127649202286079418781645629,            // 17^-8
+    170141183460469231731687303715884105728,            // 17^0
+    276338222097818360804550122558443225088,            // 17^8
+    224410138213025296601555690180338253824,            // 17^16
+    182240117745863932172015090234506084352,            // 17^24
+    295988949345058405730513287165118905920,            // 17^32
+    240368199982629535993820184805831872348,            // 17^40
+    195199421095732140407812372336079928061,            // 17^48
+    317037062297446153078380490386689107619,            // 17^56
+    257461057788947429232455063849242347039,            // 17^64
+    209080275338955809947349984471742343690,            // 17^72
+    339581930651806711314806824645491109283,            // 17^80
+    275769408276943332346622203534744539377,            // 17^88
+    223948213014292349032159641795245781843,            // 17^96
+    181864995198918377644202761532864575404,            // 17^104
+    295379686522363719531147616048257012833,            // 17^112
+    239873426754333326759263874720553852658,            // 17^120
+    194797623155139058727680168785666503632,            // 17^128
+    316384474098117832632118586933880356805,            // 17^136
+    256931100670110578075784008065054807112,            // 17^144
+    208649905086942477070838417411852870460,            // 17^152
+    338882936158725697632383782036927673666,            // 17^160
+    275201765300840924300371814765015192837,            // 17^168
+    223487238641092167380922055560365365575,            // 17^176
+    181490644803170745141604509031893001355,            // 17^184
+    294771677804553486829405243638525556429,            // 17^192
+    239379671965861754658715697694088165244,            // 17^200
+    194396652274299323679629299288271234884,            // 17^208
+    315733229184507643855046849844924656388,            // 17^216
+    256402234413519915955050497805856036474,            // 17^224
+    208220420707848135466354215936729966175,            // 17^232
+    338185380473947645648707735110624890484,            // 17^240
+    274635290759447542459052551448368297186,            // 17^248
+];
+const BASE17_LARGE_EXPONENT: [i32; 67] = [
+    -1272,                                              // 17^-280
+    -1239,                                              // 17^-272
+    -1207,                                              // 17^-264
+    -1174,                                              // 17^-256
+    -1141,                                              // 17^-248
+    -1108,                                              // 17^-240
+    -1076,                                              // 17^-232
+    -1043,                                              // 17^-224
+    -1010,                                              // 17^-216
+    -978,                                               // 17^-208
+    -945,                                               // 17^-200
+    -912,                                               // 17^-192
+    -880,                                               // 17^-184
+    -847,                                               // 17^-176
+    -814,                                               // 17^-168
+    -781,                                               // 17^-160
+    -749,                                               // 17^-152
+    -716,                                               // 17^-144
+    -683,                                               // 17^-136
+    -651,                                               // 17^-128
+    -618,                                               // 17^-120
+    -585,                                               // 17^-112
+    -553,                                               // 17^-104
+    -520,                                               // 17^-96
+    -487,                                               // 17^-88
+    -454,                                               // 17^-80
+    -422,                                               // 17^-72
+    -389,                                               // 17^-64
+    -356,                                               // 17^-56
+    -324,                                               // 17^-48
+    -291,                                               // 17^-40
+    -258,                                               // 17^-32
+    -226,                                               // 17^-24
+    -193,                                               // 17^-16
+    -160,                                               // 17^-8
+    -127,                                               // 17^0
+    -95,                                                // 17^8
+    -62,                                                // 17^16
+    -29,                                                // 17^24
+    3,                                                  // 17^32
+    36,                                                 // 17^40
+    69,                                                 // 17^48
+    101,                                                // 17^56
+    134,                                                // 17^64
+    167,                                                // 17^72
+    199,                                                // 17^80
+    232,                                                // 17^88
+    265,                                                // 17^96
+    298,                                                // 17^104
+    330,                                                // 17^112
+    363,                                                // 17^120
+    396,                                                // 17^128
+    428,                                                // 17^136
+    461,                                                // 17^144
+    494,                                                // 17^152
+    526,                                                // 17^160
+    559,                                                // 17^168
+    592,                                                // 17^176
+    625,                                                // 17^184
+    657,                                                // 17^192
+    690,                                                // 17^200
+    723,                                                // 17^208
+    755,                                                // 17^216
+    788,                                                // 17^224
+    821,                                                // 17^232
+    853,                                                // 17^240
+    886,                                                // 17^248
+];
+const BASE17_SMALL_INT_POWERS: [u128; 8] = [1, 17, 289, 4913, 83521, 1419857, 24137569, 410338673];
+const BASE17_STEP: i32 = 8;
+const BASE17_BIAS: i32 = 280;
+
+// BASE18
+
+const BASE18_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 18^0
+    191408831393027885698148216680369618944,            // 18^1
+    215334935317156371410416743765415821312,            // 18^2
+    242251802231800917836718836736092798976,            // 18^3
+    272533277510776032566308691328104398848,            // 18^4
+    306599937199623036637097277744117448704,            // 18^5
+    172462464674787958108367218731066064896,            // 18^6
+];
+const BASE18_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 18^0
+    -123,                                               // 18^1
+    -119,                                               // 18^2
+    -115,                                               // 18^3
+    -111,                                               // 18^4
+    -107,                                               // 18^5
+    -102,                                               // 18^6
+];
+const BASE18_LARGE_MANTISSA: [u128; 75] = [
+    259764989429046712145887613713888779974,            // 18^-273
+    296222660952677279411722167462707735076,            // 18^-266
+    337797118290463899238253918549284876092,            // 18^-259
+    192603247770383575639211190527648274245,            // 18^-252
+    219634857984796466920734002291401705412,            // 18^-245
+    250460318818255417964791343261171179660,            // 18^-238
+    285612092170198511649999639102587856294,            // 18^-231
+    325697370261002112643262654266086944683,            // 18^-224
+    185704281966673733437923590446998072591,            // 18^-217
+    211767631486382365261996259087726574961,            // 18^-210
+    241488937521646207617474790890828249100,            // 18^-203
+    275381589414827976227270551469877695982,            // 18^-196
+    314031030021154964119856834958393443507,            // 18^-189
+    179052434161812488744424286609186187994,            // 18^-182
+    204182205669996766442639895844185984708,            // 18^-175
+    232838907258801165579649662968151663564,            // 18^-168
+    265517538884334791214783518037108753711,            // 18^-161
+    302782573089615796089597203369720463425,            // 18^-154
+    172638852694972345186098175788410725025,            // 18^-147
+    196868486555962367745019627988939060464,            // 18^-140
+    224498717373391335032231518045098273537,            // 18^-133
+    256006814417050404626793229969178591795,            // 18^-126
+    291937031065346039954998156631577529912,            // 18^-119
+    332910005936047335476283449703688561122,            // 18^-112
+    189816741726628588213403698819375225722,            // 18^-105
+    216457269515865090355509585365869594574,            // 18^-98
+    246836760024792608106756526472045881483,            // 18^-91
+    281479971709018296242657937208050445965,            // 18^-84
+    320985312176969416466104839150917967197,            // 18^-77
+    183017587375374702561553597022155160742,            // 18^-70
+    208703862874796048578293668364396201854,            // 18^-63
+    237995173051452727716558620615765508935,            // 18^-56
+    271397479737933588417468230506889186025,            // 18^-49
+    309487755838552588810803796052767101096,            // 18^-42
+    176461975819512133258798291874254633040,            // 18^-35
+    201228179937237770199942876645925476060,            // 18^-28
+    229470287934835004924643178169318563534,            // 18^-21
+    261676138308856451194147028266269550444,            // 18^-14
+    298402037041419227483658365640566588740,            // 18^-7
+    170141183460469231731687303715884105728,            // 18^0
+    194020272759136452871913121072449323008,            // 18^7
+    221250760550139932836609227367108313088,            // 18^14
+    252303011164126931290527343657214803968,            // 18^21
+    287713403941314941508226937857819803648,            // 18^28
+    328093598350474163167634651360244400128,            // 18^35
+    187070549727531559196917812917453861026,            // 18^42
+    213325653114257310428744028742785781912,            // 18^49
+    243265625417291205836310243227923719532,            // 18^56
+    277407633098725295421526662764935275289,            // 18^63
+    316341426247257477645159711999449660471,            // 18^70
+    180369762796928745579122531717097251784,            // 18^77
+    205684419630781050995309380627725821797,            // 18^84
+    234551954955343535589691141355422293223,            // 18^91
+    267471010551644448060009348077202513313,            // 18^98
+    305010211912915299914630616083972269987,            // 18^105
+    173908995182860443486855135343139262701,            // 18^112
+    198316891856377323275537495574245323224,            // 18^119
+    226150404435492799169987273137391228527,            // 18^126
+    257890313566309108293837274983090159159,            // 18^133
+    294084876820548989626661915132664622178,            // 18^140
+    335359298992515654651080492391625827617,            // 18^147
+    191213265769831372286179520084128641258,            // 18^154
+    218049793855157992570938056229892893589,            // 18^161
+    248652793041613380567795520750960012282,            // 18^168
+    283550882549632193861238568804430594202,            // 18^175
+    323346872605688987884591669129361771279,            // 18^182
+    184364088525767284952804747951506893851,            // 18^189
+    210239343674659878049714940191476577896,            // 18^196
+    239746156543789930881397013133212694240,            // 18^203
+    273394211439632029990640781047045990695,            // 18^210
+    311764726184655516350818907233192566650,            // 18^217
+    177760245875679923341865534533290364422,            // 18^224
+    202708660472811443153981984577454872377,            // 18^231
+    231158551948781603682221903513060749406,            // 18^238
+    263601347936609267755115798860540547258,            // 18^245
+];
+const BASE18_LARGE_EXPONENT: [i32; 75] = [
+    -1266,                                              // 18^-273
+    -1237,                                              // 18^-266
+    -1208,                                              // 18^-259
+    -1178,                                              // 18^-252
+    -1149,                                              // 18^-245
+    -1120,                                              // 18^-238
+    -1091,                                              // 18^-231
+    -1062,                                              // 18^-224
+    -1032,                                              // 18^-217
+    -1003,                                              // 18^-210
+    -974,                                               // 18^-203
+    -945,                                               // 18^-196
+    -916,                                               // 18^-189
+    -886,                                               // 18^-182
+    -857,                                               // 18^-175
+    -828,                                               // 18^-168
+    -799,                                               // 18^-161
+    -770,                                               // 18^-154
+    -740,                                               // 18^-147
+    -711,                                               // 18^-140
+    -682,                                               // 18^-133
+    -653,                                               // 18^-126
+    -624,                                               // 18^-119
+    -595,                                               // 18^-112
+    -565,                                               // 18^-105
+    -536,                                               // 18^-98
+    -507,                                               // 18^-91
+    -478,                                               // 18^-84
+    -449,                                               // 18^-77
+    -419,                                               // 18^-70
+    -390,                                               // 18^-63
+    -361,                                               // 18^-56
+    -332,                                               // 18^-49
+    -303,                                               // 18^-42
+    -273,                                               // 18^-35
+    -244,                                               // 18^-28
+    -215,                                               // 18^-21
+    -186,                                               // 18^-14
+    -157,                                               // 18^-7
+    -127,                                               // 18^0
+    -98,                                                // 18^7
+    -69,                                                // 18^14
+    -40,                                                // 18^21
+    -11,                                                // 18^28
+    18,                                                 // 18^35
+    48,                                                 // 18^42
+    77,                                                 // 18^49
+    106,                                                // 18^56
+    135,                                                // 18^63
+    164,                                                // 18^70
+    194,                                                // 18^77
+    223,                                                // 18^84
+    252,                                                // 18^91
+    281,                                                // 18^98
+    310,                                                // 18^105
+    340,                                                // 18^112
+    369,                                                // 18^119
+    398,                                                // 18^126
+    427,                                                // 18^133
+    456,                                                // 18^140
+    485,                                                // 18^147
+    515,                                                // 18^154
+    544,                                                // 18^161
+    573,                                                // 18^168
+    602,                                                // 18^175
+    631,                                                // 18^182
+    661,                                                // 18^189
+    690,                                                // 18^196
+    719,                                                // 18^203
+    748,                                                // 18^210
+    777,                                                // 18^217
+    807,                                                // 18^224
+    836,                                                // 18^231
+    865,                                                // 18^238
+    894,                                                // 18^245
+];
+const BASE18_SMALL_INT_POWERS: [u128; 7] = [1, 18, 324, 5832, 104976, 1889568, 34012224];
+const BASE18_STEP: i32 = 7;
+const BASE18_BIAS: i32 = 273;
+
+// BASE19
+
+const BASE19_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 19^0
+    202042655359307212681378673162612375552,            // 19^1
+    239925653239177315059137174380602195968,            // 19^2
+    284911713221523061632725394576965107712,            // 19^3
+    338332659450558635688861406060146065408,            // 19^4
+    200885016548769189940261459848211726336,            // 19^5
+    238550957151663413054060483569751425024,            // 19^6
+];
+const BASE19_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 19^0
+    -123,                                               // 19^1
+    -119,                                               // 19^2
+    -115,                                               // 19^3
+    -111,                                               // 19^4
+    -106,                                               // 19^5
+    -102,                                               // 19^6
+];
+const BASE19_LARGE_MANTISSA: [u128; 74] = [
+    211773375714873706954526795446522416463,            // 19^-273
+    176297720171655089222657736919708805072,            // 19^-266
+    293529685049453215881543661471874663538,            // 19^-259
+    244358452058655253685245151337508023797,            // 19^-252
+    203424239979142604035433607238695466107,            // 19^-245
+    338694414393807804581041366088196084612,            // 19^-238
+    281957318246159342222500231430112814088,            // 19^-231
+    234724654242834897063227749239967575385,            // 19^-224
+    195404267752744776874588226122954622761,            // 19^-217
+    325341434449269614607198466720898964379,            // 19^-210
+    270841190386491955899443752473167688523,            // 19^-203
+    225470667559284387835624717321131334248,            // 19^-196
+    187700481810335462307725392489901825033,            // 19^-189
+    312514893872556142260088491662230499613,            // 19^-182
+    260163314313871975296322899252180920269,            // 19^-175
+    216581518007204247993872678149555585108,            // 19^-168
+    180300416551865148993646942230063074210,            // 19^-161
+    300194037865176954165930472692882676095,            // 19^-154
+    249906412012854191998973084780461202007,            // 19^-147
+    208042821933683442841807340743863291908,            // 19^-140
+    173192097831823827445985218112992713522,            // 19^-133
+    288358929883670982310136287441393538062,            // 19^-126
+    240053886651337192078493312543483732688,            // 19^-119
+    199840762759316398351061941853830886312,            // 19^-112
+    332728047167428932050765437002481330484,            // 19^-105
+    276990419380016367557580152018464109110,            // 19^-98
+    230589795725005243268941857960660823918,            // 19^-91
+    191962068621409314298003076822671000161,            // 19^-84
+    319610290416807823632571053703933063036,            // 19^-77
+    266070110813870135824430347248350305665,            // 19^-70
+    221498825260546806854707890357129976717,            // 19^-63
+    184393990898599943457278294759382590034,            // 19^-56
+    307009699392470911375170613720126268120,            // 19^-49
+    255580333886495993526502175170654921405,            // 19^-42
+    212766265035907553834903279232863277537,            // 19^-35
+    177124283582141234157272719875613305569,            // 19^-28
+    294905884907949220984741236292709278206,            // 19^-21
+    245504114948215358970059027289947453449,            // 19^-14
+    204377984777481442195434041001194890061,            // 19^-7
+    170141183460469231731687303715884105728,            // 19^0
+    283279261617600303001696824239079817216,            // 19^7
+    235825149533115640143913831779140632576,            // 19^14
+    196320411295724208786653789764804673536,            // 19^21
+    326866782169983241283381922259938632192,            // 19^28
+    272111016325296008481488740678554545334,            // 19^35
+    226527775976573799542251126784141726274,            // 19^42
+    188580506522192103284103254483314456872,            // 19^49
+    313980104972594785419533005246072709649,            // 19^56
+    261383077542535819285819131850454151532,            // 19^63
+    217596950072905364683647533344696965413,            // 19^70
+    181145746412467300065049161663171614429,            // 19^77
+    301601483222404786925353682146130769038,            // 19^84
+    251078086246727305139312855014591629283,            // 19^91
+    209018220732132084019166621358085321302,            // 19^98
+    174004100680832526758226172220060851297,            // 19^105
+    289710886904423785696066284771374024143,            // 19^112
+    241179367792317286239104434314982328918,            // 19^119
+    200777706596478115292553836948931709029,            // 19^126
+    334288026667806625723834320874258952107,            // 19^133
+    278289075684203471850125042859239363909,            // 19^140
+    231670904929322723497179168675130067798,            // 19^147
+    192862073578757583112120353708241916963,            // 19^154
+    321108767943438131876044073228689471164,            // 19^161
+    267317567774791732969648063348207624890,            // 19^168
+    222537311885602256946640972609673172416,            // 19^175
+    185258513286308067365753274779077551187,            // 19^182
+    308449099652072036761706748552096805527,            // 19^189
+    256778610031103646805005837172547824357,            // 19^196
+    213763809470930565948441961387708938512,            // 19^203
+    177954722295557497937779873950595261616,            // 19^210
+    296288537013515928119667265056482304979,            // 19^217
+    246655149223317717362685108852956230915,            // 19^224
+    205336201162591117777390249036062770913,            // 19^231
+    170938882243688352586356584716130516258,            // 19^238
+];
+const BASE19_LARGE_EXPONENT: [i32; 74] = [
+    -1287,                                              // 19^-273
+    -1257,                                              // 19^-266
+    -1228,                                              // 19^-259
+    -1198,                                              // 19^-252
+    -1168,                                              // 19^-245
+    -1139,                                              // 19^-238
+    -1109,                                              // 19^-231
+    -1079,                                              // 19^-224
+    -1049,                                              // 19^-217
+    -1020,                                              // 19^-210
+    -990,                                               // 19^-203
+    -960,                                               // 19^-196
+    -930,                                               // 19^-189
+    -901,                                               // 19^-182
+    -871,                                               // 19^-175
+    -841,                                               // 19^-168
+    -811,                                               // 19^-161
+    -782,                                               // 19^-154
+    -752,                                               // 19^-147
+    -722,                                               // 19^-140
+    -692,                                               // 19^-133
+    -663,                                               // 19^-126
+    -633,                                               // 19^-119
+    -603,                                               // 19^-112
+    -574,                                               // 19^-105
+    -544,                                               // 19^-98
+    -514,                                               // 19^-91
+    -484,                                               // 19^-84
+    -455,                                               // 19^-77
+    -425,                                               // 19^-70
+    -395,                                               // 19^-63
+    -365,                                               // 19^-56
+    -336,                                               // 19^-49
+    -306,                                               // 19^-42
+    -276,                                               // 19^-35
+    -246,                                               // 19^-28
+    -217,                                               // 19^-21
+    -187,                                               // 19^-14
+    -157,                                               // 19^-7
+    -127,                                               // 19^0
+    -98,                                                // 19^7
+    -68,                                                // 19^14
+    -38,                                                // 19^21
+    -9,                                                 // 19^28
+    21,                                                 // 19^35
+    51,                                                 // 19^42
+    81,                                                 // 19^49
+    110,                                                // 19^56
+    140,                                                // 19^63
+    170,                                                // 19^70
+    200,                                                // 19^77
+    229,                                                // 19^84
+    259,                                                // 19^91
+    289,                                                // 19^98
+    319,                                                // 19^105
+    348,                                                // 19^112
+    378,                                                // 19^119
+    408,                                                // 19^126
+    437,                                                // 19^133
+    467,                                                // 19^140
+    497,                                                // 19^147
+    527,                                                // 19^154
+    556,                                                // 19^161
+    586,                                                // 19^168
+    616,                                                // 19^175
+    646,                                                // 19^182
+    675,                                                // 19^189
+    705,                                                // 19^196
+    735,                                                // 19^203
+    765,                                                // 19^210
+    794,                                                // 19^217
+    824,                                                // 19^224
+    854,                                                // 19^231
+    884,                                                // 19^238
+];
+const BASE19_SMALL_INT_POWERS: [u128; 7] = [1, 19, 361, 6859, 130321, 2476099, 47045881];
+const BASE19_STEP: i32 = 7;
+const BASE19_BIAS: i32 = 273;
+
+// BASE20
+
+const BASE20_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 20^0
+    212676479325586539664609129644855132160,            // 20^1
+    265845599156983174580761412056068915200,            // 20^2
+    332306998946228968225951765070086144000,            // 20^3
+    207691874341393105141219853168803840000,            // 20^4
+    259614842926741381426524816461004800000,            // 20^5
+    324518553658426726783156020576256000000,            // 20^6
+];
+const BASE20_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 20^0
+    -123,                                               // 20^1
+    -119,                                               // 20^2
+    -115,                                               // 20^3
+    -110,                                               // 20^4
+    -106,                                               // 20^5
+    -102,                                               // 20^6
+];
+const BASE20_LARGE_MANTISSA: [u128; 72] = [
+    219444962751747547330237450047488370802,            // 20^-266
+    261598781051334795153424084243164504531,            // 20^-259
+    311850048364799970571308236412006025948,            // 20^-252
+    185877113559722882849757812268737570016,            // 20^-245
+    221582786512044528543660416923448526878,            // 20^-238
+    264147265567832623176169892458258303259,            // 20^-231
+    314888078651228693933689466069052580904,            // 20^-224
+    187687920720117505749278942387731421532,            // 20^-217
+    223741436863085634409521749481834675708,            // 20^-210
+    266720577315194170963194071628850311885,            // 20^-203
+    317955705303185189918510999237120523316,            // 20^-196
+    189516368689051383685178160212707831452,            // 20^-189
+    225921116696657399755928707376370229068,            // 20^-182
+    269318958159276723570738682003462587676,            // 20^-175
+    321053216647239593947814323906257853121,            // 20^-168
+    191362629322552438943275406304751547051,            // 20^-161
+    228122030881109760932058580285014566244,            // 20^-154
+    271942652322184754529069161754863937192,            // 20^-147
+    324180903818827574883781864350871964922,            // 20^-140
+    193226876150862917234767594546599367214,            // 20^-133
+    230344386280611654799899571593522271174,            // 20^-126
+    274591906405224388599276031963255728690,            // 20^-119
+    327339060789614187001318969682759915221,            // 20^-112
+    195109284394749514461349826862072894109,            // 20^-105
+    232588391774594204975783618524161450993,            // 20^-98
+    277266969412081485957841418414308370343,            // 20^-91
+    330527984395124299475957654016385519914,            // 20^-84
+    197010030981972396061395200500718069025,            // 20^-77
+    234854258277383322788948059678933702737,            // 20^-70
+    279968092772225526319680285071055534765,            // 20^-63
+    333747974362642200374222141588992517906,            // 20^-56
+    198929294563914656862152899258728336040,            // 20^-49
+    237142198758023568227473377297792835283,            // 20^-42
+    282695530364541492733327600118866962532,            // 20^-35
+    336999333339382997433337688587745383420,            // 20^-28
+    200867255532373784442745261542645325315,            // 20^-21
+    239452428260295134118491722992235809940,            // 20^-14
+    285449538541191976211657193889899027276,            // 20^-7
+    170141183460469231731687303715884105728,            // 20^0
+    202824096036516704239472512860160000000,            // 20^7
+    241785163922925834941235200000000000000,            // 20^14
+    288230376151711744000000000000000000000,            // 20^21
+    171798691840000000000000000000000000000,            // 20^28
+    204800000000000000000000000000000000000,            // 20^35
+    244140625000000000000000000000000000000,            // 20^42
+    291038304567337036132812500000000000000,            // 20^49
+    173472347597680709441192448139190673828,            // 20^56
+    206795153138256918717852173017490713391,            // 20^63
+    246519032881566189191165176650870696772,            // 20^70
+    293873587705571876992184134305561419454,            // 20^77
+    175162308040602133865466197911239516410,            // 20^84
+    208809742975952784854729411496209521782,            // 20^91
+    248920611114445668285762562151204969623,            // 20^98
+    296736492054993710858538820923811161069,            // 20^105
+    176868732008334225927912486150152183216,            // 20^112
+    210843958864610464486971481025400380154,            // 20^119
+    251345585423243599518503524095297312920,            // 20^126
+    299627286700300692937974362486955300474,            // 20^133
+    178591779887855465971216179422709524914,            // 20^140
+    212897992000407535995502685812365442412,            // 20^147
+    253794183731564922327402455583054354682,            // 20^154
+    302546243347602990063908643225496238091,            // 20^161
+    180331613628627651967947866455016278082,            // 20^168
+    214972035442146840057310898846407268146,            // 20^175
+    256266636183436918326986907537468991453,            // 20^182
+    305493636349960468205197939321361769978,            // 20^189
+    182088396757817547443627082897044283139,            // 20^196
+    217066284129402097992452481862359384464,            // 20^203
+    258763175164940474024358370140027266101,            // 20^210
+    308469742733169167070816004443201143863,            // 20^217
+    183862294395666818064937594201088633455,            // 20^224
+    219180934900840303975269310714112083263,            // 20^231
+];
+const BASE20_LARGE_EXPONENT: [i32; 72] = [
+    -1277,                                              // 20^-266
+    -1247,                                              // 20^-259
+    -1217,                                              // 20^-252
+    -1186,                                              // 20^-245
+    -1156,                                              // 20^-238
+    -1126,                                              // 20^-231
+    -1096,                                              // 20^-224
+    -1065,                                              // 20^-217
+    -1035,                                              // 20^-210
+    -1005,                                              // 20^-203
+    -975,                                               // 20^-196
+    -944,                                               // 20^-189
+    -914,                                               // 20^-182
+    -884,                                               // 20^-175
+    -854,                                               // 20^-168
+    -823,                                               // 20^-161
+    -793,                                               // 20^-154
+    -763,                                               // 20^-147
+    -733,                                               // 20^-140
+    -702,                                               // 20^-133
+    -672,                                               // 20^-126
+    -642,                                               // 20^-119
+    -612,                                               // 20^-112
+    -581,                                               // 20^-105
+    -551,                                               // 20^-98
+    -521,                                               // 20^-91
+    -491,                                               // 20^-84
+    -460,                                               // 20^-77
+    -430,                                               // 20^-70
+    -400,                                               // 20^-63
+    -370,                                               // 20^-56
+    -339,                                               // 20^-49
+    -309,                                               // 20^-42
+    -279,                                               // 20^-35
+    -249,                                               // 20^-28
+    -218,                                               // 20^-21
+    -188,                                               // 20^-14
+    -158,                                               // 20^-7
+    -127,                                               // 20^0
+    -97,                                                // 20^7
+    -67,                                                // 20^14
+    -37,                                                // 20^21
+    -6,                                                 // 20^28
+    24,                                                 // 20^35
+    54,                                                 // 20^42
+    84,                                                 // 20^49
+    115,                                                // 20^56
+    145,                                                // 20^63
+    175,                                                // 20^70
+    205,                                                // 20^77
+    236,                                                // 20^84
+    266,                                                // 20^91
+    296,                                                // 20^98
+    326,                                                // 20^105
+    357,                                                // 20^112
+    387,                                                // 20^119
+    417,                                                // 20^126
+    447,                                                // 20^133
+    478,                                                // 20^140
+    508,                                                // 20^147
+    538,                                                // 20^154
+    568,                                                // 20^161
+    599,                                                // 20^168
+    629,                                                // 20^175
+    659,                                                // 20^182
+    689,                                                // 20^189
+    720,                                                // 20^196
+    750,                                                // 20^203
+    780,                                                // 20^210
+    810,                                                // 20^217
+    841,                                                // 20^224
+    871,                                                // 20^231
+];
+const BASE20_SMALL_INT_POWERS: [u128; 7] = [1, 20, 400, 8000, 160000, 3200000, 64000000];
+const BASE20_STEP: i32 = 7;
+const BASE20_BIAS: i32 = 266;
+
+// BASE21
+
+const BASE21_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 21^0
+    223310303291865866647839586127097888768,            // 21^1
+    293094773070573949975289456791815979008,            // 21^2
+    192343444827564154671283706019629236224,            // 21^3
+    252450771336177953006059864150763372544,            // 21^4
+    331341637378733563320453571697876926464,            // 21^5
+    217442949529793900929047656426731732992,            // 21^6
+];
+const BASE21_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 21^0
+    -123,                                               // 21^1
+    -119,                                               // 21^2
+    -114,                                               // 21^3
+    -110,                                               // 21^4
+    -106,                                               // 21^5
+    -101,                                               // 21^6
+];
+const BASE21_LARGE_MANTISSA: [u128; 72] = [
+    265792046637109917415346664544311644566,            // 21^-266
+    222919047571269915259553685343512655124,            // 21^-259
+    186961582932271121624867982904669033286,            // 21^-252
+    313608315425491608924946770674906010971,            // 21^-245
+    263022418727710133477288744271513099136,            // 21^-238
+    220596168374913987040298637494305910349,            // 21^-231
+    185013390634471631571140317809259206000,            // 21^-224
+    310340428541697166126551714455108139315,            // 21^-217
+    260281651120390792657949798157903984485,            // 21^-210
+    218297494233351046265168261721480533031,            // 21^-203
+    183085499048559996047315841365348324923,            // 21^-196
+    307106593958686861611740529249331599561,            // 21^-189
+    257569443082684061423017949935163592863,            // 21^-182
+    216022772923099798407562907443165238977,            // 21^-175
+    181177696635406520735133253192775193924,            // 21^-168
+    303906456841905544859103298218510174905,            // 21^-161
+    254885497015839035366704878377106222377,            // 21^-154
+    213771754848918589809660748287013123679,            // 21^-147
+    179289774060178761532557823153782969422,            // 21^-140
+    300739666054273966520895709937608788747,            // 21^-133
+    252229518422167527105381200194678741672,            // 21^-126
+    211544193016418411141172507362190098875,            // 21^-119
+    177421524169372127003871154186445625381,            // 21^-112
+    297605874117660039208334869188863219128,            // 21^-105
+    249601215872730120248972738434931034589,            // 21^-98
+    209339843004961281067680970866486691183,            // 21^-91
+    175572741968079828414917198043029764862,            // 21^-84
+    294504737174751578579986057113044461622,            // 21^-77
+    247000300975358943781849899984000214119,            // 21^-70
+    207158462940841036386486635842909509778,            // 21^-63
+    173743224597499683284324187350601048284,            // 21^-56
+    291435914951326341195521446658582144907,            // 21^-49
+    244426488343013658131803347774089798564,            // 21^-42
+    204999813470743585875109991683322467328,            // 21^-35
+    171932771312675304370424739613867083896,            // 21^-28
+    288399070718915219190771894363169343679,            // 21^-21
+    241879495562467180767563428674995339169,            // 21^-14
+    202863657735483715761934442388454879916,            // 21^-7
+    170141183460469231731687303715884105728,            // 21^0
+    285393871257854494969375049060085399552,            // 21^7
+    239359043163317715346200180609446313984,            // 21^14
+    200749761344015565073276401119215484928,            // 21^21
+    336736528915531181897146582027467512352,            // 21^28
+    282419986820723101796180638245767114566,            // 21^35
+    236864854587323684235605162154192799609,            // 21^42
+    198657892347713919139770232958888414539,            // 21^49
+    333227639539799771559276379603105082665,            // 21^56
+    279477091096160878422591085338554667498,            // 21^63
+    234396656158058199668034426556911280906,            // 21^70
+    196587821214923499260650393397155679946,            // 21^77
+    329755313778627116894330266634709348105,            // 21^84
+    276564861173063847678827937275753188756,            // 21^91
+    231954177050879743842271364358265802922,            // 21^98
+    194539320805773455930561882331086488568,            // 21^105
+    326319170628861950820780822968026849107,            // 21^112
+    273682977505152590337309001442167333935,            // 21^119
+    229537149263215762988196018745023784859,            // 21^126
+    192512166347254302133159603748230049238,            // 21^133
+    322918833057513041780316846850363342758,            // 21^140
+    270831123875909826489436864951365328546,            // 21^147
+    227145307585155914742230901032159391581,            // 21^154
+    190506135408554552002160365053046193282,            // 21^161
+    319553927960379009120613001977483142041,            // 21^168
+    268008987363883357189628558586004761583,            // 21^175
+    224778389570351742159039695242233732277,            // 21^182
+    188521007876654358646847770858984158583,            // 21^189
+    316224086121109227441755855330741121363,            // 21^196
+    265216258308350559209803685525363124313,            // 21^203
+    222436135507219581307712678266362793773,            // 21^210
+    186556565932173473138426942632517671964,            // 21^217
+    312928942170691327838033505846831903751,            // 21^224
+    262452630275340665419193194878653363790,            // 21^231
+];
+const BASE21_LARGE_EXPONENT: [i32; 72] = [
+    -1296,                                              // 21^-266
+    -1265,                                              // 21^-259
+    -1234,                                              // 21^-252
+    -1204,                                              // 21^-245
+    -1173,                                              // 21^-238
+    -1142,                                              // 21^-231
+    -1111,                                              // 21^-224
+    -1081,                                              // 21^-217
+    -1050,                                              // 21^-210
+    -1019,                                              // 21^-203
+    -988,                                               // 21^-196
+    -958,                                               // 21^-189
+    -927,                                               // 21^-182
+    -896,                                               // 21^-175
+    -865,                                               // 21^-168
+    -835,                                               // 21^-161
+    -804,                                               // 21^-154
+    -773,                                               // 21^-147
+    -742,                                               // 21^-140
+    -712,                                               // 21^-133
+    -681,                                               // 21^-126
+    -650,                                               // 21^-119
+    -619,                                               // 21^-112
+    -589,                                               // 21^-105
+    -558,                                               // 21^-98
+    -527,                                               // 21^-91
+    -496,                                               // 21^-84
+    -466,                                               // 21^-77
+    -435,                                               // 21^-70
+    -404,                                               // 21^-63
+    -373,                                               // 21^-56
+    -343,                                               // 21^-49
+    -312,                                               // 21^-42
+    -281,                                               // 21^-35
+    -250,                                               // 21^-28
+    -220,                                               // 21^-21
+    -189,                                               // 21^-14
+    -158,                                               // 21^-7
+    -127,                                               // 21^0
+    -97,                                                // 21^7
+    -66,                                                // 21^14
+    -35,                                                // 21^21
+    -5,                                                 // 21^28
+    26,                                                 // 21^35
+    57,                                                 // 21^42
+    88,                                                 // 21^49
+    118,                                                // 21^56
+    149,                                                // 21^63
+    180,                                                // 21^70
+    211,                                                // 21^77
+    241,                                                // 21^84
+    272,                                                // 21^91
+    303,                                                // 21^98
+    334,                                                // 21^105
+    364,                                                // 21^112
+    395,                                                // 21^119
+    426,                                                // 21^126
+    457,                                                // 21^133
+    487,                                                // 21^140
+    518,                                                // 21^147
+    549,                                                // 21^154
+    580,                                                // 21^161
+    610,                                                // 21^168
+    641,                                                // 21^175
+    672,                                                // 21^182
+    703,                                                // 21^189
+    733,                                                // 21^196
+    764,                                                // 21^203
+    795,                                                // 21^210
+    826,                                                // 21^217
+    856,                                                // 21^224
+    887,                                                // 21^231
+];
+const BASE21_SMALL_INT_POWERS: [u128; 7] = [1, 21, 441, 9261, 194481, 4084101, 85766121];
+const BASE21_STEP: i32 = 7;
+const BASE21_BIAS: i32 = 266;
+
+// BASE22
+
+const BASE22_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 22^0
+    233944127258145193631070042609340645376,            // 22^1
+    321673174979949641242721308587843387392,            // 22^2
+    221150307798715378354370899654142328832,            // 22^3
+    304081673223233645237259987024445702144,            // 22^4
+    209056150340973131100616241079306420224,            // 22^5
+    287452206718838055263347331484046327808,            // 22^6
+];
+const BASE22_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 22^0
+    -123,                                               // 22^1
+    -119,                                               // 22^2
+    -114,                                               // 22^3
+    -110,                                               // 22^4
+    -105,                                               // 22^5
+    -101,                                               // 22^6
+];
+const BASE22_LARGE_MANTISSA: [u128; 70] = [
+    170993699408656992611557257796811971606,            // 22^-259
+    198613611477559667549559644399735817047,            // 22^-252
+    230694854843066209807480559654047740794,            // 22^-245
+    267958050080955588510051414081700394572,            // 22^-238
+    311240216657766425412953324616068813788,            // 22^-231
+    180756787183491671385793896073455879749,            // 22^-224
+    209953690842110549054787911387661891558,            // 22^-217
+    243866650791248218437107825156701479612,            // 22^-210
+    283257432291885574825362738029166670391,            // 22^-203
+    329010845428281790557809997379933231677,            // 22^-196
+    191077310017213090920037889613280023761,            // 22^-189
+    221941245467987325560887198530024987097,            // 22^-182
+    257790506028392555656294807759853932728,            // 22^-175
+    299430350849140679073407301022315056449,            // 22^-168
+    173898054647064197545039940705011138943,            // 22^-161
+    201987095324676314922450395008827008097,            // 22^-154
+    234613243722037545951821958217296505941,            // 22^-147
+    272509360270263083361596599896866808472,            // 22^-140
+    316526681344939644363801942778159729297,            // 22^-133
+    183826970023851061892407973678416422311,            // 22^-126
+    213519787744680626489456759979414929795,            // 22^-119
+    248008764723795396613310192753363562635,            // 22^-112
+    288068604926548520494484698905215058937,            // 22^-105
+    334599147077506390730919115808572688418,            // 22^-98
+    194322788582847037606425160078121997271,            // 22^-91
+    225710952896522753756036626884027523975,            // 22^-84
+    262169118861406100263284327408804984594,            // 22^-77
+    304516223083230613247976703037939646270,            // 22^-70
+    176851740822108453297561032060281913714,            // 22^-63
+    205417878332621336576645714920472857997,            // 22^-56
+    238598187060653380400994399373084663429,            // 22^-49
+    277137975188549744820727493204211809261,            // 22^-42
+    321902937477411396463387072352875080544,            // 22^-35
+    186949300409097210175717446748311788922,            // 22^-28
+    217146455371525722164937611369356262209,            // 22^-21
+    252221233121680633945860233133208134270,            // 22^-14
+    292961496095243353908740467141073506540,            // 22^-7
+    170141183460469231731687303715884105728,            // 22^0
+    197623392119201162993551290395281850368,            // 22^7
+    229544689406569328704727047276706398208,            // 22^14
+    266622103131276669014944105065242165248,            // 22^21
+    309688479667831891620434363534947647488,            // 22^28
+    179855595827611186243917689814617910464,            // 22^35
+    208906933736774069538597567757512183241,            // 22^42
+    242650815297018604365857953016443636978,            // 22^49
+    281845207868958552685905724295461354592,            // 22^56
+    327370510177191550022527822209865447333,            // 22^63
+    190124664073591590972067520727552350138,            // 22^70
+    220834722526051754798575401303998056567,            // 22^77
+    256505250966711193359488809204377717494,            // 22^84
+    297937493800295372760917121026044042670,            // 22^91
+    173031058579617612943075122066206208260,            // 22^98
+    200980056932689281584830175015332323410,            // 22^105
+    233443542542281837469979323535186565406,            // 22^112
+    271150722048713022289973166238934106646,            // 22^119
+    314948587854906379895896832699151980516,            // 22^126
+    182910471789153927982518189465009158829,            // 22^133
+    212455251303071888680280266327561854998,            // 22^140
+    246772278069909496307705991140052073087,            // 22^147
+    286632393646709698979385809127728921005,            // 22^154
+    332930950470730393610585733499849696474,            // 22^161
+    193353961796034982060992467369794830962,            // 22^168
+    224585635486054469192295827945894724481,            // 22^175
+    260862033537650797156363766298784568546,            // 22^182
+    302998009619470597652934458975103615488,            // 22^189
+    175970018688269509849993361647138860754,            // 22^196
+    204393735233038880379975139336743154541,            // 22^203
+    237408618319925875163860351801153447367,            // 22^210
+    275756260280259146490263920764281465178,            // 22^217
+    320298039817924375055421761218548035863,            // 22^224
+];
+const BASE22_LARGE_EXPONENT: [i32; 70] = [
+    -1282,                                              // 22^-259
+    -1251,                                              // 22^-252
+    -1220,                                              // 22^-245
+    -1189,                                              // 22^-238
+    -1158,                                              // 22^-231
+    -1126,                                              // 22^-224
+    -1095,                                              // 22^-217
+    -1064,                                              // 22^-210
+    -1033,                                              // 22^-203
+    -1002,                                              // 22^-196
+    -970,                                               // 22^-189
+    -939,                                               // 22^-182
+    -908,                                               // 22^-175
+    -877,                                               // 22^-168
+    -845,                                               // 22^-161
+    -814,                                               // 22^-154
+    -783,                                               // 22^-147
+    -752,                                               // 22^-140
+    -721,                                               // 22^-133
+    -689,                                               // 22^-126
+    -658,                                               // 22^-119
+    -627,                                               // 22^-112
+    -596,                                               // 22^-105
+    -565,                                               // 22^-98
+    -533,                                               // 22^-91
+    -502,                                               // 22^-84
+    -471,                                               // 22^-77
+    -440,                                               // 22^-70
+    -408,                                               // 22^-63
+    -377,                                               // 22^-56
+    -346,                                               // 22^-49
+    -315,                                               // 22^-42
+    -284,                                               // 22^-35
+    -252,                                               // 22^-28
+    -221,                                               // 22^-21
+    -190,                                               // 22^-14
+    -159,                                               // 22^-7
+    -127,                                               // 22^0
+    -96,                                                // 22^7
+    -65,                                                // 22^14
+    -34,                                                // 22^21
+    -3,                                                 // 22^28
+    29,                                                 // 22^35
+    60,                                                 // 22^42
+    91,                                                 // 22^49
+    122,                                                // 22^56
+    153,                                                // 22^63
+    185,                                                // 22^70
+    216,                                                // 22^77
+    247,                                                // 22^84
+    278,                                                // 22^91
+    310,                                                // 22^98
+    341,                                                // 22^105
+    372,                                                // 22^112
+    403,                                                // 22^119
+    434,                                                // 22^126
+    466,                                                // 22^133
+    497,                                                // 22^140
+    528,                                                // 22^147
+    559,                                                // 22^154
+    590,                                                // 22^161
+    622,                                                // 22^168
+    653,                                                // 22^175
+    684,                                                // 22^182
+    715,                                                // 22^189
+    747,                                                // 22^196
+    778,                                                // 22^203
+    809,                                                // 22^210
+    840,                                                // 22^217
+    871,                                                // 22^224
+];
+const BASE22_SMALL_INT_POWERS: [u128; 7] = [1, 22, 484, 10648, 234256, 5153632, 113379904];
+const BASE22_STEP: i32 = 7;
+const BASE22_BIAS: i32 = 259;
+
+// BASE23
+
+const BASE23_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 23^0
+    244577951224424520614300499091583401984,            // 23^1
+    175790402442555124191528483722075570176,            // 23^2
+    252698703511172991025322195350483632128,            // 23^3
+    181627193148655587299450327908160110592,            // 23^4
+    261089090151192406742959846367980158976,            // 23^5
+    187657783546169542346502389576985739264,            // 23^6
+];
+const BASE23_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 23^0
+    -123,                                               // 23^1
+    -118,                                               // 23^2
+    -114,                                               // 23^3
+    -109,                                               // 23^4
+    -105,                                               // 23^5
+    -100,                                               // 23^6
+];
+const BASE23_LARGE_MANTISSA: [u128; 69] = [
+    177660070384959299518117426820409879479,            // 23^-252
+    281679224484842507661590842703493245235,            // 23^-245
+    223300557447880794264720046366338636067,            // 23^-238
+    177021003404592607294928857171705382014,            // 23^-231
+    280665986726726659567026238400885338462,            // 23^-224
+    222497315545222527698408099502330410230,            // 23^-217
+    176384235233432227183413281705333529169,            // 23^-210
+    279656393720034524921314175179274359595,            // 23^-203
+    221696963010873772243653930801015609536,            // 23^-196
+    175749757602354687973874432000535316950,            // 23^-189
+    278650432354108872233513992865613552171,            // 23^-182
+    220899489451391157505367921930602163472,            // 23^-175
+    175117562271981659025201047697761937562,            // 23^-168
+    277648089565453253577594524944387660343,            // 23^-161
+    220104884510717915806439152820624263438,            // 23^-154
+    174487641032572953025011241897191693675,            // 23^-147
+    276649352337562360960754521131809259049,            // 23^-140
+    219313137870049397588841701361789229875,            // 23^-133
+    173859985703919913633146478806481352851,            // 23^-126
+    275654207700752992922523689325318624601,            // 23^-119
+    218524239247699070573788964393354746146,            // 23^-112
+    173234588135239186624038395745277208596,            // 23^-105
+    274662642731995629169562809047557585825,            // 23^-98
+    217738178398965000940790150805824878955,            // 23^-91
+    172611440205066873148451849294509762826,            // 23^-84
+    273674644554746611058977369746265857416,            // 23^-77
+    216954945115996814791722634413562231827,            // 23^-70
+    171990533821153063740069798803230423676,            // 23^-63
+    272690200338780925750826785583705218666,            // 23^-56
+    216174529227663138172270874689475697712,            // 23^-49
+    171371860920356751697330024074687407971,            // 23^-42
+    271709297300025591858350535820526217684,            // 23^-35
+    215396920599419513929297198496715326537,            // 23^-28
+    170755413468541124475850272054650469150,            // 23^-21
+    270731922700393644432243678371210997948,            // 23^-14
+    214622109133176793688901966303396671549,            // 23^-7
+    170141183460469231731687303715884105728,            // 23^0
+    269758063847618717123097185016917000192,            // 23^7
+    213850084767170003246100602438595641344,            // 23^14
+    339058325839400057321133061640411938816,            // 23^21
+    268787708095090219373873551177395072962,            // 23^28
+    213080837475827679663192730864754774513,            // 23^35
+    337838687796969586566185112723027994705,            // 23^42
+    267820842841689106502015241773782572538,            // 23^49
+    212314357269641678380024305538561269739,            // 23^56
+    336623436955327832661614051077606366471,            // 23^63
+    266857455531624240538482847903341038248,            // 23^70
+    211550634195037448645447237257455979321,            // 23^77
+    335412557533128124785597638278283462337,            // 23^84
+    265897533654269339698691446779528819034,            // 23^91
+    210789658334244775585362676204225495858,            // 23^98
+    334206033805791401974785682123232789907,            // 23^105
+    264941064744000514367957679290425962065,            // 23^112
+    210031419805168987228793890184514974036,            // 23^119
+    333003850105302012456495057986285588216,            // 23^126
+    263988036380034387491686584861354377998,            // 23^133
+    209275908761262624819472661494385533289,            // 23^140
+    331805990820004247517955628678622148639,            // 23^147
+    263038436186266797268116360982380732098,            // 23^154
+    208523115391397574746439388866966551936,            // 23^161
+    330612440394399607270379273154482344971,            // 23^168
+    262092251831112080049001043331284413642,            // 23^175
+    207773029919737660433151703156509162570,            // 23^182
+    329423183328944795675128680336602321085,            // 23^189
+    261149471027342931361145730086041639640,            // 23^196
+    207025642605611692530569464171386341133,            // 23^203
+    328238204179850442208732821518504518810,            // 23^210
+    260210081531930842969216498623209392426,            // 23^217
+    206280943743386975765635578931435897048,            // 23^224
+];
+const BASE23_LARGE_EXPONENT: [i32; 69] = [
+    -1267,                                              // 23^-252
+    -1236,                                              // 23^-245
+    -1204,                                              // 23^-238
+    -1172,                                              // 23^-231
+    -1141,                                              // 23^-224
+    -1109,                                              // 23^-217
+    -1077,                                              // 23^-210
+    -1046,                                              // 23^-203
+    -1014,                                              // 23^-196
+    -982,                                               // 23^-189
+    -951,                                               // 23^-182
+    -919,                                               // 23^-175
+    -887,                                               // 23^-168
+    -856,                                               // 23^-161
+    -824,                                               // 23^-154
+    -792,                                               // 23^-147
+    -761,                                               // 23^-140
+    -729,                                               // 23^-133
+    -697,                                               // 23^-126
+    -666,                                               // 23^-119
+    -634,                                               // 23^-112
+    -602,                                               // 23^-105
+    -571,                                               // 23^-98
+    -539,                                               // 23^-91
+    -507,                                               // 23^-84
+    -476,                                               // 23^-77
+    -444,                                               // 23^-70
+    -412,                                               // 23^-63
+    -381,                                               // 23^-56
+    -349,                                               // 23^-49
+    -317,                                               // 23^-42
+    -286,                                               // 23^-35
+    -254,                                               // 23^-28
+    -222,                                               // 23^-21
+    -191,                                               // 23^-14
+    -159,                                               // 23^-7
+    -127,                                               // 23^0
+    -96,                                                // 23^7
+    -64,                                                // 23^14
+    -33,                                                // 23^21
+    -1,                                                 // 23^28
+    31,                                                 // 23^35
+    62,                                                 // 23^42
+    94,                                                 // 23^49
+    126,                                                // 23^56
+    157,                                                // 23^63
+    189,                                                // 23^70
+    221,                                                // 23^77
+    252,                                                // 23^84
+    284,                                                // 23^91
+    316,                                                // 23^98
+    347,                                                // 23^105
+    379,                                                // 23^112
+    411,                                                // 23^119
+    442,                                                // 23^126
+    474,                                                // 23^133
+    506,                                                // 23^140
+    537,                                                // 23^147
+    569,                                                // 23^154
+    601,                                                // 23^161
+    632,                                                // 23^168
+    664,                                                // 23^175
+    696,                                                // 23^182
+    727,                                                // 23^189
+    759,                                                // 23^196
+    791,                                                // 23^203
+    822,                                                // 23^210
+    854,                                                // 23^217
+    886,                                                // 23^224
+];
+const BASE23_SMALL_INT_POWERS: [u128; 7] = [1, 23, 529, 12167, 279841, 6436343, 148035889];
+const BASE23_STEP: i32 = 7;
+const BASE23_BIAS: i32 = 252;
+
+// BASE24
+
+const BASE24_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 24^0
+    255211775190703847597530955573826158592,            // 24^1
+    191408831393027885698148216680369618944,            // 24^2
+    287113247089541828547222325020554428416,            // 24^3
+    215334935317156371410416743765415821312,            // 24^4
+    323002402975734557115625115648123731968,            // 24^5
+    242251802231800917836718836736092798976,            // 24^6
+];
+const BASE24_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 24^0
+    -123,                                               // 24^1
+    -118,                                               // 24^2
+    -114,                                               // 24^3
+    -109,                                               // 24^4
+    -105,                                               // 24^5
+    -100,                                               // 24^6
+];
+const BASE24_LARGE_MANTISSA: [u128; 68] = [
+    256006814417050404626793229969178591795,            // 24^-252
+    273382276918988884237693747042282021609,            // 24^-245
+    291937031065346039954998156631577529912,            // 24^-238
+    311751116669878803408975082301396512655,            // 24^-231
+    332910005936047335476283449703688561122,            // 24^-224
+    177752486079622930343415992310050508587,            // 24^-217
+    189816741726628588213403698819375225722,            // 24^-210
+    202699811599676133995465766268541805984,            // 24^-203
+    216457269515865090355509585365869594574,            // 24^-196
+    231148461148045387015380597263260157877,            // 24^-189
+    246836760024792608106756526472045881483,            // 24^-182
+    263589840905381559535877208688654464260,            // 24^-175
+    281479971709018296242657937208050445965,            // 24^-168
+    300584325257628424747408646813479651038,            // 24^-161
+    320985312176969416466104839150917967197,            // 24^-154
+    171385468196052762160979317193129295473,            // 24^-147
+    183017587375374702561553597022155160742,            // 24^-140
+    195439191206027575440487166351295574484,            // 24^-133
+    208703862874796048578293668364396201854,            // 24^-126
+    222868822317958475703480592144987545632,            // 24^-119
+    237995173051452727716558620615765508935,            // 24^-112
+    254148165753675349373102394182948812519,            // 24^-105
+    271397479737933588417468230506889186025,            // 24^-98
+    289817523528740604428224130917268871991,            // 24^-91
+    309487755838552588810803796052767101096,            // 24^-84
+    330493028329548101430287061507520336961,            // 24^-77
+    176461975819512133258798291874254633040,            // 24^-70
+    188438643123668474334468683754392032451,            // 24^-63
+    201228179937237770199942876645925476060,            // 24^-56
+    214885756602899904017224155871405769601,            // 24^-49
+    229470287934835004924643178169318563534,            // 24^-42
+    245044687360099685434665347000146337133,            // 24^-35
+    261676138308856451194147028266269550444,            // 24^-28
+    279436384024154813848437280673013431065,            // 24^-21
+    298402037041419227483658365640566588740,            // 24^-14
+    318654909672648364505254319167929262488,            // 24^-7
+    170141183460469231731687303715884105728,            // 24^0
+    181688851673850688377539127552069599232,            // 24^7
+    194020272759136452871913121072449323008,            // 24^14
+    207188640880972374233825193254612631552,            // 24^21
+    221250760550139932836609227367108313088,            // 24^28
+    236267291661697281793781435669856387072,            // 24^35
+    252303011164126931290527343657214803968,            // 24^42
+    269427092488254686881046533485512097792,            // 24^49
+    287713403941314941508226937857819803648,            // 24^56
+    307240827353347547401607574753443315712,            // 24^63
+    328093598350474163167634651360244400128,            // 24^70
+    175180834861447020226468989874232056416,            // 24^77
+    187070549727531559196917812917453861026,            // 24^84
+    199767232545952890607255496509019333039,            // 24^91
+    213325653114257310428744028742785781912,            // 24^98
+    227804298516055047806476167412340090352,            // 24^105
+    243265625417291205836310243227923719532,            // 24^112
+    259776329486140560138677002900131432918,            // 24^119
+    277407633098725295421526662764935275289,            // 24^126
+    296235592571734482952577544661578831571,            // 24^133
+    316341426247257477645159711999449660471,            // 24^140
+    337811864845093800590802876046287308325,            // 24^147
+    180369762796928745579122531717097251784,            // 24^154
+    192611655877384358682393055110005707838,            // 24^161
+    205684419630781050995309380627725821797,            // 24^168
+    219644446158456132093135554410564634898,            // 24^175
+    234551954955343535589691141355422293223,            // 24^182
+    250471252679363433757155530343900661758,            // 24^189
+    267471010551644448060009348077202513313,            // 24^196
+    285624560584202347610957248166426707331,            // 24^203
+    305010211912915299914630616083972269987,            // 24^210
+    325711588600364141070945877624827809796,            // 24^217
+];
+const BASE24_LARGE_EXPONENT: [i32; 68] = [
+    -1283,                                              // 24^-252
+    -1251,                                              // 24^-245
+    -1219,                                              // 24^-238
+    -1187,                                              // 24^-231
+    -1155,                                              // 24^-224
+    -1122,                                              // 24^-217
+    -1090,                                              // 24^-210
+    -1058,                                              // 24^-203
+    -1026,                                              // 24^-196
+    -994,                                               // 24^-189
+    -962,                                               // 24^-182
+    -930,                                               // 24^-175
+    -898,                                               // 24^-168
+    -866,                                               // 24^-161
+    -834,                                               // 24^-154
+    -801,                                               // 24^-147
+    -769,                                               // 24^-140
+    -737,                                               // 24^-133
+    -705,                                               // 24^-126
+    -673,                                               // 24^-119
+    -641,                                               // 24^-112
+    -609,                                               // 24^-105
+    -577,                                               // 24^-98
+    -545,                                               // 24^-91
+    -513,                                               // 24^-84
+    -481,                                               // 24^-77
+    -448,                                               // 24^-70
+    -416,                                               // 24^-63
+    -384,                                               // 24^-56
+    -352,                                               // 24^-49
+    -320,                                               // 24^-42
+    -288,                                               // 24^-35
+    -256,                                               // 24^-28
+    -224,                                               // 24^-21
+    -192,                                               // 24^-14
+    -160,                                               // 24^-7
+    -127,                                               // 24^0
+    -95,                                                // 24^7
+    -63,                                                // 24^14
+    -31,                                                // 24^21
+    1,                                                  // 24^28
+    33,                                                 // 24^35
+    65,                                                 // 24^42
+    97,                                                 // 24^49
+    129,                                                // 24^56
+    161,                                                // 24^63
+    193,                                                // 24^70
+    226,                                                // 24^77
+    258,                                                // 24^84
+    290,                                                // 24^91
+    322,                                                // 24^98
+    354,                                                // 24^105
+    386,                                                // 24^112
+    418,                                                // 24^119
+    450,                                                // 24^126
+    482,                                                // 24^133
+    514,                                                // 24^140
+    546,                                                // 24^147
+    579,                                                // 24^154
+    611,                                                // 24^161
+    643,                                                // 24^168
+    675,                                                // 24^175
+    707,                                                // 24^182
+    739,                                                // 24^189
+    771,                                                // 24^196
+    803,                                                // 24^203
+    835,                                                // 24^210
+    867,                                                // 24^217
+];
+const BASE24_SMALL_INT_POWERS: [u128; 7] = [1, 24, 576, 13824, 331776, 7962624, 191102976];
+const BASE24_STEP: i32 = 7;
+const BASE24_BIAS: i32 = 252;
+
+// BASE25
+
+const BASE25_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 25^0
+    265845599156983174580761412056068915200,            // 25^1
+    207691874341393105141219853168803840000,            // 25^2
+    324518553658426726783156020576256000000,            // 25^3
+    253530120045645880299340641075200000000,            // 25^4
+    198070406285660843983859875840000000000,            // 25^5
+    309485009821345068724781056000000000000,            // 25^6
+];
+const BASE25_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 25^0
+    -123,                                               // 25^1
+    -118,                                               // 25^2
+    -114,                                               // 25^3
+    -109,                                               // 25^4
+    -104,                                               // 25^5
+    -100,                                               // 25^6
+];
+const BASE25_LARGE_MANTISSA: [u128; 68] = [
+    285793394306920833441610418092098634655,            // 25^-252
+    203068420253004570555511362849258201390,            // 25^-245
+    288577581746103207017755725657449092679,            // 25^-238
+    205046704412910121830119952091883627559,            // 25^-231
+    291388892624283530821742192659774598780,            // 25^-224
+    207044260935364498850036477975162511299,            // 25^-217
+    294227591176883860910658765384315687611,            // 25^-210
+    209061277570927374050781655074839937648,            // 25^-203
+    297093944213496817569054052050375869453,            // 25^-196
+    211097943899216614887176072592734406508,            // 25^-189
+    299988221142963048588365030287739055137,            // 25^-182
+    213154451346726893197828921904416471830,            // 25^-175
+    302910693998692996157485768413290076965,            // 25^-168
+    215230993204821882725842221200657943544,            // 25^-161
+    305861637464235347360161968596028634045,            // 25^-154
+    217327764647901735884376228537482684576,            // 25^-147
+    308841328899094571460716776609676066664,            // 25^-140
+    219444962751747547330237450047488370802,            // 25^-133
+    311850048364799970571308236412006025948,            // 25^-126
+    221582786512044528543660416923448526878,            // 25^-119
+    314888078651228693933689466069052580904,            // 25^-112
+    223741436863085634409521749481834675708,            // 25^-105
+    317955705303185189918510999237120523316,            // 25^-98
+    225921116696657399755928707376370229068,            // 25^-91
+    321053216647239593947814323906257853121,            // 25^-84
+    228122030881109760932058580285014566244,            // 25^-77
+    324180903818827574883781864350871964922,            // 25^-70
+    230344386280611654799899571593522271174,            // 25^-63
+    327339060789614187001318969682759915221,            // 25^-56
+    232588391774594204975783618524161450993,            // 25^-49
+    330527984395124299475957654016385519914,            // 25^-42
+    234854258277383322788948059678933702737,            // 25^-35
+    333747974362642200374222141588992517906,            // 25^-28
+    237142198758023568227473377297792835283,            // 25^-21
+    336999333339382997433337688587745383420,            // 25^-14
+    239452428260295134118491722992235809940,            // 25^-7
+    170141183460469231731687303715884105728,            // 25^0
+    241785163922925834941235200000000000000,            // 25^7
+    171798691840000000000000000000000000000,            // 25^14
+    244140625000000000000000000000000000000,            // 25^21
+    173472347597680709441192448139190673828,            // 25^28
+    246519032881566189191165176650870696772,            // 25^35
+    175162308040602133865466197911239516410,            // 25^42
+    248920611114445668285762562151204969623,            // 25^49
+    176868732008334225927912486150152183216,            // 25^56
+    251345585423243599518503524095297312920,            // 25^63
+    178591779887855465971216179422709524914,            // 25^70
+    253794183731564922327402455583054354682,            // 25^77
+    180331613628627651967947866455016278082,            // 25^84
+    256266636183436918326986907537468991453,            // 25^91
+    182088396757817547443627082897044283139,            // 25^98
+    258763175164940474024358370140027266101,            // 25^105
+    183862294395666818064937594201088633455,            // 25^112
+    261284035326052074402891767876281837538,            // 25^119
+    185653473271011701515143789632334288014,            // 25^126
+    263829453602698580304979415177988198613,            // 25^133
+    187462101736953869352205554703508169192,            // 25^140
+    266399669239026862544798113253119949479,            // 25^147
+    189288349786683953755640255602884245064,            // 25^154
+    268994923809890385876486015494726082500,            // 25^161
+    191132389069459226417170338759437756337,            // 25^168
+    271615461243554856334256923502490730495,            // 25^175
+    192994392906736931318972184714148973580,            // 25^182
+    274261527844625066050770363850331497104,            // 25^189
+    194874536308464787773268059716493991903,            // 25^196
+    276933372317195090450451374005771742621,            // 25^203
+    196772995989530194869453349330805553038,            // 25^210
+    279631245788224013707368483964622716141,            // 25^217
+];
+const BASE25_LARGE_EXPONENT: [i32; 68] = [
+    -1298,                                              // 25^-252
+    -1265,                                              // 25^-245
+    -1233,                                              // 25^-238
+    -1200,                                              // 25^-231
+    -1168,                                              // 25^-224
+    -1135,                                              // 25^-217
+    -1103,                                              // 25^-210
+    -1070,                                              // 25^-203
+    -1038,                                              // 25^-196
+    -1005,                                              // 25^-189
+    -973,                                               // 25^-182
+    -940,                                               // 25^-175
+    -908,                                               // 25^-168
+    -875,                                               // 25^-161
+    -843,                                               // 25^-154
+    -810,                                               // 25^-147
+    -778,                                               // 25^-140
+    -745,                                               // 25^-133
+    -713,                                               // 25^-126
+    -680,                                               // 25^-119
+    -648,                                               // 25^-112
+    -615,                                               // 25^-105
+    -583,                                               // 25^-98
+    -550,                                               // 25^-91
+    -518,                                               // 25^-84
+    -485,                                               // 25^-77
+    -453,                                               // 25^-70
+    -420,                                               // 25^-63
+    -388,                                               // 25^-56
+    -355,                                               // 25^-49
+    -323,                                               // 25^-42
+    -290,                                               // 25^-35
+    -258,                                               // 25^-28
+    -225,                                               // 25^-21
+    -193,                                               // 25^-14
+    -160,                                               // 25^-7
+    -127,                                               // 25^0
+    -95,                                                // 25^7
+    -62,                                                // 25^14
+    -30,                                                // 25^21
+    3,                                                  // 25^28
+    35,                                                 // 25^35
+    68,                                                 // 25^42
+    100,                                                // 25^49
+    133,                                                // 25^56
+    165,                                                // 25^63
+    198,                                                // 25^70
+    230,                                                // 25^77
+    263,                                                // 25^84
+    295,                                                // 25^91
+    328,                                                // 25^98
+    360,                                                // 25^105
+    393,                                                // 25^112
+    425,                                                // 25^119
+    458,                                                // 25^126
+    490,                                                // 25^133
+    523,                                                // 25^140
+    555,                                                // 25^147
+    588,                                                // 25^154
+    620,                                                // 25^161
+    653,                                                // 25^168
+    685,                                                // 25^175
+    718,                                                // 25^182
+    750,                                                // 25^189
+    783,                                                // 25^196
+    815,                                                // 25^203
+    848,                                                // 25^210
+    880,                                                // 25^217
+];
+const BASE25_SMALL_INT_POWERS: [u128; 7] = [1, 25, 625, 15625, 390625, 9765625, 244140625];
+const BASE25_STEP: i32 = 7;
+const BASE25_BIAS: i32 = 252;
+
+// BASE26
+
+const BASE26_SMALL_MANTISSA: [u128; 7] = [
+    170141183460469231731687303715884105728,            // 26^0
+    276479423123262501563991868538311671808,            // 26^1
+    224639531287650782520743393187378233344,            // 26^2
+    182519619171216260798104006964744814592,            // 26^3
+    296594381153226423796919011317710323712,            // 26^4
+    240982934686996469334996696695639638016,            // 26^5
+    195798634433184631334684816065207205888,            // 26^6
+];
+const BASE26_SMALL_EXPONENT: [i32; 7] = [
+    -127,                                               // 26^0
+    -123,                                               // 26^1
+    -118,                                               // 26^2
+    -113,                                               // 26^3
+    -109,                                               // 26^4
+    -104,                                               // 26^5
+    -99,                                                // 26^6
+];
+const BASE26_LARGE_MANTISSA: [u128; 67] = [
+    223302816785416365261501121183664506010,            // 26^-245
+    208793887424582006747864373745206480886,            // 26^-238
+    195227664627991173689253365541181602096,            // 26^-231
+    182542896759209079117924981191278218615,            // 26^-224
+    170682311959929403775713752016508602388,            // 26^-217
+    319184719133881733167774634228398630548,            // 26^-210
+    298445936660656380797439373851559361096,            // 26^-203
+    279054640682520272457995982566385389064,            // 26^-196
+    260923279297292454826462160021044868443,            // 26^-189
+    243969989220528359050303591757077787596,            // 26^-182
+    228118226171942658526451569535286060353,            // 26^-175
+    213296419277190995686832685182416132955,            // 26^-168
+    199437647924631042854519895051784617004,            // 26^-161
+    186479339618067826498814972661362929947,            // 26^-154
+    174362987461285330626576271532417342855,            // 26^-147
+    326067771997608226855765039505019953527,            // 26^-140
+    304881768440366443726402955195105316329,            // 26^-133
+    285072309225356538301642822964643005408,            // 26^-126
+    266549954439052068809893515776468694564,            // 26^-119
+    249231075457753005677502945704601914895,            // 26^-112
+    233037477363483566918311865718592557833,            // 26^-105
+    217896045893127676516686822732460831572,            // 26^-98
+    203738417326773735777703283427712394918,            // 26^-91
+    190500669824811165252338688092226229364,            // 26^-84
+    178123034820162511238845936350714491622,            // 26^-77
+    333099254325168111301464298292509503356,            // 26^-70
+    311456385593267303107050428484389238716,            // 26^-63
+    291219745668138391592456499213129019442,            // 26^-56
+    272297965910924348580716754684381379181,            // 26^-49
+    254605614290044560620651113294031241626,            // 26^-42
+    238062809654687405271268739306918462570,            // 26^-35
+    222594861070586991002412082254420837256,            // 26^-28
+    208131930589681357218231284385128680344,            // 26^-21
+    194608717931053648412097371491373800423,            // 26^-14
+    181964165649487446029462142596867446143,            // 26^-7
+    170141183460469231731687303715884105728,            // 26^0
+    318172780953925025918862826105961709568,            // 26^7
+    297499748388299952530789444812804194304,            // 26^14
+    278169930267914565987548746187341299712,            // 26^21
+    260096052263752396381159488684908609536,            // 26^28
+    243196510629429753543644020787720315589,            // 26^35
+    227395003759435617782759026890197718352,            // 26^42
+    212620187686592486096128182198450396409,            // 26^49
+    198805353963305641500281734389939339052,            // 26^56
+    185888128472231349675004689621278542958,            // 26^63
+    173810189806491030350550655153103473999,            // 26^70
+    325034011895830307254166714675296871096,            // 26^77
+    303915176108832810280521264920190203131,            // 26^84
+    284168520489679119677023043643028417295,            // 26^91
+    265704888683728554332237168601547339173,            // 26^98
+    248440917202145588620033973783642939305,            // 26^105
+    232298659034884347081172590621418853088,            // 26^112
+    217205231719130933968079964556427917884,            // 26^119
+    203092488274228969742684708734280089507,            // 26^126
+    189896709517356115129460946793154219973,            // 26^133
+    177558316370753675479515454481338457101,            // 26^140
+    332043201723146894831623394706398020929,            // 26^147
+    310468949199606660363664220576467010752,            // 26^154
+    290296467197293861525395669447395056845,            // 26^161
+    271434676751037481783657313824389119896,            // 26^168
+    253798416681617203255579043607175584203,            // 26^175
+    237308059092157195001470401326248026898,            // 26^182
+    221889149847346996027560241559399617642,            // 26^189
+    207472072412249451654170398205728730819,            // 26^196
+    193991733532924439390933354984357040572,            // 26^203
+    181387269339713144970498252974494732833,            // 26^210
+    339203541092472346195720855153810480522,            // 26^217
+];
+const BASE26_LARGE_EXPONENT: [i32; 67] = [
+    -1279,                                              // 26^-245
+    -1246,                                              // 26^-238
+    -1213,                                              // 26^-231
+    -1180,                                              // 26^-224
+    -1147,                                              // 26^-217
+    -1115,                                              // 26^-210
+    -1082,                                              // 26^-203
+    -1049,                                              // 26^-196
+    -1016,                                              // 26^-189
+    -983,                                               // 26^-182
+    -950,                                               // 26^-175
+    -917,                                               // 26^-168
+    -884,                                               // 26^-161
+    -851,                                               // 26^-154
+    -818,                                               // 26^-147
+    -786,                                               // 26^-140
+    -753,                                               // 26^-133
+    -720,                                               // 26^-126
+    -687,                                               // 26^-119
+    -654,                                               // 26^-112
+    -621,                                               // 26^-105
+    -588,                                               // 26^-98
+    -555,                                               // 26^-91
+    -522,                                               // 26^-84
+    -489,                                               // 26^-77
+    -457,                                               // 26^-70
+    -424,                                               // 26^-63
+    -391,                                               // 26^-56
+    -358,                                               // 26^-49
+    -325,                                               // 26^-42
+    -292,                                               // 26^-35
+    -259,                                               // 26^-28
+    -226,                                               // 26^-21
+    -193,                                               // 26^-14
+    -160,                                               // 26^-7
+    -127,                                               // 26^0
+    -95,                                                // 26^7
+    -62,                                                // 26^14
+    -29,                                                // 26^21
+    4,                                                  // 26^28
+    37,                                                 // 26^35
+    70,                                                 // 26^42
+    103,                                                // 26^49
+    136,                                                // 26^56
+    169,                                                // 26^63
+    202,                                                // 26^70
+    234,                                                // 26^77
+    267,                                                // 26^84
+    300,                                                // 26^91
+    333,                                                // 26^98
+    366,                                                // 26^105
+    399,                                                // 26^112
+    432,                                                // 26^119
+    465,                                                // 26^126
+    498,                                                // 26^133
+    531,                                                // 26^140
+    563,                                                // 26^147
+    596,                                                // 26^154
+    629,                                                // 26^161
+    662,                                                // 26^168
+    695,                                                // 26^175
+    728,                                                // 26^182
+    761,                                                // 26^189
+    794,                                                // 26^196
+    827,                                                // 26^203
+    860,                                                // 26^210
+    892,                                                // 26^217
+];
+const BASE26_SMALL_INT_POWERS: [u128; 7] = [1, 26, 676, 17576, 456976, 11881376, 308915776];
+const BASE26_STEP: i32 = 7;
+const BASE26_BIAS: i32 = 245;
+
+// BASE27
+
+const BASE27_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 27^0
+    287113247089541828547222325020554428416,            // 27^1
+    242251802231800917836718836736092798976,            // 27^2
+    204399958133082024424731518496078299136,            // 27^3
+    172462464674787958108367218731066064896,            // 27^4
+    291030409138704679307869681608673984512,            // 27^5
+];
+const BASE27_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 27^0
+    -123,                                               // 27^1
+    -118,                                               // 27^2
+    -113,                                               // 27^3
+    -108,                                               // 27^4
+    -104,                                               // 27^5
+];
+const BASE27_LARGE_MANTISSA: [u128; 76] = [
+    301829093537629265639465570217176944359,            // 27^-240
+    217807991453958805640698687941213190524,            // 27^-234
+    314352208961548438173441007673156326734,            // 27^-228
+    226845008347394462887832488874694288292,            // 27^-222
+    327394917835133689224334116987590197085,            // 27^-216
+    236256977848340413085493360278597848651,            // 27^-210
+    170489389240119998671196096475026672256,            // 27^-204
+    246059457021648542224892012444309926233,            // 27^-198
+    177563121844831037921653709250257605479,            // 27^-192
+    256268648406457241006138264113659504394,            // 27^-186
+    184930348919702200346046943747485274024,            // 27^-180
+    266901426797403574706768528236472000862,            // 27^-174
+    192603247770383575639211190527648274245,            // 27^-168
+    277975367137008028446553971650055283412,            // 27^-162
+    200594500948068090486693848039128919647,            // 27^-156
+    289508773565335211238455692680966173052,            // 27^-150
+    208917317212507950117664039252872831665,            // 27^-144
+    301520709674946766164053267333891939739,            // 27^-138
+    217585453364802351586979201161384846208,            // 27^-132
+    314031030021154964119856834958393443507,            // 27^-126
+    226613236986043931067161987739751269180,            // 27^-120
+    327060412939660347810097743318775450603,            // 27^-114
+    236015590119408703302029793810763336632,            // 27^-108
+    170315197362908885300398426895467760677,            // 27^-102
+    245808053934833671173174941698733239342,            // 27^-96
+    177381702616012906692133545122052956869,            // 27^-90
+    256006814417050404626793229969178591795,            // 27^-84
+    184741402471039290909022270993420155647,            // 27^-78
+    266628729119434395515123988465075762881,            // 27^-72
+    192406461791880080316008520325217417399,            // 27^-66
+    277691355027891684120101092281051616669,            // 27^-60
+    200389550171752283164939097875653100692,            // 27^-54
+    289212977580839036146652597763405686112,            // 27^-48
+    208703862874796048578293668364396201854,            // 27^-42
+    301212640893244858516269504216828222245,            // 27^-36
+    217363142646555453321168098187951653993,            // 27^-30
+    313710179234688236904530296665341569850,            // 27^-24
+    226381702429392491474935736226666160567,            // 27^-18
+    326726249813466247246220462666861782844,            // 27^-12
+    235774449020380624184618955567855082461,            // 27^-6
+    170141183460469231731687303715884105728,            // 27^0
+    245556907710782073166015043857318674432,            // 27^6
+    177200468746272961345336076752392290304,            // 27^12
+    255745247947835503562868389206950936576,            // 27^18
+    184552649072141716781794491390137475072,            // 27^24
+    266356310061270520809673995345359110719,            // 27^30
+    192209876872921446586714266254161951235,            // 27^36
+    277407633098725295421526662764935275289,            // 27^42
+    200184808797092622572327630249651738267,            // 27^48
+    288917483816076538023589582665008561757,            // 27^54
+    208490626626972031635281014538153149532,            // 27^60
+    300904886870600004067510516586852827477,            // 27^66
+    217141059066909427380630585083218539864,            // 27^72
+    313389656266867868879861721401276560157,            // 27^78
+    226150404435492799169987273137391228527,            // 27^84
+    326392428107359965184387801150473482685,            // 27^90
+    235533554299270254021060647605641184828,            // 27^96
+    339934694701922439619874702371784251126,            // 27^102
+    245306018087052741642305313258629505287,            // 27^108
+    177019420046226713314377865847118993119,            // 27^114
+    255483948725482657093998355855298189652,            // 27^120
+    184364088525767284952804747951506893851,            // 27^126
+    266084169338241408156670471179837543899,            // 27^132
+    192013492808081754945415747456910215687,            // 27^138
+    277124201053027125645172361985060059244,            // 27^144
+    199980276610139913759598726349951659975,            // 27^150
+    288622291962264730584478255384696488209,            // 27^156
+    208277608246209791806511248482402407710,            // 27^162
+    300597447285417578884462942447710218615,            // 27^168
+    216919202393792943992865658673403318648,            // 27^174
+    313069460782756034010893203297842312622,            // 27^180
+    225919342762644710883872352816958877073,            // 27^186
+    326058947472506854027112756453181563499,            // 27^192
+    235292905704349129354647627776916151748,            // 27^198
+    339587377705461640362820917278613293254,            // 27^204
+    245055384801472810432512717678228228007,            // 27^210
+];
+const BASE27_LARGE_EXPONENT: [i32; 76] = [
+    -1269,                                              // 27^-240
+    -1240,                                              // 27^-234
+    -1212,                                              // 27^-228
+    -1183,                                              // 27^-222
+    -1155,                                              // 27^-216
+    -1126,                                              // 27^-210
+    -1097,                                              // 27^-204
+    -1069,                                              // 27^-198
+    -1040,                                              // 27^-192
+    -1012,                                              // 27^-186
+    -983,                                               // 27^-180
+    -955,                                               // 27^-174
+    -926,                                               // 27^-168
+    -898,                                               // 27^-162
+    -869,                                               // 27^-156
+    -841,                                               // 27^-150
+    -812,                                               // 27^-144
+    -784,                                               // 27^-138
+    -755,                                               // 27^-132
+    -727,                                               // 27^-126
+    -698,                                               // 27^-120
+    -670,                                               // 27^-114
+    -641,                                               // 27^-108
+    -612,                                               // 27^-102
+    -584,                                               // 27^-96
+    -555,                                               // 27^-90
+    -527,                                               // 27^-84
+    -498,                                               // 27^-78
+    -470,                                               // 27^-72
+    -441,                                               // 27^-66
+    -413,                                               // 27^-60
+    -384,                                               // 27^-54
+    -356,                                               // 27^-48
+    -327,                                               // 27^-42
+    -299,                                               // 27^-36
+    -270,                                               // 27^-30
+    -242,                                               // 27^-24
+    -213,                                               // 27^-18
+    -185,                                               // 27^-12
+    -156,                                               // 27^-6
+    -127,                                               // 27^0
+    -99,                                                // 27^6
+    -70,                                                // 27^12
+    -42,                                                // 27^18
+    -13,                                                // 27^24
+    15,                                                 // 27^30
+    44,                                                 // 27^36
+    72,                                                 // 27^42
+    101,                                                // 27^48
+    129,                                                // 27^54
+    158,                                                // 27^60
+    186,                                                // 27^66
+    215,                                                // 27^72
+    243,                                                // 27^78
+    272,                                                // 27^84
+    300,                                                // 27^90
+    329,                                                // 27^96
+    357,                                                // 27^102
+    386,                                                // 27^108
+    415,                                                // 27^114
+    443,                                                // 27^120
+    472,                                                // 27^126
+    500,                                                // 27^132
+    529,                                                // 27^138
+    557,                                                // 27^144
+    586,                                                // 27^150
+    614,                                                // 27^156
+    643,                                                // 27^162
+    671,                                                // 27^168
+    700,                                                // 27^174
+    728,                                                // 27^180
+    757,                                                // 27^186
+    785,                                                // 27^192
+    814,                                                // 27^198
+    842,                                                // 27^204
+    871,                                                // 27^210
+];
+const BASE27_SMALL_INT_POWERS: [u128; 6] = [1, 27, 729, 19683, 531441, 14348907];
+const BASE27_STEP: i32 = 6;
+const BASE27_BIAS: i32 = 240;
+
+// BASE28
+
+const BASE28_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 28^0
+    297747071055821155530452781502797185024,            // 28^1
+    260528687173843511089146183814947536896,            // 28^2
+    227962601277113072203002910838079094784,            // 28^3
+    199467276117473938177627546983319207936,            // 28^4
+    174533866602789695905424103610404306944,            // 28^5
+];
+const BASE28_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 28^0
+    -123,                                               // 28^1
+    -118,                                               // 28^2
+    -113,                                               // 28^3
+    -108,                                               // 28^4
+    -103,                                               // 28^5
+];
+const BASE28_LARGE_MANTISSA: [u128; 76] = [
+    200215143815698040798730279921859793515,            // 28^-240
+    179711238516029806533278035755362570551,            // 28^-234
+    322614250185735942212427179391214768413,            // 28^-228
+    289575530396283324168013345552040300667,            // 28^-222
+    259920284847963995399800125815215983072,            // 28^-216
+    233302014099717072256401710525774728336,            // 28^-210
+    209409703497448836012980688794302909957,            // 28^-204
+    187964189199610581269006081054389519147,            // 28^-198
+    337429792711562885676838629607664070711,            // 28^-192
+    302873822652608199592547515371033250847,            // 28^-186
+    271856707468083969679745656096547629768,            // 28^-180
+    244016035285282981482333348801442963368,            // 28^-174
+    219026508600450572879143037057044702127,            // 28^-168
+    196596143419909740056291955312532441411,            // 28^-162
+    176462857644721687377034700397980722042,            // 28^-156
+    316782817673398770114452445482208770257,            // 28^-150
+    284341291171704802743493772571841275116,            // 28^-144
+    255222080727080523208383932871281083497,            // 28^-138
+    229084950069124576377435007616984162844,            // 28^-132
+    205624506307086466111975488366169508167,            // 28^-126
+    184566631641558957302915986868221103411,            // 28^-120
+    331330561004604641231243330979299081348,            // 28^-114
+    297399209378286220063892720385616742108,            // 28^-108
+    266942745850723232302069966588191406954,            // 28^-102
+    239605309345945263344621501916001364416,            // 28^-96
+    215067482294014848993159294730496555497,            // 28^-90
+    193042558474796699288911421705232156812,            // 28^-84
+    173273193069468359944466704194632400641,            // 28^-78
+    311056791556242112413125050076207081650,            // 28^-72
+    279201663740542055384000770694089408486,            // 28^-66
+    250608799266136415663698628779517553855,            // 28^-60
+    224944111822980370837543334787608800457,            // 28^-54
+    201907728667158642949418150287074186439,            // 28^-48
+    181230486831379296755646484093658378299,            // 28^-42
+    325341576312636457580643512071759255196,            // 28^-36
+    292023552792399342330208805478900181690,            // 28^-30
+    262117606830390855604604612394616145902,            // 28^-24
+    235274309738072614830216430996812400431,            // 28^-18
+    211180017596241035935669959185363632952,            // 28^-12
+    189553206559602063269009666658011215615,            // 28^-6
+    170141183460469231731687303715884105728,            // 28^0
+    305434266554881967834492181318207537152,            // 28^6
+    274154937941858738966065755004164112384,            // 28^12
+    246078905440687093968343124469641904128,            // 28^18
+    220878121537715117784741212850409701376,            // 28^24
+    198258133856129805696540977101424033792,            // 28^30
+    177954644699400447924746318168681611264,            // 28^36
+    319460845859371388212562249545703474176,            // 28^42
+    286745064197610355009611023687762970225,            // 28^48
+    257379684889104161503034418684704785797,            // 28^54
+    231021595363755916570056887236303965333,            // 28^60
+    207362820991138609531788808643065835705,            // 28^66
+    186126926626483659918254253754028720893,            // 28^72
+    334131573344103639308512797544978713750,            // 28^78
+    299913371828921883094842698046640019943,            // 28^84
+    269199434526831288331795872363961423540,            // 28^90
+    241630891972710985114650364591580944199,            // 28^96
+    216885626294688985349681859923056842835,            // 28^102
+    194674507506895938395726937393857685110,            // 28^108
+    174738015241079713869620349559402181972,            // 28^114
+    313686412889065357315780098042512623701,            // 28^120
+    281561987228284074576142980610683957411,            // 28^126
+    252727403529513497084111370284014563793,            // 28^132
+    226845751173734538409794758625366435361,            // 28^138
+    203614622343740041422835873088956724196,            // 28^144
+    182762578614186646525232068123189313087,            // 28^150
+    328091958791815868790390435525895683218,            // 28^156
+    294492270354449044397893099587906656150,            // 28^162
+    264333504599995236391965677440014878764,            // 28^168
+    237263278829077450304247817879793628477,            // 28^174
+    212965297630021155936008083539885258459,            // 28^180
+    191155657202715751455043144381591497592,            // 28^186
+    171579528154314464133715598246382584383,            // 28^192
+    308016356015425756696586706818979868623,            // 28^198
+    276472597266073797985814891590470600613,            // 28^204
+    248159214750338106225838746496027188809,            // 28^210
+];
+const BASE28_LARGE_EXPONENT: [i32; 76] = [
+    -1281,                                              // 28^-240
+    -1252,                                              // 28^-234
+    -1224,                                              // 28^-228
+    -1195,                                              // 28^-222
+    -1166,                                              // 28^-216
+    -1137,                                              // 28^-210
+    -1108,                                              // 28^-204
+    -1079,                                              // 28^-198
+    -1051,                                              // 28^-192
+    -1022,                                              // 28^-186
+    -993,                                               // 28^-180
+    -964,                                               // 28^-174
+    -935,                                               // 28^-168
+    -906,                                               // 28^-162
+    -877,                                               // 28^-156
+    -849,                                               // 28^-150
+    -820,                                               // 28^-144
+    -791,                                               // 28^-138
+    -762,                                               // 28^-132
+    -733,                                               // 28^-126
+    -704,                                               // 28^-120
+    -676,                                               // 28^-114
+    -647,                                               // 28^-108
+    -618,                                               // 28^-102
+    -589,                                               // 28^-96
+    -560,                                               // 28^-90
+    -531,                                               // 28^-84
+    -502,                                               // 28^-78
+    -474,                                               // 28^-72
+    -445,                                               // 28^-66
+    -416,                                               // 28^-60
+    -387,                                               // 28^-54
+    -358,                                               // 28^-48
+    -329,                                               // 28^-42
+    -301,                                               // 28^-36
+    -272,                                               // 28^-30
+    -243,                                               // 28^-24
+    -214,                                               // 28^-18
+    -185,                                               // 28^-12
+    -156,                                               // 28^-6
+    -127,                                               // 28^0
+    -99,                                                // 28^6
+    -70,                                                // 28^12
+    -41,                                                // 28^18
+    -12,                                                // 28^24
+    17,                                                 // 28^30
+    46,                                                 // 28^36
+    74,                                                 // 28^42
+    103,                                                // 28^48
+    132,                                                // 28^54
+    161,                                                // 28^60
+    190,                                                // 28^66
+    219,                                                // 28^72
+    247,                                                // 28^78
+    276,                                                // 28^84
+    305,                                                // 28^90
+    334,                                                // 28^96
+    363,                                                // 28^102
+    392,                                                // 28^108
+    421,                                                // 28^114
+    449,                                                // 28^120
+    478,                                                // 28^126
+    507,                                                // 28^132
+    536,                                                // 28^138
+    565,                                                // 28^144
+    594,                                                // 28^150
+    622,                                                // 28^156
+    651,                                                // 28^162
+    680,                                                // 28^168
+    709,                                                // 28^174
+    738,                                                // 28^180
+    767,                                                // 28^186
+    796,                                                // 28^192
+    824,                                                // 28^198
+    853,                                                // 28^204
+    882,                                                // 28^210
+];
+const BASE28_SMALL_INT_POWERS: [u128; 6] = [1, 28, 784, 21952, 614656, 17210368];
+const BASE28_STEP: i32 = 6;
+const BASE28_BIAS: i32 = 240;
+
+// BASE29
+
+const BASE29_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 29^0
+    308380895022100482513683237985039941632,            // 29^1
+    279470186113778562278025434423942447104,            // 29^2
+    253269856165611822064460549946697842688,            // 29^3
+    229525807150085713745917373389194919936,            // 29^4
+    208007762729765178082237619633957896192,            // 29^5
+];
+const BASE29_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 29^0
+    -123,                                               // 29^1
+    -118,                                               // 29^2
+    -113,                                               // 29^3
+    -108,                                               // 29^4
+    -103,                                               // 29^5
+];
+const BASE29_LARGE_MANTISSA: [u128; 76] = [
+    180411782640948456163108621039484300353,            // 29^-240
+    199886291656678749778798199538954577713,            // 29^-234
+    221462972137332420374365077239613292335,            // 29^-228
+    245368742505570013761609603669658845854,            // 29^-222
+    271855015841791437163383377269432435982,            // 29^-216
+    301200343954417841961395964144914808415,            // 29^-210
+    333713346863741229059418106803065448261,            // 29^-204
+    184867979254122350694373980738345610830,            // 29^-198
+    204823511403978168182734748793342650457,            // 29^-192
+    226933138952023660037574950865203175761,            // 29^-186
+    251429385238135556008900174982942596722,            // 29^-180
+    278569873281449391084528542386060643447,            // 29^-174
+    308640035159552273337407148073177516540,            // 29^-168
+    170978056925499484035797671737173759761,            // 29^-162
+    189434244555519246827735852425496159000,            // 29^-156
+    209882681179121373738148351480252166035,            // 29^-150
+    232538419662693834656863635067192575556,            // 29^-144
+    257639726705579546348788818074016917383,            // 29^-138
+    285450588652016995453946272087193218261,            // 29^-132
+    316263487792383250937533050996202736450,            // 29^-126
+    175201239175822924661859658491633525197,            // 29^-120
+    194113297257345719179697640426306620561,            // 29^-114
+    215066813165088318898530949380694999931,            // 29^-108
+    238282151601732438626757341123945812037,            // 29^-102
+    264003464487880391063907148518553600721,            // 29^-96
+    292501258667905961095191488633763572010,            // 29^-90
+    324075240786231793266420435905585066661,            // 29^-84
+    179528734626566103050967344518404222838,            // 29^-78
+    198907923224385351394870557131224024014,            // 29^-72
+    220378993946205681004466278772642662300,            // 29^-66
+    244167754534112212293116837315364018708,            // 29^-60
+    270524387495766270724774864712621178351,            // 29^-54
+    299726081232954872012689080099923610541,            // 29^-48
+    332079945186715557451765374774991672241,            // 29^-42
+    183963119828570739334286542177638201257,            // 29^-36
+    203820977132676910337518249049241331980,            // 29^-30
+    225822386345870676314424417535913775896,            // 29^-24
+    250198732693485636863600410972168425001,            // 29^-18
+    277206378226597610088077970727216566225,            // 29^-12
+    307129357939822377568583266911848900855,            // 29^-6
+    170141183460469231731687303715884105728,            // 29^0
+    188507034973849692637027842793274343424,            // 29^6
+    208855384169162106382075974754544648192,            // 29^12
+    231400231309666912826787170353923751936,            // 29^18
+    256378676868573301455838684793773426688,            // 29^24
+    284053415075970164879962990673826094314,            // 29^30
+    314715496631115750914098978917481871688,            // 29^36
+    174343694817539847357322592625772163155,            // 29^42
+    193163185467532912371523116182520814756,            // 29^48
+    214014141773314894388674508400179209532,            // 29^54
+    237115849834993471687725998227739696222,            // 29^60
+    262711266541086358656385267533109039869,            // 29^66
+    291069574706415032602452081981147446763,            // 29^72
+    322489014023779685975823216414806216349,            // 29^78
+    178650008801035774670984867305268298071,            // 29^84
+    197934343538640677425270715935647505996,            // 29^90
+    219300321421789265371466533424126863110,            // 29^96
+    242972644948356100526463281459541324974,            // 29^102
+    269200272076455967884065094333741996545,            // 29^108
+    298259034474605889482552078350958780837,            // 29^114
+    330454538398307869859357548505383554011,            // 29^120
+    183062689350548673356118481539553806163,            // 29^126
+    202823349890643162760568057855283073783,            // 29^132
+    224717070457148091679782830215989826885,            // 29^138
+    248974103731497779640892318688061490897,            // 29^144
+    275849556968674066644388728598920812956,            // 29^150
+    305626074918518590345961283073160340970,            // 29^156
+    338616812354378462414859289927404969896,            // 29^162
+    187584363735341677353233362159059264795,            // 29^168
+    207833115392789061354400140358968381064,            // 29^174
+    230267613961761833964469003400183663813,            // 29^180
+    255123799397575000468261630468177681638,            // 29^186
+    282663080140582027146793786682106989268,            // 29^192
+    313175082306023963280707662359655742783,            // 29^198
+    173490347817277081445057491729890113081,            // 29^204
+    192217724118601260264099717636971309833,            // 29^210
+];
+const BASE29_LARGE_EXPONENT: [i32; 76] = [
+    -1293,                                              // 29^-240
+    -1264,                                              // 29^-234
+    -1235,                                              // 29^-228
+    -1206,                                              // 29^-222
+    -1177,                                              // 29^-216
+    -1148,                                              // 29^-210
+    -1119,                                              // 29^-204
+    -1089,                                              // 29^-198
+    -1060,                                              // 29^-192
+    -1031,                                              // 29^-186
+    -1002,                                              // 29^-180
+    -973,                                               // 29^-174
+    -944,                                               // 29^-168
+    -914,                                               // 29^-162
+    -885,                                               // 29^-156
+    -856,                                               // 29^-150
+    -827,                                               // 29^-144
+    -798,                                               // 29^-138
+    -769,                                               // 29^-132
+    -740,                                               // 29^-126
+    -710,                                               // 29^-120
+    -681,                                               // 29^-114
+    -652,                                               // 29^-108
+    -623,                                               // 29^-102
+    -594,                                               // 29^-96
+    -565,                                               // 29^-90
+    -536,                                               // 29^-84
+    -506,                                               // 29^-78
+    -477,                                               // 29^-72
+    -448,                                               // 29^-66
+    -419,                                               // 29^-60
+    -390,                                               // 29^-54
+    -361,                                               // 29^-48
+    -332,                                               // 29^-42
+    -302,                                               // 29^-36
+    -273,                                               // 29^-30
+    -244,                                               // 29^-24
+    -215,                                               // 29^-18
+    -186,                                               // 29^-12
+    -157,                                               // 29^-6
+    -127,                                               // 29^0
+    -98,                                                // 29^6
+    -69,                                                // 29^12
+    -40,                                                // 29^18
+    -11,                                                // 29^24
+    18,                                                 // 29^30
+    47,                                                 // 29^36
+    77,                                                 // 29^42
+    106,                                                // 29^48
+    135,                                                // 29^54
+    164,                                                // 29^60
+    193,                                                // 29^66
+    222,                                                // 29^72
+    251,                                                // 29^78
+    281,                                                // 29^84
+    310,                                                // 29^90
+    339,                                                // 29^96
+    368,                                                // 29^102
+    397,                                                // 29^108
+    426,                                                // 29^114
+    455,                                                // 29^120
+    485,                                                // 29^126
+    514,                                                // 29^132
+    543,                                                // 29^138
+    572,                                                // 29^144
+    601,                                                // 29^150
+    630,                                                // 29^156
+    659,                                                // 29^162
+    689,                                                // 29^168
+    718,                                                // 29^174
+    747,                                                // 29^180
+    776,                                                // 29^186
+    805,                                                // 29^192
+    834,                                                // 29^198
+    864,                                                // 29^204
+    893,                                                // 29^210
+];
+const BASE29_SMALL_INT_POWERS: [u128; 6] = [1, 29, 841, 24389, 707281, 20511149];
+const BASE29_STEP: i32 = 6;
+const BASE29_BIAS: i32 = 240;
+
+// BASE30
+
+const BASE30_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 30^0
+    319014718988379809496913694467282698240,            // 30^1
+    299076299051606071403356588563077529600,            // 30^2
+    280384030360880691940646801777885184000,            // 30^3
+    262860028463325648694356376666767360000,            // 30^4
+    246431276684367795650959103125094400000,            // 30^5
+];
+const BASE30_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 30^0
+    -123,                                               // 30^1
+    -118,                                               // 30^2
+    -113,                                               // 30^3
+    -108,                                               // 30^4
+    -103,                                               // 30^5
+];
+const BASE30_LARGE_MANTISSA: [u128; 74] = [
+    293697914606894485088361958296166003399,            // 30^-234
+    199401546035358756435491021348075025228,            // 30^-228
+    270761041082025567891957153683056483774,            // 30^-222
+    183828919146951883093674448351327494412,            // 30^-216
+    249615464467793559236989678532104461317,            // 30^-210
+    338944929832632662139396137837142035924,            // 30^-204
+    230121290169646228383872457298707723793,            // 30^-198
+    312474408249691315911417866816293319027,            // 30^-192
+    212149548916169413644283660602828329029,            // 30^-186
+    288071150257973936473359891361485890787,            // 30^-180
+    195581343526079319127909243854250027224,            // 30^-174
+    265573709142416387133758214804806317848,            // 30^-168
+    180307062310000458937613050074040708794,            // 30^-162
+    244833246663194772909432488501026624276,            // 30^-156
+    332451307806128616353452734867573546427,            // 30^-150
+    225712548373888955751123878842649157480,            // 30^-144
+    306487917461553679299669913344627685478,            // 30^-138
+    208085115840167395965624010961720331305,            // 30^-132
+    282552185370553343852869987471204477403,            // 30^-126
+    191834329753307055373436045708607941890,            // 30^-120
+    260485757869036576463347072380734960806,            // 30^-114
+    176852678401887104140389725347567150767,            // 30^-108
+    240142648210703765821352805529490956868,            // 30^-102
+    326082092794781635112624979076905003855,            // 30^-96
+    221388270750079128888532155889145795079,            // 30^-90
+    300616117896153936087600778123712697276,            // 30^-84
+    204098550552778150334824777443135675335,            // 30^-78
+    277138954685954882938577351637270128950,            // 30^-72
+    188159102542382767109407940268116001044,            // 30^-66
+    255495283293346012426090218975127795266,            // 30^-60
+    173464474753336275982316368848893943009,            // 30^-54
+    235541913835671069456466721167496749113,            // 30^-48
+    319834901366763207379289417958082873567,            // 30^-42
+    217146839104937741700096042539405091508,            // 30^-36
+    294856812260112936979848919457246198708,            // 30^-30
+    200188361236473853754168248068850933442,            // 30^-24
+    271829432512427567293473804075629134624,            // 30^-18
+    184554286581985369843377175900278276895,            // 30^-12
+    250600417923680198594596164731872945757,            // 30^-6
+    170141183460469231731687303715884105728,            // 30^0
+    231029321891594808422774159179776000000,            // 30^6
+    313707395752840890251476992000000000000,            // 30^12
+    212986666247081951232000000000000000000,            // 30^18
+    289207845356544000000000000000000000000,            // 30^24
+    196353084654473304748535156250000000000,            // 30^30
+    266621631967110632288608940143603831529,            // 30^36
+    181018532909474941844489348460628831000,            // 30^42
+    245799330046413899594233809090775284541,            // 30^48
+    333763121820680299409099755486799743829,            // 30^54
+    226603183715861233202026897808422346833,            // 30^60
+    307697282971558792524556831461079215336,            // 30^66
+    208906195393080226844550976655564036201,            // 30^72
+    283667103278554017412807162817392837984,            // 30^78
+    192591285603182277357146536646298485706,            // 30^84
+    261513604232519641878753574965804062932,            // 30^90
+    177550518406095745907734479894927853604,            // 30^96
+    241090223040513319460187919146199534233,            // 30^102
+    327368774631124380764508606973252185538,            // 30^108
+    222261842997828194477899721342605392688,            // 30^114
+    301802313971178147521594347169174498450,            // 30^120
+    204903899584886496461222208185427085841,            // 30^126
+    278232512618195742220116760148063945729,            // 30^132
+    188901556375124208702207652989717774500,            // 30^138
+    256503437827277086943219190518379691262,            // 30^144
+    174148945301850322989380722761059920238,            // 30^150
+    236471334705220322048773145103478211637,            // 30^156
+    321096932515698698858834100478208840422,            // 30^162
+    218003675159015088778073023304915283497,            // 30^168
+    296020282788056879712669614682501632104,            // 30^174
+    200978281118435287206001718625001320433,            // 30^180
+    272902039690575235287053981567967613406,            // 30^186
+    185282516232160242762660936045505469826,            // 30^192
+    251589257890814574386886921482483833102,            // 30^198
+    170812540689859376035668482781137073721,            // 30^204
+];
+const BASE30_LARGE_EXPONENT: [i32; 74] = [
+    -1276,                                              // 30^-234
+    -1246,                                              // 30^-228
+    -1217,                                              // 30^-222
+    -1187,                                              // 30^-216
+    -1158,                                              // 30^-210
+    -1129,                                              // 30^-204
+    -1099,                                              // 30^-198
+    -1070,                                              // 30^-192
+    -1040,                                              // 30^-186
+    -1011,                                              // 30^-180
+    -981,                                               // 30^-174
+    -952,                                               // 30^-168
+    -922,                                               // 30^-162
+    -893,                                               // 30^-156
+    -864,                                               // 30^-150
+    -834,                                               // 30^-144
+    -805,                                               // 30^-138
+    -775,                                               // 30^-132
+    -746,                                               // 30^-126
+    -716,                                               // 30^-120
+    -687,                                               // 30^-114
+    -657,                                               // 30^-108
+    -628,                                               // 30^-102
+    -599,                                               // 30^-96
+    -569,                                               // 30^-90
+    -540,                                               // 30^-84
+    -510,                                               // 30^-78
+    -481,                                               // 30^-72
+    -451,                                               // 30^-66
+    -422,                                               // 30^-60
+    -392,                                               // 30^-54
+    -363,                                               // 30^-48
+    -334,                                               // 30^-42
+    -304,                                               // 30^-36
+    -275,                                               // 30^-30
+    -245,                                               // 30^-24
+    -216,                                               // 30^-18
+    -186,                                               // 30^-12
+    -157,                                               // 30^-6
+    -127,                                               // 30^0
+    -98,                                                // 30^6
+    -69,                                                // 30^12
+    -39,                                                // 30^18
+    -10,                                                // 30^24
+    20,                                                 // 30^30
+    49,                                                 // 30^36
+    79,                                                 // 30^42
+    108,                                                // 30^48
+    137,                                                // 30^54
+    167,                                                // 30^60
+    196,                                                // 30^66
+    226,                                                // 30^72
+    255,                                                // 30^78
+    285,                                                // 30^84
+    314,                                                // 30^90
+    344,                                                // 30^96
+    373,                                                // 30^102
+    402,                                                // 30^108
+    432,                                                // 30^114
+    461,                                                // 30^120
+    491,                                                // 30^126
+    520,                                                // 30^132
+    550,                                                // 30^138
+    579,                                                // 30^144
+    609,                                                // 30^150
+    638,                                                // 30^156
+    667,                                                // 30^162
+    697,                                                // 30^168
+    726,                                                // 30^174
+    756,                                                // 30^180
+    785,                                                // 30^186
+    815,                                                // 30^192
+    844,                                                // 30^198
+    874,                                                // 30^204
+];
+const BASE30_SMALL_INT_POWERS: [u128; 6] = [1, 30, 900, 27000, 810000, 24300000];
+const BASE30_STEP: i32 = 6;
+const BASE30_BIAS: i32 = 234;
+
+// BASE31
+
+const BASE31_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 31^0
+    329648542954659136480144150949525454848,            // 31^1
+    319347025987326038465139646232352784384,            // 31^2
+    309367431425222099763104032287591759872,            // 31^3
+    299699699193183909145507031278604517376,            // 31^4
+    290334083593396911984709936551148126208,            // 31^5
+];
+const BASE31_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 31^0
+    -123,                                               // 31^1
+    -118,                                               // 31^2
+    -113,                                               // 31^3
+    -108,                                               // 31^4
+    -103,                                               // 31^5
+];
+const BASE31_LARGE_MANTISSA: [u128; 74] = [
+    279877549230888994466722529922465951128,            // 31^-234
+    231333407733284590292354000091386191754,            // 31^-228
+    191209140142019782313183919746595976478,            // 31^-222
+    316088675925298444140273004034743674741,            // 31^-216
+    261263794643914746305034655542823358647,            // 31^-210
+    215948167684024592485185159022754788335,            // 31^-204
+    178492435929157837038046463019461592108,            // 31^-198
+    295066635902569136770934561228011804883,            // 31^-192
+    243887980937787207068127465341221873783,            // 31^-186
+    201586150409601608540557644579125879351,            // 31^-180
+    333242957530806000015262416296943861408,            // 31^-174
+    275442704070282164877682412643443854572,            // 31^-168
+    227667776650720372831068985136241988697,            // 31^-162
+    188179304658062925738530341045324738580,            // 31^-156
+    311080041475689584245114254221154550706,            // 31^-150
+    257123896754632869764136622554477725012,            // 31^-144
+    212526325921342359594316086083656739425,            // 31^-138
+    175664105047096554749814041961690625344,            // 31^-132
+    290391109602281582919653498207198252857,            // 31^-126
+    240023414326551697067636257878891518439,            // 31^-120
+    198391884324143423870507706735824676989,            // 31^-114
+    327962502126029666246881442269148110223,            // 31^-108
+    271078131968920728852328597367236335349,            // 31^-102
+    224060229920801636254083864004341099802,            // 31^-96
+    185197478924335716894196793983277050828,            // 31^-90
+    306150772156692797734166574102932652557,            // 31^-84
+    253049598289706899575201136976026000492,            // 31^-78
+    209158705508044155113481306826330986049,            // 31^-72
+    172880590941369685133685946960988620150,            // 31^-66
+    285789670113326703641484035227164931190,            // 31^-60
+    236220084333189890382264913587684321799,            // 31^-54
+    195248233500715771863466694882341429463,            // 31^-48
+    322765719034956327944217102842371688313,            // 31^-42
+    266782719403631527651786656524762917448,            // 31^-36
+    220509847158485190531810693342620280466,            // 31^-30
+    182262902194543738831736462131829646508,            // 31^-24
+    301299610375241462753468658335350302125,            // 31^-18
+    249039859782804352657429715423616325073,            // 31^-12
+    205844447270932349829274233837837318735,            // 31^-6
+    170141183460469231731687303715884105728,            // 31^0
+    281261143481103258485187751033924747264,            // 31^6
+    232477020622927971041480650211423420416,            // 31^12
+    192154395906963839472434931204572053504,            // 31^18
+    317651282414350176352409831205456445952,            // 31^24
+    262555370495753687560337482407159416999,            // 31^30
+    217015722562838525119352550468059930336,            // 31^36
+    179374825776921533841673613411506136043,            // 31^42
+    296525318465664137401900073705767585881,            // 31^48
+    245093658238625334625948305994309525378,            // 31^54
+    202582705650977753904076181059390370572,            // 31^60
+    334890367411416504232175148268475073388,            // 31^66
+    276804374353098300220638069068074602530,            // 31^72
+    228793268236589371413606590094648720070,            // 31^78
+    189109582219266748069833984779993889354,            // 31^84
+    312617887429839722873414506299686714932,            // 31^90
+    258395006731549634868442333657079980382,            // 31^96
+    213576964685944914612871149421565862652,            // 31^102
+    176532512843220607081571440296564925357,            // 31^108
+    291826678373921783044839874892818001863,            // 31^114
+    241209986871908117885122799335937441435,            // 31^120
+    199372648487594099824157002892036768477,            // 31^126
+    329583807705824908665978895106558273752,            // 31^132
+    272418225684124763666228455375305707749,            // 31^138
+    225167887346958248891898253497228074938,            // 31^144
+    186113015621359245893427982047443315204,            // 31^150
+    307664249923018427479642383336104189758,            // 31^156
+    254300566687046383525258086411660098107,            // 31^162
+    210192696205470376085866529648531617961,            // 31^168
+    173735238240724141814430167095519087450,            // 31^174
+    287202491346848457988114640516635531033,            // 31^180
+    237387854850570349221700427782261535085,            // 31^186
+    196213456806330839063706448987155946803,            // 31^192
+    324361333953874416226256763524449662322,            // 31^198
+    268101578446229760174200876130811505774,            // 31^204
+];
+const BASE31_LARGE_EXPONENT: [i32; 74] = [
+    -1287,                                              // 31^-234
+    -1257,                                              // 31^-228
+    -1227,                                              // 31^-222
+    -1198,                                              // 31^-216
+    -1168,                                              // 31^-210
+    -1138,                                              // 31^-204
+    -1108,                                              // 31^-198
+    -1079,                                              // 31^-192
+    -1049,                                              // 31^-186
+    -1019,                                              // 31^-180
+    -990,                                               // 31^-174
+    -960,                                               // 31^-168
+    -930,                                               // 31^-162
+    -900,                                               // 31^-156
+    -871,                                               // 31^-150
+    -841,                                               // 31^-144
+    -811,                                               // 31^-138
+    -781,                                               // 31^-132
+    -752,                                               // 31^-126
+    -722,                                               // 31^-120
+    -692,                                               // 31^-114
+    -663,                                               // 31^-108
+    -633,                                               // 31^-102
+    -603,                                               // 31^-96
+    -573,                                               // 31^-90
+    -544,                                               // 31^-84
+    -514,                                               // 31^-78
+    -484,                                               // 31^-72
+    -454,                                               // 31^-66
+    -425,                                               // 31^-60
+    -395,                                               // 31^-54
+    -365,                                               // 31^-48
+    -336,                                               // 31^-42
+    -306,                                               // 31^-36
+    -276,                                               // 31^-30
+    -246,                                               // 31^-24
+    -217,                                               // 31^-18
+    -187,                                               // 31^-12
+    -157,                                               // 31^-6
+    -127,                                               // 31^0
+    -98,                                                // 31^6
+    -68,                                                // 31^12
+    -38,                                                // 31^18
+    -9,                                                 // 31^24
+    21,                                                 // 31^30
+    51,                                                 // 31^36
+    81,                                                 // 31^42
+    110,                                                // 31^48
+    140,                                                // 31^54
+    170,                                                // 31^60
+    199,                                                // 31^66
+    229,                                                // 31^72
+    259,                                                // 31^78
+    289,                                                // 31^84
+    318,                                                // 31^90
+    348,                                                // 31^96
+    378,                                                // 31^102
+    408,                                                // 31^108
+    437,                                                // 31^114
+    467,                                                // 31^120
+    497,                                                // 31^126
+    526,                                                // 31^132
+    556,                                                // 31^138
+    586,                                                // 31^144
+    616,                                                // 31^150
+    645,                                                // 31^156
+    675,                                                // 31^162
+    705,                                                // 31^168
+    735,                                                // 31^174
+    764,                                                // 31^180
+    794,                                                // 31^186
+    824,                                                // 31^192
+    853,                                                // 31^198
+    883,                                                // 31^204
+];
+const BASE31_SMALL_INT_POWERS: [u128; 6] = [1, 31, 961, 29791, 923521, 28629151];
+const BASE31_STEP: i32 = 6;
+const BASE31_BIAS: i32 = 234;
+
+// BASE33
+
+const BASE33_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 33^0
+    175458095443608895223302531957005484032,            // 33^1
+    180941160926221673199030736080661905408,            // 33^2
+    186595572205166100486500446583182589952,            // 33^3
+    192426683836577541126703585538907045888,            // 33^4
+    198440017706470589286913072586997891072,            // 33^5
+];
+const BASE33_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 33^0
+    -122,                                               // 33^1
+    -117,                                               // 33^2
+    -112,                                               // 33^3
+    -107,                                               // 33^4
+    -102,                                               // 33^5
+];
+const BASE33_LARGE_MANTISSA: [u128; 72] = [
+    312720366502509540124188550868577470271,            // 33^-228
+    188065849520234218420139418711557486770,            // 33^-222
+    226200577540468899968415353242546081790,            // 33^-216
+    272068009211510778916881923005514361559,            // 33^-210
+    327236130168906522048072439540872358087,            // 33^-204
+    196795435814493025178219114364462772750,            // 33^-198
+    236700290627603575579431376108202583063,            // 33^-192
+    284696783496570703658001718555889571262,            // 33^-186
+    171212841180688182412693440011648609110,            // 33^-180
+    205930229524469868245369490973155168397,            // 33^-174
+    247687376364759110421449812279701734754,            // 33^-168
+    297911756579516503503766398038992340964,            // 33^-162
+    179160149400574418614614090847719005026,            // 33^-156
+    215489039450973655880961058312920063458,            // 33^-150
+    259184457474862991304220337185522020620,            // 33^-144
+    311740138466868713435648102307209093287,            // 33^-138
+    187476353478425047886734580102095167043,            // 33^-132
+    225491547456297727220699982909970598320,            // 33^-126
+    271215206775862669602998925081523543654,            // 33^-120
+    326210402191372960931717472229356291097,            // 33^-114
+    196178576715647050727159488732861667611,            // 33^-108
+    235958348989735718000162987087766864735,            // 33^-102
+    283804395923732956473182174007605293342,            // 33^-96
+    170676171219393275768862099029406252664,            // 33^-90
+    205284737238107330416766226733647440005,            // 33^-84
+    246910995494199118965634147066154669324,            // 33^-78
+    296977946418022259559609845940558313794,            // 33^-72
+    178598568447993152099773363289076713958,            // 33^-66
+    214813584890064968045989415466080479007,            // 33^-60
+    258372038781252962127704032685119793391,            // 33^-54
+    310762982974959535779710715380461212334,            // 33^-48
+    186888705223357570139042022172334279947,            // 33^-42
+    224784739840635370899218738060963824868,            // 33^-36
+    270365077465939099085308357449561310080,            // 33^-30
+    325187889378018709806160016110270251585,            // 33^-24
+    195563651173574149793648095659417101115,            // 33^-18
+    235218732982278125085778976978720276897,            // 33^-12
+    282914805556997697053159518336509943216,            // 33^-6
+    170141183460469231731687303715884105728,            // 33^0
+    204641268259797795202129106105341575168,            // 33^6
+    246137048204490191229033862368809975808,            // 33^12
+    296047063302535604636168085099824283648,            // 33^18
+    178038747781766620403928207609098977344,            // 33^24
+    214140247554538205717741625292909706188,            // 33^30
+    257562166629747183314707096744136073023,            // 33^36
+    309788890395834268833431845588643035745,            // 33^42
+    186302898963108514077454910111746951397,            // 33^48
+    224080147727111315915564635257325506176,            // 33^54
+    269517612902775795573733407057825442248,            // 33^60
+    324168581650849479410768181980047458277,            // 33^66
+    194950653127503229444535496044715069916,            // 33^72
+    234481435315497306894208542281087212757,            // 33^78
+    282028003628468309677795696968404883305,            // 33^84
+    339215745262040382698593524434347927396,            // 33^90
+    203999816247443047277506123370388146319,            // 33^96
+    245365526867526093228395853689144006062,            // 33^102
+    295119098058174229856749108333084701428,            // 33^108
+    177480681884243207276442522127875068624,            // 33^114
+    213469020807909470054649976638820369879,            // 33^120
+    256754833038160188521579955085771893751,            // 33^126
+    308817851128733566186038756059234075639,            // 33^132
+    185718928923909504089695656878457160369,            // 33^138
+    223377764171191270264346565880758640128,            // 33^144
+    268672804733672512805858396506074869210,            // 33^150
+    323152468963460648455199258995519212913,            // 33^156
+    194339576535660800930047023345366203227,            // 33^162
+    233746448722509584063702393615930970798,            // 33^168
+    281143981397731320107155010945727058593,            // 33^174
+    338152466949356579395454697640846384307,            // 33^180
+    203360374878824300807265157901557614739,            // 33^186
+    244596423879111037469845073222731160599,            // 33^192
+    294194041538814672349638971928150296782,            // 33^198
+];
+const BASE33_LARGE_EXPONENT: [i32; 72] = [
+    -1278,                                              // 33^-228
+    -1247,                                              // 33^-222
+    -1217,                                              // 33^-216
+    -1187,                                              // 33^-210
+    -1157,                                              // 33^-204
+    -1126,                                              // 33^-198
+    -1096,                                              // 33^-192
+    -1066,                                              // 33^-186
+    -1035,                                              // 33^-180
+    -1005,                                              // 33^-174
+    -975,                                               // 33^-168
+    -945,                                               // 33^-162
+    -914,                                               // 33^-156
+    -884,                                               // 33^-150
+    -854,                                               // 33^-144
+    -824,                                               // 33^-138
+    -793,                                               // 33^-132
+    -763,                                               // 33^-126
+    -733,                                               // 33^-120
+    -703,                                               // 33^-114
+    -672,                                               // 33^-108
+    -642,                                               // 33^-102
+    -612,                                               // 33^-96
+    -581,                                               // 33^-90
+    -551,                                               // 33^-84
+    -521,                                               // 33^-78
+    -491,                                               // 33^-72
+    -460,                                               // 33^-66
+    -430,                                               // 33^-60
+    -400,                                               // 33^-54
+    -370,                                               // 33^-48
+    -339,                                               // 33^-42
+    -309,                                               // 33^-36
+    -279,                                               // 33^-30
+    -249,                                               // 33^-24
+    -218,                                               // 33^-18
+    -188,                                               // 33^-12
+    -158,                                               // 33^-6
+    -127,                                               // 33^0
+    -97,                                                // 33^6
+    -67,                                                // 33^12
+    -37,                                                // 33^18
+    -6,                                                 // 33^24
+    24,                                                 // 33^30
+    54,                                                 // 33^36
+    84,                                                 // 33^42
+    115,                                                // 33^48
+    145,                                                // 33^54
+    175,                                                // 33^60
+    205,                                                // 33^66
+    236,                                                // 33^72
+    266,                                                // 33^78
+    296,                                                // 33^84
+    326,                                                // 33^90
+    357,                                                // 33^96
+    387,                                                // 33^102
+    417,                                                // 33^108
+    448,                                                // 33^114
+    478,                                                // 33^120
+    508,                                                // 33^126
+    538,                                                // 33^132
+    569,                                                // 33^138
+    599,                                                // 33^144
+    629,                                                // 33^150
+    659,                                                // 33^156
+    690,                                                // 33^162
+    720,                                                // 33^168
+    750,                                                // 33^174
+    780,                                                // 33^180
+    811,                                                // 33^186
+    841,                                                // 33^192
+    871,                                                // 33^198
+];
+const BASE33_SMALL_INT_POWERS: [u128; 6] = [1, 33, 1089, 35937, 1185921, 39135393];
+const BASE33_STEP: i32 = 6;
+const BASE33_BIAS: i32 = 228;
+
+// BASE34
+
+const BASE34_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 34^0
+    180775007426748558714917760198126862336,            // 34^1
+    192073445390920343634600120210509791232,            // 34^2
+    204078035727852865111762627723666653184,            // 34^3
+    216832912960843669181247791956395819008,            // 34^4
+    230384970020896398505075778953670557696,            // 34^5
+];
+const BASE34_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 34^0
+    -122,                                               // 34^1
+    -117,                                               // 34^2
+    -112,                                               // 34^3
+    -107,                                               // 34^4
+    -102,                                               // 34^5
+];
+const BASE34_LARGE_MANTISSA: [u128; 72] = [
+    177178627816250193201809052313908765038,            // 34^-228
+    254908880844119689445018585029338745822,            // 34^-222
+    183370134237042583472660416437030762483,            // 34^-216
+    263816670637481076390123392064426194701,            // 34^-210
+    189778002824260993825223275854263893366,            // 34^-204
+    273035743108558333663040444930692235847,            // 34^-198
+    196409794352921881357331916371145369426,            // 34^-192
+    282576976029244796208883094031259474966,            // 34^-186
+    203273333809293576669182005378991774735,            // 34^-180
+    292451627295127901322196175360309190338,            // 34^-174
+    210376719623757394611528557965027181599,            // 34^-168
+    302671348208910116654395983418902348443,            // 34^-162
+    217728333226311038599715596529740433091,            // 34^-156
+    313248197228018957952397977805898800839,            // 34^-150
+    225336848935989032116058614991615739830,            // 34^-144
+    324194654192627182361160566056046446660,            // 34^-138
+    233211244195868906543198111154344051285,            // 34^-132
+    335523635050871088900625460663893770435,            // 34^-126
+    241360810165739638162969982622013142483,            // 34^-120
+    173624253549320755964330470575918052959,            // 34^-114
+    249795162684930840147804514904540284970,            // 34^-108
+    179691552375964624115693619162436412029,            // 34^-102
+    258524253618237975606418771469177669493,            // 34^-96
+    185970872935167515117533503151908736546,            // 34^-90
+    267558382598330880564928534158522761469,            // 34^-84
+    192469624325502244069180532494789364726,            // 34^-78
+    276908209178500704519431941303594138118,            // 34^-72
+    199195474556460799929094324231727524305,            // 34^-66
+    286584765410084542875511011996966308779,            // 34^-60
+    206156359596095351859662099550265135432,            // 34^-54
+    296599468859408121472112670217716316867,            // 34^-48
+    213360492734829033350750838314127106094,            // 34^-42
+    306964136079605489713373754120772284157,            // 34^-36
+    220816374276485055706958449270700673524,            // 34^-30
+    317690996553211397504541477525504659745,            // 34^-24
+    228532801567968794073232940648013889325,            // 34^-18
+    328792707121977505492535302517672775182,            // 34^-12
+    236518879379437072732268269343858967136,            // 34^-6
+    170141183460469231731687303715884105728,            // 34^0
+    244784030647202423411643015138274967552,            // 34^6
+    176086766417174433233313223161344425984,            // 34^12
+    253338007592048088741599978367647481856,            // 34^18
+    182240117745863932172015090234506084352,            // 34^24
+    262190903226072497809728032921351003168,            // 34^30
+    188608497911442742195268251474898499613,            // 34^36
+    271353163261640374618023568003458637143,            // 34^42
+    195199421095732140407812372336079928061,            // 34^48
+    280835598436492094076350884217966821974,            // 34^54
+    202020664063606263361049018383687293681,            // 34^60
+    290649397269553933781951224423558743337,            // 34^66
+    209080275338955809947349984471742343690,            // 34^72
+    300806139262500062617960370620227418603,            // 34^78
+    216386584701305758176605078134277823932,            // 34^84
+    311317808562643058781928971959145202656,            // 34^90
+    223948213014292349032159641795245781843,            // 34^96
+    322196808103274080809106622508050735664,            // 34^102
+    231774082397596158130210248504430880773,            // 34^108
+    333455974238137167751959613429477643393,            // 34^114
+    239873426754333326759263874720553852658,            // 34^120
+    172554295943652591814138834633669982456,            // 34^126
+    248255802666326436218178945574152405546,            // 34^132
+    178584205106164167247426311765412935775,            // 34^138
+    256931100670110578075784008065054807112,            // 34^144
+    184824829419575343010846487395966556532,            // 34^150
+    265909556926979410208640982981191461086,            // 34^156
+    191283532323968216046404126970062690800,            // 34^162
+    275201765300840924300371814765015192837,            // 34^168
+    197967934574808286676526111499839216564,            // 34^174
+    284818689858133833493377548255268489047,            // 34^180
+    204885923234829474007514465274285458561,            // 34^186
+    294771677804553486829405243638525556429,            // 34^192
+    212045660980140516237478265085420658486,            // 34^198
+];
+const BASE34_LARGE_EXPONENT: [i32; 72] = [
+    -1287,                                              // 34^-228
+    -1257,                                              // 34^-222
+    -1226,                                              // 34^-216
+    -1196,                                              // 34^-210
+    -1165,                                              // 34^-204
+    -1135,                                              // 34^-198
+    -1104,                                              // 34^-192
+    -1074,                                              // 34^-186
+    -1043,                                              // 34^-180
+    -1013,                                              // 34^-174
+    -982,                                               // 34^-168
+    -952,                                               // 34^-162
+    -921,                                               // 34^-156
+    -891,                                               // 34^-150
+    -860,                                               // 34^-144
+    -830,                                               // 34^-138
+    -799,                                               // 34^-132
+    -769,                                               // 34^-126
+    -738,                                               // 34^-120
+    -707,                                               // 34^-114
+    -677,                                               // 34^-108
+    -646,                                               // 34^-102
+    -616,                                               // 34^-96
+    -585,                                               // 34^-90
+    -555,                                               // 34^-84
+    -524,                                               // 34^-78
+    -494,                                               // 34^-72
+    -463,                                               // 34^-66
+    -433,                                               // 34^-60
+    -402,                                               // 34^-54
+    -372,                                               // 34^-48
+    -341,                                               // 34^-42
+    -311,                                               // 34^-36
+    -280,                                               // 34^-30
+    -250,                                               // 34^-24
+    -219,                                               // 34^-18
+    -189,                                               // 34^-12
+    -158,                                               // 34^-6
+    -127,                                               // 34^0
+    -97,                                                // 34^6
+    -66,                                                // 34^12
+    -36,                                                // 34^18
+    -5,                                                 // 34^24
+    25,                                                 // 34^30
+    56,                                                 // 34^36
+    86,                                                 // 34^42
+    117,                                                // 34^48
+    147,                                                // 34^54
+    178,                                                // 34^60
+    208,                                                // 34^66
+    239,                                                // 34^72
+    269,                                                // 34^78
+    300,                                                // 34^84
+    330,                                                // 34^90
+    361,                                                // 34^96
+    391,                                                // 34^102
+    422,                                                // 34^108
+    452,                                                // 34^114
+    483,                                                // 34^120
+    514,                                                // 34^126
+    544,                                                // 34^132
+    575,                                                // 34^138
+    605,                                                // 34^144
+    636,                                                // 34^150
+    666,                                                // 34^156
+    697,                                                // 34^162
+    727,                                                // 34^168
+    758,                                                // 34^174
+    788,                                                // 34^180
+    819,                                                // 34^186
+    849,                                                // 34^192
+    880,                                                // 34^198
+];
+const BASE34_SMALL_INT_POWERS: [u128; 6] = [1, 34, 1156, 39304, 1336336, 45435424];
+const BASE34_STEP: i32 = 6;
+const BASE34_BIAS: i32 = 228;
+
+// BASE35
+
+const BASE35_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 35^0
+    186091919409888222206532988439248240640,            // 35^1
+    203538036854565243038395456105427763200,            // 35^2
+    222619727809680734573245030115311616000,            // 35^3
+    243490327291838303439486751688622080000,            // 35^4
+    266317545475448144386938634659430400000,            // 35^5
+];
+const BASE35_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 35^0
+    -122,                                               // 35^1
+    -117,                                               // 35^2
+    -112,                                               // 35^3
+    -107,                                               // 35^4
+    -102,                                               // 35^5
+];
+const BASE35_LARGE_MANTISSA: [u128; 71] = [
+    209347927024496598038547144935237941328,            // 35^-222
+    179203738418473223738234323205585013488,            // 35^-216
+    306800075067366652359189609572260396844,            // 35^-210
+    262623667597658781475957209306702595701,            // 35^-204
+    224808259148244964176155115402974869951,            // 35^-198
+    192437923982884034851744022831878031683,            // 35^-192
+    329457242604437106875016361913696434196,            // 35^-186
+    282018410035885035080273518999343445370,            // 35^-180
+    241410335891937127541744115564170038883,            // 35^-174
+    206649453374488156391879990784284316065,            // 35^-168
+    176893820317164915550880607303262990177,            // 35^-162
+    302845453064861578599747045789577351117,            // 35^-156
+    259238475028744868618971960605253012775,            // 35^-150
+    221910503377561727015952290044860359194,            // 35^-144
+    189957418565367403947310019950147953923,            // 35^-138
+    325210571999150993462493010696415973233,            // 35^-132
+    278383221194439940371876875109029372360,            // 35^-126
+    238298581027663491439386725539968731964,            // 35^-120
+    203985762777473298078638682440591083627,            // 35^-114
+    174613676827044081042213382537397413381,            // 35^-108
+    298941805740831610317914779329181594758,            // 35^-102
+    255896917250379178747915691007066092001,            // 35^-96
+    219050099386294168656703063834650082992,            // 35^-90
+    187508886612326915552639247886565481996,            // 35^-84
+    321018640549353575448221161417409055741,            // 35^-78
+    274794889570264049674062490664049677426,            // 35^-72
+    235226936369523138128743288428339150410,            // 35^-66
+    201356406883409564599485887013038683702,            // 35^-60
+    172362924156377643998457025163202983813,            // 35^-54
+    295088476036816041433113722500648405442,            // 35^-48
+    252598431814515573631538400793788490787,            // 35^-42
+    216226565713775509518577464877951003673,            // 35^-36
+    185091915989032531210622402180350455682,            // 35^-30
+    316880742672855387564028424008808371736,            // 35^-24
+    271252811178556028546302550648486766486,            // 35^-18
+    232194884901007304160476988045002650981,            // 35^-12
+    198760943121441293094365080225590768425,            // 35^-6
+    170141183460469231731687303715884105728,            // 35^0
+    291284815363771407923214131658752000000,            // 35^6
+    249342463523006462279286784000000000000,            // 35^12
+    213439427105318371328000000000000000000,            // 35^18
+    182706099873129286194801330566406250000,            // 35^24
+    312796181882350172840701732490664710439,            // 35^30
+    267756389819817671992755772413469185401,            // 35^36
+    229201916269897841937750664282591869365,            // 35^42
+    196198934625406481835921498002300001382,            // 35^48
+    335896161555784742544555459149306885413,            // 35^54
+    287530183492901554386658282699185698307,            // 35^60
+    246128464334152340394473578644658105769,            // 35^66
+    210688214432220328999897334535237907298,            // 35^72
+    180351036686161310983217274120661055754,            // 35^78
+    308764270668182755993104788402294107778,            // 35^84
+    264305036979502132888830858069861274896,            // 35^90
+    226247526702365186299998179464172492810,            // 35^96
+    193669950160303864708173829536684422103,            // 35^102
+    331566493935091266452974274160244175815,            // 35^108
+    283823948447894890028153679891537227671,            // 35^114
+    242955893270455896832007072848205740580,            // 35^120
+    207972464612800582882401068589523181243,            // 35^126
+    178026330025978501184229413909552478799,            // 35^132
+    304784330382628027085206214062708598478,            // 35^138
+    260898171728955674614898641290082042559,            // 35^144
+    223331218918173589647399860035052277272,            // 35^150
+    191173564049707817673529979461919468076,            // 35^156
+    327292635293038256953486831534470016773,            // 35^162
+    280165486398550695538293601153410149006,            // 35^168
+    239824216327565160313568077123618791086,            // 35^174
+    205291720534454460326603808102056989101,            // 35^180
+    175731588600014458664842906141703880790,            // 35^186
+    300855691125661557416025651977765954086,            // 35^192
+    257535220627636274500677259708261311842,            // 35^198
+];
+const BASE35_LARGE_EXPONENT: [i32; 71] = [
+    -1266,                                              // 35^-222
+    -1235,                                              // 35^-216
+    -1205,                                              // 35^-210
+    -1174,                                              // 35^-204
+    -1143,                                              // 35^-198
+    -1112,                                              // 35^-192
+    -1082,                                              // 35^-186
+    -1051,                                              // 35^-180
+    -1020,                                              // 35^-174
+    -989,                                               // 35^-168
+    -958,                                               // 35^-162
+    -928,                                               // 35^-156
+    -897,                                               // 35^-150
+    -866,                                               // 35^-144
+    -835,                                               // 35^-138
+    -805,                                               // 35^-132
+    -774,                                               // 35^-126
+    -743,                                               // 35^-120
+    -712,                                               // 35^-114
+    -681,                                               // 35^-108
+    -651,                                               // 35^-102
+    -620,                                               // 35^-96
+    -589,                                               // 35^-90
+    -558,                                               // 35^-84
+    -528,                                               // 35^-78
+    -497,                                               // 35^-72
+    -466,                                               // 35^-66
+    -435,                                               // 35^-60
+    -404,                                               // 35^-54
+    -374,                                               // 35^-48
+    -343,                                               // 35^-42
+    -312,                                               // 35^-36
+    -281,                                               // 35^-30
+    -251,                                               // 35^-24
+    -220,                                               // 35^-18
+    -189,                                               // 35^-12
+    -158,                                               // 35^-6
+    -127,                                               // 35^0
+    -97,                                                // 35^6
+    -66,                                                // 35^12
+    -35,                                                // 35^18
+    -4,                                                 // 35^24
+    26,                                                 // 35^30
+    57,                                                 // 35^36
+    88,                                                 // 35^42
+    119,                                                // 35^48
+    149,                                                // 35^54
+    180,                                                // 35^60
+    211,                                                // 35^66
+    242,                                                // 35^72
+    273,                                                // 35^78
+    303,                                                // 35^84
+    334,                                                // 35^90
+    365,                                                // 35^96
+    396,                                                // 35^102
+    426,                                                // 35^108
+    457,                                                // 35^114
+    488,                                                // 35^120
+    519,                                                // 35^126
+    550,                                                // 35^132
+    580,                                                // 35^138
+    611,                                                // 35^144
+    642,                                                // 35^150
+    673,                                                // 35^156
+    703,                                                // 35^162
+    734,                                                // 35^168
+    765,                                                // 35^174
+    796,                                                // 35^180
+    827,                                                // 35^186
+    857,                                                // 35^192
+    888,                                                // 35^198
+];
+const BASE35_SMALL_INT_POWERS: [u128; 6] = [1, 35, 1225, 42875, 1500625, 52521875];
+const BASE35_STEP: i32 = 6;
+const BASE35_BIAS: i32 = 222;
+
+// BASE36
+
+const BASE36_SMALL_MANTISSA: [u128; 6] = [
+    170141183460469231731687303715884105728,            // 36^0
+    191408831393027885698148216680369618944,            // 36^1
+    215334935317156371410416743765415821312,            // 36^2
+    242251802231800917836718836736092798976,            // 36^3
+    272533277510776032566308691328104398848,            // 36^4
+    306599937199623036637097277744117448704,            // 36^5
+];
+const BASE36_SMALL_EXPONENT: [i32; 6] = [
+    -127,                                               // 36^0
+    -122,                                               // 36^1
+    -117,                                               // 36^2
+    -112,                                               // 36^3
+    -107,                                               // 36^4
+    -102,                                               // 36^5
+];
+const BASE36_LARGE_MANTISSA: [u128; 71] = [
+    206105367118290399407064648402758144682,            // 36^-222
+    208917317212507950117664039252872831665,            // 36^-216
+    211767631486382365261996259087726574961,            // 36^-210
+    214656833352574406771088703014069554755,            // 36^-204
+    217585453364802351586979201161384846208,            // 36^-198
+    220554029315269330081435801781477974040,            // 36^-192
+    223563106333419891448609016293621894840,            // 36^-186
+    226613236986043931067161987739751269180,            // 36^-180
+    229704981378746362247969882824709232796,            // 36^-174
+    232838907258801165579649662968151663564,            // 36^-168
+    236015590119408703302029793810763336632,            // 36^-162
+    239235613305375443823879271798297650114,            // 36^-156
+    242499568120235502703106353919523432682,            // 36^-150
+    245808053934833671173174941698733239342,            // 36^-144
+    249161678297389871677290466673500998400,            // 36^-138
+    252561057045065251911260457800735557729,            // 36^-132
+    256006814417050404626793229969178591795,            // 36^-126
+    259499583169196479959998361450291137700,            // 36^-120
+    263040004690210240376322725691803307553,            // 36^-114
+    266628729119434395515123988465075762881,            // 36^-108
+    270266415466234845327287688358055741312,            // 36^-102
+    273953731731016754981191818978678705632,            // 36^-96
+    277691355027891684120101092281051616669,            // 36^-90
+    281479971709018296242657937208050445965,            // 36^-84
+    285320277490639481303204301467482637509,            // 36^-78
+    289212977580839036146652597763405686112,            // 36^-72
+    293158786809041363160730749526943361727,            // 36^-66
+    297158429757277967604640789526650060843,            // 36^-60
+    301212640893244858516269504216828222245,            // 36^-54
+    305322164705175286969651759320250334279,            // 36^-48
+    309487755838552588810803796052767101096,            // 36^-42
+    313710179234688236904530296665341569850,            // 36^-36
+    317990210271190550439415903835536554761,            // 36^-30
+    322328634904349856025836233807108654402,            // 36^-24
+    326726249813466247246220462666861782844,            // 36^-18
+    331183862547146446042592332649497399781,            // 36^-12
+    335702291671596630919115661345637412333,            // 36^-6
+    170141183460469231731687303715884105728,            // 36^0
+    172462464674787958108367218731066064896,            // 36^6
+    174815415743320440759790006808579407872,            // 36^12
+    177200468746272961345336076752392290304,            // 36^18
+    179618061658836457920697688990341398528,            // 36^24
+    182068638431613361423174859113151594496,            // 36^30
+    184552649072141716781794491390137475072,            // 36^36
+    187070549727531559196917812917453861026,            // 36^42
+    189622802768228720381105803326920695033,            // 36^48
+    192209876872921446586714266254161951235,            // 36^54
+    194832247114605420104007752175098574688,            // 36^60
+    197490395047822988635051696441052554380,            // 36^66
+    200184808797092622572327630249651738267,            // 36^72
+    202915983146544838776512848181734408257,            // 36^78
+    205684419630781050995309380627725821797,            // 36^84
+    208490626626972031635281014538153149532,            // 36^90
+    211335119448212897232599978727666183358,            // 36^96
+    214218420438151760708217936124820030498,            // 36^102
+    217141059066909427380630585083218539864,            // 36^108
+    220103572028307748788051030668660629356,            // 36^114
+    223106503338424488684979682521025988628,            // 36^120
+    226150404435492799169987273137391228527,            // 36^126
+    229235834281163651816744244429413474808,            // 36^132
+    232363359463149818964276081092475750857,            // 36^138
+    235533554299270254021060647605641184828,            // 36^144
+    238747000942913976797497733353022683918,            // 36^150
+    242004289489942830549695955106475311593,            // 36^156
+    245306018087052741642305313258629505287,            // 36^162
+    248652793041613380567795520750960012282,            // 36^168
+    252045228933006394543323172270604972624,            // 36^174
+    255483948725482657093998355855298189652,            // 36^180
+    258969583882559258973487053363982248701,            // 36^186
+    262502774482977247520692697766891651596,            // 36^192
+    266084169338241408156670471179837543899,            // 36^198
+];
+const BASE36_LARGE_EXPONENT: [i32; 71] = [
+    -1275,                                              // 36^-222
+    -1244,                                              // 36^-216
+    -1213,                                              // 36^-210
+    -1182,                                              // 36^-204
+    -1151,                                              // 36^-198
+    -1120,                                              // 36^-192
+    -1089,                                              // 36^-186
+    -1058,                                              // 36^-180
+    -1027,                                              // 36^-174
+    -996,                                               // 36^-168
+    -965,                                               // 36^-162
+    -934,                                               // 36^-156
+    -903,                                               // 36^-150
+    -872,                                               // 36^-144
+    -841,                                               // 36^-138
+    -810,                                               // 36^-132
+    -779,                                               // 36^-126
+    -748,                                               // 36^-120
+    -717,                                               // 36^-114
+    -686,                                               // 36^-108
+    -655,                                               // 36^-102
+    -624,                                               // 36^-96
+    -593,                                               // 36^-90
+    -562,                                               // 36^-84
+    -531,                                               // 36^-78
+    -500,                                               // 36^-72
+    -469,                                               // 36^-66
+    -438,                                               // 36^-60
+    -407,                                               // 36^-54
+    -376,                                               // 36^-48
+    -345,                                               // 36^-42
+    -314,                                               // 36^-36
+    -283,                                               // 36^-30
+    -252,                                               // 36^-24
+    -221,                                               // 36^-18
+    -190,                                               // 36^-12
+    -159,                                               // 36^-6
+    -127,                                               // 36^0
+    -96,                                                // 36^6
+    -65,                                                // 36^12
+    -34,                                                // 36^18
+    -3,                                                 // 36^24
+    28,                                                 // 36^30
+    59,                                                 // 36^36
+    90,                                                 // 36^42
+    121,                                                // 36^48
+    152,                                                // 36^54
+    183,                                                // 36^60
+    214,                                                // 36^66
+    245,                                                // 36^72
+    276,                                                // 36^78
+    307,                                                // 36^84
+    338,                                                // 36^90
+    369,                                                // 36^96
+    400,                                                // 36^102
+    431,                                                // 36^108
+    462,                                                // 36^114
+    493,                                                // 36^120
+    524,                                                // 36^126
+    555,                                                // 36^132
+    586,                                                // 36^138
+    617,                                                // 36^144
+    648,                                                // 36^150
+    679,                                                // 36^156
+    710,                                                // 36^162
+    741,                                                // 36^168
+    772,                                                // 36^174
+    803,                                                // 36^180
+    834,                                                // 36^186
+    865,                                                // 36^192
+    896,                                                // 36^198
+];
+const BASE36_SMALL_INT_POWERS: [u128; 6] = [1, 36, 1296, 46656, 1679616, 60466176];
+const BASE36_STEP: i32 = 6;
+const BASE36_BIAS: i32 = 222;
+
+}}  // cfg_if
+
+// HIGH LEVEL
+// ----------
+
+pub(crate) const BASE10_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE10_SMALL_MANTISSA, exp: &BASE10_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE10_LARGE_MANTISSA, exp: &BASE10_LARGE_EXPONENT },
+    small_int: &BASE10_SMALL_INT_POWERS,
+    step: BASE10_STEP,
+    bias: BASE10_BIAS,
+};
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+pub(crate) const BASE3_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE3_SMALL_MANTISSA, exp: &BASE3_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE3_LARGE_MANTISSA, exp: &BASE3_LARGE_EXPONENT },
+    small_int: &BASE3_SMALL_INT_POWERS,
+    step: BASE3_STEP,
+    bias: BASE3_BIAS,
+};
+
+pub(crate) const BASE5_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE5_SMALL_MANTISSA, exp: &BASE5_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE5_LARGE_MANTISSA, exp: &BASE5_LARGE_EXPONENT },
+    small_int: &BASE5_SMALL_INT_POWERS,
+    step: BASE5_STEP,
+    bias: BASE5_BIAS,
+};
+
+pub(crate) const BASE6_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE6_SMALL_MANTISSA, exp: &BASE6_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE6_LARGE_MANTISSA, exp: &BASE6_LARGE_EXPONENT },
+    small_int: &BASE6_SMALL_INT_POWERS,
+    step: BASE6_STEP,
+    bias: BASE6_BIAS,
+};
+
+pub(crate) const BASE7_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE7_SMALL_MANTISSA, exp: &BASE7_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE7_LARGE_MANTISSA, exp: &BASE7_LARGE_EXPONENT },
+    small_int: &BASE7_SMALL_INT_POWERS,
+    step: BASE7_STEP,
+    bias: BASE7_BIAS,
+};
+
+pub(crate) const BASE9_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE9_SMALL_MANTISSA, exp: &BASE9_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE9_LARGE_MANTISSA, exp: &BASE9_LARGE_EXPONENT },
+    small_int: &BASE9_SMALL_INT_POWERS,
+    step: BASE9_STEP,
+    bias: BASE9_BIAS,
+};
+
+pub(crate) const BASE11_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE11_SMALL_MANTISSA, exp: &BASE11_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE11_LARGE_MANTISSA, exp: &BASE11_LARGE_EXPONENT },
+    small_int: &BASE11_SMALL_INT_POWERS,
+    step: BASE11_STEP,
+    bias: BASE11_BIAS,
+};
+
+pub(crate) const BASE12_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE12_SMALL_MANTISSA, exp: &BASE12_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE12_LARGE_MANTISSA, exp: &BASE12_LARGE_EXPONENT },
+    small_int: &BASE12_SMALL_INT_POWERS,
+    step: BASE12_STEP,
+    bias: BASE12_BIAS,
+};
+
+pub(crate) const BASE13_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE13_SMALL_MANTISSA, exp: &BASE13_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE13_LARGE_MANTISSA, exp: &BASE13_LARGE_EXPONENT },
+    small_int: &BASE13_SMALL_INT_POWERS,
+    step: BASE13_STEP,
+    bias: BASE13_BIAS,
+};
+
+pub(crate) const BASE14_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE14_SMALL_MANTISSA, exp: &BASE14_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE14_LARGE_MANTISSA, exp: &BASE14_LARGE_EXPONENT },
+    small_int: &BASE14_SMALL_INT_POWERS,
+    step: BASE14_STEP,
+    bias: BASE14_BIAS,
+};
+
+pub(crate) const BASE15_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE15_SMALL_MANTISSA, exp: &BASE15_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE15_LARGE_MANTISSA, exp: &BASE15_LARGE_EXPONENT },
+    small_int: &BASE15_SMALL_INT_POWERS,
+    step: BASE15_STEP,
+    bias: BASE15_BIAS,
+};
+
+pub(crate) const BASE17_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE17_SMALL_MANTISSA, exp: &BASE17_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE17_LARGE_MANTISSA, exp: &BASE17_LARGE_EXPONENT },
+    small_int: &BASE17_SMALL_INT_POWERS,
+    step: BASE17_STEP,
+    bias: BASE17_BIAS,
+};
+
+pub(crate) const BASE18_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE18_SMALL_MANTISSA, exp: &BASE18_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE18_LARGE_MANTISSA, exp: &BASE18_LARGE_EXPONENT },
+    small_int: &BASE18_SMALL_INT_POWERS,
+    step: BASE18_STEP,
+    bias: BASE18_BIAS,
+};
+
+pub(crate) const BASE19_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE19_SMALL_MANTISSA, exp: &BASE19_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE19_LARGE_MANTISSA, exp: &BASE19_LARGE_EXPONENT },
+    small_int: &BASE19_SMALL_INT_POWERS,
+    step: BASE19_STEP,
+    bias: BASE19_BIAS,
+};
+
+pub(crate) const BASE20_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE20_SMALL_MANTISSA, exp: &BASE20_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE20_LARGE_MANTISSA, exp: &BASE20_LARGE_EXPONENT },
+    small_int: &BASE20_SMALL_INT_POWERS,
+    step: BASE20_STEP,
+    bias: BASE20_BIAS,
+};
+
+pub(crate) const BASE21_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE21_SMALL_MANTISSA, exp: &BASE21_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE21_LARGE_MANTISSA, exp: &BASE21_LARGE_EXPONENT },
+    small_int: &BASE21_SMALL_INT_POWERS,
+    step: BASE21_STEP,
+    bias: BASE21_BIAS,
+};
+
+pub(crate) const BASE22_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE22_SMALL_MANTISSA, exp: &BASE22_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE22_LARGE_MANTISSA, exp: &BASE22_LARGE_EXPONENT },
+    small_int: &BASE22_SMALL_INT_POWERS,
+    step: BASE22_STEP,
+    bias: BASE22_BIAS,
+};
+
+pub(crate) const BASE23_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE23_SMALL_MANTISSA, exp: &BASE23_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE23_LARGE_MANTISSA, exp: &BASE23_LARGE_EXPONENT },
+    small_int: &BASE23_SMALL_INT_POWERS,
+    step: BASE23_STEP,
+    bias: BASE23_BIAS,
+};
+
+pub(crate) const BASE24_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE24_SMALL_MANTISSA, exp: &BASE24_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE24_LARGE_MANTISSA, exp: &BASE24_LARGE_EXPONENT },
+    small_int: &BASE24_SMALL_INT_POWERS,
+    step: BASE24_STEP,
+    bias: BASE24_BIAS,
+};
+
+pub(crate) const BASE25_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE25_SMALL_MANTISSA, exp: &BASE25_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE25_LARGE_MANTISSA, exp: &BASE25_LARGE_EXPONENT },
+    small_int: &BASE25_SMALL_INT_POWERS,
+    step: BASE25_STEP,
+    bias: BASE25_BIAS,
+};
+
+pub(crate) const BASE26_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE26_SMALL_MANTISSA, exp: &BASE26_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE26_LARGE_MANTISSA, exp: &BASE26_LARGE_EXPONENT },
+    small_int: &BASE26_SMALL_INT_POWERS,
+    step: BASE26_STEP,
+    bias: BASE26_BIAS,
+};
+
+pub(crate) const BASE27_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE27_SMALL_MANTISSA, exp: &BASE27_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE27_LARGE_MANTISSA, exp: &BASE27_LARGE_EXPONENT },
+    small_int: &BASE27_SMALL_INT_POWERS,
+    step: BASE27_STEP,
+    bias: BASE27_BIAS,
+};
+
+pub(crate) const BASE28_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE28_SMALL_MANTISSA, exp: &BASE28_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE28_LARGE_MANTISSA, exp: &BASE28_LARGE_EXPONENT },
+    small_int: &BASE28_SMALL_INT_POWERS,
+    step: BASE28_STEP,
+    bias: BASE28_BIAS,
+};
+
+pub(crate) const BASE29_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE29_SMALL_MANTISSA, exp: &BASE29_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE29_LARGE_MANTISSA, exp: &BASE29_LARGE_EXPONENT },
+    small_int: &BASE29_SMALL_INT_POWERS,
+    step: BASE29_STEP,
+    bias: BASE29_BIAS,
+};
+
+pub(crate) const BASE30_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE30_SMALL_MANTISSA, exp: &BASE30_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE30_LARGE_MANTISSA, exp: &BASE30_LARGE_EXPONENT },
+    small_int: &BASE30_SMALL_INT_POWERS,
+    step: BASE30_STEP,
+    bias: BASE30_BIAS,
+};
+
+pub(crate) const BASE31_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE31_SMALL_MANTISSA, exp: &BASE31_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE31_LARGE_MANTISSA, exp: &BASE31_LARGE_EXPONENT },
+    small_int: &BASE31_SMALL_INT_POWERS,
+    step: BASE31_STEP,
+    bias: BASE31_BIAS,
+};
+
+pub(crate) const BASE33_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE33_SMALL_MANTISSA, exp: &BASE33_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE33_LARGE_MANTISSA, exp: &BASE33_LARGE_EXPONENT },
+    small_int: &BASE33_SMALL_INT_POWERS,
+    step: BASE33_STEP,
+    bias: BASE33_BIAS,
+};
+
+pub(crate) const BASE34_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE34_SMALL_MANTISSA, exp: &BASE34_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE34_LARGE_MANTISSA, exp: &BASE34_LARGE_EXPONENT },
+    small_int: &BASE34_SMALL_INT_POWERS,
+    step: BASE34_STEP,
+    bias: BASE34_BIAS,
+};
+
+pub(crate) const BASE35_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE35_SMALL_MANTISSA, exp: &BASE35_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE35_LARGE_MANTISSA, exp: &BASE35_LARGE_EXPONENT },
+    small_int: &BASE35_SMALL_INT_POWERS,
+    step: BASE35_STEP,
+    bias: BASE35_BIAS,
+};
+
+pub(crate) const BASE36_POWERS: ModeratePathPowers<u128> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE36_SMALL_MANTISSA, exp: &BASE36_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE36_LARGE_MANTISSA, exp: &BASE36_LARGE_EXPONENT },
+    small_int: &BASE36_SMALL_INT_POWERS,
+    step: BASE36_STEP,
+    bias: BASE36_BIAS,
+};
+
+}}  // cfg_if
+
+/// Get powers from radix.
+pub(crate) fn get_powers(radix: u32)
+    -> &'static ModeratePathPowers<u128>
+{
+    debug_assert_radix!(radix);
+
+    #[cfg(not(feature = "radix"))] {
+        &BASE10_POWERS
+    }
+
+    #[cfg(feature = "radix")] {
+        match radix {
+            3  => &BASE3_POWERS,
+            5  => &BASE5_POWERS,
+            6  => &BASE6_POWERS,
+            7  => &BASE7_POWERS,
+            9  => &BASE9_POWERS,
+            10 => &BASE10_POWERS,
+            11 => &BASE11_POWERS,
+            12 => &BASE12_POWERS,
+            13 => &BASE13_POWERS,
+            14 => &BASE14_POWERS,
+            15 => &BASE15_POWERS,
+            17 => &BASE17_POWERS,
+            18 => &BASE18_POWERS,
+            19 => &BASE19_POWERS,
+            20 => &BASE20_POWERS,
+            21 => &BASE21_POWERS,
+            22 => &BASE22_POWERS,
+            23 => &BASE23_POWERS,
+            24 => &BASE24_POWERS,
+            25 => &BASE25_POWERS,
+            26 => &BASE26_POWERS,
+            27 => &BASE27_POWERS,
+            28 => &BASE28_POWERS,
+            29 => &BASE29_POWERS,
+            30 => &BASE30_POWERS,
+            31 => &BASE31_POWERS,
+            33 => &BASE33_POWERS,
+            34 => &BASE34_POWERS,
+            35 => &BASE35_POWERS,
+            36 => &BASE36_POWERS,
+            // Powers of 2, and others, should already be handled by now.
+            _  => unreachable!(),
+        }
+    }
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::test::*;
+    use super::*;
+
+    #[test]
+    fn normalization_test() {
+        // Ensure each valid is normalized.
+        for base in BASE_POWN.iter().cloned() {
+            let powers = get_powers(base);
+            for idx in 0..powers.small.len() {
+                let fp = powers.get_small(idx);
+                assert_eq!(fp.mant.leading_zeros(), 0);
+            }
+            for idx in 0..powers.large.len() {
+                let fp = powers.get_large(idx);
+                assert_eq!(fp.mant.leading_zeros(), 0);
+            }
+        }
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    #[should_panic]
+    fn pow2_test() {
+        for base in BASE_POW2.iter().cloned() {
+            let _ = get_powers(base);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached_float80.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached_float80.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached_float80.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached_float80.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5669 @@
+//! Cached exponents for basen values with 80-bit extended floats.
+//!
+//! Exact versions of base**n as an extended-precision float, with both
+//! large and small powers. Use the large powers to minimize the amount
+//! of compounded error.
+//!
+//! These values were calculated using Python, using the arbitrary-precision
+//! integer to calculate exact extended-representation of each value.
+//! These values are all normalized.
+//!
+//! This files takes ~ 26KB of storage.
+//!
+//! This file is mostly automatically generated, do not change values
+//! manually, unless you know what you are doing. The script to generate
+//! the values is as follows:
+//!
+//! ```text
+//! import math
+//! from collections import deque
+//!
+//! STEP_STR = "const BASE{0}_STEP: i32 = {1};"
+//! SMALL_MANTISSA_STR = "const BASE{0}_SMALL_MANTISSA: [u64; {1}] = ["
+//! SMALL_EXPONENT_STR = "const BASE{0}_SMALL_EXPONENT: [i32; {1}] = ["
+//! LARGE_MANTISSA_STR = "const BASE{0}_LARGE_MANTISSA: [u64; {1}] = ["
+//! LARGE_EXPONENT_STR = "const BASE{0}_LARGE_EXPONENT: [i32; {1}] = ["
+//! SMALL_INT_STR = "const BASE{0}_SMALL_INT_POWERS: [u64; {1}] = {2};"
+//! BIAS_STR = "const BASE{0}_BIAS: i32 = {1};"
+//! EXP_STR = "// {}^{}"
+//! POWER_STR = """pub(crate) const BASE{0}_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {{
+//!     small: ExtendedFloatArray {{ mant: &BASE{0}_SMALL_MANTISSA, exp: &BASE{0}_SMALL_EXPONENT }},
+//!     large: ExtendedFloatArray {{ mant: &BASE{0}_LARGE_MANTISSA, exp: &BASE{0}_LARGE_EXPONENT }},
+//!     small_int: &BASE{0}_SMALL_INT_POWERS,
+//!     step: BASE{0}_STEP,
+//!     bias: BASE{0}_BIAS,
+//! }};\n"""
+//!
+//! def calculate_bitshift(base, exponent):
+//!     '''
+//!     Calculate the bitshift required for a given base. The exponent
+//!     is the absolute value of the max exponent (log distance from 1.)
+//!     '''
+//!
+//!     return 63 + math.ceil(math.log2(base**exponent))
+//!
+//!
+//! def next_fp(fp, base, step = 1):
+//!     '''Generate the next extended-floating point value.'''
+//!
+//!     return (fp[0] * (base**step), fp[1])
+//!
+//!
+//! def prev_fp(fp, base, step = 1):
+//!     '''Generate the previous extended-floating point value.'''
+//!
+//!     return (fp[0] // (base**step), fp[1])
+//!
+//!
+//! def normalize_fp(fp):
+//!     '''Normalize a extended-float so the MSB is the 64th bit'''
+//!
+//!     while fp[0] >> 64 != 0:
+//!         fp = (fp[0] >> 1, fp[1] + 1)
+//!     return fp
+//!
+//!
+//! def generate_small(base, count):
+//!     '''Generate the small powers for a given base'''
+//!
+//!     bitshift = calculate_bitshift(base, count)
+//!     fps = []
+//!     fp = (1 << bitshift, -bitshift)
+//!     for exp in range(count):
+//!         fps.append((normalize_fp(fp), exp))
+//!         fp = next_fp(fp, base)
+//!
+//!     # Print the small powers as integers.
+//!     ints = [base**i for _, i in fps]
+//!
+//!     return fps, ints
+//!
+//!
+//! def generate_large(base, step):
+//!     '''Generate the large powers for a given base.'''
+//!
+//!     # Get our starting parameters
+//!     min_exp = math.floor(math.log(5e-324, base) - math.log(0xFFFFFFFFFFFFFFFF, base))
+//!     max_exp = math.ceil(math.log(1.7976931348623157e+308, base))
+//!     bitshift = calculate_bitshift(base, abs(min_exp - step))
+//!     fps = deque()
+//!
+//!     # Add negative exponents
+//!     # We need to go below the minimum exponent, since we need
+//!     # all resulting exponents to be positive.
+//!     fp = (1 << bitshift, -bitshift)
+//!     for exp in range(-step, min_exp-step, -step):
+//!         fp = prev_fp(fp, base, step)
+//!         fps.appendleft((normalize_fp(fp), exp))
+//!
+//!     # Add positive exponents
+//!     fp = (1 << bitshift, -bitshift)
+//!     fps.append((normalize_fp(fp), 0))
+//!     for exp in range(step, max_exp, step):
+//!         fp = next_fp(fp, base, step)
+//!         fps.append((normalize_fp(fp), exp))
+//!
+//!     # Return the smallest exp, AKA, the bias
+//!     return fps, -fps[0][1]
+//!
+//!
+//! def print_array(base, string, fps, index):
+//!     '''Print an entire array'''
+//!
+//!     print(string.format(base, len(fps)))
+//!     for fp, exp in fps:
+//!         value = "    {},".format(fp[index])
+//!         exp = EXP_STR.format(base, exp)
+//!         print(value.ljust(30, " ") + exp)
+//!     print("];")
+//!
+//!
+//! def generate_base(base):
+//!     '''Generate all powers and variables.'''
+//!
+//!     step = math.floor(math.log(1e10, base))
+//!     small, ints = generate_small(base, step)
+//!     large, bias = generate_large(base, step)
+//!
+//!     print_array(base, SMALL_MANTISSA_STR, small, 0)
+//!     print_array(base, SMALL_EXPONENT_STR, small, 1)
+//!     print_array(base, LARGE_MANTISSA_STR, large, 0)
+//!     print_array(base, LARGE_EXPONENT_STR, large, 1)
+//!     print(SMALL_INT_STR.format(base, len(ints), ints))
+//!     print(STEP_STR.format(base, step))
+//!     print(BIAS_STR.format(base, bias))
+//!
+//!
+//! def generate():
+//!     '''Generate all bases.'''
+//!
+//!     bases = [
+//!         3, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 21,
+//!         22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 33, 34, 35, 36
+//!     ]
+//!
+//!     for base in bases:
+//!         print("// BASE{}\n".format(base))
+//!         generate_base(base)
+//!         print("")
+//!
+//!     print("// HIGH LEVEL\n// ----------\n")
+//!
+//!     for base in bases:
+//!         print(POWER_STR.format(base))
+//!
+//!
+//! if __name__ == '__main__':
+//!     generate()
+//! ```
+
+use crate::util::*;
+use super::cached::{ExtendedFloatArray, ModeratePathPowers};
+
+// LOW-LEVEL
+// ---------
+
+// BASE10
+
+const BASE10_SMALL_MANTISSA: [u64; 10] = [
+    9223372036854775808,      // 10^0
+    11529215046068469760,     // 10^1
+    14411518807585587200,     // 10^2
+    18014398509481984000,     // 10^3
+    11258999068426240000,     // 10^4
+    14073748835532800000,     // 10^5
+    17592186044416000000,     // 10^6
+    10995116277760000000,     // 10^7
+    13743895347200000000,     // 10^8
+    17179869184000000000,     // 10^9
+];
+const BASE10_SMALL_EXPONENT: [i32; 10] = [
+    -63,                      // 10^0
+    -60,                      // 10^1
+    -57,                      // 10^2
+    -54,                      // 10^3
+    -50,                      // 10^4
+    -47,                      // 10^5
+    -44,                      // 10^6
+    -40,                      // 10^7
+    -37,                      // 10^8
+    -34,                      // 10^9
+];
+const BASE10_LARGE_MANTISSA: [u64; 66] = [
+    11555125961253852697,     // 10^-350
+    13451937075301367670,     // 10^-340
+    15660115838168849784,     // 10^-330
+    18230774251475056848,     // 10^-320
+    10611707258198326947,     // 10^-310
+    12353653155963782858,     // 10^-300
+    14381545078898527261,     // 10^-290
+    16742321987285426889,     // 10^-280
+    9745314011399999080,      // 10^-270
+    11345038669416679861,     // 10^-260
+    13207363278391631158,     // 10^-250
+    15375394465392026070,     // 10^-240
+    17899314949046850752,     // 10^-230
+    10418772551374772303,     // 10^-220
+    12129047596099288555,     // 10^-210
+    14120069793541087484,     // 10^-200
+    16437924692338667210,     // 10^-190
+    9568131466127621947,      // 10^-180
+    11138771039116687545,     // 10^-170
+    12967236152753102995,     // 10^-160
+    15095849699286165408,     // 10^-150
+    17573882009934360870,     // 10^-140
+    10229345649675443343,     // 10^-130
+    11908525658859223294,     // 10^-120
+    13863348470604074297,     // 10^-110
+    16139061738043178685,     // 10^-100
+    9394170331095332911,      // 10^-90
+    10936253623915059621,     // 10^-80
+    12731474852090538039,     // 10^-70
+    14821387422376473014,     // 10^-60
+    17254365866976409468,     // 10^-50
+    10043362776618689222,     // 10^-40
+    11692013098647223345,     // 10^-30
+    13611294676837538538,     // 10^-20
+    15845632502852867518,     // 10^-10
+    9223372036854775808,      // 10^0
+    10737418240000000000,     // 10^10
+    12500000000000000000,     // 10^20
+    14551915228366851806,     // 10^30
+    16940658945086006781,     // 10^40
+    9860761315262647567,      // 10^50
+    11479437019748901445,     // 10^60
+    13363823550460978230,     // 10^70
+    15557538194652854267,     // 10^80
+    18111358157653424735,     // 10^90
+    10542197943230523224,     // 10^100
+    12272733663244316382,     // 10^110
+    14287342391028437277,     // 10^120
+    16632655625031838749,     // 10^130
+    9681479787123295682,      // 10^140
+    11270725851789228247,     // 10^150
+    13120851772591970218,     // 10^160
+    15274681817498023410,     // 10^170
+    17782069995880619867,     // 10^180
+    10350527006597618960,     // 10^190
+    12049599325514420588,     // 10^200
+    14027579833653779454,     // 10^210
+    16330252207878254650,     // 10^220
+    9505457831475799117,      // 10^230
+    11065809325636130661,     // 10^240
+    12882297539194266616,     // 10^250
+    14996968138956309548,     // 10^260
+    17458768723248864463,     // 10^270
+    10162340898095201970,     // 10^280
+    11830521861667747109,     // 10^290
+    13772540099066387756,     // 10^300
+];
+const BASE10_LARGE_EXPONENT: [i32; 66] = [
+    -1226,                    // 10^-350
+    -1193,                    // 10^-340
+    -1160,                    // 10^-330
+    -1127,                    // 10^-320
+    -1093,                    // 10^-310
+    -1060,                    // 10^-300
+    -1027,                    // 10^-290
+    -994,                     // 10^-280
+    -960,                     // 10^-270
+    -927,                     // 10^-260
+    -894,                     // 10^-250
+    -861,                     // 10^-240
+    -828,                     // 10^-230
+    -794,                     // 10^-220
+    -761,                     // 10^-210
+    -728,                     // 10^-200
+    -695,                     // 10^-190
+    -661,                     // 10^-180
+    -628,                     // 10^-170
+    -595,                     // 10^-160
+    -562,                     // 10^-150
+    -529,                     // 10^-140
+    -495,                     // 10^-130
+    -462,                     // 10^-120
+    -429,                     // 10^-110
+    -396,                     // 10^-100
+    -362,                     // 10^-90
+    -329,                     // 10^-80
+    -296,                     // 10^-70
+    -263,                     // 10^-60
+    -230,                     // 10^-50
+    -196,                     // 10^-40
+    -163,                     // 10^-30
+    -130,                     // 10^-20
+    -97,                      // 10^-10
+    -63,                      // 10^0
+    -30,                      // 10^10
+    3,                        // 10^20
+    36,                       // 10^30
+    69,                       // 10^40
+    103,                      // 10^50
+    136,                      // 10^60
+    169,                      // 10^70
+    202,                      // 10^80
+    235,                      // 10^90
+    269,                      // 10^100
+    302,                      // 10^110
+    335,                      // 10^120
+    368,                      // 10^130
+    402,                      // 10^140
+    435,                      // 10^150
+    468,                      // 10^160
+    501,                      // 10^170
+    534,                      // 10^180
+    568,                      // 10^190
+    601,                      // 10^200
+    634,                      // 10^210
+    667,                      // 10^220
+    701,                      // 10^230
+    734,                      // 10^240
+    767,                      // 10^250
+    800,                      // 10^260
+    833,                      // 10^270
+    867,                      // 10^280
+    900,                      // 10^290
+    933,                      // 10^300
+];
+const BASE10_SMALL_INT_POWERS: [u64; 10] = [1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000];
+const BASE10_STEP: i32 = 10;
+const BASE10_BIAS: i32 = 350;
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+// BASE3
+
+const BASE3_SMALL_MANTISSA: [u64; 20] = [
+    9223372036854775808,      // 3^0
+    13835058055282163712,     // 3^1
+    10376293541461622784,     // 3^2
+    15564440312192434176,     // 3^3
+    11673330234144325632,     // 3^4
+    17509995351216488448,     // 3^5
+    13132496513412366336,     // 3^6
+    9849372385059274752,      // 3^7
+    14774058577588912128,     // 3^8
+    11080543933191684096,     // 3^9
+    16620815899787526144,     // 3^10
+    12465611924840644608,     // 3^11
+    9349208943630483456,      // 3^12
+    14023813415445725184,     // 3^13
+    10517860061584293888,     // 3^14
+    15776790092376440832,     // 3^15
+    11832592569282330624,     // 3^16
+    17748888853923495936,     // 3^17
+    13311666640442621952,     // 3^18
+    9983749980331966464,      // 3^19
+];
+const BASE3_SMALL_EXPONENT: [i32; 20] = [
+    -63,                      // 3^0
+    -62,                      // 3^1
+    -60,                      // 3^2
+    -59,                      // 3^3
+    -57,                      // 3^4
+    -56,                      // 3^5
+    -54,                      // 3^6
+    -52,                      // 3^7
+    -51,                      // 3^8
+    -49,                      // 3^9
+    -48,                      // 3^10
+    -46,                      // 3^11
+    -44,                      // 3^12
+    -43,                      // 3^13
+    -41,                      // 3^14
+    -40,                      // 3^15
+    -38,                      // 3^16
+    -37,                      // 3^17
+    -35,                      // 3^18
+    -33,                      // 3^19
+];
+const BASE3_LARGE_MANTISSA: [u64; 69] = [
+    16362187946641408838,     // 3^-720
+    13283319235448605538,     // 3^-700
+    10783800460320302292,     // 3^-680
+    17509230984627012859,     // 3^-660
+    14214523479040558273,     // 3^-640
+    11539780240125690827,     // 3^-620
+    9368342750761260524,      // 3^-600
+    15211008194170796346,     // 3^-580
+    12348756681875770872,     // 3^-560
+    10025094302862174179,     // 3^-540
+    16277349755993950451,     // 3^-520
+    13214445025385558299,     // 3^-500
+    10727886292707736997,     // 3^-480
+    17418445358572088840,     // 3^-460
+    14140820960965941427,     // 3^-440
+    11479946305982273645,     // 3^-420
+    9319767752666157840,      // 3^-400
+    15132138887857638912,     // 3^-380
+    12284728192712064755,     // 3^-360
+    9973114038089604413,      // 3^-340
+    16192951452641260116,     // 3^-320
+    13145927929137795237,     // 3^-300
+    10672262040895386089,     // 3^-280
+    17328130457353990660,     // 3^-260
+    14067500591556283265,     // 3^-240
+    11420422611687500217,     // 3^-220
+    9271444616666914905,      // 3^-200
+    15053678520084183432,     // 3^-180
+    12221031692227883264,     // 3^-160
+    9921403291771844100,      // 3^-140
+    16108990755761097026,     // 3^-120
+    13077766095064811873,     // 3^-100
+    10616926201665464118,     // 3^-80
+    17238283840257358043,     // 3^-60
+    13994560389365007134,     // 3^-40
+    11361207548643088241,     // 3^-20
+    9223372036854775808,      // 3^0
+    14975624970497949696,     // 3^20
+    12157665459056928801,     // 3^40
+    9869960666451650558,      // 3^60
+    16025465396357318008,     // 3^80
+    13009957681126887596,     // 3^100
+    10561877279594392463,     // 3^120
+    17148903079221976570,     // 3^140
+    13921998383219366688,     // 3^160
+    11302299516591361707,     // 3^180
+    18351097428184282358,     // 3^200
+    14897976129740516999,     // 3^220
+    12094627780758213915,     // 3^240
+    9818784771917617934,      // 3^260
+    15942373117198559022,     // 3^280
+    12942500854835305460,     // 3^300
+    10507113787012386253,     // 3^320
+    17059985758777160561,     // 3^340
+    13849812612167175924,     // 3^360
+    11243696923572004730,     // 3^380
+    18255946711954919292,     // 3^400
+    14820729899390519784,     // 3^420
+    12031916953769783440,     // 3^440
+    9767874225166607426,      // 3^460
+    15859711672757234610,     // 3^480
+    12875393793202830082,     // 3^500
+    10452634243963250834,     // 3^520
+    16971529475976476179,     // 3^540
+    13778001125423815423,     // 3^560
+    11185398185879039609,     // 3^580
+    18161289353620602647,     // 3^600
+    14743884191906938838,     // 3^620
+    11969531283362676572,     // 3^640
+];
+const BASE3_LARGE_EXPONENT: [i32; 69] = [
+    -1205,                    // 3^-720
+    -1173,                    // 3^-700
+    -1141,                    // 3^-680
+    -1110,                    // 3^-660
+    -1078,                    // 3^-640
+    -1046,                    // 3^-620
+    -1014,                    // 3^-600
+    -983,                     // 3^-580
+    -951,                     // 3^-560
+    -919,                     // 3^-540
+    -888,                     // 3^-520
+    -856,                     // 3^-500
+    -824,                     // 3^-480
+    -793,                     // 3^-460
+    -761,                     // 3^-440
+    -729,                     // 3^-420
+    -697,                     // 3^-400
+    -666,                     // 3^-380
+    -634,                     // 3^-360
+    -602,                     // 3^-340
+    -571,                     // 3^-320
+    -539,                     // 3^-300
+    -507,                     // 3^-280
+    -476,                     // 3^-260
+    -444,                     // 3^-240
+    -412,                     // 3^-220
+    -380,                     // 3^-200
+    -349,                     // 3^-180
+    -317,                     // 3^-160
+    -285,                     // 3^-140
+    -254,                     // 3^-120
+    -222,                     // 3^-100
+    -190,                     // 3^-80
+    -159,                     // 3^-60
+    -127,                     // 3^-40
+    -95,                      // 3^-20
+    -63,                      // 3^0
+    -32,                      // 3^20
+    0,                        // 3^40
+    32,                       // 3^60
+    63,                       // 3^80
+    95,                       // 3^100
+    127,                      // 3^120
+    158,                      // 3^140
+    190,                      // 3^160
+    222,                      // 3^180
+    253,                      // 3^200
+    285,                      // 3^220
+    317,                      // 3^240
+    349,                      // 3^260
+    380,                      // 3^280
+    412,                      // 3^300
+    444,                      // 3^320
+    475,                      // 3^340
+    507,                      // 3^360
+    539,                      // 3^380
+    570,                      // 3^400
+    602,                      // 3^420
+    634,                      // 3^440
+    666,                      // 3^460
+    697,                      // 3^480
+    729,                      // 3^500
+    761,                      // 3^520
+    792,                      // 3^540
+    824,                      // 3^560
+    856,                      // 3^580
+    887,                      // 3^600
+    919,                      // 3^620
+    951,                      // 3^640
+];
+const BASE3_SMALL_INT_POWERS: [u64; 20] = [1, 3, 9, 27, 81, 243, 729, 2187, 6561, 19683, 59049, 177147, 531441, 1594323, 4782969, 14348907, 43046721, 129140163, 387420489, 1162261467];
+const BASE3_STEP: i32 = 20;
+const BASE3_BIAS: i32 = 720;
+
+// BASE5
+
+const BASE5_SMALL_MANTISSA: [u64; 14] = [
+    9223372036854775808,      // 5^0
+    11529215046068469760,     // 5^1
+    14411518807585587200,     // 5^2
+    18014398509481984000,     // 5^3
+    11258999068426240000,     // 5^4
+    14073748835532800000,     // 5^5
+    17592186044416000000,     // 5^6
+    10995116277760000000,     // 5^7
+    13743895347200000000,     // 5^8
+    17179869184000000000,     // 5^9
+    10737418240000000000,     // 5^10
+    13421772800000000000,     // 5^11
+    16777216000000000000,     // 5^12
+    10485760000000000000,     // 5^13
+];
+const BASE5_SMALL_EXPONENT: [i32; 14] = [
+    -63,                      // 5^0
+    -61,                      // 5^1
+    -59,                      // 5^2
+    -57,                      // 5^3
+    -54,                      // 5^4
+    -52,                      // 5^5
+    -50,                      // 5^6
+    -47,                      // 5^7
+    -45,                      // 5^8
+    -43,                      // 5^9
+    -40,                      // 5^10
+    -38,                      // 5^11
+    -36,                      // 5^12
+    -33,                      // 5^13
+];
+const BASE5_LARGE_MANTISSA: [u64; 68] = [
+    15492890949478498119,     // 5^-504
+    11008361120075348168,     // 5^-490
+    15643822052986917253,     // 5^-476
+    11115604119273511155,     // 5^-462
+    15796223521069679172,     // 5^-448
+    11223891875338892399,     // 5^-434
+    15950109677957715915,     // 5^-420
+    11333234566249726012,     // 5^-406
+    16105494987428025427,     // 5^-392
+    11443642469137689536,     // 5^-378
+    16262394054163123565,     // 5^-364
+    11555125961253852697,     // 5^-350
+    16420821625123739831,     // 5^-336
+    11667695520944036383,     // 5^-322
+    16580792590934885855,     // 5^-308
+    11781361728633673532,     // 5^-294
+    16742321987285426889,     // 5^-280
+    11896135267822264502,     // 5^-266
+    16905424996341287883,     // 5^-252
+    12012026926087520367,     // 5^-238
+    17070116948172426941,     // 5^-224
+    12129047596099288555,     // 5^-210
+    17236413322193710308,     // 5^-196
+    12247208276643356092,     // 5^-182
+    17404329748619824289,     // 5^-168
+    12366520073655226703,     // 5^-154
+    17573882009934360870,     // 5^-140
+    12486994201263968925,     // 5^-126
+    17745086042373215101,     // 5^-112
+    12608641982846233347,     // 5^-98
+    17917957937422433684,     // 5^-84
+    12731474852090538039,     // 5^-70
+    18092513943330655534,     // 5^-56
+    12855504354071922204,     // 5^-42
+    18268770466636286477,     // 5^-28
+    12980742146337069071,     // 5^-14
+    9223372036854775808,      // 5^0
+    13107200000000000000,     // 5^14
+    9313225746154785156,      // 5^28
+    13234889800848442797,     // 5^42
+    9403954806578300063,      // 5^56
+    13363823550460978230,     // 5^70
+    9495567745759798747,      // 5^84
+    13494013367335069727,     // 5^98
+    9588073174409622174,      // 5^112
+    13625471488026082303,     // 5^126
+    9681479787123295682,      // 5^140
+    13758210268297397763,     // 5^154
+    9775796363198734982,      // 5^168
+    13892242184281734271,     // 5^182
+    9871031767461413346,      // 5^196
+    14027579833653779454,     // 5^210
+    9967194951097567535,      // 5^224
+    14164235936814247246,     // 5^238
+    10064294952495520794,     // 5^252
+    14302223338085469768,     // 5^266
+    10162340898095201970,     // 5^280
+    14441555006918636608,     // 5^294
+    10261342003245940623,     // 5^308
+    14582244039112794984,     // 5^322
+    10361307573072618726,     // 5^336
+    14724303658045725350,     // 5^350
+    10462247003350260393,     // 5^364
+    14867747215916808149,     // 5^378
+    10564169781387141817,     // 5^392
+    15012588195001998509,     // 5^406
+    10667085486916504429,     // 5^420
+    15158840208921026870,     // 5^434
+];
+const BASE5_LARGE_EXPONENT: [i32; 68] = [
+    -1234,                    // 5^-504
+    -1201,                    // 5^-490
+    -1169,                    // 5^-476
+    -1136,                    // 5^-462
+    -1104,                    // 5^-448
+    -1071,                    // 5^-434
+    -1039,                    // 5^-420
+    -1006,                    // 5^-406
+    -974,                     // 5^-392
+    -941,                     // 5^-378
+    -909,                     // 5^-364
+    -876,                     // 5^-350
+    -844,                     // 5^-336
+    -811,                     // 5^-322
+    -779,                     // 5^-308
+    -746,                     // 5^-294
+    -714,                     // 5^-280
+    -681,                     // 5^-266
+    -649,                     // 5^-252
+    -616,                     // 5^-238
+    -584,                     // 5^-224
+    -551,                     // 5^-210
+    -519,                     // 5^-196
+    -486,                     // 5^-182
+    -454,                     // 5^-168
+    -421,                     // 5^-154
+    -389,                     // 5^-140
+    -356,                     // 5^-126
+    -324,                     // 5^-112
+    -291,                     // 5^-98
+    -259,                     // 5^-84
+    -226,                     // 5^-70
+    -194,                     // 5^-56
+    -161,                     // 5^-42
+    -129,                     // 5^-28
+    -96,                      // 5^-14
+    -63,                      // 5^0
+    -31,                      // 5^14
+    2,                        // 5^28
+    34,                       // 5^42
+    67,                       // 5^56
+    99,                       // 5^70
+    132,                      // 5^84
+    164,                      // 5^98
+    197,                      // 5^112
+    229,                      // 5^126
+    262,                      // 5^140
+    294,                      // 5^154
+    327,                      // 5^168
+    359,                      // 5^182
+    392,                      // 5^196
+    424,                      // 5^210
+    457,                      // 5^224
+    489,                      // 5^238
+    522,                      // 5^252
+    554,                      // 5^266
+    587,                      // 5^280
+    619,                      // 5^294
+    652,                      // 5^308
+    684,                      // 5^322
+    717,                      // 5^336
+    749,                      // 5^350
+    782,                      // 5^364
+    814,                      // 5^378
+    847,                      // 5^392
+    879,                      // 5^406
+    912,                      // 5^420
+    944,                      // 5^434
+];
+const BASE5_SMALL_INT_POWERS: [u64; 14] = [1, 5, 25, 125, 625, 3125, 15625, 78125, 390625, 1953125, 9765625, 48828125, 244140625, 1220703125];
+const BASE5_STEP: i32 = 14;
+const BASE5_BIAS: i32 = 504;
+
+// BASE6
+
+const BASE6_SMALL_MANTISSA: [u64; 12] = [
+    9223372036854775808,      // 6^0
+    13835058055282163712,     // 6^1
+    10376293541461622784,     // 6^2
+    15564440312192434176,     // 6^3
+    11673330234144325632,     // 6^4
+    17509995351216488448,     // 6^5
+    13132496513412366336,     // 6^6
+    9849372385059274752,      // 6^7
+    14774058577588912128,     // 6^8
+    11080543933191684096,     // 6^9
+    16620815899787526144,     // 6^10
+    12465611924840644608,     // 6^11
+];
+const BASE6_SMALL_EXPONENT: [i32; 12] = [
+    -63,                      // 6^0
+    -61,                      // 6^1
+    -58,                      // 6^2
+    -56,                      // 6^3
+    -53,                      // 6^4
+    -51,                      // 6^5
+    -48,                      // 6^6
+    -45,                      // 6^7
+    -43,                      // 6^8
+    -40,                      // 6^9
+    -38,                      // 6^10
+    -35,                      // 6^11
+];
+const BASE6_LARGE_MANTISSA: [u64; 71] = [
+    11172994339528645078,     // 6^-444
+    11325430459582219446,     // 6^-432
+    11479946305982273645,     // 6^-420
+    11636570252986002899,     // 6^-408
+    11795331061968106016,     // 6^-396
+    11956257886702331980,     // 6^-384
+    12119380278715084095,     // 6^-372
+    12284728192712064755,     // 6^-360
+    12452331992078957377,     // 6^-348
+    12622222454457155586,     // 6^-336
+    12794430777395563548,     // 6^-324
+    12968988584079505325,     // 6^-312
+    13145927929137795237,     // 6^-300
+    13325281304529035642,     // 6^-288
+    13507081645508223020,     // 6^-276
+    13691362336674758052,     // 6^-264
+    13878157218102970303,     // 6^-252
+    14067500591556283265,     // 6^-240
+    14259427226786160917,     // 6^-228
+    14453972367916992462,     // 6^-216
+    14651171739918087751,     // 6^-204
+    14851061555163971849,     // 6^-192
+    15053678520084183432,     // 6^-180
+    15259059841903798156,     // 6^-168
+    15467243235475914756,     // 6^-156
+    15678266930207358578,     // 6^-144
+    15892169677078874302,     // 6^-132
+    16108990755761097026,     // 6^-120
+    16328769981827608423,     // 6^-108
+    16551547714066402526,     // 6^-96
+    16777364861891103792,     // 6^-84
+    17006262892853298360,     // 6^-72
+    17238283840257358043,     // 6^-60
+    17473470310879155380,     // 6^-48
+    17711865492790087155,     // 6^-36
+    17953513163287843146,     // 6^-24
+    18198457696935376453,     // 6^-12
+    9223372036854775808,      // 6^0
+    9349208943630483456,      // 6^12
+    9476762676643233792,      // 6^24
+    9606056659007943744,      // 6^36
+    9737114633407288801,      // 6^48
+    9869960666451650558,      // 6^60
+    10004619153098548172,     // 6^72
+    10141114821132365302,     // 6^84
+    10279472735705195138,     // 6^96
+    10419718303939637392,     // 6^108
+    10561877279594392463,     // 6^120
+    10705975767793509530,     // 6^132
+    10852040229820157048,     // 6^144
+    11000097487975795902,     // 6^156
+    11150174730505647564,     // 6^168
+    11302299516591361707,     // 6^180
+    11456499781411800112,     // 6^192
+    11612803841272866179,     // 6^204
+    11771240398807322073,     // 6^216
+    11931838548245548344,     // 6^228
+    12094627780758213915,     // 6^240
+    12259637989871837542,     // 6^252
+    12426899476958235198,     // 6^264
+    12596442956798861450,     // 6^276
+    12768299563225066619,     // 6^288
+    12942500854835305460,     // 6^300
+    13119078820790347231,     // 6^312
+    13298065886687551351,     // 6^324
+    13479494920515287357,     // 6^336
+    13663399238688592583,     // 6^348
+    13849812612167175924,     // 6^360
+    14038769272656891137,     // 6^372
+    14230303918895818486,     // 6^384
+    14424451723026109070,     // 6^396
+];
+const BASE6_LARGE_EXPONENT: [i32; 71] = [
+    -1211,                    // 6^-444
+    -1180,                    // 6^-432
+    -1149,                    // 6^-420
+    -1118,                    // 6^-408
+    -1087,                    // 6^-396
+    -1056,                    // 6^-384
+    -1025,                    // 6^-372
+    -994,                     // 6^-360
+    -963,                     // 6^-348
+    -932,                     // 6^-336
+    -901,                     // 6^-324
+    -870,                     // 6^-312
+    -839,                     // 6^-300
+    -808,                     // 6^-288
+    -777,                     // 6^-276
+    -746,                     // 6^-264
+    -715,                     // 6^-252
+    -684,                     // 6^-240
+    -653,                     // 6^-228
+    -622,                     // 6^-216
+    -591,                     // 6^-204
+    -560,                     // 6^-192
+    -529,                     // 6^-180
+    -498,                     // 6^-168
+    -467,                     // 6^-156
+    -436,                     // 6^-144
+    -405,                     // 6^-132
+    -374,                     // 6^-120
+    -343,                     // 6^-108
+    -312,                     // 6^-96
+    -281,                     // 6^-84
+    -250,                     // 6^-72
+    -219,                     // 6^-60
+    -188,                     // 6^-48
+    -157,                     // 6^-36
+    -126,                     // 6^-24
+    -95,                      // 6^-12
+    -63,                      // 6^0
+    -32,                      // 6^12
+    -1,                       // 6^24
+    30,                       // 6^36
+    61,                       // 6^48
+    92,                       // 6^60
+    123,                      // 6^72
+    154,                      // 6^84
+    185,                      // 6^96
+    216,                      // 6^108
+    247,                      // 6^120
+    278,                      // 6^132
+    309,                      // 6^144
+    340,                      // 6^156
+    371,                      // 6^168
+    402,                      // 6^180
+    433,                      // 6^192
+    464,                      // 6^204
+    495,                      // 6^216
+    526,                      // 6^228
+    557,                      // 6^240
+    588,                      // 6^252
+    619,                      // 6^264
+    650,                      // 6^276
+    681,                      // 6^288
+    712,                      // 6^300
+    743,                      // 6^312
+    774,                      // 6^324
+    805,                      // 6^336
+    836,                      // 6^348
+    867,                      // 6^360
+    898,                      // 6^372
+    929,                      // 6^384
+    960,                      // 6^396
+];
+const BASE6_SMALL_INT_POWERS: [u64; 12] = [1, 6, 36, 216, 1296, 7776, 46656, 279936, 1679616, 10077696, 60466176, 362797056];
+const BASE6_STEP: i32 = 12;
+const BASE6_BIAS: i32 = 444;
+
+// BASE7
+
+const BASE7_SMALL_MANTISSA: [u64; 11] = [
+    9223372036854775808,      // 7^0
+    16140901064495857664,     // 7^1
+    14123288431433875456,     // 7^2
+    12357877377504641024,     // 7^3
+    10813142705316560896,     // 7^4
+    9461499867151990784,      // 7^5
+    16557624767515983872,     // 7^6
+    14487921671576485888,     // 7^7
+    12676931462629425152,     // 7^8
+    11092315029800747008,     // 7^9
+    9705775651075653632,      // 7^10
+];
+const BASE7_SMALL_EXPONENT: [i32; 11] = [
+    -63,                      // 7^0
+    -61,                      // 7^1
+    -58,                      // 7^2
+    -55,                      // 7^3
+    -52,                      // 7^4
+    -49,                      // 7^5
+    -47,                      // 7^6
+    -44,                      // 7^7
+    -41,                      // 7^8
+    -38,                      // 7^9
+    -35,                      // 7^10
+];
+const BASE7_LARGE_MANTISSA: [u64; 71] = [
+    12225664820028455743,     // 7^-407
+    11256958357801915874,     // 7^-396
+    10365007820408367996,     // 7^-385
+    9543731415037814164,      // 7^-374
+    17575058485347314089,     // 7^-363
+    16182490230010039076,     // 7^-352
+    14900262793588950961,     // 7^-341
+    13719633267955538670,     // 7^-330
+    12632551493533408059,     // 7^-319
+    11631605169031861852,     // 7^-308
+    10709969310436274791,     // 7^-297
+    9861359714639799269,      // 7^-286
+    18159980220813419398,     // 7^-275
+    16721065408999761282,     // 7^-264
+    15396163707909854531,     // 7^-253
+    14176241233598532153,     // 7^-242
+    13052979906282242272,     // 7^-231
+    12018720733250263776,     // 7^-220
+    11066411585781870352,     // 7^-209
+    10189559113984709052,     // 7^-198
+    9382184471684205580,      // 7^-187
+    17277565098945522629,     // 7^-176
+    15908568875896010079,     // 7^-165
+    14648045730389016129,     // 7^-154
+    13487400745686688174,     // 7^-143
+    12418720027433908743,     // 7^-132
+    11434716742520575143,     // 7^-121
+    10528681433580712628,     // 7^-110
+    9694436270346269630,      // 7^-99
+    17852585851834022264,     // 7^-88
+    16438027581449061548,     // 7^-77
+    15135552519453149331,     // 7^-66
+    13936279698645574929,     // 7^-55
+    12832031839555071753,     // 7^-44
+    11815279593402393441,     // 7^-33
+    10879090202998704701,     // 7^-22
+    10017080231522506848,     // 7^-11
+    9223372036854775808,      // 7^0
+    16985107389382393856,     // 7^11
+    15639284194331952196,     // 7^22
+    14400097950748064600,     // 7^33
+    13259099228230139701,     // 7^44
+    12208508091080056405,     // 7^55
+    11241161050565762112,     // 7^66
+    10350462220447909415,     // 7^77
+    9530338342721952463,      // 7^88
+    17550394753834620135,     // 7^99
+    16159780741186857313,     // 7^110
+    14879352702091044991,     // 7^121
+    13700379997665963732,     // 7^132
+    12614823765422770599,     // 7^143
+    11615282106028126090,     // 7^154
+    10694939613220642893,     // 7^165
+    9847520902748803399,      // 7^176
+    18134495646931893353,     // 7^187
+    16697600117649658875,     // 7^198
+    15374557700263623520,     // 7^209
+    14156347188413069088,     // 7^220
+    13034662175384360011,     // 7^231
+    12001854416615353596,     // 7^242
+    11050881679899153397,     // 7^253
+    10175259727702178785,     // 7^264
+    9369018104186475301,      // 7^275
+    17253318850937371954,     // 7^286
+    15886243791070066478,     // 7^297
+    14627489584451796037,     // 7^308
+    13468473375910191470,     // 7^319
+    12401292376951646786,     // 7^330
+    11418669980349265042,     // 7^341
+    10513906144367477972,     // 7^352
+    9680831708316613461,      // 7^363
+];
+const BASE7_LARGE_EXPONENT: [i32; 71] = [
+    -1206,                    // 7^-407
+    -1175,                    // 7^-396
+    -1144,                    // 7^-385
+    -1113,                    // 7^-374
+    -1083,                    // 7^-363
+    -1052,                    // 7^-352
+    -1021,                    // 7^-341
+    -990,                     // 7^-330
+    -959,                     // 7^-319
+    -928,                     // 7^-308
+    -897,                     // 7^-297
+    -866,                     // 7^-286
+    -836,                     // 7^-275
+    -805,                     // 7^-264
+    -774,                     // 7^-253
+    -743,                     // 7^-242
+    -712,                     // 7^-231
+    -681,                     // 7^-220
+    -650,                     // 7^-209
+    -619,                     // 7^-198
+    -588,                     // 7^-187
+    -558,                     // 7^-176
+    -527,                     // 7^-165
+    -496,                     // 7^-154
+    -465,                     // 7^-143
+    -434,                     // 7^-132
+    -403,                     // 7^-121
+    -372,                     // 7^-110
+    -341,                     // 7^-99
+    -311,                     // 7^-88
+    -280,                     // 7^-77
+    -249,                     // 7^-66
+    -218,                     // 7^-55
+    -187,                     // 7^-44
+    -156,                     // 7^-33
+    -125,                     // 7^-22
+    -94,                      // 7^-11
+    -63,                      // 7^0
+    -33,                      // 7^11
+    -2,                       // 7^22
+    29,                       // 7^33
+    60,                       // 7^44
+    91,                       // 7^55
+    122,                      // 7^66
+    153,                      // 7^77
+    184,                      // 7^88
+    214,                      // 7^99
+    245,                      // 7^110
+    276,                      // 7^121
+    307,                      // 7^132
+    338,                      // 7^143
+    369,                      // 7^154
+    400,                      // 7^165
+    431,                      // 7^176
+    461,                      // 7^187
+    492,                      // 7^198
+    523,                      // 7^209
+    554,                      // 7^220
+    585,                      // 7^231
+    616,                      // 7^242
+    647,                      // 7^253
+    678,                      // 7^264
+    709,                      // 7^275
+    739,                      // 7^286
+    770,                      // 7^297
+    801,                      // 7^308
+    832,                      // 7^319
+    863,                      // 7^330
+    894,                      // 7^341
+    925,                      // 7^352
+    956,                      // 7^363
+];
+const BASE7_SMALL_INT_POWERS: [u64; 11] = [1, 7, 49, 343, 2401, 16807, 117649, 823543, 5764801, 40353607, 282475249];
+const BASE7_STEP: i32 = 11;
+const BASE7_BIAS: i32 = 407;
+
+// BASE9
+
+const BASE9_SMALL_MANTISSA: [u64; 10] = [
+    9223372036854775808,      // 9^0
+    10376293541461622784,     // 9^1
+    11673330234144325632,     // 9^2
+    13132496513412366336,     // 9^3
+    14774058577588912128,     // 9^4
+    16620815899787526144,     // 9^5
+    9349208943630483456,      // 9^6
+    10517860061584293888,     // 9^7
+    11832592569282330624,     // 9^8
+    13311666640442621952,     // 9^9
+];
+const BASE9_SMALL_EXPONENT: [i32; 10] = [
+    -63,                      // 9^0
+    -60,                      // 9^1
+    -57,                      // 9^2
+    -54,                      // 9^3
+    -51,                      // 9^4
+    -48,                      // 9^5
+    -44,                      // 9^6
+    -41,                      // 9^7
+    -38,                      // 9^8
+    -35,                      // 9^9
+];
+const BASE9_LARGE_MANTISSA: [u64; 69] = [
+    16362187946641408838,     // 9^-360
+    13283319235448605538,     // 9^-350
+    10783800460320302292,     // 9^-340
+    17509230984627012859,     // 9^-330
+    14214523479040558273,     // 9^-320
+    11539780240125690827,     // 9^-310
+    9368342750761260524,      // 9^-300
+    15211008194170796346,     // 9^-290
+    12348756681875770872,     // 9^-280
+    10025094302862174179,     // 9^-270
+    16277349755993950451,     // 9^-260
+    13214445025385558299,     // 9^-250
+    10727886292707736997,     // 9^-240
+    17418445358572088840,     // 9^-230
+    14140820960965941427,     // 9^-220
+    11479946305982273645,     // 9^-210
+    9319767752666157840,      // 9^-200
+    15132138887857638912,     // 9^-190
+    12284728192712064755,     // 9^-180
+    9973114038089604413,      // 9^-170
+    16192951452641260116,     // 9^-160
+    13145927929137795237,     // 9^-150
+    10672262040895386089,     // 9^-140
+    17328130457353990660,     // 9^-130
+    14067500591556283265,     // 9^-120
+    11420422611687500217,     // 9^-110
+    9271444616666914905,      // 9^-100
+    15053678520084183432,     // 9^-90
+    12221031692227883264,     // 9^-80
+    9921403291771844100,      // 9^-70
+    16108990755761097026,     // 9^-60
+    13077766095064811873,     // 9^-50
+    10616926201665464118,     // 9^-40
+    17238283840257358043,     // 9^-30
+    13994560389365007134,     // 9^-20
+    11361207548643088241,     // 9^-10
+    9223372036854775808,      // 9^0
+    14975624970497949696,     // 9^10
+    12157665459056928801,     // 9^20
+    9869960666451650558,      // 9^30
+    16025465396357318008,     // 9^40
+    13009957681126887596,     // 9^50
+    10561877279594392463,     // 9^60
+    17148903079221976570,     // 9^70
+    13921998383219366688,     // 9^80
+    11302299516591361707,     // 9^90
+    18351097428184282358,     // 9^100
+    14897976129740516999,     // 9^110
+    12094627780758213915,     // 9^120
+    9818784771917617934,      // 9^130
+    15942373117198559022,     // 9^140
+    12942500854835305460,     // 9^150
+    10507113787012386253,     // 9^160
+    17059985758777160561,     // 9^170
+    13849812612167175924,     // 9^180
+    11243696923572004730,     // 9^190
+    18255946711954919292,     // 9^200
+    14820729899390519784,     // 9^210
+    12031916953769783440,     // 9^220
+    9767874225166607426,      // 9^230
+    15859711672757234610,     // 9^240
+    12875393793202830082,     // 9^250
+    10452634243963250834,     // 9^260
+    16971529475976476179,     // 9^270
+    13778001125423815423,     // 9^280
+    11185398185879039609,     // 9^290
+    18161289353620602647,     // 9^300
+    14743884191906938838,     // 9^310
+    11969531283362676572,     // 9^320
+];
+const BASE9_LARGE_EXPONENT: [i32; 69] = [
+    -1205,                    // 9^-360
+    -1173,                    // 9^-350
+    -1141,                    // 9^-340
+    -1110,                    // 9^-330
+    -1078,                    // 9^-320
+    -1046,                    // 9^-310
+    -1014,                    // 9^-300
+    -983,                     // 9^-290
+    -951,                     // 9^-280
+    -919,                     // 9^-270
+    -888,                     // 9^-260
+    -856,                     // 9^-250
+    -824,                     // 9^-240
+    -793,                     // 9^-230
+    -761,                     // 9^-220
+    -729,                     // 9^-210
+    -697,                     // 9^-200
+    -666,                     // 9^-190
+    -634,                     // 9^-180
+    -602,                     // 9^-170
+    -571,                     // 9^-160
+    -539,                     // 9^-150
+    -507,                     // 9^-140
+    -476,                     // 9^-130
+    -444,                     // 9^-120
+    -412,                     // 9^-110
+    -380,                     // 9^-100
+    -349,                     // 9^-90
+    -317,                     // 9^-80
+    -285,                     // 9^-70
+    -254,                     // 9^-60
+    -222,                     // 9^-50
+    -190,                     // 9^-40
+    -159,                     // 9^-30
+    -127,                     // 9^-20
+    -95,                      // 9^-10
+    -63,                      // 9^0
+    -32,                      // 9^10
+    0,                        // 9^20
+    32,                       // 9^30
+    63,                       // 9^40
+    95,                       // 9^50
+    127,                      // 9^60
+    158,                      // 9^70
+    190,                      // 9^80
+    222,                      // 9^90
+    253,                      // 9^100
+    285,                      // 9^110
+    317,                      // 9^120
+    349,                      // 9^130
+    380,                      // 9^140
+    412,                      // 9^150
+    444,                      // 9^160
+    475,                      // 9^170
+    507,                      // 9^180
+    539,                      // 9^190
+    570,                      // 9^200
+    602,                      // 9^210
+    634,                      // 9^220
+    666,                      // 9^230
+    697,                      // 9^240
+    729,                      // 9^250
+    761,                      // 9^260
+    792,                      // 9^270
+    824,                      // 9^280
+    856,                      // 9^290
+    887,                      // 9^300
+    919,                      // 9^310
+    951,                      // 9^320
+];
+const BASE9_SMALL_INT_POWERS: [u64; 10] = [1, 9, 81, 729, 6561, 59049, 531441, 4782969, 43046721, 387420489];
+const BASE9_STEP: i32 = 10;
+const BASE9_BIAS: i32 = 360;
+
+// BASE11
+
+const BASE11_SMALL_MANTISSA: [u64; 9] = [
+    9223372036854775808,      // 11^0
+    12682136550675316736,     // 11^1
+    17437937757178560512,     // 11^2
+    11988582208060260352,     // 11^3
+    16484300536082857984,     // 11^4
+    11332956618556964864,     // 11^5
+    15582815350515826688,     // 11^6
+    10713185553479630848,     // 11^7
+    14730630136034492416,     // 11^8
+];
+const BASE11_SMALL_EXPONENT: [i32; 9] = [
+    -63,                      // 11^0
+    -60,                      // 11^1
+    -57,                      // 11^2
+    -53,                      // 11^3
+    -50,                      // 11^4
+    -46,                      // 11^5
+    -43,                      // 11^6
+    -39,                      // 11^7
+    -36,                      // 11^8
+];
+const BASE11_LARGE_MANTISSA: [u64; 70] = [
+    9282833781626869722,      // 11^-333
+    10192597509046958613,     // 11^-324
+    11191522591630754840,     // 11^-315
+    12288347284174558846,     // 11^-306
+    13492666233761944748,     // 11^-297
+    14815014410453217040,     // 11^-288
+    16266959263598494876,     // 11^-279
+    17861201909926315464,     // 11^-270
+    9805844119283264859,      // 11^-261
+    10766865452458105492,     // 11^-252
+    11822071640254585128,     // 11^-243
+    12980693265318349774,     // 11^-234
+    14252865553152120313,     // 11^-225
+    15649717031600177225,     // 11^-216
+    17183466879401827195,     // 11^-207
+    9433765907692842627,      // 11^-198
+    10358321731667433590,     // 11^-189
+    11373488609595385666,     // 11^-180
+    12488146873940825498,     // 11^-171
+    13712047173770907127,     // 11^-162
+    15055895770097238115,     // 11^-153
+    16531448190583591098,     // 11^-144
+    18151612062879235750,     // 11^-135
+    9965280013064351107,      // 11^-126
+    10941926854184612877,     // 11^-117
+    12014289927163860584,     // 11^-108
+    13191749897208336388,     // 11^-99
+    14484606781216284322,     // 11^-90
+    15904170048801172427,     // 11^-81
+    17462857553661839031,     // 11^-72
+    9587152080358667750,      // 11^-63
+    10526740509619734750,     // 11^-54
+    11558413262671798860,     // 11^-45
+    12691195059726361470,     // 11^-36
+    13934995088312952370,     // 11^-27
+    15300693685460773821,     // 11^-18
+    16800237515163846269,     // 11^-9
+    9223372036854775808,      // 11^0
+    10127308218523713536,     // 11^9
+    11119834626984462962,     // 11^18
+    12209633543621683835,     // 11^27
+    13406238156435497652,     // 11^36
+    14720115953107913248,     // 11^45
+    16162760287003157808,     // 11^54
+    17746790917089950882,     // 11^63
+    9743032200637278641,      // 11^72
+    10697897654413860244,     // 11^81
+    11746344656115154606,     // 11^90
+    12897544661339799796,     // 11^99
+    14161567973799797658,     // 11^108
+    15549471836891389165,     // 11^117
+    17073397158676562691,     // 11^126
+    9373337358196117359,      // 11^135
+    10291970884763903381,     // 11^144
+    11300635050781198339,     // 11^153
+    12408153305213523269,     // 11^162
+    13624213838764580644,     // 11^171
+    14959454332853289890,     // 11^180
+    16425555014410689631,     // 11^189
+    18035340830508227153,     // 11^198
+    9901446818303059920,      // 11^207
+    10871837689903097542,     // 11^216
+    11937331677337075986,     // 11^225
+    13107249357401447067,     // 11^234
+    14391824769622635037,     // 11^243
+    15802294940132787091,     // 11^252
+    17350998179329134782,     // 11^261
+    9525741006595626773,      // 11^270
+    10459310846201225147,     // 11^279
+    11484375157976259923,     // 11^288
+];
+const BASE11_LARGE_EXPONENT: [i32; 70] = [
+    -1215,                    // 11^-333
+    -1184,                    // 11^-324
+    -1153,                    // 11^-315
+    -1122,                    // 11^-306
+    -1091,                    // 11^-297
+    -1060,                    // 11^-288
+    -1029,                    // 11^-279
+    -998,                     // 11^-270
+    -966,                     // 11^-261
+    -935,                     // 11^-252
+    -904,                     // 11^-243
+    -873,                     // 11^-234
+    -842,                     // 11^-225
+    -811,                     // 11^-216
+    -780,                     // 11^-207
+    -748,                     // 11^-198
+    -717,                     // 11^-189
+    -686,                     // 11^-180
+    -655,                     // 11^-171
+    -624,                     // 11^-162
+    -593,                     // 11^-153
+    -562,                     // 11^-144
+    -531,                     // 11^-135
+    -499,                     // 11^-126
+    -468,                     // 11^-117
+    -437,                     // 11^-108
+    -406,                     // 11^-99
+    -375,                     // 11^-90
+    -344,                     // 11^-81
+    -313,                     // 11^-72
+    -281,                     // 11^-63
+    -250,                     // 11^-54
+    -219,                     // 11^-45
+    -188,                     // 11^-36
+    -157,                     // 11^-27
+    -126,                     // 11^-18
+    -95,                      // 11^-9
+    -63,                      // 11^0
+    -32,                      // 11^9
+    -1,                       // 11^18
+    30,                       // 11^27
+    61,                       // 11^36
+    92,                       // 11^45
+    123,                      // 11^54
+    154,                      // 11^63
+    186,                      // 11^72
+    217,                      // 11^81
+    248,                      // 11^90
+    279,                      // 11^99
+    310,                      // 11^108
+    341,                      // 11^117
+    372,                      // 11^126
+    404,                      // 11^135
+    435,                      // 11^144
+    466,                      // 11^153
+    497,                      // 11^162
+    528,                      // 11^171
+    559,                      // 11^180
+    590,                      // 11^189
+    621,                      // 11^198
+    653,                      // 11^207
+    684,                      // 11^216
+    715,                      // 11^225
+    746,                      // 11^234
+    777,                      // 11^243
+    808,                      // 11^252
+    839,                      // 11^261
+    871,                      // 11^270
+    902,                      // 11^279
+    933,                      // 11^288
+];
+const BASE11_SMALL_INT_POWERS: [u64; 9] = [1, 11, 121, 1331, 14641, 161051, 1771561, 19487171, 214358881];
+const BASE11_STEP: i32 = 9;
+const BASE11_BIAS: i32 = 333;
+
+// BASE12
+
+const BASE12_SMALL_MANTISSA: [u64; 9] = [
+    9223372036854775808,      // 12^0
+    13835058055282163712,     // 12^1
+    10376293541461622784,     // 12^2
+    15564440312192434176,     // 12^3
+    11673330234144325632,     // 12^4
+    17509995351216488448,     // 12^5
+    13132496513412366336,     // 12^6
+    9849372385059274752,      // 12^7
+    14774058577588912128,     // 12^8
+];
+const BASE12_SMALL_EXPONENT: [i32; 9] = [
+    -63,                      // 12^0
+    -60,                      // 12^1
+    -56,                      // 12^2
+    -53,                      // 12^3
+    -49,                      // 12^4
+    -46,                      // 12^5
+    -42,                      // 12^6
+    -38,                      // 12^7
+    -35,                      // 12^8
+];
+const BASE12_LARGE_MANTISSA: [u64; 68] = [
+    12794430777395563548,     // 12^-324
+    15370653136686821126,     // 12^-315
+    9232805349408163458,      // 12^-306
+    11091876690210014731,     // 12^-297
+    13325281304529035642,     // 12^-288
+    16008393061343079134,     // 12^-279
+    9615881366772943927,      // 12^-270
+    11552086971569327107,     // 12^-261
+    13878157218102970303,     // 12^-252
+    16672593293696335722,     // 12^-243
+    10014851495355986817,     // 12^-234
+    12031391722600823274,     // 12^-225
+    14453972367916992462,     // 12^-216
+    17364351691754770668,     // 12^-207
+    10430375193750279268,     // 12^-198
+    12530583187169601247,     // 12^-189
+    15053678520084183432,     // 12^-180
+    18084811664478575592,     // 12^-171
+    10863139281980340679,     // 12^-162
+    13050486479932803075,     // 12^-153
+    15678266930207358578,     // 12^-144
+    9417582030861555141,      // 12^-135
+    11313859076748534537,     // 12^-126
+    13591960950173425616,     // 12^-117
+    16328769981827608423,     // 12^-108
+    9808324571298608904,      // 12^-99
+    11783279573783601017,     // 12^-90
+    14155901602220618825,     // 12^-81
+    17006262892853298360,     // 12^-72
+    10215279312745101062,     // 12^-63
+    12272176679245716810,     // 12^-54
+    14743240574804287352,     // 12^-45
+    17711865492790087155,     // 12^-36
+    10639118911577981124,     // 12^-27
+    12781358492223474271,     // 12^-18
+    15354948681789223882,     // 12^-9
+    9223372036854775808,      // 12^0
+    11080543933191684096,     // 12^9
+    13311666640442621952,     // 12^18
+    15992037016835457024,     // 12^27
+    9606056659007943744,      // 12^36
+    11540284009964194135,     // 12^45
+    13863977671394362375,     // 12^54
+    16655558624637160317,     // 12^63
+    10004619153098548172,     // 12^72
+    12019099047267988506,     // 12^81
+    14439204501182606065,     // 12^90
+    17346610241502516795,     // 12^99
+    10419718303939637392,     // 12^108
+    12517780479519279956,     // 12^117
+    15038297923484984581,     // 12^126
+    18066334108151547333,     // 12^135
+    10852040229820157048,     // 12^144
+    13037152578341684032,     // 12^153
+    15662248181121787524,     // 12^162
+    9407959928864140132,      // 12^171
+    11302299516591361707,     // 12^180
+    13578073815006577911,     // 12^189
+    16312086602830473207,     // 12^198
+    9798303241073980839,      // 12^207
+    11771240398807322073,     // 12^216
+    14141438279402131370,     // 12^225
+    16988887307951181138,     // 12^234
+    10204842190014742991,     // 12^243
+    12259637989871837542,     // 12^252
+    14728177157876426901,     // 12^261
+    17693768981840924725,     // 12^270
+    10628248744799039348,     // 12^279
+];
+const BASE12_LARGE_EXPONENT: [i32; 68] = [
+    -1225,                    // 12^-324
+    -1193,                    // 12^-315
+    -1160,                    // 12^-306
+    -1128,                    // 12^-297
+    -1096,                    // 12^-288
+    -1064,                    // 12^-279
+    -1031,                    // 12^-270
+    -999,                     // 12^-261
+    -967,                     // 12^-252
+    -935,                     // 12^-243
+    -902,                     // 12^-234
+    -870,                     // 12^-225
+    -838,                     // 12^-216
+    -806,                     // 12^-207
+    -773,                     // 12^-198
+    -741,                     // 12^-189
+    -709,                     // 12^-180
+    -677,                     // 12^-171
+    -644,                     // 12^-162
+    -612,                     // 12^-153
+    -580,                     // 12^-144
+    -547,                     // 12^-135
+    -515,                     // 12^-126
+    -483,                     // 12^-117
+    -451,                     // 12^-108
+    -418,                     // 12^-99
+    -386,                     // 12^-90
+    -354,                     // 12^-81
+    -322,                     // 12^-72
+    -289,                     // 12^-63
+    -257,                     // 12^-54
+    -225,                     // 12^-45
+    -193,                     // 12^-36
+    -160,                     // 12^-27
+    -128,                     // 12^-18
+    -96,                      // 12^-9
+    -63,                      // 12^0
+    -31,                      // 12^9
+    1,                        // 12^18
+    33,                       // 12^27
+    66,                       // 12^36
+    98,                       // 12^45
+    130,                      // 12^54
+    162,                      // 12^63
+    195,                      // 12^72
+    227,                      // 12^81
+    259,                      // 12^90
+    291,                      // 12^99
+    324,                      // 12^108
+    356,                      // 12^117
+    388,                      // 12^126
+    420,                      // 12^135
+    453,                      // 12^144
+    485,                      // 12^153
+    517,                      // 12^162
+    550,                      // 12^171
+    582,                      // 12^180
+    614,                      // 12^189
+    646,                      // 12^198
+    679,                      // 12^207
+    711,                      // 12^216
+    743,                      // 12^225
+    775,                      // 12^234
+    808,                      // 12^243
+    840,                      // 12^252
+    872,                      // 12^261
+    904,                      // 12^270
+    937,                      // 12^279
+];
+const BASE12_SMALL_INT_POWERS: [u64; 9] = [1, 12, 144, 1728, 20736, 248832, 2985984, 35831808, 429981696];
+const BASE12_STEP: i32 = 9;
+const BASE12_BIAS: i32 = 324;
+
+// BASE13
+
+const BASE13_SMALL_MANTISSA: [u64; 8] = [
+    9223372036854775808,      // 13^0
+    14987979559889010688,     // 13^1
+    12177733392409821184,     // 13^2
+    9894408381332979712,      // 13^3
+    16078413619666092032,     // 13^4
+    13063711065978699776,     // 13^5
+    10614265241107693568,     // 13^6
+    17248181016800002048,     // 13^7
+];
+const BASE13_SMALL_EXPONENT: [i32; 8] = [
+    -63,                      // 13^0
+    -60,                      // 13^1
+    -56,                      // 13^2
+    -52,                      // 13^3
+    -49,                      // 13^4
+    -45,                      // 13^5
+    -41,                      // 13^6
+    -38,                      // 13^7
+];
+const BASE13_LARGE_MANTISSA: [u64; 74] = [
+    12711851154623003921,     // 13^-312
+    9657300550123029827,      // 13^-304
+    14673465379822171777,     // 13^-296
+    11147555423761605318,     // 13^-288
+    16937783776246970219,     // 13^-280
+    12867777209673117558,     // 13^-272
+    9775758889423702247,      // 13^-264
+    14853452979012869128,     // 13^-256
+    11284293521111612769,     // 13^-248
+    17145545948207386966,     // 13^-240
+    13025615884242430727,     // 13^-232
+    9895670261906581517,      // 13^-224
+    15035648341334079534,     // 13^-216
+    11422708874734959378,     // 13^-208
+    17355856571645749915,     // 13^-200
+    13185390638896427802,     // 13^-192
+    10017052490761162429,     // 13^-184
+    15220078547640608376,     // 13^-176
+    11562822058185475244,     // 13^-168
+    17568746906366835671,     // 13^-160
+    13347125221972482607,     // 13^-152
+    10139923617799671626,     // 13^-144
+    15406771010966328102,     // 13^-136
+    11704653897376229735,     // 13^-128
+    17784248595614306423,     // 13^-120
+    13510843673109724761,     // 13^-112
+    10264301906138736839,     // 13^-104
+    15595753480598751694,     // 13^-96
+    11848225473675019323,     // 13^-88
+    18002393670774046392,     // 13^-80
+    13676570326822204041,     // 13^-72
+    10390205842913949994,     // 13^-64
+    15787054046203585657,     // 13^-56
+    11993558127037825287,     // 13^-48
+    18223214556135190308,     // 13^-40
+    13844329816115883890,     // 13^-32
+    10517654142027727687,     // 13^-24
+    15980701141999875583,     // 13^-16
+    12140673459180707010,     // 13^-8
+    9223372036854775808,      // 13^0
+    14014147076150001664,     // 13^8
+    10646665746930877456,     // 13^16
+    16176723550986364864,     // 13^24
+    12289593336790602348,     // 13^32
+    9336507724055083356,      // 13^40
+    14186047347943339851,     // 13^48
+    10777259833438283283,     // 13^56
+    16375150409219694755,     // 13^64
+    12440339894775512302,     // 13^72
+    9451031155744840189,      // 13^80
+    14360056182125959135,     // 13^88
+    10909455812579128852,     // 13^96
+    16576011210145081669,     // 13^104
+    12592935539554553092,     // 13^112
+    9566959354269653198,      // 13^120
+    14536199442736950948,     // 13^128
+    11043273333482082198,     // 13^136
+    16779335808980115413,     // 13^144
+    12747402952388364654,     // 13^152
+    9684309550774553205,      // 13^160
+    14714503311068774005,     // 13^168
+    11178732286295870598,     // 13^176
+    16985154427152329948,     // 13^184
+    12903765092750370582,     // 13^192
+    9803099187765169579,      // 13^200
+    14894994289558746218,     // 13^208
+    11315852805145679810,     // 13^216
+    17193497656791206265,     // 13^224
+    13062045201739390598,     // 13^232
+    9923345921700320715,      // 13^240
+    15077699205728270417,     // 13^248
+    11454655271125817073,     // 13^256
+    17404396465275275042,     // 13^264
+    13222266805534112801,     // 13^272
+];
+const BASE13_LARGE_EXPONENT: [i32; 74] = [
+    -1218,                    // 13^-312
+    -1188,                    // 13^-304
+    -1159,                    // 13^-296
+    -1129,                    // 13^-288
+    -1100,                    // 13^-280
+    -1070,                    // 13^-272
+    -1040,                    // 13^-264
+    -1011,                    // 13^-256
+    -981,                     // 13^-248
+    -952,                     // 13^-240
+    -922,                     // 13^-232
+    -892,                     // 13^-224
+    -863,                     // 13^-216
+    -833,                     // 13^-208
+    -804,                     // 13^-200
+    -774,                     // 13^-192
+    -744,                     // 13^-184
+    -715,                     // 13^-176
+    -685,                     // 13^-168
+    -656,                     // 13^-160
+    -626,                     // 13^-152
+    -596,                     // 13^-144
+    -567,                     // 13^-136
+    -537,                     // 13^-128
+    -508,                     // 13^-120
+    -478,                     // 13^-112
+    -448,                     // 13^-104
+    -419,                     // 13^-96
+    -389,                     // 13^-88
+    -360,                     // 13^-80
+    -330,                     // 13^-72
+    -300,                     // 13^-64
+    -271,                     // 13^-56
+    -241,                     // 13^-48
+    -212,                     // 13^-40
+    -182,                     // 13^-32
+    -152,                     // 13^-24
+    -123,                     // 13^-16
+    -93,                      // 13^-8
+    -63,                      // 13^0
+    -34,                      // 13^8
+    -4,                       // 13^16
+    25,                       // 13^24
+    55,                       // 13^32
+    85,                       // 13^40
+    114,                      // 13^48
+    144,                      // 13^56
+    173,                      // 13^64
+    203,                      // 13^72
+    233,                      // 13^80
+    262,                      // 13^88
+    292,                      // 13^96
+    321,                      // 13^104
+    351,                      // 13^112
+    381,                      // 13^120
+    410,                      // 13^128
+    440,                      // 13^136
+    469,                      // 13^144
+    499,                      // 13^152
+    529,                      // 13^160
+    558,                      // 13^168
+    588,                      // 13^176
+    617,                      // 13^184
+    647,                      // 13^192
+    677,                      // 13^200
+    706,                      // 13^208
+    736,                      // 13^216
+    765,                      // 13^224
+    795,                      // 13^232
+    825,                      // 13^240
+    854,                      // 13^248
+    884,                      // 13^256
+    913,                      // 13^264
+    943,                      // 13^272
+];
+const BASE13_SMALL_INT_POWERS: [u64; 8] = [1, 13, 169, 2197, 28561, 371293, 4826809, 62748517];
+const BASE13_STEP: i32 = 8;
+const BASE13_BIAS: i32 = 312;
+
+// BASE14
+
+const BASE14_SMALL_MANTISSA: [u64; 8] = [
+    9223372036854775808,      // 14^0
+    16140901064495857664,     // 14^1
+    14123288431433875456,     // 14^2
+    12357877377504641024,     // 14^3
+    10813142705316560896,     // 14^4
+    9461499867151990784,      // 14^5
+    16557624767515983872,     // 14^6
+    14487921671576485888,     // 14^7
+];
+const BASE14_SMALL_EXPONENT: [i32; 8] = [
+    -63,                      // 14^0
+    -60,                      // 14^1
+    -56,                      // 14^2
+    -52,                      // 14^3
+    -48,                      // 14^4
+    -44,                      // 14^5
+    -41,                      // 14^6
+    -37,                      // 14^7
+];
+const BASE14_LARGE_MANTISSA: [u64; 72] = [
+    13636466802170654447,     // 14^-304
+    9371223146631740442,      // 14^-296
+    12880143300754023535,     // 14^-288
+    17702928299982570560,     // 14^-280
+    12165767999490239948,     // 14^-272
+    16721065408999761282,     // 14^-264
+    11491014312609104256,     // 14^-256
+    15793659877858943182,     // 14^-248
+    10853684694473876180,     // 14^-240
+    14917691321465419740,     // 14^-232
+    10251703482589146278,     // 14^-224
+    14090306875260685218,     // 14^-216
+    9683110137559136558,      // 14^-208
+    13308811903980028150,     // 14^-200
+    18292105715960495534,     // 14^-192
+    12570661225733134820,     // 14^-184
+    17277565098945522629,     // 14^-176
+    11873450822826176619,     // 14^-168
+    16319294256419936609,     // 14^-160
+    11214910012329090474,     // 14^-152
+    15414172280784786485,     // 14^-144
+    10592894050889065017,     // 14^-136
+    14559251360287507272,     // 14^-128
+    10005377149705503250,     // 14^-120
+    13751747178554400168,     // 14^-112
+    9450445876917551117,      // 14^-104
+    12989029846596759700,     // 14^-96
+    17852585851834022264,     // 14^-88
+    12268615337757900164,     // 14^-80
+    16862422458582420498,     // 14^-72
+    11588157397706317457,     // 14^-64
+    15927176798452085633,     // 14^-56
+    10945439903127358164,     // 14^-48
+    15043802952525257461,     // 14^-40
+    10338369644227094261,     // 14^-32
+    14209423938610553080,     // 14^-24
+    9764969507542378307,      // 14^-16
+    13421322341453983785,     // 14^-8
+    9223372036854775808,      // 14^0
+    12676931462629425152,     // 14^8
+    17423626702474969088,     // 14^16
+    11973826961285400900,     // 14^24
+    16457254800854930971,     // 14^32
+    11309718958523667683,     // 14^40
+    15544481077627229210,     // 14^48
+    10682444579695049354,     // 14^56
+    14682332800738954595,     // 14^64
+    10089960910324183248,     // 14^72
+    13868002115678253630,     // 14^80
+    9530338342721952463,      // 14^88
+    13098836900821174211,     // 14^96
+    18003508583233548621,     // 14^104
+    12372332129971187630,     // 14^112
+    17004974516675479989,     // 14^120
+    11686121713960805382,     // 14^128
+    16061822448435536582,     // 14^136
+    11037970794744924274,     // 14^144
+    15170980709914287138,     // 14^152
+    10425768466889213611,     // 14^160
+    14329547997401095751,     // 14^168
+    9847520902748803399,      // 14^176
+    13534783923074532648,     // 14^184
+    9301344858947275744,      // 14^192
+    12784100090075520076,     // 14^200
+    17570923086015569737,     // 14^208
+    12075051662586407952,     // 14^216
+    16596381640322157656,     // 14^224
+    11405329403461315009,     // 14^232
+    15675891482926176126,     // 14^240
+    10772752153475797540,     // 14^248
+    14806454750802381310,     // 14^256
+    10175259727702178785,     // 14^264
+];
+const BASE14_LARGE_EXPONENT: [i32; 72] = [
+    -1221,                    // 14^-304
+    -1190,                    // 14^-296
+    -1160,                    // 14^-288
+    -1130,                    // 14^-280
+    -1099,                    // 14^-272
+    -1069,                    // 14^-264
+    -1038,                    // 14^-256
+    -1008,                    // 14^-248
+    -977,                     // 14^-240
+    -947,                     // 14^-232
+    -916,                     // 14^-224
+    -886,                     // 14^-216
+    -855,                     // 14^-208
+    -825,                     // 14^-200
+    -795,                     // 14^-192
+    -764,                     // 14^-184
+    -734,                     // 14^-176
+    -703,                     // 14^-168
+    -673,                     // 14^-160
+    -642,                     // 14^-152
+    -612,                     // 14^-144
+    -581,                     // 14^-136
+    -551,                     // 14^-128
+    -520,                     // 14^-120
+    -490,                     // 14^-112
+    -459,                     // 14^-104
+    -429,                     // 14^-96
+    -399,                     // 14^-88
+    -368,                     // 14^-80
+    -338,                     // 14^-72
+    -307,                     // 14^-64
+    -277,                     // 14^-56
+    -246,                     // 14^-48
+    -216,                     // 14^-40
+    -185,                     // 14^-32
+    -155,                     // 14^-24
+    -124,                     // 14^-16
+    -94,                      // 14^-8
+    -63,                      // 14^0
+    -33,                      // 14^8
+    -3,                       // 14^16
+    28,                       // 14^24
+    58,                       // 14^32
+    89,                       // 14^40
+    119,                      // 14^48
+    150,                      // 14^56
+    180,                      // 14^64
+    211,                      // 14^72
+    241,                      // 14^80
+    272,                      // 14^88
+    302,                      // 14^96
+    332,                      // 14^104
+    363,                      // 14^112
+    393,                      // 14^120
+    424,                      // 14^128
+    454,                      // 14^136
+    485,                      // 14^144
+    515,                      // 14^152
+    546,                      // 14^160
+    576,                      // 14^168
+    607,                      // 14^176
+    637,                      // 14^184
+    668,                      // 14^192
+    698,                      // 14^200
+    728,                      // 14^208
+    759,                      // 14^216
+    789,                      // 14^224
+    820,                      // 14^232
+    850,                      // 14^240
+    881,                      // 14^248
+    911,                      // 14^256
+    942,                      // 14^264
+];
+const BASE14_SMALL_INT_POWERS: [u64; 8] = [1, 14, 196, 2744, 38416, 537824, 7529536, 105413504];
+const BASE14_STEP: i32 = 8;
+const BASE14_BIAS: i32 = 304;
+
+// BASE15
+
+const BASE15_SMALL_MANTISSA: [u64; 8] = [
+    9223372036854775808,      // 15^0
+    17293822569102704640,     // 15^1
+    16212958658533785600,     // 15^2
+    15199648742375424000,     // 15^3
+    14249670695976960000,     // 15^4
+    13359066277478400000,     // 15^5
+    12524124635136000000,     // 15^6
+    11741366845440000000,     // 15^7
+];
+const BASE15_SMALL_EXPONENT: [i32; 8] = [
+    -63,                      // 15^0
+    -60,                      // 15^1
+    -56,                      // 15^2
+    -52,                      // 15^3
+    -48,                      // 15^4
+    -44,                      // 15^5
+    -40,                      // 15^6
+    -36,                      // 15^7
+];
+const BASE15_LARGE_MANTISSA: [u64; 70] = [
+    13601350414362439244,     // 15^-296
+    16232381325359158633,     // 15^-288
+    9686178043528474499,      // 15^-280
+    11559862131178364723,     // 15^-272
+    13795989697002596758,     // 15^-264
+    16464671426007778306,     // 15^-256
+    9824790070164184132,      // 15^-248
+    11725287122380398084,     // 15^-240
+    13993414324420480958,     // 15^-232
+    16700285665596816319,     // 15^-224
+    9965385675239368708,      // 15^-216
+    11893079393347852255,     // 15^-208
+    14193664155710441018,     // 15^-200
+    16939271613521887687,     // 15^-192
+    10107993244338750184,     // 15^-184
+    12063272820543086702,     // 15^-176
+    14396779620362065880,     // 15^-168
+    17181677519910502131,     // 15^-160
+    10252641569253028545,     // 15^-152
+    12235901765210495847,     // 15^-144
+    14602801726422706134,     // 15^-136
+    17427552325363535592,     // 15^-128
+    10399359853791807565,     // 15^-120
+    12411001080313881072,     // 15^-112
+    14811772068776803956,     // 15^-104
+    17676945670836105047,     // 15^-96
+    10548177719679705225,     // 15^-88
+    12588606117573098524,     // 15^-80
+    15023732837543702665,     // 15^-72
+    17929907907659841510,     // 15^-64
+    10699125212536839185,     // 15^-56
+    12768752734601403407,     // 15^-48
+    15238726826595631383,     // 15^-40
+    18186490107708584674,     // 15^-32
+    10852232807944894743,     // 15^-24
+    12951477302144931748,     // 15^-16
+    15456797442197584532,     // 15^-8
+    9223372036854775808,      // 15^0
+    11007531417600000000,     // 15^8
+    13136816711425781250,     // 15^16
+    15677988711770840524,     // 15^24
+    9355361174851030653,      // 15^32
+    11165052395553650442,     // 15^40
+    13324808381590173768,     // 15^48
+    15902345292781888946,     // 15^56
+    9489239115822963265,      // 15^64
+    11324827544542942993,     // 15^72
+    13515490267263203164,     // 15^80
+    16129912481758560891,     // 15^88
+    9625032889090827484,      // 15^96
+    11486889122411397534,     // 15^104
+    13708900866211693796,     // 15^112
+    16360736223435182728,     // 15^120
+    9762769910772315950,      // 15^128
+    11651269848621662268,     // 15^136
+    13905079227116716745,     // 15^144
+    16594863120028599690,     // 15^152
+    9902477989317744010,      // 15^160
+    11818002910861417777,     // 15^168
+    14104064957457333009,     // 15^176
+    16832340440646942057,     // 15^184
+    10044185331124443731,     // 15^192
+    11987121971743813505,     // 15^200
+    14305898231507155361,     // 15^208
+    17073216130833033517,     // 15^216
+    10187920546231501512,     // 15^224
+    12158661175603789420,     // 15^232
+    14510619798445343328,     // 15^240
+    17317538822244368489,     // 15^248
+    10333712654095989060,     // 15^256
+];
+const BASE15_LARGE_EXPONENT: [i32; 70] = [
+    -1220,                    // 15^-296
+    -1189,                    // 15^-288
+    -1157,                    // 15^-280
+    -1126,                    // 15^-272
+    -1095,                    // 15^-264
+    -1064,                    // 15^-256
+    -1032,                    // 15^-248
+    -1001,                    // 15^-240
+    -970,                     // 15^-232
+    -939,                     // 15^-224
+    -907,                     // 15^-216
+    -876,                     // 15^-208
+    -845,                     // 15^-200
+    -814,                     // 15^-192
+    -782,                     // 15^-184
+    -751,                     // 15^-176
+    -720,                     // 15^-168
+    -689,                     // 15^-160
+    -657,                     // 15^-152
+    -626,                     // 15^-144
+    -595,                     // 15^-136
+    -564,                     // 15^-128
+    -532,                     // 15^-120
+    -501,                     // 15^-112
+    -470,                     // 15^-104
+    -439,                     // 15^-96
+    -407,                     // 15^-88
+    -376,                     // 15^-80
+    -345,                     // 15^-72
+    -314,                     // 15^-64
+    -282,                     // 15^-56
+    -251,                     // 15^-48
+    -220,                     // 15^-40
+    -189,                     // 15^-32
+    -157,                     // 15^-24
+    -126,                     // 15^-16
+    -95,                      // 15^-8
+    -63,                      // 15^0
+    -32,                      // 15^8
+    -1,                       // 15^16
+    30,                       // 15^24
+    62,                       // 15^32
+    93,                       // 15^40
+    124,                      // 15^48
+    155,                      // 15^56
+    187,                      // 15^64
+    218,                      // 15^72
+    249,                      // 15^80
+    280,                      // 15^88
+    312,                      // 15^96
+    343,                      // 15^104
+    374,                      // 15^112
+    405,                      // 15^120
+    437,                      // 15^128
+    468,                      // 15^136
+    499,                      // 15^144
+    530,                      // 15^152
+    562,                      // 15^160
+    593,                      // 15^168
+    624,                      // 15^176
+    655,                      // 15^184
+    687,                      // 15^192
+    718,                      // 15^200
+    749,                      // 15^208
+    780,                      // 15^216
+    812,                      // 15^224
+    843,                      // 15^232
+    874,                      // 15^240
+    905,                      // 15^248
+    937,                      // 15^256
+];
+const BASE15_SMALL_INT_POWERS: [u64; 8] = [1, 15, 225, 3375, 50625, 759375, 11390625, 170859375];
+const BASE15_STEP: i32 = 8;
+const BASE15_BIAS: i32 = 296;
+
+// BASE17
+
+const BASE17_SMALL_MANTISSA: [u64; 8] = [
+    9223372036854775808,      // 17^0
+    9799832789158199296,      // 17^1
+    10412322338480586752,     // 17^2
+    11063092484635623424,     // 17^3
+    11754535764925349888,     // 17^4
+    12489194250233184256,     // 17^5
+    13269768890872758272,     // 17^6
+    14099129446552305664,     // 17^7
+];
+const BASE17_SMALL_EXPONENT: [i32; 8] = [
+    -63,                      // 17^0
+    -59,                      // 17^1
+    -55,                      // 17^2
+    -51,                      // 17^3
+    -47,                      // 17^4
+    -43,                      // 17^5
+    -39,                      // 17^6
+    -35,                      // 17^7
+];
+const BASE17_LARGE_MANTISSA: [u64; 67] = [
+    13138227451101932889,     // 17^-280
+    10669358063439695630,     // 17^-272
+    17328852299072967575,     // 17^-264
+    14072501842077846052,     // 17^-256
+    11428068326595325663,     // 17^-248
+    9280563409615280245,      // 17^-240
+    15073213554289220394,     // 17^-232
+    12240731344920942400,     // 17^-224
+    9940514895438007254,      // 17^-216
+    16145087021687770276,     // 17^-208
+    13111183760586542995,     // 17^-200
+    10647396286743453217,     // 17^-192
+    17293182638130712658,     // 17^-184
+    14043535043777936273,     // 17^-176
+    11404544822822581011,     // 17^-168
+    9261460323937079649,      // 17^-160
+    15042186893809203473,     // 17^-152
+    12215535057871861844,     // 17^-144
+    9920053367473418578,      // 17^-136
+    16111854019870470980,     // 17^-128
+    13084195736727816960,     // 17^-120
+    10625479716106730764,     // 17^-112
+    17257586399518441101,     // 17^-104
+    14014627870654357169,     // 17^-96
+    11381069739763987898,     // 17^-88
+    9242396559996829853,      // 17^-80
+    15011224098520048145,     // 17^-72
+    12190390634789334486,     // 17^-64
+    9899633957460570790,      // 17^-56
+    16078689424770850259,     // 17^-48
+    13057263264941664926,     // 17^-40
+    10603608258477502216,     // 17^-32
+    17222063432103834911,     // 17^-24
+    13985780199974813110,     // 17^-16
+    11357642977750484199,     // 17^-8
+    9223372036854775808,      // 17^0
+    14980325036961824768,     // 17^8
+    12165297968916717120,     // 17^16
+    9879256578703990224,      // 17^24
+    16045593095580712414,     // 17^32
+    13030386230879856604,     // 17^40
+    10581781820995279550,     // 17^48
+    17186613585065666435,     // 17^56
+    13956991909259640275,     // 17^64
+    11334264437318166304,     // 17^72
+    18408773347475537258,     // 17^80
+    14949489577945200446,     // 17^88
+    12140256953717114113,     // 17^96
+    9858921144686656932,      // 17^104
+    16012564891781700940,     // 17^112
+    13003564520429535778,     // 17^120
+    10560000310990718510,     // 17^128
+    17151236707893158013,     // 17^136
+    13928262876281286641,     // 17^144
+    11310934019207866827,     // 17^152
+    18370880780077845311,     // 17^160
+    14918717590550882042,     // 17^168
+    12115267482872925081,     // 17^176
+    9838627569069637357,      // 17^184
+    15979604673144701925,     // 17^192
+    12976798019712735820,     // 17^200
+    10538263635985225157,     // 17^208
+    17115932650385342947,     // 17^216
+    13899592979063793037,     // 17^224
+    11287651624364733171,     // 17^232
+    18333066210634546428,     // 17^240
+    14888008944129060322,     // 17^248
+];
+const BASE17_LARGE_EXPONENT: [i32; 67] = [
+    -1208,                    // 17^-280
+    -1175,                    // 17^-272
+    -1143,                    // 17^-264
+    -1110,                    // 17^-256
+    -1077,                    // 17^-248
+    -1044,                    // 17^-240
+    -1012,                    // 17^-232
+    -979,                     // 17^-224
+    -946,                     // 17^-216
+    -914,                     // 17^-208
+    -881,                     // 17^-200
+    -848,                     // 17^-192
+    -816,                     // 17^-184
+    -783,                     // 17^-176
+    -750,                     // 17^-168
+    -717,                     // 17^-160
+    -685,                     // 17^-152
+    -652,                     // 17^-144
+    -619,                     // 17^-136
+    -587,                     // 17^-128
+    -554,                     // 17^-120
+    -521,                     // 17^-112
+    -489,                     // 17^-104
+    -456,                     // 17^-96
+    -423,                     // 17^-88
+    -390,                     // 17^-80
+    -358,                     // 17^-72
+    -325,                     // 17^-64
+    -292,                     // 17^-56
+    -260,                     // 17^-48
+    -227,                     // 17^-40
+    -194,                     // 17^-32
+    -162,                     // 17^-24
+    -129,                     // 17^-16
+    -96,                      // 17^-8
+    -63,                      // 17^0
+    -31,                      // 17^8
+    2,                        // 17^16
+    35,                       // 17^24
+    67,                       // 17^32
+    100,                      // 17^40
+    133,                      // 17^48
+    165,                      // 17^56
+    198,                      // 17^64
+    231,                      // 17^72
+    263,                      // 17^80
+    296,                      // 17^88
+    329,                      // 17^96
+    362,                      // 17^104
+    394,                      // 17^112
+    427,                      // 17^120
+    460,                      // 17^128
+    492,                      // 17^136
+    525,                      // 17^144
+    558,                      // 17^152
+    590,                      // 17^160
+    623,                      // 17^168
+    656,                      // 17^176
+    689,                      // 17^184
+    721,                      // 17^192
+    754,                      // 17^200
+    787,                      // 17^208
+    819,                      // 17^216
+    852,                      // 17^224
+    885,                      // 17^232
+    917,                      // 17^240
+    950,                      // 17^248
+];
+const BASE17_SMALL_INT_POWERS: [u64; 8] = [1, 17, 289, 4913, 83521, 1419857, 24137569, 410338673];
+const BASE17_STEP: i32 = 8;
+const BASE17_BIAS: i32 = 280;
+
+// BASE18
+
+const BASE18_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 18^0
+    10376293541461622784,     // 18^1
+    11673330234144325632,     // 18^2
+    13132496513412366336,     // 18^3
+    14774058577588912128,     // 18^4
+    16620815899787526144,     // 18^5
+    9349208943630483456,      // 18^6
+];
+const BASE18_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 18^0
+    -59,                      // 18^1
+    -55,                      // 18^2
+    -51,                      // 18^3
+    -47,                      // 18^4
+    -43,                      // 18^5
+    -38,                      // 18^6
+];
+const BASE18_LARGE_MANTISSA: [u64; 75] = [
+    14081888293732326968,     // 18^-273
+    16058262627216485544,     // 18^-266
+    18312018475493194258,     // 18^-259
+    10441042983020688038,     // 18^-252
+    11906429509033078491,     // 18^-245
+    13577481089208229636,     // 18^-238
+    15483062540952967857,     // 18^-231
+    17656089820489710741,     // 18^-224
+    10067049297406417285,     // 18^-217
+    11479946305982273645,     // 18^-210
+    13091141534609253262,     // 18^-203
+    14928465875303384176,     // 18^-196
+    17023656248839843776,     // 18^-189
+    9706451905352742522,      // 18^-182
+    11068739548514628780,     // 18^-175
+    12622222454457155586,     // 18^-168
+    14393734624570008992,     // 18^-161
+    16413876176725623927,     // 18^-154
+    9358770957364699929,      // 18^-147
+    10672262040895386089,     // 18^-140
+    12170099854822007158,     // 18^-133
+    13878157218102970303,     // 18^-126
+    15825938165500818674,     // 18^-119
+    18047087583901234911,     // 18^-112
+    10289986187706530766,     // 18^-105
+    11734172092969064177,     // 18^-98
+    13381047573408163051,     // 18^-91
+    15259059841903798156,     // 18^-84
+    17400648639910404101,     // 18^-77
+    9921403291771844100,      // 18^-70
+    11313859076748534537,     // 18^-63
+    12901744183172431346,     // 18^-56
+    14712486856947913357,     // 18^-49
+    16777364861891103792,     // 18^-42
+    9566022877229980327,      // 18^-35
+    10908601492662859386,     // 18^-28
+    12439609234991117453,     // 18^-21
+    14185491882103974832,     // 18^-14
+    16176406841720334625,     // 18^-7
+    9223372036854775808,      // 18^0
+    10517860061584293888,     // 18^7
+    11994027762626592768,     // 18^14
+    13677373641439044901,     // 18^21
+    15596974880318657672,     // 18^28
+    17785989605508530085,     // 18^35
+    10141114821132365302,     // 18^42
+    11564406827668344530,     // 18^49
+    13187455978423603575,     // 18^56
+    15038297923484984581,     // 18^63
+    17148903079221976570,     // 18^70
+    9777864433756263024,      // 18^77
+    11150174730505647564,     // 18^84
+    12715086956165281921,     // 18^91
+    14499632535849309517,     // 18^98
+    16534636719312342666,     // 18^105
+    9427625519601420913,      // 18^112
+    10750780249562856814,     // 18^119
+    12259637989871837542,     // 18^126
+    13980261911578014597,     // 18^133
+    15942373117198559022,     // 18^140
+    18179864026545065558,     // 18^147
+    10365691907784965713,     // 18^154
+    11820503010388934534,     // 18^161
+    13479494920515287357,     // 18^168
+    15371324143524666656,     // 18^175
+    17528669087274082029,     // 18^182
+    9994397265397337538,      // 18^189
+    11397097657699641734,     // 18^196
+    12996665188491343910,     // 18^203
+    14820729899390519784,     // 18^210
+    16900799671687597041,     // 18^217
+    9636402237998480121,      // 18^224
+    10988858503312433354,     // 18^231
+    12531130210573617469,     // 18^238
+    14289857705148955482,     // 18^245
+];
+const BASE18_LARGE_EXPONENT: [i32; 75] = [
+    -1202,                    // 18^-273
+    -1173,                    // 18^-266
+    -1144,                    // 18^-259
+    -1114,                    // 18^-252
+    -1085,                    // 18^-245
+    -1056,                    // 18^-238
+    -1027,                    // 18^-231
+    -998,                     // 18^-224
+    -968,                     // 18^-217
+    -939,                     // 18^-210
+    -910,                     // 18^-203
+    -881,                     // 18^-196
+    -852,                     // 18^-189
+    -822,                     // 18^-182
+    -793,                     // 18^-175
+    -764,                     // 18^-168
+    -735,                     // 18^-161
+    -706,                     // 18^-154
+    -676,                     // 18^-147
+    -647,                     // 18^-140
+    -618,                     // 18^-133
+    -589,                     // 18^-126
+    -560,                     // 18^-119
+    -531,                     // 18^-112
+    -501,                     // 18^-105
+    -472,                     // 18^-98
+    -443,                     // 18^-91
+    -414,                     // 18^-84
+    -385,                     // 18^-77
+    -355,                     // 18^-70
+    -326,                     // 18^-63
+    -297,                     // 18^-56
+    -268,                     // 18^-49
+    -239,                     // 18^-42
+    -209,                     // 18^-35
+    -180,                     // 18^-28
+    -151,                     // 18^-21
+    -122,                     // 18^-14
+    -93,                      // 18^-7
+    -63,                      // 18^0
+    -34,                      // 18^7
+    -5,                       // 18^14
+    24,                       // 18^21
+    53,                       // 18^28
+    82,                       // 18^35
+    112,                      // 18^42
+    141,                      // 18^49
+    170,                      // 18^56
+    199,                      // 18^63
+    228,                      // 18^70
+    258,                      // 18^77
+    287,                      // 18^84
+    316,                      // 18^91
+    345,                      // 18^98
+    374,                      // 18^105
+    404,                      // 18^112
+    433,                      // 18^119
+    462,                      // 18^126
+    491,                      // 18^133
+    520,                      // 18^140
+    549,                      // 18^147
+    579,                      // 18^154
+    608,                      // 18^161
+    637,                      // 18^168
+    666,                      // 18^175
+    695,                      // 18^182
+    725,                      // 18^189
+    754,                      // 18^196
+    783,                      // 18^203
+    812,                      // 18^210
+    841,                      // 18^217
+    871,                      // 18^224
+    900,                      // 18^231
+    929,                      // 18^238
+    958,                      // 18^245
+];
+const BASE18_SMALL_INT_POWERS: [u64; 7] = [1, 18, 324, 5832, 104976, 1889568, 34012224];
+const BASE18_STEP: i32 = 7;
+const BASE18_BIAS: i32 = 273;
+
+// BASE19
+
+const BASE19_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 19^0
+    10952754293765046272,     // 19^1
+    13006395723845992448,     // 19^2
+    15445094922067116032,     // 19^3
+    18341050219954700288,     // 19^4
+    10889998568098103296,     // 19^5
+    12931873299616497664,     // 19^6
+];
+const BASE19_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 19^0
+    -59,                      // 19^1
+    -55,                      // 19^2
+    -51,                      // 19^3
+    -47,                      // 19^4
+    -42,                      // 19^5
+    -38,                      // 19^6
+];
+const BASE19_LARGE_MANTISSA: [u64; 74] = [
+    11480257701232751935,     // 19^-273
+    9557118560717499270,      // 19^-266
+    15912276110980153383,     // 19^-259
+    13246698229359450470,     // 19^-252
+    11027650146079950824,     // 19^-245
+    18360660994723606251,     // 19^-238
+    15284936849533635885,     // 19^-231
+    12724449003299523561,     // 19^-224
+    10592886580523254223,     // 19^-217
+    17636794501472422448,     // 19^-210
+    14682330350779734844,     // 19^-203
+    12222789379976654044,     // 19^-196
+    10175263507767080823,     // 19^-189
+    16941466343535111364,     // 19^-182
+    14103481529006456400,     // 19^-175
+    11740907617180962231,     // 19^-168
+    9774105166278679843,      // 19^-161
+    16273551401031031665,     // 19^-154
+    13547453741119703900,     // 19^-147
+    11278023975525727060,     // 19^-140
+    9388762436329270793,      // 19^-133
+    15631968911773566269,     // 19^-126
+    13013347271048440836,     // 19^-119
+    10833389456740556437,     // 19^-112
+    18037223579289291900,     // 19^-105
+    15015680722474235794,     // 19^-98
+    12500297873901968386,     // 19^-91
+    10406284591707172986,     // 19^-84
+    17326108560931302042,     // 19^-77
+    14423689608892845377,     // 19^-70
+    12007475377523598784,     // 19^-63
+    9996018276276719532,      // 19^-56
+    16643029152771930644,     // 19^-49
+    13855037662215477149,     // 19^-42
+    11534082339177879647,     // 19^-35
+    9601926652984804576,      // 19^-28
+    15986880054797934009,     // 19^-21
+    13308804739049304804,     // 19^-14
+    11079352755197736707,     // 19^-7
+    9223372036854775808,      // 19^0
+    15356599543294590976,     // 19^7
+    12784106972526145936,     // 19^14
+    10642550821503597582,     // 19^21
+    17719483767102098773,     // 19^28
+    14751167752856224795,     // 19^35
+    12280095342105548712,     // 19^42
+    10222969742988875833,     // 19^49
+    17020895596425699999,     // 19^56
+    14169605026128220038,     // 19^63
+    11795954299763191941,     // 19^70
+    9819930589845265884,      // 19^77
+    16349849166729084322,     // 19^84
+    13610970328610229813,     // 19^91
+    11330900450341615431,     // 19^98
+    9432781198977253334,      // 19^105
+    15705258648723927251,     // 19^112
+    13074359725955544955,     // 19^119
+    10884181283927938347,     // 19^126
+    18121790237456409263,     // 19^133
+    15086081021789818522,     // 19^140
+    12558904921302722743,     // 19^147
+    10455073958207408827,     // 19^154
+    17407341190420966318,     // 19^161
+    14491314386248513408,     // 19^168
+    12063771850272711708,     // 19^175
+    10042884128822494706,     // 19^182
+    16721059197198717605,     // 19^189
+    13919996342176535757,     // 19^196
+    11588159331358018389,     // 19^203
+    9646944825844903597,      // 19^210
+    16061833775630288054,     // 19^217
+    13371202432132867541,     // 19^224
+    11131297769520092558,     // 19^231
+    9266615374542536521,      // 19^238
+];
+const BASE19_LARGE_EXPONENT: [i32; 74] = [
+    -1223,                    // 19^-273
+    -1193,                    // 19^-266
+    -1164,                    // 19^-259
+    -1134,                    // 19^-252
+    -1104,                    // 19^-245
+    -1075,                    // 19^-238
+    -1045,                    // 19^-231
+    -1015,                    // 19^-224
+    -985,                     // 19^-217
+    -956,                     // 19^-210
+    -926,                     // 19^-203
+    -896,                     // 19^-196
+    -866,                     // 19^-189
+    -837,                     // 19^-182
+    -807,                     // 19^-175
+    -777,                     // 19^-168
+    -747,                     // 19^-161
+    -718,                     // 19^-154
+    -688,                     // 19^-147
+    -658,                     // 19^-140
+    -628,                     // 19^-133
+    -599,                     // 19^-126
+    -569,                     // 19^-119
+    -539,                     // 19^-112
+    -510,                     // 19^-105
+    -480,                     // 19^-98
+    -450,                     // 19^-91
+    -420,                     // 19^-84
+    -391,                     // 19^-77
+    -361,                     // 19^-70
+    -331,                     // 19^-63
+    -301,                     // 19^-56
+    -272,                     // 19^-49
+    -242,                     // 19^-42
+    -212,                     // 19^-35
+    -182,                     // 19^-28
+    -153,                     // 19^-21
+    -123,                     // 19^-14
+    -93,                      // 19^-7
+    -63,                      // 19^0
+    -34,                      // 19^7
+    -4,                       // 19^14
+    26,                       // 19^21
+    55,                       // 19^28
+    85,                       // 19^35
+    115,                      // 19^42
+    145,                      // 19^49
+    174,                      // 19^56
+    204,                      // 19^63
+    234,                      // 19^70
+    264,                      // 19^77
+    293,                      // 19^84
+    323,                      // 19^91
+    353,                      // 19^98
+    383,                      // 19^105
+    412,                      // 19^112
+    442,                      // 19^119
+    472,                      // 19^126
+    501,                      // 19^133
+    531,                      // 19^140
+    561,                      // 19^147
+    591,                      // 19^154
+    620,                      // 19^161
+    650,                      // 19^168
+    680,                      // 19^175
+    710,                      // 19^182
+    739,                      // 19^189
+    769,                      // 19^196
+    799,                      // 19^203
+    829,                      // 19^210
+    858,                      // 19^217
+    888,                      // 19^224
+    918,                      // 19^231
+    948,                      // 19^238
+];
+const BASE19_SMALL_INT_POWERS: [u64; 7] = [1, 19, 361, 6859, 130321, 2476099, 47045881];
+const BASE19_STEP: i32 = 7;
+const BASE19_BIAS: i32 = 273;
+
+// BASE20
+
+const BASE20_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 20^0
+    11529215046068469760,     // 20^1
+    14411518807585587200,     // 20^2
+    18014398509481984000,     // 20^3
+    11258999068426240000,     // 20^4
+    14073748835532800000,     // 20^5
+    17592186044416000000,     // 20^6
+];
+const BASE20_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 20^0
+    -59,                      // 20^1
+    -55,                      // 20^2
+    -51,                      // 20^3
+    -46,                      // 20^4
+    -42,                      // 20^5
+    -38,                      // 20^6
+];
+const BASE20_LARGE_MANTISSA: [u64; 72] = [
+    11896135267822264502,     // 20^-266
+    14181298336770849826,     // 20^-259
+    16905424996341287883,     // 20^-252
+    10076418516839318205,     // 20^-245
+    12012026926087520367,     // 20^-238
+    14319451959237480602,     // 20^-231
+    17070116948172426941,     // 20^-224
+    10174582569701926077,     // 20^-217
+    12129047596099288555,     // 20^-210
+    14458951468586073584,     // 20^-203
+    17236413322193710308,     // 20^-196
+    10273702932711667006,     // 20^-189
+    12247208276643356092,     // 20^-182
+    14599809976391024699,     // 20^-175
+    17404329748619824289,     // 20^-168
+    10373788922202482396,     // 20^-161
+    12366520073655226703,     // 20^-154
+    14742040721959145907,     // 20^-147
+    17573882009934360870,     // 20^-140
+    10474849945267653984,     // 20^-133
+    12486994201263968925,     // 20^-126
+    14885657073574029118,     // 20^-119
+    17745086042373215101,     // 20^-112
+    10576895500643977583,     // 20^-105
+    12608641982846233347,     // 20^-98
+    15030672529752532658,     // 20^-91
+    17917957937422433684,     // 20^-84
+    10679935179604550411,     // 20^-77
+    12731474852090538039,     // 20^-70
+    15177100720513508366,     // 20^-63
+    18092513943330655534,     // 20^-56
+    10783978666860255917,     // 20^-49
+    12855504354071922204,     // 20^-42
+    15324955408658888583,     // 20^-35
+    18268770466636286477,     // 20^-28
+    10889035741470030830,     // 20^-21
+    12980742146337069071,     // 20^-14
+    15474250491067253436,     // 20^-7
+    9223372036854775808,      // 20^0
+    10995116277760000000,     // 20^7
+    13107200000000000000,     // 20^14
+    15625000000000000000,     // 20^21
+    9313225746154785156,      // 20^28
+    11102230246251565404,     // 20^35
+    13234889800848442797,     // 20^42
+    15777218104420236108,     // 20^49
+    9403954806578300063,      // 20^56
+    11210387714598536567,     // 20^63
+    13363823550460978230,     // 20^70
+    15930919111324522770,     // 20^77
+    9495567745759798747,      // 20^84
+    11319598848533390459,     // 20^91
+    13494013367335069727,     // 20^98
+    16086117467087590369,     // 20^105
+    9588073174409622174,      // 20^112
+    11429873912822749822,     // 20^119
+    13625471488026082303,     // 20^126
+    16242827758820155028,     // 20^133
+    9681479787123295682,      // 20^140
+    11541223272232169725,     // 20^147
+    13758210268297397763,     // 20^154
+    16401064715739962772,     // 20^161
+    9775796363198734982,      // 20^168
+    11653657392500323036,     // 20^175
+    13892242184281734271,     // 20^182
+    16560843210556190337,     // 20^189
+    9871031767461413346,      // 20^196
+    11767186841322676356,     // 20^203
+    14027579833653779454,     // 20^210
+    16722178260867332761,     // 20^217
+    9967194951097567535,      // 20^224
+    11881822289344748896,     // 20^231
+];
+const BASE20_LARGE_EXPONENT: [i32; 72] = [
+    -1213,                    // 20^-266
+    -1183,                    // 20^-259
+    -1153,                    // 20^-252
+    -1122,                    // 20^-245
+    -1092,                    // 20^-238
+    -1062,                    // 20^-231
+    -1032,                    // 20^-224
+    -1001,                    // 20^-217
+    -971,                     // 20^-210
+    -941,                     // 20^-203
+    -911,                     // 20^-196
+    -880,                     // 20^-189
+    -850,                     // 20^-182
+    -820,                     // 20^-175
+    -790,                     // 20^-168
+    -759,                     // 20^-161
+    -729,                     // 20^-154
+    -699,                     // 20^-147
+    -669,                     // 20^-140
+    -638,                     // 20^-133
+    -608,                     // 20^-126
+    -578,                     // 20^-119
+    -548,                     // 20^-112
+    -517,                     // 20^-105
+    -487,                     // 20^-98
+    -457,                     // 20^-91
+    -427,                     // 20^-84
+    -396,                     // 20^-77
+    -366,                     // 20^-70
+    -336,                     // 20^-63
+    -306,                     // 20^-56
+    -275,                     // 20^-49
+    -245,                     // 20^-42
+    -215,                     // 20^-35
+    -185,                     // 20^-28
+    -154,                     // 20^-21
+    -124,                     // 20^-14
+    -94,                      // 20^-7
+    -63,                      // 20^0
+    -33,                      // 20^7
+    -3,                       // 20^14
+    27,                       // 20^21
+    58,                       // 20^28
+    88,                       // 20^35
+    118,                      // 20^42
+    148,                      // 20^49
+    179,                      // 20^56
+    209,                      // 20^63
+    239,                      // 20^70
+    269,                      // 20^77
+    300,                      // 20^84
+    330,                      // 20^91
+    360,                      // 20^98
+    390,                      // 20^105
+    421,                      // 20^112
+    451,                      // 20^119
+    481,                      // 20^126
+    511,                      // 20^133
+    542,                      // 20^140
+    572,                      // 20^147
+    602,                      // 20^154
+    632,                      // 20^161
+    663,                      // 20^168
+    693,                      // 20^175
+    723,                      // 20^182
+    753,                      // 20^189
+    784,                      // 20^196
+    814,                      // 20^203
+    844,                      // 20^210
+    874,                      // 20^217
+    905,                      // 20^224
+    935,                      // 20^231
+];
+const BASE20_SMALL_INT_POWERS: [u64; 7] = [1, 20, 400, 8000, 160000, 3200000, 64000000];
+const BASE20_STEP: i32 = 7;
+const BASE20_BIAS: i32 = 266;
+
+// BASE21
+
+const BASE21_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 21^0
+    12105675798371893248,     // 21^1
+    15888699485363109888,     // 21^2
+    10426959037269540864,     // 21^3
+    13685383736416272384,     // 21^4
+    17962066154046357504,     // 21^5
+    11787605913592922112,     // 21^6
+];
+const BASE21_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 21^0
+    -59,                      // 21^1
+    -55,                      // 21^2
+    -50,                      // 21^3
+    -46,                      // 21^4
+    -42,                      // 21^5
+    -37,                      // 21^6
+];
+const BASE21_LARGE_MANTISSA: [u64; 72] = [
+    14408615719666154271,     // 21^-266
+    12084465783258517647,     // 21^-259
+    10135207719324857823,     // 21^-252
+    17000740844691866712,     // 21^-245
+    14258473889848767691,     // 21^-238
+    11958542249702993646,     // 21^-231
+    10029596003240171126,     // 21^-224
+    16823588341749525709,     // 21^-217
+    14109896580142091329,     // 21^-210
+    11833930874797054029,     // 21^-203
+    9925084790952075138,      // 21^-196
+    16648281817731599335,     // 21^-189
+    13962867487806377083,     // 21^-182
+    11710617985478380225,     // 21^-175
+    9821662614901370847,      // 21^-168
+    16474802037018309233,     // 21^-161
+    13817370479981011975,     // 21^-154
+    11588590051161810088,     // 21^-147
+    9719318127024052612,      // 21^-140
+    16303129964430447286,     // 21^-133
+    13673389591914329770,     // 21^-126
+    11467833682254685835,     // 21^-119
+    9618040097506134632,      // 21^-112
+    16133246763140728476,     // 21^-105
+    13530909025211868449,     // 21^-98
+    11348335628687672485,     // 21^-91
+    9517817413551452467,      // 21^-84
+    15965133792606908039,     // 21^-77
+    13389913146102881332,     // 21^-70
+    11230082778460885572,     // 21^-63
+    9418639078162304415,      // 21^-56
+    15798772606526436117,     // 21^-49
+    13250386483724911652,     // 21^-42
+    11113062156205168633,     // 21^-35
+    9320494208932798947,      // 21^-28
+    15634144950812425486,     // 21^-21
+    13112313728426242332,     // 21^-14
+    10997260921758362571,     // 21^-7
+    9223372036854775808,      // 21^0
+    15471232761590710272,     // 21^7
+    12975679730086034724,     // 21^14
+    10882666368756410705,     // 21^21
+    18254523810272339491,     // 21^28
+    15310018163217775871,     // 21^35
+    12840469496451971963,     // 21^42
+    10769265923239144897,     // 21^49
+    18064306536063374465,     // 21^56
+    15150483466319342608,     // 21^63
+    12706668191495224563,     // 21^70
+    10657047142270599779,     // 21^77
+    17876071379371335714,     // 21^84
+    14992611165849387896,     // 21^91
+    12574261133782557711,     // 21^98
+    10545997712573703694,     // 21^105
+    17689797685974006860,     // 21^112
+    14836383939169393936,     // 21^119
+    12443233794865401683,     // 21^126
+    10436105449179196548,     // 21^133
+    17505465016871978304,     // 21^140
+    14681784644147610193,     // 21^147
+    12313571797685708585,     // 21^154
+    10327358294088626305,     // 21^161
+    17323053146045965028,     // 21^168
+    14528796317278122096,     // 21^175
+    12185260914998420522,     // 21^182
+    10219744314951277448,     // 21^189
+    17142542058237493769,     // 21^196
+    14377402171819519570,     // 21^203
+    12058287067810376090,     // 21^210
+    10113251703754886210,     // 21^217
+    16963911946752716066,     // 21^224
+    14227585595952961160,     // 21^231
+];
+const BASE21_LARGE_EXPONENT: [i32; 72] = [
+    -1232,                    // 21^-266
+    -1201,                    // 21^-259
+    -1170,                    // 21^-252
+    -1140,                    // 21^-245
+    -1109,                    // 21^-238
+    -1078,                    // 21^-231
+    -1047,                    // 21^-224
+    -1017,                    // 21^-217
+    -986,                     // 21^-210
+    -955,                     // 21^-203
+    -924,                     // 21^-196
+    -894,                     // 21^-189
+    -863,                     // 21^-182
+    -832,                     // 21^-175
+    -801,                     // 21^-168
+    -771,                     // 21^-161
+    -740,                     // 21^-154
+    -709,                     // 21^-147
+    -678,                     // 21^-140
+    -648,                     // 21^-133
+    -617,                     // 21^-126
+    -586,                     // 21^-119
+    -555,                     // 21^-112
+    -525,                     // 21^-105
+    -494,                     // 21^-98
+    -463,                     // 21^-91
+    -432,                     // 21^-84
+    -402,                     // 21^-77
+    -371,                     // 21^-70
+    -340,                     // 21^-63
+    -309,                     // 21^-56
+    -279,                     // 21^-49
+    -248,                     // 21^-42
+    -217,                     // 21^-35
+    -186,                     // 21^-28
+    -156,                     // 21^-21
+    -125,                     // 21^-14
+    -94,                      // 21^-7
+    -63,                      // 21^0
+    -33,                      // 21^7
+    -2,                       // 21^14
+    29,                       // 21^21
+    59,                       // 21^28
+    90,                       // 21^35
+    121,                      // 21^42
+    152,                      // 21^49
+    182,                      // 21^56
+    213,                      // 21^63
+    244,                      // 21^70
+    275,                      // 21^77
+    305,                      // 21^84
+    336,                      // 21^91
+    367,                      // 21^98
+    398,                      // 21^105
+    428,                      // 21^112
+    459,                      // 21^119
+    490,                      // 21^126
+    521,                      // 21^133
+    551,                      // 21^140
+    582,                      // 21^147
+    613,                      // 21^154
+    644,                      // 21^161
+    674,                      // 21^168
+    705,                      // 21^175
+    736,                      // 21^182
+    767,                      // 21^189
+    797,                      // 21^196
+    828,                      // 21^203
+    859,                      // 21^210
+    890,                      // 21^217
+    920,                      // 21^224
+    951,                      // 21^231
+];
+const BASE21_SMALL_INT_POWERS: [u64; 7] = [1, 21, 441, 9261, 194481, 4084101, 85766121];
+const BASE21_STEP: i32 = 7;
+const BASE21_BIAS: i32 = 266;
+
+// BASE22
+
+const BASE22_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 22^0
+    12682136550675316736,     // 22^1
+    17437937757178560512,     // 22^2
+    11988582208060260352,     // 22^3
+    16484300536082857984,     // 22^4
+    11332956618556964864,     // 22^5
+    15582815350515826688,     // 22^6
+];
+const BASE22_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 22^0
+    -59,                      // 22^1
+    -55,                      // 22^2
+    -50,                      // 22^3
+    -46,                      // 22^4
+    -41,                      // 22^5
+    -37,                      // 22^6
+];
+const BASE22_LARGE_MANTISSA: [u64; 70] = [
+    9269587019009961312,      // 22^-259
+    10766865452458105492,     // 22^-252
+    12505993140104023937,     // 22^-245
+    14526035001637582317,     // 22^-238
+    16872365953260472216,     // 22^-231
+    9798845067792082715,      // 22^-224
+    11381612386618310709,     // 22^-217
+    13220037629231758864,     // 22^-210
+    15355416173176400877,     // 22^-203
+    17835713669231780592,     // 22^-196
+    10358321731667433590,     // 22^-189
+    12031459025026523680,     // 22^-182
+    13974851334106036811,     // 22^-175
+    16232151844936756579,     // 22^-168
+    9427032431967498649,      // 22^-161
+    10949742378252536811,     // 22^-154
+    12718409426865212084,     // 22^-147
+    14772762021382712235,     // 22^-140
+    17158945778190527545,     // 22^-133
+    9965280013064351107,      // 22^-126
+    11574930887071326019,     // 22^-119
+    13444582075449265201,     // 22^-112
+    15616230364311619568,     // 22^-105
+    18138656108661462534,     // 22^-98
+    10534259477248206780,     // 22^-91
+    12235815274209166465,     // 22^-84
+    14212216411407346527,     // 22^-77
+    16507857531195957209,     // 22^-70
+    9587152080358667750,      // 22^-63
+    11135725497779554116,     // 22^-56
+    12934433638113158426,     // 22^-49
+    15023679738882972932,     // 22^-42
+    17450393207123747022,     // 22^-35
+    10134541882409419905,     // 22^-28
+    11771532933066741091,     // 22^-21
+    13672940444874950532,     // 22^-14
+    15881474526053323426,     // 22^-7
+    9223372036854775808,      // 22^0
+    10713185553479630848,     // 22^7
+    12443642546855641088,     // 22^14
+    14453613172379218947,     // 22^21
+    16788246122479815273,     // 22^28
+    9749991386498543747,      // 22^35
+    11324867570234788254,     // 22^42
+    13154127055020322136,     // 22^49
+    15278859333807672616,     // 22^56
+    17746790917089950882,     // 22^63
+    10306678691583236909,     // 22^70
+    11971474296148943805,     // 22^77
+    13905177517602390611,     // 22^84
+    16151223902158337584,     // 22^91
+    9380032480974399852,      // 22^98
+    10895150717634104284,     // 22^105
+    12654999798852712250,     // 22^112
+    14699110095811391320,     // 22^119
+    17073397158676562691,     // 22^126
+    9915596544207462992,      // 22^133
+    11517222250937216925,     // 22^140
+    13377551999629643946,     // 22^147
+    15538373194824147716,     // 22^154
+    18048222989401488392,     // 22^161
+    10481739271897017716,     // 22^168
+    12174811695150892652,     // 22^175
+    14141359174025375600,     // 22^182
+    16425555014410689631,     // 22^189
+    9539353827706830891,      // 22^196
+    11080206589104387250,     // 22^203
+    12869946987462278079,     // 22^210
+    14948776823616759120,     // 22^217
+    17363391530672110525,     // 22^224
+];
+const BASE22_LARGE_EXPONENT: [i32; 70] = [
+    -1218,                    // 22^-259
+    -1187,                    // 22^-252
+    -1156,                    // 22^-245
+    -1125,                    // 22^-238
+    -1094,                    // 22^-231
+    -1062,                    // 22^-224
+    -1031,                    // 22^-217
+    -1000,                    // 22^-210
+    -969,                     // 22^-203
+    -938,                     // 22^-196
+    -906,                     // 22^-189
+    -875,                     // 22^-182
+    -844,                     // 22^-175
+    -813,                     // 22^-168
+    -781,                     // 22^-161
+    -750,                     // 22^-154
+    -719,                     // 22^-147
+    -688,                     // 22^-140
+    -657,                     // 22^-133
+    -625,                     // 22^-126
+    -594,                     // 22^-119
+    -563,                     // 22^-112
+    -532,                     // 22^-105
+    -501,                     // 22^-98
+    -469,                     // 22^-91
+    -438,                     // 22^-84
+    -407,                     // 22^-77
+    -376,                     // 22^-70
+    -344,                     // 22^-63
+    -313,                     // 22^-56
+    -282,                     // 22^-49
+    -251,                     // 22^-42
+    -220,                     // 22^-35
+    -188,                     // 22^-28
+    -157,                     // 22^-21
+    -126,                     // 22^-14
+    -95,                      // 22^-7
+    -63,                      // 22^0
+    -32,                      // 22^7
+    -1,                       // 22^14
+    30,                       // 22^21
+    61,                       // 22^28
+    93,                       // 22^35
+    124,                      // 22^42
+    155,                      // 22^49
+    186,                      // 22^56
+    217,                      // 22^63
+    249,                      // 22^70
+    280,                      // 22^77
+    311,                      // 22^84
+    342,                      // 22^91
+    374,                      // 22^98
+    405,                      // 22^105
+    436,                      // 22^112
+    467,                      // 22^119
+    498,                      // 22^126
+    530,                      // 22^133
+    561,                      // 22^140
+    592,                      // 22^147
+    623,                      // 22^154
+    654,                      // 22^161
+    686,                      // 22^168
+    717,                      // 22^175
+    748,                      // 22^182
+    779,                      // 22^189
+    811,                      // 22^196
+    842,                      // 22^203
+    873,                      // 22^210
+    904,                      // 22^217
+    935,                      // 22^224
+];
+const BASE22_SMALL_INT_POWERS: [u64; 7] = [1, 22, 484, 10648, 234256, 5153632, 113379904];
+const BASE22_STEP: i32 = 7;
+const BASE22_BIAS: i32 = 259;
+
+// BASE23
+
+const BASE23_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 23^0
+    13258597302978740224,     // 23^1
+    9529616811515969536,      // 23^2
+    13698824166554206208,     // 23^3
+    9846029869710835712,      // 23^4
+    14153667937709326336,     // 23^5
+    10172948830228578304,     // 23^6
+];
+const BASE23_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 23^0
+    -59,                      // 23^1
+    -54,                      // 23^2
+    -50,                      // 23^3
+    -45,                      // 23^4
+    -41,                      // 23^5
+    -36,                      // 23^6
+];
+const BASE23_LARGE_MANTISSA: [u64; 69] = [
+    9630971713765025029,      // 23^-252
+    15269861356524917016,     // 23^-245
+    12105147475110827234,     // 23^-238
+    9596327823341159083,      // 23^-231
+    15214933627595239789,     // 23^-224
+    12061603644316153100,     // 23^-217
+    9561808551614073801,      // 23^-210
+    15160203481036150549,     // 23^-203
+    12018216446491393101,     // 23^-196
+    9527413450313687580,      // 23^-189
+    15105670206117496642,     // 23^-182
+    11974985318206853149,     // 23^-175
+    9493142072782406120,      // 23^-168
+    15051333094665716613,     // 23^-161
+    11931909698059570948,     // 23^-154
+    9458993973969322090,      // 23^-147
+    14997191441054643808,     // 23^-140
+    11888989026666025574,     // 23^-133
+    9424968710424435661,      // 23^-126
+    14943244542196343052,     // 23^-119
+    11846222746654873270,     // 23^-112
+    9391065840292895827,      // 23^-105
+    14889491697531980297,     // 23^-98
+    11803610302659709381,     // 23^-91
+    9357284923309262442,      // 23^-84
+    14835932209022725101,     // 23^-77
+    11761151141311856318,     // 23^-70
+    9323625520791788901,      // 23^-63
+    14782565381140685845,     // 23^-56
+    11718844711233177467,     // 23^-49
+    9290087195636725377,      // 23^-42
+    14729390520859877547,     // 23^-35
+    11676690463028916948,     // 23^-28
+    9256669512312642559,      // 23^-21
+    14676406937647222172,     // 23^-14
+    11634687849280565129,     // 23^-7
+    9223372036854775808,      // 23^0
+    14623613943453581312,     // 23^7
+    11592836324538749809,     // 23^14
+    18380388673718779295,     // 23^21
+    14571010852704821123,     // 23^28
+    11551135345316152959,     // 23^35
+    18314271962956325083,     // 23^42
+    14518596982292909406,     // 23^49
+    11509584370080452960,     // 23^56
+    18248393082825183718,     // 23^63
+    14466371651567044709,     // 23^70
+    11468182859247292218,     // 23^77
+    18182751177816837937,     // 23^84
+    14414334182324817337,     // 23^91
+    11426930275173270071,     // 23^98
+    18117345395500148774,     // 23^105
+    14362483898803402166,     // 23^112
+    11385826082148960918,     // 23^119
+    18052174886510285819,     // 23^126
+    14310820127670783127,     // 23^133
+    11344869746391957446,     // 23^140
+    17987238804537697299,     // 23^147
+    14259342198017009262,     // 23^154
+    11304060736039938888,     // 23^161
+    17922536306317119829,     // 23^168
+    14208049441345482237,     // 23^175
+    11263398521143764220,     // 23^182
+    17858066551616627705,     // 23^189
+    14156941191564275184,     // 23^196
+    11222882573660590193,     // 23^203
+    17793828703226721580,     // 23^210
+    14106016784977482782,     // 23^217
+    11182512367447014130,     // 23^224
+];
+const BASE23_LARGE_EXPONENT: [i32; 69] = [
+    -1203,                    // 23^-252
+    -1172,                    // 23^-245
+    -1140,                    // 23^-238
+    -1108,                    // 23^-231
+    -1077,                    // 23^-224
+    -1045,                    // 23^-217
+    -1013,                    // 23^-210
+    -982,                     // 23^-203
+    -950,                     // 23^-196
+    -918,                     // 23^-189
+    -887,                     // 23^-182
+    -855,                     // 23^-175
+    -823,                     // 23^-168
+    -792,                     // 23^-161
+    -760,                     // 23^-154
+    -728,                     // 23^-147
+    -697,                     // 23^-140
+    -665,                     // 23^-133
+    -633,                     // 23^-126
+    -602,                     // 23^-119
+    -570,                     // 23^-112
+    -538,                     // 23^-105
+    -507,                     // 23^-98
+    -475,                     // 23^-91
+    -443,                     // 23^-84
+    -412,                     // 23^-77
+    -380,                     // 23^-70
+    -348,                     // 23^-63
+    -317,                     // 23^-56
+    -285,                     // 23^-49
+    -253,                     // 23^-42
+    -222,                     // 23^-35
+    -190,                     // 23^-28
+    -158,                     // 23^-21
+    -127,                     // 23^-14
+    -95,                      // 23^-7
+    -63,                      // 23^0
+    -32,                      // 23^7
+    0,                        // 23^14
+    31,                       // 23^21
+    63,                       // 23^28
+    95,                       // 23^35
+    126,                      // 23^42
+    158,                      // 23^49
+    190,                      // 23^56
+    221,                      // 23^63
+    253,                      // 23^70
+    285,                      // 23^77
+    316,                      // 23^84
+    348,                      // 23^91
+    380,                      // 23^98
+    411,                      // 23^105
+    443,                      // 23^112
+    475,                      // 23^119
+    506,                      // 23^126
+    538,                      // 23^133
+    570,                      // 23^140
+    601,                      // 23^147
+    633,                      // 23^154
+    665,                      // 23^161
+    696,                      // 23^168
+    728,                      // 23^175
+    760,                      // 23^182
+    791,                      // 23^189
+    823,                      // 23^196
+    855,                      // 23^203
+    886,                      // 23^210
+    918,                      // 23^217
+    950,                      // 23^224
+];
+const BASE23_SMALL_INT_POWERS: [u64; 7] = [1, 23, 529, 12167, 279841, 6436343, 148035889];
+const BASE23_STEP: i32 = 7;
+const BASE23_BIAS: i32 = 252;
+
+// BASE24
+
+const BASE24_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 24^0
+    13835058055282163712,     // 24^1
+    10376293541461622784,     // 24^2
+    15564440312192434176,     // 24^3
+    11673330234144325632,     // 24^4
+    17509995351216488448,     // 24^5
+    13132496513412366336,     // 24^6
+];
+const BASE24_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 24^0
+    -59,                      // 24^1
+    -54,                      // 24^2
+    -50,                      // 24^3
+    -45,                      // 24^4
+    -41,                      // 24^5
+    -36,                      // 24^6
+];
+const BASE24_LARGE_MANTISSA: [u64; 68] = [
+    13878157218102970303,     // 24^-252
+    14820082927730076197,     // 24^-245
+    15825938165500818674,     // 24^-238
+    16900061898413227754,     // 24^-231
+    18047087583901234911,     // 24^-224
+    9635981578611328308,      // 24^-217
+    10289986187706530766,     // 24^-210
+    10988378804938565813,     // 24^-203
+    11734172092969064177,     // 24^-196
+    12530583187169601247,     // 24^-189
+    13381047573408163051,     // 24^-182
+    14289233907736158492,     // 24^-175
+    15259059841903798156,     // 24^-168
+    16294708922970511019,     // 24^-161
+    17400648639910404101,     // 24^-154
+    9290824847530286564,      // 24^-147
+    9921403291771844100,      // 24^-140
+    10594779784719249534,     // 24^-133
+    11313859076748534537,     // 24^-126
+    12081743066820822770,     // 24^-119
+    12901744183172431346,     // 24^-112
+    13777399672167044607,     // 24^-105
+    14712486856947913357,     // 24^-98
+    15711039431711468023,     // 24^-91
+    16777364861891103792,     // 24^-84
+    17916062965310470700,     // 24^-77
+    9566022877229980327,      // 24^-70
+    10215279312745101062,     // 24^-63
+    10908601492662859386,     // 24^-56
+    11648980207252770253,     // 24^-49
+    12439609234991117453,     // 24^-42
+    13283899119592565366,     // 24^-35
+    14185491882103974832,     // 24^-28
+    15148276731524117655,     // 24^-21
+    16176406841720334625,     // 24^-14
+    17274317267012876867,     // 24^-7
+    9223372036854775808,      // 24^0
+    9849372385059274752,      // 24^7
+    10517860061584293888,     // 24^14
+    11231718727873462272,     // 24^21
+    11994027762626592768,     // 24^28
+    12808075545343924992,     // 24^35
+    13677373641439044901,     // 24^42
+    14605671950110933202,     // 24^49
+    15596974880318657672,     // 24^56
+    16655558624637160317,     // 24^63
+    17785989605508530085,     // 24^70
+    9496572086730262523,      // 24^77
+    10141114821132365302,     // 24^84
+    10829403375886954548,     // 24^91
+    11564406827668344530,     // 24^98
+    12349295767632162835,     // 24^105
+    13187455978423603575,     // 24^112
+    14082503039459189950,     // 24^119
+    15038297923484984581,     // 24^126
+    16058963651690264296,     // 24^133
+    17148903079221976570,     // 24^140
+    18312817887821515019,     // 24^147
+    9777864433756263024,      // 24^154
+    10441498787414525016,     // 24^161
+    11150174730505647564,     // 24^168
+    11906949284968677354,     // 24^175
+    12715086956165281921,     // 24^182
+    13578073815006577911,     // 24^189
+    14499632535849309517,     // 24^196
+    15483738455030488239,     // 24^203
+    16534636719312342666,     // 24^210
+    17656860598210983110,     // 24^217
+];
+const BASE24_LARGE_EXPONENT: [i32; 68] = [
+    -1219,                    // 24^-252
+    -1187,                    // 24^-245
+    -1155,                    // 24^-238
+    -1123,                    // 24^-231
+    -1091,                    // 24^-224
+    -1058,                    // 24^-217
+    -1026,                    // 24^-210
+    -994,                     // 24^-203
+    -962,                     // 24^-196
+    -930,                     // 24^-189
+    -898,                     // 24^-182
+    -866,                     // 24^-175
+    -834,                     // 24^-168
+    -802,                     // 24^-161
+    -770,                     // 24^-154
+    -737,                     // 24^-147
+    -705,                     // 24^-140
+    -673,                     // 24^-133
+    -641,                     // 24^-126
+    -609,                     // 24^-119
+    -577,                     // 24^-112
+    -545,                     // 24^-105
+    -513,                     // 24^-98
+    -481,                     // 24^-91
+    -449,                     // 24^-84
+    -417,                     // 24^-77
+    -384,                     // 24^-70
+    -352,                     // 24^-63
+    -320,                     // 24^-56
+    -288,                     // 24^-49
+    -256,                     // 24^-42
+    -224,                     // 24^-35
+    -192,                     // 24^-28
+    -160,                     // 24^-21
+    -128,                     // 24^-14
+    -96,                      // 24^-7
+    -63,                      // 24^0
+    -31,                      // 24^7
+    1,                        // 24^14
+    33,                       // 24^21
+    65,                       // 24^28
+    97,                       // 24^35
+    129,                      // 24^42
+    161,                      // 24^49
+    193,                      // 24^56
+    225,                      // 24^63
+    257,                      // 24^70
+    290,                      // 24^77
+    322,                      // 24^84
+    354,                      // 24^91
+    386,                      // 24^98
+    418,                      // 24^105
+    450,                      // 24^112
+    482,                      // 24^119
+    514,                      // 24^126
+    546,                      // 24^133
+    578,                      // 24^140
+    610,                      // 24^147
+    643,                      // 24^154
+    675,                      // 24^161
+    707,                      // 24^168
+    739,                      // 24^175
+    771,                      // 24^182
+    803,                      // 24^189
+    835,                      // 24^196
+    867,                      // 24^203
+    899,                      // 24^210
+    931,                      // 24^217
+];
+const BASE24_SMALL_INT_POWERS: [u64; 7] = [1, 24, 576, 13824, 331776, 7962624, 191102976];
+const BASE24_STEP: i32 = 7;
+const BASE24_BIAS: i32 = 252;
+
+// BASE25
+
+const BASE25_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 25^0
+    14411518807585587200,     // 25^1
+    11258999068426240000,     // 25^2
+    17592186044416000000,     // 25^3
+    13743895347200000000,     // 25^4
+    10737418240000000000,     // 25^5
+    16777216000000000000,     // 25^6
+];
+const BASE25_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 25^0
+    -59,                      // 25^1
+    -54,                      // 25^2
+    -50,                      // 25^3
+    -45,                      // 25^4
+    -40,                      // 25^5
+    -36,                      // 25^6
+];
+const BASE25_LARGE_MANTISSA: [u64; 68] = [
+    15492890949478498119,     // 25^-252
+    11008361120075348168,     // 25^-245
+    15643822052986917253,     // 25^-238
+    11115604119273511155,     // 25^-231
+    15796223521069679172,     // 25^-224
+    11223891875338892399,     // 25^-217
+    15950109677957715915,     // 25^-210
+    11333234566249726012,     // 25^-203
+    16105494987428025427,     // 25^-196
+    11443642469137689536,     // 25^-189
+    16262394054163123565,     // 25^-182
+    11555125961253852697,     // 25^-175
+    16420821625123739831,     // 25^-168
+    11667695520944036383,     // 25^-161
+    16580792590934885855,     // 25^-154
+    11781361728633673532,     // 25^-147
+    16742321987285426889,     // 25^-140
+    11896135267822264502,     // 25^-133
+    16905424996341287883,     // 25^-126
+    12012026926087520367,     // 25^-119
+    17070116948172426941,     // 25^-112
+    12129047596099288555,     // 25^-105
+    17236413322193710308,     // 25^-98
+    12247208276643356092,     // 25^-91
+    17404329748619824289,     // 25^-84
+    12366520073655226703,     // 25^-77
+    17573882009934360870,     // 25^-70
+    12486994201263968925,     // 25^-63
+    17745086042373215101,     // 25^-56
+    12608641982846233347,     // 25^-49
+    17917957937422433684,     // 25^-42
+    12731474852090538039,     // 25^-35
+    18092513943330655534,     // 25^-28
+    12855504354071922204,     // 25^-21
+    18268770466636286477,     // 25^-14
+    12980742146337069071,     // 25^-7
+    9223372036854775808,      // 25^0
+    13107200000000000000,     // 25^7
+    9313225746154785156,      // 25^14
+    13234889800848442797,     // 25^21
+    9403954806578300063,      // 25^28
+    13363823550460978230,     // 25^35
+    9495567745759798747,      // 25^42
+    13494013367335069727,     // 25^49
+    9588073174409622174,      // 25^56
+    13625471488026082303,     // 25^63
+    9681479787123295682,      // 25^70
+    13758210268297397763,     // 25^77
+    9775796363198734982,      // 25^84
+    13892242184281734271,     // 25^91
+    9871031767461413346,      // 25^98
+    14027579833653779454,     // 25^105
+    9967194951097567535,      // 25^112
+    14164235936814247246,     // 25^119
+    10064294952495520794,     // 25^126
+    14302223338085469768,     // 25^133
+    10162340898095201970,     // 25^140
+    14441555006918636608,     // 25^147
+    10261342003245940623,     // 25^154
+    14582244039112794984,     // 25^161
+    10361307573072618726,     // 25^168
+    14724303658045725350,     // 25^175
+    10462247003350260393,     // 25^182
+    14867747215916808149,     // 25^189
+    10564169781387141817,     // 25^196
+    15012588195001998509,     // 25^203
+    10667085486916504429,     // 25^210
+    15158840208921026870,     // 25^217
+];
+const BASE25_LARGE_EXPONENT: [i32; 68] = [
+    -1234,                    // 25^-252
+    -1201,                    // 25^-245
+    -1169,                    // 25^-238
+    -1136,                    // 25^-231
+    -1104,                    // 25^-224
+    -1071,                    // 25^-217
+    -1039,                    // 25^-210
+    -1006,                    // 25^-203
+    -974,                     // 25^-196
+    -941,                     // 25^-189
+    -909,                     // 25^-182
+    -876,                     // 25^-175
+    -844,                     // 25^-168
+    -811,                     // 25^-161
+    -779,                     // 25^-154
+    -746,                     // 25^-147
+    -714,                     // 25^-140
+    -681,                     // 25^-133
+    -649,                     // 25^-126
+    -616,                     // 25^-119
+    -584,                     // 25^-112
+    -551,                     // 25^-105
+    -519,                     // 25^-98
+    -486,                     // 25^-91
+    -454,                     // 25^-84
+    -421,                     // 25^-77
+    -389,                     // 25^-70
+    -356,                     // 25^-63
+    -324,                     // 25^-56
+    -291,                     // 25^-49
+    -259,                     // 25^-42
+    -226,                     // 25^-35
+    -194,                     // 25^-28
+    -161,                     // 25^-21
+    -129,                     // 25^-14
+    -96,                      // 25^-7
+    -63,                      // 25^0
+    -31,                      // 25^7
+    2,                        // 25^14
+    34,                       // 25^21
+    67,                       // 25^28
+    99,                       // 25^35
+    132,                      // 25^42
+    164,                      // 25^49
+    197,                      // 25^56
+    229,                      // 25^63
+    262,                      // 25^70
+    294,                      // 25^77
+    327,                      // 25^84
+    359,                      // 25^91
+    392,                      // 25^98
+    424,                      // 25^105
+    457,                      // 25^112
+    489,                      // 25^119
+    522,                      // 25^126
+    554,                      // 25^133
+    587,                      // 25^140
+    619,                      // 25^147
+    652,                      // 25^154
+    684,                      // 25^161
+    717,                      // 25^168
+    749,                      // 25^175
+    782,                      // 25^182
+    814,                      // 25^189
+    847,                      // 25^196
+    879,                      // 25^203
+    912,                      // 25^210
+    944,                      // 25^217
+];
+const BASE25_SMALL_INT_POWERS: [u64; 7] = [1, 25, 625, 15625, 390625, 9765625, 244140625];
+const BASE25_STEP: i32 = 7;
+const BASE25_BIAS: i32 = 252;
+
+// BASE26
+
+const BASE26_SMALL_MANTISSA: [u64; 7] = [
+    9223372036854775808,      // 26^0
+    14987979559889010688,     // 26^1
+    12177733392409821184,     // 26^2
+    9894408381332979712,      // 26^3
+    16078413619666092032,     // 26^4
+    13063711065978699776,     // 26^5
+    10614265241107693568,     // 26^6
+];
+const BASE26_SMALL_EXPONENT: [i32; 7] = [
+    -63,                      // 26^0
+    -59,                      // 26^1
+    -54,                      // 26^2
+    -49,                      // 26^3
+    -45,                      // 26^4
+    -40,                      // 26^5
+    -35,                      // 26^6
+];
+const BASE26_LARGE_MANTISSA: [u64; 67] = [
+    12105269954044049440,     // 26^-245
+    11318739317371282802,     // 26^-238
+    10583312905946974966,     // 26^-231
+    9895670261906581517,      // 26^-224
+    9252706671590202790,      // 26^-217
+    17303038295456506514,     // 26^-210
+    16178786644847745028,     // 26^-203
+    15127582383507515360,     // 26^-196
+    14144679313308326113,     // 26^-189
+    13225639616708097270,     // 26^-182
+    12366313819957994305,     // 26^-175
+    11562822058185475244,     // 26^-168
+    10811536557764206566,     // 26^-161
+    10109065256878566708,     // 26^-154
+    9452236490329416245,      // 26^-147
+    17676169338865748372,     // 26^-140
+    16527673784713390059,     // 26^-133
+    15453800848879553322,     // 26^-126
+    14449701983936623969,     // 26^-119
+    13510843673109724761,     // 26^-112
+    12632986961401522264,     // 26^-105
+    11812168316666510159,     // 26^-98
+    11044681734222321153,     // 26^-91
+    10327062004200202236,     // 26^-84
+    9656069066086567364,      // 26^-77
+    18057346759632441273,     // 26^-70
+    16884084494735168740,     // 26^-63
+    15787054046203585657,     // 26^-56
+    14761302310200400353,     // 26^-49
+    13802198007013635263,     // 26^-42
+    12905410770780760221,     // 26^-35
+    12066891597841972649,     // 26^-28
+    11282854565446737172,     // 26^-21
+    10549759738273355365,     // 26^-14
+    9864297185584324446,      // 26^-7
+    9223372036854775808,      // 26^0
+    17248181016800002048,     // 26^7
+    16127493675824287744,     // 26^14
+    15079622135830712445,     // 26^21
+    14099835245963182583,     // 26^28
+    13183709258266090507,     // 26^35
+    12327107854416477244,     // 26^42
+    11526163470203963629,     // 26^49
+    10777259833438283283,     // 26^56
+    10077015636442889080,     // 26^63
+    9422269269415772631,      // 26^70
+    17620129091456925542,     // 26^77
+    16475274709425560342,     // 26^84
+    15404806363345084091,     // 26^91
+    14403890877545881062,     // 26^98
+    13468009108242878856,     // 26^105
+    12592935539554553092,     // 26^112
+    11774719205254957782,     // 26^119
+    11009665850120294209,     // 26^126
+    10294321250328313309,     // 26^133
+    9625455617601982106,      // 26^140
+    18000098033363922638,     // 26^147
+    16830555460575262708,     // 26^154
+    15737003020008648959,     // 26^161
+    14714503311068774005,     // 26^168
+    13758439736979533044,     // 26^175
+    12864495660801764695,     // 26^182
+    12028634915772762381,     // 26^189
+    11247083581971537298,     // 26^196
+    10516312947031287874,     // 26^203
+    9833023573966516058,      // 26^210
+    18388260808361729691,     // 26^217
+];
+const BASE26_LARGE_EXPONENT: [i32; 67] = [
+    -1215,                    // 26^-245
+    -1182,                    // 26^-238
+    -1149,                    // 26^-231
+    -1116,                    // 26^-224
+    -1083,                    // 26^-217
+    -1051,                    // 26^-210
+    -1018,                    // 26^-203
+    -985,                     // 26^-196
+    -952,                     // 26^-189
+    -919,                     // 26^-182
+    -886,                     // 26^-175
+    -853,                     // 26^-168
+    -820,                     // 26^-161
+    -787,                     // 26^-154
+    -754,                     // 26^-147
+    -722,                     // 26^-140
+    -689,                     // 26^-133
+    -656,                     // 26^-126
+    -623,                     // 26^-119
+    -590,                     // 26^-112
+    -557,                     // 26^-105
+    -524,                     // 26^-98
+    -491,                     // 26^-91
+    -458,                     // 26^-84
+    -425,                     // 26^-77
+    -393,                     // 26^-70
+    -360,                     // 26^-63
+    -327,                     // 26^-56
+    -294,                     // 26^-49
+    -261,                     // 26^-42
+    -228,                     // 26^-35
+    -195,                     // 26^-28
+    -162,                     // 26^-21
+    -129,                     // 26^-14
+    -96,                      // 26^-7
+    -63,                      // 26^0
+    -31,                      // 26^7
+    2,                        // 26^14
+    35,                       // 26^21
+    68,                       // 26^28
+    101,                      // 26^35
+    134,                      // 26^42
+    167,                      // 26^49
+    200,                      // 26^56
+    233,                      // 26^63
+    266,                      // 26^70
+    298,                      // 26^77
+    331,                      // 26^84
+    364,                      // 26^91
+    397,                      // 26^98
+    430,                      // 26^105
+    463,                      // 26^112
+    496,                      // 26^119
+    529,                      // 26^126
+    562,                      // 26^133
+    595,                      // 26^140
+    627,                      // 26^147
+    660,                      // 26^154
+    693,                      // 26^161
+    726,                      // 26^168
+    759,                      // 26^175
+    792,                      // 26^182
+    825,                      // 26^189
+    858,                      // 26^196
+    891,                      // 26^203
+    924,                      // 26^210
+    956,                      // 26^217
+];
+const BASE26_SMALL_INT_POWERS: [u64; 7] = [1, 26, 676, 17576, 456976, 11881376, 308915776];
+const BASE26_STEP: i32 = 7;
+const BASE26_BIAS: i32 = 245;
+
+// BASE27
+
+const BASE27_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 27^0
+    15564440312192434176,     // 27^1
+    13132496513412366336,     // 27^2
+    11080543933191684096,     // 27^3
+    9349208943630483456,      // 27^4
+    15776790092376440832,     // 27^5
+];
+const BASE27_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 27^0
+    -59,                      // 27^1
+    -54,                      // 27^2
+    -49,                      // 27^3
+    -44,                      // 27^4
+    -40,                      // 27^5
+];
+const BASE27_LARGE_MANTISSA: [u64; 76] = [
+    16362187946641408838,     // 27^-240
+    11807394875954316034,     // 27^-234
+    17041067394086403622,     // 27^-228
+    12297292543386873229,     // 27^-222
+    17748114058878258402,     // 27^-216
+    12807516432401518638,     // 27^-210
+    9242248309993244326,      // 27^-204
+    13338909893173747895,     // 27^-198
+    9625716122873707062,      // 27^-192
+    13892351267110242231,     // 27^-186
+    10025094302862174179,     // 27^-180
+    14468755338661289290,     // 27^-174
+    10441042983020688038,     // 27^-168
+    15069074847369989965,     // 27^-162
+    10874249685827050127,     // 27^-156
+    15694302062657520659,     // 27^-150
+    11325430459582219446,     // 27^-144
+    16345470423947416967,     // 27^-138
+    11795331061968106016,     // 27^-132
+    17023656248839843776,     // 27^-126
+    12284728192712064755,     // 27^-120
+    17729980512159296735,     // 27^-114
+    12794430777395563548,     // 27^-108
+    9232805349408163458,      // 27^-102
+    13325281304529035642,     // 27^-96
+    9615881366772943927,      // 27^-90
+    13878157218102970303,     // 27^-84
+    10014851495355986817,     // 27^-78
+    14453972367916992462,     // 27^-72
+    10430375193750279268,     // 27^-66
+    15053678520084183432,     // 27^-60
+    10863139281980340679,     // 27^-54
+    15678266930207358578,     // 27^-48
+    11313859076748534537,     // 27^-42
+    16328769981827608423,     // 27^-36
+    11783279573783601017,     // 27^-30
+    17006262892853298360,     // 27^-24
+    12272176679245716810,     // 27^-18
+    17711865492790087155,     // 27^-12
+    12781358492223474271,     // 27^-6
+    9223372036854775808,      // 27^0
+    13311666640442621952,     // 27^6
+    9606056659007943744,      // 27^12
+    13863977671394362375,     // 27^18
+    10004619153098548172,     // 27^24
+    14439204501182606065,     // 27^30
+    10419718303939637392,     // 27^36
+    15038297923484984581,     // 27^42
+    10852040229820157048,     // 27^48
+    15662248181121787524,     // 27^54
+    11302299516591361707,     // 27^60
+    16312086602830473207,     // 27^66
+    11771240398807322073,     // 27^72
+    16988887307951181138,     // 27^78
+    12259637989871837542,     // 27^84
+    17693768981840924725,     // 27^90
+    12768299563225066619,     // 27^96
+    18427896724951050158,     // 27^102
+    13298065886687551351,     // 27^108
+    9596241989312152815,      // 27^114
+    13849812612167175924,     // 27^120
+    9994397265397337538,      // 27^126
+    14424451723026109070,     // 27^132
+    10409072302452601000,     // 27^138
+    15022933041500086259,     // 27^144
+    10840952517748290136,     // 27^150
+    15646245798661648271,     // 27^156
+    11290751767031273467,     // 27^162
+    16295420269522331823,     // 27^168
+    11759213524458657188,     // 27^174
+    16971529475976476179,     // 27^180
+    12247112111487835932,     // 27^186
+    17675690960401445308,     // 27^192
+    12755253976754113245,     // 27^198
+    18409068632845853217,     // 27^204
+    13284479029051404288,     // 27^210
+];
+const BASE27_LARGE_EXPONENT: [i32; 76] = [
+    -1205,                    // 27^-240
+    -1176,                    // 27^-234
+    -1148,                    // 27^-228
+    -1119,                    // 27^-222
+    -1091,                    // 27^-216
+    -1062,                    // 27^-210
+    -1033,                    // 27^-204
+    -1005,                    // 27^-198
+    -976,                     // 27^-192
+    -948,                     // 27^-186
+    -919,                     // 27^-180
+    -891,                     // 27^-174
+    -862,                     // 27^-168
+    -834,                     // 27^-162
+    -805,                     // 27^-156
+    -777,                     // 27^-150
+    -748,                     // 27^-144
+    -720,                     // 27^-138
+    -691,                     // 27^-132
+    -663,                     // 27^-126
+    -634,                     // 27^-120
+    -606,                     // 27^-114
+    -577,                     // 27^-108
+    -548,                     // 27^-102
+    -520,                     // 27^-96
+    -491,                     // 27^-90
+    -463,                     // 27^-84
+    -434,                     // 27^-78
+    -406,                     // 27^-72
+    -377,                     // 27^-66
+    -349,                     // 27^-60
+    -320,                     // 27^-54
+    -292,                     // 27^-48
+    -263,                     // 27^-42
+    -235,                     // 27^-36
+    -206,                     // 27^-30
+    -178,                     // 27^-24
+    -149,                     // 27^-18
+    -121,                     // 27^-12
+    -92,                      // 27^-6
+    -63,                      // 27^0
+    -35,                      // 27^6
+    -6,                       // 27^12
+    22,                       // 27^18
+    51,                       // 27^24
+    79,                       // 27^30
+    108,                      // 27^36
+    136,                      // 27^42
+    165,                      // 27^48
+    193,                      // 27^54
+    222,                      // 27^60
+    250,                      // 27^66
+    279,                      // 27^72
+    307,                      // 27^78
+    336,                      // 27^84
+    364,                      // 27^90
+    393,                      // 27^96
+    421,                      // 27^102
+    450,                      // 27^108
+    479,                      // 27^114
+    507,                      // 27^120
+    536,                      // 27^126
+    564,                      // 27^132
+    593,                      // 27^138
+    621,                      // 27^144
+    650,                      // 27^150
+    678,                      // 27^156
+    707,                      // 27^162
+    735,                      // 27^168
+    764,                      // 27^174
+    792,                      // 27^180
+    821,                      // 27^186
+    849,                      // 27^192
+    878,                      // 27^198
+    906,                      // 27^204
+    935,                      // 27^210
+];
+const BASE27_SMALL_INT_POWERS: [u64; 6] = [1, 27, 729, 19683, 531441, 14348907];
+const BASE27_STEP: i32 = 6;
+const BASE27_BIAS: i32 = 240;
+
+// BASE28
+
+const BASE28_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 28^0
+    16140901064495857664,     // 28^1
+    14123288431433875456,     // 28^2
+    12357877377504641024,     // 28^3
+    10813142705316560896,     // 28^4
+    9461499867151990784,      // 28^5
+];
+const BASE28_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 28^0
+    -59,                      // 28^1
+    -54,                      // 28^2
+    -49,                      // 28^3
+    -44,                      // 28^4
+    -39,                      // 28^5
+];
+const BASE28_LARGE_MANTISSA: [u64; 76] = [
+    10853684694473876180,     // 28^-240
+    9742165760957008810,      // 28^-234
+    17488953546307848045,     // 28^-228
+    15697920957714630238,     // 28^-222
+    14090306875260685218,     // 28^-216
+    12647327526607851831,     // 28^-210
+    11352122773573968201,     // 28^-204
+    10189559113984709052,     // 28^-198
+    18292105715960495534,     // 28^-192
+    16418822825447359765,     // 28^-186
+    14737381642082644874,     // 28^-180
+    13228135778880165762,     // 28^-174
+    11873450822826176619,     // 28^-168
+    10657498289906897377,     // 28^-162
+    9566070681070377880,      // 28^-156
+    17172830956378919788,     // 28^-150
+    15414172280784786485,     // 28^-144
+    13835616719528574716,     // 28^-138
+    12418720027433908743,     // 28^-132
+    11146926822720122755,     // 28^-126
+    10005377149705503250,     // 28^-120
+    17961465702601665525,     // 28^-114
+    16122043445170466212,     // 28^-108
+    14470995249030000148,     // 28^-102
+    12989029846596759700,     // 28^-96
+    11658831576707932907,     // 28^-90
+    10464858064026730335,     // 28^-84
+    9393158617970892313,      // 28^-78
+    16862422458582420498,     // 28^-72
+    15135552519453149331,     // 28^-66
+    13585530230416439557,     // 28^-60
+    12194244736314878063,     // 28^-54
+    10945439903127358164,     // 28^-48
+    9824524377159351811,      // 28^-42
+    17636802191900948811,     // 28^-36
+    15830628517722738088,     // 28^-30
+    14209423938610553080,     // 28^-24
+    12754245887402290033,     // 28^-18
+    11448091693168579255,     // 28^-12
+    10275699917675706335,     // 28^-6
+    9223372036854775808,      // 28^0
+    16557624767515983872,     // 28^6
+    14861968965709594624,     // 28^12
+    13339964194082398208,     // 28^18
+    11973826961285400900,     // 28^24
+    10747594971986893695,     // 28^30
+    9646940619348801089,      // 28^36
+    17318007155239366140,     // 28^42
+    15544481077627229210,     // 28^48
+    13952580675520064463,     // 28^54
+    12523705779222565186,     // 28^60
+    11241161050565762112,     // 28^66
+    10089960910324183248,     // 28^72
+    18113308885783841476,     // 28^78
+    16258336464718499495,     // 28^84
+    14593330587292989709,     // 28^90
+    13098836900821174211,     // 28^96
+    11757393360479052160,     // 28^102
+    10553326198326110898,     // 28^108
+    9472566787009190529,      // 28^114
+    17004974516675479989,     // 28^120
+    15263505912112072336,     // 28^126
+    13700379997665963732,     // 28^132
+    12297332812083457696,     // 28^138
+    11037970794744924274,     // 28^144
+    9907579239127697723,      // 28^150
+    17785900724855568076,     // 28^156
+    15964457964924108341,     // 28^162
+    14329547997401095751,     // 28^168
+    12862068117875988113,     // 28^174
+    11544871917724549298,     // 28^180
+    10362568941103939059,     // 28^186
+    9301344858947275744,      // 28^192
+    16697600117649658875,     // 28^198
+    14987609529429357277,     // 28^204
+    13452737987730670580,     // 28^210
+];
+const BASE28_LARGE_EXPONENT: [i32; 76] = [
+    -1217,                    // 28^-240
+    -1188,                    // 28^-234
+    -1160,                    // 28^-228
+    -1131,                    // 28^-222
+    -1102,                    // 28^-216
+    -1073,                    // 28^-210
+    -1044,                    // 28^-204
+    -1015,                    // 28^-198
+    -987,                     // 28^-192
+    -958,                     // 28^-186
+    -929,                     // 28^-180
+    -900,                     // 28^-174
+    -871,                     // 28^-168
+    -842,                     // 28^-162
+    -813,                     // 28^-156
+    -785,                     // 28^-150
+    -756,                     // 28^-144
+    -727,                     // 28^-138
+    -698,                     // 28^-132
+    -669,                     // 28^-126
+    -640,                     // 28^-120
+    -612,                     // 28^-114
+    -583,                     // 28^-108
+    -554,                     // 28^-102
+    -525,                     // 28^-96
+    -496,                     // 28^-90
+    -467,                     // 28^-84
+    -438,                     // 28^-78
+    -410,                     // 28^-72
+    -381,                     // 28^-66
+    -352,                     // 28^-60
+    -323,                     // 28^-54
+    -294,                     // 28^-48
+    -265,                     // 28^-42
+    -237,                     // 28^-36
+    -208,                     // 28^-30
+    -179,                     // 28^-24
+    -150,                     // 28^-18
+    -121,                     // 28^-12
+    -92,                      // 28^-6
+    -63,                      // 28^0
+    -35,                      // 28^6
+    -6,                       // 28^12
+    23,                       // 28^18
+    52,                       // 28^24
+    81,                       // 28^30
+    110,                      // 28^36
+    138,                      // 28^42
+    167,                      // 28^48
+    196,                      // 28^54
+    225,                      // 28^60
+    254,                      // 28^66
+    283,                      // 28^72
+    311,                      // 28^78
+    340,                      // 28^84
+    369,                      // 28^90
+    398,                      // 28^96
+    427,                      // 28^102
+    456,                      // 28^108
+    485,                      // 28^114
+    513,                      // 28^120
+    542,                      // 28^126
+    571,                      // 28^132
+    600,                      // 28^138
+    629,                      // 28^144
+    658,                      // 28^150
+    686,                      // 28^156
+    715,                      // 28^162
+    744,                      // 28^168
+    773,                      // 28^174
+    802,                      // 28^180
+    831,                      // 28^186
+    860,                      // 28^192
+    888,                      // 28^198
+    917,                      // 28^204
+    946,                      // 28^210
+];
+const BASE28_SMALL_INT_POWERS: [u64; 6] = [1, 28, 784, 21952, 614656, 17210368];
+const BASE28_STEP: i32 = 6;
+const BASE28_BIAS: i32 = 240;
+
+// BASE29
+
+const BASE29_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 29^0
+    16717361816799281152,     // 29^1
+    15150109146474348544,     // 29^2
+    13729786413992378368,     // 29^3
+    12442618937680592896,     // 29^4
+    11276123412273037312,     // 29^5
+];
+const BASE29_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 29^0
+    -59,                      // 29^1
+    -54,                      // 29^2
+    -49,                      // 29^3
+    -44,                      // 29^4
+    -39,                      // 29^5
+];
+const BASE29_LARGE_MANTISSA: [u64; 76] = [
+    9780142334064946636,      // 29^-240
+    10835857583212112985,     // 29^-234
+    12005531775819627369,     // 29^-228
+    13301466184228767173,     // 29^-222
+    14737289938837575007,     // 29^-216
+    16328103363438049788,     // 29^-210
+    18090636782853846909,     // 29^-204
+    10021713236516230810,     // 29^-198
+    11103504802015131117,     // 29^-192
+    12302070113036945059,     // 29^-186
+    13630014285094069421,     // 29^-180
+    15101303090037955289,     // 29^-174
+    16731409831799452344,     // 29^-168
+    9268739038298839376,      // 29^-162
+    10269250974512215384,     // 29^-156
+    11377762945074294339,     // 29^-150
+    12605932989231929836,     // 29^-144
+    13966677570638048918,     // 29^-138
+    15474307417689145256,     // 29^-132
+    17144678027117236568,     // 29^-126
+    9497678206828984163,      // 29^-120
+    10522902929736936910,     // 29^-114
+    11658795303156142066,     // 29^-108
+    12917301321555931503,     // 29^-102
+    14311656487072982013,     // 29^-96
+    15856525005124406387,     // 29^-90
+    17568154005459773215,     // 29^-84
+    9732272205284828726,      // 29^-78
+    10782820124222926001,     // 29^-72
+    11946769200332301461,     // 29^-66
+    13236360495839591806,     // 29^-60
+    14665156431661011058,     // 29^-54
+    16248183421166822582,     // 29^-48
+    18002089900515211938,     // 29^-42
+    9972660708767378680,      // 29^-36
+    11049157310268331325,     // 29^-30
+    12241856093602695018,     // 29^-24
+    13563300476969856592,     // 29^-18
+    15027387875005778139,     // 29^-12
+    16649515855621676607,     // 29^-6
+    9223372036854775808,      // 29^0
+    10218986842372440064,     // 29^6
+    11322073062575009312,     // 29^12
+    12544231674979455490,     // 29^18
+    13898315921993315819,     // 29^24
+    15398566486364679514,     // 29^30
+    17060761258115507449,     // 29^36
+    9451190634016324153,      // 29^42
+    10471397266405980105,     // 29^48
+    11601729872662437745,     // 29^54
+    12854075976092328003,     // 29^60
+    14241606296013212103,     // 29^66
+    15778913262056350490,     // 29^72
+    17482164480364512070,     // 29^78
+    9684636382831873707,      // 29^84
+    10730042263704319491,     // 29^90
+    11888294245613666403,     // 29^96
+    13171573475377840424,     // 29^102
+    14593375990949121808,     // 29^108
+    16168654657039833397,     // 29^114
+    17913976421956996862,     // 29^120
+    9923848274745194421,      // 29^126
+    10995075829111145761,     // 29^132
+    12181936799210906401,     // 29^138
+    13496913207916061440,     // 29^144
+    14953834447230017102,     // 29^150
+    16568022719743769659,     // 29^156
+    18356454179736676324,     // 29^162
+    10168968734308426004,     // 29^168
+    11266655761164621625,     // 29^174
+    12482832365519782645,     // 29^180
+    13830288877980342143,     // 29^186
+    15323196278493163895,     // 29^192
+    16977255230225892037,     // 29^198
+    9404930600437880197,      // 29^204
+    10420143703980341466,     // 29^210
+];
+const BASE29_LARGE_EXPONENT: [i32; 76] = [
+    -1229,                    // 29^-240
+    -1200,                    // 29^-234
+    -1171,                    // 29^-228
+    -1142,                    // 29^-222
+    -1113,                    // 29^-216
+    -1084,                    // 29^-210
+    -1055,                    // 29^-204
+    -1025,                    // 29^-198
+    -996,                     // 29^-192
+    -967,                     // 29^-186
+    -938,                     // 29^-180
+    -909,                     // 29^-174
+    -880,                     // 29^-168
+    -850,                     // 29^-162
+    -821,                     // 29^-156
+    -792,                     // 29^-150
+    -763,                     // 29^-144
+    -734,                     // 29^-138
+    -705,                     // 29^-132
+    -676,                     // 29^-126
+    -646,                     // 29^-120
+    -617,                     // 29^-114
+    -588,                     // 29^-108
+    -559,                     // 29^-102
+    -530,                     // 29^-96
+    -501,                     // 29^-90
+    -472,                     // 29^-84
+    -442,                     // 29^-78
+    -413,                     // 29^-72
+    -384,                     // 29^-66
+    -355,                     // 29^-60
+    -326,                     // 29^-54
+    -297,                     // 29^-48
+    -268,                     // 29^-42
+    -238,                     // 29^-36
+    -209,                     // 29^-30
+    -180,                     // 29^-24
+    -151,                     // 29^-18
+    -122,                     // 29^-12
+    -93,                      // 29^-6
+    -63,                      // 29^0
+    -34,                      // 29^6
+    -5,                       // 29^12
+    24,                       // 29^18
+    53,                       // 29^24
+    82,                       // 29^30
+    111,                      // 29^36
+    141,                      // 29^42
+    170,                      // 29^48
+    199,                      // 29^54
+    228,                      // 29^60
+    257,                      // 29^66
+    286,                      // 29^72
+    315,                      // 29^78
+    345,                      // 29^84
+    374,                      // 29^90
+    403,                      // 29^96
+    432,                      // 29^102
+    461,                      // 29^108
+    490,                      // 29^114
+    519,                      // 29^120
+    549,                      // 29^126
+    578,                      // 29^132
+    607,                      // 29^138
+    636,                      // 29^144
+    665,                      // 29^150
+    694,                      // 29^156
+    723,                      // 29^162
+    753,                      // 29^168
+    782,                      // 29^174
+    811,                      // 29^180
+    840,                      // 29^186
+    869,                      // 29^192
+    898,                      // 29^198
+    928,                      // 29^204
+    957,                      // 29^210
+];
+const BASE29_SMALL_INT_POWERS: [u64; 6] = [1, 29, 841, 24389, 707281, 20511149];
+const BASE29_STEP: i32 = 6;
+const BASE29_BIAS: i32 = 240;
+
+// BASE30
+
+const BASE30_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 30^0
+    17293822569102704640,     // 30^1
+    16212958658533785600,     // 30^2
+    15199648742375424000,     // 30^3
+    14249670695976960000,     // 30^4
+    13359066277478400000,     // 30^5
+];
+const BASE30_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 30^0
+    -59,                      // 30^1
+    -54,                      // 30^2
+    -49,                      // 30^3
+    -44,                      // 30^4
+    -39,                      // 30^5
+];
+const BASE30_LARGE_MANTISSA: [u64; 74] = [
+    15921395853562858335,     // 30^-234
+    10809579470425214363,     // 30^-228
+    14677985448278451843,     // 30^-222
+    9965385675239368708,      // 30^-216
+    13531681443098000788,     // 30^-210
+    18374241463874359754,     // 30^-204
+    12474900136854879801,     // 30^-198
+    16939271613521887687,     // 30^-192
+    11500650091336533543,     // 30^-186
+    15616368347004676150,     // 30^-180
+    10602485877430447296,     // 30^-174
+    14396779620362065880,     // 30^-168
+    9774465433549085656,      // 30^-162
+    13272436896445757604,     // 30^-156
+    18022221508452589239,     // 30^-150
+    12235901765210495847,     // 30^-144
+    16614743297618723424,     // 30^-138
+    11280316732790367097,     // 30^-132
+    15317184660964044954,     // 30^-126
+    10399359853791807565,     // 30^-120
+    14120961229157126909,     // 30^-114
+    9587202906660312336,      // 30^-108
+    13018159044823362852,     // 30^-102
+    17676945670836105047,     // 30^-96
+    12001482205502242389,     // 30^-90
+    16296432405358431306,     // 30^-84
+    11064204595523231124,     // 30^-78
+    15023732837543702665,     // 30^-72
+    10200125387468709836,     // 30^-66
+    13850427060322257636,     // 30^-60
+    9403528018831206315,      // 30^-54
+    12768752734601403407,     // 30^-48
+    17338284744926585040,     // 30^-42
+    11771553735296689434,     // 30^-36
+    15984219821228248249,     // 30^-30
+    10852232807944894743,     // 30^-24
+    14735903063773789011,     // 30^-18
+    10004707922685045925,     // 30^-12
+    13585075876931470780,     // 30^-6
+    9223372036854775808,      // 30^0
+    12524124635136000000,     // 30^6
+    17006112000000000000,     // 30^12
+    11546030312776565551,     // 30^18
+    15677988711770840524,     // 30^24
+    10644322047830505987,     // 30^30
+    14453587630518598230,     // 30^36
+    9813034332029575584,      // 30^42
+    13324808381590173768,     // 30^48
+    18093335088676282534,     // 30^54
+    12284183203843431517,     // 30^60
+    16680303133282552614,     // 30^66
+    11324827544542942993,     // 30^72
+    15377624481863911156,     // 30^78
+    10440394512637323916,     // 30^84
+    14176680892170610158,     // 30^90
+    9625032889090827484,      // 30^96
+    13069527179276967861,     // 30^102
+    17746696832949127203,     // 30^108
+    12048838651943871501,     // 30^114
+    16360736223435182728,     // 30^120
+    11107862654034279481,     // 30^126
+    15083014731837417449,     // 30^132
+    10240373890390132852,     // 30^138
+    13905079227116716745,     // 30^144
+    9440633241616270046,      // 30^150
+    12819136740897336720,     // 30^156
+    17406699590597596894,     // 30^162
+    11818002910861417777,     // 30^168
+    16047291684929232224,     // 30^174
+    10895054450550498712,     // 30^180
+    14794049215412351417,     // 30^186
+    10044185331124443731,     // 30^192
+    13638680998961850032,     // 30^198
+    9259766385185707988,      // 30^204
+];
+const BASE30_LARGE_EXPONENT: [i32; 74] = [
+    -1212,                    // 30^-234
+    -1182,                    // 30^-228
+    -1153,                    // 30^-222
+    -1123,                    // 30^-216
+    -1094,                    // 30^-210
+    -1065,                    // 30^-204
+    -1035,                    // 30^-198
+    -1006,                    // 30^-192
+    -976,                     // 30^-186
+    -947,                     // 30^-180
+    -917,                     // 30^-174
+    -888,                     // 30^-168
+    -858,                     // 30^-162
+    -829,                     // 30^-156
+    -800,                     // 30^-150
+    -770,                     // 30^-144
+    -741,                     // 30^-138
+    -711,                     // 30^-132
+    -682,                     // 30^-126
+    -652,                     // 30^-120
+    -623,                     // 30^-114
+    -593,                     // 30^-108
+    -564,                     // 30^-102
+    -535,                     // 30^-96
+    -505,                     // 30^-90
+    -476,                     // 30^-84
+    -446,                     // 30^-78
+    -417,                     // 30^-72
+    -387,                     // 30^-66
+    -358,                     // 30^-60
+    -328,                     // 30^-54
+    -299,                     // 30^-48
+    -270,                     // 30^-42
+    -240,                     // 30^-36
+    -211,                     // 30^-30
+    -181,                     // 30^-24
+    -152,                     // 30^-18
+    -122,                     // 30^-12
+    -93,                      // 30^-6
+    -63,                      // 30^0
+    -34,                      // 30^6
+    -5,                       // 30^12
+    25,                       // 30^18
+    54,                       // 30^24
+    84,                       // 30^30
+    113,                      // 30^36
+    143,                      // 30^42
+    172,                      // 30^48
+    201,                      // 30^54
+    231,                      // 30^60
+    260,                      // 30^66
+    290,                      // 30^72
+    319,                      // 30^78
+    349,                      // 30^84
+    378,                      // 30^90
+    408,                      // 30^96
+    437,                      // 30^102
+    466,                      // 30^108
+    496,                      // 30^114
+    525,                      // 30^120
+    555,                      // 30^126
+    584,                      // 30^132
+    614,                      // 30^138
+    643,                      // 30^144
+    673,                      // 30^150
+    702,                      // 30^156
+    731,                      // 30^162
+    761,                      // 30^168
+    790,                      // 30^174
+    820,                      // 30^180
+    849,                      // 30^186
+    879,                      // 30^192
+    908,                      // 30^198
+    938,                      // 30^204
+];
+const BASE30_SMALL_INT_POWERS: [u64; 6] = [1, 30, 900, 27000, 810000, 24300000];
+const BASE30_STEP: i32 = 6;
+const BASE30_BIAS: i32 = 234;
+
+// BASE31
+
+const BASE31_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 31^0
+    17870283321406128128,     // 31^1
+    17311836967612186624,     // 31^2
+    16770842062374305792,     // 31^3
+    16246753247925108736,     // 31^4
+    15739042208927449088,     // 31^5
+];
+const BASE31_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 31^0
+    -59,                      // 31^1
+    -54,                      // 31^2
+    -49,                      // 31^3
+    -44,                      // 31^4
+    -39,                      // 31^5
+];
+const BASE31_LARGE_MANTISSA: [u64; 74] = [
+    15172192345302428421,     // 31^-234
+    12540609161645107233,     // 31^-228
+    10365468257053156090,     // 31^-222
+    17135201456813756829,     // 31^-216
+    14163138687236953263,     // 31^-210
+    11706573627364173290,     // 31^-204
+    9676094340331131706,      // 31^-198
+    15995594383677739926,     // 31^-192
+    13221193938792609146,     // 31^-186
+    10928007110853986174,     // 31^-180
+    18065136926019727780,     // 31^-174
+    14931778907414090897,     // 31^-168
+    12341894902482781431,     // 31^-162
+    10201220546354171409,     // 31^-156
+    16863682839241173595,     // 31^-150
+    13938714372965575021,     // 31^-144
+    11521075213714088050,     // 31^-138
+    9522770215989197442,      // 31^-132
+    15742133595063495983,     // 31^-126
+    13011695363011784957,     // 31^-120
+    10754845599386459585,     // 31^-114
+    17778882864941161542,     // 31^-108
+    14695174979700806287,     // 31^-102
+    12146329402386737855,     // 31^-96
+    10039575449430160254,     // 31^-90
+    16596466614020050649,     // 31^-84
+    13717846210614220387,     // 31^-78
+    11338516145303865769,     // 31^-72
+    9371875613960541536,      // 31^-66
+    15492689060539222513,     // 31^-60
+    12805516430937677459,     // 31^-54
+    10584427946771654325,     // 31^-48
+    17497164689077279120,     // 31^-42
+    14462320197950402007,     // 31^-36
+    11953862767183809017,     // 31^-30
+    9880491726141866768,      // 31^-24
+    16333484606893641287,     // 31^-18
+    13500477850600094178,     // 31^-12
+    11158849846261135900,     // 31^-6
+    9223372036854775808,      // 31^0
+    15247197139898466304,     // 31^6
+    12602604540616796176,     // 31^12
+    10416710674748495795,     // 31^18
+    17219910524322248562,     // 31^24
+    14233155154461633068,     // 31^30
+    11764445893307051548,     // 31^36
+    9723928789827359386,      // 31^42
+    16074669723871456105,     // 31^48
+    13286553836236866995,     // 31^54
+    10982030478739077827,     // 31^60
+    18154443194596327488,     // 31^66
+    15005595201356001156,     // 31^72
+    12402907923608447627,     // 31^78
+    10251650993997756459,     // 31^84
+    16947049635463054782,     // 31^90
+    14007621382887632827,     // 31^96
+    11578030455268066882,     // 31^102
+    9569846696947249770,      // 31^108
+    15819955934111728582,     // 31^114
+    13076019589586139267,     // 31^120
+    10808012931221917147,     // 31^126
+    17866774016535005152,     // 31^132
+    14767821605568725557,     // 31^138
+    12206375631777172937,     // 31^144
+    10089206793225315915,     // 31^150
+    16678512408132988469,     // 31^156
+    13785661343319529298,     // 31^162
+    11394568893327831301,     // 31^168
+    9418206136893990095,      // 31^174
+    15569278253075119325,     // 31^180
+    12868821397533098208,     // 31^186
+    10636752807015729117,     // 31^192
+    17583663147154342787,     // 31^198
+    14533815689909759814,     // 31^204
+];
+const BASE31_LARGE_EXPONENT: [i32; 74] = [
+    -1223,                    // 31^-234
+    -1193,                    // 31^-228
+    -1163,                    // 31^-222
+    -1134,                    // 31^-216
+    -1104,                    // 31^-210
+    -1074,                    // 31^-204
+    -1044,                    // 31^-198
+    -1015,                    // 31^-192
+    -985,                     // 31^-186
+    -955,                     // 31^-180
+    -926,                     // 31^-174
+    -896,                     // 31^-168
+    -866,                     // 31^-162
+    -836,                     // 31^-156
+    -807,                     // 31^-150
+    -777,                     // 31^-144
+    -747,                     // 31^-138
+    -717,                     // 31^-132
+    -688,                     // 31^-126
+    -658,                     // 31^-120
+    -628,                     // 31^-114
+    -599,                     // 31^-108
+    -569,                     // 31^-102
+    -539,                     // 31^-96
+    -509,                     // 31^-90
+    -480,                     // 31^-84
+    -450,                     // 31^-78
+    -420,                     // 31^-72
+    -390,                     // 31^-66
+    -361,                     // 31^-60
+    -331,                     // 31^-54
+    -301,                     // 31^-48
+    -272,                     // 31^-42
+    -242,                     // 31^-36
+    -212,                     // 31^-30
+    -182,                     // 31^-24
+    -153,                     // 31^-18
+    -123,                     // 31^-12
+    -93,                      // 31^-6
+    -63,                      // 31^0
+    -34,                      // 31^6
+    -4,                       // 31^12
+    26,                       // 31^18
+    55,                       // 31^24
+    85,                       // 31^30
+    115,                      // 31^36
+    145,                      // 31^42
+    174,                      // 31^48
+    204,                      // 31^54
+    234,                      // 31^60
+    263,                      // 31^66
+    293,                      // 31^72
+    323,                      // 31^78
+    353,                      // 31^84
+    382,                      // 31^90
+    412,                      // 31^96
+    442,                      // 31^102
+    472,                      // 31^108
+    501,                      // 31^114
+    531,                      // 31^120
+    561,                      // 31^126
+    590,                      // 31^132
+    620,                      // 31^138
+    650,                      // 31^144
+    680,                      // 31^150
+    709,                      // 31^156
+    739,                      // 31^162
+    769,                      // 31^168
+    799,                      // 31^174
+    828,                      // 31^180
+    858,                      // 31^186
+    888,                      // 31^192
+    917,                      // 31^198
+    947,                      // 31^204
+];
+const BASE31_SMALL_INT_POWERS: [u64; 6] = [1, 31, 961, 29791, 923521, 28629151];
+const BASE31_STEP: i32 = 6;
+const BASE31_BIAS: i32 = 234;
+
+// BASE33
+
+const BASE33_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 33^0
+    9511602413006487552,      // 33^1
+    9808839988412940288,      // 33^2
+    10115366238050844672,     // 33^3
+    10431471432989933568,     // 33^4
+    10757454915270868992,     // 33^5
+];
+const BASE33_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 33^0
+    -58,                      // 33^1
+    -53,                      // 33^2
+    -48,                      // 33^3
+    -43,                      // 33^4
+    -38,                      // 33^5
+];
+const BASE33_LARGE_MANTISSA: [u64; 72] = [
+    16952605037124200569,     // 33^-228
+    10195070131008495069,     // 33^-222
+    12262357879342609130,     // 33^-216
+    14748836332546310936,     // 33^-210
+    17739506162243888511,     // 33^-204
+    10668301952265249182,     // 33^-198
+    12831548466319904021,     // 33^-192
+    15433443558330863109,     // 33^-186
+    9281466718275888268,      // 33^-180
+    11163500111543439891,     // 33^-174
+    13427159577595330562,     // 33^-168
+    16149828684624228128,     // 33^-162
+    9712291160146516482,      // 33^-156
+    11681684235978010467,     // 33^-150
+    14050417593436164695,     // 33^-144
+    16899466768835551431,     // 33^-138
+    10163113486548439647,     // 33^-132
+    12223921281461810852,     // 33^-126
+    14702605819874780450,     // 33^-120
+    17683901337162836029,     // 33^-114
+    10634861953510936381,     // 33^-108
+    12791327729538214791,     // 33^-102
+    15385067131072375518,     // 33^-96
+    9252373781378705800,      // 33^-90
+    11128507904583594948,     // 33^-84
+    13385071886268464065,     // 33^-78
+    16099206734335173177,     // 33^-72
+    9681847795705762071,      // 33^-66
+    11645067770860388376,     // 33^-60
+    14006376287807173243,     // 33^-54
+    16846495063476347823,     // 33^-48
+    10131257010808365886,     // 33^-42
+    12185605163840289543,     // 33^-36
+    14656520217639143557,     // 33^-30
+    17628470806481188820,     // 33^-24
+    10601526773079323099,     // 33^-18
+    12751233065433685927,     // 33^-12
+    15336842340660548274,     // 33^-6
+    9223372036854775808,      // 33^0
+    11093625381373083648,     // 33^6
+    13343116119623879688,     // 33^12
+    16048743459528137878,     // 33^18
+    9651499856579507665,      // 33^24
+    11608566080760702539,     // 33^30
+    13962473030502269494,     // 33^36
+    16793689398951866695,     // 33^42
+    10099500389807484117,     // 33^48
+    12147409148830342864,     // 33^54
+    14610579071614836924,     // 33^60
+    17573214023869781748,     // 33^66
+    10568296082415350040,     // 33^72
+    12711264078829073096,     // 33^78
+    15288768711786753433,     // 33^84
+    18388922397719682024,     // 33^90
+    11058852198106072831,     // 33^96
+    13301291864141109889,     // 33^102
+    15998438362831755651,     // 33^108
+    9621247043655259795,      // 33^114
+    11572178805914439916,     // 33^120
+    13918707388806312258,     // 33^126
+    16741049254803901004,     // 33^132
+    10067843310549183526,     // 33^138
+    12109332859968012500,     // 33^144
+    14564781929001072895,     // 33^150
+    17518130444711929011,     // 33^156
+    10535169553993820096,     // 33^162
+    12671420375785822681,     // 33^168
+    15240845770632227134,     // 33^174
+    18331281964891256972,     // 33^180
+    11024188012054395372,     // 33^186
+    13259598707595875029,     // 33^192
+    15948290948433680084,     // 33^198
+];
+const BASE33_LARGE_EXPONENT: [i32; 72] = [
+    -1214,                    // 33^-228
+    -1183,                    // 33^-222
+    -1153,                    // 33^-216
+    -1123,                    // 33^-210
+    -1093,                    // 33^-204
+    -1062,                    // 33^-198
+    -1032,                    // 33^-192
+    -1002,                    // 33^-186
+    -971,                     // 33^-180
+    -941,                     // 33^-174
+    -911,                     // 33^-168
+    -881,                     // 33^-162
+    -850,                     // 33^-156
+    -820,                     // 33^-150
+    -790,                     // 33^-144
+    -760,                     // 33^-138
+    -729,                     // 33^-132
+    -699,                     // 33^-126
+    -669,                     // 33^-120
+    -639,                     // 33^-114
+    -608,                     // 33^-108
+    -578,                     // 33^-102
+    -548,                     // 33^-96
+    -517,                     // 33^-90
+    -487,                     // 33^-84
+    -457,                     // 33^-78
+    -427,                     // 33^-72
+    -396,                     // 33^-66
+    -366,                     // 33^-60
+    -336,                     // 33^-54
+    -306,                     // 33^-48
+    -275,                     // 33^-42
+    -245,                     // 33^-36
+    -215,                     // 33^-30
+    -185,                     // 33^-24
+    -154,                     // 33^-18
+    -124,                     // 33^-12
+    -94,                      // 33^-6
+    -63,                      // 33^0
+    -33,                      // 33^6
+    -3,                       // 33^12
+    27,                       // 33^18
+    58,                       // 33^24
+    88,                       // 33^30
+    118,                      // 33^36
+    148,                      // 33^42
+    179,                      // 33^48
+    209,                      // 33^54
+    239,                      // 33^60
+    269,                      // 33^66
+    300,                      // 33^72
+    330,                      // 33^78
+    360,                      // 33^84
+    390,                      // 33^90
+    421,                      // 33^96
+    451,                      // 33^102
+    481,                      // 33^108
+    512,                      // 33^114
+    542,                      // 33^120
+    572,                      // 33^126
+    602,                      // 33^132
+    633,                      // 33^138
+    663,                      // 33^144
+    693,                      // 33^150
+    723,                      // 33^156
+    754,                      // 33^162
+    784,                      // 33^168
+    814,                      // 33^174
+    844,                      // 33^180
+    875,                      // 33^186
+    905,                      // 33^192
+    935,                      // 33^198
+];
+const BASE33_SMALL_INT_POWERS: [u64; 6] = [1, 33, 1089, 35937, 1185921, 39135393];
+const BASE33_STEP: i32 = 6;
+const BASE33_BIAS: i32 = 228;
+
+// BASE34
+
+const BASE34_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 34^0
+    9799832789158199296,      // 34^1
+    10412322338480586752,     // 34^2
+    11063092484635623424,     // 34^3
+    11754535764925349888,     // 34^4
+    12489194250233184256,     // 34^5
+];
+const BASE34_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 34^0
+    -58,                      // 34^1
+    -53,                      // 34^2
+    -48,                      // 34^3
+    -43,                      // 34^4
+    -38,                      // 34^5
+];
+const BASE34_LARGE_MANTISSA: [u64; 72] = [
+    9604872659818954289,      // 34^-228
+    13818638119852157632,     // 34^-222
+    9940514895438007254,      // 34^-216
+    14301530372152488549,     // 34^-210
+    10287886147601198282,     // 34^-204
+    14801297292224652053,     // 34^-198
+    10647396286743453217,     // 34^-192
+    15318528565264575918,     // 34^-186
+    11019469506220361724,     // 34^-180
+    15853834483014935870,     // 34^-174
+    11404544822822581011,     // 34^-168
+    16407846663860846991,     // 34^-162
+    11803076594780713339,     // 34^-156
+    16981218798089296108,     // 34^-150
+    12215535057871861844,     // 34^-144
+    17574627419191661979,     // 34^-138
+    12642406880260427750,     // 34^-132
+    18188772702119398880,     // 34^-126
+    13084195736727816960,     // 34^-120
+    9412189644717380884,      // 34^-114
+    13541422902968601381,     // 34^-108
+    9741098573165682574,      // 34^-102
+    14014627870654357169,     // 34^-96
+    10081501222766715924,     // 34^-90
+    14504368983990906269,     // 34^-84
+    10433799241558921201,     // 34^-78
+    15011224098520048145,     // 34^-72
+    10798408313169791102,     // 34^-66
+    15535791262943115320,     // 34^-60
+    11175758647289472494,     // 34^-54
+    16078689424770850259,     // 34^-48
+    11566295487283966163,     // 34^-42
+    16640559160632214299,     // 34^-36
+    11970479635546867736,     // 34^-30
+    17222063432103834911,     // 34^-24
+    12388787997209523031,     // 34^-18
+    17823888367951909878,     // 34^-12
+    12821714142851132552,     // 34^-6
+    9223372036854775808,      // 34^0
+    13269768890872758272,     // 34^6
+    9545682734772404224,      // 34^12
+    13733480910222387686,     // 34^18
+    9879256578703990224,      // 34^24
+    14213397344182222761,     // 34^30
+    10224487159240697338,     // 34^36
+    14710084455954213119,     // 34^42
+    10581781820995279550,     // 34^48
+    15224128296805573036,     // 34^54
+    10951562143236309252,     // 34^60
+    15756135397562640779,     // 34^66
+    11334264437318166304,     // 34^72
+    16306733484268988021,     // 34^78
+    11730340261493716029,     // 34^84
+    16876572218852198941,     // 34^90
+    12140256953717114113,     // 34^96
+    17466323965673246884,     // 34^102
+    12564498183065403345,     // 34^108
+    18076684584862935827,     // 34^114
+    13003564520429535778,     // 34^120
+    9354187126690740272,      // 34^126
+    13457974029148190318,     // 34^132
+    9681069157385005207,      // 34^138
+    13928262876281286641,     // 34^144
+    10019374079298318020,     // 34^150
+    14414985965244449544,     // 34^156
+    10369501065317377529,     // 34^162
+    14918717590550882042,     // 34^168
+    10731863237423767546,     // 34^174
+    15440052115433190547,     // 34^180
+    11106888154145020298,     // 34^186
+    15979604673144701925,     // 34^192
+    11495018315039655259,     // 34^198
+];
+const BASE34_LARGE_EXPONENT: [i32; 72] = [
+    -1223,                    // 34^-228
+    -1193,                    // 34^-222
+    -1162,                    // 34^-216
+    -1132,                    // 34^-210
+    -1101,                    // 34^-204
+    -1071,                    // 34^-198
+    -1040,                    // 34^-192
+    -1010,                    // 34^-186
+    -979,                     // 34^-180
+    -949,                     // 34^-174
+    -918,                     // 34^-168
+    -888,                     // 34^-162
+    -857,                     // 34^-156
+    -827,                     // 34^-150
+    -796,                     // 34^-144
+    -766,                     // 34^-138
+    -735,                     // 34^-132
+    -705,                     // 34^-126
+    -674,                     // 34^-120
+    -643,                     // 34^-114
+    -613,                     // 34^-108
+    -582,                     // 34^-102
+    -552,                     // 34^-96
+    -521,                     // 34^-90
+    -491,                     // 34^-84
+    -460,                     // 34^-78
+    -430,                     // 34^-72
+    -399,                     // 34^-66
+    -369,                     // 34^-60
+    -338,                     // 34^-54
+    -308,                     // 34^-48
+    -277,                     // 34^-42
+    -247,                     // 34^-36
+    -216,                     // 34^-30
+    -186,                     // 34^-24
+    -155,                     // 34^-18
+    -125,                     // 34^-12
+    -94,                      // 34^-6
+    -63,                      // 34^0
+    -33,                      // 34^6
+    -2,                       // 34^12
+    28,                       // 34^18
+    59,                       // 34^24
+    89,                       // 34^30
+    120,                      // 34^36
+    150,                      // 34^42
+    181,                      // 34^48
+    211,                      // 34^54
+    242,                      // 34^60
+    272,                      // 34^66
+    303,                      // 34^72
+    333,                      // 34^78
+    364,                      // 34^84
+    394,                      // 34^90
+    425,                      // 34^96
+    455,                      // 34^102
+    486,                      // 34^108
+    516,                      // 34^114
+    547,                      // 34^120
+    578,                      // 34^126
+    608,                      // 34^132
+    639,                      // 34^138
+    669,                      // 34^144
+    700,                      // 34^150
+    730,                      // 34^156
+    761,                      // 34^162
+    791,                      // 34^168
+    822,                      // 34^174
+    852,                      // 34^180
+    883,                      // 34^186
+    913,                      // 34^192
+    944,                      // 34^198
+];
+const BASE34_SMALL_INT_POWERS: [u64; 6] = [1, 34, 1156, 39304, 1336336, 45435424];
+const BASE34_STEP: i32 = 6;
+const BASE34_BIAS: i32 = 228;
+
+// BASE35
+
+const BASE35_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 35^0
+    10088063165309911040,     // 35^1
+    11033819087057715200,     // 35^2
+    12068239626469376000,     // 35^3
+    13199637091450880000,     // 35^4
+    14437103068774400000,     // 35^5
+];
+const BASE35_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 35^0
+    -58,                      // 35^1
+    -53,                      // 35^2
+    -48,                      // 35^3
+    -43,                      // 35^4
+    -38,                      // 35^5
+];
+const BASE35_LARGE_MANTISSA: [u64; 71] = [
+    11348773864264802781,     // 35^-222
+    9714654125541636184,      // 35^-216
+    16631665395337738380,     // 35^-210
+    14236857547774631404,     // 35^-204
+    12186880148060573338,     // 35^-198
+    10432080762542161338,     // 35^-192
+    17859912908640730010,     // 35^-186
+    15288248642090717076,     // 35^-180
+    13086880531724678972,     // 35^-174
+    11202489314578100722,     // 35^-168
+    9589433214356533221,      // 35^-162
+    16417284907013989533,     // 35^-156
+    14053345890899718904,     // 35^-150
+    12029792492965214691,     // 35^-144
+    10297612294415481616,     // 35^-138
+    17629700433836653197,     // 35^-132
+    15091184660126225295,     // 35^-126
+    12918191962520288360,     // 35^-120
+    11058090357972464737,     // 35^-114
+    9465826388078148767,      // 35^-108
+    16205667761547463659,     // 35^-102
+    13872199680760223069,     // 35^-96
+    11874729681889289960,     // 35^-90
+    10164877111271147984,     // 35^-84
+    17402455374597619654,     // 35^-78
+    14896660812999728329,     // 35^-72
+    12751677771947325078,     // 35^-66
+    10915552689343391453,     // 35^-60
+    9343812841314943660,      // 35^-54
+    15996778339727633381,     // 35^-48
+    13693388426986467236,     // 35^-42
+    11721665614797754707,     // 35^-36
+    10033852871240677221,     // 35^-30
+    17178139481236495112,     // 35^-24
+    14704644358629538426,     // 35^-18
+    12587309932484688516,     // 35^-12
+    10774852316876721446,     // 35^-6
+    9223372036854775808,      // 35^0
+    15790581481472000000,     // 35^6
+    13516882032226562500,     // 35^12
+    11570574528082381959,     // 35^18
+    9904517520440015906,      // 35^24
+    16956714997100751955,     // 35^30
+    14515102976976096155,     // 35^36
+    12425060777883196253,     // 35^42
+    10635965558010358334,     // 35^48
+    18208967404416189641,     // 35^54
+    15587042479907979542,     // 35^60
+    13342650787080448100,     // 35^66
+    11421430990225254489,     // 35^72
+    9776849289257450184,      // 35^78
+    16738144652217302890,     // 35^84
+    14328004764601889967,     // 35^90
+    12264902998508825496,     // 35^96
+    10498869035448040891,     // 35^102
+    17974255652391389054,     // 35^108
+    15386127075531072702,     // 35^114
+    13170665365099231511,     // 35^120
+    11274209897518154234,     // 35^126
+    9650826688689364000,      // 35^132
+    16522391657019252092,     // 35^138
+    14143318229301497845,     // 35^144
+    12106809636745979660,     // 35^150
+    10363539673224497244,     // 35^156
+    17742569311160898016,     // 35^162
+    15187801450438335382,     // 35^168
+    13000896817848986534,     // 35^174
+    11128886469837128365,     // 35^180
+    9526428506723229038,      // 35^186
+    16309419696153507876,     // 35^192
+    13961012284800847178,     // 35^198
+];
+const BASE35_LARGE_EXPONENT: [i32; 71] = [
+    -1202,                    // 35^-222
+    -1171,                    // 35^-216
+    -1141,                    // 35^-210
+    -1110,                    // 35^-204
+    -1079,                    // 35^-198
+    -1048,                    // 35^-192
+    -1018,                    // 35^-186
+    -987,                     // 35^-180
+    -956,                     // 35^-174
+    -925,                     // 35^-168
+    -894,                     // 35^-162
+    -864,                     // 35^-156
+    -833,                     // 35^-150
+    -802,                     // 35^-144
+    -771,                     // 35^-138
+    -741,                     // 35^-132
+    -710,                     // 35^-126
+    -679,                     // 35^-120
+    -648,                     // 35^-114
+    -617,                     // 35^-108
+    -587,                     // 35^-102
+    -556,                     // 35^-96
+    -525,                     // 35^-90
+    -494,                     // 35^-84
+    -464,                     // 35^-78
+    -433,                     // 35^-72
+    -402,                     // 35^-66
+    -371,                     // 35^-60
+    -340,                     // 35^-54
+    -310,                     // 35^-48
+    -279,                     // 35^-42
+    -248,                     // 35^-36
+    -217,                     // 35^-30
+    -187,                     // 35^-24
+    -156,                     // 35^-18
+    -125,                     // 35^-12
+    -94,                      // 35^-6
+    -63,                      // 35^0
+    -33,                      // 35^6
+    -2,                       // 35^12
+    29,                       // 35^18
+    60,                       // 35^24
+    90,                       // 35^30
+    121,                      // 35^36
+    152,                      // 35^42
+    183,                      // 35^48
+    213,                      // 35^54
+    244,                      // 35^60
+    275,                      // 35^66
+    306,                      // 35^72
+    337,                      // 35^78
+    367,                      // 35^84
+    398,                      // 35^90
+    429,                      // 35^96
+    460,                      // 35^102
+    490,                      // 35^108
+    521,                      // 35^114
+    552,                      // 35^120
+    583,                      // 35^126
+    614,                      // 35^132
+    644,                      // 35^138
+    675,                      // 35^144
+    706,                      // 35^150
+    737,                      // 35^156
+    767,                      // 35^162
+    798,                      // 35^168
+    829,                      // 35^174
+    860,                      // 35^180
+    891,                      // 35^186
+    921,                      // 35^192
+    952,                      // 35^198
+];
+const BASE35_SMALL_INT_POWERS: [u64; 6] = [1, 35, 1225, 42875, 1500625, 52521875];
+const BASE35_STEP: i32 = 6;
+const BASE35_BIAS: i32 = 222;
+
+// BASE36
+
+const BASE36_SMALL_MANTISSA: [u64; 6] = [
+    9223372036854775808,      // 36^0
+    10376293541461622784,     // 36^1
+    11673330234144325632,     // 36^2
+    13132496513412366336,     // 36^3
+    14774058577588912128,     // 36^4
+    16620815899787526144,     // 36^5
+];
+const BASE36_SMALL_EXPONENT: [i32; 6] = [
+    -63,                      // 36^0
+    -58,                      // 36^1
+    -53,                      // 36^2
+    -48,                      // 36^3
+    -43,                      // 36^4
+    -38,                      // 36^5
+];
+const BASE36_LARGE_MANTISSA: [u64; 71] = [
+    11172994339528645078,     // 36^-222
+    11325430459582219446,     // 36^-216
+    11479946305982273645,     // 36^-210
+    11636570252986002899,     // 36^-204
+    11795331061968106016,     // 36^-198
+    11956257886702331980,     // 36^-192
+    12119380278715084095,     // 36^-186
+    12284728192712064755,     // 36^-180
+    12452331992078957377,     // 36^-174
+    12622222454457155586,     // 36^-168
+    12794430777395563548,     // 36^-162
+    12968988584079505325,     // 36^-156
+    13145927929137795237,     // 36^-150
+    13325281304529035642,     // 36^-144
+    13507081645508223020,     // 36^-138
+    13691362336674758052,     // 36^-132
+    13878157218102970303,     // 36^-126
+    14067500591556283265,     // 36^-120
+    14259427226786160917,     // 36^-114
+    14453972367916992462,     // 36^-108
+    14651171739918087751,     // 36^-102
+    14851061555163971849,     // 36^-96
+    15053678520084183432,     // 36^-90
+    15259059841903798156,     // 36^-84
+    15467243235475914756,     // 36^-78
+    15678266930207358578,     // 36^-72
+    15892169677078874302,     // 36^-66
+    16108990755761097026,     // 36^-60
+    16328769981827608423,     // 36^-54
+    16551547714066402526,     // 36^-48
+    16777364861891103792,     // 36^-42
+    17006262892853298360,     // 36^-36
+    17238283840257358043,     // 36^-30
+    17473470310879155380,     // 36^-24
+    17711865492790087155,     // 36^-18
+    17953513163287843146,     // 36^-12
+    18198457696935376453,     // 36^-6
+    9223372036854775808,      // 36^0
+    9349208943630483456,      // 36^6
+    9476762676643233792,      // 36^12
+    9606056659007943744,      // 36^18
+    9737114633407288801,      // 36^24
+    9869960666451650558,      // 36^30
+    10004619153098548172,     // 36^36
+    10141114821132365302,     // 36^42
+    10279472735705195138,     // 36^48
+    10419718303939637392,     // 36^54
+    10561877279594392463,     // 36^60
+    10705975767793509530,     // 36^66
+    10852040229820157048,     // 36^72
+    11000097487975795902,     // 36^78
+    11150174730505647564,     // 36^84
+    11302299516591361707,     // 36^90
+    11456499781411800112,     // 36^96
+    11612803841272866179,     // 36^102
+    11771240398807322073,     // 36^108
+    11931838548245548344,     // 36^114
+    12094627780758213915,     // 36^120
+    12259637989871837542,     // 36^126
+    12426899476958235198,     // 36^132
+    12596442956798861450,     // 36^138
+    12768299563225066619,     // 36^144
+    12942500854835305460,     // 36^150
+    13119078820790347231,     // 36^156
+    13298065886687551351,     // 36^162
+    13479494920515287357,     // 36^168
+    13663399238688592583,     // 36^174
+    13849812612167175924,     // 36^180
+    14038769272656891137,     // 36^186
+    14230303918895818486,     // 36^192
+    14424451723026109070,     // 36^198
+];
+const BASE36_LARGE_EXPONENT: [i32; 71] = [
+    -1211,                    // 36^-222
+    -1180,                    // 36^-216
+    -1149,                    // 36^-210
+    -1118,                    // 36^-204
+    -1087,                    // 36^-198
+    -1056,                    // 36^-192
+    -1025,                    // 36^-186
+    -994,                     // 36^-180
+    -963,                     // 36^-174
+    -932,                     // 36^-168
+    -901,                     // 36^-162
+    -870,                     // 36^-156
+    -839,                     // 36^-150
+    -808,                     // 36^-144
+    -777,                     // 36^-138
+    -746,                     // 36^-132
+    -715,                     // 36^-126
+    -684,                     // 36^-120
+    -653,                     // 36^-114
+    -622,                     // 36^-108
+    -591,                     // 36^-102
+    -560,                     // 36^-96
+    -529,                     // 36^-90
+    -498,                     // 36^-84
+    -467,                     // 36^-78
+    -436,                     // 36^-72
+    -405,                     // 36^-66
+    -374,                     // 36^-60
+    -343,                     // 36^-54
+    -312,                     // 36^-48
+    -281,                     // 36^-42
+    -250,                     // 36^-36
+    -219,                     // 36^-30
+    -188,                     // 36^-24
+    -157,                     // 36^-18
+    -126,                     // 36^-12
+    -95,                      // 36^-6
+    -63,                      // 36^0
+    -32,                      // 36^6
+    -1,                       // 36^12
+    30,                       // 36^18
+    61,                       // 36^24
+    92,                       // 36^30
+    123,                      // 36^36
+    154,                      // 36^42
+    185,                      // 36^48
+    216,                      // 36^54
+    247,                      // 36^60
+    278,                      // 36^66
+    309,                      // 36^72
+    340,                      // 36^78
+    371,                      // 36^84
+    402,                      // 36^90
+    433,                      // 36^96
+    464,                      // 36^102
+    495,                      // 36^108
+    526,                      // 36^114
+    557,                      // 36^120
+    588,                      // 36^126
+    619,                      // 36^132
+    650,                      // 36^138
+    681,                      // 36^144
+    712,                      // 36^150
+    743,                      // 36^156
+    774,                      // 36^162
+    805,                      // 36^168
+    836,                      // 36^174
+    867,                      // 36^180
+    898,                      // 36^186
+    929,                      // 36^192
+    960,                      // 36^198
+];
+const BASE36_SMALL_INT_POWERS: [u64; 6] = [1, 36, 1296, 46656, 1679616, 60466176];
+const BASE36_STEP: i32 = 6;
+const BASE36_BIAS: i32 = 222;
+
+}}  // cfg_if
+
+// HIGH LEVEL
+// ----------
+
+pub(crate) const BASE10_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE10_SMALL_MANTISSA, exp: &BASE10_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE10_LARGE_MANTISSA, exp: &BASE10_LARGE_EXPONENT },
+    small_int: &BASE10_SMALL_INT_POWERS,
+    step: BASE10_STEP,
+    bias: BASE10_BIAS,
+};
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+pub(crate) const BASE3_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE3_SMALL_MANTISSA, exp: &BASE3_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE3_LARGE_MANTISSA, exp: &BASE3_LARGE_EXPONENT },
+    small_int: &BASE3_SMALL_INT_POWERS,
+    step: BASE3_STEP,
+    bias: BASE3_BIAS,
+};
+
+pub(crate) const BASE5_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE5_SMALL_MANTISSA, exp: &BASE5_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE5_LARGE_MANTISSA, exp: &BASE5_LARGE_EXPONENT },
+    small_int: &BASE5_SMALL_INT_POWERS,
+    step: BASE5_STEP,
+    bias: BASE5_BIAS,
+};
+
+pub(crate) const BASE6_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE6_SMALL_MANTISSA, exp: &BASE6_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE6_LARGE_MANTISSA, exp: &BASE6_LARGE_EXPONENT },
+    small_int: &BASE6_SMALL_INT_POWERS,
+    step: BASE6_STEP,
+    bias: BASE6_BIAS,
+};
+
+pub(crate) const BASE7_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE7_SMALL_MANTISSA, exp: &BASE7_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE7_LARGE_MANTISSA, exp: &BASE7_LARGE_EXPONENT },
+    small_int: &BASE7_SMALL_INT_POWERS,
+    step: BASE7_STEP,
+    bias: BASE7_BIAS,
+};
+
+pub(crate) const BASE9_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE9_SMALL_MANTISSA, exp: &BASE9_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE9_LARGE_MANTISSA, exp: &BASE9_LARGE_EXPONENT },
+    small_int: &BASE9_SMALL_INT_POWERS,
+    step: BASE9_STEP,
+    bias: BASE9_BIAS,
+};
+
+pub(crate) const BASE11_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE11_SMALL_MANTISSA, exp: &BASE11_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE11_LARGE_MANTISSA, exp: &BASE11_LARGE_EXPONENT },
+    small_int: &BASE11_SMALL_INT_POWERS,
+    step: BASE11_STEP,
+    bias: BASE11_BIAS,
+};
+
+pub(crate) const BASE12_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE12_SMALL_MANTISSA, exp: &BASE12_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE12_LARGE_MANTISSA, exp: &BASE12_LARGE_EXPONENT },
+    small_int: &BASE12_SMALL_INT_POWERS,
+    step: BASE12_STEP,
+    bias: BASE12_BIAS,
+};
+
+pub(crate) const BASE13_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE13_SMALL_MANTISSA, exp: &BASE13_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE13_LARGE_MANTISSA, exp: &BASE13_LARGE_EXPONENT },
+    small_int: &BASE13_SMALL_INT_POWERS,
+    step: BASE13_STEP,
+    bias: BASE13_BIAS,
+};
+
+pub(crate) const BASE14_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE14_SMALL_MANTISSA, exp: &BASE14_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE14_LARGE_MANTISSA, exp: &BASE14_LARGE_EXPONENT },
+    small_int: &BASE14_SMALL_INT_POWERS,
+    step: BASE14_STEP,
+    bias: BASE14_BIAS,
+};
+
+pub(crate) const BASE15_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE15_SMALL_MANTISSA, exp: &BASE15_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE15_LARGE_MANTISSA, exp: &BASE15_LARGE_EXPONENT },
+    small_int: &BASE15_SMALL_INT_POWERS,
+    step: BASE15_STEP,
+    bias: BASE15_BIAS,
+};
+
+pub(crate) const BASE17_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE17_SMALL_MANTISSA, exp: &BASE17_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE17_LARGE_MANTISSA, exp: &BASE17_LARGE_EXPONENT },
+    small_int: &BASE17_SMALL_INT_POWERS,
+    step: BASE17_STEP,
+    bias: BASE17_BIAS,
+};
+
+pub(crate) const BASE18_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE18_SMALL_MANTISSA, exp: &BASE18_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE18_LARGE_MANTISSA, exp: &BASE18_LARGE_EXPONENT },
+    small_int: &BASE18_SMALL_INT_POWERS,
+    step: BASE18_STEP,
+    bias: BASE18_BIAS,
+};
+
+pub(crate) const BASE19_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE19_SMALL_MANTISSA, exp: &BASE19_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE19_LARGE_MANTISSA, exp: &BASE19_LARGE_EXPONENT },
+    small_int: &BASE19_SMALL_INT_POWERS,
+    step: BASE19_STEP,
+    bias: BASE19_BIAS,
+};
+
+pub(crate) const BASE20_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE20_SMALL_MANTISSA, exp: &BASE20_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE20_LARGE_MANTISSA, exp: &BASE20_LARGE_EXPONENT },
+    small_int: &BASE20_SMALL_INT_POWERS,
+    step: BASE20_STEP,
+    bias: BASE20_BIAS,
+};
+
+pub(crate) const BASE21_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE21_SMALL_MANTISSA, exp: &BASE21_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE21_LARGE_MANTISSA, exp: &BASE21_LARGE_EXPONENT },
+    small_int: &BASE21_SMALL_INT_POWERS,
+    step: BASE21_STEP,
+    bias: BASE21_BIAS,
+};
+
+pub(crate) const BASE22_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE22_SMALL_MANTISSA, exp: &BASE22_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE22_LARGE_MANTISSA, exp: &BASE22_LARGE_EXPONENT },
+    small_int: &BASE22_SMALL_INT_POWERS,
+    step: BASE22_STEP,
+    bias: BASE22_BIAS,
+};
+
+pub(crate) const BASE23_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE23_SMALL_MANTISSA, exp: &BASE23_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE23_LARGE_MANTISSA, exp: &BASE23_LARGE_EXPONENT },
+    small_int: &BASE23_SMALL_INT_POWERS,
+    step: BASE23_STEP,
+    bias: BASE23_BIAS,
+};
+
+pub(crate) const BASE24_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE24_SMALL_MANTISSA, exp: &BASE24_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE24_LARGE_MANTISSA, exp: &BASE24_LARGE_EXPONENT },
+    small_int: &BASE24_SMALL_INT_POWERS,
+    step: BASE24_STEP,
+    bias: BASE24_BIAS,
+};
+
+pub(crate) const BASE25_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE25_SMALL_MANTISSA, exp: &BASE25_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE25_LARGE_MANTISSA, exp: &BASE25_LARGE_EXPONENT },
+    small_int: &BASE25_SMALL_INT_POWERS,
+    step: BASE25_STEP,
+    bias: BASE25_BIAS,
+};
+
+pub(crate) const BASE26_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE26_SMALL_MANTISSA, exp: &BASE26_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE26_LARGE_MANTISSA, exp: &BASE26_LARGE_EXPONENT },
+    small_int: &BASE26_SMALL_INT_POWERS,
+    step: BASE26_STEP,
+    bias: BASE26_BIAS,
+};
+
+pub(crate) const BASE27_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE27_SMALL_MANTISSA, exp: &BASE27_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE27_LARGE_MANTISSA, exp: &BASE27_LARGE_EXPONENT },
+    small_int: &BASE27_SMALL_INT_POWERS,
+    step: BASE27_STEP,
+    bias: BASE27_BIAS,
+};
+
+pub(crate) const BASE28_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE28_SMALL_MANTISSA, exp: &BASE28_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE28_LARGE_MANTISSA, exp: &BASE28_LARGE_EXPONENT },
+    small_int: &BASE28_SMALL_INT_POWERS,
+    step: BASE28_STEP,
+    bias: BASE28_BIAS,
+};
+
+pub(crate) const BASE29_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE29_SMALL_MANTISSA, exp: &BASE29_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE29_LARGE_MANTISSA, exp: &BASE29_LARGE_EXPONENT },
+    small_int: &BASE29_SMALL_INT_POWERS,
+    step: BASE29_STEP,
+    bias: BASE29_BIAS,
+};
+
+pub(crate) const BASE30_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE30_SMALL_MANTISSA, exp: &BASE30_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE30_LARGE_MANTISSA, exp: &BASE30_LARGE_EXPONENT },
+    small_int: &BASE30_SMALL_INT_POWERS,
+    step: BASE30_STEP,
+    bias: BASE30_BIAS,
+};
+
+pub(crate) const BASE31_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE31_SMALL_MANTISSA, exp: &BASE31_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE31_LARGE_MANTISSA, exp: &BASE31_LARGE_EXPONENT },
+    small_int: &BASE31_SMALL_INT_POWERS,
+    step: BASE31_STEP,
+    bias: BASE31_BIAS,
+};
+
+pub(crate) const BASE33_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE33_SMALL_MANTISSA, exp: &BASE33_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE33_LARGE_MANTISSA, exp: &BASE33_LARGE_EXPONENT },
+    small_int: &BASE33_SMALL_INT_POWERS,
+    step: BASE33_STEP,
+    bias: BASE33_BIAS,
+};
+
+pub(crate) const BASE34_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE34_SMALL_MANTISSA, exp: &BASE34_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE34_LARGE_MANTISSA, exp: &BASE34_LARGE_EXPONENT },
+    small_int: &BASE34_SMALL_INT_POWERS,
+    step: BASE34_STEP,
+    bias: BASE34_BIAS,
+};
+
+pub(crate) const BASE35_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE35_SMALL_MANTISSA, exp: &BASE35_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE35_LARGE_MANTISSA, exp: &BASE35_LARGE_EXPONENT },
+    small_int: &BASE35_SMALL_INT_POWERS,
+    step: BASE35_STEP,
+    bias: BASE35_BIAS,
+};
+
+pub(crate) const BASE36_POWERS: ModeratePathPowers<u64> = ModeratePathPowers {
+    small: ExtendedFloatArray { mant: &BASE36_SMALL_MANTISSA, exp: &BASE36_SMALL_EXPONENT },
+    large: ExtendedFloatArray { mant: &BASE36_LARGE_MANTISSA, exp: &BASE36_LARGE_EXPONENT },
+    small_int: &BASE36_SMALL_INT_POWERS,
+    step: BASE36_STEP,
+    bias: BASE36_BIAS,
+};
+
+}}  // cfg_if
+
+/// Get powers from base.
+pub(crate) fn get_powers(radix: u32)
+    -> &'static ModeratePathPowers<u64>
+{
+    debug_assert_radix!(radix);
+
+    #[cfg(not(feature = "radix"))] {
+        &BASE10_POWERS
+    }
+
+    #[cfg(feature = "radix")] {
+        match radix {
+            3  => &BASE3_POWERS,
+            5  => &BASE5_POWERS,
+            6  => &BASE6_POWERS,
+            7  => &BASE7_POWERS,
+            9  => &BASE9_POWERS,
+            10 => &BASE10_POWERS,
+            11 => &BASE11_POWERS,
+            12 => &BASE12_POWERS,
+            13 => &BASE13_POWERS,
+            14 => &BASE14_POWERS,
+            15 => &BASE15_POWERS,
+            17 => &BASE17_POWERS,
+            18 => &BASE18_POWERS,
+            19 => &BASE19_POWERS,
+            20 => &BASE20_POWERS,
+            21 => &BASE21_POWERS,
+            22 => &BASE22_POWERS,
+            23 => &BASE23_POWERS,
+            24 => &BASE24_POWERS,
+            25 => &BASE25_POWERS,
+            26 => &BASE26_POWERS,
+            27 => &BASE27_POWERS,
+            28 => &BASE28_POWERS,
+            29 => &BASE29_POWERS,
+            30 => &BASE30_POWERS,
+            31 => &BASE31_POWERS,
+            33 => &BASE33_POWERS,
+            34 => &BASE34_POWERS,
+            35 => &BASE35_POWERS,
+            36 => &BASE36_POWERS,
+            // Powers of 2, and others, should already be handled by now.
+            _  => unreachable!(),
+        }
+    }
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::test::*;
+    use super::*;
+
+    #[test]
+    fn normalization_test() {
+        // Ensure each valid is normalized.
+        for base in BASE_POWN.iter().cloned() {
+            let powers = get_powers(base);
+            for idx in 0..powers.small.len() {
+                let fp = powers.get_small(idx);
+                assert_eq!(fp.mant.leading_zeros(), 0);
+            }
+            for idx in 0..powers.large.len() {
+                let fp = powers.get_large(idx);
+                assert_eq!(fp.mant.leading_zeros(), 0);
+            }
+        }
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    #[should_panic]
+    fn pow2_test() {
+        for base in BASE_POW2.iter().cloned() {
+            let _ = get_powers(base);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/cached.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,90 @@
+//! Cached powers trait for extended-precision floats.
+
+use crate::float::{ExtendedFloat, Mantissa};
+use super::cached_float80;
+use super::cached_float160;
+
+// POWERS
+
+/// Precalculated powers that uses two-separate arrays for memory-efficiency.
+#[doc(hidden)]
+pub(crate) struct ExtendedFloatArray<M: Mantissa> {
+    // Pre-calculated mantissa for the powers.
+    pub mant: &'static [M],
+    // Pre-calculated binary exponents for the powers.
+    pub exp: &'static [i32],
+}
+
+/// Allow indexing of values without bounds checking
+impl<M: Mantissa> ExtendedFloatArray<M> {
+    perftools_inline!{
+    pub fn get_extended_float(&self, index: usize)
+        -> ExtendedFloat<M>
+    {
+        let mant = self.mant[index];
+        let exp = self.exp[index];
+        ExtendedFloat { mant: mant, exp: exp }
+    }}
+
+    perftools_inline!{
+    pub fn len(&self) -> usize {
+        self.mant.len()
+    }}
+}
+
+// MODERATE PATH POWERS
+
+/// Precalculated powers of base N for the moderate path.
+#[doc(hidden)]
+pub(crate) struct ModeratePathPowers<M: Mantissa> {
+    // Pre-calculated small powers.
+    pub small: ExtendedFloatArray<M>,
+    // Pre-calculated large powers.
+    pub large: ExtendedFloatArray<M>,
+    /// Pre-calculated small powers as 64-bit integers
+    pub small_int: &'static [M],
+    // Step between large powers and number of small powers.
+    pub step: i32,
+    // Exponent bias for the large powers.
+    pub bias: i32,
+}
+
+/// Allow indexing of values without bounds checking
+impl<M: Mantissa> ModeratePathPowers<M> {
+    perftools_inline!{
+    pub fn get_small(&self, index: usize) -> ExtendedFloat<M> {
+        self.small.get_extended_float(index)
+    }}
+
+    perftools_inline!{
+    pub fn get_large(&self, index: usize) -> ExtendedFloat<M> {
+        self.large.get_extended_float(index)
+    }}
+
+    perftools_inline!{
+    pub fn get_small_int(&self, index: usize) -> M {
+        self.small_int[index]
+    }}
+}
+
+// CACHED EXTENDED POWERS
+
+/// Cached powers as a trait for a floating-point type.
+pub(super) trait ModeratePathCache<M: Mantissa> {
+    /// Get powers from radix.
+    fn get_powers(radix: u32) -> &'static ModeratePathPowers<M>;
+}
+
+impl ModeratePathCache<u64> for ExtendedFloat<u64> {
+    perftools_inline!{
+    fn get_powers(radix: u32) -> &'static ModeratePathPowers<u64> {
+        cached_float80::get_powers(radix)
+    }}
+}
+
+impl ModeratePathCache<u128> for ExtendedFloat<u128> {
+    perftools_inline!{
+    fn get_powers(radix: u32) -> &'static ModeratePathPowers<u128> {
+        cached_float160::get_powers(radix)
+    }}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/correct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/correct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/correct.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/correct.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,907 @@
+//! Correct algorithms for string-to-float conversions.
+//!
+//! This implementation is loosely based off the Golang implementation,
+//! found here:
+//!     https://golang.org/src/strconv/atof.go
+
+use crate::atoi;
+use crate::float::*;
+use crate::util::*;
+use super::alias::*;
+use super::bhcomp;
+use super::cached::ModeratePathCache;
+use super::errors::FloatErrors;
+use super::format::*;
+use super::small_powers::get_small_powers_64;
+
+// HELPERS
+// -------
+
+// Parse the raw float state into a mantissa, calculating the number
+// of truncated digits and the offset.
+perftools_inline!{
+fn process_mantissa<'a, M, Data>(data: &Data, radix: u32)
+    -> (M, usize)
+    where M: Mantissa,
+          Data: FastDataInterface<'a>
+{
+    atoi::standalone_mantissa(data.integer_iter(), data.fraction_iter(), radix)
+}}
+
+// FAST
+// ----
+
+// POWN
+
+/// Convert mantissa to exact value for a non-base2 power.
+///
+/// Returns the resulting float and if the value can be represented exactly.
+fn fast_path<F>(mantissa: u64, radix: u32, exponent: i32)
+    -> Option<F>
+    where F: FloatType
+{
+    debug_assert_radix!(radix);
+    debug_assert!(pow2_exponent(radix) == 0, "Cannot use `fast_path` with a power of 2.");
+
+    // `mantissa >> (F::MANTISSA_SIZE+1) != 0` effectively checks if the
+    // value has a no bits above the hidden bit, which is what we want.
+    let (min_exp, max_exp) = F::exponent_limit(radix);
+    let shift_exp = F::mantissa_limit(radix);
+    let mantissa_size = F::MANTISSA_SIZE + 1;
+    if mantissa >> mantissa_size != 0 {
+        // Would require truncation of the mantissa.
+        None
+    } else if exponent == 0 {
+        // 0 exponent, same as value, exact representation.
+        let float: F = as_cast(mantissa);
+        Some(float)
+    } else if exponent >= min_exp && exponent <= max_exp {
+        // Value can be exactly represented, return the value.
+        // Use powi, since it's correct, and faster on
+        // the fast-path.
+        let float: F = as_cast(mantissa);
+        Some(float.pow(radix, exponent))
+    } else if exponent >= 0 && exponent <= max_exp + shift_exp {
+        // Check to see if we have a disguised fast-path, where the
+        // number of digits in the mantissa is very small, but and
+        // so digits can be shifted from the exponent to the mantissa.
+        // https://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/
+        let small_powers = get_small_powers_64(radix);
+        let shift = exponent - max_exp;
+        let power = small_powers[shift.as_usize()];
+
+        // Compute the product of the power, if it overflows,
+        // prematurely return early, otherwise, if we didn't overshoot,
+        // we can get an exact value.
+        let value = mantissa.checked_mul(power)?;
+        if value >> mantissa_size != 0 {
+            None
+        } else {
+            // Use powi, since it's correct, and faster on
+            // the fast-path.
+            let float: F = as_cast(value);
+            Some(float.pow(radix, max_exp))
+        }
+    } else {
+        // Cannot be exactly represented, exponent too small or too big,
+        // would require truncation.
+        None
+    }
+}
+
+// POW2
+
+// Detect if a float representation is exactly halfway after truncation.
+#[cfg(feature = "radix")]
+perftools_inline!{
+fn is_halfway<F: FloatType>(mantissa: u64)
+    -> bool
+{
+    // Get the leading and trailing zeros from the least-significant bit.
+    let bit_length: i32 = 64 - mantissa.leading_zeros().as_i32();
+    let trailing_zeros: i32 = mantissa.trailing_zeros().as_i32();
+
+    // We need exactly mantissa+2 elements between these if it is halfway.
+    // The hidden bit is mantissa+1 elements away, which is the last non-
+    // truncated bit, while mantissa+2
+    bit_length - trailing_zeros == F::MANTISSA_SIZE + 2
+}}
+
+// Detect if a float representation is odd after truncation.
+#[cfg(feature = "radix")]
+perftools_inline!{
+fn is_odd<F: FloatType>(mantissa: u64)
+    -> bool
+{
+    // Get the leading and trailing zeros from the least-significant bit.
+    let bit_length: i32 = 64 - mantissa.leading_zeros().as_i32();
+    let shift = bit_length - (F::MANTISSA_SIZE + 1);
+    if shift >= 0 {
+        // Have enough bits to have a full mantissa in the float, need to
+        // check if that last bit is set.
+        let mask = 1u64 << shift;
+        mantissa & mask == mask
+    } else {
+        // Not enough bits for a full mantissa, must be even.
+        false
+    }
+}}
+
+/// Convert power-of-two to exact value.
+///
+/// We will always get an exact representation.
+///
+/// This works since multiplying by the exponent will not affect the
+/// mantissa unless the exponent is denormal, which will cause truncation
+/// regardless.
+#[cfg(feature = "radix")]
+fn pow2_fast_path<F>(mantissa: u64, radix: u32, pow2_exp: i32, exponent: i32)
+    -> F
+    where F: FloatType
+{
+    debug_assert!(pow2_exp != 0, "Not a power of 2.");
+
+    // As long as the value is within the bounds, we can get an exact value.
+    // Since any power of 2 only affects the exponent, we should be able to get
+    // any exact value.
+
+    // We know that if any value is > than max_exp, we get infinity, since
+    // the mantissa must be positive. We know that the actual value that
+    // causes underflow is 64, use 65 since that prevents inaccurate
+    // rounding for any pow2_exp.
+    let (min_exp, max_exp) = F::exponent_limit(radix);
+    let underflow_exp = min_exp - (65 / pow2_exp);
+    if exponent > max_exp {
+        F::INFINITY
+    } else if exponent < underflow_exp{
+        F::ZERO
+    } else if exponent < min_exp {
+        // We know the mantissa is somewhere <= 65 below min_exp.
+        // May still underflow, but it's close. Use the first multiplication
+        // which guarantees no truncation, and then the second multiplication
+        // which will round to the accurate representation.
+        let remainder = exponent - min_exp;
+        let float: F = as_cast(mantissa);
+        let float = float.pow2(pow2_exp * remainder).pow2(pow2_exp * min_exp);
+        float
+    } else {
+        let float: F = as_cast(mantissa);
+        let float = float.pow2(pow2_exp * exponent);
+        float
+    }
+}
+
+// MODERATE
+// --------
+
+/// Multiply the floating-point by the exponent.
+///
+/// Multiply by pre-calculated powers of the base, modify the extended-
+/// float, and return if new value and if the value can be represented
+/// accurately.
+fn multiply_exponent_extended<F, M>(fp: &mut ExtendedFloat<M>, radix: u32, exponent: i32, truncated: bool, kind: RoundingKind)
+    -> bool
+    where M: FloatErrors,
+          F: FloatRounding<M>,
+          ExtendedFloat<M>: ModeratePathCache<M>
+{
+    let powers = ExtendedFloat::<M>::get_powers(radix);
+    let exponent = exponent.saturating_add(powers.bias);
+    let small_index = exponent % powers.step;
+    let large_index = exponent / powers.step;
+    if exponent < 0 {
+        // Guaranteed underflow (assign 0).
+        fp.mant = M::ZERO;
+        true
+    } else if large_index as usize >= powers.large.len() {
+        // Overflow (assign infinity)
+        fp.mant = M::ONE << 63;
+        fp.exp = 0x7FF;
+        true
+    } else {
+        // Within the valid exponent range, multiply by the large and small
+        // exponents and return the resulting value.
+
+        // Track errors to as a factor of unit in last-precision.
+        let mut errors: u32 = 0;
+        if truncated {
+            errors += M::error_halfscale();
+        }
+
+        // Multiply by the small power.
+        // Check if we can directly multiply by an integer, if not,
+        // use extended-precision multiplication.
+        match fp.mant.overflowing_mul(powers.get_small_int(small_index.as_usize())) {
+            // Overflow, multiplication unsuccessful, go slow path.
+            (_, true)     => {
+                fp.normalize();
+                fp.imul(&powers.get_small(small_index.as_usize()));
+                errors += M::error_halfscale();
+            },
+            // No overflow, multiplication successful.
+            (mant, false) => {
+                fp.mant = mant;
+                fp.normalize();
+            },
+        }
+
+        // Multiply by the large power
+        fp.imul(&powers.get_large(large_index.as_usize()));
+        if errors > 0 {
+            errors += 1;
+        }
+        errors += M::error_halfscale();
+
+        // Normalize the floating point (and the errors).
+        let shift = fp.normalize();
+        errors <<= shift;
+
+        M::error_is_accurate::<F>(errors, &fp, kind)
+    }
+}
+
+// Create a precise native float using an intermediate extended-precision float.
+//
+// Return the float approximation and if the value can be accurately
+// represented with mantissa bits of precision.
+perftools_inline_always!{
+pub(super) fn moderate_path<F, M>(mantissa: M, radix: u32, exponent: i32, truncated: bool, kind: RoundingKind)
+    -> (ExtendedFloat<M>, bool)
+    where M: FloatErrors,
+          F: FloatRounding<M> + StablePower,
+          ExtendedFloat<M>: ModeratePathCache<M>
+{
+    let mut fp = ExtendedFloat { mant: mantissa, exp: 0 };
+    let valid = multiply_exponent_extended::<F, M>(&mut fp, radix, exponent, truncated, kind);
+    (fp, valid)
+}}
+
+// TO NATIVE
+// ---------
+
+// POWN
+
+/// Fallback method. Do not inline so the stack requirements only occur
+/// if required.
+fn pown_fallback<'a, F, Data>(data: Data, mantissa: u64, radix: u32, lossy: bool, sign: Sign)
+    -> F
+    where F: FloatType,
+          Data: SlowDataInterface<'a>
+{
+    let kind = global_rounding(sign);
+
+    // Moderate path (use an extended 80-bit representation).
+    let exponent = data.mantissa_exponent();
+    let is_truncated = data.truncated_digits() != 0;
+    let (fp, valid) = moderate_path::<F, _>(mantissa, radix, exponent, is_truncated, kind);
+    if valid || lossy {
+        let float = fp.into_rounded_float_impl::<F>(kind);
+        return float;
+    }
+
+    // Slow path
+    let b = fp.into_rounded_float_impl::<F>(RoundingKind::Downward);
+    if b.is_special() {
+        // We have a non-finite number, we get to leave early.
+        return b;
+    } else {
+        let float = bhcomp::atof(data, radix, b, kind);
+        return float;
+    }
+}
+
+/// Parse non-power-of-two radix string to native float.
+fn pown_to_native<'a, F, Data>(mut data: Data, bytes: &'a [u8], radix: u32, lossy: bool, sign: Sign)
+    -> ParseResult<(F, *const u8)>
+    where F: FloatType,
+          Data: FastDataInterface<'a>
+{
+    // Parse the mantissa and exponent.
+    let ptr = data.extract(bytes, radix)?;
+    let (mantissa, truncated) = process_mantissa::<u64, _>(&data, radix);
+
+    // Process the state to a float.
+    let float = if mantissa.is_zero() {
+        // Literal 0, return early.
+        // Value cannot be truncated, since truncation only occurs on
+        // overflow or underflow.
+        F::ZERO
+    } else if truncated.is_zero() {
+        // Try the fast path, no mantissa truncation.
+        let mant_exp = data.mantissa_exponent(0);
+        if let Some(float) = fast_path::<F>(mantissa, radix, mant_exp) {
+            float
+        } else {
+            let slow = data.to_slow(truncated);
+            pown_fallback(slow, mantissa, radix, lossy, sign)
+        }
+    } else {
+        // Can only use the moderate/slow path.
+        let slow = data.to_slow(truncated);
+        pown_fallback(slow, mantissa, radix, lossy, sign)
+    };
+    Ok((float, ptr))
+}
+
+// POW2
+
+/// Parse power-of-two radix string to native float.
+#[cfg(feature = "radix")]
+fn pow2_to_native<'a, F, Data>(mut data: Data, bytes: &'a [u8], radix: u32, pow2_exp: i32, sign: Sign)
+    -> ParseResult<(F, *const u8)>
+    where F: FloatType,
+          Data: FastDataInterface<'a>
+{
+    // Parse the mantissa and exponent.
+    let ptr = data.extract(bytes, radix)?;
+    let (mut mantissa, truncated) = process_mantissa::<u64, _>(&data, radix);
+
+    // We have a power of 2, can get an exact value even if the mantissa
+    // was truncated. Check to see if there are any truncated digits, depending
+    // on our rounding scheme.
+    let mantissa_size = F::MANTISSA_SIZE + 1;
+    let float = if !truncated.is_zero() {
+        // Truncated mantissa.
+        let kind = global_rounding(sign);
+        let slow = data.to_slow(truncated);
+        if kind != RoundingKind::Downward {
+            if cfg!(feature = "rounding") || kind == RoundingKind::NearestTieEven {
+                // Need to check if we're exactly halfway and if there are truncated digits.
+                if is_halfway::<F>(mantissa) && is_odd::<F>(mantissa) {
+                    mantissa += 1;
+                }
+            } else if kind == RoundingKind::NearestTieAwayZero {
+                // Need to check if we're exactly halfway and if there are truncated digits.
+                if is_halfway::<F>(mantissa) {
+                    mantissa += 1;
+                }
+            } else {
+                // Need to check if there are any bytes present.
+                // Check if there were any truncated bytes.
+                let index = slow.mantissa_digits() - slow.truncated_digits();
+                let iter = slow.integer_iter().chain(slow.fraction_iter()).skip(index);
+                let count = iter.take_while(|&&c| c == b'0').count();
+                let is_truncated = count < slow.truncated_digits();
+                if is_truncated {
+                    mantissa += 1;
+                }
+            }
+        }
+
+        // Create exact representation and return.
+        let exponent = slow.mantissa_exponent().saturating_mul(pow2_exp);
+        let fp = ExtendedFloat { mant: mantissa, exp: exponent };
+        fp.into_rounded_float_impl::<F>(kind)
+    } else if mantissa >> mantissa_size != 0 {
+        // Would be truncated, use the extended float.
+        let kind = global_rounding(sign);
+        let slow = data.to_slow(truncated);
+        let exponent = slow.mantissa_exponent().saturating_mul(pow2_exp);
+        let fp = ExtendedFloat { mant: mantissa, exp: exponent };
+        fp.into_rounded_float_impl::<F>(kind)
+    } else {
+        // Nothing above the hidden bit, so no rounding-error, can use the fast path.
+        let mant_exp = data.mantissa_exponent(0);
+        pow2_fast_path(mantissa, radix, pow2_exp, mant_exp)
+    };
+    Ok((float, ptr))
+}
+
+// Check if value is power of 2 and get the power.
+perftools_inline!{
+fn pow2_exponent(radix: u32) -> i32 {
+    match radix {
+        2  => 1,
+        4  => 2,
+        8  => 3,
+        16 => 4,
+        32 => 5,
+        _  => 0,
+    }
+}}
+
+// DISPATCHER
+
+// Parse native float from string.
+//
+// The float string must be non-special, non-zero, and positive.
+perftools_inline!{
+fn to_native<F>(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+    where F: FloatType
+{
+    #[cfg(not(feature = "radix"))] {
+        apply_interface!(pown_to_native, format, bytes, radix,  lossy, sign)
+    }
+
+    #[cfg(feature = "radix")] {
+        let pow2_exp = pow2_exponent(radix);
+        match pow2_exp {
+            0 => apply_interface!(pown_to_native, format, bytes, radix, lossy, sign),
+            _ => apply_interface!(pow2_to_native, format, bytes, radix, pow2_exp, sign)
+        }
+    }
+}}
+
+// ATOF/ATOD
+// ---------
+
+// Parse 32-bit float from string.
+perftools_inline!{
+pub(crate) fn atof(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(f32, *const u8)>
+{
+    to_native::<f32>(bytes, radix, lossy, sign, format)
+}}
+
+// Parse 64-bit float from string.
+perftools_inline!{
+pub(crate) fn atod(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(f64, *const u8)>
+{
+    to_native::<f64>(bytes, radix, lossy, sign, format)
+}}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::test::*;
+    use super::*;
+
+    #[test]
+    fn process_mantissa_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        // 64-bits
+        let data = (b!("1"), Some(b!("2345")), None, 0).into();
+        assert_eq!((12345, 0), process_mantissa::<u64, Data>(&data, 10));
+
+        let data = (b!("12"), Some(b!("345")), None, 0).into();
+        assert_eq!((12345, 0), process_mantissa::<u64, Data>(&data, 10));
+
+        let data = (b!("12345"), Some(b!("6789")), None, 0).into();
+        assert_eq!((123456789, 0), process_mantissa::<u64, Data>(&data, 10));
+
+        let data = (b!("1"), Some(b!("2345")), Some(b!("10")), 10).into();
+        assert_eq!((12345, 0), process_mantissa::<u64, Data>(&data, 10));
+
+        let data = (b!("100000000000000000000"), None, None, 0).into();
+        assert_eq!((10000000000000000000, 1), process_mantissa::<u64, Data>(&data, 10));
+
+        let data = (b!("100000000000000000001"), None, None, 0).into();
+        assert_eq!((10000000000000000000, 1), process_mantissa::<u64, Data>(&data, 10));
+
+        let data = (b!("179769313486231580793728971405303415079934132710037826936173778980444968292764750946649017977587207096330286416692887910946555547851940402630657488671505820681908902000708383676273854845817711531764475730270069855571366959622842914819860834936475292719074168444365510704342711559699508093042880177904174497791"), Some(b!("9999999999999999999999999999999999999999999999999999999999999999999999")), None, 0).into();
+        assert_eq!((17976931348623158079, 359), process_mantissa::<u64, Data>(&data, 10));
+
+        let data = (b!("1009"), None, Some(b!("-31")), -31).into();
+        assert_eq!((1009, 0), process_mantissa::<u64, Data>(&data, 10));
+
+        // 128-bit
+        let data = (b!("1"), Some(b!("2345")), None, 0).into();
+        assert_eq!((12345, 0), process_mantissa::<u128, Data>(&data, 10));
+
+        let data = (b!("12"), Some(b!("345")), None, 0).into();
+        assert_eq!((12345, 0), process_mantissa::<u128, Data>(&data, 10));
+
+        let data = (b!("12345"), Some(b!("6789")), None, 0).into();
+        assert_eq!((123456789, 0), process_mantissa::<u128, Data>(&data, 10));
+
+        let data = (b!("1"), Some(b!("2345")), Some(b!("10")), 10).into();
+        assert_eq!((12345, 0), process_mantissa::<u128, Data>(&data, 10));
+
+        let data = (b!("100000000000000000000"), None, None, 0).into();
+        assert_eq!((100000000000000000000, 0), process_mantissa::<u128, Data>(&data, 10));
+
+        let data = (b!("100000000000000000001"), None, None, 0).into();
+        assert_eq!((100000000000000000001, 0), process_mantissa::<u128, Data>(&data, 10));
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn is_odd_test() {
+        // Variant of b1000000000000000000000001, a halfway value for f32.
+        assert!(is_odd::<f32>(0x1000002));
+        assert!(is_odd::<f32>(0x2000004));
+        assert!(is_odd::<f32>(0x8000010000000000));
+        assert!(!is_odd::<f64>(0x1000002));
+        assert!(!is_odd::<f64>(0x2000004));
+        assert!(!is_odd::<f64>(0x8000010000000000));
+
+        assert!(!is_odd::<f32>(0x1000001));
+        assert!(!is_odd::<f32>(0x2000002));
+        assert!(!is_odd::<f32>(0x8000008000000000));
+        assert!(!is_odd::<f64>(0x1000001));
+        assert!(!is_odd::<f64>(0x2000002));
+        assert!(!is_odd::<f64>(0x8000008000000000));
+
+        // Variant of b100000000000000000000000000000000000000000000000000001,
+        // a halfway value for f64
+        assert!(!is_odd::<f32>(0x3f000000000002));
+        assert!(!is_odd::<f32>(0x3f000000000003));
+        assert!(!is_odd::<f32>(0xFC00000000000800));
+        assert!(!is_odd::<f32>(0xFC00000000000C00));
+        assert!(is_odd::<f64>(0x3f000000000002));
+        assert!(is_odd::<f64>(0x3f000000000003));
+        assert!(is_odd::<f64>(0xFC00000000000800));
+        assert!(is_odd::<f64>(0xFC00000000000C00));
+
+        assert!(!is_odd::<f32>(0x3f000000000001));
+        assert!(!is_odd::<f32>(0x3f000000000004));
+        assert!(!is_odd::<f32>(0xFC00000000000400));
+        assert!(!is_odd::<f32>(0xFC00000000001000));
+        assert!(!is_odd::<f64>(0x3f000000000001));
+        assert!(!is_odd::<f64>(0x3f000000000004));
+        assert!(!is_odd::<f64>(0xFC00000000000400));
+        assert!(!is_odd::<f64>(0xFC00000000001000));
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn is_halfway_test() {
+        // Variant of b1000000000000000000000001, a halfway value for f32.
+        assert!(is_halfway::<f32>(0x1000001));
+        assert!(is_halfway::<f32>(0x2000002));
+        assert!(is_halfway::<f32>(0x8000008000000000));
+        assert!(!is_halfway::<f64>(0x1000001));
+        assert!(!is_halfway::<f64>(0x2000002));
+        assert!(!is_halfway::<f64>(0x8000008000000000));
+
+        // Variant of b10000000000000000000000001, which is 1-off a halfway value.
+        assert!(!is_halfway::<f32>(0x2000001));
+        assert!(!is_halfway::<f64>(0x2000001));
+
+        // Variant of b100000000000000000000000000000000000000000000000000001,
+        // a halfway value for f64
+        assert!(!is_halfway::<f32>(0x20000000000001));
+        assert!(!is_halfway::<f32>(0x40000000000002));
+        assert!(!is_halfway::<f32>(0x8000000000000400));
+        assert!(is_halfway::<f64>(0x20000000000001));
+        assert!(is_halfway::<f64>(0x40000000000002));
+        assert!(is_halfway::<f64>(0x8000000000000400));
+
+        // Variant of b111111000000000000000000000000000000000000000000000001,
+        // a halfway value for f64.
+        assert!(!is_halfway::<f32>(0x3f000000000001));
+        assert!(!is_halfway::<f32>(0xFC00000000000400));
+        assert!(is_halfway::<f64>(0x3f000000000001));
+        assert!(is_halfway::<f64>(0xFC00000000000400));
+
+        // Variant of b1000000000000000000000000000000000000000000000000000001,
+        // which is 1-off a halfway value.
+        assert!(!is_halfway::<f32>(0x40000000000001));
+        assert!(!is_halfway::<f64>(0x40000000000001));
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn float_pow2_fast_path() {
+        // Everything is valid.
+        let mantissa = 1 << 63;
+        for base in BASE_POW2.iter().cloned() {
+            let (min_exp, max_exp) = f32::exponent_limit(base);
+            let pow2_exp = pow2_exponent(base);
+            for exp in min_exp-20..max_exp+30 {
+                // Always valid, ignore result
+                pow2_fast_path::<f32>(mantissa, base, pow2_exp, exp);
+            }
+        }
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn double_pow2_fast_path_test() {
+        // Everything is valid.
+        let mantissa = 1 << 63;
+        for base in BASE_POW2.iter().cloned() {
+            let (min_exp, max_exp) = f64::exponent_limit(base);
+            let pow2_exp = pow2_exponent(base);
+            for exp in min_exp-20..max_exp+30 {
+                // Ignore result, always valid
+                pow2_fast_path::<f64>(mantissa, base, pow2_exp, exp);
+            }
+        }
+    }
+
+    #[test]
+    fn float_fast_path_test() {
+        // valid
+        let mantissa = (1 << f32::MANTISSA_SIZE) - 1;
+        for base in BASE_POWN.iter().cloned() {
+            let (min_exp, max_exp) = f32::exponent_limit(base);
+            for exp in min_exp..max_exp+1 {
+                let valid = fast_path::<f32>(mantissa, base, exp).is_some();
+                assert!(valid, "should be valid {:?}.", (mantissa, base, exp));
+            }
+        }
+
+        // Check slightly above valid exponents
+        let f = fast_path::<f32>(123, 10, 15);
+        assert_eq!(f, Some(1.23e+17));
+
+        // Exponent is 1 too high, pushes over the mantissa.
+        let f = fast_path::<f32>(123, 10, 16);
+        assert!(f.is_none());
+
+        // Mantissa is too large, checked_mul should overflow.
+        let f = fast_path::<f32>(mantissa, 10, 11);
+        assert!(f.is_none());
+
+        // invalid mantissa
+        #[cfg(feature = "radix")] {
+            let (_, max_exp) = f64::exponent_limit(3);
+            let f = fast_path::<f32>(1<<f32::MANTISSA_SIZE, 3, max_exp+1);
+            assert!(f.is_none(), "invalid mantissa");
+        }
+
+        // invalid exponents
+        for base in BASE_POWN.iter().cloned() {
+            let (min_exp, max_exp) = f32::exponent_limit(base);
+            let f = fast_path::<f32>(mantissa, base, min_exp-1);
+            assert!(f.is_none(), "exponent under min_exp");
+
+            let f = fast_path::<f32>(mantissa, base, max_exp+1);
+            assert!(f.is_none(), "exponent above max_exp");
+        }
+    }
+
+    #[test]
+    fn double_fast_path_test() {
+        // valid
+        let mantissa = (1 << f64::MANTISSA_SIZE) - 1;
+        for base in BASE_POWN.iter().cloned() {
+            let (min_exp, max_exp) = f64::exponent_limit(base);
+            for exp in min_exp..max_exp+1 {
+                let f = fast_path::<f64>(mantissa, base, exp);
+                assert!(f.is_some(), "should be valid {:?}.", (mantissa, base, exp));
+            }
+        }
+
+        // invalid mantissa
+        #[cfg(feature = "radix")] {
+            let (_, max_exp) = f64::exponent_limit(3);
+            let f = fast_path::<f64>(1<<f64::MANTISSA_SIZE, 3, max_exp+1);
+            assert!(f.is_none(), "invalid mantissa");
+        }
+
+        // invalid exponents
+        for base in BASE_POWN.iter().cloned() {
+            let (min_exp, max_exp) = f64::exponent_limit(base);
+            let f = fast_path::<f64>(mantissa, base, min_exp-1);
+            assert!(f.is_none(), "exponent under min_exp");
+
+            let f = fast_path::<f64>(mantissa, base, max_exp+1);
+            assert!(f.is_none(), "exponent above max_exp");
+        }
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn float_moderate_path_test() {
+        // valid (overflowing small mult)
+        let mantissa: u64 = 1 << 63;
+        let (f, valid) = moderate_path::<f32, _>(mantissa, 3, 1, false, RoundingKind::NearestTieEven);
+        assert_eq!(f.into_f32(), 2.7670116e+19);
+        assert!(valid, "exponent should be valid");
+
+        let mantissa: u64 = 4746067219335938;
+        let (f, valid) = moderate_path::<f32, _>(mantissa, 15, -9, false, RoundingKind::NearestTieEven);
+        assert_eq!(f.into_f32(), 123456.1);
+        assert!(valid, "exponent should be valid");
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn double_moderate_path_test() {
+        // valid (overflowing small mult)
+        let mantissa: u64 = 1 << 63;
+        let (f, valid) = moderate_path::<f64, _>(mantissa, 3, 1, false, RoundingKind::NearestTieEven);
+        assert_eq!(f.into_f64(), 2.7670116110564327e+19);
+        assert!(valid, "exponent should be valid");
+
+        // valid (ends of the earth, salting the earth)
+        let (f, valid) = moderate_path::<f64, _>(mantissa, 3, -695, true, RoundingKind::NearestTieEven);
+        assert_eq!(f.into_f64(), 2.32069302345e-313);
+        assert!(valid, "exponent should be valid");
+
+        // invalid ("268A6.177777778", base 15)
+        let mantissa: u64 = 4746067219335938;
+        let (_, valid) = moderate_path::<f64, _>(mantissa, 15, -9, false, RoundingKind::NearestTieEven);
+        assert!(!valid, "exponent should be invalid");
+
+        // valid ("268A6.177777778", base 15)
+        // 123456.10000000001300614743687445, exactly, should not round up.
+        let mantissa: u128 = 4746067219335938;
+        let (f, valid) = moderate_path::<f64, _>(mantissa, 15, -9, false, RoundingKind::NearestTieEven);
+        assert_eq!(f.into_f64(), 123456.1);
+        assert!(valid, "exponent should be valid");
+
+        // Rounding error
+        // Adapted from test-parse-random failures.
+        let mantissa: u64 = 1009;
+        let (_, valid) = moderate_path::<f64, _>(mantissa, 10, -31, false, RoundingKind::NearestTieEven);
+        assert!(!valid, "exponent should be valid");
+    }
+
+    #[test]
+    fn atof_test() {
+        let atof10 = move |x| match atof(x, 10, false, Sign::Positive, NumberFormat::standard().unwrap()) {
+            Ok((v, p))  => Ok((v, distance(x.as_ptr(), p))),
+            Err((v, p)) => Err((v, distance(x.as_ptr(), p))),
+        };
+
+        assert_eq!(Ok((0.0, 1)), atof10(b"0"));
+        assert_eq!(Ok((1.2345, 6)), atof10(b"1.2345"));
+        assert_eq!(Ok((12.345, 6)), atof10(b"12.345"));
+        assert_eq!(Ok((12345.6789, 10)), atof10(b"12345.6789"));
+        assert_eq!(Ok((1.2345e10, 9)), atof10(b"1.2345e10"));
+        assert_eq!(Ok((1.2345e-38, 10)), atof10(b"1.2345e-38"));
+
+        // Check expected rounding, using borderline cases.
+        // Round-down, halfway
+        assert_eq!(Ok((16777216.0, 8)), atof10(b"16777216"));
+        assert_eq!(Ok((16777216.0, 8)), atof10(b"16777217"));
+        assert_eq!(Ok((16777218.0, 8)), atof10(b"16777218"));
+        assert_eq!(Ok((33554432.0, 8)), atof10(b"33554432"));
+        assert_eq!(Ok((33554432.0, 8)), atof10(b"33554434"));
+        assert_eq!(Ok((33554436.0, 8)), atof10(b"33554436"));
+        assert_eq!(Ok((17179869184.0, 11)), atof10(b"17179869184"));
+        assert_eq!(Ok((17179869184.0, 11)), atof10(b"17179870208"));
+        assert_eq!(Ok((17179871232.0, 11)), atof10(b"17179871232"));
+
+        // Round-up, halfway
+        assert_eq!(Ok((16777218.0, 8)), atof10(b"16777218"));
+        assert_eq!(Ok((16777220.0, 8)), atof10(b"16777219"));
+        assert_eq!(Ok((16777220.0, 8)), atof10(b"16777220"));
+        assert_eq!(Ok((33554436.0, 8)), atof10(b"33554436"));
+        assert_eq!(Ok((33554440.0, 8)), atof10(b"33554438"));
+        assert_eq!(Ok((33554440.0, 8)), atof10(b"33554440"));
+        assert_eq!(Ok((17179871232.0, 11)), atof10(b"17179871232"));
+        assert_eq!(Ok((17179873280.0, 11)), atof10(b"17179872256"));
+        assert_eq!(Ok((17179873280.0, 11)), atof10(b"17179873280"));
+
+        // Round-up, above halfway
+        assert_eq!(Ok((33554436.0, 8)), atof10(b"33554435"));
+        assert_eq!(Ok((17179871232.0, 11)), atof10(b"17179870209"));
+
+        // Check exactly halfway, round-up at halfway
+        assert_eq!(Ok((1.0000001, 28)), atof10(b"1.00000017881393432617187499"));
+        assert_eq!(Ok((1.0000002, 26)), atof10(b"1.000000178813934326171875"));
+        assert_eq!(Ok((1.0000002, 28)), atof10(b"1.00000017881393432617187501"));
+
+        // Invalid or partially-parsed
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0)), atof10(b"e10"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0)), atof10(b"."));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0)), atof10(b".e10"));
+        assert_eq!(Err((ErrorCode::EmptyExponent, 2)), atof10(b"0e"));
+        assert_eq!(Ok((1.23, 4)), atof10(b"1.23/"));
+    }
+
+    #[test]
+    fn atod_test() {
+        let adod_impl = move | x, r | match atod(x, r, false, Sign::Positive, NumberFormat::standard().unwrap()) {
+            Ok((v, p))  => Ok((v, distance(x.as_ptr(), p))),
+            Err((v, p)) => Err((v, distance(x.as_ptr(), p))),
+        };
+        #[cfg(feature = "radix")]
+        let atod2 = move |x| adod_impl(x, 2);
+        let atod10 = move |x| adod_impl(x, 10);
+
+        assert_eq!(Ok((0.0, 1)), atod10(b"0"));
+        assert_eq!(Ok((1.2345, 6)), atod10(b"1.2345"));
+        assert_eq!(Ok((12.345, 6)), atod10(b"12.345"));
+        assert_eq!(Ok((12345.6789, 10)), atod10(b"12345.6789"));
+        assert_eq!(Ok((1.2345e10, 9)), atod10(b"1.2345e10"));
+        assert_eq!(Ok((1.2345e-308, 11)), atod10(b"1.2345e-308"));
+
+        // Check expected rounding, using borderline cases.
+        // Round-down, halfway
+        assert_eq!(Ok((9007199254740992.0, 16)), atod10(b"9007199254740992"));
+        assert_eq!(Ok((9007199254740992.0, 16)), atod10(b"9007199254740993"));
+        assert_eq!(Ok((9007199254740994.0, 16)), atod10(b"9007199254740994"));
+        assert_eq!(Ok((18014398509481984.0, 17)), atod10(b"18014398509481984"));
+        assert_eq!(Ok((18014398509481984.0, 17)), atod10(b"18014398509481986"));
+        assert_eq!(Ok((18014398509481988.0, 17)), atod10(b"18014398509481988"));
+        assert_eq!(Ok((9223372036854775808.0, 19)), atod10(b"9223372036854775808"));
+        assert_eq!(Ok((9223372036854775808.0, 19)), atod10(b"9223372036854776832"));
+        assert_eq!(Ok((9223372036854777856.0, 19)), atod10(b"9223372036854777856"));
+        assert_eq!(Ok((11417981541647679048466287755595961091061972992.0, 47)), atod10(b"11417981541647679048466287755595961091061972992"));
+        assert_eq!(Ok((11417981541647679048466287755595961091061972992.0, 47)), atod10(b"11417981541647680316116887983825362587765178368"));
+        assert_eq!(Ok((11417981541647681583767488212054764084468383744.0, 47)), atod10(b"11417981541647681583767488212054764084468383744"));
+
+        // Round-up, halfway
+        assert_eq!(Ok((9007199254740994.0, 16)), atod10(b"9007199254740994"));
+        assert_eq!(Ok((9007199254740996.0, 16)), atod10(b"9007199254740995"));
+        assert_eq!(Ok((9007199254740996.0, 16)), atod10(b"9007199254740996"));
+        assert_eq!(Ok((18014398509481988.0, 17)), atod10(b"18014398509481988"));
+        assert_eq!(Ok((18014398509481992.0, 17)), atod10(b"18014398509481990"));
+        assert_eq!(Ok((18014398509481992.0, 17)), atod10(b"18014398509481992"));
+        assert_eq!(Ok((9223372036854777856.0, 19)), atod10(b"9223372036854777856"));
+        assert_eq!(Ok((9223372036854779904.0, 19)), atod10(b"9223372036854778880"));
+        assert_eq!(Ok((9223372036854779904.0, 19)), atod10(b"9223372036854779904"));
+        assert_eq!(Ok((11417981541647681583767488212054764084468383744.0, 47)), atod10(b"11417981541647681583767488212054764084468383744"));
+        assert_eq!(Ok((11417981541647684119068688668513567077874794496.0, 47)), atod10(b"11417981541647682851418088440284165581171589120"));
+        assert_eq!(Ok((11417981541647684119068688668513567077874794496.0, 47)), atod10(b"11417981541647684119068688668513567077874794496"));
+
+        // Round-up, above halfway
+        assert_eq!(Ok((9223372036854777856.0, 19)), atod10(b"9223372036854776833"));
+        assert_eq!(Ok((11417981541647681583767488212054764084468383744.0, 47)), atod10(b"11417981541647680316116887983825362587765178369"));
+
+        // Rounding error
+        // Adapted from failures in strtod.
+        assert_eq!(Ok((2.2250738585072014e-308, 23)), atod10(b"2.2250738585072014e-308"));
+        assert_eq!(Ok((2.225073858507201e-308, 776)), atod10(b"2.2250738585072011360574097967091319759348195463516456480234261097248222220210769455165295239081350879141491589130396211068700864386945946455276572074078206217433799881410632673292535522868813721490129811224514518898490572223072852551331557550159143974763979834118019993239625482890171070818506906306666559949382757725720157630626906633326475653000092458883164330377797918696120494973903778297049050510806099407302629371289589500035837999672072543043602840788957717961509455167482434710307026091446215722898802581825451803257070188608721131280795122334262883686223215037756666225039825343359745688844239002654981983854879482922068947216898310996983658468140228542433306603398508864458040010349339704275671864433837704860378616227717385456230658746790140867233276367187499e-308"));
+        assert_eq!(Ok((2.2250738585072014e-308, 774)), atod10(b"2.22507385850720113605740979670913197593481954635164564802342610972482222202107694551652952390813508791414915891303962110687008643869459464552765720740782062174337998814106326732925355228688137214901298112245145188984905722230728525513315575501591439747639798341180199932396254828901710708185069063066665599493827577257201576306269066333264756530000924588831643303777979186961204949739037782970490505108060994073026293712895895000358379996720725430436028407889577179615094551674824347103070260914462157228988025818254518032570701886087211312807951223342628836862232150377566662250398253433597456888442390026549819838548794829220689472168983109969836584681402285424333066033985088644580400103493397042756718644338377048603786162277173854562306587467901408672332763671875e-308"));
+        assert_eq!(Ok((2.2250738585072014e-308, 776)), atod10(b"2.2250738585072011360574097967091319759348195463516456480234261097248222220210769455165295239081350879141491589130396211068700864386945946455276572074078206217433799881410632673292535522868813721490129811224514518898490572223072852551331557550159143974763979834118019993239625482890171070818506906306666559949382757725720157630626906633326475653000092458883164330377797918696120494973903778297049050510806099407302629371289589500035837999672072543043602840788957717961509455167482434710307026091446215722898802581825451803257070188608721131280795122334262883686223215037756666225039825343359745688844239002654981983854879482922068947216898310996983658468140228542433306603398508864458040010349339704275671864433837704860378616227717385456230658746790140867233276367187501e-308"));
+        assert_eq!(Ok((1.7976931348623157e+308, 380)), atod10(b"179769313486231580793728971405303415079934132710037826936173778980444968292764750946649017977587207096330286416692887910946555547851940402630657488671505820681908902000708383676273854845817711531764475730270069855571366959622842914819860834936475292719074168444365510704342711559699508093042880177904174497791.9999999999999999999999999999999999999999999999999999999999999999999999"));
+        assert_eq!(Ok((5e-324, 761)), atod10(b"7.4109846876186981626485318930233205854758970392148714663837852375101326090531312779794975454245398856969484704316857659638998506553390969459816219401617281718945106978546710679176872575177347315553307795408549809608457500958111373034747658096871009590975442271004757307809711118935784838675653998783503015228055934046593739791790738723868299395818481660169122019456499931289798411362062484498678713572180352209017023903285791732520220528974020802906854021606612375549983402671300035812486479041385743401875520901590172592547146296175134159774938718574737870961645638908718119841271673056017045493004705269590165763776884908267986972573366521765567941072508764337560846003984904972149117463085539556354188641513168478436313080237596295773983001708984374999e-324"));
+        assert_eq!(Ok((1e-323, 758)), atod10(b"7.4109846876186981626485318930233205854758970392148714663837852375101326090531312779794975454245398856969484704316857659638998506553390969459816219401617281718945106978546710679176872575177347315553307795408549809608457500958111373034747658096871009590975442271004757307809711118935784838675653998783503015228055934046593739791790738723868299395818481660169122019456499931289798411362062484498678713572180352209017023903285791732520220528974020802906854021606612375549983402671300035812486479041385743401875520901590172592547146296175134159774938718574737870961645638908718119841271673056017045493004705269590165763776884908267986972573366521765567941072508764337560846003984904972149117463085539556354188641513168478436313080237596295773983001708984375e-324"));
+        assert_eq!(Ok((1e-323, 761)), atod10(b"7.4109846876186981626485318930233205854758970392148714663837852375101326090531312779794975454245398856969484704316857659638998506553390969459816219401617281718945106978546710679176872575177347315553307795408549809608457500958111373034747658096871009590975442271004757307809711118935784838675653998783503015228055934046593739791790738723868299395818481660169122019456499931289798411362062484498678713572180352209017023903285791732520220528974020802906854021606612375549983402671300035812486479041385743401875520901590172592547146296175134159774938718574737870961645638908718119841271673056017045493004705269590165763776884908267986972573366521765567941072508764337560846003984904972149117463085539556354188641513168478436313080237596295773983001708984375001e-324"));
+
+        // Rounding error
+        // Adapted from:
+        //  https://www.exploringbinary.com/glibc-strtod-incorrectly-converts-2-to-the-negative-1075/
+        #[cfg(feature = "radix")]
+        assert_eq!(Ok((5e-324, 14)), atod2(b"1e-10000110010"));
+
+        #[cfg(feature = "radix")]
+        assert_eq!(Ok((0.0, 14)), atod2(b"1e-10000110011"));
+        assert_eq!(Ok((0.0, 1077)), atod10(b"0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024703282292062327208828439643411068618252990130716238221279284125033775363510437593264991818081799618989828234772285886546332835517796989819938739800539093906315035659515570226392290858392449105184435931802849936536152500319370457678249219365623669863658480757001585769269903706311928279558551332927834338409351978015531246597263579574622766465272827220056374006485499977096599470454020828166226237857393450736339007967761930577506740176324673600968951340535537458516661134223766678604162159680461914467291840300530057530849048765391711386591646239524912623653881879636239373280423891018672348497668235089863388587925628302755995657524455507255189313690836254779186948667994968324049705821028513185451396213837722826145437693412532098591327667236328125"));
+
+        // Rounding error
+        // Adapted from:
+        //  https://www.exploringbinary.com/how-glibc-strtod-works/
+        assert_eq!(Ok((2.2250738585072011e-308, 1076)), atod10(b"0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022250738585072008890245868760858598876504231122409594654935248025624400092282356951787758888037591552642309780950434312085877387158357291821993020294379224223559819827501242041788969571311791082261043971979604000454897391938079198936081525613113376149842043271751033627391549782731594143828136275113838604094249464942286316695429105080201815926642134996606517803095075913058719846423906068637102005108723282784678843631944515866135041223479014792369585208321597621066375401613736583044193603714778355306682834535634005074073040135602968046375918583163124224521599262546494300836851861719422417646455137135420132217031370496583210154654068035397417906022589503023501937519773030945763173210852507299305089761582519159720757232455434770912461317493580281734466552734375"));
+
+        // Rounding error
+        // Adapted from test-parse-random failures.
+        assert_eq!(Ok((1.009e-28, 8)), atod10(b"1009e-31"));
+        assert_eq!(Ok((f64::INFINITY, 9)), atod10(b"18294e304"));
+
+        // Rounding error
+        // Adapted from a @dangrabcad's issue #20.
+        assert_eq!(Ok((7.689539722041643e164, 21)), atod10(b"7.689539722041643e164"));
+        assert_eq!(Ok((7.689539722041643e164, 165)), atod10(b"768953972204164300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"));
+        assert_eq!(Ok((7.689539722041643e164, 167)), atod10(b"768953972204164300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0"));
+
+        // Check other cases similar to @dangrabcad's issue #20.
+        assert_eq!(Ok((9223372036854777856.0, 21)), atod10(b"9223372036854776833.0"));
+        assert_eq!(Ok((11417981541647681583767488212054764084468383744.0, 49)), atod10(b"11417981541647680316116887983825362587765178369.0"));
+        assert_eq!(Ok((9007199254740996.0, 18)), atod10(b"9007199254740995.0"));
+        assert_eq!(Ok((18014398509481992.0, 19)), atod10(b"18014398509481990.0"));
+        assert_eq!(Ok((9223372036854779904.0, 21)), atod10(b"9223372036854778880.0"));
+        assert_eq!(Ok((11417981541647684119068688668513567077874794496.0, 49)), atod10(b"11417981541647682851418088440284165581171589120.0"));
+
+        // Check other cases ostensibly identified via proptest.
+        assert_eq!(Ok((71610528364411830000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0, 310)), atod10(b"71610528364411830000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0"));
+        assert_eq!(Ok((126769393745745060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0, 311)), atod10(b"126769393745745060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0"));
+        assert_eq!(Ok((38652960461239320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0, 310)), atod10(b"38652960461239320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0"));
+    }
+
+    #[test]
+    fn atof_lossy_test() {
+        let atof10 = move |x| match atof(x, 10, true, Sign::Positive, NumberFormat::standard().unwrap()) {
+            Ok((v, p))  => Ok((v, distance(x.as_ptr(), p))),
+            Err((v, p)) => Err((v, distance(x.as_ptr(), p))),
+        };
+
+        assert_eq!(Ok((1.2345, 6)), atof10(b"1.2345"));
+        assert_eq!(Ok((12.345, 6)), atof10(b"12.345"));
+        assert_eq!(Ok((12345.6789, 10)), atof10(b"12345.6789"));
+        assert_eq!(Ok((1.2345e10, 9)), atof10(b"1.2345e10"));
+    }
+
+    #[test]
+    fn atod_lossy_test() {
+        let atod10 = move |x| match atod(x, 10, true, Sign::Positive, NumberFormat::standard().unwrap()) {
+            Ok((v, p))  => Ok((v, distance(x.as_ptr(), p))),
+            Err((v, p)) => Err((v, distance(x.as_ptr(), p))),
+        };
+
+        assert_eq!(Ok((1.2345, 6)), atod10(b"1.2345"));
+        assert_eq!(Ok((12.345, 6)), atod10(b"12.345"));
+        assert_eq!(Ok((12345.6789, 10)), atod10(b"12345.6789"));
+        assert_eq!(Ok((1.2345e10, 9)), atod10(b"1.2345e10"));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/errors.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/errors.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/errors.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/errors.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,204 @@
+//! Estimate the error in an 80-bit approximation of a float.
+//!
+//! This estimates the error in a floating-point representation.
+//!
+//! This implementation is loosely based off the Golang implementation,
+//! found here:
+//!     https://golang.org/src/strconv/atof.go
+
+use crate::float::*;
+use crate::util::*;
+
+pub trait FloatErrors: Mantissa {
+    /// Get the full error scale.
+    fn error_scale() -> u32;
+    /// Get the half error scale.
+    fn error_halfscale() -> u32;
+    /// Determine if the number of errors is tolerable for float precision.
+    fn error_is_accurate<F: Float>(count: u32, fp: &ExtendedFloat<Self>, kind: RoundingKind) -> bool;
+}
+
+perftools_inline!{
+/// Check if the error is accurate with a round-nearest rounding scheme.
+fn nearest_error_is_accurate(errors: u64, fp: &ExtendedFloat<u64>, extrabits: u64)
+    -> bool
+{
+    // Round-to-nearest, need to use the halfway point.
+    if extrabits == 65 {
+        // Underflow, we have a shift larger than the mantissa.
+        // Representation is valid **only** if the value is close enough
+        // overflow to the next bit within errors. If it overflows,
+        // the representation is **not** valid.
+        !fp.mant.overflowing_add(errors).1
+    } else {
+        let mask: u64 = lower_n_mask(extrabits);
+        let extra: u64 = fp.mant & mask;
+
+        // Round-to-nearest, need to check if we're close to halfway.
+        // IE, b10100 | 100000, where `|` signifies the truncation point.
+        let halfway: u64 = lower_n_halfway(extrabits);
+        let cmp1 = halfway.wrapping_sub(errors) < extra;
+        let cmp2 = extra < halfway.wrapping_add(errors);
+
+        // If both comparisons are true, we have significant rounding error,
+        // and the value cannot be exactly represented. Otherwise, the
+        // representation is valid.
+        !(cmp1 && cmp2)
+    }
+}}
+
+perftools_inline!{
+/// Check if the error is accurate with a round-toward rounding scheme.
+#[cfg(feature = "rounding")]
+fn toward_error_is_accurate(errors: u64, fp: &ExtendedFloat<u64>, extrabits: u64)
+    -> bool
+{
+    if extrabits == 65 {
+        // Underflow, we have a literal 0.
+        true
+    } else {
+        let mask: u64 = lower_n_mask(extrabits);
+        let extra: u64 = fp.mant & mask;
+
+        // Round-towards, need to use `1 << extrabits`.
+        if extrabits == 64 {
+            // Round toward something, we need to check if either operation can overflow,
+            // since we cannot exactly represent the comparison point as the type
+            // in question.
+            let cmp1 = extra.checked_sub(errors).is_none();
+            let cmp2 = extra.checked_add(errors).is_none();
+            // If either comparison is true, we have significant rounding error,
+            // since we cannot distinguish the value (1 << 64).
+            cmp1 || cmp2
+        } else {
+            // Round toward something, need to check if we're close to
+            // IE, b10101 | 000000, where `|` signifies the truncation point.
+            // If the extract bits +/- the error can overflow, then  we have
+            // an issue.
+            let fullway: u64 = nth_bit(extrabits);
+            let cmp1 = fullway.wrapping_sub(errors) < extra;
+            let cmp2 = extra < fullway.wrapping_add(errors);
+
+            // If both comparisons are true, we have significant rounding error,
+            // and the value cannot be exactly represented. Otherwise, the
+            // representation is valid.
+            !(cmp1 && cmp2)
+        }
+    }
+}}
+
+impl FloatErrors for u64 {
+    perftools_inline!{
+    fn error_scale() -> u32 {
+        8
+    }}
+
+    perftools_inline!{
+    fn error_halfscale() -> u32 {
+        u64::error_scale() / 2
+    }}
+
+    perftools_inline!{
+    #[allow(unused_variables)]
+    fn error_is_accurate<F: Float>(count: u32, fp: &ExtendedFloat<u64>, kind: RoundingKind)
+        -> bool
+    {
+        // Determine if extended-precision float is a good approximation.
+        // If the error has affected too many units, the float will be
+        // inaccurate, or if the representation is too close to halfway
+        // that any operations could affect this halfway representation.
+        // See the documentation for dtoa for more information.
+        let bias = -(F::EXPONENT_BIAS - F::MANTISSA_SIZE);
+        let denormal_exp = bias - 63;
+        // This is always a valid u32, since (denormal_exp - fp.exp)
+        // will always be positive and the significand size is {23, 52}.
+        let extrabits = match fp.exp <= denormal_exp {
+            true  => 64 - F::MANTISSA_SIZE + denormal_exp - fp.exp,
+            false => 63 - F::MANTISSA_SIZE,
+        };
+
+        // Our logic is as follows: we want to determine if the actual
+        // mantissa and the errors during calculation differ significantly
+        // from the rounding point. The rounding point for round-nearest
+        // is the halfway point, IE, this when the truncated bits start
+        // with b1000..., while the rounding point for the round-toward
+        // is when the truncated bits are equal to 0.
+        // To do so, we can check whether the rounding point +/- the error
+        // are >/< the actual lower n bits.
+        //
+        // For whether we need to use signed or unsigned types for this
+        // analysis, see this example, using u8 rather than u64 to simplify
+        // things.
+        //
+        // # Comparisons
+        //      cmp1 = (halfway - errors) < extra
+        //      cmp1 = extra < (halfway + errors)
+        //
+        // # Large Extrabits, Low Errors
+        //
+        //      extrabits = 8
+        //      halfway          =  0b10000000
+        //      extra            =  0b10000010
+        //      errors           =  0b00000100
+        //      halfway - errors =  0b01111100
+        //      halfway + errors =  0b10000100
+        //
+        //      Unsigned:
+        //          halfway - errors = 124
+        //          halfway + errors = 132
+        //          extra            = 130
+        //          cmp1             = true
+        //          cmp2             = true
+        //      Signed:
+        //          halfway - errors = 124
+        //          halfway + errors = -124
+        //          extra            = -126
+        //          cmp1             = false
+        //          cmp2             = true
+        //
+        // # Conclusion
+        //
+        // Since errors will always be small, and since we want to detect
+        // if the representation is accurate, we need to use an **unsigned**
+        // type for comparisons.
+
+        let extrabits = extrabits.as_u64();
+        let errors = count.as_u64();
+        if extrabits > 65 {
+            // Underflow, we have a literal 0.
+            return true;
+        }
+
+        #[cfg(not(feature = "rounding"))] {
+            nearest_error_is_accurate(errors, fp, extrabits)
+        }
+
+        #[cfg(feature = "rounding")] {
+            if is_nearest(kind) {
+                nearest_error_is_accurate(errors, fp, extrabits)
+            } else {
+                toward_error_is_accurate(errors, fp, extrabits)
+            }
+        }
+    }}
+}
+
+// 128-bit representation is always accurate, ignore this.
+impl FloatErrors for u128 {
+    perftools_inline!{
+    fn error_scale() -> u32 {
+        0
+    }}
+
+    perftools_inline!{
+    fn error_halfscale() -> u32 {
+        0
+    }}
+
+    perftools_inline!{
+    fn error_is_accurate<F: Float>(_: u32, _: &ExtendedFloat<u128>, _: RoundingKind) -> bool {
+        // Ignore the halfway problem, use more bits to aim for accuracy,
+        // but short-circuit to avoid extremely slow operations.
+        true
+    }}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/exponent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/exponent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/exponent.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/exponent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,801 @@
+//! Utilities to parse, extract, and interpret exponent components.
+
+use crate::atoi;
+use crate::lib::slice;
+use crate::util::*;
+use super::traits::*;
+
+/// The actual float-type doesn't matter, it just needs to be used for
+/// signed/unsigned detection during sign parsing.
+type FloatType = f64;
+
+// EXPONENT CALCULATION
+
+// Calculate the scientific notation exponent without overflow.
+//
+// For example, 0.1 would be -1, and 10 would be 1 in base 10.
+perftools_inline!{
+#[cfg(feature = "correct")]
+pub(super) fn scientific_exponent(exponent: i32, integer_digits: usize, fraction_start: usize)
+    -> i32
+{
+    if integer_digits == 0 {
+        let fraction_start = fraction_start.try_i32_or_max();
+        exponent.saturating_sub(fraction_start).saturating_sub(1)
+    } else {
+        let integer_shift = (integer_digits - 1).try_i32_or_max();
+        exponent.saturating_add(integer_shift)
+    }
+}}
+
+// Calculate the mantissa exponent without overflow.
+//
+// Remove the number of digits that contributed to the mantissa past
+// the dot, and add the number of truncated digits from the mantissa,
+// to calculate the scaling factor for the mantissa from a raw exponent.
+perftools_inline!{
+#[cfg(feature = "correct")]
+pub(super) fn mantissa_exponent(raw_exponent: i32, fraction_digits: usize, truncated: usize)
+    -> i32
+{
+    if fraction_digits > truncated {
+        raw_exponent.saturating_sub((fraction_digits - truncated).try_i32_or_max())
+    } else {
+        raw_exponent.saturating_add((truncated - fraction_digits).try_i32_or_max())
+    }
+}}
+
+// EXPONENT EXTRACTORS
+
+// Extract exponent substring and parse exponent.
+// Uses an abstract iterator to allow generic implementations
+// iterators to work. This only works with greedy iterators, where we
+// know exactly when we should stop upon encountering a given character.
+//
+// Precondition:
+//      Iter should not implement ConsumedIterator, since it would break
+//      the assumption in `extract_exponent_iltc`.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn extract_and_parse_exponent<'a, Data, Iter>(
+    data: &mut Data,
+    iter: Iter,
+    bytes: &'a [u8],
+    radix: u32,
+    sign: Sign
+)
+    -> &'a [u8]
+    where Data: FastDataInterface<'a>,
+          Iter: AsPtrIterator<'a, u8>
+{
+    let (raw_exponent, ptr) = atoi::standalone_exponent(iter, radix, sign);
+    data.set_raw_exponent(raw_exponent);
+
+    unsafe {
+        // Extract the exponent subslice.
+        let first = bytes.as_ptr();
+        data.set_exponent(Some(slice::from_raw_parts(first, distance(first, ptr))));
+
+        // Return the remaining bytes.
+        let last = index!(bytes[bytes.len()..]).as_ptr();
+        slice::from_raw_parts(ptr, distance(ptr, last))
+    }
+}}
+
+// Parse exponent.
+// This only works with exponents that may contain digit separators,
+// where the invalid (trailing) data has already been determined.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn parse_exponent<'a, Data>(
+    data: &mut Data,
+    bytes: &'a [u8],
+    leading: &'a [u8],
+    trailing: &'a [u8],
+    radix: u32,
+    digit_separator: u8,
+    sign: Sign
+)
+    where Data: FastDataInterface<'a>
+{
+    // Get an iterator over our digits and sign bits, and parse the exponent.
+    let iter = iterate_digits_ignore_separator(leading, digit_separator);
+
+    // Parse the exponent and store the extracted digits.
+    let bytes_len = bytes.len() - trailing.len();
+    data.set_raw_exponent(atoi::standalone_exponent(iter, radix, sign).0);
+    data.set_exponent(Some(&index!(bytes[..bytes_len])));
+}}
+
+// PARSE THEN EXTRACT
+
+// These algorithms are slightly more efficient, since they only
+// require a single pass of the exponent string. These algorithms
+// must be able to parse until they reach an invalid character,
+// without any backsteps to find the correct subslice, that is,
+// they must be greedy.
+
+// Extract exponent substring and parse exponent.
+// Does not consume any digit separators.
+perftools_inline!{
+fn extract_exponent<'a, Data>(
+    data: &mut Data,
+    bytes: &'a [u8],
+    radix: u32,
+    digit_separator: u8
+)
+    -> &'a [u8]
+    where Data: FastDataInterface<'a>
+{
+    // Remove leading exponent character and parse exponent.
+    let bytes = &index!(bytes[1..]);
+    let (sign, digits) = parse_sign_no_separator::<FloatType>(bytes, digit_separator);
+    let iter = iterate_digits_no_separator(digits, digit_separator);
+    extract_and_parse_exponent(data, iter, bytes, radix, sign)
+}}
+
+// Extract exponent substring and parse exponent.
+// Consumes leading, internal, trailing, and consecutive digit separators.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn extract_exponent_iltc<'a, Data>(
+    data: &mut Data,
+    bytes: &'a [u8],
+    radix: u32,
+    digit_separator: u8
+)
+    -> &'a [u8]
+    where Data: FastDataInterface<'a>
+{
+    // Remove leading exponent character and parse exponent.
+    // We're not calling `consumed()`, so it's fine to have trailing underscores.
+    let bytes = &index!(bytes[1..]);
+    let (sign, digits) = parse_sign_lc_separator::<FloatType>(bytes, digit_separator);
+    let iter = iterate_digits_ignore_separator(digits, digit_separator);
+    extract_and_parse_exponent(data, iter, bytes, radix, sign)
+}}
+
+// EXTRACT THEN PARSE
+
+// These algorithms are less efficient, since they first extract the
+// subslice of valid data in the exponent, and then parse it,
+// using 2 passes over the input data. However, because they first extract
+// the data, they allow consumers that are not greedy, where there may
+// be backsteps to determine if an input is actually valid after reaching
+// the end or an invalid character.
+
+// Generate function definition to extraction exponent with digit separators.
+macro_rules! extract_exponent_separator {
+    (
+        fn $name:ident,
+        sign => $sign:ident,
+        consume => $consume:ident
+    ) => (
+        perftools_inline!{
+        #[cfg(feature = "format")]
+        fn $name<'a, Data>(
+            data: &mut Data,
+            bytes: &'a [u8],
+            radix: u32,
+            digit_separator: u8
+        )
+            -> &'a [u8]
+            where Data: FastDataInterface<'a>
+        {
+            let bytes = &index!(bytes[1..]);
+            let (sign, digits) = $sign::<FloatType>(bytes, digit_separator);
+            let (leading, trailing) = $consume(digits, radix, digit_separator);
+            parse_exponent(data, bytes, leading, trailing, radix, digit_separator, sign);
+
+            trailing
+        }}
+    );
+}
+
+extract_exponent_separator!(
+    fn extract_exponent_i,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_i
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_ic,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_ic
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_l,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_l
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_lc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_lc
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_t,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_t
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_tc,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_tc
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_il,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_il
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_ilc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_ilc
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_it,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_it
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_itc,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_itc
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_lt,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_lt
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_ltc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_ltc
+);
+
+extract_exponent_separator!(
+    fn extract_exponent_ilt,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_ilt
+);
+
+// API
+
+// Extract exponent without a digit separator.
+perftools_inline!{
+pub(crate) fn extract_exponent_no_separator<'a, Data>(data: &mut Data, bytes: &'a [u8], radix: u32, format: NumberFormat)
+    -> &'a [u8]
+    where Data: FastDataInterface<'a>
+{
+    extract_exponent(data, bytes, radix, format.digit_separator())
+}}
+
+// Extract exponent while ignoring the digit separator.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(crate) fn extract_exponent_ignore_separator<'a, Data>(data: &mut Data, bytes: &'a [u8], radix: u32, format: NumberFormat)
+    -> &'a [u8]
+    where Data: FastDataInterface<'a>
+{
+    extract_exponent_iltc(data, bytes, radix, format.digit_separator())
+}}
+
+// Extract exponent with a digit separator in the exponent component.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn extract_exponent_separator<'a, Data>(data: &mut Data, bytes: &'a [u8], radix: u32, format: NumberFormat)
+    -> &'a [u8]
+    where Data: FastDataInterface<'a>
+{
+    const I: NumberFormat = NumberFormat::EXPONENT_INTERNAL_DIGIT_SEPARATOR;
+    const L: NumberFormat = NumberFormat::EXPONENT_LEADING_DIGIT_SEPARATOR;
+    const T: NumberFormat = NumberFormat::EXPONENT_TRAILING_DIGIT_SEPARATOR;
+    const C: NumberFormat = NumberFormat::EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR;
+    const IL: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | L.bits());
+    const IT: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | T.bits());
+    const LT: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | T.bits());
+    const ILT: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | T.bits());
+    const IC: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | C.bits());
+    const LC: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | C.bits());
+    const TC: NumberFormat = NumberFormat::from_bits_truncate(T.bits() | C.bits());
+    const ILC: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | C.bits());
+    const ITC: NumberFormat = NumberFormat::from_bits_truncate(IT.bits() | C.bits());
+    const LTC: NumberFormat = NumberFormat::from_bits_truncate(LT.bits() | C.bits());
+    const ILTC: NumberFormat = NumberFormat::from_bits_truncate(ILT.bits() | C.bits());
+
+    let digit_separator = format.digit_separator();
+    match format & NumberFormat::EXPONENT_DIGIT_SEPARATOR_FLAG_MASK {
+        I       => extract_exponent_i(data, bytes, radix, digit_separator),
+        IC      => extract_exponent_ic(data, bytes, radix, digit_separator),
+        L       => extract_exponent_l(data, bytes, radix, digit_separator),
+        LC      => extract_exponent_lc(data, bytes, radix, digit_separator),
+        T       => extract_exponent_t(data, bytes, radix, digit_separator),
+        TC      => extract_exponent_tc(data, bytes, radix, digit_separator),
+        IL      => extract_exponent_il(data, bytes, radix, digit_separator),
+        ILC     => extract_exponent_ilc(data, bytes, radix, digit_separator),
+        IT      => extract_exponent_it(data, bytes, radix, digit_separator),
+        ITC     => extract_exponent_itc(data, bytes, radix, digit_separator),
+        LT      => extract_exponent_lt(data, bytes, radix, digit_separator),
+        LTC     => extract_exponent_ltc(data, bytes, radix, digit_separator),
+        ILT     => extract_exponent_ilt(data, bytes, radix, digit_separator),
+        ILTC    => extract_exponent_iltc(data, bytes, radix, digit_separator),
+        _       => unreachable!()
+    }
+}}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use super::super::standard::*;
+
+    #[cfg(feature = "format")]
+    use super::super::ignore::*;
+
+    #[cfg(feature = "correct")]
+    #[test]
+    fn scientific_exponent_test() {
+        // 0 digits in the integer
+        assert_eq!(scientific_exponent(0, 0, 5), -6);
+        assert_eq!(scientific_exponent(10, 0, 5), 4);
+        assert_eq!(scientific_exponent(-10, 0, 5), -16);
+
+        // >0 digits in the integer
+        assert_eq!(scientific_exponent(0, 1, 5), 0);
+        assert_eq!(scientific_exponent(0, 2, 5), 1);
+        assert_eq!(scientific_exponent(0, 2, 20), 1);
+        assert_eq!(scientific_exponent(10, 2, 20), 11);
+        assert_eq!(scientific_exponent(-10, 2, 20), -9);
+
+        // Underflow
+        assert_eq!(scientific_exponent(i32::min_value(), 0, 0), i32::min_value());
+        assert_eq!(scientific_exponent(i32::min_value(), 0, 5), i32::min_value());
+
+        // Overflow
+        assert_eq!(scientific_exponent(i32::max_value(), 0, 0), i32::max_value()-1);
+        assert_eq!(scientific_exponent(i32::max_value(), 5, 0), i32::max_value());
+    }
+
+    #[cfg(feature = "correct")]
+    #[test]
+    fn mantissa_exponent_test() {
+        assert_eq!(mantissa_exponent(10, 5, 0), 5);
+        assert_eq!(mantissa_exponent(0, 5, 0), -5);
+        assert_eq!(mantissa_exponent(i32::max_value(), 5, 0), i32::max_value()-5);
+        assert_eq!(mantissa_exponent(i32::max_value(), 0, 5), i32::max_value());
+        assert_eq!(mantissa_exponent(i32::min_value(), 5, 0), i32::min_value());
+        assert_eq!(mantissa_exponent(i32::min_value(), 0, 5), i32::min_value()+5);
+    }
+
+    #[test]
+    fn extract_exponent_test() {
+        // Allows present exponents.
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::standard().unwrap());
+        extract_exponent(&mut data, b"e+23", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+23")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::standard().unwrap());
+        extract_exponent(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_iltc_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_iltc(&mut data, b"e__+__2__3____", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("__+__2__3____")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows present exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_iltc(&mut data, b"e__+_2_3_", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("__+_2_3_")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows present exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_iltc(&mut data, b"e_+__2_3_", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_+__2_3_")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_iltc(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_i_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_i(&mut data, b"e+2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2_3")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_i(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_i(&mut data, b"e+_2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_i(&mut data, b"e+2__3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2")));
+        assert_eq!(data.raw_exponent(), 2);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_ic_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ic(&mut data, b"e+2__3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2__3")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ic(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ic(&mut data, b"e+_2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ic(&mut data, b"e_+2__3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_l_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_l(&mut data, b"e+_23", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+_23")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_l(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_l(&mut data, b"e+_2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+_2")));
+        assert_eq!(data.raw_exponent(), 2);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_l(&mut data, b"e_+__2__3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_+")));
+        assert_eq!(data.raw_exponent(), 0);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_lc_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_lc(&mut data, b"e+__23", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+__23")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_lc(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_lc(&mut data, b"e+_2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+_2")));
+        assert_eq!(data.raw_exponent(), 2);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_lc(&mut data, b"e_+__2__3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_+__2")));
+        assert_eq!(data.raw_exponent(), 2);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_t_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_t(&mut data, b"e+23_", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+23_")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_t(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_t(&mut data, b"e+23__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+23")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_t(&mut data, b"e_+__2__3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_")));
+        assert_eq!(data.raw_exponent(), 0);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_tc_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_tc(&mut data, b"e+23__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+23__")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_tc(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_tc(&mut data, b"e+_2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_tc(&mut data, b"e_+__2__3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_")));
+        assert_eq!(data.raw_exponent(), 0);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_il_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_il(&mut data, b"e+_2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+_2_3")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_il(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_il(&mut data, b"e+23__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+23")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_il(&mut data, b"e+2__3__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2")));
+        assert_eq!(data.raw_exponent(), 2);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_ilc_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ilc(&mut data, b"e+__2__3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+__2__3")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ilc(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ilc(&mut data, b"e+23__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+23")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ilc(&mut data, b"e+2__3__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2__3")));
+        assert_eq!(data.raw_exponent(), 23);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_it_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_it(&mut data, b"e+2_3_", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2_3_")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_it(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_it(&mut data, b"e+_23", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_it(&mut data, b"e+2__3__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2")));
+        assert_eq!(data.raw_exponent(), 2);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_itc_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_itc(&mut data, b"e+2__3__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2__3__")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_itc(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_itc(&mut data, b"e+_23", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_itc(&mut data, b"e_+2__3__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_")));
+        assert_eq!(data.raw_exponent(), 0);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_lt_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_lt(&mut data, b"e_+_23_", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_+_23_")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_lt(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_lt(&mut data, b"e+2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2")));
+        assert_eq!(data.raw_exponent(), 2);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_lt(&mut data, b"e__+__2__3__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_ltc_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ltc(&mut data, b"e__+__23__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("__+__23__")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ltc(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ltc(&mut data, b"e+2_3", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("+2")));
+        assert_eq!(data.raw_exponent(), 2);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ltc(&mut data, b"e__+__2__3__", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("__+__2")));
+        assert_eq!(data.raw_exponent(), 2);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn extract_exponent_ilt_test() {
+        // Allows present exponents.
+        type Data<'a> = IgnoreFastDataInterface<'a>;
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ilt(&mut data, b"e_+_2_3_", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_+_2_3_")));
+        assert_eq!(data.raw_exponent(), 23);
+
+        // Allows absent exponents.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ilt(&mut data, b"e", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+        assert_eq!(data.raw_exponent(), 0);
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ilt(&mut data, b"e__+_2_3_", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("")));
+
+        // Ignores invalid data.
+        let mut data = Data::new(NumberFormat::ignore(b'_').unwrap());
+        extract_exponent_ilt(&mut data, b"e_+__2_3_", 10, b'_');
+        assert_eq!(data.exponent(), Some(b!("_+")));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/generic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/generic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/generic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/generic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,349 @@
+//! Generic float-parsing data interfaces.
+
+use crate::util::*;
+use super::exponent::*;
+use super::traits::*;
+use super::trim::*;
+use super::validate::*;
+
+// The following interfaces are named:
+//      Generic*Interface, where * represents any combination of the following:
+//          1). [I]nteger.
+//          2). [F]raction.
+//          3). [E]xponent.
+
+/// Shared definition for all generic fast data interfaces.
+macro_rules! generic_data_interface {
+    (
+        struct $fast:ident,
+        struct $slow:ident,
+        integer_iter => ( $integer_iter:tt, $integer_iter_fn:ident ),
+        fraction_iter => ( $fraction_iter:tt, $fraction_iter_fn:ident ),
+        exponent_iter => ( $exponent_iter:tt, $exponent_iter_fn:ident ),
+        consume_integer_digits => $consume_integer_digits:expr,
+        consume_fraction_digits => $consume_fraction_digits:expr,
+        extract_exponent => $extract_exponent:expr,
+        ltrim_zero => $ltrim_zero:ident,
+        ltrim_separator => $ltrim_separator:ident,
+        rtrim_zero => $rtrim_zero:ident,
+        rtrim_separator => $rtrim_separator:ident
+    ) => {
+        data_interface!(
+            struct $fast,
+            struct $slow,
+            fields => {
+                format: NumberFormat,
+            },
+            integer_iter => ($integer_iter, $integer_iter_fn),
+            fraction_iter => ($fraction_iter, $fraction_iter_fn),
+            exponent_iter => ($exponent_iter, $exponent_iter_fn),
+            format => |this: &Self| this.format,
+            consume_integer_digits => $consume_integer_digits,
+            consume_fraction_digits => $consume_fraction_digits,
+            extract_exponent => $extract_exponent,
+            validate_mantissa => |this: &Self| validate_mantissa(this, this.format),
+            validate_exponent => |this: &Self| validate_exponent(this, this.format),
+            validate_exponent_fraction => |this: &Self| validate_exponent_fraction(this, this.format),
+            validate_exponent_sign => |this: &Self| validate_exponent_sign(this, this.format),
+            ltrim_zero => $ltrim_zero,
+            ltrim_separator => $ltrim_separator,
+            rtrim_zero => $rtrim_zero,
+            rtrim_separator => $rtrim_separator,
+            new => fn new(format: NumberFormat) -> Self {
+                Self {
+                    format: format,
+                    integer: &[],
+                    fraction: None,
+                    exponent: None,
+                    raw_exponent: 0
+                }
+            }
+        );
+    };
+}
+
+// Generic data interface without digit separators.
+generic_data_interface!(
+    struct GenericFastDataInterface,
+    struct GenericSlowDataInterface,
+    integer_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    fraction_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    exponent_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    consume_integer_digits => consume_digits_no_separator,
+    consume_fraction_digits => consume_digits_no_separator,
+    extract_exponent => extract_exponent_no_separator,
+    ltrim_zero => ltrim_zero_no_separator,
+    ltrim_separator => ltrim_separator_no_separator,
+    rtrim_zero => rtrim_zero_no_separator,
+    rtrim_separator => rtrim_separator_no_separator
+);
+
+// Generic data interface with integer digit separators.
+generic_data_interface!(
+    struct GenericIFastDataInterface,
+    struct GenericISlowDataInterface,
+    integer_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    fraction_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    exponent_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    consume_integer_digits => consume_integer_digits_separator,
+    consume_fraction_digits => consume_digits_no_separator,
+    extract_exponent => extract_exponent_no_separator,
+    ltrim_zero => ltrim_zero_separator,
+    ltrim_separator => ltrim_separator_separator,
+    rtrim_zero => rtrim_zero_separator,
+    rtrim_separator => rtrim_separator_separator
+);
+
+// Generic data interface with fraction digit separators.
+generic_data_interface!(
+    struct GenericFFastDataInterface,
+    struct GenericFSlowDataInterface,
+    integer_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    fraction_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    exponent_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    consume_integer_digits => consume_digits_no_separator,
+    consume_fraction_digits => consume_fraction_digits_separator,
+    extract_exponent => extract_exponent_no_separator,
+    ltrim_zero => ltrim_zero_separator,
+    ltrim_separator => ltrim_separator_separator,
+    rtrim_zero => rtrim_zero_separator,
+    rtrim_separator => rtrim_separator_separator
+);
+
+// Generic data interface with exponent digit separators.
+generic_data_interface!(
+    struct GenericEFastDataInterface,
+    struct GenericESlowDataInterface,
+    integer_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    fraction_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    exponent_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    consume_integer_digits => consume_digits_no_separator,
+    consume_fraction_digits => consume_digits_no_separator,
+    extract_exponent => extract_exponent_separator,
+    ltrim_zero => ltrim_zero_no_separator,
+    ltrim_separator => ltrim_separator_no_separator,
+    rtrim_zero => rtrim_zero_no_separator,
+    rtrim_separator => rtrim_separator_no_separator
+);
+
+// Generic data interface with integer and fraction digit separators.
+generic_data_interface!(
+    struct GenericIFFastDataInterface,
+    struct GenericIFSlowDataInterface,
+    integer_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    fraction_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    exponent_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    consume_integer_digits => consume_integer_digits_separator,
+    consume_fraction_digits => consume_fraction_digits_separator,
+    extract_exponent => extract_exponent_no_separator,
+    ltrim_zero => ltrim_zero_separator,
+    ltrim_separator => ltrim_separator_separator,
+    rtrim_zero => rtrim_zero_separator,
+    rtrim_separator => rtrim_separator_separator
+);
+
+// Generic data interface with integer and exponent digit separators.
+generic_data_interface!(
+    struct GenericIEFastDataInterface,
+    struct GenericIESlowDataInterface,
+    integer_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    fraction_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    exponent_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    consume_integer_digits => consume_integer_digits_separator,
+    consume_fraction_digits => consume_digits_no_separator,
+    extract_exponent => extract_exponent_separator,
+    ltrim_zero => ltrim_zero_separator,
+    ltrim_separator => ltrim_separator_separator,
+    rtrim_zero => rtrim_zero_separator,
+    rtrim_separator => rtrim_separator_separator
+);
+
+// Generic data interface with fraction and exponent digit separators.
+generic_data_interface!(
+    struct GenericFEFastDataInterface,
+    struct GenericFESlowDataInterface,
+    integer_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    fraction_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    exponent_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    consume_integer_digits => consume_digits_no_separator,
+    consume_fraction_digits => consume_fraction_digits_separator,
+    extract_exponent => extract_exponent_separator,
+    ltrim_zero => ltrim_zero_separator,
+    ltrim_separator => ltrim_separator_separator,
+    rtrim_zero => rtrim_zero_separator,
+    rtrim_separator => rtrim_separator_separator
+);
+
+// Generic data interface with integer, fraction, and exponent digit separators.
+generic_data_interface!(
+    struct GenericIFEFastDataInterface,
+    struct GenericIFESlowDataInterface,
+    integer_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    fraction_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    exponent_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    consume_integer_digits => consume_integer_digits_separator,
+    consume_fraction_digits => consume_fraction_digits_separator,
+    extract_exponent => extract_exponent_separator,
+    ltrim_zero => ltrim_zero_separator,
+    ltrim_separator => ltrim_separator_separator,
+    rtrim_zero => rtrim_zero_separator,
+    rtrim_separator => rtrim_separator_separator
+);
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    macro_rules! generic {
+        ($cls:ident, $integer:expr, $fraction:expr, $exponent:expr, $raw_exponent:expr) => {
+            $cls {
+                format: NumberFormat::default(),
+                integer: $integer,
+                fraction: $fraction,
+                exponent: $exponent,
+                raw_exponent: $raw_exponent
+            }
+        };
+    }
+
+    #[test]
+    fn extract_test() {
+        type Generic<'a> = GenericFastDataInterface<'a>;
+        let format = NumberFormat::from_separator(b'_');
+        Generic::new(format).run_tests([
+            // Valid
+            ("1.2345", Ok(generic!(Generic, b"1", Some(b!("2345")), None, 0))),
+            ("1009e-31", Ok(generic!(Generic, b"1009", None, Some(b!("-31")), -31))),
+
+            // Invalid
+            ("1.2_345e+10", Ok(generic!(Generic, b"1", Some(b!("2")), None, 0))),
+            ("1_.2_345e+10", Ok(generic!(Generic, b"1", None, None, 0))),
+            ("1.2345e+1_0", Ok(generic!(Generic, b"1", Some(b!("2345")), Some(b!("+1")), 1)))
+        ].iter())
+    }
+
+    #[test]
+    fn extract_i_test() {
+        type Generic<'a> = GenericIFastDataInterface<'a>;
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK;
+        Generic::new(format).run_tests([
+            // Valid
+            ("1.2345", Ok(generic!(Generic, b"1", Some(b!("2345")), None, 0))),
+            ("1009e-31", Ok(generic!(Generic, b"1009", None, Some(b!("-31")), -31))),
+            ("1_.2_345e+10", Ok(generic!(Generic, b"1_", Some(b!("2")), None, 0))),
+
+            // Invalid
+            ("1.2_345e+10", Ok(generic!(Generic, b"1", Some(b!("2")), None, 0))),
+            ("1.2345e+1_0", Ok(generic!(Generic, b"1", Some(b!("2345")), Some(b!("+1")), 1)))
+        ].iter())
+    }
+
+    #[test]
+    fn extract_f_test() {
+        type Generic<'a> = GenericFFastDataInterface<'a>;
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::FRACTION_DIGIT_SEPARATOR_FLAG_MASK;
+        Generic::new(format).run_tests([
+            // Valid
+            ("1.2345", Ok(generic!(Generic, b"1", Some(b!("2345")), None, 0))),
+            ("1009e-31", Ok(generic!(Generic, b"1009", None, Some(b!("-31")), -31))),
+            ("1.2_345e+10", Ok(generic!(Generic, b"1", Some(b!("2_345")), Some(b!("+10")), 10))),
+
+            // Invalid
+            ("1_.2_345e+10", Ok(generic!(Generic, b"1", None, None, 0))),
+            ("1.2345e+1_0", Ok(generic!(Generic, b"1", Some(b!("2345")), Some(b!("+1")), 1)))
+        ].iter())
+    }
+
+    #[test]
+    fn extract_e_test() {
+        type Generic<'a> = GenericEFastDataInterface<'a>;
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::EXPONENT_DIGIT_SEPARATOR_FLAG_MASK;
+        Generic::new(format).run_tests([
+            // Valid
+            ("1.2345", Ok(generic!(Generic, b"1", Some(b!("2345")), None, 0))),
+            ("1009e-31", Ok(generic!(Generic, b"1009", None, Some(b!("-31")), -31))),
+            ("1.2345e+1_0", Ok(generic!(Generic, b"1", Some(b!("2345")), Some(b!("+1_0")), 10))),
+
+            // Invalid
+            ("1_.2_345e+10", Ok(generic!(Generic, b"1", None, None, 0))),
+            ("1.2_345e+10", Ok(generic!(Generic, b"1", Some(b!("2")), None, 0)))
+        ].iter())
+    }
+
+    #[test]
+    fn extract_if_test() {
+        type Generic<'a> = GenericIFFastDataInterface<'a>;
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK
+            | NumberFormat::FRACTION_DIGIT_SEPARATOR_FLAG_MASK;
+        Generic::new(format).run_tests([
+            // Valid
+            ("1.2345", Ok(generic!(Generic, b"1", Some(b!("2345")), None, 0))),
+            ("1009e-31", Ok(generic!(Generic, b"1009", None, Some(b!("-31")), -31))),
+            ("1_.2_345e+10", Ok(generic!(Generic, b"1_", Some(b!("2_345")), Some(b!("+10")), 10))),
+            ("1.2_345e+10", Ok(generic!(Generic, b"1", Some(b!("2_345")), Some(b!("+10")), 10))),
+
+            // Invalid
+            ("1.2345e+1_0", Ok(generic!(Generic, b"1", Some(b!("2345")), Some(b!("+1")), 1)))
+        ].iter())
+    }
+
+    #[test]
+    fn extract_ie_test() {
+        type Generic<'a> = GenericIEFastDataInterface<'a>;
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK
+            | NumberFormat::EXPONENT_DIGIT_SEPARATOR_FLAG_MASK;
+        Generic::new(format).run_tests([
+            // Valid
+            ("1.2345", Ok(generic!(Generic, b"1", Some(b!("2345")), None, 0))),
+            ("1009e-31", Ok(generic!(Generic, b"1009", None, Some(b!("-31")), -31))),
+            ("1_.2345e+10", Ok(generic!(Generic, b"1_", Some(b!("2345")), Some(b!("+10")), 10))),
+            ("1.2345e+1_0", Ok(generic!(Generic, b"1", Some(b!("2345")), Some(b!("+1_0")), 10))),
+
+            // Invalid
+            ("1.2_345e+10", Ok(generic!(Generic, b"1", Some(b!("2")), None, 0)))
+        ].iter())
+    }
+
+    #[test]
+    fn extract_fe_test() {
+        type Generic<'a> = GenericFEFastDataInterface<'a>;
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::FRACTION_DIGIT_SEPARATOR_FLAG_MASK
+            | NumberFormat::EXPONENT_DIGIT_SEPARATOR_FLAG_MASK;
+        Generic::new(format).run_tests([
+            // Valid
+            ("1.2345", Ok(generic!(Generic, b"1", Some(b!("2345")), None, 0))),
+            ("1009e-31", Ok(generic!(Generic, b"1009", None, Some(b!("-31")), -31))),
+            ("1.2_345e+10", Ok(generic!(Generic, b"1", Some(b!("2_345")), Some(b!("+10")), 10))),
+            ("1.2345e+1_0", Ok(generic!(Generic, b"1", Some(b!("2345")), Some(b!("+1_0")), 10))),
+
+            // Invalid
+            ("1_.2345e+10", Ok(generic!(Generic, b"1", None, None, 0)))
+        ].iter())
+    }
+
+    #[test]
+    fn extract_ife_test() {
+        type Generic<'a> = GenericIFEFastDataInterface<'a>;
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK
+            | NumberFormat::FRACTION_DIGIT_SEPARATOR_FLAG_MASK
+            | NumberFormat::EXPONENT_DIGIT_SEPARATOR_FLAG_MASK;
+        Generic::new(format).run_tests([
+            // Valid
+            ("1.2345", Ok(generic!(Generic, b"1", Some(b!("2345")), None, 0))),
+            ("1009e-31", Ok(generic!(Generic, b"1009", None, Some(b!("-31")), -31))),
+            ("1_.2345e+10", Ok(generic!(Generic, b"1_", Some(b!("2345")), Some(b!("+10")), 0))),
+            ("1.2_345e+10", Ok(generic!(Generic, b"1", Some(b!("2_345")), Some(b!("+10")), 10))),
+            ("1.2345e+1_0", Ok(generic!(Generic, b"1", Some(b!("2345")), Some(b!("+1_0")), 10)))
+        ].iter())
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/ignore.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/ignore.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/ignore.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/ignore.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,111 @@
+//! Ignore float-parsing data interface.
+
+use crate::util::*;
+use super::exponent::*;
+use super::traits::*;
+use super::trim::*;
+use super::validate::*;
+
+// Ignore data interface for fast float parsers.
+//
+// Guaranteed to parse `NumberFormat::ignore(digit_separator)`.
+//
+// The requirements:
+//     1). Must contain significant digits.
+data_interface!(
+    struct IgnoreFastDataInterface,
+    struct IgnoreSlowDataInterface,
+    fields => {
+        format: NumberFormat,
+    },
+    integer_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    fraction_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    exponent_iter => (IteratorSeparator, iterate_digits_ignore_separator),
+    format => |this: &Self| this.format,
+    consume_integer_digits => consume_digits_ignore_separator,
+    consume_fraction_digits => consume_digits_ignore_separator,
+    extract_exponent => extract_exponent_ignore_separator,
+    validate_mantissa => validate_permissive_mantissa,
+    validate_exponent => validate_optional_exponent,
+    validate_exponent_fraction => validate_exponent_optional_fraction,
+    validate_exponent_sign => validate_optional_exponent_sign,
+    ltrim_zero => ltrim_zero_separator,
+    ltrim_separator => ltrim_separator_separator,
+    rtrim_zero => rtrim_zero_separator,
+    rtrim_separator => rtrim_separator_separator,
+    new => fn new(format: NumberFormat) -> Self {
+        Self {
+            format,
+            integer: &[],
+            fraction: None,
+            exponent: None,
+            raw_exponent: 0
+        }
+    }
+);
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    macro_rules! ignore {
+        ($integer:expr, $fraction:expr, $exponent:expr, $raw_exponent:expr) => {
+            IgnoreFastDataInterface {
+                format: NumberFormat::ignore(b'_').unwrap(),
+                integer: $integer,
+                fraction: $fraction,
+                exponent: $exponent,
+                raw_exponent: $raw_exponent
+            }
+        };
+    }
+
+    #[test]
+    fn extract_test() {
+        IgnoreFastDataInterface::new(NumberFormat::ignore(b'_').unwrap()).run_tests([
+            // Valid
+            ("1.2345", Ok(ignore!(b"1", Some(b!("2345")), None, 0))),
+            ("12.345", Ok(ignore!(b"12", Some(b!("345")), None, 0))),
+            ("12345.6789", Ok(ignore!(b"12345", Some(b!("6789")), None, 0))),
+            ("1.2345e10", Ok(ignore!(b"1", Some(b!("2345")), Some(b!("10")), 10))),
+            ("1.2345e+10", Ok(ignore!(b"1", Some(b!("2345")), Some(b!("+10")), 10))),
+            ("1.2345e-10", Ok(ignore!(b"1", Some(b!("2345")), Some(b!("-10")), -10))),
+            ("100000000000000000000", Ok(ignore!(b"100000000000000000000", None, None, 0))),
+            ("100000000000000000001", Ok(ignore!(b"100000000000000000001", None, None, 0))),
+            ("179769313486231580793728971405303415079934132710037826936173778980444968292764750946649017977587207096330286416692887910946555547851940402630657488671505820681908902000708383676273854845817711531764475730270069855571366959622842914819860834936475292719074168444365510704342711559699508093042880177904174497791.9999999999999999999999999999999999999999999999999999999999999999999999", Ok(ignore!(b"179769313486231580793728971405303415079934132710037826936173778980444968292764750946649017977587207096330286416692887910946555547851940402630657488671505820681908902000708383676273854845817711531764475730270069855571366959622842914819860834936475292719074168444365510704342711559699508093042880177904174497791", Some(b!("9999999999999999999999999999999999999999999999999999999999999999999999")), None, 0))),
+            ("1009e-31", Ok(ignore!(b"1009", None, Some(b!("-31")), -31))),
+            ("001.0", Ok(ignore!(b"1", Some(b!("")), None, 0))),
+            ("1.", Ok(ignore!(b"1", Some(b!("")), None, 0))),
+            ("12.", Ok(ignore!(b"12", Some(b!("")), None, 0))),
+            ("1234567.", Ok(ignore!(b"1234567", Some(b!("")), None, 0))),
+            (".1", Ok(ignore!(b"", Some(b!("1")), None, 0))),
+            (".12", Ok(ignore!(b"", Some(b!("12")), None, 0))),
+            (".1234567", Ok(ignore!(b"", Some(b!("1234567")), None, 0))),
+            ("1.2345e", Ok(ignore!(b"1", Some(b!("2345")), Some(b!("")), 0))),
+            (".3e", Ok(ignore!(b"", Some(b!("3")), Some(b!("")), 0))),
+            ("_1.2345_e_+_10", Ok(ignore!(b"1", Some(b!("2345")), Some(b!("_+_10")), 10))),
+            ("12__1_._23__45e+1__0_", Ok(ignore!(b"12__1_", Some(b!("_23__45")), Some(b!("+1__0_")), 10))),
+
+            // Invalid
+            ("", Err(ErrorCode::EmptyMantissa)),
+            ("+", Err(ErrorCode::EmptyMantissa)),
+            ("-", Err(ErrorCode::EmptyMantissa)),
+            (".", Err(ErrorCode::EmptyMantissa)),
+            ("+.", Err(ErrorCode::EmptyMantissa)),
+            ("-.", Err(ErrorCode::EmptyMantissa)),
+            ("e", Err(ErrorCode::EmptyMantissa)),
+            ("E", Err(ErrorCode::EmptyMantissa)),
+            ("e1", Err(ErrorCode::EmptyMantissa)),
+            ("e+1", Err(ErrorCode::EmptyMantissa)),
+            ("e-1", Err(ErrorCode::EmptyMantissa)),
+            (".e", Err(ErrorCode::EmptyMantissa)),
+            (".E", Err(ErrorCode::EmptyMantissa)),
+            (".e1", Err(ErrorCode::EmptyMantissa)),
+            (".e+1", Err(ErrorCode::EmptyMantissa)),
+            (".e-1", Err(ErrorCode::EmptyMantissa)),
+        ].iter());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/interface.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/interface.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/interface.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/interface.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+//! High-level data interface utilities.
+
+/// Convert format to interface, and call function with new item as first argument.
+#[cfg(not(feature = "format"))]
+macro_rules! apply_interface {
+    ($fn:ident, $format:expr $(,$args:ident)*) => {
+        $fn(StandardFastDataInterface::new($format) $(,$args)*)
+    };
+}
+
+/// Convert format to interface, and call function with new item as first argument.
+#[cfg(feature = "format")]
+macro_rules! apply_interface {
+    ($fn:ident, $format:expr $(,$args:ident)*) => {
+        match $format.interface_flags() {
+            NumberFormat::PERMISSIVE_INTERFACE  => $fn(PermissiveFastDataInterface::new($format) $(,$args)*),
+            NumberFormat::STANDARD_INTERFACE    => $fn(StandardFastDataInterface::new($format) $(,$args)*),
+            NumberFormat::IGNORE_INTERFACE      => $fn(IgnoreFastDataInterface::new($format) $(,$args)*),
+            flags                               => {
+                let integer = flags.intersects(NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK);
+                let fraction = flags.intersects(NumberFormat::FRACTION_DIGIT_SEPARATOR_FLAG_MASK);
+                let exponent = flags.intersects(NumberFormat::EXPONENT_DIGIT_SEPARATOR_FLAG_MASK);
+                match (integer, fraction, exponent) {
+                    (true, true, true)      => $fn(GenericIFEFastDataInterface::new($format) $(,$args)*),
+                    (false, true, true)     => $fn(GenericFEFastDataInterface::new($format) $(,$args)*),
+                    (true, false, true)     => $fn(GenericIEFastDataInterface::new($format) $(,$args)*),
+                    (true, true, false)     => $fn(GenericIFFastDataInterface::new($format) $(,$args)*),
+                    (false, false, true)    => $fn(GenericEFastDataInterface::new($format) $(,$args)*),
+                    (false, true, false)    => $fn(GenericFFastDataInterface::new($format) $(,$args)*),
+                    (true, false, false)    => $fn(GenericIFastDataInterface::new($format) $(,$args)*),
+                    (false, false, false)   => $fn(GenericFastDataInterface::new($format) $(,$args)*)
+                }
+            }
+        }
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+//! Module specifying float.
+
+// Utilities.
+mod exponent;
+mod trim;
+mod validate;
+
+#[macro_use]
+mod interface;
+
+#[macro_use]
+mod traits;
+
+// Formats
+mod standard;
+
+cfg_if! {
+if #[cfg(feature = "format")] {
+    mod generic;
+    mod permissive;
+    mod ignore;
+}}
+
+// Re-export interface and traits.
+pub(super) use standard::*;
+pub(super) use traits::*;
+
+cfg_if! {
+if #[cfg(feature = "format")] {
+    pub(super) use generic::*;
+    pub(super) use permissive::*;
+    pub(super) use ignore::*;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/permissive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/permissive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/permissive.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/permissive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,106 @@
+//! Permissive float-parsing data interface.
+
+use crate::util::*;
+use super::exponent::*;
+use super::traits::*;
+use super::trim::*;
+use super::validate::*;
+
+// Permissive data interface for fast float parsers.
+//
+// Guaranteed to parse `NumberFormat::permissive()`.
+//
+// The requirements:
+//     1). Must contain significant digits.
+//     2). Does not contain any digit separators.
+data_interface!(
+    struct PermissiveFastDataInterface,
+    struct PermissiveSlowDataInterface,
+    fields => {},
+    integer_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    fraction_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    exponent_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    format => |_| NumberFormat::default(),
+    consume_integer_digits => consume_digits_no_separator,
+    consume_fraction_digits =>  consume_digits_no_separator,
+    extract_exponent => extract_exponent_no_separator,
+    validate_mantissa => validate_permissive_mantissa,
+    validate_exponent => validate_optional_exponent,
+    validate_exponent_fraction => validate_exponent_optional_fraction,
+    validate_exponent_sign => validate_optional_exponent_sign,
+    ltrim_zero => ltrim_zero_no_separator,
+    ltrim_separator => ltrim_separator_no_separator,
+    rtrim_zero => rtrim_zero_no_separator,
+    rtrim_separator => rtrim_separator_no_separator,
+    new => fn new(format: NumberFormat) -> Self {
+        Self {
+            integer: &[],
+            fraction: None,
+            exponent: None,
+            raw_exponent: 0
+        }
+    }
+);
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    macro_rules! permissive {
+        ($integer:expr, $fraction:expr, $exponent:expr, $raw_exponent:expr) => {
+            PermissiveFastDataInterface {
+                integer: $integer,
+                fraction: $fraction,
+                exponent: $exponent,
+                raw_exponent: $raw_exponent
+            }
+        };
+    }
+
+    #[test]
+    fn extract_test() {
+        PermissiveFastDataInterface::new(NumberFormat::permissive().unwrap()).run_tests([
+            // Valid
+            ("1.2345", Ok(permissive!(b"1", Some(b!("2345")), None, 0))),
+            ("12.345", Ok(permissive!(b"12", Some(b!("345")), None, 0))),
+            ("12345.6789", Ok(permissive!(b"12345", Some(b!("6789")), None, 0))),
+            ("1.2345e10", Ok(permissive!(b"1", Some(b!("2345")), Some(b!("10")), 10))),
+            ("1.2345e+10", Ok(permissive!(b"1", Some(b!("2345")), Some(b!("+10")), 10))),
+            ("1.2345e-10", Ok(permissive!(b"1", Some(b!("2345")), Some(b!("-10")), -10))),
+            ("100000000000000000000", Ok(permissive!(b"100000000000000000000", None, None, 0))),
+            ("100000000000000000001", Ok(permissive!(b"100000000000000000001", None, None, 0))),
+            ("179769313486231580793728971405303415079934132710037826936173778980444968292764750946649017977587207096330286416692887910946555547851940402630657488671505820681908902000708383676273854845817711531764475730270069855571366959622842914819860834936475292719074168444365510704342711559699508093042880177904174497791.9999999999999999999999999999999999999999999999999999999999999999999999", Ok(permissive!(b"179769313486231580793728971405303415079934132710037826936173778980444968292764750946649017977587207096330286416692887910946555547851940402630657488671505820681908902000708383676273854845817711531764475730270069855571366959622842914819860834936475292719074168444365510704342711559699508093042880177904174497791", Some(b!("9999999999999999999999999999999999999999999999999999999999999999999999")), None, 0))),
+            ("1009e-31", Ok(permissive!(b"1009", None, Some(b!("-31")), -31))),
+            ("001.0", Ok(permissive!(b"1", Some(b!("")), None, 0))),
+            ("1.", Ok(permissive!(b"1", Some(b!("")), None, 0))),
+            ("12.", Ok(permissive!(b"12", Some(b!("")), None, 0))),
+            ("1234567.", Ok(permissive!(b"1234567", Some(b!("")), None, 0))),
+            (".1", Ok(permissive!(b"", Some(b!("1")), None, 0))),
+            (".12", Ok(permissive!(b"", Some(b!("12")), None, 0))),
+            (".1234567", Ok(permissive!(b"", Some(b!("1234567")), None, 0))),
+            ("1.2345e", Ok(permissive!(b"1", Some(b!("2345")), Some(b!("")), 0))),
+            (".3e", Ok(permissive!(b"", Some(b!("3")), Some(b!("")), 0))),
+
+            // Invalid
+            ("", Err(ErrorCode::EmptyMantissa)),
+            ("+", Err(ErrorCode::EmptyMantissa)),
+            ("-", Err(ErrorCode::EmptyMantissa)),
+            (".", Err(ErrorCode::EmptyMantissa)),
+            ("+.", Err(ErrorCode::EmptyMantissa)),
+            ("-.", Err(ErrorCode::EmptyMantissa)),
+            ("e", Err(ErrorCode::EmptyMantissa)),
+            ("E", Err(ErrorCode::EmptyMantissa)),
+            ("e1", Err(ErrorCode::EmptyMantissa)),
+            ("e+1", Err(ErrorCode::EmptyMantissa)),
+            ("e-1", Err(ErrorCode::EmptyMantissa)),
+            (".e", Err(ErrorCode::EmptyMantissa)),
+            (".E", Err(ErrorCode::EmptyMantissa)),
+            (".e1", Err(ErrorCode::EmptyMantissa)),
+            (".e+1", Err(ErrorCode::EmptyMantissa)),
+            (".e-1", Err(ErrorCode::EmptyMantissa)),
+        ].iter());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/standard.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/standard.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/standard.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/standard.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,190 @@
+//! Standard float-parsing data interface.
+
+use crate::util::*;
+use super::exponent::*;
+use super::traits::*;
+use super::trim::*;
+use super::validate::*;
+
+// Standard data interface for fast float parsers.
+//
+// Guaranteed to parse `NumberFormat::standard()`, and
+// therefore will track that exact specification.
+//
+// The requirements:
+//     1). Must contain significant digits.
+//     2). Must contain exponent digits if an exponent is present.
+//     3). Does not contain any digit separators.
+data_interface!(
+    struct StandardFastDataInterface,
+    struct StandardSlowDataInterface,
+    fields => {},
+    integer_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    fraction_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    exponent_iter => (IteratorNoSeparator, iterate_digits_no_separator),
+    format => |_| NumberFormat::default(),
+    consume_integer_digits => consume_digits_no_separator,
+    consume_fraction_digits =>  consume_digits_no_separator,
+    extract_exponent => extract_exponent_no_separator,
+    validate_mantissa => validate_permissive_mantissa,
+    validate_exponent => validate_required_exponent,
+    validate_exponent_fraction => validate_exponent_optional_fraction,
+    validate_exponent_sign => validate_optional_exponent_sign,
+    ltrim_zero => ltrim_zero_no_separator,
+    ltrim_separator => ltrim_separator_no_separator,
+    rtrim_zero => rtrim_zero_no_separator,
+    rtrim_separator => rtrim_separator_no_separator,
+    new => fn new(format: NumberFormat) -> Self {
+        Self {
+            integer: &[],
+            fraction: None,
+            exponent: None,
+            raw_exponent: 0
+        }
+    }
+);
+
+// FROM
+
+type DataTuple<'a> = (&'a [u8], Option<&'a [u8]>, Option<&'a [u8]>, i32);
+
+// Add `From` to remove repition in unit-testing.
+impl<'a> From<DataTuple<'a>> for StandardFastDataInterface<'a> {
+    perftools_inline!{
+    fn from(data: DataTuple<'a>) -> Self {
+        StandardFastDataInterface {
+            integer: data.0,
+            fraction: data.1,
+            exponent: data.2,
+            raw_exponent: data.3
+        }
+    }}
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    macro_rules! standard {
+        ($integer:expr, $fraction:expr, $exponent:expr, $raw_exponent:expr) => {
+            StandardFastDataInterface {
+                integer: $integer,
+                fraction: $fraction,
+                exponent: $exponent,
+                raw_exponent: $raw_exponent
+            }
+        };
+    }
+
+    #[test]
+    fn extract_test() {
+        StandardFastDataInterface::new(NumberFormat::standard().unwrap()).run_tests([
+            // Valid
+            ("1.2345", Ok(standard!(b"1", Some(b!("2345")), None, 0))),
+            ("12.345", Ok(standard!(b"12", Some(b!("345")), None, 0))),
+            ("12345.6789", Ok(standard!(b"12345", Some(b!("6789")), None, 0))),
+            ("1.2345e10", Ok(standard!(b"1", Some(b!("2345")), Some(b!("10")), 10))),
+            ("1.2345e+10", Ok(standard!(b"1", Some(b!("2345")), Some(b!("+10")), 10))),
+            ("1.2345e-10", Ok(standard!(b"1", Some(b!("2345")), Some(b!("-10")), -10))),
+            ("100000000000000000000", Ok(standard!(b"100000000000000000000", None, None, 0))),
+            ("100000000000000000001", Ok(standard!(b"100000000000000000001", None, None, 0))),
+            ("179769313486231580793728971405303415079934132710037826936173778980444968292764750946649017977587207096330286416692887910946555547851940402630657488671505820681908902000708383676273854845817711531764475730270069855571366959622842914819860834936475292719074168444365510704342711559699508093042880177904174497791.9999999999999999999999999999999999999999999999999999999999999999999999", Ok(standard!(b"179769313486231580793728971405303415079934132710037826936173778980444968292764750946649017977587207096330286416692887910946555547851940402630657488671505820681908902000708383676273854845817711531764475730270069855571366959622842914819860834936475292719074168444365510704342711559699508093042880177904174497791", Some(b!("9999999999999999999999999999999999999999999999999999999999999999999999")), None, 0))),
+            ("1009e-31", Ok(standard!(b"1009", None, Some(b!("-31")), -31))),
+            ("001.0", Ok(standard!(b"1", Some(b!("")), None, 0))),
+            ("1.", Ok(standard!(b"1", Some(b!("")), None, 0))),
+            ("12.", Ok(standard!(b"12", Some(b!("")), None, 0))),
+            ("1234567.", Ok(standard!(b"1234567", Some(b!("")), None, 0))),
+            (".1", Ok(standard!(b"", Some(b!("1")), None, 0))),
+            (".12", Ok(standard!(b"", Some(b!("12")), None, 0))),
+            (".1234567", Ok(standard!(b"", Some(b!("1234567")), None, 0))),
+
+            // Invalid
+            ("1.2345e", Err(ErrorCode::EmptyExponent)),
+            ("", Err(ErrorCode::EmptyMantissa)),
+            ("+", Err(ErrorCode::EmptyMantissa)),
+            ("-", Err(ErrorCode::EmptyMantissa)),
+            (".", Err(ErrorCode::EmptyMantissa)),
+            ("+.", Err(ErrorCode::EmptyMantissa)),
+            ("-.", Err(ErrorCode::EmptyMantissa)),
+            ("e", Err(ErrorCode::EmptyMantissa)),
+            ("E", Err(ErrorCode::EmptyMantissa)),
+            ("e1", Err(ErrorCode::EmptyMantissa)),
+            ("e+1", Err(ErrorCode::EmptyMantissa)),
+            ("e-1", Err(ErrorCode::EmptyMantissa)),
+            (".e", Err(ErrorCode::EmptyMantissa)),
+            (".E", Err(ErrorCode::EmptyMantissa)),
+            (".e1", Err(ErrorCode::EmptyMantissa)),
+            (".e+1", Err(ErrorCode::EmptyMantissa)),
+            (".e-1", Err(ErrorCode::EmptyMantissa)),
+            (".3e", Err(ErrorCode::EmptyExponent))
+        ].iter());
+    }
+
+    #[test]
+    fn fast_data_interface_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+
+        // Check "1.2345".
+        let data = Data {
+            integer: b"1",
+            fraction: Some(b!("2345")),
+            exponent: None,
+            raw_exponent: 0
+        };
+        assert!(data.integer_iter().eq(b"1".iter()));
+        assert!(data.fraction_iter().eq(b"2345".iter()));
+
+        #[cfg(feature = "correct")]
+        assert_eq!(data.digits_start(), 0);
+    }
+
+    #[cfg(feature = "correct")]
+    #[test]
+    fn slow_data_interface_test() {
+        type Data<'a> = StandardSlowDataInterface<'a>;
+        // Check "1.2345", simple.
+        let data = Data {
+            integer: b"1",
+            fraction: b"2345",
+            digits_start: 0,
+            truncated_digits: 0,
+            raw_exponent: 0
+        };
+        assert_eq!(data.integer_digits(), 1);
+        assert!(data.integer_iter().eq(b"1".iter()));
+        assert_eq!(data.fraction_digits(), 4);
+        assert!(data.fraction_iter().eq(b"2345".iter()));
+        assert_eq!(data.significant_fraction_digits(), 4);
+        assert!(data.significant_fraction_iter().eq(b"2345".iter()));
+        assert_eq!(data.mantissa_digits(), 5);
+        assert_eq!(data.digits_start(), 0);
+        assert_eq!(data.truncated_digits(), 0);
+        assert_eq!(data.raw_exponent(), 0);
+        assert_eq!(data.mantissa_exponent(), -4);
+        assert_eq!(data.scientific_exponent(), 0);
+
+        // Check "0.12345", simple.
+        let data = Data {
+            integer: b"",
+            fraction: b"12345",
+            digits_start: 0,
+            truncated_digits: 0,
+            raw_exponent: 0
+        };
+        assert_eq!(data.integer_digits(), 0);
+        assert!(data.integer_iter().eq(b"".iter()));
+        assert_eq!(data.fraction_digits(), 5);
+        assert!(data.fraction_iter().eq(b"12345".iter()));
+        assert_eq!(data.significant_fraction_digits(), 5);
+        assert!(data.significant_fraction_iter().eq(b"12345".iter()));
+        assert_eq!(data.mantissa_digits(), 5);
+        assert_eq!(data.digits_start(), 0);
+        assert_eq!(data.truncated_digits(), 0);
+        assert_eq!(data.raw_exponent(), 0);
+        assert_eq!(data.mantissa_exponent(), -5);
+        assert_eq!(data.scientific_exponent(), -1);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,669 @@
+//! Traits that provide format-dependent data for floating parsing algorithms.
+
+use crate::util::*;
+
+#[cfg(feature = "correct")]
+use super::exponent::*;
+
+/// Private data interface for local utilities.
+pub(crate) trait FastDataInterfaceImpl<'a>: Sized {
+    /// Get integer component of float.
+    fn integer(&self) -> &'a [u8];
+
+    /// Set integer component of float.
+    fn set_integer(&mut self, integer: &'a [u8]);
+
+    /// Get fraction component of float.
+    fn fraction(&self) -> Option<&'a [u8]>;
+
+    /// Set fraction component of float.
+    fn set_fraction(&mut self, fraction: Option<&'a [u8]>);
+
+    /// Get exponent component of float.
+    fn exponent(&self) -> Option<&'a [u8]>;
+
+    /// Set exponent component of float.
+    fn set_exponent(&mut self, exponent: Option<&'a [u8]>);
+
+    /// Get raw exponent component of float.
+    fn raw_exponent(&self) -> i32;
+
+    /// Set raw exponent component of float.
+    fn set_raw_exponent(&mut self, raw_exponent: i32);
+}
+
+/// Private data interface for local utilities.
+#[cfg(feature = "correct")]
+pub(crate) trait SlowDataInterfaceImpl<'a>: Sized {
+    /// Get integer component of float.
+    fn integer(&self) -> &'a [u8];
+
+    /// Set integer component of float.
+    fn set_integer(&mut self, integer: &'a [u8]);
+
+    /// Get fraction component of float.
+    fn fraction(&self) -> &'a [u8];
+
+    /// Set fraction component of float.
+    fn set_fraction(&mut self, fraction: &'a [u8]);
+
+    /// Get raw exponent component of float.
+    fn raw_exponent(&self) -> i32;
+
+    /// Set raw exponent component of float.
+    fn set_raw_exponent(&mut self, raw_exponent: i32);
+}
+
+// Implement FastDataInterfaceImpl for a default structure.
+macro_rules! fast_data_interface_impl {
+    ($name:ident) => (
+        impl<'a> FastDataInterfaceImpl<'a> for $name<'a> {
+            perftools_inline!{
+            fn integer(&self) -> &'a [u8] {
+                self.integer
+            }}
+
+            perftools_inline!{
+            fn set_integer(&mut self, integer: &'a [u8]) {
+                self.integer = integer
+            }}
+
+            perftools_inline!{
+            fn fraction(&self) -> Option<&'a [u8]> {
+                self.fraction
+            }}
+
+            perftools_inline!{
+            fn set_fraction(&mut self, fraction: Option<&'a [u8]>) {
+                self.fraction = fraction
+            }}
+
+            perftools_inline!{
+            fn exponent(&self) -> Option<&'a [u8]> {
+                self.exponent
+            }}
+
+            perftools_inline!{
+            fn set_exponent(&mut self, exponent: Option<&'a [u8]>) {
+                self.exponent = exponent
+            }}
+
+            perftools_inline!{
+            fn raw_exponent(&self) -> i32 {
+                self.raw_exponent
+            }}
+
+            perftools_inline!{
+            fn set_raw_exponent(&mut self, raw_exponent: i32) {
+                self.raw_exponent = raw_exponent
+            }}
+        }
+    );
+}
+
+// Implement SlowDataInterfaceImpl for a default structure.
+#[cfg(feature = "correct")]
+macro_rules! slow_data_interface_impl {
+    ($name:ident) => (
+        impl<'a> SlowDataInterfaceImpl<'a> for $name<'a> {
+            perftools_inline!{
+            fn integer(&self) -> &'a [u8] {
+                self.integer
+            }}
+
+            perftools_inline!{
+            fn set_integer(&mut self, integer: &'a [u8]) {
+                self.integer = integer
+            }}
+
+            perftools_inline!{
+            fn fraction(&self) -> &'a [u8] {
+                self.fraction
+            }}
+
+            perftools_inline!{
+            fn set_fraction(&mut self, fraction: &'a [u8]) {
+                self.fraction = fraction
+            }}
+
+            perftools_inline!{
+            fn raw_exponent(&self) -> i32 {
+                self.raw_exponent
+            }}
+
+            perftools_inline!{
+            fn set_raw_exponent(&mut self, raw_exponent: i32) {
+                self.raw_exponent = raw_exponent
+            }}
+        }
+    );
+}
+
+// PUBLIC
+
+/// Data interface for fast float parsers.
+pub(crate) trait FastDataInterface<'a>: FastDataInterfaceImpl<'a> {
+    /// Integer digits iterator type.
+    type IntegerIter: ConsumedIterator<Item=&'a u8> + AsPtrIterator<'a, u8>;
+
+    /// Float digits iterator type.
+    type FractionIter: ConsumedIterator<Item=&'a u8> + AsPtrIterator<'a, u8>;
+
+    /// Exponent digits iterator type.
+    type ExponentIter: ConsumedIterator<Item=&'a u8> + AsPtrIterator<'a, u8>;
+
+    /// Associated slow data type.
+    #[cfg(feature = "correct")]
+    type SlowInterface: SlowDataInterface<'a>;
+
+    /// Create new float data from format specification.
+    fn new(format: NumberFormat) -> Self;
+
+    // DATA
+
+    /// Iterate over all integer digits.
+    fn integer_iter(&self) -> Self::IntegerIter;
+
+    /// Iterate over all fraction digits
+    fn fraction_iter(&self) -> Self::FractionIter;
+
+    /// Iterate over all exponent digits
+    fn exponent_iter(&self) -> Self::ExponentIter;
+
+    /// Get the number format.
+    fn format(&self) -> NumberFormat;
+
+    perftools_inline!{
+    /// Get the mantissa exponent from the raw exponent.
+    #[cfg(feature = "correct")]
+    fn mantissa_exponent(&self, truncated_digits: usize) -> i32 {
+        mantissa_exponent(self.raw_exponent(), self.fraction_iter().count(), truncated_digits)
+    }}
+
+    // EXTRACT
+
+    // Consume integer digits until a non-digit character is found.
+    fn consume_integer_digits(&self, bytes: &'a [u8], radix: u32) -> (&'a [u8], &'a [u8]);
+
+    // Consume fraction digits until a non-digit character is found.
+    fn consume_fraction_digits(&self, bytes: &'a [u8], radix: u32) -> (&'a [u8], &'a [u8]);
+
+    // Extract the integer substring from the float.
+    perftools_inline!{
+    fn extract_integer(&mut self, bytes: &'a [u8], radix: u32)
+        -> &'a [u8]
+    {
+        let result = self.consume_integer_digits(bytes, radix);
+        self.set_integer(result.0);
+        result.1
+    }}
+
+    // Extract the fraction substring from the float.
+    //
+    //  Preconditions:
+    //      `bytes.len()` >= 1 and `bytes[0] == b'.'`.
+    perftools_inline!{
+    fn extract_fraction(&mut self, bytes: &'a [u8], radix: u32)
+        -> &'a [u8]
+    {
+        let digits = &index!(bytes[1..]);
+        let result = self.consume_fraction_digits(digits, radix);
+        self.set_fraction(Some(result.0));
+        result.1
+    }}
+
+    // Extract and parse the exponent substring from the float.
+    fn extract_exponent(&mut self, bytes: &'a [u8], radix: u32) -> &'a [u8];
+
+    // Validate the extracted mantissa components.
+    fn validate_mantissa(&self) -> ParseResult<()>;
+
+    // Validate the extracted exponent component.
+    fn validate_exponent(&self) -> ParseResult<()>;
+
+    // Validate the extracted exponent depending on the fraction component.
+    fn validate_exponent_fraction(&self) -> ParseResult<()>;
+
+    // Validate the extracted exponent sign.
+    fn validate_exponent_sign(&self) -> ParseResult<()>;
+
+    // Trim leading 0s and digit separators.
+    fn ltrim_zero(&self, bytes: &'a [u8]) -> (&'a [u8], usize);
+
+    // Trim leading digit separators.
+    fn ltrim_separator(&self, bytes: &'a [u8]) -> (&'a [u8], usize);
+
+    // Trim trailing 0s and digit separators.
+    fn rtrim_zero(&self, bytes: &'a [u8]) -> (&'a [u8], usize);
+
+    // Trim trailing digit separators.
+    fn rtrim_separator(&self, bytes: &'a [u8]) -> (&'a [u8], usize);
+
+    // Post-process float to trim leading and trailing 0s and digit separators.
+    // This is required for accurate results in the slow-path algorithm,
+    // otherwise, we may incorrect guess the mantissa or scientific exponent.
+    perftools_inline!{
+    fn trim(&mut self) {
+        self.set_integer(self.ltrim_zero(self.integer()).0);
+        self.set_fraction(self.fraction().map(|x| self.rtrim_zero(x).0));
+    }}
+
+    perftools_inline!{
+    /// Extract float subcomponents from input bytes.
+    fn extract(&mut self, bytes: &'a [u8], radix: u32) -> ParseResult<*const u8> {
+        // Parse the integer, aka, the digits preceding any control characters.
+        let mut digits = bytes;
+        digits = self.extract_integer(digits, radix);
+
+        // Parse and validate a fraction, if present.
+        let exp_char = exponent_notation_char(radix).to_ascii_lowercase();
+        if let Some(&b'.') = digits.first() {
+            digits = self.extract_fraction(digits, radix);
+        }
+        self.validate_mantissa()?;
+
+        // Parse and validate an exponent, if present.
+        if let Some(&c) = digits.first() {
+            if c.to_ascii_lowercase() == exp_char {
+                digits = self.extract_exponent(digits, radix);
+            }
+        }
+        self.validate_exponent()?;
+        self.validate_exponent_fraction()?;
+        self.validate_exponent_sign()?;
+
+        // Trim the remaining digits.
+        self.trim();
+
+        Ok(digits.as_ptr())
+    }}
+
+    // TO SLOW DATA
+
+    // Calculate the digit start from the integer and fraction slices.
+    perftools_inline!{
+    #[cfg(feature = "correct")]
+    fn digits_start(&self) -> usize {
+        // If there are no returned values in the integer iterator
+        // since we've trimmed leading 0s, then we have to trim
+        // leading zeros to get to the start of the significant
+        // digits in the fraction.
+        match self.integer().is_empty() {
+            true  => self.ltrim_zero(self.fraction().unwrap_or(&[])).1,
+            false => 0,
+        }
+    }}
+
+    /// Process float data for moderate/slow float parsers.
+    #[cfg(feature = "correct")]
+    fn to_slow(self, truncated_digits: usize) -> Self::SlowInterface;
+
+    // TESTS
+
+    #[cfg(test)]
+    fn clear(&mut self) {
+        self.set_integer(&[]);
+        self.set_fraction(None);
+        self.set_exponent(None);
+        self.set_raw_exponent(0);
+    }
+
+    /// Check the float state parses the desired data.
+    #[cfg(test)]
+    fn check_extract(&mut self, digits: &'a [u8], expected: &ParseTestResult<Self>) {
+        let expected = expected.as_ref();
+        match self.extract(digits, 10) {
+            Ok(_)       => {
+                let expected = expected.unwrap();
+                assert_eq!(self.integer(), expected.integer());
+                assert_eq!(self.fraction(), expected.fraction());
+                assert_eq!(self.exponent(), expected.exponent());
+            },
+            Err((c, _))  => assert_eq!(c, *expected.err().unwrap()),
+        }
+    }
+
+    // Run series of tests.
+    #[cfg(test)]
+    fn run_tests<Iter>(&mut self, tests: Iter)
+        where Iter: Iterator<Item=&'a (&'a str, ParseTestResult<Self>)>,
+              Self: 'a
+    {
+        for value in tests {
+            self.check_extract(value.0.as_bytes(), &value.1);
+            self.clear();
+        }
+    }
+}
+
+/// Shared definition for all fast data interfaces.
+macro_rules! fast_data_interface {
+    (
+        struct $name:ident,
+        fields => { $( $field:ident : $type:tt, )* },
+        integer_iter => ( $integer_iter:tt, $integer_iter_fn:ident ),
+        fraction_iter => ( $fraction_iter:tt, $fraction_iter_fn:ident ),
+        exponent_iter => ( $exponent_iter:tt, $exponent_iter_fn:ident ),
+        format => $format:expr,
+        slow_interface => $slow_interface:tt,
+        consume_integer_digits => $consume_integer_digits:expr,
+        consume_fraction_digits => $consume_fraction_digits:expr,
+        extract_exponent => $extract_exponent:expr,
+        validate_mantissa => $validate_mantissa:expr,
+        validate_exponent => $validate_exponent:expr,
+        validate_exponent_fraction => $validate_exponent_fraction:expr,
+        validate_exponent_sign => $validate_exponent_sign:expr,
+        ltrim_zero => $ltrim_zero:ident,
+        ltrim_separator => $ltrim_separator:ident,
+        rtrim_zero => $rtrim_zero:ident,
+        rtrim_separator => $rtrim_separator:ident,
+        new => $($new:tt)*
+    ) => (
+        pub(crate) struct $name<'a> {
+            $( $field : $type, )*
+            integer: &'a [u8],
+            fraction: Option<&'a [u8]>,
+            exponent: Option<&'a [u8]>,
+            raw_exponent: i32
+        }
+
+        fast_data_interface_impl!($name);
+
+        impl<'a> FastDataInterface<'a> for $name<'a> {
+            type IntegerIter = $integer_iter<'a>;
+            type FractionIter = $fraction_iter<'a>;
+            type ExponentIter = $exponent_iter<'a>;
+
+            #[cfg(feature = "correct")]
+            type SlowInterface = $slow_interface<'a>;
+
+            perftools_inline!{
+            #[allow(unused_variables)]
+            $($new)*
+            }
+
+            // DATA
+
+            perftools_inline!{
+            fn integer_iter(&self) -> Self::IntegerIter {
+                $integer_iter_fn(self.integer, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn fraction_iter(&self) -> Self::FractionIter {
+                let fraction = self.fraction.unwrap_or(&[]);
+                $fraction_iter_fn(fraction, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn exponent_iter(&self) -> Self::ExponentIter {
+                let exponent = self.exponent.unwrap_or(&[]);
+                $exponent_iter_fn(exponent, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn format(&self) -> NumberFormat {
+                $format(self)
+            }}
+
+            perftools_inline!{
+            fn consume_integer_digits(&self, digits: &'a [u8], radix: u32)
+                -> (&'a [u8], &'a [u8])
+            {
+                $consume_integer_digits(digits, radix, self.format())
+            }}
+
+            perftools_inline!{
+            fn consume_fraction_digits(&self, digits: &'a [u8], radix: u32)
+                -> (&'a [u8], &'a [u8])
+            {
+                $consume_fraction_digits(digits, radix, self.format())
+            }}
+
+            perftools_inline!{
+            fn extract_exponent(&mut self, bytes: &'a [u8], radix: u32) -> &'a [u8]
+            {
+                $extract_exponent(self, bytes, radix, self.format())
+            }}
+
+            perftools_inline!{
+            fn validate_mantissa(&self) -> ParseResult<()> {
+                $validate_mantissa(self)
+            }}
+
+            perftools_inline!{
+            fn validate_exponent(&self) -> ParseResult<()> {
+                $validate_exponent(self)
+            }}
+
+            perftools_inline!{
+            fn validate_exponent_fraction(&self) -> ParseResult<()> {
+                $validate_exponent_fraction(self)
+            }}
+
+            perftools_inline!{
+            fn validate_exponent_sign(&self) -> ParseResult<()> {
+                $validate_exponent_sign(self)
+            }}
+
+            perftools_inline!{
+            fn ltrim_zero(&self, bytes: &'a [u8]) -> (&'a [u8], usize) {
+                $ltrim_zero(bytes, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn ltrim_separator(&self, bytes: &'a [u8]) -> (&'a [u8], usize) {
+                $ltrim_separator(bytes, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn rtrim_zero(&self, bytes: &'a [u8]) -> (&'a [u8], usize) {
+                $rtrim_zero(bytes, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn rtrim_separator(&self, bytes: &'a [u8]) -> (&'a [u8], usize) {
+                $rtrim_separator(bytes, self.format().digit_separator())
+            }}
+
+            // TO SLOW DATA
+
+            #[cfg(feature = "correct")]
+            perftools_inline!{
+            fn to_slow(self, truncated_digits: usize) -> Self::SlowInterface {
+                let digits_start = self.digits_start();
+                Self::SlowInterface {
+                    $( $field: self.$field, )*
+                    digits_start,
+                    truncated_digits,
+                    integer: self.integer,
+                    fraction: self.fraction.unwrap_or(&[]),
+                    raw_exponent: self.raw_exponent
+                }
+            }}
+        }
+    );
+}
+
+/// Data interface for moderate/slow float parsers.
+#[cfg(feature = "correct")]
+pub(crate) trait SlowDataInterface<'a>: SlowDataInterfaceImpl<'a> {
+    /// Integer digits iterator type.
+    type IntegerIter: ConsumedIterator<Item=&'a u8> + AsPtrIterator<'a, u8>;
+
+    /// Float digits iterator type.
+    type FractionIter: ConsumedIterator<Item=&'a u8> + AsPtrIterator<'a, u8>;
+
+    /// Iterate over all integer digits.
+    fn integer_iter(&self) -> Self::IntegerIter;
+
+    perftools_inline!{
+    /// Get number of all integer digits.
+    fn integer_digits(&self) -> usize {
+        self.integer_iter().count()
+    }}
+
+    /// Iterate over all fraction digits
+    fn fraction_iter(&self) -> Self::FractionIter;
+
+    perftools_inline!{
+    /// Get number of all fraction digits.
+    fn fraction_digits(&self) -> usize {
+        self.fraction_iter().count()
+    }}
+
+    /// Iterate over significant fraction digits.
+    fn significant_fraction_iter(&self) -> Self::FractionIter;
+
+    perftools_inline!{
+    /// Get number of significant fraction digits.
+    fn significant_fraction_digits(&self) -> usize {
+        self.significant_fraction_iter().count()
+    }}
+
+    perftools_inline!{
+    /// Get the number of digits in the mantissa.
+    /// Cannot overflow, since this is based off a single usize input string.
+    fn mantissa_digits(&self) -> usize {
+        self.integer_digits() + self.significant_fraction_digits()
+    }}
+
+    /// Get the number format.
+    fn format(&self) -> NumberFormat;
+
+    /// Get index to start of significant digits in the fraction.
+    fn digits_start(&self) -> usize;
+
+    /// Get number of truncated digits.
+    fn truncated_digits(&self) -> usize;
+
+    perftools_inline!{
+    /// Get the mantissa exponent from the raw exponent.
+    fn mantissa_exponent(&self) -> i32 {
+        mantissa_exponent(self.raw_exponent(), self.fraction_digits(), self.truncated_digits())
+    }}
+
+    perftools_inline!{
+    /// Get the scientific exponent from the raw exponent.
+    fn scientific_exponent(&self) -> i32 {
+        scientific_exponent(self.raw_exponent(), self.integer_digits(), self.digits_start())
+    }}
+}
+
+/// Shared definition for all slow data interfaces.
+macro_rules! slow_data_interface {
+    (
+        struct $name:ident,
+        fields => { $( $field:ident : $type:tt, )* },
+        integer_iter => ( $integer_iter:tt, $integer_iter_fn:ident ),
+        fraction_iter => ( $fraction_iter:tt, $fraction_iter_fn:ident ),
+        format => $format:expr
+    ) => (
+        #[cfg(feature = "correct")]
+        pub(crate) struct $name<'a> {
+            $( $field : $type, )*
+            integer: &'a [u8],
+            fraction: &'a [u8],
+            digits_start: usize,
+            truncated_digits: usize,
+            raw_exponent: i32
+        }
+
+        #[cfg(feature = "correct")]
+        slow_data_interface_impl!($name);
+
+        #[cfg(feature = "correct")]
+        impl<'a> SlowDataInterface<'a> for $name<'a> {
+            type IntegerIter = $integer_iter<'a>;
+            type FractionIter = $fraction_iter<'a>;
+
+            // DATA
+
+            perftools_inline!{
+            fn integer_iter(&self) -> Self::IntegerIter {
+                $integer_iter_fn(self.integer, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn fraction_iter(&self) -> Self::FractionIter {
+                $fraction_iter_fn(self.fraction, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn significant_fraction_iter(&self) -> Self::FractionIter {
+                let fraction = &index!(self.fraction[self.digits_start..]);
+                $fraction_iter_fn(fraction, self.format().digit_separator())
+            }}
+
+            perftools_inline!{
+            fn format(&self) -> NumberFormat {
+                $format(self)
+            }}
+
+            perftools_inline!{
+            fn digits_start(&self) -> usize {
+                self.digits_start
+            }}
+
+            perftools_inline!{
+            fn truncated_digits(&self) -> usize {
+                self.truncated_digits
+            }}
+        }
+    );
+}
+
+/// Shared definition for all data interfaces.
+macro_rules! data_interface {
+    (
+        struct $fast:ident,
+        struct $slow:ident,
+        fields => { $( $field:ident : $type:tt, )* },
+        integer_iter => ( $integer_iter:tt, $integer_iter_fn:ident ),
+        fraction_iter => ( $fraction_iter:tt, $fraction_iter_fn:ident ),
+        exponent_iter => ( $exponent_iter:tt, $exponent_iter_fn:ident ),
+        format => $format:expr,
+        consume_integer_digits => $consume_integer_digits:expr,
+        consume_fraction_digits => $consume_fraction_digits:expr,
+        extract_exponent => $extract_exponent:expr,
+        validate_mantissa => $validate_mantissa:expr,
+        validate_exponent => $validate_exponent:expr,
+        validate_exponent_fraction => $validate_exponent_fraction:expr,
+        validate_exponent_sign => $validate_exponent_sign:expr,
+        ltrim_zero => $ltrim_zero:ident,
+        ltrim_separator => $ltrim_separator:ident,
+        rtrim_zero => $rtrim_zero:ident,
+        rtrim_separator => $rtrim_separator:ident,
+        new => $($new:tt)*
+    ) => (
+        fast_data_interface!(
+            struct $fast,
+            fields => { $( $field : $type , )* },
+            integer_iter => ($integer_iter, $integer_iter_fn),
+            fraction_iter => ($fraction_iter, $fraction_iter_fn),
+            exponent_iter => ($exponent_iter, $exponent_iter_fn),
+            format => $format,
+            slow_interface => $slow,
+            consume_integer_digits => $consume_integer_digits,
+            consume_fraction_digits => $consume_fraction_digits,
+            extract_exponent => $extract_exponent,
+            validate_mantissa => $validate_mantissa,
+            validate_exponent => $validate_exponent,
+            validate_exponent_fraction => $validate_exponent_fraction,
+            validate_exponent_sign => $validate_exponent_sign,
+            ltrim_zero => $ltrim_zero,
+            ltrim_separator => $ltrim_separator,
+            rtrim_zero => $rtrim_zero,
+            rtrim_separator => $rtrim_separator,
+            new => $($new)*
+        );
+
+        slow_data_interface!(
+            struct $slow,
+            fields => { $( $field : $type , )* },
+            integer_iter => ($integer_iter, $integer_iter_fn),
+            fraction_iter => ($fraction_iter, $fraction_iter_fn),
+            format => $format
+        );
+    );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/trim.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/trim.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/trim.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/trim.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,111 @@
+//! Trim leading and trailing 0s and digit separators.
+
+use crate::util::*;
+
+// TRIM
+
+// Trim leading 0s.
+// Does not consume any digit separators.
+perftools_inline!{
+pub(super) fn ltrim_zero_no_separator<'a>(bytes: &'a [u8], _: u8)
+    -> (&'a [u8], usize)
+{
+    ltrim_char_slice(bytes, b'0')
+}}
+
+// Trim leading 0s and digit separators.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn ltrim_zero_separator<'a>(bytes: &'a [u8], digit_separator: u8)
+    -> (&'a [u8], usize)
+{
+    ltrim_char2_slice(bytes, b'0', digit_separator)
+}}
+
+// Trim leading digit separators (so, nothing).
+// Does not consume any digit separators.
+perftools_inline!{
+pub(super) fn ltrim_separator_no_separator<'a>(bytes: &'a [u8], _: u8)
+    -> (&'a [u8], usize)
+{
+    (bytes, 0)
+}}
+
+// Trim leading digit separators.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn ltrim_separator_separator<'a>(bytes: &'a [u8], digit_separator: u8)
+    -> (&'a [u8], usize)
+{
+    ltrim_char_slice(bytes, digit_separator)
+}}
+
+// Trim trailing 0s.
+// Does not consume any digit separators.
+perftools_inline!{
+pub(super) fn rtrim_zero_no_separator<'a>(bytes: &'a [u8], _: u8)
+    -> (&'a [u8], usize)
+{
+    rtrim_char_slice(bytes, b'0')
+}}
+
+// Trim trailing 0s and digit separators.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn rtrim_zero_separator<'a>(bytes: &'a [u8], digit_separator: u8)
+    -> (&'a [u8], usize)
+{
+    rtrim_char2_slice(bytes, b'0', digit_separator)
+}}
+
+// Trim trailing digit separators (so, nothing).
+// Does not consume any digit separators.
+perftools_inline!{
+pub(super) fn rtrim_separator_no_separator<'a>(bytes: &'a [u8], _: u8)
+    -> (&'a [u8], usize)
+{
+    (bytes, 0)
+}}
+
+// Trim trailing digit separators.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn rtrim_separator_separator<'a>(bytes: &'a [u8], digit_separator: u8)
+    -> (&'a [u8], usize)
+{
+    rtrim_char_slice(bytes, digit_separator)
+}}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn trim_zero_no_separator_test() {
+        assert_eq!(ltrim_zero_no_separator(b!("01"), b'_'), (b!("1"), 1));
+        assert_eq!(rtrim_zero_no_separator(b!("23450"), b'_'), (b!("2345"), 1));
+    }
+
+    #[test]
+    fn trim_separator_no_separator_test() {
+        assert_eq!(ltrim_separator_no_separator(b!("01"), b'_'), (b!("01"), 0));
+        assert_eq!(rtrim_separator_no_separator(b!("23450"), b'_'), (b!("23450"), 0));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn trim_zero_iltc_separator_test() {
+        assert_eq!(ltrim_zero_separator(b!("0_1_2"), b'_'), (b!("1_2"), 2));
+        assert_eq!(rtrim_zero_separator(b!("2345_0_"), b'_'), (b!("2345"), 3));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn trim_separator_iltc_separator_test() {
+        assert_eq!(ltrim_separator_separator(b!("0_1_2"), b'_'), (b!("0_1_2"), 0));
+        assert_eq!(rtrim_separator_separator(b!("2345_0_"), b'_'), (b!("2345_0"), 1));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/validate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/validate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/validate.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/format/validate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,577 @@
+//! Validate buffers and other information.
+
+use crate::util::*;
+use super::traits::*;
+
+// HELPERS
+
+// Determine if the integer component is empty.
+perftools_inline!{
+fn is_integer_empty<'a, Data>(data: &Data)
+    -> bool
+    where Data: FastDataInterface<'a>
+{
+    data.integer_iter().next().is_none()
+}}
+
+// Determine if the fraction component is empty.
+perftools_inline!{
+fn is_fraction_empty<'a, Data>(data: &Data)
+    -> bool
+    where Data: FastDataInterface<'a>
+{
+    data.fraction_iter().next().is_none()
+}}
+
+// Determine if the fraction component exists.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn has_fraction<'a, Data>(data: &Data)
+    -> bool
+    where Data: FastDataInterface<'a>
+{
+    data.fraction().is_some()
+}}
+
+// Determine if the exponent component exists.
+perftools_inline!{
+fn has_exponent<'a, Data>(data: &Data)
+    -> bool
+    where Data: FastDataInterface<'a>
+{
+    data.exponent().is_some()
+}}
+
+// Unwrap option to get the pointer.
+perftools_inline!{
+fn option_as_ptr(option: Option<&[u8]>) -> *const u8
+{
+    option.unwrap().as_ptr()
+}}
+
+// MANTISSA
+
+// Validate the extracted integer has no leading zeros.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_no_leading_zeros<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    // Check if the next character is a sign symbol.
+    let mut iter = data.integer_iter();
+    match iter.next() {
+        Some(&b'0')     => (),
+        _               => return Ok(())
+    };
+
+    // Only here if we have a leading 0 symbol.
+    match iter.next() {
+        Some(_) => Err((ErrorCode::InvalidLeadingZeros, data.integer().as_ptr())),
+        None    => Ok(())
+    }
+}}
+
+// Validate the extracted mantissa float components.
+//      1. Validate non-empty significant digits (integer or fraction).
+perftools_inline!{
+pub(super) fn validate_permissive_mantissa<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    let integer_empty = is_integer_empty(data);
+    let fraction_empty = is_fraction_empty(data);
+    if integer_empty && fraction_empty {
+        // Invalid floating-point number, no integer or fraction components.
+        Err((ErrorCode::EmptyMantissa, data.integer().as_ptr()))
+    } else {
+        Ok(())
+    }
+}}
+
+// Validate the extracted mantissa float components.
+//      1. Validate integer component is non-empty.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_required_integer<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    if is_integer_empty(data) {
+        // Invalid floating-point number, no integer component.
+        Err((ErrorCode::EmptyInteger, data.integer().as_ptr()))
+    } else {
+        Ok(())
+    }
+}}
+
+// Validate the extracted mantissa float components.
+//      1. Validate fraction component is non-empty if present.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_required_fraction<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    if has_fraction(data) && is_fraction_empty(data) {
+        // Invalid floating-point number, no fraction component.
+        Err((ErrorCode::EmptyFraction, option_as_ptr(data.fraction())))
+    } else {
+        Ok(())
+    }
+}}
+
+// Validate the extracted mantissa float components.
+//      1. Validate integer component is non-empty.
+//      2. Validate fraction component is non-empty if present.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_required_digits<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    if is_integer_empty(data) {
+        // Invalid floating-point number, no integer component.
+        Err((ErrorCode::EmptyInteger, data.integer().as_ptr()))
+    } else if has_fraction(data) && is_fraction_empty(data) {
+        // Invalid floating-point number, no fraction component.
+        Err((ErrorCode::EmptyFraction, option_as_ptr(data.fraction())))
+    } else {
+        Ok(())
+    }
+}}
+
+// Validate mantissa depending on float format.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_mantissa<'a, Data>(data: &Data, format: NumberFormat)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    // Check no leading zeros.
+    if format.no_float_leading_zeros() {
+        validate_no_leading_zeros(data)?;
+    }
+
+    // Check required digits.
+    let required_integer = format.required_integer_digits();
+    let required_fraction = format.required_fraction_digits();
+    match (required_integer, required_fraction) {
+        (true, true)    => validate_required_digits(data),
+        (false, true)   => validate_required_fraction(data),
+        (true, false)   => validate_required_integer(data),
+        (false, false)  => validate_permissive_mantissa(data)
+    }
+}}
+
+// EXPONENT
+
+// Validate the required exponent component.
+//      1). If the exponent has been defined, ensure at least 1 digit follows it.
+perftools_inline!{
+pub(super) fn validate_required_exponent<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    // If we don't have an exponent stored, we're fine.
+    if !has_exponent(data) {
+        return Ok(())
+    }
+
+    // Check if the next character is a sign symbol.
+    let mut iter = data.exponent_iter();
+    match iter.next() {
+        Some(&b'+') | Some(&b'-')   => (),
+        Some(_)                     => return Ok(()),
+        None                        => return Err((ErrorCode::EmptyExponent, option_as_ptr(data.exponent())))
+    };
+
+    // Only here if we have a sign symbol.
+    match iter.next() {
+        Some(_) => Ok(()),
+        None    => Err((ErrorCode::EmptyExponent, option_as_ptr(data.exponent())))
+    }
+}}
+
+// Validate optional exponent component.
+//      A no-op, since the data is optional.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_optional_exponent<'a, Data>(_: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    Ok(())
+}}
+
+// Validate invalid exponent component.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_invalid_exponent<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    match has_exponent(data) {
+        true  => return Err((ErrorCode::InvalidExponent, option_as_ptr(data.exponent()))),
+        false => Ok(())
+    }
+}}
+
+// Validate exponent depending on float format.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_exponent<'a, Data>(data: &Data, format: NumberFormat)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    let required = format.required_exponent_digits();
+    let invalid = format.no_exponent_notation();
+    match (required, invalid) {
+        (true, _)       => validate_required_exponent(data),
+        (_, true)       => validate_invalid_exponent(data),
+        (false, false)  => validate_optional_exponent(data)
+    }
+}}
+
+// EXPONENT SIGN
+
+// Validate optional exponent sign.
+//      A no-op, since the data is optional.
+perftools_inline!{
+pub(super) fn validate_optional_exponent_sign<'a, Data>(_: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    Ok(())
+}}
+
+// Validate a required exponent sign.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_required_exponent_sign<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    // Check if the next character is a sign symbol.
+    let mut iter = data.exponent_iter();
+    match iter.next() {
+        Some(&b'+') | Some(&b'-')   => Ok(()),
+        _ if has_exponent(data)     => Err((ErrorCode::MissingExponentSign, option_as_ptr(data.exponent()))),
+        _                           => Ok(())
+    }
+}}
+
+// Validate a required exponent sign.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_no_positive_exponent_sign<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    // Check if the next character is a sign symbol.
+    let mut iter = data.exponent_iter();
+    match iter.next() {
+        Some(&b'+') => Err((ErrorCode::InvalidPositiveExponentSign, option_as_ptr(data.exponent()))),
+        _           => Ok(())
+    }
+}}
+
+// Validate exponent sign depending on float format.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_exponent_sign<'a, Data>(data: &Data, format: NumberFormat)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    let required = format.required_exponent_sign();
+    let no_positive = format.no_positive_exponent_sign();
+    match (required, no_positive) {
+        (true, _)       => validate_required_exponent_sign(data),
+        (_, true)       => validate_no_positive_exponent_sign(data),
+        (false, false)  => validate_optional_exponent_sign(data)
+    }
+}}
+
+// EXPONENT FRACTION
+
+// Validate an exponent may occur with or without a fraction.
+perftools_inline!{
+pub(super) fn validate_exponent_optional_fraction<'a, Data>(_: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    Ok(())
+}}
+
+// Validate an exponent requires a fraction component.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_exponent_required_fraction<'a, Data>(data: &Data)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    match has_exponent(data) && !has_fraction(data) {
+        true  => Err((ErrorCode::ExponentWithoutFraction, option_as_ptr(data.exponent()))),
+        false => Ok(())
+    }
+}}
+
+// Validate exponent fraction depending on float format.
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(super) fn validate_exponent_fraction<'a, Data>(data: &Data, format: NumberFormat)
+    -> ParseResult<()>
+    where Data: FastDataInterface<'a>
+{
+    match format.no_exponent_without_fraction() {
+        true  => validate_exponent_required_fraction(data),
+        false => validate_exponent_optional_fraction(data)
+    }
+}}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use super::super::standard::*;
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_no_leading_zeros_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("01"), Some(b!("23450")), None, 0).into();
+        assert!(validate_no_leading_zeros(&data).is_err());
+
+        let data: Data = (b!("1"), Some(b!("23450")), None, 0).into();
+        assert!(validate_no_leading_zeros(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("23450")), None, 0).into();
+        assert!(validate_no_leading_zeros(&data).is_ok());
+
+        let data: Data = (b!(""), Some(b!("23450")), None, 0).into();
+        assert!(validate_no_leading_zeros(&data).is_ok());
+    }
+
+    #[test]
+    fn validate_permissive_mantissa_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("01"), Some(b!("23450")), None, 0).into();
+        assert!(validate_permissive_mantissa(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_permissive_mantissa(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_permissive_mantissa(&data).is_ok());
+
+        let data: Data = (b!(""), Some(b!("")), Some(b!("+")), 0).into();
+        assert!(validate_permissive_mantissa(&data).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_required_integer_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("01"), Some(b!("23450")), None, 0).into();
+        assert!(validate_required_integer(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_required_integer(&data).is_ok());
+
+        let data: Data = (b!(""), Some(b!("0")), Some(b!("")), 0).into();
+        assert!(validate_required_integer(&data).is_err());
+
+        let data: Data = (b!(""), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_required_integer(&data).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_required_fraction_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("01"), Some(b!("23450")), None, 0).into();
+        assert!(validate_required_fraction(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_required_fraction(&data).is_err());
+
+        let data: Data = (b!(""), Some(b!("0")), Some(b!("")), 0).into();
+        assert!(validate_required_fraction(&data).is_ok());
+
+        let data: Data = (b!(""), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_required_fraction(&data).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_required_digits_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("01"), Some(b!("23450")), None, 0).into();
+        assert!(validate_required_digits(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_required_digits(&data).is_err());
+
+        let data: Data = (b!(""), Some(b!("0")), Some(b!("")), 0).into();
+        assert!(validate_required_digits(&data).is_err());
+
+        let data: Data = (b!(""), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_required_digits(&data).is_err());
+    }
+
+    #[test]
+    fn validate_required_exponent_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("01"), Some(b!("23450")), None, 0).into();
+        assert!(validate_required_exponent(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_required_exponent(&data).is_err());
+
+        let data: Data = (b!(""), Some(b!("")), Some(b!("+")), 0).into();
+        assert!(validate_required_exponent(&data).is_err());
+
+        let data: Data = (b!(""), Some(b!("")), Some(b!("2")), 0).into();
+        assert!(validate_required_exponent(&data).is_ok());
+
+        let data: Data = (b!(""), Some(b!("")), Some(b!("+2")), 0).into();
+        assert!(validate_required_exponent(&data).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_optional_exponent_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("0"), Some(b!("")), None, 0).into();
+        assert!(validate_optional_exponent(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_optional_exponent(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+")), 0).into();
+        assert!(validate_optional_exponent(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("2")), 0).into();
+        assert!(validate_optional_exponent(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+2")), 0).into();
+        assert!(validate_optional_exponent(&data).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_invalid_exponent_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("0"), Some(b!("")), None, 0).into();
+        assert!(validate_invalid_exponent(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_invalid_exponent(&data).is_err());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+")), 0).into();
+        assert!(validate_invalid_exponent(&data).is_err());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("2")), 0).into();
+        assert!(validate_invalid_exponent(&data).is_err());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+2")), 0).into();
+        assert!(validate_invalid_exponent(&data).is_err());
+    }
+
+    #[test]
+    fn validate_optional_exponent_sign_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("0"), Some(b!("")), None, 0).into();
+        assert!(validate_optional_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_optional_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+")), 0).into();
+        assert!(validate_optional_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("2")), 0).into();
+        assert!(validate_optional_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+2")), 0).into();
+        assert!(validate_optional_exponent_sign(&data).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_required_exponent_sign_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("0"), Some(b!("")), None, 0).into();
+        assert!(validate_required_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_required_exponent_sign(&data).is_err());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+")), 0).into();
+        assert!(validate_required_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("2")), 0).into();
+        assert!(validate_required_exponent_sign(&data).is_err());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+2")), 0).into();
+        assert!(validate_required_exponent_sign(&data).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_no_positive_exponent_sign_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("0"), Some(b!("")), None, 0).into();
+        assert!(validate_no_positive_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_no_positive_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+")), 0).into();
+        assert!(validate_no_positive_exponent_sign(&data).is_err());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("2")), 0).into();
+        assert!(validate_no_positive_exponent_sign(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("+2")), 0).into();
+        assert!(validate_no_positive_exponent_sign(&data).is_err());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("-2")), 0).into();
+        assert!(validate_no_positive_exponent_sign(&data).is_ok());
+    }
+
+    #[test]
+    fn validate_exponent_optional_fraction_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("0"), Some(b!("")), None, 0).into();
+        assert!(validate_exponent_optional_fraction(&data).is_ok());
+
+        let data: Data = (b!(""), Some(b!("0")), None, 0).into();
+        assert!(validate_exponent_optional_fraction(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_exponent_optional_fraction(&data).is_ok());
+
+        let data: Data = (b!(""), Some(b!("0")), Some(b!("+")), 0).into();
+        assert!(validate_exponent_optional_fraction(&data).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn validate_exponent_required_fraction_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+        let data: Data = (b!("0"), Some(b!("")), None, 0).into();
+        assert!(validate_exponent_required_fraction(&data).is_ok());
+
+        let data: Data = (b!("0"), Some(b!("")), Some(b!("")), 0).into();
+        assert!(validate_exponent_required_fraction(&data).is_ok());
+
+        let data: Data = (b!("0"), None, Some(b!("")), 0).into();
+        assert!(validate_exponent_required_fraction(&data).is_err());
+
+        let data: Data = (b!(""), Some(b!("0")), Some(b!("+")), 0).into();
+        assert!(validate_exponent_required_fraction(&data).is_ok());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/incorrect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/incorrect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/incorrect.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/incorrect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,185 @@
+//! Incorrect, fast algorithms for string-to-float conversions.
+
+use crate::atoi;
+use crate::util::*;
+use super::format::*;
+
+// FRACTION
+
+type Wrapped<F> = WrappedFloat<F>;
+
+// Process the integer component of the raw float.
+perftools_inline!{
+fn process_integer<'a, F, Data>(data: &Data, radix: u32)
+    -> F
+    where F: StablePower,
+          Data: FastDataInterface<'a>
+{
+    match data.integer().len() {
+        0 => F::ZERO,
+        // Cannot overflow and cannot have invalid digits.
+        _ => atoi::standalone_mantissa::<Wrapped<F>, _>(data.integer_iter(), radix)
+                .into_inner()
+    }
+}}
+
+// Process the fraction component of the raw float.
+perftools_inline!{
+fn process_fraction<'a, F, Data>(data: &Data, radix: u32)
+    -> F
+    where F: StablePower,
+          Data: FastDataInterface<'a>
+{
+    // We don't really care about numerical precision, so just break
+    // the fraction into 12-digit pieces.
+    // 12 is the maximum number of digits we can use without
+    // potentially overflowing  a 36-radix float string.
+    let mut fraction = F::ZERO;
+    let mut digits: i32 = 0;
+    let mut iter = data.fraction_iter();
+    while !iter.consumed() {
+        let (value, length) = atoi::standalone_mantissa_n::<u64, _>(&mut iter, radix, 12);
+        digits = digits.saturating_add(length.as_i32());
+        if !value.is_zero() {
+            fraction += F::iterative_pow(as_cast(value), radix, -digits);
+        }
+    }
+
+    fraction
+}}
+
+// Convert the float string to a native floating-point number.
+perftools_inline!{
+fn to_native<'a, F, Data>(mut data: Data, bytes: &'a [u8], radix: u32)
+    -> ParseResult<(F, *const u8)>
+    where F: StablePower,
+          Data: FastDataInterface<'a>
+{
+    let ptr = data.extract(bytes, radix)?;
+    let integer: F = process_integer(&data, radix);
+    let fraction: F = process_fraction(&data, radix);
+    let mut value = integer + fraction;
+    if !data.raw_exponent().is_zero() && !value.is_zero() {
+        value = value.iterative_pow(radix, data.raw_exponent());
+    }
+    Ok((value, ptr))
+}}
+
+perftools_inline!{
+pub(crate) fn atof_generic<'a, F>(bytes: &'a [u8], radix: u32, _: bool, _: Sign, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+    where F: StablePower
+{
+    apply_interface!(to_native, format, bytes, radix)
+}}
+
+// ATOF/ATOD
+// ---------
+
+// Parse 32-bit float from string.
+perftools_inline!{
+pub(crate) fn atof<'a>(bytes: &'a [u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(f32, *const u8)>
+{
+    atof_generic(bytes, radix, lossy, sign, format)
+}}
+
+// Parse 64-bit float from string.
+perftools_inline!{
+pub(crate) fn atod<'a>(bytes: &'a [u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(f64, *const u8)>
+{
+    atof_generic(bytes, radix, lossy, sign, format)
+}}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn process_integer_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+
+        let data = (b!("1"), Some(b!("2345")), None, 0).into();
+        assert_eq!(1.0, process_integer::<f64, Data>(&data, 10));
+
+        let data = (b!("12"), Some(b!("345")), None, 0).into();
+        assert_eq!(12.0, process_integer::<f64, Data>(&data, 10));
+
+        let data = (b!("12345"), Some(b!("6789")), None, 0).into();
+        assert_eq!(12345.0, process_integer::<f64, Data>(&data, 10));
+    }
+
+    #[test]
+    fn process_fraction_test() {
+        type Data<'a> = StandardFastDataInterface<'a>;
+
+        let data = (b!("1"), Some(b!("2345")), None, 0).into();
+        assert_eq!(0.2345, process_fraction::<f64, Data>(&data, 10));
+
+        let data = (b!("12"), Some(b!("345")), None, 0).into();
+        assert_eq!(0.345, process_fraction::<f64, Data>(&data, 10));
+
+        let data = (b!("12345"), Some(b!("6789")), None, 0).into();
+        assert_eq!(0.6789, process_fraction::<f64, Data>(&data, 10));
+    }
+
+    #[test]
+    fn atof_test() {
+        let atof10 = move |x| match atof(x, 10, false, Sign::Positive, NumberFormat::standard().unwrap()) {
+            Ok((v, p))  => Ok((v, distance(x.as_ptr(), p))),
+            Err((v, p)) => Err((v, distance(x.as_ptr(), p))),
+        };
+
+        assert_eq!(Ok((1.2345, 6)), atof10(b"1.2345"));
+        assert_eq!(Ok((12.345, 6)), atof10(b"12.345"));
+        assert_eq!(Ok((12345.6789, 10)), atof10(b"12345.6789"));
+        assert_f32_eq!(1.2345e10, atof10(b"1.2345e10").unwrap().0);
+    }
+
+    #[test]
+    fn atod_test() {
+        let atod10 = move |x| match atod(x, 10, false, Sign::Positive, NumberFormat::standard().unwrap()) {
+            Ok((v, p))  => Ok((v, distance(x.as_ptr(), p))),
+            Err((v, p)) => Err((v, distance(x.as_ptr(), p))),
+        };
+
+        assert_eq!(Ok((1.2345, 6)), atod10(b"1.2345"));
+        assert_eq!(Ok((12.345, 6)), atod10(b"12.345"));
+        assert_eq!(Ok((12345.6789, 10)), atod10(b"12345.6789"));
+        assert_f64_eq!(1.2345e10, atod10(b"1.2345e10").unwrap().0);
+    }
+
+    // Lossy
+    // Just a synonym for the regular overloads, since we're not using the
+    // correct feature. Use the same tests.
+
+    #[test]
+    fn atof_lossy_test() {
+        let atof10 = move |x| match atof(x, 10, true, Sign::Positive, NumberFormat::standard().unwrap()) {
+            Ok((v, p))  => Ok((v, distance(x.as_ptr(), p))),
+            Err((v, p)) => Err((v, distance(x.as_ptr(), p))),
+        };
+
+        assert_eq!(Ok((1.2345, 6)), atof10(b"1.2345"));
+        assert_eq!(Ok((12.345, 6)), atof10(b"12.345"));
+        assert_eq!(Ok((12345.6789, 10)), atof10(b"12345.6789"));
+        assert_f32_eq!(1.2345e10, atof10(b"1.2345e10").unwrap().0);
+    }
+
+    #[test]
+    fn atod_lossy_test() {
+        let atod10 = move |x| match atod(x, 10, true, Sign::Positive, NumberFormat::standard().unwrap()) {
+            Ok((v, p))  => Ok((v, distance(x.as_ptr(), p))),
+            Err((v, p)) => Err((v, distance(x.as_ptr(), p))),
+        };
+
+        assert_eq!(Ok((1.2345, 6)), atod10(b"1.2345"));
+        assert_eq!(Ok((12.345, 6)), atod10(b"12.345"));
+        assert_eq!(Ok((12345.6789, 10)), atod10(b"12345.6789"));
+        assert_f64_eq!(1.2345e10, atod10(b"1.2345e10").unwrap().0);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers_32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers_32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers_32.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers_32.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,330 @@
+//! Precalculated large powers for 32-bit limbs.
+
+// PRIME (EXCEPT 2)
+
+/// Large powers (&[u32]) for base5 operations.
+const POW5_1: [u32; 1] = [5];
+const POW5_2: [u32; 1] = [25];
+const POW5_3: [u32; 1] = [625];
+const POW5_4: [u32; 1] = [390625];
+const POW5_5: [u32; 2] = [2264035265, 35];
+const POW5_6: [u32; 3] = [2242703233, 762134875, 1262];
+const POW5_7: [u32; 5] = [3211403009, 1849224548, 3668416493, 3913284084, 1593091];
+const POW5_8: [u32; 10] = [781532673, 64985353, 253049085, 594863151, 3553621484, 3288652808, 3167596762, 2788392729, 3911132675, 590];
+const POW5_9: [u32; 19] = [2553183233, 3201533787, 3638140786, 303378311, 1809731782, 3477761648, 3583367183, 649228654, 2915460784, 487929380, 1011012442, 1677677582, 3428152256, 1710878487, 1438394610, 2161952759, 4100910556, 1608314830, 349175];
+const POW5_10: [u32; 38] = [4234999809, 2012377703, 2408924892, 1570150255, 3090844311, 3273530073, 1187251475, 2498123591, 3364452033, 1148564857, 687371067, 2854068671, 1883165473, 505794538, 2988060450, 3159489326, 2531348317, 3215191468, 849106862, 3892080979, 3288073877, 2242451748, 4183778142, 2995818208, 2477501924, 325481258, 2487842652, 1774082830, 1933815724, 2962865281, 1168579910, 2724829000, 2360374019, 2315984659, 2360052375, 3251779801, 1664357844, 28];
+const POW5_11: [u32; 75] = [689565697, 4116392818, 1853628763, 516071302, 2568769159, 365238920, 336250165, 1283268122, 3425490969, 248595470, 2305176814, 2111925499, 507770399, 2681111421, 589114268, 591287751, 1708941527, 4098957707, 475844916, 3378731398, 2452339615, 2817037361, 2678008327, 1656645978, 2383430340, 73103988, 448667107, 2329420453, 3124020241, 3625235717, 3208634035, 2412059158, 2981664444, 4117622508, 838560765, 3069470027, 270153238, 1802868219, 3692709886, 2161737865, 2159912357, 2585798786, 837488486, 4237238160, 2540319504, 3798629246, 3748148874, 1021550776, 2386715342, 1973637538, 1823520457, 1146713475, 833971519, 3277251466, 905620390, 26278816, 2680483154, 2294040859, 373297482, 5996609, 4109575006, 512575049, 917036550, 1942311753, 2816916778, 3248920332, 1192784020, 3537586671, 2456567643, 2925660628, 759380297, 888447942, 3559939476, 3654687237, 805];
+const POW5_12: [u32; 149] = [322166785, 3809044581, 2994556223, 1239584207, 3962455841, 4001882964, 3053876612, 915114683, 2783289745, 785739093, 4253185907, 3931164994, 1370983858, 2553556126, 3360742076, 2255410929, 422849554, 2457422215, 3539495362, 1720790602, 1908931983, 1470596141, 592794347, 4219465164, 4085652704, 941661409, 2534650953, 885063988, 2355909854, 2812815516, 767256131, 3821757683, 2155151105, 3817418473, 281116564, 2834395026, 2821201622, 2524625843, 1511330880, 2572352493, 330571332, 2951088579, 2730271766, 4044456479, 4212286644, 2444937588, 3603420843, 2387148597, 1142537539, 3299235429, 1751012624, 861228086, 2873722519, 230498814, 1023297821, 2553128038, 3421129895, 2651917435, 2042981258, 1606787143, 2228751918, 447345732, 1930371132, 1784132011, 3612538790, 2275925090, 2487567871, 1080427616, 2009179183, 3383506781, 3899054063, 1950782960, 2168622213, 2717674390, 3616636027, 2079341593, 1530129217, 1461057425, 2406264415, 3674671357, 2972036238, 2019354295, 1455849819, 1866918619, 1324269294, 424891864, 2722422332, 2641594816, 1400249021, 3482963993, 3734946379, 225889849, 1891545473, 777383150, 3589824633, 4117601611, 4220028667, 334453379, 1083130821, 1060342180, 4208163139, 1489826908, 4163762246, 1096580926, 689301528, 2336054516, 1782865703, 4175148410, 3398369392, 2329412588, 3001580596, 59740741, 3202189932, 3351895776, 246185302, 718535188, 3772647488, 4151666556, 4055698133, 2461934110, 2281316281, 3466396836, 3536023465, 1064267812, 2955456354, 2423805422, 3627960790, 1325057500, 3876919979, 2009959531, 175455101, 184092852, 2358785571, 3842977831, 2485266289, 487121622, 4159252710, 4075707558, 459389244, 300652075, 2521346588, 3458976673, 888631636, 2076098096, 3844514585, 2363697580, 3729421522, 3051115477, 649395];
+const POW5_13: [u32; 298] = [711442433, 3564261005, 2399042279, 4170849936, 4010295575, 1423987028, 330414929, 1349249065, 4213813618, 3852031822, 4040843590, 2154565331, 3094013374, 1159028371, 3227065538, 2115927092, 2085102554, 488590542, 2609619432, 3602898805, 3812736528, 3269439096, 23816114, 253984538, 1035905997, 2942969204, 3400787671, 338562688, 1637191975, 740509713, 2264962817, 3410753922, 4162231428, 2282041228, 1759373012, 3155367777, 4278913285, 1420532801, 1981002276, 438054990, 1006507643, 1142697287, 1332538012, 2029019521, 3949305784, 818392641, 2491288846, 2716584663, 3648886102, 556814413, 444795339, 4071412999, 1066321706, 4253169466, 2510832316, 672091442, 4083256000, 2165985028, 1841538484, 3549854235, 364431512, 3707648143, 1162785440, 2268641545, 281340310, 735693841, 848809228, 1700785200, 2919703985, 4094234344, 58530286, 965505005, 1000010347, 3381961808, 3040089923, 1973852082, 2890971585, 1019960210, 4292895237, 2821887841, 3756675650, 3951282907, 3885870583, 1008791145, 503998487, 1881258362, 1949332730, 392996726, 2012973814, 3970014187, 2461725150, 2942547730, 3728066699, 2766901132, 3778532841, 1085564064, 2278673896, 1116879805, 3448726271, 774279411, 157211670, 1506320155, 531168605, 1362654525, 956967721, 2148871960, 769186085, 4186232894, 2055679604, 3248365487, 3981268013, 3975787984, 2489510517, 3309046495, 212771124, 933418041, 3371839114, 562115198, 1853601831, 757336096, 1354633440, 1486083256, 2872126393, 522920738, 1141587749, 3210903262, 1926940553, 3054024853, 2021162538, 2262742000, 1877899947, 3147002868, 669840763, 4158174590, 4238502559, 1023731922, 3386840011, 829588074, 3449720188, 2835142880, 2999162007, 813056473, 482949569, 638108879, 3067201471, 1026714238, 4004452838, 2383667807, 3999477803, 771648919, 630660440, 3827121348, 176185980, 2878191002, 2666149832, 3909811063, 2429163983, 2665690412, 907266128, 4269332098, 2022665808, 1527122180, 3072053668, 1072477492, 3006022924, 549664855, 2800340954, 37352654, 1212772743, 2711280533, 3029527946, 2511120040, 1305308377, 3474662224, 4226330922, 442988428, 954940108, 3274548099, 4212288177, 2688499880, 3982226758, 3922609956, 1279948029, 1939943640, 3650489901, 2733364929, 2494263275, 1864579964, 1225941120, 2390465139, 1267503249, 3533240729, 904410805, 2842550015, 2517736241, 1796069820, 3335274381, 673539835, 1924694759, 3598098235, 2792633405, 16535707, 3703535497, 3592841791, 2929082877, 1317622811, 294990855, 1396706563, 2383271770, 3853857605, 277813677, 277580220, 1101318484, 3761974115, 1132150143, 2544692622, 3419825776, 743770306, 1695464553, 1548693232, 2421159615, 2575672031, 2678971806, 1591267897, 626546738, 3823443129, 267710932, 1455435162, 2353985540, 3248523795, 335348168, 3872552561, 2814522612, 2634118860, 3503767026, 1301019273, 1414467789, 722985138, 3070909565, 4253482569, 3744939841, 558142907, 2229819389, 13833173, 77003966, 2763671364, 3905603970, 2931990126, 2280419384, 1879090457, 2934846267, 4284933164, 2331863845, 62191163, 3178861020, 1522063815, 785672270, 1215568492, 2936443917, 802972489, 2956820173, 3916732783, 2893572089, 1391232801, 3168640330, 2396859648, 894950918, 1103583736, 961991865, 2807302642, 305977505, 3054505899, 1048256994, 781017659, 2459278754, 3164823415, 537658277, 905753687, 464963300, 4149131560, 1029507924, 2278300961, 1231291503, 414073408, 3630740085, 2345841814, 475358196, 3258243317, 4167625072, 4178911231, 2927355042, 655438830, 3138378018, 623200562, 2785714112, 273403236, 807993669, 98];
+const POW5_14: [u32; 595] = [1691320321, 2671006246, 1682531301, 2072858707, 1240508969, 3108358191, 1125119096, 2470144952, 1610099978, 1690632660, 1941696884, 2663506355, 1006364675, 3909158537, 4147711374, 1072663936, 4078768933, 745751659, 4123687570, 471458681, 655028926, 4113407388, 3945524552, 985625313, 1254424514, 2127508744, 570530434, 945388122, 3194649404, 2589065070, 2731705399, 202030749, 2090780394, 3348662271, 1481754777, 1130635472, 4025144705, 1924486271, 2578567861, 125491448, 1558036315, 994248173, 3817216711, 763950077, 1030439870, 959586474, 3845661701, 483795093, 1637944470, 2275463649, 3398804829, 1758016486, 2665513698, 2004912571, 1094885097, 4223064276, 3307819021, 651121777, 1757003305, 3603542336, 129917786, 2215974994, 3042386306, 2205352757, 3944939700, 3710987569, 97967515, 1217242524, 930630949, 3660328512, 1787663098, 1784141600, 2500542892, 4034561586, 3444961378, 785043562, 3869499367, 885623728, 2625011087, 3053789617, 1965731793, 3900511934, 2648823592, 3851062028, 3321968688, 799195417, 1011847510, 1369129160, 1348009103, 2876796955, 2915408967, 3305284948, 263399535, 1715990604, 2645821294, 1587844552, 2624912049, 3035631499, 2306636348, 3499275462, 675152704, 854794152, 4004972748, 1739996642, 1333476491, 4012621867, 3658792931, 3297985728, 2864481726, 3066357406, 785287846, 1671499798, 433044045, 1919608025, 264833858, 3999983367, 1116778570, 1301982149, 4213901070, 4081649357, 536169226, 1389008649, 188923873, 373495152, 2551132278, 1800758715, 3951840330, 2632334454, 3118778225, 1034046547, 1862428410, 3037609062, 1994608505, 29051798, 2571685694, 264151332, 2260643090, 2717535964, 3508441116, 3283713017, 1903365635, 923575694, 1219598101, 2288281570, 3676533911, 1014136356, 555142354, 2389170030, 4185108175, 884862419, 836141292, 2957159173, 1997444768, 4233903127, 2876184692, 3089125070, 1480848293, 1097600237, 299700527, 2507669891, 2982628312, 2114881043, 2529576251, 2812279824, 2987750993, 4241938954, 2204775591, 1037094060, 829315638, 1231047149, 52608178, 3735136637, 3455232602, 962039123, 488286513, 50685385, 3516451821, 843975207, 1572355722, 675489076, 2428445672, 1555117248, 3708476086, 10375249, 4172112346, 2117510871, 2227658327, 3187664554, 3050656558, 328034318, 3179601324, 1247769761, 3439263953, 1431538938, 2962525068, 1213366289, 3813013550, 2651093719, 1860661503, 3933716208, 264320617, 789980519, 2257856172, 102000748, 977269860, 1113845122, 3008928583, 1461738106, 557786285, 2926560363, 1038106190, 3643478847, 828004507, 457818698, 1933056971, 373408056, 2076808229, 3160935130, 2781854874, 2519636100, 177606000, 4237103862, 3977834316, 1621936232, 2599050516, 319893558, 3343370366, 765044144, 976657331, 7026264, 294277429, 3829376742, 3029627280, 2705178718, 3614653880, 230519152, 3288033233, 293525479, 3805751881, 3227511198, 2520308544, 3648103003, 1111086184, 437622105, 2232033852, 3239146386, 584244184, 1450926016, 2462430443, 3226534010, 298582169, 4214576928, 1762099469, 964985185, 1585788148, 1641127666, 787006566, 2315956284, 3258232694, 2275058964, 2541003317, 1508235863, 2613339827, 4080647514, 1152057965, 3149266279, 731345410, 914737650, 65395712, 1884566942, 1379520432, 2611027720, 4163073378, 2619704967, 2746552541, 1388822415, 3005141199, 843440249, 4288674003, 3136174279, 4051522914, 4144149433, 3427566947, 3419023197, 3758479825, 3893877676, 96899594, 1657725776, 253618880, 434129337, 1499045748, 2996992534, 4036042074, 2110713869, 906222950, 928326225, 2541827893, 1604330202, 226792470, 4022228930, 815850898, 1466012310, 3377712199, 292769859, 2822055597, 3225701344, 3052947004, 385831222, 705324593, 4030158636, 3540280538, 2982120874, 2136414455, 255762046, 3852783591, 3262064164, 2358991588, 3756586117, 4143612643, 3326743817, 2897365738, 807711264, 3719310016, 3721264861, 3627337076, 944539331, 3640975513, 3712525681, 1162911839, 2008243316, 2179489649, 2867584109, 261861553, 3570253908, 2062868357, 2220328623, 3857004679, 3744109002, 4138041873, 1451860932, 2364975637, 2802161722, 2680106834, 753401584, 1223182946, 1245401957, 4163377735, 3565815922, 2216942838, 4036140094, 71979081, 3924559643, 400477238, 551750683, 1174153235, 859969898, 1185921017, 1711399735, 812991545, 4051735761, 3549118738, 1631653329, 3631835958, 3648867800, 1206500363, 2155893137, 361030362, 3454286017, 2505909489, 1083595169, 453595313, 1510564703, 1706163902, 1632924345, 1381875722, 1661526119, 1082778324, 3571910052, 1140625929, 851544870, 1145546234, 2938573139, 907528924, 1304752338, 1764668294, 1788942063, 1700368828, 104979467, 1413911959, 3327497828, 1956384744, 1272712474, 2815637534, 3307809377, 1320574940, 1111968962, 4073107827, 434096622, 169451929, 3201183459, 3331028877, 2852366972, 3369830128, 2924794558, 3106537952, 3739481231, 1612955817, 4138608722, 2721281595, 2755775390, 843505117, 982234295, 1157276611, 814674632, 4246504726, 3532006708, 992340967, 1647538031, 204696133, 193866982, 3899126129, 300851698, 1379496684, 1759463683, 1354782756, 1374637239, 3410883240, 1073406229, 3038431791, 1053909855, 3607043270, 173719711, 3733903830, 171820911, 1573050589, 932781534, 4183534770, 2158849555, 372245998, 3573073830, 841339264, 2759200520, 1610547277, 2603293319, 3890906486, 1557138278, 3964109906, 677238797, 537994297, 1124184993, 4287078344, 4207654540, 2943022776, 2977947524, 3255359985, 4098397558, 2274666217, 2915862060, 243524940, 2467726756, 2869020032, 507521339, 3403121914, 522051455, 1803903108, 3471254194, 473535371, 1948602036, 3352095732, 3116527002, 1795743673, 775867940, 2551469548, 3757442064, 3162525227, 3765412747, 3040105484, 1927625810, 48214767, 2997207130, 1342349989, 2536583992, 1501320191, 3592287317, 887432730, 967585477, 3334212779, 948663609, 1064513472, 15386372, 2465931737, 3230242590, 3036652803, 2063155087, 1927500726, 2821790499, 2187774383, 501520074, 3688568496, 3606711121, 2576459247, 3176542345, 378322447, 156541411, 1400607301, 1406179107, 677848877, 2253753529, 193196070, 4207435024, 4166396241, 509467541, 2906024136, 1221753746, 3375413222, 431327897, 2749265123, 2848827671, 3412997614, 2051920238, 1283516885, 1300498239, 1957256104, 2634010560, 3531900395, 360276850, 1461184973, 2012063967, 2873572430, 2914608609, 4289554777, 1539331673, 1859532928, 4213441063, 538215691, 3512720863, 4258743698, 3040408445, 982396546, 343095663, 4138069496, 1021581857, 214185242, 1968079460, 2864275059, 3347192726, 4096783459, 3259169450, 3707808869, 142485006, 399610869, 230556456, 2219467721, 4191227798, 2242548189, 3136366572, 179755707, 3464881829, 452317775, 3887426070, 3446430233, 1473370015, 1576807208, 3964523248, 419325089, 2373067114, 1596072055, 1928415752, 3635452689, 1005598891, 3335462724, 3290848636, 3669078247, 1178176812, 2110774376, 3068593619, 1253036518, 908857731, 3631223047, 4138506423, 2903592318, 3596915748, 3289036113, 3721512676, 2704409359, 3386016968, 3676268074, 2185259502, 1096257611, 3360076717, 3548676554, 170167319, 3360064287, 3899940843, 9640];
+
+pub(super) const POW5: [&'static [u32]; 14] = [
+    &POW5_1,
+    &POW5_2,
+    &POW5_3,
+    &POW5_4,
+    &POW5_5,
+    &POW5_6,
+    &POW5_7,
+    &POW5_8,
+    &POW5_9,
+    &POW5_10,
+    &POW5_11,
+    &POW5_12,
+    &POW5_13,
+    &POW5_14,
+];
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+
+/// Large powers (&[u32]) for base3 operations.
+const POW3_1: [u32; 1] = [3];
+const POW3_2: [u32; 1] = [9];
+const POW3_3: [u32; 1] = [81];
+const POW3_4: [u32; 1] = [6561];
+const POW3_5: [u32; 1] = [43046721];
+const POW3_6: [u32; 2] = [3793632897, 431439];
+const POW3_7: [u32; 4] = [2038349057, 2033330060, 1456779151, 43];
+const POW3_8: [u32; 7] = [2324068865, 2151814273, 4219200356, 3831009148, 1515007727, 1223069914, 1878];
+const POW3_9: [u32; 13] = [120648705, 3524288303, 123305297, 1973552606, 1582677123, 4275192449, 223346561, 3350064824, 1500483036, 1257605964, 1367913622, 2878850248, 3527953];
+const POW3_10: [u32; 26] = [1995565057, 493227282, 1124501772, 1987702555, 1293151165, 901580639, 3173678675, 2491643407, 2858789928, 4190666723, 3234280160, 1552091534, 1098766192, 535263123, 671427889, 2428827667, 442154954, 3812608783, 2997209821, 882392610, 726842283, 3784254415, 1868908668, 1167284160, 3936843162, 2897];
+const POW3_11: [u32; 51] = [2418266113, 2644811931, 291457750, 1228555692, 4188395951, 1879994809, 3593180558, 10265866, 1663691138, 843910177, 428616802, 383870689, 363531492, 132717144, 1517834416, 1163669408, 3198438890, 2668578238, 3647540890, 862346293, 2517635987, 240350806, 3915968527, 1177122755, 748979939, 2832571033, 89370928, 1833830663, 2468463247, 2650192631, 2242055147, 1865594656, 4265350596, 1503068824, 1868812441, 2681777372, 2889847246, 3308916069, 983500879, 3408251151, 2154883072, 49524507, 3278693234, 4217536798, 4081384898, 3784867324, 607038776, 4050474118, 1564906641, 3106553379, 8397920];
+const POW3_12: [u32; 102] = [2840043521, 1540321337, 767411044, 3396833747, 259596680, 3733039683, 207521616, 948242495, 781132489, 2161879572, 891872999, 895088354, 1052134478, 3366112117, 2144001521, 2587580027, 3486676624, 1606020622, 1120717714, 3202521782, 2600718456, 1561168670, 4008838462, 4289731214, 2853963150, 2124711879, 2426069860, 4179412452, 2514942520, 782315593, 637303440, 2034234560, 1899461323, 1365048154, 143638530, 1091043496, 2313128713, 1632823752, 1501556769, 1617441271, 3832922217, 4022881155, 2291639705, 2009961883, 2923031135, 104349646, 721181067, 3110549978, 1118342134, 3111544970, 3523576724, 3188223411, 1433909029, 715526501, 480052905, 3456303432, 1911699360, 2383287320, 806454471, 3619655246, 797999986, 3490535011, 727608595, 3007402875, 412470314, 311012536, 4082475156, 1929900167, 2743731994, 123772258, 3183779998, 331631487, 2482139594, 2030549481, 886716221, 3336904643, 1675792966, 708537412, 3256221032, 1941911759, 3257054398, 2644783750, 2889722204, 2012789015, 3141472195, 2208384519, 4290796508, 3164140686, 798188221, 3588366685, 2275055709, 1007570156, 895359884, 308610244, 3285989372, 453890838, 2972940297, 3657184703, 4029262500, 1785980957, 1709474525, 16420];
+const POW3_13: [u32; 203] = [1989099521, 4118005181, 2784736632, 1591520375, 3149497838, 120872100, 3268194218, 2541515075, 1443129394, 2450564616, 4211997843, 3010894003, 3488508283, 3168823743, 4221978727, 1814219615, 2257880666, 2937457502, 726097399, 1432510431, 3623148218, 4212655794, 674028783, 1070458814, 2999384570, 1057211904, 1214775680, 1198321802, 1742834418, 3976283753, 1704638003, 1150196049, 862607433, 3094934565, 1717221074, 2662007806, 1439914256, 440811537, 2348627913, 1256162099, 267894251, 786369445, 1766348239, 3821736572, 3346805441, 153712663, 3885791558, 2372893612, 3047484027, 1233249852, 2901680213, 1633905397, 1227232372, 2772305912, 3924643248, 2682967226, 452577852, 4125302502, 3281241925, 4238233594, 2716754899, 3041594220, 2682018838, 626131564, 1963041990, 2065902713, 2603950262, 3095577885, 1839434394, 4180555672, 84786972, 4278806346, 3035916175, 2330476828, 1488573301, 2500745307, 851546392, 856436551, 3255008763, 1254027339, 3922579641, 684521982, 3718279773, 201247274, 2865772478, 1661217807, 2452776392, 2994094948, 1563975657, 3404497195, 26262692, 1976116320, 2717359634, 3933383310, 2639054358, 433403848, 3618223885, 515738077, 1166242878, 2870355216, 2931111594, 3146034481, 1341461620, 2902728897, 445742713, 2516857131, 3214583960, 2398636469, 272528879, 1474549553, 4074162653, 2846904993, 3653153845, 1143580991, 2862624787, 1146152282, 678419602, 676200709, 3450362083, 3496513874, 1340992762, 4202699539, 2772946083, 1813525850, 3647968120, 2351713161, 2620418793, 1432172974, 1926349909, 3142386689, 798457517, 2602933474, 1282058432, 1591224320, 2716997635, 1470549750, 3231957967, 1843138204, 916505043, 944975043, 3562455555, 142650189, 3496720432, 172385644, 1321658753, 3705048361, 2722721050, 1309746413, 3948489302, 1278815165, 2862992204, 416184660, 1314168979, 3057292743, 3306397597, 3990492847, 4077152808, 728714950, 1739211429, 2747763777, 1272802838, 311396446, 3721256556, 3351298146, 3532437535, 1181844299, 4211695344, 3293791810, 463498694, 467923860, 3160877532, 1513252595, 2210598062, 375855701, 2032403348, 126535477, 2612392194, 2324015344, 3456022262, 3450499670, 2870619468, 794761483, 3000301945, 2387559626, 2662253415, 3659359224, 1026083388, 1046817774, 3912755589, 2122896674, 3271718598, 2001918117, 1779848570, 2511901175, 2480900964, 1524873519, 2123619892, 3128581558, 2498944444, 637563527, 4159894460, 306290363, 269629471];
+const POW3_14: [u32; 406] = [2099150849, 701786787, 1755792598, 784340596, 1318601904, 3847911731, 587073536, 365758857, 458403624, 386356260, 1762699493, 3433357154, 2584239718, 3024933458, 992158912, 190818046, 626134648, 3100287313, 2050339901, 3193336121, 865261815, 4032628840, 3544894355, 1343940016, 2256792156, 660366745, 3495038095, 1796842708, 2708197863, 488865090, 3019365153, 3547886422, 338978285, 2879593856, 1161424980, 2532570101, 919483686, 285229234, 1471360694, 962282435, 3522233567, 812073225, 2974433512, 2062552230, 4142366515, 3030097561, 2370820074, 1533608708, 3136743081, 677180323, 2026099629, 3988538975, 2882718020, 2791855106, 901454064, 1733181317, 1815926074, 2641249342, 205063446, 1605355824, 1412530368, 392610986, 1165183496, 1547418282, 234904178, 1452470696, 4153026085, 1039567861, 976503900, 3326386007, 398523011, 636629983, 988936191, 180109784, 35078416, 3316096777, 446118631, 3363780714, 2778228881, 1121420008, 2277227294, 3286959436, 3390534136, 3471230490, 26261918, 1529388667, 1337804871, 157925485, 4005827295, 1940455666, 2179129784, 2230764206, 4133049885, 787743620, 206584505, 536424564, 2347733349, 2127350488, 3622501416, 2681290576, 29689975, 3157055732, 3755589600, 3964024562, 1703745931, 444745493, 1685391633, 3847735038, 1141249397, 4124411194, 2699168764, 2516945277, 1379343014, 1735161321, 2518007387, 4154772473, 2516518603, 77667182, 2901149252, 1077617976, 3033704680, 2341748280, 3239557938, 3625034956, 3851721623, 958796982, 1030859667, 1614720586, 1417286859, 3019299795, 3316288320, 2053046853, 1205913034, 406765224, 4163409034, 3644521955, 678788809, 1048403252, 2180427097, 1510574153, 1320493806, 4279263604, 281966796, 2685455103, 2666190803, 3067005562, 3221244892, 1971957474, 849438589, 1584595613, 2454213790, 2156344722, 3770071351, 2205912499, 2893248775, 1629808101, 252803404, 1632951746, 3155742212, 166264103, 492569650, 2230310542, 3689268700, 4204139123, 3759547874, 326889610, 711452220, 4058365029, 1128589942, 789582083, 4071978836, 2696635374, 3923925207, 1293857747, 2987905449, 3346858289, 28115676, 715947610, 608126801, 1751549604, 3309338460, 1129461952, 552591053, 267524979, 1414364888, 2528558825, 3781593658, 2335318828, 4139346762, 2281798865, 3588226868, 2855371367, 308801770, 2067748732, 2361054051, 3541790565, 1015821430, 1667098714, 2017648993, 2672308018, 1576401102, 59885878, 2536836354, 769548065, 3150906464, 3038028751, 2097625751, 4213561908, 1337967423, 2931763012, 2256338530, 3526977155, 2211626795, 3921745985, 4044006804, 2620267187, 1303853568, 138250406, 676718200, 2434799399, 1034944144, 2790768247, 1949560037, 2657385661, 1401109267, 2969455499, 2342873842, 4292623932, 3148918694, 169039494, 1361292240, 1689965319, 270493791, 1171826919, 1200742270, 2846839124, 3153980733, 3233534339, 3824262631, 326024744, 3780525617, 1649806460, 1500987616, 288775088, 3535410573, 3275414509, 3158560889, 2281111300, 3764770800, 1798194300, 2256605564, 1104786778, 147494599, 1948189160, 469870811, 3275616186, 1215054053, 1802946482, 215038054, 3232037233, 3945501635, 1363902757, 404304310, 2741496635, 4006384272, 3104805825, 2707083507, 1268576851, 74077974, 1902096819, 2500280581, 2077772156, 252830146, 330674602, 182339026, 3998928, 679066470, 2193213293, 2297252499, 3199220015, 2916487180, 34820209, 3043558828, 496902160, 1912842248, 2761877593, 81053742, 31423440, 1623392413, 3681614180, 3706303025, 3609099829, 319355607, 2116802460, 1631992176, 326568575, 308633459, 2253446077, 2505725839, 1658619050, 3717100624, 3124457627, 3938979720, 378615080, 796775517, 2484425710, 2370945803, 3635404255, 1642897911, 3461267096, 980851450, 669484175, 3957917346, 1291209040, 3534600633, 908358350, 1171284312, 1173895248, 2045404622, 2383359933, 694807182, 782712160, 276844360, 3279951877, 662528357, 1140187597, 962859221, 609598977, 3224082259, 606343511, 1007222254, 3312403701, 3723085654, 2896760681, 1268912052, 2669270762, 2776585343, 2328099212, 1913949529, 1705013131, 1352980727, 3247747100, 3237280485, 3725838632, 1816740850, 2095343623, 2604445469, 2014122662, 2278326090, 2137889241, 2073810843, 3230036038, 2722123549, 625335738, 2143934557, 3485229053, 907622657, 389106053, 517294670, 3975094579, 3460497132, 2753230712, 3618500254, 1767180180, 450598903, 318120517, 1371944747, 4270384812, 4064996567, 4062789116, 2378871712, 2581768669, 1541615487, 3183806363, 2187213713, 592752252, 2581891948, 105706307, 1271739594, 2675380672, 4001439490, 4045432171, 1661211140, 169691080, 3239633127, 1859466085, 4177368645, 4254065357, 1214584656, 4106228738, 1588437889, 4216163436, 1823694050, 1947452389, 3346370711, 3092250440, 808677001, 2442695134, 2423455871, 305111635, 781955824, 3233596643, 2406310476, 4094768582, 3539230931, 16926799];
+const POW3_15: [u32; 812] = [977076225, 665231849, 1569936694, 3300462826, 3759246837, 326316884, 2798287963, 3779953373, 2277747800, 689807777, 829104887, 2397668658, 1709214325, 4206373129, 3483391277, 462393218, 116664855, 3637894846, 2827889973, 2289639987, 3701261422, 4131673423, 1392299185, 18191081, 1308379809, 2813448616, 2137621016, 3532900543, 1569394972, 2216088761, 3605559987, 2480823850, 153023415, 2537218497, 754662786, 2688938781, 104227757, 3786462738, 1526336091, 4226287732, 2226740239, 221297306, 2380509180, 1464866741, 2133456807, 96068661, 76554789, 1194672402, 1286883027, 2750574887, 3680268940, 1148071571, 1618401263, 2273043207, 4233533562, 3294809827, 3038764813, 2260406468, 2751753334, 1445140655, 951517675, 2699714925, 797923648, 1411860472, 1216680597, 1265156686, 3093702682, 3635681048, 103475451, 1351713669, 1822435752, 1075856608, 617029753, 2108292708, 2265794484, 3444562046, 3013856539, 3374113009, 1273744434, 1798683062, 731085671, 1174843365, 1264751086, 3613934285, 234566293, 759631509, 2924341480, 1364564907, 1422066798, 3499662881, 3217435347, 1735515946, 783210314, 1463486206, 503941910, 573961175, 3116332448, 1988468357, 1619292039, 494673558, 289406169, 3681947934, 2354543125, 576799059, 604599075, 2021838681, 2539335679, 3620888342, 3440021174, 3167827176, 3202187935, 3409546789, 1753251271, 3951582214, 521441946, 3520318558, 2949580253, 1744686194, 3722262649, 623707689, 2906626542, 3122971166, 3666397302, 1405545324, 3247824480, 50348455, 2950984894, 4100482143, 2601927701, 769445341, 3282420320, 1612837839, 3846723436, 3100293446, 3454749416, 3832773649, 4106402262, 2132557325, 3697449131, 911174079, 1113364369, 4157715961, 3459844844, 884122317, 2104093387, 2246217016, 1014013752, 1363067164, 2136896341, 638524480, 856226478, 2613694659, 3809502541, 1101617889, 1348584245, 4085070738, 2653090842, 3548571547, 3638729786, 3978827176, 2701180571, 2431405901, 1991357722, 2789553889, 1215139818, 149948434, 1862909929, 524705816, 3865681882, 3085477434, 1234829146, 261905085, 2486282815, 902059058, 1115268482, 3234668970, 633446375, 2133637664, 208465789, 1168192927, 91089615, 2600824463, 821516792, 655082941, 2827356163, 958520014, 459754197, 3190418314, 2477738486, 2276057265, 2937046308, 4129474599, 2953340360, 720300476, 3071321147, 1961269026, 2626964164, 3295057101, 351312209, 3989328611, 4016287034, 2784297095, 2584564549, 4235964864, 3020191779, 3613856936, 3834427981, 2394222409, 4238789829, 4268785928, 3051356005, 3293606548, 3630736032, 422867984, 432824566, 3901098751, 2390975830, 3134306497, 2564921837, 4140939134, 1810973406, 232764264, 69946565, 1089005411, 288255572, 2307356902, 721551027, 2799884692, 4290562898, 3755023645, 3388258631, 1735432797, 3975130945, 3656271477, 980084222, 1693335884, 1128682411, 459254825, 4286436860, 1282800380, 3201300723, 2913660195, 1230767939, 2564841558, 2901607613, 2047657105, 312129423, 3670907676, 747204213, 398567505, 1017711391, 3562607879, 1151347463, 3504014102, 2885816569, 3702067617, 71206157, 3414390270, 875720752, 756309280, 2064378149, 3801432071, 2624302272, 4115743361, 2437234452, 4096619154, 2014005425, 837832307, 606482339, 1435363044, 3220253675, 2923815073, 3601698132, 2353903620, 320691909, 2980412705, 3629142485, 527344715, 712935520, 3244244787, 3953180185, 2997173735, 1152679787, 4141514275, 2153167521, 1995499395, 2881799696, 1641155614, 2156166469, 1572616433, 1510630704, 644378049, 4087657681, 3978892094, 691499394, 1761722997, 3050169641, 129094026, 2242972306, 3174880108, 4111928597, 2556230763, 1057341631, 3171345450, 4263386100, 3631765252, 1299324510, 2638754245, 2928716291, 2489288192, 1674137302, 2117213443, 882713605, 1721601475, 454277280, 2909840013, 4261878591, 4022483988, 3544985560, 458094242, 2961271485, 3048055976, 1376883343, 449828671, 564618158, 4214664377, 1215494659, 2499909252, 4219176856, 2811094696, 1385141981, 2701051365, 1856463317, 3584408118, 2968635820, 10172405, 2056014449, 3384619603, 2280278205, 3805365066, 901038155, 2068856942, 307396294, 3069118749, 998505300, 2487723299, 3358590131, 2731763005, 2707256312, 1883994053, 3799343800, 2732088777, 3387374759, 2710407985, 2023144656, 1627017642, 2744538970, 1417526901, 1979078266, 3955229367, 836934913, 3899152926, 3259588588, 4063607839, 1894138936, 4153978973, 2768699532, 3020574603, 2328913378, 1569099469, 799511246, 1133327297, 300277759, 3974871327, 2460059461, 3899205157, 3064672977, 1872540621, 945262695, 325232699, 76534068, 1479292589, 79858847, 4048780148, 4214538964, 3544736689, 3122263589, 3478566613, 81585786, 1883073293, 1586951053, 2187904173, 310461746, 3417021150, 921595721, 2053427479, 576973815, 3088873149, 254955010, 136832176, 4131280646, 396511795, 933966624, 596695524, 1886566601, 538546092, 1777359054, 1782863433, 4088120414, 2692527488, 1994469219, 1205575334, 2220302319, 3071518678, 1822291831, 555715043, 1382151022, 1251562657, 3366152646, 2235627699, 3309035321, 2952465262, 1588243565, 616371241, 1537858556, 3733502239, 3038942605, 2943072839, 1772377061, 212909121, 280698560, 1185201976, 1806348826, 3495857928, 1360522891, 667653581, 4169340271, 518461107, 4110527590, 2668038607, 2414610661, 1865330298, 825331100, 2444783573, 2466941253, 3650347584, 1397625664, 1980523468, 3793438624, 2690589061, 1195952221, 3747602114, 2374869194, 414544833, 27677727, 3400143154, 2210677843, 238322055, 2955979780, 1742604312, 1635554129, 4288342779, 3525767625, 3575812701, 3852420364, 774768456, 1506764262, 2429709095, 650578902, 340564538, 3927129992, 4056828676, 166703365, 33948809, 3717821049, 1509919413, 3567916042, 3981250677, 1927530024, 224725383, 600599372, 1383643164, 2138194201, 4215725040, 694881644, 3312648852, 772708618, 3733439657, 4142109032, 3690065639, 577875182, 2042961772, 2305850905, 2666010309, 4139127974, 3625925851, 37363622, 1484971370, 4226846556, 992135373, 1354091842, 2706219413, 4006422807, 3356274389, 1898412496, 372485657, 3113085433, 2469075819, 3700417951, 661665232, 2175263303, 4151002255, 1322953602, 1398857372, 4092760541, 460708877, 1380138655, 1173256788, 3543568491, 372513444, 3618774273, 171778171, 2906866967, 2741819333, 2449184156, 223365344, 4074821242, 389134615, 3872232579, 2182620296, 1144968045, 1253477771, 1488762008, 950621237, 2808471730, 1754633513, 1343614188, 707229382, 1587254860, 4057654663, 2471650257, 3003858919, 1521938392, 2801431700, 4041731793, 1665613244, 1764345685, 2682613774, 1089317494, 3920898996, 1631542663, 1152751820, 2593297577, 2401176124, 3427924880, 2895054615, 2841733279, 3854928360, 3715787645, 3776522603, 2555629509, 4206541732, 3223789014, 3740340293, 3320164578, 435177505, 2523400968, 563655360, 1581191127, 1144707279, 855705671, 1764404902, 1980422602, 3193983722, 1784826658, 2033241881, 3298662269, 4052448551, 1814214611, 2414784682, 1392057948, 1530764508, 4236021491, 2631121997, 1558832356, 65806235, 2439716846, 2333677941, 3855912835, 3323178073, 1648841414, 3829450625, 2677208545, 3734992945, 3608554434, 4151698100, 2265494611, 973831956, 1127908087, 2675067860, 2242029652, 1172430891, 386583169, 891502608, 3159236118, 91249420, 924134833, 655922446, 3878261204, 2569875981, 306765063, 3997879750, 922838874, 469732202, 3413422760, 2100428547, 1134345585, 2671194616, 744990806, 2212196019, 4048773444, 3791713114, 465130004, 396721512, 3896966880, 2771391871, 2858000595, 3584483877, 2691782662, 71701344, 3267381379, 2627664943, 487370091, 1128409664, 555841047, 682672357, 2207620346, 1974862125, 1961136721, 2764165810, 633378149, 3686514390, 1628451091, 1244377725, 4021981336, 2632625717, 212003232, 4213777100, 1614360497, 2205714513, 1193502716, 2965908528, 2556543713, 2169587738, 1716921633, 3361580901, 1270997602, 3251480352, 1461993621, 4009359607, 872306146, 2274523155, 2334723523, 3398888123, 4015291819, 12680754, 2805358789, 2247586482, 28821447, 4228210838, 2867165351, 4209425414, 922472442, 3643667272, 1313769367, 1778529406, 584053570, 83932611, 3878783785, 4196858881, 1254933100, 30545947, 2451049957, 154913180, 3845798874, 1409060809, 3698149006, 527499883, 3434852678, 1979037736, 401474618, 2713075691, 2032852562, 3315343561, 3117156026, 3181822096, 2967959904, 1867039832, 1567241529, 1015814356, 2412089990, 1113107588, 602907863, 159564957, 2080426894, 198488940, 3985292030, 55282183, 3166735149, 1314890162, 119232860, 3469854015, 4174956040, 2691924814, 1006559213, 1532043124, 3780490932, 735080823, 4038443176, 1464982680, 2188164698, 1105691252, 2832066849, 642565775, 2809009489, 3698954670, 1268079142, 3380048275, 2662521390, 3640101839, 1367787965, 1769983508, 1558676012, 3821420353, 557271040, 200032047, 2391640791, 3185110957, 3370102276, 4192700174, 1951921206, 2393913997, 2256077493, 3912963808, 890212418, 410895905, 793331347, 1194949436, 1163600753, 3261321478, 1478141486, 3778505335, 1148133083, 1580132921, 2075844758, 2044688990, 3252322700, 3450246327, 1665549940, 885615587, 3053594569, 2064590405, 882713210, 1035067905, 2624489169, 422434002, 861334403, 1732796031, 3463839962, 2080242549, 1471721702, 3879684426, 1737303084, 452970607, 2407914145, 1453526573, 2797693217, 699390353, 3388187217, 1293310005, 3490803260, 1346814231, 147543365, 3807051994, 513089673, 3224976654, 2555625000, 2421574820, 2500076521, 3147402354, 3326543525, 1259937196, 3089525877, 3832036063, 1145039035, 3033684338, 3430207412, 789393924, 3750175001, 2595067644, 2026469744, 2973210731, 77465930, 199452807, 3866340586, 786433973, 1959614337, 2595721884, 707599685, 2186856175, 3578934304, 66709];
+
+pub(super) const POW3: [&'static [u32]; 15] = [
+    &POW3_1,
+    &POW3_2,
+    &POW3_3,
+    &POW3_4,
+    &POW3_5,
+    &POW3_6,
+    &POW3_7,
+    &POW3_8,
+    &POW3_9,
+    &POW3_10,
+    &POW3_11,
+    &POW3_12,
+    &POW3_13,
+    &POW3_14,
+    &POW3_15,
+];
+
+/// Large powers (&[u32]) for base7 operations.
+const POW7_1: [u32; 1] = [7];
+const POW7_2: [u32; 1] = [49];
+const POW7_3: [u32; 1] = [2401];
+const POW7_4: [u32; 1] = [5764801];
+const POW7_5: [u32; 2] = [2768600449, 7737];
+const POW7_6: [u32; 3] = [1855011585, 809251672, 59871144];
+const POW7_7: [u32; 6] = [3233510913, 429135816, 2162242590, 3594221799, 4265959880, 834593];
+const POW7_8: [u32; 12] = [467332097, 140397015, 2040215064, 1542555902, 642371654, 3366106563, 831699702, 4090248544, 1331205625, 2632189658, 762431610, 162];
+const POW7_9: [u32; 23] = [21354497, 135586989, 282407512, 217755548, 3801957565, 1769047343, 3062175267, 1076844155, 1124873580, 2147641037, 1086167164, 3185325477, 3247742386, 2077448856, 1351003107, 2494468834, 1425599169, 1702421937, 627210051, 1827625163, 1157572577, 2350050876, 26301];
+const POW7_10: [u32; 45] = [684437505, 4048640024, 292557896, 3831731169, 3332525442, 473405432, 318170344, 90380968, 1033695812, 2724674731, 3595206122, 3629228025, 4209239057, 3965362365, 2238697023, 3154103790, 4052343864, 307061298, 318989332, 3153953031, 3156479151, 3680726623, 4137569985, 2873142659, 111620858, 2694718026, 9322418, 1564274048, 34089246, 3248975485, 350774805, 3831801630, 1993467950, 948561877, 2841933524, 572639019, 4216663619, 2647977339, 3749591258, 2896152255, 2891627799, 2539551806, 2116905892, 913342961, 691771383];
+const POW7_11: [u32; 90] = [3935789057, 4166252864, 1130174762, 746642697, 2097267391, 230814212, 262482422, 3074840744, 4242045452, 4198780607, 1168143213, 3832006688, 635278146, 3974112408, 2693579674, 4052193596, 224135106, 224110576, 1831951626, 884408112, 4161923167, 2530538468, 1766697210, 3734044005, 2193311966, 3643962908, 2508922853, 1237927695, 826765018, 301294391, 1355373603, 1013255492, 201605170, 4021658079, 1585360530, 2707437896, 1900635396, 1905296076, 1675742546, 1310459767, 3490908979, 1638170283, 4030411698, 3455559243, 2381042632, 3337653594, 279126172, 981840272, 4256082875, 2339121715, 620004595, 3193169600, 1024613477, 1289526822, 3754565871, 3118997668, 3220746202, 1344646439, 1144771397, 110884155, 2555110865, 1640054265, 266135361, 261538498, 2590652801, 3038147251, 4191122774, 4053161994, 3178416621, 3431021971, 1510437530, 2311593861, 420559473, 3882531531, 1283913491, 4286998498, 297948899, 1491612193, 2971470854, 1136813312, 1037229141, 134785729, 763322283, 3085025371, 3408591202, 487574582, 1031455143, 297009289, 2509812334, 111420556];
+const POW7_12: [u32; 180] = [959365121, 3423668100, 712143694, 444296678, 48418474, 142336985, 3887558252, 3943006832, 3576330202, 4129514092, 42707875, 2694838052, 4082217492, 1355779148, 1861261927, 4159987319, 2544936187, 3806468287, 2398026180, 3957753963, 402448149, 2470238010, 66876637, 2170332003, 2407422937, 1228991919, 2304511904, 3264332932, 2065315545, 2762340589, 334250829, 4004573477, 3741920693, 2645443327, 2594766859, 895785842, 685096937, 3987524779, 1950352476, 2513536865, 1885951213, 4205468775, 3467243111, 4147994187, 1971851587, 558300163, 2061929723, 2784144437, 2922857092, 983256724, 230712609, 3933689823, 3690771138, 339563475, 24292607, 3371043320, 1273540978, 999150964, 1547569001, 1982341170, 1284932132, 4168068064, 3400761299, 3440883534, 3651096652, 3298235049, 708333125, 2267355819, 1643664806, 4114241045, 2619840477, 4293837164, 2866213855, 333068409, 2378301991, 991300859, 3044159605, 4196815209, 4135023850, 2196188706, 962925211, 2245320399, 564630964, 2457639540, 3232877080, 3055780701, 980341, 2711742573, 861530545, 3387314866, 3853131369, 32864486, 2678257946, 2669908999, 2000719590, 4085016586, 783013123, 3352468813, 3041875261, 672636292, 130345520, 3182074148, 2375468194, 144749725, 455673297, 3298407527, 2300894874, 2550621169, 2686545759, 2253272293, 2104008843, 3417084127, 3977810179, 3028718465, 3616280352, 472810701, 2435685230, 1140184549, 1815608139, 820551257, 1499547529, 3723830388, 3341076506, 1943874127, 2208139362, 843305710, 3253353809, 450882879, 2226491280, 2792190206, 2983548622, 1950750459, 2107941997, 1949146725, 3541495173, 1504541620, 4057108078, 1764274118, 2345724503, 4134715625, 3990303177, 853336782, 2849901989, 4105387281, 2811829615, 2395277513, 1705693013, 3132275041, 962121883, 1160904978, 716319733, 1865107910, 2767053744, 597618956, 1268902401, 3183068659, 465089785, 4051212113, 2371235036, 153181892, 1517303695, 4284973800, 2302738028, 2923330867, 1156795778, 3306600239, 3325535674, 4131001630, 3795322436, 1518142203, 42963, 1989482042, 462137403, 274966593, 1990974015, 2775016969, 2607645715, 2927122125, 1884990280, 2890485];
+const POW7_13: [u32; 360] = [39682049, 2879252754, 3905716286, 2731189630, 966550211, 3252116258, 1335121684, 681044725, 2706091913, 648576539, 1423719455, 2112883936, 446026994, 788763554, 3766400133, 3802304351, 230490497, 1165165563, 11106404, 306247384, 2988589671, 1661613069, 439656198, 1535870016, 3928833501, 3568921325, 1383527719, 966546572, 2522388907, 633790419, 4215157643, 2929987618, 179646966, 1117925074, 4104859487, 290750689, 472489963, 2821759338, 2262625157, 1313217641, 3057814726, 574179583, 1571020465, 2183096229, 4252706683, 2950945461, 225603735, 3822968681, 1486094954, 3059720615, 1450766227, 3907188135, 871584955, 1088147742, 2446721734, 359320498, 1045473649, 152701656, 2073984609, 1019883931, 900397467, 4005214849, 1127792464, 2304454455, 455034548, 43343476, 4155327021, 2523732159, 638983805, 2892302829, 4283759155, 2943823736, 733632460, 2081380126, 2068191087, 3773292338, 3545085461, 2480295365, 2977057353, 1465321450, 4251560853, 2330236178, 200580713, 3888643412, 2710299332, 508228750, 3563957841, 611964264, 2420910703, 3715783850, 1060180261, 3687212695, 57436190, 2594481263, 3517172044, 2710085974, 1386435930, 2003427645, 1887681247, 67580893, 2492380859, 2530292932, 4141927460, 326169307, 3038495324, 1595985242, 4038575285, 871235333, 197140807, 2932035130, 3876347670, 102413750, 1348655981, 3781071583, 991687143, 2244663491, 3034023638, 2226118165, 4266682441, 2558001305, 652816556, 1306666356, 2409492116, 1189710321, 641930377, 121304481, 988012863, 1120045908, 2647024674, 1693808083, 2400379292, 4130523923, 2228041005, 3088521292, 3953572113, 1315146663, 1730466124, 448651717, 3142660598, 2888439717, 2144478006, 1952012792, 1281347257, 3034776202, 3385354032, 1610743174, 3250198660, 2062397168, 7849456, 2951565047, 1210878543, 3197024034, 3936553620, 1576601042, 1703562519, 2038817515, 1911545912, 3115087069, 2546337969, 1477903667, 1111933258, 788616929, 2725714831, 3330901336, 1035806609, 2773494881, 1840946151, 3387943085, 3856066552, 3124046370, 142112852, 3468696704, 1443178086, 4025409800, 3051817770, 3710270826, 1815171402, 2543269087, 1648373362, 1343483240, 4281806129, 1455193863, 2812972380, 1656167148, 1786309504, 3815616779, 1363050615, 3979406714, 2704972290, 496180240, 604853040, 3222170484, 1533573479, 2064025049, 525044436, 1431874076, 298038857, 3499922978, 2897172967, 949779672, 2390963596, 4226088650, 1288804277, 114574730, 3602333058, 4093682466, 958318090, 4092877466, 3776234353, 2890875716, 1589722447, 70461774, 3108903503, 1694441784, 52774611, 4265039878, 384595410, 1941048036, 4144534331, 2615953628, 245732993, 3234665791, 4163933482, 1697208095, 920250943, 1613357097, 3496559205, 3015994176, 40127559, 3369681758, 322792290, 3524996575, 3994827051, 393680817, 3200838249, 1153726347, 2406622498, 3869429162, 425402345, 2207346618, 365059, 2913999903, 4229175742, 2389219440, 1271061414, 1326457181, 450511120, 3944707822, 3886268527, 789528580, 852899589, 2410522351, 4038073280, 2914394560, 1370579794, 2293563894, 2719647097, 3380071952, 3067201483, 1763398529, 2991294230, 2209995439, 3200272980, 2005056358, 1166615296, 880283180, 3472909777, 342105901, 4124970840, 3561185389, 4208382111, 2839271323, 1206554429, 3696465541, 3706600000, 4229678662, 927942557, 3432267311, 1525401348, 2926457083, 3636398962, 744164581, 2280802780, 1850592388, 3725781290, 1981983136, 2894286166, 3518902953, 4130465722, 2780390157, 294854241, 4252673443, 2401608171, 1052084730, 1085373656, 1581328005, 3173411406, 3835729745, 2899844887, 3136848387, 1454757175, 3772637913, 1260190546, 2099037014, 3394671557, 1749814814, 3800071156, 2262535435, 33126042, 2981030374, 2265695734, 2284915338, 3206556658, 2832368439, 1417325431, 1582639928, 2632360018, 1712991880, 2547303465, 1517517778, 3660163307, 1046516952, 2374217362, 2927717337, 2513567247, 4244432732, 3248485883, 3851115926, 1003869639, 3947494045, 703696287, 1034178955, 1036111252, 1790993163, 3023345892, 3450329516, 1660808035, 3850898253, 1771224094, 579613367, 2072593500, 2421697040, 3247577931, 1513830843, 266394078, 1416619970, 1337774628, 1654066033, 3821326261, 1375198867, 1094040881, 1528646615, 3652940609, 2913873658, 1945416978, 1951666989, 3036904715, 2325875688, 1194681677, 1945];
+const POW7_14: [u32; 719] = [1153105921, 3748096586, 978622910, 3057108446, 4163170541, 1475680606, 2896837077, 1817581710, 4230906863, 923122206, 2922006298, 2809572217, 3083308048, 231281980, 627002913, 106338948, 89650935, 1486504804, 2516894440, 3179661582, 3612364719, 1773194738, 4088816374, 354575531, 3666777246, 1576096274, 4233470586, 2095621999, 2970035246, 4110595912, 1358918312, 3628722034, 1149966972, 591400841, 3187581789, 4193396823, 12888783, 574915035, 2249808107, 3381397609, 2623734857, 740709562, 2546218981, 1725780745, 3351544684, 3633549760, 513705480, 3197256058, 1040246531, 1592866823, 2459213266, 3905053856, 2914075030, 915653484, 2333738230, 217825286, 2444620904, 2078822099, 608853997, 102326136, 1311845337, 871277544, 820523394, 1738639497, 4065841057, 1613004231, 2660853222, 2868364490, 1224390301, 513979072, 2055102626, 2109197819, 2669136545, 2085059472, 662164683, 394805015, 3659253988, 2984019579, 2109740354, 1779344816, 304690248, 1330182754, 2018784696, 2900087501, 3007768746, 2102207330, 2981687066, 612325851, 2279869201, 1529453769, 1972024802, 1499876922, 516721211, 321506622, 2707831412, 1201984786, 2336323361, 4219002744, 438957379, 828217643, 4194939659, 2231811303, 384618266, 2593821208, 3563124922, 4107917569, 3403654838, 2049628812, 1052405170, 3716531778, 1929466028, 3972824820, 824258969, 2497221351, 4151283990, 3657604243, 1007508491, 2276339330, 3866424680, 2244938938, 1571583002, 1949328097, 2674201210, 3934027974, 1820081934, 373810442, 1158794837, 1535976805, 2594293063, 1265703501, 1302223049, 1577048594, 151730989, 611882750, 3680638713, 1504655705, 2540403722, 3694579162, 461807637, 3019726503, 3612147647, 3015269393, 2204949105, 526872857, 1035176768, 1835861107, 2364218155, 2681021965, 2554335141, 1288907257, 2605885745, 3807016274, 2952394860, 1044216606, 82999816, 2830344404, 3205579736, 3705177523, 2769864739, 1456121549, 3573727012, 412745620, 2189310813, 187260800, 2590038269, 2420082833, 2314343445, 4136873716, 3047185979, 3178516382, 3032609299, 642806458, 1454301025, 82252124, 3275337515, 1734026600, 3741465849, 2676973446, 2749492780, 3078811183, 3652601975, 523379590, 3297473030, 2317427843, 32842235, 2816337061, 2475200552, 423232845, 497187125, 4214825014, 2174134877, 1493591393, 3250970901, 2332110719, 3959711000, 3929962791, 3625751890, 2435618294, 197650571, 2581084028, 359459964, 1836929608, 209890023, 703580385, 2177789617, 951344639, 2664644557, 2436893896, 2571451997, 3806745872, 3547944748, 4040254763, 386888799, 140028986, 3881171361, 1501141365, 4056634011, 4189900791, 1966959141, 1613488508, 989474367, 854455994, 136161545, 791237984, 3698679741, 535816137, 979707224, 3335735253, 676376709, 1517887200, 1144246118, 1274409907, 1616516914, 912735086, 2379244426, 2517318681, 1597046559, 12333141, 1073220241, 4220849166, 3636789234, 2358542730, 54029752, 1937294786, 2672023367, 3546104798, 3811752789, 2427341597, 3076000293, 1991184063, 3753278648, 121003404, 3652600541, 1984852734, 912364563, 2047474216, 1935941550, 3764307070, 1582175758, 127440725, 2330212039, 526839080, 3312028891, 1394970791, 1474372973, 2540744706, 1738211591, 3837815516, 3252079654, 2301442285, 1613562956, 2499277553, 3441096592, 2747500539, 2287259636, 2807578121, 1677289991, 1665996425, 2217022758, 3756818249, 2980850970, 1544637470, 1633921400, 4205764903, 792411862, 583762863, 2189836678, 1922953239, 1346364866, 3014148848, 2340843708, 1670072191, 1255400575, 3606338005, 2570968473, 2425790420, 707900326, 2143152343, 2745029367, 670293110, 3999614746, 3370996986, 491656146, 1532127729, 77134227, 4178304080, 3558559758, 3725562259, 2466603336, 2438859951, 3311034008, 1514769094, 374651559, 1633871428, 1447594957, 2427805085, 2684566455, 1732135452, 757320869, 3768098156, 3397376950, 1480382334, 588057005, 2957530935, 2011613980, 1687967416, 1777963549, 1233920782, 2294471781, 112108380, 3009690358, 3736688893, 72034545, 4246427889, 2695216477, 530287243, 2050752351, 652291986, 1662763440, 3689402310, 2144301097, 2283252203, 3479162609, 3066689563, 2807261412, 4146952328, 1437257025, 55350497, 3459772015, 369017485, 738846542, 805222689, 2961340083, 3475656112, 3326516981, 2800947885, 2336052516, 2654129831, 238976140, 83443562, 330221668, 3317802863, 666725705, 3383708319, 993009182, 254579037, 4242485096, 1579429492, 3811867359, 3450480200, 1481985188, 1482644519, 2910231812, 3308446917, 3011690497, 2304226970, 1134916107, 488410008, 857142045, 3986457525, 1456260330, 843366222, 3304110132, 4138476730, 736041681, 1547352989, 3049665367, 3506381443, 4124716701, 3381880597, 1915742763, 1808725730, 4105410130, 2198569419, 1386329308, 2356293163, 2685388559, 1719133264, 4228371740, 1468536490, 2067459757, 1718630680, 2324243436, 2952968880, 4076335840, 2403998755, 809862168, 2806524602, 2802419727, 3923693949, 255077309, 4150937580, 822572440, 3602578857, 1263840496, 2488015830, 902056622, 1643356219, 2838629771, 3610298087, 2179873862, 606152528, 2437557331, 3488800879, 876430535, 3098692439, 3125969266, 3160034175, 3523921867, 115637708, 2818674504, 2793552788, 3727731629, 3585445699, 1835434236, 1669933918, 3922127915, 999653945, 2175581148, 3020535201, 3928723015, 3317467748, 1944034356, 217205701, 378862281, 807325426, 867399702, 290496724, 175373522, 3580436040, 568376999, 881149950, 1005592714, 1887045576, 747546941, 2914821352, 3305251061, 1279405556, 881399316, 547602040, 200297724, 1560896296, 2935557875, 748832393, 373218117, 3073301090, 1618010803, 2434671440, 797497944, 419297674, 1553563068, 2313622833, 3559700525, 1635613056, 1123818923, 4112032971, 528915762, 2109047881, 4145488685, 155480440, 2423616749, 1183660032, 2477160975, 828160843, 1484661647, 2471164875, 1489334933, 1012896981, 2338203819, 339361895, 4078634584, 2068779935, 1102030564, 2402077859, 913116273, 809671166, 3761753718, 3940674856, 1742006890, 3686867776, 3967164332, 3646017009, 1331274146, 1731062675, 2538196931, 2828367729, 1244400705, 1319780385, 1316177888, 1870289197, 1316080050, 3170658907, 4107182519, 1177187703, 569255601, 479247227, 1380242537, 555072541, 2004418401, 4282549996, 3119355810, 837186318, 2369247570, 1099970852, 561838147, 20602717, 1138744095, 2891632962, 1493526963, 3499306068, 62201839, 2433802059, 894372251, 2751097797, 1714035873, 3101021033, 2512576194, 3972865821, 1099362247, 3724167579, 1331499754, 776982313, 904336468, 2796586040, 1946476205, 1306766676, 796080494, 3388182499, 2603454905, 427659975, 4154723015, 390160151, 313493660, 1526895795, 2230189943, 4227662425, 3170756818, 3030306231, 8858515, 1122624576, 2923206001, 3469487704, 2441063536, 4202927798, 4084007727, 935649002, 1963520419, 2649713081, 3337381769, 3607591719, 78688266, 520191842, 4042543809, 2517983022, 266942687, 2568707342, 1145096805, 2989583839, 3454749423, 2941347316, 433006007, 3385957842, 2158533973, 1297931376, 1287013961, 2104630109, 2054364877, 1545615453, 2448905893, 3540073710, 1623584004, 1967252767, 1994341042, 1310732054, 2013842419, 3333117969, 2210515758, 2296487942, 1395582116, 3375670959, 2892151175, 4011817996, 619230196, 495042200, 2620782475, 1695574355, 553255419, 3803106015, 4208410060, 2286831406, 1193771919, 3298509554, 3411559309, 4180378230, 2855176103, 1875028861, 2414766865, 1354638132, 4041297731, 3889126499, 100683305, 774308857, 2008948704, 2621007698, 1317839822, 1977505935, 1699489450, 1576232670, 1207737392, 1880318149, 1893164693, 4268540102, 1446410475, 2209518770, 2798189966, 295412899, 1449048199, 1905265270, 3671064440, 260580421, 4150015275, 3668501119, 2341543178, 1698397458, 1549193903, 2671077356, 313973002, 4188990811, 3758641278, 2621061863, 3011353435, 3720176335, 2831212049, 3900897064, 1409175473, 3103835334, 3443002515, 2562592851, 2448088013, 1820389257, 1450260636, 1771109840, 3036330463, 1646746416, 518150615, 1801754979, 3595046886, 2104281978, 2267537723, 857190932, 1871647842, 2990058049, 580273327, 2686857724, 1637859671, 2414777686, 3107828639, 3139674888, 3467628273, 2709878525, 1038907005, 4075121701, 2814464206, 3864794613, 2660278673, 2599961839, 2030885286, 2827273080, 527219392, 4018232299, 1368084053, 3869553637, 1389963880, 1571327879, 4225101988, 1861605877, 2197582553, 3851374488, 208574880, 1204848641, 4294490766, 2842385856, 913263915, 1958032961, 1454915737, 2843434041, 2490051537, 2118049584, 4281828637, 2544353302, 1823440601, 2427463976, 89726641, 4097444643, 1640965918, 532209431, 2943387299, 489422232, 3784107];
+
+pub(super) const POW7: [&'static [u32]; 14] = [
+    &POW7_1,
+    &POW7_2,
+    &POW7_3,
+    &POW7_4,
+    &POW7_5,
+    &POW7_6,
+    &POW7_7,
+    &POW7_8,
+    &POW7_9,
+    &POW7_10,
+    &POW7_11,
+    &POW7_12,
+    &POW7_13,
+    &POW7_14,
+];
+
+/// Large powers (&[u32]) for base11 operations.
+const POW11_1: [u32; 1] = [11];
+const POW11_2: [u32; 1] = [121];
+const POW11_3: [u32; 1] = [14641];
+const POW11_4: [u32; 1] = [214358881];
+const POW11_5: [u32; 2] = [772479681, 10698505];
+const POW11_6: [u32; 4] = [2875311489, 3456163242, 1429612321, 26649];
+const POW11_7: [u32; 7] = [2585905921, 2073480325, 1636806860, 3370723472, 3947938656, 3233553771, 710186941];
+const POW11_8: [u32; 14] = [725390849, 983511997, 1546466724, 1452173552, 4110885543, 3594965768, 3109748563, 3754293795, 4268788147, 2994526333, 3490277564, 3382469739, 833985310, 117431742];
+const POW11_9: [u32; 28] = [4267518977, 3418704948, 4145983365, 2633889206, 1401015784, 2168955970, 4023491585, 2524575715, 1049283211, 445723862, 2434794608, 580179552, 2985579862, 2834866824, 480627468, 2191904507, 996937640, 2935962584, 1843145488, 1510931281, 327439189, 27267795, 129172641, 339183348, 3871693391, 3654642246, 1800239665, 3210784];
+const POW11_10: [u32; 56] = [4232730625, 4097932706, 1490802744, 1867908586, 2724996515, 2011879905, 326698679, 4127462488, 840325205, 2229494804, 1262994467, 482469434, 1420581911, 3335497932, 1947974370, 115845259, 107144140, 4106149828, 1698261230, 2710549612, 635562105, 955831875, 3553998392, 186570327, 2293025151, 3737801843, 2669890933, 2617861926, 811827227, 1669377375, 2900245233, 1521548800, 1807704428, 414015847, 4291805179, 2832878152, 4263613655, 1607020746, 4106685115, 1439641309, 1239778605, 3869166695, 2478617187, 2371970986, 314417574, 782839013, 2698203809, 2206976258, 2530586241, 2282465641, 4070492013, 3894191130, 926862392, 2441413722, 1215075862, 2400];
+const POW11_11: [u32; 111] = [4141133825, 2032979484, 3524827159, 1779079378, 4024400033, 1736752743, 2286386169, 2281943783, 2312119071, 1441879824, 2106994417, 2198887008, 3538871549, 3308641462, 1802204363, 720418141, 784183413, 155727697, 400164668, 813106568, 422073521, 22474994, 2846752640, 2303474280, 2066227883, 1503268392, 250830710, 2090036307, 2739805682, 1001846430, 3888615633, 2916606130, 3948696965, 4099947954, 2539164700, 3619344625, 1436649263, 390608915, 4179636138, 1731812072, 3606488196, 2063647324, 350623992, 170798726, 1288828649, 1497761545, 2941359089, 4222238530, 2336294577, 2515641214, 197418423, 4025643045, 3210677689, 2358071829, 3406251140, 3112734109, 4192102319, 1407631921, 4084900893, 1332291286, 1473052503, 3193020458, 3582429336, 2287319506, 2689946046, 590828939, 1092703632, 3967962452, 1955093624, 3766411750, 668711646, 3860644732, 647459628, 3424440292, 2712061312, 3397247314, 3045422855, 1832687227, 1747645833, 1244959344, 152949509, 1075533131, 202325721, 815802040, 3793027242, 2431666777, 4145768276, 92597003, 3756449424, 771389754, 2833191593, 4152921425, 1032605176, 439850745, 1990627130, 3239738123, 2963980584, 3329048404, 3214391679, 3009295430, 3682028224, 220913858, 2536745075, 2023812800, 2800493459, 3121880805, 974926757, 2069202727, 720743103, 142305700, 5761358];
+const POW11_12: [u32; 222] = [3869859841, 2854063917, 1889884208, 2022964038, 3603195100, 502071371, 474465694, 4152855322, 1398326773, 4275106380, 887147922, 1691233063, 2011450311, 388838798, 3801654612, 1331477005, 747816233, 1900605903, 1009749887, 2645734039, 1539916229, 946336119, 851071301, 2692816950, 2662152929, 588635876, 3187004443, 3576613079, 1981871555, 1738099482, 3380892176, 1796956124, 3397525580, 657292099, 2591699721, 3149742663, 4041201154, 2195797098, 3351045615, 904595538, 1334241505, 1521739205, 2828238575, 1038796987, 2547250474, 4200726341, 2703556888, 1739688469, 209829270, 3962781589, 4264971273, 1149735334, 2167150866, 939580810, 239676954, 3218166905, 1552866, 3227504832, 1404487130, 2131450362, 1742093842, 3923402526, 427152929, 2927933153, 2471455735, 1995653969, 162843970, 3235954335, 1548968465, 188747565, 45604216, 1855505400, 1992538720, 997981727, 1559880400, 3491821681, 1490986077, 1924332905, 621812681, 3676379956, 3975921387, 275936914, 4032514215, 3879034146, 3403485904, 595163544, 2554398869, 1953178592, 2826546226, 4184318576, 2722054308, 353502213, 4049756048, 3477037883, 1376236983, 3590379845, 3196628706, 3500798689, 4241740474, 867181969, 779564930, 3911113180, 751942860, 2089630146, 3098914351, 170156892, 2972958347, 2030930695, 630104136, 4174596611, 3610904270, 266982989, 584140030, 4140942458, 3586658039, 3868077426, 3846170377, 2104241794, 975478838, 1543171979, 66720657, 77614061, 737768900, 3576929742, 4024034598, 3067027138, 2170480890, 3649174216, 2001675371, 2111191181, 3801182046, 398908084, 1346485642, 4122990553, 382415280, 850245041, 3284568739, 2534805287, 2823194212, 577939938, 2036269819, 2937472987, 311426674, 367746621, 1689857062, 3424697633, 58605103, 11984314, 877875338, 444100515, 2306970422, 64456454, 3583517780, 4229732174, 4274921429, 2252255259, 3825433926, 1695539474, 1778915798, 2673475271, 2477589530, 25638469, 272317646, 2790651081, 1511598805, 2775216623, 2521592706, 1041000893, 755617320, 2097900204, 462265493, 3907772707, 1663734723, 3889590955, 3920735492, 2602716974, 3960180417, 1970046431, 1435078416, 2818559054, 2384120597, 3902012439, 3472928531, 3458904990, 1151760472, 2654969323, 1576704615, 3965273527, 1465371726, 1704948267, 3067789515, 2045561924, 1391284099, 296961224, 149394475, 636839124, 2476458570, 1406040725, 4203739580, 425906425, 3896729981, 1154686444, 243822498, 3013347645, 780439327, 3321355321, 1150372588, 3909023926, 3283498893, 1381234586, 3540879757, 1738538592, 1861402027, 2769530245, 3578873312, 78385056, 1954255545, 1485602757, 1588799125, 2673761104, 1739122459, 7728];
+const POW11_13: [u32; 443] = [2974990337, 886810347, 1235367469, 3247998528, 1266708286, 2281334753, 3508173699, 3584374607, 927020900, 1956332791, 423255369, 2478161032, 1110082262, 179285634, 76779911, 2944469863, 1014042971, 3004104218, 40989949, 1097347567, 2144381125, 2982306288, 1594568231, 840934796, 668771519, 2512929418, 1926593062, 2286317039, 115375215, 2422055400, 3496946850, 721689833, 1760159277, 303610295, 3444971505, 4005211476, 3030238888, 2747270777, 471274338, 1231716495, 3743325078, 1580360895, 345974508, 3614608741, 4290395798, 4142762147, 3552241329, 3959257273, 3114916710, 2989797040, 2743528887, 4144868575, 2329751946, 2023346244, 2722914919, 3963062858, 3805443369, 2843879915, 3376707268, 452779392, 4202201503, 2882236683, 3983056802, 1841321863, 1943804249, 695628442, 2250666831, 474733573, 1309970587, 1574342593, 3436394886, 2079535374, 1473583641, 1801902801, 3293611912, 2392725287, 3312283079, 1033749601, 954822500, 3163673053, 2185522280, 2463483901, 1770933757, 786641795, 2301956811, 2686259278, 39312491, 3914666264, 1762789717, 1837306708, 1007435468, 2177160075, 3296655398, 1282950346, 2038964665, 2580894214, 2751586561, 2917187922, 2937144239, 645598957, 2684220382, 2702748272, 3590116382, 2459018264, 1540131195, 2198036930, 150782656, 2604814448, 63350345, 4217056873, 888507216, 2197882270, 3540801146, 2903226106, 722862329, 3395604303, 3970614305, 44729879, 508855665, 1572645425, 1260787290, 1054909269, 3167223460, 107910164, 3952497435, 1466355981, 3846625768, 29242262, 3180243996, 2569443999, 4266302660, 4103339395, 3283032177, 3672978853, 594635929, 3416582250, 1237100891, 281707214, 390060316, 3627008920, 2684206858, 2926850740, 3020008643, 2691769288, 3673654227, 1082908754, 3040464583, 1704951909, 3794131135, 2749543778, 718192982, 563547953, 2828954940, 3959732687, 2656908980, 2138436744, 486521795, 1171424981, 1625045989, 724353093, 412005125, 3032400303, 1828341894, 1945517046, 150116753, 773231125, 1705584394, 1466940545, 859075406, 4132076121, 83313068, 639737848, 1676217023, 816236605, 1497752199, 823896869, 3749261953, 1261979817, 2748516810, 3621634515, 4030362957, 3373576215, 298434919, 1129231193, 4262487017, 3332018489, 4019029330, 2163521164, 1079519614, 2725808019, 3541407711, 2631878018, 2548421851, 2117515271, 1054311869, 2464880688, 4203703314, 4181753824, 3365161331, 2018783743, 2560337842, 2014785831, 1932415105, 1762245993, 884237557, 3230276329, 20454952, 3683272639, 356236860, 3499440238, 1990782775, 3224132926, 416822690, 4242275363, 364749046, 2007597332, 1605047707, 2521834722, 1912978517, 810916178, 3542071297, 1801734579, 1143093630, 556038080, 2067456433, 1014687787, 232532349, 1748043586, 2069484578, 20784607, 2276087048, 3157699876, 1968607472, 3831090736, 1654015548, 3726576643, 2830024300, 3647816176, 4099267749, 1298173212, 155940039, 2428617961, 1546314543, 2714667295, 2830915896, 1139822374, 797836549, 1418220596, 4066046461, 4146345735, 2259397643, 2228421691, 2468365576, 1370849257, 4079360423, 1139661317, 3949688523, 61570993, 1159761556, 2811376232, 737984647, 1393665393, 4010402903, 2079282959, 291080581, 135460766, 1037662671, 4177242690, 374053900, 3682728148, 94673243, 545582988, 3154559367, 95206075, 363445988, 1013020252, 428519276, 3952976820, 555114629, 928853924, 2720137936, 2746901602, 3444735454, 600310186, 2018362055, 1843342515, 3880080454, 984961881, 3907780401, 3056144783, 3184949149, 3950783192, 193469505, 2635151519, 817462585, 2945037563, 1993534483, 724379440, 1333667479, 2492836205, 3381464640, 3368271876, 2031170389, 4067633372, 3924918837, 4286754266, 3458306614, 734339222, 614342218, 236164084, 1584809905, 2111183392, 1306657771, 2141200365, 3124308398, 4270571755, 3550451412, 478128667, 2686883913, 3611569215, 2910085506, 3018633570, 273750991, 1072897033, 2493114187, 4186065849, 1596097473, 3699214752, 339363728, 1441513643, 3507673604, 3995323433, 3867827003, 4077574071, 3757981427, 2425459708, 627460790, 4206690153, 664849414, 1445743014, 787429280, 1567786561, 193640995, 1063599729, 1475528048, 2643870666, 701285894, 3591459499, 2279084258, 3955873780, 1287087372, 2251837591, 1146015384, 3051667063, 2550050456, 2516734256, 4208571648, 598826918, 2304366111, 2851076526, 1993463006, 3839353374, 967227050, 95846598, 1609952768, 435034943, 3531583260, 2568808904, 3619367599, 1477226707, 51110073, 177139523, 3888931447, 769851956, 2495542158, 1592424566, 2778962622, 3834261637, 1659135327, 491759826, 1112811379, 2944548908, 2883134377, 2326760206, 2945056646, 3496435689, 1692799806, 349018150, 1764242425, 2855067765, 3748713256, 245165772, 1825448728, 588045899, 1967959460, 2182946280, 44403394, 618505048, 415106561, 1298153882, 2503705565, 513469357, 964967278, 939724558, 386295402, 3569810726, 4168598696, 3553597393, 1627215002, 2889135, 3373164162, 505222248, 489875874, 1209335956, 2847054290, 4284077100, 2379694006, 34096050, 1229732749, 1354001516, 3061649930, 3736286526, 1243461683, 4049558096, 1418890796, 3369219718, 945406425, 878930290, 1700641215, 4079722516, 2452574684, 314984708, 3198984676, 2894702689, 1109209654, 1293554534, 464385312, 32630398, 1116566508, 1339200257, 1072368191, 2675604766, 59728242];
+const POW11_14: [u32; 886] = [4070932481, 1131894294, 2541580517, 3314335917, 2621222710, 2869536534, 2259585760, 308457433, 3075365252, 141385081, 2209617233, 342003376, 987047251, 2752647932, 415512433, 412750028, 3888010303, 1026392053, 531725674, 41885172, 517497408, 4045966437, 898789227, 399141194, 829183925, 3196159056, 1556167610, 3587980714, 1523862219, 1639041152, 2084734832, 3189329044, 1765573105, 2141192374, 4156227592, 979640142, 4121679305, 1782014569, 1070929751, 1648884387, 3147541389, 4220465729, 4098653625, 303180016, 2564515297, 530392946, 4081743324, 4022373073, 3566899890, 4108692210, 2801029917, 247188192, 3415226323, 1401953185, 1200397516, 2396501541, 1492430773, 3144686397, 1281203173, 191964542, 468640886, 1843861327, 1099663598, 462374683, 1868051233, 1403316667, 2830773658, 1278003691, 3698875734, 1490478002, 1251588998, 3783559703, 1288390447, 3599829920, 403631845, 501073745, 3628790866, 1995096702, 300244162, 2685729029, 1043247117, 1270609242, 1883655131, 4215435320, 4100429127, 336720770, 142595584, 1383060640, 2439149541, 1099753346, 53064458, 2638552127, 3353382228, 2610244989, 491489225, 3786668044, 2121735204, 1532806824, 1413969261, 808886062, 2568527399, 273744004, 2952477361, 2331629037, 3112996173, 112329411, 1544537734, 2946414591, 376685424, 2808148785, 1507936170, 3811722359, 1159670939, 3195571284, 285012140, 2124103551, 3578311259, 564467310, 3477123971, 1650281466, 2410688778, 3398337318, 2986299181, 3717975184, 3060601431, 4017903284, 2653122359, 4070291299, 849084145, 951004750, 1212614599, 3981119203, 2566703780, 1982735235, 846636004, 532784497, 1999973932, 3795100102, 2105545697, 1993347610, 1699669179, 2624964597, 6140530, 1674556546, 966678971, 2090523086, 3887825235, 3241893962, 2586004674, 1357877398, 2064685679, 2290546241, 992284202, 4202912844, 3927220794, 1079658617, 3440308624, 1453049536, 3873319046, 1718339831, 170237072, 2476995681, 385924417, 2221877126, 1588774856, 124201159, 4253033542, 3719812823, 4287560623, 3170521061, 1364694937, 2392634924, 2906240203, 3543369279, 3697755918, 1566290098, 3930668148, 519398905, 3876359489, 2333254569, 1947490476, 375504323, 4047613257, 1639438905, 2964150195, 1232039149, 291272726, 2474215855, 767387170, 852077576, 3180450827, 359841564, 798542523, 3380604431, 2033268447, 298113335, 2521370110, 3771794538, 3757914067, 1995944575, 1984985073, 3977002802, 3290665163, 4260261825, 3644465517, 3428014918, 3164649324, 2041307645, 3402977909, 2926411733, 545291530, 2445788464, 1415275564, 4187220013, 2556979554, 76532612, 1348025426, 506304002, 2479294010, 664845898, 2016498767, 2097610119, 412114424, 2532825482, 1545363882, 4019613161, 3830197079, 52003152, 784340115, 1338279932, 403817189, 3728186790, 4067803879, 995325116, 1394408747, 1326695547, 3494336040, 654333105, 4209872954, 468141302, 3081362583, 2113191305, 1628052800, 3960313831, 1850082798, 3855146531, 2163433175, 4280472630, 3986310002, 3667616803, 617338426, 1442514807, 1696333813, 3221981896, 3998802600, 930750551, 2045906298, 3174131745, 749316339, 2461355189, 4013720187, 3463722134, 3925206244, 903351518, 1436125350, 4246085443, 2955864459, 3038951335, 234079060, 2154079368, 2420162185, 2423173754, 2033757437, 1056733160, 1739561183, 2074753830, 2583049296, 2408306266, 2635307150, 3523389815, 2223713888, 1831163316, 278004040, 1130207121, 3269180378, 3373831537, 1667568560, 447719129, 104696336, 2978338186, 2656085147, 1145580331, 3213259943, 569625455, 339198509, 633080196, 1722577508, 2328208384, 3280823183, 1125969106, 3022600006, 1395727915, 668084278, 3511880526, 3676744300, 4169664813, 3126915500, 2003076035, 2179608109, 3092578470, 1002151320, 1741503696, 844041551, 658131435, 4289916842, 2198587284, 11810130, 3188560700, 1612596425, 947822095, 3422109094, 3145469557, 2317999441, 930277130, 3775579768, 3609086377, 1009443894, 2280721933, 4202076109, 366005216, 3941500782, 3060068449, 1633301684, 2245956492, 3366817402, 2043701019, 1885260207, 2300661209, 1521660573, 1980947376, 3952259346, 3519811464, 2028050103, 3836092415, 2244422455, 2212774592, 1350469798, 3297244715, 2291378428, 2333522621, 3669290718, 180390701, 60300764, 84512031, 2268736806, 632136814, 3182303842, 4119844270, 3259697275, 282630540, 801642006, 2803409553, 2595474417, 2341819055, 1144853912, 525300043, 1135530042, 4229268371, 256930731, 2961900081, 127363863, 3581059085, 1296651780, 2140749214, 974771997, 324842794, 3893679710, 2062677328, 4222442, 1791165587, 859905573, 4116030842, 2946754764, 1176093473, 3167096377, 2766703440, 1003207502, 1268406517, 2969773597, 759332428, 803908399, 1633524313, 2588734550, 2886893338, 3804778649, 3871545617, 3679188802, 1039963565, 2302174152, 2683894558, 1011336061, 3468446669, 3864182200, 1733740316, 1940646178, 143259692, 4252132355, 3590449941, 3046112866, 3705447583, 257756962, 2427814998, 2430857633, 103329624, 4077938023, 1303147448, 3602884249, 1475689568, 397342958, 3081227134, 2830662621, 4138610654, 97172805, 2119432886, 3306055932, 3109151444, 3729428721, 219796604, 3232963899, 2090178124, 1302726280, 872678205, 4199692655, 768054, 1732174930, 1964058489, 632528501, 2759426115, 450224041, 3800921670, 1009505843, 1400793450, 2940475260, 2713485302, 3113099991, 319009507, 2285161383, 3440575161, 770343811, 2509003244, 1340453413, 1032213360, 3878004983, 3454397903, 1154514660, 1090893710, 2576207997, 1724848192, 1985365162, 3538901477, 2447045019, 514898869, 2283491244, 2368316641, 4063318665, 2986655158, 4076216358, 2550056126, 2878339444, 1148639848, 837491563, 1704283458, 1378661113, 4098522605, 3371463500, 1030746799, 2917554515, 1341204917, 3387830943, 611879271, 315404268, 3294079476, 86241882, 3748484102, 2352320584, 774672579, 844276536, 1249900953, 336052797, 2151721035, 586962547, 3641645058, 2341962484, 2208872600, 1269015893, 4105434232, 3543579581, 2965497267, 4023218637, 2321691548, 3392055752, 3997297637, 1959011850, 96508499, 766563511, 1356783068, 1130708583, 2005327310, 2753738818, 155641301, 765599089, 1045643795, 417019531, 4279177501, 3141781224, 2330999246, 1175129605, 3274946160, 325263414, 3715586975, 4087778066, 2820246349, 2953573922, 314003702, 2427613123, 4290348179, 992235384, 138456964, 2981343154, 2109809464, 4284604113, 3950505789, 881086028, 1738915794, 4189931245, 106478441, 2642176795, 3416075864, 3989123265, 387883555, 3991266157, 3972565066, 3187826264, 338642415, 1495975504, 2136825939, 762375475, 508049359, 131999286, 2970554320, 3966422178, 2705492368, 4289705839, 2104019310, 596636472, 3065570912, 3289124724, 1855567379, 20159508, 2457906835, 1788340431, 707498337, 4221485148, 2706774190, 4015950809, 117987882, 3035391549, 2524048164, 457807155, 3396518424, 1288466349, 90439263, 2164109950, 708733436, 1355156843, 2280665581, 1737724469, 2022775283, 529606498, 2452894920, 3461564193, 1954946106, 3609082938, 4218678935, 1298958447, 3837284047, 2129379103, 2948380137, 2299353551, 1424725141, 536058925, 503230181, 1996902958, 2400752447, 1496876021, 3404123439, 2358739091, 2151289701, 1443733466, 2818061111, 3082508621, 2709122055, 992958633, 1512850725, 3012822226, 3384645338, 533725542, 4044430918, 272943741, 943999291, 1766065436, 2877732382, 3835412802, 718108910, 1397588672, 2680041715, 2282977712, 3270916867, 3722273660, 826652679, 4143202450, 1650020929, 4010941523, 2718815727, 1602960184, 1427517158, 3644929012, 857260087, 3243666693, 3340410932, 3676495307, 4030353869, 2792872295, 2156212200, 4025830339, 3870363358, 3850982905, 2546524745, 1538610575, 3594745811, 3951971938, 3137413934, 8469919, 4235244239, 1270322934, 1228060597, 3877519911, 1160386569, 2010570083, 1629837228, 2571271563, 578136632, 2489161866, 655133121, 1500184496, 190202049, 2458685579, 403297538, 778321025, 3734551682, 2631438217, 32541742, 2466777289, 4128937423, 893637377, 1073285338, 492763568, 3239505966, 2269081088, 712333859, 830437732, 3447526734, 3696521755, 1296725656, 608606261, 3347056464, 2897155532, 1817848162, 697798988, 132644033, 4219025119, 12060084, 1451516218, 2212982342, 3664925880, 2146221586, 1575731675, 2533044067, 1755593894, 2058968296, 4290028320, 1455009286, 66037293, 573802245, 3036270415, 2552709177, 2564995126, 1200668905, 126743679, 1273110179, 1437985708, 506765039, 375995703, 1631860051, 337395672, 1544295859, 139177756, 4224519853, 1160719268, 1886998076, 3127117391, 2088826595, 199063578, 1399636190, 2790105408, 927425914, 3200190318, 904924367, 2965435123, 3940870390, 2208604356, 3726163018, 1459478394, 338517128, 3779374617, 992010876, 551173706, 4223223345, 3035093341, 3888145231, 1232373136, 1733768816, 1795904673, 2551527730, 2752925555, 1196709495, 3342895187, 4110270879, 2743430114, 1754629452, 2348271519, 1771309554, 2341244584, 3390218226, 1385211349, 3063788339, 2485171731, 2885497667, 3304778666, 1809504693, 2992696783, 1428344003, 623630415, 936927397, 1569189475, 3214559426, 887178239, 2619861432, 1890694716, 1535366889, 199677522, 3432642120, 3647950708, 692899641, 1637087898, 2749418322, 1977363022, 4099800292, 2404536715, 1423983840, 727951753, 3983837110, 2974501161, 340512213, 989883469, 863907583, 2582484458, 2586599347, 944006389, 2185993602, 4162703295, 1418591485, 1362602198, 3388441084, 1053587319, 598791580, 1292863440, 3094564285, 3653072303, 2477921523, 670324931, 242053704, 2706816646, 585803084, 3709712346, 1235872749, 3683668463, 1248998175, 3313218763, 2228491170, 503151767, 1010983578, 2816330914, 3218773763, 1596737466, 3055840371, 2168180487, 1523514012, 1495001033, 3644591539, 444548763, 296729366, 1778637469, 1193855794, 3405789531, 3354183376, 3728215902, 3103751643, 1527238010, 2420400493, 1402016200, 1617688348, 3238327513, 1969615161, 2342876063, 3288511060, 3790922492, 2000550945, 3318981623, 4021432786, 3510791403, 2331892605, 2557162884, 4202413135, 3305792408, 3474494290, 3325017089, 3904897310, 1684472309, 3007641723, 4154313981, 4276823588, 2362703100, 3764623176, 3532967864, 476776680, 1141442939, 306204369, 3779583093, 3291937717, 3308501447, 192247119, 2410509919, 711399214, 1829817082, 347516703, 688605891, 4157145667, 352944182, 3251086987, 3719124641, 238052721, 209502934, 4029082102, 2806990453, 3373411417, 2081377628, 828649400, 722547061, 2282664078, 3575173360, 1359901770, 2464158424, 4066308244, 3464822223, 177133317, 4226125148, 2593495596, 829439895, 1047772155, 2185360966, 3933664574, 185903185, 3163334715, 3001227763, 830614];
+
+pub(super) const POW11: [&'static [u32]; 14] = [
+    &POW11_1,
+    &POW11_2,
+    &POW11_3,
+    &POW11_4,
+    &POW11_5,
+    &POW11_6,
+    &POW11_7,
+    &POW11_8,
+    &POW11_9,
+    &POW11_10,
+    &POW11_11,
+    &POW11_12,
+    &POW11_13,
+    &POW11_14,
+];
+
+/// Large powers (&[u32]) for base13 operations.
+const POW13_1: [u32; 1] = [13];
+const POW13_2: [u32; 1] = [169];
+const POW13_3: [u32; 1] = [28561];
+const POW13_4: [u32; 1] = [815730721];
+const POW13_5: [u32; 2] = [1778525249, 154929377];
+const POW13_6: [u32; 4] = [1780897921, 912625740, 57455785, 5588660];
+const POW13_7: [u32; 8] = [954528001, 2552460193, 811089956, 1065775915, 3255164516, 1007972746, 118568612, 7272];
+const POW13_8: [u32; 15] = [2628444673, 1667825520, 3480482745, 1792807966, 2982160738, 2216443239, 1414760918, 1741036037, 3705043424, 136135250, 395110073, 1084641480, 2452973265, 2183283898, 52882385];
+const POW13_9: [u32; 30] = [685360129, 1249145954, 645630652, 1995019793, 3253088488, 1804068787, 392320294, 1343267562, 507087513, 2330257028, 3658736453, 3072903141, 2377702882, 4240373633, 2610933614, 2563321149, 1240024358, 1174015769, 312909694, 3764772638, 510500093, 1167371064, 563930725, 3086997765, 1545500121, 2429233725, 68804066, 1863990200, 3296313385, 651121];
+const POW13_10: [u32; 60] = [801343489, 3687300930, 3650812618, 1292855309, 2657805576, 2016037326, 2874760646, 4032262657, 3967567070, 883767154, 3799873193, 1340661027, 2187028009, 519274923, 858329769, 1315293196, 1461381497, 2243176904, 2753124609, 1955575782, 3920557849, 3872634657, 1019315217, 2838082753, 4120836809, 3754077040, 3026025179, 3031194929, 939865930, 3056830274, 985854548, 1576100855, 1107911373, 110425770, 1299195383, 1944865273, 2937643568, 2194411508, 2836927120, 1383249273, 57765149, 3867259877, 1932068233, 109231726, 906092787, 3309745783, 2104989599, 791524559, 2729013296, 3986268043, 477685452, 2884389037, 612321482, 3705313463, 2993214628, 3749675120, 3978557831, 3791485445, 3052761081, 98];
+const POW13_11: [u32; 119] = [3620147201, 2520448972, 3203085989, 1217137342, 484743908, 1266092962, 4017933550, 613421828, 1157475910, 1814056583, 2810379772, 2293156651, 1965199283, 1927758316, 2374138670, 479770094, 262749610, 2384139334, 1670384786, 2884741713, 3251648127, 2797691182, 2810917987, 3630241364, 2157703366, 2088147519, 1236575574, 3715291775, 454175536, 4102988862, 2473058752, 663798426, 2536668137, 3238952308, 1835701502, 1702835847, 1052170065, 1687755339, 2826467910, 1535016938, 3193994837, 3446775204, 2204416003, 3656812722, 2730402046, 1893756449, 2053075260, 860659233, 1806071445, 2655250301, 4258151335, 1844307072, 1274603853, 1527617519, 2253700363, 2821044754, 419774276, 527694400, 4022163085, 1101339995, 2025426409, 3797830892, 3487708653, 3598614153, 1916423427, 897070156, 1895034986, 413560392, 280773718, 2448371825, 165282340, 179165469, 1030808076, 39526810, 3877992771, 2162336219, 2334849212, 3701673118, 3052707624, 1966847591, 2558342553, 3106702943, 1120734167, 3082482115, 117878845, 1243873970, 749558131, 2716083794, 2654625971, 285288667, 1341977361, 3231619945, 2142906861, 3563550616, 1991443713, 1969042993, 841057806, 1671882063, 2685874009, 1179964040, 3849314352, 131899846, 1283609696, 3137550223, 3712908318, 3301971787, 3577169086, 4263774890, 4235897085, 2488576797, 876167408, 3032262832, 797148112, 2583748789, 886261242, 3063930978, 3840348196, 3510548215, 9743];
+const POW13_12: [u32; 237] = [2425233409, 2574743363, 4101624837, 2153042727, 1531252719, 4036354306, 2401474531, 2403619786, 1719472816, 350359211, 451450518, 2224633991, 1428121154, 1999448647, 1585463868, 1206872105, 869324018, 848230480, 2750061047, 4284173396, 486383658, 831827024, 675124885, 984738848, 2138354606, 827070744, 3016864193, 431856008, 943413656, 3266222201, 2837427173, 3463873313, 677794294, 2548501243, 178001789, 337320639, 4034985727, 1808420373, 1344978182, 3912589803, 1033442872, 52718543, 2250494829, 3558544136, 3122831758, 346404849, 668684072, 2406040350, 2420354654, 637393673, 4098750334, 2939549086, 1264791761, 2859564186, 3468812613, 4008674017, 4254115003, 2544764869, 3867714930, 2529930645, 1851568576, 775869569, 1482041037, 1137060211, 643668385, 4102840359, 2555794241, 206916058, 983377758, 1396985722, 957949107, 2024380604, 2199022796, 1499271974, 469023693, 1177083598, 1752268915, 4060513915, 1446807110, 440224784, 3705711514, 1983674577, 3576135134, 2983057703, 3538843950, 2737247417, 1005612404, 2991215791, 983614109, 743993101, 1647755052, 1259263581, 319781774, 1611804733, 1083833261, 1208608074, 2367174970, 3194329404, 1177756119, 2474980291, 2369559203, 2068529994, 1297717025, 1454638114, 2734555032, 811712058, 1336242572, 2310255276, 2387114925, 3271408028, 2502887356, 2094479200, 474660715, 3350628624, 3403940146, 2050141589, 1833993774, 364733640, 3218126981, 3477723798, 380035144, 1826185561, 873938827, 1714280976, 1858073373, 2083003323, 1474730733, 2882374875, 904986443, 2473857363, 3269354893, 3448104725, 2169444320, 2235183121, 2575197543, 2290535644, 1321689261, 1935808522, 1112616083, 1754300357, 1425341447, 4085151395, 1182577983, 1254051060, 4119729564, 2401638640, 3454808266, 2309994520, 1640684696, 1224355549, 2182651080, 3869604543, 1863319579, 3078167217, 1904866486, 3792869478, 1355205715, 1864150525, 299187236, 1185533991, 882246841, 2345090191, 3112757939, 3285727616, 509028476, 76970100, 3315151085, 3688079555, 2862397804, 2196302659, 1155354124, 4085531211, 3884726114, 2096383930, 256229858, 3034840193, 823572967, 3539255498, 2332934609, 1314879257, 3110127578, 3138071632, 424647373, 2353538903, 525324637, 2245908706, 1032785158, 3572623713, 1981528100, 1742376255, 2042281104, 2047789421, 3137387214, 4164202311, 1795955008, 1524631721, 628395172, 1467338913, 4175798669, 2970351306, 1934462376, 3084449096, 3326694779, 509857835, 2919086400, 2663173614, 2779131459, 3282039794, 3983826989, 1917509999, 3495152555, 4174987179, 4092034002, 2311496518, 110257144, 2327334555, 2213388081, 2124473154, 3729882918, 4189444486, 3424543753, 2265140621, 3633421397, 3968371473, 33820435, 4070867890, 791648135, 1518365079, 1843767356, 2800735357, 3415928287, 1970816581, 930922651, 2933175509, 1383619664, 3467804447, 94941976];
+const POW13_13: [u32; 474] = [2770092033, 280224110, 246091942, 374836744, 3607013529, 253512952, 177646904, 3922117122, 2148254347, 3223611726, 3865501515, 2626156833, 989547111, 974283937, 3003459491, 3170742052, 2589703124, 2581400182, 2165153230, 2985830471, 1475784315, 3504033590, 2881668895, 2316680387, 3511038643, 3397084274, 2578493341, 1960520677, 73504101, 3051337079, 1504567381, 518177353, 3575573965, 3057255272, 3216184760, 3346547012, 393673973, 317565720, 957485750, 813335576, 3709344008, 46126917, 2611447377, 4126735737, 3595823679, 3611359744, 2031678107, 2191428280, 1411860804, 3051745288, 3280383825, 3335460735, 2226183551, 4025871240, 837606713, 3006379156, 686664223, 2768120872, 339578215, 3917147530, 1273686782, 1549830028, 3078670208, 2494099685, 1042732950, 3163033797, 86441987, 1281815991, 348421568, 217001506, 4017340371, 4019844214, 3556283649, 2146097930, 2270174349, 1719863819, 2763306949, 3697682472, 276478498, 1999857109, 2253852500, 2852185129, 3282813689, 3353376613, 394482546, 3535818980, 1110676660, 3186472404, 800893469, 3992983194, 2176615172, 3948360834, 639471592, 103908103, 202243463, 113430590, 1331890480, 2630431929, 528384611, 1600167062, 2598772260, 1912111261, 4293437669, 776014103, 1566456533, 1609790320, 3159532308, 2128884070, 1533748912, 3911012398, 2872566187, 75228133, 1378524420, 3108914974, 3868458668, 2981751804, 107089968, 4253406523, 3961903717, 1020359712, 2004968899, 197361203, 2041843185, 214556791, 4079590443, 794785720, 746147898, 1233829155, 3762541793, 3863505596, 3628747110, 158785463, 1873132594, 4010432341, 4073167215, 3179777450, 797445362, 3710062573, 4223428401, 1389616073, 1893581875, 2546613520, 1245613358, 3803671791, 1988518811, 2888476702, 2567029727, 2341492200, 3193553523, 2222450177, 714099752, 1450703628, 3150528499, 401219602, 689603544, 759986930, 3078711132, 2808389020, 2591337821, 3677239533, 1644870392, 645042089, 2259101651, 2035601092, 1917023803, 2922085335, 4187753069, 1317058292, 2373086190, 3513129050, 3133275789, 2552447641, 2928047049, 2556372464, 1909569339, 3211899072, 4676947, 1035632270, 2488097790, 9003917, 3830909762, 1434251395, 866919600, 292794276, 327039161, 740061955, 3686185869, 3001893598, 1400171098, 359791510, 3510621913, 3461839011, 2188755022, 2894813905, 3662814350, 243919073, 1670424940, 2987320578, 1546978015, 3950456083, 1167806508, 3562314041, 3879472154, 639979027, 2408265652, 3361581149, 1465489790, 1195818519, 2217402719, 2691027340, 2017525845, 2317038524, 3174058830, 2120025818, 2688173402, 2943399075, 99619204, 3434080855, 4274885553, 1820238284, 1763571765, 762452581, 79715782, 2145788487, 2661559287, 648455633, 722916325, 1850179877, 3031761966, 2300516444, 2624237337, 1702671866, 3569612857, 1582992344, 2684356765, 1210899082, 1397665657, 1271600252, 3524956906, 1552340482, 1363082597, 2529231496, 2542055832, 1159800647, 1169650988, 4285318734, 1452462859, 611511573, 3612626278, 587667021, 3623373186, 2194342199, 4291509347, 2185971813, 502535224, 601182308, 3908631698, 805942480, 1879472563, 1607395107, 1129122572, 3298848373, 174698773, 2785240237, 1444202161, 4243527810, 259356752, 2850901382, 3933623322, 4115636047, 547038038, 3655462568, 3502451555, 926079503, 1722207232, 4138993533, 1039107710, 3298283152, 2282624588, 2945236299, 759263377, 3391272306, 3433251348, 4265990061, 3149069185, 2403408177, 1162778116, 4134714139, 3813329316, 1171827073, 400581629, 3009999040, 4061326516, 1261810447, 511899134, 2451111623, 1355824333, 791974327, 3686088002, 4101109368, 219973590, 1120035633, 53961656, 816734567, 979301214, 3640215323, 3764031081, 2185919590, 860594344, 4206263253, 2200598939, 3583011712, 699277704, 107496135, 3983224148, 3690497201, 3903478923, 3285573455, 2116551127, 1162978445, 2559642491, 2515822592, 4067740483, 922254774, 2800200216, 2402553132, 4239545323, 1337189450, 2181950874, 2372338711, 547750316, 1309058307, 904368026, 3666222198, 1068046481, 3277822362, 3817944533, 417730359, 1546943492, 3852618022, 537109694, 1098971095, 3302128171, 2727628990, 2165459563, 3684942333, 849597304, 1763743193, 1883968625, 830232956, 318348250, 2931492361, 2026235029, 112878337, 723329677, 3587687010, 1792817637, 1493742140, 1187328123, 3993625964, 1839596571, 1858019152, 573000935, 2404658877, 1742169035, 2851996326, 1045595807, 2425224508, 1482513435, 4074947726, 669697757, 2558647442, 93498172, 1220328942, 3225739130, 574036431, 1293679291, 2345754323, 1066530946, 3988256419, 2671745740, 2527519788, 4253346119, 3473651924, 921950866, 3552188502, 179378863, 2136216814, 1085209858, 506391777, 3040955182, 734408408, 2240296289, 2353189990, 1525516884, 350519298, 4034989771, 3125870643, 2498034387, 3325926792, 2730601914, 1965324699, 579502103, 1181376476, 2504227516, 1399468995, 352661714, 1984723490, 3666746672, 3080165925, 1879443766, 849919215, 790324719, 1569814023, 2458343887, 4014421975, 755780875, 3186796623, 379409846, 257726134, 918072968, 4176579022, 4264622186, 214176848, 3857236105, 2402509578, 3828635205, 3694477513, 711561401, 1845924925, 1234827689, 2036365951, 2239015709, 2041164661, 2616341638, 1012632782, 2595136816, 2122924896, 1366611735, 1961650896, 474321148, 2926691709, 333195756, 3381411750, 541637243, 3858321538, 2241353192, 2749834711, 4031206761, 51329255, 3462462125, 2669823769, 823300936, 1674034500, 3485087004, 2450138386, 231547375, 452303643, 3414776178, 3326617885, 3875604562, 4021341687, 4068217451, 2155536911, 1728551567, 3648149057, 4145014037, 749726987, 420081287, 2712204900, 2278319478, 410408403, 2246964915, 2098730];
+const POW13_14: [u32; 948] = [1513652225, 2561421435, 568016091, 3219124610, 1567548994, 3140672003, 3901443699, 2182387622, 4141196970, 366544369, 3676769560, 1911033767, 3242806085, 3748543015, 192824234, 1956115948, 1696291081, 1211388376, 700323856, 1515270072, 1084306770, 2465771648, 1542369175, 3166292813, 1509064568, 2196599076, 1239276043, 2364515323, 3741001254, 943293, 1432737829, 1555653668, 3641646355, 3313476148, 1069086654, 2865509789, 681536068, 3319239661, 2983083463, 1630276271, 1686018834, 3982604714, 2499040238, 4080953275, 3186544137, 3492167634, 3859279674, 4002574719, 2303161186, 1165791332, 3824318502, 2061358225, 937392540, 3954310122, 282436525, 474293277, 4238882128, 7082045, 1225756846, 1870807289, 1085028422, 1406801929, 3672630733, 3697064332, 2065063721, 2263797067, 11961925, 3559293097, 390564761, 656808016, 692370340, 2322676275, 546038800, 1672419195, 2556287572, 317711936, 1327212729, 4259953, 197577355, 134308044, 2271578320, 1386560190, 3050738733, 1718060978, 2130640554, 1331375940, 624111047, 3525554789, 1985521375, 2586019191, 1558402647, 3909440642, 856980417, 60053137, 913591866, 2898291345, 3513718336, 329509821, 2417319852, 4168311558, 664301251, 636015145, 2271617140, 1452171662, 2458460330, 1505883977, 1445507301, 302456227, 3822965831, 92894040, 3072167418, 1758772508, 2961726038, 3942910328, 1720364146, 300138901, 1080779583, 608595466, 287672053, 2991774865, 762076370, 76860426, 1501520728, 1340523011, 3081299408, 1760038262, 333139184, 1290564990, 76012907, 356964572, 859660282, 1728034276, 4082308696, 3863777730, 1111208589, 4167045508, 2377192236, 2115772327, 252081885, 2110972140, 3423848279, 1825612364, 4007303109, 3940132191, 529705551, 1131819847, 592386154, 767211996, 139345560, 2560638736, 1895474888, 3572412807, 1881983119, 306828160, 4280170547, 3436356640, 36724135, 298470868, 4009401144, 1201965222, 1907743005, 2272048226, 2027347658, 3171140097, 2209466522, 1141566160, 1535992603, 3480643687, 1411494951, 497705101, 325571997, 863779574, 1184765804, 268740290, 3578205385, 689075140, 2224186343, 674642629, 1777572359, 2532206686, 1918297826, 2786087730, 4275399690, 862160943, 3259486169, 482763122, 3311818353, 3745176056, 1712996127, 2457056529, 3105386152, 2913799945, 1952930022, 3669936214, 2031184872, 2112139107, 2357143158, 2447231606, 507345305, 4094940971, 3926425827, 3724336083, 1509694285, 151207944, 3864335236, 727913605, 3187844539, 872137891, 1332616877, 638024373, 3801449042, 573612644, 575875522, 3238993358, 2861607758, 2548845838, 3141071378, 2334409874, 4289008640, 870877795, 1278831489, 3428774005, 4271138832, 1818592575, 878735662, 3620716114, 1945114857, 839824163, 2157168551, 4219212498, 3329653447, 3874762373, 3680159945, 244325794, 3271264534, 1473424871, 3737837342, 3519006596, 2834960577, 3436012911, 3683895049, 4176039645, 2376577933, 3247021487, 513042186, 768601904, 3622268649, 867697180, 2366161934, 3939446948, 2835080666, 3537114981, 1849443514, 2370190814, 3809085128, 3267234068, 719980388, 1621149743, 2686272540, 1262781703, 379346578, 1557964862, 2566561722, 2280542739, 1233009971, 3097781731, 473123888, 1508969395, 166217313, 1439964413, 3646047105, 3595493850, 4093783883, 2795147704, 4123805955, 1250668369, 2283708785, 4245016844, 2370592816, 3828877629, 2787374354, 2139886021, 1208299774, 1237413658, 169664298, 3173462107, 187208603, 2350252003, 892173722, 1004799120, 1328565147, 1789812913, 2527558555, 3872714659, 436946276, 3539454332, 571491969, 189796439, 1759928285, 2669584886, 718645501, 3223822936, 2575652450, 1909911646, 1050893712, 3043752848, 354123663, 487623292, 3025255091, 374157101, 2780753679, 194255140, 3725060196, 3685000348, 1428039010, 4159354712, 4012044805, 3798775630, 20529910, 2559898033, 3760819554, 1905045719, 4136414273, 1334841817, 1687195975, 396189875, 125555202, 2020505664, 3220241916, 2924152273, 1863085422, 500567270, 195508168, 1089450990, 2248396770, 1138761945, 3890258299, 2873381448, 3780002525, 3957311268, 687889825, 1668858664, 1655301133, 15032665, 1027527896, 3031209921, 604531171, 188027538, 3397073288, 3066311381, 2394581530, 303094307, 396468081, 2601109216, 2132608852, 2544917816, 2811813849, 1747120901, 2708158049, 863836234, 2697246800, 1710479489, 2729997963, 4131856113, 2321916459, 1262031341, 232880161, 1058563119, 4099189568, 1755908884, 3803044948, 1379125605, 1386052163, 1738771205, 1749683758, 2024467163, 1809475648, 2754470451, 2421546076, 1874430359, 2069109089, 1152782153, 991766383, 1737431140, 269673911, 2437505434, 2400728955, 1431646091, 1518987122, 2186573637, 339196051, 2764190315, 2259560835, 1282592948, 385468243, 4224274421, 576119317, 3614677639, 4077356423, 1125313062, 3470202367, 1919613845, 4086285995, 1177477287, 1673930406, 705504836, 2454248004, 3209530252, 2088988744, 4246583497, 1590352726, 3112690209, 2013531390, 3100368545, 3437386857, 3717564705, 1286589729, 718408048, 905320788, 2180204187, 2467325432, 3761853951, 3456699635, 2225751987, 1172971511, 733477348, 3854435069, 2062050530, 846090884, 719789043, 1202566603, 2104825256, 2675059687, 319293190, 3793179115, 3001011882, 1431545052, 3969584490, 128832074, 3901679260, 3656005145, 2737768227, 3888240409, 1806666537, 67018228, 2350913546, 1861921716, 3862626538, 4097865829, 2778774693, 794562701, 2871622549, 3207270794, 921035565, 2952602132, 960502613, 284709072, 1063639601, 1270411333, 4218699110, 2004386441, 1244682346, 1409678825, 115127831, 4190053265, 1862167526, 2739270424, 219481578, 3279781500, 3827260408, 2695400129, 298768304, 2646618453, 3569808749, 1266254550, 4053619764, 2493810128, 2777409661, 1011099958, 2293535048, 1538972312, 403680299, 2974007309, 2874111038, 3709710526, 656396871, 3952406898, 1858557412, 2334590495, 968681341, 966614911, 3222900426, 2213498955, 1818090739, 3542494106, 3166652381, 3192598200, 604136432, 3368065402, 3682460660, 689589424, 695654418, 121724358, 2920509093, 2198787760, 890996897, 669876185, 3690589436, 1070026100, 2332305551, 4278372981, 1574424533, 3582500652, 1235862574, 3850504962, 968104830, 3633004844, 1578094246, 3003761403, 3963252178, 3840627084, 1693470859, 81769956, 466743567, 713232122, 1407990440, 302068389, 445519817, 1064709610, 227912160, 2386646931, 3986077052, 4064515613, 1678703953, 4241671000, 1681278033, 1917715036, 2061733932, 2732251455, 1894829556, 3512167475, 3522668618, 3656561203, 4246783356, 1548504543, 3310397548, 3132349564, 405441083, 1890605897, 291119375, 1279935057, 1127928022, 3720852427, 755282063, 634444696, 528643617, 892885284, 406515873, 3274379684, 2703617700, 3403237914, 3915236057, 3184451645, 3061575457, 2105702428, 2973892165, 3999271114, 4220671200, 2503013152, 2707203603, 27691282, 3046681132, 1274969825, 1900657527, 2401297211, 1552686090, 227547796, 2045679188, 4173296788, 2776138215, 591988920, 2131566845, 2003789538, 1235232893, 3340198667, 3333296244, 2018829707, 2454383771, 1982743622, 3479308400, 3863852620, 1843512509, 2509383589, 3639484414, 466868776, 3008250020, 778970280, 2551780482, 4099311632, 3662393901, 489399479, 3093439758, 3216889430, 3027882678, 1720491014, 611553651, 3358642299, 713635213, 1447045321, 2800156197, 2137306122, 2459446301, 1759310149, 547011719, 1432342532, 4199872702, 1895280434, 3406272363, 216310692, 3843975459, 2857117203, 4062571918, 536631140, 1530351545, 2202767419, 4251275457, 1033942363, 1710252604, 1209244418, 854719529, 1827039250, 1721644441, 2392598670, 298698364, 3362109492, 2412492131, 3294067883, 1963247666, 348649514, 2261373206, 938962700, 750409289, 3763953107, 356905891, 2430006041, 3980385739, 717486472, 1098229618, 2187536344, 1411854270, 648813363, 2036353351, 4018623382, 268372487, 670309263, 2712132306, 578773468, 3590008529, 1467649524, 1615886356, 838976389, 1947563188, 544421144, 2717842254, 516155658, 2022510534, 198574402, 3109744008, 4090909930, 2752050324, 3484409074, 2934380843, 3509731361, 422644402, 2439130793, 2971079069, 3031992074, 2924654189, 490468002, 1865664422, 2831427047, 1903651532, 3500580721, 2196852090, 2284208344, 3912911632, 3628348878, 1194228659, 2662145560, 1698198936, 3608826986, 2296769476, 208592660, 1778240109, 2294936288, 2463134109, 2193491972, 2222032594, 2911161316, 3798448785, 182161400, 2335547072, 3311803402, 2366498045, 799281076, 760849489, 2583953491, 730201846, 2567758141, 862894082, 3268126212, 2202597914, 3472692951, 2541602720, 3855357471, 1670106726, 1458362949, 582777374, 3032782867, 1913202013, 2770672567, 654399100, 1581322803, 3325054319, 1915420607, 384321647, 3612199730, 2571660929, 194766147, 2497927899, 783080414, 47229788, 1102095090, 44506115, 2027940288, 1762855022, 260908886, 832440255, 3225197671, 3726417634, 1206263839, 610637814, 2208683705, 2133435355, 3346426517, 224534500, 331233567, 3117629849, 4091918435, 2432831282, 4173196902, 4185058230, 3544764999, 1899728526, 3483314643, 1787603337, 2012280234, 1582069083, 1854338184, 608566817, 292018758, 68148185, 1784644537, 162824350, 46084345, 1399098201, 1011250592, 1119676264, 4100416618, 610831036, 2628823081, 3471721533, 3416232519, 1200121027, 3007148243, 1070271576, 2418754722, 2133851283, 1604771026, 2823776969, 3826842772, 3172890451, 1425697732, 2726151980, 2963167702, 17686890, 1194564047, 1804687131, 3950206041, 421525065, 1333016152, 2466497591, 372565849, 681921832, 2957148092, 2661466908, 296262422, 804942293, 3815683888, 2376634571, 1899045977, 384927800, 2809050809, 1836583241, 2993834542, 1085356114, 3292258341, 1028941227, 1638891302, 2140584062, 113470547, 149891607, 868278739, 1752309909, 1361127472, 4000144082, 1412503340, 528978060, 325410307, 2201220004, 270121903, 4019419590, 864855298, 842515367, 3573287403, 3929124052, 1218070028, 214091141, 2473026042, 3930593534, 426335338, 1513416994, 101725441, 1898194862, 3769220994, 3358173240, 3251806489, 2346613945, 1822324793, 385846400, 1905141224, 3762370339, 3671341477, 2733102709, 322430576, 2794508835, 2474465429, 2043541568, 2738081290, 3885575667, 2009733977, 4225772572, 921826531, 3187755075, 1875257447, 1621428986, 3859138601, 1871313650, 3309224894, 136404944, 3926302281, 3095910985, 2755740164, 2232225837, 1221715843, 3881886774, 770005275, 363454342, 761530375, 2038996127, 1629145929, 2924898105, 751524179, 623104484, 3339997361, 3853611564, 1008822372, 321609560, 1196466737, 3038983061, 211222827, 2079451992, 2543829854, 4054374694, 1360599687, 2016528549, 2377504097, 1187988191, 929094844, 1785919608, 1879099701, 994220924, 1227457127, 2677672527, 3465041955, 84769360, 2436251402, 331603758, 1135534070, 1903010537, 2648205504, 1118585624, 970619688, 4220032948, 2220352008, 1183597872, 4286883798, 4053369708, 1816754731, 3426271933, 3929750343, 2771249666, 2749699081, 2457642363, 3992523278, 1613632090, 2397782377, 3735099573, 3798575094, 399742811, 2994377476, 2714996325, 1705111263, 2267158662, 3635994134, 3159268715, 1991382833, 70956919, 1127357667, 1823907249, 8950685, 816809301, 1310535478, 1087069453, 1468526264, 1582856215, 1085290774, 2479625835, 1334283253, 601399030, 4123082659, 4184693207, 1371028573, 3674475575, 3565090678, 209491207, 2328330453, 1025];
+
+pub(super) const POW13: [&'static [u32]; 14] = [
+    &POW13_1,
+    &POW13_2,
+    &POW13_3,
+    &POW13_4,
+    &POW13_5,
+    &POW13_6,
+    &POW13_7,
+    &POW13_8,
+    &POW13_9,
+    &POW13_10,
+    &POW13_11,
+    &POW13_12,
+    &POW13_13,
+    &POW13_14,
+];
+
+/// Large powers (&[u32]) for base17 operations.
+const POW17_1: [u32; 1] = [17];
+const POW17_2: [u32; 1] = [289];
+const POW17_3: [u32; 1] = [83521];
+const POW17_4: [u32; 2] = [2680790145, 1];
+const POW17_5: [u32; 3] = [1614772481, 2739882033, 2];
+const POW17_6: [u32; 5] = [2276454913, 2771029215, 73658097, 4117442370, 6];
+const POW17_7: [u32; 9] = [3492013057, 3480731623, 2144081192, 1009276412, 4254173166, 4151923560, 452949210, 1816956013, 48];
+const POW17_8: [u32; 17] = [3277309953, 1864847191, 707834086, 1365492312, 4096642650, 2628241885, 1040897072, 3647618881, 4287772355, 126927969, 3695747218, 1041208948, 524092261, 1484945811, 3697469546, 3397736009, 2344];
+const POW17_9: [u32; 33] = [317689857, 1450665849, 1775742626, 792817246, 735751321, 1553574078, 160284371, 1873256746, 2085456896, 2906891001, 2367433931, 2570134778, 3520334249, 99950267, 475720041, 4178498415, 925636968, 3880190760, 4090350540, 1913195868, 737980718, 2149816287, 3313879437, 1462712522, 3066369386, 2488096894, 2055534827, 1929403434, 1042156826, 164256614, 685827684, 1240652339, 5498045];
+const POW17_10: [u32; 66] = [1457463297, 984317792, 129815356, 1108536177, 928471766, 2693550375, 2072553947, 1297125867, 1133000653, 1362423844, 2622920053, 2400166317, 2898543712, 3911312760, 340195761, 1832344099, 4238200431, 4289498679, 705322524, 3307021183, 2157383404, 2978222774, 3893788760, 2997995349, 3286528627, 3564068084, 1266442040, 2127456684, 697216183, 818919725, 399364822, 3518519912, 3208026815, 3949195313, 3259276073, 3282846545, 1676913258, 3748532885, 4097340895, 2606771886, 61542262, 928806234, 3952687047, 733904288, 708149719, 1985158190, 3554113964, 3778903691, 3310198145, 3418861933, 2384303007, 1529238789, 2412994435, 3893269128, 1436629905, 3992557715, 1329675393, 3885197615, 1566768946, 690629475, 2807722067, 656572394, 3411636943, 1472870658, 522169128, 7038];
+const POW17_11: [u32; 131] = [1908293633, 3689523897, 2822932863, 4126052176, 3318263763, 3554909022, 3131835113, 784466375, 3362613358, 1594674871, 1342349825, 363201666, 3676246246, 3527189453, 4228641855, 3365544222, 2883906697, 1582601823, 2762086834, 444671130, 2667867771, 3306000853, 3176478884, 3611595152, 768565409, 1351677235, 1170484663, 1819794577, 2852094787, 3425809562, 3324861987, 167440938, 181440877, 3524867703, 875516746, 3772659731, 3494739066, 950227557, 4090892939, 3436199439, 2002989813, 2259107998, 514339703, 2959546, 4187061166, 279847702, 1113414927, 758547077, 2853043995, 2873726472, 2287854644, 586017138, 2360476349, 3937610949, 3442197266, 4107701379, 2564015432, 1436806687, 3123130272, 2028236154, 271886327, 2209938990, 804782749, 1603918673, 1581219264, 895483627, 1680234075, 2696502106, 2687909103, 1540265941, 529828618, 1934284392, 2534313015, 1183476453, 3357634495, 2329916589, 824072586, 3201172191, 354985910, 3218236432, 3073740731, 3761536584, 2028365300, 3397332515, 2172674274, 3767236113, 3476937416, 411868655, 1526749518, 2890623234, 275778389, 1862954273, 1889470767, 3943776092, 1863934473, 3244088512, 2671715289, 144944824, 2265756264, 764669572, 3040952776, 1765360244, 1115262701, 1619170671, 4212058315, 497757440, 4033354219, 893706607, 1084351448, 4095156874, 625437665, 1734599070, 4247172012, 4071352317, 1515537083, 1809169497, 2031873292, 2971219249, 3025150444, 3436736022, 1247708329, 201175674, 4101671226, 1644588900, 3326030287, 2437954544, 3174945387, 1000881834, 3196968465, 1427090841, 49535155];
+const POW17_12: [u32; 262] = [4085022721, 2085967701, 1271919158, 44627928, 174363308, 2296121937, 2273963065, 3579431623, 1831121498, 1096894109, 3924357025, 2130068491, 2853365964, 1456617496, 2555178632, 3746749536, 1383109574, 4261474331, 436085303, 1293151098, 441533120, 1560211791, 3021758582, 4130670084, 19616318, 4095949148, 299409815, 1030209244, 1017224504, 3231906507, 1156282507, 1702927686, 2584098128, 492684726, 2159222556, 3752625501, 1456067947, 1084048890, 3453698315, 1591197554, 469559807, 851103264, 1113417463, 2668783582, 3284889668, 2346329028, 2859144744, 3057119932, 685449570, 1371349121, 920431876, 1427880275, 1652896932, 2264698818, 3897036934, 1221702260, 2212511271, 1987473568, 3854708112, 174246271, 540141811, 202099746, 2095338732, 645481146, 172501779, 3576793478, 283247730, 787654734, 2208423693, 1891955499, 2872549476, 935317575, 576771104, 1837844074, 3735762380, 1297782969, 1536128999, 1891495801, 1560967616, 3658718251, 3609644461, 3834598381, 3653579888, 2151769073, 862856085, 1438108966, 3966205101, 2513991516, 2033733267, 3497662243, 738646014, 3359330046, 1716117831, 1567957198, 2441990387, 2462302078, 3146031357, 3854102737, 2477210531, 292734252, 536678863, 909946955, 597585563, 1062761901, 2519377479, 2829303059, 995785540, 106677374, 2472390202, 953709486, 3167979348, 1723625740, 1854305745, 751864725, 1017260449, 962057863, 4090581882, 2249910134, 3926571064, 2150011692, 865882320, 928188638, 2537577815, 1998444138, 647936451, 3788138743, 11890717, 1299876652, 1052111241, 967696368, 3105978598, 2381554820, 843522982, 3559778921, 3374913697, 3014493578, 3433375089, 1476534227, 3851837465, 3550982465, 1947597635, 2617914116, 106488640, 212144176, 2408832624, 1301908012, 1665491697, 1379419294, 564803941, 3758117497, 1390844977, 29202037, 1842462665, 403468144, 2251965155, 131885595, 2635790422, 3212943466, 2591184548, 163518376, 1138906802, 2811232560, 1308265054, 772614419, 486210035, 2876589880, 1560778969, 4102610143, 2398046952, 414553900, 1138663335, 3092278650, 1164462332, 1074765431, 1294746920, 4168075562, 3198096521, 525130810, 4196764428, 1193236444, 1829545935, 2602603448, 3748322696, 2531099143, 2959009708, 3100670387, 2579785316, 382627899, 1714279389, 2236320312, 495836236, 2042911161, 51711653, 731191632, 4175109342, 3152106635, 2765872876, 1590115393, 2193625718, 4263502234, 1016876936, 4151561832, 605147024, 1598400881, 3018525409, 2654779395, 403909671, 1064515905, 762427870, 1495038862, 1837964475, 446573324, 2637178619, 725348654, 3025474236, 2784974393, 4013523660, 3185945252, 2195374701, 1059401852, 2957046851, 174542286, 2481692364, 1660288373, 2984571049, 1608858050, 1730035028, 890242804, 1883861595, 3561450135, 939429604, 529468388, 1256327278, 1400120915, 260360173, 1610973719, 2342985870, 1734243871, 3419599710, 4052964039, 3199610118, 1332281756, 1495544395, 482759947, 3706968720, 1387748444, 138131933, 3582340586, 3708359744, 3367255753, 1454884494, 955331047, 4232050806, 1692999880, 2390083316, 1121736953, 2141922999, 2203079571, 2702128415, 2113771929, 3912685476, 571303];
+const POW17_13: [u32; 524] = [653852673, 804079160, 317045108, 3382101936, 1130367358, 1227772723, 4173914146, 3339195028, 3542063781, 2657877445, 3894315327, 3230922447, 4236383890, 74823206, 2713476980, 71935918, 3620482072, 3704646672, 336255660, 232091333, 3791099718, 3650314826, 366776504, 1444273864, 1120618892, 832839135, 609493913, 3201718649, 2486986236, 523770901, 1256029734, 2712373222, 3262555274, 2506465289, 313435995, 1170776324, 2820914572, 3104396610, 2910509361, 2468198655, 597764295, 87220591, 3201602912, 2057714627, 4187173982, 2915554184, 2122327454, 3466244712, 1117527356, 1834344467, 3185473027, 2323452348, 2197006662, 918358991, 1904036828, 3034522700, 1505524446, 3966195641, 2595798511, 3570966377, 297776101, 3314296794, 4028994078, 851938039, 3387562221, 2868368863, 2075437202, 4044965662, 667890580, 749943233, 2295967072, 3166655855, 4046713910, 288763546, 1802946687, 573814020, 3577395284, 1418065602, 613718014, 1108079389, 4144561354, 3158868488, 366065647, 517765378, 1252908858, 1800108071, 2039996851, 3103091418, 3035738119, 2311487556, 1484469507, 3811702428, 1485945074, 2186456769, 1440424806, 3219088477, 433920879, 1422162825, 2580724280, 3492571424, 3778679178, 1894964076, 3681876024, 185171109, 4081206146, 798917859, 1622533717, 953272728, 2232493014, 3214889684, 3936812384, 2566447781, 185469242, 130567499, 1369584753, 3152723673, 718117334, 1363850836, 1111801416, 76218431, 3144698431, 986789270, 4225990079, 1780295982, 2604050341, 1696265807, 3843667692, 907399108, 924884706, 249967460, 1558341531, 2528047802, 2518503920, 782994105, 1567940528, 1213726789, 1271011848, 401704401, 3311358501, 2783606812, 740870759, 2243045410, 3792179791, 2296007301, 3397510700, 2429904720, 3177665560, 3222432088, 3273294152, 96430915, 3271992663, 2641596440, 817687428, 1255065052, 236752853, 2979142313, 4240368624, 3772355931, 1589141692, 654783556, 2510746811, 152515501, 3713061712, 4012073196, 3156953387, 2580252737, 3438325899, 4294242085, 700415702, 1934727278, 2461513951, 451545344, 2357896586, 621639245, 759303246, 2225149225, 970127902, 884863837, 3728550998, 2754966688, 3219134282, 3682522197, 2219314299, 2364077779, 3612037037, 1302499120, 828188324, 2391024989, 2626738557, 883556972, 1546920446, 2341614606, 1520229141, 2968132573, 2697752544, 2479047703, 914636198, 2966521022, 1565555576, 2131686145, 267371516, 1237209139, 657787771, 1847745685, 3652066149, 2806093487, 626954154, 1078641188, 861789609, 4047429839, 1115869132, 2337343572, 2615394121, 2096333782, 1138444742, 2803024457, 131733434, 3143027078, 2985106047, 2826591279, 2642089216, 3944409184, 3633985939, 112520625, 3018084251, 2902017751, 2379500901, 470467556, 4020793048, 527244468, 352974788, 104402052, 2392599968, 2967330921, 567027142, 1483285025, 2942011053, 3332847706, 3197112695, 3724457591, 525975090, 241229588, 3492017920, 2614767616, 3535332976, 3207066141, 1072491264, 4162339653, 3820310096, 498690043, 1552583229, 3214142499, 1877255302, 1796230911, 3836721678, 1290150340, 313362434, 3188934567, 629795581, 3722093035, 946136182, 1343568012, 1144246267, 1290859252, 2467260418, 737358861, 3351888966, 4247954332, 2056378976, 1923963393, 833559643, 2304209581, 248746521, 734365562, 3718828583, 3109765686, 2181915489, 1003856590, 842334805, 3685181364, 1796224132, 1310504456, 3600986180, 4000748173, 2108016032, 2100281436, 653200590, 2344231620, 3671081413, 980655718, 975271315, 4081644043, 3387949569, 2648901384, 1374091753, 2154882951, 3118633206, 1876114421, 2130585588, 1625918937, 2697933051, 2678682545, 2083275865, 3650477692, 3245973132, 3362683911, 1015800757, 2255754549, 2907822735, 3163319592, 3131108494, 3005746967, 2944601521, 3400077278, 111205239, 65939123, 3042606419, 2397248111, 1765631252, 1151241243, 3815617887, 1663933225, 4196394528, 3530711924, 2041739626, 1497457836, 953998311, 570299149, 1311040112, 1031912543, 3952297037, 1429571434, 255646515, 1222461235, 358668034, 1291853262, 2561065587, 2494917777, 1038769745, 777198421, 2474384421, 4060113779, 725387790, 1595744499, 3739635811, 3812095211, 862373119, 3419451045, 1346587053, 1599169722, 824353531, 4259087799, 4091898003, 1693692162, 3916338621, 3488559751, 2521899964, 380859707, 3433232441, 623595720, 4024482943, 81903787, 949716956, 1488402371, 3919092307, 1938231947, 3428304871, 2170138389, 2143978663, 1457524934, 1352559918, 1478138542, 3260047087, 2141004915, 2901137763, 3904369290, 3759282057, 223943031, 875457119, 2131919520, 1568150650, 3649244639, 4205983702, 1267114280, 3929274314, 2066798261, 148847134, 1702265052, 3996556009, 1917239926, 3088056852, 3563887171, 1685277956, 1746697736, 1666454561, 1097111846, 141402998, 3358200408, 1225064452, 337312220, 864053464, 1415344927, 186648222, 633455815, 3895168635, 2402380352, 2939714357, 4217314923, 2268288847, 1491107257, 3936594949, 2155373198, 2109326196, 4118071792, 2002361849, 2353074369, 2559517815, 1773929122, 851200359, 875535853, 600517347, 3914683899, 2125327927, 2675990885, 589214872, 3068643885, 2281933169, 3224556846, 1547148234, 3507824974, 527664256, 726590753, 3431953398, 3204653402, 1123510277, 658746889, 3442991421, 2494213803, 2858333528, 2299417507, 1694766033, 4105482648, 2271222974, 279971142, 3425485238, 1875763912, 163514685, 855584457, 4127771402, 4027007331, 294343798, 3390077754, 1881338062, 3038077868, 2750900911, 3776107425, 282274049, 1316767029, 2839656145, 1706342088, 3997887022, 3245969985, 3158904772, 128653744, 163806714, 2959247222, 4134428955, 288596525, 906847794, 4139446572, 3944785016, 1365830554, 627418401, 1425486391, 4107966312, 3717061340, 3695004161, 1659726457, 4017260558, 430318666, 10830527, 1112525155, 1465704640, 2588279261, 2712586113, 2293334594, 2304990040, 1342029279, 1148007717, 1117909867, 1908885335, 2108935559, 61143512, 3245889886, 2849144913, 1585177368, 3231792894, 2868854115, 455631408, 3737249491, 1511987494, 1520617731, 4130027243, 2830658473, 52316930, 1072967416, 1015556087, 4106393656, 2586008251, 3105140800, 637395747, 2926208061, 2194055491, 4243576748, 751283033, 2540338189, 3953438836, 2005809997, 229028678, 1219407764, 2826213775, 4237771999, 4265611515, 75];
+
+pub(super) const POW17: [&'static [u32]; 13] = [
+    &POW17_1,
+    &POW17_2,
+    &POW17_3,
+    &POW17_4,
+    &POW17_5,
+    &POW17_6,
+    &POW17_7,
+    &POW17_8,
+    &POW17_9,
+    &POW17_10,
+    &POW17_11,
+    &POW17_12,
+    &POW17_13,
+];
+
+/// Large powers (&[u32]) for base19 operations.
+const POW19_1: [u32; 1] = [19];
+const POW19_2: [u32; 1] = [361];
+const POW19_3: [u32; 1] = [130321];
+const POW19_4: [u32; 2] = [4098661153, 3];
+const POW19_5: [u32; 3] = [1637415489, 2733490537, 15];
+const POW19_6: [u32; 5] = [1674773633, 2120389729, 2125575713, 2140041202, 244];
+const POW19_7: [u32; 9] = [851069185, 953120046, 3422911417, 3249671984, 1253122465, 387558350, 2121285446, 1729366164, 59779];
+const POW19_8: [u32; 17] = [2386924033, 190345838, 2985903449, 2575403751, 3663280926, 3225853746, 4150572491, 603254694, 1674172707, 3673007190, 1176051141, 3802513312, 1962388533, 482203478, 2403994182, 530593434, 3573576981];
+const POW19_9: [u32; 34] = [600777729, 4287864253, 879263622, 662006526, 209087784, 1566861921, 1868491450, 2979970599, 2251023872, 619496482, 1962810147, 2474730226, 1043946239, 2571498863, 24001819, 1859204983, 2472425095, 339377689, 866657198, 990396938, 2881482992, 3673813, 1416246612, 2126450992, 810411284, 2469838367, 1356652332, 2422736342, 1273451346, 3772130430, 2531937001, 3633029867, 1546447747, 2973352661];
+const POW19_10: [u32; 68] = [2226014209, 1311551213, 19006035, 3560028624, 3400822883, 2260137902, 2626308946, 397916838, 2154438492, 3267979482, 51974750, 3434718507, 352206864, 1183471152, 2304943612, 3788818754, 190140117, 170026499, 3825508396, 1347714733, 389308855, 1686258633, 1915096964, 1618679228, 56663032, 1502877569, 1787809606, 3171026396, 3411597083, 153287481, 3487511685, 3169928240, 3583116939, 1767370122, 487663870, 3505082218, 2006247521, 4220801096, 3037411207, 358526239, 4042932841, 1595456929, 1024170034, 3237701565, 2043937592, 3040155548, 2347496689, 1142942189, 2961469253, 163240502, 1637537269, 3146413046, 2853742643, 960593755, 2146471541, 407701098, 3202413246, 3392470930, 2399295285, 2816655148, 4137870176, 3139435252, 3999095315, 153016687, 3766844738, 3406533690, 1623276339, 2058415219];
+const POW19_11: [u32; 136] = [4254896129, 900652736, 980304171, 2237494519, 806622219, 1481372569, 1594893306, 1429651042, 520461233, 1384169010, 1860986400, 3353153719, 521012967, 1061918539, 3585061057, 593465121, 4090592225, 511257954, 2042776089, 136083668, 3963988729, 2231773506, 1896847515, 2755786263, 437517368, 3542151637, 284143785, 888382325, 2229806951, 2282519678, 1727256475, 2202818889, 2173872667, 1234038854, 1585204565, 1378039623, 1024316507, 2844837976, 3737636296, 1501749607, 1687087875, 3587579209, 2909567867, 2902509091, 3536167724, 2520584651, 3701257854, 959596522, 2000373416, 638415389, 550367812, 2494901029, 3102796157, 3546334266, 1096826775, 1944229679, 1295092879, 2779719369, 1065888657, 1798890005, 3807924864, 2275240966, 2908136145, 4155123706, 3032995156, 3718296519, 267222915, 857395390, 340092803, 2424871771, 2044596141, 2628187515, 2157533238, 70172775, 2930304387, 1898292758, 2605936345, 3125842343, 4069912846, 1567585176, 3029314262, 1529860590, 1833219710, 240562859, 431586267, 2936800789, 3270111111, 2211649058, 2928629166, 2193374933, 2533225289, 2073294107, 1616302889, 3713955772, 1100750018, 1396681706, 3028822840, 3385342207, 3291026658, 2155875215, 937347553, 3624152314, 900975440, 2768781459, 3403238712, 1375102474, 680803628, 503869938, 420124670, 83031187, 3023590859, 4053349732, 2761177557, 1235737784, 3055076616, 3625956358, 4040355971, 975831122, 1148785172, 2676068949, 277739707, 3985956042, 2081975591, 1118499225, 1493547608, 2094944807, 2143099536, 3089923066, 889986503, 4024266613, 2416103842, 2307158933, 3736694398, 470967898, 4047643779, 986520483];
+const POW19_12: [u32; 272] = [3426295809, 456430049, 1640218659, 3007079176, 959876987, 2223467885, 4076124500, 417888859, 1037880115, 2378369546, 2319054386, 1030664361, 3083754353, 1253520369, 1805795630, 466075093, 2198447969, 3550793507, 3483002958, 3696527081, 4109159608, 1034772337, 2864538764, 1845561056, 3844244629, 3328643887, 1623928805, 94248299, 3464429028, 279508986, 4121047871, 3703811188, 334236727, 3416012628, 1785319913, 350924216, 2805337799, 1595308984, 3493323566, 1994363794, 111516809, 1091882592, 1530881168, 176026905, 169089692, 3569082320, 4163151425, 2460214920, 1021156045, 3151009207, 985865882, 2997649065, 3116091745, 463670204, 2092181874, 4040408465, 2135545971, 3099695959, 3688345583, 2676964065, 1625226024, 3190311882, 87375303, 57511715, 2176616519, 2922021671, 131894521, 4045480739, 3029371625, 3683791277, 183182440, 2918812480, 679022819, 548831725, 545194003, 150746027, 2384861643, 774162756, 2307333480, 4063401231, 905006671, 1286321744, 1471072142, 2369239251, 4157285691, 2832213518, 3542764709, 275213133, 3264190258, 2673529100, 4162262270, 1352735401, 2495929144, 339616562, 99498066, 1548873055, 3278885527, 4030169179, 1520494036, 2805618981, 1493269915, 3893155572, 1427410907, 222948129, 453116650, 200054796, 3229577687, 2380861490, 2671152624, 2551740703, 1648910867, 337009883, 934844752, 3866683384, 1968565113, 4068714733, 3311509119, 1522688853, 2991638604, 2013517995, 481294794, 2578892484, 2175664801, 118823337, 3395067020, 3788021466, 996427616, 1991957499, 3061191301, 2685798947, 737155512, 2806053612, 2652347270, 646385592, 718776402, 3056261309, 1671840470, 3664347811, 2067964160, 4279377199, 864814793, 2733297930, 1857065174, 664714154, 2568338541, 4114063995, 1857735519, 334586826, 2193181127, 4282352547, 755179073, 2595052814, 3360639724, 2048031108, 2536631630, 3730675741, 288445910, 2488075713, 3340156953, 1759689498, 1699524541, 3465719663, 161191240, 2305028968, 663140709, 424749294, 3203217945, 980017320, 2641622629, 3179262525, 2268258129, 3703847754, 1953149931, 2034331792, 2453785789, 2645877717, 4149107306, 2444326557, 181780619, 641344048, 947653609, 494564618, 4165372872, 1009533988, 2247525603, 4272908696, 2399217132, 1227010564, 319655213, 2799392398, 3561139967, 4280646442, 705080968, 2030943653, 3077510072, 2623422447, 4145844983, 1555248449, 2666106573, 117240579, 321366571, 556728016, 1710553605, 802873415, 1550782081, 3989893606, 1992495208, 405282038, 720198523, 1022727910, 3080262583, 2885853759, 853837388, 3228366717, 3649328617, 97009278, 944298843, 2405349692, 3574066585, 2478557666, 3197441940, 1581669964, 3284119736, 2738233173, 3586426533, 1291387723, 2963731997, 1169402355, 1172500732, 3858949327, 4048579900, 3512967151, 277988563, 575774030, 3203736845, 3196420723, 2699397170, 189743599, 3290783293, 2310014003, 4154330172, 3890826007, 3698234563, 2259699940, 2728960897, 2813861197, 3040889884, 3943121979, 3924249142, 3370921844, 1739074773, 2250012001, 3311607808, 4275228102, 3032334483, 501818730, 2564077082, 289590731, 2811899264, 2262280121, 48124927, 3551007956, 3187578938, 3342870504, 1670700644, 400340834, 2974288493, 3545233831, 1864662781, 4093578384, 2430491226, 226596059];
+const POW19_13: [u32; 544] = [3698475009, 2348710786, 1125569724, 27387644, 1693267154, 525565825, 3221818805, 627963023, 1871616018, 1703673704, 2288610982, 4012520689, 1077215743, 3542560748, 352715808, 1026708448, 763132536, 1292513486, 3128094965, 2432068461, 3144078469, 3639513047, 2452365249, 3897634097, 3158041736, 2842036982, 750624087, 2448194546, 1445977927, 2281412423, 2559176832, 2121789021, 820711812, 445943201, 4107798256, 1205099379, 3734091239, 262484112, 1708009319, 2341670672, 2385931575, 1604531876, 2763730110, 2987878241, 2598893428, 4080242107, 658701652, 3278278300, 495685585, 707364982, 2953115421, 2331439434, 695374200, 3059863288, 2673841031, 945337560, 2963017008, 2600811093, 2010921721, 2190994195, 1441728782, 874413108, 1340547061, 253295198, 1830889962, 1106390773, 267733138, 1078616913, 2176681734, 1037756416, 3496174982, 4160304534, 3708573742, 3606953911, 759922554, 908768211, 36301915, 2731180088, 2431564390, 3111240551, 1796201297, 1449677007, 2077716548, 3012974782, 3253299885, 1395989820, 4093069628, 3976864013, 2222800946, 3966075865, 1440883596, 2937249133, 1960613258, 3866722429, 3045749476, 4218987064, 2538371182, 3675801283, 841605258, 2239840858, 2661704789, 2124919157, 3178074258, 246943499, 3626277666, 2151349822, 1757973659, 2937817170, 3911039073, 2603480839, 1410754424, 3628086132, 3410926441, 1394153497, 161038440, 4048050492, 2857121086, 2302352481, 3355362520, 837134425, 4091164381, 2181027065, 1448048876, 1990829837, 4233637301, 4210787010, 3799162065, 3587407276, 2865177792, 69460099, 2373511514, 4056317445, 1815952152, 1832959647, 3225977, 2432637060, 1949712484, 3303591154, 2355390943, 3886644230, 365475074, 4141964206, 2626358532, 1941078737, 2622974917, 618116244, 4275387220, 594915216, 1224569507, 3845674819, 3912729408, 3090512886, 1189631081, 1022115508, 1984805740, 3021120626, 1759395566, 55950297, 1460793026, 1462014826, 2281305419, 135943629, 2549233697, 3448970082, 698019423, 1750514438, 1083912407, 1792619850, 2397984834, 180833955, 2525167464, 736145625, 4279871585, 4016857381, 4036939174, 2105463069, 498683168, 4159081386, 3370439434, 607760224, 836741276, 714413915, 778783896, 4218365807, 260504127, 2427279166, 3994847061, 745700051, 405317637, 437018589, 1108173734, 1038879664, 3107146829, 1753820698, 13154889, 4089222476, 783840504, 3758645013, 3296239984, 1465674627, 3860937699, 2330242899, 3356964930, 3428227399, 1170326701, 4027939567, 272867974, 1139814414, 1686357188, 4137535440, 935295564, 658917480, 3581653950, 2471701971, 2281752281, 229936885, 2479291357, 2273019496, 522521942, 3877448615, 2990128797, 378293256, 33829329, 47693473, 3264019538, 3673586715, 810931650, 3588924867, 881802719, 849877068, 3519113866, 2648824723, 298764587, 1061117323, 3497516460, 774097362, 2829082334, 2354372120, 290967978, 2228127560, 2448428118, 712297790, 2212669481, 4117664708, 2844307473, 2448759562, 3909013179, 82446222, 4063738208, 2548920436, 1399220080, 2174367894, 572159520, 2576016842, 1633755072, 1332574234, 90563630, 3403454573, 2306449586, 1836111429, 3847263182, 3157943865, 3187263043, 2336380071, 57204767, 3374191127, 2263034681, 1024000143, 2635372492, 3261928202, 797536801, 3763489472, 2206747643, 2978801531, 4291367355, 1851048078, 1583883821, 3058137808, 2876732371, 238942589, 987844605, 541104707, 4269758182, 726401954, 517779157, 3932852177, 2519316915, 215545279, 1170775446, 2679061552, 139443286, 3996718746, 3408745927, 1586582409, 1454370473, 3045247666, 2444884360, 3059683652, 3318906948, 1283666682, 4193821293, 834087456, 1135898775, 1334330677, 3583264251, 1256013730, 3356123107, 3794612215, 4184288324, 4209598392, 1148473112, 4097605935, 1368958267, 3522601735, 922959283, 4068741403, 3701983404, 3107114321, 461316967, 1960582466, 2441363463, 1407849835, 2168499426, 3799713542, 83435149, 1647227160, 2206800003, 3640079826, 2946722865, 1140599594, 1069261201, 3689142171, 4081025932, 91001280, 3621475658, 4210903522, 186355933, 748465236, 202779544, 1331032212, 3297032193, 14749470, 335754767, 703241747, 4055911534, 141500073, 3860904859, 801854871, 3134540418, 3697700580, 1121562158, 1292698770, 2759792766, 2163162039, 4214972901, 69131059, 2439268588, 1646213910, 3568299259, 416961787, 233508894, 3405225790, 2707437307, 169033690, 2763821461, 3371930561, 2671731524, 2218631372, 3556740456, 4196704464, 3270298054, 4025382741, 2046909602, 2072061389, 1575451198, 4188215372, 3836979169, 1617568182, 4287398767, 1420826033, 539985529, 213746114, 2053529503, 3280856001, 262261005, 2719073765, 2076616586, 3880611696, 4283397239, 4217794368, 3892326973, 3101643777, 1107439832, 320556763, 2418357014, 2613973143, 3590814049, 262032528, 1405627149, 2915350870, 1135921419, 857282742, 1554243154, 3702194247, 2756742536, 303554327, 2668112029, 2816621037, 1216972063, 3132436655, 2248364458, 1635977659, 375283790, 2351775118, 1477024371, 227015564, 3995133651, 1177315689, 3956504171, 4043948729, 1505950922, 3733597925, 1942915677, 1208783370, 77892568, 3780201208, 3992211952, 585713512, 3794452100, 2872133197, 1268675185, 2222307392, 1786705831, 1154148139, 2449697059, 3562775153, 4243048772, 2239913232, 1821035718, 785641329, 1483537159, 3966867099, 3711390631, 4160723913, 4128180782, 3845419982, 3498967752, 3623467449, 4023386558, 2080345519, 1829865640, 2066544244, 4269343993, 1707442400, 3652540860, 1580459142, 3170722747, 2635513381, 819917600, 963481752, 3956002458, 4207297868, 4146519668, 684565896, 330723648, 2732580672, 2460677898, 921005803, 328628933, 3004678593, 1290348712, 3375692685, 1995878766, 1738267363, 2136007949, 110895732, 2392525990, 3693450969, 225201216, 3171073045, 3478244004, 4155779732, 50953808, 825956166, 1897027940, 936075529, 3324254947, 3244913167, 774896874, 1181764826, 3286855052, 3636573853, 2004728685, 954948499, 480128314, 2144898790, 3707494056, 1991944670, 1023933339, 2129301216, 3774884033, 279325989, 1411971072, 631884243, 2797000113, 2469417595, 1059902555, 2554835918, 472620564, 1606463096, 45490379, 4072472094, 2574648783, 2363640954, 3956224404, 1251461196, 1488722722, 3112095189, 4023319800, 3492404471, 2694941226, 154487917, 133194553, 1842024384, 3321045507, 311009458, 2582077646, 1622864329, 4265317991, 3217905926, 2587369922, 2173669452, 985706565, 4174931395, 3045862001, 1615132599, 4171162099, 734562947, 2126761952, 852377186, 3655493546, 2471786196, 2827825430, 11954869];
+
+pub(super) const POW19: [&'static [u32]; 13] = [
+    &POW19_1,
+    &POW19_2,
+    &POW19_3,
+    &POW19_4,
+    &POW19_5,
+    &POW19_6,
+    &POW19_7,
+    &POW19_8,
+    &POW19_9,
+    &POW19_10,
+    &POW19_11,
+    &POW19_12,
+    &POW19_13,
+];
+
+/// Large powers (&[u32]) for base23 operations.
+const POW23_1: [u32; 1] = [23];
+const POW23_2: [u32; 1] = [529];
+const POW23_3: [u32; 1] = [279841];
+const POW23_4: [u32; 2] = [1001573953, 18];
+const POW23_5: [u32; 3] = [1854975105, 1930488089, 332];
+const POW23_6: [u32; 5] = [1633523969, 2552572211, 2550303091, 2811546753, 110522];
+const POW23_7: [u32; 10] = [1210855937, 1436506257, 788091685, 4255817435, 2500410572, 2361723765, 2618086504, 4203283319, 3625322590, 2];
+const POW23_8: [u32; 19] = [3390858241, 538851, 3291369078, 492442738, 2850638734, 3029803664, 2378638741, 755966606, 185069185, 2748924587, 3547456468, 2115104919, 3398114034, 3022323801, 3693445824, 1646113784, 2709808682, 381505921, 8];
+const POW23_9: [u32; 37] = [2605238273, 3116014269, 2992234958, 1161074084, 479530153, 3899908674, 2110077101, 945664495, 1886615027, 178825347, 3336466241, 1535044871, 3130879489, 2072972949, 3321140195, 1277356633, 557957570, 1424987297, 2661331017, 3155813457, 1979672171, 69442422, 1465357477, 1292379284, 4001039347, 2329370010, 3548005518, 2351685740, 4050637122, 1246418910, 3135187870, 2896849915, 3344622137, 994758688, 3546606478, 1843015197, 65];
+const POW23_10: [u32; 73] = [1389465601, 1270725724, 2430805426, 793913803, 1730617534, 830391743, 1447514731, 618344372, 623481912, 3084697698, 193767822, 3851124886, 255326659, 3713486952, 1566487911, 1755920970, 2992359304, 966788492, 3740415920, 159326876, 58388316, 3618138013, 1211637293, 3982421756, 447680048, 977798062, 1729585872, 29528160, 3511980698, 2986171906, 721298031, 4087122058, 1337589914, 2891941726, 1799086713, 677396911, 3673570755, 3849306605, 3461700235, 1874006132, 2569805975, 1563150380, 4669777, 2045351581, 374132179, 2011356629, 918291745, 3147334072, 236807592, 2435596618, 26881790, 2019016339, 1175120407, 1285033588, 272812424, 2679220483, 4186085566, 2453245162, 420923676, 1014007343, 1216833656, 3376737166, 3242365153, 838929369, 4111422289, 2611056369, 1954578150, 3133421373, 1159123251, 1087135977, 1381913124, 4159631453, 4280];
+const POW23_11: [u32; 145] = [379789313, 2758141061, 71522850, 1119530638, 3978370053, 1160536233, 803554839, 4138152392, 3767315879, 2206196210, 1579030902, 1743902133, 2467116037, 2987035458, 3012122326, 432014986, 1690767645, 4236672118, 823127706, 3913278592, 1175238479, 39484736, 2726235066, 429737273, 3996909923, 3231819960, 3841170194, 3549092869, 156053954, 4177621645, 3218207888, 3773558946, 291467074, 2735794354, 2817713113, 2107057369, 4062136853, 1239339744, 1963513639, 2850418918, 3316030415, 2583849721, 4178950459, 3643813342, 3629742336, 4063289682, 2858387189, 401584375, 2351321327, 1961707692, 3148842945, 103814549, 3501419191, 2975550077, 1101977746, 2679908101, 3834230311, 188877196, 1948690137, 2620024128, 289849790, 457761556, 3006912097, 2159899689, 3894307461, 2329790703, 1426201101, 3005856300, 3111020731, 2546062547, 3089661554, 4084360158, 2272224239, 651696083, 1286065301, 1757277020, 1138141021, 2237865833, 642045488, 4203444687, 2023651164, 2966208508, 1092430863, 3622977179, 2319864750, 93603986, 2769608280, 887833271, 1586054297, 3225966370, 2510175321, 98568386, 655221764, 2788081662, 3922902292, 2900505997, 1887368825, 3533864638, 425446961, 3961415955, 1151618629, 1646022686, 3222130023, 3474940252, 1361296164, 659675733, 693297050, 3373397441, 1215971414, 2340864725, 407181956, 872585078, 3031994095, 2114550411, 2349517248, 700038787, 787928209, 1323880295, 1010311499, 1467760695, 3061713726, 3939092210, 1720173567, 121727021, 4004998533, 790233415, 2624290768, 4130208598, 1193155313, 2097752256, 1268873715, 2041343193, 3277403825, 1353198293, 648245758, 2548770238, 1282528946, 3619875585, 2095010525, 2649414752, 1890794924, 795315762, 369156751, 899949386, 18326691];
+const POW23_12: [u32; 290] = [4047912961, 2706078331, 542992255, 1637665820, 2741142721, 4065827615, 1270610388, 3130100114, 3409680144, 3226805914, 3382630134, 1695211647, 835807866, 1253342310, 1867751943, 3414562408, 4131807098, 1838155340, 272019709, 475330415, 2848842812, 2628625154, 1779768443, 3660761624, 28646505, 4064911928, 1324601206, 2648009214, 3009464369, 4040162765, 4032792242, 3188403026, 2627115900, 3600369684, 1661889763, 2461085059, 2557186775, 1547903206, 2444484871, 2002767868, 3963260566, 4277655133, 3164618438, 1526177493, 3687429330, 3036799512, 1342125841, 886772701, 3065742182, 3228196492, 2175413217, 1149380218, 1160578103, 425846651, 3233169681, 3301185752, 3653989427, 1932531647, 1176656790, 2479866857, 1697450058, 2696979544, 4171688849, 1984257175, 2376794540, 268070975, 1584360037, 435144812, 341033877, 3377520632, 4090216239, 2751416470, 1489343099, 4012274079, 3182747585, 1106761117, 3074921942, 2826597558, 530613369, 1408107841, 2909853108, 2052055873, 2151637918, 3775153332, 1697210164, 2748383243, 388425896, 3902000475, 44444877, 190299373, 3802467288, 2432430955, 3573228694, 4234613504, 663227232, 3504998182, 2818568140, 2089079729, 1764011739, 2345693684, 2156823721, 479848277, 2482061478, 286763971, 460347807, 34719071, 3309308291, 2058164715, 4097499901, 3229558899, 3934884672, 1978363444, 2053796824, 2811196783, 1095805763, 1217074101, 264596232, 2900338186, 999456882, 1879395680, 260962281, 4134975577, 2801571397, 2888997548, 321354816, 224916052, 1371339964, 3611483631, 1647901049, 491660493, 8514499, 2355964689, 1047118756, 754250461, 919479968, 1046073168, 517250720, 3251815459, 45306865, 1906674686, 2805610381, 3032672849, 2114249531, 277875506, 3426639681, 2424703720, 2261633930, 3648844959, 185410792, 2668214722, 391505289, 2161966703, 2612423299, 2978933815, 2442786080, 368451385, 3270180305, 287202057, 781208358, 3581321000, 1724769350, 1359713574, 2429054300, 270136631, 420238567, 3404338829, 23256407, 2684317479, 3905086894, 2918661679, 2047888093, 2662771914, 3989908354, 3417530629, 2094001687, 361580016, 3086435457, 965781219, 4249366685, 448816469, 251000905, 3512983509, 399664727, 3319202455, 2991935997, 238214973, 2059177992, 924510095, 2738727311, 1408152090, 1366672482, 544745176, 2718822597, 3342403313, 3069625731, 1122889278, 2352618905, 4032627128, 2739922667, 3448136107, 2173196206, 1213124524, 181560319, 1137248410, 3748611021, 1634052255, 1140008267, 1000807011, 266130147, 3968119094, 1663575010, 2544232626, 387355496, 536092600, 3034262090, 2275205838, 1992098149, 904357246, 2047404193, 504923133, 3579921170, 1631109480, 3686011874, 2301805038, 2932643745, 1516851640, 2629543965, 1734466704, 1916624342, 3614123815, 1985797395, 1822045299, 1571737744, 328376417, 3307293173, 3298812782, 3929675526, 381933809, 8956221, 2330861594, 3129515112, 843570113, 4249041719, 2832931138, 2596533158, 3295015771, 2890813875, 578570402, 3426929694, 3286268033, 2079105775, 2984649912, 3249157295, 1209368491, 2149367866, 1110834557, 3595580613, 3493621749, 2880729144, 2806520113, 1886576060, 3568463889, 1694305802, 878278620, 809891654, 1983193009, 1867229389, 4162557282, 2356690531, 521290693, 1959127013, 4142787822, 499367916, 2474576428, 2093902775, 13158038, 292424669, 3987092736, 2963112161, 2440758231, 580917628, 3344986760, 3870742929, 2276641489, 3392631670, 2272346511, 3831968049, 2465542736, 1168142476, 78200];
+const POW23_13: [u32; 580] = [4069294081, 1954401470, 2426562721, 2785656499, 2436180519, 1555477753, 26008596, 2550420690, 2660826980, 1910178312, 751335956, 3784438901, 3887774093, 1253188426, 2461159114, 2396898009, 536785702, 1539400130, 3340993484, 723696446, 2866420198, 137664586, 28452047, 2346439400, 710205197, 773955028, 1295618182, 2168257280, 823750549, 4107353467, 194544918, 1399866117, 4080865184, 4294414893, 2716211388, 30877716, 2805600161, 1168681766, 3675200818, 826363708, 1788156611, 2383043973, 3368147427, 2635875110, 2897736799, 2501181051, 640939406, 742206169, 1553972078, 82055010, 1960090306, 2044466541, 3382908180, 2691915312, 3811761225, 978356366, 2121280903, 1044872173, 1689233681, 3523820819, 2719151474, 1557860688, 2816310055, 3007778646, 1955415889, 2709007886, 824179083, 4157845984, 1668333438, 1323991598, 2512532644, 115219799, 1798362470, 3294560066, 4165155070, 2094351775, 3845308917, 3592861001, 4037342980, 836321446, 1146169325, 3788391498, 3845351500, 4123710833, 2287261707, 3001660701, 365734328, 1373840209, 379319944, 3304703246, 2667248859, 3469642195, 1491933952, 1800417045, 4188345322, 3836015449, 2289088224, 1881030843, 2117857271, 227625765, 3378234399, 3686254475, 2839453187, 2345076086, 325108888, 316281677, 144330590, 185763391, 2751272900, 3413189564, 2095740472, 2304249401, 3738777365, 3589204737, 3926188970, 1855205086, 971129436, 1728588995, 1912872952, 4155583376, 3490428049, 67177501, 939790347, 3681278908, 1257097516, 2165164581, 197355782, 3182242994, 2304233930, 2399030398, 2931875554, 1536732010, 2218690775, 1447885919, 4040462315, 854495807, 180717071, 2262287620, 2620208073, 3231180781, 3311643465, 724991797, 3699878088, 2946011589, 3890861432, 1043419275, 92510136, 4007698002, 1864878984, 304713154, 1813086879, 2824742219, 577583630, 2786013288, 117739258, 3826637508, 3801221845, 1137785848, 3296897084, 1076447441, 3166882710, 3103335519, 3153904328, 2340551809, 3629195646, 299740308, 239096656, 3194262602, 3177130873, 3245830874, 2835384678, 3761796838, 4294537490, 2190208216, 1386675137, 3366893001, 607433185, 1897011430, 1418554732, 2272214293, 1735757754, 2507633226, 2029556540, 2826896662, 4046611314, 810189824, 922331213, 958459530, 3657536577, 1086105018, 3758440273, 1579013403, 204829439, 338418247, 1660430527, 3668379592, 2730295562, 223749203, 3117457472, 307354783, 3841575, 3276225973, 2970415599, 3695857983, 2939332526, 2757720255, 2767717659, 4239836917, 2359756599, 1282847416, 221814126, 3738616852, 332100895, 2827681514, 1399634935, 2631257341, 1044381446, 3617910905, 1189777580, 903799496, 1144824547, 485155442, 2947328600, 1686177123, 2947084384, 3941590708, 3197580207, 614109925, 3653865495, 1435212859, 3391256022, 1006926394, 2902917026, 801475739, 3070880610, 1276574800, 2142234948, 3356519153, 2035630764, 3205171983, 1332734318, 4078069739, 1428897349, 342772171, 2097758727, 2225548100, 4118513652, 2062957901, 3528788113, 2427038307, 3572649043, 4129470847, 3666530417, 2690176479, 2531735868, 164025276, 3432026166, 682738945, 3631838634, 657685579, 618943277, 996863671, 2187701409, 4019922914, 3644683240, 857254337, 409516993, 2681090225, 1635520229, 229516358, 3151916241, 694772196, 2435581206, 1125534899, 1910166927, 2448255279, 697647330, 1830318100, 1609142992, 3611999617, 1847492473, 1355259976, 3708210041, 2735959343, 293575348, 2975059905, 4274837588, 3745372880, 4076667507, 3873563731, 3099420835, 1001674783, 3547607037, 1838139501, 3326132470, 356100529, 2607636644, 3791208868, 2579299845, 3155313575, 309611805, 3292634034, 3698684191, 2375433324, 3877927092, 3763165659, 531649305, 3837201187, 2282886327, 3002787250, 1223950399, 3649652961, 1184782172, 3466130022, 1238685353, 180270883, 1752600178, 726733767, 52593246, 2618104701, 2843395146, 1428755413, 2660004701, 1927047974, 2869239333, 1007878885, 1944014181, 2497293477, 1862749216, 2028701675, 216388274, 771716445, 3598106963, 1505785136, 1371557563, 2522177212, 3753067627, 207338163, 1955929058, 3148350200, 1957377172, 2164175391, 1006133080, 218924664, 4237756727, 4124313905, 963598878, 499215679, 1172118642, 352801645, 3711486055, 2704856106, 843526135, 2380772459, 3349025226, 4273981066, 3853711389, 3666535652, 3757224559, 3343712598, 4110824240, 2216790611, 2036434305, 1637307214, 1895812213, 1109890606, 960516819, 416511472, 1428970943, 714117557, 1042867327, 3584887456, 1200174443, 4106051533, 2966846591, 4286452120, 907712294, 3028289635, 608526429, 2369063090, 71802511, 3188847921, 46576398, 3655681067, 3295512953, 3638105274, 2119636724, 2572108308, 763014256, 4016048453, 2184788569, 3419569661, 3686207017, 3368449948, 1683363159, 2266607979, 4157176569, 3329606707, 2406202189, 2840460639, 4002433436, 1857236927, 1186011215, 2565743137, 2506474626, 2869693354, 3765518931, 1708079424, 2703237025, 2402297528, 563068429, 1459608153, 2846473058, 2604689849, 2216300800, 2424306645, 529388414, 2318346844, 2403016497, 3445305487, 994471558, 2958786303, 3964318006, 4180280941, 3250713050, 3786273909, 969898182, 1008973939, 122032332, 2129955944, 638544021, 2812683054, 2775574130, 1576693875, 525779223, 420097599, 3642591110, 2993241847, 2620193437, 4269035410, 1575785715, 3444471787, 4294921544, 2478645296, 1930412589, 441446086, 2060156797, 554640781, 1583647825, 2456879323, 2790030200, 2100532777, 2854768645, 787011355, 2298053187, 1455122573, 582074911, 14997701, 3518950742, 2881834507, 1940098452, 1701395718, 3034550474, 2087613597, 250442365, 1580048717, 3790302087, 2344367410, 2437266339, 3023419473, 3840138892, 3550683195, 960677531, 4143492805, 467899094, 3581822845, 2855355044, 1254323525, 3603167711, 3285584259, 3091552660, 1528201745, 2387950529, 3188835330, 124684358, 1610853249, 716458711, 3435200986, 2378854294, 199806670, 4193966026, 2799407192, 3782350066, 868481059, 443682634, 3674611533, 763113571, 2754086452, 2528179471, 1576625559, 510326000, 1657616019, 1833044432, 2723855909, 152377489, 998028148, 337731178, 3265443092, 3700237320, 2940004226, 971765863, 2450784377, 3215723394, 3678551205, 4061391272, 3851851231, 2899339302, 1248189013, 570675688, 1276023275, 3759158608, 2500824135, 2509074472, 2527752661, 988837119, 1475656310, 706394433, 2455979371, 2436825652, 2507640175, 626513663, 4005398074, 2644648308, 1290976833, 1654396564, 110135643, 3263622255, 463879869, 1888262729, 4215769909, 1934613129, 3483952775, 1724048463, 3932205985, 2088081195, 861756285, 1594614133, 2492863394, 722201448, 1550394506, 571927635, 2659445340, 2801880457, 3132851170, 165526633, 683594542, 3481462370, 2478620971, 2302899208, 3801656181, 1601163220, 3263774847, 1631993133, 1238601788, 1247510535, 1461290983, 4238127104, 2128496266, 90140812, 1830400869, 751828593, 621557169, 1723496903, 3957415136, 3262786214, 549825854, 2955876730, 2777176878, 1820315241, 1];
+
+pub(super) const POW23: [&'static [u32]; 13] = [
+    &POW23_1,
+    &POW23_2,
+    &POW23_3,
+    &POW23_4,
+    &POW23_5,
+    &POW23_6,
+    &POW23_7,
+    &POW23_8,
+    &POW23_9,
+    &POW23_10,
+    &POW23_11,
+    &POW23_12,
+    &POW23_13,
+];
+
+/// Large powers (&[u32]) for base29 operations.
+const POW29_1: [u32; 1] = [29];
+const POW29_2: [u32; 1] = [841];
+const POW29_3: [u32; 1] = [707281];
+const POW29_4: [u32; 2] = [2030206625, 116];
+const POW29_5: [u32; 3] = [1797710145, 3816168866, 13565];
+const POW29_6: [u32; 5] = [4219425409, 2265142903, 4119564573, 1570454940, 184033331];
+const POW29_7: [u32; 10] = [3969180929, 1340492553, 1739183727, 105569977, 1767257366, 1739519195, 3874617455, 3771111571, 1793220428, 7885570];
+const POW29_8: [u32; 20] = [1845676545, 3608513765, 1294341313, 344489966, 566774291, 427680924, 163628113, 422450508, 3222465417, 3727450692, 2861254789, 883344622, 1689193932, 1672377999, 1874044950, 3963222593, 1712211922, 4194848827, 3979265421, 14477];
+const POW29_9: [u32; 39] = [2741605377, 3747537770, 2886285109, 1412328910, 1983065589, 3689472563, 746895763, 1865898533, 3190488753, 2306727561, 93165003, 393896841, 3469007245, 350649525, 2503345911, 993127718, 3133114464, 821782878, 626409599, 381575402, 45686706, 1602747444, 2383280150, 2768255957, 404622700, 1968885784, 1077673669, 3777279179, 1028090331, 643293672, 4270324062, 58968547, 538879074, 3280367964, 1962916813, 2823720265, 2293198637, 2545114653, 209610355];
+const POW29_10: [u32; 78] = [73607169, 1727263960, 1550447109, 223139752, 474733911, 2907675967, 3776691901, 2917289149, 8658750, 572966205, 3934783264, 3097006194, 1229111012, 552677943, 244540825, 2659847833, 3839719922, 4256484087, 4285080068, 3146272340, 2443489594, 890208720, 2265994015, 386119463, 949159946, 22693323, 1194056901, 1827462345, 4016125523, 3968753268, 960638922, 2816452726, 1620062006, 545777120, 414071121, 3769697272, 204797, 2016773156, 2535915665, 599464091, 1031205166, 917030052, 2226442601, 3339166097, 1797305811, 541956524, 2958721485, 3048266196, 4259459440, 1379998557, 4176468795, 2567940618, 4181173209, 3739384482, 3312759079, 2983647679, 1436244967, 3871463862, 1499007172, 2101608748, 3148042606, 3529524040, 4136411945, 936705246, 3326082955, 2710274333, 1883484962, 361100589, 3022765025, 3931132428, 2649068847, 2761797091, 3525392638, 859192676, 3927252476, 4260244805, 3640817271, 10229763];
+const POW29_11: [u32; 156] = [4278603777, 697215319, 202853069, 2954909114, 1550962014, 1496023878, 1782193615, 3665399447, 3085565264, 2841551794, 3719475863, 1273167982, 2320235283, 2098517552, 44349562, 862793635, 2953154376, 1587005149, 3168348248, 1764782146, 2062885846, 1072560879, 1789045518, 2917948689, 2924957515, 2555853131, 2939971233, 681122998, 3174781702, 2662376941, 4123393835, 1483261462, 3334085387, 841325466, 4161363919, 1996038917, 2662316806, 4117921344, 1854020894, 2163718449, 624914160, 4143716802, 1152477144, 3761430858, 3634337359, 740859484, 3562428707, 4026862771, 678311050, 1940514605, 2932426120, 2325287144, 4183216363, 962659255, 3417669325, 2479541064, 298477652, 4169501017, 3758278103, 1711340542, 96141647, 3215275776, 1919119895, 9401932, 2882445344, 1060594142, 355920713, 385890957, 1054224959, 569979766, 3797736015, 3397125441, 195938544, 995733397, 2588893058, 2042240136, 1709410972, 4120956638, 3141477629, 2131485274, 771892488, 2816894770, 3054172189, 3611267231, 2977682122, 685750076, 4150739665, 3619886069, 3053318796, 899466401, 454257567, 4246663479, 2422422368, 2084224089, 3446576329, 1212477009, 506911052, 2987008999, 2040308234, 3639166139, 2462919952, 4272561960, 2096264055, 3729176847, 2102556768, 2603507063, 1899102954, 1553729706, 122344717, 859323548, 1649990386, 1521267614, 1927659096, 2731685046, 3916751522, 198593844, 1228999290, 3674435493, 3172342912, 1702890034, 1328949637, 3890640112, 1647424304, 2639285503, 341668221, 4107683075, 658508302, 1929600924, 168815462, 3733313214, 3380373144, 3663192695, 1301952946, 1856661354, 490667334, 1640212579, 2118340383, 884101983, 3676138166, 3368341196, 1984411539, 4128071055, 607633591, 208516855, 1101438860, 2842144949, 724302134, 1515113562, 72509015, 3435476047, 3059758279, 3665234599, 1182272530, 2792877457, 1190212543, 24365];
+const POW29_12: [u32; 311] = [3607928833, 3172288055, 199160624, 3815140915, 4105135486, 354905100, 3334288201, 2374822670, 1591127775, 257429645, 1191501490, 1839186182, 4012788896, 4287636051, 442130510, 1519890657, 1288950902, 158929220, 4220851980, 3951512010, 4194716349, 28529624, 3940969666, 315223375, 816580711, 1792851290, 845620169, 2590898178, 2193361451, 260246424, 953995987, 293040003, 378698822, 1766866274, 3894726485, 3059015199, 2210108283, 685592791, 3465961704, 4117926780, 2444200593, 2515179420, 2695137729, 864772394, 3019284117, 1419771309, 703241944, 3693031146, 4033289377, 2451600091, 3740912397, 1363611801, 1100094045, 1789977742, 1402519375, 2934850417, 2560495362, 1713428760, 4209170350, 1296762553, 4177610136, 1073420145, 3871056953, 3387126897, 512427028, 2665482997, 3291283379, 2751792998, 661182206, 2101149465, 788878807, 4100594244, 99048184, 146464003, 3380645691, 3819035076, 3603170945, 701081015, 3720253032, 130253503, 3679112580, 1794752709, 1209476919, 2671937841, 87671778, 1752746183, 4041650367, 4290916551, 4167356879, 3876112030, 1108122061, 3491100392, 1489365511, 373185189, 1883413925, 2425193676, 2323548305, 908560591, 1948021589, 3776848200, 47334853, 2963562145, 3102090119, 3742296626, 3195412642, 2807873934, 3274976012, 1756841097, 650785134, 651748604, 2981868088, 389371324, 3895577665, 2011007468, 1241038096, 560605404, 2680398066, 2580194201, 3768424261, 1401956559, 2125168161, 1817282670, 1069321318, 611379508, 4080385706, 3777745780, 1405905850, 2342863597, 2922904845, 580076185, 3201346217, 3927498483, 3584531193, 1264830103, 2227961968, 1490369089, 2482481839, 3009000827, 969504404, 3905341734, 2874668988, 2045899191, 1089128399, 1504976194, 2833313782, 3063026411, 911402527, 1265656537, 1000807348, 3466284855, 2416281739, 1318343005, 626681002, 1411270607, 627171802, 3899677631, 2769301206, 1951203588, 2499971370, 776095777, 3786039761, 1317617964, 3185899345, 4132713697, 1305149308, 3763748177, 1703616143, 2381192787, 423169192, 2338580159, 164376048, 3534014631, 2435384891, 2536480092, 2611549869, 3390039588, 2506328084, 4047419198, 3611123991, 144779922, 994101540, 2523775857, 3972705149, 458202001, 3947530004, 1902196855, 2482166846, 2510589980, 793211894, 3979960687, 1791603334, 2677229163, 3963053333, 2889462311, 3639690090, 1727091983, 2132273135, 4260113040, 4136804362, 366651068, 4014155770, 3108998370, 3524928879, 163789635, 1857975067, 2175199387, 3061735179, 1671255764, 2487618669, 170315554, 3600792564, 3129952624, 1895671812, 2394379137, 1058623778, 3720215419, 1625703422, 1854220682, 1922473404, 1319953466, 3003019916, 3369563474, 1720693313, 3027887928, 2700242801, 2236329480, 2274388727, 3748013616, 1803164013, 1997843968, 3591495713, 1395040688, 2646289185, 1044704746, 2468273032, 3399212506, 2308715228, 3242205410, 466084230, 2675183433, 1513832991, 2588626825, 3740540717, 2653270253, 2476312429, 891627129, 450536579, 3552176684, 465569917, 3776661276, 1494793834, 2304900165, 1244037087, 3765131358, 1421214113, 2216329758, 2377502548, 3461492606, 417469843, 3927482701, 1900648322, 237767264, 2245383962, 2743269639, 455634196, 656163457, 3436736663, 3007991801, 3500075783, 151551344, 1861964282, 2332367313, 227261633, 928786803, 442629844, 223744743, 2914982971, 2271868058, 3591067978, 4217647960, 374514385, 4230019140, 1550676035, 3377325821, 3678940869, 1049269419, 2477001772, 812696853, 3495418575, 3427581880, 1068364743, 1305279423, 3640508285, 1573640499, 2030179892, 453940246, 555867500, 2104328489, 1169480451, 1057036024, 1007972776, 3374167874, 587514179, 3159698528, 1705338233, 2465824868, 1335209891, 957788808, 3503441638, 148716156, 593666729];
+const POW29_13: [u32; 622] = [303644673, 3183313359, 1076783228, 999911089, 3398129928, 2779329913, 1032887498, 3986457683, 2955592949, 1691800665, 3824605515, 2804753885, 3452962860, 1060557084, 3938354736, 1895760521, 2235469582, 3475924610, 158840748, 2465874169, 1305903705, 47725050, 72716818, 4282885909, 4241690860, 4207749816, 1075135789, 3023104985, 3829299750, 3029023672, 1193029810, 3128772959, 3866776527, 4003411115, 2382880661, 4163238484, 3751602836, 2035172010, 541641876, 245401834, 1858547923, 2201891579, 4173044206, 2941936212, 218252298, 1820008548, 33580923, 167399357, 1543106286, 2446335653, 2111948432, 3883029972, 3496468947, 752335179, 817552192, 1917461340, 1324761443, 168684988, 2104242380, 3124339844, 1141408612, 2074356148, 1167598633, 3357103207, 2471197125, 4200966721, 2402964820, 1333066366, 3391310489, 3043470037, 895188397, 2392954091, 2952156610, 2798187726, 3425704694, 4109012957, 1888190658, 1345700401, 721060681, 3876834174, 2209380659, 4092844177, 1823377013, 4248159515, 2632724164, 2063037533, 2902415591, 490954952, 1044158739, 2951434559, 2521421609, 997866532, 1952446248, 2160056446, 3186384396, 2535960823, 838019242, 3119346130, 3861853776, 3623933842, 857167795, 2250467289, 1780232445, 1277821502, 2082379725, 3495661016, 3018854047, 1345333239, 4280922518, 3466106207, 2579113204, 39317414, 1472739731, 1792810543, 2185078144, 1487293172, 401857417, 2146057477, 3143789664, 2699086962, 827996356, 4064349888, 1662353986, 1797375974, 979056531, 1344912360, 765649955, 2771210394, 1164010295, 3788606568, 2802032172, 4231796015, 4001203572, 313890799, 3052869518, 1301272702, 4070120662, 3340639114, 2007663329, 604496786, 3897245152, 3026622833, 4284829951, 1828563085, 1540793618, 1729659901, 3154823257, 2135200319, 4183552731, 2997372558, 111567451, 532555489, 687137494, 3599716408, 2316350567, 251811707, 1434760416, 1432186602, 1096469152, 2624751716, 1368985992, 3212505234, 3055001132, 2473674731, 2150232166, 146699872, 2837058512, 2647805246, 2096270624, 250307650, 844431077, 1246568178, 555089930, 4063302278, 3306804856, 2060007132, 1539650155, 3433967093, 2830736770, 4223922604, 3733371591, 1905078074, 268715723, 1802178127, 2026703815, 2324444230, 3440092954, 2057951711, 136534841, 3684051805, 2104244864, 1744845513, 2192314422, 2305196093, 131872073, 438869222, 674629894, 3299635811, 1106938552, 3254925718, 3192711691, 3146361283, 1755736231, 1291673623, 4261541459, 1986268199, 1315835509, 3009412613, 2973425468, 3640768416, 4224096917, 2882674484, 3355313666, 1279142813, 1160361149, 50119274, 949924603, 2933555006, 1274125673, 2472227477, 1519351166, 201587781, 1074748878, 4229158278, 603906850, 990754641, 4294456296, 345136702, 3560171052, 627635694, 4101663877, 142723961, 2378988083, 1245764179, 2973857140, 2478095233, 62555848, 1808536722, 3025895988, 3104995285, 3373929246, 4169827753, 2840358176, 81042179, 285927421, 3337938645, 1305479039, 2862535986, 1874603606, 807474687, 1660116983, 3434786736, 3554253119, 2702055524, 438987431, 2307841985, 1455140514, 2845740475, 1883605201, 1280643263, 581237717, 224756748, 1269082234, 1890630962, 4176579598, 2418094911, 521775027, 2584291463, 76563234, 4224875385, 2855407519, 2144695537, 3277115083, 3756289399, 2153175735, 3604124288, 3258293705, 2042617615, 2472190561, 252576920, 4001317443, 1212884260, 1549325556, 4088074707, 22493855, 33328745, 2960453593, 2527772030, 2591296152, 619193823, 3989256628, 3906079973, 1210839857, 1234498834, 4223523499, 973035588, 3177917377, 2556043565, 1271906994, 2006279264, 156770796, 3884106513, 831340199, 4053124734, 2982401735, 4001576003, 2516342895, 2930489120, 2028053718, 519993087, 936909979, 1071994874, 725603483, 3497336401, 3610814535, 3930657257, 3977278599, 1010148812, 580900628, 593301858, 3327728996, 328744601, 3945396574, 2505306274, 2342321917, 2815739140, 3389869102, 3085070177, 1610655666, 4093683037, 3192440806, 602451862, 3851066731, 2144890088, 950713960, 4287963561, 3286490648, 136894868, 3319128654, 3904646232, 3985523626, 4197905340, 1694102576, 501793921, 1206701048, 2833568710, 3371724344, 3052249003, 1744131785, 2083286690, 1859301448, 1371001931, 3286393557, 3401800068, 34471061, 3591009703, 2518753186, 874480531, 2566451611, 1477745000, 328163581, 244124411, 2892083124, 2298202563, 2167594460, 2538473758, 2357707143, 977661367, 1581329216, 1592884799, 3698473987, 3185681363, 2455621907, 3364832939, 1054679906, 2217747561, 4105059165, 3959399075, 3548450065, 3774469321, 3791714722, 3553057415, 2063297147, 1807493563, 3977593379, 3254904003, 2599804607, 2020243000, 1118199017, 1564055810, 3370022, 1734908882, 3623326673, 2966995191, 3642308246, 3449150232, 1502085375, 3446684038, 718560555, 1447552798, 2812607505, 3644257274, 444292967, 3362075634, 1643860215, 3089826123, 2115551495, 1254916978, 1087167284, 869638441, 2010653041, 2527916487, 1285767759, 2416012550, 3547777031, 915740087, 2729231436, 162451211, 365493721, 3877582547, 2277113986, 572868686, 1262230636, 1895163344, 628196366, 2922199147, 4037231086, 3420625536, 2410166508, 1909185220, 2702337144, 2725970107, 4261606944, 3751913945, 3050620361, 990491761, 3145229247, 3237716436, 4082857938, 390867178, 1768964419, 751005573, 2546755211, 1112835765, 820035761, 986213907, 2473306682, 1360563042, 1905677837, 3181662095, 2911801772, 1901440501, 344892035, 3006094535, 2680608443, 3732710880, 3541067859, 4055206617, 2202617299, 2080481907, 86028653, 2033998330, 1363819323, 3777887954, 399211942, 977260394, 3736523869, 1913224162, 4013933894, 1529265582, 2007809405, 1095173889, 3696356081, 4229713491, 2687125930, 2108457172, 938560412, 3425892164, 3351361513, 3939588737, 3509314163, 3847320545, 3911595459, 149317008, 3256445432, 3557227499, 1627632369, 1142527704, 527475203, 1273749217, 544269845, 1653200233, 212332584, 3154602799, 2554156023, 3164377227, 1953273019, 3124461181, 281702484, 2973367854, 2084540394, 391716868, 533992137, 3772849927, 10812354, 496132998, 3916517968, 907608417, 1716473062, 3447839240, 990843744, 3014585829, 3774531883, 3979986077, 1490012160, 1053656454, 2965511562, 3121392799, 4288672751, 402781092, 428614128, 3818398840, 810522711, 1659949872, 54897046, 3971042606, 3321161469, 1385187039, 2492529446, 3067064010, 183154593, 2655170055, 1663939522, 1573558418, 3519154304, 1154816616, 4111070745, 705578613, 1942823529, 1774191611, 630059831, 4180110313, 3706196772, 100307053, 2381605985, 1985147547, 3386256081, 468300529, 2951787591, 389561435, 4254671518, 3867720458, 3183869016, 1500247372, 2558315356, 1480087440, 55126764, 1210148925, 3681601188, 3519747474, 3340697889, 2797517767, 855268, 2128908273, 2509415773, 3803681356, 3796106933, 128933844, 69661913, 684821642, 1456666030, 3909086261, 133474552, 2814021940, 1385209203, 1521674972, 1988313066, 2379102257, 2348906564, 4158524805, 338482558, 3888007623, 1995626085, 2428026966, 1046401992, 575781181, 2301318754, 181133530, 753396344, 3655347530, 4292433521, 3945538019, 1452083430, 1405107381, 283647490, 3917176879, 3188796574, 2707263909, 1329780507, 3512292689, 2188459725, 3736113550, 1278090504, 1315319779, 1591842429, 3936306061, 703921010, 4281991091, 2117759127, 3819397001, 676858981, 1122763461, 2597188748, 503031614, 2595031841, 1860404840, 2527881539, 457668224, 3911672161, 2601854028, 691119667, 82058875];
+
+pub(super) const POW29: [&'static [u32]; 13] = [
+    &POW29_1,
+    &POW29_2,
+    &POW29_3,
+    &POW29_4,
+    &POW29_5,
+    &POW29_6,
+    &POW29_7,
+    &POW29_8,
+    &POW29_9,
+    &POW29_10,
+    &POW29_11,
+    &POW29_12,
+    &POW29_13,
+];
+
+/// Large powers (&[u32]) for base31 operations.
+const POW31_1: [u32; 1] = [31];
+const POW31_2: [u32; 1] = [961];
+const POW31_3: [u32; 1] = [923521];
+const POW31_4: [u32; 2] = [2487512833, 198];
+const POW31_5: [u32; 3] = [1353309697, 2948261936, 39433];
+const POW31_6: [u32; 5] = [2111290369, 854830039, 1377820608, 3005187674, 1555015626];
+const POW31_7: [u32; 10] = [1304393729, 558465812, 2768012290, 3935646446, 3376640041, 1419477874, 1557778152, 3873581017, 2245632988, 563001632];
+const POW31_8: [u32; 20] = [3820941313, 3840574348, 1970562388, 1279978999, 91057081, 172159608, 7026786, 3609778129, 320477644, 2720004857, 2683868502, 3872769187, 1705702550, 1250974998, 1821061582, 2142610495, 2457779444, 131107681, 1215733575, 73800524];
+const POW31_9: [u32; 40] = [3900563457, 3605508898, 1080835543, 1839856042, 1887789426, 506338258, 1664410539, 1941444729, 2303133992, 1204730127, 4228901863, 3235428013, 108090832, 4278312395, 4187964700, 878213001, 1487687387, 2089710316, 1913306896, 866021004, 281352193, 3790189294, 1071396380, 1070474072, 1560701226, 508984177, 2267895212, 3095779249, 3222665897, 3587404114, 523699303, 1215001001, 2154196787, 3884596454, 2367833007, 2975277751, 3968326605, 1164131563, 636920197, 1268116];
+const POW31_10: [u32; 80] = [1425784833, 2309179946, 605198140, 4075439659, 2712533997, 103860628, 3011372056, 1930212728, 1296157408, 1058369540, 1528293566, 1111476611, 2626896309, 2709728996, 1397738171, 1300019571, 3454944728, 681924413, 506805944, 223257902, 3164499261, 877689735, 252073363, 1368223871, 1957508588, 2561824618, 745102383, 3229593914, 1953834733, 4023459261, 2970522886, 3289050300, 1988414496, 3618191877, 2791612790, 3753666209, 551881119, 2867462426, 2431166687, 1542558833, 3082166710, 1692150099, 862968556, 1700789331, 1196859083, 1734165634, 2284249015, 3240024613, 3607341121, 3616513708, 3272709503, 3622879435, 741213114, 1560534899, 3403198491, 3230513765, 4203027176, 579111566, 2236689072, 1728386745, 3852156906, 3851502305, 3358676318, 1552411624, 2866922094, 387134890, 3075002974, 2260892662, 124842076, 496426192, 700274592, 1288973540, 2534470918, 1648355020, 2966648217, 3670674092, 2654505063, 1625485661, 1800796861, 374];
+const POW31_11: [u32; 159] = [3120005121, 488096230, 4043397809, 3846877022, 2483592266, 1741088811, 1435142880, 2050319480, 517262951, 722574780, 238070319, 786965630, 322204487, 1103090908, 2967926613, 2315724446, 2772989472, 1810548431, 1359881341, 4051147333, 1218086232, 776892200, 1943969984, 819401991, 3332468732, 1228365157, 19838017, 3010084475, 918974391, 3616871658, 3127018519, 2188858850, 3991305607, 1675249399, 1788150933, 1662898117, 1569457105, 3386262069, 3142393857, 283522619, 2220147540, 2991940678, 958689879, 4038295507, 2789663217, 2933447657, 1366791790, 1923121992, 1038666084, 79141466, 1862841584, 4172033108, 1515140411, 1459517991, 2435126659, 1263530374, 3461849730, 1023461415, 360959558, 1480477433, 4015033035, 2612764845, 411967187, 640257764, 3364343281, 742559927, 429175685, 1115349365, 1534393072, 273676385, 41832834, 1338543611, 737323479, 1609524875, 1031988474, 1156849110, 3163325674, 1359180346, 1113088160, 879320928, 1185571731, 2639531511, 2496406806, 462087665, 1734468616, 1613759369, 922076852, 1592024184, 1673328534, 3345308531, 2736181850, 4022461859, 1053087598, 722982409, 841417491, 2932897596, 2825857611, 1506576220, 3356827401, 838819962, 4246599948, 2694391874, 1631357300, 2587807358, 885057850, 254343006, 1347746364, 2524302616, 2190891935, 242348930, 991113938, 3891063097, 2249770445, 1391269286, 1741318817, 3470463227, 1941278356, 3112312335, 3611229996, 1591476171, 3905400994, 4270906928, 728748276, 29536128, 201741823, 1083723043, 871807055, 1207413132, 1311110999, 3698150249, 754440540, 2435230741, 1700095394, 2263890850, 3675382371, 2041485294, 3739417473, 697942096, 2689881429, 3435609081, 3358084069, 412824872, 2743917970, 1687371847, 1412072137, 2638121547, 1733477680, 1180409564, 3573621075, 1182797785, 4279670835, 622698019, 1631163303, 1252862013, 4187932825, 1254825595, 3715086166, 3426328017, 140189];
+const POW31_12: [u32; 318] = [3018784769, 419506709, 3233212213, 2647101854, 1477793438, 2458093334, 2288485237, 3429482278, 2831108905, 3809323989, 403137974, 3835811100, 1610459238, 4109149581, 1610747818, 1074953727, 2920186091, 2577002919, 2589919117, 462552040, 1462936280, 3094523706, 4105142664, 858835160, 2719310131, 2913242650, 3972794176, 1676912351, 4280513099, 923764361, 465224322, 2812484591, 3066396016, 1348073152, 4199723738, 1500985824, 3375336889, 4146043012, 1454194161, 851561957, 4247797608, 1024323299, 4070074584, 4209776858, 1943151726, 1029649909, 1083700918, 1639565385, 3862138132, 1112783654, 1468101321, 4135322607, 1062896025, 1603454720, 3050916297, 1596325937, 3696381945, 1554644965, 3298910421, 3289579255, 292490621, 616477315, 564799944, 1151973107, 1537218851, 1174576388, 3905729297, 465868533, 698473488, 1792091640, 2945073796, 3189415559, 2446703543, 2912460746, 637266798, 3657401194, 1510126640, 4115069262, 3648087043, 605289505, 2464500956, 467870221, 2105706646, 2130955145, 486376380, 1951498815, 4290218813, 2179473839, 1935789855, 1825772748, 172130114, 1197404015, 2603367882, 2460444193, 3307498781, 3862141976, 753261873, 615019379, 2914438021, 2627031896, 3239475496, 2496043199, 2168300320, 1171971473, 3599919440, 3109516901, 2958093187, 11899504, 2740177559, 3903901458, 884552025, 3093790134, 957145515, 4084008785, 2307781754, 3738538007, 293067613, 3597823465, 3240542144, 368882458, 1670042397, 4152571281, 309483204, 3669862414, 1884363565, 4128384557, 1387982208, 3697023611, 3698061679, 3152908271, 320634861, 3132422725, 1788486808, 4229940495, 3381901194, 4250442499, 3601486272, 1145260618, 1550198089, 34745150, 3956057056, 595514528, 3828247218, 1473795595, 2609913194, 1703863313, 3811751146, 486210934, 9348244, 591691691, 3467033910, 88755306, 3005002439, 3743182597, 2996665153, 1970416184, 3788536607, 153893617, 128047321, 632017363, 397418666, 2881420714, 2956471890, 1181119044, 3036255393, 98507404, 1035178092, 3324933040, 3782741863, 4176523726, 1631122807, 4248599254, 3528346344, 3766981847, 2039336580, 3031794437, 2305122739, 2074825435, 2112728216, 2645744926, 4103404197, 2500935439, 3610013250, 2335060409, 2358894139, 3742733646, 2429514141, 877651683, 3173403496, 2271349607, 526525851, 3426636266, 3558349301, 1762698863, 3219633537, 1000803285, 3026367708, 3237224684, 3661302038, 3560761596, 3274671807, 123055829, 2430724955, 3583392084, 1620450329, 786940026, 2666934574, 3175328535, 2721719547, 4111833181, 1260489798, 2748812635, 1759741972, 3643279594, 4178723567, 1785976326, 1775532742, 3394440427, 1092540046, 725274647, 3353843106, 1487980419, 1893843101, 720244643, 3576064213, 4284131422, 3548959637, 3093012789, 1784730937, 3554465193, 3635561711, 2923335044, 3242071688, 1728240122, 2457964547, 2309058770, 1311798242, 1796666200, 1421606769, 1003035025, 509218541, 1001007100, 2513790966, 2579349489, 2368558506, 1674638636, 1848570716, 3360991553, 1519298938, 3041316120, 563730877, 3258334470, 502273689, 18205981, 3522179972, 3882181459, 1213464180, 587602597, 3241644306, 4042784099, 1975158053, 3023488285, 4207961823, 1353678974, 1769145680, 3428501067, 2345068356, 2217643002, 1333238334, 487305453, 437806812, 87016367, 2947505658, 1900708318, 1838188938, 3294142465, 231538659, 757985396, 3106426697, 2999167873, 3665346125, 1491136468, 658022211, 2005742040, 4154854801, 2804986423, 3137674860, 971420416, 1203598082, 1094155649, 2743938545, 2028706224, 2688847041, 915909610, 238345560, 2287176763, 3035995830, 1160017862, 2848858409, 2673211775, 591232133, 1109898692, 2700262121, 4215639262, 127379574, 3675139257, 1802194813, 3124284639, 2162602875, 18064492, 3219263946, 3310803175, 2740665076, 1138589124, 640377103, 1510362163, 2473310210, 4];
+const POW31_13: [u32; 635] = [1742602241, 2712694092, 3969844521, 4030024960, 3498984537, 3608158682, 576130865, 413907429, 685334448, 2310203983, 3614129488, 2826104460, 2409640991, 4063374733, 1477292428, 2081766794, 1394595811, 3345035813, 1099378286, 2815653833, 2904983105, 1424980588, 3595308604, 940700773, 3922907263, 3759905200, 2635160994, 2709716432, 3907941784, 1665894635, 4207386969, 1733690565, 164929134, 3300318735, 354481355, 2562427821, 2160848272, 961345105, 3365044123, 1843189937, 3084862570, 3974595972, 237355324, 1936488715, 2701673480, 3942094087, 3512375909, 1422117058, 1210054132, 4128467560, 971193828, 2322652741, 1550099421, 4084627544, 2753748181, 2111537343, 1614730916, 2657905887, 569549264, 3245912140, 2344967673, 2243340516, 253999102, 2004450639, 284115510, 1273879578, 761323451, 588931017, 2330833468, 1304890665, 884856597, 1180867463, 612510327, 2307123015, 248328847, 3566610571, 1084727639, 3566188200, 2109971242, 1692532445, 516814364, 4198410336, 11582444, 2177407516, 3708307492, 1709899827, 2874710400, 1274525827, 2111164058, 4070338644, 400439673, 1356063997, 1478669924, 3784739233, 3970025643, 2667544651, 4069878409, 1030572482, 2880952372, 389293382, 982675512, 459875096, 3712204933, 2687344655, 3004405439, 284104407, 3944193068, 831810388, 1308948787, 3959581066, 2488261527, 107772095, 164213469, 1384608366, 2311715038, 2558943373, 473580057, 1704616716, 496989078, 2688908018, 1574625329, 1060021895, 1490036773, 1540921, 3096216483, 3100373184, 1537788597, 17470621, 3188476918, 2453383104, 1431325646, 195756539, 2880896207, 646593199, 90330352, 3961124530, 1827399992, 1633344461, 3741151065, 1526580449, 2019661887, 735159922, 3221729095, 2755534372, 3621298717, 966384068, 482669086, 945383312, 2441376446, 927823971, 1967343761, 2258372909, 646033921, 1652706794, 3471710200, 58292462, 3535345003, 3002082721, 213539009, 2776339201, 3562761185, 1954167026, 3302407048, 1304646401, 4213703860, 1004101238, 3169011127, 4148571839, 2564293074, 1729630728, 2766453747, 3210948511, 884630112, 3920666526, 2005012169, 3525795472, 3931451014, 6224738, 910001578, 1304686443, 151718680, 407491051, 2619604510, 3159210219, 3816730597, 880480511, 1115767705, 3002908945, 2707114743, 635594262, 1726018006, 696637100, 513482034, 3305263239, 2798416989, 1723305, 2011353818, 705861072, 2723201758, 2924166530, 1108452763, 2068774330, 1495460864, 1691603250, 456651540, 456923474, 1959681531, 857783853, 3930669182, 2383874766, 4287839069, 2976331139, 1208460834, 2885060970, 3047970969, 238351352, 3336153557, 2899307923, 2271879335, 3093104656, 3344624615, 3855037668, 1130818629, 1235935730, 1643697088, 651097950, 918462320, 3717032221, 3197438660, 4188258045, 2522845555, 3271357381, 1538710606, 677340008, 2468511212, 4254079112, 658921195, 4067520048, 116661002, 2150343726, 2817660409, 3586583391, 1482025530, 1260675908, 1452495403, 2959503405, 756029845, 2642229035, 1498028053, 3091970612, 569961004, 2329761040, 4292169792, 90222790, 190387838, 2781559307, 2917291193, 2691026458, 1075189898, 4059944629, 4114364763, 3830989952, 3351765634, 4282342604, 3939445622, 1284783665, 2376071789, 925272463, 2364509562, 3703468763, 3311558520, 2980519534, 702072550, 1131176482, 1015663272, 2170462071, 2320129449, 3328536099, 2523170352, 2233495964, 953653350, 537220430, 3258604626, 788472508, 1513210443, 2269189121, 225396670, 4042124581, 3970457239, 542819208, 1064864224, 15599949, 3681733175, 3568163747, 435612715, 515167662, 2920074478, 858295613, 2021232959, 4294514297, 199939877, 874059115, 3043261335, 724543880, 557003460, 3496395691, 3514106423, 3550568600, 279845898, 2255561333, 2695916856, 3171370168, 1096833516, 1441325713, 433034286, 2374659071, 1330891183, 4223843286, 962673246, 2140818628, 4225430131, 1684729340, 2705128107, 707784248, 509351241, 1260865699, 4171859855, 3798313893, 3744144457, 3832767151, 3214278779, 2126972581, 1322182129, 999821442, 2984750496, 3230061016, 191820816, 703926511, 578693817, 3767317383, 3819895309, 3867149923, 626736563, 3759588883, 2948954341, 899990890, 3298124329, 2807236639, 3843579196, 1175298984, 3320790919, 308595574, 1591588158, 899369493, 14799420, 2829862714, 2944200479, 3157141718, 2376984832, 3809211207, 1128878942, 1752683221, 3037718287, 2495148815, 2642325320, 2667307900, 1681086360, 2491706114, 50620460, 2496263600, 138337152, 2966611559, 3819947952, 3357831871, 3714499188, 2742600654, 891376157, 1263040894, 1397195941, 1196628561, 3169290598, 4112182048, 1817194505, 2720356475, 3592261524, 1979701283, 3382271511, 2761309276, 2534251817, 2909157238, 3884612364, 1957501749, 3335269372, 1110221348, 3582796558, 4265299726, 3328991437, 1962564627, 1576239011, 2318280151, 383073149, 3592155296, 3655169945, 1162442196, 4292171127, 2429088230, 3359427039, 4268348448, 3706225061, 723682994, 578194845, 2536702371, 383875365, 577216906, 1997248387, 856921253, 2139686297, 1837767581, 2120201901, 3189412593, 2707332447, 2109041594, 2377975350, 1903059381, 2323705884, 3506337925, 679208764, 1467729428, 569461524, 2249943848, 1871392477, 2418401166, 3339243325, 1947645141, 1716848793, 1375820726, 4087047552, 1747489454, 22815696, 3454086193, 897252209, 1671384647, 2815952662, 755326187, 2074696402, 1741175855, 3659919168, 2313570242, 1953266518, 1679709350, 767347542, 2664118553, 3559981454, 2161973795, 3514438343, 2134804417, 2712509674, 3949219881, 514783764, 2532009617, 1330811725, 3863190624, 1934885504, 700124836, 3141348565, 3774480605, 353971280, 2085103681, 3491245646, 463693460, 2098012506, 3954253967, 1400103191, 36511640, 752541941, 3738400088, 4114201656, 846741457, 1589107444, 2083233961, 1096448150, 2585105136, 3353854165, 1424813123, 2632857786, 22520950, 2989071093, 3012014911, 142167267, 2136931379, 2710847877, 1308539610, 2128524691, 2738618409, 232439464, 2971331669, 699686869, 856592908, 2619308329, 3107261014, 333379732, 3824336016, 1051187204, 3546514611, 1464263119, 2181070272, 133096427, 3615003023, 3471075976, 52815242, 3379588565, 56641150, 4047976038, 1413000684, 1648150629, 2099201989, 39240609, 3758920611, 4250815576, 387627480, 3569186946, 3965003118, 414323464, 1539237033, 1509126441, 4143406457, 2920674546, 3532744036, 2718781690, 3841783144, 1973748669, 3087881975, 1033502228, 1260936963, 3096176660, 2292436222, 2666901210, 3495175453, 2299822890, 2165980566, 1556534880, 2359613267, 1439966100, 3208895672, 3703730780, 549009779, 462732450, 1564638356, 2188371518, 2261740360, 1049543683, 3432977622, 563988795, 3063490889, 143883901, 3110230930, 3327294448, 1676983126, 1158668336, 930878540, 3916676239, 2896575052, 3894139248, 1411023284, 650666444, 413987502, 2304139707, 722081477, 3130866484, 3715828678, 3222365880, 887685607, 2283444283, 740343702, 1508259186, 1117792936, 2068700327, 1060755268, 873702885, 2332769466, 3625190651, 2375782112, 3829179462, 2260661047, 3495790441, 1914553319, 939689320, 3253990951, 1252334930, 3296139429, 3282440456, 1306898975, 2892499023, 1550191943, 838881807, 2388933249, 1552390444, 1688912152, 3124757624, 466908810, 71552052, 2417772964, 3246482, 2470839226, 2377505316, 4161279486, 3383731011, 3007865013, 4264254790, 2600609437, 1713854493, 4286450349, 3144723533, 1759591282, 4155149512, 1879878928, 1555014535, 394741672, 505005590, 556141291, 1812252180, 896817811, 395900714, 1974143062, 3863368026, 205727200, 1039736694, 62236392, 1026952601, 3391053023, 1572679856, 926803867, 3654303694, 4030898872, 20];
+
+pub(super) const POW31: [&'static [u32]; 13] = [
+    &POW31_1,
+    &POW31_2,
+    &POW31_3,
+    &POW31_4,
+    &POW31_5,
+    &POW31_6,
+    &POW31_7,
+    &POW31_8,
+    &POW31_9,
+    &POW31_10,
+    &POW31_11,
+    &POW31_12,
+    &POW31_13,
+];
+
+}}  // cfg_if
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers_64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers_64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers_64.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers_64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,328 @@
+//! Precalculated large powers for 64-bit limbs.
+
+/// Large powers (&[u64]) for base5 operations.
+const POW5_1: [u64; 1] = [5];
+const POW5_2: [u64; 1] = [25];
+const POW5_3: [u64; 1] = [625];
+const POW5_4: [u64; 1] = [390625];
+const POW5_5: [u64; 1] = [152587890625];
+const POW5_6: [u64; 2] = [3273344365508751233, 1262];
+const POW5_7: [u64; 3] = [7942358959831785217, 16807427164405733357, 1593091];
+const POW5_8: [u64; 5] = [279109966635548161, 2554917779393558781, 14124656261812188652, 11976055582626787546, 2537941837315];
+const POW5_9: [u64; 10] = [13750482914757213185, 1302999927698857842, 14936872543252795590, 2788415840139466767, 2095640732773017264, 7205570348933370714, 7348167152523113408, 9285516396840364274, 6907659600622710236, 349175];
+const POW5_10: [u64; 19] = [8643096425819600897, 6743743997439985372, 14059704609098336919, 10729359125898331411, 4933048501514368705, 12258131603170554683, 2172371001088594721, 13569903330219142946, 13809142207969578845, 16716360519037769646, 9631256923806107285, 12866941232305103710, 1397931361048440292, 7619627737732970332, 12725409486282665900, 11703051443360963910, 9947078370803086083, 13966287901448440471, 121923442132];
+const POW5_11: [u64; 38] = [17679772531488845825, 2216509366347768155, 1568689219195129479, 5511594616325588277, 1067709417009240089, 9070650952098657518, 11515285870634858015, 2539561553659505564, 17604889300961091799, 14511540856854204724, 12099083339557485471, 7115240299237943815, 313979240050606788, 10004784664717172195, 15570268847930131473, 10359715202835930803, 17685054012115162812, 13183273382855797757, 7743260039872919062, 9284593436392572926, 11105921222066415013, 18198799323400703846, 16314988383739458320, 4387527177871570570, 8476708682254672590, 4925096874831034057, 14075687868072027455, 112866656203221926, 9852830467773230418, 25755239915196746, 2201493076310172510, 8342165458688466438, 13954006576066379050, 15193819059903295636, 12565616718911389531, 3815854855847885129, 15696762163583540628, 805];
+const POW5_12: [u64; 75] = [16359721904723189761, 5323973632697650495, 17187956456762001185, 3930387638628283780, 3374723710406992273, 16884225088663222131, 10967440051041439154, 9686916182456720060, 10554548046311730194, 7390739362393647554, 6316162333127736719, 18122464886584070891, 4044404959645932768, 3801320885861987401, 12080950653257274590, 16414324262488991299, 16395687498836410113, 12173633940896186260, 10843185433142632150, 11048169832730399808, 12674828934734683716, 17370808310130582550, 10500926985433408692, 10252725158410704555, 14170108270502067523, 3698946465517688080, 989984870770509463, 10965601426733943069, 11389898658438335655, 6901098232861256586, 1921335291173932590, 7662788640922083388, 9775023833308395430, 4640401278902814207, 14532050972198413359, 8378549018693130223, 11672322628395371653, 8930704142764178555, 6275193859483102017, 15782593304269205087, 8673060659034172558, 8018354414354334043, 1824896661540749038, 11345563346725559868, 14959216444480821949, 970189517688324683, 3338835207603007873, 17684964260791738489, 1436466329061721851, 4554134986752476101, 6398757850768963907, 4709779218751158342, 10033277748582410264, 17932125878679265063, 10004750887749091440, 256584531835386932, 14396282740722731628, 3086085133731396950, 17831272085689600064, 10573926491412564693, 14888061047859191737, 4570995450261499817, 10410165022312935266, 5691078631447480790, 8632710455805418155, 790672778942823293, 16505464105756800547, 2092171438149740401, 17505030673829275878, 1291290830058928444, 14856191690683232796, 8916773426496500052, 10152003807578858265, 13104441193763861714, 649395];
+const POW5_13: [u64; 149] = [15308384451594534913, 17913664074042735335, 6115977719198531863, 5794980608663993169, 16544350702855106930, 9253787637781258566, 4977988951675168190, 9087837664087448770, 2098480401110016986, 15474332540882100712, 14042133997396540944, 1090855284423485362, 12639956485351058381, 1454115676006639319, 3180465001342538023, 14649076551958697729, 9801292446545910916, 13552201410826594004, 6101141927469189381, 1881431857880609316, 4907847477899433595, 8714572486973123228, 3514969632331374520, 11667642286891470094, 2391499697425323350, 17486585679659076043, 18267223761882105642, 2886610765822313148, 9302834862968900288, 15246507846733637044, 15924227519624562840, 9743741243284697760, 3159780987244964246, 7304816812369628428, 17584602612559717809, 4146812420657846766, 14525415362681041515, 8477630142371600195, 4380695748062263745, 12119915994367943173, 16970630866565485122, 4332724980155264503, 8079943140620527639, 1687908087554405626, 17051081099834002166, 12638146269730763230, 11883749876933445771, 4662462156371383785, 4796962238316531176, 3325504751659868927, 6469595803187862550, 5852556621152583005, 9229334792448387881, 17979733373938620709, 13951623534175792756, 17075879371091039277, 14212246479457938037, 4008999959804158260, 2414266395366403722, 3252733766253918247, 6382678985007829216, 2245927470982310841, 13790724502051307301, 13116936866733148041, 9718402891306794538, 13516274400356104875, 17859223875778049403, 4396895129099725471, 3563053650368467915, 12176845952536972668, 3492050964335269015, 2740656767075170753, 4409704077614761919, 10237775279597492710, 3314206875098230827, 16437361028114095448, 12361736225407656572, 16792510651790145480, 11449053143229929935, 18336641737580333136, 6558939822118891088, 4606255756908155300, 2360792578991605004, 160428430149144538, 11644861220729221511, 10785178451159739786, 14923560618031934681, 1902620814992781610, 14064076995338910412, 11547019064112212657, 16847481479966225734, 8331994491163145469, 11739712981738851885, 8008309968651120619, 10266969595459035264, 15175153381217702033, 12208659352573720245, 7714061140750342961, 2892831567213510541, 15453714249045017319, 71020323573871677, 15431137995750602633, 5659146884637671933, 5998809010488554503, 16552192379299157850, 1192197967194298797, 16157555793424861524, 10929371590994640255, 3194469143425738352, 6651586784672005225, 11062427140788057791, 6834443579468668318, 16421563197797455922, 6251046422506172884, 13952303462156793860, 16632486601871393224, 11313454360291325172, 5587835232504462834, 3105197524618514637, 18268568531031972989, 2397205535804309313, 59413027864729597, 11869878125348715710, 12592801707270523266, 8070632061321113656, 18403647807860650811, 267109013517069093, 6537214311028855260, 5220826919973709902, 3448740582779163661, 16822239213112884941, 5975299384311048185, 10294433804430712138, 4739856055412448774, 12057273038326387897, 13119002941950056609, 3354445304051737058, 13592813067499314594, 3890182464434078629, 17820384357466425060, 9785228118969879380, 1778431746734556271, 10075313876350055029, 13994048489400919028, 17948287074199726448, 2815088342305858722, 2676626035777198370, 1174257960026283968, 421714788677];
+const POW5_14: [u64; 298] = [11471884475673051137, 8902860357476377573, 13350296775839230505, 10609191786344608888, 7261211985859587338, 11439672689354862964, 16789708072300570627, 4607056528866348430, 3202978990421512997, 2024899620433984146, 17666950207239811774, 4233228489390288200, 9137580478688460738, 4060411066587388546, 11119949806060600124, 867715462473090103, 14382394941384869610, 4856042377419278489, 8265605599571137921, 538981667666252469, 4270263388700786523, 3281140600308898503, 4121392524544394174, 2077884106245940229, 9773041957329767574, 7550623316597646685, 8611033926449791714, 18137922955420802793, 2796546741236224013, 15477096484628446761, 9517540128113714010, 9471917970500821378, 15938570248662483124, 5228016831978462619, 15720991252586974501, 7662829825220776698, 17328310068068434348, 3371736428170309730, 3803724952191098855, 13115926536504376719, 16752571196153442257, 16540185467776259880, 3432518182450051120, 5880364967211798870, 12355748840305392783, 14196090758536469575, 7370123524686686319, 6819740424617592686, 13037938013537368753, 15029273671291927100, 3671312928327205696, 7473228676544792780, 17234079691312938123, 14164740848093544419, 13169904779481875902, 7179036968465894054, 8244653688947194445, 17179797746073799490, 5591970751047577674, 17530550506268329742, 5965746721852312330, 1604149463243472865, 7734199791463116918, 11305790396015856714, 4441196105025505137, 13046431581185664762, 124776524294606713, 1134521334706523966, 11671728093344476434, 14103440020972933148, 3966727403013869059, 9828094508409132821, 4355682486381147287, 10261407143988481234, 3800455155249557199, 12700901937937547500, 18184475466894579360, 13267691151779895412, 4714157123477697445, 10770360171308585263, 9083344917597998040, 12078649873810212155, 18218989082046199377, 4454285072780637351, 5287307245618354742, 16042289702059031730, 4131926574212754010, 217692071448455473, 3624845916216282093, 2901203491797614218, 6679177724033967080, 44561358851332790, 9094639944041587162, 13690915012276084311, 1408896670826320686, 5359130319612337580, 6148412925099835601, 5211368532286409612, 11386360825549027374, 16895182466965795071, 3392940493846427241, 438089879085393580, 4783928372776399972, 6278117363595909959, 12569481049412674733, 15648622492570893902, 1966316336235305115, 1603775390515993547, 13576113010204316709, 10821754650102840474, 18198222517222903152, 6966163076615302988, 1373932372410129684, 3285839581819684990, 30177575069719475, 16447047871247307061, 11618654126674833808, 990072222556306872, 1260682336135768017, 13862055046689532489, 15668483092844698432, 1879572630092764264, 13912027797058626108, 6231679788219816920, 13857858054844167403, 18101470072534728857, 4144579812461609229, 7048589655616599284, 9946956499532694630, 9771303850109874038, 6477823708780339765, 17526247621747041971, 13525995675852669549, 3928768291901239810, 8094153383078124544, 11214278667728965552, 11251547162596832610, 5964946855123292381, 3622548288590237903, 13469765967150053587, 17798986288523466082, 14684592818807932259, 16724077276802963921, 7119877993753121290, 1864571304902781632, 12871984921385213812, 9065447042604670298, 3987130777300360550, 6890545752116901685, 17275341711601865750, 6296474927799264658, 1257436973037243463, 13854281781965301421, 1657132483318662716, 17309399540017292849, 12808111630089217242, 1098489625264462071, 14010458905686364135, 16134414519481621220, 14288255900328821475, 3469093466388187882, 15982710881468295872, 4056765540058056052, 15945176389096104089, 8625339365793505375, 12316179968863788913, 15334123773538054321, 9536238824220581765, 16080825720106203271, 6235695225418121745, 12035192956458019349, 3235835166714703698, 5348960676912581218, 15315062772709464647, 17335089708021308662, 16855855317958414409, 2369751139431140406, 3693542588628609043, 7350405893393987577, 17402072586341663801, 7007897690013647122, 15671767872059304758, 9259490518292347915, 14836045474406130394, 4654005815464502513, 6487825998330548401, 7013356660323385022, 7136200343936679946, 15341236858676437716, 3657357368867197449, 12621075530054608378, 5603868621997066972, 7683447656788439942, 450883379216880060, 14291494350184945047, 5466258454997635048, 14206933098432772126, 4775870327277641692, 1864430798867181939, 13748978265070608793, 12250822864261576589, 12561896977498605296, 16060949594257359328, 17775189113543311529, 11835965177892927035, 4218664174878121437, 3499000902478111683, 15169853304359126294, 7076121963053575143, 832652347668916805, 1292148207755194737, 7556838978364207852, 5904021986723518500, 4610244652288570024, 4526508363195533871, 746120481022614726, 737965197247830486, 4006266184415762653, 9272188239892688050, 15346235246415709678, 11850675997347533184, 11181059668610842701, 6687857983250662774, 2908718488661492818, 4828337780126983225, 18071738646453002184, 12790187227727197880, 17602483480871623153, 12523532189621855977, 10598805712727696716, 2179787555896149376, 2242193929457337594, 14908923241136742532, 8369182018012550027, 13385381554043022324, 3332327430110633913, 16138090784046208492, 16172324607469047339, 8279089815915615244, 12872906602736235247, 10894545290539475621, 15428756545851905023, 4155747980686992922, 4074479178894544043, 66083965608603584, 13873786284662268377, 8861183628277687555, 12119497911296021430, 2154012318305274287, 15490706314503067312, 13643145488710608367, 672340241093017103, 6039493278284091973, 9679797700977436461, 18070795828318171174, 2188146431134935377, 5247392385741514952, 1852539214842869734, 12235621681634112739, 8812930319623534062, 5585597406294108629, 11312989214475901864, 1547377291787797995, 8641748937186208205, 12518148659168623694, 6611379197521520985, 18096591571068008576, 15087021227100112139, 13058454842015958418, 1473584652966833794, 4387660670140018168, 8452836916843525402, 14376083294443363955, 13998026203969090659, 611968444648172645, 990232438801273845, 18001186324715561929, 13470591857250177501, 14881554140239420091, 16696367836720124495, 6328076032778459673, 17027497695968504616, 10192245646262428833, 8282482589527318647, 4319014353374321425, 14134087271041670980, 5060230880114618599, 13179509240430058600, 3903514232614801894, 17774749744702165255, 15448635507030969726, 15983775238358480209, 14542832143965487887, 9385618098039514666, 14431419612662304843, 730863073501675978, 16750118380379734815, 9640];
+
+pub(super) const POW5: [&'static [u64]; 14] = [
+    &POW5_1,
+    &POW5_2,
+    &POW5_3,
+    &POW5_4,
+    &POW5_5,
+    &POW5_6,
+    &POW5_7,
+    &POW5_8,
+    &POW5_9,
+    &POW5_10,
+    &POW5_11,
+    &POW5_12,
+    &POW5_13,
+    &POW5_14,
+];
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+
+/// Large powers (&[u64]) for base3 operations.
+const POW3_1: [u64; 1] = [3];
+const POW3_2: [u64; 1] = [9];
+const POW3_3: [u64; 1] = [81];
+const POW3_4: [u64; 1] = [6561];
+const POW3_5: [u64; 1] = [43046721];
+const POW3_6: [u64; 1] = [1853020188851841];
+const POW3_7: [u64; 2] = [8733086111712066817, 186140372879];
+const POW3_8: [u64; 4] = [9241971931925084673, 16454059005556024164, 5253045282866540271, 1878];
+const POW3_9: [u64; 7] = [15136703003180987393, 8476343899828878673, 18361811754143825027, 14388418858783342465, 5401376488135036380, 12364567666609403030, 3527953];
+const POW3_10: [u64; 13] = [2118395047680534529, 8537117469025143052, 3872259360504933309, 10701526949532696147, 17998776526579280936, 6666182382162752224, 2298937609138591600, 10431735398056406321, 16375030035869515722, 3789847405179292381, 16253248952895454123, 5013447294207740028, 12446457099674];
+const POW3_11: [u64; 26] = [11359380750133874689, 5276606518746106582, 8074516225493162415, 44091562328298894, 3624566612640262530, 1648712055576603746, 570015793462054116, 4997922052233515184, 11461456262225743338, 3703749129909374618, 1032298853854876563, 5055703740018389007, 12165799951080916707, 7876242724076368176, 11382490680713659023, 8012668037354425323, 6455631446982530500, 11518146109761638553, 14211686304453726670, 14638327231082858575, 212706140070406144, 18114182620365251442, 16255881380360420802, 17396653870711483704, 13342545167648199825, 8397920];
+const POW3_12: [u64; 51] = [6615629770586038273, 14589289854081549156, 16033283353414803848, 4072670504909965136, 9285202060411609801, 3844375208352343783, 14457341458236460110, 11113571593891798513, 6897806051678254736, 13754726319538359186, 6705168383790534776, 18424255276769215806, 9125568036581672334, 17950439800261239652, 3360019889600789048, 8736970908230253200, 5862837180794632907, 4685996133977145346, 7012924617285143305, 6946857363647229985, 17278143000252629097, 8632720555983218073, 448178319842208351, 13359710428804700555, 13363983887301643254, 13693315286110143380, 3073162922650220325, 14844710205972612777, 10236141098283186080, 15546300905171289287, 14991733718586000242, 12916696994748984595, 1335788671178492970, 8288858105892413588, 531597803005806362, 1424346394172629150, 8721143616286912970, 14331896312442271549, 3043145014208270918, 8340447499879054696, 11359259714499294398, 8644862996062775644, 9484939289239162819, 13589880770603801564, 15411917558929121981, 4327480870720673885, 1325470906085940108, 1949446308450023420, 15707488697789413385, 7670729805623044772, 70525072474845];
+const POW3_13: [u64; 102] = [17686697579142660097, 6835527964327392632, 519141719648339438, 10915724132684181418, 10525094883897927730, 12931691278819523731, 13609994346461817211, 7792013918408689767, 12616283906737735258, 6152585453049961975, 18093218868158061242, 4597585598518975727, 4540690555621276154, 5146752950888563072, 17078008680493976306, 4940054416148051507, 13292642740797593673, 11433236470183933650, 1893271136554408208, 5395175136028342217, 3377431049116564971, 16414233592433497551, 660190863912874689, 10191500464313104710, 5296767785184324219, 7017570247774576725, 11906963227774686324, 11523256495834484144, 17718039332649552444, 18203074682319783749, 13063547705319384019, 2689214593055349782, 8872984591015716038, 13295405780899799222, 17955349892186737306, 18377333322072047388, 10009321763381733263, 10740619310679053173, 3678366978495582488, 5386006412549914107, 2939999530005680313, 864350463957430877, 7134876155463612350, 12859539885231597000, 14622204113412710377, 8487354967518133412, 16893752681799589394, 1861455355759609366, 2215078177635153677, 12328081781789258814, 13512115210914444970, 12467125683110614132, 10809819066795130489, 10302065192562501784, 6333142106738947567, 12227363843828271581, 4911642960325424181, 4922686570288394259, 2904259931365432466, 15017412742290626787, 18050457076260269306, 7789034218973547683, 10100531119715750776, 6151136088165477097, 13496448062567072853, 11179514145292123821, 6834256416281897152, 6315963086107973635, 7916218311420134351, 4058636906137698771, 612677900085674499, 740390706776619056, 15913061541915060609, 5625318012611030298, 5492469315252333142, 1787499506659871564, 13130972346797301907, 17139036276093329309, 3129806882433428008, 11801555561087648421, 1337437552933432854, 14393715939936689772, 5075982616701483039, 14146728107994341104, 2009717676181581254, 6499370409273010652, 1614287946020752558, 543465737531163540, 9981569900494582018, 14819783240964814582, 3413474580476079436, 10254490513920293241, 15716828194058191719, 4496048105227602492, 9117771791529929093, 8598172845056620230, 10788533399188821370, 6549281897122335588, 13437155476602347060, 2738314500086357436, 1315507096324862908, 269629471];
+const POW3_14: [u64; 203] = [3014151301029068801, 3368717210500941014, 16526655043858351280, 1570922329624414208, 1659387501763276584, 14746156693680335077, 12991990277270429286, 819557268048782528, 13315632618164850296, 13715274206880838717, 17320008985571678455, 5772178420050611091, 2836253575397763676, 7717380670411115663, 2099659576414294503, 15238056155431820065, 12367761437621511661, 10877305759783841876, 1225050232812614950, 4132971589311606454, 3487827946854483167, 8858594377116303592, 13014169932326731571, 6586799248091633642, 2908467343916459689, 17130644458472461229, 11990926378323331396, 7443957075454662896, 11344079546287445306, 6894950762728195350, 1686251346332844224, 6646110915587688968, 6238314137953262194, 4464909969120699941, 14286719114913530972, 2734304957036558979, 773565632958560255, 14242527207621083408, 14447328157991647975, 4816462262218287249, 14117383283175832350, 14908821434818589176, 6568674307664296350, 678284794617743431, 8334193628813726431, 9581059312036536760, 3383333089665701405, 2303925959357643449, 9136900775437373797, 11516055338615503912, 13559451120619030647, 17025355858086313952, 1910167349182142859, 16525896153568708881, 17714211194627560821, 10810197653235829756, 7452461128358501030, 17844611896374050395, 333578009178998475, 4628333967402862148, 10057732281097955560, 15569406586116356914, 4118001685045222295, 6935172110078815123, 12967793877761791179, 8817769094107007808, 1747043335436027338, 15653102610442392714, 4502857681038835401, 6487866587498327385, 18379297231463588590, 11533941842543278284, 13172688588106291155, 8469492863154015196, 6805786336069511037, 9261430062346425502, 9474322044812704055, 6999972495444113671, 7013474345268902220, 714098888039517700, 9579110838306604082, 18056640044808390108, 1403980188111742434, 17430545075496543804, 3391229225121147510, 11581960744638707540, 5557076712965167319, 14374646898589421993, 3074971570627478236, 7522848267109877585, 4851002149225660252, 1149011036220677837, 10860077460801552088, 10030117995774642746, 9800251505364265802, 12263726642788040500, 8880913180594270442, 15211874648317416291, 7160134456849478774, 11477475544166228321, 257207889078646990, 3305183774411918594, 13048234133003633760, 18097110596628986519, 12591826257500422975, 15148251536720461410, 16843770751005933355, 11253961878990923156, 593780973732575744, 10457383791702173304, 11986258352615194256, 11413384508803902693, 12753714256533469971, 18436679404309801714, 726019101611306918, 7258345777840499664, 5032958293947934815, 12227080935754030974, 13887924239651958077, 1400265616991034855, 7085864794210057777, 1240279560360509664, 14067798200534308237, 9797298435194605689, 7723185714118383600, 4745023082819817852, 8367408728769205959, 14068664393588123867, 7743596177843306725, 13881494215404370022, 5857917740184736707, 11774638389823353270, 13335039482811683472, 5448496090214748403, 8169443631504709398, 8923963461059690757, 1420236601460646338, 17175265161397714, 9419779367266532198, 13740545339430881939, 149551661811372044, 2134178529555318188, 11862173939403040776, 134962647208871982, 15812412501213249693, 15500965737260495409, 9091597338111703767, 1402601351158315376, 9678477204323131251, 7123714578778314639, 13419443329419867216, 1626139390311403400, 10670527174588355677, 15613942385335190283, 14866028981683790327, 2875412637795392250, 5545700603057473186, 3901369409833122233, 5041841700261093720, 10236452968877155790, 3361723130076326542, 14087286044445658952, 4897068441082356069, 2618207670852915413, 2604225553110898515, 14226665567951584750, 12441492392956774230, 11464430628227911604, 9999109980159956095, 7322975638809513305, 13948967581531822327, 16002355077850659557, 8999432336483894258, 8650590966026907421, 9182164374843588426, 13872899150185224091, 2685796546452147997, 14968944803847985245, 1671197773218265345, 17072901215829183054, 11825035869843291884, 7589981082857893534, 1366317217152210935, 18341163110247053099, 17449546387829746903, 11088612001571320736, 13674344207423319935, 2545851539157564305, 454005134127827820, 11490672491862242506, 17374998876632719106, 728817640684130820, 7986346026335789287, 18271071587538933317, 17636118140819937104, 18108284073799426945, 8364244323095764194, 13281114514187980951, 10491295715437014665, 1310444496377544831, 13888191830922343152, 17586897146784604748, 72700051670196435];
+const POW3_15: [u64; 406] = [2857149036689686529, 14175379900903675190, 1401520348671872501, 16234776120238177371, 2962701845019208792, 10297908473583313655, 18066235025537403509, 1985963752685589805, 15624639389973621271, 9833928866606755125, 17745402233238635630, 78130099366186161, 12083669796004842145, 15173692294343262744, 9518028755097555228, 10655057306492369587, 10897270467574297527, 11548904126095768962, 16262733627336844205, 18151767593952348763, 950464694189644815, 6291554747973611516, 412611759298967463, 5131078896100319781, 11813629186150778579, 4930929854592610956, 9762646238078359535, 14151100457737951354, 9708371858765635341, 6206831854096772214, 11595187312349610475, 6063894554553047360, 5433806591902421653, 15615131202940708890, 5805566002014644475, 4620768948367927720, 9055048231872307321, 14794281338878642100, 14491705029677010203, 7725284928432884786, 5045913831328676711, 15521729565232894446, 3262592488400695957, 5860761651758622952, 15030937622342206574, 7453984232973937363, 6285625393700329290, 2465144476302674710, 8540406565562185120, 2124606755425251207, 15813845962394172633, 2477333097123117589, 8683731013287375651, 15551597013896998911, 13605714123740057270, 14643891956139000479, 16971916378338524615, 15119653078633321114, 7493370147962291677, 2678804130241001593, 13413059027227613678, 6036771203292121206, 216244970876952160, 17611436704967980222, 3304742578256495637, 6927085775538733664, 13315658962419865452, 16461637478880332520, 9159263971826645462, 3913462873965369515, 17857254079665575825, 3797276440638589676, 9647428625542802123, 5854328892645482296, 2742441761432302421, 11225733082991098542, 4731412809753060685, 17545245222905168693, 15240998744534217754, 17088932600994765882, 10442808830797594267, 11981042725675971866, 644023621331554282, 2253594321603903465, 13252024675441680346, 1124873775965929306, 3874314155656849983, 13892797440651273602, 9163903989027282919, 5017350417091981181, 11170456011312851663, 2813559808584014328, 4116812115518818307, 13702742319649213141, 9775591519475943926, 17735958355304760612, 3093666990666573256, 8423586328399094843, 14152162489874533060, 17134035917593418065, 11958464969389092154, 18193330560469652293, 15521397355562956835, 10283106949839764045, 18334295958623800517, 14145932412602810213, 1816204165436187296, 16755091554444271862, 13461743902646297942, 17785198157821483501, 999714903368483550, 4677242625481985221, 9910022434578132564, 12025413185432583859, 16127703755272276818, 7453627110909065543, 15703566422987747137, 7272822243903333886, 1972484455033885611, 5509585683682809340, 12514075252383283443, 11015910612262455107, 8794620302298645693, 15766428415367493519, 1711834399970520693, 15301284329794636575, 15049625973964155655, 15900259345481470201, 14664694545501816077, 3248323624137027632, 16327026424974928165, 17676983136848424128, 17594845293034422036, 3598462360111237297, 6164837332473491363, 12557690121307106283, 10109939069437709652, 12800775096878587589, 2264928308272583125, 13933925261096421472, 12872763176208350745, 17787668368194830187, 8570604642865953441, 7048709692658599440, 6754336151043341637, 2767582648225916208, 17089211422130615505, 7566542657417605506, 554454622829143337, 13636006234823920274, 10978927532226055445, 13620824993125744831, 15598312988352584692, 11333363185755496030, 10691411377887685123, 9093362498010697430, 7394222032753075205, 12497667692881492128, 17276437181405535039, 1967499791420895192, 13091300736258632381, 1931999432125026959, 18101845663395832750, 10737028481523317251, 12073559789498238872, 11600927278876301021, 15394915644183372245, 43690149765302700, 14536830506341517937, 16343918510091159741, 8885672906893606987, 13181764654802828998, 10684690211700734804, 11732832770256274611, 8091692846200747000, 11734231950782980792, 11641113657779633319, 6987987564428180688, 6088231683739768666, 16987580781422859898, 16746734300109643009, 17453062775533821932, 17841203839200805944, 12973269137781883020, 6739230905854879202, 4867603677078590158, 17071942355573399551, 16746958632169604933, 8042500730691203793, 1396863806740074599, 6353513291046703412, 17389378324433898655, 15224528156400861908, 14940329842914752037, 8087738209487611514, 9396976871403877261, 14675994089300772146, 8819403867934322505, 13266609157024508919, 587689721215471106, 1703005196134536966, 2562787762183549728, 2313037854415173833, 7657340139746646222, 11564317508629152862, 5177906634388746083, 13192072273283457007, 2386777937402525559, 5375420682092016494, 9601947856602884550, 12680741746175106873, 2647294323878177901, 16035270017585634300, 12640401596289815949, 914437713487483877, 5090403726355275456, 15014595474028671514, 2867550296812809867, 2226773502982296943, 11459138565640924262, 8011532628562544869, 10500265492658359708, 15678123494779554117, 8506283525418128192, 11555992027763787680, 16095828519246415965, 1780456502835650762, 14603503648175969311, 1023585434351191123, 7484428532864560132, 18418291991478309713, 15357998610942194121, 3327605184344835340, 10435521103325521382, 1462713553537928150, 17423946492822110088, 145809024559853829, 6485054502148338297, 17099341458460775434, 965188172493604392, 5942702139314563916, 18106401177866486041, 14227718483166825836, 16035001229177166090, 15848711243740451176, 8774453998296083694, 11450427090259705369, 15573232951905096870, 6377903469683679142, 4261188984466607964, 11623123875989409090, 14415088741163804951, 1599813716942485968, 10604599897062500857, 2841830536040670623, 17828418933022515783, 6008046665831459714, 1978729563784647133, 5039099535650143903, 1599933062843895915, 737781630230469889, 11776024369682400535, 959346849988973980, 1671320449241372282, 9374282794778072195, 5383646033852945261, 4082887125286827160, 7536093557609062578, 3037527067803905260, 17427494077634156108, 12901475821374563281, 12032057534999621592, 7153754414806200017, 11521738428893480789, 16840132959828552310, 4951031368936021383, 10312972927109338281, 12434164894986795920, 16556791237464647839, 16220041076205579133, 18066959170754826181, 16064639237569846742, 1869073155250041058, 2420881339938507528, 4916480328379338711, 7578061351847790663, 13718055631926778314, 8732707385537350434, 17405133998566250365, 10371421237885974483, 6574583501129588316, 11300582933137231603, 282635628756722916, 10023070438431334382, 14272941146175213443, 16447365197670601414, 16041672552242935265, 17831407565973892034, 4182576405085205587, 11489328974408614647, 5035552335907170388, 3828974546045291137, 391913277838204438, 2817165455206460849, 11037533297049178580, 17170762779897421063, 2017484446390904666, 9021271920363221672, 11472693518105623921, 9501309554691385430, 16285283824493093188, 1703905920124801556, 11903037454242217696, 15395241027612287187, 307954930251028486, 11285734998298085507, 4846482603857718635, 2932055447754077719, 8481968243191684346, 11872001756632486481, 15833458741916767589, 5344561634374332691, 11307041361145532568, 18098034837345724832, 9473471699261927345, 12738480131881003004, 9318308383069160161, 14437880034370135329, 13965001776697565794, 17220068391430406293, 9769002565592045026, 14598113333382548931, 54463427733913003, 9653310437927051461, 18160027269831575495, 18079344490948425895, 15649431771668008954, 7638725635058075543, 360487819896943426, 18025371643700939561, 131193844645282412, 665347044270411237, 6051870096576101338, 2265594749826975374, 8499902357104734534, 11652571364819076154, 14239292171532033618, 13665821847127328442, 8018875021737294176, 4362889439394542905, 4780760689801532038, 685326272505554135, 852503507998133134, 237435172021779198, 5647410246788877101, 14902909516438526300, 11561729043595838984, 6580075114648231917, 3157148098482255540, 6292052703844876456, 4748907769001459290, 2759798991985961249, 15886889339845481809, 14517196801294293542, 15634118355276978734, 7602021282687142333, 16412875441962451500, 859131100574205952, 13679947396837903063, 18007510132633611780, 10281782328503563318, 16806051588047700661, 1764784474925535298, 5132268748786976403, 14007269090915984241, 16228556843064665646, 6786619220176084699, 8781872344617115798, 14818695140861444492, 3803689984658392692, 8867348272163989449, 4445582801996948090, 1814340225932887761, 7442302284644936579, 8934573719166517466, 16663117729942253798, 1945493944851571756, 6242849097309870753, 3003858696070588705, 5554724178452783697, 5784523079423192636, 16351163808549131589, 13851169259806597257, 10400584659272711720, 13517990180283491305, 5411389055160485541, 16458469570767121525, 13029575019242449083, 3390421090671316916, 11145730665637945625, 12769842855787723120, 856643283237865802, 3377708198364687594, 11148540603251120001, 9392475753388252485, 286516552283168];
+
+pub(super) const POW3: [&'static [u64]; 15] = [
+    &POW3_1,
+    &POW3_2,
+    &POW3_3,
+    &POW3_4,
+    &POW3_5,
+    &POW3_6,
+    &POW3_7,
+    &POW3_8,
+    &POW3_9,
+    &POW3_10,
+    &POW3_11,
+    &POW3_12,
+    &POW3_13,
+    &POW3_14,
+    &POW3_15,
+];
+
+/// Large powers (&[u64]) for base7 operations.
+const POW7_1: [u64; 1] = [7];
+const POW7_2: [u64; 1] = [49];
+const POW7_3: [u64; 1] = [2401];
+const POW7_4: [u64; 1] = [5764801];
+const POW7_5: [u64; 1] = [33232930569601];
+const POW7_6: [u64; 2] = [3475709467328330497, 59871144];
+const POW7_7: [u64; 3] = [1843124298495784449, 15437065083437528094, 3584553906430408];
+const POW7_8: [u64; 6] = [603000588348353537, 6625227153381996056, 14457317603578335302, 17567483729823316726, 11305168499310630393, 696547133562];
+const POW7_9: [u64; 12] = [582341683539466241, 935252957464965720, 7598000487062652093, 4625010431675930147, 9224048018587399532, 13680868751916767356, 8922574898880355762, 10713662064272255971, 7311846544833571521, 7849590305058879299, 10093391657513723873, 26301];
+const POW7_10: [u64; 23] = [17388776497041092609, 16457160058211406920, 2033260851521277314, 388183302058992872, 11702388862916293188, 15587415680696876522, 17031101678673454097, 13546772628478348863, 1318818236829654072, 13546125121584063508, 15808600474458000559, 12340053761285050049, 11573725793723298554, 6718505878150856626, 13954243453614827806, 16457462685960267285, 4074042241940842542, 2459465861860456148, 11372976075770768963, 12438879223211243738, 10907291956159364375, 3922778149643709348, 691771383];
+const POW7_11: [u64; 45] = [17893919801682124801, 3206805966542412074, 991339494089278143, 13206340436150790646, 18033625394386074124, 16458343404181418861, 17068682823623086914, 17404038974574216090, 962547594831857602, 3798503919189056778, 10868579965491865695, 16037596885066557690, 15650701519890368734, 5316858967346585573, 1294049556640001754, 4351899201987763235, 17272889925200789554, 11628357220856409746, 8183184337517765892, 5628381843664522578, 7035887794254973747, 14841513942105928626, 14335113033987904456, 4216971858414870684, 10046451271544515515, 13714559003201406195, 5538475528829426789, 13395992984114831599, 5775212483408605146, 476243820514366277, 7043979434395428305, 1123299295821096769, 13048743086067956097, 17408198213811270998, 14736127160480877037, 9928220036139807386, 16675345951754369649, 18412518348195034899, 6406425587547789027, 4882575999668915206, 578900299059747925, 13250083076538589099, 2094116887459461474, 1275645183894667687, 478547646631948910];
+const POW7_12: [u64; 90] = [14704542522817822721, 1908239702443586382, 611332695634661034, 16935085395232124524, 17736127977087465434, 11574241301399055267, 5823027105340961300, 17867009488740981351, 16348656808471078139, 16998423839097420228, 10609591466688569109, 9321504974414050525, 5278480101560703961, 14020203188500303776, 11864162492233692889, 17199512118478259021, 11362092576628354485, 3847370898204590091, 17126288518479724521, 10795558634415719516, 18062350854860133613, 17815499380630351463, 2397880943408320835, 11957809306317262075, 4223055476074955396, 16895069142623741217, 1458414023731884738, 14478520812823555327, 4291320715420414322, 8514090496211945321, 17901716023666967076, 14778482251275665363, 14165811673627054156, 9738219091708628549, 17670530737779529126, 18441890196349229021, 1430517926851965919, 4257604772280009255, 18025184073054564469, 9432558672249582826, 9643577683709596315, 10555481450221114804, 13124478177775831576, 11646845666206872949, 14548406571586152881, 141151896422981225, 11467171836679354650, 17545012642488291046, 14398743913477952771, 2888950879284581693, 13666904399237409328, 621695337355461794, 14166552457800910289, 10954834507641183898, 9677730810104475487, 14676264575249719435, 13008246759944130819, 2030706501610114848, 4897055351795194734, 3524240815322299211, 15993729733810538377, 8348875806346627098, 3621970447188199522, 1936527222884678993, 11992365621207994256, 8378409427045537486, 8371521441088447597, 6461957056912354693, 7577499642046353006, 17758468389980924503, 3665053575154184649, 17632504112159264165, 10287638585991044463, 13453018864877752149, 4986048915235721371, 8010577477677231093, 2566753874256716720, 13671175792596478465, 17399823534959146233, 657911218850639068, 18403822336734148495, 12555610471455063660, 14201739888607579522, 17742516903898228154, 6520371116357715524, 8544760306369341395, 1180972524889679931, 11918607129691019839, 12571893800880669715, 12414540429568840];
+const POW7_13: [u64; 180] = [12366296415387615233, 11730370143930056766, 13967732971866448579, 2925064822323435284, 2785615026663960457, 9074767406787476511, 3387713669152756978, 16330772840749905029, 5004347987740918145, 1315322498776660068, 7136573792949781095, 6596511490066652934, 15328400376800820701, 4151285918184437031, 2722109124645525931, 12584201001210098571, 4801451632388026870, 1248764704649326431, 12119364074365100011, 5640226822887893893, 2466082534073732294, 9376326909146947249, 12674214251527350139, 16419525458752860311, 13141399977808101994, 16781245260594999187, 4673558965977830587, 1543269790139155142, 655848619610515825, 4380368131434905185, 17202266790808975771, 9897556520474296144, 186158812369995444, 10839347090923799085, 12422346061322264189, 12643626675592297011, 8939459572447991756, 16206167192025569135, 10652787480640468501, 6293507708854356553, 10008288180717595541, 16701596280546434665, 2182825862847259332, 2628366503764667985, 15959170117175880303, 15836457939481202981, 11143212174727211038, 11639730631195478348, 8604656216563733850, 290257727157156575, 10867525394732332731, 1400886510665911332, 6854704422327140956, 3741927266393244853, 12592994994270249287, 439863710787067670, 16239578794168605549, 9640756285361877479, 9561104718740555478, 10986531952367003721, 5612089266456309932, 5109766922818154132, 520998779395183753, 4810560545866637631, 7274850324832478242, 17740465167031001500, 13265097944367707437, 5648511910982105361, 1926944453539713356, 12405754124125155830, 8383831105158128438, 13034264539550437049, 6918089257970591536, 8857928391173216388, 12676875348889552368, 13731113671766870607, 6771449918166076052, 8756654551140551959, 13379197087459041336, 6347547918949812401, 3387083920238887242, 14306112307048422287, 11912069810554218385, 14551104752625294311, 13417676994193582072, 14897938903565105236, 17289003445441078886, 15935491860024724266, 10923257555407950154, 5770216580172492402, 6250010055206710577, 7113183740182564188, 16387949281660169088, 17091421695475875959, 2131077906426403330, 13839116851521344304, 8864920085113370983, 6149852328935262932, 15032054729326966345, 4079272632542779879, 18150912544137753996, 492094719586834357, 17582232315280964994, 17578774863963670026, 12416216660796818289, 302631016537865551, 7277572050364799567, 18318206792198604499, 8336737834969626066, 11235435284257084219, 13892783786080704129, 7289453266695394602, 6929315969304750655, 12953596354343027301, 14472672948577913927, 15139745008459803490, 1690846238072387883, 4955216932099385961, 16619071707385308450, 9480481535671607273, 12515534283932537347, 10261619361996609982, 5697090213210413990, 16942391088215900432, 3390999434243588207, 10353114664674932485, 12517229326878383040, 9850781917386990418, 14517298494686528889, 7573739014936709067, 9491858137805457174, 8611651487447140948, 3780787470485496576, 1469333660036523473, 15295174784873008984, 12194577480964034719, 15876198610592501565, 18166331529585637952, 14741475852802803613, 12569037466157958916, 3196162541872941938, 7948233786967345628, 8512552754069301546, 15113573103827111254, 11941684798565771194, 18265093358547574369, 4518669510372598251, 6791752066809298136, 16474333814242830926, 13472661237575196439, 16203356457439450423, 9015295329483684690, 7515397403580994501, 9717515703166204916, 12803427964745774746, 9813636653104481782, 12164929818934127602, 6797386733521120119, 7357244105545916498, 6517689230155891753, 4494756087209765099, 12574450216721428114, 18229699776525499919, 16540416958523241979, 16954357825433621959, 4441764790640151967, 7692257063480708500, 14819052434666854628, 16539482058519341923, 2489420457360669726, 10401109589692597340, 6501853965608688459, 6084336442276895198, 7104159518497231396, 5906434163082579893, 6565487219660143921, 12514992069438829377, 8382345892383208722, 9989560017558404363, 8354906072397];
+const POW7_14: [u64; 360] = [16097952260272357377, 13130180796874004926, 6337999946274631917, 7806454005154593237, 3964779689212281839, 12067020790687221530, 993348543337434128, 456722304578047521, 6384489518616540919, 13656542509554516712, 7615813412761653167, 1522890313695650550, 6769281955844232350, 9000627954716615290, 17654875012081329198, 15585242463663518376, 2540047272071862908, 18010502217122882397, 2469241273316584143, 14522992147677403371, 3181323347248219209, 7412171862387734501, 15605977390940193644, 13732110206561584648, 6841310912708667139, 16772078603097906642, 3932701771162534294, 935552481945584886, 8928472931851695208, 439487408254902253, 3742108558531046361, 7467399779969413506, 6927800424520470433, 12319531680218572262, 2207523306292819613, 9058935655454630050, 8955262245124164257, 1695674628383954123, 12816266506087942372, 7642227795136877890, 5713091426437903432, 12455780974352151992, 9028911734769248426, 2629919507522055962, 6568953920878807825, 6441922329987167714, 1380860427454155323, 5162485348867390068, 18120478809550583585, 3557167691094160707, 9585556561423086347, 11140377260415831834, 17643371617081948346, 8803088719882987190, 15962382442107137458, 17063152676566552748, 10725484034242195865, 15709290609547120918, 9776802977956060171, 9641939324093396328, 8372300427360498714, 16896521492553339514, 1605503625113386766, 6596970146048364117, 5436155145821996359, 6773372136735004873, 2628016400388274989, 6462447048395462393, 15868096675813489674, 12969626573711253525, 12950483435176918975, 2262901692170033777, 7884963415598533440, 11514901661896874795, 5535814518946402213, 16351010394775660849, 4484876175662512236, 12156236651679611400, 15913616290364867544, 6253994434725726243, 1772728943040970532, 804279014012107613, 10394176623936067837, 17767737320216335381, 13651623913537429051, 2760832717800206867, 353270184060837729, 7447587540669411115, 11497513406571887865, 13223393344293563948, 2247898226096490615, 9953276799822295558, 12096075571540599291, 1817771230343237672, 18102535593989929269, 6414926188696218205, 10016339272007016725, 16879061665801594136, 10460900921895064914, 11085671488685598859, 7889552591773559932, 3021854743891978983, 4085994113907715761, 10466379589806669773, 16349849026994454109, 17352762078141175596, 601419915748930655, 6447353073228970401, 17995486874886165147, 6929880376298793509, 3669860551090646591, 3398341264769132809, 2301312788782735293, 14326873820728993112, 6519275883693387909, 5473548873407647590, 3920167345898264370, 10811801410884101002, 52970438849003295, 18128409130392095377, 10129863895205347314, 8320617748635348408, 15230404138270709575, 10425352779147164501, 8552070433977403941, 519705666637954232, 8524877583558787805, 8793834798035604499, 16167575759687524270, 547353747635705358, 2262756621184939719, 5991353929532280027, 10912415421229507949, 16483292131039576327, 9884619350958591014, 10734315355375469644, 11800424964188469136, 12058456212947390452, 7155400162305206791, 16135411518688007462, 6634167420807032090, 18063622714683533688, 2507242405996740310, 8259021275432108422, 12945670728782439874, 7172905444644909244, 15489103791052285055, 10418690523421072793, 9204769224238674854, 2878886988929159927, 14478321813784184602, 6580438489841406930, 17945679376420501907, 16001168065175441422, 10474823731535765832, 6505883723032583832, 7017424349503470247, 10427343442585095117, 7439465121266744247, 16183858348895227045, 6358193713503525814, 12702498643321358765, 7249764850445241116, 5299649406322709021, 481501828002012261, 16048956593771133686, 18238268908149352689, 2277566368866221405, 2801572749363642207, 15845862264899617200, 9806493542549254185, 13171331383548694257, 17811024629638326500, 237728575869603137, 1584918033186942575, 3458405115991025486, 14927829336143853235, 12029979567201885941, 11399400825819059492, 358387370090724492, 14249854791490390116, 14532916569974861129, 1093408639155183134, 6783598018720378728, 14819699618307406559, 6367909722180635812, 14209671311977258244, 9896579481722863617, 2097705012534014475, 17121704697625244445, 3622230343497336042, 17774622213911132212, 6645830483858889425, 15059793628035953495, 14525066567216672413, 7768417859699468843, 9442783756696131154, 10120202076259726556, 7383621149031122703, 6307316201761002780, 7381462566569701037, 12682904768029991916, 10325096036426052320, 12053931381819278360, 16852137193270511631, 17828141154092460989, 15472958372898633112, 10685946623044136176, 7058161217185270446, 15506112215314992523, 2603405286327598150, 14984285679998610515, 13308782686743905479, 13572243438993310066, 496660177568319435, 11998217866928295752, 15399372022516591533, 7172311566126579964, 4293481005014510635, 12973099906887367644, 14248415487123492423, 932891384243788852, 3467436302278130377, 1247673930042538006, 15377855697395121362, 3784510218690412199, 8104799035987075210, 12519062381270051133, 5495005024645947637, 2351932853904283156, 6703998543967833340, 3216210641055977203, 13199727672684370757, 10456834212923237043, 1800869797916367448, 9936934404567432636, 7024904587990317101, 17661047131642535339, 9058291675122015538, 667783409113178925, 5083781129445930221, 3556923738989951503, 10613572322633589647, 4350359409101468309, 1457548242871789739, 8885342167524640344, 10316845847952729828, 3477511179397303409, 16925069634451263094, 15834976524338260586, 15659523818281901996, 7434857577782550946, 12147746899654987715, 5668413592721689665, 8032830936493279200, 13617876313652185522, 5055982689745543607, 2058351167232943793, 2384018411882861673, 18393412178309349217, 3595687859588011938, 4724338838262503762, 88487996285581379, 12419469004964354847, 15029405122247879091, 10453100248404664303, 11815875067107019163, 13318783922657172641, 17063328775103766210, 15995177957727858631, 3337113625236935402, 12011245583154484308, 5612520138869104301, 14552133026880633198, 1836785609036632505, 1675725092902144711, 6557967504238413980, 18157671856133242743, 13015066162180778194, 4821635839614725011, 14901336225477334385, 18051437442300357744, 4018581868209046319, 11380431028641919395, 15494488453762803593, 2234206949114687498, 10814654735415792321, 11032514027152029919, 12840164818300226149, 12632990531852126959, 14542578197457741239, 5574572814530813269, 9039317489618929225, 6638367824881589965, 15204500812328294053, 8449286298854092036, 5629551307743247026, 14315632672578784243, 9863340608758860590, 14498396372357538980, 17230627093216409991, 2126190059759121396, 7282436405282076555, 16334215958199140859, 9821866104444108236, 14166990661167317903, 17954587786171925389, 8053187639906305959, 5818126477269297937, 16703671127253274435, 3325631217918823977, 11257142347483193312, 8493323319788741582, 6769867770236249770, 8075904957237992496, 18333240141647668885, 9489810858494556395, 1268788742819741070, 8183052026303658119, 1119184389843976056, 15756092335594419499, 7294561540061076746, 11472189890655343279, 17991578536803490058, 11257374986136473726, 15978035697189493595, 16754225317773630993, 13330871253108412337, 11006252491451403411, 7818512327252827085, 7606858841874053276, 7072722004561541599, 7738478710728317399, 9037822280667238374, 3681607021635297595, 12842201535468213346, 11539966054165267631, 10371391190118416727, 13484800967140291487, 11638839644475346673, 17502514434053797501, 16599166471406440654, 11166751072013296017, 12143045417492076966, 17258176312463112896, 16619606322400939605, 6748801852988009064, 7995536363981500580, 16541527472806327001, 5174785509933619616, 12207954298427456142, 8409687532898307371, 12212456215883038873, 9096953697076456401, 10927914225841440029, 10425878390961569497, 17598390738945121969, 2285822102408734494, 2102052483318711971, 3784107];
+
+pub(super) const POW7: [&'static [u64]; 14] = [
+    &POW7_1,
+    &POW7_2,
+    &POW7_3,
+    &POW7_4,
+    &POW7_5,
+    &POW7_6,
+    &POW7_7,
+    &POW7_8,
+    &POW7_9,
+    &POW7_10,
+    &POW7_11,
+    &POW7_12,
+    &POW7_13,
+    &POW7_14,
+];
+
+/// Large powers (&[u64]) for base11 operations.
+const POW11_1: [u64; 1] = [11];
+const POW11_2: [u64; 1] = [121];
+const POW11_3: [u64; 1] = [14641];
+const POW11_4: [u64; 1] = [214358881];
+const POW11_5: [u64; 1] = [45949729863572161];
+const POW11_6: [u64; 2] = [14844108096902645121, 114458013083425];
+const POW11_7: [u64; 4] = [8905530187360357121, 14477147077736378572, 13888007700250411872, 710186941];
+const POW11_8: [u64; 7] = [4224151863064040961, 6237037915502622116, 15440260407910408871, 16124569072210476883, 12861392671514593715, 14527596912204933308, 504365492236294942];
+const POW11_9: [u64; 14] = [14683225950600899585, 11312468005203390341, 9315594959014972904, 10842970136224308225, 1914369411386100363, 2491852204082726000, 12175660300580967766, 9414158174000630540, 12609863281556590504, 6489400440241531664, 117114288086471509, 1456781387136959649, 15696568929021680207, 13790214074759729];
+const POW11_10: [u64; 28] = [17600486957711513601, 8022606290278406200, 8640958398179583395, 17727316401753491127, 9575607270622255189, 2072190441612624931, 14325854535236213783, 497551600749624034, 17635779223843169228, 11641721939423750382, 4105266644234922105, 801313456423024184, 16053736676906551679, 11243631360283463029, 7169921231119155227, 6535002338168290033, 1778184524698444140, 12167119020684722171, 6902101552327136471, 6183212344232315579, 16617944419037185325, 10187537814409491043, 3362267959182336422, 9478890853856662177, 9803115284869262977, 16725423551793776493, 10485792092922498104, 10309136586262];
+const POW11_11: [u64; 56] = [8731580401360089089, 7641087749022849047, 7459296236447692961, 9800873921581906937, 6192826691154354975, 9444147789066284785, 14210506877018498301, 3094172356842321099, 668845366480580725, 3492266118122964796, 96529364629869745, 9893346702623899520, 6456488582816735915, 8976637586268446582, 4302897655204158962, 12526727947551740113, 17609142381680809349, 15544966799867548700, 1677652516887693103, 7438076216237633450, 8863297770664404100, 733574942719088888, 6432836854270260969, 18134376405202473969, 10804596744936031921, 17290005223842274743, 10127841390384582073, 13369091202704950404, 6045733069692757935, 5722147506200683549, 13713918444041994071, 9823962477355305112, 2537590973225324990, 17042268964188673424, 16176615291475221624, 16581342866083396318, 14707859061892150060, 14591066112765904256, 7871331706807351047, 5347059669077259657, 4619379623562433285, 3503843082012409561, 10443929285777752234, 397701103738382164, 3313093769655934608, 17836661706065908393, 1889144565928840696, 13914569287880052538, 14298154024944976168, 12924825459066648959, 948817799025216192, 8692209791762933875, 13408375962285646739, 8887158042233942949, 611198328255130303, 5761358];
+const POW11_12: [u64; 111] = [12258111188078518273, 8688564386083985456, 2156380122306077916, 17836377793484015006, 18361442090419275253, 7263790696386055570, 1670049922837400519, 5718650195652683092, 8163040196717364521, 11363341172428738431, 4064482683668480453, 11565560735215538501, 2528171839334464225, 15361436207937868827, 7465080434366412227, 7717867788307812880, 2823048072521719884, 13528041730992648969, 9430876728602908162, 3885208255168570863, 6535820119850281185, 4461599089176575727, 18041982256587994410, 7471905082286866712, 17020017326155742614, 4938075662850608137, 4035468853066340626, 13821921610284215834, 13862027701123527138, 9154509599241848282, 16850885539955883538, 12575377137436317217, 8571268533459053559, 13898318040337272130, 810664620423602705, 7969335010597002616, 4286298881463138912, 14997259924918624976, 8264946895082660957, 15789931679311731657, 1185140025365085931, 16660324801169803431, 2556207960654942928, 8388838178441726101, 17971511442791836722, 1518280446620680356, 14933763998487830416, 15420564015868786103, 15035815882331303650, 3724518200777626298, 16798103199834126210, 8974893138557648076, 730818289427918383, 8722780918440509067, 17929755918867537992, 1146683209954232014, 17785212432311993598, 16613266046652518135, 9037649691952539401, 6627873182884077622, 333349853771469713, 15362796262717486532, 13172781257678513446, 15673083917296920826, 9067497080000291947, 1713297178691202910, 17708109588198440330, 3651774645063594416, 10886905812677462691, 2482233135585461860, 12616350414084702971, 1579459710720933490, 14708964334113467430, 51472236753600047, 1907397188939632778, 276838364253098806, 18166561361752499284, 9673362683923931093, 7282286593732476230, 11482488857388653014, 110116388352099354, 11985755127714364622, 11919464636612160213, 4471064793063388034, 9010412767207345704, 16783755977228655765, 16705665948206142403, 11178584287994817796, 8461284996706700993, 12105618960209776400, 16759015816474315541, 14855883815494135571, 11403006415320021080, 17030720119736277607, 7322697049602247758, 8785621568590627019, 1275438746651414403, 2735203210542683179, 6038898933195588170, 1829254170735016380, 4959340518011265405, 12942229586997440418, 14265112482871021343, 16789129922601896684, 5932357378257598349, 7466966399014766989, 11895041829419269547, 336661255594001888, 6380615258116690617, 11483716500585653909, 33193246385947];
+const POW11_13: [u64; 222] = [3808821441094402049, 13950047456451507757, 9798258156629946174, 15394771717186026371, 8402385358364424036, 10643620587084864841, 770025935782707926, 12646401765719380359, 12902529371099697499, 4713071912651158781, 12808907975759538373, 3611787448482999847, 10792949668135085247, 9819656912719149606, 10402648732215573615, 3099634234087648418, 1303996289514071597, 17202252306428860401, 11799438143501747880, 5290182064440021858, 6787598363645614998, 15524626330776708844, 17793027940762140310, 17004880507537385137, 12841080511592520550, 17802074978586652087, 8690205948794188170, 17021225369825206887, 12214371232481703209, 1944672684319471300, 12379112297018720671, 7908417186977849250, 2987701410501237081, 2038965172598895439, 6761749950944809115, 8931536425641523590, 7739113602339379737, 10276676859270825864, 4439920731860331975, 13587872298826297188, 10580582791203023976, 3378600784962670077, 11537395749888529099, 16813363578673814635, 7891172225344211285, 9350831321289342668, 5510229781758539814, 11084856245604590009, 12529226724027785473, 2772826409583854511, 11608215440244732894, 10561403027736810526, 9440496731290372475, 11187592866459075264, 18112121354970375753, 9439832470996749136, 12469261181704230522, 14584009432264737017, 192113371429651489, 6754460669087876465, 4530800811863053914, 463470628453220004, 6297950986641494811, 125594562797689320, 11035677947788700700, 17623708510179728580, 15775324055817623665, 14674109028438731929, 1209923272414374235, 15577884694090340636, 12570728211257605898, 11561061063357213891, 4651057686655763411, 7322712693448232647, 11809200609224415423, 2420420028580938070, 17006922394396159292, 9184515882701633204, 5031231983598943171, 3111072846816492517, 13024060130177495813, 8355932088208869510, 3321002394274404753, 6300461667657000714, 17747131805136614222, 2747653135256732076, 3505709525949287103, 3538610109129548423, 5420162045976326785, 15554801802738338250, 14489399518018827597, 4850011043856499047, 14310910444184822761, 9292252647602881874, 11707256297859066238, 11303830017912707039, 9094658840273999067, 10586581944556291517, 17960495918206643218, 8670610157246630259, 8653439255149520818, 7568788909374460033, 13873931190982173941, 15819535526777069096, 15029981376872693308, 13847545477117570871, 18220433945128351138, 8622564884841603318, 10831197658512299419, 3482858466220293205, 7738391096419399681, 2388165370073725310, 4358050862883070385, 7507790034085095805, 89269209394697250, 13562217700279342344, 16454409421097177328, 16005524809376482876, 15667251180569804396, 5575611494182542501, 10430834717129143495, 11659407253092098863, 4895499822409996600, 6091211079131464965, 17808419333800129021, 9570998286801415179, 5887752729029264648, 4894808089110649255, 264445405266933451, 12074768974351470228, 5985747285239971975, 8930452312045511767, 581799560152189317, 17941120742042728911, 15817196956092701708, 2343261090808633691, 408906981660082567, 4350888852889124580, 16977906164174597996, 3989397226896384133, 11797852548640146128, 2578312619770412510, 7917095819269751495, 4230379070581724230, 13126041898733797169, 16968484606411437981, 11317889594303192129, 12648840019394002233, 3111186006688328723, 10706649976093419159, 14466617554838031936, 17470352306889372501, 18411469382383403573, 3153962946118390326, 1014317017884139082, 9067463626083157937, 9196385543164920811, 18341966026070632878, 2053546991595525844, 15511571668352276553, 12964932464667812226, 4608057668984183759, 17979015922850588491, 15888006382316848065, 6191253953762183056, 17159783485185120772, 17513047285830409019, 10417270127383690995, 18067596632167697078, 6209418964215319558, 6733592007390738336, 4568126052283103779, 11355338046799267184, 15425201093814830598, 16990348514482983138, 9671568810535511308, 13106810235011387032, 10809291324792942232, 2571942032983045376, 12245280439867659807, 16489897181110719710, 411658004810086058, 1868460854412176896, 11032950235885186844, 6344640398962141871, 760808458165149881, 3306488977670562423, 6839411434812535694, 16468028338001386174, 2112092371815785823, 12646741262445324147, 9993358993287357353, 15017076939767283590, 1499021541653222206, 12262422680303055865, 1052978976587305768, 2525637906577367832, 9375682883492818340, 2656458953615313602, 5575528468780549633, 2205334098316854237, 4036086244823022446, 15332220321466312298, 15262584590254458024, 12408741965943962, 2169913035744765570, 5194058381386770850, 18399971040889575890, 146441422052474806, 5815392231184153485, 16047228440717103626, 17392719586815490099, 14470688503267233324, 3774976851959202265, 17522274784675477951, 1352849022052684252, 12432653384097243620, 5555774420231729718, 140146492729849120, 5751821307726361580, 11491634968064100927, 59728242];
+const POW11_14: [u64; 443] = [4861448979329941505, 14234964374014750949, 12324565570828414774, 1324814589202696928, 607244302112676228, 1468893317251208529, 11822532846329079123, 1772747872098596721, 4408320304397308991, 179895444459060586, 17377293528146141760, 1714298375615180651, 13727398619163416501, 15410259826864896954, 7039628146162027211, 13698063942247679856, 9196351222540173809, 4207522375895023624, 7653694298972214729, 7081904518120937303, 18126762283091340173, 1302148257619410361, 2278020359663609313, 17275960804927763932, 17646698674846864050, 1061665203398398749, 6021343083513264083, 10292895744609000652, 13506325232783503285, 824481431162821605, 7919324098292802678, 1985884143083030766, 6027199192564773665, 5488984059843063194, 6401554277696298326, 16250265188100062086, 15461151778850686767, 2152095348062875365, 8568875091076248658, 11535118345773079746, 5457225141428596749, 18105156839686949851, 1446204699134367047, 5940200217327425024, 4723404657175721957, 11332495094309303050, 11210916865656261972, 16263615410279778249, 6583355182287363108, 3474139183894197613, 1175721547224620583, 10014270463271451313, 482451149736938829, 12654754310346753670, 12060907194253820784, 16371222874844907434, 13724874157976399003, 9122955285147480236, 2424368639689405019, 7087904929142059907, 14595747643997040906, 15968581825605881645, 17256763206331601495, 17481768017051479863, 4084534300439740145, 17098776779575199687, 8515782993518578340, 2288291991277446116, 16299830825136238124, 8561362796615308257, 11274137098972488891, 7192165600378860146, 8978728286869674427, 13923828547777691987, 5832039018973580482, 9837821197135420015, 18051373213910634026, 4637098454786810426, 6240800240028283280, 7380213381432486022, 10638615442398485648, 9542889592286395713, 533439917619070920, 15976474426279470150, 13617284272561781679, 10276288751212140441, 15218655173862339787, 6727164750656390926, 2230801314483879028, 10021252070973934913, 1612778788739111084, 7041336484812664137, 5291567855310821299, 10626676180760950806, 3659645323342341666, 1545507752301941771, 14519585472656231099, 1280387026359760607, 16199734190462799358, 8572516678011533267, 17081096972675348465, 18297685214062940363, 14723211966654587245, 8767349579514427244, 12568842691268661877, 10504581466359364874, 17983973018406970412, 328705068174436706, 2174559131771944018, 2855491391269045818, 9009166862880166991, 10878402612077551096, 17264107070611546538, 223351840959114071, 5747868541617443987, 16012440336833037029, 4274888826175210215, 5698113987508239659, 2810339290159470120, 2010651586206732346, 9076087548247923863, 17009418387669523776, 16557728273782932974, 18384489959436541655, 15752294227131384690, 6195553920678090298, 13838306873320407029, 3997543181277782696, 13632792040016317818, 10571440041344215283, 14876573291975049851, 3879865230527161572, 18236798115142797478, 13052196600916404619, 9251700438782427988, 10407452028375711369, 4538634364832492797, 8910999848840304863, 10343596653804926032, 15132844029119797390, 7864786558078627424, 4854202622679318856, 14490496116897594330, 1922939018516173744, 12791865105402661392, 4920230059241940123, 2446522703407379623, 2719058737904468525, 9999578869275587172, 4836000489857180559, 5994605752061867846, 15083412007297361974, 17908574010793699948, 8603146064853266860, 13282523391143325229, 7479701421185277336, 2826652990638591311, 9442860486471380906, 13694763927822677330, 4070864902063801545, 13509688881300716966, 3995509851884739921, 15500907961429706360, 9795626114514347062, 1571980437087492045, 13142893915917944686, 9646309683012187316, 8777629042773692026, 9881264653716081071, 8508104196538675869, 15117475129918140690, 16475891468886709943, 9503794508304165687, 14161558219184310438, 10022403343962581244, 774772164966805214, 362976409323838940, 2715006944996371750, 17694596407445297762, 1213888929410517115, 12040552348230620694, 10058036256970099697, 2256146506417247640, 18164569340587724858, 12721263982171681707, 15380531655246048023, 9194447864364357124, 1395189177546037021, 8859131669854344798, 7692997617889865194, 17678217856577248805, 5051283006520813772, 11882900795697794617, 5447764509551475534, 3261307948022048285, 7015933502359776047, 12399112476339008598, 16628161813791920281, 4466609504385759042, 11527239354824549320, 14896865012286473085, 7446357960840887736, 615295693915679010, 15420865078772261891, 15914776189073358434, 10427386017406062370, 443797358218834337, 5596975675103798631, 6338038437211252377, 13233769772475152622, 17775197412637834205, 9102894931534069061, 13353703773597231356, 944019229681291505, 8977246688627596603, 3748124351709709960, 3298771011254639, 8435566979418350674, 11851644920285863541, 16324834267757928361, 6016362057210517043, 11654330633207158652, 1370135402791183063, 14777157798210096039, 10776086879308252035, 4433322625034727973, 14836526024633985271, 4685352809016622820, 7408166577780936829, 15199466109466461354, 2211473805549433243, 10171842521951063980, 12827586232103031433, 10952407668210671654, 4933370584920750452, 7319841716061281131, 17603020551770387193, 4427023795533149004, 5760431258666948947, 2628001461433152159, 14147963620160221164, 16099616627752170074, 3327193394265296968, 5368283717218509624, 9241571475776324157, 15640746428336985715, 9487035580372452084, 17632705763587892565, 12736713781685959613, 9971589274082832845, 17168262626685135304, 414500848950060554, 5827338905593107639, 8612815215356362343, 668474300455630914, 4491005903555927409, 18378927420991026827, 10011565531712440040, 14065786654535912965, 15958324543393833014, 12112865839706180370, 1348635633866503714, 18426905119685767107, 594668133275684728, 9061562651652632498, 16967293170698280657, 7468586466608959052, 457321426013996781, 14671934119177120539, 1665947187370340545, 17062037043693347693, 1454458100651286104, 9177597526745466448, 2182055382421138739, 12758433655523518006, 11620001244104019106, 9036694130892191599, 13166526811205530424, 7969601211618561908, 10556629472960027668, 3038682221177727183, 11625506627928375388, 506754098530257881, 10840704320944236093, 14587935551799268659, 388433678147809197, 3043986931365819006, 9795384084862995819, 8687753689379869237, 10535103462454142818, 8396429594174113569, 18119088061758192698, 16481009488626485359, 12663196266720378655, 6119147888683342287, 2161357170291219501, 10311153247653876270, 14620598843548926965, 9239718912375357587, 12103480311318159322, 11635590630179821901, 6497644388597848233, 14536941038281688274, 17370698524274983270, 4054446082565130877, 12359766469096244508, 3084254287251620162, 11510691519238341312, 14048480973982759344, 3550446225178059644, 7086785931913740434, 11677224635326405715, 6131139509691824952, 3681904041476043764, 14346955711384546565, 17310238062338563531, 9260860885029083495, 16623084050272570307, 10937240502080722425, 15439315697216607631, 13475090244496674402, 18190235497085877663, 5274480102891558646, 4983822368450167335, 7000097594073865571, 2483077929630858635, 2813775331710572682, 816911581587374000, 1732149738726002827, 16039777340190112897, 139765720276307849, 17733651201482295497, 4609725426879943425, 13913572179659651504, 3059450630507556352, 14807014575446128996, 5569394288100667931, 14375498051354007605, 7807598407780865484, 569701784442343756, 51797670586037983, 9504686786967003450, 9217951525504177336, 10879341428667564507, 8843201496576441510, 6249217303036338976, 2464461876712416813, 10963802434450345807, 5156833682864126006, 5467966583136449663, 2176539270699150252, 7008785551069887799, 6632700210090622936, 18144174610076905244, 8104595025195641764, 8971441915667154511, 6011391662547105818, 3983263972883013952, 3886620564818691950, 16925909445790200563, 16003748304083263684, 1453919995355324282, 4260654273475685913, 18138606151029898826, 16699456612278458717, 7446480364777014672, 10958728156983022753, 5139828146590601075, 17653479006349068371, 7536076115681831906, 7607716607870617503, 14560876409314381480, 13158870719256372693, 12393118114934470163, 7771763481698298794, 6134690783315422671, 4024072529465038927, 13806427607287721571, 11252219171378906111, 6594350577506956860, 14743085644471785042, 2975981301153091444, 11808661777650285210, 17608508176248613454, 6115964025237033355, 17110450100769106313, 1462488821698087209, 3710454816741289037, 11109359605802440170, 9388771030799246581, 6092804038621777855, 14553243641565391062, 2571790254273754999, 13291052400737486800, 10642591906992584111, 1039612743225989315, 2516005090382757510, 5308033042682329050, 5364406318072353263, 9571296697887995083, 4342141404806216855, 13824528048124185762, 13124734456838244282, 6543442858705932039, 15653401468778309577, 1274442923177363099, 5127571593148750493, 14406107908112660827, 13330511805319483230, 10395540962184514938, 6947918551182283208, 8459432705439102169, 14124047457577169823, 8592300886547817212, 17271922302251148279, 10015402479770037483, 18049226981662995844, 14922839348994532248, 16771406244013390849, 12917722840054563317, 18368817445375692029, 16168933425046355196, 2047740251628425144, 1315137751888759163, 14138764838763486325, 825695092163721671, 3055436360940615263, 1492572876028562170, 17854804685161712323, 13963312285969121334, 1022428655137937057, 17304775861198439126, 14488691714775008885, 3559022074931400028, 9803967563486540149, 5840733631497687280, 17464660925899346648, 760781807011823055, 11138978771366153564, 4500147140213882775, 16894960700949132870, 13586419147412383825, 3567462966827507];
+
+pub(super) const POW11: [&'static [u64]; 14] = [
+    &POW11_1,
+    &POW11_2,
+    &POW11_3,
+    &POW11_4,
+    &POW11_5,
+    &POW11_6,
+    &POW11_7,
+    &POW11_8,
+    &POW11_9,
+    &POW11_10,
+    &POW11_11,
+    &POW11_12,
+    &POW11_13,
+    &POW11_14,
+];
+
+/// Large powers (&[u64]) for base13 operations.
+const POW13_1: [u64; 1] = [13];
+const POW13_2: [u64; 1] = [169];
+const POW13_3: [u64; 1] = [28561];
+const POW13_4: [u64; 1] = [815730721];
+const POW13_5: [u64; 1] = [665416609183179841];
+const POW13_6: [u64; 2] = [3919697708568696961, 24003111985919145];
+const POW13_7: [u64; 4] = [10962733054231376129, 4577472700600565796, 4329209982584479332, 31233120745124];
+const POW13_8: [u64; 8] = [7163256066462638593, 7700051585458762681, 9519551227927472482, 7477692841487206870, 584696450287827424, 4658499684880148153, 9377132942246373073, 52882385];
+const POW13_9: [u64; 15] = [5365041021046080513, 8568544766453320380, 7748416443152478440, 5769290248959972646, 10008377727041243801, 13198018498029413189, 18212266078933409250, 11009380506711076718, 5042359334083314982, 16169575357398556542, 5013820542687223037, 13258554444064024165, 10433479404760757721, 8005776949133303266, 2796546697052201];
+const POW13_10: [u64; 30] = [15836836905661728769, 5552771274265787082, 8658814385343096072, 17318436243571826118, 3795751027676562654, 5758095269786646185, 2230268814104946217, 5649141262329647785, 9634371443283913081, 8399134031292750081, 16632839205091735321, 12189472608495961105, 16123638117585320649, 13018883090882067163, 13128986057192585034, 6769301628408492628, 474275071893529293, 8353132743960307191, 9424925663763685936, 5941010392587702928, 16609754696905747741, 469146692787701129, 14215249896965005555, 3399572096990812063, 17120890880503935024, 12388356583333619404, 15914200145625827530, 16104732014018090148, 16284305993513564551, 423959556089];
+const POW13_11: [u64; 60] = [10825245909596966913, 5227565081833453221, 5437827865970514660, 2634626693930470638, 7791313698235985478, 9849032823460265468, 8279658923777232819, 2060596865702984494, 10239800468899970474, 12389871316412402834, 12015992134249231999, 15591767937777349731, 8968525305486241990, 15957056669959365974, 17622202978596432688, 2850992533279334848, 13911194238700387305, 7313624275157161214, 7248853985706563409, 6592847550342527558, 14803786781037723221, 15705891050791155715, 8133622017774493950, 3696503260788519228, 11404213207295227541, 7921238562279668647, 6561067286176262477, 12116294961236065547, 2266430190702116676, 4730219264323966605, 16311559478903934441, 15455930101545448941, 3852886984154041603, 1776228360455975018, 10515676917103608918, 769509830092784164, 169766357296013836, 9287163347439286595, 15898564984627198140, 8447546082614091560, 13343187541130294681, 13239159875550645207, 5342398021613563965, 11665491069175159155, 1225305497339060403, 13879701978218296081, 15305333355503561197, 8456975261344400641, 7180678784195069454, 5067906964941909849, 566505528766750768, 13475675598626116704, 14181860841192586270, 18312773713633166526, 10688355960935327997, 13023469697192509680, 11097116550631752656, 13159483348597556730, 15077689778296524836, 9743];
+const POW13_12: [u64; 119] = [11058438542103289857, 9247248103457281029, 17336009740870029295, 10323468375289993187, 1504781354816836272, 9554730237366408854, 8587566550324569666, 5183476223015141948, 3643122171939706098, 18400384628963318263, 3572669864495390762, 4229421147935839893, 3552241799096742830, 1854807433957978561, 14028317535707552152, 14877222599659598821, 10945729493178143222, 1448781112948823933, 7767106363490107135, 16804445247893060870, 226424419111212600, 15283830687743071085, 1487797500753650062, 10333864616775077672, 2737584982632672862, 12625267193455441790, 12281734660947652817, 17217123806808760645, 10929681892618839227, 10865969385290900850, 3332334426668184000, 4883636421309900493, 17621565163257567649, 888697704683033409, 6000007989952325470, 8694648489794675891, 6439324098338385100, 5055535558537034701, 17439774471630192755, 1890751051615471174, 8519817437827345306, 12812135280042016222, 11756388140614318382, 12847173998629383540, 3195426038228239005, 5408495899086602028, 6922648616092793742, 5190932152595381165, 13719540325198346554, 10629959409267319255, 8884268677394635427, 6247623128442836769, 3486276745613410200, 9922470857167696268, 14050590494518967213, 8995719668655130556, 14390840361596141419, 8805291080328413490, 1566519057385031214, 14936709980149037189, 7843407261302448200, 7362780728948899723, 8946431151602397981, 12379705824411818733, 10625136469958786891, 14809497030327428493, 9600038407435655136, 9837775683877496167, 8314234294629785773, 7534662661788740755, 17545591642159119367, 5386108291396711743, 10314959419729647004, 9921350920794026186, 5258567043271810200, 16619824962820676808, 13220627530497654811, 16290250367911457974, 8006465541051436115, 5091829719940545572, 10072085677397640377, 14112092657396804275, 330584062778878076, 15840181077086384365, 9433048095385237868, 17547222939187629580, 9003900423094679394, 13034539377777557986, 15200986616921766375, 5647363409336713681, 13477915035055474650, 10108372618673363661, 9646104442597003613, 15344302009281875206, 7483449034533484580, 8795188594332056720, 17885112742810008270, 6548243381935151424, 6302172644111584420, 12757561721076687245, 13247607995431226792, 2189822730261058939, 11438243578619214144, 14096253582179708483, 8235642739441819693, 17931433398519450539, 9927801953719909330, 9995825800685970424, 9124542719873359665, 17993527059507412774, 9728704891460674569, 17044025698547768405, 17484244453920345875, 6521328358485104519, 12029066764909652028, 8464592765225463263, 12597892885514076315, 14894106690171984976, 94941976];
+const POW13_13: [u64; 237] = [1203553390770798593, 1609911557065216166, 1088829841559431321, 16845364770249289016, 13845306940320367243, 11279257715767435083, 4184517647422671463, 13618233420395390883, 11087029362168150996, 12824044226510429646, 15049709674611256955, 9950066500331292447, 14590365862096941747, 8420372193425272733, 13105392963450672485, 2225554786167414869, 13130811412339158477, 14373309974282704312, 1363934382124367093, 3493249700550808246, 198113603689650440, 17724195032260904529, 15510671998166755903, 9412112796161208987, 13107146209093962052, 14325694777197506385, 17290985315933150591, 12912300155233688889, 11888988617301666335, 16824020535296757095, 6656469285892451070, 10712076583117571968, 13585126715300435862, 5505357760921272323, 932014371801169344, 17265099438162165715, 9217420426919580929, 7386758858448837773, 15881425290995742661, 8589320880104585762, 12250041853446393684, 14402642887289062137, 15186226884070560626, 13685794765897176244, 17149732232508516893, 16958080657013900036, 446281904813871080, 487180674618228103, 11297619110741084464, 6872665199954788963, 8212455334907092516, 3332955197913213157, 6913996779383831253, 9143487460784907028, 16797670345194284720, 323102373846704555, 13352688140753214724, 12806526486837460652, 18268241912985161776, 4382411597157882469, 847659914389185987, 921514402521550321, 3413578678807403563, 5299255870322462778, 16593630186495530209, 681978374293965158, 17224675749288852530, 13657040160381442415, 15934597417946057970, 5968355591754377009, 10937621785845023795, 16336645948308360494, 12405912972336456603, 10056632425406120927, 9545350830397964915, 6230724639162649640, 1723225072254664691, 3264119010427044824, 12061938998424201052, 15793623536384650589, 2770434678443391736, 8742840120100988883, 12550260951863227963, 5656722295253371501, 15088774378750634990, 10962679145980624525, 10979536132202984393, 13795001474202318651, 4448006730336918867, 38671531538996222, 6160062839598287682, 1257541840742917296, 3178541894065862841, 12893034833167956877, 1545292770228628058, 14868485339772606169, 12433131052169805902, 1047624445068450958, 12830444186848242028, 16967079682316239583, 15300022305344409644, 2748688994970373146, 14437881100213368756, 5136001432521644414, 11557874420159275359, 9951604686169636949, 9105441558159706958, 12641802768889824602, 14749264964144337284, 7817863904982045617, 3274708901909362741, 9216091375878036934, 2785095739303537655, 7946462064155218917, 9880642893921977390, 7312919982913531673, 6798900350867994681, 5200771958630779037, 5461481497323024249, 6667251605971833578, 10862966560696237413, 4981305851286696344, 18405303816635774252, 2626422208612979467, 2524010639745371494, 9424627984561097090, 9388677451104336995, 2582058352296334392, 3461496597965765778, 6903709418194893235, 14168445877626931980, 11962515729592987925, 18225813165060703921, 12244528200070559824, 17676522228037342234, 15700092181859214166, 3977481182383385443, 17776841864312704000, 14166018271826904702, 12649693585479702092, 14565403646859767953, 18322287800489296404, 10322559522303048577, 17758462006476576260, 5032958958915733924, 12927847438191977469, 5419434607677467828, 10527444260142380542, 3401503835092434125, 17614130616565316930, 4810516414309631958, 3507848254831682488, 15634605763662377822, 9388453154499759721, 18065763110862168232, 15388918126425569691, 461692384970678664, 15850564788257762644, 14111430541734206603, 4994954389344485847, 10805375757737593723, 3961054096977611587, 10318887131642571288, 5743184960545772523, 10189117180961746330, 5622362617669878188, 15746304441183604634, 14078139847955519633, 1794138234269283797, 16546868410017152004, 4720044912811418814, 11715077310973639211, 15826706810046401131, 7575219333327213432, 3565823395965375601, 12590663819287174106, 484808767868101781, 15408998376957354637, 6415573641749871077, 17152492909023801467, 7980131495021249563, 10327931235324087527, 12249230950224323531, 10416259948363286175, 17501767217562082331, 10989307086053754589, 5241272896345779004, 2465467701083299706, 10074938103029299899, 17129430888733603970, 10855614832124598988, 14919221415520823623, 15256533446239181458, 9174981353474693807, 2174936122263534850, 3154260097308379950, 10106874050564863329, 1505468923052395092, 13425512187246481099, 14284746803028228819, 8441005310956645818, 5073973329263230999, 6010673567795215036, 8524322481505644754, 13229211917795335472, 3650375234546436406, 6742299890377516527, 17241811097427073487, 13687187275544022283, 1106925317233923510, 17938270309567737480, 919882561984985194, 10318700069693997193, 15867660097971050053, 7928187184457814201, 8746125163467766185, 8766735466984942365, 4349224684163839110, 9117893002779338032, 8425226445855708951, 12570045176103670012, 14523052880893323756, 16571364823704058491, 11810450155391964648, 220457475584251241, 11466805777400920749, 7189923430699012936, 10523264242029311260, 1942629354778206703, 14287715025778465138, 17271531035582072914, 9257960542134080107, 15668680892476791439, 3220052894238631189, 11648831345971031687, 1762690671166907766, 9013978960098995];
+const POW13_14: [u64; 474] = [11001221296112041985, 13826034922266770651, 13489083541915362882, 9373283467586653811, 1574296081529153194, 8207827534493453592, 16099869660317043525, 8401454024036860842, 5202873459370842377, 6508035404547889168, 10590408588648330578, 13599124082937212823, 9434321195352883064, 10155515984415152651, 4051416326546982, 6681481629395179557, 14231271695377702163, 12307270831191947198, 14256025792262662724, 7001983270372916679, 17105157001211452178, 17527560855128134638, 14998745783366241801, 17190927521760669498, 5007035647203439458, 8853466165539928102, 16983632653169162652, 2037074113710105517, 30417155902682448, 8035056124599177390, 6042168278089742406, 15878770400820717005, 9722934369610784553, 15287047448505517637, 2820968948861209497, 9975818641012472740, 7182985748273685520, 1364562377225132628, 18296360144709817, 576848656767306379, 5955230672257124560, 7379015716094514221, 5718216123111898794, 15142142519635291591, 11106867854158898911, 16790919704601646679, 257926260294187969, 12448066541968444986, 1415233908419532352, 17902761823566127020, 2731664248199999171, 6237029798739583092, 6467722435243876522, 1299039604882059493, 398976867616281671, 7553870406036065786, 16934670912782359126, 1289086765772745842, 2613897624044659519, 12849575202457487093, 330113016788704466, 5757502493281968984, 7559306778079978960, 5542934425745706224, 1533151162646650219, 7421850702646697978, 16594798993445426776, 17897324178914914957, 9087172952624010028, 9066556304319215325, 7840945401977096023, 16922738906269128645, 4861129228358429263, 3295150432511268970, 10997859628130123416, 15343396175772034760, 1317816914573838479, 14759039390472615987, 1281922616905457063, 5162401323428780856, 9758372827512559901, 13619943009676615370, 4902989325629769882, 14949250806229852955, 2137627133258871847, 3709905021608383901, 1154230757852321644, 2959555194364826825, 2897568030266647527, 10875744904860113415, 11966155686055175906, 3702953058348919818, 2073451823964344281, 16085408681594082929, 10552977438191271711, 12514675473966984872, 15762256019488987366, 9071568391198829544, 10510779715864700534, 17587637550002829721, 15995901679724167395, 649433175885093709, 3126365131652797316, 3745803722635257275, 2740293817418522285, 2463647550353539666, 13911370545147095490, 10947209519617321806, 10026214067430552082, 3740391652626600960, 14726472218128771969, 7810795638644566032, 15550857298608943406, 3607017316420688105, 18121379695941633959, 16641977675136006855, 1049371298479392969, 6328311637329283350, 15114018247966121758, 14757563084213719233, 17935953705758344969, 13945851098450867085, 3301120041836373770, 3726731014553693929, 16919795808353174542, 15191793168421742042, 10179892033259062458, 14032663474246125256, 6962785128823785316, 5423606119058457628, 6691408130986499730, 9794856483701825466, 13304871226024279347, 6480974202663029808, 6184600061405054561, 15442528502365176705, 12005067980263272267, 5371579747120466179, 18232208518232842609, 16444904199311614000, 9190740480149943570, 5314651193942028542, 13629915964829916970, 10094255490430702491, 4315579360341753242, 7687187928622058395, 16633182809672350619, 15201840602062472548, 815169498973750913, 11465779781025816541, 13846214078933346557, 8203008060395181666, 13072818940317752720, 2094326092261982095, 1606992515386423987, 834319476160655119, 15826955984133679204, 17864292461931537762, 16315617099703841285, 10994678332850258678, 8182109064250625378, 5733101953484631105, 1701622557818523975, 8678005748388319746, 12559138384279305724, 2149920055961087342, 4679156372840331208, 4890945313952747490, 12341079351983382907, 16996522479932293853, 7167693384214142369, 64564806202024973, 13018947479033271512, 807572127061928419, 13169707104144669064, 1301780138563365402, 11171679016440668017, 10930338792860354388, 7503827134764867545, 3710148376837961313, 7346453468431038544, 17746186879842678411, 5420383338443940395, 4546493977089636385, 7541571235635047232, 5923299374354259028, 7467965462087563843, 8695020258660585006, 11830360506652846144, 8050617092956085340, 4951161648616577377, 7462209926343763823, 10469006123121960375, 6148873142691968891, 9391262262729762674, 11872107003184134291, 5508694767999789443, 18143120487909803859, 15524922245663613461, 4833182803128976775, 8244678688694015487, 5057226443534091947, 3030120199463773862, 13784827470316886596, 18238937241437302856, 13368902651824757590, 13315981508335635710, 15966818832176274537, 3085539072629787937, 9363905682672589140, 16157039694340711928, 9559531996628716787, 3150261223189782519, 8856439592903901949, 3091470400550228612, 9040155639517394379, 1371353811560573927, 12889247891890590187, 17049235564690384092, 16757584821310313034, 11758625002648909337, 7759573695080814361, 10097096795860409844, 16589854659233622964, 11934746433485305957, 12333524935205720205, 3955817633335153034, 4125327313510146580, 4568297301310197968, 18119174710384717893, 5345869971982942857, 494470270414093801, 7997948628033282961, 942666202323743512, 16437958288915398268, 1283200097456786113, 15332211832576291157, 17410164318065492694, 11928883664083256784, 9850658024400890166, 1733793683783473816, 12344212916256620557, 2819203097851441342, 7982443306230804850, 4160454682175014431, 13842251928901083007, 7808640267378970699, 13600668417738025882, 2594746220954726072, 15816048106874640762, 2987812975317503152, 12543491042227346886, 3826802535651268272, 15850960931252961241, 10017176066894286196, 6762101883533445749, 5307989341262880556, 4157978587800144642, 6777863180208783660, 17022038493314532091, 7273401959974654348, 2004648355965154788, 6047272893593882362, 1913493044036973221, 978875274625428970, 17120070580062738323, 7209978581865436701, 7221034171459879768, 8855079812911202908, 8138230977246452031, 15129746512467684403, 18239795630873686579, 14218049206967094751, 1741356195072171132, 1250348196747565897, 4844413968011903569, 3243911763561264075, 2270507046888594328, 1745972380732774692, 11611949605661118884, 16815810824338229786, 13149366465235705917, 12772769592611338268, 18127644775168346314, 11627350941001380640, 13085395823307950354, 8163261920636206817, 6668735979905409851, 8786125210795383444, 11923422846774113428, 9155009889104890040, 5305284880382256866, 14316398359199834891, 10541498030296982923, 14943515792680830022, 7917825939785758284, 15631466534941108133, 12920335454558214696, 10959813717540086952, 15729862033964173328, 13286222593245553847, 13004657081351788118, 2626602932514888710, 3065039904467636347, 12026579291253778633, 10563241431200478218, 2349397445393051973, 18038315903885496324, 14629828402248920882, 16509748883247899556, 17448613528315110931, 6572809837694703460, 18259089056305221691, 7345479003112781147, 3670992425516768002, 7394406571262240786, 1282899707141302414, 10361574807864457268, 8432084522712399019, 9712523964169320490, 3222983355808575244, 1532899133358693843, 17095626576899797785, 4716860293526059400, 6063867918555490264, 8746071046293822259, 1152651058829808534, 11648519557365373839, 15418969224994841052, 6940179054540262900, 8364720200192476037, 11673043597161346328, 8686616599861651722, 13356248813490536770, 11819966142617113834, 12603069758178319602, 1815243887937208353, 12760687437624258217, 12561294096896395018, 8012967678291210914, 8176121075751724519, 9435407884199829361, 16805827493862195416, 5129173037979284942, 7293708894884142616, 9864549789479883882, 7637483112799067924, 10579080446112035552, 9543557324069537796, 16314213310017096676, 10031098292690718712, 10164031712634739722, 3267823673232592820, 3136193050632781907, 3706101864669700413, 9460086010135946756, 10916100565297338071, 7173053772854990367, 2503009763637123653, 8217140079509149715, 2810622735802506167, 14280999559109874227, 1650648906925277119, 11045199590068177714, 10728518634165757251, 202850395640093662, 191152309499110130, 7571404669107300800, 3575303671359809366, 16004841872492895335, 2622669442037194783, 9163035080063833785, 964368337670138517, 13390118242819651871, 10448930796967671907, 17974688233878842982, 8159271893993050695, 7677697874118781395, 6794934973509989802, 2613774578300155016, 292694226148776518, 699325260027102137, 6009081017233518841, 4808972936998712736, 2623499327102215274, 14910930447682807849, 5154480565623165511, 4596781419765526739, 9164821477431395490, 12128029734657776850, 13627460724662533268, 11708733599451343812, 75964617081117142, 7751072208351631823, 1810436372569480281, 10593526490340800088, 2928831967240972121, 11430913332203388860, 3457200823898512150, 10207567760803673904, 1653252314220274777, 7888064959285737145, 4661569017137482286, 4419268922763370533, 9193738542267727654, 643779550123355219, 7526113752480014803, 17180488012839069744, 2271943469414029100, 9454167928806399491, 17263275688221850543, 3618575948507292930, 16875459308840290795, 919514450176394764, 16881770684872090106, 6500076494866963562, 8152684853826958593, 14423244243871580034, 10078630153364349209, 1657197671101659193, 16159257563350574568, 11738586755435346341, 12002324055030490736, 8776944205051025557, 16688420418636467722, 18149554999083539289, 13691303795704853731, 6963984469531699303, 8037230931167529001, 585854776801936318, 13296836435828448841, 9587336969956966916, 16672576742326658947, 1561024513249204507, 8757421682897192967, 12562341706736520009, 2676213381522479443, 16551135642207408305, 1381302543289772132, 13052332861289439793, 8931178299453276459, 17413406719003837278, 8660924170765933191, 5102370430756705633, 7670466310574234812, 4270146355458001205, 11500515934090134119, 364081632367892515, 1424227298276949770, 8173368021493932022, 4804288675503958208, 18124903500673088296, 5083514154075546120, 17409090338743953366, 14715725901254457899, 11902426688450673479, 10555493577098859529, 6930497058318651918, 16042130515736346985, 1716882303854684150, 11660820427629564676, 9737372309838229215, 13568955813836938774, 304757648521303857, 7833621986519686371, 3508169234872570781, 4668927750426144566, 6798315679163870904, 10649911868726982934, 2582989167030406133, 17973120471981440931, 15781752425946823773, 899757886429656950, 4404669808853];
+
+pub(super) const POW13: [&'static [u64]; 14] = [
+    &POW13_1,
+    &POW13_2,
+    &POW13_3,
+    &POW13_4,
+    &POW13_5,
+    &POW13_6,
+    &POW13_7,
+    &POW13_8,
+    &POW13_9,
+    &POW13_10,
+    &POW13_11,
+    &POW13_12,
+    &POW13_13,
+    &POW13_14,
+];
+
+/// Large powers (&[u64]) for base17 operations.
+const POW17_1: [u64; 1] = [17];
+const POW17_2: [u64; 1] = [289];
+const POW17_3: [u64; 1] = [83521];
+const POW17_4: [u64; 1] = [6975757441];
+const POW17_5: [u64; 2] = [11767703728247765249, 2];
+const POW17_6: [u64; 3] = [11901479856962007553, 17684280322388389617, 6];
+const POW17_7: [u64; 5] = [14949628490430014465, 4334809184308303144, 17832375909946066926, 7803766654558500058, 48];
+const POW17_8: [u64; 9] = [8009457700659775489, 5864744823687262438, 11288212946149035610, 15666403803208012848, 545151480090474179, 4471958383658311826, 6377793695101289317, 14593165042794031210, 2344];
+const POW17_9: [u64; 17] = [6230562379196764161, 3405124145050529442, 6672549857659104409, 8045576461241663187, 12485001784417160192, 11038644820189654219, 429283131511802281, 17946514039288555881, 16665292417367021928, 8217113687992683468, 9233390645811130670, 6282302448753559949, 10686294792075548010, 8286724651875629291, 705476786323852570, 5328561222396733028, 5498045];
+const POW17_10: [u64; 33] = [4227612726968393729, 4761126626777682748, 11568710771682007766, 5571113179633199579, 5851565854403606477, 10308635839098688885, 16798960391526040672, 7869857980563782065, 18423256546778402415, 14203547828869553692, 12791369416689782508, 12876291981408895064, 15307555864783909491, 9137356882703048504, 3517233437621529783, 15111927952764162774, 16961664718059510463, 14099718551820868393, 16099826150732442218, 11196000002599581151, 3989192399412465526, 3152094919306852295, 8526189504144703959, 16230267771132803500, 14683900195084541313, 6568030588913947551, 16721463581699432323, 17147904814754118545, 16686796696251874433, 2966231010345418546, 2819956962494148691, 6325931310759637711, 30228501998376];
+const POW17_11: [u64; 66] = [15846384477333766145, 17721259160332568959, 15268217993063608275, 3369257428568507113, 6849076422060632174, 1559939278665064961, 15149163351107375334, 14454902370960405567, 6797223075258887305, 1909847963587451314, 14199165546850971259, 15511683067408627876, 5805409519841271969, 7815958194823638455, 14713740033966179139, 719153356046425635, 15139191507293081965, 16203450164456674122, 4081196284567714938, 14758364217129439883, 9702794971545023221, 12711153795347319, 1201936732137814958, 3257934889304808719, 12342561217742503707, 2516924444893373492, 16911910252687000253, 17642443087981298450, 6171037733903123784, 8711207953117949856, 9491615688477157367, 6888778246783500957, 3846072893649681856, 11581388360545359451, 6615391846425574639, 8307688205333072650, 5082992663755394103, 10006915555520507839, 13748929870033738122, 13822220226590713782, 16155676614061297595, 14591432047590794740, 16180155903817834722, 1768962406949444296, 12415132256614504782, 8001327676754234197, 16938389339776157999, 13933254066233238025, 622533281476191193, 3284230806252073576, 7582164516679533000, 6954285079702638317, 2137851930352740555, 3838440653317478891, 17588564846903944152, 7450046277947452385, 17486325056255996844, 7770323824051307195, 12761289505732553996, 14760668822500286956, 864042941828465833, 7063455544966285626, 10470935038940623311, 4298754747365446251, 6129308493713104401, 49535155];
+const POW17_12: [u64; 131] = [8959163060392329217, 191675492520161846, 9861768627217535660, 15373541761327164473, 4711124327161180762, 9148574511009427361, 6256124510954776780, 16092166725978353288, 18302892885771588550, 5554041675132576311, 6701058617620120256, 17741092924367331446, 17591967636758680126, 4424715011316294039, 13880932752311819576, 7314018719979239563, 2116064787992819024, 16117403803089837852, 4655954531271169387, 6834141459358892299, 3655460684868413951, 11462338205905151735, 10077406444200357956, 13130230130748888616, 5889899626778796386, 6132699084648918276, 9726807360252753060, 5247171256046325894, 8536133978436943399, 748382039249661328, 868011800140048627, 2772320414349939948, 15362211012728597267, 3382951323352826994, 8125886995900784397, 4017158398871576676, 7893480193554175008, 5573935412896544204, 8123912607352453095, 15714075234884286912, 16469474643299192237, 9241777800732816496, 6176630977917232021, 10797511347607665837, 15022344948172738195, 14428212684778821630, 6734324888653914439, 10575506900324831475, 16553245213985120509, 1257284041236233123, 3908192413356462543, 4564527608827375259, 12151764111397135943, 458175833548946244, 4096151054727360058, 7402916187011778388, 3229234406745339345, 4132007059461908897, 9663290448559559546, 9234229907084195896, 3986539845594665168, 8583252218130488663, 16269932014543485379, 5582927709185863709, 4156224254070092169, 10228700068637145318, 15289134047528690598, 12947151334886938785, 6341666219823015281, 15251353559696302105, 11243855513904347971, 911152298063356736, 5591652336349208176, 5924560756866900721, 16140991744705182053, 125421795282426929, 1732882485300281289, 566444319590466275, 13799487113002678358, 702306079806215844, 12074151907789264562, 3318353663331306078, 12354859459090774515, 17620576393983662297, 1780495445327301352, 13281235673007693735, 4616082378180806908, 17901748227341567272, 2255419658270086281, 5124911507572099852, 11178096695446382543, 10870988045866950024, 13317277910799673260, 1643374315321976420, 9604922605134795741, 8774236625624226892, 3140444146600578725, 13538194915004718302, 6829493612567060204, 18311602663646564982, 17830822296778723208, 6865079510397734800, 11402190682638191329, 4572060998450752551, 6421143019301485022, 1918017823683976379, 3115348749764798203, 11961373941157925564, 13683530668200002252, 4550096309857206893, 749653413096125507, 7130884266445741772, 6909992711640903849, 3823563730409373012, 15296311858043646555, 2274049411665268452, 6013473541626923118, 6919079438080853997, 7448520711576428686, 17407348002788668254, 5722106574277061894, 2073438185679237707, 5960334185761856144, 15386035660141607389, 14462253340111213632, 4103115605173323406, 7271379120963975286, 4817823530239772404, 9462154710072633015, 9078581308959962399, 2453731613792164];
+const POW17_13: [u64; 262] = [3453493696249004033, 14526017207175330164, 5273243693336234366, 14341733444399718434, 11415496706593102501, 13876706249671608639, 321363226988254866, 308962417931214708, 15911336303095720984, 996824685256301228, 15677982801565030214, 6203109012714328248, 3577016848774547852, 13751276889057797017, 2249578892878439932, 11649554284292177446, 10765186448076743818, 5028446022824535899, 13333281916584181132, 10600832506166696241, 374609586480556231, 8837817030667441504, 12522209874183140446, 14887407680095266206, 7878449496481078588, 9979151851659884035, 3944321834529564998, 13033175757373656028, 17034680569138281182, 15337183806926405103, 14234796339765425125, 3659046019752366622, 12319550462837266669, 17372995233808427154, 3220981660259398548, 13600683337207885152, 1240229990393705526, 2464512451689236607, 6090545387749947476, 4759164737740380158, 13567236852469529802, 2223785365877143535, 7731405295463554874, 13327676158848262579, 9927763461166706695, 16371137271828264195, 9390760318458771698, 13825879733085872998, 6108142823395892079, 15000480047604873784, 8138808737293537674, 795303861000927288, 3431326080676545410, 4094275192551237205, 13807846055260267478, 11022809290223582560, 560783138310981946, 13540845070229582961, 5857694737960376790, 327355669609233992, 4238227645838412351, 7646313024116194751, 7285406168992098213, 3897249497123239660, 1073602066689072866, 10857882633873024923, 3362934076454294000, 5212916866602033072, 1725307266225281544, 11955500225774178853, 9633806680133782119, 9861276272964407887, 10436361308193547820, 13840240434718659608, 414167629521649992, 11345570322302018903, 5390463353510226820, 12795318804701548501, 16202145356757001200, 2812273960567726268, 655049091438802107, 17231723169691259728, 11082101123986442539, 18443629319620178059, 8309590386389515990, 1939372487602583775, 2669920229543028106, 9556943150854048846, 3800461242298202654, 11832491830257986646, 15816312406128203594, 10153636748224629883, 5594191127080816557, 10269374132501948068, 3794848301519526269, 10057158154152845822, 12748032332747561749, 10647428812306673632, 12741110773301132710, 9155522279676869496, 5313772790584689660, 7936007289057905531, 12052079759835667301, 4632728627205541802, 17383578792221334953, 10038814202371690444, 9003685037805387593, 12038898373841603014, 13499198510584174522, 12140117105448917631, 16941108449964135680, 483272408134465939, 12464071335974555547, 2020642769228549477, 2264497751077711576, 448403399328266180, 12744589264497159584, 6370660673588569542, 14314471902760634029, 15996423551881056631, 1036073191813529138, 11230341400851904256, 13774244195239257712, 17877112685551479552, 2141857429346143824, 13804636919441295933, 7714753020686541958, 5541153521060002318, 13696369674662283266, 15986267858624178941, 5770580672437871734, 5544198272223268859, 3166932195878070274, 18244824934193415238, 8263359853692574304, 9896504794358422619, 3154076072347406873, 13356341923311833639, 4311531226105996129, 15827733439051006549, 5628573781578495108, 17183082566167736388, 9020640082123933088, 10068398142802300110, 4211884241116479941, 17530527679573489043, 11376944817997087233, 9255151802627062249, 8057850084867608822, 6983268662492669940, 11504853929838981371, 15678682304000836697, 14442617427776347788, 9688392016774030261, 13586354197343885967, 12909584926447299726, 14603220715827301809, 283206376923126647, 10296102240185384275, 4944543490257020180, 7146538787918427487, 15164292249373632032, 6431532434800671082, 2449416194845629415, 4432030625828233840, 6139962560278119501, 5250431025208417075, 5548467511879587586, 10715590260985086579, 3338041801736609361, 17438055901318356005, 6853670436702292494, 16372824264222855267, 14686430409410397439, 6868381658089998765, 18292642808321975035, 7274352449373431955, 14983250044603241917, 1635779988451042236, 2678323226758805561, 351774090608032895, 6392639507683575772, 8324642828346497619, 9320673411977431015, 6260021926778537127, 6348556698199682350, 9195546093760306927, 16769138414957877603, 961827998071396233, 9156524616979475039, 15673386381176476794, 5442214397100570582, 8876830942353946570, 7311172727612586526, 8234482784752016105, 15306778849167016468, 7502009653802519812, 4712059500290642977, 14423360925915259766, 1448744954666221572, 6078860174888560856, 2720672009072674462, 10318145048288136827, 18113229674157472565, 6404256905911555919, 9257257400021527557, 17686983671329440628, 10106377461913198073, 7618967566971511927, 3760397855961663847, 16813439320983284451, 11493293337594424887, 13179725129734599832, 13849366199944841585, 15065993544969198538, 3120683522238678144, 13763881560037094390, 2829296345720252421, 10712566716559778109, 9875922995273184600, 17632913709150245841, 1202466900984995006, 8056344660482507190, 3674707261944432957, 17295864791525018378, 14560273084621476982, 13048445087642742990, 16218257899308673711, 5655471326288357633, 7328683466588010193, 13941334933370497582, 552563626146860996, 12709870039432658426, 1239512640748675355, 17778787651186157106, 5866197565252347000, 6122417430865487137, 15964656896633902952, 7128470856815954433, 1848204601345607694, 4778259156713161407, 11116574780375752896, 9849797082728023937, 5763971865884449624, 4801386319788717349, 9057809257185363799, 13940990906848311768, 6808284956768501841, 12321634604151815934, 16051364341293277744, 6531003425874712870, 12157585571810326251, 4608359961445944066, 17636826458037430263, 13336478188061285051, 12567967923923968803, 18226023352920088899, 10910669443286149977, 8614888343058296948, 5237316467097514822, 18201092146435758479, 326388158715];
+
+pub(super) const POW17: [&'static [u64]; 13] = [
+    &POW17_1,
+    &POW17_2,
+    &POW17_3,
+    &POW17_4,
+    &POW17_5,
+    &POW17_6,
+    &POW17_7,
+    &POW17_8,
+    &POW17_9,
+    &POW17_10,
+    &POW17_11,
+    &POW17_12,
+    &POW17_13,
+];
+
+/// Large powers (&[u64]) for base19 operations.
+const POW19_1: [u64; 1] = [19];
+const POW19_2: [u64; 1] = [361];
+const POW19_3: [u64; 1] = [130321];
+const POW19_4: [u64; 1] = [16983563041];
+const POW19_5: [u64; 2] = [11740252461977893441, 15];
+const POW19_6: [u64; 3] = [9107004542504076417, 9191406976808105505, 244];
+const POW19_7: [u64; 5] = [4093619427583084801, 13957234897430346681, 1664550439794844065, 7427571119310257990, 59779];
+const POW19_8: [u64; 9] = [817529151526638081, 11061274887526630745, 13854936344412371742, 2590959186039059915, 15775445760697030947, 16331670318820695493, 2071048169989844021, 2278881448906328646, 3573576981];
+const POW19_9: [u64; 17] = [18416236736923247617, 2843296379787837318, 6729620708251823400, 12798876267615021754, 2660717132428076544, 10628885389055499043, 11044503519330130687, 7985224598569237787, 1457616077719484039, 4253722459635196846, 15778909568102640, 9133037468603004244, 10607875013481456916, 10405573357077323564, 16201176834369868626, 15603744466688166633, 12770452440016022403];
+const POW19_10: [u64; 34] = [5633069569090144257, 15290206512922886739, 9707218376940875875, 1709039808364038994, 14035865001343459164, 14752003658582921822, 5082969893951651856, 16272852641206412796, 730258252848516821, 5788390706397880364, 7242425681721975223, 6952174348889624452, 6454810008803646456, 13619454667360554822, 658364721192818459, 13614738124954350725, 7590796877500647051, 15054213496588806398, 18128202672247203937, 1539858474300290951, 6852435336274526825, 13905822336907188274, 13057368655456895800, 4908899325321147633, 701112620434091845, 13513741133915280885, 4125718765320579123, 1751062884599762549, 14570551700183118526, 12097441747169335093, 13483771739387388768, 657201670406363667, 14630950795039046978, 8840826048816954163];
+const POW19_11: [u64; 68] = [3868274050427817985, 9609965785064554795, 6362446737853125643, 6140304471677215738, 5944960630607158193, 14401685563426760224, 4560905396542113511, 2548913289596743873, 2195836196340464609, 584474905622497817, 9585394224313248505, 11836011876247902363, 15213425438825380920, 3815573032503586985, 9803347371716257639, 9461035088993310619, 5300156522097191451, 5918635114962373973, 12218486070363149403, 6449965452583488968, 15408535376151636739, 12466181625097255803, 10825828646380741420, 4121435683046602366, 2741973219018491560, 10715518326862115396, 15231389696256960893, 8350402888314404759, 11938803783207849103, 7726173741642165137, 9772085543297372800, 17846120431012455121, 15969961948968637780, 3682485160058388355, 10414744953778694019, 11287979426725105581, 301389775852099638, 8153105316773946755, 13425390638242950873, 6732727068684316942, 6570701204518578902, 1033209613870478974, 12613463344053582811, 9498960377609318279, 9420473608029820334, 8904730387087749961, 15951318581146735401, 5998702251292236994, 14539934067862285112, 9259413545972995298, 15565615665290070497, 11891825817077140304, 5906020157881929016, 2164104905828351276, 356616233133185022, 17409004541213955531, 5307453371472689621, 15573363977388344584, 4191162759449342083, 11493628618944877076, 17119550843961342139, 4803917594058321191, 8997719434483579480, 13271118517769149072, 17284093494109674951, 9909172166325359010, 2022791723112558206, 4237073215366767747];
+const POW19_12: [u64; 136] = [1960352136792973313, 12915306719042846755, 9549721850741165947, 1794818986843879764, 10215019418910247731, 4426669725966792242, 5383828992808606577, 2001777283720954158, 15250541989612595041, 15876462925156345934, 4444313350329650360, 7926624381155763340, 14296416638539564181, 404793363532558309, 1200481957272550884, 15907747927139955519, 14671662520317250615, 1507208032879759849, 6851799916100325063, 8565727275049804590, 4689600023823228041, 756029801721980048, 15329091841300896412, 10566542626694407745, 13533481494481050317, 12874804700045844122, 1991448365425740129, 17353422221748742514, 13313092773583902835, 11497473115430563823, 13702285198855437096, 247010935149247943, 12549987517324888135, 17375207470734806265, 15821763063034448617, 12536204144939836520, 2357214310561288419, 647449256512126995, 3325003721186089419, 17452175399978474856, 5524709823518690895, 10175805100915607438, 12164264439256393019, 1182031409207463077, 11482720052668503858, 5809954311598707966, 1458642029465885496, 6652359116980107346, 17309444824431055511, 12050041769952339412, 16720975861473443227, 957554924186800091, 859228806681068266, 10225722239085408727, 10959642869928201712, 1447446427562697235, 16607278679201454416, 17474996716956937081, 6539898828930260607, 8647993941424130124, 11076258879161498058, 510342348592251553, 16269428316411042956, 8555392314223380320, 11535418644057428613, 12051908495099828664, 2776204980897946502, 13126542370903926866, 15738254011086029526, 18379785119021048064, 11739425220439312073, 2854925554475372758, 17669770314744446061, 1437039477200178015, 18392564141500484039, 11145666968277950017, 8796226633411283692, 16023130302112197966, 10686203817595327958, 7557808848364814361, 14885152611388665789, 9900024034053821768, 1824284327392229733, 4209142342116784665, 13654828572915005029, 15907904975061311313, 8737388517806224363, 11363958266183929021, 10498302627208387178, 2754551711826034827, 2124138861016386537, 4335915466825829320, 18352003110361531619, 5269970246625732076, 12023298798400671021, 18385236477689900799, 8722836570358853256, 11267513616534803384, 6679741229755568887, 503544455235210957, 2391128621808331307, 3448315061963389445, 17136462553840291457, 1740673100858724456, 4392582926876629883, 12394647519023928247, 13865729469863724620, 416651680067900905, 10330898263527971675, 10645324120294157721, 6793220771642939284, 11760621930141429944, 5546468040327333541, 5022544873554114077, 16574061157558710524, 15088079029515873596, 2472930629014111443, 13728522472745411853, 814942555029735474, 9921434599477829181, 16710970458645597244, 9705337344771396803, 12085441819327374209, 16935579946984688668, 14477999081276262966, 9663727961641594069, 18361964884341760000, 2155295036902588563, 1243782721433810458, 9716419136897822080, 15251463038903931903, 14357519492630616122, 1719450790954065508, 15226663363792079469, 17581785284757192445, 973222665237977690];
+const POW19_13: [u64; 272] = [10087636017330929665, 117629036420060348, 2257288031963526354, 2697080650104114613, 7317222843606800402, 17233645136066997926, 15215182557830513151, 4409679207039632416, 5551303152772086392, 10445654504756146421, 15631589513374389381, 16740210980841856961, 12206455894870582408, 10514915510066191703, 9798591746919096135, 9113014456766034048, 1915311464989266308, 5175862425342707440, 1127360680493692391, 10057398955950352231, 6891411935195458871, 12832839332288736446, 17524506411926026100, 14080098086345178452, 3038109464521314257, 10013456124587865885, 13142012752886403448, 4060193906554278791, 11170398590472031536, 9410248415261768441, 3755575703495444750, 1087894592984391669, 4751912188462049770, 4632624366515210386, 4457129870110852870, 17868371918426695046, 15491749089632868398, 3903129746649350010, 11730329157482703963, 13362676418965584486, 6226315336624364369, 12940628154440446020, 5995730625702226605, 17080500880567388476, 17034166135852711986, 12615388967880237964, 16607446377225295242, 18120411465172808420, 15787446299618211950, 9620043234196185226, 9126458288620594261, 1060614255342882962, 9239977131371698978, 12617828668535245979, 11181865063178680417, 15582511285421893496, 5987843678629960553, 17386244475857748072, 9888528612616582462, 3595464981086127320, 9367439919957030621, 8550549043264059628, 18085192502605262261, 15407796931651607761, 298328856447100096, 17421750770842790234, 7872501740568656664, 10448096615740815737, 14188815967734612068, 16693009861392493023, 17789600806338082050, 8336869697002343684, 2654789055729331141, 2555141400888163156, 16517047579880288931, 13273651777149305664, 4389952680784057449, 12975614287925853036, 240304697575882478, 6279305865397923522, 583873442935862603, 14813213709621671969, 7518402263083839071, 7699243630994338007, 776675925129320514, 3161721386993647464, 17252271088371083361, 9042895028327730598, 17863118534771035424, 2610310289260073738, 3068384401569065116, 18117743184408431768, 10425084636492659263, 3202757335665379157, 1876980547904382981, 4461954182467642278, 7532602544065039437, 17563076800501299785, 16143257408892335352, 6295024592838238576, 10008317046802168803, 14724124565313108034, 17299868711699727533, 4895465631912272518, 17770579402527327428, 2830029028298029644, 10615879134485394366, 987571403500865241, 9762544400969694173, 16653514993868016982, 1624757165807484573, 204841906801488337, 15777934803209092178, 15414314932377081282, 3650194213562170847, 11376615561640372874, 4557464199802833195, 3324722857207389612, 10111951260843269854, 9569735001807245738, 3059295715511503958, 17685235258966059049, 10517342237401591825, 354103831077768891, 10947529916789799264, 9338838995601614704, 11063908090907358752, 5723362756156006336, 14617726084547208238, 7886038541673275570, 13563265626626102222, 10034675999158421059, 14492040540975587359, 4398047127547358009, 14009874952125454284, 16164064201877844513, 12793855159126477819, 7950190962625024443, 13134601873605010989, 1026250608253301715, 2324027021264506877, 3119872640450254566, 16891471480735182549, 925759926631512499, 11506481750981778838, 17165776305519574102, 6814319562472641991, 13079239135144701609, 13141241223890729352, 5513306421473738820, 3582378349717660269, 5730906620900438167, 5394537897260238331, 16297735367783243747, 18080087427118476356, 17599083483868974872, 15129459250026816827, 17475111262689115571, 13344954397330229420, 8420637573042348903, 6046669001445359623, 16319645399226821858, 7074786781366394509, 15634023809706170499, 4898837957007600689, 15844744975808700817, 390847525575164812, 18085692917222692170, 3214633710999277789, 5716739820665318296, 63348494580365313, 3020400304882660879, 607738189972524142, 3443940450944203675, 15881503064634772098, 5552098941850988078, 9290710216213469310, 296915641757819365, 7070434908109555948, 1790837242415017211, 14625333403779272734, 725994173179639547, 14482331486641754517, 9528949187291341636, 18024708427413949800, 17288887229748136390, 8899435903106243746, 17988248052919925310, 6947402444577155041, 6102401349327815535, 918032569817073273, 14091169229233872799, 11678332896348850445, 16667100324871710602, 18115288876096386167, 13321458589949243965, 1376780814704062680, 11226929164225688342, 1125421141839018337, 12521336644420774669, 3682001341451127051, 15900803215858589266, 1303755909781032328, 12097295241808717981, 13453712991233606943, 7026470544640004522, 10100797219731824718, 975024424540019315, 5056532385317840595, 17368627541712270955, 16035680985794411722, 5191685044041583197, 16235840560737586136, 2515620382857515504, 12335718154665377412, 9544737571567727217, 4957028513530967975, 15302002767586093347, 9620354081560709444, 3374303816262012102, 17037564459266931463, 17870173137731539879, 16515953066203089454, 15562674195074515656, 8935015972508533182, 8875739945546909864, 7333409272073094393, 6788020331206760892, 11319443782736110523, 4138122615952700192, 18070206751546527386, 2940188139423456884, 11736344620252426560, 3955689805771896586, 12904996292254923461, 14498489684711778472, 7465801477785039214, 476293544341988621, 15863251123627035814, 13619655021727337536, 17848938041797888676, 3547454720950500944, 4020413785537927524, 13936795933949041379, 5075641280008027370, 15618965771410566540, 4101472574574017389, 9212270156760100154, 8555337216799006376, 9145279087076965275, 1199695991452739777, 2713922159954688000, 10606067813488973233, 10972936715516040283, 6899706460023528980, 17491134457648128203, 10151760599490889167, 5374984912989270420, 13366347060282661666, 14999762991372500216, 663520553837103658, 7911434487847740217, 1335775454177731075, 6970149221482062030, 13820800718039914087, 9335839211241611714, 17931193805554364485, 6936941694454344305, 3154923838389543411, 3660932139853271008, 10616240878179739562, 51345774210789654];
+
+pub(super) const POW19: [&'static [u64]; 13] = [
+    &POW19_1,
+    &POW19_2,
+    &POW19_3,
+    &POW19_4,
+    &POW19_5,
+    &POW19_6,
+    &POW19_7,
+    &POW19_8,
+    &POW19_9,
+    &POW19_10,
+    &POW19_11,
+    &POW19_12,
+    &POW19_13,
+];
+
+/// Large powers (&[u64]) for base23 operations.
+const POW23_1: [u64; 1] = [23];
+const POW23_2: [u64; 1] = [529];
+const POW23_3: [u64; 1] = [279841];
+const POW23_4: [u64; 1] = [78310985281];
+const POW23_5: [u64; 2] = [8291383209427512449, 332];
+const POW23_6: [u64; 3] = [10963214168556935425, 12075501357860292979, 110522];
+const POW23_7: [u64; 5] = [6169747395525227009, 18278596701859697445, 10143526335361400012, 18052964393545421928, 12215257182];
+const POW23_8: [u64; 10] = [2314350813275137, 2115025458154065526, 13012907653031611278, 3246851852016756117, 11806541200520375937, 9084306458261185492, 12980781886615526130, 7070004871468253888, 1638555456635168298, 8];
+const POW23_9: [u64; 19] = [13383179381829584897, 4986775222005391822, 16749980212696255657, 4061598081123432621, 768049018947466739, 6592967522174005057, 8903351024578555393, 5486204967384814563, 6120273838388396482, 13554115592753033289, 298252933424703083, 5550726760273253541, 10004568017234232307, 10100413347317564558, 5353328459616604482, 12441875649480567710, 4272456035716489785, 7915690000692603790, 65];
+const POW23_10: [u64; 37] = [5457725428155387905, 3409833822158792114, 3566505380784054462, 2655768856853172843, 13248675731579966520, 16540455438375496078, 15949305013218048451, 7541623142077085031, 4152324958281516936, 684303725534263216, 15539784438307811164, 17104371202110529069, 4199610698829860400, 126822483240641232, 12825510680015966874, 17554055574591513199, 12420795136445382810, 2909397580955509369, 16532645984425360835, 8048795052905159307, 6713679763399778455, 8784718149221564753, 8638710942521937363, 13517696909744801057, 10460807820795012520, 8671609146121531134, 5519177235896658455, 11507164353531136392, 10536607744046307518, 4355128376509778204, 14502975696374556792, 3603174206751281377, 11214401716978930513, 13457942323576995558, 4669213468679131443, 17865481055429874212, 4280];
+const POW23_11: [u64; 73] = [11846125655129530369, 4808347477151537698, 4984465170536406021, 17773229190307726871, 9475540574276464039, 7490002630238673270, 12829219606569497605, 1855490239264020182, 18196368192375820573, 16807403573600054938, 169585650986432335, 1845707536133458874, 13880561038756938083, 15243237806662982418, 17942748340492775874, 16207312265816437904, 11750147279302913858, 9049742493468517337, 5322923673175149077, 12242456034673219367, 11097550052789754831, 15650059140797413691, 17451696301993982208, 1724791760067987189, 8425470383802962159, 445880095952832449, 12779890271826700983, 11510117651182442642, 811221383614412327, 11252917946439608025, 1966070912675922366, 9276698529902483041, 10006374879804156549, 12910054506401765901, 10935255376046483643, 17542193306785054322, 2799013365688525807, 7547447332198403221, 9611560566708938589, 18053657461852001840, 12739768537000605532, 15560568499051768847, 402026060965106606, 3813214866015313496, 13855420058731889817, 423347996799679577, 11974719557522547716, 12457578402889776404, 15177833050588247673, 17014151973003054641, 7069613605995695685, 14924754741116128615, 2833285700561124132, 14488631686198386586, 10053937439451005014, 3747724373394791044, 9081924864020352751, 3006643698446027200, 5686022571631760529, 6303984184389542219, 16918272220940077886, 522813575954678783, 3394026677636394373, 17739110856692301776, 9009777335823375089, 8767502255116089843, 5811942416715429553, 10946884817876382206, 15547247254446397106, 11379149715474961117, 3415855189674114476, 3865253181294437007, 18326691];
+const POW23_12: [u64; 145] = [11622517936107175937, 7033721139220014975, 17462596640339821761, 13443677624106482132, 13859025874579068688, 7280878587045926646, 5383064232978901626, 14665433874378760711, 7894817074399567738, 2041528587491127549, 11289859072721806396, 15722851455311617147, 17458663791908953193, 11373112974961266550, 17352366949201397809, 13694086727170229938, 15463470048916970364, 10570279842741120227, 6648193649700737751, 8601822496984129799, 18372388903764790934, 6554882423490887366, 13042954592236188882, 3808659751122712337, 13864998361267667814, 4936550449154763745, 1828997440316703799, 14178484846094336273, 8300160226004005939, 10650947050425965462, 11583438941158443082, 8522319677650037649, 1151356073008628140, 1868932738148428389, 14506340656346284949, 11817243760415981359, 17232585953382863483, 4753502805182177217, 12140144073638385110, 6047777126866781305, 8813512867009582516, 16214160100477068190, 11804216147256631092, 16758964429489891496, 817329583528750285, 10447211405305514968, 18187526514453193878, 15053852564892683104, 8972529117610110924, 10074677660977770203, 2060932658913772713, 1231641879598153894, 149117274952849823, 8839750144015468931, 13870849855808267005, 8497006295516812096, 12073998247659205592, 5227293461699406659, 12456857656474561288, 8071942982843138162, 17759584873234692073, 12408149989685761605, 966007088006790208, 15511204086555671740, 2111665739818137977, 10118791289794325443, 3239481064035042212, 4492850046702593696, 13966441049549479584, 8189105420526375921, 13025230708727756685, 1193466212743701307, 10414023183316180801, 15671669769341094794, 11459894969881142504, 9285576284817450377, 12794423314985937539, 1582486651183691040, 1233523445429108177, 15381656572259224358, 5839925333982045254, 1160227998025674076, 14621523935478174951, 11529055784409423191, 12535556463298536878, 11436518289385212637, 14678182288623217538, 1552974345701158423, 4147998753782449281, 1927652060510564509, 15088149282793322569, 14255865993427576407, 1023125521444459005, 3970740624906031112, 6047967177082775951, 2339662716940436578, 14355512922095874245, 4822772729108678019, 17320001634075024793, 14809631814461679339, 5210330158728763310, 4884444728559559679, 7018200998928663501, 4298433382992520523, 17042941735629279971, 10927395923749774306, 2302500185014965096, 9771934668912536138, 3884184797462724965, 2168628345276262561, 7005561876375487250, 9886177363664049122, 6514828189616609185, 7449477772310456349, 15522543591036378582, 7825624973021338899, 1410365973364396176, 14168293017624070645, 1640393222821385990, 10010974317741386045, 3623106050347539560, 12167346593779104567, 14151984978845758374, 2484940957914386867, 14114413731052178462, 12818973764128383727, 5194198120907027631, 4770998095731015738, 15004991160144901317, 12053912103781953592, 15326435702098550204, 3772177951370317322, 8517749116120725318, 17878047395783878861, 2238926480500866659, 17793138211716196325, 10628224830211866604, 56513344983428023, 17124432907531586525, 10482976782550925537, 14366608740333918588, 9778100743842486673, 9759653953317335926, 10589425421842329905, 335867610689676];
+const POW23_13: [u64; 290] = [8394090400973619201, 11964303563521419425, 6680726081226746407, 10953973454617762836, 8204153382229311332, 16254041314256517652, 5382403309283490189, 10294598562963672778, 6611673214344934182, 3108252571142423500, 591264897553799654, 10077880485074314447, 3324111534544969485, 9312594108209533062, 17640948814700965781, 6012379191488054550, 18444371524971204512, 132618783111387324, 5019449967207124897, 3549205104136494386, 10235095930753063619, 11320997397158549987, 10742490818317644895, 3187751223385388430, 352423585976925038, 8780916933321333442, 11561688232024544532, 4202008599615167561, 4487691813656735111, 15134695176258169105, 6690960709403211122, 12918310920993471271, 11635100276931512145, 17857812523909118347, 5686500615257112446, 494865271069226148, 14150027739975964006, 8995172384109705470, 15431220502214132213, 3591973263550772996, 16271017589500618733, 17711203169741269068, 12892034546770696203, 5900598767950539192, 14193592364934362760, 14901999759013903579, 7732732328927894272, 16475560904594101226, 8078965955741398752, 977645218519838711, 15832342418236883999, 10072025098841136643, 1358419459364144280, 797847689283391326, 14659537555179771844, 9896675821218330168, 15415516967802058517, 7968045175669056426, 7424233202721636956, 17848094697634144248, 288525173312435345, 15810972518254383115, 9299311067109640492, 13667629587352480006, 10303757103824097738, 6600213728598220514, 6218622672662595799, 3670031549674590187, 9716451342226392591, 13877815784478946249, 3113816061294914377, 12653023432091871432, 4481451666031891832, 17212931850927052728, 1308733032955890568, 12132175452048556703, 11965835958759012878, 16435282950624677626, 4886753010812848853, 4623306558254786620, 13328724565787069334, 10052593477402542792, 1287374823782162814, 13719253410664960848, 13940737455354227577, 16156794396241594726, 9406872663445041426, 14460695329812970433, 8147602052595626465, 9759086079357316460, 10770202697768734650, 12141428714491122492, 3479738801678607218, 4116552336811862093, 4664785535989027905, 6781810929589108561, 1453495303439479551, 15755570378614253759, 960995512121360650, 1320078744371634240, 14071283408344620583, 15873589170615939567, 11844318309681113006, 18209960901656184091, 5509787699837863735, 16057237111836286318, 12144799626465867039, 11301164228354554871, 15538809017861144326, 3881789278651060396, 2083726758011249379, 7242075601495698008, 16929003188024569952, 2637582047221593007, 6164192295857524759, 4324715935100466646, 3442312090445348770, 5482847019968621410, 14416139992674855236, 13766108847076098732, 17515176161144990062, 1472195265852816965, 9558656307272696327, 8860336721938319348, 10424050158232995985, 17735942241223068755, 11554220001439961201, 704483198669109564, 2932341443912568886, 2824738056487663018, 4281496866134446893, 17265437450258721953, 3681879345413845992, 11515194834409798593, 985765253142548197, 2984023863142018257, 4834135584147244310, 10515176357474522511, 7861156381474504930, 15513420229788668624, 5820797276345237369, 11750855905078856569, 12777784995909442228, 16086254035200170068, 16636829547693408883, 4302160437312317603, 7894749045828366333, 1529440129469432054, 16283118102972817572, 13551968615829143045, 14141755494036163869, 10202408444107256095, 16162673438713215156, 16480653606869029657, 12896873037878662327, 15675140110468513855, 14886915089358542684, 774257548144727721, 3121297763916484210, 11244674068351451742, 6136457775661368394, 8276608028813063005, 4328806852273184293, 10725793814173142373, 8713207349328170016, 3314496893276770994, 6467297917521019219, 10832668641628016315, 890510633050784875, 13522061147310988258, 9295062529110389908, 940274273173921624, 17713793344650807607, 2144115015919032862, 1515271528422120562, 11617268519367395431, 10225339851466026999, 18356608905542242762, 15747650718811748381, 14361136259390419567, 9521043180435682096, 7032180939671307649, 4766943856803433589, 1788903151609336531, 3067111554243386815, 15396974384403506303, 17635357051125839211, 18410171674236714111, 13006404946048489254, 10175048494319231069, 13695997532684394127, 15701030627417961230, 15625543174530632057, 11047121066749531892, 17248796765549407344, 14686939862573595225, 14467382368559107625, 9735007144341017943, 14300551919264430841, 12199685552486464333, 7976771866390972828, 11019782864537458767, 12325239107485025410, 7336145268816036435, 10317789320724881313, 6268969282673032717, 11187057720524651362, 10412317757966782720, 9957223876294202238, 14797474393797369649, 12707890408232218246, 17954169933651423542, 16261922616103793114, 4333510071491197126, 9148091121522839756, 12080381731581946005, 6771848631704086130, 1804305449358901527, 12855875845526226822, 18335367474036144797, 14793893678735463667, 10645700488999161160, 1895996504247616045, 2382164017483054973, 10552216344087268433, 9021719584181091192, 3380188034160414725, 6249703865004425795, 64414635892261407, 12377384963568233814, 7307438968304536980, 8966232128834474186, 6786257565852201597, 10068981359548525447, 12985487761061821347, 15250068204821929612, 17796166089646982811, 15383811979808576214, 5387278521333793444, 14111476944260561375, 6563576519556684180, 13695943457067318209, 6918562023235029062, 14754075890773412567, 858163115551518614, 12023362342021158858, 3730097749382796530, 15782336360183107402, 11828711242459787363, 6771555216470897935, 7119406591441040624, 11698872050004396496, 4286498256299825297, 14024971287426850410, 12627222004472030216, 10526038749734500455, 15799257125352115074, 16543575070263732648, 5360930992960858150, 5480478235630490088, 10740957876631647568, 10856615013881049128, 6337895592574874879, 10548351078802045249, 10770232544197542452, 17203053735917901567, 5544703280273301876, 473028986463327892, 1992348869891386479, 18106593888504158793, 14963463231368059529, 16888696108434515023, 3701215063285536555, 10706766752220176757, 6658893699890277224, 11422230761371528275, 13455493321187216777, 2936016201779625065, 10645596013106226786, 16327988970334155784, 14017806230973566932, 5319754173859118381, 6276196983172202503, 9141821856366243840, 7861511871015121036, 2669567714201173617, 16996968587538889159, 2361484064688056998, 11927883869173258618, 6115282537];
+
+pub(super) const POW23: [&'static [u64]; 13] = [
+    &POW23_1,
+    &POW23_2,
+    &POW23_3,
+    &POW23_4,
+    &POW23_5,
+    &POW23_6,
+    &POW23_7,
+    &POW23_8,
+    &POW23_9,
+    &POW23_10,
+    &POW23_11,
+    &POW23_12,
+    &POW23_13,
+];
+
+/// Large powers (&[u64]) for base29 operations.
+const POW29_1: [u64; 1] = [29];
+const POW29_2: [u64; 1] = [841];
+const POW29_3: [u64; 1] = [707281];
+const POW29_4: [u64; 1] = [500246412961];
+const POW29_5: [u64; 2] = [16390320477281116481, 13565];
+const POW29_6: [u64; 3] = [9728714693370925697, 6745052611261206813, 184033331];
+const POW29_7: [u64; 5] = [5757371679635727617, 453419600393655919, 7471178055056504086, 16196800870886799471, 33868267053539148];
+const POW29_8: [u64; 10] = [15498448609686505985, 1479573139064493249, 1836875582269835795, 1814411116202214481, 16009278822815034249, 3793936265448736901, 7182808813944114636, 17021911425577363478, 18016738525341173714, 62182220809613];
+const POW29_9: [u64; 20] = [16095552165416375297, 6065906482531612469, 15846163999557365237, 8013973177636272531, 9907319438467333809, 1691774050185876939, 1506028245701941645, 4265451072064456439, 3529530588555872352, 1638853873174462591, 6883747855773278130, 11889568804655462422, 8456300052243942764, 16223290542744403653, 2762925283991841243, 253267985127962974, 14089073124764984418, 12127786193190370253, 10931184201498586925, 209610355];
+const POW29_10: [u64; 39] = [7418542219833059329, 958377938827997701, 12488373186104909143, 12529661491707363005, 2460871112196890430, 13301540322674214688, 2373733691634663140, 11423959455316010393, 18281459953449138674, 13513136808894472708, 3823417341457510714, 1658370468200076063, 97467081071724554, 7848891007640526021, 17045665495969248851, 12096572349860687818, 2344094882925129526, 16190726499474487633, 8661974748470910973, 2574678668507283601, 3938614083820384558, 14341609184753406313, 2327685548231144915, 13092203624281047501, 5927048675101651312, 11029220976556497723, 16060534061541073881, 12814669207404065063, 16627810676372102119, 9026340843146512580, 15159190325393838446, 4023118401698046761, 11640539626749296523, 1550915222204822306, 16884085217527839713, 11861828186682004783, 3690204447908116734, 18297612114356149756, 43936501171648119];
+const POW29_11: [u64; 78] = [2994516997653811201, 12691238007485188813, 6425373631596055902, 15742770753423678927, 12204372028205694288, 5468214848723792535, 9013064258242214675, 3705670445566310522, 6816135216491761480, 7579681604803045464, 4606613900336899030, 12532494192450120462, 10977305613949161291, 2925401003903444641, 11434821894394303238, 6370559474830540587, 3613465365096045323, 8572921874219622351, 17686337502642682630, 9293099978060864798, 17797128149100621552, 16155222522427697112, 3181967258345772623, 17295243910487365923, 8334446766563669130, 9987032240221668744, 4134590021599940843, 10649547782386712269, 17907870508952217684, 7350151663967192535, 13809504305637163343, 40380992378335767, 4555217157101625376, 1657389040493062985, 2448044455405957695, 14590542673302313551, 4276642375845923056, 8771354597287485314, 17699373990153521820, 9154659546877076733, 12098470914195334408, 15510274657315649565, 2945274152627196618, 15547292285751739089, 3863178779199140492, 18239280759876840351, 8951674302212815712, 5207549104253473993, 12829105964069607756, 15630099553755898378, 18350513890796580112, 16016692600961659767, 11181977692592568416, 6673218275992797930, 3690766535465030925, 6533794652243942130, 11732497937469914712, 852954069083677346, 15781580274925636218, 7313857007886670976, 16710172042874726789, 11335644921839334192, 17642364469799383421, 8287572863569889806, 16034458160023464806, 15733292827351475864, 7974299796479031730, 7044659385783483718, 3797189105432088351, 14466915282265664182, 17729930178773628819, 895573073497407671, 12206919607548026764, 6507363199240370486, 14755257268128867927, 15742062737932432583, 11995317340732918802, 104648068379583];
+const POW29_12: [u64; 156] = [13624873453324378113, 16385905459755676464, 1524305801788745086, 10199785704783688521, 1105651907887017695, 7899244504136605362, 18415256620208376992, 6527880665753083982, 682595803567740022, 16971614856922076940, 122533806241893053, 1353874090500713666, 7700237657957992551, 11127822942621606857, 1117749882174310955, 1258597230258737875, 7588632863614073926, 13138370241566658389, 2944598617928471419, 17686360850888548584, 10802613354916448913, 3714169153408764353, 6097871342973394581, 15861447995882643160, 10529542217748913313, 5856668093475572493, 7687895863558019677, 12605086561069481807, 7359120490786328322, 5569552760021637038, 4610304421820188056, 14547599253888017465, 11448162300671493140, 11818860935063076787, 9024368236844078846, 17611918172934723031, 629058103025294072, 16402630757077520187, 3011120034874656385, 559434539294690920, 7708404193241517444, 11475885645249324855, 7527987534261502946, 18429346260451766463, 16647774408649527759, 14994162011800902093, 1602818183595944455, 10416127526769434021, 3902238027102980241, 16221439502904488789, 12728402492485944773, 16073041623703233415, 12059726721016275106, 7545575059158739724, 2799238940044439918, 1672337105562087992, 8637211310967344193, 2407781877381905680, 11081849713304248562, 6021357575086118725, 7805169637362728481, 2625854993373891686, 16225294581782396586, 10062522529509829562, 2491408246686350605, 16868477542775958185, 5432403930965842681, 6401086498452275312, 12923560148084435631, 16773315028203435668, 8787070119132526524, 6463823535577679823, 13155598264862568438, 5435953435295016479, 14887580091845909428, 5662240093801646219, 6061361103497749674, 16748987890714927578, 8380355601067159254, 3333305983278680362, 5659126067788145105, 17749870175532152657, 16165175331899768700, 10227145147339710095, 10044125302402649256, 15178477263894883824, 10894099044530456123, 14560109165216863917, 17383533091118876692, 621825033718554903, 10839534769243474212, 1967962613229464445, 8169873286726584084, 10782901860247460926, 17093800990823904246, 11498611700774056582, 12410146132732634389, 7417803587808478058, 18297046186195412975, 1574754350240276490, 13353046326481463290, 703471129273705839, 9342410231302222619, 7177988852693229323, 731499736917740653, 13443044161710177268, 10283780089535375364, 15978203559738560802, 7963817190382519294, 5669156970634321340, 14472164925629166220, 13004679628433896001, 9604961982380928881, 16097595907957091063, 8580674506874034541, 5991654135140835361, 4486972720692276001, 14599506547892476808, 13925166205172986588, 11489825356002091398, 11118067556437148191, 11395708967825186605, 3829509361757685613, 15256482687844263043, 16220636668955199613, 9899470830714797674, 16171116048998105055, 9519063829182808481, 14866997540493315924, 16868409756818216339, 1021202624840046466, 11782253385860110106, 2818200589100936468, 12919226415367876759, 650908069644921607, 10017441333456359930, 3989108944068656321, 960976354279554772, 9757599012852014139, 18114660057832184138, 18167793868128559825, 14505503950682026051, 4506577842976861893, 3490506407674121260, 14721352082457615055, 5606132434995114951, 6758734482506628989, 1949658512938374708, 9038022040851963244, 4539935154943351555, 14491940671051821480, 13570801843566854467, 10590637167428855161, 4113671608170033059, 638731029910275814, 593666729];
+const POW29_13: [u64; 311] = [13672226770128551937, 4294585427239528572, 11937131084527655176, 17121705376405822666, 7266228530481644789, 12046326213228550475, 4555057994774087724, 8142229442681275952, 14928982525547024142, 10590848912065017772, 204977530255868505, 18394854911726948882, 18072147853711708396, 12984137044024706349, 13009557613879130662, 13437977536707178674, 17194519815234671567, 17880973136611499925, 8740997228436187796, 1053992851950062740, 9457052323001348307, 12635519821631166958, 7816877192318698506, 718974763720009595, 10506931626216910574, 16677486741239744144, 3231254992931774931, 8235433747461888832, 724496508110913891, 13418937453673984204, 8909291817057944420, 14418648484529316905, 18043014680750553541, 5725476447770531156, 13071604278662220441, 10277659562569596333, 12018124774190765506, 17648076272580958966, 5779739214397276354, 16650875990066234185, 17578631890048416051, 18245706186939598453, 8860678737288244932, 2108635465551665383, 12676314908233341203, 4285804123234359081, 9277371795036436264, 10891868801908629004, 13397489614092183722, 15564677338119485008, 9665683407829948339, 5488201562995831037, 15013749743704512461, 5778162266745605791, 14886812807808528790, 168867009872405748, 7700062651581741459, 6387875535489181056, 9217246679453129609, 11592490233993784416, 17456249849289259204, 7719671028608500290, 5776354603165235091, 11902258013330924579, 16271941308134810423, 18175425490570157612, 1348150720221513076, 5588923701320423310, 14347935746438536406, 2596293928414773985, 12999246088959114720, 7853618653032698111, 7428832709538391314, 9170615543668590681, 12873617114721415899, 2287308408671855195, 15460664247921730262, 1081523048631284839, 6151194618794128608, 11273222781436349088, 13797604919627813256, 10624352073641598508, 630071154717618278, 11372236940584293328, 1075063172784885024, 5353969557588737765, 17451750398327390218, 8847663264773559928, 14748776361514840683, 18141609447845895554, 8182248027890039495, 7740296117300250315, 9983411951252605895, 8838835298932336410, 15822882019381304121, 7494054417011587712, 9900741832494288950, 1884928955842835785, 14171827897630066950, 13979799510826257080, 13513518815078312459, 5547695969646569639, 8530956960051361363, 12925328754320739957, 15636981282003148604, 12380992638017772181, 5493876552103757314, 215260643889624253, 12599522812737008379, 10618136163261717865, 865812928187561342, 18164096494692425166, 4255258782059127586, 1482350852033754088, 2695674783092434476, 612994748952243333, 5350516409712278067, 10643337985082357108, 7767606074667599560, 13335853206335095348, 17909273832462095134, 348073511241936160, 14336337316615481341, 12294498444798592895, 3468077374887439958, 14752296701514702839, 11605240111110396223, 9912105850349709991, 12222362274483646114, 5500320934311332049, 965322882796551125, 8120198151864100986, 10385638565545610254, 11099447317438769075, 18145701608326972194, 9211397194147565471, 16133140126293610187, 15479595949832460983, 8772975857916812745, 1084809613596598881, 5209298234534478403, 17558147171719107828, 143145869814217375, 10856698203553984473, 2659417222261508760, 16776485743584819636, 5302132120190972721, 4179156032527653547, 10978123522004167617, 8616903826794857138, 16682110447672369644, 17408038179970039463, 17186638068325799623, 12586354934200162415, 2233353304839136470, 4604182926246550683, 15020945466130945179, 16882044374210881607, 4338556115610530951, 2548212077346936596, 1411947313359297892, 10760208517239011678, 12093507522709487357, 13250275519469800494, 17582234765715613618, 2587511047896745958, 9212232785325628779, 18416663261885415016, 587958984336727576, 16770327872208757326, 18029866150989284266, 2155188481720710192, 12170084941625609208, 13109309650505330232, 8947648203486222025, 5888408458257150024, 14610620042876969685, 15423269234038144149, 3755865284152467362, 6346866449393971611, 1048506361728426237, 9870704850560462772, 10902661774531812828, 4199023600185360775, 6841388119581862720, 13682397273260178435, 14451847431964184851, 9525153246333444962, 17005489543042710365, 16211222296998776081, 15260265402027014562, 7763125742878812795, 13979706248482079267, 8676877617572732607, 6717568554186988777, 7451376909733293094, 12743147316357600209, 14813987449073120918, 14803395224357306623, 6217191927361854763, 15651965812852718609, 14440004895152758631, 13270702150255333623, 5389827381820702983, 3735068664526592820, 10857318640694862193, 10376694890261332559, 3933073728848971783, 697722641169826892, 16654090227270876633, 2460452273549607042, 8139664584320228460, 12550749769392292878, 14691474813019701742, 8199888084316731628, 11707952462140957816, 16114347695442949664, 4254129723503068617, 13905886209486906303, 1678761750672668626, 3225544376917705027, 4779593219040896651, 4235756478245421233, 5843573772009581114, 13665134646853522957, 8166624769996657068, 12911077716854219395, 16031871157703988923, 17416979802078865491, 8935601752687330771, 8735956307554644333, 16225905211746171707, 4197301432305286566, 8217235209443529821, 6568145665602340166, 4703736038695943549, 18166481118991346417, 9055754601443772842, 14714094804941228956, 16920404788456306665, 16524115921513210483, 641311670008165827, 15278175775893318136, 4907119125081600753, 5470711230848082435, 7100440935018849813, 13548915853787394088, 13590896704726324215, 13419458591969809595, 12770517692189405268, 1682411139436089322, 16204267049714979529, 2130875000887245762, 3898148472505848400, 14808356779381968102, 12947547547530892128, 17093910043024869675, 4525420012639340544, 13406279992640413066, 1729931621875839983, 16399898141312950768, 7129430414049908823, 17055498123847510422, 5949333034669238013, 13172939620181146406, 11403868551726675873, 6758381945319437250, 4959899602116544640, 3030437071703111193, 7620094948025377385, 17953437088637383479, 430815515899335460, 8526143794481228897, 2011335460140755665, 1673153626059617351, 16611732881434813086, 6443513401833815128, 6356927152578677596, 5197550056219683564, 15117200294690211492, 12015247322584645921, 9143591408719695076, 16336687030934349149, 553766647123672757, 2941286556052681945, 16789397649694586286, 12086132202659948792, 6535544241266924915, 10218166389643100138, 17860728039428683844, 16698865587722179966, 10428296414771730021, 2472961343093658568, 777962589860353634, 15699598097617775224, 16945956761022060145, 6034890250215295206, 16824146588235996674, 11627609953984916638, 15085182234564679451, 16046485513580920525, 5649255435865038088, 16906305800633423485, 18391011698312280946, 16404185211853238423, 4822232346815630437, 2160504333581284492, 7990377947715144481, 1965670057026283843, 11174877963137540449, 352440185162671667];
+
+pub(super) const POW29: [&'static [u64]; 13] = [
+    &POW29_1,
+    &POW29_2,
+    &POW29_3,
+    &POW29_4,
+    &POW29_5,
+    &POW29_6,
+    &POW29_7,
+    &POW29_8,
+    &POW29_9,
+    &POW29_10,
+    &POW29_11,
+    &POW29_12,
+    &POW29_13,
+];
+
+/// Large powers (&[u64]) for base31 operations.
+const POW31_1: [u64; 1] = [31];
+const POW31_2: [u64; 1] = [961];
+const POW31_3: [u64; 1] = [923521];
+const POW31_4: [u64; 1] = [852891037441];
+const POW31_5: [u64; 2] = [12662688596514954753, 39433];
+const POW31_6: [u64; 3] = [3671467063254694913, 12907182779550130112, 1555015626];
+const POW31_7: [u64; 5] = [2398592399778478081, 16903472776956642306, 6096611049602248745, 16636903787979198184, 2418073599280260060];
+const POW31_8: [u64; 10] = [16495141226337464321, 5497467942242379092, 739419886143237049, 15503879009878095970, 11682331906096634316, 16633417005805376854, 5372896706229367958, 9202442005912433102, 563103204607180020, 316970838223396679];
+const POW31_9: [u64; 20] = [15485542806247563265, 7902121530818837975, 2174706260711399794, 8338441619710993323, 5174276498274060584, 13896057508626164711, 18375211818704524752, 3771896122404979996, 8975237466821512923, 3719531891742392080, 16278739063660681217, 4597651131527345692, 2186070395957176618, 13296270632358335916, 15407783350388521641, 5218389564425962599, 16684214730241765171, 12778720639429264303, 4999906995294690253, 5446517384454533];
+const POW31_10: [u64; 40] = [9917852350074830849, 17503880052831590204, 446078003314555885, 8290200544094315544, 4545662562678721248, 4773755696042207422, 11638197421469811125, 5583541543002688187, 2928843055633941976, 958885388170378936, 3769648711024405821, 5876476779803596179, 11002952954355201516, 13871000240735738927, 17280625944737162989, 14126363476369511686, 15540015784356269088, 16121873610546913654, 12315657342730701215, 6625239742322092255, 7267729338210329014, 7304834554893687532, 7448184685073964747, 13915799753354305463, 15532808105003034689, 15560148693948667263, 6702446356212876218, 13874950973356027931, 2487265240908372712, 7423364546851580592, 16542076444295774186, 6667557158368925022, 1662731694557479534, 9710460046131384926, 2132134259642658908, 5536099200409622432, 7079630905631896838, 15765425182381143449, 6981407756766447719, 1608118565565];
+const POW31_11: [u64; 80] = [2096357348270899201, 16522211005267270321, 7477919505160117322, 8806055114386868960, 3103435049531657831, 3379991644164106799, 4737739374697149255, 9945960765085644629, 7776246301742102048, 17399545307872502909, 3336726592735577432, 3519304755566256320, 5275788180193374204, 12928214378342167617, 15534345485858271159, 9401077179437188119, 7195141385339960711, 7142093030883132565, 14543884843609752529, 1217720379423662081, 12850287365802214228, 17344347135107428951, 12599061754132488689, 8259746063225165422, 339910009266162020, 17918745758552077552, 6268582040783762747, 5426821636267775363, 4395733309604733570, 6358602157561990726, 11221739565428542155, 2749886157802053331, 3189270605149490673, 4790389046718542725, 1175431124796898032, 5749001033556578690, 6912856700960811479, 4968629094888695034, 5837635138599290090, 3776654629561458848, 11336701517692035987, 1984651411556410646, 6931043715203064840, 6837691805643163316, 14367990737348130710, 17276342136548545114, 3105185803291383662, 12596699258178437907, 6470695596657158731, 3602704307378790153, 11572324985684752652, 11114547972589521268, 1092394893621389626, 10841797182274992700, 1040880730761485215, 16711988749278589650, 5975456085549041101, 14905526063676943009, 13367279695703674516, 6835338110419533612, 18343405583925227682, 126856704539218164, 4654555027808343551, 5185799915572738127, 15883434376460367703, 10459236391563286876, 9723337164163736994, 8768112576670327395, 2997638480561109889, 14755828647425496405, 1773069327573470181, 7247206901800033682, 11330645768649999049, 5069820474999096624, 5080077807929860435, 2674467631168657459, 5381001373866890151, 5389434896896673945, 14715966782098618198, 140189];
+const POW31_12: [u64; 159] = [1801767598626373633, 11369215895344178997, 10557430481523398302, 14729514228510065525, 16360921955454372649, 16474683228536923574, 17648663066377562214, 4616891103789060010, 11068143261721723115, 1986645887088002957, 13290878115429655256, 3688668928960070024, 12512281909781684531, 7202283709776267072, 3967537723985850955, 12079529339314160258, 5789930103522033008, 6446685030039335642, 17807119147724672441, 3657430757286952433, 4399435073983627112, 18080853932637710552, 4422312687427527790, 7041879709312349878, 4779369405315517716, 17761075356942561993, 6886785584079733145, 6856167696222472649, 6677149285262446585, 14128635321123954901, 2647749906943380861, 4947686821001308616, 5044767174651025699, 2000890117376226065, 7696974985933478928, 13698435522203632260, 12508923657400466359, 15708418517218618222, 17674087902574982192, 2599698632235115523, 2009487300431793372, 9152382659123644566, 8381623589094130620, 9360768865282788157, 7841634244523839263, 5142811084696223554, 10567527345171480010, 16587773482736315677, 2641488119964491057, 11283016081783311237, 10720423912347695400, 5033579150548247328, 13355273399754189136, 51107983476714371, 16767129091656895127, 13287727447102009689, 17540684169108840875, 16056898477225800826, 15452534119249468253, 1584338096418635712, 17835157847873868573, 15761939049259095748, 17731276659510811437, 15878595503172808064, 13541637914930966895, 13453653161442836461, 18167456091839538328, 18255511530115413898, 4918856903308235200, 149229284494812489, 2557715426008933344, 6329903885342108338, 7318037208799124842, 2088260064299365610, 2541296462169285780, 381201140083506486, 16076846840076350151, 8462873072785783617, 660968055866686239, 2714493904717207769, 12375607733044388010, 5072867669619256914, 423086081630114977, 14280478669225037932, 17938032817920806759, 18247594851371119991, 16179063841019022056, 13021457957149068932, 8911307390539096499, 11363387932840668312, 10741435924015807141, 10029008094449397314, 16074918609567735355, 3769485278193873309, 9755372283020856168, 14717290698284082587, 7570733972839733749, 4298417382024000897, 13903774150610302172, 15293354607334066454, 528520764411840191, 15390551811956009819, 3379881677203840025, 13637932214547525934, 17660189041724368123, 11806060371417074758, 15647766708173899796, 7670709915778958063, 14579010623960808134, 3115030890575484558, 6390827240047220130, 3093427188698038429, 18400204352832039125, 13284388778413708181, 15266311760490059065, 12555628412866282735, 7422734806867121800, 9917331904149950467, 7716622572140393442, 4308002630539149169, 4299292758073020141, 11078221702723102710, 7192518176606606762, 14435348804115821404, 13062353273716910458, 13994439988643223997, 78194093488871065, 16673842407064744836, 2523733938373131892, 17363625493235470610, 12985783305889285413, 5814006926820796127, 14725299958835250512, 9524704170138330948, 2092960985130703422, 373732450919540444, 8163480067992673786, 14148234157378013578, 3255522486897147875, 12881327932855308105, 6404382367598296653, 8614596466670346051, 12047324956663877009, 4172218920524389996, 4699362730392253186, 8713226888015588849, 3933801823730961601, 9823349397494488408, 4982238783101836982, 11481357151755968809, 4766978584604408965, 18106032764723837673, 15784602917188118646, 13418700349702360957, 77586404521456507, 14219791363337228746, 4890203053901953780, 6486956095841198351, 19653179394];
+const POW31_13: [u64; 318] = [11650932410935017473, 17308825409233552681, 15496923541467448409, 1777718871702572849, 9922250554759274416, 12138026234393869648, 17452061592037372959, 8941120299606061452, 14366819422178367459, 12093141130691423854, 6120245025799833153, 4040279058952228412, 16148669873983246463, 11638143459508968866, 7154962979814798744, 7446144282266149209, 14174761033366019694, 11005543689910023371, 4128945788305534352, 7916440503096344475, 17070759717638194282, 8317155700235419964, 16931165184121652232, 6107946258706111077, 17731633154006971892, 9975717563530952164, 17543341719370900445, 9068983835221482709, 11415618862125602468, 13941086487558922704, 9635074152356732409, 8609049941205301246, 5471271126836396598, 2529439458376343483, 5604462733361525308, 5071787135380346645, 9909017897886427767, 15318475760261214863, 15316661691465834839, 7269371500803889962, 18032035088825185820, 9351894071296179180, 7343963840109365284, 5474046747747064192, 17481971361736150682, 5824250518798481785, 16255331231101793892, 11457017040634759339, 4426275110417427081, 1672002347120187444, 1975148498547535928, 11542057410017607813, 1220219139718878911, 3572598416877263916, 17006271185639766323, 462877625934666647, 5946847649902211805, 10990578101662644446, 7321273047908499993, 11548771999759168406, 4552759373643571249, 6618206790756389, 13316001433771606947, 75035747373599413, 10537200199427443702, 840767934414474190, 2777096646401916111, 17012900311823701232, 7015161044925147448, 6556613106909146969, 3157487824339572799, 11834930013965627207, 4150587971056738845, 4060390407706833438, 3984973614331228862, 9699637788294727825, 7098321630753042945, 250364221365032952, 12893847110117037419, 11924286071111309505, 8393083471154342881, 5603413628441508744, 4312581983296816308, 17817980376780588471, 7428707413480964562, 13790918846651350003, 16839134508576563808, 15143176246629895881, 26735050067619462, 5603585605129569706, 1750160737609386776, 13568704574413602334, 3781635003327098853, 12897395712756630425, 2729856571522370295, 2992033563406299606, 14195997516689513778, 7401541414450269, 3031650221770855130, 12559199617131004638, 8885318091262764443, 7265380638052772864, 1962471378061357844, 3684153597631553019, 10238664161660321918, 12783244908359269213, 12391242514324497954, 1023711264845355161, 12452432713654839765, 13284783342897209511, 16557260712252730343, 5308303541438704709, 2796444403386340288, 15964531828291706736, 17988431333681334980, 14050372967446057331, 2909153184171088974, 18271130663105232364, 17469865582643271403, 9235655978445445898, 15404258371539441145, 5414561797197130298, 12710970338328138283, 11348287294622669205, 13279912660231133205, 10006247474864908844, 387503936696045632, 11946706255639811710, 11557870632698008761, 17437329406201043082, 16453976559258974555, 18392521437799244418, 5518103827549465462, 3974014970850441837, 15906277221207084410, 12801233926930718584, 4858365996896405222, 9322063613169093288, 14295953691080547753, 9592792123651163696, 2307344178546710630, 3386463638913702994, 9746093064647197259, 17360792881978099646, 2331390749971078807, 67001271839132128, 15325146603819551287, 2212628260682394667, 3686351591055346926, 18444798459840663871, 3754055313895642917, 3111892272160209815, 15016905147277324996, 15249576022718612023, 9687562159637011466, 13620931157765942584, 6190446801315715564, 10199083049527776302, 18141268778130065839, 9194745994890263134, 7235857422137094771, 3039910200489081515, 5415376942362531145, 16313633954549303183, 16461609570472238153, 9135277678097989755, 4294200396551742961, 13873006430789283232, 3023341343724205072, 16180504954216000185, 16609282451833813517, 16147311299516906931, 3865431442196887781, 12056989559936082473, 5047870703145606460, 1325407901341138823, 3862762561046689086, 12154167808814600764, 13559820430591455007, 16360437559998671104, 7527717115571819358, 10716582562115872527, 11456000201504763720, 10701796272554334104, 10721370524245846060, 12741499625978911616, 14421778075231438768, 11779380118632710772, 5424719334131978781, 5139480536351736997, 17661687414527592806, 11683842095404036105, 8502752269926502292, 11859733037943709207, 12494735198665940265, 8407405997702413068, 4768364384316304380, 18319322834390557454, 8429150892580430029, 9956937433087180707, 15428189518856272765, 4992651218965591961, 10432854511240697207, 18332416995451783647, 3108194795607589285, 10895053723708853661, 2479127734352181541, 3680448758879590275, 7893151660183717273, 13698422782505760429, 9058264674841042271, 8173577806118979126, 15059606718923206684, 6303849893315995452, 9663435245565856532, 10386953918449659613, 8365072188147552061, 5909105025045825689, 7505410059121943936, 14835187236522959824, 7178542398798756721, 3244101273793333014, 7478293355884534482, 9936708530048724800, 7214296726988684118, 11442302058569190230, 9285606747893989774, 9168915157885784775, 16961770236320521450, 10874898498687269396, 16592277389624644429, 3007013275672248960, 16211270761002642645, 8955452119018187856, 1991548249560329806, 16983391470441275738, 156816301123428631, 16056306118076063989, 3636726870096591928, 8947421734000646900, 11102942016938080406, 6119525769550479573, 96726746357708986, 12936505540798421749, 9178050386743348451, 5620134833181442437, 11762276505007076755, 12761772344156536488, 3679038526545223637, 13345584437885106473, 16425398117968312468, 15232164270082349060, 9367625489982087631, 15526319758859232235, 226839740591401608, 243271890237418965, 6068791731053606502, 9016003892101302373, 16144441092544578465, 1664847353881709656, 17029558723917215874, 6610972717941396232, 17795795228359356713, 15173020102679721202, 16500332964522840314, 13262352098506638269, 5415683019436064276, 9845938604751972372, 15011664267083886298, 9302815697041392426, 10134461814529250912, 13782101968955909012, 2357979049692918364, 6720070569549937826, 9714100880431638078, 14744526615439393795, 13157593180412954939, 13358340127501549181, 7202587685441141744, 3998092887006896176, 12440695122666175631, 6060298862568659312, 1778062782693401036, 3101316331066515899, 15959362652679781172, 3812580654417274552, 3179751990173014075, 4800884105328080242, 4555909187188415655, 10019168566451086821, 10203906477086999803, 9709465268035298374, 8222943895049045865, 13975784716964627816, 14156811051863448914, 5613088360083362056, 6658023700600195151, 10260390177620906511, 7253822460209371436, 2005358072289035384, 10384255809604537396, 10612173669347199378, 17872559304263195172, 12918681865001345859, 11169532485848227142, 18410164066596640797, 7557387013661437005, 8074018520354688200, 1695402573163373447, 2388608657305224726, 3851803170527561236, 8478879889311201066, 883591599761019226, 267303269300772726, 14564461833813888409, 3980592300144013488, 17312578832377593806, 20];
+
+pub(super) const POW31: [&'static [u64]; 13] = [
+    &POW31_1,
+    &POW31_2,
+    &POW31_3,
+    &POW31_4,
+    &POW31_5,
+    &POW31_6,
+    &POW31_7,
+    &POW31_8,
+    &POW31_9,
+    &POW31_10,
+    &POW31_11,
+    &POW31_12,
+    &POW31_13,
+];
+
+}}  // cfg_if
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/large_powers.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+//! Precalculated large powers for prime numbers for `b^2^i`.
+//!
+//! We only need powers such that `b^n <= 2^1075` for `bigcomp`.
+//! However, for `bhcomp`, we need at least as many digits as are
+//! input. We tentatively accept up to ~2^15.
+//!
+//! The larger powers are **quite** large (~3Kb per radix), so we'd rather
+//! not include them in binaries unless necessary.
+
+use super::math::Limb;
+
+#[cfg(limb_width_32)]
+use super::large_powers_32::*;
+
+#[cfg(limb_width_64)]
+use super::large_powers_64::*;
+
+// HELPER
+
+/// Get the correct large power from the radix.
+#[allow(unused_variables)]
+pub(in crate::atof::algorithm) fn get_large_powers(radix: u32)
+    -> &'static [&'static [Limb]]
+{
+    #[cfg(not(feature = "radix"))] {
+        &POW5
+    }
+
+    #[cfg(feature = "radix")] {
+        match radix {
+            3  => &POW3,
+            5  => &POW5,
+            7  => &POW7,
+            11  => &POW11,
+            13  => &POW13,
+            17  => &POW17,
+            19  => &POW19,
+            23  => &POW23,
+            29  => &POW29,
+            31  => &POW31,
+            _  => unreachable!(),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/math.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/math.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/math.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/math.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3542 @@
+//! Building-blocks for arbitrary-precision math.
+//!
+//! These algorithms assume little-endian order for the large integer
+//! buffers, so for a `vec![0, 1, 2, 3]`, `3` is the most significant limb,
+//! and `0` is the least significant limb.
+
+// We have a lot of higher-order, efficient math routines that may
+// come in handy later. These aren't trivial to implement, so keep them.
+#![allow(dead_code)]
+
+use crate::util::*;
+
+// ALIASES
+// -------
+
+//  Type for a single limb of the big integer.
+//
+//  A limb is analogous to a digit in base10, except, it stores 32-bit
+//  or 64-bit numbers instead.
+//
+//  This should be all-known 64-bit platforms supported by Rust.
+//      https://forge.rust-lang.org/platform-support.html
+//
+//  Platforms where native 128-bit multiplication is explicitly supported:
+//      - x86_64 (Supported via `MUL`).
+//      - mips64 (Supported via `DMULTU`, which `HI` and `LO` can be read-from).
+//
+//  Platforms where native 64-bit multiplication is supported and
+//  you can extract hi-lo for 64-bit multiplications.
+//      aarch64 (Requires `UMULH` and `MUL` to capture high and low bits).
+//      powerpc64 (Requires `MULHDU` and `MULLD` to capture high and low bits).
+//
+//  Platforms where native 128-bit multiplication is not supported,
+//  requiring software emulation.
+//      sparc64 (`UMUL` only supported double-word arguments).
+cfg_if! {
+if #[cfg(limb_width_64)] {
+    pub type Limb = u64;
+    type Wide = u128;
+    type SignedWide = i128;
+} else {
+    pub type Limb = u32;
+    type Wide = u64;
+    type SignedWide = i64;
+}}   // cfg_if
+
+perftools_inline!{
+/// Cast to limb type.
+pub(super) fn as_limb<T: Integer>(t: T)
+    -> Limb
+{
+    as_cast(t)
+}}
+
+perftools_inline!{
+/// Cast to wide type.
+fn as_wide<T: Integer>(t: T)
+    -> Wide
+{
+    as_cast(t)
+}}
+
+perftools_inline!{
+/// Cast tosigned wide type.
+fn as_signed_wide<T: Integer>(t: T)
+    -> SignedWide
+{
+    as_cast(t)
+}}
+
+// SPLIT
+// -----
+
+perftools_inline!{
+/// Split u16 into limbs, in little-endian order.
+fn split_u16(x: u16) -> [Limb; 1] {
+    [as_limb(x)]
+}}
+
+perftools_inline!{
+/// Split u32 into limbs, in little-endian order.
+fn split_u32(x: u32) -> [Limb; 1] {
+    [as_limb(x)]
+}}
+
+perftools_inline!{
+/// Split u64 into limbs, in little-endian order.
+#[cfg(limb_width_32)]
+fn split_u64(x: u64) -> [Limb; 2] {
+    [as_limb(x), as_limb(x >> 32)]
+}}
+
+perftools_inline!{
+/// Split u64 into limbs, in little-endian order.
+#[cfg(limb_width_64)]
+fn split_u64(x: u64) -> [Limb; 1] {
+    [as_limb(x)]
+}}
+
+perftools_inline!{
+/// Split u128 into limbs, in little-endian order.
+#[cfg(limb_width_32)]
+fn split_u128(x: u128) -> [Limb; 4] {
+    [as_limb(x), as_limb(x >> 32), as_limb(x >> 64), as_limb(x >> 96)]
+}}
+
+perftools_inline!{
+/// Split u128 into limbs, in little-endian order.
+#[cfg(limb_width_64)]
+fn split_u128(x: u128) -> [Limb; 2] {
+    [as_limb(x), as_limb(x >> 64)]
+}}
+
+// HI BITS
+// -------
+
+// NONZERO
+
+perftools_inline!{
+/// Check if any of the remaining bits are non-zero.
+pub fn nonzero<T: Integer>(x: &[T], rindex: usize) -> bool {
+    let len = x.len();
+    let slc = &x[..len-rindex];
+    slc.iter().rev().any(|&x| x != T::ZERO)
+}}
+
+// HI16
+
+perftools_inline!{
+/// Shift 16-bit integer to high 16-bits.
+fn u16_to_hi16_1(r0: u16) -> (u16, bool) {
+    debug_assert!(r0 != 0);
+    let ls = r0.leading_zeros();
+    (r0 << ls, false)
+}}
+
+perftools_inline!{
+/// Shift 2 16-bit integers to high 16-bits.
+fn u16_to_hi16_2(r0: u16, r1: u16) -> (u16, bool) {
+    debug_assert!(r0 != 0);
+    let ls = r0.leading_zeros();
+    let rs = 16 - ls;
+    let v = match ls {
+        0 => r0,
+        _ => (r0 << ls) | (r1 >> rs),
+    };
+    let n = r1 << ls != 0;
+    (v, n)
+}}
+
+perftools_inline!{
+/// Shift 32-bit integer to high 16-bits.
+fn u32_to_hi16_1(r0: u32) -> (u16, bool) {
+    let r0 = u32_to_hi32_1(r0).0;
+    ((r0 >> 16).as_u16(), r0.as_u16() != 0)
+}}
+
+perftools_inline!{
+/// Shift 2 32-bit integers to high 16-bits.
+fn u32_to_hi16_2(r0: u32, r1: u32) -> (u16, bool) {
+    let (r0, n) = u32_to_hi32_2(r0, r1);
+    ((r0 >> 16).as_u16(), n || r0.as_u16() != 0)
+}}
+
+perftools_inline!{
+/// Shift 64-bit integer to high 16-bits.
+fn u64_to_hi16_1(r0: u64) -> (u16, bool) {
+    let r0 = u64_to_hi64_1(r0).0;
+    ((r0 >> 48).as_u16(), r0.as_u16() != 0)
+}}
+
+perftools_inline!{
+/// Shift 2 64-bit integers to high 16-bits.
+fn u64_to_hi16_2(r0: u64, r1: u64) -> (u16, bool) {
+    let (r0, n) = u64_to_hi64_2(r0, r1);
+    ((r0 >> 48).as_u16(), n || r0.as_u16() != 0)
+}}
+
+/// Trait to export the high 16-bits from a little-endian slice.
+trait Hi16<T>: SliceLike<T> {
+    /// Get the hi16 bits from a 1-limb slice.
+    fn hi16_1(&self) -> (u16, bool);
+
+    /// Get the hi16 bits from a 2-limb slice.
+    fn hi16_2(&self) -> (u16, bool);
+
+    perftools_inline!{
+    /// High-level exporter to extract the high 16 bits from a little-endian slice.
+    fn hi16(&self) -> (u16, bool) {
+        match self.len() {
+            0 => (0, false),
+            1 => self.hi16_1(),
+            _ => self.hi16_2(),
+        }
+    }}
+}
+
+impl Hi16<u16> for [u16] {
+    perftools_inline!{
+    fn hi16_1(&self) -> (u16, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0];
+        u16_to_hi16_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi16_2(&self) -> (u16, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0];
+        let r1 = rview[1];
+        let (v, n) = u16_to_hi16_2(r0, r1);
+        (v, n || nonzero(self, 2))
+    }}
+}
+
+impl Hi16<u32> for [u32] {
+    perftools_inline!{
+    fn hi16_1(&self) -> (u16, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0];
+        u32_to_hi16_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi16_2(&self) -> (u16, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0];
+        let r1 = rview[1];
+        let (v, n) = u32_to_hi16_2(r0, r1);
+        (v, n || nonzero(self, 2))
+    }}
+}
+
+impl Hi16<u64> for [u64] {
+    perftools_inline!{
+    fn hi16_1(&self) -> (u16, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0];
+        u64_to_hi16_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi16_2(&self) -> (u16, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0];
+        let r1 = rview[1];
+        let (v, n) = u64_to_hi16_2(r0, r1);
+        (v, n || nonzero(self, 2))
+    }}
+}
+
+// HI32
+
+perftools_inline!{
+/// Shift 32-bit integer to high 32-bits.
+fn u32_to_hi32_1(r0: u32) -> (u32, bool) {
+    debug_assert!(r0 != 0);
+    let ls = r0.leading_zeros();
+    (r0 << ls, false)
+}}
+
+perftools_inline!{
+/// Shift 2 32-bit integers to high 32-bits.
+fn u32_to_hi32_2(r0: u32, r1: u32) -> (u32, bool) {
+    debug_assert!(r0 != 0);
+    let ls = r0.leading_zeros();
+    let rs = 32 - ls;
+    let v = match ls {
+        0 => r0,
+        _ => (r0 << ls) | (r1 >> rs),
+    };
+    let n = r1 << ls != 0;
+    (v, n)
+}}
+
+perftools_inline!{
+/// Shift 64-bit integer to high 32-bits.
+fn u64_to_hi32_1(r0: u64) -> (u32, bool) {
+    let r0 = u64_to_hi64_1(r0).0;
+    ((r0 >> 32).as_u32(), r0.as_u32() != 0)
+}}
+
+perftools_inline!{
+/// Shift 2 64-bit integers to high 32-bits.
+fn u64_to_hi32_2(r0: u64, r1: u64) -> (u32, bool) {
+    let (r0, n) = u64_to_hi64_2(r0, r1);
+    ((r0 >> 32).as_u32(), n || r0.as_u32() != 0)
+}}
+
+/// Trait to export the high 32-bits from a little-endian slice.
+trait Hi32<T>: SliceLike<T> {
+    /// Get the hi32 bits from a 1-limb slice.
+    fn hi32_1(&self) -> (u32, bool);
+
+    /// Get the hi32 bits from a 2-limb slice.
+    fn hi32_2(&self) -> (u32, bool);
+
+    /// Get the hi32 bits from a 3-limb slice.
+    fn hi32_3(&self) -> (u32, bool);
+
+    perftools_inline!{
+    /// High-level exporter to extract the high 32 bits from a little-endian slice.
+    fn hi32(&self) -> (u32, bool) {
+        match self.len() {
+            0 => (0, false),
+            1 => self.hi32_1(),
+            2 => self.hi32_2(),
+            _ => self.hi32_3(),
+        }
+    }}
+}
+
+impl Hi32<u16> for [u16] {
+    perftools_inline!{
+    fn hi32_1(&self) -> (u32, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        u32_to_hi32_1(rview[0].as_u32())
+    }}
+
+    perftools_inline!{
+    fn hi32_2(&self) -> (u32, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0].as_u32() << 16;
+        let r1 = rview[1].as_u32();
+        u32_to_hi32_1(r0 | r1)
+    }}
+
+    perftools_inline!{
+    fn hi32_3(&self) -> (u32, bool) {
+        debug_assert!(self.len() >= 3);
+        let rview = self.rview();
+        let r0 = rview[0].as_u32();
+        let r1 = rview[1].as_u32() << 16;
+        let r2 = rview[2].as_u32();
+        let (v, n) = u32_to_hi32_2( r0, r1 | r2);
+        (v, n || nonzero(self, 3))
+    }}
+}
+
+impl Hi32<u32> for [u32] {
+    perftools_inline!{
+    fn hi32_1(&self) -> (u32, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0];
+        u32_to_hi32_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi32_2(&self) -> (u32, bool) {
+        debug_assert!(self.len() >= 2);
+        let rview = self.rview();
+        let r0 = rview[0];
+        let r1 = rview[1];
+        let (v, n) = u32_to_hi32_2(r0, r1);
+        (v, n || nonzero(self, 2))
+    }}
+
+    perftools_inline!{
+    fn hi32_3(&self) -> (u32, bool) {
+        self.hi32_2()
+    }}
+}
+
+impl Hi32<u64> for [u64] {
+    perftools_inline!{
+    fn hi32_1(&self) -> (u32, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0];
+        u64_to_hi32_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi32_2(&self) -> (u32, bool) {
+        debug_assert!(self.len() >= 2);
+        let rview = self.rview();
+        let r0 = rview[0];
+        let r1 = rview[1];
+        let (v, n) = u64_to_hi32_2(r0, r1);
+        (v, n || nonzero(self, 2))
+    }}
+
+    perftools_inline!{
+    fn hi32_3(&self) -> (u32, bool) {
+        self.hi32_2()
+    }}
+}
+
+// HI64
+
+perftools_inline!{
+/// Shift 64-bit integer to high 64-bits.
+fn u64_to_hi64_1(r0: u64) -> (u64, bool) {
+    debug_assert!(r0 != 0);
+    let ls = r0.leading_zeros();
+    (r0 << ls, false)
+}}
+
+perftools_inline!{
+/// Shift 2 64-bit integers to high 64-bits.
+fn u64_to_hi64_2(r0: u64, r1: u64) -> (u64, bool) {
+    debug_assert!(r0 != 0);
+    let ls = r0.leading_zeros();
+    let rs = 64 - ls;
+    let v = match ls {
+        0 => r0,
+        _ => (r0 << ls) | (r1 >> rs),
+    };
+    let n = r1 << ls != 0;
+    (v, n)
+}}
+
+/// Trait to export the high 64-bits from a little-endian slice.
+trait Hi64<T>: SliceLike<T> {
+    /// Get the hi64 bits from a 1-limb slice.
+    fn hi64_1(&self) -> (u64, bool);
+
+    /// Get the hi64 bits from a 2-limb slice.
+    fn hi64_2(&self) -> (u64, bool);
+
+    /// Get the hi64 bits from a 3-limb slice.
+    fn hi64_3(&self) -> (u64, bool);
+
+    /// Get the hi64 bits from a 4-limb slice.
+    fn hi64_4(&self) -> (u64, bool);
+
+    /// Get the hi64 bits from a 5-limb slice.
+    fn hi64_5(&self) -> (u64, bool);
+
+    perftools_inline!{
+    /// High-level exporter to extract the high 64 bits from a little-endian slice.
+    fn hi64(&self) -> (u64, bool) {
+        match self.len() {
+            0 => (0, false),
+            1 => self.hi64_1(),
+            2 => self.hi64_2(),
+            3 => self.hi64_3(),
+            4 => self.hi64_4(),
+            _ => self.hi64_5(),
+        }
+    }}
+}
+
+impl Hi64<u16> for [u16] {
+    perftools_inline!{
+    fn hi64_1(&self) -> (u64, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0].as_u64();
+        u64_to_hi64_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi64_2(&self) -> (u64, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0].as_u64() << 16;
+        let r1 = rview[1].as_u64();
+        u64_to_hi64_1(r0 | r1)
+    }}
+
+    perftools_inline!{
+    fn hi64_3(&self) -> (u64, bool) {
+        debug_assert!(self.len() == 3);
+        let rview = self.rview();
+        let r0 = rview[0].as_u64() << 32;
+        let r1 = rview[1].as_u64() << 16;
+        let r2 = rview[2].as_u64();
+        u64_to_hi64_1(r0 | r1 | r2)
+    }}
+
+    perftools_inline!{
+    fn hi64_4(&self) -> (u64, bool) {
+        debug_assert!(self.len() == 4);
+        let rview = self.rview();
+        let r0 = rview[0].as_u64() << 48;
+        let r1 = rview[1].as_u64() << 32;
+        let r2 = rview[2].as_u64() << 16;
+        let r3 = rview[3].as_u64();
+        u64_to_hi64_1(r0 | r1 | r2 | r3)
+    }}
+
+    perftools_inline!{
+    fn hi64_5(&self) -> (u64, bool) {
+        debug_assert!(self.len() >= 5);
+        let rview = self.rview();
+        let r0 = rview[0].as_u64();
+        let r1 = rview[1].as_u64() << 48;
+        let r2 = rview[2].as_u64() << 32;
+        let r3 = rview[3].as_u64() << 16;
+        let r4 = rview[4].as_u64();
+        let (v, n) = u64_to_hi64_2(r0, r1 | r2 | r3 | r4);
+        (v, n || nonzero(self, 5))
+    }}
+}
+
+impl Hi64<u32> for [u32] {
+    perftools_inline!{
+    fn hi64_1(&self) -> (u64, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0].as_u64();
+        u64_to_hi64_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi64_2(&self) -> (u64, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0].as_u64() << 32;
+        let r1 = rview[1].as_u64();
+        u64_to_hi64_1(r0 | r1)
+    }}
+
+    perftools_inline!{
+    fn hi64_3(&self) -> (u64, bool) {
+        debug_assert!(self.len() >= 3);
+        let rview = self.rview();
+        let r0 = rview[0].as_u64();
+        let r1 = rview[1].as_u64() << 32;
+        let r2 = rview[2].as_u64();
+        let (v, n) = u64_to_hi64_2(r0, r1 | r2);
+        (v, n || nonzero(self, 3))
+    }}
+
+    perftools_inline!{
+    fn hi64_4(&self) -> (u64, bool) {
+        self.hi64_3()
+    }}
+
+    perftools_inline!{
+    fn hi64_5(&self) -> (u64, bool) {
+        self.hi64_3()
+    }}
+}
+
+impl Hi64<u64> for [u64] {
+    perftools_inline!{
+    fn hi64_1(&self) -> (u64, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0];
+        u64_to_hi64_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi64_2(&self) -> (u64, bool) {
+        debug_assert!(self.len() >= 2);
+        let rview = self.rview();
+        let r0 = rview[0];
+        let r1 = rview[1];
+        let (v, n) = u64_to_hi64_2(r0, r1);
+        (v, n || nonzero(self, 2))
+    }}
+
+    perftools_inline!{
+    fn hi64_3(&self) -> (u64, bool) {
+        self.hi64_2()
+    }}
+
+    perftools_inline!{
+    fn hi64_4(&self) -> (u64, bool) {
+        self.hi64_2()
+    }}
+
+    perftools_inline!{
+    fn hi64_5(&self) -> (u64, bool) {
+        self.hi64_2()
+    }}
+}
+
+// HI128
+
+perftools_inline!{
+/// Shift 128-bit integer to high 128-bits.
+fn u128_to_hi128_1(r0: u128) -> (u128, bool) {
+    let ls = r0.leading_zeros();
+    (r0 << ls, false)
+}}
+
+perftools_inline!{
+/// Shift 2 128-bit integers to high 128-bits.
+fn u128_to_hi128_2(r0: u128, r1: u128) -> (u128, bool) {
+    let ls = r0.leading_zeros();
+    let rs = 128 - ls;
+    let v = (r0 << ls) | (r1 >> rs);
+    let n = r1 << ls != 0;
+    (v, n)
+}}
+
+/// Trait to export the high 128-bits from a little-endian slice.
+trait Hi128<T>: SliceLike<T> {
+    /// Get the hi128 bits from a 1-limb slice.
+    fn hi128_1(&self) -> (u128, bool);
+
+    /// Get the hi128 bits from a 2-limb slice.
+    fn hi128_2(&self) -> (u128, bool);
+
+    /// Get the hi128 bits from a 3-limb slice.
+    fn hi128_3(&self) -> (u128, bool);
+
+    /// Get the hi128 bits from a 4-limb slice.
+    fn hi128_4(&self) -> (u128, bool);
+
+    /// Get the hi128 bits from a 5-limb slice.
+    fn hi128_5(&self) -> (u128, bool);
+
+    /// Get the hi128 bits from a 5-limb slice.
+    fn hi128_6(&self) -> (u128, bool);
+
+    /// Get the hi128 bits from a 5-limb slice.
+    fn hi128_7(&self) -> (u128, bool);
+
+    /// Get the hi128 bits from a 5-limb slice.
+    fn hi128_8(&self) -> (u128, bool);
+
+    /// Get the hi128 bits from a 5-limb slice.
+    fn hi128_9(&self) -> (u128, bool);
+
+    perftools_inline!{
+    /// High-level exporter to extract the high 128 bits from a little-endian slice.
+    fn hi128(&self) -> (u128, bool) {
+        match self.len() {
+            0 => (0, false),
+            1 => self.hi128_1(),
+            2 => self.hi128_2(),
+            3 => self.hi128_3(),
+            4 => self.hi128_4(),
+            6 => self.hi128_6(),
+            7 => self.hi128_7(),
+            8 => self.hi128_8(),
+            _ => self.hi128_9(),
+        }
+    }}
+}
+
+impl Hi128<u16> for [u16] {
+    perftools_inline!{
+    fn hi128_1(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128();
+        u128_to_hi128_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi128_2(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 16;
+        let r1 = rview[1].as_u128();
+        u128_to_hi128_1(r0 | r1)
+    }}
+
+    perftools_inline!{
+    fn hi128_3(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 3);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 32;
+        let r1 = rview[1].as_u128() << 16;
+        let r2 = rview[2].as_u128();
+        u128_to_hi128_1(r0 | r1 | r2)
+    }}
+
+    perftools_inline!{
+    fn hi128_4(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 4);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 48;
+        let r1 = rview[1].as_u128() << 32;
+        let r2 = rview[2].as_u128() << 16;
+        let r3 = rview[3].as_u128();
+        u128_to_hi128_1(r0 | r1 | r2 | r3)
+    }}
+
+    perftools_inline!{
+    fn hi128_5(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 5);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 64;
+        let r1 = rview[1].as_u128() << 48;
+        let r2 = rview[2].as_u128() << 32;
+        let r3 = rview[3].as_u128() << 16;
+        let r4 = rview[4].as_u128();
+        u128_to_hi128_1(r0 | r1 | r2 | r3 | r4)
+    }}
+
+    perftools_inline!{
+    fn hi128_6(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 6);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 80;
+        let r1 = rview[1].as_u128() << 64;
+        let r2 = rview[2].as_u128() << 48;
+        let r3 = rview[3].as_u128() << 32;
+        let r4 = rview[4].as_u128() << 16;
+        let r5 = rview[5].as_u128();
+        u128_to_hi128_1(r0 | r1 | r2 | r3 | r4 | r5)
+    }}
+
+    perftools_inline!{
+    fn hi128_7(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 7);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 96;
+        let r1 = rview[1].as_u128() << 80;
+        let r2 = rview[2].as_u128() << 64;
+        let r3 = rview[3].as_u128() << 48;
+        let r4 = rview[4].as_u128() << 32;
+        let r5 = rview[5].as_u128() << 16;
+        let r6 = rview[6].as_u128();
+        u128_to_hi128_1(r0 | r1 | r2 | r3 | r4 | r5 | r6)
+    }}
+
+    perftools_inline!{
+    fn hi128_8(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 8);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 112;
+        let r1 = rview[1].as_u128() << 96;
+        let r2 = rview[2].as_u128() << 80;
+        let r3 = rview[3].as_u128() << 64;
+        let r4 = rview[4].as_u128() << 48;
+        let r5 = rview[5].as_u128() << 32;
+        let r6 = rview[6].as_u128() << 16;
+        let r7 = rview[7].as_u128();
+        u128_to_hi128_1(r0 | r1 | r2 | r3 | r4 | r5 | r6 | r7)
+    }}
+
+    perftools_inline!{
+    fn hi128_9(&self) -> (u128, bool) {
+        debug_assert!(self.len() >= 9);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128();
+        let r1 = rview[1].as_u128() << 112;
+        let r2 = rview[2].as_u128() << 96;
+        let r3 = rview[3].as_u128() << 80;
+        let r4 = rview[4].as_u128() << 64;
+        let r5 = rview[5].as_u128() << 48;
+        let r6 = rview[6].as_u128() << 32;
+        let r7 = rview[7].as_u128() << 16;
+        let r8 = rview[8].as_u128();
+        let (v, n) = u128_to_hi128_2(r0, r1 | r2 | r3 | r4 | r5 | r6 | r7 | r8);
+        (v, n || nonzero(self, 9))
+    }}
+}
+
+impl Hi128<u32> for [u32] {
+    perftools_inline!{
+    fn hi128_1(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128();
+        u128_to_hi128_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi128_2(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 32;
+        let r1 = rview[1].as_u128();
+        u128_to_hi128_1(r0 | r1)
+    }}
+
+    perftools_inline!{
+    fn hi128_3(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 3);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 64;
+        let r1 = rview[1].as_u128() << 32;
+        let r2 = rview[2].as_u128();
+        u128_to_hi128_1(r0 | r1 | r2)
+    }}
+
+    perftools_inline!{
+    fn hi128_4(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 4);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 96;
+        let r1 = rview[1].as_u128() << 64;
+        let r2 = rview[2].as_u128() << 32;
+        let r3 = rview[3].as_u128();
+        u128_to_hi128_1(r0 | r1 | r2 | r3)
+    }}
+
+    perftools_inline!{
+    fn hi128_5(&self) -> (u128, bool) {
+        debug_assert!(self.len() >= 5);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128();
+        let r1 = rview[1].as_u128() << 96;
+        let r2 = rview[2].as_u128() << 64;
+        let r3 = rview[3].as_u128() << 32;
+        let r4 = rview[4].as_u128();
+        let (v, n) = u128_to_hi128_2(r0, r1 | r2 | r3 | r4);
+        (v, n || nonzero(self, 5))
+    }}
+
+    perftools_inline!{
+    fn hi128_6(&self) -> (u128, bool) {
+        self.hi128_5()
+    }}
+
+    perftools_inline!{
+    fn hi128_7(&self) -> (u128, bool) {
+        self.hi128_5()
+    }}
+
+    perftools_inline!{
+    fn hi128_8(&self) -> (u128, bool) {
+        self.hi128_5()
+    }}
+
+    perftools_inline!{
+    fn hi128_9(&self) -> (u128, bool) {
+        self.hi128_5()
+    }}
+}
+
+impl Hi128<u64> for [u64] {
+    perftools_inline!{
+    fn hi128_1(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 1);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128();
+        u128_to_hi128_1(r0)
+    }}
+
+    perftools_inline!{
+    fn hi128_2(&self) -> (u128, bool) {
+        debug_assert!(self.len() == 2);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128() << 64;
+        let r1 = rview[1].as_u128();
+        u128_to_hi128_1(r0 | r1)
+    }}
+
+    perftools_inline!{
+    fn hi128_3(&self) -> (u128, bool) {
+        debug_assert!(self.len() >= 3);
+        let rview = self.rview();
+        let r0 = rview[0].as_u128();
+        let r1 = rview[1].as_u128() << 64;
+        let r2 = rview[2].as_u128();
+        let (v, n) = u128_to_hi128_2(r0, r1 | r2);
+        (v, n || nonzero(self, 3))
+    }}
+
+    perftools_inline!{
+    fn hi128_4(&self) -> (u128, bool) {
+        self.hi128_3()
+    }}
+
+    perftools_inline!{
+    fn hi128_5(&self) -> (u128, bool) {
+        self.hi128_3()
+    }}
+
+    perftools_inline!{
+    fn hi128_6(&self) -> (u128, bool) {
+        self.hi128_3()
+    }}
+
+    perftools_inline!{
+    fn hi128_7(&self) -> (u128, bool) {
+        self.hi128_3()
+    }}
+
+    perftools_inline!{
+    fn hi128_8(&self) -> (u128, bool) {
+        self.hi128_3()
+    }}
+
+    perftools_inline!{
+    fn hi128_9(&self) -> (u128, bool) {
+        self.hi128_3()
+    }}
+}
+
+// SCALAR
+// ------
+
+// Scalar-to-scalar operations, for building-blocks for arbitrary-precision
+// operations.
+
+pub(in crate::atof::algorithm) mod scalar {
+
+use super::*;
+
+// ADDITION
+
+perftools_inline!{
+/// Add two small integers and return the resulting value and if overflow happens.
+pub fn add(x: Limb, y: Limb)
+    -> (Limb, bool)
+{
+    x.overflowing_add(y)
+}}
+
+perftools_inline!{
+/// AddAssign two small integers and return if overflow happens.
+pub fn iadd(x: &mut Limb, y: Limb)
+    -> bool
+{
+    let t = add(*x, y);
+    *x = t.0;
+    t.1
+}}
+
+// SUBTRACTION
+
+perftools_inline!{
+/// Subtract two small integers and return the resulting value and if overflow happens.
+pub fn sub(x: Limb, y: Limb)
+    -> (Limb, bool)
+{
+    x.overflowing_sub(y)
+}}
+
+perftools_inline!{
+/// SubAssign two small integers and return if overflow happens.
+pub fn isub(x: &mut Limb, y: Limb)
+    -> bool
+{
+    let t = sub(*x, y);
+    *x = t.0;
+    t.1
+}}
+
+// MULTIPLICATION
+
+perftools_inline!{
+/// Multiply two small integers (with carry) (and return the overflow contribution).
+///
+/// Returns the (low, high) components.
+pub fn mul(x: Limb, y: Limb, carry: Limb)
+    -> (Limb, Limb)
+{
+    // Cannot overflow, as long as wide is 2x as wide. This is because
+    // the following is always true:
+    // `Wide::max_value() - (Narrow::max_value() * Narrow::max_value()) >= Narrow::max_value()`
+    let z: Wide = as_wide(x) * as_wide(y) + as_wide(carry);
+    (as_limb(z), as_limb(z >> <Limb as Integer>::BITS))
+}}
+
+perftools_inline!{
+/// Multiply two small integers (with carry) (and return if overflow happens).
+pub fn imul(x: &mut Limb, y: Limb, carry: Limb)
+    -> Limb
+{
+    let t = mul(*x, y, carry);
+    *x = t.0;
+    t.1
+}}
+
+// DIVISION
+
+perftools_inline!{
+/// Divide two small integers (with remainder) (and return the remainder contribution).
+///
+/// Returns the (value, remainder) components.
+pub fn div(x: Limb, y: Limb, rem: Limb)
+    -> (Limb, Limb)
+{
+    // Cannot overflow, as long as wide is 2x as wide.
+    let x = as_wide(x) | (as_wide(rem) << <Limb as Integer>::BITS);
+    let y = as_wide(y);
+    (as_limb(x / y), as_limb(x % y))
+}}
+
+perftools_inline!{
+/// DivAssign two small integers and return the remainder.
+pub fn idiv(x: &mut Limb, y: Limb, rem: Limb)
+    -> Limb
+{
+    let t = div(*x, y, rem);
+    *x = t.0;
+    t.1
+}}
+
+}   // scalar
+
+// SMALL
+// -----
+
+// Large-to-small operations, to modify a big integer from a native scalar.
+
+pub(in crate::atof::algorithm) mod small {
+
+use crate::lib::iter;
+use super::*;
+use super::super::small_powers::*;
+use super::super::large_powers::*;
+
+// PROPERTIES
+
+perftools_inline!{
+/// Get the number of leading zero values in the storage.
+/// Assumes the value is normalized.
+pub fn leading_zero_limbs(_: &[Limb]) -> usize {
+    0
+}}
+
+perftools_inline!{
+/// Get the number of trailing zero values in the storage.
+/// Assumes the value is normalized.
+pub fn trailing_zero_limbs(x: &[Limb]) -> usize {
+    let mut iter = x.iter().enumerate();
+    let opt = iter.find(|&tup| !tup.1.is_zero());
+    let value = opt
+        .map(|t| t.0)
+        .unwrap_or(x.len());
+
+    value
+}}
+
+perftools_inline!{
+/// Get number of leading zero bits in the storage.
+pub fn leading_zeros(x: &[Limb]) -> usize {
+    if x.is_empty() {
+        0
+    } else {
+        x.rindex(0).leading_zeros().as_usize()
+    }
+}}
+
+perftools_inline!{
+/// Get number of trailing zero bits in the storage.
+/// Assumes the value is normalized.
+pub fn trailing_zeros(x: &[Limb]) -> usize {
+    // Get the index of the last non-zero value
+    let index = trailing_zero_limbs(x);
+    let mut count = index.saturating_mul(<Limb as Integer>::BITS);
+    if let Some(value) = x.get(index) {
+        count = count.saturating_add(value.trailing_zeros().as_usize());
+    }
+    count
+}}
+
+// BIT LENGTH
+
+perftools_inline!{
+/// Calculate the bit-length of the big-integer.
+pub fn bit_length(x: &[Limb]) -> usize {
+    // Avoid overflowing, calculate via total number of bits
+    // minus leading zero bits.
+    let nlz = leading_zeros(x);
+    <Limb as Integer>::BITS.checked_mul(x.len())
+        .map(|v| v - nlz)
+        .unwrap_or(usize::max_value())
+}}
+
+// BIT LENGTH
+
+perftools_inline!{
+/// Calculate the limb-length of the big-integer.
+pub fn limb_length(x: &[Limb]) -> usize {
+    x.len()
+}}
+
+// SHR
+
+perftools_inline!{
+/// Shift-right bits inside a buffer and returns the truncated bits.
+///
+/// Returns the truncated bits.
+///
+/// Assumes `n < <Limb as Integer>::BITS`, IE, internally shifting bits.
+pub fn ishr_bits<T>(x: &mut T, n: usize)
+    -> Limb
+    where T: CloneableVecLike<Limb>
+{
+    // Need to shift by the number of `bits % <Limb as Integer>::BITS`.
+    let bits = <Limb as Integer>::BITS;
+    debug_assert!(n < bits && n != 0);
+
+    // Internally, for each item, we shift left by n, and add the previous
+    // right shifted limb-bits.
+    // For example, we transform (for u8) shifted right 2, to:
+    //      b10100100 b01000010
+    //        b101001 b00010000
+    let lshift = bits - n;
+    let rshift = n;
+    let mut prev: Limb = 0;
+    for xi in x.iter_mut().rev() {
+        let tmp = *xi;
+        *xi >>= rshift;
+        *xi |= prev << lshift;
+        prev = tmp;
+    }
+
+    prev & lower_n_mask(as_limb(rshift))
+}}
+
+perftools_inline!{
+/// Shift-right `n` limbs inside a buffer and returns if all the truncated limbs are zero.
+///
+/// Assumes `n` is not 0.
+pub fn ishr_limbs<T>(x: &mut T, n: usize)
+    -> bool
+    where T: CloneableVecLike<Limb>
+{
+    debug_assert!(n != 0);
+
+    if n >= x.len() {
+        x.clear();
+        false
+    } else {
+        let is_zero = (&x[..n]).iter().all(|v| v.is_zero());
+        x.remove_many(0..n);
+        is_zero
+    }
+}}
+
+perftools_inline!{
+/// Shift-left buffer by n bits and return if we should round-up.
+pub fn ishr<T>(x: &mut T, n: usize)
+    -> bool
+    where T: CloneableVecLike<Limb>
+{
+    let bits = <Limb as Integer>::BITS;
+    // Need to pad with zeros for the number of `bits / <Limb as Integer>::BITS`,
+    // and shift-left with carry for `bits % <Limb as Integer>::BITS`.
+    let rem = n % bits;
+    let div = n / bits;
+    let is_zero = match div.is_zero() {
+        true  => true,
+        false => ishr_limbs(x, div),
+    };
+    let truncated = match rem.is_zero() {
+        true  => 0,
+        false => ishr_bits(x, rem),
+    };
+
+    // Calculate if we need to roundup.
+    let roundup = {
+        let halfway = lower_n_halfway(as_limb(rem));
+        if truncated > halfway {
+            // Above halfway
+            true
+        } else if truncated == halfway {
+            // Exactly halfway, if !is_zero, we have a tie-breaker,
+            // otherwise, we follow round-to-nearest, tie-even rules.
+            // Cannot be empty, since truncated is non-zero.
+            !is_zero || x[0].is_odd()
+        } else {
+            // Below halfway
+            false
+        }
+    };
+
+    // Normalize the data
+    normalize(x);
+
+    roundup
+}}
+
+perftools_inline!{
+/// Shift-left buffer by n bits.
+pub fn shr<T>(x: &[Limb], n: usize)
+    -> (T, bool)
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    let roundup = ishr(&mut z, n);
+    (z, roundup)
+}}
+
+// SHL
+
+perftools_inline!{
+/// Shift-left bits inside a buffer.
+///
+/// Assumes `n < <Limb as Integer>::BITS`, IE, internally shifting bits.
+pub fn ishl_bits<T>(x: &mut T, n: usize)
+    where T: CloneableVecLike<Limb>
+{
+    // Need to shift by the number of `bits % <Limb as Integer>::BITS)`.
+    let bits = <Limb as Integer>::BITS;
+    debug_assert!(n < bits);
+    if n.is_zero() {
+        return;
+    }
+
+    // Internally, for each item, we shift left by n, and add the previous
+    // right shifted limb-bits.
+    // For example, we transform (for u8) shifted left 2, to:
+    //      b10100100 b01000010
+    //      b10 b10010001 b00001000
+    let rshift = bits - n;
+    let lshift = n;
+    let mut prev: Limb = 0;
+    for xi in x.iter_mut() {
+        let tmp = *xi;
+        *xi <<= lshift;
+        *xi |= prev >> rshift;
+        prev = tmp;
+    }
+
+    // Always push the carry, even if it creates a non-normal result.
+    let carry = prev >> rshift;
+    if carry != 0 {
+        x.push(carry);
+    }
+}}
+
+perftools_inline!{
+/// Shift-left bits inside a buffer.
+///
+/// Assumes `n < <Limb as Integer>::BITS`, IE, internally shifting bits.
+pub fn shl_bits<T>(x: &[Limb], n: usize)
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    ishl_bits(&mut z, n);
+    z
+}}
+
+perftools_inline!{
+/// Shift-left `n` digits inside a buffer.
+///
+/// Assumes `n` is not 0.
+pub fn ishl_limbs<T>(x: &mut T, n: usize)
+    where T: CloneableVecLike<Limb>
+{
+    debug_assert!(n != 0);
+    if !x.is_empty() {
+        x.insert_many(0, iter::repeat(0).take(n));
+    }
+}}
+
+perftools_inline!{
+/// Shift-left buffer by n bits.
+pub fn ishl<T>(x: &mut T, n: usize)
+    where T: CloneableVecLike<Limb>
+{
+    let bits = <Limb as Integer>::BITS;
+    // Need to pad with zeros for the number of `bits / <Limb as Integer>::BITS`,
+    // and shift-left with carry for `bits % <Limb as Integer>::BITS`.
+    let rem = n % bits;
+    let div = n / bits;
+    ishl_bits(x, rem);
+    if !div.is_zero() {
+        ishl_limbs(x, div);
+    }
+}}
+
+perftools_inline!{
+/// Shift-left buffer by n bits.
+pub fn shl<T>(x: &[Limb], n: usize)
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    ishl(&mut z, n);
+    z
+}}
+
+// NORMALIZE
+
+perftools_inline!{
+/// Normalize the container by popping any leading zeros.
+pub fn normalize<T>(x: &mut T)
+    where T: CloneableVecLike<Limb>
+{
+    // Remove leading zero if we cause underflow. Since we're dividing
+    // by a small power, we have at max 1 int removed.
+    while !x.is_empty() && x.rindex(0).is_zero() {
+        x.pop();
+    }
+}}
+
+// ADDITION
+
+perftools_inline!{
+/// Implied AddAssign implementation for adding a small integer to bigint.
+///
+/// Allows us to choose a start-index in x to store, to allow incrementing
+/// from a non-zero start.
+pub fn iadd_impl<T>(x: &mut T, y: Limb, xstart: usize)
+    where T: CloneableVecLike<Limb>
+{
+    if x.len() <= xstart {
+        x.push(y);
+    } else {
+        // Initial add
+        let mut carry = scalar::iadd(&mut x[xstart], y);
+
+        // Increment until overflow stops occurring.
+        let mut size = xstart + 1;
+        while carry && size < x.len() {
+            carry = scalar::iadd(&mut x[size], 1);
+            size += 1;
+        }
+
+        // If we overflowed the buffer entirely, need to add 1 to the end
+        // of the buffer.
+        if carry {
+            x.push(1);
+        }
+    }
+}}
+
+perftools_inline!{
+/// AddAssign small integer to bigint.
+pub fn iadd<T>(x: &mut T, y: Limb)
+    where T: CloneableVecLike<Limb>
+{
+    iadd_impl(x, y, 0);
+}}
+
+perftools_inline!{
+/// Add small integer to bigint.
+pub fn add<T>(x: &[Limb], y: Limb)
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    iadd(&mut z, y);
+    z
+}}
+
+// SUBTRACTION
+
+perftools_inline!{
+/// SubAssign small integer to bigint.
+/// Does not do overflowing subtraction.
+pub fn isub_impl<T>(x: &mut T, y: Limb, xstart: usize)
+    where T: CloneableVecLike<Limb>
+{
+    debug_assert!(x.len() > xstart && (x[xstart] >= y || x.len() > xstart+1));
+
+    // Initial subtraction
+    let mut carry = scalar::isub(&mut x[xstart], y);
+
+    // Increment until overflow stops occurring.
+    let mut size = xstart + 1;
+    while carry && size < x.len() {
+        carry = scalar::isub(&mut x[size], 1);
+        size += 1;
+    }
+    normalize(x);
+}}
+
+perftools_inline!{
+/// SubAssign small integer to bigint.
+/// Does not do overflowing subtraction.
+pub fn isub<T>(x: &mut T, y: Limb)
+    where T: CloneableVecLike<Limb>
+{
+    isub_impl(x, y, 0);
+}}
+
+perftools_inline!{
+/// Sub small integer to bigint.
+pub fn sub<T>(x: &[Limb], y: Limb)
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    isub(&mut z, y);
+    z
+}}
+
+// MULTIPLICATION
+
+perftools_inline!{
+/// MulAssign small integer to bigint.
+pub fn imul<T>(x: &mut T, y: Limb)
+    where T: CloneableVecLike<Limb>
+{
+    // Multiply iteratively over all elements, adding the carry each time.
+    let mut carry: Limb = 0;
+    for xi in x.iter_mut() {
+        carry = scalar::imul(xi, y, carry);
+    }
+
+    // Overflow of value, add to end.
+    if carry != 0 {
+        x.push(carry);
+    }
+}}
+
+perftools_inline!{
+/// Mul small integer to bigint.
+pub fn mul<T>(x: &[Limb], y: Limb)
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    imul(&mut z, y);
+    z
+}}
+
+/// MulAssign by a power.
+///
+/// Theoretically...
+///
+/// Use an exponentiation by squaring method, since it reduces the time
+/// complexity of the multiplication to ~`O(log(n))` for the squaring,
+/// and `O(n*m)` for the result. Since `m` is typically a lower-order
+/// factor, this significantly reduces the number of multiplications
+/// we need to do. Iteratively multiplying by small powers follows
+/// the nth triangular number series, which scales as `O(p^2)`, but
+/// where `p` is `n+m`. In short, it scales very poorly.
+///
+/// Practically....
+///
+/// Exponentiation by Squaring:
+///     running 2 tests
+///     test bigcomp_f32_lexical ... bench:       1,018 ns/iter (+/- 78)
+///     test bigcomp_f64_lexical ... bench:       3,639 ns/iter (+/- 1,007)
+///
+/// Exponentiation by Iterative Small Powers:
+///     running 2 tests
+///     test bigcomp_f32_lexical ... bench:         518 ns/iter (+/- 31)
+///     test bigcomp_f64_lexical ... bench:         583 ns/iter (+/- 47)
+///
+/// Exponentiation by Iterative Large Powers (of 2):
+///     running 2 tests
+///     test bigcomp_f32_lexical ... bench:         671 ns/iter (+/- 31)
+///     test bigcomp_f64_lexical ... bench:       1,394 ns/iter (+/- 47)
+///
+/// Even using worst-case scenarios, exponentiation by squaring is
+/// significantly slower for our workloads. Just multiply by small powers,
+/// in simple cases, and use precalculated large powers in other cases.
+pub fn imul_power<T>(x: &mut T, radix: u32, n: u32)
+    where T: CloneableVecLike<Limb>
+{
+    use super::large::KARATSUBA_CUTOFF;
+
+    let small_powers = get_small_powers(radix);
+    let large_powers = get_large_powers(radix);
+
+    if n == 0 {
+        // No exponent, just return.
+        // The 0-index of the large powers is `2^0`, which is 1, so we want
+        // to make sure we don't take that path with a literal 0.
+        return;
+    }
+
+    // We want to use the asymptotically faster algorithm if we're going
+    // to be using Karabatsu multiplication sometime during the result,
+    // otherwise, just use exponentiation by squaring.
+    let bit_length = 32 - n.leading_zeros().as_usize();
+    debug_assert!(bit_length != 0 && bit_length <= large_powers.len());
+    if x.len() + large_powers[bit_length-1].len() < 2*KARATSUBA_CUTOFF {
+        // We can use iterative small powers to make this faster for the
+        // easy cases.
+
+        // Multiply by the largest small power until n < step.
+        let step = small_powers.len() - 1;
+        let power = small_powers[step];
+        let mut n = n.as_usize();
+        while n >= step {
+            imul(x, power);
+            n -= step;
+        }
+
+        // Multiply by the remainder.
+        imul(x, small_powers[n]);
+    } else {
+        // In theory, this code should be asymptotically a lot faster,
+        // in practice, our small::imul seems to be the limiting step,
+        // and large imul is slow as well.
+
+        // Multiply by higher order powers.
+        let mut idx: usize = 0;
+        let mut bit: usize = 1;
+        let mut n = n.as_usize();
+        while n != 0 {
+            if n & bit != 0 {
+                debug_assert!(idx < large_powers.len());
+                large::imul(x, large_powers[idx]);
+                n ^= bit;
+            }
+            idx += 1;
+            bit <<= 1;
+        }
+    }
+}
+
+perftools_inline!{
+/// Mul by a power.
+pub fn mul_power<T>(x: &[Limb], radix: u32, n: u32)
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    imul_power(&mut z, radix, n);
+    z
+}}
+
+// DIVISION
+
+perftools_inline!{
+/// DivAssign small integer to bigint and get the remainder.
+pub fn idiv<T>(x: &mut T, y: Limb)
+    -> Limb
+    where T: CloneableVecLike<Limb>
+{
+    // Divide iteratively over all elements, adding the carry each time.
+    let mut rem: Limb = 0;
+    for xi in x.iter_mut().rev() {
+        rem = scalar::idiv(xi, y, rem);
+    }
+    normalize(x);
+
+    rem
+}}
+
+perftools_inline!{
+/// Div small integer to bigint and get the remainder.
+pub fn div<T>(x: &[Limb], y: Limb)
+    -> (T, Limb)
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    let rem = idiv(&mut z, y);
+    (z, rem)
+}}
+
+// POWER
+
+perftools_inline!{
+/// Calculate x^n, using exponentiation by squaring.
+///
+/// This algorithm is slow, using `mul_power` should generally be preferred,
+/// as although it's not asymptotically faster, it precalculates a lot
+/// of results.
+pub fn ipow<T>(x: &mut T, mut n: Limb)
+    where T: CloneableVecLike<Limb>
+{
+    // Store `x` as 1, and switch `base` to `x`.
+    let mut base = T::default();
+    base.push(1);
+    mem::swap(x, &mut base);
+
+    // Do main algorithm.
+    loop {
+        if n.is_odd() {
+            large::imul(x, &base);
+        }
+        n /= 2;
+
+        // We need to break as a post-condition, since the real work
+        // is in the `imul` and `mul` algorithms.
+        if n.is_zero() {
+            break;
+        } else {
+            base = large::mul(&base, &base);
+        }
+    }
+}}
+
+perftools_inline!{
+/// Calculate x^n, using exponentiation by squaring.
+pub fn pow<T>(x: &[Limb], n: Limb)
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    ipow(&mut z, n);
+    z
+}}
+
+}   // small
+
+// LARGE
+// -----
+
+// Large-to-large operations, to modify a big integer from a native scalar.
+
+pub(in crate::atof::algorithm) mod large {
+
+use crate::lib::cmp;
+use super::*;
+
+// RELATIVE OPERATORS
+
+perftools_inline!{
+/// Compare `x` to `y`, in little-endian order.
+pub fn compare(x: &[Limb], y: &[Limb]) -> cmp::Ordering {
+    if x.len() > y.len() {
+        return cmp::Ordering::Greater;
+    } else if x.len() < y.len() {
+        return cmp::Ordering::Less;
+    } else {
+        let iter = x.iter().rev().zip(y.iter().rev());
+        for (&xi, &yi) in iter {
+            if xi > yi {
+                return cmp::Ordering::Greater;
+            } else if xi < yi {
+                return cmp::Ordering::Less;
+            }
+        }
+        // Equal case.
+        return cmp::Ordering::Equal;
+    }
+}}
+
+perftools_inline!{
+/// Check if x is greater than y.
+pub fn greater(x: &[Limb], y: &[Limb]) -> bool {
+    compare(x, y) == cmp::Ordering::Greater
+}}
+
+perftools_inline!{
+/// Check if x is greater than or equal to y.
+pub fn greater_equal(x: &[Limb], y: &[Limb]) -> bool {
+    !less(x, y)
+}}
+
+perftools_inline!{
+/// Check if x is less than y.
+pub fn less(x: &[Limb], y: &[Limb]) -> bool {
+    compare(x, y) == cmp::Ordering::Less
+}}
+
+perftools_inline!{
+/// Check if x is less than or equal to y.
+pub fn less_equal(x: &[Limb], y: &[Limb]) -> bool {
+    !greater(x, y)
+}}
+
+perftools_inline!{
+/// Check if x is equal to y.
+/// Slightly optimized for equality comparisons, since it reduces the number
+/// of comparisons relative to `compare`.
+pub fn equal(x: &[Limb], y: &[Limb]) -> bool {
+    let mut iter = x.iter().rev().zip(y.iter().rev());
+    x.len() == y.len() && iter.all(|(&xi, &yi)| xi == yi)
+}}
+
+/// ADDITION
+
+/// Implied AddAssign implementation for bigints.
+///
+/// Allows us to choose a start-index in x to store, so we can avoid
+/// padding the buffer with zeros when not needed, optimized for vectors.
+pub fn iadd_impl<T>(x: &mut T, y: &[Limb], xstart: usize)
+    where T: CloneableVecLike<Limb>
+{
+    // The effective x buffer is from `xstart..x.len()`, so we need to treat
+    // that as the current range. If the effective y buffer is longer, need
+    // to resize to that, + the start index.
+    if y.len() > x.len() - xstart {
+        x.resize(y.len() + xstart, 0);
+    }
+
+    // Iteratively add elements from y to x.
+    let mut carry = false;
+    for (xi, yi) in (&mut x[xstart..]).iter_mut().zip(y.iter()) {
+        // Only one op of the two can overflow, since we added at max
+        // Limb::max_value() + Limb::max_value(). Add the previous carry,
+        // and store the current carry for the next.
+        let mut tmp = scalar::iadd(xi, *yi);
+        if carry {
+            tmp |= scalar::iadd(xi, 1);
+        }
+        carry = tmp;
+    }
+
+    // Overflow from the previous bit.
+    if carry {
+        small::iadd_impl(x, 1, y.len()+xstart);
+    }
+}
+
+perftools_inline!{
+/// AddAssign bigint to bigint.
+pub fn iadd<T>(x: &mut T, y: &[Limb])
+    where T: CloneableVecLike<Limb>
+{
+    iadd_impl(x, y, 0)
+}}
+
+perftools_inline!{
+/// Add bigint to bigint.
+pub fn add<T>(x: &[Limb], y: &[Limb])
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    iadd(&mut z, y);
+    z
+}}
+
+// SUBTRACTION
+
+/// SubAssign bigint to bigint.
+pub fn isub<T>(x: &mut T, y: &[Limb])
+    where T: CloneableVecLike<Limb>
+{
+    // Basic underflow checks.
+    debug_assert!(greater_equal(x, y));
+
+    // Iteratively add elements from y to x.
+    let mut carry = false;
+    for (xi, yi) in x.iter_mut().zip(y.iter()) {
+        // Only one op of the two can overflow, since we added at max
+        // Limb::max_value() + Limb::max_value(). Add the previous carry,
+        // and store the current carry for the next.
+        let mut tmp = scalar::isub(xi, *yi);
+        if carry {
+            tmp |= scalar::isub(xi, 1);
+        }
+        carry = tmp;
+    }
+
+    if carry {
+        small::isub_impl(x, 1, y.len());
+    } else {
+        small::normalize(x);
+    }
+}
+
+perftools_inline!{
+/// Sub bigint to bigint.
+pub fn sub<T>(x: &[Limb], y: &[Limb])
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    isub(&mut z, y);
+    z
+}}
+
+// MULTIPLICATIION
+
+/// Number of digits to bottom-out to asymptotically slow algorithms.
+///
+/// Karatsuba tends to out-perform long-multiplication at ~320-640 bits,
+/// so we go halfway, while Newton division tends to out-perform
+/// Algorithm D at ~1024 bits. We can toggle this for optimal performance.
+pub const KARATSUBA_CUTOFF: usize = 32;
+
+/// Grade-school multiplication algorithm.
+///
+/// Slow, naive algorithm, using limb-bit bases and just shifting left for
+/// each iteration. This could be optimized with numerous other algorithms,
+/// but it's extremely simple, and works in O(n*m) time, which is fine
+/// by me. Each iteration, of which there are `m` iterations, requires
+/// `n` multiplications, and `n` additions, or grade-school multiplication.
+fn long_mul<T>(x: &[Limb], y: &[Limb])
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    // Using the immutable value, multiply by all the scalars in y, using
+    // the algorithm defined above. Use a single buffer to avoid
+    // frequent reallocations. Handle the first case to avoid a redundant
+    // addition, since we know y.len() >= 1.
+    let mut z: T = small::mul(x, y[0]);
+    z.resize(x.len() + y.len(), 0);
+
+    // Handle the iterative cases.
+    for (i, &yi) in y[1..].iter().enumerate() {
+        let zi: T = small::mul(x, yi);
+        iadd_impl(&mut z, &zi, i+1);
+    }
+
+    small::normalize(&mut z);
+
+    z
+}
+
+perftools_inline!{
+/// Split two buffers into halfway, into (lo, hi).
+pub fn karatsuba_split<'a>(z: &'a [Limb], m: usize)
+    -> (&'a [Limb], &'a [Limb])
+{
+    (&z[..m], &z[m..])
+}}
+
+/// Karatsuba multiplication algorithm with roughly equal input sizes.
+///
+/// Assumes `y.len() >= x.len()`.
+fn karatsuba_mul<T>(x: &[Limb], y: &[Limb])
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    if y.len() <= KARATSUBA_CUTOFF {
+        // Bottom-out to long division for small cases.
+        long_mul(x, y)
+    } else if x.len() < y.len() / 2 {
+        karatsuba_uneven_mul(x, y)
+    } else {
+        // Do our 3 multiplications.
+        let m = y.len() / 2;
+        let (xl, xh) = karatsuba_split(x, m);
+        let (yl, yh) = karatsuba_split(y, m);
+        let sumx: T = add(xl, xh);
+        let sumy: T = add(yl, yh);
+        let z0: T = karatsuba_mul(xl, yl);
+        let mut z1: T = karatsuba_mul(&sumx, &sumy);
+        let z2: T = karatsuba_mul(xh, yh);
+        // Properly scale z1, which is `z1 - z2 - zo`.
+        isub(&mut z1, &z2);
+        isub(&mut z1, &z0);
+
+        // Create our result, which is equal to, in little-endian order:
+        // [z0, z1 - z2 - z0, z2]
+        //  z1 must be shifted m digits (2^(32m)) over.
+        //  z2 must be shifted 2*m digits (2^(64m)) over.
+        let mut result = T::default();
+        let len = z0.len().max(m + z1.len()).max(2*m + z2.len());
+        result.reserve_exact(len);
+        result.extend_from_slice(&z0);
+        iadd_impl(&mut result, &z1, m);
+        iadd_impl(&mut result, &z2, 2*m);
+
+        result
+    }
+}
+
+/// Karatsuba multiplication algorithm where y is substantially larger than x.
+///
+/// Assumes `y.len() >= x.len()`.
+fn karatsuba_uneven_mul<T>(x: &[Limb], mut y: &[Limb])
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut result = T::default();
+    result.resize(x.len() + y.len(), 0);
+
+    // This effectively is like grade-school multiplication between
+    // two numbers, except we're using splits on `y`, and the intermediate
+    // step is a Karatsuba multiplication.
+    let mut start = 0;
+    while y.len() != 0 {
+        let m = x.len().min(y.len());
+        let (yl, yh) = karatsuba_split(y, m);
+        let prod: T = karatsuba_mul(x, yl);
+        iadd_impl(&mut result, &prod, start);
+        y = yh;
+        start += m;
+    }
+    small::normalize(&mut result);
+
+    result
+}
+
+perftools_inline!{
+/// Forwarder to the proper Karatsuba algorithm.
+fn karatsuba_mul_fwd<T>(x: &[Limb], y: &[Limb])
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    if x.len() < y.len() {
+        karatsuba_mul(x, y)
+    } else {
+        karatsuba_mul(y, x)
+    }
+}}
+
+perftools_inline!{
+/// MulAssign bigint to bigint.
+pub fn imul<T>(x: &mut T, y: &[Limb])
+    where T: CloneableVecLike<Limb>
+{
+    if y.len() == 1 {
+        small::imul(x, y[0]);
+    } else {
+        // We're not really in a condition where using Karatsuba
+        // multiplication makes sense, so we're just going to use long
+        // division. ~20% speedup compared to:
+        //      *x = karatsuba_mul_fwd(x, y);
+        *x = karatsuba_mul_fwd(x, y);
+    }
+}}
+
+perftools_inline!{
+/// Mul bigint to bigint.
+pub fn mul<T>(x: &[Limb], y: &[Limb])
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    imul(&mut z, y);
+    z
+}}
+
+// DIVISION
+
+/// Constants for algorithm D.
+const ALGORITHM_D_B: Wide = 1 << <Limb as Integer>::BITS;
+const ALGORITHM_D_M: Wide = ALGORITHM_D_B - 1;
+
+/// Calculate qhat (an estimate for the quotient).
+///
+/// This is step D3 in Algorithm D in "The Art of Computer Programming".
+/// Assumes `x.len() > y.len()` and `y.len() >= 2`.
+///
+/// * `j`   - Current index on the iteration of the loop.
+fn calculate_qhat(x: &[Limb], y: &[Limb], j: usize)
+    -> Wide
+{
+    let n = y.len();
+
+    // Estimate qhat of q[j]
+    // Original Code:
+    //  qhat = (x[j+n]*B + x[j+n-1])/y[n-1];
+    //  rhat = (x[j+n]*B + x[j+n-1]) - qhat*y[n-1];
+    let x_jn = as_wide(x[j+n]);
+    let x_jn1 = as_wide(x[j+n-1]);
+    let num = (x_jn << <Limb as Integer>::BITS) + x_jn1;
+    let den = as_wide(y[n-1]);
+    let mut qhat = num / den;
+    let mut rhat = num - qhat * den;
+
+    // Scale qhat and rhat
+    // Original Code:
+    //  again:
+    //    if (qhat >= B || qhat*y[n-2] > B*rhat + x[j+n-2])
+    //    { qhat = qhat - 1;
+    //      rhat = rhat + y[n-1];
+    //      if (rhat < B) goto again;
+    //    }
+    let x_jn2 = as_wide(x[j+n-2]);
+    let y_n2 = as_wide(y[n-2]);
+    let y_n1 = as_wide(y[n-1]);
+    // This only happens when the leading bit of qhat is set.
+    while qhat >= ALGORITHM_D_B || qhat * y_n2 > (rhat << <Limb as Integer>::BITS) + x_jn2 {
+        qhat -= 1;
+        rhat += y_n1;
+        if rhat >= ALGORITHM_D_B {
+            break;
+        }
+    }
+
+    qhat
+}
+
+/// Multiply and subtract.
+///
+/// This is step D4 in Algorithm D in "The Art of Computer Programming",
+/// and returns the remainder.
+fn multiply_and_subtract<T>(x: &mut T, y: &T, qhat: Wide, j: usize)
+    -> SignedWide
+    where T: CloneableVecLike<Limb>
+{
+    let n = y.len();
+
+    // Multiply and subtract
+    // Original Code:
+    //  k = 0;
+    //  for (i = 0; i < n; i++) {
+    //     p = qhat*y[i];
+    //     t = x[i+j] - k - (p & 0xFFFFFFFFLL);
+    //     x[i+j] = t;
+    //     k = (p >> 32) - (t >> 32);
+    //  }
+    //  t = x[j+n] - k;
+    //  x[j+n] = t;
+    let mut k: SignedWide = 0;
+    let mut t: SignedWide;
+    for i in 0..n {
+        let x_ij = as_signed_wide(x[i+j]);
+        let y_i = as_wide(y[i]);
+        let p = qhat * y_i;
+        t = x_ij.wrapping_sub(k).wrapping_sub(as_signed_wide(p & ALGORITHM_D_M));
+        x[i+j] = as_limb(t);
+        k = as_signed_wide(p >> <Limb as Integer>::BITS) - (t >> <Limb as Integer>::BITS);
+    }
+    t = as_signed_wide(x[j+n]) - k;
+    x[j+n] = as_limb(t);
+
+    t
+}
+
+perftools_inline!{
+/// Calculate the quotient from the estimate and the test.
+///
+/// This is a mix of step D5 and D6 in Algorithm D, so the algorithm
+/// may work for single passes, without a quotient buffer.
+fn test_quotient(qhat: Wide, t: SignedWide)
+    -> Wide
+{
+    if t < 0 {
+        qhat - 1
+    } else {
+        qhat
+    }
+}}
+
+/// Add back.
+///
+/// This is step D6 in Algorithm D in "The Art of Computer Programming",
+/// and adds back the remainder on the very unlikely scenario we overestimated
+/// the quotient by 1. Subtract 1 from the quotient, and add back the
+/// remainder.
+///
+/// This step should be specifically debugged, due to its low likelihood,
+/// since the probability is ~2/b, where b in this case is 2^32 or 2^64.
+fn add_back<T>(x: &mut T, y: &T, mut t: SignedWide, j: usize)
+    where T: CloneableVecLike<Limb>
+{
+    let n = y.len();
+
+    // Store quotient digits
+    // If we subtracted too much, add back.
+    // Original Code:
+    //  q[j] = qhat;              // Store quotient digit.
+    //  if (t < 0) {              // If we subtracted too
+    //     q[j] = q[j] - 1;       // much, add back.
+    //     k = 0;
+    //     for (i = 0; i < n; i++) {
+    //        t = (unsigned long long)x[i+j] + y[i] + k;
+    //        x[i+j] = t;
+    //        k = t >> 32;
+    //     }
+    //     x[j+n] = x[j+n] + k;
+    //  }
+    if t < 0 {
+        let mut k: SignedWide = 0;
+        for i in 0..n {
+            t = as_signed_wide(as_wide(x[i+j]) + as_wide(y[i])) + k;
+            x[i+j] = as_limb(t);
+            k = t >> <Limb as Integer>::BITS;
+        }
+        let x_jn = as_signed_wide(x[j+n]) + k;
+        x[j+n] = as_limb(x_jn);
+    }
+}
+
+/// Calculate the remainder from the quotient.
+///
+/// This is step D8 in Algorithm D in "The Art of Computer Programming",
+/// and "unnormalizes" to calculate the remainder from the quotient.
+fn calculate_remainder<T>(x: &[Limb], y: &[Limb], s: usize)
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    // Calculate the remainder.
+    // Original Code:
+    //  for (i = 0; i < n-1; i++)
+    //     r[i] = (x[i] >> s) | ((unsigned long long)x[i+1] << (32-s));
+    //  r[n-1] = x[n-1] >> s;
+    let n = y.len();
+    let mut r = T::default();
+    r.reserve_exact(n);
+    let rs = <Limb as Integer>::BITS - s;
+    for i in 0..n-1 {
+        let xi = as_wide(x[i]) >> s;
+        let xi1 = as_wide(x[i+1]) << rs;
+        let ri = xi | xi1;
+        r.push(as_limb(ri));
+    }
+    let x_n1 = x[n-1] >> s;
+    r.push(as_limb(x_n1));
+
+    r
+}
+
+/// Implementation of Knuth's Algorithm D, and return the quotient and remainder.
+///
+/// `x` is the dividend, and `y` is the divisor.
+/// Assumes `x.len() > y.len()` and `y.len() >= 2`.
+///
+/// Based off the Hacker's Delight implementation of Knuth's Algorithm D
+/// in "The Art of Computer Programming".
+///     http://www.hackersdelight.org/hdcodetxt/divmnu64.c.txt
+///
+/// All Hacker's Delight code is public domain, so this routine shall
+/// also be placed in the public domain. See:
+///     https://www.hackersdelight.org/permissions.htm
+fn algorithm_d_div<T>(x: &[Limb], y: &[Limb])
+    -> (T, T)
+    where T: CloneableVecLike<Limb>
+{
+    // Normalize the divisor so the leading-bit is set to 1.
+    // x is the dividend, y is the divisor.
+    // Need a leading zero on the numerator.
+    let s = y.rindex(0).leading_zeros().as_usize();
+    let m = x.len();
+    let n = y.len();
+    let mut xn: T = small::shl_bits(x, s);
+    let yn: T = small::shl_bits(y, s);
+    xn.push(0);
+
+    // Store certain variables for the algorithm.
+    let mut q = T::default();
+    q.resize(m-n+1, 0);
+    for j in (0..m-n+1).rev() {
+        // Estimate the quotient
+        let mut qhat = calculate_qhat(&xn, &yn, j);
+        if qhat != 0 {
+            let t = multiply_and_subtract(&mut xn, &yn, qhat, j);
+            qhat = test_quotient(qhat, t);
+            add_back(&mut xn, &yn, t, j);
+        }
+        q[j] = as_limb(qhat);
+    }
+    let mut r = calculate_remainder(&xn, &yn, s);
+
+    // Normalize our results
+    small::normalize(&mut q);
+    small::normalize(&mut r);
+
+    (q, r)
+}
+
+perftools_inline!{
+/// DivAssign bigint to bigint.
+pub fn idiv<T>(x: &mut T, y: &[Limb])
+    -> T
+    where T: CloneableVecLike<Limb>
+{
+    debug_assert!(y.len() != 0);
+
+    if x.len() < y.len() {
+        // Can optimize easily, since the quotient is 0,
+        // and the remainder is x. Put before `y.len() == 1`, since
+        // it optimizes when `x.len() == 0` nicely.
+        let mut r = T::default();
+        mem::swap(x, &mut r);
+        r
+    } else if y.len() == 1 {
+        // Can optimize for division by a small value.
+        let mut r = T::default();
+        r.push(small::idiv(x, y[0]));
+        r
+    } else {
+        let (q, r) = algorithm_d_div(x, y);
+        *x = q;
+        r
+    }
+}}
+
+perftools_inline!{
+/// Div bigint to bigint.
+pub fn div<T>(x: &[Limb], y: &[Limb])
+    -> (T, T)
+    where T: CloneableVecLike<Limb>
+{
+    let mut z = T::default();
+    z.extend_from_slice(x);
+    let rem = idiv(&mut z, y);
+    (z, rem)
+}}
+
+/// Emit a single digit for the quotient and store the remainder in-place.
+///
+/// An extremely efficient division algorithm for small quotients, requiring
+/// you to know the full range of the quotient prior to use. For example,
+/// with a quotient that can range from [0, 10), you must have 4 leading
+/// zeros in the divisor, so we can use a single-limb division to get
+/// an accurate estimate of the quotient. Since we always underestimate
+/// the quotient, we can add 1 and then emit the digit.
+///
+/// Requires a non-normalized denominator, with at least [1-6] leading
+/// zeros, depending on the base (for example, 1 for base2, 6 for base36).
+///
+/// Adapted from David M. Gay's dtoa, and therefore under an MIT license:
+///     www.netlib.org/fp/dtoa.c
+pub fn quorem<T>(x: &mut T, y: &T)
+    -> Limb
+    where T: CloneableVecLike<Limb>
+{
+    debug_assert!(y.len() > 0);
+    let mask = as_wide(Limb::max_value());
+
+    // Numerator is smaller the denominator, quotient always 0.
+    let m = x.len();
+    let n = y.len();
+    if m < n {
+        return 0;
+    }
+
+    // Calculate our initial estimate for q
+    let mut q = x[m-1] / (y[n-1] + 1);
+
+    // Need to calculate the remainder if we don't have a 0 quotient.
+    if q != 0 {
+        let mut borrow: Wide = 0;
+        let mut carry: Wide = 0;
+        for j in 0..m {
+            let p = as_wide(y[j]) * as_wide(q) + carry;
+            carry = p >> <Limb as Integer>::BITS;
+            let t = as_wide(x[j]).wrapping_sub(p & mask).wrapping_sub(borrow);
+            borrow = (t >> <Limb as Integer>::BITS) & 1;
+            x[j] = as_limb(t);
+        }
+        small::normalize(x);
+    }
+
+    // Check if we under-estimated x.
+    if greater_equal(x, y) {
+        q += 1;
+        let mut borrow: Wide = 0;
+        let mut carry: Wide = 0;
+        for j in 0..m {
+            let p = as_wide(y[j]) + carry;
+            carry = p >> <Limb as Integer>::BITS;
+            let t = as_wide(x[j]).wrapping_sub(p & mask).wrapping_sub(borrow);
+            borrow = (t >> <Limb as Integer>::BITS) & 1;
+            x[j] = as_limb(t);
+        }
+        small::normalize(x);
+    }
+
+    q
+}
+
+}   // large
+
+use crate::lib::cmp;
+use super::small_powers::*;
+use super::large_powers::*;
+
+/// Generate the imul_pown wrappers.
+macro_rules! imul_power {
+    ($name:ident, $base:expr) => (
+        perftools_inline!{
+        /// Multiply by a power of $base.
+        fn $name(&mut self, n: u32) {
+            self.imul_power_impl($base, n)
+        }}
+    );
+}
+
+// TRAITS
+// ------
+
+/// Traits for shared operations for big integers.
+///
+/// None of these are implemented using normal traits, since these
+/// are very expensive operations, and we want to deliberately
+/// and explicitly use these functions.
+pub(in crate::atof::algorithm) trait SharedOps: Clone + Sized + Default {
+    /// Underlying storage type for a SmallOps.
+    type StorageType: CloneableVecLike<Limb>;
+
+    // DATA
+
+    /// Get access to the underlying data
+    fn data<'a>(&'a self) -> &'a Self::StorageType;
+
+    /// Get access to the underlying data
+    fn data_mut<'a>(&'a mut self) -> &'a mut Self::StorageType;
+
+    // ZERO
+
+    perftools_inline!{
+    /// Check if the value is a normalized 0.
+    fn is_zero(&self) -> bool {
+        self.limb_length() == 0
+    }}
+
+    // RELATIVE OPERATIONS
+
+    perftools_inline!{
+    /// Compare self to y.
+    fn compare(&self, y: &Self) -> cmp::Ordering {
+        large::compare(self.data(), y.data())
+    }}
+
+    perftools_inline!{
+    /// Check if self is greater than y.
+    fn greater(&self, y: &Self) -> bool {
+        large::greater(self.data(), y.data())
+    }}
+
+    perftools_inline!{
+    /// Check if self is greater than or equal to y.
+    fn greater_equal(&self, y: &Self) -> bool {
+        large::greater_equal(self.data(), y.data())
+    }}
+
+    perftools_inline!{
+    /// Check if self is less than y.
+    fn less(&self, y: &Self) -> bool {
+        large::less(self.data(), y.data())
+    }}
+
+    perftools_inline!{
+    /// Check if self is less than or equal to y.
+    fn less_equal(&self, y: &Self) -> bool {
+        large::less_equal(self.data(), y.data())
+    }}
+
+    perftools_inline!{
+    /// Check if self is equal to y.
+    fn equal(&self, y: &Self) -> bool {
+        large::equal(self.data(), y.data())
+    }}
+
+    // PROPERTIES
+
+    perftools_inline!{
+    /// Get the number of leading zero digits in the storage.
+    /// Assumes the value is normalized.
+    fn leading_zero_limbs(&self) -> usize {
+        small::leading_zero_limbs(self.data())
+    }}
+
+    perftools_inline!{
+    /// Get the number of trailing zero digits in the storage.
+    /// Assumes the value is normalized.
+    fn trailing_zero_limbs(&self) -> usize {
+        small::trailing_zero_limbs(self.data())
+    }}
+
+    perftools_inline!{
+    /// Get number of leading zero bits in the storage.
+    /// Assumes the value is normalized.
+    fn leading_zeros(&self) -> usize {
+        small::leading_zeros(self.data())
+    }}
+
+    perftools_inline!{
+    /// Get number of trailing zero bits in the storage.
+    /// Assumes the value is normalized.
+    fn trailing_zeros(&self) -> usize {
+        small::trailing_zeros(self.data())
+    }}
+
+    perftools_inline!{
+    /// Calculate the bit-length of the big-integer.
+    /// Returns usize::max_value() if the value overflows,
+    /// IE, if `self.data().len() > usize::max_value() / 8`.
+    fn bit_length(&self) -> usize {
+        small::bit_length(self.data())
+    }}
+
+    perftools_inline!{
+    /// Calculate the digit-length of the big-integer.
+    fn limb_length(&self) -> usize {
+        small::limb_length(self.data())
+    }}
+
+    perftools_inline!{
+    /// Get the high 16-bits from the bigint and if there are remaining bits.
+    fn hi16(&self) -> (u16, bool) {
+        self.data().as_slice().hi16()
+    }}
+
+    perftools_inline!{
+    /// Get the high 32-bits from the bigint and if there are remaining bits.
+    fn hi32(&self) -> (u32, bool) {
+        self.data().as_slice().hi32()
+    }}
+
+    perftools_inline!{
+    /// Get the high 64-bits from the bigint and if there are remaining bits.
+    fn hi64(&self) -> (u64, bool) {
+        self.data().as_slice().hi64()
+    }}
+
+    perftools_inline!{
+    /// Get the high 128-bits from the bigint and if there are remaining bits.
+    fn hi128(&self) -> (u128, bool) {
+        self.data().as_slice().hi128()
+    }}
+
+    perftools_inline!{
+    /// Pad the buffer with zeros to the least-significant bits.
+    fn pad_zero_digits(&mut self, n: usize) -> usize {
+        small::ishl_limbs(self.data_mut(), n);
+        n
+    }}
+
+    // INTEGER CONVERSIONS
+
+    // CREATION
+
+    perftools_inline!{
+    /// Create new big integer from u16.
+    fn from_u16(x: u16) -> Self {
+        let mut v = Self::default();
+        let slc = split_u16(x);
+        v.data_mut().extend_from_slice(&slc);
+        v.normalize();
+        v
+    }}
+
+    perftools_inline!{
+    /// Create new big integer from u32.
+    fn from_u32(x: u32) -> Self {
+        let mut v = Self::default();
+        let slc = split_u32(x);
+        v.data_mut().extend_from_slice(&slc);
+        v.normalize();
+        v
+    }}
+
+    perftools_inline!{
+    /// Create new big integer from u64.
+    fn from_u64(x: u64) -> Self {
+        let mut v = Self::default();
+        let slc = split_u64(x);
+        v.data_mut().extend_from_slice(&slc);
+        v.normalize();
+        v
+    }}
+
+    perftools_inline!{
+    /// Create new big integer from u128.
+    fn from_u128(x: u128) -> Self {
+        let mut v = Self::default();
+        let slc = split_u128(x);
+        v.data_mut().extend_from_slice(&slc);
+        v.normalize();
+        v
+    }}
+
+    // NORMALIZE
+
+    perftools_inline!{
+    /// Normalize the integer, so any leading zero values are removed.
+    fn normalize(&mut self) {
+        small::normalize(self.data_mut());
+    }}
+
+    perftools_inline!{
+    /// Get if the big integer is normalized.
+    fn is_normalized(&self) -> bool {
+        self.data().is_empty() || !self.data().rindex(0).is_zero()
+    }}
+
+    // SHIFTS
+
+    perftools_inline!{
+    /// Shift-left the entire buffer n bits.
+    fn ishl(&mut self, n: usize) {
+        small::ishl(self.data_mut(), n);
+    }}
+
+    perftools_inline!{
+    /// Shift-left the entire buffer n bits.
+    fn shl(&self, n: usize) -> Self {
+        let mut x = self.clone();
+        x.ishl(n);
+        x
+    }}
+
+    perftools_inline!{
+    /// Shift-right the entire buffer n bits.
+    fn ishr(&mut self, n: usize, mut roundup: bool) {
+        roundup &= small::ishr(self.data_mut(), n);
+
+        // Round-up the least significant bit.
+        if roundup {
+            if self.data().is_empty() {
+                self.data_mut().push(1);
+            } else {
+                self.data_mut()[0] += 1;
+            }
+        }
+    }}
+
+    perftools_inline!{
+    /// Shift-right the entire buffer n bits.
+    fn shr(&self, n: usize, roundup: bool) -> Self {
+        let mut x = self.clone();
+        x.ishr(n, roundup);
+        x
+    }}
+}
+
+/// Trait for small operations for arbitrary-precision numbers.
+pub(in crate::atof::algorithm) trait SmallOps: SharedOps {
+    // SMALL POWERS
+
+    perftools_inline!{
+    /// Get the small powers from the radix.
+    fn small_powers(radix: u32) -> &'static [Limb] {
+        get_small_powers(radix)
+    }}
+
+    perftools_inline!{
+    /// Get the large powers from the radix.
+    fn large_powers(radix: u32) -> &'static [&'static [Limb]] {
+        get_large_powers(radix)
+    }}
+
+    // ADDITION
+
+    perftools_inline!{
+    /// AddAssign small integer.
+    fn iadd_small(&mut self, y: Limb) {
+        small::iadd(self.data_mut(), y);
+    }}
+
+    perftools_inline!{
+    /// Add small integer to a copy of self.
+    fn add_small(&self, y: Limb) -> Self {
+        let mut x = self.clone();
+        x.iadd_small(y);
+        x
+    }}
+
+    // SUBTRACTION
+
+    perftools_inline!{
+    /// SubAssign small integer.
+    /// Warning: Does no overflow checking, x must be >= y.
+    fn isub_small(&mut self, y: Limb) {
+        small::isub(self.data_mut(), y);
+    }}
+
+    perftools_inline!{
+    /// Sub small integer to a copy of self.
+    /// Warning: Does no overflow checking, x must be >= y.
+    fn sub_small(&mut self, y: Limb) -> Self {
+        let mut x = self.clone();
+        x.isub_small(y);
+        x
+    }}
+
+    // MULTIPLICATION
+
+    perftools_inline!{
+    /// MulAssign small integer.
+    fn imul_small(&mut self, y: Limb) {
+        small::imul(self.data_mut(), y);
+    }}
+
+    perftools_inline!{
+    /// Mul small integer to a copy of self.
+    fn mul_small(&self, y: Limb) -> Self {
+        let mut x = self.clone();
+        x.imul_small(y);
+        x
+    }}
+
+    perftools_inline!{
+    /// MulAssign by a power.
+    fn imul_power_impl(&mut self, radix: u32, n: u32) {
+        small::imul_power(self.data_mut(), radix, n);
+    }}
+
+    perftools_inline!{
+    fn imul_power(&mut self, radix: u32, n: u32) {
+        match radix {
+            2  => self.imul_pow2(n),
+            3  => self.imul_pow3(n),
+            4  => self.imul_pow4(n),
+            5  => self.imul_pow5(n),
+            6  => self.imul_pow6(n),
+            7  => self.imul_pow7(n),
+            8  => self.imul_pow8(n),
+            9  => self.imul_pow9(n),
+            10 => self.imul_pow10(n),
+            11 => self.imul_pow11(n),
+            12 => self.imul_pow12(n),
+            13 => self.imul_pow13(n),
+            14 => self.imul_pow14(n),
+            15 => self.imul_pow15(n),
+            16 => self.imul_pow16(n),
+            17 => self.imul_pow17(n),
+            18 => self.imul_pow18(n),
+            19 => self.imul_pow19(n),
+            20 => self.imul_pow20(n),
+            21 => self.imul_pow21(n),
+            22 => self.imul_pow22(n),
+            23 => self.imul_pow23(n),
+            24 => self.imul_pow24(n),
+            25 => self.imul_pow25(n),
+            26 => self.imul_pow26(n),
+            27 => self.imul_pow27(n),
+            28 => self.imul_pow28(n),
+            29 => self.imul_pow29(n),
+            30 => self.imul_pow30(n),
+            31 => self.imul_pow31(n),
+            32 => self.imul_pow32(n),
+            33 => self.imul_pow33(n),
+            34 => self.imul_pow34(n),
+            35 => self.imul_pow35(n),
+            36 => self.imul_pow36(n),
+            _  => unreachable!()
+        }
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 2.
+    fn imul_pow2(&mut self, n: u32) {
+        self.ishl(n.as_usize())
+    }}
+
+    imul_power!(imul_pow3, 3);
+
+    perftools_inline!{
+    /// Multiply by a power of 4.
+    fn imul_pow4(&mut self, n: u32) {
+        self.imul_pow2(2*n);
+    }}
+
+    imul_power!(imul_pow5, 5);
+
+    perftools_inline!{
+    /// Multiply by a power of 6.
+    fn imul_pow6(&mut self, n: u32) {
+        self.imul_pow3(n);
+        self.imul_pow2(n);
+    }}
+
+    imul_power!(imul_pow7, 7);
+
+    perftools_inline!{
+    /// Multiply by a power of 8.
+    fn imul_pow8(&mut self, n: u32) {
+        self.imul_pow2(3*n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 9.
+    fn imul_pow9(&mut self, n: u32) {
+        self.imul_pow3(n);
+        self.imul_pow3(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 10.
+    fn imul_pow10(&mut self, n: u32) {
+        self.imul_pow5(n);
+        self.imul_pow2(n);
+    }}
+
+    imul_power!(imul_pow11, 11);
+
+    perftools_inline!{
+    /// Multiply by a power of 12.
+    fn imul_pow12(&mut self, n: u32) {
+        self.imul_pow3(n);
+        self.imul_pow4(n);
+    }}
+
+    imul_power!(imul_pow13, 13);
+
+    perftools_inline!{
+    /// Multiply by a power of 14.
+    fn imul_pow14(&mut self, n: u32) {
+        self.imul_pow7(n);
+        self.imul_pow2(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 15.
+    fn imul_pow15(&mut self, n: u32) {
+        self.imul_pow3(n);
+        self.imul_pow5(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 16.
+    fn imul_pow16(&mut self, n: u32) {
+        self.imul_pow2(4*n);
+    }}
+
+    imul_power!(imul_pow17, 17);
+
+    perftools_inline!{
+    /// Multiply by a power of 18.
+    fn imul_pow18(&mut self, n: u32) {
+        self.imul_pow9(n);
+        self.imul_pow2(n);
+    }}
+
+    imul_power!(imul_pow19, 19);
+
+    perftools_inline!{
+    /// Multiply by a power of 20.
+    fn imul_pow20(&mut self, n: u32) {
+        self.imul_pow5(n);
+        self.imul_pow4(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 21.
+    fn imul_pow21(&mut self, n: u32) {
+        self.imul_pow3(n);
+        self.imul_pow7(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 22.
+    fn imul_pow22(&mut self, n: u32) {
+        self.imul_pow11(n);
+        self.imul_pow2(n);
+    }}
+
+    imul_power!(imul_pow23, 23);
+
+    perftools_inline!{
+    /// Multiply by a power of 24.
+    fn imul_pow24(&mut self, n: u32) {
+        self.imul_pow3(n);
+        self.imul_pow8(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 25.
+    fn imul_pow25(&mut self, n: u32) {
+        self.imul_pow5(n);
+        self.imul_pow5(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 26.
+    fn imul_pow26(&mut self, n: u32) {
+        self.imul_pow13(n);
+        self.imul_pow2(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 27.
+    fn imul_pow27(&mut self, n: u32) {
+        self.imul_pow9(n);
+        self.imul_pow3(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 28.
+    fn imul_pow28(&mut self, n: u32) {
+        self.imul_pow7(n);
+        self.imul_pow4(n);
+    }}
+
+    imul_power!(imul_pow29, 29);
+
+    perftools_inline!{
+    /// Multiply by a power of 30.
+    fn imul_pow30(&mut self, n: u32) {
+        self.imul_pow15(n);
+        self.imul_pow2(n);
+    }}
+
+    imul_power!(imul_pow31, 31);
+
+    perftools_inline!{
+    /// Multiply by a power of 32.
+    fn imul_pow32(&mut self, n: u32) {
+        self.imul_pow2(5*n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 33.
+    fn imul_pow33(&mut self, n: u32) {
+        self.imul_pow3(n);
+        self.imul_pow11(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 34.
+    fn imul_pow34(&mut self, n: u32) {
+        self.imul_pow17(n);
+        self.imul_pow2(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 35.
+    fn imul_pow35(&mut self, n: u32) {
+        self.imul_pow5(n);
+        self.imul_pow7(n);
+    }}
+
+    perftools_inline!{
+    /// Multiply by a power of 36.
+    fn imul_pow36(&mut self, n: u32) {
+        self.imul_pow9(n);
+        self.imul_pow4(n);
+    }}
+
+    // DIVISION
+
+    perftools_inline!{
+    /// DivAssign small integer, and return the remainder.
+    fn idiv_small(&mut self, y: Limb) -> Limb {
+        small::idiv(self.data_mut(), y)
+    }}
+
+    perftools_inline!{
+    /// Div small integer to a copy of self, and return the remainder.
+    fn div_small(&self, y: Limb) -> (Self, Limb) {
+        let mut x = self.clone();
+        let rem = x.idiv_small(y);
+        (x, rem)
+    }}
+
+    // POWER
+
+    perftools_inline!{
+    /// Calculate self^n
+    fn ipow(&mut self, n: Limb) {
+        small::ipow(self.data_mut(), n);
+    }}
+
+    perftools_inline!{
+    /// Calculate self^n
+    fn pow(&self, n: Limb) -> Self {
+        let mut x = self.clone();
+        x.ipow(n);
+        x
+    }}
+}
+
+/// Trait for large operations for arbitrary-precision numbers.
+pub(in crate::atof::algorithm) trait LargeOps: SmallOps {
+    // ADDITION
+
+    perftools_inline!{
+    /// AddAssign large integer.
+    fn iadd_large(&mut self, y: &Self) {
+        large::iadd(self.data_mut(), y.data());
+    }}
+
+    perftools_inline!{
+    /// Add large integer to a copy of self.
+    fn add_large(&mut self, y: &Self) -> Self {
+        let mut x = self.clone();
+        x.iadd_large(y);
+        x
+    }}
+
+    // SUBTRACTION
+
+    perftools_inline!{
+    /// SubAssign large integer.
+    /// Warning: Does no overflow checking, x must be >= y.
+    fn isub_large(&mut self, y: &Self) {
+        large::isub(self.data_mut(), y.data());
+    }}
+
+    perftools_inline!{
+    /// Sub large integer to a copy of self.
+    /// Warning: Does no overflow checking, x must be >= y.
+    fn sub_large(&mut self, y: &Self) -> Self {
+        let mut x = self.clone();
+        x.isub_large(y);
+        x
+    }}
+
+    // MULTIPLICATION
+
+    perftools_inline!{
+    /// MulAssign large integer.
+    fn imul_large(&mut self, y: &Self) {
+        large::imul(self.data_mut(), y.data());
+    }}
+
+    perftools_inline!{
+    /// Mul large integer to a copy of self.
+    fn mul_large(&mut self, y: &Self) -> Self {
+        let mut x = self.clone();
+        x.imul_large(y);
+        x
+    }}
+
+    // DIVISION
+
+    perftools_inline!{
+    /// DivAssign large integer and get remainder.
+    fn idiv_large(&mut self, y: &Self) -> Self {
+        let mut rem = Self::default();
+        *rem.data_mut() = large::idiv(self.data_mut(), y.data());
+        rem
+    }}
+
+    perftools_inline!{
+    /// Div large integer to a copy of self and get quotient and remainder.
+    fn div_large(&mut self, y: &Self) -> (Self, Self) {
+        let mut x = self.clone();
+        let rem = x.idiv_large(y);
+        (x, rem)
+    }}
+
+    perftools_inline!{
+    /// Calculate the fast quotient for a single limb-bit quotient.
+    ///
+    /// This requires a non-normalized divisor, where there at least
+    /// `integral_binary_factor` 0 bits set, to ensure at maximum a single
+    /// digit will be produced for a single base.
+    ///
+    /// Warning: This is not a general-purpose division algorithm,
+    /// it is highly specialized for peeling off singular digits.
+    fn quorem(&mut self, y: &Self) -> Limb {
+        large::quorem(self.data_mut(), y.data())
+    }}
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::util::test::*;
+    use super::*;
+
+    #[derive(Clone, Default)]
+    struct Bigint {
+        data: DataType,
+    }
+
+    impl Bigint {
+        #[inline]
+        pub fn new() -> Bigint {
+            Bigint { data: arrvec![] }
+        }
+    }
+
+    impl SharedOps for Bigint {
+        type StorageType = DataType;
+
+        #[inline]
+        fn data<'a>(&'a self) -> &'a Self::StorageType {
+            &self.data
+        }
+
+        #[inline]
+        fn data_mut<'a>(&'a mut self) -> &'a mut Self::StorageType {
+            &mut self.data
+        }
+    }
+
+    impl SmallOps for Bigint {
+    }
+
+    impl LargeOps for Bigint {
+    }
+
+    // SHARED OPS
+
+    #[test]
+    fn greater_test() {
+        // Simple
+        let x = Bigint { data: from_u32(&[1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(!x.greater(&y));
+        assert!(!x.greater(&x));
+        assert!(y.greater(&x));
+
+        // Check asymmetric
+        let x = Bigint { data: from_u32(&[5, 1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(x.greater(&y));
+        assert!(!x.greater(&x));
+        assert!(!y.greater(&x));
+
+        // Check when we use reverse ordering properly.
+        let x = Bigint { data: from_u32(&[5, 1, 9]) };
+        let y = Bigint { data: from_u32(&[6, 2, 8]) };
+        assert!(x.greater(&y));
+        assert!(!x.greater(&x));
+        assert!(!y.greater(&x));
+
+        // Complex scenario, check it properly uses reverse ordering.
+        let x = Bigint { data: from_u32(&[0, 1, 9]) };
+        let y = Bigint { data: from_u32(&[4294967295, 0, 9]) };
+        assert!(x.greater(&y));
+        assert!(!x.greater(&x));
+        assert!(!y.greater(&x));
+    }
+
+    #[test]
+    fn greater_equal_test() {
+        // Simple
+        let x = Bigint { data: from_u32(&[1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(!x.greater_equal(&y));
+        assert!(x.greater_equal(&x));
+        assert!(y.greater_equal(&x));
+
+        // Check asymmetric
+        let x = Bigint { data: from_u32(&[5, 1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(x.greater_equal(&y));
+        assert!(x.greater_equal(&x));
+        assert!(!y.greater_equal(&x));
+
+        // Check when we use reverse ordering properly.
+        let x = Bigint { data: from_u32(&[5, 1, 9]) };
+        let y = Bigint { data: from_u32(&[6, 2, 8]) };
+        assert!(x.greater_equal(&y));
+        assert!(x.greater_equal(&x));
+        assert!(!y.greater_equal(&x));
+
+        // Complex scenario, check it properly uses reverse ordering.
+        let x = Bigint { data: from_u32(&[0, 1, 9]) };
+        let y = Bigint { data: from_u32(&[4294967295, 0, 9]) };
+        assert!(x.greater_equal(&y));
+        assert!(x.greater_equal(&x));
+        assert!(!y.greater_equal(&x));
+    }
+
+    #[test]
+    fn equal_test() {
+        // Simple
+        let x = Bigint { data: from_u32(&[1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(!x.equal(&y));
+        assert!(x.equal(&x));
+        assert!(!y.equal(&x));
+
+        // Check asymmetric
+        let x = Bigint { data: from_u32(&[5, 1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(!x.equal(&y));
+        assert!(x.equal(&x));
+        assert!(!y.equal(&x));
+
+        // Check when we use reverse ordering properly.
+        let x = Bigint { data: from_u32(&[5, 1, 9]) };
+        let y = Bigint { data: from_u32(&[6, 2, 8]) };
+        assert!(!x.equal(&y));
+        assert!(x.equal(&x));
+        assert!(!y.equal(&x));
+
+        // Complex scenario, check it properly uses reverse ordering.
+        let x = Bigint { data: from_u32(&[0, 1, 9]) };
+        let y = Bigint { data: from_u32(&[4294967295, 0, 9]) };
+        assert!(!x.equal(&y));
+        assert!(x.equal(&x));
+        assert!(!y.equal(&x));
+    }
+
+    #[test]
+    fn less_test() {
+        // Simple
+        let x = Bigint { data: from_u32(&[1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(x.less(&y));
+        assert!(!x.less(&x));
+        assert!(!y.less(&x));
+
+        // Check asymmetric
+        let x = Bigint { data: from_u32(&[5, 1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(!x.less(&y));
+        assert!(!x.less(&x));
+        assert!(y.less(&x));
+
+        // Check when we use reverse ordering properly.
+        let x = Bigint { data: from_u32(&[5, 1, 9]) };
+        let y = Bigint { data: from_u32(&[6, 2, 8]) };
+        assert!(!x.less(&y));
+        assert!(!x.less(&x));
+        assert!(y.less(&x));
+
+        // Complex scenario, check it properly uses reverse ordering.
+        let x = Bigint { data: from_u32(&[0, 1, 9]) };
+        let y = Bigint { data: from_u32(&[4294967295, 0, 9]) };
+        assert!(!x.less(&y));
+        assert!(!x.less(&x));
+        assert!(y.less(&x));
+    }
+
+    #[test]
+    fn less_equal_test() {
+        // Simple
+        let x = Bigint { data: from_u32(&[1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(x.less_equal(&y));
+        assert!(x.less_equal(&x));
+        assert!(!y.less_equal(&x));
+
+        // Check asymmetric
+        let x = Bigint { data: from_u32(&[5, 1]) };
+        let y = Bigint { data: from_u32(&[2]) };
+        assert!(!x.less_equal(&y));
+        assert!(x.less_equal(&x));
+        assert!(y.less_equal(&x));
+
+        // Check when we use reverse ordering properly.
+        let x = Bigint { data: from_u32(&[5, 1, 9]) };
+        let y = Bigint { data: from_u32(&[6, 2, 8]) };
+        assert!(!x.less_equal(&y));
+        assert!(x.less_equal(&x));
+        assert!(y.less_equal(&x));
+
+        // Complex scenario, check it properly uses reverse ordering.
+        let x = Bigint { data: from_u32(&[0, 1, 9]) };
+        let y = Bigint { data: from_u32(&[4294967295, 0, 9]) };
+        assert!(!x.less_equal(&y));
+        assert!(x.less_equal(&x));
+        assert!(y.less_equal(&x));
+    }
+
+    #[test]
+    fn leading_zero_limbs_test() {
+        assert_eq!(Bigint::new().leading_zero_limbs(), 0);
+
+        assert_eq!(Bigint::from_u16(0xF).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u32(0xFF).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u64(0xFF00000000).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u128(0xFF000000000000000000000000).leading_zero_limbs(), 0);
+
+        assert_eq!(Bigint::from_u16(0xF).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u32(0xF).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u64(0xF00000000).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u128(0xF000000000000000000000000).leading_zero_limbs(), 0);
+
+        assert_eq!(Bigint::from_u16(0xF0).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u32(0xF0).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u64(0xF000000000).leading_zero_limbs(), 0);
+        assert_eq!(Bigint::from_u128(0xF0000000000000000000000000).leading_zero_limbs(), 0);
+    }
+
+    #[test]
+    fn trailing_zero_limbs_test() {
+        assert_eq!(Bigint::new().trailing_zero_limbs(), 0);
+
+        assert_eq!(Bigint { data: arrvec![0xFF] }.trailing_zero_limbs(), 0);
+        assert_eq!(Bigint { data: arrvec![0, 0xFF000] }.trailing_zero_limbs(), 1);
+        assert_eq!(Bigint { data: arrvec![0, 0, 0, 0xFF000] }.trailing_zero_limbs(), 3);
+    }
+
+    #[test]
+    fn leading_zeros_test() {
+        assert_eq!(Bigint::new().leading_zeros(), 0);
+
+        assert_eq!(Bigint::from_u16(0xFF).leading_zeros(), <Limb as Integer>::BITS-8);
+        assert_eq!(Bigint::from_u32(0xFF).leading_zeros(), <Limb as Integer>::BITS-8);
+        assert_eq!(Bigint::from_u64(0xFF00000000).leading_zeros(), 24);
+        assert_eq!(Bigint::from_u128(0xFF000000000000000000000000).leading_zeros(), 24);
+
+        assert_eq!(Bigint::from_u16(0xF).leading_zeros(), <Limb as Integer>::BITS-4);
+        assert_eq!(Bigint::from_u32(0xF).leading_zeros(), <Limb as Integer>::BITS-4);
+        assert_eq!(Bigint::from_u64(0xF00000000).leading_zeros(), 28);
+        assert_eq!(Bigint::from_u128(0xF000000000000000000000000).leading_zeros(), 28);
+
+        assert_eq!(Bigint::from_u16(0xF0).leading_zeros(), <Limb as Integer>::BITS-8);
+        assert_eq!(Bigint::from_u32(0xF0).leading_zeros(), <Limb as Integer>::BITS-8);
+        assert_eq!(Bigint::from_u64(0xF000000000).leading_zeros(), 24);
+        assert_eq!(Bigint::from_u128(0xF0000000000000000000000000).leading_zeros(), 24);
+    }
+
+    #[test]
+    fn trailing_zeros_test() {
+        assert_eq!(Bigint::new().trailing_zeros(), 0);
+
+        assert_eq!(Bigint::from_u16(0xFF).trailing_zeros(), 0);
+        assert_eq!(Bigint::from_u32(0xFF).trailing_zeros(), 0);
+        assert_eq!(Bigint::from_u64(0xFF00000000).trailing_zeros(), 32);
+        assert_eq!(Bigint::from_u128(0xFF000000000000000000000000).trailing_zeros(), 96);
+
+        assert_eq!(Bigint::from_u16(0xF).trailing_zeros(), 0);
+        assert_eq!(Bigint::from_u32(0xF).trailing_zeros(), 0);
+        assert_eq!(Bigint::from_u64(0xF00000000).trailing_zeros(), 32);
+        assert_eq!(Bigint::from_u128(0xF000000000000000000000000).trailing_zeros(), 96);
+
+        assert_eq!(Bigint::from_u16(0xF0).trailing_zeros(), 4);
+        assert_eq!(Bigint::from_u32(0xF0).trailing_zeros(), 4);
+        assert_eq!(Bigint::from_u64(0xF000000000).trailing_zeros(), 36);
+        assert_eq!(Bigint::from_u128(0xF0000000000000000000000000).trailing_zeros(), 100);
+    }
+
+    #[test]
+    fn hi32_test() {
+        assert_eq!(Bigint::from_u16(0xA).hi32(), (0xA0000000, false));
+        assert_eq!(Bigint::from_u32(0xAB).hi32(), (0xAB000000, false));
+        assert_eq!(Bigint::from_u64(0xAB00000000).hi32(), (0xAB000000, false));
+        assert_eq!(Bigint::from_u64(0xA23456789A).hi32(), (0xA2345678, true));
+    }
+
+    #[test]
+    fn hi64_test() {
+        assert_eq!(Bigint::from_u16(0xA).hi64(), (0xA000000000000000, false));
+        assert_eq!(Bigint::from_u32(0xAB).hi64(), (0xAB00000000000000, false));
+        assert_eq!(Bigint::from_u64(0xAB00000000).hi64(), (0xAB00000000000000, false));
+        assert_eq!(Bigint::from_u64(0xA23456789A).hi64(), (0xA23456789A000000, false));
+        assert_eq!(Bigint::from_u128(0xABCDEF0123456789ABCDEF0123).hi64(), (0xABCDEF0123456789, true));
+    }
+
+    #[test]
+    fn hi128_test() {
+        assert_eq!(Bigint::from_u128(0xABCDEF0123456789ABCDEF0123).hi128(), (0xABCDEF0123456789ABCDEF0123000000, false));
+        assert_eq!(Bigint::from_u128(0xABCDEF0123456789ABCDEF0123456789).hi128(), (0xABCDEF0123456789ABCDEF0123456789, false));
+        assert_eq!(Bigint { data: from_u32(&[0x34567890, 0xBCDEF012, 0x3456789A, 0xBCDEF012, 0xA]) }.hi128(), (0xABCDEF0123456789ABCDEF0123456789, false));
+        assert_eq!(Bigint { data: from_u32(&[0x34567891, 0xBCDEF012, 0x3456789A, 0xBCDEF012, 0xA]) }.hi128(), (0xABCDEF0123456789ABCDEF0123456789, true));
+    }
+
+    #[test]
+    fn pad_zero_digits_test() {
+        let mut x = Bigint { data: arrvec![0, 0, 0, 1] };
+        x.pad_zero_digits(3);
+        assert_eq!(x.data.as_slice(), &[0, 0, 0, 0, 0, 0, 1]);
+
+        let mut x = Bigint { data: arrvec![1] };
+        x.pad_zero_digits(1);
+        assert_eq!(x.data.as_slice(), &[0, 1]);
+    }
+
+    #[test]
+    fn shl_test() {
+        // Pattern generated via `''.join(["1" +"0"*i for i in range(20)])`
+        let mut big = Bigint { data: from_u32(&[0xD2210408]) };
+        big.ishl(5);
+        assert_eq!(big.data, from_u32(&[0x44208100, 0x1A]));
+        big.ishl(32);
+        assert_eq!(big.data, from_u32(&[0, 0x44208100, 0x1A]));
+        big.ishl(27);
+        assert_eq!(big.data, from_u32(&[0, 0, 0xD2210408]));
+
+        // 96-bits of previous pattern
+        let mut big = Bigint { data: from_u32(&[0x20020010, 0x8040100, 0xD2210408]) };
+        big.ishl(5);
+        assert_eq!(big.data, from_u32(&[0x400200, 0x802004, 0x44208101, 0x1A]));
+        big.ishl(32);
+        assert_eq!(big.data, from_u32(&[0, 0x400200, 0x802004, 0x44208101, 0x1A]));
+        big.ishl(27);
+        assert_eq!(big.data, from_u32(&[0, 0, 0x20020010, 0x8040100, 0xD2210408]));
+    }
+
+    #[test]
+    fn shr_test() {
+        // Simple case.
+        let mut big = Bigint { data: from_u32(&[0xD2210408]) };
+        big.ishr(5, false);
+        assert_eq!(big.data, from_u32(&[0x6910820]));
+        big.ishr(27, false);
+        assert_eq!(big.data, from_u32(&[]));
+
+        // Pattern generated via `''.join(["1" +"0"*i for i in range(20)])`
+        let mut big = Bigint { data: from_u32(&[0x20020010, 0x8040100, 0xD2210408]) };
+        big.ishr(5, false);
+        assert_eq!(big.data, from_u32(&[0x1001000, 0x40402008, 0x6910820]));
+        big.ishr(32, false);
+        assert_eq!(big.data, from_u32(&[0x40402008, 0x6910820]));
+        big.ishr(27, false);
+        assert_eq!(big.data, from_u32(&[0xD2210408]));
+
+        // Check no-roundup with halfway and even
+        let mut big = Bigint { data: from_u32(&[0xD2210408]) };
+        big.ishr(3, true);
+        assert_eq!(big.data, from_u32(&[0x1A442081]));
+        big.ishr(1, true);
+        assert_eq!(big.data, from_u32(&[0xD221040]));
+
+        let mut big = Bigint { data: from_u32(&[0xD2210408]) };
+        big.ishr(4, true);
+        assert_eq!(big.data, from_u32(&[0xD221040]));
+
+        // Check roundup with halfway and odd
+        let mut big = Bigint { data: from_u32(&[0xD2210438]) };
+        big.ishr(3, true);
+        assert_eq!(big.data, from_u32(&[0x1A442087]));
+        big.ishr(1, true);
+        assert_eq!(big.data, from_u32(&[0xD221044]));
+
+        let mut big = Bigint { data: from_u32(&[0xD2210438]) };
+        big.ishr(5, true);
+        assert_eq!(big.data, from_u32(&[0x6910822]));
+    }
+
+    #[test]
+    fn bit_length_test() {
+        let x = Bigint { data: from_u32(&[0, 0, 0, 1]) };
+        assert_eq!(x.bit_length(), 97);
+
+        let x = Bigint { data: from_u32(&[0, 0, 0, 3]) };
+        assert_eq!(x.bit_length(), 98);
+
+        let x = Bigint { data: from_u32(&[1<<31]) };
+        assert_eq!(x.bit_length(), 32);
+    }
+
+    // SMALL OPS
+
+    #[test]
+    fn iadd_small_test() {
+        // Overflow check (single)
+        // This should set all the internal data values to 0, the top
+        // value to (1<<31), and the bottom value to (4>>1).
+        // This is because the max_value + 1 leads to all 0s, we set the
+        // topmost bit to 1.
+        let mut x = Bigint { data: from_u32(&[4294967295]) };
+        x.iadd_small(5);
+        assert_eq!(x.data, from_u32(&[4, 1]));
+
+        // No overflow, single value
+        let mut x = Bigint { data: from_u32(&[5]) };
+        x.iadd_small(7);
+        assert_eq!(x.data, from_u32(&[12]));
+
+        // Single carry, internal overflow
+        let mut x = Bigint::from_u64(0x80000000FFFFFFFF);
+        x.iadd_small(7);
+        assert_eq!(x.data, from_u32(&[6, 0x80000001]));
+
+        // Double carry, overflow
+        let mut x = Bigint::from_u64(0xFFFFFFFFFFFFFFFF);
+        x.iadd_small(7);
+        assert_eq!(x.data, from_u32(&[6, 0, 1]));
+    }
+
+    #[test]
+    fn isub_small_test() {
+        // Overflow check (single)
+        let mut x = Bigint { data: from_u32(&[4, 1]) };
+        x.isub_small(5);
+        assert_eq!(x.data, from_u32(&[4294967295]));
+
+        // No overflow, single value
+        let mut x = Bigint { data: from_u32(&[12]) };
+        x.isub_small(7);
+        assert_eq!(x.data, from_u32(&[5]));
+
+        // Single carry, internal overflow
+        let mut x = Bigint { data: from_u32(&[6, 0x80000001]) };
+        x.isub_small(7);
+        assert_eq!(x.data, from_u32(&[0xFFFFFFFF, 0x80000000]));
+
+        // Double carry, overflow
+        let mut x = Bigint { data: from_u32(&[6, 0, 1]) };
+        x.isub_small(7);
+        assert_eq!(x.data, from_u32(&[0xFFFFFFFF, 0xFFFFFFFF]));
+    }
+
+    #[test]
+    fn imul_small_test() {
+        // No overflow check, 1-int.
+        let mut x = Bigint { data: from_u32(&[5]) };
+        x.imul_small(7);
+        assert_eq!(x.data, from_u32(&[35]));
+
+        // No overflow check, 2-ints.
+        let mut x = Bigint::from_u64(0x4000000040000);
+        x.imul_small(5);
+        assert_eq!(x.data, from_u32(&[0x00140000, 0x140000]));
+
+        // Overflow, 1 carry.
+        let mut x = Bigint { data: from_u32(&[0x33333334]) };
+        x.imul_small(5);
+        assert_eq!(x.data, from_u32(&[4, 1]));
+
+        // Overflow, 1 carry, internal.
+        let mut x = Bigint::from_u64(0x133333334);
+        x.imul_small(5);
+        assert_eq!(x.data, from_u32(&[4, 6]));
+
+        // Overflow, 2 carries.
+        let mut x = Bigint::from_u64(0x3333333333333334);
+        x.imul_small(5);
+        assert_eq!(x.data, from_u32(&[4, 0, 1]));
+    }
+
+    #[test]
+    fn idiv_small_test() {
+        let mut x = Bigint { data: from_u32(&[4]) };
+        assert_eq!(x.idiv_small(7), 4);
+        assert_eq!(x.data, from_u32(&[]));
+
+        let mut x = Bigint { data: from_u32(&[3]) };
+        assert_eq!(x.idiv_small(7), 3);
+        assert_eq!(x.data, from_u32(&[]));
+
+        // Check roundup, odd, halfway
+        let mut x = Bigint { data: from_u32(&[15]) };
+        assert_eq!(x.idiv_small(10), 5);
+        assert_eq!(x.data, from_u32(&[1]));
+
+        // Check 1 carry.
+        let mut x = Bigint::from_u64(0x133333334);
+        assert_eq!(x.idiv_small(5), 1);
+        assert_eq!(x.data, from_u32(&[0x3D70A3D7]));
+
+        // Check 2 carries.
+        let mut x = Bigint::from_u64(0x3333333333333334);
+        assert_eq!(x.idiv_small(5), 4);
+        assert_eq!(x.data, from_u32(&[0xD70A3D70, 0xA3D70A3]));
+    }
+
+    #[test]
+    fn ipow_test() {
+        let x = Bigint { data: from_u32(&[5]) };
+        assert_eq!(x.pow(2).data, from_u32(&[25]));
+        assert_eq!(x.pow(15).data, from_u32(&[452807053, 7]));
+        assert_eq!(x.pow(16).data, from_u32(&[2264035265, 35]));
+        assert_eq!(x.pow(17).data, from_u32(&[2730241733, 177]));
+        assert_eq!(x.pow(302).data, from_u32(&[2443090281, 2149694430, 2297493928, 1584384001, 1279504719, 1930002239, 3312868939, 3735173465, 3523274756, 2025818732, 1641675015, 2431239749, 4292780461, 3719612855, 4174476133, 3296847770, 2677357556, 638848153, 2198928114, 3285049351, 2159526706, 626302612]));
+    }
+
+    // LARGE OPS
+
+    #[test]
+    fn iadd_large_test() {
+        // Overflow, both single values
+        let mut x = Bigint { data: from_u32(&[4294967295]) };
+        let y = Bigint { data: from_u32(&[5]) };
+        x.iadd_large(&y);
+        assert_eq!(x.data, from_u32(&[4, 1]));
+
+        // No overflow, single value
+        let mut x = Bigint { data: from_u32(&[5]) };
+        let y = Bigint { data: from_u32(&[7]) };
+        x.iadd_large(&y);
+        assert_eq!(x.data, from_u32(&[12]));
+
+        // Single carry, internal overflow
+        let mut x = Bigint::from_u64(0x80000000FFFFFFFF);
+        let y = Bigint { data: from_u32(&[7]) };
+        x.iadd_large(&y);
+        assert_eq!(x.data, from_u32(&[6, 0x80000001]));
+
+        // 1st overflows, 2nd doesn't.
+        let mut x = Bigint::from_u64(0x7FFFFFFFFFFFFFFF);
+        let y = Bigint::from_u64(0x7FFFFFFFFFFFFFFF);
+        x.iadd_large(&y);
+        assert_eq!(x.data, from_u32(&[0xFFFFFFFE, 0xFFFFFFFF]));
+
+        // Both overflow.
+        let mut x = Bigint::from_u64(0x8FFFFFFFFFFFFFFF);
+        let y = Bigint::from_u64(0x7FFFFFFFFFFFFFFF);
+        x.iadd_large(&y);
+        assert_eq!(x.data, from_u32(&[0xFFFFFFFE, 0x0FFFFFFF, 1]));
+    }
+
+    #[test]
+    fn isub_large_test() {
+        // Overflow, both single values
+        let mut x = Bigint { data: from_u32(&[4, 1]) };
+        let y = Bigint { data: from_u32(&[5]) };
+        x.isub_large(&y);
+        assert_eq!(x.data, from_u32(&[4294967295]));
+
+        // No overflow, single value
+        let mut x = Bigint { data: from_u32(&[12]) };
+        let y = Bigint { data: from_u32(&[7]) };
+        x.isub_large(&y);
+        assert_eq!(x.data, from_u32(&[5]));
+
+        // Single carry, internal overflow
+        let mut x = Bigint { data: from_u32(&[6, 0x80000001]) };
+        let y = Bigint { data: from_u32(&[7]) };
+        x.isub_large(&y);
+        assert_eq!(x.data, from_u32(&[0xFFFFFFFF, 0x80000000]));
+
+        // Zeros out.
+        let mut x = Bigint { data: from_u32(&[0xFFFFFFFF, 0x7FFFFFFF]) };
+        let y = Bigint { data: from_u32(&[0xFFFFFFFF, 0x7FFFFFFF]) };
+        x.isub_large(&y);
+        assert_eq!(x.data, from_u32(&[]));
+
+        // 1st overflows, 2nd doesn't.
+        let mut x = Bigint { data: from_u32(&[0xFFFFFFFE, 0x80000000]) };
+        let y = Bigint { data: from_u32(&[0xFFFFFFFF, 0x7FFFFFFF]) };
+        x.isub_large(&y);
+        assert_eq!(x.data, from_u32(&[0xFFFFFFFF]));
+    }
+
+    #[test]
+    fn imul_large_test() {
+        // Test by empty
+        let mut x = Bigint { data: from_u32(&[0xFFFFFFFF]) };
+        let y = Bigint { data: from_u32(&[]) };
+        x.imul_large(&y);
+        assert_eq!(x.data, from_u32(&[]));
+
+        // Simple case
+        let mut x = Bigint { data: from_u32(&[0xFFFFFFFF]) };
+        let y = Bigint { data: from_u32(&[5]) };
+        x.imul_large(&y);
+        assert_eq!(x.data, from_u32(&[0xFFFFFFFB, 0x4]));
+
+        // Large u32, but still just as easy.
+        let mut x = Bigint { data: from_u32(&[0xFFFFFFFF]) };
+        let y = Bigint { data: from_u32(&[0xFFFFFFFE]) };
+        x.imul_large(&y);
+        assert_eq!(x.data, from_u32(&[0x2, 0xFFFFFFFD]));
+
+        // Let's multiply two large values together
+        let mut x = Bigint { data: from_u32(&[0xFFFFFFFE, 0x0FFFFFFF, 1]) };
+        let y = Bigint { data: from_u32(&[0x99999999, 0x99999999, 0xCCCD9999, 0xCCCC]) };
+        x.imul_large(&y);
+        assert_eq!(x.data, from_u32(&[0xCCCCCCCE, 0x5CCCCCCC, 0x9997FFFF, 0x33319999, 0x999A7333, 0xD999]));
+    }
+
+    #[test]
+    fn imul_karatsuba_mul_test() {
+        // Test cases triggered to use `karatsuba_mul`.
+        let mut x = Bigint { data: from_u32(&[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]) };
+        let y = Bigint { data: from_u32(&[4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]) };
+        x.imul_large(&y);
+        assert_eq!(x.data, from_u32(&[4, 13, 28, 50, 80, 119, 168, 228, 300, 385, 484, 598, 728, 875, 1040, 1224, 1340, 1435, 1508, 1558, 1584, 1585, 1560, 1508, 1428, 1319, 1180, 1010, 808, 573, 304]));
+
+        // Test cases to use karatsuba_uneven_mul
+        let mut x = Bigint { data: from_u32(&[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]) };
+        let y = Bigint { data: from_u32(&[4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37]) };
+        x.imul_large(&y);
+        assert_eq!(x.data, from_u32(&[4, 13, 28, 50, 80, 119, 168, 228, 300, 385, 484, 598, 728, 875, 1040, 1224, 1360, 1496, 1632, 1768, 1904, 2040, 2176, 2312, 2448, 2584, 2720, 2856, 2992, 3128, 3264, 3400, 3536, 3672, 3770, 3829, 3848, 3826, 3762, 3655, 3504, 3308, 3066, 2777, 2440, 2054, 1618, 1131, 592]));
+    }
+
+    #[test]
+    fn idiv_large_test() {
+        // Simple case.
+        let mut x = Bigint { data: from_u32(&[0xFFFFFFFF]) };
+        let y = Bigint { data: from_u32(&[5]) };
+        let rem = x.idiv_large(&y);
+        assert_eq!(x.data, from_u32(&[0x33333333]));
+        assert_eq!(rem.data, from_u32(&[0]));
+
+        // Two integer case
+        let mut x = Bigint { data: from_u32(&[0x2, 0xFFFFFFFF]) };
+        let y = Bigint { data: from_u32(&[0xFFFFFFFE]) };
+        let rem = x.idiv_large(&y);
+        assert_eq!(x.data, from_u32(&[1, 1]));
+        assert_eq!(rem.data, from_u32(&[4]));
+
+        // Larger large case
+        let mut x = Bigint { data: from_u32(&[0xCCCCCCCF, 0x5CCCCCCC, 0x9997FFFF, 0x33319999, 0x999A7333, 0xD999]) };
+        let y = Bigint { data: from_u32(&[0x99999999, 0x99999999, 0xCCCD9999, 0xCCCC]) };
+        let rem = x.idiv_large(&y);
+        assert_eq!(x.data, from_u32(&[0xFFFFFFFE, 0x0FFFFFFF, 1]));
+        assert_eq!(rem.data, from_u32(&[1]));
+
+        // Extremely large cases, examples from Karatsuba multiplication.
+        let mut x = Bigint { data: from_u32(&[4, 13, 29, 50, 80, 119, 168, 228, 300, 385, 484, 598, 728, 875, 1040, 1224, 1340, 1435, 1508, 1558, 1584, 1585, 1560, 1508, 1428, 1319, 1180, 1010, 808, 573, 304]) };
+        let y = Bigint { data: from_u32(&[4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]) };
+        let rem = x.idiv_large(&y);
+        assert_eq!(x.data, from_u32(&[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]));
+        assert_eq!(rem.data, from_u32(&[0, 0, 1]));
+    }
+
+    #[test]
+    fn quorem_test() {
+        let mut x = Bigint::from_u128(42535295865117307932921825928971026432);
+        let y = Bigint::from_u128(17218479456385750618067377696052635483);
+        assert_eq!(x.quorem(&y), 2);
+        assert_eq!(x.data, from_u32(&[1873752394, 3049207402, 3024501058, 102215382]));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+//! Algorithms for parsing strings to floats.
+
+// Hide implementation details.
+#[macro_use]
+mod format;
+
+cfg_if! {
+if #[cfg(feature = "correct")] {
+mod bhcomp;
+mod bigcomp;
+mod alias;
+mod bignum;
+mod cached;
+mod cached_float80;
+mod cached_float160;
+mod errors;
+mod large_powers;
+mod math;
+mod small_powers;
+
+#[cfg(limb_width_32)]
+mod large_powers_32;
+
+#[cfg(limb_width_32)]
+mod small_powers_32;
+
+#[cfg(limb_width_64)]
+mod large_powers_64;
+
+// Required for fast-path, keep on all platforms.
+mod small_powers_64;
+
+}}  // cfg_if
+
+// Export algorithms.
+#[cfg(feature = "correct")]
+pub(crate) mod correct;
+
+#[cfg(not(feature = "correct"))]
+pub(crate) mod incorrect;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers_32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers_32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers_32.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers_32.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,49 @@
+//! Precalculated small powers for 32-bit limbs.
+
+// DECIMAL
+
+pub(super) const POW5: [u32; 14] = [1, 5, 25, 125, 625, 3125, 15625, 78125, 390625, 1953125, 9765625, 48828125, 244140625, 1220703125];
+pub(super) const POW10: [u32; 10] = [1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000];
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+// PRIME (EXCEPT 2)
+
+pub(super) const POW3: [u32; 21] = [1, 3, 9, 27, 81, 243, 729, 2187, 6561, 19683, 59049, 177147,  531441, 1594323, 4782969, 14348907, 43046721, 129140163, 387420489, 1162261467, 3486784401];
+pub(super) const POW7: [u32; 12] = [1, 7, 49, 343, 2401, 16807, 117649, 823543, 5764801, 40353607, 282475249, 1977326743];
+pub(super) const POW11: [u32; 10] = [1, 11, 121, 1331, 14641, 161051, 1771561, 19487171, 214358881, 2357947691];
+pub(super) const POW13: [u32; 9] = [1, 13, 169, 2197, 28561, 371293, 4826809, 62748517, 815730721];
+pub(super) const POW17: [u32; 8] = [1, 17, 289, 4913, 83521, 1419857, 24137569, 410338673];
+pub(super) const POW19: [u32; 8] = [1, 19, 361, 6859, 130321, 2476099, 47045881, 893871739];
+pub(super) const POW23: [u32; 8] = [1, 23, 529, 12167, 279841, 6436343, 148035889, 3404825447];
+pub(super) const POW29: [u32; 7] = [1, 29, 841, 24389, 707281, 20511149, 594823321];
+pub(super) const POW31: [u32; 7] = [1, 31, 961, 29791, 923521, 28629151, 887503681];
+
+// NON-PRIME (AND 2)
+
+pub(super) const POW2: [u32; 32] = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912, 1073741824, 2147483648];
+pub(super) const POW4: [u32; 16] = [1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864, 268435456, 1073741824];
+pub(super) const POW6: [u32; 13] = [1, 6, 36, 216, 1296, 7776, 46656, 279936, 1679616, 10077696, 60466176, 362797056, 2176782336];
+pub(super) const POW8: [u32; 11] = [1, 8, 64, 512, 4096, 32768, 262144, 2097152, 16777216, 134217728, 1073741824];
+pub(super) const POW9: [u32; 11] = [1, 9, 81, 729, 6561, 59049, 531441, 4782969, 43046721, 387420489, 3486784401];
+pub(super) const POW12: [u32; 9] = [1, 12, 144, 1728, 20736, 248832, 2985984, 35831808, 429981696];
+pub(super) const POW14: [u32; 9] = [1, 14, 196, 2744, 38416, 537824, 7529536, 105413504, 1475789056];
+pub(super) const POW15: [u32; 9] = [1, 15, 225, 3375, 50625, 759375, 11390625, 170859375, 2562890625];
+pub(super) const POW16: [u32; 8] = [1, 16, 256, 4096, 65536, 1048576, 16777216, 268435456];
+pub(super) const POW18: [u32; 8] = [1, 18, 324, 5832, 104976, 1889568, 34012224, 612220032];
+pub(super) const POW20: [u32; 8] = [1, 20, 400, 8000, 160000, 3200000, 64000000, 1280000000];
+pub(super) const POW21: [u32; 8] = [1, 21, 441, 9261, 194481, 4084101, 85766121, 1801088541];
+pub(super) const POW22: [u32; 8] = [1, 22, 484, 10648, 234256, 5153632, 113379904, 2494357888];
+pub(super) const POW24: [u32; 7] = [1, 24, 576, 13824, 331776, 7962624, 191102976];
+pub(super) const POW25: [u32; 7] = [1, 25, 625, 15625, 390625, 9765625, 244140625];
+pub(super) const POW26: [u32; 7] = [1, 26, 676, 17576, 456976, 11881376, 308915776];
+pub(super) const POW27: [u32; 7] = [1, 27, 729, 19683, 531441, 14348907, 387420489];
+pub(super) const POW28: [u32; 7] = [1, 28, 784, 21952, 614656, 17210368, 481890304];
+pub(super) const POW30: [u32; 7] = [1, 30, 900, 27000, 810000, 24300000, 729000000];
+pub(super) const POW32: [u32; 7] = [1, 32, 1024, 32768, 1048576, 33554432, 1073741824];
+pub(super) const POW33: [u32; 7] = [1, 33, 1089, 35937, 1185921, 39135393, 1291467969];
+pub(super) const POW34: [u32; 7] = [1, 34, 1156, 39304, 1336336, 45435424, 1544804416];
+pub(super) const POW35: [u32; 7] = [1, 35, 1225, 42875, 1500625, 52521875, 1838265625];
+pub(super) const POW36: [u32; 7] = [1, 36, 1296, 46656, 1679616, 60466176, 2176782336];
+
+}}  // cfg_if
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers_64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers_64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers_64.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers_64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,46 @@
+//! Precalculated small powers for 64-bit limbs.
+
+// DECIMAL
+pub(super) const POW5: [u64; 28] = [1, 5, 25, 125, 625, 3125, 15625, 78125, 390625, 1953125, 9765625, 48828125, 244140625, 1220703125, 6103515625, 30517578125, 152587890625, 762939453125, 3814697265625, 19073486328125, 95367431640625, 476837158203125, 2384185791015625, 11920928955078125, 59604644775390625, 298023223876953125, 1490116119384765625, 7450580596923828125];
+pub(super) const POW10: [u64; 20] = [1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000, 10000000000, 100000000000, 1000000000000, 10000000000000, 100000000000000, 1000000000000000, 10000000000000000, 100000000000000000, 1000000000000000000, 10000000000000000000];
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+// PRIME (EXCEPT 2)
+pub(super) const POW3: [u64; 41] = [1, 3, 9, 27, 81, 243, 729, 2187, 6561, 19683, 59049, 177147, 531441, 1594323, 4782969, 14348907, 43046721, 129140163, 387420489, 1162261467, 3486784401, 10460353203, 31381059609, 94143178827, 282429536481, 847288609443, 2541865828329, 7625597484987, 22876792454961, 68630377364883, 205891132094649, 617673396283947, 1853020188851841, 5559060566555523, 16677181699666569, 50031545098999707, 150094635296999121, 450283905890997363, 1350851717672992089, 4052555153018976267, 12157665459056928801];
+pub(super) const POW7: [u64; 23] = [1, 7, 49, 343, 2401, 16807, 117649, 823543, 5764801, 40353607, 282475249, 1977326743, 13841287201, 96889010407, 678223072849, 4747561509943, 33232930569601, 232630513987207, 1628413597910449, 11398895185373143, 79792266297612001, 558545864083284007, 3909821048582988049];
+pub(super) const POW11: [u64; 19] = [1, 11, 121, 1331, 14641, 161051, 1771561, 19487171, 214358881, 2357947691, 25937424601, 285311670611, 3138428376721, 34522712143931, 379749833583241, 4177248169415651, 45949729863572161, 505447028499293771, 5559917313492231481];
+pub(super) const POW13: [u64; 18] = [1, 13, 169, 2197, 28561, 371293, 4826809, 62748517, 815730721, 10604499373, 137858491849, 1792160394037, 23298085122481, 302875106592253, 3937376385699289, 51185893014090757, 665416609183179841, 8650415919381337933];
+pub(super) const POW17: [u64; 16] = [1, 17, 289, 4913, 83521, 1419857, 24137569, 410338673, 6975757441, 118587876497, 2015993900449, 34271896307633, 582622237229761, 9904578032905937, 168377826559400929, 2862423051509815793];
+pub(super) const POW19: [u64; 16] = [1, 19, 361, 6859, 130321, 2476099, 47045881, 893871739, 16983563041, 322687697779, 6131066257801, 116490258898219, 2213314919066161, 42052983462257059, 799006685782884121, 15181127029874798299];
+pub(super) const POW23: [u64; 15] = [1, 23, 529, 12167, 279841, 6436343, 148035889, 3404825447, 78310985281, 1801152661463, 41426511213649, 952809757913927, 21914624432020321, 504036361936467383, 11592836324538749809];
+pub(super) const POW29: [u64; 14] = [1, 29, 841, 24389, 707281, 20511149, 594823321, 17249876309, 500246412961, 14507145975869, 420707233300201, 12200509765705829, 353814783205469041, 10260628712958602189];
+pub(super) const POW31: [u64; 13] = [1, 31, 961, 29791, 923521, 28629151, 887503681, 27512614111, 852891037441, 26439622160671, 819628286980801, 25408476896404831, 787662783788549761];
+
+// NON-PRIME (AND 2)
+pub(super) const POW2: [u64; 64] = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912, 1073741824, 2147483648, 4294967296, 8589934592, 17179869184, 34359738368, 68719476736, 137438953472, 274877906944, 549755813888, 1099511627776, 2199023255552, 4398046511104, 8796093022208, 17592186044416, 35184372088832, 70368744177664, 140737488355328, 281474976710656, 562949953421312, 1125899906842624, 2251799813685248, 4503599627370496, 9007199254740992, 18014398509481984, 36028797018963968, 72057594037927936, 144115188075855872, 288230376151711744, 576460752303423488, 1152921504606846976, 2305843009213693952, 4611686018427387904, 9223372036854775808];
+pub(super) const POW4: [u64; 32] = [1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864, 268435456, 1073741824, 4294967296, 17179869184, 68719476736, 274877906944, 1099511627776, 4398046511104, 17592186044416, 70368744177664, 281474976710656, 1125899906842624, 4503599627370496, 18014398509481984, 72057594037927936, 288230376151711744, 1152921504606846976, 4611686018427387904];
+pub(super) const POW6: [u64; 25] = [1, 6, 36, 216, 1296, 7776, 46656, 279936, 1679616, 10077696, 60466176, 362797056, 2176782336, 13060694016, 78364164096, 470184984576, 2821109907456, 16926659444736, 101559956668416, 609359740010496, 3656158440062976, 21936950640377856, 131621703842267136, 789730223053602816, 4738381338321616896];
+pub(super) const POW8: [u64; 22] = [1, 8, 64, 512, 4096, 32768, 262144, 2097152, 16777216, 134217728, 1073741824, 8589934592, 68719476736, 549755813888, 4398046511104, 35184372088832, 281474976710656, 2251799813685248, 18014398509481984, 144115188075855872, 1152921504606846976, 9223372036854775808];
+pub(super) const POW9: [u64; 21] = [1, 9, 81, 729, 6561, 59049, 531441, 4782969, 43046721, 387420489, 3486784401, 31381059609, 282429536481, 2541865828329, 22876792454961, 205891132094649, 1853020188851841, 16677181699666569, 150094635296999121, 1350851717672992089, 12157665459056928801];
+pub(super) const POW12: [u64; 18] = [1, 12, 144, 1728, 20736, 248832, 2985984, 35831808, 429981696, 5159780352, 61917364224, 743008370688, 8916100448256, 106993205379072, 1283918464548864, 15407021574586368, 184884258895036416, 2218611106740436992];
+pub(super) const POW14: [u64; 17] = [1, 14, 196, 2744, 38416, 537824, 7529536, 105413504, 1475789056, 20661046784, 289254654976, 4049565169664, 56693912375296, 793714773254144, 11112006825558016, 155568095557812224, 2177953337809371136];
+pub(super) const POW15: [u64; 17] = [1, 15, 225, 3375, 50625, 759375, 11390625, 170859375, 2562890625, 38443359375, 576650390625, 8649755859375, 129746337890625, 1946195068359375, 29192926025390625, 437893890380859375, 6568408355712890625];
+pub(super) const POW16: [u64; 16] = [1, 16, 256, 4096, 65536, 1048576, 16777216, 268435456, 4294967296, 68719476736, 1099511627776, 17592186044416, 281474976710656, 4503599627370496, 72057594037927936, 1152921504606846976];
+pub(super) const POW18: [u64; 16] = [1, 18, 324, 5832, 104976, 1889568, 34012224, 612220032, 11019960576, 198359290368, 3570467226624, 64268410079232, 1156831381426176, 20822964865671168, 374813367582081024, 6746640616477458432];
+pub(super) const POW20: [u64; 15] = [1, 20, 400, 8000, 160000, 3200000, 64000000, 1280000000, 25600000000, 512000000000, 10240000000000, 204800000000000, 4096000000000000, 81920000000000000, 1638400000000000000];
+pub(super) const POW21: [u64; 15] = [1, 21, 441, 9261, 194481, 4084101, 85766121, 1801088541, 37822859361, 794280046581, 16679880978201, 350277500542221, 7355827511386641, 154472377739119461, 3243919932521508681];
+pub(super) const POW22: [u64; 15] = [1, 22, 484, 10648, 234256, 5153632, 113379904, 2494357888, 54875873536, 1207269217792, 26559922791424, 584318301411328, 12855002631049216, 282810057883082752, 6221821273427820544];
+pub(super) const POW24: [u64; 14] = [1, 24, 576, 13824, 331776, 7962624, 191102976, 4586471424, 110075314176, 2641807540224, 63403380965376, 1521681143169024, 36520347436056576, 876488338465357824];
+pub(super) const POW25: [u64; 14] = [1, 25, 625, 15625, 390625, 9765625, 244140625, 6103515625, 152587890625, 3814697265625, 95367431640625, 2384185791015625, 59604644775390625, 1490116119384765625];
+pub(super) const POW26: [u64; 14] = [1, 26, 676, 17576, 456976, 11881376, 308915776, 8031810176, 208827064576, 5429503678976, 141167095653376, 3670344486987776, 95428956661682176, 2481152873203736576];
+pub(super) const POW27: [u64; 14] = [1, 27, 729, 19683, 531441, 14348907, 387420489, 10460353203, 282429536481, 7625597484987, 205891132094649, 5559060566555523, 150094635296999121, 4052555153018976267];
+pub(super) const POW28: [u64; 14] = [1, 28, 784, 21952, 614656, 17210368, 481890304, 13492928512, 377801998336, 10578455953408, 296196766695424, 8293509467471872, 232218265089212416, 6502111422497947648];
+pub(super) const POW30: [u64; 14] = [1, 30, 900, 27000, 810000, 24300000, 729000000, 21870000000, 656100000000, 19683000000000, 590490000000000, 17714700000000000, 531441000000000000, 15943230000000000000];
+pub(super) const POW32: [u64; 13] = [1, 32, 1024, 32768, 1048576, 33554432, 1073741824, 34359738368, 1099511627776, 35184372088832, 1125899906842624, 36028797018963968, 1152921504606846976];
+pub(super) const POW33: [u64; 13] = [1, 33, 1089, 35937, 1185921, 39135393, 1291467969, 42618442977, 1406408618241, 46411484401953, 1531578985264449, 50542106513726817, 1667889514952984961];
+pub(super) const POW34: [u64; 13] = [1, 34, 1156, 39304, 1336336, 45435424, 1544804416, 52523350144, 1785793904896, 60716992766464, 2064377754059776, 70188843638032384, 2386420683693101056];
+pub(super) const POW35: [u64; 13] = [1, 35, 1225, 42875, 1500625, 52521875, 1838265625, 64339296875, 2251875390625, 78815638671875, 2758547353515625, 96549157373046875, 3379220508056640625];
+pub(super) const POW36: [u64; 13] = [1, 36, 1296, 46656, 1679616, 60466176, 2176782336, 78364164096, 2821109907456, 101559956668416, 3656158440062976, 131621703842267136, 4738381338321616896];
+
+}}  //cfg_if
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/algorithm/small_powers.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,166 @@
+//! Precalculated small powers.
+
+#[cfg(any(feature = "correct", feature = "format"))]
+use static_assertions::const_assert;
+
+use super::math::Limb;
+use super::small_powers_64;
+
+#[cfg(limb_width_32)]
+use super::small_powers_32::*;
+
+#[cfg(limb_width_64)]
+use super::small_powers_64::*;
+
+// ASSERTIONS
+const_assert!(POW5[1] / POW5[0] == 5);
+const_assert!(POW10[1] / POW10[0] == 10);
+
+cfg_if! {
+if #[cfg(feature = "radix")] {
+// Ensure our small powers are valid.
+const_assert!(POW2[1] / POW2[0] == 2);
+const_assert!(POW3[1] / POW3[0] == 3);
+const_assert!(POW4[1] / POW4[0] == 4);
+const_assert!(POW6[1] / POW6[0] == 6);
+const_assert!(POW7[1] / POW7[0] == 7);
+const_assert!(POW8[1] / POW8[0] == 8);
+const_assert!(POW9[1] / POW9[0] == 9);
+const_assert!(POW11[1] / POW11[0] == 11);
+const_assert!(POW12[1] / POW12[0] == 12);
+const_assert!(POW13[1] / POW13[0] == 13);
+const_assert!(POW14[1] / POW14[0] == 14);
+const_assert!(POW15[1] / POW15[0] == 15);
+const_assert!(POW16[1] / POW16[0] == 16);
+const_assert!(POW17[1] / POW17[0] == 17);
+const_assert!(POW18[1] / POW18[0] == 18);
+const_assert!(POW19[1] / POW19[0] == 19);
+const_assert!(POW20[1] / POW20[0] == 20);
+const_assert!(POW21[1] / POW21[0] == 21);
+const_assert!(POW22[1] / POW22[0] == 22);
+const_assert!(POW23[1] / POW23[0] == 23);
+const_assert!(POW24[1] / POW24[0] == 24);
+const_assert!(POW25[1] / POW25[0] == 25);
+const_assert!(POW26[1] / POW26[0] == 26);
+const_assert!(POW27[1] / POW27[0] == 27);
+const_assert!(POW28[1] / POW28[0] == 28);
+const_assert!(POW29[1] / POW29[0] == 29);
+const_assert!(POW30[1] / POW30[0] == 30);
+const_assert!(POW31[1] / POW31[0] == 31);
+const_assert!(POW32[1] / POW32[0] == 32);
+const_assert!(POW33[1] / POW33[0] == 33);
+const_assert!(POW34[1] / POW34[0] == 34);
+const_assert!(POW35[1] / POW35[0] == 35);
+const_assert!(POW36[1] / POW36[0] == 36);
+
+}} //cfg_if
+
+// HELPER
+
+/// Get the correct small power from the radix.
+pub(in crate::atof::algorithm) fn get_small_powers(radix: u32)
+    -> &'static [Limb]
+{
+    #[cfg(not(feature = "radix"))] {
+        match radix {
+            5  => &POW5,
+            10 => &POW10,
+            _  => unreachable!()
+        }
+    }
+
+    #[cfg(feature = "radix")] {
+        match radix {
+            2  => &POW2,
+            3  => &POW3,
+            4  => &POW4,
+            5  => &POW5,
+            6  => &POW6,
+            7  => &POW7,
+            8  => &POW8,
+            9  => &POW9,
+            10  => &POW10,
+            11  => &POW11,
+            12  => &POW12,
+            13  => &POW13,
+            14  => &POW14,
+            15  => &POW15,
+            16  => &POW16,
+            17  => &POW17,
+            18  => &POW18,
+            19  => &POW19,
+            20  => &POW20,
+            21  => &POW21,
+            22  => &POW22,
+            23  => &POW23,
+            24  => &POW24,
+            25  => &POW25,
+            26  => &POW26,
+            27  => &POW27,
+            28  => &POW28,
+            29  => &POW29,
+            30  => &POW30,
+            31  => &POW31,
+            32  => &POW32,
+            33  => &POW33,
+            34  => &POW34,
+            35  => &POW35,
+            36  => &POW36,
+            _  => unreachable!(),
+        }
+    }
+}
+
+/// Get the correct 64-bit small power from the radix.
+pub(in crate::atof::algorithm) fn get_small_powers_64(radix: u32)
+    -> &'static [u64]
+{
+    #[cfg(not(feature = "radix"))] {
+        match radix {
+            5  => &small_powers_64::POW5,
+            10 => &small_powers_64::POW10,
+            _  => unreachable!()
+        }
+    }
+
+    #[cfg(feature = "radix")] {
+        match radix {
+            2  => &small_powers_64::POW2,
+            3  => &small_powers_64::POW3,
+            4  => &small_powers_64::POW4,
+            5  => &small_powers_64::POW5,
+            6  => &small_powers_64::POW6,
+            7  => &small_powers_64::POW7,
+            8  => &small_powers_64::POW8,
+            9  => &small_powers_64::POW9,
+            10  => &small_powers_64::POW10,
+            11  => &small_powers_64::POW11,
+            12  => &small_powers_64::POW12,
+            13  => &small_powers_64::POW13,
+            14  => &small_powers_64::POW14,
+            15  => &small_powers_64::POW15,
+            16  => &small_powers_64::POW16,
+            17  => &small_powers_64::POW17,
+            18  => &small_powers_64::POW18,
+            19  => &small_powers_64::POW19,
+            20  => &small_powers_64::POW20,
+            21  => &small_powers_64::POW21,
+            22  => &small_powers_64::POW22,
+            23  => &small_powers_64::POW23,
+            24  => &small_powers_64::POW24,
+            25  => &small_powers_64::POW25,
+            26  => &small_powers_64::POW26,
+            27  => &small_powers_64::POW27,
+            28  => &small_powers_64::POW28,
+            29  => &small_powers_64::POW29,
+            30  => &small_powers_64::POW30,
+            31  => &small_powers_64::POW31,
+            32  => &small_powers_64::POW32,
+            33  => &small_powers_64::POW33,
+            34  => &small_powers_64::POW34,
+            35  => &small_powers_64::POW35,
+            36  => &small_powers_64::POW36,
+            _  => unreachable!(),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/api.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1038 @@
+//! Low-level API generator.
+//!
+//! Uses either the imprecise or the precise algorithm.
+
+use crate::lib::slice;
+use crate::util::*;
+
+// Select the back-end
+cfg_if! {
+if #[cfg(feature = "correct")] {
+    use super::algorithm::correct as algorithm;
+} else {
+    use super::algorithm::incorrect as algorithm;
+}}  // cfg_if
+
+// TRAITS
+
+/// Trait to define parsing of a string to float.
+trait StringToFloat: Float {
+    /// Serialize string to float, favoring correctness.
+    fn default(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat) -> ParseResult<(Self, *const u8)>;
+}
+
+impl StringToFloat for f32 {
+    perftools_inline_always!{
+    fn default(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+        -> ParseResult<(f32, *const u8)>
+    {
+        algorithm::atof(bytes, radix, lossy, sign, format)
+    }}
+}
+
+impl StringToFloat for f64 {
+    perftools_inline_always!{
+    fn default(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+        -> ParseResult<(f64, *const u8)>
+    {
+        algorithm::atod(bytes, radix, lossy, sign, format)
+    }}
+}
+
+// SPECIAL
+// Utilities to filter special values.
+
+// Convert slice to iterator without digit separators.
+perftools_inline!{
+fn to_iter<'a>(bytes: &'a [u8], _: u8) -> slice::Iter<'a, u8> {
+    bytes.iter()
+}}
+
+// Convert slice to iterator with digit separators.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn to_iter_s<'a>(bytes: &'a [u8], digit_separator: u8) -> SkipValueIterator<'a, u8> {
+    SkipValueIterator::new(bytes, digit_separator)
+}}
+
+// PARSER
+
+// Parse infinity from string.
+perftools_inline!{
+fn parse_infinity<'a, ToIter, StartsWith, Iter, F>(
+    bytes: &'a [u8],
+    radix: u32,
+    lossy: bool,
+    sign: Sign,
+    format: NumberFormat,
+    to_iter: ToIter,
+    starts_with: StartsWith
+)
+    -> ParseResult<(F, *const u8)>
+    where F: StringToFloat,
+          ToIter: Fn(&'a [u8], u8) -> Iter,
+          Iter: AsPtrIterator<'a, u8>,
+          StartsWith: Fn(Iter, slice::Iter<'a, u8>) -> (bool, Iter)
+{
+    let infinity = get_infinity_string();
+    let inf = get_inf_string();
+    if let (true, iter) = starts_with(to_iter(bytes, format.digit_separator()), infinity.iter()) {
+        Ok((F::INFINITY, iter.as_ptr()))
+    } else if let (true, iter) = starts_with(to_iter(bytes, format.digit_separator()), inf.iter()) {
+        Ok((F::INFINITY, iter.as_ptr()))
+    } else {
+        // Not infinity, may be valid with a different radix.
+        if cfg!(feature = "radix"){
+            F::default(bytes, radix, lossy, sign, format)
+        } else {
+            Err((ErrorCode::InvalidDigit, bytes.as_ptr()))
+        }
+    }
+}}
+
+// Parse NaN from string.
+perftools_inline!{
+fn parse_nan<'a, ToIter, StartsWith, Iter, F>(
+    bytes: &'a [u8],
+    radix: u32,
+    lossy: bool,
+    sign: Sign,
+    format: NumberFormat,
+    to_iter: ToIter,
+    starts_with: StartsWith
+)
+-> ParseResult<(F, *const u8)>
+    where F: StringToFloat,
+          ToIter: Fn(&'a [u8], u8) -> Iter,
+          Iter: AsPtrIterator<'a, u8>,
+          StartsWith: Fn(Iter, slice::Iter<'a, u8>) -> (bool, Iter)
+{
+    let nan = get_nan_string();
+    if let (true, iter) = starts_with(to_iter(bytes, format.digit_separator()), nan.iter()) {
+        Ok((F::NAN, iter.as_ptr()))
+    } else {
+        // Not NaN, may be valid with a different radix.
+        if cfg!(feature = "radix"){
+            F::default(bytes, radix, lossy, sign, format)
+        } else {
+            Err((ErrorCode::InvalidDigit, bytes.as_ptr()))
+        }
+    }
+}}
+
+// ATOF/ATOD
+
+// Parse special or float values with the standard format.
+// Special values are allowed, the match is case-insensitive,
+// and no digit separators are allowed.
+perftools_inline!{
+fn parse_float_standard<F: StringToFloat>(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+{
+    // Use predictive parsing to filter special cases. This leads to
+    // dramatic performance gains.
+    let starts_with = case_insensitive_starts_with_iter;
+    match index!(bytes[0]) {
+        b'i' | b'I' => parse_infinity(bytes, radix, lossy, sign, format, to_iter, starts_with),
+        b'N' | b'n' => parse_nan(bytes, radix, lossy, sign, format, to_iter, starts_with),
+        _           => F::default(bytes, radix, lossy, sign, format),
+    }
+}}
+
+// Parse special or float values.
+// Special values are allowed, the match is case-sensitive,
+// and digit separators are allowed.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn parse_float_cs<F: StringToFloat>(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+{
+    let digit_separator = format.digit_separator();
+    let starts_with = starts_with_iter;
+    match SkipValueIterator::new(bytes, digit_separator).next()  {
+        Some(&b'i') | Some(&b'I')   => parse_infinity(bytes, radix, lossy, sign, format, to_iter_s, starts_with),
+        Some(&b'n') | Some(&b'N')   => parse_nan(bytes, radix, lossy, sign, format, to_iter_s, starts_with),
+        _                           => F::default(bytes, radix, lossy, sign, format),
+    }
+}}
+
+// Parse special or float values.
+// Special values are allowed, the match is case-sensitive,
+// and no digit separators are allowed.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn parse_float_c<F: StringToFloat>(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+{
+    // Use predictive parsing to filter special cases. This leads to
+    // dramatic performance gains.
+    let starts_with = starts_with_iter;
+    match index!(bytes[0]) {
+        b'i' | b'I' => parse_infinity(bytes, radix, lossy, sign, format, to_iter, starts_with),
+        b'N' | b'n' => parse_nan(bytes, radix, lossy, sign, format, to_iter, starts_with),
+        _           => F::default(bytes, radix, lossy, sign, format),
+    }
+}}
+
+// Parse special or float values.
+// Special values are allowed, the match is case-insensitive,
+// and digit separators are allowed.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn parse_float_s<F: StringToFloat>(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+{
+    let digit_separator = format.digit_separator();
+    let starts_with = case_insensitive_starts_with_iter;
+    match SkipValueIterator::new(bytes, digit_separator).next()  {
+        Some(&b'i') | Some(&b'I')   => parse_infinity(bytes, radix, lossy, sign, format, to_iter_s, starts_with),
+        Some(&b'n') | Some(&b'N')   => parse_nan(bytes, radix, lossy, sign, format, to_iter_s, starts_with),
+        _                           => F::default(bytes, radix, lossy, sign, format),
+    }
+}}
+
+// Parse special or float values with the default formatter.
+perftools_inline!{
+#[cfg(not(feature = "format"))]
+fn parse_float<F: StringToFloat>(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+{
+    parse_float_standard(bytes, radix, lossy, sign, format)
+}}
+
+// Parse special or float values with the default formatter.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn parse_float<F: StringToFloat>(bytes: &[u8], radix: u32, lossy: bool, sign: Sign, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+{
+    // Need to consider 3 possibilities:
+    //  1). No special values are allowed.
+    //  2). Special values are case-sensitive.
+    //  3). Digit separators are allowed in the special.
+    let no_special = format.no_special();
+    let case = format.case_sensitive_special();
+    let has_sep = format.special_digit_separator();
+    match (no_special, case, has_sep) {
+        (true, _, _)            => F::default(bytes, radix, lossy, sign, format),
+        (false, true, true)     => parse_float_cs(bytes, radix, lossy, sign, format),
+        (false, false, true)    => parse_float_s(bytes, radix, lossy, sign, format),
+        (false, true, false)    => parse_float_c(bytes, radix, lossy, sign, format),
+        (false, false, false)   => parse_float_standard(bytes, radix, lossy, sign, format),
+    }
+}}
+
+// Validate sign byte is valid.
+perftools_inline!{
+#[cfg(not(feature = "format"))]
+fn validate_sign(_: &[u8], _: &[u8], _: Sign, _: NumberFormat)
+    -> ParseResult<()>
+{
+    Ok(())
+}}
+
+// Validate sign byte is valid.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn validate_sign(bytes: &[u8], digits: &[u8], sign: Sign, format: NumberFormat)
+    -> ParseResult<()>
+{
+    let has_sign = bytes.as_ptr() != digits.as_ptr();
+    if format.no_positive_mantissa_sign() && has_sign && sign == Sign::Positive {
+        Err((ErrorCode::InvalidPositiveMantissaSign, bytes.as_ptr()))
+    } else if format.required_mantissa_sign() && !has_sign {
+        Err((ErrorCode::MissingMantissaSign, bytes.as_ptr()))
+    } else {
+        Ok(())
+    }
+}}
+
+// Convert float to signed representation.
+perftools_inline!{
+fn to_signed<F: StringToFloat>(float: F, sign: Sign) -> F
+{
+    match sign {
+        Sign::Positive => float,
+        Sign::Negative => -float
+    }
+}}
+
+// Standalone atof processor.
+perftools_inline!{
+fn atof<F: StringToFloat>(bytes: &[u8], radix: u32, lossy: bool, format: NumberFormat)
+    -> ParseResult<(F, *const u8)>
+{
+    let (sign, digits) = parse_sign::<F>(bytes, format);
+    if digits.is_empty() {
+        return Err((ErrorCode::Empty, digits.as_ptr()));
+    }
+    let (float, ptr): (F, *const u8) = parse_float(digits, radix, lossy, sign, format)?;
+    validate_sign(bytes, digits, sign, format)?;
+
+    Ok((to_signed(float, sign), ptr))
+}}
+
+perftools_inline!{
+fn atof_lossy<F: StringToFloat>(bytes: &[u8], radix: u32)
+    -> Result<(F, usize)>
+{
+    let index = | ptr | distance(bytes.as_ptr(), ptr);
+    match atof::<F>(bytes, radix, true, NumberFormat::standard().unwrap()) {
+        Ok((value, ptr)) => Ok((value, index(ptr))),
+        Err((code, ptr)) => Err((code, index(ptr)).into()),
+    }
+}}
+
+perftools_inline!{
+fn atof_nonlossy<F: StringToFloat>(bytes: &[u8], radix: u32)
+    -> Result<(F, usize)>
+{
+    let index = | ptr | distance(bytes.as_ptr(), ptr);
+    match atof::<F>(bytes, radix, false, NumberFormat::standard().unwrap()) {
+        Ok((value, ptr)) => Ok((value, index(ptr))),
+        Err((code, ptr)) => Err((code, index(ptr)).into()),
+    }
+}}
+
+perftools_inline!{
+#[cfg(feature = "format")]
+fn atof_format<F: StringToFloat>(bytes: &[u8], radix: u32, format: NumberFormat)
+    -> Result<(F, usize)>
+{
+    let index = | ptr | distance(bytes.as_ptr(), ptr);
+    match atof::<F>(bytes, radix, false, format) {
+        Ok((value, ptr)) => Ok((value, index(ptr))),
+        Err((code, ptr)) => Err((code, index(ptr)).into()),
+    }
+}}
+
+perftools_inline!{
+#[cfg(feature = "format")]
+fn atof_lossy_format<F: StringToFloat>(bytes: &[u8], radix: u32, format: NumberFormat)
+    -> Result<(F, usize)>
+{
+    let index = | ptr | distance(bytes.as_ptr(), ptr);
+    match atof::<F>(bytes, radix, true, format) {
+        Ok((value, ptr)) => Ok((value, index(ptr))),
+        Err((code, ptr)) => Err((code, index(ptr)).into()),
+    }
+}}
+
+// FROM LEXICAL
+// ------------
+
+from_lexical!(atof_nonlossy, f32);
+from_lexical!(atof_nonlossy, f64);
+from_lexical_lossy!(atof_lossy, f32);
+from_lexical_lossy!(atof_lossy, f64);
+
+cfg_if!{
+if #[cfg(feature = "format")] {
+    from_lexical_format!(atof_format, f32);
+    from_lexical_format!(atof_format, f64);
+    from_lexical_lossy_format!(atof_lossy_format, f32);
+    from_lexical_lossy_format!(atof_lossy_format, f64);
+}}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::*;
+
+    use approx::assert_relative_eq;
+    #[cfg(all(feature = "std", feature = "property_tests"))]
+    use proptest::{proptest, prop_assert_eq, prop_assert};
+
+    #[test]
+    fn f32_decimal_test() {
+        // integer test
+        assert_f32_eq!(0.0, f32::from_lexical(b"0").unwrap());
+        assert_f32_eq!(1.0, f32::from_lexical(b"1").unwrap());
+        assert_f32_eq!(12.0, f32::from_lexical(b"12").unwrap());
+        assert_f32_eq!(123.0, f32::from_lexical(b"123").unwrap());
+        assert_f32_eq!(1234.0, f32::from_lexical(b"1234").unwrap());
+        assert_f32_eq!(12345.0, f32::from_lexical(b"12345").unwrap());
+        assert_f32_eq!(123456.0, f32::from_lexical(b"123456").unwrap());
+        assert_f32_eq!(1234567.0, f32::from_lexical(b"1234567").unwrap());
+        assert_f32_eq!(12345678.0, f32::from_lexical(b"12345678").unwrap());
+
+         // No fraction after decimal point test
+        assert_f32_eq!(1.0, f32::from_lexical(b"1.").unwrap());
+        assert_f32_eq!(12.0, f32::from_lexical(b"12.").unwrap());
+        assert_f32_eq!(1234567.0, f32::from_lexical(b"1234567.").unwrap());
+
+        // No integer before decimal point test
+        assert_f32_eq!(0.1, f32::from_lexical(b".1").unwrap());
+        assert_f32_eq!(0.12, f32::from_lexical(b".12").unwrap());
+        assert_f32_eq!(0.1234567, f32::from_lexical(b".1234567").unwrap());
+
+        // decimal test
+        assert_f32_eq!(123.1, f32::from_lexical(b"123.1").unwrap());
+        assert_f32_eq!(123.12, f32::from_lexical(b"123.12").unwrap());
+        assert_f32_eq!(123.123, f32::from_lexical(b"123.123").unwrap());
+        assert_f32_eq!(123.1234, f32::from_lexical(b"123.1234").unwrap());
+        assert_f32_eq!(123.12345, f32::from_lexical(b"123.12345").unwrap());
+
+        // rounding test
+        assert_f32_eq!(123456790.0, f32::from_lexical(b"123456789").unwrap());
+        assert_f32_eq!(123456790.0, f32::from_lexical(b"123456789.1").unwrap());
+        assert_f32_eq!(123456790.0, f32::from_lexical(b"123456789.12").unwrap());
+        assert_f32_eq!(123456790.0, f32::from_lexical(b"123456789.123").unwrap());
+        assert_f32_eq!(123456790.0, f32::from_lexical(b"123456789.1234").unwrap());
+        assert_f32_eq!(123456790.0, f32::from_lexical(b"123456789.12345").unwrap());
+
+        // exponent test
+        assert_f32_eq!(123456789.12345, f32::from_lexical(b"1.2345678912345e8").unwrap());
+        assert_f32_eq!(123450000.0, f32::from_lexical(b"1.2345e+8").unwrap());
+        assert_f32_eq!(1.2345e+11, f32::from_lexical(b"1.2345e+11").unwrap());
+        assert_f32_eq!(1.2345e+11, f32::from_lexical(b"123450000000").unwrap());
+        assert_f32_eq!(1.2345e+38, f32::from_lexical(b"1.2345e+38").unwrap());
+        assert_f32_eq!(1.2345e+38, f32::from_lexical(b"123450000000000000000000000000000000000").unwrap());
+        assert_f32_eq!(1.2345e-8, f32::from_lexical(b"1.2345e-8").unwrap());
+        assert_f32_eq!(1.2345e-8, f32::from_lexical(b"0.000000012345").unwrap());
+        assert_f32_eq!(1.2345e-38, f32::from_lexical(b"1.2345e-38").unwrap());
+        assert_f32_eq!(1.2345e-38, f32::from_lexical(b"0.000000000000000000000000000000000000012345").unwrap());
+
+        assert!(f32::from_lexical(b"NaN").unwrap().is_nan());
+        assert!(f32::from_lexical(b"nan").unwrap().is_nan());
+        assert!(f32::from_lexical(b"NAN").unwrap().is_nan());
+        assert!(f32::from_lexical(b"inf").unwrap().is_infinite());
+        assert!(f32::from_lexical(b"INF").unwrap().is_infinite());
+        assert!(f32::from_lexical(b"+inf").unwrap().is_infinite());
+        assert!(f32::from_lexical(b"-inf").unwrap().is_infinite());
+
+        // Check various expected failures.
+        assert_eq!(Err(ErrorCode::Empty.into()), f32::from_lexical(b""));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f32::from_lexical(b"e"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f32::from_lexical(b"E"));
+        assert_eq!(Err(ErrorCode::EmptyMantissa.into()), f32::from_lexical(b".e1"));
+        assert_eq!(Err(ErrorCode::EmptyMantissa.into()), f32::from_lexical(b".e-1"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f32::from_lexical(b"e1"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f32::from_lexical(b"e-1"));
+        assert_eq!(Err((ErrorCode::Empty, 1).into()), f32::from_lexical(b"+"));
+        assert_eq!(Err((ErrorCode::Empty, 1).into()), f32::from_lexical(b"-"));
+
+        // Bug fix for Issue #8
+        assert_eq!(Ok(5.002868148396374), f32::from_lexical(b"5.002868148396374"));
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn f32_radix_test() {
+        assert_f32_eq!(1234.0, f32::from_lexical_radix(b"YA", 36).unwrap());
+        assert_f32_eq!(1234.0, f32::from_lexical_lossy_radix(b"YA", 36).unwrap());
+    }
+
+    #[test]
+    fn f64_decimal_test() {
+        // integer test
+        assert_f64_eq!(0.0, f64::from_lexical(b"0").unwrap());
+        assert_f64_eq!(1.0, f64::from_lexical(b"1").unwrap());
+        assert_f64_eq!(12.0, f64::from_lexical(b"12").unwrap());
+        assert_f64_eq!(123.0, f64::from_lexical(b"123").unwrap());
+        assert_f64_eq!(1234.0, f64::from_lexical(b"1234").unwrap());
+        assert_f64_eq!(12345.0, f64::from_lexical(b"12345").unwrap());
+        assert_f64_eq!(123456.0, f64::from_lexical(b"123456").unwrap());
+        assert_f64_eq!(1234567.0, f64::from_lexical(b"1234567").unwrap());
+        assert_f64_eq!(12345678.0, f64::from_lexical(b"12345678").unwrap());
+
+        // No fraction after decimal point test
+        assert_f64_eq!(1.0, f64::from_lexical(b"1.").unwrap());
+        assert_f64_eq!(12.0, f64::from_lexical(b"12.").unwrap());
+        assert_f64_eq!(1234567.0, f64::from_lexical(b"1234567.").unwrap());
+
+        // No integer before decimal point test
+        assert_f64_eq!(0.1, f64::from_lexical(b".1").unwrap());
+        assert_f64_eq!(0.12, f64::from_lexical(b".12").unwrap());
+        assert_f64_eq!(0.1234567, f64::from_lexical(b".1234567").unwrap());
+
+        // decimal test
+        assert_f64_eq!(123456789.0, f64::from_lexical(b"123456789").unwrap());
+        assert_f64_eq!(123456789.1, f64::from_lexical(b"123456789.1").unwrap());
+        assert_f64_eq!(123456789.12, f64::from_lexical(b"123456789.12").unwrap());
+        assert_f64_eq!(123456789.123, f64::from_lexical(b"123456789.123").unwrap());
+        assert_f64_eq!(123456789.1234, f64::from_lexical(b"123456789.1234").unwrap());
+        assert_f64_eq!(123456789.12345, f64::from_lexical(b"123456789.12345").unwrap());
+        assert_f64_eq!(123456789.123456, f64::from_lexical(b"123456789.123456").unwrap());
+        assert_f64_eq!(123456789.1234567, f64::from_lexical(b"123456789.1234567").unwrap());
+        assert_f64_eq!(123456789.12345678, f64::from_lexical(b"123456789.12345678").unwrap());
+
+        // rounding test
+        assert_f64_eq!(123456789.12345679, f64::from_lexical(b"123456789.123456789").unwrap());
+        assert_f64_eq!(123456789.12345679, f64::from_lexical(b"123456789.1234567890").unwrap());
+        assert_f64_eq!(123456789.12345679, f64::from_lexical(b"123456789.123456789012").unwrap());
+        assert_f64_eq!(123456789.12345679, f64::from_lexical(b"123456789.1234567890123").unwrap());
+        assert_f64_eq!(123456789.12345679, f64::from_lexical(b"123456789.12345678901234").unwrap());
+
+        // exponent test
+        assert_f64_eq!(123456789.12345, f64::from_lexical(b"1.2345678912345e8").unwrap());
+        assert_f64_eq!(123450000.0, f64::from_lexical(b"1.2345e+8").unwrap());
+        assert_f64_eq!(1.2345e+11, f64::from_lexical(b"123450000000").unwrap());
+        assert_f64_eq!(1.2345e+11, f64::from_lexical(b"1.2345e+11").unwrap());
+        assert_f64_eq!(1.2345e+38, f64::from_lexical(b"1.2345e+38").unwrap());
+        assert_f64_eq!(1.2345e+38, f64::from_lexical(b"123450000000000000000000000000000000000").unwrap());
+        assert_f64_eq!(1.2345e+308, f64::from_lexical(b"1.2345e+308").unwrap());
+        assert_f64_eq!(1.2345e+308, f64::from_lexical(b"123450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").unwrap());
+        assert_f64_eq!(0.000000012345, f64::from_lexical(b"1.2345e-8").unwrap());
+        assert_f64_eq!(1.2345e-8, f64::from_lexical(b"0.000000012345").unwrap());
+        assert_f64_eq!(1.2345e-38, f64::from_lexical(b"1.2345e-38").unwrap());
+        assert_f64_eq!(1.2345e-38, f64::from_lexical(b"0.000000000000000000000000000000000000012345").unwrap());
+
+        // denormalized (try extremely low values)
+        assert_f64_eq!(1.2345e-308, f64::from_lexical(b"1.2345e-308").unwrap());
+        // These next 3 tests fail on arm-unknown-linux-gnueabi with the
+        // incorrect parser.
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_eq!(Ok(5e-322), f64::from_lexical(b"5e-322"));
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_eq!(Ok(5e-323), f64::from_lexical(b"5e-323"));
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_eq!(Ok(5e-324), f64::from_lexical(b"5e-324"));
+        // due to issues in how the data is parsed, manually extracting
+        // non-exponents of 1.<e-299 is prone to error
+        // test the limit of our ability
+        // We tend to get relative errors of 1e-16, even at super low values.
+        assert_f64_eq!(1.2345e-299, f64::from_lexical(b"0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345").unwrap(), epsilon=1e-314);
+
+        // Keep pushing from -300 to -324
+        assert_f64_eq!(1.2345e-300, f64::from_lexical(b"0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345").unwrap(), epsilon=1e-315);
+
+        // These next 3 tests fail on arm-unknown-linux-gnueabi with the
+        // incorrect parser.
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_f64_eq!(1.2345e-310, f64::from_lexical(b"0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345").unwrap(), epsilon=5e-324);
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_f64_eq!(1.2345e-320, f64::from_lexical(b"0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345").unwrap(), epsilon=5e-324);
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_f64_eq!(1.2345e-321, f64::from_lexical(b"0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345").unwrap(), epsilon=5e-324);
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_f64_eq!(1.24e-322, f64::from_lexical(b"0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000124").unwrap(), epsilon=5e-324);
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_eq!(Ok(1e-323), f64::from_lexical(b"0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001"));
+        #[cfg(all(not(feature = "correct"), not(target_arch = "arm")))]
+        assert_eq!(Ok(5e-324), f64::from_lexical(b"0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005"));
+
+        assert!(f64::from_lexical(b"NaN").unwrap().is_nan());
+        assert!(f64::from_lexical(b"nan").unwrap().is_nan());
+        assert!(f64::from_lexical(b"NAN").unwrap().is_nan());
+        assert!(f64::from_lexical(b"inf").unwrap().is_infinite());
+        assert!(f64::from_lexical(b"INF").unwrap().is_infinite());
+        assert!(f64::from_lexical(b"+inf").unwrap().is_infinite());
+        assert!(f64::from_lexical(b"-inf").unwrap().is_infinite());
+
+        // Check various expected failures.
+        assert_eq!(Err(ErrorCode::Empty.into()), f64::from_lexical(b""));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b"e"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b"E"));
+        assert_eq!(Err(ErrorCode::EmptyMantissa.into()), f64::from_lexical(b".e1"));
+        assert_eq!(Err(ErrorCode::EmptyMantissa.into()), f64::from_lexical(b".e-1"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b"e1"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b"e-1"));
+
+        // Check various reports from a fuzzer.
+        assert_eq!(Err((ErrorCode::EmptyExponent, 2).into()), f64::from_lexical(b"0e"));
+        assert_eq!(Err((ErrorCode::EmptyExponent, 4).into()), f64::from_lexical(b"0.0e"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b".E"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b".e"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b"E2252525225"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b"e2252525225"));
+        assert_eq!(Ok(f64::INFINITY), f64::from_lexical(b"2E200000000000"));
+
+        // Add various unittests from proptests.
+        assert_eq!(Err((ErrorCode::EmptyExponent, 2).into()), f64::from_lexical(b"0e"));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 0).into()), f64::from_lexical(b"."));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 1).into()), f64::from_lexical(b"+."));
+        assert_eq!(Err((ErrorCode::EmptyMantissa, 1).into()), f64::from_lexical(b"-."));
+        assert_eq!(Err((ErrorCode::Empty, 1).into()), f64::from_lexical(b"+"));
+        assert_eq!(Err((ErrorCode::Empty, 1).into()), f64::from_lexical(b"-"));
+
+        // Bug fix for Issue #8
+        assert_eq!(Ok(5.002868148396374), f64::from_lexical(b"5.002868148396374"));
+    }
+
+    #[test]
+    #[should_panic]
+    fn limit_test() {
+        assert_relative_eq!(1.2345e-320, 0.0, epsilon=5e-324);
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn f64_radix_test() {
+        assert_f64_eq!(1234.0, f64::from_lexical_radix(b"YA", 36).unwrap());
+        assert_f64_eq!(1234.0, f64::from_lexical_lossy_radix(b"YA", 36).unwrap());
+    }
+
+    #[test]
+    fn f32_lossy_decimal_test() {
+        assert_eq!(Err(ErrorCode::EmptyMantissa.into()), f32::from_lexical_lossy(b"."));
+        assert_eq!(Err(ErrorCode::Empty.into()), f32::from_lexical_lossy(b""));
+        assert_eq!(Ok(0.0), f32::from_lexical_lossy(b"0.0"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), f32::from_lexical_lossy(b"1a"));
+
+        // Bug fix for Issue #8
+        assert_eq!(Ok(5.002868148396374), f32::from_lexical_lossy(b"5.002868148396374"));
+    }
+
+    #[test]
+    fn f64_lossy_decimal_test() {
+        assert_eq!(Err(ErrorCode::EmptyMantissa.into()), f64::from_lexical_lossy(b"."));
+        assert_eq!(Err(ErrorCode::Empty.into()), f64::from_lexical_lossy(b""));
+        assert_eq!(Ok(0.0), f64::from_lexical_lossy(b"0.0"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), f64::from_lexical_lossy(b"1a"));
+
+        // Bug fix for Issue #8
+        assert_eq!(Ok(5.002868148396374), f64::from_lexical_lossy(b"5.002868148396374"));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_special_test() {
+        //  Comments match (no_special, case_sensitive, has_sep)
+        let f1 = NumberFormat::standard().unwrap();         // false, false, false
+        let f2 = NumberFormat::ignore(b'_').unwrap();       // false, false, true
+        let f3 = f1 | NumberFormat::NO_SPECIAL;             // true, _, _
+        let f4 = f1 | NumberFormat::CASE_SENSITIVE_SPECIAL; // false, true, false
+        let f5 = f2 | NumberFormat::CASE_SENSITIVE_SPECIAL; // false, true, true
+
+        // Easy NaN
+        assert!(f64::from_lexical_format(b"NaN", f1).unwrap().is_nan());
+        assert!(f64::from_lexical_format(b"NaN", f2).unwrap().is_nan());
+        assert!(f64::from_lexical_format(b"NaN", f3).is_err());
+        assert!(f64::from_lexical_format(b"NaN", f4).unwrap().is_nan());
+        assert!(f64::from_lexical_format(b"NaN", f5).unwrap().is_nan());
+
+        // Case-sensitive NaN.
+        assert!(f64::from_lexical_format(b"nan", f1).unwrap().is_nan());
+        assert!(f64::from_lexical_format(b"nan", f2).unwrap().is_nan());
+        assert!(f64::from_lexical_format(b"nan", f3).is_err());
+        assert!(f64::from_lexical_format(b"nan", f4).is_err());
+        assert!(f64::from_lexical_format(b"nan", f5).is_err());
+
+        // Digit-separator NaN.
+        assert!(f64::from_lexical_format(b"N_aN", f1).is_err());
+        assert!(f64::from_lexical_format(b"N_aN", f2).unwrap().is_nan());
+        assert!(f64::from_lexical_format(b"N_aN", f3).is_err());
+        assert!(f64::from_lexical_format(b"N_aN", f4).is_err());
+        assert!(f64::from_lexical_format(b"N_aN", f5).unwrap().is_nan());
+
+        // Digit-separator + case-sensitive NaN.
+        assert!(f64::from_lexical_format(b"n_an", f1).is_err());
+        assert!(f64::from_lexical_format(b"n_an", f2).unwrap().is_nan());
+        assert!(f64::from_lexical_format(b"n_an", f3).is_err());
+        assert!(f64::from_lexical_format(b"n_an", f4).is_err());
+        assert!(f64::from_lexical_format(b"n_an", f5).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_required_integer_digits_test() {
+        let format = NumberFormat::REQUIRED_INTEGER_DIGITS;
+        assert!(f64::from_lexical_format(b"+3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b".0", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_required_fraction_digits_test() {
+        let format = NumberFormat::REQUIRED_FRACTION_DIGITS;
+        assert!(f64::from_lexical_format(b"+3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.", format).is_err());
+        assert!(f64::from_lexical_format(b"3", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_required_digits_test() {
+        let format = NumberFormat::REQUIRED_DIGITS;
+        assert!(f64::from_lexical_format(b"+3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.", format).is_err());
+        assert!(f64::from_lexical_format(b"3", format).is_ok());
+        assert!(f64::from_lexical_format(b".0", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_no_positive_mantissa_sign_test() {
+        let format = NumberFormat::NO_POSITIVE_MANTISSA_SIGN;
+        assert!(f64::from_lexical_format(b"+3.0", format).is_err());
+        assert!(f64::from_lexical_format(b"-3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.0", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_required_mantissa_sign_test() {
+        let format = NumberFormat::REQUIRED_MANTISSA_SIGN;
+        assert!(f64::from_lexical_format(b"+3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"-3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.0", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_no_exponent_notation_test() {
+        let format = NumberFormat::NO_EXPONENT_NOTATION;
+        assert!(f64::from_lexical_format(b"+3.0e7", format).is_err());
+        assert!(f64::from_lexical_format(b"+3.0e-7", format).is_err());
+        assert!(f64::from_lexical_format(b"+3e", format).is_err());
+        assert!(f64::from_lexical_format(b"+3e-", format).is_err());
+        assert!(f64::from_lexical_format(b"+3.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"+3", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_optional_exponent_test() {
+        let format = NumberFormat::permissive().unwrap();
+        assert!(f64::from_lexical_format(b"+3.0e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"+3.0e-7", format).is_ok());
+        assert!(f64::from_lexical_format(b"+3.0e", format).is_ok());
+        assert!(f64::from_lexical_format(b"+3.0e-", format).is_ok());
+        assert!(f64::from_lexical_format(b"+3.0", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_required_exponent_test() {
+        let format = NumberFormat::REQUIRED_EXPONENT_DIGITS;
+        assert!(f64::from_lexical_format(b"+3.0e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"+3.0e-7", format).is_ok());
+        assert!(f64::from_lexical_format(b"+3.0e", format).is_err());
+        assert!(f64::from_lexical_format(b"+3.0e-", format).is_err());
+        assert!(f64::from_lexical_format(b"+3.0", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_no_positive_exponent_sign_test() {
+        let format = NumberFormat::NO_POSITIVE_EXPONENT_SIGN;
+        assert!(f64::from_lexical_format(b"3.0e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.0e+7", format).is_err());
+        assert!(f64::from_lexical_format(b"3.0e-7", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_required_exponent_sign_test() {
+        let format = NumberFormat::REQUIRED_EXPONENT_SIGN;
+        assert!(f64::from_lexical_format(b"3.0e7", format).is_err());
+        assert!(f64::from_lexical_format(b"3.0e+7", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.0e-7", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_no_exponent_without_fraction_test() {
+        let format = NumberFormat::NO_EXPONENT_WITHOUT_FRACTION;
+        assert!(f64::from_lexical_format(b"3.0e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"3e7", format).is_err());
+
+        let format = format | NumberFormat::REQUIRED_FRACTION_DIGITS;
+        assert!(f64::from_lexical_format(b"3.0e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"3.e7", format).is_err());
+        assert!(f64::from_lexical_format(b"3e7", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_no_leading_zeros_test() {
+        let format = NumberFormat::NO_FLOAT_LEADING_ZEROS;
+        assert!(f64::from_lexical_format(b"1.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"0.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"01.0", format).is_err());
+        assert!(f64::from_lexical_format(b"10.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"010.0", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_integer_internal_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"3_1.0e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"_31.0e7", format).is_err());
+        assert!(f64::from_lexical_format(b"31_.0e7", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_fraction_internal_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::FRACTION_INTERNAL_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"31.0_1e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"31._01e7", format).is_err());
+        assert!(f64::from_lexical_format(b"31.01_e7", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_exponent_internal_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::EXPONENT_INTERNAL_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"31.01e7_1", format).is_ok());
+        assert!(f64::from_lexical_format(b"31.01e_71", format).is_err());
+        assert!(f64::from_lexical_format(b"31.01e71_", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_integer_leading_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::INTEGER_LEADING_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"3_1.0e7", format).is_err());
+        assert!(f64::from_lexical_format(b"_31.0e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"31_.0e7", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_fraction_leading_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::FRACTION_LEADING_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"31.0_1e7", format).is_err());
+        assert!(f64::from_lexical_format(b"31._01e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"31.01_e7", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_exponent_leading_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::EXPONENT_LEADING_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"31.01e7_1", format).is_err());
+        assert!(f64::from_lexical_format(b"31.01e_71", format).is_ok());
+        assert!(f64::from_lexical_format(b"31.01e71_", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_integer_trailing_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::INTEGER_TRAILING_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"3_1.0e7", format).is_err());
+        assert!(f64::from_lexical_format(b"_31.0e7", format).is_err());
+        assert!(f64::from_lexical_format(b"31_.0e7", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_fraction_trailing_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::FRACTION_TRAILING_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"31.0_1e7", format).is_err());
+        assert!(f64::from_lexical_format(b"31._01e7", format).is_err());
+        assert!(f64::from_lexical_format(b"31.01_e7", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_exponent_trailing_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::EXPONENT_TRAILING_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"31.01e7_1", format).is_err());
+        assert!(f64::from_lexical_format(b"31.01e_71", format).is_err());
+        assert!(f64::from_lexical_format(b"31.01e71_", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_integer_consecutive_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR
+            | NumberFormat::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"3__1.0e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"_31.0e7", format).is_err());
+        assert!(f64::from_lexical_format(b"31_.0e7", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_fraction_consecutive_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::FRACTION_INTERNAL_DIGIT_SEPARATOR
+            | NumberFormat::FRACTION_CONSECUTIVE_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"31.0__1e7", format).is_ok());
+        assert!(f64::from_lexical_format(b"31._01e7", format).is_err());
+        assert!(f64::from_lexical_format(b"31.01_e7", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_exponent_consecutive_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::EXPONENT_INTERNAL_DIGIT_SEPARATOR
+            | NumberFormat::EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR;
+        assert!(f64::from_lexical_format(b"31.01e7__1", format).is_ok());
+        assert!(f64::from_lexical_format(b"31.01e_71", format).is_err());
+        assert!(f64::from_lexical_format(b"31.01e71_", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_json_exponent_without_dot() {
+        // Tests courtesy of @ijl:
+        //  https://github.com/Alexhuszagh/rust-lexical/issues/24#issuecomment-578153783
+        let format = NumberFormat::JSON;
+        // JSONTestSuite/test_parsing/y_number_0e1.json
+        assert!(f64::from_lexical_format(b"0e1", format).is_ok());
+        // JSONTestSuite/test_parsing/y_number_int_with_exp.json
+        assert!(f64::from_lexical_format(b"20e1", format).is_ok());
+        // JSONTestSuite/test_parsing/y_number_real_capital_e_pos_exp.json
+        assert!(f64::from_lexical_format(b"1E+2", format).is_ok());
+        // JSONTestSuite/test_transform/number_1e-999.json
+        assert!(f64::from_lexical_format(b"1E-999", format).is_ok());
+        // nativejson-benchmark/data/jsonchecker/pass01.json
+        assert!(f64::from_lexical_format(b"23456789012E66", format).is_ok());
+    }
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_json_exponent_requires_digit() {
+        // Tests courtesy of @ijl:
+        //  https://github.com/Alexhuszagh/rust-lexical/issues/24#issuecomment-578153783
+        let format = NumberFormat::JSON;
+        assert!(f64::from_lexical_format(b"1e", format).is_err());
+        // JSONTestSuite/test_parsing/n_number_9.e+.json
+        assert!(f64::from_lexical_format(b"9.e+", format).is_err());
+        // JSONTestSuite/test_parsing/n_number_2.e-3.json
+        assert!(f64::from_lexical_format(b"2.e-3", format).is_err());
+        // JSONTestSuite/test_parsing/n_number_real_without_fractional_part.json
+        assert!(f64::from_lexical_format(b"1.", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn f64_json_no_leading_zero() {
+        let format = NumberFormat::JSON;
+        assert!(f64::from_lexical_format(b"12.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"-12.0", format).is_ok());
+        assert!(f64::from_lexical_format(b"012.0", format).is_err());
+        assert!(f64::from_lexical_format(b"-012.0", format).is_err());
+    }
+
+    #[cfg(all(feature = "std", feature = "property_tests"))]
+    proptest! {
+        #[test]
+        fn f32_invalid_proptest(i in r"[+-]?[0-9]{2}[^\deE]?\.[^\deE]?[0-9]{2}[^\deE]?e[+-]?[0-9]+[^\deE]") {
+            let res = f32::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert_eq!(err.code, ErrorCode::InvalidDigit);
+        }
+
+        #[test]
+        fn f32_double_sign_proptest(i in r"[+-]{2}[0-9]{2}\.[0-9]{2}e[+-]?[0-9]+") {
+            let res = f32::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert!(err.code == ErrorCode::InvalidDigit || err.code == ErrorCode::EmptyMantissa);
+            prop_assert!(err.index == 0 || err.index == 1);
+        }
+
+        #[test]
+        fn f32_sign_or_dot_only_proptest(i in r"[+-]?\.?") {
+            let res = f32::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert!(err.code == ErrorCode::Empty || err.code == ErrorCode::EmptyMantissa);
+            prop_assert!(err.index == 0 || err.index == 1);
+        }
+
+        #[test]
+        fn f32_double_exponent_sign_proptest(i in r"[+-]?[0-9]{2}\.[0-9]{2}e[+-]{2}[0-9]+") {
+            let res = f32::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert_eq!(err.code, ErrorCode::EmptyExponent);
+        }
+
+        #[test]
+        fn f32_missing_exponent_proptest(i in r"[+-]?[0-9]{2}\.[0-9]{2}e[+-]?") {
+            let res = f32::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert_eq!(err.code, ErrorCode::EmptyExponent);
+        }
+
+        #[cfg(feature = "correct")]
+        #[test]
+        fn f32_roundtrip_display_proptest(i in f32::MIN..f32::MAX) {
+            let input: String = format!("{}", i);
+            prop_assert_eq!(i, f32::from_lexical(input.as_bytes()).unwrap());
+        }
+
+        #[cfg(feature = "correct")]
+        #[test]
+        fn f32_roundtrip_debug_proptest(i in f32::MIN..f32::MAX) {
+            let input: String = format!("{:?}", i);
+            prop_assert_eq!(i, f32::from_lexical(input.as_bytes()).unwrap());
+        }
+
+        #[cfg(feature = "correct")]
+        #[test]
+        fn f32_roundtrip_scientific_proptest(i in f32::MIN..f32::MAX) {
+            let input: String = format!("{:e}", i);
+            prop_assert_eq!(i, f32::from_lexical(input.as_bytes()).unwrap());
+        }
+
+        #[test]
+        fn f64_invalid_proptest(i in r"[+-]?[0-9]{2}[^\deE]?\.[^\deE]?[0-9]{2}[^\deE]?e[+-]?[0-9]+[^\deE]") {
+            let res = f64::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert_eq!(err.code, ErrorCode::InvalidDigit);
+        }
+
+        #[test]
+        fn f64_double_sign_proptest(i in r"[+-]{2}[0-9]{2}\.[0-9]{2}e[+-]?[0-9]+") {
+            let res = f64::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert!(err.code == ErrorCode::InvalidDigit || err.code == ErrorCode::EmptyMantissa);
+            prop_assert!(err.index == 0 || err.index == 1);
+        }
+
+        #[test]
+        fn f64_sign_or_dot_only_proptest(i in r"[+-]?\.?") {
+            let res = f64::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert!(err.code == ErrorCode::Empty || err.code == ErrorCode::EmptyMantissa);
+            prop_assert!(err.index == 0 || err.index == 1);
+        }
+
+        #[test]
+        fn f64_double_exponent_sign_proptest(i in r"[+-]?[0-9]{2}\.[0-9]{2}e[+-]{2}[0-9]+") {
+            let res = f64::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert_eq!(err.code, ErrorCode::EmptyExponent);
+        }
+
+        #[test]
+        fn f64_missing_exponent_proptest(i in r"[+-]?[0-9]{2}\.[0-9]{2}e[+-]?") {
+            let res = f64::from_lexical(i.as_bytes());
+            prop_assert!(res.is_err());
+            let err = res.err().unwrap();
+            prop_assert_eq!(err.code, ErrorCode::EmptyExponent);
+        }
+
+        #[cfg(feature = "correct")]
+        #[test]
+        fn f64_roundtrip_display_proptest(i in f64::MIN..f64::MAX) {
+            let input: String = format!("{}", i);
+            prop_assert_eq!(i, f64::from_lexical(input.as_bytes()).unwrap());
+        }
+
+        #[cfg(feature = "correct")]
+        #[test]
+        fn f64_roundtrip_debug_proptest(i in f64::MIN..f64::MAX) {
+            let input: String = format!("{:?}", i);
+            prop_assert_eq!(i, f64::from_lexical(input.as_bytes()).unwrap());
+        }
+
+        #[cfg(feature = "correct")]
+        #[test]
+        fn f64_roundtrip_scientific_proptest(i in f64::MIN..f64::MAX) {
+            let input: String = format!("{:e}", i);
+            prop_assert_eq!(i, f64::from_lexical(input.as_bytes()).unwrap());
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atof/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atof/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+//! Fast lexical string-to-float conversion routines.
+
+// Hide implementation details.
+mod algorithm;
+mod api;
+
+// Re-exports
+pub use self::api::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/api.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,761 @@
+//! Fast lexical string-to-integer conversion routines.
+
+use crate::util::*;
+use super::generic::*;
+
+// ATOI TRAIT
+// ----------
+
+pub(crate) trait Atoi: Integer {
+    // Parse integer from string.
+    fn atoi(bytes: &[u8], radix: u32) -> ParseResult<(Self, *const u8)>;
+
+    // Parse integer from string with format.
+    #[cfg(feature = "format")]
+    fn atoi_format(bytes: &[u8], radix: u32, format: NumberFormat) -> ParseResult<(Self, *const u8)>;
+}
+
+// Implement atoi for type.
+macro_rules! atoi_impl {
+    ($($t:ty)*) => ($(
+        impl Atoi for $t {
+            perftools_inline_always!{
+            fn atoi(bytes: &[u8], radix: u32)
+                -> ParseResult<($t, *const u8)>
+            {
+                standalone_no_separator(bytes, radix)
+            }}
+
+            perftools_inline_always!{
+            #[cfg(feature = "format")]
+            fn atoi_format(bytes: &[u8], radix: u32, format: NumberFormat)
+                -> ParseResult<($t, *const u8)>
+            {
+                standalone_separator(bytes, radix, format)
+            }}
+        }
+    )*);
+}
+
+atoi_impl! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }
+
+impl Atoi for u128 {
+    perftools_inline_always!{
+    fn atoi(bytes: &[u8], radix: u32)
+        -> ParseResult<(u128, *const u8)>
+    {
+        standalone_128_no_separator::<u128, u64>(bytes, radix)
+    }}
+
+    perftools_inline_always!{
+    #[cfg(feature = "format")]
+    fn atoi_format(bytes: &[u8], radix: u32, format: NumberFormat)
+        -> ParseResult<(u128, *const u8)>
+    {
+        standalone_128_separator::<u128, u64>(bytes, radix, format)
+    }}
+}
+
+impl Atoi for i128 {
+    perftools_inline_always!{
+    fn atoi(bytes: &[u8], radix: u32)
+        -> ParseResult<(i128, *const u8)>
+    {
+        standalone_128_no_separator::<i128, i64>(bytes, radix)
+    }}
+
+    perftools_inline_always!{
+    #[cfg(feature = "format")]
+    fn atoi_format(bytes: &[u8], radix: u32, format: NumberFormat)
+        -> ParseResult<(i128, *const u8)>
+    {
+        standalone_128_separator::<i128, i64>(bytes, radix, format)
+    }}
+}
+
+// ATOI
+// ----
+
+perftools_inline!{
+pub(crate) fn atoi<'a, T>(bytes: &'a [u8], radix: u32)
+    -> Result<(T, usize)>
+    where T: Atoi
+{
+    let index = | ptr | distance(bytes.as_ptr(), ptr);
+    match T::atoi(bytes, radix) {
+        Ok((value, ptr)) => Ok((value, index(ptr))),
+        Err((code, ptr)) => Err((code, index(ptr)).into()),
+    }
+}}
+
+perftools_inline!{
+#[cfg(feature = "format")]
+pub(crate) fn atoi_format<'a, T>(bytes: &'a [u8], radix: u32, format: NumberFormat)
+    -> Result<(T, usize)>
+    where T: Atoi
+{
+    let index = | ptr | distance(bytes.as_ptr(), ptr);
+    match T::atoi_format(bytes, radix, format) {
+        Ok((value, ptr)) => Ok((value, index(ptr))),
+        Err((code, ptr)) => Err((code, index(ptr)).into()),
+    }
+}}
+
+// FROM LEXICAL
+// ------------
+
+from_lexical!(atoi, u8);
+from_lexical!(atoi, u16);
+from_lexical!(atoi, u32);
+from_lexical!(atoi, u64);
+from_lexical!(atoi, usize);
+from_lexical!(atoi, u128);
+
+from_lexical!(atoi, i8);
+from_lexical!(atoi, i16);
+from_lexical!(atoi, i32);
+from_lexical!(atoi, i64);
+from_lexical!(atoi, isize);
+from_lexical!(atoi, i128);
+
+cfg_if!{
+if #[cfg(feature = "format")] {
+    from_lexical_format!(atoi_format, u8);
+    from_lexical_format!(atoi_format, u16);
+    from_lexical_format!(atoi_format, u32);
+    from_lexical_format!(atoi_format, u64);
+    from_lexical_format!(atoi_format, usize);
+    from_lexical_format!(atoi_format, u128);
+
+    from_lexical_format!(atoi_format, i8);
+    from_lexical_format!(atoi_format, i16);
+    from_lexical_format!(atoi_format, i32);
+    from_lexical_format!(atoi_format, i64);
+    from_lexical_format!(atoi_format, isize);
+    from_lexical_format!(atoi_format, i128);
+}}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::*;
+
+    #[cfg(all(feature = "std", feature = "property_tests"))]
+    use proptest::{proptest, prop_assert_eq, prop_assert};
+
+    #[cfg(feature = "radix")]
+    const DATA: [(u8, &'static str); 35] = [
+        (2, "100101"),
+        (3, "1101"),
+        (4, "211"),
+        (5, "122"),
+        (6, "101"),
+        (7, "52"),
+        (8, "45"),
+        (9, "41"),
+        (10, "37"),
+        (11, "34"),
+        (12, "31"),
+        (13, "2B"),
+        (14, "29"),
+        (15, "27"),
+        (16, "25"),
+        (17, "23"),
+        (18, "21"),
+        (19, "1I"),
+        (20, "1H"),
+        (21, "1G"),
+        (22, "1F"),
+        (23, "1E"),
+        (24, "1D"),
+        (25, "1C"),
+        (26, "1B"),
+        (27, "1A"),
+        (28, "19"),
+        (29, "18"),
+        (30, "17"),
+        (31, "16"),
+        (32, "15"),
+        (33, "14"),
+        (34, "13"),
+        (35, "12"),
+        (36, "11"),
+    ];
+
+    #[test]
+    fn u8_decimal_test() {
+        assert_eq!(Ok(0), u8::from_lexical(b"0"));
+        assert_eq!(Ok(127), u8::from_lexical(b"127"));
+        assert_eq!(Ok(128), u8::from_lexical(b"128"));
+        assert_eq!(Ok(255), u8::from_lexical(b"255"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 0).into()), u8::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), u8::from_lexical(b"1a"));
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn u8_radix_test() {
+        for (b, s) in DATA.iter() {
+            assert_eq!(u8::from_lexical_radix(s.as_bytes(), *b), Ok(37));
+        }
+    }
+
+    #[test]
+    fn i8_decimal_test() {
+        assert_eq!(Ok(0), i8::from_lexical(b"0"));
+        assert_eq!(Ok(127), i8::from_lexical(b"127"));
+        assert_eq!(Err((ErrorCode::Overflow, 2).into()), i8::from_lexical(b"128"));
+        assert_eq!(Err((ErrorCode::Overflow, 2).into()), i8::from_lexical(b"255"));
+        assert_eq!(Ok(-1), i8::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), i8::from_lexical(b"1a"));
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn i8_radix_test() {
+        for (b, s) in DATA.iter() {
+            assert_eq!(i8::from_lexical_radix(s.as_bytes(), *b), Ok(37));
+        }
+    }
+
+    #[test]
+    fn u16_decimal_test() {
+        assert_eq!(Ok(0), u16::from_lexical(b"0"));
+        assert_eq!(Ok(32767), u16::from_lexical(b"32767"));
+        assert_eq!(Ok(32768), u16::from_lexical(b"32768"));
+        assert_eq!(Ok(65535), u16::from_lexical(b"65535"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 0).into()), u16::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), u16::from_lexical(b"1a"));
+    }
+
+    #[test]
+    fn i16_decimal_test() {
+        assert_eq!(Ok(0), i16::from_lexical(b"0"));
+        assert_eq!(Ok(32767), i16::from_lexical(b"32767"));
+        assert_eq!(Err((ErrorCode::Overflow, 4).into()), i16::from_lexical(b"32768"));
+        assert_eq!(Err((ErrorCode::Overflow, 4).into()), i16::from_lexical(b"65535"));
+        assert_eq!(Ok(-1), i16::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), i16::from_lexical(b"1a"));
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn i16_radix_test() {
+        for (b, s) in DATA.iter() {
+            assert_eq!(i16::from_lexical_radix(s.as_bytes(), *b), Ok(37));
+        }
+        assert_eq!(i16::from_lexical_radix(b"YA", 36), Ok(1234));
+    }
+
+    #[test]
+    fn u32_decimal_test() {
+        assert_eq!(Ok(0), u32::from_lexical(b"0"));
+        assert_eq!(Ok(2147483647), u32::from_lexical(b"2147483647"));
+        assert_eq!(Ok(2147483648), u32::from_lexical(b"2147483648"));
+        assert_eq!(Ok(4294967295), u32::from_lexical(b"4294967295"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 0).into()), u32::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), u32::from_lexical(b"1a"));
+    }
+
+    #[test]
+    fn i32_decimal_test() {
+        assert_eq!(Ok(0), i32::from_lexical(b"0"));
+        assert_eq!(Ok(2147483647), i32::from_lexical(b"2147483647"));
+        assert_eq!(Err((ErrorCode::Overflow, 9).into()), i32::from_lexical(b"2147483648"));
+        assert_eq!(Err((ErrorCode::Overflow, 9).into()), i32::from_lexical(b"4294967295"));
+        assert_eq!(Ok(-1), i32::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), i32::from_lexical(b"1a"));
+    }
+
+    #[test]
+    fn u64_decimal_test() {
+        assert_eq!(Ok(0), u64::from_lexical(b"0"));
+        assert_eq!(Ok(9223372036854775807), u64::from_lexical(b"9223372036854775807"));
+        assert_eq!(Ok(9223372036854775808), u64::from_lexical(b"9223372036854775808"));
+        assert_eq!(Ok(18446744073709551615), u64::from_lexical(b"18446744073709551615"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 0).into()), u64::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), u64::from_lexical(b"1a"));
+    }
+
+    #[test]
+    fn i64_decimal_test() {
+        assert_eq!(Ok(0), i64::from_lexical(b"0"));
+        assert_eq!(Ok(9223372036854775807), i64::from_lexical(b"9223372036854775807"));
+        assert_eq!(Err((ErrorCode::Overflow, 18).into()), i64::from_lexical(b"9223372036854775808"));
+        assert_eq!(Err((ErrorCode::Overflow, 19).into()), i64::from_lexical(b"18446744073709551615"));
+        assert_eq!(Ok(-1), i64::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), i64::from_lexical(b"1a"));
+
+        // Add tests discovered via fuzzing.
+        assert_eq!(Err((ErrorCode::Overflow, 19).into()), i64::from_lexical(b"406260572150672006000066000000060060007667760000000000000000000+00000006766767766666767665670000000000000000000000666"));
+    }
+
+    #[test]
+    fn u128_decimal_test() {
+        assert_eq!(Ok(0), u128::from_lexical(b"0"));
+        assert_eq!(Ok(170141183460469231731687303715884105727), u128::from_lexical(b"170141183460469231731687303715884105727"));
+        assert_eq!(Ok(170141183460469231731687303715884105728), u128::from_lexical(b"170141183460469231731687303715884105728"));
+        assert_eq!(Ok(340282366920938463463374607431768211455), u128::from_lexical(b"340282366920938463463374607431768211455"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 0).into()), u128::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), u128::from_lexical(b"1a"));
+    }
+
+    #[test]
+    fn i128_decimal_test() {
+        assert_eq!(Ok(0), i128::from_lexical(b"0"));
+        assert_eq!(Ok(170141183460469231731687303715884105727), i128::from_lexical(b"170141183460469231731687303715884105727"));
+        assert_eq!(Err((ErrorCode::Overflow, 39).into()), i128::from_lexical(b"170141183460469231731687303715884105728"));
+        assert_eq!(Err((ErrorCode::Overflow, 39).into()), i128::from_lexical(b"340282366920938463463374607431768211455"));
+        assert_eq!(Ok(-1), i128::from_lexical(b"-1"));
+        assert_eq!(Err((ErrorCode::InvalidDigit, 1).into()), i128::from_lexical(b"1a"));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn i32_no_leading_zeros_test() {
+        let format = NumberFormat::NO_INTEGER_LEADING_ZEROS;
+        assert!(i32::from_lexical_format(b"1", format).is_ok());
+        assert!(i32::from_lexical_format(b"0", format).is_ok());
+        assert!(i32::from_lexical_format(b"01", format).is_err());
+        assert!(i32::from_lexical_format(b"10", format).is_ok());
+        assert!(i32::from_lexical_format(b"010", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn i32_integer_internal_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR;
+        assert!(i32::from_lexical_format(b"3_1", format).is_ok());
+        assert!(i32::from_lexical_format(b"_31", format).is_err());
+        assert!(i32::from_lexical_format(b"31_", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn i32_integer_leading_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::INTEGER_LEADING_DIGIT_SEPARATOR;
+        assert!(i32::from_lexical_format(b"3_1", format).is_err());
+        assert!(i32::from_lexical_format(b"_31", format).is_ok());
+        assert!(i32::from_lexical_format(b"31_", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn i32_integer_trailing_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_') | NumberFormat::INTEGER_TRAILING_DIGIT_SEPARATOR;
+        assert!(i32::from_lexical_format(b"3_1", format).is_err());
+        assert!(i32::from_lexical_format(b"_31", format).is_err());
+        assert!(i32::from_lexical_format(b"31_", format).is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn i32_integer_consecutive_digit_separator_test() {
+        let format = NumberFormat::from_separator(b'_')
+            | NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR
+            | NumberFormat::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR;
+        assert!(i32::from_lexical_format(b"3_1", format).is_ok());
+        assert!(i32::from_lexical_format(b"3__1", format).is_ok());
+        assert!(i32::from_lexical_format(b"_31", format).is_err());
+        assert!(i32::from_lexical_format(b"31_", format).is_err());
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn i32_json_no_leading_zero() {
+        let format = NumberFormat::JSON;
+        assert!(i32::from_lexical_format(b"12", format).is_ok());
+        assert!(i32::from_lexical_format(b"-12", format).is_ok());
+        assert!(i32::from_lexical_format(b"012", format).is_err());
+        assert!(i32::from_lexical_format(b"-012", format).is_err());
+    }
+
+    #[cfg(all(feature = "std", feature = "property_tests"))]
+    proptest! {
+        #[test]
+        fn u8_invalid_proptest(i in r"[+]?[0-9]{2}\D") {
+            let result = u8::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let index = result.err().unwrap().index;
+            prop_assert!(index == 2 || index == 3);
+        }
+
+        #[test]
+        fn u8_overflow_proptest(i in r"[+]?[1-9][0-9]{3}") {
+            let result = u8::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Overflow);
+        }
+
+        #[test]
+        fn u8_negative_proptest(i in r"[-][1-9][0-9]{2}") {
+            let result = u8::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::InvalidDigit);
+        }
+
+        #[test]
+        fn u8_double_sign_proptest(i in r"[+]{2}[0-9]{2}") {
+            let result = u8::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 1);
+        }
+
+        #[test]
+        fn u8_sign_only_proptest(i in r"[+]") {
+            let result = u8::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Empty);
+        }
+
+        #[test]
+        fn u8_trailing_digits_proptest(i in r"[+]?[0-9]{2}\D[0-9]{2}") {
+            let result = u8::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 2 || error.index == 3);
+        }
+
+        #[test]
+        fn i8_invalid_proptest(i in r"[+-]?[0-9]{2}\D") {
+            let result = i8::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 2 || error.index == 3);
+        }
+
+        #[test]
+        fn i8_overflow_proptest(i in r"[+]?[1-9][0-9]{3}\D") {
+            let result = i8::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Overflow);
+        }
+
+        #[test]
+        fn i8_underflow_proptest(i in r"[-][1-9][0-9]{3}\D") {
+            let result = i8::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Underflow);
+        }
+
+        #[test]
+        fn i8_double_sign_proptest(i in r"[+-]{2}[0-9]{2}") {
+            let result = i8::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 1);
+        }
+
+        #[test]
+        fn i8_sign_only_proptest(i in r"[+-]") {
+            let result = i8::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::Empty);
+        }
+
+        #[test]
+        fn i8_trailing_digits_proptest(i in r"[+-]?[0-9]{2}\D[0-9]{2}") {
+            let result = i8::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 2 || error.index == 3);
+        }
+
+        #[test]
+        fn u16_invalid_proptest(i in r"[+]?[0-9]{4}\D") {
+            let result = u16::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 4 || error.index == 5);
+        }
+
+        #[test]
+        fn u16_overflow_proptest(i in r"[+]?[1-9][0-9]{5}\D") {
+            let result = u16::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Overflow);
+        }
+
+        #[test]
+        fn u16_negative_proptest(i in r"[-][1-9][0-9]{4}") {
+            let result = u16::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::InvalidDigit);
+        }
+
+        #[test]
+        fn u16_double_sign_proptest(i in r"[+]{2}[0-9]{4}") {
+            let result = u16::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 1);
+        }
+
+        #[test]
+        fn u16_sign_only_proptest(i in r"[+]") {
+            let result = u16::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Empty);
+        }
+
+        #[test]
+        fn u16_trailing_digits_proptest(i in r"[+]?[0-9]{4}\D[0-9]{2}") {
+            let result = u16::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 4 || error.index == 5);
+        }
+
+        #[test]
+        fn i16_invalid_proptest(i in r"[+-]?[0-9]{4}\D") {
+            let result = i16::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 4 || error.index == 5);
+        }
+
+        #[test]
+        fn i16_overflow_proptest(i in r"[+]?[1-9][0-9]{5}\D") {
+            let result = i16::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Overflow);
+        }
+
+        #[test]
+        fn i16_underflow_proptest(i in r"[-][1-9][0-9]{5}\DD") {
+            let result = i16::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Underflow);
+        }
+
+        #[test]
+        fn i16_double_sign_proptest(i in r"[+-]{2}[0-9]{4}") {
+            let result = i16::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 1);
+        }
+
+        #[test]
+        fn i16_sign_only_proptest(i in r"[+-]") {
+            let result = i16::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Empty);
+        }
+
+        #[test]
+        fn i16_trailing_digits_proptest(i in r"[+-]?[0-9]{4}\D[0-9]{2}") {
+            let result = i16::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 4 || error.index == 5);
+        }
+
+        #[test]
+        fn u32_invalid_proptest(i in r"[+]?[0-9]{9}\D") {
+            let result = u32::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 9 || error.index == 10);
+        }
+
+        #[test]
+        fn u32_overflow_proptest(i in r"[+]?[1-9][0-9]{10}\D") {
+            let result = u32::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Overflow);
+        }
+
+        #[test]
+        fn u32_negative_proptest(i in r"[-][1-9][0-9]{9}") {
+            let result = u32::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::InvalidDigit);
+        }
+
+        #[test]
+        fn u32_double_sign_proptest(i in r"[+]{2}[0-9]{9}") {
+            let result = u32::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 1);
+        }
+
+        #[test]
+        fn u32_sign_only_proptest(i in r"[+]") {
+            let result = u32::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Empty);
+        }
+
+        #[test]
+        fn u32_trailing_digits_proptest(i in r"[+]?[0-9]{9}\D[0-9]{2}") {
+            let result = u32::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 9 || error.index == 10);
+        }
+
+        #[test]
+        fn i32_invalid_proptest(i in r"[+-]?[0-9]{9}\D") {
+            let result = i32::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 9 || error.index == 10);
+        }
+
+        #[test]
+        fn i32_overflow_proptest(i in r"[+]?[1-9][0-9]{10}\D") {
+            let result = i32::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Overflow);
+        }
+
+        #[test]
+        fn i32_underflow_proptest(i in r"-[1-9][0-9]{10}\D") {
+            let result = i32::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Underflow);
+        }
+
+        #[test]
+        fn i32_double_sign_proptest(i in r"[+-]{2}[0-9]{9}") {
+            let result = i32::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 1);
+        }
+
+        #[test]
+        fn i32_sign_only_proptest(i in r"[+-]") {
+            let result = i32::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Empty);
+        }
+
+        #[test]
+        fn i32_trailing_digits_proptest(i in r"[+-]?[0-9]{9}\D[0-9]{2}") {
+            let result = i32::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 9 || error.index == 10);
+        }
+
+        #[test]
+        fn u64_invalid_proptest(i in r"[+]?[0-9]{19}\D") {
+            let result = u64::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 19 || error.index == 20);
+        }
+
+        #[test]
+        fn u64_overflow_proptest(i in r"[+]?[1-9][0-9]{21}\D") {
+            let result = u64::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Overflow);
+        }
+
+        #[test]
+        fn u64_negative_proptest(i in r"[-][1-9][0-9]{21}") {
+            let result = u64::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::InvalidDigit);
+        }
+
+        #[test]
+        fn u64_double_sign_proptest(i in r"[+]{2}[0-9]{19}") {
+            let result = u64::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 1);
+        }
+
+        #[test]
+        fn u64_sign_only_proptest(i in r"[+]") {
+            let result = u64::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Empty);
+        }
+
+        #[test]
+        fn u64_trailing_digits_proptest(i in r"[+]?[0-9]{19}\D[0-9]{2}") {
+            let result = u64::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 19 || error.index == 20);
+        }
+
+        #[test]
+        fn i64_invalid_proptest(i in r"[+-]?[0-9]{18}\D") {
+            let result = i64::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 18 || error.index == 19);
+        }
+
+        #[test]
+        fn i64_overflow_proptest(i in r"[+]?[1-9][0-9]{19}\D") {
+            let result = i64::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Overflow);
+        }
+
+        #[test]
+        fn i64_underflow_proptest(i in r"-[1-9][0-9]{19}\D") {
+            let result = i64::from_lexical(i.as_bytes());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Underflow);
+        }
+
+        #[test]
+        fn i64_double_sign_proptest(i in r"[+-]{2}[0-9]{18}") {
+            let result = i64::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 1);
+        }
+
+        #[test]
+        fn i64_sign_only_proptest(i in r"[+-]") {
+            let result = i32::from_lexical(i.as_bytes());
+            prop_assert!(result.is_err());
+            let code = result.err().unwrap().code;
+            prop_assert_eq!(code, ErrorCode::Empty);
+        }
+
+        #[test]
+        fn i64_trailing_digits_proptest(i in r"[+-]?[0-9]{18}\D[0-9]{2}") {
+            let result = i64::from_lexical(i.as_bytes());
+            let error = result.err().unwrap();
+            prop_assert_eq!(error.code, ErrorCode::InvalidDigit);
+            prop_assert!(error.index == 18 || error.index == 19);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/exponent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/exponent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/exponent.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/exponent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,64 @@
+//! String-to-integer routines specialized to parse the exponent of a float.
+
+use crate::util::*;
+use super::shared::*;
+
+// STANDALONE EXPONENT
+// -------------------
+
+// These routines are a specialized parser for the exponent of a floating-
+// point number, from an unvalidated buffer with a potential sign bit.
+// On numeric overflow or underflow, we want to return the max or min
+// value possible, respectively. On overflow, find the first non-digit
+// char (if applicable), and return the max/min value and the number
+// of digits parsed.
+
+// Add digit to mantissa.
+macro_rules! add_digit {
+    ($value:ident, $radix:ident, $op:ident, $digit:ident) => {
+        match $value.checked_mul(as_cast($radix)) {
+            Some(v) => v.$op(as_cast($digit)),
+            None    => None,
+        }
+    };
+}
+
+// Iterate over the digits and iteratively process them.
+macro_rules! parse_digits_exponent {
+    ($value:ident, $iter:ident, $radix:ident, $op:ident, $default:expr) => (
+        while let Some(c) = $iter.next() {
+            let digit = match to_digit(c, $radix) {
+                Ok(v)  => v,
+                Err(c) => return ($value, c),
+            };
+            $value = match add_digit!($value, $radix, $op, digit) {
+                Some(v) => v,
+                None    => {
+                    // Consume the rest of the iterator to validate
+                    // the remaining data.
+                    if let Some(c) = $iter.find(|&c| is_not_digit_char(*c, $radix)) {
+                        return ($default, c);
+                    }
+                    $default
+                },
+            };
+        }
+    );
+}
+
+// Specialized parser for the exponent, which validates digits and
+// returns a default min or max value on overflow.
+perftools_inline!{
+pub(crate) fn standalone_exponent<'a, Iter>(mut iter: Iter, radix: u32, sign: Sign)
+    -> (i32, *const u8)
+    where Iter: AsPtrIterator<'a, u8>
+{
+    // Parse the sign bit or current data.
+    let mut value = 0;
+    match sign {
+        Sign::Positive => parse_digits_exponent!(value, iter, radix, checked_add, i32::max_value()),
+        Sign::Negative => parse_digits_exponent!(value, iter, radix, checked_sub, i32::min_value())
+    }
+
+    (value, iter.as_ptr())
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/generic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/generic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/generic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/generic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,680 @@
+//! Fast, generic, lexical string-to-integer conversion routines.
+
+//  The following benchmarks were run on an "Intel(R) Core(TM) i7-6560U
+//  CPU @ 2.20GHz" CPU, on Fedora 28, Linux kernel version 4.18.16-200
+//  (x86-64), using the lexical formatter or `x.parse()`,
+//  avoiding any inefficiencies in Rust string parsing. The code was
+//  compiled with LTO and at an optimization level of 3.
+//
+//  The benchmarks with `std` were compiled using "rustc 1.32.0
+// (9fda7c223 2019-01-16)".
+//
+//  The benchmark code may be found `benches/atoi.rs`.
+//
+//  # Benchmarks
+//
+//  | Type  |  lexical (ns/iter) | parse (ns/iter)       | Relative Increase |
+//  |:-----:|:------------------:|:---------------------:|:-----------------:|
+//  | u8    | 75,622             | 80,021                | 1.06x             |
+//  | u16   | 80,926             | 82,185                | 1.02x             |
+//  | u32   | 131,221            | 148,231               | 1.13x             |
+//  | u64   | 243,315            | 296,713               | 1.22x             |
+//  | u128  | 512,552            | 1,175,946             | 2.29x             |
+//  | i8    | 112,152            | 115,147               | 1.03x             |
+//  | i16   | 153,670            | 150,231               | 0.98x             |
+//  | i32   | 202,512            | 204,880               | 1.01x             |
+//  | i64   | 309,731            | 309,584               | 1.00x             |
+//  | i128  | 4,362,672          | 149,418,085           | 34.3x             |
+//
+//  # Raw Benchmarks
+//
+//  ```text
+//  test atoi_i128_lexical        ... bench:   4,305,621 ns/iter (+/- 132,707)
+//  test atoi_i128_parse          ... bench: 146,893,478 ns/iter (+/- 2,822,002)
+//  test atoi_i16_lexical         ... bench:     132,255 ns/iter (+/- 5,503)
+//  test atoi_i16_parse           ... bench:     137,965 ns/iter (+/- 5,906)
+//  test atoi_i32_lexical         ... bench:     207,101 ns/iter (+/- 79,541)
+//  test atoi_i32_parse           ... bench:     194,225 ns/iter (+/- 9,065)
+//  test atoi_i64_lexical         ... bench:     271,538 ns/iter (+/- 9,137)
+//  test atoi_i64_parse           ... bench:     293,542 ns/iter (+/- 9,706)
+//  test atoi_i8_lexical          ... bench:     106,368 ns/iter (+/- 5,919)
+//  test atoi_i8_parse            ... bench:     108,316 ns/iter (+/- 3,418)
+//  test atoi_u128_lexical        ... bench:     496,426 ns/iter (+/- 40,197)
+//  test atoi_u128_parse          ... bench:   1,119,213 ns/iter (+/- 54,945)
+//  test atoi_u128_simple_lexical ... bench:     121,121 ns/iter (+/- 4,858)
+//  test atoi_u128_simple_parse   ... bench:      97,518 ns/iter (+/- 2,739)
+//  test atoi_u16_lexical         ... bench:      80,886 ns/iter (+/- 2,366)
+//  test atoi_u16_parse           ... bench:      81,881 ns/iter (+/- 1,708)
+//  test atoi_u16_simple_lexical  ... bench:      62,819 ns/iter (+/- 1,707)
+//  test atoi_u16_simple_parse    ... bench:      60,916 ns/iter (+/- 8,340)
+//  test atoi_u32_lexical         ... bench:     139,264 ns/iter (+/- 3,945)
+//  test atoi_u32_parse           ... bench:     139,649 ns/iter (+/- 5,735)
+//  test atoi_u32_simple_lexical  ... bench:      61,398 ns/iter (+/- 1,248)
+//  test atoi_u32_simple_parse    ... bench:      59,560 ns/iter (+/- 3,388)
+//  test atoi_u64_lexical         ... bench:     257,116 ns/iter (+/- 6,810)
+//  test atoi_u64_parse           ... bench:     273,811 ns/iter (+/- 6,871)
+//  test atoi_u64_simple_lexical  ... bench:      59,674 ns/iter (+/- 4,852)
+//  test atoi_u64_simple_parse    ... bench:      55,982 ns/iter (+/- 2,288)
+//  test atoi_u8_lexical          ... bench:      70,637 ns/iter (+/- 1,889)
+//  test atoi_u8_parse            ... bench:      67,606 ns/iter (+/- 1,924)
+//  test atoi_u8_simple_lexical   ... bench:      41,190 ns/iter (+/- 6,948)
+//  test atoi_u8_simple_parse     ... bench:      36,836 ns/iter (+/- 2,958)
+//  ```
+//
+// Code the generate the benchmark plot:
+//  import numpy as np
+//  import pandas as pd
+//  import matplotlib.pyplot as plt
+//  plt.style.use('ggplot')
+//  lexical = np.array([75622, 80926, 131221, 243315, 512552, 112152, 153670, 202512, 309731, 4362672]) / 1e6
+//  rustcore = np.array([80021, 82185, 148231, 296713, 1175946, 115147, 150231, 204880, 309584, 149418085]) / 1e6
+//  index = ["u8", "u16", "u32", "u64", "u128", "i8", "i16", "i32", "i64", "i128"]
+//  df = pd.DataFrame({'lexical': lexical, 'rustcore': rustcore}, index = index, columns=['lexical', 'rustcore'])
+//  ax = df.plot.bar(rot=0, figsize=(16, 8), fontsize=14, color=['#E24A33', '#348ABD'])
+//  ax.set_ylabel("ms/iter")
+//  ax.set_yscale('log')
+//  ax.figure.tight_layout()
+//  ax.legend(loc=2, prop={'size': 14})
+//  plt.show()
+
+use crate::util::*;
+use super::shared::*;
+
+// SHARED
+// ------
+
+// Validate the extracted integer has no leading zeros.
+perftools_inline!{
+#[cfg(feature = "format")]
+fn validate_no_leading_zeros<'a>(digits: &[u8], digit_separator: u8, ptr: *const u8)
+    -> ParseResult<()>
+{
+    // Check if the next character is a sign symbol.
+    let index = distance(digits.as_ptr(), ptr);
+    let digits = &index!(digits[..index]);
+    let mut iter = iterate_digits_ignore_separator(digits, digit_separator);
+    let is_zero = match iter.next() {
+        Some(&b'+') | Some(&b'-')   => false,
+        Some(&b'0')                 => true,
+        _                           => return Ok(())
+    };
+
+    // Only here if we have a leading 0 or sign symbol.
+    match iter.next() {
+        Some(_) if is_zero  => return Err((ErrorCode::InvalidLeadingZeros, digits.as_ptr())),
+        Some(&b'0')         => (),
+        _                   => return Ok(())
+    }
+
+    // Only here if we have a leading 0 symbol.
+    match iter.next() {
+        Some(_)             => Err((ErrorCode::InvalidLeadingZeros, digits.as_ptr())),
+        _                   => Ok(())
+    }
+}}
+
+// STANDALONE
+// ----------
+
+/// Iterate over the digits and iteratively process them.
+macro_rules! parse_digits {
+    ($value:ident, $iter:ident, $radix:ident, $op:ident, $code:ident) => (
+        while let Some(c) = $iter.next() {
+            let digit = match to_digit!(*c, $radix) {
+                Some(v) => v,
+                None    => return Ok(($value, c)),
+            };
+            $value = match $value.checked_mul(as_cast($radix)) {
+                Some(v) => v,
+                None    => return Err((ErrorCode::$code, c)),
+            };
+            $value = match $value.$op(as_cast(digit)) {
+                Some(v) => v,
+                None    => return Err((ErrorCode::$code, c)),
+            };
+        }
+    );
+}
+
+// Parse the digits for the atoi processor.
+perftools_inline_always!{
+fn parse_digits<'a, T, Iter>(digits: &[u8], mut iter: Iter, radix: u32, sign: Sign)
+    -> ParseResult<(T, *const u8)>
+    where T: Integer,
+          Iter: AsPtrIterator<'a, u8>
+{
+    let mut value = T::ZERO;
+    if sign == Sign::Positive {
+        parse_digits!(value, iter, radix, checked_add, Overflow);
+    } else {
+        parse_digits!(value, iter, radix, checked_sub, Underflow);
+    }
+    Ok((value, last_ptr(digits)))
+}}
+
+// PARSE THEN EXTRACT
+
+// Standalone atoi processor without a digit separator.
+perftools_inline_always!{
+fn standalone<T>(bytes: &[u8], radix: u32)
+    -> ParseResult<(T, *const u8)>
+    where T: Integer
+{
+    let (sign, digits) = parse_sign!(bytes, T::IS_SIGNED, Empty);
+    let iter = iterate_digits_no_separator(digits, b'\x00');
+    parse_digits(digits, iter, radix, sign)
+}}
+
+// Standalone atoi processor with digit separators.
+// Consumes leading, internal, trailing, and consecutive digit separators.
+perftools_inline_always!{
+#[cfg(feature = "format")]
+fn standalone_iltc<T>(bytes: &[u8], radix: u32, digit_separator: u8)
+    -> ParseResult<(T, *const u8)>
+    where T: Integer
+{
+    let (sign, digits) = parse_sign_lc_separator::<T>(bytes, digit_separator);
+    if digits.is_empty() {
+        return Err((ErrorCode::Empty, digits.as_ptr()));
+    }
+    let iter = iterate_digits_ignore_separator(digits, digit_separator);
+    parse_digits(digits, iter, radix, sign)
+}}
+
+// EXTRACT THEN PARSE
+
+// Generate function definition to extract then parse an integer with digit separators.
+macro_rules! standalone_atoi_separator {
+    (
+        fn $name:ident,
+        sign => $sign:ident,
+        consume => $consume:ident
+    ) => (
+        perftools_inline_always!{
+        #[cfg(feature = "format")]
+        fn $name<T>(
+            bytes: &[u8],
+            radix: u32,
+            digit_separator: u8
+        )
+            -> ParseResult<(T, *const u8)>
+            where T: Integer
+        {
+            // Parse the sign, and error if we have no more digits.
+            let (sign, digits) = $sign::<T>(bytes, digit_separator);
+            if digits.is_empty() {
+                return Err((ErrorCode::Empty, digits.as_ptr()));
+            }
+
+            // Extract the integer subslice, then parse.
+            let leading = $consume(digits, radix, digit_separator).0;
+            let iter = iterate_digits_ignore_separator(leading, digit_separator);
+
+            parse_digits(leading, iter, radix, sign)
+        }}
+    );
+}
+
+standalone_atoi_separator!(
+    fn standalone_i,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_i
+);
+
+standalone_atoi_separator!(
+    fn standalone_ic,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_ic
+);
+
+standalone_atoi_separator!(
+    fn standalone_l,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_l
+);
+
+standalone_atoi_separator!(
+    fn standalone_lc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_lc
+);
+
+standalone_atoi_separator!(
+    fn standalone_t,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_t
+);
+
+standalone_atoi_separator!(
+    fn standalone_tc,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_tc
+);
+
+standalone_atoi_separator!(
+    fn standalone_il,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_il
+);
+
+standalone_atoi_separator!(
+    fn standalone_ilc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_ilc
+);
+
+standalone_atoi_separator!(
+    fn standalone_it,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_it
+);
+
+standalone_atoi_separator!(
+    fn standalone_itc,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_itc
+);
+
+standalone_atoi_separator!(
+    fn standalone_lt,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_lt
+);
+
+standalone_atoi_separator!(
+    fn standalone_ltc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_ltc
+);
+
+standalone_atoi_separator!(
+    fn standalone_ilt,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_ilt
+);
+
+// API
+
+// Standalone atoi processor without a digit separator.
+perftools_inline_always!{
+pub(crate) fn standalone_no_separator<T>(bytes: &[u8], radix: u32)
+    -> ParseResult<(T, *const u8)>
+    where T: Integer
+{
+    standalone(bytes, radix)
+}}
+
+// Extract exponent with a digit separator in the exponent component.
+perftools_inline_always!{
+#[cfg(feature = "format")]
+pub(crate) fn standalone_separator<V>(bytes: &[u8], radix: u32, format: NumberFormat)
+    -> ParseResult<(V, *const u8)>
+    where V: Integer
+{
+    const I: NumberFormat = NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR;
+    const L: NumberFormat = NumberFormat::INTEGER_LEADING_DIGIT_SEPARATOR;
+    const T: NumberFormat = NumberFormat::INTEGER_TRAILING_DIGIT_SEPARATOR;
+    const C: NumberFormat = NumberFormat::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR;
+    const IL: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | L.bits());
+    const IT: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | T.bits());
+    const LT: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | T.bits());
+    const ILT: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | T.bits());
+    const IC: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | C.bits());
+    const LC: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | C.bits());
+    const TC: NumberFormat = NumberFormat::from_bits_truncate(T.bits() | C.bits());
+    const ILC: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | C.bits());
+    const ITC: NumberFormat = NumberFormat::from_bits_truncate(IT.bits() | C.bits());
+    const LTC: NumberFormat = NumberFormat::from_bits_truncate(LT.bits() | C.bits());
+    const ILTC: NumberFormat = NumberFormat::from_bits_truncate(ILT.bits() | C.bits());
+
+    let digit_separator = format.digit_separator();
+    let (value, ptr) = match format & NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK {
+        I       => standalone_i(bytes, radix, digit_separator),
+        IC      => standalone_ic(bytes, radix, digit_separator),
+        L       => standalone_l(bytes, radix, digit_separator),
+        LC      => standalone_lc(bytes, radix, digit_separator),
+        T       => standalone_t(bytes, radix, digit_separator),
+        TC      => standalone_tc(bytes, radix, digit_separator),
+        IL      => standalone_il(bytes, radix, digit_separator),
+        ILC     => standalone_ilc(bytes, radix, digit_separator),
+        IT      => standalone_it(bytes, radix, digit_separator),
+        ITC     => standalone_itc(bytes, radix, digit_separator),
+        LT      => standalone_lt(bytes, radix, digit_separator),
+        LTC     => standalone_ltc(bytes, radix, digit_separator),
+        ILT     => standalone_ilt(bytes, radix, digit_separator),
+        ILTC    => standalone_iltc(bytes, radix, digit_separator),
+        // No digit separator match.
+        _       => standalone(bytes, radix)
+    }?;
+
+    // Check if we have any leading zeros.
+    if format.no_integer_leading_zeros() {
+        validate_no_leading_zeros(bytes, digit_separator, ptr)?;
+    }
+
+    Ok((value, ptr))
+}}
+
+// STANDALONE U128
+// ---------------
+
+// Grab the step size and power for step_u64.
+// This is the same as the u128 divisor, so don't duplicate the values
+// there.
+perftools_inline_always!{
+fn step_u64(radix: u32) -> usize {
+    u128_divisor(radix).1
+}}
+
+// Add 64-bit temporary to the 128-bit value.
+macro_rules! add_temporary_128 {
+    ($value:ident, $tmp:ident, $step_power:ident, $ptr:expr, $op:ident, $code:ident) => (
+        if !$value.is_zero() {
+            $value = match $value.checked_mul(as_cast($step_power)) {
+                Some(v) => v,
+                None    => return Err((ErrorCode::$code, $ptr)),
+            };
+        }
+        $value = match $value.$op(as_cast($tmp)) {
+            Some(v) => v,
+            None    => return Err((ErrorCode::$code, $ptr)),
+        };
+    );
+}
+
+/// Iterate over the digits and iteratively process them.
+macro_rules! parse_digits_u128 {
+    ($value:ident, $iter:ident, $radix:ident, $step:ident, $op:ident, $code:ident) => ({
+        // Break the input into chunks of len `step`, which can be parsed
+        // as a 64-bit integer.
+        while !$iter.consumed() {
+            let mut value: u64 = 0;
+            let mut index = 0;
+            while index < $step {
+                if let Some(c) = $iter.next() {
+                    index += 1;
+                    let digit = match to_digit!(*c, $radix) {
+                        Some(v) => v,
+                        None    => {
+                            // Add temporary to value and return early.
+                            let radix_pow = $radix.as_u64().pow(index.as_u32());
+                            add_temporary_128!($value, value, radix_pow, c, $op, $code);
+                            return Ok(($value, c));
+                        },
+                    };
+
+                    // Don't have to worry about overflows.
+                    value *= $radix.as_u64();
+                    value += digit.as_u64();
+                } else {
+                    break;
+                }
+            }
+
+            // Add the temporary value to the total value.
+            let radix_pow = $radix.as_u64().pow(index.as_u32());
+            add_temporary_128!($value, value, radix_pow, $iter.as_ptr(), $op, $code);
+        }
+    });
+}
+
+// Quickly parse digits using a 64-bit intermediate for the 128-bit atoi processor.
+perftools_inline_always!{
+fn parse_digits_128_fast<'a, W, N, Iter>(digits: &[u8], iter: Iter, radix: u32, sign: Sign)
+    -> ParseResult<(W, *const u8)>
+    where W: Integer,
+          N: Integer,
+          Iter: ConsumedIterator<Item=&'a u8> + AsPtrIterator<'a, u8>
+{
+    let (value, ptr) = parse_digits::<N, _>(digits, iter, radix, sign)?;
+    Ok((as_cast(value), ptr))
+}}
+
+// Slowly parse digits for the 128-bit atoi processor.
+perftools_inline_always!{
+fn parse_digits_128_slow<'a, T, Iter>(digits: &[u8], mut iter: Iter, radix: u32, step: usize, sign: Sign)
+    -> ParseResult<(T, *const u8)>
+    where T: Integer,
+          Iter: ConsumedIterator<Item=&'a u8> + AsPtrIterator<'a, u8>
+{
+    let mut value = T::ZERO;
+    if sign == Sign::Positive {
+        parse_digits_u128!(value, iter, radix, step, checked_add, Overflow)
+    } else {
+        parse_digits_u128!(value, iter, radix, step, checked_sub, Underflow)
+    }
+    Ok((value, last_ptr(digits)))
+}}
+
+// Parse digits for the 128-bit atoi processor.
+//
+// This algorithm may overestimate the number of digits to overflow
+// on numeric overflow or underflow, otherwise, it will be accurate.
+// This is because we break costly u128 addition/multiplications into
+// temporary steps using u64, allowing much better performance.
+// This is a similar approach to what we take in the arbitrary-precision
+// arithmetic.
+perftools_inline_always!{
+fn parse_digits_128<'a, W, N, Iter>(digits: &[u8], iter: Iter, radix: u32, sign: Sign)
+    -> ParseResult<(W, *const u8)>
+    where W: Integer,
+          N: Integer,
+          Iter: ConsumedIterator<Item=&'a u8> + AsPtrIterator<'a, u8>
+{
+    // This is guaranteed to be safe, since if the length is
+    // 1 less than step, and the min radix is 2, the value must be
+    // less than 2x u64::MAX, which means it must fit in an i64.
+    let step = step_u64(radix);
+    if digits.len() < step {
+        parse_digits_128_fast::<W, N, _>(digits, iter, radix, sign)
+    } else {
+        parse_digits_128_slow(digits, iter, radix, step, sign)
+    }
+}}
+
+// PARSE THEN EXTRACT
+
+// Standalone atoi processor for 128-bit integers without a digit separator.
+perftools_inline_always!{
+fn standalone_128<W, N>(bytes: &[u8], radix: u32)
+    -> ParseResult<(W, *const u8)>
+    where W: Integer,
+          N: Integer
+{
+    let (sign, digits) = parse_sign!(bytes, W::IS_SIGNED, Empty);
+    let iter = iterate_digits_no_separator(digits, b'\x00');
+    parse_digits_128::<W, N, _>(digits, iter, radix, sign)
+}}
+
+// Standalone atoi processor for 128-bit integers with digit separators.
+// Consumes leading, internal, trailing, and consecutive digit separators.
+perftools_inline_always!{
+#[cfg(feature = "format")]
+fn standalone_128_iltc<W, N>(bytes: &[u8], radix: u32, digit_separator: u8)
+    -> ParseResult<(W, *const u8)>
+    where W: Integer,
+          N: Integer
+{
+    let (sign, digits) = parse_sign_lc_separator::<W>(bytes, digit_separator);
+    if digits.is_empty() {
+        return Err((ErrorCode::Empty, digits.as_ptr()));
+    }
+    let iter = iterate_digits_ignore_separator(digits, digit_separator);
+    parse_digits_128::<W, N, _>(digits, iter, radix, sign)
+}}
+
+// EXTRACT THEN PARSE
+
+// Generate function definition to extract then parse an 128-bit integer with digit separators.
+macro_rules! standalone_atoi_128_separator {
+    (
+        fn $name:ident,
+        sign => $sign:ident,
+        consume => $consume:ident
+    ) => (
+        perftools_inline!{
+        #[cfg(feature = "format")]
+        fn $name<W, N>(
+            bytes: &[u8],
+            radix: u32,
+            digit_separator: u8
+        )
+            -> ParseResult<(W, *const u8)>
+            where W: Integer,
+                  N: Integer
+        {
+            // Parse the sign, and error if we have no more digits.
+            let (sign, digits) = $sign::<W>(bytes, digit_separator);
+            if digits.is_empty() {
+                return Err((ErrorCode::Empty, digits.as_ptr()));
+            }
+
+            // Extract the integer subslice, then parse.
+            let leading = $consume(digits, radix, digit_separator).0;
+            let iter = iterate_digits_ignore_separator(leading, digit_separator);
+            parse_digits_128::<W, N, _>(leading, iter, radix, sign)
+        }}
+    );
+}
+
+standalone_atoi_128_separator!(
+    fn standalone_128_i,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_i
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_ic,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_ic
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_l,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_l
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_lc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_lc
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_t,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_t
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_tc,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_tc
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_il,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_il
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_ilc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_ilc
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_it,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_it
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_itc,
+    sign => parse_sign_no_separator,
+    consume => consume_digits_itc
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_lt,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_lt
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_ltc,
+    sign => parse_sign_lc_separator,
+    consume => consume_digits_ltc
+);
+
+standalone_atoi_128_separator!(
+    fn standalone_128_ilt,
+    sign => parse_sign_l_separator,
+    consume => consume_digits_ilt
+);
+
+// API
+
+// Standalone atoi processor for u128 without a digit separator.
+perftools_inline_always!{
+pub(crate) fn standalone_128_no_separator<W, N>(bytes: &[u8], radix: u32)
+    -> ParseResult<(W, *const u8)>
+    where W: Integer,
+          N: Integer
+{
+    standalone_128::<W, N>(bytes, radix)
+}}
+
+// Extract exponent with a digit separator in the exponent component.
+perftools_inline_always!{
+#[cfg(feature = "format")]
+pub(crate) fn standalone_128_separator<W, N>(bytes: &[u8], radix: u32, format: NumberFormat)
+    -> ParseResult<(W, *const u8)>
+    where W: Integer,
+          N: Integer
+{
+    const I: NumberFormat = NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR;
+    const L: NumberFormat = NumberFormat::INTEGER_LEADING_DIGIT_SEPARATOR;
+    const T: NumberFormat = NumberFormat::INTEGER_TRAILING_DIGIT_SEPARATOR;
+    const C: NumberFormat = NumberFormat::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR;
+    const IL: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | L.bits());
+    const IT: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | T.bits());
+    const LT: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | T.bits());
+    const ILT: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | T.bits());
+    const IC: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | C.bits());
+    const LC: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | C.bits());
+    const TC: NumberFormat = NumberFormat::from_bits_truncate(T.bits() | C.bits());
+    const ILC: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | C.bits());
+    const ITC: NumberFormat = NumberFormat::from_bits_truncate(IT.bits() | C.bits());
+    const LTC: NumberFormat = NumberFormat::from_bits_truncate(LT.bits() | C.bits());
+    const ILTC: NumberFormat = NumberFormat::from_bits_truncate(ILT.bits() | C.bits());
+
+    let digit_separator = format.digit_separator();
+    let (value, ptr) = match format & NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK {
+        I       => standalone_128_i::<W, N>(bytes, radix, digit_separator),
+        IC      => standalone_128_ic::<W, N>(bytes, radix, digit_separator),
+        L       => standalone_128_l::<W, N>(bytes, radix, digit_separator),
+        LC      => standalone_128_lc::<W, N>(bytes, radix, digit_separator),
+        T       => standalone_128_t::<W, N>(bytes, radix, digit_separator),
+        TC      => standalone_128_tc::<W, N>(bytes, radix, digit_separator),
+        IL      => standalone_128_il::<W, N>(bytes, radix, digit_separator),
+        ILC     => standalone_128_ilc::<W, N>(bytes, radix, digit_separator),
+        IT      => standalone_128_it::<W, N>(bytes, radix, digit_separator),
+        ITC     => standalone_128_itc::<W, N>(bytes, radix, digit_separator),
+        LT      => standalone_128_lt::<W, N>(bytes, radix, digit_separator),
+        LTC     => standalone_128_ltc::<W, N>(bytes, radix, digit_separator),
+        ILT     => standalone_128_ilt::<W, N>(bytes, radix, digit_separator),
+        ILTC    => standalone_128_iltc::<W, N>(bytes, radix, digit_separator),
+        // No digit separator match.
+        _       => standalone_128::<W, N>(bytes, radix)
+    }?;
+
+    // Check if we have any leading zeros.
+    if format.no_integer_leading_zeros() {
+        validate_no_leading_zeros(bytes, digit_separator, ptr)?;
+    }
+
+    Ok((value, ptr))
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/mantissa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/mantissa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/mantissa.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/mantissa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,95 @@
+//! String-to-integer routines specialized to parse the mantissa of a float.
+
+use crate::util::*;
+
+#[cfg(feature = "correct")]
+use super::shared::*;
+
+// STANDALONE MANTISSA
+// -------------------
+
+// These routines are a specialized parser for the mantissa of a floating-
+// point number, from two buffers containing valid digits. We want to
+// exit early on numeric overflow, returning the value parsed up until
+// that point.
+
+// Calculate the mantissa and the number of truncated digits from a digits iterator.
+// Will stop once the iterators produce a non-valid digit character.
+perftools_inline!{
+#[cfg(feature = "correct")]
+pub(crate) fn standalone_mantissa<'a, T, Iter1, Iter2>(mut integer: Iter1, mut fraction: Iter2, radix: u32)
+    -> (T, usize)
+    where T: UnsignedInteger,
+          Iter1: Iterator<Item=&'a u8>,
+          Iter2: Iterator<Item=&'a u8>
+{
+    // Mote:
+    //  Do not use iter.chain(), since it is enormously slow.
+    //  Since we need to maintain backwards compatibility, even if
+    //  iter.chain() is patched, for older Rustc versions, it's nor
+    //  worth the performance penalty.
+
+    let mut value: T = T::ZERO;
+    // On overflow, validate that all the remaining characters are valid
+    // digits, if not, return the first invalid digit. Otherwise,
+    // calculate the number of truncated digits.
+    while let Some(c) = integer.next() {
+        value = match add_digit(value, to_digit!(*c, radix).unwrap(), radix) {
+            Some(v) => v,
+            None    => {
+                let truncated = 1 + integer.count() + fraction.count();
+                return (value, truncated);
+            },
+        };
+    }
+    while let Some(c) = fraction.next() {
+        value = match add_digit(value, to_digit!(*c, radix).unwrap(), radix) {
+            Some(v) => v,
+            None    => {
+                let truncated = 1 + fraction.count();
+                return (value, truncated);
+            },
+        };
+    }
+    (value, 0)
+}}
+
+// Calculate the mantissa when it cannot have sign or other invalid digits.
+perftools_inline!{
+#[cfg(not(feature = "correct"))]
+pub(crate) fn standalone_mantissa<'a, T, Iter>(mut iter: Iter, radix: u32)
+    -> T
+    where T: Integer,
+          Iter: Iterator<Item=&'a u8>
+{
+    // Parse the integer.
+    let mut value = T::ZERO;
+    while let Some(c) = iter.next() {
+        // Cannot overflow, since using a wrapped float.
+        value = (value * as_cast(radix)) + as_cast(to_digit!(*c, radix).unwrap());
+    }
+   value
+}}
+
+// Calculate mantissa and only take first N digits.
+perftools_inline!{
+#[cfg(not(feature = "correct"))]
+pub(crate) fn standalone_mantissa_n<'a, T, Iter>(iter: &mut Iter, radix: u32, max: usize)
+    -> (T, usize)
+    where T: Integer,
+          Iter: Iterator<Item=&'a u8>
+{
+    // Parse the integer.
+    let mut value = T::ZERO;
+    let mut index = 0;
+    while index < max {
+        if let Some(c) = iter.next() {
+            // Cannot overflow, since we're limiting it to non-overflowing digit counts.
+            index += 1;
+            value = (value * as_cast(radix)) + as_cast(to_digit!(*c, radix).unwrap());
+        } else {
+            break;
+        }
+    }
+    (value, index)
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+//! Fast lexical string-to-integer conversion routines.
+
+// Hide implementation details.
+#[macro_use]
+mod shared;
+
+mod api;
+mod exponent;
+mod generic;
+mod mantissa;
+
+// Re-exports
+pub(crate) use self::mantissa::*;
+pub(crate) use self::exponent::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/shared.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/shared.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/atoi/shared.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/atoi/shared.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,73 @@
+//! Shared definitions for string-to-integer conversions.
+
+use crate::lib::result::Result as StdResult;
+
+#[cfg(feature = "correct")]
+use crate::util::*;
+
+// SHARED
+// ------
+
+// Convert u8 to digit.
+macro_rules! to_digit {
+    ($c:expr, $radix:expr) => (($c as char).to_digit($radix));
+}
+
+// Parse the sign bit and filter empty inputs from the atoi data.
+macro_rules! parse_sign {
+    ($bytes:ident, $is_signed:expr, $code:ident) => ({
+        // Filter out empty inputs.
+        if $bytes.is_empty() {
+            return Err((ErrorCode::$code, $bytes.as_ptr()));
+        }
+
+        let (sign, digits) = match index!($bytes[0]) {
+            b'+'               => (Sign::Positive, &index!($bytes[1..])),
+            b'-' if $is_signed => (Sign::Negative, &index!($bytes[1..])),
+            _                  => (Sign::Positive, $bytes),
+        };
+
+        // Filter out empty inputs.
+        if digits.is_empty() {
+            return Err((ErrorCode::$code, digits.as_ptr()));
+        }
+
+        (sign, digits)
+    });
+}
+
+// Get pointer to 1-past-end of slice.
+// Performance note: Use slice, as `iter.as_ptr()` turns out to
+// quite slow performance wise, likely since it needs to calculate
+// the end ptr, while for a slice this is effectively a no-op.
+perftools_inline_always!{
+pub(super) fn last_ptr<T>(slc: &[T]) -> *const T {
+    index!(slc[slc.len()..]).as_ptr()
+}}
+
+// Convert character to digit.
+perftools_inline_always!{
+pub(super) fn to_digit<'a>(c: &'a u8, radix: u32) -> StdResult<u32, &'a u8> {
+    match to_digit!(*c, radix) {
+        Some(v) => Ok(v),
+        None    => Err(c),
+    }
+}}
+
+// Convert character to digit.
+perftools_inline_always!{
+pub(super) fn is_not_digit_char(c: u8, radix: u32) -> bool {
+    to_digit!(c, radix).is_none()
+}}
+
+// Add digit to mantissa.
+perftools_inline_always!{
+#[cfg(feature = "correct")]
+pub(super) fn add_digit<T>(value: T, digit: u32, radix: u32)
+    -> Option<T>
+    where T: UnsignedInteger
+{
+    return value
+        .checked_mul(as_cast(radix))?
+        .checked_add(as_cast(digit))
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/convert.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/convert.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/convert.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/convert.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,115 @@
+//! Convert between extended-precision and native floats/integers.
+
+use crate::lib::convert::From;
+use crate::lib::mem;
+use crate::util::*;
+use super::float::ExtendedFloat;
+use super::mantissa::Mantissa;
+
+// FROM INT
+
+// Import ExtendedFloat from integer.
+//
+// This works because we call normalize before any operation, which
+// allows us to convert the integer representation to the float one.
+perftools_inline!{
+pub(crate) fn from_int<T, M>(t: T)
+    -> ExtendedFloat<M>
+    where T: Integer,
+          M: Mantissa
+{
+    debug_assert!(mem::size_of::<T>() <= mem::size_of::<M>(), "Possible truncation in ExtendedFloat::from_int.");
+
+    ExtendedFloat {
+        mant: as_cast(t),
+        exp: 0,
+    }
+}}
+
+// FROM FLOAT
+
+// Import ExtendedFloat from native float.
+perftools_inline!{
+pub(crate) fn from_float<T, M>(t: T)
+    -> ExtendedFloat<M>
+    where T: Float,
+          M: Mantissa
+{
+    ExtendedFloat {
+        mant: as_cast(t.mantissa()),
+        exp: t.exponent(),
+    }
+}}
+
+// AS FLOAT
+
+// Export extended-precision float to native float.
+//
+// The extended-precision float must be in native float representation,
+// with overflow/underflow appropriately handled.
+perftools_inline!{
+pub(crate) fn into_float<T, M>(fp: ExtendedFloat<M>)
+    -> T
+    where T: Float,
+          M: Mantissa
+{
+    // Export floating-point number.
+    if fp.mant.is_zero() || fp.exp < T::DENORMAL_EXPONENT {
+        // sub-denormal, underflow
+        T::ZERO
+    } else if fp.exp >= T::MAX_EXPONENT {
+        // overflow
+        T::from_bits(T::INFINITY_BITS)
+    } else {
+        // calculate the exp and fraction bits, and return a float from bits.
+        let exp: M;
+        if (fp.exp == T::DENORMAL_EXPONENT) && (fp.mant & as_cast::<M, _>(T::HIDDEN_BIT_MASK)).is_zero() {
+            exp = M::ZERO;
+        } else {
+            exp = as_cast::<M, _>(fp.exp + T::EXPONENT_BIAS);
+        }
+        let exp = exp << T::MANTISSA_SIZE;
+        let mant = fp.mant & as_cast::<M, _>(T::MANTISSA_MASK);
+        T::from_bits(as_cast(mant | exp))
+    }
+}}
+
+// FROM CONVERSIONS
+
+/// Conversion from a float to an extended float of the same size.
+impl<F: Float> From<F> for ExtendedFloat<F::Unsigned> where F::Unsigned: Mantissa {
+    perftools_inline!{
+    fn from(f: F) -> Self {
+        from_float(f)
+    }}
+}
+
+/// Conversion from a (mant, exp) tuple to an extended float of the same size.
+impl<M: Mantissa> From<(M, i32)> for ExtendedFloat<M> {
+    perftools_inline!{
+    fn from(t: (M, i32)) -> Self {
+        ExtendedFloat { mant: t.0, exp: t.1 }
+    }}
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn convert_float_test() {
+        let f: f32 = 1e-45;
+        let fp: ExtendedFloat<u32> = f.into();
+        assert_eq!(fp, ExtendedFloat { mant: 1u32, exp: -149 });
+    }
+
+    #[test]
+    fn convert_tuple_test() {
+        let t = (1u64, 0i32);
+        let fp: ExtendedFloat<u64> = t.into();
+        assert_eq!(fp, ExtendedFloat { mant: 1u64, exp: 0 });
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/float.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/float.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/float.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/float.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1183 @@
+//! Extended precision floating-point types.
+//!
+//! Also contains helpers to convert to and from native rust floats.
+//! This representation stores the mantissa as a 64-bit unsigned integer,
+//! and the exponent as a 32-bit unsigned integer, allowed ~80 bits of
+//! precision (only 16 bits of the 32-bit integer are used, u32 is used
+//! for performance). Since there is no storage for the sign bit,
+//! this only works for positive floats.
+// Lot of useful algorithms in here, and helper utilities.
+// We want to make sure this code is not accidentally deleted.
+#![allow(dead_code)]
+
+use crate::util::*;
+use super::convert::*;
+use super::mantissa::Mantissa;
+use super::rounding::*;
+use super::shift::*;
+
+// FLOAT TYPE
+
+/// Extended precision floating-point type.
+///
+/// Private implementation, exposed only for testing purposes.
+#[doc(hidden)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ExtendedFloat<M: Mantissa> {
+    /// Mantissa for the extended-precision float.
+    pub mant: M,
+    /// Binary exponent for the extended-precision float.
+    pub exp: i32,
+}
+
+impl<M: Mantissa> ExtendedFloat<M> {
+    // PROPERTIES
+
+    perftools_inline!{
+    /// Get the mantissa component.
+    pub fn mantissa(&self) -> M {
+        self.mant
+    }}
+
+    perftools_inline!{
+    /// Get the exponent component.
+    pub fn exponent(&self) -> i32 {
+        self.exp
+    }}
+
+    // OPERATIONS
+
+    perftools_inline!{
+    /// Multiply two normalized extended-precision floats, as if by `a*b`.
+    ///
+    /// The precision is maximal when the numbers are normalized, however,
+    /// decent precision will occur as long as both values have high bits
+    /// set. The result is not normalized.
+    ///
+    /// Algorithm:
+    ///     1. Non-signed multiplication of mantissas (requires 2x as many bits as input).
+    ///     2. Normalization of the result (not done here).
+    ///     3. Addition of exponents.
+    pub fn mul(&self, b: &ExtendedFloat<M>)
+        -> ExtendedFloat<M>
+    {
+        // Logic check, values must be decently normalized prior to multiplication.
+        debug_assert!((self.mant & M::HIMASK != M::ZERO) && (b.mant & M::HIMASK != M::ZERO));
+
+        // Extract high-and-low masks.
+        let ah = self.mant >> M::HALF;
+        let al = self.mant & M::LOMASK;
+        let bh = b.mant >> M::HALF;
+        let bl = b.mant & M::LOMASK;
+
+        // Get our products
+        let ah_bl = ah * bl;
+        let al_bh = al * bh;
+        let al_bl = al * bl;
+        let ah_bh = ah * bh;
+
+        let mut tmp = (ah_bl & M::LOMASK) + (al_bh & M::LOMASK) + (al_bl >> M::HALF);
+        // round up
+        tmp += M::ONE << (M::HALF-1);
+
+        ExtendedFloat {
+            mant: ah_bh + (ah_bl >> M::HALF) + (al_bh >> M::HALF) + (tmp >> M::HALF),
+            exp: self.exp + b.exp + M::FULL
+        }
+    }}
+
+    perftools_inline!{
+    /// Multiply in-place, as if by `a*b`.
+    ///
+    /// The result is not normalized.
+    pub fn imul(&mut self, b: &ExtendedFloat<M>)
+    {
+        *self = self.mul(b);
+    }}
+
+    // NORMALIZE
+
+    perftools_inline!{
+    /// Get if extended-float is normalized, MSB is set.
+    pub fn is_normalized(&self)
+        -> bool
+    {
+        self.mant & M::NORMALIZED_MASK == M::NORMALIZED_MASK
+    }}
+
+    perftools_inline!{
+    /// Normalize float-point number.
+    ///
+    /// Shift the mantissa so the number of leading zeros is 0, or the value
+    /// itself is 0.
+    ///
+    /// Get the number of bytes shifted.
+    pub fn normalize(&mut self)
+        -> u32
+    {
+        // Note:
+        // Using the cltz intrinsic via leading_zeros is way faster (~10x)
+        // than shifting 1-bit at a time, via while loop, and also way
+        // faster (~2x) than an unrolled loop that checks at 32, 16, 4,
+        // 2, and 1 bit.
+        //
+        // Using a modulus of pow2 (which will get optimized to a bitwise
+        // and with 0x3F or faster) is slightly slower than an if/then,
+        // however, removing the if/then will likely optimize more branched
+        // code as it removes conditional logic.
+
+        // Calculate the number of leading zeros, and then zero-out
+        // any overflowing bits, to avoid shl overflow when self.mant == 0.
+        let shift = if self.mant.is_zero() { 0 } else { self.mant.leading_zeros() };
+        shl(self, shift);
+        shift
+    }}
+
+    perftools_inline!{
+    /// Normalize floating-point number to n-bits away from the MSB.
+    ///
+    /// This may lead to lossy rounding, and will not use custom rounding
+    /// rules to accommodate for this.
+    pub fn normalize_to(&mut self, n: u32)
+        -> i32
+    {
+        debug_assert!(n <= M::BITS.as_u32(), "ExtendedFloat::normalize_to() attempting to shift beyond type size.");
+
+        // Get the shift, with any of the higher bits removed.
+        // This way, we can guarantee that we will not overflow
+        // with the shl/shr.
+        let leading = if self.mant.is_zero() { n } else { self.mant.leading_zeros() };
+        let shift = leading.as_i32() - n.as_i32();
+        if shift > 0 {
+            // Need to shift left
+            shl(self, shift);
+        } else if shift < 0 {
+            // Need to shift right.
+            shr(self, -shift);
+        }
+
+        shift
+    }}
+
+    perftools_inline!{
+    /// Get normalized boundaries for float.
+    pub fn normalized_boundaries(&self)
+        -> (ExtendedFloat<M>, ExtendedFloat<M>)
+    {
+        let mut upper = ExtendedFloat {
+            mant: (self.mant << 1) + M::ONE,
+            exp: self.exp - 1,
+        };
+        upper.normalize();
+
+        // Use a boolean hack to get 2 if they're equal, else 1, without
+        // any branching.
+        let is_hidden = self.mant == as_cast::<M, _>(f64::HIDDEN_BIT_MASK);
+        let l_shift: i32 = is_hidden as i32 + 1;
+
+        let mut lower = ExtendedFloat {
+            mant: (self.mant << l_shift) - M::ONE,
+            exp: self.exp - l_shift,
+        };
+        lower.mant <<= lower.exp - upper.exp;
+        lower.exp = upper.exp;
+
+        (lower, upper)
+    }}
+
+    // ROUND
+
+    perftools_inline!{
+    /// Lossy round float-point number to native mantissa boundaries.
+    pub(crate) fn round_to_native<F, Cb>(&mut self, cb: Cb)
+        where F: FloatRounding<M>,
+              Cb: FnOnce(&mut ExtendedFloat<M>, i32)
+    {
+        round_to_native::<F, M, _>(self, cb)
+    }}
+
+    perftools_inline!{
+    /// Lossy round float-point number to f32 mantissa boundaries.
+    pub(crate) fn round_to_f32<Cb>(&mut self, cb: Cb)
+        where f32: FloatRounding<M>,
+              Cb: FnOnce(&mut ExtendedFloat<M>, i32)
+    {
+        self.round_to_native::<f32, Cb>(cb)
+    }}
+
+    perftools_inline!{
+    /// Lossy round float-point number to f64 mantissa boundaries.
+    pub(crate) fn round_to_f64<Cb>(&mut self, cb: Cb)
+        where f64: FloatRounding<M>,
+              Cb: FnOnce(&mut ExtendedFloat<M>, i32)
+    {
+        self.round_to_native::<f64, Cb>(cb)
+    }}
+
+    // FROM
+
+    perftools_inline!{
+    /// Create extended float from 8-bit unsigned integer.
+    pub fn from_int<T: Integer>(i: T)
+        -> ExtendedFloat<M>
+    {
+        from_int(i)
+    }}
+
+    perftools_inline!{
+    /// Create extended float from 8-bit unsigned integer.
+    pub fn from_u8(i: u8)
+        -> ExtendedFloat<M>
+    {
+        Self::from_int(i)
+    }}
+
+    perftools_inline!{
+    /// Create extended float from 16-bit unsigned integer.
+    pub fn from_u16(i: u16)
+        -> ExtendedFloat<M>
+    {
+        Self::from_int(i)
+    }}
+
+    perftools_inline!{
+    /// Create extended float from 32-bit unsigned integer.
+    pub fn from_u32(i: u32)
+        -> ExtendedFloat<M>
+    {
+        Self::from_int(i)
+    }}
+
+    perftools_inline!{
+    /// Create extended float from 64-bit unsigned integer.
+    pub fn from_u64(i: u64)
+        -> ExtendedFloat<M>
+    {
+        Self::from_int(i)
+    }}
+
+    perftools_inline!{
+    /// Create extended float from native float.
+    pub fn from_float<F: Float>(f: F)
+        -> ExtendedFloat<M>
+    {
+        from_float(f)
+    }}
+
+    perftools_inline!{
+    /// Create extended float from 32-bit float.
+    pub fn from_f32(f: f32)
+        -> ExtendedFloat<M>
+    {
+        Self::from_float(f)
+    }}
+
+    perftools_inline!{
+    /// Create extended float from 64-bit float.
+    pub fn from_f64(f: f64)
+        -> ExtendedFloat<M>
+    {
+        Self::from_float(f)
+    }}
+
+    // INTO
+
+    perftools_inline!{
+    /// Convert into lower-precision native float.
+    pub fn into_float<F: FloatRounding<M>>(self)
+        -> F
+    {
+        #[cfg(not(feature = "rounding"))] {
+            self.into_rounded_float::<F>(RoundingKind::NearestTieEven, Sign::Positive)
+        }
+
+        #[cfg(feature = "rounding")] {
+            self.into_rounded_float::<F>(get_float_rounding(), Sign::Positive)
+        }
+    }}
+
+    perftools_inline!{
+    /// Convert into lower-precision 32-bit float.
+    pub fn into_f32(self)
+        -> f32
+        where f32: FloatRounding<M>
+    {
+        self.into_float()
+    }}
+
+    perftools_inline!{
+    /// Convert into lower-precision 64-bit float.
+    pub fn into_f64(self)
+        -> f64
+        where f64: FloatRounding<M>
+    {
+        self.into_float()
+    }}
+
+    // INTO ROUNDED
+
+    perftools_inline!{
+    /// Into rounded float where the rounding kind has been converted.
+    pub(crate) fn into_rounded_float_impl<F>(mut self, kind: RoundingKind)
+        -> F
+        where F: FloatRounding<M>
+    {
+        // Normalize the actual float rounding here.
+        let cb = match kind {
+            RoundingKind::NearestTieEven     => round_nearest_tie_even,
+            RoundingKind::NearestTieAwayZero => round_nearest_tie_away_zero,
+            RoundingKind::Upward             => round_upward,
+            RoundingKind::Downward           => round_downward,
+            _                                => unreachable!()
+        };
+
+        self.round_to_native::<F, _>(cb);
+        into_float(self)
+    }}
+
+    perftools_inline!{
+    /// Convert into lower-precision native float with custom rounding rules.
+    pub fn into_rounded_float<F>(self, kind: RoundingKind, sign: Sign)
+        -> F
+        where F: FloatRounding<M>
+    {
+        self.into_rounded_float_impl(internal_rounding(kind, sign))
+    }}
+
+    perftools_inline!{
+    /// Convert into lower-precision 32-bit float with custom rounding rules.
+    pub fn into_rounded_f32(self, kind: RoundingKind, sign: Sign)
+        -> f32
+        where f32: FloatRounding<M>
+    {
+        self.into_rounded_float(kind, sign)
+    }}
+
+    perftools_inline!{
+    /// Convert into lower-precision 64-bit float with custom rounding rules.
+    pub fn into_rounded_f64(self, kind: RoundingKind, sign: Sign)
+        -> f64
+        where f64: FloatRounding<M>
+    {
+        self.into_rounded_float(kind, sign)
+    }}
+
+    // AS
+
+    perftools_inline!{
+    /// Convert to lower-precision native float.
+    pub fn as_float<F: FloatRounding<M>>(&self)
+        -> F
+    {
+        self.clone().into_float::<F>()
+    }}
+
+    perftools_inline!{
+    /// Convert to lower-precision 32-bit float.
+    pub fn as_f32(&self)
+        -> f32
+        where f32: FloatRounding<M>
+    {
+        self.as_float()
+    }}
+
+    perftools_inline!{
+    /// Convert to lower-precision 64-bit float.
+    pub fn as_f64(&self)
+        -> f64
+        where f64: FloatRounding<M>
+    {
+        self.as_float()
+    }}
+
+    // AS ROUNDED
+
+    perftools_inline!{
+    /// Convert to lower-precision native float with custom rounding rules.
+    pub fn as_rounded_float<F>(&self, kind: RoundingKind, sign: Sign)
+        -> F
+        where F: FloatRounding<M>
+    {
+        self.clone().into_rounded_float::<F>(kind, sign)
+    }}
+
+    perftools_inline!{
+    /// Convert to lower-precision 32-bit float with custom rounding rules.
+    pub fn as_rounded_f32(&self, kind: RoundingKind, sign: Sign)
+        -> f32
+        where f32: FloatRounding<M>
+    {
+        self.as_rounded_float(kind, sign)
+    }}
+
+    perftools_inline!{
+    /// Convert to lower-precision 64-bit float with custom rounding rules.
+    pub fn as_rounded_f64(&self, kind: RoundingKind, sign: Sign)
+        -> f64
+        where f64: FloatRounding<M>
+    {
+        self.as_rounded_float(kind, sign)
+    }}
+}
+
+impl ExtendedFloat<u128> {
+    perftools_inline!{
+    /// Create extended float from 64-bit unsigned integer.
+    pub fn from_u128(i: u128) -> ExtendedFloat<u128> {
+        Self::from_int(i)
+    }}
+}
+
+// ALIASES
+
+/// Alias with ~80 bits of precision, 64 for the mantissa and 16 for exponent.
+pub type ExtendedFloat80 = ExtendedFloat<u64>;
+
+/// Alias with ~160 bits of precision, 128 for the mantissa and 32 for exponent.
+pub type ExtendedFloat160 = ExtendedFloat<u128>;
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use approx::assert_relative_eq;
+
+    // NORMALIZE
+
+    fn check_normalize(mant: u64, exp: i32, shift: u32, r_mant: u64, r_exp: i32) {
+        let mut x = ExtendedFloat {mant: mant, exp: exp};
+        assert!(!x.is_normalized());
+        assert_eq!(x.normalize(), shift);
+        assert_eq!(x, ExtendedFloat {mant: r_mant, exp: r_exp});
+        assert!(x.is_normalized() || x.mant.is_zero());
+
+        let mut x = ExtendedFloat {mant: mant as u128, exp: exp};
+        let shift = if shift == 0 { 0 } else { shift+64 };
+        let r_exp = if r_exp == 0 { 0 } else { r_exp-64 };
+        assert!(!x.is_normalized());
+        assert_eq!(x.normalize(), shift);
+        assert_eq!(x, ExtendedFloat {mant: (r_mant as u128) << 64, exp: r_exp});
+        assert!(x.is_normalized() || x.mant.is_zero());
+    }
+
+    #[test]
+    fn normalize_test() {
+        // F32
+        // 0
+        check_normalize(0, 0, 0, 0, 0);
+
+        // min value
+        check_normalize(1, -149, 63, 9223372036854775808, -212);
+
+        // 1.0e-40
+        check_normalize(71362, -149, 47, 10043308644012916736, -196);
+
+        // 1.0e-20
+        check_normalize(12379400, -90, 40, 13611294244890214400, -130);
+
+        // 1.0
+        check_normalize(8388608, -23, 40, 9223372036854775808, -63);
+
+        // 1e20
+        check_normalize(11368684, 43, 40, 12500000250510966784, 3);
+
+        // max value
+        check_normalize(16777213, 104, 40, 18446740775174668288, 64);
+
+        // F64
+
+        // min value
+        check_normalize(1, -1074, 63, 9223372036854775808, -1137);
+
+        // 1.0e-250
+        check_normalize(6448907850777164, -883, 11, 13207363278391631872, -894);
+
+        // 1.0e-150
+        check_normalize(7371020360979573, -551, 11, 15095849699286165504, -562);
+
+        // 1.0e-45
+        check_normalize(6427752177035961, -202, 11, 13164036458569648128, -213);
+
+        // 1.0e-40
+        check_normalize(4903985730770844, -185, 11, 10043362776618688512, -196);
+
+        // 1.0e-20
+        check_normalize(6646139978924579, -119, 11, 13611294676837537792, -130);
+
+        // 1.0
+        check_normalize(4503599627370496, -52, 11, 9223372036854775808, -63);
+
+        // 1e20
+        check_normalize(6103515625000000, 14, 11, 12500000000000000000, 3);
+
+        // 1e40
+        check_normalize(8271806125530277, 80, 11, 16940658945086007296, 69);
+
+        // 1e150
+        check_normalize(5503284107318959, 446, 11, 11270725851789228032, 435);
+
+        // 1e250
+        check_normalize(6290184345309700, 778, 11, 12882297539194265600, 767);
+
+        // max value
+        check_normalize(9007199254740991, 971, 11, 18446744073709549568, 960);
+    }
+
+    fn check_normalize_to(mant: u64, exp: i32, n: u32, shift: i32, r_mant: u64, r_exp: i32) {
+        let mut x = ExtendedFloat {mant: mant, exp: exp};
+        assert_eq!(x.normalize_to(n), shift);
+        assert_eq!(x, ExtendedFloat {mant: r_mant, exp: r_exp});
+
+        let mut x = ExtendedFloat {mant: mant as u128, exp: exp};
+        let shift = if shift == 0 { 0 } else { shift+64 };
+        let r_exp = if r_exp == 0 { 0 } else { r_exp-64 };
+        assert_eq!(x.normalize_to(n), shift);
+        assert_eq!(x, ExtendedFloat {mant: (r_mant as u128) << 64, exp: r_exp});
+    }
+
+    #[test]
+    fn normalize_to_test() {
+        // F32
+        // 0
+        check_normalize_to(0, 0, 0, 0, 0, 0);
+        check_normalize_to(0, 0, 2, 0, 0, 0);
+
+        // min value
+        check_normalize_to(1, -149, 0, 63, 9223372036854775808, -212);
+        check_normalize_to(1, -149, 2, 61, 2305843009213693952, -210);
+
+        // 1.0e-40
+        check_normalize_to(71362, -149, 0, 47, 10043308644012916736, -196);
+        check_normalize_to(71362, -149, 2, 45, 2510827161003229184, -194);
+
+        // 1.0e-20
+        check_normalize_to(12379400, -90, 0, 40, 13611294244890214400, -130);
+        check_normalize_to(12379400, -90, 2, 38, 3402823561222553600, -128);
+
+        // 1.0
+        check_normalize_to(8388608, -23, 0, 40, 9223372036854775808, -63);
+        check_normalize_to(8388608, -23, 2, 38, 2305843009213693952, -61);
+
+        // 1e20
+        check_normalize_to(11368684, 43, 0, 40, 12500000250510966784, 3);
+        check_normalize_to(11368684, 43, 2, 38, 3125000062627741696, 5);
+
+        // max value
+        check_normalize_to(16777213, 104, 0, 40, 18446740775174668288, 64);
+        check_normalize_to(16777213, 104, 2, 38, 4611685193793667072, 66);
+
+        // F64
+
+        // min value
+        check_normalize_to(1, -1074, 0, 63, 9223372036854775808, -1137);
+        check_normalize_to(1, -1074, 2, 61, 2305843009213693952, -1135);
+
+        // 1.0e-250
+        check_normalize_to(6448907850777164, -883, 0, 11, 13207363278391631872, -894);
+        check_normalize_to(6448907850777164, -883, 2, 9, 3301840819597907968, -892);
+
+        // 1.0e-150
+        check_normalize_to(7371020360979573, -551, 0, 11, 15095849699286165504, -562);
+        check_normalize_to(7371020360979573, -551, 2, 9, 3773962424821541376, -560);
+
+        // 1.0e-45
+        check_normalize_to(6427752177035961, -202, 0, 11, 13164036458569648128, -213);
+        check_normalize_to(6427752177035961, -202, 2, 9, 3291009114642412032, -211);
+
+        // 1.0e-40
+        check_normalize_to(4903985730770844, -185, 0, 11, 10043362776618688512, -196);
+        check_normalize_to(4903985730770844, -185, 2, 9, 2510840694154672128, -194);
+
+        // 1.0e-20
+        check_normalize_to(6646139978924579, -119, 0, 11, 13611294676837537792, -130);
+        check_normalize_to(6646139978924579, -119, 2, 9, 3402823669209384448, -128);
+
+        // 1.0
+        check_normalize_to(4503599627370496, -52, 0, 11, 9223372036854775808, -63);
+        check_normalize_to(4503599627370496, -52, 2, 9, 2305843009213693952, -61);
+
+        // 1e20
+        check_normalize_to(6103515625000000, 14, 0 ,11, 12500000000000000000, 3);
+        check_normalize_to(6103515625000000, 14, 2, 9, 3125000000000000000, 5);
+
+        // 1e40
+        check_normalize_to(8271806125530277, 80, 0, 11, 16940658945086007296, 69);
+        check_normalize_to(8271806125530277, 80, 2, 9, 4235164736271501824, 71);
+
+        // 1e150
+        check_normalize_to(5503284107318959, 446, 0, 11, 11270725851789228032, 435);
+        check_normalize_to(5503284107318959, 446, 2, 9, 2817681462947307008, 437);
+
+        // 1e250
+        check_normalize_to(6290184345309700, 778, 0, 11, 12882297539194265600, 767);
+        check_normalize_to(6290184345309700, 778, 2, 9, 3220574384798566400, 769);
+
+        // max value
+        check_normalize_to(9007199254740991, 971, 0, 11, 18446744073709549568, 960);
+        check_normalize_to(9007199254740991, 971, 2, 9, 4611686018427387392, 962);
+    }
+
+    #[test]
+    fn normalized_boundaries_test() {
+        let fp = ExtendedFloat80 {mant: 4503599627370496, exp: -50};
+        let u = ExtendedFloat80 {mant: 9223372036854775296, exp: -61};
+        let l = ExtendedFloat80 {mant: 9223372036854776832, exp: -61};
+        let (upper, lower) = fp.normalized_boundaries();
+        assert_eq!(upper, u);
+        assert_eq!(lower, l);
+    }
+
+    // ROUND
+
+    fn check_round_to_f32(mant: u64, exp: i32, r_mant: u64, r_exp: i32)
+    {
+        let mut x = ExtendedFloat {mant: mant, exp: exp};
+        x.round_to_f32(round_nearest_tie_even);
+        assert_eq!(x, ExtendedFloat {mant: r_mant, exp: r_exp});
+
+        let mut x = ExtendedFloat {mant: (mant as u128) << 64, exp: exp-64};
+        x.round_to_f32(round_nearest_tie_even);
+        assert_eq!(x, ExtendedFloat {mant: r_mant as u128, exp: r_exp});
+    }
+
+    #[test]
+    fn round_to_f32_test() {
+        // This is lossy, so some of these values are **slightly** rounded.
+
+        // underflow
+        check_round_to_f32(9223372036854775808, -213, 0, -149);
+
+        // min value
+        check_round_to_f32(9223372036854775808, -212, 1, -149);
+
+        // 1.0e-40
+        check_round_to_f32(10043308644012916736, -196, 71362, -149);
+
+        // 1.0e-20
+        check_round_to_f32(13611294244890214400, -130, 12379400, -90);
+
+        // 1.0
+        check_round_to_f32(9223372036854775808, -63, 8388608, -23);
+
+        // 1e20
+        check_round_to_f32(12500000250510966784, 3, 11368684, 43);
+
+        // max value
+        check_round_to_f32(18446740775174668288, 64, 16777213, 104);
+
+        // overflow
+        check_round_to_f32(18446740775174668288, 65, 16777213, 105);
+    }
+
+    fn check_round_to_f64(mant: u64, exp: i32, r_mant: u64, r_exp: i32)
+    {
+        let mut x = ExtendedFloat {mant: mant, exp: exp};
+        x.round_to_f64(round_nearest_tie_even);
+        assert_eq!(x, ExtendedFloat {mant: r_mant, exp: r_exp});
+
+        let mut x = ExtendedFloat {mant: (mant as u128) << 64, exp: exp-64};
+        x.round_to_f64(round_nearest_tie_even);
+        assert_eq!(x, ExtendedFloat {mant: r_mant as u128, exp: r_exp});
+    }
+
+    #[test]
+    fn round_to_f64_test() {
+        // This is lossy, so some of these values are **slightly** rounded.
+
+        // underflow
+        check_round_to_f64(9223372036854775808, -1138, 0, -1074);
+
+        // min value
+        check_round_to_f64(9223372036854775808, -1137, 1, -1074);
+
+        // 1.0e-250
+        check_round_to_f64(15095849699286165504, -562, 7371020360979573, -551);
+
+        // 1.0e-150
+        check_round_to_f64(15095849699286165504, -562, 7371020360979573, -551);
+
+        // 1.0e-45
+        check_round_to_f64(13164036458569648128, -213, 6427752177035961, -202);
+
+        // 1.0e-40
+        check_round_to_f64(10043362776618688512, -196, 4903985730770844, -185);
+
+        // 1.0e-20
+        check_round_to_f64(13611294676837537792, -130, 6646139978924579, -119);
+
+        // 1.0
+        check_round_to_f64(9223372036854775808, -63, 4503599627370496, -52);
+
+        // 1e20
+        check_round_to_f64(12500000000000000000, 3, 6103515625000000, 14);
+
+        // 1e40
+        check_round_to_f64(16940658945086007296, 69, 8271806125530277, 80);
+
+        // 1e150
+        check_round_to_f64(11270725851789228032, 435, 5503284107318959, 446);
+
+        // 1e250
+        check_round_to_f64(12882297539194265600, 767, 6290184345309700, 778);
+
+        // max value
+        check_round_to_f64(18446744073709549568, 960, 9007199254740991, 971);
+
+        // Bug fixes
+        // 1.2345e-308
+        check_round_to_f64(10234494226754558294, -1086, 2498655817078750, -1074)
+    }
+
+    // FROM
+
+    #[test]
+    fn from_int_test() {
+        // 0
+        assert_eq!(ExtendedFloat80::from_u8(0), (0, 0).into());
+        assert_eq!(ExtendedFloat80::from_u16(0), (0, 0).into());
+        assert_eq!(ExtendedFloat80::from_u32(0), (0, 0).into());
+        assert_eq!(ExtendedFloat80::from_u64(0), (0, 0).into());
+        assert_eq!(ExtendedFloat160::from_u128(0), (0, 0).into());
+
+        // 1
+        assert_eq!(ExtendedFloat80::from_u8(1), (1, 0).into());
+        assert_eq!(ExtendedFloat80::from_u16(1), (1, 0).into());
+        assert_eq!(ExtendedFloat80::from_u32(1), (1, 0).into());
+        assert_eq!(ExtendedFloat80::from_u64(1), (1, 0).into());
+        assert_eq!(ExtendedFloat160::from_u128(1), (1, 0).into());
+
+        // (2^8-1) 255
+        assert_eq!(ExtendedFloat80::from_u8(255), (255, 0).into());
+        assert_eq!(ExtendedFloat80::from_u16(255), (255, 0).into());
+        assert_eq!(ExtendedFloat80::from_u32(255), (255, 0).into());
+        assert_eq!(ExtendedFloat80::from_u64(255), (255, 0).into());
+        assert_eq!(ExtendedFloat160::from_u128(255), (255, 0).into());
+
+        // (2^16-1) 65535
+        assert_eq!(ExtendedFloat80::from_u16(65535), (65535, 0).into());
+        assert_eq!(ExtendedFloat80::from_u32(65535), (65535, 0).into());
+        assert_eq!(ExtendedFloat80::from_u64(65535), (65535, 0).into());
+        assert_eq!(ExtendedFloat160::from_u128(65535), (65535, 0).into());
+
+        // (2^32-1) 4294967295
+        assert_eq!(ExtendedFloat80::from_u32(4294967295), (4294967295, 0).into());
+        assert_eq!(ExtendedFloat80::from_u64(4294967295), (4294967295, 0).into());
+        assert_eq!(ExtendedFloat160::from_u128(4294967295), (4294967295, 0).into());
+
+        // (2^64-1) 18446744073709551615
+        assert_eq!(ExtendedFloat80::from_u64(18446744073709551615), (18446744073709551615, 0).into());
+        assert_eq!(ExtendedFloat160::from_u128(18446744073709551615), (18446744073709551615, 0).into());
+
+        // (2^128-1) 340282366920938463463374607431768211455
+        assert_eq!(ExtendedFloat160::from_u128(340282366920938463463374607431768211455), (340282366920938463463374607431768211455, 0).into());
+    }
+
+    #[test]
+    fn from_f32_test() {
+        assert_eq!(ExtendedFloat80::from_f32(0.), (0, -149).into());
+        assert_eq!(ExtendedFloat80::from_f32(-0.), (0, -149).into());
+
+        assert_eq!(ExtendedFloat80::from_f32(1e-45), (1, -149).into());
+        assert_eq!(ExtendedFloat80::from_f32(1e-40), (71362, -149).into());
+        assert_eq!(ExtendedFloat80::from_f32(2e-40), (142725, -149).into());
+        assert_eq!(ExtendedFloat80::from_f32(1e-20), (12379400, -90).into());
+        assert_eq!(ExtendedFloat80::from_f32(2e-20), (12379400, -89).into());
+        assert_eq!(ExtendedFloat80::from_f32(1.0), (8388608, -23).into());
+        assert_eq!(ExtendedFloat80::from_f32(2.0), (8388608, -22).into());
+        assert_eq!(ExtendedFloat80::from_f32(1e20), (11368684, 43).into());
+        assert_eq!(ExtendedFloat80::from_f32(2e20), (11368684, 44).into());
+        assert_eq!(ExtendedFloat80::from_f32(3.402823e38), (16777213, 104).into());
+    }
+
+    #[test]
+    fn from_f64_test() {
+        assert_eq!(ExtendedFloat80::from_f64(0.), (0, -1074).into());
+        assert_eq!(ExtendedFloat80::from_f64(-0.), (0, -1074).into());
+        assert_eq!(ExtendedFloat80::from_f64(5e-324), (1, -1074).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e-250), (6448907850777164, -883).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e-150), (7371020360979573, -551).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e-45), (6427752177035961, -202).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e-40), (4903985730770844, -185).into());
+        assert_eq!(ExtendedFloat80::from_f64(2e-40), (4903985730770844, -184).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e-20), (6646139978924579, -119).into());
+        assert_eq!(ExtendedFloat80::from_f64(2e-20), (6646139978924579, -118).into());
+        assert_eq!(ExtendedFloat80::from_f64(1.0), (4503599627370496, -52).into());
+        assert_eq!(ExtendedFloat80::from_f64(2.0), (4503599627370496, -51).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e20), (6103515625000000, 14).into());
+        assert_eq!(ExtendedFloat80::from_f64(2e20), (6103515625000000, 15).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e40), (8271806125530277, 80).into());
+        assert_eq!(ExtendedFloat80::from_f64(2e40), (8271806125530277, 81).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e150), (5503284107318959, 446).into());
+        assert_eq!(ExtendedFloat80::from_f64(1e250), (6290184345309700, 778).into());
+        assert_eq!(ExtendedFloat80::from_f64(1.7976931348623157e308), (9007199254740991, 971).into());
+    }
+
+    fn assert_normalized_eq<M: Mantissa>(mut x: ExtendedFloat<M>, mut y: ExtendedFloat<M>) {
+        x.normalize();
+        y.normalize();
+        assert_eq!(x, y);
+    }
+
+    #[test]
+    fn from_float() {
+        let values: [f32; 26] = [
+            1e-40,
+            2e-40,
+            1e-35,
+            2e-35,
+            1e-30,
+            2e-30,
+            1e-25,
+            2e-25,
+            1e-20,
+            2e-20,
+            1e-15,
+            2e-15,
+            1e-10,
+            2e-10,
+            1e-5,
+            2e-5,
+            1.0,
+            2.0,
+            1e5,
+            2e5,
+            1e10,
+            2e10,
+            1e15,
+            2e15,
+            1e20,
+            2e20,
+        ];
+        for value in values.iter() {
+            assert_normalized_eq(ExtendedFloat80::from_f32(*value), ExtendedFloat80::from_f64(*value as f64));
+            assert_normalized_eq(ExtendedFloat160::from_f32(*value), ExtendedFloat160::from_f64(*value as f64));
+        }
+    }
+
+    // TO
+
+    // Sample of interesting numbers to check during standard test builds.
+    const INTEGERS: [u64; 32] = [
+        0,                      // 0x0
+        1,                      // 0x1
+        7,                      // 0x7
+        15,                     // 0xF
+        112,                    // 0x70
+        119,                    // 0x77
+        127,                    // 0x7F
+        240,                    // 0xF0
+        247,                    // 0xF7
+        255,                    // 0xFF
+        2032,                   // 0x7F0
+        2039,                   // 0x7F7
+        2047,                   // 0x7FF
+        4080,                   // 0xFF0
+        4087,                   // 0xFF7
+        4095,                   // 0xFFF
+        65520,                  // 0xFFF0
+        65527,                  // 0xFFF7
+        65535,                  // 0xFFFF
+        1048560,                // 0xFFFF0
+        1048567,                // 0xFFFF7
+        1048575,                // 0xFFFFF
+        16777200,               // 0xFFFFF0
+        16777207,               // 0xFFFFF7
+        16777215,               // 0xFFFFFF
+        268435440,              // 0xFFFFFF0
+        268435447,              // 0xFFFFFF7
+        268435455,              // 0xFFFFFFF
+        4294967280,             // 0xFFFFFFF0
+        4294967287,             // 0xFFFFFFF7
+        4294967295,             // 0xFFFFFFFF
+        18446744073709551615,   // 0xFFFFFFFFFFFFFFFF
+    ];
+
+    #[test]
+    fn to_f32_test() {
+        // underflow
+        let x = ExtendedFloat80 {mant: 9223372036854775808, exp: -213};
+        assert_eq!(x.into_f32(), 0.0);
+
+        // min value
+        let x = ExtendedFloat80 {mant: 9223372036854775808, exp: -212};
+        assert_eq!(x.into_f32(), 1e-45);
+
+        // 1.0e-40
+        let x = ExtendedFloat80 {mant: 10043308644012916736, exp: -196};
+        assert_eq!(x.into_f32(), 1e-40);
+
+        // 1.0e-20
+        let x = ExtendedFloat80 {mant: 13611294244890214400, exp: -130};
+        assert_eq!(x.into_f32(), 1e-20);
+
+        // 1.0
+        let x = ExtendedFloat80 {mant: 9223372036854775808, exp: -63};
+        assert_eq!(x.into_f32(), 1.0);
+
+        // 1e20
+        let x = ExtendedFloat80 {mant: 12500000250510966784, exp: 3};
+        assert_eq!(x.into_f32(), 1e20);
+
+        // max value
+        let x = ExtendedFloat80 {mant: 18446740775174668288, exp: 64};
+        assert_eq!(x.into_f32(), 3.402823e38);
+
+        // almost max, high exp
+        let x = ExtendedFloat80 {mant: 1048575, exp: 108};
+        assert_eq!(x.into_f32(), 3.4028204e38);
+
+        // max value + 1
+        let x = ExtendedFloat80 {mant: 16777216, exp: 104};
+        assert_eq!(x.into_f32(), f32::INFINITY);
+
+        // max value + 1
+        let x = ExtendedFloat80 {mant: 1048576, exp: 108};
+        assert_eq!(x.into_f32(), f32::INFINITY);
+
+        // 1e40
+        let x = ExtendedFloat80 {mant: 16940658945086007296, exp: 69};
+        assert_eq!(x.into_f32(), f32::INFINITY);
+
+        // Integers.
+        for int in INTEGERS.iter() {
+            let fp = ExtendedFloat80 {mant: *int, exp: 0};
+            assert_eq!(fp.into_f32(), *int as f32, "{:?} as f32", *int);
+        }
+    }
+
+    #[test]
+    fn to_f64_test() {
+        // underflow
+        let x = ExtendedFloat80 {mant: 9223372036854775808, exp: -1138};
+        assert_relative_eq!(x.into_f64(), 0.0);
+
+        // min value
+        let x = ExtendedFloat80 {mant: 9223372036854775808, exp: -1137};
+        assert_relative_eq!(x.into_f64(), 5e-324);
+
+        // 1.0e-250
+        let x = ExtendedFloat80 {mant: 13207363278391631872, exp: -894};
+        assert_relative_eq!(x.into_f64(), 1e-250);
+
+        // 1.0e-150
+        let x = ExtendedFloat80 {mant: 15095849699286165504, exp: -562};
+        assert_relative_eq!(x.into_f64(), 1e-150);
+
+        // 1.0e-45
+        let x = ExtendedFloat80 {mant: 13164036458569648128, exp: -213};
+        assert_relative_eq!(x.into_f64(), 1e-45);
+
+        // 1.0e-40
+        let x = ExtendedFloat80 {mant: 10043362776618688512, exp: -196};
+        assert_relative_eq!(x.into_f64(), 1e-40);
+
+        // 1.0e-20
+        let x = ExtendedFloat80 {mant: 13611294676837537792, exp: -130};
+        assert_relative_eq!(x.into_f64(), 1e-20);
+
+        // 1.0
+        let x = ExtendedFloat80 {mant: 9223372036854775808, exp: -63};
+        assert_relative_eq!(x.into_f64(), 1.0);
+
+        // 1e20
+        let x = ExtendedFloat80 {mant: 12500000000000000000, exp: 3};
+        assert_relative_eq!(x.into_f64(), 1e20);
+
+        // 1e40
+        let x = ExtendedFloat80 {mant: 16940658945086007296, exp: 69};
+        assert_relative_eq!(x.into_f64(), 1e40);
+
+        // 1e150
+        let x = ExtendedFloat80 {mant: 11270725851789228032, exp: 435};
+        assert_relative_eq!(x.into_f64(), 1e150);
+
+        // 1e250
+        let x = ExtendedFloat80 {mant: 12882297539194265600, exp: 767};
+        assert_relative_eq!(x.into_f64(), 1e250);
+
+        // max value
+        let x = ExtendedFloat80 {mant: 9007199254740991, exp: 971};
+        assert_relative_eq!(x.into_f64(), 1.7976931348623157e308);
+
+        // max value
+        let x = ExtendedFloat80 {mant: 18446744073709549568, exp: 960};
+        assert_relative_eq!(x.into_f64(), 1.7976931348623157e308);
+
+        // overflow
+        let x = ExtendedFloat80 {mant: 9007199254740992, exp: 971};
+        assert_relative_eq!(x.into_f64(), f64::INFINITY);
+
+        // overflow
+        let x = ExtendedFloat80 {mant: 18446744073709549568, exp: 961};
+        assert_relative_eq!(x.into_f64(), f64::INFINITY);
+
+        // Underflow
+        // Adapted from failures in strtod.
+        let x = ExtendedFloat80 { exp: -1139, mant: 18446744073709550712 };
+        assert_relative_eq!(x.into_f64(), 0.0);
+
+        let x = ExtendedFloat80 { exp: -1139, mant: 18446744073709551460 };
+        assert_relative_eq!(x.into_f64(), 0.0);
+
+        let x = ExtendedFloat80 { exp: -1138, mant: 9223372036854776103 };
+        assert_relative_eq!(x.into_f64(), 5e-324);
+
+        // Integers.
+        for int in INTEGERS.iter() {
+            let fp = ExtendedFloat80 {mant: *int, exp: 0};
+            assert_eq!(fp.into_f64(), *int as f64, "{:?} as f64", *int);
+        }
+    }
+
+    #[test]
+    fn to_rounded_f32_test() {
+        // Just check it compiles, we already check the underlying algorithms.
+        let x = ExtendedFloat80 {mant: 9223372036854775808, exp: -63};
+        assert_eq!(x.as_rounded_f32(RoundingKind::NearestTieEven, Sign::Positive), 1.0);
+        assert_eq!(x.as_rounded_f32(RoundingKind::NearestTieAwayZero, Sign::Positive), 1.0);
+        assert_eq!(x.as_rounded_f32(RoundingKind::TowardPositiveInfinity, Sign::Positive), 1.0);
+        assert_eq!(x.as_rounded_f32(RoundingKind::TowardNegativeInfinity, Sign::Positive), 1.0);
+        assert_eq!(x.as_rounded_f32(RoundingKind::TowardZero, Sign::Positive), 1.0);
+    }
+
+    #[test]
+    fn to_rounded_f64_test() {
+        // Just check it compiles, we already check the underlying algorithms.
+        let x = ExtendedFloat80 {mant: 9223372036854775808, exp: -63};
+        assert_eq!(x.as_rounded_f64(RoundingKind::NearestTieEven, Sign::Positive), 1.0);
+        assert_eq!(x.as_rounded_f64(RoundingKind::NearestTieAwayZero, Sign::Positive), 1.0);
+        assert_eq!(x.as_rounded_f64(RoundingKind::TowardPositiveInfinity, Sign::Positive), 1.0);
+        assert_eq!(x.as_rounded_f64(RoundingKind::TowardNegativeInfinity, Sign::Positive), 1.0);
+        assert_eq!(x.as_rounded_f64(RoundingKind::TowardZero, Sign::Positive), 1.0);
+    }
+
+    #[test]
+    #[ignore]
+    fn to_f32_full_test() {
+        // Use exhaustive search to ensure both lossy and unlossy items are checked.
+        // 23-bits of precision, so go from 0-32.
+        for int in 0..u32::max_value() {
+            let fp = ExtendedFloat80 {mant: int as u64, exp: 0};
+            assert_eq!(fp.into_f32(), int as f32, "ExtendedFloat80 {:?} as f32", int);
+
+            let fp = ExtendedFloat160 {mant: int as u128, exp: 0};
+            assert_eq!(fp.into_f32(), int as f32, "ExtendedFloat160 {:?} as f64", int);
+        }
+    }
+
+    #[test]
+    #[ignore]
+    fn to_f64_full_test() {
+        // Use exhaustive search to ensure both lossy and unlossy items are checked.
+        const U32_MAX: u64 = u32::max_value() as u64;
+        const POW2_52: u64 = 4503599627370496;
+        const START: u64 = POW2_52 - U32_MAX / 2;
+        const END: u64 = START + U32_MAX;
+        for int in START..END {
+            let fp = ExtendedFloat80 {mant: int, exp: 0};
+            assert_eq!(fp.into_f64(), int as f64, "ExtendedFloat80 {:?} as f64", int);
+
+            let fp = ExtendedFloat160 {mant: int as u128, exp: 0};
+            assert_eq!(fp.into_f64(), int as f64, "ExtendedFloat160 {:?} as f64", int);
+        }
+    }
+
+    // OPERATIONS
+
+    fn check_mul<M: Mantissa>(a: ExtendedFloat<M>, b: ExtendedFloat<M>, c: ExtendedFloat<M>) {
+        let r = a.mul(&b);
+        assert_eq!(r, c);
+    }
+
+    #[test]
+    fn mul_test() {
+        // Normalized (64-bit mantissa)
+        let a = ExtendedFloat80 {mant: 13164036458569648128, exp: -213};
+        let b = ExtendedFloat80 {mant: 9223372036854775808, exp: -62};
+        let c = ExtendedFloat80 {mant: 6582018229284824064, exp: -211};
+        check_mul(a, b, c);
+
+        // Normalized (128-bit mantissa)
+        let a = ExtendedFloat160 {mant: 242833611528216130005140556221773774848, exp: -277};
+        let b = ExtendedFloat160 {mant: 170141183460469231731687303715884105728, exp: -126};
+        let c = ExtendedFloat160 {mant: 121416805764108065002570278110886887424, exp: -275};
+        check_mul(a, b, c);
+
+        // Check with integers
+        // 64-bit mantissa
+        let mut a = ExtendedFloat80::from_u8(10);
+        let mut b = ExtendedFloat80::from_u8(10);
+        a.normalize();
+        b.normalize();
+        assert_eq!(a.mul(&b).into_f64(), 100.0);
+
+        // 128-bit mantissa
+        let mut a = ExtendedFloat160::from_u8(10);
+        let mut b = ExtendedFloat160::from_u8(10);
+        a.normalize();
+        b.normalize();
+        assert_eq!(a.mul(&b).into_f64(), 100.0);
+
+        // Check both values need high bits set.
+        let a = ExtendedFloat80 { mant: 1 << 32, exp: -31 };
+        let b = ExtendedFloat80 { mant: 1 << 32, exp: -31 };
+        assert_eq!(a.mul(&b).into_f64(), 4.0);
+
+        // Check both values need high bits set.
+        let a = ExtendedFloat80 { mant: 10 << 31, exp: -31 };
+        let b = ExtendedFloat80 { mant: 10 << 31, exp: -31 };
+        assert_eq!(a.mul(&b).into_f64(), 100.0);
+    }
+
+    fn check_imul<M: Mantissa>(mut a: ExtendedFloat<M>, b: ExtendedFloat<M>, c: ExtendedFloat<M>) {
+        a.imul(&b);
+        assert_eq!(a, c);
+    }
+
+    #[test]
+    fn imul_test() {
+        // Normalized (64-bit mantissa)
+        let a = ExtendedFloat80 {mant: 13164036458569648128, exp: -213};
+        let b = ExtendedFloat80 {mant: 9223372036854775808, exp: -62};
+        let c = ExtendedFloat80 {mant: 6582018229284824064, exp: -211};
+        check_imul(a, b, c);
+
+        // Normalized (128-bit mantissa)
+        let a = ExtendedFloat160 {mant: 242833611528216130005140556221773774848, exp: -277};
+        let b = ExtendedFloat160 {mant: 170141183460469231731687303715884105728, exp: -126};
+        let c = ExtendedFloat160 {mant: 121416805764108065002570278110886887424, exp: -275};
+        check_imul(a, b, c);
+
+        // Check with integers
+        // 64-bit mantissa
+        let mut a = ExtendedFloat80::from_u8(10);
+        let mut b = ExtendedFloat80::from_u8(10);
+        a.normalize();
+        b.normalize();
+        a.imul(&b);
+        assert_eq!(a.into_f64(), 100.0);
+
+        // 128-bit mantissa
+        let mut a = ExtendedFloat160::from_u8(10);
+        let mut b = ExtendedFloat160::from_u8(10);
+        a.normalize();
+        b.normalize();
+        a.imul(&b);
+        assert_eq!(a.into_f64(), 100.0);
+
+        // Check both values need high bits set.
+        let mut a = ExtendedFloat80 { mant: 1 << 32, exp: -31 };
+        let b = ExtendedFloat80 { mant: 1 << 32, exp: -31 };
+        a.imul(&b);
+        assert_eq!(a.into_f64(), 4.0);
+
+        // Check both values need high bits set.
+        let mut a = ExtendedFloat80 { mant: 10 << 31, exp: -31 };
+        let b = ExtendedFloat80 { mant: 10 << 31, exp: -31 };
+        a.imul(&b);
+        assert_eq!(a.into_f64(), 100.0);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/mantissa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/mantissa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/mantissa.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/mantissa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+//! Type trait for the mantissa of an extended float.
+
+use crate::util::*;
+
+/// Type trait for the mantissa type.
+pub trait Mantissa: UnsignedInteger {
+    /// Mask for the left-most bit, to check if the value is normalized.
+    const NORMALIZED_MASK: Self;
+    /// Mask to extract the high bits from the integer.
+    const HIMASK: Self;
+    /// Mask to extract the low bits from the integer.
+    const LOMASK: Self;
+    /// Full size of the integer, in bits.
+    const FULL: i32 = Self::BITS as i32;
+    /// Half size of the integer, in bits.
+    const HALF: i32 = Self::FULL / 2;
+}
+
+impl Mantissa for u8 {
+    const NORMALIZED_MASK: u8  = 0x80;
+    const HIMASK: u8           = 0xF0;
+    const LOMASK: u8           = 0x0F;
+}
+
+impl Mantissa for u16 {
+    const NORMALIZED_MASK: u16  = 0x8000;
+    const HIMASK: u16           = 0xFF00;
+    const LOMASK: u16           = 0x00FF;
+}
+
+impl Mantissa for u32 {
+    const NORMALIZED_MASK: u32  = 0x80000000;
+    const HIMASK: u32           = 0xFFFF0000;
+    const LOMASK: u32           = 0x0000FFFF;
+}
+
+impl Mantissa for u64 {
+    const NORMALIZED_MASK: u64  = 0x8000000000000000;
+    const HIMASK: u64           = 0xFFFFFFFF00000000;
+    const LOMASK: u64           = 0x00000000FFFFFFFF;
+}
+
+impl Mantissa for u128 {
+    const NORMALIZED_MASK: u128 = 0x80000000000000000000000000000000;
+    const HIMASK: u128          = 0xFFFFFFFFFFFFFFFF0000000000000000;
+    const LOMASK: u128          = 0x0000000000000000FFFFFFFFFFFFFFFF;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+//! Extended-precision floating-point type.
+
+// Hide implementation details.
+pub(crate) mod convert;
+pub(crate) mod float;
+pub(crate) mod mantissa;
+pub(crate) mod rounding;
+pub(crate) mod shift;
+
+// Re-export the extended-precision floating-point type.
+pub use self::float::{ExtendedFloat, ExtendedFloat80, ExtendedFloat160};
+pub use self::mantissa::Mantissa;
+pub use self::rounding::{FloatRounding};
+
+#[cfg(feature = "correct")]
+pub(crate) use self::rounding::global_rounding;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/rounding.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/rounding.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/rounding.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/rounding.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,602 @@
+//! Defines rounding schemes for floating-point numbers.
+
+use crate::util::*;
+use super::float::ExtendedFloat;
+use super::mantissa::Mantissa;
+use super::shift::*;
+
+// GENERIC
+// -------
+
+// NEAREST ROUNDING
+
+// Shift right N-bytes and round to the nearest.
+//
+// Return if we are above halfway and if we are halfway.
+perftools_inline!{
+pub(crate) fn round_nearest<M>(fp: &mut ExtendedFloat<M>, shift: i32)
+    -> (bool, bool)
+    where M: Mantissa
+{
+    // Extract the truncated bits using mask.
+    // Calculate if the value of the truncated bits are either above
+    // the mid-way point, or equal to it.
+    //
+    // For example, for 4 truncated bytes, the mask would be b1111
+    // and the midway point would be b1000.
+    let mask: M = lower_n_mask(as_cast(shift));
+    let halfway: M = lower_n_halfway(as_cast(shift));
+
+    let truncated_bits = fp.mant & mask;
+    let is_above = truncated_bits > halfway;
+    let is_halfway = truncated_bits == halfway;
+
+    // Bit shift so the leading bit is in the hidden bit.
+    overflowing_shr(fp, shift);
+
+    (is_above, is_halfway)
+}}
+
+// Tie rounded floating point to event.
+perftools_inline!{
+pub(crate) fn tie_even<M>(fp: &mut ExtendedFloat<M>, is_above: bool, is_halfway: bool)
+    where M: Mantissa
+{
+    // Extract the last bit after shifting (and determine if it is odd).
+    let is_odd = fp.mant & M::ONE == M::ONE;
+
+    // Calculate if we need to roundup.
+    // We need to roundup if we are above halfway, or if we are odd
+    // and at half-way (need to tie-to-even).
+    if is_above || (is_odd && is_halfway) {
+        fp.mant += M::ONE;
+    }
+}}
+
+// Shift right N-bytes and round nearest, tie-to-even.
+//
+// Floating-point arithmetic uses round to nearest, ties to even,
+// which rounds to the nearest value, if the value is halfway in between,
+// round to an even value.
+perftools_inline!{
+pub(crate) fn round_nearest_tie_even<M>(fp: &mut ExtendedFloat<M>, shift: i32)
+    where M: Mantissa
+{
+    let (is_above, is_halfway) = round_nearest(fp, shift);
+    tie_even(fp, is_above, is_halfway);
+}}
+
+// Tie rounded floating point away from zero.
+perftools_inline!{
+pub(crate) fn tie_away_zero<M>(fp: &mut ExtendedFloat<M>, is_above: bool, is_halfway: bool)
+    where M: Mantissa
+{
+    // Calculate if we need to roundup.
+    // We need to roundup if we are halfway or above halfway,
+    // since the value is always positive and we need to round away
+    // from zero.
+    if is_above || is_halfway {
+        fp.mant += M::ONE;
+    }
+}}
+
+// Shift right N-bytes and round nearest, tie-away-zero.
+//
+// Floating-point arithmetic defines round to nearest, ties away from zero,
+// which rounds to the nearest value, if the value is halfway in between,
+// ties away from zero.
+perftools_inline!{
+pub(crate) fn round_nearest_tie_away_zero<M>(fp: &mut ExtendedFloat<M>, shift: i32)
+    where M: Mantissa
+{
+    let (is_above, is_halfway) = round_nearest(fp, shift);
+    tie_away_zero(fp, is_above, is_halfway);
+}}
+
+// DIRECTED ROUNDING
+
+// Shift right N-bytes and round towards a direction.
+//
+// Return if we have any truncated bytes.
+perftools_inline!{
+pub(crate) fn round_toward<M>(fp: &mut ExtendedFloat<M>, shift: i32)
+    -> bool
+    where M: Mantissa
+{
+    let mask: M = lower_n_mask(as_cast(shift));
+    let truncated_bits = fp.mant & mask;
+
+    // Bit shift so the leading bit is in the hidden bit.
+    overflowing_shr(fp, shift);
+
+    truncated_bits != M::ZERO
+}}
+
+// Round up.
+perftools_inline!{
+pub(crate) fn upward<M>(fp: &mut ExtendedFloat<M>, is_truncated: bool)
+    where M: Mantissa
+{
+    if is_truncated {
+        fp.mant += M::ONE;
+    }
+}}
+
+// Shift right N-bytes and round toward infinity.
+//
+// Floating-point arithmetic defines round toward infinity, which rounds
+// towards positive infinity.
+perftools_inline!{
+pub(crate) fn round_upward<M>(fp: &mut ExtendedFloat<M>, shift: i32)
+    where M: Mantissa
+{
+    // If the truncated bits are non-zero, that is, any rounding error occurred,
+    // round-up.
+    let is_truncated = round_toward(fp, shift);
+    upward(fp, is_truncated);
+}}
+
+// Round down.
+perftools_inline!{
+pub(crate) fn downard<M>(_: &mut ExtendedFloat<M>, _: bool)
+    where M: Mantissa
+{}}
+
+// Shift right N-bytes and round toward zero.
+//
+// Floating-point arithmetic defines round toward zero, which rounds
+// towards positive zero.
+perftools_inline!{
+pub(crate) fn round_downward<M>(fp: &mut ExtendedFloat<M>, shift: i32)
+    where M: Mantissa
+{
+    // Bit shift so the leading bit is in the hidden bit.
+    // No rounding schemes, so we just ignore everything else.
+    let is_truncated = round_toward(fp, shift);
+    downard(fp, is_truncated);
+}}
+
+// NATIVE FLOAT
+// ------------
+
+// FLOAT ROUNDING
+
+/// Trait to round extended-precision floats to native representations.
+pub trait FloatRounding<M: Mantissa>: Float {
+    /// Default number of bits to shift (or 64 - mantissa size - 1).
+    const DEFAULT_SHIFT: i32;
+    /// Mask to determine if a full-carry occurred (1 in bit above hidden bit).
+    const CARRY_MASK: M;
+}
+
+// Literals don't work for generic types, we need to use this as a hack.
+macro_rules! float_rounding_f32 {
+    ($($t:tt)*) => ($(
+        impl FloatRounding<$t> for f32 {
+            const DEFAULT_SHIFT: i32    = $t::FULL - f32::MANTISSA_SIZE - 1;
+            const CARRY_MASK: $t        = 0x1000000;
+        }
+    )*)
+}
+
+float_rounding_f32! { u64 u128 }
+
+// Literals don't work for generic types, we need to use this as a hack.
+macro_rules! float_rounding_f64 {
+    ($($t:tt)*) => ($(
+        impl FloatRounding<$t> for f64 {
+            const DEFAULT_SHIFT: i32    = $t::FULL - f64::MANTISSA_SIZE - 1;
+            const CARRY_MASK: $t        = 0x20000000000000;
+        }
+    )*)
+}
+
+float_rounding_f64! { u64 u128 }
+
+// ROUND TO FLOAT
+
+// Shift the ExtendedFloat fraction to the fraction bits in a native float.
+//
+// Floating-point arithmetic uses round to nearest, ties to even,
+// which rounds to the nearest value, if the value is halfway in between,
+// round to an even value.
+perftools_inline!{
+pub(crate) fn round_to_float<T, M, Cb>(fp: &mut ExtendedFloat<M>, cb: Cb)
+    where T: FloatRounding<M>,
+          M: Mantissa,
+          Cb: FnOnce(&mut ExtendedFloat<M>, i32)
+{
+    // Calculate the difference to allow a single calculation
+    // rather than a loop, to minimize the number of ops required.
+    // This does underflow detection.
+    let final_exp = fp.exp + T::DEFAULT_SHIFT;
+    if final_exp < T::DENORMAL_EXPONENT {
+        // We would end up with a denormal exponent, try to round to more
+        // digits. Only shift right if we can avoid zeroing out the value,
+        // which requires the exponent diff to be < M::BITS. The value
+        // is already normalized, so we shouldn't have any issue zeroing
+        // out the value.
+        let diff = T::DENORMAL_EXPONENT - fp.exp;
+        if diff <= M::FULL {
+            // We can avoid underflow, can get a valid representation.
+            cb(fp, diff);
+        } else {
+            // Certain underflow, assign literal 0s.
+            fp.mant = M::ZERO;
+            fp.exp = 0;
+        }
+    } else {
+        cb(fp, T::DEFAULT_SHIFT);
+    }
+
+    if fp.mant & T::CARRY_MASK == T::CARRY_MASK {
+        // Roundup carried over to 1 past the hidden bit.
+        shr(fp, 1);
+    }
+}}
+
+// AVOID OVERFLOW/UNDERFLOW
+
+// Avoid overflow for large values, shift left as needed.
+//
+// Shift until a 1-bit is in the hidden bit, if the mantissa is not 0.
+perftools_inline!{
+pub(crate) fn avoid_overflow<T, M>(fp: &mut ExtendedFloat<M>)
+    where T: FloatRounding<M>,
+          M: Mantissa
+{
+    // Calculate the difference to allow a single calculation
+    // rather than a loop, minimizing the number of ops required.
+    if fp.exp >= T::MAX_EXPONENT {
+        let diff = fp.exp - T::MAX_EXPONENT;
+        if diff <= T::MANTISSA_SIZE {
+            // Our overflow mask needs to start at the hidden bit, or at
+            // `T::MANTISSA_SIZE+1`, and needs to have `diff+1` bits set,
+            // to see if our value overflows.
+            let bit = as_cast(T::MANTISSA_SIZE+1);
+            let n = as_cast(diff+1);
+            let mask: M = internal_n_mask(bit, n);
+            if (fp.mant & mask).is_zero() {
+                // If we have no 1-bit in the hidden-bit position,
+                // which is index 0, we need to shift 1.
+                let shift = diff + 1;
+                shl(fp, shift);
+            }
+        }
+    }
+}}
+
+// ROUND TO NATIVE
+
+// Round an extended-precision float to a native float representation.
+perftools_inline!{
+pub(crate) fn round_to_native<T, M, Cb>(fp: &mut ExtendedFloat<M>, cb: Cb)
+    where T: FloatRounding<M>,
+          M: Mantissa,
+          Cb: FnOnce(&mut ExtendedFloat<M>, i32)
+{
+    // Shift all the way left, to ensure a consistent representation.
+    // The following right-shifts do not work for a non-normalized number.
+    fp.normalize();
+
+    // Round so the fraction is in a native mantissa representation,
+    // and avoid overflow/underflow.
+    round_to_float::<T, M, _>(fp, cb);
+    avoid_overflow::<T, M>(fp);
+}}
+
+// Get the rounding scheme to determine if we should go up or down.
+perftools_inline!{
+#[allow(unused_variables)]
+pub(crate) fn internal_rounding(kind: RoundingKind, sign: Sign)
+    -> RoundingKind
+{
+    #[cfg(not(feature = "rounding"))] {
+        RoundingKind::NearestTieEven
+    }
+
+    #[cfg(feature = "rounding")] {
+        match sign {
+            Sign::Positive => {
+                match kind {
+                    RoundingKind::TowardPositiveInfinity => RoundingKind::Upward,
+                    RoundingKind::TowardNegativeInfinity => RoundingKind::Downward,
+                    RoundingKind::TowardZero             => RoundingKind::Downward,
+                    _                                    => kind,
+                }
+            },
+            Sign::Negative => {
+                match kind {
+                    RoundingKind::TowardPositiveInfinity => RoundingKind::Downward,
+                    RoundingKind::TowardNegativeInfinity => RoundingKind::Upward,
+                    RoundingKind::TowardZero             => RoundingKind::Downward,
+                    _                                    => kind,
+                }
+            },
+        }
+    }
+}}
+
+// Get the global, default rounding scheme.
+perftools_inline!{
+#[cfg(feature = "correct")]
+#[allow(unused_variables)]
+pub(crate) fn global_rounding(sign: Sign) -> RoundingKind {
+    #[cfg(not(feature = "rounding"))] {
+        RoundingKind::NearestTieEven
+    }
+
+    #[cfg(feature = "rounding")] {
+        internal_rounding(get_float_rounding(), sign)
+    }
+}}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use crate::float::ExtendedFloat80;
+    use super::*;
+
+    // NEAREST ROUNDING
+
+    #[test]
+    fn round_nearest_test() {
+        // Check exactly halfway (b'1100000')
+        let mut fp = ExtendedFloat80 { mant: 0x60, exp: 0 };
+        let (above, halfway) = round_nearest(&mut fp, 6);
+        assert!(!above);
+        assert!(halfway);
+        assert_eq!(fp.mant, 1);
+
+        // Check above halfway (b'1100001')
+        let mut fp = ExtendedFloat80 { mant: 0x61, exp: 0 };
+        let (above, halfway) = round_nearest(&mut fp, 6);
+        assert!(above);
+        assert!(!halfway);
+        assert_eq!(fp.mant, 1);
+
+        // Check below halfway (b'1011111')
+        let mut fp = ExtendedFloat80 { mant: 0x5F, exp: 0 };
+        let (above, halfway) = round_nearest(&mut fp, 6);
+        assert!(!above);
+        assert!(!halfway);
+        assert_eq!(fp.mant, 1);
+    }
+
+    #[test]
+    fn round_nearest_tie_even_test() {
+        // Check round-up, halfway
+        let mut fp = ExtendedFloat80 { mant: 0x60, exp: 0 };
+        round_nearest_tie_even(&mut fp, 6);
+        assert_eq!(fp.mant, 2);
+
+        // Check round-down, halfway
+        let mut fp = ExtendedFloat80 { mant: 0x20, exp: 0 };
+        round_nearest_tie_even(&mut fp, 6);
+        assert_eq!(fp.mant, 0);
+
+        // Check round-up, above halfway
+        let mut fp = ExtendedFloat80 { mant: 0x61, exp: 0 };
+        round_nearest_tie_even(&mut fp, 6);
+        assert_eq!(fp.mant, 2);
+
+        let mut fp = ExtendedFloat80 { mant: 0x21, exp: 0 };
+        round_nearest_tie_even(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+
+        // Check round-down, below halfway
+        let mut fp = ExtendedFloat80 { mant: 0x5F, exp: 0 };
+        round_nearest_tie_even(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+
+        let mut fp = ExtendedFloat80 { mant: 0x1F, exp: 0 };
+        round_nearest_tie_even(&mut fp, 6);
+        assert_eq!(fp.mant, 0);
+    }
+
+    #[test]
+    fn round_nearest_tie_away_zero_test() {
+        // Check round-up, halfway
+        let mut fp = ExtendedFloat80 { mant: 0x60, exp: 0 };
+        round_nearest_tie_away_zero(&mut fp, 6);
+        assert_eq!(fp.mant, 2);
+
+        let mut fp = ExtendedFloat80 { mant: 0x20, exp: 0 };
+        round_nearest_tie_away_zero(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+
+        // Check round-up, above halfway
+        let mut fp = ExtendedFloat80 { mant: 0x61, exp: 0 };
+        round_nearest_tie_away_zero(&mut fp, 6);
+        assert_eq!(fp.mant, 2);
+
+        let mut fp = ExtendedFloat80 { mant: 0x21, exp: 0 };
+        round_nearest_tie_away_zero(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+
+        // Check round-down, below halfway
+        let mut fp = ExtendedFloat80 { mant: 0x5F, exp: 0 };
+        round_nearest_tie_away_zero(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+
+        let mut fp = ExtendedFloat80 { mant: 0x1F, exp: 0 };
+        round_nearest_tie_away_zero(&mut fp, 6);
+        assert_eq!(fp.mant, 0);
+    }
+
+    // DIRECTED ROUNDING
+
+    #[test]
+    fn round_upward_test() {
+        // b0000000
+        let mut fp = ExtendedFloat80 { mant: 0x00, exp: 0 };
+        round_upward(&mut fp, 6);
+        assert_eq!(fp.mant, 0);
+
+        // b1000000
+        let mut fp = ExtendedFloat80 { mant: 0x40, exp: 0 };
+        round_upward(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+
+        // b1100000
+        let mut fp = ExtendedFloat80 { mant: 0x60, exp: 0 };
+        round_upward(&mut fp, 6);
+        assert_eq!(fp.mant, 2);
+
+        // b1110000
+        let mut fp = ExtendedFloat80 { mant: 0x70, exp: 0 };
+        round_upward(&mut fp, 6);
+        assert_eq!(fp.mant, 2);
+    }
+
+    #[test]
+    fn round_downward_test() {
+        // b0000000
+        let mut fp = ExtendedFloat80 { mant: 0x00, exp: 0 };
+        round_downward(&mut fp, 6);
+        assert_eq!(fp.mant, 0);
+
+        // b1000000
+        let mut fp = ExtendedFloat80 { mant: 0x40, exp: 0 };
+        round_downward(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+
+        // b1100000
+        let mut fp = ExtendedFloat80 { mant: 0x60, exp: 0 };
+        round_downward(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+
+        // b1110000
+        let mut fp = ExtendedFloat80 { mant: 0x70, exp: 0 };
+        round_downward(&mut fp, 6);
+        assert_eq!(fp.mant, 1);
+    }
+
+    // HIGH-LEVEL
+
+    #[test]
+    fn round_to_float_test() {
+        // Denormal
+        let mut fp = ExtendedFloat80 { mant: 1<<63, exp: f64::DENORMAL_EXPONENT - 15 };
+        round_to_float::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 1<<48);
+        assert_eq!(fp.exp, f64::DENORMAL_EXPONENT);
+
+        // Halfway, round-down (b'1000000000000000000000000000000000000000000000000000010000000000')
+        let mut fp = ExtendedFloat80 { mant: 0x8000000000000400, exp: -63 };
+        round_to_float::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 1<<52);
+        assert_eq!(fp.exp, -52);
+
+        // Halfway, round-up (b'1000000000000000000000000000000000000000000000000000110000000000')
+        let mut fp = ExtendedFloat80 { mant: 0x8000000000000C00, exp: -63 };
+        round_to_float::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, (1<<52) + 2);
+        assert_eq!(fp.exp, -52);
+
+        // Above halfway
+        let mut fp = ExtendedFloat80 { mant: 0x8000000000000401, exp: -63 };
+        round_to_float::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, (1<<52)+1);
+        assert_eq!(fp.exp, -52);
+
+        let mut fp = ExtendedFloat80 { mant: 0x8000000000000C01, exp: -63 };
+        round_to_float::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, (1<<52) + 2);
+        assert_eq!(fp.exp, -52);
+
+        // Below halfway
+        let mut fp = ExtendedFloat80 { mant: 0x80000000000003FF, exp: -63 };
+        round_to_float::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 1<<52);
+        assert_eq!(fp.exp, -52);
+
+        let mut fp = ExtendedFloat80 { mant: 0x8000000000000BFF, exp: -63 };
+        round_to_float::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, (1<<52) + 1);
+        assert_eq!(fp.exp, -52);
+    }
+
+    #[test]
+    fn avoid_overflow_test() {
+        // Avoid overflow, fails by 1
+        let mut fp = ExtendedFloat80 { mant: 0xFFFFFFFFFFFF, exp: f64::MAX_EXPONENT + 5 };
+        avoid_overflow::<f64, _>(&mut fp);
+        assert_eq!(fp.mant, 0xFFFFFFFFFFFF);
+        assert_eq!(fp.exp, f64::MAX_EXPONENT+5);
+
+        // Avoid overflow, succeeds
+        let mut fp = ExtendedFloat80 { mant: 0xFFFFFFFFFFFF, exp: f64::MAX_EXPONENT + 4 };
+        avoid_overflow::<f64, _>(&mut fp);
+        assert_eq!(fp.mant, 0x1FFFFFFFFFFFE0);
+        assert_eq!(fp.exp, f64::MAX_EXPONENT-1);
+    }
+
+    #[test]
+    fn round_to_native_test() {
+        // Overflow
+        let mut fp = ExtendedFloat80 { mant: 0xFFFFFFFFFFFF, exp: f64::MAX_EXPONENT + 4 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 0x1FFFFFFFFFFFE0);
+        assert_eq!(fp.exp, f64::MAX_EXPONENT-1);
+
+        // Need denormal
+        let mut fp = ExtendedFloat80 { mant: 1, exp: f64::DENORMAL_EXPONENT +48 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 1<<48);
+        assert_eq!(fp.exp, f64::DENORMAL_EXPONENT);
+
+        // Halfway, round-down (b'10000000000000000000000000000000000000000000000000000100000')
+        let mut fp = ExtendedFloat80 { mant: 0x400000000000020, exp: -58 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 1<<52);
+        assert_eq!(fp.exp, -52);
+
+        // Halfway, round-up (b'10000000000000000000000000000000000000000000000000001100000')
+        let mut fp = ExtendedFloat80 { mant: 0x400000000000060, exp: -58 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, (1<<52) + 2);
+        assert_eq!(fp.exp, -52);
+
+        // Above halfway
+        let mut fp = ExtendedFloat80 { mant: 0x400000000000021, exp: -58 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, (1<<52)+1);
+        assert_eq!(fp.exp, -52);
+
+        let mut fp = ExtendedFloat80 { mant: 0x400000000000061, exp: -58 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, (1<<52) + 2);
+        assert_eq!(fp.exp, -52);
+
+        // Below halfway
+        let mut fp = ExtendedFloat80 { mant: 0x40000000000001F, exp: -58 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 1<<52);
+        assert_eq!(fp.exp, -52);
+
+        let mut fp = ExtendedFloat80 { mant: 0x40000000000005F, exp: -58 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, (1<<52) + 1);
+        assert_eq!(fp.exp, -52);
+
+        // Underflow
+        // Adapted from failures in strtod.
+        let mut fp = ExtendedFloat80 { exp: -1139, mant: 18446744073709550712 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 0);
+        assert_eq!(fp.exp, 0);
+
+        let mut fp = ExtendedFloat80 { exp: -1139, mant: 18446744073709551460 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 0);
+        assert_eq!(fp.exp, 0);
+
+        let mut fp = ExtendedFloat80 { exp: -1138, mant: 9223372036854776103 };
+        round_to_native::<f64, _, _>(&mut fp, round_nearest_tie_even);
+        assert_eq!(fp.mant, 1);
+        assert_eq!(fp.exp, -1074);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/shift.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/shift.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/float/shift.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/float/shift.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+//! Macros for bit-wise shifts.
+
+use crate::lib::mem;
+use crate::util::*;
+use super::float::ExtendedFloat;
+use super::mantissa::Mantissa;
+
+// SHIFT RIGHT
+
+// Shift extended-precision float right `shift` bytes.
+perftools_inline!{
+pub(super) fn shr<M: Mantissa, T: Integer>(fp: &mut ExtendedFloat<M>, shift: T)
+{
+    let bits: T = as_cast(mem::size_of::<M>() * 8);
+    debug_assert!(shift < bits, "shr() overflow in shift right.");
+
+    fp.mant >>= as_cast::<M, _>(shift);
+    fp.exp += shift.as_i32();
+}}
+
+// Shift extended-precision float right `shift` bytes.
+//
+// Accepts when the shift is the same as the type size, and
+// sets the value to 0.
+perftools_inline!{
+pub(super) fn overflowing_shr<M: Mantissa, T: Integer>(fp: &mut ExtendedFloat<M>, shift: T)
+{
+    let bits: T = as_cast(mem::size_of::<M>() * 8);
+    debug_assert!(shift <= bits, "overflowing_shr() overflow in shift right.");
+
+    fp.mant = match shift == bits {
+        true  => M::ZERO,
+        false => fp.mant >> as_cast::<M, _>(shift),
+    };
+    fp.exp += shift.as_i32();
+}}
+
+// Shift extended-precision float left `shift` bytes.
+perftools_inline!{
+pub(super) fn shl<M: Mantissa, T: Integer>(fp: &mut ExtendedFloat<M>, shift: T)
+{
+    let bits: T = as_cast(mem::size_of::<M>() * 8);
+    debug_assert!(shift < bits, "shl() overflow in shift left.");
+
+    fp.mant <<= as_cast::<M, _>(shift);
+    fp.exp -= shift.as_i32();
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/api.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,476 @@
+//! Low-level API generator.
+//!
+//! Uses either the internal "Grisu2", or the external "Grisu3" or "Ryu"
+//! algorithms provided by `https://github.com/dtolnay`.
+
+//  The following benchmarks were run on an "Intel(R) Core(TM) i7-6560U
+//  CPU @ 2.20GHz" CPU, on Fedora 28, Linux kernel version 4.18.16-200
+//  (x86-64), using the lexical formatter or `x.parse()`,
+//  avoiding any inefficiencies in Rust string parsing. The code was
+//  compiled with LTO and at an optimization level of 3.
+//
+//  The benchmarks with `std` were compiled using "rustc 1.29.2 (17a9dc751
+//  2018-10-05", and the `no_std` benchmarks were compiled using "rustc
+//  1.31.0-nightly (46880f41b 2018-10-15)".
+//
+//  The benchmark code may be found `benches/atof.rs`.
+//
+//  # Benchmarks
+//
+//  | Type  |  lexical (ns/iter) | libcore (ns/iter)     | Relative Increase |
+//  |:-----:|:------------------:|:---------------------:|:-----------------:|
+//  | f32   | 465,584            | 1,884,646             | 4.04x             |
+//  | f64   | 539,904            | 2,276,839             | 4.22x             |
+//
+//  # Raw Benchmarks
+//
+//  ```text
+//  test ftoa_f32_dtoa    ... bench:     917,561 ns/iter (+/- 45,458)
+//  test ftoa_f32_lexical ... bench:     465,584 ns/iter (+/- 76,158)
+//  test ftoa_f32_std     ... bench:   1,884,646 ns/iter (+/- 130,721)
+//  test ftoa_f64_dtoa    ... bench:   1,092,687 ns/iter (+/- 125,136)
+//  test ftoa_f64_lexical ... bench:     539,904 ns/iter (+/- 29,626)
+//  test ftoa_f64_std     ... bench:   2,276,839 ns/iter (+/- 64,515)
+//  ```
+
+// Code the generate the benchmark plot:
+//  import numpy as np
+//  import pandas as pd
+//  import matplotlib.pyplot as plt
+//  plt.style.use('ggplot')
+//  lexical = np.array([465584, 539904]) / 1e6
+//  rustcore = np.array([1884646, 2276839]) / 1e6
+//  dtoa = np.array([917561, 1092687]) / 1e6
+//  ryu = np.array([432878, 522515]) / 1e6
+//  index = ["f32", "f64"]
+//  df = pd.DataFrame({'lexical': lexical, 'rustcore': rustcore, 'dtoa': dtoa, 'ryu': ryu}, index = index, columns=['lexical', 'dtoa', 'ryu', 'rustcore'])
+//  ax = df.plot.bar(rot=0, figsize=(16, 8), fontsize=14)
+//  ax.set_ylabel("ms/iter")
+//  ax.figure.tight_layout()
+//  ax.legend(loc=2, prop={'size': 14})
+//  plt.show()
+
+use crate::util::*;
+
+#[cfg(feature = "radix")]
+use super::radix::{double_radix, float_radix};
+
+// Select the back-end
+cfg_if! {
+if #[cfg(feature = "grisu3")] {
+    use super::grisu3::{double_decimal, float_decimal};
+} else if #[cfg(feature = "ryu")] {
+    use super::ryu::{double_decimal, float_decimal};
+} else {
+    use super::grisu2::{double_decimal, float_decimal};
+}}  //cfg_if
+
+// TRAITS
+
+/// Trait to define serialization of a float to string.
+pub(crate) trait FloatToString: Float {
+    /// Export float to decimal string with optimized algorithm.
+    fn decimal<'a>(self, bytes: &'a mut [u8]) -> usize;
+
+    /// Export float to radix string with slow algorithm.
+    #[cfg(feature = "radix")]
+    fn radix<'a>(self, radix: u32, bytes: &'a mut [u8]) -> usize;
+}
+
+impl FloatToString for f32 {
+    perftools_inline!{
+    fn decimal<'a>(self, bytes: &'a mut [u8]) -> usize {
+        float_decimal(self, bytes)
+    }}
+
+    perftools_inline!{
+    #[cfg(feature = "radix")]
+    fn radix<'a>(self, radix: u32, bytes: &'a mut [u8]) -> usize {
+        float_radix(self, radix, bytes)
+    }}
+}
+
+impl FloatToString for f64 {
+    perftools_inline!{
+    fn decimal<'a>(self, bytes: &'a mut [u8]) -> usize {
+        double_decimal(self, bytes)
+    }}
+
+    perftools_inline!{
+    #[cfg(feature = "radix")]
+    fn radix<'a>(self, radix: u32, bytes: &'a mut [u8]) -> usize {
+        double_radix(self, radix, bytes)
+    }}
+}
+
+// FTOA
+
+// Forward the correct arguments the ideal encoder.
+perftools_inline!{
+fn forward<'a, F: FloatToString>(value: F, radix: u32, bytes: &'a mut [u8])
+    -> usize
+{
+    debug_assert_radix!(radix);
+
+    #[cfg(not(feature = "radix"))] {
+        value.decimal(bytes)
+    }
+
+    #[cfg(feature = "radix")] {
+        match radix {
+            10 => value.decimal(bytes),
+            _  => value.radix(radix, bytes),
+        }
+    }
+}}
+
+// Convert float-to-string and handle special (positive) floats.
+perftools_inline!{
+fn filter_special<'a, F: FloatToString>(value: F, radix: u32, bytes: &'a mut [u8])
+    -> usize
+{
+    // Logic errors, disable in release builds.
+    debug_assert!(value.is_sign_positive(), "Value cannot be negative.");
+    debug_assert_radix!(radix);
+
+    // We already check for 0 in `filter_sign` if value.is_zero().
+    #[cfg(not(feature = "trim_floats"))] {
+        if value.is_zero() {
+            // This is safe, because we confirmed the buffer is >= 4
+            // in total (since we also handled the sign by here).
+            return copy_to_dst(bytes, b"0.0");
+        }
+    }
+
+    if value.is_nan() {
+        // This is safe, because we confirmed the buffer is >= F::FORMATTED_SIZE.
+        // We have up to `F::FORMATTED_SIZE - 1` bytes from `get_nan_string()`,
+        // and up to 1 byte from the sign.
+        copy_to_dst(bytes, get_nan_string())
+    } else if value.is_special() {
+        // This is safe, because we confirmed the buffer is >= F::FORMATTED_SIZE.
+        // We have up to `F::FORMATTED_SIZE - 1` bytes from `get_inf_string()`,
+        // and up to 1 byte from the sign.
+        copy_to_dst(bytes, get_inf_string())
+    } else {
+        forward(value, radix, bytes)
+    }
+}}
+
+// Handle +/- values.
+perftools_inline!{
+fn filter_sign<'a, F: FloatToString>(value: F, radix: u32, bytes: &'a mut [u8])
+    -> usize
+{
+    debug_assert_radix!(radix);
+
+    // Export "-0.0" and "0.0" as "0" with trimmed floats.
+    #[cfg(feature = "trim_floats")] {
+        if value.is_zero() {
+            // We know this is safe, because we confirmed the buffer is >= 1.
+            index_mut!(bytes[0] = b'0');
+            return 1;
+        }
+    }
+
+    // If the sign bit is set, invert it and just set the first
+    // value to "-".
+    if value.is_sign_negative() {
+        let value = -value;
+        // We know this is safe, because we confirmed the buffer is >= 1.
+        index_mut!(bytes[0] = b'-');
+        let bytes = &mut index_mut!(bytes[1..]);
+        filter_special(value, radix, bytes) + 1
+    } else {
+        filter_special(value, radix, bytes)
+    }
+}}
+
+// Write float to string..
+perftools_inline!{
+fn ftoa<F: FloatToString>(value: F, radix: u32, bytes: &mut [u8])
+    -> usize
+{
+    let len = filter_sign(value, radix, bytes);
+    let bytes = &mut index_mut!(bytes[..len]);
+    trim(bytes)
+}}
+
+// Trim a trailing ".0" from a float.
+perftools_inline!{
+fn trim<'a>(bytes: &'a mut [u8])
+    -> usize
+{
+    // Trim a trailing ".0" from a float.
+    if cfg!(feature = "trim_floats") && ends_with_slice(bytes, b".0") {
+        bytes.len() - 2
+    } else {
+        bytes.len()
+    }
+}}
+
+// TO LEXICAL
+
+to_lexical!(ftoa, f32);
+to_lexical!(ftoa, f64);
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::*;
+    use crate::util::test::*;
+
+    #[cfg(all(feature = "correct", feature = "property_tests"))]
+    use quickcheck::quickcheck;
+
+    #[cfg(all(feature = "correct", feature = "std", feature = "property_tests"))]
+    use proptest::{proptest, prop_assert_eq};
+    use approx::assert_relative_eq;
+
+    // Test data for roundtrips.
+    const F32_DATA : [f32; 31] = [0., 0.1, 1., 1.1, 12., 12.1, 123., 123.1, 1234., 1234.1, 12345., 12345.1, 123456., 123456.1, 1234567., 1234567.1, 12345678., 12345678.1, 123456789., 123456789.1, 123456789.12, 123456789.123, 123456789.1234, 123456789.12345, 1.2345678912345e8, 1.2345e+8, 1.2345e+11, 1.2345e+38, 1.2345e-8, 1.2345e-11, 1.2345e-38];
+    const F64_DATA: [f64; 33] = [0., 0.1, 1., 1.1, 12., 12.1, 123., 123.1, 1234., 1234.1, 12345., 12345.1, 123456., 123456.1, 1234567., 1234567.1, 12345678., 12345678.1, 123456789., 123456789.1, 123456789.12, 123456789.123, 123456789.1234, 123456789.12345, 1.2345678912345e8, 1.2345e+8, 1.2345e+11, 1.2345e+38, 1.2345e+308, 1.2345e-8, 1.2345e-11, 1.2345e-38, 1.2345e-299];
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn f32_binary_test() {
+        let mut buffer = new_buffer();
+        // positive
+        #[cfg(feature = "trim_floats")] {
+            assert_eq!(as_slice(b"0"), 0.0f32.to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"0"), (-0.0f32).to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"1"), 1.0f32.to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"10"), 2.0f32.to_lexical_radix(2, &mut buffer));
+        }
+
+        #[cfg(not(feature = "trim_floats"))] {
+            assert_eq!(as_slice(b"0.0"), 0.0f32.to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"-0.0"), (-0.0f32).to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"1.0"), 1.0f32.to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"10.0"), 2.0f32.to_lexical_radix(2, &mut buffer));
+        }
+
+        assert_eq!(as_slice(b"1.1"), 1.5f32.to_lexical_radix(2, &mut buffer));
+        assert_eq!(as_slice(b"1.01"), 1.25f32.to_lexical_radix(2, &mut buffer));
+        assert_eq!(b"1.001111000000110010", &1.2345678901234567890e0f32.to_lexical_radix(2, &mut buffer)[..20]);
+        assert_eq!(b"1100.010110000111111", &1.2345678901234567890e1f32.to_lexical_radix(2, &mut buffer)[..20]);
+        assert_eq!(b"1111011.011101001111", &1.2345678901234567890e2f32.to_lexical_radix(2, &mut buffer)[..20]);
+        assert_eq!(b"10011010010.10010001", &1.2345678901234567890e3f32.to_lexical_radix(2, &mut buffer)[..20]);
+
+        // negative
+        assert_eq!(b"-1.001111000000110010", &(-1.2345678901234567890e0f32).to_lexical_radix(2, &mut buffer)[..21]);
+        assert_eq!(b"-1100.010110000111111", &(-1.2345678901234567890e1f32).to_lexical_radix(2, &mut buffer)[..21]);
+        assert_eq!(b"-1111011.011101001111", &(-1.2345678901234567890e2f32).to_lexical_radix(2, &mut buffer)[..21]);
+        assert_eq!(b"-10011010010.10010001", &(-1.2345678901234567890e3f32).to_lexical_radix(2, &mut buffer)[..21]);
+
+        // special
+        assert_eq!(as_slice(b"NaN"), f32::NAN.to_lexical_radix(2, &mut buffer));
+        assert_eq!(as_slice(b"inf"), f32::INFINITY.to_lexical_radix(2, &mut buffer));
+
+        // bugfixes
+        assert_eq!(as_slice(b"1.1010100000101011110001e-11011"), 0.000000012345f32.to_lexical_radix(2, &mut buffer));
+    }
+
+    #[test]
+    fn f32_decimal_test() {
+        let mut buffer = new_buffer();
+        // positive
+        #[cfg(feature = "trim_floats")] {
+            assert_eq!(as_slice(b"0"), 0.0f32.to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"0"), (-0.0f32).to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"1"), 1.0f32.to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"10"), 10.0f32.to_lexical(&mut buffer));
+        }
+
+        #[cfg(not(feature = "trim_floats"))] {
+            assert_eq!(as_slice(b"0.0"), 0.0f32.to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"-0.0"), (-0.0f32).to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"1.0"), 1.0f32.to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"10.0"), 10.0f32.to_lexical(&mut buffer));
+        }
+
+        assert_eq!(as_slice(b"1.234567"), &1.2345678901234567890e0f32.to_lexical(&mut buffer)[..8]);
+        assert_eq!(as_slice(b"12.34567"), &1.2345678901234567890e1f32.to_lexical(&mut buffer)[..8]);
+        assert_eq!(as_slice(b"123.4567"), &1.2345678901234567890e2f32.to_lexical(&mut buffer)[..8]);
+        assert_eq!(as_slice(b"1234.567"), &1.2345678901234567890e3f32.to_lexical(&mut buffer)[..8]);
+
+        // negative
+        assert_eq!(as_slice(b"-1.234567"), &(-1.2345678901234567890e0f32).to_lexical(&mut buffer)[..9]);
+        assert_eq!(as_slice(b"-12.34567"), &(-1.2345678901234567890e1f32).to_lexical(&mut buffer)[..9]);
+        assert_eq!(as_slice(b"-123.4567"), &(-1.2345678901234567890e2f32).to_lexical(&mut buffer)[..9]);
+        assert_eq!(as_slice(b"-1234.567"), &(-1.2345678901234567890e3f32).to_lexical(&mut buffer)[..9]);
+
+        // special
+        assert_eq!(as_slice(b"NaN"), f32::NAN.to_lexical(&mut buffer));
+        assert_eq!(as_slice(b"inf"), f32::INFINITY.to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn f32_decimal_roundtrip_test() {
+        let mut buffer = new_buffer();
+        for &f in F32_DATA.iter() {
+            let s = f.to_lexical(&mut buffer);
+            assert_relative_eq!(f32::from_lexical(s).unwrap(), f, epsilon=1e-6, max_relative=1e-6);
+        }
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn f32_radix_roundtrip_test() {
+        let mut buffer = new_buffer();
+        for &f in F32_DATA.iter() {
+            for radix in 2..37 {
+                // The lower accuracy is due to slight rounding errors of
+                // ftoa for the Grisu method with non-10 bases.
+                let s = f.to_lexical_radix(radix, &mut buffer);
+                assert_relative_eq!(f32::from_lexical_radix(s, radix).unwrap(), f, max_relative=2e-5);
+            }
+        }
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn f64_binary_test() {
+        let mut buffer = new_buffer();
+        // positive
+        #[cfg(feature = "trim_floats")] {
+            assert_eq!(as_slice(b"0"), 0.0f64.to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"0"), (-0.0f64).to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"1"), 1.0f64.to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"10"), 2.0f64.to_lexical_radix(2, &mut buffer));
+        }
+
+        #[cfg(not(feature = "trim_floats"))] {
+            assert_eq!(as_slice(b"0.0"), 0.0f64.to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"-0.0"), (-0.0f64).to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"1.0"), 1.0f64.to_lexical_radix(2, &mut buffer));
+            assert_eq!(as_slice(b"10.0"), 2.0f64.to_lexical_radix(2, &mut buffer));
+        }
+
+        assert_eq!(as_slice(b"1.00111100000011001010010000101000110001"), &1.2345678901234567890e0f64.to_lexical_radix(2, &mut buffer)[..40]);
+        assert_eq!(as_slice(b"1100.01011000011111100110100110010111101"), &1.2345678901234567890e1f64.to_lexical_radix(2, &mut buffer)[..40]);
+        assert_eq!(as_slice(b"1111011.01110100111100000001111111101101"), &1.2345678901234567890e2f64.to_lexical_radix(2, &mut buffer)[..40]);
+        assert_eq!(as_slice(b"10011010010.1001000101100001001111110100"), &1.2345678901234567890e3f64.to_lexical_radix(2, &mut buffer)[..40]);
+
+        // negative
+        assert_eq!(as_slice(b"-1.00111100000011001010010000101000110001"), &(-1.2345678901234567890e0f64).to_lexical_radix(2, &mut buffer)[..41]);
+        assert_eq!(as_slice(b"-1100.01011000011111100110100110010111101"), &(-1.2345678901234567890e1f64).to_lexical_radix(2, &mut buffer)[..41]);
+        assert_eq!(as_slice(b"-1111011.01110100111100000001111111101101"), &(-1.2345678901234567890e2f64).to_lexical_radix(2, &mut buffer)[..41]);
+        assert_eq!(as_slice(b"-10011010010.1001000101100001001111110100"), &(-1.2345678901234567890e3f64).to_lexical_radix(2, &mut buffer)[..41]);
+
+        // special
+        assert_eq!(as_slice(b"NaN"), f64::NAN.to_lexical_radix(2, &mut buffer));
+        assert_eq!(as_slice(b"inf"), f64::INFINITY.to_lexical_radix(2, &mut buffer));
+    }
+
+    #[test]
+    fn f64_decimal_test() {
+        let mut buffer = new_buffer();
+        // positive
+        #[cfg(feature = "trim_floats")] {
+            assert_eq!(as_slice(b"0"), 0.0.to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"0"), (-0.0).to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"1"), 1.0.to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"10"), 10.0.to_lexical(&mut buffer));
+        }
+
+        #[cfg(not(feature = "trim_floats"))] {
+            assert_eq!(as_slice(b"0.0"), 0.0.to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"-0.0"), (-0.0).to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"1.0"), 1.0.to_lexical(&mut buffer));
+            assert_eq!(as_slice(b"10.0"), 10.0.to_lexical(&mut buffer));
+        }
+
+        assert_eq!(as_slice(b"1.234567"), &1.2345678901234567890e0.to_lexical(&mut buffer)[..8]);
+        assert_eq!(as_slice(b"12.34567"), &1.2345678901234567890e1.to_lexical(&mut buffer)[..8]);
+        assert_eq!(as_slice(b"123.4567"), &1.2345678901234567890e2.to_lexical(&mut buffer)[..8]);
+        assert_eq!(as_slice(b"1234.567"), &1.2345678901234567890e3.to_lexical(&mut buffer)[..8]);
+
+        // negative
+        assert_eq!(as_slice(b"-1.234567"), &(-1.2345678901234567890e0).to_lexical(&mut buffer)[..9]);
+        assert_eq!(as_slice(b"-12.34567"), &(-1.2345678901234567890e1).to_lexical(&mut buffer)[..9]);
+        assert_eq!(as_slice(b"-123.4567"), &(-1.2345678901234567890e2).to_lexical(&mut buffer)[..9]);
+        assert_eq!(as_slice(b"-1234.567"), &(-1.2345678901234567890e3).to_lexical(&mut buffer)[..9]);
+
+        // special
+        assert_eq!(b"NaN".to_vec(), f64::NAN.to_lexical(&mut buffer));
+        assert_eq!(b"inf".to_vec(), f64::INFINITY.to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn f64_decimal_roundtrip_test() {
+        let mut buffer = new_buffer();
+        for &f in F64_DATA.iter() {
+            let s = f.to_lexical(&mut buffer);
+            assert_relative_eq!(f64::from_lexical(s).unwrap(), f, epsilon=1e-12, max_relative=1e-12);
+        }
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn f64_radix_roundtrip_test() {
+        let mut buffer = new_buffer();
+        for &f in F64_DATA.iter() {
+            for radix in 2..37 {
+                // The lower accuracy is due to slight rounding errors of
+                // ftoa for the Grisu method with non-10 bases.
+                let s = f.to_lexical_radix(radix, &mut buffer);
+                assert_relative_eq!(f64::from_lexical_radix(s, radix).unwrap(), f, max_relative=3e-5);
+            }
+        }
+    }
+
+    #[cfg(all(feature = "correct", feature = "property_tests"))]
+    quickcheck! {
+        fn f32_quickcheck(f: f32) -> bool {
+            let mut buffer = new_buffer();
+            let parsed = f32::from_lexical(f.to_lexical(&mut buffer)).unwrap();
+            if f.is_nan() {
+                parsed.is_nan()
+            } else {
+                f == parsed
+            }
+        }
+
+        fn f64_quickcheck(f: f64) -> bool {
+            let mut buffer = new_buffer();
+            let parsed = f64::from_lexical(f.to_lexical(&mut buffer)).unwrap();
+            if f.is_nan() {
+                parsed.is_nan()
+            } else {
+                f == parsed
+            }
+        }
+    }
+
+    #[cfg(all(feature = "correct", feature = "std", feature = "property_tests"))]
+    proptest! {
+        #[test]
+        fn f32_proptest(i in f32::MIN..f32::MAX) {
+            let mut buffer = new_buffer();
+            prop_assert_eq!(i, f32::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+
+        #[test]
+        fn f64_proptest(i in f64::MIN..f64::MAX) {
+            let mut buffer = new_buffer();
+            prop_assert_eq!(i, f64::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    #[should_panic]
+    fn f32_buffer_test() {
+        let mut buffer = [b'0'; f32::FORMATTED_SIZE_DECIMAL-1];
+        1.2345f32.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn f64_buffer_test() {
+        let mut buffer = [b'0'; f64::FORMATTED_SIZE_DECIMAL-1];
+        1.2345f64.to_lexical(&mut buffer);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/grisu2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/grisu2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/grisu2.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/grisu2.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,435 @@
+//! Internal implementation of the Grisu2 algorithm.
+//!
+//! The optimized routines are adapted from Andrea Samoljuk's `fpconv` library,
+//! which is available [here](https://github.com/night-shift/fpconv).
+//!
+//! The following benchmarks were run on an "Intel(R) Core(TM) i7-6560U
+//! CPU @ 2.20GHz" CPU, on Fedora 28, Linux kernel version 4.18.16-200
+//! (x86-64), using the lexical formatter, `dtoa::write()` or `x.to_string()`,
+//! avoiding any inefficiencies in Rust string parsing for `format!(...)`
+//! or `write!()` macros. The code was compiled with LTO and at an optimization
+//! level of 3.
+//!
+//! The benchmarks with `std` were compiled using "rustc 1.29.2 (17a9dc751
+//! 2018-10-05", and the `no_std` benchmarks were compiled using "rustc
+//! 1.31.0-nightly (46880f41b 2018-10-15)".
+//!
+//! The benchmark code may be found `benches/ftoa.rs`.
+//!
+//! # Benchmarks
+//!
+//! | Type  |  lexical (ns/iter) | to_string (ns/iter)   | Relative Increase |
+//! |:-----:|:------------------:|:---------------------:|:-----------------:|
+//! | f32   | 1,221,025          | 2,711,290             | 2.22x             |
+//! | f64   | 1,248,397          | 3,558,305             | 2.85x             |
+//!
+//! # Raw Benchmarks
+//!
+//! ```text
+//! test f32_dtoa      ... bench:   1,174,070 ns/iter (+/- 442,501)
+//! test f32_lexical   ... bench:   1,433,234 ns/iter (+/- 633,261)
+//! test f32_ryu       ... bench:     669,828 ns/iter (+/- 192,291)
+//! test f32_to_string ... bench:   3,341,733 ns/iter (+/- 1,346,744)
+//! test f64_dtoa      ... bench:   1,302,522 ns/iter (+/- 364,655)
+//! test f64_lexical   ... bench:   1,375,384 ns/iter (+/- 596,860)
+//! test f64_ryu       ... bench:   1,015,171 ns/iter (+/- 187,552)
+//! test f64_to_string ... bench:   3,900,299 ns/iter (+/- 521,956)
+//! ```
+
+// Code the generate the benchmark plot:
+//  import numpy as np
+//  import pandas as pd
+//  import matplotlib.pyplot as plt
+//  plt.style.use('ggplot')
+//  lexical = np.array([1221025, 1375384]) / 1e6
+//  dtoa = np.array([1174070, 1302522]) / 1e6
+//  ryu = np.array([669828, 1015171]) / 1e6
+//  rustcore = np.array([2711290, 3558305]) / 1e6
+//  index = ["f32", "f64"]
+//  df = pd.DataFrame({'lexical': lexical, 'lexical (dtoa)': dtoa, 'lexical (ryu)': ryu, 'rustcore': rustcore}, index = index, columns=['lexical', 'lexical (dtoa)', 'lexical (ryu)', 'rustcore'])
+//  ax = df.plot.bar(rot=0, figsize=(16, 8), fontsize=14, color=['#E24A33', '#988ED5', '#8EBA42', '#348ABD'])
+//  ax.set_ylabel("ms/iter")
+//  ax.figure.tight_layout()
+//  ax.legend(loc=2, prop={'size': 14})
+//  plt.show()
+
+use crate::float::ExtendedFloat80;
+use crate::util::*;
+
+// CACHED POWERS
+
+perftools_inline!{
+/// Find cached power of 10 from the exponent.
+fn cached_grisu_power(exp: i32, k: &mut i32)
+    -> &'static ExtendedFloat80
+{
+    // FLOATING POINT CONSTANTS
+    const ONE_LOG_TEN: f64 = 0.30102999566398114;
+    const NPOWERS: i32 = 87;
+    const FIRSTPOWER: i32 = -348;       // 10 ^ -348
+    const STEPPOWERS: i32 = 8;
+    const EXPMAX: i32 = -32;
+    const EXPMIN: i32 = -60;
+
+    let approx = -((exp + NPOWERS).as_f64()) * ONE_LOG_TEN;
+    let approx = approx.as_i32();
+    let mut idx = ((approx - FIRSTPOWER) / STEPPOWERS).as_usize();
+
+    loop {
+        // Use `arr.get(idx)`, which explicitly provides a reference,
+        // instead of `arr[idx]`, which provides a value.
+        // We have a bug in versions <= 1.27.0 where it creates
+        // a local copy, which we then get the reference to and return.
+        // This allows use-after-free, without any warning, so we're
+        // using unidiomatic code to avoid any issue.
+        let power = GRISU_POWERS_OF_TEN.get(idx).unwrap();
+        let current = exp + power.exp + 64;
+        if current < EXPMIN {
+            idx += 1;
+            continue;
+        }
+
+        if current > EXPMAX {
+            idx -= 1;
+            continue;
+        }
+
+        *k = FIRSTPOWER + idx.as_i32() * STEPPOWERS;
+        return power;
+    }
+}}
+
+/// Cached powers of ten as specified by the Grisu algorithm.
+///
+/// Cached powers of 10^k, calculated as if by:
+/// `ceil((alpha-e+63) * ONE_LOG_TEN);`
+const GRISU_POWERS_OF_TEN: [ExtendedFloat80; 87] = [
+    ExtendedFloat80 { mant: 18054884314459144840, exp: -1220 },
+    ExtendedFloat80 { mant: 13451937075301367670, exp: -1193 },
+    ExtendedFloat80 { mant: 10022474136428063862, exp: -1166 },
+    ExtendedFloat80 { mant: 14934650266808366570, exp: -1140 },
+    ExtendedFloat80 { mant: 11127181549972568877, exp: -1113 },
+    ExtendedFloat80 { mant: 16580792590934885855, exp: -1087 },
+    ExtendedFloat80 { mant: 12353653155963782858, exp: -1060 },
+    ExtendedFloat80 { mant: 18408377700990114895, exp: -1034 },
+    ExtendedFloat80 { mant: 13715310171984221708, exp: -1007 },
+    ExtendedFloat80 { mant: 10218702384817765436, exp: -980 },
+    ExtendedFloat80 { mant: 15227053142812498563, exp: -954 },
+    ExtendedFloat80 { mant: 11345038669416679861, exp: -927 },
+    ExtendedFloat80 { mant: 16905424996341287883, exp: -901 },
+    ExtendedFloat80 { mant: 12595523146049147757, exp: -874 },
+    ExtendedFloat80 { mant: 9384396036005875287, exp: -847 },
+    ExtendedFloat80 { mant: 13983839803942852151, exp: -821 },
+    ExtendedFloat80 { mant: 10418772551374772303, exp: -794 },
+    ExtendedFloat80 { mant: 15525180923007089351, exp: -768 },
+    ExtendedFloat80 { mant: 11567161174868858868, exp: -741 },
+    ExtendedFloat80 { mant: 17236413322193710309, exp: -715 },
+    ExtendedFloat80 { mant: 12842128665889583758, exp: -688 },
+    ExtendedFloat80 { mant: 9568131466127621947, exp: -661 },
+    ExtendedFloat80 { mant: 14257626930069360058, exp: -635 },
+    ExtendedFloat80 { mant: 10622759856335341974, exp: -608 },
+    ExtendedFloat80 { mant: 15829145694278690180, exp: -582 },
+    ExtendedFloat80 { mant: 11793632577567316726, exp: -555 },
+    ExtendedFloat80 { mant: 17573882009934360870, exp: -529 },
+    ExtendedFloat80 { mant: 13093562431584567480, exp: -502 },
+    ExtendedFloat80 { mant: 9755464219737475723, exp: -475 },
+    ExtendedFloat80 { mant: 14536774485912137811, exp: -449 },
+    ExtendedFloat80 { mant: 10830740992659433045, exp: -422 },
+    ExtendedFloat80 { mant: 16139061738043178685, exp: -396 },
+    ExtendedFloat80 { mant: 12024538023802026127, exp: -369 },
+    ExtendedFloat80 { mant: 17917957937422433684, exp: -343 },
+    ExtendedFloat80 { mant: 13349918974505688015, exp: -316 },
+    ExtendedFloat80 { mant: 9946464728195732843, exp: -289 },
+    ExtendedFloat80 { mant: 14821387422376473014, exp: -263 },
+    ExtendedFloat80 { mant: 11042794154864902060, exp: -236 },
+    ExtendedFloat80 { mant: 16455045573212060422, exp: -210 },
+    ExtendedFloat80 { mant: 12259964326927110867, exp: -183 },
+    ExtendedFloat80 { mant: 18268770466636286478, exp: -157 },
+    ExtendedFloat80 { mant: 13611294676837538539, exp: -130 },
+    ExtendedFloat80 { mant: 10141204801825835212, exp: -103 },
+    ExtendedFloat80 { mant: 15111572745182864684, exp: -77 },
+    ExtendedFloat80 { mant: 11258999068426240000, exp: -50 },
+    ExtendedFloat80 { mant: 16777216000000000000, exp: -24 },
+    ExtendedFloat80 { mant: 12500000000000000000, exp:  3 },
+    ExtendedFloat80 { mant: 9313225746154785156, exp:  30 },
+    ExtendedFloat80 { mant: 13877787807814456755, exp: 56 },
+    ExtendedFloat80 { mant: 10339757656912845936, exp: 83 },
+    ExtendedFloat80 { mant: 15407439555097886824, exp: 109 },
+    ExtendedFloat80 { mant: 11479437019748901445, exp: 136 },
+    ExtendedFloat80 { mant: 17105694144590052135, exp: 162 },
+    ExtendedFloat80 { mant: 12744735289059618216, exp: 189 },
+    ExtendedFloat80 { mant: 9495567745759798747, exp: 216 },
+    ExtendedFloat80 { mant: 14149498560666738074, exp: 242 },
+    ExtendedFloat80 { mant: 10542197943230523224, exp: 269 },
+    ExtendedFloat80 { mant: 15709099088952724970, exp: 295 },
+    ExtendedFloat80 { mant: 11704190886730495818, exp: 322 },
+    ExtendedFloat80 { mant: 17440603504673385349, exp: 348 },
+    ExtendedFloat80 { mant: 12994262207056124023, exp: 375 },
+    ExtendedFloat80 { mant: 9681479787123295682, exp: 402 },
+    ExtendedFloat80 { mant: 14426529090290212157, exp: 428 },
+    ExtendedFloat80 { mant: 10748601772107342003, exp: 455 },
+    ExtendedFloat80 { mant: 16016664761464807395, exp: 481 },
+    ExtendedFloat80 { mant: 11933345169920330789, exp: 508 },
+    ExtendedFloat80 { mant: 17782069995880619868, exp: 534 },
+    ExtendedFloat80 { mant: 13248674568444952270, exp: 561 },
+    ExtendedFloat80 { mant: 9871031767461413346, exp: 588 },
+    ExtendedFloat80 { mant: 14708983551653345445, exp: 614 },
+    ExtendedFloat80 { mant: 10959046745042015199, exp: 641 },
+    ExtendedFloat80 { mant: 16330252207878254650, exp: 667 },
+    ExtendedFloat80 { mant: 12166986024289022870, exp: 694 },
+    ExtendedFloat80 { mant: 18130221999122236476, exp: 720 },
+    ExtendedFloat80 { mant: 13508068024458167312, exp: 747 },
+    ExtendedFloat80 { mant: 10064294952495520794, exp: 774 },
+    ExtendedFloat80 { mant: 14996968138956309548, exp: 800 },
+    ExtendedFloat80 { mant: 11173611982879273257, exp: 827 },
+    ExtendedFloat80 { mant: 16649979327439178909, exp: 853 },
+    ExtendedFloat80 { mant: 12405201291620119593, exp: 880 },
+    ExtendedFloat80 { mant: 9242595204427927429, exp: 907 },
+    ExtendedFloat80 { mant: 13772540099066387757, exp: 933 },
+    ExtendedFloat80 { mant: 10261342003245940623, exp: 960 },
+    ExtendedFloat80 { mant: 15290591125556738113, exp: 986 },
+    ExtendedFloat80 { mant: 11392378155556871081, exp: 1013 },
+    ExtendedFloat80 { mant: 16975966327722178521, exp: 1039 },
+    ExtendedFloat80 { mant: 12648080533535911531, exp: 1066 }
+];
+
+// FTOA DECIMAL
+
+// LOOKUPS
+const TENS: [u64; 20] = [
+    10000000000000000000, 1000000000000000000, 100000000000000000,
+    10000000000000000, 1000000000000000, 100000000000000,
+    10000000000000, 1000000000000, 100000000000,
+    10000000000, 1000000000, 100000000,
+    10000000, 1000000, 100000,
+    10000, 1000, 100,
+    10, 1
+];
+
+// FPCONV GRISU
+
+perftools_inline!{
+/// Round digit to sane approximation.
+fn round_digit(digits: &mut [u8], ndigits: usize, delta: u64, mut rem: u64, kappa: u64, mant: u64)
+{
+    while rem < mant && delta - rem >= kappa && (rem + kappa < mant || mant - rem > rem + kappa - mant)
+    {
+        digits[ndigits - 1] -= 1;
+        rem += kappa;
+    }
+}}
+
+/// Generate digits from upper and lower range on rounding of number.
+fn generate_digits(fp: &ExtendedFloat80, upper: &ExtendedFloat80, lower: &ExtendedFloat80, digits: &mut [u8], k: &mut i32)
+    -> usize
+{
+    let wmant = upper.mant - fp.mant;
+    let mut delta = upper.mant - lower.mant;
+
+    let one = ExtendedFloat80 {
+        mant: 1 << -upper.exp,
+        exp: upper.exp,
+    };
+
+    let mut part1 = upper.mant >> -one.exp;
+    let mut part2 = upper.mant & (one.mant - 1);
+
+    let mut idx: usize = 0;
+    let mut kappa: i32 = 10;
+    // 1000000000
+    // Guaranteed to be safe, TENS has 20 elements.
+    let mut divp = index!(TENS[10..]).iter();
+    while kappa > 0 {
+        // Remember not to continue! This loop has an increment condition.
+        let div = divp.next().unwrap();
+        let digit = part1 / div;
+        if digit != 0 || idx != 0 {
+            digits[idx] = digit.as_u8() + b'0';
+            idx += 1;
+        }
+
+        part1 -= digit.as_u64() * div;
+        kappa -= 1;
+
+        let tmp = (part1 <<-one.exp) + part2;
+        if tmp <= delta {
+            *k += kappa;
+            round_digit(digits, idx, delta, tmp, div << -one.exp, wmant);
+            return idx;
+        }
+    }
+
+    /* 10 */
+    // Guaranteed to be safe, TENS has 20 elements.
+    let mut unit = index!(TENS[..=18]).iter().rev();
+    loop {
+        part2 *= 10;
+        delta *= 10;
+        kappa -= 1;
+
+        let digit = part2 >> -one.exp;
+        if digit != 0 || idx != 0 {
+            digits[idx] = digit.as_u8() + b'0';
+            idx += 1;
+        }
+
+        part2 &= one.mant - 1;
+        let ten = unit.next().unwrap();
+        if part2 < delta {
+            *k += kappa;
+            round_digit(digits, idx, delta, part2, one.mant, wmant * ten);
+            return idx;
+        }
+    }
+}
+
+/// Core Grisu2 algorithm for the float formatter.
+fn grisu2(d: f64, digits: &mut [u8], k: &mut i32)
+    -> usize
+{
+    let mut w = ExtendedFloat80::from_f64(d);
+
+    let (mut lower, mut upper) = w.normalized_boundaries();
+    w.normalize();
+
+    let mut ki: i32 =  0;
+    let cp = cached_grisu_power(upper.exp, &mut ki);
+
+    w     = w.mul(cp);
+    upper = upper.mul(cp);
+    lower = lower.mul(cp);
+
+    lower.mant += 1;
+    upper.mant -= 1;
+
+    *k = -ki;
+
+    generate_digits(&w, &upper, &lower, digits, k)
+}
+
+/// Write the produced digits to string.
+///
+/// Adds formatting for exponents, and other types of information.
+fn emit_digits(digits: &mut [u8], mut ndigits: usize, dest: &mut [u8], k: i32)
+    -> usize
+{
+    let exp = k + ndigits.as_i32() - 1;
+    let mut exp = exp.abs().as_usize();
+
+    // write plain integer (with ".0" suffix).
+    if k >= 0 && exp < (ndigits + 7) {
+        let idx = ndigits;
+        let count = k.as_usize();
+        // These are all safe, since digits.len() >= idx, and
+        // dest.len() >= idx+count+2, so the range must be valid.
+        copy_to_dst(dest, &index!(digits[..idx]));
+        write_bytes(&mut index_mut!(dest[idx..idx+count]), b'0');
+        copy_to_dst(&mut index_mut!(dest[idx+count..]), b".0");
+
+        return ndigits + k.as_usize() + 2;
+    }
+
+    // write decimal w/o scientific notation
+    if k < 0 && (k > -7 || exp < 4) {
+        let offset = ndigits.as_isize() - k.abs().as_isize();
+        // fp < 1.0 -> write leading zero
+        if offset <= 0 {
+            let offset = (-offset).as_usize();
+            // These are all safe, since digits.len() >= ndigits, and
+            // dest.len() >= ndigits+offset+2, so the range must be valid.
+            index_mut!(dest[0] = b'0');
+            index_mut!(dest[1] = b'.');
+            write_bytes(&mut index_mut!(dest[2..offset+2]), b'0');
+            copy_to_dst(&mut index_mut!(dest[offset+2..]), &index!(digits[..ndigits]));
+
+            return ndigits + 2 + offset;
+
+        } else {
+            // fp > 1.0
+            let offset = offset.as_usize();
+            // These are all safe, since digits.len() >= ndigits, and
+            // dest.len() >= ndigits+1, so the range must be valid.
+            copy_to_dst(dest, &index!(digits[..offset]));
+            index_mut!(dest[offset] = b'.');
+            copy_to_dst(&mut index_mut!(dest[offset+1..]), &index!(digits[offset..ndigits]));
+
+            return ndigits + 1;
+        }
+    }
+
+    // write decimal w/ scientific notation
+    ndigits = ndigits.min(18);
+
+    let dst_len = dest.len();
+    let mut dst_iter = dest.iter_mut();
+    let mut src_iter = digits.iter().take(ndigits);
+    *dst_iter.next().unwrap() = *src_iter.next().unwrap();
+
+    if ndigits > 1 {
+        *dst_iter.next().unwrap() = b'.';
+        for &src in src_iter {
+            *dst_iter.next().unwrap() = src;
+        }
+    }
+
+    *dst_iter.next().unwrap() = exponent_notation_char(10);
+
+    *dst_iter.next().unwrap() = match k + ndigits.as_i32() - 1 < 0 {
+        true    => b'-',
+        false   => b'+',
+    };
+
+    let mut cent: usize = 0;
+    if exp > 99 {
+        cent = exp / 100;
+        *dst_iter.next().unwrap() = cent.as_u8() + b'0';
+        exp -= cent * 100;
+    }
+    if exp > 9 {
+        let dec = exp / 10;
+        *dst_iter.next().unwrap() = dec.as_u8() + b'0';
+        exp -= dec * 10;
+    } else if cent != 0 {
+        *dst_iter.next().unwrap() = b'0';
+    }
+
+    let shift = (exp % 10).as_u8();
+    *dst_iter.next().unwrap() = shift + b'0';
+
+    dst_len - dst_iter.count()
+}
+
+perftools_inline!{
+fn fpconv_dtoa(d: f64, dest: &mut [u8]) -> usize
+{
+    let mut digits: [u8; 18] = [0; 18];
+    let mut k: i32 = 0;
+    let ndigits = grisu2(d, &mut digits, &mut k);
+    emit_digits(&mut digits, ndigits, dest, k)
+}}
+
+// DECIMAL
+
+perftools_inline!{
+/// Forward to double_decimal.
+///
+/// `f` must be non-special (NaN or infinite), non-negative,
+/// and non-zero.
+pub(crate) fn float_decimal<'a>(f: f32, bytes: &'a mut [u8])
+    -> usize
+{
+    double_decimal(f.as_f64(), bytes)
+}}
+
+// F64
+
+perftools_inline!{
+/// Optimized algorithm for decimal numbers.
+///
+/// `d` must be non-special (NaN or infinite), non-negative,
+/// and non-zero.
+pub(crate) fn double_decimal<'a>(d: f64, bytes: &'a mut [u8])
+    -> usize
+{
+    fpconv_dtoa(d, bytes)
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/grisu3.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/grisu3.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/grisu3.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/grisu3.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+//! Wrapper around David Tolnay's dtoa.
+
+use dtoa;
+use crate::util::*;
+
+// F32
+
+perftools_inline!{
+/// Wrapper for dtoa.
+///
+/// `f` must be non-special (NaN or infinite), non-negative,
+/// and non-zero.
+pub(crate) fn float_decimal<'a>(f: f32, bytes: &'a mut [u8])
+    -> usize
+{
+    dtoa::write(bytes, f).expect("Write to in-memory buffer.")
+}}
+
+// F64
+
+perftools_inline!{
+/// Wrapper for dtoa.
+///
+/// `d` must be non-special (NaN or infinite), non-negative,
+/// and non-zero.
+pub(crate) fn double_decimal<'a>(d: f64, bytes: &'a mut [u8])
+    -> usize
+{
+    dtoa::write(bytes, d).expect("Write to in-memory buffer.")
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+//! Fast lexical float-to-string conversion routines.
+
+// Hide implementation details.
+#[cfg(feature = "radix")]
+mod radix;
+
+cfg_if! {
+if #[cfg(feature = "grisu3")] {
+    mod grisu3;
+} else if #[cfg(feature = "ryu")] {
+    mod ryu;
+} else {
+    mod grisu2;
+}}  // cfg_if
+
+mod api;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/radix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/radix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/radix.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/radix.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,241 @@
+//! Adaptation of the V8 ftoa algorithm with a custom radix.
+//!
+//! This algorithm is adapted from the V8 codebase,
+//! and may be found [here](https://github.com/v8/v8).
+
+use crate::itoa;
+use crate::util::*;
+
+// FTOA BASEN
+// ----------
+
+// Export a character to digit.
+macro_rules! to_digit {
+    ($c:expr, $radix:ident) => (($c as char).to_digit($radix));
+}
+
+// Calculate the naive exponent from a minimal value.
+//
+// Don't export this for float, since it's specialized for radix.
+perftools_inline!{
+pub(crate) fn naive_exponent(d: f64, radix: u32) -> i32
+{
+    // floor returns the minimal value, which is our
+    // desired exponent
+    // ln(1.1e-5) -> -4.95 -> -5
+    // ln(1.1e5) -> -5.04 -> 5
+    (d.ln() / (radix as f64).ln()).floor() as i32
+}}
+
+/// Naive algorithm for converting a floating point to a custom radix.
+///
+/// `d` must be non-special (NaN or infinite), non-negative,
+/// and non-zero.
+///
+/// Adapted from the V8 implementation.
+fn ftoa_naive<'a>(value: f64, radix: u32, bytes: &'a mut [u8])
+    -> usize
+{
+    debug_assert_radix!(radix);
+
+    // Assert no special cases remain, no non-zero values,
+    // and no negative numbers.
+    debug_assert!(!value.is_special());
+    debug_assert!(value != 0.0);
+    debug_assert!(value > 0.0);
+
+    // Store the first digit and up to `BUFFER_SIZE - 20` digits
+    // that occur from left-to-right in the decimal representation.
+    // For example, for the number 123.45, store the first digit `1`
+    // and `2345` as the remaining values. Then, decide on-the-fly
+    // if we need scientific or regular formatting.
+    //
+    //   BUFFER_SIZE
+    // - 1      # first digit
+    // - 1      # period
+    // - 1      # +/- sign
+    // - 2      # e and +/- sign
+    // - 9      # max exp is 308, in radix2 is 9
+    // - 1      # null terminator
+    // = 15 characters of formatting required
+    // Just pad it a bit, we don't want memory corruption.
+    const MAX_NONDIGIT_LENGTH: usize = 25;
+    const MAX_DIGIT_LENGTH: usize = BUFFER_SIZE - MAX_NONDIGIT_LENGTH;
+
+    // Temporary buffer for the result. We start with the decimal point in the
+    // middle and write to the left for the integer part and to the right for the
+    // fractional part. 1024 characters for the exponent and 52 for the mantissa
+    // either way, with additional space for sign, decimal point and string
+    // termination should be sufficient.
+    const SIZE: usize = 2200;
+    let mut buffer: [u8; SIZE] = [b'\0'; SIZE];
+    //let buffer = buffer.as_mut_ptr();
+    let initial_position: usize = SIZE / 2;
+    let mut integer_cursor = initial_position;
+    let mut fraction_cursor = initial_position;
+    let base = radix as f64;
+
+    // Split the value into an integer part and a fractional part.
+    let mut integer = value.floor();
+    let mut fraction = value - integer;
+
+    // We only compute fractional digits up to the input double's precision.
+    let mut delta = 0.5 * (value.next_positive() - value);
+    delta = 0.0.next_positive().max_finite(delta);
+    debug_assert!(delta > 0.0);
+
+    // Don't remove bounds checks, for a few reasons.
+    //  1. Difficult to determine statically.
+    //  2. Algorithm is fairly slow, in general, so performance isn't a major deal.
+    if fraction > delta {
+        loop {
+            // Shift up by one digit.
+            fraction *= base;
+            delta *= base;
+            // Write digit.
+            let digit = fraction as i32;
+            buffer[fraction_cursor] = digit_to_char(digit);
+            fraction_cursor += 1;
+            // Calculate remainder.
+            fraction -= digit as f64;
+            // Round to even.
+            if fraction > 0.5 || (fraction == 0.5 && (digit & 1) != 0) {
+                if fraction + delta > 1.0 {
+                    // We need to back trace already written digits in case of carry-over.
+                    loop {
+                        fraction_cursor -= 1;
+                        if fraction_cursor == initial_position-1 {
+                            // Carry over to the integer part.
+                            integer += 1.0;
+                            break;
+                        }
+                        // Reconstruct digit.
+                        let c = buffer[fraction_cursor];
+                        if let Some(digit) = to_digit!(c, radix) {
+                            let idx = (digit + 1) as usize;
+                            buffer[fraction_cursor] = digit_to_char(idx);
+                            fraction_cursor += 1;
+                            break;
+                        }
+                    }
+                    break;
+                }
+            }
+
+            if delta >= fraction {
+                break;
+            }
+        }
+    }
+
+    // Compute integer digits. Fill unrepresented digits with zero.
+    while (integer / base).exponent() > 0 {
+        integer /= base;
+        integer_cursor -= 1;
+        buffer[integer_cursor] = b'0';
+    }
+
+    loop {
+        let remainder = integer % base;
+        integer_cursor -= 1;
+        let idx = remainder as usize;
+        buffer[integer_cursor] = digit_to_char(idx);
+        integer = (integer - remainder) / base;
+
+        if integer <= 0.0 {
+            break;
+        }
+    };
+
+    if value <= 1e-5 || value >= 1e9 {
+        // write scientific notation with negative exponent
+        let exponent = naive_exponent(value, radix);
+
+        // Non-exponent portion.
+        // 1.   Get as many digits as possible, up to `MAX_DIGIT_LENGTH+1`
+        //      (since we are ignoring the digit for the first digit),
+        //      or the number of written digits
+        let start: usize;
+        let end: usize;
+        if value <= 1e-5 {
+            start = ((initial_position as i32) - exponent - 1) as usize;
+            end = fraction_cursor.min(start + MAX_DIGIT_LENGTH + 1);
+        } else {
+            start = integer_cursor;
+            end = fraction_cursor.min(start + MAX_DIGIT_LENGTH + 1);
+        }
+        let buffer = &buffer[start..end];
+
+        // 2.   Remove any trailing 0s in the selected range.
+        let buffer = rtrim_char_slice(buffer, b'0').0;
+
+        // 3.   Write the fraction component
+        bytes[0] = buffer[0];
+        bytes[1] = b'.';
+        let count = copy_to_dst(&mut bytes[2..], &buffer[1..]);
+        let bytes = &mut bytes[count+2..];
+
+        // write the exponent component
+        bytes[0] = exponent_notation_char(radix);
+        // Handle negative exponents.
+        let exp: u32;
+        if exponent < 0 {
+            bytes[1] = b'-';
+            exp = exponent.wrapping_neg() as u32;
+            itoa::itoa_positive(exp, radix, &mut bytes[2..]) + count + 4
+        } else {
+            exp = exponent as u32;
+            itoa::itoa_positive(exp, radix, &mut bytes[1..]) + count + 3
+        }
+    } else {
+        // get component lengths
+        let integer_length = initial_position - integer_cursor;
+        let fraction_length = (fraction_cursor - initial_position).min(MAX_DIGIT_LENGTH - integer_length);
+
+        // write integer component
+        let start = integer_cursor;
+        let end = integer_cursor + integer_length;
+        let count = copy_to_dst(bytes, &buffer[start..end]);
+        let bytes = &mut bytes[count..];
+
+        // write fraction component
+        if fraction_length > 0 {
+            // fraction exists, write it
+            bytes[0] = b'.';
+            let start = initial_position;
+            let end = initial_position + fraction_length;
+            copy_to_dst(&mut bytes[1..], &buffer[start..end]);
+            integer_length + fraction_length + 1
+        } else {
+            // no fraction, write decimal place
+            copy_to_dst(bytes, ".0");
+            integer_length + 2
+        }
+    }
+}
+
+// F32
+
+// Forward to double_radix.
+//
+// `f` must be non-special (NaN or infinite), non-negative,
+// and non-zero.
+perftools_inline!{
+pub(crate) fn float_radix<'a>(f: f32, radix: u32, bytes: &'a mut [u8])
+    -> usize
+{
+    double_radix(f as f64, radix, bytes)
+}}
+
+// F64
+
+// Algorithm for non-decimal string representations.
+//
+// `d` must be non-special (NaN or infinite), non-negative,
+// and non-zero.
+perftools_inline!{
+pub(crate) fn double_radix<'a>(value: f64, radix: u32, bytes: &'a mut [u8])
+    -> usize
+{
+    ftoa_naive(value, radix, bytes)
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/ryu.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/ryu.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/ftoa/ryu.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/ftoa/ryu.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,34 @@
+//! Wrapper around David Tolnay's ryu.
+
+use ryu::raw;
+use crate::util::*;
+
+// F32
+
+perftools_inline!{
+/// Wrapper for ryu.
+///
+/// `f` must be non-special (NaN or infinite), non-negative,
+/// and non-zero.
+pub(crate) fn float_decimal<'a>(f: f32, bytes: &'a mut [u8])
+    -> usize
+{
+    unsafe {
+        raw::format32(f, bytes.as_mut_ptr())
+    }
+}}
+
+// F64
+
+perftools_inline!{
+/// Wrapper for ryu.
+///
+/// `d` must be non-special (NaN or infinite), non-negative,
+/// and non-zero.
+pub(crate) fn double_decimal<'a>(d: f64, bytes: &'a mut [u8])
+    -> usize
+{
+    unsafe {
+        raw::format64(d, bytes.as_mut_ptr())
+    }
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/api.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/api.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/api.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/api.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,674 @@
+//! Low-level API generator.
+//!
+//! Uses either the optimized decimal algorithm, the optimized generic
+//! algorithm, or the naive algorithm.
+
+use crate::util::*;
+
+/// Select the back-end.
+#[cfg(feature = "table")]
+use super::decimal::Decimal;
+
+#[cfg(all(feature = "table", feature = "radix"))]
+use super::generic::Generic;
+
+#[cfg(not(feature = "table"))]
+use super::naive::Naive;
+
+// HELPERS
+
+// Wrapper to facilitate calling a backend that writes iteratively to
+// the end of the buffer.
+#[cfg(any(not(feature = "table"), feature = "radix"))]
+macro_rules! write_backwards {
+    ($value:ident, $radix:expr, $buffer:ident, $t:tt, $cb:ident) => ({
+        // Create a temporary buffer, and copy into it.
+        // Way faster than reversing a buffer in-place.
+        // Need to ensure the buffer size is adequate for any radix, but
+        // small for the optimized decimal formatters.
+        debug_assert_radix!($radix);
+        let mut buffer: [u8; BUFFER_SIZE] = [b'0'; BUFFER_SIZE];
+        let digits;
+        if cfg!(not(feature = "radix")) || $radix == 10 {
+            digits = &mut buffer[..$t::FORMATTED_SIZE_DECIMAL];
+        } else {
+            digits = &mut buffer[..$t::FORMATTED_SIZE];
+        }
+
+        // Write backwards to buffer and copy output to slice.
+        let offset = $value.$cb($radix, digits);
+        debug_assert!(offset <= digits.len());
+        copy_to_dst($buffer, &unchecked_index!(digits[offset..]))
+    });
+}
+
+#[cfg(all(feature = "table", not(feature = "radix")))]
+pub(crate) trait Itoa: Decimal + UnsignedInteger
+{}
+
+#[cfg(all(feature = "table", feature = "radix"))]
+pub(crate) trait Itoa: Decimal + Generic + UnsignedInteger
+{}
+
+#[cfg(not(feature = "table"))]
+pub(crate) trait Itoa: Naive + UnsignedInteger
+{}
+
+macro_rules! itoa_impl {
+    ($($t:ty)*) => ($(
+        impl Itoa for $t {}
+    )*)
+}
+
+itoa_impl! { u8 u16 u32 u64 u128 usize }
+
+// FORWARD
+
+// Forward itoa arguments to an optimized backend.
+//  Preconditions: `value` must be non-negative and unsigned.
+perftools_inline!{
+#[cfg(all(feature = "table", not(feature = "radix")))]
+pub(crate) fn itoa_positive<T>(value: T, _: u32, buffer: &mut [u8])
+    -> usize
+    where T: Itoa
+{
+    value.decimal(buffer)
+}}
+
+// Forward itoa arguments to an optimized backend.
+//  Preconditions: `value` must be non-negative and unsigned.
+perftools_inline!{
+#[cfg(all(feature = "table", feature = "radix"))]
+pub(crate) fn itoa_positive<T>(value: T, radix: u32, buffer: &mut [u8])
+    -> usize
+    where T: Itoa
+{
+    if radix == 10 {
+        value.decimal(buffer)
+    } else {
+        write_backwards!(value, radix, buffer, T, generic)
+    }
+}}
+
+// Forward itoa arguments to a naive backend.
+//  Preconditions: `value` must be non-negative and unsigned.
+perftools_inline!{
+#[cfg(not(feature = "table"))]
+pub(crate) fn itoa_positive<T>(value: T, radix: u32, buffer: &mut [u8])
+    -> usize
+    where T: Itoa
+{
+    write_backwards!(value, radix, buffer, T, naive)
+}}
+
+// TO LEXICAL
+
+// Callback for unsigned integer formatter.
+perftools_inline!{
+fn unsigned<Narrow, Wide>(value: Narrow, radix: u32, buffer: &mut [u8])
+    -> usize
+    where Narrow: UnsignedInteger,
+          Wide: Itoa
+{
+    let value: Wide = as_cast(value);
+    itoa_positive(value, radix, buffer)
+}}
+
+macro_rules! unsigned_to_lexical {
+    ($narrow:ty, $wide:ty) => (
+        to_lexical!(unsigned::<$narrow, $wide>, $narrow);
+    );
+}
+
+unsigned_to_lexical!(u8, u32);
+unsigned_to_lexical!(u16, u32);
+unsigned_to_lexical!(u32, u32);
+unsigned_to_lexical!(u64, u64);
+unsigned_to_lexical!(u128, u128);
+
+#[cfg(any(target_pointer_width = "16", target_pointer_width = "32"))]
+unsigned_to_lexical!(usize, u32);
+
+#[cfg(target_pointer_width = "64")]
+unsigned_to_lexical!(usize, u64);
+
+// Callback for signed integer formatter.
+perftools_inline!{
+fn signed<Narrow, Wide, Unsigned>(value: Narrow, radix: u32, buffer: &mut [u8])
+    -> usize
+    where Narrow: SignedInteger,
+          Wide: SignedInteger,
+          Unsigned: Itoa
+{
+    if value < Narrow::ZERO {
+        unchecked_index_mut!(buffer[0] = b'-');
+        let value: Wide = as_cast(value);
+        let value: Unsigned = as_cast(value.wrapping_neg());
+        itoa_positive(value, radix, &mut unchecked_index_mut!(buffer[1..])) + 1
+    } else {
+        let value: Unsigned = as_cast(value);
+        itoa_positive(value, radix, buffer)
+    }
+}}
+
+macro_rules! signed_to_lexical {
+    ($narrow:ty, $wide:ty, $unsigned:ty) => (
+        to_lexical!(signed::<$narrow, $wide, $unsigned>, $narrow);
+    );
+}
+
+signed_to_lexical!(i8, i32, u32);
+signed_to_lexical!(i16, i32, u32);
+signed_to_lexical!(i32, i32, u32);
+signed_to_lexical!(i64, i64, u64);
+signed_to_lexical!(i128, i128, u128);
+
+#[cfg(any(target_pointer_width = "16", target_pointer_width = "32"))]
+signed_to_lexical!(isize, i32, u32);
+
+#[cfg(target_pointer_width = "64")]
+signed_to_lexical!(isize, i64, u64);
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    // Shouldn't need to include atoi, should be fine with ToLexical in scope.
+    use crate::util::*;
+    use crate::util::test::*;
+
+    #[cfg(feature = "property_tests")]
+    use quickcheck::quickcheck;
+    #[cfg(all(feature = "std", feature = "property_tests"))]
+    use proptest::proptest;
+
+    // GENERIC
+
+    #[test]
+    fn u8_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0u8.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1u8.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5u8.to_lexical(&mut buffer));
+        assert_eq!(b"127", 127u8.to_lexical(&mut buffer));
+        assert_eq!(b"128", 128u8.to_lexical(&mut buffer));
+        assert_eq!(b"255", 255u8.to_lexical(&mut buffer));
+        assert_eq!(b"255", (-1i8 as u8).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn i8_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0i8.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1i8.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5i8.to_lexical(&mut buffer));
+        assert_eq!(b"127", 127i8.to_lexical(&mut buffer));
+        assert_eq!(b"-128", (128u8 as i8).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (255u8 as i8).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (-1i8).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn u16_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0u16.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1u16.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5u16.to_lexical(&mut buffer));
+        assert_eq!(b"32767", 32767u16.to_lexical(&mut buffer));
+        assert_eq!(b"32768", 32768u16.to_lexical(&mut buffer));
+        assert_eq!(b"65535", 65535u16.to_lexical(&mut buffer));
+        assert_eq!(b"65535", (-1i16 as u16).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn i16_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0i16.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1i16.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5i16.to_lexical(&mut buffer));
+        assert_eq!(b"32767", 32767i16.to_lexical(&mut buffer));
+        assert_eq!(b"-32768", (32768u16 as i16).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (65535u16 as i16).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (-1i16).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn u32_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0u32.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1u32.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5u32.to_lexical(&mut buffer));
+        assert_eq!(b"2147483647", 2147483647u32.to_lexical(&mut buffer));
+        assert_eq!(b"2147483648", 2147483648u32.to_lexical(&mut buffer));
+        assert_eq!(b"4294967295", 4294967295u32.to_lexical(&mut buffer));
+        assert_eq!(b"4294967295", (-1i32 as u32).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn i32_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0i32.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1i32.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5i32.to_lexical(&mut buffer));
+        assert_eq!(b"2147483647", 2147483647i32.to_lexical(&mut buffer));
+        assert_eq!(b"-2147483648", (2147483648u32 as i32).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (4294967295u32 as i32).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (-1i32).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn u64_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0u64.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1u64.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5u64.to_lexical(&mut buffer));
+        assert_eq!(b"9223372036854775807", 9223372036854775807u64.to_lexical(&mut buffer));
+        assert_eq!(b"9223372036854775808", 9223372036854775808u64.to_lexical(&mut buffer));
+        assert_eq!(b"18446744073709551615", 18446744073709551615u64.to_lexical(&mut buffer));
+        assert_eq!(b"18446744073709551615", (-1i64 as u64).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn i64_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0i64.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1i64.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5i64.to_lexical(&mut buffer));
+        assert_eq!(b"9223372036854775807", 9223372036854775807i64.to_lexical(&mut buffer));
+        assert_eq!(b"-9223372036854775808", (9223372036854775808u64 as i64).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (18446744073709551615u64 as i64).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (-1i64).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn u128_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0u128.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1u128.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5u128.to_lexical(&mut buffer));
+        assert_eq!(&b"170141183460469231731687303715884105727"[..], 170141183460469231731687303715884105727u128.to_lexical(&mut buffer));
+        assert_eq!(&b"170141183460469231731687303715884105728"[..], 170141183460469231731687303715884105728u128.to_lexical(&mut buffer));
+        assert_eq!(&b"340282366920938463463374607431768211455"[..], 340282366920938463463374607431768211455u128.to_lexical(&mut buffer));
+        assert_eq!(&b"340282366920938463463374607431768211455"[..], (-1i128 as u128).to_lexical(&mut buffer));
+    }
+
+    #[test]
+    fn i128_test() {
+        let mut buffer = new_buffer();
+        assert_eq!(b"0", 0i128.to_lexical(&mut buffer));
+        assert_eq!(b"1", 1i128.to_lexical(&mut buffer));
+        assert_eq!(b"5", 5i128.to_lexical(&mut buffer));
+        assert_eq!(&b"170141183460469231731687303715884105727"[..], 170141183460469231731687303715884105727i128.to_lexical(&mut buffer));
+        assert_eq!(&b"-170141183460469231731687303715884105728"[..], (170141183460469231731687303715884105728u128 as i128).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (340282366920938463463374607431768211455u128 as i128).to_lexical(&mut buffer));
+        assert_eq!(b"-1", (-1i128).to_lexical(&mut buffer));
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn radix_test() {
+        let data = [
+            (2, "100101"),
+            (3, "1101"),
+            (4, "211"),
+            (5, "122"),
+            (6, "101"),
+            (7, "52"),
+            (8, "45"),
+            (9, "41"),
+            (10, "37"),
+            (11, "34"),
+            (12, "31"),
+            (13, "2B"),
+            (14, "29"),
+            (15, "27"),
+            (16, "25"),
+            (17, "23"),
+            (18, "21"),
+            (19, "1I"),
+            (20, "1H"),
+            (21, "1G"),
+            (22, "1F"),
+            (23, "1E"),
+            (24, "1D"),
+            (25, "1C"),
+            (26, "1B"),
+            (27, "1A"),
+            (28, "19"),
+            (29, "18"),
+            (30, "17"),
+            (31, "16"),
+            (32, "15"),
+            (33, "14"),
+            (34, "13"),
+            (35, "12"),
+            (36, "11"),
+        ];
+
+        let mut buffer = new_buffer();
+        for (base, expected) in data.iter() {
+            assert_eq!(expected.as_bytes(), 37.to_lexical_radix(*base, &mut buffer));
+        }
+    }
+
+    // Extensive tests
+
+    #[test]
+    fn u8_pow2_test() {
+        let mut buffer = new_buffer();
+        let values: &[u8] = &[0, 1, 2, 3, 4, 5, 7, 8, 9, 15, 16, 17, 31, 32, 33, 63, 64, 65, 127, 128, 129, 255];
+        for &i in values.iter() {
+            assert_eq!(i, u8::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u8_pow10_test() {
+        let mut buffer = new_buffer();
+        let values: &[u8] = &[0, 1, 5, 9, 10, 11, 15, 99, 100, 101, 105];
+        for &i in values.iter() {
+            assert_eq!(i, u8::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u16_pow2_test() {
+        let mut buffer = new_buffer();
+        let values: &[u16] = &[0, 1, 2, 3, 4, 5, 7, 8, 9, 15, 16, 17, 31, 32, 33, 63, 64, 65, 127, 128, 129, 255, 256, 257, 511, 512, 513, 1023, 1024, 1025, 2047, 2048, 2049, 4095, 4096, 4097, 8191, 8192, 8193, 16383, 16384, 16385, 32767, 32768, 32769, 65535];
+        for &i in values.iter() {
+            assert_eq!(i, u16::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u16_pow10_test() {
+        let mut buffer = new_buffer();
+        let values: &[u16] = &[0, 1, 5, 9, 10, 11, 15, 99, 100, 101, 105, 999, 1000, 1001, 1005, 9999, 10000, 10001, 10005];
+        for &i in values.iter() {
+            assert_eq!(i, u16::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u32_pow2_test() {
+        let mut buffer = new_buffer();
+        let values: &[u32] = &[0, 1, 2, 3, 4, 5, 7, 8, 9, 15, 16, 17, 31, 32, 33, 63, 64, 65, 127, 128, 129, 255, 256, 257, 511, 512, 513, 1023, 1024, 1025, 2047, 2048, 2049, 4095, 4096, 4097, 8191, 8192, 8193, 16383, 16384, 16385, 32767, 32768, 32769, 65535, 65536, 65537, 131071, 131072, 131073, 262143, 262144, 262145, 524287, 524288, 524289, 1048575, 1048576, 1048577, 2097151, 2097152, 2097153, 4194303, 4194304, 4194305, 8388607, 8388608, 8388609, 16777215, 16777216, 16777217, 33554431, 33554432, 33554433, 67108863, 67108864, 67108865, 134217727, 134217728, 134217729, 268435455, 268435456, 268435457, 536870911, 536870912, 536870913, 1073741823, 1073741824, 1073741825, 2147483647, 2147483648, 2147483649, 4294967295];
+        for &i in values.iter() {
+            assert_eq!(i, u32::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u32_pow10_test() {
+        let mut buffer = new_buffer();
+        let values: &[u32] = &[0, 1, 5, 9, 10, 11, 15, 99, 100, 101, 105, 999, 1000, 1001, 1005, 9999, 10000, 10001, 10005, 99999, 100000, 100001, 100005, 999999, 1000000, 1000001, 1000005, 9999999, 10000000, 10000001, 10000005, 99999999, 100000000, 100000001, 100000005, 999999999, 1000000000, 1000000001, 1000000005];
+        for &i in values.iter() {
+            assert_eq!(i, u32::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u64_pow2_test() {
+        let mut buffer = new_buffer();
+        let values: &[u64] = &[0, 1, 2, 3, 4, 5, 7, 8, 9, 15, 16, 17, 31, 32, 33, 63, 64, 65, 127, 128, 129, 255, 256, 257, 511, 512, 513, 1023, 1024, 1025, 2047, 2048, 2049, 4095, 4096, 4097, 8191, 8192, 8193, 16383, 16384, 16385, 32767, 32768, 32769, 65535, 65536, 65537, 131071, 131072, 131073, 262143, 262144, 262145, 524287, 524288, 524289, 1048575, 1048576, 1048577, 2097151, 2097152, 2097153, 4194303, 4194304, 4194305, 8388607, 8388608, 8388609, 16777215, 16777216, 16777217, 33554431, 33554432, 33554433, 67108863, 67108864, 67108865, 134217727, 134217728, 134217729, 268435455, 268435456, 268435457, 536870911, 536870912, 536870913, 1073741823, 1073741824, 1073741825, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 4294967297, 8589934591, 8589934592, 8589934593, 17179869183, 17179869184, 17179869185, 34359738367, 34359738368, 34359738369, 68719476735, 68719476736, 68719476737, 137438953471, 137438953472, 137438953473, 274877906943, 274877906944, 274877906945, 549755813887, 549755813888, 549755813889, 1099511627775, 1099511627776, 1099511627777, 2199023255551, 2199023255552, 2199023255553, 4398046511103, 4398046511104, 4398046511105, 8796093022207, 8796093022208, 8796093022209, 17592186044415, 17592186044416, 17592186044417, 35184372088831, 35184372088832, 35184372088833, 70368744177663, 70368744177664, 70368744177665, 140737488355327, 140737488355328, 140737488355329, 281474976710655, 281474976710656, 281474976710657, 562949953421311, 562949953421312, 562949953421313, 1125899906842623, 1125899906842624, 1125899906842625, 2251799813685247, 2251799813685248, 2251799813685249, 4503599627370495, 4503599627370496, 4503599627370497, 9007199254740991, 9007199254740992, 9007199254740993, 18014398509481983, 18014398509481984, 18014398509481985, 36028797018963967, 36028797018963968, 36028797018963969, 72057594037927935, 72057594037927936, 72057594037927937, 144115188075855871, 144115188075855872, 144115188075855873, 288230376151711743, 288230376151711744, 288230376151711745, 576460752303423487, 576460752303423488, 576460752303423489, 1152921504606846975, 1152921504606846976, 1152921504606846977, 2305843009213693951, 2305843009213693952, 2305843009213693953, 4611686018427387903, 4611686018427387904, 4611686018427387905, 9223372036854775807, 9223372036854775808, 9223372036854775809, 18446744073709551615];
+        for &i in values.iter() {
+            assert_eq!(i, u64::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u64_pow10_test() {
+        let mut buffer = new_buffer();
+        let values: &[u64] = &[0, 1, 5, 9, 10, 11, 15, 99, 100, 101, 105, 999, 1000, 1001, 1005, 9999, 10000, 10001, 10005, 99999, 100000, 100001, 100005, 999999, 1000000, 1000001, 1000005, 9999999, 10000000, 10000001, 10000005, 99999999, 100000000, 100000001, 100000005, 999999999, 1000000000, 1000000001, 1000000005, 9999999999, 10000000000, 10000000001, 10000000005, 99999999999, 100000000000, 100000000001, 100000000005, 999999999999, 1000000000000, 1000000000001, 1000000000005, 9999999999999, 10000000000000, 10000000000001, 10000000000005, 99999999999999, 100000000000000, 100000000000001, 100000000000005, 999999999999999, 1000000000000000, 1000000000000001, 1000000000000005, 9999999999999999, 10000000000000000, 10000000000000001, 10000000000000005, 99999999999999999, 100000000000000000, 100000000000000001, 100000000000000005, 999999999999999999, 1000000000000000000, 1000000000000000001, 1000000000000000005];
+        for &i in values.iter() {
+            assert_eq!(i, u64::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u128_pow2_test() {
+        let mut buffer = new_buffer();
+        let values: &[u128] = &[0, 1, 2, 3, 4, 5, 7, 8, 9, 15, 16, 17, 31, 32, 33, 63, 64, 65, 127, 128, 129, 255, 256, 257, 511, 512, 513, 1023, 1024, 1025, 2047, 2048, 2049, 4095, 4096, 4097, 8191, 8192, 8193, 16383, 16384, 16385, 32767, 32768, 32769, 65535, 65536, 65537, 131071, 131072, 131073, 262143, 262144, 262145, 524287, 524288, 524289, 1048575, 1048576, 1048577, 2097151, 2097152, 2097153, 4194303, 4194304, 4194305, 8388607, 8388608, 8388609, 16777215, 16777216, 16777217, 33554431, 33554432, 33554433, 67108863, 67108864, 67108865, 134217727, 134217728, 134217729, 268435455, 268435456, 268435457, 536870911, 536870912, 536870913, 1073741823, 1073741824, 1073741825, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 4294967297, 8589934591, 8589934592, 8589934593, 17179869183, 17179869184, 17179869185, 34359738367, 34359738368, 34359738369, 68719476735, 68719476736, 68719476737, 137438953471, 137438953472, 137438953473, 274877906943, 274877906944, 274877906945, 549755813887, 549755813888, 549755813889, 1099511627775, 1099511627776, 1099511627777, 2199023255551, 2199023255552, 2199023255553, 4398046511103, 4398046511104, 4398046511105, 8796093022207, 8796093022208, 8796093022209, 17592186044415, 17592186044416, 17592186044417, 35184372088831, 35184372088832, 35184372088833, 70368744177663, 70368744177664, 70368744177665, 140737488355327, 140737488355328, 140737488355329, 281474976710655, 281474976710656, 281474976710657, 562949953421311, 562949953421312, 562949953421313, 1125899906842623, 1125899906842624, 1125899906842625, 2251799813685247, 2251799813685248, 2251799813685249, 4503599627370495, 4503599627370496, 4503599627370497, 9007199254740991, 9007199254740992, 9007199254740993, 18014398509481983, 18014398509481984, 18014398509481985, 36028797018963967, 36028797018963968, 36028797018963969, 72057594037927935, 72057594037927936, 72057594037927937, 144115188075855871, 144115188075855872, 144115188075855873, 288230376151711743, 288230376151711744, 288230376151711745, 576460752303423487, 576460752303423488, 576460752303423489, 1152921504606846975, 1152921504606846976, 1152921504606846977, 2305843009213693951, 2305843009213693952, 2305843009213693953, 4611686018427387903, 4611686018427387904, 4611686018427387905, 9223372036854775807, 9223372036854775808, 9223372036854775809, 18446744073709551615, 18446744073709551616, 18446744073709551617, 36893488147419103231, 36893488147419103232, 36893488147419103233, 73786976294838206463, 73786976294838206464, 73786976294838206465, 147573952589676412927, 147573952589676412928, 147573952589676412929, 295147905179352825855, 295147905179352825856, 295147905179352825857, 590295810358705651711, 590295810358705651712, 590295810358705651713, 1180591620717411303423, 1180591620717411303424, 1180591620717411303425, 2361183241434822606847, 2361183241434822606848, 2361183241434822606849, 4722366482869645213695, 4722366482869645213696, 4722366482869645213697, 9444732965739290427391, 9444732965739290427392, 9444732965739290427393, 18889465931478580854783, 18889465931478580854784, 18889465931478580854785, 37778931862957161709567, 37778931862957161709568, 37778931862957161709569, 75557863725914323419135, 75557863725914323419136, 75557863725914323419137, 151115727451828646838271, 151115727451828646838272, 151115727451828646838273, 302231454903657293676543, 302231454903657293676544, 302231454903657293676545, 604462909807314587353087, 604462909807314587353088, 604462909807314587353089, 1208925819614629174706175, 1208925819614629174706176, 1208925819614629174706177, 2417851639229258349412351, 2417851639229258349412352, 2417851639229258349412353, 4835703278458516698824703, 4835703278458516698824704, 4835703278458516698824705, 9671406556917033397649407, 9671406556917033397649408, 9671406556917033397649409, 19342813113834066795298815, 19342813113834066795298816, 19342813113834066795298817, 38685626227668133590597631, 38685626227668133590597632, 38685626227668133590597633, 77371252455336267181195263, 77371252455336267181195264, 77371252455336267181195265, 154742504910672534362390527, 154742504910672534362390528, 154742504910672534362390529, 309485009821345068724781055, 309485009821345068724781056, 309485009821345068724781057, 618970019642690137449562111, 618970019642690137449562112, 618970019642690137449562113, 1237940039285380274899124223, 1237940039285380274899124224, 1237940039285380274899124225, 2475880078570760549798248447, 2475880078570760549798248448, 2475880078570760549798248449, 4951760157141521099596496895, 4951760157141521099596496896, 4951760157141521099596496897, 9903520314283042199192993791, 9903520314283042199192993792, 9903520314283042199192993793, 19807040628566084398385987583, 19807040628566084398385987584, 19807040628566084398385987585, 39614081257132168796771975167, 39614081257132168796771975168, 39614081257132168796771975169, 79228162514264337593543950335, 79228162514264337593543950336, 79228162514264337593543950337, 158456325028528675187087900671, 158456325028528675187087900672, 158456325028528675187087900673, 316912650057057350374175801343, 316912650057057350374175801344, 316912650057057350374175801345, 633825300114114700748351602687, 633825300114114700748351602688, 633825300114114700748351602689, 1267650600228229401496703205375, 1267650600228229401496703205376, 1267650600228229401496703205377, 2535301200456458802993406410751, 2535301200456458802993406410752, 2535301200456458802993406410753, 5070602400912917605986812821503, 5070602400912917605986812821504, 5070602400912917605986812821505, 10141204801825835211973625643007, 10141204801825835211973625643008, 10141204801825835211973625643009, 20282409603651670423947251286015, 20282409603651670423947251286016, 20282409603651670423947251286017, 40564819207303340847894502572031, 40564819207303340847894502572032, 40564819207303340847894502572033, 81129638414606681695789005144063, 81129638414606681695789005144064, 81129638414606681695789005144065, 162259276829213363391578010288127, 162259276829213363391578010288128, 162259276829213363391578010288129, 324518553658426726783156020576255, 324518553658426726783156020576256, 324518553658426726783156020576257, 649037107316853453566312041152511, 649037107316853453566312041152512, 649037107316853453566312041152513, 1298074214633706907132624082305023, 1298074214633706907132624082305024, 1298074214633706907132624082305025, 2596148429267413814265248164610047, 2596148429267413814265248164610048, 2596148429267413814265248164610049, 5192296858534827628530496329220095, 5192296858534827628530496329220096, 5192296858534827628530496329220097, 10384593717069655257060992658440191, 10384593717069655257060992658440192, 10384593717069655257060992658440193, 20769187434139310514121985316880383, 20769187434139310514121985316880384, 20769187434139310514121985316880385, 41538374868278621028243970633760767, 41538374868278621028243970633760768, 41538374868278621028243970633760769, 83076749736557242056487941267521535, 83076749736557242056487941267521536, 83076749736557242056487941267521537, 166153499473114484112975882535043071, 166153499473114484112975882535043072, 166153499473114484112975882535043073, 332306998946228968225951765070086143, 332306998946228968225951765070086144, 332306998946228968225951765070086145, 664613997892457936451903530140172287, 664613997892457936451903530140172288, 664613997892457936451903530140172289, 1329227995784915872903807060280344575, 1329227995784915872903807060280344576, 1329227995784915872903807060280344577, 2658455991569831745807614120560689151, 2658455991569831745807614120560689152, 2658455991569831745807614120560689153, 5316911983139663491615228241121378303, 5316911983139663491615228241121378304, 5316911983139663491615228241121378305, 10633823966279326983230456482242756607, 10633823966279326983230456482242756608, 10633823966279326983230456482242756609, 21267647932558653966460912964485513215, 21267647932558653966460912964485513216, 21267647932558653966460912964485513217, 42535295865117307932921825928971026431, 42535295865117307932921825928971026432, 42535295865117307932921825928971026433, 85070591730234615865843651857942052863, 85070591730234615865843651857942052864, 85070591730234615865843651857942052865, 170141183460469231731687303715884105727, 170141183460469231731687303715884105728, 170141183460469231731687303715884105729, 340282366920938463463374607431768211455];
+        for &i in values.iter() {
+            assert_eq!(i, u128::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    #[test]
+    fn u128_pow10_test() {
+        let mut buffer = new_buffer();
+        let values: &[u128] = &[0, 1, 5, 9, 10, 11, 15, 99, 100, 101, 105, 999, 1000, 1001, 1005, 9999, 10000, 10001, 10005, 99999, 100000, 100001, 100005, 999999, 1000000, 1000001, 1000005, 9999999, 10000000, 10000001, 10000005, 99999999, 100000000, 100000001, 100000005, 999999999, 1000000000, 1000000001, 1000000005, 9999999999, 10000000000, 10000000001, 10000000005, 99999999999, 100000000000, 100000000001, 100000000005, 999999999999, 1000000000000, 1000000000001, 1000000000005, 9999999999999, 10000000000000, 10000000000001, 10000000000005, 99999999999999, 100000000000000, 100000000000001, 100000000000005, 999999999999999, 1000000000000000, 1000000000000001, 1000000000000005, 9999999999999999, 10000000000000000, 10000000000000001, 10000000000000005, 99999999999999999, 100000000000000000, 100000000000000001, 100000000000000005, 999999999999999999, 1000000000000000000, 1000000000000000001, 1000000000000000005, 9999999999999999999, 10000000000000000000, 10000000000000000001, 10000000000000000005, 99999999999999999999, 100000000000000000000, 100000000000000000001, 100000000000000000005, 999999999999999999999, 1000000000000000000000, 1000000000000000000001, 1000000000000000000005, 9999999999999999999999, 10000000000000000000000, 10000000000000000000001, 10000000000000000000005, 99999999999999999999999, 100000000000000000000000, 100000000000000000000001, 100000000000000000000005, 999999999999999999999999, 1000000000000000000000000, 1000000000000000000000001, 1000000000000000000000005, 9999999999999999999999999, 10000000000000000000000000, 10000000000000000000000001, 10000000000000000000000005, 99999999999999999999999999, 100000000000000000000000000, 100000000000000000000000001, 100000000000000000000000005, 999999999999999999999999999, 1000000000000000000000000000, 1000000000000000000000000001, 1000000000000000000000000005, 9999999999999999999999999999, 10000000000000000000000000000, 10000000000000000000000000001, 10000000000000000000000000005, 99999999999999999999999999999, 100000000000000000000000000000, 100000000000000000000000000001, 100000000000000000000000000005, 999999999999999999999999999999, 1000000000000000000000000000000, 1000000000000000000000000000001, 1000000000000000000000000000005, 9999999999999999999999999999999, 10000000000000000000000000000000, 10000000000000000000000000000001, 10000000000000000000000000000005, 99999999999999999999999999999999, 100000000000000000000000000000000, 100000000000000000000000000000001, 100000000000000000000000000000005, 999999999999999999999999999999999, 1000000000000000000000000000000000, 1000000000000000000000000000000001, 1000000000000000000000000000000005, 9999999999999999999999999999999999, 10000000000000000000000000000000000, 10000000000000000000000000000000001, 10000000000000000000000000000000005, 99999999999999999999999999999999999, 100000000000000000000000000000000000, 100000000000000000000000000000000001, 100000000000000000000000000000000005, 999999999999999999999999999999999999, 1000000000000000000000000000000000000, 1000000000000000000000000000000000001, 1000000000000000000000000000000000005, 9999999999999999999999999999999999999, 10000000000000000000000000000000000000, 10000000000000000000000000000000000001, 10000000000000000000000000000000000005, 99999999999999999999999999999999999999, 100000000000000000000000000000000000000, 100000000000000000000000000000000000001, 100000000000000000000000000000000000005];
+        for &i in values.iter() {
+            assert_eq!(i, u128::from_lexical(i.to_lexical(&mut buffer)).unwrap());
+        }
+    }
+
+    // Quickcheck
+
+    #[cfg(feature = "property_tests")]
+    quickcheck! {
+        fn u8_quickcheck(i: u8) -> bool {
+            let mut buffer = new_buffer();
+            i == u8::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn u16_quickcheck(i: u16) -> bool {
+            let mut buffer = new_buffer();
+            i == u16::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn u32_quickcheck(i: u32) -> bool {
+            let mut buffer = new_buffer();
+            i == u32::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn u64_quickcheck(i: u64) -> bool {
+            let mut buffer = new_buffer();
+            i == u64::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn u128_quickcheck(i: u128) -> bool {
+            let mut buffer = new_buffer();
+            i == u128::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn usize_quickcheck(i: usize) -> bool {
+            let mut buffer = new_buffer();
+            i == usize::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn i8_quickcheck(i: i8) -> bool {
+            let mut buffer = new_buffer();
+            i == i8::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn i16_quickcheck(i: i16) -> bool {
+            let mut buffer = new_buffer();
+            i == i16::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn i32_quickcheck(i: i32) -> bool {
+            let mut buffer = new_buffer();
+            i == i32::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn i64_quickcheck(i: i64) -> bool {
+            let mut buffer = new_buffer();
+            i == i64::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn i128_quickcheck(i: i128) -> bool {
+            let mut buffer = new_buffer();
+            i == i128::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+
+        fn isize_quickcheck(i: isize) -> bool {
+            let mut buffer = new_buffer();
+            i == isize::from_lexical(i.to_lexical(&mut buffer)).unwrap()
+        }
+    }
+
+    // Proptest
+
+    #[cfg(all(feature = "std", feature = "property_tests"))]
+    proptest! {
+        #[test]
+        fn u8_proptest(i in u8::min_value()..u8::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, u8::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn i8_proptest(i in i8::min_value()..i8::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, i8::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn u16_proptest(i in u16::min_value()..u16::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, u16::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn i16_proptest(i in i16::min_value()..i16::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, i16::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn u32_proptest(i in u32::min_value()..u32::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, u32::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn i32_proptest(i in i32::min_value()..i32::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, i32::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn u64_proptest(i in u64::min_value()..u64::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, u64::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn i64_proptest(i in i64::min_value()..i64::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, i64::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn u128_proptest(i in u128::min_value()..u128::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, u128::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn i128_proptest(i in i128::min_value()..i128::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, i128::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn usize_proptest(i in usize::min_value()..usize::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, usize::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+
+        #[test]
+        fn isize_proptest(i in isize::min_value()..isize::max_value()) {
+            let mut buffer = new_buffer();
+            assert_eq!(i, isize::from_lexical(i.to_lexical(&mut buffer)).unwrap())
+        }
+    }
+
+    // Panic tests
+
+    #[test]
+    #[should_panic]
+    fn i8_buffer_test() {
+        let mut buffer = [b'0'; i8::FORMATTED_SIZE_DECIMAL-1];
+        12i8.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn i16_buffer_test() {
+        let mut buffer = [b'0'; i16::FORMATTED_SIZE_DECIMAL-1];
+        12i16.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn i32_buffer_test() {
+        let mut buffer = [b'0'; i32::FORMATTED_SIZE_DECIMAL-1];
+        12i32.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn i64_buffer_test() {
+        let mut buffer = [b'0'; i64::FORMATTED_SIZE_DECIMAL-1];
+        12i64.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn i128_buffer_test() {
+        let mut buffer = [b'0'; i128::FORMATTED_SIZE_DECIMAL-1];
+        12i128.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn isize_buffer_test() {
+        let mut buffer = [b'0'; isize::FORMATTED_SIZE_DECIMAL-1];
+        12isize.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn u8_buffer_test() {
+        let mut buffer = [b'0'; u8::FORMATTED_SIZE_DECIMAL-1];
+        12i8.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn u16_buffer_test() {
+        let mut buffer = [b'0'; u16::FORMATTED_SIZE_DECIMAL-1];
+        12i16.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn u32_buffer_test() {
+        let mut buffer = [b'0'; u32::FORMATTED_SIZE_DECIMAL-1];
+        12i32.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn u64_buffer_test() {
+        let mut buffer = [b'0'; u64::FORMATTED_SIZE_DECIMAL-1];
+        12i64.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn u128_buffer_test() {
+        let mut buffer = [b'0'; u128::FORMATTED_SIZE_DECIMAL-1];
+        12i128.to_lexical(&mut buffer);
+    }
+
+    #[test]
+    #[should_panic]
+    fn usize_buffer_test() {
+        let mut buffer = [b'0'; usize::FORMATTED_SIZE_DECIMAL-1];
+        12usize.to_lexical(&mut buffer);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/decimal.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/decimal.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/decimal.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/decimal.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,777 @@
+//! Fast lexical integer-to-string conversion routines for decimal strings.
+
+//  The following algorithms aim to minimize the number of conditional
+//  jumps required, by requiring at most 5 linear conditions before
+//  jumping to a condition-less set of instructions. This allows high
+//  performance formatting for integer sizes, and scales well for
+//  both sequential values (primarily low number of digits) and uniform
+//  values (primarily high numbers of digits), however, it also works
+//  well even with branch misprediction (tested using a linear congruent
+//  generator to choose between a sequential or uniform integer).
+//
+//  The performance is ~2-3x the performance of traditional integer
+//  formatters (see, dtolnay/itoa, or the generic algorithm) for 32-bits
+//  or less, highlighting the advantage of removing for loops with
+//  minimal branches. It also scales well for 64 or more bit integers.
+
+//  The following benchmarks were run on an "Intel(R) Core(TM) i7-6560U
+//  CPU @ 2.20GHz" CPU, on Fedora 28, Linux kernel version 4.18.16-200
+//  (x86-64), using the lexical formatter, `itoa::write()` or `x.to_string()`,
+//  avoiding any inefficiencies in Rust string parsing for `format!(...)`
+//  or `write!()` macros. The code was compiled with LTO and at an optimization
+//  level of 3.
+//
+//  The benchmarks with `std` were compiled using "rustc 1.32.0
+// (9fda7c223 2019-01-16".
+//
+//  The benchmark code may be found `benches/itoa.rs`.
+//
+//  # Benchmarks
+//
+//  | Type  |  lexical (ns/iter) | libcore (ns/iter)     | Relative Increase |
+//  |:-----:|:------------------:|:---------------------:|:-----------------:|
+//  | u8    | 55,072             | 376,625               | 6.84x             |
+//  | u16   | 51,219             | 385,722               | 7.53x             |
+//  | u32   | 120,378            | 410,117               | 3.41x             |
+//  | u64   | 187,850            | 489,783               | 2.60x             |
+//  | u128  | 2,056,008          | 14,556,649            | 7.08x             |
+//  | i8    | 81,346             | 414,715               | 5.10x             |
+//  | i16   | 102,664            | 447,581               | 5.50x             |
+//  | i32   | 149,340            | 475,189               | 3.18x             |
+//  | i64   | 230,283            | 527,589               | 2.29x             |
+//  | i128  | 2,052,915          | 14,600,861            | 7.11x             |
+//
+//  # Raw Benchmarks
+//
+//  ```text
+//  test itoa_i8_itoa                    ... bench:     126,392 ns/iter (+/- 5,778)
+//  test itoa_i8_lexical                 ... bench:      81,346 ns/iter (+/- 1,476)
+//  test itoa_i8_std                     ... bench:     414,715 ns/iter (+/- 5,695)
+//  test itoa_i16_itoa                   ... bench:     142,794 ns/iter (+/- 8,103)
+//  test itoa_i16_lexical                ... bench:     102,664 ns/iter (+/- 2,735)
+//  test itoa_i16_std                    ... bench:     447,581 ns/iter (+/- 47,814)
+//  test itoa_i32_itoa                   ... bench:     173,478 ns/iter (+/- 7,305)
+//  test itoa_i32_lexical                ... bench:     149,340 ns/iter (+/- 9,998)
+//  test itoa_i32_std                    ... bench:     475,189 ns/iter (+/- 32,131)
+//  test itoa_i64_itoa                   ... bench:     198,176 ns/iter (+/- 16,321)
+//  test itoa_i64_lexical                ... bench:     230,283 ns/iter (+/- 5,156)
+//  test itoa_i64_std                    ... bench:     527,589 ns/iter (+/- 9,557)
+//  test itoa_i128_itoa                  ... bench:   2,047,257 ns/iter (+/- 73,000)
+//  test itoa_i128_lexical               ... bench:   2,052,915 ns/iter (+/- 74,725)
+//  test itoa_i128_std                   ... bench:  14,600,861 ns/iter (+/- 271,447)
+//  test itoa_u8_heterogeneous_itoa      ... bench:     292,486 ns/iter (+/- 9,220)
+//  test itoa_u8_heterogeneous_lexical   ... bench:     206,873 ns/iter (+/- 2,046)
+//  test itoa_u8_heterogeneous_std       ... bench:     750,418 ns/iter (+/- 15,635)
+//  test itoa_u8_itoa                    ... bench:     105,066 ns/iter (+/- 2,855)
+//  test itoa_u8_lexical                 ... bench:      55,072 ns/iter (+/- 1,549)
+//  test itoa_u8_simple_itoa             ... bench:      69,004 ns/iter (+/- 1,619)
+//  test itoa_u8_simple_lexical          ... bench:      28,524 ns/iter (+/- 1,577)
+//  test itoa_u8_simple_std              ... bench:     317,812 ns/iter (+/- 14,782)
+//  test itoa_u8_std                     ... bench:     376,625 ns/iter (+/- 10,076)
+//  test itoa_u16_heterogeneous_itoa     ... bench:     286,189 ns/iter (+/- 16,636)
+//  test itoa_u16_heterogeneous_lexical  ... bench:     214,915 ns/iter (+/- 7,595)
+//  test itoa_u16_heterogeneous_std      ... bench:     797,362 ns/iter (+/- 39,345)
+//  test itoa_u16_itoa                   ... bench:      90,015 ns/iter (+/- 1,597)
+//  test itoa_u16_lexical                ... bench:      51,219 ns/iter (+/- 5,323)
+//  test itoa_u16_simple_itoa            ... bench:      92,558 ns/iter (+/- 2,638)
+//  test itoa_u16_simple_lexical         ... bench:      42,701 ns/iter (+/- 3,799)
+//  test itoa_u16_simple_std             ... bench:     363,527 ns/iter (+/- 20,206)
+//  test itoa_u16_std                    ... bench:     385,722 ns/iter (+/- 14,945)
+//  test itoa_u32_heterogeneous_itoa     ... bench:     319,279 ns/iter (+/- 8,077)
+//  test itoa_u32_heterogeneous_lexical  ... bench:     262,614 ns/iter (+/- 10,914)
+//  test itoa_u32_heterogeneous_std      ... bench:     830,270 ns/iter (+/- 38,468)
+//  test itoa_u32_itoa                   ... bench:     114,494 ns/iter (+/- 2,552)
+//  test itoa_u32_lexical                ... bench:     120,378 ns/iter (+/- 4,930)
+//  test itoa_u32_simple_itoa            ... bench:      89,981 ns/iter (+/- 4,136)
+//  test itoa_u32_simple_lexical         ... bench:      42,902 ns/iter (+/- 2,875)
+//  test itoa_u32_simple_std             ... bench:     366,203 ns/iter (+/- 14,009)
+//  test itoa_u32_std                    ... bench:     410,117 ns/iter (+/- 15,781)
+//  test itoa_u64_heterogeneous_itoa     ... bench:     399,933 ns/iter (+/- 9,702)
+//  test itoa_u64_heterogeneous_lexical  ... bench:     348,971 ns/iter (+/- 5,901)
+//  test itoa_u64_heterogeneous_std      ... bench:     928,328 ns/iter (+/- 27,413)
+//  test itoa_u64_itoa                   ... bench:     205,365 ns/iter (+/- 20,925)
+//  test itoa_u64_lexical                ... bench:     187,850 ns/iter (+/- 5,501)
+//  test itoa_u64_simple_itoa            ... bench:      91,360 ns/iter (+/- 3,417)
+//  test itoa_u64_simple_lexical         ... bench:      43,714 ns/iter (+/- 771)
+//  test itoa_u64_simple_std             ... bench:     373,320 ns/iter (+/- 6,293)
+//  test itoa_u64_std                    ... bench:     489,783 ns/iter (+/- 27,719)
+//  test itoa_u128_heterogeneous_itoa    ... bench:   2,313,010 ns/iter (+/- 56,841)
+//  test itoa_u128_heterogeneous_lexical ... bench:   2,219,170 ns/iter (+/- 61,161)
+//  test itoa_u128_heterogeneous_std     ... bench:  15,076,380 ns/iter (+/- 206,851)
+//  test itoa_u128_itoa                  ... bench:   2,084,005 ns/iter (+/- 55,530)
+//  test itoa_u128_lexical               ... bench:   2,056,008 ns/iter (+/- 76,115)
+//  test itoa_u128_simple_itoa           ... bench:     112,675 ns/iter (+/- 6,788)
+//  test itoa_u128_simple_lexical        ... bench:      59,320 ns/iter (+/- 2,386)
+//  test itoa_u128_simple_std            ... bench:     365,819 ns/iter (+/- 17,862)
+//  test itoa_u128_std                   ... bench:  14,556,649 ns/iter (+/- 238,244)
+//  ```
+
+// Code the generate the benchmark plot:
+//  import numpy as np
+//  import pandas as pd
+//  import matplotlib.pyplot as plt
+//  plt.style.use('ggplot')
+//  lexical = np.array([55072, 51219, 120378, 187850, 2056008, 81346, 102664, 149340, 230283, 2052915]) / 1e3
+//  itoa = np.array([105066, 90015, 114494, 205365, 2084005, 126392, 142794, 173478, 198176, 2047257]) / 1e3
+//  rustcore = np.array([376625, 385722, 410117, 489783, 14556649, 414715, 447581, 475189, 527589, 14600861]) / 1e3
+//  index = ["u8", "u16", "u32", "u64", "u128", "i8", "i16", "i32", "i64", "i128"]
+//  df = pd.DataFrame({'lexical': lexical, 'itoa': itoa, 'rustcore': rustcore}, index = index, columns=['lexical', 'itoa', 'rustcore'])
+//  ax = df.plot.bar(rot=0, figsize=(16, 8), fontsize=14, color=['#E24A33', '#988ED5', '#348ABD'])
+//  ax.set_ylabel("ms/iter")
+//  ax.set_yscale('log')
+//  ax.figure.tight_layout()
+//  ax.legend(loc=2, prop={'size': 14})
+//  plt.show()
+
+use crate::util::*;
+
+// Lookup table for optimized base10 itoa.
+const TABLE: &[u8] = &DIGIT_TO_BASE10_SQUARED;
+
+// DIGIT COUNT
+// -----------
+
+// Hyper-optimized integer formatters using bit-twiddling tricks for
+// base10. These are meant to be correct, however, they use bit-twiddling
+// tricks so they may not be very legible.
+
+// Calculate the number of leading 0s.
+macro_rules! cltz {
+    ($value:ident) => {
+        $value.leading_zeros().as_usize()
+    };
+}
+
+// Calculate the offset where the digits were first written.
+macro_rules! calculate_offset {
+    ($value:ident, $digits:ident, $max_digits:expr, $size:expr) => ({
+        // Get the log2 of the value to estimate the log10 quickly.
+        // log2(0) is undefined, always ensure 1 bit is set.
+        let value = $value | 1;
+        let log2 = $size - cltz!(value);
+
+        // Estimate log10(value) to calculate number of digits.
+        // Put in safe guards so we always have at least 1 digit.
+        // Our magic numbers are:
+        //  1233 / 2^12 == log10(2)
+        // These magic numbers are valid for any value <= 2**18,
+        // which encompasses all offsets (<= 40).
+        let digits = (log2 * 1233) >> 12;
+        let mut offset = $max_digits - digits - 1;
+        debug_assert!(offset < $digits.len());
+        if digits != 0 && unchecked_index!($digits[offset]) == b'0' {
+            offset += 1;
+        }
+
+        offset
+    });
+}
+
+// INDEXING
+// --------
+
+// Convert sequential values to index.
+macro_rules! sequential_index {
+    ($v0:ident, $v1:ident) => (($v0 * 2 - $v1 * 200).as_usize());
+}
+
+// Convert singular value to index.
+macro_rules! last_index {
+    ($value:ident) => ((2 * $value).as_usize());
+}
+
+// WRITE
+// -----
+
+// Write N digits to buffer.
+
+// Write 1 digit to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_1(value: u32, buffer: &mut [u8]) {
+    unchecked_index_mut!(buffer[0] = digit_to_char(value));
+}}
+
+// Write 2 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_2(value: u32, buffer: &mut [u8]) {
+    let i_0 = last_index!(value);
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_0+0]));
+}}
+
+// Write 3 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_3(value: u32, buffer: &mut [u8]) {
+    let v_0 = value;
+    let v_1 = v_0 / 100;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = last_index!(v_1);
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_1+1]));
+}}
+
+// Write 4 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_4(value: u32, buffer: &mut [u8]) {
+    let v_0 = value;
+    let v_1 = v_0 / 100;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = last_index!(v_1);
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_1+0]));
+}}
+
+// Write 5 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_5(value: u32, buffer: &mut [u8]) {
+    let v_0 = value;
+    let v_1 = v_0 / 100;
+    let v_2 = v_1 / 100;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = sequential_index!(v_1, v_2);
+    let i_2 = last_index!(v_2);
+    unchecked_index_mut!(buffer[4] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_1+0]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_2+1]));
+}}
+
+// Write 10 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_10(value: u32, buffer: &mut [u8]) {
+    let t0 = value / 100000000;
+    let v_0 = value.wrapping_sub(t0.wrapping_mul(100000000));
+    let v_1 = v_0 / 100;
+    let v_2 = v_1 / 100;
+    let v_3 = v_2 / 100;
+    let v_4 = t0;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = sequential_index!(v_1, v_2);
+    let i_2 = sequential_index!(v_2, v_3);
+    let i_3 = last_index!(v_3);
+    let i_4 = last_index!(v_4);
+    unchecked_index_mut!(buffer[9] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[8] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[7] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[6] = unchecked_index!(TABLE[i_1+0]));
+    unchecked_index_mut!(buffer[5] = unchecked_index!(TABLE[i_2+1]));
+    unchecked_index_mut!(buffer[4] = unchecked_index!(TABLE[i_2+0]));
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_3+1]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_3+0]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_4+1]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_4+0]));
+}}
+
+// Write 15 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_15(value: u64, buffer: &mut [u8]) {
+    let t_0 = (value / 100000000).as_u32();
+    let v_0 = value.as_u32().wrapping_sub(t_0.wrapping_mul(100000000));
+    let v_1 = v_0 / 100;
+    let v_2 = v_1 / 100;
+    let v_3 = v_2 / 100;
+    let v_4 = t_0;
+    let v_5 = v_4 / 100;
+    let v_6 = v_5 / 100;
+    let v_7 = v_6 / 100;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = sequential_index!(v_1, v_2);
+    let i_2 = sequential_index!(v_2, v_3);
+    let i_3 = last_index!(v_3);
+    let i_4 = sequential_index!(v_4, v_5);
+    let i_5 = sequential_index!(v_5, v_6);
+    let i_6 = sequential_index!(v_6, v_7);
+    let i_7 = last_index!(v_7);
+    unchecked_index_mut!(buffer[14] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[13] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[12] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[11] = unchecked_index!(TABLE[i_1+0]));
+    unchecked_index_mut!(buffer[10] = unchecked_index!(TABLE[i_2+1]));
+    unchecked_index_mut!(buffer[9] = unchecked_index!(TABLE[i_2+0]));
+    unchecked_index_mut!(buffer[8] = unchecked_index!(TABLE[i_3+1]));
+    unchecked_index_mut!(buffer[7] = unchecked_index!(TABLE[i_3+0]));
+    unchecked_index_mut!(buffer[6] = unchecked_index!(TABLE[i_4+1]));
+    unchecked_index_mut!(buffer[5] = unchecked_index!(TABLE[i_4+0]));
+    unchecked_index_mut!(buffer[4] = unchecked_index!(TABLE[i_5+1]));
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_5+0]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_6+1]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_6+0]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_7+1]));
+}}
+
+// Write 19 digits to buffer (used internally for the u128 writers).
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_19(value: u64, buffer: &mut [u8]) {
+    let t_0 = (value / 100000000).as_u32();
+    let t_1 = (value / 10000000000000000).as_u32();
+    let v_0 = value.as_u32().wrapping_sub(t_0.wrapping_mul(100000000));
+    let v_1 = v_0 / 100;
+    let v_2 = v_1 / 100;
+    let v_3 = v_2 / 100;
+    let v_4 = t_0.wrapping_sub(t_1.wrapping_mul(100000000));
+    let v_5 = v_4 / 100;
+    let v_6 = v_5 / 100;
+    let v_7 = v_6 / 100;
+    let v_8 = t_1;
+    let v_9 = v_8 / 100;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = sequential_index!(v_1, v_2);
+    let i_2 = sequential_index!(v_2, v_3);
+    let i_3 = last_index!(v_3);
+    let i_4 = sequential_index!(v_4, v_5);
+    let i_5 = sequential_index!(v_5, v_6);
+    let i_6 = sequential_index!(v_6, v_7);
+    let i_7 = last_index!(v_7);
+    let i_8 = sequential_index!(v_8, v_9);
+    let i_9 = last_index!(v_9);
+    unchecked_index_mut!(buffer[18] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[17] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[16] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[15] = unchecked_index!(TABLE[i_1+0]));
+    unchecked_index_mut!(buffer[14] = unchecked_index!(TABLE[i_2+1]));
+    unchecked_index_mut!(buffer[13] = unchecked_index!(TABLE[i_2+0]));
+    unchecked_index_mut!(buffer[12] = unchecked_index!(TABLE[i_3+1]));
+    unchecked_index_mut!(buffer[11] = unchecked_index!(TABLE[i_3+0]));
+    unchecked_index_mut!(buffer[10] = unchecked_index!(TABLE[i_4+1]));
+    unchecked_index_mut!(buffer[9] = unchecked_index!(TABLE[i_4+0]));
+    unchecked_index_mut!(buffer[8] = unchecked_index!(TABLE[i_5+1]));
+    unchecked_index_mut!(buffer[7] = unchecked_index!(TABLE[i_5+0]));
+    unchecked_index_mut!(buffer[6] = unchecked_index!(TABLE[i_6+1]));
+    unchecked_index_mut!(buffer[5] = unchecked_index!(TABLE[i_6+0]));
+    unchecked_index_mut!(buffer[4] = unchecked_index!(TABLE[i_7+1]));
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_7+0]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_8+1]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_8+0]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_9+1]));
+}}
+
+// Write 20 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_20(value: u64, buffer: &mut [u8]) {
+    let t_0 = (value / 100000000).as_u32();
+    let t_1 = (value / 10000000000000000).as_u32();
+    let v_0 = value.as_u32().wrapping_sub(t_0.wrapping_mul(100000000));
+    let v_1 = v_0 / 100;
+    let v_2 = v_1 / 100;
+    let v_3 = v_2 / 100;
+    let v_4 = t_0.wrapping_sub(t_1.wrapping_mul(100000000));
+    let v_5 = v_4 / 100;
+    let v_6 = v_5 / 100;
+    let v_7 = v_6 / 100;
+    let v_8 = t_1;
+    let v_9 = v_8 / 100;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = sequential_index!(v_1, v_2);
+    let i_2 = sequential_index!(v_2, v_3);
+    let i_3 = last_index!(v_3);
+    let i_4 = sequential_index!(v_4, v_5);
+    let i_5 = sequential_index!(v_5, v_6);
+    let i_6 = sequential_index!(v_6, v_7);
+    let i_7 = last_index!(v_7);
+    let i_8 = sequential_index!(v_8, v_9);
+    let i_9 = last_index!(v_9);
+    unchecked_index_mut!(buffer[19] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[18] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[17] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[16] = unchecked_index!(TABLE[i_1+0]));
+    unchecked_index_mut!(buffer[15] = unchecked_index!(TABLE[i_2+1]));
+    unchecked_index_mut!(buffer[14] = unchecked_index!(TABLE[i_2+0]));
+    unchecked_index_mut!(buffer[13] = unchecked_index!(TABLE[i_3+1]));
+    unchecked_index_mut!(buffer[12] = unchecked_index!(TABLE[i_3+0]));
+    unchecked_index_mut!(buffer[11] = unchecked_index!(TABLE[i_4+1]));
+    unchecked_index_mut!(buffer[10] = unchecked_index!(TABLE[i_4+0]));
+    unchecked_index_mut!(buffer[9] = unchecked_index!(TABLE[i_5+1]));
+    unchecked_index_mut!(buffer[8] = unchecked_index!(TABLE[i_5+0]));
+    unchecked_index_mut!(buffer[7] = unchecked_index!(TABLE[i_6+1]));
+    unchecked_index_mut!(buffer[6] = unchecked_index!(TABLE[i_6+0]));
+    unchecked_index_mut!(buffer[5] = unchecked_index!(TABLE[i_7+1]));
+    unchecked_index_mut!(buffer[4] = unchecked_index!(TABLE[i_7+0]));
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_8+1]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_8+0]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_9+1]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_9+0]));
+}}
+
+// Write 25 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_25(value: u128, buffer: &mut [u8]) {
+    // Split value into high 6 and low 19.
+    let (high, low) = u128_divrem_1e19(value);
+
+    // Write low 19 to the end of the buffer.
+    write_19(low, &mut unchecked_index_mut!(buffer[6..]));
+
+    // Write high 6 to the front of the buffer.
+    let value = high.as_u64();
+    let v_0 = value.as_u32();
+    let v_1 = v_0 / 100;
+    let v_2 = v_1 / 100;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = sequential_index!(v_1, v_2);
+    let i_2 = last_index!(v_2);
+    unchecked_index_mut!(buffer[5] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[4] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_1+0]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_2+1]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_2+0]));
+}}
+
+// Write 29 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_29(value: u128, buffer: &mut [u8]) {
+    // Split value into high 10 and low 19.
+    let (high, low) = u128_divrem_1e19(value);
+
+    // Write low 19 to the end of the buffer.
+    write_19(low, &mut unchecked_index_mut!(buffer[10..]));
+
+    // Write high 10 to the front of the buffer.
+    let value = high.as_u64();
+    let t_0 = (value / 100000000).as_u32();
+    let v_0 = value.as_u32().wrapping_sub(t_0.wrapping_mul(100000000));
+    let v_1 = v_0 / 100;
+    let v_2 = v_1 / 100;
+    let v_3 = v_2 / 100;
+    let v_4 = t_0;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = sequential_index!(v_1, v_2);
+    let i_2 = sequential_index!(v_2, v_3);
+    let i_3 = last_index!(v_3);
+    let i_4 = last_index!(v_4);
+    unchecked_index_mut!(buffer[9] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[8] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[7] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[6] = unchecked_index!(TABLE[i_1+0]));
+    unchecked_index_mut!(buffer[5] = unchecked_index!(TABLE[i_2+1]));
+    unchecked_index_mut!(buffer[4] = unchecked_index!(TABLE[i_2+0]));
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_3+1]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_3+0]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_4+1]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_4+0]));
+}}
+
+// Write 34 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_34(value: u128, buffer: &mut [u8]) {
+    // Split value into high 15 and low 19.
+    let (high, low) = u128_divrem_1e19(value);
+
+    // Write low 19 to the end of the buffer.
+    write_19(low, &mut unchecked_index_mut!(buffer[15..]));
+
+    // Write high 15 to the front of the buffer.
+    let value = high.as_u64();
+    let t_0 = (value / 100000000).as_u32();
+    let v_0 = value.as_u32().wrapping_sub(t_0.wrapping_mul(100000000));
+    let v_1 = v_0 / 100;
+    let v_2 = v_1 / 100;
+    let v_3 = v_2 / 100;
+    let v_4 = t_0;
+    let v_5 = v_4 / 100;
+    let v_6 = v_5 / 100;
+    let v_7 = v_6 / 100;
+    let i_0 = sequential_index!(v_0, v_1);
+    let i_1 = sequential_index!(v_1, v_2);
+    let i_2 = sequential_index!(v_2, v_3);
+    let i_3 = last_index!(v_3);
+    let i_4 = sequential_index!(v_4, v_5);
+    let i_5 = sequential_index!(v_5, v_6);
+    let i_6 = sequential_index!(v_6, v_7);
+    let i_7 = last_index!(v_7);
+    unchecked_index_mut!(buffer[14] = unchecked_index!(TABLE[i_0+1]));
+    unchecked_index_mut!(buffer[13] = unchecked_index!(TABLE[i_0+0]));
+    unchecked_index_mut!(buffer[12] = unchecked_index!(TABLE[i_1+1]));
+    unchecked_index_mut!(buffer[11] = unchecked_index!(TABLE[i_1+0]));
+    unchecked_index_mut!(buffer[10] = unchecked_index!(TABLE[i_2+1]));
+    unchecked_index_mut!(buffer[9] = unchecked_index!(TABLE[i_2+0]));
+    unchecked_index_mut!(buffer[8] = unchecked_index!(TABLE[i_3+1]));
+    unchecked_index_mut!(buffer[7] = unchecked_index!(TABLE[i_3+0]));
+    unchecked_index_mut!(buffer[6] = unchecked_index!(TABLE[i_4+1]));
+    unchecked_index_mut!(buffer[5] = unchecked_index!(TABLE[i_4+0]));
+    unchecked_index_mut!(buffer[4] = unchecked_index!(TABLE[i_5+1]));
+    unchecked_index_mut!(buffer[3] = unchecked_index!(TABLE[i_5+0]));
+    unchecked_index_mut!(buffer[2] = unchecked_index!(TABLE[i_6+1]));
+    unchecked_index_mut!(buffer[1] = unchecked_index!(TABLE[i_6+0]));
+    unchecked_index_mut!(buffer[0] = unchecked_index!(TABLE[i_7+1]));
+}}
+
+// Write 39 digits to buffer.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn write_39(value: u128, buffer: &mut [u8]) {
+    // Split value into high 20 and low 19.
+    let (high, low) = u128_divrem_1e19(value);
+
+    // Write low 19 to the end of the buffer.
+    write_19(low, &mut unchecked_index_mut!(buffer[20..]));
+
+    // Split the value into the high 1 and mid 19.
+    let (high, mid) = u128_divrem_1e19(high);
+
+    // Write mid 19 to the middle of the buffer.
+    write_19(mid, &mut unchecked_index_mut!(buffer[1..]));
+
+    // Write high 1 to the front of the buffer.
+    unchecked_index_mut!(buffer[0] = digit_to_char(high));
+}}
+
+// WRITE RAMGE
+// -----------
+
+// Write range of digits to buffer, optionally using a temporary buffer
+// and copying the digits over.
+
+// Write 1-3 digits (from a u8 value).
+perftools_inline!{
+fn write_1_3(value: u32, buffer: &mut [u8]) -> usize {
+    if value < 10 {
+        write_1(value, buffer);
+        1
+    } else if value < 100 {
+        write_2(value, buffer);
+        2
+    } else {
+        write_3(value, buffer);
+        3
+    }
+}}
+
+// Write 1-3 digits (from a u16 value).
+perftools_inline!{
+fn write_1_5(value: u32, buffer: &mut [u8]) -> usize {
+    if value < 10 {
+        write_1(value, buffer);
+        1
+    } else if value < 100 {
+        write_2(value, buffer);
+        2
+    } else if value < 1000 {
+        write_3(value, buffer);
+        3
+    } else if value < 10000 {
+        write_4(value, buffer);
+        4
+    } else {
+        write_5(value, buffer);
+        5
+    }
+}}
+
+// Write 5-10 digits (from a u32 value).
+perftools_inline!{
+fn write_5_10(value: u32, buffer: &mut [u8]) -> usize {
+    // Use a temporary buffer so we only need a single code path.
+    let mut tmp_buf: [u8; 16] = [b'0'; 16];
+    let digits = &mut tmp_buf[..10];
+    write_10(value, digits);
+    let offset = calculate_offset!(value, digits, 10, 32);
+    copy_to_dst(buffer, &unchecked_index!(digits[offset..]))
+}}
+
+// Write 10-15 digits (from a u64 value).
+perftools_inline!{
+fn write_10_15(value: u64, buffer: &mut [u8]) -> usize {
+    // Use a temporary buffer so we only need a single code path.
+    let mut tmp_buf: [u8; 32] = [b'0'; 32];
+    let digits = &mut tmp_buf[..15];
+    write_15(value, digits);
+    let offset = calculate_offset!(value, digits, 15, 64);
+    copy_to_dst(buffer, &unchecked_index!(digits[offset..]))
+}}
+
+// Write 15-20 digits (from a u64 value).
+perftools_inline!{
+fn write_15_20(value: u64, buffer: &mut [u8]) -> usize {
+    // Use a temporary buffer so we only need a single code path.
+    let mut tmp_buf: [u8; 32] = [b'0'; 32];
+    let digits = &mut tmp_buf[..20];
+    write_20(value, digits);
+    let offset = calculate_offset!(value, digits, 20, 64);
+    copy_to_dst(buffer, &unchecked_index!(digits[offset..]))
+}}
+
+// Write 20-25 digits (from a u64 value).
+perftools_inline!{
+fn write_20_25(value: u128, buffer: &mut [u8]) -> usize {
+    // Use a temporary buffer so we only need a single code path.
+    let mut tmp_buf: [u8; 64] = [b'0'; 64];
+    let digits = &mut tmp_buf[..25];
+    write_25(value, digits);
+    let offset = calculate_offset!(value, digits, 25, 128);
+    copy_to_dst(buffer, &unchecked_index!(digits[offset..]))
+}}
+
+// Write 25-29 digits (from a u64 value).
+perftools_inline!{
+fn write_25_29(value: u128, buffer: &mut [u8]) -> usize {
+    // Use a temporary buffer so we only need a single code path.
+    let mut tmp_buf: [u8; 64] = [b'0'; 64];
+    let digits = &mut tmp_buf[..29];
+    write_29(value, digits);
+    let offset = calculate_offset!(value, digits, 29, 128);
+    copy_to_dst(buffer, &unchecked_index!(digits[offset..]))
+}}
+
+// Write 29-34 digits (from a u64 value).
+perftools_inline!{
+fn write_29_34(value: u128, buffer: &mut [u8]) -> usize {
+    // Use a temporary buffer so we only need a single code path.
+    let mut tmp_buf: [u8; 64] = [b'0'; 64];
+    let digits = &mut tmp_buf[..34];
+    write_34(value, digits);
+    let offset = calculate_offset!(value, digits, 34, 128);
+    copy_to_dst(buffer, &unchecked_index!(digits[offset..]))
+}}
+
+// Write 34-39 digits (from a u64 value).
+perftools_inline!{
+fn write_34_39(value: u128, buffer: &mut [u8]) -> usize {
+    // Use a temporary buffer so we only need a single code path.
+    let mut tmp_buf: [u8; 64] = [b'0'; 64];
+    let digits = &mut tmp_buf[..39];
+    write_39(value, digits);
+    let offset = calculate_offset!(value, digits, 39, 128);
+    copy_to_dst(buffer, &unchecked_index!(digits[offset..]))
+}}
+
+// FORMATTERS
+// ----------
+
+// Each flow-path should have no more than 5 comparisons, or
+// else we're poorly optimizing our code.
+// Use the number of leading zeros to minimize the number
+// of jumps we have possible.
+
+// Internal integer formatter for u8.
+perftools_inline!{
+fn u8toa(value: u8, buffer: &mut [u8]) -> usize {
+    write_1_3(value.as_u32(), buffer)
+}}
+
+// Internal integer formatter for u16.
+perftools_inline!{
+fn u16toa(value: u16, buffer: &mut [u8]) -> usize {
+    write_1_5(value.as_u32(), buffer)
+}}
+
+// Internal integer formatter for u32.
+perftools_inline!{
+fn u32toa(value: u32, buffer: &mut [u8]) -> usize {
+    if value >> 16 == 0 {
+        // [0, 2^16 - 1]
+        write_1_5(value, buffer)
+    } else {
+        // [2^16, 2^32 - 1]
+        write_5_10(value, buffer)
+    }
+}}
+
+// Internal integer formatter for u64.
+perftools_inline!{
+fn u64toa(value: u64, buffer: &mut [u8]) -> usize {
+    if value >> 16 == 0 {
+        // [0, 2^16 - 1]
+        write_1_5(value.as_u32(), buffer)
+    } else if value >> 32 == 0 {
+        // [2^16, 2^32 - 1]
+        write_5_10(value.as_u32(), buffer)
+    } else if value >> 48 == 0 {
+        // [2^32, 2^48 - 1]
+        write_10_15(value, buffer)
+    } else {
+        // [2^48, 2^64 - 1]
+        write_15_20(value, buffer)
+    }
+}}
+
+// Internal integer formatter for u128.
+perftools_inline!{
+fn u128toa(value: u128, buffer: &mut [u8]) -> usize {
+    if value >> 16 == 0 {
+        // [0, 2^16 - 1]
+        write_1_5(value.as_u32(), buffer)
+    } else if value >> 32 == 0 {
+        // [2^16, 2^32 - 1]
+        write_5_10(value.as_u32(), buffer)
+    } else if value >> 48 == 0 {
+        // [2^32, 2^48 - 1]
+        write_10_15(value.as_u64(), buffer)
+    } else if value >> 64 == 0 {
+        // [2^48, 2^64 - 1]
+        write_15_20(value.as_u64(), buffer)
+    } else if value >> 80 == 0 {
+        // [2^64, 2^80 - 1]
+        write_20_25(value, buffer)
+    } else if value >> 96 == 0 {
+        // [2^80, 2^96 - 1]
+        write_25_29(value, buffer)
+    } else if value >> 112 == 0 {
+        // [2^96, 2^112 - 1]
+        write_29_34(value, buffer)
+    } else {
+        // [2^112, 2^128 - 1]
+        write_34_39(value, buffer)
+    }
+}}
+
+cfg_if! {
+if #[cfg(target_pointer_width = "16")] {
+    perftools_inline!{
+    fn usizetoa(value: usize, buffer: &mut [u8]) -> usize {
+        u16toa(value.as_u16(), buffer)
+    }}
+} else if #[cfg(target_pointer_width = "32")] {
+    perftools_inline!{
+    fn usizetoa(value: usize, buffer: &mut [u8]) -> usize {
+        u32toa(value.as_u32(), buffer)
+    }}
+} else if #[cfg(target_pointer_width = "64")] {
+    perftools_inline!{
+    fn usizetoa(value: usize, buffer: &mut [u8]) -> usize {
+        u64toa(value.as_u64(), buffer)
+    }}
+}} // cfg_if
+
+// TRAIT
+// -----
+
+pub(crate) trait Decimal {
+    // Export integer to string.
+    fn decimal(self, buffer: &mut [u8]) -> usize;
+}
+
+// Implement decimal for type.
+macro_rules! decimal_impl {
+    ($t:ty, $cb:ident) => (
+        impl Decimal for $t {
+            perftools_inline_always!{
+            fn decimal(self, buffer: &mut [u8]) -> usize {
+                $cb(self, buffer)
+            }}
+        }
+    );
+}
+
+decimal_impl!(u8, u8toa);
+decimal_impl!(u16, u16toa);
+decimal_impl!(u32, u32toa);
+decimal_impl!(u64, u64toa);
+decimal_impl!(u128, u128toa);
+decimal_impl!(usize, usizetoa);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/generic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/generic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/generic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/generic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,279 @@
+//! Mildly fast, generic, lexical integer-to-string conversion routines.
+
+//  The following benchmarks were run on an "Intel(R) Core(TM) i7-6560U
+//  CPU @ 2.20GHz" CPU, on Fedora 28, Linux kernel version 4.18.16-200
+//  (x86-64), using the lexical formatter, `itoa::write()` or `x.to_string()`,
+//  avoiding any inefficiencies in Rust string parsing for `format!(...)`
+//  or `write!()` macros. The code was compiled with LTO and at an optimization
+//  level of 3.
+//
+//  The benchmarks with `std` were compiled using "rustc 1.32.0
+// (9fda7c223 2019-01-16".
+//
+//  The benchmark code may be found `benches/itoa.rs`.
+//
+//  # Benchmarks
+//
+//  | Type  |  lexical (ns/iter) | libcore (ns/iter)     | Relative Increase |
+//  |:-----:|:------------------:|:---------------------:|:-----------------:|
+//  | u8    | 122,329            | 413,025               | 3.38x             |
+//  | u16   | 119,888            | 405,945               | 3.41x             |
+//  | u32   | 121,150            | 423,174               | 3.49x             |
+//  | u64   | 165,609            | 531,862               | 3.21x             |
+//  | i8    | 151,478            | 458,374               | 3.03x             |
+//  | i16   | 153,211            | 489,010               | 3.19x             |
+//  | i32   | 149,433            | 517,710               | 3.46x             |
+//  | i64   | 195,575            | 553,387               | 2.83x             |
+//
+//  # Raw Benchmarks
+//
+//  ```text
+//  test itoa_i8_itoa     ... bench:     130,969 ns/iter (+/- 7,420)
+//  test itoa_i8_lexical  ... bench:     151,478 ns/iter (+/- 7,510)
+//  test itoa_i8_std      ... bench:     458,374 ns/iter (+/- 26,663)
+//  test itoa_i16_itoa    ... bench:     143,344 ns/iter (+/- 9,495)
+//  test itoa_i16_lexical ... bench:     153,211 ns/iter (+/- 7,365)
+//  test itoa_i16_std     ... bench:     489,010 ns/iter (+/- 25,319)
+//  test itoa_i32_itoa    ... bench:     176,494 ns/iter (+/- 9,596)
+//  test itoa_i32_lexical ... bench:     149,433 ns/iter (+/- 5,803)
+//  test itoa_i32_std     ... bench:     517,710 ns/iter (+/- 38,439)
+//  test itoa_i64_itoa    ... bench:     205,055 ns/iter (+/- 12,436)
+//  test itoa_i64_lexical ... bench:     195,575 ns/iter (+/- 8,007)
+//  test itoa_i64_std     ... bench:     553,387 ns/iter (+/- 26,731)
+//  test itoa_u8_itoa     ... bench:     112,529 ns/iter (+/- 4,514)
+//  test itoa_u8_lexical  ... bench:     122,329 ns/iter (+/- 9,902)
+//  test itoa_u8_std      ... bench:     413,025 ns/iter (+/- 30,262)
+//  test itoa_u16_itoa    ... bench:      91,936 ns/iter (+/- 5,405)
+//  test itoa_u16_lexical ... bench:     119,888 ns/iter (+/- 6,089)
+//  test itoa_u16_std     ... bench:     405,945 ns/iter (+/- 24,104)
+//  test itoa_u32_itoa    ... bench:     161,679 ns/iter (+/- 6,719)
+//  test itoa_u32_lexical ... bench:     121,150 ns/iter (+/- 7,580)
+//  test itoa_u32_std     ... bench:     423,174 ns/iter (+/- 21,801)
+//  test itoa_u64_itoa    ... bench:     203,847 ns/iter (+/- 18,512)
+//  test itoa_u64_lexical ... bench:     165,609 ns/iter (+/- 8,620)
+//  test itoa_u64_std     ... bench:     531,862 ns/iter (+/- 31,223)
+//  ```
+
+// Code the generate the benchmark plot:
+//  import numpy as np
+//  import pandas as pd
+//  import matplotlib.pyplot as plt
+//  plt.style.use('ggplot')
+//  lexical = np.array([122329, 119888, 121150, 165609, 151478, 153211, 149433, 195575]) / 1e6
+//  itoa = np.array([112529, 91936, 161679, 203847, 130969, 143344, 176494, 205055]) / 1e6
+//  rustcore = np.array([413025, 405945, 423174, 531862, 458374, 489010, 517710, 553387]) / 1e6
+//  index = ["u8", "u16", "u32", "u64", "i8", "i16", "i32", "i64"]
+//  df = pd.DataFrame({'lexical': lexical, 'itoa': itoa, 'rustcore': rustcore}, index = index, columns=['lexical', 'itoa', 'rustcore'])
+//  ax = df.plot.bar(rot=0, figsize=(16, 8), fontsize=14, color=['#E24A33', '#988ED5', '#348ABD'])
+//  ax.set_ylabel("ms/iter")
+//  ax.figure.tight_layout()
+//  ax.legend(loc=2, prop={'size': 14})
+//  plt.show()
+
+use crate::util::*;
+
+// Generic itoa algorithm.
+macro_rules! generic_algorithm {
+    ($value:ident, $radix:ident, $buffer:ident, $t:tt, $table:ident, $index:ident, $radix2:ident, $radix4:ident) => ({
+        while $value >= $radix4 {
+            let r = $value % $radix4;
+            $value /= $radix4;
+            let r1 = ($t::TWO * (r / $radix2)).as_usize();
+            let r2 = ($t::TWO * (r % $radix2)).as_usize();
+
+            // This is always safe, since the table is 2*radix^2, and
+            // r1 and r2 must be in the range [0, 2*radix^2-1), since the maximum
+            // value of r is `radix4-1`, which must have a div and r
+            // in the range [0, radix^2-1).
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = unchecked_index!($table[r2+1]));
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = unchecked_index!($table[r2]));
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = unchecked_index!($table[r1+1]));
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = unchecked_index!($table[r1]));
+        }
+
+        // Decode 2 digits at a time.
+        while $value >= $radix2 {
+            let r = ($t::TWO * ($value % $radix2)).as_usize();
+            $value /= $radix2;
+
+            // This is always safe, since the table is 2*radix^2, and
+            // r must be in the range [0, 2*radix^2-1).
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = unchecked_index!($table[r+1]));
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = unchecked_index!($table[r]));
+        }
+
+        // Decode last 2 digits.
+        if $value < $radix {
+            // This is always safe, since value < radix, so it must be < 36.
+            // Digit must be <= 36.
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = digit_to_char($value));
+            //*iter.next().unwrap() = digit_to_char(value);
+        } else {
+            let r = ($t::TWO * $value).as_usize();
+            // This is always safe, since the table is 2*radix^2, and the value
+            // must <= radix^2, so rem must be in the range [0, 2*radix^2-1).
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = unchecked_index!($table[r+1]));
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = unchecked_index!($table[r]));
+        }
+    });
+}
+
+// Get lookup table for 2 digit radix conversions.
+perftools_inline!{
+#[cfg(feature = "radix")]
+fn get_table(radix: u32) -> &'static [u8] {
+    match radix {
+        2   => &DIGIT_TO_BASE2_SQUARED,
+        3   => &DIGIT_TO_BASE3_SQUARED,
+        4   => &DIGIT_TO_BASE4_SQUARED,
+        5   => &DIGIT_TO_BASE5_SQUARED,
+        6   => &DIGIT_TO_BASE6_SQUARED,
+        7   => &DIGIT_TO_BASE7_SQUARED,
+        8   => &DIGIT_TO_BASE8_SQUARED,
+        9   => &DIGIT_TO_BASE9_SQUARED,
+        10  => &DIGIT_TO_BASE10_SQUARED,
+        11  => &DIGIT_TO_BASE11_SQUARED,
+        12  => &DIGIT_TO_BASE12_SQUARED,
+        13  => &DIGIT_TO_BASE13_SQUARED,
+        14  => &DIGIT_TO_BASE14_SQUARED,
+        15  => &DIGIT_TO_BASE15_SQUARED,
+        16  => &DIGIT_TO_BASE16_SQUARED,
+        17  => &DIGIT_TO_BASE17_SQUARED,
+        18  => &DIGIT_TO_BASE18_SQUARED,
+        19  => &DIGIT_TO_BASE19_SQUARED,
+        20  => &DIGIT_TO_BASE20_SQUARED,
+        21  => &DIGIT_TO_BASE21_SQUARED,
+        22  => &DIGIT_TO_BASE22_SQUARED,
+        23  => &DIGIT_TO_BASE23_SQUARED,
+        24  => &DIGIT_TO_BASE24_SQUARED,
+        25  => &DIGIT_TO_BASE25_SQUARED,
+        26  => &DIGIT_TO_BASE26_SQUARED,
+        27  => &DIGIT_TO_BASE27_SQUARED,
+        28  => &DIGIT_TO_BASE28_SQUARED,
+        29  => &DIGIT_TO_BASE29_SQUARED,
+        30  => &DIGIT_TO_BASE30_SQUARED,
+        31  => &DIGIT_TO_BASE31_SQUARED,
+        32  => &DIGIT_TO_BASE32_SQUARED,
+        33  => &DIGIT_TO_BASE33_SQUARED,
+        34  => &DIGIT_TO_BASE34_SQUARED,
+        35  => &DIGIT_TO_BASE35_SQUARED,
+        36  => &DIGIT_TO_BASE36_SQUARED,
+        _   => unreachable!(),
+    }
+}}
+
+// Get lookup table for 2 digit radix conversions.
+perftools_inline!{
+#[cfg(not(feature = "radix"))]
+fn get_table(_: u32) -> &'static [u8] {
+   &DIGIT_TO_BASE10_SQUARED
+}}
+
+// Optimized implementation for radix-N numbers.
+// Precondition: `value` must be non-negative and mutable.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn generic<T>(mut value: T, radix: u32, table: &[u8], buffer: &mut [u8])
+    -> usize
+    where T: UnsignedInteger
+{
+    // Both forms of unchecked indexing cannot overflow.
+    // The table always has 2*radix^2 elements, so it must be a legal index.
+    // The buffer is ensured to have at least MAX_DIGITS or MAX_DIGITS_BASE10
+    // characters, which is the maximum number of digits an integer of
+    // that size may write.
+
+    // Use power-reduction to minimize the number of operations.
+    // Idea taken from "3 Optimization Tips for C++".
+    let radix: T = as_cast(radix);
+    let radix2 = radix * radix;
+    let radix4 = radix2 * radix2;
+
+    // Decode 4-digits at a time
+    let mut index = buffer.len();
+    generic_algorithm!(value, radix, buffer, T, table, index, radix2, radix4);
+    index
+}}
+
+// Optimized implementation for radix-N numbers.
+// Precondition:
+//  `value` must be non-negative and mutable.
+//  Buffer must be 0-initialized.
+perftools_inline!{
+#[allow(unused_unsafe)]
+fn generic_u128(value: u128, radix: u32, table: &[u8], buffer: &mut [u8])
+    -> usize
+{
+    // Both forms of unchecked indexing cannot overflow.
+    // The table always has 2*radix^2 elements, so it must be a legal index.
+    // The buffer is ensured to have at least MAX_DIGITS or MAX_DIGITS_BASE10
+    // characters, which is the maximum number of digits an integer of
+    // that size may write.
+
+    // Use power-reduction to minimize the number of operations.
+    // Idea taken from "3 Optimization Tips for C++".
+    let (divisor, digits_per_iter, d_cltz) = u128_divisor(radix);
+    let radix: u64 = as_cast(radix);
+    let radix2 = radix * radix;
+    let radix4 = radix2 * radix2;
+
+    // Decode 4-digits at a time.
+    // To deal with internal 0 values or values with internal 0 digits set,
+    // we store the starting index, and if not all digits are written,
+    // we just skip down `digits` digits for the next value.
+    let mut index = buffer.len();
+    let mut start_index = index;
+    let (value, mut low) = u128_divrem(value, divisor, d_cltz);
+    generic_algorithm!(low, radix, buffer, u64, table, index, radix2, radix4);
+    if value != 0 {
+        start_index -= digits_per_iter;
+        index = index.min(start_index);
+        let (value, mut mid) = u128_divrem(value, divisor, d_cltz);
+        generic_algorithm!(mid, radix, buffer, u64, table, index, radix2, radix4);
+
+        if value != 0 {
+            start_index -= digits_per_iter;
+            index = index.min(start_index);
+            let mut high = value as u64;
+            generic_algorithm!(high, radix, buffer, u64, table, index, radix2, radix4);
+        }
+    }
+    index
+}}
+
+pub(crate) trait Generic {
+    // Export integer to string.
+    fn generic(self, radix: u32, buffer: &mut [u8]) -> usize;
+}
+
+// Implement generic for type.
+macro_rules! generic_impl {
+    ($($t:ty)*) => ($(
+        impl Generic for $t {
+            perftools_inline_always!{
+            fn generic(self, radix: u32, buffer: &mut [u8]) -> usize {
+                let table = get_table(radix);
+                generic(self, radix, table, buffer)
+            }}
+        }
+    )*);
+}
+
+generic_impl! { u8 u16 u32 u64 usize }
+
+impl Generic for u128 {
+    perftools_inline_always!{
+    fn generic(self, radix: u32, buffer: &mut [u8]) -> usize {
+        let table = get_table(radix);
+        generic_u128(self, radix, table, buffer)
+    }}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+//! Integer-to-string formatting routines.
+
+// Hide internal implementation details.
+#[cfg(feature = "table")]
+mod decimal;
+
+#[cfg(all(feature = "table", feature = "radix"))]
+mod generic;
+
+#[cfg(not(feature = "table"))]
+mod naive;
+
+mod api;
+
+#[cfg(feature = "radix")]
+pub(crate) use self::api::itoa_positive;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/naive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/naive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/itoa/naive.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/itoa/naive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+//! Slow, simple lexical integer-to-string conversion routine.
+
+use crate::util::*;
+
+// Naive itoa algorithm.
+macro_rules! naive_algorithm {
+    ($value:ident, $radix:ident, $buffer:ident, $index:ident) => ({
+        while $value >= $radix {
+            let r = ($value % $radix).as_usize();
+            $value /= $radix;
+
+            // This is always safe, since r must be [0, radix).
+            $index -= 1;
+            unchecked_index_mut!($buffer[$index] = digit_to_char(r));
+        }
+
+        // Decode last digit.
+        let r = ($value % $radix).as_usize();
+        // This is always safe, since r must be [0, radix).
+        $index -= 1;
+        unchecked_index_mut!($buffer[$index] = digit_to_char(r));
+    });
+}
+
+// Naive implementation for radix-N numbers.
+// Precondition: `value` must be non-negative and mutable.
+perftools_inline!{
+fn naive<T>(mut value: T, radix: u32, buffer: &mut [u8])
+    -> usize
+    where T: UnsignedInteger
+{
+    // Decode all but last digit, 1 at a time.
+    let mut index = buffer.len();
+    let radix: T = as_cast(radix);
+    naive_algorithm!(value, radix, buffer, index);
+    index
+}}
+
+pub(crate) trait Naive {
+    // Export integer to string.
+    fn naive(self, radix: u32, buffer: &mut [u8]) -> usize;
+}
+
+// Implement naive for type.
+macro_rules! naive_impl {
+    ($($t:ty)*) => ($(
+        impl Naive for $t {
+            perftools_inline_always!{
+            fn naive(self, radix: u32, buffer: &mut [u8]) -> usize {
+                naive(self, radix, buffer)
+            }}
+        }
+    )*);
+}
+
+naive_impl! { u8 u16 u32 u64 usize }
+
+// Naive implementation for 128-bit radix-N numbers.
+// Precondition: `value` must be non-negative and mutable.
+perftools_inline!{
+fn naive_u128(value: u128, radix: u32, buffer: &mut [u8])
+    -> usize
+{
+    // Decode all but last digit, 1 at a time.
+    let (divisor, digits_per_iter, d_cltz) = u128_divisor(radix);
+    let radix: u64 = as_cast(radix);
+
+    // To deal with internal 0 values or values with internal 0 digits set,
+    // we store the starting index, and if not all digits are written,
+    // we just skip down `digits` digits for the next value.
+    let mut index = buffer.len();
+    let mut start_index = index;
+    let (value, mut low) = u128_divrem(value, divisor, d_cltz);
+    naive_algorithm!(low, radix, buffer, index);
+    if value != 0 {
+        start_index -= digits_per_iter;
+        index = index.min(start_index);
+        let (value, mut mid) = u128_divrem(value, divisor, d_cltz);
+        naive_algorithm!(mid, radix, buffer, index);
+
+        if value != 0 {
+            start_index -= digits_per_iter;
+            index = index.min(start_index);
+            let mut high = value as u64;
+            naive_algorithm!(high, radix, buffer, index);
+        }
+    }
+    index
+}}
+
+impl Naive for u128 {
+    perftools_inline_always!{
+    fn naive(self, radix: u32, buffer: &mut [u8]) -> usize {
+        naive_u128(self, radix, buffer)
+    }}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,572 @@
+//! Fast lexical conversion routines for a no_std environment.
+//!
+//! lexical-core is a low-level API for number-to-string and
+//! string-to-number conversions, without requiring a system
+//! allocator. If you would like to use a convenient, high-level
+//! API, please look at [lexical](https://crates.io/crates/lexical)
+//! instead.
+//!
+//! # Getting Started
+//!
+//! ```rust
+//! extern crate lexical_core;
+//!
+//! // String to number using Rust slices.
+//! // The argument is the byte string parsed.
+//! let f: f32 = lexical_core::parse(b"3.5").unwrap();   // 3.5
+//! let i: i32 = lexical_core::parse(b"15").unwrap();    // 15
+//!
+//! // All lexical_core parsers are checked, they validate the
+//! // input data is entirely correct, and stop parsing when invalid data
+//! // is found, or upon numerical overflow.
+//! let r = lexical_core::parse::<u8>(b"256"); // Err(ErrorCode::Overflow.into())
+//! let r = lexical_core::parse::<u8>(b"1a5"); // Err(ErrorCode::InvalidDigit.into())
+//!
+//! // In order to extract and parse a number from a substring of the input
+//! // data, use `parse_partial`. These functions return the parsed value and
+//! // the number of processed digits, allowing you to extract and parse the
+//! // number in a single pass.
+//! let r = lexical_core::parse_partial::<i8>(b"3a5"); // Ok((3, 1))
+//!
+//! // If an insufficiently long buffer is passed, the serializer will panic.
+//! // PANICS
+//! let mut buf = [b'0'; 1];
+//! //let slc = lexical_core::write::<i64>(15, &mut buf);
+//!
+//! // In order to guarantee the buffer is long enough, always ensure there
+//! // are at least `T::FORMATTED_SIZE` bytes, which requires the
+//! // `lexical_core::Number` trait to be in scope.
+//! use lexical_core::Number;
+//! let mut buf = [b'0'; f64::FORMATTED_SIZE];
+//! let slc = lexical_core::write::<f64>(15.1, &mut buf);
+//! assert_eq!(slc, b"15.1");
+//!
+//! // When the `radix` feature is enabled, for decimal floats, using
+//! // `T::FORMATTED_SIZE` may significantly overestimate the space
+//! // required to format the number. Therefore, the
+//! // `T::FORMATTED_SIZE_DECIMAL` constants allow you to get a much
+//! // tighter bound on the space required.
+//! let mut buf = [b'0'; f64::FORMATTED_SIZE_DECIMAL];
+//! let slc = lexical_core::write::<f64>(15.1, &mut buf);
+//! assert_eq!(slc, b"15.1");
+//! ```
+//!
+//! # Conversion API
+//!
+//! **To String**
+//! - [`write`]
+#![cfg_attr(feature = "radix", doc = " - [`write_radix`]")]
+//!
+//! **From String**
+//! - [`parse`]
+#![cfg_attr(feature = "radix", doc = " - [`parse_radix`]")]
+#![cfg_attr(feature = "format", doc = " - [`parse_format`]")]
+#![cfg_attr(all(feature = "format", feature = "radix"), doc = " - [`parse_format_radix`]")]
+//! - [`parse_partial`]
+#![cfg_attr(feature = "radix", doc = " - [`parse_partial_radix`]")]
+#![cfg_attr(feature = "format", doc = " - [`parse_partial_format`]")]
+#![cfg_attr(all(feature = "format", feature = "radix"), doc = " - [`parse_partial_format_radix`]")]
+//! - [`parse_lossy`]
+#![cfg_attr(feature = "radix", doc = " - [`parse_lossy_radix`]")]
+#![cfg_attr(feature = "format", doc = " - [`parse_lossy_format`]")]
+#![cfg_attr(all(feature = "format", feature = "radix"), doc = " - [`parse_lossy_format_radix`]")]
+//! - [`parse_partial_lossy`]
+#![cfg_attr(feature = "radix", doc = " - [`parse_partial_lossy_radix`]")]
+#![cfg_attr(feature = "format", doc = " - [`parse_partial_lossy_format`]")]
+#![cfg_attr(all(feature = "format", feature = "radix"), doc = " - [`parse_partial_lossy_format_radix`]")]
+//!
+//! # Configuration Settings
+//!
+//! **Get Configuration**
+//! - [`get_exponent_default_char`]
+#![cfg_attr(feature = "radix", doc = " - [`get_exponent_backup_char`]")]
+#![cfg_attr(all(feature = "correct", feature = "rounding"), doc = " - [`get_float_rounding`]")]
+//! - [`get_nan_string`]
+//! - [`get_inf_string`]
+//! - [`get_infinity_string`]
+//!
+//! **Set Configuration**
+//! - [`set_exponent_default_char`]
+#![cfg_attr(feature = "radix", doc = " - [`set_exponent_backup_char`]")]
+#![cfg_attr(all(feature = "correct", feature = "rounding"), doc = " - [`set_float_rounding`]")]
+//! - [`set_nan_string`]
+//! - [`set_inf_string`]
+//! - [`set_infinity_string`]
+//!
+//! [`write`]: fn.write.html
+#![cfg_attr(feature = "radix", doc = " [`write_radix`]: fn.write_radix.html")]
+//! [`parse`]: fn.parse.html
+#![cfg_attr(feature = "radix", doc = " [`parse_radix`]: fn.parse_radix.html")]
+#![cfg_attr(feature = "format", doc = " [`parse_format`]: fn.parse_format.html")]
+#![cfg_attr(all(feature = "format", feature = "radix"), doc = " [`parse_format_radix`]: fn.parse_format_radix.html")]
+//! [`parse_partial`]: fn.parse_partial.html
+#![cfg_attr(feature = "radix", doc = " [`parse_partial_radix`]: fn.parse_partial_radix.html")]
+#![cfg_attr(feature = "format", doc = " [`parse_partial_format`]: fn.parse_partial_format.html")]
+#![cfg_attr(all(feature = "format", feature = "radix"), doc = " [`parse_partial_format_radix`]: fn.parse_partial_format_radix.html")]
+//! [`parse_lossy`]: fn.parse_lossy.html
+#![cfg_attr(feature = "radix", doc = " [`parse_lossy_radix`]: fn.parse_lossy_radix.html")]
+#![cfg_attr(feature = "format", doc = " [`parse_lossy_format`]: fn.parse_lossy_format.html")]
+#![cfg_attr(all(feature = "format", feature = "radix"), doc = " [`parse_lossy_format_radix`]: fn.parse_lossy_format_radix.html")]
+//! [`parse_partial_lossy`]: fn.parse_partial_lossy.html
+#![cfg_attr(feature = "radix", doc = " [`parse_partial_lossy_radix`]: fn.parse_partial_lossy_radix.html")]
+#![cfg_attr(feature = "format", doc = " [`parse_partial_lossy_format`]: fn.parse_partial_lossy_format.html")]
+#![cfg_attr(all(feature = "format", feature = "radix"), doc = " [`parse_partial_lossy_format_radix`]: fn.parse_partial_lossy_format_radix.html")]
+//!
+//! [`get_exponent_default_char`]: fn.get_exponent_default_char.html
+#![cfg_attr(feature = "radix", doc = " [`get_exponent_backup_char`]: fn.get_exponent_backup_char.html")]
+#![cfg_attr(all(feature = "correct", feature = "rounding"), doc = " [`get_float_rounding`]: fn.get_float_rounding.html")]
+//! [`get_nan_string`]: fn.get_nan_string.html
+//! [`get_inf_string`]: fn.get_inf_string.html
+//! [`get_infinity_string`]: fn.get_infinity_string.html
+//!
+//! [`set_exponent_default_char`]: fn.set_exponent_default_char.html
+#![cfg_attr(feature = "radix", doc = " [`set_exponent_backup_char`]: fn.set_exponent_backup_char.html")]
+#![cfg_attr(all(feature = "correct", feature = "rounding"), doc = " [`set_float_rounding`]: fn.set_float_rounding.html")]
+//! [`set_nan_string`]: fn.set_nan_string.html
+//! [`set_inf_string`]: fn.set_inf_string.html
+//! [`set_infinity_string`]: fn.set_infinity_string.html
+
+// silence warnings for unused doc comments
+#![allow(unused_doc_comments)]
+
+// FEATURES
+
+// Require intrinsics in a no_std context.
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(all(not(feature = "std"), not(feature = "libm")), feature(core_intrinsics))]
+
+// DEPENDENCIES
+
+#[macro_use]
+extern crate cfg_if;
+
+// Use vec if there is a system allocator, which we require only if
+// we're using the correct and radix features.
+#[cfg(all(not(feature = "std"), feature = "correct", feature = "radix"))]
+#[cfg_attr(test, macro_use)]
+extern crate alloc;
+
+// Use arrayvec for atof.
+#[cfg(feature = "correct")]
+extern crate arrayvec;
+
+// Ensure only one back-end is enabled.
+#[cfg(all(feature = "grisu3", feature = "ryu"))]
+compile_error!("Lexical only accepts one of the following backends: `grisu3` or `ryu`.");
+
+// Import the back-end, if applicable.
+cfg_if! {
+    if #[cfg(feature = "grisu3")] {
+        extern crate dtoa;
+    } else if #[cfg(feature = "ryu")] {
+        extern crate ryu;
+    }
+}  // cfg_if
+
+/// Facade around the core features for name mangling.
+pub(crate) mod lib {
+    #[cfg(feature = "std")]
+    pub(crate) use std::*;
+
+    #[cfg(not(feature = "std"))]
+    pub(crate) use core::*;
+
+    cfg_if! {
+        if #[cfg(all(feature = "correct", feature = "radix"))] {
+            #[cfg(feature = "std")]
+            pub(crate) use std::vec::Vec;
+
+            #[cfg(not(feature = "std"))]
+            pub(crate) use ::alloc::vec::Vec;
+        }
+    }  // cfg_if
+}   // lib
+
+// API
+
+// Hide implementation details
+#[macro_use]
+mod util;
+
+mod atof;
+mod atoi;
+mod float;
+mod ftoa;
+mod itoa;
+
+// Re-export configuration and utilities globally.
+pub use util::*;
+
+/// Write number to string.
+///
+/// Returns a subslice of the input buffer containing the written bytes,
+/// starting from the same address in memory as the input slice.
+///
+/// * `value`   - Number to serialize.
+/// * `bytes`   - Slice containing a numeric string.
+///
+/// # Panics
+///
+/// Panics if the buffer may not be large enough to hold the serialized
+/// number. In order to ensure the function will not panic, provide a
+/// buffer with at least `{integer}::FORMATTED_SIZE_DECIMAL` elements.
+///
+/// # Example
+///
+/// ```
+/// // import `Number` trait to get the `FORMATTED_SIZE_DECIMAL` of the number.
+/// use lexical_core::Number;
+///
+/// let mut buffer = [0u8; f32::FORMATTED_SIZE_DECIMAL];
+/// let float = 3.14159265359_f32;
+///
+/// lexical_core::write(float, &mut buffer);
+///
+/// assert_eq!(&buffer[0..9], b"3.1415927");
+/// ```
+///
+/// This will panic, because the buffer is not large enough:
+///
+/// ```should_panic
+/// // note: the buffer is only one byte large
+/// let mut buffer = [0u8; 1];
+/// let float = 3.14159265359_f32;
+///
+/// lexical_core::write(float, &mut buffer);
+/// ```
+#[inline]
+pub fn write<'a, N: ToLexical>(n: N, bytes: &'a mut [u8])
+    -> &'a mut [u8]
+{
+    n.to_lexical(bytes)
+}
+
+/// Write number to string with a custom radix.
+///
+/// Returns a subslice of the input buffer containing the written bytes,
+/// starting from the same address in memory as the input slice.
+///
+/// * `value`   - Number to serialize.
+/// * `radix`   - Radix for number encoding.
+/// * `bytes`   - Slice containing a numeric string.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+///
+/// Also panics if the buffer may not be large enough to hold the
+/// serialized number. In order to ensure the function will not panic,
+/// provide a buffer with at least [`FORMATTED_SIZE`] elements.
+///
+/// [`FORMATTED_SIZE`]: trait.Number.html#associatedconstant.FORMATTED_SIZE
+#[inline]
+#[cfg(feature = "radix")]
+pub fn write_radix<'a, N: ToLexical>(n: N, radix: u8, bytes: &'a mut [u8])
+    -> &'a mut [u8]
+{
+    n.to_lexical_radix(radix, bytes)
+}
+
+/// Parse number from string.
+///
+/// This method parses the entire string, returning an error if
+/// any invalid digits are found during parsing.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+#[inline]
+pub fn parse<N: FromLexical>(bytes: &[u8])
+    -> Result<N>
+{
+    N::from_lexical(bytes)
+}
+
+/// Parse number from string.
+///
+/// This method parses until an invalid digit is found (or the end
+/// of the string), returning the number of processed digits
+/// and the parsed value until that point.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+#[inline]
+pub fn parse_partial<N: FromLexical>(bytes: &[u8])
+    -> Result<(N, usize)>
+{
+    N::from_lexical_partial(bytes)
+}
+
+/// Lossily parse number from string.
+///
+/// This method parses the entire string, returning an error if
+/// any invalid digits are found during parsing. This parser is
+/// lossy, so numerical rounding may occur during parsing.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+#[inline]
+pub fn parse_lossy<N: FromLexicalLossy>(bytes: &[u8])
+    -> Result<N>
+{
+    N::from_lexical_lossy(bytes)
+}
+
+/// Lossily parse number from string.
+///
+/// This method parses until an invalid digit is found (or the end
+/// of the string), returning the number of processed digits
+/// and the parsed value until that point. This parser is
+/// lossy, so numerical rounding may occur during parsing.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+#[inline]
+pub fn parse_partial_lossy<N: FromLexicalLossy>(bytes: &[u8])
+    -> Result<(N, usize)>
+{
+    N::from_lexical_partial_lossy(bytes)
+}
+
+/// Parse number from string with a custom radix.
+///
+/// This method parses the entire string, returning an error if
+/// any invalid digits are found during parsing.
+///
+/// * `radix`   - Radix for number decoding.
+/// * `bytes`   - Byte slice containing a numeric string.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+#[inline]
+#[cfg(feature = "radix")]
+pub fn parse_radix<N: FromLexical>(bytes: &[u8], radix: u8)
+    -> Result<N>
+{
+    N::from_lexical_radix(bytes, radix)
+}
+
+/// Parse number from string with a custom radix.
+///
+/// This method parses until an invalid digit is found (or the end
+/// of the string), returning the number of processed digits
+/// and the parsed value until that point.
+///
+/// * `radix`   - Radix for number decoding.
+/// * `bytes`   - Byte slice containing a numeric string.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+#[inline]
+#[cfg(feature = "radix")]
+pub fn parse_partial_radix<N: FromLexical>(bytes: &[u8], radix: u8)
+    -> Result<(N, usize)>
+{
+    N::from_lexical_partial_radix(bytes, radix)
+}
+
+/// Lossily parse number from string with a custom radix.
+///
+/// This method parses the entire string, returning an error if
+/// any invalid digits are found during parsing. This parser is
+/// lossy, so numerical rounding may occur during parsing.
+///
+/// * `radix`   - Radix for number decoding.
+/// * `bytes`   - Byte slice containing a numeric string.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+#[inline]
+#[cfg(feature = "radix")]
+pub fn parse_lossy_radix<N: FromLexicalLossy>(bytes: &[u8], radix: u8)
+    -> Result<N>
+{
+    N::from_lexical_lossy_radix(bytes, radix)
+}
+
+/// Lossily parse number from string with a custom radix.
+///
+/// This method parses until an invalid digit is found (or the end
+/// of the string), returning the number of processed digits
+/// and the parsed value until that point. This parser is
+/// lossy, so numerical rounding may occur during parsing.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `radix`   - Radix for number decoding.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+#[inline]
+#[cfg(feature = "radix")]
+pub fn parse_partial_lossy_radix<N: FromLexicalLossy>(bytes: &[u8], radix: u8)
+    -> Result<(N, usize)>
+{
+    N::from_lexical_partial_lossy_radix(bytes, radix)
+}
+
+/// Parse number from string with a custom numerical format.
+///
+/// This method parses the entire string, returning an error if
+/// any invalid digits are found during parsing. The numerical format
+/// is specified by the format bitflags, which customize the required
+/// components, digit separators, and other parameters of the number.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `format`  - Numerical format.
+#[inline]
+#[cfg(feature = "format")]
+pub fn parse_format<N: FromLexicalFormat>(bytes: &[u8], format: NumberFormat)
+    -> Result<N>
+{
+    N::from_lexical_format(bytes, format)
+}
+
+/// Parse number from string with a custom numerical format.
+///
+/// This method parses until an invalid digit is found (or the end
+/// of the string), returning the number of processed digits
+/// and the parsed value until that point. The numerical format
+/// is specified by the format bitflags, which customize the required
+/// components, digit separators, and other parameters of the number.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `format`  - Numerical format.
+#[inline]
+#[cfg(feature = "format")]
+pub fn parse_partial_format<N: FromLexicalFormat>(bytes: &[u8], format: NumberFormat)
+    -> Result<(N, usize)>
+{
+    N::from_lexical_partial_format(bytes, format)
+}
+
+/// Lossily parse number from string with a custom numerical format.
+///
+/// This method parses the entire string, returning an error if
+/// any invalid digits are found during parsing. This parser is
+/// lossy, so numerical rounding may occur during parsing. The
+/// numerical format is specified by the format bitflags, which
+/// customize the required components, digit separators, and other
+/// parameters of the number.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `format`  - Numerical format.
+#[inline]
+#[cfg(feature = "format")]
+pub fn parse_lossy_format<N: FromLexicalLossyFormat>(bytes: &[u8], format: NumberFormat)
+    -> Result<N>
+{
+    N::from_lexical_lossy_format(bytes, format)
+}
+
+/// Lossily parse number from string with a custom numerical format.
+///
+/// This method parses until an invalid digit is found (or the end
+/// of the string), returning the number of processed digits
+/// and the parsed value until that point. This parser is
+/// lossy, so numerical rounding may occur during parsing. The
+/// numerical format is specified by the format bitflags, which
+/// customize the required components, digit separators, and other
+/// parameters of the number.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `format`  - Numerical format.
+#[inline]
+#[cfg(feature = "format")]
+pub fn parse_partial_lossy_format<N: FromLexicalLossyFormat>(bytes: &[u8], format: NumberFormat)
+    -> Result<(N, usize)>
+{
+    N::from_lexical_partial_lossy_format(bytes, format)
+}
+
+/// Parse number from string with a custom radix and numerical format.
+///
+/// This method parses the entire string, returning an error if
+/// any invalid digits are found during parsing. The numerical format
+/// is specified by the format bitflags, which customize the required
+/// components, digit separators, and other parameters of the number.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `radix`   - Radix for number decoding.
+/// * `format`  - Numerical format.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+#[inline]
+#[cfg(all(feature = "radix", feature = "format"))]
+pub fn parse_format_radix<N: FromLexicalFormat>(bytes: &[u8], radix: u8, format: NumberFormat)
+    -> Result<N>
+{
+    N::from_lexical_format_radix(bytes, radix, format)
+}
+
+/// Parse number from string with a custom radix and numerical format.
+///
+/// This method parses until an invalid digit is found (or the end
+/// of the string), returning the number of processed digits
+/// and the parsed value until that point. The numerical format
+/// is specified by the format bitflags, which customize the required
+/// components, digit separators, and other parameters of the number.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `radix`   - Radix for number decoding.
+/// * `format`  - Numerical format.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+#[inline]
+#[cfg(all(feature = "radix", feature = "format"))]
+pub fn parse_partial_format_radix<N: FromLexicalFormat>(bytes: &[u8], radix: u8, format: NumberFormat)
+    -> Result<(N, usize)>
+{
+    N::from_lexical_partial_format_radix(bytes, radix, format)
+}
+
+/// Lossily parse number from string with a custom radix and numerical format.
+///
+/// This method parses the entire string, returning an error if
+/// any invalid digits are found during parsing. This parser is
+/// lossy, so numerical rounding may occur during parsing. The
+/// numerical format is specified by the format bitflags, which
+/// customize the required components, digit separators, and other
+/// parameters of the number.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `radix`   - Radix for number decoding.
+/// * `format`  - Numerical format.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+#[inline]
+#[cfg(all(feature = "radix", feature = "format"))]
+pub fn parse_lossy_format_radix<N: FromLexicalLossyFormat>(bytes: &[u8], radix: u8, format: NumberFormat)
+    -> Result<N>
+{
+    N::from_lexical_lossy_format_radix(bytes, radix, format)
+}
+
+/// Lossily parse number from string with a custom radix and numerical format.
+///
+/// This method parses until an invalid digit is found (or the end
+/// of the string), returning the number of processed digits
+/// and the parsed value until that point. This parser is
+/// lossy, so numerical rounding may occur during parsing. The
+/// numerical format is specified by the format bitflags, which
+/// customize the required components, digit separators, and other
+/// parameters of the number.
+///
+/// * `bytes`   - Byte slice containing a numeric string.
+/// * `radix`   - Radix for number decoding.
+/// * `format`  - Numerical format.
+///
+/// # Panics
+///
+/// Panics if the radix is not in the range `[2, 36]`.
+#[inline]
+#[cfg(all(feature = "radix", feature = "format"))]
+pub fn parse_partial_lossy_format_radix<N: FromLexicalLossyFormat>(bytes: &[u8], radix: u8, format: NumberFormat)
+    -> Result<(N, usize)>
+{
+    N::from_lexical_partial_lossy_format_radix(bytes, radix, format)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/algorithm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/algorithm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/algorithm.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/algorithm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,327 @@
+//! Simple, shared algorithm utilities.
+
+use crate::lib::convert::AsRef;
+use crate::lib::{mem, ptr, slice};
+
+// ALGORITHMS
+
+/// Calculate the difference between two pointers.
+#[inline]
+pub fn distance<T>(first: *const T, last: *const T)
+    -> usize
+{
+    debug_assert!(last >= first, "range must be positive.");
+    let f = first as usize;
+    let l = last as usize;
+    l - f
+}
+
+/// Check if two slices are equal to each other.
+#[inline]
+pub fn equal_to_slice(l: &[u8], r: &[u8])
+    -> bool
+{
+    l == r
+}
+
+/// Check if left iter starts with right iter.
+#[inline]
+#[cfg(feature = "format")]
+pub fn starts_with_iter<'a, Iter1, Iter2>(mut l: Iter1, mut r: Iter2)
+    -> (bool, Iter1)
+    where Iter1: Iterator<Item=&'a u8>,
+          Iter2: Iterator<Item=&'a u8>
+{
+    loop {
+        // Only call `next()` on l if r is not None, otherwise,
+        // we may incorrectly consume an l character.
+        let ri = r.next();
+        if ri.is_none() {
+            return (true, l);
+        } else if l.next() != ri {
+            return (false, l);
+        }
+    }
+}
+
+/// Check if left iter starts with right iter without case-sensitivity.
+#[inline]
+pub fn case_insensitive_starts_with_iter<'a, Iter1, Iter2>(mut l: Iter1, mut r: Iter2)
+    -> (bool, Iter1)
+    where Iter1: Iterator<Item=&'a u8>,
+          Iter2: Iterator<Item=&'a u8>
+{
+    loop {
+        let ri = r.next().map(|x| x.to_ascii_lowercase());
+        if ri.is_none() {
+            return (true, l);
+        } else if l.next().map(|x| x.to_ascii_lowercase()) != ri {
+            return (false, l);
+        }
+    }
+}
+
+/// Check if left slice ends with right slice.
+#[inline]
+pub fn ends_with_slice(l: &[u8], r: &[u8])
+    -> bool
+{
+    // This cannot be out-of-bounds, since we check `l.len() >= r.len()`
+    // previous to extracting the subslice, so `l.len() - r.len()` must
+    // also be <= l.len() and >= 0.
+    let rget = move || unsafe {l.get_unchecked(l.len()-r.len()..)};
+    l.len() >= r.len() && equal_to_slice(rget(), r)
+}
+
+/// Trim character from the left-side of a slice.
+#[inline]
+pub fn ltrim_char_slice<'a>(slc: &'a [u8], c: u8)
+    -> (&'a [u8], usize)
+{
+    let count = slc.iter().take_while(|&&si| si == c).count();
+    //  This count cannot exceed the bounds of the slice, since it is
+    // derived from an iterator using the standard library to generate it.
+    debug_assert!(count <= slc.len());
+    let slc = unsafe {slc.get_unchecked(count..)};
+    (slc, count)
+}
+
+/// Trim characters from the left-side of a slice.
+#[inline]
+#[cfg(feature = "format")]
+pub fn ltrim_char2_slice<'a>(slc: &'a [u8], c1: u8, c2: u8)
+    -> (&'a [u8], usize)
+{
+    let count = slc.iter().take_while(|&&si| si == c1 || si == c2).count();
+    //  This count cannot exceed the bounds of the slice, since it is
+    // derived from an iterator using the standard library to generate it.
+    debug_assert!(count <= slc.len());
+    let slc = unsafe {slc.get_unchecked(count..)};
+    (slc, count)
+}
+
+/// Trim character from the right-side of a slice.
+#[inline]
+pub fn rtrim_char_slice<'a>(slc: &'a [u8], c: u8)
+    -> (&'a [u8], usize)
+{
+    let count = slc.iter().rev().take_while(|&&si| si == c).count();
+    let index = slc.len() - count;
+    // Count must be <= slc.len(), and therefore, slc.len() - count must
+    // also be <= slc.len(), since this is derived from an iterator
+    // in the standard library.
+    debug_assert!(count <= slc.len());
+    debug_assert!(index <= slc.len());
+    let slc = unsafe {slc.get_unchecked(..index)};
+    (slc, count)
+}
+
+/// Trim character from the right-side of a slice.
+#[inline]
+#[cfg(feature = "format")]
+pub fn rtrim_char2_slice<'a>(slc: &'a [u8], c1: u8, c2: u8)
+    -> (&'a [u8], usize)
+{
+    let count = slc.iter().rev().take_while(|&&si| si == c1 || si == c2).count();
+    let index = slc.len() - count;
+    // Count must be <= slc.len(), and therefore, slc.len() - count must
+    // also be <= slc.len(), since this is derived from an iterator
+    // in the standard library.
+    debug_assert!(count <= slc.len());
+    debug_assert!(index <= slc.len());
+    let slc = unsafe {slc.get_unchecked(..index)};
+    (slc, count)
+}
+
+/// Copy from source-to-dst.
+#[inline]
+pub fn copy_to_dst<'a, Bytes: AsRef<[u8]>>(dst: &'a mut [u8], src: Bytes)
+    -> usize
+{
+    let src = src.as_ref();
+    let dst = &mut index_mut!(dst[..src.len()]);
+
+    unsafe {
+        ptr::copy_nonoverlapping(src.as_ptr(), dst.as_mut_ptr(), dst.len());
+    }
+
+    src.len()
+}
+
+/// Length-check variant of ptr::write_bytes for a slice.
+#[cfg(not(any(feature = "grisu3", feature = "ryu")))]
+#[inline]
+pub fn write_bytes(dst: &mut [u8], byte: u8)
+{
+    unsafe {
+        ptr::write_bytes(dst.as_mut_ptr(), byte, dst.len());
+    }
+}
+
+// TEST
+// ----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn distance_test() {
+        unsafe {
+            let x: [u8; 10] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+            let first: *const u8 = x.as_ptr();
+            let last = first.add(x.len());
+            assert_eq!(distance(first, last), 10);
+        }
+    }
+
+    #[test]
+    fn equal_to_test() {
+        let x = "Hello";
+        let y = "Hello";
+        let z = "hello";
+
+        assert!(equal_to_slice(x.as_bytes(), y.as_bytes()));
+        assert!(!equal_to_slice(x.as_bytes(), z.as_bytes()));
+        assert!(!equal_to_slice(y.as_bytes(), z.as_bytes()));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn starts_with_test() {
+        let w = b"Hello";
+        let x = b"H";
+        let y = b"h";
+        let z = b"a";
+
+        // forward
+        assert!(starts_with_iter(w.iter(), x.iter()).0);
+        assert!(!starts_with_iter(w.iter(), y.iter()).0);
+        assert!(!starts_with_iter(x.iter(), y.iter()).0);
+        assert!(!starts_with_iter(w.iter(), z.iter()).0);
+        assert!(!starts_with_iter(x.iter(), z.iter()).0);
+        assert!(!starts_with_iter(y.iter(), z.iter()).0);
+
+        // back
+        assert!(!starts_with_iter(x.iter(), w.iter()).0);
+        assert!(!starts_with_iter(y.iter(), w.iter()).0);
+        assert!(!starts_with_iter(z.iter(), w.iter()).0);
+    }
+
+    #[test]
+    fn case_insensitive_starts_with_test() {
+        let w = b"Hello";
+        let x = b"H";
+        let y = b"h";
+        let z = b"a";
+
+        // forward
+        assert!(case_insensitive_starts_with_iter(w.iter(), x.iter()).0);
+        assert!(case_insensitive_starts_with_iter(w.iter(), y.iter()).0);
+        assert!(case_insensitive_starts_with_iter(x.iter(), y.iter()).0);
+        assert!(!case_insensitive_starts_with_iter(w.iter(), z.iter()).0);
+        assert!(!case_insensitive_starts_with_iter(x.iter(), z.iter()).0);
+        assert!(!case_insensitive_starts_with_iter(y.iter(), z.iter()).0);
+
+        // back
+        assert!(!case_insensitive_starts_with_iter(x.iter(), w.iter()).0);
+        assert!(!case_insensitive_starts_with_iter(y.iter(), w.iter()).0);
+        assert!(!case_insensitive_starts_with_iter(z.iter(), w.iter()).0);
+    }
+
+    #[test]
+    fn ends_with_test() {
+        let w = "Hello";
+        let x = "lO";
+        let y = "lo";
+        let z = "o";
+
+        // forward
+        assert!(!ends_with_slice(w.as_bytes(), x.as_bytes()));
+        assert!(ends_with_slice(w.as_bytes(), y.as_bytes()));
+        assert!(ends_with_slice(w.as_bytes(), z.as_bytes()));
+        assert!(!ends_with_slice(x.as_bytes(), y.as_bytes()));
+        assert!(!ends_with_slice(x.as_bytes(), z.as_bytes()));
+        assert!(ends_with_slice(y.as_bytes(), z.as_bytes()));
+
+        // back
+        assert!(!ends_with_slice(z.as_bytes(), y.as_bytes()));
+        assert!(!ends_with_slice(z.as_bytes(), x.as_bytes()));
+        assert!(!ends_with_slice(z.as_bytes(), w.as_bytes()));
+        assert!(!ends_with_slice(y.as_bytes(), x.as_bytes()));
+        assert!(!ends_with_slice(y.as_bytes(), w.as_bytes()));
+        assert!(!ends_with_slice(x.as_bytes(), w.as_bytes()));
+    }
+
+    #[test]
+    fn ltrim_char_test() {
+        let w = "0001";
+        let x = "1010";
+        let y = "1.00";
+        let z = "1e05";
+
+        assert_eq!(ltrim_char_slice(w.as_bytes(), b'0').1, 3);
+        assert_eq!(ltrim_char_slice(x.as_bytes(), b'0').1, 0);
+        assert_eq!(ltrim_char_slice(x.as_bytes(), b'1').1, 1);
+        assert_eq!(ltrim_char_slice(y.as_bytes(), b'0').1, 0);
+        assert_eq!(ltrim_char_slice(y.as_bytes(), b'1').1, 1);
+        assert_eq!(ltrim_char_slice(z.as_bytes(), b'0').1, 0);
+        assert_eq!(ltrim_char_slice(z.as_bytes(), b'1').1, 1);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn ltrim_char2_test() {
+        let w = "0001";
+        let x = "1010";
+        let y = "1.00";
+        let z = "1e05";
+        let a = "0_01";
+
+        assert_eq!(ltrim_char2_slice(w.as_bytes(), b'0', b'_').1, 3);
+        assert_eq!(ltrim_char2_slice(x.as_bytes(), b'0', b'_').1, 0);
+        assert_eq!(ltrim_char2_slice(x.as_bytes(), b'1', b'_').1, 1);
+        assert_eq!(ltrim_char2_slice(y.as_bytes(), b'0', b'_').1, 0);
+        assert_eq!(ltrim_char2_slice(y.as_bytes(), b'1', b'_').1, 1);
+        assert_eq!(ltrim_char2_slice(z.as_bytes(), b'0', b'_').1, 0);
+        assert_eq!(ltrim_char2_slice(z.as_bytes(), b'1', b'_').1, 1);
+        assert_eq!(ltrim_char2_slice(a.as_bytes(), b'0', b'_').1, 3);
+        assert_eq!(ltrim_char2_slice(a.as_bytes(), b'1', b'_').1, 0);
+    }
+
+    #[test]
+    fn rtrim_char_test() {
+        let w = "0001";
+        let x = "1010";
+        let y = "1.00";
+        let z = "1e05";
+
+        assert_eq!(rtrim_char_slice(w.as_bytes(), b'0').1, 0);
+        assert_eq!(rtrim_char_slice(x.as_bytes(), b'0').1, 1);
+        assert_eq!(rtrim_char_slice(x.as_bytes(), b'1').1, 0);
+        assert_eq!(rtrim_char_slice(y.as_bytes(), b'0').1, 2);
+        assert_eq!(rtrim_char_slice(y.as_bytes(), b'1').1, 0);
+        assert_eq!(rtrim_char_slice(z.as_bytes(), b'0').1, 0);
+        assert_eq!(rtrim_char_slice(z.as_bytes(), b'5').1, 1);
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn rtrim_char2_test() {
+        let w = "0001";
+        let x = "1010";
+        let y = "1.00";
+        let z = "1e05";
+        let a = "0_01";
+
+        assert_eq!(rtrim_char2_slice(w.as_bytes(), b'0', b'_').1, 0);
+        assert_eq!(rtrim_char2_slice(x.as_bytes(), b'0', b'_').1, 1);
+        assert_eq!(rtrim_char2_slice(x.as_bytes(), b'1', b'_').1, 0);
+        assert_eq!(rtrim_char2_slice(y.as_bytes(), b'0', b'_').1, 2);
+        assert_eq!(rtrim_char2_slice(y.as_bytes(), b'1', b'_').1, 0);
+        assert_eq!(rtrim_char2_slice(z.as_bytes(), b'0', b'_').1, 0);
+        assert_eq!(rtrim_char2_slice(z.as_bytes(), b'1', b'_').1, 0);
+        assert_eq!(rtrim_char2_slice(a.as_bytes(), b'0', b'_').1, 0);
+        assert_eq!(rtrim_char2_slice(a.as_bytes(), b'1', b'_').1, 1);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/assert.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/assert.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/assert.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/assert.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,37 @@
+//! Macro to check if the radix is valid, in generic code.
+
+// RADIX
+
+/// Check radix is in range [2, 36] in debug builds.
+#[cfg(feature = "radix")]
+macro_rules! debug_assert_radix {
+    ($radix:expr) => (debug_assert!($radix.as_i32() >= 2 && $radix.as_i32() <= 36, "Numerical base must be from 2-36.");)
+}
+
+/// Check radix is equal to 10.
+#[cfg(not(feature = "radix"))]
+macro_rules! debug_assert_radix {
+    ($radix:expr) => (debug_assert!($radix.as_i32() == 10, "Numerical base must be 10.");)
+}
+
+/// Check radix is in range [2, 36] in debug and release builds.
+#[cfg(feature = "radix")]
+macro_rules! assert_radix {
+    ($radix:expr) => (assert!($radix.as_i32() >= 2 && $radix.as_i32() <= 36, "Numerical base must be from 2-36.");)
+}
+
+// BUFFER
+
+/// Check the buffer has sufficient room for the output.
+macro_rules! assert_buffer {
+    ($radix:expr, $slc:ident, $t:ty) => ({
+        #[cfg(feature = "radix")]
+        match $radix {
+            10 => assert!($slc.len() >= <$t>::FORMATTED_SIZE_DECIMAL),
+            _  => assert!($slc.len() >= <$t>::FORMATTED_SIZE),
+        }
+
+        #[cfg(not(feature = "radix"))]
+        assert!($slc.len() >= <$t>::FORMATTED_SIZE);
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/cast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/cast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/cast.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/cast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,882 @@
+//! Rust cast utilities.
+
+// We have a lot of high-level casts that make the type-system work.
+// Don't delete them, fake they're being used.
+#![allow(dead_code)]
+
+use super::primitive::AsPrimitive;
+use super::num::{Integer};
+
+// AS CAST
+
+/// Allows the high-level conversion of generic types as if `as` was used.
+#[inline]
+pub(crate) fn as_cast<U: AsCast, T: AsCast>(t: T) -> U {
+    AsCast::as_cast(t)
+}
+
+/// An interface for casting between machine scalars.
+pub trait AsCast: AsPrimitive {
+    /// Creates a number from another value that can be converted into
+    /// a primitive via the `AsPrimitive` trait.
+    fn as_cast<N: AsPrimitive>(n: N) -> Self;
+}
+
+macro_rules! as_cast {
+    ($t:ty, $meth:ident) => {
+        impl AsCast for $t {
+            #[inline]
+            fn as_cast<N: AsPrimitive>(n: N) -> $t {
+                n.$meth()
+            }
+        }
+    };
+}
+
+as_cast!(u8, as_u8);
+as_cast!(u16, as_u16);
+as_cast!(u32, as_u32);
+as_cast!(u64, as_u64);
+as_cast!(u128, as_u128);
+as_cast!(usize, as_usize);
+as_cast!(i8, as_i8);
+as_cast!(i16, as_i16);
+as_cast!(i32, as_i32);
+as_cast!(i64, as_i64);
+as_cast!(i128, as_i128);
+as_cast!(isize, as_isize);
+as_cast!(f32, as_f32);
+as_cast!(f64, as_f64);
+
+// TRY CAST
+// Analogous to TryInto.
+
+/// High-level conversion of types using TryCast.
+#[inline]
+pub(crate) fn try_cast<U, T: TryCast<U>>(t: T) -> Option<U> {
+    TryCast::try_cast(t)
+}
+
+/// Non-lossy cast between types. Returns None if new type cannot represent value.
+pub trait TryCast<T>: Sized {
+    /// Consume self and return the cast value (or None).
+    fn try_cast(self) -> Option<T>;
+}
+
+macro_rules! try_cast {
+    // CHECK
+
+    // Checked conversion
+    (@check $v:ident, $cond:expr) => (if $cond { Some(as_cast($v)) } else { None });
+
+    // INTEGER
+
+    // Widen type,so no checks required, both are signed/unsigned.
+    (@widen $src:tt, $($dst:tt),*) => ($(
+        impl TryCast<$dst> for $src {
+            #[inline]
+            fn try_cast(self) -> Option<$dst> {
+                try_cast!(@check self, true)
+            }
+        }
+    )*);
+
+    // Above zero check, for a signed to unsigned conversion of same width.
+    (@positive $src:tt, $($dst:tt),*) => ($(
+        impl TryCast<$dst> for $src {
+            #[inline]
+            fn try_cast(self) -> Option<$dst> {
+                try_cast!(@check self, self >= 0)
+            }
+        }
+    )*);
+
+    // Check below some upper bound (for narrowing of an unsigned value).
+    (@below $src:tt, $($dst:tt),*) => ($(
+        impl TryCast<$dst> for $src {
+            #[inline]
+            fn try_cast(self) -> Option<$dst> {
+                const MAX: $src = $dst::max_value() as $src;
+                try_cast!(@check self, self <= MAX)
+            }
+        }
+    )*);
+
+    // Check within min and max bounds (for narrowing of a signed value).
+    (@within $src:tt, $($dst:tt),*) => ($(
+        impl TryCast<$dst> for $src {
+            #[inline]
+            fn try_cast(self) -> Option<$dst> {
+                const MIN: $src = $dst::min_value() as $src;
+                const MAX: $src = $dst::max_value() as $src;
+                try_cast!(@check self, self >= MIN && self <= MAX)
+            }
+        }
+    )*);
+
+    // FLOAT
+
+    // Cannot be done without implementation defined behavior.
+    (@into_float $src:tt, $($dst:tt),*) => ($(
+        impl TryCast<$dst> for $src {
+            #[inline]
+            fn try_cast(self) -> Option<$dst> {
+                unreachable!()
+            }
+        }
+    )*);
+
+    // Cannot be done without implementation defined behavior.
+    (@from_float $src:tt, $($dst:tt),*) => ($(
+        impl TryCast<$dst> for $src {
+            #[inline]
+            fn try_cast(self) -> Option<$dst> {
+                unreachable!()
+            }
+        }
+    )*);
+}
+
+// u8
+try_cast! { @widen u8, u8, u16, u32, u64, u128 }
+try_cast! { @below u8, i8 }
+try_cast! { @widen u8, i16, i32, i64, i128 }
+try_cast! { @widen u8, f32, f64 }
+
+// u16
+try_cast! { @below u16, u8 }
+try_cast! { @widen u16, u16, u32, u64, u128 }
+try_cast! { @below u16, i8, i16 }
+try_cast! { @widen u16, i32, i64, i128 }
+try_cast! { @widen u16, f32, f64 }
+
+// u32
+try_cast! { @below u32, u8, u16 }
+try_cast! { @widen u32, u32, u64, u128 }
+try_cast! { @below u32, i8, i16, i32 }
+try_cast! { @widen u32, i64, i128 }
+try_cast! { @into_float u32, f32 }
+try_cast! { @widen u32, f64 }
+
+// u64
+try_cast! { @below u64, u8, u16, u32 }
+try_cast! { @widen u64, u64, u128 }
+try_cast! { @below u64, i8, i16, i32, i64 }
+try_cast! { @widen u64, i128}
+try_cast! { @into_float u64, f32, f64 }
+
+// u128
+try_cast! { @below u128, u8, u16, u32, u64 }
+try_cast! { @widen u128, u128 }
+try_cast! { @below u128, i8, i16, i32, i64, i128 }
+try_cast! { @into_float u128, f32, f64 }
+
+// i8
+try_cast! { @positive i8, u8, u16, u32, u64, u128 }
+try_cast! { @widen i8, i8, i16, i32, i64, i128 }
+try_cast! { @widen i8, f32, f64 }
+
+// i16
+try_cast! { @within i16, u8 }
+try_cast! { @positive i16, u16, u32, u64, u128 }
+try_cast! { @within i16, i8 }
+try_cast! { @widen i16, i16, i32, i64, i128 }
+try_cast! { @widen i16, f32, f64 }
+
+// i32
+try_cast! { @within i32, u8, u16 }
+try_cast! { @positive i32, u32, u64, u128 }
+try_cast! { @within i32, i8, i16 }
+try_cast! { @widen i32, i32, i64, i128 }
+try_cast! { @into_float i32, f32 }
+try_cast! { @widen i32, f64 }
+
+// i64
+try_cast! { @within i64, u8, u16, u32 }
+try_cast! { @positive i64, u64, u128 }
+try_cast! { @within i64, i8, i16, i32 }
+try_cast! { @widen i64, i64, i128 }
+try_cast! { @into_float i64, f32, f64 }
+
+// i128
+try_cast! { @within i128, u8, u16, u32, u64 }
+try_cast! { @positive i128, u128 }
+try_cast! { @within i128, i8, i16, i32, i64 }
+try_cast! { @widen i128, i128 }
+try_cast! { @into_float i128, f32, f64 }
+
+// f32
+try_cast! { @from_float f32, u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, f32, f64 }
+
+// f64
+try_cast! { @from_float f64, u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, f32, f64 }
+
+// usize/isize shared
+try_cast! { @from_float f32, usize }
+try_cast! { @from_float f64, usize }
+try_cast! { @from_float f32, isize }
+try_cast! { @from_float f64, isize }
+
+cfg_if! {
+if #[cfg(target_pointer_width = "16")] {
+    // 16-bit usize
+    try_cast! { @below usize, u8 }
+    try_cast! { @widen usize, u16, u32, u64, u128, usize }
+    try_cast! { @below usize, i8, i16, isize }
+    try_cast! { @widen usize, i32, i64, i128 }
+    try_cast! { @widen usize, f32, f64 }
+    try_cast! { @widen u8, usize }
+    try_cast! { @widen u16, usize }
+    try_cast! { @below u32, usize }
+    try_cast! { @below u64, usize }
+    try_cast! { @below u128, usize }
+    try_cast! { @positive i8, usize }
+    try_cast! { @positive i16, usize }
+    try_cast! { @within i32, usize }
+    try_cast! { @within i64, usize }
+    try_cast! { @within i128, usize }
+
+    // 16-bit isize
+    try_cast! { @within isize, u8 }
+    try_cast! { @positive isize, u16, u32, u64, u128, usize }
+    try_cast! { @within isize, i8 }
+    try_cast! { @widen isize, i16, i32, i64, i128, isize }
+    try_cast! { @widen isize, f32, f64 }
+    try_cast! { @widen u8, isize }
+    try_cast! { @below u16, isize }
+    try_cast! { @below u32, isize }
+    try_cast! { @below u64, isize }
+    try_cast! { @below u128, isize }
+    try_cast! { @widen i8, isize }
+    try_cast! { @widen i16, isize }
+    try_cast! { @within i32, isize }
+    try_cast! { @within i64, isize }
+    try_cast! { @within i128, isize }
+} else if #[cfg(target_pointer_width = "32")] {
+    try_cast! { @below usize, u8, u16 }
+    try_cast! { @widen usize, u32, u64, u128, usize }
+    try_cast! { @below usize, i8, i16, i32, isize }
+    try_cast! { @widen usize, i64, i128 }
+    try_cast! { @into_float usize, f32 }
+    try_cast! { @widen usize, f64 }
+    try_cast! { @widen u8, usize }
+    try_cast! { @widen u16, usize }
+    try_cast! { @widen u32, usize }
+    try_cast! { @below u64, usize }
+    try_cast! { @below u128, usize }
+    try_cast! { @positive i8, usize }
+    try_cast! { @positive i16, usize }
+    try_cast! { @positive i32, usize }
+    try_cast! { @within i64, usize }
+    try_cast! { @within i128, usize }
+
+    // 32-bit isize
+    try_cast! { @within isize, u8, u16 }
+    try_cast! { @positive isize, u32, u64, u128, usize }
+    try_cast! { @within isize, i8, i16 }
+    try_cast! { @widen isize, i32, i64, i128, isize }
+    try_cast! { @into_float isize, f32 }
+    try_cast! { @widen isize, f64 }
+    try_cast! { @widen u8, isize }
+    try_cast! { @widen u16, isize }
+    try_cast! { @below u32, isize }
+    try_cast! { @below u64, isize }
+    try_cast! { @below u128, isize }
+    try_cast! { @widen i8, isize }
+    try_cast! { @widen i16, isize }
+    try_cast! { @widen i32, isize }
+    try_cast! { @within i64, isize }
+    try_cast! { @within i128, isize }
+} else if #[cfg(target_pointer_width = "64")] {
+    // 64-bit usize
+    try_cast! { @below usize, u8, u16, u32 }
+    try_cast! { @widen usize, u64, u128, usize }
+    try_cast! { @below usize, i8, i16, i32, i64, isize }
+    try_cast! { @widen usize, i128 }
+    try_cast! { @into_float usize, f32, f64 }
+    try_cast! { @widen u8, usize }
+    try_cast! { @widen u16, usize }
+    try_cast! { @widen u32, usize }
+    try_cast! { @widen u64, usize }
+    try_cast! { @below u128, usize }
+    try_cast! { @positive i8, usize }
+    try_cast! { @positive i16, usize }
+    try_cast! { @positive i32, usize }
+    try_cast! { @positive i64, usize }
+    try_cast! { @within i128, usize }
+
+    // 64-bit isize
+    try_cast! { @within isize, u8, u16, u32 }
+    try_cast! { @positive isize, u64, u128, usize }
+    try_cast! { @within isize, i8, i16, i32 }
+    try_cast! { @widen isize, i64, i128, isize }
+    try_cast! { @into_float isize, f32, f64 }
+    try_cast! { @widen u8, isize }
+    try_cast! { @widen u16, isize }
+    try_cast! { @widen u32, isize }
+    try_cast! { @below u64, isize }
+    try_cast! { @below u128, isize }
+    try_cast! { @widen i8, isize }
+    try_cast! { @widen i16, isize }
+    try_cast! { @widen i32, isize }
+    try_cast! { @widen i64, isize }
+    try_cast! { @within i128, isize }
+}}  // cfg_if
+
+// TEST
+// ----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use super::super::num::{Integer, Float};
+
+    fn check_as_cast<T: AsCast>(t: T) {
+        let _: i8 = as_cast(t);
+        let _: i16 = as_cast(t);
+        let _: i32 = as_cast(t);
+        let _: i64 = as_cast(t);
+        let _: i128 = as_cast(t);
+        let _: isize = as_cast(t);
+        let _: u8 = as_cast(t);
+        let _: u16 = as_cast(t);
+        let _: u32 = as_cast(t);
+        let _: u64 = as_cast(t);
+        let _: u128 = as_cast(t);
+        let _: usize = as_cast(t);
+        let _: f32 = as_cast(t);
+        let _: f64 = as_cast(t);
+    }
+
+    #[test]
+    fn as_cast_test() {
+        check_as_cast(1u8);
+        check_as_cast(1u16);
+        check_as_cast(1u32);
+        check_as_cast(1u64);
+        check_as_cast(1u128);
+        check_as_cast(1usize);
+        check_as_cast(1i8);
+        check_as_cast(1i16);
+        check_as_cast(1i32);
+        check_as_cast(1i64);
+        check_as_cast(1i128);
+        check_as_cast(1isize);
+        check_as_cast(1f32);
+        check_as_cast(1f64);
+    }
+
+    fn try_cast_u8<T: TryCast<u8>>(t: T) -> Option<u8> {
+        t.try_cast()
+    }
+
+    fn try_cast_u16<T: TryCast<u16>>(t: T) -> Option<u16> {
+        t.try_cast()
+    }
+
+    fn try_cast_u32<T: TryCast<u32>>(t: T) -> Option<u32> {
+        t.try_cast()
+    }
+
+    fn try_cast_u64<T: TryCast<u64>>(t: T) -> Option<u64> {
+        t.try_cast()
+    }
+
+    fn try_cast_u128<T: TryCast<u128>>(t: T) -> Option<u128> {
+        t.try_cast()
+    }
+
+    fn try_cast_usize<T: TryCast<usize>>(t: T) -> Option<usize> {
+        t.try_cast()
+    }
+
+    fn try_cast_i8<T: TryCast<i8>>(t: T) -> Option<i8> {
+        t.try_cast()
+    }
+
+    fn try_cast_i16<T: TryCast<i16>>(t: T) -> Option<i16> {
+        t.try_cast()
+    }
+
+    fn try_cast_i32<T: TryCast<i32>>(t: T) -> Option<i32> {
+        t.try_cast()
+    }
+
+    fn try_cast_i64<T: TryCast<i64>>(t: T) -> Option<i64> {
+        t.try_cast()
+    }
+
+    fn try_cast_i128<T: TryCast<i128>>(t: T) -> Option<i128> {
+        t.try_cast()
+    }
+
+    fn try_cast_isize<T: TryCast<isize>>(t: T) -> Option<isize> {
+        t.try_cast()
+    }
+
+    fn try_cast_f32<T: TryCast<f32>>(t: T) -> Option<f32> {
+        t.try_cast()
+    }
+
+    fn try_cast_f64<T: TryCast<f64>>(t: T) -> Option<f64> {
+        t.try_cast()
+    }
+
+    #[test]
+    fn try_cast_test() {
+        // u8
+        assert!(try_cast_u8(u8::min_value()).is_some());
+        assert!(try_cast_u16(u8::min_value()).is_some());
+        assert!(try_cast_u32(u8::min_value()).is_some());
+        assert!(try_cast_u64(u8::min_value()).is_some());
+        assert!(try_cast_u128(u8::min_value()).is_some());
+        assert!(try_cast_i8(u8::min_value()).is_some());
+        assert!(try_cast_i16(u8::min_value()).is_some());
+        assert!(try_cast_i32(u8::min_value()).is_some());
+        assert!(try_cast_i64(u8::min_value()).is_some());
+        assert!(try_cast_i128(u8::min_value()).is_some());
+        assert!(try_cast_u8(u8::max_value()).is_some());
+        assert!(try_cast_u16(u8::max_value()).is_some());
+        assert!(try_cast_u32(u8::max_value()).is_some());
+        assert!(try_cast_u64(u8::max_value()).is_some());
+        assert!(try_cast_u128(u8::max_value()).is_some());
+        assert!(try_cast_i8(u8::max_value()).is_none());
+        assert!(try_cast_i16(u8::max_value()).is_some());
+        assert!(try_cast_i32(u8::max_value()).is_some());
+        assert!(try_cast_i64(u8::max_value()).is_some());
+        assert!(try_cast_i128(u8::max_value()).is_some());
+        assert!(try_cast_usize(u8::min_value()).is_some());
+        assert!(try_cast_isize(u8::min_value()).is_some());
+        assert!(try_cast_usize(u8::max_value()).is_some());
+        assert!(try_cast_isize(u8::max_value()).is_some());
+
+        // u16
+        assert!(try_cast_u8(u16::min_value()).is_some());
+        assert!(try_cast_u16(u16::min_value()).is_some());
+        assert!(try_cast_u32(u16::min_value()).is_some());
+        assert!(try_cast_u64(u16::min_value()).is_some());
+        assert!(try_cast_u128(u16::min_value()).is_some());
+        assert!(try_cast_i8(u16::min_value()).is_some());
+        assert!(try_cast_i16(u16::min_value()).is_some());
+        assert!(try_cast_i32(u16::min_value()).is_some());
+        assert!(try_cast_i64(u16::min_value()).is_some());
+        assert!(try_cast_i128(u16::min_value()).is_some());
+        assert!(try_cast_u8(u16::max_value()).is_none());
+        assert!(try_cast_u16(u16::max_value()).is_some());
+        assert!(try_cast_u32(u16::max_value()).is_some());
+        assert!(try_cast_u64(u16::max_value()).is_some());
+        assert!(try_cast_u128(u16::max_value()).is_some());
+        assert!(try_cast_i8(u16::max_value()).is_none());
+        assert!(try_cast_i16(u16::max_value()).is_none());
+        assert!(try_cast_i32(u16::max_value()).is_some());
+        assert!(try_cast_i64(u16::max_value()).is_some());
+        assert!(try_cast_i128(u16::max_value()).is_some());
+        assert!(try_cast_usize(u16::min_value()).is_some());
+        assert!(try_cast_isize(u16::min_value()).is_some());
+        assert!(try_cast_usize(u16::max_value()).is_some());
+        // Discard the results, since platform dependent. Just check it compiles.
+        try_cast_isize(u16::max_value());
+
+        // u32
+        assert!(try_cast_u8(u32::min_value()).is_some());
+        assert!(try_cast_u16(u32::min_value()).is_some());
+        assert!(try_cast_u32(u32::min_value()).is_some());
+        assert!(try_cast_u64(u32::min_value()).is_some());
+        assert!(try_cast_u128(u32::min_value()).is_some());
+        assert!(try_cast_i8(u32::min_value()).is_some());
+        assert!(try_cast_i16(u32::min_value()).is_some());
+        assert!(try_cast_i32(u32::min_value()).is_some());
+        assert!(try_cast_i64(u32::min_value()).is_some());
+        assert!(try_cast_i128(u32::min_value()).is_some());
+        assert!(try_cast_u8(u32::max_value()).is_none());
+        assert!(try_cast_u16(u32::max_value()).is_none());
+        assert!(try_cast_u32(u32::max_value()).is_some());
+        assert!(try_cast_u64(u32::max_value()).is_some());
+        assert!(try_cast_u128(u32::max_value()).is_some());
+        assert!(try_cast_i8(u32::max_value()).is_none());
+        assert!(try_cast_i16(u32::max_value()).is_none());
+        assert!(try_cast_i32(u32::max_value()).is_none());
+        assert!(try_cast_i64(u32::max_value()).is_some());
+        assert!(try_cast_i128(u32::max_value()).is_some());
+        assert!(try_cast_usize(u32::min_value()).is_some());
+        assert!(try_cast_isize(u32::min_value()).is_some());
+        // Discard the results, since platform dependent. Just check it compiles.
+        try_cast_usize(u32::max_value());
+        try_cast_isize(u32::max_value());
+
+        // u64
+        assert!(try_cast_u8(u64::min_value()).is_some());
+        assert!(try_cast_u16(u64::min_value()).is_some());
+        assert!(try_cast_u32(u64::min_value()).is_some());
+        assert!(try_cast_u64(u64::min_value()).is_some());
+        assert!(try_cast_u128(u64::min_value()).is_some());
+        assert!(try_cast_i8(u64::min_value()).is_some());
+        assert!(try_cast_i16(u64::min_value()).is_some());
+        assert!(try_cast_i32(u64::min_value()).is_some());
+        assert!(try_cast_i64(u64::min_value()).is_some());
+        assert!(try_cast_i128(u64::min_value()).is_some());
+        assert!(try_cast_u8(u64::max_value()).is_none());
+        assert!(try_cast_u16(u64::max_value()).is_none());
+        assert!(try_cast_u32(u64::max_value()).is_none());
+        assert!(try_cast_u64(u64::max_value()).is_some());
+        assert!(try_cast_u128(u64::max_value()).is_some());
+        assert!(try_cast_i8(u64::max_value()).is_none());
+        assert!(try_cast_i16(u64::max_value()).is_none());
+        assert!(try_cast_i32(u64::max_value()).is_none());
+        assert!(try_cast_i64(u64::max_value()).is_none());
+        assert!(try_cast_i128(u64::max_value()).is_some());
+        assert!(try_cast_usize(u64::min_value()).is_some());
+        assert!(try_cast_isize(u64::min_value()).is_some());
+        // Discard the results, since platform dependent. Just check it compiles.
+        try_cast_usize(u64::max_value());
+        try_cast_isize(u64::max_value());
+
+        // u128
+        assert!(try_cast_u8(u128::min_value()).is_some());
+        assert!(try_cast_u16(u128::min_value()).is_some());
+        assert!(try_cast_u32(u128::min_value()).is_some());
+        assert!(try_cast_u64(u128::min_value()).is_some());
+        assert!(try_cast_u128(u128::min_value()).is_some());
+        assert!(try_cast_i8(u128::min_value()).is_some());
+        assert!(try_cast_i16(u128::min_value()).is_some());
+        assert!(try_cast_i32(u128::min_value()).is_some());
+        assert!(try_cast_i64(u128::min_value()).is_some());
+        assert!(try_cast_i128(u128::min_value()).is_some());
+        assert!(try_cast_u8(u128::max_value()).is_none());
+        assert!(try_cast_u16(u128::max_value()).is_none());
+        assert!(try_cast_u32(u128::max_value()).is_none());
+        assert!(try_cast_u64(u128::max_value()).is_none());
+        assert!(try_cast_u128(u128::max_value()).is_some());
+        assert!(try_cast_i8(u128::max_value()).is_none());
+        assert!(try_cast_i16(u128::max_value()).is_none());
+        assert!(try_cast_i32(u128::max_value()).is_none());
+        assert!(try_cast_i64(u128::max_value()).is_none());
+        assert!(try_cast_i128(u128::max_value()).is_none());
+        assert!(try_cast_usize(u128::min_value()).is_some());
+        assert!(try_cast_isize(u128::min_value()).is_some());
+        assert!(try_cast_usize(u128::max_value()).is_none());
+        assert!(try_cast_isize(u128::max_value()).is_none());
+
+        // i8
+        assert!(try_cast_u8(i8::min_value()).is_none());
+        assert!(try_cast_u16(i8::min_value()).is_none());
+        assert!(try_cast_u32(i8::min_value()).is_none());
+        assert!(try_cast_u64(i8::min_value()).is_none());
+        assert!(try_cast_u128(i8::min_value()).is_none());
+        assert!(try_cast_i8(i8::min_value()).is_some());
+        assert!(try_cast_i16(i8::min_value()).is_some());
+        assert!(try_cast_i32(i8::min_value()).is_some());
+        assert!(try_cast_i64(i8::min_value()).is_some());
+        assert!(try_cast_i128(i8::min_value()).is_some());
+        assert!(try_cast_u8(i8::zero()).is_some());
+        assert!(try_cast_u16(i8::zero()).is_some());
+        assert!(try_cast_u32(i8::zero()).is_some());
+        assert!(try_cast_u64(i8::zero()).is_some());
+        assert!(try_cast_u128(i8::zero()).is_some());
+        assert!(try_cast_i8(i8::zero()).is_some());
+        assert!(try_cast_i16(i8::zero()).is_some());
+        assert!(try_cast_i32(i8::zero()).is_some());
+        assert!(try_cast_i64(i8::zero()).is_some());
+        assert!(try_cast_i128(i8::zero()).is_some());
+        assert!(try_cast_u8(i8::max_value()).is_some());
+        assert!(try_cast_u16(i8::max_value()).is_some());
+        assert!(try_cast_u32(i8::max_value()).is_some());
+        assert!(try_cast_u64(i8::max_value()).is_some());
+        assert!(try_cast_u128(i8::max_value()).is_some());
+        assert!(try_cast_i8(i8::max_value()).is_some());
+        assert!(try_cast_i16(i8::max_value()).is_some());
+        assert!(try_cast_i32(i8::max_value()).is_some());
+        assert!(try_cast_i64(i8::max_value()).is_some());
+        assert!(try_cast_i128(i8::max_value()).is_some());
+        assert!(try_cast_usize(i8::min_value()).is_none());
+        assert!(try_cast_isize(i8::min_value()).is_some());
+        assert!(try_cast_usize(i8::zero()).is_some());
+        assert!(try_cast_isize(i8::zero()).is_some());
+        assert!(try_cast_usize(i8::max_value()).is_some());
+        assert!(try_cast_isize(i8::max_value()).is_some());
+
+        // i16
+        assert!(try_cast_u8(i16::min_value()).is_none());
+        assert!(try_cast_u16(i16::min_value()).is_none());
+        assert!(try_cast_u32(i16::min_value()).is_none());
+        assert!(try_cast_u64(i16::min_value()).is_none());
+        assert!(try_cast_u128(i16::min_value()).is_none());
+        assert!(try_cast_i8(i16::min_value()).is_none());
+        assert!(try_cast_i16(i16::min_value()).is_some());
+        assert!(try_cast_i32(i16::min_value()).is_some());
+        assert!(try_cast_i64(i16::min_value()).is_some());
+        assert!(try_cast_i128(i16::min_value()).is_some());
+        assert!(try_cast_u8(i16::zero()).is_some());
+        assert!(try_cast_u16(i16::zero()).is_some());
+        assert!(try_cast_u32(i16::zero()).is_some());
+        assert!(try_cast_u64(i16::zero()).is_some());
+        assert!(try_cast_u128(i16::zero()).is_some());
+        assert!(try_cast_i8(i16::zero()).is_some());
+        assert!(try_cast_i16(i16::zero()).is_some());
+        assert!(try_cast_i32(i16::zero()).is_some());
+        assert!(try_cast_i64(i16::zero()).is_some());
+        assert!(try_cast_i128(i16::zero()).is_some());
+        assert!(try_cast_u8(i16::max_value()).is_none());
+        assert!(try_cast_u16(i16::max_value()).is_some());
+        assert!(try_cast_u32(i16::max_value()).is_some());
+        assert!(try_cast_u64(i16::max_value()).is_some());
+        assert!(try_cast_u128(i16::max_value()).is_some());
+        assert!(try_cast_i8(i16::max_value()).is_none());
+        assert!(try_cast_i16(i16::max_value()).is_some());
+        assert!(try_cast_i32(i16::max_value()).is_some());
+        assert!(try_cast_i64(i16::max_value()).is_some());
+        assert!(try_cast_i128(i16::max_value()).is_some());
+        assert!(try_cast_usize(i16::min_value()).is_none());
+        assert!(try_cast_isize(i16::min_value()).is_some());
+        assert!(try_cast_usize(i16::zero()).is_some());
+        assert!(try_cast_isize(i16::zero()).is_some());
+        assert!(try_cast_usize(i16::max_value()).is_some());
+        assert!(try_cast_isize(i16::max_value()).is_some());
+
+        // i32
+        assert!(try_cast_u8(i32::min_value()).is_none());
+        assert!(try_cast_u16(i32::min_value()).is_none());
+        assert!(try_cast_u32(i32::min_value()).is_none());
+        assert!(try_cast_u64(i32::min_value()).is_none());
+        assert!(try_cast_u128(i32::min_value()).is_none());
+        assert!(try_cast_i8(i32::min_value()).is_none());
+        assert!(try_cast_i16(i32::min_value()).is_none());
+        assert!(try_cast_i32(i32::min_value()).is_some());
+        assert!(try_cast_i64(i32::min_value()).is_some());
+        assert!(try_cast_i128(i32::min_value()).is_some());
+        assert!(try_cast_u8(i32::zero()).is_some());
+        assert!(try_cast_u16(i32::zero()).is_some());
+        assert!(try_cast_u32(i32::zero()).is_some());
+        assert!(try_cast_u64(i32::zero()).is_some());
+        assert!(try_cast_u128(i32::zero()).is_some());
+        assert!(try_cast_i8(i32::zero()).is_some());
+        assert!(try_cast_i16(i32::zero()).is_some());
+        assert!(try_cast_i32(i32::zero()).is_some());
+        assert!(try_cast_i64(i32::zero()).is_some());
+        assert!(try_cast_i128(i32::zero()).is_some());
+        assert!(try_cast_u8(i32::max_value()).is_none());
+        assert!(try_cast_u16(i32::max_value()).is_none());
+        assert!(try_cast_u32(i32::max_value()).is_some());
+        assert!(try_cast_u64(i32::max_value()).is_some());
+        assert!(try_cast_u128(i32::max_value()).is_some());
+        assert!(try_cast_i8(i32::max_value()).is_none());
+        assert!(try_cast_i16(i32::max_value()).is_none());
+        assert!(try_cast_i32(i32::max_value()).is_some());
+        assert!(try_cast_i64(i32::max_value()).is_some());
+        assert!(try_cast_i128(i32::max_value()).is_some());
+        assert!(try_cast_usize(i32::zero()).is_some());
+        assert!(try_cast_isize(i32::zero()).is_some());
+        // Discard the results, since platform dependent. Just check it compiles.
+        try_cast_usize(i32::min_value());
+        try_cast_isize(i32::min_value());
+        try_cast_usize(i32::max_value());
+        try_cast_isize(i32::max_value());
+
+        // i64
+        assert!(try_cast_u8(i64::min_value()).is_none());
+        assert!(try_cast_u16(i64::min_value()).is_none());
+        assert!(try_cast_u32(i64::min_value()).is_none());
+        assert!(try_cast_u64(i64::min_value()).is_none());
+        assert!(try_cast_u128(i64::min_value()).is_none());
+        assert!(try_cast_i8(i64::min_value()).is_none());
+        assert!(try_cast_i16(i64::min_value()).is_none());
+        assert!(try_cast_i32(i64::min_value()).is_none());
+        assert!(try_cast_i64(i64::min_value()).is_some());
+        assert!(try_cast_i128(i64::min_value()).is_some());
+        assert!(try_cast_u8(i64::zero()).is_some());
+        assert!(try_cast_u16(i64::zero()).is_some());
+        assert!(try_cast_u32(i64::zero()).is_some());
+        assert!(try_cast_u64(i64::zero()).is_some());
+        assert!(try_cast_u128(i64::zero()).is_some());
+        assert!(try_cast_i8(i64::zero()).is_some());
+        assert!(try_cast_i16(i64::zero()).is_some());
+        assert!(try_cast_i32(i64::zero()).is_some());
+        assert!(try_cast_i64(i64::zero()).is_some());
+        assert!(try_cast_i128(i64::zero()).is_some());
+        assert!(try_cast_u8(i64::max_value()).is_none());
+        assert!(try_cast_u16(i64::max_value()).is_none());
+        assert!(try_cast_u32(i64::max_value()).is_none());
+        assert!(try_cast_u64(i64::max_value()).is_some());
+        assert!(try_cast_u128(i64::max_value()).is_some());
+        assert!(try_cast_i8(i64::max_value()).is_none());
+        assert!(try_cast_i16(i64::max_value()).is_none());
+        assert!(try_cast_i32(i64::max_value()).is_none());
+        assert!(try_cast_i64(i64::max_value()).is_some());
+        assert!(try_cast_i128(i64::max_value()).is_some());
+        assert!(try_cast_usize(i64::zero()).is_some());
+        assert!(try_cast_isize(i64::zero()).is_some());
+        // Discard the results, since platform dependent. Just check it compiles.
+        try_cast_usize(i64::min_value());
+        try_cast_isize(i64::min_value());
+        try_cast_usize(i64::max_value());
+        try_cast_isize(i64::max_value());
+
+        // i128
+        assert!(try_cast_u8(i128::min_value()).is_none());
+        assert!(try_cast_u16(i128::min_value()).is_none());
+        assert!(try_cast_u32(i128::min_value()).is_none());
+        assert!(try_cast_u64(i128::min_value()).is_none());
+        assert!(try_cast_u128(i128::min_value()).is_none());
+        assert!(try_cast_i8(i128::min_value()).is_none());
+        assert!(try_cast_i16(i128::min_value()).is_none());
+        assert!(try_cast_i32(i128::min_value()).is_none());
+        assert!(try_cast_i64(i128::min_value()).is_none());
+        assert!(try_cast_i128(i128::min_value()).is_some());
+        assert!(try_cast_u8(i128::zero()).is_some());
+        assert!(try_cast_u16(i128::zero()).is_some());
+        assert!(try_cast_u32(i128::zero()).is_some());
+        assert!(try_cast_u64(i128::zero()).is_some());
+        assert!(try_cast_u128(i128::zero()).is_some());
+        assert!(try_cast_i8(i128::zero()).is_some());
+        assert!(try_cast_i16(i128::zero()).is_some());
+        assert!(try_cast_i32(i128::zero()).is_some());
+        assert!(try_cast_i64(i128::zero()).is_some());
+        assert!(try_cast_i128(i128::zero()).is_some());
+        assert!(try_cast_u8(i128::max_value()).is_none());
+        assert!(try_cast_u16(i128::max_value()).is_none());
+        assert!(try_cast_u32(i128::max_value()).is_none());
+        assert!(try_cast_u64(i128::max_value()).is_none());
+        assert!(try_cast_u128(i128::max_value()).is_some());
+        assert!(try_cast_i8(i128::max_value()).is_none());
+        assert!(try_cast_i16(i128::max_value()).is_none());
+        assert!(try_cast_i32(i128::max_value()).is_none());
+        assert!(try_cast_i64(i128::max_value()).is_none());
+        assert!(try_cast_i128(i128::max_value()).is_some());
+        assert!(try_cast_usize(i128::min_value()).is_none());
+        assert!(try_cast_isize(i128::min_value()).is_none());
+        assert!(try_cast_usize(i128::zero()).is_some());
+        assert!(try_cast_isize(i128::zero()).is_some());
+        assert!(try_cast_usize(i128::max_value()).is_none());
+        assert!(try_cast_isize(i128::max_value()).is_none());
+
+        // usize
+        assert!(try_cast_u8(usize::min_value()).is_some());
+        assert!(try_cast_u16(usize::min_value()).is_some());
+        assert!(try_cast_u32(usize::min_value()).is_some());
+        assert!(try_cast_u64(usize::min_value()).is_some());
+        assert!(try_cast_u128(usize::min_value()).is_some());
+        assert!(try_cast_i8(usize::min_value()).is_some());
+        assert!(try_cast_i16(usize::min_value()).is_some());
+        assert!(try_cast_i32(usize::min_value()).is_some());
+        assert!(try_cast_i64(usize::min_value()).is_some());
+        assert!(try_cast_i128(usize::min_value()).is_some());
+        assert!(try_cast_u8(usize::max_value()).is_none());
+        assert!(try_cast_u64(usize::max_value()).is_some());
+        assert!(try_cast_u128(usize::max_value()).is_some());
+        assert!(try_cast_i8(usize::max_value()).is_none());
+        assert!(try_cast_i16(usize::max_value()).is_none());
+        assert!(try_cast_i128(usize::max_value()).is_some());
+        assert!(try_cast_usize(usize::min_value()).is_some());
+        assert!(try_cast_isize(usize::min_value()).is_some());
+        assert!(try_cast_usize(usize::max_value()).is_some());
+        assert!(try_cast_isize(usize::max_value()).is_none());
+        // Discard the results, since platform dependent. Just check it compiles.
+        try_cast_u16(usize::max_value());
+        try_cast_u32(usize::max_value());
+        try_cast_i32(usize::max_value());
+        try_cast_i64(usize::max_value());
+
+        // isize
+        assert!(try_cast_u8(isize::min_value()).is_none());
+        assert!(try_cast_u16(isize::min_value()).is_none());
+        assert!(try_cast_u32(isize::min_value()).is_none());
+        assert!(try_cast_u64(isize::min_value()).is_none());
+        assert!(try_cast_u128(isize::min_value()).is_none());
+        assert!(try_cast_i8(isize::min_value()).is_none());
+        assert!(try_cast_i64(isize::min_value()).is_some());
+        assert!(try_cast_i128(isize::min_value()).is_some());
+        assert!(try_cast_u8(isize::zero()).is_some());
+        assert!(try_cast_u16(isize::zero()).is_some());
+        assert!(try_cast_u32(isize::zero()).is_some());
+        assert!(try_cast_u64(isize::zero()).is_some());
+        assert!(try_cast_u128(isize::zero()).is_some());
+        assert!(try_cast_i8(isize::zero()).is_some());
+        assert!(try_cast_i16(isize::zero()).is_some());
+        assert!(try_cast_i32(isize::zero()).is_some());
+        assert!(try_cast_i64(isize::zero()).is_some());
+        assert!(try_cast_i128(isize::zero()).is_some());
+        assert!(try_cast_u8(isize::max_value()).is_none());
+        assert!(try_cast_u64(isize::max_value()).is_some());
+        assert!(try_cast_u128(isize::max_value()).is_some());
+        assert!(try_cast_i8(isize::max_value()).is_none());
+        assert!(try_cast_i64(isize::max_value()).is_some());
+        assert!(try_cast_i128(isize::max_value()).is_some());
+        assert!(try_cast_usize(isize::min_value()).is_none());
+        assert!(try_cast_isize(isize::min_value()).is_some());
+        assert!(try_cast_usize(isize::zero()).is_some());
+        assert!(try_cast_isize(isize::zero()).is_some());
+        assert!(try_cast_usize(isize::max_value()).is_some());
+        assert!(try_cast_isize(isize::max_value()).is_some());
+
+        // Discard the results, since platform dependent. Just check it compiles.
+        try_cast_i16(isize::min_value());
+        try_cast_i32(isize::min_value());
+        try_cast_u16(isize::max_value());
+        try_cast_u32(isize::max_value());
+        try_cast_i16(isize::max_value());
+        try_cast_i32(isize::max_value());
+    }
+
+    #[allow(dead_code)]     // Compile-only
+    fn try_float_cast_test() {
+        // from f32
+        try_cast_u8(f32::MIN);
+        try_cast_u16(f32::MIN);
+        try_cast_u32(f32::MIN);
+        try_cast_u64(f32::MIN);
+        try_cast_u128(f32::MIN);
+        try_cast_usize(f32::MIN);
+        try_cast_i8(f32::MIN);
+        try_cast_i16(f32::MIN);
+        try_cast_i32(f32::MIN);
+        try_cast_i64(f32::MIN);
+        try_cast_i128(f32::MIN);
+        try_cast_isize(f32::MIN);
+
+        // from f64
+        try_cast_u8(f64::MIN);
+        try_cast_u16(f64::MIN);
+        try_cast_u32(f64::MIN);
+        try_cast_u64(f64::MIN);
+        try_cast_u128(f64::MIN);
+        try_cast_usize(f64::MIN);
+        try_cast_i8(f64::MIN);
+        try_cast_i16(f64::MIN);
+        try_cast_i32(f64::MIN);
+        try_cast_i64(f64::MIN);
+        try_cast_i128(f64::MIN);
+        try_cast_isize(f64::MIN);
+
+        // into f32
+        try_cast_f32(u8::min_value());
+        try_cast_f32(u16::min_value());
+        try_cast_f32(u32::min_value());
+        try_cast_f32(u64::min_value());
+        try_cast_f32(u128::min_value());
+        try_cast_f32(usize::min_value());
+        try_cast_f32(i8::min_value());
+        try_cast_f32(i16::min_value());
+        try_cast_f32(i32::min_value());
+        try_cast_f32(i64::min_value());
+        try_cast_f32(i128::min_value());
+        try_cast_f32(isize::min_value());
+        try_cast_f32(f32::MIN);
+        try_cast_f32(f64::MIN);
+
+        // into f64
+        try_cast_f64(u8::min_value());
+        try_cast_f64(u16::min_value());
+        try_cast_f64(u32::min_value());
+        try_cast_f64(u64::min_value());
+        try_cast_f64(u128::min_value());
+        try_cast_f64(usize::min_value());
+        try_cast_f64(i8::min_value());
+        try_cast_f64(i16::min_value());
+        try_cast_f64(i32::min_value());
+        try_cast_f64(i64::min_value());
+        try_cast_f64(i128::min_value());
+        try_cast_f64(isize::min_value());
+        try_cast_f64(f32::MIN);
+        try_cast_f64(f64::MIN);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/config.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/config.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/config.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/config.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,711 @@
+//! Config settings for lexical-core.
+
+use crate::lib::slice;
+use super::algorithm::copy_to_dst;
+use super::rounding::RoundingKind;
+
+// HELPERS
+
+/// Determine if the character is a control character for integers or floats.
+/// Control characters include digits, `.`, `+`, and `-`.
+fn is_control_character(ch: u8, is_default: bool) -> bool {
+    if is_default {
+        // Default character handles radixes < 15 (where 'e'/'E' is a
+        // a valid exponent character).
+        match ch as char {
+            '0' ..= '9'     => true,
+            'a' ..= 'd'     => true,
+            'A' ..= 'D'     => true,
+            '.' | '+' | '-' => true,
+            _               => false,
+        }
+    } else {
+        // Backup character handles radixes >= 15 (where no digit is
+        // a valid exponent character).
+        match ch as char {
+            '0' ..= '9'     => true,
+            'a' ..= 'z'     => true,
+            'A' ..= 'Z'     => true,
+            '.' | '+' | '-' => true,
+            _               => false,
+        }
+    }
+}
+
+// Check if byte array starts with case-insensitive N.
+#[inline]
+fn starts_with_n(bytes: &[u8]) -> bool {
+    match bytes.get(0) {
+        Some(&b'N') => true,
+        Some(&b'n') => true,
+        _           => false,
+    }
+}
+
+// Check if byte array starts with case-insensitive I.
+#[inline]
+fn starts_with_i(bytes: &[u8]) -> bool {
+    match bytes.get(0) {
+        Some(&b'I') => true,
+        Some(&b'i') => true,
+        _           => false,
+    }
+}
+
+/// Fixed-size string for float configurations.
+///
+/// These values are guaranteed less than or equal to the maximum
+/// number of bytes after a sign byte has been written.
+pub(crate) struct FloatConfigString {
+    /// Storage data for the config string.
+    data: [u8; F32_FORMATTED_SIZE - 1],
+    /// Actual length of the data.
+    length: usize,
+}
+
+impl FloatConfigString {
+    /// Reset data from a byte string.
+    pub(crate) fn load_bytes(&mut self, bytes: &[u8]) {
+        assert!(bytes.len() <= self.data.len());
+        copy_to_dst(&mut self.data, bytes);
+        self.length = bytes.len();
+    }
+
+    /// Convert to byte slice.
+    pub(crate) fn as_bytes(&self) -> &[u8] {
+        // Always safe, since length can only be set from `load_bytes`.
+        unsafe {
+            self.data.get_unchecked(..self.length)
+        }
+    }
+}
+
+// GLOBALS
+
+/// Default character for scientific notation, used when the `radix < 15`.
+static mut EXPONENT_DEFAULT_CHAR: u8 = b'e';
+
+/// Backup character for scientific notation, used when the `radix >= 15`.
+#[cfg(feature ="radix")]
+static mut EXPONENT_BACKUP_CHAR: u8 = b'^';
+
+/// The rounding scheme for float conversions.
+#[cfg(feature = "rounding")]
+static mut FLOAT_ROUNDING: RoundingKind = RoundingKind::NearestTieEven;
+
+cfg_if! {
+    if #[cfg(feature = "radix")] {
+        /// Not a Number literal.
+        static mut NAN_STRING: FloatConfigString = FloatConfigString {
+            // b"NaN"
+            data: [b'N', b'a', b'N', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0'],
+            length: 3
+        };
+
+        /// Short infinity literal.
+        static mut INF_STRING: FloatConfigString = FloatConfigString {
+            // b"inf"
+            data: [b'i', b'n', b'f', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0'],
+            length: 3
+        };
+
+        /// Long infinity literal.
+        static mut INFINITY_STRING: FloatConfigString = FloatConfigString {
+            // b"infinity"
+            data: [b'i', b'n', b'f', b'i', b'n', b'i', b't', b'y', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0'],
+            length: 8
+        };
+    } else {
+        /// Not a Number literal.
+        static mut NAN_STRING: FloatConfigString = FloatConfigString {
+            // b"NaN"
+            data: [b'N', b'a', b'N', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0'],
+            length: 3
+        };
+
+        /// Short infinity literal.
+        static mut INF_STRING: FloatConfigString = FloatConfigString {
+            // b"inf"
+            data: [b'i', b'n', b'f', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0'],
+            length: 3
+        };
+
+        /// Long infinity literal.
+        static mut INFINITY_STRING: FloatConfigString = FloatConfigString {
+            // b"infinity"
+            data: [b'i', b'n', b'f', b'i', b'n', b'i', b't', b'y', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0', b'0'],
+            length: 8
+        };
+    }
+}   // cfg_if
+
+// GETTERS/SETTERS
+
+/// Get default character for the exponent symbol.
+///
+/// Default character for scientific notation, used when the `radix < 15`.
+#[inline]
+pub fn get_exponent_default_char() -> u8
+{
+    unsafe {
+        EXPONENT_DEFAULT_CHAR
+    }
+}
+
+/// Set the default character for the exponent symbol.
+///
+/// Default character for scientific notation, used when the `radix < 15`.
+///
+/// To change the expected, default character for an exponent,
+/// change this value before using lexical.
+///
+/// * `ch`      - Character for exponent symbol.
+///
+/// # Safety
+///
+/// Do not call this function in threaded-code, as it is not thread-safe.
+/// Do not call this function after compiling any formats.
+///
+/// # Panics
+///
+/// Panics if the character is in the character set `[A-Da-d.+\-]`.
+#[inline]
+pub unsafe fn set_exponent_default_char(ch: u8)
+{
+    assert!(!is_control_character(ch, true));
+    EXPONENT_DEFAULT_CHAR = ch
+}
+
+/// Get backup character for the exponent symbol.
+///
+/// For numerical strings of `radix >= 15`, 'e' or 'E' is a valid digit,
+/// and therefore may no longer be used as a marker for the exponent.
+#[inline]
+#[cfg(feature ="radix")]
+pub fn get_exponent_backup_char() -> u8
+{
+    unsafe {
+        EXPONENT_BACKUP_CHAR
+    }
+}
+
+/// Set the backup character for the exponent symbol.
+///
+/// For numerical strings of `radix >= 15`, 'e' or 'E' is a valid digit,
+/// and therefore may no longer be used as a marker for the exponent.
+///
+/// To change the expected, backup character for an exponent,
+/// change this value before using lexical.
+///
+/// * `ch`      - Character for exponent symbol.
+///
+/// # Safety
+///
+/// Do not call this function in threaded-code, as it is not thread-safe.
+/// Do not call this function after compiling any formats.
+///
+/// # Panics
+///
+/// Panics if the character is in the character set `[A-Za-z.+\-]`.
+#[inline]
+#[cfg(feature ="radix")]
+pub unsafe fn set_exponent_backup_char(ch: u8)
+{
+    assert!(!is_control_character(ch, false));
+    EXPONENT_BACKUP_CHAR = ch
+}
+
+/// Get the default rounding scheme for float conversions.
+///
+/// This defines the global rounding-scheme for float parsing operations.
+/// By default, this is set to `RoundingKind::NearestTieEven`. IEEE754
+/// recommends this as the default for all for decimal and binary
+/// operations.
+#[inline]
+#[cfg(feature = "rounding")]
+pub fn get_float_rounding() -> RoundingKind {
+    unsafe {
+        FLOAT_ROUNDING
+    }
+}
+
+/// Set the default rounding scheme for float conversions.
+///
+/// This defines the global rounding-scheme for float parsing operations.
+/// By default, this is set to `RoundingKind::NearestTieEven`. IEEE754
+/// recommends this as the default for all for decimal and binary
+/// operations.
+///
+/// # Safety
+///
+/// Do not modify this value in threaded-code, as it is not thread-safe.
+#[inline]
+#[cfg(feature = "rounding")]
+pub unsafe fn set_float_rounding(rounding: RoundingKind) {
+    FLOAT_ROUNDING = rounding
+}
+
+/// Get string representation of Not a Number as a byte slice.
+#[inline]
+pub fn get_nan_string() -> &'static [u8]
+{
+    unsafe {
+        NAN_STRING.as_bytes()
+    }
+}
+
+/// Set representation of Not a Number from a byte slice.
+///
+/// * `bytes`    - Slice of bytes to assign as NaN string representation.
+///
+/// # Safety
+///
+/// Do not call this function in threaded-code, as it is not thread-safe.
+///
+/// # Panics
+///
+/// Panics if:
+/// - `bytes.len() >= f32::FORMATTED_SIZE`
+/// - `bytes` is empty
+/// - `bytes` does not start with an `'N'` or `'n'`.
+#[inline]
+pub unsafe fn set_nan_string(bytes: &[u8])
+{
+    assert!(starts_with_n(bytes));
+    NAN_STRING.load_bytes(bytes);
+}
+
+/// Get the short representation of an Infinity literal as a byte slice.
+#[inline]
+pub fn get_inf_string() -> &'static [u8]
+{
+    unsafe {
+        INF_STRING.as_bytes()
+    }
+}
+
+/// Set the short representation of Infinity from a byte slice.
+///
+/// * `bytes`    - Slice of bytes to assign as Infinity string representation.
+///
+/// # Safety
+///
+/// Do not call this function in threaded-code, as it is not thread-safe.
+///
+/// # Panics
+///
+/// Panics if:
+/// - `bytes.len() >= f32::FORMATTED_SIZE`
+/// - `bytes.len() >= get_infinity_string().len()`
+/// - `bytes` is empty
+/// - `bytes` does not start with an `'I'` or `'i'`.
+#[inline]
+pub unsafe fn set_inf_string(bytes: &[u8])
+{
+    assert!(starts_with_i(bytes) && bytes.len() <= INFINITY_STRING.length);
+    INF_STRING.load_bytes(bytes);
+}
+
+/// Get the long representation of an Infinity literal as a byte slice.
+#[inline]
+pub fn get_infinity_string() -> &'static [u8]
+{
+    unsafe {
+        INFINITY_STRING.as_bytes()
+    }
+}
+
+/// Set the long representation of Infinity from a byte slice.
+///
+/// * `bytes`    - Slice of bytes to assign as Infinity string representation.
+///
+/// # Safety
+///
+/// Do not call this function in threaded-code, as it is not thread-safe.
+///
+/// # Panics
+///
+/// Panics if:
+/// - `bytes.len() >= f32::FORMATTED_SIZE`
+/// - `bytes.len() < get_inf_string().len()`
+/// - `bytes` is empty
+/// - `bytes` does not start with an `'I'` or `'i'`.
+#[inline]
+pub unsafe fn set_infinity_string(bytes: &[u8])
+{
+    assert!(starts_with_i(bytes) && bytes.len() >= INF_STRING.length);
+    INFINITY_STRING.load_bytes(bytes);
+}
+
+// CONSTANTS
+
+// The f64 buffer is actually a size of 60, but use 64 since it's a
+// power of 2.
+pub(crate) const I8_FORMATTED_SIZE_DECIMAL: usize = 4;
+pub(crate) const I16_FORMATTED_SIZE_DECIMAL: usize = 6;
+pub(crate) const I32_FORMATTED_SIZE_DECIMAL: usize = 11;
+pub(crate) const I64_FORMATTED_SIZE_DECIMAL: usize = 20;
+pub(crate) const U8_FORMATTED_SIZE_DECIMAL: usize = 3;
+pub(crate) const U16_FORMATTED_SIZE_DECIMAL: usize = 5;
+pub(crate) const U32_FORMATTED_SIZE_DECIMAL: usize = 10;
+pub(crate) const U64_FORMATTED_SIZE_DECIMAL: usize = 20;
+pub(crate) const F32_FORMATTED_SIZE_DECIMAL: usize = 64;
+pub(crate) const F64_FORMATTED_SIZE_DECIMAL: usize = 64;
+pub(crate) const I128_FORMATTED_SIZE_DECIMAL: usize = 40;
+pub(crate) const U128_FORMATTED_SIZE_DECIMAL: usize = 39;
+
+// Simple, fast optimization.
+// Since we're declaring a variable on the stack, and our power-of-two
+// alignment dramatically improved atoi performance, do it.
+cfg_if! {
+if #[cfg(feature = "radix")] {
+    // Use 256, actually, since we seem to have memory issues with f64.
+    // Clearly not sufficient memory allocated for non-decimal values.
+    pub(crate) const I8_FORMATTED_SIZE: usize = 16;
+    pub(crate) const I16_FORMATTED_SIZE: usize = 32;
+    pub(crate) const I32_FORMATTED_SIZE: usize = 64;
+    pub(crate) const I64_FORMATTED_SIZE: usize = 128;
+    pub(crate) const U8_FORMATTED_SIZE: usize = 16;
+    pub(crate) const U16_FORMATTED_SIZE: usize = 32;
+    pub(crate) const U32_FORMATTED_SIZE: usize = 64;
+    pub(crate) const U64_FORMATTED_SIZE: usize = 128;
+    pub(crate) const F32_FORMATTED_SIZE: usize = 256;
+    pub(crate) const F64_FORMATTED_SIZE: usize = 256;
+    pub(crate) const I128_FORMATTED_SIZE: usize = 256;
+    pub(crate) const U128_FORMATTED_SIZE: usize = 256;
+} else {
+    // The f64 buffer is actually a size of 60, but use 64 since it's a
+    // power of 2.
+    pub(crate) const I8_FORMATTED_SIZE: usize = I8_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const I16_FORMATTED_SIZE: usize = I16_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const I32_FORMATTED_SIZE: usize = I32_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const I64_FORMATTED_SIZE: usize = I64_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const U8_FORMATTED_SIZE: usize = U8_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const U16_FORMATTED_SIZE: usize = U16_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const U32_FORMATTED_SIZE: usize = U32_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const U64_FORMATTED_SIZE: usize = U64_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const F32_FORMATTED_SIZE: usize = F32_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const F64_FORMATTED_SIZE: usize = F64_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const I128_FORMATTED_SIZE: usize = I128_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const U128_FORMATTED_SIZE: usize = U128_FORMATTED_SIZE_DECIMAL;
+}} // cfg_if
+
+cfg_if! {
+if #[cfg(target_pointer_width = "16")] {
+    pub(crate) const ISIZE_FORMATTED_SIZE: usize = I16_FORMATTED_SIZE;
+    pub(crate) const ISIZE_FORMATTED_SIZE_DECIMAL: usize = I16_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const USIZE_FORMATTED_SIZE: usize = U16_FORMATTED_SIZE;
+    pub(crate) const USIZE_FORMATTED_SIZE_DECIMAL: usize = U16_FORMATTED_SIZE_DECIMAL;
+} else if #[cfg(target_pointer_width = "32")] {
+    pub(crate) const ISIZE_FORMATTED_SIZE: usize = I32_FORMATTED_SIZE;
+    pub(crate) const ISIZE_FORMATTED_SIZE_DECIMAL: usize = I32_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const USIZE_FORMATTED_SIZE: usize = U32_FORMATTED_SIZE;
+    pub(crate) const USIZE_FORMATTED_SIZE_DECIMAL: usize = U32_FORMATTED_SIZE_DECIMAL;
+} else if #[cfg(target_pointer_width = "64")] {
+    pub(crate) const ISIZE_FORMATTED_SIZE: usize = I64_FORMATTED_SIZE;
+    pub(crate) const ISIZE_FORMATTED_SIZE_DECIMAL: usize = I64_FORMATTED_SIZE_DECIMAL;
+    pub(crate) const USIZE_FORMATTED_SIZE: usize = U64_FORMATTED_SIZE;
+    pub(crate) const USIZE_FORMATTED_SIZE_DECIMAL: usize = U64_FORMATTED_SIZE_DECIMAL;
+}}  // cfg_if
+
+/// Maximum number of bytes required to serialize any number to string.
+pub const BUFFER_SIZE: usize = F64_FORMATTED_SIZE;
+
+// FUNCTIONS
+
+/// Get the exponent notation character.
+#[inline]
+#[allow(unused_variables)]
+pub(crate) fn exponent_notation_char(radix: u32) -> u8 {
+    #[cfg(not(feature ="radix"))] {
+        get_exponent_default_char()
+    }
+
+    #[cfg(feature ="radix")] {
+        if radix >= 15 {
+            get_exponent_backup_char()
+        } else {
+            get_exponent_default_char()
+        }
+    }
+}
+
+// TEST
+// ----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::*;
+    use crate::util::test::*;
+    use super::*;
+
+    #[cfg(feature ="radix")]
+    #[test]
+    fn exponent_notation_char_test() {
+        let default = get_exponent_default_char();
+        let backup = get_exponent_backup_char();
+        assert_eq!(exponent_notation_char(2), default);
+        assert_eq!(exponent_notation_char(8), default);
+        assert_eq!(exponent_notation_char(10), default);
+        assert_eq!(exponent_notation_char(15), backup);
+        assert_eq!(exponent_notation_char(16), backup);
+        assert_eq!(exponent_notation_char(32), backup);
+    }
+
+    // Only enable when no other threads touch NAN_STRING or INFINITY_STRING.
+    #[test]
+    #[ignore]
+    fn special_bytes_test() {
+        unsafe {
+            let mut buffer = new_buffer();
+            // Test serializing and deserializing special strings.
+            assert!(f32::from_lexical(b"NaN").unwrap().is_nan());
+            assert!(f32::from_lexical(b"nan").unwrap().is_nan());
+            assert!(f32::from_lexical(b"NAN").unwrap().is_nan());
+            assert!(f32::from_lexical(b"inf").unwrap().is_infinite());
+            assert!(f32::from_lexical(b"INF").unwrap().is_infinite());
+            assert!(f32::from_lexical(b"Infinity").unwrap().is_infinite());
+            assert_eq!(f64::NAN.to_lexical(&mut buffer), b"NaN");
+            assert_eq!(f64::INFINITY.to_lexical(&mut buffer), b"inf");
+
+            set_nan_string(b"nan");
+            set_inf_string(b"Infinity");
+
+            assert!(f32::from_lexical(b"inf").err().unwrap().code == ErrorCode::InvalidDigit);
+            assert!(f32::from_lexical(b"Infinity").unwrap().is_infinite());
+            assert_eq!(f64::NAN.to_lexical(&mut buffer), b"nan");
+            assert_eq!(f64::INFINITY.to_lexical(&mut buffer), b"Infinity");
+
+            set_nan_string(b"NaN");
+            set_inf_string(b"inf");
+        }
+    }
+
+    // Only enable when no other threads touch FLOAT_ROUNDING.
+    #[cfg(all(feature = "correct", feature = "rounding"))]
+    #[test]
+    #[ignore]
+    fn special_rounding_test() {
+        // Each one of these pairs is halfway, and we can detect the
+        // rounding schemes from this.
+        unsafe {
+            // Nearest, tie-even
+            set_float_rounding(RoundingKind::NearestTieEven);
+            assert_eq!(f64::from_lexical(b"-9007199254740993").unwrap(), -9007199254740992.0);
+            assert_eq!(f64::from_lexical(b"-9007199254740995").unwrap(), -9007199254740996.0);
+            assert_eq!(f64::from_lexical(b"9007199254740993").unwrap(), 9007199254740992.0);
+            assert_eq!(f64::from_lexical(b"9007199254740995").unwrap(), 9007199254740996.0);
+
+            // Nearest, tie-away-zero
+            set_float_rounding(RoundingKind::NearestTieAwayZero);
+            assert_eq!(f64::from_lexical(b"-9007199254740993").unwrap(), -9007199254740994.0);
+            assert_eq!(f64::from_lexical(b"-9007199254740995").unwrap(), -9007199254740996.0);
+            assert_eq!(f64::from_lexical(b"9007199254740993").unwrap(), 9007199254740994.0);
+            assert_eq!(f64::from_lexical(b"9007199254740995").unwrap(), 9007199254740996.0);
+
+            // Toward positive infinity
+            set_float_rounding(RoundingKind::TowardPositiveInfinity);
+            assert_eq!(f64::from_lexical(b"-9007199254740993").unwrap(), -9007199254740992.0);
+            assert_eq!(f64::from_lexical(b"-9007199254740995").unwrap(), -9007199254740994.0);
+            assert_eq!(f64::from_lexical(b"9007199254740993").unwrap(), 9007199254740994.0);
+            assert_eq!(f64::from_lexical(b"9007199254740995").unwrap(), 9007199254740996.0);
+
+            // Toward negative infinity
+            set_float_rounding(RoundingKind::TowardNegativeInfinity);
+            assert_eq!(f64::from_lexical(b"-9007199254740993").unwrap(), -9007199254740994.0);
+            assert_eq!(f64::from_lexical(b"-9007199254740995").unwrap(), -9007199254740996.0);
+            assert_eq!(f64::from_lexical(b"9007199254740993").unwrap(), 9007199254740992.0);
+            assert_eq!(f64::from_lexical(b"9007199254740995").unwrap(), 9007199254740994.0);
+
+            // Toward zero
+            set_float_rounding(RoundingKind::TowardZero);
+            assert_eq!(f64::from_lexical(b"-9007199254740993").unwrap(), -9007199254740992.0);
+            assert_eq!(f64::from_lexical(b"-9007199254740995").unwrap(), -9007199254740994.0);
+            assert_eq!(f64::from_lexical(b"9007199254740993").unwrap(), 9007199254740992.0);
+            assert_eq!(f64::from_lexical(b"9007199254740995").unwrap(), 9007199254740994.0);
+
+            // Reset to default
+            set_float_rounding(RoundingKind::NearestTieEven);
+        }
+    }
+
+    // Only enable when no other threads touch FLOAT_ROUNDING.
+    #[cfg(all(feature = "correct", feature = "radix", feature = "rounding"))]
+    #[test]
+    #[ignore]
+    fn special_rounding_binary_test() {
+        // Each one of these pairs is halfway, and we can detect the
+        // rounding schemes from this.
+        unsafe {
+            // Nearest, tie-even
+            set_float_rounding(RoundingKind::NearestTieEven);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000001", 2).unwrap(), -9007199254740992.0);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000011", 2).unwrap(), -9007199254740996.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000001", 2).unwrap(), 9007199254740992.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000011", 2).unwrap(), 9007199254740996.0);
+
+            // Nearest, tie-away-zero
+            set_float_rounding(RoundingKind::NearestTieAwayZero);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000001", 2).unwrap(), -9007199254740994.0);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000011", 2).unwrap(), -9007199254740996.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000001", 2).unwrap(), 9007199254740994.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000011", 2).unwrap(), 9007199254740996.0);
+
+            // Toward positive infinity
+            set_float_rounding(RoundingKind::TowardPositiveInfinity);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000001", 2).unwrap(), -9007199254740992.0);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000011", 2).unwrap(), -9007199254740994.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000001", 2).unwrap(), 9007199254740994.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000011", 2).unwrap(), 9007199254740996.0);
+
+            // Toward negative infinity
+            set_float_rounding(RoundingKind::TowardNegativeInfinity);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000001", 2).unwrap(), -9007199254740994.0);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000011", 2).unwrap(), -9007199254740996.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000001", 2).unwrap(), 9007199254740992.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000011", 2).unwrap(), 9007199254740994.0);
+
+            // Toward zero
+            set_float_rounding(RoundingKind::TowardZero);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000001", 2).unwrap(), -9007199254740992.0);
+            assert_eq!(f64::from_lexical_radix(b"-100000000000000000000000000000000000000000000000000011", 2).unwrap(), -9007199254740994.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000001", 2).unwrap(), 9007199254740992.0);
+            assert_eq!(f64::from_lexical_radix(b"100000000000000000000000000000000000000000000000000011", 2).unwrap(), 9007199254740994.0);
+
+            // Reset to default
+            set_float_rounding(RoundingKind::NearestTieEven);
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_exponent_default_char_digit_test() {
+        unsafe {
+            set_exponent_default_char(b'0')
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_exponent_default_char_period_test() {
+        unsafe {
+            set_exponent_default_char(b'.')
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_exponent_default_char_add_test() {
+        unsafe {
+            set_exponent_default_char(b'+')
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_exponent_default_char_sub_test() {
+        unsafe {
+            set_exponent_default_char(b'-')
+        }
+    }
+
+    #[cfg(all(feature = "radix"))]
+    #[should_panic]
+    #[test]
+    fn set_exponent_backup_char_digit_test() {
+        unsafe {
+            set_exponent_backup_char(b'0')
+        }
+    }
+
+    #[cfg(all(feature = "radix"))]
+    #[should_panic]
+    #[test]
+    fn set_exponent_backup_char_period_test() {
+        unsafe {
+            set_exponent_backup_char(b'.')
+        }
+    }
+
+    #[cfg(all(feature = "radix"))]
+    #[should_panic]
+    #[test]
+    fn set_exponent_backup_char_add_test() {
+        unsafe {
+            set_exponent_backup_char(b'+')
+        }
+    }
+
+    #[cfg(all(feature = "radix"))]
+    #[should_panic]
+    #[test]
+    fn set_exponent_backup_char_sub_test() {
+        unsafe {
+            set_exponent_backup_char(b'-')
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_nan_string_empty_test() {
+        unsafe {
+            set_nan_string(b"")
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_nan_string_invalid_test() {
+        unsafe {
+            set_nan_string(b"i")
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_inf_string_empty_test() {
+        unsafe {
+            set_inf_string(b"")
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_inf_string_invalid_test() {
+        unsafe {
+            set_inf_string(b"n")
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_inf_string_long_test() {
+        unsafe {
+            set_inf_string(b"infinityinfinf")
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_infinity_string_empty_test() {
+        unsafe {
+            set_infinity_string(b"")
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_infinity_string_invalid_test() {
+        unsafe {
+            set_infinity_string(b"n")
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn set_infinity_string_short_test() {
+        unsafe {
+            set_infinity_string(b"i")
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/consume.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/consume.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/consume.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/consume.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1201 @@
+//! Algorithms to consume digits and digit separators.
+//!
+//! # Complexity
+//!
+//! Although superficially quite simple, the level of complexity
+//! introduced by digit separators can be quite complex, due
+//! the number of permutations during parsing.
+//!
+//! We can consume any combinations of of [0,3] items from the following set:
+//!     - [l]eading digit separators, where digit separators occur before digits.
+//!     - [i]nternal digit separators, where digit separators occur between digits.
+//!     - [t]railing digit separators, where digit separators occur after digits.
+//!
+//! In addition to those combinations, we can also have:
+//!     - [c]onsecutive digit separators, which allows two digit separators to be adjacent.
+//!
+//! # Shorthand
+//!
+//! We will use the term consumer to denote a function that consumes digits,
+//! splitting an input buffer at an index, where the leading section contains
+//! valid input digits, and the trailing section contains invalid characters.
+//! Due to the number of combinations for consumers, we use the following
+//! shorthand to denote consumers:
+//!     - `no`, does not use a digit separator.
+//!     - `l`, consumes leading digit separators.
+//!     - `i`, consumes internal digit separators.
+//!     - `t`, consumes trailing digit separators.
+//!     - `c`, consumes consecutive digit separators.
+//!
+//! Consumers are named `consume_digits_x_separator`, where `x` represents
+//! the shorthand name of the consumer, in sorted order. For example,
+//! `consume_digits_ilt` means that consumer can consume
+//! internal, leading, and trailing digit separators, but not
+//! consecutive ones.
+//!
+//! # Signature
+//!
+//! All low-level consumers have the following signature:
+//!
+//! ```text
+//! fn consumer<'a>(
+//!     digits: &'a [u8],
+//!     radix: u32,
+//!     digit_separator: u8
+//! ) -> (&'a [u8], &'a [u8]);
+//! ```
+//!
+//! All high-level consumers have the following signature:
+//!
+//! ```text
+//! fn consumer<'a>(
+//!     digits: &'a [u8],
+//!     radix: u32,
+//!     format: NumberFormat
+//! ) -> (&'a [u8], &'a [u8]);
+//! ```
+//!
+//! If the consumer does not require a digit separator, that value is
+//! simply ignored.
+
+use super::format::*;
+
+// HELPERS
+
+// Convert radix to value.
+macro_rules! to_digit {
+    ($c:expr, $radix:expr) => (($c as char).to_digit($radix));
+}
+
+// Convert character to digit.
+#[inline(always)]
+fn is_digit(c: u8, radix: u32) -> bool {
+    to_digit!(c, radix).is_some()
+}
+
+// Convert character to digit.
+#[cfg(feature = "format")]
+#[inline(always)]
+fn is_digit_or_separator(c: u8, radix: u32, digit_separator: u8) -> bool {
+    return is_digit(c, radix) || c == digit_separator
+}
+
+// Split buffer at index.
+#[inline(always)]
+fn split_at_index<'a>(digits: &'a [u8], index: usize)
+    -> (&'a [u8], &'a [u8])
+{
+    (&digits[..index], &digits[index..])
+}
+
+// CONSUMERS
+
+// We use the following convention to denote consumers:
+//  consume_digits_x, where `x` can be:
+//      - , does not use a digit separator.
+//      - l, consumes leading digit separators.
+//      - i, consumes internal digit separators.
+//      - t, consumes trailing digit separators.
+//      - c, consumes consecutive digit separators.
+//
+// It then can use any permutation of [lit], with an optional [c] for
+// each permutation, or use `` for no permutation.
+
+// Consume until a an invalid digit is found.
+// Does not consume any digit separators.
+#[inline]
+fn consume_digits<'a>(digits: &'a [u8], radix: u32, _: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all digits.
+    let mut index = 0;
+    while index < digits.len() && is_digit(index!(digits[index]), radix) {
+        index += 1;
+    }
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes internal digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_i<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all digits and internal digit separators, except for
+    // consecutive digit separators.
+    let mut previous = false;
+    let mut index = 0;
+    while index < digits.len() {
+        let c = index!(digits[index]);
+        if is_digit(c, radix) {
+            index += 1;
+            previous = false;
+        } else if c == digit_separator && index != 0 && !previous {
+            index += 1;
+            previous = true;
+        } else {
+            break;
+        }
+    }
+
+    // We've gone too far if:
+    //      1). The last character was a digit separator.
+    if previous {
+        index -= 1;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes internal and consecutive digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_ic<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all characters that are digits or digit separators, except
+    // for a leading digit separator.
+    let mut index = 0;
+    while index < digits.len() {
+        let c = index!(digits[index]);
+        if is_digit(c, radix) {
+            index += 1;
+        } else if c == digit_separator && index != 0 {
+            index += 1;
+        } else {
+            break;
+        }
+    }
+
+    // We've gone too far if:
+    //      1). The trailing digits are digit separators.
+    // Preconditions:
+    //      1). If index > 0, we know digits[0] has to a digit.
+    while index > 1 && index!(digits[index-1]) == digit_separator {
+        index -= 1;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes leading digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_l<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume leading digit separator, if applicable.
+    let mut index = 0;
+    if index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+    }
+
+    // Consume all interior digits.
+    // Store the previous index to later determine if any digits
+    // were consumed.
+    let prev_index = index;
+    while index < digits.len() && is_digit(index!(digits[index]), radix) {
+        index += 1;
+    }
+
+    // We've gone too far if:
+    //      1). We consumed no interior digits.
+    //      2). The next character is a digit separator (cannot be a digit).
+    if prev_index == index && index < digits.len() && index!(digits[index]) == digit_separator {
+        index = 0;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes leading and consecutive digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_lc<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all leading digit separators, if applicable.
+    let mut index = 0;
+    while index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+    }
+
+    // Consume all interior digits.
+    while index < digits.len() && is_digit(index!(digits[index]), radix) {
+        index += 1;
+    }
+
+    // We cannot have gone too far, because in order to be in an invalid
+    // state, we would have to consume 0 digits and the next character
+    // be a digit separator, which is impossible since we greedily
+    // consume leading digit separators.
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes trailing digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_t<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all interior digits.
+    let mut index = 0;
+    while index < digits.len() && is_digit(index!(digits[index]), radix) {
+        index += 1;
+    }
+
+    // Consume a trailing digit separator, if applicable.
+    // Store the previous index to later determine if a digit separator
+    // was consumed.
+    let prev_index = index;
+    if index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+    }
+
+    // We have gone too far if:
+    //      1). We consumed a trailing digit separator.
+    //      2). The next character is a digit or digit separator.
+    if index != prev_index && index < digits.len() && is_digit_or_separator(index!(digits[index]), radix, digit_separator) {
+        index = prev_index;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes trailing and consecutive digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_tc<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all interior digits.
+    let mut index = 0;
+    while index < digits.len() && is_digit(index!(digits[index]), radix) {
+        index += 1;
+    }
+
+    // Consume all trailing digit separators, if applicable.
+    // Store the previous index to later determine if any digit
+    // separators were consumed.
+    let prev_index = index;
+    while index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+    }
+
+    // We have gone too far if:
+    //      1). We consumed more than 1 trailing digit separators.
+    //      2). The next character is a digit (cannot be a digit separator).
+    if index != prev_index && index < digits.len() && is_digit(index!(digits[index]), radix) {
+        index = prev_index;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes leading and internal digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_il<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume digits and digit separators, until consecutive digit
+    // separators or invalid characters.
+    let mut previous = false;
+    let mut index = 0;
+    while index < digits.len() {
+        let c = index!(digits[index]);
+        if is_digit(c, radix) {
+            index += 1;
+            previous = false;
+        } else if c == digit_separator && !previous {
+            index += 1;
+            previous = true;
+        } else {
+            break;
+        }
+    }
+
+    // We've taken everything except consecutive digit separators.
+    // We've gone too far if:
+    //      1). The last index was a digit separator unless:
+    //          1). The current index is 1 (index 0 was a digit separator).
+    //          2). The current character is not a digit separator (cannot be a digit).
+    if previous && !(index == 1 && index < digits.len() && index!(digits[index]) != digit_separator) {
+        index -= 1;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes leading and internal digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_ilc<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume digits and digit separators until an invalid character.
+    let mut index = 0;
+    while index < digits.len() {
+        let c = index!(digits[index]);
+        if is_digit_or_separator(c, radix, digit_separator) {
+            index += 1;
+        } else {
+            break;
+        }
+    }
+
+    // We've taken everything except invalid characters.
+    // We have gone too far if:
+    //      1). We have trailing digit separators.
+    // Remove all trailing digit separators, however, store the index in
+    // case all are removed.
+    let current_index = index;
+    while index >= 1 && index!(digits[index-1]) == digit_separator {
+        index -= 1;
+    }
+
+    // All trailing digit separators were removed (or current_index is 0).
+    // Reset back to current index.
+    if index == 0 {
+        index = current_index;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes internal and trailing digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_it<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all characters that are digits or digit separators, except
+    // leading and consecutive digit separators.
+    let mut previous = false;
+    let mut index = 0;
+    while index < digits.len() {
+        let c = index!(digits[index]);
+        if is_digit(c, radix) {
+            index += 1;
+            previous = false;
+        } else if c == digit_separator && index != 0 && !previous {
+            index += 1;
+            previous = true;
+        } else {
+            break;
+        }
+    }
+
+    // We needed the check for `index != 0` to ensure we don't consume
+    // buffers like b"_123_". However, We might not have gotten a
+    // trailing separator if:
+    //      1). The index was 0, something like b"_.".
+    if index == 0 && index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+        previous = true;
+    }
+
+    // We've taken up to 1 leading digit separator, or anything
+    // except consecutive digit separators. We've gone too far if:
+    //      1). We take consecutive digit separators.
+    //      2). The next character is a digit (only occurs from special index == 9 check).
+    if previous && index < digits.len() && is_digit_or_separator(index!(digits[index]), radix, digit_separator) {
+        index -= 1;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes internal, trailing, and consecutive digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_itc<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all characters that are digits or digit separators, except
+    // for a leading digit separator.
+    let mut index = 0;
+    while index < digits.len() {
+        let c = index!(digits[index]);
+        if is_digit(c, radix) {
+            index += 1;
+        } else if c == digit_separator && index != 0 {
+            index += 1;
+        } else {
+            break;
+        }
+    }
+
+    // We needed to check for `index != 0` to ensure we don't consume
+    // buffers like b"_123_". However, We might not have gotten a
+    // trailing separator if:
+    //      1). The index was 0, something like b"_." or b"__.".
+    if index == 0 {
+        // Consume all leading digit separators.
+        while index < digits.len() && index!(digits[index]) == digit_separator {
+            index += 1;
+        }
+
+        // Now, we might have gone too far. If the next character is a digit,
+        // we need to rollback to 0.
+        if index < digits.len() && is_digit(index!(digits[index]), radix) {
+            index = 0;
+        }
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes leading and trailing digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_lt<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume leading digit separator, if applicable.
+    let mut index = 0;
+    if index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+    }
+
+    // Consume all interior digits.
+    // Store the previous index to later determine if any digits
+    // were consumed.
+    let prev_index = index;
+    while index < digits.len() && is_digit(index!(digits[index]), radix) {
+        index += 1;
+    }
+
+    // Consume a trailing digit separator. If we haven't consumed any digits,
+    // then we have a leading b'__', so we shouldn't consume that either.
+    let mut previous = index == prev_index;
+    if !previous && index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+        previous = true;
+    }
+
+    // We have gone too far if:
+    //      1). The last character was a digit separator.
+    //      2). The current character is a digit or digit separator.
+    if index < digits.len() && previous && is_digit_or_separator(index!(digits[index]), radix, digit_separator) {
+        index -= 1;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes leading, trailing, and consecutive digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_ltc<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume all leading digit separators, if applicable.
+    let mut index = 0;
+    while index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+    }
+
+    // Consume all interior digits.
+    // We don't need to store the index, because if we consume no digits,
+    // then the next character cannot possibly be a digit separator.
+    while index < digits.len() && is_digit(index!(digits[index]), radix) {
+        index += 1;
+    }
+
+    // Consume all trailing digit separators.
+    let prev_index = index;
+    while index < digits.len() && index!(digits[index]) == digit_separator {
+        index += 1;
+    }
+
+    // We have gone too far if:
+    //      1). We consumed trailing digit separators.
+    //      2). The subsequent character is a digit (cannot be a digit separator).
+    if index < digits.len() && index != prev_index && is_digit(index!(digits[index]), radix) {
+        index = prev_index;
+    }
+
+    split_at_index(digits, index)
+}
+
+
+// Consume until a an invalid digit is found.
+// Consumes leading, internal, and trailing digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_ilt<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume digits and digit separators, until consecutive digit
+    // separators or invalid characters.
+    let mut previous = false;
+    let mut index = 0;
+    while index < digits.len() {
+        let c = index!(digits[index]);
+        if is_digit(c, radix) {
+            index += 1;
+            previous = false;
+        } else if c == digit_separator && !previous {
+            index += 1;
+            previous = true;
+        } else {
+            break;
+        }
+    }
+
+    // We've taken everything except consecutive digit separators.
+    // That means we've gone too far if:
+    //      1). The last character was a digit separator.
+    //      2). The current character is a digit separator.
+    if previous && index < digits.len() && index!(digits[index]) == digit_separator {
+        index -= 1;
+    }
+
+    split_at_index(digits, index)
+}
+
+// Consume until a an invalid digit is found.
+// Consumes leading, internal, trailing, and consecutive digit separators.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_iltc<'a>(digits: &'a [u8], radix: u32, digit_separator: u8)
+    -> (&'a [u8], &'a [u8])
+{
+    // Consume digits and digit separators, until an invalid character.
+    // There is no post-condition since we accept any digit or
+    // digit separator combination.
+    let mut index = 0;
+    while index < digits.len() {
+        let c = index!(digits[index]);
+        if is_digit_or_separator(c, radix, digit_separator) {
+            index += 1;
+        } else {
+            break;
+        }
+    }
+
+    split_at_index(digits, index)
+}
+
+// API
+
+// Consume digits without a digit separator.
+#[inline]
+pub(crate) fn consume_digits_no_separator<'a>(bytes: &'a [u8], radix: u32, format: NumberFormat)
+    -> (&'a [u8], &'a [u8])
+{
+    consume_digits(bytes, radix, format.digit_separator())
+}
+
+// Consume digits while ignoring the digit separator.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_digits_ignore_separator<'a>(bytes: &'a [u8], radix: u32, format: NumberFormat)
+    -> (&'a [u8], &'a [u8])
+{
+    consume_digits_iltc(bytes, radix, format.digit_separator())
+}
+
+// Consume digits with a digit separator in the integer component.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_integer_digits_separator<'a>(bytes: &'a [u8], radix: u32, format: NumberFormat)
+    -> (&'a [u8], &'a [u8])
+{
+    const I: NumberFormat = NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR;
+    const L: NumberFormat = NumberFormat::INTEGER_LEADING_DIGIT_SEPARATOR;
+    const T: NumberFormat = NumberFormat::INTEGER_TRAILING_DIGIT_SEPARATOR;
+    const C: NumberFormat = NumberFormat::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR;
+    const IL: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | L.bits());
+    const IT: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | T.bits());
+    const LT: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | T.bits());
+    const ILT: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | T.bits());
+    const IC: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | C.bits());
+    const LC: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | C.bits());
+    const TC: NumberFormat = NumberFormat::from_bits_truncate(T.bits() | C.bits());
+    const ILC: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | C.bits());
+    const ITC: NumberFormat = NumberFormat::from_bits_truncate(IT.bits() | C.bits());
+    const LTC: NumberFormat = NumberFormat::from_bits_truncate(LT.bits() | C.bits());
+    const ILTC: NumberFormat = NumberFormat::from_bits_truncate(ILT.bits() | C.bits());
+
+    let digit_separator = format.digit_separator();
+    match format & NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK {
+        I       => consume_digits_i(bytes, radix, digit_separator),
+        IC      => consume_digits_ic(bytes, radix, digit_separator),
+        L       => consume_digits_l(bytes, radix, digit_separator),
+        LC      => consume_digits_lc(bytes, radix, digit_separator),
+        T       => consume_digits_t(bytes, radix, digit_separator),
+        TC      => consume_digits_tc(bytes, radix, digit_separator),
+        IL      => consume_digits_il(bytes, radix, digit_separator),
+        ILC     => consume_digits_ilc(bytes, radix, digit_separator),
+        IT      => consume_digits_it(bytes, radix, digit_separator),
+        ITC     => consume_digits_itc(bytes, radix, digit_separator),
+        LT      => consume_digits_lt(bytes, radix, digit_separator),
+        LTC     => consume_digits_ltc(bytes, radix, digit_separator),
+        ILT     => consume_digits_ilt(bytes, radix, digit_separator),
+        ILTC    => consume_digits_iltc(bytes, radix, digit_separator),
+        _       => unreachable!()
+    }
+}
+
+// Consume digits with a digit separator in the fraction component.
+#[inline]
+#[cfg(feature = "format")]
+pub(crate) fn consume_fraction_digits_separator<'a>(bytes: &'a [u8], radix: u32, format: NumberFormat)
+    -> (&'a [u8], &'a [u8])
+{
+    const I: NumberFormat = NumberFormat::FRACTION_INTERNAL_DIGIT_SEPARATOR;
+    const L: NumberFormat = NumberFormat::FRACTION_LEADING_DIGIT_SEPARATOR;
+    const T: NumberFormat = NumberFormat::FRACTION_TRAILING_DIGIT_SEPARATOR;
+    const C: NumberFormat = NumberFormat::FRACTION_CONSECUTIVE_DIGIT_SEPARATOR;
+    const IL: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | L.bits());
+    const IT: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | T.bits());
+    const LT: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | T.bits());
+    const ILT: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | T.bits());
+    const IC: NumberFormat = NumberFormat::from_bits_truncate(I.bits() | C.bits());
+    const LC: NumberFormat = NumberFormat::from_bits_truncate(L.bits() | C.bits());
+    const TC: NumberFormat = NumberFormat::from_bits_truncate(T.bits() | C.bits());
+    const ILC: NumberFormat = NumberFormat::from_bits_truncate(IL.bits() | C.bits());
+    const ITC: NumberFormat = NumberFormat::from_bits_truncate(IT.bits() | C.bits());
+    const LTC: NumberFormat = NumberFormat::from_bits_truncate(LT.bits() | C.bits());
+    const ILTC: NumberFormat = NumberFormat::from_bits_truncate(ILT.bits() | C.bits());
+
+    let digit_separator = format.digit_separator();
+    match format & NumberFormat::FRACTION_DIGIT_SEPARATOR_FLAG_MASK {
+        I       => consume_digits_i(bytes, radix, digit_separator),
+        IC      => consume_digits_ic(bytes, radix, digit_separator),
+        L       => consume_digits_l(bytes, radix, digit_separator),
+        LC      => consume_digits_lc(bytes, radix, digit_separator),
+        T       => consume_digits_t(bytes, radix, digit_separator),
+        TC      => consume_digits_tc(bytes, radix, digit_separator),
+        IL      => consume_digits_il(bytes, radix, digit_separator),
+        ILC     => consume_digits_ilc(bytes, radix, digit_separator),
+        IT      => consume_digits_it(bytes, radix, digit_separator),
+        ITC     => consume_digits_itc(bytes, radix, digit_separator),
+        LT      => consume_digits_lt(bytes, radix, digit_separator),
+        LTC     => consume_digits_ltc(bytes, radix, digit_separator),
+        ILT     => consume_digits_ilt(bytes, radix, digit_separator),
+        ILTC    => consume_digits_iltc(bytes, radix, digit_separator),
+        _       => unreachable!()
+    }
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn consume_digits_test() {
+        assert_eq!(consume_digits(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits(b!("_45"), 10, b'_'), (b!(""), b!("_45")));
+        assert_eq!(consume_digits(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits(b!("_.45"), 10, b'_'), (b!(""), b!("_.45")));
+        assert_eq!(consume_digits(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits(b!("4_5"), 10, b'_'), (b!("4"), b!("_5")));
+        assert_eq!(consume_digits(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits(b!("4_"), 10, b'_'), (b!("4"), b!("_")));
+        assert_eq!(consume_digits(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits(b!("4_."), 10, b'_'), (b!("4"), b!("_.")));
+        assert_eq!(consume_digits(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits(b!("_45_5"), 10, b'_'), (b!(""), b!("_45_5")));
+        assert_eq!(consume_digits(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits(b!("_.45_5"), 10, b'_'), (b!(""), b!("_.45_5")));
+        assert_eq!(consume_digits(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits(b!("4_5_"), 10, b'_'), (b!("4"), b!("_5_")));
+        assert_eq!(consume_digits(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits(b!("4_5_.5"), 10, b'_'), (b!("4"), b!("_5_.5")));
+        assert_eq!(consume_digits(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits(b!("_45_"), 10, b'_'), (b!(""), b!("_45_")));
+        assert_eq!(consume_digits(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits(b!("_45_.56"), 10, b'_'), (b!(""), b!("_45_.56")));
+        assert_eq!(consume_digits(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits(b!("_4_5_"), 10, b'_'), (b!(""), b!("_4_5_")));
+        assert_eq!(consume_digits(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits(b!("_4_5_.56"), 10, b'_'), (b!(""), b!("_4_5_.56")));
+        assert_eq!(consume_digits(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+    }
+
+    #[cfg(feature = "format")]
+    #[test]
+    fn consume_digits_l_test() {
+        assert_eq!(consume_digits_l(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_l(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_l(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_l(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_l(b!("_45"), 10, b'_'), (b!("_45"), b!("")));
+        assert_eq!(consume_digits_l(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_l(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_l(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits_l(b!("4_5"), 10, b'_'), (b!("4"), b!("_5")));
+        assert_eq!(consume_digits_l(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_l(b!("4_"), 10, b'_'), (b!("4"), b!("_")));
+        assert_eq!(consume_digits_l(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_l(b!("4_."), 10, b'_'), (b!("4"), b!("_.")));
+        assert_eq!(consume_digits_l(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_l(b!("_45_5"), 10, b'_'), (b!("_45"), b!("_5")));
+        assert_eq!(consume_digits_l(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_l(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_l(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits_l(b!("4_5_"), 10, b'_'), (b!("4"), b!("_5_")));
+        assert_eq!(consume_digits_l(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_l(b!("4_5_.5"), 10, b'_'), (b!("4"), b!("_5_.5")));
+        assert_eq!(consume_digits_l(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_l(b!("_45_"), 10, b'_'), (b!("_45"), b!("_")));
+        assert_eq!(consume_digits_l(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_l(b!("_45_.56"), 10, b'_'), (b!("_45"), b!("_.56")));
+        assert_eq!(consume_digits_l(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_l(b!("_4_5_"), 10, b'_'), (b!("_4"), b!("_5_")));
+        assert_eq!(consume_digits_l(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_l(b!("_4_5_.56"), 10, b'_'), (b!("_4"), b!("_5_.56")));
+        assert_eq!(consume_digits_l(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+
+        assert_eq!(consume_digits_lc(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_lc(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_lc(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_lc(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_lc(b!("_45"), 10, b'_'), (b!("_45"), b!("")));
+        assert_eq!(consume_digits_lc(b!("__45"), 10, b'_'), (b!("__45"), b!("")));
+        assert_eq!(consume_digits_lc(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_lc(b!("__.45"), 10, b'_'), (b!("__"), b!(".45")));
+        assert_eq!(consume_digits_lc(b!("4_5"), 10, b'_'), (b!("4"), b!("_5")));
+        assert_eq!(consume_digits_lc(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_lc(b!("4_"), 10, b'_'), (b!("4"), b!("_")));
+        assert_eq!(consume_digits_lc(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_lc(b!("4_."), 10, b'_'), (b!("4"), b!("_.")));
+        assert_eq!(consume_digits_lc(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_lc(b!("_45_5"), 10, b'_'), (b!("_45"), b!("_5")));
+        assert_eq!(consume_digits_lc(b!("__45__5"), 10, b'_'), (b!("__45"), b!("__5")));
+        assert_eq!(consume_digits_lc(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_lc(b!("__.45__5"), 10, b'_'), (b!("__"), b!(".45__5")));
+        assert_eq!(consume_digits_lc(b!("4_5_"), 10, b'_'), (b!("4"), b!("_5_")));
+        assert_eq!(consume_digits_lc(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_lc(b!("4_5_.5"), 10, b'_'), (b!("4"), b!("_5_.5")));
+        assert_eq!(consume_digits_lc(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_lc(b!("_45_"), 10, b'_'), (b!("_45"), b!("_")));
+        assert_eq!(consume_digits_lc(b!("__45__"), 10, b'_'), (b!("__45"), b!("__")));
+        assert_eq!(consume_digits_lc(b!("_45_.56"), 10, b'_'), (b!("_45"), b!("_.56")));
+        assert_eq!(consume_digits_lc(b!("__45__.56"), 10, b'_'), (b!("__45"), b!("__.56")));
+        assert_eq!(consume_digits_lc(b!("_4_5_"), 10, b'_'), (b!("_4"), b!("_5_")));
+        assert_eq!(consume_digits_lc(b!("__4__5__"), 10, b'_'), (b!("__4"), b!("__5__")));
+        assert_eq!(consume_digits_lc(b!("_4_5_.56"), 10, b'_'), (b!("_4"), b!("_5_.56")));
+        assert_eq!(consume_digits_lc(b!("__4__5__.56"), 10, b'_'), (b!("__4"), b!("__5__.56")));
+
+    }
+
+    #[cfg(feature = "format")]
+    #[test]
+    fn consume_digits_i_test() {
+        assert_eq!(consume_digits_i(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_i(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_i(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_i(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_i(b!("_45"), 10, b'_'), (b!(""), b!("_45")));
+        assert_eq!(consume_digits_i(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_i(b!("_.45"), 10, b'_'), (b!(""), b!("_.45")));
+        assert_eq!(consume_digits_i(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits_i(b!("4_5"), 10, b'_'), (b!("4_5"), b!("")));
+        assert_eq!(consume_digits_i(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_i(b!("4_"), 10, b'_'), (b!("4"), b!("_")));
+        assert_eq!(consume_digits_i(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_i(b!("4_."), 10, b'_'), (b!("4"), b!("_.")));
+        assert_eq!(consume_digits_i(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_i(b!("_45_5"), 10, b'_'), (b!(""), b!("_45_5")));
+        assert_eq!(consume_digits_i(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_i(b!("_.45_5"), 10, b'_'), (b!(""), b!("_.45_5")));
+        assert_eq!(consume_digits_i(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits_i(b!("4_5_"), 10, b'_'), (b!("4_5"), b!("_")));
+        assert_eq!(consume_digits_i(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_i(b!("4_5_.5"), 10, b'_'), (b!("4_5"), b!("_.5")));
+        assert_eq!(consume_digits_i(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_i(b!("_45_"), 10, b'_'), (b!(""), b!("_45_")));
+        assert_eq!(consume_digits_i(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_i(b!("_45_.56"), 10, b'_'), (b!(""), b!("_45_.56")));
+        assert_eq!(consume_digits_i(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_i(b!("_4_5_"), 10, b'_'), (b!(""), b!("_4_5_")));
+        assert_eq!(consume_digits_i(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_i(b!("_4_5_.56"), 10, b'_'), (b!(""), b!("_4_5_.56")));
+        assert_eq!(consume_digits_i(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+
+        assert_eq!(consume_digits_ic(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_ic(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_ic(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_ic(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_ic(b!("_45"), 10, b'_'), (b!(""), b!("_45")));
+        assert_eq!(consume_digits_ic(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_ic(b!("_.45"), 10, b'_'), (b!(""), b!("_.45")));
+        assert_eq!(consume_digits_ic(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits_ic(b!("4_5"), 10, b'_'), (b!("4_5"), b!("")));
+        assert_eq!(consume_digits_ic(b!("4__5"), 10, b'_'), (b!("4__5"), b!("")));
+        assert_eq!(consume_digits_ic(b!("4_"), 10, b'_'), (b!("4"), b!("_")));
+        assert_eq!(consume_digits_ic(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_ic(b!("4_."), 10, b'_'), (b!("4"), b!("_.")));
+        assert_eq!(consume_digits_ic(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_ic(b!("_45_5"), 10, b'_'), (b!(""), b!("_45_5")));
+        assert_eq!(consume_digits_ic(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_ic(b!("_.45_5"), 10, b'_'), (b!(""), b!("_.45_5")));
+        assert_eq!(consume_digits_ic(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits_ic(b!("4_5_"), 10, b'_'), (b!("4_5"), b!("_")));
+        assert_eq!(consume_digits_ic(b!("4__5__"), 10, b'_'), (b!("4__5"), b!("__")));
+        assert_eq!(consume_digits_ic(b!("4_5_.5"), 10, b'_'), (b!("4_5"), b!("_.5")));
+        assert_eq!(consume_digits_ic(b!("4__5__.5"), 10, b'_'), (b!("4__5"), b!("__.5")));
+        assert_eq!(consume_digits_ic(b!("_45_"), 10, b'_'), (b!(""), b!("_45_")));
+        assert_eq!(consume_digits_ic(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_ic(b!("_45_.56"), 10, b'_'), (b!(""), b!("_45_.56")));
+        assert_eq!(consume_digits_ic(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_ic(b!("_4_5_"), 10, b'_'), (b!(""), b!("_4_5_")));
+        assert_eq!(consume_digits_ic(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_ic(b!("_4_5_.56"), 10, b'_'), (b!(""), b!("_4_5_.56")));
+        assert_eq!(consume_digits_ic(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+
+    }
+
+    #[cfg(feature = "format")]
+    #[test]
+    fn consume_digits_t_test() {
+        assert_eq!(consume_digits_t(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_t(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_t(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_t(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_t(b!("_45"), 10, b'_'), (b!(""), b!("_45")));
+        assert_eq!(consume_digits_t(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_t(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_t(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits_t(b!("4_5"), 10, b'_'), (b!("4"), b!("_5")));
+        assert_eq!(consume_digits_t(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_t(b!("4_"), 10, b'_'), (b!("4_"), b!("")));
+        assert_eq!(consume_digits_t(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_t(b!("4_."), 10, b'_'), (b!("4_"), b!(".")));
+        assert_eq!(consume_digits_t(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_t(b!("_45_5"), 10, b'_'), (b!(""), b!("_45_5")));
+        assert_eq!(consume_digits_t(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_t(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_t(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits_t(b!("4_5_"), 10, b'_'), (b!("4"), b!("_5_")));
+        assert_eq!(consume_digits_t(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_t(b!("4_5_.5"), 10, b'_'), (b!("4"), b!("_5_.5")));
+        assert_eq!(consume_digits_t(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_t(b!("_45_"), 10, b'_'), (b!(""), b!("_45_")));
+        assert_eq!(consume_digits_t(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_t(b!("_45_.56"), 10, b'_'), (b!(""), b!("_45_.56")));
+        assert_eq!(consume_digits_t(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_t(b!("_4_5_"), 10, b'_'), (b!(""), b!("_4_5_")));
+        assert_eq!(consume_digits_t(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_t(b!("_4_5_.56"), 10, b'_'), (b!(""), b!("_4_5_.56")));
+        assert_eq!(consume_digits_t(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+
+        assert_eq!(consume_digits_tc(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_tc(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_tc(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_tc(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_tc(b!("_45"), 10, b'_'), (b!(""), b!("_45")));
+        assert_eq!(consume_digits_tc(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_tc(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_tc(b!("__.45"), 10, b'_'), (b!("__"), b!(".45")));
+        assert_eq!(consume_digits_tc(b!("4_5"), 10, b'_'), (b!("4"), b!("_5")));
+        assert_eq!(consume_digits_tc(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_tc(b!("4_"), 10, b'_'), (b!("4_"), b!("")));
+        assert_eq!(consume_digits_tc(b!("4__"), 10, b'_'), (b!("4__"), b!("")));
+        assert_eq!(consume_digits_tc(b!("4_."), 10, b'_'), (b!("4_"), b!(".")));
+        assert_eq!(consume_digits_tc(b!("4__."), 10, b'_'), (b!("4__"), b!(".")));
+        assert_eq!(consume_digits_tc(b!("_45_5"), 10, b'_'), (b!(""), b!("_45_5")));
+        assert_eq!(consume_digits_tc(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_tc(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_tc(b!("__.45__5"), 10, b'_'), (b!("__"), b!(".45__5")));
+        assert_eq!(consume_digits_tc(b!("4_5_"), 10, b'_'), (b!("4"), b!("_5_")));
+        assert_eq!(consume_digits_tc(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_tc(b!("4_5_.5"), 10, b'_'), (b!("4"), b!("_5_.5")));
+        assert_eq!(consume_digits_tc(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_tc(b!("_45_"), 10, b'_'), (b!(""), b!("_45_")));
+        assert_eq!(consume_digits_tc(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_tc(b!("_45_.56"), 10, b'_'), (b!(""), b!("_45_.56")));
+        assert_eq!(consume_digits_tc(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_tc(b!("_4_5_"), 10, b'_'), (b!(""), b!("_4_5_")));
+        assert_eq!(consume_digits_tc(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_tc(b!("_4_5_.56"), 10, b'_'), (b!(""), b!("_4_5_.56")));
+        assert_eq!(consume_digits_tc(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+    }
+
+    #[cfg(feature = "format")]
+    #[test]
+    fn consume_digits_il_test() {
+        assert_eq!(consume_digits_il(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_il(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_il(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_il(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_il(b!("_45"), 10, b'_'), (b!("_45"), b!("")));
+        assert_eq!(consume_digits_il(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_il(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_il(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits_il(b!("4_5"), 10, b'_'), (b!("4_5"), b!("")));
+        assert_eq!(consume_digits_il(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_il(b!("4_"), 10, b'_'), (b!("4"), b!("_")));
+        assert_eq!(consume_digits_il(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_il(b!("4_."), 10, b'_'), (b!("4"), b!("_.")));
+        assert_eq!(consume_digits_il(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_il(b!("_45_5"), 10, b'_'), (b!("_45_5"), b!("")));
+        assert_eq!(consume_digits_il(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_il(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_il(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits_il(b!("4_5_"), 10, b'_'), (b!("4_5"), b!("_")));
+        assert_eq!(consume_digits_il(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_il(b!("4_5_.5"), 10, b'_'), (b!("4_5"), b!("_.5")));
+        assert_eq!(consume_digits_il(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_il(b!("_45_"), 10, b'_'), (b!("_45"), b!("_")));
+        assert_eq!(consume_digits_il(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_il(b!("_45_.56"), 10, b'_'), (b!("_45"), b!("_.56")));
+        assert_eq!(consume_digits_il(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_il(b!("_4_5_"), 10, b'_'), (b!("_4_5"), b!("_")));
+        assert_eq!(consume_digits_il(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_il(b!("_4_5_.56"), 10, b'_'), (b!("_4_5"), b!("_.56")));
+        assert_eq!(consume_digits_il(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+
+        assert_eq!(consume_digits_ilc(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_ilc(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_ilc(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_ilc(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_ilc(b!("_45"), 10, b'_'), (b!("_45"), b!("")));
+        assert_eq!(consume_digits_ilc(b!("__45"), 10, b'_'), (b!("__45"), b!("")));
+        assert_eq!(consume_digits_ilc(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_ilc(b!("__.45"), 10, b'_'), (b!("__"), b!(".45")));
+        assert_eq!(consume_digits_ilc(b!("4_5"), 10, b'_'), (b!("4_5"), b!("")));
+        assert_eq!(consume_digits_ilc(b!("4__5"), 10, b'_'), (b!("4__5"), b!("")));
+        assert_eq!(consume_digits_ilc(b!("4_"), 10, b'_'), (b!("4"), b!("_")));
+        assert_eq!(consume_digits_ilc(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_ilc(b!("4_."), 10, b'_'), (b!("4"), b!("_.")));
+        assert_eq!(consume_digits_ilc(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_ilc(b!("_45_5"), 10, b'_'), (b!("_45_5"), b!("")));
+        assert_eq!(consume_digits_ilc(b!("__45__5"), 10, b'_'), (b!("__45__5"), b!("")));
+        assert_eq!(consume_digits_ilc(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_ilc(b!("__.45__5"), 10, b'_'), (b!("__"), b!(".45__5")));
+        assert_eq!(consume_digits_ilc(b!("4_5_"), 10, b'_'), (b!("4_5"), b!("_")));
+        assert_eq!(consume_digits_ilc(b!("4__5__"), 10, b'_'), (b!("4__5"), b!("__")));
+        assert_eq!(consume_digits_ilc(b!("4_5_.5"), 10, b'_'), (b!("4_5"), b!("_.5")));
+        assert_eq!(consume_digits_ilc(b!("4__5__.5"), 10, b'_'), (b!("4__5"), b!("__.5")));
+        assert_eq!(consume_digits_ilc(b!("_45_"), 10, b'_'), (b!("_45"), b!("_")));
+        assert_eq!(consume_digits_ilc(b!("__45__"), 10, b'_'), (b!("__45"), b!("__")));
+        assert_eq!(consume_digits_ilc(b!("_45_.56"), 10, b'_'), (b!("_45"), b!("_.56")));
+        assert_eq!(consume_digits_ilc(b!("__45__.56"), 10, b'_'), (b!("__45"), b!("__.56")));
+        assert_eq!(consume_digits_ilc(b!("_4_5_"), 10, b'_'), (b!("_4_5"), b!("_")));
+        assert_eq!(consume_digits_ilc(b!("__4__5__"), 10, b'_'), (b!("__4__5"), b!("__")));
+        assert_eq!(consume_digits_ilc(b!("_4_5_.56"), 10, b'_'), (b!("_4_5"), b!("_.56")));
+        assert_eq!(consume_digits_ilc(b!("__4__5__.56"), 10, b'_'), (b!("__4__5"), b!("__.56")));
+    }
+
+    #[cfg(feature = "format")]
+    #[test]
+    fn consume_digits_it_test() {
+        assert_eq!(consume_digits_it(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_it(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_it(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_it(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_it(b!("_45"), 10, b'_'), (b!(""), b!("_45")));
+        assert_eq!(consume_digits_it(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_it(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_it(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits_it(b!("4_5"), 10, b'_'), (b!("4_5"), b!("")));
+        assert_eq!(consume_digits_it(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_it(b!("4_"), 10, b'_'), (b!("4_"), b!("")));
+        assert_eq!(consume_digits_it(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_it(b!("4_."), 10, b'_'), (b!("4_"), b!(".")));
+        assert_eq!(consume_digits_it(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_it(b!("_45_5"), 10, b'_'), (b!(""), b!("_45_5")));
+        assert_eq!(consume_digits_it(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_it(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_it(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits_it(b!("4_5_"), 10, b'_'), (b!("4_5_"), b!("")));
+        assert_eq!(consume_digits_it(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_it(b!("4_5_.5"), 10, b'_'), (b!("4_5_"), b!(".5")));
+        assert_eq!(consume_digits_it(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_it(b!("_45_"), 10, b'_'), (b!(""), b!("_45_")));
+        assert_eq!(consume_digits_it(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_it(b!("_45_.56"), 10, b'_'), (b!(""), b!("_45_.56")));
+        assert_eq!(consume_digits_it(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_it(b!("_4_5_"), 10, b'_'), (b!(""), b!("_4_5_")));
+        assert_eq!(consume_digits_it(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_it(b!("_4_5_.56"), 10, b'_'), (b!(""), b!("_4_5_.56")));
+        assert_eq!(consume_digits_it(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+
+        assert_eq!(consume_digits_itc(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_itc(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_itc(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_itc(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_itc(b!("_45"), 10, b'_'), (b!(""), b!("_45")));
+        assert_eq!(consume_digits_itc(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_itc(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_itc(b!("__.45"), 10, b'_'), (b!("__"), b!(".45")));
+        assert_eq!(consume_digits_itc(b!("4_5"), 10, b'_'), (b!("4_5"), b!("")));
+        assert_eq!(consume_digits_itc(b!("4__5"), 10, b'_'), (b!("4__5"), b!("")));
+        assert_eq!(consume_digits_itc(b!("4_"), 10, b'_'), (b!("4_"), b!("")));
+        assert_eq!(consume_digits_itc(b!("4__"), 10, b'_'), (b!("4__"), b!("")));
+        assert_eq!(consume_digits_itc(b!("4_."), 10, b'_'), (b!("4_"), b!(".")));
+        assert_eq!(consume_digits_itc(b!("4__."), 10, b'_'), (b!("4__"), b!(".")));
+        assert_eq!(consume_digits_itc(b!("_45_5"), 10, b'_'), (b!(""), b!("_45_5")));
+        assert_eq!(consume_digits_itc(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_itc(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_itc(b!("__.45__5"), 10, b'_'), (b!("__"), b!(".45__5")));
+        assert_eq!(consume_digits_itc(b!("4_5_"), 10, b'_'), (b!("4_5_"), b!("")));
+        assert_eq!(consume_digits_itc(b!("4__5__"), 10, b'_'), (b!("4__5__"), b!("")));
+        assert_eq!(consume_digits_itc(b!("4_5_.5"), 10, b'_'), (b!("4_5_"), b!(".5")));
+        assert_eq!(consume_digits_itc(b!("4__5__.5"), 10, b'_'), (b!("4__5__"), b!(".5")));
+        assert_eq!(consume_digits_itc(b!("_45_"), 10, b'_'), (b!(""), b!("_45_")));
+        assert_eq!(consume_digits_itc(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_itc(b!("_45_.56"), 10, b'_'), (b!(""), b!("_45_.56")));
+        assert_eq!(consume_digits_itc(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_itc(b!("_4_5_"), 10, b'_'), (b!(""), b!("_4_5_")));
+        assert_eq!(consume_digits_itc(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_itc(b!("_4_5_.56"), 10, b'_'), (b!(""), b!("_4_5_.56")));
+        assert_eq!(consume_digits_itc(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+    }
+
+    #[cfg(feature = "format")]
+    #[test]
+    fn consume_digits_lt_test() {
+        assert_eq!(consume_digits_lt(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_lt(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_lt(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_lt(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_lt(b!("_45"), 10, b'_'), (b!("_45"), b!("")));
+        assert_eq!(consume_digits_lt(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_lt(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_lt(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits_lt(b!("4_5"), 10, b'_'), (b!("4"), b!("_5")));
+        assert_eq!(consume_digits_lt(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_lt(b!("4_"), 10, b'_'), (b!("4_"), b!("")));
+        assert_eq!(consume_digits_lt(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_lt(b!("4_."), 10, b'_'), (b!("4_"), b!(".")));
+        assert_eq!(consume_digits_lt(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_lt(b!("_45_5"), 10, b'_'), (b!("_45"), b!("_5")));
+        assert_eq!(consume_digits_lt(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_lt(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_lt(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits_lt(b!("4_5_"), 10, b'_'), (b!("4"), b!("_5_")));
+        assert_eq!(consume_digits_lt(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_lt(b!("4_5_.5"), 10, b'_'), (b!("4"), b!("_5_.5")));
+        assert_eq!(consume_digits_lt(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_lt(b!("_45_"), 10, b'_'), (b!("_45_"), b!("")));
+        assert_eq!(consume_digits_lt(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_lt(b!("_45_.56"), 10, b'_'), (b!("_45_"), b!(".56")));
+        assert_eq!(consume_digits_lt(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_lt(b!("_4_5_"), 10, b'_'), (b!("_4"), b!("_5_")));
+        assert_eq!(consume_digits_lt(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_lt(b!("_4_5_.56"), 10, b'_'), (b!("_4"), b!("_5_.56")));
+        assert_eq!(consume_digits_lt(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+
+        assert_eq!(consume_digits_ltc(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_ltc(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_ltc(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_ltc(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_ltc(b!("_45"), 10, b'_'), (b!("_45"), b!("")));
+        assert_eq!(consume_digits_ltc(b!("__45"), 10, b'_'), (b!("__45"), b!("")));
+        assert_eq!(consume_digits_ltc(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_ltc(b!("__.45"), 10, b'_'), (b!("__"), b!(".45")));
+        assert_eq!(consume_digits_ltc(b!("4_5"), 10, b'_'), (b!("4"), b!("_5")));
+        assert_eq!(consume_digits_ltc(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_ltc(b!("4_"), 10, b'_'), (b!("4_"), b!("")));
+        assert_eq!(consume_digits_ltc(b!("4__"), 10, b'_'), (b!("4__"), b!("")));
+        assert_eq!(consume_digits_ltc(b!("4_."), 10, b'_'), (b!("4_"), b!(".")));
+        assert_eq!(consume_digits_ltc(b!("4__."), 10, b'_'), (b!("4__"), b!(".")));
+        assert_eq!(consume_digits_ltc(b!("_45_5"), 10, b'_'), (b!("_45"), b!("_5")));
+        assert_eq!(consume_digits_ltc(b!("__45__5"), 10, b'_'), (b!("__45"), b!("__5")));
+        assert_eq!(consume_digits_ltc(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_ltc(b!("__.45__5"), 10, b'_'), (b!("__"), b!(".45__5")));
+        assert_eq!(consume_digits_ltc(b!("4_5_"), 10, b'_'), (b!("4"), b!("_5_")));
+        assert_eq!(consume_digits_ltc(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_ltc(b!("4_5_.5"), 10, b'_'), (b!("4"), b!("_5_.5")));
+        assert_eq!(consume_digits_ltc(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_ltc(b!("_45_"), 10, b'_'), (b!("_45_"), b!("")));
+        assert_eq!(consume_digits_ltc(b!("__45__"), 10, b'_'), (b!("__45__"), b!("")));
+        assert_eq!(consume_digits_ltc(b!("_45_.56"), 10, b'_'), (b!("_45_"), b!(".56")));
+        assert_eq!(consume_digits_ltc(b!("__45__.56"), 10, b'_'), (b!("__45__"), b!(".56")));
+        assert_eq!(consume_digits_ltc(b!("_4_5_"), 10, b'_'), (b!("_4"), b!("_5_")));
+        assert_eq!(consume_digits_ltc(b!("__4__5__"), 10, b'_'), (b!("__4"), b!("__5__")));
+        assert_eq!(consume_digits_ltc(b!("_4_5_.56"), 10, b'_'), (b!("_4"), b!("_5_.56")));
+        assert_eq!(consume_digits_ltc(b!("__4__5__.56"), 10, b'_'), (b!("__4"), b!("__5__.56")));
+    }
+
+    #[cfg(feature = "format")]
+    #[test]
+    fn consume_digits_ilt_test() {
+        assert_eq!(consume_digits_ilt(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_ilt(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_ilt(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_ilt(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_ilt(b!("_45"), 10, b'_'), (b!("_45"), b!("")));
+        assert_eq!(consume_digits_ilt(b!("__45"), 10, b'_'), (b!(""), b!("__45")));
+        assert_eq!(consume_digits_ilt(b!("4_5"), 10, b'_'), (b!("4_5"), b!("")));
+        assert_eq!(consume_digits_ilt(b!("4__5"), 10, b'_'), (b!("4"), b!("__5")));
+        assert_eq!(consume_digits_ilt(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_ilt(b!("__.45"), 10, b'_'), (b!(""), b!("__.45")));
+        assert_eq!(consume_digits_ilt(b!("4_"), 10, b'_'), (b!("4_"), b!("")));
+        assert_eq!(consume_digits_ilt(b!("4__"), 10, b'_'), (b!("4"), b!("__")));
+        assert_eq!(consume_digits_ilt(b!("4_."), 10, b'_'), (b!("4_"), b!(".")));
+        assert_eq!(consume_digits_ilt(b!("4__."), 10, b'_'), (b!("4"), b!("__.")));
+        assert_eq!(consume_digits_ilt(b!("_45_5"), 10, b'_'), (b!("_45_5"), b!("")));
+        assert_eq!(consume_digits_ilt(b!("__45__5"), 10, b'_'), (b!(""), b!("__45__5")));
+        assert_eq!(consume_digits_ilt(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_ilt(b!("__.45__5"), 10, b'_'), (b!(""), b!("__.45__5")));
+        assert_eq!(consume_digits_ilt(b!("4_5_"), 10, b'_'), (b!("4_5_"), b!("")));
+        assert_eq!(consume_digits_ilt(b!("4__5__"), 10, b'_'), (b!("4"), b!("__5__")));
+        assert_eq!(consume_digits_ilt(b!("4_5_.5"), 10, b'_'), (b!("4_5_"), b!(".5")));
+        assert_eq!(consume_digits_ilt(b!("4__5__.5"), 10, b'_'), (b!("4"), b!("__5__.5")));
+        assert_eq!(consume_digits_ilt(b!("_45_"), 10, b'_'), (b!("_45_"), b!("")));
+        assert_eq!(consume_digits_ilt(b!("__45__"), 10, b'_'), (b!(""), b!("__45__")));
+        assert_eq!(consume_digits_ilt(b!("_45_.56"), 10, b'_'), (b!("_45_"), b!(".56")));
+        assert_eq!(consume_digits_ilt(b!("__45__.56"), 10, b'_'), (b!(""), b!("__45__.56")));
+        assert_eq!(consume_digits_ilt(b!("_4_5_"), 10, b'_'), (b!("_4_5_"), b!("")));
+        assert_eq!(consume_digits_ilt(b!("__4__5__"), 10, b'_'), (b!(""), b!("__4__5__")));
+        assert_eq!(consume_digits_ilt(b!("_4_5_.56"), 10, b'_'), (b!("_4_5_"), b!(".56")));
+        assert_eq!(consume_digits_ilt(b!("__4__5__.56"), 10, b'_'), (b!(""), b!("__4__5__.56")));
+
+        assert_eq!(consume_digits_iltc(b!("123.45"), 10, b'_'), (b!("123"), b!(".45")));
+        assert_eq!(consume_digits_iltc(b!("1e45"), 10, b'_'), (b!("1"), b!("e45")));
+        assert_eq!(consume_digits_iltc(b!("1e"), 10, b'_'), (b!("1"), b!("e")));
+        assert_eq!(consume_digits_iltc(b!("1"), 10, b'_'), (b!("1"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("_45"), 10, b'_'), (b!("_45"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("__45"), 10, b'_'), (b!("__45"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("_.45"), 10, b'_'), (b!("_"), b!(".45")));
+        assert_eq!(consume_digits_iltc(b!("__.45"), 10, b'_'), (b!("__"), b!(".45")));
+        assert_eq!(consume_digits_iltc(b!("4_5"), 10, b'_'), (b!("4_5"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("4__5"), 10, b'_'), (b!("4__5"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("4_"), 10, b'_'), (b!("4_"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("4__"), 10, b'_'), (b!("4__"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("4_."), 10, b'_'), (b!("4_"), b!(".")));
+        assert_eq!(consume_digits_iltc(b!("4__."), 10, b'_'), (b!("4__"), b!(".")));
+        assert_eq!(consume_digits_iltc(b!("_45_5"), 10, b'_'), (b!("_45_5"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("__45__5"), 10, b'_'), (b!("__45__5"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("_.45_5"), 10, b'_'), (b!("_"), b!(".45_5")));
+        assert_eq!(consume_digits_iltc(b!("__.45__5"), 10, b'_'), (b!("__"), b!(".45__5")));
+        assert_eq!(consume_digits_iltc(b!("4_5_"), 10, b'_'), (b!("4_5_"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("4__5__"), 10, b'_'), (b!("4__5__"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("4_5_.5"), 10, b'_'), (b!("4_5_"), b!(".5")));
+        assert_eq!(consume_digits_iltc(b!("4__5__.5"), 10, b'_'), (b!("4__5__"), b!(".5")));
+        assert_eq!(consume_digits_iltc(b!("_45_"), 10, b'_'), (b!("_45_"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("__45__"), 10, b'_'), (b!("__45__"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("_45_.56"), 10, b'_'), (b!("_45_"), b!(".56")));
+        assert_eq!(consume_digits_iltc(b!("__45__.56"), 10, b'_'), (b!("__45__"), b!(".56")));
+        assert_eq!(consume_digits_iltc(b!("_4_5_"), 10, b'_'), (b!("_4_5_"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("__4__5__"), 10, b'_'), (b!("__4__5__"), b!("")));
+        assert_eq!(consume_digits_iltc(b!("_4_5_.56"), 10, b'_'), (b!("_4_5_"), b!(".56")));
+        assert_eq!(consume_digits_iltc(b!("__4__5__.56"), 10, b'_'), (b!("__4__5__"), b!(".56")));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/div128.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/div128.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/div128.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/div128.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,179 @@
+//! Optimized division algorithms for u128.
+//!
+//! The code in this module is derived off of `dtolnay/itoa`
+//! and Rust's compiler-builtins crate. This copies a specific
+//! path of LLVM's `__udivmodti4` intrinsic, which does division/
+//! modulus for u128 in a single step. Rust implements both division
+//! and modulus in terms of this intrinsic, but calls the intrinsic
+//! twice for subsequent division and modulus operations on the same
+//! dividend/divisor, leading to significant performance overhead.
+//!
+//! This module calculates the optimal divisors for each radix,
+//! and exports a general-purpose division algorithm for u128 where
+//! the divisor can fit in a u64.
+//!
+//! This implementation is derived from dtolnay/itoa, which can be found here:
+//!     https://github.com/dtolnay/itoa/blob/master/src/udiv128.rs
+//!
+//! This implementation is also derived from Rust's compiler-builtins crate,
+//! which can be found here:
+//!     https://github.com/rust-lang-nursery/compiler-builtins/blob/master/src/int/udiv.rs
+//!
+//! Licensing for this module may be under the MIT or Illinois license
+//! (a BSD-like license), and may be found here:
+//!     https://github.com/rust-lang-nursery/compiler-builtins/blob/master/LICENSE.TXT
+
+// Get the divisor for optimized 128-bit division.
+// Returns the divisor, the number of digits processed, and the
+// number of leading zeros in the divisor.
+//
+// These values were calculated using the following script:
+//
+//  ```text
+//  import math
+//
+//  u64_max = 2**64 - 1
+//  u128_max = 2**128-1
+//
+//  def is_valid(x):
+//      return (
+//          x <= u64_max
+//          and (u128_max / (x**2)) < x
+//      )
+//
+//  def find_pow(radix):
+//      start_pow = int(math.floor(math.log(u64_max, radix))) - 1
+//      while is_valid(radix**start_pow):
+//          start_pow += 1
+//      return start_pow - 1
+//
+//  for radix in range(2, 37):
+//      power = find_pow(radix)
+//      print(radix, radix**power, power)
+//  ```
+#[cfg(feature = "radix")]
+#[inline]
+pub(crate) fn u128_divisor(radix: u32) -> (u64, usize, u32) {
+    match radix {
+        2  => (9223372036854775808, 63, 0),    // 2^63
+        3  => (12157665459056928801, 40, 0),   // 3^40
+        4  => (4611686018427387904, 31, 1),    // 4^31
+        5  => (7450580596923828125, 27, 1),    // 5^27
+        6  => (4738381338321616896, 24, 1),    // 6^24
+        7  => (3909821048582988049, 22, 2),    // 7^22
+        8  => (9223372036854775808, 21, 0),    // 8^21
+        9  => (12157665459056928801, 20, 0),   // 9^20
+        10 => (10000000000000000000, 19, 0),   // 10^19
+        11 => (5559917313492231481, 18, 1),    // 11^18
+        12 => (2218611106740436992, 17, 3),    // 12^17
+        13 => (8650415919381337933, 17, 1),    // 13^17
+        14 => (2177953337809371136, 16, 3),    // 14^16
+        15 => (6568408355712890625, 16, 1),    // 15^16
+        16 => (1152921504606846976, 15, 3),    // 16^15
+        17 => (2862423051509815793, 15, 2),    // 17^15
+        18 => (6746640616477458432, 15, 1),    // 18^15
+        19 => (15181127029874798299, 15, 0),   // 19^15
+        20 => (1638400000000000000, 14, 3),    // 20^14
+        21 => (3243919932521508681, 14, 2),    // 21^14
+        22 => (6221821273427820544, 14, 1),    // 22^14
+        23 => (11592836324538749809, 14, 0),   // 23^14
+        24 => (876488338465357824, 13, 4),     // 24^13
+        25 => (1490116119384765625, 13, 3),    // 25^13
+        26 => (2481152873203736576, 13, 2),    // 26^13
+        27 => (4052555153018976267, 13, 2),    // 27^13
+        28 => (6502111422497947648, 13, 1),    // 28^13
+        29 => (10260628712958602189, 13, 0),   // 29^13
+        30 => (15943230000000000000, 13, 0),   // 30^13
+        31 => (787662783788549761, 12, 4),     // 31^12
+        32 => (1152921504606846976, 12, 3),    // 32^12
+        33 => (1667889514952984961, 12, 3),    // 33^12
+        34 => (2386420683693101056, 12, 2),    // 34^12
+        35 => (3379220508056640625, 12, 2),    // 35^12
+        36 => (4738381338321616896, 12, 1),    // 36^12
+        _  => unreachable!(),
+    }
+}
+
+// Get the divisor for optimized 128-bit division.
+// Returns the divisor, the number of digits processed, and the
+// number of leading zeros in the divisor.
+#[cfg(not(feature = "radix"))]
+#[inline]
+#[allow(dead_code)]
+pub(crate) fn u128_divisor(_: u32) -> (u64, usize, u32) {
+    (10000000000000000000, 19, 0)              // 10^19
+}
+
+// Optimized division/remainder algorithm for u128.
+// This is because the codegen for u128 divrem is very inefficient in Rust,
+// calling both `__udivmodti4` twice internally, rather than a single time.
+#[inline]
+pub(crate) fn u128_divrem(n: u128, d: u64, d_cltz: u32) -> (u128, u64) {
+    // Ensure we have the correct number of leading zeros passed.
+    debug_assert_eq!(d_cltz, d.leading_zeros());
+
+    // Optimize if we can divide using u64 first.
+    let high = (n >> 64) as u64;
+    if high == 0 {
+        let low = n as u64;
+        return ((low / d) as u128, low % d);
+    }
+
+    // sr = 1 + u64::BITS + d.leading_zeros() - high.leading_zeros();
+    let sr = 65 + d_cltz - high.leading_zeros();
+
+    // 1 <= sr <= u64::BITS - 1
+    let mut q: u128 = n << (128 - sr);
+    let mut r: u128 = n >> sr;
+    let mut carry: u64 = 0;
+
+    // Don't use a range because they may generate references to memcpy in unoptimized code
+    // Loop invariants:  r < d; carry is 0 or 1
+    let mut i = 0;
+    while i < sr {
+        i += 1;
+
+        // r:q = ((r:q) << 1) | carry
+        r = (r << 1) | (q >> 127);
+        q = (q << 1) | carry as u128;
+
+        // carry = 0
+        // if r >= d {
+        //     r -= d;
+        //     carry = 1;
+        // }
+        let s = (d as u128).wrapping_sub(r).wrapping_sub(1) as i128 >> 127;
+        carry = (s & 1) as u64;
+        r -= (d as u128) & s as u128;
+    }
+
+    ((q << 1) | carry as u128, r as u64)
+}
+
+// Divide by 1e19 for base10 algorithms.
+#[cfg(feature = "table")]
+pub(crate) fn u128_divrem_1e19(n: u128) -> (u128, u64) {
+    u128_divrem(n, 10000000000000000000, 0)
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[cfg(all(feature = "std", feature = "property_tests"))]
+    use proptest::{proptest, prop_assert_eq, prop_assert};
+
+    #[cfg(all(feature = "std", feature = "property_tests"))]
+    proptest! {
+        #[test]
+        fn u128_divrem_proptest(i in u128::min_value()..u128::max_value()) {
+            let (d, _, d_cltz) = u128_divisor(10);
+            let expected = (i / d as u128, (i % d as u128) as u64);
+            let actual = u128_divrem(i, d, d_cltz);
+            prop_assert_eq!(actual, expected);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,109 @@
+//! C-compatible error type.
+
+use crate::lib::fmt::{self, Display, Formatter};
+
+#[cfg(feature = "std")]
+use std::error::Error as StdError;
+
+/// Error code, indicating failure type.
+///
+/// Error messages are designating by an error code of less than 0.
+/// This is to be compatible with C conventions. This enumeration is
+/// FFI-compatible for interfacing with C code.
+///
+/// # FFI
+///
+/// For interfacing with FFI-code, this may be approximated by:
+/// ```text
+/// const int32_t OVERFLOW = -1;
+/// const int32_t UNDERFLOW = -2;
+/// const int32_t INVALID_DIGIT = -3;
+/// const int32_t EMPTY = -4;
+/// const int32_t EMPTY_FRACTION = -5;
+/// const int32_t EMPTY_EXPONENT = -6;
+/// ```
+///
+/// # Safety
+///
+/// Assigning any value outside the range `[-6, -1]` to value of type
+/// ErrorCode may invoke undefined-behavior.
+#[repr(i32)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub enum ErrorCode {
+    /// Integral overflow occurred during numeric parsing.
+    ///
+    /// Numeric overflow takes precedence over the presence of an invalid
+    /// digit.
+    Overflow = -1,
+    /// Integral underflow occurred during numeric parsing.
+    ///
+    /// Numeric overflow takes precedence over the presence of an invalid
+    /// digit.
+    Underflow = -2,
+    /// Invalid digit found before string termination.
+    InvalidDigit = -3,
+    /// Empty byte array found.
+    Empty = -4,
+    /// Empty mantissa found.
+    EmptyMantissa = -5,
+    /// Empty exponent found.
+    EmptyExponent = -6,
+    /// Empty integer found.
+    EmptyInteger = -7,
+    /// Empty fraction found.
+    EmptyFraction = -8,
+    /// Invalid positive mantissa sign was found.
+    InvalidPositiveMantissaSign = -9,
+    /// Mantissa sign was required, but not found.
+    MissingMantissaSign = -10,
+    /// Exponent was present but not allowed.
+    InvalidExponent = -11,
+    /// Invalid positive exponent sign was found.
+    InvalidPositiveExponentSign = -12,
+    /// Exponent sign was required, but not found.
+    MissingExponentSign = -13,
+    /// Exponent was present without fraction component.
+    ExponentWithoutFraction = -14,
+    /// Integer had invalid leading zeros.
+    InvalidLeadingZeros = -15,
+
+    // We may add additional variants later, so ensure that client matching
+    // does not depend on exhaustive matching.
+    #[doc(hidden)]
+    __Nonexhaustive = -200,
+}
+
+/// Error type for lexical parsing.
+///
+/// This error is FFI-compatible for interfacing with C code.
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub struct Error {
+    /// Error code designating the type of error occurred.
+    pub code: ErrorCode,
+    /// Optional position within the buffer for the error.
+    pub index: usize,
+}
+
+impl From<ErrorCode> for Error {
+    #[inline]
+    fn from(code: ErrorCode) -> Self {
+        Error { code: code, index: 0 }
+    }
+}
+
+impl From<(ErrorCode, usize)> for Error {
+    #[inline]
+    fn from(error: (ErrorCode, usize)) -> Self {
+        Error { code: error.0, index: error.1 }
+    }
+}
+
+impl Display for Error {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "lexical error: {:?} at index {}.", self.code, self.index)
+    }
+}
+
+#[cfg(feature = "std")]
+impl StdError for Error {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/format/feature_format.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/format/feature_format.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/format/feature_format.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/format/feature_format.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2063 @@
+#![cfg(feature = "format")]
+
+use super::super::config;
+use bitflags::bitflags;
+use static_assertions::const_assert;
+
+// HELPERS
+
+// Determine if character is valid ASCII.
+#[inline]
+fn is_ascii(ch: u8) -> bool {
+    ch.is_ascii()
+}
+
+/// Determine if the digit separator is valid.
+#[inline]
+#[cfg(not(feature = "radix"))]
+fn is_valid_separator(ch: u8) -> bool {
+    match ch {
+        b'0' ..= b'9'       => false,
+        b'+' | b'.' | b'-'  => false,
+        _                   => (
+            is_ascii(ch)
+            && ch != config::get_exponent_default_char()
+        )
+    }
+}
+
+/// Determine if the digit separator is valid.
+#[inline]
+#[cfg(feature = "radix")]
+fn is_valid_separator(ch: u8) -> bool {
+    match ch {
+        b'A' ..= b'Z'       => false,
+        b'a' ..= b'z'       => false,
+        b'0' ..= b'9'       => false,
+        b'+' | b'.' | b'-'  => false,
+        _                   => (
+            is_ascii(ch)
+            && ch != config::get_exponent_default_char()
+            && ch != config::get_exponent_backup_char()
+        )
+    }
+}
+
+/// Convert digit separator to flags.
+#[inline]
+const fn digit_separator_to_flags(ch: u8) -> u64 {
+    (ch as u64) << 56
+}
+
+/// Extract digit separator from flags.
+#[inline]
+const fn digit_separator_from_flags(flag: u64) -> u8 {
+    (flag >> 56) as u8
+}
+
+// BITFLAGS
+
+bitflags! {
+    /// Bitflags for a serialized number format.
+    ///
+    /// This is used to derive the high-level bitflags.The default
+    /// representation has no digit separators, no required integer or
+    /// fraction digits, required exponent digits, and no digit separators.
+    ///
+    /// Bit Flags Layout
+    /// ----------------
+    ///
+    /// The bitflags has the lower bits designated for flags that modify
+    /// the parsing behavior of lexical, and the upper 8 bits set for the
+    /// digit separator, allowing any valid ASCII character as a
+    /// separator. The first 32-bits are reserved for non-digit separator
+    /// flags, bits 32-55 are reserved for digit separator flags, and
+    /// the last 8 bits for the digit separator.
+    //
+    /// ```text
+    ///  0   1   2   3   4   5   6   7   8   9   0   1   2   3   4   5
+    /// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    /// |I/R|F/R|E/R|+/M|R/M|e/e|+/E|R/E|e/F|S/S|S/C|     RESERVED      |
+    /// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    ///
+    ///  16  17  18  19  20  21  22  23  24  25  26  27  28  29  30  31
+    /// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    /// |                           RESERVED                            |
+    /// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    ///
+    ///  32  33  34  35  36  37  38  39  40  41  42  43  44  45  46  47
+    /// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    /// |I/I|F/I|E/I|I/L|F/L|E/L|I/T|F/T|E/T|I/C|F/C|E/C|S/D| RESERVED  |
+    /// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    ///
+    ///  48  49  50  51  52  53  54  55  56  57  58  59  60  62  62  63
+    /// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    /// |           RESERVED            |        Digit Separator        |
+    /// +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    ///
+    /// Where:
+    ///     I/R = Required integer digits.
+    ///     F/R = Required fraction digits.
+    ///     E/R = Required exponent digits.
+    ///     +/M = No mantissa positive sign.
+    ///     R/M = Required positive sign.
+    ///     e/e = No exponent notation.
+    ///     +/E = No exponent positive sign.
+    ///     R/E = Required exponent sign.
+    ///     e/F = No exponent without fraction.
+    ///     S/S = No special (non-finite) values.
+    ///     S/C = Case-sensitive special (non-finite) values.
+    ///     I/I = Integer internal digit separator.
+    ///     F/I = Fraction internal digit separator.
+    ///     E/I = Exponent internal digit separator.
+    ///     I/L = Integer leading digit separator.
+    ///     F/L = Fraction leading digit separator.
+    ///     E/L = Exponent leading digit separator.
+    ///     I/T = Integer trailing digit separator.
+    ///     F/T = Fraction trailing digit separator.
+    ///     E/T = Exponent trailing digit separator.
+    ///     I/C = Integer consecutive digit separator.
+    ///     F/C = Fraction consecutive digit separator.
+    ///     E/C = Exponent consecutive digit separator.
+    ///     S/D = Special (non-finite) digit separator.
+    /// ```
+    ///
+    /// Note:
+    /// -----
+    ///
+    /// In order to limit the format specification and avoid parsing
+    /// non-numerical data, all number formats require some significant
+    /// digits. Examples of always invalid numbers include:
+    /// - ``
+    /// - `.`
+    /// - `e`
+    /// - `e7`
+    ///
+    /// Test Cases:
+    /// -----------
+    ///
+    /// The following test-cases are used to define whether a literal or
+    /// a string float is valid in a given language, and these tests are
+    /// used to denote features in pre-defined formats. Only a few
+    /// of these flags may modify the parsing behavior of integers.
+    /// Integer parsing is assumed to be derived from float parsing,
+    /// so if consecutive digit separators are valid in the integer
+    /// component of a float, they are also valid in an integer.
+    ///
+    /// ```text
+    /// 0: '.3'         // Non-required integer.
+    /// 1: '3.'         // Non-required fraction.
+    /// 2: '3e'         // Non-required exponent.
+    /// 3. '+3.0'       // Mantissa positive sign.
+    /// 4: '3.0e7'      // Exponent notation.
+    /// 5: '3.0e+7'     // Exponent positive sign.
+    /// 6. '3e7'        // Exponent notation without fraction.
+    /// 7: 'NaN'        // Special (non-finite) values.
+    /// 8: 'NAN'        // Case-sensitive special (non-finite) values.
+    /// 9: '3_4.01'     // Integer internal digit separator.
+    /// A: '3.0_1'      // Fraction internal digit separator.
+    /// B: '3.0e7_1'    // Exponent internal digit separator.
+    /// C: '_3.01'      // Integer leading digit separator.
+    /// D: '3._01'      // Fraction leading digit separator.
+    /// E: '3.0e_71'    // Exponent leading digit separator.
+    /// F: '3_.01'      // Integer trailing digit separator.
+    /// G: '3.01_'      // Fraction trailing digit separator.
+    /// H: '3.0e71_'    // Exponent trailing digit separator.
+    /// I: '3__4.01'    // Integer consecutive digit separator.
+    /// J: '3.0__1'     // Fraction consecutive digit separator.
+    /// K: '3.0e7__1'   // Exponent consecutive digit separator.
+    /// L: 'In_f'       // Special (non-finite) digit separator.
+    /// M: '010'        // No integer leading zeros.
+    /// N: '010.0'      // No float leading zeros.
+    /// ```
+    ///
+    /// Currently Supported Programming and Data Languages:
+    /// ---------------------------------------------------
+    ///
+    /// 1. Rust
+    /// 2. Python
+    /// 3. C++ (98, 03, 11, 14, 17)
+    /// 4. C (89, 90, 99, 11, 18)
+    /// 5. Ruby
+    /// 6. Swift
+    /// 7. Go
+    /// 8. Haskell
+    /// 9. Javascript
+    /// 10. Perl
+    /// 11. PHP
+    /// 12. Java
+    /// 13. R
+    /// 14. Kotlin
+    /// 15. Julia
+    /// 16. C# (ISO-1, ISO-2, 3, 4, 5, 6, 7)
+    /// 17. Kawa
+    /// 18. Gambit-C
+    /// 19. Guile
+    /// 20. Clojure
+    /// 21. Erlang
+    /// 22. Elm
+    /// 23. Scala
+    /// 24. Elixir
+    /// 25. FORTRAN
+    /// 26. D
+    /// 27. Coffeescript
+    /// 28. Cobol
+    /// 29. F#
+    /// 30. Visual Basic
+    /// 31. OCaml
+    /// 32. Objective-C
+    /// 33. ReasonML
+    /// 34. Octave
+    /// 35. Matlab
+    /// 36. Zig
+    /// 37. SageMath
+    /// 38. JSON
+    /// 39. TOML
+    /// 40. XML
+    /// 41. SQLite
+    /// 42. PostgreSQL
+    /// 43. MySQL
+    /// 44. MongoDB
+    #[derive(Default)]
+    pub struct NumberFormat: u64 {
+        // MASKS & FLAGS
+
+        /// Mask to extract the flag bits.
+        #[doc(hidden)]
+        const FLAG_MASK                             = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_POSITIVE_MANTISSA_SIGN.bits
+            | Self::REQUIRED_MANTISSA_SIGN.bits
+            | Self::NO_EXPONENT_NOTATION.bits
+            | Self::NO_POSITIVE_EXPONENT_SIGN.bits
+            | Self::REQUIRED_EXPONENT_SIGN.bits
+            | Self::NO_EXPONENT_WITHOUT_FRACTION.bits
+            | Self::NO_SPECIAL.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+            | Self::SPECIAL_DIGIT_SEPARATOR.bits
+        );
+
+        /// Mask to extract the flag bits controlling interface parsing.
+        ///
+        /// This mask controls all the flags handled by the interface,
+        /// omitting those that are handled prior. This limits the
+        /// number of match paths required to determine the correct
+        /// interface.
+        const INTERFACE_FLAG_MASK                   = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_EXPONENT_NOTATION.bits
+            | Self::NO_POSITIVE_EXPONENT_SIGN.bits
+            | Self::REQUIRED_EXPONENT_SIGN.bits
+            | Self::NO_EXPONENT_WITHOUT_FRACTION.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        /// Mask to extract digit separator flags.
+        #[doc(hidden)]
+        const DIGIT_SEPARATOR_FLAG_MASK             = (
+            Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+            | Self::SPECIAL_DIGIT_SEPARATOR.bits
+        );
+
+        /// Mask to extract integer digit separator flags.
+        #[doc(hidden)]
+        const INTEGER_DIGIT_SEPARATOR_FLAG_MASK     = (
+            Self::INTEGER_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::INTEGER_LEADING_DIGIT_SEPARATOR.bits
+            | Self::INTEGER_TRAILING_DIGIT_SEPARATOR.bits
+            | Self::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        /// Mask to extract fraction digit separator flags.
+        #[doc(hidden)]
+        const FRACTION_DIGIT_SEPARATOR_FLAG_MASK     = (
+            Self::FRACTION_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_LEADING_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_TRAILING_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        /// Mask to extract exponent digit separator flags.
+        #[doc(hidden)]
+        const EXPONENT_DIGIT_SEPARATOR_FLAG_MASK     = (
+            Self::EXPONENT_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_LEADING_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_TRAILING_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        /// Mask to extract exponent flags.
+        #[doc(hidden)]
+        const EXPONENT_FLAG_MASK                    = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_POSITIVE_EXPONENT_SIGN.bits
+            | Self::REQUIRED_EXPONENT_SIGN.bits
+            | Self::NO_EXPONENT_WITHOUT_FRACTION.bits
+            | Self::EXPONENT_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_LEADING_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_TRAILING_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // NON-DIGIT SEPARATOR FLAGS & MASKS
+
+        /// Digits are required before the decimal point.
+        #[doc(hidden)]
+        const REQUIRED_INTEGER_DIGITS               = 0b0000000000000000000000000000000000000000000000000000000000000001;
+
+        /// Digits are required after the decimal point.
+        /// This check will only occur if the decimal point is present.
+        #[doc(hidden)]
+        const REQUIRED_FRACTION_DIGITS              = 0b0000000000000000000000000000000000000000000000000000000000000010;
+
+        /// Digits are required after the exponent character.
+        /// This check will only occur if the exponent character is present.
+        #[doc(hidden)]
+        const REQUIRED_EXPONENT_DIGITS              = 0b0000000000000000000000000000000000000000000000000000000000000100;
+
+        /// Digits are required before or after the control characters.
+        #[doc(hidden)]
+        const REQUIRED_DIGITS                       = (
+            Self::REQUIRED_INTEGER_DIGITS.bits
+            | Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+        );
+
+        /// Positive sign before the mantissa is not allowed.
+        #[doc(hidden)]
+        const NO_POSITIVE_MANTISSA_SIGN             = 0b0000000000000000000000000000000000000000000000000000000000001000;
+
+        /// Positive sign before the mantissa is required.
+        #[doc(hidden)]
+        const REQUIRED_MANTISSA_SIGN                = 0b0000000000000000000000000000000000000000000000000000000000010000;
+
+        /// Exponent notation is not allowed.
+        #[doc(hidden)]
+        const NO_EXPONENT_NOTATION                  = 0b0000000000000000000000000000000000000000000000000000000000100000;
+
+        /// Positive sign before the exponent is not allowed.
+        #[doc(hidden)]
+        const NO_POSITIVE_EXPONENT_SIGN             = 0b0000000000000000000000000000000000000000000000000000000001000000;
+
+        /// Positive sign before the exponent is required.
+        #[doc(hidden)]
+        const REQUIRED_EXPONENT_SIGN                = 0b0000000000000000000000000000000000000000000000000000000010000000;
+
+        /// Exponent without a fraction component is not allowed.
+        ///
+        /// This only checks if a decimal point precedes the exponent character.
+        /// To require fraction digits or exponent digits with this check,
+        /// please use the appropriate flags.
+        #[doc(hidden)]
+        const NO_EXPONENT_WITHOUT_FRACTION          = 0b0000000000000000000000000000000000000000000000000000000100000000;
+
+        /// Special (non-finite) values are not allowed.
+        #[doc(hidden)]
+        const NO_SPECIAL                            = 0b0000000000000000000000000000000000000000000000000000001000000000;
+
+        /// Special (non-finite) values are case-sensitive.
+        #[doc(hidden)]
+        const CASE_SENSITIVE_SPECIAL                = 0b0000000000000000000000000000000000000000000000000000010000000000;
+
+        /// Leading zeros before an integer value are not allowed.
+        ///
+        /// If the value is a literal, then this distinction applies
+        /// when the value is treated like an integer literal, typically
+        /// when there is no decimal point. If the value is parsed,
+        /// then this distinction applies when the value as parsed
+        /// as an integer.
+        ///
+        /// # Warning
+        ///
+        /// This also does not mean that the value parsed will be correct,
+        /// for example, in languages like C, this will not auto-
+        /// deduce that the radix is 8 with leading zeros, for an octal
+        /// literal.
+        #[doc(hidden)]
+        const NO_INTEGER_LEADING_ZEROS              = 0b0000000000000000000000000000000000000000000000000000100000000000;
+
+        /// Leading zeros before a float value are not allowed.
+        ///
+        /// If the value is a literal, then this distinction applies
+        /// when the value is treated like an integer float, typically
+        /// when there is a decimal point. If the value is parsed,
+        /// then this distinction applies when the value as parsed
+        /// as a float.
+        ///
+        /// # Warning
+        ///
+        /// This also does not mean that the value parsed will be correct,
+        /// for example, in languages like C, this will not auto-
+        /// deduce that the radix is 8 with leading zeros, for an octal
+        /// literal.
+        #[doc(hidden)]
+        const NO_FLOAT_LEADING_ZEROS                = 0b0000000000000000000000000000000000000000000000000001000000000000;
+
+        // DIGIT SEPARATOR FLAGS & MASKS
+
+        /// Digit separators are allowed between integer digits.
+        #[doc(hidden)]
+        const INTEGER_INTERNAL_DIGIT_SEPARATOR      = 0b0000000000000000000000000000000100000000000000000000000000000000;
+
+        /// A digit separator is allowed before any integer digits.
+        #[doc(hidden)]
+        const INTEGER_LEADING_DIGIT_SEPARATOR       = 0b0000000000000000000000000000001000000000000000000000000000000000;
+
+        /// A digit separator is allowed after any integer digits.
+        #[doc(hidden)]
+        const INTEGER_TRAILING_DIGIT_SEPARATOR      = 0b0000000000000000000000000000010000000000000000000000000000000000;
+
+        /// Multiple consecutive integer digit separators are allowed.
+        #[doc(hidden)]
+        const INTEGER_CONSECUTIVE_DIGIT_SEPARATOR   = 0b0000000000000000000000000000100000000000000000000000000000000000;
+
+        /// Digit separators are allowed between fraction digits.
+        #[doc(hidden)]
+        const FRACTION_INTERNAL_DIGIT_SEPARATOR     = 0b0000000000000000000000000001000000000000000000000000000000000000;
+
+        /// A digit separator is allowed before any fraction digits.
+        #[doc(hidden)]
+        const FRACTION_LEADING_DIGIT_SEPARATOR      = 0b0000000000000000000000000010000000000000000000000000000000000000;
+
+        /// A digit separator is allowed after any fraction digits.
+        #[doc(hidden)]
+        const FRACTION_TRAILING_DIGIT_SEPARATOR     = 0b0000000000000000000000000100000000000000000000000000000000000000;
+
+        /// Multiple consecutive fraction digit separators are allowed.
+        #[doc(hidden)]
+        const FRACTION_CONSECUTIVE_DIGIT_SEPARATOR  = 0b0000000000000000000000001000000000000000000000000000000000000000;
+
+        /// Digit separators are allowed between exponent digits.
+        #[doc(hidden)]
+        const EXPONENT_INTERNAL_DIGIT_SEPARATOR     = 0b0000000000000000000000010000000000000000000000000000000000000000;
+
+        /// A digit separator is allowed before any exponent digits.
+        #[doc(hidden)]
+        const EXPONENT_LEADING_DIGIT_SEPARATOR      = 0b0000000000000000000000100000000000000000000000000000000000000000;
+
+        /// A digit separator is allowed after any exponent digits.
+        #[doc(hidden)]
+        const EXPONENT_TRAILING_DIGIT_SEPARATOR     = 0b0000000000000000000001000000000000000000000000000000000000000000;
+
+        /// Multiple consecutive exponent digit separators are allowed.
+        #[doc(hidden)]
+        const EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR  = 0b0000000000000000000010000000000000000000000000000000000000000000;
+
+        /// Digit separators are allowed between digits.
+        #[doc(hidden)]
+        const INTERNAL_DIGIT_SEPARATOR              = (
+            Self::INTEGER_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_INTERNAL_DIGIT_SEPARATOR.bits
+        );
+
+        /// A digit separator is allowed before any digits.
+        #[doc(hidden)]
+        const LEADING_DIGIT_SEPARATOR               = (
+            Self::INTEGER_LEADING_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_LEADING_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_LEADING_DIGIT_SEPARATOR.bits
+        );
+
+        /// A digit separator is allowed after any digits.
+        #[doc(hidden)]
+        const TRAILING_DIGIT_SEPARATOR              = (
+            Self::INTEGER_TRAILING_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_TRAILING_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_TRAILING_DIGIT_SEPARATOR.bits
+        );
+
+        /// Multiple consecutive digit separators are allowed.
+        #[doc(hidden)]
+        const CONSECUTIVE_DIGIT_SEPARATOR           = (
+            Self::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_CONSECUTIVE_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        /// Any digit separators are allowed in special (non-finite) values.
+        #[doc(hidden)]
+        const SPECIAL_DIGIT_SEPARATOR               = 0b0000000000000000000100000000000000000000000000000000000000000000;
+
+        // PRE-DEFINED
+        //
+        // Sample Format Shorthand:
+        // ------------------------
+        //
+        // The format shorthand lists the test cases, and if applicable,
+        // the digit separator character. For example, the shorthand
+        // `[134-_]` specifies it passes tests 1, 3, and 4, and uses
+        // `'_'` as a digit-separator character. Meanwhile, `[0]` means it
+        // passes test 0, and has no digit separator.
+
+        // RUST LITERAL [4569ABFGHIJKMN-_]
+        /// Float format for a Rust literal floating-point number.
+        const RUST_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_DIGITS.bits
+            | Self::NO_POSITIVE_MANTISSA_SIGN.bits
+            | Self::NO_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // RUST STRING [0134567MN]
+        /// Float format to parse a Rust float from string.
+        const RUST_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // RUST STRING STRICT [01345678MN]
+        /// `RUST_STRING`, but enforces strict equality for special values.
+        const RUST_STRING_STRICT = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        /// Float format for a Python literal floating-point number.
+        const PYTHON_LITERAL = Self::PYTHON3_LITERAL.bits;
+
+        /// Float format to parse a Python float from string.
+        const PYTHON_STRING = Self::PYTHON3_STRING.bits;
+
+        // PYTHON3 LITERAL [013456N]
+        /// Float format for a Python3 literal floating-point number.
+        const PYTHON3_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+        );
+
+        // PYTHON3 STRING [0134567MN]
+        /// Float format to parse a Python3 float from string.
+        const PYTHON3_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // PYTHON2 LITERAL [013456MN]
+        /// Float format for a Python2 literal floating-point number.
+        const PYTHON2_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // PYTHON2 STRING [0134567MN]
+        /// Float format to parse a Python2 float from string.
+        const PYTHON2_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        /// Float format for a C++ literal floating-point number.
+        const CXX_LITERAL = Self::CXX17_LITERAL.bits;
+
+        /// Float format to parse a C++ float from string.
+        const CXX_STRING = Self::CXX17_STRING.bits;
+
+        // C++17 LITERAL [01345689ABMN-']
+        /// Float format for a C++17 literal floating-point number.
+        const CXX17_LITERAL = (
+            digit_separator_to_flags(b'\'')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+        );
+
+        // C++17 STRING [013456MN]
+        const CXX17_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // C++14 LITERAL [01345689ABMN-']
+        /// Float format for a C++14 literal floating-point number.
+        const CXX14_LITERAL = (
+            digit_separator_to_flags(b'\'')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+        );
+
+        // C++14 STRING [013456MN]
+        /// Float format to parse a C++14 float from string.
+        const CXX14_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // C++11 LITERAL [0134568MN]
+        /// Float format for a C++11 literal floating-point number.
+        const CXX11_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // C++11 STRING [013456MN]
+        /// Float format to parse a C++11 float from string.
+        const CXX11_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // C++03 LITERAL [0134567MN]
+        /// Float format for a C++03 literal floating-point number.
+        const CXX03_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // C++03 STRING [013456MN]
+        /// Float format to parse a C++03 float from string.
+        const CXX03_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // C++98 LITERAL [0134567MN]
+        /// Float format for a C++98 literal floating-point number.
+        const CXX98_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // C++98 STRING [013456MN]
+        /// Float format to parse a C++98 float from string.
+        const CXX98_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        /// Float format for a C literal floating-point number.
+        const C_LITERAL = Self::C18_LITERAL.bits;
+
+        /// Float format to parse a C float from string.
+        const C_STRING = Self::C18_STRING.bits;
+
+        // C18 LITERAL [0134568MN]
+        /// Float format for a C18 literal floating-point number.
+        const C18_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // C18 STRING [013456MN]
+        /// Float format to parse a C18 float from string.
+        const C18_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // C11 LITERAL [0134568MN]
+        /// Float format for a C11 literal floating-point number.
+        const C11_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // C11 STRING [013456MN]
+        /// Float format to parse a C11 float from string.
+        const C11_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // C99 LITERAL [0134568MN]
+        /// Float format for a C99 literal floating-point number.
+        const C99_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // C99 STRING [013456MN]
+        /// Float format to parse a C99 float from string.
+        const C99_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // C90 LITERAL [0134567MN]
+        /// Float format for a C90 literal floating-point number.
+        const C90_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // C90 STRING [013456MN]
+        /// Float format to parse a C90 float from string.
+        const C90_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // C89 LITERAL [0134567MN]
+        /// Float format for a C89 literal floating-point number.
+        const C89_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // C89 STRING [013456MN]
+        /// Float format to parse a C89 float from string.
+        const C89_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // RUBY LITERAL [345689AM-_]
+        /// Float format for a Ruby literal floating-point number.
+        const RUBY_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+        );
+
+        // RUBY STRING [01234569ABMN-_]
+        /// Float format to parse a Ruby float from string.
+        // Note: Amazingly, Ruby 1.8+ do not allow parsing special values.
+        const RUBY_STRING = (
+            digit_separator_to_flags(b'_')
+            | Self::NO_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+        );
+
+        // SWIFT LITERAL [34569ABFGHIJKMN-_]
+        /// Float format for a Swift literal floating-point number.
+        const SWIFT_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // SWIFT STRING [13456MN]
+        /// Float format to parse a Swift float from string.
+        const SWIFT_STRING = Self::REQUIRED_FRACTION_DIGITS.bits;
+
+        // GO LITERAL [0134567MN]
+        /// Float format for a Golang literal floating-point number.
+        const GO_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // GO STRING [013456MN]
+        /// Float format to parse a Golang float from string.
+        const GO_STRING = Self::REQUIRED_FRACTION_DIGITS.bits;
+
+        // HASKELL LITERAL [456MN]
+        /// Float format for a Haskell literal floating-point number.
+        const HASKELL_LITERAL = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_POSITIVE_MANTISSA_SIGN.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // HASKELL STRING [45678MN]
+        /// Float format to parse a Haskell float from string.
+        const HASKELL_STRING = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_POSITIVE_MANTISSA_SIGN.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // JAVASCRIPT LITERAL [01345678M]
+        /// Float format for a Javascript literal floating-point number.
+        const JAVASCRIPT_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+        );
+
+        // JAVASCRIPT STRING [012345678MN]
+        /// Float format to parse a Javascript float from string.
+        const JAVASCRIPT_STRING = Self::CASE_SENSITIVE_SPECIAL.bits;
+
+        // PERL LITERAL [0134569ABDEFGHIJKMN-_]
+        /// Float format for a Perl literal floating-point number.
+        const PERL_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_LEADING_DIGIT_SEPARATOR.bits
+            | Self::EXPONENT_LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // PERL STRING [01234567MN]
+        /// Float format to parse a Perl float from string.
+        const PERL_STRING = 0;
+
+        // PHP LITERAL [01345678MN]
+        /// Float format for a PHP literal floating-point number.
+        const PHP_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // PHP STRING [0123456MN]
+        /// Float format to parse a PHP float from string.
+        const PHP_STRING = Self::NO_SPECIAL.bits;
+
+        // JAVA LITERAL [0134569ABIJKMN-_]
+        /// Float format for a Java literal floating-point number.
+        const JAVA_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // JAVA STRING [01345678MN]
+        /// Float format to parse a Java float from string.
+        const JAVA_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // R LITERAL [01345678MN]
+        /// Float format for a R literal floating-point number.
+        const R_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // R STRING [01234567MN]
+        /// Float format to parse a R float from string.
+        const R_STRING = 0;
+
+        // KOTLIN LITERAL [0134569ABIJKN-_]
+        /// Float format for a Kotlin literal floating-point number.
+        const KOTLIN_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // KOTLIN STRING [0134568MN]
+        /// Float format to parse a Kotlin float from string.
+        const KOTLIN_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // JULIA LITERAL [01345689AMN-_]
+        /// Float format for a Julia literal floating-point number.
+        const JULIA_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::INTEGER_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_INTERNAL_DIGIT_SEPARATOR.bits
+        );
+
+        // JULIA STRING [01345678MN]
+        /// Float format to parse a Julia float from string.
+        const JULIA_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        /// Float format for a C# literal floating-point number.
+        const CSHARP_LITERAL = Self::CSHARP7_LITERAL.bits;
+
+        /// Float format to parse a C# float from string.
+        const CSHARP_STRING = Self::CSHARP7_STRING.bits;
+
+        // CSHARP7 LITERAL [034569ABIJKMN-_]
+        /// Float format for a C#7 literal floating-point number.
+        const CSHARP7_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // CSHARP7 STRING [0134568MN]
+        /// Float format to parse a C#7 float from string.
+        const CSHARP7_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // CSHARP6 LITERAL [03456MN]
+        /// Float format for a C#6 literal floating-point number.
+        const CSHARP6_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // CSHARP6 STRING [0134568MN]
+        /// Float format to parse a C#6 float from string.
+        const CSHARP6_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // CSHARP5 LITERAL [03456MN]
+        /// Float format for a C#5 literal floating-point number.
+        const CSHARP5_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // CSHARP5 STRING [0134568MN]
+        /// Float format to parse a C#5 float from string.
+        const CSHARP5_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // CSHARP4 LITERAL [03456MN]
+        /// Float format for a C#4 literal floating-point number.
+        const CSHARP4_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // CSHARP4 STRING [0134568MN]
+        /// Float format to parse a C#4 float from string.
+        const CSHARP4_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // CSHARP3 LITERAL [03456MN]
+        /// Float format for a C#3 literal floating-point number.
+        const CSHARP3_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // CSHARP3 STRING [0134568MN]
+        /// Float format to parse a C#3 float from string.
+        const CSHARP3_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // CSHARP2 LITERAL [03456MN]
+        /// Float format for a C#2 literal floating-point number.
+        const CSHARP2_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // CSHARP2 STRING [0134568MN]
+        /// Float format to parse a C#2 float from string.
+        const CSHARP2_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // CSHARP1 LITERAL [03456MN]
+        /// Float format for a C#1 literal floating-point number.
+        const CSHARP1_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // CSHARP1 STRING [0134568MN]
+        /// Float format to parse a C#1 float from string.
+        const CSHARP1_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // KAWA LITERAL [013456MN]
+        /// Float format for a Kawa literal floating-point number.
+        const KAWA_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // KAWA STRING [013456MN]
+        /// Float format to parse a Kawa float from string.
+        const KAWA_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // GAMBITC LITERAL [013456MN]
+        /// Float format for a Gambit-C literal floating-point number.
+        const GAMBITC_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // GAMBITC STRING [013456MN]
+        /// Float format to parse a Gambit-C float from string.
+        const GAMBITC_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // GUILE LITERAL [013456MN]
+        /// Float format for a Guile literal floating-point number.
+        const GUILE_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // GUILE STRING [013456MN]
+        /// Float format to parse a Guile float from string.
+        const GUILE_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // CLOJURE LITERAL [13456MN]
+        /// Float format for a Clojure literal floating-point number.
+        const CLOJURE_LITERAL = (
+            Self::REQUIRED_INTEGER_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // CLOJURE STRING [01345678MN]
+        /// Float format to parse a Clojure float from string.
+        const CLOJURE_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // ERLANG LITERAL [34578MN]
+        /// Float format for an Erlang literal floating-point number.
+        const ERLANG_LITERAL = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_EXPONENT_WITHOUT_FRACTION.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // ERLANG STRING [345MN]
+        /// Float format to parse an Erlang float from string.
+        const ERLANG_STRING = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_EXPONENT_WITHOUT_FRACTION.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // ELM LITERAL [456]
+        /// Float format for an Elm literal floating-point number.
+        const ELM_LITERAL = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_POSITIVE_MANTISSA_SIGN.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+        );
+
+        // ELM STRING [01345678MN]
+        /// Float format to parse an Elm float from string.
+        // Note: There is no valid representation of NaN, just Infinity.
+        const ELM_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // SCALA LITERAL [3456]
+        /// Float format for a Scala literal floating-point number.
+        const SCALA_LITERAL = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+        );
+
+        // SCALA STRING [01345678MN]
+        /// Float format to parse a Scala float from string.
+        const SCALA_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // ELIXIR LITERAL [3459ABMN-_]
+        /// Float format for an Elixir literal floating-point number.
+        const ELIXIR_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_DIGITS.bits
+            | Self::NO_EXPONENT_WITHOUT_FRACTION.bits
+            | Self::NO_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+        );
+
+        // ELIXIR STRING [345MN]
+        /// Float format to parse an Elixir float from string.
+        const ELIXIR_STRING = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_EXPONENT_WITHOUT_FRACTION.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // FORTRAN LITERAL [013456MN]
+        /// Float format for a FORTRAN literal floating-point number.
+        const FORTRAN_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // FORTRAN STRING [0134567MN]
+        /// Float format to parse a FORTRAN float from string.
+        const FORTRAN_STRING = Self::REQUIRED_EXPONENT_DIGITS.bits;
+
+        // D LITERAL [0134569ABFGHIJKN-_]
+        /// Float format for a D literal floating-point number.
+        const D_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // D STRING [01345679AFGMN-_]
+        /// Float format to parse a D float from string.
+        const D_STRING = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::INTEGER_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::INTEGER_TRAILING_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_TRAILING_DIGIT_SEPARATOR.bits
+        );
+
+        // COFFEESCRIPT LITERAL [01345678]
+        /// Float format for a Coffeescript literal floating-point number.
+        const COFFEESCRIPT_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+        );
+
+        // COFFEESCRIPT STRING [012345678MN]
+        /// Float format to parse a Coffeescript float from string.
+        const COFFEESCRIPT_STRING = Self::CASE_SENSITIVE_SPECIAL.bits;
+
+        // COBOL LITERAL [0345MN]
+        /// Float format for a Cobol literal floating-point number.
+        const COBOL_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_EXPONENT_WITHOUT_FRACTION.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // COBOL STRING [012356MN]
+        /// Float format to parse a Cobol float from string.
+        const COBOL_STRING = (
+            Self::REQUIRED_EXPONENT_SIGN.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // FSHARP LITERAL [13456789ABIJKMN-_]
+        /// Float format for a F# literal floating-point number.
+        const FSHARP_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_INTEGER_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // FSHARP STRING [013456789ABCDEFGHIJKLMN-_]
+        /// Float format to parse a F# float from string.
+        const FSHARP_STRING = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+            | Self::SPECIAL_DIGIT_SEPARATOR.bits
+        );
+
+        // VB LITERAL [03456MN]
+        /// Float format for a Visual Basic literal floating-point number.
+        const VB_LITERAL = (
+            Self::REQUIRED_FRACTION_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // VB STRING [01345678MN]
+        /// Float format to parse a Visual Basic float from string.
+        // Note: To my knowledge, Visual Basic cannot parse infinity.
+        const VB_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // OCAML LITERAL [1456789ABDFGHIJKMN-_]
+        /// Float format for an OCaml literal floating-point number.
+        const OCAML_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_INTEGER_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_POSITIVE_MANTISSA_SIGN.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // OCAML STRING [01345679ABCDEFGHIJKLMN-_]
+        /// Float format to parse an OCaml float from string.
+        const OCAML_STRING = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+            | Self::SPECIAL_DIGIT_SEPARATOR.bits
+        );
+
+        // OBJECTIVEC LITERAL [013456MN]
+        /// Float format for an Objective-C literal floating-point number.
+        const OBJECTIVEC_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // OBJECTIVEC STRING [013456MN]
+        /// Float format to parse an Objective-C float from string.
+        const OBJECTIVEC_STRING = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // REASONML LITERAL [13456789ABDFGHIJKMN-_]
+        /// Float format for a ReasonML literal floating-point number.
+        const REASONML_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_INTEGER_DIGITS.bits
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // REASONML STRING [01345679ABCDEFGHIJKLMN-_]
+        /// Float format to parse a ReasonML float from string.
+        const REASONML_STRING = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+            | Self::SPECIAL_DIGIT_SEPARATOR.bits
+        );
+
+        // OCTAVE LITERAL [013456789ABDFGHIJKMN-_]
+        /// Float format for an Octave literal floating-point number.
+        // Note: Octave accepts both NaN and nan, Inf and inf.
+        const OCTAVE_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // OCTAVE STRING [01345679ABCDEFGHIJKMN-,]
+        /// Float format to parse an Octave float from string.
+        const OCTAVE_STRING = (
+            digit_separator_to_flags(b',')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // MATLAB LITERAL [013456789ABDFGHIJKMN-_]
+        /// Float format for an Matlab literal floating-point number.
+        // Note: Matlab accepts both NaN and nan, Inf and inf.
+        const MATLAB_LITERAL = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::FRACTION_LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // MATLAB STRING [01345679ABCDEFGHIJKMN-,]
+        /// Float format to parse an Matlab float from string.
+        const MATLAB_STRING = (
+            digit_separator_to_flags(b',')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::LEADING_DIGIT_SEPARATOR.bits
+            | Self::TRAILING_DIGIT_SEPARATOR.bits
+            | Self::CONSECUTIVE_DIGIT_SEPARATOR.bits
+        );
+
+        // ZIG LITERAL [1456MN]
+        /// Float format for a Zig literal floating-point number.
+        const ZIG_LITERAL = (
+            Self::REQUIRED_INTEGER_DIGITS.bits
+            | Self::NO_POSITIVE_MANTISSA_SIGN.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // ZIG STRING [01234567MN]
+        /// Float format to parse a Zig float from string.
+        const ZIG_STRING = 0;
+
+        // SAGE LITERAL [012345678MN]
+        /// Float format for a Sage literal floating-point number.
+        // Note: Both Infinity and infinity are accepted.
+        const SAGE_LITERAL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+        );
+
+        // SAGE STRING [01345679ABMN-_]
+        /// Float format to parse a Sage float from string.
+        const SAGE_STRING = (
+            digit_separator_to_flags(b'_')
+            | Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+        );
+
+        // JSON [456]
+        /// Float format for a JSON literal floating-point number.
+        const JSON = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_POSITIVE_MANTISSA_SIGN.bits
+            | Self::NO_SPECIAL.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+        );
+
+        // TOML [34569AB]
+        /// Float format for a TOML literal floating-point number.
+        const TOML = (
+            Self::REQUIRED_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+            | Self::INTERNAL_DIGIT_SEPARATOR.bits
+            | Self::NO_INTEGER_LEADING_ZEROS.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+        );
+
+        // YAML (defined in-terms of JSON schema).
+        /// Float format for a YAML literal floating-point number.
+        const YAML = Self::JSON.bits;
+
+        // XML [01234578MN]
+        /// Float format for a XML literal floating-point number.
+        const XML = Self::CASE_SENSITIVE_SPECIAL.bits;
+
+        // SQLITE [013456MN]
+        /// Float format for a SQLite literal floating-point number.
+        const SQLITE = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // POSTGRESQL [013456MN]
+        /// Float format for a PostgreSQL literal floating-point number.
+        const POSTGRESQL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // MYSQL [013456MN]
+        /// Float format for a MySQL literal floating-point number.
+        const MYSQL = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::NO_SPECIAL.bits
+        );
+
+        // MONGODB [01345678M]
+        /// Float format for a MongoDB literal floating-point number.
+        const MONGODB = (
+            Self::REQUIRED_EXPONENT_DIGITS.bits
+            | Self::CASE_SENSITIVE_SPECIAL.bits
+            | Self::NO_FLOAT_LEADING_ZEROS.bits
+        );
+
+        // HIDDEN DEFAULTS
+
+        /// Float format when no flags are set.
+        #[doc(hidden)]
+        const PERMISSIVE = 0;
+
+        /// Permissive interface float format flags.
+        #[doc(hidden)]
+        const PERMISSIVE_INTERFACE = Self::PERMISSIVE.bits & Self::INTERFACE_FLAG_MASK.bits;
+
+        /// Standard float format.
+        #[doc(hidden)]
+        const STANDARD = Self::RUST_STRING.bits;
+
+        /// Standard interface float format flags.
+        #[doc(hidden)]
+        const STANDARD_INTERFACE = Self::STANDARD.bits & Self::INTERFACE_FLAG_MASK.bits;
+
+        /// Float format when all digit separator flags are set.
+        #[doc(hidden)]
+        const IGNORE = Self::DIGIT_SEPARATOR_FLAG_MASK.bits;
+
+        /// Ignore interface float format flags.
+        #[doc(hidden)]
+        const IGNORE_INTERFACE = Self::IGNORE.bits & Self::INTERFACE_FLAG_MASK.bits;
+    }
+}
+
+// Ensure all our bit flags are valid.
+macro_rules! check_subsequent_flags {
+    ($x:ident, $y:ident) => (
+        const_assert!(NumberFormat::$x.bits << 1 == NumberFormat::$y.bits);
+    );
+}
+
+// Non-digit separator flags.
+const_assert!(NumberFormat::REQUIRED_INTEGER_DIGITS.bits == 1);
+check_subsequent_flags!(REQUIRED_INTEGER_DIGITS, REQUIRED_FRACTION_DIGITS);
+check_subsequent_flags!(REQUIRED_FRACTION_DIGITS, REQUIRED_EXPONENT_DIGITS);
+check_subsequent_flags!(REQUIRED_EXPONENT_DIGITS, NO_POSITIVE_MANTISSA_SIGN);
+check_subsequent_flags!(NO_POSITIVE_MANTISSA_SIGN, REQUIRED_MANTISSA_SIGN);
+check_subsequent_flags!(REQUIRED_MANTISSA_SIGN, NO_EXPONENT_NOTATION);
+check_subsequent_flags!(NO_EXPONENT_NOTATION, NO_POSITIVE_EXPONENT_SIGN);
+check_subsequent_flags!(NO_POSITIVE_EXPONENT_SIGN, REQUIRED_EXPONENT_SIGN);
+check_subsequent_flags!(REQUIRED_EXPONENT_SIGN, NO_EXPONENT_WITHOUT_FRACTION);
+check_subsequent_flags!(NO_EXPONENT_WITHOUT_FRACTION, NO_SPECIAL);
+check_subsequent_flags!(NO_SPECIAL, CASE_SENSITIVE_SPECIAL);
+check_subsequent_flags!(CASE_SENSITIVE_SPECIAL, NO_INTEGER_LEADING_ZEROS);
+check_subsequent_flags!(NO_INTEGER_LEADING_ZEROS, NO_FLOAT_LEADING_ZEROS);
+
+// Digit separator flags.
+const_assert!(NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR.bits == 1 << 32);
+check_subsequent_flags!(INTEGER_INTERNAL_DIGIT_SEPARATOR, INTEGER_LEADING_DIGIT_SEPARATOR);
+check_subsequent_flags!(INTEGER_LEADING_DIGIT_SEPARATOR, INTEGER_TRAILING_DIGIT_SEPARATOR);
+check_subsequent_flags!(INTEGER_TRAILING_DIGIT_SEPARATOR, INTEGER_CONSECUTIVE_DIGIT_SEPARATOR);
+check_subsequent_flags!(INTEGER_CONSECUTIVE_DIGIT_SEPARATOR, FRACTION_INTERNAL_DIGIT_SEPARATOR);
+check_subsequent_flags!(FRACTION_INTERNAL_DIGIT_SEPARATOR, FRACTION_LEADING_DIGIT_SEPARATOR);
+check_subsequent_flags!(FRACTION_LEADING_DIGIT_SEPARATOR, FRACTION_TRAILING_DIGIT_SEPARATOR);
+check_subsequent_flags!(FRACTION_TRAILING_DIGIT_SEPARATOR, FRACTION_CONSECUTIVE_DIGIT_SEPARATOR);
+check_subsequent_flags!(FRACTION_CONSECUTIVE_DIGIT_SEPARATOR, EXPONENT_INTERNAL_DIGIT_SEPARATOR);
+check_subsequent_flags!(EXPONENT_INTERNAL_DIGIT_SEPARATOR, EXPONENT_LEADING_DIGIT_SEPARATOR);
+check_subsequent_flags!(EXPONENT_LEADING_DIGIT_SEPARATOR, EXPONENT_TRAILING_DIGIT_SEPARATOR);
+check_subsequent_flags!(EXPONENT_TRAILING_DIGIT_SEPARATOR, EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR);
+check_subsequent_flags!(EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR, SPECIAL_DIGIT_SEPARATOR);
+
+/// Add flag to flags
+macro_rules! add_flag {
+    ($flags:ident, $bool:ident, $flag:ident) => {
+        if $bool {
+            $flags |= NumberFormat::$flag;
+        }
+    };
+}
+
+impl NumberFormat {
+    /// Compile float format value from specifications.
+    ///
+    /// * `digit_separator`                         - Character to separate digits.
+    /// * `required_integer_digits`                 - If digits are required before the decimal point.
+    /// * `required_fraction_digits`                - If digits are required after the decimal point.
+    /// * `required_exponent_digits`                - If digits are required after the exponent character.
+    /// * `no_positive_mantissa_sign`               - If positive sign before the mantissa is not allowed.
+    /// * `required_mantissa_sign`                  - If positive sign before the mantissa is required.
+    /// * `no_exponent_notation`                    - If exponent notation is not allowed.
+    /// * `no_positive_exponent_sign`               - If positive sign before the exponent is not allowed.
+    /// * `required_exponent_sign`                  - If sign before the exponent is required.
+    /// * `no_exponent_without_fraction`            - If exponent without fraction is not allowed.
+    /// * `no_special`                              - If special (non-finite) values are not allowed.
+    /// * `case_sensitive_special`                  - If special (non-finite) values are case-sensitive.
+    /// * `no_integer_leading_zeros`                - If leading zeros before an integer are not allowed.
+    /// * `no_float_leading_zeros`                  - If leading zeros before a float are not allowed.
+    /// * `integer_internal_digit_separator`        - If digit separators are allowed between integer digits.
+    /// * `fraction_internal_digit_separator`       - If digit separators are allowed between fraction digits.
+    /// * `exponent_internal_digit_separator`       - If digit separators are allowed between exponent digits.
+    /// * `integer_leading_digit_separator`         - If a digit separator is allowed before any integer digits.
+    /// * `fraction_leading_digit_separator`        - If a digit separator is allowed before any fraction digits.
+    /// * `exponent_leading_digit_separator`        - If a digit separator is allowed before any exponent digits.
+    /// * `integer_trailing_digit_separator`        - If a digit separator is allowed after any integer digits.
+    /// * `fraction_trailing_digit_separator`       - If a digit separator is allowed after any fraction digits.
+    /// * `exponent_trailing_digit_separator`       - If a digit separator is allowed after any exponent digits.
+    /// * `integer_consecutive_digit_separator`     - If multiple consecutive integer digit separators are allowed.
+    /// * `fraction_consecutive_digit_separator`    - If multiple consecutive fraction digit separators are allowed.
+    /// * `special_digit_separator`                 - If any digit separators are allowed in special (non-finite) values.
+    ///
+    /// Returns the value if it was able to compile the format,
+    /// otherwise, returns None.
+    #[cfg_attr(feature = "radix", doc = " Digit separators must not be in the character group `[A-Za-z0-9+.-]`, nor be equal to")]
+    #[cfg_attr(feature = "radix", doc = " [`get_exponent_default_char`](fn.get_exponent_default_char.html) or")]
+    #[cfg_attr(feature = "radix", doc = " [`get_exponent_backup_char`](fn.get_exponent_backup_char.html).")]
+    #[cfg_attr(not(feature = "radix"), doc = " Digit separators must not be in the character group `[0-9+.-]`, nor be equal to")]
+    #[cfg_attr(not(feature = "radix"), doc = " [get_exponent_default_char](fn.get_exponent_default_char.html).")]
+    ///
+    /// # Versioning
+    ///
+    /// Due to the potential addition of bitflags required to parse a given
+    /// number, this function is not considered stable and will not
+    /// be stabilized until lexical-core version 1.0. Any changes will
+    /// ensure they introduce compile errors in existing code, and will
+    /// not the current major/minor version.
+    #[inline]
+    pub fn compile(
+        digit_separator: u8,
+        required_integer_digits: bool,
+        required_fraction_digits: bool,
+        required_exponent_digits: bool,
+        no_positive_mantissa_sign: bool,
+        required_mantissa_sign: bool,
+        no_exponent_notation: bool,
+        no_positive_exponent_sign: bool,
+        required_exponent_sign: bool,
+        no_exponent_without_fraction: bool,
+        no_special: bool,
+        case_sensitive_special: bool,
+        no_integer_leading_zeros: bool,
+        no_float_leading_zeros: bool,
+        integer_internal_digit_separator: bool,
+        fraction_internal_digit_separator: bool,
+        exponent_internal_digit_separator: bool,
+        integer_leading_digit_separator: bool,
+        fraction_leading_digit_separator: bool,
+        exponent_leading_digit_separator: bool,
+        integer_trailing_digit_separator: bool,
+        fraction_trailing_digit_separator: bool,
+        exponent_trailing_digit_separator: bool,
+        integer_consecutive_digit_separator: bool,
+        fraction_consecutive_digit_separator: bool,
+        exponent_consecutive_digit_separator: bool,
+        special_digit_separator: bool
+    ) -> Option<NumberFormat> {
+        let mut format = NumberFormat::default();
+        // Generic flags.
+        add_flag!(format, required_integer_digits, REQUIRED_INTEGER_DIGITS);
+        add_flag!(format, required_fraction_digits, REQUIRED_FRACTION_DIGITS);
+        add_flag!(format, required_exponent_digits, REQUIRED_EXPONENT_DIGITS);
+        add_flag!(format, no_positive_mantissa_sign, NO_POSITIVE_MANTISSA_SIGN);
+        add_flag!(format, required_mantissa_sign, REQUIRED_MANTISSA_SIGN);
+        add_flag!(format, no_exponent_notation, NO_EXPONENT_NOTATION);
+        add_flag!(format, no_positive_exponent_sign, NO_POSITIVE_EXPONENT_SIGN);
+        add_flag!(format, required_exponent_sign, REQUIRED_EXPONENT_SIGN);
+        add_flag!(format, no_exponent_without_fraction, NO_EXPONENT_WITHOUT_FRACTION);
+        add_flag!(format, no_special, NO_SPECIAL);
+        add_flag!(format, case_sensitive_special, CASE_SENSITIVE_SPECIAL);
+        add_flag!(format, no_integer_leading_zeros, NO_INTEGER_LEADING_ZEROS);
+        add_flag!(format, no_float_leading_zeros, NO_FLOAT_LEADING_ZEROS);
+
+        // Digit separator flags.
+        add_flag!(format, integer_internal_digit_separator, INTEGER_INTERNAL_DIGIT_SEPARATOR);
+        add_flag!(format, fraction_internal_digit_separator, FRACTION_INTERNAL_DIGIT_SEPARATOR);
+        add_flag!(format, exponent_internal_digit_separator, EXPONENT_INTERNAL_DIGIT_SEPARATOR);
+        add_flag!(format, integer_leading_digit_separator, INTEGER_LEADING_DIGIT_SEPARATOR);
+        add_flag!(format, fraction_leading_digit_separator, FRACTION_LEADING_DIGIT_SEPARATOR);
+        add_flag!(format, exponent_leading_digit_separator, EXPONENT_LEADING_DIGIT_SEPARATOR);
+        add_flag!(format, integer_trailing_digit_separator, INTEGER_TRAILING_DIGIT_SEPARATOR);
+        add_flag!(format, fraction_trailing_digit_separator, FRACTION_TRAILING_DIGIT_SEPARATOR);
+        add_flag!(format, exponent_trailing_digit_separator, EXPONENT_TRAILING_DIGIT_SEPARATOR);
+        add_flag!(format, integer_consecutive_digit_separator, INTEGER_CONSECUTIVE_DIGIT_SEPARATOR);
+        add_flag!(format, fraction_consecutive_digit_separator, FRACTION_CONSECUTIVE_DIGIT_SEPARATOR);
+        add_flag!(format, exponent_consecutive_digit_separator, EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR);
+        add_flag!(format, special_digit_separator, SPECIAL_DIGIT_SEPARATOR);
+
+        // Digit separator.
+        if format.intersects(NumberFormat::DIGIT_SEPARATOR_FLAG_MASK) {
+            format.bits |= digit_separator_to_flags(digit_separator);
+        }
+
+        // Validation.
+        let is_invalid =
+            !is_valid_separator(digit_separator)
+            || format.intersects(NumberFormat::NO_EXPONENT_NOTATION) && format.intersects(NumberFormat::EXPONENT_FLAG_MASK)
+            || no_positive_mantissa_sign && required_mantissa_sign
+            || no_positive_exponent_sign && required_exponent_sign
+            || no_special && (case_sensitive_special || special_digit_separator)
+            || format & NumberFormat::INTEGER_DIGIT_SEPARATOR_FLAG_MASK == NumberFormat::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR
+            || format & NumberFormat::FRACTION_DIGIT_SEPARATOR_FLAG_MASK == NumberFormat::FRACTION_CONSECUTIVE_DIGIT_SEPARATOR
+            || format & NumberFormat::EXPONENT_DIGIT_SEPARATOR_FLAG_MASK == NumberFormat::EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR;
+        match is_invalid {
+            true  => None,
+            false => Some(format)
+        }
+    }
+
+    /// Compile permissive number format.
+    ///
+    /// The permissive number format does not require any control
+    /// grammar, besides the presence of mantissa digits.
+    ///
+    /// This function cannot fail, but returns an option for consistency
+    /// with other grammar compilers.
+    pub fn permissive() -> Option<NumberFormat> {
+        Some(NumberFormat::PERMISSIVE)
+    }
+
+    /// Compile standard number format.
+    ///
+    /// The standard number format is guaranteed to be identical
+    /// to the format expected by Rust's string to number parsers.
+    ///
+    /// This function cannot fail, but returns an option for consistency
+    /// with other grammar compilers.
+    pub fn standard() -> Option<NumberFormat> {
+        Some(NumberFormat::STANDARD)
+    }
+
+    /// Compile ignore number format.
+    ///
+    /// The ignore number format ignores all digit separators,
+    /// and is permissive for all other control grammar, so
+    /// implements a fast parser.
+    ///
+    /// * `digit_separator`                         - Character to separate digits.
+    ///
+    /// Returns the value if it was able to compile the format,
+    /// otherwise, returns None.
+    pub fn ignore(digit_separator: u8) -> Option<NumberFormat> {
+        if !is_valid_separator(digit_separator) {
+            return None
+        }
+
+        let mut format = NumberFormat::IGNORE;
+        format.bits |= digit_separator_to_flags(digit_separator);
+
+        Some(format)
+    }
+
+    /// Create float format directly from digit separator for unittests.
+    #[cfg(test)]
+    #[inline]
+    pub(crate) fn from_separator(digit_separator: u8) -> NumberFormat {
+        NumberFormat { bits: digit_separator_to_flags(digit_separator) }
+    }
+
+    /// Get the flag bits from the compiled float format.
+    #[inline]
+    pub fn flags(self) -> NumberFormat {
+        return self & NumberFormat::FLAG_MASK
+    }
+
+    /// Get the interface flag bits from the compiled float format.
+    #[inline]
+    pub(crate) fn interface_flags(self) -> NumberFormat {
+        return self & NumberFormat::INTERFACE_FLAG_MASK
+    }
+
+    /// Get the digit separator from the compiled float format.
+    #[inline]
+    pub fn digit_separator(self) -> u8 {
+        digit_separator_from_flags(self.bits)
+    }
+
+    /// Get if digits are required before the decimal point.
+    #[inline]
+    pub fn required_integer_digits(self) -> bool {
+        self.intersects(NumberFormat::REQUIRED_INTEGER_DIGITS)
+    }
+
+    /// Get if digits are required after the decimal point.
+    #[inline]
+    pub fn required_fraction_digits(self) -> bool {
+        self.intersects(NumberFormat::REQUIRED_FRACTION_DIGITS)
+    }
+
+    /// Get if digits are required after the exponent character.
+    #[inline]
+    pub fn required_exponent_digits(self) -> bool {
+        self.intersects(NumberFormat::REQUIRED_EXPONENT_DIGITS)
+    }
+
+    /// Get if digits are required before or after the decimal point.
+    #[inline]
+    pub fn required_digits(self) -> bool {
+        self.intersects(NumberFormat::REQUIRED_DIGITS)
+    }
+
+    /// Get if positive sign before the mantissa is not allowed.
+    #[inline]
+    pub fn no_positive_mantissa_sign(self) -> bool {
+        self.intersects(NumberFormat::NO_POSITIVE_MANTISSA_SIGN)
+    }
+
+    /// Get if positive sign before the mantissa is required.
+    #[inline]
+    pub fn required_mantissa_sign(self) -> bool {
+        self.intersects(NumberFormat::REQUIRED_MANTISSA_SIGN)
+    }
+
+    /// Get if exponent notation is not allowed.
+    #[inline]
+    pub fn no_exponent_notation(self) -> bool {
+        self.intersects(NumberFormat::NO_EXPONENT_NOTATION)
+    }
+
+    /// Get if positive sign before the exponent is not allowed.
+    #[inline]
+    pub fn no_positive_exponent_sign(self) -> bool {
+        self.intersects(NumberFormat::NO_POSITIVE_EXPONENT_SIGN)
+    }
+
+    /// Get if sign before the exponent is required.
+    #[inline]
+    pub fn required_exponent_sign(self) -> bool {
+        self.intersects(NumberFormat::REQUIRED_EXPONENT_SIGN)
+    }
+
+    /// Get if exponent without fraction is not allowed.
+    #[inline]
+    pub fn no_exponent_without_fraction(self) -> bool {
+        self.intersects(NumberFormat::NO_EXPONENT_WITHOUT_FRACTION)
+    }
+
+    /// Get if special (non-finite) values are not allowed.
+    #[inline]
+    pub fn no_special(self) -> bool {
+        self.intersects(NumberFormat::NO_SPECIAL)
+    }
+
+    /// Get if special (non-finite) values are case-sensitive.
+    #[inline]
+    pub fn case_sensitive_special(self) -> bool {
+        self.intersects(NumberFormat::CASE_SENSITIVE_SPECIAL)
+    }
+
+    /// Get if leading zeros before an integer are not allowed.
+    #[inline]
+    pub fn no_integer_leading_zeros(self) -> bool {
+        self.intersects(NumberFormat::NO_INTEGER_LEADING_ZEROS)
+    }
+
+    /// Get if leading zeros before a float are not allowed.
+    #[inline]
+    pub fn no_float_leading_zeros(self) -> bool {
+        self.intersects(NumberFormat::NO_FLOAT_LEADING_ZEROS)
+    }
+
+    /// Get if digit separators are allowed between integer digits.
+    #[inline]
+    pub fn integer_internal_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR)
+    }
+
+    /// Get if digit separators are allowed between fraction digits.
+    #[inline]
+    pub fn fraction_internal_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::FRACTION_INTERNAL_DIGIT_SEPARATOR)
+    }
+
+    /// Get if digit separators are allowed between exponent digits.
+    #[inline]
+    pub fn exponent_internal_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::EXPONENT_INTERNAL_DIGIT_SEPARATOR)
+    }
+
+    /// Get if digit separators are allowed between digits.
+    #[inline]
+    pub fn internal_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::INTERNAL_DIGIT_SEPARATOR)
+    }
+
+    /// Get if a digit separator is allowed before any integer digits.
+    #[inline]
+    pub fn integer_leading_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::INTEGER_LEADING_DIGIT_SEPARATOR)
+    }
+
+    /// Get if a digit separator is allowed before any fraction digits.
+    #[inline]
+    pub fn fraction_leading_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::FRACTION_LEADING_DIGIT_SEPARATOR)
+    }
+
+    /// Get if a digit separator is allowed before any exponent digits.
+    #[inline]
+    pub fn exponent_leading_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::EXPONENT_LEADING_DIGIT_SEPARATOR)
+    }
+
+    /// Get if a digit separator is allowed before any digits.
+    #[inline]
+    pub fn leading_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::LEADING_DIGIT_SEPARATOR)
+    }
+
+    /// Get if a digit separator is allowed after any integer digits.
+    #[inline]
+    pub fn integer_trailing_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::INTEGER_TRAILING_DIGIT_SEPARATOR)
+    }
+
+    /// Get if a digit separator is allowed after any fraction digits.
+    #[inline]
+    pub fn fraction_trailing_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::FRACTION_TRAILING_DIGIT_SEPARATOR)
+    }
+
+    /// Get if a digit separator is allowed after any exponent digits.
+    #[inline]
+    pub fn exponent_trailing_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::EXPONENT_TRAILING_DIGIT_SEPARATOR)
+    }
+
+    /// Get if a digit separator is allowed after any digits.
+    #[inline]
+    pub fn trailing_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::TRAILING_DIGIT_SEPARATOR)
+    }
+
+    /// Get if multiple consecutive integer digit separators are allowed.
+    #[inline]
+    pub fn integer_consecutive_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR)
+    }
+
+    /// Get if multiple consecutive fraction digit separators are allowed.
+    #[inline]
+    pub fn fraction_consecutive_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::FRACTION_CONSECUTIVE_DIGIT_SEPARATOR)
+    }
+
+    /// Get if multiple consecutive exponent digit separators are allowed.
+    #[inline]
+    pub fn exponent_consecutive_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR)
+    }
+
+    /// Get if multiple consecutive digit separators are allowed.
+    #[inline]
+    pub fn consecutive_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::CONSECUTIVE_DIGIT_SEPARATOR)
+    }
+
+    /// Get if any digit separators are allowed in special (non-finite) values.
+    #[inline]
+    pub fn special_digit_separator(self) -> bool {
+        self.intersects(NumberFormat::SPECIAL_DIGIT_SEPARATOR)
+    }
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_is_valid_separator() {
+        assert_eq!(is_valid_separator(b'_'), true);
+        assert_eq!(is_valid_separator(b'\''), true);
+        assert_eq!(is_valid_separator(b'0'), false);
+        assert_eq!(is_valid_separator(128), false);
+    }
+
+    #[test]
+    fn test_compile() {
+        // Test all false
+        let flags = NumberFormat::compile(b'_', false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false).unwrap();
+        assert_eq!(flags.flags(), NumberFormat::default());
+        assert_eq!(flags.digit_separator(), 0);
+    }
+
+    #[test]
+    fn test_permissive() {
+        let flags = NumberFormat::ignore(b'_').unwrap();
+        assert_eq!(flags.flags(), NumberFormat::DIGIT_SEPARATOR_FLAG_MASK);
+    }
+
+    #[test]
+    fn test_ignore() {
+        let flags = NumberFormat::ignore(b'_').unwrap();
+        assert_eq!(flags.flags(), NumberFormat::DIGIT_SEPARATOR_FLAG_MASK);
+        assert_eq!(flags.digit_separator(), b'_');
+        assert_eq!(flags.required_integer_digits(), false);
+        assert_eq!(flags.required_fraction_digits(), false);
+        assert_eq!(flags.required_exponent_digits(), false);
+        assert_eq!(flags.required_digits(), false);
+        assert_eq!(flags.no_positive_mantissa_sign(), false);
+        assert_eq!(flags.required_mantissa_sign(), false);
+        assert_eq!(flags.no_exponent_notation(), false);
+        assert_eq!(flags.no_positive_exponent_sign(), false);
+        assert_eq!(flags.required_exponent_sign(), false);
+        assert_eq!(flags.no_exponent_without_fraction(), false);
+        assert_eq!(flags.no_special(), false);
+        assert_eq!(flags.case_sensitive_special(), false);
+        assert_eq!(flags.no_integer_leading_zeros(), false);
+        assert_eq!(flags.no_float_leading_zeros(), false);
+        assert_eq!(flags.integer_internal_digit_separator(), true);
+        assert_eq!(flags.fraction_internal_digit_separator(), true);
+        assert_eq!(flags.exponent_internal_digit_separator(), true);
+        assert_eq!(flags.internal_digit_separator(), true);
+        assert_eq!(flags.integer_leading_digit_separator(), true);
+        assert_eq!(flags.fraction_leading_digit_separator(), true);
+        assert_eq!(flags.exponent_leading_digit_separator(), true);
+        assert_eq!(flags.leading_digit_separator(), true);
+        assert_eq!(flags.integer_trailing_digit_separator(), true);
+        assert_eq!(flags.fraction_trailing_digit_separator(), true);
+        assert_eq!(flags.exponent_trailing_digit_separator(), true);
+        assert_eq!(flags.trailing_digit_separator(), true);
+        assert_eq!(flags.integer_consecutive_digit_separator(), true);
+        assert_eq!(flags.fraction_consecutive_digit_separator(), true);
+        assert_eq!(flags.exponent_consecutive_digit_separator(), true);
+        assert_eq!(flags.consecutive_digit_separator(), true);
+        assert_eq!(flags.special_digit_separator(), true);
+    }
+
+    #[test]
+    fn test_flags() {
+        let flags = [
+            NumberFormat::REQUIRED_INTEGER_DIGITS,
+            NumberFormat::REQUIRED_FRACTION_DIGITS,
+            NumberFormat::REQUIRED_EXPONENT_DIGITS,
+            NumberFormat::NO_POSITIVE_MANTISSA_SIGN,
+            NumberFormat::REQUIRED_MANTISSA_SIGN,
+            NumberFormat::NO_EXPONENT_NOTATION,
+            NumberFormat::NO_POSITIVE_EXPONENT_SIGN,
+            NumberFormat::REQUIRED_EXPONENT_SIGN,
+            NumberFormat::NO_EXPONENT_WITHOUT_FRACTION,
+            NumberFormat::NO_SPECIAL,
+            NumberFormat::CASE_SENSITIVE_SPECIAL,
+            NumberFormat::NO_INTEGER_LEADING_ZEROS,
+            NumberFormat::NO_FLOAT_LEADING_ZEROS,
+            NumberFormat::INTEGER_INTERNAL_DIGIT_SEPARATOR,
+            NumberFormat::FRACTION_INTERNAL_DIGIT_SEPARATOR,
+            NumberFormat::EXPONENT_INTERNAL_DIGIT_SEPARATOR,
+            NumberFormat::INTEGER_LEADING_DIGIT_SEPARATOR,
+            NumberFormat::FRACTION_LEADING_DIGIT_SEPARATOR,
+            NumberFormat::EXPONENT_LEADING_DIGIT_SEPARATOR,
+            NumberFormat::INTEGER_TRAILING_DIGIT_SEPARATOR,
+            NumberFormat::FRACTION_TRAILING_DIGIT_SEPARATOR,
+            NumberFormat::EXPONENT_TRAILING_DIGIT_SEPARATOR,
+            NumberFormat::INTEGER_CONSECUTIVE_DIGIT_SEPARATOR,
+            NumberFormat::FRACTION_CONSECUTIVE_DIGIT_SEPARATOR,
+            NumberFormat::EXPONENT_CONSECUTIVE_DIGIT_SEPARATOR,
+            NumberFormat::SPECIAL_DIGIT_SEPARATOR
+        ];
+        for &flag in flags.iter() {
+            assert_eq!(flag.flags(), flag);
+            assert_eq!(flag.digit_separator(), 0);
+        }
+    }
+
+    #[test]
+    fn test_constants() {
+        let flags = [
+            NumberFormat::RUST_LITERAL,
+            NumberFormat::RUST_STRING,
+            NumberFormat::RUST_STRING_STRICT,
+            NumberFormat::PYTHON_LITERAL,
+            NumberFormat::PYTHON_STRING,
+            NumberFormat::CXX17_LITERAL,
+            NumberFormat::CXX17_STRING,
+            NumberFormat::CXX14_LITERAL,
+            NumberFormat::CXX14_STRING,
+            NumberFormat::CXX11_LITERAL,
+            NumberFormat::CXX11_STRING,
+            NumberFormat::CXX03_LITERAL,
+            NumberFormat::CXX03_STRING,
+            NumberFormat::CXX98_LITERAL,
+            NumberFormat::CXX98_STRING,
+            NumberFormat::C18_LITERAL,
+            NumberFormat::C18_STRING,
+            NumberFormat::C11_LITERAL,
+            NumberFormat::C11_STRING,
+            NumberFormat::C99_LITERAL,
+            NumberFormat::C99_STRING,
+            NumberFormat::C90_LITERAL,
+            NumberFormat::C90_STRING,
+            NumberFormat::C89_LITERAL,
+            NumberFormat::C89_STRING,
+            NumberFormat::RUBY_LITERAL,
+            NumberFormat::RUBY_STRING,
+            NumberFormat::SWIFT_LITERAL,
+            NumberFormat::SWIFT_STRING,
+            NumberFormat::GO_LITERAL,
+            NumberFormat::GO_STRING,
+            NumberFormat::HASKELL_LITERAL,
+            NumberFormat::HASKELL_STRING,
+            NumberFormat::JAVASCRIPT_LITERAL,
+            NumberFormat::JAVASCRIPT_STRING,
+            NumberFormat::PERL_LITERAL,
+            NumberFormat::PERL_STRING,
+            NumberFormat::PHP_LITERAL,
+            NumberFormat::PHP_STRING,
+            NumberFormat::JAVA_LITERAL,
+            NumberFormat::JAVA_STRING,
+            NumberFormat::R_LITERAL,
+            NumberFormat::R_STRING,
+            NumberFormat::KOTLIN_LITERAL,
+            NumberFormat::KOTLIN_STRING,
+            NumberFormat::JULIA_LITERAL,
+            NumberFormat::JULIA_STRING,
+            NumberFormat::CSHARP7_LITERAL,
+            NumberFormat::CSHARP7_STRING,
+            NumberFormat::CSHARP6_LITERAL,
+            NumberFormat::CSHARP6_STRING,
+            NumberFormat::CSHARP5_LITERAL,
+            NumberFormat::CSHARP5_STRING,
+            NumberFormat::CSHARP4_LITERAL,
+            NumberFormat::CSHARP4_STRING,
+            NumberFormat::CSHARP3_LITERAL,
+            NumberFormat::CSHARP3_STRING,
+            NumberFormat::CSHARP2_LITERAL,
+            NumberFormat::CSHARP2_STRING,
+            NumberFormat::CSHARP1_LITERAL,
+            NumberFormat::CSHARP1_STRING,
+            NumberFormat::KAWA_LITERAL,
+            NumberFormat::KAWA_STRING,
+            NumberFormat::GAMBITC_LITERAL,
+            NumberFormat::GAMBITC_STRING,
+            NumberFormat::GUILE_LITERAL,
+            NumberFormat::GUILE_STRING,
+            NumberFormat::CLOJURE_LITERAL,
+            NumberFormat::CLOJURE_STRING,
+            NumberFormat::ERLANG_LITERAL,
+            NumberFormat::ERLANG_STRING,
+            NumberFormat::ELM_LITERAL,
+            NumberFormat::ELM_STRING,
+            NumberFormat::SCALA_LITERAL,
+            NumberFormat::SCALA_STRING,
+            NumberFormat::ELIXIR_LITERAL,
+            NumberFormat::ELIXIR_STRING,
+            NumberFormat::FORTRAN_LITERAL,
+            NumberFormat::FORTRAN_STRING,
+            NumberFormat::D_LITERAL,
+            NumberFormat::D_STRING,
+            NumberFormat::COFFEESCRIPT_LITERAL,
+            NumberFormat::COFFEESCRIPT_STRING,
+            NumberFormat::COBOL_LITERAL,
+            NumberFormat::COBOL_STRING,
+            NumberFormat::FSHARP_LITERAL,
+            NumberFormat::FSHARP_STRING,
+            NumberFormat::VB_LITERAL,
+            NumberFormat::VB_STRING,
+            NumberFormat::OCAML_LITERAL,
+            NumberFormat::OCAML_STRING,
+            NumberFormat::OBJECTIVEC_LITERAL,
+            NumberFormat::OBJECTIVEC_STRING,
+            NumberFormat::REASONML_LITERAL,
+            NumberFormat::REASONML_STRING,
+            NumberFormat::OCTAVE_LITERAL,
+            NumberFormat::OCTAVE_STRING,
+            NumberFormat::MATLAB_LITERAL,
+            NumberFormat::MATLAB_STRING,
+            NumberFormat::ZIG_LITERAL,
+            NumberFormat::ZIG_STRING,
+            NumberFormat::SAGE_LITERAL,
+            NumberFormat::SAGE_STRING,
+            NumberFormat::JSON,
+            NumberFormat::TOML,
+            NumberFormat::YAML,
+            NumberFormat::XML,
+            NumberFormat::SQLITE,
+            NumberFormat::POSTGRESQL,
+            NumberFormat::MYSQL,
+            NumberFormat::MONGODB
+        ];
+        for &flag in flags.iter() {
+            // Just wanna check the flags are defined.
+            assert!((flag.bits == 0) | true);
+            assert!((flag.digit_separator() == 0) | true);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/format/not_feature_format.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/format/not_feature_format.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/format/not_feature_format.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/format/not_feature_format.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+#![cfg(not(feature = "format"))]
+
+use bitflags::bitflags;
+
+bitflags! {
+    /// Dummy bitflags for the float format.
+    #[doc(hidden)]
+    #[derive(Default)]
+    pub struct NumberFormat: u64 {
+        const __NONEXHAUSTIVE = 0;
+    }
+}
+
+
+impl NumberFormat {
+    #[inline]
+    pub fn standard() -> Option<NumberFormat> {
+        Some(NumberFormat::default())
+    }
+
+    #[inline]
+    pub fn digit_separator(&self) -> u8 {
+        0
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/format.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/format.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/format.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/format.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,688 @@
+//! Number format enumerations and bit masks.
+
+// Sample test code for each language used:
+//
+//  Rust
+//  ----
+//
+//  Setup:
+//      Save to `main.rs` and run `rustc main.rs -o main`.
+//
+//  Code:
+//      ```text
+//      pub fn main() {
+//          println!("{:?}", 3_.0f32);
+//          println!("{:?}", "3_.0".parse::<f32>());
+//      }
+//      ```
+//
+// Python
+// ------
+//
+//  Setup:
+//      Run `python` to enter the interpreter.
+//
+//  Code:
+//      ```text
+//      print(3_.0)
+//      print(float("3_.0"))
+//      ```
+//
+//  C++
+//  ---
+//
+//  Setup:
+//      Save to `main.cc` and run `g++ main.cc -o main -std=c++XX`,
+//      where XX is one of the following values:
+//          - 98
+//          - 03
+//          - 11
+//          - 14
+//          - 17
+//
+//  Code:
+//      ```text
+//      #include <cstdlib>
+//      #include <cstring>
+//      #include <iostream>
+//      #include <iterator>
+//      #include <stdexcept>
+//
+//      double parse(const char* string) {
+//          char* end;
+//          double result = strtod(string, &end);
+//          if (std::distance(string, reinterpret_cast<const char*>(end)) != strlen(string)) {
+//              throw std::invalid_argument("did not consume entire string.");
+//          }
+//          return result;
+//      }
+//
+//      int main() {
+//          std::cout << 3'.0 << std::endl;
+//          std::cout << parse("3'.0") << std::endl;
+//      }
+//      ```
+//
+//  C
+//  -
+//
+//  Setup:
+//      Save to `main.c` and run `gcc main.c -o main -std=cXX`,
+//      where XX is one of the following values:
+//          - 89
+//          - 90
+//          - 99
+//          - 11
+//          - 18
+//
+//  Code:
+//      ```text
+//      #include <stdint.h>
+//      #include <stdlib.h>
+//      #include <string.h>
+//      #include <stdio.h>
+//
+//      size_t distance(const char* first, const char* last) {
+//          uintptr_t x = (uintptr_t) first;
+//          uintptr_t y = (uintptr_t) last;
+//          return (size_t) (y - x);
+//      }
+//
+//      double parse(const char* string) {
+//          char* end;
+//          double result = strtod(string, &end);
+//          if (distance(string, (const char*) end) != strlen(string)) {
+//              abort();
+//          }
+//          return result;
+//      }
+//
+//      int main() {
+//          printf("%f\n", 3'.);
+//          printf("%f\n", parse("3'."));
+//      }
+//      ```
+//
+// Ruby
+// ----
+//
+//  Setup:
+//      Run `irb` to enter the interpreter.
+//
+//  Code:
+//      ```text
+//      puts 3.0_1;
+//      puts "3.0_1".to_f;
+//      ```
+// Swift
+// -----
+//
+//  Setup:
+//      Run `swift` to enter the interpreter.
+//
+//  Code:
+//      ```text
+//      print(3.0);
+//      print(Float("3.0"));
+//      ```
+// Golang
+// ------
+//
+// Setup:
+//      Save to `main.go` and run `go run main.go`
+//
+// Code:
+//      ```text
+//      package main
+//
+//      import (
+//          "fmt"
+//          "strconv"
+//      )
+//
+//      func main() {
+//          fmt.Println(3.0)
+//          fmt.Println(strconv.ParseFloat("3.0", 64))
+//      }
+//      ```
+//
+// Haskell
+// -------
+//
+// Setup:
+//      Run `ghci` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      :m Numeric
+//      showFloat 3.0 ""
+//      let x = "3.0"
+//      read x :: Float
+//      ```
+//
+// Javascript
+// ----------
+//
+// Setup:
+//      Run `nodejs` (or `node`) to enter the interpreter.
+//
+// Code:
+//      ```text
+//          console.log(3.0)
+//          console.log(parseFloat("3.0"))
+//      ```
+//
+// Perl
+// ----
+//
+// Setup:
+//      Run `perl -de1` to enter the interpret.
+//
+// Code:
+//      ```text
+//      print 3.01;
+//      print '3.01' * 1;
+//      ```
+//
+// PHP
+// ---
+//
+// Setup:
+//      Run `php -a` to enter the interpret.
+//
+// Code:
+//      ```text
+//      printf("%f\n", 3.0);
+//      printf("%f\n", floatval("3.0"));
+//      ```
+//
+// Java
+// ----
+//
+// Setup:
+//      Save to `main.java` and run `javac main.java`, then run `java Main`.
+//
+// Code:
+//      ```text
+//      class Main {
+//          public static void main(String args[]) {
+//              System.out.println(3.0);
+//              System.out.println(Float.parseFloat("3.0"));
+//          }
+//      }
+//      ```
+//
+// R
+// -
+//
+// Setup:
+//      Run `R` to enter the interpret.
+//
+// Code:
+//      ```text
+//      print(3.0);
+//      print(as.numeric("3.0"));
+//      ```
+//
+// Kotlin
+// ------
+//
+// Setup:
+//      Save file to `main.kt` and run `kotlinc main.kt -d main.jar`,
+//      then run `java -jar main.jar`.
+//
+// Code:
+//      ```text
+//      fun main() {
+//          println(3.0)
+//          println("3.0".toDouble())
+//      }
+//      ```
+//
+// Julia
+// -----
+//
+// Setup:
+//      Run `julia` to enter the interpret.
+//
+// Code:
+//      ```text
+//      print(3.0);
+//      print(parse(Float64, "3.0"));
+//      ```
+//
+// C#
+// --
+//
+// Note:
+//      Mono accepts both integer and fraction decimal separators, Mono is
+//      just buggy, see https://github.com/dotnet/csharplang/issues/55#issuecomment-574902516.
+//
+// Setup:
+//      Run `csharp -langversion:X` to enter the interpret,
+//      where XX is one of the following values:
+//          - ISO-1
+//          - ISO-2
+//          - 3
+//          - 4
+//          - 5
+//          - 6
+//          - 7
+//
+// Code:
+//      ```text
+//      Console.WriteLine("{0}", 3.0);
+//      Console.WriteLine("{0}", float.Parse("3.0"));
+//      ```
+//
+// Kawa
+// ----
+//
+// Setup:
+//      Run `kawa` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0
+//      (string->number "3.0")
+//      ```
+//
+// Gambit-C
+// --------
+//
+// Setup:
+//      Run `gsc` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0
+//      (string->number "3.0")
+//      ```
+//
+// Guile
+// -----
+//
+// Setup:
+//      Run `guile` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0
+//      (string->number "3.0")
+//      ```
+//
+// Clojure
+// -------
+//
+// Setup:
+//      Run `clojure` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0
+//      (Float/parseFloat "3.0")
+//      ```
+//
+// Erlang
+// ------
+//
+// Setup:
+//      Run `erl` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      io:format("~p~n", [3.0]).
+//      string:to_float("3.0").
+//      ```
+//
+// Elm
+// ---
+//
+// Setup:
+//      Run `elm repl` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0
+//      String.toFloat "3.0"
+//      ```
+//
+// Scala
+// -----
+//
+// Setup:
+//      Run `scala` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0
+//      "3.0".toFloat
+//      ```
+//
+// Elixir
+// ------
+//
+// Setup:
+//      Run `iex` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0;
+//      String.to_float("3.0");
+//      ```
+//
+// FORTRAN
+// -------
+//
+// Setup:
+//      Save to `main.f90` and run `gfortran -o main main.f90`
+//
+// Code:
+//      ```text
+//      program main
+//        real :: x
+//        character (len=30) :: word
+//        word = "3."
+//        read(word, *) x
+//        print *, 3.
+//        print *, x
+//      end program main
+//      ```
+//
+// D
+// -
+//
+// Setup:
+//      Save to `main.d` and run `dmd -run main.d`
+//
+// Code:
+//      ```text
+//      import std.conv;
+//      import std.stdio;
+//
+//      void main()
+//      {
+//          writeln(3.0);
+//          writeln(to!double("3.0"));
+//      }
+//      ```
+//
+// Coffeescript
+// ------------
+//
+// Setup:
+//      Run `coffee` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0;
+//      parseFloat("3.0");
+//      ```
+//
+// Cobol
+// -----
+//
+// Setup:
+//      Save to `main.cbl` and run `cobc main.cbl` then `cobcrun main`.
+//
+// Code:
+//      ```text
+//                IDENTIFICATION DIVISION.
+//                PROGRAM-ID. main.
+//
+//                DATA DIVISION.
+//                   WORKING-STORAGE SECTION.
+//                   01 R PIC X(20)   VALUE "3.0".
+//                   01 TOTAL        USAGE IS COMP-2.
+//
+//                PROCEDURE DIVISION.
+//                   COMPUTE TOTAL = FUNCTION NUMVAL(R).
+//                   Display 3.0.
+//                   Display TOTAL.
+//                   STOP RUN.
+//      ```
+//
+// F#
+// --
+//
+// Setup:
+//      Run `fsharpi` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      printfn "%f" 3.0;;
+//      let f = float "3.0";;
+//      printfn "%f" f;;
+//      ```
+//
+// Visual Basic
+// ------------
+//
+// Setup:
+//      Save to `main.vb` and run `vbnc main.vb`.
+//
+// Code:
+//      ```text
+//      Imports System
+//
+//      Module Module1
+//          Sub Main()
+//              Console.WriteLine(Format$(3.0, "0.0000000000000"))
+//              Console.WriteLine(Format$(CDbl("3.0"), "0.0000000000000"))
+//          End Sub
+//      End Module
+//      ```
+//
+// OCaml
+// -----
+//
+// Setup:
+//      Save to `main.ml` and run `ocamlc -o main main.ml`.
+//
+// Code:
+//      ```text
+//      Printf.printf "%f\n" 3.0
+//      let () =
+//          let f = float_of_string "3.0" in
+//          Printf.printf "%f\n" f
+//      ```
+//
+// Objective-C
+// -----------
+//
+// Setup:
+//      Save to `main.m` and run `gcc -o main -lobjc -lgnustep-base main.m -fconstant-string-class=NSConstantString`.
+//
+// Code:
+//      ```text
+//      #import <Foundation/Foundation.h>
+//      #import <stdio.h>
+//
+//      int main(int argv, char* argc[])
+//      {
+//          printf("%f\n", 3.0);
+//          NSString *s = @"3.0";
+//          double f = [s doubleValue];
+//          printf("%f\n", f);
+//      }
+//      ```
+//
+// ReasonML
+// --------
+//
+// Setup:
+//      Run `rtop` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      Printf.printf("%f\n", 3.0);
+//      Printf.printf("%f\n", float_of_string("3.0"));
+//      ```
+//
+// Zig
+// ---
+//
+// Setup:
+//      Save to `main.zig` and run `zig build-exe main.zig`
+//
+// Code:
+//      ```text
+//      const std = @import("std");
+//
+//      pub fn main() void {
+//          const f: f64 = 3.0;
+//          std.debug.warn("{}\n", f);
+//          const x: f64 = std.fmt.parseFloat(f64, "3.0") catch unreachable;
+//          std.debug.warn("{}\n", x);
+//      }
+//      ```
+//
+//
+// Octave (and Matlab)
+// -------------------
+//
+// Setup:
+//      Run `octave` to enter the interpreter, or
+//      run `octave --traditional` to enter the Matlab interpret.
+//
+// Code:
+//      ```text
+//      3.0
+//      str2double("3.0")
+//      ```
+//
+// Sage
+// ----
+//
+// Setup:
+//      Run `sage` to enter the interpreter.
+//
+// Code:
+//      ```text
+//      3.0
+//      float("3.0")
+//      ```
+//
+// JSON
+// ----
+//
+// Setup:
+//      Run `node` (or `nodejs`) to enter the JS interpreter.
+//
+// Code:
+//      ```text
+//      JSON.parse("3.0")
+//      ```
+//
+// TOML
+// ----
+//
+// Setup:
+//      Run `python` to enter the Python interpreter.
+//
+// Code:
+//      ```text
+//      import tomlkit
+//      tomlkit.parse("a = 3.0")
+//      ```
+//
+// XML
+// ---
+//
+// Setup:
+//      Run `python` to enter the Python interpreter.
+//
+// Code:
+//      ```text
+//      from lxml import etree
+//
+//      def validate_xml(xsd, xml):
+//          '''Validate XML file against schema'''
+//
+//          schema = etree.fromstring(xsd)
+//          doc = etree.fromstring(xml)
+//          xmlschema = etree.XMLSchema(schema)
+//
+//          return xmlschema.validate(doc)
+//
+//
+//      xsd = b'''<?xml version="1.0" encoding="UTF-8"?>
+//      <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+//          <xs:element name="prize" type="xs:float"/>
+//      </xs:schema>'''
+//
+//      xml = b'''<?xml version="1.0" encoding="UTF-8"?>
+//      <prize>3.0</prize>
+//      '''
+//
+//      validate_xml(xsd, xml)
+//      ```
+//
+// SQLite
+// ------
+//
+// Setup:
+//      Run `sqlite3 :memory:` to enter the sqlite3 interpreter
+//      with an in-memory database.
+//
+// Code:
+//      ```text
+//      CREATE TABLE stocks (price real);
+//      INSERT INTO stocks VALUES (3.0);
+//      SELECT * FROM stocks;
+//      ```
+//
+// PostgreSQL
+// ----------
+//
+// Setup:
+//      Run `initdb -D db` to create a database data direction,
+//      then run `pg_ctl -D db start` to start the server, then run
+//      `createdb` to create a user database and `psql` to start the
+//      interpreter.
+//
+// Code:
+//      ```text
+//      CREATE TABLE stocks (price real);
+//      INSERT INTO stocks VALUES (3.0);
+//      SELECT * FROM stocks;
+//      ```
+//
+// MySQL
+// -----
+//
+// Setup:
+//      Run `mysqld` to start the server, then run `mysql` to start the
+//      interpreter.
+//
+// Code:
+//      ```text
+//      USE mysql;
+//      CREATE TABLE stocks (price real);
+//      INSERT INTO stocks VALUES (3.0);
+//      SELECT * FROM stocks;
+//      ```
+//
+// MongoDB
+// -------
+//
+// Setup:
+//      Run `mongod --dbpath data/db` to start the server, then run
+//      `mongo` to start the interpreter.
+//
+// Code:
+//      ```text
+//      use mydb
+//      db.movie.insert({"name": 3.0})
+//      db.movie.find()
+//      ```
+
+cfg_if! {
+    if #[cfg(feature = "format")] {
+        mod feature_format;
+        pub use self::feature_format::*;
+    } else {
+        mod not_feature_format;
+        pub use self::not_feature_format::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/index.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/index.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/index.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/index.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,85 @@
+//! Macro to facilitate indexing for unchecked variants.
+
+/// Macro to index without bounds checking.
+#[allow(unused_macros)]
+macro_rules! unchecked_index {
+    // Get
+    ($container:ident[$index:expr]) => (
+        * unsafe { $container.get_unchecked($index) }
+    );
+
+    // Get
+    ($obj:ident$(.$subobj:ident)*[$index:expr]) => (
+        * unsafe { $obj$(.$subobj)*.get_unchecked($index) }
+    );
+}
+
+/// Macro to mutably index without bounds checking.
+#[allow(unused_macros)]
+macro_rules! unchecked_index_mut {
+    // Get
+    ($container:ident[$index:expr]) => {
+        * unsafe { $container.get_unchecked_mut($index) }
+    };
+
+    // Set
+    ($container:ident[$index:expr] = $rhs:expr) => (
+        unsafe { *$container.get_unchecked_mut($index) = $rhs }
+    );
+}
+
+/// Macro to index without bounds checking.
+#[cfg(feature = "unchecked_index")]
+macro_rules! index {
+    // Get
+    ($container:ident[$index:expr]) => (
+        * unsafe { $container.get_unchecked($index) }
+    );
+
+    // Get
+    ($obj:ident$(.$subobj:ident)*[$index:expr]) => (
+        * unsafe { $obj$(.$subobj)*.get_unchecked($index) }
+    );
+}
+
+/// Macro to mutably index without bounds checking.
+#[cfg(feature = "unchecked_index")]
+macro_rules! index_mut {
+    // Get
+    ($container:ident[$index:expr]) => (
+        * unsafe { $container.get_unchecked_mut($index) }
+    );
+
+    // Set
+    ($container:ident[$index:expr] = $rhs:expr) => (
+        unsafe { *$container.get_unchecked_mut($index) = $rhs }
+    );
+}
+
+/// Macro to index with bounds checking.
+#[cfg(not(feature = "unchecked_index"))]
+macro_rules! index {
+    // Get
+    ($container:ident[$index:expr]) => (
+        $container[$index]
+    );
+
+    // Get
+    ($obj:ident$(.$subobj:ident)*[$index:expr]) => (
+        $obj$(.$subobj)*[$index]
+    );
+}
+
+/// Macro to mutably index with bounds checking.
+#[cfg(not(feature = "unchecked_index"))]
+macro_rules! index_mut {
+    // Get
+    ($container:ident[$index:expr]) => (
+        $container[$index]
+    );
+
+    // Set
+    ($container:ident[$index:expr] = $rhs:expr) => (
+        $container[$index] = $rhs
+    );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/iterator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/iterator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/iterator.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/iterator.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,103 @@
+//! Helper traits for iterators.
+
+use crate::lib::slice;
+
+#[cfg(feature = "format")]
+use super::skip_value::*;
+
+/// An iterator that knows if it has been fully consumed yet.
+///
+/// A consumed iterator will guarantee to return `None` for the next
+/// value. It is effectively a weak variant of `is_empty()` on
+/// `ExactSizeIterator`. When the length of an iterator is known,
+/// `ConsumedIterator` will be implemented in terms of that length..
+pub(crate) trait ConsumedIterator: Iterator {
+    /// Return if the iterator has been consumed.
+    fn consumed(&self) -> bool;
+}
+
+impl<T: ExactSizeIterator> ConsumedIterator for T {
+    #[inline]
+    fn consumed(&self) -> bool {
+        self.len() == 0
+    }
+}
+
+/// Get access to a raw, const pointer from the underlying data.
+///
+/// A default implementation is provided for slice iterators.
+/// This trait **should never** return null, or be implemented
+/// for non-contiguous data.
+pub(crate) trait AsPtrIterator<'a, T: 'a>: Iterator<Item=&'a T> {
+    /// Get raw pointer from iterator state.
+    fn as_ptr(&self) -> *const T;
+}
+
+impl<'a, T> AsPtrIterator<'a, T> for slice::Iter<'a, T> {
+    #[inline]
+    fn as_ptr(&self) -> *const T {
+        self.as_slice().as_ptr()
+    }
+}
+
+// Type for iteration without any digit separators.
+pub(crate) type IteratorNoSeparator<'a> = slice::Iter<'a, u8>;
+
+// Iterate without any skipping any digit separators.
+#[inline(always)]
+pub(crate) fn iterate_digits_no_separator<'a>(bytes: &'a [u8], _: u8)
+    -> IteratorNoSeparator<'a>
+{
+    bytes.iter()
+}
+
+// Type for iteration with a digit separator.
+#[cfg(feature = "format")]
+pub(crate) type IteratorSeparator<'a> = SkipValueIterator<'a, u8>;
+
+// Iterate while skipping digit separators.
+#[cfg(feature = "format")]
+#[inline(always)]
+pub(crate) fn iterate_digits_ignore_separator<'a>(bytes: &'a [u8], digit_separator: u8)
+    -> IteratorSeparator<'a>
+{
+    IteratorSeparator::new(bytes, digit_separator)
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn consumer_iterator_test() {
+        let mut iter = b"12345".iter();
+        assert_eq!(iter.consumed(), false);
+        assert_eq!(iter.nth(4).unwrap(), &b'5');
+        assert_eq!(iter.consumed(), true);
+    }
+
+    #[test]
+    fn as_ptr_iterator_test() {
+        let digits = b"12345";
+        let mut iter = digits.iter();
+        assert_eq!(iter.as_ptr(), digits.as_ptr());
+        assert_eq!(iter.nth(4).unwrap(), &b'5');
+        assert_eq!(iter.as_ptr(), digits[digits.len()..].as_ptr());
+    }
+
+    #[test]
+    fn iterate_digits_no_separator_test() {
+        assert!(iterate_digits_no_separator(b"01", b'\x00').eq(b"01".iter()));
+        assert!(iterate_digits_no_separator(b"01_01", b'_').eq(b"01_01".iter()));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+        fn iterate_digits_ignore_separator_test() {
+        assert!(iterate_digits_ignore_separator(b"01", b'_').eq(b"01".iter()));
+        assert!(iterate_digits_ignore_separator(b"01_01", b'_').eq(b"0101".iter()));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/mask.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/mask.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/mask.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/mask.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,145 @@
+//! Bit masks for extracting bits.
+
+use crate::lib::mem;
+use super::cast::as_cast;
+use super::num::UnsignedInteger;
+
+/// Generate a bitwise mask for the lower `n` bits.
+///
+/// # Examples
+///
+/// ```text
+/// # use lexical::util::lower_n_mask;
+/// # pub fn main() {
+/// lower_n_mask(2u32) -> b11u32;
+/// # }
+/// ```
+#[inline]
+pub(crate) fn lower_n_mask<N>(n: N)
+    -> N
+    where N:UnsignedInteger
+{
+    let bits: N = as_cast(mem::size_of::<N>() * 8);
+    debug_assert!(n <= bits, "lower_n_mask() overflow in shl.");
+
+    match n == bits {
+        true  => N::max_value(),
+        false => (N::ONE << n) - N::ONE,
+    }
+}
+
+/// Calculate the halfway point for the lower `n` bits.
+///
+/// # Examples
+///
+/// ```text
+/// # use lexical::util::lower_n_halfway;
+/// # pub fn main() {
+/// lower_n_halfway(2u32) -> b10u32;
+/// # }
+/// ```
+#[inline]
+pub(crate) fn lower_n_halfway<N>(n: N)
+    -> N
+    where N:UnsignedInteger
+{
+    let bits: N = as_cast(mem::size_of::<N>() * 8);
+    debug_assert!(n <= bits, "lower_n_halfway() overflow in shl.");
+
+    match n.is_zero() {
+        true  => N::ZERO,
+        false => nth_bit(n - N::ONE),
+    }
+}
+
+/// Calculate a scalar factor of 2 above the halfway point.
+///
+/// # Examples
+///
+/// ```text
+/// # use lexical::util::nth_bit;
+/// # pub fn main() {
+/// nth_bit(2u32) -> b100u32;
+/// # }
+/// ```
+#[inline]
+pub(crate) fn nth_bit<N>(n: N)
+    -> N
+    where N:UnsignedInteger
+{
+    let bits: N = as_cast(N::BITS);
+    debug_assert!(n < bits, "nth_bit() overflow in shl.");
+
+    N::ONE << n
+}
+
+/// Calculate a bitwise mask with `n` 1 bits starting at the `bit` position.
+///
+/// # Examples
+///
+/// ```text
+/// # use lexical::util::internal_n_mask;
+/// # pub fn main() {
+/// internal_n_mask(4u32, 2u32) -> b1100u32;
+/// internal_n_mask(10u32, 2u32) -> 0b1100000000;
+/// # }
+/// ```
+#[inline]
+pub(crate) fn internal_n_mask<N>(bit: N, n: N)
+    -> N
+    where N:UnsignedInteger
+{
+    let bits: N = as_cast(mem::size_of::<N>() * 8);
+    debug_assert!(bit <= bits, "internal_n_halfway() overflow in shl.");
+    debug_assert!(n <= bits, "internal_n_halfway() overflow in shl.");
+    debug_assert!(bit >= n, "internal_n_halfway() overflow in sub.");
+
+    lower_n_mask(bit) ^ lower_n_mask(bit - n)
+}
+
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn lower_n_mask_test() {
+        assert_eq!(lower_n_mask(0u32), 0b0);
+        assert_eq!(lower_n_mask(1u32), 0b1);
+        assert_eq!(lower_n_mask(2u32), 0b11);
+        assert_eq!(lower_n_mask(10u32), 0b1111111111);
+        assert_eq!(lower_n_mask(32u32), 0b11111111111111111111111111111111);
+    }
+
+    #[test]
+    fn lower_n_halfway_test() {
+        assert_eq!(lower_n_halfway(0u32), 0b0);
+        assert_eq!(lower_n_halfway(1u32), 0b1);
+        assert_eq!(lower_n_halfway(2u32), 0b10);
+        assert_eq!(lower_n_halfway(10u32), 0b1000000000);
+        assert_eq!(lower_n_halfway(32u32), 0b10000000000000000000000000000000);
+    }
+
+    #[test]
+    fn nth_bit_test() {
+        assert_eq!(nth_bit(0u32), 0b1);
+        assert_eq!(nth_bit(1u32), 0b10);
+        assert_eq!(nth_bit(2u32), 0b100);
+        assert_eq!(nth_bit(10u32), 0b10000000000);
+        assert_eq!(nth_bit(31u32), 0b10000000000000000000000000000000);
+    }
+
+    #[test]
+    fn internal_n_mask_test() {
+        assert_eq!(internal_n_mask(1u32, 0u32), 0b0);
+        assert_eq!(internal_n_mask(1u32, 1u32), 0b1);
+        assert_eq!(internal_n_mask(2u32, 1u32), 0b10);
+        assert_eq!(internal_n_mask(4u32, 2u32), 0b1100);
+        assert_eq!(internal_n_mask(10u32, 2u32), 0b1100000000);
+        assert_eq!(internal_n_mask(10u32, 4u32), 0b1111000000);
+        assert_eq!(internal_n_mask(32u32, 4u32), 0b11110000000000000000000000000000);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,83 @@
+//! Helper utilities for low-level features.
+// Fix a compiler bug that thinks `pow` isn't used.
+#![allow(unused_imports)]
+
+// Hide implementation details.
+#[macro_use]
+mod assert;
+
+#[macro_use]
+mod index;
+
+#[macro_use]
+mod perftools;
+
+#[macro_use]
+mod traits;
+
+#[cfg(test)]
+#[macro_use]
+pub(crate) mod test;
+
+// Hide implementation details.
+mod algorithm;
+mod cast;
+mod config;
+mod consume;
+mod div128;
+mod error;
+mod format;
+mod iterator;
+mod mask;
+mod num;
+mod primitive;
+mod pow;
+mod result;
+mod rounding;
+mod sign;
+mod table;
+
+#[cfg(feature = "format")]
+mod skip_value;
+
+cfg_if! {
+if #[cfg(feature = "correct")] {
+    #[macro_use]
+    mod sequence;
+} else {
+    mod wrapped;
+}}  // cfg_if
+
+// Publicly export everything with crate-visibility.
+pub(crate) use self::algorithm::*;
+pub(crate) use self::cast::*;
+pub(crate) use self::consume::*;
+pub(crate) use self::div128::*;
+pub(crate) use self::iterator::*;
+pub(crate) use self::mask::*;
+pub(crate) use self::primitive::*;
+pub(crate) use self::pow::*;
+pub(crate) use self::rounding::*;
+pub(crate) use self::sign::*;
+pub(crate) use self::table::*;
+
+#[cfg(feature = "format")]
+pub(crate) use self::skip_value::*;
+
+cfg_if! {
+if #[cfg(feature = "correct")] {
+    pub(crate) use self::sequence::*;
+} else {
+    pub(crate) use self::wrapped::*;
+}}  // cfg_if
+
+// Publicly export config globally.
+pub use self::config::*;
+pub use self::error::*;
+pub use self::format::*;
+pub use self::num::*;
+pub use self::result::*;
+pub use self::traits::*;
+
+#[cfg(feature = "rounding")]
+pub use self::rounding::RoundingKind;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/num.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/num.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/num.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/num.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1360 @@
+//! Utilities for Rust numbers.
+
+// We have a lot of high-level casts that make the type-system work.
+// Don't delete them, fake they're being used.
+#![allow(dead_code)]
+
+pub(crate) use crate::lib::{f32, f64, mem};
+use crate::lib::{fmt, iter, ops};
+use super::cast::{AsCast, TryCast};
+use super::config::*;
+use super::primitive::Primitive;
+
+// NUMBER
+
+/// Numerical type trait.
+#[doc(hidden)]
+pub trait Number:
+    Primitive +
+    // Iteration
+    iter::Product + iter::Sum +
+    // Operations
+    ops::Add<Output=Self> +
+    ops::AddAssign +
+    ops::Div<Output=Self> +
+    ops::DivAssign +
+    ops::Mul<Output=Self> +
+    ops::MulAssign +
+    ops::Rem<Output=Self> +
+    ops::RemAssign +
+    ops::Sub<Output=Self> +
+    ops::SubAssign
+{
+    /// Maximum number of bytes required to serialize a number to string.
+    const FORMATTED_SIZE: usize;
+    /// Maximum number of bytes required to serialize a number to a decimal string.
+    const FORMATTED_SIZE_DECIMAL: usize;
+    /// If the type can hold a signed (negative) value.
+    const IS_SIGNED: bool;
+}
+
+macro_rules! number_impl {
+    ($($t:tt $radix_size:ident $decimal_size:ident $is_signed:expr ; )*) => ($(
+        impl Number for $t {
+            const FORMATTED_SIZE: usize = $radix_size;
+            const FORMATTED_SIZE_DECIMAL: usize = $decimal_size;
+            const IS_SIGNED: bool = $is_signed;
+        }
+    )*)
+}
+
+number_impl! {
+    u8 U8_FORMATTED_SIZE U8_FORMATTED_SIZE_DECIMAL false ;
+    u16 U16_FORMATTED_SIZE U16_FORMATTED_SIZE_DECIMAL false ;
+    u32 U32_FORMATTED_SIZE U32_FORMATTED_SIZE_DECIMAL false ;
+    u64 U64_FORMATTED_SIZE U64_FORMATTED_SIZE_DECIMAL false ;
+    u128 U128_FORMATTED_SIZE U128_FORMATTED_SIZE_DECIMAL false ;
+    usize USIZE_FORMATTED_SIZE USIZE_FORMATTED_SIZE_DECIMAL false ;
+    i8 I8_FORMATTED_SIZE I8_FORMATTED_SIZE_DECIMAL true ;
+    i16 I16_FORMATTED_SIZE I16_FORMATTED_SIZE_DECIMAL true ;
+    i32 I32_FORMATTED_SIZE I32_FORMATTED_SIZE_DECIMAL true ;
+    i64 I64_FORMATTED_SIZE I64_FORMATTED_SIZE_DECIMAL true ;
+    i128 I128_FORMATTED_SIZE I128_FORMATTED_SIZE_DECIMAL true ;
+    isize ISIZE_FORMATTED_SIZE ISIZE_FORMATTED_SIZE_DECIMAL true ;
+    f32 F32_FORMATTED_SIZE F32_FORMATTED_SIZE_DECIMAL true ;
+    f64 F64_FORMATTED_SIZE F64_FORMATTED_SIZE_DECIMAL true ;
+}
+
+// INTEGER
+
+/// Defines a trait that supports integral operations.
+#[doc(hidden)]
+pub trait Integer:
+    // Basic
+    Number + Eq + Ord +
+    // Display
+    fmt::Octal + fmt::LowerHex + fmt::UpperHex +
+    //Operations
+    ops::BitAnd<Output=Self> +
+    ops::BitAndAssign +
+    ops::BitOr<Output=Self> +
+    ops::BitOrAssign +
+    ops::BitXor<Output=Self> +
+    ops::BitXorAssign +
+    ops::Not +
+    ops::Shl<Self, Output=Self> +
+    ops::Shl<u8, Output=Self> +
+    ops::Shl<u16, Output=Self> +
+    ops::Shl<u32, Output=Self> +
+    ops::Shl<u64, Output=Self> +
+    ops::Shl<usize, Output=Self> +
+    ops::Shl<i8, Output=Self> +
+    ops::Shl<i16, Output=Self> +
+    ops::Shl<i64, Output=Self> +
+    ops::Shl<isize, Output=Self> +
+    ops::Shl<i32, Output=Self> +
+    ops::ShlAssign<Self> +
+    ops::ShlAssign<u8> +
+    ops::ShlAssign<u16> +
+    ops::ShlAssign<u32> +
+    ops::ShlAssign<u64> +
+    ops::ShlAssign<usize> +
+    ops::ShlAssign<i8> +
+    ops::ShlAssign<i16> +
+    ops::ShlAssign<i32> +
+    ops::ShlAssign<i64> +
+    ops::ShlAssign<isize> +
+    ops::Shr<Self, Output=Self> +
+    ops::Shr<u8, Output=Self> +
+    ops::Shr<u16, Output=Self> +
+    ops::Shr<u32, Output=Self> +
+    ops::Shr<u64, Output=Self> +
+    ops::Shr<usize, Output=Self> +
+    ops::Shr<i8, Output=Self> +
+    ops::Shr<i16, Output=Self> +
+    ops::Shr<i64, Output=Self> +
+    ops::Shr<isize, Output=Self> +
+    ops::Shr<i32, Output=Self> +
+    ops::ShrAssign<Self> +
+    ops::ShrAssign<u8> +
+    ops::ShrAssign<u16> +
+    ops::ShrAssign<u32> +
+    ops::ShrAssign<u64> +
+    ops::ShrAssign<usize> +
+    ops::ShrAssign<i8> +
+    ops::ShrAssign<i16> +
+    ops::ShrAssign<i32> +
+    ops::ShrAssign<i64> +
+    ops::ShrAssign<isize>
+{
+    // CONSTANTS
+    const ZERO: Self;
+    const ONE: Self;
+    const TWO: Self;
+    const MAX: Self;
+    const MIN: Self;
+    const BITS: usize;
+
+    // FUNCTIONS (INHERITED)
+    fn max_value() -> Self;
+    fn min_value() -> Self;
+    fn count_ones(self) -> u32;
+    fn count_zeros(self) -> u32;
+    fn leading_zeros(self) -> u32;
+    fn trailing_zeros(self) -> u32;
+    fn pow(self, i: u32) -> Self;
+    fn checked_add(self, i: Self) -> Option<Self>;
+    fn checked_sub(self, i: Self) -> Option<Self>;
+    fn checked_mul(self, i: Self) -> Option<Self>;
+    fn checked_div(self, i: Self) -> Option<Self>;
+    fn checked_rem(self, i: Self) -> Option<Self>;
+    fn checked_neg(self) -> Option<Self>;
+    fn checked_shl(self, i: u32) -> Option<Self>;
+    fn checked_shr(self, i: u32) -> Option<Self>;
+    fn wrapping_add(self, i: Self) -> Self;
+    fn wrapping_sub(self, i: Self) -> Self;
+    fn wrapping_mul(self, i: Self) -> Self;
+    fn wrapping_div(self, i: Self) -> Self;
+    fn wrapping_rem(self, i: Self) -> Self;
+    fn wrapping_neg(self) -> Self;
+    fn wrapping_shl(self, i: u32) -> Self;
+    fn wrapping_shr(self, i: u32) -> Self;
+    fn overflowing_add(self, i: Self) -> (Self, bool);
+    fn overflowing_sub(self, i: Self) -> (Self, bool);
+    fn overflowing_mul(self, i: Self) -> (Self, bool);
+    fn overflowing_div(self, i: Self) -> (Self, bool);
+    fn overflowing_rem(self, i: Self) -> (Self, bool);
+    fn overflowing_neg(self) -> (Self, bool);
+    fn overflowing_shl(self, i: u32) -> (Self, bool);
+    fn overflowing_shr(self, i: u32) -> (Self, bool);
+    fn saturating_add(self, i: Self) -> Self;
+    fn saturating_sub(self, i: Self) -> Self;
+    fn saturating_mul(self, i: Self) -> Self;
+
+    /// Create literal zero.
+    #[inline]
+    fn zero() -> Self {
+        Self::ZERO
+    }
+
+    /// Create literal one.
+    #[inline]
+    fn one() -> Self {
+        Self::ONE
+    }
+
+    /// Create literal two.
+    #[inline]
+    fn two() -> Self {
+        Self::TWO
+    }
+
+    /// Check if value is equal to zero.
+    #[inline]
+    fn is_zero(self) -> bool {
+        self == Self::ZERO
+    }
+
+    /// Check if value is equal to one.
+    #[inline]
+    fn is_one(self) -> bool {
+        self == Self::ONE
+    }
+
+    // OPERATIONS
+
+    /// Get the fast ceiling of the quotient from integer division.
+    /// Not safe, since the remainder can easily overflow.
+    #[inline]
+    fn ceil_divmod(self, y: Self) -> (Self, i32) {
+        let q = self / y;
+        let r = self % y;
+        match r.is_zero() {
+            true  => (q, r.as_i32()),
+            false => (q + Self::ONE, r.as_i32() - y.as_i32())
+        }
+    }
+
+    /// Get the fast ceiling of the quotient from integer division.
+    /// Not safe, since the remainder can easily overflow.
+    #[inline]
+    fn ceil_div(self, y: Self) -> Self {
+        self.ceil_divmod(y).0
+    }
+
+    /// Get the fast ceiling modulus from integer division.
+    /// Not safe, since the remainder can easily overflow.
+    #[inline]
+    fn ceil_mod(self, y: Self) -> i32 {
+        self.ceil_divmod(y).1
+    }
+
+    // PROPERTIES
+
+    /// Get the number of bits in a value.
+    #[inline]
+    fn bit_length(self) -> u32 {
+        Self::BITS as u32 - self.leading_zeros()
+    }
+
+    // TRY CAST OR MAX
+
+    #[inline]
+    fn try_u8_or_max(self) -> u8 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_u16_or_max(self) -> u16 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_u32_or_max(self) -> u32 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_u64_or_max(self) -> u64 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_u128_or_max(self) -> u128 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_usize_or_max(self) -> usize {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_i8_or_max(self) -> i8 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_i16_or_max(self) -> i16 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_i32_or_max(self) -> i32 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_i64_or_max(self) -> i64 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_i128_or_max(self) -> i128 {
+        try_cast_or_max(self)
+    }
+
+    #[inline]
+    fn try_isize_or_max(self) -> isize {
+        try_cast_or_max(self)
+    }
+
+    // TRY CAST OR MIN
+
+    #[inline]
+    fn try_u8_or_min(self) -> u8 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_u16_or_min(self) -> u16 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_u32_or_min(self) -> u32 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_u64_or_min(self) -> u64 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_u128_or_min(self) -> u128 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_usize_or_min(self) -> usize {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_i8_or_min(self) -> i8 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_i16_or_min(self) -> i16 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_i32_or_min(self) -> i32 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_i64_or_min(self) -> i64 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_i128_or_min(self) -> i128 {
+        try_cast_or_min(self)
+    }
+
+    #[inline]
+    fn try_isize_or_min(self) -> isize {
+        try_cast_or_min(self)
+    }
+}
+
+macro_rules! integer_impl {
+    ($($t:tt)*) => ($(
+        impl Integer for $t {
+            const ZERO: $t = 0;
+            const ONE: $t = 1;
+            const TWO: $t = 2;
+            const MAX: $t = $t::max_value();
+            const MIN: $t = $t::min_value();
+            const BITS: usize = mem::size_of::<$t>() * 8;
+
+            #[inline]
+            fn max_value() -> Self {
+                Self::MAX
+            }
+
+            #[inline]
+            fn min_value() -> Self {
+                Self::MIN
+            }
+
+            #[inline]
+            fn count_ones(self) -> u32 {
+                $t::count_ones(self)
+            }
+
+            #[inline]
+            fn count_zeros(self) -> u32 {
+                $t::count_zeros(self)
+            }
+
+            #[inline]
+            fn leading_zeros(self) -> u32 {
+                $t::leading_zeros(self)
+            }
+
+            #[inline]
+            fn trailing_zeros(self) -> u32 {
+                $t::trailing_zeros(self)
+            }
+
+            #[inline]
+            fn pow(self, i: u32) -> Self {
+                $t::pow(self, i)
+            }
+
+            #[inline]
+            fn checked_add(self, i: Self) -> Option<Self> {
+                $t::checked_add(self, i)
+            }
+
+            #[inline]
+            fn checked_sub(self, i: Self) -> Option<Self> {
+                $t::checked_sub(self, i)
+            }
+
+            #[inline]
+            fn checked_mul(self, i: Self) -> Option<Self> {
+                $t::checked_mul(self, i)
+            }
+
+            #[inline]
+            fn checked_div(self, i: Self) -> Option<Self> {
+                $t::checked_div(self, i)
+            }
+
+            #[inline]
+            fn checked_rem(self, i: Self) -> Option<Self> {
+                $t::checked_rem(self, i)
+            }
+
+            #[inline]
+            fn checked_neg(self) -> Option<Self> {
+                $t::checked_neg(self)
+            }
+
+            #[inline]
+            fn checked_shl(self, i: u32) -> Option<Self> {
+                $t::checked_shl(self,i)
+            }
+
+            #[inline]
+            fn checked_shr(self, i: u32) -> Option<Self> {
+                $t::checked_shr(self,i)
+            }
+
+            #[inline]
+            fn wrapping_add(self, i: Self) -> Self {
+                $t::wrapping_add(self, i)
+            }
+
+            #[inline]
+            fn wrapping_sub(self, i: Self) -> Self {
+                $t::wrapping_sub(self, i)
+            }
+
+            #[inline]
+            fn wrapping_mul(self, i: Self) -> Self {
+                $t::wrapping_mul(self, i)
+            }
+
+            #[inline]
+            fn wrapping_div(self, i: Self) -> Self {
+                $t::wrapping_div(self, i)
+            }
+
+            #[inline]
+            fn wrapping_rem(self, i: Self) -> Self {
+                $t::wrapping_rem(self, i)
+            }
+
+            #[inline]
+            fn wrapping_neg(self) -> Self {
+                $t::wrapping_neg(self)
+            }
+
+            #[inline]
+            fn wrapping_shl(self, i: u32) -> Self {
+                $t::wrapping_shl(self,i)
+            }
+
+            #[inline]
+            fn wrapping_shr(self, i: u32) -> Self {
+                $t::wrapping_shr(self,i)
+            }
+
+            #[inline]
+            fn overflowing_add(self, i: Self) -> (Self, bool) {
+                $t::overflowing_add(self, i)
+            }
+
+            #[inline]
+            fn overflowing_sub(self, i: Self) -> (Self, bool) {
+                $t::overflowing_sub(self, i)
+            }
+
+            #[inline]
+            fn overflowing_mul(self, i: Self) -> (Self, bool) {
+                $t::overflowing_mul(self, i)
+            }
+
+            #[inline]
+            fn overflowing_div(self, i: Self) -> (Self, bool) {
+                $t::overflowing_div(self, i)
+            }
+
+            #[inline]
+            fn overflowing_rem(self, i: Self) -> (Self, bool) {
+                $t::overflowing_rem(self, i)
+            }
+
+            #[inline]
+            fn overflowing_neg(self) -> (Self, bool) {
+                $t::overflowing_neg(self)
+            }
+
+            #[inline]
+            fn overflowing_shl(self, i: u32) -> (Self, bool) {
+                $t::overflowing_shl(self,i)
+            }
+
+            #[inline]
+            fn overflowing_shr(self, i: u32) -> (Self, bool) {
+                $t::overflowing_shr(self,i)
+            }
+
+            #[inline]
+            fn saturating_add(self, i: Self) -> Self {
+                $t::saturating_add(self, i)
+            }
+
+            #[inline]
+            fn saturating_sub(self, i: Self) -> Self {
+                $t::saturating_sub(self, i)
+            }
+
+            #[inline]
+            fn saturating_mul(self, i: Self) -> Self {
+                $t::saturating_mul(self, i)
+            }
+        }
+    )*)
+}
+
+integer_impl! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize }
+
+/// Unwrap or get T::max_value().
+#[inline]
+pub(crate) fn unwrap_or_max<T: Integer>(t: Option<T>) -> T {
+    t.unwrap_or(T::max_value())
+}
+
+/// Unwrap or get T::min_value().
+#[inline]
+pub(crate) fn unwrap_or_min<T: Integer>(t: Option<T>) -> T {
+    t.unwrap_or(T::min_value())
+}
+
+/// Try to convert to U, if not, return U::max_value().
+#[inline]
+pub(crate) fn try_cast_or_max<U: Integer, T: TryCast<U>>(t: T) -> U {
+    unwrap_or_max(TryCast::try_cast(t))
+}
+
+/// Try to convert to U, if not, return U::min_value().
+#[inline]
+pub(crate) fn try_cast_or_min<U: Integer, T: TryCast<U>>(t: T) -> U {
+    unwrap_or_min(TryCast::try_cast(t))
+}
+
+// SIGNED INTEGER
+
+/// Defines a trait that supports signed integral operations.
+#[doc(hidden)]
+pub trait SignedInteger: Integer + ops::Neg<Output=Self>
+{
+    // FUNCTIONS (INHERITED)
+    fn checked_abs(self) -> Option<Self>;
+    fn wrapping_abs(self) -> Self;
+    fn overflowing_abs(self) -> (Self, bool);
+}
+
+macro_rules! signed_integer_impl {
+    ($($t:tt)*) => ($(
+        impl SignedInteger for $t {
+            fn checked_abs(self) -> Option<Self> {
+                $t::checked_abs(self)
+            }
+
+            fn wrapping_abs(self) -> Self {
+                $t::wrapping_abs(self)
+            }
+
+            fn overflowing_abs(self) -> (Self, bool) {
+                $t::overflowing_abs(self)
+            }
+        }
+    )*)
+}
+
+signed_integer_impl! { i8 i16 i32 i64 i128 isize }
+
+// UNSIGNED INTEGER
+
+/// Defines a trait that supports unsigned integral operations.
+#[doc(hidden)]
+pub trait UnsignedInteger: Integer
+{
+    /// Returns true if the least-significant bit is odd.
+    #[inline]
+    fn is_odd(self) -> bool {
+        self & Self::ONE == Self::ONE
+    }
+
+    /// Returns true if the least-significant bit is even.
+    #[inline]
+    fn is_even(self) -> bool {
+        !self.is_odd()
+    }
+}
+
+macro_rules! unsigned_integer_impl {
+    ($($t:ty)*) => ($(
+        impl UnsignedInteger for $t {}
+    )*)
+}
+
+unsigned_integer_impl! { u8 u16 u32 u64 u128 usize }
+
+// FLOAT
+
+/// Float information for native float types.
+#[doc(hidden)]
+pub trait Float: Number + ops::Neg<Output=Self>
+{
+    /// Unsigned type of the same size.
+    type Unsigned: UnsignedInteger;
+
+    // CONSTANTS
+    const ZERO: Self;
+    const ONE: Self;
+    const TWO: Self;
+    const MAX: Self;
+    const MIN: Self;
+    const INFINITY: Self;
+    const NEG_INFINITY: Self;
+    const NAN: Self;
+    const BITS: usize;
+
+    /// Bitmask for the sign bit.
+    const SIGN_MASK: Self::Unsigned;
+    /// Bitmask for the exponent, including the hidden bit.
+    const EXPONENT_MASK: Self::Unsigned;
+    /// Bitmask for the hidden bit in exponent, which is an implicit 1 in the fraction.
+    const HIDDEN_BIT_MASK: Self::Unsigned;
+    /// Bitmask for the mantissa (fraction), excluding the hidden bit.
+    const MANTISSA_MASK: Self::Unsigned;
+
+    // PROPERTIES
+
+    /// Positive infinity as bits.
+    const INFINITY_BITS: Self::Unsigned;
+    /// Positive infinity as bits.
+    const NEGATIVE_INFINITY_BITS: Self::Unsigned;
+    /// Size of the significand (mantissa) without hidden bit.
+    const MANTISSA_SIZE: i32;
+    /// Bias of the exponet
+    const EXPONENT_BIAS: i32;
+    /// Exponent portion of a denormal float.
+    const DENORMAL_EXPONENT: i32;
+    /// Maximum exponent value in float.
+    const MAX_EXPONENT: i32;
+
+    // FUNCTIONS (INHERITED)
+
+    // Re-export the to and from bits methods.
+    fn abs(self) -> Self;
+    fn ceil(self) -> Self;
+    fn exp(self) -> Self;
+    fn floor(self) -> Self;
+    fn ln(self) -> Self;
+    fn powi(self, n: i32) -> Self;
+    fn powf(self, f: Self) -> Self;
+    fn round(self) -> Self;
+    fn to_bits(self) -> Self::Unsigned;
+    fn from_bits(u: Self::Unsigned) -> Self;
+    fn is_sign_positive(self) -> bool;
+    fn is_sign_negative(self) -> bool;
+
+    // FUNCTIONS
+
+    /// Check if value is equal to zero.
+    #[inline]
+    fn is_zero(self) -> bool {
+        // IEEE754 guarantees `+0.0 == -0.0`, and Rust respects this,
+        // unlike some other languages.
+        self == Self::ZERO
+    }
+
+    /// Check if value is equal to one.
+    #[inline]
+    fn is_one(self) -> bool {
+        self == Self::ONE
+    }
+
+    /// Returns true if the float is a denormal.
+    #[inline]
+    fn is_denormal(self) -> bool {
+        self.to_bits() & Self::EXPONENT_MASK == Self::Unsigned::ZERO
+    }
+
+    /// Returns true if the float is a NaN or Infinite.
+    #[inline]
+    fn is_special(self) -> bool {
+        self.to_bits() & Self::EXPONENT_MASK == Self::EXPONENT_MASK
+    }
+
+    /// Returns true if the float is NaN.
+    #[inline]
+    fn is_nan(self) -> bool {
+        self.is_special() && !(self.to_bits() & Self::MANTISSA_MASK).is_zero()
+    }
+
+    /// Returns true if the float is infinite.
+    #[inline]
+    fn is_inf(self) -> bool {
+        self.is_special() && (self.to_bits() & Self::MANTISSA_MASK).is_zero()
+    }
+
+    /// Returns true if the float's least-significant mantissa bit is odd.
+    #[inline]
+    fn is_odd(self) -> bool {
+        self.to_bits().is_odd()
+    }
+
+    /// Returns true if the float's least-significant mantissa bit is even.
+    #[inline]
+    fn is_even(self) -> bool {
+        !self.is_odd()
+    }
+
+    /// Get exponent component from the float.
+    #[inline]
+    fn exponent(self) -> i32 {
+        if self.is_denormal() {
+            return Self::DENORMAL_EXPONENT;
+        }
+
+        let bits = self.to_bits();
+        let biased_e: i32 = AsCast::as_cast((bits & Self::EXPONENT_MASK) >> Self::MANTISSA_SIZE);
+        biased_e - Self::EXPONENT_BIAS
+    }
+
+    /// Get mantissa (significand) component from float.
+    #[inline]
+    fn mantissa(self) -> Self::Unsigned {
+        let bits = self.to_bits();
+        let s = bits & Self::MANTISSA_MASK;
+        if !self.is_denormal() {
+            s + Self::HIDDEN_BIT_MASK
+        } else {
+            s
+        }
+    }
+
+    /// Get next greater float.
+    #[inline]
+    fn next(self) -> Self {
+        let bits = self.to_bits();
+        if self.is_sign_negative() && self.is_zero() {
+            // -0.0
+            Self::ZERO
+        } else if bits == Self::INFINITY_BITS {
+            Self::from_bits(Self::INFINITY_BITS)
+        } else if self.is_sign_negative() {
+            Self::from_bits(bits.saturating_sub(Self::Unsigned::ONE))
+        } else {
+            Self::from_bits(bits.saturating_add(Self::Unsigned::ONE))
+        }
+    }
+
+    /// Get next greater float for a positive float.
+    /// Value must be >= 0.0 and < INFINITY.
+    #[inline]
+    fn next_positive(self) -> Self {
+        debug_assert!(self.is_sign_positive() && !self.is_inf());
+        Self::from_bits(self.to_bits() + Self::Unsigned::ONE)
+    }
+
+    /// Get previous greater float, such that `self.prev().next() == self`.
+    #[inline]
+    fn prev(self) -> Self {
+        let bits = self.to_bits();
+        if self.is_sign_positive() && self.is_zero() {
+            // +0.0
+            -Self::ZERO
+        } else if bits == Self::NEGATIVE_INFINITY_BITS {
+            Self::from_bits(Self::NEGATIVE_INFINITY_BITS)
+        } else if self.is_sign_negative() {
+            Self::from_bits(bits.saturating_add(Self::Unsigned::ONE))
+        } else {
+            Self::from_bits(bits.saturating_sub(Self::Unsigned::ONE))
+        }
+    }
+
+    /// Get previous greater float for a positive float.
+    /// Value must be > 0.0.
+    #[inline]
+    fn prev_positive(self) -> Self {
+        debug_assert!(self.is_sign_positive() && !self.is_zero());
+        return Self::from_bits(self.to_bits() - Self::Unsigned::ONE);
+    }
+
+    /// Round a positive number to even.
+    #[inline]
+    fn round_positive_even(self) -> Self {
+        if self.mantissa().is_odd() {
+            self.next_positive()
+        } else {
+            self
+        }
+    }
+
+    /// Get the max of two finite numbers.
+    #[inline]
+    fn max_finite(self, f: Self) -> Self {
+        debug_assert!(!self.is_special() && !f.is_special(), "max_finite self={} f={}",  self, f);
+        if self < f { f } else { self }
+    }
+
+    /// Get the min of two finite numbers.
+    #[inline]
+    fn min_finite(self, f: Self) -> Self {
+        debug_assert!(!self.is_special() && !f.is_special(), "min_finite self={} f={}",  self, f);
+        if self < f { self } else { f }
+    }
+}
+
+/// Wrap float method for `std` and `no_std` context.
+macro_rules! float_method {
+    ($f:ident, $t:tt, $meth:ident, $intr:ident, $libm:ident $(,$i:expr)*) => ({
+        #[cfg(feature = "std")]
+        return $t::$meth($f $(,$i)*);
+
+        #[cfg(all(not(feature = "std"), feature = "libm"))]
+        return libm::$libm($f $(,$i)*);
+
+        #[cfg(all(not(feature = "std"), not(feature = "libm")))]
+        return unsafe { core::intrinsics::$intr($f $(,$i)*) };
+    })
+}
+
+/// Wrap float method with special conditions for MSVC.
+///
+/// This is because MSVC wraps these as inline functions, with no actual
+/// ABI for the LLVM intrinsic.
+macro_rules! float_method_msvc {
+    ($f:ident, $ts:tt, $tl:tt, $meth:ident, $intr:ident, $libm:ident $(,$i:expr)*) => ({
+        #[cfg(feature = "std")]
+        return $ts::$meth($f $(,$i)*);
+
+        #[cfg(all(not(feature = "std"), feature = "libm"))]
+        return libm::$libm($f $(,$i)*);
+
+        #[cfg(all(not(feature = "std"), not(feature = "libm"), not(target_env = "msvc")))]
+        return unsafe { core::intrinsics::$intr($f $(,$i)*) };
+
+        #[cfg(all(not(feature = "std"), not(feature = "libm"), target_env = "msvc"))]
+        return $tl::$meth($f as $tl $(,$i as $tl)*) as $ts;
+    })
+}
+
+/// Wrap float log method for `no_std` context, with special conditions for Solaris.
+///
+/// Solaris has a standard non-conforming log implementation, we need
+/// to wrap this cheaply.
+macro_rules! float_method_log_solaris {
+    ($f:ident, $t:tt, $meth:ident, $intr:ident, $libm:ident $(,$i:expr)*) => ({
+        #[cfg(feature = "std")]
+        return $t::$meth($f $(,$i)*);
+
+        #[cfg(all(not(feature = "std"), feature = "libm"))]
+        return libm::$libm($f $(,$i)*);
+
+        #[cfg(all(not(feature = "std"), not(feature = "libm"), not(target_os = "solaris")))]
+        return unsafe { core::intrinsics::$intr($f $(,$i)*) };
+
+        // Workaround for Solaris/Illumos due to log(-value) == -Inf, not NaN.
+        #[cfg(all(not(feature = "std"), not(feature = "libm"), target_os = "solaris"))] {
+            if $f.is_nan() {
+                $f
+            } else if $f.is_special() {
+                if $f > $t::ZERO { $f } else { $t::NAN }
+            } else if $f > $t::ZERO {
+                unsafe { core::intrinsics::$intr($f $(,$i)*) }
+            } else if $f.is_zero() {
+                $t::NEG_INFINITY
+            } else {
+                $t::NAN
+            }
+        }
+    })
+}
+
+impl Float for f32 {
+    type Unsigned = u32;
+    const ZERO: f32 = 0.0;
+    const ONE: f32 = 1.0;
+    const TWO: f32 = 2.0;
+    const MAX: f32 = f32::MAX;
+    const MIN: f32 = f32::MIN;
+    const INFINITY: f32 = f32::INFINITY;
+    const NEG_INFINITY: f32 = f32::NEG_INFINITY;
+    const NAN: f32 = f32::NAN;
+    const BITS: usize = 32;
+    const SIGN_MASK: u32            = 0x80000000;
+    const EXPONENT_MASK: u32        = 0x7F800000;
+    const HIDDEN_BIT_MASK: u32      = 0x00800000;
+    const MANTISSA_MASK: u32        = 0x007FFFFF;
+    const INFINITY_BITS: u32        = 0x7F800000;
+    const NEGATIVE_INFINITY_BITS: u32 = Self::INFINITY_BITS | Self::SIGN_MASK;
+    const MANTISSA_SIZE: i32        = 23;
+    const EXPONENT_BIAS: i32        = 127 + Self::MANTISSA_SIZE;
+    const DENORMAL_EXPONENT: i32    = 1 - Self::EXPONENT_BIAS;
+    const MAX_EXPONENT: i32         = 0xFF - Self::EXPONENT_BIAS;
+
+    #[inline]
+    fn abs(self) -> f32 {
+        float_method!(self, f32, abs, fabsf32, fabsf)
+    }
+
+    #[inline]
+    fn ceil(self) -> f32 {
+        float_method_msvc!(self, f32, f64, ceil, ceilf32, ceilf)
+    }
+
+    #[inline]
+    fn exp(self) -> f32 {
+        float_method_msvc!(self, f32, f64, exp, expf32, expf)
+    }
+
+    #[inline]
+    fn floor(self) -> f32 {
+        float_method_msvc!(self, f32, f64, floor, floorf32, floorf)
+    }
+
+    #[inline]
+    fn ln(self) -> f32 {
+        float_method_msvc!(self, f32, f64, ln, logf32, logf)
+    }
+
+    #[inline]
+    fn powi(self, n: i32) -> f32 {
+        cfg_if! {
+            if #[cfg(all(not(feature = "std"), feature = "libm"))] {
+                self.powf(n as f32)
+            } else {
+                float_method!(self, f32, powi, powif32, powif, n)
+            }
+        }
+    }
+
+    #[inline]
+    fn powf(self, n: f32) -> f32 {
+        float_method_msvc!(self, f32, f64, powf, powf32, powf, n)
+    }
+
+    #[inline]
+    fn round(self) -> f32 {
+        float_method!(self, f32, round, roundf32, roundf)
+    }
+
+    #[inline]
+    fn to_bits(self) -> u32 {
+        f32::to_bits(self)
+    }
+
+    #[inline]
+    fn from_bits(u: u32) -> f32 {
+        f32::from_bits(u)
+    }
+
+    #[inline]
+    fn is_sign_positive(self) -> bool {
+        f32::is_sign_positive(self)
+    }
+
+    #[inline]
+    fn is_sign_negative(self) -> bool {
+        f32::is_sign_negative(self)
+    }
+}
+
+impl Float for f64 {
+    type Unsigned = u64;
+    const ZERO: f64 = 0.0;
+    const ONE: f64 = 1.0;
+    const TWO: f64 = 2.0;
+    const MAX: f64 = f64::MAX;
+    const MIN: f64 = f64::MIN;
+    const INFINITY: f64 = f64::INFINITY;
+    const NEG_INFINITY: f64 = f64::NEG_INFINITY;
+    const NAN: f64 = f64::NAN;
+    const BITS: usize = 64;
+    const SIGN_MASK: u64            = 0x8000000000000000;
+    const EXPONENT_MASK: u64        = 0x7FF0000000000000;
+    const HIDDEN_BIT_MASK: u64      = 0x0010000000000000;
+    const MANTISSA_MASK: u64        = 0x000FFFFFFFFFFFFF;
+    const INFINITY_BITS: u64        = 0x7FF0000000000000;
+    const NEGATIVE_INFINITY_BITS: u64 = Self::INFINITY_BITS | Self::SIGN_MASK;
+    const MANTISSA_SIZE: i32        = 52;
+    const EXPONENT_BIAS: i32        = 1023 + Self::MANTISSA_SIZE;
+    const DENORMAL_EXPONENT: i32    = 1 - Self::EXPONENT_BIAS;
+    const MAX_EXPONENT: i32         = 0x7FF - Self::EXPONENT_BIAS;
+
+    #[inline]
+    fn abs(self) -> f64 {
+        float_method!(self, f64, abs, fabsf64, fabs)
+    }
+
+    #[inline]
+    fn ceil(self) -> f64 {
+        float_method!(self, f64, ceil, ceilf64, ceil)
+    }
+
+    #[inline]
+    fn exp(self) -> f64 {
+        float_method!(self, f64, exp, expf64, exp)
+    }
+
+    #[inline]
+    fn floor(self) -> f64 {
+        float_method!(self, f64, floor, floorf64, floor)
+    }
+
+    #[inline]
+    fn ln(self) -> f64 {
+        float_method_log_solaris!(self, f64, ln, logf64, log)
+    }
+
+    #[inline]
+    fn powi(self, n: i32) -> f64 {
+        cfg_if! {
+            if #[cfg(all(not(feature = "std"), feature = "libm"))] {
+                self.powf(n as f64)
+            } else {
+                float_method!(self, f64, powi, powif64, powi, n)
+            }
+        }
+    }
+
+    #[inline]
+    fn powf(self, n: f64) -> f64 {
+        float_method!(self, f64, powf, powf64, pow, n)
+    }
+
+    #[inline]
+    fn round(self) -> f64 {
+        float_method!(self, f64, round, roundf64, round)
+    }
+
+    #[inline]
+    fn to_bits(self) -> u64 {
+        f64::to_bits(self)
+    }
+
+    #[inline]
+    fn from_bits(u: u64) -> f64 {
+        f64::from_bits(u)
+    }
+
+    #[inline]
+    fn is_sign_positive(self) -> bool {
+        f64::is_sign_positive(self)
+    }
+
+    #[inline]
+    fn is_sign_negative(self) -> bool {
+        f64::is_sign_negative(self)
+    }
+}
+
+// TEST
+// ----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn check_number<T: Number>(x: T, mut y: T) {
+        // Copy, partialeq, partialord
+        let _ = x;
+        assert!(x < y);
+        assert!(x != y);
+
+        // Operations
+        let _ = y + x;
+        let _ = y - x;
+        let _ = y * x;
+        let _ = y / x;
+        let _ = y % x;
+        y += x;
+        y -= x;
+        y *= x;
+        y /= x;
+        y %= x;
+
+        // Conversions already tested.
+    }
+
+    #[test]
+    fn number_test() {
+        check_number(1u8, 5);
+        check_number(1u16, 5);
+        check_number(1u32, 5);
+        check_number(1u64, 5);
+        check_number(1u128, 5);
+        check_number(1usize, 5);
+        check_number(1i8, 5);
+        check_number(1i16, 5);
+        check_number(1i32, 5);
+        check_number(1i64, 5);
+        check_number(1i128, 5);
+        check_number(1isize, 5);
+        check_number(1f32, 5.0);
+        check_number(1f64, 5.0);
+    }
+
+    fn check_integer<T: Integer>(mut x: T) {
+        // Copy, partialeq, partialord, ord, eq
+        let _ = x;
+        assert!(x > T::ONE);
+        assert!(x != T::ONE);
+        assert_eq!(x.min(T::ONE), T::ONE);
+        assert_eq!(x.max(T::ONE), x);
+
+        // Operations
+        let _ = x + T::ONE;
+        let _ = x - T::ONE;
+        let _ = x * T::ONE;
+        let _ = x / T::ONE;
+        let _ = x % T::ONE;
+        x += T::ONE;
+        x -= T::ONE;
+        x *= T::ONE;
+        x /= T::ONE;
+        x %= T::ONE;
+
+        // Bitwise operations
+        let _ = x & T::ONE;
+        let _ = x | T::ONE;
+        let _ = x ^ T::ONE;
+        let _ = !x;
+        x &= T::ONE;
+        x |= T::ONE;
+        x ^= T::ONE;
+
+        // Bitshifts
+        let _ = x << 1u8;
+        let _ = x << 1u16;
+        let _ = x << 1u32;
+        let _ = x << 1u64;
+        let _ = x << 1usize;
+        let _ = x << 1i8;
+        let _ = x << 1i16;
+        let _ = x << 1i32;
+        let _ = x << 1i64;
+        let _ = x << 1isize;
+        let _ = x >> 1u8;
+        let _ = x >> 1u16;
+        let _ = x >> 1u32;
+        let _ = x >> 1u64;
+        let _ = x >> 1usize;
+        let _ = x >> 1i8;
+        let _ = x >> 1i16;
+        let _ = x >> 1i32;
+        let _ = x >> 1i64;
+        let _ = x >> 1isize;
+        x <<= 1u8;
+        x <<= 1u16;
+        x <<= 1u32;
+        x <<= 1u64;
+        x <<= 1usize;
+        x <<= 1i8;
+        x <<= 1i16;
+        x <<= 1i32;
+        x <<= 1i64;
+        x <<= 1isize;
+        x >>= 1u8;
+        x >>= 1u16;
+        x >>= 1u32;
+        x >>= 1u64;
+        x >>= 1usize;
+        x >>= 1i8;
+        x >>= 1i16;
+        x >>= 1i32;
+        x >>= 1i64;
+        x >>= 1isize;
+
+        // Functions
+        assert!(T::ZERO.is_zero());
+        assert!(!T::ONE.is_zero());
+        assert!(T::ONE.is_one());
+        assert!(!T::ZERO.is_one());
+
+        // Conversions already tested.
+    }
+
+    #[test]
+    fn integer_test() {
+        check_integer(65u8);
+        check_integer(65u16);
+        check_integer(65u32);
+        check_integer(65u64);
+        check_integer(65u128);
+        check_integer(65usize);
+        check_integer(65i8);
+        check_integer(65i16);
+        check_integer(65i32);
+        check_integer(65i64);
+        check_integer(65i128);
+        check_integer(65isize);
+    }
+
+    #[test]
+    fn ceil_divmod_test() {
+        assert_eq!(5usize.ceil_divmod(7), (1, -2));
+        assert_eq!(0usize.ceil_divmod(7), (0, 0));
+        assert_eq!(35usize.ceil_divmod(7), (5, 0));
+        assert_eq!(36usize.ceil_divmod(7), (6, -6));
+    }
+
+    #[test]
+    fn unwrap_or_max_test() {
+        let x: Option<u8> = None;
+        assert_eq!(unwrap_or_max(x), u8::max_value());
+
+        let x: Option<u8> = Some(1);
+        assert_eq!(unwrap_or_max(x), 1);
+    }
+
+    #[test]
+    fn unwrap_or_min_test() {
+        let x: Option<u8> = None;
+        assert_eq!(unwrap_or_min(x), u8::min_value());
+
+        let x: Option<u8> = Some(1);
+        assert_eq!(unwrap_or_min(x), 1);
+    }
+
+    #[test]
+    fn try_cast_or_max_test() {
+        let x: u8 = try_cast_or_max(u16::min_value());
+        assert_eq!(x, u8::min_value());
+
+        let x: u8 = try_cast_or_max(u8::max_value() as u16);
+        assert_eq!(x, u8::max_value());
+
+        let x: u8 = try_cast_or_max(u16::max_value());
+        assert_eq!(x, u8::max_value());
+    }
+
+    #[test]
+    fn try_cast_or_min_test() {
+        let x: u8 = try_cast_or_min(u16::min_value());
+        assert_eq!(x, u8::min_value());
+
+        let x: u8 = try_cast_or_min(u8::max_value() as u16);
+        assert_eq!(x, u8::max_value());
+
+        let x: u8 = try_cast_or_min(u16::max_value());
+        assert_eq!(x, u8::min_value());
+    }
+
+    fn check_float<T: Float>(mut x: T) {
+        // Copy, partialeq, partialord
+        let _ = x;
+        assert!(x > T::ONE);
+        assert!(x != T::ONE);
+
+        // Operations
+        let _ = x + T::ONE;
+        let _ = x - T::ONE;
+        let _ = x * T::ONE;
+        let _ = x / T::ONE;
+        let _ = x % T::ONE;
+        let _ = -x;
+        x += T::ONE;
+        x -= T::ONE;
+        x *= T::ONE;
+        x /= T::ONE;
+        x %= T::ONE;
+
+        // Check functions
+        let _ = x.abs();
+        let _ = x.ceil();
+        let _ = x.exp();
+        let _ = x.floor();
+        let _ = x.ln();
+        let _ = x.powi(5);
+        let _ = x.powf(T::ONE);
+        let _ = x.round();
+        let _ = x.to_bits();
+        assert_eq!(T::from_bits(x.to_bits()), x);
+        let _ = x.is_sign_positive();
+        let _ = x.is_sign_negative();
+
+        // Check properties
+        let _ = x.to_bits() & T::SIGN_MASK;
+        let _ = x.to_bits() & T::EXPONENT_MASK;
+        let _ = x.to_bits() & T::HIDDEN_BIT_MASK;
+        let _ = x.to_bits() & T::MANTISSA_MASK;
+        assert!(T::from_bits(T::INFINITY_BITS).is_special());
+    }
+
+    #[test]
+    fn float_test() {
+        check_float(123f32);
+        check_float(123f64);
+
+        // b00000000000000000000000000000001
+        let f: f32 = 1e-45;
+        assert!(f.is_odd());
+        assert!(f.next().is_even());
+        assert!(f.next_positive().is_even());
+        assert!(f.prev().is_even());
+        assert!(f.prev_positive().is_even());
+        assert!(f.round_positive_even().is_even());
+        assert_eq!(f.prev().next(), f);
+        assert_eq!(f.prev_positive().next_positive(), f);
+        assert_eq!(f.round_positive_even(), f.next());
+
+        // b00111101110011001100110011001101
+        let f: f32 = 0.1;
+        assert!(f.is_odd());
+        assert!(f.next().is_even());
+        assert!(f.next_positive().is_even());
+        assert!(f.prev().is_even());
+        assert!(f.prev_positive().is_even());
+        assert!(f.round_positive_even().is_even());
+        assert_eq!(f.prev().next(), f);
+        assert_eq!(f.prev_positive().next_positive(), f);
+        assert_eq!(f.round_positive_even(), f.next());
+
+        // b01000000000000000000000000000000
+        let f: f32 = 1.0;
+        assert!(f.is_even());
+        assert!(f.next().is_odd());
+        assert!(f.next_positive().is_odd());
+        assert!(f.prev().is_odd());
+        assert!(f.prev_positive().is_odd());
+        assert!(f.round_positive_even().is_even());
+        assert_eq!(f.prev().next(), f);
+        assert_eq!(f.prev_positive().next_positive(), f);
+        assert_ne!(f.round_positive_even(), f.next());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/perftools.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/perftools.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/perftools.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/perftools.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+//! Macros to simple performance profiling using perftools.
+
+/// Only inline when not profiling.
+macro_rules! perftools_inline {
+    ($($item:tt)*) => (
+        #[cfg_attr(feature = "noinline", inline(never))]
+        #[cfg_attr(not(feature = "noinline"), inline)]
+        $($item)*
+    );
+}
+
+/// Only inline when not profiling.
+macro_rules! perftools_inline_always {
+    ($($item:tt)*) => (
+        #[cfg_attr(feature = "noinline", inline(never))]
+        #[cfg_attr(not(feature = "noinline"), inline(always))]
+        $($item)*
+    )
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/pow.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/pow.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/pow.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/pow.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,362 @@
+//! FLoating point power utilities.
+
+use super::cast::*;
+use super::num::*;
+use super::table::*;
+
+// STABLE POWER
+
+mod private {
+    use super::*;
+
+    #[cfg(not(feature = "correct"))]
+    pub(crate) trait StablePowerImpl: Float + ExactExponent {
+    }
+
+    #[cfg(feature = "correct")]
+    pub(crate) trait StablePowerImpl: Float + ExactExponent + TablePower {
+    }
+
+    impl StablePowerImpl for f32 {
+    }
+
+    impl StablePowerImpl for f64 {
+    }
+}
+
+/// Stable power implementations for increased numeric stability.
+pub(crate) trait StablePower: private::StablePowerImpl {
+//    /// Calculate pow2 with numeric exponent.
+//    #[cfg(any(test, not(feature = "imprecise")))]
+//    fn pow2(self, exponent: i32) -> Self;
+//
+//    /// Calculate base^n with numeric exponent and base.
+//    #[cfg(any(test, not(feature = "imprecise")))]
+//    fn pow<T: Integer>(self, base: T, exponent: i32) -> Self;
+
+    // ITERATIVE
+
+    /// Get max exponent for `iterative_pow`.
+    fn iterative_max<T: Integer>(base: T) -> i32;
+
+    /// Get exponent step for `iterative_pow`.
+    fn iterative_step<T: Integer>(base: T) -> i32;
+
+    /// Calculate base^n iteratively for better numeric stability.
+    #[inline]
+    fn iterative_pow<T: Integer>(self, base: T, exponent: i32) -> Self {
+        let max = Self::iterative_max(base);
+        if exponent > max {
+            // Value is impossibly large, must be infinity.
+            Self::INFINITY
+        } else if exponent < -max {
+            // Value is impossibly small, must be 0.
+            Self::ZERO
+        } else {
+            self.iterative_pow_finite(base, exponent)
+        }
+    }
+
+    /// Calculate base^n iteratively for a finite result.
+    #[inline]
+    fn iterative_pow_finite<T: Integer>(mut self, base: T, mut exponent: i32) -> Self {
+        let step = Self::iterative_step(base);
+        let base: Self = as_cast(base);
+        if exponent < 0 {
+            // negative exponent, use division for numeric stability
+            while exponent <= -step {
+                exponent += step;
+                self /= base.powi(step)
+            }
+            if exponent != 0 {
+                self /= base.powi(-exponent)
+            }
+            self
+        } else {
+            // positive exponent
+            while exponent >= step {
+                exponent -= step;
+                self *= base.powi(step)
+            }
+            if exponent != 0 {
+                self *= base.powi(exponent)
+            }
+            self
+        }
+    }
+
+    // POW2
+
+    /// Calculate a stable powi when the value is known to be >= -2*max && <= 2*max
+    ///
+    /// powi is not stable, even with exact values, at high or low exponents.
+    /// However, doing it in 2 shots for exact values is exact.
+    #[cfg(all(feature = "radix", not(feature = "correct")))]
+    #[inline]
+    fn pow2(self, exponent: i32) -> Self {
+        let step: i32 = 75;
+        if exponent > step {
+            self * Self::TWO.powi(step) * Self::TWO.powi(exponent - step)
+        } else if exponent < -step {
+            self * Self::TWO.powi(-step) * Self::TWO.powi(exponent + step)
+        } else {
+            self * Self::TWO.powi(exponent)
+        }
+    }
+
+    /// Calculate power of 2 using precalculated table.
+    #[cfg(all(feature = "radix", feature = "correct"))]
+    #[inline]
+    fn pow2(self, exponent: i32) -> Self {
+        self * Self::table_pow2(exponent)
+    }
+
+    // POW
+
+    /// Calculate power of n using powi.
+    #[cfg(not(feature = "correct"))]
+    #[inline]
+    fn pow<T: Integer>(self, base: T, exponent: i32) -> Self {
+        // Check the exponent is within bounds in debug builds.
+        debug_assert!({
+            let (min, max) = Self::exponent_limit(base);
+            exponent >= min && exponent <= max
+        });
+
+        let base: Self = as_cast(base);
+        self * base.powi(exponent)
+    }
+
+    /// Calculate power of n using precalculated table.
+    #[cfg(feature = "correct")]
+    #[inline]
+    fn pow<T: Integer>(self, base: T, exponent: i32) -> Self {
+        // Check the exponent is within bounds in debug builds.
+        debug_assert!({
+            let (min, max) = Self::exponent_limit(base);
+            exponent >= min && exponent <= max
+        });
+
+        if exponent > 0 {
+            self * Self::table_pow(base, exponent)
+        } else {
+            self / Self::table_pow(base, -exponent)
+        }
+    }
+}
+
+// F32
+
+impl StablePower for f32 {
+    fn iterative_max<T: Integer>(radix: T) -> i32 {
+        // Cached max exponents.
+        // Make sure the value is >= 2*log(1e45, radix), which guarantees the
+        // value overflows or underflows.
+        const MAX: [i32; 35] = [
+            150, 100, 80, 70, 60, 60, 50, 50, 50, 50, 50, 50,
+            40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+            40, 40, 40, 40, 40, 40, 30, 30, 30, 30, 30
+        ];
+
+        debug_assert_radix!(radix);
+        let idx: usize = as_cast(radix.as_i32() - 2);
+        MAX[idx]
+    }
+
+    fn iterative_step<T: Integer>(radix: T) -> i32 {
+        // Cached powers to get the desired exponent.
+        // Make sure all values are < 1e25.
+        const STEP: [i32; 35] = [
+            90, 60, 50, 40, 40, 30, 30, 30, 30, 30, 30, 30,
+            30, 30, 30, 30, 20, 20, 20, 20, 20, 20, 20, 20,
+            20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20
+        ];
+
+        debug_assert_radix!(radix);
+        let idx: usize = as_cast(radix.as_i32() - 2);
+        STEP[idx]
+    }
+}
+
+// F64
+
+impl StablePower for f64 {
+    fn iterative_max<T: Integer>(radix: T) -> i32 {
+        // Cached max exponents.
+        // Make sure the value is >= 2*log(5e324, radix), which guarantees the
+        // value overflows or underflows.
+        const MAX: [i32; 35] = [
+            2200, 1400, 1200, 1000, 900, 800, 750, 700, 650, 625, 625, 600,
+            575, 575, 550, 550, 525, 525, 500, 500, 500, 500, 475, 475,
+            475, 475, 450, 450, 450, 450, 450, 450, 425, 425, 425
+        ];
+
+        debug_assert_radix!(radix);
+        MAX[radix.as_usize() - 2]
+    }
+
+    fn iterative_step<T: Integer>(radix: T) -> i32 {
+        // Cached powers to get the desired exponent.
+        // Make sure all values are < 1e300.
+        const STEP: [i32; 35] = [
+            512, 512, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+            256, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+            128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128
+        ];
+
+        debug_assert_radix!(radix);
+        STEP[radix.as_usize() - 2]
+    }
+}
+
+// TEST
+// ----
+
+#[cfg(test)]
+mod tests {
+    use crate::util::test::*;
+    use super::*;
+
+    use approx::assert_relative_eq;
+
+    #[test]
+    fn f32_iterative_pow_finite_test() {
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, 38), 1e38, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, 30), 1e30, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, 25), 1e25, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, 20), 1e20, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, 15), 1e15, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, 10), 1e10, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, 5), 1e5, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, -5), 1e-5, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, -10), 1e-10, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, -15), 1e-15, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, -20), 1e-20, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, -25), 1e-25, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, -30), 1e-30, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, -38), 1e-38, max_relative=1e-6);
+        assert_relative_eq!(f32::iterative_pow_finite(1.0, 10, -45), 1e-45, max_relative=1e-6);
+
+        // overflow
+        assert!(f32::iterative_pow_finite(1.0, 10, 39).is_infinite());
+
+        // underflow
+        assert_eq!(f32::iterative_pow_finite(1.0, 10, -46), 0.0);
+    }
+
+    #[test]
+    fn f32_iterative_pow_test() {
+        assert_relative_eq!(f32::iterative_pow(1.0, 10, 10), 1e10, max_relative=1e-15);
+        assert!(f32::iterative_pow(1.0, 10, 1000).is_infinite());
+        assert_eq!(f32::iterative_pow(1.0, 10, -1000), 0.0);
+
+        // overflow
+        assert!(f32::iterative_pow(1.0, 10, 39).is_infinite());
+
+        // underflow
+        assert_eq!(f32::iterative_pow(1.0, 10, -46), 0.0);
+    }
+
+    #[test]
+    fn f64_iterative_pow_finite_test() {
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, 308), 1e308, max_relative=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, 300), 1e300, max_relative=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, 200), 1e200, max_relative=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, 100), 1e100, max_relative=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, 50), 1e50, max_relative=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, -50), 1e-50, epsilon=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, -100), 1e-100, epsilon=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, -200), 1e-200, epsilon=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, -300), 1e-300, epsilon=1e-15);
+        assert_relative_eq!(f64::iterative_pow_finite(1.0, 10, -308), 1e-308, epsilon=1e-15);
+
+        // This only affects armv6 and not armv7, but we'll skip this test
+        // both, since `target_arch` does not differentiate between
+        // the two.
+        #[cfg(not(all(target_arch = "arm", not(target_feature = "v7"))))]
+        assert_eq!(f64::iterative_pow_finite(5.0, 10, -324), 5e-324);
+
+        // overflow
+        assert!(f64::iterative_pow_finite(1.0, 10, 309).is_infinite());
+
+        // underflow
+        assert_eq!(f64::iterative_pow_finite(1.0, 10, -325), 0.0);
+    }
+
+    #[test]
+    fn f64_iterative_pow_test() {
+        assert_relative_eq!(f64::iterative_pow(1.0, 10, 50), 1e50, max_relative=1e-15);
+        assert!(f64::iterative_pow(1.0, 10, 1000).is_infinite());
+        assert_eq!(f64::iterative_pow(1.0, 10, -1000), 0.0);
+
+        // overflow
+        assert!(f64::iterative_pow(1.0, 10, 309).is_infinite());
+
+        // underflow
+        assert_eq!(f64::iterative_pow(1.0, 10, -325), 0.0);
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn f32_pow2_test() {
+        let (min, max) = f32::exponent_limit(2);
+        for i in min+1..max+1 {
+            assert_eq!(f32::pow2(1.0, i) / f32::pow2(1.0, i-1), 2.0);
+        }
+        for i in 1..max+1 {
+            let f = f32::pow2(1.0, i);
+            if f < u64::max_value() as f32 {
+                assert_eq!((f as u64) as f32, f);
+            }
+        }
+    }
+
+    #[test]
+    fn f32_pow_test() {
+        // Only check positive, since negative values round during division.
+        for b in BASE_POWN.iter().cloned() {
+            let (_, max) = f32::exponent_limit(b);
+            for i in 1..max+1 {
+                let f = f32::pow(1.0, b, i);
+                let p = f32::pow(1.0, b, i-1);
+                assert_eq!(f / p, b as f32);
+                if f < u64::max_value() as f32 {
+                    assert_eq!((f as u64) as f32, f);
+                }
+            }
+        }
+    }
+
+    #[cfg(feature = "radix")]
+    #[test]
+    fn f64_pow2_test() {
+        let (min, max) = f64::exponent_limit(2);
+        for i in min+1..max+1 {
+            let curr = f64::pow2(1.0, i);
+            let prev = f64::pow2(1.0, i-1);
+            assert_eq!(curr / prev, 2.0);
+        }
+        for i in 1..max+1 {
+            let f = f64::pow2(1.0, i);
+            if f < u64::max_value() as f64 {
+                assert_eq!((f as u64) as f64, f);
+            }
+        }
+    }
+
+    #[test]
+    fn f64_pow_test() {
+        // Only check positive, since negative values round during division.
+        for b in BASE_POWN.iter().cloned() {
+            let (_, max) = f64::exponent_limit(b);
+            for i in 1..max+1 {
+                let f = f64::pow(1.0, b, i);
+                let p = f64::pow(1.0, b, i-1);
+                assert_eq!(f / p, b as f64);
+                if f < u64::max_value() as f64 {
+                    assert_eq!((f as u64) as f64, f);
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/primitive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/primitive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/primitive.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/primitive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,247 @@
+//! Utilities for Rust primitives.
+
+use crate::lib::fmt;
+use super::cast::{AsCast, TryCast};
+
+/// Type that can be converted to primitive with `as`.
+pub trait AsPrimitive: Copy + PartialEq + PartialOrd + Send + Sync {
+    fn as_u8(self) -> u8;
+    fn as_u16(self) -> u16;
+    fn as_u32(self) -> u32;
+    fn as_u64(self) -> u64;
+    fn as_u128(self) -> u128;
+    fn as_usize(self) -> usize;
+    fn as_i8(self) -> i8;
+    fn as_i16(self) -> i16;
+    fn as_i32(self) -> i32;
+    fn as_i64(self) -> i64;
+    fn as_i128(self) -> i128;
+    fn as_isize(self) -> isize;
+    fn as_f32(self) -> f32;
+    fn as_f64(self) -> f64;
+}
+
+macro_rules! as_primitive {
+    ($($t:ty)*) => ($(
+        impl AsPrimitive for $t {
+            #[inline]
+            fn as_u8(self) -> u8 {
+                self as u8
+            }
+
+            #[inline]
+            fn as_u16(self) -> u16 {
+                self as u16
+            }
+
+            #[inline]
+            fn as_u32(self) -> u32 {
+                self as u32
+            }
+
+            #[inline]
+            fn as_u64(self) -> u64 {
+                self as u64
+            }
+
+            #[inline]
+            fn as_u128(self) -> u128 {
+                self as u128
+            }
+
+            #[inline]
+            fn as_usize(self) -> usize {
+                self as usize
+            }
+
+            #[inline]
+            fn as_i8(self) -> i8 {
+                self as i8
+            }
+
+            #[inline]
+            fn as_i16(self) -> i16 {
+                self as i16
+            }
+
+            #[inline]
+            fn as_i32(self) -> i32 {
+                self as i32
+            }
+
+            #[inline]
+            fn as_i64(self) -> i64 {
+                self as i64
+            }
+
+            #[inline]
+            fn as_i128(self) -> i128 {
+                self as i128
+            }
+
+            #[inline]
+            fn as_isize(self) -> isize {
+                self as isize
+            }
+
+            #[inline]
+            fn as_f32(self) -> f32 {
+                self as f32
+            }
+
+            #[inline]
+            fn as_f64(self) -> f64 {
+                self as f64
+            }
+        }
+    )*)
+}
+
+as_primitive! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize f32 f64 }
+
+macro_rules! def_try_primitive {
+    ($($t:ty)*) => (
+        /// Type that can be converted to primitive with `as`.
+        pub trait TryPrimitive:
+            AsCast +
+            $(TryCast<$t> +)*
+        {
+            #[inline]
+            fn try_u8(self) -> Option<u8> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_u16(self) -> Option<u16> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_u32(self) -> Option<u32> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_u64(self) -> Option<u64> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_u128(self) -> Option<u128> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_usize(self) -> Option<usize> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_i8(self) -> Option<i8> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_i16(self) -> Option<i16> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_i32(self) -> Option<i32> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_i64(self) -> Option<i64> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_i128(self) -> Option<i128> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_isize(self) -> Option<isize> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_f32(self) -> Option<f32> {
+                self.try_cast()
+            }
+
+            #[inline]
+            fn try_f64(self) -> Option<f64> {
+                self.try_cast()
+            }
+        }
+    );
+}
+
+def_try_primitive!(u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize f32 f64);
+
+macro_rules! try_primitive {
+    ($($t:ty)*) => ($(
+        impl TryPrimitive for $t {}
+    )*)
+}
+
+try_primitive! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize f32 f64 }
+
+// PRIMITIVE
+
+/// Primitive type trait (which all have static lifetimes).
+pub trait Primitive: 'static + fmt::Debug + fmt::Display + TryPrimitive
+{}
+
+macro_rules! primitive {
+    ($($t:ty)*) => ($(
+        impl Primitive for $t {}
+    )*)
+}
+
+primitive! { u8 u16 u32 u64 u128 usize i8 i16 i32 i64 i128 isize f32 f64 }
+
+// TEST
+// ----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn check_as_primitive<T: AsPrimitive>(t: T) {
+        let _: u8 = t.as_u8();
+        let _: u16 = t.as_u16();
+        let _: u32 = t.as_u32();
+        let _: u64 = t.as_u64();
+        let _: u128 = t.as_u128();
+        let _: usize = t.as_usize();
+        let _: i8 = t.as_i8();
+        let _: i16 = t.as_i16();
+        let _: i32 = t.as_i32();
+        let _: i64 = t.as_i64();
+        let _: i128 = t.as_i128();
+        let _: isize = t.as_isize();
+        let _: f32 = t.as_f32();
+        let _: f64 = t.as_f64();
+    }
+
+    #[test]
+    fn as_primitive_test() {
+        check_as_primitive(1u8);
+        check_as_primitive(1u16);
+        check_as_primitive(1u32);
+        check_as_primitive(1u64);
+        check_as_primitive(1u128);
+        check_as_primitive(1usize);
+        check_as_primitive(1i8);
+        check_as_primitive(1i16);
+        check_as_primitive(1i32);
+        check_as_primitive(1i64);
+        check_as_primitive(1i128);
+        check_as_primitive(1isize);
+        check_as_primitive(1f32);
+        check_as_primitive(1f64);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/result.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/result.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/result.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/result.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+//! Parser result type.
+
+use crate::lib::result::Result as StdResult;
+use super::error::{Error, ErrorCode};
+
+/// A specialized Result type for lexical operations.
+pub type Result<T> = StdResult<T, Error>;
+
+/// Specialized error type for format parsers.
+pub(crate) type ParseError = (ErrorCode, *const u8);
+
+/// Specialized result type for format parsers.
+pub(crate) type ParseResult<T> = StdResult<T, ParseError>;
+
+/// Type definition for result when testing parsing.
+#[cfg(test)]
+pub(crate) type ParseTestResult<T> = StdResult<T, ErrorCode>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/rounding.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/rounding.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/rounding.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/rounding.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,66 @@
+//! Rounding-scheme identifiers.
+
+#![allow(dead_code)]
+
+/// Rounding type for float-parsing.
+///
+/// Defines the IEEE754 rounding scheme to be used during float parsing.
+/// In general, this should be set to `NearestTieEven`, the default
+/// recommended rounding scheme by IEEE754 for binary and decimal
+/// operations.
+///
+/// # FFI
+///
+/// For interfacing with FFI-code, this may be approximated by:
+/// ```text
+/// const int32_t NEAREST_TIE_EVEN = 0;
+/// const int32_t NEAREST_TIE_AWAY_ZERO = 1;
+/// const int32_t TOWARD_POSITIVE_INFINITY = 2;
+/// const int32_t TOWARD_NEGATIVE_INFINITY = 3;
+/// const int32_t TOWARD_ZERO = 4;
+/// ```
+///
+/// # Safety
+///
+/// Assigning any value outside the range `[1-4]` to value of type
+/// RoundingKind may invoke undefined-behavior.
+#[repr(i32)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+pub enum RoundingKind {
+    /// Round to the nearest, tie to even.
+    NearestTieEven = 0,
+    /// Round to the nearest, tie away from zero.
+    NearestTieAwayZero = 1,
+    /// Round toward positive infinity.
+    TowardPositiveInfinity = 2,
+    /// Round toward negative infinity.
+    TowardNegativeInfinity = 3,
+    /// Round toward zero.
+    TowardZero = 4,
+
+    // Hide the internal implementation details, for how we implement
+    // TowardPositiveInfinity, TowardNegativeInfinity, and TowardZero.
+
+    /// Round to increase the magnitude of the float.
+    /// For example, for a negative number, this rounds to negative infinity,
+    /// for a positive number, to positive infinity.
+    #[doc(hidden)]
+    Upward = -1,
+
+    /// Round to decrease the magnitude of the float.
+    /// This always rounds toward zero.
+    #[doc(hidden)]
+    Downward = -2,
+}
+
+/// Determine if we are rounding to the nearest value, then tying away.
+#[inline]
+pub(crate) fn is_nearest(kind: RoundingKind) -> bool {
+    kind == RoundingKind::NearestTieEven || kind == RoundingKind::NearestTieAwayZero
+}
+
+/// Determine if we are rounding to the nearest value, then tying away.
+#[inline]
+pub(crate) fn is_toward(kind: RoundingKind) -> bool {
+    !is_nearest(kind)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/sequence.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/sequence.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/sequence.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/sequence.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1449 @@
+//! Helper traits for sequences.
+
+#![allow(dead_code)]
+
+use crate::lib::{cmp, iter, marker, mem, ops, ptr, slice};
+use arrayvec;
+
+#[cfg(all(feature = "correct", feature = "radix"))]
+use crate::lib::Vec;
+
+// ARRVEC
+
+/// Macro to automate simplify the creation of an ArrayVec.
+#[macro_export]
+macro_rules! arrvec {
+    // This only works if the ArrayVec is the same size as the input array.
+    ($elem:expr; $n:expr) => ({
+        $crate::arrayvec::ArrayVec::from([$elem; $n])
+    });
+    // This just repeatedly calls `push`. I don't believe there's a concise way to count the number of expressions.
+    ($($x:expr),*$(,)*) => ({
+        // Allow an unused mut variable, since if the sequence is empty,
+        // the vec will never be mutated.
+        #[allow(unused_mut)] {
+            let mut vec = $crate::arrayvec::ArrayVec::new();
+            $(vec.push($x);)*
+            vec
+        }
+    });
+}
+
+// INSERT MANY
+
+/// Insert multiple elements at position `index`.
+///
+/// Shifts all elements before index to the back of the iterator.
+/// It uses size hints to try to minimize the number of moves,
+/// however, it does not rely on them. We cannot internally allocate, so
+/// if we overstep the lower_size_bound, we have to do extensive
+/// moves to shift each item back incrementally.
+///
+/// This implementation is adapted from [`smallvec`], which has a battle-tested
+/// implementation that has been revised for at least a security advisory
+/// warning. Smallvec is similarly licensed under an MIT/Apache dual license.
+///
+/// [`smallvec`]: https://github.com/servo/rust-smallvec
+pub fn insert_many<V, T, I>(vec: &mut V, index: usize, iterable: I)
+    where V: VecLike<T>,
+          I: iter::IntoIterator<Item=T>
+{
+    let mut iter = iterable.into_iter();
+    if index == vec.len() {
+        return vec.extend(iter);
+    }
+
+    let (lower_size_bound, _) = iter.size_hint();
+    assert!(lower_size_bound <= core::isize::MAX as usize); // Ensure offset is indexable
+    assert!(index + lower_size_bound >= index); // Protect against overflow
+
+    let mut num_added = 0;
+    let old_len = vec.len();
+    assert!(index <= old_len);
+
+    unsafe {
+        // Reserve space for `lower_size_bound` elements.
+        vec.reserve(lower_size_bound);
+        let start = vec.as_mut_ptr();
+        let ptr = start.add(index);
+
+        // Move the trailing elements.
+        ptr::copy(ptr, ptr.add(lower_size_bound), old_len - index);
+
+        // In case the iterator panics, don't double-drop the items we just copied above.
+        vec.set_len(0);
+        let mut guard = DropOnPanic {
+            start,
+            skip: index..(index + lower_size_bound),
+            len: old_len + lower_size_bound,
+        };
+
+        while num_added < lower_size_bound {
+            let element = match iter.next() {
+                Some(x) => x,
+                None => break,
+            };
+            let cur = ptr.add(num_added);
+            ptr::write(cur, element);
+            guard.skip.start += 1;
+            num_added += 1;
+        }
+
+        if num_added < lower_size_bound {
+            // Iterator provided fewer elements than the hint. Move the tail backward.
+            ptr::copy(
+                ptr.add(lower_size_bound),
+                ptr.add(num_added),
+                old_len - index,
+            );
+        }
+        // There are no more duplicate or uninitialized slots, so the guard is not needed.
+        vec.set_len(old_len + num_added);
+        mem::forget(guard);
+    }
+
+    // Insert any remaining elements one-by-one.
+    for element in iter {
+        vec.insert(index + num_added, element);
+        num_added += 1;
+    }
+
+    struct DropOnPanic<T> {
+        start: *mut T,
+        skip: ops::Range<usize>, // Space we copied-out-of, but haven't written-to yet.
+        len: usize,
+    }
+
+    impl<T> Drop for DropOnPanic<T> {
+        fn drop(&mut self) {
+            for i in 0..self.len {
+                if !self.skip.contains(&i) {
+                    unsafe {
+                        ptr::drop_in_place(self.start.add(i));
+                    }
+                }
+            }
+        }
+    }
+}
+
+// REMOVE_MANY
+
+/// Remove many elements from a vec-like container.
+///
+/// Does not change the size of the vector, and may leak
+/// if the destructor panics. **Must** call `set_len` after,
+/// and ideally before (to 0).
+fn remove_many<V, T, R>(vec: &mut V, range: R)
+    where V: VecLike<T>,
+          R: ops::RangeBounds<usize>
+{
+    // Get the bounds on the items we're removing.
+    let len = vec.len();
+    let start = match range.start_bound() {
+        ops::Bound::Included(&n) => n,
+        ops::Bound::Excluded(&n) => n + 1,
+        ops::Bound::Unbounded    => 0,
+    };
+    let end = match range.end_bound() {
+        ops::Bound::Included(&n) => n + 1,
+        ops::Bound::Excluded(&n) => n,
+        ops::Bound::Unbounded    => len,
+    };
+    assert!(start <= end);
+    assert!(end <= len);
+
+    // Drop the existing items.
+    unsafe {
+        // Set len temporarily to the start, in case we panic on a drop.
+        // This means we leak memory, but we don't allow any double freeing,
+        // or use after-free.
+        vec.set_len(start);
+        // Iteratively drop the range.
+        let mut first = vec.as_mut_ptr().add(start);
+        let last = vec.as_mut_ptr().add(end);
+        while first < last {
+            ptr::drop_in_place(first);
+            first = first.add(1);
+        }
+
+        // Now we need to copy the end range into the buffer.
+        let count = len - end;
+        if count != 0 {
+            let src = vec.as_ptr().add(end);
+            let dst = vec.as_mut_ptr().add(start);
+            ptr::copy(src, dst, count);
+        }
+
+        // Set the proper length, now that we've moved items in.
+        vec.set_len(start + count);
+    }
+}
+
+// HELPERS
+// -------
+
+// RSLICE INDEX
+
+/// A trait for reversed-indexing operations.
+pub trait RSliceIndex<T: ?Sized> {
+    /// Output type for the index.
+    type Output: ?Sized;
+
+    /// Get reference to element or subslice.
+    fn rget(self, slc: &T) -> Option<&Self::Output>;
+
+    /// Get mutable reference to element or subslice.
+    fn rget_mut(self, slc: &mut T) -> Option<&mut Self::Output>;
+
+    /// Get reference to element or subslice without bounds checking.
+    unsafe fn rget_unchecked(self, slc: &T) -> &Self::Output;
+
+    /// Get mutable reference to element or subslice without bounds checking.
+    unsafe fn rget_unchecked_mut(self, slc: &mut T) -> &mut Self::Output;
+
+    /// Get reference to element or subslice, panic if out-of-bounds.
+    fn rindex(self, slc: &T) -> &Self::Output;
+
+    /// Get mutable reference to element or subslice, panic if out-of-bounds.
+    fn rindex_mut(self, slc: &mut T) -> &mut Self::Output;
+}
+
+impl<T> RSliceIndex<[T]> for usize {
+    type Output = T;
+
+    #[inline]
+    fn rget(self, slc: &[T]) -> Option<&T> {
+        let len = slc.len();
+        slc.get(len - self - 1)
+    }
+
+    #[inline]
+    fn rget_mut(self, slc: &mut [T]) -> Option<&mut T> {
+        let len = slc.len();
+        slc.get_mut(len - self - 1)
+    }
+
+    #[inline]
+    unsafe fn rget_unchecked(self, slc: &[T]) -> &T {
+        let len = slc.len();
+        slc.get_unchecked(len - self - 1)
+    }
+
+    #[inline]
+    unsafe fn rget_unchecked_mut(self, slc: &mut [T]) -> &mut T {
+        let len = slc.len();
+        slc.get_unchecked_mut(len - self - 1)
+    }
+
+    #[inline]
+    fn rindex(self, slc: &[T]) -> &T {
+        let len = slc.len();
+        &(*slc)[len - self - 1]
+    }
+
+    #[inline]
+    fn rindex_mut(self, slc: &mut [T]) -> &mut T {
+        let len = slc.len();
+        &mut (*slc)[len - self - 1]
+    }
+}
+
+/// REVERSE VIEW
+
+/// Reverse, immutable view of a sequence.
+pub struct ReverseView<'a, T: 'a> {
+    inner: &'a [T],
+}
+
+impl<'a, T> ops::Index<usize> for ReverseView<'a, T> {
+    type Output = T;
+
+    #[inline]
+    fn index(&self, index: usize) -> &T {
+        self.inner.rindex(index)
+    }
+}
+
+/// REVERSE VIEW MUT
+
+/// Reverse, mutable view of a sequence.
+pub struct ReverseViewMut<'a, T: 'a> {
+    inner: &'a mut [T],
+}
+
+impl<'a, T: 'a> ops::Index<usize> for ReverseViewMut<'a, T> {
+    type Output = T;
+
+    #[inline]
+    fn index(&self, index: usize) -> &T {
+        self.inner.rindex(index)
+    }
+}
+
+impl<'a, T: 'a> ops::IndexMut<usize> for ReverseViewMut<'a, T> {
+    #[inline]
+    fn index_mut(&mut self, index: usize) -> &mut T {
+        self.inner.rindex_mut(index)
+    }
+}
+
+// SLICELIKE
+
+/// Implied base trait for slice-like types.
+///
+/// Used to provide specializations since it requires no generic function parameters.
+pub trait SliceLikeImpl<T> {
+    // AS SLICE
+
+    /// Get slice of immutable elements.
+    fn as_slice(&self) -> &[T];
+
+    /// Get slice of mutable elements.
+    fn as_mut_slice(&mut self) -> &mut [T];
+}
+
+impl<T> SliceLikeImpl<T> for [T] {
+    // AS SLICE
+
+    #[inline]
+    fn as_slice(&self) -> &[T] {
+        self
+    }
+
+    #[inline]
+    fn as_mut_slice(&mut self) -> &mut [T] {
+        self
+    }
+}
+
+#[cfg(all(feature = "correct", feature = "radix"))]
+impl<T> SliceLikeImpl<T> for Vec<T> {
+    // AS SLICE
+
+    #[inline]
+    fn as_slice(&self) -> &[T] {
+        Vec::as_slice(self)
+    }
+
+    #[inline]
+    fn as_mut_slice(&mut self) -> &mut [T] {
+        Vec::as_mut_slice(self)
+    }
+}
+
+impl<A: arrayvec::Array> SliceLikeImpl<A::Item> for arrayvec::ArrayVec<A> {
+    // AS SLICE
+
+    #[inline]
+    fn as_slice(&self) -> &[A::Item] {
+        arrayvec::ArrayVec::as_slice(self)
+    }
+
+    #[inline]
+    fn as_mut_slice(&mut self) -> &mut [A::Item] {
+        arrayvec::ArrayVec::as_mut_slice(self)
+    }
+}
+
+/// Collection that has a `contains()` method.
+pub trait Contains<T: PartialEq> {
+    /// Check if slice contains element.
+    fn contains(&self, x: &T) -> bool;
+}
+
+impl<T: PartialEq> Contains<T> for dyn SliceLikeImpl<T> {
+    #[inline]
+    fn contains(&self, x: &T) -> bool {
+        <[T]>::contains(self.as_slice(), x)
+    }
+}
+
+/// Collection that has a `starts_with()` method.
+pub trait StartsWith<T: PartialEq> {
+    /// Check if slice starts_with subslice.
+    fn starts_with(&self, x: &[T]) -> bool;
+}
+
+impl<T: PartialEq> StartsWith<T> for dyn SliceLikeImpl<T> {
+    #[inline]
+    fn starts_with(&self, x: &[T]) -> bool {
+        <[T]>::starts_with(self.as_slice(), x)
+    }
+}
+
+/// Collection that has a `ends_with()` method.
+pub trait EndsWith<T: PartialEq> {
+    /// Check if slice ends_with subslice.
+    fn ends_with(&self, x: &[T]) -> bool;
+}
+
+impl<T: PartialEq> EndsWith<T> for dyn SliceLikeImpl<T> {
+    #[inline]
+    fn ends_with(&self, x: &[T]) -> bool {
+        <[T]>::ends_with(self.as_slice(), x)
+    }
+}
+
+/// Collection that has a `binary_search()` method.
+pub trait BinarySearch<T: Ord> {
+    /// Perform binary search for value.
+    fn binary_search(&self, x: &T) -> Result<usize, usize>;
+}
+
+impl<T: Ord> BinarySearch<T> for dyn SliceLikeImpl<T> {
+    #[inline]
+    fn binary_search(&self, x: &T) -> Result<usize, usize> {
+        <[T]>::binary_search(self.as_slice(), x)
+    }
+}
+
+/// Collection that has a `sort()` method.
+pub trait Sort<T: Ord> {
+    // TODO(ahuszagh) Currently bugged on no_std.
+    ///// Sort sequence.
+    //fn sort(&mut self);
+}
+
+impl<T: Ord> Sort<T> for dyn SliceLikeImpl<T> {
+    //
+    //#[inline]
+    //fn sort(&mut self) {
+    //    <[T]>::sort(self.as_mut_slice())
+    //}
+}
+
+/// Collection that has a `sort_unstable()` method.
+pub trait SortUnstable<T: Ord> {
+    /// Sort sequence without preserving order of equal elements.
+    fn sort_unstable(&mut self);
+}
+
+impl<T: Ord> SortUnstable<T> for dyn SliceLikeImpl<T> {
+    #[inline]
+    fn sort_unstable(&mut self) {
+        <[T]>::sort_unstable(self.as_mut_slice())
+    }
+}
+
+/// Collection that has a `clone_from_slice()` method.
+pub trait CloneFromSlice<T: Clone> {
+    /// Clone items from src into self.
+    fn clone_from_slice(&mut self, src: &[T]);
+}
+
+impl<T: Clone> CloneFromSlice<T> for dyn SliceLikeImpl<T> {
+    #[inline]
+    fn clone_from_slice(&mut self, src: &[T]) {
+        <[T]>::clone_from_slice(self.as_mut_slice(), src)
+    }
+}
+
+/// Collection that has a `copy_from_slice()` method.
+pub trait CopyFromSlice<T: Copy> {
+    /// Copy items from src into self.
+    fn copy_from_slice(&mut self, src: &[T]);
+}
+
+impl<T: Copy> CopyFromSlice<T> for dyn SliceLikeImpl<T> {
+    #[inline]
+    fn copy_from_slice(&mut self, src: &[T]) {
+        <[T]>::copy_from_slice(self.as_mut_slice(), src)
+    }
+}
+
+/// Slice-like container.
+pub trait SliceLike<T>: SliceLikeImpl<T> {
+    // CORE
+    // ----
+
+    // GET
+
+    /// Get an immutable reference to item at index.
+    fn get<I: slice::SliceIndex<[T]>>(&self, index: I) -> Option<&I::Output>;
+
+    /// Get a mutable reference to item at index.
+    fn get_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> Option<&mut I::Output>;
+
+    /// Get an immutable reference to item at index.
+    unsafe fn get_unchecked<I: slice::SliceIndex<[T]>>(&self, index: I) -> &I::Output;
+
+    /// Get a mutable reference to item at index.
+    unsafe fn get_unchecked_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output;
+
+    // INDEX
+
+    /// Get immutable element(s) via indexing.
+    fn index<I: slice::SliceIndex<[T]>>(&self, index: I) -> &I::Output;
+
+    /// Get mutable element(s) via indexing.
+    fn index_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output;
+
+    // RGET
+
+    /// Get reference to element or subslice.
+    fn rget<I: RSliceIndex<[T]>>(&self, index: I) -> Option<&I::Output>;
+
+    /// Get mutable reference to element or subslice.
+    fn rget_mut<I: RSliceIndex<[T]>>(&mut self, index: I) -> Option<&mut I::Output>;
+
+    /// Get reference to element or subslice without bounds checking.
+    unsafe fn rget_unchecked<I: RSliceIndex<[T]>>(&self, index: I) -> &I::Output;
+
+    /// Get mutable reference to element or subslice without bounds checking.
+    unsafe fn rget_unchecked_mut<I: RSliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output;
+
+    // RINDEX
+
+    /// Get reference to element or subslice.
+    fn rindex<I: RSliceIndex<[T]>>(&self, index: I) -> &I::Output;
+
+    /// Get mutable reference to element or subslice.
+    fn rindex_mut<I: RSliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output;
+
+    // DERIVATIVE
+    // ----------
+
+    // AS PTR
+
+    /// Get pointer to start of contiguous collection.
+    #[inline]
+    fn as_ptr(&self) -> *const T {
+        <[T]>::as_ptr(self.as_slice())
+    }
+
+    /// Get mutable pointer to start of contiguous collection.
+    #[inline]
+    fn as_mut_ptr(&mut self) -> *mut T {
+        <[T]>::as_mut_ptr(self.as_mut_slice())
+    }
+
+    // BINARY SEARCH BY
+
+    /// Perform binary search with a predicate.
+    #[inline]
+    fn binary_search_by<F>(&self, func: F)
+        -> Result<usize, usize>
+        where F: FnMut(&T) -> cmp::Ordering
+    {
+        <[T]>::binary_search_by(self.as_slice(), func)
+    }
+
+    /// Perform binary search by key with key extractor.
+    #[inline]
+    fn binary_search_by_key<K, F>(&self, key: &K, func: F)
+        -> Result<usize, usize>
+        where K: Ord,
+              F: FnMut(&T) -> K
+    {
+        <[T]>::binary_search_by_key(self.as_slice(), key, func)
+    }
+
+    // CHUNKS
+
+    /// Get iterator over `size`-length immutable elements in sequence.
+    #[inline]
+    fn chunks(&self, size: usize) -> slice::Chunks<T> {
+        <[T]>::chunks(self.as_slice(), size)
+    }
+
+    /// Get iterator over `size`-length mutable elements in sequence.
+    #[inline]
+    fn chunks_mut(&mut self, size: usize) -> slice::ChunksMut<T> {
+        <[T]>::chunks_mut(self.as_mut_slice(), size)
+    }
+
+    // CHUNKS EXACT
+    // Currently unused, restore and add default implementation if required
+    // later. Requires rustc >= 1.31.0.
+//
+//    /// Get iterator over exactly `size`-length immutable elements in sequence.
+//    #[inline]
+//    fn chunks_exact(&self, size: usize) -> slice::ChunksExact<T> {
+//        <[T]>::chunks_exact(self.as_slice(), size)
+//    }
+//
+//    /// Get iterator over exactly `size`-length mutable elements in sequence.
+//    #[inline]
+//    fn chunks_exact_mut(&mut self, size: usize) -> slice::ChunksExactMut<T> {
+//        <[T]>::chunks_exact_mut(self.as_mut_slice(), size)
+//    }
+
+    // FIRST
+
+    /// Get an immutable reference to the first item.
+    #[inline]
+    fn first(&self) -> Option<&T> {
+        self.as_slice().get(0)
+    }
+
+    /// Get a mutable reference to the first item.
+    #[inline]
+    fn first_mut(&mut self) -> Option<&mut T> {
+        self.as_mut_slice().get_mut(0)
+    }
+
+    /// Get an immutable reference to the first item without bounds checking.
+    #[inline]
+    unsafe fn first_unchecked(&self) -> &T {
+        self.as_slice().get_unchecked(0)
+    }
+
+    /// Get a mutable reference to the first item without bounds checking.
+    #[inline]
+    unsafe fn first_unchecked_mut(&mut self) -> &mut T  {
+        self.as_mut_slice().get_unchecked_mut(0)
+    }
+
+    // ITER
+
+    /// Iterate over immutable elements in the collection.
+    #[inline]
+    fn iter(&self) -> slice::Iter<T> {
+        <[T]>::iter(self.as_slice())
+    }
+
+    /// Iterate over mutable elements in the collection.
+    #[inline]
+    fn iter_mut(&mut self) -> slice::IterMut<T> {
+        <[T]>::iter_mut(self.as_mut_slice())
+    }
+
+    // LAST
+
+    /// Get an immutable reference to the last item.
+    #[inline]
+    fn last(&self) -> Option<&T> {
+        self.rget(0)
+    }
+
+    /// Get a mutable reference to the last item.
+    #[inline]
+    fn last_mut(&mut self) -> Option<&mut T> {
+        self.rget_mut(0)
+    }
+
+    /// Get an immutable reference to the last item without bounds checking.
+    #[inline]
+    unsafe fn last_unchecked(&self) -> &T {
+        debug_assert!(self.len() > 0);
+        self.rget_unchecked(0)
+    }
+
+    /// Get a mutable reference to the last item without bounds checking.
+    #[inline]
+    unsafe fn last_unchecked_mut(&mut self) -> &mut T  {
+        debug_assert!(self.len() > 0);
+        self.rget_unchecked_mut(0)
+    }
+
+    // LEN
+
+    /// Get if the collection is empty.
+    #[inline]
+    fn is_empty(&self) -> bool {
+        <[T]>::is_empty(self.as_slice())
+    }
+
+    /// Get the length of the collection.
+    #[inline]
+    fn len(&self) -> usize {
+        <[T]>::len(self.as_slice())
+    }
+
+    // Currently unused, restore and add default implementation if required
+    // later. Requires rustc >= 1.31.0.
+//    // RCHUNKS
+//
+//    /// Get iterator over `size`-length immutable elements in sequence.
+//    #[inline]
+//    fn rchunks(&self, size: usize) -> slice::RChunks<T> {
+//        <[T]>::rchunks(self.as_slice(), size)
+//    }
+//
+//    /// Get iterator over `size`-length mutable elements in sequence.
+//    #[inline]
+//    fn rchunks_mut(&mut self, size: usize) -> slice::RChunksMut<T> {
+//        <[T]>::rchunks_mut(self.as_mut_slice(), size)
+//    }
+//
+//    // RCHUNKS EXACT
+//
+//    /// Get iterator over exactly `size`-length immutable elements in sequence.
+//    #[inline]
+//    fn rchunks_exact(&self, size: usize) -> slice::RChunksExact<T> {
+//        <[T]>::rchunks_exact(self.as_slice(), size)
+//    }
+//
+//    /// Get iterator over exactly `size`-length mutable elements in sequence.
+//    #[inline]
+//    fn rchunks_exact_mut(&mut self, size: usize) -> slice::RChunksExactMut<T> {
+//        <[T]>::rchunks_exact_mut(self.as_mut_slice(), size)
+//    }
+
+    // REVERSE
+
+    /// Reverse elements in collection.
+    #[inline]
+    fn reverse(&mut self) {
+        <[T]>::reverse(self.as_mut_slice())
+    }
+
+    // ROTATE
+
+    // Currently unused, restore and add default implementation if required
+    // later. Requires rustc >= 1.26.0.
+//    /// Rotate elements of slice left.
+//    #[inline]
+//    fn rotate_left(&mut self, mid: usize) {
+//        <[T]>::rotate_left(self.as_mut_slice(), mid)
+//    }
+//
+//    /// Rotate elements of slice right.
+//    #[inline]
+//    fn rotate_right(&mut self, mid: usize) {
+//        <[T]>::rotate_right(self.as_mut_slice(), mid)
+//    }
+
+    // RSPLIT
+
+    // Currently unused, restore and add default implementation if required
+    // later. Requires rustc >= 1.27.0.
+//    /// Split on condition into immutable subslices, start from the back of the slice.
+//    #[inline]
+//    fn rsplit<F: FnMut(&T) -> bool>(&self, func: F) -> slice::RSplit<T, F> {
+//        <[T]>::rsplit(self.as_slice(), func)
+//    }
+//
+//    /// Split on condition into mutable subslices, start from the back of the slice.
+//    #[inline]
+//    fn rsplit_mut<F: FnMut(&T) -> bool>(&mut self, func: F) -> slice::RSplitMut<T, F> {
+//        <[T]>::rsplit_mut(self.as_mut_slice(), func)
+//    }
+
+    // RSPLITN
+
+    /// `rsplit()` with n subslices.
+    #[inline]
+    fn rsplitn<F: FnMut(&T) -> bool>(&self, n: usize, func: F) -> slice::RSplitN<T, F> {
+        <[T]>::rsplitn(self.as_slice(), n, func)
+    }
+
+    /// `rsplit_mut()` with n subslices.
+    #[inline]
+    fn rsplitn_mut<F: FnMut(&T) -> bool>(&mut self, n: usize, func: F) -> slice::RSplitNMut<T, F> {
+        <[T]>::rsplitn_mut(self.as_mut_slice(), n, func)
+    }
+
+    // SORT BY
+
+    /// Perform sort with a predicate.
+    #[inline]
+    fn sort_by<F>(&mut self, func: F)
+        where F: FnMut(&T, &T) -> cmp::Ordering
+    {
+        <[T]>::sort_by(self.as_mut_slice(), func)
+    }
+
+    /// Perform sort by key with key extractor.
+    #[inline]
+    fn sort_by_key<K, F>(&mut self, func: F)
+        where K: Ord,
+              F: FnMut(&T) -> K
+    {
+        <[T]>::sort_by_key(self.as_mut_slice(), func)
+    }
+
+    // SORT UNSTABLE BY
+
+    /// Perform untable sort with a predicate.
+    #[inline]
+    fn sort_unstable_by<F>(&mut self, func: F)
+        where F: FnMut(&T, &T) -> cmp::Ordering
+    {
+        <[T]>::sort_unstable_by(self.as_mut_slice(), func)
+    }
+
+    /// Perform untable sort by key with key extractor.
+    #[inline]
+    fn sort_unstable_by_key<K, F>(&mut self, func: F)
+        where K: Ord,
+              F: FnMut(&T) -> K
+    {
+        <[T]>::sort_unstable_by_key(self.as_mut_slice(), func)
+    }
+
+    // SPLIT
+
+    /// Split on condition into immutable subslices, start from the front of the slice.
+    #[inline]
+    fn split<F: FnMut(&T) -> bool>(&self, func: F) -> slice::Split<T, F> {
+        <[T]>::split(self.as_slice(), func)
+    }
+
+    /// Split on condition into mutable subslices, start from the front of the slice.
+    #[inline]
+    fn split_mut<F: FnMut(&T) -> bool>(&mut self, func: F) -> slice::SplitMut<T, F> {
+        <[T]>::split_mut(self.as_mut_slice(), func)
+    }
+
+    // SPLIT AT
+
+    /// Split at index, return immutable values for the values before and after.
+    #[inline]
+    fn split_at(&self, index: usize) -> (&[T], &[T]) {
+        <[T]>::split_at(self.as_slice(), index)
+    }
+
+    /// Split at index, return immutable values for the values before and after.
+    #[inline]
+    fn split_at_mut(&mut self, index: usize) -> (&mut [T], &mut [T]) {
+        <[T]>::split_at_mut(self.as_mut_slice(), index)
+    }
+
+    // SPLIT FIRST
+
+    /// Split at first item, returning values or None if empty.
+    #[inline]
+    fn split_first(&self) -> Option<(&T, &[T])> {
+        <[T]>::split_first(self.as_slice())
+    }
+
+    /// Split at first item, returning values or None if empty.
+    #[inline]
+    fn split_first_mut(&mut self) -> Option<(&mut T, &mut [T])> {
+        <[T]>::split_first_mut(self.as_mut_slice())
+    }
+
+    // SPLIT LAST
+
+    /// Split at last item, returning values or None if empty.
+    #[inline]
+    fn split_last(&self) -> Option<(&T, &[T])> {
+        <[T]>::split_last(self.as_slice())
+    }
+
+    /// Split at last item, returning values or None if empty.
+    #[inline]
+    fn split_last_mut(&mut self) -> Option<(&mut T, &mut [T])> {
+        <[T]>::split_last_mut(self.as_mut_slice())
+    }
+
+    // SPLIT N
+
+    /// `split()` with n subslices.
+    #[inline]
+    fn splitn<F: FnMut(&T) -> bool>(&self, n: usize, func: F) -> slice::SplitN<T, F> {
+        <[T]>::splitn(self.as_slice(), n, func)
+    }
+
+    /// `split_mut()` with n subslices.
+    #[inline]
+    fn splitn_mut<F: FnMut(&T) -> bool>(&mut self, n: usize, func: F) -> slice::SplitNMut<T, F> {
+        <[T]>::splitn_mut(self.as_mut_slice(), n, func)
+    }
+
+    // SWAP
+
+    /// Swap two elements in the container by index.
+    #[inline]
+    fn swap(&mut self, x: usize, y: usize) {
+        <[T]>::swap(self.as_mut_slice(), x, y)
+    }
+
+    /// Swap all elements in `self` with `other`.
+    #[inline]
+    fn swap_with_slice(&mut self, other: &mut [T]) {
+        <[T]>::swap_with_slice(self.as_mut_slice(), other)
+    }
+
+    // WINDOWS
+
+    /// View windows of `n`-length contiguous subslices.
+    #[inline]
+    fn windows(&self, size: usize) -> slice::Windows<T> {
+        <[T]>::windows(self.as_slice(), size)
+    }
+
+    // RVIEW
+
+    /// Create a reverse view of the vector for indexing.
+    #[inline]
+    fn rview<'a>(&'a self) -> ReverseView<'a, T> {
+        ReverseView { inner: self.as_slice() }
+    }
+
+    /// Create a reverse, mutable view of the vector for indexing.
+    #[inline]
+    fn rview_mut<'a>(&'a mut self) -> ReverseViewMut<'a, T> {
+        ReverseViewMut { inner: self.as_mut_slice() }
+    }
+}
+
+impl<T> SliceLike<T> for [T] {
+    // GET
+
+    /// Get an immutable reference to item at index.
+    #[inline]
+    fn get<I: slice::SliceIndex<[T]>>(&self, index: I) -> Option<&I::Output> {
+        return <[T]>::get(self, index);
+    }
+
+    /// Get an mutable reference to item at index.
+    #[inline]
+    fn get_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> Option<&mut I::Output> {
+        return <[T]>::get_mut(self, index);
+    }
+
+    /// Get an immutable reference to item at index.
+    #[inline]
+    unsafe fn get_unchecked<I: slice::SliceIndex<[T]>>(&self, index: I) -> &I::Output {
+        return <[T]>::get_unchecked(self, index);
+    }
+
+    /// Get an mutable reference to item at index.
+    #[inline]
+    unsafe fn get_unchecked_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output {
+        return <[T]>::get_unchecked_mut(self, index);
+    }
+
+    // INDEX
+
+    #[inline]
+    fn index<I: slice::SliceIndex<[T]>>(&self, index: I) -> &I::Output {
+        return <[T] as ops::Index<I>>::index(self, index);
+    }
+
+    #[inline]
+    fn index_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output {
+        return <[T] as ops::IndexMut<I>>::index_mut(self, index);
+    }
+
+    // RGET
+
+    #[inline]
+    fn rget<I: RSliceIndex<[T]>>(&self, index: I)
+        -> Option<&I::Output>
+    {
+        index.rget(self)
+    }
+
+    #[inline]
+    fn rget_mut<I: RSliceIndex<[T]>>(&mut self, index: I)
+        -> Option<&mut I::Output>
+    {
+        index.rget_mut(self)
+    }
+
+    #[inline]
+    unsafe fn rget_unchecked<I: RSliceIndex<[T]>>(&self, index: I)
+        -> &I::Output
+    {
+        index.rget_unchecked(self)
+    }
+
+    #[inline]
+    unsafe fn rget_unchecked_mut<I: RSliceIndex<[T]>>(&mut self, index: I)
+        -> &mut I::Output
+    {
+        index.rget_unchecked_mut(self)
+    }
+
+    // RINDEX
+
+    #[inline]
+    fn rindex<I: RSliceIndex<[T]>>(&self, index: I) -> &I::Output {
+        index.rindex(self)
+    }
+
+    #[inline]
+    fn rindex_mut<I: RSliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output {
+        index.rindex_mut(self)
+    }
+}
+
+#[cfg(all(feature = "correct", feature = "radix"))]
+impl<T> SliceLike<T> for Vec<T> {
+    // GET
+
+    /// Get an immutable reference to item at index.
+    #[inline]
+    fn get<I: slice::SliceIndex<[T]>>(&self, index: I) -> Option<&I::Output> {
+        return self.as_slice().get(index);
+    }
+
+    /// Get an mutable reference to item at index.
+    #[inline]
+    fn get_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> Option<&mut I::Output> {
+        return self.as_mut_slice().get_mut(index);
+    }
+
+    /// Get an immutable reference to item at index.
+    #[inline]
+    unsafe fn get_unchecked<I: slice::SliceIndex<[T]>>(&self, index: I) -> &I::Output {
+        return self.as_slice().get_unchecked(index);
+    }
+
+    /// Get an mutable reference to item at index.
+    #[inline]
+    unsafe fn get_unchecked_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output {
+        return self.as_mut_slice().get_unchecked_mut(index);
+    }
+
+    // INDEX
+
+    #[inline]
+    fn index<I: slice::SliceIndex<[T]>>(&self, index: I) -> &I::Output {
+        return self.as_slice().index(index);
+    }
+
+    #[inline]
+    fn index_mut<I: slice::SliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output {
+        return self.as_mut_slice().index_mut(index);
+    }
+
+    // RGET
+
+    #[inline]
+    fn rget<I: RSliceIndex<[T]>>(&self, index: I)
+        -> Option<&I::Output>
+    {
+        index.rget(self.as_slice())
+    }
+
+    #[inline]
+    fn rget_mut<I: RSliceIndex<[T]>>(&mut self, index: I)
+        -> Option<&mut I::Output>
+    {
+        index.rget_mut(self.as_mut_slice())
+    }
+
+    #[inline]
+    unsafe fn rget_unchecked<I: RSliceIndex<[T]>>(&self, index: I)
+        -> &I::Output
+    {
+        index.rget_unchecked(self.as_slice())
+    }
+
+    #[inline]
+    unsafe fn rget_unchecked_mut<I: RSliceIndex<[T]>>(&mut self, index: I)
+        -> &mut I::Output
+    {
+        index.rget_unchecked_mut(self.as_mut_slice())
+    }
+
+    // RINDEX
+
+    #[inline]
+    fn rindex<I: RSliceIndex<[T]>>(&self, index: I) -> &I::Output {
+        index.rindex(self.as_slice())
+    }
+
+    #[inline]
+    fn rindex_mut<I: RSliceIndex<[T]>>(&mut self, index: I) -> &mut I::Output {
+        index.rindex_mut(self.as_mut_slice())
+    }
+}
+
+impl<A: arrayvec::Array> SliceLike<A::Item> for arrayvec::ArrayVec<A> {
+    // GET
+
+    /// Get an immutable reference to item at index.
+    #[inline]
+    fn get<I: slice::SliceIndex<[A::Item]>>(&self, index: I) -> Option<&I::Output> {
+        return self.as_slice().get(index);
+    }
+
+    /// Get an mutable reference to item at index.
+    #[inline]
+    fn get_mut<I: slice::SliceIndex<[A::Item]>>(&mut self, index: I) -> Option<&mut I::Output> {
+        return self.as_mut_slice().get_mut(index);
+    }
+
+    /// Get an immutable reference to item at index.
+    #[inline]
+    unsafe fn get_unchecked<I: slice::SliceIndex<[A::Item]>>(&self, index: I) -> &I::Output {
+        return self.as_slice().get_unchecked(index);
+    }
+
+    /// Get an mutable reference to item at index.
+    #[inline]
+    unsafe fn get_unchecked_mut<I: slice::SliceIndex<[A::Item]>>(&mut self, index: I) -> &mut I::Output {
+        return self.as_mut_slice().get_unchecked_mut(index);
+    }
+
+    // INDEX
+
+    #[inline]
+    fn index<I: slice::SliceIndex<[A::Item]>>(&self, index: I) -> &I::Output {
+        return self.as_slice().index(index);
+    }
+
+    #[inline]
+    fn index_mut<I: slice::SliceIndex<[A::Item]>>(&mut self, index: I) -> &mut I::Output {
+        return self.as_mut_slice().index_mut(index);
+    }
+
+    // RGET
+
+    #[inline]
+    fn rget<I: RSliceIndex<[A::Item]>>(&self, index: I)
+        -> Option<&I::Output>
+    {
+        index.rget(self.as_slice())
+    }
+
+    #[inline]
+    fn rget_mut<I: RSliceIndex<[A::Item]>>(&mut self, index: I)
+        -> Option<&mut I::Output>
+    {
+        index.rget_mut(self.as_mut_slice())
+    }
+
+    #[inline]
+    unsafe fn rget_unchecked<I: RSliceIndex<[A::Item]>>(&self, index: I)
+        -> &I::Output
+    {
+        index.rget_unchecked(self.as_slice())
+    }
+
+    #[inline]
+    unsafe fn rget_unchecked_mut<I: RSliceIndex<[A::Item]>>(&mut self, index: I)
+        -> &mut I::Output
+    {
+        index.rget_unchecked_mut(self.as_mut_slice())
+    }
+
+    // RINDEX
+
+    #[inline]
+    fn rindex<I: RSliceIndex<[A::Item]>>(&self, index: I) -> &I::Output {
+        index.rindex(self.as_slice())
+    }
+
+    #[inline]
+    fn rindex_mut<I: RSliceIndex<[A::Item]>>(&mut self, index: I) -> &mut I::Output {
+        index.rindex_mut(self.as_mut_slice())
+    }
+}
+
+// VECTOR
+// ------
+
+// VECLIKE
+
+/// Vector-like container.
+pub trait VecLike<T>:
+    Default +
+    iter::FromIterator<T> +
+    iter::IntoIterator +
+    ops::DerefMut<Target = [T]> +
+    Extend<T> +
+    SliceLike<T>
+{
+    /// Create new, empty vector.
+    fn new() -> Self;
+
+    /// Create new, empty vector with preallocated, uninitialized storage.
+    fn with_capacity(capacity: usize) -> Self;
+
+    /// Get the capacity of the underlying storage.
+    fn capacity(&self) -> usize;
+
+    /// Reserve additional capacity for the collection.
+    fn reserve(&mut self, capacity: usize);
+
+    /// Reserve minimal additional capacity for the collection.
+    fn reserve_exact(&mut self, additional: usize);
+
+    /// Shrink capacity to fit data size.
+    fn shrink_to_fit(&mut self);
+
+    /// Truncate vector to new length, dropping any items after `len`.
+    fn truncate(&mut self, len: usize);
+
+    /// Set the buffer length (unsafe).
+    unsafe fn set_len(&mut self, new_len: usize);
+
+    /// Remove element from vector and return it, replacing it with the last item in the vector.
+    fn swap_remove(&mut self, index: usize) -> T;
+
+    /// Insert element at index, shifting all elements after.
+    fn insert(&mut self, index: usize, element: T);
+
+    /// Remove element from vector at index, shifting all elements after.
+    fn remove(&mut self, index: usize) -> T;
+
+    /// Append an element to the vector.
+    fn push(&mut self, value: T);
+
+    /// Pop an element from the end of the vector.
+    fn pop(&mut self) -> Option<T>;
+
+    /// Clear the buffer
+    fn clear(&mut self);
+
+    /// Insert many elements at index, pushing everything else to the back.
+    fn insert_many<I: iter::IntoIterator<Item=T>>(&mut self, index: usize, iterable: I);
+
+    /// Remove many elements from range.
+    fn remove_many<R: ops::RangeBounds<usize>>(&mut self, range: R);
+}
+
+#[cfg(all(feature = "correct", feature = "radix"))]
+impl<T> VecLike<T> for Vec<T> {
+    #[inline]
+    fn new() -> Vec<T> {
+        Vec::new()
+    }
+
+    #[inline]
+    fn with_capacity(capacity: usize) -> Vec<T> {
+        Vec::with_capacity(capacity)
+    }
+
+    #[inline]
+    fn capacity(&self) -> usize {
+        Vec::capacity(self)
+    }
+
+    #[inline]
+    fn reserve(&mut self, capacity: usize) {
+        Vec::reserve(self, capacity)
+    }
+
+    #[inline]
+    fn reserve_exact(&mut self, capacity: usize) {
+        Vec::reserve_exact(self, capacity)
+    }
+
+    #[inline]
+    fn shrink_to_fit(&mut self) {
+        Vec::shrink_to_fit(self)
+    }
+
+    #[inline]
+    fn truncate(&mut self, len: usize) {
+        Vec::truncate(self, len)
+    }
+
+    #[inline]
+    unsafe fn set_len(&mut self, new_len: usize) {
+        Vec::set_len(self, new_len);
+    }
+
+    #[inline]
+    fn swap_remove(&mut self, index: usize) -> T {
+        Vec::swap_remove(self, index)
+    }
+
+    #[inline]
+    fn insert(&mut self, index: usize, element: T) {
+        Vec::insert(self, index, element)
+    }
+
+    #[inline]
+    fn remove(&mut self, index: usize) -> T {
+        Vec::remove(self, index)
+    }
+
+    #[inline]
+    fn push(&mut self, value: T) {
+        Vec::push(self, value);
+    }
+
+    #[inline]
+    fn pop(&mut self) -> Option<T> {
+        Vec::pop(self)
+    }
+
+    #[inline]
+    fn clear(&mut self) {
+        Vec::clear(self);
+    }
+
+    #[inline]
+    fn insert_many<I: iter::IntoIterator<Item=T>>(&mut self, index: usize, iterable: I) {
+        self.splice(index..index, iterable);
+    }
+
+    #[inline]
+    fn remove_many<R: ops::RangeBounds<usize>>(&mut self, range: R) {
+        remove_many(self, range)
+    }
+}
+
+impl<A: arrayvec::Array> VecLike<A::Item> for arrayvec::ArrayVec<A> {
+    #[inline]
+    fn new() -> arrayvec::ArrayVec<A> {
+        arrayvec::ArrayVec::new()
+    }
+
+    #[inline]
+    fn with_capacity(capacity: usize) -> arrayvec::ArrayVec<A> {
+        let mut v = arrayvec::ArrayVec::new();
+        v.reserve(capacity);
+        v
+    }
+
+    #[inline]
+    fn capacity(&self) -> usize {
+        arrayvec::ArrayVec::capacity(self)
+    }
+
+    #[inline]
+    fn reserve(&mut self, capacity: usize) {
+        assert!(self.len() + capacity <= self.capacity());
+    }
+
+    #[inline]
+    fn reserve_exact(&mut self, capacity: usize) {
+        assert!(self.len() + capacity <= self.capacity());
+    }
+
+    #[inline]
+    fn shrink_to_fit(&mut self) {
+    }
+
+    #[inline]
+    fn truncate(&mut self, len: usize) {
+        arrayvec::ArrayVec::truncate(self, len)
+    }
+
+    #[inline]
+    unsafe fn set_len(&mut self, new_len: usize) {
+        arrayvec::ArrayVec::set_len(self, new_len);
+    }
+
+    #[inline]
+    fn swap_remove(&mut self, index: usize) -> A::Item {
+        arrayvec::ArrayVec::swap_remove(self, index)
+    }
+
+    #[inline]
+    fn insert(&mut self, index: usize, element: A::Item) {
+        arrayvec::ArrayVec::insert(self, index, element)
+    }
+
+    #[inline]
+    fn remove(&mut self, index: usize) -> A::Item {
+        arrayvec::ArrayVec::remove(self, index)
+    }
+
+    #[inline]
+    fn push(&mut self, value: A::Item) {
+        arrayvec::ArrayVec::push(self, value);
+    }
+
+    #[inline]
+    fn pop(&mut self) -> Option<A::Item> {
+        arrayvec::ArrayVec::pop(self)
+    }
+
+    #[inline]
+    fn clear(&mut self) {
+        arrayvec::ArrayVec::clear(self);
+    }
+
+    #[inline]
+    fn insert_many<I: iter::IntoIterator<Item=A::Item>>(&mut self, index: usize, iterable: I) {
+        insert_many(self, index, iterable)
+    }
+
+    #[inline]
+    fn remove_many<R: ops::RangeBounds<usize>>(&mut self, range: R) {
+        remove_many(self, range)
+    }
+}
+
+// CLONEABLE VECLIKE
+
+/// Vector-like container with cloneable values.
+///
+/// Implemented for Vec, SmallVec, and StackVec.
+pub trait CloneableVecLike<T: Clone + Copy + Send>: Send + VecLike<T>
+{
+    /// Extend collection from slice.
+    fn extend_from_slice(&mut self, other: &[T]);
+
+    /// Resize container to new length, with a default value if adding elements.
+    fn resize(&mut self, len: usize, value: T);
+}
+
+#[cfg(all(feature = "correct", feature = "radix"))]
+impl<T> CloneableVecLike<T> for Vec<T>
+    where T: Clone + Copy + Send
+{
+    #[inline]
+    fn extend_from_slice(&mut self, other: &[T]) {
+        Vec::extend_from_slice(self, other)
+    }
+
+    #[inline]
+    fn resize(&mut self, len: usize, value: T) {
+        Vec::resize(self, len, value)
+    }
+}
+
+impl<A: arrayvec::Array> CloneableVecLike<A::Item> for arrayvec::ArrayVec<A>
+    where A: Send,
+          A::Index: Send,
+          A::Item: Clone + Copy + Send
+{
+    #[inline]
+    fn extend_from_slice(&mut self, other: &[A::Item]) {
+        self.extend(other.iter().cloned())
+    }
+
+    #[inline]
+    fn resize(&mut self, len: usize, value: A::Item) {
+        assert!(len <= self.capacity());
+        let old_len = self.len();
+        if len > old_len {
+            self.extend(iter::repeat(value).take(len - old_len));
+        } else {
+            self.truncate(len);
+        }
+    }
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_insert_many() {
+        type V = arrayvec::ArrayVec<[u8; 8]>;
+        let mut v: V = V::new();
+        for x in 0..4 {
+            v.push(x);
+        }
+        assert_eq!(v.len(), 4);
+        v.insert_many(1, [5, 6].iter().cloned());
+        assert_eq!(&v[..], &[0, 5, 6, 1, 2, 3]);
+    }
+
+    #[cfg(all(feature = "correct", feature = "radix"))]
+    #[test]
+    fn remove_many_test() {
+        let mut x = vec![0, 1, 2, 3, 4, 5];
+        x.remove_many(0..3);
+        assert_eq!(x, vec![3, 4, 5]);
+        assert_eq!(x.len(), 3);
+
+        let mut x = vec![0, 1, 2, 3, 4, 5];
+        x.remove_many(..);
+        assert_eq!(x, vec![]);
+
+        let mut x = vec![0, 1, 2, 3, 4, 5];
+        x.remove_many(3..);
+        assert_eq!(x, vec![0, 1, 2]);
+
+        let mut x = vec![0, 1, 2, 3, 4, 5];
+        x.remove_many(..3);
+        assert_eq!(x, vec![3, 4, 5]);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/sign.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/sign.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/sign.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/sign.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,221 @@
+//! Enumerations for the sign-bit of a number.
+
+use super::format::NumberFormat;
+use super::num::Number;
+
+// ENUMERATION
+
+/// Enumeration for the sign of a a number.
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub enum Sign {
+    /// Negative value.
+    Negative,
+    /// Positive value.
+    Positive,
+}
+
+// HELPERS
+
+// Get if an option contains a digit separator.
+#[inline(always)]
+#[cfg(feature = "format")]
+fn is_digit_separator(option: Option<&u8>, digit_separator: u8) -> bool {
+    option == Some(&digit_separator)
+}
+
+// Convert option of byte to option of sign.
+#[inline(always)]
+#[cfg(feature = "format")]
+fn to_sign<T>(option: Option<&u8>)
+    -> Option<Sign>
+    where T: Number
+{
+    match option {
+        Some(&b'+')                 => Some(Sign::Positive),
+        Some(&b'-') if T::IS_SIGNED => Some(Sign::Negative),
+        _                           => None
+    }
+}
+
+// PARSE
+
+/// Find and parse sign without any possible digit separators.
+#[inline(always)]
+pub(crate) fn parse_sign_no_separator<'a, T>(bytes: &'a [u8], _: u8)
+    -> (Sign, &'a [u8])
+    where T: Number
+{
+    match bytes.get(0) {
+        Some(&b'+')                 => (Sign::Positive, &index!(bytes[1..])),
+        Some(&b'-') if T::IS_SIGNED => (Sign::Negative, &index!(bytes[1..])),
+        _                           => (Sign::Positive, bytes)
+    }
+}
+
+/// Find and parse sign with leading and consecutive digit separators.
+///
+/// We need to consider the following possibilities:
+///     1). _*[+-]\d+
+#[inline(always)]
+#[cfg(feature = "format")]
+pub(crate) fn parse_sign_lc_separator<'a, T>(bytes: &'a [u8], digit_separator: u8)
+    -> (Sign, &'a [u8])
+    where T: Number
+{
+    let mut index = 0;
+    while is_digit_separator(bytes.get(index), digit_separator) {
+        index += 1;
+    }
+    if let Some(sign) = to_sign::<T>(bytes.get(index)) {
+        (sign, &index!(bytes[index+1..]))
+    } else {
+        (Sign::Positive, bytes)
+    }
+}
+
+/// Find and parse sign with leading digit separators.
+///
+/// We need to consider the following possibilities:
+///     1). [+-]\d+
+///     2). _[+-]\d+
+#[inline(always)]
+#[cfg(feature = "format")]
+pub(crate) fn parse_sign_l_separator<'a, T>(bytes: &'a [u8], digit_separator: u8)
+    -> (Sign, &'a [u8])
+    where T: Number
+{
+    let b0 = bytes.get(0);
+    if let Some(sign) = to_sign::<T>(b0) {
+        (sign, &index!(bytes[1..]))
+    } else if is_digit_separator(b0, digit_separator) {
+        if let Some(sign) = to_sign::<T>(bytes.get(1)) {
+            (sign, &index!(bytes[2..]))
+        } else {
+            (Sign::Positive, bytes)
+        }
+    } else {
+        (Sign::Positive, bytes)
+    }
+}
+
+/// Find and parse sign with digit separators.
+#[inline(always)]
+#[cfg(feature = "format")]
+pub(crate) fn parse_sign_separator<'a, T>(bytes: &'a [u8], format: NumberFormat)
+    -> (Sign, &'a [u8])
+    where T: Number
+{
+    // If the integer cannot have leading digit separators, we know the sign
+    // byte must by the first byte. Otherwise, we must consider digit separators
+    // before the sign byte.
+    let leading = format.integer_leading_digit_separator();
+    let consecutive = format.integer_consecutive_digit_separator();
+    match (leading, consecutive) {
+        (true, true)    => parse_sign_lc_separator::<T>(bytes, format.digit_separator()),
+        (true, false)   => parse_sign_l_separator::<T>(bytes, format.digit_separator()),
+        (false, _)      => parse_sign_no_separator::<T>(bytes, format.digit_separator())
+    }
+}
+
+/// Find and parse sign.
+#[inline]
+pub(crate) fn parse_sign<'a, T>(bytes: &'a [u8], format: NumberFormat)
+    -> (Sign, &'a [u8])
+    where T: Number
+{
+    #[cfg(not(feature = "format"))]
+    return parse_sign_no_separator::<T>(bytes, format.digit_separator());
+
+    #[cfg(feature = "format")]
+    return parse_sign_separator::<T>(bytes, format);
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::util::test::*;
+
+    #[test]
+    fn parse_sign_no_separator_test() {
+        // Signed
+        assert_eq!(parse_sign_no_separator::<i32>(b"", b'_'), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign_no_separator::<i32>(b"+", b'_'), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign_no_separator::<i32>(b"-", b'_'), (Sign::Negative, b!("")));
+        assert_eq!(parse_sign_no_separator::<i32>(b"+5", b'_'), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign_no_separator::<i32>(b"-5", b'_'), (Sign::Negative, b!("5")));
+        assert_eq!(parse_sign_no_separator::<i32>(b"_-5", b'_'), (Sign::Positive, b!("_-5")));
+        assert_eq!(parse_sign_no_separator::<i32>(b"___-5", b'_'), (Sign::Positive, b!("___-5")));
+
+        // Unsigned
+        assert_eq!(parse_sign_no_separator::<u32>(b"+5", b'_'), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign_no_separator::<u32>(b"-5", b'_'), (Sign::Positive, b!("-5")));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn parse_sign_lc_separator_test() {
+        assert_eq!(parse_sign_lc_separator::<i32>(b"", b'_'), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign_lc_separator::<i32>(b"+", b'_'), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign_lc_separator::<i32>(b"-", b'_'), (Sign::Negative, b!("")));
+        assert_eq!(parse_sign_lc_separator::<i32>(b"+5", b'_'), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign_lc_separator::<i32>(b"-5", b'_'), (Sign::Negative, b!("5")));
+        assert_eq!(parse_sign_lc_separator::<i32>(b"_-5", b'_'), (Sign::Negative, b!("5")));
+        assert_eq!(parse_sign_lc_separator::<i32>(b"___-5", b'_'), (Sign::Negative, b!("5")));
+
+        // Unsigned
+        assert_eq!(parse_sign_lc_separator::<u32>(b"___+5", b'_'), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign_lc_separator::<u32>(b"___-5", b'_'), (Sign::Positive, b!("___-5")));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn parse_sign_l_separator_test() {
+        assert_eq!(parse_sign_l_separator::<i32>(b"", b'_'), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign_l_separator::<i32>(b"+", b'_'), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign_l_separator::<i32>(b"-", b'_'), (Sign::Negative, b!("")));
+        assert_eq!(parse_sign_l_separator::<i32>(b"+5", b'_'), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign_l_separator::<i32>(b"-5", b'_'), (Sign::Negative, b!("5")));
+        assert_eq!(parse_sign_l_separator::<i32>(b"_-5", b'_'), (Sign::Negative, b!("5")));
+        assert_eq!(parse_sign_l_separator::<i32>(b"___-5", b'_'), (Sign::Positive, b!("___-5")));
+
+        // Unsigned
+        assert_eq!(parse_sign_l_separator::<u32>(b"_+5", b'_'), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign_l_separator::<u32>(b"_-5", b'_'), (Sign::Positive, b!("_-5")));
+    }
+
+    #[test]
+    #[cfg(feature = "format")]
+    fn parse_sign_separator_test() {
+        let format = NumberFormat::ignore(b'_').unwrap();
+        assert_eq!(parse_sign_separator::<i32>(b"", format), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign_separator::<i32>(b"+", format), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign_separator::<i32>(b"-", format), (Sign::Negative, b!("")));
+        assert_eq!(parse_sign_separator::<i32>(b"+5", format), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign_separator::<i32>(b"-5", format), (Sign::Negative, b!("5")));
+        assert_eq!(parse_sign_separator::<i32>(b"_-5", format), (Sign::Negative, b!("5")));
+        assert_eq!(parse_sign_separator::<i32>(b"___-5", format), (Sign::Negative, b!("5")));
+
+        // Unsigned
+        assert_eq!(parse_sign_separator::<u32>(b"__+5", format), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign_separator::<u32>(b"__-5", format), (Sign::Positive, b!("__-5")));
+    }
+
+    #[test]
+    fn parse_sign_test() {
+        let format = NumberFormat::standard().unwrap();
+        assert_eq!(parse_sign::<i32>(b"", format), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign::<i32>(b"+", format), (Sign::Positive, b!("")));
+        assert_eq!(parse_sign::<i32>(b"-", format), (Sign::Negative, b!("")));
+        assert_eq!(parse_sign::<i32>(b"+5", format), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign::<i32>(b"-5", format), (Sign::Negative, b!("5")));
+        assert_eq!(parse_sign::<i32>(b"_-5", format), (Sign::Positive, b!("_-5")));
+        assert_eq!(parse_sign::<i32>(b"___-5", format), (Sign::Positive, b!("___-5")));
+
+        // Unsigned
+        assert_eq!(parse_sign::<u32>(b"+5", format), (Sign::Positive, b!("5")));
+        assert_eq!(parse_sign::<u32>(b"-5", format), (Sign::Positive, b!("-5")));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/skip_value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/skip_value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/skip_value.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/skip_value.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,99 @@
+//! An iterator that skips values equal to a provided value.
+//!
+//! SkipValueIterator iterates over a slice, returning all values
+//! except for those matching the provided skip value.
+//!
+//! Example
+//! -------
+//!
+//! ```text
+//! let iter = SkipValueIterator(&[1, 2, 5, 2, 6, 7], 2);
+//! assert!(iter.eq([1, 5, 6, 7].iter()));
+//! ```
+
+use crate::lib::slice;
+use super::iterator::*;
+
+/// Slice iterator that skips characters matching a given value.
+pub(crate) struct SkipValueIterator<'a, T: 'a + PartialEq> {
+    /// Slice iterator to wrap.
+    iter: slice::Iter<'a, T>,
+    /// Value to skip.
+    skip: T
+}
+
+impl<'a, T: 'a + PartialEq> SkipValueIterator<'a, T> {
+    #[inline]
+    pub(crate) fn new(slc: &'a [T], skip: T) -> Self {
+        SkipValueIterator {
+            iter: slc.iter(),
+            skip: skip
+        }
+    }
+}
+
+impl<'a, T: 'a + PartialEq + Clone> Clone for SkipValueIterator<'a, T> {
+    #[inline]
+    fn clone(&self) -> Self {
+        SkipValueIterator {
+            iter: self.iter.clone(),
+            skip: self.skip.clone()
+        }
+    }
+}
+
+impl<'a, T: 'a + PartialEq> Iterator for SkipValueIterator<'a, T> {
+    type Item = &'a T;
+
+    #[inline]
+    fn next(&mut self) -> Option<Self::Item> {
+        loop {
+            let value = self.iter.next()?;
+            if *value != self.skip {
+                return Some(value);
+            }
+        }
+    }
+}
+
+impl<'a, T: 'a + PartialEq> ConsumedIterator for SkipValueIterator<'a, T> {
+    // Preconditions: The iterator cannot end with `skip` characters.
+    // Use debug_assert to enforce this is removed successfully in test scenarios.
+    #[inline]
+    fn consumed(&self) -> bool {
+        // This implementation is essentially a hack.
+        // We rely on callers to ensure this is only ever called without
+        // any trailing digit separators, otherwise, it will incorrectly
+        // report if the iterator itself is consumed.
+        debug_assert!(self.iter.as_slice().last() != Some(&self.skip));
+        self.iter.len() == 0
+    }
+}
+
+impl<'a, T: 'a + PartialEq> AsPtrIterator<'a, T> for SkipValueIterator<'a, T> {
+    #[inline]
+    fn as_ptr(&self) -> *const T {
+        self.iter.as_slice().as_ptr()
+    }
+}
+
+// TESTS
+// -----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn skip_value_test() {
+        let slc = &[1, 2, 5, 2, 6, 7];
+        let iter = SkipValueIterator::new(slc, 2);
+        assert!(iter.eq([1, 5, 6, 7].iter()));
+
+        let iter = SkipValueIterator::new(slc, 5);
+        assert!(iter.eq([1, 2, 2, 6, 7].iter()));
+
+        let iter = SkipValueIterator::new(slc, 1);
+        assert!(iter.eq([2, 5, 2, 6, 7].iter()));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/table.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/table.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/table.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/table.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3225 @@
+//! Cached tables for precalculated values.
+
+use crate::util::*;
+#[cfg(any(feature = "correct", feature = "format"))]
+use static_assertions::const_assert;
+
+/// Precalculated table for a digit to a character.
+///
+/// Unoptimized table for radix N always, which translates a single digit to a
+/// character, and also useful for radix-N float encoding.
+const DIGIT_TO_CHAR: [u8; 36] = [b'0', b'1', b'2', b'3', b'4', b'5', b'6', b'7', b'8', b'9', b'A', b'B', b'C', b'D', b'E', b'F', b'G', b'H', b'I', b'J', b'K', b'L', b'M', b'N', b'O', b'P', b'Q', b'R', b'S', b'T', b'U', b'V', b'W', b'X', b'Y', b'Z'];
+
+/// Get character from digit.
+#[inline(always)]
+#[allow(dead_code)]
+pub(crate) fn digit_to_char<T: Integer>(digit: T) -> u8 {
+    debug_assert!(digit.as_i32() >= 0 && digit.as_i32() < 36, "digit_to_char() invalid character.");
+    index!(DIGIT_TO_CHAR[digit.as_usize()])
+}
+
+// Conditionally compile the precompiled radix**2 tables.
+// These tables take `2 * (value % (radix^2))`, and return
+// two consecutive values corresponding to both digits.
+//
+// Total array storage: 32 KB.
+// Provides ~5x performance enhancement.
+//
+// These arrays are cache-friendly, for each BASE[2-36] table,
+// elements can be access sequentially 2-at-a-time, preventing as many
+// cache misses inside inner loops. For example, accessing the two elements
+// for a remainder of `3` for the radix^2 in radix 2 will give you `1` and `1`,
+// at indexes 6 and 7.
+
+cfg_if! {
+if #[cfg(feature = "table")] {
+pub(crate) const DIGIT_TO_BASE10_SQUARED: [u8; 200] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9'];
+}}  // cfg_if
+
+cfg_if! {
+if #[cfg(all(feature = "radix", feature = "table"))] {
+pub(crate) const DIGIT_TO_BASE2_SQUARED: [u8; 8] = [b'0', b'0', b'0', b'1', b'1', b'0', b'1', b'1'];
+pub(crate) const DIGIT_TO_BASE3_SQUARED: [u8; 18] = [b'0', b'0', b'0', b'1', b'0', b'2', b'1', b'0', b'1', b'1', b'1', b'2', b'2', b'0', b'2', b'1', b'2', b'2'];
+pub(crate) const DIGIT_TO_BASE4_SQUARED: [u8; 32] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3'];
+pub(crate) const DIGIT_TO_BASE5_SQUARED: [u8; 50] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4'];
+pub(crate) const DIGIT_TO_BASE6_SQUARED: [u8; 72] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5'];
+pub(crate) const DIGIT_TO_BASE7_SQUARED: [u8; 98] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6'];
+pub(crate) const DIGIT_TO_BASE8_SQUARED: [u8; 128] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7'];
+pub(crate) const DIGIT_TO_BASE9_SQUARED: [u8; 162] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8'];
+pub(crate) const DIGIT_TO_BASE11_SQUARED: [u8; 242] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A'];
+pub(crate) const DIGIT_TO_BASE12_SQUARED: [u8; 288] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B'];
+pub(crate) const DIGIT_TO_BASE13_SQUARED: [u8; 338] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C'];
+pub(crate) const DIGIT_TO_BASE14_SQUARED: [u8; 392] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D'];
+pub(crate) const DIGIT_TO_BASE15_SQUARED: [u8; 450] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E'];
+pub(crate) const DIGIT_TO_BASE16_SQUARED: [u8; 512] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F'];
+pub(crate) const DIGIT_TO_BASE17_SQUARED: [u8; 578] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G'];
+pub(crate) const DIGIT_TO_BASE18_SQUARED: [u8; 648] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H'];
+pub(crate) const DIGIT_TO_BASE19_SQUARED: [u8; 722] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I'];
+pub(crate) const DIGIT_TO_BASE20_SQUARED: [u8; 800] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J'];
+pub(crate) const DIGIT_TO_BASE21_SQUARED: [u8; 882] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K'];
+pub(crate) const DIGIT_TO_BASE22_SQUARED: [u8; 968] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L'];
+pub(crate) const DIGIT_TO_BASE23_SQUARED: [u8; 1058] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M'];
+pub(crate) const DIGIT_TO_BASE24_SQUARED: [u8; 1152] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N'];
+pub(crate) const DIGIT_TO_BASE25_SQUARED: [u8; 1250] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O'];
+pub(crate) const DIGIT_TO_BASE26_SQUARED: [u8; 1352] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P'];
+pub(crate) const DIGIT_TO_BASE27_SQUARED: [u8; 1458] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q'];
+pub(crate) const DIGIT_TO_BASE28_SQUARED: [u8; 1568] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R'];
+pub(crate) const DIGIT_TO_BASE29_SQUARED: [u8; 1682] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'0', b'S', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'1', b'S', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'2', b'S', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'3', b'S', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'4', b'S', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'5', b'S', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'6', b'S', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'7', b'S', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'8', b'S', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'9', b'S', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'A', b'S', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'B', b'S', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'C', b'S', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'D', b'S', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'E', b'S', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'F', b'S', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'G', b'S', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'H', b'S', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'I', b'S', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'J', b'S', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'K', b'S', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'L', b'S', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'M', b'S', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'N', b'S', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'O', b'S', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'P', b'S', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'Q', b'S', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R', b'R', b'S', b'S', b'0', b'S', b'1', b'S', b'2', b'S', b'3', b'S', b'4', b'S', b'5', b'S', b'6', b'S', b'7', b'S', b'8', b'S', b'9', b'S', b'A', b'S', b'B', b'S', b'C', b'S', b'D', b'S', b'E', b'S', b'F', b'S', b'G', b'S', b'H', b'S', b'I', b'S', b'J', b'S', b'K', b'S', b'L', b'S', b'M', b'S', b'N', b'S', b'O', b'S', b'P', b'S', b'Q', b'S', b'R', b'S', b'S'];
+pub(crate) const DIGIT_TO_BASE30_SQUARED: [u8; 1800] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'0', b'S', b'0', b'T', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'1', b'S', b'1', b'T', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'2', b'S', b'2', b'T', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'3', b'S', b'3', b'T', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'4', b'S', b'4', b'T', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'5', b'S', b'5', b'T', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'6', b'S', b'6', b'T', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'7', b'S', b'7', b'T', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'8', b'S', b'8', b'T', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'9', b'S', b'9', b'T', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'A', b'S', b'A', b'T', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'B', b'S', b'B', b'T', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'C', b'S', b'C', b'T', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'D', b'S', b'D', b'T', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'E', b'S', b'E', b'T', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'F', b'S', b'F', b'T', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'G', b'S', b'G', b'T', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'H', b'S', b'H', b'T', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'I', b'S', b'I', b'T', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'J', b'S', b'J', b'T', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'K', b'S', b'K', b'T', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'L', b'S', b'L', b'T', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'M', b'S', b'M', b'T', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'N', b'S', b'N', b'T', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'O', b'S', b'O', b'T', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'P', b'S', b'P', b'T', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'Q', b'S', b'Q', b'T', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R', b'R', b'S', b'R', b'T', b'S', b'0', b'S', b'1', b'S', b'2', b'S', b'3', b'S', b'4', b'S', b'5', b'S', b'6', b'S', b'7', b'S', b'8', b'S', b'9', b'S', b'A', b'S', b'B', b'S', b'C', b'S', b'D', b'S', b'E', b'S', b'F', b'S', b'G', b'S', b'H', b'S', b'I', b'S', b'J', b'S', b'K', b'S', b'L', b'S', b'M', b'S', b'N', b'S', b'O', b'S', b'P', b'S', b'Q', b'S', b'R', b'S', b'S', b'S', b'T', b'T', b'0', b'T', b'1', b'T', b'2', b'T', b'3', b'T', b'4', b'T', b'5', b'T', b'6', b'T', b'7', b'T', b'8', b'T', b'9', b'T', b'A', b'T', b'B', b'T', b'C', b'T', b'D', b'T', b'E', b'T', b'F', b'T', b'G', b'T', b'H', b'T', b'I', b'T', b'J', b'T', b'K', b'T', b'L', b'T', b'M', b'T', b'N', b'T', b'O', b'T', b'P', b'T', b'Q', b'T', b'R', b'T', b'S', b'T', b'T'];
+pub(crate) const DIGIT_TO_BASE31_SQUARED: [u8; 1922] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'0', b'S', b'0', b'T', b'0', b'U', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'1', b'S', b'1', b'T', b'1', b'U', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'2', b'S', b'2', b'T', b'2', b'U', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'3', b'S', b'3', b'T', b'3', b'U', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'4', b'S', b'4', b'T', b'4', b'U', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'5', b'S', b'5', b'T', b'5', b'U', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'6', b'S', b'6', b'T', b'6', b'U', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'7', b'S', b'7', b'T', b'7', b'U', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'8', b'S', b'8', b'T', b'8', b'U', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'9', b'S', b'9', b'T', b'9', b'U', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'A', b'S', b'A', b'T', b'A', b'U', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'B', b'S', b'B', b'T', b'B', b'U', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'C', b'S', b'C', b'T', b'C', b'U', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'D', b'S', b'D', b'T', b'D', b'U', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'E', b'S', b'E', b'T', b'E', b'U', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'F', b'S', b'F', b'T', b'F', b'U', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'G', b'S', b'G', b'T', b'G', b'U', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'H', b'S', b'H', b'T', b'H', b'U', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'I', b'S', b'I', b'T', b'I', b'U', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'J', b'S', b'J', b'T', b'J', b'U', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'K', b'S', b'K', b'T', b'K', b'U', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'L', b'S', b'L', b'T', b'L', b'U', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'M', b'S', b'M', b'T', b'M', b'U', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'N', b'S', b'N', b'T', b'N', b'U', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'O', b'S', b'O', b'T', b'O', b'U', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'P', b'S', b'P', b'T', b'P', b'U', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'Q', b'S', b'Q', b'T', b'Q', b'U', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R', b'R', b'S', b'R', b'T', b'R', b'U', b'S', b'0', b'S', b'1', b'S', b'2', b'S', b'3', b'S', b'4', b'S', b'5', b'S', b'6', b'S', b'7', b'S', b'8', b'S', b'9', b'S', b'A', b'S', b'B', b'S', b'C', b'S', b'D', b'S', b'E', b'S', b'F', b'S', b'G', b'S', b'H', b'S', b'I', b'S', b'J', b'S', b'K', b'S', b'L', b'S', b'M', b'S', b'N', b'S', b'O', b'S', b'P', b'S', b'Q', b'S', b'R', b'S', b'S', b'S', b'T', b'S', b'U', b'T', b'0', b'T', b'1', b'T', b'2', b'T', b'3', b'T', b'4', b'T', b'5', b'T', b'6', b'T', b'7', b'T', b'8', b'T', b'9', b'T', b'A', b'T', b'B', b'T', b'C', b'T', b'D', b'T', b'E', b'T', b'F', b'T', b'G', b'T', b'H', b'T', b'I', b'T', b'J', b'T', b'K', b'T', b'L', b'T', b'M', b'T', b'N', b'T', b'O', b'T', b'P', b'T', b'Q', b'T', b'R', b'T', b'S', b'T', b'T', b'T', b'U', b'U', b'0', b'U', b'1', b'U', b'2', b'U', b'3', b'U', b'4', b'U', b'5', b'U', b'6', b'U', b'7', b'U', b'8', b'U', b'9', b'U', b'A', b'U', b'B', b'U', b'C', b'U', b'D', b'U', b'E', b'U', b'F', b'U', b'G', b'U', b'H', b'U', b'I', b'U', b'J', b'U', b'K', b'U', b'L', b'U', b'M', b'U', b'N', b'U', b'O', b'U', b'P', b'U', b'Q', b'U', b'R', b'U', b'S', b'U', b'T', b'U', b'U'];
+pub(crate) const DIGIT_TO_BASE32_SQUARED: [u8; 2048] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'0', b'S', b'0', b'T', b'0', b'U', b'0', b'V', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'1', b'S', b'1', b'T', b'1', b'U', b'1', b'V', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'2', b'S', b'2', b'T', b'2', b'U', b'2', b'V', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'3', b'S', b'3', b'T', b'3', b'U', b'3', b'V', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'4', b'S', b'4', b'T', b'4', b'U', b'4', b'V', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'5', b'S', b'5', b'T', b'5', b'U', b'5', b'V', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'6', b'S', b'6', b'T', b'6', b'U', b'6', b'V', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'7', b'S', b'7', b'T', b'7', b'U', b'7', b'V', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'8', b'S', b'8', b'T', b'8', b'U', b'8', b'V', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'9', b'S', b'9', b'T', b'9', b'U', b'9', b'V', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'A', b'S', b'A', b'T', b'A', b'U', b'A', b'V', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'B', b'S', b'B', b'T', b'B', b'U', b'B', b'V', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'C', b'S', b'C', b'T', b'C', b'U', b'C', b'V', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'D', b'S', b'D', b'T', b'D', b'U', b'D', b'V', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'E', b'S', b'E', b'T', b'E', b'U', b'E', b'V', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'F', b'S', b'F', b'T', b'F', b'U', b'F', b'V', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'G', b'S', b'G', b'T', b'G', b'U', b'G', b'V', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'H', b'S', b'H', b'T', b'H', b'U', b'H', b'V', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'I', b'S', b'I', b'T', b'I', b'U', b'I', b'V', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'J', b'S', b'J', b'T', b'J', b'U', b'J', b'V', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'K', b'S', b'K', b'T', b'K', b'U', b'K', b'V', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'L', b'S', b'L', b'T', b'L', b'U', b'L', b'V', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'M', b'S', b'M', b'T', b'M', b'U', b'M', b'V', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'N', b'S', b'N', b'T', b'N', b'U', b'N', b'V', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'O', b'S', b'O', b'T', b'O', b'U', b'O', b'V', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'P', b'S', b'P', b'T', b'P', b'U', b'P', b'V', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'Q', b'S', b'Q', b'T', b'Q', b'U', b'Q', b'V', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R', b'R', b'S', b'R', b'T', b'R', b'U', b'R', b'V', b'S', b'0', b'S', b'1', b'S', b'2', b'S', b'3', b'S', b'4', b'S', b'5', b'S', b'6', b'S', b'7', b'S', b'8', b'S', b'9', b'S', b'A', b'S', b'B', b'S', b'C', b'S', b'D', b'S', b'E', b'S', b'F', b'S', b'G', b'S', b'H', b'S', b'I', b'S', b'J', b'S', b'K', b'S', b'L', b'S', b'M', b'S', b'N', b'S', b'O', b'S', b'P', b'S', b'Q', b'S', b'R', b'S', b'S', b'S', b'T', b'S', b'U', b'S', b'V', b'T', b'0', b'T', b'1', b'T', b'2', b'T', b'3', b'T', b'4', b'T', b'5', b'T', b'6', b'T', b'7', b'T', b'8', b'T', b'9', b'T', b'A', b'T', b'B', b'T', b'C', b'T', b'D', b'T', b'E', b'T', b'F', b'T', b'G', b'T', b'H', b'T', b'I', b'T', b'J', b'T', b'K', b'T', b'L', b'T', b'M', b'T', b'N', b'T', b'O', b'T', b'P', b'T', b'Q', b'T', b'R', b'T', b'S', b'T', b'T', b'T', b'U', b'T', b'V', b'U', b'0', b'U', b'1', b'U', b'2', b'U', b'3', b'U', b'4', b'U', b'5', b'U', b'6', b'U', b'7', b'U', b'8', b'U', b'9', b'U', b'A', b'U', b'B', b'U', b'C', b'U', b'D', b'U', b'E', b'U', b'F', b'U', b'G', b'U', b'H', b'U', b'I', b'U', b'J', b'U', b'K', b'U', b'L', b'U', b'M', b'U', b'N', b'U', b'O', b'U', b'P', b'U', b'Q', b'U', b'R', b'U', b'S', b'U', b'T', b'U', b'U', b'U', b'V', b'V', b'0', b'V', b'1', b'V', b'2', b'V', b'3', b'V', b'4', b'V', b'5', b'V', b'6', b'V', b'7', b'V', b'8', b'V', b'9', b'V', b'A', b'V', b'B', b'V', b'C', b'V', b'D', b'V', b'E', b'V', b'F', b'V', b'G', b'V', b'H', b'V', b'I', b'V', b'J', b'V', b'K', b'V', b'L', b'V', b'M', b'V', b'N', b'V', b'O', b'V', b'P', b'V', b'Q', b'V', b'R', b'V', b'S', b'V', b'T', b'V', b'U', b'V', b'V'];
+pub(crate) const DIGIT_TO_BASE33_SQUARED: [u8; 2178] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'0', b'S', b'0', b'T', b'0', b'U', b'0', b'V', b'0', b'W', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'1', b'S', b'1', b'T', b'1', b'U', b'1', b'V', b'1', b'W', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'2', b'S', b'2', b'T', b'2', b'U', b'2', b'V', b'2', b'W', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'3', b'S', b'3', b'T', b'3', b'U', b'3', b'V', b'3', b'W', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'4', b'S', b'4', b'T', b'4', b'U', b'4', b'V', b'4', b'W', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'5', b'S', b'5', b'T', b'5', b'U', b'5', b'V', b'5', b'W', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'6', b'S', b'6', b'T', b'6', b'U', b'6', b'V', b'6', b'W', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'7', b'S', b'7', b'T', b'7', b'U', b'7', b'V', b'7', b'W', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'8', b'S', b'8', b'T', b'8', b'U', b'8', b'V', b'8', b'W', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'9', b'S', b'9', b'T', b'9', b'U', b'9', b'V', b'9', b'W', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'A', b'S', b'A', b'T', b'A', b'U', b'A', b'V', b'A', b'W', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'B', b'S', b'B', b'T', b'B', b'U', b'B', b'V', b'B', b'W', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'C', b'S', b'C', b'T', b'C', b'U', b'C', b'V', b'C', b'W', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'D', b'S', b'D', b'T', b'D', b'U', b'D', b'V', b'D', b'W', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'E', b'S', b'E', b'T', b'E', b'U', b'E', b'V', b'E', b'W', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'F', b'S', b'F', b'T', b'F', b'U', b'F', b'V', b'F', b'W', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'G', b'S', b'G', b'T', b'G', b'U', b'G', b'V', b'G', b'W', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'H', b'S', b'H', b'T', b'H', b'U', b'H', b'V', b'H', b'W', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'I', b'S', b'I', b'T', b'I', b'U', b'I', b'V', b'I', b'W', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'J', b'S', b'J', b'T', b'J', b'U', b'J', b'V', b'J', b'W', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'K', b'S', b'K', b'T', b'K', b'U', b'K', b'V', b'K', b'W', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'L', b'S', b'L', b'T', b'L', b'U', b'L', b'V', b'L', b'W', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'M', b'S', b'M', b'T', b'M', b'U', b'M', b'V', b'M', b'W', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'N', b'S', b'N', b'T', b'N', b'U', b'N', b'V', b'N', b'W', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'O', b'S', b'O', b'T', b'O', b'U', b'O', b'V', b'O', b'W', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'P', b'S', b'P', b'T', b'P', b'U', b'P', b'V', b'P', b'W', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'Q', b'S', b'Q', b'T', b'Q', b'U', b'Q', b'V', b'Q', b'W', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R', b'R', b'S', b'R', b'T', b'R', b'U', b'R', b'V', b'R', b'W', b'S', b'0', b'S', b'1', b'S', b'2', b'S', b'3', b'S', b'4', b'S', b'5', b'S', b'6', b'S', b'7', b'S', b'8', b'S', b'9', b'S', b'A', b'S', b'B', b'S', b'C', b'S', b'D', b'S', b'E', b'S', b'F', b'S', b'G', b'S', b'H', b'S', b'I', b'S', b'J', b'S', b'K', b'S', b'L', b'S', b'M', b'S', b'N', b'S', b'O', b'S', b'P', b'S', b'Q', b'S', b'R', b'S', b'S', b'S', b'T', b'S', b'U', b'S', b'V', b'S', b'W', b'T', b'0', b'T', b'1', b'T', b'2', b'T', b'3', b'T', b'4', b'T', b'5', b'T', b'6', b'T', b'7', b'T', b'8', b'T', b'9', b'T', b'A', b'T', b'B', b'T', b'C', b'T', b'D', b'T', b'E', b'T', b'F', b'T', b'G', b'T', b'H', b'T', b'I', b'T', b'J', b'T', b'K', b'T', b'L', b'T', b'M', b'T', b'N', b'T', b'O', b'T', b'P', b'T', b'Q', b'T', b'R', b'T', b'S', b'T', b'T', b'T', b'U', b'T', b'V', b'T', b'W', b'U', b'0', b'U', b'1', b'U', b'2', b'U', b'3', b'U', b'4', b'U', b'5', b'U', b'6', b'U', b'7', b'U', b'8', b'U', b'9', b'U', b'A', b'U', b'B', b'U', b'C', b'U', b'D', b'U', b'E', b'U', b'F', b'U', b'G', b'U', b'H', b'U', b'I', b'U', b'J', b'U', b'K', b'U', b'L', b'U', b'M', b'U', b'N', b'U', b'O', b'U', b'P', b'U', b'Q', b'U', b'R', b'U', b'S', b'U', b'T', b'U', b'U', b'U', b'V', b'U', b'W', b'V', b'0', b'V', b'1', b'V', b'2', b'V', b'3', b'V', b'4', b'V', b'5', b'V', b'6', b'V', b'7', b'V', b'8', b'V', b'9', b'V', b'A', b'V', b'B', b'V', b'C', b'V', b'D', b'V', b'E', b'V', b'F', b'V', b'G', b'V', b'H', b'V', b'I', b'V', b'J', b'V', b'K', b'V', b'L', b'V', b'M', b'V', b'N', b'V', b'O', b'V', b'P', b'V', b'Q', b'V', b'R', b'V', b'S', b'V', b'T', b'V', b'U', b'V', b'V', b'V', b'W', b'W', b'0', b'W', b'1', b'W', b'2', b'W', b'3', b'W', b'4', b'W', b'5', b'W', b'6', b'W', b'7', b'W', b'8', b'W', b'9', b'W', b'A', b'W', b'B', b'W', b'C', b'W', b'D', b'W', b'E', b'W', b'F', b'W', b'G', b'W', b'H', b'W', b'I', b'W', b'J', b'W', b'K', b'W', b'L', b'W', b'M', b'W', b'N', b'W', b'O', b'W', b'P', b'W', b'Q', b'W', b'R', b'W', b'S', b'W', b'T', b'W', b'U', b'W', b'V', b'W', b'W'];
+pub(crate) const DIGIT_TO_BASE34_SQUARED: [u8; 2312] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'0', b'S', b'0', b'T', b'0', b'U', b'0', b'V', b'0', b'W', b'0', b'X', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'1', b'S', b'1', b'T', b'1', b'U', b'1', b'V', b'1', b'W', b'1', b'X', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'2', b'S', b'2', b'T', b'2', b'U', b'2', b'V', b'2', b'W', b'2', b'X', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'3', b'S', b'3', b'T', b'3', b'U', b'3', b'V', b'3', b'W', b'3', b'X', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'4', b'S', b'4', b'T', b'4', b'U', b'4', b'V', b'4', b'W', b'4', b'X', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'5', b'S', b'5', b'T', b'5', b'U', b'5', b'V', b'5', b'W', b'5', b'X', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'6', b'S', b'6', b'T', b'6', b'U', b'6', b'V', b'6', b'W', b'6', b'X', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'7', b'S', b'7', b'T', b'7', b'U', b'7', b'V', b'7', b'W', b'7', b'X', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'8', b'S', b'8', b'T', b'8', b'U', b'8', b'V', b'8', b'W', b'8', b'X', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'9', b'S', b'9', b'T', b'9', b'U', b'9', b'V', b'9', b'W', b'9', b'X', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'A', b'S', b'A', b'T', b'A', b'U', b'A', b'V', b'A', b'W', b'A', b'X', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'B', b'S', b'B', b'T', b'B', b'U', b'B', b'V', b'B', b'W', b'B', b'X', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'C', b'S', b'C', b'T', b'C', b'U', b'C', b'V', b'C', b'W', b'C', b'X', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'D', b'S', b'D', b'T', b'D', b'U', b'D', b'V', b'D', b'W', b'D', b'X', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'E', b'S', b'E', b'T', b'E', b'U', b'E', b'V', b'E', b'W', b'E', b'X', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'F', b'S', b'F', b'T', b'F', b'U', b'F', b'V', b'F', b'W', b'F', b'X', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'G', b'S', b'G', b'T', b'G', b'U', b'G', b'V', b'G', b'W', b'G', b'X', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'H', b'S', b'H', b'T', b'H', b'U', b'H', b'V', b'H', b'W', b'H', b'X', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'I', b'S', b'I', b'T', b'I', b'U', b'I', b'V', b'I', b'W', b'I', b'X', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'J', b'S', b'J', b'T', b'J', b'U', b'J', b'V', b'J', b'W', b'J', b'X', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'K', b'S', b'K', b'T', b'K', b'U', b'K', b'V', b'K', b'W', b'K', b'X', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'L', b'S', b'L', b'T', b'L', b'U', b'L', b'V', b'L', b'W', b'L', b'X', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'M', b'S', b'M', b'T', b'M', b'U', b'M', b'V', b'M', b'W', b'M', b'X', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'N', b'S', b'N', b'T', b'N', b'U', b'N', b'V', b'N', b'W', b'N', b'X', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'O', b'S', b'O', b'T', b'O', b'U', b'O', b'V', b'O', b'W', b'O', b'X', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'P', b'S', b'P', b'T', b'P', b'U', b'P', b'V', b'P', b'W', b'P', b'X', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'Q', b'S', b'Q', b'T', b'Q', b'U', b'Q', b'V', b'Q', b'W', b'Q', b'X', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R', b'R', b'S', b'R', b'T', b'R', b'U', b'R', b'V', b'R', b'W', b'R', b'X', b'S', b'0', b'S', b'1', b'S', b'2', b'S', b'3', b'S', b'4', b'S', b'5', b'S', b'6', b'S', b'7', b'S', b'8', b'S', b'9', b'S', b'A', b'S', b'B', b'S', b'C', b'S', b'D', b'S', b'E', b'S', b'F', b'S', b'G', b'S', b'H', b'S', b'I', b'S', b'J', b'S', b'K', b'S', b'L', b'S', b'M', b'S', b'N', b'S', b'O', b'S', b'P', b'S', b'Q', b'S', b'R', b'S', b'S', b'S', b'T', b'S', b'U', b'S', b'V', b'S', b'W', b'S', b'X', b'T', b'0', b'T', b'1', b'T', b'2', b'T', b'3', b'T', b'4', b'T', b'5', b'T', b'6', b'T', b'7', b'T', b'8', b'T', b'9', b'T', b'A', b'T', b'B', b'T', b'C', b'T', b'D', b'T', b'E', b'T', b'F', b'T', b'G', b'T', b'H', b'T', b'I', b'T', b'J', b'T', b'K', b'T', b'L', b'T', b'M', b'T', b'N', b'T', b'O', b'T', b'P', b'T', b'Q', b'T', b'R', b'T', b'S', b'T', b'T', b'T', b'U', b'T', b'V', b'T', b'W', b'T', b'X', b'U', b'0', b'U', b'1', b'U', b'2', b'U', b'3', b'U', b'4', b'U', b'5', b'U', b'6', b'U', b'7', b'U', b'8', b'U', b'9', b'U', b'A', b'U', b'B', b'U', b'C', b'U', b'D', b'U', b'E', b'U', b'F', b'U', b'G', b'U', b'H', b'U', b'I', b'U', b'J', b'U', b'K', b'U', b'L', b'U', b'M', b'U', b'N', b'U', b'O', b'U', b'P', b'U', b'Q', b'U', b'R', b'U', b'S', b'U', b'T', b'U', b'U', b'U', b'V', b'U', b'W', b'U', b'X', b'V', b'0', b'V', b'1', b'V', b'2', b'V', b'3', b'V', b'4', b'V', b'5', b'V', b'6', b'V', b'7', b'V', b'8', b'V', b'9', b'V', b'A', b'V', b'B', b'V', b'C', b'V', b'D', b'V', b'E', b'V', b'F', b'V', b'G', b'V', b'H', b'V', b'I', b'V', b'J', b'V', b'K', b'V', b'L', b'V', b'M', b'V', b'N', b'V', b'O', b'V', b'P', b'V', b'Q', b'V', b'R', b'V', b'S', b'V', b'T', b'V', b'U', b'V', b'V', b'V', b'W', b'V', b'X', b'W', b'0', b'W', b'1', b'W', b'2', b'W', b'3', b'W', b'4', b'W', b'5', b'W', b'6', b'W', b'7', b'W', b'8', b'W', b'9', b'W', b'A', b'W', b'B', b'W', b'C', b'W', b'D', b'W', b'E', b'W', b'F', b'W', b'G', b'W', b'H', b'W', b'I', b'W', b'J', b'W', b'K', b'W', b'L', b'W', b'M', b'W', b'N', b'W', b'O', b'W', b'P', b'W', b'Q', b'W', b'R', b'W', b'S', b'W', b'T', b'W', b'U', b'W', b'V', b'W', b'W', b'W', b'X', b'X', b'0', b'X', b'1', b'X', b'2', b'X', b'3', b'X', b'4', b'X', b'5', b'X', b'6', b'X', b'7', b'X', b'8', b'X', b'9', b'X', b'A', b'X', b'B', b'X', b'C', b'X', b'D', b'X', b'E', b'X', b'F', b'X', b'G', b'X', b'H', b'X', b'I', b'X', b'J', b'X', b'K', b'X', b'L', b'X', b'M', b'X', b'N', b'X', b'O', b'X', b'P', b'X', b'Q', b'X', b'R', b'X', b'S', b'X', b'T', b'X', b'U', b'X', b'V', b'X', b'W', b'X', b'X'];
+pub(crate) const DIGIT_TO_BASE35_SQUARED: [u8; 2450] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'0', b'S', b'0', b'T', b'0', b'U', b'0', b'V', b'0', b'W', b'0', b'X', b'0', b'Y', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'1', b'S', b'1', b'T', b'1', b'U', b'1', b'V', b'1', b'W', b'1', b'X', b'1', b'Y', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'2', b'S', b'2', b'T', b'2', b'U', b'2', b'V', b'2', b'W', b'2', b'X', b'2', b'Y', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'3', b'S', b'3', b'T', b'3', b'U', b'3', b'V', b'3', b'W', b'3', b'X', b'3', b'Y', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'4', b'S', b'4', b'T', b'4', b'U', b'4', b'V', b'4', b'W', b'4', b'X', b'4', b'Y', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'5', b'S', b'5', b'T', b'5', b'U', b'5', b'V', b'5', b'W', b'5', b'X', b'5', b'Y', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'6', b'S', b'6', b'T', b'6', b'U', b'6', b'V', b'6', b'W', b'6', b'X', b'6', b'Y', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'7', b'S', b'7', b'T', b'7', b'U', b'7', b'V', b'7', b'W', b'7', b'X', b'7', b'Y', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'8', b'S', b'8', b'T', b'8', b'U', b'8', b'V', b'8', b'W', b'8', b'X', b'8', b'Y', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'9', b'S', b'9', b'T', b'9', b'U', b'9', b'V', b'9', b'W', b'9', b'X', b'9', b'Y', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'A', b'S', b'A', b'T', b'A', b'U', b'A', b'V', b'A', b'W', b'A', b'X', b'A', b'Y', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'B', b'S', b'B', b'T', b'B', b'U', b'B', b'V', b'B', b'W', b'B', b'X', b'B', b'Y', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'C', b'S', b'C', b'T', b'C', b'U', b'C', b'V', b'C', b'W', b'C', b'X', b'C', b'Y', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'D', b'S', b'D', b'T', b'D', b'U', b'D', b'V', b'D', b'W', b'D', b'X', b'D', b'Y', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'E', b'S', b'E', b'T', b'E', b'U', b'E', b'V', b'E', b'W', b'E', b'X', b'E', b'Y', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'F', b'S', b'F', b'T', b'F', b'U', b'F', b'V', b'F', b'W', b'F', b'X', b'F', b'Y', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'G', b'S', b'G', b'T', b'G', b'U', b'G', b'V', b'G', b'W', b'G', b'X', b'G', b'Y', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'H', b'S', b'H', b'T', b'H', b'U', b'H', b'V', b'H', b'W', b'H', b'X', b'H', b'Y', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'I', b'S', b'I', b'T', b'I', b'U', b'I', b'V', b'I', b'W', b'I', b'X', b'I', b'Y', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'J', b'S', b'J', b'T', b'J', b'U', b'J', b'V', b'J', b'W', b'J', b'X', b'J', b'Y', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'K', b'S', b'K', b'T', b'K', b'U', b'K', b'V', b'K', b'W', b'K', b'X', b'K', b'Y', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'L', b'S', b'L', b'T', b'L', b'U', b'L', b'V', b'L', b'W', b'L', b'X', b'L', b'Y', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'M', b'S', b'M', b'T', b'M', b'U', b'M', b'V', b'M', b'W', b'M', b'X', b'M', b'Y', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'N', b'S', b'N', b'T', b'N', b'U', b'N', b'V', b'N', b'W', b'N', b'X', b'N', b'Y', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'O', b'S', b'O', b'T', b'O', b'U', b'O', b'V', b'O', b'W', b'O', b'X', b'O', b'Y', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'P', b'S', b'P', b'T', b'P', b'U', b'P', b'V', b'P', b'W', b'P', b'X', b'P', b'Y', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'Q', b'S', b'Q', b'T', b'Q', b'U', b'Q', b'V', b'Q', b'W', b'Q', b'X', b'Q', b'Y', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R', b'R', b'S', b'R', b'T', b'R', b'U', b'R', b'V', b'R', b'W', b'R', b'X', b'R', b'Y', b'S', b'0', b'S', b'1', b'S', b'2', b'S', b'3', b'S', b'4', b'S', b'5', b'S', b'6', b'S', b'7', b'S', b'8', b'S', b'9', b'S', b'A', b'S', b'B', b'S', b'C', b'S', b'D', b'S', b'E', b'S', b'F', b'S', b'G', b'S', b'H', b'S', b'I', b'S', b'J', b'S', b'K', b'S', b'L', b'S', b'M', b'S', b'N', b'S', b'O', b'S', b'P', b'S', b'Q', b'S', b'R', b'S', b'S', b'S', b'T', b'S', b'U', b'S', b'V', b'S', b'W', b'S', b'X', b'S', b'Y', b'T', b'0', b'T', b'1', b'T', b'2', b'T', b'3', b'T', b'4', b'T', b'5', b'T', b'6', b'T', b'7', b'T', b'8', b'T', b'9', b'T', b'A', b'T', b'B', b'T', b'C', b'T', b'D', b'T', b'E', b'T', b'F', b'T', b'G', b'T', b'H', b'T', b'I', b'T', b'J', b'T', b'K', b'T', b'L', b'T', b'M', b'T', b'N', b'T', b'O', b'T', b'P', b'T', b'Q', b'T', b'R', b'T', b'S', b'T', b'T', b'T', b'U', b'T', b'V', b'T', b'W', b'T', b'X', b'T', b'Y', b'U', b'0', b'U', b'1', b'U', b'2', b'U', b'3', b'U', b'4', b'U', b'5', b'U', b'6', b'U', b'7', b'U', b'8', b'U', b'9', b'U', b'A', b'U', b'B', b'U', b'C', b'U', b'D', b'U', b'E', b'U', b'F', b'U', b'G', b'U', b'H', b'U', b'I', b'U', b'J', b'U', b'K', b'U', b'L', b'U', b'M', b'U', b'N', b'U', b'O', b'U', b'P', b'U', b'Q', b'U', b'R', b'U', b'S', b'U', b'T', b'U', b'U', b'U', b'V', b'U', b'W', b'U', b'X', b'U', b'Y', b'V', b'0', b'V', b'1', b'V', b'2', b'V', b'3', b'V', b'4', b'V', b'5', b'V', b'6', b'V', b'7', b'V', b'8', b'V', b'9', b'V', b'A', b'V', b'B', b'V', b'C', b'V', b'D', b'V', b'E', b'V', b'F', b'V', b'G', b'V', b'H', b'V', b'I', b'V', b'J', b'V', b'K', b'V', b'L', b'V', b'M', b'V', b'N', b'V', b'O', b'V', b'P', b'V', b'Q', b'V', b'R', b'V', b'S', b'V', b'T', b'V', b'U', b'V', b'V', b'V', b'W', b'V', b'X', b'V', b'Y', b'W', b'0', b'W', b'1', b'W', b'2', b'W', b'3', b'W', b'4', b'W', b'5', b'W', b'6', b'W', b'7', b'W', b'8', b'W', b'9', b'W', b'A', b'W', b'B', b'W', b'C', b'W', b'D', b'W', b'E', b'W', b'F', b'W', b'G', b'W', b'H', b'W', b'I', b'W', b'J', b'W', b'K', b'W', b'L', b'W', b'M', b'W', b'N', b'W', b'O', b'W', b'P', b'W', b'Q', b'W', b'R', b'W', b'S', b'W', b'T', b'W', b'U', b'W', b'V', b'W', b'W', b'W', b'X', b'W', b'Y', b'X', b'0', b'X', b'1', b'X', b'2', b'X', b'3', b'X', b'4', b'X', b'5', b'X', b'6', b'X', b'7', b'X', b'8', b'X', b'9', b'X', b'A', b'X', b'B', b'X', b'C', b'X', b'D', b'X', b'E', b'X', b'F', b'X', b'G', b'X', b'H', b'X', b'I', b'X', b'J', b'X', b'K', b'X', b'L', b'X', b'M', b'X', b'N', b'X', b'O', b'X', b'P', b'X', b'Q', b'X', b'R', b'X', b'S', b'X', b'T', b'X', b'U', b'X', b'V', b'X', b'W', b'X', b'X', b'X', b'Y', b'Y', b'0', b'Y', b'1', b'Y', b'2', b'Y', b'3', b'Y', b'4', b'Y', b'5', b'Y', b'6', b'Y', b'7', b'Y', b'8', b'Y', b'9', b'Y', b'A', b'Y', b'B', b'Y', b'C', b'Y', b'D', b'Y', b'E', b'Y', b'F', b'Y', b'G', b'Y', b'H', b'Y', b'I', b'Y', b'J', b'Y', b'K', b'Y', b'L', b'Y', b'M', b'Y', b'N', b'Y', b'O', b'Y', b'P', b'Y', b'Q', b'Y', b'R', b'Y', b'S', b'Y', b'T', b'Y', b'U', b'Y', b'V', b'Y', b'W', b'Y', b'X', b'Y', b'Y'];
+pub(crate) const DIGIT_TO_BASE36_SQUARED: [u8; 2592] = [b'0', b'0', b'0', b'1', b'0', b'2', b'0', b'3', b'0', b'4', b'0', b'5', b'0', b'6', b'0', b'7', b'0', b'8', b'0', b'9', b'0', b'A', b'0', b'B', b'0', b'C', b'0', b'D', b'0', b'E', b'0', b'F', b'0', b'G', b'0', b'H', b'0', b'I', b'0', b'J', b'0', b'K', b'0', b'L', b'0', b'M', b'0', b'N', b'0', b'O', b'0', b'P', b'0', b'Q', b'0', b'R', b'0', b'S', b'0', b'T', b'0', b'U', b'0', b'V', b'0', b'W', b'0', b'X', b'0', b'Y', b'0', b'Z', b'1', b'0', b'1', b'1', b'1', b'2', b'1', b'3', b'1', b'4', b'1', b'5', b'1', b'6', b'1', b'7', b'1', b'8', b'1', b'9', b'1', b'A', b'1', b'B', b'1', b'C', b'1', b'D', b'1', b'E', b'1', b'F', b'1', b'G', b'1', b'H', b'1', b'I', b'1', b'J', b'1', b'K', b'1', b'L', b'1', b'M', b'1', b'N', b'1', b'O', b'1', b'P', b'1', b'Q', b'1', b'R', b'1', b'S', b'1', b'T', b'1', b'U', b'1', b'V', b'1', b'W', b'1', b'X', b'1', b'Y', b'1', b'Z', b'2', b'0', b'2', b'1', b'2', b'2', b'2', b'3', b'2', b'4', b'2', b'5', b'2', b'6', b'2', b'7', b'2', b'8', b'2', b'9', b'2', b'A', b'2', b'B', b'2', b'C', b'2', b'D', b'2', b'E', b'2', b'F', b'2', b'G', b'2', b'H', b'2', b'I', b'2', b'J', b'2', b'K', b'2', b'L', b'2', b'M', b'2', b'N', b'2', b'O', b'2', b'P', b'2', b'Q', b'2', b'R', b'2', b'S', b'2', b'T', b'2', b'U', b'2', b'V', b'2', b'W', b'2', b'X', b'2', b'Y', b'2', b'Z', b'3', b'0', b'3', b'1', b'3', b'2', b'3', b'3', b'3', b'4', b'3', b'5', b'3', b'6', b'3', b'7', b'3', b'8', b'3', b'9', b'3', b'A', b'3', b'B', b'3', b'C', b'3', b'D', b'3', b'E', b'3', b'F', b'3', b'G', b'3', b'H', b'3', b'I', b'3', b'J', b'3', b'K', b'3', b'L', b'3', b'M', b'3', b'N', b'3', b'O', b'3', b'P', b'3', b'Q', b'3', b'R', b'3', b'S', b'3', b'T', b'3', b'U', b'3', b'V', b'3', b'W', b'3', b'X', b'3', b'Y', b'3', b'Z', b'4', b'0', b'4', b'1', b'4', b'2', b'4', b'3', b'4', b'4', b'4', b'5', b'4', b'6', b'4', b'7', b'4', b'8', b'4', b'9', b'4', b'A', b'4', b'B', b'4', b'C', b'4', b'D', b'4', b'E', b'4', b'F', b'4', b'G', b'4', b'H', b'4', b'I', b'4', b'J', b'4', b'K', b'4', b'L', b'4', b'M', b'4', b'N', b'4', b'O', b'4', b'P', b'4', b'Q', b'4', b'R', b'4', b'S', b'4', b'T', b'4', b'U', b'4', b'V', b'4', b'W', b'4', b'X', b'4', b'Y', b'4', b'Z', b'5', b'0', b'5', b'1', b'5', b'2', b'5', b'3', b'5', b'4', b'5', b'5', b'5', b'6', b'5', b'7', b'5', b'8', b'5', b'9', b'5', b'A', b'5', b'B', b'5', b'C', b'5', b'D', b'5', b'E', b'5', b'F', b'5', b'G', b'5', b'H', b'5', b'I', b'5', b'J', b'5', b'K', b'5', b'L', b'5', b'M', b'5', b'N', b'5', b'O', b'5', b'P', b'5', b'Q', b'5', b'R', b'5', b'S', b'5', b'T', b'5', b'U', b'5', b'V', b'5', b'W', b'5', b'X', b'5', b'Y', b'5', b'Z', b'6', b'0', b'6', b'1', b'6', b'2', b'6', b'3', b'6', b'4', b'6', b'5', b'6', b'6', b'6', b'7', b'6', b'8', b'6', b'9', b'6', b'A', b'6', b'B', b'6', b'C', b'6', b'D', b'6', b'E', b'6', b'F', b'6', b'G', b'6', b'H', b'6', b'I', b'6', b'J', b'6', b'K', b'6', b'L', b'6', b'M', b'6', b'N', b'6', b'O', b'6', b'P', b'6', b'Q', b'6', b'R', b'6', b'S', b'6', b'T', b'6', b'U', b'6', b'V', b'6', b'W', b'6', b'X', b'6', b'Y', b'6', b'Z', b'7', b'0', b'7', b'1', b'7', b'2', b'7', b'3', b'7', b'4', b'7', b'5', b'7', b'6', b'7', b'7', b'7', b'8', b'7', b'9', b'7', b'A', b'7', b'B', b'7', b'C', b'7', b'D', b'7', b'E', b'7', b'F', b'7', b'G', b'7', b'H', b'7', b'I', b'7', b'J', b'7', b'K', b'7', b'L', b'7', b'M', b'7', b'N', b'7', b'O', b'7', b'P', b'7', b'Q', b'7', b'R', b'7', b'S', b'7', b'T', b'7', b'U', b'7', b'V', b'7', b'W', b'7', b'X', b'7', b'Y', b'7', b'Z', b'8', b'0', b'8', b'1', b'8', b'2', b'8', b'3', b'8', b'4', b'8', b'5', b'8', b'6', b'8', b'7', b'8', b'8', b'8', b'9', b'8', b'A', b'8', b'B', b'8', b'C', b'8', b'D', b'8', b'E', b'8', b'F', b'8', b'G', b'8', b'H', b'8', b'I', b'8', b'J', b'8', b'K', b'8', b'L', b'8', b'M', b'8', b'N', b'8', b'O', b'8', b'P', b'8', b'Q', b'8', b'R', b'8', b'S', b'8', b'T', b'8', b'U', b'8', b'V', b'8', b'W', b'8', b'X', b'8', b'Y', b'8', b'Z', b'9', b'0', b'9', b'1', b'9', b'2', b'9', b'3', b'9', b'4', b'9', b'5', b'9', b'6', b'9', b'7', b'9', b'8', b'9', b'9', b'9', b'A', b'9', b'B', b'9', b'C', b'9', b'D', b'9', b'E', b'9', b'F', b'9', b'G', b'9', b'H', b'9', b'I', b'9', b'J', b'9', b'K', b'9', b'L', b'9', b'M', b'9', b'N', b'9', b'O', b'9', b'P', b'9', b'Q', b'9', b'R', b'9', b'S', b'9', b'T', b'9', b'U', b'9', b'V', b'9', b'W', b'9', b'X', b'9', b'Y', b'9', b'Z', b'A', b'0', b'A', b'1', b'A', b'2', b'A', b'3', b'A', b'4', b'A', b'5', b'A', b'6', b'A', b'7', b'A', b'8', b'A', b'9', b'A', b'A', b'A', b'B', b'A', b'C', b'A', b'D', b'A', b'E', b'A', b'F', b'A', b'G', b'A', b'H', b'A', b'I', b'A', b'J', b'A', b'K', b'A', b'L', b'A', b'M', b'A', b'N', b'A', b'O', b'A', b'P', b'A', b'Q', b'A', b'R', b'A', b'S', b'A', b'T', b'A', b'U', b'A', b'V', b'A', b'W', b'A', b'X', b'A', b'Y', b'A', b'Z', b'B', b'0', b'B', b'1', b'B', b'2', b'B', b'3', b'B', b'4', b'B', b'5', b'B', b'6', b'B', b'7', b'B', b'8', b'B', b'9', b'B', b'A', b'B', b'B', b'B', b'C', b'B', b'D', b'B', b'E', b'B', b'F', b'B', b'G', b'B', b'H', b'B', b'I', b'B', b'J', b'B', b'K', b'B', b'L', b'B', b'M', b'B', b'N', b'B', b'O', b'B', b'P', b'B', b'Q', b'B', b'R', b'B', b'S', b'B', b'T', b'B', b'U', b'B', b'V', b'B', b'W', b'B', b'X', b'B', b'Y', b'B', b'Z', b'C', b'0', b'C', b'1', b'C', b'2', b'C', b'3', b'C', b'4', b'C', b'5', b'C', b'6', b'C', b'7', b'C', b'8', b'C', b'9', b'C', b'A', b'C', b'B', b'C', b'C', b'C', b'D', b'C', b'E', b'C', b'F', b'C', b'G', b'C', b'H', b'C', b'I', b'C', b'J', b'C', b'K', b'C', b'L', b'C', b'M', b'C', b'N', b'C', b'O', b'C', b'P', b'C', b'Q', b'C', b'R', b'C', b'S', b'C', b'T', b'C', b'U', b'C', b'V', b'C', b'W', b'C', b'X', b'C', b'Y', b'C', b'Z', b'D', b'0', b'D', b'1', b'D', b'2', b'D', b'3', b'D', b'4', b'D', b'5', b'D', b'6', b'D', b'7', b'D', b'8', b'D', b'9', b'D', b'A', b'D', b'B', b'D', b'C', b'D', b'D', b'D', b'E', b'D', b'F', b'D', b'G', b'D', b'H', b'D', b'I', b'D', b'J', b'D', b'K', b'D', b'L', b'D', b'M', b'D', b'N', b'D', b'O', b'D', b'P', b'D', b'Q', b'D', b'R', b'D', b'S', b'D', b'T', b'D', b'U', b'D', b'V', b'D', b'W', b'D', b'X', b'D', b'Y', b'D', b'Z', b'E', b'0', b'E', b'1', b'E', b'2', b'E', b'3', b'E', b'4', b'E', b'5', b'E', b'6', b'E', b'7', b'E', b'8', b'E', b'9', b'E', b'A', b'E', b'B', b'E', b'C', b'E', b'D', b'E', b'E', b'E', b'F', b'E', b'G', b'E', b'H', b'E', b'I', b'E', b'J', b'E', b'K', b'E', b'L', b'E', b'M', b'E', b'N', b'E', b'O', b'E', b'P', b'E', b'Q', b'E', b'R', b'E', b'S', b'E', b'T', b'E', b'U', b'E', b'V', b'E', b'W', b'E', b'X', b'E', b'Y', b'E', b'Z', b'F', b'0', b'F', b'1', b'F', b'2', b'F', b'3', b'F', b'4', b'F', b'5', b'F', b'6', b'F', b'7', b'F', b'8', b'F', b'9', b'F', b'A', b'F', b'B', b'F', b'C', b'F', b'D', b'F', b'E', b'F', b'F', b'F', b'G', b'F', b'H', b'F', b'I', b'F', b'J', b'F', b'K', b'F', b'L', b'F', b'M', b'F', b'N', b'F', b'O', b'F', b'P', b'F', b'Q', b'F', b'R', b'F', b'S', b'F', b'T', b'F', b'U', b'F', b'V', b'F', b'W', b'F', b'X', b'F', b'Y', b'F', b'Z', b'G', b'0', b'G', b'1', b'G', b'2', b'G', b'3', b'G', b'4', b'G', b'5', b'G', b'6', b'G', b'7', b'G', b'8', b'G', b'9', b'G', b'A', b'G', b'B', b'G', b'C', b'G', b'D', b'G', b'E', b'G', b'F', b'G', b'G', b'G', b'H', b'G', b'I', b'G', b'J', b'G', b'K', b'G', b'L', b'G', b'M', b'G', b'N', b'G', b'O', b'G', b'P', b'G', b'Q', b'G', b'R', b'G', b'S', b'G', b'T', b'G', b'U', b'G', b'V', b'G', b'W', b'G', b'X', b'G', b'Y', b'G', b'Z', b'H', b'0', b'H', b'1', b'H', b'2', b'H', b'3', b'H', b'4', b'H', b'5', b'H', b'6', b'H', b'7', b'H', b'8', b'H', b'9', b'H', b'A', b'H', b'B', b'H', b'C', b'H', b'D', b'H', b'E', b'H', b'F', b'H', b'G', b'H', b'H', b'H', b'I', b'H', b'J', b'H', b'K', b'H', b'L', b'H', b'M', b'H', b'N', b'H', b'O', b'H', b'P', b'H', b'Q', b'H', b'R', b'H', b'S', b'H', b'T', b'H', b'U', b'H', b'V', b'H', b'W', b'H', b'X', b'H', b'Y', b'H', b'Z', b'I', b'0', b'I', b'1', b'I', b'2', b'I', b'3', b'I', b'4', b'I', b'5', b'I', b'6', b'I', b'7', b'I', b'8', b'I', b'9', b'I', b'A', b'I', b'B', b'I', b'C', b'I', b'D', b'I', b'E', b'I', b'F', b'I', b'G', b'I', b'H', b'I', b'I', b'I', b'J', b'I', b'K', b'I', b'L', b'I', b'M', b'I', b'N', b'I', b'O', b'I', b'P', b'I', b'Q', b'I', b'R', b'I', b'S', b'I', b'T', b'I', b'U', b'I', b'V', b'I', b'W', b'I', b'X', b'I', b'Y', b'I', b'Z', b'J', b'0', b'J', b'1', b'J', b'2', b'J', b'3', b'J', b'4', b'J', b'5', b'J', b'6', b'J', b'7', b'J', b'8', b'J', b'9', b'J', b'A', b'J', b'B', b'J', b'C', b'J', b'D', b'J', b'E', b'J', b'F', b'J', b'G', b'J', b'H', b'J', b'I', b'J', b'J', b'J', b'K', b'J', b'L', b'J', b'M', b'J', b'N', b'J', b'O', b'J', b'P', b'J', b'Q', b'J', b'R', b'J', b'S', b'J', b'T', b'J', b'U', b'J', b'V', b'J', b'W', b'J', b'X', b'J', b'Y', b'J', b'Z', b'K', b'0', b'K', b'1', b'K', b'2', b'K', b'3', b'K', b'4', b'K', b'5', b'K', b'6', b'K', b'7', b'K', b'8', b'K', b'9', b'K', b'A', b'K', b'B', b'K', b'C', b'K', b'D', b'K', b'E', b'K', b'F', b'K', b'G', b'K', b'H', b'K', b'I', b'K', b'J', b'K', b'K', b'K', b'L', b'K', b'M', b'K', b'N', b'K', b'O', b'K', b'P', b'K', b'Q', b'K', b'R', b'K', b'S', b'K', b'T', b'K', b'U', b'K', b'V', b'K', b'W', b'K', b'X', b'K', b'Y', b'K', b'Z', b'L', b'0', b'L', b'1', b'L', b'2', b'L', b'3', b'L', b'4', b'L', b'5', b'L', b'6', b'L', b'7', b'L', b'8', b'L', b'9', b'L', b'A', b'L', b'B', b'L', b'C', b'L', b'D', b'L', b'E', b'L', b'F', b'L', b'G', b'L', b'H', b'L', b'I', b'L', b'J', b'L', b'K', b'L', b'L', b'L', b'M', b'L', b'N', b'L', b'O', b'L', b'P', b'L', b'Q', b'L', b'R', b'L', b'S', b'L', b'T', b'L', b'U', b'L', b'V', b'L', b'W', b'L', b'X', b'L', b'Y', b'L', b'Z', b'M', b'0', b'M', b'1', b'M', b'2', b'M', b'3', b'M', b'4', b'M', b'5', b'M', b'6', b'M', b'7', b'M', b'8', b'M', b'9', b'M', b'A', b'M', b'B', b'M', b'C', b'M', b'D', b'M', b'E', b'M', b'F', b'M', b'G', b'M', b'H', b'M', b'I', b'M', b'J', b'M', b'K', b'M', b'L', b'M', b'M', b'M', b'N', b'M', b'O', b'M', b'P', b'M', b'Q', b'M', b'R', b'M', b'S', b'M', b'T', b'M', b'U', b'M', b'V', b'M', b'W', b'M', b'X', b'M', b'Y', b'M', b'Z', b'N', b'0', b'N', b'1', b'N', b'2', b'N', b'3', b'N', b'4', b'N', b'5', b'N', b'6', b'N', b'7', b'N', b'8', b'N', b'9', b'N', b'A', b'N', b'B', b'N', b'C', b'N', b'D', b'N', b'E', b'N', b'F', b'N', b'G', b'N', b'H', b'N', b'I', b'N', b'J', b'N', b'K', b'N', b'L', b'N', b'M', b'N', b'N', b'N', b'O', b'N', b'P', b'N', b'Q', b'N', b'R', b'N', b'S', b'N', b'T', b'N', b'U', b'N', b'V', b'N', b'W', b'N', b'X', b'N', b'Y', b'N', b'Z', b'O', b'0', b'O', b'1', b'O', b'2', b'O', b'3', b'O', b'4', b'O', b'5', b'O', b'6', b'O', b'7', b'O', b'8', b'O', b'9', b'O', b'A', b'O', b'B', b'O', b'C', b'O', b'D', b'O', b'E', b'O', b'F', b'O', b'G', b'O', b'H', b'O', b'I', b'O', b'J', b'O', b'K', b'O', b'L', b'O', b'M', b'O', b'N', b'O', b'O', b'O', b'P', b'O', b'Q', b'O', b'R', b'O', b'S', b'O', b'T', b'O', b'U', b'O', b'V', b'O', b'W', b'O', b'X', b'O', b'Y', b'O', b'Z', b'P', b'0', b'P', b'1', b'P', b'2', b'P', b'3', b'P', b'4', b'P', b'5', b'P', b'6', b'P', b'7', b'P', b'8', b'P', b'9', b'P', b'A', b'P', b'B', b'P', b'C', b'P', b'D', b'P', b'E', b'P', b'F', b'P', b'G', b'P', b'H', b'P', b'I', b'P', b'J', b'P', b'K', b'P', b'L', b'P', b'M', b'P', b'N', b'P', b'O', b'P', b'P', b'P', b'Q', b'P', b'R', b'P', b'S', b'P', b'T', b'P', b'U', b'P', b'V', b'P', b'W', b'P', b'X', b'P', b'Y', b'P', b'Z', b'Q', b'0', b'Q', b'1', b'Q', b'2', b'Q', b'3', b'Q', b'4', b'Q', b'5', b'Q', b'6', b'Q', b'7', b'Q', b'8', b'Q', b'9', b'Q', b'A', b'Q', b'B', b'Q', b'C', b'Q', b'D', b'Q', b'E', b'Q', b'F', b'Q', b'G', b'Q', b'H', b'Q', b'I', b'Q', b'J', b'Q', b'K', b'Q', b'L', b'Q', b'M', b'Q', b'N', b'Q', b'O', b'Q', b'P', b'Q', b'Q', b'Q', b'R', b'Q', b'S', b'Q', b'T', b'Q', b'U', b'Q', b'V', b'Q', b'W', b'Q', b'X', b'Q', b'Y', b'Q', b'Z', b'R', b'0', b'R', b'1', b'R', b'2', b'R', b'3', b'R', b'4', b'R', b'5', b'R', b'6', b'R', b'7', b'R', b'8', b'R', b'9', b'R', b'A', b'R', b'B', b'R', b'C', b'R', b'D', b'R', b'E', b'R', b'F', b'R', b'G', b'R', b'H', b'R', b'I', b'R', b'J', b'R', b'K', b'R', b'L', b'R', b'M', b'R', b'N', b'R', b'O', b'R', b'P', b'R', b'Q', b'R', b'R', b'R', b'S', b'R', b'T', b'R', b'U', b'R', b'V', b'R', b'W', b'R', b'X', b'R', b'Y', b'R', b'Z', b'S', b'0', b'S', b'1', b'S', b'2', b'S', b'3', b'S', b'4', b'S', b'5', b'S', b'6', b'S', b'7', b'S', b'8', b'S', b'9', b'S', b'A', b'S', b'B', b'S', b'C', b'S', b'D', b'S', b'E', b'S', b'F', b'S', b'G', b'S', b'H', b'S', b'I', b'S', b'J', b'S', b'K', b'S', b'L', b'S', b'M', b'S', b'N', b'S', b'O', b'S', b'P', b'S', b'Q', b'S', b'R', b'S', b'S', b'S', b'T', b'S', b'U', b'S', b'V', b'S', b'W', b'S', b'X', b'S', b'Y', b'S', b'Z', b'T', b'0', b'T', b'1', b'T', b'2', b'T', b'3', b'T', b'4', b'T', b'5', b'T', b'6', b'T', b'7', b'T', b'8', b'T', b'9', b'T', b'A', b'T', b'B', b'T', b'C', b'T', b'D', b'T', b'E', b'T', b'F', b'T', b'G', b'T', b'H', b'T', b'I', b'T', b'J', b'T', b'K', b'T', b'L', b'T', b'M', b'T', b'N', b'T', b'O', b'T', b'P', b'T', b'Q', b'T', b'R', b'T', b'S', b'T', b'T', b'T', b'U', b'T', b'V', b'T', b'W', b'T', b'X', b'T', b'Y', b'T', b'Z', b'U', b'0', b'U', b'1', b'U', b'2', b'U', b'3', b'U', b'4', b'U', b'5', b'U', b'6', b'U', b'7', b'U', b'8', b'U', b'9', b'U', b'A', b'U', b'B', b'U', b'C', b'U', b'D', b'U', b'E', b'U', b'F', b'U', b'G', b'U', b'H', b'U', b'I', b'U', b'J', b'U', b'K', b'U', b'L', b'U', b'M', b'U', b'N', b'U', b'O', b'U', b'P', b'U', b'Q', b'U', b'R', b'U', b'S', b'U', b'T', b'U', b'U', b'U', b'V', b'U', b'W', b'U', b'X', b'U', b'Y', b'U', b'Z', b'V', b'0', b'V', b'1', b'V', b'2', b'V', b'3', b'V', b'4', b'V', b'5', b'V', b'6', b'V', b'7', b'V', b'8', b'V', b'9', b'V', b'A', b'V', b'B', b'V', b'C', b'V', b'D', b'V', b'E', b'V', b'F', b'V', b'G', b'V', b'H', b'V', b'I', b'V', b'J', b'V', b'K', b'V', b'L', b'V', b'M', b'V', b'N', b'V', b'O', b'V', b'P', b'V', b'Q', b'V', b'R', b'V', b'S', b'V', b'T', b'V', b'U', b'V', b'V', b'V', b'W', b'V', b'X', b'V', b'Y', b'V', b'Z', b'W', b'0', b'W', b'1', b'W', b'2', b'W', b'3', b'W', b'4', b'W', b'5', b'W', b'6', b'W', b'7', b'W', b'8', b'W', b'9', b'W', b'A', b'W', b'B', b'W', b'C', b'W', b'D', b'W', b'E', b'W', b'F', b'W', b'G', b'W', b'H', b'W', b'I', b'W', b'J', b'W', b'K', b'W', b'L', b'W', b'M', b'W', b'N', b'W', b'O', b'W', b'P', b'W', b'Q', b'W', b'R', b'W', b'S', b'W', b'T', b'W', b'U', b'W', b'V', b'W', b'W', b'W', b'X', b'W', b'Y', b'W', b'Z', b'X', b'0', b'X', b'1', b'X', b'2', b'X', b'3', b'X', b'4', b'X', b'5', b'X', b'6', b'X', b'7', b'X', b'8', b'X', b'9', b'X', b'A', b'X', b'B', b'X', b'C', b'X', b'D', b'X', b'E', b'X', b'F', b'X', b'G', b'X', b'H', b'X', b'I', b'X', b'J', b'X', b'K', b'X', b'L', b'X', b'M', b'X', b'N', b'X', b'O', b'X', b'P', b'X', b'Q', b'X', b'R', b'X', b'S', b'X', b'T', b'X', b'U', b'X', b'V', b'X', b'W', b'X', b'X', b'X', b'Y', b'X', b'Z', b'Y', b'0', b'Y', b'1', b'Y', b'2', b'Y', b'3', b'Y', b'4', b'Y', b'5', b'Y', b'6', b'Y', b'7', b'Y', b'8', b'Y', b'9', b'Y', b'A', b'Y', b'B', b'Y', b'C', b'Y', b'D', b'Y', b'E', b'Y', b'F', b'Y', b'G', b'Y', b'H', b'Y', b'I', b'Y', b'J', b'Y', b'K', b'Y', b'L', b'Y', b'M', b'Y', b'N', b'Y', b'O', b'Y', b'P', b'Y', b'Q', b'Y', b'R', b'Y', b'S', b'Y', b'T', b'Y', b'U', b'Y', b'V', b'Y', b'W', b'Y', b'X', b'Y', b'Y', b'Y', b'Z', b'Z', b'0', b'Z', b'1', b'Z', b'2', b'Z', b'3', b'Z', b'4', b'Z', b'5', b'Z', b'6', b'Z', b'7', b'Z', b'8', b'Z', b'9', b'Z', b'A', b'Z', b'B', b'Z', b'C', b'Z', b'D', b'Z', b'E', b'Z', b'F', b'Z', b'G', b'Z', b'H', b'Z', b'I', b'Z', b'J', b'Z', b'K', b'Z', b'L', b'Z', b'M', b'Z', b'N', b'Z', b'O', b'Z', b'P', b'Z', b'Q', b'Z', b'R', b'Z', b'S', b'Z', b'T', b'Z', b'U', b'Z', b'V', b'Z', b'W', b'Z', b'X', b'Z', b'Y', b'Z', b'Z'];
+}}  // cfg_if
+
+// EXACT EXPONENT
+
+/// Get exact exponent limit for radix.
+pub(crate) trait ExactExponent {
+    /// Get min and max exponent limits (exact) from radix.
+    fn exponent_limit<T: Integer>(radix: T) -> (i32, i32);
+
+    /// Get the number of digits that can be shifted from exponent to mantissa.
+    fn mantissa_limit<T: Integer>(radix: T) -> i32;
+}
+
+impl ExactExponent for f32 {
+    #[inline]
+    fn exponent_limit<T: Integer>(radix: T) -> (i32, i32) {
+        debug_assert_radix!(radix);
+        #[cfg(not(feature = "radix"))] {
+            (-10, 10)
+        }
+
+        #[cfg(feature = "radix")] {
+            match radix.as_i32() {
+                2  => (-149, 127),
+                3  => (-15, 15),
+                4  => (-74, 63),
+                5  => (-10, 10),
+                6  => (-15, 15),
+                7  => (-8, 8),
+                8  => (-49, 42),
+                9  => (-7, 7),
+                10 => (-10, 10),
+                11 => (-6, 6),
+                12 => (-15, 15),
+                13 => (-6, 6),
+                14 => (-8, 8),
+                15 => (-6, 6),
+                16 => (-37, 31),
+                17 => (-5, 5),
+                18 => (-7, 7),
+                19 => (-5, 5),
+                20 => (-10, 10),
+                21 => (-5, 5),
+                22 => (-6, 6),
+                23 => (-5, 5),
+                24 => (-15, 15),
+                25 => (-5, 5),
+                26 => (-6, 6),
+                27 => (-5, 5),
+                28 => (-8, 8),
+                29 => (-4, 4),
+                30 => (-6, 6),
+                31 => (-4, 4),
+                32 => (-29, 25),
+                33 => (-4, 4),
+                34 => (-5, 5),
+                35 => (-4, 4),
+                36 => (-7, 7),
+                // Invalid radix
+                _  => unreachable!(),
+            }
+        }
+    }
+
+    #[inline]
+    fn mantissa_limit<T: Integer>(radix: T) -> i32 {
+        debug_assert_radix!(radix);
+        #[cfg(not(feature = "radix"))] {
+            7
+        }
+
+        #[cfg(feature = "radix")] {
+            match radix.as_i32() {
+                2  => 23,
+                3  => 15,
+                4  => 11,
+                5  => 10,
+                6  => 9,
+                7  => 8,
+                8  => 7,
+                9  => 7,
+                10 => 7,
+                11 => 6,
+                12 => 6,
+                13 => 6,
+                14 => 6,
+                15 => 6,
+                16 => 5,
+                17 => 5,
+                18 => 5,
+                19 => 5,
+                20 => 5,
+                21 => 5,
+                22 => 5,
+                23 => 5,
+                24 => 5,
+                25 => 5,
+                26 => 5,
+                27 => 5,
+                28 => 4,
+                29 => 4,
+                30 => 4,
+                31 => 4,
+                32 => 4,
+                33 => 4,
+                34 => 4,
+                35 => 4,
+                36 => 4,
+                // Invalid radix
+                _  => unreachable!(),
+            }
+        }
+    }
+}
+
+/// Precalculated min and max exponents for values exactly representable as f64.
+///
+/// Table of values where `radix**min` and `radix**max` are the limits of types
+/// exactly representable as an f64.
+
+impl ExactExponent for f64 {
+    #[inline]
+    fn exponent_limit<T: Integer>(radix: T) -> (i32, i32) {
+        debug_assert_radix!(radix);
+        #[cfg(not(feature = "radix"))] {
+            (-22, 22)
+        }
+
+        #[cfg(feature = "radix")] {
+            match radix.as_i32() {
+                2  => (-1074, 1023),
+                3  => (-33, 33),
+                4  => (-537, 511),
+                5  => (-22, 22),
+                6  => (-33, 33),
+                7  => (-18, 18),
+                8  => (-358, 341),
+                9  => (-16, 16),
+                10 => (-22, 22),
+                11 => (-15, 15),
+                12 => (-33, 33),
+                13 => (-14, 14),
+                14 => (-18, 18),
+                15 => (-13, 13),
+                16 => (-268, 255),
+                17 => (-12, 12),
+                18 => (-16, 16),
+                19 => (-12, 12),
+                20 => (-22, 22),
+                21 => (-12, 12),
+                22 => (-15, 15),
+                23 => (-11, 11),
+                24 => (-33, 33),
+                25 => (-11, 11),
+                26 => (-14, 14),
+                27 => (-11, 11),
+                28 => (-18, 18),
+                29 => (-10, 10),
+                30 => (-13, 13),
+                31 => (-10, 10),
+                32 => (-214, 204),
+                33 => (-10, 10),
+                34 => (-12, 12),
+                35 => (-10, 10),
+                36 => (-16, 16),
+                // Invalid radix
+                _  => unreachable!(),
+            }
+        }
+    }
+
+    #[inline]
+    fn mantissa_limit<T: Integer>(radix: T) -> i32 {
+        debug_assert_radix!(radix);
+        #[cfg(not(feature = "radix"))] {
+            15
+        }
+
+        #[cfg(feature = "radix")] {
+            match radix.as_i32() {
+                2  => 52,
+                3  => 33,
+                4  => 26,
+                5  => 22,
+                6  => 20,
+                7  => 18,
+                8  => 17,
+                9  => 16,
+                10 => 15,
+                11 => 15,
+                12 => 14,
+                13 => 14,
+                14 => 13,
+                15 => 13,
+                16 => 13,
+                17 => 12,
+                18 => 12,
+                19 => 12,
+                20 => 12,
+                21 => 12,
+                22 => 11,
+                23 => 11,
+                24 => 11,
+                25 => 11,
+                26 => 11,
+                27 => 11,
+                28 => 11,
+                29 => 10,
+                30 => 10,
+                31 => 10,
+                32 => 10,
+                33 => 10,
+                34 => 10,
+                35 => 10,
+                36 => 10,
+                // Invalid radix
+                _  => unreachable!(),
+            }
+        }
+    }
+}
+
+// Conditionally compile the radix POWI tables.
+// These tables contain all the values that can be exactly represented
+// by a given float of a certain size.
+//
+// Total array storage: 2.1 KB (f32) + 21.5 KB (f64).
+// The total performance enhancements save ~350+ clock cycles (x86) or
+// ~100 clock cycles (x87) for the FYL2X and F2XM1 instructions, require
+// to compute a power. This should be a significant performance win.
+
+cfg_if! {
+if #[cfg(feature = "correct")] {
+// TRANSMUTE
+
+/// Hacky transmute for 32-bit and 64-bit floats.
+///
+/// Remove when `f32::from_bits` and `f64::from_bits` become const
+/// in stable.
+#[cfg(feature = "radix")]
+union Transmute<U: Copy, F: Copy> {
+    u: U,
+    f: F,
+}
+
+// TABLE POW
+
+/// Calculate powers using pre-calculated lookup tables.
+/// No error-checking occurs, these methods are not safe.
+pub(crate) trait TablePower {
+    /// Exponent
+    const POW2_EXPONENT_BIAS: i32;
+
+    /// Get power of 2 from exponent.
+    #[cfg(feature = "radix")]
+    fn table_pow2(exponent: i32) -> Self;
+
+    /// Get power of 2 from exponent.
+    fn table_pow<T: Integer>(radix: T, exponent: i32) -> Self;
+}
+
+// F32
+
+/// Hacky transmute for 32-bit values.
+#[cfg(feature = "radix")]
+type F32Transmute = Transmute<u32, f32>;
+
+/// Precalculated values of 2**i for i in range [-149, 127].
+#[cfg(feature = "radix")]
+const F32_POW2: [f32; 277] = unsafe {[
+    // Denormal floats ([-149, -127])
+    F32Transmute { u: 0x00000001 }.f,
+    F32Transmute { u: 0x00000002 }.f,
+    F32Transmute { u: 0x00000004 }.f,
+    F32Transmute { u: 0x00000008 }.f,
+    F32Transmute { u: 0x00000010 }.f,
+    F32Transmute { u: 0x00000020 }.f,
+    F32Transmute { u: 0x00000040 }.f,
+    F32Transmute { u: 0x00000080 }.f,
+    F32Transmute { u: 0x00000100 }.f,
+    F32Transmute { u: 0x00000200 }.f,
+    F32Transmute { u: 0x00000400 }.f,
+    F32Transmute { u: 0x00000800 }.f,
+    F32Transmute { u: 0x00001000 }.f,
+    F32Transmute { u: 0x00002000 }.f,
+    F32Transmute { u: 0x00004000 }.f,
+    F32Transmute { u: 0x00008000 }.f,
+    F32Transmute { u: 0x00010000 }.f,
+    F32Transmute { u: 0x00020000 }.f,
+    F32Transmute { u: 0x00040000 }.f,
+    F32Transmute { u: 0x00080000 }.f,
+    F32Transmute { u: 0x00100000 }.f,
+    F32Transmute { u: 0x00200000 }.f,
+    F32Transmute { u: 0x00400000 }.f,
+
+    // Regular floats (exponent only, [-126, 127])
+    F32Transmute { u: 0x00800000 }.f,
+    F32Transmute { u: 0x01000000 }.f,
+    F32Transmute { u: 0x01800000 }.f,
+    F32Transmute { u: 0x02000000 }.f,
+    F32Transmute { u: 0x02800000 }.f,
+    F32Transmute { u: 0x03000000 }.f,
+    F32Transmute { u: 0x03800000 }.f,
+    F32Transmute { u: 0x04000000 }.f,
+    F32Transmute { u: 0x04800000 }.f,
+    F32Transmute { u: 0x05000000 }.f,
+    F32Transmute { u: 0x05800000 }.f,
+    F32Transmute { u: 0x06000000 }.f,
+    F32Transmute { u: 0x06800000 }.f,
+    F32Transmute { u: 0x07000000 }.f,
+    F32Transmute { u: 0x07800000 }.f,
+    F32Transmute { u: 0x08000000 }.f,
+    F32Transmute { u: 0x08800000 }.f,
+    F32Transmute { u: 0x09000000 }.f,
+    F32Transmute { u: 0x09800000 }.f,
+    F32Transmute { u: 0x0A000000 }.f,
+    F32Transmute { u: 0x0A800000 }.f,
+    F32Transmute { u: 0x0B000000 }.f,
+    F32Transmute { u: 0x0B800000 }.f,
+    F32Transmute { u: 0x0C000000 }.f,
+    F32Transmute { u: 0x0C800000 }.f,
+    F32Transmute { u: 0x0D000000 }.f,
+    F32Transmute { u: 0x0D800000 }.f,
+    F32Transmute { u: 0x0E000000 }.f,
+    F32Transmute { u: 0x0E800000 }.f,
+    F32Transmute { u: 0x0F000000 }.f,
+    F32Transmute { u: 0x0F800000 }.f,
+    F32Transmute { u: 0x10000000 }.f,
+    F32Transmute { u: 0x10800000 }.f,
+    F32Transmute { u: 0x11000000 }.f,
+    F32Transmute { u: 0x11800000 }.f,
+    F32Transmute { u: 0x12000000 }.f,
+    F32Transmute { u: 0x12800000 }.f,
+    F32Transmute { u: 0x13000000 }.f,
+    F32Transmute { u: 0x13800000 }.f,
+    F32Transmute { u: 0x14000000 }.f,
+    F32Transmute { u: 0x14800000 }.f,
+    F32Transmute { u: 0x15000000 }.f,
+    F32Transmute { u: 0x15800000 }.f,
+    F32Transmute { u: 0x16000000 }.f,
+    F32Transmute { u: 0x16800000 }.f,
+    F32Transmute { u: 0x17000000 }.f,
+    F32Transmute { u: 0x17800000 }.f,
+    F32Transmute { u: 0x18000000 }.f,
+    F32Transmute { u: 0x18800000 }.f,
+    F32Transmute { u: 0x19000000 }.f,
+    F32Transmute { u: 0x19800000 }.f,
+    F32Transmute { u: 0x1A000000 }.f,
+    F32Transmute { u: 0x1A800000 }.f,
+    F32Transmute { u: 0x1B000000 }.f,
+    F32Transmute { u: 0x1B800000 }.f,
+    F32Transmute { u: 0x1C000000 }.f,
+    F32Transmute { u: 0x1C800000 }.f,
+    F32Transmute { u: 0x1D000000 }.f,
+    F32Transmute { u: 0x1D800000 }.f,
+    F32Transmute { u: 0x1E000000 }.f,
+    F32Transmute { u: 0x1E800000 }.f,
+    F32Transmute { u: 0x1F000000 }.f,
+    F32Transmute { u: 0x1F800000 }.f,
+    F32Transmute { u: 0x20000000 }.f,
+    F32Transmute { u: 0x20800000 }.f,
+    F32Transmute { u: 0x21000000 }.f,
+    F32Transmute { u: 0x21800000 }.f,
+    F32Transmute { u: 0x22000000 }.f,
+    F32Transmute { u: 0x22800000 }.f,
+    F32Transmute { u: 0x23000000 }.f,
+    F32Transmute { u: 0x23800000 }.f,
+    F32Transmute { u: 0x24000000 }.f,
+    F32Transmute { u: 0x24800000 }.f,
+    F32Transmute { u: 0x25000000 }.f,
+    F32Transmute { u: 0x25800000 }.f,
+    F32Transmute { u: 0x26000000 }.f,
+    F32Transmute { u: 0x26800000 }.f,
+    F32Transmute { u: 0x27000000 }.f,
+    F32Transmute { u: 0x27800000 }.f,
+    F32Transmute { u: 0x28000000 }.f,
+    F32Transmute { u: 0x28800000 }.f,
+    F32Transmute { u: 0x29000000 }.f,
+    F32Transmute { u: 0x29800000 }.f,
+    F32Transmute { u: 0x2A000000 }.f,
+    F32Transmute { u: 0x2A800000 }.f,
+    F32Transmute { u: 0x2B000000 }.f,
+    F32Transmute { u: 0x2B800000 }.f,
+    F32Transmute { u: 0x2C000000 }.f,
+    F32Transmute { u: 0x2C800000 }.f,
+    F32Transmute { u: 0x2D000000 }.f,
+    F32Transmute { u: 0x2D800000 }.f,
+    F32Transmute { u: 0x2E000000 }.f,
+    F32Transmute { u: 0x2E800000 }.f,
+    F32Transmute { u: 0x2F000000 }.f,
+    F32Transmute { u: 0x2F800000 }.f,
+    F32Transmute { u: 0x30000000 }.f,
+    F32Transmute { u: 0x30800000 }.f,
+    F32Transmute { u: 0x31000000 }.f,
+    F32Transmute { u: 0x31800000 }.f,
+    F32Transmute { u: 0x32000000 }.f,
+    F32Transmute { u: 0x32800000 }.f,
+    F32Transmute { u: 0x33000000 }.f,
+    F32Transmute { u: 0x33800000 }.f,
+    F32Transmute { u: 0x34000000 }.f,
+    F32Transmute { u: 0x34800000 }.f,
+    F32Transmute { u: 0x35000000 }.f,
+    F32Transmute { u: 0x35800000 }.f,
+    F32Transmute { u: 0x36000000 }.f,
+    F32Transmute { u: 0x36800000 }.f,
+    F32Transmute { u: 0x37000000 }.f,
+    F32Transmute { u: 0x37800000 }.f,
+    F32Transmute { u: 0x38000000 }.f,
+    F32Transmute { u: 0x38800000 }.f,
+    F32Transmute { u: 0x39000000 }.f,
+    F32Transmute { u: 0x39800000 }.f,
+    F32Transmute { u: 0x3A000000 }.f,
+    F32Transmute { u: 0x3A800000 }.f,
+    F32Transmute { u: 0x3B000000 }.f,
+    F32Transmute { u: 0x3B800000 }.f,
+    F32Transmute { u: 0x3C000000 }.f,
+    F32Transmute { u: 0x3C800000 }.f,
+    F32Transmute { u: 0x3D000000 }.f,
+    F32Transmute { u: 0x3D800000 }.f,
+    F32Transmute { u: 0x3E000000 }.f,
+    F32Transmute { u: 0x3E800000 }.f,
+    F32Transmute { u: 0x3F000000 }.f,
+    F32Transmute { u: 0x3F800000 }.f,
+    F32Transmute { u: 0x40000000 }.f,
+    F32Transmute { u: 0x40800000 }.f,
+    F32Transmute { u: 0x41000000 }.f,
+    F32Transmute { u: 0x41800000 }.f,
+    F32Transmute { u: 0x42000000 }.f,
+    F32Transmute { u: 0x42800000 }.f,
+    F32Transmute { u: 0x43000000 }.f,
+    F32Transmute { u: 0x43800000 }.f,
+    F32Transmute { u: 0x44000000 }.f,
+    F32Transmute { u: 0x44800000 }.f,
+    F32Transmute { u: 0x45000000 }.f,
+    F32Transmute { u: 0x45800000 }.f,
+    F32Transmute { u: 0x46000000 }.f,
+    F32Transmute { u: 0x46800000 }.f,
+    F32Transmute { u: 0x47000000 }.f,
+    F32Transmute { u: 0x47800000 }.f,
+    F32Transmute { u: 0x48000000 }.f,
+    F32Transmute { u: 0x48800000 }.f,
+    F32Transmute { u: 0x49000000 }.f,
+    F32Transmute { u: 0x49800000 }.f,
+    F32Transmute { u: 0x4A000000 }.f,
+    F32Transmute { u: 0x4A800000 }.f,
+    F32Transmute { u: 0x4B000000 }.f,
+    F32Transmute { u: 0x4B800000 }.f,
+    F32Transmute { u: 0x4C000000 }.f,
+    F32Transmute { u: 0x4C800000 }.f,
+    F32Transmute { u: 0x4D000000 }.f,
+    F32Transmute { u: 0x4D800000 }.f,
+    F32Transmute { u: 0x4E000000 }.f,
+    F32Transmute { u: 0x4E800000 }.f,
+    F32Transmute { u: 0x4F000000 }.f,
+    F32Transmute { u: 0x4F800000 }.f,
+    F32Transmute { u: 0x50000000 }.f,
+    F32Transmute { u: 0x50800000 }.f,
+    F32Transmute { u: 0x51000000 }.f,
+    F32Transmute { u: 0x51800000 }.f,
+    F32Transmute { u: 0x52000000 }.f,
+    F32Transmute { u: 0x52800000 }.f,
+    F32Transmute { u: 0x53000000 }.f,
+    F32Transmute { u: 0x53800000 }.f,
+    F32Transmute { u: 0x54000000 }.f,
+    F32Transmute { u: 0x54800000 }.f,
+    F32Transmute { u: 0x55000000 }.f,
+    F32Transmute { u: 0x55800000 }.f,
+    F32Transmute { u: 0x56000000 }.f,
+    F32Transmute { u: 0x56800000 }.f,
+    F32Transmute { u: 0x57000000 }.f,
+    F32Transmute { u: 0x57800000 }.f,
+    F32Transmute { u: 0x58000000 }.f,
+    F32Transmute { u: 0x58800000 }.f,
+    F32Transmute { u: 0x59000000 }.f,
+    F32Transmute { u: 0x59800000 }.f,
+    F32Transmute { u: 0x5A000000 }.f,
+    F32Transmute { u: 0x5A800000 }.f,
+    F32Transmute { u: 0x5B000000 }.f,
+    F32Transmute { u: 0x5B800000 }.f,
+    F32Transmute { u: 0x5C000000 }.f,
+    F32Transmute { u: 0x5C800000 }.f,
+    F32Transmute { u: 0x5D000000 }.f,
+    F32Transmute { u: 0x5D800000 }.f,
+    F32Transmute { u: 0x5E000000 }.f,
+    F32Transmute { u: 0x5E800000 }.f,
+    F32Transmute { u: 0x5F000000 }.f,
+    F32Transmute { u: 0x5F800000 }.f,
+    F32Transmute { u: 0x60000000 }.f,
+    F32Transmute { u: 0x60800000 }.f,
+    F32Transmute { u: 0x61000000 }.f,
+    F32Transmute { u: 0x61800000 }.f,
+    F32Transmute { u: 0x62000000 }.f,
+    F32Transmute { u: 0x62800000 }.f,
+    F32Transmute { u: 0x63000000 }.f,
+    F32Transmute { u: 0x63800000 }.f,
+    F32Transmute { u: 0x64000000 }.f,
+    F32Transmute { u: 0x64800000 }.f,
+    F32Transmute { u: 0x65000000 }.f,
+    F32Transmute { u: 0x65800000 }.f,
+    F32Transmute { u: 0x66000000 }.f,
+    F32Transmute { u: 0x66800000 }.f,
+    F32Transmute { u: 0x67000000 }.f,
+    F32Transmute { u: 0x67800000 }.f,
+    F32Transmute { u: 0x68000000 }.f,
+    F32Transmute { u: 0x68800000 }.f,
+    F32Transmute { u: 0x69000000 }.f,
+    F32Transmute { u: 0x69800000 }.f,
+    F32Transmute { u: 0x6A000000 }.f,
+    F32Transmute { u: 0x6A800000 }.f,
+    F32Transmute { u: 0x6B000000 }.f,
+    F32Transmute { u: 0x6B800000 }.f,
+    F32Transmute { u: 0x6C000000 }.f,
+    F32Transmute { u: 0x6C800000 }.f,
+    F32Transmute { u: 0x6D000000 }.f,
+    F32Transmute { u: 0x6D800000 }.f,
+    F32Transmute { u: 0x6E000000 }.f,
+    F32Transmute { u: 0x6E800000 }.f,
+    F32Transmute { u: 0x6F000000 }.f,
+    F32Transmute { u: 0x6F800000 }.f,
+    F32Transmute { u: 0x70000000 }.f,
+    F32Transmute { u: 0x70800000 }.f,
+    F32Transmute { u: 0x71000000 }.f,
+    F32Transmute { u: 0x71800000 }.f,
+    F32Transmute { u: 0x72000000 }.f,
+    F32Transmute { u: 0x72800000 }.f,
+    F32Transmute { u: 0x73000000 }.f,
+    F32Transmute { u: 0x73800000 }.f,
+    F32Transmute { u: 0x74000000 }.f,
+    F32Transmute { u: 0x74800000 }.f,
+    F32Transmute { u: 0x75000000 }.f,
+    F32Transmute { u: 0x75800000 }.f,
+    F32Transmute { u: 0x76000000 }.f,
+    F32Transmute { u: 0x76800000 }.f,
+    F32Transmute { u: 0x77000000 }.f,
+    F32Transmute { u: 0x77800000 }.f,
+    F32Transmute { u: 0x78000000 }.f,
+    F32Transmute { u: 0x78800000 }.f,
+    F32Transmute { u: 0x79000000 }.f,
+    F32Transmute { u: 0x79800000 }.f,
+    F32Transmute { u: 0x7A000000 }.f,
+    F32Transmute { u: 0x7A800000 }.f,
+    F32Transmute { u: 0x7B000000 }.f,
+    F32Transmute { u: 0x7B800000 }.f,
+    F32Transmute { u: 0x7C000000 }.f,
+    F32Transmute { u: 0x7C800000 }.f,
+    F32Transmute { u: 0x7D000000 }.f,
+    F32Transmute { u: 0x7D800000 }.f,
+    F32Transmute { u: 0x7E000000 }.f,
+    F32Transmute { u: 0x7E800000 }.f,
+    F32Transmute { u: 0x7F000000 }.f,
+]};
+
+/// Precalculated values of radix**i for i in range [0, arr.len()-1].
+/// Each value can be **exactly** represented as that type.
+const F32_POW10: [f32; 11] = [1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 10000000.0, 100000000.0, 1000000000.0, 10000000000.0];
+
+#[cfg(feature = "radix")]
+const F32_POW3: [f32; 16] = [1.0, 3.0, 9.0, 27.0, 81.0, 243.0, 729.0, 2187.0, 6561.0, 19683.0, 59049.0, 177147.0, 531441.0, 1594323.0, 4782969.0, 14348907.0];
+
+#[cfg(feature = "radix")]
+const F32_POW5: [f32; 11] = [1.0, 5.0, 25.0, 125.0, 625.0, 3125.0, 15625.0, 78125.0, 390625.0, 1953125.0, 9765625.0];
+
+#[cfg(feature = "radix")]
+const F32_POW6: [f32; 16] = [1.0, 6.0, 36.0, 216.0, 1296.0, 7776.0, 46656.0, 279936.0, 1679616.0, 10077696.0, 60466176.0, 362797056.0, 2176782336.0, 13060694016.0, 78364164096.0, 470184984576.0];
+
+#[cfg(feature = "radix")]
+const F32_POW7: [f32; 9] = [1.0, 7.0, 49.0, 343.0, 2401.0, 16807.0, 117649.0, 823543.0, 5764801.0];
+
+#[cfg(feature = "radix")]
+const F32_POW9: [f32; 8] = [1.0, 9.0, 81.0, 729.0, 6561.0, 59049.0, 531441.0, 4782969.0];
+
+#[cfg(feature = "radix")]
+const F32_POW11: [f32; 7] = [1.0, 11.0, 121.0, 1331.0, 14641.0, 161051.0, 1771561.0];
+
+#[cfg(feature = "radix")]
+const F32_POW12: [f32; 16] = [1.0, 12.0, 144.0, 1728.0, 20736.0, 248832.0, 2985984.0, 35831808.0, 429981696.0, 5159780352.0, 61917364224.0, 743008370688.0, 8916100448256.0, 106993205379072.0, 1283918464548864.0, 15407021574586368.0];
+
+#[cfg(feature = "radix")]
+const F32_POW13: [f32; 7] = [1.0, 13.0, 169.0, 2197.0, 28561.0, 371293.0, 4826809.0];
+
+#[cfg(feature = "radix")]
+const F32_POW14: [f32; 9] = [1.0, 14.0, 196.0, 2744.0, 38416.0, 537824.0, 7529536.0, 105413504.0, 1475789056.0];
+
+#[cfg(feature = "radix")]
+const F32_POW15: [f32; 7] = [1.0, 15.0, 225.0, 3375.0, 50625.0, 759375.0, 11390625.0];
+
+#[cfg(feature = "radix")]
+const F32_POW17: [f32; 6] = [1.0, 17.0, 289.0, 4913.0, 83521.0, 1419857.0];
+
+#[cfg(feature = "radix")]
+const F32_POW18: [f32; 8] = [1.0, 18.0, 324.0, 5832.0, 104976.0, 1889568.0, 34012224.0, 612220032.0];
+
+#[cfg(feature = "radix")]
+const F32_POW19: [f32; 6] = [1.0, 19.0, 361.0, 6859.0, 130321.0, 2476099.0];
+
+#[cfg(feature = "radix")]
+const F32_POW20: [f32; 11] = [1.0, 20.0, 400.0, 8000.0, 160000.0, 3200000.0, 64000000.0, 1280000000.0, 25600000000.0, 512000000000.0, 10240000000000.0];
+
+#[cfg(feature = "radix")]
+const F32_POW21: [f32; 6] = [1.0, 21.0, 441.0, 9261.0, 194481.0, 4084101.0];
+
+#[cfg(feature = "radix")]
+const F32_POW22: [f32; 7] = [1.0, 22.0, 484.0, 10648.0, 234256.0, 5153632.0, 113379904.0];
+
+#[cfg(feature = "radix")]
+const F32_POW23: [f32; 6] = [1.0, 23.0, 529.0, 12167.0, 279841.0, 6436343.0];
+
+#[cfg(feature = "radix")]
+const F32_POW24: [f32; 16] = [1.0, 24.0, 576.0, 13824.0, 331776.0, 7962624.0, 191102976.0, 4586471424.0, 110075314176.0, 2641807540224.0, 63403380965376.0, 1521681143169024.0, 36520347436056576.0, 876488338465357824.0, 21035720123168587776.0, 504857282956046106624.0];
+
+#[cfg(feature = "radix")]
+const F32_POW25: [f32; 6] = [1.0, 25.0, 625.0, 15625.0, 390625.0, 9765625.0];
+
+#[cfg(feature = "radix")]
+const F32_POW26: [f32; 7] = [1.0, 26.0, 676.0, 17576.0, 456976.0, 11881376.0, 308915776.0];
+
+#[cfg(feature = "radix")]
+const F32_POW27: [f32; 6] = [1.0, 27.0, 729.0, 19683.0, 531441.0, 14348907.0];
+
+#[cfg(feature = "radix")]
+const F32_POW28: [f32; 9] = [1.0, 28.0, 784.0, 21952.0, 614656.0, 17210368.0, 481890304.0, 13492928512.0, 377801998336.0];
+
+#[cfg(feature = "radix")]
+const F32_POW29: [f32; 5] = [1.0, 29.0, 841.0, 24389.0, 707281.0];
+
+#[cfg(feature = "radix")]
+const F32_POW30: [f32; 7] = [1.0, 30.0, 900.0, 27000.0, 810000.0, 24300000.0, 729000000.0];
+
+#[cfg(feature = "radix")]
+const F32_POW31: [f32; 5] = [1.0, 31.0, 961.0, 29791.0, 923521.0];
+
+#[cfg(feature = "radix")]
+const F32_POW33: [f32; 5] = [1.0, 33.0, 1089.0, 35937.0, 1185921.0];
+
+#[cfg(feature = "radix")]
+const F32_POW34: [f32; 6] = [1.0, 34.0, 1156.0, 39304.0, 1336336.0, 45435424.0];
+
+#[cfg(feature = "radix")]
+const F32_POW35: [f32; 5] = [1.0, 35.0, 1225.0, 42875.0, 1500625.0];
+
+#[cfg(feature = "radix")]
+const F32_POW36: [f32; 8] = [1.0, 36.0, 1296.0, 46656.0, 1679616.0, 60466176.0, 2176782336.0, 78364164096.0];
+
+// Compile-time guarantees for our tables.
+const_assert!(F32_POW10[1] / F32_POW10[0] == 10.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW2[1] / F32_POW2[0] == 2.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW3[1] / F32_POW3[0] == 3.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW5[1] / F32_POW5[0] == 5.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW6[1] / F32_POW6[0] == 6.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW7[1] / F32_POW7[0] == 7.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW9[1] / F32_POW9[0] == 9.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW11[1] / F32_POW11[0] == 11.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW12[1] / F32_POW12[0] == 12.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW13[1] / F32_POW13[0] == 13.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW14[1] / F32_POW14[0] == 14.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW15[1] / F32_POW15[0] == 15.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW17[1] / F32_POW17[0] == 17.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW18[1] / F32_POW18[0] == 18.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW19[1] / F32_POW19[0] == 19.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW20[1] / F32_POW20[0] == 20.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW21[1] / F32_POW21[0] == 21.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW22[1] / F32_POW22[0] == 22.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW23[1] / F32_POW23[0] == 23.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW24[1] / F32_POW24[0] == 24.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW25[1] / F32_POW25[0] == 25.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW26[1] / F32_POW26[0] == 26.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW27[1] / F32_POW27[0] == 27.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW28[1] / F32_POW28[0] == 28.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW29[1] / F32_POW29[0] == 29.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW30[1] / F32_POW30[0] == 30.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW31[1] / F32_POW31[0] == 31.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW33[1] / F32_POW33[0] == 33.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW34[1] / F32_POW34[0] == 34.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW35[1] / F32_POW35[0] == 35.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F32_POW36[1] / F32_POW36[0] == 36.0);
+
+impl TablePower for f32 {
+    const POW2_EXPONENT_BIAS: i32 = 149;
+
+    #[cfg(feature = "radix")]
+    #[inline]
+    fn table_pow2(exponent: i32) -> f32 {
+        debug_assert!(exponent + Self::POW2_EXPONENT_BIAS >= 0, "table_pow2() have negative exponent.");
+        F32_POW2[(exponent + Self::POW2_EXPONENT_BIAS).as_usize()]
+    }
+
+    #[inline]
+    fn table_pow<T: Integer>(radix: T, exponent: i32) -> f32 {
+        debug_assert!(exponent >= 0, "table_pow() have negative exponent.");
+        debug_assert_radix!(radix);
+        let exponent = exponent as usize;
+
+        #[cfg(not(feature = "radix"))] {
+            F32_POW10[exponent]
+        }
+
+        #[cfg(feature = "radix")] {
+            match radix.as_i32() {
+                3  => F32_POW3 [exponent],
+                5  => F32_POW5 [exponent],
+                6  => F32_POW6 [exponent],
+                7  => F32_POW7 [exponent],
+                9  => F32_POW9 [exponent],
+                10 => F32_POW10[exponent],
+                11 => F32_POW11[exponent],
+                12 => F32_POW12[exponent],
+                13 => F32_POW13[exponent],
+                14 => F32_POW14[exponent],
+                15 => F32_POW15[exponent],
+                17 => F32_POW17[exponent],
+                18 => F32_POW18[exponent],
+                19 => F32_POW19[exponent],
+                20 => F32_POW20[exponent],
+                21 => F32_POW21[exponent],
+                22 => F32_POW22[exponent],
+                23 => F32_POW23[exponent],
+                24 => F32_POW24[exponent],
+                25 => F32_POW25[exponent],
+                26 => F32_POW26[exponent],
+                27 => F32_POW27[exponent],
+                28 => F32_POW28[exponent],
+                29 => F32_POW29[exponent],
+                30 => F32_POW30[exponent],
+                31 => F32_POW31[exponent],
+                33 => F32_POW33[exponent],
+                34 => F32_POW34[exponent],
+                35 => F32_POW35[exponent],
+                36 => F32_POW36[exponent],
+                // Invalid radix
+                _  => unreachable!(),
+            }
+        }
+    }
+}
+
+// F64
+
+/// Hacky transmute for 64-bit values.
+#[cfg(feature = "radix")]
+type F64Transmute = Transmute<u64, f64>;
+
+/// Precalculated values of 2**i for i in range [-1074, 1023].
+#[cfg(feature = "radix")]
+const F64_POW2: [f64; 2098] = unsafe {[
+    // Denormal floats ([-1074, -1023])
+    F64Transmute { u: 0x0000000000000001 }.f,
+    F64Transmute { u: 0x0000000000000002 }.f,
+    F64Transmute { u: 0x0000000000000004 }.f,
+    F64Transmute { u: 0x0000000000000008 }.f,
+    F64Transmute { u: 0x0000000000000010 }.f,
+    F64Transmute { u: 0x0000000000000020 }.f,
+    F64Transmute { u: 0x0000000000000040 }.f,
+    F64Transmute { u: 0x0000000000000080 }.f,
+    F64Transmute { u: 0x0000000000000100 }.f,
+    F64Transmute { u: 0x0000000000000200 }.f,
+    F64Transmute { u: 0x0000000000000400 }.f,
+    F64Transmute { u: 0x0000000000000800 }.f,
+    F64Transmute { u: 0x0000000000001000 }.f,
+    F64Transmute { u: 0x0000000000002000 }.f,
+    F64Transmute { u: 0x0000000000004000 }.f,
+    F64Transmute { u: 0x0000000000008000 }.f,
+    F64Transmute { u: 0x0000000000010000 }.f,
+    F64Transmute { u: 0x0000000000020000 }.f,
+    F64Transmute { u: 0x0000000000040000 }.f,
+    F64Transmute { u: 0x0000000000080000 }.f,
+    F64Transmute { u: 0x0000000000100000 }.f,
+    F64Transmute { u: 0x0000000000200000 }.f,
+    F64Transmute { u: 0x0000000000400000 }.f,
+    F64Transmute { u: 0x0000000000800000 }.f,
+    F64Transmute { u: 0x0000000001000000 }.f,
+    F64Transmute { u: 0x0000000002000000 }.f,
+    F64Transmute { u: 0x0000000004000000 }.f,
+    F64Transmute { u: 0x0000000008000000 }.f,
+    F64Transmute { u: 0x0000000010000000 }.f,
+    F64Transmute { u: 0x0000000020000000 }.f,
+    F64Transmute { u: 0x0000000040000000 }.f,
+    F64Transmute { u: 0x0000000080000000 }.f,
+    F64Transmute { u: 0x0000000100000000 }.f,
+    F64Transmute { u: 0x0000000200000000 }.f,
+    F64Transmute { u: 0x0000000400000000 }.f,
+    F64Transmute { u: 0x0000000800000000 }.f,
+    F64Transmute { u: 0x0000001000000000 }.f,
+    F64Transmute { u: 0x0000002000000000 }.f,
+    F64Transmute { u: 0x0000004000000000 }.f,
+    F64Transmute { u: 0x0000008000000000 }.f,
+    F64Transmute { u: 0x0000010000000000 }.f,
+    F64Transmute { u: 0x0000020000000000 }.f,
+    F64Transmute { u: 0x0000040000000000 }.f,
+    F64Transmute { u: 0x0000080000000000 }.f,
+    F64Transmute { u: 0x0000100000000000 }.f,
+    F64Transmute { u: 0x0000200000000000 }.f,
+    F64Transmute { u: 0x0000400000000000 }.f,
+    F64Transmute { u: 0x0000800000000000 }.f,
+    F64Transmute { u: 0x0001000000000000 }.f,
+    F64Transmute { u: 0x0002000000000000 }.f,
+    F64Transmute { u: 0x0004000000000000 }.f,
+    F64Transmute { u: 0x0008000000000000 }.f,
+
+    // Regular floats (exponent only, [-1022, 1023])
+    F64Transmute { u: 0x0010000000000000 }.f,
+    F64Transmute { u: 0x0020000000000000 }.f,
+    F64Transmute { u: 0x0030000000000000 }.f,
+    F64Transmute { u: 0x0040000000000000 }.f,
+    F64Transmute { u: 0x0050000000000000 }.f,
+    F64Transmute { u: 0x0060000000000000 }.f,
+    F64Transmute { u: 0x0070000000000000 }.f,
+    F64Transmute { u: 0x0080000000000000 }.f,
+    F64Transmute { u: 0x0090000000000000 }.f,
+    F64Transmute { u: 0x00A0000000000000 }.f,
+    F64Transmute { u: 0x00B0000000000000 }.f,
+    F64Transmute { u: 0x00C0000000000000 }.f,
+    F64Transmute { u: 0x00D0000000000000 }.f,
+    F64Transmute { u: 0x00E0000000000000 }.f,
+    F64Transmute { u: 0x00F0000000000000 }.f,
+    F64Transmute { u: 0x0100000000000000 }.f,
+    F64Transmute { u: 0x0110000000000000 }.f,
+    F64Transmute { u: 0x0120000000000000 }.f,
+    F64Transmute { u: 0x0130000000000000 }.f,
+    F64Transmute { u: 0x0140000000000000 }.f,
+    F64Transmute { u: 0x0150000000000000 }.f,
+    F64Transmute { u: 0x0160000000000000 }.f,
+    F64Transmute { u: 0x0170000000000000 }.f,
+    F64Transmute { u: 0x0180000000000000 }.f,
+    F64Transmute { u: 0x0190000000000000 }.f,
+    F64Transmute { u: 0x01A0000000000000 }.f,
+    F64Transmute { u: 0x01B0000000000000 }.f,
+    F64Transmute { u: 0x01C0000000000000 }.f,
+    F64Transmute { u: 0x01D0000000000000 }.f,
+    F64Transmute { u: 0x01E0000000000000 }.f,
+    F64Transmute { u: 0x01F0000000000000 }.f,
+    F64Transmute { u: 0x0200000000000000 }.f,
+    F64Transmute { u: 0x0210000000000000 }.f,
+    F64Transmute { u: 0x0220000000000000 }.f,
+    F64Transmute { u: 0x0230000000000000 }.f,
+    F64Transmute { u: 0x0240000000000000 }.f,
+    F64Transmute { u: 0x0250000000000000 }.f,
+    F64Transmute { u: 0x0260000000000000 }.f,
+    F64Transmute { u: 0x0270000000000000 }.f,
+    F64Transmute { u: 0x0280000000000000 }.f,
+    F64Transmute { u: 0x0290000000000000 }.f,
+    F64Transmute { u: 0x02A0000000000000 }.f,
+    F64Transmute { u: 0x02B0000000000000 }.f,
+    F64Transmute { u: 0x02C0000000000000 }.f,
+    F64Transmute { u: 0x02D0000000000000 }.f,
+    F64Transmute { u: 0x02E0000000000000 }.f,
+    F64Transmute { u: 0x02F0000000000000 }.f,
+    F64Transmute { u: 0x0300000000000000 }.f,
+    F64Transmute { u: 0x0310000000000000 }.f,
+    F64Transmute { u: 0x0320000000000000 }.f,
+    F64Transmute { u: 0x0330000000000000 }.f,
+    F64Transmute { u: 0x0340000000000000 }.f,
+    F64Transmute { u: 0x0350000000000000 }.f,
+    F64Transmute { u: 0x0360000000000000 }.f,
+    F64Transmute { u: 0x0370000000000000 }.f,
+    F64Transmute { u: 0x0380000000000000 }.f,
+    F64Transmute { u: 0x0390000000000000 }.f,
+    F64Transmute { u: 0x03A0000000000000 }.f,
+    F64Transmute { u: 0x03B0000000000000 }.f,
+    F64Transmute { u: 0x03C0000000000000 }.f,
+    F64Transmute { u: 0x03D0000000000000 }.f,
+    F64Transmute { u: 0x03E0000000000000 }.f,
+    F64Transmute { u: 0x03F0000000000000 }.f,
+    F64Transmute { u: 0x0400000000000000 }.f,
+    F64Transmute { u: 0x0410000000000000 }.f,
+    F64Transmute { u: 0x0420000000000000 }.f,
+    F64Transmute { u: 0x0430000000000000 }.f,
+    F64Transmute { u: 0x0440000000000000 }.f,
+    F64Transmute { u: 0x0450000000000000 }.f,
+    F64Transmute { u: 0x0460000000000000 }.f,
+    F64Transmute { u: 0x0470000000000000 }.f,
+    F64Transmute { u: 0x0480000000000000 }.f,
+    F64Transmute { u: 0x0490000000000000 }.f,
+    F64Transmute { u: 0x04A0000000000000 }.f,
+    F64Transmute { u: 0x04B0000000000000 }.f,
+    F64Transmute { u: 0x04C0000000000000 }.f,
+    F64Transmute { u: 0x04D0000000000000 }.f,
+    F64Transmute { u: 0x04E0000000000000 }.f,
+    F64Transmute { u: 0x04F0000000000000 }.f,
+    F64Transmute { u: 0x0500000000000000 }.f,
+    F64Transmute { u: 0x0510000000000000 }.f,
+    F64Transmute { u: 0x0520000000000000 }.f,
+    F64Transmute { u: 0x0530000000000000 }.f,
+    F64Transmute { u: 0x0540000000000000 }.f,
+    F64Transmute { u: 0x0550000000000000 }.f,
+    F64Transmute { u: 0x0560000000000000 }.f,
+    F64Transmute { u: 0x0570000000000000 }.f,
+    F64Transmute { u: 0x0580000000000000 }.f,
+    F64Transmute { u: 0x0590000000000000 }.f,
+    F64Transmute { u: 0x05A0000000000000 }.f,
+    F64Transmute { u: 0x05B0000000000000 }.f,
+    F64Transmute { u: 0x05C0000000000000 }.f,
+    F64Transmute { u: 0x05D0000000000000 }.f,
+    F64Transmute { u: 0x05E0000000000000 }.f,
+    F64Transmute { u: 0x05F0000000000000 }.f,
+    F64Transmute { u: 0x0600000000000000 }.f,
+    F64Transmute { u: 0x0610000000000000 }.f,
+    F64Transmute { u: 0x0620000000000000 }.f,
+    F64Transmute { u: 0x0630000000000000 }.f,
+    F64Transmute { u: 0x0640000000000000 }.f,
+    F64Transmute { u: 0x0650000000000000 }.f,
+    F64Transmute { u: 0x0660000000000000 }.f,
+    F64Transmute { u: 0x0670000000000000 }.f,
+    F64Transmute { u: 0x0680000000000000 }.f,
+    F64Transmute { u: 0x0690000000000000 }.f,
+    F64Transmute { u: 0x06A0000000000000 }.f,
+    F64Transmute { u: 0x06B0000000000000 }.f,
+    F64Transmute { u: 0x06C0000000000000 }.f,
+    F64Transmute { u: 0x06D0000000000000 }.f,
+    F64Transmute { u: 0x06E0000000000000 }.f,
+    F64Transmute { u: 0x06F0000000000000 }.f,
+    F64Transmute { u: 0x0700000000000000 }.f,
+    F64Transmute { u: 0x0710000000000000 }.f,
+    F64Transmute { u: 0x0720000000000000 }.f,
+    F64Transmute { u: 0x0730000000000000 }.f,
+    F64Transmute { u: 0x0740000000000000 }.f,
+    F64Transmute { u: 0x0750000000000000 }.f,
+    F64Transmute { u: 0x0760000000000000 }.f,
+    F64Transmute { u: 0x0770000000000000 }.f,
+    F64Transmute { u: 0x0780000000000000 }.f,
+    F64Transmute { u: 0x0790000000000000 }.f,
+    F64Transmute { u: 0x07A0000000000000 }.f,
+    F64Transmute { u: 0x07B0000000000000 }.f,
+    F64Transmute { u: 0x07C0000000000000 }.f,
+    F64Transmute { u: 0x07D0000000000000 }.f,
+    F64Transmute { u: 0x07E0000000000000 }.f,
+    F64Transmute { u: 0x07F0000000000000 }.f,
+    F64Transmute { u: 0x0800000000000000 }.f,
+    F64Transmute { u: 0x0810000000000000 }.f,
+    F64Transmute { u: 0x0820000000000000 }.f,
+    F64Transmute { u: 0x0830000000000000 }.f,
+    F64Transmute { u: 0x0840000000000000 }.f,
+    F64Transmute { u: 0x0850000000000000 }.f,
+    F64Transmute { u: 0x0860000000000000 }.f,
+    F64Transmute { u: 0x0870000000000000 }.f,
+    F64Transmute { u: 0x0880000000000000 }.f,
+    F64Transmute { u: 0x0890000000000000 }.f,
+    F64Transmute { u: 0x08A0000000000000 }.f,
+    F64Transmute { u: 0x08B0000000000000 }.f,
+    F64Transmute { u: 0x08C0000000000000 }.f,
+    F64Transmute { u: 0x08D0000000000000 }.f,
+    F64Transmute { u: 0x08E0000000000000 }.f,
+    F64Transmute { u: 0x08F0000000000000 }.f,
+    F64Transmute { u: 0x0900000000000000 }.f,
+    F64Transmute { u: 0x0910000000000000 }.f,
+    F64Transmute { u: 0x0920000000000000 }.f,
+    F64Transmute { u: 0x0930000000000000 }.f,
+    F64Transmute { u: 0x0940000000000000 }.f,
+    F64Transmute { u: 0x0950000000000000 }.f,
+    F64Transmute { u: 0x0960000000000000 }.f,
+    F64Transmute { u: 0x0970000000000000 }.f,
+    F64Transmute { u: 0x0980000000000000 }.f,
+    F64Transmute { u: 0x0990000000000000 }.f,
+    F64Transmute { u: 0x09A0000000000000 }.f,
+    F64Transmute { u: 0x09B0000000000000 }.f,
+    F64Transmute { u: 0x09C0000000000000 }.f,
+    F64Transmute { u: 0x09D0000000000000 }.f,
+    F64Transmute { u: 0x09E0000000000000 }.f,
+    F64Transmute { u: 0x09F0000000000000 }.f,
+    F64Transmute { u: 0x0A00000000000000 }.f,
+    F64Transmute { u: 0x0A10000000000000 }.f,
+    F64Transmute { u: 0x0A20000000000000 }.f,
+    F64Transmute { u: 0x0A30000000000000 }.f,
+    F64Transmute { u: 0x0A40000000000000 }.f,
+    F64Transmute { u: 0x0A50000000000000 }.f,
+    F64Transmute { u: 0x0A60000000000000 }.f,
+    F64Transmute { u: 0x0A70000000000000 }.f,
+    F64Transmute { u: 0x0A80000000000000 }.f,
+    F64Transmute { u: 0x0A90000000000000 }.f,
+    F64Transmute { u: 0x0AA0000000000000 }.f,
+    F64Transmute { u: 0x0AB0000000000000 }.f,
+    F64Transmute { u: 0x0AC0000000000000 }.f,
+    F64Transmute { u: 0x0AD0000000000000 }.f,
+    F64Transmute { u: 0x0AE0000000000000 }.f,
+    F64Transmute { u: 0x0AF0000000000000 }.f,
+    F64Transmute { u: 0x0B00000000000000 }.f,
+    F64Transmute { u: 0x0B10000000000000 }.f,
+    F64Transmute { u: 0x0B20000000000000 }.f,
+    F64Transmute { u: 0x0B30000000000000 }.f,
+    F64Transmute { u: 0x0B40000000000000 }.f,
+    F64Transmute { u: 0x0B50000000000000 }.f,
+    F64Transmute { u: 0x0B60000000000000 }.f,
+    F64Transmute { u: 0x0B70000000000000 }.f,
+    F64Transmute { u: 0x0B80000000000000 }.f,
+    F64Transmute { u: 0x0B90000000000000 }.f,
+    F64Transmute { u: 0x0BA0000000000000 }.f,
+    F64Transmute { u: 0x0BB0000000000000 }.f,
+    F64Transmute { u: 0x0BC0000000000000 }.f,
+    F64Transmute { u: 0x0BD0000000000000 }.f,
+    F64Transmute { u: 0x0BE0000000000000 }.f,
+    F64Transmute { u: 0x0BF0000000000000 }.f,
+    F64Transmute { u: 0x0C00000000000000 }.f,
+    F64Transmute { u: 0x0C10000000000000 }.f,
+    F64Transmute { u: 0x0C20000000000000 }.f,
+    F64Transmute { u: 0x0C30000000000000 }.f,
+    F64Transmute { u: 0x0C40000000000000 }.f,
+    F64Transmute { u: 0x0C50000000000000 }.f,
+    F64Transmute { u: 0x0C60000000000000 }.f,
+    F64Transmute { u: 0x0C70000000000000 }.f,
+    F64Transmute { u: 0x0C80000000000000 }.f,
+    F64Transmute { u: 0x0C90000000000000 }.f,
+    F64Transmute { u: 0x0CA0000000000000 }.f,
+    F64Transmute { u: 0x0CB0000000000000 }.f,
+    F64Transmute { u: 0x0CC0000000000000 }.f,
+    F64Transmute { u: 0x0CD0000000000000 }.f,
+    F64Transmute { u: 0x0CE0000000000000 }.f,
+    F64Transmute { u: 0x0CF0000000000000 }.f,
+    F64Transmute { u: 0x0D00000000000000 }.f,
+    F64Transmute { u: 0x0D10000000000000 }.f,
+    F64Transmute { u: 0x0D20000000000000 }.f,
+    F64Transmute { u: 0x0D30000000000000 }.f,
+    F64Transmute { u: 0x0D40000000000000 }.f,
+    F64Transmute { u: 0x0D50000000000000 }.f,
+    F64Transmute { u: 0x0D60000000000000 }.f,
+    F64Transmute { u: 0x0D70000000000000 }.f,
+    F64Transmute { u: 0x0D80000000000000 }.f,
+    F64Transmute { u: 0x0D90000000000000 }.f,
+    F64Transmute { u: 0x0DA0000000000000 }.f,
+    F64Transmute { u: 0x0DB0000000000000 }.f,
+    F64Transmute { u: 0x0DC0000000000000 }.f,
+    F64Transmute { u: 0x0DD0000000000000 }.f,
+    F64Transmute { u: 0x0DE0000000000000 }.f,
+    F64Transmute { u: 0x0DF0000000000000 }.f,
+    F64Transmute { u: 0x0E00000000000000 }.f,
+    F64Transmute { u: 0x0E10000000000000 }.f,
+    F64Transmute { u: 0x0E20000000000000 }.f,
+    F64Transmute { u: 0x0E30000000000000 }.f,
+    F64Transmute { u: 0x0E40000000000000 }.f,
+    F64Transmute { u: 0x0E50000000000000 }.f,
+    F64Transmute { u: 0x0E60000000000000 }.f,
+    F64Transmute { u: 0x0E70000000000000 }.f,
+    F64Transmute { u: 0x0E80000000000000 }.f,
+    F64Transmute { u: 0x0E90000000000000 }.f,
+    F64Transmute { u: 0x0EA0000000000000 }.f,
+    F64Transmute { u: 0x0EB0000000000000 }.f,
+    F64Transmute { u: 0x0EC0000000000000 }.f,
+    F64Transmute { u: 0x0ED0000000000000 }.f,
+    F64Transmute { u: 0x0EE0000000000000 }.f,
+    F64Transmute { u: 0x0EF0000000000000 }.f,
+    F64Transmute { u: 0x0F00000000000000 }.f,
+    F64Transmute { u: 0x0F10000000000000 }.f,
+    F64Transmute { u: 0x0F20000000000000 }.f,
+    F64Transmute { u: 0x0F30000000000000 }.f,
+    F64Transmute { u: 0x0F40000000000000 }.f,
+    F64Transmute { u: 0x0F50000000000000 }.f,
+    F64Transmute { u: 0x0F60000000000000 }.f,
+    F64Transmute { u: 0x0F70000000000000 }.f,
+    F64Transmute { u: 0x0F80000000000000 }.f,
+    F64Transmute { u: 0x0F90000000000000 }.f,
+    F64Transmute { u: 0x0FA0000000000000 }.f,
+    F64Transmute { u: 0x0FB0000000000000 }.f,
+    F64Transmute { u: 0x0FC0000000000000 }.f,
+    F64Transmute { u: 0x0FD0000000000000 }.f,
+    F64Transmute { u: 0x0FE0000000000000 }.f,
+    F64Transmute { u: 0x0FF0000000000000 }.f,
+    F64Transmute { u: 0x1000000000000000 }.f,
+    F64Transmute { u: 0x1010000000000000 }.f,
+    F64Transmute { u: 0x1020000000000000 }.f,
+    F64Transmute { u: 0x1030000000000000 }.f,
+    F64Transmute { u: 0x1040000000000000 }.f,
+    F64Transmute { u: 0x1050000000000000 }.f,
+    F64Transmute { u: 0x1060000000000000 }.f,
+    F64Transmute { u: 0x1070000000000000 }.f,
+    F64Transmute { u: 0x1080000000000000 }.f,
+    F64Transmute { u: 0x1090000000000000 }.f,
+    F64Transmute { u: 0x10A0000000000000 }.f,
+    F64Transmute { u: 0x10B0000000000000 }.f,
+    F64Transmute { u: 0x10C0000000000000 }.f,
+    F64Transmute { u: 0x10D0000000000000 }.f,
+    F64Transmute { u: 0x10E0000000000000 }.f,
+    F64Transmute { u: 0x10F0000000000000 }.f,
+    F64Transmute { u: 0x1100000000000000 }.f,
+    F64Transmute { u: 0x1110000000000000 }.f,
+    F64Transmute { u: 0x1120000000000000 }.f,
+    F64Transmute { u: 0x1130000000000000 }.f,
+    F64Transmute { u: 0x1140000000000000 }.f,
+    F64Transmute { u: 0x1150000000000000 }.f,
+    F64Transmute { u: 0x1160000000000000 }.f,
+    F64Transmute { u: 0x1170000000000000 }.f,
+    F64Transmute { u: 0x1180000000000000 }.f,
+    F64Transmute { u: 0x1190000000000000 }.f,
+    F64Transmute { u: 0x11A0000000000000 }.f,
+    F64Transmute { u: 0x11B0000000000000 }.f,
+    F64Transmute { u: 0x11C0000000000000 }.f,
+    F64Transmute { u: 0x11D0000000000000 }.f,
+    F64Transmute { u: 0x11E0000000000000 }.f,
+    F64Transmute { u: 0x11F0000000000000 }.f,
+    F64Transmute { u: 0x1200000000000000 }.f,
+    F64Transmute { u: 0x1210000000000000 }.f,
+    F64Transmute { u: 0x1220000000000000 }.f,
+    F64Transmute { u: 0x1230000000000000 }.f,
+    F64Transmute { u: 0x1240000000000000 }.f,
+    F64Transmute { u: 0x1250000000000000 }.f,
+    F64Transmute { u: 0x1260000000000000 }.f,
+    F64Transmute { u: 0x1270000000000000 }.f,
+    F64Transmute { u: 0x1280000000000000 }.f,
+    F64Transmute { u: 0x1290000000000000 }.f,
+    F64Transmute { u: 0x12A0000000000000 }.f,
+    F64Transmute { u: 0x12B0000000000000 }.f,
+    F64Transmute { u: 0x12C0000000000000 }.f,
+    F64Transmute { u: 0x12D0000000000000 }.f,
+    F64Transmute { u: 0x12E0000000000000 }.f,
+    F64Transmute { u: 0x12F0000000000000 }.f,
+    F64Transmute { u: 0x1300000000000000 }.f,
+    F64Transmute { u: 0x1310000000000000 }.f,
+    F64Transmute { u: 0x1320000000000000 }.f,
+    F64Transmute { u: 0x1330000000000000 }.f,
+    F64Transmute { u: 0x1340000000000000 }.f,
+    F64Transmute { u: 0x1350000000000000 }.f,
+    F64Transmute { u: 0x1360000000000000 }.f,
+    F64Transmute { u: 0x1370000000000000 }.f,
+    F64Transmute { u: 0x1380000000000000 }.f,
+    F64Transmute { u: 0x1390000000000000 }.f,
+    F64Transmute { u: 0x13A0000000000000 }.f,
+    F64Transmute { u: 0x13B0000000000000 }.f,
+    F64Transmute { u: 0x13C0000000000000 }.f,
+    F64Transmute { u: 0x13D0000000000000 }.f,
+    F64Transmute { u: 0x13E0000000000000 }.f,
+    F64Transmute { u: 0x13F0000000000000 }.f,
+    F64Transmute { u: 0x1400000000000000 }.f,
+    F64Transmute { u: 0x1410000000000000 }.f,
+    F64Transmute { u: 0x1420000000000000 }.f,
+    F64Transmute { u: 0x1430000000000000 }.f,
+    F64Transmute { u: 0x1440000000000000 }.f,
+    F64Transmute { u: 0x1450000000000000 }.f,
+    F64Transmute { u: 0x1460000000000000 }.f,
+    F64Transmute { u: 0x1470000000000000 }.f,
+    F64Transmute { u: 0x1480000000000000 }.f,
+    F64Transmute { u: 0x1490000000000000 }.f,
+    F64Transmute { u: 0x14A0000000000000 }.f,
+    F64Transmute { u: 0x14B0000000000000 }.f,
+    F64Transmute { u: 0x14C0000000000000 }.f,
+    F64Transmute { u: 0x14D0000000000000 }.f,
+    F64Transmute { u: 0x14E0000000000000 }.f,
+    F64Transmute { u: 0x14F0000000000000 }.f,
+    F64Transmute { u: 0x1500000000000000 }.f,
+    F64Transmute { u: 0x1510000000000000 }.f,
+    F64Transmute { u: 0x1520000000000000 }.f,
+    F64Transmute { u: 0x1530000000000000 }.f,
+    F64Transmute { u: 0x1540000000000000 }.f,
+    F64Transmute { u: 0x1550000000000000 }.f,
+    F64Transmute { u: 0x1560000000000000 }.f,
+    F64Transmute { u: 0x1570000000000000 }.f,
+    F64Transmute { u: 0x1580000000000000 }.f,
+    F64Transmute { u: 0x1590000000000000 }.f,
+    F64Transmute { u: 0x15A0000000000000 }.f,
+    F64Transmute { u: 0x15B0000000000000 }.f,
+    F64Transmute { u: 0x15C0000000000000 }.f,
+    F64Transmute { u: 0x15D0000000000000 }.f,
+    F64Transmute { u: 0x15E0000000000000 }.f,
+    F64Transmute { u: 0x15F0000000000000 }.f,
+    F64Transmute { u: 0x1600000000000000 }.f,
+    F64Transmute { u: 0x1610000000000000 }.f,
+    F64Transmute { u: 0x1620000000000000 }.f,
+    F64Transmute { u: 0x1630000000000000 }.f,
+    F64Transmute { u: 0x1640000000000000 }.f,
+    F64Transmute { u: 0x1650000000000000 }.f,
+    F64Transmute { u: 0x1660000000000000 }.f,
+    F64Transmute { u: 0x1670000000000000 }.f,
+    F64Transmute { u: 0x1680000000000000 }.f,
+    F64Transmute { u: 0x1690000000000000 }.f,
+    F64Transmute { u: 0x16A0000000000000 }.f,
+    F64Transmute { u: 0x16B0000000000000 }.f,
+    F64Transmute { u: 0x16C0000000000000 }.f,
+    F64Transmute { u: 0x16D0000000000000 }.f,
+    F64Transmute { u: 0x16E0000000000000 }.f,
+    F64Transmute { u: 0x16F0000000000000 }.f,
+    F64Transmute { u: 0x1700000000000000 }.f,
+    F64Transmute { u: 0x1710000000000000 }.f,
+    F64Transmute { u: 0x1720000000000000 }.f,
+    F64Transmute { u: 0x1730000000000000 }.f,
+    F64Transmute { u: 0x1740000000000000 }.f,
+    F64Transmute { u: 0x1750000000000000 }.f,
+    F64Transmute { u: 0x1760000000000000 }.f,
+    F64Transmute { u: 0x1770000000000000 }.f,
+    F64Transmute { u: 0x1780000000000000 }.f,
+    F64Transmute { u: 0x1790000000000000 }.f,
+    F64Transmute { u: 0x17A0000000000000 }.f,
+    F64Transmute { u: 0x17B0000000000000 }.f,
+    F64Transmute { u: 0x17C0000000000000 }.f,
+    F64Transmute { u: 0x17D0000000000000 }.f,
+    F64Transmute { u: 0x17E0000000000000 }.f,
+    F64Transmute { u: 0x17F0000000000000 }.f,
+    F64Transmute { u: 0x1800000000000000 }.f,
+    F64Transmute { u: 0x1810000000000000 }.f,
+    F64Transmute { u: 0x1820000000000000 }.f,
+    F64Transmute { u: 0x1830000000000000 }.f,
+    F64Transmute { u: 0x1840000000000000 }.f,
+    F64Transmute { u: 0x1850000000000000 }.f,
+    F64Transmute { u: 0x1860000000000000 }.f,
+    F64Transmute { u: 0x1870000000000000 }.f,
+    F64Transmute { u: 0x1880000000000000 }.f,
+    F64Transmute { u: 0x1890000000000000 }.f,
+    F64Transmute { u: 0x18A0000000000000 }.f,
+    F64Transmute { u: 0x18B0000000000000 }.f,
+    F64Transmute { u: 0x18C0000000000000 }.f,
+    F64Transmute { u: 0x18D0000000000000 }.f,
+    F64Transmute { u: 0x18E0000000000000 }.f,
+    F64Transmute { u: 0x18F0000000000000 }.f,
+    F64Transmute { u: 0x1900000000000000 }.f,
+    F64Transmute { u: 0x1910000000000000 }.f,
+    F64Transmute { u: 0x1920000000000000 }.f,
+    F64Transmute { u: 0x1930000000000000 }.f,
+    F64Transmute { u: 0x1940000000000000 }.f,
+    F64Transmute { u: 0x1950000000000000 }.f,
+    F64Transmute { u: 0x1960000000000000 }.f,
+    F64Transmute { u: 0x1970000000000000 }.f,
+    F64Transmute { u: 0x1980000000000000 }.f,
+    F64Transmute { u: 0x1990000000000000 }.f,
+    F64Transmute { u: 0x19A0000000000000 }.f,
+    F64Transmute { u: 0x19B0000000000000 }.f,
+    F64Transmute { u: 0x19C0000000000000 }.f,
+    F64Transmute { u: 0x19D0000000000000 }.f,
+    F64Transmute { u: 0x19E0000000000000 }.f,
+    F64Transmute { u: 0x19F0000000000000 }.f,
+    F64Transmute { u: 0x1A00000000000000 }.f,
+    F64Transmute { u: 0x1A10000000000000 }.f,
+    F64Transmute { u: 0x1A20000000000000 }.f,
+    F64Transmute { u: 0x1A30000000000000 }.f,
+    F64Transmute { u: 0x1A40000000000000 }.f,
+    F64Transmute { u: 0x1A50000000000000 }.f,
+    F64Transmute { u: 0x1A60000000000000 }.f,
+    F64Transmute { u: 0x1A70000000000000 }.f,
+    F64Transmute { u: 0x1A80000000000000 }.f,
+    F64Transmute { u: 0x1A90000000000000 }.f,
+    F64Transmute { u: 0x1AA0000000000000 }.f,
+    F64Transmute { u: 0x1AB0000000000000 }.f,
+    F64Transmute { u: 0x1AC0000000000000 }.f,
+    F64Transmute { u: 0x1AD0000000000000 }.f,
+    F64Transmute { u: 0x1AE0000000000000 }.f,
+    F64Transmute { u: 0x1AF0000000000000 }.f,
+    F64Transmute { u: 0x1B00000000000000 }.f,
+    F64Transmute { u: 0x1B10000000000000 }.f,
+    F64Transmute { u: 0x1B20000000000000 }.f,
+    F64Transmute { u: 0x1B30000000000000 }.f,
+    F64Transmute { u: 0x1B40000000000000 }.f,
+    F64Transmute { u: 0x1B50000000000000 }.f,
+    F64Transmute { u: 0x1B60000000000000 }.f,
+    F64Transmute { u: 0x1B70000000000000 }.f,
+    F64Transmute { u: 0x1B80000000000000 }.f,
+    F64Transmute { u: 0x1B90000000000000 }.f,
+    F64Transmute { u: 0x1BA0000000000000 }.f,
+    F64Transmute { u: 0x1BB0000000000000 }.f,
+    F64Transmute { u: 0x1BC0000000000000 }.f,
+    F64Transmute { u: 0x1BD0000000000000 }.f,
+    F64Transmute { u: 0x1BE0000000000000 }.f,
+    F64Transmute { u: 0x1BF0000000000000 }.f,
+    F64Transmute { u: 0x1C00000000000000 }.f,
+    F64Transmute { u: 0x1C10000000000000 }.f,
+    F64Transmute { u: 0x1C20000000000000 }.f,
+    F64Transmute { u: 0x1C30000000000000 }.f,
+    F64Transmute { u: 0x1C40000000000000 }.f,
+    F64Transmute { u: 0x1C50000000000000 }.f,
+    F64Transmute { u: 0x1C60000000000000 }.f,
+    F64Transmute { u: 0x1C70000000000000 }.f,
+    F64Transmute { u: 0x1C80000000000000 }.f,
+    F64Transmute { u: 0x1C90000000000000 }.f,
+    F64Transmute { u: 0x1CA0000000000000 }.f,
+    F64Transmute { u: 0x1CB0000000000000 }.f,
+    F64Transmute { u: 0x1CC0000000000000 }.f,
+    F64Transmute { u: 0x1CD0000000000000 }.f,
+    F64Transmute { u: 0x1CE0000000000000 }.f,
+    F64Transmute { u: 0x1CF0000000000000 }.f,
+    F64Transmute { u: 0x1D00000000000000 }.f,
+    F64Transmute { u: 0x1D10000000000000 }.f,
+    F64Transmute { u: 0x1D20000000000000 }.f,
+    F64Transmute { u: 0x1D30000000000000 }.f,
+    F64Transmute { u: 0x1D40000000000000 }.f,
+    F64Transmute { u: 0x1D50000000000000 }.f,
+    F64Transmute { u: 0x1D60000000000000 }.f,
+    F64Transmute { u: 0x1D70000000000000 }.f,
+    F64Transmute { u: 0x1D80000000000000 }.f,
+    F64Transmute { u: 0x1D90000000000000 }.f,
+    F64Transmute { u: 0x1DA0000000000000 }.f,
+    F64Transmute { u: 0x1DB0000000000000 }.f,
+    F64Transmute { u: 0x1DC0000000000000 }.f,
+    F64Transmute { u: 0x1DD0000000000000 }.f,
+    F64Transmute { u: 0x1DE0000000000000 }.f,
+    F64Transmute { u: 0x1DF0000000000000 }.f,
+    F64Transmute { u: 0x1E00000000000000 }.f,
+    F64Transmute { u: 0x1E10000000000000 }.f,
+    F64Transmute { u: 0x1E20000000000000 }.f,
+    F64Transmute { u: 0x1E30000000000000 }.f,
+    F64Transmute { u: 0x1E40000000000000 }.f,
+    F64Transmute { u: 0x1E50000000000000 }.f,
+    F64Transmute { u: 0x1E60000000000000 }.f,
+    F64Transmute { u: 0x1E70000000000000 }.f,
+    F64Transmute { u: 0x1E80000000000000 }.f,
+    F64Transmute { u: 0x1E90000000000000 }.f,
+    F64Transmute { u: 0x1EA0000000000000 }.f,
+    F64Transmute { u: 0x1EB0000000000000 }.f,
+    F64Transmute { u: 0x1EC0000000000000 }.f,
+    F64Transmute { u: 0x1ED0000000000000 }.f,
+    F64Transmute { u: 0x1EE0000000000000 }.f,
+    F64Transmute { u: 0x1EF0000000000000 }.f,
+    F64Transmute { u: 0x1F00000000000000 }.f,
+    F64Transmute { u: 0x1F10000000000000 }.f,
+    F64Transmute { u: 0x1F20000000000000 }.f,
+    F64Transmute { u: 0x1F30000000000000 }.f,
+    F64Transmute { u: 0x1F40000000000000 }.f,
+    F64Transmute { u: 0x1F50000000000000 }.f,
+    F64Transmute { u: 0x1F60000000000000 }.f,
+    F64Transmute { u: 0x1F70000000000000 }.f,
+    F64Transmute { u: 0x1F80000000000000 }.f,
+    F64Transmute { u: 0x1F90000000000000 }.f,
+    F64Transmute { u: 0x1FA0000000000000 }.f,
+    F64Transmute { u: 0x1FB0000000000000 }.f,
+    F64Transmute { u: 0x1FC0000000000000 }.f,
+    F64Transmute { u: 0x1FD0000000000000 }.f,
+    F64Transmute { u: 0x1FE0000000000000 }.f,
+    F64Transmute { u: 0x1FF0000000000000 }.f,
+    F64Transmute { u: 0x2000000000000000 }.f,
+    F64Transmute { u: 0x2010000000000000 }.f,
+    F64Transmute { u: 0x2020000000000000 }.f,
+    F64Transmute { u: 0x2030000000000000 }.f,
+    F64Transmute { u: 0x2040000000000000 }.f,
+    F64Transmute { u: 0x2050000000000000 }.f,
+    F64Transmute { u: 0x2060000000000000 }.f,
+    F64Transmute { u: 0x2070000000000000 }.f,
+    F64Transmute { u: 0x2080000000000000 }.f,
+    F64Transmute { u: 0x2090000000000000 }.f,
+    F64Transmute { u: 0x20A0000000000000 }.f,
+    F64Transmute { u: 0x20B0000000000000 }.f,
+    F64Transmute { u: 0x20C0000000000000 }.f,
+    F64Transmute { u: 0x20D0000000000000 }.f,
+    F64Transmute { u: 0x20E0000000000000 }.f,
+    F64Transmute { u: 0x20F0000000000000 }.f,
+    F64Transmute { u: 0x2100000000000000 }.f,
+    F64Transmute { u: 0x2110000000000000 }.f,
+    F64Transmute { u: 0x2120000000000000 }.f,
+    F64Transmute { u: 0x2130000000000000 }.f,
+    F64Transmute { u: 0x2140000000000000 }.f,
+    F64Transmute { u: 0x2150000000000000 }.f,
+    F64Transmute { u: 0x2160000000000000 }.f,
+    F64Transmute { u: 0x2170000000000000 }.f,
+    F64Transmute { u: 0x2180000000000000 }.f,
+    F64Transmute { u: 0x2190000000000000 }.f,
+    F64Transmute { u: 0x21A0000000000000 }.f,
+    F64Transmute { u: 0x21B0000000000000 }.f,
+    F64Transmute { u: 0x21C0000000000000 }.f,
+    F64Transmute { u: 0x21D0000000000000 }.f,
+    F64Transmute { u: 0x21E0000000000000 }.f,
+    F64Transmute { u: 0x21F0000000000000 }.f,
+    F64Transmute { u: 0x2200000000000000 }.f,
+    F64Transmute { u: 0x2210000000000000 }.f,
+    F64Transmute { u: 0x2220000000000000 }.f,
+    F64Transmute { u: 0x2230000000000000 }.f,
+    F64Transmute { u: 0x2240000000000000 }.f,
+    F64Transmute { u: 0x2250000000000000 }.f,
+    F64Transmute { u: 0x2260000000000000 }.f,
+    F64Transmute { u: 0x2270000000000000 }.f,
+    F64Transmute { u: 0x2280000000000000 }.f,
+    F64Transmute { u: 0x2290000000000000 }.f,
+    F64Transmute { u: 0x22A0000000000000 }.f,
+    F64Transmute { u: 0x22B0000000000000 }.f,
+    F64Transmute { u: 0x22C0000000000000 }.f,
+    F64Transmute { u: 0x22D0000000000000 }.f,
+    F64Transmute { u: 0x22E0000000000000 }.f,
+    F64Transmute { u: 0x22F0000000000000 }.f,
+    F64Transmute { u: 0x2300000000000000 }.f,
+    F64Transmute { u: 0x2310000000000000 }.f,
+    F64Transmute { u: 0x2320000000000000 }.f,
+    F64Transmute { u: 0x2330000000000000 }.f,
+    F64Transmute { u: 0x2340000000000000 }.f,
+    F64Transmute { u: 0x2350000000000000 }.f,
+    F64Transmute { u: 0x2360000000000000 }.f,
+    F64Transmute { u: 0x2370000000000000 }.f,
+    F64Transmute { u: 0x2380000000000000 }.f,
+    F64Transmute { u: 0x2390000000000000 }.f,
+    F64Transmute { u: 0x23A0000000000000 }.f,
+    F64Transmute { u: 0x23B0000000000000 }.f,
+    F64Transmute { u: 0x23C0000000000000 }.f,
+    F64Transmute { u: 0x23D0000000000000 }.f,
+    F64Transmute { u: 0x23E0000000000000 }.f,
+    F64Transmute { u: 0x23F0000000000000 }.f,
+    F64Transmute { u: 0x2400000000000000 }.f,
+    F64Transmute { u: 0x2410000000000000 }.f,
+    F64Transmute { u: 0x2420000000000000 }.f,
+    F64Transmute { u: 0x2430000000000000 }.f,
+    F64Transmute { u: 0x2440000000000000 }.f,
+    F64Transmute { u: 0x2450000000000000 }.f,
+    F64Transmute { u: 0x2460000000000000 }.f,
+    F64Transmute { u: 0x2470000000000000 }.f,
+    F64Transmute { u: 0x2480000000000000 }.f,
+    F64Transmute { u: 0x2490000000000000 }.f,
+    F64Transmute { u: 0x24A0000000000000 }.f,
+    F64Transmute { u: 0x24B0000000000000 }.f,
+    F64Transmute { u: 0x24C0000000000000 }.f,
+    F64Transmute { u: 0x24D0000000000000 }.f,
+    F64Transmute { u: 0x24E0000000000000 }.f,
+    F64Transmute { u: 0x24F0000000000000 }.f,
+    F64Transmute { u: 0x2500000000000000 }.f,
+    F64Transmute { u: 0x2510000000000000 }.f,
+    F64Transmute { u: 0x2520000000000000 }.f,
+    F64Transmute { u: 0x2530000000000000 }.f,
+    F64Transmute { u: 0x2540000000000000 }.f,
+    F64Transmute { u: 0x2550000000000000 }.f,
+    F64Transmute { u: 0x2560000000000000 }.f,
+    F64Transmute { u: 0x2570000000000000 }.f,
+    F64Transmute { u: 0x2580000000000000 }.f,
+    F64Transmute { u: 0x2590000000000000 }.f,
+    F64Transmute { u: 0x25A0000000000000 }.f,
+    F64Transmute { u: 0x25B0000000000000 }.f,
+    F64Transmute { u: 0x25C0000000000000 }.f,
+    F64Transmute { u: 0x25D0000000000000 }.f,
+    F64Transmute { u: 0x25E0000000000000 }.f,
+    F64Transmute { u: 0x25F0000000000000 }.f,
+    F64Transmute { u: 0x2600000000000000 }.f,
+    F64Transmute { u: 0x2610000000000000 }.f,
+    F64Transmute { u: 0x2620000000000000 }.f,
+    F64Transmute { u: 0x2630000000000000 }.f,
+    F64Transmute { u: 0x2640000000000000 }.f,
+    F64Transmute { u: 0x2650000000000000 }.f,
+    F64Transmute { u: 0x2660000000000000 }.f,
+    F64Transmute { u: 0x2670000000000000 }.f,
+    F64Transmute { u: 0x2680000000000000 }.f,
+    F64Transmute { u: 0x2690000000000000 }.f,
+    F64Transmute { u: 0x26A0000000000000 }.f,
+    F64Transmute { u: 0x26B0000000000000 }.f,
+    F64Transmute { u: 0x26C0000000000000 }.f,
+    F64Transmute { u: 0x26D0000000000000 }.f,
+    F64Transmute { u: 0x26E0000000000000 }.f,
+    F64Transmute { u: 0x26F0000000000000 }.f,
+    F64Transmute { u: 0x2700000000000000 }.f,
+    F64Transmute { u: 0x2710000000000000 }.f,
+    F64Transmute { u: 0x2720000000000000 }.f,
+    F64Transmute { u: 0x2730000000000000 }.f,
+    F64Transmute { u: 0x2740000000000000 }.f,
+    F64Transmute { u: 0x2750000000000000 }.f,
+    F64Transmute { u: 0x2760000000000000 }.f,
+    F64Transmute { u: 0x2770000000000000 }.f,
+    F64Transmute { u: 0x2780000000000000 }.f,
+    F64Transmute { u: 0x2790000000000000 }.f,
+    F64Transmute { u: 0x27A0000000000000 }.f,
+    F64Transmute { u: 0x27B0000000000000 }.f,
+    F64Transmute { u: 0x27C0000000000000 }.f,
+    F64Transmute { u: 0x27D0000000000000 }.f,
+    F64Transmute { u: 0x27E0000000000000 }.f,
+    F64Transmute { u: 0x27F0000000000000 }.f,
+    F64Transmute { u: 0x2800000000000000 }.f,
+    F64Transmute { u: 0x2810000000000000 }.f,
+    F64Transmute { u: 0x2820000000000000 }.f,
+    F64Transmute { u: 0x2830000000000000 }.f,
+    F64Transmute { u: 0x2840000000000000 }.f,
+    F64Transmute { u: 0x2850000000000000 }.f,
+    F64Transmute { u: 0x2860000000000000 }.f,
+    F64Transmute { u: 0x2870000000000000 }.f,
+    F64Transmute { u: 0x2880000000000000 }.f,
+    F64Transmute { u: 0x2890000000000000 }.f,
+    F64Transmute { u: 0x28A0000000000000 }.f,
+    F64Transmute { u: 0x28B0000000000000 }.f,
+    F64Transmute { u: 0x28C0000000000000 }.f,
+    F64Transmute { u: 0x28D0000000000000 }.f,
+    F64Transmute { u: 0x28E0000000000000 }.f,
+    F64Transmute { u: 0x28F0000000000000 }.f,
+    F64Transmute { u: 0x2900000000000000 }.f,
+    F64Transmute { u: 0x2910000000000000 }.f,
+    F64Transmute { u: 0x2920000000000000 }.f,
+    F64Transmute { u: 0x2930000000000000 }.f,
+    F64Transmute { u: 0x2940000000000000 }.f,
+    F64Transmute { u: 0x2950000000000000 }.f,
+    F64Transmute { u: 0x2960000000000000 }.f,
+    F64Transmute { u: 0x2970000000000000 }.f,
+    F64Transmute { u: 0x2980000000000000 }.f,
+    F64Transmute { u: 0x2990000000000000 }.f,
+    F64Transmute { u: 0x29A0000000000000 }.f,
+    F64Transmute { u: 0x29B0000000000000 }.f,
+    F64Transmute { u: 0x29C0000000000000 }.f,
+    F64Transmute { u: 0x29D0000000000000 }.f,
+    F64Transmute { u: 0x29E0000000000000 }.f,
+    F64Transmute { u: 0x29F0000000000000 }.f,
+    F64Transmute { u: 0x2A00000000000000 }.f,
+    F64Transmute { u: 0x2A10000000000000 }.f,
+    F64Transmute { u: 0x2A20000000000000 }.f,
+    F64Transmute { u: 0x2A30000000000000 }.f,
+    F64Transmute { u: 0x2A40000000000000 }.f,
+    F64Transmute { u: 0x2A50000000000000 }.f,
+    F64Transmute { u: 0x2A60000000000000 }.f,
+    F64Transmute { u: 0x2A70000000000000 }.f,
+    F64Transmute { u: 0x2A80000000000000 }.f,
+    F64Transmute { u: 0x2A90000000000000 }.f,
+    F64Transmute { u: 0x2AA0000000000000 }.f,
+    F64Transmute { u: 0x2AB0000000000000 }.f,
+    F64Transmute { u: 0x2AC0000000000000 }.f,
+    F64Transmute { u: 0x2AD0000000000000 }.f,
+    F64Transmute { u: 0x2AE0000000000000 }.f,
+    F64Transmute { u: 0x2AF0000000000000 }.f,
+    F64Transmute { u: 0x2B00000000000000 }.f,
+    F64Transmute { u: 0x2B10000000000000 }.f,
+    F64Transmute { u: 0x2B20000000000000 }.f,
+    F64Transmute { u: 0x2B30000000000000 }.f,
+    F64Transmute { u: 0x2B40000000000000 }.f,
+    F64Transmute { u: 0x2B50000000000000 }.f,
+    F64Transmute { u: 0x2B60000000000000 }.f,
+    F64Transmute { u: 0x2B70000000000000 }.f,
+    F64Transmute { u: 0x2B80000000000000 }.f,
+    F64Transmute { u: 0x2B90000000000000 }.f,
+    F64Transmute { u: 0x2BA0000000000000 }.f,
+    F64Transmute { u: 0x2BB0000000000000 }.f,
+    F64Transmute { u: 0x2BC0000000000000 }.f,
+    F64Transmute { u: 0x2BD0000000000000 }.f,
+    F64Transmute { u: 0x2BE0000000000000 }.f,
+    F64Transmute { u: 0x2BF0000000000000 }.f,
+    F64Transmute { u: 0x2C00000000000000 }.f,
+    F64Transmute { u: 0x2C10000000000000 }.f,
+    F64Transmute { u: 0x2C20000000000000 }.f,
+    F64Transmute { u: 0x2C30000000000000 }.f,
+    F64Transmute { u: 0x2C40000000000000 }.f,
+    F64Transmute { u: 0x2C50000000000000 }.f,
+    F64Transmute { u: 0x2C60000000000000 }.f,
+    F64Transmute { u: 0x2C70000000000000 }.f,
+    F64Transmute { u: 0x2C80000000000000 }.f,
+    F64Transmute { u: 0x2C90000000000000 }.f,
+    F64Transmute { u: 0x2CA0000000000000 }.f,
+    F64Transmute { u: 0x2CB0000000000000 }.f,
+    F64Transmute { u: 0x2CC0000000000000 }.f,
+    F64Transmute { u: 0x2CD0000000000000 }.f,
+    F64Transmute { u: 0x2CE0000000000000 }.f,
+    F64Transmute { u: 0x2CF0000000000000 }.f,
+    F64Transmute { u: 0x2D00000000000000 }.f,
+    F64Transmute { u: 0x2D10000000000000 }.f,
+    F64Transmute { u: 0x2D20000000000000 }.f,
+    F64Transmute { u: 0x2D30000000000000 }.f,
+    F64Transmute { u: 0x2D40000000000000 }.f,
+    F64Transmute { u: 0x2D50000000000000 }.f,
+    F64Transmute { u: 0x2D60000000000000 }.f,
+    F64Transmute { u: 0x2D70000000000000 }.f,
+    F64Transmute { u: 0x2D80000000000000 }.f,
+    F64Transmute { u: 0x2D90000000000000 }.f,
+    F64Transmute { u: 0x2DA0000000000000 }.f,
+    F64Transmute { u: 0x2DB0000000000000 }.f,
+    F64Transmute { u: 0x2DC0000000000000 }.f,
+    F64Transmute { u: 0x2DD0000000000000 }.f,
+    F64Transmute { u: 0x2DE0000000000000 }.f,
+    F64Transmute { u: 0x2DF0000000000000 }.f,
+    F64Transmute { u: 0x2E00000000000000 }.f,
+    F64Transmute { u: 0x2E10000000000000 }.f,
+    F64Transmute { u: 0x2E20000000000000 }.f,
+    F64Transmute { u: 0x2E30000000000000 }.f,
+    F64Transmute { u: 0x2E40000000000000 }.f,
+    F64Transmute { u: 0x2E50000000000000 }.f,
+    F64Transmute { u: 0x2E60000000000000 }.f,
+    F64Transmute { u: 0x2E70000000000000 }.f,
+    F64Transmute { u: 0x2E80000000000000 }.f,
+    F64Transmute { u: 0x2E90000000000000 }.f,
+    F64Transmute { u: 0x2EA0000000000000 }.f,
+    F64Transmute { u: 0x2EB0000000000000 }.f,
+    F64Transmute { u: 0x2EC0000000000000 }.f,
+    F64Transmute { u: 0x2ED0000000000000 }.f,
+    F64Transmute { u: 0x2EE0000000000000 }.f,
+    F64Transmute { u: 0x2EF0000000000000 }.f,
+    F64Transmute { u: 0x2F00000000000000 }.f,
+    F64Transmute { u: 0x2F10000000000000 }.f,
+    F64Transmute { u: 0x2F20000000000000 }.f,
+    F64Transmute { u: 0x2F30000000000000 }.f,
+    F64Transmute { u: 0x2F40000000000000 }.f,
+    F64Transmute { u: 0x2F50000000000000 }.f,
+    F64Transmute { u: 0x2F60000000000000 }.f,
+    F64Transmute { u: 0x2F70000000000000 }.f,
+    F64Transmute { u: 0x2F80000000000000 }.f,
+    F64Transmute { u: 0x2F90000000000000 }.f,
+    F64Transmute { u: 0x2FA0000000000000 }.f,
+    F64Transmute { u: 0x2FB0000000000000 }.f,
+    F64Transmute { u: 0x2FC0000000000000 }.f,
+    F64Transmute { u: 0x2FD0000000000000 }.f,
+    F64Transmute { u: 0x2FE0000000000000 }.f,
+    F64Transmute { u: 0x2FF0000000000000 }.f,
+    F64Transmute { u: 0x3000000000000000 }.f,
+    F64Transmute { u: 0x3010000000000000 }.f,
+    F64Transmute { u: 0x3020000000000000 }.f,
+    F64Transmute { u: 0x3030000000000000 }.f,
+    F64Transmute { u: 0x3040000000000000 }.f,
+    F64Transmute { u: 0x3050000000000000 }.f,
+    F64Transmute { u: 0x3060000000000000 }.f,
+    F64Transmute { u: 0x3070000000000000 }.f,
+    F64Transmute { u: 0x3080000000000000 }.f,
+    F64Transmute { u: 0x3090000000000000 }.f,
+    F64Transmute { u: 0x30A0000000000000 }.f,
+    F64Transmute { u: 0x30B0000000000000 }.f,
+    F64Transmute { u: 0x30C0000000000000 }.f,
+    F64Transmute { u: 0x30D0000000000000 }.f,
+    F64Transmute { u: 0x30E0000000000000 }.f,
+    F64Transmute { u: 0x30F0000000000000 }.f,
+    F64Transmute { u: 0x3100000000000000 }.f,
+    F64Transmute { u: 0x3110000000000000 }.f,
+    F64Transmute { u: 0x3120000000000000 }.f,
+    F64Transmute { u: 0x3130000000000000 }.f,
+    F64Transmute { u: 0x3140000000000000 }.f,
+    F64Transmute { u: 0x3150000000000000 }.f,
+    F64Transmute { u: 0x3160000000000000 }.f,
+    F64Transmute { u: 0x3170000000000000 }.f,
+    F64Transmute { u: 0x3180000000000000 }.f,
+    F64Transmute { u: 0x3190000000000000 }.f,
+    F64Transmute { u: 0x31A0000000000000 }.f,
+    F64Transmute { u: 0x31B0000000000000 }.f,
+    F64Transmute { u: 0x31C0000000000000 }.f,
+    F64Transmute { u: 0x31D0000000000000 }.f,
+    F64Transmute { u: 0x31E0000000000000 }.f,
+    F64Transmute { u: 0x31F0000000000000 }.f,
+    F64Transmute { u: 0x3200000000000000 }.f,
+    F64Transmute { u: 0x3210000000000000 }.f,
+    F64Transmute { u: 0x3220000000000000 }.f,
+    F64Transmute { u: 0x3230000000000000 }.f,
+    F64Transmute { u: 0x3240000000000000 }.f,
+    F64Transmute { u: 0x3250000000000000 }.f,
+    F64Transmute { u: 0x3260000000000000 }.f,
+    F64Transmute { u: 0x3270000000000000 }.f,
+    F64Transmute { u: 0x3280000000000000 }.f,
+    F64Transmute { u: 0x3290000000000000 }.f,
+    F64Transmute { u: 0x32A0000000000000 }.f,
+    F64Transmute { u: 0x32B0000000000000 }.f,
+    F64Transmute { u: 0x32C0000000000000 }.f,
+    F64Transmute { u: 0x32D0000000000000 }.f,
+    F64Transmute { u: 0x32E0000000000000 }.f,
+    F64Transmute { u: 0x32F0000000000000 }.f,
+    F64Transmute { u: 0x3300000000000000 }.f,
+    F64Transmute { u: 0x3310000000000000 }.f,
+    F64Transmute { u: 0x3320000000000000 }.f,
+    F64Transmute { u: 0x3330000000000000 }.f,
+    F64Transmute { u: 0x3340000000000000 }.f,
+    F64Transmute { u: 0x3350000000000000 }.f,
+    F64Transmute { u: 0x3360000000000000 }.f,
+    F64Transmute { u: 0x3370000000000000 }.f,
+    F64Transmute { u: 0x3380000000000000 }.f,
+    F64Transmute { u: 0x3390000000000000 }.f,
+    F64Transmute { u: 0x33A0000000000000 }.f,
+    F64Transmute { u: 0x33B0000000000000 }.f,
+    F64Transmute { u: 0x33C0000000000000 }.f,
+    F64Transmute { u: 0x33D0000000000000 }.f,
+    F64Transmute { u: 0x33E0000000000000 }.f,
+    F64Transmute { u: 0x33F0000000000000 }.f,
+    F64Transmute { u: 0x3400000000000000 }.f,
+    F64Transmute { u: 0x3410000000000000 }.f,
+    F64Transmute { u: 0x3420000000000000 }.f,
+    F64Transmute { u: 0x3430000000000000 }.f,
+    F64Transmute { u: 0x3440000000000000 }.f,
+    F64Transmute { u: 0x3450000000000000 }.f,
+    F64Transmute { u: 0x3460000000000000 }.f,
+    F64Transmute { u: 0x3470000000000000 }.f,
+    F64Transmute { u: 0x3480000000000000 }.f,
+    F64Transmute { u: 0x3490000000000000 }.f,
+    F64Transmute { u: 0x34A0000000000000 }.f,
+    F64Transmute { u: 0x34B0000000000000 }.f,
+    F64Transmute { u: 0x34C0000000000000 }.f,
+    F64Transmute { u: 0x34D0000000000000 }.f,
+    F64Transmute { u: 0x34E0000000000000 }.f,
+    F64Transmute { u: 0x34F0000000000000 }.f,
+    F64Transmute { u: 0x3500000000000000 }.f,
+    F64Transmute { u: 0x3510000000000000 }.f,
+    F64Transmute { u: 0x3520000000000000 }.f,
+    F64Transmute { u: 0x3530000000000000 }.f,
+    F64Transmute { u: 0x3540000000000000 }.f,
+    F64Transmute { u: 0x3550000000000000 }.f,
+    F64Transmute { u: 0x3560000000000000 }.f,
+    F64Transmute { u: 0x3570000000000000 }.f,
+    F64Transmute { u: 0x3580000000000000 }.f,
+    F64Transmute { u: 0x3590000000000000 }.f,
+    F64Transmute { u: 0x35A0000000000000 }.f,
+    F64Transmute { u: 0x35B0000000000000 }.f,
+    F64Transmute { u: 0x35C0000000000000 }.f,
+    F64Transmute { u: 0x35D0000000000000 }.f,
+    F64Transmute { u: 0x35E0000000000000 }.f,
+    F64Transmute { u: 0x35F0000000000000 }.f,
+    F64Transmute { u: 0x3600000000000000 }.f,
+    F64Transmute { u: 0x3610000000000000 }.f,
+    F64Transmute { u: 0x3620000000000000 }.f,
+    F64Transmute { u: 0x3630000000000000 }.f,
+    F64Transmute { u: 0x3640000000000000 }.f,
+    F64Transmute { u: 0x3650000000000000 }.f,
+    F64Transmute { u: 0x3660000000000000 }.f,
+    F64Transmute { u: 0x3670000000000000 }.f,
+    F64Transmute { u: 0x3680000000000000 }.f,
+    F64Transmute { u: 0x3690000000000000 }.f,
+    F64Transmute { u: 0x36A0000000000000 }.f,
+    F64Transmute { u: 0x36B0000000000000 }.f,
+    F64Transmute { u: 0x36C0000000000000 }.f,
+    F64Transmute { u: 0x36D0000000000000 }.f,
+    F64Transmute { u: 0x36E0000000000000 }.f,
+    F64Transmute { u: 0x36F0000000000000 }.f,
+    F64Transmute { u: 0x3700000000000000 }.f,
+    F64Transmute { u: 0x3710000000000000 }.f,
+    F64Transmute { u: 0x3720000000000000 }.f,
+    F64Transmute { u: 0x3730000000000000 }.f,
+    F64Transmute { u: 0x3740000000000000 }.f,
+    F64Transmute { u: 0x3750000000000000 }.f,
+    F64Transmute { u: 0x3760000000000000 }.f,
+    F64Transmute { u: 0x3770000000000000 }.f,
+    F64Transmute { u: 0x3780000000000000 }.f,
+    F64Transmute { u: 0x3790000000000000 }.f,
+    F64Transmute { u: 0x37A0000000000000 }.f,
+    F64Transmute { u: 0x37B0000000000000 }.f,
+    F64Transmute { u: 0x37C0000000000000 }.f,
+    F64Transmute { u: 0x37D0000000000000 }.f,
+    F64Transmute { u: 0x37E0000000000000 }.f,
+    F64Transmute { u: 0x37F0000000000000 }.f,
+    F64Transmute { u: 0x3800000000000000 }.f,
+    F64Transmute { u: 0x3810000000000000 }.f,
+    F64Transmute { u: 0x3820000000000000 }.f,
+    F64Transmute { u: 0x3830000000000000 }.f,
+    F64Transmute { u: 0x3840000000000000 }.f,
+    F64Transmute { u: 0x3850000000000000 }.f,
+    F64Transmute { u: 0x3860000000000000 }.f,
+    F64Transmute { u: 0x3870000000000000 }.f,
+    F64Transmute { u: 0x3880000000000000 }.f,
+    F64Transmute { u: 0x3890000000000000 }.f,
+    F64Transmute { u: 0x38A0000000000000 }.f,
+    F64Transmute { u: 0x38B0000000000000 }.f,
+    F64Transmute { u: 0x38C0000000000000 }.f,
+    F64Transmute { u: 0x38D0000000000000 }.f,
+    F64Transmute { u: 0x38E0000000000000 }.f,
+    F64Transmute { u: 0x38F0000000000000 }.f,
+    F64Transmute { u: 0x3900000000000000 }.f,
+    F64Transmute { u: 0x3910000000000000 }.f,
+    F64Transmute { u: 0x3920000000000000 }.f,
+    F64Transmute { u: 0x3930000000000000 }.f,
+    F64Transmute { u: 0x3940000000000000 }.f,
+    F64Transmute { u: 0x3950000000000000 }.f,
+    F64Transmute { u: 0x3960000000000000 }.f,
+    F64Transmute { u: 0x3970000000000000 }.f,
+    F64Transmute { u: 0x3980000000000000 }.f,
+    F64Transmute { u: 0x3990000000000000 }.f,
+    F64Transmute { u: 0x39A0000000000000 }.f,
+    F64Transmute { u: 0x39B0000000000000 }.f,
+    F64Transmute { u: 0x39C0000000000000 }.f,
+    F64Transmute { u: 0x39D0000000000000 }.f,
+    F64Transmute { u: 0x39E0000000000000 }.f,
+    F64Transmute { u: 0x39F0000000000000 }.f,
+    F64Transmute { u: 0x3A00000000000000 }.f,
+    F64Transmute { u: 0x3A10000000000000 }.f,
+    F64Transmute { u: 0x3A20000000000000 }.f,
+    F64Transmute { u: 0x3A30000000000000 }.f,
+    F64Transmute { u: 0x3A40000000000000 }.f,
+    F64Transmute { u: 0x3A50000000000000 }.f,
+    F64Transmute { u: 0x3A60000000000000 }.f,
+    F64Transmute { u: 0x3A70000000000000 }.f,
+    F64Transmute { u: 0x3A80000000000000 }.f,
+    F64Transmute { u: 0x3A90000000000000 }.f,
+    F64Transmute { u: 0x3AA0000000000000 }.f,
+    F64Transmute { u: 0x3AB0000000000000 }.f,
+    F64Transmute { u: 0x3AC0000000000000 }.f,
+    F64Transmute { u: 0x3AD0000000000000 }.f,
+    F64Transmute { u: 0x3AE0000000000000 }.f,
+    F64Transmute { u: 0x3AF0000000000000 }.f,
+    F64Transmute { u: 0x3B00000000000000 }.f,
+    F64Transmute { u: 0x3B10000000000000 }.f,
+    F64Transmute { u: 0x3B20000000000000 }.f,
+    F64Transmute { u: 0x3B30000000000000 }.f,
+    F64Transmute { u: 0x3B40000000000000 }.f,
+    F64Transmute { u: 0x3B50000000000000 }.f,
+    F64Transmute { u: 0x3B60000000000000 }.f,
+    F64Transmute { u: 0x3B70000000000000 }.f,
+    F64Transmute { u: 0x3B80000000000000 }.f,
+    F64Transmute { u: 0x3B90000000000000 }.f,
+    F64Transmute { u: 0x3BA0000000000000 }.f,
+    F64Transmute { u: 0x3BB0000000000000 }.f,
+    F64Transmute { u: 0x3BC0000000000000 }.f,
+    F64Transmute { u: 0x3BD0000000000000 }.f,
+    F64Transmute { u: 0x3BE0000000000000 }.f,
+    F64Transmute { u: 0x3BF0000000000000 }.f,
+    F64Transmute { u: 0x3C00000000000000 }.f,
+    F64Transmute { u: 0x3C10000000000000 }.f,
+    F64Transmute { u: 0x3C20000000000000 }.f,
+    F64Transmute { u: 0x3C30000000000000 }.f,
+    F64Transmute { u: 0x3C40000000000000 }.f,
+    F64Transmute { u: 0x3C50000000000000 }.f,
+    F64Transmute { u: 0x3C60000000000000 }.f,
+    F64Transmute { u: 0x3C70000000000000 }.f,
+    F64Transmute { u: 0x3C80000000000000 }.f,
+    F64Transmute { u: 0x3C90000000000000 }.f,
+    F64Transmute { u: 0x3CA0000000000000 }.f,
+    F64Transmute { u: 0x3CB0000000000000 }.f,
+    F64Transmute { u: 0x3CC0000000000000 }.f,
+    F64Transmute { u: 0x3CD0000000000000 }.f,
+    F64Transmute { u: 0x3CE0000000000000 }.f,
+    F64Transmute { u: 0x3CF0000000000000 }.f,
+    F64Transmute { u: 0x3D00000000000000 }.f,
+    F64Transmute { u: 0x3D10000000000000 }.f,
+    F64Transmute { u: 0x3D20000000000000 }.f,
+    F64Transmute { u: 0x3D30000000000000 }.f,
+    F64Transmute { u: 0x3D40000000000000 }.f,
+    F64Transmute { u: 0x3D50000000000000 }.f,
+    F64Transmute { u: 0x3D60000000000000 }.f,
+    F64Transmute { u: 0x3D70000000000000 }.f,
+    F64Transmute { u: 0x3D80000000000000 }.f,
+    F64Transmute { u: 0x3D90000000000000 }.f,
+    F64Transmute { u: 0x3DA0000000000000 }.f,
+    F64Transmute { u: 0x3DB0000000000000 }.f,
+    F64Transmute { u: 0x3DC0000000000000 }.f,
+    F64Transmute { u: 0x3DD0000000000000 }.f,
+    F64Transmute { u: 0x3DE0000000000000 }.f,
+    F64Transmute { u: 0x3DF0000000000000 }.f,
+    F64Transmute { u: 0x3E00000000000000 }.f,
+    F64Transmute { u: 0x3E10000000000000 }.f,
+    F64Transmute { u: 0x3E20000000000000 }.f,
+    F64Transmute { u: 0x3E30000000000000 }.f,
+    F64Transmute { u: 0x3E40000000000000 }.f,
+    F64Transmute { u: 0x3E50000000000000 }.f,
+    F64Transmute { u: 0x3E60000000000000 }.f,
+    F64Transmute { u: 0x3E70000000000000 }.f,
+    F64Transmute { u: 0x3E80000000000000 }.f,
+    F64Transmute { u: 0x3E90000000000000 }.f,
+    F64Transmute { u: 0x3EA0000000000000 }.f,
+    F64Transmute { u: 0x3EB0000000000000 }.f,
+    F64Transmute { u: 0x3EC0000000000000 }.f,
+    F64Transmute { u: 0x3ED0000000000000 }.f,
+    F64Transmute { u: 0x3EE0000000000000 }.f,
+    F64Transmute { u: 0x3EF0000000000000 }.f,
+    F64Transmute { u: 0x3F00000000000000 }.f,
+    F64Transmute { u: 0x3F10000000000000 }.f,
+    F64Transmute { u: 0x3F20000000000000 }.f,
+    F64Transmute { u: 0x3F30000000000000 }.f,
+    F64Transmute { u: 0x3F40000000000000 }.f,
+    F64Transmute { u: 0x3F50000000000000 }.f,
+    F64Transmute { u: 0x3F60000000000000 }.f,
+    F64Transmute { u: 0x3F70000000000000 }.f,
+    F64Transmute { u: 0x3F80000000000000 }.f,
+    F64Transmute { u: 0x3F90000000000000 }.f,
+    F64Transmute { u: 0x3FA0000000000000 }.f,
+    F64Transmute { u: 0x3FB0000000000000 }.f,
+    F64Transmute { u: 0x3FC0000000000000 }.f,
+    F64Transmute { u: 0x3FD0000000000000 }.f,
+    F64Transmute { u: 0x3FE0000000000000 }.f,
+    F64Transmute { u: 0x3FF0000000000000 }.f,
+    F64Transmute { u: 0x4000000000000000 }.f,
+    F64Transmute { u: 0x4010000000000000 }.f,
+    F64Transmute { u: 0x4020000000000000 }.f,
+    F64Transmute { u: 0x4030000000000000 }.f,
+    F64Transmute { u: 0x4040000000000000 }.f,
+    F64Transmute { u: 0x4050000000000000 }.f,
+    F64Transmute { u: 0x4060000000000000 }.f,
+    F64Transmute { u: 0x4070000000000000 }.f,
+    F64Transmute { u: 0x4080000000000000 }.f,
+    F64Transmute { u: 0x4090000000000000 }.f,
+    F64Transmute { u: 0x40A0000000000000 }.f,
+    F64Transmute { u: 0x40B0000000000000 }.f,
+    F64Transmute { u: 0x40C0000000000000 }.f,
+    F64Transmute { u: 0x40D0000000000000 }.f,
+    F64Transmute { u: 0x40E0000000000000 }.f,
+    F64Transmute { u: 0x40F0000000000000 }.f,
+    F64Transmute { u: 0x4100000000000000 }.f,
+    F64Transmute { u: 0x4110000000000000 }.f,
+    F64Transmute { u: 0x4120000000000000 }.f,
+    F64Transmute { u: 0x4130000000000000 }.f,
+    F64Transmute { u: 0x4140000000000000 }.f,
+    F64Transmute { u: 0x4150000000000000 }.f,
+    F64Transmute { u: 0x4160000000000000 }.f,
+    F64Transmute { u: 0x4170000000000000 }.f,
+    F64Transmute { u: 0x4180000000000000 }.f,
+    F64Transmute { u: 0x4190000000000000 }.f,
+    F64Transmute { u: 0x41A0000000000000 }.f,
+    F64Transmute { u: 0x41B0000000000000 }.f,
+    F64Transmute { u: 0x41C0000000000000 }.f,
+    F64Transmute { u: 0x41D0000000000000 }.f,
+    F64Transmute { u: 0x41E0000000000000 }.f,
+    F64Transmute { u: 0x41F0000000000000 }.f,
+    F64Transmute { u: 0x4200000000000000 }.f,
+    F64Transmute { u: 0x4210000000000000 }.f,
+    F64Transmute { u: 0x4220000000000000 }.f,
+    F64Transmute { u: 0x4230000000000000 }.f,
+    F64Transmute { u: 0x4240000000000000 }.f,
+    F64Transmute { u: 0x4250000000000000 }.f,
+    F64Transmute { u: 0x4260000000000000 }.f,
+    F64Transmute { u: 0x4270000000000000 }.f,
+    F64Transmute { u: 0x4280000000000000 }.f,
+    F64Transmute { u: 0x4290000000000000 }.f,
+    F64Transmute { u: 0x42A0000000000000 }.f,
+    F64Transmute { u: 0x42B0000000000000 }.f,
+    F64Transmute { u: 0x42C0000000000000 }.f,
+    F64Transmute { u: 0x42D0000000000000 }.f,
+    F64Transmute { u: 0x42E0000000000000 }.f,
+    F64Transmute { u: 0x42F0000000000000 }.f,
+    F64Transmute { u: 0x4300000000000000 }.f,
+    F64Transmute { u: 0x4310000000000000 }.f,
+    F64Transmute { u: 0x4320000000000000 }.f,
+    F64Transmute { u: 0x4330000000000000 }.f,
+    F64Transmute { u: 0x4340000000000000 }.f,
+    F64Transmute { u: 0x4350000000000000 }.f,
+    F64Transmute { u: 0x4360000000000000 }.f,
+    F64Transmute { u: 0x4370000000000000 }.f,
+    F64Transmute { u: 0x4380000000000000 }.f,
+    F64Transmute { u: 0x4390000000000000 }.f,
+    F64Transmute { u: 0x43A0000000000000 }.f,
+    F64Transmute { u: 0x43B0000000000000 }.f,
+    F64Transmute { u: 0x43C0000000000000 }.f,
+    F64Transmute { u: 0x43D0000000000000 }.f,
+    F64Transmute { u: 0x43E0000000000000 }.f,
+    F64Transmute { u: 0x43F0000000000000 }.f,
+    F64Transmute { u: 0x4400000000000000 }.f,
+    F64Transmute { u: 0x4410000000000000 }.f,
+    F64Transmute { u: 0x4420000000000000 }.f,
+    F64Transmute { u: 0x4430000000000000 }.f,
+    F64Transmute { u: 0x4440000000000000 }.f,
+    F64Transmute { u: 0x4450000000000000 }.f,
+    F64Transmute { u: 0x4460000000000000 }.f,
+    F64Transmute { u: 0x4470000000000000 }.f,
+    F64Transmute { u: 0x4480000000000000 }.f,
+    F64Transmute { u: 0x4490000000000000 }.f,
+    F64Transmute { u: 0x44A0000000000000 }.f,
+    F64Transmute { u: 0x44B0000000000000 }.f,
+    F64Transmute { u: 0x44C0000000000000 }.f,
+    F64Transmute { u: 0x44D0000000000000 }.f,
+    F64Transmute { u: 0x44E0000000000000 }.f,
+    F64Transmute { u: 0x44F0000000000000 }.f,
+    F64Transmute { u: 0x4500000000000000 }.f,
+    F64Transmute { u: 0x4510000000000000 }.f,
+    F64Transmute { u: 0x4520000000000000 }.f,
+    F64Transmute { u: 0x4530000000000000 }.f,
+    F64Transmute { u: 0x4540000000000000 }.f,
+    F64Transmute { u: 0x4550000000000000 }.f,
+    F64Transmute { u: 0x4560000000000000 }.f,
+    F64Transmute { u: 0x4570000000000000 }.f,
+    F64Transmute { u: 0x4580000000000000 }.f,
+    F64Transmute { u: 0x4590000000000000 }.f,
+    F64Transmute { u: 0x45A0000000000000 }.f,
+    F64Transmute { u: 0x45B0000000000000 }.f,
+    F64Transmute { u: 0x45C0000000000000 }.f,
+    F64Transmute { u: 0x45D0000000000000 }.f,
+    F64Transmute { u: 0x45E0000000000000 }.f,
+    F64Transmute { u: 0x45F0000000000000 }.f,
+    F64Transmute { u: 0x4600000000000000 }.f,
+    F64Transmute { u: 0x4610000000000000 }.f,
+    F64Transmute { u: 0x4620000000000000 }.f,
+    F64Transmute { u: 0x4630000000000000 }.f,
+    F64Transmute { u: 0x4640000000000000 }.f,
+    F64Transmute { u: 0x4650000000000000 }.f,
+    F64Transmute { u: 0x4660000000000000 }.f,
+    F64Transmute { u: 0x4670000000000000 }.f,
+    F64Transmute { u: 0x4680000000000000 }.f,
+    F64Transmute { u: 0x4690000000000000 }.f,
+    F64Transmute { u: 0x46A0000000000000 }.f,
+    F64Transmute { u: 0x46B0000000000000 }.f,
+    F64Transmute { u: 0x46C0000000000000 }.f,
+    F64Transmute { u: 0x46D0000000000000 }.f,
+    F64Transmute { u: 0x46E0000000000000 }.f,
+    F64Transmute { u: 0x46F0000000000000 }.f,
+    F64Transmute { u: 0x4700000000000000 }.f,
+    F64Transmute { u: 0x4710000000000000 }.f,
+    F64Transmute { u: 0x4720000000000000 }.f,
+    F64Transmute { u: 0x4730000000000000 }.f,
+    F64Transmute { u: 0x4740000000000000 }.f,
+    F64Transmute { u: 0x4750000000000000 }.f,
+    F64Transmute { u: 0x4760000000000000 }.f,
+    F64Transmute { u: 0x4770000000000000 }.f,
+    F64Transmute { u: 0x4780000000000000 }.f,
+    F64Transmute { u: 0x4790000000000000 }.f,
+    F64Transmute { u: 0x47A0000000000000 }.f,
+    F64Transmute { u: 0x47B0000000000000 }.f,
+    F64Transmute { u: 0x47C0000000000000 }.f,
+    F64Transmute { u: 0x47D0000000000000 }.f,
+    F64Transmute { u: 0x47E0000000000000 }.f,
+    F64Transmute { u: 0x47F0000000000000 }.f,
+    F64Transmute { u: 0x4800000000000000 }.f,
+    F64Transmute { u: 0x4810000000000000 }.f,
+    F64Transmute { u: 0x4820000000000000 }.f,
+    F64Transmute { u: 0x4830000000000000 }.f,
+    F64Transmute { u: 0x4840000000000000 }.f,
+    F64Transmute { u: 0x4850000000000000 }.f,
+    F64Transmute { u: 0x4860000000000000 }.f,
+    F64Transmute { u: 0x4870000000000000 }.f,
+    F64Transmute { u: 0x4880000000000000 }.f,
+    F64Transmute { u: 0x4890000000000000 }.f,
+    F64Transmute { u: 0x48A0000000000000 }.f,
+    F64Transmute { u: 0x48B0000000000000 }.f,
+    F64Transmute { u: 0x48C0000000000000 }.f,
+    F64Transmute { u: 0x48D0000000000000 }.f,
+    F64Transmute { u: 0x48E0000000000000 }.f,
+    F64Transmute { u: 0x48F0000000000000 }.f,
+    F64Transmute { u: 0x4900000000000000 }.f,
+    F64Transmute { u: 0x4910000000000000 }.f,
+    F64Transmute { u: 0x4920000000000000 }.f,
+    F64Transmute { u: 0x4930000000000000 }.f,
+    F64Transmute { u: 0x4940000000000000 }.f,
+    F64Transmute { u: 0x4950000000000000 }.f,
+    F64Transmute { u: 0x4960000000000000 }.f,
+    F64Transmute { u: 0x4970000000000000 }.f,
+    F64Transmute { u: 0x4980000000000000 }.f,
+    F64Transmute { u: 0x4990000000000000 }.f,
+    F64Transmute { u: 0x49A0000000000000 }.f,
+    F64Transmute { u: 0x49B0000000000000 }.f,
+    F64Transmute { u: 0x49C0000000000000 }.f,
+    F64Transmute { u: 0x49D0000000000000 }.f,
+    F64Transmute { u: 0x49E0000000000000 }.f,
+    F64Transmute { u: 0x49F0000000000000 }.f,
+    F64Transmute { u: 0x4A00000000000000 }.f,
+    F64Transmute { u: 0x4A10000000000000 }.f,
+    F64Transmute { u: 0x4A20000000000000 }.f,
+    F64Transmute { u: 0x4A30000000000000 }.f,
+    F64Transmute { u: 0x4A40000000000000 }.f,
+    F64Transmute { u: 0x4A50000000000000 }.f,
+    F64Transmute { u: 0x4A60000000000000 }.f,
+    F64Transmute { u: 0x4A70000000000000 }.f,
+    F64Transmute { u: 0x4A80000000000000 }.f,
+    F64Transmute { u: 0x4A90000000000000 }.f,
+    F64Transmute { u: 0x4AA0000000000000 }.f,
+    F64Transmute { u: 0x4AB0000000000000 }.f,
+    F64Transmute { u: 0x4AC0000000000000 }.f,
+    F64Transmute { u: 0x4AD0000000000000 }.f,
+    F64Transmute { u: 0x4AE0000000000000 }.f,
+    F64Transmute { u: 0x4AF0000000000000 }.f,
+    F64Transmute { u: 0x4B00000000000000 }.f,
+    F64Transmute { u: 0x4B10000000000000 }.f,
+    F64Transmute { u: 0x4B20000000000000 }.f,
+    F64Transmute { u: 0x4B30000000000000 }.f,
+    F64Transmute { u: 0x4B40000000000000 }.f,
+    F64Transmute { u: 0x4B50000000000000 }.f,
+    F64Transmute { u: 0x4B60000000000000 }.f,
+    F64Transmute { u: 0x4B70000000000000 }.f,
+    F64Transmute { u: 0x4B80000000000000 }.f,
+    F64Transmute { u: 0x4B90000000000000 }.f,
+    F64Transmute { u: 0x4BA0000000000000 }.f,
+    F64Transmute { u: 0x4BB0000000000000 }.f,
+    F64Transmute { u: 0x4BC0000000000000 }.f,
+    F64Transmute { u: 0x4BD0000000000000 }.f,
+    F64Transmute { u: 0x4BE0000000000000 }.f,
+    F64Transmute { u: 0x4BF0000000000000 }.f,
+    F64Transmute { u: 0x4C00000000000000 }.f,
+    F64Transmute { u: 0x4C10000000000000 }.f,
+    F64Transmute { u: 0x4C20000000000000 }.f,
+    F64Transmute { u: 0x4C30000000000000 }.f,
+    F64Transmute { u: 0x4C40000000000000 }.f,
+    F64Transmute { u: 0x4C50000000000000 }.f,
+    F64Transmute { u: 0x4C60000000000000 }.f,
+    F64Transmute { u: 0x4C70000000000000 }.f,
+    F64Transmute { u: 0x4C80000000000000 }.f,
+    F64Transmute { u: 0x4C90000000000000 }.f,
+    F64Transmute { u: 0x4CA0000000000000 }.f,
+    F64Transmute { u: 0x4CB0000000000000 }.f,
+    F64Transmute { u: 0x4CC0000000000000 }.f,
+    F64Transmute { u: 0x4CD0000000000000 }.f,
+    F64Transmute { u: 0x4CE0000000000000 }.f,
+    F64Transmute { u: 0x4CF0000000000000 }.f,
+    F64Transmute { u: 0x4D00000000000000 }.f,
+    F64Transmute { u: 0x4D10000000000000 }.f,
+    F64Transmute { u: 0x4D20000000000000 }.f,
+    F64Transmute { u: 0x4D30000000000000 }.f,
+    F64Transmute { u: 0x4D40000000000000 }.f,
+    F64Transmute { u: 0x4D50000000000000 }.f,
+    F64Transmute { u: 0x4D60000000000000 }.f,
+    F64Transmute { u: 0x4D70000000000000 }.f,
+    F64Transmute { u: 0x4D80000000000000 }.f,
+    F64Transmute { u: 0x4D90000000000000 }.f,
+    F64Transmute { u: 0x4DA0000000000000 }.f,
+    F64Transmute { u: 0x4DB0000000000000 }.f,
+    F64Transmute { u: 0x4DC0000000000000 }.f,
+    F64Transmute { u: 0x4DD0000000000000 }.f,
+    F64Transmute { u: 0x4DE0000000000000 }.f,
+    F64Transmute { u: 0x4DF0000000000000 }.f,
+    F64Transmute { u: 0x4E00000000000000 }.f,
+    F64Transmute { u: 0x4E10000000000000 }.f,
+    F64Transmute { u: 0x4E20000000000000 }.f,
+    F64Transmute { u: 0x4E30000000000000 }.f,
+    F64Transmute { u: 0x4E40000000000000 }.f,
+    F64Transmute { u: 0x4E50000000000000 }.f,
+    F64Transmute { u: 0x4E60000000000000 }.f,
+    F64Transmute { u: 0x4E70000000000000 }.f,
+    F64Transmute { u: 0x4E80000000000000 }.f,
+    F64Transmute { u: 0x4E90000000000000 }.f,
+    F64Transmute { u: 0x4EA0000000000000 }.f,
+    F64Transmute { u: 0x4EB0000000000000 }.f,
+    F64Transmute { u: 0x4EC0000000000000 }.f,
+    F64Transmute { u: 0x4ED0000000000000 }.f,
+    F64Transmute { u: 0x4EE0000000000000 }.f,
+    F64Transmute { u: 0x4EF0000000000000 }.f,
+    F64Transmute { u: 0x4F00000000000000 }.f,
+    F64Transmute { u: 0x4F10000000000000 }.f,
+    F64Transmute { u: 0x4F20000000000000 }.f,
+    F64Transmute { u: 0x4F30000000000000 }.f,
+    F64Transmute { u: 0x4F40000000000000 }.f,
+    F64Transmute { u: 0x4F50000000000000 }.f,
+    F64Transmute { u: 0x4F60000000000000 }.f,
+    F64Transmute { u: 0x4F70000000000000 }.f,
+    F64Transmute { u: 0x4F80000000000000 }.f,
+    F64Transmute { u: 0x4F90000000000000 }.f,
+    F64Transmute { u: 0x4FA0000000000000 }.f,
+    F64Transmute { u: 0x4FB0000000000000 }.f,
+    F64Transmute { u: 0x4FC0000000000000 }.f,
+    F64Transmute { u: 0x4FD0000000000000 }.f,
+    F64Transmute { u: 0x4FE0000000000000 }.f,
+    F64Transmute { u: 0x4FF0000000000000 }.f,
+    F64Transmute { u: 0x5000000000000000 }.f,
+    F64Transmute { u: 0x5010000000000000 }.f,
+    F64Transmute { u: 0x5020000000000000 }.f,
+    F64Transmute { u: 0x5030000000000000 }.f,
+    F64Transmute { u: 0x5040000000000000 }.f,
+    F64Transmute { u: 0x5050000000000000 }.f,
+    F64Transmute { u: 0x5060000000000000 }.f,
+    F64Transmute { u: 0x5070000000000000 }.f,
+    F64Transmute { u: 0x5080000000000000 }.f,
+    F64Transmute { u: 0x5090000000000000 }.f,
+    F64Transmute { u: 0x50A0000000000000 }.f,
+    F64Transmute { u: 0x50B0000000000000 }.f,
+    F64Transmute { u: 0x50C0000000000000 }.f,
+    F64Transmute { u: 0x50D0000000000000 }.f,
+    F64Transmute { u: 0x50E0000000000000 }.f,
+    F64Transmute { u: 0x50F0000000000000 }.f,
+    F64Transmute { u: 0x5100000000000000 }.f,
+    F64Transmute { u: 0x5110000000000000 }.f,
+    F64Transmute { u: 0x5120000000000000 }.f,
+    F64Transmute { u: 0x5130000000000000 }.f,
+    F64Transmute { u: 0x5140000000000000 }.f,
+    F64Transmute { u: 0x5150000000000000 }.f,
+    F64Transmute { u: 0x5160000000000000 }.f,
+    F64Transmute { u: 0x5170000000000000 }.f,
+    F64Transmute { u: 0x5180000000000000 }.f,
+    F64Transmute { u: 0x5190000000000000 }.f,
+    F64Transmute { u: 0x51A0000000000000 }.f,
+    F64Transmute { u: 0x51B0000000000000 }.f,
+    F64Transmute { u: 0x51C0000000000000 }.f,
+    F64Transmute { u: 0x51D0000000000000 }.f,
+    F64Transmute { u: 0x51E0000000000000 }.f,
+    F64Transmute { u: 0x51F0000000000000 }.f,
+    F64Transmute { u: 0x5200000000000000 }.f,
+    F64Transmute { u: 0x5210000000000000 }.f,
+    F64Transmute { u: 0x5220000000000000 }.f,
+    F64Transmute { u: 0x5230000000000000 }.f,
+    F64Transmute { u: 0x5240000000000000 }.f,
+    F64Transmute { u: 0x5250000000000000 }.f,
+    F64Transmute { u: 0x5260000000000000 }.f,
+    F64Transmute { u: 0x5270000000000000 }.f,
+    F64Transmute { u: 0x5280000000000000 }.f,
+    F64Transmute { u: 0x5290000000000000 }.f,
+    F64Transmute { u: 0x52A0000000000000 }.f,
+    F64Transmute { u: 0x52B0000000000000 }.f,
+    F64Transmute { u: 0x52C0000000000000 }.f,
+    F64Transmute { u: 0x52D0000000000000 }.f,
+    F64Transmute { u: 0x52E0000000000000 }.f,
+    F64Transmute { u: 0x52F0000000000000 }.f,
+    F64Transmute { u: 0x5300000000000000 }.f,
+    F64Transmute { u: 0x5310000000000000 }.f,
+    F64Transmute { u: 0x5320000000000000 }.f,
+    F64Transmute { u: 0x5330000000000000 }.f,
+    F64Transmute { u: 0x5340000000000000 }.f,
+    F64Transmute { u: 0x5350000000000000 }.f,
+    F64Transmute { u: 0x5360000000000000 }.f,
+    F64Transmute { u: 0x5370000000000000 }.f,
+    F64Transmute { u: 0x5380000000000000 }.f,
+    F64Transmute { u: 0x5390000000000000 }.f,
+    F64Transmute { u: 0x53A0000000000000 }.f,
+    F64Transmute { u: 0x53B0000000000000 }.f,
+    F64Transmute { u: 0x53C0000000000000 }.f,
+    F64Transmute { u: 0x53D0000000000000 }.f,
+    F64Transmute { u: 0x53E0000000000000 }.f,
+    F64Transmute { u: 0x53F0000000000000 }.f,
+    F64Transmute { u: 0x5400000000000000 }.f,
+    F64Transmute { u: 0x5410000000000000 }.f,
+    F64Transmute { u: 0x5420000000000000 }.f,
+    F64Transmute { u: 0x5430000000000000 }.f,
+    F64Transmute { u: 0x5440000000000000 }.f,
+    F64Transmute { u: 0x5450000000000000 }.f,
+    F64Transmute { u: 0x5460000000000000 }.f,
+    F64Transmute { u: 0x5470000000000000 }.f,
+    F64Transmute { u: 0x5480000000000000 }.f,
+    F64Transmute { u: 0x5490000000000000 }.f,
+    F64Transmute { u: 0x54A0000000000000 }.f,
+    F64Transmute { u: 0x54B0000000000000 }.f,
+    F64Transmute { u: 0x54C0000000000000 }.f,
+    F64Transmute { u: 0x54D0000000000000 }.f,
+    F64Transmute { u: 0x54E0000000000000 }.f,
+    F64Transmute { u: 0x54F0000000000000 }.f,
+    F64Transmute { u: 0x5500000000000000 }.f,
+    F64Transmute { u: 0x5510000000000000 }.f,
+    F64Transmute { u: 0x5520000000000000 }.f,
+    F64Transmute { u: 0x5530000000000000 }.f,
+    F64Transmute { u: 0x5540000000000000 }.f,
+    F64Transmute { u: 0x5550000000000000 }.f,
+    F64Transmute { u: 0x5560000000000000 }.f,
+    F64Transmute { u: 0x5570000000000000 }.f,
+    F64Transmute { u: 0x5580000000000000 }.f,
+    F64Transmute { u: 0x5590000000000000 }.f,
+    F64Transmute { u: 0x55A0000000000000 }.f,
+    F64Transmute { u: 0x55B0000000000000 }.f,
+    F64Transmute { u: 0x55C0000000000000 }.f,
+    F64Transmute { u: 0x55D0000000000000 }.f,
+    F64Transmute { u: 0x55E0000000000000 }.f,
+    F64Transmute { u: 0x55F0000000000000 }.f,
+    F64Transmute { u: 0x5600000000000000 }.f,
+    F64Transmute { u: 0x5610000000000000 }.f,
+    F64Transmute { u: 0x5620000000000000 }.f,
+    F64Transmute { u: 0x5630000000000000 }.f,
+    F64Transmute { u: 0x5640000000000000 }.f,
+    F64Transmute { u: 0x5650000000000000 }.f,
+    F64Transmute { u: 0x5660000000000000 }.f,
+    F64Transmute { u: 0x5670000000000000 }.f,
+    F64Transmute { u: 0x5680000000000000 }.f,
+    F64Transmute { u: 0x5690000000000000 }.f,
+    F64Transmute { u: 0x56A0000000000000 }.f,
+    F64Transmute { u: 0x56B0000000000000 }.f,
+    F64Transmute { u: 0x56C0000000000000 }.f,
+    F64Transmute { u: 0x56D0000000000000 }.f,
+    F64Transmute { u: 0x56E0000000000000 }.f,
+    F64Transmute { u: 0x56F0000000000000 }.f,
+    F64Transmute { u: 0x5700000000000000 }.f,
+    F64Transmute { u: 0x5710000000000000 }.f,
+    F64Transmute { u: 0x5720000000000000 }.f,
+    F64Transmute { u: 0x5730000000000000 }.f,
+    F64Transmute { u: 0x5740000000000000 }.f,
+    F64Transmute { u: 0x5750000000000000 }.f,
+    F64Transmute { u: 0x5760000000000000 }.f,
+    F64Transmute { u: 0x5770000000000000 }.f,
+    F64Transmute { u: 0x5780000000000000 }.f,
+    F64Transmute { u: 0x5790000000000000 }.f,
+    F64Transmute { u: 0x57A0000000000000 }.f,
+    F64Transmute { u: 0x57B0000000000000 }.f,
+    F64Transmute { u: 0x57C0000000000000 }.f,
+    F64Transmute { u: 0x57D0000000000000 }.f,
+    F64Transmute { u: 0x57E0000000000000 }.f,
+    F64Transmute { u: 0x57F0000000000000 }.f,
+    F64Transmute { u: 0x5800000000000000 }.f,
+    F64Transmute { u: 0x5810000000000000 }.f,
+    F64Transmute { u: 0x5820000000000000 }.f,
+    F64Transmute { u: 0x5830000000000000 }.f,
+    F64Transmute { u: 0x5840000000000000 }.f,
+    F64Transmute { u: 0x5850000000000000 }.f,
+    F64Transmute { u: 0x5860000000000000 }.f,
+    F64Transmute { u: 0x5870000000000000 }.f,
+    F64Transmute { u: 0x5880000000000000 }.f,
+    F64Transmute { u: 0x5890000000000000 }.f,
+    F64Transmute { u: 0x58A0000000000000 }.f,
+    F64Transmute { u: 0x58B0000000000000 }.f,
+    F64Transmute { u: 0x58C0000000000000 }.f,
+    F64Transmute { u: 0x58D0000000000000 }.f,
+    F64Transmute { u: 0x58E0000000000000 }.f,
+    F64Transmute { u: 0x58F0000000000000 }.f,
+    F64Transmute { u: 0x5900000000000000 }.f,
+    F64Transmute { u: 0x5910000000000000 }.f,
+    F64Transmute { u: 0x5920000000000000 }.f,
+    F64Transmute { u: 0x5930000000000000 }.f,
+    F64Transmute { u: 0x5940000000000000 }.f,
+    F64Transmute { u: 0x5950000000000000 }.f,
+    F64Transmute { u: 0x5960000000000000 }.f,
+    F64Transmute { u: 0x5970000000000000 }.f,
+    F64Transmute { u: 0x5980000000000000 }.f,
+    F64Transmute { u: 0x5990000000000000 }.f,
+    F64Transmute { u: 0x59A0000000000000 }.f,
+    F64Transmute { u: 0x59B0000000000000 }.f,
+    F64Transmute { u: 0x59C0000000000000 }.f,
+    F64Transmute { u: 0x59D0000000000000 }.f,
+    F64Transmute { u: 0x59E0000000000000 }.f,
+    F64Transmute { u: 0x59F0000000000000 }.f,
+    F64Transmute { u: 0x5A00000000000000 }.f,
+    F64Transmute { u: 0x5A10000000000000 }.f,
+    F64Transmute { u: 0x5A20000000000000 }.f,
+    F64Transmute { u: 0x5A30000000000000 }.f,
+    F64Transmute { u: 0x5A40000000000000 }.f,
+    F64Transmute { u: 0x5A50000000000000 }.f,
+    F64Transmute { u: 0x5A60000000000000 }.f,
+    F64Transmute { u: 0x5A70000000000000 }.f,
+    F64Transmute { u: 0x5A80000000000000 }.f,
+    F64Transmute { u: 0x5A90000000000000 }.f,
+    F64Transmute { u: 0x5AA0000000000000 }.f,
+    F64Transmute { u: 0x5AB0000000000000 }.f,
+    F64Transmute { u: 0x5AC0000000000000 }.f,
+    F64Transmute { u: 0x5AD0000000000000 }.f,
+    F64Transmute { u: 0x5AE0000000000000 }.f,
+    F64Transmute { u: 0x5AF0000000000000 }.f,
+    F64Transmute { u: 0x5B00000000000000 }.f,
+    F64Transmute { u: 0x5B10000000000000 }.f,
+    F64Transmute { u: 0x5B20000000000000 }.f,
+    F64Transmute { u: 0x5B30000000000000 }.f,
+    F64Transmute { u: 0x5B40000000000000 }.f,
+    F64Transmute { u: 0x5B50000000000000 }.f,
+    F64Transmute { u: 0x5B60000000000000 }.f,
+    F64Transmute { u: 0x5B70000000000000 }.f,
+    F64Transmute { u: 0x5B80000000000000 }.f,
+    F64Transmute { u: 0x5B90000000000000 }.f,
+    F64Transmute { u: 0x5BA0000000000000 }.f,
+    F64Transmute { u: 0x5BB0000000000000 }.f,
+    F64Transmute { u: 0x5BC0000000000000 }.f,
+    F64Transmute { u: 0x5BD0000000000000 }.f,
+    F64Transmute { u: 0x5BE0000000000000 }.f,
+    F64Transmute { u: 0x5BF0000000000000 }.f,
+    F64Transmute { u: 0x5C00000000000000 }.f,
+    F64Transmute { u: 0x5C10000000000000 }.f,
+    F64Transmute { u: 0x5C20000000000000 }.f,
+    F64Transmute { u: 0x5C30000000000000 }.f,
+    F64Transmute { u: 0x5C40000000000000 }.f,
+    F64Transmute { u: 0x5C50000000000000 }.f,
+    F64Transmute { u: 0x5C60000000000000 }.f,
+    F64Transmute { u: 0x5C70000000000000 }.f,
+    F64Transmute { u: 0x5C80000000000000 }.f,
+    F64Transmute { u: 0x5C90000000000000 }.f,
+    F64Transmute { u: 0x5CA0000000000000 }.f,
+    F64Transmute { u: 0x5CB0000000000000 }.f,
+    F64Transmute { u: 0x5CC0000000000000 }.f,
+    F64Transmute { u: 0x5CD0000000000000 }.f,
+    F64Transmute { u: 0x5CE0000000000000 }.f,
+    F64Transmute { u: 0x5CF0000000000000 }.f,
+    F64Transmute { u: 0x5D00000000000000 }.f,
+    F64Transmute { u: 0x5D10000000000000 }.f,
+    F64Transmute { u: 0x5D20000000000000 }.f,
+    F64Transmute { u: 0x5D30000000000000 }.f,
+    F64Transmute { u: 0x5D40000000000000 }.f,
+    F64Transmute { u: 0x5D50000000000000 }.f,
+    F64Transmute { u: 0x5D60000000000000 }.f,
+    F64Transmute { u: 0x5D70000000000000 }.f,
+    F64Transmute { u: 0x5D80000000000000 }.f,
+    F64Transmute { u: 0x5D90000000000000 }.f,
+    F64Transmute { u: 0x5DA0000000000000 }.f,
+    F64Transmute { u: 0x5DB0000000000000 }.f,
+    F64Transmute { u: 0x5DC0000000000000 }.f,
+    F64Transmute { u: 0x5DD0000000000000 }.f,
+    F64Transmute { u: 0x5DE0000000000000 }.f,
+    F64Transmute { u: 0x5DF0000000000000 }.f,
+    F64Transmute { u: 0x5E00000000000000 }.f,
+    F64Transmute { u: 0x5E10000000000000 }.f,
+    F64Transmute { u: 0x5E20000000000000 }.f,
+    F64Transmute { u: 0x5E30000000000000 }.f,
+    F64Transmute { u: 0x5E40000000000000 }.f,
+    F64Transmute { u: 0x5E50000000000000 }.f,
+    F64Transmute { u: 0x5E60000000000000 }.f,
+    F64Transmute { u: 0x5E70000000000000 }.f,
+    F64Transmute { u: 0x5E80000000000000 }.f,
+    F64Transmute { u: 0x5E90000000000000 }.f,
+    F64Transmute { u: 0x5EA0000000000000 }.f,
+    F64Transmute { u: 0x5EB0000000000000 }.f,
+    F64Transmute { u: 0x5EC0000000000000 }.f,
+    F64Transmute { u: 0x5ED0000000000000 }.f,
+    F64Transmute { u: 0x5EE0000000000000 }.f,
+    F64Transmute { u: 0x5EF0000000000000 }.f,
+    F64Transmute { u: 0x5F00000000000000 }.f,
+    F64Transmute { u: 0x5F10000000000000 }.f,
+    F64Transmute { u: 0x5F20000000000000 }.f,
+    F64Transmute { u: 0x5F30000000000000 }.f,
+    F64Transmute { u: 0x5F40000000000000 }.f,
+    F64Transmute { u: 0x5F50000000000000 }.f,
+    F64Transmute { u: 0x5F60000000000000 }.f,
+    F64Transmute { u: 0x5F70000000000000 }.f,
+    F64Transmute { u: 0x5F80000000000000 }.f,
+    F64Transmute { u: 0x5F90000000000000 }.f,
+    F64Transmute { u: 0x5FA0000000000000 }.f,
+    F64Transmute { u: 0x5FB0000000000000 }.f,
+    F64Transmute { u: 0x5FC0000000000000 }.f,
+    F64Transmute { u: 0x5FD0000000000000 }.f,
+    F64Transmute { u: 0x5FE0000000000000 }.f,
+    F64Transmute { u: 0x5FF0000000000000 }.f,
+    F64Transmute { u: 0x6000000000000000 }.f,
+    F64Transmute { u: 0x6010000000000000 }.f,
+    F64Transmute { u: 0x6020000000000000 }.f,
+    F64Transmute { u: 0x6030000000000000 }.f,
+    F64Transmute { u: 0x6040000000000000 }.f,
+    F64Transmute { u: 0x6050000000000000 }.f,
+    F64Transmute { u: 0x6060000000000000 }.f,
+    F64Transmute { u: 0x6070000000000000 }.f,
+    F64Transmute { u: 0x6080000000000000 }.f,
+    F64Transmute { u: 0x6090000000000000 }.f,
+    F64Transmute { u: 0x60A0000000000000 }.f,
+    F64Transmute { u: 0x60B0000000000000 }.f,
+    F64Transmute { u: 0x60C0000000000000 }.f,
+    F64Transmute { u: 0x60D0000000000000 }.f,
+    F64Transmute { u: 0x60E0000000000000 }.f,
+    F64Transmute { u: 0x60F0000000000000 }.f,
+    F64Transmute { u: 0x6100000000000000 }.f,
+    F64Transmute { u: 0x6110000000000000 }.f,
+    F64Transmute { u: 0x6120000000000000 }.f,
+    F64Transmute { u: 0x6130000000000000 }.f,
+    F64Transmute { u: 0x6140000000000000 }.f,
+    F64Transmute { u: 0x6150000000000000 }.f,
+    F64Transmute { u: 0x6160000000000000 }.f,
+    F64Transmute { u: 0x6170000000000000 }.f,
+    F64Transmute { u: 0x6180000000000000 }.f,
+    F64Transmute { u: 0x6190000000000000 }.f,
+    F64Transmute { u: 0x61A0000000000000 }.f,
+    F64Transmute { u: 0x61B0000000000000 }.f,
+    F64Transmute { u: 0x61C0000000000000 }.f,
+    F64Transmute { u: 0x61D0000000000000 }.f,
+    F64Transmute { u: 0x61E0000000000000 }.f,
+    F64Transmute { u: 0x61F0000000000000 }.f,
+    F64Transmute { u: 0x6200000000000000 }.f,
+    F64Transmute { u: 0x6210000000000000 }.f,
+    F64Transmute { u: 0x6220000000000000 }.f,
+    F64Transmute { u: 0x6230000000000000 }.f,
+    F64Transmute { u: 0x6240000000000000 }.f,
+    F64Transmute { u: 0x6250000000000000 }.f,
+    F64Transmute { u: 0x6260000000000000 }.f,
+    F64Transmute { u: 0x6270000000000000 }.f,
+    F64Transmute { u: 0x6280000000000000 }.f,
+    F64Transmute { u: 0x6290000000000000 }.f,
+    F64Transmute { u: 0x62A0000000000000 }.f,
+    F64Transmute { u: 0x62B0000000000000 }.f,
+    F64Transmute { u: 0x62C0000000000000 }.f,
+    F64Transmute { u: 0x62D0000000000000 }.f,
+    F64Transmute { u: 0x62E0000000000000 }.f,
+    F64Transmute { u: 0x62F0000000000000 }.f,
+    F64Transmute { u: 0x6300000000000000 }.f,
+    F64Transmute { u: 0x6310000000000000 }.f,
+    F64Transmute { u: 0x6320000000000000 }.f,
+    F64Transmute { u: 0x6330000000000000 }.f,
+    F64Transmute { u: 0x6340000000000000 }.f,
+    F64Transmute { u: 0x6350000000000000 }.f,
+    F64Transmute { u: 0x6360000000000000 }.f,
+    F64Transmute { u: 0x6370000000000000 }.f,
+    F64Transmute { u: 0x6380000000000000 }.f,
+    F64Transmute { u: 0x6390000000000000 }.f,
+    F64Transmute { u: 0x63A0000000000000 }.f,
+    F64Transmute { u: 0x63B0000000000000 }.f,
+    F64Transmute { u: 0x63C0000000000000 }.f,
+    F64Transmute { u: 0x63D0000000000000 }.f,
+    F64Transmute { u: 0x63E0000000000000 }.f,
+    F64Transmute { u: 0x63F0000000000000 }.f,
+    F64Transmute { u: 0x6400000000000000 }.f,
+    F64Transmute { u: 0x6410000000000000 }.f,
+    F64Transmute { u: 0x6420000000000000 }.f,
+    F64Transmute { u: 0x6430000000000000 }.f,
+    F64Transmute { u: 0x6440000000000000 }.f,
+    F64Transmute { u: 0x6450000000000000 }.f,
+    F64Transmute { u: 0x6460000000000000 }.f,
+    F64Transmute { u: 0x6470000000000000 }.f,
+    F64Transmute { u: 0x6480000000000000 }.f,
+    F64Transmute { u: 0x6490000000000000 }.f,
+    F64Transmute { u: 0x64A0000000000000 }.f,
+    F64Transmute { u: 0x64B0000000000000 }.f,
+    F64Transmute { u: 0x64C0000000000000 }.f,
+    F64Transmute { u: 0x64D0000000000000 }.f,
+    F64Transmute { u: 0x64E0000000000000 }.f,
+    F64Transmute { u: 0x64F0000000000000 }.f,
+    F64Transmute { u: 0x6500000000000000 }.f,
+    F64Transmute { u: 0x6510000000000000 }.f,
+    F64Transmute { u: 0x6520000000000000 }.f,
+    F64Transmute { u: 0x6530000000000000 }.f,
+    F64Transmute { u: 0x6540000000000000 }.f,
+    F64Transmute { u: 0x6550000000000000 }.f,
+    F64Transmute { u: 0x6560000000000000 }.f,
+    F64Transmute { u: 0x6570000000000000 }.f,
+    F64Transmute { u: 0x6580000000000000 }.f,
+    F64Transmute { u: 0x6590000000000000 }.f,
+    F64Transmute { u: 0x65A0000000000000 }.f,
+    F64Transmute { u: 0x65B0000000000000 }.f,
+    F64Transmute { u: 0x65C0000000000000 }.f,
+    F64Transmute { u: 0x65D0000000000000 }.f,
+    F64Transmute { u: 0x65E0000000000000 }.f,
+    F64Transmute { u: 0x65F0000000000000 }.f,
+    F64Transmute { u: 0x6600000000000000 }.f,
+    F64Transmute { u: 0x6610000000000000 }.f,
+    F64Transmute { u: 0x6620000000000000 }.f,
+    F64Transmute { u: 0x6630000000000000 }.f,
+    F64Transmute { u: 0x6640000000000000 }.f,
+    F64Transmute { u: 0x6650000000000000 }.f,
+    F64Transmute { u: 0x6660000000000000 }.f,
+    F64Transmute { u: 0x6670000000000000 }.f,
+    F64Transmute { u: 0x6680000000000000 }.f,
+    F64Transmute { u: 0x6690000000000000 }.f,
+    F64Transmute { u: 0x66A0000000000000 }.f,
+    F64Transmute { u: 0x66B0000000000000 }.f,
+    F64Transmute { u: 0x66C0000000000000 }.f,
+    F64Transmute { u: 0x66D0000000000000 }.f,
+    F64Transmute { u: 0x66E0000000000000 }.f,
+    F64Transmute { u: 0x66F0000000000000 }.f,
+    F64Transmute { u: 0x6700000000000000 }.f,
+    F64Transmute { u: 0x6710000000000000 }.f,
+    F64Transmute { u: 0x6720000000000000 }.f,
+    F64Transmute { u: 0x6730000000000000 }.f,
+    F64Transmute { u: 0x6740000000000000 }.f,
+    F64Transmute { u: 0x6750000000000000 }.f,
+    F64Transmute { u: 0x6760000000000000 }.f,
+    F64Transmute { u: 0x6770000000000000 }.f,
+    F64Transmute { u: 0x6780000000000000 }.f,
+    F64Transmute { u: 0x6790000000000000 }.f,
+    F64Transmute { u: 0x67A0000000000000 }.f,
+    F64Transmute { u: 0x67B0000000000000 }.f,
+    F64Transmute { u: 0x67C0000000000000 }.f,
+    F64Transmute { u: 0x67D0000000000000 }.f,
+    F64Transmute { u: 0x67E0000000000000 }.f,
+    F64Transmute { u: 0x67F0000000000000 }.f,
+    F64Transmute { u: 0x6800000000000000 }.f,
+    F64Transmute { u: 0x6810000000000000 }.f,
+    F64Transmute { u: 0x6820000000000000 }.f,
+    F64Transmute { u: 0x6830000000000000 }.f,
+    F64Transmute { u: 0x6840000000000000 }.f,
+    F64Transmute { u: 0x6850000000000000 }.f,
+    F64Transmute { u: 0x6860000000000000 }.f,
+    F64Transmute { u: 0x6870000000000000 }.f,
+    F64Transmute { u: 0x6880000000000000 }.f,
+    F64Transmute { u: 0x6890000000000000 }.f,
+    F64Transmute { u: 0x68A0000000000000 }.f,
+    F64Transmute { u: 0x68B0000000000000 }.f,
+    F64Transmute { u: 0x68C0000000000000 }.f,
+    F64Transmute { u: 0x68D0000000000000 }.f,
+    F64Transmute { u: 0x68E0000000000000 }.f,
+    F64Transmute { u: 0x68F0000000000000 }.f,
+    F64Transmute { u: 0x6900000000000000 }.f,
+    F64Transmute { u: 0x6910000000000000 }.f,
+    F64Transmute { u: 0x6920000000000000 }.f,
+    F64Transmute { u: 0x6930000000000000 }.f,
+    F64Transmute { u: 0x6940000000000000 }.f,
+    F64Transmute { u: 0x6950000000000000 }.f,
+    F64Transmute { u: 0x6960000000000000 }.f,
+    F64Transmute { u: 0x6970000000000000 }.f,
+    F64Transmute { u: 0x6980000000000000 }.f,
+    F64Transmute { u: 0x6990000000000000 }.f,
+    F64Transmute { u: 0x69A0000000000000 }.f,
+    F64Transmute { u: 0x69B0000000000000 }.f,
+    F64Transmute { u: 0x69C0000000000000 }.f,
+    F64Transmute { u: 0x69D0000000000000 }.f,
+    F64Transmute { u: 0x69E0000000000000 }.f,
+    F64Transmute { u: 0x69F0000000000000 }.f,
+    F64Transmute { u: 0x6A00000000000000 }.f,
+    F64Transmute { u: 0x6A10000000000000 }.f,
+    F64Transmute { u: 0x6A20000000000000 }.f,
+    F64Transmute { u: 0x6A30000000000000 }.f,
+    F64Transmute { u: 0x6A40000000000000 }.f,
+    F64Transmute { u: 0x6A50000000000000 }.f,
+    F64Transmute { u: 0x6A60000000000000 }.f,
+    F64Transmute { u: 0x6A70000000000000 }.f,
+    F64Transmute { u: 0x6A80000000000000 }.f,
+    F64Transmute { u: 0x6A90000000000000 }.f,
+    F64Transmute { u: 0x6AA0000000000000 }.f,
+    F64Transmute { u: 0x6AB0000000000000 }.f,
+    F64Transmute { u: 0x6AC0000000000000 }.f,
+    F64Transmute { u: 0x6AD0000000000000 }.f,
+    F64Transmute { u: 0x6AE0000000000000 }.f,
+    F64Transmute { u: 0x6AF0000000000000 }.f,
+    F64Transmute { u: 0x6B00000000000000 }.f,
+    F64Transmute { u: 0x6B10000000000000 }.f,
+    F64Transmute { u: 0x6B20000000000000 }.f,
+    F64Transmute { u: 0x6B30000000000000 }.f,
+    F64Transmute { u: 0x6B40000000000000 }.f,
+    F64Transmute { u: 0x6B50000000000000 }.f,
+    F64Transmute { u: 0x6B60000000000000 }.f,
+    F64Transmute { u: 0x6B70000000000000 }.f,
+    F64Transmute { u: 0x6B80000000000000 }.f,
+    F64Transmute { u: 0x6B90000000000000 }.f,
+    F64Transmute { u: 0x6BA0000000000000 }.f,
+    F64Transmute { u: 0x6BB0000000000000 }.f,
+    F64Transmute { u: 0x6BC0000000000000 }.f,
+    F64Transmute { u: 0x6BD0000000000000 }.f,
+    F64Transmute { u: 0x6BE0000000000000 }.f,
+    F64Transmute { u: 0x6BF0000000000000 }.f,
+    F64Transmute { u: 0x6C00000000000000 }.f,
+    F64Transmute { u: 0x6C10000000000000 }.f,
+    F64Transmute { u: 0x6C20000000000000 }.f,
+    F64Transmute { u: 0x6C30000000000000 }.f,
+    F64Transmute { u: 0x6C40000000000000 }.f,
+    F64Transmute { u: 0x6C50000000000000 }.f,
+    F64Transmute { u: 0x6C60000000000000 }.f,
+    F64Transmute { u: 0x6C70000000000000 }.f,
+    F64Transmute { u: 0x6C80000000000000 }.f,
+    F64Transmute { u: 0x6C90000000000000 }.f,
+    F64Transmute { u: 0x6CA0000000000000 }.f,
+    F64Transmute { u: 0x6CB0000000000000 }.f,
+    F64Transmute { u: 0x6CC0000000000000 }.f,
+    F64Transmute { u: 0x6CD0000000000000 }.f,
+    F64Transmute { u: 0x6CE0000000000000 }.f,
+    F64Transmute { u: 0x6CF0000000000000 }.f,
+    F64Transmute { u: 0x6D00000000000000 }.f,
+    F64Transmute { u: 0x6D10000000000000 }.f,
+    F64Transmute { u: 0x6D20000000000000 }.f,
+    F64Transmute { u: 0x6D30000000000000 }.f,
+    F64Transmute { u: 0x6D40000000000000 }.f,
+    F64Transmute { u: 0x6D50000000000000 }.f,
+    F64Transmute { u: 0x6D60000000000000 }.f,
+    F64Transmute { u: 0x6D70000000000000 }.f,
+    F64Transmute { u: 0x6D80000000000000 }.f,
+    F64Transmute { u: 0x6D90000000000000 }.f,
+    F64Transmute { u: 0x6DA0000000000000 }.f,
+    F64Transmute { u: 0x6DB0000000000000 }.f,
+    F64Transmute { u: 0x6DC0000000000000 }.f,
+    F64Transmute { u: 0x6DD0000000000000 }.f,
+    F64Transmute { u: 0x6DE0000000000000 }.f,
+    F64Transmute { u: 0x6DF0000000000000 }.f,
+    F64Transmute { u: 0x6E00000000000000 }.f,
+    F64Transmute { u: 0x6E10000000000000 }.f,
+    F64Transmute { u: 0x6E20000000000000 }.f,
+    F64Transmute { u: 0x6E30000000000000 }.f,
+    F64Transmute { u: 0x6E40000000000000 }.f,
+    F64Transmute { u: 0x6E50000000000000 }.f,
+    F64Transmute { u: 0x6E60000000000000 }.f,
+    F64Transmute { u: 0x6E70000000000000 }.f,
+    F64Transmute { u: 0x6E80000000000000 }.f,
+    F64Transmute { u: 0x6E90000000000000 }.f,
+    F64Transmute { u: 0x6EA0000000000000 }.f,
+    F64Transmute { u: 0x6EB0000000000000 }.f,
+    F64Transmute { u: 0x6EC0000000000000 }.f,
+    F64Transmute { u: 0x6ED0000000000000 }.f,
+    F64Transmute { u: 0x6EE0000000000000 }.f,
+    F64Transmute { u: 0x6EF0000000000000 }.f,
+    F64Transmute { u: 0x6F00000000000000 }.f,
+    F64Transmute { u: 0x6F10000000000000 }.f,
+    F64Transmute { u: 0x6F20000000000000 }.f,
+    F64Transmute { u: 0x6F30000000000000 }.f,
+    F64Transmute { u: 0x6F40000000000000 }.f,
+    F64Transmute { u: 0x6F50000000000000 }.f,
+    F64Transmute { u: 0x6F60000000000000 }.f,
+    F64Transmute { u: 0x6F70000000000000 }.f,
+    F64Transmute { u: 0x6F80000000000000 }.f,
+    F64Transmute { u: 0x6F90000000000000 }.f,
+    F64Transmute { u: 0x6FA0000000000000 }.f,
+    F64Transmute { u: 0x6FB0000000000000 }.f,
+    F64Transmute { u: 0x6FC0000000000000 }.f,
+    F64Transmute { u: 0x6FD0000000000000 }.f,
+    F64Transmute { u: 0x6FE0000000000000 }.f,
+    F64Transmute { u: 0x6FF0000000000000 }.f,
+    F64Transmute { u: 0x7000000000000000 }.f,
+    F64Transmute { u: 0x7010000000000000 }.f,
+    F64Transmute { u: 0x7020000000000000 }.f,
+    F64Transmute { u: 0x7030000000000000 }.f,
+    F64Transmute { u: 0x7040000000000000 }.f,
+    F64Transmute { u: 0x7050000000000000 }.f,
+    F64Transmute { u: 0x7060000000000000 }.f,
+    F64Transmute { u: 0x7070000000000000 }.f,
+    F64Transmute { u: 0x7080000000000000 }.f,
+    F64Transmute { u: 0x7090000000000000 }.f,
+    F64Transmute { u: 0x70A0000000000000 }.f,
+    F64Transmute { u: 0x70B0000000000000 }.f,
+    F64Transmute { u: 0x70C0000000000000 }.f,
+    F64Transmute { u: 0x70D0000000000000 }.f,
+    F64Transmute { u: 0x70E0000000000000 }.f,
+    F64Transmute { u: 0x70F0000000000000 }.f,
+    F64Transmute { u: 0x7100000000000000 }.f,
+    F64Transmute { u: 0x7110000000000000 }.f,
+    F64Transmute { u: 0x7120000000000000 }.f,
+    F64Transmute { u: 0x7130000000000000 }.f,
+    F64Transmute { u: 0x7140000000000000 }.f,
+    F64Transmute { u: 0x7150000000000000 }.f,
+    F64Transmute { u: 0x7160000000000000 }.f,
+    F64Transmute { u: 0x7170000000000000 }.f,
+    F64Transmute { u: 0x7180000000000000 }.f,
+    F64Transmute { u: 0x7190000000000000 }.f,
+    F64Transmute { u: 0x71A0000000000000 }.f,
+    F64Transmute { u: 0x71B0000000000000 }.f,
+    F64Transmute { u: 0x71C0000000000000 }.f,
+    F64Transmute { u: 0x71D0000000000000 }.f,
+    F64Transmute { u: 0x71E0000000000000 }.f,
+    F64Transmute { u: 0x71F0000000000000 }.f,
+    F64Transmute { u: 0x7200000000000000 }.f,
+    F64Transmute { u: 0x7210000000000000 }.f,
+    F64Transmute { u: 0x7220000000000000 }.f,
+    F64Transmute { u: 0x7230000000000000 }.f,
+    F64Transmute { u: 0x7240000000000000 }.f,
+    F64Transmute { u: 0x7250000000000000 }.f,
+    F64Transmute { u: 0x7260000000000000 }.f,
+    F64Transmute { u: 0x7270000000000000 }.f,
+    F64Transmute { u: 0x7280000000000000 }.f,
+    F64Transmute { u: 0x7290000000000000 }.f,
+    F64Transmute { u: 0x72A0000000000000 }.f,
+    F64Transmute { u: 0x72B0000000000000 }.f,
+    F64Transmute { u: 0x72C0000000000000 }.f,
+    F64Transmute { u: 0x72D0000000000000 }.f,
+    F64Transmute { u: 0x72E0000000000000 }.f,
+    F64Transmute { u: 0x72F0000000000000 }.f,
+    F64Transmute { u: 0x7300000000000000 }.f,
+    F64Transmute { u: 0x7310000000000000 }.f,
+    F64Transmute { u: 0x7320000000000000 }.f,
+    F64Transmute { u: 0x7330000000000000 }.f,
+    F64Transmute { u: 0x7340000000000000 }.f,
+    F64Transmute { u: 0x7350000000000000 }.f,
+    F64Transmute { u: 0x7360000000000000 }.f,
+    F64Transmute { u: 0x7370000000000000 }.f,
+    F64Transmute { u: 0x7380000000000000 }.f,
+    F64Transmute { u: 0x7390000000000000 }.f,
+    F64Transmute { u: 0x73A0000000000000 }.f,
+    F64Transmute { u: 0x73B0000000000000 }.f,
+    F64Transmute { u: 0x73C0000000000000 }.f,
+    F64Transmute { u: 0x73D0000000000000 }.f,
+    F64Transmute { u: 0x73E0000000000000 }.f,
+    F64Transmute { u: 0x73F0000000000000 }.f,
+    F64Transmute { u: 0x7400000000000000 }.f,
+    F64Transmute { u: 0x7410000000000000 }.f,
+    F64Transmute { u: 0x7420000000000000 }.f,
+    F64Transmute { u: 0x7430000000000000 }.f,
+    F64Transmute { u: 0x7440000000000000 }.f,
+    F64Transmute { u: 0x7450000000000000 }.f,
+    F64Transmute { u: 0x7460000000000000 }.f,
+    F64Transmute { u: 0x7470000000000000 }.f,
+    F64Transmute { u: 0x7480000000000000 }.f,
+    F64Transmute { u: 0x7490000000000000 }.f,
+    F64Transmute { u: 0x74A0000000000000 }.f,
+    F64Transmute { u: 0x74B0000000000000 }.f,
+    F64Transmute { u: 0x74C0000000000000 }.f,
+    F64Transmute { u: 0x74D0000000000000 }.f,
+    F64Transmute { u: 0x74E0000000000000 }.f,
+    F64Transmute { u: 0x74F0000000000000 }.f,
+    F64Transmute { u: 0x7500000000000000 }.f,
+    F64Transmute { u: 0x7510000000000000 }.f,
+    F64Transmute { u: 0x7520000000000000 }.f,
+    F64Transmute { u: 0x7530000000000000 }.f,
+    F64Transmute { u: 0x7540000000000000 }.f,
+    F64Transmute { u: 0x7550000000000000 }.f,
+    F64Transmute { u: 0x7560000000000000 }.f,
+    F64Transmute { u: 0x7570000000000000 }.f,
+    F64Transmute { u: 0x7580000000000000 }.f,
+    F64Transmute { u: 0x7590000000000000 }.f,
+    F64Transmute { u: 0x75A0000000000000 }.f,
+    F64Transmute { u: 0x75B0000000000000 }.f,
+    F64Transmute { u: 0x75C0000000000000 }.f,
+    F64Transmute { u: 0x75D0000000000000 }.f,
+    F64Transmute { u: 0x75E0000000000000 }.f,
+    F64Transmute { u: 0x75F0000000000000 }.f,
+    F64Transmute { u: 0x7600000000000000 }.f,
+    F64Transmute { u: 0x7610000000000000 }.f,
+    F64Transmute { u: 0x7620000000000000 }.f,
+    F64Transmute { u: 0x7630000000000000 }.f,
+    F64Transmute { u: 0x7640000000000000 }.f,
+    F64Transmute { u: 0x7650000000000000 }.f,
+    F64Transmute { u: 0x7660000000000000 }.f,
+    F64Transmute { u: 0x7670000000000000 }.f,
+    F64Transmute { u: 0x7680000000000000 }.f,
+    F64Transmute { u: 0x7690000000000000 }.f,
+    F64Transmute { u: 0x76A0000000000000 }.f,
+    F64Transmute { u: 0x76B0000000000000 }.f,
+    F64Transmute { u: 0x76C0000000000000 }.f,
+    F64Transmute { u: 0x76D0000000000000 }.f,
+    F64Transmute { u: 0x76E0000000000000 }.f,
+    F64Transmute { u: 0x76F0000000000000 }.f,
+    F64Transmute { u: 0x7700000000000000 }.f,
+    F64Transmute { u: 0x7710000000000000 }.f,
+    F64Transmute { u: 0x7720000000000000 }.f,
+    F64Transmute { u: 0x7730000000000000 }.f,
+    F64Transmute { u: 0x7740000000000000 }.f,
+    F64Transmute { u: 0x7750000000000000 }.f,
+    F64Transmute { u: 0x7760000000000000 }.f,
+    F64Transmute { u: 0x7770000000000000 }.f,
+    F64Transmute { u: 0x7780000000000000 }.f,
+    F64Transmute { u: 0x7790000000000000 }.f,
+    F64Transmute { u: 0x77A0000000000000 }.f,
+    F64Transmute { u: 0x77B0000000000000 }.f,
+    F64Transmute { u: 0x77C0000000000000 }.f,
+    F64Transmute { u: 0x77D0000000000000 }.f,
+    F64Transmute { u: 0x77E0000000000000 }.f,
+    F64Transmute { u: 0x77F0000000000000 }.f,
+    F64Transmute { u: 0x7800000000000000 }.f,
+    F64Transmute { u: 0x7810000000000000 }.f,
+    F64Transmute { u: 0x7820000000000000 }.f,
+    F64Transmute { u: 0x7830000000000000 }.f,
+    F64Transmute { u: 0x7840000000000000 }.f,
+    F64Transmute { u: 0x7850000000000000 }.f,
+    F64Transmute { u: 0x7860000000000000 }.f,
+    F64Transmute { u: 0x7870000000000000 }.f,
+    F64Transmute { u: 0x7880000000000000 }.f,
+    F64Transmute { u: 0x7890000000000000 }.f,
+    F64Transmute { u: 0x78A0000000000000 }.f,
+    F64Transmute { u: 0x78B0000000000000 }.f,
+    F64Transmute { u: 0x78C0000000000000 }.f,
+    F64Transmute { u: 0x78D0000000000000 }.f,
+    F64Transmute { u: 0x78E0000000000000 }.f,
+    F64Transmute { u: 0x78F0000000000000 }.f,
+    F64Transmute { u: 0x7900000000000000 }.f,
+    F64Transmute { u: 0x7910000000000000 }.f,
+    F64Transmute { u: 0x7920000000000000 }.f,
+    F64Transmute { u: 0x7930000000000000 }.f,
+    F64Transmute { u: 0x7940000000000000 }.f,
+    F64Transmute { u: 0x7950000000000000 }.f,
+    F64Transmute { u: 0x7960000000000000 }.f,
+    F64Transmute { u: 0x7970000000000000 }.f,
+    F64Transmute { u: 0x7980000000000000 }.f,
+    F64Transmute { u: 0x7990000000000000 }.f,
+    F64Transmute { u: 0x79A0000000000000 }.f,
+    F64Transmute { u: 0x79B0000000000000 }.f,
+    F64Transmute { u: 0x79C0000000000000 }.f,
+    F64Transmute { u: 0x79D0000000000000 }.f,
+    F64Transmute { u: 0x79E0000000000000 }.f,
+    F64Transmute { u: 0x79F0000000000000 }.f,
+    F64Transmute { u: 0x7A00000000000000 }.f,
+    F64Transmute { u: 0x7A10000000000000 }.f,
+    F64Transmute { u: 0x7A20000000000000 }.f,
+    F64Transmute { u: 0x7A30000000000000 }.f,
+    F64Transmute { u: 0x7A40000000000000 }.f,
+    F64Transmute { u: 0x7A50000000000000 }.f,
+    F64Transmute { u: 0x7A60000000000000 }.f,
+    F64Transmute { u: 0x7A70000000000000 }.f,
+    F64Transmute { u: 0x7A80000000000000 }.f,
+    F64Transmute { u: 0x7A90000000000000 }.f,
+    F64Transmute { u: 0x7AA0000000000000 }.f,
+    F64Transmute { u: 0x7AB0000000000000 }.f,
+    F64Transmute { u: 0x7AC0000000000000 }.f,
+    F64Transmute { u: 0x7AD0000000000000 }.f,
+    F64Transmute { u: 0x7AE0000000000000 }.f,
+    F64Transmute { u: 0x7AF0000000000000 }.f,
+    F64Transmute { u: 0x7B00000000000000 }.f,
+    F64Transmute { u: 0x7B10000000000000 }.f,
+    F64Transmute { u: 0x7B20000000000000 }.f,
+    F64Transmute { u: 0x7B30000000000000 }.f,
+    F64Transmute { u: 0x7B40000000000000 }.f,
+    F64Transmute { u: 0x7B50000000000000 }.f,
+    F64Transmute { u: 0x7B60000000000000 }.f,
+    F64Transmute { u: 0x7B70000000000000 }.f,
+    F64Transmute { u: 0x7B80000000000000 }.f,
+    F64Transmute { u: 0x7B90000000000000 }.f,
+    F64Transmute { u: 0x7BA0000000000000 }.f,
+    F64Transmute { u: 0x7BB0000000000000 }.f,
+    F64Transmute { u: 0x7BC0000000000000 }.f,
+    F64Transmute { u: 0x7BD0000000000000 }.f,
+    F64Transmute { u: 0x7BE0000000000000 }.f,
+    F64Transmute { u: 0x7BF0000000000000 }.f,
+    F64Transmute { u: 0x7C00000000000000 }.f,
+    F64Transmute { u: 0x7C10000000000000 }.f,
+    F64Transmute { u: 0x7C20000000000000 }.f,
+    F64Transmute { u: 0x7C30000000000000 }.f,
+    F64Transmute { u: 0x7C40000000000000 }.f,
+    F64Transmute { u: 0x7C50000000000000 }.f,
+    F64Transmute { u: 0x7C60000000000000 }.f,
+    F64Transmute { u: 0x7C70000000000000 }.f,
+    F64Transmute { u: 0x7C80000000000000 }.f,
+    F64Transmute { u: 0x7C90000000000000 }.f,
+    F64Transmute { u: 0x7CA0000000000000 }.f,
+    F64Transmute { u: 0x7CB0000000000000 }.f,
+    F64Transmute { u: 0x7CC0000000000000 }.f,
+    F64Transmute { u: 0x7CD0000000000000 }.f,
+    F64Transmute { u: 0x7CE0000000000000 }.f,
+    F64Transmute { u: 0x7CF0000000000000 }.f,
+    F64Transmute { u: 0x7D00000000000000 }.f,
+    F64Transmute { u: 0x7D10000000000000 }.f,
+    F64Transmute { u: 0x7D20000000000000 }.f,
+    F64Transmute { u: 0x7D30000000000000 }.f,
+    F64Transmute { u: 0x7D40000000000000 }.f,
+    F64Transmute { u: 0x7D50000000000000 }.f,
+    F64Transmute { u: 0x7D60000000000000 }.f,
+    F64Transmute { u: 0x7D70000000000000 }.f,
+    F64Transmute { u: 0x7D80000000000000 }.f,
+    F64Transmute { u: 0x7D90000000000000 }.f,
+    F64Transmute { u: 0x7DA0000000000000 }.f,
+    F64Transmute { u: 0x7DB0000000000000 }.f,
+    F64Transmute { u: 0x7DC0000000000000 }.f,
+    F64Transmute { u: 0x7DD0000000000000 }.f,
+    F64Transmute { u: 0x7DE0000000000000 }.f,
+    F64Transmute { u: 0x7DF0000000000000 }.f,
+    F64Transmute { u: 0x7E00000000000000 }.f,
+    F64Transmute { u: 0x7E10000000000000 }.f,
+    F64Transmute { u: 0x7E20000000000000 }.f,
+    F64Transmute { u: 0x7E30000000000000 }.f,
+    F64Transmute { u: 0x7E40000000000000 }.f,
+    F64Transmute { u: 0x7E50000000000000 }.f,
+    F64Transmute { u: 0x7E60000000000000 }.f,
+    F64Transmute { u: 0x7E70000000000000 }.f,
+    F64Transmute { u: 0x7E80000000000000 }.f,
+    F64Transmute { u: 0x7E90000000000000 }.f,
+    F64Transmute { u: 0x7EA0000000000000 }.f,
+    F64Transmute { u: 0x7EB0000000000000 }.f,
+    F64Transmute { u: 0x7EC0000000000000 }.f,
+    F64Transmute { u: 0x7ED0000000000000 }.f,
+    F64Transmute { u: 0x7EE0000000000000 }.f,
+    F64Transmute { u: 0x7EF0000000000000 }.f,
+    F64Transmute { u: 0x7F00000000000000 }.f,
+    F64Transmute { u: 0x7F10000000000000 }.f,
+    F64Transmute { u: 0x7F20000000000000 }.f,
+    F64Transmute { u: 0x7F30000000000000 }.f,
+    F64Transmute { u: 0x7F40000000000000 }.f,
+    F64Transmute { u: 0x7F50000000000000 }.f,
+    F64Transmute { u: 0x7F60000000000000 }.f,
+    F64Transmute { u: 0x7F70000000000000 }.f,
+    F64Transmute { u: 0x7F80000000000000 }.f,
+    F64Transmute { u: 0x7F90000000000000 }.f,
+    F64Transmute { u: 0x7FA0000000000000 }.f,
+    F64Transmute { u: 0x7FB0000000000000 }.f,
+    F64Transmute { u: 0x7FC0000000000000 }.f,
+    F64Transmute { u: 0x7FD0000000000000 }.f,
+    F64Transmute { u: 0x7FE0000000000000 }.f,
+]};
+
+/// Precalculated values of radix**i for i in range [0, arr.len()-1].
+/// Each value can be **exactly** represented as that type.
+const F64_POW10: [f64; 23] = [1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 10000000.0, 100000000.0, 1000000000.0, 10000000000.0, 100000000000.0, 1000000000000.0, 10000000000000.0, 100000000000000.0, 1000000000000000.0, 10000000000000000.0, 100000000000000000.0, 1000000000000000000.0, 10000000000000000000.0, 100000000000000000000.0, 1000000000000000000000.0, 10000000000000000000000.0];
+
+#[cfg(feature = "radix")]
+const F64_POW3: [f64; 34] = [1.0, 3.0, 9.0, 27.0, 81.0, 243.0, 729.0, 2187.0, 6561.0, 19683.0, 59049.0, 177147.0, 531441.0, 1594323.0, 4782969.0, 14348907.0, 43046721.0, 129140163.0, 387420489.0, 1162261467.0, 3486784401.0, 10460353203.0, 31381059609.0, 94143178827.0, 282429536481.0, 847288609443.0, 2541865828329.0, 7625597484987.0, 22876792454961.0, 68630377364883.0, 205891132094649.0, 617673396283947.0, 1853020188851841.0, 5559060566555523.0];
+
+#[cfg(feature = "radix")]
+const F64_POW5: [f64; 23] = [1.0, 5.0, 25.0, 125.0, 625.0, 3125.0, 15625.0, 78125.0, 390625.0, 1953125.0, 9765625.0, 48828125.0, 244140625.0, 1220703125.0, 6103515625.0, 30517578125.0, 152587890625.0, 762939453125.0, 3814697265625.0, 19073486328125.0, 95367431640625.0, 476837158203125.0, 2384185791015625.0];
+
+#[cfg(feature = "radix")]
+const F64_POW6: [f64; 34] = [1.0, 6.0, 36.0, 216.0, 1296.0, 7776.0, 46656.0, 279936.0, 1679616.0, 10077696.0, 60466176.0, 362797056.0, 2176782336.0, 13060694016.0, 78364164096.0, 470184984576.0, 2821109907456.0, 16926659444736.0, 101559956668416.0, 609359740010496.0, 3656158440062976.0, 21936950640377856.0, 131621703842267136.0, 789730223053602816.0, 4738381338321616896.0, 28430288029929701376.0, 170581728179578208256.0, 1023490369077469249536.0, 6140942214464815497216.0, 36845653286788892983296.0, 221073919720733357899776.0, 1326443518324400147398656.0, 7958661109946400884391936.0, 47751966659678405306351616.0];
+
+#[cfg(feature = "radix")]
+const F64_POW7: [f64; 19] = [1.0, 7.0, 49.0, 343.0, 2401.0, 16807.0, 117649.0, 823543.0, 5764801.0, 40353607.0, 282475249.0, 1977326743.0, 13841287201.0, 96889010407.0, 678223072849.0, 4747561509943.0, 33232930569601.0, 232630513987207.0, 1628413597910449.0];
+
+#[cfg(feature = "radix")]
+const F64_POW9: [f64; 17] = [1.0, 9.0, 81.0, 729.0, 6561.0, 59049.0, 531441.0, 4782969.0, 43046721.0, 387420489.0, 3486784401.0, 31381059609.0, 282429536481.0, 2541865828329.0, 22876792454961.0, 205891132094649.0, 1853020188851841.0];
+
+#[cfg(feature = "radix")]
+const F64_POW11: [f64; 16] = [1.0, 11.0, 121.0, 1331.0, 14641.0, 161051.0, 1771561.0, 19487171.0, 214358881.0, 2357947691.0, 25937424601.0, 285311670611.0, 3138428376721.0, 34522712143931.0, 379749833583241.0, 4177248169415651.0];
+
+#[cfg(feature = "radix")]
+const F64_POW12: [f64; 34] = [1.0, 12.0, 144.0, 1728.0, 20736.0, 248832.0, 2985984.0, 35831808.0, 429981696.0, 5159780352.0, 61917364224.0, 743008370688.0, 8916100448256.0, 106993205379072.0, 1283918464548864.0, 15407021574586368.0, 184884258895036416.0, 2218611106740436992.0, 26623333280885243904.0, 319479999370622926848.0, 3833759992447475122176.0, 46005119909369701466112.0, 552061438912436417593344.0, 6624737266949237011120128.0, 79496847203390844133441536.0, 953962166440690129601298432.0, 11447545997288281555215581184.0, 137370551967459378662586974208.0, 1648446623609512543951043690496.0, 19781359483314150527412524285952.0, 237376313799769806328950291431424.0, 2848515765597237675947403497177088.0, 34182189187166852111368841966125056.0, 410186270246002225336426103593500672.0];
+
+#[cfg(feature = "radix")]
+const F64_POW13: [f64; 15] = [1.0, 13.0, 169.0, 2197.0, 28561.0, 371293.0, 4826809.0, 62748517.0, 815730721.0, 10604499373.0, 137858491849.0, 1792160394037.0, 23298085122481.0, 302875106592253.0, 3937376385699289.0];
+
+#[cfg(feature = "radix")]
+const F64_POW14: [f64; 19] = [1.0, 14.0, 196.0, 2744.0, 38416.0, 537824.0, 7529536.0, 105413504.0, 1475789056.0, 20661046784.0, 289254654976.0, 4049565169664.0, 56693912375296.0, 793714773254144.0, 11112006825558016.0, 155568095557812224.0, 2177953337809371136.0, 30491346729331195904.0, 426878854210636742656.0];
+
+#[cfg(feature = "radix")]
+const F64_POW15: [f64; 14] = [1.0, 15.0, 225.0, 3375.0, 50625.0, 759375.0, 11390625.0, 170859375.0, 2562890625.0, 38443359375.0, 576650390625.0, 8649755859375.0, 129746337890625.0, 1946195068359375.0];
+
+#[cfg(feature = "radix")]
+const F64_POW17: [f64; 13] = [1.0, 17.0, 289.0, 4913.0, 83521.0, 1419857.0, 24137569.0, 410338673.0, 6975757441.0, 118587876497.0, 2015993900449.0, 34271896307633.0, 582622237229761.0];
+
+#[cfg(feature = "radix")]
+const F64_POW18: [f64; 17] = [1.0, 18.0, 324.0, 5832.0, 104976.0, 1889568.0, 34012224.0, 612220032.0, 11019960576.0, 198359290368.0, 3570467226624.0, 64268410079232.0, 1156831381426176.0, 20822964865671168.0, 374813367582081024.0, 6746640616477458432.0, 121439531096594251776.0];
+
+#[cfg(feature = "radix")]
+const F64_POW19: [f64; 13] = [1.0, 19.0, 361.0, 6859.0, 130321.0, 2476099.0, 47045881.0, 893871739.0, 16983563041.0, 322687697779.0, 6131066257801.0, 116490258898219.0, 2213314919066161.0];
+
+#[cfg(feature = "radix")]
+const F64_POW20: [f64; 23] = [1.0, 20.0, 400.0, 8000.0, 160000.0, 3200000.0, 64000000.0, 1280000000.0, 25600000000.0, 512000000000.0, 10240000000000.0, 204800000000000.0, 4096000000000000.0, 81920000000000000.0, 1638400000000000000.0, 32768000000000000000.0, 655360000000000000000.0, 13107200000000000000000.0, 262144000000000000000000.0, 5242880000000000000000000.0, 104857600000000000000000000.0, 2097152000000000000000000000.0, 41943040000000000000000000000.0];
+
+#[cfg(feature = "radix")]
+const F64_POW21: [f64; 13] = [1.0, 21.0, 441.0, 9261.0, 194481.0, 4084101.0, 85766121.0, 1801088541.0, 37822859361.0, 794280046581.0, 16679880978201.0, 350277500542221.0, 7355827511386641.0];
+
+#[cfg(feature = "radix")]
+const F64_POW22: [f64; 16] = [1.0, 22.0, 484.0, 10648.0, 234256.0, 5153632.0, 113379904.0, 2494357888.0, 54875873536.0, 1207269217792.0, 26559922791424.0, 584318301411328.0, 12855002631049216.0, 282810057883082752.0, 6221821273427820544.0, 136880068015412051968.0];
+
+#[cfg(feature = "radix")]
+const F64_POW23: [f64; 12] = [1.0, 23.0, 529.0, 12167.0, 279841.0, 6436343.0, 148035889.0, 3404825447.0, 78310985281.0, 1801152661463.0, 41426511213649.0, 952809757913927.0];
+
+#[cfg(feature = "radix")]
+const F64_POW24: [f64; 34] = [1.0, 24.0, 576.0, 13824.0, 331776.0, 7962624.0, 191102976.0, 4586471424.0, 110075314176.0, 2641807540224.0, 63403380965376.0, 1521681143169024.0, 36520347436056576.0, 876488338465357824.0, 21035720123168587776.0, 504857282956046106624.0, 12116574790945106558976.0, 290797794982682557415424.0, 6979147079584381377970176.0, 167499529910025153071284224.0, 4019988717840603673710821376.0, 96479729228174488169059713024.0, 2315513501476187716057433112576.0, 55572324035428505185378394701824.0, 1333735776850284124449081472843776.0, 32009658644406818986777955348250624.0, 768231807465763655682670928358014976.0, 18437563379178327736384102280592359424.0, 442501521100279865673218454734216626176.0, 10620036506406716776157242913621199028224.0, 254880876153761202627773829926908776677376.0, 6117141027690268863066571918245810640257024.0, 146811384664566452713597726037899455366168576.0, 3523473231949594865126345424909586928788045824.0];
+
+#[cfg(feature = "radix")]
+const F64_POW25: [f64; 12] = [1.0, 25.0, 625.0, 15625.0, 390625.0, 9765625.0, 244140625.0, 6103515625.0, 152587890625.0, 3814697265625.0, 95367431640625.0, 2384185791015625.0];
+
+#[cfg(feature = "radix")]
+const F64_POW26: [f64; 15] = [1.0, 26.0, 676.0, 17576.0, 456976.0, 11881376.0, 308915776.0, 8031810176.0, 208827064576.0, 5429503678976.0, 141167095653376.0, 3670344486987776.0, 95428956661682176.0, 2481152873203736576.0, 64509974703297150976.0];
+
+#[cfg(feature = "radix")]
+const F64_POW27: [f64; 12] = [1.0, 27.0, 729.0, 19683.0, 531441.0, 14348907.0, 387420489.0, 10460353203.0, 282429536481.0, 7625597484987.0, 205891132094649.0, 5559060566555523.0];
+
+#[cfg(feature = "radix")]
+const F64_POW28: [f64; 19] = [1.0, 28.0, 784.0, 21952.0, 614656.0, 17210368.0, 481890304.0, 13492928512.0, 377801998336.0, 10578455953408.0, 296196766695424.0, 8293509467471872.0, 232218265089212416.0, 6502111422497947648.0, 182059119829942534144.0, 5097655355238390956032.0, 142734349946674946768896.0, 3996561798506898509529088.0, 111903730358193158266814464.0];
+
+#[cfg(feature = "radix")]
+const F64_POW29: [f64; 11] = [1.0, 29.0, 841.0, 24389.0, 707281.0, 20511149.0, 594823321.0, 17249876309.0, 500246412961.0, 14507145975869.0, 420707233300201.0];
+
+#[cfg(feature = "radix")]
+const F64_POW30: [f64; 14] = [1.0, 30.0, 900.0, 27000.0, 810000.0, 24300000.0, 729000000.0, 21870000000.0, 656100000000.0, 19683000000000.0, 590490000000000.0, 17714700000000000.0, 531441000000000000.0, 15943230000000000000.0];
+
+#[cfg(feature = "radix")]
+const F64_POW31: [f64; 11] = [1.0, 31.0, 961.0, 29791.0, 923521.0, 28629151.0, 887503681.0, 27512614111.0, 852891037441.0, 26439622160671.0, 819628286980801.0];
+
+#[cfg(feature = "radix")]
+const F64_POW33: [f64; 11] = [1.0, 33.0, 1089.0, 35937.0, 1185921.0, 39135393.0, 1291467969.0, 42618442977.0, 1406408618241.0, 46411484401953.0, 1531578985264449.0];
+
+#[cfg(feature = "radix")]
+const F64_POW34: [f64; 13] = [1.0, 34.0, 1156.0, 39304.0, 1336336.0, 45435424.0, 1544804416.0, 52523350144.0, 1785793904896.0, 60716992766464.0, 2064377754059776.0, 70188843638032384.0, 2386420683693101056.0];
+
+#[cfg(feature = "radix")]
+const F64_POW35: [f64; 11] = [1.0, 35.0, 1225.0, 42875.0, 1500625.0, 52521875.0, 1838265625.0, 64339296875.0, 2251875390625.0, 78815638671875.0, 2758547353515625.0];
+
+#[cfg(feature = "radix")]
+const F64_POW36: [f64; 17] = [1.0, 36.0, 1296.0, 46656.0, 1679616.0, 60466176.0, 2176782336.0, 78364164096.0, 2821109907456.0, 101559956668416.0, 3656158440062976.0, 131621703842267136.0, 4738381338321616896.0, 170581728179578208256.0, 6140942214464815497216.0, 221073919720733357899776.0, 7958661109946400884391936.0];
+
+// Compile-time guarantees for our tables.
+const_assert!(F64_POW10[1] / F64_POW10[0] == 10.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW2[1] / F64_POW2[0] == 2.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW3[1] / F64_POW3[0] == 3.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW5[1] / F64_POW5[0] == 5.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW6[1] / F64_POW6[0] == 6.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW7[1] / F64_POW7[0] == 7.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW9[1] / F64_POW9[0] == 9.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW11[1] / F64_POW11[0] == 11.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW12[1] / F64_POW12[0] == 12.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW13[1] / F64_POW13[0] == 13.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW14[1] / F64_POW14[0] == 14.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW15[1] / F64_POW15[0] == 15.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW17[1] / F64_POW17[0] == 17.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW18[1] / F64_POW18[0] == 18.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW19[1] / F64_POW19[0] == 19.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW20[1] / F64_POW20[0] == 20.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW21[1] / F64_POW21[0] == 21.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW22[1] / F64_POW22[0] == 22.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW23[1] / F64_POW23[0] == 23.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW24[1] / F64_POW24[0] == 24.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW25[1] / F64_POW25[0] == 25.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW26[1] / F64_POW26[0] == 26.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW27[1] / F64_POW27[0] == 27.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW28[1] / F64_POW28[0] == 28.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW29[1] / F64_POW29[0] == 29.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW30[1] / F64_POW30[0] == 30.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW31[1] / F64_POW31[0] == 31.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW33[1] / F64_POW33[0] == 33.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW34[1] / F64_POW34[0] == 34.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW35[1] / F64_POW35[0] == 35.0);
+
+#[cfg(feature = "radix")]
+const_assert!(F64_POW36[1] / F64_POW36[0] == 36.0);
+
+impl TablePower for f64 {
+    const POW2_EXPONENT_BIAS: i32 = 1074;
+
+    #[cfg(feature = "radix")]
+    #[inline]
+    fn table_pow2(exponent: i32) -> f64 {
+        debug_assert!(exponent + Self::POW2_EXPONENT_BIAS >= 0, "table_pow2() have negative exponent.");
+        F64_POW2[(exponent + Self::POW2_EXPONENT_BIAS).as_usize()]
+    }
+
+    #[inline]
+    fn table_pow<T: Integer>(radix: T, exponent: i32) -> f64 {
+        debug_assert!(exponent >= 0, "table_pow() have negative exponent.");
+        debug_assert_radix!(radix);
+        let exponent = exponent as usize;
+
+        #[cfg(not(feature = "radix"))] {
+            F64_POW10[exponent]
+        }
+
+        #[cfg(feature = "radix")] {
+            match radix.as_i32() {
+                3  => F64_POW3 [exponent],
+                5  => F64_POW5 [exponent],
+                6  => F64_POW6 [exponent],
+                7  => F64_POW7 [exponent],
+                9  => F64_POW9 [exponent],
+                10 => F64_POW10[exponent],
+                11 => F64_POW11[exponent],
+                12 => F64_POW12[exponent],
+                13 => F64_POW13[exponent],
+                14 => F64_POW14[exponent],
+                15 => F64_POW15[exponent],
+                17 => F64_POW17[exponent],
+                18 => F64_POW18[exponent],
+                19 => F64_POW19[exponent],
+                20 => F64_POW20[exponent],
+                21 => F64_POW21[exponent],
+                22 => F64_POW22[exponent],
+                23 => F64_POW23[exponent],
+                24 => F64_POW24[exponent],
+                25 => F64_POW25[exponent],
+                26 => F64_POW26[exponent],
+                27 => F64_POW27[exponent],
+                28 => F64_POW28[exponent],
+                29 => F64_POW29[exponent],
+                30 => F64_POW30[exponent],
+                31 => F64_POW31[exponent],
+                33 => F64_POW33[exponent],
+                34 => F64_POW34[exponent],
+                35 => F64_POW35[exponent],
+                36 => F64_POW36[exponent],
+                // Invalid radix
+                _  => unreachable!(),
+            }
+        }
+    }
+}
+
+}}   // cfg_if
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/test.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/test.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,123 @@
+//! Test utilities.
+
+use super::config::BUFFER_SIZE;
+
+cfg_if! {
+if #[cfg(feature = "correct")] {
+    use arrayvec;
+    use super::sequence::{CloneableVecLike, VecLike};
+}}  // cfg_if
+
+// BASES
+
+/// Pow2 bases.
+#[cfg(all(feature = "correct", feature = "radix"))]
+pub(crate) const BASE_POW2: [u32; 5] = [2, 4, 8, 16, 32];
+
+/// Non-pow2 bases.
+#[cfg(feature = "radix")]
+pub(crate) const BASE_POWN: [u32; 30] = [
+    3, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 21,
+    22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 33, 34, 35, 36
+];
+
+#[cfg(not(feature = "radix"))]
+pub(crate) const BASE_POWN: [u32; 1] = [10];
+
+// BUFFER
+
+/// Create new buffer for itoa or ftoa functionality.
+#[inline]
+pub(crate) fn new_buffer() -> [u8; BUFFER_SIZE] {
+    [b'\0'; BUFFER_SIZE]
+}
+
+// BYTE SLICE
+
+/// Use to help type deduction.
+#[inline]
+pub(crate) fn as_slice<'a, T>(x: &'a [T]) -> &'a [T] {
+    x
+}
+
+cfg_if! {
+if #[cfg(feature = "correct")] {
+
+// FROM U32
+
+#[cfg(limb_width_32)]
+pub(crate) type DataType = arrayvec::ArrayVec<[u32; 128]>;
+
+#[cfg(limb_width_64)]
+pub(crate) type DataType = arrayvec::ArrayVec<[u64; 64]>;
+
+
+#[cfg(limb_width_32)]
+pub(crate) fn from_u32(x: &[u32]) -> DataType {
+    x.iter().cloned().collect()
+}
+
+#[cfg(limb_width_64)]
+pub(crate) fn from_u32(x: &[u32]) -> DataType {
+    let mut v = DataType::default();
+    v.reserve(x.len() / 2);
+    for xi in x.chunks(2) {
+        match xi.len() {
+            1 => v.push(xi[0] as u64),
+            2 => v.push(((xi[1] as u64) << 32) | (xi[0] as u64)),
+            _ => unreachable!(),
+        }
+    }
+
+    v
+}
+
+#[cfg(limb_width_32)]
+pub(crate) fn deduce_from_u32<T: CloneableVecLike<u32>>(x: &[u32]) -> T
+{
+    from_u32(x).iter().cloned().collect()
+}
+
+#[cfg(limb_width_64)]
+pub(crate) fn deduce_from_u32<T: CloneableVecLike<u64>>(x: &[u32]) -> T
+{
+    from_u32(x).iter().cloned().collect()
+}
+
+}}  // cfg_if
+
+// LITERAL BYTE SLICES
+
+/// Create a literal byte slice.
+macro_rules! b {
+    ($l:expr) => ($l.as_bytes());
+}
+
+// FLOATING-POINT EQUALITY
+
+cfg_if! {
+if #[cfg(feature = "correct")] {
+    /// Assert two 32-bit floats are equal.
+    macro_rules! assert_f32_eq {
+        ($l:expr, $r:expr $(, $opt:ident = $val:expr)+) => (assert_eq!($l, $r););
+        ($l:expr, $r:expr) => (assert_eq!($l, $r););
+    }
+
+    /// Assert two 64-bit floats are equal.
+    macro_rules! assert_f64_eq {
+        ($l:expr, $r:expr $(, $opt:ident = $val:expr)+) => (assert_eq!($l, $r););
+        ($l:expr, $r:expr) => (assert_eq!($l, $r););
+    }
+} else {
+    /// Assert two 32-bit floats are equal.
+    macro_rules! assert_f32_eq {
+        ($l:expr, $r:expr $(, $opt:ident = $val:expr)+) => (approx::assert_relative_eq!($l, $r $(, $opt = $val)*););
+        ($l:expr, $r:expr) => (approx::assert_relative_eq!($l, $r, epsilon=1e-20););
+    }
+
+    /// Assert two 64-bit floats are equal.
+    macro_rules! assert_f64_eq {
+        ($l:expr, $r:expr $(, $opt:ident = $val:expr)+) => (approx::assert_relative_eq!($l, $r $(, $opt = $val)*););
+        ($l:expr, $r:expr) => (approx::assert_relative_eq!($l, $r, epsilon=1e-20, max_relative=1e-12););
+    }
+}}  // cfg_if
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,543 @@
+//! Wrap the low-level API into idiomatic serializers.
+
+use super::format::NumberFormat;
+use super::num::Number;
+use super::result::Result;
+
+// HELPERS
+
+/// Map partial result to complete result.
+macro_rules! to_complete {
+    ($cb:expr, $bytes:expr $(,$args:expr)*) => {
+        match $cb($bytes $(,$args)*) {
+            Err(e)                  => Err(e),
+            Ok((value, processed))  => if processed == $bytes.len() {
+                Ok(value)
+            } else{
+                Err((ErrorCode::InvalidDigit, processed).into())
+            }
+        }
+    };
+}
+
+// FROM LEXICAL
+
+/// Trait for numerical types that can be parsed from bytes.
+pub trait FromLexical: Number {
+    /// Checked parser for a string-to-number conversion.
+    ///
+    /// This method parses the entire string, returning an error if
+    /// any invalid digits are found during parsing.
+    ///
+    /// Returns a `Result` containing either the parsed value,
+    /// or an error containing any errors that occurred during parsing.
+    ///
+    /// Numeric overflow takes precedence over the presence of an invalid
+    /// digit, and therefore may mask an invalid digit error.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    fn from_lexical(bytes: &[u8]) -> Result<Self>;
+
+    /// Checked parser for a string-to-number conversion.
+    ///
+    /// This method parses until an invalid digit is found (or the end
+    /// of the string), returning the number of processed digits
+    /// and the parsed value until that point.
+    ///
+    /// Returns a `Result` containing either the parsed value
+    /// and the number of processed digits, or an error containing
+    /// any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    fn from_lexical_partial(bytes: &[u8]) -> Result<(Self, usize)>;
+
+    /// Checked parser for a string-to-number conversion.
+    ///
+    /// This method parses the entire string, returning an error if
+    /// any invalid digits are found during parsing.
+    ///
+    /// Returns a `Result` containing either the parsed value,
+    /// or an error containing any errors that occurred during parsing.
+    ///
+    /// Numeric overflow takes precedence over the presence of an invalid
+    /// digit, and therefore may mask an invalid digit error.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `radix`   - Radix for the number parsing.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    #[cfg(feature = "radix")]
+    fn from_lexical_radix(bytes: &[u8], radix: u8) -> Result<Self>;
+
+    /// Checked parser for a string-to-number conversion.
+    ///
+    /// This method parses until an invalid digit is found (or the end
+    /// of the string), returning the number of processed digits
+    /// and the parsed value until that point.
+    ///
+    /// Returns a `Result` containing either the parsed value
+    /// and the number of processed digits, or an error containing
+    /// any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `radix`   - Radix for the number parsing.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    #[cfg(feature = "radix")]
+    fn from_lexical_partial_radix(bytes: &[u8], radix: u8) -> Result<(Self, usize)>;
+}
+
+// Implement FromLexical for numeric type.
+macro_rules! from_lexical {
+    ($cb:expr, $t:ty) => (
+        impl FromLexical for $t {
+            #[inline]
+            fn from_lexical(bytes: &[u8]) -> Result<$t>
+            {
+                to_complete!($cb, bytes, 10)
+            }
+
+            #[inline]
+            fn from_lexical_partial(bytes: &[u8]) -> Result<($t, usize)>
+            {
+                $cb(bytes, 10)
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn from_lexical_radix(bytes: &[u8], radix: u8) -> Result<$t>
+            {
+                to_complete!($cb, bytes, radix.as_u32())
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn from_lexical_partial_radix(bytes: &[u8], radix: u8) -> Result<($t, usize)>
+            {
+                $cb(bytes, radix.as_u32())
+            }
+        }
+    )
+}
+
+// FROM LEXICAL LOSSY
+
+/// Trait for floating-point types that can be parsed using lossy algorithms from bytes.
+pub trait FromLexicalLossy: FromLexical {
+    /// Lossy, checked parser for a string-to-number conversion.
+    ///
+    /// This method parses the entire string, returning an error if
+    /// any invalid digits are found during parsing. This parser is
+    /// lossy, so numerical rounding may occur during parsing.
+    ///
+    /// Returns a `Result` containing either the parsed value,
+    /// or an error containing any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    fn from_lexical_lossy(bytes: &[u8]) -> Result<Self>;
+
+    /// Lossy, checked parser for a string-to-number conversion.
+    ///
+    /// This method parses until an invalid digit is found (or the end
+    /// of the string), returning the number of processed digits
+    /// and the parsed value until that point. This parser is
+    /// lossy, so numerical rounding may occur during parsing.
+    ///
+    /// Returns a `Result` containing either the parsed value
+    /// and the number of processed digits, or an error containing
+    /// any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    fn from_lexical_partial_lossy(bytes: &[u8]) -> Result<(Self, usize)>;
+
+    /// Lossy, checked parser for a string-to-number conversion.
+    ///
+    /// This method parses the entire string, returning an error if
+    /// any invalid digits are found during parsing. This parser is
+    /// lossy, so numerical rounding may occur during parsing.
+    ///
+    /// Returns a `Result` containing either the parsed value,
+    /// or an error containing any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `radix`   - Radix for the number parsing.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    #[cfg(feature = "radix")]
+    fn from_lexical_lossy_radix(bytes: &[u8], radix: u8) -> Result<Self>;
+
+    /// Lossy, checked parser for a string-to-number conversion.
+    ///
+    /// This method parses until an invalid digit is found (or the end
+    /// of the string), returning the number of processed digits
+    /// and the parsed value until that point. This parser is
+    /// lossy, so numerical rounding may occur during parsing.
+    ///
+    /// Returns a `Result` containing either the parsed value
+    /// and the number of processed digits, or an error containing
+    /// any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `radix`   - Radix for the number parsing.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    #[cfg(feature = "radix")]
+    fn from_lexical_partial_lossy_radix(bytes: &[u8], radix: u8) -> Result<(Self, usize)>;
+}
+
+// Implement FromLexicalLossy for numeric type.
+macro_rules! from_lexical_lossy {
+    ($cb:expr, $t:ty) => (
+        impl FromLexicalLossy for $t {
+            #[inline]
+            fn from_lexical_lossy(bytes: &[u8]) -> Result<$t>
+            {
+                to_complete!($cb, bytes, 10)
+            }
+
+            #[inline]
+            fn from_lexical_partial_lossy(bytes: &[u8]) -> Result<($t, usize)>
+            {
+                $cb(bytes, 10)
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn from_lexical_lossy_radix(bytes: &[u8], radix: u8) -> Result<$t>
+            {
+                to_complete!($cb, bytes, radix.as_u32())
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn from_lexical_partial_lossy_radix(bytes: &[u8], radix: u8) -> Result<($t, usize)>
+            {
+                $cb(bytes, radix.as_u32())
+            }
+        }
+    )
+}
+
+// FROM LEXICAL FORMAT
+
+/// Trait for number that can be parsed using a custom format specification.
+#[cfg(feature = "format")]
+pub trait FromLexicalFormat: FromLexical {
+    /// Checked parser for a string-to-number conversion.
+    ///
+    /// This method parses the entire string, returning an error if
+    /// any invalid digits are found during parsing. The numerical format
+    /// is specified by the format bitflags, which customize the required
+    /// components, digit separators, and other parameters of the number.
+    ///
+    /// Returns a `Result` containing either the parsed value,
+    /// or an error containing any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `format`  - Numerical format.
+    fn from_lexical_format(bytes: &[u8], format: NumberFormat) -> Result<Self>;
+
+    /// Checked parser for a string-to-number conversion.
+    ///
+    /// This method parses until an invalid digit is found (or the end
+    /// of the string), returning the number of processed digits
+    /// and the parsed value until that point. The numerical format
+    /// is specified by the format bitflags, which customize the required
+    /// components, digit separators, and other parameters of the number.
+    ///
+    /// Returns a `Result` containing either the parsed value
+    /// and the number of processed digits, or an error containing
+    /// any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `format`  - Numerical format.
+    fn from_lexical_partial_format(bytes: &[u8], format: NumberFormat) -> Result<(Self, usize)>;
+
+    /// Checked parser for a string-to-number conversion.
+    ///
+    /// This method parses the entire string, returning an error if
+    /// any invalid digits are found during parsing. The numerical format
+    /// is specified by the format bitflags, which customize the required
+    /// components, digit separators, and other parameters of the number.
+    ///
+    /// Returns a `Result` containing either the parsed value,
+    /// or an error containing any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `radix`   - Radix for the number parsing.
+    /// * `format`  - Numerical format.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    #[cfg(feature = "radix")]
+    fn from_lexical_format_radix(bytes: &[u8], radix: u8, format: NumberFormat) -> Result<Self>;
+
+    /// Checked parser for a string-to-number conversion.
+    ///
+    /// This method parses until an invalid digit is found (or the end
+    /// of the string), returning the number of processed digits
+    /// and the parsed value until that point. The numerical format
+    /// is specified by the format bitflags, which customize the required
+    /// components, digit separators, and other parameters of the number.
+    ///
+    /// Returns a `Result` containing either the parsed value
+    /// and the number of processed digits, or an error containing
+    /// any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `radix`   - Radix for the number parsing.
+    /// * `format`  - Numerical format.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    #[cfg(feature = "radix")]
+    fn from_lexical_partial_format_radix(bytes: &[u8], radix: u8, format: NumberFormat) -> Result<(Self, usize)>;
+}
+
+// Implement FromLexicalFormat for numeric type.
+#[cfg(feature = "format")]
+macro_rules! from_lexical_format {
+    ($cb:expr, $t:ty) => (
+        impl FromLexicalFormat for $t {
+            #[inline]
+            fn from_lexical_format(bytes: &[u8], format: NumberFormat) -> Result<$t>
+            {
+                to_complete!($cb, bytes, 10, format)
+            }
+
+            #[inline]
+            fn from_lexical_partial_format(bytes: &[u8], format: NumberFormat) -> Result<($t, usize)>
+            {
+                $cb(bytes, 10, format)
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn from_lexical_format_radix(bytes: &[u8], radix: u8, format: NumberFormat) -> Result<$t>
+            {
+                to_complete!($cb, bytes, radix.as_u32(), format)
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn from_lexical_partial_format_radix(bytes: &[u8], radix: u8, format: NumberFormat) -> Result<($t, usize)>
+            {
+                $cb(bytes, radix.as_u32(), format)
+            }
+        }
+    )
+}
+
+// FROM LEXICAL LOSSY
+
+/// Trait for floating-point types that can be parsed using lossy algorithms with a custom format specification.
+#[cfg(feature = "format")]
+pub trait FromLexicalLossyFormat: FromLexical {
+    /// Lossy, checked parser for a string-to-number conversion.
+    ///
+    /// This method parses the entire string, returning an error if
+    /// any invalid digits are found during parsing. This parser is
+    /// lossy, so numerical rounding may occur during parsing. The
+    /// numerical format is specified by the format bitflags, which
+    /// customize the required components, digit separators, and other
+    /// parameters of the number.
+    ///
+    /// Returns a `Result` containing either the parsed value,
+    /// or an error containing any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `format`  - Numerical format.
+    fn from_lexical_lossy_format(bytes: &[u8], format: NumberFormat) -> Result<Self>;
+
+    /// Lossy, checked parser for a string-to-number conversion.
+    ///
+    /// This method parses until an invalid digit is found (or the end
+    /// of the string), returning the number of processed digits
+    /// and the parsed value until that point. This parser is
+    /// lossy, so numerical rounding may occur during parsing. The
+    /// numerical format is specified by the format bitflags, which
+    /// customize the required components, digit separators, and other
+    /// parameters of the number.
+    ///
+    /// Returns a `Result` containing either the parsed value
+    /// and the number of processed digits, or an error containing
+    /// any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `format`  - Numerical format.
+    fn from_lexical_partial_lossy_format(bytes: &[u8], format: NumberFormat) -> Result<(Self, usize)>;
+
+    /// Lossy, checked parser for a string-to-number conversion.
+    ///
+    /// This method parses the entire string, returning an error if
+    /// any invalid digits are found during parsing. This parser is
+    /// lossy, so numerical rounding may occur during parsing. The
+    /// numerical format is specified by the format bitflags, which
+    /// customize the required components, digit separators, and other
+    /// parameters of the number.
+    ///
+    /// Returns a `Result` containing either the parsed value,
+    /// or an error containing any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `radix`   - Radix for the number parsing.
+    /// * `format`  - Numerical format.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    #[cfg(feature = "radix")]
+    fn from_lexical_lossy_format_radix(bytes: &[u8], radix: u8, format: NumberFormat) -> Result<Self>;
+
+    /// Lossy, checked parser for a string-to-number conversion.
+    ///
+    /// This method parses until an invalid digit is found (or the end
+    /// of the string), returning the number of processed digits
+    /// and the parsed value until that point. This parser is
+    /// lossy, so numerical rounding may occur during parsing. The
+    /// numerical format is specified by the format bitflags, which
+    /// customize the required components, digit separators, and other
+    /// parameters of the number.
+    ///
+    /// Returns a `Result` containing either the parsed value
+    /// and the number of processed digits, or an error containing
+    /// any errors that occurred during parsing.
+    ///
+    /// * `bytes`   - Slice containing a numeric string.
+    /// * `radix`   - Radix for the number parsing.
+    /// * `format`  - Numerical format.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    #[cfg(feature = "radix")]
+    fn from_lexical_partial_lossy_format_radix(bytes: &[u8], radix: u8, format: NumberFormat) -> Result<(Self, usize)>;
+}
+
+// Implement FromLexicalLossyFormat for numeric type.
+#[cfg(feature = "format")]
+macro_rules! from_lexical_lossy_format {
+    ($cb:expr, $t:ty) => (
+        impl FromLexicalLossyFormat for $t {
+            #[inline]
+            fn from_lexical_lossy_format(bytes: &[u8], format: NumberFormat)
+                -> Result<$t>
+            {
+                to_complete!($cb, bytes, 10, format)
+            }
+
+            #[inline]
+            fn from_lexical_partial_lossy_format(bytes: &[u8], format: NumberFormat)
+                -> Result<($t, usize)>
+            {
+                $cb(bytes, 10, format)
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn from_lexical_lossy_format_radix(bytes: &[u8], radix: u8, format: NumberFormat)
+                -> Result<$t>
+            {
+                to_complete!($cb, bytes, radix.as_u32(), format)
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn from_lexical_partial_lossy_format_radix(bytes: &[u8], radix: u8, format: NumberFormat)
+                -> Result<($t, usize)>
+            {
+                $cb(bytes, radix.as_u32(), format)
+            }
+        }
+    )
+}
+
+// TO LEXICAL
+
+/// Trait for numerical types that can be serialized to bytes.
+///
+/// To determine the number of bytes required to serialize a value to
+/// string, check the associated constants from a required trait:
+/// - [`FORMATTED_SIZE`]
+/// - [`FORMATTED_SIZE_DECIMAL`]
+///
+/// [`FORMATTED_SIZE`]: trait.Number.html#associatedconstant.FORMATTED_SIZE
+/// [`FORMATTED_SIZE_DECIMAL`]: trait.Number.html#associatedconstant.FORMATTED_SIZE_DECIMAL
+pub trait ToLexical: Number {
+    /// Serializer for a number-to-string conversion.
+    ///
+    /// Returns a subslice of the input buffer containing the written bytes,
+    /// starting from the same address in memory as the input slice.
+    ///
+    /// * `value`   - Number to serialize.
+    /// * `bytes`   - Slice containing a numeric string.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not of sufficient size. The caller
+    /// must provide a slice of sufficient size. In order to ensure
+    /// the function will not panic, ensure the buffer has at least
+    /// [`FORMATTED_SIZE_DECIMAL`] elements.
+    ///
+    /// [`FORMATTED_SIZE_DECIMAL`]: trait.Number.html#associatedconstant.FORMATTED_SIZE_DECIMAL
+    fn to_lexical<'a>(self, bytes: &'a mut [u8]) -> &'a mut [u8];
+
+     /// Serializer for a number-to-string conversion.
+    ///
+    /// Returns a subslice of the input buffer containing the written bytes,
+    /// starting from the same address in memory as the input slice.
+    ///
+    /// * `value`   - Number to serialize.
+    /// * `radix`   - Radix for number encoding.
+    /// * `bytes`   - Slice containing a numeric string.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the radix is not in the range `[2, 36]`.
+    ///
+    /// Also panics if the buffer is not of sufficient size. The caller
+    /// must provide a slice of sufficient size. In order to ensure
+    /// the function will not panic, ensure the buffer has at least
+    /// [`FORMATTED_SIZE`] elements.
+    ///
+    /// [`FORMATTED_SIZE`]: trait.Number.html#associatedconstant.FORMATTED_SIZE
+    #[cfg(feature = "radix")]
+    fn to_lexical_radix<'a>(self, radix: u8, bytes: &'a mut [u8]) -> &'a mut [u8];
+}
+
+// Implement ToLexical for numeric type.
+macro_rules! to_lexical {
+    ($cb:expr, $t:ty) => (
+        impl ToLexical for $t {
+            #[inline]
+            fn to_lexical<'a>(self, bytes: &'a mut [u8])
+                -> &'a mut [u8]
+            {
+                assert_buffer!(10, bytes, $t);
+                let len = $cb(self, 10, bytes);
+                &mut index_mut!(bytes[..len])
+            }
+
+            #[cfg(feature = "radix")]
+            #[inline]
+            fn to_lexical_radix<'a>(self, radix: u8, bytes: &'a mut [u8])
+                -> &'a mut [u8]
+            {
+                assert_radix!(radix);
+                assert_buffer!(radix, bytes, $t);
+                let len = $cb(self, radix.as_u32(), bytes);
+                &mut index_mut!(bytes[..len])
+            }
+        }
+    )
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/wrapped.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/wrapped.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lexical-core/src/util/wrapped.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lexical-core/src/util/wrapped.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,735 @@
+//! Wrapped float that behaves like an integer.
+//!
+//! Comprehensive wrapper for the Float trait that acts like an Integer
+//! trait, allowed floats to be mocked as integers.
+//! Operations natively supported by floats are wrapped, while
+//! those that can be mocked (like overflow-checked operations)
+//! are implemented, and others (like bitshift assigns) are unimplemented.
+
+use crate::lib::{cmp, fmt, iter, ops};
+use super::cast::*;
+use super::config::*;
+use super::num::*;
+use super::primitive::*;
+
+// WRAPPED FLOAT
+
+/// Wrap a float to act like an integer.
+///
+/// Required for the lossy atof algorithm.
+#[derive(Clone, Copy, Debug, PartialOrd)]
+pub(crate) struct WrappedFloat<T: Float>
+{
+    /// Internal data.
+    data: T,
+}
+
+impl<T: Float> WrappedFloat<T> {
+    /// Wrap existing float.
+    #[inline]
+    pub fn from_float(t: T) -> Self {
+        WrappedFloat { data: t }
+    }
+
+    /// Consume wrapper and return float.
+    #[inline]
+    pub fn into_inner(self) -> T {
+        self.data
+    }
+}
+
+// IMPL AS PRIMITIVE
+
+impl<T: Float> PartialEq for WrappedFloat<T> {
+    fn eq(&self, other: &Self) -> bool {
+        // Need to return true when both are NaN, since the default
+        // PartialEq for floats returns false when both are NaN.
+        // We demand total ordering, do it the right way,
+        if self.data.is_nan() && other.data.is_nan() {
+            true
+        } else {
+            self.data == other.data
+        }
+    }
+}
+
+impl<T: Float> AsPrimitive for WrappedFloat<T> {
+    #[inline]
+    fn as_u8(self) -> u8 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_u16(self) -> u16 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_u32(self) -> u32 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_u64(self) -> u64 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_u128(self) -> u128 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_usize(self) -> usize {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_i8(self) -> i8 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_i16(self) -> i16 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_i32(self) -> i32 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_i64(self) -> i64 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_i128(self) -> i128 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_isize(self) -> isize {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_f32(self) -> f32 {
+        as_cast(self.data)
+    }
+
+    #[inline]
+    fn as_f64(self) -> f64 {
+        as_cast(self.data)
+    }
+}
+
+// IMPL TRY PRIMITIVE
+
+impl<T: Float> TryPrimitive for WrappedFloat<T> {
+    #[inline]
+    fn try_u8(self) -> Option<u8> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_u16(self) -> Option<u16> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_u32(self) -> Option<u32> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_u64(self) -> Option<u64> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_u128(self) -> Option<u128> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_usize(self) -> Option<usize> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_i8(self) -> Option<i8> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_i16(self) -> Option<i16> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_i32(self) -> Option<i32> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_i64(self) -> Option<i64> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_i128(self) -> Option<i128> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_isize(self) -> Option<isize> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_f32(self) -> Option<f32> {
+        try_cast(self.data)
+    }
+
+    #[inline]
+    fn try_f64(self) -> Option<f64> {
+        try_cast(self.data)
+    }
+}
+
+// IMPL AS CAST
+
+impl<T: Float> AsCast for WrappedFloat<T> {
+    #[inline]
+    fn as_cast<N: AsPrimitive>(n: N) -> Self {
+        // Wrap to wide float and back down. Should be a no-op. Just indirection.
+        WrappedFloat { data: as_cast(n.as_f64()) }
+    }
+}
+
+// IMPL TRY CAST
+
+impl<N: Primitive, T: Float + TryCast<N>> TryCast<N> for WrappedFloat<T> {
+    #[inline]
+    fn try_cast(self) -> Option<N> {
+        try_cast(self.data)
+    }
+}
+
+// IMPL PRIMITIVE
+
+impl<T: Float> fmt::Display for WrappedFloat<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(&self.data, f)
+    }
+}
+
+impl<T: Float> Primitive for WrappedFloat<T> {
+}
+
+// IMPL NUMBER
+
+impl<T: Float> iter::Product for WrappedFloat<T> {
+    #[inline]
+    fn product<Iter: Iterator<Item=WrappedFloat<T>>>(iter: Iter) -> Self {
+        iter.fold(Self::from_float(T::ONE), ops::Mul::mul)
+    }
+}
+
+impl<T: Float> iter::Sum for WrappedFloat<T> {
+    #[inline]
+    fn sum<Iter: Iterator<Item=WrappedFloat<T>>>(iter: Iter) -> Self {
+        iter.fold(Self::from_float(T::ZERO), ops::Add::add)
+    }
+}
+
+/// Implement arithmetic operations.
+macro_rules! ops_impl {
+    ($($t:ident, $meth:ident ;)*) => ($(
+        impl<T: Float> ops::$t for WrappedFloat<T> {
+            type Output = Self;
+
+            #[inline]
+            fn $meth(self, other: Self) -> Self::Output {
+                WrappedFloat { data: self.data.$meth(other.data) }
+            }
+        }
+    )*);
+}
+
+ops_impl! {
+    Add, add ;
+    Div, div ;
+    Mul, mul ;
+    Rem, rem ;
+    Sub, sub ;
+}
+
+/// Implement arithmetic assignment operations.
+macro_rules! ops_assign_impl {
+    ($($t:ident, $meth:ident ;)*) => ($(
+        impl<T: Float> ops::$t for WrappedFloat<T> {
+            #[inline]
+            fn $meth(&mut self, other: Self) {
+                self.data.$meth(other.data)
+            }
+        }
+    )*);
+}
+
+ops_assign_impl! {
+    AddAssign, add_assign ;
+    DivAssign, div_assign ;
+    MulAssign, mul_assign ;
+    RemAssign, rem_assign ;
+    SubAssign, sub_assign ;
+}
+
+impl<T: Float> Number for WrappedFloat<T> {
+    const FORMATTED_SIZE: usize = T::FORMATTED_SIZE;
+    const FORMATTED_SIZE_DECIMAL: usize = T::FORMATTED_SIZE_DECIMAL;
+    const IS_SIGNED: bool = T::IS_SIGNED;
+}
+
+// IMPL INTEGER
+
+impl<T: Float> Ord for WrappedFloat<T> {
+    #[inline]
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        // Implements total ordering for a float, while keeping typical
+        // behavior. All ordering is preserved, except for NaN,
+        // such that if both are NaN, they compare equal.
+        // PartialOrd are fails to provide an Ordering if
+        // either are NaN, so we just need to provide consistent
+        // ordering if either is NaN.
+        if let Some(ordering) = self.partial_cmp(&other) {
+            ordering
+        } else if !self.data.is_nan() {
+            cmp::Ordering::Less
+        } else if other.data.is_nan() {
+            cmp::Ordering::Equal
+        } else {
+            cmp::Ordering::Greater
+        }
+    }
+}
+
+impl<T: Float> Eq for WrappedFloat<T> {
+}
+
+impl<T: Float> fmt::Octal for WrappedFloat<T> {
+    #[inline]
+    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
+        unimplemented!()
+    }
+}
+
+impl<T: Float> fmt::LowerHex for WrappedFloat<T> {
+    #[inline]
+    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
+        unimplemented!()
+    }
+}
+
+impl<T: Float> fmt::UpperHex for WrappedFloat<T> {
+    #[inline]
+    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
+        unimplemented!()
+    }
+}
+
+/// Unimplement bitwise operations.
+macro_rules! bitwise_impl {
+    ($($t:ident, $meth:ident ;)*) => ($(
+        impl<T: Float> ops::$t for WrappedFloat<T> {
+            type Output = Self;
+
+            #[inline]
+            fn $meth(self, _: Self) -> Self::Output {
+                unimplemented!()
+            }
+        }
+    )*);
+}
+
+bitwise_impl! {
+    BitAnd, bitand ;
+    BitOr, bitor ;
+    BitXor, bitxor ;
+}
+
+/// Unimplement bitwise assignment operations.
+macro_rules! bitwise_assign_impl {
+    ($($t:ident, $meth:ident ;)*) => ($(
+        impl<T: Float> ops::$t for WrappedFloat<T> {
+            #[inline]
+            fn $meth(&mut self, _: Self) {
+                unimplemented!()
+            }
+        }
+    )*);
+}
+
+bitwise_assign_impl! {
+    BitAndAssign, bitand_assign ;
+    BitOrAssign, bitor_assign ;
+    BitXorAssign, bitxor_assign ;
+}
+
+impl<T: Float> ops::Not for WrappedFloat<T> {
+    type Output = Self;
+
+    #[inline]
+    fn not(self) -> Self::Output {
+        unimplemented!()
+    }
+}
+
+/// Unimplement bitshift operations.
+macro_rules! bitshift_impl {
+    ($t:tt, $meth:ident ; $($s:ty)*) => ($(
+        // Iterate over all primitives.
+        impl<T: Float> ops::$t<$s> for WrappedFloat<T> {
+            type Output = Self;
+
+            #[inline]
+            fn $meth(self, _: $s) -> Self::Output {
+                unimplemented!()
+            }
+        }
+    )*);
+    ($($t:ident, $meth:ident ;)*) => ($(
+        // Base case, same as self.
+        impl<T: Float> ops::$t<> for WrappedFloat<T> {
+            type Output = Self;
+
+            #[inline]
+            fn $meth(self, _: Self) -> Self::Output {
+                unimplemented!()
+            }
+        }
+
+        bitshift_impl!($t, $meth ; u8 u16 u32 u64 usize i8 i16 i32 i64 isize);
+    )*);
+}
+
+bitshift_impl! {
+    Shl, shl ;
+    Shr, shr ;
+}
+
+/// Unimplement bitshift assignment operations.
+macro_rules! bitshift_assign_impl {
+    ($t:tt, $meth:ident ; $($s:ty)*) => ($(
+        // Iterate over all primitives.
+        impl<T: Float> ops::$t<$s> for WrappedFloat<T> {
+            #[inline]
+            fn $meth(&mut self, _: $s) {
+                unimplemented!()
+            }
+        }
+    )*);
+    ($($t:ident, $meth:ident ;)*) => ($(
+        // Base case, same as self.
+        impl<T: Float> ops::$t<> for WrappedFloat<T> {
+            #[inline]
+            fn $meth(&mut self, _: Self) {
+                unimplemented!()
+            }
+        }
+
+        bitshift_assign_impl!($t, $meth ; u8 u16 u32 u64 usize i8 i16 i32 i64 isize);
+    )*);
+}
+
+bitshift_assign_impl! {
+    ShlAssign, shl_assign ;
+    ShrAssign, shr_assign ;
+}
+
+impl<T: Float> Integer for WrappedFloat<T> {
+    const ZERO: Self = WrappedFloat { data: T::ZERO };
+    const ONE: Self = WrappedFloat { data: T::ONE };
+    const TWO: Self = WrappedFloat { data: T::TWO };
+    const MAX: Self = WrappedFloat { data: T::MAX };
+    const MIN: Self = WrappedFloat { data: T::MIN };
+    const BITS: usize = T::BITS;
+
+    #[inline]
+    fn max_value() -> Self {
+        Self::MAX
+    }
+
+    #[inline]
+    fn min_value() -> Self {
+        Self::MIN
+    }
+
+    #[inline]
+    fn count_ones(self) -> u32 {
+        unreachable!()
+    }
+
+    #[inline]
+    fn count_zeros(self) -> u32 {
+        unreachable!()
+    }
+
+    #[inline]
+    fn leading_zeros(self) -> u32 {
+        unreachable!()
+    }
+
+    #[inline]
+    fn trailing_zeros(self) -> u32 {
+        unreachable!()
+    }
+
+    #[inline]
+    fn pow(self, _: u32) -> Self {
+        unreachable!()
+    }
+
+    #[inline]
+    fn checked_add(self, i: Self) -> Option<Self> {
+        Some(self + i)
+    }
+
+    #[inline]
+    fn checked_sub(self, i: Self) -> Option<Self> {
+        Some(self - i)
+    }
+
+    #[inline]
+    fn checked_mul(self, i: Self) -> Option<Self> {
+        Some(self * i)
+    }
+
+    #[inline]
+    fn checked_div(self, i: Self) -> Option<Self> {
+        Some(self / i)
+    }
+
+    #[inline]
+    fn checked_rem(self, i: Self) -> Option<Self> {
+        Some(self % i)
+    }
+
+    #[inline]
+    fn checked_neg(self) -> Option<Self> {
+        Some(-self)
+    }
+
+    #[inline]
+    fn checked_shl(self, _: u32) -> Option<Self> {
+        unimplemented!()
+    }
+
+    #[inline]
+    fn checked_shr(self, _: u32) -> Option<Self> {
+        unimplemented!()
+    }
+
+    #[inline]
+    fn wrapping_add(self, i: Self) -> Self {
+        self + i
+    }
+
+    #[inline]
+    fn wrapping_sub(self, i: Self) -> Self {
+        self - i
+    }
+
+    #[inline]
+    fn wrapping_mul(self, i: Self) -> Self {
+        self * i
+    }
+
+    #[inline]
+    fn wrapping_div(self, i: Self) -> Self {
+        self / i
+    }
+
+    #[inline]
+    fn wrapping_rem(self, i: Self) -> Self {
+        self % i
+    }
+
+    #[inline]
+    fn wrapping_neg(self) -> Self {
+        -self
+    }
+
+    #[inline]
+    fn wrapping_shl(self, _: u32) -> Self {
+        unimplemented!()
+    }
+
+    #[inline]
+    fn wrapping_shr(self, _: u32) -> Self {
+        unimplemented!()
+    }
+
+    #[inline]
+    fn overflowing_add(self, i: Self) -> (Self, bool) {
+        (self + i, false)
+    }
+
+    #[inline]
+    fn overflowing_sub(self, i: Self) -> (Self, bool) {
+        (self - i, false)
+    }
+
+    #[inline]
+    fn overflowing_mul(self, i: Self) -> (Self, bool) {
+        (self * i, false)
+    }
+
+    #[inline]
+    fn overflowing_div(self, i: Self) -> (Self, bool) {
+        (self / i, false)
+    }
+
+    #[inline]
+    fn overflowing_rem(self, i: Self) -> (Self, bool) {
+        (self % i, false)
+    }
+
+    #[inline]
+    fn overflowing_neg(self) -> (Self, bool) {
+        (-self, false)
+    }
+
+    #[inline]
+    fn overflowing_shl(self, _: u32) -> (Self, bool) {
+        unimplemented!()
+    }
+
+    #[inline]
+    fn overflowing_shr(self, _: u32) -> (Self, bool) {
+        unimplemented!()
+    }
+
+    #[inline]
+    fn saturating_add(self, i: Self) -> Self {
+        self + i
+    }
+
+    #[inline]
+    fn saturating_sub(self, i: Self) -> Self {
+        self - i
+    }
+
+    #[inline]
+    fn saturating_mul(self, i: Self) -> Self {
+        self * i
+    }
+}
+
+// SIGNED INTEGER
+
+impl<T: Float> ops::Neg for WrappedFloat<T> {
+    type Output = Self;
+
+    #[inline]
+    fn neg(self) -> Self {
+        WrappedFloat { data: -self.data }
+    }
+}
+
+impl<T: Float> SignedInteger for WrappedFloat<T> {
+    fn checked_abs(self) -> Option<Self> {
+        Some(self.wrapping_abs())
+    }
+
+    fn wrapping_abs(self) -> Self {
+        WrappedFloat { data: self.data.abs() }
+    }
+
+    fn overflowing_abs(self) -> (Self, bool) {
+        (self.wrapping_abs(), false)
+    }
+}
+
+// TEST
+// ----
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn check_integer<T: Integer>(mut x: T) {
+        // Copy, partialeq, partialord, ord, eq
+        let _ = x;
+        assert!(x > T::ONE);
+        assert!(x != T::ONE);
+        assert_eq!(x.min(T::ONE), T::ONE);
+        assert_eq!(x.max(T::ONE), x);
+
+        // Operations
+        let _ = x + T::ONE;
+        let _ = x - T::ONE;
+        let _ = x * T::ONE;
+        let _ = x / T::ONE;
+        let _ = x % T::ONE;
+        x += T::ONE;
+        x -= T::ONE;
+        x *= T::ONE;
+        x /= T::ONE;
+        x %= T::ONE;
+
+        // Functions
+        assert!(T::ZERO.is_zero());
+        assert!(!T::ONE.is_zero());
+        assert!(T::ONE.is_one());
+        assert!(!T::ZERO.is_one());
+
+        // As cast
+        let _: u8 = as_cast(x);
+        let _: u16 = as_cast(x);
+        let _: u32 = as_cast(x);
+        let _: u64 = as_cast(x);
+        let _: u128 = as_cast(x);
+        let _: usize = as_cast(x);
+        let _: i8 = as_cast(x);
+        let _: i16 = as_cast(x);
+        let _: i32 = as_cast(x);
+        let _: i64 = as_cast(x);
+        let _: i128 = as_cast(x);
+        let _: isize = as_cast(x);
+        let _: f32 = as_cast(x);
+        let _: f64 = as_cast(x);
+    }
+
+    fn check_try_cast_compile<T: Integer>(x: T) {
+        // Try cast
+        let _: Option<u8> = try_cast(x);
+        let _: Option<u16> = try_cast(x);
+        let _: Option<u32> = try_cast(x);
+        let _: Option<u64> = try_cast(x);
+        let _: Option<u128> = try_cast(x);
+        let _: Option<usize> = try_cast(x);
+        let _: Option<i8> = try_cast(x);
+        let _: Option<i16> = try_cast(x);
+        let _: Option<i32> = try_cast(x);
+        let _: Option<i64> = try_cast(x);
+        let _: Option<i128> = try_cast(x);
+        let _: Option<isize> = try_cast(x);
+        let _: Option<f32> = try_cast(x);
+        let _: Option<f64> = try_cast(x);
+    }
+
+    #[allow(dead_code)]     // Compile-only
+    fn try_cast_test() {
+        check_try_cast_compile(WrappedFloat::from_float(65f32));
+        check_try_cast_compile(WrappedFloat::from_float(65f64));
+    }
+
+    #[test]
+    fn integer_test() {
+        check_integer(WrappedFloat::from_float(65f32));
+        check_integer(WrappedFloat::from_float(65f64));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,12 +3,13 @@
 use std::str;
 
 fn main() {
-    let (rustc_minor_ver, is_nightly) =
-        rustc_minor_nightly().expect("Failed to get rustc version");
+    // Avoid unnecessary re-building.
+    println!("cargo:rerun-if-changed=build.rs");
+
+    let (rustc_minor_ver, is_nightly) = rustc_minor_nightly().expect("Failed to get rustc version");
     let rustc_dep_of_std = env::var("CARGO_FEATURE_RUSTC_DEP_OF_STD").is_ok();
     let align_cargo_feature = env::var("CARGO_FEATURE_ALIGN").is_ok();
-    let const_extern_fn_cargo_feature =
-        env::var("CARGO_FEATURE_CONST_EXTERN_FN").is_ok();
+    let const_extern_fn_cargo_feature = env::var("CARGO_FEATURE_CONST_EXTERN_FN").is_ok();
     let libc_ci = env::var("LIBC_CI").is_ok();
 
     if env::var("CARGO_FEATURE_USE_STD").is_ok() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CONTRIBUTING.md":"7c3df1ab9348b2be844479c08637f5f426bcd2f9200584d56cebd9812700b073","Cargo.toml":"0169ac4c0703927fb5d51f8f2c39fa9fccdb8c3d2ffaec9bfdcff1ac16b4451c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"73041c7dda55cca7e18bcaf115d28090c8d3c2373a19ecef82fadeab292a607b","build.rs":"e487789ca77b0015d75cecb253286d4a1406f11b1ae538929414fc0506842bef","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"d5d4488e8c0b8227f516fe13810f550a2a72af3bdfe769200ad8687c8755bdf6","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"2bfb6ffad0170b3f56b9033a4c9ae2a3a3bb04b0ecb92cbdde7fafa7e868ca3e","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"8aeb4106f57e956eb51f7a8dd06f299695c8738cf8adc20ac786b524615cedb5","src/macros.rs":"7844312c233a6889fa15395fe3106f6a8f6229211104a92f33ea3c9536eef763","src/psp.rs":"a621e34d2d31d9b29c725897b846122acce4763ac2017a1fe2200b133e5ad064","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"6a4ce300da0d2b0db04b18548286603ffe4b47d679a41cf60f1902895894aa1f","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"81254d89be1febc5bb20e787d014a624950d56e2e14973df5bbebfdabc95ae20","src/unix/bsd/apple/mod.rs":"9c6ba890cfd1f4ea834fc97260c79467cfcaaccf9c1d019347d50fec5c19f197","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"8295b8bb0dfd38d2cdb4d9192cdeeb534cc6c3b208170e64615fa3e0edb3e578","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"86a0e11f928db7c8587e94ea3ba5801025526ed9a35d8d592c2705f96df05c22","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"14f0bd6693967d4fedec904f7042bd51f2138cb843ec4df18c911b357417cdd2","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"45d8ba0bdca685ea6bc0c601f60a0d39cb1513c3ccb57edc6bc9d97a46040f3b","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"636ec55d7efda523fff8279a3c224495017626e0c971e6dac35c27a794db39fd","src/unix/bsd/freebsdlike/freebsd/mod.rs":"7c8f999c42c8616372f8581bc09fe852ecb6c070dbcf5bc161bd4c75b50e378e","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/unix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"6132aa0973454379674ea6cbc77e6eace1e1032dd9f38182071388a036f1bc08","src/unix/bsd/freebsdlike/mod.rs":"348f3d72830846f5ed1ddfa2cc3e681ff3c086f3d9ef54f0e9fd67ffa8449e4d","src/unix/bsd/mod.rs":"4fd08b1fe9c9f74b50e8405a60dd506a6910190fbfbae7e968f1d9848f2b328e","src/unix/bsd/netbsdlike/mod.rs":"48dd60524119c1e09b255d5472d091e7e7b2b29eab04be51b4b1e740bd022859","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"a70f3c73b423bf44b06f16e44934ce3536517e60b3a4e256f41340a9e5dded40","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"1dd5449dd1fd3d51e30ffdeeaece91d0aaf05c710e0ac699fecc5461cfa2c28e","src/unix/bsd/netbsdlike/openbsd/mod.rs":"0a64323d35bf7fa32ccfbce69733e958e97a5fc9abdc8d65d9415b619bbff31f","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"e59b7fd65f68f8e857eec39e0c03bac1d3af6ddc26c9ba58494336b83659bb9b","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"ecd6139a3656a2fb13e66fed8bed9dfceafea48c169b1fa533b9e1b09a8b18eb","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"2d8d3ce0299931199011bb73136bebbddf88edf7d263cc39d26dbfaaa1a14228","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"155994121906903a2e0afad895f0b3b7546f6e54d6305a3336ce2c4dfafbfdfa","src/unix/linux_like/android/b32/mod.rs":"0325adf3364fed7157fff5b24fabe1b36d806c39ee04ec82dd29a606d28f91f6","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"5b1e9fcd77ca5f939acb7fb5f5da12f305b0377698d8b8989feb236e26360aa0","src/unix/linux_like/android/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"655116966eb7846b933e5e28b073c329668588cd3c2120cc9ce60c697bd19978","src/unix/linux_like/android/b64/mod.rs":"6a71abfcbbcdae60c916de41cd4688d5f25bdbca83d1d9df49decd56ad726a06","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"e84176d838e663d351450bad218715db1fafbb531e47ea0e262cbb45829dae89","src/unix/linux_like/android/mod.rs":"63f62b1005ce41039d222de5fdf517eb9b611db28be158ab74f8a9f652589299","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"0770f13ce30b98752d5e868332bf5a55bee8389108fe9d91cf2c2bf71c237093","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"015ec9e064bf7dee63b5a16e6d87aef11aeeeea84a3b083f9e75a97bb7ab2f0b","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"9e18ad197709bce3aab40537b6ea371ff13f3be7be1d50ff97964f937c517646","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"5cf043f5342c37b1cf50bc09de9baaa8d120a8827640f328a74ebbff1fe5aca0","src/unix/linux_like/linux/gnu/b32/mod.rs":"d86a7bb02f97a1129c870905c536769770dfb233184e4cff6b395ad512e5300b","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"5457ff8f90fb777cfc3cbe6c0c6a3b3f8eaecb28e66fffc53390e82010030ebe","src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs":"7b2528fdcdbbfb5cd350b27a3f66a6950fb94be1c924c1156a1d93e8950496a1","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/linux/gnu/b32/sparc/mod.rs":"0a4aec7eb78dcac864ed33a2a0d60ae285c7572ec9e475828e158fa6f43593a3","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"b1005390da3ed2d95b612fdcc4b69f11165ce31cfbf50674fe877ed47ad1b431","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"97b1d8a5a5bc3c8cd81c35ec8989002959983f674778e812f5b80ac6a3cdceac","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"e86403f310a14fc5355dd78746ac55056c91fa7cd3248d5d8a18430b4940cb2d","src/unix/linux_like/linux/gnu/b64/mod.rs":"b90d87f76bff37707a1725551fe45d70d0c106e01b1dbbcd5f60460e0a19b4c3","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"8aaaa4d9a5f79a7413930632c47382e845789dd9a191dc8bf084c8041ee350b1","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"b954a060f88cd03d0ca8bdeb864046230d0c52e2d2ab97394430f1356a357a82","src/unix/linux_like/linux/gnu/b64/s390x.rs":"818bdc54fdcb9d83190d78f31d0f4a082d06ded112ccb40daa1ab4c541ee58d5","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"22e57216290614616c671f35e24e881d6fcf9839dbfa8d2833a1a77ada28d156","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"c084edff71fa74f7ceb743c116f76a9996d311c06475d53b0de68958991e1b9b","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"74deaf2135168fd8a8fe3382a443d3800b95ea833e94150b265cc59a24872166","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"60ff6e9aca19226714cf0c7f58f4388f5f046cf099cc4f61f9a2913d94d7e846","src/unix/linux_like/linux/gnu/mod.rs":"b456bd2d934ccd53c35ee6c6758709482e4cc868dd39caf1ff686dc38f5981f0","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"bde7daee513791150b611bbe237298a40ae24bce1b5289c589e936a6512ff410","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"4269bfda82f0af7bb849f74d381bfadc61e1d1eec86b9506cee5c3ba13c9490a","src/unix/linux_like/linux/musl/b32/hexagon.rs":"7c6c481f70da1fe6ca759f363784e130041f3d87906c45910fc1142b5ef17970","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"f7adecc4a36b4eb484c168b6c21e73f02ee23f607c0a0351f773f9d9c83b8400","src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"cf286cbf4d2076aaa82662ace2b5c333480410fa59af5cb4542d59f04da84b31","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"014a3854f2dc8f8e0d10ab78193b1c4ce827cae84e5ecdac16b2bd7fa39cbce5","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"22da1c030c254c511bc335c824d40b693904975a4633f8243a8777ca68ef1c65","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"9870fd9a953c98b775c9e17a29a66bbe8019a6236eb69a0272f42232a226521d","src/unix/linux_like/linux/musl/b64/mips64.rs":"4bfd8ee1f22a163a7037e1e401d143573bcb14cc3321da0698528e9c0b68c81a","src/unix/linux_like/linux/musl/b64/mod.rs":"8b76e92a1505ad785d4aa0b7739e0b93647a1e81910949b49cedb6c88468be9c","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"ed9b879bb9cdc526ad83815875edeb4cad4e8829086dfba2578277c265336229","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"4c9fd4792b575a5b90d909c0e60283b705a51fa38bce13eab068645e34321f1f","src/unix/linux_like/linux/musl/mod.rs":"f89babf227c1e021dff04f39fb4e4cd71b8f7fa598ae8b336b8b2deb10ff38f9","src/unix/linux_like/linux/no_align.rs":"5ed04c53bf9d27da9b4d65ba7625c6ac53330162683d1b3df98950caafa3507b","src/unix/linux_like/mod.rs":"e65c49d9ee229aee11118758e36beebd90629e2e0c59647786cb0e472837d705","src/unix/mod.rs":"7e8e10e956ae38e5829720df90db4133ec0433d3bf53c83b02c5534d47c9dc02","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/mod.rs":"2f771ab23df36ab0c7a117e854483a917aaf9c5cbb9eded1bdda35827cdaf734","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/newlib/powerpc/mod.rs":"2d0f7af28b47f7a2a6c210ebd1c1f33ed8eac62e56b5af2b856de2ad3fdc5187","src/unix/newlib/xtensa/mod.rs":"4c72003c5e692e648c7e798358c49af6901e68850dbba0624af84c40baf208f5","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"b865c65438e102403708fa8a299d02ea635bda0879a256d99fadd0092d42f224","src/unix/solarish/compat.rs":"3f13657fc072462b85b5f937f0db1427c41acb2a714cc4f78fefba1ea8036846","src/unix/solarish/illumos.rs":"c42db942ab90813ecc7b2b32dea0e173e1e349e2e049a06021fd0dbc090c2c30","src/unix/solarish/mod.rs":"ca460056aca88af4f89296888d5c35df651f32456294a25d6343eb066f28b315","src/unix/solarish/solaris.rs":"3d3cc14b47839da1e4ec117bce1395e22ef86d8d1eb1fdcc6464d2fd8267efb4","src/unix/uclibc/align.rs":"a8540e1cce5913a45bc8d7422b79e86c0b12740e8a679478e0e4d863a31f8cc1","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"d67dd46bc6f417169fc6a23832bde7ccdafc5d1bcb08b10debdd82edaf75d529","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"a045ebc6619f540adf670b88a987abd2d6e42e440a552e8cfe9f8c77f397e873","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/uclibc/mips/mod.rs":"1054d0bfeb506b3346b9a4148564beced8a22da0d9c9a612101f6237756795fb","src/unix/uclibc/mod.rs":"0f3c30c8de0932021d78f790245458b766675c16d1cfc51cbc9db75c5134d1f2","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"4e34cebb7955e9c98ae2f310be6f8ed16a861fc3817c08543867554aeec9524e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"188fbaf06a8e23cac72718b1ef7eb4bd98bdfd946aa708151f3f7e3553b65876","src/unix/uclibc/x86_64/no_align.rs":"2ccc0107a6007c70dc49e656095b64a352ca5d8f9f3e65c1dba634effbc15636","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"b7c57b72a0f312c20531ba393f6fab7331fb708170d141d898d705868a5ee780","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"11e1ca29d1a446845c551d5717ec5c6081459a2a850781c9194f557d53ecf44f","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"c7ab9793baaa3b6854d25fdf44266b7953533009e4fa722ca717b71d3e5d2c9d","src/windows/mod.rs":"7b74bf885712d16a3557df33ef02799dc03d4a1af953c7e6b4648954ce7a20fc","src/windows/msvc.rs":"2c2bfce66027d88021e7289139ebf5b0db258a7b6443f18872c84dbd4ef57131","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4"},"package":"1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"}
\ No newline at end of file
+{"files":{"CONTRIBUTING.md":"752eea5a703d11b485c6b5f195f51bd2c79aa5159b619ce09555c779e1fb586b","Cargo.toml":"151a09f8f25db066c8256ba2c8498cfd9e2205a988ebaf9a1e6e485f8c4b0e2d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"8228847944f1332882fbb00275b6f30e4a8aad08a13569c25d52cac012cc2a47","build.rs":"8e0e8d33cc9e7c25cde75c2b502420f943266a681024169f94084774b422681d","rustfmt.toml":"eaa2ea84fc1ba0359b77680804903e07bb38d257ab11986b95b158e460f787b2","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"66fe805867933dc875e87fa5371458913aee596d80562a6873de234bbc61294d","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"d4f7452c0fe720f3a961b918b74ec86d19cef33e6b4aac08efbbad6f6d818e09","src/macros.rs":"7844312c233a6889fa15395fe3106f6a8f6229211104a92f33ea3c9536eef763","src/psp.rs":"dd31aabd46171d474ec5828372e28588935120e7355c90c105360d8fa9264c1c","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"6a4ce300da0d2b0db04b18548286603ffe4b47d679a41cf60f1902895894aa1f","src/unix/bsd/apple/b64/aarch64/align.rs":"f0c321265dd7671f16106b84951ac7dd77ed2e65c6623cbf2d29e76531984770","src/unix/bsd/apple/b64/aarch64/mod.rs":"46d5d061c7a74cbc09cbdfb3bee9a600867bf4e04c0e4d0ca6c817e6033b32e1","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"f5e278a1af7fb358891d1c9be4eb7e815aaca0c5cb738d0c3604ba2208a856f7","src/unix/bsd/apple/b64/x86_64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/x86_64/mod.rs":"cc6878dd130c3f255418e4da74992ae9ba6a3cdb0530772de76c518077d3b12a","src/unix/bsd/apple/mod.rs":"eeffdf3542657410eefdb8ad3b02584a323fd9d70495106a1d284b3c89f2e93a","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"8295b8bb0dfd38d2cdb4d9192cdeeb534cc6c3b208170e64615fa3e0edb3e578","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"d94fae70582ac058f9c492f7385c86a5e5815f6f3e1667bf001a556840886cb4","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"2a215bd6136b8617aacedf9be738ccee94da9d29b418e9a78101d6291c182352","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"6523af60c0e4937ad374003c1653e9e721f5b6f11572c747732f76522d07d034","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"4de82eed7fc33fc5f3962e3af3f4b17c82f6b2a9916442bfca4e00e3f2f5a492","src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"b77316c3503be031af6536743ecf69c444c4e74f7c2e41ce4fc8de69835aefd1","src/unix/bsd/freebsdlike/freebsd/mod.rs":"433349d5328359004f1624547918ac817d9c9268023c51bc6dc7834c7e73a3d9","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"9ca3f82f88974e6db5569f2d76a5a3749b248a31747a6c0da5820492bdfeca42","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/unix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"c3a0111252e201c172b99e7d9cbee4cf088d3dd47995110e819f04276bccd198","src/unix/bsd/freebsdlike/mod.rs":"7b1bfbd0253aa14e9acdd448d0303b84f283a70a0c4ba546f445d44d3ad011ef","src/unix/bsd/mod.rs":"2fed08973739d7f6a7412b204724af64b1a915c712689c250cf9a08263ba05ff","src/unix/bsd/netbsdlike/mod.rs":"4e9da54e541773c7ad4cca9dade1df00f28f2fdac3f8df5957f4c74b7e082344","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"78091375c1c6dcdd03d3a1b35337b5c8bc74af500e294bc5ec91d4b73bf982d9","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"1afe5ef46b14397cdd68664b5b232e4f5b035b6db1d4cf411c899d51ebca9f30","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"1dd5449dd1fd3d51e30ffdeeaece91d0aaf05c710e0ac699fecc5461cfa2c28e","src/unix/bsd/netbsdlike/openbsd/mod.rs":"ac6fff797511b00659849242b997de4d9f948698b5677de928375fc84d2ac1f3","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"d31db31630289c85af3339dbe357998a21ca584cbae31607448fe2cf7675a4e1","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"916e15a760e973b3ad3830ecfab435b557d05942116e33cb80b15bcba02e39f0","src/unix/haiku/native.rs":"b3c35dba8c07e3347de58a44750690e16dc137adbae8bc030a3a658dd1f3c871","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"859814f5df89e28fd4b345db399d181e11e7ed413841b6ff703a1fcbdbf013ae","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"433c1530f602cc5ed26610c58055dde0c4ceea5e00150063b24ddc60768332a4","src/unix/linux_like/android/b32/mod.rs":"d971b98530a96f5892f98e1edc3133cf278d1b3939d77ab0a27a6323e0961715","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"8388bd3a0fcb5636bf965eee6dc95ae6860b85a2b555b387c868aa4d4e01ec89","src/unix/linux_like/android/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"8fe667d2b14abc5ac8aad32e16c3da24350471d8156eaea9ab4989f73dd9f9fc","src/unix/linux_like/android/b64/mod.rs":"d7bbbadafdb2cb2ff8e9cde3d89a03b9facaabb6b2d45705225d3ece1c5cce37","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"06b22dc184e85a988ab969c75cadc52b9878faeab0eb9d21215878c95fe07c19","src/unix/linux_like/android/mod.rs":"7d42d84cb547012d19034221c174208766f2dcf62d08724f6b453b2a075d5cff","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"6ef97140ca6fb24125fdd0aacb986ef785aa21993229660d7f703f8875ebfe49","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"213e70ebed2703e14a9cf17666b21ecbf180b7bff7fa22fdbb36dbbd52df326d","src/unix/linux_like/linux/arch/generic/mod.rs":"ff1fe8fad4ea15d9bec3db25efcfcb4939190c5189f86cfa4d05825aa8c10956","src/unix/linux_like/linux/arch/mips/mod.rs":"e4a980b002105aaa057eb6568e1e2c6168ade5c00e13a31ef67e316ddffdb900","src/unix/linux_like/linux/arch/mod.rs":"466a29622e47c6c7f1500682b2eb17f5566dd81b322cd6348f0fdd355cec593a","src/unix/linux_like/linux/arch/powerpc/mod.rs":"1789eb5b41f75c29239795124a4a7cdcf7c8d213b88cf581b2f5bda08d7cf15b","src/unix/linux_like/linux/arch/sparc/mod.rs":"ded708124ee610267d011dee31fb02d1ec697c334aa822776ec95a7ddf6fc541","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"07adf9f4b96854062db518aaf08521fde0ad4a21a5c049efccba437bd97b2b5a","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"1cb5c0c9df3af2bbe131a91593583259fac9118931744c8435e197a394eb0462","src/unix/linux_like/linux/gnu/b32/mod.rs":"794dbcbae7dae8fd6b0b814573243197ceb532b56ef0772ad86b4b401478fcd9","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"0cd7348badb9c4f8a0db31a2503b30c456a2bfcc7a0e5919762b1e12f912c5ad","src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs":"9c628cd97806181dc4d34b072f63fe1eb42f08108712002e0628ffe27f2fa93f","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/linux/gnu/b32/sparc/mod.rs":"1bcec269a8416ccc48a384ca5765eaaa23f30f39f32311f50008ef4eeadafb2f","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"5317dbf2323577b89370bbee3894882b89d8333176db4f7b271ddc2f036ef43c","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs":"21a21503ef2e095f4371044915d4bfb07a8578011cb5c713cd9f45947b0b5730","src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs":"e78c3cd197f44832338b414d1a9bc0d194f44c74db77bd7bf830c1fff62b2690","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"c3730792dabcc166d8fd22929ef2633d49bc626875382dfcd401e8e125fb7a84","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"68bcb71bbfccb4e8648948e494366d94767ce96f36daab9c1329375cdd32a459","src/unix/linux_like/linux/gnu/b64/mod.rs":"6336065423c26b59681fd2ce77f1117ea36af13e163fdadaefd108bd8191e8c8","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"dbb8905e363ed4a2dfb984554ad9b6389d27f6a2d599ec2d80e38a6c7551a019","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"18edaa89c9746125863ff53182e0ef32cb1e1612e1ed9a2672558a9de85440e9","src/unix/linux_like/linux/gnu/b64/s390x.rs":"d9bb4e524e70d6fef49e0f77d89a92f478fd95d9a1aea32f4dc845275a7465d4","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"26fda11bdce99372c2c246e60866b56d98beb9fb49a2f6b69347ecfd03d18255","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"5a5ce7c5c92f60d8900dce63d363a38f3126aaf5be981710e172bec96ef95ac6","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"f775ac2b754f90b63053fe22afe1d19d306b5404995568d6805baa9249fb617f","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"4ba1b58468f55254717366f50fdfd3e4114fde6dc442a56681926c4d7e5b6b0d","src/unix/linux_like/linux/gnu/mod.rs":"8cae88fb171344dd2ce21835691476ea1cf21dd7d6b4c81aaa10de72fb2a7d34","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"4924fdce70f2d1dcf3f024f64fbdab679264c20fa99bbe42b5f17e31f258f660","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"6255abe2ee04986832d12b7b2190589580f2a43e9bfb285b32b5747227f62727","src/unix/linux_like/linux/musl/b32/hexagon.rs":"a8811791809672be8338e6e27d1c4fcf383c2f26585be8bf9ab2923b219de032","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"b9e9ff42363ebbb884ddf6445129ec4164471df45846874fc08f5f458e659254","src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"4592dc5f1f2fe888dfef85fa862d42d168e73a2c6f4fc052b58287d0f4d4ffcd","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"a19a8decfab185af3cebd34aae4b15082e7552be573904b8c1a3f0c0e493ef34","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"798a9229d70ce235394f2dd625f6c4c1e10519a94382dc5b091952b638ae2928","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"a73035c6d9b776f13b839008e15c04c2c53455571efd06664affcb047e457112","src/unix/linux_like/linux/musl/b64/mips64.rs":"2744895451f3a777fbe54f7f2695be53310b965fd62084c9b7e9121c7fe28346","src/unix/linux_like/linux/musl/b64/mod.rs":"d18abc0aeba2e26342bf3416a4dba0836db2bb0ee013b0a39629475cf8640289","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"e5a55525b42493923956d668f978fb45e22d51deea00ce5edbfddf76ff19c741","src/unix/linux_like/linux/musl/b64/s390x.rs":"03dfec6794d93cb31a7c52b2d53a0973755168f91f8fa437cc5dbd54882c8ee7","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"0dd168f5a6881f32e5239fb312b23cf137b800d0ff323286a92c8a2c382b5456","src/unix/linux_like/linux/musl/mod.rs":"81690cfec80ae3de9dc7e3d31b251de46863a87b534e038a56fa0bedc0986889","src/unix/linux_like/linux/no_align.rs":"5ed04c53bf9d27da9b4d65ba7625c6ac53330162683d1b3df98950caafa3507b","src/unix/linux_like/linux/uclibc/align.rs":"9ed16138d8e439bd90930845a65eafa7ebd67366e6bf633936d44014f6e4c959","src/unix/linux_like/linux/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/arm/mod.rs":"9b691eeec0a9bf7b2abb87e09062d2c148d18e11c96ecad0edd0b74d1d0509fd","src/unix/linux_like/linux/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs":"18753a99b820d69e062e3ba22a63fa86577b6dcc42f740479c7be1a4c658e1be","src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/linux_like/linux/uclibc/mips/mod.rs":"656fbf5157ab6d06fc365a8353b138818ad5b8429ea5628ff35a3972c63a1a7c","src/unix/linux_like/linux/uclibc/mod.rs":"6885187dc15e9239981ad36ac5bdc8559ae4c55775c8e304ae1a2093568d93f2","src/unix/linux_like/linux/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/linux_like/linux/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/linux_like/linux/uclibc/x86_64/mod.rs":"02e21c0550a423a3f6db0a0af6a0f37cf5937feb2562a490e0ad0e09a8d9fc77","src/unix/linux_like/linux/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/unix/linux_like/mod.rs":"9f6eadebed153e31777482932dae2f3fd3471d5b5465099f98f1e2a9429922fe","src/unix/mod.rs":"6b2b57833e37cd3231944696c8216eb587a2a68069346150cf321153eaf04d03","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/espidf/mod.rs":"c198cb4beccdab483be61c102da74dc51ac80f766797e33021f3110394ed5a3d","src/unix/newlib/mod.rs":"07c282da3fedf04d061c70ab918b561ba44e5d67670e0b04664505afc9c5979f","src/unix/newlib/no_align.rs":"e0743b2179495a9514bc3a4d1781e492878c4ec834ee0085d0891dd1712e82fb","src/unix/newlib/powerpc/mod.rs":"2d0f7af28b47f7a2a6c210ebd1c1f33ed8eac62e56b5af2b856de2ad3fdc5187","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"251ade5cbe9d648ba7186f58dfe7d4fd8e08be1ab9d0d51bba13e0bf3a0207d0","src/unix/solarish/compat.rs":"b07a5bfac925eb012003a459ba6bddbd3bfa9c44b3394da2ac5a602e54beae9c","src/unix/solarish/illumos.rs":"be7cf5334fc8f2c6bc1b856288e53af7f90a92bd64793eb19b60b660383e508c","src/unix/solarish/mod.rs":"e326528365803b1085050b5d14705c02db25ff0c241facbaa8929d7a3f417b59","src/unix/solarish/solaris.rs":"65b005453aefa9b9d4fc860fe77cfec80d8c97a51342b15daf55fc3e808bb384","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"aea3da66f2140f2a82dfc9c58f6e6531d2dd9c15ea696e0f95a0d4a2a187b5b6","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"2c945bce3ddd26bf20ff03fb4192c9c3f625f1308a479c5cb4bd4510a892629a","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"3c8c7edb7cdf5d0c44af936db2a94869585c69dfabeef30571b4f4e38375767a","src/windows/mod.rs":"cf605ceefc10481aaf6274a205b2899abeb7c043bd384ff766dcb301318dfa2a","src/windows/msvc.rs":"ea6d87a6a9cd668261b1c043e7c36cf599e80b5d09f6e4502e85daa4797c7927","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4"},"package":"3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,16 +3,15 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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]
 name = "libc"
-version = "0.2.81"
+version = "0.2.101"
 authors = ["The Rust Project Developers"]
 build = "build.rs"
 exclude = ["/ci/*", "/.github/*", "/.cirrus.yml", "/triagebot.toml"]
@@ -24,6 +23,8 @@
 categories = ["external-ffi-bindings", "no-std", "os"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/libc"
+[package.metadata.docs.rs]
+features = ["const-extern-fn", "extra_traits"]
 [dependencies.rustc-std-workspace-core]
 version = "1.0.0"
 optional = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/CONTRIBUTING.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/CONTRIBUTING.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/CONTRIBUTING.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/CONTRIBUTING.md	2021-12-09 12:01:26.000000000 +0000
@@ -28,15 +28,25 @@
 platforms supported, so you'll see failures if an API is added at the wrong
 level or has different signatures across platforms.
 
+New symbol(s) (i.e. functions, constants etc.) should also be added to the
+symbols list(s) found in the `libc-test/semver` directory. These lists keep
+track of what symbols are public in the libc crate and ensures they remain
+available between changes to the crate. If the new symbol(s) are available on
+all supported Unixes it should be added to `unix.txt` list<sup>1</sup>,
+otherwise they should be added to the OS specific list(s).
+
 With that in mind, the steps for adding a new API are:
 
 1. Determine where in the module hierarchy your API should be added.
-2. Add the API.
+2. Add the API, including adding new symbol(s) to the semver lists.
 3. Send a PR to this repo.
 4. Wait for CI to pass, fixing errors.
 5. Wait for a merge!
 
-### Test before you commit
+<sup>1</sup>: Note that this list has nothing to do with any Unix or Posix
+standard, it's just a list shared between all OSs that declare `#[cfg(unix)]`.
+
+## Test before you commit
 
 We have two automated tests running on [GitHub Actions](https://github.com/rust-lang/libc/actions):
 
@@ -46,18 +56,34 @@
 2. Style checker
   - `rustc ci/style.rs && ./style src`
 
-### Releasing your change to crates.io
+## Breaking change policy
+
+Sometimes an upstream adds a breaking change to their API e.g. removing outdated items,
+changing the type signature, etc. And we probably should follow that change to build the
+`libc` crate successfully. It's annoying to do the equivalent of semver-major versioning
+for each such change. Instead, we mark the item as deprecated and do the actual change
+after a certain period. The steps are:
+
+1. Add `#[deprecated(since = "", note="")]` attribute to the item.
+  - The `since` field should have a next version of `libc`
+    (e.g., if the current version is `0.2.1`, it should be `0.2.2`).
+  - The `note` field should have a reason to deprecate and a tracking issue to call for comments
+    (e.g., "We consider removing this as the upstream removed it.
+    If you're using it, please comment on #XXX").
+2. If we don't see any concerns for a while, do the change actually.
+
+## Releasing your change to crates.io
 
 Now that you've done the amazing job of landing your new API or your new
 platform in this crate, the next step is to get that sweet, sweet usage from
 crates.io! The only next step is to bump the version of libc and then publish
 it. If you'd like to get a release out ASAP you can follow these steps:
 
-1. Increment the patch version number in `Cargo.toml`.
-1. Send a PR to this repository. It should [look like this][example], but it'd
+1. Increment the patch version number in `Cargo.toml` and `libc-test/Cargo.toml`.
+1. Send a PR to this repository. It should [look like this][example-pr], but it'd
    also be nice to fill out the description with a small rationale for the
    release (any rationale is ok though!)
 1. Once merged, the release will be tagged and published by one of the libc crate
    maintainers.
 
-[example]: https://github.com/rust-lang/libc/pull/583
+[example-pr]: https://github.com/rust-lang/libc/pull/2120
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -61,7 +61,7 @@
 See
 [`ci/build.sh`](https://github.com/rust-lang/libc/blob/master/ci/build.sh)
 for the platforms on which `libc` is guaranteed to build for each Rust
-toolchain. The test-matrix at [Azure] and [Cirrus CI] show the
+toolchain. The test-matrix at [GitHub Actions] and [Cirrus CI] show the
 platforms in which `libc` tests are run.
 
 <div class="platform_docs"></div>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/rustfmt.toml	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1 @@
-max_width = 79
-comment_width = 79
-error_on_line_overflow = true
\ No newline at end of file
+error_on_line_overflow = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/aarch64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/aarch64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/aarch64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/aarch64.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-pub type c_char = u8;
-pub type c_long = i64;
-pub type c_ulong = u64;
-pub type wchar_t = u32;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/arm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/arm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/arm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/arm.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-pub type c_char = u8;
-pub type c_long = i32;
-pub type c_ulong = u32;
-pub type wchar_t = u32;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,375 +0,0 @@
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
-pub type c_float = f32;
-pub type c_double = f64;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
-pub type intmax_t = i64;
-pub type uintmax_t = u64;
-
-pub type size_t = usize;
-pub type ptrdiff_t = isize;
-pub type intptr_t = isize;
-pub type uintptr_t = usize;
-pub type ssize_t = isize;
-
-pub type in_addr_t = u32;
-pub type in_port_t = u16;
-pub type pthread_key_t = usize;
-pub type pthread_t = usize;
-pub type sa_family_t = u8;
-pub type socklen_t = usize;
-pub type time_t = i64;
-
-s! {
-    pub struct addrinfo {
-        pub ai_flags: ::c_int,
-        pub ai_family: ::c_int,
-        pub ai_socktype: ::c_int,
-        pub ai_protocol: ::c_int,
-        pub ai_addrlen: ::socklen_t,
-        pub ai_addr: *mut ::sockaddr,
-        pub ai_canonname: *mut ::c_char,
-        pub ai_next: *mut addrinfo,
-    }
-
-    pub struct in_addr {
-        pub s_addr: in_addr_t,
-    }
-
-    pub struct in6_addr {
-        pub s6_addr: [u8; 16],
-    }
-
-    pub struct pthread_attr_t {
-        __detachstate: ::c_int,
-        __stacksize: usize,
-    }
-
-    pub struct sockaddr {
-        pub sa_family: sa_family_t,
-        pub sa_data: [::c_char; 0],
-    }
-
-    pub struct sockaddr_in {
-        pub sin_family: ::sa_family_t,
-        pub sin_port: ::in_port_t,
-        pub sin_addr: ::in_addr,
-    }
-
-    pub struct sockaddr_in6 {
-        pub sin6_family: sa_family_t,
-        pub sin6_port: ::in_port_t,
-        pub sin6_flowinfo: u32,
-        pub sin6_addr: ::in6_addr,
-        pub sin6_scope_id: u32,
-    }
-
-    pub struct sockaddr_storage {
-        pub ss_family: ::sa_family_t,
-        __ss_data: [u8; 32],
-    }
-}
-
-pub const INT_MIN: c_int = -2147483648;
-pub const INT_MAX: c_int = 2147483647;
-
-pub const _SC_NPROCESSORS_ONLN: ::c_int = 52;
-pub const _SC_PAGESIZE: ::c_int = 54;
-
-pub const AF_INET: ::c_int = 1;
-pub const AF_INET6: ::c_int = 2;
-
-pub const EACCES: ::c_int = 2;
-pub const EADDRINUSE: ::c_int = 3;
-pub const EADDRNOTAVAIL: ::c_int = 4;
-pub const EAGAIN: ::c_int = 6;
-pub const ECONNABORTED: ::c_int = 13;
-pub const ECONNREFUSED: ::c_int = 14;
-pub const ECONNRESET: ::c_int = 15;
-pub const EEXIST: ::c_int = 20;
-pub const EINTR: ::c_int = 27;
-pub const EINVAL: ::c_int = 28;
-pub const ENOENT: ::c_int = 44;
-pub const ENOTCONN: ::c_int = 53;
-pub const EPERM: ::c_int = 63;
-pub const EPIPE: ::c_int = 64;
-pub const ETIMEDOUT: ::c_int = 73;
-pub const EWOULDBLOCK: ::c_int = EAGAIN;
-
-pub const EAI_SYSTEM: ::c_int = 9;
-
-pub const EXIT_FAILURE: ::c_int = 1;
-pub const EXIT_SUCCESS: ::c_int = 0;
-
-pub const PTHREAD_STACK_MIN: ::size_t = 1024;
-
-pub const SOCK_DGRAM: ::c_int = 128;
-pub const SOCK_STREAM: ::c_int = 130;
-
-#[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum FILE {}
-impl ::Copy for FILE {}
-impl ::Clone for FILE {
-    fn clone(&self) -> FILE {
-        *self
-    }
-}
-#[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // FIXME: fill this out with a struct
-impl ::Copy for fpos_t {}
-impl ::Clone for fpos_t {
-    fn clone(&self) -> fpos_t {
-        *self
-    }
-}
-
-extern "C" {
-    pub fn isalnum(c: c_int) -> c_int;
-    pub fn isalpha(c: c_int) -> c_int;
-    pub fn iscntrl(c: c_int) -> c_int;
-    pub fn isdigit(c: c_int) -> c_int;
-    pub fn isgraph(c: c_int) -> c_int;
-    pub fn islower(c: c_int) -> c_int;
-    pub fn isprint(c: c_int) -> c_int;
-    pub fn ispunct(c: c_int) -> c_int;
-    pub fn isspace(c: c_int) -> c_int;
-    pub fn isupper(c: c_int) -> c_int;
-    pub fn isxdigit(c: c_int) -> c_int;
-    pub fn isblank(c: c_int) -> c_int;
-    pub fn tolower(c: c_int) -> c_int;
-    pub fn toupper(c: c_int) -> c_int;
-    pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;
-    pub fn freopen(
-        filename: *const c_char,
-        mode: *const c_char,
-        file: *mut FILE,
-    ) -> *mut FILE;
-    pub fn fflush(file: *mut FILE) -> c_int;
-    pub fn fclose(file: *mut FILE) -> c_int;
-    pub fn remove(filename: *const c_char) -> c_int;
-    pub fn rename(oldname: *const c_char, newname: *const c_char) -> c_int;
-    pub fn tmpfile() -> *mut FILE;
-    pub fn setvbuf(
-        stream: *mut FILE,
-        buffer: *mut c_char,
-        mode: c_int,
-        size: size_t,
-    ) -> c_int;
-    pub fn setbuf(stream: *mut FILE, buf: *mut c_char);
-    pub fn getchar() -> c_int;
-    pub fn putchar(c: c_int) -> c_int;
-    pub fn fgetc(stream: *mut FILE) -> c_int;
-    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE)
-        -> *mut c_char;
-    pub fn fputc(c: c_int, stream: *mut FILE) -> c_int;
-    pub fn fputs(s: *const c_char, stream: *mut FILE) -> c_int;
-    pub fn puts(s: *const c_char) -> c_int;
-    pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
-    pub fn fread(
-        ptr: *mut c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
-    pub fn fwrite(
-        ptr: *const c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
-    pub fn fseek(stream: *mut FILE, offset: c_long, whence: c_int) -> c_int;
-    pub fn ftell(stream: *mut FILE) -> c_long;
-    pub fn rewind(stream: *mut FILE);
-    pub fn fgetpos(stream: *mut FILE, ptr: *mut fpos_t) -> c_int;
-    pub fn fsetpos(stream: *mut FILE, ptr: *const fpos_t) -> c_int;
-    pub fn feof(stream: *mut FILE) -> c_int;
-    pub fn ferror(stream: *mut FILE) -> c_int;
-    pub fn perror(s: *const c_char);
-    pub fn atoi(s: *const c_char) -> c_int;
-    pub fn strtod(s: *const c_char, endp: *mut *mut c_char) -> c_double;
-    pub fn strtol(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_long;
-    pub fn strtoul(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_ulong;
-    pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
-    pub fn malloc(size: size_t) -> *mut c_void;
-    pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
-    pub fn free(p: *mut c_void);
-    pub fn abort() -> !;
-    pub fn exit(status: c_int) -> !;
-    pub fn _exit(status: c_int) -> !;
-    pub fn atexit(cb: extern "C" fn()) -> c_int;
-    pub fn system(s: *const c_char) -> c_int;
-    pub fn getenv(s: *const c_char) -> *mut c_char;
-    pub fn getline(
-        lineptr: *mut *mut c_char,
-        n: *mut size_t,
-        stream: *mut FILE,
-    ) -> ssize_t;
-
-    pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
-    pub fn strncpy(
-        dst: *mut c_char,
-        src: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
-    pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strncat(
-        s: *mut c_char,
-        ct: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
-    pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
-    pub fn strncmp(cs: *const c_char, ct: *const c_char, n: size_t) -> c_int;
-    pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
-    pub fn strchr(cs: *const c_char, c: c_int) -> *mut c_char;
-    pub fn strrchr(cs: *const c_char, c: c_int) -> *mut c_char;
-    pub fn strspn(cs: *const c_char, ct: *const c_char) -> size_t;
-    pub fn strcspn(cs: *const c_char, ct: *const c_char) -> size_t;
-    pub fn strdup(cs: *const c_char) -> *mut c_char;
-    pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
-    pub fn strncasecmp(
-        s1: *const c_char,
-        s2: *const c_char,
-        n: size_t,
-    ) -> c_int;
-    pub fn strlen(cs: *const c_char) -> size_t;
-    pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
-    pub fn strerror(n: c_int) -> *mut c_char;
-    pub fn strtok(s: *mut c_char, t: *const c_char) -> *mut c_char;
-    pub fn strxfrm(s: *mut c_char, ct: *const c_char, n: size_t) -> size_t;
-    pub fn wcslen(buf: *const wchar_t) -> size_t;
-    pub fn wcstombs(
-        dest: *mut c_char,
-        src: *const wchar_t,
-        n: size_t,
-    ) -> ::size_t;
-
-    pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
-    pub fn wmemchr(cx: *const wchar_t, c: wchar_t, n: size_t) -> *mut wchar_t;
-    pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
-    pub fn memcpy(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
-    pub fn memmove(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
-    pub fn memset(dest: *mut c_void, c: c_int, n: size_t) -> *mut c_void;
-
-    pub fn abs(i: c_int) -> c_int;
-    pub fn atof(s: *const c_char) -> c_double;
-    pub fn labs(i: c_long) -> c_long;
-    pub fn rand() -> c_int;
-    pub fn srand(seed: c_uint);
-
-    pub fn arc4random_buf(buf: *const ::c_void, len: ::size_t);
-    pub fn freeaddrinfo(res: *mut addrinfo);
-    pub fn gai_strerror(errcode: ::c_int) -> *const ::c_char;
-    pub fn getaddrinfo(
-        node: *const c_char,
-        service: *const c_char,
-        hints: *const addrinfo,
-        res: *mut *mut addrinfo,
-    ) -> ::c_int;
-    pub fn getsockopt(
-        sockfd: ::c_int,
-        level: ::c_int,
-        optname: ::c_int,
-        optval: *mut ::c_void,
-        optlen: *mut ::socklen_t,
-    ) -> ::c_int;
-    pub fn posix_memalign(
-        memptr: *mut *mut ::c_void,
-        align: ::size_t,
-        size: ::size_t,
-    ) -> ::c_int;
-    pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int;
-    pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int;
-    pub fn pthread_attr_setstacksize(
-        attr: *mut ::pthread_attr_t,
-        stack_size: ::size_t,
-    ) -> ::c_int;
-    pub fn pthread_create(
-        native: *mut ::pthread_t,
-        attr: *const ::pthread_attr_t,
-        f: extern "C" fn(*mut ::c_void) -> *mut ::c_void,
-        value: *mut ::c_void,
-    ) -> ::c_int;
-    pub fn pthread_detach(thread: ::pthread_t) -> ::c_int;
-    pub fn pthread_getspecific(key: pthread_key_t) -> *mut ::c_void;
-    pub fn pthread_join(
-        native: ::pthread_t,
-        value: *mut *mut ::c_void,
-    ) -> ::c_int;
-    pub fn pthread_key_create(
-        key: *mut pthread_key_t,
-        dtor: ::Option<unsafe extern "C" fn(*mut ::c_void)>,
-    ) -> ::c_int;
-    pub fn pthread_key_delete(key: pthread_key_t) -> ::c_int;
-    pub fn pthread_setspecific(
-        key: pthread_key_t,
-        value: *const ::c_void,
-    ) -> ::c_int;
-    pub fn send(
-        socket: ::c_int,
-        buf: *const ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn sysconf(name: ::c_int) -> ::c_long;
-}
-
-cfg_if! {
-    if #[cfg(target_arch = "aarch64")] {
-        mod aarch64;
-        pub use self::aarch64::*;
-    } else if #[cfg(any(target_arch = "arm"))] {
-        mod arm;
-        pub use self::arm::*;
-    } else if #[cfg(any(target_arch = "x86"))] {
-        mod x86;
-        pub use self::x86::*;
-    } else if #[cfg(any(target_arch = "x86_64"))] {
-        mod x86_64;
-        pub use self::x86_64::*;
-    } else {
-        // Unknown target_arch
-    }
-}
-
-cfg_if! {
-    if #[cfg(libc_core_cvoid)] {
-        pub use ::ffi::c_void;
-    } else {
-        // Use repr(u8) as LLVM expects `void*` to be the same as `i8*` to help
-        // enable more optimization opportunities around it recognizing things
-        // like malloc/free.
-        #[repr(u8)]
-        #[allow(missing_copy_implementations)]
-        #[allow(missing_debug_implementations)]
-        pub enum c_void {
-            // Two dummy variants so the #[repr] attribute can be used.
-            #[doc(hidden)]
-            __variant1,
-            #[doc(hidden)]
-            __variant2,
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/x86_64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/x86_64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/x86_64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/x86_64.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-pub type c_char = i8;
-pub type c_long = i64;
-pub type c_ulong = u64;
-pub type wchar_t = i32;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/x86.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/x86.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/cloudabi/x86.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/cloudabi/x86.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-pub type c_char = i8;
-pub type c_long = i32;
-pub type c_ulong = u32;
-pub type wchar_t = i32;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/fuchsia/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/fuchsia/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/fuchsia/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/fuchsia/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -89,6 +89,8 @@
 pub type c_long = i64;
 pub type c_ulong = u64;
 
+pub type zx_status_t = i32;
+
 // FIXME: why are these uninhabited types? that seems... wrong?
 // Presumably these should be `()` or an `extern type` (when that stabilizes).
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
@@ -209,6 +211,12 @@
         pub imr_interface: in_addr,
     }
 
+    pub struct ip_mreqn {
+        pub imr_multiaddr: in_addr,
+        pub imr_address: in_addr,
+        pub imr_ifindex: ::c_int,
+    }
+
     pub struct ipv6_mreq {
         pub ipv6mr_multiaddr: in6_addr,
         pub ipv6mr_interface: ::c_uint,
@@ -1327,6 +1335,7 @@
 pub const S_ISVTX: ::c_int = 0x200;
 
 pub const IF_NAMESIZE: ::size_t = 16;
+pub const IFNAMSIZ: ::size_t = IF_NAMESIZE;
 
 pub const LOG_EMERG: ::c_int = 0;
 pub const LOG_ALERT: ::c_int = 1;
@@ -1454,8 +1463,6 @@
 pub const O_WRONLY: ::c_int = 1;
 pub const O_RDWR: ::c_int = 2;
 
-pub const SOCK_CLOEXEC: ::c_int = O_CLOEXEC;
-
 pub const S_IFIFO: ::mode_t = 4096;
 pub const S_IFCHR: ::mode_t = 8192;
 pub const S_IFBLK: ::mode_t = 24576;
@@ -1762,14 +1769,19 @@
 
 pub const SOCK_RAW: ::c_int = 3;
 pub const SOCK_RDM: ::c_int = 4;
+
+pub const IP_TOS: ::c_int = 1;
+pub const IP_TTL: ::c_int = 2;
+pub const IP_HDRINCL: ::c_int = 3;
+pub const IP_RECVTOS: ::c_int = 13;
+pub const IP_FREEBIND: ::c_int = 15;
+pub const IP_TRANSPARENT: ::c_int = 19;
 pub const IP_MULTICAST_IF: ::c_int = 32;
 pub const IP_MULTICAST_TTL: ::c_int = 33;
 pub const IP_MULTICAST_LOOP: ::c_int = 34;
-pub const IP_TTL: ::c_int = 2;
-pub const IP_HDRINCL: ::c_int = 3;
 pub const IP_ADD_MEMBERSHIP: ::c_int = 35;
 pub const IP_DROP_MEMBERSHIP: ::c_int = 36;
-pub const IP_TRANSPARENT: ::c_int = 19;
+
 pub const IPV6_UNICAST_HOPS: ::c_int = 16;
 pub const IPV6_MULTICAST_IF: ::c_int = 17;
 pub const IPV6_MULTICAST_HOPS: ::c_int = 18;
@@ -1980,6 +1992,13 @@
 
 pub const SI_LOAD_SHIFT: ::c_uint = 16;
 
+pub const CLD_EXITED: ::c_int = 1;
+pub const CLD_KILLED: ::c_int = 2;
+pub const CLD_DUMPED: ::c_int = 3;
+pub const CLD_TRAPPED: ::c_int = 4;
+pub const CLD_STOPPED: ::c_int = 5;
+pub const CLD_CONTINUED: ::c_int = 6;
+
 pub const SIGEV_SIGNAL: ::c_int = 0;
 pub const SIGEV_NONE: ::c_int = 1;
 pub const SIGEV_THREAD: ::c_int = 2;
@@ -2702,6 +2721,7 @@
 pub const RLIM_INFINITY: ::rlim_t = !0;
 pub const RLIMIT_RTTIME: ::c_int = 15;
 pub const RLIMIT_NLIMITS: ::c_int = 16;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 
 pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
 
@@ -2891,7 +2911,8 @@
 pub const O_RSYNC: ::c_int = O_SYNC;
 pub const O_DSYNC: ::c_int = 0x00000020;
 
-pub const SOCK_NONBLOCK: ::c_int = 2048;
+pub const SOCK_CLOEXEC: ::c_int = 0o2000000;
+pub const SOCK_NONBLOCK: ::c_int = 0o4000;
 
 pub const MAP_ANON: ::c_int = 0x0020;
 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
@@ -3139,7 +3160,7 @@
         return
     }
 
-    pub fn FD_ISSET(fd: ::c_int, set: *mut fd_set) -> bool {
+    pub fn FD_ISSET(fd: ::c_int, set: *const fd_set) -> bool {
         let fd = fd as usize;
         let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
         return ((*set).fds_bits[fd / size] & (1 << (fd % size))) != 0
@@ -3240,12 +3261,12 @@
         }
     }
 
-    pub fn CMSG_ALIGN(len: ::size_t) -> ::size_t {
+    pub {const} fn CMSG_ALIGN(len: ::size_t) -> ::size_t {
         (len + ::mem::size_of::<::size_t>() - 1)
             & !(::mem::size_of::<::size_t>() - 1)
     }
 
-    pub fn CMSG_SPACE(len: ::c_uint) -> ::c_uint {
+    pub {const} fn CMSG_SPACE(len: ::c_uint) -> ::c_uint {
         (CMSG_ALIGN(len as ::size_t) + CMSG_ALIGN(::mem::size_of::<cmsghdr>()))
             as ::c_uint
     }
@@ -3294,8 +3315,7 @@
 }
 
 fn __CMSG_LEN(cmsg: *const cmsghdr) -> ::ssize_t {
-    ((unsafe { (*cmsg).cmsg_len as ::size_t } + ::mem::size_of::<::c_long>()
-        - 1)
+    ((unsafe { (*cmsg).cmsg_len as ::size_t } + ::mem::size_of::<::c_long>() - 1)
         & !(::mem::size_of::<::c_long>() - 1)) as ::ssize_t
 }
 
@@ -3304,8 +3324,7 @@
 }
 
 fn __MHDR_END(mhdr: *const msghdr) -> *mut c_uchar {
-    unsafe { (*mhdr).msg_control.offset((*mhdr).msg_controllen as isize) }
-        .cast()
+    unsafe { (*mhdr).msg_control.offset((*mhdr).msg_controllen as isize) }.cast()
 }
 
 // EXTERN_FN
@@ -3347,44 +3366,24 @@
     pub fn tolower(c: c_int) -> c_int;
     pub fn toupper(c: c_int) -> c_int;
     pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;
-    pub fn freopen(
-        filename: *const c_char,
-        mode: *const c_char,
-        file: *mut FILE,
-    ) -> *mut FILE;
+    pub fn freopen(filename: *const c_char, mode: *const c_char, file: *mut FILE) -> *mut FILE;
     pub fn fflush(file: *mut FILE) -> c_int;
     pub fn fclose(file: *mut FILE) -> c_int;
     pub fn remove(filename: *const c_char) -> c_int;
     pub fn rename(oldname: *const c_char, newname: *const c_char) -> c_int;
     pub fn tmpfile() -> *mut FILE;
-    pub fn setvbuf(
-        stream: *mut FILE,
-        buffer: *mut c_char,
-        mode: c_int,
-        size: size_t,
-    ) -> c_int;
+    pub fn setvbuf(stream: *mut FILE, buffer: *mut c_char, mode: c_int, size: size_t) -> c_int;
     pub fn setbuf(stream: *mut FILE, buf: *mut c_char);
     pub fn getchar() -> c_int;
     pub fn putchar(c: c_int) -> c_int;
     pub fn fgetc(stream: *mut FILE) -> c_int;
-    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE)
-        -> *mut c_char;
+    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE) -> *mut c_char;
     pub fn fputc(c: c_int, stream: *mut FILE) -> c_int;
     pub fn fputs(s: *const c_char, stream: *mut FILE) -> c_int;
     pub fn puts(s: *const c_char) -> c_int;
     pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
-    pub fn fread(
-        ptr: *mut c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
-    pub fn fwrite(
-        ptr: *const c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
+    pub fn fread(ptr: *mut c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
+    pub fn fwrite(ptr: *const c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
     pub fn fseek(stream: *mut FILE, offset: c_long, whence: c_int) -> c_int;
     pub fn ftell(stream: *mut FILE) -> c_long;
     pub fn rewind(stream: *mut FILE);
@@ -3395,16 +3394,9 @@
     pub fn perror(s: *const c_char);
     pub fn atoi(s: *const c_char) -> c_int;
     pub fn strtod(s: *const c_char, endp: *mut *mut c_char) -> c_double;
-    pub fn strtol(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_long;
-    pub fn strtoul(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_ulong;
+    pub fn strtof(s: *const c_char, endp: *mut *mut c_char) -> c_float;
+    pub fn strtol(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_long;
+    pub fn strtoul(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_ulong;
     pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
     pub fn malloc(size: size_t) -> *mut c_void;
     pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
@@ -3417,17 +3409,9 @@
     pub fn getenv(s: *const c_char) -> *mut c_char;
 
     pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
-    pub fn strncpy(
-        dst: *mut c_char,
-        src: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strncat(
-        s: *mut c_char,
-        ct: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncat(s: *mut c_char, ct: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
     pub fn strncmp(cs: *const c_char, ct: *const c_char, n: size_t) -> c_int;
     pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
@@ -3444,25 +3428,13 @@
     pub fn strtok(s: *mut c_char, t: *const c_char) -> *mut c_char;
     pub fn strxfrm(s: *mut c_char, ct: *const c_char, n: size_t) -> size_t;
     pub fn wcslen(buf: *const wchar_t) -> size_t;
-    pub fn wcstombs(
-        dest: *mut c_char,
-        src: *const wchar_t,
-        n: size_t,
-    ) -> ::size_t;
+    pub fn wcstombs(dest: *mut c_char, src: *const wchar_t, n: size_t) -> ::size_t;
 
     pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
     pub fn wmemchr(cx: *const wchar_t, c: wchar_t, n: size_t) -> *mut wchar_t;
     pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
-    pub fn memcpy(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
-    pub fn memmove(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
+    pub fn memcpy(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
+    pub fn memmove(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
     pub fn memset(dest: *mut c_void, c: c_int, n: size_t) -> *mut c_void;
 
     pub fn abs(i: c_int) -> c_int;
@@ -3474,42 +3446,20 @@
     pub fn getpwnam(name: *const ::c_char) -> *mut passwd;
     pub fn getpwuid(uid: ::uid_t) -> *mut passwd;
 
-    pub fn fprintf(
-        stream: *mut ::FILE,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn fprintf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
     pub fn printf(format: *const ::c_char, ...) -> ::c_int;
-    pub fn snprintf(
-        s: *mut ::c_char,
-        n: ::size_t,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn snprintf(s: *mut ::c_char, n: ::size_t, format: *const ::c_char, ...) -> ::c_int;
     pub fn sprintf(s: *mut ::c_char, format: *const ::c_char, ...) -> ::c_int;
-    pub fn fscanf(
-        stream: *mut ::FILE,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn fscanf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
     pub fn scanf(format: *const ::c_char, ...) -> ::c_int;
-    pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...)
-        -> ::c_int;
+    pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...) -> ::c_int;
     pub fn getchar_unlocked() -> ::c_int;
     pub fn putchar_unlocked(c: ::c_int) -> ::c_int;
 
     pub fn socket(domain: ::c_int, ty: ::c_int, protocol: ::c_int) -> ::c_int;
-    pub fn connect(
-        socket: ::c_int,
-        address: *const sockaddr,
-        len: socklen_t,
-    ) -> ::c_int;
+    pub fn connect(socket: ::c_int, address: *const sockaddr, len: socklen_t) -> ::c_int;
     pub fn listen(socket: ::c_int, backlog: ::c_int) -> ::c_int;
-    pub fn accept(
-        socket: ::c_int,
-        address: *mut sockaddr,
-        address_len: *mut socklen_t,
-    ) -> ::c_int;
+    pub fn accept(socket: ::c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> ::c_int;
     pub fn getpeername(
         socket: ::c_int,
         address: *mut sockaddr,
@@ -3562,20 +3512,12 @@
 
     pub fn opendir(dirname: *const c_char) -> *mut ::DIR;
     pub fn readdir(dirp: *mut ::DIR) -> *mut ::dirent;
-    pub fn readdir_r(
-        dirp: *mut ::DIR,
-        entry: *mut ::dirent,
-        result: *mut *mut ::dirent,
-    ) -> ::c_int;
+    pub fn readdir_r(dirp: *mut ::DIR, entry: *mut ::dirent, result: *mut *mut ::dirent)
+        -> ::c_int;
     pub fn closedir(dirp: *mut ::DIR) -> ::c_int;
     pub fn rewinddir(dirp: *mut ::DIR);
 
-    pub fn openat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        flags: ::c_int,
-        ...
-    ) -> ::c_int;
+    pub fn openat(dirfd: ::c_int, pathname: *const ::c_char, flags: ::c_int, ...) -> ::c_int;
     pub fn fchmodat(
         dirfd: ::c_int,
         pathname: *const ::c_char,
@@ -3603,11 +3545,7 @@
         newpath: *const ::c_char,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn mkdirat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn mkdirat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
     pub fn readlinkat(
         dirfd: ::c_int,
         pathname: *const ::c_char,
@@ -3625,11 +3563,7 @@
         newdirfd: ::c_int,
         linkpath: *const ::c_char,
     ) -> ::c_int;
-    pub fn unlinkat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn unlinkat(dirfd: ::c_int, pathname: *const ::c_char, flags: ::c_int) -> ::c_int;
 
     pub fn access(path: *const c_char, amode: ::c_int) -> ::c_int;
     pub fn alarm(seconds: ::c_uint) -> ::c_uint;
@@ -3640,16 +3574,8 @@
     pub fn dup(fd: ::c_int) -> ::c_int;
     pub fn dup2(src: ::c_int, dst: ::c_int) -> ::c_int;
     pub fn execl(path: *const c_char, arg0: *const c_char, ...) -> ::c_int;
-    pub fn execle(
-        path: *const ::c_char,
-        arg0: *const ::c_char,
-        ...
-    ) -> ::c_int;
-    pub fn execlp(
-        file: *const ::c_char,
-        arg0: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn execle(path: *const ::c_char, arg0: *const ::c_char, ...) -> ::c_int;
+    pub fn execlp(file: *const ::c_char, arg0: *const ::c_char, ...) -> ::c_int;
     pub fn execv(prog: *const c_char, argv: *const *const c_char) -> ::c_int;
     pub fn execve(
         prog: *const c_char,
@@ -3665,11 +3591,7 @@
     pub fn getgid() -> gid_t;
     pub fn getgroups(ngroups_max: ::c_int, groups: *mut gid_t) -> ::c_int;
     pub fn getlogin() -> *mut c_char;
-    pub fn getopt(
-        argc: ::c_int,
-        argv: *const *mut c_char,
-        optstr: *const c_char,
-    ) -> ::c_int;
+    pub fn getopt(argc: ::c_int, argv: *const *mut c_char, optstr: *const c_char) -> ::c_int;
     pub fn getpgid(pid: pid_t) -> pid_t;
     pub fn getpgrp() -> pid_t;
     pub fn getpid() -> pid_t;
@@ -3681,13 +3603,8 @@
     pub fn pathconf(path: *const c_char, name: ::c_int) -> c_long;
     pub fn pause() -> ::c_int;
     pub fn pipe(fds: *mut ::c_int) -> ::c_int;
-    pub fn posix_memalign(
-        memptr: *mut *mut ::c_void,
-        align: ::size_t,
-        size: ::size_t,
-    ) -> ::c_int;
-    pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t)
-        -> ::ssize_t;
+    pub fn posix_memalign(memptr: *mut *mut ::c_void, align: ::size_t, size: ::size_t) -> ::c_int;
+    pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t) -> ::ssize_t;
     pub fn rmdir(path: *const c_char) -> ::c_int;
     pub fn seteuid(uid: uid_t) -> ::c_int;
     pub fn setegid(gid: gid_t) -> ::c_int;
@@ -3702,28 +3619,10 @@
     pub fn ttyname(fd: ::c_int) -> *mut c_char;
     pub fn unlink(c: *const c_char) -> ::c_int;
     pub fn wait(status: *mut ::c_int) -> pid_t;
-    pub fn waitpid(
-        pid: pid_t,
-        status: *mut ::c_int,
-        options: ::c_int,
-    ) -> pid_t;
-    pub fn write(
-        fd: ::c_int,
-        buf: *const ::c_void,
-        count: ::size_t,
-    ) -> ::ssize_t;
-    pub fn pread(
-        fd: ::c_int,
-        buf: *mut ::c_void,
-        count: ::size_t,
-        offset: off_t,
-    ) -> ::ssize_t;
-    pub fn pwrite(
-        fd: ::c_int,
-        buf: *const ::c_void,
-        count: ::size_t,
-        offset: off_t,
-    ) -> ::ssize_t;
+    pub fn waitpid(pid: pid_t, status: *mut ::c_int, options: ::c_int) -> pid_t;
+    pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::size_t) -> ::ssize_t;
+    pub fn pread(fd: ::c_int, buf: *mut ::c_void, count: ::size_t, offset: off_t) -> ::ssize_t;
+    pub fn pwrite(fd: ::c_int, buf: *const ::c_void, count: ::size_t, offset: off_t) -> ::ssize_t;
     pub fn umask(mask: mode_t) -> mode_t;
 
     pub fn utime(file: *const c_char, buf: *const utimbuf) -> ::c_int;
@@ -3746,20 +3645,13 @@
     pub fn munmap(addr: *mut ::c_void, len: ::size_t) -> ::c_int;
 
     pub fn if_nametoindex(ifname: *const c_char) -> ::c_uint;
-    pub fn if_indextoname(
-        ifindex: ::c_uint,
-        ifname: *mut ::c_char,
-    ) -> *mut ::c_char;
+    pub fn if_indextoname(ifindex: ::c_uint, ifname: *mut ::c_char) -> *mut ::c_char;
 
     pub fn lstat(path: *const c_char, buf: *mut stat) -> ::c_int;
 
     pub fn fsync(fd: ::c_int) -> ::c_int;
 
-    pub fn setenv(
-        name: *const c_char,
-        val: *const c_char,
-        overwrite: ::c_int,
-    ) -> ::c_int;
+    pub fn setenv(name: *const c_char, val: *const c_char, overwrite: ::c_int) -> ::c_int;
     pub fn unsetenv(name: *const c_char) -> ::c_int;
 
     pub fn symlink(path1: *const c_char, path2: *const c_char) -> ::c_int;
@@ -3768,10 +3660,7 @@
 
     pub fn signal(signum: ::c_int, handler: sighandler_t) -> sighandler_t;
 
-    pub fn realpath(
-        pathname: *const ::c_char,
-        resolved: *mut ::c_char,
-    ) -> *mut ::c_char;
+    pub fn realpath(pathname: *const ::c_char, resolved: *mut ::c_char) -> *mut ::c_char;
 
     pub fn flock(fd: ::c_int, operation: ::c_int) -> ::c_int;
 
@@ -3779,21 +3668,12 @@
     pub fn times(buf: *mut ::tms) -> ::clock_t;
 
     pub fn pthread_self() -> ::pthread_t;
-    pub fn pthread_join(
-        native: ::pthread_t,
-        value: *mut *mut ::c_void,
-    ) -> ::c_int;
+    pub fn pthread_join(native: ::pthread_t, value: *mut *mut ::c_void) -> ::c_int;
     pub fn pthread_exit(value: *mut ::c_void) -> !;
     pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int;
     pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int;
-    pub fn pthread_attr_setstacksize(
-        attr: *mut ::pthread_attr_t,
-        stack_size: ::size_t,
-    ) -> ::c_int;
-    pub fn pthread_attr_setdetachstate(
-        attr: *mut ::pthread_attr_t,
-        state: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_attr_setstacksize(attr: *mut ::pthread_attr_t, stack_size: ::size_t) -> ::c_int;
+    pub fn pthread_attr_setdetachstate(attr: *mut ::pthread_attr_t, state: ::c_int) -> ::c_int;
     pub fn pthread_detach(thread: ::pthread_t) -> ::c_int;
     pub fn sched_yield() -> ::c_int;
     pub fn pthread_key_create(
@@ -3802,10 +3682,7 @@
     ) -> ::c_int;
     pub fn pthread_key_delete(key: pthread_key_t) -> ::c_int;
     pub fn pthread_getspecific(key: pthread_key_t) -> *mut ::c_void;
-    pub fn pthread_setspecific(
-        key: pthread_key_t,
-        value: *const ::c_void,
-    ) -> ::c_int;
+    pub fn pthread_setspecific(key: pthread_key_t, value: *const ::c_void) -> ::c_int;
     pub fn pthread_mutex_init(
         lock: *mut pthread_mutex_t,
         attr: *const pthread_mutexattr_t,
@@ -3816,22 +3693,12 @@
     pub fn pthread_mutex_unlock(lock: *mut pthread_mutex_t) -> ::c_int;
 
     pub fn pthread_mutexattr_init(attr: *mut pthread_mutexattr_t) -> ::c_int;
-    pub fn pthread_mutexattr_destroy(
-        attr: *mut pthread_mutexattr_t,
-    ) -> ::c_int;
-    pub fn pthread_mutexattr_settype(
-        attr: *mut pthread_mutexattr_t,
-        _type: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_mutexattr_destroy(attr: *mut pthread_mutexattr_t) -> ::c_int;
+    pub fn pthread_mutexattr_settype(attr: *mut pthread_mutexattr_t, _type: ::c_int) -> ::c_int;
 
-    pub fn pthread_cond_init(
-        cond: *mut pthread_cond_t,
-        attr: *const pthread_condattr_t,
-    ) -> ::c_int;
-    pub fn pthread_cond_wait(
-        cond: *mut pthread_cond_t,
-        lock: *mut pthread_mutex_t,
-    ) -> ::c_int;
+    pub fn pthread_cond_init(cond: *mut pthread_cond_t, attr: *const pthread_condattr_t)
+        -> ::c_int;
+    pub fn pthread_cond_wait(cond: *mut pthread_cond_t, lock: *mut pthread_mutex_t) -> ::c_int;
     pub fn pthread_cond_timedwait(
         cond: *mut pthread_cond_t,
         lock: *mut pthread_mutex_t,
@@ -3852,16 +3719,9 @@
     pub fn pthread_rwlock_wrlock(lock: *mut pthread_rwlock_t) -> ::c_int;
     pub fn pthread_rwlock_trywrlock(lock: *mut pthread_rwlock_t) -> ::c_int;
     pub fn pthread_rwlock_unlock(lock: *mut pthread_rwlock_t) -> ::c_int;
-    pub fn pthread_rwlockattr_init(attr: *mut pthread_rwlockattr_t)
-        -> ::c_int;
-    pub fn pthread_rwlockattr_destroy(
-        attr: *mut pthread_rwlockattr_t,
-    ) -> ::c_int;
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn pthread_rwlockattr_init(attr: *mut pthread_rwlockattr_t) -> ::c_int;
+    pub fn pthread_rwlockattr_destroy(attr: *mut pthread_rwlockattr_t) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     pub fn getsockopt(
         sockfd: ::c_int,
@@ -3871,22 +3731,12 @@
         optlen: *mut ::socklen_t,
     ) -> ::c_int;
     pub fn raise(signum: ::c_int) -> ::c_int;
-    pub fn sigaction(
-        signum: ::c_int,
-        act: *const sigaction,
-        oldact: *mut sigaction,
-    ) -> ::c_int;
+    pub fn sigaction(signum: ::c_int, act: *const sigaction, oldact: *mut sigaction) -> ::c_int;
 
-    pub fn utimes(
-        filename: *const ::c_char,
-        times: *const ::timeval,
-    ) -> ::c_int;
+    pub fn utimes(filename: *const ::c_char, times: *const ::timeval) -> ::c_int;
     pub fn dlopen(filename: *const ::c_char, flag: ::c_int) -> *mut ::c_void;
     pub fn dlerror() -> *mut ::c_char;
-    pub fn dlsym(
-        handle: *mut ::c_void,
-        symbol: *const ::c_char,
-    ) -> *mut ::c_void;
+    pub fn dlsym(handle: *mut ::c_void, symbol: *const ::c_char) -> *mut ::c_void;
     pub fn dlclose(handle: *mut ::c_void) -> ::c_int;
     pub fn dladdr(addr: *const ::c_void, info: *mut Dl_info) -> ::c_int;
 
@@ -3907,32 +3757,15 @@
     pub fn gmtime(time_p: *const time_t) -> *mut tm;
     pub fn localtime(time_p: *const time_t) -> *mut tm;
 
-    pub fn mknod(
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-        dev: ::dev_t,
-    ) -> ::c_int;
+    pub fn mknod(pathname: *const ::c_char, mode: ::mode_t, dev: ::dev_t) -> ::c_int;
     pub fn uname(buf: *mut ::utsname) -> ::c_int;
     pub fn gethostname(name: *mut ::c_char, len: ::size_t) -> ::c_int;
-    pub fn getservbyname(
-        name: *const ::c_char,
-        proto: *const ::c_char,
-    ) -> *mut servent;
+    pub fn getservbyname(name: *const ::c_char, proto: *const ::c_char) -> *mut servent;
     pub fn getprotobyname(name: *const ::c_char) -> *mut protoent;
     pub fn getprotobynumber(proto: ::c_int) -> *mut protoent;
     pub fn usleep(secs: ::c_uint) -> ::c_int;
-    pub fn send(
-        socket: ::c_int,
-        buf: *const ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn recv(
-        socket: ::c_int,
-        buf: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn send(socket: ::c_int, buf: *const ::c_void, len: ::size_t, flags: ::c_int) -> ::ssize_t;
+    pub fn recv(socket: ::c_int, buf: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::ssize_t;
     pub fn putenv(string: *mut c_char) -> ::c_int;
     pub fn poll(fds: *mut pollfd, nfds: nfds_t, timeout: ::c_int) -> ::c_int;
     pub fn select(
@@ -3942,29 +3775,18 @@
         errorfds: *mut fd_set,
         timeout: *mut timeval,
     ) -> ::c_int;
-    pub fn setlocale(
-        category: ::c_int,
-        locale: *const ::c_char,
-    ) -> *mut ::c_char;
+    pub fn setlocale(category: ::c_int, locale: *const ::c_char) -> *mut ::c_char;
     pub fn localeconv() -> *mut lconv;
 
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
     pub fn sem_wait(sem: *mut sem_t) -> ::c_int;
     pub fn sem_trywait(sem: *mut sem_t) -> ::c_int;
     pub fn sem_post(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
     pub fn statvfs(path: *const c_char, buf: *mut statvfs) -> ::c_int;
     pub fn fstatvfs(fd: ::c_int, buf: *mut statvfs) -> ::c_int;
 
-    pub fn readlink(
-        path: *const c_char,
-        buf: *mut c_char,
-        bufsz: ::size_t,
-    ) -> ::ssize_t;
+    pub fn readlink(path: *const c_char, buf: *mut c_char, bufsz: ::size_t) -> ::ssize_t;
 
     pub fn sigemptyset(set: *mut sigset_t) -> ::c_int;
     pub fn sigaddset(set: *mut sigset_t, signum: ::c_int) -> ::c_int;
@@ -3972,11 +3794,7 @@
     pub fn sigdelset(set: *mut sigset_t, signum: ::c_int) -> ::c_int;
     pub fn sigismember(set: *const sigset_t, signum: ::c_int) -> ::c_int;
 
-    pub fn sigprocmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn sigprocmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sigpending(set: *mut sigset_t) -> ::c_int;
 
     pub fn timegm(tm: *mut ::tm) -> time_t;
@@ -3995,11 +3813,7 @@
         timeout: *const timespec,
         sigmask: *const sigset_t,
     ) -> ::c_int;
-    pub fn fseeko(
-        stream: *mut ::FILE,
-        offset: ::off_t,
-        whence: ::c_int,
-    ) -> ::c_int;
+    pub fn fseeko(stream: *mut ::FILE, offset: ::off_t, whence: ::c_int) -> ::c_int;
     pub fn ftello(stream: *mut ::FILE) -> ::off_t;
     pub fn tcdrain(fd: ::c_int) -> ::c_int;
     pub fn cfgetispeed(termios: *const ::termios) -> ::speed_t;
@@ -4009,11 +3823,7 @@
     pub fn cfsetospeed(termios: *mut ::termios, speed: ::speed_t) -> ::c_int;
     pub fn cfsetspeed(termios: *mut ::termios, speed: ::speed_t) -> ::c_int;
     pub fn tcgetattr(fd: ::c_int, termios: *mut ::termios) -> ::c_int;
-    pub fn tcsetattr(
-        fd: ::c_int,
-        optional_actions: ::c_int,
-        termios: *const ::termios,
-    ) -> ::c_int;
+    pub fn tcsetattr(fd: ::c_int, optional_actions: ::c_int, termios: *const ::termios) -> ::c_int;
     pub fn tcflow(fd: ::c_int, action: ::c_int) -> ::c_int;
     pub fn tcflush(fd: ::c_int, action: ::c_int) -> ::c_int;
     pub fn tcgetsid(fd: ::c_int) -> ::pid_t;
@@ -4036,16 +3846,10 @@
     pub fn fdatasync(fd: ::c_int) -> ::c_int;
     pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
     pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
-    pub fn clock_settime(
-        clk_id: ::clockid_t,
-        tp: *const ::timespec,
-    ) -> ::c_int;
+    pub fn clock_settime(clk_id: ::clockid_t, tp: *const ::timespec) -> ::c_int;
     pub fn dirfd(dirp: *mut ::DIR) -> ::c_int;
 
-    pub fn pthread_getattr_np(
-        native: ::pthread_t,
-        attr: *mut ::pthread_attr_t,
-    ) -> ::c_int;
+    pub fn pthread_getattr_np(native: ::pthread_t, attr: *mut ::pthread_attr_t) -> ::c_int;
     pub fn pthread_attr_getstack(
         attr: *const ::pthread_attr_t,
         stackaddr: *mut *mut ::c_void,
@@ -4056,18 +3860,9 @@
     pub fn pipe2(fds: *mut ::c_int, flags: ::c_int) -> ::c_int;
     pub fn statfs(path: *const ::c_char, buf: *mut statfs) -> ::c_int;
     pub fn fstatfs(fd: ::c_int, buf: *mut statfs) -> ::c_int;
-    pub fn memrchr(
-        cx: *const ::c_void,
-        c: ::c_int,
-        n: ::size_t,
-    ) -> *mut ::c_void;
+    pub fn memrchr(cx: *const ::c_void, c: ::c_int, n: ::size_t) -> *mut ::c_void;
 
-    pub fn posix_fadvise(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-        advise: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t, advise: ::c_int) -> ::c_int;
     pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
     pub fn utimensat(
         dirfd: ::c_int,
@@ -4077,11 +3872,7 @@
     ) -> ::c_int;
     pub fn duplocale(base: ::locale_t) -> ::locale_t;
     pub fn freelocale(loc: ::locale_t);
-    pub fn newlocale(
-        mask: ::c_int,
-        locale: *const ::c_char,
-        base: ::locale_t,
-    ) -> ::locale_t;
+    pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
     pub fn uselocale(loc: ::locale_t) -> ::locale_t;
 
     pub fn fdopendir(fd: ::c_int) -> *mut ::DIR;
@@ -4106,30 +3897,14 @@
         len: *mut ::socklen_t,
         flg: ::c_int,
     ) -> ::c_int;
-    pub fn ptsname_r(
-        fd: ::c_int,
-        buf: *mut ::c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn ptsname_r(fd: ::c_int, buf: *mut ::c_char, buflen: ::size_t) -> ::c_int;
     pub fn clearenv() -> ::c_int;
-    pub fn waitid(
-        idtype: idtype_t,
-        id: id_t,
-        infop: *mut ::siginfo_t,
-        options: ::c_int,
-    ) -> ::c_int;
+    pub fn waitid(idtype: idtype_t, id: id_t, infop: *mut ::siginfo_t, options: ::c_int)
+        -> ::c_int;
     pub fn setreuid(ruid: ::uid_t, euid: ::uid_t) -> ::c_int;
     pub fn setregid(rgid: ::gid_t, egid: ::gid_t) -> ::c_int;
-    pub fn getresuid(
-        ruid: *mut ::uid_t,
-        euid: *mut ::uid_t,
-        suid: *mut ::uid_t,
-    ) -> ::c_int;
-    pub fn getresgid(
-        rgid: *mut ::gid_t,
-        egid: *mut ::gid_t,
-        sgid: *mut ::gid_t,
-    ) -> ::c_int;
+    pub fn getresuid(ruid: *mut ::uid_t, euid: *mut ::uid_t, suid: *mut ::uid_t) -> ::c_int;
+    pub fn getresgid(rgid: *mut ::gid_t, egid: *mut ::gid_t, sgid: *mut ::gid_t) -> ::c_int;
     pub fn acct(filename: *const ::c_char) -> ::c_int;
     pub fn brk(addr: *mut ::c_void) -> ::c_int;
     pub fn setresgid(rgid: ::gid_t, egid: ::gid_t, sgid: ::gid_t) -> ::c_int;
@@ -4160,40 +3935,18 @@
     pub fn endpwent();
     pub fn getpwent() -> *mut passwd;
 
-    pub fn shm_open(
-        name: *const c_char,
-        oflag: ::c_int,
-        mode: mode_t,
-    ) -> ::c_int;
+    pub fn shm_open(name: *const c_char, oflag: ::c_int, mode: mode_t) -> ::c_int;
 
     // System V IPC
     pub fn shmget(key: ::key_t, size: ::size_t, shmflg: ::c_int) -> ::c_int;
-    pub fn shmat(
-        shmid: ::c_int,
-        shmaddr: *const ::c_void,
-        shmflg: ::c_int,
-    ) -> *mut ::c_void;
+    pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
     pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
-    pub fn shmctl(
-        shmid: ::c_int,
-        cmd: ::c_int,
-        buf: *mut ::shmid_ds,
-    ) -> ::c_int;
+    pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
     pub fn ftok(pathname: *const ::c_char, proj_id: ::c_int) -> ::key_t;
     pub fn semget(key: ::key_t, nsems: ::c_int, semflag: ::c_int) -> ::c_int;
-    pub fn semop(
-        semid: ::c_int,
-        sops: *mut ::sembuf,
-        nsops: ::size_t,
-    ) -> ::c_int;
-    pub fn semctl(
-        semid: ::c_int,
-        semnum: ::c_int,
-        cmd: ::c_int,
-        ...
-    ) -> ::c_int;
-    pub fn msgctl(msqid: ::c_int, cmd: ::c_int, buf: *mut msqid_ds)
-        -> ::c_int;
+    pub fn semop(semid: ::c_int, sops: *mut ::sembuf, nsops: ::size_t) -> ::c_int;
+    pub fn semctl(semid: ::c_int, semnum: ::c_int, cmd: ::c_int, ...) -> ::c_int;
+    pub fn msgctl(msqid: ::c_int, cmd: ::c_int, buf: *mut msqid_ds) -> ::c_int;
     pub fn msgget(key: ::key_t, msgflg: ::c_int) -> ::c_int;
     pub fn msgrcv(
         msqid: ::c_int,
@@ -4209,57 +3962,24 @@
         msgflg: ::c_int,
     ) -> ::c_int;
 
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn __errno_location() -> *mut ::c_int;
 
-    pub fn fallocate(
-        fd: ::c_int,
-        mode: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
-    pub fn posix_fallocate(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
-    pub fn readahead(
-        fd: ::c_int,
-        offset: ::off64_t,
-        count: ::size_t,
-    ) -> ::ssize_t;
-    pub fn signalfd(
-        fd: ::c_int,
-        mask: *const ::sigset_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn fallocate(fd: ::c_int, mode: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
+    pub fn posix_fallocate(fd: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
+    pub fn readahead(fd: ::c_int, offset: ::off64_t, count: ::size_t) -> ::ssize_t;
+    pub fn signalfd(fd: ::c_int, mask: *const ::sigset_t, flags: ::c_int) -> ::c_int;
     pub fn timerfd_create(clockid: ::c_int, flags: ::c_int) -> ::c_int;
-    pub fn timerfd_gettime(
-        fd: ::c_int,
-        curr_value: *mut itimerspec,
-    ) -> ::c_int;
+    pub fn timerfd_gettime(fd: ::c_int, curr_value: *mut itimerspec) -> ::c_int;
     pub fn timerfd_settime(
         fd: ::c_int,
         flags: ::c_int,
         new_value: *const itimerspec,
         old_value: *mut itimerspec,
     ) -> ::c_int;
-    pub fn pwritev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn preadv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
+    pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
+        -> ::ssize_t;
+    pub fn preadv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t) -> ::ssize_t;
     pub fn quotactl(
         cmd: ::c_int,
         special: *const ::c_char,
@@ -4268,19 +3988,14 @@
     ) -> ::c_int;
     pub fn dup3(oldfd: ::c_int, newfd: ::c_int, flags: ::c_int) -> ::c_int;
     pub fn mkostemp(template: *mut ::c_char, flags: ::c_int) -> ::c_int;
-    pub fn mkostemps(
-        template: *mut ::c_char,
-        suffixlen: ::c_int,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn mkostemps(template: *mut ::c_char, suffixlen: ::c_int, flags: ::c_int) -> ::c_int;
     pub fn sigtimedwait(
         set: *const sigset_t,
         info: *mut siginfo_t,
         timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn sigwaitinfo(set: *const sigset_t, info: *mut siginfo_t) -> ::c_int;
-    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t)
-        -> *mut ::c_char;
+    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t) -> *mut ::c_char;
     pub fn getnameinfo(
         sa: *const ::sockaddr,
         salen: ::socklen_t,
@@ -4295,11 +4010,7 @@
     pub fn setfsuid(uid: ::uid_t) -> ::c_int;
 
     // Not available now on Android
-    pub fn mkfifoat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
     pub fn if_nameindex() -> *mut if_nameindex;
     pub fn if_freenameindex(ptr: *mut if_nameindex);
     pub fn sync_file_range(
@@ -4314,35 +4025,21 @@
     pub fn glob(
         pattern: *const c_char,
         flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const c_char, errno: ::c_int) -> ::c_int,
-        >,
+        errfunc: ::Option<extern "C" fn(epath: *const c_char, errno: ::c_int) -> ::c_int>,
         pglob: *mut ::glob_t,
     ) -> ::c_int;
     pub fn globfree(pglob: *mut ::glob_t);
 
-    pub fn posix_madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
     pub fn shm_unlink(name: *const ::c_char) -> ::c_int;
 
     pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long);
 
     pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
-    pub fn madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn msync(addr: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::c_int;
 
     pub fn recvfrom(
         socket: ::c_int,
@@ -4356,33 +4053,13 @@
     pub fn futimes(fd: ::c_int, times: *const ::timeval) -> ::c_int;
     pub fn nl_langinfo(item: ::nl_item) -> *mut ::c_char;
 
-    pub fn bind(
-        socket: ::c_int,
-        address: *const ::sockaddr,
-        address_len: ::socklen_t,
-    ) -> ::c_int;
+    pub fn bind(socket: ::c_int, address: *const ::sockaddr, address_len: ::socklen_t) -> ::c_int;
 
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
+    pub fn readv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
 
-    pub fn sendmsg(
-        fd: ::c_int,
-        msg: *const ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn recvmsg(
-        fd: ::c_int,
-        msg: *mut ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn sendmsg(fd: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
+    pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
     pub fn getdomainname(name: *mut ::c_char, len: ::size_t) -> ::c_int;
     pub fn setdomainname(name: *const ::c_char, len: ::size_t) -> ::c_int;
     pub fn vhangup() -> ::c_int;
@@ -4401,11 +4078,8 @@
     ) -> ::c_int;
     pub fn sync();
     pub fn syscall(num: ::c_long, ...) -> ::c_long;
-    pub fn sched_getaffinity(
-        pid: ::pid_t,
-        cpusetsize: ::size_t,
-        cpuset: *mut cpu_set_t,
-    ) -> ::c_int;
+    pub fn sched_getaffinity(pid: ::pid_t, cpusetsize: ::size_t, cpuset: *mut cpu_set_t)
+        -> ::c_int;
     pub fn sched_setaffinity(
         pid: ::pid_t,
         cpusetsize: ::size_t,
@@ -4413,16 +4087,8 @@
     ) -> ::c_int;
     pub fn umount(target: *const ::c_char) -> ::c_int;
     pub fn sched_get_priority_max(policy: ::c_int) -> ::c_int;
-    pub fn tee(
-        fd_in: ::c_int,
-        fd_out: ::c_int,
-        len: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
-    pub fn settimeofday(
-        tv: *const ::timeval,
-        tz: *const ::timezone,
-    ) -> ::c_int;
+    pub fn tee(fd_in: ::c_int, fd_out: ::c_int, len: ::size_t, flags: ::c_uint) -> ::ssize_t;
+    pub fn settimeofday(tv: *const ::timeval, tz: *const ::timezone) -> ::c_int;
     pub fn splice(
         fd_in: ::c_int,
         off_in: *mut ::loff_t,
@@ -4432,17 +4098,10 @@
         flags: ::c_uint,
     ) -> ::ssize_t;
     pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int;
-    pub fn sched_rr_get_interval(pid: ::pid_t, tp: *mut ::timespec)
-        -> ::c_int;
-    pub fn sem_timedwait(
-        sem: *mut sem_t,
-        abstime: *const ::timespec,
-    ) -> ::c_int;
+    pub fn sched_rr_get_interval(pid: ::pid_t, tp: *mut ::timespec) -> ::c_int;
+    pub fn sem_timedwait(sem: *mut sem_t, abstime: *const ::timespec) -> ::c_int;
     pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int;
-    pub fn sched_setparam(
-        pid: ::pid_t,
-        param: *const ::sched_param,
-    ) -> ::c_int;
+    pub fn sched_setparam(pid: ::pid_t, param: *const ::sched_param) -> ::c_int;
     pub fn swapoff(puath: *const ::c_char) -> ::c_int;
     pub fn vmsplice(
         fd: ::c_int,
@@ -4515,11 +4174,7 @@
         result: *mut *mut ::group,
     ) -> ::c_int;
     pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sem_open(name: *const ::c_char, oflag: ::c_int, ...) -> *mut sem_t;
     pub fn getgrnam(name: *const ::c_char) -> *mut ::group;
     pub fn pthread_cancel(thread: ::pthread_t) -> ::c_int;
@@ -4576,6 +4231,9 @@
         >,
         data: *mut ::c_void,
     ) -> ::c_int;
+
+    pub fn zx_cprng_draw(buffer: *mut ::c_void, buffer_size: ::size_t);
+    pub fn zx_cprng_add_entropy(buffer: *const ::c_void, buffer_size: ::size_t) -> ::zx_status_t;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,15 +17,12 @@
 )]
 #![cfg_attr(libc_deny_warnings, deny(warnings))]
 // Attributes needed when building as part of the standard library
-#![cfg_attr(
-    feature = "rustc-dep-of-std",
-    feature(cfg_target_vendor, link_cfg, no_core)
-)]
+#![cfg_attr(feature = "rustc-dep-of-std", feature(link_cfg, no_core))]
 #![cfg_attr(libc_thread_local, feature(thread_local))]
 // Enable extra lints:
 #![cfg_attr(feature = "extra_traits", deny(missing_debug_implementations))]
 #![deny(missing_copy_implementations, safe_packed_borrows)]
-#![no_std]
+#![cfg_attr(not(feature = "rustc-dep-of-std"), no_std)]
 #![cfg_attr(feature = "rustc-dep-of-std", no_core)]
 #![cfg_attr(
     any(feature = "rustc-dep-of-std", target_os = "redox"),
@@ -102,12 +99,6 @@
 
         mod windows;
         pub use windows::*;
-    } else if #[cfg(target_os = "cloudabi")] {
-        mod fixed_width_ints;
-        pub use fixed_width_ints::*;
-
-        mod cloudabi;
-        pub use cloudabi::*;
     } else if #[cfg(target_os = "fuchsia")] {
         mod fixed_width_ints;
         pub use fixed_width_ints::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/psp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/psp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/psp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/psp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -54,24 +54,18 @@
     arg3: *mut c_void,
 ) -> u32;
 
-pub type SceKernelVTimerHandlerWide = unsafe extern "C" fn(
-    uid: SceUid,
-    arg1: i64,
-    arg2: i64,
-    arg3: *mut c_void,
-) -> u32;
+pub type SceKernelVTimerHandlerWide =
+    unsafe extern "C" fn(uid: SceUid, arg1: i64, arg2: i64, arg3: *mut c_void) -> u32;
 
 pub type SceKernelThreadEventHandler =
     unsafe extern "C" fn(mask: i32, thid: SceUid, common: *mut c_void) -> i32;
 
-pub type SceKernelAlarmHandler =
-    unsafe extern "C" fn(common: *mut c_void) -> u32;
+pub type SceKernelAlarmHandler = unsafe extern "C" fn(common: *mut c_void) -> u32;
 
 pub type SceKernelCallbackFunction =
     unsafe extern "C" fn(arg1: i32, arg2: i32, arg: *mut c_void) -> i32;
 
-pub type SceKernelThreadEntry =
-    unsafe extern "C" fn(args: usize, argp: *mut c_void) -> i32;
+pub type SceKernelThreadEntry = unsafe extern "C" fn(args: usize, argp: *mut c_void) -> i32;
 
 pub type PowerCallback = extern "C" fn(unknown: i32, power_info: i32);
 
@@ -79,24 +73,15 @@
 
 pub type UmdCallback = fn(unknown: i32, event: i32) -> i32;
 
-pub type SceMpegRingbufferCb = ::Option<
-    unsafe extern "C" fn(
-        data: *mut c_void,
-        num_packets: i32,
-        param: *mut c_void,
-    ) -> i32,
->;
+pub type SceMpegRingbufferCb =
+    ::Option<unsafe extern "C" fn(data: *mut c_void, num_packets: i32, param: *mut c_void) -> i32>;
 
 pub type GuCallback = ::Option<extern "C" fn(id: i32, arg: *mut c_void)>;
-pub type GuSwapBuffersCallback = ::Option<extern "C" fn(
-        display: *mut *mut c_void, render: *mut *mut c_void
-    ),
->;
+pub type GuSwapBuffersCallback =
+    ::Option<extern "C" fn(display: *mut *mut c_void, render: *mut *mut c_void)>;
 
-pub type SceNetAdhocctlHandler = ::Option<unsafe extern "C" fn(
-        flag: i32, error: i32, unknown: *mut c_void
-    ),
->;
+pub type SceNetAdhocctlHandler =
+    ::Option<unsafe extern "C" fn(flag: i32, error: i32, unknown: *mut c_void)>;
 
 pub type AdhocMatchingCallback = ::Option<
     unsafe extern "C" fn(
@@ -109,17 +94,10 @@
 >;
 
 pub type SceNetApctlHandler = ::Option<
-    unsafe extern "C" fn(
-        oldState: i32,
-        newState: i32,
-        event: i32,
-        error: i32,
-        pArg: *mut c_void,
-    ),
+    unsafe extern "C" fn(oldState: i32, newState: i32, event: i32, error: i32, pArg: *mut c_void),
 >;
 
-pub type HttpMallocFunction =
-    ::Option<unsafe extern "C" fn(size: usize) -> *mut c_void>;
+pub type HttpMallocFunction = ::Option<unsafe extern "C" fn(size: usize) -> *mut c_void>;
 pub type HttpReallocFunction =
     ::Option<unsafe extern "C" fn(p: *mut c_void, size: usize) -> *mut c_void>;
 pub type HttpFreeFunction = ::Option<unsafe extern "C" fn(p: *mut c_void)>;
@@ -2615,8 +2593,7 @@
 pub const UTILITY_HTMLVIEWER_DISABLE_CURSOR: i32 = 0x000008;
 pub const UTILITY_HTMLVIEWER_DISABLE_DOWNLOAD_COMPLETE_DIALOG: i32 = 0x000010;
 pub const UTILITY_HTMLVIEWER_DISABLE_DOWNLOAD_START_DIALOG: i32 = 0x000020;
-pub const UTILITY_HTMLVIEWER_DISABLE_DOWNLOAD_DESTINATION_DIALOG: i32 =
-    0x000040;
+pub const UTILITY_HTMLVIEWER_DISABLE_DOWNLOAD_DESTINATION_DIALOG: i32 = 0x000040;
 pub const UTILITY_HTMLVIEWER_LOCK_DOWNLOAD_DESTINATION_DIALOG: i32 = 0x000080;
 pub const UTILITY_HTMLVIEWER_DISABLE_TAB_DISPLAY: i32 = 0x000100;
 pub const UTILITY_HTMLVIEWER_ENABLE_ANALOG_HOLD: i32 = 0x000200;
@@ -2624,18 +2601,10 @@
 pub const UTILITY_HTMLVIEWER_DISABLE_LRTRIGGER: i32 = 0x000800;
 
 extern "C" {
-    pub fn sceAudioChReserve(
-        channel: i32,
-        sample_count: i32,
-        format: AudioFormat,
-    ) -> i32;
+    pub fn sceAudioChReserve(channel: i32, sample_count: i32, format: AudioFormat) -> i32;
     pub fn sceAudioChRelease(channel: i32) -> i32;
     pub fn sceAudioOutput(channel: i32, vol: i32, buf: *mut c_void) -> i32;
-    pub fn sceAudioOutputBlocking(
-        channel: i32,
-        vol: i32,
-        buf: *mut c_void,
-    ) -> i32;
+    pub fn sceAudioOutputBlocking(channel: i32, vol: i32, buf: *mut c_void) -> i32;
     pub fn sceAudioOutputPanned(
         channel: i32,
         left_vol: i32,
@@ -2651,15 +2620,8 @@
     pub fn sceAudioGetChannelRestLen(channel: i32) -> i32;
     pub fn sceAudioGetChannelRestLength(channel: i32) -> i32;
     pub fn sceAudioSetChannelDataLen(channel: i32, sample_count: i32) -> i32;
-    pub fn sceAudioChangeChannelConfig(
-        channel: i32,
-        format: AudioFormat,
-    ) -> i32;
-    pub fn sceAudioChangeChannelVolume(
-        channel: i32,
-        left_vol: i32,
-        right_vol: i32,
-    ) -> i32;
+    pub fn sceAudioChangeChannelConfig(channel: i32, format: AudioFormat) -> i32;
+    pub fn sceAudioChangeChannelVolume(channel: i32, left_vol: i32, right_vol: i32) -> i32;
     pub fn sceAudioOutput2Reserve(sample_count: i32) -> i32;
     pub fn sceAudioOutput2Release() -> i32;
     pub fn sceAudioOutput2ChangeLength(sample_count: i32) -> i32;
@@ -2674,16 +2636,8 @@
     pub fn sceAudioSRCOutputBlocking(vol: i32, buf: *mut c_void) -> i32;
     pub fn sceAudioInputInit(unknown1: i32, gain: i32, unknown2: i32) -> i32;
     pub fn sceAudioInputInitEx(params: *mut AudioInputParams) -> i32;
-    pub fn sceAudioInputBlocking(
-        sample_count: i32,
-        freq: AudioInputFrequency,
-        buf: *mut c_void,
-    );
-    pub fn sceAudioInput(
-        sample_count: i32,
-        freq: AudioInputFrequency,
-        buf: *mut c_void,
-    );
+    pub fn sceAudioInputBlocking(sample_count: i32, freq: AudioInputFrequency, buf: *mut c_void);
+    pub fn sceAudioInput(sample_count: i32, freq: AudioInputFrequency, buf: *mut c_void);
     pub fn sceAudioGetInputLength() -> i32;
     pub fn sceAudioWaitInputEnd() -> i32;
     pub fn sceAudioPollInputEnd() -> i32;
@@ -2697,10 +2651,7 @@
         out_end: *mut i32,
         out_remain_frame: *mut i32,
     ) -> i32;
-    pub fn sceAtracGetRemainFrame(
-        atrac_id: i32,
-        out_remain_frame: *mut i32,
-    ) -> i32;
+    pub fn sceAtracGetRemainFrame(atrac_id: i32, out_remain_frame: *mut i32) -> i32;
     pub fn sceAtracGetStreamDataInfo(
         atrac_id: i32,
         write_pointer: *mut *mut u8,
@@ -2719,19 +2670,13 @@
         pbuffer_info: *mut Atrac3BufferInfo,
     ) -> i32;
     pub fn sceAtracGetChannel(atrac_id: i32, pui_channel: *mut u32) -> i32;
-    pub fn sceAtracGetInternalErrorInfo(
-        atrac_id: i32,
-        pi_result: *mut i32,
-    ) -> i32;
+    pub fn sceAtracGetInternalErrorInfo(atrac_id: i32, pi_result: *mut i32) -> i32;
     pub fn sceAtracGetLoopStatus(
         atrac_id: i32,
         pi_loop_num: *mut i32,
         pui_loop_status: *mut u32,
     ) -> i32;
-    pub fn sceAtracGetNextDecodePosition(
-        atrac_id: i32,
-        pui_sample_position: *mut u32,
-    ) -> i32;
+    pub fn sceAtracGetNextDecodePosition(atrac_id: i32, pui_sample_position: *mut u32) -> i32;
     pub fn sceAtracGetSecondBufferInfo(
         atrac_id: i32,
         pui_position: *mut u32,
@@ -2749,11 +2694,7 @@
         ui_write_byte_first_buf: u32,
         ui_write_byte_second_buf: u32,
     ) -> i32;
-    pub fn sceAtracSetData(
-        atrac_id: i32,
-        puc_buffer_addr: *mut u8,
-        ui_buffer_byte: u32,
-    ) -> i32;
+    pub fn sceAtracSetData(atrac_id: i32, puc_buffer_addr: *mut u8, ui_buffer_byte: u32) -> i32;
     pub fn sceAtracSetHalfwayBuffer(
         atrac_id: i32,
         puc_buffer_addr: *mut u8,
@@ -2775,41 +2716,17 @@
     pub fn sceCtrlGetSamplingCycle(pcycle: *mut i32) -> i32;
     pub fn sceCtrlSetSamplingMode(mode: CtrlMode) -> i32;
     pub fn sceCtrlGetSamplingMode(pmode: *mut i32) -> i32;
-    pub fn sceCtrlPeekBufferPositive(
-        pad_data: *mut SceCtrlData,
-        count: i32,
-    ) -> i32;
-    pub fn sceCtrlPeekBufferNegative(
-        pad_data: *mut SceCtrlData,
-        count: i32,
-    ) -> i32;
-    pub fn sceCtrlReadBufferPositive(
-        pad_data: *mut SceCtrlData,
-        count: i32,
-    ) -> i32;
-    pub fn sceCtrlReadBufferNegative(
-        pad_data: *mut SceCtrlData,
-        count: i32,
-    ) -> i32;
+    pub fn sceCtrlPeekBufferPositive(pad_data: *mut SceCtrlData, count: i32) -> i32;
+    pub fn sceCtrlPeekBufferNegative(pad_data: *mut SceCtrlData, count: i32) -> i32;
+    pub fn sceCtrlReadBufferPositive(pad_data: *mut SceCtrlData, count: i32) -> i32;
+    pub fn sceCtrlReadBufferNegative(pad_data: *mut SceCtrlData, count: i32) -> i32;
     pub fn sceCtrlPeekLatch(latch_data: *mut SceCtrlLatch) -> i32;
     pub fn sceCtrlReadLatch(latch_data: *mut SceCtrlLatch) -> i32;
-    pub fn sceCtrlSetIdleCancelThreshold(idlereset: i32, idleback: i32)
-    -> i32;
-    pub fn sceCtrlGetIdleCancelThreshold(
-        idlereset: *mut i32,
-        idleback: *mut i32,
-    ) -> i32;
+    pub fn sceCtrlSetIdleCancelThreshold(idlereset: i32, idleback: i32) -> i32;
+    pub fn sceCtrlGetIdleCancelThreshold(idlereset: *mut i32, idleback: *mut i32) -> i32;
 
-    pub fn sceDisplaySetMode(
-        mode: DisplayMode,
-        width: usize,
-        height: usize,
-    ) -> u32;
-    pub fn sceDisplayGetMode(
-        pmode: *mut i32,
-        pwidth: *mut i32,
-        pheight: *mut i32,
-    ) -> i32;
+    pub fn sceDisplaySetMode(mode: DisplayMode, width: usize, height: usize) -> u32;
+    pub fn sceDisplayGetMode(pmode: *mut i32, pwidth: *mut i32, pheight: *mut i32) -> i32;
     pub fn sceDisplaySetFrameBuf(
         top_addr: *const u8,
         buffer_width: usize,
@@ -2864,10 +2781,7 @@
 
     pub fn sceKernelExitGame();
     pub fn sceKernelRegisterExitCallback(id: SceUid) -> i32;
-    pub fn sceKernelLoadExec(
-        file: *const u8,
-        param: *mut SceKernelLoadExecParam,
-    ) -> i32;
+    pub fn sceKernelLoadExec(file: *const u8, param: *mut SceKernelLoadExecParam) -> i32;
 
     pub fn sceKernelAllocPartitionMemory(
         partition: SceSysMemPartitionId,
@@ -2886,52 +2800,27 @@
 
     pub fn sceKernelLibcTime(t: *mut i32) -> i32;
     pub fn sceKernelLibcClock() -> u32;
-    pub fn sceKernelLibcGettimeofday(
-        tp: *mut timeval,
-        tzp: *mut timezone,
-    ) -> i32;
+    pub fn sceKernelLibcGettimeofday(tp: *mut timeval, tzp: *mut timezone) -> i32;
     pub fn sceKernelDcacheWritebackAll();
     pub fn sceKernelDcacheWritebackInvalidateAll();
     pub fn sceKernelDcacheWritebackRange(p: *const c_void, size: u32);
-    pub fn sceKernelDcacheWritebackInvalidateRange(
-        p: *const c_void,
-        size: u32,
-    );
+    pub fn sceKernelDcacheWritebackInvalidateRange(p: *const c_void, size: u32);
     pub fn sceKernelDcacheInvalidateRange(p: *const c_void, size: u32);
     pub fn sceKernelIcacheInvalidateAll();
     pub fn sceKernelIcacheInvalidateRange(p: *const c_void, size: u32);
-    pub fn sceKernelUtilsMt19937Init(
-        ctx: *mut SceKernelUtilsMt19937Context,
-        seed: u32,
-    ) -> i32;
-    pub fn sceKernelUtilsMt19937UInt(
-        ctx: *mut SceKernelUtilsMt19937Context,
-    ) -> u32;
-    pub fn sceKernelUtilsMd5Digest(
-        data: *mut u8,
-        size: u32,
-        digest: *mut u8,
-    ) -> i32;
-    pub fn sceKernelUtilsMd5BlockInit(
-        ctx: *mut SceKernelUtilsMd5Context,
-    ) -> i32;
+    pub fn sceKernelUtilsMt19937Init(ctx: *mut SceKernelUtilsMt19937Context, seed: u32) -> i32;
+    pub fn sceKernelUtilsMt19937UInt(ctx: *mut SceKernelUtilsMt19937Context) -> u32;
+    pub fn sceKernelUtilsMd5Digest(data: *mut u8, size: u32, digest: *mut u8) -> i32;
+    pub fn sceKernelUtilsMd5BlockInit(ctx: *mut SceKernelUtilsMd5Context) -> i32;
     pub fn sceKernelUtilsMd5BlockUpdate(
         ctx: *mut SceKernelUtilsMd5Context,
         data: *mut u8,
         size: u32,
     ) -> i32;
-    pub fn sceKernelUtilsMd5BlockResult(
-        ctx: *mut SceKernelUtilsMd5Context,
-        digest: *mut u8,
-    ) -> i32;
-    pub fn sceKernelUtilsSha1Digest(
-        data: *mut u8,
-        size: u32,
-        digest: *mut u8,
-    ) -> i32;
-    pub fn sceKernelUtilsSha1BlockInit(
-        ctx: *mut SceKernelUtilsSha1Context,
-    ) -> i32;
+    pub fn sceKernelUtilsMd5BlockResult(ctx: *mut SceKernelUtilsMd5Context, digest: *mut u8)
+        -> i32;
+    pub fn sceKernelUtilsSha1Digest(data: *mut u8, size: u32, digest: *mut u8) -> i32;
+    pub fn sceKernelUtilsSha1BlockInit(ctx: *mut SceKernelUtilsSha1Context) -> i32;
     pub fn sceKernelUtilsSha1BlockUpdate(
         ctx: *mut SceKernelUtilsSha1Context,
         data: *mut u8,
@@ -2999,37 +2888,22 @@
         option: *mut SceKernelSMOption,
     ) -> i32;
     pub fn sceKernelUnloadModule(mod_id: SceUid) -> i32;
-    pub fn sceKernelSelfStopUnloadModule(
-        unknown: i32,
-        arg_size: usize,
-        argp: *mut c_void,
-    ) -> i32;
+    pub fn sceKernelSelfStopUnloadModule(unknown: i32, arg_size: usize, argp: *mut c_void) -> i32;
     pub fn sceKernelStopUnloadSelfModule(
         arg_size: usize,
         argp: *mut c_void,
         status: *mut i32,
         option: *mut SceKernelSMOption,
     ) -> i32;
-    pub fn sceKernelQueryModuleInfo(
-        mod_id: SceUid,
-        info: *mut SceKernelModuleInfo,
-    ) -> i32;
+    pub fn sceKernelQueryModuleInfo(mod_id: SceUid, info: *mut SceKernelModuleInfo) -> i32;
     pub fn sceKernelGetModuleIdList(
         read_buf: *mut SceUid,
         read_buf_size: i32,
         id_count: *mut i32,
     ) -> i32;
 
-    pub fn sceKernelVolatileMemLock(
-        unk: i32,
-        ptr: *mut *mut c_void,
-        size: *mut i32,
-    ) -> i32;
-    pub fn sceKernelVolatileMemTryLock(
-        unk: i32,
-        ptr: *mut *mut c_void,
-        size: *mut i32,
-    ) -> i32;
+    pub fn sceKernelVolatileMemLock(unk: i32, ptr: *mut *mut c_void, size: *mut i32) -> i32;
+    pub fn sceKernelVolatileMemTryLock(unk: i32, ptr: *mut *mut c_void, size: *mut i32) -> i32;
     pub fn sceKernelVolatileMemUnlock(unk: i32) -> i32;
 
     pub fn sceKernelStdin() -> SceUid;
@@ -3046,11 +2920,7 @@
         option: *mut SceKernelThreadOptParam,
     ) -> SceUid;
     pub fn sceKernelDeleteThread(thid: SceUid) -> i32;
-    pub fn sceKernelStartThread(
-        id: SceUid,
-        arg_len: usize,
-        arg_p: *mut c_void,
-    ) -> i32;
+    pub fn sceKernelStartThread(id: SceUid, arg_len: usize, arg_p: *mut c_void) -> i32;
     pub fn sceKernelExitThread(status: i32) -> i32;
     pub fn sceKernelExitDeleteThread(status: i32) -> i32;
     pub fn sceKernelTerminateThread(thid: SceUid) -> i32;
@@ -3068,9 +2938,7 @@
     pub fn sceKernelDelayThread(delay: u32) -> i32;
     pub fn sceKernelDelayThreadCB(delay: u32) -> i32;
     pub fn sceKernelDelaySysClockThread(delay: *mut SceKernelSysClock) -> i32;
-    pub fn sceKernelDelaySysClockThreadCB(
-        delay: *mut SceKernelSysClock,
-    ) -> i32;
+    pub fn sceKernelDelaySysClockThreadCB(delay: *mut SceKernelSysClock) -> i32;
     pub fn sceKernelChangeCurrentThreadAttr(unknown: i32, attr: i32) -> i32;
     pub fn sceKernelChangeThreadPriority(thid: SceUid, priority: i32) -> i32;
     pub fn sceKernelRotateThreadReadyQueue(priority: i32) -> i32;
@@ -3080,10 +2948,7 @@
     pub fn sceKernelGetThreadExitStatus(thid: SceUid) -> i32;
     pub fn sceKernelCheckThreadStack() -> i32;
     pub fn sceKernelGetThreadStackFreeSize(thid: SceUid) -> i32;
-    pub fn sceKernelReferThreadStatus(
-        thid: SceUid,
-        info: *mut SceKernelThreadInfo,
-    ) -> i32;
+    pub fn sceKernelReferThreadStatus(thid: SceUid, info: *mut SceKernelThreadInfo) -> i32;
     pub fn sceKernelReferThreadRunStatus(
         thid: SceUid,
         status: *mut SceKernelThreadRunStatus,
@@ -3097,21 +2962,10 @@
     ) -> SceUid;
     pub fn sceKernelDeleteSema(sema_id: SceUid) -> i32;
     pub fn sceKernelSignalSema(sema_id: SceUid, signal: i32) -> i32;
-    pub fn sceKernelWaitSema(
-        sema_id: SceUid,
-        signal: i32,
-        timeout: *mut u32,
-    ) -> i32;
-    pub fn sceKernelWaitSemaCB(
-        sema_id: SceUid,
-        signal: i32,
-        timeout: *mut u32,
-    ) -> i32;
+    pub fn sceKernelWaitSema(sema_id: SceUid, signal: i32, timeout: *mut u32) -> i32;
+    pub fn sceKernelWaitSemaCB(sema_id: SceUid, signal: i32, timeout: *mut u32) -> i32;
     pub fn sceKernelPollSema(sema_id: SceUid, signal: i32) -> i32;
-    pub fn sceKernelReferSemaStatus(
-        sema_id: SceUid,
-        info: *mut SceKernelSemaInfo,
-    ) -> i32;
+    pub fn sceKernelReferSemaStatus(sema_id: SceUid, info: *mut SceKernelSemaInfo) -> i32;
     pub fn sceKernelCreateEventFlag(
         name: *const u8,
         attr: i32,
@@ -3120,12 +2974,7 @@
     ) -> SceUid;
     pub fn sceKernelSetEventFlag(ev_id: SceUid, bits: u32) -> i32;
     pub fn sceKernelClearEventFlag(ev_id: SceUid, bits: u32) -> i32;
-    pub fn sceKernelPollEventFlag(
-        ev_id: SceUid,
-        bits: u32,
-        wait: i32,
-        out_bits: *mut u32,
-    ) -> i32;
+    pub fn sceKernelPollEventFlag(ev_id: SceUid, bits: u32, wait: i32, out_bits: *mut u32) -> i32;
     pub fn sceKernelWaitEventFlag(
         ev_id: SceUid,
         bits: u32,
@@ -3141,10 +2990,8 @@
         timeout: *mut u32,
     ) -> i32;
     pub fn sceKernelDeleteEventFlag(ev_id: SceUid) -> i32;
-    pub fn sceKernelReferEventFlagStatus(
-        event: SceUid,
-        status: *mut SceKernelEventFlagInfo,
-    ) -> i32;
+    pub fn sceKernelReferEventFlagStatus(event: SceUid, status: *mut SceKernelEventFlagInfo)
+        -> i32;
     pub fn sceKernelCreateMbx(
         name: *const u8,
         attr: u32,
@@ -3152,23 +2999,16 @@
     ) -> SceUid;
     pub fn sceKernelDeleteMbx(mbx_id: SceUid) -> i32;
     pub fn sceKernelSendMbx(mbx_id: SceUid, message: *mut c_void) -> i32;
-    pub fn sceKernelReceiveMbx(
-        mbx_id: SceUid,
-        message: *mut *mut c_void,
-        timeout: *mut u32,
-    ) -> i32;
+    pub fn sceKernelReceiveMbx(mbx_id: SceUid, message: *mut *mut c_void, timeout: *mut u32)
+        -> i32;
     pub fn sceKernelReceiveMbxCB(
         mbx_id: SceUid,
         message: *mut *mut c_void,
         timeout: *mut u32,
     ) -> i32;
-    pub fn sceKernelPollMbx(mbx_id: SceUid, pmessage: *mut *mut c_void)
-    -> i32;
+    pub fn sceKernelPollMbx(mbx_id: SceUid, pmessage: *mut *mut c_void) -> i32;
     pub fn sceKernelCancelReceiveMbx(mbx_id: SceUid, num: *mut i32) -> i32;
-    pub fn sceKernelReferMbxStatus(
-        mbx_id: SceUid,
-        info: *mut SceKernelMbxInfo,
-    ) -> i32;
+    pub fn sceKernelReferMbxStatus(mbx_id: SceUid, info: *mut SceKernelMbxInfo) -> i32;
     pub fn sceKernelSetAlarm(
         clock: u32,
         handler: SceKernelAlarmHandler,
@@ -3180,19 +3020,13 @@
         common: *mut c_void,
     ) -> SceUid;
     pub fn sceKernelCancelAlarm(alarm_id: SceUid) -> i32;
-    pub fn sceKernelReferAlarmStatus(
-        alarm_id: SceUid,
-        info: *mut SceKernelAlarmInfo,
-    ) -> i32;
+    pub fn sceKernelReferAlarmStatus(alarm_id: SceUid, info: *mut SceKernelAlarmInfo) -> i32;
     pub fn sceKernelCreateCallback(
         name: *const u8,
         func: SceKernelCallbackFunction,
         arg: *mut c_void,
     ) -> SceUid;
-    pub fn sceKernelReferCallbackStatus(
-        cb: SceUid,
-        status: *mut SceKernelCallbackInfo,
-    ) -> i32;
+    pub fn sceKernelReferCallbackStatus(cb: SceUid, status: *mut SceKernelCallbackInfo) -> i32;
     pub fn sceKernelDeleteCallback(cb: SceUid) -> i32;
     pub fn sceKernelNotifyCallback(cb: SceUid, arg2: i32) -> i32;
     pub fn sceKernelCancelCallback(cb: SceUid) -> i32;
@@ -3204,9 +3038,7 @@
         read_buf_size: i32,
         id_count: *mut i32,
     ) -> i32;
-    pub fn sceKernelReferSystemStatus(
-        status: *mut SceKernelSystemStatus,
-    ) -> i32;
+    pub fn sceKernelReferSystemStatus(status: *mut SceKernelSystemStatus) -> i32;
     pub fn sceKernelCreateMsgPipe(
         name: *const u8,
         part: i32,
@@ -3261,15 +3093,8 @@
         unk1: i32,
         unk2: *mut c_void,
     ) -> i32;
-    pub fn sceKernelCancelMsgPipe(
-        uid: SceUid,
-        send: *mut i32,
-        recv: *mut i32,
-    ) -> i32;
-    pub fn sceKernelReferMsgPipeStatus(
-        uid: SceUid,
-        info: *mut SceKernelMppInfo,
-    ) -> i32;
+    pub fn sceKernelCancelMsgPipe(uid: SceUid, send: *mut i32, recv: *mut i32) -> i32;
+    pub fn sceKernelReferMsgPipeStatus(uid: SceUid, info: *mut SceKernelMppInfo) -> i32;
     pub fn sceKernelCreateVpl(
         name: *const u8,
         part: i32,
@@ -3290,17 +3115,10 @@
         data: *mut *mut c_void,
         timeout: *mut u32,
     ) -> i32;
-    pub fn sceKernelTryAllocateVpl(
-        uid: SceUid,
-        size: u32,
-        data: *mut *mut c_void,
-    ) -> i32;
+    pub fn sceKernelTryAllocateVpl(uid: SceUid, size: u32, data: *mut *mut c_void) -> i32;
     pub fn sceKernelFreeVpl(uid: SceUid, data: *mut c_void) -> i32;
     pub fn sceKernelCancelVpl(uid: SceUid, num: *mut i32) -> i32;
-    pub fn sceKernelReferVplStatus(
-        uid: SceUid,
-        info: *mut SceKernelVplInfo,
-    ) -> i32;
+    pub fn sceKernelReferVplStatus(uid: SceUid, info: *mut SceKernelVplInfo) -> i32;
     pub fn sceKernelCreateFpl(
         name: *const u8,
         part: i32,
@@ -3310,61 +3128,30 @@
         opt: *mut SceKernelFplOptParam,
     ) -> i32;
     pub fn sceKernelDeleteFpl(uid: SceUid) -> i32;
-    pub fn sceKernelAllocateFpl(
-        uid: SceUid,
-        data: *mut *mut c_void,
-        timeout: *mut u32,
-    ) -> i32;
-    pub fn sceKernelAllocateFplCB(
-        uid: SceUid,
-        data: *mut *mut c_void,
-        timeout: *mut u32,
-    ) -> i32;
-    pub fn sceKernelTryAllocateFpl(uid: SceUid, data: *mut *mut c_void)
-    -> i32;
+    pub fn sceKernelAllocateFpl(uid: SceUid, data: *mut *mut c_void, timeout: *mut u32) -> i32;
+    pub fn sceKernelAllocateFplCB(uid: SceUid, data: *mut *mut c_void, timeout: *mut u32) -> i32;
+    pub fn sceKernelTryAllocateFpl(uid: SceUid, data: *mut *mut c_void) -> i32;
     pub fn sceKernelFreeFpl(uid: SceUid, data: *mut c_void) -> i32;
     pub fn sceKernelCancelFpl(uid: SceUid, pnum: *mut i32) -> i32;
-    pub fn sceKernelReferFplStatus(
-        uid: SceUid,
-        info: *mut SceKernelFplInfo,
-    ) -> i32;
-    pub fn sceKernelUSec2SysClock(
-        usec: u32,
-        clock: *mut SceKernelSysClock,
-    ) -> i32;
+    pub fn sceKernelReferFplStatus(uid: SceUid, info: *mut SceKernelFplInfo) -> i32;
+    pub fn sceKernelUSec2SysClock(usec: u32, clock: *mut SceKernelSysClock) -> i32;
     pub fn sceKernelUSec2SysClockWide(usec: u32) -> i64;
     pub fn sceKernelSysClock2USec(
         clock: *mut SceKernelSysClock,
         low: *mut u32,
         high: *mut u32,
     ) -> i32;
-    pub fn sceKernelSysClock2USecWide(
-        clock: i64,
-        low: *mut u32,
-        high: *mut u32,
-    ) -> i32;
+    pub fn sceKernelSysClock2USecWide(clock: i64, low: *mut u32, high: *mut u32) -> i32;
     pub fn sceKernelGetSystemTime(time: *mut SceKernelSysClock) -> i32;
     pub fn sceKernelGetSystemTimeWide() -> i64;
     pub fn sceKernelGetSystemTimeLow() -> u32;
-    pub fn sceKernelCreateVTimer(
-        name: *const u8,
-        opt: *mut SceKernelVTimerOptParam,
-    ) -> SceUid;
+    pub fn sceKernelCreateVTimer(name: *const u8, opt: *mut SceKernelVTimerOptParam) -> SceUid;
     pub fn sceKernelDeleteVTimer(uid: SceUid) -> i32;
-    pub fn sceKernelGetVTimerBase(
-        uid: SceUid,
-        base: *mut SceKernelSysClock,
-    ) -> i32;
+    pub fn sceKernelGetVTimerBase(uid: SceUid, base: *mut SceKernelSysClock) -> i32;
     pub fn sceKernelGetVTimerBaseWide(uid: SceUid) -> i64;
-    pub fn sceKernelGetVTimerTime(
-        uid: SceUid,
-        time: *mut SceKernelSysClock,
-    ) -> i32;
+    pub fn sceKernelGetVTimerTime(uid: SceUid, time: *mut SceKernelSysClock) -> i32;
     pub fn sceKernelGetVTimerTimeWide(uid: SceUid) -> i64;
-    pub fn sceKernelSetVTimerTime(
-        uid: SceUid,
-        time: *mut SceKernelSysClock,
-    ) -> i32;
+    pub fn sceKernelSetVTimerTime(uid: SceUid, time: *mut SceKernelSysClock) -> i32;
     pub fn sceKernelSetVTimerTimeWide(uid: SceUid, time: i64) -> i64;
     pub fn sceKernelStartVTimer(uid: SceUid) -> i32;
     pub fn sceKernelStopVTimer(uid: SceUid) -> i32;
@@ -3381,10 +3168,7 @@
         common: *mut c_void,
     ) -> i32;
     pub fn sceKernelCancelVTimerHandler(uid: SceUid) -> i32;
-    pub fn sceKernelReferVTimerStatus(
-        uid: SceUid,
-        info: *mut SceKernelVTimerInfo,
-    ) -> i32;
+    pub fn sceKernelReferVTimerStatus(uid: SceUid, info: *mut SceKernelVTimerInfo) -> i32;
     pub fn sceKernelRegisterThreadEventHandler(
         name: *const u8,
         thread_id: SceUid,
@@ -3400,16 +3184,8 @@
     pub fn sceKernelReferThreadProfiler() -> *mut DebugProfilerRegs;
     pub fn sceKernelReferGlobalProfiler() -> *mut DebugProfilerRegs;
 
-    pub fn sceUsbStart(
-        driver_name: *const u8,
-        size: i32,
-        args: *mut c_void,
-    ) -> i32;
-    pub fn sceUsbStop(
-        driver_name: *const u8,
-        size: i32,
-        args: *mut c_void,
-    ) -> i32;
+    pub fn sceUsbStart(driver_name: *const u8, size: i32, args: *mut c_void) -> i32;
+    pub fn sceUsbStop(driver_name: *const u8, size: i32, args: *mut c_void) -> i32;
     pub fn sceUsbActivate(pid: u32) -> i32;
     pub fn sceUsbDeactivate(pid: u32) -> i32;
     pub fn sceUsbGetState() -> i32;
@@ -3454,9 +3230,7 @@
     pub fn sceUsbCamGetBrightness(brightness: *mut i32) -> i32;
     pub fn sceUsbCamGetContrast(contrast: *mut i32) -> i32;
     pub fn sceUsbCamGetSharpness(sharpness: *mut i32) -> i32;
-    pub fn sceUsbCamGetImageEffectMode(
-        effect_mode: *mut UsbCamEffectMode,
-    ) -> i32;
+    pub fn sceUsbCamGetImageEffectMode(effect_mode: *mut UsbCamEffectMode) -> i32;
     pub fn sceUsbCamGetEvLevel(exposure_level: *mut UsbCamEvLevel) -> i32;
     pub fn sceUsbCamGetReverseMode(reverse_flags: *mut i32) -> i32;
     pub fn sceUsbCamGetZoom(zoom: *mut i32) -> i32;
@@ -3488,11 +3262,7 @@
     pub fn scePowerGetBusClockFrequency() -> i32;
     pub fn scePowerGetBusClockFrequencyInt() -> i32;
     pub fn scePowerGetBusClockFrequencyFloat() -> f32;
-    pub fn scePowerSetClockFrequency(
-        pllfreq: i32,
-        cpufreq: i32,
-        busfreq: i32,
-    ) -> i32;
+    pub fn scePowerSetClockFrequency(pllfreq: i32, cpufreq: i32, busfreq: i32) -> i32;
     pub fn scePowerLock(unknown: i32) -> i32;
     pub fn scePowerUnlock(unknown: i32) -> i32;
     pub fn scePowerTick(t: PowerTick) -> i32;
@@ -3513,14 +3283,8 @@
     pub fn sceRtcGetCurrentTick(tick: *mut u64) -> i32;
     pub fn sceRtcGetCurrentClock(tm: *mut ScePspDateTime, tz: i32) -> i32;
     pub fn sceRtcGetCurrentClockLocalTime(tm: *mut ScePspDateTime) -> i32;
-    pub fn sceRtcConvertUtcToLocalTime(
-        tick_utc: *const u64,
-        tick_local: *mut u64,
-    ) -> i32;
-    pub fn sceRtcConvertLocalTimeToUTC(
-        tick_local: *const u64,
-        tick_utc: *mut u64,
-    ) -> i32;
+    pub fn sceRtcConvertUtcToLocalTime(tick_utc: *const u64, tick_local: *mut u64) -> i32;
+    pub fn sceRtcConvertLocalTimeToUTC(tick_local: *const u64, tick_utc: *mut u64) -> i32;
     pub fn sceRtcIsLeapYear(year: i32) -> i32;
     pub fn sceRtcGetDaysInMonth(year: i32, month: i32) -> i32;
     pub fn sceRtcGetDayOfWeek(year: i32, month: i32, day: i32) -> i32;
@@ -3528,104 +3292,43 @@
     pub fn sceRtcSetTick(date: *mut ScePspDateTime, tick: *const u64) -> i32;
     pub fn sceRtcGetTick(date: *const ScePspDateTime, tick: *mut u64) -> i32;
     pub fn sceRtcCompareTick(tick1: *const u64, tick2: *const u64) -> i32;
-    pub fn sceRtcTickAddTicks(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_ticks: u64,
-    ) -> i32;
-    pub fn sceRtcTickAddMicroseconds(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_ms: u64,
-    ) -> i32;
-    pub fn sceRtcTickAddSeconds(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_seconds: u64,
-    ) -> i32;
-    pub fn sceRtcTickAddMinutes(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_minutes: u64,
-    ) -> i32;
-    pub fn sceRtcTickAddHours(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_hours: u64,
-    ) -> i32;
-    pub fn sceRtcTickAddDays(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_days: u64,
-    ) -> i32;
-    pub fn sceRtcTickAddWeeks(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_weeks: u64,
-    ) -> i32;
-    pub fn sceRtcTickAddMonths(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_months: u64,
-    ) -> i32;
-    pub fn sceRtcTickAddYears(
-        dest_tick: *mut u64,
-        src_tick: *const u64,
-        num_years: u64,
-    ) -> i32;
+    pub fn sceRtcTickAddTicks(dest_tick: *mut u64, src_tick: *const u64, num_ticks: u64) -> i32;
+    pub fn sceRtcTickAddMicroseconds(dest_tick: *mut u64, src_tick: *const u64, num_ms: u64)
+        -> i32;
+    pub fn sceRtcTickAddSeconds(dest_tick: *mut u64, src_tick: *const u64, num_seconds: u64)
+        -> i32;
+    pub fn sceRtcTickAddMinutes(dest_tick: *mut u64, src_tick: *const u64, num_minutes: u64)
+        -> i32;
+    pub fn sceRtcTickAddHours(dest_tick: *mut u64, src_tick: *const u64, num_hours: u64) -> i32;
+    pub fn sceRtcTickAddDays(dest_tick: *mut u64, src_tick: *const u64, num_days: u64) -> i32;
+    pub fn sceRtcTickAddWeeks(dest_tick: *mut u64, src_tick: *const u64, num_weeks: u64) -> i32;
+    pub fn sceRtcTickAddMonths(dest_tick: *mut u64, src_tick: *const u64, num_months: u64) -> i32;
+    pub fn sceRtcTickAddYears(dest_tick: *mut u64, src_tick: *const u64, num_years: u64) -> i32;
     pub fn sceRtcSetTime_t(date: *mut ScePspDateTime, time: u32) -> i32;
     pub fn sceRtcGetTime_t(date: *const ScePspDateTime, time: *mut u32) -> i32;
     pub fn sceRtcSetTime64_t(date: *mut ScePspDateTime, time: u64) -> i32;
-    pub fn sceRtcGetTime64_t(
-        date: *const ScePspDateTime, time: *mut u64
-    ) -> i32;
+    pub fn sceRtcGetTime64_t(date: *const ScePspDateTime, time: *mut u64) -> i32;
     pub fn sceRtcSetDosTime(date: *mut ScePspDateTime, dos_time: u32) -> i32;
     pub fn sceRtcGetDosTime(date: *mut ScePspDateTime, dos_time: u32) -> i32;
-    pub fn sceRtcSetWin32FileTime(
-        date: *mut ScePspDateTime,
-        time: *mut u64,
-    ) -> i32;
-    pub fn sceRtcGetWin32FileTime(
-        date: *mut ScePspDateTime,
-        time: *mut u64,
-    ) -> i32;
-    pub fn sceRtcParseDateTime(
-        dest_tick: *mut u64,
-        date_string: *const u8,
-    ) -> i32;
+    pub fn sceRtcSetWin32FileTime(date: *mut ScePspDateTime, time: *mut u64) -> i32;
+    pub fn sceRtcGetWin32FileTime(date: *mut ScePspDateTime, time: *mut u64) -> i32;
+    pub fn sceRtcParseDateTime(dest_tick: *mut u64, date_string: *const u8) -> i32;
     pub fn sceRtcFormatRFC3339(
         psz_date_time: *mut char,
         p_utc: *const u64,
         time_zone_minutes: i32,
     ) -> i32;
-    pub fn sceRtcFormatRFC3339LocalTime(
-        psz_date_time: *mut char,
-        p_utc: *const u64,
-    ) -> i32;
-    pub fn sceRtcParseRFC3339(
-        p_utc: *mut u64,
-        psz_date_time: *const u8,
-    ) -> i32;
+    pub fn sceRtcFormatRFC3339LocalTime(psz_date_time: *mut char, p_utc: *const u64) -> i32;
+    pub fn sceRtcParseRFC3339(p_utc: *mut u64, psz_date_time: *const u8) -> i32;
     pub fn sceRtcFormatRFC2822(
         psz_date_time: *mut char,
         p_utc: *const u64,
         time_zone_minutes: i32,
     ) -> i32;
-    pub fn sceRtcFormatRFC2822LocalTime(
-        psz_date_time: *mut char,
-        p_utc: *const u64,
-    ) -> i32;
+    pub fn sceRtcFormatRFC2822LocalTime(psz_date_time: *mut char, p_utc: *const u64) -> i32;
 
-    pub fn sceIoOpen(
-        file: *const u8,
-        flags: i32,
-        permissions: IoPermissions,
-    ) -> SceUid;
-    pub fn sceIoOpenAsync(
-        file: *const u8,
-        flags: i32,
-        permissions: IoPermissions,
-    ) -> SceUid;
+    pub fn sceIoOpen(file: *const u8, flags: i32, permissions: IoPermissions) -> SceUid;
+    pub fn sceIoOpenAsync(file: *const u8, flags: i32, permissions: IoPermissions) -> SceUid;
     pub fn sceIoClose(fd: SceUid) -> i32;
     pub fn sceIoCloseAsync(fd: SceUid) -> i32;
     pub fn sceIoRead(fd: SceUid, data: *mut c_void, size: u32) -> i32;
@@ -3635,8 +3338,7 @@
     pub fn sceIoLseek(fd: SceUid, offset: i64, whence: IoWhence) -> i64;
     pub fn sceIoLseekAsync(fd: SceUid, offset: i64, whence: IoWhence) -> i32;
     pub fn sceIoLseek32(fd: SceUid, offset: i32, whence: IoWhence) -> i32;
-    pub fn sceIoLseek32Async(fd: SceUid, offset: i32, whence: IoWhence)
-    -> i32;
+    pub fn sceIoLseek32Async(fd: SceUid, offset: i32, whence: IoWhence) -> i32;
     pub fn sceIoRemove(file: *const u8) -> i32;
     pub fn sceIoMkdir(dir: *const u8, mode: IoPermissions) -> i32;
     pub fn sceIoRmdir(path: *const u8) -> i32;
@@ -3663,11 +3365,7 @@
     ) -> i32;
     pub fn sceIoUnassign(dev: *const u8) -> i32;
     pub fn sceIoGetstat(file: *const u8, stat: *mut SceIoStat) -> i32;
-    pub fn sceIoChstat(
-        file: *const u8,
-        stat: *mut SceIoStat,
-        bits: i32,
-    ) -> i32;
+    pub fn sceIoChstat(file: *const u8, stat: *mut SceIoStat, bits: i32) -> i32;
     pub fn sceIoIoctl(
         fd: SceUid,
         cmd: u32,
@@ -3692,22 +3390,13 @@
     pub fn sceIoCancel(fd: SceUid) -> i32;
     pub fn sceIoGetDevType(fd: SceUid) -> i32;
     pub fn sceIoChangeAsyncPriority(fd: SceUid, pri: i32) -> i32;
-    pub fn sceIoSetAsyncCallback(
-        fd: SceUid,
-        cb: SceUid,
-        argp: *mut c_void,
-    ) -> i32;
+    pub fn sceIoSetAsyncCallback(fd: SceUid, cb: SceUid, argp: *mut c_void) -> i32;
 
     pub fn sceJpegInitMJpeg() -> i32;
     pub fn sceJpegFinishMJpeg() -> i32;
     pub fn sceJpegCreateMJpeg(width: i32, height: i32) -> i32;
     pub fn sceJpegDeleteMJpeg() -> i32;
-    pub fn sceJpegDecodeMJpeg(
-        jpeg_buf: *mut u8,
-        size: usize,
-        rgba: *mut c_void,
-        unk: u32,
-    ) -> i32;
+    pub fn sceJpegDecodeMJpeg(jpeg_buf: *mut u8, size: usize, rgba: *mut c_void, unk: u32) -> i32;
 
     pub fn sceUmdCheckMedium() -> i32;
     pub fn sceUmdGetDiscInfo(info: *mut UmdInfo) -> i32;
@@ -3736,9 +3425,7 @@
         cb_param: *mut c_void,
     ) -> i32;
     pub fn sceMpegRingbufferDestruct(ringbuffer: *mut SceMpegRingbuffer);
-    pub fn sceMpegRingbufferAvailableSize(
-        ringbuffer: *mut SceMpegRingbuffer,
-    ) -> i32;
+    pub fn sceMpegRingbufferAvailableSize(ringbuffer: *mut SceMpegRingbuffer) -> i32;
     pub fn sceMpegRingbufferPut(
         ringbuffer: *mut SceMpegRingbuffer,
         num_packets: i32,
@@ -3755,41 +3442,22 @@
         unk2: i32,
     ) -> i32;
     pub fn sceMpegDelete(handle: SceMpeg);
-    pub fn sceMpegQueryStreamOffset(
-        handle: SceMpeg,
-        buffer: *mut c_void,
-        offset: *mut i32,
-    ) -> i32;
+    pub fn sceMpegQueryStreamOffset(handle: SceMpeg, buffer: *mut c_void, offset: *mut i32) -> i32;
     pub fn sceMpegQueryStreamSize(buffer: *mut c_void, size: *mut i32) -> i32;
-    pub fn sceMpegRegistStream(
-        handle: SceMpeg,
-        stream_id: i32,
-        unk: i32,
-    ) -> SceMpegStream;
+    pub fn sceMpegRegistStream(handle: SceMpeg, stream_id: i32, unk: i32) -> SceMpegStream;
     pub fn sceMpegUnRegistStream(handle: SceMpeg, stream: SceMpegStream);
     pub fn sceMpegFlushAllStream(handle: SceMpeg) -> i32;
     pub fn sceMpegMallocAvcEsBuf(handle: SceMpeg) -> *mut c_void;
     pub fn sceMpegFreeAvcEsBuf(handle: SceMpeg, buf: *mut c_void);
-    pub fn sceMpegQueryAtracEsSize(
-        handle: SceMpeg,
-        es_size: *mut i32,
-        out_size: *mut i32,
-    ) -> i32;
-    pub fn sceMpegInitAu(
-        handle: SceMpeg,
-        es_buffer: *mut c_void,
-        au: *mut SceMpegAu,
-    ) -> i32;
+    pub fn sceMpegQueryAtracEsSize(handle: SceMpeg, es_size: *mut i32, out_size: *mut i32) -> i32;
+    pub fn sceMpegInitAu(handle: SceMpeg, es_buffer: *mut c_void, au: *mut SceMpegAu) -> i32;
     pub fn sceMpegGetAvcAu(
         handle: SceMpeg,
         stream: SceMpegStream,
         au: *mut SceMpegAu,
         unk: *mut i32,
     ) -> i32;
-    pub fn sceMpegAvcDecodeMode(
-        handle: SceMpeg,
-        mode: *mut SceMpegAvcMode,
-    ) -> i32;
+    pub fn sceMpegAvcDecodeMode(handle: SceMpeg, mode: *mut SceMpegAvcMode) -> i32;
     pub fn sceMpegAvcDecode(
         handle: SceMpeg,
         au: *mut SceMpegAu,
@@ -3816,11 +3484,7 @@
         init: i32,
     ) -> i32;
 
-    pub fn sceMpegBaseYCrCbCopyVme(
-        yuv_buffer: *mut c_void,
-        buffer: *mut i32,
-        type_: i32,
-    ) -> i32;
+    pub fn sceMpegBaseYCrCbCopyVme(yuv_buffer: *mut c_void, buffer: *mut i32, type_: i32) -> i32;
     pub fn sceMpegBaseCscInit(width: i32) -> i32;
     pub fn sceMpegBaseCscVme(
         rgb_buffer: *mut c_void,
@@ -3838,22 +3502,9 @@
     pub fn sceHprmIsMicrophoneExist() -> i32;
 
     pub fn sceGuDepthBuffer(zbp: *mut c_void, zbw: i32);
-    pub fn sceGuDispBuffer(
-        width: i32,
-        height: i32,
-        dispbp: *mut c_void,
-        dispbw: i32,
-    );
-    pub fn sceGuDrawBuffer(
-        psm: DisplayPixelFormat,
-        fbp: *mut c_void,
-        fbw: i32,
-    );
-    pub fn sceGuDrawBufferList(
-        psm: DisplayPixelFormat,
-        fbp: *mut c_void,
-        fbw: i32,
-    );
+    pub fn sceGuDispBuffer(width: i32, height: i32, dispbp: *mut c_void, dispbw: i32);
+    pub fn sceGuDrawBuffer(psm: DisplayPixelFormat, fbp: *mut c_void, fbw: i32);
+    pub fn sceGuDrawBufferList(psm: DisplayPixelFormat, fbp: *mut c_void, fbw: i32);
     pub fn sceGuDisplay(state: bool) -> bool;
     pub fn sceGuDepthFunc(function: DepthFunc);
     pub fn sceGuDepthMask(mask: i32);
@@ -3864,10 +3515,7 @@
     pub fn sceGuTerm();
     pub fn sceGuBreak(mode: i32);
     pub fn sceGuContinue();
-    pub fn sceGuSetCallback(
-        signal: GuCallbackId,
-        callback: GuCallback,
-    ) -> GuCallback;
+    pub fn sceGuSetCallback(signal: GuCallbackId, callback: GuCallback) -> GuCallback;
     pub fn sceGuSignal(behavior: SignalBehavior, signal: i32);
     pub fn sceGuSendCommandf(cmd: GeCommand, argument: f32);
     pub fn sceGuSendCommandi(cmd: GeCommand, argument: i32);
@@ -3878,16 +3526,9 @@
     pub fn sceGuCallList(list: *const c_void);
     pub fn sceGuCallMode(mode: i32);
     pub fn sceGuCheckList() -> i32;
-    pub fn sceGuSendList(
-        mode: GuQueueMode,
-        list: *const c_void,
-        context: *mut GeContext,
-    );
+    pub fn sceGuSendList(mode: GuQueueMode, list: *const c_void, context: *mut GeContext);
     pub fn sceGuSwapBuffers() -> *mut c_void;
-    pub fn sceGuSync(
-        mode: GuSyncMode,
-        behavior: GuSyncBehavior,
-    ) -> GeListState;
+    pub fn sceGuSync(mode: GuSyncMode, behavior: GuSyncBehavior) -> GeListState;
     pub fn sceGuDrawArray(
         prim: GuPrimitive,
         vtype: i32,
@@ -3908,21 +3549,11 @@
     pub fn sceGuGetAllStatus() -> i32;
     pub fn sceGuEnable(state: GuState);
     pub fn sceGuDisable(state: GuState);
-    pub fn sceGuLight(
-        light: i32,
-        type_: LightType,
-        components: i32,
-        position: &ScePspFVector3,
-    );
+    pub fn sceGuLight(light: i32, type_: LightType, components: i32, position: &ScePspFVector3);
     pub fn sceGuLightAtt(light: i32, atten0: f32, atten1: f32, atten2: f32);
     pub fn sceGuLightColor(light: i32, component: i32, color: u32);
     pub fn sceGuLightMode(mode: LightMode);
-    pub fn sceGuLightSpot(
-        light: i32,
-        direction: &ScePspFVector3,
-        exponent: f32,
-        cutoff: f32,
-    );
+    pub fn sceGuLightSpot(light: i32, direction: &ScePspFVector3, exponent: f32, cutoff: f32);
     pub fn sceGuClear(flags: i32);
     pub fn sceGuClearColor(color: u32);
     pub fn sceGuClearDepth(depth: u32);
@@ -3934,26 +3565,11 @@
     pub fn sceGuAlphaFunc(func: AlphaFunc, value: i32, mask: i32);
     pub fn sceGuAmbient(color: u32);
     pub fn sceGuAmbientColor(color: u32);
-    pub fn sceGuBlendFunc(
-        op: BlendOp,
-        src: BlendSrc,
-        dest: BlendDst,
-        src_fix: u32,
-        dest_fix: u32,
-    );
+    pub fn sceGuBlendFunc(op: BlendOp, src: BlendSrc, dest: BlendDst, src_fix: u32, dest_fix: u32);
     pub fn sceGuMaterial(components: i32, color: u32);
-    pub fn sceGuModelColor(
-        emissive: u32,
-        ambient: u32,
-        diffuse: u32,
-        specular: u32,
-    );
+    pub fn sceGuModelColor(emissive: u32, ambient: u32, diffuse: u32, specular: u32);
     pub fn sceGuStencilFunc(func: StencilFunc, ref_: i32, mask: i32);
-    pub fn sceGuStencilOp(
-        fail: StencilOperation,
-        zfail: StencilOperation,
-        zpass: StencilOperation,
-    );
+    pub fn sceGuStencilOp(fail: StencilOperation, zfail: StencilOperation, zpass: StencilOperation);
     pub fn sceGuSpecular(power: f32);
     pub fn sceGuFrontFace(order: FrontFaceDirection);
     pub fn sceGuLogicalOp(op: LogicalOperation);
@@ -3985,12 +3601,7 @@
     );
     pub fn sceGuTexLevelMode(mode: TextureLevelMode, bias: f32);
     pub fn sceGuTexMapMode(mode: TextureMapMode, a1: u32, a2: u32);
-    pub fn sceGuTexMode(
-        tpsm: TexturePixelFormat,
-        maxmips: i32,
-        a2: i32,
-        swizzle: i32,
-    );
+    pub fn sceGuTexMode(tpsm: TexturePixelFormat, maxmips: i32, a2: i32, swizzle: i32);
     pub fn sceGuTexOffset(u: f32, v: f32);
     pub fn sceGuTexProjMapMode(mode: TextureProjectionMapMode);
     pub fn sceGuTexScale(u: f32, v: f32);
@@ -3998,12 +3609,7 @@
     pub fn sceGuTexSync();
     pub fn sceGuTexWrap(u: GuTexWrapMode, v: GuTexWrapMode);
     pub fn sceGuClutLoad(num_blocks: i32, cbp: *const c_void);
-    pub fn sceGuClutMode(
-        cpsm: ClutPixelFormat,
-        shift: u32,
-        mask: u32,
-        a3: u32,
-    );
+    pub fn sceGuClutMode(cpsm: ClutPixelFormat, shift: u32, mask: u32, a3: u32);
     pub fn sceGuOffset(x: u32, y: u32);
     pub fn sceGuScissor(x: i32, y: i32, w: i32, h: i32);
     pub fn sceGuViewport(cx: i32, cy: i32, width: i32, height: i32);
@@ -4073,21 +3679,10 @@
     pub fn sceGumFullInverse();
     pub fn sceGumLoadIdentity();
     pub fn sceGumLoadMatrix(m: &ScePspFMatrix4);
-    pub fn sceGumLookAt(
-        eye: &ScePspFVector3,
-        center: &ScePspFVector3,
-        up: &ScePspFVector3,
-    );
+    pub fn sceGumLookAt(eye: &ScePspFVector3, center: &ScePspFVector3, up: &ScePspFVector3);
     pub fn sceGumMatrixMode(mode: MatrixMode);
     pub fn sceGumMultMatrix(m: &ScePspFMatrix4);
-    pub fn sceGumOrtho(
-        left: f32,
-        right: f32,
-        bottom: f32,
-        top: f32,
-        near: f32,
-        far: f32,
-    );
+    pub fn sceGumOrtho(left: f32, right: f32, bottom: f32, top: f32, near: f32, far: f32);
     pub fn sceGumPerspective(fovy: f32, aspect: f32, near: f32, far: f32);
     pub fn sceGumPopMatrix();
     pub fn sceGumPushMatrix();
@@ -4124,11 +3719,7 @@
     pub fn sceMp3GetMp3ChannelNum(handle: Mp3Handle) -> i32;
     pub fn sceMp3ResetPlayPosition(handle: Mp3Handle) -> i32;
 
-    pub fn sceRegOpenRegistry(
-        reg: *mut Key,
-        mode: i32,
-        handle: *mut RegHandle,
-    ) -> i32;
+    pub fn sceRegOpenRegistry(reg: *mut Key, mode: i32, handle: *mut RegHandle) -> i32;
     pub fn sceRegFlushRegistry(handle: RegHandle) -> i32;
     pub fn sceRegCloseRegistry(handle: RegHandle) -> i32;
     pub fn sceRegOpenCategory(
@@ -4172,21 +3763,13 @@
         size: usize,
     ) -> i32;
     pub fn sceRegGetKeysNum(dir_handle: RegHandle, num: *mut i32) -> i32;
-    pub fn sceRegGetKeys(dir_handle: RegHandle, buf: *mut u8, num: i32)
-    -> i32;
-    pub fn sceRegCreateKey(
-        dir_handle: RegHandle,
-        name: *const u8,
-        type_: i32,
-        size: usize,
-    ) -> i32;
+    pub fn sceRegGetKeys(dir_handle: RegHandle, buf: *mut u8, num: i32) -> i32;
+    pub fn sceRegCreateKey(dir_handle: RegHandle, name: *const u8, type_: i32, size: usize) -> i32;
     pub fn sceRegRemoveRegistry(key: *mut Key) -> i32;
 
     pub fn sceOpenPSIDGetOpenPSID(openpsid: *mut OpenPSID) -> i32;
 
-    pub fn sceUtilityMsgDialogInitStart(
-        params: *mut UtilityMsgDialogParams,
-    ) -> i32;
+    pub fn sceUtilityMsgDialogInitStart(params: *mut UtilityMsgDialogParams) -> i32;
     pub fn sceUtilityMsgDialogShutdownStart();
     pub fn sceUtilityMsgDialogGetStatus() -> i32;
     pub fn sceUtilityMsgDialogUpdate(n: i32);
@@ -4196,43 +3779,23 @@
     pub fn sceUtilityNetconfUpdate(unknown: i32) -> i32;
     pub fn sceUtilityNetconfGetStatus() -> i32;
     pub fn sceUtilityCheckNetParam(id: i32) -> i32;
-    pub fn sceUtilityGetNetParam(
-        conf: i32,
-        param: NetParam,
-        data: *mut UtilityNetData,
-    ) -> i32;
-    pub fn sceUtilitySavedataInitStart(
-        params: *mut SceUtilitySavedataParam,
-    ) -> i32;
+    pub fn sceUtilityGetNetParam(conf: i32, param: NetParam, data: *mut UtilityNetData) -> i32;
+    pub fn sceUtilitySavedataInitStart(params: *mut SceUtilitySavedataParam) -> i32;
     pub fn sceUtilitySavedataGetStatus() -> i32;
     pub fn sceUtilitySavedataShutdownStart() -> i32;
     pub fn sceUtilitySavedataUpdate(unknown: i32);
-    pub fn sceUtilityGameSharingInitStart(
-        params: *mut UtilityGameSharingParams,
-    ) -> i32;
+    pub fn sceUtilityGameSharingInitStart(params: *mut UtilityGameSharingParams) -> i32;
     pub fn sceUtilityGameSharingShutdownStart();
     pub fn sceUtilityGameSharingGetStatus() -> i32;
     pub fn sceUtilityGameSharingUpdate(n: i32);
-    pub fn sceUtilityHtmlViewerInitStart(
-        params: *mut UtilityHtmlViewerParam,
-    ) -> i32;
+    pub fn sceUtilityHtmlViewerInitStart(params: *mut UtilityHtmlViewerParam) -> i32;
     pub fn sceUtilityHtmlViewerShutdownStart() -> i32;
     pub fn sceUtilityHtmlViewerUpdate(n: i32) -> i32;
     pub fn sceUtilityHtmlViewerGetStatus() -> i32;
     pub fn sceUtilitySetSystemParamInt(id: SystemParamId, value: i32) -> i32;
-    pub fn sceUtilitySetSystemParamString(
-        id: SystemParamId,
-        str: *const u8,
-    ) -> i32;
-    pub fn sceUtilityGetSystemParamInt(
-        id: SystemParamId,
-        value: *mut i32,
-    ) -> i32;
-    pub fn sceUtilityGetSystemParamString(
-        id: SystemParamId,
-        str: *mut u8,
-        len: i32,
-    ) -> i32;
+    pub fn sceUtilitySetSystemParamString(id: SystemParamId, str: *const u8) -> i32;
+    pub fn sceUtilityGetSystemParamInt(id: SystemParamId, value: *mut i32) -> i32;
+    pub fn sceUtilityGetSystemParamString(id: SystemParamId, str: *mut u8, len: i32) -> i32;
     pub fn sceUtilityOskInitStart(params: *mut SceUtilityOskParams) -> i32;
     pub fn sceUtilityOskShutdownStart() -> i32;
     pub fn sceUtilityOskUpdate(n: i32) -> i32;
@@ -4291,48 +3854,29 @@
         timeout: u32,
         unknown: i32,
     ) -> i32;
-    pub fn sceNetAdhocctlGetGameModeInfo(
-        gamemodeinfo: *mut SceNetAdhocctlGameModeInfo,
-    ) -> i32;
+    pub fn sceNetAdhocctlGetGameModeInfo(gamemodeinfo: *mut SceNetAdhocctlGameModeInfo) -> i32;
     pub fn sceNetAdhocctlExitGameMode() -> i32;
-    pub fn sceNetAdhocctlGetPeerList(
-        length: *mut i32,
-        buf: *mut c_void,
-    ) -> i32;
+    pub fn sceNetAdhocctlGetPeerList(length: *mut i32, buf: *mut c_void) -> i32;
     pub fn sceNetAdhocctlGetPeerInfo(
         mac: *mut u8,
         size: i32,
         peerinfo: *mut SceNetAdhocctlPeerInfo,
     ) -> i32;
     pub fn sceNetAdhocctlScan() -> i32;
-    pub fn sceNetAdhocctlGetScanInfo(
-        length: *mut i32,
-        buf: *mut c_void,
-    ) -> i32;
-    pub fn sceNetAdhocctlAddHandler(
-        handler: SceNetAdhocctlHandler,
-        unknown: *mut c_void,
-    ) -> i32;
+    pub fn sceNetAdhocctlGetScanInfo(length: *mut i32, buf: *mut c_void) -> i32;
+    pub fn sceNetAdhocctlAddHandler(handler: SceNetAdhocctlHandler, unknown: *mut c_void) -> i32;
     pub fn sceNetAdhocctlDelHandler(id: i32) -> i32;
-    pub fn sceNetAdhocctlGetNameByAddr(mac: *mut u8, nickname: *mut u8)
-    -> i32;
+    pub fn sceNetAdhocctlGetNameByAddr(mac: *mut u8, nickname: *mut u8) -> i32;
     pub fn sceNetAdhocctlGetAddrByName(
         nickname: *mut u8,
         length: *mut i32,
         buf: *mut c_void,
     ) -> i32;
-    pub fn sceNetAdhocctlGetParameter(
-        params: *mut SceNetAdhocctlParams,
-    ) -> i32;
+    pub fn sceNetAdhocctlGetParameter(params: *mut SceNetAdhocctlParams) -> i32;
 
     pub fn sceNetAdhocInit() -> i32;
     pub fn sceNetAdhocTerm() -> i32;
-    pub fn sceNetAdhocPdpCreate(
-        mac: *mut u8,
-        port: u16,
-        buf_size: u32,
-        unk1: i32,
-    ) -> i32;
+    pub fn sceNetAdhocPdpCreate(mac: *mut u8, port: u16, buf_size: u32, unk1: i32) -> i32;
     pub fn sceNetAdhocPdpDelete(id: i32, unk1: i32) -> i32;
     pub fn sceNetAdhocPdpSend(
         id: i32,
@@ -4352,19 +3896,9 @@
         timeout: u32,
         nonblock: i32,
     ) -> i32;
-    pub fn sceNetAdhocGetPdpStat(
-        size: *mut i32,
-        stat: *mut SceNetAdhocPdpStat,
-    ) -> i32;
-    pub fn sceNetAdhocGameModeCreateMaster(
-        data: *mut c_void,
-        size: i32,
-    ) -> i32;
-    pub fn sceNetAdhocGameModeCreateReplica(
-        mac: *mut u8,
-        data: *mut c_void,
-        size: i32,
-    ) -> i32;
+    pub fn sceNetAdhocGetPdpStat(size: *mut i32, stat: *mut SceNetAdhocPdpStat) -> i32;
+    pub fn sceNetAdhocGameModeCreateMaster(data: *mut c_void, size: i32) -> i32;
+    pub fn sceNetAdhocGameModeCreateReplica(mac: *mut u8, data: *mut c_void, size: i32) -> i32;
     pub fn sceNetAdhocGameModeUpdateMaster() -> i32;
     pub fn sceNetAdhocGameModeUpdateReplica(id: i32, unk1: i32) -> i32;
     pub fn sceNetAdhocGameModeDeleteMaster() -> i32;
@@ -4412,10 +3946,7 @@
     ) -> i32;
     pub fn sceNetAdhocPtpFlush(id: i32, timeout: u32, nonblock: i32) -> i32;
     pub fn sceNetAdhocPtpClose(id: i32, unk1: i32) -> i32;
-    pub fn sceNetAdhocGetPtpStat(
-        size: *mut i32,
-        stat: *mut SceNetAdhocPtpStat,
-    ) -> i32;
+    pub fn sceNetAdhocGetPtpStat(size: *mut i32, stat: *mut SceNetAdhocPtpStat) -> i32;
 }
 
 extern "C" {
@@ -4449,10 +3980,7 @@
         opt_len: i32,
         opt_data: *mut c_void,
     ) -> i32;
-    pub fn sceNetAdhocMatchingCancelTarget(
-        matching_id: i32,
-        mac: *mut u8,
-    ) -> i32;
+    pub fn sceNetAdhocMatchingCancelTarget(matching_id: i32, mac: *mut u8) -> i32;
     pub fn sceNetAdhocMatchingCancelTargetWithOpt(
         matching_id: i32,
         mac: *mut u8,
@@ -4465,10 +3993,7 @@
         data_len: i32,
         data: *mut c_void,
     ) -> i32;
-    pub fn sceNetAdhocMatchingAbortSendData(
-        matching_id: i32,
-        mac: *mut u8,
-    ) -> i32;
+    pub fn sceNetAdhocMatchingAbortSendData(matching_id: i32, mac: *mut u8) -> i32;
     pub fn sceNetAdhocMatchingSetHelloOpt(
         matching_id: i32,
         opt_len: i32,
@@ -4485,21 +4010,14 @@
         buf: *mut c_void,
     ) -> i32;
     pub fn sceNetAdhocMatchingGetPoolMaxAlloc() -> i32;
-    pub fn sceNetAdhocMatchingGetPoolStat(poolstat: *mut AdhocPoolStat)
-    -> i32;
+    pub fn sceNetAdhocMatchingGetPoolStat(poolstat: *mut AdhocPoolStat) -> i32;
 }
 
 extern "C" {
     pub fn sceNetApctlInit(stack_size: i32, init_priority: i32) -> i32;
     pub fn sceNetApctlTerm() -> i32;
-    pub fn sceNetApctlGetInfo(
-        code: ApctlInfo,
-        pinfo: *mut SceNetApctlInfo,
-    ) -> i32;
-    pub fn sceNetApctlAddHandler(
-        handler: SceNetApctlHandler,
-        parg: *mut c_void,
-    ) -> i32;
+    pub fn sceNetApctlGetInfo(code: ApctlInfo, pinfo: *mut SceNetApctlInfo) -> i32;
+    pub fn sceNetApctlAddHandler(handler: SceNetApctlHandler, parg: *mut c_void) -> i32;
     pub fn sceNetApctlDelHandler(handler_id: i32) -> i32;
     pub fn sceNetApctlConnect(conn_index: i32) -> i32;
     pub fn sceNetApctlDisconnect() -> i32;
@@ -4507,21 +4025,9 @@
 
     pub fn sceNetInetInit() -> i32;
     pub fn sceNetInetTerm() -> i32;
-    pub fn sceNetInetAccept(
-        s: i32,
-        addr: *mut sockaddr,
-        addr_len: *mut socklen_t,
-    ) -> i32;
-    pub fn sceNetInetBind(
-        s: i32,
-        my_addr: *const sockaddr,
-        addr_len: socklen_t,
-    ) -> i32;
-    pub fn sceNetInetConnect(
-        s: i32,
-        serv_addr: *const sockaddr,
-        addr_len: socklen_t,
-    ) -> i32;
+    pub fn sceNetInetAccept(s: i32, addr: *mut sockaddr, addr_len: *mut socklen_t) -> i32;
+    pub fn sceNetInetBind(s: i32, my_addr: *const sockaddr, addr_len: socklen_t) -> i32;
+    pub fn sceNetInetConnect(s: i32, serv_addr: *const sockaddr, addr_len: socklen_t) -> i32;
     pub fn sceNetInetGetsockopt(
         s: i32,
         level: i32,
@@ -4530,12 +4036,7 @@
         optl_en: *mut socklen_t,
     ) -> i32;
     pub fn sceNetInetListen(s: i32, backlog: i32) -> i32;
-    pub fn sceNetInetRecv(
-        s: i32,
-        buf: *mut c_void,
-        len: usize,
-        flags: i32,
-    ) -> usize;
+    pub fn sceNetInetRecv(s: i32, buf: *mut c_void, len: usize, flags: i32) -> usize;
     pub fn sceNetInetRecvfrom(
         s: i32,
         buf: *mut c_void,
@@ -4544,12 +4045,7 @@
         from: *mut sockaddr,
         from_len: *mut socklen_t,
     ) -> usize;
-    pub fn sceNetInetSend(
-        s: i32,
-        buf: *const c_void,
-        len: usize,
-        flags: i32,
-    ) -> usize;
+    pub fn sceNetInetSend(s: i32, buf: *const c_void, len: usize, flags: i32) -> usize;
     pub fn sceNetInetSendto(
         s: i32,
         buf: *const c_void,
@@ -4577,11 +4073,7 @@
 
     pub fn sceHttpInit(unknown1: u32) -> i32;
     pub fn sceHttpEnd() -> i32;
-    pub fn sceHttpCreateTemplate(
-        agent: *mut u8,
-        unknown1: i32,
-        unknown2: i32,
-    ) -> i32;
+    pub fn sceHttpCreateTemplate(agent: *mut u8, unknown1: i32, unknown2: i32) -> i32;
     pub fn sceHttpDeleteTemplate(templateid: i32) -> i32;
     pub fn sceHttpCreateConnection(
         templateid: i32,
@@ -4590,11 +4082,7 @@
         port: u16,
         unknown2: i32,
     ) -> i32;
-    pub fn sceHttpCreateConnectionWithURL(
-        templateid: i32,
-        url: *const u8,
-        unknown1: i32,
-    ) -> i32;
+    pub fn sceHttpCreateConnectionWithURL(templateid: i32, url: *const u8, unknown1: i32) -> i32;
     pub fn sceHttpDeleteConnection(connection_id: i32) -> i32;
     pub fn sceHttpCreateRequest(
         connection_id: i32,
@@ -4609,23 +4097,11 @@
         content_length: u64,
     ) -> i32;
     pub fn sceHttpDeleteRequest(request_id: i32) -> i32;
-    pub fn sceHttpSendRequest(
-        request_id: i32,
-        data: *mut c_void,
-        data_size: u32,
-    ) -> i32;
+    pub fn sceHttpSendRequest(request_id: i32, data: *mut c_void, data_size: u32) -> i32;
     pub fn sceHttpAbortRequest(request_id: i32) -> i32;
-    pub fn sceHttpReadData(
-        request_id: i32,
-        data: *mut c_void,
-        data_size: u32,
-    ) -> i32;
-    pub fn sceHttpGetContentLength(
-        request_id: i32,
-        content_length: *mut u64,
-    ) -> i32;
-    pub fn sceHttpGetStatusCode(request_id: i32, status_code: *mut i32)
-    -> i32;
+    pub fn sceHttpReadData(request_id: i32, data: *mut c_void, data_size: u32) -> i32;
+    pub fn sceHttpGetContentLength(request_id: i32, content_length: *mut u64) -> i32;
+    pub fn sceHttpGetStatusCode(request_id: i32, status_code: *mut i32) -> i32;
     pub fn sceHttpSetResolveTimeOut(id: i32, timeout: u32) -> i32;
     pub fn sceHttpSetResolveRetry(id: i32, count: i32) -> i32;
     pub fn sceHttpSetConnectTimeOut(id: i32, timeout: u32) -> i32;
@@ -4639,19 +4115,9 @@
     pub fn sceHttpDisableCookie(id: i32) -> i32;
     pub fn sceHttpSaveSystemCookie() -> i32;
     pub fn sceHttpLoadSystemCookie() -> i32;
-    pub fn sceHttpAddExtraHeader(
-        id: i32,
-        name: *mut u8,
-        value: *mut u8,
-        unknown1: i32,
-    ) -> i32;
+    pub fn sceHttpAddExtraHeader(id: i32, name: *mut u8, value: *mut u8, unknown1: i32) -> i32;
     pub fn sceHttpDeleteHeader(id: i32, name: *const u8) -> i32;
-    pub fn sceHttpsInit(
-        unknown1: i32,
-        unknown2: i32,
-        unknown3: i32,
-        unknown4: i32,
-    ) -> i32;
+    pub fn sceHttpsInit(unknown1: i32, unknown2: i32, unknown3: i32, unknown4: i32) -> i32;
     pub fn sceHttpsEnd() -> i32;
     pub fn sceHttpsLoadDefaultCert(unknown1: i32, unknown2: i32) -> i32;
     pub fn sceHttpDisableAuth(id: i32) -> i32;
@@ -4659,11 +4125,7 @@
     pub fn sceHttpEnableAuth(id: i32) -> i32;
     pub fn sceHttpEnableCache(id: i32) -> i32;
     pub fn sceHttpEndCache() -> i32;
-    pub fn sceHttpGetAllHeader(
-        request: i32,
-        header: *mut *mut u8,
-        header_size: *mut u32,
-    ) -> i32;
+    pub fn sceHttpGetAllHeader(request: i32, header: *mut *mut u8, header_size: *mut u32) -> i32;
     pub fn sceHttpGetNetworkErrno(request: i32, err_num: *mut i32) -> i32;
     pub fn sceHttpGetProxy(
         id: i32,
@@ -4690,11 +4152,7 @@
     ) -> i32;
 
     pub fn sceNetResolverInit() -> i32;
-    pub fn sceNetResolverCreate(
-        rid: *mut i32,
-        buf: *mut c_void,
-        buf_length: u32,
-    ) -> i32;
+    pub fn sceNetResolverCreate(rid: *mut i32, buf: *mut c_void, buf_length: u32) -> i32;
     pub fn sceNetResolverDelete(rid: i32) -> i32;
     pub fn sceNetResolverStartNtoA(
         rid: i32,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/aarch64/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/aarch64/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/aarch64/align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/aarch64/align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+pub type mcontext_t = *mut __darwin_mcontext64;
+
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    pub struct max_align_t {
+        priv_: f64
+    }
+}
+
+s! {
+    pub struct ucontext_t {
+        pub uc_onstack: ::c_int,
+        pub uc_sigmask: ::sigset_t,
+        pub uc_stack: ::stack_t,
+        pub uc_link: *mut ::ucontext_t,
+        pub uc_mcsize: usize,
+        pub uc_mcontext: mcontext_t,
+    }
+
+    pub struct __darwin_mcontext64 {
+        pub __es: __darwin_arm_exception_state64,
+        pub __ss: __darwin_arm_thread_state64,
+        pub __ns: __darwin_arm_neon_state64,
+    }
+
+    pub struct __darwin_arm_exception_state64 {
+        pub __far: u64,
+        pub __esr: u32,
+        pub __exception: u32,
+    }
+
+    pub struct __darwin_arm_thread_state64 {
+        pub __x: [u64; 29],
+        pub __fp: u64,
+        pub __lr: u64,
+        pub __sp: u64,
+        pub __pc: u64,
+        pub __cpsr: u32,
+        pub __pad: u32,
+    }
+
+    #[repr(align(16))]
+    pub struct __darwin_arm_neon_state64 {
+        pub __v: [[u64; 2]; 32],
+        pub __fpsr: u32,
+        pub __fpcr: u32,
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/aarch64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/aarch64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/aarch64/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/aarch64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+pub type boolean_t = ::c_int;
+
+cfg_if! {
+    if #[cfg(libc_align)] {
+        mod align;
+        pub use self::align::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,8 +2,6 @@
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type boolean_t = ::c_uint;
-pub type mcontext_t = *mut __darwin_mcontext64;
 
 s! {
     pub struct timeval32 {
@@ -49,107 +47,6 @@
         pub bh_datalen: u32,
         pub bh_hdrlen: ::c_ushort,
     }
-
-    pub struct ucontext_t {
-        pub uc_onstack: ::c_int,
-        pub uc_sigmask: ::sigset_t,
-        pub uc_stack: ::stack_t,
-        pub uc_link: *mut ::ucontext_t,
-        pub uc_mcsize: usize,
-        pub uc_mcontext: mcontext_t,
-    }
-
-    pub struct __darwin_mcontext64 {
-        pub __es: __darwin_x86_exception_state64,
-        pub __ss: __darwin_x86_thread_state64,
-        pub __fs: __darwin_x86_float_state64,
-    }
-
-    pub struct __darwin_x86_exception_state64 {
-        pub __trapno: u16,
-        pub __cpu: u16,
-        pub __err: u32,
-        pub __faultvaddr: u64,
-    }
-
-    pub struct __darwin_x86_thread_state64 {
-        pub __rax: u64,
-        pub __rbx: u64,
-        pub __rcx: u64,
-        pub __rdx: u64,
-        pub __rdi: u64,
-        pub __rsi: u64,
-        pub __rbp: u64,
-        pub __rsp: u64,
-        pub __r8: u64,
-        pub __r9: u64,
-        pub __r10: u64,
-        pub __r11: u64,
-        pub __r12: u64,
-        pub __r13: u64,
-        pub __r14: u64,
-        pub __r15: u64,
-        pub __rip: u64,
-        pub __rflags: u64,
-        pub __cs: u64,
-        pub __fs: u64,
-        pub __gs: u64,
-    }
-
-    pub struct __darwin_x86_float_state64 {
-        pub __fpu_reserved: [::c_int; 2],
-        __fpu_fcw: ::c_short,
-        __fpu_fsw: ::c_short,
-        pub __fpu_ftw: u8,
-        pub __fpu_rsrv1: u8,
-        pub __fpu_fop: u16,
-        pub __fpu_ip: u32,
-        pub __fpu_cs: u16,
-        pub __fpu_rsrv2: u16,
-        pub __fpu_dp: u32,
-        pub __fpu_ds: u16,
-        pub __fpu_rsrv3: u16,
-        pub __fpu_mxcsr: u32,
-        pub __fpu_mxcsrmask: u32,
-        pub __fpu_stmm0: __darwin_mmst_reg,
-        pub __fpu_stmm1: __darwin_mmst_reg,
-        pub __fpu_stmm2: __darwin_mmst_reg,
-        pub __fpu_stmm3: __darwin_mmst_reg,
-        pub __fpu_stmm4: __darwin_mmst_reg,
-        pub __fpu_stmm5: __darwin_mmst_reg,
-        pub __fpu_stmm6: __darwin_mmst_reg,
-        pub __fpu_stmm7: __darwin_mmst_reg,
-        pub __fpu_xmm0: __darwin_xmm_reg,
-        pub __fpu_xmm1: __darwin_xmm_reg,
-        pub __fpu_xmm2: __darwin_xmm_reg,
-        pub __fpu_xmm3: __darwin_xmm_reg,
-        pub __fpu_xmm4: __darwin_xmm_reg,
-        pub __fpu_xmm5: __darwin_xmm_reg,
-        pub __fpu_xmm6: __darwin_xmm_reg,
-        pub __fpu_xmm7: __darwin_xmm_reg,
-        pub __fpu_xmm8: __darwin_xmm_reg,
-        pub __fpu_xmm9: __darwin_xmm_reg,
-        pub __fpu_xmm10: __darwin_xmm_reg,
-        pub __fpu_xmm11: __darwin_xmm_reg,
-        pub __fpu_xmm12: __darwin_xmm_reg,
-        pub __fpu_xmm13: __darwin_xmm_reg,
-        pub __fpu_xmm14: __darwin_xmm_reg,
-        pub __fpu_xmm15: __darwin_xmm_reg,
-        // this field is actually [u8; 96], but defining it with a bigger type
-        // allows us to auto-implement traits for it since the length of the
-        // array is less than 32
-        __fpu_rsrv4: [u32; 24],
-        pub __fpu_reserved1: ::c_int,
-    }
-
-    pub struct __darwin_mmst_reg {
-        pub __mmst_reg: [::c_char; 10],
-        pub __mmst_rsrv: [::c_char; 6],
-    }
-
-    pub struct __darwin_xmm_reg {
-        pub __xmm_reg: [::c_char; 16],
-    }
 }
 
 s_no_extra_traits! {
@@ -215,8 +112,13 @@
 }
 
 cfg_if! {
-    if #[cfg(libc_align)] {
-        mod align;
-        pub use self::align::*;
+    if #[cfg(target_arch = "x86_64")] {
+        mod x86_64;
+        pub use self::x86_64::*;
+    } else if #[cfg(target_arch = "aarch64")] {
+        mod aarch64;
+        pub use self::aarch64::*;
+    } else {
+        // Unknown target_arch
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/x86_64/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/x86_64/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/x86_64/align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/x86_64/align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    #[repr(align(16))]
+    pub struct max_align_t {
+        priv_: [f64; 2]
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/x86_64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/x86_64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/x86_64/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/b64/x86_64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,112 @@
+pub type boolean_t = ::c_uint;
+pub type mcontext_t = *mut __darwin_mcontext64;
+
+s! {
+    pub struct ucontext_t {
+        pub uc_onstack: ::c_int,
+        pub uc_sigmask: ::sigset_t,
+        pub uc_stack: ::stack_t,
+        pub uc_link: *mut ::ucontext_t,
+        pub uc_mcsize: usize,
+        pub uc_mcontext: mcontext_t,
+    }
+
+    pub struct __darwin_mcontext64 {
+        pub __es: __darwin_x86_exception_state64,
+        pub __ss: __darwin_x86_thread_state64,
+        pub __fs: __darwin_x86_float_state64,
+    }
+
+    pub struct __darwin_x86_exception_state64 {
+        pub __trapno: u16,
+        pub __cpu: u16,
+        pub __err: u32,
+        pub __faultvaddr: u64,
+    }
+
+    pub struct __darwin_x86_thread_state64 {
+        pub __rax: u64,
+        pub __rbx: u64,
+        pub __rcx: u64,
+        pub __rdx: u64,
+        pub __rdi: u64,
+        pub __rsi: u64,
+        pub __rbp: u64,
+        pub __rsp: u64,
+        pub __r8: u64,
+        pub __r9: u64,
+        pub __r10: u64,
+        pub __r11: u64,
+        pub __r12: u64,
+        pub __r13: u64,
+        pub __r14: u64,
+        pub __r15: u64,
+        pub __rip: u64,
+        pub __rflags: u64,
+        pub __cs: u64,
+        pub __fs: u64,
+        pub __gs: u64,
+    }
+
+    pub struct __darwin_x86_float_state64 {
+        pub __fpu_reserved: [::c_int; 2],
+        __fpu_fcw: ::c_short,
+        __fpu_fsw: ::c_short,
+        pub __fpu_ftw: u8,
+        pub __fpu_rsrv1: u8,
+        pub __fpu_fop: u16,
+        pub __fpu_ip: u32,
+        pub __fpu_cs: u16,
+        pub __fpu_rsrv2: u16,
+        pub __fpu_dp: u32,
+        pub __fpu_ds: u16,
+        pub __fpu_rsrv3: u16,
+        pub __fpu_mxcsr: u32,
+        pub __fpu_mxcsrmask: u32,
+        pub __fpu_stmm0: __darwin_mmst_reg,
+        pub __fpu_stmm1: __darwin_mmst_reg,
+        pub __fpu_stmm2: __darwin_mmst_reg,
+        pub __fpu_stmm3: __darwin_mmst_reg,
+        pub __fpu_stmm4: __darwin_mmst_reg,
+        pub __fpu_stmm5: __darwin_mmst_reg,
+        pub __fpu_stmm6: __darwin_mmst_reg,
+        pub __fpu_stmm7: __darwin_mmst_reg,
+        pub __fpu_xmm0: __darwin_xmm_reg,
+        pub __fpu_xmm1: __darwin_xmm_reg,
+        pub __fpu_xmm2: __darwin_xmm_reg,
+        pub __fpu_xmm3: __darwin_xmm_reg,
+        pub __fpu_xmm4: __darwin_xmm_reg,
+        pub __fpu_xmm5: __darwin_xmm_reg,
+        pub __fpu_xmm6: __darwin_xmm_reg,
+        pub __fpu_xmm7: __darwin_xmm_reg,
+        pub __fpu_xmm8: __darwin_xmm_reg,
+        pub __fpu_xmm9: __darwin_xmm_reg,
+        pub __fpu_xmm10: __darwin_xmm_reg,
+        pub __fpu_xmm11: __darwin_xmm_reg,
+        pub __fpu_xmm12: __darwin_xmm_reg,
+        pub __fpu_xmm13: __darwin_xmm_reg,
+        pub __fpu_xmm14: __darwin_xmm_reg,
+        pub __fpu_xmm15: __darwin_xmm_reg,
+        // this field is actually [u8; 96], but defining it with a bigger type
+        // allows us to auto-implement traits for it since the length of the
+        // array is less than 32
+        __fpu_rsrv4: [u32; 24],
+        pub __fpu_reserved1: ::c_int,
+    }
+
+    pub struct __darwin_mmst_reg {
+        pub __mmst_reg: [::c_char; 10],
+        pub __mmst_rsrv: [::c_char; 6],
+    }
+
+    pub struct __darwin_xmm_reg {
+        pub __xmm_reg: [::c_char; 16],
+    }
+}
+
+cfg_if! {
+    if #[cfg(libc_align)] {
+        mod align;
+        pub use self::align::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/apple/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -26,6 +26,10 @@
 pub type integer_t = ::c_int;
 pub type cpu_type_t = integer_t;
 pub type cpu_subtype_t = integer_t;
+pub type natural_t = u32;
+pub type mach_msg_type_number_t = natural_t;
+pub type kern_return_t = ::c_int;
+pub type uuid_t = [u8; 16];
 
 pub type posix_spawnattr_t = *mut ::c_void;
 pub type posix_spawn_file_actions_t = *mut ::c_void;
@@ -36,9 +40,68 @@
 pub type sae_connid_t = u32;
 
 pub type mach_port_t = ::c_uint;
+pub type processor_flavor_t = ::c_int;
+pub type thread_flavor_t = natural_t;
+pub type thread_inspect_t = mach_port_t;
+pub type policy_t = ::c_int;
+pub type mach_vm_address_t = u64;
+pub type mach_vm_offset_t = u64;
+pub type mach_vm_size_t = u64;
+pub type vm_map_t = ::mach_port_t;
+pub type mem_entry_name_port_t = ::mach_port_t;
+pub type memory_object_t = ::mach_port_t;
+pub type memory_object_offset_t = ::c_ulonglong;
+pub type vm_inherit_t = ::c_uint;
+pub type vm_prot_t = ::c_int;
+
+pub type iconv_t = *mut ::c_void;
+
+pub type processor_cpu_load_info_t = *mut processor_cpu_load_info;
+pub type processor_cpu_load_info_data_t = processor_cpu_load_info;
+pub type processor_basic_info_t = *mut processor_basic_info;
+pub type processor_basic_info_data_t = processor_basic_info;
+pub type processor_set_basic_info_data_t = processor_set_basic_info;
+pub type processor_set_basic_info_t = *mut processor_set_basic_info;
+pub type processor_set_load_info_data_t = processor_set_load_info;
+pub type processor_set_load_info_t = *mut processor_set_load_info;
+pub type processor_info_t = *mut integer_t;
+pub type processor_info_array_t = *mut integer_t;
+
+pub type thread_info_t = *mut integer_t;
+pub type thread_basic_info_t = *mut thread_basic_info;
+pub type thread_basic_info_data_t = thread_basic_info;
+pub type thread_identifier_info_t = *mut thread_identifier_info;
+pub type thread_identifier_info_data_t = thread_identifier_info;
+pub type thread_extended_info_t = *mut thread_extended_info;
+pub type thread_extended_info_data_t = thread_extended_info;
+
+pub type thread_t = mach_port_t;
+pub type thread_policy_flavor_t = natural_t;
+pub type thread_policy_t = *mut integer_t;
+pub type thread_latency_qos_t = integer_t;
+pub type thread_throughput_qos_t = integer_t;
+pub type thread_standard_policy_data_t = thread_standard_policy;
+pub type thread_standard_policy_t = *mut thread_standard_policy;
+pub type thread_extended_policy_data_t = thread_extended_policy;
+pub type thread_extended_policy_t = *mut thread_extended_policy;
+pub type thread_time_constraint_policy_data_t = thread_time_constraint_policy;
+pub type thread_time_constraint_policy_t = *mut thread_time_constraint_policy;
+pub type thread_precedence_policy_data_t = thread_precedence_policy;
+pub type thread_precedence_policy_t = *mut thread_precedence_policy;
+pub type thread_affinity_policy_data_t = thread_affinity_policy;
+pub type thread_affinity_policy_t = *mut thread_affinity_policy;
+pub type thread_background_policy_data_t = thread_background_policy;
+pub type thread_background_policy_t = *mut thread_background_policy;
+pub type thread_latency_qos_policy_data_t = thread_latency_qos_policy;
+pub type thread_latency_qos_policy_t = *mut thread_latency_qos_policy;
+pub type thread_throughput_qos_policy_data_t = thread_throughput_qos_policy;
+pub type thread_throughput_qos_policy_t = *mut thread_throughput_qos_policy;
+
+pub type CCStatus = i32;
+pub type CCCryptorStatus = i32;
+pub type CCRNGStatus = ::CCCryptorStatus;
 
 deprecated_mach! {
-    pub type vm_prot_t = ::c_int;
     pub type vm_size_t = ::uintptr_t;
     pub type mach_timebase_info_data_t = mach_timebase_info;
 }
@@ -52,6 +115,23 @@
     }
 }
 
+#[cfg_attr(feature = "extra_traits", derive(Debug))]
+#[repr(u32)]
+pub enum qos_class_t {
+    QOS_CLASS_USER_INTERACTIVE = 0x21,
+    QOS_CLASS_USER_INITIATED = 0x19,
+    QOS_CLASS_DEFAULT = 0x15,
+    QOS_CLASS_UTILITY = 0x11,
+    QOS_CLASS_BACKGROUND = 0x09,
+    QOS_CLASS_UNSPECIFIED = 0x00,
+}
+impl ::Copy for qos_class_t {}
+impl ::Clone for qos_class_t {
+    fn clone(&self) -> qos_class_t {
+        *self
+    }
+}
+
 s! {
     pub struct ip_mreq {
         pub imr_multiaddr: in_addr,
@@ -537,6 +617,110 @@
         pub tai: ::c_long,
         pub time_state: ::c_int,
     }
+
+    pub struct thread_standard_policy {
+        pub no_data: natural_t,
+    }
+
+    pub struct thread_extended_policy {
+        pub timeshare: boolean_t,
+    }
+
+    pub struct thread_time_constraint_policy {
+        pub period: u32,
+        pub computation: u32,
+        pub constraint: u32,
+        pub preemptible: boolean_t,
+    }
+
+    pub struct thread_precedence_policy {
+        pub importance: integer_t,
+    }
+
+    pub struct thread_affinity_policy {
+        pub affinity_tag: integer_t,
+    }
+
+    pub struct thread_background_policy {
+        pub priority: integer_t,
+    }
+
+    pub struct thread_latency_qos_policy {
+        pub thread_latency_qos_tier: thread_latency_qos_t,
+    }
+
+    pub struct thread_throughput_qos_policy {
+        pub thread_throughput_qos_tier: thread_throughput_qos_t,
+    }
+
+    // malloc/malloc.h
+    pub struct malloc_statistics_t {
+        pub blocks_in_use: ::c_uint,
+        pub size_in_use: ::size_t,
+        pub max_size_in_use: ::size_t,
+        pub size_allocated: ::size_t,
+    }
+
+    pub struct mstats {
+        pub bytes_total: ::size_t,
+        pub chunks_used: ::size_t,
+        pub bytes_used: ::size_t,
+        pub chunks_free: ::size_t,
+        pub bytes_free: ::size_t,
+    }
+
+    pub struct malloc_zone_t {
+        __private: [::uintptr_t; 18], // FIXME: keeping private for now
+    }
+
+    // sched.h
+    pub struct sched_param {
+        pub sched_priority: ::c_int,
+        __opaque: [::c_char; 4],
+    }
+
+    pub struct vinfo_stat {
+        pub vst_dev: u32,
+        pub vst_mode: u16,
+        pub vst_nlink: u16,
+        pub vst_ino: u64,
+        pub vst_uid: ::uid_t,
+        pub vst_gid: ::gid_t,
+        pub vst_atime: i64,
+        pub vst_atimensec: i64,
+        pub vst_mtime: i64,
+        pub vst_mtimensec: i64,
+        pub vst_ctime: i64,
+        pub vst_ctimensec: i64,
+        pub vst_birthtime: i64,
+        pub vst_birthtimensec: i64,
+        pub vst_size: ::off_t,
+        pub vst_blocks: i64,
+        pub vst_blksize: i32,
+        pub vst_flags: u32,
+        pub vst_gen: u32,
+        pub vst_rdev: u32,
+        pub vst_qspare: [i64; 2],
+    }
+
+    pub struct vnode_info {
+        pub vi_stat: vinfo_stat,
+        pub vi_type: ::c_int,
+        pub vi_pad: ::c_int,
+        pub vi_fsid: ::fsid_t,
+    }
+
+    pub struct vnode_info_path {
+        pub vip_vi: vnode_info,
+        // Normally it's `vip_path: [::c_char; MAXPATHLEN]` but because libc supports an old rustc
+        // version, we go around this limitation like this.
+        pub vip_path: [[::c_char; 32]; 32],
+    }
+
+    pub struct proc_vnodepathinfo {
+        pub pvi_cdir: vnode_info_path,
+        pub pvi_rdir: vnode_info_path,
+    }
 }
 
 s_no_extra_traits! {
@@ -660,6 +844,66 @@
         __unused1: *mut ::c_void,       //actually a function pointer
         pub sigev_notify_attributes: *mut ::pthread_attr_t
     }
+
+    pub struct processor_cpu_load_info {
+        pub cpu_ticks: [::c_uint; CPU_STATE_MAX as usize],
+    }
+
+    pub struct processor_basic_info {
+        pub cpu_type: cpu_type_t,
+        pub cpu_subtype: cpu_subtype_t,
+        pub running: ::boolean_t,
+        pub slot_num: ::c_int,
+        pub is_master: ::boolean_t,
+    }
+
+    pub struct processor_set_basic_info {
+        pub processor_count: ::c_int,
+        pub default_policy: ::c_int,
+    }
+
+    pub struct processor_set_load_info {
+        pub task_count: ::c_int,
+        pub thread_count: ::c_int,
+        pub load_average: integer_t,
+        pub mach_factor: integer_t,
+    }
+
+    pub struct time_value_t {
+        pub seconds: integer_t,
+        pub microseconds: integer_t,
+    }
+
+    pub struct thread_basic_info {
+        pub user_time: time_value_t,
+        pub system_time: time_value_t,
+        pub cpu_usage: ::integer_t,
+        pub policy: ::policy_t,
+        pub run_state: ::integer_t,
+        pub flags: ::integer_t,
+        pub suspend_count: ::integer_t,
+        pub sleep_time: ::integer_t,
+    }
+
+    pub struct thread_identifier_info {
+        pub thread_id: u64,
+        pub thread_handle: u64,
+        pub dispatch_qaddr: u64,
+    }
+
+    pub struct thread_extended_info {
+        pub pth_user_time: u64,
+        pub pth_system_time: u64,
+        pub pth_cpu_usage: i32,
+        pub pth_policy: i32,
+        pub pth_run_state: i32,
+        pub pth_flags: i32,
+        pub pth_sleep_time: i32,
+        pub pth_curpri: i32,
+        pub pth_priority: i32,
+        pub pth_maxpriority: i32,
+        pub pth_name: [::c_char; MAXTHREADNAMESIZE],
+    }
 }
 
 impl siginfo_t {
@@ -690,6 +934,10 @@
     pub unsafe fn si_uid(&self) -> ::uid_t {
         self.si_uid
     }
+
+    pub unsafe fn si_status(&self) -> ::c_int {
+        self.si_status
+    }
 }
 
 cfg_if! {
@@ -1270,6 +1518,242 @@
                 self.sigev_notify_attributes.hash(state);
             }
         }
+
+        impl PartialEq for processor_cpu_load_info {
+            fn eq(&self, other: &processor_cpu_load_info) -> bool {
+                self.cpu_ticks == other.cpu_ticks
+            }
+        }
+        impl Eq for processor_cpu_load_info {}
+        impl ::fmt::Debug for processor_cpu_load_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("processor_cpu_load_info")
+                    .field("cpu_ticks", &self.cpu_ticks)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for processor_cpu_load_info {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.cpu_ticks.hash(state);
+            }
+        }
+
+        impl PartialEq for processor_basic_info {
+            fn eq(&self, other: &processor_basic_info) -> bool {
+                self.cpu_type == other.cpu_type
+                    && self.cpu_subtype == other.cpu_subtype
+                    && self.running == other.running
+                    && self.slot_num == other.slot_num
+                    && self.is_master == other.is_master
+            }
+        }
+        impl Eq for processor_basic_info {}
+        impl ::fmt::Debug for processor_basic_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("processor_basic_info")
+                    .field("cpu_type", &self.cpu_type)
+                    .field("cpu_subtype", &self.cpu_subtype)
+                    .field("running", &self.running)
+                    .field("slot_num", &self.slot_num)
+                    .field("is_master", &self.is_master)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for processor_basic_info {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.cpu_type.hash(state);
+                self.cpu_subtype.hash(state);
+                self.running.hash(state);
+                self.slot_num.hash(state);
+                self.is_master.hash(state);
+            }
+        }
+
+        impl PartialEq for processor_set_basic_info {
+            fn eq(&self, other: &processor_set_basic_info) -> bool {
+                self.processor_count == other.processor_count
+                    && self.default_policy == other.default_policy
+            }
+        }
+        impl Eq for processor_set_basic_info {}
+        impl ::fmt::Debug for processor_set_basic_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("processor_set_basic_info")
+                    .field("processor_count", &self.processor_count)
+                    .field("default_policy", &self.default_policy)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for processor_set_basic_info {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.processor_count.hash(state);
+                self.default_policy.hash(state);
+            }
+        }
+
+        impl PartialEq for processor_set_load_info {
+            fn eq(&self, other: &processor_set_load_info) -> bool {
+                self.task_count == other.task_count
+                    && self.thread_count == other.thread_count
+                    && self.load_average == other.load_average
+                    && self.mach_factor == other.mach_factor
+            }
+        }
+        impl Eq for processor_set_load_info {}
+        impl ::fmt::Debug for processor_set_load_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("processor_set_load_info")
+                    .field("task_count", &self.task_count)
+                    .field("thread_count", &self.thread_count)
+                    .field("load_average", &self.load_average)
+                    .field("mach_factor", &self.mach_factor)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for processor_set_load_info {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.task_count.hash(state);
+                self.thread_count.hash(state);
+                self.load_average.hash(state);
+                self.mach_factor.hash(state);
+            }
+        }
+
+        impl PartialEq for time_value_t {
+            fn eq(&self, other: &time_value_t) -> bool {
+                self.seconds == other.seconds
+                    && self.microseconds == other.microseconds
+            }
+        }
+        impl Eq for time_value_t {}
+        impl ::fmt::Debug for time_value_t {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("time_value_t")
+                    .field("seconds", &self.seconds)
+                    .field("microseconds", &self.microseconds)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for time_value_t {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.seconds.hash(state);
+                self.microseconds.hash(state);
+            }
+        }
+        impl PartialEq for thread_basic_info {
+            fn eq(&self, other: &thread_basic_info) -> bool {
+                self.user_time == other.user_time
+                    && self.system_time == other.system_time
+                    && self.cpu_usage == other.cpu_usage
+                    && self.policy == other.policy
+                    && self.run_state == other.run_state
+                    && self.flags == other.flags
+                    && self.suspend_count == other.suspend_count
+                    && self.sleep_time == other.sleep_time
+            }
+        }
+        impl Eq for thread_basic_info {}
+        impl ::fmt::Debug for thread_basic_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("thread_basic_info")
+                    .field("user_time", &self.user_time)
+                    .field("system_time", &self.system_time)
+                    .field("cpu_usage", &self.cpu_usage)
+                    .field("policy", &self.policy)
+                    .field("run_state", &self.run_state)
+                    .field("flags", &self.flags)
+                    .field("suspend_count", &self.suspend_count)
+                    .field("sleep_time", &self.sleep_time)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for thread_basic_info {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.user_time.hash(state);
+                self.system_time.hash(state);
+                self.cpu_usage.hash(state);
+                self.policy.hash(state);
+                self.run_state.hash(state);
+                self.flags.hash(state);
+                self.suspend_count.hash(state);
+                self.sleep_time.hash(state);
+            }
+        }
+        impl PartialEq for thread_extended_info {
+            fn eq(&self, other: &thread_extended_info) -> bool {
+                self.pth_user_time == other.pth_user_time
+                    && self.pth_system_time == other.pth_system_time
+                    && self.pth_cpu_usage == other.pth_cpu_usage
+                    && self.pth_policy == other.pth_policy
+                    && self.pth_run_state == other.pth_run_state
+                    && self.pth_flags == other.pth_flags
+                    && self.pth_sleep_time == other.pth_sleep_time
+                    && self.pth_curpri == other.pth_curpri
+                    && self.pth_priority == other.pth_priority
+                    && self.pth_maxpriority == other.pth_maxpriority
+                    && self.pth_name
+                           .iter()
+                           .zip(other.pth_name.iter())
+                           .all(|(a,b)| a == b)
+            }
+        }
+        impl Eq for thread_extended_info {}
+        impl ::fmt::Debug for thread_extended_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("proc_threadinfo")
+                    .field("pth_user_time", &self.pth_user_time)
+                    .field("pth_system_time", &self.pth_system_time)
+                    .field("pth_cpu_usage", &self.pth_cpu_usage)
+                    .field("pth_policy", &self.pth_policy)
+                    .field("pth_run_state", &self.pth_run_state)
+                    .field("pth_flags", &self.pth_flags)
+                    .field("pth_sleep_time", &self.pth_sleep_time)
+                    .field("pth_curpri", &self.pth_curpri)
+                    .field("pth_priority", &self.pth_priority)
+                    .field("pth_maxpriority", &self.pth_maxpriority)
+                      // FIXME: .field("pth_name", &self.pth_name)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for thread_extended_info {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.pth_user_time.hash(state);
+                self.pth_system_time.hash(state);
+                self.pth_cpu_usage.hash(state);
+                self.pth_policy.hash(state);
+                self.pth_run_state.hash(state);
+                self.pth_flags.hash(state);
+                self.pth_sleep_time.hash(state);
+                self.pth_curpri.hash(state);
+                self.pth_priority.hash(state);
+                self.pth_maxpriority.hash(state);
+                self.pth_name.hash(state);
+            }
+        }
+        impl PartialEq for thread_identifier_info {
+            fn eq(&self, other: &thread_identifier_info) -> bool {
+                self.thread_id == other.thread_id
+                    && self.thread_handle == other.thread_handle
+                    && self.dispatch_qaddr == other.dispatch_qaddr
+            }
+        }
+        impl Eq for thread_identifier_info {}
+        impl ::fmt::Debug for thread_identifier_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("thread_identifier_info")
+                    .field("thread_id", &self.thread_id)
+                    .field("thread_handle", &self.thread_handle)
+                    .field("dispatch_qaddr", &self.dispatch_qaddr)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for thread_identifier_info {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.thread_id.hash(state);
+                self.thread_handle.hash(state);
+                self.dispatch_qaddr.hash(state);
+            }
+        }
     }
 }
 
@@ -1489,6 +1973,19 @@
 pub const MAP_ANON: ::c_int = 0x1000;
 pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
 
+pub const CPU_STATE_USER: ::c_int = 0;
+pub const CPU_STATE_SYSTEM: ::c_int = 1;
+pub const CPU_STATE_IDLE: ::c_int = 2;
+pub const CPU_STATE_NICE: ::c_int = 3;
+pub const CPU_STATE_MAX: ::c_int = 4;
+
+pub const PROCESSOR_BASIC_INFO: ::c_int = 1;
+pub const PROCESSOR_CPU_LOAD_INFO: ::c_int = 2;
+pub const PROCESSOR_PM_REGS_INFO: ::c_int = 0x10000001;
+pub const PROCESSOR_TEMPERATURE: ::c_int = 0x10000002;
+pub const PROCESSOR_SET_LOAD_INFO: ::c_int = 4;
+pub const PROCESSOR_SET_BASIC_INFO: ::c_int = 5;
+
 deprecated_mach! {
     pub const VM_FLAGS_FIXED: ::c_int = 0x0000;
     pub const VM_FLAGS_ANYWHERE: ::c_int = 0x0001;
@@ -1903,6 +2400,9 @@
 pub const PTHREAD_PROCESS_SHARED: ::c_int = 1;
 pub const PTHREAD_CREATE_JOINABLE: ::c_int = 1;
 pub const PTHREAD_CREATE_DETACHED: ::c_int = 2;
+#[cfg(target_arch = "aarch64")]
+pub const PTHREAD_STACK_MIN: ::size_t = 16384;
+#[cfg(not(target_arch = "aarch64"))]
 pub const PTHREAD_STACK_MIN: ::size_t = 8192;
 
 pub const RLIMIT_CPU: ::c_int = 0;
@@ -2255,6 +2755,7 @@
 pub const IP_ADD_MEMBERSHIP: ::c_int = 12;
 pub const IP_DROP_MEMBERSHIP: ::c_int = 13;
 pub const IP_RECVIF: ::c_int = 20;
+pub const IP_BOUND_IF: ::c_int = 25;
 pub const IP_PKTINFO: ::c_int = 26;
 pub const IP_RECVTOS: ::c_int = 27;
 pub const IPV6_JOIN_GROUP: ::c_int = 12;
@@ -2316,6 +2817,7 @@
 pub const SO_NWRITE: ::c_int = 0x1024;
 pub const SO_REUSESHAREUID: ::c_int = 0x1025;
 pub const SO_NOTIFYCONFLICT: ::c_int = 0x1026;
+pub const SO_LINGER_SEC: ::c_int = 0x1080;
 pub const SO_RANDOMPORT: ::c_int = 0x1082;
 pub const SO_NP_EXTENSIONS: ::c_int = 0x1083;
 
@@ -2799,6 +3301,59 @@
 pub const KERN_PROC_UID: ::c_int = 5;
 pub const KERN_PROC_RUID: ::c_int = 6;
 pub const KERN_PROC_LCID: ::c_int = 7;
+pub const KERN_SUCCESS: ::c_int = 0;
+pub const KERN_INVALID_ADDRESS: ::c_int = 1;
+pub const KERN_PROTECTION_FAILURE: ::c_int = 2;
+pub const KERN_NO_SPACE: ::c_int = 3;
+pub const KERN_INVALID_ARGUMENT: ::c_int = 4;
+pub const KERN_FAILURE: ::c_int = 5;
+pub const KERN_RESOURCE_SHORTAGE: ::c_int = 6;
+pub const KERN_NOT_RECEIVER: ::c_int = 7;
+pub const KERN_NO_ACCESS: ::c_int = 8;
+pub const KERN_MEMORY_FAILURE: ::c_int = 9;
+pub const KERN_MEMORY_ERROR: ::c_int = 10;
+pub const KERN_ALREADY_IN_SET: ::c_int = 11;
+pub const KERN_NOT_IN_SET: ::c_int = 12;
+pub const KERN_NAME_EXISTS: ::c_int = 13;
+pub const KERN_ABORTED: ::c_int = 14;
+pub const KERN_INVALID_NAME: ::c_int = 15;
+pub const KERN_INVALID_TASK: ::c_int = 16;
+pub const KERN_INVALID_RIGHT: ::c_int = 17;
+pub const KERN_INVALID_VALUE: ::c_int = 18;
+pub const KERN_UREFS_OVERFLOW: ::c_int = 19;
+pub const KERN_INVALID_CAPABILITY: ::c_int = 20;
+pub const KERN_RIGHT_EXISTS: ::c_int = 21;
+pub const KERN_INVALID_HOST: ::c_int = 22;
+pub const KERN_MEMORY_PRESENT: ::c_int = 23;
+pub const KERN_MEMORY_DATA_MOVED: ::c_int = 24;
+pub const KERN_MEMORY_RESTART_COPY: ::c_int = 25;
+pub const KERN_INVALID_PROCESSOR_SET: ::c_int = 26;
+pub const KERN_POLICY_LIMIT: ::c_int = 27;
+pub const KERN_INVALID_POLICY: ::c_int = 28;
+pub const KERN_INVALID_OBJECT: ::c_int = 29;
+pub const KERN_ALREADY_WAITING: ::c_int = 30;
+pub const KERN_DEFAULT_SET: ::c_int = 31;
+pub const KERN_EXCEPTION_PROTECTED: ::c_int = 32;
+pub const KERN_INVALID_LEDGER: ::c_int = 33;
+pub const KERN_INVALID_MEMORY_CONTROL: ::c_int = 34;
+pub const KERN_INVALID_SECURITY: ::c_int = 35;
+pub const KERN_NOT_DEPRESSED: ::c_int = 36;
+pub const KERN_TERMINATED: ::c_int = 37;
+pub const KERN_LOCK_SET_DESTROYED: ::c_int = 38;
+pub const KERN_LOCK_UNSTABLE: ::c_int = 39;
+pub const KERN_LOCK_OWNED: ::c_int = 40;
+pub const KERN_LOCK_OWNED_SELF: ::c_int = 41;
+pub const KERN_SEMAPHORE_DESTROYED: ::c_int = 42;
+pub const KERN_RPC_SERVER_TERMINATED: ::c_int = 43;
+pub const KERN_RPC_TERMINATE_ORPHAN: ::c_int = 44;
+pub const KERN_RPC_CONTINUE_ORPHAN: ::c_int = 45;
+pub const KERN_NOT_SUPPORTED: ::c_int = 46;
+pub const KERN_NODE_DOWN: ::c_int = 47;
+pub const KERN_NOT_WAITING: ::c_int = 48;
+pub const KERN_OPERATION_TIMED_OUT: ::c_int = 49;
+pub const KERN_CODESIGN_ERROR: ::c_int = 50;
+pub const KERN_POLICY_STATIC: ::c_int = 51;
+pub const KERN_INSUFFICIENT_BUFFER_SIZE: ::c_int = 52;
 pub const KIPC_MAXSOCKBUF: ::c_int = 1;
 pub const KIPC_SOCKBUF_WASTE: ::c_int = 2;
 pub const KIPC_SOMAXCONN: ::c_int = 3;
@@ -2814,6 +3369,11 @@
 pub const VM_MACHFACTOR: ::c_int = 4;
 pub const VM_SWAPUSAGE: ::c_int = 5;
 pub const VM_MAXID: ::c_int = 6;
+pub const VM_PROT_NONE: ::vm_prot_t = 0x00;
+pub const VM_PROT_READ: ::vm_prot_t = 0x01;
+pub const VM_PROT_WRITE: ::vm_prot_t = 0x02;
+pub const VM_PROT_EXECUTE: ::vm_prot_t = 0x04;
+pub const MEMORY_OBJECT_NULL: ::memory_object_t = 0;
 pub const HW_MACHINE: ::c_int = 1;
 pub const HW_MODEL: ::c_int = 2;
 pub const HW_NCPU: ::c_int = 3;
@@ -2839,7 +3399,9 @@
 pub const HW_TB_FREQ: ::c_int = 23;
 pub const HW_MEMSIZE: ::c_int = 24;
 pub const HW_AVAILCPU: ::c_int = 25;
-pub const HW_MAXID: ::c_int = 26;
+pub const HW_TARGET: ::c_int = 26;
+pub const HW_PRODUCT: ::c_int = 27;
+pub const HW_MAXID: ::c_int = 28;
 pub const USER_CS_PATH: ::c_int = 1;
 pub const USER_BC_BASE_MAX: ::c_int = 2;
 pub const USER_BC_DIM_MAX: ::c_int = 3;
@@ -2876,11 +3438,8 @@
 pub const AI_CANONNAME: ::c_int = 0x00000002;
 pub const AI_NUMERICHOST: ::c_int = 0x00000004;
 pub const AI_NUMERICSERV: ::c_int = 0x00001000;
-pub const AI_MASK: ::c_int = AI_PASSIVE
-    | AI_CANONNAME
-    | AI_NUMERICHOST
-    | AI_NUMERICSERV
-    | AI_ADDRCONFIG;
+pub const AI_MASK: ::c_int =
+    AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | AI_ADDRCONFIG;
 pub const AI_ALL: ::c_int = 0x00000100;
 pub const AI_V4MAPPED_CFG: ::c_int = 0x00000200;
 pub const AI_ADDRCONFIG: ::c_int = 0x00000400;
@@ -3014,8 +3573,11 @@
 pub const KERN_PROCARGS2: ::c_int = 49;
 
 pub const PROC_PIDTASKALLINFO: ::c_int = 2;
+pub const PROC_PIDTBSDINFO: ::c_int = 3;
 pub const PROC_PIDTASKINFO: ::c_int = 4;
 pub const PROC_PIDTHREADINFO: ::c_int = 5;
+pub const PROC_PIDVNODEPATHINFO: ::c_int = 9;
+pub const PROC_PIDPATHINFO_MAXSIZE: ::c_int = 4096;
 pub const MAXCOMLEN: usize = 16;
 pub const MAXTHREADNAMESIZE: usize = 64;
 
@@ -3052,18 +3614,10 @@
 pub const BPF_ALIGNMENT: ::c_int = 4;
 
 // sys/mount.h
-pub const MNT_RDONLY: ::c_int = 0x00000001;
-pub const MNT_SYNCHRONOUS: ::c_int = 0x00000002;
-pub const MNT_NOEXEC: ::c_int = 0x00000004;
-pub const MNT_NOSUID: ::c_int = 0x00000008;
 pub const MNT_NODEV: ::c_int = 0x00000010;
 pub const MNT_UNION: ::c_int = 0x00000020;
-pub const MNT_ASYNC: ::c_int = 0x00000040;
 pub const MNT_CPROTECT: ::c_int = 0x00000080;
 
-// NFS export related mount flags.
-pub const MNT_EXPORTED: ::c_int = 0x00000100;
-
 // MAC labeled / "quarantined" flag
 pub const MNT_QUARANTINE: ::c_int = 0x00000400;
 
@@ -3084,9 +3638,7 @@
 pub const MNT_SNAPSHOT: ::c_int = 0x40000000;
 
 // External filesystem command modifier flags.
-pub const MNT_UPDATE: ::c_int = 0x00010000;
 pub const MNT_NOBLOCK: ::c_int = 0x00020000;
-pub const MNT_RELOAD: ::c_int = 0x00040000;
 
 // sys/spawn.h:
 pub const POSIX_SPAWN_RESETIDS: ::c_int = 0x01;
@@ -3125,6 +3677,9 @@
 // sys/shm.h
 pub const SHM_RDONLY: ::c_int = 0x1000;
 pub const SHM_RND: ::c_int = 0x2000;
+#[cfg(target_arch = "aarch64")]
+pub const SHMLBA: ::c_int = 16 * 1024;
+#[cfg(not(target_arch = "aarch64"))]
 pub const SHMLBA: ::c_int = 4096;
 pub const SHM_R: ::c_int = IPC_R;
 pub const SHM_W: ::c_int = IPC_W;
@@ -3195,17 +3750,107 @@
 pub const TIME_WAIT: ::c_int = 4;
 pub const TIME_ERROR: ::c_int = 5;
 
+// <sys/mount.h>
+pub const MNT_WAIT: ::c_int = 1;
+pub const MNT_NOWAIT: ::c_int = 2;
+
+// <mach/thread_policy.h>
+pub const THREAD_STANDARD_POLICY: ::c_int = 1;
+pub const THREAD_STANDARD_POLICY_COUNT: ::c_int = 0;
+pub const THREAD_EXTENDED_POLICY: ::c_int = 1;
+pub const THREAD_TIME_CONSTRAINT_POLICY: ::c_int = 2;
+pub const THREAD_PRECEDENCE_POLICY: ::c_int = 3;
+pub const THREAD_AFFINITY_POLICY: ::c_int = 4;
+pub const THREAD_AFFINITY_TAG_NULL: ::c_int = 0;
+pub const THREAD_BACKGROUND_POLICY: ::c_int = 5;
+pub const THREAD_BACKGROUND_POLICY_DARWIN_BG: ::c_int = 0x1000;
+pub const THREAD_LATENCY_QOS_POLICY: ::c_int = 7;
+pub const THREAD_THROUGHPUT_QOS_POLICY: ::c_int = 8;
+
+// <mach/thread_info.h>
+pub const TH_STATE_RUNNING: ::c_int = 1;
+pub const TH_STATE_STOPPED: ::c_int = 2;
+pub const TH_STATE_WAITING: ::c_int = 3;
+pub const TH_STATE_UNINTERRUPTIBLE: ::c_int = 4;
+pub const TH_STATE_HALTED: ::c_int = 5;
+pub const TH_FLAGS_SWAPPED: ::c_int = 0x1;
+pub const TH_FLAGS_IDLE: ::c_int = 0x2;
+pub const TH_FLAGS_GLOBAL_FORCED_IDLE: ::c_int = 0x4;
+pub const THREAD_BASIC_INFO: ::c_int = 3;
+pub const THREAD_IDENTIFIER_INFO: ::c_int = 4;
+pub const THREAD_EXTENDED_INFO: ::c_int = 5;
+
+// CommonCrypto/CommonCryptoError.h
+pub const kCCSuccess: i32 = 0;
+pub const kCCParamError: i32 = -4300;
+pub const kCCBufferTooSmall: i32 = -4301;
+pub const kCCMemoryFailure: i32 = -4302;
+pub const kCCAlignmentError: i32 = -4303;
+pub const kCCDecodeError: i32 = -4304;
+pub const kCCUnimplemented: i32 = -4305;
+pub const kCCOverflow: i32 = -4306;
+pub const kCCRNGFailure: i32 = -4307;
+pub const kCCUnspecifiedError: i32 = -4308;
+pub const kCCCallSequenceError: i32 = -4309;
+pub const kCCKeySizeError: i32 = -4310;
+pub const kCCInvalidKey: i32 = -4311;
+
 cfg_if! {
-    if #[cfg(libc_const_size_of)] {
+    if #[cfg(libc_const_extern_fn)] {
+        const fn __DARWIN_ALIGN32(p: usize) -> usize {
+            const __DARWIN_ALIGNBYTES32: usize = ::mem::size_of::<u32>() - 1;
+            p + __DARWIN_ALIGNBYTES32 & !__DARWIN_ALIGNBYTES32
+        }
+    } else if #[cfg(libc_const_size_of)] {
         fn __DARWIN_ALIGN32(p: usize) -> usize {
             const __DARWIN_ALIGNBYTES32: usize = ::mem::size_of::<u32>() - 1;
             p + __DARWIN_ALIGNBYTES32 & !__DARWIN_ALIGNBYTES32
         }
+        pub const THREAD_EXTENDED_POLICY_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_extended_policy_data_t>() / ::mem::size_of::<integer_t>())
+            as mach_msg_type_number_t;
+        pub const THREAD_TIME_CONSTRAINT_POLICY_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_time_constraint_policy_data_t>() /
+             ::mem::size_of::<integer_t>()) as mach_msg_type_number_t;
+        pub const THREAD_PRECEDENCE_POLICY_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_precedence_policy_data_t>() / ::mem::size_of::<integer_t>())
+            as mach_msg_type_number_t;
+        pub const THREAD_AFFINITY_POLICY_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_affinity_policy_data_t>() / ::mem::size_of::<integer_t>())
+            as mach_msg_type_number_t;
+        pub const THREAD_BACKGROUND_POLICY_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_background_policy_data_t>() / ::mem::size_of::<integer_t>())
+            as mach_msg_type_number_t;
+        pub const THREAD_LATENCY_QOS_POLICY_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_latency_qos_policy_data_t>() / ::mem::size_of::<integer_t>())
+            as mach_msg_type_number_t;
+        pub const THREAD_THROUGHPUT_QOS_POLICY_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_throughput_qos_policy_data_t>() /
+             ::mem::size_of::<integer_t>()) as mach_msg_type_number_t;
+        pub const THREAD_BASIC_INFO_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_basic_info_data_t>() / ::mem::size_of::<integer_t>())
+            as mach_msg_type_number_t;
+        pub const THREAD_IDENTIFIER_INFO_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_identifier_info_data_t>() / ::mem::size_of::<integer_t>())
+            as mach_msg_type_number_t;
+        pub const THREAD_EXTENDED_INFO_COUNT: mach_msg_type_number_t =
+            (::mem::size_of::<thread_extended_info_data_t>() / ::mem::size_of::<integer_t>())
+            as mach_msg_type_number_t;
     } else {
         fn __DARWIN_ALIGN32(p: usize) -> usize {
             let __DARWIN_ALIGNBYTES32: usize = ::mem::size_of::<u32>() - 1;
             p + __DARWIN_ALIGNBYTES32 & !__DARWIN_ALIGNBYTES32
         }
+        pub const THREAD_EXTENDED_POLICY_COUNT: mach_msg_type_number_t = 1;
+        pub const THREAD_TIME_CONSTRAINT_POLICY_COUNT: mach_msg_type_number_t = 4;
+        pub const THREAD_PRECEDENCE_POLICY_COUNT: mach_msg_type_number_t = 1;
+        pub const THREAD_AFFINITY_POLICY_COUNT: mach_msg_type_number_t = 1;
+        pub const THREAD_BACKGROUND_POLICY_COUNT: mach_msg_type_number_t = 1;
+        pub const THREAD_LATENCY_QOS_POLICY_COUNT: mach_msg_type_number_t = 1;
+        pub const THREAD_THROUGHPUT_QOS_POLICY_COUNT: mach_msg_type_number_t = 1;
+        pub const THREAD_BASIC_INFO_COUNT: mach_msg_type_number_t = 10;
+        pub const THREAD_IDENTIFIER_INFO_COUNT: mach_msg_type_number_t = 6;
+        pub const THREAD_EXTENDED_INFO_COUNT: mach_msg_type_number_t = 28;
     }
 }
 
@@ -3218,7 +3863,7 @@
         let cmsg_len = (*cmsg).cmsg_len as usize;
         let next = cmsg as usize + __DARWIN_ALIGN32(cmsg_len as usize);
         let max = (*mhdr).msg_control as usize
-                   + (*mhdr).msg_controllen as usize;
+                    + (*mhdr).msg_controllen as usize;
         if next + __DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>()) > max {
             0 as *mut ::cmsghdr
         } else {
@@ -3231,7 +3876,7 @@
             .offset(__DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>()) as isize)
     }
 
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+    pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
         (__DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>())
             + __DARWIN_ALIGN32(length as usize))
             as ::c_uint
@@ -3241,6 +3886,10 @@
         (__DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>()) + length as usize)
             as ::c_uint
     }
+
+    pub {const} fn VM_MAKE_TAG(id: u8) -> u32 {
+        (id as u32) << 24u32
+    }
 }
 
 safe_f! {
@@ -3269,18 +3918,14 @@
     pub fn setgrent();
     #[doc(hidden)]
     #[deprecated(since = "0.2.49", note = "Deprecated in MacOSX 10.5")]
-    #[link_name = "daemon$1050"]
+    #[cfg_attr(not(target_arch = "aarch64"), link_name = "daemon$1050")]
     pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
     #[doc(hidden)]
     #[deprecated(since = "0.2.49", note = "Deprecated in MacOSX 10.10")]
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
     #[doc(hidden)]
     #[deprecated(since = "0.2.49", note = "Deprecated in MacOSX 10.10")]
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
     pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
     pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
     pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
@@ -3329,11 +3974,7 @@
         sevlen: ::socklen_t,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn mincore(
-        addr: *const ::c_void,
-        len: ::size_t,
-        vec: *mut ::c_char,
-    ) -> ::c_int;
+    pub fn mincore(addr: *const ::c_void, len: ::size_t, vec: *mut ::c_char) -> ::c_int;
     pub fn sysctlnametomib(
         name: *const ::c_char,
         mibp: *mut ::c_int,
@@ -3343,44 +3984,23 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "mprotect$UNIX2003"
     )]
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn semget(key: key_t, nsems: ::c_int, semflg: ::c_int) -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "semctl$UNIX2003"
     )]
-    pub fn semctl(
-        semid: ::c_int,
-        semnum: ::c_int,
-        cmd: ::c_int,
-        ...
-    ) -> ::c_int;
-    pub fn semop(
-        semid: ::c_int,
-        sops: *mut sembuf,
-        nsops: ::size_t,
-    ) -> ::c_int;
+    pub fn semctl(semid: ::c_int, semnum: ::c_int, cmd: ::c_int, ...) -> ::c_int;
+    pub fn semop(semid: ::c_int, sops: *mut sembuf, nsops: ::size_t) -> ::c_int;
     pub fn shm_open(name: *const ::c_char, oflag: ::c_int, ...) -> ::c_int;
     pub fn ftok(pathname: *const c_char, proj_id: ::c_int) -> key_t;
-    pub fn shmat(
-        shmid: ::c_int,
-        shmaddr: *const ::c_void,
-        shmflg: ::c_int,
-    ) -> *mut ::c_void;
+    pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
     pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "shmctl$UNIX2003"
     )]
-    pub fn shmctl(
-        shmid: ::c_int,
-        cmd: ::c_int,
-        buf: *mut ::shmid_ds,
-    ) -> ::c_int;
+    pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
     pub fn shmget(key: key_t, size: ::size_t, shmflg: ::c_int) -> ::c_int;
     pub fn sysctl(
         name: *mut ::c_int,
@@ -3402,19 +4022,15 @@
     #[deprecated(since = "0.2.55", note = "Use the mach crate")]
     #[allow(deprecated)]
     pub fn mach_timebase_info(info: *mut ::mach_timebase_info) -> ::c_int;
+    pub fn mach_host_self() -> mach_port_t;
+    pub fn mach_thread_self() -> mach_port_t;
     pub fn pthread_setname_np(name: *const ::c_char) -> ::c_int;
-    pub fn pthread_getname_np(
-        thread: ::pthread_t,
-        name: *mut ::c_char,
-        len: ::size_t,
-    ) -> ::c_int;
+    pub fn pthread_getname_np(thread: ::pthread_t, name: *mut ::c_char, len: ::size_t) -> ::c_int;
+    pub fn pthread_mach_thread_np(thread: ::pthread_t) -> ::mach_port_t;
     pub fn pthread_from_mach_thread_np(port: ::mach_port_t) -> ::pthread_t;
     pub fn pthread_get_stackaddr_np(thread: ::pthread_t) -> *mut ::c_void;
     pub fn pthread_get_stacksize_np(thread: ::pthread_t) -> ::size_t;
-    pub fn pthread_condattr_setpshared(
-        attr: *mut pthread_condattr_t,
-        pshared: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_condattr_setpshared(attr: *mut pthread_condattr_t, pshared: ::c_int) -> ::c_int;
     pub fn pthread_condattr_getpshared(
         attr: *const pthread_condattr_t,
         pshared: *mut ::c_int,
@@ -3431,15 +4047,72 @@
         attr: *const pthread_rwlockattr_t,
         val: *mut ::c_int,
     ) -> ::c_int;
-    pub fn pthread_rwlockattr_setpshared(
-        attr: *mut pthread_rwlockattr_t,
-        val: ::c_int,
+    pub fn pthread_rwlockattr_setpshared(attr: *mut pthread_rwlockattr_t, val: ::c_int) -> ::c_int;
+    pub fn pthread_threadid_np(thread: ::pthread_t, thread_id: *mut u64) -> ::c_int;
+    pub fn pthread_attr_set_qos_class_np(
+        attr: *mut pthread_attr_t,
+        class: qos_class_t,
+        priority: ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_attr_get_qos_class_np(
+        attr: *mut pthread_attr_t,
+        class: *mut qos_class_t,
+        priority: *mut ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_set_qos_class_self_np(class: qos_class_t, priority: ::c_int) -> ::c_int;
+    pub fn pthread_get_qos_class_np(
+        thread: ::pthread_t,
+        class: *mut qos_class_t,
+        priority: *mut ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_attr_getschedparam(
+        attr: *const ::pthread_attr_t,
+        param: *mut sched_param,
+    ) -> ::c_int;
+    pub fn pthread_attr_setschedparam(
+        attr: *mut ::pthread_attr_t,
+        param: *const sched_param,
     ) -> ::c_int;
+    pub fn pthread_getschedparam(
+        thread: ::pthread_t,
+        policy: *mut ::c_int,
+        param: *mut sched_param,
+    ) -> ::c_int;
+    pub fn pthread_setschedparam(
+        thread: ::pthread_t,
+        policy: ::c_int,
+        param: *const sched_param,
+    ) -> ::c_int;
+    pub fn thread_policy_set(
+        thread: thread_t,
+        flavor: thread_policy_flavor_t,
+        policy_info: thread_policy_t,
+        count: mach_msg_type_number_t,
+    ) -> kern_return_t;
+    pub fn thread_policy_get(
+        thread: thread_t,
+        flavor: thread_policy_flavor_t,
+        policy_info: thread_policy_t,
+        count: *mut mach_msg_type_number_t,
+        get_default: *mut boolean_t,
+    ) -> kern_return_t;
+    pub fn thread_info(
+        target_act: thread_inspect_t,
+        flavor: thread_flavor_t,
+        thread_info_out: thread_info_t,
+        thread_info_outCnt: *mut mach_msg_type_number_t,
+    ) -> kern_return_t;
     pub fn __error() -> *mut ::c_int;
     pub fn backtrace(buf: *mut *mut ::c_void, sz: ::c_int) -> ::c_int;
-    #[cfg_attr(target_os = "macos", link_name = "statfs$INODE64")]
+    #[cfg_attr(
+        all(target_os = "macos", not(target_arch = "aarch64")),
+        link_name = "statfs$INODE64"
+    )]
     pub fn statfs(path: *const ::c_char, buf: *mut statfs) -> ::c_int;
-    #[cfg_attr(target_os = "macos", link_name = "fstatfs$INODE64")]
+    #[cfg_attr(
+        all(target_os = "macos", not(target_arch = "aarch64")),
+        link_name = "fstatfs$INODE64"
+    )]
     pub fn fstatfs(fd: ::c_int, buf: *mut statfs) -> ::c_int;
     pub fn kevent(
         kq: ::c_int,
@@ -3464,12 +4137,7 @@
         flags: ::c_int,
         data: *mut ::c_void,
     ) -> ::c_int;
-    pub fn ptrace(
-        request: ::c_int,
-        pid: ::pid_t,
-        addr: *mut ::c_char,
-        data: ::c_int,
-    ) -> ::c_int;
+    pub fn ptrace(request: ::c_int, pid: ::pid_t, addr: *mut ::c_char, data: ::c_int) -> ::c_int;
     pub fn quotactl(
         special: *const ::c_char,
         cmd: ::c_int,
@@ -3509,17 +4177,16 @@
     pub fn duplocale(base: ::locale_t) -> ::locale_t;
     pub fn freelocale(loc: ::locale_t) -> ::c_int;
     pub fn localeconv_l(loc: ::locale_t) -> *mut lconv;
-    pub fn newlocale(
-        mask: ::c_int,
-        locale: *const ::c_char,
-        base: ::locale_t,
-    ) -> ::locale_t;
+    pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
     pub fn uselocale(loc: ::locale_t) -> ::locale_t;
     pub fn querylocale(mask: ::c_int, loc: ::locale_t) -> *const ::c_char;
     pub fn getpriority(which: ::c_int, who: ::id_t) -> ::c_int;
     pub fn setpriority(which: ::c_int, who: ::id_t, prio: ::c_int) -> ::c_int;
     pub fn getdomainname(name: *mut ::c_char, len: ::c_int) -> ::c_int;
     pub fn setdomainname(name: *const ::c_char, len: ::c_int) -> ::c_int;
+    pub fn preadv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t) -> ::ssize_t;
+    pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
+        -> ::ssize_t;
     pub fn getxattr(
         path: *const ::c_char,
         name: *const ::c_char,
@@ -3564,16 +4231,8 @@
         size: ::size_t,
         flags: ::c_int,
     ) -> ::ssize_t;
-    pub fn removexattr(
-        path: *const ::c_char,
-        name: *const ::c_char,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn renamex_np(
-        from: *const ::c_char,
-        to: *const ::c_char,
-        flags: ::c_uint,
-    ) -> ::c_int;
+    pub fn removexattr(path: *const ::c_char, name: *const ::c_char, flags: ::c_int) -> ::c_int;
+    pub fn renamex_np(from: *const ::c_char, to: *const ::c_char, flags: ::c_uint) -> ::c_int;
     pub fn renameatx_np(
         fromfd: ::c_int,
         from: *const ::c_char,
@@ -3581,11 +4240,7 @@
         to: *const ::c_char,
         flags: ::c_uint,
     ) -> ::c_int;
-    pub fn fremovexattr(
-        filedes: ::c_int,
-        name: *const ::c_char,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn fremovexattr(filedes: ::c_int, name: *const ::c_char, flags: ::c_int) -> ::c_int;
 
     pub fn getgrouplist(
         name: *const ::c_char,
@@ -3599,18 +4254,11 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "waitid$UNIX2003"
     )]
-    pub fn waitid(
-        idtype: idtype_t,
-        id: id_t,
-        infop: *mut ::siginfo_t,
-        options: ::c_int,
-    ) -> ::c_int;
+    pub fn waitid(idtype: idtype_t, id: id_t, infop: *mut ::siginfo_t, options: ::c_int)
+        -> ::c_int;
     pub fn brk(addr: *const ::c_void) -> *mut ::c_void;
     pub fn sbrk(increment: ::c_int) -> *mut ::c_void;
-    pub fn settimeofday(
-        tv: *const ::timeval,
-        tz: *const ::timezone,
-    ) -> ::c_int;
+    pub fn settimeofday(tv: *const ::timeval, tz: *const ::timezone) -> ::c_int;
     #[deprecated(since = "0.2.55", note = "Use the mach crate")]
     pub fn _dyld_image_count() -> u32;
     #[deprecated(since = "0.2.55", note = "Use the mach crate")]
@@ -3659,25 +4307,15 @@
         attr: *const posix_spawnattr_t,
         flags: *mut ::c_short,
     ) -> ::c_int;
-    pub fn posix_spawnattr_setflags(
-        attr: *mut posix_spawnattr_t,
-        flags: ::c_short,
-    ) -> ::c_int;
+    pub fn posix_spawnattr_setflags(attr: *mut posix_spawnattr_t, flags: ::c_short) -> ::c_int;
     pub fn posix_spawnattr_getpgroup(
         attr: *const posix_spawnattr_t,
         flags: *mut ::pid_t,
     ) -> ::c_int;
-    pub fn posix_spawnattr_setpgroup(
-        attr: *mut posix_spawnattr_t,
-        flags: ::pid_t,
-    ) -> ::c_int;
+    pub fn posix_spawnattr_setpgroup(attr: *mut posix_spawnattr_t, flags: ::pid_t) -> ::c_int;
 
-    pub fn posix_spawn_file_actions_init(
-        actions: *mut posix_spawn_file_actions_t,
-    ) -> ::c_int;
-    pub fn posix_spawn_file_actions_destroy(
-        actions: *mut posix_spawn_file_actions_t,
-    ) -> ::c_int;
+    pub fn posix_spawn_file_actions_init(actions: *mut posix_spawn_file_actions_t) -> ::c_int;
+    pub fn posix_spawn_file_actions_destroy(actions: *mut posix_spawn_file_actions_t) -> ::c_int;
     pub fn posix_spawn_file_actions_addopen(
         actions: *mut posix_spawn_file_actions_t,
         fd: ::c_int,
@@ -3706,14 +4344,168 @@
         len: *mut ::size_t,
         connid: *mut sae_connid_t,
     ) -> ::c_int;
-    pub fn disconnectx(
-        socket: ::c_int,
-        associd: sae_associd_t,
-        connid: sae_connid_t,
-    ) -> ::c_int;
+    pub fn disconnectx(socket: ::c_int, associd: sae_associd_t, connid: sae_connid_t) -> ::c_int;
 
     pub fn ntp_adjtime(buf: *mut timex) -> ::c_int;
     pub fn ntp_gettime(buf: *mut ntptimeval) -> ::c_int;
+
+    #[cfg_attr(
+        all(target_os = "macos", not(target_arch = "aarch64")),
+        link_name = "getmntinfo$INODE64"
+    )]
+    pub fn getmntinfo(mntbufp: *mut *mut statfs, flags: ::c_int) -> ::c_int;
+    #[cfg_attr(
+        all(target_os = "macos", not(target_arch = "aarch64")),
+        link_name = "getfsstat$INODE64"
+    )]
+    pub fn getfsstat(mntbufp: *mut statfs, bufsize: ::c_int, flags: ::c_int) -> ::c_int;
+
+    // Copy-on-write functions.
+    // According to the man page `flags` is an `int` but in the header
+    // this is a `uint32_t`.
+    pub fn clonefile(src: *const ::c_char, dst: *const ::c_char, flags: u32) -> ::c_int;
+    pub fn clonefileat(
+        src_dirfd: ::c_int,
+        src: *const ::c_char,
+        dst_dirfd: ::c_int,
+        dst: *const ::c_char,
+        flags: u32,
+    ) -> ::c_int;
+    pub fn fclonefileat(
+        srcfd: ::c_int,
+        dst_dirfd: ::c_int,
+        dst: *const ::c_char,
+        flags: u32,
+    ) -> ::c_int;
+
+    // Added in macOS 10.13
+    // ISO/IEC 9899:2011 ("ISO C11") K.3.7.4.1
+    pub fn memset_s(s: *mut ::c_void, smax: ::size_t, c: ::c_int, n: ::size_t) -> ::c_int;
+    // Added in macOS 10.5
+    pub fn memset_pattern4(b: *mut ::c_void, pattern4: *const ::c_void, len: ::size_t);
+    pub fn memset_pattern8(b: *mut ::c_void, pattern8: *const ::c_void, len: ::size_t);
+    pub fn memset_pattern16(b: *mut ::c_void, pattern16: *const ::c_void, len: ::size_t);
+
+    pub fn mstats() -> mstats;
+    pub fn malloc_printf(format: *const ::c_char, ...);
+    pub fn malloc_zone_check(zone: *mut ::malloc_zone_t) -> ::boolean_t;
+    pub fn malloc_zone_print(zone: *mut ::malloc_zone_t, verbose: ::boolean_t);
+    pub fn malloc_zone_statistics(zone: *mut ::malloc_zone_t, stats: *mut malloc_statistics_t);
+    pub fn malloc_zone_log(zone: *mut ::malloc_zone_t, address: *mut ::c_void);
+    pub fn malloc_zone_print_ptr_info(ptr: *mut ::c_void);
+    pub fn malloc_default_zone() -> *mut ::malloc_zone_t;
+    pub fn malloc_zone_from_ptr(ptr: *const ::c_void) -> *mut ::malloc_zone_t;
+    pub fn malloc_zone_malloc(zone: *mut ::malloc_zone_t, size: ::size_t) -> *mut ::c_void;
+    pub fn malloc_zone_valloc(zone: *mut ::malloc_zone_t, size: ::size_t) -> *mut ::c_void;
+    pub fn malloc_zone_calloc(
+        zone: *mut ::malloc_zone_t,
+        num_items: ::size_t,
+        size: ::size_t,
+    ) -> *mut ::c_void;
+    pub fn malloc_zone_realloc(
+        zone: *mut ::malloc_zone_t,
+        ptr: *mut ::c_void,
+        size: ::size_t,
+    ) -> *mut ::c_void;
+    pub fn malloc_zone_free(zone: *mut ::malloc_zone_t, ptr: *mut ::c_void);
+
+    pub fn proc_listpids(
+        t: u32,
+        typeinfo: u32,
+        buffer: *mut ::c_void,
+        buffersize: ::c_int,
+    ) -> ::c_int;
+    pub fn proc_listallpids(buffer: *mut ::c_void, buffersize: ::c_int) -> ::c_int;
+    pub fn proc_listpgrppids(
+        pgrpid: ::pid_t,
+        buffer: *mut ::c_void,
+        buffersize: ::c_int,
+    ) -> ::c_int;
+    pub fn proc_listchildpids(ppid: ::pid_t, buffer: *mut ::c_void, buffersize: ::c_int)
+        -> ::c_int;
+    pub fn proc_pidinfo(
+        pid: ::c_int,
+        flavor: ::c_int,
+        arg: u64,
+        buffer: *mut ::c_void,
+        buffersize: ::c_int,
+    ) -> ::c_int;
+    pub fn proc_pidfdinfo(
+        pid: ::c_int,
+        fd: ::c_int,
+        flavor: ::c_int,
+        buffer: *mut ::c_void,
+        buffersize: ::c_int,
+    ) -> ::c_int;
+    pub fn proc_pidfileportinfo(
+        pid: ::c_int,
+        fileport: u32,
+        flavor: ::c_int,
+        buffer: *mut ::c_void,
+        buffersize: ::c_int,
+    ) -> ::c_int;
+    pub fn proc_pidpath(pid: ::c_int, buffer: *mut ::c_void, buffersize: u32) -> ::c_int;
+    pub fn proc_name(pid: ::c_int, buffer: *mut ::c_void, buffersize: u32) -> ::c_int;
+    pub fn proc_regionfilename(
+        pid: ::c_int,
+        address: u64,
+        buffer: *mut ::c_void,
+        buffersize: u32,
+    ) -> ::c_int;
+    pub fn proc_kmsgbuf(buffer: *mut ::c_void, buffersize: u32) -> ::c_int;
+    pub fn proc_libversion(major: *mut ::c_int, mintor: *mut ::c_int) -> ::c_int;
+    /// # Notes
+    ///
+    /// `id` is of type [`uuid_t`].
+    pub fn gethostuuid(id: *mut u8, timeout: *const ::timespec) -> ::c_int;
+
+    pub fn gethostid() -> ::c_long;
+    pub fn sethostid(hostid: ::c_long);
+
+    pub fn CCRandomGenerateBytes(bytes: *mut ::c_void, size: ::size_t) -> ::CCRNGStatus;
+
+    pub fn _NSGetExecutablePath(buf: *mut ::c_char, bufsize: *mut u32) -> ::c_int;
+    pub fn _NSGetEnviron() -> *mut *mut *mut ::c_char;
+
+    pub fn mach_vm_map(
+        target_task: ::vm_map_t,
+        address: *mut ::mach_vm_address_t,
+        size: ::mach_vm_size_t,
+        mask: ::mach_vm_offset_t,
+        flags: ::c_int,
+        object: ::mem_entry_name_port_t,
+        offset: ::memory_object_offset_t,
+        copy: ::boolean_t,
+        cur_protection: ::vm_prot_t,
+        max_protection: ::vm_prot_t,
+        inheritance: ::vm_inherit_t,
+    ) -> ::kern_return_t;
+}
+
+cfg_if! {
+    if #[cfg(target_os = "macos")] {
+        extern "C" {
+            pub fn memmem(
+                haystack: *const ::c_void,
+                haystacklen: ::size_t,
+                needle: *const ::c_void,
+                needlelen: ::size_t,
+            ) -> *mut ::c_void;
+        }
+    }
+}
+
+#[link(name = "iconv")]
+extern "C" {
+    pub fn iconv_open(tocode: *const ::c_char, fromcode: *const ::c_char) -> iconv_t;
+    pub fn iconv(
+        cd: iconv_t,
+        inbuf: *mut *mut ::c_char,
+        inbytesleft: *mut ::size_t,
+        outbuf: *mut *mut ::c_char,
+        outbytesleft: *mut ::size_t,
+    ) -> ::size_t;
+    pub fn iconv_close(cd: iconv_t) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,10 +17,21 @@
 
 pub type fsblkcnt_t = u64;
 pub type fsfilcnt_t = u64;
+pub type idtype_t = ::c_uint;
+pub type shmatt_t = ::c_uint;
 
 pub type mqd_t = ::c_int;
 pub type sem_t = *mut sem;
 
+pub type cpuset_t = cpumask_t;
+pub type cpu_set_t = cpumask_t;
+
+pub type register_t = ::c_long;
+pub type umtx_t = ::c_int;
+pub type pthread_barrierattr_t = ::c_int;
+pub type pthread_barrier_t = ::uintptr_t;
+pub type pthread_spinlock_t = ::uintptr_t;
+
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum sem {}
 impl ::Copy for sem {}
@@ -170,11 +181,35 @@
         pub sdl_route: [::c_ushort; 16],
     }
 
+    pub struct xucred {
+        pub cr_version: ::c_uint,
+        pub cr_uid: ::uid_t,
+        pub cr_ngroups: ::c_short,
+        pub cr_groups: [::gid_t; 16],
+        __cr_unused1: *mut ::c_void,
+    }
+
     pub struct stack_t {
-        pub ss_sp: *mut ::c_char,
+        pub ss_sp: *mut ::c_void,
         pub ss_size: ::size_t,
         pub ss_flags: ::c_int,
     }
+
+    pub struct cpumask_t {
+        ary: [u64; 4],
+    }
+
+    pub struct shmid_ds {
+        pub shm_perm: ::ipc_perm,
+        pub shm_segsz: ::size_t,
+        pub shm_lpid: ::pid_t,
+        pub shm_cpid: ::pid_t,
+        pub shm_nattch: ::shmatt_t,
+        pub shm_atime: ::time_t,
+        pub shm_dtime: ::time_t,
+        pub shm_ctime: ::time_t,
+        shm_internal: *mut ::c_void,
+    }
 }
 
 s_no_extra_traits! {
@@ -195,6 +230,13 @@
         pub ut_unused2: [u8; 16],
     }
 
+    pub struct lastlogx {
+        pub ll_tv: ::timeval,
+        pub ll_line: [::c_char; _UTX_LINESIZE],
+        pub ll_host: [::c_char; _UTX_HOSTSIZE],
+        pub ll_ss: ::sockaddr_storage,
+    }
+
     pub struct dirent {
         pub d_fileno: ::ino_t,
         pub d_namlen: u16,
@@ -205,6 +247,7 @@
     }
 
     pub struct statfs {
+        __spare2: ::c_long,
         pub f_bsize: ::c_long,
         pub f_iosize: ::c_long,
         pub f_blocks: ::c_long,
@@ -214,15 +257,18 @@
         pub f_ffree: ::c_long,
         pub f_fsid: ::fsid_t,
         pub f_owner: ::uid_t,
-        pub f_type: i32,
-        pub f_flags: i32,
+        pub f_type: ::c_int,
+        pub f_flags: ::c_int,
         pub f_syncwrites: ::c_long,
         pub f_asyncwrites: ::c_long,
         pub f_fstypename: [::c_char; 16],
-        pub f_mntonname: [::c_char; 90],
+        pub f_mntonname: [::c_char; 80],
         pub f_syncreads: ::c_long,
         pub f_asyncreads: ::c_long,
-        pub f_mntfromname: [::c_char; 90],
+        __spares1: ::c_short,
+        pub f_mntfromname: [::c_char; 80],
+        __spares2: ::c_short,
+        __spare: [::c_long; 2],
     }
 
     pub struct sigevent {
@@ -238,6 +284,50 @@
         __unused3: *mut ::c_void        //actually a function pointer
     }
 
+    pub struct mcontext_t {
+        pub mc_onstack: register_t,
+        pub mc_rdi: register_t,
+        pub mc_rsi: register_t,
+        pub mc_rdx: register_t,
+        pub mc_rcx: register_t,
+        pub mc_r8: register_t,
+        pub mc_r9: register_t,
+        pub mc_rax: register_t,
+        pub mc_rbx: register_t,
+        pub mc_rbp: register_t,
+        pub mc_r10: register_t,
+        pub mc_r11: register_t,
+        pub mc_r12: register_t,
+        pub mc_r13: register_t,
+        pub mc_r14: register_t,
+        pub mc_r15: register_t,
+        pub mc_xflags: register_t,
+        pub mc_trapno: register_t,
+        pub mc_addr: register_t,
+        pub mc_flags: register_t,
+        pub mc_err: register_t,
+        pub mc_rip: register_t,
+        pub mc_cs: register_t,
+        pub mc_rflags: register_t,
+        pub mc_rsp: register_t,
+        pub mc_ss: register_t,
+        pub mc_len: ::c_uint,
+        pub mc_fpformat: ::c_uint,
+        pub mc_ownedfp: ::c_uint,
+        __reserved: ::c_uint,
+        __unused: [::c_uint; 8],
+        pub mc_fpregs: [[::c_uint; 8]; 32],
+    }
+
+    pub struct ucontext_t {
+        pub uc_sigmask: ::sigset_t,
+        pub uc_mcontext: mcontext_t,
+        pub uc_link: *mut ucontext_t,
+        pub uc_stack: stack_t,
+        pub uc_cofunc: ::Option<unsafe extern "C" fn(uc: *mut ucontext_t, arg: *mut ::c_void)>,
+        pub uc_arg: *mut ::c_void,
+        __pad: [::c_int; 4],
+    }
 }
 
 cfg_if! {
@@ -297,6 +387,33 @@
                 self.ut_unused2.hash(state);
             }
         }
+        impl PartialEq for lastlogx {
+            fn eq(&self, other: &lastlogx) -> bool {
+                self.ll_tv == other.ll_tv
+                    && self.ll_line == other.ll_line
+                    && self.ll_host == other.ll_host
+                    && self.ll_ss == other.ll_ss
+            }
+        }
+        impl Eq for lastlogx {}
+        impl ::fmt::Debug for lastlogx {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("lastlogx")
+                    .field("ll_tv", &self.ll_tv)
+                    .field("ll_line", &self.ll_line)
+                    .field("ll_host", &self.ll_host)
+                    .field("ll_ss", &self.ll_ss)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for lastlogx {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.ll_tv.hash(state);
+                self.ll_line.hash(state);
+                self.ll_host.hash(state);
+                self.ll_ss.hash(state);
+            }
+        }
 
         impl PartialEq for dirent {
             fn eq(&self, other: &dirent) -> bool {
@@ -437,6 +554,100 @@
                 self.sigev_value.hash(state);
             }
         }
+        impl PartialEq for mcontext_t {
+            fn eq(&self, other: &mcontext_t) -> bool {
+                self.mc_onstack == other.mc_onstack &&
+                self.mc_rdi == other.mc_rdi &&
+                self.mc_rsi == other.mc_rsi &&
+                self.mc_rdx == other.mc_rdx &&
+                self.mc_rcx == other.mc_rcx &&
+                self.mc_r8 == other.mc_r8 &&
+                self.mc_r9 == other.mc_r9 &&
+                self.mc_rax == other.mc_rax &&
+                self.mc_rbx == other.mc_rbx &&
+                self.mc_rbp == other.mc_rbp &&
+                self.mc_r10 == other.mc_r10 &&
+                self.mc_r11 == other.mc_r11 &&
+                self.mc_r12 == other.mc_r12 &&
+                self.mc_r13 == other.mc_r13 &&
+                self.mc_r14 == other.mc_r14 &&
+                self.mc_r15 == other.mc_r15 &&
+                self.mc_xflags == other.mc_xflags &&
+                self.mc_trapno == other.mc_trapno &&
+                self.mc_addr == other.mc_addr &&
+                self.mc_flags == other.mc_flags &&
+                self.mc_err == other.mc_err &&
+                self.mc_rip == other.mc_rip &&
+                self.mc_cs == other.mc_cs &&
+                self.mc_rflags == other.mc_rflags &&
+                self.mc_rsp == other.mc_rsp &&
+                self.mc_ss == other.mc_ss &&
+                self.mc_len == other.mc_len &&
+                self.mc_fpformat == other.mc_fpformat &&
+                self.mc_ownedfp == other.mc_ownedfp
+                // FIXME: self.mc_fpregs == other.mc_fpregs
+            }
+        }
+        impl Eq for mcontext_t {}
+        impl ::fmt::Debug for mcontext_t {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("mcontext_t")
+                    .field("mc_onstack", &self.mc_onstack)
+                    .field("mc_rdi", &self.mc_rdi)
+                    .field("mc_rsi", &self.mc_rsi)
+                    .field("mc_rdx", &self.mc_rdx)
+                    .field("mc_rcx", &self.mc_rcx)
+                    .field("mc_r8", &self.mc_r8)
+                    .field("mc_r9", &self.mc_r9)
+                    .field("mc_rax", &self.mc_rax)
+                    .field("mc_rbx", &self.mc_rbx)
+                    .field("mc_rbp", &self.mc_rbp)
+                    .field("mc_r10", &self.mc_r10)
+                    .field("mc_r11", &self.mc_r11)
+                    .field("mc_r12", &self.mc_r12)
+                    .field("mc_r13", &self.mc_r13)
+                    .field("mc_r14", &self.mc_r14)
+                    .field("mc_r15", &self.mc_r15)
+                    .field("mc_xflags", &self.mc_xflags)
+                    .field("mc_trapno", &self.mc_trapno)
+                    .field("mc_addr", &self.mc_addr)
+                    .field("mc_flags", &self.mc_flags)
+                    .field("mc_err", &self.mc_err)
+                    .field("mc_rip", &self.mc_rip)
+                    .field("mc_cs", &self.mc_cs)
+                    .field("mc_rflags", &self.mc_rflags)
+                    .field("mc_rsp", &self.mc_rsp)
+                    .field("mc_ss", &self.mc_ss)
+                    .field("mc_len", &self.mc_len)
+                    .field("mc_fpformat", &self.mc_fpformat)
+                    .field("mc_ownedfp", &self.mc_ownedfp)
+                    // FIXME: .field("mc_fpregs", &self.mc_fpregs)
+                    .finish()
+            }
+        }
+        impl PartialEq for ucontext_t {
+            fn eq(&self, other: &ucontext_t) -> bool {
+                self.uc_sigmask == other.uc_sigmask
+                    && self.uc_mcontext == other.uc_mcontext
+                    && self.uc_link == other.uc_link
+                    && self.uc_stack == other.uc_stack
+                    && self.uc_cofunc == other.uc_cofunc
+                    && self.uc_arg == other.uc_arg
+            }
+        }
+        impl Eq for ucontext_t {}
+        impl ::fmt::Debug for ucontext_t {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("ucontext_t")
+                    .field("uc_sigmask", &self.uc_sigmask)
+                    .field("uc_mcontext", &self.uc_mcontext)
+                    .field("uc_link", &self.uc_link)
+                    .field("uc_stack", &self.uc_stack)
+                    .field("uc_cofunc", &self.uc_cofunc)
+                    .field("uc_arg", &self.uc_arg)
+                    .finish()
+            }
+        }
     }
 }
 
@@ -647,6 +858,12 @@
 
 pub const PT_FIRSTMACH: ::c_int = 32;
 
+pub const PROC_REAP_ACQUIRE: ::c_int = 0x0001;
+pub const PROC_REAP_RELEASE: ::c_int = 0x0002;
+pub const PROC_REAP_STATUS: ::c_int = 0x0003;
+pub const PROC_PDEATHSIG_CTL: ::c_int = 0x0004;
+pub const PROC_PDEATHSIG_STATUS: ::c_int = 0x0005;
+
 // https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/net/if.h#L101
 pub const IFF_UP: ::c_int = 0x1; // interface is up
 pub const IFF_BROADCAST: ::c_int = 0x2; // broadcast address valid
@@ -941,6 +1158,10 @@
 pub const UTX_DB_UTMPX: ::c_uint = 0;
 pub const UTX_DB_WTMPX: ::c_uint = 1;
 pub const UTX_DB_LASTLOG: ::c_uint = 2;
+pub const _UTX_LINESIZE: usize = 32;
+pub const _UTX_USERSIZE: usize = 32;
+pub const _UTX_IDSIZE: usize = 4;
+pub const _UTX_HOSTSIZE: usize = 256;
 
 pub const LC_COLLATE_MASK: ::c_int = 1 << 0;
 pub const LC_CTYPE_MASK: ::c_int = 1 << 1;
@@ -982,8 +1203,17 @@
 pub const _SC_THREAD_ROBUST_PRIO_INHERIT: ::c_int = 126;
 pub const _SC_THREAD_ROBUST_PRIO_PROTECT: ::c_int = 127;
 
-pub const WCONTINUED: ::c_int = 4;
-pub const WSTOPPED: ::c_int = 0o177;
+pub const WCONTINUED: ::c_int = 0x4;
+pub const WSTOPPED: ::c_int = 0x2;
+pub const WNOWAIT: ::c_int = 0x8;
+pub const WEXITED: ::c_int = 0x10;
+pub const WTRAPPED: ::c_int = 0x20;
+
+// Similar to FreeBSD, only the standardized ones are exposed.
+// There are more.
+pub const P_PID: idtype_t = 0;
+pub const P_PGID: idtype_t = 2;
+pub const P_ALL: idtype_t = 7;
 
 // Values for struct rtprio (type_ field)
 pub const RTP_PRIO_REALTIME: ::c_ushort = 0;
@@ -1003,8 +1233,10 @@
 pub const UTIME_OMIT: c_long = -2;
 pub const UTIME_NOW: c_long = -1;
 
-fn _CMSG_ALIGN(n: usize) -> usize {
-    (n + 3) & !3
+const_fn! {
+    {const} fn _CMSG_ALIGN(n: usize) -> usize {
+        (n + 3) & !3
+    }
 }
 
 f! {
@@ -1033,10 +1265,33 @@
         }
     }
 
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+    pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
         (_CMSG_ALIGN(::mem::size_of::<::cmsghdr>()) +
             _CMSG_ALIGN(length as usize)) as ::c_uint
     }
+
+    pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
+        for slot in cpuset.ary.iter_mut() {
+            *slot = 0;
+        }
+    }
+
+    pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) -> () {
+        let (idx, offset) = ((cpu >> 6) & 3, cpu & 63);
+        cpuset.ary[idx] |= 1 << offset;
+        ()
+    }
+
+    pub fn CPU_CLR(cpu: usize, cpuset: &mut cpu_set_t) -> () {
+        let (idx, offset) = ((cpu >> 6) & 3, cpu & 63);
+        cpuset.ary[idx] &= !(1 << offset);
+        ()
+    }
+
+    pub fn CPU_ISSET(cpu: usize, cpuset: &mut cpu_set_t) -> bool {
+        let (idx, offset) = ((cpu >> 6) & 3, cpu & 63);
+        0 != cpuset.ary[idx] & (1 << offset)
+    }
 }
 
 safe_f! {
@@ -1048,17 +1303,17 @@
 extern "C" {
     pub fn __errno_location() -> *mut ::c_int;
     pub fn setgrent();
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
 
     pub fn setutxdb(_type: ::c_uint, file: *mut ::c_char) -> ::c_int;
 
-    pub fn aio_waitcomplete(
-        iocbp: *mut *mut aiocb,
-        timeout: *mut ::timespec,
+    pub fn aio_waitcomplete(iocbp: *mut *mut aiocb, timeout: *mut ::timespec) -> ::c_int;
+
+    pub fn waitid(
+        idtype: idtype_t,
+        id: ::id_t,
+        infop: *mut ::siginfo_t,
+        options: ::c_int,
     ) -> ::c_int;
 
     pub fn freelocale(loc: ::locale_t);
@@ -1079,6 +1334,49 @@
         needle: *const ::c_void,
         needlelen: ::size_t,
     ) -> *mut ::c_void;
+    pub fn pthread_spin_init(lock: *mut pthread_spinlock_t, pshared: ::c_int) -> ::c_int;
+    pub fn pthread_spin_destroy(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_lock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_trylock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_unlock(lock: *mut pthread_spinlock_t) -> ::c_int;
+
+    pub fn sched_getaffinity(pid: ::pid_t, cpusetsize: ::size_t, mask: *mut cpu_set_t) -> ::c_int;
+    pub fn sched_setaffinity(pid: ::pid_t, cpusetsize: ::size_t, mask: *const cpu_set_t)
+        -> ::c_int;
+    pub fn setproctitle(fmt: *const ::c_char, ...);
+
+    pub fn shmget(key: ::key_t, size: ::size_t, shmflg: ::c_int) -> ::c_int;
+    pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
+    pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
+    pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
+    pub fn procctl(idtype: ::idtype_t, id: ::id_t, cmd: ::c_int, data: *mut ::c_void) -> ::c_int;
+
+    pub fn updwtmpx(file: *const ::c_char, ut: *const utmpx) -> ::c_int;
+    pub fn getlastlogx(fname: *const ::c_char, uid: ::uid_t, ll: *mut lastlogx) -> *mut lastlogx;
+    pub fn updlastlogx(fname: *const ::c_char, uid: ::uid_t, ll: *mut lastlogx) -> ::c_int;
+    pub fn getutxuser(name: *const ::c_char) -> utmpx;
+    pub fn utmpxname(file: *const ::c_char) -> ::c_int;
+}
+
+#[link(name = "rt")]
+extern "C" {
+    pub fn aio_cancel(fd: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
+    pub fn aio_error(aiocbp: *const aiocb) -> ::c_int;
+    pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
+    pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
+    pub fn aio_return(aiocbp: *mut aiocb) -> ::ssize_t;
+    pub fn aio_suspend(
+        aiocb_list: *const *const aiocb,
+        nitems: ::c_int,
+        timeout: *const ::timespec,
+    ) -> ::c_int;
+    pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
+    pub fn lio_listio(
+        mode: ::c_int,
+        aiocb_list: *const *mut aiocb,
+        nitems: ::c_int,
+        sevp: *mut sigevent,
+    ) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,5 +17,130 @@
     }
 }
 
+s_no_extra_traits! {
+    pub struct gpregs {
+        pub gp_x: [::register_t; 30],
+        pub gp_lr: ::register_t,
+        pub gp_sp: ::register_t,
+        pub gp_elr: ::register_t,
+        pub gp_spsr: u32,
+        pub gp_pad: ::c_int,
+    }
+
+    pub struct fpregs {
+        pub fp_q: u128,
+        pub fp_sr: u32,
+        pub fp_cr: u32,
+        pub fp_flags: ::c_int,
+        pub fp_pad: ::c_int,
+    }
+
+    pub struct mcontext_t {
+        pub mc_gpregs: gpregs,
+        pub mc_fpregs: fpregs,
+        pub mc_flags: ::c_int,
+        pub mc_pad: ::c_int,
+        pub mc_spare: [u64; 8],
+    }
+}
+
+cfg_if! {
+    if #[cfg(feature = "extra_traits")] {
+        impl PartialEq for gpregs {
+            fn eq(&self, other: &gpregs) -> bool {
+                self.gp_x.iter().zip(other.gp_x.iter()).all(|(a, b)| a == b) &&
+                self.gp_lr == other.gp_lr &&
+                self.gp_sp == other.gp_sp &&
+                self.gp_elr == other.gp_elr &&
+                self.gp_spsr == other.gp_spsr &&
+                self.gp_pad == other.gp_pad
+            }
+        }
+        impl Eq for gpregs {}
+        impl ::fmt::Debug for gpregs {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("gpregs")
+                    .field("gp_x", &self.gp_x)
+                    .field("gp_lr", &self.gp_lr)
+                    .field("gp_sp", &self.gp_sp)
+                    .field("gp_elr", &self.gp_elr)
+                    .field("gp_spsr", &self.gp_spsr)
+                    .field("gp_pad", &self.gp_pad)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for gpregs {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.gp_x.hash(state);
+                self.gp_lr.hash(state);
+                self.gp_sp.hash(state);
+                self.gp_elr.hash(state);
+                self.gp_spsr.hash(state);
+                self.gp_pad.hash(state);
+            }
+        }
+        impl PartialEq for fpregs {
+            fn eq(&self, other: &fpregs) -> bool {
+                self.fp_q == other.fp_q &&
+                self.fp_sr == other.fp_sr &&
+                self.fp_cr == other.fp_cr &&
+                self.fp_flags == other.fp_flags &&
+                self.fp_pad == other.fp_pad
+            }
+        }
+        impl Eq for fpregs {}
+        impl ::fmt::Debug for fpregs {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("fpregs")
+                    .field("fp_q", &self.fp_q)
+                    .field("fp_sr", &self.fp_sr)
+                    .field("fp_cr", &self.fp_cr)
+                    .field("fp_flags", &self.fp_flags)
+                    .field("fp_pad", &self.fp_pad)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for fpregs {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.fp_q.hash(state);
+                self.fp_sr.hash(state);
+                self.fp_cr.hash(state);
+                self.fp_flags.hash(state);
+                self.fp_pad.hash(state);
+            }
+        }
+        impl PartialEq for mcontext_t {
+            fn eq(&self, other: &mcontext_t) -> bool {
+                self.mc_gpregs == other.mc_gpregs &&
+                self.mc_fpregs == other.mc_fpregs &&
+                self.mc_flags == other.mc_flags &&
+                self.mc_pad == other.mc_pad &&
+                self.mc_spare.iter().zip(other.mc_spare.iter()).all(|(a, b)| a == b)
+            }
+        }
+        impl Eq for mcontext_t {}
+        impl ::fmt::Debug for mcontext_t {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("mcontext_t")
+                    .field("mc_gpregs", &self.mc_gpregs)
+                    .field("mc_fpregs", &self.mc_fpregs)
+                    .field("mc_flags", &self.mc_flags)
+                    .field("mc_pad", &self.mc_pad)
+                    .field("mc_spare", &self.mc_spare)
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for mcontext_t {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.mc_gpregs.hash(state);
+                self.mc_fpregs.hash(state);
+                self.mc_flags.hash(state);
+                self.mc_pad.hash(state);
+                self.mc_spare.hash(state);
+            }
+        }
+    }
+}
+
 pub const MAP_32BIT: ::c_int = 0x00080000;
 pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-// APIs that had breaking changes after FreeBSD 11
+// APIs that were changed after FreeBSD 11
 
 // The type of `nlink_t` changed from `u16` to `u64` in FreeBSD 12:
 pub type nlink_t = u16;
@@ -190,6 +190,7 @@
 }
 
 pub const ELAST: ::c_int = 96;
+pub const RAND_MAX: ::c_int = 0x7fff_fffd;
 
 extern "C" {
     // Return type ::c_int was removed in FreeBSD 12
@@ -197,11 +198,7 @@
 
     // Type of `addr` argument changed from `const void*` to `void*`
     // in FreeBSD 12
-    pub fn mprotect(
-        addr: *const ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *const ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
 
     // Return type ::c_int was removed in FreeBSD 12
     pub fn freelocale(loc: ::locale_t) -> ::c_int;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-// APIs that changed in FreeBSD12
+// APIs in FreeBSD 12 that have changed since 11.
 
 pub type nlink_t = u64;
 pub type dev_t = u64;
@@ -200,23 +200,19 @@
 pub const GRND_NONBLOCK: ::c_uint = 0x1;
 pub const GRND_RANDOM: ::c_uint = 0x2;
 
-cfg_if! {
-    if #[cfg(not(freebsd13))] {
-        pub const ELAST: ::c_int = 96;
-    } else {
-        pub const EINTEGRITY: ::c_int = 97;
-        pub const ELAST: ::c_int = 97;
-        pub const GRND_INSECURE: ::c_uint = 0x4;
-    }
-}
+pub const RAND_MAX: ::c_int = 0x7fff_fffd;
+
+pub const PROC_ASLR_CTL: ::c_int = 13;
+pub const PROC_ASLR_STATUS: ::c_int = 14;
+
+pub const SO_DOMAIN: ::c_int = 0x1019;
+
+pub const EINTEGRITY: ::c_int = 97;
+pub const ELAST: ::c_int = 97;
 
 extern "C" {
     pub fn setgrent();
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn freelocale(loc: ::locale_t);
     pub fn msgrcv(
         msqid: ::c_int,
@@ -234,11 +230,11 @@
 
     pub fn fdatasync(fd: ::c_int) -> ::c_int;
 
-    pub fn getrandom(
-        buf: *mut ::c_void,
-        buflen: ::size_t,
-        flags: ::c_uint
-    ) -> ::ssize_t;
+    pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
+    pub fn elf_aux_info(aux: ::c_int, buf: *mut ::c_void, buflen: ::c_int) -> ::c_int;
+    pub fn setproctitle_fast(fmt: *const ::c_char, ...);
+    pub fn timingsafe_bcmp(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
+    pub fn timingsafe_memcmp(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,34 @@
+#[repr(C)]
+#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]
+pub struct stat {
+    pub st_dev: ::dev_t,
+    pub st_ino: ::ino_t,
+    pub st_nlink: ::nlink_t,
+    pub st_mode: ::mode_t,
+    st_padding0: i16,
+    pub st_uid: ::uid_t,
+    pub st_gid: ::gid_t,
+    st_padding1: i32,
+    pub st_rdev: ::dev_t,
+    pub st_atime: ::time_t,
+    pub st_atime_nsec: ::c_long,
+    pub st_mtime: ::time_t,
+    pub st_mtime_nsec: ::c_long,
+    pub st_ctime: ::time_t,
+    pub st_ctime_nsec: ::c_long,
+    pub st_birthtime: ::time_t,
+    pub st_birthtime_nsec: ::c_long,
+    pub st_size: ::off_t,
+    pub st_blocks: ::blkcnt_t,
+    pub st_blksize: ::blksize_t,
+    pub st_flags: ::fflags_t,
+    pub st_gen: u64,
+    pub st_spare: [u64; 10],
+}
+
+impl ::Copy for ::stat {}
+impl ::Clone for ::stat {
+    fn clone(&self) -> ::stat {
+        *self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,277 @@
+// APIs in FreeBSD 13 that have changed since 11.
+
+pub type nlink_t = u64;
+pub type dev_t = u64;
+pub type ino_t = ::c_ulong;
+pub type shmatt_t = ::c_uint;
+
+s! {
+    pub struct shmid_ds {
+        pub shm_perm: ::ipc_perm,
+        pub shm_segsz: ::size_t,
+        pub shm_lpid: ::pid_t,
+        pub shm_cpid: ::pid_t,
+        pub shm_nattch: ::shmatt_t,
+        pub shm_atime: ::time_t,
+        pub shm_dtime: ::time_t,
+        pub shm_ctime: ::time_t,
+    }
+
+    pub struct kevent {
+        pub ident: ::uintptr_t,
+        pub filter: ::c_short,
+        pub flags: ::c_ushort,
+        pub fflags: ::c_uint,
+        pub data: ::intptr_t,
+        pub udata: *mut ::c_void,
+        pub ext: [u64; 4],
+    }
+
+    pub struct sockcred2 {
+        pub sc_version: ::c_int,
+        pub sc_pid: ::pid_t,
+        pub sc_uid: ::uid_t,
+        pub sc_euid: ::uid_t,
+        pub sc_gid: ::gid_t,
+        pub sc_egid: ::gid_t,
+        pub sc_ngroups: ::c_int,
+        pub sc_groups: [::gid_t; 1],
+    }
+}
+
+s_no_extra_traits! {
+    pub struct dirent {
+        pub d_fileno: ::ino_t,
+        pub d_off: ::off_t,
+        pub d_reclen: u16,
+        pub d_type: u8,
+        d_pad0: u8,
+        pub d_namlen: u16,
+        d_pad1: u16,
+        pub d_name: [::c_char; 256],
+    }
+
+    pub struct statfs {
+        pub f_version: u32,
+        pub f_type: u32,
+        pub f_flags: u64,
+        pub f_bsize: u64,
+        pub f_iosize: u64,
+        pub f_blocks: u64,
+        pub f_bfree: u64,
+        pub f_bavail: i64,
+        pub f_files: u64,
+        pub f_ffree: i64,
+        pub f_syncwrites: u64,
+        pub f_asyncwrites: u64,
+        pub f_syncreads: u64,
+        pub f_asyncreads: u64,
+        f_spare: [u64; 10],
+        pub f_namemax: u32,
+        pub f_owner: ::uid_t,
+        pub f_fsid: ::fsid_t,
+        f_charspare: [::c_char; 80],
+        pub f_fstypename: [::c_char; 16],
+        pub f_mntfromname: [::c_char; 1024],
+        pub f_mntonname: [::c_char; 1024],
+    }
+}
+
+cfg_if! {
+    if #[cfg(feature = "extra_traits")] {
+        impl PartialEq for statfs {
+            fn eq(&self, other: &statfs) -> bool {
+                self.f_version == other.f_version
+                    && self.f_type == other.f_type
+                    && self.f_flags == other.f_flags
+                    && self.f_bsize == other.f_bsize
+                    && self.f_iosize == other.f_iosize
+                    && self.f_blocks == other.f_blocks
+                    && self.f_bfree == other.f_bfree
+                    && self.f_bavail == other.f_bavail
+                    && self.f_files == other.f_files
+                    && self.f_ffree == other.f_ffree
+                    && self.f_syncwrites == other.f_syncwrites
+                    && self.f_asyncwrites == other.f_asyncwrites
+                    && self.f_syncreads == other.f_syncreads
+                    && self.f_asyncreads == other.f_asyncreads
+                    && self.f_namemax == other.f_namemax
+                    && self.f_owner == other.f_owner
+                    && self.f_fsid == other.f_fsid
+                    && self.f_fstypename == other.f_fstypename
+                    && self
+                    .f_mntfromname
+                    .iter()
+                    .zip(other.f_mntfromname.iter())
+                    .all(|(a,b)| a == b)
+                    && self
+                    .f_mntonname
+                    .iter()
+                    .zip(other.f_mntonname.iter())
+                    .all(|(a,b)| a == b)
+            }
+        }
+        impl Eq for statfs {}
+        impl ::fmt::Debug for statfs {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("statfs")
+                    .field("f_bsize", &self.f_bsize)
+                    .field("f_iosize", &self.f_iosize)
+                    .field("f_blocks", &self.f_blocks)
+                    .field("f_bfree", &self.f_bfree)
+                    .field("f_bavail", &self.f_bavail)
+                    .field("f_files", &self.f_files)
+                    .field("f_ffree", &self.f_ffree)
+                    .field("f_syncwrites", &self.f_syncwrites)
+                    .field("f_asyncwrites", &self.f_asyncwrites)
+                    .field("f_syncreads", &self.f_syncreads)
+                    .field("f_asyncreads", &self.f_asyncreads)
+                    .field("f_namemax", &self.f_namemax)
+                    .field("f_owner", &self.f_owner)
+                    .field("f_fsid", &self.f_fsid)
+                    .field("f_fstypename", &self.f_fstypename)
+                    .field("f_mntfromname", &&self.f_mntfromname[..])
+                    .field("f_mntonname", &&self.f_mntonname[..])
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for statfs {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.f_version.hash(state);
+                self.f_type.hash(state);
+                self.f_flags.hash(state);
+                self.f_bsize.hash(state);
+                self.f_iosize.hash(state);
+                self.f_blocks.hash(state);
+                self.f_bfree.hash(state);
+                self.f_bavail.hash(state);
+                self.f_files.hash(state);
+                self.f_ffree.hash(state);
+                self.f_syncwrites.hash(state);
+                self.f_asyncwrites.hash(state);
+                self.f_syncreads.hash(state);
+                self.f_asyncreads.hash(state);
+                self.f_namemax.hash(state);
+                self.f_owner.hash(state);
+                self.f_fsid.hash(state);
+                self.f_charspare.hash(state);
+                self.f_fstypename.hash(state);
+                self.f_mntfromname.hash(state);
+                self.f_mntonname.hash(state);
+            }
+        }
+
+        impl PartialEq for dirent {
+            fn eq(&self, other: &dirent) -> bool {
+                self.d_fileno == other.d_fileno
+                    && self.d_off == other.d_off
+                    && self.d_reclen == other.d_reclen
+                    && self.d_type == other.d_type
+                    && self.d_namlen == other.d_namlen
+                    && self
+                    .d_name[..self.d_namlen as _]
+                    .iter()
+                    .zip(other.d_name.iter())
+                    .all(|(a,b)| a == b)
+            }
+        }
+        impl Eq for dirent {}
+        impl ::fmt::Debug for dirent {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("dirent")
+                    .field("d_fileno", &self.d_fileno)
+                    .field("d_off", &self.d_off)
+                    .field("d_reclen", &self.d_reclen)
+                    .field("d_type", &self.d_type)
+                    .field("d_namlen", &self.d_namlen)
+                    .field("d_name", &&self.d_name[..self.d_namlen as _])
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for dirent {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.d_fileno.hash(state);
+                self.d_off.hash(state);
+                self.d_reclen.hash(state);
+                self.d_type.hash(state);
+                self.d_namlen.hash(state);
+                self.d_name[..self.d_namlen as _].hash(state);
+            }
+        }
+    }
+}
+
+pub const F_ADD_SEALS: ::c_int = 19;
+pub const F_GET_SEALS: ::c_int = 20;
+pub const F_SEAL_SEAL: ::c_int = 0x0001;
+pub const F_SEAL_SHRINK: ::c_int = 0x0002;
+pub const F_SEAL_GROW: ::c_int = 0x0004;
+pub const F_SEAL_WRITE: ::c_int = 0x0008;
+
+pub const GRND_NONBLOCK: ::c_uint = 0x1;
+pub const GRND_RANDOM: ::c_uint = 0x2;
+
+pub const RAND_MAX: ::c_int = 0x7fff_ffff;
+
+pub const SO_DOMAIN: ::c_int = 0x1019;
+
+pub const EINTEGRITY: ::c_int = 97;
+pub const ELAST: ::c_int = 97;
+pub const GRND_INSECURE: ::c_uint = 0x4;
+
+pub const PROC_ASLR_CTL: ::c_int = 13;
+pub const PROC_ASLR_STATUS: ::c_int = 14;
+pub const PROC_PROTMAX_CTL: ::c_int = 15;
+pub const PROC_PROTMAX_STATUS: ::c_int = 16;
+
+pub const LOCAL_CREDS_PERSISTENT: ::c_int = 3;
+pub const SCM_CREDS2: ::c_int = 0x08;
+
+f! {
+    pub fn SOCKCRED2SIZE(ngrps: usize) -> usize {
+        let ngrps = if ngrps > 0 {
+            ngrps - 1
+        } else {
+            0
+        };
+        ::mem::size_of::<sockcred2>() + ::mem::size_of::<::gid_t>() * ngrps
+    }
+}
+
+extern "C" {
+    pub fn aio_readv(aiocbp: *mut ::aiocb) -> ::c_int;
+    pub fn aio_writev(aiocbp: *mut ::aiocb) -> ::c_int;
+    pub fn setgrent();
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
+    pub fn freelocale(loc: ::locale_t);
+    pub fn msgrcv(
+        msqid: ::c_int,
+        msgp: *mut ::c_void,
+        msgsz: ::size_t,
+        msgtyp: ::c_long,
+        msgflg: ::c_int,
+    ) -> ::ssize_t;
+    pub fn clock_nanosleep(
+        clk_id: ::clockid_t,
+        flags: ::c_int,
+        rqtp: *const ::timespec,
+        rmtp: *mut ::timespec,
+    ) -> ::c_int;
+
+    pub fn fdatasync(fd: ::c_int) -> ::c_int;
+
+    pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
+    pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int;
+    pub fn elf_aux_info(aux: ::c_int, buf: *mut ::c_void, buflen: ::c_int) -> ::c_int;
+    pub fn setproctitle_fast(fmt: *const ::c_char, ...);
+    pub fn timingsafe_bcmp(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
+    pub fn timingsafe_memcmp(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
+}
+
+cfg_if! {
+    if #[cfg(any(target_arch = "x86_64",
+                 target_arch = "aarch64"))] {
+        mod b64;
+        pub use self::b64::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,14 +10,20 @@
 pub type fsfilcnt_t = u64;
 pub type idtype_t = ::c_uint;
 
-pub type key_t = ::c_long;
 pub type msglen_t = ::c_ulong;
 pub type msgqnum_t = ::c_ulong;
 
+pub type cpulevel_t = ::c_int;
+pub type cpuwhich_t = ::c_int;
+
 pub type mqd_t = *mut ::c_void;
 pub type posix_spawnattr_t = *mut ::c_void;
 pub type posix_spawn_file_actions_t = *mut ::c_void;
 
+pub type pthread_spinlock_t = *mut __c_anonymous_pthread_spinlock;
+pub type pthread_barrierattr_t = *mut __c_anonymous_pthread_barrierattr;
+pub type pthread_barrier_t = *mut __c_anonymous_pthread_barrier;
+
 s! {
     pub struct aiocb {
         pub aio_fildes: ::c_int,
@@ -65,16 +71,6 @@
         data: [u32; 4],
     }
 
-    pub struct ipc_perm {
-        pub cuid: ::uid_t,
-        pub cgid: ::gid_t,
-        pub uid: ::uid_t,
-        pub gid: ::gid_t,
-        pub mode: ::mode_t,
-        pub seq: ::c_ushort,
-        pub key: ::key_t,
-    }
-
     pub struct msqid_ds {
         pub msg_perm: ::ipc_perm,
         __unused1: *mut ::c_void,
@@ -89,14 +85,6 @@
         pub msg_ctime: ::time_t,
     }
 
-    pub struct xucred {
-        pub cr_version: ::c_uint,
-        pub cr_uid: ::uid_t,
-        pub cr_ngroups: ::c_short,
-        pub cr_groups: [::gid_t;16],
-        __cr_unused1: *mut ::c_void,
-    }
-
     pub struct stack_t {
         pub ss_sp: *mut ::c_void,
         pub ss_size: ::size_t,
@@ -117,6 +105,11 @@
         pub sc_groups: [::gid_t; 1],
     }
 
+    pub struct accept_filter_arg {
+        pub af_name: [::c_char; 16],
+        af_arg: [[::c_char; 10]; 24],
+    }
+
     pub struct ptrace_vm_entry {
         pub pve_entry: ::c_int,
         pub pve_timestamp: ::c_int,
@@ -129,6 +122,122 @@
         pub pve_fsid: u32,
         pub pve_path: *mut ::c_char,
     }
+
+    pub struct cpuset_t {
+        #[cfg(target_pointer_width = "64")]
+        __bits: [::c_long; 4],
+        #[cfg(target_pointer_width = "32")]
+        __bits: [::c_long; 8],
+    }
+
+    pub struct cap_rights_t {
+        cr_rights: [u64; 2],
+    }
+
+    pub struct umutex {
+        m_owner: ::lwpid_t,
+        m_flags: u32,
+        m_ceilings: [u32; 2],
+        m_rb_link: ::uintptr_t,
+        #[cfg(target_pointer_width = "32")]
+        m_pad: u32,
+        m_spare: [u32; 2],
+
+    }
+
+    pub struct ucond {
+        c_has_waiters: u32,
+        c_flags: u32,
+        c_clockid: u32,
+        c_spare: [u32; 1],
+    }
+
+    pub struct __c_anonymous_pthread_spinlock {
+        s_clock: umutex,
+    }
+
+    pub struct __c_anonymous_pthread_barrierattr {
+        pshared: ::c_int,
+    }
+
+    pub struct __c_anonymous_pthread_barrier {
+        b_lock: umutex,
+        b_cv: ucond,
+        b_cycle: i64,
+        b_count: ::c_int,
+        b_waiters: ::c_int,
+        b_refcount: ::c_int,
+        b_destroying: ::c_int,
+    }
+
+    pub struct kinfo_vmentry {
+        pub kve_structsize: ::c_int,
+        pub kve_type: ::c_int,
+        pub kve_start: u64,
+        pub kve_end: u64,
+        pub kve_offset: u64,
+        pub kve_vn_fileid: u64,
+        #[cfg(not(freebsd11))]
+        pub kve_vn_fsid_freebsd11: u32,
+        #[cfg(freebsd11)]
+        pub kve_vn_fsid: u32,
+        pub kve_flags: ::c_int,
+        pub kve_resident: ::c_int,
+        pub kve_private_resident: ::c_int,
+        pub kve_protection: ::c_int,
+        pub kve_ref_count: ::c_int,
+        pub kve_shadow_count: ::c_int,
+        pub kve_vn_type: ::c_int,
+        pub kve_vn_size: u64,
+        #[cfg(not(freebsd11))]
+        pub kve_vn_rdev_freebsd11: u32,
+        #[cfg(freebsd11)]
+        pub kve_vn_rdev: u32,
+        pub kve_vn_mode: u16,
+        pub kve_status: u16,
+        #[cfg(not(freebsd11))]
+        pub kve_vn_fsid: u64,
+        #[cfg(not(freebsd11))]
+        pub kve_vn_rdev: u64,
+        #[cfg(not(freebsd11))]
+        _kve_is_spare: [::c_int; 8],
+        #[cfg(freebsd11)]
+        _kve_is_spare: [::c_int; 12],
+        pub kve_path: [[::c_char; 32]; 32],
+    }
+
+    pub struct kinfo_proc {
+        __pad0: [[::uintptr_t; 17]; 8],
+    }
+
+    pub struct filestat {
+        fs_type: ::c_int,
+        fs_flags: ::c_int,
+        fs_fflags: ::c_int,
+        fs_uflags: ::c_int,
+        fs_fd: ::c_int,
+        fs_ref_count: ::c_int,
+        fs_offset: ::off_t,
+        fs_typedep: *mut ::c_void,
+        fs_path: *mut ::c_char,
+        next: *mut filestat,
+        fs_cap_rights: cap_rights_t,
+    }
+
+    pub struct filestat_list {
+        stqh_first: *mut filestat,
+        stqh_last: *mut *mut filestat,
+    }
+
+    pub struct procstat {
+        tpe: ::c_int,
+        kd: ::uintptr_t,
+        vmentries: *mut ::c_void,
+        files: *mut ::c_void,
+        argv: *mut ::c_void,
+        envv: *mut ::c_void,
+        core: ::uintptr_t,
+    }
 }
 
 s_no_extra_traits! {
@@ -143,6 +252,23 @@
         pub __ut_spare: [::c_char; 64],
     }
 
+    #[cfg(libc_union)]
+    pub union __c_anonymous_cr_pid {
+        __cr_unused: *mut ::c_void,
+        pub cr_pid: ::pid_t,
+    }
+
+    pub struct xucred {
+        pub cr_version: ::c_uint,
+        pub cr_uid: ::uid_t,
+        pub cr_ngroups: ::c_short,
+        pub cr_groups: [::gid_t; 16],
+        #[cfg(libc_union)]
+        pub cr_pid__c_anonymous_union: __c_anonymous_cr_pid,
+        #[cfg(not(libc_union))]
+        __cr_unused1: *mut ::c_void,
+    }
+
     pub struct sockaddr_dl {
         pub sdl_len: ::c_uchar,
         pub sdl_family: ::c_uchar,
@@ -173,6 +299,17 @@
         __unused1: ::c_int,
         __unused2: [::c_long; 7]
     }
+
+    #[cfg(libc_union)]
+    pub union __c_anonymous_elf32_auxv_union {
+        pub a_val: ::c_int,
+    }
+
+    pub struct Elf32_Auxinfo {
+        pub a_type: ::c_int,
+        #[cfg(libc_union)]
+        pub a_un: __c_anonymous_elf32_auxv_union,
+    }
 }
 
 cfg_if! {
@@ -225,6 +362,73 @@
             }
         }
 
+        #[cfg(libc_union)]
+        impl PartialEq for __c_anonymous_cr_pid {
+            fn eq(&self, other: &__c_anonymous_cr_pid) -> bool {
+                unsafe { self.cr_pid == other.cr_pid}
+            }
+        }
+        #[cfg(libc_union)]
+        impl Eq for __c_anonymous_cr_pid {}
+        #[cfg(libc_union)]
+        impl ::fmt::Debug for __c_anonymous_cr_pid {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("cr_pid")
+                    .field("cr_pid", unsafe { &self.cr_pid })
+                    .finish()
+            }
+        }
+        #[cfg(libc_union)]
+        impl ::hash::Hash for __c_anonymous_cr_pid {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                unsafe { self.cr_pid.hash(state) };
+            }
+        }
+
+        impl PartialEq for xucred {
+            fn eq(&self, other: &xucred) -> bool {
+                #[cfg(libc_union)]
+                let equal_cr_pid = self.cr_pid__c_anonymous_union
+                    == other.cr_pid__c_anonymous_union;
+                #[cfg(not(libc_union))]
+                let equal_cr_pid = self.__cr_unused1 == other.__cr_unused1;
+
+                self.cr_version == other.cr_version
+                    && self.cr_uid == other.cr_uid
+                    && self.cr_ngroups == other.cr_ngroups
+                    && self.cr_groups == other.cr_groups
+                    && equal_cr_pid
+            }
+        }
+        impl Eq for xucred {}
+        impl ::fmt::Debug for xucred {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                let mut struct_formatter = f.debug_struct("xucred");
+                struct_formatter.field("cr_version", &self.cr_version);
+                struct_formatter.field("cr_uid", &self.cr_uid);
+                struct_formatter.field("cr_ngroups", &self.cr_ngroups);
+                struct_formatter.field("cr_groups", &self.cr_groups);
+                #[cfg(libc_union)]
+                struct_formatter.field(
+                    "cr_pid__c_anonymous_union",
+                    &self.cr_pid__c_anonymous_union
+                );
+                struct_formatter.finish()
+            }
+        }
+        impl ::hash::Hash for xucred {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.cr_version.hash(state);
+                self.cr_uid.hash(state);
+                self.cr_ngroups.hash(state);
+                self.cr_groups.hash(state);
+                #[cfg(libc_union)]
+                self.cr_pid__c_anonymous_union.hash(state);
+                #[cfg(not(libc_union))]
+                self.__cr_unused1.hash(state);
+            }
+        }
+
         impl PartialEq for sockaddr_dl {
             fn eq(&self, other: &sockaddr_dl) -> bool {
                 self.sdl_len == other.sdl_len
@@ -326,6 +530,53 @@
                 self.sigev_notify_thread_id.hash(state);
             }
         }
+        #[cfg(libc_union)]
+        impl PartialEq for __c_anonymous_elf32_auxv_union {
+            fn eq(&self, other: &__c_anonymous_elf32_auxv_union) -> bool {
+                unsafe { self.a_val == other.a_val}
+            }
+        }
+        #[cfg(libc_union)]
+        impl Eq for __c_anonymous_elf32_auxv_union {}
+        #[cfg(libc_union)]
+        impl ::fmt::Debug for __c_anonymous_elf32_auxv_union {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("a_val")
+                    .field("a_val", unsafe { &self.a_val })
+                    .finish()
+            }
+        }
+        #[cfg(not(libc_union))]
+        impl PartialEq for Elf32_Auxinfo {
+            fn eq(&self, other: &Elf32_Auxinfo) -> bool {
+                self.a_type == other.a_type
+            }
+        }
+        #[cfg(libc_union)]
+        impl PartialEq for Elf32_Auxinfo {
+            fn eq(&self, other: &Elf32_Auxinfo) -> bool {
+                self.a_type == other.a_type
+                    && self.a_un == other.a_un
+            }
+        }
+        impl Eq for Elf32_Auxinfo {}
+        #[cfg(not(libc_union))]
+        impl ::fmt::Debug for Elf32_Auxinfo {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("Elf32_Auxinfo")
+                    .field("a_type", &self.a_type)
+                    .finish()
+            }
+        }
+        #[cfg(libc_union)]
+        impl ::fmt::Debug for Elf32_Auxinfo {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("Elf32_Auxinfo")
+                    .field("a_type", &self.a_type)
+                    .field("a_un", &self.a_un)
+                    .finish()
+            }
+        }
     }
 }
 
@@ -335,14 +586,6 @@
 pub const EXTATTR_NAMESPACE_USER: ::c_int = 1;
 pub const EXTATTR_NAMESPACE_SYSTEM: ::c_int = 2;
 
-cfg_if! {
-    if #[cfg(any(freebsd10, freebsd11, freebsd12))] {
-        pub const RAND_MAX: ::c_int = 0x7fff_fffd;
-    } else {
-        pub const RAND_MAX: ::c_int = 0x7fff_ffff;
-    }
-}
-
 pub const PTHREAD_STACK_MIN: ::size_t = MINSIGSTKSZ;
 pub const PTHREAD_MUTEX_ADAPTIVE_NP: ::c_int = 4;
 pub const SIGSTKSZ: ::size_t = MINSIGSTKSZ + 32768;
@@ -379,6 +622,10 @@
 pub const Q_GETQUOTA: ::c_int = 0x700;
 pub const Q_SETQUOTA: ::c_int = 0x800;
 
+pub const MAP_GUARD: ::c_int = 0x00002000;
+pub const MAP_EXCL: ::c_int = 0x00004000;
+pub const MAP_ALIGNED_SUPER: ::c_int = 1 << 24;
+
 pub const POSIX_FADV_NORMAL: ::c_int = 0;
 pub const POSIX_FADV_RANDOM: ::c_int = 1;
 pub const POSIX_FADV_SEQUENTIAL: ::c_int = 2;
@@ -622,6 +869,16 @@
 pub const JAIL_SYS_NEW: ::c_int = 1;
 pub const JAIL_SYS_INHERIT: ::c_int = 2;
 
+pub const MNT_ACLS: ::c_int = 0x08000000;
+pub const MNT_BYFSID: ::c_int = 0x08000000;
+pub const MNT_GJOURNAL: ::c_int = 0x02000000;
+pub const MNT_MULTILABEL: ::c_int = 0x04000000;
+pub const MNT_NFS4ACLS: ::c_int = 0x00000010;
+pub const MNT_SNAPSHOT: ::c_int = 0x01000000;
+pub const MNT_UNION: ::c_int = 0x00000020;
+pub const MNT_EXPUBLIC: ::c_int = 0x20000000;
+pub const MNT_NONBUSY: ::c_int = 0x04000000;
+
 pub const SO_BINTIME: ::c_int = 0x2000;
 pub const SO_NO_OFFLOAD: ::c_int = 0x4000;
 pub const SO_NO_DDP: ::c_int = 0x8000;
@@ -637,7 +894,6 @@
 pub const SO_PROTOTYPE: ::c_int = SO_PROTOCOL;
 pub const SO_VENDOR: ::c_int = 0x80000000;
 
-pub const LOCAL_PEERCRED: ::c_int = 1;
 pub const LOCAL_CREDS: ::c_int = 2;
 pub const LOCAL_CONNWAIT: ::c_int = 4;
 pub const LOCAL_VENDOR: ::c_int = SO_VENDOR;
@@ -675,6 +931,21 @@
 pub const PTRACE_VFORK: ::c_int = 0x0020;
 pub const PTRACE_DEFAULT: ::c_int = PTRACE_EXEC;
 
+pub const PROC_SPROTECT: ::c_int = 1;
+pub const PROC_REAP_ACQUIRE: ::c_int = 2;
+pub const PROC_REAP_RELEASE: ::c_int = 3;
+pub const PROC_REAP_STATUS: ::c_int = 4;
+pub const PROC_REAP_GETPIDS: ::c_int = 5;
+pub const PROC_REAP_KILL: ::c_int = 6;
+pub const PROC_TRACE_CTL: ::c_int = 7;
+pub const PROC_TRACE_STATUS: ::c_int = 8;
+pub const PROC_TRAPCAP_CTL: ::c_int = 9;
+pub const PROC_TRAPCAP_STATUS: ::c_int = 10;
+pub const PROC_PDEATHSIG_CTL: ::c_int = 11;
+pub const PROC_PDEATHSIG_STATUS: ::c_int = 12;
+pub const PROC_STACKGAP_CTL: ::c_int = 17;
+pub const PROC_STACKGAP_STATUS: ::c_int = 18;
+
 pub const AF_SLOW: ::c_int = 33;
 pub const AF_SCLUSTER: ::c_int = 34;
 pub const AF_ARP: ::c_int = 35;
@@ -702,10 +973,7 @@
 pub const IFF_ALLMULTI: ::c_int = 0x200; // (n) receive all multicast packets
 pub const IFF_OACTIVE: ::c_int = 0x400; // (d) tx hardware queue is full
 #[doc(hidden)]
-#[deprecated(
-    since = "0.2.54",
-    note = "Use the portable `IFF_OACTIVE` instead"
-)]
+#[deprecated(since = "0.2.54", note = "Use the portable `IFF_OACTIVE` instead")]
 pub const IFF_DRV_OACTIVE: ::c_int = 0x400;
 pub const IFF_SIMPLEX: ::c_int = 0x800; // (i) can't hear own transmissions
 pub const IFF_LINK0: ::c_int = 0x1000; // per link layer defined bit
@@ -1003,22 +1271,8 @@
 pub const NET_RT_IFLISTL: ::c_int = 5;
 
 // System V IPC
-pub const IPC_PRIVATE: ::key_t = 0;
-pub const IPC_CREAT: ::c_int = 0o1000;
-pub const IPC_EXCL: ::c_int = 0o2000;
-pub const IPC_NOWAIT: ::c_int = 0o4000;
-pub const IPC_RMID: ::c_int = 0;
-pub const IPC_SET: ::c_int = 1;
-pub const IPC_STAT: ::c_int = 2;
 pub const IPC_INFO: ::c_int = 3;
-pub const IPC_R: ::c_int = 0o400;
-pub const IPC_W: ::c_int = 0o200;
-pub const IPC_M: ::c_int = 0o10000;
 pub const MSG_NOERROR: ::c_int = 0o10000;
-pub const SHM_RDONLY: ::c_int = 0o10000;
-pub const SHM_RND: ::c_int = 0o20000;
-pub const SHM_R: ::c_int = 0o400;
-pub const SHM_W: ::c_int = 0o200;
 pub const SHM_LOCK: ::c_int = 11;
 pub const SHM_UNLOCK: ::c_int = 12;
 pub const SHM_STAT: ::c_int = 13;
@@ -1103,6 +1357,23 @@
 pub const AT_SYMLINK_FOLLOW: ::c_int = 0x400;
 pub const AT_REMOVEDIR: ::c_int = 0x800;
 
+pub const AT_NULL: ::c_int = 0;
+pub const AT_IGNORE: ::c_int = 1;
+pub const AT_EXECFD: ::c_int = 2;
+pub const AT_PHDR: ::c_int = 3;
+pub const AT_PHENT: ::c_int = 4;
+pub const AT_PHNUM: ::c_int = 5;
+pub const AT_PAGESZ: ::c_int = 6;
+pub const AT_BASE: ::c_int = 7;
+pub const AT_FLAGS: ::c_int = 8;
+pub const AT_ENTRY: ::c_int = 9;
+pub const AT_NOTELF: ::c_int = 10;
+pub const AT_UID: ::c_int = 11;
+pub const AT_EUID: ::c_int = 12;
+pub const AT_GID: ::c_int = 13;
+pub const AT_EGID: ::c_int = 14;
+pub const AT_EXECPATH: ::c_int = 15;
+
 pub const TABDLY: ::tcflag_t = 0x00000004;
 pub const TAB0: ::tcflag_t = 0x00000000;
 pub const TAB3: ::tcflag_t = 0x00000004;
@@ -1111,9 +1382,6 @@
 
 pub const _SC_CPUSET_SIZE: ::c_int = 122;
 
-pub const XU_NGROUPS: ::c_int = 16;
-pub const XUCRED_VERSION: ::c_uint = 0;
-
 // Flags which can be passed to pdfork(2)
 pub const PD_DAEMON: ::c_int = 0x00000001;
 pub const PD_CLOEXEC: ::c_int = 0x00000002;
@@ -1150,8 +1418,29 @@
 pub const F_RDAHEAD: ::c_int = 16;
 pub const F_DUP2FD_CLOEXEC: ::c_int = 18;
 
-fn _ALIGN(p: usize) -> usize {
-    (p + _ALIGNBYTES) & !_ALIGNBYTES
+// For realhostname* api
+pub const HOSTNAME_FOUND: ::c_int = 0;
+pub const HOSTNAME_INCORRECTNAME: ::c_int = 1;
+pub const HOSTNAME_INVALIDADDR: ::c_int = 2;
+pub const HOSTNAME_INVALIDNAME: ::c_int = 3;
+
+// For rfork
+pub const RFFDG: ::c_int = 4;
+pub const RFPROC: ::c_int = 16;
+pub const RFMEM: ::c_int = 32;
+pub const RFNOWAIT: ::c_int = 64;
+pub const RFCFDG: ::c_int = 4096;
+pub const RFTHREAD: ::c_int = 8192;
+pub const RFLINUXTHPN: ::c_int = 65536;
+pub const RFTSIGZMB: ::c_int = 524288;
+pub const RFSPAWN: ::c_int = 2147483648;
+
+pub const MALLOCX_ZERO: ::c_int = 0x40;
+
+const_fn! {
+    {const} fn _ALIGN(p: usize) -> usize {
+        (p + _ALIGNBYTES) & !_ALIGNBYTES
+    }
 }
 
 f! {
@@ -1182,11 +1471,23 @@
         }
     }
 
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+    pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
         (_ALIGN(::mem::size_of::<::cmsghdr>()) + _ALIGN(length as usize))
             as ::c_uint
     }
 
+    pub fn MALLOCX_ALIGN(lg: ::c_uint) -> ::c_int {
+        ffsl(lg as ::c_long - 1)
+    }
+
+    pub {const} fn MALLOCX_TCACHE(tc: ::c_int) -> ::c_int {
+        (tc + 2) << 8 as ::c_int
+    }
+
+    pub {const} fn MALLOCX_ARENA(a: ::c_int) -> ::c_int {
+        (a + 1) << 20 as ::c_int
+    }
+
     pub fn SOCKCREDSIZE(ngrps: usize) -> usize {
         let ngrps = if ngrps > 0 {
             ngrps - 1
@@ -1199,6 +1500,38 @@
     pub fn uname(buf: *mut ::utsname) -> ::c_int {
         __xuname(256, buf as *mut ::c_void)
     }
+
+    pub fn CPU_ZERO(cpuset: &mut cpuset_t) -> () {
+        for slot in cpuset.__bits.iter_mut() {
+            *slot = 0;
+        }
+    }
+
+    pub fn CPU_FILL(cpuset: &mut cpuset_t) -> () {
+        for slot in cpuset.__bits.iter_mut() {
+            *slot = !0;
+        }
+    }
+
+    pub fn CPU_SET(cpu: usize, cpuset: &mut cpuset_t) -> () {
+        let bitset_bits = ::mem::size_of::<::c_long>();
+        let (idx, offset) = (cpu / bitset_bits, cpu % bitset_bits);
+        cpuset.__bits[idx] |= 1 << offset;
+        ()
+    }
+
+    pub fn CPU_CLR(cpu: usize, cpuset: &mut cpuset_t) -> () {
+        let bitset_bits = ::mem::size_of::<::c_long>();
+        let (idx, offset) = (cpu / bitset_bits, cpu % bitset_bits);
+        cpuset.__bits[idx] &= !(1 << offset);
+        ()
+    }
+
+    pub fn CPU_ISSET(cpu: usize, cpuset: &mut cpuset_t) -> bool {
+        let bitset_bits = ::mem::size_of::<::c_long>();
+        let (idx, offset) = (cpu / bitset_bits, cpu % bitset_bits);
+        0 != cpuset.__bits[idx] & (1 << offset)
+    }
 }
 
 safe_f! {
@@ -1210,6 +1543,18 @@
 extern "C" {
     pub fn __error() -> *mut ::c_int;
 
+    pub fn aio_cancel(fd: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
+    pub fn aio_error(aiocbp: *const aiocb) -> ::c_int;
+    pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
+    pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
+    pub fn aio_return(aiocbp: *mut aiocb) -> ::ssize_t;
+    pub fn aio_suspend(
+        aiocb_list: *const *const aiocb,
+        nitems: ::c_int,
+        timeout: *const ::timespec,
+    ) -> ::c_int;
+    pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
+
     pub fn extattr_delete_fd(
         fd: ::c_int,
         attrnamespace: ::c_int,
@@ -1289,42 +1634,25 @@
     pub fn jail(jail: *mut ::jail) -> ::c_int;
     pub fn jail_attach(jid: ::c_int) -> ::c_int;
     pub fn jail_remove(jid: ::c_int) -> ::c_int;
-    pub fn jail_get(
-        iov: *mut ::iovec,
-        niov: ::c_uint,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn jail_set(
-        iov: *mut ::iovec,
-        niov: ::c_uint,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn jail_get(iov: *mut ::iovec, niov: ::c_uint, flags: ::c_int) -> ::c_int;
+    pub fn jail_set(iov: *mut ::iovec, niov: ::c_uint, flags: ::c_int) -> ::c_int;
 
-    pub fn posix_fallocate(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
-    pub fn posix_fadvise(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-        advise: ::c_int,
+    pub fn lio_listio(
+        mode: ::c_int,
+        aiocb_list: *const *mut aiocb,
+        nitems: ::c_int,
+        sevp: *mut sigevent,
     ) -> ::c_int;
+
+    pub fn posix_fallocate(fd: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
+    pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t, advise: ::c_int) -> ::c_int;
     pub fn mkostemp(template: *mut ::c_char, flags: ::c_int) -> ::c_int;
-    pub fn mkostemps(
-        template: *mut ::c_char,
-        suffixlen: ::c_int,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn mkostemps(template: *mut ::c_char, suffixlen: ::c_int, flags: ::c_int) -> ::c_int;
 
     pub fn getutxuser(user: *const ::c_char) -> *mut utmpx;
     pub fn setutxdb(_type: ::c_int, file: *const ::c_char) -> ::c_int;
 
-    pub fn aio_waitcomplete(
-        iocbp: *mut *mut aiocb,
-        timeout: *mut ::timespec,
-    ) -> ::ssize_t;
+    pub fn aio_waitcomplete(iocbp: *mut *mut aiocb, timeout: *mut ::timespec) -> ::ssize_t;
     pub fn mq_getfd_np(mqd: ::mqd_t) -> ::c_int;
 
     pub fn waitid(
@@ -1336,22 +1664,10 @@
 
     pub fn ftok(pathname: *const ::c_char, proj_id: ::c_int) -> ::key_t;
     pub fn shmget(key: ::key_t, size: ::size_t, shmflg: ::c_int) -> ::c_int;
-    pub fn shmat(
-        shmid: ::c_int,
-        shmaddr: *const ::c_void,
-        shmflg: ::c_int,
-    ) -> *mut ::c_void;
+    pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
     pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
-    pub fn shmctl(
-        shmid: ::c_int,
-        cmd: ::c_int,
-        buf: *mut ::shmid_ds,
-    ) -> ::c_int;
-    pub fn msgctl(
-        msqid: ::c_int,
-        cmd: ::c_int,
-        buf: *mut ::msqid_ds,
-    ) -> ::c_int;
+    pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
+    pub fn msgctl(msqid: ::c_int, cmd: ::c_int, buf: *mut ::msqid_ds) -> ::c_int;
     pub fn msgget(key: ::key_t, msgflg: ::c_int) -> ::c_int;
     pub fn msgsnd(
         msqid: ::c_int,
@@ -1370,11 +1686,7 @@
     pub fn pdgetpid(fd: ::c_int, pidp: *mut ::pid_t) -> ::c_int;
     pub fn pdkill(fd: ::c_int, signum: ::c_int) -> ::c_int;
 
-    pub fn rtprio_thread(
-        function: ::c_int,
-        lwpid: ::lwpid_t,
-        rtp: *mut super::rtprio,
-    ) -> ::c_int;
+    pub fn rtprio_thread(function: ::c_int, lwpid: ::lwpid_t, rtp: *mut super::rtprio) -> ::c_int;
 
     pub fn posix_spawn(
         pid: *mut ::pid_t,
@@ -1414,26 +1726,17 @@
         attr: *const posix_spawnattr_t,
         flags: *mut ::c_short,
     ) -> ::c_int;
-    pub fn posix_spawnattr_setflags(
-        attr: *mut posix_spawnattr_t,
-        flags: ::c_short,
-    ) -> ::c_int;
+    pub fn posix_spawnattr_setflags(attr: *mut posix_spawnattr_t, flags: ::c_short) -> ::c_int;
     pub fn posix_spawnattr_getpgroup(
         attr: *const posix_spawnattr_t,
         flags: *mut ::pid_t,
     ) -> ::c_int;
-    pub fn posix_spawnattr_setpgroup(
-        attr: *mut posix_spawnattr_t,
-        flags: ::pid_t,
-    ) -> ::c_int;
+    pub fn posix_spawnattr_setpgroup(attr: *mut posix_spawnattr_t, flags: ::pid_t) -> ::c_int;
     pub fn posix_spawnattr_getschedpolicy(
         attr: *const posix_spawnattr_t,
         flags: *mut ::c_int,
     ) -> ::c_int;
-    pub fn posix_spawnattr_setschedpolicy(
-        attr: *mut posix_spawnattr_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_spawnattr_setschedpolicy(attr: *mut posix_spawnattr_t, flags: ::c_int) -> ::c_int;
     pub fn posix_spawnattr_getschedparam(
         attr: *const posix_spawnattr_t,
         param: *mut ::sched_param,
@@ -1443,12 +1746,8 @@
         param: *const ::sched_param,
     ) -> ::c_int;
 
-    pub fn posix_spawn_file_actions_init(
-        actions: *mut posix_spawn_file_actions_t,
-    ) -> ::c_int;
-    pub fn posix_spawn_file_actions_destroy(
-        actions: *mut posix_spawn_file_actions_t,
-    ) -> ::c_int;
+    pub fn posix_spawn_file_actions_init(actions: *mut posix_spawn_file_actions_t) -> ::c_int;
+    pub fn posix_spawn_file_actions_destroy(actions: *mut posix_spawn_file_actions_t) -> ::c_int;
     pub fn posix_spawn_file_actions_addopen(
         actions: *mut posix_spawn_file_actions_t,
         fd: ::c_int,
@@ -1466,15 +1765,27 @@
         newfd: ::c_int,
     ) -> ::c_int;
 
-    #[cfg_attr(
-        all(target_os = "freebsd", freebsd11),
-        link_name = "statfs@FBSD_1.0"
-    )]
+    pub fn pthread_getthreadid_np() -> ::c_int;
+    pub fn pthread_getaffinity_np(
+        td: ::pthread_t,
+        cpusetsize: ::size_t,
+        cpusetp: *mut cpuset_t,
+    ) -> ::c_int;
+    pub fn pthread_setaffinity_np(
+        td: ::pthread_t,
+        cpusetsize: ::size_t,
+        cpusetp: *const cpuset_t,
+    ) -> ::c_int;
+
+    pub fn pthread_spin_init(lock: *mut pthread_spinlock_t, pshared: ::c_int) -> ::c_int;
+    pub fn pthread_spin_destroy(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_lock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_trylock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_unlock(lock: *mut pthread_spinlock_t) -> ::c_int;
+
+    #[cfg_attr(all(target_os = "freebsd", freebsd11), link_name = "statfs@FBSD_1.0")]
     pub fn statfs(path: *const ::c_char, buf: *mut statfs) -> ::c_int;
-    #[cfg_attr(
-        all(target_os = "freebsd", freebsd11),
-        link_name = "fstatfs@FBSD_1.0"
-    )]
+    #[cfg_attr(all(target_os = "freebsd", freebsd11), link_name = "fstatfs@FBSD_1.0")]
     pub fn fstatfs(fd: ::c_int, buf: *mut statfs) -> ::c_int;
 
     pub fn dup3(src: ::c_int, dst: ::c_int, flags: ::c_int) -> ::c_int;
@@ -1500,11 +1811,81 @@
         needlelen: ::size_t,
     ) -> *mut ::c_void;
 
-    pub fn nmount(
-        iov: *mut ::iovec,
-        niov: ::c_uint,
-        flags: ::c_int,
+    pub fn nmount(iov: *mut ::iovec, niov: ::c_uint, flags: ::c_int) -> ::c_int;
+    pub fn setproctitle(fmt: *const ::c_char, ...);
+    pub fn rfork(flags: ::c_int) -> ::c_int;
+    pub fn cpuset_getaffinity(
+        level: cpulevel_t,
+        which: cpuwhich_t,
+        id: ::id_t,
+        setsize: ::size_t,
+        mask: *mut cpuset_t,
+    ) -> ::c_int;
+    pub fn cpuset_setaffinity(
+        level: cpulevel_t,
+        which: cpuwhich_t,
+        id: ::id_t,
+        setsize: ::size_t,
+        mask: *const cpuset_t,
     ) -> ::c_int;
+    pub fn cap_enter() -> ::c_int;
+    pub fn cap_getmode(modep: *mut ::c_uint) -> ::c_int;
+    pub fn __cap_rights_init(version: ::c_int, rights: *mut cap_rights_t, ...)
+        -> *mut cap_rights_t;
+    pub fn __cap_rights_set(rights: *mut cap_rights_t, ...) -> *mut cap_rights_t;
+    pub fn __cap_rights_clear(rights: *mut cap_rights_t, ...) -> *mut cap_rights_t;
+    pub fn __cap_rights_is_set(rights: *const cap_rights_t, ...) -> bool;
+    pub fn cap_rights_is_valid(rights: *const cap_rights_t) -> bool;
+    pub fn cap_rights_limit(fd: ::c_int, rights: *const cap_rights_t) -> ::c_int;
+    pub fn cap_rights_merge(dst: *mut cap_rights_t, src: *const cap_rights_t) -> *mut cap_rights_t;
+    pub fn cap_rights_remove(dst: *mut cap_rights_t, src: *const cap_rights_t)
+        -> *mut cap_rights_t;
+    pub fn cap_rights_contains(big: *const cap_rights_t, little: *const cap_rights_t) -> bool;
+
+    pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
+
+    pub fn ffs(value: ::c_int) -> ::c_int;
+    pub fn ffsl(value: ::c_long) -> ::c_int;
+    pub fn ffsll(value: ::c_longlong) -> ::c_int;
+    pub fn fls(value: ::c_int) -> ::c_int;
+    pub fn flsl(value: ::c_long) -> ::c_int;
+    pub fn flsll(value: ::c_longlong) -> ::c_int;
+    pub fn malloc_usable_size(ptr: *const ::c_void) -> ::size_t;
+    pub fn malloc_stats_print(
+        write_cb: unsafe extern "C" fn(*mut ::c_void, *const ::c_char),
+        cbopaque: *mut ::c_void,
+        opt: *const ::c_char,
+    );
+    pub fn mallctl(
+        name: *const ::c_char,
+        oldp: *mut ::c_void,
+        oldlenp: *mut ::size_t,
+        newp: *mut ::c_void,
+        newlen: ::size_t,
+    ) -> ::c_int;
+    pub fn mallctlnametomib(
+        name: *const ::c_char,
+        mibp: *mut ::size_t,
+        miplen: *mut ::size_t,
+    ) -> ::c_int;
+    pub fn mallctlbymib(
+        mib: *const ::size_t,
+        mible: ::size_t,
+        oldp: *mut ::c_void,
+        oldlenp: *mut ::size_t,
+        newp: *mut ::c_void,
+        newlen: ::size_t,
+    ) -> ::c_int;
+    pub fn mallocx(size: ::size_t, flags: ::c_int) -> *mut ::c_void;
+    pub fn rallocx(ptr: *mut ::c_void, size: ::size_t, flags: ::c_int) -> *mut ::c_void;
+    pub fn xallocx(ptr: *mut ::c_void, size: ::size_t, extra: ::size_t, flags: ::c_int)
+        -> ::size_t;
+    pub fn sallocx(ptr: *const ::c_void, flags: ::c_int) -> ::size_t;
+    pub fn dallocx(ptr: *mut ::c_void, flags: ::c_int);
+    pub fn sdallocx(ptr: *mut ::c_void, size: ::size_t, flags: ::c_int);
+    pub fn nallocx(size: ::size_t, flags: ::c_int) -> ::size_t;
+
+    pub fn procctl(idtype: ::idtype_t, id: ::id_t, cmd: ::c_int, data: *mut ::c_void) -> ::c_int;
 }
 
 #[link(name = "util")]
@@ -1517,13 +1898,50 @@
         string: *const ::c_char,
         attrnamespace: *mut ::c_int,
     ) -> ::c_int;
+    pub fn realhostname(host: *mut ::c_char, hsize: ::size_t, ip: *const ::in_addr) -> ::c_int;
+    pub fn realhostname_sa(
+        host: *mut ::c_char,
+        hsize: ::size_t,
+        addr: *mut ::sockaddr,
+        addrlen: ::c_int,
+    ) -> ::c_int;
+
+    pub fn kld_isloaded(name: *const ::c_char) -> ::c_int;
+    pub fn kld_load(name: *const ::c_char) -> ::c_int;
+
+    pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::c_int) -> *mut kinfo_vmentry;
+}
+
+#[link(name = "procstat")]
+extern "C" {
+    pub fn procstat_open_sysctl() -> *mut procstat;
+    pub fn procstat_getfiles(
+        procstat: *mut procstat,
+        kp: *mut kinfo_proc,
+        mmapped: ::c_int,
+    ) -> *mut filestat_list;
+    pub fn procstat_freefiles(procstat: *mut procstat, head: *mut filestat_list);
+    pub fn procstat_getprocs(
+        procstat: *mut procstat,
+        what: ::c_int,
+        arg: ::c_int,
+        count: *mut ::c_uint,
+    ) -> *mut kinfo_proc;
+    pub fn procstat_freeprocs(procstat: *mut procstat, p: *mut kinfo_proc);
+    pub fn procstat_getvmmap(
+        procstat: *mut procstat,
+        kp: *mut kinfo_proc,
+        count: *mut ::c_uint,
+    ) -> *mut kinfo_vmentry;
+    pub fn procstat_freevmmap(procstat: *mut procstat, vmmap: *mut kinfo_vmentry);
+    pub fn procstat_close(procstat: *mut procstat);
 }
 
 cfg_if! {
-    if #[cfg(freebsd12)] {
-        mod freebsd12;
-        pub use self::freebsd12::*;
-    } else if #[cfg(freebsd13)] {
+    if #[cfg(freebsd13)] {
+        mod freebsd13;
+        pub use self::freebsd13::*;
+    } else if #[cfg(freebsd12)] {
         mod freebsd12;
         pub use self::freebsd12::*;
     } else if #[cfg(any(freebsd10, freebsd11))] {
@@ -1550,6 +1968,9 @@
     } else if #[cfg(target_arch = "powerpc64")] {
         mod powerpc64;
         pub use self::powerpc64::*;
+    } else if #[cfg(target_arch = "powerpc")] {
+        mod powerpc;
+        pub use self::powerpc::*;
     } else {
         // Unknown target_arch
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/powerpc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/powerpc.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/powerpc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+pub type c_char = u8;
+pub type c_long = i32;
+pub type c_ulong = u32;
+pub type wchar_t = i32;
+pub type time_t = i64;
+pub type suseconds_t = i32;
+pub type register_t = i32;
+
+s! {
+    pub struct stat {
+        pub st_dev: ::dev_t,
+        pub st_ino: ::ino_t,
+        pub st_mode: ::mode_t,
+        pub st_nlink: ::nlink_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::dev_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_size: ::off_t,
+        pub st_blocks: ::blkcnt_t,
+        pub st_blksize: ::blksize_t,
+        pub st_flags: ::fflags_t,
+        pub st_gen: u32,
+        pub st_lspare: i32,
+        pub st_birthtime: ::time_t,
+        pub st_birthtime_nsec: ::c_long,
+    }
+}
+
+// should be pub(crate), but that requires Rust 1.18.0
+cfg_if! {
+    if #[cfg(libc_const_size_of)] {
+        #[doc(hidden)]
+        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
+    } else {
+        #[doc(hidden)]
+        pub const _ALIGNBYTES: usize = 4 - 1;
+    }
+}
+
+pub const MAP_32BIT: ::c_int = 0x00080000;
+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -80,6 +80,19 @@
         pub xmm_reg: [[u8; 16]; 8],
         pub xmm_pad: [u8; 224],
     }
+
+    #[cfg(libc_union)]
+    pub union __c_anonymous_elf64_auxv_union {
+        pub a_val: ::c_long,
+        pub a_ptr: *mut ::c_void,
+        pub a_fcn: extern "C" fn(),
+    }
+
+    pub struct Elf64_Auxinfo {
+        pub a_type: ::c_long,
+        #[cfg(libc_union)]
+        pub a_un: __c_anonymous_elf64_auxv_union,
+    }
 }
 
 cfg_if! {
@@ -173,6 +186,56 @@
                 self.xmm_pad.hash(state);
             }
         }
+
+        #[cfg(libc_union)]
+        impl PartialEq for __c_anonymous_elf64_auxv_union {
+            fn eq(&self, other: &__c_anonymous_elf64_auxv_union) -> bool {
+                unsafe { self.a_val == other.a_val
+                        || self.a_ptr == other.a_ptr
+                        || self.a_fcn == other.a_fcn }
+            }
+        }
+        #[cfg(libc_union)]
+        impl Eq for __c_anonymous_elf64_auxv_union {}
+        #[cfg(libc_union)]
+        impl ::fmt::Debug for __c_anonymous_elf64_auxv_union {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("a_val")
+                    .field("a_val", unsafe { &self.a_val })
+                    .finish()
+            }
+        }
+        #[cfg(not(libc_union))]
+        impl PartialEq for Elf64_Auxinfo {
+            fn eq(&self, other: &Elf64_Auxinfo) -> bool {
+                self.a_type == other.a_type
+            }
+        }
+        #[cfg(libc_union)]
+        impl PartialEq for Elf64_Auxinfo {
+            fn eq(&self, other: &Elf64_Auxinfo) -> bool {
+                self.a_type == other.a_type
+                    && self.a_un == other.a_un
+            }
+        }
+        impl Eq for Elf64_Auxinfo {}
+        #[cfg(not(libc_union))]
+        impl ::fmt::Debug for Elf64_Auxinfo {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("Elf64_Auxinfo")
+                    .field("a_type", &self.a_type)
+                    .finish()
+            }
+        }
+        #[cfg(libc_union)]
+        impl ::fmt::Debug for Elf64_Auxinfo {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("Elf64_Auxinfo")
+                    .field("a_type", &self.a_type)
+                    .field("a_un", &self.a_un)
+                    .finish()
+            }
+        }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/freebsdlike/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,6 +13,7 @@
 pub type nl_item = ::c_int;
 pub type id_t = i64;
 pub type vm_size_t = ::uintptr_t;
+pub type key_t = ::c_long;
 
 // elf.h
 
@@ -32,6 +33,8 @@
 pub type Elf64_Word = u32;
 pub type Elf64_Xword = u64;
 
+pub type iconv_t = *mut ::c_void;
+
 cfg_if! {
     if #[cfg(target_pointer_width = "64")] {
         type Elf_Addr = Elf64_Addr;
@@ -71,6 +74,10 @@
     pub unsafe fn si_uid(&self) -> ::uid_t {
         self.si_uid
     }
+
+    pub unsafe fn si_status(&self) -> ::c_int {
+        self.si_status
+    }
 }
 
 s! {
@@ -266,6 +273,42 @@
         pub piod_len: ::size_t,
     }
 
+    // bpf.h
+
+    pub struct bpf_program {
+        pub bf_len: ::c_uint,
+        pub bf_insns: *mut bpf_insn,
+    }
+
+    pub struct bpf_stat {
+        pub bs_recv: ::c_uint,
+        pub bs_drop: ::c_uint,
+    }
+
+    pub struct bpf_version {
+        pub bv_major: ::c_ushort,
+        pub bv_minor: ::c_ushort,
+    }
+
+    pub struct bpf_hdr {
+        pub bh_tstamp: ::timeval,
+        pub bh_caplen: u32,
+        pub bh_datalen: u32,
+        pub bh_hdrlen: ::c_ushort,
+    }
+
+    pub struct bpf_insn {
+        pub code: ::c_ushort,
+        pub jt: ::c_uchar,
+        pub jf: ::c_uchar,
+        pub k: u32,
+    }
+
+    pub struct bpf_dltlist {
+        bfl_len: ::c_uint,
+        bfl_list: *mut ::c_uint,
+    }
+
     // elf.h
 
     pub struct Elf32_Phdr {
@@ -302,6 +345,16 @@
         pub dlpi_tls_modid: usize,
         pub dlpi_tls_data: *mut ::c_void,
     }
+
+    pub struct ipc_perm {
+        pub cuid: ::uid_t,
+        pub cgid: ::gid_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
+        pub mode: ::mode_t,
+        pub seq: ::c_ushort,
+        pub key: ::key_t,
+    }
 }
 
 s_no_extra_traits! {
@@ -353,6 +406,17 @@
     }
 }
 
+// Non-public helper constant
+cfg_if! {
+    if #[cfg(all(not(libc_const_size_of), target_pointer_width = "32"))] {
+        const SIZEOF_LONG: usize = 4;
+    } else if #[cfg(all(not(libc_const_size_of), target_pointer_width = "64"))] {
+        const SIZEOF_LONG: usize = 8;
+    } else if #[cfg(libc_const_size_of)] {
+        const SIZEOF_LONG: usize = ::mem::size_of::<::c_long>();
+    }
+}
+
 #[deprecated(
     since = "0.2.64",
     note = "Can vary at runtime.  Use sysconf(3) instead"
@@ -539,6 +603,18 @@
 pub const MCL_CURRENT: ::c_int = 0x0001;
 pub const MCL_FUTURE: ::c_int = 0x0002;
 
+pub const MNT_NOATIME: ::c_int = 0x10000000;
+pub const MNT_NOCLUSTERR: ::c_int = 0x40000000;
+pub const MNT_NOCLUSTERW: ::c_int = 0x80000000;
+pub const MNT_NOSYMFOLLOW: ::c_int = 0x00400000;
+pub const MNT_SOFTDEP: ::c_int = 0x00200000;
+pub const MNT_SUIDDIR: ::c_int = 0x00100000;
+pub const MNT_EXRDONLY: ::c_int = 0x00000080;
+pub const MNT_DEFEXPORTED: ::c_int = 0x00000200;
+pub const MNT_EXPORTANON: ::c_int = 0x00000400;
+pub const MNT_EXKERB: ::c_int = 0x00000800;
+pub const MNT_DELEXPORT: ::c_int = 0x00020000;
+
 pub const MS_SYNC: ::c_int = 0x0000;
 pub const MS_ASYNC: ::c_int = 0x0001;
 pub const MS_INVALIDATE: ::c_int = 0x0002;
@@ -897,6 +973,8 @@
 pub const SO_ERROR: ::c_int = 0x1007;
 pub const SO_TYPE: ::c_int = 0x1008;
 
+pub const LOCAL_PEERCRED: ::c_int = 1;
+
 pub const SHUT_RD: ::c_int = 0;
 pub const SHUT_WR: ::c_int = 1;
 pub const SHUT_RDWR: ::c_int = 2;
@@ -1083,6 +1161,9 @@
 
 pub const NI_MAXHOST: ::size_t = 1025;
 
+pub const XU_NGROUPS: ::c_int = 16;
+pub const XUCRED_VERSION: ::c_uint = 0;
+
 pub const RTLD_LOCAL: ::c_int = 0;
 pub const RTLD_NODELETE: ::c_int = 0x1000;
 pub const RTLD_NOLOAD: ::c_int = 0x2000;
@@ -1210,8 +1291,7 @@
 pub const CMGROUP_MAX: usize = 16;
 
 // https://github.com/freebsd/freebsd/blob/master/sys/net/bpf.h
-// sizeof(long)
-pub const BPF_ALIGNMENT: ::c_int = 8;
+pub const BPF_ALIGNMENT: usize = SIZEOF_LONG;
 
 // Values for rtprio struct (prio field) and syscall (function argument)
 pub const RTP_PRIO_MIN: ::c_ushort = 0;
@@ -1289,6 +1369,22 @@
 pub const REG_ENOSYS: ::c_int = -1;
 pub const REG_ILLSEQ: ::c_int = 17;
 
+pub const IPC_PRIVATE: ::key_t = 0;
+pub const IPC_CREAT: ::c_int = 0o1000;
+pub const IPC_EXCL: ::c_int = 0o2000;
+pub const IPC_NOWAIT: ::c_int = 0o4000;
+pub const IPC_RMID: ::c_int = 0;
+pub const IPC_SET: ::c_int = 1;
+pub const IPC_STAT: ::c_int = 2;
+pub const IPC_R: ::c_int = 0o400;
+pub const IPC_W: ::c_int = 0o200;
+pub const IPC_M: ::c_int = 0o10000;
+
+pub const SHM_RDONLY: ::c_int = 0o10000;
+pub const SHM_RND: ::c_int = 0o20000;
+pub const SHM_R: ::c_int = 0o400;
+pub const SHM_W: ::c_int = 0o200;
+
 safe_f! {
     pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
         status == 0x13
@@ -1305,11 +1401,7 @@
 
 extern "C" {
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
 
     pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
@@ -1329,14 +1421,8 @@
 
     pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
     pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
-    pub fn clock_settime(
-        clk_id: ::clockid_t,
-        tp: *const ::timespec,
-    ) -> ::c_int;
-    pub fn clock_getcpuclockid(
-        pid: ::pid_t,
-        clk_id: *mut ::clockid_t,
-    ) -> ::c_int;
+    pub fn clock_settime(clk_id: ::clockid_t, tp: *const ::timespec) -> ::c_int;
+    pub fn clock_getcpuclockid(pid: ::pid_t, clk_id: *mut ::clockid_t) -> ::c_int;
 
     pub fn dirfd(dirp: *mut ::DIR) -> ::c_int;
     pub fn duplocale(base: ::locale_t) -> ::locale_t;
@@ -1389,23 +1475,9 @@
         timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn lchflags(path: *const ::c_char, flags: ::c_ulong) -> ::c_int;
-    pub fn lio_listio(
-        mode: ::c_int,
-        aiocb_list: *const *mut aiocb,
-        nitems: ::c_int,
-        sevp: *mut sigevent,
-    ) -> ::c_int;
     pub fn lutimes(file: *const ::c_char, times: *const ::timeval) -> ::c_int;
-    pub fn memrchr(
-        cx: *const ::c_void,
-        c: ::c_int,
-        n: ::size_t,
-    ) -> *mut ::c_void;
-    pub fn mkfifoat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn memrchr(cx: *const ::c_void, c: ::c_int, n: ::size_t) -> *mut ::c_void;
+    pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
     #[cfg_attr(
         all(target_os = "freebsd", any(freebsd11, freebsd10)),
         link_name = "mknodat@FBSD_1.1"
@@ -1416,18 +1488,9 @@
         mode: ::mode_t,
         dev: dev_t,
     ) -> ::c_int;
-    pub fn mincore(
-        addr: *const ::c_void,
-        len: ::size_t,
-        vec: *mut ::c_char,
-    ) -> ::c_int;
-    pub fn newlocale(
-        mask: ::c_int,
-        locale: *const ::c_char,
-        base: ::locale_t,
-    ) -> ::locale_t;
-    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t)
-        -> *mut ::c_char;
+    pub fn mincore(addr: *const ::c_void, len: ::size_t, vec: *mut ::c_char) -> ::c_int;
+    pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
+    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t) -> *mut ::c_char;
     pub fn pipe2(fds: *mut ::c_int, flags: ::c_int) -> ::c_int;
     pub fn ppoll(
         fds: *mut ::pollfd,
@@ -1435,16 +1498,8 @@
         timeout: *const ::timespec,
         sigmask: *const sigset_t,
     ) -> ::c_int;
-    pub fn preadv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn pthread_attr_get_np(
-        tid: ::pthread_t,
-        attr: *mut ::pthread_attr_t,
-    ) -> ::c_int;
+    pub fn preadv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t) -> ::ssize_t;
+    pub fn pthread_attr_get_np(tid: ::pthread_t, attr: *mut ::pthread_attr_t) -> ::c_int;
     pub fn pthread_attr_getguardsize(
         attr: *const ::pthread_attr_t,
         guardsize: *mut ::size_t,
@@ -1466,10 +1521,7 @@
         attr: *mut pthread_condattr_t,
         clock_id: ::clockid_t,
     ) -> ::c_int;
-    pub fn pthread_condattr_setpshared(
-        attr: *mut pthread_condattr_t,
-        pshared: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_condattr_setpshared(attr: *mut pthread_condattr_t, pshared: ::c_int) -> ::c_int;
     pub fn pthread_main_np() -> ::c_int;
     pub fn pthread_mutex_timedlock(
         lock: *mut pthread_mutex_t,
@@ -1487,30 +1539,33 @@
         attr: *const pthread_rwlockattr_t,
         val: *mut ::c_int,
     ) -> ::c_int;
-    pub fn pthread_rwlockattr_setpshared(
-        attr: *mut pthread_rwlockattr_t,
-        val: ::c_int,
+    pub fn pthread_rwlockattr_setpshared(attr: *mut pthread_rwlockattr_t, val: ::c_int) -> ::c_int;
+    pub fn pthread_barrierattr_init(attr: *mut ::pthread_barrierattr_t) -> ::c_int;
+    pub fn pthread_barrierattr_destroy(attr: *mut ::pthread_barrierattr_t) -> ::c_int;
+    pub fn pthread_barrierattr_getpshared(
+        attr: *const ::pthread_barrierattr_t,
+        shared: *mut ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_barrierattr_setpshared(
+        attr: *mut ::pthread_barrierattr_t,
+        shared: ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_barrier_init(
+        barrier: *mut pthread_barrier_t,
+        attr: *const ::pthread_barrierattr_t,
+        count: ::c_uint,
     ) -> ::c_int;
+    pub fn pthread_barrier_destroy(barrier: *mut pthread_barrier_t) -> ::c_int;
+    pub fn pthread_barrier_wait(barrier: *mut pthread_barrier_t) -> ::c_int;
     pub fn pthread_set_name_np(tid: ::pthread_t, name: *const ::c_char);
-    pub fn ptrace(
-        request: ::c_int,
-        pid: ::pid_t,
-        addr: *mut ::c_char,
-        data: ::c_int,
-    ) -> ::c_int;
+    pub fn ptrace(request: ::c_int, pid: ::pid_t, addr: *mut ::c_char, data: ::c_int) -> ::c_int;
     pub fn pututxline(ut: *const utmpx) -> *mut utmpx;
-    pub fn pwritev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
+    pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
+        -> ::ssize_t;
     pub fn querylocale(mask: ::c_int, loc: ::locale_t) -> *const ::c_char;
-    pub fn rtprio(
-        function: ::c_int,
-        pid: ::pid_t,
-        rtp: *mut rtprio,
-    ) -> ::c_int;
+    pub fn rtprio(function: ::c_int, pid: ::pid_t, rtp: *mut rtprio) -> ::c_int;
+    pub fn sched_getparam(pid: ::pid_t, param: *mut sched_param) -> ::c_int;
+    pub fn sched_setparam(pid: ::pid_t, param: *const sched_param) -> ::c_int;
     pub fn sched_getscheduler(pid: ::pid_t) -> ::c_int;
     pub fn sched_setscheduler(
         pid: ::pid_t,
@@ -1518,10 +1573,7 @@
         param: *const ::sched_param,
     ) -> ::c_int;
     pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int;
-    pub fn sem_timedwait(
-        sem: *mut sem_t,
-        abstime: *const ::timespec,
-    ) -> ::c_int;
+    pub fn sem_timedwait(sem: *mut sem_t, abstime: *const ::timespec) -> ::c_int;
     pub fn sendfile(
         fd: ::c_int,
         s: ::c_int,
@@ -1533,20 +1585,12 @@
     ) -> ::c_int;
     pub fn setdomainname(name: *const ::c_char, len: ::c_int) -> ::c_int;
     pub fn sethostname(name: *const ::c_char, len: ::c_int) -> ::c_int;
-    pub fn setpriority(which: ::c_int, who: ::c_int, prio: ::c_int)
-        -> ::c_int;
+    pub fn setpriority(which: ::c_int, who: ::c_int, prio: ::c_int) -> ::c_int;
     pub fn setresgid(rgid: ::gid_t, egid: ::gid_t, sgid: ::gid_t) -> ::c_int;
     pub fn setresuid(ruid: ::uid_t, euid: ::uid_t, suid: ::uid_t) -> ::c_int;
-    pub fn settimeofday(
-        tv: *const ::timeval,
-        tz: *const ::timezone,
-    ) -> ::c_int;
+    pub fn settimeofday(tv: *const ::timeval, tz: *const ::timezone) -> ::c_int;
     pub fn setutxent();
-    pub fn shm_open(
-        name: *const ::c_char,
-        oflag: ::c_int,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn shm_open(name: *const ::c_char, oflag: ::c_int, mode: ::mode_t) -> ::c_int;
     pub fn sigtimedwait(
         set: *const sigset_t,
         info: *mut siginfo_t,
@@ -1595,25 +1639,31 @@
         >,
         data: *mut ::c_void,
     ) -> ::c_int;
+
+    pub fn iconv_open(tocode: *const ::c_char, fromcode: *const ::c_char) -> iconv_t;
+    pub fn iconv(
+        cd: iconv_t,
+        inbuf: *mut *mut ::c_char,
+        inbytesleft: *mut ::size_t,
+        outbuf: *mut *mut ::c_char,
+        outbytesleft: *mut ::size_t,
+    ) -> ::size_t;
+    pub fn iconv_close(cd: iconv_t) -> ::c_int;
+
+    // Added in `FreeBSD` 11.0
+    // Added in `DragonFly BSD` 5.4
+    pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
+    // ISO/IEC 9899:2011 ("ISO C11") K.3.7.4.1
+    pub fn memset_s(s: *mut ::c_void, smax: ::size_t, c: ::c_int, n: ::size_t) -> ::c_int;
+    pub fn gethostid() -> ::c_long;
+    pub fn sethostid(hostid: ::c_long);
 }
 
 #[link(name = "rt")]
 extern "C" {
-    pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
-    pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
-    pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
-    pub fn aio_error(aiocbp: *const aiocb) -> ::c_int;
-    pub fn aio_return(aiocbp: *mut aiocb) -> ::ssize_t;
-    pub fn aio_suspend(
-        aiocb_list: *const *const aiocb,
-        nitems: ::c_int,
-        timeout: *const ::timespec,
-    ) -> ::c_int;
-    pub fn aio_cancel(fd: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
     pub fn mq_close(mqd: ::mqd_t) -> ::c_int;
     pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
-    pub fn mq_notify(mqd: ::mqd_t, notification: *const ::sigevent)
-        -> ::c_int;
+    pub fn mq_notify(mqd: ::mqd_t, notification: *const ::sigevent) -> ::c_int;
     pub fn mq_open(name: *const ::c_char, oflag: ::c_int, ...) -> ::mqd_t;
     pub fn mq_receive(
         mqd: ::mqd_t,
@@ -1627,11 +1677,7 @@
         msg_len: ::size_t,
         msg_prio: ::c_uint,
     ) -> ::c_int;
-    pub fn mq_setattr(
-        mqd: ::mqd_t,
-        newattr: *const ::mq_attr,
-        oldattr: *mut ::mq_attr,
-    ) -> ::c_int;
+    pub fn mq_setattr(mqd: ::mqd_t, newattr: *const ::mq_attr, oldattr: *mut ::mq_attr) -> ::c_int;
     pub fn mq_timedreceive(
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
@@ -1667,6 +1713,17 @@
     pub fn login_tty(fd: ::c_int) -> ::c_int;
 }
 
+#[link(name = "execinfo")]
+extern "C" {
+    pub fn backtrace(addrlist: *mut *mut ::c_void, len: ::size_t) -> ::size_t;
+    pub fn backtrace_symbols(addrlist: *const *mut ::c_void, len: ::size_t) -> *mut *mut ::c_char;
+    pub fn backtrace_symbols_fd(
+        addrlist: *const *mut ::c_void,
+        len: ::size_t,
+        fd: ::c_int,
+    ) -> ::c_int;
+}
+
 cfg_if! {
     if #[cfg(target_os = "freebsd")] {
         mod freebsd;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -253,6 +253,7 @@
 pub const FIOGETOWN: ::c_ulong = 0x4004667b;
 
 pub const PATH_MAX: ::c_int = 1024;
+pub const MAXPATHLEN: ::c_int = PATH_MAX;
 
 pub const IOV_MAX: ::c_int = 1024;
 
@@ -337,7 +338,15 @@
 pub const F_UNLCK: ::c_short = 2;
 pub const F_WRLCK: ::c_short = 3;
 
-pub const MNT_FORCE: ::c_int = 0x80000;
+pub const MNT_RDONLY: ::c_int = 0x00000001;
+pub const MNT_SYNCHRONOUS: ::c_int = 0x00000002;
+pub const MNT_NOEXEC: ::c_int = 0x00000004;
+pub const MNT_NOSUID: ::c_int = 0x00000008;
+pub const MNT_ASYNC: ::c_int = 0x00000040;
+pub const MNT_EXPORTED: ::c_int = 0x00000100;
+pub const MNT_UPDATE: ::c_int = 0x00010000;
+pub const MNT_RELOAD: ::c_int = 0x00040000;
+pub const MNT_FORCE: ::c_int = 0x00080000;
 
 pub const Q_SYNC: ::c_int = 0x600;
 pub const Q_QUOTAON: ::c_int = 0x100;
@@ -439,6 +448,13 @@
 
 pub const PIPE_BUF: usize = 512;
 
+pub const CLD_EXITED: ::c_int = 1;
+pub const CLD_KILLED: ::c_int = 2;
+pub const CLD_DUMPED: ::c_int = 3;
+pub const CLD_TRAPPED: ::c_int = 4;
+pub const CLD_STOPPED: ::c_int = 5;
+pub const CLD_CONTINUED: ::c_int = 6;
+
 pub const POLLIN: ::c_short = 0x1;
 pub const POLLPRI: ::c_short = 0x2;
 pub const POLLOUT: ::c_short = 0x4;
@@ -526,7 +542,7 @@
         return
     }
 
-    pub fn FD_ISSET(fd: ::c_int, set: *mut fd_set) -> bool {
+    pub fn FD_ISSET(fd: ::c_int, set: *const fd_set) -> bool {
         let bits = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
         let fd = fd as usize;
         return ((*set).fds_bits[fd / bits] & (1 << (fd % bits))) != 0
@@ -580,11 +596,7 @@
     )]
     pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
 
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
     pub fn abs(i: ::c_int) -> ::c_int;
     pub fn atof(s: *const ::c_char) -> ::c_double;
     pub fn labs(i: ::c_long) -> ::c_long;
@@ -619,13 +631,12 @@
     pub fn if_nameindex() -> *mut if_nameindex;
     pub fn if_freenameindex(ptr: *mut if_nameindex);
 
-    pub fn getpeereid(
-        socket: ::c_int,
-        euid: *mut ::uid_t,
-        egid: *mut ::gid_t,
-    ) -> ::c_int;
+    pub fn getpeereid(socket: ::c_int, euid: *mut ::uid_t, egid: *mut ::gid_t) -> ::c_int;
 
-    #[cfg_attr(target_os = "macos", link_name = "glob$INODE64")]
+    #[cfg_attr(
+        all(target_os = "macos", not(target_arch = "aarch64")),
+        link_name = "glob$INODE64"
+    )]
     #[cfg_attr(target_os = "netbsd", link_name = "__glob30")]
     #[cfg_attr(
         all(target_os = "freebsd", any(freebsd11, freebsd10)),
@@ -634,9 +645,7 @@
     pub fn glob(
         pattern: *const ::c_char,
         flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int,
-        >,
+        errfunc: ::Option<extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int>,
         pglob: *mut ::glob_t,
     ) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__globfree30")]
@@ -646,11 +655,7 @@
     )]
     pub fn globfree(pglob: *mut ::glob_t);
 
-    pub fn posix_madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
     pub fn shm_unlink(name: *const ::c_char) -> ::c_int;
 
@@ -673,22 +678,14 @@
         link_name = "telldir$INODE64$UNIX2003"
     )]
     pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
-    pub fn madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "msync$UNIX2003"
     )]
     #[cfg_attr(target_os = "netbsd", link_name = "__msync13")]
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn msync(addr: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::c_int;
 
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
@@ -711,49 +708,29 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "bind$UNIX2003"
     )]
-    pub fn bind(
-        socket: ::c_int,
-        address: *const ::sockaddr,
-        address_len: ::socklen_t,
-    ) -> ::c_int;
+    pub fn bind(socket: ::c_int, address: *const ::sockaddr, address_len: ::socklen_t) -> ::c_int;
 
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "writev$UNIX2003"
     )]
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "readv$UNIX2003"
     )]
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
+    pub fn readv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
 
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "sendmsg$UNIX2003"
     )]
-    pub fn sendmsg(
-        fd: ::c_int,
-        msg: *const ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn sendmsg(fd: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "recvmsg$UNIX2003"
     )]
-    pub fn recvmsg(
-        fd: ::c_int,
-        msg: *mut ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
 
     pub fn sync();
     pub fn getgrgid_r(
@@ -782,11 +759,7 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "pthread_sigmask$UNIX2003"
     )]
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sem_open(name: *const ::c_char, oflag: ::c_int, ...) -> *mut sem_t;
     pub fn getgrnam(name: *const ::c_char) -> *mut ::group;
     #[cfg_attr(
@@ -795,6 +768,8 @@
     )]
     pub fn pthread_cancel(thread: ::pthread_t) -> ::c_int;
     pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
+    pub fn sched_get_priority_min(policy: ::c_int) -> ::c_int;
+    pub fn sched_get_priority_max(policy: ::c_int) -> ::c_int;
     pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
     pub fn getpwnam_r(
@@ -859,10 +834,7 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "getitimer$UNIX2003"
     )]
-    pub fn getitimer(
-        which: ::c_int,
-        curr_value: *mut ::itimerval
-    ) -> ::c_int;
+    pub fn getitimer(which: ::c_int, curr_value: *mut ::itimerval) -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "setitimer$UNIX2003"
@@ -873,11 +845,7 @@
         old_value: *mut ::itimerval,
     ) -> ::c_int;
 
-    pub fn regcomp(
-        preg: *mut regex_t,
-        pattern: *const ::c_char,
-        cflags: ::c_int,
-    ) -> ::c_int;
+    pub fn regcomp(preg: *mut regex_t, pattern: *const ::c_char, cflags: ::c_int) -> ::c_int;
 
     pub fn regexec(
         preg: *const regex_t,
@@ -895,6 +863,10 @@
     ) -> ::size_t;
 
     pub fn regfree(preg: *mut regex_t);
+
+    pub fn arc4random() -> u32;
+    pub fn arc4random_buf(buf: *mut ::c_void, size: ::size_t);
+    pub fn arc4random_uniform(l: u32) -> u32;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -72,8 +72,14 @@
         pub uid: ::uid_t,
         pub gid: ::gid_t,
         pub mode: ::mode_t,
+        #[cfg(target_os = "openbsd")]
         pub seq: ::c_ushort,
+        #[cfg(target_os = "netbsd")]
+        pub _seq: ::c_ushort,
+        #[cfg(target_os = "openbsd")]
         pub key: ::key_t,
+        #[cfg(target_os = "netbsd")]
+        pub _key: ::key_t,
     }
 
     pub struct ptrace_io_desc {
@@ -232,6 +238,13 @@
 pub const IPC_SET: ::c_int = 1;
 pub const IPC_STAT: ::c_int = 2;
 
+pub const IPC_R: ::c_int = 0o000400;
+pub const IPC_W: ::c_int = 0o000200;
+pub const IPC_M: ::c_int = 0o010000;
+
+pub const SHM_R: ::c_int = IPC_R;
+pub const SHM_W: ::c_int = IPC_W;
+
 pub const MCL_CURRENT: ::c_int = 0x0001;
 pub const MCL_FUTURE: ::c_int = 0x0002;
 
@@ -639,11 +652,7 @@
 extern "C" {
     pub fn setgrent();
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
 
     pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
     pub fn accept4(
@@ -652,49 +661,21 @@
         addrlen: *mut ::socklen_t,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn mincore(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        vec: *mut ::c_char,
-    ) -> ::c_int;
+    pub fn mincore(addr: *mut ::c_void, len: ::size_t, vec: *mut ::c_char) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__clock_getres50")]
     pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__clock_gettime50")]
     pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__clock_settime50")]
-    pub fn clock_settime(
-        clk_id: ::clockid_t,
-        tp: *const ::timespec,
-    ) -> ::c_int;
+    pub fn clock_settime(clk_id: ::clockid_t, tp: *const ::timespec) -> ::c_int;
     pub fn __errno() -> *mut ::c_int;
-    pub fn shm_open(
-        name: *const ::c_char,
-        oflag: ::c_int,
-        mode: ::mode_t,
-    ) -> ::c_int;
-    pub fn memrchr(
-        cx: *const ::c_void,
-        c: ::c_int,
-        n: ::size_t,
-    ) -> *mut ::c_void;
+    pub fn shm_open(name: *const ::c_char, oflag: ::c_int, mode: ::mode_t) -> ::c_int;
+    pub fn memrchr(cx: *const ::c_void, c: ::c_int, n: ::size_t) -> *mut ::c_void;
     pub fn mkostemp(template: *mut ::c_char, flags: ::c_int) -> ::c_int;
-    pub fn mkostemps(
-        template: *mut ::c_char,
-        suffixlen: ::c_int,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn pwritev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn preadv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
+    pub fn mkostemps(template: *mut ::c_char, suffixlen: ::c_int, flags: ::c_int) -> ::c_int;
+    pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
+        -> ::ssize_t;
+    pub fn preadv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t) -> ::ssize_t;
     pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
     pub fn utimensat(
         dirfd: ::c_int,
@@ -726,15 +707,8 @@
         mode: ::mode_t,
         dev: dev_t,
     ) -> ::c_int;
-    pub fn mkfifoat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
-    pub fn sem_timedwait(
-        sem: *mut sem_t,
-        abstime: *const ::timespec,
-    ) -> ::c_int;
+    pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
+    pub fn sem_timedwait(sem: *mut sem_t, abstime: *const ::timespec) -> ::c_int;
     pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int;
     pub fn pthread_condattr_setclock(
         attr: *mut pthread_condattr_t,
@@ -745,6 +719,11 @@
         lock: *mut pthread_mutex_t,
         abstime: *const ::timespec,
     ) -> ::c_int;
+    pub fn pthread_spin_init(lock: *mut pthread_spinlock_t, pshared: ::c_int) -> ::c_int;
+    pub fn pthread_spin_destroy(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_lock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_trylock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_unlock(lock: *mut pthread_spinlock_t) -> ::c_int;
     pub fn pipe2(fds: *mut ::c_int, flags: ::c_int) -> ::c_int;
 
     pub fn getgrouplist(
@@ -759,17 +738,15 @@
     pub fn uname(buf: *mut ::utsname) -> ::c_int;
 
     pub fn shmget(key: ::key_t, size: ::size_t, shmflg: ::c_int) -> ::c_int;
-    pub fn shmat(
-        shmid: ::c_int,
-        shmaddr: *const ::c_void,
-        shmflg: ::c_int,
-    ) -> *mut ::c_void;
+    pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
     pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
-    pub fn shmctl(
-        shmid: ::c_int,
-        cmd: ::c_int,
-        buf: *mut ::shmid_ds,
-    ) -> ::c_int;
+    pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
+}
+
+extern "C" {
+    pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
+    pub fn gethostid() -> ::c_long;
+    pub fn sethostid(hostid: ::c_long) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,9 +7,12 @@
 pub type idtype_t = ::c_int;
 pub type mqd_t = ::c_int;
 type __pthread_spin_t = __cpu_simple_lock_nv_t;
-pub type vm_size_t = ::uintptr_t;
+pub type vm_size_t = ::uintptr_t; // FIXME: deprecated since long time
 pub type lwpid_t = ::c_uint;
 pub type shmatt_t = ::c_uint;
+pub type cpuid_t = u64;
+pub type cpuset_t = _cpuset;
+pub type pthread_spin_t = ::c_uchar;
 
 // elf.h
 
@@ -29,6 +32,8 @@
 pub type Elf64_Word = u32;
 pub type Elf64_Xword = u64;
 
+pub type iconv_t = *mut ::c_void;
+
 cfg_if! {
     if #[cfg(target_pointer_width = "64")] {
         type Elf_Addr = Elf64_Addr;
@@ -42,6 +47,10 @@
 }
 
 impl siginfo_t {
+    pub unsafe fn si_addr(&self) -> *mut ::c_void {
+        self.si_addr
+    }
+
     pub unsafe fn si_value(&self) -> ::sigval {
         #[repr(C)]
         struct siginfo_timer {
@@ -55,6 +64,23 @@
         }
         (*(self as *const siginfo_t as *const siginfo_timer)).value
     }
+
+    pub unsafe fn si_status(&self) -> ::c_int {
+        #[repr(C)]
+        struct siginfo_timer {
+            _si_signo: ::c_int,
+            _si_errno: ::c_int,
+            _si_code: ::c_int,
+            __pad1: ::c_int,
+            _pid: ::pid_t,
+            _uid: ::uid_t,
+            _value: ::sigval,
+            _cpid: ::pid_t,
+            _cuid: ::uid_t,
+            status: ::c_int,
+        }
+        (*(self as *const siginfo_t as *const siginfo_timer)).status
+    }
 }
 
 s! {
@@ -201,13 +227,19 @@
         ptr_private: *mut ::c_void,
     }
 
+    pub struct pthread_spinlock_t {
+        pts_magic: ::c_uint,
+        pts_spin: ::pthread_spin_t,
+        pts_flags: ::c_int,
+    }
+
     pub struct kevent {
         pub ident: ::uintptr_t,
         pub filter: u32,
         pub flags: u32,
         pub fflags: u32,
         pub data: i64,
-        pub udata: ::intptr_t,
+        pub udata: ::intptr_t, /* FIXME: NetBSD 10.0 will finally have same layout as other BSD */
     }
 
     pub struct dqblk {
@@ -297,6 +329,12 @@
         pub sc_groups: [::gid_t; 1],
     }
 
+    pub struct unpcbid {
+        pub unp_pid: ::pid_t,
+        pub unp_euid: ::uid_t,
+        pub unp_egid: ::gid_t,
+    }
+
     pub struct sockaddr_dl {
         pub sdl_len: ::c_uchar,
         pub sdl_family: ::c_uchar,
@@ -395,6 +433,16 @@
         pub p_align: Elf64_Xword,
     }
 
+    pub struct Aux32Info {
+        pub a_type: Elf32_Word,
+        pub a_v: Elf32_Word,
+    }
+
+    pub struct Aux64Info {
+        pub a_type: Elf64_Word,
+        pub a_v: Elf64_Xword,
+    }
+
     // link.h
 
     pub struct dl_phdr_info {
@@ -407,6 +455,42 @@
         pub dlpi_tls_modid: usize,
         pub dlpi_tls_data: *mut ::c_void,
     }
+
+    pub struct _cpuset {
+        bits: [u32; 0]
+    }
+
+    pub struct accept_filter_arg {
+        pub af_name: [::c_char; 16],
+        af_arg: [[::c_char; 10]; 24],
+    }
+
+    pub struct sched_param {
+        pub sched_priority: ::c_int,
+    }
+
+    pub struct kinfo_vmentry {
+        pub kve_start: u64,
+        pub kve_end: u64,
+        pub kve_offset: u64,
+        pub kve_type: u32,
+        pub kve_flags: u32,
+        pub kve_count: u32,
+        pub kve_wired_count: u32,
+        pub kve_advice: u32,
+        pub kve_attributes: u32,
+        pub kve_protection: u32,
+        pub kve_max_protection: u32,
+        pub kve_ref_count: u32,
+        pub kve_inheritance: u32,
+        pub kve_vn_fileid: u64,
+        pub kve_vn_size: u64,
+        pub kve_vn_fsid: u64,
+        pub kve_vn_rdev: u64,
+        pub kve_vn_type: u32,
+        pub kve_vn_mode: u32,
+        pub kve_path: [[::c_char; 32]; 32],
+    }
 }
 
 s_no_extra_traits! {
@@ -419,7 +503,7 @@
         pub ut_session: u16,
         pub ut_type: u16,
         pub ut_pid: ::pid_t,
-        pub ut_exit: __exit_status,
+        pub ut_exit: __exit_status, // FIXME: when anonymous struct are supported
         pub ut_ss: sockaddr_storage,
         pub ut_tv: ::timeval,
         pub ut_pad: [u8; _UTX_PADSIZE],
@@ -437,7 +521,6 @@
         pub ipi_ifindex: ::c_uint,
     }
 
-    #[repr(packed)]
     pub struct arphdr {
         pub ar_hrd: u16,
         pub ar_pro: u16,
@@ -446,7 +529,6 @@
         pub ar_op: u16,
     }
 
-    #[repr(packed)]
     pub struct in_addr {
         pub s_addr: ::in_addr_t,
     }
@@ -957,6 +1039,36 @@
 pub const AT_SYMLINK_FOLLOW: ::c_int = 0x400;
 pub const AT_REMOVEDIR: ::c_int = 0x800;
 
+pub const AT_NULL: ::c_int = 0;
+pub const AT_IGNORE: ::c_int = 1;
+pub const AT_EXECFD: ::c_int = 2;
+pub const AT_PHDR: ::c_int = 3;
+pub const AT_PHENT: ::c_int = 4;
+pub const AT_PHNUM: ::c_int = 5;
+pub const AT_PAGESZ: ::c_int = 6;
+pub const AT_BASE: ::c_int = 7;
+pub const AT_FLAGS: ::c_int = 8;
+pub const AT_ENTRY: ::c_int = 9;
+pub const AT_DCACHEBSIZE: ::c_int = 10;
+pub const AT_ICACHEBSIZE: ::c_int = 11;
+pub const AT_UCACHEBSIZE: ::c_int = 12;
+pub const AT_STACKBASE: ::c_int = 13;
+pub const AT_EUID: ::c_int = 2000;
+pub const AT_RUID: ::c_int = 2001;
+pub const AT_EGID: ::c_int = 2002;
+pub const AT_RGID: ::c_int = 2003;
+pub const AT_SUN_LDELF: ::c_int = 2004;
+pub const AT_SUN_LDSHDR: ::c_int = 2005;
+pub const AT_SUN_LDNAME: ::c_int = 2006;
+pub const AT_SUN_LDPGSIZE: ::c_int = 2007;
+pub const AT_SUN_PLATFORM: ::c_int = 2008;
+pub const AT_SUN_HWCAP: ::c_int = 2009;
+pub const AT_SUN_IFLUSH: ::c_int = 2010;
+pub const AT_SUN_CPU: ::c_int = 2011;
+pub const AT_SUN_EMUL_ENTRY: ::c_int = 2012;
+pub const AT_SUN_EMUL_EXECFD: ::c_int = 2013;
+pub const AT_SUN_EXECNAME: ::c_int = 2014;
+
 pub const EXTATTR_NAMESPACE_USER: ::c_int = 1;
 pub const EXTATTR_NAMESPACE_SYSTEM: ::c_int = 2;
 
@@ -1045,6 +1157,12 @@
 pub const SO_OVERFLOWED: ::c_int = 0x1009;
 pub const SO_NOHEADER: ::c_int = 0x100a;
 
+// http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/un.h?annotate
+pub const LOCAL_OCREDS: ::c_int = 0x0001; // pass credentials to receiver
+pub const LOCAL_CONNWAIT: ::c_int = 0x0002; // connects block until accepted
+pub const LOCAL_PEEREID: ::c_int = 0x0003; // get peer identification
+pub const LOCAL_CREDS: ::c_int = 0x0004; // pass credentials to receiver
+
 // https://github.com/NetBSD/src/blob/trunk/sys/net/if.h#L373
 pub const IFF_UP: ::c_int = 0x0001; // interface is up
 pub const IFF_BROADCAST: ::c_int = 0x0002; // broadcast address valid
@@ -1178,6 +1296,8 @@
 pub const MAP_NORESERVE: ::c_int = 0x40;
 pub const MAP_HASSEMAPHORE: ::c_int = 0x200;
 pub const MAP_WIRED: ::c_int = 0x800;
+// mremap flag
+pub const MAP_REMAPDUP: ::c_int = 0x004;
 
 pub const DCCP_TYPE_REQUEST: ::c_int = 0;
 pub const DCCP_TYPE_RESPONSE: ::c_int = 1;
@@ -1386,6 +1506,9 @@
 pub const TIME_WAIT: ::c_int = 4;
 pub const TIME_ERROR: ::c_int = 5;
 
+pub const LITTLE_ENDIAN: ::c_int = 1234;
+pub const BIG_ENDIAN: ::c_int = 4321;
+
 cfg_if! {
     if #[cfg(any(target_arch = "sparc", target_arch = "sparc64",
                  target_arch = "x86", target_arch = "x86_64"))] {
@@ -1439,6 +1562,11 @@
 pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
 pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
 
+pub const SCHED_NONE: ::c_int = -1;
+pub const SCHED_OTHER: ::c_int = 0;
+pub const SCHED_FIFO: ::c_int = 1;
+pub const SCHED_RR: ::c_int = 2;
+
 pub const EVFILT_AIO: u32 = 2;
 pub const EVFILT_PROC: u32 = 4;
 pub const EVFILT_READ: u32 = 0;
@@ -1480,6 +1608,15 @@
 pub const TMP_MAX: ::c_uint = 308915776;
 
 pub const NI_MAXHOST: ::socklen_t = 1025;
+pub const NI_MAXSERV: ::socklen_t = 32;
+
+pub const NI_NOFQDN: ::c_int = 0x00000001;
+pub const NI_NUMERICHOST: ::c_int = 0x000000002;
+pub const NI_NAMEREQD: ::c_int = 0x000000004;
+pub const NI_NUMERICSERV: ::c_int = 0x000000008;
+pub const NI_DGRAM: ::c_int = 0x00000010;
+pub const NI_WITHSCOPEID: ::c_int = 0x00000020;
+pub const NI_NUMERICSCOPE: ::c_int = 0x00000040;
 
 pub const RTLD_NOLOAD: ::c_int = 0x2000;
 pub const RTLD_LOCAL: ::c_int = 0x200;
@@ -1633,6 +1770,8 @@
 pub const KERN_PROC_ENV: ::c_int = 3;
 pub const KERN_PROC_NENV: ::c_int = 4;
 pub const KERN_PROC_PATHNAME: ::c_int = 5;
+pub const VM_PROC: ::c_int = 16;
+pub const VM_PROC_MAP: ::c_int = 1;
 
 pub const EAI_AGAIN: ::c_int = 2;
 pub const EAI_BADFLAGS: ::c_int = 3;
@@ -1734,8 +1873,22 @@
 pub const SF_LOG: ::c_ulong = 0x00400000;
 pub const SF_SNAPINVAL: ::c_ulong = 0x00800000;
 
-fn _ALIGN(p: usize) -> usize {
-    (p + _ALIGNBYTES) & !_ALIGNBYTES
+// sys/sysctl.h
+pub const KVME_PROT_READ: ::c_int = 0x00000001;
+pub const KVME_PROT_WRITE: ::c_int = 0x00000002;
+pub const KVME_PROT_EXEC: ::c_int = 0x00000004;
+
+pub const KVME_FLAG_COW: ::c_int = 0x00000001;
+pub const KVME_FLAG_NEEDS_COPY: ::c_int = 0x00000002;
+pub const KVME_FLAG_NOCOREDUMP: ::c_int = 0x000000004;
+pub const KVME_FLAG_PAGEABLE: ::c_int = 0x000000008;
+pub const KVME_FLAG_GROWS_UP: ::c_int = 0x000000010;
+pub const KVME_FLAG_GROWS_DOWN: ::c_int = 0x000000020;
+
+const_fn! {
+    {const} fn _ALIGN(p: usize) -> usize {
+        (p + _ALIGNBYTES) & !_ALIGNBYTES
+    }
 }
 
 f! {
@@ -1766,7 +1919,7 @@
         }
     }
 
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+    pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
         (_ALIGN(::mem::size_of::<::cmsghdr>()) + _ALIGN(length as usize))
             as ::c_uint
     }
@@ -1815,6 +1968,8 @@
         rqtp: *const ::timespec,
         rmtp: *mut ::timespec,
     ) -> ::c_int;
+
+    pub fn reallocarr(ptr: *mut ::c_void, number: ::size_t, size: ::size_t) -> ::c_int;
 }
 
 #[link(name = "rt")]
@@ -1923,11 +2078,7 @@
         sevlen: ::socklen_t,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn sysctl(
         name: *const ::c_int,
         namelen: ::c_uint,
@@ -1963,8 +2114,7 @@
     pub fn mq_open(name: *const ::c_char, oflag: ::c_int, ...) -> ::mqd_t;
     pub fn mq_close(mqd: ::mqd_t) -> ::c_int;
     pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
-    pub fn mq_notify(mqd: ::mqd_t, notification: *const ::sigevent)
-        -> ::c_int;
+    pub fn mq_notify(mqd: ::mqd_t, notification: *const ::sigevent) -> ::c_int;
     pub fn mq_receive(
         mqd: ::mqd_t,
         msg_ptr: *mut ::c_char,
@@ -1977,11 +2127,7 @@
         msg_len: ::size_t,
         msg_prio: ::c_uint,
     ) -> ::c_int;
-    pub fn mq_setattr(
-        mqd: ::mqd_t,
-        newattr: *const ::mq_attr,
-        oldattr: *mut ::mq_attr,
-    ) -> ::c_int;
+    pub fn mq_setattr(mqd: ::mqd_t, newattr: *const ::mq_attr, oldattr: *mut ::mq_attr) -> ::c_int;
     #[link_name = "__mq_timedreceive50"]
     pub fn mq_timedreceive(
         mqd: ::mqd_t,
@@ -1999,25 +2145,14 @@
         abs_timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn mq_unlink(name: *const ::c_char) -> ::c_int;
-    pub fn ptrace(
-        request: ::c_int,
-        pid: ::pid_t,
-        addr: *mut ::c_void,
-        data: ::c_int,
-    ) -> ::c_int;
+    pub fn ptrace(request: ::c_int, pid: ::pid_t, addr: *mut ::c_void, data: ::c_int) -> ::c_int;
     pub fn pthread_setname_np(
         t: ::pthread_t,
         name: *const ::c_char,
         arg: *const ::c_void,
     ) -> ::c_int;
-    pub fn pthread_attr_get_np(
-        thread: ::pthread_t,
-        attr: *mut ::pthread_attr_t,
-    ) -> ::c_int;
-    pub fn pthread_getattr_np(
-        native: ::pthread_t,
-        attr: *mut ::pthread_attr_t,
-    ) -> ::c_int;
+    pub fn pthread_attr_get_np(thread: ::pthread_t, attr: *mut ::pthread_attr_t) -> ::c_int;
+    pub fn pthread_getattr_np(native: ::pthread_t, attr: *mut ::pthread_attr_t) -> ::c_int;
     pub fn pthread_attr_getguardsize(
         attr: *const ::pthread_attr_t,
         guardsize: *mut ::size_t,
@@ -2027,6 +2162,24 @@
         stackaddr: *mut *mut ::c_void,
         stacksize: *mut ::size_t,
     ) -> ::c_int;
+    pub fn pthread_getaffinity_np(
+        thread: ::pthread_t,
+        size: ::size_t,
+        set: *mut cpuset_t,
+    ) -> ::c_int;
+    pub fn pthread_setaffinity_np(
+        thread: ::pthread_t,
+        size: ::size_t,
+        set: *mut cpuset_t,
+    ) -> ::c_int;
+
+    pub fn _cpuset_create() -> *mut cpuset_t;
+    pub fn _cpuset_destroy(set: *mut cpuset_t);
+    pub fn _cpuset_clr(cpu: cpuid_t, set: *mut cpuset_t) -> ::c_int;
+    pub fn _cpuset_set(cpu: cpuid_t, set: *mut cpuset_t) -> ::c_int;
+    pub fn _cpuset_isset(cpu: cpuid_t, set: *const cpuset_t) -> ::c_int;
+    pub fn _cpuset_size(set: *const cpuset_t) -> ::size_t;
+    pub fn _cpuset_zero(set: *mut cpuset_t);
     #[link_name = "__sigtimedwait50"]
     pub fn sigtimedwait(
         set: *const sigset_t,
@@ -2034,19 +2187,24 @@
         timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn sigwaitinfo(set: *const sigset_t, info: *mut siginfo_t) -> ::c_int;
+    pub fn waitid(
+        idtype: idtype_t,
+        id: ::id_t,
+        infop: *mut ::siginfo_t,
+        options: ::c_int,
+    ) -> ::c_int;
+
     pub fn duplocale(base: ::locale_t) -> ::locale_t;
     pub fn freelocale(loc: ::locale_t);
     pub fn localeconv_l(loc: ::locale_t) -> *mut lconv;
-    pub fn newlocale(
-        mask: ::c_int,
-        locale: *const ::c_char,
-        base: ::locale_t,
-    ) -> ::locale_t;
+    pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
     #[link_name = "__settimeofday50"]
     pub fn settimeofday(tv: *const ::timeval, tz: *const ::c_void) -> ::c_int;
 
     pub fn dup3(src: ::c_int, dst: ::c_int, flags: ::c_int) -> ::c_int;
 
+    pub fn kqueue1(flags: ::c_int) -> ::c_int;
+
     pub fn sendmmsg(
         sockfd: ::c_int,
         msgvec: *mut ::mmsghdr,
@@ -2081,6 +2239,42 @@
         >,
         data: *mut ::c_void,
     ) -> ::c_int;
+
+    // dlfcn.h
+
+    pub fn _dlauxinfo() -> *mut ::c_void;
+
+    pub fn iconv_open(tocode: *const ::c_char, fromcode: *const ::c_char) -> iconv_t;
+    pub fn iconv(
+        cd: iconv_t,
+        inbuf: *mut *mut ::c_char,
+        inbytesleft: *mut ::size_t,
+        outbuf: *mut *mut ::c_char,
+        outbytesleft: *mut ::size_t,
+    ) -> ::size_t;
+    pub fn iconv_close(cd: iconv_t) -> ::c_int;
+
+    // Added in `NetBSD` 7.0
+    pub fn explicit_memset(b: *mut ::c_void, c: ::c_int, len: ::size_t);
+    pub fn consttime_memequal(a: *const ::c_void, b: *const ::c_void, len: ::size_t) -> ::c_int;
+
+    pub fn setproctitle(fmt: *const ::c_char, ...);
+    pub fn mremap(
+        oldp: *mut ::c_void,
+        oldsize: ::size_t,
+        newp: *mut ::c_void,
+        newsize: ::size_t,
+        flags: ::c_int,
+    ) -> *mut ::c_void;
+
+    pub fn sched_setparam(pid: ::pid_t, param: *const sched_param) -> ::c_int;
+    pub fn sched_getparam(pid: ::pid_t, param: *mut sched_param) -> ::c_int;
+    pub fn sched_getscheduler(pid: ::pid_t) -> ::c_int;
+    pub fn sched_setscheduler(
+        pid: ::pid_t,
+        policy: ::c_int,
+        param: *const ::sched_param,
+    ) -> ::c_int;
 }
 
 #[link(name = "util")]
@@ -2100,16 +2294,8 @@
     ) -> ::c_int;
 
     pub fn updwtmpx(file: *const ::c_char, ut: *const utmpx) -> ::c_int;
-    pub fn getlastlogx(
-        fname: *const ::c_char,
-        uid: ::uid_t,
-        ll: *mut lastlogx,
-    ) -> *mut lastlogx;
-    pub fn updlastlogx(
-        fname: *const ::c_char,
-        uid: ::uid_t,
-        ll: *mut lastlogx,
-    ) -> ::c_int;
+    pub fn getlastlogx(fname: *const ::c_char, uid: ::uid_t, ll: *mut lastlogx) -> *mut lastlogx;
+    pub fn updlastlogx(fname: *const ::c_char, uid: ::uid_t, ll: *mut lastlogx) -> ::c_int;
     pub fn utmpxname(file: *const ::c_char) -> ::c_int;
     pub fn getutxent() -> *mut utmpx;
     pub fn getutxid(ut: *const utmpx) -> *mut utmpx;
@@ -2125,6 +2311,83 @@
     pub fn setutent();
     pub fn endutent();
     pub fn getutent() -> *mut utmp;
+
+    pub fn efopen(p: *const ::c_char, m: *const ::c_char) -> ::FILE;
+    pub fn emalloc(n: ::size_t) -> *mut ::c_void;
+    pub fn ecalloc(n: ::size_t, c: ::size_t) -> *mut ::c_void;
+    pub fn erealloc(p: *mut ::c_void, n: ::size_t) -> *mut ::c_void;
+    pub fn estrdup(s: *const ::c_char) -> *mut ::c_char;
+    pub fn estrndup(s: *const ::c_char, len: ::size_t) -> *mut ::c_char;
+    pub fn estrlcpy(dst: *mut ::c_char, src: *const ::c_char, len: ::size_t) -> ::size_t;
+    pub fn estrlcat(dst: *mut ::c_char, src: *const ::c_char, len: ::size_t) -> ::size_t;
+    pub fn easprintf(string: *mut *mut ::c_char, fmt: *const ::c_char, ...) -> ::c_int;
+    pub fn evasprintf(string: *mut *mut ::c_char, fmt: *const ::c_char, ...) -> ::c_int;
+    pub fn esetfunc(
+        cb: ::Option<unsafe extern "C" fn(::c_int, *const ::c_char, ...)>,
+    ) -> ::Option<unsafe extern "C" fn(::c_int, *const ::c_char, ...)>;
+    pub fn secure_path(path: *const ::c_char) -> ::c_int;
+    pub fn snprintb(
+        buf: *mut ::c_char,
+        buflen: ::size_t,
+        fmt: *const ::c_char,
+        val: u64,
+    ) -> ::c_int;
+    pub fn snprintb_m(
+        buf: *mut ::c_char,
+        buflen: ::size_t,
+        fmt: *const ::c_char,
+        val: u64,
+        max: ::size_t,
+    ) -> ::c_int;
+
+    pub fn getbootfile() -> *const ::c_char;
+    pub fn getbyteorder() -> ::c_int;
+    pub fn getdiskrawname(
+        buf: *mut ::c_char,
+        buflen: ::size_t,
+        name: *const ::c_char,
+    ) -> *const ::c_char;
+    pub fn getdiskcookedname(
+        buf: *mut ::c_char,
+        buflen: ::size_t,
+        name: *const ::c_char,
+    ) -> *const ::c_char;
+    pub fn getfsspecname(
+        buf: *mut ::c_char,
+        buflen: ::size_t,
+        spec: *const ::c_char,
+    ) -> *const ::c_char;
+
+    pub fn strpct(
+        buf: *mut ::c_char,
+        bufsiz: ::size_t,
+        numerator: ::uintmax_t,
+        denominator: ::uintmax_t,
+        precision: ::size_t,
+    ) -> *mut ::c_char;
+    pub fn strspct(
+        buf: *mut ::c_char,
+        bufsiz: ::size_t,
+        numerator: ::intmax_t,
+        denominator: ::intmax_t,
+        precision: ::size_t,
+    ) -> *mut ::c_char;
+    #[link_name = "__login50"]
+    pub fn login(ut: *const utmp);
+    #[link_name = "__loginx50"]
+    pub fn loginx(ut: *const utmpx);
+    pub fn logout(line: *const ::c_char);
+    pub fn logoutx(line: *const ::c_char, status: ::c_int, tpe: ::c_int);
+    pub fn logwtmp(line: *const ::c_char, name: *const ::c_char, host: *const ::c_char);
+    pub fn logwtmpx(
+        line: *const ::c_char,
+        name: *const ::c_char,
+        host: *const ::c_char,
+        status: ::c_int,
+        tpe: ::c_int,
+    );
+
+    pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86_64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86_64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86_64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86_64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,8 +3,25 @@
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type c_char = i8;
+pub type c___greg_t = u64;
 pub type __cpu_simple_lock_nv_t = ::c_uchar;
 
+s! {
+    pub struct mcontext_t {
+        pub __gregs: [c___greg_t; 26],
+        pub _mc_tlsbase: c___greg_t,
+        pub __fpregs: [[::c_char;32]; 16],
+    }
+
+    pub struct ucontext_t {
+        pub uc_flags: ::c_uint,
+        pub uc_link: *mut ::ucontext_t,
+        pub uc_sigmask: ::sigset_t,
+        pub uc_stack: ::stack_t,
+        pub uc_mcontext: ::mcontext_t,
+    }
+}
+
 // should be pub(crate), but that requires Rust 1.18.0
 cfg_if! {
     if #[cfg(libc_const_size_of)] {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/openbsd/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/openbsd/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/openbsd/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/openbsd/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,6 +14,7 @@
 pub type pthread_condattr_t = *mut ::c_void;
 pub type pthread_rwlock_t = *mut ::c_void;
 pub type pthread_rwlockattr_t = *mut ::c_void;
+pub type pthread_spinlock_t = ::uintptr_t;
 pub type caddr_t = *mut ::c_char;
 
 // elf.h
@@ -383,9 +384,30 @@
         pub dlpi_phdr: *const Elf_Phdr,
         pub dlpi_phnum: Elf_Half,
     }
+
+    // sys/sysctl.h
+    pub struct kinfo_vmentry {
+        pub kve_start: ::c_ulong,
+        pub kve_end: ::c_ulong,
+        pub kve_guard: ::c_ulong,
+        pub kve_fspace: ::c_ulong,
+        pub kve_fspace_augment: ::c_ulong,
+        pub kve_offset: u64,
+        pub kve_wired_count: ::c_int,
+        pub kve_etype: ::c_int,
+        pub kve_protection: ::c_int,
+        pub kve_max_protection: ::c_int,
+        pub kve_advice: ::c_int,
+        pub kve_inheritance: ::c_int,
+        pub kve_flags: u8,
+    }
 }
 
 impl siginfo_t {
+    pub unsafe fn si_addr(&self) -> *mut ::c_char {
+        self.si_addr
+    }
+
     pub unsafe fn si_value(&self) -> ::sigval {
         #[repr(C)]
         struct siginfo_timer {
@@ -936,6 +958,10 @@
 pub const NET_RT_TABLE: ::c_int = 5;
 pub const NET_RT_IFNAMES: ::c_int = 6;
 #[doc(hidden)]
+#[deprecated(
+    since = "0.2.95",
+    note = "Possibly increasing over the releases and might not be so used in the field"
+)]
 pub const NET_RT_MAXID: ::c_int = 7;
 
 pub const IPV6_JOIN_GROUP: ::c_int = 12;
@@ -1160,6 +1186,12 @@
 
 pub const TMP_MAX: ::c_uint = 0x7fffffff;
 
+pub const NI_NUMERICHOST: ::c_int = 1;
+pub const NI_NUMERICSERV: ::c_int = 2;
+pub const NI_NOFQDN: ::c_int = 4;
+pub const NI_NAMEREQD: ::c_int = 8;
+pub const NI_DGRAM: ::c_int = 16;
+
 pub const NI_MAXHOST: ::size_t = 256;
 
 pub const RTLD_LOCAL: ::c_int = 0;
@@ -1266,6 +1298,10 @@
 pub const KERN_CPUSTATS: ::c_int = 85;
 pub const KERN_PFSTATUS: ::c_int = 86;
 pub const KERN_TIMEOUT_STATS: ::c_int = 87;
+#[deprecated(
+    since = "0.2.95",
+    note = "Possibly increasing over the releases and might not be so used in the field"
+)]
 pub const KERN_MAXID: ::c_int = 88;
 
 pub const KERN_PROC_ALL: ::c_int = 0;
@@ -1360,6 +1396,7 @@
 pub const TMPFS_ARGS_VERSION: ::c_int = 1;
 
 pub const MAP_STACK: ::c_int = 0x4000;
+pub const MAP_CONCEAL: ::c_int = 0x8000;
 
 // https://github.com/openbsd/src/blob/master/sys/net/if.h#L187
 pub const IFF_UP: ::c_int = 0x1; // interface is up
@@ -1397,16 +1434,14 @@
 
 pub const WCONTINUED: ::c_int = 8;
 
-fn _ALIGN(p: usize) -> usize {
-    (p + _ALIGNBYTES) & !_ALIGNBYTES
+const_fn! {
+    {const} fn _ALIGN(p: usize) -> usize {
+        (p + _ALIGNBYTES) & !_ALIGNBYTES
+    }
 }
 
 f! {
-    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
-        status & 0o177777 == 0o177777
-    }
-
-        pub fn CMSG_DATA(cmsg: *const ::cmsghdr) -> *mut ::c_uchar {
+    pub fn CMSG_DATA(cmsg: *const ::cmsghdr) -> *mut ::c_uchar {
         (cmsg as *mut ::c_uchar)
             .offset(_ALIGN(::mem::size_of::<::cmsghdr>()) as isize)
     }
@@ -1433,7 +1468,7 @@
         }
     }
 
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+    pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
         (_ALIGN(::mem::size_of::<::cmsghdr>()) + _ALIGN(length as usize))
             as ::c_uint
     }
@@ -1451,23 +1486,22 @@
     pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
         (status & 0xff) == 0o177
     }
+
+    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
+        (status & 0o177777) == 0o177777
+    }
 }
 
 extern "C" {
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
-    pub fn settimeofday(
-        tp: *const ::timeval,
-        tz: *const ::timezone,
-    ) -> ::c_int;
+    pub fn settimeofday(tp: *const ::timeval, tz: *const ::timezone) -> ::c_int;
     pub fn execvpe(
         file: *const ::c_char,
         argv: *const *const ::c_char,
         envp: *const *const ::c_char,
     ) -> ::c_int;
-    pub fn pledge(
-        promises: *const ::c_char,
-        execpromises: *const ::c_char,
-    ) -> ::c_int;
+    pub fn pledge(promises: *const ::c_char, execpromises: *const ::c_char) -> ::c_int;
+    pub fn unveil(path: *const ::c_char, permissions: *const ::c_char) -> ::c_int;
     pub fn strtonum(
         nptr: *const ::c_char,
         minval: ::c_longlong,
@@ -1501,11 +1535,7 @@
         nevents: ::c_int,
         timeout: *const ::timespec,
     ) -> ::c_int;
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn pthread_attr_getguardsize(
         attr: *const ::pthread_attr_t,
         guardsize: *mut ::size_t,
@@ -1517,10 +1547,8 @@
     ) -> ::c_int;
     pub fn pthread_main_np() -> ::c_int;
     pub fn pthread_set_name_np(tid: ::pthread_t, name: *const ::c_char);
-    pub fn pthread_stackseg_np(
-        thread: ::pthread_t,
-        sinfo: *mut ::stack_t,
-    ) -> ::c_int;
+    pub fn pthread_stackseg_np(thread: ::pthread_t, sinfo: *mut ::stack_t) -> ::c_int;
+
     pub fn sysctl(
         name: *const ::c_int,
         namelen: ::c_uint,
@@ -1532,12 +1560,7 @@
     pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int;
     pub fn setresgid(rgid: ::gid_t, egid: ::gid_t, sgid: ::gid_t) -> ::c_int;
     pub fn setresuid(ruid: ::uid_t, euid: ::uid_t, suid: ::uid_t) -> ::c_int;
-    pub fn ptrace(
-        request: ::c_int,
-        pid: ::pid_t,
-        addr: caddr_t,
-        data: ::c_int,
-    ) -> ::c_int;
+    pub fn ptrace(request: ::c_int, pid: ::pid_t, addr: caddr_t, data: ::c_int) -> ::c_int;
     pub fn memmem(
         haystack: *const ::c_void,
         haystacklen: ::size_t,
@@ -1555,6 +1578,15 @@
         >,
         data: *mut ::c_void,
     ) -> ::c_int;
+    pub fn uselocale(loc: ::locale_t) -> ::locale_t;
+    pub fn freelocale(loc: ::locale_t);
+    pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
+    pub fn duplocale(base: ::locale_t) -> ::locale_t;
+
+    // Added in `OpenBSD` 5.5
+    pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
+
+    pub fn setproctitle(fmt: *const ::c_char, ...);
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/openbsd/x86_64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/openbsd/x86_64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/openbsd/x86_64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/bsd/netbsdlike/openbsd/x86_64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,6 +3,112 @@
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type c_char = i8;
+pub type ucontext_t = sigcontext;
+
+s! {
+    pub struct sigcontext {
+        pub sc_rdi: ::c_long,
+        pub sc_rsi: ::c_long,
+        pub sc_rdx: ::c_long,
+        pub sc_rcx: ::c_long,
+        pub sc_r8: ::c_long,
+        pub sc_r9: ::c_long,
+        pub sc_r10: ::c_long,
+        pub sc_r11: ::c_long,
+        pub sc_r12: ::c_long,
+        pub sc_r13: ::c_long,
+        pub sc_r14: ::c_long,
+        pub sc_r15: ::c_long,
+        pub sc_rbp: ::c_long,
+        pub sc_rbx: ::c_long,
+        pub sc_rax: ::c_long,
+        pub sc_gs: ::c_long,
+        pub sc_fs: ::c_long,
+        pub sc_es: ::c_long,
+        pub sc_ds: ::c_long,
+        pub sc_trapno: ::c_long,
+        pub sc_err: ::c_long,
+        pub sc_rip: ::c_long,
+        pub sc_cs: ::c_long,
+        pub sc_rflags: ::c_long,
+        pub sc_rsp: ::c_long,
+        pub sc_ss: ::c_long,
+        pub sc_fpstate: *mut fxsave64,
+        __sc_unused: ::c_int,
+        pub sc_mask: ::c_int,
+        pub sc_cookie: ::c_long,
+    }
+}
+
+s_no_extra_traits! {
+    #[repr(packed)]
+    pub struct fxsave64 {
+        pub fx_fcw: u16,
+        pub fx_fsw: u16,
+        pub fx_ftw: u8,
+        __fx_unused1: u8,
+        pub fx_fop: u16,
+        pub fx_rip: u64,
+        pub fx_rdp: u64,
+        pub fx_mxcsr: u32,
+        pub fx_mxcsr_mask: u32,
+        pub fx_st: [[u64; 2]; 8],
+        pub fx_xmm: [[u64; 2]; 16],
+        __fx_unused3: [u8; 96],
+    }
+}
+
+cfg_if! {
+    if #[cfg(feature = "extra_traits")] {
+        // `fxsave64` is packed, so field access is unaligned.
+        // use {x} to create temporary storage, copy field to it, and do aligned access.
+        impl PartialEq for fxsave64 {
+            fn eq(&self, other: &fxsave64) -> bool {
+                return {self.fx_fcw} == {other.fx_fcw} &&
+                    {self.fx_fsw} == {other.fx_fsw} &&
+                    {self.fx_ftw} == {other.fx_ftw} &&
+                    {self.fx_fop} == {other.fx_fop} &&
+                    {self.fx_rip} == {other.fx_rip} &&
+                    {self.fx_rdp} == {other.fx_rdp} &&
+                    {self.fx_mxcsr} == {other.fx_mxcsr} &&
+                    {self.fx_mxcsr_mask} == {other.fx_mxcsr_mask} &&
+                    {self.fx_st}.iter().zip({other.fx_st}.iter()).all(|(a,b)| a == b) &&
+                    {self.fx_xmm}.iter().zip({other.fx_xmm}.iter()).all(|(a,b)| a == b)
+            }
+        }
+        impl Eq for fxsave64 {}
+        impl ::fmt::Debug for fxsave64 {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("fxsave64")
+                    .field("fx_fcw", &{self.fx_fcw})
+                    .field("fx_fsw", &{self.fx_fsw})
+                    .field("fx_ftw", &{self.fx_ftw})
+                    .field("fx_fop", &{self.fx_fop})
+                    .field("fx_rip", &{self.fx_rip})
+                    .field("fx_rdp", &{self.fx_rdp})
+                    .field("fx_mxcsr", &{self.fx_mxcsr})
+                    .field("fx_mxcsr_mask", &{self.fx_mxcsr_mask})
+                    // FIXME: .field("fx_st", &{self.fx_st})
+                    // FIXME: .field("fx_xmm", &{self.fx_xmm})
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for fxsave64 {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                {self.fx_fcw}.hash(state);
+                {self.fx_fsw}.hash(state);
+                {self.fx_ftw}.hash(state);
+                {self.fx_fop}.hash(state);
+                {self.fx_rip}.hash(state);
+                {self.fx_rdp}.hash(state);
+                {self.fx_mxcsr}.hash(state);
+                {self.fx_mxcsr_mask}.hash(state);
+                {self.fx_st}.hash(state);
+                {self.fx_xmm}.hash(state);
+            }
+        }
+    }
+}
 
 // should be pub(crate), but that requires Rust 1.18.0
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/haiku/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/haiku/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/haiku/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/haiku/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,9 @@
 pub type rlim_t = ::uintptr_t;
 pub type sa_family_t = u8;
 pub type pthread_key_t = ::c_int;
-pub type nfds_t = ::c_long;
+pub type nfds_t = ::c_ulong;
 pub type tcflag_t = ::c_uint;
-pub type speed_t = ::c_uint;
+pub type speed_t = ::c_uchar;
 pub type c_char = i8;
 pub type clock_t = i32;
 pub type clockid_t = i32;
@@ -19,6 +19,7 @@
 pub type useconds_t = u32;
 pub type socklen_t = u32;
 pub type pthread_t = ::uintptr_t;
+pub type pthread_condattr_t = ::uintptr_t;
 pub type pthread_mutexattr_t = ::uintptr_t;
 pub type pthread_rwlockattr_t = ::uintptr_t;
 pub type sigset_t = u64;
@@ -28,6 +29,7 @@
 pub type nl_item = ::c_int;
 pub type id_t = i32;
 pub type idtype_t = ::c_uint;
+pub type fd_mask = u32;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum timezone {}
@@ -50,6 +52,10 @@
     pub unsafe fn si_uid(&self) -> ::uid_t {
         self.si_uid
     }
+
+    pub unsafe fn si_status(&self) -> ::c_int {
+        self.si_status
+    }
 }
 
 s! {
@@ -65,7 +71,7 @@
     pub struct sockaddr {
         pub sa_len: u8,
         pub sa_family: sa_family_t,
-        pub sa_data: [::c_char; 30],
+        pub sa_data: [u8; 30],
     }
 
     pub struct sockaddr_in {
@@ -73,13 +79,13 @@
         pub sin_family: sa_family_t,
         pub sin_port: ::in_port_t,
         pub sin_addr: ::in_addr,
-        pub sin_zero: [u8; 24],
+        pub sin_zero: [i8; 24],
     }
 
     pub struct sockaddr_in6 {
         pub sin6_len: u8,
-        pub sin6_family: sa_family_t,
-        pub sin6_port: ::in_port_t,
+        pub sin6_family: u8,
+        pub sin6_port: u16,
         pub sin6_flowinfo: u32,
         pub sin6_addr: ::in6_addr,
         pub sin6_scope_id: u32,
@@ -97,7 +103,8 @@
     }
 
     pub struct fd_set {
-        fds_bits: [c_ulong; FD_SETSIZE / ULONG_SIZE],
+        // size for 1024 bits, and a fd_mask with size u32
+        fds_bits: [fd_mask; 32],
     }
 
     pub struct tm {
@@ -110,8 +117,8 @@
         pub tm_wday: ::c_int,
         pub tm_yday: ::c_int,
         pub tm_isdst: ::c_int,
-        pub tm_gmtoff: ::c_long,
-        pub tm_zone: *const ::c_char,
+        pub tm_gmtoff: ::c_int,
+        pub tm_zone: *mut ::c_char,
     }
 
     pub struct utsname {
@@ -151,16 +158,16 @@
 
     pub struct msghdr {
         pub msg_name: *mut ::c_void,
-        pub msg_namelen: ::socklen_t,
+        pub msg_namelen: socklen_t,
         pub msg_iov: *mut ::iovec,
         pub msg_iovlen: ::c_int,
         pub msg_control: *mut ::c_void,
-        pub msg_controllen: ::socklen_t,
+        pub msg_controllen: socklen_t,
         pub msg_flags: ::c_int,
     }
 
     pub struct cmsghdr {
-        pub cmsg_len: ::size_t,
+        pub cmsg_len: ::socklen_t,
         pub cmsg_level: ::c_int,
         pub cmsg_type: ::c_int,
     }
@@ -297,22 +304,22 @@
     }
 
     pub struct sigaction {
-        pub sa_sigaction: ::sighandler_t,
+        pub sa_sigaction: ::sighandler_t, //actually a union with sa_handler
         pub sa_mask: ::sigset_t,
         pub sa_flags: ::c_int,
         sa_userdata: *mut ::c_void,
     }
 
     pub struct sem_t {
-        pub se_type: i32,
-        pub se_named_id: i32, // this is actually a union
-        pub se_unnamed: i32,
-        pub se_padding: [i32; 4],
+        pub type_: i32,
+        pub named_sem_id: i32, // actually a union with unnamed_sem (i32)
+        pub padding: [i32; 2],
     }
 
-    pub struct pthread_condattr_t {
-        pub process_shared: bool,
-        pub clock_id: i32,
+    pub struct ucred {
+        pub pid: ::pid_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
     }
 }
 
@@ -487,17 +494,6 @@
     }
 }
 
-// intentionally not public, only used for fd_set
-cfg_if! {
-    if #[cfg(target_pointer_width = "32")] {
-        const ULONG_SIZE: usize = 32;
-    } else if #[cfg(target_pointer_width = "64")] {
-        const ULONG_SIZE: usize = 64;
-    } else {
-        // Unknown target_pointer_width
-    }
-}
-
 pub const EXIT_FAILURE: ::c_int = 1;
 pub const EXIT_SUCCESS: ::c_int = 0;
 pub const RAND_MAX: ::c_int = 2147483647;
@@ -555,7 +551,7 @@
 pub const RLIMIT_AS: ::c_int = 6;
 // Haiku specific
 pub const RLIMIT_NOVMON: ::c_int = 7;
-pub const RLIMIT_NLIMITS: ::c_int = 8;
+pub const RLIM_NLIMITS: ::c_int = 8;
 
 pub const RUSAGE_SELF: ::c_int = 0;
 
@@ -592,18 +588,20 @@
 pub const S_IFLNK: ::mode_t = 40960;
 pub const S_IFSOCK: ::mode_t = 49152;
 pub const S_IFMT: ::mode_t = 61440;
-pub const S_IRWXU: ::mode_t = 448;
-pub const S_IXUSR: ::mode_t = 64;
-pub const S_IWUSR: ::mode_t = 128;
-pub const S_IRUSR: ::mode_t = 256;
-pub const S_IRWXG: ::mode_t = 70;
-pub const S_IXGRP: ::mode_t = 10;
-pub const S_IWGRP: ::mode_t = 20;
-pub const S_IRGRP: ::mode_t = 40;
-pub const S_IRWXO: ::mode_t = 7;
-pub const S_IXOTH: ::mode_t = 1;
-pub const S_IWOTH: ::mode_t = 2;
-pub const S_IROTH: ::mode_t = 4;
+
+pub const S_IRWXU: ::mode_t = 0o00700;
+pub const S_IRUSR: ::mode_t = 0o00400;
+pub const S_IWUSR: ::mode_t = 0o00200;
+pub const S_IXUSR: ::mode_t = 0o00100;
+pub const S_IRWXG: ::mode_t = 0o00070;
+pub const S_IRGRP: ::mode_t = 0o00040;
+pub const S_IWGRP: ::mode_t = 0o00020;
+pub const S_IXGRP: ::mode_t = 0o00010;
+pub const S_IRWXO: ::mode_t = 0o00007;
+pub const S_IROTH: ::mode_t = 0o00004;
+pub const S_IWOTH: ::mode_t = 0o00002;
+pub const S_IXOTH: ::mode_t = 0o00001;
+
 pub const F_OK: ::c_int = 0;
 pub const R_OK: ::c_int = 4;
 pub const W_OK: ::c_int = 2;
@@ -682,6 +680,7 @@
 pub const MAP_PRIVATE: ::c_int = 0x02;
 pub const MAP_FIXED: ::c_int = 0x04;
 pub const MAP_ANONYMOUS: ::c_int = 0x08;
+pub const MAP_NORESERVE: ::c_int = 0x10;
 pub const MAP_ANON: ::c_int = MAP_ANONYMOUS;
 
 pub const MAP_FAILED: *mut ::c_void = !0 as *mut ::c_void;
@@ -703,8 +702,8 @@
 pub const ENXIO: ::c_int = -2147454965;
 pub const ESPIPE: ::c_int = -2147454964;
 pub const ESRCH: ::c_int = -2147454963;
-pub const EFPOS: ::c_int = -2147457962;
-pub const ESIGPARM: ::c_int = -2147457961;
+pub const EFPOS: ::c_int = -2147454962;
+pub const ESIGPARM: ::c_int = -2147454961;
 pub const EDOM: ::c_int = -2147454960;
 pub const ERANGE: ::c_int = -2147454959;
 pub const EPROTOTYPE: ::c_int = -2147454958;
@@ -752,7 +751,7 @@
 pub const ENOATTR: ::c_int = -2147454916;
 
 // INT_MIN
-pub const ENOMEM: ::c_int = -2147454976;
+pub const ENOMEM: ::c_int = -2147483648;
 
 // POSIX errors that can be mapped to BeOS error codes
 pub const EACCES: ::c_int = -2147483646;
@@ -788,6 +787,7 @@
 pub const MADV_RANDOM: ::c_int = 3;
 pub const MADV_WILLNEED: ::c_int = 4;
 pub const MADV_DONTNEED: ::c_int = 5;
+pub const MADV_FREE: ::c_int = 6;
 
 // https://github.com/haiku/haiku/blob/master/headers/posix/net/if.h#L80
 pub const IFF_UP: ::c_int = 0x0001;
@@ -817,6 +817,15 @@
 pub const AF_UNIX: ::c_int = AF_LOCAL;
 pub const AF_BLUETOOTH: ::c_int = 10;
 
+pub const PF_UNSPEC: ::c_int = AF_UNSPEC;
+pub const PF_INET: ::c_int = AF_INET;
+pub const PF_ROUTE: ::c_int = AF_ROUTE;
+pub const PF_LINK: ::c_int = AF_LINK;
+pub const PF_INET6: ::c_int = AF_INET6;
+pub const PF_LOCAL: ::c_int = AF_LOCAL;
+pub const PF_UNIX: ::c_int = AF_UNIX;
+pub const PF_BLUETOOTH: ::c_int = AF_BLUETOOTH;
+
 pub const IP_OPTIONS: ::c_int = 1;
 pub const IP_HDRINCL: ::c_int = 2;
 pub const IP_TOS: ::c_int = 3;
@@ -840,6 +849,9 @@
 pub const TCP_NOPUSH: ::c_int = 0x04;
 pub const TCP_NOOPT: ::c_int = 0x08;
 
+pub const IF_NAMESIZE: ::size_t = 32;
+pub const IFNAMSIZ: ::size_t = IF_NAMESIZE;
+
 pub const IPV6_MULTICAST_IF: ::c_int = 24;
 pub const IPV6_MULTICAST_HOPS: ::c_int = 25;
 pub const IPV6_MULTICAST_LOOP: ::c_int = 26;
@@ -850,7 +862,7 @@
 pub const IPV6_PKTINFO: ::c_int = 31;
 pub const IPV6_RECVPKTINFO: ::c_int = 32;
 pub const IPV6_HOPLIMIT: ::c_int = 33;
-pub const IPV6_REVCHOPLIMIT: ::c_int = 34;
+pub const IPV6_RECVHOPLIMIT: ::c_int = 34;
 pub const IPV6_HOPOPTS: ::c_int = 35;
 pub const IPV6_DSTOPTS: ::c_int = 36;
 pub const IPV6_RTHDR: ::c_int = 37;
@@ -879,6 +891,7 @@
 
 pub const SIGSTKSZ: ::size_t = 16384;
 
+pub const IOV_MAX: ::c_int = 1024;
 pub const PATH_MAX: ::c_int = 1024;
 
 pub const SA_NOCLDSTOP: ::c_int = 0x01;
@@ -929,7 +942,10 @@
 pub const _PC_XATTR_EXISTS: ::c_int = 38;
 pub const _PC_XATTR_ENABLED: ::c_int = 39;
 
-pub const FIONBIO: ::c_int = 0xbe000000;
+pub const FIONBIO: ::c_ulong = 0xbe000000;
+pub const FIONREAD: ::c_ulong = 0xbe000001;
+pub const FIOSEEKDATA: ::c_ulong = 0xbe000002;
+pub const FIOSEEKHOLE: ::c_ulong = 0xbe000003;
 
 pub const _SC_ARG_MAX: ::c_int = 15;
 pub const _SC_CHILD_MAX: ::c_int = 16;
@@ -980,6 +996,7 @@
 pub const _SC_REGEXP: ::c_int = 62;
 pub const _SC_SYMLOOP_MAX: ::c_int = 63;
 pub const _SC_SHELL: ::c_int = 64;
+pub const _SC_TTY_NAME_MAX: ::c_int = 65;
 
 pub const PTHREAD_STACK_MIN: ::size_t = 8192;
 
@@ -1055,6 +1072,13 @@
 pub const WSTOPPED: ::c_int = 0x10;
 pub const WNOWAIT: ::c_int = 0x20;
 
+pub const CLD_EXITED: ::c_int = 60;
+pub const CLD_KILLED: ::c_int = 61;
+pub const CLD_DUMPED: ::c_int = 62;
+pub const CLD_TRAPPED: ::c_int = 63;
+pub const CLD_STOPPED: ::c_int = 64;
+pub const CLD_CONTINUED: ::c_int = 65;
+
 pub const P_ALL: idtype_t = 0;
 pub const P_PID: idtype_t = 1;
 pub const P_PGID: idtype_t = 2;
@@ -1199,36 +1223,89 @@
 pub const TCOFLUSH: ::c_int = 0x02;
 pub const TCIOFLUSH: ::c_int = 0x03;
 
-pub const TCGETA: ::c_int = 0x8000;
-pub const TCSETA: ::c_int = TCGETA + 1;
-pub const TCSETAF: ::c_int = TCGETA + 2;
-pub const TCSETAW: ::c_int = TCGETA + 3;
-pub const TCWAITEVENT: ::c_int = TCGETA + 4;
-pub const TCSBRK: ::c_int = TCGETA + 5;
-pub const TCFLSH: ::c_int = TCGETA + 6;
-pub const TCXONC: ::c_int = TCGETA + 7;
-pub const TCQUERYCONNECTED: ::c_int = TCGETA + 8;
-pub const TCGETBITS: ::c_int = TCGETA + 9;
-pub const TCSETDTR: ::c_int = TCGETA + 10;
-pub const TCSETRTS: ::c_int = TCGETA + 11;
-pub const TIOCGWINSZ: ::c_int = TCGETA + 12;
-pub const TIOCSWINSZ: ::c_int = TCGETA + 13;
-pub const TCVTIME: ::c_int = TCGETA + 14;
-pub const TIOCGPGRP: ::c_int = TCGETA + 15;
-pub const TIOCSPGRP: ::c_int = TCGETA + 16;
-pub const TIOCSCTTY: ::c_int = TCGETA + 17;
-pub const TIOCMGET: ::c_int = TCGETA + 18;
-pub const TIOCMSET: ::c_int = TCGETA + 19;
-pub const TIOCSBRK: ::c_int = TCGETA + 20;
-pub const TIOCCBRK: ::c_int = TCGETA + 21;
-pub const TIOCMBIS: ::c_int = TCGETA + 22;
-pub const TIOCMBIC: ::c_int = TCGETA + 23;
+pub const TCGETA: ::c_ulong = 0x8000;
+pub const TCSETA: ::c_ulong = TCGETA + 1;
+pub const TCSETAF: ::c_ulong = TCGETA + 2;
+pub const TCSETAW: ::c_ulong = TCGETA + 3;
+pub const TCWAITEVENT: ::c_ulong = TCGETA + 4;
+pub const TCSBRK: ::c_ulong = TCGETA + 5;
+pub const TCFLSH: ::c_ulong = TCGETA + 6;
+pub const TCXONC: ::c_ulong = TCGETA + 7;
+pub const TCQUERYCONNECTED: ::c_ulong = TCGETA + 8;
+pub const TCGETBITS: ::c_ulong = TCGETA + 9;
+pub const TCSETDTR: ::c_ulong = TCGETA + 10;
+pub const TCSETRTS: ::c_ulong = TCGETA + 11;
+pub const TIOCGWINSZ: ::c_ulong = TCGETA + 12;
+pub const TIOCSWINSZ: ::c_ulong = TCGETA + 13;
+pub const TCVTIME: ::c_ulong = TCGETA + 14;
+pub const TIOCGPGRP: ::c_ulong = TCGETA + 15;
+pub const TIOCSPGRP: ::c_ulong = TCGETA + 16;
+pub const TIOCSCTTY: ::c_ulong = TCGETA + 17;
+pub const TIOCMGET: ::c_ulong = TCGETA + 18;
+pub const TIOCMSET: ::c_ulong = TCGETA + 19;
+pub const TIOCSBRK: ::c_ulong = TCGETA + 20;
+pub const TIOCCBRK: ::c_ulong = TCGETA + 21;
+pub const TIOCMBIS: ::c_ulong = TCGETA + 22;
+pub const TIOCMBIC: ::c_ulong = TCGETA + 23;
 
 pub const PRIO_PROCESS: ::c_int = 0;
 pub const PRIO_PGRP: ::c_int = 1;
 pub const PRIO_USER: ::c_int = 2;
 
+pub const LOG_PID: ::c_int = 1 << 12;
+pub const LOG_CONS: ::c_int = 2 << 12;
+pub const LOG_ODELAY: ::c_int = 4 << 12;
+pub const LOG_NDELAY: ::c_int = 8 << 12;
+pub const LOG_SERIAL: ::c_int = 16 << 12;
+pub const LOG_PERROR: ::c_int = 32 << 12;
+pub const LOG_NOWAIT: ::c_int = 64 << 12;
+
+const_fn! {
+    {const} fn CMSG_ALIGN(len: usize) -> usize {
+        len + ::mem::size_of::<usize>() - 1 & !(::mem::size_of::<usize>() - 1)
+    }
+}
+
 f! {
+    pub fn CMSG_FIRSTHDR(mhdr: *const msghdr) -> *mut cmsghdr {
+        if (*mhdr).msg_controllen as usize >= ::mem::size_of::<cmsghdr>() {
+            (*mhdr).msg_control as *mut cmsghdr
+        } else {
+            0 as *mut cmsghdr
+        }
+    }
+
+    pub fn CMSG_DATA(cmsg: *const ::cmsghdr) -> *mut ::c_uchar {
+        (cmsg as *mut ::c_uchar)
+            .offset(CMSG_ALIGN(::mem::size_of::<::cmsghdr>()) as isize)
+    }
+
+    pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+        (CMSG_ALIGN(length as usize) + CMSG_ALIGN(::mem::size_of::<cmsghdr>()))
+            as ::c_uint
+    }
+
+    pub fn CMSG_LEN(length: ::c_uint) -> ::c_uint {
+        CMSG_ALIGN(::mem::size_of::<cmsghdr>()) as ::c_uint + length
+    }
+
+    pub fn CMSG_NXTHDR(mhdr: *const msghdr,
+                       cmsg: *const cmsghdr) -> *mut cmsghdr {
+        if cmsg.is_null() {
+            return ::CMSG_FIRSTHDR(mhdr);
+        };
+        let next = cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len as usize)
+            + CMSG_ALIGN(::mem::size_of::<::cmsghdr>());
+        let max = (*mhdr).msg_control as usize
+            + (*mhdr).msg_controllen as usize;
+        if next > max {
+            0 as *mut ::cmsghdr
+        } else {
+            (cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len as usize))
+                as *mut ::cmsghdr
+        }
+    }
+
     pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
         let fd = fd as usize;
         let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
@@ -1236,7 +1313,7 @@
         return
     }
 
-    pub fn FD_ISSET(fd: ::c_int, set: *mut fd_set) -> bool {
+    pub fn FD_ISSET(fd: ::c_int, set: *const fd_set) -> bool {
         let fd = fd as usize;
         let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
         return ((*set).fds_bits[fd / size] & (1 << (fd % size))) != 0
@@ -1295,11 +1372,7 @@
     pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;
     pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
     pub fn getpriority(which: ::c_int, who: id_t) -> ::c_int;
-    pub fn setpriority(
-        which: ::c_int,
-        who: id_t,
-        priority: ::c_int,
-    ) -> ::c_int;
+    pub fn setpriority(which: ::c_int, who: id_t, priority: ::c_int) -> ::c_int;
 
     pub fn utimensat(
         fd: ::c_int,
@@ -1308,11 +1381,7 @@
         flag: ::c_int,
     ) -> ::c_int;
     pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
     pub fn _errnop() -> *mut ::c_int;
 
     pub fn abs(i: ::c_int) -> ::c_int;
@@ -1325,11 +1394,7 @@
 #[link(name = "bsd")]
 extern "C" {
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
 
     pub fn clock_gettime(clk_id: ::c_int, tp: *mut ::timespec) -> ::c_int;
     pub fn clock_settime(clk_id: ::c_int, tp: *const ::timespec) -> ::c_int;
@@ -1357,71 +1422,47 @@
         clock_id: ::clockid_t,
     ) -> ::c_int;
     pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
-    pub fn setgroups(ngroups: ::size_t, ptr: *const ::gid_t) -> ::c_int;
-    pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
-    pub fn mprotect(
-        addr: *const ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn setgroups(ngroups: ::c_int, ptr: *const ::gid_t) -> ::c_int;
+    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn dirfd(dirp: *mut ::DIR) -> ::c_int;
     pub fn getnameinfo(
         sa: *const ::sockaddr,
         salen: ::socklen_t,
         host: *mut ::c_char,
-        hostlen: ::size_t,
+        hostlen: ::socklen_t,
         serv: *mut ::c_char,
-        sevlen: ::size_t,
+        sevlen: ::socklen_t,
         flags: ::c_int,
     ) -> ::c_int;
     pub fn pthread_mutex_timedlock(
         lock: *mut pthread_mutex_t,
         abstime: *const ::timespec,
     ) -> ::c_int;
-    pub fn waitid(
-        idtype: idtype_t,
-        id: id_t,
-        infop: *mut ::siginfo_t,
-        options: ::c_int,
-    ) -> ::c_int;
+    pub fn waitid(idtype: idtype_t, id: id_t, infop: *mut ::siginfo_t, options: ::c_int)
+        -> ::c_int;
 
     pub fn glob(
         pattern: *const ::c_char,
         flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int,
-        >,
+        errfunc: ::Option<extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int>,
         pglob: *mut ::glob_t,
     ) -> ::c_int;
     pub fn globfree(pglob: *mut ::glob_t);
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
-    pub fn posix_madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
+    pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t, advice: ::c_int) -> ::c_int;
+    pub fn posix_fallocate(fd: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
 
-    pub fn shm_open(
-        name: *const ::c_char,
-        oflag: ::c_int,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn shm_open(name: *const ::c_char, oflag: ::c_int, mode: ::mode_t) -> ::c_int;
     pub fn shm_unlink(name: *const ::c_char) -> ::c_int;
 
     pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long);
 
     pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
-    pub fn madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn msync(addr: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::c_int;
 
     pub fn recvfrom(
         socket: ::c_int,
@@ -1435,33 +1476,13 @@
     pub fn lutimes(file: *const ::c_char, times: *const ::timeval) -> ::c_int;
     pub fn nl_langinfo(item: ::nl_item) -> *mut ::c_char;
 
-    pub fn bind(
-        socket: ::c_int,
-        address: *const ::sockaddr,
-        address_len: ::socklen_t,
-    ) -> ::c_int;
+    pub fn bind(socket: ::c_int, address: *const ::sockaddr, address_len: ::socklen_t) -> ::c_int;
 
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, count: ::c_int) -> ::ssize_t;
+    pub fn readv(fd: ::c_int, iov: *const ::iovec, count: ::c_int) -> ::ssize_t;
 
-    pub fn sendmsg(
-        fd: ::c_int,
-        msg: *const ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn recvmsg(
-        fd: ::c_int,
-        msg: *mut ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn sendmsg(fd: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
+    pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
     pub fn execvpe(
         file: *const ::c_char,
         argv: *const *const ::c_char,
@@ -1484,11 +1505,7 @@
         buflen: ::size_t,
         result: *mut *mut ::group,
     ) -> ::c_int;
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sem_open(name: *const ::c_char, oflag: ::c_int, ...) -> *mut sem_t;
     pub fn getgrnam(name: *const ::c_char) -> *mut ::group;
     pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
@@ -1542,3 +1559,6 @@
         pub use self::b32::*;
     }
 }
+
+mod native;
+pub use self::native::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/haiku/native.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/haiku/native.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/haiku/native.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/haiku/native.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1176 @@
+// This module contains bindings to the native Haiku API. The Haiku API
+// originates from BeOS, and it was the original way to perform low level
+// system and IO operations. The POSIX API was in that era was like a
+// compatibility layer. In current Haiku development, both the POSIX API and
+// the Haiku API are considered to be co-equal status. However, they are not
+// integrated like they are on other UNIX platforms, which means that for many
+// low level concepts there are two versions, like processes (POSIX) and
+// teams (Haiku), or pthreads and native threads.
+//
+// Both the POSIX API and the Haiku API live in libroot.so, the library that is
+// linked to any binary by default.
+//
+// This file follows the Haiku API for Haiku R1 beta 2. It is organized by the
+// C/C++ header files in which the concepts can be found, while adhering to the
+// style guide for this crate.
+
+// Helper macro to generate u32 constants. The Haiku API uses (non-standard)
+// multi-character constants (like 'UPDA' or 'MSGM') to represent 32 bit
+// integer constants.
+
+macro_rules! haiku_constant {
+    ($a:tt, $b:tt, $c:tt, $d:tt) => {
+        (($a as u32) << 24) + (($b as u32) << 16) + (($c as u32) << 8) + ($d as u32)
+    };
+}
+
+// support/SupportDefs.h
+pub type status_t = i32;
+pub type bigtime_t = i64;
+pub type nanotime_t = i64;
+pub type type_code = u32;
+pub type perform_code = u32;
+
+// kernel/OS.h
+pub type area_id = i32;
+pub type port_id = i32;
+pub type sem_id = i32;
+pub type team_id = i32;
+pub type thread_id = i32;
+
+pub type thread_func = extern "C" fn(*mut ::c_void) -> status_t;
+
+// kernel/image.h
+pub type image_id = i32;
+
+e! {
+    // kernel/OS.h
+    pub enum thread_state {
+        B_THREAD_RUNNING = 1,
+        B_THREAD_READY,
+        B_THREAD_RECEIVING,
+        B_THREAD_ASLEEP,
+        B_THREAD_SUSPENDED,
+        B_THREAD_WAITING
+    }
+
+    // kernel/image.h
+    pub enum image_type {
+        B_APP_IMAGE = 1,
+        B_LIBRARY_IMAGE,
+        B_ADD_ON_IMAGE,
+        B_SYSTEM_IMAGE
+    }
+
+    // kernel/scheduler.h
+    pub enum schduler_mode {
+        SCHEDULER_MODE_LOW_LATENCY,
+        SCHEDULER_MODE_POWER_SAVING,
+    }
+
+    // FindDirectory.h
+    pub enum path_base_directory {
+        B_FIND_PATH_INSTALLATION_LOCATION_DIRECTORY,
+        B_FIND_PATH_ADD_ONS_DIRECTORY,
+        B_FIND_PATH_APPS_DIRECTORY,
+        B_FIND_PATH_BIN_DIRECTORY,
+        B_FIND_PATH_BOOT_DIRECTORY,
+        B_FIND_PATH_CACHE_DIRECTORY,
+        B_FIND_PATH_DATA_DIRECTORY,
+        B_FIND_PATH_DEVELOP_DIRECTORY,
+        B_FIND_PATH_DEVELOP_LIB_DIRECTORY,
+        B_FIND_PATH_DOCUMENTATION_DIRECTORY,
+        B_FIND_PATH_ETC_DIRECTORY,
+        B_FIND_PATH_FONTS_DIRECTORY,
+        B_FIND_PATH_HEADERS_DIRECTORY,
+        B_FIND_PATH_LIB_DIRECTORY,
+        B_FIND_PATH_LOG_DIRECTORY,
+        B_FIND_PATH_MEDIA_NODES_DIRECTORY,
+        B_FIND_PATH_PACKAGES_DIRECTORY,
+        B_FIND_PATH_PREFERENCES_DIRECTORY,
+        B_FIND_PATH_SERVERS_DIRECTORY,
+        B_FIND_PATH_SETTINGS_DIRECTORY,
+        B_FIND_PATH_SOUNDS_DIRECTORY,
+        B_FIND_PATH_SPOOL_DIRECTORY,
+        B_FIND_PATH_TRANSLATORS_DIRECTORY,
+        B_FIND_PATH_VAR_DIRECTORY,
+        B_FIND_PATH_IMAGE_PATH = 1000,
+        B_FIND_PATH_PACKAGE_PATH,
+    }
+}
+
+s! {
+    // kernel/OS.h
+    pub struct area_info {
+        pub area: area_id,
+        pub name: [::c_char; B_OS_NAME_LENGTH],
+        pub size: usize,
+        pub lock: u32,
+        pub protection: u32,
+        pub team: team_id,
+        pub ram_size: u32,
+        pub copy_count: u32,
+        pub in_count: u32,
+        pub out_count: u32,
+        pub address: *mut ::c_void
+    }
+
+    pub struct port_info {
+        pub port: port_id,
+        pub team: team_id,
+        pub name: [::c_char; B_OS_NAME_LENGTH],
+        pub capacity: i32,
+        pub queue_count: i32,
+        pub total_count: i32,
+    }
+
+    pub struct port_message_info {
+        pub size: ::size_t,
+        pub sender: ::uid_t,
+        pub sender_group: ::gid_t,
+        pub sender_team: ::team_id
+    }
+
+    pub struct team_info {
+        pub team: team_id,
+        pub thread_count: i32,
+        pub image_count: i32,
+        pub area_count: i32,
+        pub debugger_nub_thread: thread_id,
+        pub debugger_nub_port: port_id,
+        pub argc: i32,
+        pub args: [::c_char; 64],
+        pub uid: ::uid_t,
+        pub gid: ::gid_t
+    }
+
+    pub struct sem_info {
+        pub sem: sem_id,
+        pub team: team_id,
+        pub name: [::c_char; B_OS_NAME_LENGTH],
+        pub count: i32,
+        pub latest_holder: thread_id
+    }
+
+    pub struct team_usage_info {
+        pub user_time: bigtime_t,
+        pub kernel_time: bigtime_t
+    }
+
+    pub struct thread_info {
+        pub thread: thread_id,
+        pub team: team_id,
+        pub name: [::c_char; B_OS_NAME_LENGTH],
+        pub state: thread_state,
+        pub priority: i32,
+        pub sem: sem_id,
+        pub user_time: bigtime_t,
+        pub kernel_time: bigtime_t,
+        pub stack_base: *mut ::c_void,
+        pub stack_end: *mut ::c_void
+    }
+
+    pub struct cpu_info {
+        pub active_time: bigtime_t,
+        pub enabled: bool
+    }
+
+    pub struct system_info {
+        pub boot_time: bigtime_t,
+        pub cpu_count: u32,
+        pub max_pages: u64,
+        pub used_pages: u64,
+        pub cached_pages: u64,
+        pub block_cache_pages: u64,
+        pub ignored_pages: u64,
+        pub needed_memory: u64,
+        pub free_memory: u64,
+        pub max_swap_pages: u64,
+        pub free_swap_pages: u64,
+        pub page_faults: u32,
+        pub max_sems: u32,
+        pub used_sems: u32,
+        pub max_ports: u32,
+        pub used_ports: u32,
+        pub max_threads: u32,
+        pub used_threads: u32,
+        pub max_teams: u32,
+        pub used_teams: u32,
+        pub kernel_name: [::c_char; B_FILE_NAME_LENGTH],
+        pub kernel_build_date: [::c_char; B_OS_NAME_LENGTH],
+        pub kernel_build_time: [::c_char; B_OS_NAME_LENGTH],
+        pub kernel_version: i64,
+        pub abi: u32
+    }
+
+    pub struct object_wait_info {
+        pub object: i32,
+        pub type_: u16,
+        pub events: u16
+    }
+
+    // kernel/fs_attr.h
+    pub struct attr_info {
+        pub type_: u32,
+        pub size: ::off_t
+    }
+
+    // kernel/fs_index.h
+    pub struct index_info {
+        pub type_: u32,
+        pub size: ::off_t,
+        pub modification_time: ::time_t,
+        pub creation_time: ::time_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t
+    }
+
+    //kernel/fs_info.h
+    pub struct fs_info {
+        pub dev: ::dev_t,
+        pub root: ::ino_t,
+        pub flags: u32,
+        pub block_size: ::off_t,
+        pub io_size: ::off_t,
+        pub total_blocks: ::off_t,
+        pub free_blocks: ::off_t,
+        pub total_nodes: ::off_t,
+        pub free_nodes: ::off_t,
+        pub device_name: [::c_char; 128],
+        pub volume_name: [::c_char; B_FILE_NAME_LENGTH],
+        pub fsh_name: [::c_char; B_OS_NAME_LENGTH]
+    }
+
+    // kernel/image.h
+    pub struct image_info {
+        pub id: image_id,
+        pub image_type: ::c_int,
+        pub sequence: i32,
+        pub init_order: i32,
+        pub init_routine: extern "C" fn(),
+        pub term_routine: extern "C" fn(),
+        pub device: ::dev_t,
+        pub node: ::ino_t,
+        pub name: [::c_char; ::PATH_MAX as usize],
+        pub text: *mut ::c_void,
+        pub data: *mut ::c_void,
+        pub text_size: i32,
+        pub data_size: i32,
+        pub api_version: i32,
+        pub abi: i32
+    }
+
+    pub struct __c_anonymous_eax_0 {
+        pub max_eax: u32,
+        pub vendor_id: [::c_char; 12],
+    }
+
+    pub struct __c_anonymous_eax_1 {
+        pub stepping: u32,
+        pub model: u32,
+        pub family: u32,
+        pub tpe: u32,
+        __reserved_0: u32,
+        pub extended_model: u32,
+        pub extended_family: u32,
+        __reserved_1: u32,
+        pub brand_index: u32,
+        pub clflush: u32,
+        pub logical_cpus: u32,
+        pub apic_id: u32,
+        pub features: u32,
+        pub extended_features: u32,
+    }
+
+    pub struct __c_anonymous_eax_2 {
+        pub call_num: u8,
+        pub cache_descriptors: [u8; 15],
+    }
+
+    pub struct __c_anonymous_eax_3 {
+        __reserved: [u32; 2],
+        pub serial_number_high: u32,
+        pub serial_number_low: u32,
+    }
+
+    pub struct __c_anonymous_regs {
+        pub eax: u32,
+        pub ebx: u32,
+        pub edx: u32,
+        pub ecx: u32,
+    }
+}
+
+s_no_extra_traits! {
+    #[cfg(libc_union)]
+    pub union cpuid_info {
+        pub eax_0: __c_anonymous_eax_0,
+        pub eax_1: __c_anonymous_eax_1,
+        pub eax_2: __c_anonymous_eax_2,
+        pub eax_3: __c_anonymous_eax_3,
+        pub as_chars: [::c_char; 16],
+        pub regs: __c_anonymous_regs,
+    }
+}
+
+cfg_if! {
+    if #[cfg(feature = "extra_traits")] {
+        #[cfg(libc_union)]
+        impl PartialEq for cpuid_info {
+            fn eq(&self, other: &cpuid_info) -> bool {
+                unsafe {
+                self.eax_0 == other.eax_0
+                    || self.eax_1 == other.eax_1
+                    || self.eax_2 == other.eax_2
+                    || self.eax_3 == other.eax_3
+                    || self.as_chars == other.as_chars
+                    || self.regs == other.regs
+                }
+            }
+        }
+        #[cfg(libc_union)]
+        impl Eq for cpuid_info {}
+        #[cfg(libc_union)]
+        impl ::fmt::Debug for cpuid_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                unsafe {
+                f.debug_struct("cpuid_info")
+                    .field("eax_0", &self.eax_0)
+                    .field("eax_1", &self.eax_1)
+                    .field("eax_2", &self.eax_2)
+                    .field("eax_3", &self.eax_3)
+                    .field("as_chars", &self.as_chars)
+                    .field("regs", &self.regs)
+                    .finish()
+                }
+            }
+        }
+    }
+}
+
+// kernel/OS.h
+pub const B_OS_NAME_LENGTH: usize = 32;
+pub const B_PAGE_SIZE: usize = 4096;
+pub const B_INFINITE_TIMEOUT: usize = 9223372036854775807;
+
+pub const B_RELATIVE_TIMEOUT: u32 = 0x8;
+pub const B_ABSOLUTE_TIMEOUT: u32 = 0x10;
+pub const B_TIMEOUT_REAL_TIME_BASE: u32 = 0x40;
+pub const B_ABSOLUTE_REAL_TIME_TIMEOUT: u32 = B_ABSOLUTE_TIMEOUT | B_TIMEOUT_REAL_TIME_BASE;
+
+pub const B_NO_LOCK: u32 = 0;
+pub const B_LAZY_LOCK: u32 = 1;
+pub const B_FULL_LOCK: u32 = 2;
+pub const B_CONTIGUOUS: u32 = 3;
+pub const B_LOMEM: u32 = 4;
+pub const B_32_BIT_FULL_LOCK: u32 = 5;
+pub const B_32_BIT_CONTIGUOUS: u32 = 6;
+
+pub const B_ANY_ADDRESS: u32 = 0;
+pub const B_EXACT_ADDRESS: u32 = 1;
+pub const B_BASE_ADDRESS: u32 = 2;
+pub const B_CLONE_ADDRESS: u32 = 3;
+pub const B_ANY_KERNEL_ADDRESS: u32 = 4;
+pub const B_RANDOMIZED_ANY_ADDRESS: u32 = 6;
+pub const B_RANDOMIZED_BASE_ADDRESS: u32 = 7;
+
+pub const B_READ_AREA: u32 = 1 << 0;
+pub const B_WRITE_AREA: u32 = 1 << 1;
+pub const B_EXECUTE_AREA: u32 = 1 << 2;
+pub const B_STACK_AREA: u32 = 1 << 3;
+pub const B_CLONEABLE_AREA: u32 = 1 << 8;
+
+pub const B_CAN_INTERRUPT: u32 = 0x01;
+pub const B_CHECK_PERMISSION: u32 = 0x04;
+pub const B_KILL_CAN_INTERRUPT: u32 = 0x20;
+pub const B_DO_NOT_RESCHEDULE: u32 = 0x02;
+pub const B_RELEASE_ALL: u32 = 0x08;
+pub const B_RELEASE_IF_WAITING_ONLY: u32 = 0x10;
+
+pub const B_CURRENT_TEAM: team_id = 0;
+pub const B_SYSTEM_TEAM: team_id = 1;
+
+pub const B_TEAM_USAGE_SELF: i32 = 0;
+pub const B_TEAM_USAGE_CHILDREN: i32 = -1;
+
+pub const B_IDLE_PRIORITY: i32 = 0;
+pub const B_LOWEST_ACTIVE_PRIORITY: i32 = 1;
+pub const B_LOW_PRIORITY: i32 = 5;
+pub const B_NORMAL_PRIORITY: i32 = 10;
+pub const B_DISPLAY_PRIORITY: i32 = 15;
+pub const B_URGENT_DISPLAY_PRIORITY: i32 = 20;
+pub const B_REAL_TIME_DISPLAY_PRIORITY: i32 = 100;
+pub const B_URGENT_PRIORITY: i32 = 110;
+pub const B_REAL_TIME_PRIORITY: i32 = 120;
+
+pub const B_SYSTEM_TIMEBASE: i32 = 0;
+pub const B_FIRST_REAL_TIME_PRIORITY: i32 = B_REAL_TIME_DISPLAY_PRIORITY;
+
+pub const B_ONE_SHOT_ABSOLUTE_ALARM: u32 = 1;
+pub const B_ONE_SHOT_RELATIVE_ALARM: u32 = 2;
+pub const B_PERIODIC_ALARM: u32 = 3;
+
+pub const B_OBJECT_TYPE_FD: u16 = 0;
+pub const B_OBJECT_TYPE_SEMAPHORE: u16 = 1;
+pub const B_OBJECT_TYPE_PORT: u16 = 2;
+pub const B_OBJECT_TYPE_THREAD: u16 = 3;
+
+pub const B_EVENT_READ: u16 = 0x0001;
+pub const B_EVENT_WRITE: u16 = 0x0002;
+pub const B_EVENT_ERROR: u16 = 0x0004;
+pub const B_EVENT_PRIORITY_READ: u16 = 0x0008;
+pub const B_EVENT_PRIORITY_WRITE: u16 = 0x0010;
+pub const B_EVENT_HIGH_PRIORITY_READ: u16 = 0x0020;
+pub const B_EVENT_HIGH_PRIORITY_WRITE: u16 = 0x0040;
+pub const B_EVENT_DISCONNECTED: u16 = 0x0080;
+pub const B_EVENT_ACQUIRE_SEMAPHORE: u16 = 0x0001;
+pub const B_EVENT_INVALID: u16 = 0x1000;
+
+// kernel/fs_info.h
+pub const B_FS_IS_READONLY: u32 = 0x00000001;
+pub const B_FS_IS_REMOVABLE: u32 = 0x00000002;
+pub const B_FS_IS_PERSISTENT: u32 = 0x00000004;
+pub const B_FS_IS_SHARED: u32 = 0x00000008;
+pub const B_FS_HAS_MIME: u32 = 0x00010000;
+pub const B_FS_HAS_ATTR: u32 = 0x00020000;
+pub const B_FS_HAS_QUERY: u32 = 0x00040000;
+pub const B_FS_HAS_SELF_HEALING_LINKS: u32 = 0x00080000;
+pub const B_FS_HAS_ALIASES: u32 = 0x00100000;
+pub const B_FS_SUPPORTS_NODE_MONITORING: u32 = 0x00200000;
+pub const B_FS_SUPPORTS_MONITOR_CHILDREN: u32 = 0x00400000;
+
+// kernel/fs_query.h
+pub const B_LIVE_QUERY: u32 = 0x00000001;
+pub const B_QUERY_NON_INDEXED: u32 = 0x00000002;
+
+// kernel/fs_volume.h
+pub const B_MOUNT_READ_ONLY: u32 = 1;
+pub const B_MOUNT_VIRTUAL_DEVICE: u32 = 2;
+pub const B_FORCE_UNMOUNT: u32 = 1;
+
+// kernel/image.h
+pub const B_FLUSH_DCACHE: u32 = 0x0001;
+pub const B_FLUSH_ICACHE: u32 = 0x0004;
+pub const B_INVALIDATE_DCACHE: u32 = 0x0002;
+pub const B_INVALIDATE_ICACHE: u32 = 0x0008;
+
+pub const B_SYMBOL_TYPE_DATA: i32 = 0x1;
+pub const B_SYMBOL_TYPE_TEXT: i32 = 0x2;
+pub const B_SYMBOL_TYPE_ANY: i32 = 0x5;
+
+// storage/StorageDefs.h
+pub const B_DEV_NAME_LENGTH: usize = 128;
+pub const B_FILE_NAME_LENGTH: usize = ::FILENAME_MAX as usize;
+pub const B_PATH_NAME_LENGTH: usize = ::PATH_MAX as usize;
+pub const B_ATTR_NAME_LENGTH: usize = B_FILE_NAME_LENGTH - 1;
+pub const B_MIME_TYPE_LENGTH: usize = B_ATTR_NAME_LENGTH - 15;
+pub const B_MAX_SYMLINKS: usize = 16;
+
+// Haiku open modes in BFile are passed as u32
+pub const B_READ_ONLY: u32 = ::O_RDONLY as u32;
+pub const B_WRITE_ONLY: u32 = ::O_WRONLY as u32;
+pub const B_READ_WRITE: u32 = ::O_RDWR as u32;
+
+pub const B_FAIL_IF_EXISTS: u32 = ::O_EXCL as u32;
+pub const B_CREATE_FILE: u32 = ::O_CREAT as u32;
+pub const B_ERASE_FILE: u32 = ::O_TRUNC as u32;
+pub const B_OPEN_AT_END: u32 = ::O_APPEND as u32;
+
+pub const B_FILE_NODE: u32 = 0x01;
+pub const B_SYMLINK_NODE: u32 = 0x02;
+pub const B_DIRECTORY_NODE: u32 = 0x04;
+pub const B_ANY_NODE: u32 = 0x07;
+
+// support/Errors.h
+pub const B_GENERAL_ERROR_BASE: status_t = core::i32::MIN;
+pub const B_OS_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x1000;
+pub const B_APP_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x2000;
+pub const B_INTERFACE_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x3000;
+pub const B_MEDIA_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x4000;
+pub const B_TRANSLATION_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x4800;
+pub const B_MIDI_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x5000;
+pub const B_STORAGE_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x6000;
+pub const B_POSIX_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x7000;
+pub const B_MAIL_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x8000;
+pub const B_PRINT_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0x9000;
+pub const B_DEVICE_ERROR_BASE: status_t = B_GENERAL_ERROR_BASE + 0xa000;
+pub const B_ERRORS_END: status_t = B_GENERAL_ERROR_BASE + 0xffff;
+
+// General errors
+pub const B_NO_MEMORY: status_t = B_GENERAL_ERROR_BASE + 0;
+pub const B_IO_ERROR: status_t = B_GENERAL_ERROR_BASE + 1;
+pub const B_PERMISSION_DENIED: status_t = B_GENERAL_ERROR_BASE + 2;
+pub const B_BAD_INDEX: status_t = B_GENERAL_ERROR_BASE + 3;
+pub const B_BAD_TYPE: status_t = B_GENERAL_ERROR_BASE + 4;
+pub const B_BAD_VALUE: status_t = B_GENERAL_ERROR_BASE + 5;
+pub const B_MISMATCHED_VALUES: status_t = B_GENERAL_ERROR_BASE + 6;
+pub const B_NAME_NOT_FOUND: status_t = B_GENERAL_ERROR_BASE + 7;
+pub const B_NAME_IN_USE: status_t = B_GENERAL_ERROR_BASE + 8;
+pub const B_TIMED_OUT: status_t = B_GENERAL_ERROR_BASE + 9;
+pub const B_INTERRUPTED: status_t = B_GENERAL_ERROR_BASE + 10;
+pub const B_WOULD_BLOCK: status_t = B_GENERAL_ERROR_BASE + 11;
+pub const B_CANCELED: status_t = B_GENERAL_ERROR_BASE + 12;
+pub const B_NO_INIT: status_t = B_GENERAL_ERROR_BASE + 13;
+pub const B_NOT_INITIALIZED: status_t = B_GENERAL_ERROR_BASE + 13;
+pub const B_BUSY: status_t = B_GENERAL_ERROR_BASE + 14;
+pub const B_NOT_ALLOWED: status_t = B_GENERAL_ERROR_BASE + 15;
+pub const B_BAD_DATA: status_t = B_GENERAL_ERROR_BASE + 16;
+pub const B_DONT_DO_THAT: status_t = B_GENERAL_ERROR_BASE + 17;
+
+pub const B_ERROR: status_t = -1;
+pub const B_OK: status_t = 0;
+pub const B_NO_ERROR: status_t = 0;
+
+// Kernel kit errors
+pub const B_BAD_SEM_ID: status_t = B_OS_ERROR_BASE + 0;
+pub const B_NO_MORE_SEMS: status_t = B_OS_ERROR_BASE + 1;
+
+pub const B_BAD_THREAD_ID: status_t = B_OS_ERROR_BASE + 0x100;
+pub const B_NO_MORE_THREADS: status_t = B_OS_ERROR_BASE + 0x101;
+pub const B_BAD_THREAD_STATE: status_t = B_OS_ERROR_BASE + 0x102;
+pub const B_BAD_TEAM_ID: status_t = B_OS_ERROR_BASE + 0x103;
+pub const B_NO_MORE_TEAMS: status_t = B_OS_ERROR_BASE + 0x104;
+
+pub const B_BAD_PORT_ID: status_t = B_OS_ERROR_BASE + 0x200;
+pub const B_NO_MORE_PORTS: status_t = B_OS_ERROR_BASE + 0x201;
+
+pub const B_BAD_IMAGE_ID: status_t = B_OS_ERROR_BASE + 0x300;
+pub const B_BAD_ADDRESS: status_t = B_OS_ERROR_BASE + 0x301;
+pub const B_NOT_AN_EXECUTABLE: status_t = B_OS_ERROR_BASE + 0x302;
+pub const B_MISSING_LIBRARY: status_t = B_OS_ERROR_BASE + 0x303;
+pub const B_MISSING_SYMBOL: status_t = B_OS_ERROR_BASE + 0x304;
+pub const B_UNKNOWN_EXECUTABLE: status_t = B_OS_ERROR_BASE + 0x305;
+pub const B_LEGACY_EXECUTABLE: status_t = B_OS_ERROR_BASE + 0x306;
+
+pub const B_DEBUGGER_ALREADY_INSTALLED: status_t = B_OS_ERROR_BASE + 0x400;
+
+// Application kit errors
+pub const B_BAD_REPLY: status_t = B_APP_ERROR_BASE + 0;
+pub const B_DUPLICATE_REPLY: status_t = B_APP_ERROR_BASE + 1;
+pub const B_MESSAGE_TO_SELF: status_t = B_APP_ERROR_BASE + 2;
+pub const B_BAD_HANDLER: status_t = B_APP_ERROR_BASE + 3;
+pub const B_ALREADY_RUNNING: status_t = B_APP_ERROR_BASE + 4;
+pub const B_LAUNCH_FAILED: status_t = B_APP_ERROR_BASE + 5;
+pub const B_AMBIGUOUS_APP_LAUNCH: status_t = B_APP_ERROR_BASE + 6;
+pub const B_UNKNOWN_MIME_TYPE: status_t = B_APP_ERROR_BASE + 7;
+pub const B_BAD_SCRIPT_SYNTAX: status_t = B_APP_ERROR_BASE + 8;
+pub const B_LAUNCH_FAILED_NO_RESOLVE_LINK: status_t = B_APP_ERROR_BASE + 9;
+pub const B_LAUNCH_FAILED_EXECUTABLE: status_t = B_APP_ERROR_BASE + 10;
+pub const B_LAUNCH_FAILED_APP_NOT_FOUND: status_t = B_APP_ERROR_BASE + 11;
+pub const B_LAUNCH_FAILED_APP_IN_TRASH: status_t = B_APP_ERROR_BASE + 12;
+pub const B_LAUNCH_FAILED_NO_PREFERRED_APP: status_t = B_APP_ERROR_BASE + 13;
+pub const B_LAUNCH_FAILED_FILES_APP_NOT_FOUND: status_t = B_APP_ERROR_BASE + 14;
+pub const B_BAD_MIME_SNIFFER_RULE: status_t = B_APP_ERROR_BASE + 15;
+pub const B_NOT_A_MESSAGE: status_t = B_APP_ERROR_BASE + 16;
+pub const B_SHUTDOWN_CANCELLED: status_t = B_APP_ERROR_BASE + 17;
+pub const B_SHUTTING_DOWN: status_t = B_APP_ERROR_BASE + 18;
+
+// Storage kit errors
+pub const B_FILE_ERROR: status_t = B_STORAGE_ERROR_BASE + 0;
+pub const B_FILE_NOT_FOUND: status_t = B_STORAGE_ERROR_BASE + 1;
+pub const B_FILE_EXISTS: status_t = B_STORAGE_ERROR_BASE + 2;
+pub const B_ENTRY_NOT_FOUND: status_t = B_STORAGE_ERROR_BASE + 3;
+pub const B_NAME_TOO_LONG: status_t = B_STORAGE_ERROR_BASE + 4;
+pub const B_NOT_A_DIRECTORY: status_t = B_STORAGE_ERROR_BASE + 5;
+pub const B_DIRECTORY_NOT_EMPTY: status_t = B_STORAGE_ERROR_BASE + 6;
+pub const B_DEVICE_FULL: status_t = B_STORAGE_ERROR_BASE + 7;
+pub const B_READ_ONLY_DEVICE: status_t = B_STORAGE_ERROR_BASE + 8;
+pub const B_IS_A_DIRECTORY: status_t = B_STORAGE_ERROR_BASE + 9;
+pub const B_NO_MORE_FDS: status_t = B_STORAGE_ERROR_BASE + 10;
+pub const B_CROSS_DEVICE_LINK: status_t = B_STORAGE_ERROR_BASE + 11;
+pub const B_LINK_LIMIT: status_t = B_STORAGE_ERROR_BASE + 12;
+pub const B_BUSTED_PIPE: status_t = B_STORAGE_ERROR_BASE + 13;
+pub const B_UNSUPPORTED: status_t = B_STORAGE_ERROR_BASE + 14;
+pub const B_PARTITION_TOO_SMALL: status_t = B_STORAGE_ERROR_BASE + 15;
+pub const B_PARTIAL_READ: status_t = B_STORAGE_ERROR_BASE + 16;
+pub const B_PARTIAL_WRITE: status_t = B_STORAGE_ERROR_BASE + 17;
+
+// Mapped posix errors
+pub const B_BUFFER_OVERFLOW: status_t = ::EOVERFLOW;
+pub const B_TOO_MANY_ARGS: status_t = ::E2BIG;
+pub const B_FILE_TOO_LARGE: status_t = ::EFBIG;
+pub const B_RESULT_NOT_REPRESENTABLE: status_t = ::ERANGE;
+pub const B_DEVICE_NOT_FOUND: status_t = ::ENODEV;
+pub const B_NOT_SUPPORTED: status_t = ::EOPNOTSUPP;
+
+// Media kit errors
+pub const B_STREAM_NOT_FOUND: status_t = B_MEDIA_ERROR_BASE + 0;
+pub const B_SERVER_NOT_FOUND: status_t = B_MEDIA_ERROR_BASE + 1;
+pub const B_RESOURCE_NOT_FOUND: status_t = B_MEDIA_ERROR_BASE + 2;
+pub const B_RESOURCE_UNAVAILABLE: status_t = B_MEDIA_ERROR_BASE + 3;
+pub const B_BAD_SUBSCRIBER: status_t = B_MEDIA_ERROR_BASE + 4;
+pub const B_SUBSCRIBER_NOT_ENTERED: status_t = B_MEDIA_ERROR_BASE + 5;
+pub const B_BUFFER_NOT_AVAILABLE: status_t = B_MEDIA_ERROR_BASE + 6;
+pub const B_LAST_BUFFER_ERROR: status_t = B_MEDIA_ERROR_BASE + 7;
+
+pub const B_MEDIA_SYSTEM_FAILURE: status_t = B_MEDIA_ERROR_BASE + 100;
+pub const B_MEDIA_BAD_NODE: status_t = B_MEDIA_ERROR_BASE + 101;
+pub const B_MEDIA_NODE_BUSY: status_t = B_MEDIA_ERROR_BASE + 102;
+pub const B_MEDIA_BAD_FORMAT: status_t = B_MEDIA_ERROR_BASE + 103;
+pub const B_MEDIA_BAD_BUFFER: status_t = B_MEDIA_ERROR_BASE + 104;
+pub const B_MEDIA_TOO_MANY_NODES: status_t = B_MEDIA_ERROR_BASE + 105;
+pub const B_MEDIA_TOO_MANY_BUFFERS: status_t = B_MEDIA_ERROR_BASE + 106;
+pub const B_MEDIA_NODE_ALREADY_EXISTS: status_t = B_MEDIA_ERROR_BASE + 107;
+pub const B_MEDIA_BUFFER_ALREADY_EXISTS: status_t = B_MEDIA_ERROR_BASE + 108;
+pub const B_MEDIA_CANNOT_SEEK: status_t = B_MEDIA_ERROR_BASE + 109;
+pub const B_MEDIA_CANNOT_CHANGE_RUN_MODE: status_t = B_MEDIA_ERROR_BASE + 110;
+pub const B_MEDIA_APP_ALREADY_REGISTERED: status_t = B_MEDIA_ERROR_BASE + 111;
+pub const B_MEDIA_APP_NOT_REGISTERED: status_t = B_MEDIA_ERROR_BASE + 112;
+pub const B_MEDIA_CANNOT_RECLAIM_BUFFERS: status_t = B_MEDIA_ERROR_BASE + 113;
+pub const B_MEDIA_BUFFERS_NOT_RECLAIMED: status_t = B_MEDIA_ERROR_BASE + 114;
+pub const B_MEDIA_TIME_SOURCE_STOPPED: status_t = B_MEDIA_ERROR_BASE + 115;
+pub const B_MEDIA_TIME_SOURCE_BUSY: status_t = B_MEDIA_ERROR_BASE + 116;
+pub const B_MEDIA_BAD_SOURCE: status_t = B_MEDIA_ERROR_BASE + 117;
+pub const B_MEDIA_BAD_DESTINATION: status_t = B_MEDIA_ERROR_BASE + 118;
+pub const B_MEDIA_ALREADY_CONNECTED: status_t = B_MEDIA_ERROR_BASE + 119;
+pub const B_MEDIA_NOT_CONNECTED: status_t = B_MEDIA_ERROR_BASE + 120;
+pub const B_MEDIA_BAD_CLIP_FORMAT: status_t = B_MEDIA_ERROR_BASE + 121;
+pub const B_MEDIA_ADDON_FAILED: status_t = B_MEDIA_ERROR_BASE + 122;
+pub const B_MEDIA_ADDON_DISABLED: status_t = B_MEDIA_ERROR_BASE + 123;
+pub const B_MEDIA_CHANGE_IN_PROGRESS: status_t = B_MEDIA_ERROR_BASE + 124;
+pub const B_MEDIA_STALE_CHANGE_COUNT: status_t = B_MEDIA_ERROR_BASE + 125;
+pub const B_MEDIA_ADDON_RESTRICTED: status_t = B_MEDIA_ERROR_BASE + 126;
+pub const B_MEDIA_NO_HANDLER: status_t = B_MEDIA_ERROR_BASE + 127;
+pub const B_MEDIA_DUPLICATE_FORMAT: status_t = B_MEDIA_ERROR_BASE + 128;
+pub const B_MEDIA_REALTIME_DISABLED: status_t = B_MEDIA_ERROR_BASE + 129;
+pub const B_MEDIA_REALTIME_UNAVAILABLE: status_t = B_MEDIA_ERROR_BASE + 130;
+
+// Mail kit errors
+pub const B_MAIL_NO_DAEMON: status_t = B_MAIL_ERROR_BASE + 0;
+pub const B_MAIL_UNKNOWN_USER: status_t = B_MAIL_ERROR_BASE + 1;
+pub const B_MAIL_WRONG_PASSWORD: status_t = B_MAIL_ERROR_BASE + 2;
+pub const B_MAIL_UNKNOWN_HOST: status_t = B_MAIL_ERROR_BASE + 3;
+pub const B_MAIL_ACCESS_ERROR: status_t = B_MAIL_ERROR_BASE + 4;
+pub const B_MAIL_UNKNOWN_FIELD: status_t = B_MAIL_ERROR_BASE + 5;
+pub const B_MAIL_NO_RECIPIENT: status_t = B_MAIL_ERROR_BASE + 6;
+pub const B_MAIL_INVALID_MAIL: status_t = B_MAIL_ERROR_BASE + 7;
+
+// Print kit errors
+pub const B_NO_PRINT_SERVER: status_t = B_PRINT_ERROR_BASE + 0;
+
+// Device kit errors
+pub const B_DEV_INVALID_IOCTL: status_t = B_DEVICE_ERROR_BASE + 0;
+pub const B_DEV_NO_MEMORY: status_t = B_DEVICE_ERROR_BASE + 1;
+pub const B_DEV_BAD_DRIVE_NUM: status_t = B_DEVICE_ERROR_BASE + 2;
+pub const B_DEV_NO_MEDIA: status_t = B_DEVICE_ERROR_BASE + 3;
+pub const B_DEV_UNREADABLE: status_t = B_DEVICE_ERROR_BASE + 4;
+pub const B_DEV_FORMAT_ERROR: status_t = B_DEVICE_ERROR_BASE + 5;
+pub const B_DEV_TIMEOUT: status_t = B_DEVICE_ERROR_BASE + 6;
+pub const B_DEV_RECALIBRATE_ERROR: status_t = B_DEVICE_ERROR_BASE + 7;
+pub const B_DEV_SEEK_ERROR: status_t = B_DEVICE_ERROR_BASE + 8;
+pub const B_DEV_ID_ERROR: status_t = B_DEVICE_ERROR_BASE + 9;
+pub const B_DEV_READ_ERROR: status_t = B_DEVICE_ERROR_BASE + 10;
+pub const B_DEV_WRITE_ERROR: status_t = B_DEVICE_ERROR_BASE + 11;
+pub const B_DEV_NOT_READY: status_t = B_DEVICE_ERROR_BASE + 12;
+pub const B_DEV_MEDIA_CHANGED: status_t = B_DEVICE_ERROR_BASE + 13;
+pub const B_DEV_MEDIA_CHANGE_REQUESTED: status_t = B_DEVICE_ERROR_BASE + 14;
+pub const B_DEV_RESOURCE_CONFLICT: status_t = B_DEVICE_ERROR_BASE + 15;
+pub const B_DEV_CONFIGURATION_ERROR: status_t = B_DEVICE_ERROR_BASE + 16;
+pub const B_DEV_DISABLED_BY_USER: status_t = B_DEVICE_ERROR_BASE + 17;
+pub const B_DEV_DOOR_OPEN: status_t = B_DEVICE_ERROR_BASE + 18;
+
+pub const B_DEV_INVALID_PIPE: status_t = B_DEVICE_ERROR_BASE + 19;
+pub const B_DEV_CRC_ERROR: status_t = B_DEVICE_ERROR_BASE + 20;
+pub const B_DEV_STALLED: status_t = B_DEVICE_ERROR_BASE + 21;
+pub const B_DEV_BAD_PID: status_t = B_DEVICE_ERROR_BASE + 22;
+pub const B_DEV_UNEXPECTED_PID: status_t = B_DEVICE_ERROR_BASE + 23;
+pub const B_DEV_DATA_OVERRUN: status_t = B_DEVICE_ERROR_BASE + 24;
+pub const B_DEV_DATA_UNDERRUN: status_t = B_DEVICE_ERROR_BASE + 25;
+pub const B_DEV_FIFO_OVERRUN: status_t = B_DEVICE_ERROR_BASE + 26;
+pub const B_DEV_FIFO_UNDERRUN: status_t = B_DEVICE_ERROR_BASE + 27;
+pub const B_DEV_PENDING: status_t = B_DEVICE_ERROR_BASE + 28;
+pub const B_DEV_MULTIPLE_ERRORS: status_t = B_DEVICE_ERROR_BASE + 29;
+pub const B_DEV_TOO_LATE: status_t = B_DEVICE_ERROR_BASE + 30;
+
+// translation kit errors
+pub const B_TRANSLATION_BASE_ERROR: status_t = B_TRANSLATION_ERROR_BASE + 0;
+pub const B_NO_TRANSLATOR: status_t = B_TRANSLATION_ERROR_BASE + 1;
+pub const B_ILLEGAL_DATA: status_t = B_TRANSLATION_ERROR_BASE + 2;
+
+// support/TypeConstants.h
+pub const B_AFFINE_TRANSFORM_TYPE: u32 = haiku_constant!('A', 'M', 'T', 'X');
+pub const B_ALIGNMENT_TYPE: u32 = haiku_constant!('A', 'L', 'G', 'N');
+pub const B_ANY_TYPE: u32 = haiku_constant!('A', 'N', 'Y', 'T');
+pub const B_ATOM_TYPE: u32 = haiku_constant!('A', 'T', 'O', 'M');
+pub const B_ATOMREF_TYPE: u32 = haiku_constant!('A', 'T', 'M', 'R');
+pub const B_BOOL_TYPE: u32 = haiku_constant!('B', 'O', 'O', 'L');
+pub const B_CHAR_TYPE: u32 = haiku_constant!('C', 'H', 'A', 'R');
+pub const B_COLOR_8_BIT_TYPE: u32 = haiku_constant!('C', 'L', 'R', 'B');
+pub const B_DOUBLE_TYPE: u32 = haiku_constant!('D', 'B', 'L', 'E');
+pub const B_FLOAT_TYPE: u32 = haiku_constant!('F', 'L', 'O', 'T');
+pub const B_GRAYSCALE_8_BIT_TYPE: u32 = haiku_constant!('G', 'R', 'Y', 'B');
+pub const B_INT16_TYPE: u32 = haiku_constant!('S', 'H', 'R', 'T');
+pub const B_INT32_TYPE: u32 = haiku_constant!('L', 'O', 'N', 'G');
+pub const B_INT64_TYPE: u32 = haiku_constant!('L', 'L', 'N', 'G');
+pub const B_INT8_TYPE: u32 = haiku_constant!('B', 'Y', 'T', 'E');
+pub const B_LARGE_ICON_TYPE: u32 = haiku_constant!('I', 'C', 'O', 'N');
+pub const B_MEDIA_PARAMETER_GROUP_TYPE: u32 = haiku_constant!('B', 'M', 'C', 'G');
+pub const B_MEDIA_PARAMETER_TYPE: u32 = haiku_constant!('B', 'M', 'C', 'T');
+pub const B_MEDIA_PARAMETER_WEB_TYPE: u32 = haiku_constant!('B', 'M', 'C', 'W');
+pub const B_MESSAGE_TYPE: u32 = haiku_constant!('M', 'S', 'G', 'G');
+pub const B_MESSENGER_TYPE: u32 = haiku_constant!('M', 'S', 'N', 'G');
+pub const B_MIME_TYPE: u32 = haiku_constant!('M', 'I', 'M', 'E');
+pub const B_MINI_ICON_TYPE: u32 = haiku_constant!('M', 'I', 'C', 'N');
+pub const B_MONOCHROME_1_BIT_TYPE: u32 = haiku_constant!('M', 'N', 'O', 'B');
+pub const B_OBJECT_TYPE: u32 = haiku_constant!('O', 'P', 'T', 'R');
+pub const B_OFF_T_TYPE: u32 = haiku_constant!('O', 'F', 'F', 'T');
+pub const B_PATTERN_TYPE: u32 = haiku_constant!('P', 'A', 'T', 'N');
+pub const B_POINTER_TYPE: u32 = haiku_constant!('P', 'N', 'T', 'R');
+pub const B_POINT_TYPE: u32 = haiku_constant!('B', 'P', 'N', 'T');
+pub const B_PROPERTY_INFO_TYPE: u32 = haiku_constant!('S', 'C', 'T', 'D');
+pub const B_RAW_TYPE: u32 = haiku_constant!('R', 'A', 'W', 'T');
+pub const B_RECT_TYPE: u32 = haiku_constant!('R', 'E', 'C', 'T');
+pub const B_REF_TYPE: u32 = haiku_constant!('R', 'R', 'E', 'F');
+pub const B_RGB_32_BIT_TYPE: u32 = haiku_constant!('R', 'G', 'B', 'B');
+pub const B_RGB_COLOR_TYPE: u32 = haiku_constant!('R', 'G', 'B', 'C');
+pub const B_SIZE_TYPE: u32 = haiku_constant!('S', 'I', 'Z', 'E');
+pub const B_SIZE_T_TYPE: u32 = haiku_constant!('S', 'I', 'Z', 'T');
+pub const B_SSIZE_T_TYPE: u32 = haiku_constant!('S', 'S', 'Z', 'T');
+pub const B_STRING_TYPE: u32 = haiku_constant!('C', 'S', 'T', 'R');
+pub const B_STRING_LIST_TYPE: u32 = haiku_constant!('S', 'T', 'R', 'L');
+pub const B_TIME_TYPE: u32 = haiku_constant!('T', 'I', 'M', 'E');
+pub const B_UINT16_TYPE: u32 = haiku_constant!('U', 'S', 'H', 'T');
+pub const B_UINT32_TYPE: u32 = haiku_constant!('U', 'L', 'N', 'G');
+pub const B_UINT64_TYPE: u32 = haiku_constant!('U', 'L', 'L', 'G');
+pub const B_UINT8_TYPE: u32 = haiku_constant!('U', 'B', 'Y', 'T');
+pub const B_VECTOR_ICON_TYPE: u32 = haiku_constant!('V', 'I', 'C', 'N');
+pub const B_XATTR_TYPE: u32 = haiku_constant!('X', 'A', 'T', 'R');
+pub const B_NETWORK_ADDRESS_TYPE: u32 = haiku_constant!('N', 'W', 'A', 'D');
+pub const B_MIME_STRING_TYPE: u32 = haiku_constant!('M', 'I', 'M', 'S');
+pub const B_ASCII_TYPE: u32 = haiku_constant!('T', 'E', 'X', 'T');
+
+extern "C" {
+    // kernel/OS.h
+    pub fn create_area(
+        name: *const ::c_char,
+        startAddress: *mut *mut ::c_void,
+        addressSpec: u32,
+        size: usize,
+        lock: u32,
+        protection: u32,
+    ) -> area_id;
+    pub fn clone_area(
+        name: *const ::c_char,
+        destAddress: *mut *mut ::c_void,
+        addressSpec: u32,
+        protection: u32,
+        source: area_id,
+    ) -> area_id;
+    pub fn find_area(name: *const ::c_char) -> area_id;
+    pub fn area_for(address: *mut ::c_void) -> area_id;
+    pub fn delete_area(id: area_id) -> status_t;
+    pub fn resize_area(id: area_id, newSize: usize) -> status_t;
+    pub fn set_area_protection(id: area_id, newProtection: u32) -> status_t;
+    pub fn _get_area_info(id: area_id, areaInfo: *mut area_info, size: usize) -> status_t;
+    pub fn _get_next_area_info(
+        team: team_id,
+        cookie: *mut isize,
+        areaInfo: *mut area_info,
+        size: usize,
+    ) -> status_t;
+
+    pub fn create_port(capacity: i32, name: *const ::c_char) -> port_id;
+    pub fn find_port(name: *const ::c_char) -> port_id;
+    pub fn read_port(
+        port: port_id,
+        code: *mut i32,
+        buffer: *mut ::c_void,
+        bufferSize: ::size_t,
+    ) -> ::ssize_t;
+    pub fn read_port_etc(
+        port: port_id,
+        code: *mut i32,
+        buffer: *mut ::c_void,
+        bufferSize: ::size_t,
+        flags: u32,
+        timeout: bigtime_t,
+    ) -> ::ssize_t;
+    pub fn write_port(
+        port: port_id,
+        code: i32,
+        buffer: *const ::c_void,
+        bufferSize: ::size_t,
+    ) -> status_t;
+    pub fn write_port_etc(
+        port: port_id,
+        code: i32,
+        buffer: *const ::c_void,
+        bufferSize: ::size_t,
+        flags: u32,
+        timeout: bigtime_t,
+    ) -> status_t;
+    pub fn close_port(port: port_id) -> status_t;
+    pub fn delete_port(port: port_id) -> status_t;
+    pub fn port_buffer_size(port: port_id) -> ::ssize_t;
+    pub fn port_buffer_size_etc(port: port_id, flags: u32, timeout: bigtime_t) -> ::ssize_t;
+    pub fn port_count(port: port_id) -> ::ssize_t;
+    pub fn set_port_owner(port: port_id, team: team_id) -> status_t;
+
+    pub fn _get_port_info(port: port_id, buf: *mut port_info, portInfoSize: ::size_t) -> status_t;
+    pub fn _get_next_port_info(
+        port: port_id,
+        cookie: *mut i32,
+        portInfo: *mut port_info,
+        portInfoSize: ::size_t,
+    ) -> status_t;
+    pub fn _get_port_message_info_etc(
+        port: port_id,
+        info: *mut port_message_info,
+        infoSize: ::size_t,
+        flags: u32,
+        timeout: bigtime_t,
+    ) -> status_t;
+
+    pub fn create_sem(count: i32, name: *const ::c_char) -> sem_id;
+    pub fn delete_sem(id: sem_id) -> status_t;
+    pub fn acquire_sem(id: sem_id) -> status_t;
+    pub fn acquire_sem_etc(id: sem_id, count: i32, flags: u32, timeout: bigtime_t) -> status_t;
+    pub fn release_sem(id: sem_id) -> status_t;
+    pub fn release_sem_etc(id: sem_id, count: i32, flags: u32) -> status_t;
+    pub fn switch_sem(semToBeReleased: sem_id, id: sem_id) -> status_t;
+    pub fn switch_sem_etc(
+        semToBeReleased: sem_id,
+        id: sem_id,
+        count: i32,
+        flags: u32,
+        timeout: bigtime_t,
+    ) -> status_t;
+    pub fn get_sem_count(id: sem_id, threadCount: *mut i32) -> status_t;
+    pub fn set_sem_owner(id: sem_id, team: team_id) -> status_t;
+    pub fn _get_sem_info(id: sem_id, info: *mut sem_info, infoSize: ::size_t) -> status_t;
+    pub fn _get_next_sem_info(
+        team: team_id,
+        cookie: *mut i32,
+        info: *mut sem_info,
+        infoSize: ::size_t,
+    ) -> status_t;
+
+    pub fn kill_team(team: team_id) -> status_t;
+    pub fn _get_team_info(team: team_id, info: *mut team_info, size: ::size_t) -> status_t;
+    pub fn _get_next_team_info(cookie: *mut i32, info: *mut team_info, size: ::size_t) -> status_t;
+
+    pub fn spawn_thread(
+        func: thread_func,
+        name: *const ::c_char,
+        priority: i32,
+        data: *mut ::c_void,
+    ) -> thread_id;
+    pub fn kill_thread(thread: thread_id) -> status_t;
+    pub fn resume_thread(thread: thread_id) -> status_t;
+    pub fn suspend_thread(thread: thread_id) -> status_t;
+
+    pub fn rename_thread(thread: thread_id, newName: *const ::c_char) -> status_t;
+    pub fn set_thread_priority(thread: thread_id, newPriority: i32) -> status_t;
+    pub fn exit_thread(status: status_t);
+    pub fn wait_for_thread(thread: thread_id, returnValue: *mut status_t) -> status_t;
+    pub fn on_exit_thread(callback: extern "C" fn(*mut ::c_void), data: *mut ::c_void) -> status_t;
+
+    pub fn find_thread(name: *const ::c_char) -> thread_id;
+
+    pub fn get_scheduler_mode() -> i32;
+    pub fn set_scheduler_mode(mode: i32) -> status_t;
+
+    pub fn send_data(
+        thread: thread_id,
+        code: i32,
+        buffer: *const ::c_void,
+        bufferSize: ::size_t,
+    ) -> status_t;
+    pub fn receive_data(sender: *mut thread_id, buffer: *mut ::c_void, bufferSize: ::size_t)
+        -> i32;
+    pub fn has_data(thread: thread_id) -> bool;
+
+    pub fn snooze(amount: bigtime_t) -> status_t;
+    pub fn snooze_etc(amount: bigtime_t, timeBase: ::c_int, flags: u32) -> status_t;
+    pub fn snooze_until(time: bigtime_t, timeBase: ::c_int) -> status_t;
+
+    pub fn _get_thread_info(id: thread_id, info: *mut thread_info, size: ::size_t) -> status_t;
+    pub fn _get_next_thread_info(
+        team: team_id,
+        cookie: *mut i32,
+        info: *mut thread_info,
+        size: ::size_t,
+    ) -> status_t;
+
+    pub fn get_pthread_thread_id(thread: ::pthread_t) -> thread_id;
+
+    pub fn _get_team_usage_info(
+        team: team_id,
+        who: i32,
+        info: *mut team_usage_info,
+        size: ::size_t,
+    ) -> status_t;
+
+    pub fn real_time_clock() -> ::c_ulong;
+    pub fn set_real_time_clock(secsSinceJan1st1970: ::c_ulong);
+    pub fn real_time_clock_usecs() -> bigtime_t;
+    pub fn system_time() -> bigtime_t;
+    pub fn system_time_nsecs() -> nanotime_t;
+    // set_timezone() is deprecated and a no-op
+
+    pub fn set_alarm(when: bigtime_t, flags: u32) -> bigtime_t;
+    pub fn debugger(message: *const ::c_char);
+    pub fn disable_debugger(state: ::c_int) -> ::c_int;
+
+    pub fn get_cpuid(info: *mut cpuid_info, eaxRegister: u32, cpuNum: u32) -> status_t;
+
+    pub fn get_system_info(info: *mut system_info) -> status_t;
+    pub fn get_cpu_info(firstCPU: u32, cpuCount: u32, info: *mut cpu_info) -> status_t;
+    pub fn is_computer_on() -> i32;
+    pub fn is_computer_on_fire() -> ::c_double;
+    pub fn send_signal(threadID: thread_id, signal: ::c_uint) -> ::c_int;
+    pub fn set_signal_stack(base: *mut ::c_void, size: ::size_t);
+
+    pub fn wait_for_objects(infos: *mut object_wait_info, numInfos: ::c_int) -> ::ssize_t;
+    pub fn wait_for_objects_etc(
+        infos: *mut object_wait_info,
+        numInfos: ::c_int,
+        flags: u32,
+        timeout: bigtime_t,
+    ) -> ::ssize_t;
+
+    // kernel/fs_attr.h
+    pub fn fs_read_attr(
+        fd: ::c_int,
+        attribute: *const ::c_char,
+        type_: u32,
+        pos: ::off_t,
+        buffer: *mut ::c_void,
+        readBytes: ::size_t,
+    ) -> ::ssize_t;
+    pub fn fs_write_attr(
+        fd: ::c_int,
+        attribute: *const ::c_char,
+        type_: u32,
+        pos: ::off_t,
+        buffer: *const ::c_void,
+        writeBytes: ::size_t,
+    ) -> ::ssize_t;
+    pub fn fs_remove_attr(fd: ::c_int, attribute: *const ::c_char) -> ::c_int;
+    pub fn fs_stat_attr(
+        fd: ::c_int,
+        attribute: *const ::c_char,
+        attrInfo: *mut attr_info,
+    ) -> ::c_int;
+
+    pub fn fs_open_attr(
+        path: *const ::c_char,
+        attribute: *const ::c_char,
+        type_: u32,
+        openMode: ::c_int,
+    ) -> ::c_int;
+    pub fn fs_fopen_attr(
+        fd: ::c_int,
+        attribute: *const ::c_char,
+        type_: u32,
+        openMode: ::c_int,
+    ) -> ::c_int;
+    pub fn fs_close_attr(fd: ::c_int) -> ::c_int;
+
+    pub fn fs_open_attr_dir(path: *const ::c_char) -> *mut ::DIR;
+    pub fn fs_lopen_attr_dir(path: *const ::c_char) -> *mut ::DIR;
+    pub fn fs_fopen_attr_dir(fd: ::c_int) -> *mut ::DIR;
+    pub fn fs_close_attr_dir(dir: *mut ::DIR) -> ::c_int;
+    pub fn fs_read_attr_dir(dir: *mut ::DIR) -> *mut ::dirent;
+    pub fn fs_rewind_attr_dir(dir: *mut ::DIR);
+
+    // kernel/fs_image.h
+    pub fn fs_create_index(
+        device: ::dev_t,
+        name: *const ::c_char,
+        type_: u32,
+        flags: u32,
+    ) -> ::c_int;
+    pub fn fs_remove_index(device: ::dev_t, name: *const ::c_char) -> ::c_int;
+    pub fn fs_stat_index(
+        device: ::dev_t,
+        name: *const ::c_char,
+        indexInfo: *mut index_info,
+    ) -> ::c_int;
+
+    pub fn fs_open_index_dir(device: ::dev_t) -> *mut ::DIR;
+    pub fn fs_close_index_dir(indexDirectory: *mut ::DIR) -> ::c_int;
+    pub fn fs_read_index_dir(indexDirectory: *mut ::DIR) -> *mut ::dirent;
+    pub fn fs_rewind_index_dir(indexDirectory: *mut ::DIR);
+
+    // kernel/fs_info.h
+    pub fn dev_for_path(path: *const ::c_char) -> ::dev_t;
+    pub fn next_dev(pos: *mut i32) -> ::dev_t;
+    pub fn fs_stat_dev(dev: ::dev_t, info: *mut fs_info) -> ::c_int;
+
+    // kernel/fs_query.h
+    pub fn fs_open_query(device: ::dev_t, query: *const ::c_char, flags: u32) -> *mut ::DIR;
+    pub fn fs_open_live_query(
+        device: ::dev_t,
+        query: *const ::c_char,
+        flags: u32,
+        port: port_id,
+        token: i32,
+    ) -> *mut ::DIR;
+    pub fn fs_close_query(d: *mut ::DIR) -> ::c_int;
+    pub fn fs_read_query(d: *mut ::DIR) -> *mut ::dirent;
+    pub fn get_path_for_dirent(dent: *mut ::dirent, buf: *mut ::c_char, len: ::size_t) -> status_t;
+
+    // kernel/fs_volume.h
+    pub fn fs_mount_volume(
+        where_: *const ::c_char,
+        device: *const ::c_char,
+        filesystem: *const ::c_char,
+        flags: u32,
+        parameters: *const ::c_char,
+    ) -> ::dev_t;
+    pub fn fs_unmount_volume(path: *const ::c_char, flags: u32) -> status_t;
+
+    // kernel/image.h
+    pub fn load_image(
+        argc: i32,
+        argv: *mut *const ::c_char,
+        environ: *mut *const ::c_char,
+    ) -> thread_id;
+    pub fn load_add_on(path: *const ::c_char) -> image_id;
+    pub fn unload_add_on(image: image_id) -> status_t;
+    pub fn get_image_symbol(
+        image: image_id,
+        name: *const ::c_char,
+        symbolType: i32,
+        symbolLocation: *mut *mut ::c_void,
+    ) -> status_t;
+    pub fn get_nth_image_symbol(
+        image: image_id,
+        n: i32,
+        nameBuffer: *mut ::c_char,
+        nameLength: *mut i32,
+        symbolType: *mut i32,
+        symbolLocation: *mut *mut ::c_void,
+    ) -> status_t;
+    pub fn clear_caches(address: *mut ::c_void, length: ::size_t, flags: u32);
+    pub fn _get_image_info(image: image_id, info: *mut image_info, size: ::size_t) -> status_t;
+    pub fn _get_next_image_info(
+        team: team_id,
+        cookie: *mut i32,
+        info: *mut image_info,
+        size: ::size_t,
+    ) -> status_t;
+    pub fn find_path(
+        codePointer: *const ::c_void,
+        baseDirectory: path_base_directory,
+        subPath: *const ::c_char,
+        pathBuffer: *mut ::c_char,
+        bufferSize: usize,
+    ) -> status_t;
+}
+
+// The following functions are defined as macros in C/C++
+pub unsafe fn get_area_info(id: area_id, info: *mut area_info) -> status_t {
+    _get_area_info(id, info, core::mem::size_of::<area_info>() as usize)
+}
+
+pub unsafe fn get_next_area_info(
+    team: team_id,
+    cookie: *mut isize,
+    info: *mut area_info,
+) -> status_t {
+    _get_next_area_info(
+        team,
+        cookie,
+        info,
+        core::mem::size_of::<area_info>() as usize,
+    )
+}
+
+pub unsafe fn get_port_info(port: port_id, buf: *mut port_info) -> status_t {
+    _get_port_info(port, buf, core::mem::size_of::<port_info>() as ::size_t)
+}
+
+pub unsafe fn get_next_port_info(
+    port: port_id,
+    cookie: *mut i32,
+    portInfo: *mut port_info,
+) -> status_t {
+    _get_next_port_info(
+        port,
+        cookie,
+        portInfo,
+        core::mem::size_of::<port_info>() as ::size_t,
+    )
+}
+
+pub unsafe fn get_port_message_info_etc(
+    port: port_id,
+    info: *mut port_message_info,
+    flags: u32,
+    timeout: bigtime_t,
+) -> status_t {
+    _get_port_message_info_etc(
+        port,
+        info,
+        core::mem::size_of::<port_message_info>() as ::size_t,
+        flags,
+        timeout,
+    )
+}
+
+pub unsafe fn get_sem_info(id: sem_id, info: *mut sem_info) -> status_t {
+    _get_sem_info(id, info, core::mem::size_of::<sem_info>() as ::size_t)
+}
+
+pub unsafe fn get_next_sem_info(team: team_id, cookie: *mut i32, info: *mut sem_info) -> status_t {
+    _get_next_sem_info(
+        team,
+        cookie,
+        info,
+        core::mem::size_of::<sem_info>() as ::size_t,
+    )
+}
+
+pub unsafe fn get_team_info(team: team_id, info: *mut team_info) -> status_t {
+    _get_team_info(team, info, core::mem::size_of::<team_info>() as ::size_t)
+}
+
+pub unsafe fn get_next_team_info(cookie: *mut i32, info: *mut team_info) -> status_t {
+    _get_next_team_info(cookie, info, core::mem::size_of::<team_info>() as ::size_t)
+}
+
+pub unsafe fn get_team_usage_info(team: team_id, who: i32, info: *mut team_usage_info) -> status_t {
+    _get_team_usage_info(
+        team,
+        who,
+        info,
+        core::mem::size_of::<team_usage_info>() as ::size_t,
+    )
+}
+
+pub unsafe fn get_thread_info(id: thread_id, info: *mut thread_info) -> status_t {
+    _get_thread_info(id, info, core::mem::size_of::<thread_info>() as ::size_t)
+}
+
+pub unsafe fn get_next_thread_info(
+    team: team_id,
+    cookie: *mut i32,
+    info: *mut thread_info,
+) -> status_t {
+    _get_next_thread_info(
+        team,
+        cookie,
+        info,
+        core::mem::size_of::<thread_info>() as ::size_t,
+    )
+}
+
+// kernel/image.h
+pub unsafe fn get_image_info(image: image_id, info: *mut image_info) -> status_t {
+    _get_image_info(image, info, core::mem::size_of::<image_info>() as ::size_t)
+}
+
+pub unsafe fn get_next_image_info(
+    team: team_id,
+    cookie: *mut i32,
+    info: *mut image_info,
+) -> status_t {
+    _get_next_image_info(
+        team,
+        cookie,
+        info,
+        core::mem::size_of::<image_info>() as ::size_t,
+    )
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/hermit/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/hermit/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/hermit/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/hermit/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -960,18 +960,10 @@
 extern "C" {
     pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;
     pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
 
     pub fn abs(i: ::c_int) -> ::c_int;
     pub fn atof(s: *const ::c_char) -> ::c_double;
@@ -979,16 +971,9 @@
     pub fn rand() -> ::c_int;
     pub fn srand(seed: ::c_uint);
 
-    pub fn bind(
-        s: ::c_int,
-        name: *const ::sockaddr,
-        namelen: ::socklen_t,
-    ) -> ::c_int;
+    pub fn bind(s: ::c_int, name: *const ::sockaddr, namelen: ::socklen_t) -> ::c_int;
 
-    pub fn clock_gettime(
-        clock_id: ::clockid_t,
-        tp: *mut ::timespec,
-    ) -> ::c_int;
+    pub fn clock_gettime(clock_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
 
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
     pub fn getpwuid_r(
@@ -1011,11 +996,7 @@
         arg: *mut ::c_void,
     ) -> ::c_int;
 
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const ::sigset_t,
-        oset: *mut ::sigset_t,
-    ) -> ::c_int;
+    pub fn pthread_sigmask(how: ::c_int, set: *const ::sigset_t, oset: *mut ::sigset_t) -> ::c_int;
 
     pub fn recvfrom(
         s: ::c_int,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/arm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/arm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/arm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/arm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -138,7 +138,7 @@
                         self.uc_stack.hash(state);
                         self.uc_mcontext.hash(state);
                         self.uc_sigmask__c_anonymous_union.hash(state);
-                        &self.uc_regspace[..].hash(state);
+                        self.uc_regspace[..].hash(state);
                         // Ignore padding field
                     }
                 }
@@ -521,3 +521,19 @@
 pub const REG_R15: ::c_int = 15;
 
 pub const NGREG: ::c_int = 18;
+
+f! {
+    // Sadly, Android before 5.0 (API level 21), the accept4 syscall is not
+    // exposed by the libc. As work-around, we implement it through `syscall`
+    // directly. This workaround can be removed if the minimum version of
+    // Android is bumped. When the workaround is removed, `accept4` can be
+    // moved back to `linux_like/mod.rs`
+    pub fn accept4(
+        fd: ::c_int,
+        addr: *mut ::sockaddr,
+        len: *mut ::socklen_t,
+        flg: ::c_int
+    ) -> ::c_int {
+        ::syscall(SYS_accept4, fd, addr, len, flg) as ::c_int
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,6 +8,7 @@
 pub type sigset_t = ::c_ulong;
 pub type socklen_t = i32;
 pub type time64_t = i64;
+pub type __u64 = ::c_ulonglong;
 
 s! {
     pub struct sigaction {
@@ -27,7 +28,7 @@
         __pad0: [::c_uchar; 4],
         __st_ino: ::ino_t,
         pub st_mode: ::c_uint,
-        pub st_nlink: ::c_uint,
+        pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
         pub st_rdev: ::c_ulonglong,
@@ -49,7 +50,7 @@
         __pad0: [::c_uchar; 4],
         __st_ino: ::ino_t,
         pub st_mode: ::c_uint,
-        pub st_nlink: ::c_uint,
+        pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
         pub st_rdev: ::c_ulonglong,
@@ -74,7 +75,7 @@
         pub f_bavail: u64,
         pub f_files: u64,
         pub f_ffree: u64,
-        f_fsid: [u32; 2],
+        pub f_fsid: ::__fsid_t,
         pub f_namelen: u32,
         pub f_frsize: u32,
         pub f_flags: u32,
@@ -119,6 +120,14 @@
         __reserved: [::c_char; 12],
     }
 
+    pub struct pthread_barrier_t {
+        __private: [i32; 8],
+    }
+
+    pub struct pthread_spinlock_t {
+        __private: [i32; 2],
+    }
+
     pub struct passwd {
         pub pw_name: *mut ::c_char,
         pub pw_passwd: *mut ::c_char,
@@ -197,10 +206,8 @@
 pub const PTRACE_GETREGS: ::c_int = 12;
 pub const PTRACE_SETREGS: ::c_int = 13;
 
-pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t =
-    pthread_mutex_t { value: 0 };
-pub const PTHREAD_COND_INITIALIZER: pthread_cond_t =
-    pthread_cond_t { value: 0 };
+pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { value: 0 };
+pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { value: 0 };
 pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
     lock: PTHREAD_MUTEX_INITIALIZER,
     cond: PTHREAD_COND_INITIALIZER,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/x86/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/x86/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/x86/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b32/x86/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -574,6 +574,35 @@
 pub const REG_UESP: ::c_int = 17;
 pub const REG_SS: ::c_int = 18;
 
+// socketcall values from linux/net.h (only the needed ones, and not public)
+const SYS_ACCEPT4: ::c_int = 18;
+
+f! {
+    // Sadly, Android before 5.0 (API level 21), the accept4 syscall is not
+    // exposed by the libc. As work-around, we implement it as raw syscall.
+    // Note that for x86, the `accept4` syscall is not available either,
+    // and we must use the `socketcall` syscall instead.
+    // This workaround can be removed if the minimum Android version is bumped.
+    // When the workaround is removed, `accept4` can be moved back
+    // to `linux_like/mod.rs`
+    pub fn accept4(
+        fd: ::c_int,
+        addr: *mut ::sockaddr,
+        len: *mut ::socklen_t,
+        flg: ::c_int
+    ) -> ::c_int {
+        // Arguments are passed as array of `long int`
+        // (which is big enough on x86 for a pointer).
+        let mut args = [
+            fd as ::c_long,
+            addr as ::c_long,
+            len as ::c_long,
+            flg as ::c_long,
+        ];
+        ::syscall(SYS_socketcall, SYS_ACCEPT4, args[..].as_mut_ptr())
+    }
+}
+
 cfg_if! {
     if #[cfg(libc_align)] {
         mod align;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/aarch64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/aarch64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/aarch64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/aarch64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,13 @@
 pub type c_char = u8;
 pub type wchar_t = u32;
+pub type __u64 = ::c_ulonglong;
 
 s! {
     pub struct stat {
         pub st_dev: ::dev_t,
         pub st_ino: ::ino_t,
         pub st_mode: ::c_uint,
-        pub st_nlink: ::c_uint,
+        pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
         pub st_rdev: ::dev_t,
@@ -29,7 +30,7 @@
         pub st_dev: ::dev_t,
         pub st_ino: ::ino_t,
         pub st_mode: ::c_uint,
-        pub st_nlink: ::c_uint,
+        pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
         pub st_rdev: ::dev_t,
@@ -57,6 +58,49 @@
 pub const SIGSTKSZ: ::size_t = 16384;
 pub const MINSIGSTKSZ: ::size_t = 5120;
 
+// From NDK's asm/hwcap.h
+pub const HWCAP_FP: ::c_ulong = 1 << 0;
+pub const HWCAP_ASIMD: ::c_ulong = 1 << 1;
+pub const HWCAP_EVTSTRM: ::c_ulong = 1 << 2;
+pub const HWCAP_AES: ::c_ulong = 1 << 3;
+pub const HWCAP_PMULL: ::c_ulong = 1 << 4;
+pub const HWCAP_SHA1: ::c_ulong = 1 << 5;
+pub const HWCAP_SHA2: ::c_ulong = 1 << 6;
+pub const HWCAP_CRC32: ::c_ulong = 1 << 7;
+pub const HWCAP_ATOMICS: ::c_ulong = 1 << 8;
+pub const HWCAP_FPHP: ::c_ulong = 1 << 9;
+pub const HWCAP_ASIMDHP: ::c_ulong = 1 << 10;
+pub const HWCAP_CPUID: ::c_ulong = 1 << 11;
+pub const HWCAP_ASIMDRDM: ::c_ulong = 1 << 12;
+pub const HWCAP_JSCVT: ::c_ulong = 1 << 13;
+pub const HWCAP_FCMA: ::c_ulong = 1 << 14;
+pub const HWCAP_LRCPC: ::c_ulong = 1 << 15;
+pub const HWCAP_DCPOP: ::c_ulong = 1 << 16;
+pub const HWCAP_SHA3: ::c_ulong = 1 << 17;
+pub const HWCAP_SM3: ::c_ulong = 1 << 18;
+pub const HWCAP_SM4: ::c_ulong = 1 << 19;
+pub const HWCAP_ASIMDDP: ::c_ulong = 1 << 20;
+pub const HWCAP_SHA512: ::c_ulong = 1 << 21;
+pub const HWCAP_SVE: ::c_ulong = 1 << 22;
+pub const HWCAP_ASIMDFHM: ::c_ulong = 1 << 23;
+pub const HWCAP_DIT: ::c_ulong = 1 << 24;
+pub const HWCAP_USCAT: ::c_ulong = 1 << 25;
+pub const HWCAP_ILRCPC: ::c_ulong = 1 << 26;
+pub const HWCAP_FLAGM: ::c_ulong = 1 << 27;
+pub const HWCAP_SSBS: ::c_ulong = 1 << 28;
+pub const HWCAP_SB: ::c_ulong = 1 << 29;
+pub const HWCAP_PACA: ::c_ulong = 1 << 30;
+pub const HWCAP_PACG: ::c_ulong = 1 << 31;
+pub const HWCAP2_DCPODP: ::c_ulong = 1 << 0;
+pub const HWCAP2_SVE2: ::c_ulong = 1 << 1;
+pub const HWCAP2_SVEAES: ::c_ulong = 1 << 2;
+pub const HWCAP2_SVEPMULL: ::c_ulong = 1 << 3;
+pub const HWCAP2_SVEBITPERM: ::c_ulong = 1 << 4;
+pub const HWCAP2_SVESHA3: ::c_ulong = 1 << 5;
+pub const HWCAP2_SVESM4: ::c_ulong = 1 << 6;
+pub const HWCAP2_FLAGM2: ::c_ulong = 1 << 7;
+pub const HWCAP2_FRINT: ::c_ulong = 1 << 8;
+
 pub const SYS_io_setup: ::c_long = 0;
 pub const SYS_io_destroy: ::c_long = 1;
 pub const SYS_io_submit: ::c_long = 2;
@@ -82,6 +126,7 @@
 pub const SYS_epoll_pwait: ::c_long = 22;
 pub const SYS_dup: ::c_long = 23;
 pub const SYS_dup3: ::c_long = 24;
+pub const SYS_fcntl: ::c_long = 25;
 pub const SYS_inotify_init1: ::c_long = 26;
 pub const SYS_inotify_add_watch: ::c_long = 27;
 pub const SYS_inotify_rm_watch: ::c_long = 28;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,7 +84,7 @@
         pub f_bavail: u64,
         pub f_files: u64,
         pub f_ffree: u64,
-        f_fsid: [u32; 2],
+        pub f_fsid: ::__fsid_t,
         pub f_namelen: u64,
         pub f_frsize: u64,
         pub f_flags: u64,
@@ -105,6 +105,14 @@
         pub f_namemax: ::c_ulong,
         __f_spare: [::c_int; 6],
     }
+
+    pub struct pthread_barrier_t {
+        __private: [i64; 4],
+    }
+
+    pub struct pthread_spinlock_t {
+        __private: i64,
+    }
 }
 
 s_no_extra_traits! {
@@ -256,6 +264,31 @@
 pub const RTLD_NOW: ::c_int = 2;
 pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void;
 
+// From NDK's linux/auxvec.h
+pub const AT_NULL: ::c_ulong = 0;
+pub const AT_IGNORE: ::c_ulong = 1;
+pub const AT_EXECFD: ::c_ulong = 2;
+pub const AT_PHDR: ::c_ulong = 3;
+pub const AT_PHENT: ::c_ulong = 4;
+pub const AT_PHNUM: ::c_ulong = 5;
+pub const AT_PAGESZ: ::c_ulong = 6;
+pub const AT_BASE: ::c_ulong = 7;
+pub const AT_FLAGS: ::c_ulong = 8;
+pub const AT_ENTRY: ::c_ulong = 9;
+pub const AT_NOTELF: ::c_ulong = 10;
+pub const AT_UID: ::c_ulong = 11;
+pub const AT_EUID: ::c_ulong = 12;
+pub const AT_GID: ::c_ulong = 13;
+pub const AT_EGID: ::c_ulong = 14;
+pub const AT_PLATFORM: ::c_ulong = 15;
+pub const AT_HWCAP: ::c_ulong = 16;
+pub const AT_CLKTCK: ::c_ulong = 17;
+pub const AT_SECURE: ::c_ulong = 23;
+pub const AT_BASE_PLATFORM: ::c_ulong = 24;
+pub const AT_RANDOM: ::c_ulong = 25;
+pub const AT_HWCAP2: ::c_ulong = 26;
+pub const AT_EXECFN: ::c_ulong = 31;
+
 pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
     value: 0,
     __reserved: [0; 36],
@@ -280,6 +313,32 @@
 pub const UT_NAMESIZE: usize = 32;
 pub const UT_HOSTSIZE: usize = 256;
 
+f! {
+    // Sadly, Android before 5.0 (API level 21), the accept4 syscall is not
+    // exposed by the libc. As work-around, we implement it through `syscall`
+    // directly. This workaround can be removed if the minimum version of
+    // Android is bumped. When the workaround is removed, `accept4` can be
+    // moved back to `linux_like/mod.rs`
+    pub fn accept4(
+        fd: ::c_int,
+        addr: *mut ::sockaddr,
+        len: *mut ::socklen_t,
+        flg: ::c_int
+    ) -> ::c_int {
+        ::syscall(SYS_accept4, fd, addr, len, flg) as ::c_int
+    }
+}
+
+extern "C" {
+    pub fn getauxval(type_: ::c_ulong) -> ::c_ulong;
+    pub fn __system_property_wait(
+        pi: *const ::prop_info,
+        __old_serial: u32,
+        __new_serial_ptr: *mut u32,
+        __relative_timeout: *const ::timespec,
+    ) -> bool;
+}
+
 cfg_if! {
     if #[cfg(target_arch = "x86_64")] {
         mod x86_64;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/x86_64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/x86_64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/x86_64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/b64/x86_64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 pub type c_char = i8;
 pub type wchar_t = i32;
 pub type greg_t = i64;
+pub type __u64 = ::c_ulonglong;
 
 s! {
     pub struct stat {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/android/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,7 @@
 pub type pthread_t = ::c_long;
 pub type pthread_mutexattr_t = ::c_long;
 pub type pthread_rwlockattr_t = ::c_long;
+pub type pthread_barrierattr_t = ::c_int;
 pub type pthread_condattr_t = ::c_long;
 pub type pthread_key_t = ::c_int;
 pub type fsfilcnt_t = ::c_ulong;
@@ -26,6 +27,25 @@
 pub type __kernel_loff_t = ::c_longlong;
 pub type __kernel_pid_t = ::c_int;
 
+pub type __u8 = ::c_uchar;
+pub type __u16 = ::c_ushort;
+pub type __s16 = ::c_short;
+pub type __u32 = ::c_uint;
+pub type __s32 = ::c_int;
+
+// linux/elf.h
+
+pub type Elf32_Addr = u32;
+pub type Elf32_Half = u16;
+pub type Elf32_Off = u32;
+pub type Elf32_Word = u32;
+
+pub type Elf64_Addr = u64;
+pub type Elf64_Half = u16;
+pub type Elf64_Off = u64;
+pub type Elf64_Word = u32;
+pub type Elf64_Xword = u64;
+
 s! {
     pub struct stack_t {
         pub ss_sp: *mut ::c_void,
@@ -73,6 +93,19 @@
         pub c_ospeed: ::speed_t,
     }
 
+    pub struct mallinfo {
+        pub arena: ::size_t,
+        pub ordblks: ::size_t,
+        pub smblks: ::size_t,
+        pub hblks: ::size_t,
+        pub hblkhd: ::size_t,
+        pub usmblks: ::size_t,
+        pub fsmblks: ::size_t,
+        pub uordblks: ::size_t,
+        pub fordblks: ::size_t,
+        pub keepcost: ::size_t,
+    }
+
     pub struct flock {
         pub l_type: ::c_short,
         pub l_whence: ::c_short,
@@ -244,6 +277,78 @@
         pub svm_cid: ::c_uint,
         pub svm_zero: [u8; 4]
     }
+
+    // linux/elf.h
+
+    pub struct Elf32_Phdr {
+        pub p_type: Elf32_Word,
+        pub p_offset: Elf32_Off,
+        pub p_vaddr: Elf32_Addr,
+        pub p_paddr: Elf32_Addr,
+        pub p_filesz: Elf32_Word,
+        pub p_memsz: Elf32_Word,
+        pub p_flags: Elf32_Word,
+        pub p_align: Elf32_Word,
+    }
+
+    pub struct Elf64_Phdr {
+        pub p_type: Elf64_Word,
+        pub p_flags: Elf64_Word,
+        pub p_offset: Elf64_Off,
+        pub p_vaddr: Elf64_Addr,
+        pub p_paddr: Elf64_Addr,
+        pub p_filesz: Elf64_Xword,
+        pub p_memsz: Elf64_Xword,
+        pub p_align: Elf64_Xword,
+    }
+
+    // link.h
+
+    pub struct dl_phdr_info {
+        #[cfg(target_pointer_width = "64")]
+        pub dlpi_addr: Elf64_Addr,
+        #[cfg(target_pointer_width = "32")]
+        pub dlpi_addr: Elf32_Addr,
+
+        pub dlpi_name: *const ::c_char,
+
+        #[cfg(target_pointer_width = "64")]
+        pub dlpi_phdr: *const Elf64_Phdr,
+        #[cfg(target_pointer_width = "32")]
+        pub dlpi_phdr: *const Elf32_Phdr,
+
+        #[cfg(target_pointer_width = "64")]
+        pub dlpi_phnum: Elf64_Half,
+        #[cfg(target_pointer_width = "32")]
+        pub dlpi_phnum: Elf32_Half,
+
+        // These fields were added in Android R
+        pub dlpi_adds: ::c_ulonglong,
+        pub dlpi_subs: ::c_ulonglong,
+        pub dlpi_tls_modid: ::size_t,
+        pub dlpi_tls_data: *mut ::c_void,
+    }
+
+    // linux/filter.h
+    pub struct sock_filter {
+        pub code: ::__u16,
+        pub jt: ::__u8,
+        pub jf: ::__u8,
+        pub k: ::__u32,
+    }
+
+    pub struct sock_fprog {
+        pub len: ::c_ushort,
+        pub filter: *mut sock_filter,
+    }
+
+    // linux/seccomp.h
+    pub struct seccomp_data {
+        pub nr: ::c_int,
+        pub arch: ::__u32,
+        pub instruction_pointer: ::__u64,
+        pub args: [::__u64; 6],
+    }
 }
 
 s_no_extra_traits! {
@@ -317,6 +422,12 @@
         pub ivlen: u32,
         pub iv: [::c_uchar; 0],
     }
+
+    pub struct prop_info {
+        __name: [::c_char; 32],
+        __serial: ::c_uint,
+        __value: [[::c_char; 4]; 23],
+    }
 }
 
 cfg_if! {
@@ -635,6 +746,24 @@
                 self.as_slice().hash(state);
             }
         }
+
+        impl PartialEq for prop_info {
+            fn eq(&self, other: &prop_info) -> bool {
+                self.__name == other.__name &&
+                    self.__serial == other.__serial &&
+                    self.__value == other.__value
+            }
+        }
+        impl Eq for prop_info {}
+        impl ::fmt::Debug for prop_info {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("prop_info")
+                    .field("__name", &self.__name)
+                    .field("__serial", &self.__serial)
+                    .field("__value", &self.__value)
+                    .finish()
+            }
+        }
     }
 }
 
@@ -1078,8 +1207,10 @@
 pub const SO_BINDTODEVICE: ::c_int = 25;
 pub const SO_TIMESTAMP: ::c_int = 29;
 pub const SO_ACCEPTCONN: ::c_int = 30;
+pub const SO_PEERSEC: ::c_int = 31;
 pub const SO_SNDBUFFORCE: ::c_int = 32;
 pub const SO_RCVBUFFORCE: ::c_int = 33;
+pub const SO_PASSSEC: ::c_int = 34;
 pub const SO_MARK: ::c_int = 36;
 pub const SO_PROTOCOL: ::c_int = 38;
 pub const SO_DOMAIN: ::c_int = 39;
@@ -1087,8 +1218,6 @@
 pub const SO_PEEK_OFF: ::c_int = 42;
 pub const SO_BUSY_POLL: ::c_int = 46;
 
-pub const TCP_ULP: ::c_int = 31;
-
 pub const IPTOS_ECN_NOTECT: u8 = 0x00;
 
 pub const O_ACCMODE: ::c_int = 3;
@@ -1101,6 +1230,7 @@
 pub const O_ASYNC: ::c_int = 0x2000;
 pub const O_NDELAY: ::c_int = 0x800;
 pub const O_DSYNC: ::c_int = 4096;
+pub const O_RSYNC: ::c_int = O_SYNC;
 
 pub const NI_MAXHOST: ::size_t = 1025;
 pub const NI_MAXSERV: ::size_t = 32;
@@ -1171,6 +1301,8 @@
 pub const PTRACE_GETEVENTMSG: ::c_int = 0x4201;
 pub const PTRACE_GETSIGINFO: ::c_int = 0x4202;
 pub const PTRACE_SETSIGINFO: ::c_int = 0x4203;
+pub const PTRACE_GETREGSET: ::c_int = 0x4204;
+pub const PTRACE_SETREGSET: ::c_int = 0x4205;
 
 pub const PTRACE_EVENT_STOP: ::c_int = 128;
 
@@ -1202,6 +1334,7 @@
 pub const RLIMIT_NICE: ::c_int = 13;
 pub const RLIMIT_RTPRIO: ::c_int = 14;
 
+pub const RLIM_NLIMITS: ::c_int = 16;
 pub const RLIM_INFINITY: ::rlim_t = !0;
 
 pub const TCGETS: ::c_int = 0x5401;
@@ -1256,11 +1389,8 @@
 pub const AI_CANONNAME: ::c_int = 0x00000002;
 pub const AI_NUMERICHOST: ::c_int = 0x00000004;
 pub const AI_NUMERICSERV: ::c_int = 0x00000008;
-pub const AI_MASK: ::c_int = AI_PASSIVE
-    | AI_CANONNAME
-    | AI_NUMERICHOST
-    | AI_NUMERICSERV
-    | AI_ADDRCONFIG;
+pub const AI_MASK: ::c_int =
+    AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | AI_ADDRCONFIG;
 pub const AI_ALL: ::c_int = 0x00000100;
 pub const AI_V4MAPPED_CFG: ::c_int = 0x00000200;
 pub const AI_ADDRCONFIG: ::c_int = 0x00000400;
@@ -1665,6 +1795,25 @@
 pub const SECCOMP_MODE_STRICT: ::c_uint = 1;
 pub const SECCOMP_MODE_FILTER: ::c_uint = 2;
 
+pub const SECCOMP_FILTER_FLAG_TSYNC: ::c_ulong = 1;
+pub const SECCOMP_FILTER_FLAG_LOG: ::c_ulong = 2;
+pub const SECCOMP_FILTER_FLAG_SPEC_ALLOW: ::c_ulong = 4;
+pub const SECCOMP_FILTER_FLAG_NEW_LISTENER: ::c_ulong = 8;
+
+pub const SECCOMP_RET_ACTION_FULL: ::c_uint = 0xffff0000;
+pub const SECCOMP_RET_ACTION: ::c_uint = 0x7fff0000;
+pub const SECCOMP_RET_DATA: ::c_uint = 0x0000ffff;
+
+pub const SECCOMP_RET_KILL_PROCESS: ::c_uint = 0x80000000;
+pub const SECCOMP_RET_KILL_THREAD: ::c_uint = 0x00000000;
+pub const SECCOMP_RET_KILL: ::c_uint = SECCOMP_RET_KILL_THREAD;
+pub const SECCOMP_RET_TRAP: ::c_uint = 0x00030000;
+pub const SECCOMP_RET_ERRNO: ::c_uint = 0x00050000;
+pub const SECCOMP_RET_USER_NOTIF: ::c_uint = 0x7fc00000;
+pub const SECCOMP_RET_TRACE: ::c_uint = 0x7ff00000;
+pub const SECCOMP_RET_LOG: ::c_uint = 0x7ffc0000;
+pub const SECCOMP_RET_ALLOW: ::c_uint = 0x7fff0000;
+
 pub const NLA_F_NESTED: ::c_int = 1 << 15;
 pub const NLA_F_NET_BYTEORDER: ::c_int = 1 << 14;
 pub const NLA_TYPE_MASK: ::c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER);
@@ -2216,8 +2365,7 @@
 
 pub const FUTEX_PRIVATE_FLAG: ::c_int = 128;
 pub const FUTEX_CLOCK_REALTIME: ::c_int = 256;
-pub const FUTEX_CMD_MASK: ::c_int =
-    !(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME);
+pub const FUTEX_CMD_MASK: ::c_int = !(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME);
 
 // linux/errqueue.h
 pub const SO_EE_ORIGIN_NONE: u8 = 0;
@@ -2286,6 +2434,10 @@
 pub const PF_NFC: ::c_int = AF_NFC;
 pub const PF_VSOCK: ::c_int = AF_VSOCK;
 
+// sys/system_properties.h
+pub const PROP_VALUE_MAX: ::c_int = 92;
+pub const PROP_NAME_MAX: ::c_int = 32;
+
 f! {
     pub fn CMSG_NXTHDR(mhdr: *const msghdr,
                        cmsg: *const cmsghdr) -> *mut cmsghdr {
@@ -2349,20 +2501,6 @@
     pub fn SO_EE_OFFENDER(ee: *const ::sock_extended_err) -> *mut ::sockaddr {
         ee.offset(1) as *mut ::sockaddr
     }
-
-    // Sadly, Android before 5.0 (API level 21), the accept4 syscall is not
-    // exposed by the libc. As work-around, we implement it through `syscall`
-    // directly. This workaround can be removed if the minimum version of
-    // Android is bumped. When the workaround is removed, `accept4` can be
-    // moved back to `linux_like/mod.rs`
-    pub fn accept4(
-        fd: ::c_int,
-        addr: *mut ::sockaddr,
-        len: *mut ::socklen_t,
-        flg: ::c_int
-    ) -> ::c_int {
-        syscall(SYS_accept4, fd, addr, len, flg) as ::c_int
-    }
 }
 
 extern "C" {
@@ -2382,29 +2520,13 @@
         new_limit: *const ::rlimit64,
         old_limit: *mut ::rlimit64,
     ) -> ::c_int;
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
-    pub fn madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn msync(addr: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn recvfrom(
         socket: ::c_int,
         buf: *mut ::c_void,
@@ -2422,18 +2544,8 @@
         sevlen: ::size_t,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn preadv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        count: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn pwritev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        count: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
+    pub fn preadv(fd: ::c_int, iov: *const ::iovec, count: ::c_int, offset: ::off_t) -> ::ssize_t;
+    pub fn pwritev(fd: ::c_int, iov: *const ::iovec, count: ::c_int, offset: ::off_t) -> ::ssize_t;
     pub fn process_vm_readv(
         pid: ::pid_t,
         local_iov: *const ::iovec,
@@ -2455,38 +2567,21 @@
     pub fn setpriority(which: ::c_int, who: ::id_t, prio: ::c_int) -> ::c_int;
     pub fn __sched_cpualloc(count: ::size_t) -> *mut ::cpu_set_t;
     pub fn __sched_cpufree(set: *mut ::cpu_set_t);
-    pub fn __sched_cpucount(
-        setsize: ::size_t,
-        set: *const cpu_set_t,
-    ) -> ::c_int;
+    pub fn __sched_cpucount(setsize: ::size_t, set: *const cpu_set_t) -> ::c_int;
     pub fn sched_getcpu() -> ::c_int;
+    pub fn mallinfo() -> ::mallinfo;
+    pub fn malloc_usable_size(ptr: *const ::c_void) -> ::size_t;
 
     pub fn utmpname(name: *const ::c_char) -> ::c_int;
     pub fn setutent();
     pub fn getutent() -> *mut utmp;
 
-    pub fn fallocate(
-        fd: ::c_int,
-        mode: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
-    pub fn fallocate64(
-        fd: ::c_int,
-        mode: ::c_int,
-        offset: ::off64_t,
-        len: ::off64_t,
-    ) -> ::c_int;
-    pub fn posix_fallocate(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
-    pub fn posix_fallocate64(
-        fd: ::c_int,
-        offset: ::off64_t,
-        len: ::off64_t,
-    ) -> ::c_int;
+    pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long);
+    pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
+    pub fn fallocate(fd: ::c_int, mode: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
+    pub fn fallocate64(fd: ::c_int, mode: ::c_int, offset: ::off64_t, len: ::off64_t) -> ::c_int;
+    pub fn posix_fallocate(fd: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
+    pub fn posix_fallocate64(fd: ::c_int, offset: ::off64_t, len: ::off64_t) -> ::c_int;
     pub fn getxattr(
         path: *const c_char,
         name: *const c_char,
@@ -2526,34 +2621,15 @@
         size: ::size_t,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn listxattr(
-        path: *const c_char,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn llistxattr(
-        path: *const c_char,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn flistxattr(
-        filedes: ::c_int,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
+    pub fn listxattr(path: *const c_char, list: *mut c_char, size: ::size_t) -> ::ssize_t;
+    pub fn llistxattr(path: *const c_char, list: *mut c_char, size: ::size_t) -> ::ssize_t;
+    pub fn flistxattr(filedes: ::c_int, list: *mut c_char, size: ::size_t) -> ::ssize_t;
     pub fn removexattr(path: *const c_char, name: *const c_char) -> ::c_int;
     pub fn lremovexattr(path: *const c_char, name: *const c_char) -> ::c_int;
     pub fn fremovexattr(filedes: ::c_int, name: *const c_char) -> ::c_int;
-    pub fn signalfd(
-        fd: ::c_int,
-        mask: *const ::sigset_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn signalfd(fd: ::c_int, mask: *const ::sigset_t, flags: ::c_int) -> ::c_int;
     pub fn timerfd_create(clock: ::clockid_t, flags: ::c_int) -> ::c_int;
-    pub fn timerfd_gettime(
-        fd: ::c_int,
-        current_value: *mut itimerspec,
-    ) -> ::c_int;
+    pub fn timerfd_gettime(fd: ::c_int, current_value: *mut itimerspec) -> ::c_int;
     pub fn timerfd_settime(
         fd: ::c_int,
         flags: ::c_int,
@@ -2561,11 +2637,8 @@
         old_value: *mut itimerspec,
     ) -> ::c_int;
     pub fn syscall(num: ::c_long, ...) -> ::c_long;
-    pub fn sched_getaffinity(
-        pid: ::pid_t,
-        cpusetsize: ::size_t,
-        cpuset: *mut cpu_set_t,
-    ) -> ::c_int;
+    pub fn sched_getaffinity(pid: ::pid_t, cpusetsize: ::size_t, cpuset: *mut cpu_set_t)
+        -> ::c_int;
     pub fn sched_setaffinity(
         pid: ::pid_t,
         cpusetsize: ::size_t,
@@ -2579,12 +2652,8 @@
         maxevents: ::c_int,
         timeout: ::c_int,
     ) -> ::c_int;
-    pub fn epoll_ctl(
-        epfd: ::c_int,
-        op: ::c_int,
-        fd: ::c_int,
-        event: *mut ::epoll_event,
-    ) -> ::c_int;
+    pub fn epoll_ctl(epfd: ::c_int, op: ::c_int, fd: ::c_int, event: *mut ::epoll_event)
+        -> ::c_int;
     pub fn pthread_getschedparam(
         native: ::pthread_t,
         policy: *mut ::c_int,
@@ -2593,16 +2662,8 @@
     pub fn unshare(flags: ::c_int) -> ::c_int;
     pub fn umount(target: *const ::c_char) -> ::c_int;
     pub fn sched_get_priority_max(policy: ::c_int) -> ::c_int;
-    pub fn tee(
-        fd_in: ::c_int,
-        fd_out: ::c_int,
-        len: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
-    pub fn settimeofday(
-        tv: *const ::timeval,
-        tz: *const ::timezone,
-    ) -> ::c_int;
+    pub fn tee(fd_in: ::c_int, fd_out: ::c_int, len: ::size_t, flags: ::c_uint) -> ::ssize_t;
+    pub fn settimeofday(tv: *const ::timeval, tz: *const ::timezone) -> ::c_int;
     pub fn splice(
         fd_in: ::c_int,
         off_in: *mut ::loff_t,
@@ -2612,17 +2673,10 @@
         flags: ::c_uint,
     ) -> ::ssize_t;
     pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int;
-    pub fn sched_rr_get_interval(pid: ::pid_t, tp: *mut ::timespec)
-        -> ::c_int;
-    pub fn sem_timedwait(
-        sem: *mut sem_t,
-        abstime: *const ::timespec,
-    ) -> ::c_int;
+    pub fn sched_rr_get_interval(pid: ::pid_t, tp: *mut ::timespec) -> ::c_int;
+    pub fn sem_timedwait(sem: *mut sem_t, abstime: *const ::timespec) -> ::c_int;
     pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int;
-    pub fn sched_setparam(
-        pid: ::pid_t,
-        param: *const ::sched_param,
-    ) -> ::c_int;
+    pub fn sched_setparam(pid: ::pid_t, param: *const ::sched_param) -> ::c_int;
     pub fn setns(fd: ::c_int, nstype: ::c_int) -> ::c_int;
     pub fn swapoff(puath: *const ::c_char) -> ::c_int;
     pub fn vmsplice(
@@ -2651,6 +2705,28 @@
         lock: *mut pthread_mutex_t,
         abstime: *const ::timespec,
     ) -> ::c_int;
+    pub fn pthread_barrierattr_init(attr: *mut ::pthread_barrierattr_t) -> ::c_int;
+    pub fn pthread_barrierattr_destroy(attr: *mut ::pthread_barrierattr_t) -> ::c_int;
+    pub fn pthread_barrierattr_getpshared(
+        attr: *const ::pthread_barrierattr_t,
+        shared: *mut ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_barrierattr_setpshared(
+        attr: *mut ::pthread_barrierattr_t,
+        shared: ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_barrier_init(
+        barrier: *mut pthread_barrier_t,
+        attr: *const ::pthread_barrierattr_t,
+        count: ::c_uint,
+    ) -> ::c_int;
+    pub fn pthread_barrier_destroy(barrier: *mut pthread_barrier_t) -> ::c_int;
+    pub fn pthread_barrier_wait(barrier: *mut pthread_barrier_t) -> ::c_int;
+    pub fn pthread_spin_init(lock: *mut ::pthread_spinlock_t, pshared: ::c_int) -> ::c_int;
+    pub fn pthread_spin_destroy(lock: *mut ::pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_lock(lock: *mut ::pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_trylock(lock: *mut ::pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_unlock(lock: *mut ::pthread_spinlock_t) -> ::c_int;
     pub fn clone(
         cb: extern "C" fn(*mut ::c_void) -> ::c_int,
         child_stack: *mut ::c_void,
@@ -2713,11 +2789,7 @@
         buflen: ::size_t,
         result: *mut *mut ::group,
     ) -> ::c_int;
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sem_open(name: *const ::c_char, oflag: ::c_int, ...) -> *mut sem_t;
     pub fn getgrnam(name: *const ::c_char) -> *mut ::group;
     pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
@@ -2790,17 +2862,9 @@
     ) -> ::c_int;
     pub fn inotify_init() -> ::c_int;
     pub fn inotify_init1(flags: ::c_int) -> ::c_int;
-    pub fn inotify_add_watch(
-        fd: ::c_int,
-        path: *const ::c_char,
-        mask: u32,
-    ) -> ::c_int;
+    pub fn inotify_add_watch(fd: ::c_int, path: *const ::c_char, mask: u32) -> ::c_int;
 
-    pub fn regcomp(
-        preg: *mut ::regex_t,
-        pattern: *const ::c_char,
-        cflags: ::c_int,
-    ) -> ::c_int;
+    pub fn regcomp(preg: *mut ::regex_t, pattern: *const ::c_char, cflags: ::c_int) -> ::c_int;
 
     pub fn regexec(
         preg: *const ::regex_t,
@@ -2818,6 +2882,38 @@
     ) -> ::size_t;
 
     pub fn regfree(preg: *mut ::regex_t);
+
+    pub fn android_set_abort_message(msg: *const ::c_char);
+
+    pub fn gettid() -> ::pid_t;
+
+    pub fn __system_property_set(__name: *const ::c_char, __value: *const ::c_char) -> ::c_int;
+    pub fn __system_property_get(__name: *const ::c_char, __value: *mut ::c_char) -> ::c_int;
+    pub fn __system_property_find(__name: *const ::c_char) -> *const prop_info;
+    pub fn __system_property_find_nth(__n: ::c_uint) -> *const prop_info;
+    pub fn __system_property_foreach(
+        __callback: unsafe extern "C" fn(__pi: *const prop_info, __cookie: *mut ::c_void),
+        __cookie: *mut ::c_void,
+    ) -> ::c_int;
+
+    // #include <link.h>
+    /// Only available in API Version 21+
+    pub fn dl_iterate_phdr(
+        callback: ::Option<
+            unsafe extern "C" fn(
+                info: *mut dl_phdr_info,
+                size: usize,
+                data: *mut ::c_void,
+            ) -> ::c_int,
+        >,
+        data: *mut ::c_void,
+    ) -> ::c_int;
+
+    pub fn arc4random() -> u32;
+    pub fn arc4random_uniform(__upper_bound: u32) -> u32;
+    pub fn arc4random_buf(__buf: *mut ::c_void, __n: ::size_t);
+
+    pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
 }
 
 cfg_if! {
@@ -2833,6 +2929,17 @@
 }
 
 impl siginfo_t {
+    pub unsafe fn si_addr(&self) -> *mut ::c_void {
+        #[repr(C)]
+        struct siginfo_sigfault {
+            _si_signo: ::c_int,
+            _si_errno: ::c_int,
+            _si_code: ::c_int,
+            si_addr: *mut ::c_void,
+        }
+        (*(self as *const siginfo_t as *const siginfo_sigfault)).si_addr
+    }
+
     pub unsafe fn si_value(&self) -> ::sigval {
         #[repr(C)]
         struct siginfo_timer {
@@ -2846,3 +2953,65 @@
         (*(self as *const siginfo_t as *const siginfo_timer)).si_sigval
     }
 }
+
+cfg_if! {
+    if #[cfg(libc_union)] {
+        // Internal, for casts to access union fields
+        #[repr(C)]
+        struct sifields_sigchld {
+            si_pid: ::pid_t,
+            si_uid: ::uid_t,
+            si_status: ::c_int,
+            si_utime: ::c_long,
+            si_stime: ::c_long,
+        }
+        impl ::Copy for sifields_sigchld {}
+        impl ::Clone for sifields_sigchld {
+            fn clone(&self) -> sifields_sigchld {
+                *self
+            }
+        }
+
+        // Internal, for casts to access union fields
+        #[repr(C)]
+        union sifields {
+            _align_pointer: *mut ::c_void,
+            sigchld: sifields_sigchld,
+        }
+
+        // Internal, for casts to access union fields. Note that some variants
+        // of sifields start with a pointer, which makes the alignment of
+        // sifields vary on 32-bit and 64-bit architectures.
+        #[repr(C)]
+        struct siginfo_f {
+            _siginfo_base: [::c_int; 3],
+            sifields: sifields,
+        }
+
+        impl siginfo_t {
+            unsafe fn sifields(&self) -> &sifields {
+                &(*(self as *const siginfo_t as *const siginfo_f)).sifields
+            }
+
+            pub unsafe fn si_pid(&self) -> ::pid_t {
+                self.sifields().sigchld.si_pid
+            }
+
+            pub unsafe fn si_uid(&self) -> ::uid_t {
+                self.sifields().sigchld.si_uid
+            }
+
+            pub unsafe fn si_status(&self) -> ::c_int {
+                self.sifields().sigchld.si_status
+            }
+
+            pub unsafe fn si_utime(&self) -> ::c_long {
+                self.sifields().sigchld.si_utime
+            }
+
+            pub unsafe fn si_stime(&self) -> ::c_long {
+                self.sifields().sigchld.si_stime
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/emscripten/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/emscripten/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/emscripten/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/emscripten/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -899,8 +899,6 @@
 pub const RTLD_NODELETE: ::c_int = 0x1000;
 pub const RTLD_NOW: ::c_int = 0x2;
 
-pub const TCP_MD5SIG: ::c_int = 14;
-
 align_const! {
     pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
         size: [0; __SIZEOF_PTHREAD_MUTEX_T],
@@ -1155,9 +1153,6 @@
 pub const ITIMER_VIRTUAL: ::c_int = 1;
 pub const ITIMER_PROF: ::c_int = 2;
 
-pub const XATTR_CREATE: ::c_int = 0x1;
-pub const XATTR_REPLACE: ::c_int = 0x2;
-
 pub const _POSIX_VDISABLE: ::cc_t = 0;
 
 pub const FALLOC_FL_KEEP_SIZE: ::c_int = 0x01;
@@ -1337,19 +1332,10 @@
 
 pub const RLIM_INFINITY: ::rlim_t = !0;
 pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 
 pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
 
-pub const TCP_THIN_LINEAR_TIMEOUTS: ::c_int = 16;
-pub const TCP_THIN_DUPACK: ::c_int = 17;
-pub const TCP_USER_TIMEOUT: ::c_int = 18;
-pub const TCP_REPAIR: ::c_int = 19;
-pub const TCP_REPAIR_QUEUE: ::c_int = 20;
-pub const TCP_QUEUE_SEQ: ::c_int = 21;
-pub const TCP_REPAIR_OPTIONS: ::c_int = 22;
-pub const TCP_FASTOPEN: ::c_int = 23;
-pub const TCP_TIMESTAMP: ::c_int = 24;
-
 #[doc(hidden)]
 #[deprecated(since = "0.2.55", note = "Use SIGSYS instead")]
 pub const SIGUNUSED: ::c_int = ::SIGSYS;
@@ -1776,11 +1762,7 @@
     pub fn setrlimit64(resource: ::c_int, rlim: *const rlimit64) -> ::c_int;
     pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;
     pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     pub fn abs(i: ::c_int) -> ::c_int;
     pub fn atof(s: *const ::c_char) -> ::c_double;
@@ -1794,23 +1776,12 @@
     pub fn endpwent();
     pub fn getpwent() -> *mut passwd;
 
-    pub fn shm_open(
-        name: *const c_char,
-        oflag: ::c_int,
-        mode: mode_t,
-    ) -> ::c_int;
+    pub fn shm_open(name: *const c_char, oflag: ::c_int, mode: mode_t) -> ::c_int;
 
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn __errno_location() -> *mut ::c_int;
 
-    pub fn fopen64(
-        filename: *const c_char,
-        mode: *const c_char,
-    ) -> *mut ::FILE;
+    pub fn fopen64(filename: *const c_char, mode: *const c_char) -> *mut ::FILE;
     pub fn freopen64(
         filename: *const c_char,
         mode: *const c_char,
@@ -1819,38 +1790,16 @@
     pub fn tmpfile64() -> *mut ::FILE;
     pub fn fgetpos64(stream: *mut ::FILE, ptr: *mut fpos64_t) -> ::c_int;
     pub fn fsetpos64(stream: *mut ::FILE, ptr: *const fpos64_t) -> ::c_int;
-    pub fn fseeko64(
-        stream: *mut ::FILE,
-        offset: ::off64_t,
-        whence: ::c_int,
-    ) -> ::c_int;
+    pub fn fseeko64(stream: *mut ::FILE, offset: ::off64_t, whence: ::c_int) -> ::c_int;
     pub fn ftello64(stream: *mut ::FILE) -> ::off64_t;
-    pub fn posix_fallocate(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
-    pub fn pwritev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn preadv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
+    pub fn posix_fallocate(fd: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
+    pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
+        -> ::ssize_t;
+    pub fn preadv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t) -> ::ssize_t;
     pub fn dup3(oldfd: ::c_int, newfd: ::c_int, flags: ::c_int) -> ::c_int;
     pub fn mkostemp(template: *mut ::c_char, flags: ::c_int) -> ::c_int;
-    pub fn mkostemps(
-        template: *mut ::c_char,
-        suffixlen: ::c_int,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t)
-        -> *mut ::c_char;
+    pub fn mkostemps(template: *mut ::c_char, suffixlen: ::c_int, flags: ::c_int) -> ::c_int;
+    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t) -> *mut ::c_char;
     pub fn accept4(
         fd: ::c_int,
         addr: *mut ::sockaddr,
@@ -1869,11 +1818,7 @@
     pub fn getloadavg(loadavg: *mut ::c_double, nelem: ::c_int) -> ::c_int;
 
     // Not available now on Android
-    pub fn mkfifoat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
     pub fn if_nameindex() -> *mut if_nameindex;
     pub fn if_freenameindex(ptr: *mut if_nameindex);
 
@@ -1888,35 +1833,21 @@
     pub fn glob(
         pattern: *const c_char,
         flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const c_char, errno: ::c_int) -> ::c_int,
-        >,
+        errfunc: ::Option<extern "C" fn(epath: *const c_char, errno: ::c_int) -> ::c_int>,
         pglob: *mut ::glob_t,
     ) -> ::c_int;
     pub fn globfree(pglob: *mut ::glob_t);
 
-    pub fn posix_madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
     pub fn shm_unlink(name: *const ::c_char) -> ::c_int;
 
     pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long);
 
     pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
-    pub fn madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn msync(addr: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::c_int;
 
     pub fn recvfrom(
         socket: ::c_int,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -116,6 +116,29 @@
             pub struct pthread_rwlock_t {
                 size: [u8; ::__SIZEOF_PTHREAD_RWLOCK_T],
             }
+
+            // linux/can.h
+            #[repr(align(8))]
+            #[allow(missing_debug_implementations)]
+            pub struct can_frame {
+                pub can_id: canid_t,
+                pub can_dlc: u8,
+                __pad: u8,
+                __res0: u8,
+                __res1: u8,
+                pub data: [u8; CAN_MAX_DLEN],
+            }
+
+            #[repr(align(8))]
+            #[allow(missing_debug_implementations)]
+            pub struct canfd_frame {
+                pub can_id: canid_t,
+                pub len: u8,
+                pub flags: u8,
+                __res0: u8,
+                __res1: u8,
+                pub data: [u8; CANFD_MAX_DLEN],
+            }
         }
     };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/generic/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/generic/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/generic/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/generic/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,100 @@
+// include/uapi/asm-generic/socket.h
+// arch/alpha/include/uapi/asm/socket.h
+// tools/include/uapi/asm-generic/socket.h
+// arch/mips/include/uapi/asm/socket.h
+pub const SOL_SOCKET: ::c_int = 1;
+
+// Defined in unix/linux_like/mod.rs
+// pub const SO_DEBUG: ::c_int = 1;
+pub const SO_REUSEADDR: ::c_int = 2;
+pub const SO_TYPE: ::c_int = 3;
+pub const SO_ERROR: ::c_int = 4;
+pub const SO_DONTROUTE: ::c_int = 5;
+pub const SO_BROADCAST: ::c_int = 6;
+pub const SO_SNDBUF: ::c_int = 7;
+pub const SO_RCVBUF: ::c_int = 8;
+pub const SO_KEEPALIVE: ::c_int = 9;
+pub const SO_OOBINLINE: ::c_int = 10;
+pub const SO_NO_CHECK: ::c_int = 11;
+pub const SO_PRIORITY: ::c_int = 12;
+pub const SO_LINGER: ::c_int = 13;
+pub const SO_BSDCOMPAT: ::c_int = 14;
+pub const SO_REUSEPORT: ::c_int = 15;
+pub const SO_PASSCRED: ::c_int = 16;
+pub const SO_PEERCRED: ::c_int = 17;
+pub const SO_RCVLOWAT: ::c_int = 18;
+pub const SO_SNDLOWAT: ::c_int = 19;
+pub const SO_RCVTIMEO: ::c_int = 20;
+pub const SO_SNDTIMEO: ::c_int = 21;
+// pub const SO_RCVTIMEO_OLD: ::c_int = 20;
+// pub const SO_SNDTIMEO_OLD: ::c_int = 21;
+pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
+pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
+pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
+pub const SO_BINDTODEVICE: ::c_int = 25;
+pub const SO_ATTACH_FILTER: ::c_int = 26;
+pub const SO_DETACH_FILTER: ::c_int = 27;
+pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
+pub const SO_PEERNAME: ::c_int = 28;
+pub const SO_TIMESTAMP: ::c_int = 29;
+// pub const SO_TIMESTAMP_OLD: ::c_int = 29;
+pub const SO_ACCEPTCONN: ::c_int = 30;
+pub const SO_PEERSEC: ::c_int = 31;
+pub const SO_SNDBUFFORCE: ::c_int = 32;
+pub const SO_RCVBUFFORCE: ::c_int = 33;
+pub const SO_PASSSEC: ::c_int = 34;
+pub const SO_TIMESTAMPNS: ::c_int = 35;
+// pub const SO_TIMESTAMPNS_OLD: ::c_int = 35;
+pub const SO_MARK: ::c_int = 36;
+pub const SO_TIMESTAMPING: ::c_int = 37;
+// pub const SO_TIMESTAMPING_OLD: ::c_int = 37;
+pub const SO_PROTOCOL: ::c_int = 38;
+pub const SO_DOMAIN: ::c_int = 39;
+pub const SO_RXQ_OVFL: ::c_int = 40;
+pub const SO_WIFI_STATUS: ::c_int = 41;
+pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
+pub const SO_PEEK_OFF: ::c_int = 42;
+pub const SO_NOFCS: ::c_int = 43;
+pub const SO_LOCK_FILTER: ::c_int = 44;
+pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
+pub const SO_BUSY_POLL: ::c_int = 46;
+pub const SO_MAX_PACING_RATE: ::c_int = 47;
+pub const SO_BPF_EXTENSIONS: ::c_int = 48;
+pub const SO_INCOMING_CPU: ::c_int = 49;
+pub const SO_ATTACH_BPF: ::c_int = 50;
+pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
+pub const SO_ATTACH_REUSEPORT_CBPF: ::c_int = 51;
+pub const SO_ATTACH_REUSEPORT_EBPF: ::c_int = 52;
+pub const SO_CNX_ADVICE: ::c_int = 53;
+pub const SCM_TIMESTAMPING_OPT_STATS: ::c_int = 54;
+pub const SO_MEMINFO: ::c_int = 55;
+pub const SO_INCOMING_NAPI_ID: ::c_int = 56;
+pub const SO_COOKIE: ::c_int = 57;
+pub const SCM_TIMESTAMPING_PKTINFO: ::c_int = 58;
+pub const SO_PEERGROUPS: ::c_int = 59;
+pub const SO_ZEROCOPY: ::c_int = 60;
+pub const SO_TXTIME: ::c_int = 61;
+pub const SCM_TXTIME: ::c_int = SO_TXTIME;
+pub const SO_BINDTOIFINDEX: ::c_int = 62;
+cfg_if! {
+    // Some of these platforms in CI already have these constants.
+    // But they may still not have those _OLD ones.
+    if #[cfg(all(any(target_arch = "x86",
+                     target_arch = "x86_64",
+                     target_arch = "aarch64"),
+                 not(target_env = "musl")))] {
+        pub const SO_TIMESTAMP_NEW: ::c_int = 63;
+        pub const SO_TIMESTAMPNS_NEW: ::c_int = 64;
+        pub const SO_TIMESTAMPING_NEW: ::c_int = 65;
+        pub const SO_RCVTIMEO_NEW: ::c_int = 66;
+        pub const SO_SNDTIMEO_NEW: ::c_int = 67;
+        pub const SO_DETACH_REUSEPORT_BPF: ::c_int = 68;
+    }
+}
+// pub const SO_PREFER_BUSY_POLL: ::c_int = 69;
+// pub const SO_BUSY_POLL_BUDGET: ::c_int = 70;
+
+// Defined in unix/linux_like/mod.rs
+// pub const SCM_TIMESTAMP: ::c_int = SO_TIMESTAMP;
+pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
+pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/mips/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/mips/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/mips/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/mips/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+// arch/mips/include/uapi/asm/socket.h
+pub const SOL_SOCKET: ::c_int = 0xffff;
+
+// Defined in unix/linux_like/mod.rs
+// pub const SO_DEBUG: ::c_int = 0x0001;
+pub const SO_REUSEADDR: ::c_int = 0x0004;
+pub const SO_KEEPALIVE: ::c_int = 0x0008;
+pub const SO_DONTROUTE: ::c_int = 0x0010;
+pub const SO_BROADCAST: ::c_int = 0x0020;
+pub const SO_LINGER: ::c_int = 0x0080;
+pub const SO_OOBINLINE: ::c_int = 0x0100;
+pub const SO_REUSEPORT: ::c_int = 0x0200;
+pub const SO_TYPE: ::c_int = 0x1008;
+// pub const SO_STYLE: ::c_int = SO_TYPE;
+pub const SO_ERROR: ::c_int = 0x1007;
+pub const SO_SNDBUF: ::c_int = 0x1001;
+pub const SO_RCVBUF: ::c_int = 0x1002;
+pub const SO_SNDLOWAT: ::c_int = 0x1003;
+pub const SO_RCVLOWAT: ::c_int = 0x1004;
+// NOTE: These definitions are now being renamed with _OLD postfix,
+// but CI haven't support them yet.
+// Some related consts could be found in b32.rs and b64.rs
+pub const SO_SNDTIMEO: ::c_int = 0x1005;
+pub const SO_RCVTIMEO: ::c_int = 0x1006;
+// pub const SO_SNDTIMEO_OLD: ::c_int = 0x1005;
+// pub const SO_RCVTIMEO_OLD: ::c_int = 0x1006;
+pub const SO_ACCEPTCONN: ::c_int = 0x1009;
+pub const SO_PROTOCOL: ::c_int = 0x1028;
+pub const SO_DOMAIN: ::c_int = 0x1029;
+
+pub const SO_NO_CHECK: ::c_int = 11;
+pub const SO_PRIORITY: ::c_int = 12;
+pub const SO_BSDCOMPAT: ::c_int = 14;
+pub const SO_PASSCRED: ::c_int = 17;
+pub const SO_PEERCRED: ::c_int = 18;
+pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
+pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
+pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
+pub const SO_BINDTODEVICE: ::c_int = 25;
+pub const SO_ATTACH_FILTER: ::c_int = 26;
+pub const SO_DETACH_FILTER: ::c_int = 27;
+pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
+pub const SO_PEERNAME: ::c_int = 28;
+pub const SO_PEERSEC: ::c_int = 30;
+pub const SO_SNDBUFFORCE: ::c_int = 31;
+pub const SO_RCVBUFFORCE: ::c_int = 33;
+pub const SO_PASSSEC: ::c_int = 34;
+pub const SO_MARK: ::c_int = 36;
+pub const SO_RXQ_OVFL: ::c_int = 40;
+pub const SO_WIFI_STATUS: ::c_int = 41;
+pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
+pub const SO_PEEK_OFF: ::c_int = 42;
+pub const SO_NOFCS: ::c_int = 43;
+pub const SO_LOCK_FILTER: ::c_int = 44;
+pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
+pub const SO_BUSY_POLL: ::c_int = 46;
+pub const SO_MAX_PACING_RATE: ::c_int = 47;
+pub const SO_BPF_EXTENSIONS: ::c_int = 48;
+pub const SO_INCOMING_CPU: ::c_int = 49;
+pub const SO_ATTACH_BPF: ::c_int = 50;
+pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
+pub const SO_ATTACH_REUSEPORT_CBPF: ::c_int = 51;
+pub const SO_ATTACH_REUSEPORT_EBPF: ::c_int = 52;
+pub const SO_CNX_ADVICE: ::c_int = 53;
+pub const SCM_TIMESTAMPING_OPT_STATS: ::c_int = 54;
+pub const SO_MEMINFO: ::c_int = 55;
+pub const SO_INCOMING_NAPI_ID: ::c_int = 56;
+pub const SO_COOKIE: ::c_int = 57;
+pub const SCM_TIMESTAMPING_PKTINFO: ::c_int = 58;
+pub const SO_PEERGROUPS: ::c_int = 59;
+pub const SO_ZEROCOPY: ::c_int = 60;
+pub const SO_TXTIME: ::c_int = 61;
+pub const SCM_TXTIME: ::c_int = SO_TXTIME;
+pub const SO_BINDTOIFINDEX: ::c_int = 62;
+// NOTE: These definitions are now being renamed with _OLD postfix,
+// but CI haven't support them yet.
+// Some related consts could be found in b32.rs and b64.rs
+pub const SO_TIMESTAMP: ::c_int = 29;
+pub const SO_TIMESTAMPNS: ::c_int = 35;
+pub const SO_TIMESTAMPING: ::c_int = 37;
+// pub const SO_TIMESTAMP_OLD: ::c_int = 29;
+// pub const SO_TIMESTAMPNS_OLD: ::c_int = 35;
+// pub const SO_TIMESTAMPING_OLD: ::c_int = 37;
+// pub const SO_TIMESTAMP_NEW: ::c_int = 63;
+// pub const SO_TIMESTAMPNS_NEW: ::c_int = 64;
+// pub const SO_TIMESTAMPING_NEW: ::c_int = 65;
+// pub const SO_RCVTIMEO_NEW: ::c_int = 66;
+// pub const SO_SNDTIMEO_NEW: ::c_int = 67;
+// pub const SO_DETACH_REUSEPORT_BPF: ::c_int = 68;
+// pub const SO_PREFER_BUSY_POLL: ::c_int = 69;
+// pub const SO_BUSY_POLL_BUDGET: ::c_int = 70;
+
+// Defined in unix/linux_like/mod.rs
+// pub const SCM_TIMESTAMP: ::c_int = SO_TIMESTAMP;
+pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
+pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+cfg_if! {
+    if #[cfg(any(target_arch = "mips", target_arch = "mips64"))] {
+        mod mips;
+        pub use self::mips::*;
+    } else if #[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))] {
+        mod powerpc;
+        pub use self::powerpc::*;
+    } else if #[cfg(any(target_arch = "sparc", target_arch = "sparc64"))] {
+        mod sparc;
+        pub use self::sparc::*;
+    } else {
+        mod generic;
+        pub use self::generic::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/powerpc/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/powerpc/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/powerpc/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/powerpc/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,91 @@
+// arch/powerpc/include/uapi/asm/socket.h
+
+pub const SOL_SOCKET: ::c_int = 1;
+
+// Defined in unix/linux_like/mod.rs
+// pub const SO_DEBUG: ::c_int = 1;
+pub const SO_REUSEADDR: ::c_int = 2;
+pub const SO_TYPE: ::c_int = 3;
+pub const SO_ERROR: ::c_int = 4;
+pub const SO_DONTROUTE: ::c_int = 5;
+pub const SO_BROADCAST: ::c_int = 6;
+pub const SO_SNDBUF: ::c_int = 7;
+pub const SO_RCVBUF: ::c_int = 8;
+pub const SO_KEEPALIVE: ::c_int = 9;
+pub const SO_OOBINLINE: ::c_int = 10;
+pub const SO_NO_CHECK: ::c_int = 11;
+pub const SO_PRIORITY: ::c_int = 12;
+pub const SO_LINGER: ::c_int = 13;
+pub const SO_BSDCOMPAT: ::c_int = 14;
+pub const SO_REUSEPORT: ::c_int = 15;
+// powerpc only differs in these
+pub const SO_RCVLOWAT: ::c_int = 16;
+pub const SO_SNDLOWAT: ::c_int = 17;
+pub const SO_RCVTIMEO: ::c_int = 18;
+pub const SO_SNDTIMEO: ::c_int = 19;
+// pub const SO_RCVTIMEO_OLD: ::c_int = 18;
+// pub const SO_SNDTIMEO_OLD: ::c_int = 19;
+pub const SO_PASSCRED: ::c_int = 20;
+pub const SO_PEERCRED: ::c_int = 21;
+// end
+pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
+pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
+pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
+pub const SO_BINDTODEVICE: ::c_int = 25;
+pub const SO_ATTACH_FILTER: ::c_int = 26;
+pub const SO_DETACH_FILTER: ::c_int = 27;
+pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
+pub const SO_PEERNAME: ::c_int = 28;
+pub const SO_TIMESTAMP: ::c_int = 29;
+// pub const SO_TIMESTAMP_OLD: ::c_int = 29;
+pub const SO_ACCEPTCONN: ::c_int = 30;
+pub const SO_PEERSEC: ::c_int = 31;
+pub const SO_SNDBUFFORCE: ::c_int = 32;
+pub const SO_RCVBUFFORCE: ::c_int = 33;
+pub const SO_PASSSEC: ::c_int = 34;
+pub const SO_TIMESTAMPNS: ::c_int = 35;
+// pub const SO_TIMESTAMPNS_OLD: ::c_int = 35;
+pub const SO_MARK: ::c_int = 36;
+pub const SO_TIMESTAMPING: ::c_int = 37;
+// pub const SO_TIMESTAMPING_OLD: ::c_int = 37;
+pub const SO_PROTOCOL: ::c_int = 38;
+pub const SO_DOMAIN: ::c_int = 39;
+pub const SO_RXQ_OVFL: ::c_int = 40;
+pub const SO_WIFI_STATUS: ::c_int = 41;
+pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
+pub const SO_PEEK_OFF: ::c_int = 42;
+pub const SO_NOFCS: ::c_int = 43;
+pub const SO_LOCK_FILTER: ::c_int = 44;
+pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
+pub const SO_BUSY_POLL: ::c_int = 46;
+pub const SO_MAX_PACING_RATE: ::c_int = 47;
+pub const SO_BPF_EXTENSIONS: ::c_int = 48;
+pub const SO_INCOMING_CPU: ::c_int = 49;
+pub const SO_ATTACH_BPF: ::c_int = 50;
+pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
+pub const SO_ATTACH_REUSEPORT_CBPF: ::c_int = 51;
+pub const SO_ATTACH_REUSEPORT_EBPF: ::c_int = 52;
+pub const SO_CNX_ADVICE: ::c_int = 53;
+pub const SCM_TIMESTAMPING_OPT_STATS: ::c_int = 54;
+pub const SO_MEMINFO: ::c_int = 55;
+pub const SO_INCOMING_NAPI_ID: ::c_int = 56;
+pub const SO_COOKIE: ::c_int = 57;
+pub const SCM_TIMESTAMPING_PKTINFO: ::c_int = 58;
+pub const SO_PEERGROUPS: ::c_int = 59;
+pub const SO_ZEROCOPY: ::c_int = 60;
+pub const SO_TXTIME: ::c_int = 61;
+pub const SCM_TXTIME: ::c_int = SO_TXTIME;
+pub const SO_BINDTOIFINDEX: ::c_int = 62;
+// pub const SO_TIMESTAMP_NEW: ::c_int = 63;
+// pub const SO_TIMESTAMPNS_NEW: ::c_int = 64;
+// pub const SO_TIMESTAMPING_NEW: ::c_int = 65;
+// pub const SO_RCVTIMEO_NEW: ::c_int = 66;
+// pub const SO_SNDTIMEO_NEW: ::c_int = 67;
+// pub const SO_DETACH_REUSEPORT_BPF: ::c_int = 68;
+// pub const SO_PREFER_BUSY_POLL: ::c_int = 69;
+// pub const SO_BUSY_POLL_BUDGET: ::c_int = 70;
+
+// Defined in unix/linux_like/mod.rs
+// pub const SCM_TIMESTAMP: ::c_int = SO_TIMESTAMP;
+pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
+pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/sparc/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/sparc/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/sparc/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/arch/sparc/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,88 @@
+// arch/sparc/include/uapi/asm/socket.h
+pub const SOL_SOCKET: ::c_int = 0xffff;
+
+// Defined in unix/linux_like/mod.rs
+// pub const SO_DEBUG: ::c_int = 0x0001;
+pub const SO_PASSCRED: ::c_int = 0x0002;
+pub const SO_REUSEADDR: ::c_int = 0x0004;
+pub const SO_KEEPALIVE: ::c_int = 0x0008;
+pub const SO_DONTROUTE: ::c_int = 0x0010;
+pub const SO_BROADCAST: ::c_int = 0x0020;
+pub const SO_PEERCRED: ::c_int = 0x0040;
+pub const SO_LINGER: ::c_int = 0x0080;
+pub const SO_OOBINLINE: ::c_int = 0x0100;
+pub const SO_REUSEPORT: ::c_int = 0x0200;
+pub const SO_BSDCOMPAT: ::c_int = 0x0400;
+pub const SO_RCVLOWAT: ::c_int = 0x0800;
+pub const SO_SNDLOWAT: ::c_int = 0x1000;
+pub const SO_RCVTIMEO: ::c_int = 0x2000;
+pub const SO_SNDTIMEO: ::c_int = 0x4000;
+// pub const SO_RCVTIMEO_OLD: ::c_int = 0x2000;
+// pub const SO_SNDTIMEO_OLD: ::c_int = 0x4000;
+pub const SO_ACCEPTCONN: ::c_int = 0x8000;
+pub const SO_SNDBUF: ::c_int = 0x1001;
+pub const SO_RCVBUF: ::c_int = 0x1002;
+pub const SO_SNDBUFFORCE: ::c_int = 0x100a;
+pub const SO_RCVBUFFORCE: ::c_int = 0x100b;
+pub const SO_ERROR: ::c_int = 0x1007;
+pub const SO_TYPE: ::c_int = 0x1008;
+pub const SO_PROTOCOL: ::c_int = 0x1028;
+pub const SO_DOMAIN: ::c_int = 0x1029;
+pub const SO_NO_CHECK: ::c_int = 0x000b;
+pub const SO_PRIORITY: ::c_int = 0x000c;
+pub const SO_BINDTODEVICE: ::c_int = 0x000d;
+pub const SO_ATTACH_FILTER: ::c_int = 0x001a;
+pub const SO_DETACH_FILTER: ::c_int = 0x001b;
+pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
+pub const SO_PEERNAME: ::c_int = 0x001c;
+pub const SO_PEERSEC: ::c_int = 0x001e;
+pub const SO_PASSSEC: ::c_int = 0x001f;
+pub const SO_MARK: ::c_int = 0x0022;
+pub const SO_RXQ_OVFL: ::c_int = 0x0024;
+pub const SO_WIFI_STATUS: ::c_int = 0x0025;
+pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
+pub const SO_PEEK_OFF: ::c_int = 0x0026;
+pub const SO_NOFCS: ::c_int = 0x0027;
+pub const SO_LOCK_FILTER: ::c_int = 0x0028;
+pub const SO_SELECT_ERR_QUEUE: ::c_int = 0x0029;
+pub const SO_BUSY_POLL: ::c_int = 0x0030;
+pub const SO_MAX_PACING_RATE: ::c_int = 0x0031;
+pub const SO_BPF_EXTENSIONS: ::c_int = 0x0032;
+pub const SO_INCOMING_CPU: ::c_int = 0x0033;
+pub const SO_ATTACH_BPF: ::c_int = 0x0034;
+pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
+pub const SO_ATTACH_REUSEPORT_CBPF: ::c_int = 0x0035;
+pub const SO_ATTACH_REUSEPORT_EBPF: ::c_int = 0x0036;
+pub const SO_CNX_ADVICE: ::c_int = 0x0037;
+pub const SCM_TIMESTAMPING_OPT_STATS: ::c_int = 0x0038;
+pub const SO_MEMINFO: ::c_int = 0x0039;
+pub const SO_INCOMING_NAPI_ID: ::c_int = 0x003a;
+pub const SO_COOKIE: ::c_int = 0x003b;
+pub const SCM_TIMESTAMPING_PKTINFO: ::c_int = 0x003c;
+pub const SO_PEERGROUPS: ::c_int = 0x003d;
+pub const SO_ZEROCOPY: ::c_int = 0x003e;
+pub const SO_TXTIME: ::c_int = 0x003f;
+pub const SCM_TXTIME: ::c_int = SO_TXTIME;
+pub const SO_BINDTOIFINDEX: ::c_int = 0x0041;
+pub const SO_SECURITY_AUTHENTICATION: ::c_int = 0x5001;
+pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 0x5002;
+pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 0x5004;
+pub const SO_TIMESTAMP: ::c_int = 0x001d;
+pub const SO_TIMESTAMPNS: ::c_int = 0x0021;
+pub const SO_TIMESTAMPING: ::c_int = 0x0023;
+// pub const SO_TIMESTAMP_OLD: ::c_int = 0x001d;
+// pub const SO_TIMESTAMPNS_OLD: ::c_int = 0x0021;
+// pub const SO_TIMESTAMPING_OLD: ::c_int = 0x0023;
+// pub const SO_TIMESTAMP_NEW: ::c_int = 0x0046;
+// pub const SO_TIMESTAMPNS_NEW: ::c_int = 0x0042;
+// pub const SO_TIMESTAMPING_NEW: ::c_int = 0x0043;
+// pub const SO_RCVTIMEO_NEW: ::c_int = 0x0044;
+// pub const SO_SNDTIMEO_NEW: ::c_int = 0x0045;
+// pub const SO_DETACH_REUSEPORT_BPF: ::c_int = 0x0047;
+// pub const SO_PREFER_BUSY_POLL: ::c_int = 0x0048;
+// pub const SO_BUSY_POLL_BUDGET: ::c_int = 0x0049;
+
+// Defined in unix/linux_like/mod.rs
+// pub const SCM_TIMESTAMP: ::c_int = SO_TIMESTAMP;
+pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
+pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/arm/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/arm/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/arm/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/arm/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -212,9 +212,7 @@
 pub const MAP_STACK: ::c_int = 0x020000;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
-pub const MAP_SYNC : ::c_int = 0x080000;
-
-pub const SOL_SOCKET: ::c_int = 1;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const EDEADLOCK: ::c_int = 35;
 pub const EUCLEAN: ::c_int = 117;
@@ -301,29 +299,6 @@
 pub const EHWPOISON: ::c_int = 133;
 pub const ERFKILL: ::c_int = 132;
 
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-
 pub const SA_SIGINFO: ::c_int = 0x00000004;
 pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
 
@@ -868,8 +843,25 @@
 pub const SYS_pkey_alloc: ::c_long = 395;
 pub const SYS_pkey_free: ::c_long = 396;
 pub const SYS_statx: ::c_long = 397;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 cfg_if! {
     if #[cfg(libc_align)] {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/mips/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/mips/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/mips/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/mips/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -527,8 +527,25 @@
 pub const SYS_pkey_alloc: ::c_long = 4000 + 364;
 pub const SYS_pkey_free: ::c_long = 4000 + 365;
 pub const SYS_statx: ::c_long = 4000 + 366;
+pub const SYS_pidfd_send_signal: ::c_long = 4000 + 424;
+pub const SYS_io_uring_setup: ::c_long = 4000 + 425;
+pub const SYS_io_uring_enter: ::c_long = 4000 + 426;
+pub const SYS_io_uring_register: ::c_long = 4000 + 427;
+pub const SYS_open_tree: ::c_long = 4000 + 428;
+pub const SYS_move_mount: ::c_long = 4000 + 429;
+pub const SYS_fsopen: ::c_long = 4000 + 430;
+pub const SYS_fsconfig: ::c_long = 4000 + 431;
+pub const SYS_fsmount: ::c_long = 4000 + 432;
+pub const SYS_fspick: ::c_long = 4000 + 433;
 pub const SYS_pidfd_open: ::c_long = 4000 + 434;
 pub const SYS_clone3: ::c_long = 4000 + 435;
+pub const SYS_close_range: ::c_long = 4000 + 436;
+pub const SYS_openat2: ::c_long = 4000 + 437;
+pub const SYS_pidfd_getfd: ::c_long = 4000 + 438;
+pub const SYS_faccessat2: ::c_long = 4000 + 439;
+pub const SYS_process_madvise: ::c_long = 4000 + 440;
+pub const SYS_epoll_pwait2: ::c_long = 4000 + 441;
+pub const SYS_mount_setattr: ::c_long = 4000 + 442;
 
 pub const O_DIRECT: ::c_int = 0x8000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
@@ -651,55 +668,6 @@
 pub const SOCK_STREAM: ::c_int = 2;
 pub const SOCK_DGRAM: ::c_int = 1;
 
-pub const SOL_SOCKET: ::c_int = 0xffff;
-
-pub const SO_REUSEADDR: ::c_int = 0x0004;
-pub const SO_KEEPALIVE: ::c_int = 0x0008;
-pub const SO_DONTROUTE: ::c_int = 0x0010;
-pub const SO_BROADCAST: ::c_int = 0x0020;
-pub const SO_LINGER: ::c_int = 0x0080;
-pub const SO_OOBINLINE: ::c_int = 0x0100;
-pub const SO_REUSEPORT: ::c_int = 0x0200;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_STYLE: ::c_int = SO_TYPE;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDLOWAT: ::c_int = 0x1003;
-pub const SO_RCVLOWAT: ::c_int = 0x1004;
-pub const SO_SNDTIMEO: ::c_int = 0x1005;
-pub const SO_RCVTIMEO: ::c_int = 0x1006;
-pub const SO_ACCEPTCONN: ::c_int = 0x1009;
-pub const SO_PROTOCOL: ::c_int = 0x1028;
-pub const SO_DOMAIN: ::c_int = 0x1029;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PASSCRED: ::c_int = 17;
-pub const SO_PEERCRED: ::c_int = 18;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_PEERSEC: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 31;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
-
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
-
 pub const FIOCLEX: ::c_ulong = 0x6601;
 pub const FIONCLEX: ::c_ulong = 0x6602;
 pub const FIONBIO: ::c_ulong = 0x667e;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,6 +14,7 @@
 pub type __fsword_t = i32;
 pub type fsblkcnt64_t = u64;
 pub type fsfilcnt64_t = u64;
+pub type __syscall_ulong_t = ::c_ulong;
 
 cfg_if! {
     if #[cfg(target_arch = "riscv32")] {
@@ -138,11 +139,24 @@
         pub imr_address: ::in_addr,
         pub imr_ifindex: ::c_int,
     }
-}
 
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_TIMESTAMP: ::c_int = 29;
+    pub struct semid_ds {
+        pub sem_perm: ipc_perm,
+        #[cfg(target_arch = "powerpc")]
+        __reserved: ::__syscall_ulong_t,
+        pub sem_otime: ::time_t,
+        #[cfg(not(any(target_arch = "mips", target_arch = "powerpc")))]
+        __reserved: ::__syscall_ulong_t,
+        #[cfg(target_arch = "powerpc")]
+        __reserved2: ::__syscall_ulong_t,
+        pub sem_ctime: ::time_t,
+        #[cfg(not(any(target_arch = "mips", target_arch = "powerpc")))]
+        __reserved2: ::__syscall_ulong_t,
+        pub sem_nsems: ::__syscall_ulong_t,
+        __glibc_reserved3: ::__syscall_ulong_t,
+        __glibc_reserved4: ::__syscall_ulong_t,
+    }
+}
 
 pub const POSIX_FADV_DONTNEED: ::c_int = 4;
 pub const POSIX_FADV_NOREUSE: ::c_int = 5;
@@ -162,11 +176,6 @@
         pub const O_NOATIME: ::c_int = 0x200000;
         pub const O_PATH: ::c_int = 0x1000000;
         pub const O_TMPFILE: ::c_int = 0x2000000 | O_DIRECTORY;
-        pub const SO_BINDTODEVICE: ::c_int = 0x000d;
-        pub const SO_MARK: ::c_int = 0x0022;
-        pub const SO_RXQ_OVFL: ::c_int = 0x0024;
-        pub const SO_PEEK_OFF: ::c_int = 0x0026;
-        pub const SO_BUSY_POLL: ::c_int = 0x0030;
 
         pub const SA_ONSTACK: ::c_int = 1;
 
@@ -213,11 +222,6 @@
         pub const O_NOATIME: ::c_int = 0o1000000;
         pub const O_PATH: ::c_int = 0o10000000;
         pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
-        pub const SO_BINDTODEVICE: ::c_int = 25;
-        pub const SO_MARK: ::c_int = 36;
-        pub const SO_RXQ_OVFL: ::c_int = 40;
-        pub const SO_PEEK_OFF: ::c_int = 42;
-        pub const SO_BUSY_POLL: ::c_int = 46;
 
         pub const SA_ONSTACK: ::c_int = 0x08000000;
 
@@ -321,7 +325,6 @@
 pub const TIOCSBRK: ::c_int = 0x5427;
 pub const TIOCCBRK: ::c_int = 0x5428;
 
-#[link(name = "util")]
 extern "C" {
     pub fn sysctl(
         name: *mut ::c_int,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/powerpc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/powerpc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/powerpc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/powerpc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -213,9 +213,7 @@
 pub const MAP_STACK: ::c_int = 0x020000;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
-pub const MAP_SYNC : ::c_int = 0x080000;
-
-pub const SOL_SOCKET: ::c_int = 1;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const EDEADLOCK: ::c_int = 58;
 pub const EUCLEAN: ::c_int = 117;
@@ -302,30 +300,6 @@
 pub const EHWPOISON: ::c_int = 133;
 pub const ERFKILL: ::c_int = 132;
 
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_RCVLOWAT: ::c_int = 16;
-pub const SO_SNDLOWAT: ::c_int = 17;
-pub const SO_RCVTIMEO: ::c_int = 18;
-pub const SO_SNDTIMEO: ::c_int = 19;
-pub const SO_PASSCRED: ::c_int = 20;
-pub const SO_PEERCRED: ::c_int = 21;
-
 pub const SA_SIGINFO: ::c_int = 0x00000004;
 pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
 
@@ -872,5 +846,22 @@
 pub const SYS_pwritev2: ::c_long = 381;
 pub const SYS_kexec_file_load: ::c_long = 382;
 pub const SYS_statx: ::c_long = 383;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -300,51 +300,7 @@
 pub const ENOTRECOVERABLE: ::c_int = 131;
 pub const EHWPOISON: ::c_int = 133;
 pub const ERFKILL: ::c_int = 132;
-pub const SOL_SOCKET: ::c_int = 1;
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = 26;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_PEERSEC: ::c_int = 31;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = 35;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = 41;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_DETACH_BPF: ::c_int = 27;
+
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 pub const SA_SIGINFO: ::c_int = 4;
@@ -417,7 +373,7 @@
 pub const MAP_POPULATE: ::c_int = 32768;
 pub const MAP_NONBLOCK: ::c_int = 65536;
 pub const MAP_STACK: ::c_int = 131072;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 pub const EDEADLOCK: ::c_int = 35;
 pub const EUCLEAN: ::c_int = 117;
 pub const ENOTNAM: ::c_int = 118;
@@ -818,3 +774,22 @@
 pub const SYS_pkey_alloc: ::c_long = 289;
 pub const SYS_pkey_free: ::c_long = 290;
 pub const SYS_statx: ::c_long = 291;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
+pub const SYS_pidfd_open: ::c_long = 434;
+pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -239,7 +239,7 @@
 pub const MAP_NONBLOCK: ::c_int = 0x010000;
 pub const MAP_STACK: ::c_int = 0x020000;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const EDEADLK: ::c_int = 78;
 pub const ENAMETOOLONG: ::c_int = 63;
@@ -320,25 +320,6 @@
 pub const EHWPOISON: ::c_int = 135;
 pub const ERFKILL: ::c_int = 134;
 
-pub const SOL_SOCKET: ::c_int = 0xffff;
-
-pub const SO_PASSCRED: ::c_int = 2;
-pub const SO_REUSEADDR: ::c_int = 4;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_DONTROUTE: ::c_int = 16;
-pub const SO_BROADCAST: ::c_int = 32;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDBUFFORCE: ::c_int = 0x100a;
-pub const SO_RCVBUFFORCE: ::c_int = 0x100b;
-pub const SO_DOMAIN: ::c_int = 0x1029;
-pub const SO_KEEPALIVE: ::c_int = 8;
-pub const SO_OOBINLINE: ::c_int = 0x100;
-pub const SO_LINGER: ::c_int = 128;
-pub const SO_REUSEPORT: ::c_int = 0x200;
-pub const SO_ACCEPTCONN: ::c_int = 0x8000;
-
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 
@@ -420,12 +401,6 @@
 pub const EISNAM: ::c_int = 120;
 pub const EREMOTEIO: ::c_int = 121;
 
-pub const SO_PEERCRED: ::c_int = 0x40;
-pub const SO_RCVLOWAT: ::c_int = 0x800;
-pub const SO_SNDLOWAT: ::c_int = 0x1000;
-pub const SO_RCVTIMEO: ::c_int = 0x2000;
-pub const SO_SNDTIMEO: ::c_int = 0x4000;
-
 pub const FIOCLEX: ::c_ulong = 0x20006601;
 pub const FIONCLEX: ::c_ulong = 0x20006602;
 pub const FIONBIO: ::c_ulong = 0x8004667e;
@@ -906,9 +881,26 @@
 pub const SYS_preadv2: ::c_long = 358;
 pub const SYS_pwritev2: ::c_long = 359;
 pub const SYS_statx: ::c_long = 360;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 // Reserved in the kernel, but not actually implemented yet
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 cfg_if! {
     if #[cfg(libc_align)] {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/x86/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/x86/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/x86/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b32/x86/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -401,8 +401,6 @@
 pub const RLIMIT_AS: ::__rlimit_resource_t = 9;
 pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 8;
 
-pub const SOL_SOCKET: ::c_int = 1;
-
 pub const MADV_SOFT_OFFLINE: ::c_int = 101;
 pub const MAP_LOCKED: ::c_int = 0x02000;
 pub const MAP_NORESERVE: ::c_int = 0x04000;
@@ -416,7 +414,7 @@
 pub const MAP_STACK: ::c_int = 0x020000;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const EDEADLOCK: ::c_int = 35;
 pub const EUCLEAN: ::c_int = 117;
@@ -503,30 +501,6 @@
 pub const EHWPOISON: ::c_int = 133;
 pub const ERFKILL: ::c_int = 132;
 
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
-
 pub const SA_SIGINFO: ::c_int = 0x00000004;
 pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
 
@@ -1103,8 +1077,25 @@
 pub const SYS_pkey_alloc: ::c_long = 381;
 pub const SYS_pkey_free: ::c_long = 382;
 pub const SYS_statx: ::c_long = 383;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 // offsets in user_regs_structs, from sys/reg.h
 pub const EBX: ::c_int = 0;
@@ -1149,16 +1140,8 @@
 extern "C" {
     pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int;
     pub fn setcontext(ucp: *const ucontext_t) -> ::c_int;
-    pub fn makecontext(
-        ucp: *mut ucontext_t,
-        func: extern "C" fn(),
-        argc: ::c_int,
-        ...
-    );
-    pub fn swapcontext(
-        uocp: *mut ucontext_t,
-        ucp: *const ucontext_t,
-    ) -> ::c_int;
+    pub fn makecontext(ucp: *mut ucontext_t, func: extern "C" fn(), argc: ::c_int, ...);
+    pub fn swapcontext(uocp: *mut ucontext_t, ucp: *const ucontext_t) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,62 @@
+use pthread_mutex_t;
+
+pub type c_long = i32;
+pub type c_ulong = u32;
+
+pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 32;
+pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 48;
+
+align_const! {
+    #[cfg(target_endian = "little")]
+    pub const PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "little")]
+    pub const PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "little")]
+    pub const PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "big")]
+    pub const PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "big")]
+    pub const PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "big")]
+    pub const PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        };
+}
+
+pub const SYS_sync_file_range2: ::c_long = 84;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,71 @@
+use pthread_mutex_t;
+
+pub type c_long = i64;
+pub type c_ulong = u64;
+
+pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 8;
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 48;
+pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 8;
+pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
+
+align_const! {
+    #[cfg(target_endian = "little")]
+    pub const PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "little")]
+    pub const PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "little")]
+    pub const PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "big")]
+    pub const PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "big")]
+    pub const PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        };
+    #[cfg(target_endian = "big")]
+    pub const PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
+        pthread_mutex_t {
+            size: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        };
+}
+
+pub const SYS_renameat: ::c_long = 38;
+pub const SYS_sync_file_range: ::c_long = 84;
+pub const SYS_getrlimit: ::c_long = 163;
+pub const SYS_setrlimit: ::c_long = 164;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,5 @@
 //! AArch64-specific definitions for 64-bit linux-like values
 
-use pthread_mutex_t;
-
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type c_char = u8;
 pub type wchar_t = u32;
 pub type nlink_t = u32;
@@ -143,7 +139,7 @@
     }
 
     pub struct pthread_attr_t {
-        __size: [u64; 8]
+        __size: [usize; 8]
     }
 
     pub struct ipc_perm {
@@ -212,7 +208,6 @@
 }
 
 pub const VEOF: usize = 4;
-pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
 
 pub const RTLD_DEEPBIND: ::c_int = 0x8;
 pub const RTLD_GLOBAL: ::c_int = 0x100;
@@ -327,80 +322,6 @@
 pub const POSIX_FADV_DONTNEED: ::c_int = 4;
 pub const POSIX_FADV_NOREUSE: ::c_int = 5;
 
-pub const SOL_SOCKET: ::c_int = 1;
-
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_BINDTODEVICE: ::c_int = 25;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_TIMESTAMP: ::c_int = 29;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_PEERSEC: ::c_int = 31;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
-pub const SO_MARK: ::c_int = 36;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_RXQ_OVFL: ::c_int = 40;
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
-pub const SO_PEEK_OFF: ::c_int = 42;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_BUSY_POLL: ::c_int = 46;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
-pub const SO_ATTACH_REUSEPORT_CBPF: ::c_int = 51;
-pub const SO_ATTACH_REUSEPORT_EBPF: ::c_int = 52;
-pub const SO_CNX_ADVICE: ::c_int = 53;
-pub const SCM_TIMESTAMPING_OPT_STATS: ::c_int = 54;
-pub const SO_MEMINFO: ::c_int = 55;
-pub const SO_INCOMING_NAPI_ID: ::c_int = 56;
-pub const SO_COOKIE: ::c_int = 57;
-pub const SCM_TIMESTAMPING_PKTINFO: ::c_int = 58;
-pub const SO_PEERGROUPS: ::c_int = 59;
-pub const SO_ZEROCOPY: ::c_int = 60;
-pub const SO_TXTIME: ::c_int = 61;
-pub const SCM_TXTIME: ::c_int = SO_TXTIME;
-pub const SO_BINDTOIFINDEX: ::c_int = 62;
-pub const SO_TIMESTAMP_NEW: ::c_int = 63;
-pub const SO_TIMESTAMPNS_NEW: ::c_int = 64;
-pub const SO_TIMESTAMPING_NEW: ::c_int = 65;
-pub const SO_RCVTIMEO_NEW: ::c_int = 66;
-pub const SO_SNDTIMEO_NEW: ::c_int = 67;
-pub const SO_DETACH_REUSEPORT_BPF: ::c_int = 68;
-
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 
@@ -514,37 +435,6 @@
 
 pub const EFD_CLOEXEC: ::c_int = 0x80000;
 
-pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 8;
-pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 48;
-pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 8;
-
-align_const! {
-    pub const PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
-        pthread_mutex_t {
-            size: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0,
-            ],
-        };
-    pub const PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
-        pthread_mutex_t {
-            size: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0,
-            ],
-        };
-    pub const PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP: ::pthread_mutex_t =
-        pthread_mutex_t {
-            size: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0,
-            ],
-        };
-}
-
 pub const O_DIRECT: ::c_int = 0x10000;
 pub const O_DIRECTORY: ::c_int = 0x4000;
 pub const O_NOFOLLOW: ::c_int = 0x8000;
@@ -776,7 +666,7 @@
 pub const SYS_unlinkat: ::c_long = 35;
 pub const SYS_symlinkat: ::c_long = 36;
 pub const SYS_linkat: ::c_long = 37;
-pub const SYS_renameat: ::c_long = 38;
+// 38 is renameat only on LP64
 pub const SYS_umount2: ::c_long = 39;
 pub const SYS_mount: ::c_long = 40;
 pub const SYS_pivot_root: ::c_long = 41;
@@ -821,7 +711,7 @@
 pub const SYS_sync: ::c_long = 81;
 pub const SYS_fsync: ::c_long = 82;
 pub const SYS_fdatasync: ::c_long = 83;
-pub const SYS_sync_file_range: ::c_long = 84;
+// 84 sync_file_range on LP64 and sync_file_range2 on ILP32
 pub const SYS_timerfd_create: ::c_long = 85;
 pub const SYS_timerfd_settime: ::c_long = 86;
 pub const SYS_timerfd_gettime: ::c_long = 87;
@@ -900,8 +790,8 @@
 pub const SYS_uname: ::c_long = 160;
 pub const SYS_sethostname: ::c_long = 161;
 pub const SYS_setdomainname: ::c_long = 162;
-pub const SYS_getrlimit: ::c_long = 163;
-pub const SYS_setrlimit: ::c_long = 164;
+// 163 is getrlimit only on LP64
+// 164 is setrlimit only on LP64
 pub const SYS_getrusage: ::c_long = 165;
 pub const SYS_umask: ::c_long = 166;
 pub const SYS_prctl: ::c_long = 167;
@@ -1012,10 +902,26 @@
 pub const SYS_pkey_alloc: ::c_long = 289;
 pub const SYS_pkey_free: ::c_long = 290;
 pub const SYS_statx: ::c_long = 291;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
-#[link(name = "util")]
 extern "C" {
     pub fn sysctl(
         name: *mut ::c_int,
@@ -1028,6 +934,16 @@
 }
 
 cfg_if! {
+    if #[cfg(target_pointer_width = "32")] {
+        mod ilp32;
+        pub use self::ilp32::*;
+    } else {
+        mod lp64;
+        pub use self::lp64::*;
+    }
+}
+
+cfg_if! {
     if #[cfg(libc_align)] {
         mod align;
         pub use self::align::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -577,8 +577,25 @@
 pub const SYS_pkey_alloc: ::c_long = 5000 + 324;
 pub const SYS_pkey_free: ::c_long = 5000 + 325;
 pub const SYS_statx: ::c_long = 5000 + 326;
+pub const SYS_pidfd_send_signal: ::c_long = 5000 + 424;
+pub const SYS_io_uring_setup: ::c_long = 5000 + 425;
+pub const SYS_io_uring_enter: ::c_long = 5000 + 426;
+pub const SYS_io_uring_register: ::c_long = 5000 + 427;
+pub const SYS_open_tree: ::c_long = 5000 + 428;
+pub const SYS_move_mount: ::c_long = 5000 + 429;
+pub const SYS_fsopen: ::c_long = 5000 + 430;
+pub const SYS_fsconfig: ::c_long = 5000 + 431;
+pub const SYS_fsmount: ::c_long = 5000 + 432;
+pub const SYS_fspick: ::c_long = 5000 + 433;
 pub const SYS_pidfd_open: ::c_long = 5000 + 434;
 pub const SYS_clone3: ::c_long = 5000 + 435;
+pub const SYS_close_range: ::c_long = 5000 + 436;
+pub const SYS_openat2: ::c_long = 5000 + 437;
+pub const SYS_pidfd_getfd: ::c_long = 5000 + 438;
+pub const SYS_faccessat2: ::c_long = 5000 + 439;
+pub const SYS_process_madvise: ::c_long = 5000 + 440;
+pub const SYS_epoll_pwait2: ::c_long = 5000 + 441;
+pub const SYS_mount_setattr: ::c_long = 5000 + 442;
 
 pub const SFD_CLOEXEC: ::c_int = 0x080000;
 
@@ -739,62 +756,6 @@
 pub const SOCK_STREAM: ::c_int = 2;
 pub const SOCK_DGRAM: ::c_int = 1;
 
-pub const SOL_SOCKET: ::c_int = 0xffff;
-
-pub const SO_REUSEADDR: ::c_int = 0x0004;
-pub const SO_KEEPALIVE: ::c_int = 0x0008;
-pub const SO_DONTROUTE: ::c_int = 0x0010;
-pub const SO_BROADCAST: ::c_int = 0x0020;
-pub const SO_LINGER: ::c_int = 0x0080;
-pub const SO_OOBINLINE: ::c_int = 0x0100;
-pub const SO_REUSEPORT: ::c_int = 0x0200;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_STYLE: ::c_int = SO_TYPE;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDLOWAT: ::c_int = 0x1003;
-pub const SO_RCVLOWAT: ::c_int = 0x1004;
-pub const SO_SNDTIMEO: ::c_int = 0x1005;
-pub const SO_RCVTIMEO: ::c_int = 0x1006;
-pub const SO_ACCEPTCONN: ::c_int = 0x1009;
-pub const SO_PROTOCOL: ::c_int = 0x1028;
-pub const SO_DOMAIN: ::c_int = 0x1029;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_PASSCRED: ::c_int = 17;
-pub const SO_PEERCRED: ::c_int = 18;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_BINDTODEVICE: ::c_int = 25;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_TIMESTAMP: ::c_int = 29;
-pub const SO_PEERSEC: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 31;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
-pub const SO_MARK: ::c_int = 36;
-pub const SO_RXQ_OVFL: ::c_int = 40;
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
-pub const SO_PEEK_OFF: ::c_int = 42;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_BUSY_POLL: ::c_int = 46;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
-
 pub const FIOCLEX: ::c_ulong = 0x6601;
 pub const FIONCLEX: ::c_ulong = 0x6602;
 pub const FIONBIO: ::c_ulong = 0x667e;
@@ -1004,7 +965,6 @@
 
 pub const EHWPOISON: ::c_int = 168;
 
-#[link(name = "util")]
 extern "C" {
     pub fn sysctl(
         name: *mut ::c_int,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,5 @@
 //! 64-bit specific definitions for linux-like values
 
-pub type clock_t = i64;
-pub type time_t = i64;
 pub type ino_t = u64;
 pub type off_t = i64;
 pub type blkcnt_t = i64;
@@ -11,7 +9,22 @@
 pub type fsblkcnt_t = u64;
 pub type fsfilcnt_t = u64;
 pub type rlim_t = u64;
-pub type __fsword_t = i64;
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
+pub type __syscall_ulong_t = ::c_ulonglong;
+#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
+pub type __syscall_ulong_t = ::c_ulong;
+
+cfg_if! {
+    if #[cfg(all(target_arch = "aarch64", target_pointer_width = "32"))] {
+        pub type clock_t = i32;
+        pub type time_t = i32;
+        pub type __fsword_t = i32;
+    } else {
+        pub type __fsword_t = i64;
+        pub type clock_t = i64;
+        pub type time_t = i64;
+    }
+}
 
 s! {
     pub struct sigset_t {
@@ -52,6 +65,28 @@
         __glibc_reserved5: u64,
     }
 
+    pub struct semid_ds {
+        pub sem_perm: ipc_perm,
+        pub sem_otime: ::time_t,
+        #[cfg(not(any(
+            target_arch = "aarch64",
+            target_arch = "mips64",
+            target_arch = "powerpc64",
+            target_arch = "riscv64",
+            target_arch = "sparc64")))]
+        __reserved: ::__syscall_ulong_t,
+        pub sem_ctime: ::time_t,
+        #[cfg(not(any(
+            target_arch = "aarch64",
+            target_arch = "mips64",
+            target_arch = "powerpc64",
+            target_arch = "riscv64",
+            target_arch = "sparc64")))]
+        __reserved2: ::__syscall_ulong_t,
+        pub sem_nsems: ::__syscall_ulong_t,
+        __glibc_reserved3: ::__syscall_ulong_t,
+        __glibc_reserved4: ::__syscall_ulong_t,
+    }
 }
 
 pub const RLIM_INFINITY: ::rlim_t = !0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -319,61 +319,6 @@
 pub const EHWPOISON: ::c_int = 133;
 pub const ERFKILL: ::c_int = 132;
 
-pub const SOL_SOCKET: ::c_int = 1;
-
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_PASSCRED: ::c_int = 20;
-pub const SO_PEERCRED: ::c_int = 21;
-pub const SO_RCVLOWAT: ::c_int = 16;
-pub const SO_SNDLOWAT: ::c_int = 17;
-pub const SO_RCVTIMEO: ::c_int = 18;
-pub const SO_SNDTIMEO: ::c_int = 19;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_BINDTODEVICE: ::c_int = 25;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_TIMESTAMP: ::c_int = 29;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_PEERSEC: ::c_int = 31;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
-pub const SO_MARK: ::c_int = 36;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_RXQ_OVFL: ::c_int = 40;
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
-pub const SO_PEEK_OFF: ::c_int = 42;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_BUSY_POLL: ::c_int = 46;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
-
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 
@@ -552,7 +497,7 @@
 
 pub const MAP_LOCKED: ::c_int = 0x00080;
 pub const MAP_NORESERVE: ::c_int = 0x00040;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const EDEADLOCK: ::c_int = 58;
 pub const EUCLEAN: ::c_int = 117;
@@ -1043,10 +988,26 @@
 pub const SYS_pwritev2: ::c_long = 381;
 pub const SYS_kexec_file_load: ::c_long = 382;
 pub const SYS_statx: ::c_long = 383;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
-#[link(name = "util")]
 extern "C" {
     pub fn sysctl(
         name: *mut ::c_int,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -305,59 +305,7 @@
 pub const ENOTRECOVERABLE: ::c_int = 131;
 pub const EHWPOISON: ::c_int = 133;
 pub const ERFKILL: ::c_int = 132;
-pub const SOL_SOCKET: ::c_int = 1;
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_BINDTODEVICE: ::c_int = 25;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = 26;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_TIMESTAMP: ::c_int = 29;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_PEERSEC: ::c_int = 31;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = 35;
-pub const SO_MARK: ::c_int = 36;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_RXQ_OVFL: ::c_int = 40;
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = 41;
-pub const SO_PEEK_OFF: ::c_int = 42;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_BUSY_POLL: ::c_int = 46;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_DETACH_BPF: ::c_int = 27;
+
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 pub const SA_ONSTACK: ::c_int = 134217728;
@@ -463,7 +411,7 @@
 pub const MAP_POPULATE: ::c_int = 32768;
 pub const MAP_NONBLOCK: ::c_int = 65536;
 pub const MAP_STACK: ::c_int = 131072;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 pub const EDEADLOCK: ::c_int = 35;
 pub const EUCLEAN: ::c_int = 117;
 pub const ENOTNAM: ::c_int = 118;
@@ -863,5 +811,22 @@
 pub const SYS_pkey_alloc: ::c_long = 289;
 pub const SYS_pkey_free: ::c_long = 290;
 pub const SYS_statx: ::c_long = 291;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/s390x.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/s390x.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/s390x.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/s390x.rs	2021-12-09 12:01:26.000000000 +0000
@@ -354,20 +354,6 @@
 pub const SIGSTKSZ: ::size_t = 0x2000;
 pub const MINSIGSTKSZ: ::size_t = 2048;
 pub const SIG_SETMASK: ::c_int = 2;
-pub const SOL_SOCKET: ::c_int = 1;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_BINDTODEVICE: ::c_int = 25;
-pub const SO_TIMESTAMP: ::c_int = 29;
-pub const SO_MARK: ::c_int = 36;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_RXQ_OVFL: ::c_int = 40;
-pub const SO_PEEK_OFF: ::c_int = 42;
-pub const SO_BUSY_POLL: ::c_int = 46;
 
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
@@ -471,24 +457,6 @@
 pub const EHWPOISON: ::c_int = 133;
 pub const ERFKILL: ::c_int = 132;
 
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-
 pub const SIGTTIN: ::c_int = 21;
 pub const SIGTTOU: ::c_int = 22;
 pub const SIGXCPU: ::c_int = 24;
@@ -1007,10 +975,26 @@
 pub const SYS_setfsgid: ::c_long = 216;
 pub const SYS_newfstatat: ::c_long = 293;
 pub const SYS_statx: ::c_long = 379;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
-#[link(name = "util")]
 extern "C" {
 
     pub fn sysctl(
@@ -1023,14 +1007,6 @@
     ) -> ::c_int;
     pub fn getcontext(ucp: *mut ::ucontext_t) -> ::c_int;
     pub fn setcontext(ucp: *const ::ucontext_t) -> ::c_int;
-    pub fn makecontext(
-        ucp: *mut ::ucontext_t,
-        func: extern "C" fn(),
-        argc: ::c_int,
-        ...
-    );
-    pub fn swapcontext(
-        uocp: *mut ::ucontext_t,
-        ucp: *const ::ucontext_t,
-    ) -> ::c_int;
+    pub fn makecontext(ucp: *mut ::ucontext_t, func: extern "C" fn(), argc: ::c_int, ...);
+    pub fn swapcontext(uocp: *mut ::ucontext_t, ucp: *const ::ucontext_t) -> ::c_int;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -247,7 +247,7 @@
 pub const MAP_NONBLOCK: ::c_int = 0x010000;
 pub const MAP_STACK: ::c_int = 0x020000;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const EDEADLK: ::c_int = 78;
 pub const ENAMETOOLONG: ::c_int = 63;
@@ -328,31 +328,6 @@
 pub const EHWPOISON: ::c_int = 135;
 pub const ERFKILL: ::c_int = 134;
 
-pub const SOL_SOCKET: ::c_int = 0xffff;
-
-pub const SO_PASSCRED: ::c_int = 2;
-pub const SO_REUSEADDR: ::c_int = 4;
-pub const SO_BINDTODEVICE: ::c_int = 0x000d;
-pub const SO_TIMESTAMP: ::c_int = 0x001d;
-pub const SO_MARK: ::c_int = 0x0022;
-pub const SO_RXQ_OVFL: ::c_int = 0x0024;
-pub const SO_PEEK_OFF: ::c_int = 0x0026;
-pub const SO_BUSY_POLL: ::c_int = 0x0030;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_DONTROUTE: ::c_int = 16;
-pub const SO_BROADCAST: ::c_int = 32;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDBUFFORCE: ::c_int = 0x100a;
-pub const SO_RCVBUFFORCE: ::c_int = 0x100b;
-pub const SO_DOMAIN: ::c_int = 0x1029;
-pub const SO_KEEPALIVE: ::c_int = 8;
-pub const SO_OOBINLINE: ::c_int = 0x100;
-pub const SO_LINGER: ::c_int = 128;
-pub const SO_REUSEPORT: ::c_int = 0x200;
-pub const SO_ACCEPTCONN: ::c_int = 0x8000;
-
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 
@@ -505,12 +480,6 @@
 pub const EISNAM: ::c_int = 120;
 pub const EREMOTEIO: ::c_int = 121;
 
-pub const SO_PEERCRED: ::c_int = 0x40;
-pub const SO_RCVLOWAT: ::c_int = 0x800;
-pub const SO_SNDLOWAT: ::c_int = 0x1000;
-pub const SO_RCVTIMEO: ::c_int = 0x2000;
-pub const SO_SNDTIMEO: ::c_int = 0x4000;
-
 pub const FIOCLEX: ::c_ulong = 0x20006601;
 pub const FIONCLEX: ::c_ulong = 0x20006602;
 pub const FIONBIO: ::c_ulong = 0x8004667e;
@@ -973,11 +942,27 @@
 pub const SYS_preadv2: ::c_long = 358;
 pub const SYS_pwritev2: ::c_long = 359;
 pub const SYS_statx: ::c_long = 360;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 // Reserved in the kernel, but not actually implemented yet
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
-#[link(name = "util")]
 extern "C" {
     pub fn sysctl(
         name: *mut ::c_int,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -515,80 +515,6 @@
 pub const EHWPOISON: ::c_int = 133;
 pub const ERFKILL: ::c_int = 132;
 
-pub const SOL_SOCKET: ::c_int = 1;
-
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_BINDTODEVICE: ::c_int = 25;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_TIMESTAMP: ::c_int = 29;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_PEERSEC: ::c_int = 31;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
-pub const SO_MARK: ::c_int = 36;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_RXQ_OVFL: ::c_int = 40;
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
-pub const SO_PEEK_OFF: ::c_int = 42;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_BUSY_POLL: ::c_int = 46;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
-pub const SO_ATTACH_REUSEPORT_CBPF: ::c_int = 51;
-pub const SO_ATTACH_REUSEPORT_EBPF: ::c_int = 52;
-pub const SO_CNX_ADVICE: ::c_int = 53;
-pub const SCM_TIMESTAMPING_OPT_STATS: ::c_int = 54;
-pub const SO_MEMINFO: ::c_int = 55;
-pub const SO_INCOMING_NAPI_ID: ::c_int = 56;
-pub const SO_COOKIE: ::c_int = 57;
-pub const SCM_TIMESTAMPING_PKTINFO: ::c_int = 58;
-pub const SO_PEERGROUPS: ::c_int = 59;
-pub const SO_ZEROCOPY: ::c_int = 60;
-pub const SO_TXTIME: ::c_int = 61;
-pub const SCM_TXTIME: ::c_int = SO_TXTIME;
-pub const SO_BINDTOIFINDEX: ::c_int = 62;
-pub const SO_TIMESTAMP_NEW: ::c_int = 63;
-pub const SO_TIMESTAMPNS_NEW: ::c_int = 64;
-pub const SO_TIMESTAMPING_NEW: ::c_int = 65;
-pub const SO_RCVTIMEO_NEW: ::c_int = 66;
-pub const SO_SNDTIMEO_NEW: ::c_int = 67;
-pub const SO_DETACH_REUSEPORT_BPF: ::c_int = 68;
-
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 
@@ -720,7 +646,7 @@
 pub const MAP_POPULATE: ::c_int = 0x08000;
 pub const MAP_NONBLOCK: ::c_int = 0x010000;
 pub const MAP_STACK: ::c_int = 0x020000;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const EDEADLOCK: ::c_int = 35;
 pub const EUCLEAN: ::c_int = 117;
@@ -920,22 +846,10 @@
 extern "C" {
     pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int;
     pub fn setcontext(ucp: *const ucontext_t) -> ::c_int;
-    pub fn makecontext(
-        ucp: *mut ucontext_t,
-        func: extern "C" fn(),
-        argc: ::c_int,
-        ...
-    );
-    pub fn swapcontext(
-        uocp: *mut ucontext_t,
-        ucp: *const ucontext_t,
-    ) -> ::c_int;
+    pub fn makecontext(ucp: *mut ucontext_t, func: extern "C" fn(), argc: ::c_int, ...);
+    pub fn swapcontext(uocp: *mut ucontext_t, ucp: *const ucontext_t) -> ::c_int;
     pub fn iopl(level: ::c_int) -> ::c_int;
-    pub fn ioperm(
-        from: ::c_ulong,
-        num: ::c_ulong,
-        turn_on: ::c_int,
-    ) -> ::c_int;
+    pub fn ioperm(from: ::c_ulong, num: ::c_ulong, turn_on: ::c_int) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs	2021-12-09 12:01:26.000000000 +0000
@@ -409,8 +409,25 @@
 pub const SYS_pkey_alloc: ::c_long = 330;
 pub const SYS_pkey_free: ::c_long = 331;
 pub const SYS_statx: ::c_long = 332;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 extern "C" {
     pub fn sysctl(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs	2021-12-09 12:01:26.000000000 +0000
@@ -337,8 +337,25 @@
 pub const SYS_pkey_alloc: ::c_long = __X32_SYSCALL_BIT + 330;
 pub const SYS_pkey_free: ::c_long = __X32_SYSCALL_BIT + 331;
 pub const SYS_statx: ::c_long = __X32_SYSCALL_BIT + 332;
+pub const SYS_pidfd_send_signal: ::c_long = __X32_SYSCALL_BIT + 424;
+pub const SYS_io_uring_setup: ::c_long = __X32_SYSCALL_BIT + 425;
+pub const SYS_io_uring_enter: ::c_long = __X32_SYSCALL_BIT + 426;
+pub const SYS_io_uring_register: ::c_long = __X32_SYSCALL_BIT + 427;
+pub const SYS_open_tree: ::c_long = __X32_SYSCALL_BIT + 428;
+pub const SYS_move_mount: ::c_long = __X32_SYSCALL_BIT + 429;
+pub const SYS_fsopen: ::c_long = __X32_SYSCALL_BIT + 430;
+pub const SYS_fsconfig: ::c_long = __X32_SYSCALL_BIT + 431;
+pub const SYS_fsmount: ::c_long = __X32_SYSCALL_BIT + 432;
+pub const SYS_fspick: ::c_long = __X32_SYSCALL_BIT + 433;
 pub const SYS_pidfd_open: ::c_long = __X32_SYSCALL_BIT + 434;
 pub const SYS_clone3: ::c_long = __X32_SYSCALL_BIT + 435;
+pub const SYS_close_range: ::c_long = __X32_SYSCALL_BIT + 436;
+pub const SYS_openat2: ::c_long = __X32_SYSCALL_BIT + 437;
+pub const SYS_pidfd_getfd: ::c_long = __X32_SYSCALL_BIT + 438;
+pub const SYS_faccessat2: ::c_long = __X32_SYSCALL_BIT + 439;
+pub const SYS_process_madvise: ::c_long = __X32_SYSCALL_BIT + 440;
+pub const SYS_epoll_pwait2: ::c_long = __X32_SYSCALL_BIT + 441;
+pub const SYS_mount_setattr: ::c_long = __X32_SYSCALL_BIT + 442;
 pub const SYS_rt_sigaction: ::c_long = __X32_SYSCALL_BIT + 512;
 pub const SYS_rt_sigreturn: ::c_long = __X32_SYSCALL_BIT + 513;
 pub const SYS_ioctl: ::c_long = __X32_SYSCALL_BIT + 514;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/gnu/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
         pub stx_uid: u32,
         pub stx_gid: u32,
         pub stx_mode: u16,
-        pub __statx_pad1: [u16; 1],
+        __statx_pad1: [u16; 1],
         pub stx_ino: u64,
         pub stx_size: u64,
         pub stx_blocks: u64,
@@ -26,7 +26,9 @@
         pub stx_rdev_minor: u32,
         pub stx_dev_major: u32,
         pub stx_dev_minor: u32,
-        pub __statx_pad2: [u64; 14],
+        pub stx_mnt_id: u64,
+        __statx_pad2: u64,
+        __statx_pad3: [u64; 12],
     }
 
     pub struct statx_timestamp {
@@ -126,6 +128,19 @@
         pub keepcost: ::c_int,
     }
 
+    pub struct mallinfo2 {
+        pub arena: ::size_t,
+        pub ordblks: ::size_t,
+        pub smblks: ::size_t,
+        pub hblks: ::size_t,
+        pub hblkhd: ::size_t,
+        pub usmblks: ::size_t,
+        pub fsmblks: ::size_t,
+        pub uordblks: ::size_t,
+        pub fordblks: ::size_t,
+        pub keepcost: ::size_t,
+    }
+
     pub struct nlmsghdr {
         pub nlmsg_len: u32,
         pub nlmsg_type: u16,
@@ -285,6 +300,32 @@
         __re_nsub: ::size_t,
         __bitfield: u8,
     }
+
+    pub struct Elf64_Chdr {
+        pub ch_type: ::Elf64_Word,
+        pub ch_reserved: ::Elf64_Word,
+        pub ch_size: ::Elf64_Xword,
+        pub ch_addralign: ::Elf64_Xword,
+    }
+
+    pub struct Elf32_Chdr {
+        pub ch_type: ::Elf32_Word,
+        pub ch_size: ::Elf32_Word,
+        pub ch_addralign: ::Elf32_Word,
+    }
+
+    pub struct seminfo {
+        pub semmap: ::c_int,
+        pub semmni: ::c_int,
+        pub semmns: ::c_int,
+        pub semmnu: ::c_int,
+        pub semmsl: ::c_int,
+        pub semopm: ::c_int,
+        pub semume: ::c_int,
+        pub semusz: ::c_int,
+        pub semvmx: ::c_int,
+        pub semaem: ::c_int,
+    }
 }
 
 impl siginfo_t {
@@ -475,20 +516,20 @@
 
 // include/uapi/asm-generic/hugetlb_encode.h
 pub const HUGETLB_FLAG_ENCODE_SHIFT: ::c_int = 26;
-pub const HUGETLB_FLAG_ENCODE_MASK:  ::c_int = 0x3f;
+pub const HUGETLB_FLAG_ENCODE_MASK: ::c_int = 0x3f;
 
-pub const HUGETLB_FLAG_ENCODE_64KB:  ::c_int = 16 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_64KB: ::c_int = 16 << HUGETLB_FLAG_ENCODE_SHIFT;
 pub const HUGETLB_FLAG_ENCODE_512KB: ::c_int = 19 << HUGETLB_FLAG_ENCODE_SHIFT;
-pub const HUGETLB_FLAG_ENCODE_1MB:   ::c_int = 20 << HUGETLB_FLAG_ENCODE_SHIFT;
-pub const HUGETLB_FLAG_ENCODE_2MB:   ::c_int = 21 << HUGETLB_FLAG_ENCODE_SHIFT;
-pub const HUGETLB_FLAG_ENCODE_8MB:   ::c_int = 23 << HUGETLB_FLAG_ENCODE_SHIFT;
-pub const HUGETLB_FLAG_ENCODE_16MB:  ::c_int = 24 << HUGETLB_FLAG_ENCODE_SHIFT;
-pub const HUGETLB_FLAG_ENCODE_32MB:  ::c_int = 25 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_1MB: ::c_int = 20 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_2MB: ::c_int = 21 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_8MB: ::c_int = 23 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_16MB: ::c_int = 24 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_32MB: ::c_int = 25 << HUGETLB_FLAG_ENCODE_SHIFT;
 pub const HUGETLB_FLAG_ENCODE_256MB: ::c_int = 28 << HUGETLB_FLAG_ENCODE_SHIFT;
 pub const HUGETLB_FLAG_ENCODE_512MB: ::c_int = 29 << HUGETLB_FLAG_ENCODE_SHIFT;
-pub const HUGETLB_FLAG_ENCODE_1GB:   ::c_int = 30 << HUGETLB_FLAG_ENCODE_SHIFT;
-pub const HUGETLB_FLAG_ENCODE_2GB:   ::c_int = 31 << HUGETLB_FLAG_ENCODE_SHIFT;
-pub const HUGETLB_FLAG_ENCODE_16GB:  ::c_int = 34 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_1GB: ::c_int = 30 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_2GB: ::c_int = 31 << HUGETLB_FLAG_ENCODE_SHIFT;
+pub const HUGETLB_FLAG_ENCODE_16GB: ::c_int = 34 << HUGETLB_FLAG_ENCODE_SHIFT;
 
 // include/uapi/linux/mman.h
 /*
@@ -499,20 +540,20 @@
  * the running system.  See mmap(2) man page for details.
  */
 pub const MAP_HUGE_SHIFT: ::c_int = HUGETLB_FLAG_ENCODE_SHIFT;
-pub const MAP_HUGE_MASK:  ::c_int = HUGETLB_FLAG_ENCODE_MASK;
+pub const MAP_HUGE_MASK: ::c_int = HUGETLB_FLAG_ENCODE_MASK;
 
-pub const MAP_HUGE_64KB:  ::c_int = HUGETLB_FLAG_ENCODE_64KB;
+pub const MAP_HUGE_64KB: ::c_int = HUGETLB_FLAG_ENCODE_64KB;
 pub const MAP_HUGE_512KB: ::c_int = HUGETLB_FLAG_ENCODE_512KB;
-pub const MAP_HUGE_1MB:   ::c_int = HUGETLB_FLAG_ENCODE_1MB;
-pub const MAP_HUGE_2MB:   ::c_int = HUGETLB_FLAG_ENCODE_2MB;
-pub const MAP_HUGE_8MB:   ::c_int = HUGETLB_FLAG_ENCODE_8MB;
-pub const MAP_HUGE_16MB:  ::c_int = HUGETLB_FLAG_ENCODE_16MB;
-pub const MAP_HUGE_32MB:  ::c_int = HUGETLB_FLAG_ENCODE_32MB;
+pub const MAP_HUGE_1MB: ::c_int = HUGETLB_FLAG_ENCODE_1MB;
+pub const MAP_HUGE_2MB: ::c_int = HUGETLB_FLAG_ENCODE_2MB;
+pub const MAP_HUGE_8MB: ::c_int = HUGETLB_FLAG_ENCODE_8MB;
+pub const MAP_HUGE_16MB: ::c_int = HUGETLB_FLAG_ENCODE_16MB;
+pub const MAP_HUGE_32MB: ::c_int = HUGETLB_FLAG_ENCODE_32MB;
 pub const MAP_HUGE_256MB: ::c_int = HUGETLB_FLAG_ENCODE_256MB;
 pub const MAP_HUGE_512MB: ::c_int = HUGETLB_FLAG_ENCODE_512MB;
-pub const MAP_HUGE_1GB:   ::c_int = HUGETLB_FLAG_ENCODE_1GB;
-pub const MAP_HUGE_2GB:   ::c_int = HUGETLB_FLAG_ENCODE_2GB;
-pub const MAP_HUGE_16GB:  ::c_int = HUGETLB_FLAG_ENCODE_16GB;
+pub const MAP_HUGE_1GB: ::c_int = HUGETLB_FLAG_ENCODE_1GB;
+pub const MAP_HUGE_2GB: ::c_int = HUGETLB_FLAG_ENCODE_2GB;
+pub const MAP_HUGE_16GB: ::c_int = HUGETLB_FLAG_ENCODE_16GB;
 
 pub const RLIMIT_CPU: ::__rlimit_resource_t = 0;
 pub const RLIMIT_FSIZE: ::__rlimit_resource_t = 1;
@@ -526,6 +567,7 @@
 pub const RLIMIT_RTPRIO: ::__rlimit_resource_t = 14;
 pub const RLIMIT_RTTIME: ::__rlimit_resource_t = 15;
 pub const RLIMIT_NLIMITS: ::__rlimit_resource_t = 16;
+pub const RLIM_NLIMITS: ::__rlimit_resource_t = RLIMIT_NLIMITS;
 
 pub const PRIO_PROCESS: ::__priority_which_t = 0;
 pub const PRIO_PGRP: ::__priority_which_t = 1;
@@ -606,17 +648,21 @@
 pub const SOCK_DCCP: ::c_int = 6;
 pub const SOCK_PACKET: ::c_int = 10;
 
-pub const TCP_COOKIE_TRANSACTIONS: ::c_int = 15;
-pub const TCP_THIN_LINEAR_TIMEOUTS: ::c_int = 16;
-pub const TCP_THIN_DUPACK: ::c_int = 17;
-pub const TCP_USER_TIMEOUT: ::c_int = 18;
-pub const TCP_REPAIR: ::c_int = 19;
-pub const TCP_REPAIR_QUEUE: ::c_int = 20;
-pub const TCP_QUEUE_SEQ: ::c_int = 21;
-pub const TCP_REPAIR_OPTIONS: ::c_int = 22;
-pub const TCP_FASTOPEN: ::c_int = 23;
-pub const TCP_TIMESTAMP: ::c_int = 24;
-pub const TCP_FASTOPEN_CONNECT: ::c_int = 30;
+pub const FAN_MARK_INODE: ::c_uint = 0x0000_0000;
+pub const FAN_MARK_MOUNT: ::c_uint = 0x0000_0010;
+// NOTE: FAN_MARK_FILESYSTEM requires Linux Kernel >= 4.20.0
+pub const FAN_MARK_FILESYSTEM: ::c_uint = 0x0000_0100;
+
+pub const AF_IB: ::c_int = 27;
+pub const AF_MPLS: ::c_int = 28;
+pub const AF_NFC: ::c_int = 39;
+pub const AF_VSOCK: ::c_int = 40;
+pub const AF_XDP: ::c_int = 44;
+pub const PF_IB: ::c_int = AF_IB;
+pub const PF_MPLS: ::c_int = AF_MPLS;
+pub const PF_NFC: ::c_int = AF_NFC;
+pub const PF_VSOCK: ::c_int = AF_VSOCK;
+pub const PF_XDP: ::c_int = AF_XDP;
 
 /* DCCP socket options */
 pub const DCCP_SOCKOPT_PACKET_SIZE: ::c_int = 1;
@@ -644,6 +690,7 @@
 pub const BUFSIZ: ::c_uint = 8192;
 pub const TMP_MAX: ::c_uint = 238328;
 pub const FOPEN_MAX: ::c_uint = 16;
+pub const FILENAME_MAX: ::c_uint = 4096;
 pub const POSIX_MADV_DONTNEED: ::c_int = 4;
 pub const _SC_EQUIV_CLASS_MAX: ::c_int = 41;
 pub const _SC_CHARCLASS_NAME_MAX: ::c_int = 45;
@@ -724,56 +771,117 @@
 pub const ST_RELATIME: ::c_ulong = 4096;
 pub const NI_MAXHOST: ::socklen_t = 1025;
 
-pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
-pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
-pub const AFS_SUPER_MAGIC: ::c_long = 0x5346414f;
-pub const AUTOFS_SUPER_MAGIC: ::c_long = 0x0187;
-pub const BINDERFS_SUPER_MAGIC: ::c_long = 0x6c6f6f70;
-pub const BPF_FS_MAGIC: ::c_long = 0xcafe4a11;
-pub const BTRFS_SUPER_MAGIC: ::c_long = 0x9123683e;
-pub const CGROUP2_SUPER_MAGIC: ::c_long = 0x63677270;
-pub const CGROUP_SUPER_MAGIC: ::c_long = 0x27e0eb;
-pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
-pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
-pub const DEBUGFS_MAGIC: ::c_long = 0x64626720;
-pub const DEVPTS_SUPER_MAGIC: ::c_long = 0x1cd1;
-pub const ECRYPTFS_SUPER_MAGIC: ::c_long = 0xf15f;
-pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
-pub const EXT2_SUPER_MAGIC: ::c_long = 0x0000ef53;
-pub const EXT3_SUPER_MAGIC: ::c_long = 0x0000ef53;
-pub const EXT4_SUPER_MAGIC: ::c_long = 0x0000ef53;
-pub const F2FS_SUPER_MAGIC: ::c_long = 0xf2f52010;
-pub const FUTEXFS_SUPER_MAGIC: ::c_long = 0xbad1dea;
-pub const HOSTFS_SUPER_MAGIC: ::c_long = 0x00c0ffee;
-pub const HPFS_SUPER_MAGIC: ::c_long = 0xf995e849;
-pub const HUGETLBFS_MAGIC: ::c_long = 0x958458f6;
-pub const ISOFS_SUPER_MAGIC: ::c_long = 0x00009660;
-pub const JFFS2_SUPER_MAGIC: ::c_long = 0x000072b6;
-pub const MINIX2_SUPER_MAGIC2: ::c_long = 0x00002478;
-pub const MINIX2_SUPER_MAGIC: ::c_long = 0x00002468;
-pub const MINIX3_SUPER_MAGIC: ::c_long = 0x4d5a;
-pub const MINIX_SUPER_MAGIC2: ::c_long = 0x0000138f;
-pub const MINIX_SUPER_MAGIC: ::c_long = 0x0000137f;
-pub const MSDOS_SUPER_MAGIC: ::c_long = 0x00004d44;
-pub const NCP_SUPER_MAGIC: ::c_long = 0x0000564c;
-pub const NFS_SUPER_MAGIC: ::c_long = 0x00006969;
-pub const NILFS_SUPER_MAGIC: ::c_long = 0x3434;
-pub const OCFS2_SUPER_MAGIC: ::c_long = 0x7461636f;
-pub const OPENPROM_SUPER_MAGIC: ::c_long = 0x00009fa1;
-pub const OVERLAYFS_SUPER_MAGIC: ::c_long = 0x794c7630;
-pub const PROC_SUPER_MAGIC: ::c_long = 0x00009fa0;
-pub const QNX4_SUPER_MAGIC: ::c_long = 0x0000002f;
-pub const QNX6_SUPER_MAGIC: ::c_long = 0x68191122;
-pub const RDTGROUP_SUPER_MAGIC: ::c_long = 0x7655821;
-pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
-pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
-pub const SYSFS_MAGIC: ::c_long = 0x62656572;
-pub const TMPFS_MAGIC: ::c_long = 0x01021994;
-pub const TRACEFS_MAGIC: ::c_long = 0x74726163;
-pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
-pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
-pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;
-pub const XFS_SUPER_MAGIC: ::c_long = 0x58465342;
+cfg_if! {
+    if #[cfg(not(target_arch = "s390x"))] {
+        pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
+        pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
+        pub const AFS_SUPER_MAGIC: ::c_long = 0x5346414f;
+        pub const AUTOFS_SUPER_MAGIC: ::c_long = 0x0187;
+        pub const BINDERFS_SUPER_MAGIC: ::c_long = 0x6c6f6f70;
+        pub const BPF_FS_MAGIC: ::c_long = 0xcafe4a11;
+        pub const BTRFS_SUPER_MAGIC: ::c_long = 0x9123683e;
+        pub const CGROUP2_SUPER_MAGIC: ::c_long = 0x63677270;
+        pub const CGROUP_SUPER_MAGIC: ::c_long = 0x27e0eb;
+        pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
+        pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
+        pub const DEBUGFS_MAGIC: ::c_long = 0x64626720;
+        pub const DEVPTS_SUPER_MAGIC: ::c_long = 0x1cd1;
+        pub const ECRYPTFS_SUPER_MAGIC: ::c_long = 0xf15f;
+        pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
+        pub const EXT2_SUPER_MAGIC: ::c_long = 0x0000ef53;
+        pub const EXT3_SUPER_MAGIC: ::c_long = 0x0000ef53;
+        pub const EXT4_SUPER_MAGIC: ::c_long = 0x0000ef53;
+        pub const F2FS_SUPER_MAGIC: ::c_long = 0xf2f52010;
+        pub const FUTEXFS_SUPER_MAGIC: ::c_long = 0xbad1dea;
+        pub const HOSTFS_SUPER_MAGIC: ::c_long = 0x00c0ffee;
+        pub const HPFS_SUPER_MAGIC: ::c_long = 0xf995e849;
+        pub const HUGETLBFS_MAGIC: ::c_long = 0x958458f6;
+        pub const ISOFS_SUPER_MAGIC: ::c_long = 0x00009660;
+        pub const JFFS2_SUPER_MAGIC: ::c_long = 0x000072b6;
+        pub const MINIX2_SUPER_MAGIC2: ::c_long = 0x00002478;
+        pub const MINIX2_SUPER_MAGIC: ::c_long = 0x00002468;
+        pub const MINIX3_SUPER_MAGIC: ::c_long = 0x4d5a;
+        pub const MINIX_SUPER_MAGIC2: ::c_long = 0x0000138f;
+        pub const MINIX_SUPER_MAGIC: ::c_long = 0x0000137f;
+        pub const MSDOS_SUPER_MAGIC: ::c_long = 0x00004d44;
+        pub const NCP_SUPER_MAGIC: ::c_long = 0x0000564c;
+        pub const NFS_SUPER_MAGIC: ::c_long = 0x00006969;
+        pub const NILFS_SUPER_MAGIC: ::c_long = 0x3434;
+        pub const OCFS2_SUPER_MAGIC: ::c_long = 0x7461636f;
+        pub const OPENPROM_SUPER_MAGIC: ::c_long = 0x00009fa1;
+        pub const OVERLAYFS_SUPER_MAGIC: ::c_long = 0x794c7630;
+        pub const PROC_SUPER_MAGIC: ::c_long = 0x00009fa0;
+        pub const QNX4_SUPER_MAGIC: ::c_long = 0x0000002f;
+        pub const QNX6_SUPER_MAGIC: ::c_long = 0x68191122;
+        pub const RDTGROUP_SUPER_MAGIC: ::c_long = 0x7655821;
+        pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
+        pub const SECURITYFS_MAGIC: ::c_long = 0x73636673;
+        pub const SELINUX_MAGIC: ::c_long = 0xf97cff8c;
+        pub const SMACK_MAGIC: ::c_long = 0x43415d53;
+        pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
+        pub const SYSFS_MAGIC: ::c_long = 0x62656572;
+        pub const TMPFS_MAGIC: ::c_long = 0x01021994;
+        pub const TRACEFS_MAGIC: ::c_long = 0x74726163;
+        pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
+        pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
+        pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;
+        pub const XFS_SUPER_MAGIC: ::c_long = 0x58465342;
+    } else if #[cfg(target_arch = "s390x")] {
+        pub const ADFS_SUPER_MAGIC: ::c_uint = 0x0000adf5;
+        pub const AFFS_SUPER_MAGIC: ::c_uint = 0x0000adff;
+        pub const AFS_SUPER_MAGIC: ::c_uint = 0x5346414f;
+        pub const AUTOFS_SUPER_MAGIC: ::c_uint = 0x0187;
+        pub const BINDERFS_SUPER_MAGIC: ::c_uint = 0x6c6f6f70;
+        pub const BPF_FS_MAGIC: ::c_uint = 0xcafe4a11;
+        pub const BTRFS_SUPER_MAGIC: ::c_uint = 0x9123683e;
+        pub const CGROUP2_SUPER_MAGIC: ::c_uint = 0x63677270;
+        pub const CGROUP_SUPER_MAGIC: ::c_uint = 0x27e0eb;
+        pub const CODA_SUPER_MAGIC: ::c_uint = 0x73757245;
+        pub const CRAMFS_MAGIC: ::c_uint = 0x28cd3d45;
+        pub const DEBUGFS_MAGIC: ::c_uint = 0x64626720;
+        pub const DEVPTS_SUPER_MAGIC: ::c_uint = 0x1cd1;
+        pub const ECRYPTFS_SUPER_MAGIC: ::c_uint = 0xf15f;
+        pub const EFS_SUPER_MAGIC: ::c_uint = 0x00414a53;
+        pub const EXT2_SUPER_MAGIC: ::c_uint = 0x0000ef53;
+        pub const EXT3_SUPER_MAGIC: ::c_uint = 0x0000ef53;
+        pub const EXT4_SUPER_MAGIC: ::c_uint = 0x0000ef53;
+        pub const F2FS_SUPER_MAGIC: ::c_uint = 0xf2f52010;
+        pub const FUTEXFS_SUPER_MAGIC: ::c_uint = 0xbad1dea;
+        pub const HOSTFS_SUPER_MAGIC: ::c_uint = 0x00c0ffee;
+        pub const HPFS_SUPER_MAGIC: ::c_uint = 0xf995e849;
+        pub const HUGETLBFS_MAGIC: ::c_uint = 0x958458f6;
+        pub const ISOFS_SUPER_MAGIC: ::c_uint = 0x00009660;
+        pub const JFFS2_SUPER_MAGIC: ::c_uint = 0x000072b6;
+        pub const MINIX2_SUPER_MAGIC2: ::c_uint = 0x00002478;
+        pub const MINIX2_SUPER_MAGIC: ::c_uint = 0x00002468;
+        pub const MINIX3_SUPER_MAGIC: ::c_uint = 0x4d5a;
+        pub const MINIX_SUPER_MAGIC2: ::c_uint = 0x0000138f;
+        pub const MINIX_SUPER_MAGIC: ::c_uint = 0x0000137f;
+        pub const MSDOS_SUPER_MAGIC: ::c_uint = 0x00004d44;
+        pub const NCP_SUPER_MAGIC: ::c_uint = 0x0000564c;
+        pub const NFS_SUPER_MAGIC: ::c_uint = 0x00006969;
+        pub const NILFS_SUPER_MAGIC: ::c_uint = 0x3434;
+        pub const OCFS2_SUPER_MAGIC: ::c_uint = 0x7461636f;
+        pub const OPENPROM_SUPER_MAGIC: ::c_uint = 0x00009fa1;
+        pub const OVERLAYFS_SUPER_MAGIC: ::c_uint = 0x794c7630;
+        pub const PROC_SUPER_MAGIC: ::c_uint = 0x00009fa0;
+        pub const QNX4_SUPER_MAGIC: ::c_uint = 0x0000002f;
+        pub const QNX6_SUPER_MAGIC: ::c_uint = 0x68191122;
+        pub const RDTGROUP_SUPER_MAGIC: ::c_uint = 0x7655821;
+        pub const REISERFS_SUPER_MAGIC: ::c_uint = 0x52654973;
+        pub const SECURITYFS_MAGIC: ::c_uint = 0x73636673;
+        pub const SELINUX_MAGIC: ::c_uint = 0xf97cff8c;
+        pub const SMACK_MAGIC: ::c_uint = 0x43415d53;
+        pub const SMB_SUPER_MAGIC: ::c_uint = 0x0000517b;
+        pub const SYSFS_MAGIC: ::c_uint = 0x62656572;
+        pub const TMPFS_MAGIC: ::c_uint = 0x01021994;
+        pub const TRACEFS_MAGIC: ::c_uint = 0x74726163;
+        pub const UDF_SUPER_MAGIC: ::c_uint = 0x15013346;
+        pub const USBDEVICE_SUPER_MAGIC: ::c_uint = 0x00009fa2;
+        pub const XENFS_SUPER_MAGIC: ::c_uint = 0xabba1974;
+        pub const XFS_SUPER_MAGIC: ::c_uint = 0x58465342;
+    }
+}
 
 pub const CPU_SETSIZE: ::c_int = 0x400;
 
@@ -800,10 +908,14 @@
 pub const PTRACE_LISTEN: ::c_uint = 0x4208;
 pub const PTRACE_PEEKSIGINFO: ::c_uint = 0x4209;
 
-pub const EPOLLWAKEUP: ::c_int = 0x20000000;
+// linux/fs.h
 
-pub const SEEK_DATA: ::c_int = 3;
-pub const SEEK_HOLE: ::c_int = 4;
+// Flags for preadv2/pwritev2
+pub const RWF_HIPRI: ::c_int = 0x00000001;
+pub const RWF_DSYNC: ::c_int = 0x00000002;
+pub const RWF_SYNC: ::c_int = 0x00000004;
+pub const RWF_NOWAIT: ::c_int = 0x00000008;
+pub const RWF_APPEND: ::c_int = 0x00000010;
 
 // linux/rtnetlink.h
 pub const TCA_PAD: ::c_ushort = 9;
@@ -862,12 +974,6 @@
 pub const TIOCM_CD: ::c_int = TIOCM_CAR;
 pub const TIOCM_RI: ::c_int = TIOCM_RNG;
 
-pub const NF_NETDEV_INGRESS: ::c_int = 0;
-pub const NF_NETDEV_NUMHOOKS: ::c_int = 1;
-
-pub const NFPROTO_INET: ::c_int = 1;
-pub const NFPROTO_NETDEV: ::c_int = 5;
-
 // linux/keyctl.h
 pub const KEYCTL_DH_COMPUTE: u32 = 23;
 pub const KEYCTL_PKEY_QUERY: u32 = 24;
@@ -899,193 +1005,6 @@
     }
 }
 
-// linux/netfilter/nf_tables.h
-pub const NFT_TABLE_MAXNAMELEN: ::c_int = 256;
-pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 256;
-pub const NFT_SET_MAXNAMELEN: ::c_int = 256;
-pub const NFT_OBJ_MAXNAMELEN: ::c_int = 256;
-pub const NFT_USERDATA_MAXLEN: ::c_int = 256;
-
-pub const NFT_REG_VERDICT: ::c_int = 0;
-pub const NFT_REG_1: ::c_int = 1;
-pub const NFT_REG_2: ::c_int = 2;
-pub const NFT_REG_3: ::c_int = 3;
-pub const NFT_REG_4: ::c_int = 4;
-pub const __NFT_REG_MAX: ::c_int = 5;
-pub const NFT_REG32_00: ::c_int = 8;
-pub const NFT_REG32_01: ::c_int = 9;
-pub const NFT_REG32_02: ::c_int = 10;
-pub const NFT_REG32_03: ::c_int = 11;
-pub const NFT_REG32_04: ::c_int = 12;
-pub const NFT_REG32_05: ::c_int = 13;
-pub const NFT_REG32_06: ::c_int = 14;
-pub const NFT_REG32_07: ::c_int = 15;
-pub const NFT_REG32_08: ::c_int = 16;
-pub const NFT_REG32_09: ::c_int = 17;
-pub const NFT_REG32_10: ::c_int = 18;
-pub const NFT_REG32_11: ::c_int = 19;
-pub const NFT_REG32_12: ::c_int = 20;
-pub const NFT_REG32_13: ::c_int = 21;
-pub const NFT_REG32_14: ::c_int = 22;
-pub const NFT_REG32_15: ::c_int = 23;
-
-pub const NFT_REG_SIZE: ::c_int = 16;
-pub const NFT_REG32_SIZE: ::c_int = 4;
-
-pub const NFT_CONTINUE: ::c_int = -1;
-pub const NFT_BREAK: ::c_int = -2;
-pub const NFT_JUMP: ::c_int = -3;
-pub const NFT_GOTO: ::c_int = -4;
-pub const NFT_RETURN: ::c_int = -5;
-
-pub const NFT_MSG_NEWTABLE: ::c_int = 0;
-pub const NFT_MSG_GETTABLE: ::c_int = 1;
-pub const NFT_MSG_DELTABLE: ::c_int = 2;
-pub const NFT_MSG_NEWCHAIN: ::c_int = 3;
-pub const NFT_MSG_GETCHAIN: ::c_int = 4;
-pub const NFT_MSG_DELCHAIN: ::c_int = 5;
-pub const NFT_MSG_NEWRULE: ::c_int = 6;
-pub const NFT_MSG_GETRULE: ::c_int = 7;
-pub const NFT_MSG_DELRULE: ::c_int = 8;
-pub const NFT_MSG_NEWSET: ::c_int = 9;
-pub const NFT_MSG_GETSET: ::c_int = 10;
-pub const NFT_MSG_DELSET: ::c_int = 11;
-pub const NFT_MSG_NEWSETELEM: ::c_int = 12;
-pub const NFT_MSG_GETSETELEM: ::c_int = 13;
-pub const NFT_MSG_DELSETELEM: ::c_int = 14;
-pub const NFT_MSG_NEWGEN: ::c_int = 15;
-pub const NFT_MSG_GETGEN: ::c_int = 16;
-pub const NFT_MSG_TRACE: ::c_int = 17;
-cfg_if! {
-    if #[cfg(not(target_arch = "sparc64"))] {
-        pub const NFT_MSG_NEWOBJ: ::c_int = 18;
-        pub const NFT_MSG_GETOBJ: ::c_int = 19;
-        pub const NFT_MSG_DELOBJ: ::c_int = 20;
-        pub const NFT_MSG_GETOBJ_RESET: ::c_int = 21;
-    }
-}
-pub const NFT_MSG_MAX: ::c_int = 25;
-
-pub const NFT_SET_ANONYMOUS: ::c_int = 0x1;
-pub const NFT_SET_CONSTANT: ::c_int = 0x2;
-pub const NFT_SET_INTERVAL: ::c_int = 0x4;
-pub const NFT_SET_MAP: ::c_int = 0x8;
-pub const NFT_SET_TIMEOUT: ::c_int = 0x10;
-pub const NFT_SET_EVAL: ::c_int = 0x20;
-
-pub const NFT_SET_POL_PERFORMANCE: ::c_int = 0;
-pub const NFT_SET_POL_MEMORY: ::c_int = 1;
-
-pub const NFT_SET_ELEM_INTERVAL_END: ::c_int = 0x1;
-
-pub const NFT_DATA_VALUE: ::c_uint = 0;
-pub const NFT_DATA_VERDICT: ::c_uint = 0xffffff00;
-
-pub const NFT_DATA_RESERVED_MASK: ::c_uint = 0xffffff00;
-
-pub const NFT_DATA_VALUE_MAXLEN: ::c_int = 64;
-
-pub const NFT_BYTEORDER_NTOH: ::c_int = 0;
-pub const NFT_BYTEORDER_HTON: ::c_int = 1;
-
-pub const NFT_CMP_EQ: ::c_int = 0;
-pub const NFT_CMP_NEQ: ::c_int = 1;
-pub const NFT_CMP_LT: ::c_int = 2;
-pub const NFT_CMP_LTE: ::c_int = 3;
-pub const NFT_CMP_GT: ::c_int = 4;
-pub const NFT_CMP_GTE: ::c_int = 5;
-
-pub const NFT_RANGE_EQ: ::c_int = 0;
-pub const NFT_RANGE_NEQ: ::c_int = 1;
-
-pub const NFT_LOOKUP_F_INV: ::c_int = 1 << 0;
-
-pub const NFT_DYNSET_OP_ADD: ::c_int = 0;
-pub const NFT_DYNSET_OP_UPDATE: ::c_int = 1;
-
-pub const NFT_DYNSET_F_INV: ::c_int = 1 << 0;
-
-pub const NFT_PAYLOAD_LL_HEADER: ::c_int = 0;
-pub const NFT_PAYLOAD_NETWORK_HEADER: ::c_int = 1;
-pub const NFT_PAYLOAD_TRANSPORT_HEADER: ::c_int = 2;
-
-pub const NFT_PAYLOAD_CSUM_NONE: ::c_int = 0;
-pub const NFT_PAYLOAD_CSUM_INET: ::c_int = 1;
-
-pub const NFT_META_LEN: ::c_int = 0;
-pub const NFT_META_PROTOCOL: ::c_int = 1;
-pub const NFT_META_PRIORITY: ::c_int = 2;
-pub const NFT_META_MARK: ::c_int = 3;
-pub const NFT_META_IIF: ::c_int = 4;
-pub const NFT_META_OIF: ::c_int = 5;
-pub const NFT_META_IIFNAME: ::c_int = 6;
-pub const NFT_META_OIFNAME: ::c_int = 7;
-pub const NFT_META_IIFTYPE: ::c_int = 8;
-pub const NFT_META_OIFTYPE: ::c_int = 9;
-pub const NFT_META_SKUID: ::c_int = 10;
-pub const NFT_META_SKGID: ::c_int = 11;
-pub const NFT_META_NFTRACE: ::c_int = 12;
-pub const NFT_META_RTCLASSID: ::c_int = 13;
-pub const NFT_META_SECMARK: ::c_int = 14;
-pub const NFT_META_NFPROTO: ::c_int = 15;
-pub const NFT_META_L4PROTO: ::c_int = 16;
-pub const NFT_META_BRI_IIFNAME: ::c_int = 17;
-pub const NFT_META_BRI_OIFNAME: ::c_int = 18;
-pub const NFT_META_PKTTYPE: ::c_int = 19;
-pub const NFT_META_CPU: ::c_int = 20;
-pub const NFT_META_IIFGROUP: ::c_int = 21;
-pub const NFT_META_OIFGROUP: ::c_int = 22;
-pub const NFT_META_CGROUP: ::c_int = 23;
-pub const NFT_META_PRANDOM: ::c_int = 24;
-
-pub const NFT_CT_STATE: ::c_int = 0;
-pub const NFT_CT_DIRECTION: ::c_int = 1;
-pub const NFT_CT_STATUS: ::c_int = 2;
-pub const NFT_CT_MARK: ::c_int = 3;
-pub const NFT_CT_SECMARK: ::c_int = 4;
-pub const NFT_CT_EXPIRATION: ::c_int = 5;
-pub const NFT_CT_HELPER: ::c_int = 6;
-pub const NFT_CT_L3PROTOCOL: ::c_int = 7;
-pub const NFT_CT_SRC: ::c_int = 8;
-pub const NFT_CT_DST: ::c_int = 9;
-pub const NFT_CT_PROTOCOL: ::c_int = 10;
-pub const NFT_CT_PROTO_SRC: ::c_int = 11;
-pub const NFT_CT_PROTO_DST: ::c_int = 12;
-pub const NFT_CT_LABELS: ::c_int = 13;
-pub const NFT_CT_PKTS: ::c_int = 14;
-pub const NFT_CT_BYTES: ::c_int = 15;
-
-pub const NFT_LIMIT_PKTS: ::c_int = 0;
-pub const NFT_LIMIT_PKT_BYTES: ::c_int = 1;
-
-pub const NFT_LIMIT_F_INV: ::c_int = 1 << 0;
-
-pub const NFT_QUEUE_FLAG_BYPASS: ::c_int = 0x01;
-pub const NFT_QUEUE_FLAG_CPU_FANOUT: ::c_int = 0x02;
-pub const NFT_QUEUE_FLAG_MASK: ::c_int = 0x03;
-
-pub const NFT_QUOTA_F_INV: ::c_int = 1 << 0;
-
-pub const NFT_REJECT_ICMP_UNREACH: ::c_int = 0;
-pub const NFT_REJECT_TCP_RST: ::c_int = 1;
-pub const NFT_REJECT_ICMPX_UNREACH: ::c_int = 2;
-
-pub const NFT_REJECT_ICMPX_NO_ROUTE: ::c_int = 0;
-pub const NFT_REJECT_ICMPX_PORT_UNREACH: ::c_int = 1;
-pub const NFT_REJECT_ICMPX_HOST_UNREACH: ::c_int = 2;
-pub const NFT_REJECT_ICMPX_ADMIN_PROHIBITED: ::c_int = 3;
-
-pub const NFT_NAT_SNAT: ::c_int = 0;
-pub const NFT_NAT_DNAT: ::c_int = 1;
-
-pub const NFT_TRACETYPE_UNSPEC: ::c_int = 0;
-pub const NFT_TRACETYPE_POLICY: ::c_int = 1;
-pub const NFT_TRACETYPE_RETURN: ::c_int = 2;
-pub const NFT_TRACETYPE_RULE: ::c_int = 3;
-
-pub const NFT_NG_INCREMENTAL: ::c_int = 0;
-pub const NFT_NG_RANDOM: ::c_int = 1;
-
 pub const M_MXFAST: ::c_int = 1;
 pub const M_NLBLKS: ::c_int = 2;
 pub const M_GRAIN: ::c_int = 3;
@@ -1116,6 +1035,7 @@
 pub const STATX_BLOCKS: ::c_uint = 0x0400;
 pub const STATX_BASIC_STATS: ::c_uint = 0x07ff;
 pub const STATX_BTIME: ::c_uint = 0x0800;
+pub const STATX_MNT_ID: ::c_uint = 0x1000;
 pub const STATX_ALL: ::c_uint = 0x0fff;
 pub const STATX__RESERVED: ::c_int = 0x80000000;
 pub const STATX_ATTR_COMPRESSED: ::c_int = 0x0004;
@@ -1125,33 +1045,6 @@
 pub const STATX_ATTR_ENCRYPTED: ::c_int = 0x0800;
 pub const STATX_ATTR_AUTOMOUNT: ::c_int = 0x1000;
 
-// sys/auxv.h
-pub const AT_NULL: ::c_ulong = 0;
-pub const AT_IGNORE: ::c_ulong = 1;
-pub const AT_EXECFD: ::c_ulong = 2;
-pub const AT_PHDR: ::c_ulong = 3;
-pub const AT_PHENT: ::c_ulong = 4;
-pub const AT_PHNUM: ::c_ulong = 5;
-pub const AT_PAGESZ: ::c_ulong = 6;
-pub const AT_BASE: ::c_ulong = 7;
-pub const AT_FLAGS: ::c_ulong = 8;
-pub const AT_ENTRY: ::c_ulong = 9;
-pub const AT_NOTELF: ::c_ulong = 10;
-pub const AT_UID: ::c_ulong = 11;
-pub const AT_EUID: ::c_ulong = 12;
-pub const AT_GID: ::c_ulong = 13;
-pub const AT_EGID: ::c_ulong = 14;
-pub const AT_PLATFORM: ::c_ulong = 15;
-pub const AT_HWCAP: ::c_ulong = 16;
-pub const AT_CLKTCK: ::c_ulong = 17;
-// AT_* values 18 through 22 are reserved
-pub const AT_SECURE: ::c_ulong = 23;
-pub const AT_BASE_PLATFORM: ::c_ulong = 24;
-pub const AT_RANDOM: ::c_ulong = 25;
-pub const AT_HWCAP2: ::c_ulong = 26;
-
-pub const AT_EXECFN: ::c_ulong = 31;
-
 //sys/timex.h
 pub const ADJ_OFFSET: ::c_uint = 0x0001;
 pub const ADJ_FREQUENCY: ::c_uint = 0x0002;
@@ -1264,11 +1157,7 @@
         num: ::size_t,
         size: ::size_t,
         compar: ::Option<
-            unsafe extern "C" fn(
-                *const ::c_void,
-                *const ::c_void,
-                *mut ::c_void,
-            ) -> ::c_int,
+            unsafe extern "C" fn(*const ::c_void, *const ::c_void, *mut ::c_void) -> ::c_int,
         >,
         arg: *mut ::c_void,
     );
@@ -1286,22 +1175,10 @@
         timeout: *mut ::timespec,
     ) -> ::c_int;
 
-    pub fn getrlimit64(
-        resource: ::__rlimit_resource_t,
-        rlim: *mut ::rlimit64,
-    ) -> ::c_int;
-    pub fn setrlimit64(
-        resource: ::__rlimit_resource_t,
-        rlim: *const ::rlimit64,
-    ) -> ::c_int;
-    pub fn getrlimit(
-        resource: ::__rlimit_resource_t,
-        rlim: *mut ::rlimit,
-    ) -> ::c_int;
-    pub fn setrlimit(
-        resource: ::__rlimit_resource_t,
-        rlim: *const ::rlimit,
-    ) -> ::c_int;
+    pub fn getrlimit64(resource: ::__rlimit_resource_t, rlim: *mut ::rlimit64) -> ::c_int;
+    pub fn setrlimit64(resource: ::__rlimit_resource_t, rlim: *const ::rlimit64) -> ::c_int;
+    pub fn getrlimit(resource: ::__rlimit_resource_t, rlim: *mut ::rlimit) -> ::c_int;
+    pub fn setrlimit(resource: ::__rlimit_resource_t, rlim: *const ::rlimit) -> ::c_int;
     pub fn prlimit(
         pid: ::pid_t,
         resource: ::__rlimit_resource_t,
@@ -1332,11 +1209,7 @@
         mask: ::c_uint,
         statxbuf: *mut statx,
     ) -> ::c_int;
-    pub fn getrandom(
-        buf: *mut ::c_void,
-        buflen: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
+    pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
 
     pub fn memmem(
         haystack: *const ::c_void,
@@ -1350,6 +1223,8 @@
     pub fn ntp_adjtime(buf: *mut timex) -> ::c_int;
     #[link_name = "ntp_gettimex"]
     pub fn ntp_gettime(buf: *mut ntptimeval) -> ::c_int;
+    pub fn clock_adjtime(clk_id: ::clockid_t, buf: *mut ::timex) -> ::c_int;
+
     pub fn copy_file_range(
         fd_in: ::c_int,
         off_in: *mut ::off64_t,
@@ -1365,6 +1240,46 @@
         dirfd: ::c_int,
         path: *const ::c_char,
     ) -> ::c_int;
+    pub fn preadv2(
+        fd: ::c_int,
+        iov: *const ::iovec,
+        iovcnt: ::c_int,
+        offset: ::off_t,
+        flags: ::c_int,
+    ) -> ::ssize_t;
+    pub fn pwritev2(
+        fd: ::c_int,
+        iov: *const ::iovec,
+        iovcnt: ::c_int,
+        offset: ::off_t,
+        flags: ::c_int,
+    ) -> ::ssize_t;
+    pub fn preadv64v2(
+        fd: ::c_int,
+        iov: *const ::iovec,
+        iovcnt: ::c_int,
+        offset: ::off64_t,
+        flags: ::c_int,
+    ) -> ::ssize_t;
+    pub fn pwritev64v2(
+        fd: ::c_int,
+        iov: *const ::iovec,
+        iovcnt: ::c_int,
+        offset: ::off64_t,
+        flags: ::c_int,
+    ) -> ::ssize_t;
+    pub fn renameat2(
+        olddirfd: ::c_int,
+        oldpath: *const ::c_char,
+        newdirfd: ::c_int,
+        newpath: *const ::c_char,
+        flags: ::c_uint,
+    ) -> ::c_int;
+
+    // Added in `glibc` 2.25
+    pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
+    // Added in `glibc` 2.29
+    pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
 }
 
 extern "C" {
@@ -1373,9 +1288,7 @@
     pub fn glob64(
         pattern: *const ::c_char,
         flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int,
-        >,
+        errfunc: ::Option<extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int>,
         pglob: *mut glob64_t,
     ) -> ::c_int;
     pub fn globfree64(pglob: *mut glob64_t);
@@ -1391,11 +1304,7 @@
         cpuset: *const ::cpu_set_t,
     ) -> ::c_int;
     pub fn getpriority(which: ::__priority_which_t, who: ::id_t) -> ::c_int;
-    pub fn setpriority(
-        which: ::__priority_which_t,
-        who: ::id_t,
-        prio: ::c_int,
-    ) -> ::c_int;
+    pub fn setpriority(which: ::__priority_which_t, who: ::id_t, prio: ::c_int) -> ::c_int;
     pub fn pthread_getaffinity_np(
         thread: ::pthread_t,
         cpusetsize: ::size_t,
@@ -1416,6 +1325,7 @@
     ) -> ::c_int;
     pub fn sched_getcpu() -> ::c_int;
     pub fn mallinfo() -> ::mallinfo;
+    pub fn mallinfo2() -> ::mallinfo2;
     pub fn malloc_usable_size(ptr: *mut ::c_void) -> ::size_t;
     pub fn getpwent_r(
         pwd: *mut ::passwd,
@@ -1429,27 +1339,20 @@
         buflen: ::size_t,
         result: *mut *mut ::group,
     ) -> ::c_int;
-    pub fn pthread_getname_np(
-        thread: ::pthread_t,
-        name: *mut ::c_char,
-        len: ::size_t,
-    ) -> ::c_int;
-    pub fn pthread_setname_np(
-        thread: ::pthread_t,
-        name: *const ::c_char,
-    ) -> ::c_int;
+    pub fn pthread_getname_np(thread: ::pthread_t, name: *mut ::c_char, len: ::size_t) -> ::c_int;
+    pub fn pthread_setname_np(thread: ::pthread_t, name: *const ::c_char) -> ::c_int;
+
+    pub fn sethostid(hostid: ::c_long) -> ::c_int;
 }
 
 extern "C" {
-    pub fn dlmopen(
-        lmid: Lmid_t,
-        filename: *const ::c_char,
-        flag: ::c_int,
-    ) -> *mut ::c_void;
-    pub fn dlinfo(
-        handle: *mut ::c_void,
-        request: ::c_int,
-        info: *mut ::c_void,
+    pub fn dlmopen(lmid: Lmid_t, filename: *const ::c_char, flag: ::c_int) -> *mut ::c_void;
+    pub fn dlinfo(handle: *mut ::c_void, request: ::c_int, info: *mut ::c_void) -> ::c_int;
+    pub fn dladdr1(
+        addr: *const ::c_void,
+        info: *mut ::Dl_info,
+        extra_info: *mut *mut ::c_void,
+        flags: ::c_int,
     ) -> ::c_int;
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,6 +14,7 @@
 pub type idtype_t = ::c_uint;
 pub type loff_t = ::c_longlong;
 pub type pthread_key_t = ::c_uint;
+pub type pthread_spinlock_t = ::c_int;
 
 pub type __u8 = ::c_uchar;
 pub type __u16 = ::c_ushort;
@@ -36,6 +37,12 @@
 pub type Elf32_Section = u16;
 pub type Elf64_Section = u16;
 
+// linux/can.h
+pub type canid_t = u32;
+pub type can_err_mask_t = u32;
+
+pub type iconv_t = *mut ::c_void;
+
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
@@ -278,6 +285,24 @@
         pub u: [u32; 7],
     }
 
+    pub struct uinput_ff_upload {
+        pub request_id: ::__u32,
+        pub retval: ::__s32,
+        pub effect: ff_effect,
+        pub old: ff_effect,
+    }
+
+    pub struct uinput_ff_erase {
+        pub request_id: ::__u32,
+        pub retval: ::__s32,
+        pub effect_id: ::__u32,
+    }
+
+    pub struct uinput_abs_setup {
+        pub code: ::__u16,
+        pub absinfo: input_absinfo,
+    }
+
     pub struct dl_phdr_info {
         #[cfg(target_pointer_width = "64")]
         pub dlpi_addr: Elf64_Addr,
@@ -296,9 +321,18 @@
         #[cfg(target_pointer_width = "32")]
         pub dlpi_phnum: Elf32_Half,
 
+        // As of uClibc 1.0.36, the following fields are
+        // gated behind a "#if 0" block which always evaluates
+        // to false. So I'm just removing these, and if uClibc changes
+        // the #if block in the future to include the following fields, these
+        // will probably need including here. tsidea, skrap
+        #[cfg(not(target_env = "uclibc"))]
         pub dlpi_adds: ::c_ulonglong,
+        #[cfg(not(target_env = "uclibc"))]
         pub dlpi_subs: ::c_ulonglong,
+        #[cfg(not(target_env = "uclibc"))]
         pub dlpi_tls_modid: ::size_t,
+        #[cfg(not(target_env = "uclibc"))]
         pub dlpi_tls_data: *mut ::c_void,
     }
 
@@ -402,19 +436,6 @@
         pub sh_entsize: Elf64_Xword,
     }
 
-    pub struct Elf32_Chdr {
-        pub ch_type: Elf32_Word,
-        pub ch_size: Elf32_Word,
-        pub ch_addralign: Elf32_Word,
-    }
-
-    pub struct Elf64_Chdr {
-        pub ch_type: Elf64_Word,
-        pub ch_reserved: Elf64_Word,
-        pub ch_size: Elf64_Xword,
-        pub ch_addralign: Elf64_Xword,
-    }
-
     pub struct ucred {
         pub pid: ::pid_t,
         pub uid: ::uid_t,
@@ -504,6 +525,44 @@
         pub ee_info: u32,
         pub ee_data: u32,
     }
+
+    // linux/can.h
+    pub struct __c_anonymous_sockaddr_can_tp {
+        pub rx_id: canid_t,
+        pub tx_id: canid_t,
+    }
+
+    pub struct __c_anonymous_sockaddr_can_j1939 {
+        pub name: u64,
+        pub pgn: u32,
+        pub addr: u8,
+    }
+
+    pub struct can_filter {
+        pub can_id: canid_t,
+        pub can_mask: canid_t,
+    }
+
+    // linux/filter.h
+    pub struct sock_filter {
+        pub code: ::__u16,
+        pub jt: ::__u8,
+        pub jf: ::__u8,
+        pub k: ::__u32,
+    }
+
+    pub struct sock_fprog {
+        pub len: ::c_ushort,
+        pub filter: *mut sock_filter,
+    }
+
+    // linux/seccomp.h
+    pub struct seccomp_data {
+        pub nr: ::c_int,
+        pub arch: ::__u32,
+        pub instruction_pointer: ::__u64,
+        pub args: [::__u64; 6],
+    }
 }
 
 s_no_extra_traits! {
@@ -538,6 +597,22 @@
         pub salg_name: [::c_uchar; 64],
     }
 
+    pub struct uinput_setup {
+        pub id: input_id,
+        pub name: [::c_char; UINPUT_MAX_NAME_SIZE],
+        pub ff_effects_max: ::__u32,
+    }
+
+    pub struct uinput_user_dev {
+        pub name: [::c_char; UINPUT_MAX_NAME_SIZE],
+        pub id: input_id,
+        pub ff_effects_max: ::__u32,
+        pub absmax: [::__s32; ABS_CNT],
+        pub absmin: [::__s32; ABS_CNT],
+        pub absfuzz: [::__s32; ABS_CNT],
+        pub absflat: [::__s32; ABS_CNT],
+    }
+
     /// WARNING: The `PartialEq`, `Eq` and `Hash` implementations of this
     /// type are unsound and will be removed in the future.
     #[deprecated(
@@ -578,6 +653,26 @@
 }
 
 cfg_if! {
+    if #[cfg(libc_union)] {
+        s_no_extra_traits! {
+            // linux/can.h
+            #[allow(missing_debug_implementations)]
+            pub union __c_anonymous_sockaddr_can_can_addr {
+                pub tp: __c_anonymous_sockaddr_can_tp,
+                pub j1939: __c_anonymous_sockaddr_can_j1939,
+            }
+
+            #[allow(missing_debug_implementations)]
+            pub struct sockaddr_can {
+                pub can_family: ::sa_family_t,
+                pub can_ifindex: ::c_int,
+                pub can_addr: __c_anonymous_sockaddr_can_can_addr,
+            }
+        }
+    }
+}
+
+cfg_if! {
     if #[cfg(feature = "extra_traits")] {
         impl PartialEq for sockaddr_nl {
             fn eq(&self, other: &sockaddr_nl) -> bool {
@@ -788,6 +883,72 @@
             }
         }
 
+        impl PartialEq for uinput_setup {
+            fn eq(&self, other: &uinput_setup) -> bool {
+                self.id == other.id
+                    && self.name[..] == other.name[..]
+                    && self.ff_effects_max == other.ff_effects_max
+           }
+        }
+        impl Eq for uinput_setup {}
+
+        impl ::fmt::Debug for uinput_setup {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("uinput_setup")
+                    .field("id", &self.id)
+                    .field("name", &&self.name[..])
+                    .field("ff_effects_max", &self.ff_effects_max)
+                    .finish()
+            }
+        }
+
+        impl ::hash::Hash for uinput_setup {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.id.hash(state);
+                self.name.hash(state);
+                self.ff_effects_max.hash(state);
+            }
+        }
+
+        impl PartialEq for uinput_user_dev {
+            fn eq(&self, other: &uinput_user_dev) -> bool {
+                 self.name[..] == other.name[..]
+                    && self.id == other.id
+                    && self.ff_effects_max == other.ff_effects_max
+                    && self.absmax[..] == other.absmax[..]
+                    && self.absmin[..] == other.absmin[..]
+                    && self.absfuzz[..] == other.absfuzz[..]
+                    && self.absflat[..] == other.absflat[..]
+           }
+        }
+        impl Eq for uinput_user_dev {}
+
+        impl ::fmt::Debug for uinput_user_dev {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("uinput_setup")
+                    .field("name", &&self.name[..])
+                    .field("id", &self.id)
+                    .field("ff_effects_max", &self.ff_effects_max)
+                    .field("absmax", &&self.absmax[..])
+                    .field("absmin", &&self.absmin[..])
+                    .field("absfuzz", &&self.absfuzz[..])
+                    .field("absflat", &&self.absflat[..])
+                    .finish()
+            }
+        }
+
+        impl ::hash::Hash for uinput_user_dev {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                self.name.hash(state);
+                self.id.hash(state);
+                self.ff_effects_max.hash(state);
+                self.absmax.hash(state);
+                self.absmin.hash(state);
+                self.absfuzz.hash(state);
+                self.absflat.hash(state);
+            }
+        }
+
         #[allow(deprecated)]
         impl af_alg_iv {
             fn as_slice(&self) -> &[u8] {
@@ -856,78 +1017,76 @@
     }
 }
 
-pub const ABDAY_1: ::nl_item = 0x20000;
-pub const ABDAY_2: ::nl_item = 0x20001;
-pub const ABDAY_3: ::nl_item = 0x20002;
-pub const ABDAY_4: ::nl_item = 0x20003;
-pub const ABDAY_5: ::nl_item = 0x20004;
-pub const ABDAY_6: ::nl_item = 0x20005;
-pub const ABDAY_7: ::nl_item = 0x20006;
-
-pub const DAY_1: ::nl_item = 0x20007;
-pub const DAY_2: ::nl_item = 0x20008;
-pub const DAY_3: ::nl_item = 0x20009;
-pub const DAY_4: ::nl_item = 0x2000A;
-pub const DAY_5: ::nl_item = 0x2000B;
-pub const DAY_6: ::nl_item = 0x2000C;
-pub const DAY_7: ::nl_item = 0x2000D;
-
-pub const ABMON_1: ::nl_item = 0x2000E;
-pub const ABMON_2: ::nl_item = 0x2000F;
-pub const ABMON_3: ::nl_item = 0x20010;
-pub const ABMON_4: ::nl_item = 0x20011;
-pub const ABMON_5: ::nl_item = 0x20012;
-pub const ABMON_6: ::nl_item = 0x20013;
-pub const ABMON_7: ::nl_item = 0x20014;
-pub const ABMON_8: ::nl_item = 0x20015;
-pub const ABMON_9: ::nl_item = 0x20016;
-pub const ABMON_10: ::nl_item = 0x20017;
-pub const ABMON_11: ::nl_item = 0x20018;
-pub const ABMON_12: ::nl_item = 0x20019;
-
-pub const MON_1: ::nl_item = 0x2001A;
-pub const MON_2: ::nl_item = 0x2001B;
-pub const MON_3: ::nl_item = 0x2001C;
-pub const MON_4: ::nl_item = 0x2001D;
-pub const MON_5: ::nl_item = 0x2001E;
-pub const MON_6: ::nl_item = 0x2001F;
-pub const MON_7: ::nl_item = 0x20020;
-pub const MON_8: ::nl_item = 0x20021;
-pub const MON_9: ::nl_item = 0x20022;
-pub const MON_10: ::nl_item = 0x20023;
-pub const MON_11: ::nl_item = 0x20024;
-pub const MON_12: ::nl_item = 0x20025;
-
-pub const AM_STR: ::nl_item = 0x20026;
-pub const PM_STR: ::nl_item = 0x20027;
-
-pub const D_T_FMT: ::nl_item = 0x20028;
-pub const D_FMT: ::nl_item = 0x20029;
-pub const T_FMT: ::nl_item = 0x2002A;
-pub const T_FMT_AMPM: ::nl_item = 0x2002B;
-
-pub const ERA: ::nl_item = 0x2002C;
-pub const ERA_D_FMT: ::nl_item = 0x2002E;
-pub const ALT_DIGITS: ::nl_item = 0x2002F;
-pub const ERA_D_T_FMT: ::nl_item = 0x20030;
-pub const ERA_T_FMT: ::nl_item = 0x20031;
-
-pub const CODESET: ::nl_item = 14;
-
-pub const CRNCYSTR: ::nl_item = 0x4000F;
+cfg_if! {
+    if #[cfg(any(target_env = "gnu", target_env = "musl"))] {
+        pub const ABDAY_1: ::nl_item = 0x20000;
+        pub const ABDAY_2: ::nl_item = 0x20001;
+        pub const ABDAY_3: ::nl_item = 0x20002;
+        pub const ABDAY_4: ::nl_item = 0x20003;
+        pub const ABDAY_5: ::nl_item = 0x20004;
+        pub const ABDAY_6: ::nl_item = 0x20005;
+        pub const ABDAY_7: ::nl_item = 0x20006;
+
+        pub const DAY_1: ::nl_item = 0x20007;
+        pub const DAY_2: ::nl_item = 0x20008;
+        pub const DAY_3: ::nl_item = 0x20009;
+        pub const DAY_4: ::nl_item = 0x2000A;
+        pub const DAY_5: ::nl_item = 0x2000B;
+        pub const DAY_6: ::nl_item = 0x2000C;
+        pub const DAY_7: ::nl_item = 0x2000D;
+
+        pub const ABMON_1: ::nl_item = 0x2000E;
+        pub const ABMON_2: ::nl_item = 0x2000F;
+        pub const ABMON_3: ::nl_item = 0x20010;
+        pub const ABMON_4: ::nl_item = 0x20011;
+        pub const ABMON_5: ::nl_item = 0x20012;
+        pub const ABMON_6: ::nl_item = 0x20013;
+        pub const ABMON_7: ::nl_item = 0x20014;
+        pub const ABMON_8: ::nl_item = 0x20015;
+        pub const ABMON_9: ::nl_item = 0x20016;
+        pub const ABMON_10: ::nl_item = 0x20017;
+        pub const ABMON_11: ::nl_item = 0x20018;
+        pub const ABMON_12: ::nl_item = 0x20019;
+
+        pub const MON_1: ::nl_item = 0x2001A;
+        pub const MON_2: ::nl_item = 0x2001B;
+        pub const MON_3: ::nl_item = 0x2001C;
+        pub const MON_4: ::nl_item = 0x2001D;
+        pub const MON_5: ::nl_item = 0x2001E;
+        pub const MON_6: ::nl_item = 0x2001F;
+        pub const MON_7: ::nl_item = 0x20020;
+        pub const MON_8: ::nl_item = 0x20021;
+        pub const MON_9: ::nl_item = 0x20022;
+        pub const MON_10: ::nl_item = 0x20023;
+        pub const MON_11: ::nl_item = 0x20024;
+        pub const MON_12: ::nl_item = 0x20025;
+
+        pub const AM_STR: ::nl_item = 0x20026;
+        pub const PM_STR: ::nl_item = 0x20027;
+
+        pub const D_T_FMT: ::nl_item = 0x20028;
+        pub const D_FMT: ::nl_item = 0x20029;
+        pub const T_FMT: ::nl_item = 0x2002A;
+        pub const T_FMT_AMPM: ::nl_item = 0x2002B;
+
+        pub const ERA: ::nl_item = 0x2002C;
+        pub const ERA_D_FMT: ::nl_item = 0x2002E;
+        pub const ALT_DIGITS: ::nl_item = 0x2002F;
+        pub const ERA_D_T_FMT: ::nl_item = 0x20030;
+        pub const ERA_T_FMT: ::nl_item = 0x20031;
+
+        pub const CODESET: ::nl_item = 14;
+        pub const CRNCYSTR: ::nl_item = 0x4000F;
+        pub const RADIXCHAR: ::nl_item = 0x10000;
+        pub const THOUSEP: ::nl_item = 0x10001;
+        pub const YESEXPR: ::nl_item = 0x50000;
+        pub const NOEXPR: ::nl_item = 0x50001;
+        pub const YESSTR: ::nl_item = 0x50002;
+        pub const NOSTR: ::nl_item = 0x50003;
+    }
+}
 
-pub const RUSAGE_THREAD: ::c_int = 1;
 pub const RUSAGE_CHILDREN: ::c_int = -1;
-
-pub const RADIXCHAR: ::nl_item = 0x10000;
-pub const THOUSEP: ::nl_item = 0x10001;
-
-pub const YESEXPR: ::nl_item = 0x50000;
-pub const NOEXPR: ::nl_item = 0x50001;
-pub const YESSTR: ::nl_item = 0x50002;
-pub const NOSTR: ::nl_item = 0x50003;
-
-pub const FILENAME_MAX: ::c_uint = 4096;
 pub const L_tmpnam: ::c_uint = 20;
 pub const _PC_LINK_MAX: ::c_int = 0;
 pub const _PC_MAX_CANON: ::c_int = 1;
@@ -1098,6 +1257,32 @@
 pub const RLIM_SAVED_MAX: ::rlim_t = RLIM_INFINITY;
 pub const RLIM_SAVED_CUR: ::rlim_t = RLIM_INFINITY;
 
+pub const AT_NULL: ::c_ulong = 0;
+pub const AT_IGNORE: ::c_ulong = 1;
+pub const AT_EXECFD: ::c_ulong = 2;
+pub const AT_PHDR: ::c_ulong = 3;
+pub const AT_PHENT: ::c_ulong = 4;
+pub const AT_PHNUM: ::c_ulong = 5;
+pub const AT_PAGESZ: ::c_ulong = 6;
+pub const AT_BASE: ::c_ulong = 7;
+pub const AT_FLAGS: ::c_ulong = 8;
+pub const AT_ENTRY: ::c_ulong = 9;
+pub const AT_NOTELF: ::c_ulong = 10;
+pub const AT_UID: ::c_ulong = 11;
+pub const AT_EUID: ::c_ulong = 12;
+pub const AT_GID: ::c_ulong = 13;
+pub const AT_EGID: ::c_ulong = 14;
+pub const AT_PLATFORM: ::c_ulong = 15;
+pub const AT_HWCAP: ::c_ulong = 16;
+pub const AT_CLKTCK: ::c_ulong = 17;
+
+pub const AT_SECURE: ::c_ulong = 23;
+pub const AT_BASE_PLATFORM: ::c_ulong = 24;
+pub const AT_RANDOM: ::c_ulong = 25;
+pub const AT_HWCAP2: ::c_ulong = 26;
+
+pub const AT_EXECFN: ::c_ulong = 31;
+
 pub const GLOB_ERR: ::c_int = 1 << 0;
 pub const GLOB_MARK: ::c_int = 1 << 1;
 pub const GLOB_NOSORT: ::c_int = 1 << 2;
@@ -1191,6 +1376,23 @@
 pub const IFLA_LINK_NETNSID: ::c_ushort = 37;
 pub const IFLA_PHYS_PORT_NAME: ::c_ushort = 38;
 pub const IFLA_PROTO_DOWN: ::c_ushort = 39;
+pub const IFLA_GSO_MAX_SEGS: ::c_ushort = 40;
+pub const IFLA_GSO_MAX_SIZE: ::c_ushort = 41;
+pub const IFLA_PAD: ::c_ushort = 42;
+pub const IFLA_XDP: ::c_ushort = 43;
+pub const IFLA_EVENT: ::c_ushort = 44;
+pub const IFLA_NEW_NETNSID: ::c_ushort = 45;
+pub const IFLA_IF_NETNSID: ::c_ushort = 46;
+pub const IFLA_TARGET_NETNSID: ::c_ushort = IFLA_IF_NETNSID;
+pub const IFLA_CARRIER_UP_COUNT: ::c_ushort = 47;
+pub const IFLA_CARRIER_DOWN_COUNT: ::c_ushort = 48;
+pub const IFLA_NEW_IFINDEX: ::c_ushort = 49;
+pub const IFLA_MIN_MTU: ::c_ushort = 50;
+pub const IFLA_MAX_MTU: ::c_ushort = 51;
+pub const IFLA_PROP_LIST: ::c_ushort = 52;
+pub const IFLA_ALT_IFNAME: ::c_ushort = 53;
+pub const IFLA_PERM_ADDRESS: ::c_ushort = 54;
+pub const IFLA_PROTO_DOWN_REASON: ::c_ushort = 55;
 
 pub const IFLA_INFO_UNSPEC: ::c_ushort = 0;
 pub const IFLA_INFO_KIND: ::c_ushort = 1;
@@ -1220,6 +1422,10 @@
 pub const IFF_PERSIST: ::c_int = 0x0800;
 pub const IFF_NOFILTER: ::c_int = 0x1000;
 
+// Since Linux 3.1
+pub const SEEK_DATA: ::c_int = 3;
+pub const SEEK_HOLE: ::c_int = 4;
+
 pub const ST_RDONLY: ::c_ulong = 1;
 pub const ST_NOSUID: ::c_ulong = 2;
 pub const ST_NODEV: ::c_ulong = 4;
@@ -1239,9 +1445,6 @@
 
 pub const AT_EACCESS: ::c_int = 0x200;
 
-pub const TCP_MD5SIG: ::c_int = 14;
-pub const TCP_ULP: ::c_int = 31;
-
 align_const! {
     pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
         size: [0; __SIZEOF_PTHREAD_MUTEX_T],
@@ -1261,9 +1464,9 @@
 pub const PTHREAD_PROCESS_SHARED: ::c_int = 1;
 pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
 
-pub const RENAME_NOREPLACE: ::c_int = 1;
-pub const RENAME_EXCHANGE: ::c_int = 2;
-pub const RENAME_WHITEOUT: ::c_int = 4;
+pub const RENAME_NOREPLACE: ::c_uint = 1;
+pub const RENAME_EXCHANGE: ::c_uint = 2;
+pub const RENAME_WHITEOUT: ::c_uint = 4;
 
 pub const SCHED_OTHER: ::c_int = 0;
 pub const SCHED_FIFO: ::c_int = 1;
@@ -1286,17 +1489,6 @@
 )]
 pub const IPPROTO_MAX: ::c_int = 256;
 
-pub const AF_IB: ::c_int = 27;
-pub const AF_MPLS: ::c_int = 28;
-pub const AF_NFC: ::c_int = 39;
-pub const AF_VSOCK: ::c_int = 40;
-pub const AF_XDP: ::c_int = 44;
-pub const PF_IB: ::c_int = AF_IB;
-pub const PF_MPLS: ::c_int = AF_MPLS;
-pub const PF_NFC: ::c_int = AF_NFC;
-pub const PF_VSOCK: ::c_int = AF_VSOCK;
-pub const PF_XDP: ::c_int = AF_XDP;
-
 // System V IPC
 pub const IPC_PRIVATE: ::key_t = 0;
 
@@ -1313,7 +1505,6 @@
 
 pub const MSG_NOERROR: ::c_int = 0o10000;
 pub const MSG_EXCEPT: ::c_int = 0o20000;
-pub const MSG_COPY: ::c_int = 0o40000;
 
 pub const SHM_R: ::c_int = 0o400;
 pub const SHM_W: ::c_int = 0o200;
@@ -1321,16 +1512,17 @@
 pub const SHM_RDONLY: ::c_int = 0o10000;
 pub const SHM_RND: ::c_int = 0o20000;
 pub const SHM_REMAP: ::c_int = 0o40000;
-pub const SHM_EXEC: ::c_int = 0o100000;
 
 pub const SHM_LOCK: ::c_int = 11;
 pub const SHM_UNLOCK: ::c_int = 12;
 
 pub const SHM_HUGETLB: ::c_int = 0o4000;
+#[cfg(not(all(target_env = "uclibc", target_arch = "mips")))]
 pub const SHM_NORESERVE: ::c_int = 0o10000;
 
 pub const EPOLLRDHUP: ::c_int = 0x2000;
 pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000;
+pub const EPOLLWAKEUP: ::c_int = 0x20000000;
 pub const EPOLLONESHOT: ::c_int = 0x40000000;
 
 pub const QFMT_VFS_OLD: ::c_int = 1;
@@ -1382,14 +1574,27 @@
 pub const SYNC_FILE_RANGE_WRITE: ::c_uint = 2;
 pub const SYNC_FILE_RANGE_WAIT_AFTER: ::c_uint = 4;
 
-pub const AIO_CANCELED: ::c_int = 0;
-pub const AIO_NOTCANCELED: ::c_int = 1;
-pub const AIO_ALLDONE: ::c_int = 2;
-pub const LIO_READ: ::c_int = 0;
-pub const LIO_WRITE: ::c_int = 1;
-pub const LIO_NOP: ::c_int = 2;
-pub const LIO_WAIT: ::c_int = 0;
-pub const LIO_NOWAIT: ::c_int = 1;
+cfg_if! {
+    if #[cfg(not(target_env = "uclibc"))] {
+        pub const AIO_CANCELED: ::c_int = 0;
+        pub const AIO_NOTCANCELED: ::c_int = 1;
+        pub const AIO_ALLDONE: ::c_int = 2;
+        pub const LIO_READ: ::c_int = 0;
+        pub const LIO_WRITE: ::c_int = 1;
+        pub const LIO_NOP: ::c_int = 2;
+        pub const LIO_WAIT: ::c_int = 0;
+        pub const LIO_NOWAIT: ::c_int = 1;
+        pub const RUSAGE_THREAD: ::c_int = 1;
+        pub const MSG_COPY: ::c_int = 0o40000;
+        pub const SHM_EXEC: ::c_int = 0o100000;
+        pub const IPV6_MULTICAST_ALL: ::c_int = 29;
+        pub const IPV6_ROUTER_ALERT_ISOLATE: ::c_int = 30;
+        pub const PACKET_MR_UNICAST: ::c_int = 3;
+        pub const PTRACE_EVENT_STOP: ::c_int = 128;
+        pub const UDP_SEGMENT: ::c_int = 103;
+        pub const UDP_GRO: ::c_int = 104;
+    }
+}
 
 pub const MREMAP_MAYMOVE: ::c_int = 1;
 pub const MREMAP_FIXED: ::c_int = 2;
@@ -1521,6 +1726,23 @@
 pub const SECCOMP_MODE_STRICT: ::c_uint = 1;
 pub const SECCOMP_MODE_FILTER: ::c_uint = 2;
 
+pub const SECCOMP_FILTER_FLAG_TSYNC: ::c_ulong = 1;
+pub const SECCOMP_FILTER_FLAG_LOG: ::c_ulong = 2;
+pub const SECCOMP_FILTER_FLAG_SPEC_ALLOW: ::c_ulong = 4;
+
+pub const SECCOMP_RET_KILL_PROCESS: ::c_uint = 0x80000000;
+pub const SECCOMP_RET_KILL_THREAD: ::c_uint = 0x00000000;
+pub const SECCOMP_RET_KILL: ::c_uint = SECCOMP_RET_KILL_THREAD;
+pub const SECCOMP_RET_TRAP: ::c_uint = 0x00030000;
+pub const SECCOMP_RET_ERRNO: ::c_uint = 0x00050000;
+pub const SECCOMP_RET_TRACE: ::c_uint = 0x7ff00000;
+pub const SECCOMP_RET_LOG: ::c_uint = 0x7ffc0000;
+pub const SECCOMP_RET_ALLOW: ::c_uint = 0x7fff0000;
+
+pub const SECCOMP_RET_ACTION_FULL: ::c_uint = 0xffff0000;
+pub const SECCOMP_RET_ACTION: ::c_uint = 0x7fff0000;
+pub const SECCOMP_RET_DATA: ::c_uint = 0x0000ffff;
+
 pub const ITIMER_REAL: ::c_int = 0;
 pub const ITIMER_VIRTUAL: ::c_int = 1;
 pub const ITIMER_PROF: ::c_int = 2;
@@ -1529,9 +1751,6 @@
 pub const TFD_NONBLOCK: ::c_int = O_NONBLOCK;
 pub const TFD_TIMER_ABSTIME: ::c_int = 1;
 
-pub const XATTR_CREATE: ::c_int = 0x1;
-pub const XATTR_REPLACE: ::c_int = 0x2;
-
 pub const _POSIX_VDISABLE: ::cc_t = 0;
 
 pub const FALLOC_FL_KEEP_SIZE: ::c_int = 0x01;
@@ -1552,8 +1771,6 @@
 pub const IP_RECVFRAGSIZE: ::c_int = 25;
 
 pub const IPV6_FLOWINFO: ::c_int = 11;
-pub const IPV6_MULTICAST_ALL: ::c_int = 29;
-pub const IPV6_ROUTER_ALERT_ISOLATE: ::c_int = 30;
 pub const IPV6_FLOWLABEL_MGR: ::c_int = 32;
 pub const IPV6_FLOWINFO_SEND: ::c_int = 33;
 pub const IPV6_RECVFRAGSIZE: ::c_int = 77;
@@ -1565,6 +1782,7 @@
 pub const IPV6_RTHDR_STRICT: ::c_int = 1;
 
 pub const IUTF8: ::tcflag_t = 0x00004000;
+#[cfg(not(all(target_env = "uclibc", target_arch = "mips")))]
 pub const CMSPAR: ::tcflag_t = 0o10000000000;
 
 pub const MFD_CLOEXEC: ::c_uint = 0x0001;
@@ -1587,6 +1805,9 @@
 pub const PT_GNU_EH_FRAME: u32 = 0x6474e550;
 pub const PT_GNU_STACK: u32 = 0x6474e551;
 pub const PT_GNU_RELRO: u32 = 0x6474e552;
+pub const PT_HIOS: u32 = 0x6fffffff;
+pub const PT_LOPROC: u32 = 0x70000000;
+pub const PT_HIPROC: u32 = 0x7fffffff;
 
 // linux/if_ether.h
 pub const ETH_ALEN: ::c_int = 6;
@@ -1883,7 +2104,6 @@
 pub const PACKET_MR_MULTICAST: ::c_int = 0;
 pub const PACKET_MR_PROMISC: ::c_int = 1;
 pub const PACKET_MR_ALLMULTI: ::c_int = 2;
-pub const PACKET_MR_UNICAST: ::c_int = 3;
 
 // linux/netfilter.h
 pub const NF_DROP: ::c_int = 0;
@@ -1917,6 +2137,11 @@
 pub const NFPROTO_IPV6: ::c_int = 10;
 pub const NFPROTO_DECNET: ::c_int = 12;
 pub const NFPROTO_NUMPROTO: ::c_int = 13;
+pub const NFPROTO_INET: ::c_int = 1;
+pub const NFPROTO_NETDEV: ::c_int = 5;
+
+pub const NF_NETDEV_INGRESS: ::c_int = 0;
+pub const NF_NETDEV_NUMHOOKS: ::c_int = 1;
 
 // linux/netfilter_ipv4.h
 pub const NF_IP_PRE_ROUTING: ::c_int = 0;
@@ -2004,8 +2229,6 @@
 pub const SIOCGIFMAP: ::c_ulong = 0x00008970;
 pub const SIOCSIFMAP: ::c_ulong = 0x00008971;
 
-pub const PTRACE_EVENT_STOP: ::c_int = 128;
-
 pub const IPTOS_TOS_MASK: u8 = 0x1E;
 pub const IPTOS_PREC_MASK: u8 = 0xE0;
 
@@ -2274,12 +2497,6 @@
 pub const ARPD_FLUSH: ::c_ushort = 0x03;
 pub const ATF_MAGIC: ::c_int = 0x80;
 
-#[cfg(not(target_arch = "sparc64"))]
-pub const SO_TIMESTAMPING: ::c_int = 37;
-#[cfg(target_arch = "sparc64")]
-pub const SO_TIMESTAMPING: ::c_int = 35;
-pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
-
 // linux/module.h
 pub const MODULE_INIT_IGNORE_MODVERSIONS: ::c_uint = 0x0001;
 pub const MODULE_INIT_IGNORE_VERMAGIC: ::c_uint = 0x0002;
@@ -2308,8 +2525,6 @@
 pub const UDP_ENCAP: ::c_int = 100;
 pub const UDP_NO_CHECK6_TX: ::c_int = 101;
 pub const UDP_NO_CHECK6_RX: ::c_int = 102;
-pub const UDP_SEGMENT: ::c_int = 103;
-pub const UDP_GRO: ::c_int = 104;
 
 // include/uapi/linux/mman.h
 pub const MAP_SHARED_VALIDATE: ::c_int = 0x3;
@@ -2417,6 +2632,225 @@
 pub const IN_CLOEXEC: ::c_int = O_CLOEXEC;
 pub const IN_NONBLOCK: ::c_int = O_NONBLOCK;
 
+// uapi/linux/netfilter/nf_tables.h
+pub const NFT_TABLE_MAXNAMELEN: ::c_int = 256;
+pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 256;
+pub const NFT_SET_MAXNAMELEN: ::c_int = 256;
+pub const NFT_OBJ_MAXNAMELEN: ::c_int = 256;
+pub const NFT_USERDATA_MAXLEN: ::c_int = 256;
+
+pub const NFT_REG_VERDICT: ::c_int = 0;
+pub const NFT_REG_1: ::c_int = 1;
+pub const NFT_REG_2: ::c_int = 2;
+pub const NFT_REG_3: ::c_int = 3;
+pub const NFT_REG_4: ::c_int = 4;
+pub const __NFT_REG_MAX: ::c_int = 5;
+pub const NFT_REG32_00: ::c_int = 8;
+pub const NFT_REG32_01: ::c_int = 9;
+pub const NFT_REG32_02: ::c_int = 10;
+pub const NFT_REG32_03: ::c_int = 11;
+pub const NFT_REG32_04: ::c_int = 12;
+pub const NFT_REG32_05: ::c_int = 13;
+pub const NFT_REG32_06: ::c_int = 14;
+pub const NFT_REG32_07: ::c_int = 15;
+pub const NFT_REG32_08: ::c_int = 16;
+pub const NFT_REG32_09: ::c_int = 17;
+pub const NFT_REG32_10: ::c_int = 18;
+pub const NFT_REG32_11: ::c_int = 19;
+pub const NFT_REG32_12: ::c_int = 20;
+pub const NFT_REG32_13: ::c_int = 21;
+pub const NFT_REG32_14: ::c_int = 22;
+pub const NFT_REG32_15: ::c_int = 23;
+
+pub const NFT_REG_SIZE: ::c_int = 16;
+pub const NFT_REG32_SIZE: ::c_int = 4;
+
+pub const NFT_CONTINUE: ::c_int = -1;
+pub const NFT_BREAK: ::c_int = -2;
+pub const NFT_JUMP: ::c_int = -3;
+pub const NFT_GOTO: ::c_int = -4;
+pub const NFT_RETURN: ::c_int = -5;
+
+pub const NFT_MSG_NEWTABLE: ::c_int = 0;
+pub const NFT_MSG_GETTABLE: ::c_int = 1;
+pub const NFT_MSG_DELTABLE: ::c_int = 2;
+pub const NFT_MSG_NEWCHAIN: ::c_int = 3;
+pub const NFT_MSG_GETCHAIN: ::c_int = 4;
+pub const NFT_MSG_DELCHAIN: ::c_int = 5;
+pub const NFT_MSG_NEWRULE: ::c_int = 6;
+pub const NFT_MSG_GETRULE: ::c_int = 7;
+pub const NFT_MSG_DELRULE: ::c_int = 8;
+pub const NFT_MSG_NEWSET: ::c_int = 9;
+pub const NFT_MSG_GETSET: ::c_int = 10;
+pub const NFT_MSG_DELSET: ::c_int = 11;
+pub const NFT_MSG_NEWSETELEM: ::c_int = 12;
+pub const NFT_MSG_GETSETELEM: ::c_int = 13;
+pub const NFT_MSG_DELSETELEM: ::c_int = 14;
+pub const NFT_MSG_NEWGEN: ::c_int = 15;
+pub const NFT_MSG_GETGEN: ::c_int = 16;
+pub const NFT_MSG_TRACE: ::c_int = 17;
+cfg_if! {
+    if #[cfg(not(target_arch = "sparc64"))] {
+        pub const NFT_MSG_NEWOBJ: ::c_int = 18;
+        pub const NFT_MSG_GETOBJ: ::c_int = 19;
+        pub const NFT_MSG_DELOBJ: ::c_int = 20;
+        pub const NFT_MSG_GETOBJ_RESET: ::c_int = 21;
+    }
+}
+pub const NFT_MSG_MAX: ::c_int = 25;
+
+pub const NFT_SET_ANONYMOUS: ::c_int = 0x1;
+pub const NFT_SET_CONSTANT: ::c_int = 0x2;
+pub const NFT_SET_INTERVAL: ::c_int = 0x4;
+pub const NFT_SET_MAP: ::c_int = 0x8;
+pub const NFT_SET_TIMEOUT: ::c_int = 0x10;
+pub const NFT_SET_EVAL: ::c_int = 0x20;
+
+pub const NFT_SET_POL_PERFORMANCE: ::c_int = 0;
+pub const NFT_SET_POL_MEMORY: ::c_int = 1;
+
+pub const NFT_SET_ELEM_INTERVAL_END: ::c_int = 0x1;
+
+pub const NFT_DATA_VALUE: ::c_uint = 0;
+pub const NFT_DATA_VERDICT: ::c_uint = 0xffffff00;
+
+pub const NFT_DATA_RESERVED_MASK: ::c_uint = 0xffffff00;
+
+pub const NFT_DATA_VALUE_MAXLEN: ::c_int = 64;
+
+pub const NFT_BYTEORDER_NTOH: ::c_int = 0;
+pub const NFT_BYTEORDER_HTON: ::c_int = 1;
+
+pub const NFT_CMP_EQ: ::c_int = 0;
+pub const NFT_CMP_NEQ: ::c_int = 1;
+pub const NFT_CMP_LT: ::c_int = 2;
+pub const NFT_CMP_LTE: ::c_int = 3;
+pub const NFT_CMP_GT: ::c_int = 4;
+pub const NFT_CMP_GTE: ::c_int = 5;
+
+pub const NFT_RANGE_EQ: ::c_int = 0;
+pub const NFT_RANGE_NEQ: ::c_int = 1;
+
+pub const NFT_LOOKUP_F_INV: ::c_int = 1 << 0;
+
+pub const NFT_DYNSET_OP_ADD: ::c_int = 0;
+pub const NFT_DYNSET_OP_UPDATE: ::c_int = 1;
+
+pub const NFT_DYNSET_F_INV: ::c_int = 1 << 0;
+
+pub const NFT_PAYLOAD_LL_HEADER: ::c_int = 0;
+pub const NFT_PAYLOAD_NETWORK_HEADER: ::c_int = 1;
+pub const NFT_PAYLOAD_TRANSPORT_HEADER: ::c_int = 2;
+
+pub const NFT_PAYLOAD_CSUM_NONE: ::c_int = 0;
+pub const NFT_PAYLOAD_CSUM_INET: ::c_int = 1;
+
+pub const NFT_META_LEN: ::c_int = 0;
+pub const NFT_META_PROTOCOL: ::c_int = 1;
+pub const NFT_META_PRIORITY: ::c_int = 2;
+pub const NFT_META_MARK: ::c_int = 3;
+pub const NFT_META_IIF: ::c_int = 4;
+pub const NFT_META_OIF: ::c_int = 5;
+pub const NFT_META_IIFNAME: ::c_int = 6;
+pub const NFT_META_OIFNAME: ::c_int = 7;
+pub const NFT_META_IIFTYPE: ::c_int = 8;
+pub const NFT_META_OIFTYPE: ::c_int = 9;
+pub const NFT_META_SKUID: ::c_int = 10;
+pub const NFT_META_SKGID: ::c_int = 11;
+pub const NFT_META_NFTRACE: ::c_int = 12;
+pub const NFT_META_RTCLASSID: ::c_int = 13;
+pub const NFT_META_SECMARK: ::c_int = 14;
+pub const NFT_META_NFPROTO: ::c_int = 15;
+pub const NFT_META_L4PROTO: ::c_int = 16;
+pub const NFT_META_BRI_IIFNAME: ::c_int = 17;
+pub const NFT_META_BRI_OIFNAME: ::c_int = 18;
+pub const NFT_META_PKTTYPE: ::c_int = 19;
+pub const NFT_META_CPU: ::c_int = 20;
+pub const NFT_META_IIFGROUP: ::c_int = 21;
+pub const NFT_META_OIFGROUP: ::c_int = 22;
+pub const NFT_META_CGROUP: ::c_int = 23;
+pub const NFT_META_PRANDOM: ::c_int = 24;
+
+pub const NFT_CT_STATE: ::c_int = 0;
+pub const NFT_CT_DIRECTION: ::c_int = 1;
+pub const NFT_CT_STATUS: ::c_int = 2;
+pub const NFT_CT_MARK: ::c_int = 3;
+pub const NFT_CT_SECMARK: ::c_int = 4;
+pub const NFT_CT_EXPIRATION: ::c_int = 5;
+pub const NFT_CT_HELPER: ::c_int = 6;
+pub const NFT_CT_L3PROTOCOL: ::c_int = 7;
+pub const NFT_CT_SRC: ::c_int = 8;
+pub const NFT_CT_DST: ::c_int = 9;
+pub const NFT_CT_PROTOCOL: ::c_int = 10;
+pub const NFT_CT_PROTO_SRC: ::c_int = 11;
+pub const NFT_CT_PROTO_DST: ::c_int = 12;
+pub const NFT_CT_LABELS: ::c_int = 13;
+pub const NFT_CT_PKTS: ::c_int = 14;
+pub const NFT_CT_BYTES: ::c_int = 15;
+
+pub const NFT_LIMIT_PKTS: ::c_int = 0;
+pub const NFT_LIMIT_PKT_BYTES: ::c_int = 1;
+
+pub const NFT_LIMIT_F_INV: ::c_int = 1 << 0;
+
+pub const NFT_QUEUE_FLAG_BYPASS: ::c_int = 0x01;
+pub const NFT_QUEUE_FLAG_CPU_FANOUT: ::c_int = 0x02;
+pub const NFT_QUEUE_FLAG_MASK: ::c_int = 0x03;
+
+pub const NFT_QUOTA_F_INV: ::c_int = 1 << 0;
+
+pub const NFT_REJECT_ICMP_UNREACH: ::c_int = 0;
+pub const NFT_REJECT_TCP_RST: ::c_int = 1;
+pub const NFT_REJECT_ICMPX_UNREACH: ::c_int = 2;
+
+pub const NFT_REJECT_ICMPX_NO_ROUTE: ::c_int = 0;
+pub const NFT_REJECT_ICMPX_PORT_UNREACH: ::c_int = 1;
+pub const NFT_REJECT_ICMPX_HOST_UNREACH: ::c_int = 2;
+pub const NFT_REJECT_ICMPX_ADMIN_PROHIBITED: ::c_int = 3;
+
+pub const NFT_NAT_SNAT: ::c_int = 0;
+pub const NFT_NAT_DNAT: ::c_int = 1;
+
+pub const NFT_TRACETYPE_UNSPEC: ::c_int = 0;
+pub const NFT_TRACETYPE_POLICY: ::c_int = 1;
+pub const NFT_TRACETYPE_RETURN: ::c_int = 2;
+pub const NFT_TRACETYPE_RULE: ::c_int = 3;
+
+pub const NFT_NG_INCREMENTAL: ::c_int = 0;
+pub const NFT_NG_RANDOM: ::c_int = 1;
+
+// linux/input.h
+pub const FF_MAX: ::__u16 = 0x7f;
+pub const FF_CNT: usize = FF_MAX as usize + 1;
+
+// linux/input-event-codes.h
+pub const INPUT_PROP_MAX: ::__u16 = 0x1f;
+pub const INPUT_PROP_CNT: usize = INPUT_PROP_MAX as usize + 1;
+pub const EV_MAX: ::__u16 = 0x1f;
+pub const EV_CNT: usize = EV_MAX as usize + 1;
+pub const SYN_MAX: ::__u16 = 0xf;
+pub const SYN_CNT: usize = SYN_MAX as usize + 1;
+pub const KEY_MAX: ::__u16 = 0x2ff;
+pub const KEY_CNT: usize = KEY_MAX as usize + 1;
+pub const REL_MAX: ::__u16 = 0x0f;
+pub const REL_CNT: usize = REL_MAX as usize + 1;
+pub const ABS_MAX: ::__u16 = 0x3f;
+pub const ABS_CNT: usize = ABS_MAX as usize + 1;
+pub const SW_MAX: ::__u16 = 0x10;
+pub const SW_CNT: usize = SW_MAX as usize + 1;
+pub const MSC_MAX: ::__u16 = 0x07;
+pub const MSC_CNT: usize = MSC_MAX as usize + 1;
+pub const LED_MAX: ::__u16 = 0x0f;
+pub const LED_CNT: usize = LED_MAX as usize + 1;
+pub const REP_MAX: ::__u16 = 0x01;
+pub const REP_CNT: usize = REP_MAX as usize + 1;
+pub const SND_MAX: ::__u16 = 0x07;
+pub const SND_CNT: usize = SND_MAX as usize + 1;
+
+// linux/uinput.h
+pub const UINPUT_VERSION: ::c_uint = 5;
+pub const UINPUT_MAX_NAME_SIZE: usize = 80;
+
 // uapi/linux/fanotify.h
 pub const FAN_ACCESS: u64 = 0x0000_0001;
 pub const FAN_MODIFY: u64 = 0x0000_0002;
@@ -2449,10 +2883,6 @@
 pub const FAN_MARK_REMOVE: ::c_uint = 0x0000_0002;
 pub const FAN_MARK_DONT_FOLLOW: ::c_uint = 0x0000_0004;
 pub const FAN_MARK_ONLYDIR: ::c_uint = 0x0000_0008;
-pub const FAN_MARK_INODE: ::c_uint = 0x0000_0000;
-pub const FAN_MARK_MOUNT: ::c_uint = 0x0000_0010;
-// NOTE: FAN_MARK_FILESYSTEM requires Linux Kernel >= 4.20.0
-pub const FAN_MARK_FILESYSTEM: ::c_uint = 0x0000_0100;
 pub const FAN_MARK_IGNORED_MASK: ::c_uint = 0x0000_0020;
 pub const FAN_MARK_IGNORED_SURV_MODIFY: ::c_uint = 0x0000_0040;
 pub const FAN_MARK_FLUSH: ::c_uint = 0x0000_0080;
@@ -2480,8 +2910,7 @@
 
 pub const FUTEX_PRIVATE_FLAG: ::c_int = 128;
 pub const FUTEX_CLOCK_REALTIME: ::c_int = 256;
-pub const FUTEX_CMD_MASK: ::c_int =
-    !(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME);
+pub const FUTEX_CMD_MASK: ::c_int = !(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME);
 
 // linux/reboot.h
 pub const LINUX_REBOOT_MAGIC1: ::c_int = 0xfee1dead;
@@ -2567,6 +2996,51 @@
 pub const ERANGE: ::c_int = 34;
 pub const EWOULDBLOCK: ::c_int = EAGAIN;
 
+// linux/can.h
+pub const CAN_EFF_FLAG: canid_t = 0x80000000;
+pub const CAN_RTR_FLAG: canid_t = 0x40000000;
+pub const CAN_ERR_FLAG: canid_t = 0x20000000;
+pub const CAN_SFF_MASK: canid_t = 0x000007FF;
+pub const CAN_EFF_MASK: canid_t = 0x1FFFFFFF;
+pub const CAN_ERR_MASK: canid_t = 0x1FFFFFFF;
+
+pub const CAN_SFF_ID_BITS: ::c_int = 11;
+pub const CAN_EFF_ID_BITS: ::c_int = 29;
+
+pub const CAN_MAX_DLC: ::c_int = 8;
+pub const CAN_MAX_DLEN: usize = 8;
+pub const CANFD_MAX_DLC: ::c_int = 15;
+pub const CANFD_MAX_DLEN: usize = 64;
+
+pub const CANFD_BRS: ::c_int = 0x01;
+pub const CANFD_ESI: ::c_int = 0x02;
+
+cfg_if! {
+    if #[cfg(libc_align)] {
+        pub const CAN_MTU: usize = ::mem::size_of::<can_frame>();
+        pub const CANFD_MTU: usize = ::mem::size_of::<canfd_frame>();
+    }
+}
+
+pub const CAN_RAW: ::c_int = 1;
+pub const CAN_BCM: ::c_int = 2;
+pub const CAN_TP16: ::c_int = 3;
+pub const CAN_TP20: ::c_int = 4;
+pub const CAN_MCNET: ::c_int = 5;
+pub const CAN_ISOTP: ::c_int = 6;
+pub const CAN_J1939: ::c_int = 7;
+pub const CAN_NPROTO: ::c_int = 8;
+
+pub const SOL_CAN_BASE: ::c_int = 100;
+
+pub const CAN_INV_FILTER: canid_t = 0x20000000;
+pub const CAN_RAW_FILTER_MAX: ::c_int = 512;
+
+#[cfg(not(any(target_arch = "sparc", target_arch = "sparc64")))]
+pub const POLLRDHUP: ::c_int = 0x2000;
+#[cfg(any(target_arch = "sparc", target_arch = "sparc64"))]
+pub const POLLRDHUP: ::c_int = 0x800;
+
 f! {
     pub fn NLA_ALIGN(len: ::c_int) -> ::c_int {
         return ((len) + NLA_ALIGNTO - 1) & !(NLA_ALIGNTO - 1)
@@ -2692,13 +3166,78 @@
     }
 }
 
+cfg_if! {
+    if #[cfg(not(target_env = "uclibc"))] {
+        extern "C" {
+            pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
+            pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
+            pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
+            pub fn aio_error(aiocbp: *const aiocb) -> ::c_int;
+            pub fn aio_return(aiocbp: *mut aiocb) -> ::ssize_t;
+            pub fn aio_suspend(
+                aiocb_list: *const *const aiocb,
+                nitems: ::c_int,
+                timeout: *const ::timespec,
+            ) -> ::c_int;
+            pub fn aio_cancel(fd: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
+            pub fn lio_listio(
+                mode: ::c_int,
+                aiocb_list: *const *mut aiocb,
+                nitems: ::c_int,
+                sevp: *mut ::sigevent,
+            ) -> ::c_int;
+            pub fn pwritev(
+                fd: ::c_int,
+                iov: *const ::iovec,
+                iovcnt: ::c_int,
+                offset: ::off_t,
+            ) -> ::ssize_t;
+            pub fn preadv(
+                fd: ::c_int,
+                iov: *const ::iovec,
+                iovcnt: ::c_int,
+                offset: ::off_t,
+            ) -> ::ssize_t;
+            pub fn getnameinfo(
+                sa: *const ::sockaddr,
+                salen: ::socklen_t,
+                host: *mut ::c_char,
+                hostlen: ::socklen_t,
+                serv: *mut ::c_char,
+                sevlen: ::socklen_t,
+                flags: ::c_int,
+            ) -> ::c_int;
+            pub fn getloadavg(
+                loadavg: *mut ::c_double,
+                nelem: ::c_int
+            ) -> ::c_int;
+            pub fn process_vm_readv(
+                pid: ::pid_t,
+                local_iov: *const ::iovec,
+                liovcnt: ::c_ulong,
+                remote_iov: *const ::iovec,
+                riovcnt: ::c_ulong,
+                flags: ::c_ulong,
+            ) -> isize;
+            pub fn process_vm_writev(
+                pid: ::pid_t,
+                local_iov: *const ::iovec,
+                liovcnt: ::c_ulong,
+                remote_iov: *const ::iovec,
+                riovcnt: ::c_ulong,
+                flags: ::c_ulong,
+            ) -> isize;
+            pub fn futimes(
+                fd: ::c_int,
+                times: *const ::timeval
+            ) -> ::c_int;
+        }
+    }
+}
+
 extern "C" {
     #[cfg_attr(not(target_env = "musl"), link_name = "__xpg_strerror_r")]
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     pub fn abs(i: ::c_int) -> ::c_int;
     pub fn atof(s: *const ::c_char) -> ::c_double;
@@ -2706,24 +3245,6 @@
     pub fn rand() -> ::c_int;
     pub fn srand(seed: ::c_uint);
 
-    pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
-    pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
-    pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
-    pub fn aio_error(aiocbp: *const aiocb) -> ::c_int;
-    pub fn aio_return(aiocbp: *mut aiocb) -> ::ssize_t;
-    pub fn aio_suspend(
-        aiocb_list: *const *const aiocb,
-        nitems: ::c_int,
-        timeout: *const ::timespec,
-    ) -> ::c_int;
-    pub fn aio_cancel(fd: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
-    pub fn lio_listio(
-        mode: ::c_int,
-        aiocb_list: *const *mut aiocb,
-        nitems: ::c_int,
-        sevp: *mut ::sigevent,
-    ) -> ::c_int;
-
     pub fn lutimes(file: *const ::c_char, times: *const ::timeval) -> ::c_int;
 
     pub fn setpwent();
@@ -2748,40 +3269,18 @@
         spbufp: *mut *mut spwd,
     ) -> ::c_int;
 
-    pub fn shm_open(
-        name: *const c_char,
-        oflag: ::c_int,
-        mode: mode_t,
-    ) -> ::c_int;
+    pub fn shm_open(name: *const c_char, oflag: ::c_int, mode: mode_t) -> ::c_int;
 
     // System V IPC
     pub fn shmget(key: ::key_t, size: ::size_t, shmflg: ::c_int) -> ::c_int;
-    pub fn shmat(
-        shmid: ::c_int,
-        shmaddr: *const ::c_void,
-        shmflg: ::c_int,
-    ) -> *mut ::c_void;
+    pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
     pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
-    pub fn shmctl(
-        shmid: ::c_int,
-        cmd: ::c_int,
-        buf: *mut ::shmid_ds,
-    ) -> ::c_int;
+    pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
     pub fn ftok(pathname: *const ::c_char, proj_id: ::c_int) -> ::key_t;
     pub fn semget(key: ::key_t, nsems: ::c_int, semflag: ::c_int) -> ::c_int;
-    pub fn semop(
-        semid: ::c_int,
-        sops: *mut ::sembuf,
-        nsops: ::size_t,
-    ) -> ::c_int;
-    pub fn semctl(
-        semid: ::c_int,
-        semnum: ::c_int,
-        cmd: ::c_int,
-        ...
-    ) -> ::c_int;
-    pub fn msgctl(msqid: ::c_int, cmd: ::c_int, buf: *mut msqid_ds)
-        -> ::c_int;
+    pub fn semop(semid: ::c_int, sops: *mut ::sembuf, nsops: ::size_t) -> ::c_int;
+    pub fn semctl(semid: ::c_int, semnum: ::c_int, cmd: ::c_int, ...) -> ::c_int;
+    pub fn msgctl(msqid: ::c_int, cmd: ::c_int, buf: *mut msqid_ds) -> ::c_int;
     pub fn msgget(key: ::key_t, msgflg: ::c_int) -> ::c_int;
     pub fn msgrcv(
         msqid: ::c_int,
@@ -2797,17 +3296,10 @@
         msgflg: ::c_int,
     ) -> ::c_int;
 
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn __errno_location() -> *mut ::c_int;
 
-    pub fn fopen64(
-        filename: *const c_char,
-        mode: *const c_char,
-    ) -> *mut ::FILE;
+    pub fn fopen64(filename: *const c_char, mode: *const c_char) -> *mut ::FILE;
     pub fn freopen64(
         filename: *const c_char,
         mode: *const c_char,
@@ -2816,39 +3308,13 @@
     pub fn tmpfile64() -> *mut ::FILE;
     pub fn fgetpos64(stream: *mut ::FILE, ptr: *mut fpos64_t) -> ::c_int;
     pub fn fsetpos64(stream: *mut ::FILE, ptr: *const fpos64_t) -> ::c_int;
-    pub fn fseeko64(
-        stream: *mut ::FILE,
-        offset: ::off64_t,
-        whence: ::c_int,
-    ) -> ::c_int;
+    pub fn fseeko64(stream: *mut ::FILE, offset: ::off64_t, whence: ::c_int) -> ::c_int;
     pub fn ftello64(stream: *mut ::FILE) -> ::off64_t;
-    pub fn fallocate(
-        fd: ::c_int,
-        mode: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
-    pub fn fallocate64(
-        fd: ::c_int,
-        mode: ::c_int,
-        offset: ::off64_t,
-        len: ::off64_t,
-    ) -> ::c_int;
-    pub fn posix_fallocate(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
-    pub fn posix_fallocate64(
-        fd: ::c_int,
-        offset: ::off64_t,
-        len: ::off64_t,
-    ) -> ::c_int;
-    pub fn readahead(
-        fd: ::c_int,
-        offset: ::off64_t,
-        count: ::size_t,
-    ) -> ::ssize_t;
+    pub fn fallocate(fd: ::c_int, mode: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
+    pub fn fallocate64(fd: ::c_int, mode: ::c_int, offset: ::off64_t, len: ::off64_t) -> ::c_int;
+    pub fn posix_fallocate(fd: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
+    pub fn posix_fallocate64(fd: ::c_int, offset: ::off64_t, len: ::off64_t) -> ::c_int;
+    pub fn readahead(fd: ::c_int, offset: ::off64_t, count: ::size_t) -> ::ssize_t;
     pub fn getxattr(
         path: *const c_char,
         name: *const c_char,
@@ -2888,52 +3354,21 @@
         size: ::size_t,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn listxattr(
-        path: *const c_char,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn llistxattr(
-        path: *const c_char,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn flistxattr(
-        filedes: ::c_int,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
+    pub fn listxattr(path: *const c_char, list: *mut c_char, size: ::size_t) -> ::ssize_t;
+    pub fn llistxattr(path: *const c_char, list: *mut c_char, size: ::size_t) -> ::ssize_t;
+    pub fn flistxattr(filedes: ::c_int, list: *mut c_char, size: ::size_t) -> ::ssize_t;
     pub fn removexattr(path: *const c_char, name: *const c_char) -> ::c_int;
     pub fn lremovexattr(path: *const c_char, name: *const c_char) -> ::c_int;
     pub fn fremovexattr(filedes: ::c_int, name: *const c_char) -> ::c_int;
-    pub fn signalfd(
-        fd: ::c_int,
-        mask: *const ::sigset_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn timerfd_create(clockid: ::c_int, flags: ::c_int) -> ::c_int;
-    pub fn timerfd_gettime(
-        fd: ::c_int,
-        curr_value: *mut itimerspec,
-    ) -> ::c_int;
+    pub fn signalfd(fd: ::c_int, mask: *const ::sigset_t, flags: ::c_int) -> ::c_int;
+    pub fn timerfd_create(clockid: ::clockid_t, flags: ::c_int) -> ::c_int;
+    pub fn timerfd_gettime(fd: ::c_int, curr_value: *mut itimerspec) -> ::c_int;
     pub fn timerfd_settime(
         fd: ::c_int,
         flags: ::c_int,
         new_value: *const itimerspec,
         old_value: *mut itimerspec,
     ) -> ::c_int;
-    pub fn pwritev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn preadv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
     pub fn quotactl(
         cmd: ::c_int,
         special: *const ::c_char,
@@ -2970,11 +3405,7 @@
         abs_timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
-    pub fn mq_setattr(
-        mqd: ::mqd_t,
-        newattr: *const ::mq_attr,
-        oldattr: *mut ::mq_attr,
-    ) -> ::c_int;
+    pub fn mq_setattr(mqd: ::mqd_t, newattr: *const ::mq_attr, oldattr: *mut ::mq_attr) -> ::c_int;
     pub fn epoll_pwait(
         epfd: ::c_int,
         events: *mut ::epoll_event,
@@ -2984,65 +3415,27 @@
     ) -> ::c_int;
     pub fn dup3(oldfd: ::c_int, newfd: ::c_int, flags: ::c_int) -> ::c_int;
     pub fn mkostemp(template: *mut ::c_char, flags: ::c_int) -> ::c_int;
-    pub fn mkostemps(
-        template: *mut ::c_char,
-        suffixlen: ::c_int,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn mkostemps(template: *mut ::c_char, suffixlen: ::c_int, flags: ::c_int) -> ::c_int;
     pub fn sigtimedwait(
         set: *const sigset_t,
         info: *mut siginfo_t,
         timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn sigwaitinfo(set: *const sigset_t, info: *mut siginfo_t) -> ::c_int;
-    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t)
-        -> *mut ::c_char;
+    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t) -> *mut ::c_char;
     pub fn accept4(
         fd: ::c_int,
         addr: *mut ::sockaddr,
         len: *mut ::socklen_t,
         flg: ::c_int,
     ) -> ::c_int;
-    pub fn getnameinfo(
-        sa: *const ::sockaddr,
-        salen: ::socklen_t,
-        host: *mut ::c_char,
-        hostlen: ::socklen_t,
-        serv: *mut ::c_char,
-        sevlen: ::socklen_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn pthread_setschedprio(
-        native: ::pthread_t,
-        priority: ::c_int,
-    ) -> ::c_int;
-    pub fn getloadavg(loadavg: *mut ::c_double, nelem: ::c_int) -> ::c_int;
-    pub fn process_vm_readv(
-        pid: ::pid_t,
-        local_iov: *const ::iovec,
-        liovcnt: ::c_ulong,
-        remote_iov: *const ::iovec,
-        riovcnt: ::c_ulong,
-        flags: ::c_ulong,
-    ) -> isize;
-    pub fn process_vm_writev(
-        pid: ::pid_t,
-        local_iov: *const ::iovec,
-        liovcnt: ::c_ulong,
-        remote_iov: *const ::iovec,
-        riovcnt: ::c_ulong,
-        flags: ::c_ulong,
-    ) -> isize;
+    pub fn pthread_setschedprio(native: ::pthread_t, priority: ::c_int) -> ::c_int;
     pub fn reboot(how_to: ::c_int) -> ::c_int;
     pub fn setfsgid(gid: ::gid_t) -> ::c_int;
     pub fn setfsuid(uid: ::uid_t) -> ::c_int;
 
     // Not available now on Android
-    pub fn mkfifoat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
     pub fn if_nameindex() -> *mut if_nameindex;
     pub fn if_freenameindex(ptr: *mut if_nameindex);
     pub fn sync_file_range(
@@ -3062,35 +3455,21 @@
     pub fn glob(
         pattern: *const c_char,
         flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const c_char, errno: ::c_int) -> ::c_int,
-        >,
+        errfunc: ::Option<extern "C" fn(epath: *const c_char, errno: ::c_int) -> ::c_int>,
         pglob: *mut ::glob_t,
     ) -> ::c_int;
     pub fn globfree(pglob: *mut ::glob_t);
 
-    pub fn posix_madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
     pub fn shm_unlink(name: *const ::c_char) -> ::c_int;
 
     pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long);
 
     pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
-    pub fn madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn msync(addr: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::c_int;
     pub fn remap_file_pages(
         addr: *mut ::c_void,
         size: ::size_t,
@@ -3107,19 +3486,17 @@
         addrlen: *mut ::socklen_t,
     ) -> ::ssize_t;
     pub fn mkstemps(template: *mut ::c_char, suffixlen: ::c_int) -> ::c_int;
-    pub fn futimes(fd: ::c_int, times: *const ::timeval) -> ::c_int;
+
     pub fn nl_langinfo(item: ::nl_item) -> *mut ::c_char;
 
     pub fn getdomainname(name: *mut ::c_char, len: ::size_t) -> ::c_int;
     pub fn setdomainname(name: *const ::c_char, len: ::size_t) -> ::c_int;
     pub fn vhangup() -> ::c_int;
     pub fn sync();
+    pub fn syncfs(fd: ::c_int) -> ::c_int;
     pub fn syscall(num: ::c_long, ...) -> ::c_long;
-    pub fn sched_getaffinity(
-        pid: ::pid_t,
-        cpusetsize: ::size_t,
-        cpuset: *mut cpu_set_t,
-    ) -> ::c_int;
+    pub fn sched_getaffinity(pid: ::pid_t, cpusetsize: ::size_t, cpuset: *mut cpu_set_t)
+        -> ::c_int;
     pub fn sched_setaffinity(
         pid: ::pid_t,
         cpusetsize: ::size_t,
@@ -3133,12 +3510,8 @@
         maxevents: ::c_int,
         timeout: ::c_int,
     ) -> ::c_int;
-    pub fn epoll_ctl(
-        epfd: ::c_int,
-        op: ::c_int,
-        fd: ::c_int,
-        event: *mut ::epoll_event,
-    ) -> ::c_int;
+    pub fn epoll_ctl(epfd: ::c_int, op: ::c_int, fd: ::c_int, event: *mut ::epoll_event)
+        -> ::c_int;
     pub fn pthread_getschedparam(
         native: ::pthread_t,
         policy: *mut ::c_int,
@@ -3147,16 +3520,8 @@
     pub fn unshare(flags: ::c_int) -> ::c_int;
     pub fn umount(target: *const ::c_char) -> ::c_int;
     pub fn sched_get_priority_max(policy: ::c_int) -> ::c_int;
-    pub fn tee(
-        fd_in: ::c_int,
-        fd_out: ::c_int,
-        len: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
-    pub fn settimeofday(
-        tv: *const ::timeval,
-        tz: *const ::timezone,
-    ) -> ::c_int;
+    pub fn tee(fd_in: ::c_int, fd_out: ::c_int, len: ::size_t, flags: ::c_uint) -> ::ssize_t;
+    pub fn settimeofday(tv: *const ::timeval, tz: *const ::timezone) -> ::c_int;
     pub fn splice(
         fd_in: ::c_int,
         off_in: *mut ::loff_t,
@@ -3166,19 +3531,12 @@
         flags: ::c_uint,
     ) -> ::ssize_t;
     pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int;
-    pub fn sched_rr_get_interval(pid: ::pid_t, tp: *mut ::timespec)
-        -> ::c_int;
-    pub fn sem_timedwait(
-        sem: *mut sem_t,
-        abstime: *const ::timespec,
-    ) -> ::c_int;
+    pub fn sched_rr_get_interval(pid: ::pid_t, tp: *mut ::timespec) -> ::c_int;
+    pub fn sem_timedwait(sem: *mut sem_t, abstime: *const ::timespec) -> ::c_int;
     pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int;
-    pub fn sched_setparam(
-        pid: ::pid_t,
-        param: *const ::sched_param,
-    ) -> ::c_int;
+    pub fn sched_setparam(pid: ::pid_t, param: *const ::sched_param) -> ::c_int;
     pub fn setns(fd: ::c_int, nstype: ::c_int) -> ::c_int;
-    pub fn swapoff(puath: *const ::c_char) -> ::c_int;
+    pub fn swapoff(path: *const ::c_char) -> ::c_int;
     pub fn vmsplice(
         fd: ::c_int,
         iov: *const ::iovec,
@@ -3205,6 +3563,11 @@
         lock: *mut pthread_mutex_t,
         abstime: *const ::timespec,
     ) -> ::c_int;
+    pub fn pthread_spin_init(lock: *mut ::pthread_spinlock_t, pshared: ::c_int) -> ::c_int;
+    pub fn pthread_spin_destroy(lock: *mut ::pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_lock(lock: *mut ::pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_trylock(lock: *mut ::pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_unlock(lock: *mut ::pthread_spinlock_t) -> ::c_int;
     pub fn clone(
         cb: extern "C" fn(*mut ::c_void) -> ::c_int,
         child_stack: *mut ::c_void,
@@ -3273,11 +3636,7 @@
         result: *mut *mut ::group,
     ) -> ::c_int;
     pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sem_open(name: *const ::c_char, oflag: ::c_int, ...) -> *mut sem_t;
     pub fn getgrnam(name: *const ::c_char) -> *mut ::group;
     pub fn pthread_cancel(thread: ::pthread_t) -> ::c_int;
@@ -3339,17 +3698,11 @@
         data: *mut ::c_void,
     ) -> ::c_int;
 
-    pub fn setmntent(
-        filename: *const ::c_char,
-        ty: *const ::c_char,
-    ) -> *mut ::FILE;
+    pub fn setmntent(filename: *const ::c_char, ty: *const ::c_char) -> *mut ::FILE;
     pub fn getmntent(stream: *mut ::FILE) -> *mut ::mntent;
     pub fn addmntent(stream: *mut ::FILE, mnt: *const ::mntent) -> ::c_int;
     pub fn endmntent(streamp: *mut ::FILE) -> ::c_int;
-    pub fn hasmntopt(
-        mnt: *const ::mntent,
-        opt: *const ::c_char,
-    ) -> *mut ::c_char;
+    pub fn hasmntopt(mnt: *const ::mntent, opt: *const ::c_char) -> *mut ::c_char;
 
     pub fn posix_spawn(
         pid: *mut ::pid_t,
@@ -3389,26 +3742,17 @@
         attr: *const posix_spawnattr_t,
         flags: *mut ::c_short,
     ) -> ::c_int;
-    pub fn posix_spawnattr_setflags(
-        attr: *mut posix_spawnattr_t,
-        flags: ::c_short,
-    ) -> ::c_int;
+    pub fn posix_spawnattr_setflags(attr: *mut posix_spawnattr_t, flags: ::c_short) -> ::c_int;
     pub fn posix_spawnattr_getpgroup(
         attr: *const posix_spawnattr_t,
         flags: *mut ::pid_t,
     ) -> ::c_int;
-    pub fn posix_spawnattr_setpgroup(
-        attr: *mut posix_spawnattr_t,
-        flags: ::pid_t,
-    ) -> ::c_int;
+    pub fn posix_spawnattr_setpgroup(attr: *mut posix_spawnattr_t, flags: ::pid_t) -> ::c_int;
     pub fn posix_spawnattr_getschedpolicy(
         attr: *const posix_spawnattr_t,
         flags: *mut ::c_int,
     ) -> ::c_int;
-    pub fn posix_spawnattr_setschedpolicy(
-        attr: *mut posix_spawnattr_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_spawnattr_setschedpolicy(attr: *mut posix_spawnattr_t, flags: ::c_int) -> ::c_int;
     pub fn posix_spawnattr_getschedparam(
         attr: *const posix_spawnattr_t,
         param: *mut ::sched_param,
@@ -3418,12 +3762,8 @@
         param: *const ::sched_param,
     ) -> ::c_int;
 
-    pub fn posix_spawn_file_actions_init(
-        actions: *mut posix_spawn_file_actions_t,
-    ) -> ::c_int;
-    pub fn posix_spawn_file_actions_destroy(
-        actions: *mut posix_spawn_file_actions_t,
-    ) -> ::c_int;
+    pub fn posix_spawn_file_actions_init(actions: *mut posix_spawn_file_actions_t) -> ::c_int;
+    pub fn posix_spawn_file_actions_destroy(actions: *mut posix_spawn_file_actions_t) -> ::c_int;
     pub fn posix_spawn_file_actions_addopen(
         actions: *mut posix_spawn_file_actions_t,
         fd: ::c_int,
@@ -3449,18 +3789,10 @@
     pub fn inotify_rm_watch(fd: ::c_int, wd: ::c_int) -> ::c_int;
     pub fn inotify_init() -> ::c_int;
     pub fn inotify_init1(flags: ::c_int) -> ::c_int;
-    pub fn inotify_add_watch(
-        fd: ::c_int,
-        path: *const ::c_char,
-        mask: u32,
-    ) -> ::c_int;
+    pub fn inotify_add_watch(fd: ::c_int, path: *const ::c_char, mask: u32) -> ::c_int;
     pub fn fanotify_init(flags: ::c_uint, event_f_flags: ::c_uint) -> ::c_int;
 
-    pub fn regcomp(
-        preg: *mut ::regex_t,
-        pattern: *const ::c_char,
-        cflags: ::c_int,
-    ) -> ::c_int;
+    pub fn regcomp(preg: *mut ::regex_t, pattern: *const ::c_char, cflags: ::c_int) -> ::c_int;
 
     pub fn regexec(
         preg: *const ::regex_t,
@@ -3478,10 +3810,42 @@
     ) -> ::size_t;
 
     pub fn regfree(preg: *mut ::regex_t);
+
+    pub fn iconv_open(tocode: *const ::c_char, fromcode: *const ::c_char) -> iconv_t;
+    pub fn iconv(
+        cd: iconv_t,
+        inbuf: *mut *mut ::c_char,
+        inbytesleft: *mut ::size_t,
+        outbuf: *mut *mut ::c_char,
+        outbytesleft: *mut ::size_t,
+    ) -> ::size_t;
+    pub fn iconv_close(cd: iconv_t) -> ::c_int;
+
+    pub fn gettid() -> ::pid_t;
+
+    pub fn timer_create(
+        clockid: ::clockid_t,
+        sevp: *mut ::sigevent,
+        timerid: *mut ::timer_t,
+    ) -> ::c_int;
+    pub fn timer_delete(timerid: ::timer_t) -> ::c_int;
+    pub fn timer_getoverrun(timerid: ::timer_t) -> ::c_int;
+    pub fn timer_gettime(timerid: ::timer_t, curr_value: *mut ::itimerspec) -> ::c_int;
+    pub fn timer_settime(
+        timerid: ::timer_t,
+        flags: ::c_int,
+        new_value: *const ::itimerspec,
+        old_value: *mut ::itimerspec,
+    ) -> ::c_int;
+
+    pub fn gethostid() -> ::c_long;
 }
 
 cfg_if! {
-    if #[cfg(target_env = "musl")] {
+    if #[cfg(target_env = "uclibc")] {
+        mod uclibc;
+        pub use self::uclibc::*;
+    } else if #[cfg(target_env = "musl")] {
         mod musl;
         pub use self::musl::*;
     } else if #[cfg(target_env = "gnu")] {
@@ -3490,6 +3854,9 @@
     }
 }
 
+mod arch;
+pub use self::arch::*;
+
 cfg_if! {
     if #[cfg(libc_align)] {
         #[macro_use]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/arm/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/arm/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/arm/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/arm/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -171,6 +171,7 @@
 pub const RLIMIT_NPROC: ::c_int = 6;
 pub const RLIMIT_MEMLOCK: ::c_int = 8;
 pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 
 pub const MADV_SOFT_OFFLINE: ::c_int = 101;
 pub const MCL_CURRENT: ::c_int = 0x0001;
@@ -262,14 +263,12 @@
 pub const MAP_POPULATE: ::c_int = 0x08000;
 pub const MAP_NONBLOCK: ::c_int = 0x010000;
 pub const MAP_STACK: ::c_int = 0x020000;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 pub const SOCK_SEQPACKET: ::c_int = 5;
 
-pub const SOL_SOCKET: ::c_int = 1;
-
 pub const EDEADLK: ::c_int = 35;
 pub const ENAMETOOLONG: ::c_int = 36;
 pub const ENOLCK: ::c_int = 37;
@@ -356,32 +355,6 @@
 pub const ERFKILL: ::c_int = 132;
 pub const EHWPOISON: ::c_int = 133;
 
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-
 pub const SA_ONSTACK: ::c_int = 0x08000000;
 pub const SA_SIGINFO: ::c_int = 0x00000004;
 pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
@@ -832,13 +805,28 @@
 pub const SYS_pkey_alloc: ::c_long = 395;
 pub const SYS_pkey_free: ::c_long = 396;
 pub const SYS_statx: ::c_long = 397;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
+pub const SYS_pidfd_open: ::c_long = 434;
+pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 extern "C" {
-    pub fn getrandom(
-        buf: *mut ::c_void,
-        buflen: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
+    pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/hexagon.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/hexagon.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/hexagon.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/hexagon.rs	2021-12-09 12:01:26.000000000 +0000
@@ -317,65 +317,19 @@
 pub const SIG_SETMASK: ::c_int = 2; // FIXME check these
 pub const SIG_BLOCK: ::c_int = 0x000000;
 pub const SIG_UNBLOCK: ::c_int = 0x01;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_ATTACH_REUSEPORT_CBPF: ::c_int = 51;
-pub const SO_ATTACH_REUSEPORT_EBPF: ::c_int = 52;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_BSDCOMPAT: ::c_int = 14;
 pub const SOCK_DGRAM: ::c_int = 2;
 pub const SOCK_NONBLOCK: ::c_int = 2048;
 pub const SOCK_SEQPACKET: ::c_int = 5;
 pub const SOCK_STREAM: ::c_int = 1;
-pub const SO_CNX_ADVICE: ::c_int = 53;
-pub const SO_DETACH_BPF: ::c_int = 27;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_DOMAIN: ::c_int = 39;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_GET_FILTER: ::c_int = 26;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_KEEPALIVE: ::c_int = 9;
 pub const SOL_CAIF: ::c_int = 278;
-pub const SO_LINGER: ::c_int = 13;
 pub const SOL_IUCV: ::c_int = 277;
 pub const SOL_KCM: ::c_int = 281;
 pub const SOL_NFC: ::c_int = 280;
-pub const SO_LOCK_FILTER: ::c_int = 44;
 pub const SOL_PNPIPE: ::c_int = 275;
 pub const SOL_PPPOL2TP: ::c_int = 273;
 pub const SOL_RDS: ::c_int = 276;
 pub const SOL_RXRPC: ::c_int = 272;
-pub const SOL_SOCKET: ::c_int = 1;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_PEERSEC: ::c_int = 31;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_WIFI_STATUS: ::c_int = 41;
+
 pub const SYS3264_fadvise64: ::c_int = 223;
 pub const SYS3264_fcntl: ::c_int = 25;
 pub const SYS3264_fstatat: ::c_int = 79;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/mips/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/mips/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/mips/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/mips/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -182,6 +182,7 @@
 pub const RLIMIT_NPROC: ::c_int = 8;
 pub const RLIMIT_MEMLOCK: ::c_int = 9;
 pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 
 pub const MCL_CURRENT: ::c_int = 0x0001;
 pub const MCL_FUTURE: ::c_int = 0x0002;
@@ -363,34 +364,6 @@
 pub const SOCK_DGRAM: ::c_int = 1;
 pub const SOCK_SEQPACKET: ::c_int = 5;
 
-pub const SOL_SOCKET: ::c_int = 65535;
-
-pub const SO_REUSEADDR: ::c_int = 0x0004;
-pub const SO_KEEPALIVE: ::c_int = 0x0008;
-pub const SO_DONTROUTE: ::c_int = 0x0010;
-pub const SO_BROADCAST: ::c_int = 0x0020;
-pub const SO_LINGER: ::c_int = 0x0080;
-pub const SO_OOBINLINE: ::c_int = 0x0100;
-pub const SO_REUSEPORT: ::c_int = 0x0200;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDLOWAT: ::c_int = 0x1003;
-pub const SO_RCVLOWAT: ::c_int = 0x1004;
-pub const SO_RCVTIMEO: ::c_int = 0x1006;
-pub const SO_SNDTIMEO: ::c_int = 0x1005;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_ACCEPTCONN: ::c_int = 0x1009;
-pub const SO_PROTOCOL: ::c_int = 0x1028;
-pub const SO_DOMAIN: ::c_int = 0x1029;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_PASSCRED: ::c_int = 17;
-pub const SO_PEERCRED: ::c_int = 18;
-pub const SO_SNDBUFFORCE: ::c_int = 31;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-
 pub const SA_ONSTACK: ::c_int = 0x08000000;
 pub const SA_SIGINFO: ::c_int = 8;
 pub const SA_NOCLDWAIT: ::c_int = 0x10000;
@@ -843,6 +816,25 @@
 pub const SYS_pkey_alloc: ::c_long = 4000 + 364;
 pub const SYS_pkey_free: ::c_long = 4000 + 365;
 pub const SYS_statx: ::c_long = 4000 + 366;
+pub const SYS_pidfd_send_signal: ::c_long = 4000 + 424;
+pub const SYS_io_uring_setup: ::c_long = 4000 + 425;
+pub const SYS_io_uring_enter: ::c_long = 4000 + 426;
+pub const SYS_io_uring_register: ::c_long = 4000 + 427;
+pub const SYS_open_tree: ::c_long = 4000 + 428;
+pub const SYS_move_mount: ::c_long = 4000 + 429;
+pub const SYS_fsopen: ::c_long = 4000 + 430;
+pub const SYS_fsconfig: ::c_long = 4000 + 431;
+pub const SYS_fsmount: ::c_long = 4000 + 432;
+pub const SYS_fspick: ::c_long = 4000 + 433;
+pub const SYS_pidfd_open: ::c_long = 4000 + 434;
+pub const SYS_clone3: ::c_long = 4000 + 435;
+pub const SYS_close_range: ::c_long = 4000 + 436;
+pub const SYS_openat2: ::c_long = 4000 + 437;
+pub const SYS_pidfd_getfd: ::c_long = 4000 + 438;
+pub const SYS_faccessat2: ::c_long = 4000 + 439;
+pub const SYS_process_madvise: ::c_long = 4000 + 440;
+pub const SYS_epoll_pwait2: ::c_long = 4000 + 441;
+pub const SYS_mount_setattr: ::c_long = 4000 + 442;
 
 cfg_if! {
     if #[cfg(libc_align)] {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/powerpc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/powerpc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/powerpc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/powerpc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -175,6 +175,7 @@
 pub const RLIMIT_NPROC: ::c_int = 6;
 pub const RLIMIT_MEMLOCK: ::c_int = 8;
 pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 
 pub const MCL_CURRENT: ::c_int = 0x2000;
 pub const MCL_FUTURE: ::c_int = 0x4000;
@@ -270,8 +271,6 @@
 pub const SOCK_DGRAM: ::c_int = 2;
 pub const SOCK_SEQPACKET: ::c_int = 5;
 
-pub const SOL_SOCKET: ::c_int = 1;
-
 pub const EDEADLK: ::c_int = 35;
 pub const ENAMETOOLONG: ::c_int = 36;
 pub const ENOLCK: ::c_int = 37;
@@ -358,32 +357,6 @@
 pub const ERFKILL: ::c_int = 132;
 pub const EHWPOISON: ::c_int = 133;
 
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_RCVLOWAT: ::c_int = 16;
-pub const SO_SNDLOWAT: ::c_int = 17;
-pub const SO_RCVTIMEO: ::c_int = 18;
-pub const SO_SNDTIMEO: ::c_int = 19;
-pub const SO_PASSCRED: ::c_int = 20;
-pub const SO_PEERCRED: ::c_int = 21;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-
 pub const SA_ONSTACK: ::c_int = 0x08000000;
 pub const SA_SIGINFO: ::c_int = 0x00000004;
 pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
@@ -856,11 +829,26 @@
 pub const SYS_pkey_alloc: ::c_long = 384;
 pub const SYS_pkey_free: ::c_long = 385;
 pub const SYS_pkey_mprotect: ::c_long = 386;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
+pub const SYS_pidfd_open: ::c_long = 434;
+pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 extern "C" {
-    pub fn getrandom(
-        buf: *mut ::c_void,
-        buflen: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
+    pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/x86/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/x86/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/x86/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b32/x86/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -231,6 +231,7 @@
 pub const RLIMIT_NPROC: ::c_int = 6;
 pub const RLIMIT_MEMLOCK: ::c_int = 8;
 pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 
 pub const MADV_SOFT_OFFLINE: ::c_int = 101;
 pub const MCL_CURRENT: ::c_int = 0x0001;
@@ -322,14 +323,12 @@
 pub const MAP_POPULATE: ::c_int = 0x08000;
 pub const MAP_NONBLOCK: ::c_int = 0x010000;
 pub const MAP_STACK: ::c_int = 0x020000;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
 pub const SOCK_SEQPACKET: ::c_int = 5;
 
-pub const SOL_SOCKET: ::c_int = 1;
-
 pub const EDEADLK: ::c_int = 35;
 pub const ENAMETOOLONG: ::c_int = 36;
 pub const ENOLCK: ::c_int = 37;
@@ -416,32 +415,6 @@
 pub const ERFKILL: ::c_int = 132;
 pub const EHWPOISON: ::c_int = 133;
 
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
-
 pub const SA_ONSTACK: ::c_int = 0x08000000;
 pub const SA_SIGINFO: ::c_int = 0x00000004;
 pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
@@ -922,6 +895,25 @@
 pub const SYS_pkey_alloc: ::c_long = 381;
 pub const SYS_pkey_free: ::c_long = 382;
 pub const SYS_statx: ::c_long = 383;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
+pub const SYS_pidfd_open: ::c_long = 434;
+pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 // offsets in user_regs_structs, from sys/reg.h
 pub const EBX: ::c_int = 0;
@@ -943,11 +935,7 @@
 pub const SS: ::c_int = 16;
 
 extern "C" {
-    pub fn getrandom(
-        buf: *mut ::c_void,
-        buflen: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
+    pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/aarch64/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/aarch64/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/aarch64/align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/aarch64/align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
     }
 }
 
-s!{
+s! {
     pub struct ucontext_t {
         pub uc_flags: ::c_ulong,
         pub uc_link: *mut ucontext_t,
@@ -17,9 +17,11 @@
 
     #[repr(align(16))]
     pub struct mcontext_t {
-        // What we want here is a single [u64; 36 + 512], but splitting things
-        // up allows Debug to be auto-derived.
-        __regs1: [[u64; 18]; 2], // 36
-        __regs2: [[u64; 32]; 16], // 512
+        pub fault_address: ::c_ulong,
+        pub regs: [::c_ulong; 31],
+        pub sp: ::c_ulong,
+        pub pc: ::c_ulong,
+        pub pstate: ::c_ulong,
+        __reserved: [[u64; 32]; 16],
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -160,6 +160,40 @@
 pub const ERFKILL: ::c_int = 132;
 pub const EHWPOISON: ::c_int = 133;
 
+// bits/hwcap.h
+pub const HWCAP_FP: ::c_ulong = 1 << 0;
+pub const HWCAP_ASIMD: ::c_ulong = 1 << 1;
+pub const HWCAP_EVTSTRM: ::c_ulong = 1 << 2;
+pub const HWCAP_AES: ::c_ulong = 1 << 3;
+pub const HWCAP_PMULL: ::c_ulong = 1 << 4;
+pub const HWCAP_SHA1: ::c_ulong = 1 << 5;
+pub const HWCAP_SHA2: ::c_ulong = 1 << 6;
+pub const HWCAP_CRC32: ::c_ulong = 1 << 7;
+pub const HWCAP_ATOMICS: ::c_ulong = 1 << 8;
+pub const HWCAP_FPHP: ::c_ulong = 1 << 9;
+pub const HWCAP_ASIMDHP: ::c_ulong = 1 << 10;
+pub const HWCAP_CPUID: ::c_ulong = 1 << 11;
+pub const HWCAP_ASIMDRDM: ::c_ulong = 1 << 12;
+pub const HWCAP_JSCVT: ::c_ulong = 1 << 13;
+pub const HWCAP_FCMA: ::c_ulong = 1 << 14;
+pub const HWCAP_LRCPC: ::c_ulong = 1 << 15;
+pub const HWCAP_DCPOP: ::c_ulong = 1 << 16;
+pub const HWCAP_SHA3: ::c_ulong = 1 << 17;
+pub const HWCAP_SM3: ::c_ulong = 1 << 18;
+pub const HWCAP_SM4: ::c_ulong = 1 << 19;
+pub const HWCAP_ASIMDDP: ::c_ulong = 1 << 20;
+pub const HWCAP_SHA512: ::c_ulong = 1 << 21;
+pub const HWCAP_SVE: ::c_ulong = 1 << 22;
+pub const HWCAP_ASIMDFHM: ::c_ulong = 1 << 23;
+pub const HWCAP_DIT: ::c_ulong = 1 << 24;
+pub const HWCAP_USCAT: ::c_ulong = 1 << 25;
+pub const HWCAP_ILRCPC: ::c_ulong = 1 << 26;
+pub const HWCAP_FLAGM: ::c_ulong = 1 << 27;
+pub const HWCAP_SSBS: ::c_ulong = 1 << 28;
+pub const HWCAP_SB: ::c_ulong = 1 << 29;
+pub const HWCAP_PACA: ::c_ulong = 1 << 30;
+pub const HWCAP_PACG: ::c_ulong = 1 << 31;
+
 pub const MAP_ANON: ::c_int = 0x0020;
 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
 pub const MAP_DENYWRITE: ::c_int = 0x0800;
@@ -174,26 +208,6 @@
 
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
-pub const SOL_SOCKET: ::c_int = 1;
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
 
 pub const SA_ONSTACK: ::c_int = 0x08000000;
 pub const SA_SIGINFO: ::c_int = 0x00000004;
@@ -515,8 +529,28 @@
 pub const SYS_pkey_alloc: ::c_long = 289;
 pub const SYS_pkey_free: ::c_long = 290;
 pub const SYS_statx: ::c_long = 291;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
+pub const SYS_pidfd_open: ::c_long = 434;
+pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 pub const TIOCINQ: ::c_int = ::FIONREAD;
 pub const MCL_CURRENT: ::c_int = 0x0001;
 pub const MCL_FUTURE: ::c_int = 0x0002;
@@ -592,12 +626,7 @@
 pub const FIONBIO: ::c_int = 0x5421;
 pub const EDEADLK: ::c_int = 35;
 pub const EDEADLOCK: ::c_int = EDEADLK;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
+
 pub const EXTPROC: ::tcflag_t = 0x00010000;
 pub const VEOL: usize = 11;
 pub const VEOL2: usize = 16;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/mips64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/mips64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/mips64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/mips64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -425,6 +425,25 @@
 pub const SYS_pkey_alloc: ::c_long = 5000 + 324;
 pub const SYS_pkey_free: ::c_long = 5000 + 325;
 pub const SYS_statx: ::c_long = 5000 + 326;
+pub const SYS_pidfd_send_signal: ::c_long = 5000 + 424;
+pub const SYS_io_uring_setup: ::c_long = 5000 + 425;
+pub const SYS_io_uring_enter: ::c_long = 5000 + 426;
+pub const SYS_io_uring_register: ::c_long = 5000 + 427;
+pub const SYS_open_tree: ::c_long = 5000 + 428;
+pub const SYS_move_mount: ::c_long = 5000 + 429;
+pub const SYS_fsopen: ::c_long = 5000 + 430;
+pub const SYS_fsconfig: ::c_long = 5000 + 431;
+pub const SYS_fsmount: ::c_long = 5000 + 432;
+pub const SYS_fspick: ::c_long = 5000 + 433;
+pub const SYS_pidfd_open: ::c_long = 5000 + 434;
+pub const SYS_clone3: ::c_long = 5000 + 435;
+pub const SYS_close_range: ::c_long = 5000 + 436;
+pub const SYS_openat2: ::c_long = 5000 + 437;
+pub const SYS_pidfd_getfd: ::c_long = 5000 + 438;
+pub const SYS_faccessat2: ::c_long = 5000 + 439;
+pub const SYS_process_madvise: ::c_long = 5000 + 440;
+pub const SYS_epoll_pwait2: ::c_long = 5000 + 441;
+pub const SYS_mount_setattr: ::c_long = 5000 + 442;
 
 pub const O_DIRECT: ::c_int = 0x8000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
@@ -538,55 +557,6 @@
 pub const SOCK_STREAM: ::c_int = 2;
 pub const SOCK_DGRAM: ::c_int = 1;
 
-pub const SOL_SOCKET: ::c_int = 0xffff;
-
-pub const SO_REUSEADDR: ::c_int = 0x0004;
-pub const SO_KEEPALIVE: ::c_int = 0x0008;
-pub const SO_DONTROUTE: ::c_int = 0x0010;
-pub const SO_BROADCAST: ::c_int = 0x0020;
-pub const SO_LINGER: ::c_int = 0x0080;
-pub const SO_OOBINLINE: ::c_int = 0x0100;
-pub const SO_REUSEPORT: ::c_int = 0x0200;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDLOWAT: ::c_int = 0x1003;
-pub const SO_RCVLOWAT: ::c_int = 0x1004;
-pub const SO_SNDTIMEO: ::c_int = 0x1005;
-pub const SO_RCVTIMEO: ::c_int = 0x1006;
-pub const SO_ACCEPTCONN: ::c_int = 0x1009;
-pub const SO_PROTOCOL: ::c_int = 0x1028;
-pub const SO_DOMAIN: ::c_int = 0x1029;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_PASSCRED: ::c_int = 17;
-pub const SO_PEERCRED: ::c_int = 18;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_PEERSEC: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 31;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-pub const SO_INCOMING_CPU: ::c_int = 49;
-pub const SO_ATTACH_BPF: ::c_int = 50;
-pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER;
-
 pub const FIOCLEX: ::c_int = 0x6601;
 pub const FIONCLEX: ::c_int = 0x6602;
 pub const FIONBIO: ::c_int = 0x667e;
@@ -639,37 +609,37 @@
 pub const F_OFD_SETLK: ::c_int = 37;
 pub const F_OFD_SETLKW: ::c_int = 38;
 
-pub const TCGETS: ::c_ulong = 0x540d;
-pub const TCSETS: ::c_ulong = 0x540e;
-pub const TCSETSW: ::c_ulong = 0x540f;
-pub const TCSETSF: ::c_ulong = 0x5410;
-pub const TCGETA: ::c_ulong = 0x5401;
-pub const TCSETA: ::c_ulong = 0x5402;
-pub const TCSETAW: ::c_ulong = 0x5403;
-pub const TCSETAF: ::c_ulong = 0x5404;
-pub const TCSBRK: ::c_ulong = 0x5405;
-pub const TCXONC: ::c_ulong = 0x5406;
-pub const TCFLSH: ::c_ulong = 0x5407;
-pub const TIOCGSOFTCAR: ::c_ulong = 0x5481;
-pub const TIOCSSOFTCAR: ::c_ulong = 0x5482;
-pub const TIOCINQ: ::c_ulong = 0x467f;
-pub const TIOCLINUX: ::c_ulong = 0x5483;
-pub const TIOCGSERIAL: ::c_ulong = 0x5484;
-pub const TIOCEXCL: ::c_ulong = 0x740d;
-pub const TIOCNXCL: ::c_ulong = 0x740e;
-pub const TIOCSCTTY: ::c_ulong = 0x5480;
-pub const TIOCGPGRP: ::c_ulong = 0x40047477;
-pub const TIOCSPGRP: ::c_ulong = 0x80047476;
-pub const TIOCOUTQ: ::c_ulong = 0x7472;
-pub const TIOCSTI: ::c_ulong = 0x5472;
-pub const TIOCGWINSZ: ::c_ulong = 0x40087468;
-pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
-pub const TIOCMGET: ::c_ulong = 0x741d;
-pub const TIOCMBIS: ::c_ulong = 0x741b;
-pub const TIOCMBIC: ::c_ulong = 0x741c;
-pub const TIOCMSET: ::c_ulong = 0x741a;
-pub const FIONREAD: ::c_ulong = 0x467f;
-pub const TIOCCONS: ::c_ulong = 0x80047478;
+pub const TCGETS: ::c_int = 0x540d;
+pub const TCSETS: ::c_int = 0x540e;
+pub const TCSETSW: ::c_int = 0x540f;
+pub const TCSETSF: ::c_int = 0x5410;
+pub const TCGETA: ::c_int = 0x5401;
+pub const TCSETA: ::c_int = 0x5402;
+pub const TCSETAW: ::c_int = 0x5403;
+pub const TCSETAF: ::c_int = 0x5404;
+pub const TCSBRK: ::c_int = 0x5405;
+pub const TCXONC: ::c_int = 0x5406;
+pub const TCFLSH: ::c_int = 0x5407;
+pub const TIOCGSOFTCAR: ::c_int = 0x5481;
+pub const TIOCSSOFTCAR: ::c_int = 0x5482;
+pub const TIOCINQ: ::c_int = 0x467f;
+pub const TIOCLINUX: ::c_int = 0x5483;
+pub const TIOCGSERIAL: ::c_int = 0x5484;
+pub const TIOCEXCL: ::c_int = 0x740d;
+pub const TIOCNXCL: ::c_int = 0x740e;
+pub const TIOCSCTTY: ::c_int = 0x5480;
+pub const TIOCGPGRP: ::c_int = 0x40047477;
+pub const TIOCSPGRP: ::c_int = 0x80047476_u32 as i32;
+pub const TIOCOUTQ: ::c_int = 0x7472;
+pub const TIOCSTI: ::c_int = 0x5472;
+pub const TIOCGWINSZ: ::c_int = 0x40087468;
+pub const TIOCSWINSZ: ::c_int = 0x80087467_u32 as i32;
+pub const TIOCMGET: ::c_int = 0x741d;
+pub const TIOCMBIS: ::c_int = 0x741b;
+pub const TIOCMBIC: ::c_int = 0x741c;
+pub const TIOCMSET: ::c_int = 0x741a;
+pub const FIONREAD: ::c_int = 0x467f;
+pub const TIOCCONS: ::c_int = 0x80047478_u32 as i32;
 
 pub const MCL_CURRENT: ::c_int = 0x0001;
 pub const MCL_FUTURE: ::c_int = 0x0002;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -144,11 +144,7 @@
 pub const SOCK_SEQPACKET: ::c_int = 5;
 
 extern "C" {
-    pub fn getrandom(
-        buf: *mut ::c_void,
-        buflen: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
+    pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
 }
 
 cfg_if! {
@@ -161,6 +157,9 @@
     } else if #[cfg(any(target_arch = "powerpc64"))] {
         mod powerpc64;
         pub use self::powerpc64::*;
+    } else if #[cfg(any(target_arch = "s390x"))] {
+        mod s390x;
+        pub use self::s390x::*;
     } else if #[cfg(any(target_arch = "x86_64"))] {
         mod x86_64;
         pub use self::x86_64::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/powerpc64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/powerpc64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/powerpc64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/powerpc64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -170,30 +170,10 @@
 pub const MAP_NONBLOCK: ::c_int = 0x010000;
 pub const MAP_STACK: ::c_int = 0x020000;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
-pub const SOL_SOCKET: ::c_int = 1;
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
 
 pub const SA_ONSTACK: ::c_int = 0x08000000;
 pub const SA_SIGINFO: ::c_int = 0x00000004;
@@ -601,18 +581,32 @@
 pub const SYS_pwritev2: ::c_long = 381;
 pub const SYS_kexec_file_load: ::c_long = 382;
 pub const SYS_statx: ::c_long = 383;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
+pub const SYS_pidfd_open: ::c_long = 434;
+pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 pub const FIOCLEX: ::c_int = 0x20006601;
 pub const FIONCLEX: ::c_int = 0x20006602;
 pub const FIONBIO: ::c_int = 0x8004667e;
 pub const EDEADLK: ::c_int = 58;
 pub const EDEADLOCK: ::c_int = EDEADLK;
-pub const SO_PASSCRED: ::c_int = 20;
-pub const SO_PEERCRED: ::c_int = 21;
-pub const SO_RCVLOWAT: ::c_int = 16;
-pub const SO_SNDLOWAT: ::c_int = 17;
-pub const SO_RCVTIMEO: ::c_int = 18;
-pub const SO_SNDTIMEO: ::c_int = 19;
+
 pub const EXTPROC: ::tcflag_t = 0x10000000;
 pub const VEOL: usize = 6;
 pub const VEOL2: usize = 8;
@@ -665,6 +659,7 @@
 pub const TIOCSRS485: ::c_int = 0x542F;
 
 pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 pub const TIOCINQ: ::c_int = ::FIONREAD;
 pub const MCL_CURRENT: ::c_int = 0x2000;
 pub const MCL_FUTURE: ::c_int = 0x4000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/s390x.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/s390x.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/s390x.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/s390x.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,758 @@
+pub type blksize_t = i64;
+pub type c_char = u8;
+pub type nlink_t = u64;
+pub type wchar_t = i32;
+pub type greg_t = u64;
+pub type __u64 = u64;
+
+s! {
+    pub struct ipc_perm {
+        pub __ipc_perm_key: ::key_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
+        pub cuid: ::uid_t,
+        pub cgid: ::gid_t,
+        pub mode: ::mode_t,
+        pub __seq: ::c_int,
+        __pad1: ::c_long,
+        __pad2: ::c_long,
+    }
+
+    pub struct stat {
+        pub st_dev: ::dev_t,
+        pub st_ino: ::ino_t,
+        pub st_nlink: ::nlink_t,
+        pub st_mode: ::mode_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::dev_t,
+        pub st_size: ::off_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_blksize: ::blksize_t,
+        pub st_blocks: ::blkcnt_t,
+        __unused: [::c_long; 3],
+    }
+
+    pub struct stat64 {
+        pub st_dev: ::dev_t,
+        pub st_ino: ::ino64_t,
+        pub st_nlink: ::nlink_t,
+        pub st_mode: ::mode_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::dev_t,
+        pub st_size: ::off_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_blksize: ::blksize_t,
+        pub st_blocks: ::blkcnt64_t,
+        __unused: [::c_long; 3],
+    }
+
+    pub struct statfs {
+        pub f_type: ::c_ulong,
+        pub f_bsize: ::c_ulong,
+        pub f_blocks: ::fsblkcnt_t,
+        pub f_bfree: ::fsblkcnt_t,
+        pub f_bavail: ::fsblkcnt_t,
+        pub f_files: ::fsfilcnt_t,
+        pub f_ffree: ::fsfilcnt_t,
+        pub f_fsid: ::fsid_t,
+        pub f_namelen: ::c_ulong,
+        pub f_frsize: ::c_ulong,
+        pub f_flags: ::c_ulong,
+        pub f_spare: [::c_ulong; 4],
+    }
+
+    pub struct statfs64 {
+        pub f_type: ::c_ulong,
+        pub f_bsize: ::c_ulong,
+        pub f_blocks: ::fsblkcnt_t,
+        pub f_bfree: ::fsblkcnt_t,
+        pub f_bavail: ::fsblkcnt_t,
+        pub f_files: ::fsfilcnt_t,
+        pub f_ffree: ::fsfilcnt_t,
+        pub f_fsid: ::fsid_t,
+        pub f_namelen: ::c_ulong,
+        pub f_frsize: ::c_ulong,
+        pub f_flags: ::c_ulong,
+        pub f_spare: [::c_ulong; 4],
+    }
+}
+
+s_no_extra_traits! {
+    // FIXME: This is actually a union.
+    pub struct fpreg_t {
+        pub d: ::c_double,
+        // f: ::c_float,
+    }
+}
+
+cfg_if! {
+    if #[cfg(feature = "extra_traits")] {
+        impl PartialEq for fpreg_t {
+            fn eq(&self, other: &fpreg_t) -> bool {
+                self.d == other.d
+            }
+        }
+
+        impl Eq for fpreg_t {}
+
+        impl ::fmt::Debug for fpreg_t {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("fpreg_t")
+                    .field("d", &self.d)
+                    .finish()
+            }
+        }
+
+        impl ::hash::Hash for fpreg_t {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                let d: u64 = unsafe { ::mem::transmute(self.d) };
+                d.hash(state);
+            }
+        }
+    }
+}
+
+pub const VEOF: usize = 4;
+pub const RTLD_DEEPBIND: ::c_int = 0x8;
+
+pub const EUCLEAN: ::c_int = 117;
+pub const ENOTNAM: ::c_int = 118;
+pub const ENAVAIL: ::c_int = 119;
+pub const EISNAM: ::c_int = 120;
+pub const EREMOTEIO: ::c_int = 121;
+pub const EADDRINUSE: ::c_int = 98;
+pub const EADDRNOTAVAIL: ::c_int = 99;
+pub const ECONNABORTED: ::c_int = 103;
+pub const ECONNREFUSED: ::c_int = 111;
+pub const ECONNRESET: ::c_int = 104;
+pub const EDEADLK: ::c_int = 35;
+pub const ENOSYS: ::c_int = 38;
+pub const ENOTCONN: ::c_int = 107;
+pub const ETIMEDOUT: ::c_int = 110;
+pub const FIOCLEX: ::c_ulong = 0x5451;
+pub const FIONCLEX: ::c_ulong = 0x5450;
+pub const FIONBIO: ::c_ulong = 0x5421;
+pub const O_APPEND: ::c_int = 1024;
+pub const O_CREAT: ::c_int = 64;
+pub const O_EXCL: ::c_int = 128;
+pub const O_NONBLOCK: ::c_int = 2048;
+pub const SA_NOCLDWAIT: ::c_int = 2;
+pub const SA_ONSTACK: ::c_int = 0x08000000;
+pub const SA_SIGINFO: ::c_int = 4;
+pub const SIGBUS: ::c_int = 7;
+pub const SIGSTKSZ: ::size_t = 0x2000;
+pub const MINSIGSTKSZ: ::size_t = 2048;
+pub const SIG_SETMASK: ::c_int = 2;
+
+pub const SOCK_STREAM: ::c_int = 1;
+pub const SOCK_DGRAM: ::c_int = 2;
+
+pub const O_NOCTTY: ::c_int = 256;
+pub const O_SYNC: ::c_int = 1052672;
+pub const O_RSYNC: ::c_int = 1052672;
+pub const O_DSYNC: ::c_int = 4096;
+pub const O_FSYNC: ::c_int = 0x101000;
+pub const O_DIRECT: ::c_int = 0x4000;
+pub const O_DIRECTORY: ::c_int = 0x10000;
+pub const O_NOFOLLOW: ::c_int = 0x20000;
+
+pub const MADV_SOFT_OFFLINE: ::c_int = 101;
+pub const MAP_GROWSDOWN: ::c_int = 0x0100;
+pub const MAP_LOCKED: ::c_int = 0x02000;
+pub const MAP_NORESERVE: ::c_int = 0x04000;
+pub const MAP_ANON: ::c_int = 0x0020;
+pub const MAP_DENYWRITE: ::c_int = 0x0800;
+pub const MAP_EXECUTABLE: ::c_int = 0x01000;
+pub const MAP_POPULATE: ::c_int = 0x08000;
+pub const MAP_NONBLOCK: ::c_int = 0x010000;
+pub const MAP_STACK: ::c_int = 0x020000;
+pub const MAP_HUGETLB: ::c_int = 0x040000;
+
+pub const EDEADLOCK: ::c_int = 35;
+pub const ENAMETOOLONG: ::c_int = 36;
+pub const ENOLCK: ::c_int = 37;
+pub const ENOTEMPTY: ::c_int = 39;
+pub const ELOOP: ::c_int = 40;
+pub const ENOMSG: ::c_int = 42;
+pub const EIDRM: ::c_int = 43;
+pub const ECHRNG: ::c_int = 44;
+pub const EL2NSYNC: ::c_int = 45;
+pub const EL3HLT: ::c_int = 46;
+pub const EL3RST: ::c_int = 47;
+pub const ELNRNG: ::c_int = 48;
+pub const EUNATCH: ::c_int = 49;
+pub const ENOCSI: ::c_int = 50;
+pub const EL2HLT: ::c_int = 51;
+pub const EBADE: ::c_int = 52;
+pub const EBADR: ::c_int = 53;
+pub const EXFULL: ::c_int = 54;
+pub const ENOANO: ::c_int = 55;
+pub const EBADRQC: ::c_int = 56;
+pub const EBADSLT: ::c_int = 57;
+pub const EMULTIHOP: ::c_int = 72;
+pub const EOVERFLOW: ::c_int = 75;
+pub const ENOTUNIQ: ::c_int = 76;
+pub const EBADFD: ::c_int = 77;
+pub const EBADMSG: ::c_int = 74;
+pub const EREMCHG: ::c_int = 78;
+pub const ELIBACC: ::c_int = 79;
+pub const ELIBBAD: ::c_int = 80;
+pub const ELIBSCN: ::c_int = 81;
+pub const ELIBMAX: ::c_int = 82;
+pub const ELIBEXEC: ::c_int = 83;
+pub const EILSEQ: ::c_int = 84;
+pub const ERESTART: ::c_int = 85;
+pub const ESTRPIPE: ::c_int = 86;
+pub const EUSERS: ::c_int = 87;
+pub const ENOTSOCK: ::c_int = 88;
+pub const EDESTADDRREQ: ::c_int = 89;
+pub const EMSGSIZE: ::c_int = 90;
+pub const EPROTOTYPE: ::c_int = 91;
+pub const ENOPROTOOPT: ::c_int = 92;
+pub const EPROTONOSUPPORT: ::c_int = 93;
+pub const ESOCKTNOSUPPORT: ::c_int = 94;
+pub const EOPNOTSUPP: ::c_int = 95;
+pub const EPFNOSUPPORT: ::c_int = 96;
+pub const EAFNOSUPPORT: ::c_int = 97;
+pub const ENETDOWN: ::c_int = 100;
+pub const ENETUNREACH: ::c_int = 101;
+pub const ENETRESET: ::c_int = 102;
+pub const ENOBUFS: ::c_int = 105;
+pub const EISCONN: ::c_int = 106;
+pub const ESHUTDOWN: ::c_int = 108;
+pub const ETOOMANYREFS: ::c_int = 109;
+pub const EHOSTDOWN: ::c_int = 112;
+pub const EHOSTUNREACH: ::c_int = 113;
+pub const EALREADY: ::c_int = 114;
+pub const EINPROGRESS: ::c_int = 115;
+pub const ESTALE: ::c_int = 116;
+pub const EDQUOT: ::c_int = 122;
+pub const ENOMEDIUM: ::c_int = 123;
+pub const EMEDIUMTYPE: ::c_int = 124;
+pub const ECANCELED: ::c_int = 125;
+pub const ENOKEY: ::c_int = 126;
+pub const EKEYEXPIRED: ::c_int = 127;
+pub const EKEYREVOKED: ::c_int = 128;
+pub const EKEYREJECTED: ::c_int = 129;
+pub const EOWNERDEAD: ::c_int = 130;
+pub const ENOTRECOVERABLE: ::c_int = 131;
+pub const EHWPOISON: ::c_int = 133;
+pub const ERFKILL: ::c_int = 132;
+
+pub const SIGTTIN: ::c_int = 21;
+pub const SIGTTOU: ::c_int = 22;
+pub const SIGXCPU: ::c_int = 24;
+pub const SIGXFSZ: ::c_int = 25;
+pub const SIGVTALRM: ::c_int = 26;
+pub const SIGPROF: ::c_int = 27;
+pub const SIGWINCH: ::c_int = 28;
+pub const SIGCHLD: ::c_int = 17;
+pub const SIGUSR1: ::c_int = 10;
+pub const SIGUSR2: ::c_int = 12;
+pub const SIGCONT: ::c_int = 18;
+pub const SIGSTOP: ::c_int = 19;
+pub const SIGTSTP: ::c_int = 20;
+pub const SIGURG: ::c_int = 23;
+pub const SIGIO: ::c_int = 29;
+pub const SIGSYS: ::c_int = 31;
+pub const SIGSTKFLT: ::c_int = 16;
+pub const SIGPOLL: ::c_int = 29;
+pub const SIGPWR: ::c_int = 30;
+pub const SIG_BLOCK: ::c_int = 0x000000;
+pub const SIG_UNBLOCK: ::c_int = 0x01;
+
+pub const O_ASYNC: ::c_int = 0x2000;
+
+pub const VEOL: usize = 11;
+pub const VEOL2: usize = 16;
+pub const VMIN: usize = 6;
+pub const IEXTEN: ::tcflag_t = 0x00008000;
+pub const TOSTOP: ::tcflag_t = 0x00000100;
+pub const FLUSHO: ::tcflag_t = 0x00001000;
+
+pub const EXTPROC: ::tcflag_t = 0x00010000;
+
+pub const MCL_CURRENT: ::c_int = 0x0001;
+pub const MCL_FUTURE: ::c_int = 0x0002;
+
+pub const F_GETLK: ::c_int = 5;
+pub const F_GETOWN: ::c_int = 9;
+pub const F_SETOWN: ::c_int = 8;
+pub const F_SETLK: ::c_int = 6;
+pub const F_SETLKW: ::c_int = 7;
+pub const F_OFD_GETLK: ::c_int = 36;
+pub const F_OFD_SETLK: ::c_int = 37;
+pub const F_OFD_SETLKW: ::c_int = 38;
+
+pub const TCGETS: ::c_int = 0x5401;
+pub const TCSETS: ::c_int = 0x5402;
+pub const TCSETSW: ::c_int = 0x5403;
+pub const TCSETSF: ::c_int = 0x5404;
+pub const TCGETA: ::c_int = 0x5405;
+pub const TCSETA: ::c_int = 0x5406;
+pub const TCSETAW: ::c_int = 0x5407;
+pub const TCSETAF: ::c_int = 0x5408;
+pub const TCSBRK: ::c_int = 0x5409;
+pub const TCXONC: ::c_int = 0x540A;
+pub const TCFLSH: ::c_int = 0x540B;
+pub const TIOCGSOFTCAR: ::c_int = 0x5419;
+pub const TIOCSSOFTCAR: ::c_int = 0x541A;
+pub const TIOCINQ: ::c_int = 0x541B;
+pub const TIOCEXCL: ::c_int = 0x540C;
+pub const TIOCNXCL: ::c_int = 0x540D;
+pub const TIOCSCTTY: ::c_int = 0x540E;
+pub const TIOCGPGRP: ::c_int = 0x540F;
+pub const TIOCSPGRP: ::c_int = 0x5410;
+pub const TIOCOUTQ: ::c_int = 0x5411;
+pub const TIOCSTI: ::c_int = 0x5412;
+pub const TIOCGWINSZ: ::c_int = 0x5413;
+pub const TIOCSWINSZ: ::c_int = 0x5414;
+pub const TIOCMGET: ::c_int = 0x5415;
+pub const TIOCMBIS: ::c_int = 0x5416;
+pub const TIOCMBIC: ::c_int = 0x5417;
+pub const TIOCMSET: ::c_int = 0x5418;
+pub const FIONREAD: ::c_int = 0x541B;
+pub const TIOCCONS: ::c_int = 0x541D;
+
+pub const TIOCLINUX: ::c_int = 0x541C;
+pub const TIOCGSERIAL: ::c_int = 0x541E;
+pub const TIOCM_ST: ::c_int = 0x008;
+pub const TIOCM_SR: ::c_int = 0x010;
+pub const TIOCM_CTS: ::c_int = 0x020;
+pub const TIOCM_CAR: ::c_int = 0x040;
+pub const TIOCM_RNG: ::c_int = 0x080;
+pub const TIOCM_DSR: ::c_int = 0x100;
+
+pub const VTIME: usize = 5;
+pub const VSWTC: usize = 7;
+pub const VSTART: usize = 8;
+pub const VSTOP: usize = 9;
+pub const VSUSP: usize = 10;
+pub const VREPRINT: usize = 12;
+pub const VDISCARD: usize = 13;
+pub const VWERASE: usize = 14;
+pub const OLCUC: ::tcflag_t = 0o000002;
+pub const ONLCR: ::tcflag_t = 0o000004;
+pub const NLDLY: ::tcflag_t = 0o000400;
+pub const CRDLY: ::tcflag_t = 0o003000;
+pub const CR1: ::tcflag_t = 0x00000200;
+pub const CR2: ::tcflag_t = 0x00000400;
+pub const CR3: ::tcflag_t = 0x00000600;
+pub const TABDLY: ::tcflag_t = 0o014000;
+pub const TAB1: ::tcflag_t = 0x00000800;
+pub const TAB2: ::tcflag_t = 0x00001000;
+pub const TAB3: ::tcflag_t = 0x00001800;
+pub const BSDLY: ::tcflag_t = 0o020000;
+pub const BS1: ::tcflag_t = 0x00002000;
+pub const FFDLY: ::tcflag_t = 0o100000;
+pub const FF1: ::tcflag_t = 0x00008000;
+pub const VTDLY: ::tcflag_t = 0o040000;
+pub const VT1: ::tcflag_t = 0x00004000;
+pub const XTABS: ::tcflag_t = 0o014000;
+
+pub const CBAUD: ::speed_t = 0o010017;
+pub const CSIZE: ::tcflag_t = 0o000060;
+pub const CS6: ::tcflag_t = 0o000020;
+pub const CS7: ::tcflag_t = 0o000040;
+pub const CS8: ::tcflag_t = 0o000060;
+pub const CSTOPB: ::tcflag_t = 0o000100;
+pub const CREAD: ::tcflag_t = 0o000200;
+pub const PARENB: ::tcflag_t = 0o000400;
+pub const PARODD: ::tcflag_t = 0o001000;
+pub const HUPCL: ::tcflag_t = 0o002000;
+pub const CLOCAL: ::tcflag_t = 0o004000;
+pub const CBAUDEX: ::tcflag_t = 0o010000;
+pub const BOTHER: ::speed_t = 0o010000;
+pub const B57600: ::speed_t = 0o010001;
+pub const B115200: ::speed_t = 0o010002;
+pub const B230400: ::speed_t = 0o010003;
+pub const B460800: ::speed_t = 0o010004;
+pub const B500000: ::speed_t = 0o010005;
+pub const B576000: ::speed_t = 0o010006;
+pub const B921600: ::speed_t = 0o010007;
+pub const B1000000: ::speed_t = 0o010010;
+pub const B1152000: ::speed_t = 0o010011;
+pub const B1500000: ::speed_t = 0o010012;
+pub const B2000000: ::speed_t = 0o010013;
+pub const B2500000: ::speed_t = 0o010014;
+pub const B3000000: ::speed_t = 0o010015;
+pub const B3500000: ::speed_t = 0o010016;
+pub const B4000000: ::speed_t = 0o010017;
+pub const CIBAUD: ::tcflag_t = 0o02003600000;
+
+pub const ISIG: ::tcflag_t = 0o000001;
+pub const ICANON: ::tcflag_t = 0o000002;
+pub const XCASE: ::tcflag_t = 0o000004;
+pub const ECHOE: ::tcflag_t = 0o000020;
+pub const ECHOK: ::tcflag_t = 0o000040;
+pub const ECHONL: ::tcflag_t = 0o000100;
+pub const NOFLSH: ::tcflag_t = 0o000200;
+pub const ECHOCTL: ::tcflag_t = 0o001000;
+pub const ECHOPRT: ::tcflag_t = 0o002000;
+pub const ECHOKE: ::tcflag_t = 0o004000;
+pub const PENDIN: ::tcflag_t = 0o040000;
+
+pub const POLLWRNORM: ::c_short = 0x100;
+pub const POLLWRBAND: ::c_short = 0x200;
+
+pub const IXON: ::tcflag_t = 0o002000;
+pub const IXOFF: ::tcflag_t = 0o010000;
+
+pub const SYS_exit: ::c_long = 1;
+pub const SYS_fork: ::c_long = 2;
+pub const SYS_read: ::c_long = 3;
+pub const SYS_write: ::c_long = 4;
+pub const SYS_open: ::c_long = 5;
+pub const SYS_close: ::c_long = 6;
+pub const SYS_restart_syscall: ::c_long = 7;
+pub const SYS_creat: ::c_long = 8;
+pub const SYS_link: ::c_long = 9;
+pub const SYS_unlink: ::c_long = 10;
+pub const SYS_execve: ::c_long = 11;
+pub const SYS_chdir: ::c_long = 12;
+pub const SYS_mknod: ::c_long = 14;
+pub const SYS_chmod: ::c_long = 15;
+pub const SYS_lseek: ::c_long = 19;
+pub const SYS_getpid: ::c_long = 20;
+pub const SYS_mount: ::c_long = 21;
+pub const SYS_umount: ::c_long = 22;
+pub const SYS_ptrace: ::c_long = 26;
+pub const SYS_alarm: ::c_long = 27;
+pub const SYS_pause: ::c_long = 29;
+pub const SYS_utime: ::c_long = 30;
+pub const SYS_access: ::c_long = 33;
+pub const SYS_nice: ::c_long = 34;
+pub const SYS_sync: ::c_long = 36;
+pub const SYS_kill: ::c_long = 37;
+pub const SYS_rename: ::c_long = 38;
+pub const SYS_mkdir: ::c_long = 39;
+pub const SYS_rmdir: ::c_long = 40;
+pub const SYS_dup: ::c_long = 41;
+pub const SYS_pipe: ::c_long = 42;
+pub const SYS_times: ::c_long = 43;
+pub const SYS_brk: ::c_long = 45;
+pub const SYS_signal: ::c_long = 48;
+pub const SYS_acct: ::c_long = 51;
+pub const SYS_umount2: ::c_long = 52;
+pub const SYS_ioctl: ::c_long = 54;
+pub const SYS_fcntl: ::c_long = 55;
+pub const SYS_setpgid: ::c_long = 57;
+pub const SYS_umask: ::c_long = 60;
+pub const SYS_chroot: ::c_long = 61;
+pub const SYS_ustat: ::c_long = 62;
+pub const SYS_dup2: ::c_long = 63;
+pub const SYS_getppid: ::c_long = 64;
+pub const SYS_getpgrp: ::c_long = 65;
+pub const SYS_setsid: ::c_long = 66;
+pub const SYS_sigaction: ::c_long = 67;
+pub const SYS_sigsuspend: ::c_long = 72;
+pub const SYS_sigpending: ::c_long = 73;
+pub const SYS_sethostname: ::c_long = 74;
+pub const SYS_setrlimit: ::c_long = 75;
+pub const SYS_getrusage: ::c_long = 77;
+pub const SYS_gettimeofday: ::c_long = 78;
+pub const SYS_settimeofday: ::c_long = 79;
+pub const SYS_symlink: ::c_long = 83;
+pub const SYS_readlink: ::c_long = 85;
+pub const SYS_uselib: ::c_long = 86;
+pub const SYS_swapon: ::c_long = 87;
+pub const SYS_reboot: ::c_long = 88;
+pub const SYS_readdir: ::c_long = 89;
+pub const SYS_mmap: ::c_long = 90;
+pub const SYS_munmap: ::c_long = 91;
+pub const SYS_truncate: ::c_long = 92;
+pub const SYS_ftruncate: ::c_long = 93;
+pub const SYS_fchmod: ::c_long = 94;
+pub const SYS_getpriority: ::c_long = 96;
+pub const SYS_setpriority: ::c_long = 97;
+pub const SYS_statfs: ::c_long = 99;
+pub const SYS_fstatfs: ::c_long = 100;
+pub const SYS_socketcall: ::c_long = 102;
+pub const SYS_syslog: ::c_long = 103;
+pub const SYS_setitimer: ::c_long = 104;
+pub const SYS_getitimer: ::c_long = 105;
+pub const SYS_stat: ::c_long = 106;
+pub const SYS_lstat: ::c_long = 107;
+pub const SYS_fstat: ::c_long = 108;
+pub const SYS_lookup_dcookie: ::c_long = 110;
+pub const SYS_vhangup: ::c_long = 111;
+pub const SYS_idle: ::c_long = 112;
+pub const SYS_wait4: ::c_long = 114;
+pub const SYS_swapoff: ::c_long = 115;
+pub const SYS_sysinfo: ::c_long = 116;
+pub const SYS_ipc: ::c_long = 117;
+pub const SYS_fsync: ::c_long = 118;
+pub const SYS_sigreturn: ::c_long = 119;
+pub const SYS_clone: ::c_long = 120;
+pub const SYS_setdomainname: ::c_long = 121;
+pub const SYS_uname: ::c_long = 122;
+pub const SYS_adjtimex: ::c_long = 124;
+pub const SYS_mprotect: ::c_long = 125;
+pub const SYS_sigprocmask: ::c_long = 126;
+pub const SYS_create_module: ::c_long = 127;
+pub const SYS_init_module: ::c_long = 128;
+pub const SYS_delete_module: ::c_long = 129;
+pub const SYS_get_kernel_syms: ::c_long = 130;
+pub const SYS_quotactl: ::c_long = 131;
+pub const SYS_getpgid: ::c_long = 132;
+pub const SYS_fchdir: ::c_long = 133;
+pub const SYS_bdflush: ::c_long = 134;
+pub const SYS_sysfs: ::c_long = 135;
+pub const SYS_personality: ::c_long = 136;
+pub const SYS_afs_syscall: ::c_long = 137; /* Syscall for Andrew File System */
+pub const SYS_getdents: ::c_long = 141;
+pub const SYS_flock: ::c_long = 143;
+pub const SYS_msync: ::c_long = 144;
+pub const SYS_readv: ::c_long = 145;
+pub const SYS_writev: ::c_long = 146;
+pub const SYS_getsid: ::c_long = 147;
+pub const SYS_fdatasync: ::c_long = 148;
+pub const SYS__sysctl: ::c_long = 149;
+pub const SYS_mlock: ::c_long = 150;
+pub const SYS_munlock: ::c_long = 151;
+pub const SYS_mlockall: ::c_long = 152;
+pub const SYS_munlockall: ::c_long = 153;
+pub const SYS_sched_setparam: ::c_long = 154;
+pub const SYS_sched_getparam: ::c_long = 155;
+pub const SYS_sched_setscheduler: ::c_long = 156;
+pub const SYS_sched_getscheduler: ::c_long = 157;
+pub const SYS_sched_yield: ::c_long = 158;
+pub const SYS_sched_get_priority_max: ::c_long = 159;
+pub const SYS_sched_get_priority_min: ::c_long = 160;
+pub const SYS_sched_rr_get_interval: ::c_long = 161;
+pub const SYS_nanosleep: ::c_long = 162;
+pub const SYS_mremap: ::c_long = 163;
+pub const SYS_query_module: ::c_long = 167;
+pub const SYS_poll: ::c_long = 168;
+pub const SYS_nfsservctl: ::c_long = 169;
+pub const SYS_prctl: ::c_long = 172;
+pub const SYS_rt_sigreturn: ::c_long = 173;
+pub const SYS_rt_sigaction: ::c_long = 174;
+pub const SYS_rt_sigprocmask: ::c_long = 175;
+pub const SYS_rt_sigpending: ::c_long = 176;
+pub const SYS_rt_sigtimedwait: ::c_long = 177;
+pub const SYS_rt_sigqueueinfo: ::c_long = 178;
+pub const SYS_rt_sigsuspend: ::c_long = 179;
+pub const SYS_pread64: ::c_long = 180;
+pub const SYS_pwrite64: ::c_long = 181;
+pub const SYS_getcwd: ::c_long = 183;
+pub const SYS_capget: ::c_long = 184;
+pub const SYS_capset: ::c_long = 185;
+pub const SYS_sigaltstack: ::c_long = 186;
+pub const SYS_sendfile: ::c_long = 187;
+pub const SYS_getpmsg: ::c_long = 188;
+pub const SYS_putpmsg: ::c_long = 189;
+pub const SYS_vfork: ::c_long = 190;
+pub const SYS_pivot_root: ::c_long = 217;
+pub const SYS_mincore: ::c_long = 218;
+pub const SYS_madvise: ::c_long = 219;
+pub const SYS_getdents64: ::c_long = 220;
+pub const SYS_readahead: ::c_long = 222;
+pub const SYS_setxattr: ::c_long = 224;
+pub const SYS_lsetxattr: ::c_long = 225;
+pub const SYS_fsetxattr: ::c_long = 226;
+pub const SYS_getxattr: ::c_long = 227;
+pub const SYS_lgetxattr: ::c_long = 228;
+pub const SYS_fgetxattr: ::c_long = 229;
+pub const SYS_listxattr: ::c_long = 230;
+pub const SYS_llistxattr: ::c_long = 231;
+pub const SYS_flistxattr: ::c_long = 232;
+pub const SYS_removexattr: ::c_long = 233;
+pub const SYS_lremovexattr: ::c_long = 234;
+pub const SYS_fremovexattr: ::c_long = 235;
+pub const SYS_gettid: ::c_long = 236;
+pub const SYS_tkill: ::c_long = 237;
+pub const SYS_futex: ::c_long = 238;
+pub const SYS_sched_setaffinity: ::c_long = 239;
+pub const SYS_sched_getaffinity: ::c_long = 240;
+pub const SYS_tgkill: ::c_long = 241;
+pub const SYS_io_setup: ::c_long = 243;
+pub const SYS_io_destroy: ::c_long = 244;
+pub const SYS_io_getevents: ::c_long = 245;
+pub const SYS_io_submit: ::c_long = 246;
+pub const SYS_io_cancel: ::c_long = 247;
+pub const SYS_exit_group: ::c_long = 248;
+pub const SYS_epoll_create: ::c_long = 249;
+pub const SYS_epoll_ctl: ::c_long = 250;
+pub const SYS_epoll_wait: ::c_long = 251;
+pub const SYS_set_tid_address: ::c_long = 252;
+pub const SYS_fadvise64: ::c_long = 253;
+pub const SYS_timer_create: ::c_long = 254;
+pub const SYS_timer_settime: ::c_long = 255;
+pub const SYS_timer_gettime: ::c_long = 256;
+pub const SYS_timer_getoverrun: ::c_long = 257;
+pub const SYS_timer_delete: ::c_long = 258;
+pub const SYS_clock_settime: ::c_long = 259;
+pub const SYS_clock_gettime: ::c_long = 260;
+pub const SYS_clock_getres: ::c_long = 261;
+pub const SYS_clock_nanosleep: ::c_long = 262;
+pub const SYS_statfs64: ::c_long = 265;
+pub const SYS_fstatfs64: ::c_long = 266;
+pub const SYS_remap_file_pages: ::c_long = 267;
+pub const SYS_mbind: ::c_long = 268;
+pub const SYS_get_mempolicy: ::c_long = 269;
+pub const SYS_set_mempolicy: ::c_long = 270;
+pub const SYS_mq_open: ::c_long = 271;
+pub const SYS_mq_unlink: ::c_long = 272;
+pub const SYS_mq_timedsend: ::c_long = 273;
+pub const SYS_mq_timedreceive: ::c_long = 274;
+pub const SYS_mq_notify: ::c_long = 275;
+pub const SYS_mq_getsetattr: ::c_long = 276;
+pub const SYS_kexec_load: ::c_long = 277;
+pub const SYS_add_key: ::c_long = 278;
+pub const SYS_request_key: ::c_long = 279;
+pub const SYS_keyctl: ::c_long = 280;
+pub const SYS_waitid: ::c_long = 281;
+pub const SYS_ioprio_set: ::c_long = 282;
+pub const SYS_ioprio_get: ::c_long = 283;
+pub const SYS_inotify_init: ::c_long = 284;
+pub const SYS_inotify_add_watch: ::c_long = 285;
+pub const SYS_inotify_rm_watch: ::c_long = 286;
+pub const SYS_migrate_pages: ::c_long = 287;
+pub const SYS_openat: ::c_long = 288;
+pub const SYS_mkdirat: ::c_long = 289;
+pub const SYS_mknodat: ::c_long = 290;
+pub const SYS_fchownat: ::c_long = 291;
+pub const SYS_futimesat: ::c_long = 292;
+pub const SYS_unlinkat: ::c_long = 294;
+pub const SYS_renameat: ::c_long = 295;
+pub const SYS_linkat: ::c_long = 296;
+pub const SYS_symlinkat: ::c_long = 297;
+pub const SYS_readlinkat: ::c_long = 298;
+pub const SYS_fchmodat: ::c_long = 299;
+pub const SYS_faccessat: ::c_long = 300;
+pub const SYS_pselect6: ::c_long = 301;
+pub const SYS_ppoll: ::c_long = 302;
+pub const SYS_unshare: ::c_long = 303;
+pub const SYS_set_robust_list: ::c_long = 304;
+pub const SYS_get_robust_list: ::c_long = 305;
+pub const SYS_splice: ::c_long = 306;
+pub const SYS_sync_file_range: ::c_long = 307;
+pub const SYS_tee: ::c_long = 308;
+pub const SYS_vmsplice: ::c_long = 309;
+pub const SYS_move_pages: ::c_long = 310;
+pub const SYS_getcpu: ::c_long = 311;
+pub const SYS_epoll_pwait: ::c_long = 312;
+pub const SYS_utimes: ::c_long = 313;
+pub const SYS_fallocate: ::c_long = 314;
+pub const SYS_utimensat: ::c_long = 315;
+pub const SYS_signalfd: ::c_long = 316;
+pub const SYS_timerfd: ::c_long = 317;
+pub const SYS_eventfd: ::c_long = 318;
+pub const SYS_timerfd_create: ::c_long = 319;
+pub const SYS_timerfd_settime: ::c_long = 320;
+pub const SYS_timerfd_gettime: ::c_long = 321;
+pub const SYS_signalfd4: ::c_long = 322;
+pub const SYS_eventfd2: ::c_long = 323;
+pub const SYS_inotify_init1: ::c_long = 324;
+pub const SYS_pipe2: ::c_long = 325;
+pub const SYS_dup3: ::c_long = 326;
+pub const SYS_epoll_create1: ::c_long = 327;
+pub const SYS_preadv: ::c_long = 328;
+pub const SYS_pwritev: ::c_long = 329;
+pub const SYS_rt_tgsigqueueinfo: ::c_long = 330;
+pub const SYS_perf_event_open: ::c_long = 331;
+pub const SYS_fanotify_init: ::c_long = 332;
+pub const SYS_fanotify_mark: ::c_long = 333;
+pub const SYS_prlimit64: ::c_long = 334;
+pub const SYS_name_to_handle_at: ::c_long = 335;
+pub const SYS_open_by_handle_at: ::c_long = 336;
+pub const SYS_clock_adjtime: ::c_long = 337;
+pub const SYS_syncfs: ::c_long = 338;
+pub const SYS_setns: ::c_long = 339;
+pub const SYS_process_vm_readv: ::c_long = 340;
+pub const SYS_process_vm_writev: ::c_long = 341;
+pub const SYS_s390_runtime_instr: ::c_long = 342;
+pub const SYS_kcmp: ::c_long = 343;
+pub const SYS_finit_module: ::c_long = 344;
+pub const SYS_sched_setattr: ::c_long = 345;
+pub const SYS_sched_getattr: ::c_long = 346;
+pub const SYS_renameat2: ::c_long = 347;
+pub const SYS_seccomp: ::c_long = 348;
+pub const SYS_getrandom: ::c_long = 349;
+pub const SYS_memfd_create: ::c_long = 350;
+pub const SYS_bpf: ::c_long = 351;
+pub const SYS_s390_pci_mmio_write: ::c_long = 352;
+pub const SYS_s390_pci_mmio_read: ::c_long = 353;
+pub const SYS_execveat: ::c_long = 354;
+pub const SYS_userfaultfd: ::c_long = 355;
+pub const SYS_membarrier: ::c_long = 356;
+pub const SYS_recvmmsg: ::c_long = 357;
+pub const SYS_sendmmsg: ::c_long = 358;
+pub const SYS_socket: ::c_long = 359;
+pub const SYS_socketpair: ::c_long = 360;
+pub const SYS_bind: ::c_long = 361;
+pub const SYS_connect: ::c_long = 362;
+pub const SYS_listen: ::c_long = 363;
+pub const SYS_accept4: ::c_long = 364;
+pub const SYS_getsockopt: ::c_long = 365;
+pub const SYS_setsockopt: ::c_long = 366;
+pub const SYS_getsockname: ::c_long = 367;
+pub const SYS_getpeername: ::c_long = 368;
+pub const SYS_sendto: ::c_long = 369;
+pub const SYS_sendmsg: ::c_long = 370;
+pub const SYS_recvfrom: ::c_long = 371;
+pub const SYS_recvmsg: ::c_long = 372;
+pub const SYS_shutdown: ::c_long = 373;
+pub const SYS_mlock2: ::c_long = 374;
+pub const SYS_copy_file_range: ::c_long = 375;
+pub const SYS_preadv2: ::c_long = 376;
+pub const SYS_pwritev2: ::c_long = 377;
+pub const SYS_lchown: ::c_long = 198;
+pub const SYS_setuid: ::c_long = 213;
+pub const SYS_getuid: ::c_long = 199;
+pub const SYS_setgid: ::c_long = 214;
+pub const SYS_getgid: ::c_long = 200;
+pub const SYS_geteuid: ::c_long = 201;
+pub const SYS_setreuid: ::c_long = 203;
+pub const SYS_setregid: ::c_long = 204;
+pub const SYS_getrlimit: ::c_long = 191;
+pub const SYS_getgroups: ::c_long = 205;
+pub const SYS_fchown: ::c_long = 207;
+pub const SYS_setresuid: ::c_long = 208;
+pub const SYS_setresgid: ::c_long = 210;
+pub const SYS_getresgid: ::c_long = 211;
+pub const SYS_select: ::c_long = 142;
+pub const SYS_getegid: ::c_long = 202;
+pub const SYS_setgroups: ::c_long = 206;
+pub const SYS_getresuid: ::c_long = 209;
+pub const SYS_chown: ::c_long = 212;
+pub const SYS_setfsuid: ::c_long = 215;
+pub const SYS_setfsgid: ::c_long = 216;
+pub const SYS_newfstatat: ::c_long = 293;
+pub const SYS_statx: ::c_long = 379;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
+pub const SYS_pidfd_open: ::c_long = 434;
+pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
+
+extern "C" {
+    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -580,6 +580,25 @@
 pub const SYS_pkey_alloc: ::c_long = 330;
 pub const SYS_pkey_free: ::c_long = 331;
 pub const SYS_statx: ::c_long = 332;
+pub const SYS_pidfd_send_signal: ::c_long = 424;
+pub const SYS_io_uring_setup: ::c_long = 425;
+pub const SYS_io_uring_enter: ::c_long = 426;
+pub const SYS_io_uring_register: ::c_long = 427;
+pub const SYS_open_tree: ::c_long = 428;
+pub const SYS_move_mount: ::c_long = 429;
+pub const SYS_fsopen: ::c_long = 430;
+pub const SYS_fsconfig: ::c_long = 431;
+pub const SYS_fsmount: ::c_long = 432;
+pub const SYS_fspick: ::c_long = 433;
+pub const SYS_pidfd_open: ::c_long = 434;
+pub const SYS_clone3: ::c_long = 435;
+pub const SYS_close_range: ::c_long = 436;
+pub const SYS_openat2: ::c_long = 437;
+pub const SYS_pidfd_getfd: ::c_long = 438;
+pub const SYS_faccessat2: ::c_long = 439;
+pub const SYS_process_madvise: ::c_long = 440;
+pub const SYS_epoll_pwait2: ::c_long = 441;
+pub const SYS_mount_setattr: ::c_long = 442;
 
 // offsets in user_regs_structs, from sys/reg.h
 pub const R15: ::c_int = 0;
@@ -788,26 +807,6 @@
 
 pub const SOCK_STREAM: ::c_int = 1;
 pub const SOCK_DGRAM: ::c_int = 2;
-pub const SOL_SOCKET: ::c_int = 1;
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_TYPE: ::c_int = 3;
-pub const SO_ERROR: ::c_int = 4;
-pub const SO_DONTROUTE: ::c_int = 5;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SO_SNDBUF: ::c_int = 7;
-pub const SO_RCVBUF: ::c_int = 8;
-pub const SO_KEEPALIVE: ::c_int = 9;
-pub const SO_OOBINLINE: ::c_int = 10;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_LINGER: ::c_int = 13;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_REUSEPORT: ::c_int = 15;
-pub const SO_ACCEPTCONN: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 32;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PROTOCOL: ::c_int = 38;
-pub const SO_DOMAIN: ::c_int = 39;
 
 pub const MAP_ANON: ::c_int = 0x0020;
 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
@@ -819,9 +818,10 @@
 pub const MAP_NONBLOCK: ::c_int = 0x010000;
 pub const MAP_STACK: ::c_int = 0x020000;
 pub const MAP_HUGETLB: ::c_int = 0x040000;
-pub const MAP_SYNC : ::c_int = 0x080000;
+pub const MAP_SYNC: ::c_int = 0x080000;
 
 pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
 pub const TIOCINQ: ::c_int = ::FIONREAD;
 pub const MCL_CURRENT: ::c_int = 0x0001;
 pub const MCL_FUTURE: ::c_int = 0x0002;
@@ -897,12 +897,7 @@
 pub const FIONBIO: ::c_int = 0x5421;
 pub const EDEADLK: ::c_int = 35;
 pub const EDEADLOCK: ::c_int = EDEADLK;
-pub const SO_PASSCRED: ::c_int = 16;
-pub const SO_PEERCRED: ::c_int = 17;
-pub const SO_RCVLOWAT: ::c_int = 18;
-pub const SO_SNDLOWAT: ::c_int = 19;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_SNDTIMEO: ::c_int = 21;
+
 pub const EXTPROC: ::tcflag_t = 0x00010000;
 pub const VEOL: usize = 11;
 pub const VEOL2: usize = 16;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/musl/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,13 @@
 pub type pthread_t = *mut ::c_void;
 pub type clock_t = c_long;
-#[deprecated(
-    since = "0.2.80",
-    note = "This type is changed to 64-bit in musl 1.2.0, \
-            we'll follow that change in the future release. \
-            See #1848 for more info."
+#[cfg_attr(
+    not(feature = "rustc-dep-of-std"),
+    deprecated(
+        since = "0.2.80",
+        note = "This type is changed to 64-bit in musl 1.2.0, \
+                we'll follow that change in the future release. \
+                See #1848 for more info."
+    )
 )]
 pub type time_t = c_long;
 pub type suseconds_t = c_long;
@@ -233,6 +236,49 @@
         pub e_termination: ::c_short,
         pub e_exit: ::c_short,
     }
+
+    pub struct Elf64_Chdr {
+        pub ch_type: ::Elf64_Word,
+        pub ch_reserved: ::Elf64_Word,
+        pub ch_size: ::Elf64_Xword,
+        pub ch_addralign: ::Elf64_Xword,
+    }
+
+    pub struct Elf32_Chdr {
+        pub ch_type: ::Elf32_Word,
+        pub ch_size: ::Elf32_Word,
+        pub ch_addralign: ::Elf32_Word,
+    }
+
+    pub struct timex {
+        pub modes: ::c_uint,
+        pub offset: ::c_long,
+        pub freq: ::c_long,
+        pub maxerror: ::c_long,
+        pub esterror: ::c_long,
+        pub status: ::c_int,
+        pub constant: ::c_long,
+        pub precision: ::c_long,
+        pub tolerance: ::c_long,
+        pub time: ::timeval,
+        pub tick: ::c_long,
+        pub ppsfreq: ::c_long,
+        pub jitter: ::c_long,
+        pub shift: ::c_int,
+        pub stabil: ::c_long,
+        pub jitcnt: ::c_long,
+        pub calcnt: ::c_long,
+        pub errcnt: ::c_long,
+        pub stbcnt: ::c_long,
+        pub tai: ::c_int,
+        pub __padding: [::c_int; 11],
+    }
+
+    pub struct ntptimeval {
+        pub time: ::timeval,
+        pub maxerror: ::c_long,
+        pub esterror: ::c_long,
+    }
 }
 
 s_no_extra_traits! {
@@ -424,20 +470,20 @@
  * the running system.  See mmap(2) man page for details.
  */
 pub const MAP_HUGE_SHIFT: ::c_int = 26;
-pub const MAP_HUGE_MASK:  ::c_int = 0x3f;
+pub const MAP_HUGE_MASK: ::c_int = 0x3f;
 
-pub const MAP_HUGE_64KB:  ::c_int = 16 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_64KB: ::c_int = 16 << MAP_HUGE_SHIFT;
 pub const MAP_HUGE_512KB: ::c_int = 19 << MAP_HUGE_SHIFT;
-pub const MAP_HUGE_1MB:   ::c_int = 20 << MAP_HUGE_SHIFT;
-pub const MAP_HUGE_2MB:   ::c_int = 21 << MAP_HUGE_SHIFT;
-pub const MAP_HUGE_8MB:   ::c_int = 23 << MAP_HUGE_SHIFT;
-pub const MAP_HUGE_16MB:  ::c_int = 24 << MAP_HUGE_SHIFT;
-pub const MAP_HUGE_32MB:  ::c_int = 25 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_1MB: ::c_int = 20 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_2MB: ::c_int = 21 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_8MB: ::c_int = 23 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_16MB: ::c_int = 24 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_32MB: ::c_int = 25 << MAP_HUGE_SHIFT;
 pub const MAP_HUGE_256MB: ::c_int = 28 << MAP_HUGE_SHIFT;
 pub const MAP_HUGE_512MB: ::c_int = 29 << MAP_HUGE_SHIFT;
-pub const MAP_HUGE_1GB:   ::c_int = 30 << MAP_HUGE_SHIFT;
-pub const MAP_HUGE_2GB:   ::c_int = 31 << MAP_HUGE_SHIFT;
-pub const MAP_HUGE_16GB:  ::c_int = 34 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_1GB: ::c_int = 30 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_2GB: ::c_int = 31 << MAP_HUGE_SHIFT;
+pub const MAP_HUGE_16GB: ::c_int = 34 << MAP_HUGE_SHIFT;
 
 pub const MS_RMT_MASK: ::c_ulong = 0x02800051;
 
@@ -481,6 +527,7 @@
 pub const BUFSIZ: ::c_uint = 1024;
 pub const TMP_MAX: ::c_uint = 10000;
 pub const FOPEN_MAX: ::c_uint = 1000;
+pub const FILENAME_MAX: ::c_uint = 4096;
 pub const O_PATH: ::c_int = 0o10000000;
 pub const O_EXEC: ::c_int = 0o10000000;
 pub const O_SEARCH: ::c_int = 0o10000000;
@@ -488,8 +535,6 @@
 pub const O_NDELAY: ::c_int = O_NONBLOCK;
 pub const NI_MAXHOST: ::socklen_t = 255;
 pub const PTHREAD_STACK_MIN: ::size_t = 2048;
-pub const POSIX_FADV_DONTNEED: ::c_int = 4;
-pub const POSIX_FADV_NOREUSE: ::c_int = 5;
 
 pub const POSIX_MADV_DONTNEED: ::c_int = 4;
 
@@ -501,18 +546,6 @@
 pub const SOCK_DCCP: ::c_int = 6;
 pub const SOCK_PACKET: ::c_int = 10;
 
-pub const TCP_COOKIE_TRANSACTIONS: ::c_int = 15;
-pub const TCP_THIN_LINEAR_TIMEOUTS: ::c_int = 16;
-pub const TCP_THIN_DUPACK: ::c_int = 17;
-pub const TCP_USER_TIMEOUT: ::c_int = 18;
-pub const TCP_REPAIR: ::c_int = 19;
-pub const TCP_REPAIR_QUEUE: ::c_int = 20;
-pub const TCP_QUEUE_SEQ: ::c_int = 21;
-pub const TCP_REPAIR_OPTIONS: ::c_int = 22;
-pub const TCP_FASTOPEN: ::c_int = 23;
-pub const TCP_TIMESTAMP: ::c_int = 24;
-pub const TCP_FASTOPEN_CONNECT: ::c_int = 30;
-
 #[deprecated(since = "0.2.55", note = "Use SIGSYS instead")]
 pub const SIGUNUSED: ::c_int = ::SIGSYS;
 
@@ -552,10 +585,21 @@
 pub const PTRACE_LISTEN: ::c_int = 0x4208;
 pub const PTRACE_PEEKSIGINFO: ::c_int = 0x4209;
 
-pub const EPOLLWAKEUP: ::c_int = 0x20000000;
-
-pub const SEEK_DATA: ::c_int = 3;
-pub const SEEK_HOLE: ::c_int = 4;
+pub const FAN_MARK_INODE: ::c_uint = 0x0000_0000;
+pub const FAN_MARK_MOUNT: ::c_uint = 0x0000_0010;
+// NOTE: FAN_MARK_FILESYSTEM requires Linux Kernel >= 4.20.0
+pub const FAN_MARK_FILESYSTEM: ::c_uint = 0x0000_0100;
+
+pub const AF_IB: ::c_int = 27;
+pub const AF_MPLS: ::c_int = 28;
+pub const AF_NFC: ::c_int = 39;
+pub const AF_VSOCK: ::c_int = 40;
+pub const AF_XDP: ::c_int = 44;
+pub const PF_IB: ::c_int = AF_IB;
+pub const PF_MPLS: ::c_int = AF_MPLS;
+pub const PF_NFC: ::c_int = AF_NFC;
+pub const PF_VSOCK: ::c_int = AF_VSOCK;
+pub const PF_XDP: ::c_int = AF_XDP;
 
 pub const EFD_NONBLOCK: ::c_int = ::O_NONBLOCK;
 
@@ -589,13 +633,6 @@
 pub const EXTA: ::speed_t = B19200;
 pub const EXTB: ::speed_t = B38400;
 
-pub const SO_BINDTODEVICE: ::c_int = 25;
-pub const SO_TIMESTAMP: ::c_int = 29;
-pub const SO_MARK: ::c_int = 36;
-pub const SO_RXQ_OVFL: ::c_int = 40;
-pub const SO_PEEK_OFF: ::c_int = 42;
-pub const SO_BUSY_POLL: ::c_int = 46;
-
 pub const RLIMIT_CPU: ::c_int = 0;
 pub const RLIMIT_FSIZE: ::c_int = 1;
 pub const RLIMIT_DATA: ::c_int = 2;
@@ -616,6 +653,74 @@
 pub const PRIO_PGRP: ::c_int = 1;
 pub const PRIO_USER: ::c_int = 2;
 
+pub const ADJ_OFFSET: ::c_uint = 0x0001;
+pub const ADJ_FREQUENCY: ::c_uint = 0x0002;
+pub const ADJ_MAXERROR: ::c_uint = 0x0004;
+pub const ADJ_ESTERROR: ::c_uint = 0x0008;
+pub const ADJ_STATUS: ::c_uint = 0x0010;
+pub const ADJ_TIMECONST: ::c_uint = 0x0020;
+pub const ADJ_TAI: ::c_uint = 0x0080;
+pub const ADJ_SETOFFSET: ::c_uint = 0x0100;
+pub const ADJ_MICRO: ::c_uint = 0x1000;
+pub const ADJ_NANO: ::c_uint = 0x2000;
+pub const ADJ_TICK: ::c_uint = 0x4000;
+pub const ADJ_OFFSET_SINGLESHOT: ::c_uint = 0x8001;
+pub const ADJ_OFFSET_SS_READ: ::c_uint = 0xa001;
+pub const MOD_OFFSET: ::c_uint = ADJ_OFFSET;
+pub const MOD_FREQUENCY: ::c_uint = ADJ_FREQUENCY;
+pub const MOD_MAXERROR: ::c_uint = ADJ_MAXERROR;
+pub const MOD_ESTERROR: ::c_uint = ADJ_ESTERROR;
+pub const MOD_STATUS: ::c_uint = ADJ_STATUS;
+pub const MOD_TIMECONST: ::c_uint = ADJ_TIMECONST;
+pub const MOD_CLKB: ::c_uint = ADJ_TICK;
+pub const MOD_CLKA: ::c_uint = ADJ_OFFSET_SINGLESHOT;
+pub const MOD_TAI: ::c_uint = ADJ_TAI;
+pub const MOD_MICRO: ::c_uint = ADJ_MICRO;
+pub const MOD_NANO: ::c_uint = ADJ_NANO;
+pub const STA_PLL: ::c_int = 0x0001;
+pub const STA_PPSFREQ: ::c_int = 0x0002;
+pub const STA_PPSTIME: ::c_int = 0x0004;
+pub const STA_FLL: ::c_int = 0x0008;
+pub const STA_INS: ::c_int = 0x0010;
+pub const STA_DEL: ::c_int = 0x0020;
+pub const STA_UNSYNC: ::c_int = 0x0040;
+pub const STA_FREQHOLD: ::c_int = 0x0080;
+pub const STA_PPSSIGNAL: ::c_int = 0x0100;
+pub const STA_PPSJITTER: ::c_int = 0x0200;
+pub const STA_PPSWANDER: ::c_int = 0x0400;
+pub const STA_PPSERROR: ::c_int = 0x0800;
+pub const STA_CLOCKERR: ::c_int = 0x1000;
+pub const STA_NANO: ::c_int = 0x2000;
+pub const STA_MODE: ::c_int = 0x4000;
+pub const STA_CLK: ::c_int = 0x8000;
+pub const STA_RONLY: ::c_int = STA_PPSSIGNAL
+    | STA_PPSJITTER
+    | STA_PPSWANDER
+    | STA_PPSERROR
+    | STA_CLOCKERR
+    | STA_NANO
+    | STA_MODE
+    | STA_CLK;
+
+pub const TIME_OK: ::c_int = 0;
+pub const TIME_INS: ::c_int = 1;
+pub const TIME_DEL: ::c_int = 2;
+pub const TIME_OOP: ::c_int = 3;
+pub const TIME_WAIT: ::c_int = 4;
+pub const TIME_ERROR: ::c_int = 5;
+pub const TIME_BAD: ::c_int = TIME_ERROR;
+pub const MAXTC: ::c_long = 6;
+
+cfg_if! {
+    if #[cfg(target_arch = "s390x")] {
+        pub const POSIX_FADV_DONTNEED: ::c_int = 6;
+        pub const POSIX_FADV_NOREUSE: ::c_int = 7;
+    } else {
+        pub const POSIX_FADV_DONTNEED: ::c_int = 4;
+        pub const POSIX_FADV_NOREUSE: ::c_int = 5;
+    }
+}
+
 extern "C" {
     pub fn sendmmsg(
         sockfd: ::c_int,
@@ -679,13 +784,23 @@
         dirfd: ::c_int,
         path: *const ::c_char,
     ) -> ::c_int;
+    pub fn getauxval(type_: ::c_ulong) -> ::c_ulong;
+
+    // Added in `musl` 1.1.20
+    pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
+    // Added in `musl` 1.2.2
+    pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
+
+    pub fn adjtimex(buf: *mut ::timex) -> ::c_int;
+    pub fn clock_adjtime(clk_id: ::clockid_t, buf: *mut ::timex) -> ::c_int;
 }
 
 cfg_if! {
     if #[cfg(any(target_arch = "x86_64",
                  target_arch = "aarch64",
                  target_arch = "mips64",
-                 target_arch = "powerpc64"))] {
+                 target_arch = "powerpc64",
+                 target_arch = "s390x"))] {
         mod b64;
         pub use self::b64::*;
     } else if #[cfg(any(target_arch = "x86",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,28 @@
+macro_rules! expand_align {
+    () => {
+        s! {
+            #[cfg_attr(any(target_pointer_width = "32",
+                           target_arch = "x86_64",
+                           target_arch = "powerpc64",
+                           target_arch = "mips64",
+                           target_arch = "s390x",
+                           target_arch = "sparc64"),
+                       repr(align(4)))]
+            #[cfg_attr(not(any(target_pointer_width = "32",
+                               target_arch = "x86_64",
+                               target_arch = "powerpc64",
+                               target_arch = "mips64",
+                               target_arch = "s390x",
+                               target_arch = "sparc64")),
+                       repr(align(8)))]
+            pub struct pthread_mutexattr_t {
+                size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
+            }
+
+            #[repr(align(4))]
+            pub struct pthread_condattr_t {
+                size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
+            }
+        }
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+s! {
+    // FIXME this is actually a union
+    #[cfg_attr(target_pointer_width = "32",
+               repr(align(4)))]
+    #[cfg_attr(target_pointer_width = "64",
+               repr(align(8)))]
+    pub struct sem_t {
+        #[cfg(target_pointer_width = "32")]
+        __size: [::c_char; 16],
+        #[cfg(target_pointer_width = "64")]
+        __size: [::c_char; 32],
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,902 @@
+pub type c_char = u8;
+pub type wchar_t = ::c_uint;
+pub type c_long = i32;
+pub type c_ulong = u32;
+pub type time_t = ::c_long;
+
+pub type clock_t = ::c_long;
+pub type fsblkcnt_t = ::c_ulong;
+pub type fsfilcnt_t = ::c_ulong;
+pub type ino_t = ::c_ulong;
+pub type off_t = ::c_long;
+pub type pthread_t = ::c_ulong;
+pub type rlim_t = ::c_ulong;
+pub type suseconds_t = ::c_long;
+
+pub type nlink_t = ::c_uint;
+pub type blksize_t = ::c_long;
+pub type blkcnt_t = ::c_long;
+
+pub type fsblkcnt64_t = u64;
+pub type fsfilcnt64_t = u64;
+pub type __u64 = ::c_ulonglong;
+
+s! {
+    pub struct cmsghdr {
+        pub cmsg_len: ::size_t,
+        pub cmsg_level: ::c_int,
+        pub cmsg_type: ::c_int,
+    }
+
+    pub struct msghdr {
+        pub msg_name: *mut ::c_void,
+        pub msg_namelen: ::socklen_t,
+        pub msg_iov: *mut ::iovec,
+        pub msg_iovlen: ::c_int,
+        pub msg_control: *mut ::c_void,
+        pub msg_controllen: ::socklen_t,
+        pub msg_flags: ::c_int,
+    }
+
+    pub struct pthread_attr_t {
+        __size: [::c_long; 9],
+    }
+
+    pub struct stat {
+        pub st_dev: ::c_ulonglong,
+        pub __pad1: ::c_ushort,
+        pub st_ino: ::ino_t,
+        pub st_mode: ::mode_t,
+        pub st_nlink: ::nlink_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::c_ulonglong,
+        pub __pad2: ::c_ushort,
+        pub st_size: ::off_t,
+        pub st_blksize: ::blksize_t,
+        pub st_blocks: ::blkcnt_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub __uclibc_unused4: ::c_ulong,
+        pub __uclibc_unused5: ::c_ulong,
+    }
+
+    pub struct stat64
+    {
+        pub st_dev: ::c_ulonglong,
+        pub __pad1: ::c_uint,
+        pub __st_ino: ::ino_t,
+        pub st_mode: ::mode_t,
+        pub st_nlink: ::nlink_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::c_ulonglong,
+        pub __pad2: ::c_uint,
+        pub st_size: ::off64_t,
+        pub st_blksize: ::blksize_t,
+        pub st_blocks: ::blkcnt64_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_ino: ::ino64_t,
+    }
+
+    pub struct flock {
+        pub l_type: ::c_short,
+        pub l_whence: ::c_short,
+        pub l_start: ::off_t,
+        pub l_len: ::off_t,
+        pub l_pid: ::pid_t,
+    }
+
+    pub struct sysinfo {
+        pub uptime: ::c_long,
+        pub loads: [::c_ulong; 3],
+        pub totalram: ::c_ulong,
+        pub freeram: ::c_ulong,
+        pub sharedram: ::c_ulong,
+        pub bufferram: ::c_ulong,
+        pub totalswap: ::c_ulong,
+        pub freeswap: ::c_ulong,
+        pub procs: ::c_ushort,
+        pub pad: ::c_ushort,
+        pub totalhigh: ::c_ulong,
+        pub freehigh: ::c_ulong,
+        pub mem_unit: ::c_uint,
+        pub _f: [::c_char; 8],
+    }
+
+    pub struct statfs {
+        pub f_type: ::c_int,
+        pub f_bsize: ::c_int,
+        pub f_blocks: ::fsblkcnt_t,
+        pub f_bfree: ::fsblkcnt_t,
+        pub f_bavail: ::fsblkcnt_t,
+        pub f_files: ::fsfilcnt_t,
+        pub f_ffree: ::fsfilcnt_t,
+
+        pub f_fsid: ::fsid_t,
+        pub f_namelen: ::c_int,
+        pub f_frsize: ::c_int,
+        pub f_flags: ::c_int,
+        pub f_spare: [::c_int; 4],
+    }
+
+    pub struct statfs64 {
+        pub f_type: ::c_int,
+        pub f_bsize: ::c_int,
+        pub f_blocks: ::fsblkcnt64_t,
+        pub f_bfree: ::fsblkcnt64_t,
+        pub f_bavail: ::fsblkcnt64_t,
+        pub f_files: ::fsfilcnt64_t,
+        pub f_ffree: ::fsfilcnt64_t,
+        pub f_fsid: ::fsid_t,
+        pub f_namelen: ::c_int,
+        pub f_frsize: ::c_int,
+        pub f_flags: ::c_int,
+        pub f_spare: [::c_int; 4],
+    }
+
+    pub struct statvfs64 {
+        pub f_bsize: ::c_ulong,
+        pub f_frsize: ::c_ulong,
+        pub f_blocks: u64,
+        pub f_bfree: u64,
+        pub f_bavail: u64,
+        pub f_files: u64,
+        pub f_ffree: u64,
+        pub f_favail: u64,
+        pub f_fsid: ::c_ulong,
+        __f_unused: ::c_int,
+        pub f_flag: ::c_ulong,
+        pub f_namemax: ::c_ulong,
+        __f_spare: [::c_int; 6],
+    }
+
+    pub struct sigset_t {
+        __val: [::c_ulong; 2],
+    }
+
+    pub struct sigaction {
+        pub sa_sigaction: ::sighandler_t,
+        pub sa_flags: ::c_ulong,
+        pub sa_restorer: ::Option<extern fn()>,
+        pub sa_mask: sigset_t,
+    }
+
+    pub struct termios {
+        pub c_iflag: ::tcflag_t,
+        pub c_oflag: ::tcflag_t,
+        pub c_cflag: ::tcflag_t,
+        pub c_lflag: ::tcflag_t,
+        pub c_line: ::cc_t,
+        pub c_cc: [::cc_t; ::NCCS],
+        pub c_ispeed: ::speed_t,
+        pub c_ospeed: ::speed_t,
+    }
+
+    pub struct siginfo_t {
+        pub si_signo: ::c_int,
+        pub si_errno: ::c_int,
+        pub si_code: ::c_int,
+        pub _pad: [::c_int; 29],
+    }
+
+    pub struct stack_t {
+        pub ss_sp: *mut ::c_void,
+        pub ss_flags: ::c_int,
+        pub ss_size: ::size_t,
+    }
+
+    pub struct ipc_perm {
+        pub __key: ::key_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
+        pub cuid: ::uid_t,
+        pub cgid: ::gid_t,
+        pub mode: ::c_ushort,
+        pub __pad1: ::c_ushort,
+        pub __seq: ::c_ushort,
+        pub __pad2: ::c_ushort,
+        pub __uclibc_unused1: ::c_ulong,
+        pub __uclibc_unused2: ::c_ulong,
+    }
+
+    pub struct msqid_ds {
+        pub msg_perm: ::ipc_perm,
+        pub msg_stime: ::time_t,
+        pub __uclibc_unused1: ::c_ulong,
+        pub msg_rtime: ::time_t,
+        pub __uclibc_unused2: ::c_ulong,
+        pub msg_ctime: ::time_t,
+        pub __uclibc_unused3: ::c_ulong,
+        pub __msg_cbytes: ::c_ulong,
+        pub msg_qnum: ::msgqnum_t,
+        pub msg_qbytes: ::msglen_t,
+        pub msg_lspid: ::pid_t,
+        pub msg_lrpid: ::pid_t,
+        pub __uclibc_unused4: ::c_ulong,
+        pub __uclibc_unused5: ::c_ulong,
+    }
+
+    pub struct shmid_ds {
+        pub shm_perm: ::ipc_perm,
+        pub shm_segsz: ::size_t,
+        pub shm_atime: ::time_t,
+        pub __uclibc_unused1: ::c_ulong,
+        pub shm_dtime: ::time_t,
+        pub __uclibc_unused2: ::c_ulong,
+        pub shm_ctime: ::time_t,
+        pub __uclibc_unused3: ::c_ulong,
+        pub shm_cpid: ::pid_t,
+        pub shm_lpid: ::pid_t,
+        pub shm_nattch: ::shmatt_t,
+        pub __uclibc_unused4: ::c_ulong,
+        pub __uclibc_unused5: ::c_ulong,
+    }
+}
+
+pub const O_CLOEXEC: ::c_int = 0o2000000;
+pub const RLIM_INFINITY: rlim_t = !0;
+pub const __SIZEOF_PTHREAD_ATTR_T: usize = 36;
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
+pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_COND_COMPAT_T: usize = 12;
+pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32;
+pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 8;
+pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 20;
+pub const __SIZEOF_PTHREAD_BARRIERATTR_T: usize = 4;
+pub const NCCS: usize = 32;
+
+// I wasn't able to find those constants
+// in uclibc build environment for armv7
+pub const MAP_HUGETLB: ::c_int = 0x040000; // from linux/other/mod.rs
+
+// autogenerated constants with hand tuned types
+pub const B0: ::speed_t = 0;
+pub const B1000000: ::speed_t = 0x1008;
+pub const B110: ::speed_t = 0x3;
+pub const B115200: ::speed_t = 0x1002;
+pub const B1152000: ::speed_t = 0x1009;
+pub const B1200: ::speed_t = 0x9;
+pub const B134: ::speed_t = 0x4;
+pub const B150: ::speed_t = 0x5;
+pub const B1500000: ::speed_t = 0x100a;
+pub const B1800: ::speed_t = 0xa;
+pub const B19200: ::speed_t = 0xe;
+pub const B200: ::speed_t = 0x6;
+pub const B2000000: ::speed_t = 0x100b;
+pub const B230400: ::speed_t = 0x1003;
+pub const B2400: ::speed_t = 0xb;
+pub const B2500000: ::speed_t = 0x100c;
+pub const B300: ::speed_t = 0x7;
+pub const B3000000: ::speed_t = 0x100d;
+pub const B3500000: ::speed_t = 0x100e;
+pub const B38400: ::speed_t = 0xf;
+pub const B4000000: ::speed_t = 0x100f;
+pub const B460800: ::speed_t = 0x1004;
+pub const B4800: ::speed_t = 0xc;
+pub const B50: ::speed_t = 0x1;
+pub const B500000: ::speed_t = 0x1005;
+pub const B57600: ::speed_t = 0x1001;
+pub const B576000: ::speed_t = 0x1006;
+pub const B600: ::speed_t = 0x8;
+pub const B75: ::speed_t = 0x2;
+pub const B921600: ::speed_t = 0x1007;
+pub const B9600: ::speed_t = 0xd;
+pub const BS1: ::c_int = 0x2000;
+pub const BSDLY: ::c_int = 0x2000;
+pub const CBAUD: ::tcflag_t = 0x100f;
+pub const CBAUDEX: ::tcflag_t = 0x1000;
+pub const CIBAUD: ::tcflag_t = 0x100f0000;
+pub const CLOCAL: ::tcflag_t = 0x800;
+pub const CPU_SETSIZE: ::c_int = 0x400;
+pub const CR1: ::c_int = 0x200;
+pub const CR2: ::c_int = 0x400;
+pub const CR3: ::c_int = 0x600;
+pub const CRDLY: ::c_int = 0x600;
+pub const CREAD: ::tcflag_t = 0x80;
+pub const CS6: ::tcflag_t = 0x10;
+pub const CS7: ::tcflag_t = 0x20;
+pub const CS8: ::tcflag_t = 0x30;
+pub const CSIZE: ::tcflag_t = 0x30;
+pub const CSTOPB: ::tcflag_t = 0x40;
+pub const EADDRINUSE: ::c_int = 0x62;
+pub const EADDRNOTAVAIL: ::c_int = 0x63;
+pub const EADV: ::c_int = 0x44;
+pub const EAFNOSUPPORT: ::c_int = 0x61;
+pub const EALREADY: ::c_int = 0x72;
+pub const EBADE: ::c_int = 0x34;
+pub const EBADFD: ::c_int = 0x4d;
+pub const EBADMSG: ::c_int = 0x4a;
+pub const EBADR: ::c_int = 0x35;
+pub const EBADRQC: ::c_int = 0x38;
+pub const EBADSLT: ::c_int = 0x39;
+pub const EBFONT: ::c_int = 0x3b;
+pub const ECANCELED: ::c_int = 0x7d;
+pub const ECHOCTL: ::tcflag_t = 0x200;
+pub const ECHOE: ::tcflag_t = 0x10;
+pub const ECHOK: ::tcflag_t = 0x20;
+pub const ECHOKE: ::tcflag_t = 0x800;
+pub const ECHONL: ::tcflag_t = 0x40;
+pub const ECHOPRT: ::tcflag_t = 0x400;
+pub const ECHRNG: ::c_int = 0x2c;
+pub const ECOMM: ::c_int = 0x46;
+pub const ECONNABORTED: ::c_int = 0x67;
+pub const ECONNREFUSED: ::c_int = 0x6f;
+pub const ECONNRESET: ::c_int = 0x68;
+pub const EDEADLK: ::c_int = 0x23;
+pub const EDESTADDRREQ: ::c_int = 0x59;
+pub const EDOTDOT: ::c_int = 0x49;
+pub const EDQUOT: ::c_int = 0x7a;
+pub const EFD_CLOEXEC: ::c_int = 0x80000;
+pub const EFD_NONBLOCK: ::c_int = 0x800;
+pub const EHOSTDOWN: ::c_int = 0x70;
+pub const EHOSTUNREACH: ::c_int = 0x71;
+pub const EHWPOISON: ::c_int = 0x85;
+pub const EIDRM: ::c_int = 0x2b;
+pub const EILSEQ: ::c_int = 0x54;
+pub const EINPROGRESS: ::c_int = 0x73;
+pub const EISCONN: ::c_int = 0x6a;
+pub const EISNAM: ::c_int = 0x78;
+pub const EKEYEXPIRED: ::c_int = 0x7f;
+pub const EKEYREJECTED: ::c_int = 0x81;
+pub const EKEYREVOKED: ::c_int = 0x80;
+pub const EL2HLT: ::c_int = 0x33;
+pub const EL2NSYNC: ::c_int = 0x2d;
+pub const EL3HLT: ::c_int = 0x2e;
+pub const EL3RST: ::c_int = 0x2f;
+pub const ELIBACC: ::c_int = 0x4f;
+pub const ELIBBAD: ::c_int = 0x50;
+pub const ELIBEXEC: ::c_int = 0x53;
+pub const ELIBMAX: ::c_int = 0x52;
+pub const ELIBSCN: ::c_int = 0x51;
+pub const ELNRNG: ::c_int = 0x30;
+pub const ELOOP: ::c_int = 0x28;
+pub const EMEDIUMTYPE: ::c_int = 0x7c;
+pub const EMSGSIZE: ::c_int = 0x5a;
+pub const EMULTIHOP: ::c_int = 0x48;
+pub const ENAMETOOLONG: ::c_int = 0x24;
+pub const ENAVAIL: ::c_int = 0x77;
+pub const ENETDOWN: ::c_int = 0x64;
+pub const ENETRESET: ::c_int = 0x66;
+pub const ENETUNREACH: ::c_int = 0x65;
+pub const ENOANO: ::c_int = 0x37;
+pub const ENOBUFS: ::c_int = 0x69;
+pub const ENOCSI: ::c_int = 0x32;
+pub const ENODATA: ::c_int = 0x3d;
+pub const ENOKEY: ::c_int = 0x7e;
+pub const ENOLCK: ::c_int = 0x25;
+pub const ENOLINK: ::c_int = 0x43;
+pub const ENOMEDIUM: ::c_int = 0x7b;
+pub const ENOMSG: ::c_int = 0x2a;
+pub const ENONET: ::c_int = 0x40;
+pub const ENOPKG: ::c_int = 0x41;
+pub const ENOPROTOOPT: ::c_int = 0x5c;
+pub const ENOSR: ::c_int = 0x3f;
+pub const ENOSTR: ::c_int = 0x3c;
+pub const ENOSYS: ::c_int = 0x26;
+pub const ENOTCONN: ::c_int = 0x6b;
+pub const ENOTEMPTY: ::c_int = 0x27;
+pub const ENOTNAM: ::c_int = 0x76;
+pub const ENOTRECOVERABLE: ::c_int = 0x83;
+pub const ENOTSOCK: ::c_int = 0x58;
+pub const ENOTUNIQ: ::c_int = 0x4c;
+pub const EOPNOTSUPP: ::c_int = 0x5f;
+pub const EOVERFLOW: ::c_int = 0x4b;
+pub const EOWNERDEAD: ::c_int = 0x82;
+pub const EPFNOSUPPORT: ::c_int = 0x60;
+pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
+pub const EPROTO: ::c_int = 0x47;
+pub const EPROTONOSUPPORT: ::c_int = 0x5d;
+pub const EPROTOTYPE: ::c_int = 0x5b;
+pub const EREMCHG: ::c_int = 0x4e;
+pub const EREMOTE: ::c_int = 0x42;
+pub const EREMOTEIO: ::c_int = 0x79;
+pub const ERESTART: ::c_int = 0x55;
+pub const ERFKILL: ::c_int = 0x84;
+pub const ESHUTDOWN: ::c_int = 0x6c;
+pub const ESOCKTNOSUPPORT: ::c_int = 0x5e;
+pub const ESRMNT: ::c_int = 0x45;
+pub const ESTALE: ::c_int = 0x74;
+pub const ESTRPIPE: ::c_int = 0x56;
+pub const ETIME: ::c_int = 0x3e;
+pub const ETIMEDOUT: ::c_int = 0x6e;
+pub const ETOOMANYREFS: ::c_int = 0x6d;
+pub const EUCLEAN: ::c_int = 0x75;
+pub const EUNATCH: ::c_int = 0x31;
+pub const EUSERS: ::c_int = 0x57;
+pub const EXFULL: ::c_int = 0x36;
+pub const FF1: ::c_int = 0x8000;
+pub const FFDLY: ::c_int = 0x8000;
+pub const FIONBIO: ::c_ulong = 0x5421;
+pub const FIOCLEX: ::c_ulong = 0x5451;
+pub const FIONCLEX: ::c_ulong = 0x5450;
+pub const FLUSHO: ::tcflag_t = 0x1000;
+pub const F_GETLK: ::c_int = 0x5;
+pub const F_SETLK: ::c_int = 0x6;
+pub const F_SETLKW: ::c_int = 0x7;
+pub const HUPCL: ::tcflag_t = 0x400;
+pub const ICANON: ::tcflag_t = 0x2;
+pub const IEXTEN: ::tcflag_t = 0x8000;
+pub const ISIG: ::tcflag_t = 0x1;
+pub const IXOFF: ::tcflag_t = 0x1000;
+pub const IXON: ::tcflag_t = 0x400;
+pub const MAP_ANON: ::c_int = 0x20;
+pub const MAP_ANONYMOUS: ::c_int = 0x20;
+pub const MAP_DENYWRITE: ::c_int = 0x800;
+pub const MAP_EXECUTABLE: ::c_int = 0x1000;
+pub const MAP_GROWSDOWN: ::c_int = 0x100;
+pub const MAP_LOCKED: ::c_int = 0x2000;
+pub const MAP_NONBLOCK: ::c_int = 0x10000;
+pub const MAP_NORESERVE: ::c_int = 0x4000;
+pub const MAP_POPULATE: ::c_int = 0x8000;
+pub const MAP_STACK: ::c_int = 0x20000;
+pub const NLDLY: ::tcflag_t = 0x100;
+pub const NOFLSH: ::tcflag_t = 0x80;
+pub const OLCUC: ::tcflag_t = 0x2;
+pub const ONLCR: ::tcflag_t = 0x4;
+pub const O_ACCMODE: ::c_int = 0x3;
+pub const O_APPEND: ::c_int = 0x400;
+pub const O_ASYNC: ::c_int = 0o20000;
+pub const O_CREAT: ::c_int = 0x40;
+pub const O_DIRECT: ::c_int = 0x10000;
+pub const O_DIRECTORY: ::c_int = 0x4000;
+pub const O_DSYNC: ::c_int = O_SYNC;
+pub const O_EXCL: ::c_int = 0x80;
+pub const O_FSYNC: ::c_int = O_SYNC;
+pub const O_LARGEFILE: ::c_int = 0o400000;
+pub const O_NDELAY: ::c_int = O_NONBLOCK;
+pub const O_NOATIME: ::c_int = 0o1000000;
+pub const O_NOCTTY: ::c_int = 0x100;
+pub const O_NOFOLLOW: ::c_int = 0x8000;
+pub const O_NONBLOCK: ::c_int = 0x800;
+pub const O_PATH: ::c_int = 0o10000000;
+pub const O_RSYNC: ::c_int = O_SYNC;
+pub const O_SYNC: ::c_int = 0o10000;
+pub const O_TRUNC: ::c_int = 0x200;
+pub const PARENB: ::tcflag_t = 0x100;
+pub const PARODD: ::tcflag_t = 0x200;
+pub const PENDIN: ::tcflag_t = 0x4000;
+pub const POLLWRBAND: ::c_short = 0x200;
+pub const POLLWRNORM: ::c_short = 0x100;
+pub const PTHREAD_STACK_MIN: ::size_t = 16384;
+
+// These are typed unsigned to match sigaction
+pub const SA_NOCLDSTOP: ::c_ulong = 0x1;
+pub const SA_NOCLDWAIT: ::c_ulong = 0x2;
+pub const SA_SIGINFO: ::c_ulong = 0x4;
+pub const SA_NODEFER: ::c_ulong = 0x40000000;
+pub const SA_ONSTACK: ::c_ulong = 0x8000000;
+pub const SA_RESETHAND: ::c_ulong = 0x80000000;
+pub const SA_RESTART: ::c_ulong = 0x10000000;
+
+pub const SFD_CLOEXEC: ::c_int = 0x80000;
+pub const SFD_NONBLOCK: ::c_int = 0x800;
+pub const SIGBUS: ::c_int = 0x7;
+pub const SIGCHLD: ::c_int = 0x11;
+pub const SIGCONT: ::c_int = 0x12;
+pub const SIGIO: ::c_int = 0x1d;
+pub const SIGPROF: ::c_int = 0x1b;
+pub const SIGPWR: ::c_int = 0x1e;
+pub const SIGSTKFLT: ::c_int = 0x10;
+pub const SIGSTKSZ: ::size_t = 8192;
+pub const SIGSTOP: ::c_int = 0x13;
+pub const SIGSYS: ::c_int = 0x1f;
+pub const SIGTSTP: ::c_int = 0x14;
+pub const SIGTTIN: ::c_int = 0x15;
+pub const SIGTTOU: ::c_int = 0x16;
+pub const SIGURG: ::c_int = 0x17;
+pub const SIGUSR1: ::c_int = 0xa;
+pub const SIGUSR2: ::c_int = 0xc;
+pub const SIGVTALRM: ::c_int = 0x1a;
+pub const SIGWINCH: ::c_int = 0x1c;
+pub const SIGXCPU: ::c_int = 0x18;
+pub const SIGXFSZ: ::c_int = 0x19;
+pub const SIG_BLOCK: ::c_int = 0;
+pub const SIG_SETMASK: ::c_int = 0x2;
+pub const SIG_UNBLOCK: ::c_int = 0x1;
+pub const SOCK_DGRAM: ::c_int = 0x2;
+pub const SOCK_NONBLOCK: ::c_int = 0o0004000;
+pub const SOCK_SEQPACKET: ::c_int = 0x5;
+pub const SOCK_STREAM: ::c_int = 0x1;
+
+pub const TAB1: ::c_int = 0x800;
+pub const TAB2: ::c_int = 0x1000;
+pub const TAB3: ::c_int = 0x1800;
+pub const TABDLY: ::c_int = 0x1800;
+pub const TCSADRAIN: ::c_int = 0x1;
+pub const TCSAFLUSH: ::c_int = 0x2;
+pub const TCSANOW: ::c_int = 0;
+pub const TOSTOP: ::tcflag_t = 0x100;
+pub const VDISCARD: usize = 0xd;
+pub const VEOF: usize = 0x4;
+pub const VEOL: usize = 0xb;
+pub const VEOL2: usize = 0x10;
+pub const VMIN: usize = 0x6;
+pub const VREPRINT: usize = 0xc;
+pub const VSTART: usize = 0x8;
+pub const VSTOP: usize = 0x9;
+pub const VSUSP: usize = 0xa;
+pub const VSWTC: usize = 0x7;
+pub const VT1: ::c_int = 0x4000;
+pub const VTDLY: ::c_int = 0x4000;
+pub const VTIME: usize = 0x5;
+pub const VWERASE: usize = 0xe;
+pub const XTABS: ::tcflag_t = 0x1800;
+
+pub const MADV_SOFT_OFFLINE: ::c_int = 101;
+
+// Syscall table is copied from src/unix/notbsd/linux/musl/b32/arm.rs
+pub const SYS_restart_syscall: ::c_long = 0;
+pub const SYS_exit: ::c_long = 1;
+pub const SYS_fork: ::c_long = 2;
+pub const SYS_read: ::c_long = 3;
+pub const SYS_write: ::c_long = 4;
+pub const SYS_open: ::c_long = 5;
+pub const SYS_close: ::c_long = 6;
+pub const SYS_creat: ::c_long = 8;
+pub const SYS_link: ::c_long = 9;
+pub const SYS_unlink: ::c_long = 10;
+pub const SYS_execve: ::c_long = 11;
+pub const SYS_chdir: ::c_long = 12;
+pub const SYS_mknod: ::c_long = 14;
+pub const SYS_chmod: ::c_long = 15;
+pub const SYS_lchown: ::c_long = 16;
+pub const SYS_lseek: ::c_long = 19;
+pub const SYS_getpid: ::c_long = 20;
+pub const SYS_mount: ::c_long = 21;
+pub const SYS_setuid: ::c_long = 23;
+pub const SYS_getuid: ::c_long = 24;
+pub const SYS_ptrace: ::c_long = 26;
+pub const SYS_pause: ::c_long = 29;
+pub const SYS_access: ::c_long = 33;
+pub const SYS_nice: ::c_long = 34;
+pub const SYS_sync: ::c_long = 36;
+pub const SYS_kill: ::c_long = 37;
+pub const SYS_rename: ::c_long = 38;
+pub const SYS_mkdir: ::c_long = 39;
+pub const SYS_rmdir: ::c_long = 40;
+pub const SYS_dup: ::c_long = 41;
+pub const SYS_pipe: ::c_long = 42;
+pub const SYS_times: ::c_long = 43;
+pub const SYS_brk: ::c_long = 45;
+pub const SYS_setgid: ::c_long = 46;
+pub const SYS_getgid: ::c_long = 47;
+pub const SYS_geteuid: ::c_long = 49;
+pub const SYS_getegid: ::c_long = 50;
+pub const SYS_acct: ::c_long = 51;
+pub const SYS_umount2: ::c_long = 52;
+pub const SYS_ioctl: ::c_long = 54;
+pub const SYS_fcntl: ::c_long = 55;
+pub const SYS_setpgid: ::c_long = 57;
+pub const SYS_umask: ::c_long = 60;
+pub const SYS_chroot: ::c_long = 61;
+pub const SYS_ustat: ::c_long = 62;
+pub const SYS_dup2: ::c_long = 63;
+pub const SYS_getppid: ::c_long = 64;
+pub const SYS_getpgrp: ::c_long = 65;
+pub const SYS_setsid: ::c_long = 66;
+pub const SYS_sigaction: ::c_long = 67;
+pub const SYS_setreuid: ::c_long = 70;
+pub const SYS_setregid: ::c_long = 71;
+pub const SYS_sigsuspend: ::c_long = 72;
+pub const SYS_sigpending: ::c_long = 73;
+pub const SYS_sethostname: ::c_long = 74;
+pub const SYS_setrlimit: ::c_long = 75;
+pub const SYS_getrusage: ::c_long = 77;
+pub const SYS_gettimeofday: ::c_long = 78;
+pub const SYS_settimeofday: ::c_long = 79;
+pub const SYS_getgroups: ::c_long = 80;
+pub const SYS_setgroups: ::c_long = 81;
+pub const SYS_symlink: ::c_long = 83;
+pub const SYS_readlink: ::c_long = 85;
+pub const SYS_uselib: ::c_long = 86;
+pub const SYS_swapon: ::c_long = 87;
+pub const SYS_reboot: ::c_long = 88;
+pub const SYS_munmap: ::c_long = 91;
+pub const SYS_truncate: ::c_long = 92;
+pub const SYS_ftruncate: ::c_long = 93;
+pub const SYS_fchmod: ::c_long = 94;
+pub const SYS_fchown: ::c_long = 95;
+pub const SYS_getpriority: ::c_long = 96;
+pub const SYS_setpriority: ::c_long = 97;
+pub const SYS_statfs: ::c_long = 99;
+pub const SYS_fstatfs: ::c_long = 100;
+pub const SYS_syslog: ::c_long = 103;
+pub const SYS_setitimer: ::c_long = 104;
+pub const SYS_getitimer: ::c_long = 105;
+pub const SYS_stat: ::c_long = 106;
+pub const SYS_lstat: ::c_long = 107;
+pub const SYS_fstat: ::c_long = 108;
+pub const SYS_vhangup: ::c_long = 111;
+pub const SYS_wait4: ::c_long = 114;
+pub const SYS_swapoff: ::c_long = 115;
+pub const SYS_sysinfo: ::c_long = 116;
+pub const SYS_fsync: ::c_long = 118;
+pub const SYS_sigreturn: ::c_long = 119;
+pub const SYS_clone: ::c_long = 120;
+pub const SYS_setdomainname: ::c_long = 121;
+pub const SYS_uname: ::c_long = 122;
+pub const SYS_adjtimex: ::c_long = 124;
+pub const SYS_mprotect: ::c_long = 125;
+pub const SYS_sigprocmask: ::c_long = 126;
+pub const SYS_init_module: ::c_long = 128;
+pub const SYS_delete_module: ::c_long = 129;
+pub const SYS_quotactl: ::c_long = 131;
+pub const SYS_getpgid: ::c_long = 132;
+pub const SYS_fchdir: ::c_long = 133;
+pub const SYS_bdflush: ::c_long = 134;
+pub const SYS_sysfs: ::c_long = 135;
+pub const SYS_personality: ::c_long = 136;
+pub const SYS_setfsuid: ::c_long = 138;
+pub const SYS_setfsgid: ::c_long = 139;
+pub const SYS__llseek: ::c_long = 140;
+pub const SYS_getdents: ::c_long = 141;
+pub const SYS__newselect: ::c_long = 142;
+pub const SYS_flock: ::c_long = 143;
+pub const SYS_msync: ::c_long = 144;
+pub const SYS_readv: ::c_long = 145;
+pub const SYS_writev: ::c_long = 146;
+pub const SYS_getsid: ::c_long = 147;
+pub const SYS_fdatasync: ::c_long = 148;
+pub const SYS__sysctl: ::c_long = 149;
+pub const SYS_mlock: ::c_long = 150;
+pub const SYS_munlock: ::c_long = 151;
+pub const SYS_mlockall: ::c_long = 152;
+pub const SYS_munlockall: ::c_long = 153;
+pub const SYS_sched_setparam: ::c_long = 154;
+pub const SYS_sched_getparam: ::c_long = 155;
+pub const SYS_sched_setscheduler: ::c_long = 156;
+pub const SYS_sched_getscheduler: ::c_long = 157;
+pub const SYS_sched_yield: ::c_long = 158;
+pub const SYS_sched_get_priority_max: ::c_long = 159;
+pub const SYS_sched_get_priority_min: ::c_long = 160;
+pub const SYS_sched_rr_get_interval: ::c_long = 161;
+pub const SYS_nanosleep: ::c_long = 162;
+pub const SYS_mremap: ::c_long = 163;
+pub const SYS_setresuid: ::c_long = 164;
+pub const SYS_getresuid: ::c_long = 165;
+pub const SYS_poll: ::c_long = 168;
+pub const SYS_nfsservctl: ::c_long = 169;
+pub const SYS_setresgid: ::c_long = 170;
+pub const SYS_getresgid: ::c_long = 171;
+pub const SYS_prctl: ::c_long = 172;
+pub const SYS_rt_sigreturn: ::c_long = 173;
+pub const SYS_rt_sigaction: ::c_long = 174;
+pub const SYS_rt_sigprocmask: ::c_long = 175;
+pub const SYS_rt_sigpending: ::c_long = 176;
+pub const SYS_rt_sigtimedwait: ::c_long = 177;
+pub const SYS_rt_sigqueueinfo: ::c_long = 178;
+pub const SYS_rt_sigsuspend: ::c_long = 179;
+pub const SYS_pread64: ::c_long = 180;
+pub const SYS_pwrite64: ::c_long = 181;
+pub const SYS_chown: ::c_long = 182;
+pub const SYS_getcwd: ::c_long = 183;
+pub const SYS_capget: ::c_long = 184;
+pub const SYS_capset: ::c_long = 185;
+pub const SYS_sigaltstack: ::c_long = 186;
+pub const SYS_sendfile: ::c_long = 187;
+pub const SYS_vfork: ::c_long = 190;
+pub const SYS_ugetrlimit: ::c_long = 191;
+pub const SYS_mmap2: ::c_long = 192;
+pub const SYS_truncate64: ::c_long = 193;
+pub const SYS_ftruncate64: ::c_long = 194;
+pub const SYS_stat64: ::c_long = 195;
+pub const SYS_lstat64: ::c_long = 196;
+pub const SYS_fstat64: ::c_long = 197;
+pub const SYS_lchown32: ::c_long = 198;
+pub const SYS_getuid32: ::c_long = 199;
+pub const SYS_getgid32: ::c_long = 200;
+pub const SYS_geteuid32: ::c_long = 201;
+pub const SYS_getegid32: ::c_long = 202;
+pub const SYS_setreuid32: ::c_long = 203;
+pub const SYS_setregid32: ::c_long = 204;
+pub const SYS_getgroups32: ::c_long = 205;
+pub const SYS_setgroups32: ::c_long = 206;
+pub const SYS_fchown32: ::c_long = 207;
+pub const SYS_setresuid32: ::c_long = 208;
+pub const SYS_getresuid32: ::c_long = 209;
+pub const SYS_setresgid32: ::c_long = 210;
+pub const SYS_getresgid32: ::c_long = 211;
+pub const SYS_chown32: ::c_long = 212;
+pub const SYS_setuid32: ::c_long = 213;
+pub const SYS_setgid32: ::c_long = 214;
+pub const SYS_setfsuid32: ::c_long = 215;
+pub const SYS_setfsgid32: ::c_long = 216;
+pub const SYS_getdents64: ::c_long = 217;
+pub const SYS_pivot_root: ::c_long = 218;
+pub const SYS_mincore: ::c_long = 219;
+pub const SYS_madvise: ::c_long = 220;
+pub const SYS_fcntl64: ::c_long = 221;
+pub const SYS_gettid: ::c_long = 224;
+pub const SYS_readahead: ::c_long = 225;
+pub const SYS_setxattr: ::c_long = 226;
+pub const SYS_lsetxattr: ::c_long = 227;
+pub const SYS_fsetxattr: ::c_long = 228;
+pub const SYS_getxattr: ::c_long = 229;
+pub const SYS_lgetxattr: ::c_long = 230;
+pub const SYS_fgetxattr: ::c_long = 231;
+pub const SYS_listxattr: ::c_long = 232;
+pub const SYS_llistxattr: ::c_long = 233;
+pub const SYS_flistxattr: ::c_long = 234;
+pub const SYS_removexattr: ::c_long = 235;
+pub const SYS_lremovexattr: ::c_long = 236;
+pub const SYS_fremovexattr: ::c_long = 237;
+pub const SYS_tkill: ::c_long = 238;
+pub const SYS_sendfile64: ::c_long = 239;
+pub const SYS_futex: ::c_long = 240;
+pub const SYS_sched_setaffinity: ::c_long = 241;
+pub const SYS_sched_getaffinity: ::c_long = 242;
+pub const SYS_io_setup: ::c_long = 243;
+pub const SYS_io_destroy: ::c_long = 244;
+pub const SYS_io_getevents: ::c_long = 245;
+pub const SYS_io_submit: ::c_long = 246;
+pub const SYS_io_cancel: ::c_long = 247;
+pub const SYS_exit_group: ::c_long = 248;
+pub const SYS_lookup_dcookie: ::c_long = 249;
+pub const SYS_epoll_create: ::c_long = 250;
+pub const SYS_epoll_ctl: ::c_long = 251;
+pub const SYS_epoll_wait: ::c_long = 252;
+pub const SYS_remap_file_pages: ::c_long = 253;
+pub const SYS_set_tid_address: ::c_long = 256;
+pub const SYS_timer_create: ::c_long = 257;
+pub const SYS_timer_settime: ::c_long = 258;
+pub const SYS_timer_gettime: ::c_long = 259;
+pub const SYS_timer_getoverrun: ::c_long = 260;
+pub const SYS_timer_delete: ::c_long = 261;
+pub const SYS_clock_settime: ::c_long = 262;
+pub const SYS_clock_gettime: ::c_long = 263;
+pub const SYS_clock_getres: ::c_long = 264;
+pub const SYS_clock_nanosleep: ::c_long = 265;
+pub const SYS_statfs64: ::c_long = 266;
+pub const SYS_fstatfs64: ::c_long = 267;
+pub const SYS_tgkill: ::c_long = 268;
+pub const SYS_utimes: ::c_long = 269;
+pub const SYS_pciconfig_iobase: ::c_long = 271;
+pub const SYS_pciconfig_read: ::c_long = 272;
+pub const SYS_pciconfig_write: ::c_long = 273;
+pub const SYS_mq_open: ::c_long = 274;
+pub const SYS_mq_unlink: ::c_long = 275;
+pub const SYS_mq_timedsend: ::c_long = 276;
+pub const SYS_mq_timedreceive: ::c_long = 277;
+pub const SYS_mq_notify: ::c_long = 278;
+pub const SYS_mq_getsetattr: ::c_long = 279;
+pub const SYS_waitid: ::c_long = 280;
+pub const SYS_socket: ::c_long = 281;
+pub const SYS_bind: ::c_long = 282;
+pub const SYS_connect: ::c_long = 283;
+pub const SYS_listen: ::c_long = 284;
+pub const SYS_accept: ::c_long = 285;
+pub const SYS_getsockname: ::c_long = 286;
+pub const SYS_getpeername: ::c_long = 287;
+pub const SYS_socketpair: ::c_long = 288;
+pub const SYS_send: ::c_long = 289;
+pub const SYS_sendto: ::c_long = 290;
+pub const SYS_recv: ::c_long = 291;
+pub const SYS_recvfrom: ::c_long = 292;
+pub const SYS_shutdown: ::c_long = 293;
+pub const SYS_setsockopt: ::c_long = 294;
+pub const SYS_getsockopt: ::c_long = 295;
+pub const SYS_sendmsg: ::c_long = 296;
+pub const SYS_recvmsg: ::c_long = 297;
+pub const SYS_semop: ::c_long = 298;
+pub const SYS_semget: ::c_long = 299;
+pub const SYS_semctl: ::c_long = 300;
+pub const SYS_msgsnd: ::c_long = 301;
+pub const SYS_msgrcv: ::c_long = 302;
+pub const SYS_msgget: ::c_long = 303;
+pub const SYS_msgctl: ::c_long = 304;
+pub const SYS_shmat: ::c_long = 305;
+pub const SYS_shmdt: ::c_long = 306;
+pub const SYS_shmget: ::c_long = 307;
+pub const SYS_shmctl: ::c_long = 308;
+pub const SYS_add_key: ::c_long = 309;
+pub const SYS_request_key: ::c_long = 310;
+pub const SYS_keyctl: ::c_long = 311;
+pub const SYS_semtimedop: ::c_long = 312;
+pub const SYS_vserver: ::c_long = 313;
+pub const SYS_ioprio_set: ::c_long = 314;
+pub const SYS_ioprio_get: ::c_long = 315;
+pub const SYS_inotify_init: ::c_long = 316;
+pub const SYS_inotify_add_watch: ::c_long = 317;
+pub const SYS_inotify_rm_watch: ::c_long = 318;
+pub const SYS_mbind: ::c_long = 319;
+pub const SYS_get_mempolicy: ::c_long = 320;
+pub const SYS_set_mempolicy: ::c_long = 321;
+pub const SYS_openat: ::c_long = 322;
+pub const SYS_mkdirat: ::c_long = 323;
+pub const SYS_mknodat: ::c_long = 324;
+pub const SYS_fchownat: ::c_long = 325;
+pub const SYS_futimesat: ::c_long = 326;
+pub const SYS_fstatat64: ::c_long = 327;
+pub const SYS_unlinkat: ::c_long = 328;
+pub const SYS_renameat: ::c_long = 329;
+pub const SYS_linkat: ::c_long = 330;
+pub const SYS_symlinkat: ::c_long = 331;
+pub const SYS_readlinkat: ::c_long = 332;
+pub const SYS_fchmodat: ::c_long = 333;
+pub const SYS_faccessat: ::c_long = 334;
+pub const SYS_pselect6: ::c_long = 335;
+pub const SYS_ppoll: ::c_long = 336;
+pub const SYS_unshare: ::c_long = 337;
+pub const SYS_set_robust_list: ::c_long = 338;
+pub const SYS_get_robust_list: ::c_long = 339;
+pub const SYS_splice: ::c_long = 340;
+pub const SYS_tee: ::c_long = 342;
+pub const SYS_vmsplice: ::c_long = 343;
+pub const SYS_move_pages: ::c_long = 344;
+pub const SYS_getcpu: ::c_long = 345;
+pub const SYS_epoll_pwait: ::c_long = 346;
+pub const SYS_kexec_load: ::c_long = 347;
+pub const SYS_utimensat: ::c_long = 348;
+pub const SYS_signalfd: ::c_long = 349;
+pub const SYS_timerfd_create: ::c_long = 350;
+pub const SYS_eventfd: ::c_long = 351;
+pub const SYS_fallocate: ::c_long = 352;
+pub const SYS_timerfd_settime: ::c_long = 353;
+pub const SYS_timerfd_gettime: ::c_long = 354;
+pub const SYS_signalfd4: ::c_long = 355;
+pub const SYS_eventfd2: ::c_long = 356;
+pub const SYS_epoll_create1: ::c_long = 357;
+pub const SYS_dup3: ::c_long = 358;
+pub const SYS_pipe2: ::c_long = 359;
+pub const SYS_inotify_init1: ::c_long = 360;
+pub const SYS_preadv: ::c_long = 361;
+pub const SYS_pwritev: ::c_long = 362;
+pub const SYS_rt_tgsigqueueinfo: ::c_long = 363;
+pub const SYS_perf_event_open: ::c_long = 364;
+pub const SYS_recvmmsg: ::c_long = 365;
+pub const SYS_accept4: ::c_long = 366;
+pub const SYS_fanotify_init: ::c_long = 367;
+pub const SYS_fanotify_mark: ::c_long = 368;
+pub const SYS_prlimit64: ::c_long = 369;
+pub const SYS_name_to_handle_at: ::c_long = 370;
+pub const SYS_open_by_handle_at: ::c_long = 371;
+pub const SYS_clock_adjtime: ::c_long = 372;
+pub const SYS_syncfs: ::c_long = 373;
+pub const SYS_sendmmsg: ::c_long = 374;
+pub const SYS_setns: ::c_long = 375;
+pub const SYS_process_vm_readv: ::c_long = 376;
+pub const SYS_process_vm_writev: ::c_long = 377;
+pub const SYS_kcmp: ::c_long = 378;
+pub const SYS_finit_module: ::c_long = 379;
+pub const SYS_sched_setattr: ::c_long = 380;
+pub const SYS_sched_getattr: ::c_long = 381;
+pub const SYS_renameat2: ::c_long = 382;
+pub const SYS_seccomp: ::c_long = 383;
+pub const SYS_getrandom: ::c_long = 384;
+pub const SYS_memfd_create: ::c_long = 385;
+pub const SYS_bpf: ::c_long = 386;
+pub const SYS_execveat: ::c_long = 387;
+pub const SYS_userfaultfd: ::c_long = 388;
+pub const SYS_membarrier: ::c_long = 389;
+pub const SYS_mlock2: ::c_long = 390;
+pub const SYS_copy_file_range: ::c_long = 391;
+pub const SYS_preadv2: ::c_long = 392;
+pub const SYS_pwritev2: ::c_long = 393;
+pub const SYS_pkey_mprotect: ::c_long = 394;
+pub const SYS_pkey_alloc: ::c_long = 395;
+pub const SYS_pkey_free: ::c_long = 396;
+
+extern "C" {
+    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
+}
+
+cfg_if! {
+    if #[cfg(libc_align)] {
+        mod align;
+        pub use self::align::*;
+    } else {
+        mod no_align;
+        pub use self::no_align::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/no_align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/arm/no_align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+s! {
+    // FIXME this is actually a union
+    pub struct sem_t {
+        #[cfg(target_pointer_width = "32")]
+        __size: [::c_char; 16],
+        #[cfg(target_pointer_width = "64")]
+        __size: [::c_char; 32],
+        __align: [::c_long; 0],
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+s! {
+    // FIXME this is actually a union
+    #[cfg_attr(target_pointer_width = "32",
+               repr(align(4)))]
+    #[cfg_attr(target_pointer_width = "64",
+               repr(align(8)))]
+    pub struct sem_t {
+        #[cfg(target_pointer_width = "32")]
+        __size: [::c_char; 16],
+        #[cfg(target_pointer_width = "64")]
+        __size: [::c_char; 32],
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,667 @@
+pub type c_char = i8;
+pub type c_long = i32;
+pub type c_ulong = u32;
+pub type clock_t = i32;
+pub type time_t = i32;
+pub type suseconds_t = i32;
+pub type wchar_t = i32;
+pub type off_t = i32;
+pub type ino_t = u32;
+pub type blkcnt_t = i32;
+pub type blksize_t = i32;
+pub type nlink_t = u32;
+pub type fsblkcnt_t = ::c_ulong;
+pub type fsfilcnt_t = ::c_ulong;
+pub type rlim_t = ::c_ulong;
+pub type __u64 = ::c_ulonglong;
+pub type fsblkcnt64_t = u64;
+pub type fsfilcnt64_t = u64;
+
+s! {
+    pub struct stat {
+        pub st_dev: ::dev_t,
+        st_pad1: [::c_long; 2],
+        pub st_ino: ::ino_t,
+        pub st_mode: ::mode_t,
+        pub st_nlink: ::nlink_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::dev_t,
+        pub st_pad2: [::c_long; 1],
+        pub st_size: ::off_t,
+        st_pad3: ::c_long,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_blksize: ::blksize_t,
+        pub st_blocks: ::blkcnt_t,
+        st_pad5: [::c_long; 14],
+    }
+
+    pub struct stat64 {
+        pub st_dev: ::dev_t,
+        st_pad1: [::c_long; 2],
+        pub st_ino: ::ino64_t,
+        pub st_mode: ::mode_t,
+        pub st_nlink: ::nlink_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::dev_t,
+        st_pad2: [::c_long; 2],
+        pub st_size: ::off64_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_blksize: ::blksize_t,
+        st_pad3: ::c_long,
+        pub st_blocks: ::blkcnt64_t,
+        st_pad5: [::c_long; 14],
+    }
+
+    pub struct statvfs64 {
+        pub f_bsize: ::c_ulong,
+        pub f_frsize: ::c_ulong,
+        pub f_blocks: ::fsblkcnt64_t,
+        pub f_bfree: ::fsblkcnt64_t,
+        pub f_bavail: ::fsblkcnt64_t,
+        pub f_files: ::fsfilcnt64_t,
+        pub f_ffree: ::fsfilcnt64_t,
+        pub f_favail: ::fsfilcnt64_t,
+        pub f_fsid: ::c_ulong,
+        pub __f_unused: ::c_int,
+        pub f_flag: ::c_ulong,
+        pub f_namemax: ::c_ulong,
+        pub __f_spare: [::c_int; 6],
+    }
+
+    pub struct pthread_attr_t {
+        __size: [u32; 9]
+    }
+
+    pub struct sigaction {
+        pub sa_flags: ::c_uint,
+        pub sa_sigaction: ::sighandler_t,
+        pub sa_mask: sigset_t,
+        _restorer: *mut ::c_void,
+    }
+
+    pub struct stack_t {
+        pub ss_sp: *mut ::c_void,
+        pub ss_size: ::size_t,
+        pub ss_flags: ::c_int,
+    }
+
+    pub struct sigset_t {
+        __val: [::c_ulong; 4],
+    }
+
+    pub struct siginfo_t {
+        pub si_signo: ::c_int,
+        pub si_code: ::c_int,
+        pub si_errno: ::c_int,
+        pub _pad: [::c_int; 29],
+    }
+
+    pub struct glob64_t {
+        pub gl_pathc: ::size_t,
+        pub gl_pathv: *mut *mut ::c_char,
+        pub gl_offs: ::size_t,
+        pub gl_flags: ::c_int,
+
+        __unused1: *mut ::c_void,
+        __unused2: *mut ::c_void,
+        __unused3: *mut ::c_void,
+        __unused4: *mut ::c_void,
+        __unused5: *mut ::c_void,
+    }
+
+    pub struct ipc_perm {
+        pub __key: ::key_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
+        pub cuid: ::uid_t,
+        pub cgid: ::gid_t,
+        pub mode: ::c_uint,
+        pub __seq: ::c_ushort,
+        __pad1: ::c_ushort,
+        __unused1: ::c_ulong,
+        __unused2: ::c_ulong
+    }
+
+    pub struct shmid_ds {
+        pub shm_perm: ::ipc_perm,
+        pub shm_segsz: ::size_t,
+        pub shm_atime: ::time_t,
+        pub shm_dtime: ::time_t,
+        pub shm_ctime: ::time_t,
+        pub shm_cpid: ::pid_t,
+        pub shm_lpid: ::pid_t,
+        pub shm_nattch: ::shmatt_t,
+        __unused4: ::c_ulong,
+        __unused5: ::c_ulong
+    }
+
+    pub struct msqid_ds {
+        pub msg_perm: ::ipc_perm,
+        #[cfg(target_endian = "big")]
+        __glibc_reserved1: ::c_ulong,
+        pub msg_stime: ::time_t,
+        #[cfg(target_endian = "little")]
+        __glibc_reserved1: ::c_ulong,
+        #[cfg(target_endian = "big")]
+        __glibc_reserved2: ::c_ulong,
+        pub msg_rtime: ::time_t,
+        #[cfg(target_endian = "little")]
+        __glibc_reserved2: ::c_ulong,
+        #[cfg(target_endian = "big")]
+        __glibc_reserved3: ::c_ulong,
+        pub msg_ctime: ::time_t,
+        #[cfg(target_endian = "little")]
+        __glibc_reserved3: ::c_ulong,
+        __msg_cbytes: ::c_ulong,
+        pub msg_qnum: ::msgqnum_t,
+        pub msg_qbytes: ::msglen_t,
+        pub msg_lspid: ::pid_t,
+        pub msg_lrpid: ::pid_t,
+        __glibc_reserved4: ::c_ulong,
+        __glibc_reserved5: ::c_ulong,
+    }
+
+    pub struct statfs {
+        pub f_type: ::c_long,
+        pub f_bsize: ::c_long,
+        pub f_frsize: ::c_long,
+        pub f_blocks: ::fsblkcnt_t,
+        pub f_bfree: ::fsblkcnt_t,
+        pub f_files: ::fsblkcnt_t,
+        pub f_ffree: ::fsblkcnt_t,
+        pub f_bavail: ::fsblkcnt_t,
+        pub f_fsid: ::fsid_t,
+
+        pub f_namelen: ::c_long,
+        f_spare: [::c_long; 6],
+    }
+
+    pub struct statfs64 {
+        pub f_type: ::c_long,
+        pub f_bsize: ::c_long,
+        pub f_frsize: ::c_long,
+        pub f_blocks: ::fsblkcnt64_t,
+        pub f_bfree: ::fsblkcnt64_t,
+        pub f_files: ::fsblkcnt64_t,
+        pub f_ffree: ::fsblkcnt64_t,
+        pub f_bavail: ::fsblkcnt64_t,
+        pub f_fsid: ::fsid_t,
+        pub f_namelen: ::c_long,
+        pub f_flags: ::c_long,
+        pub f_spare: [::c_long; 5],
+    }
+
+    pub struct msghdr {
+        pub msg_name: *mut ::c_void,
+        pub msg_namelen: ::socklen_t,
+        pub msg_iov: *mut ::iovec,
+        pub msg_iovlen: ::c_int,
+        pub msg_control: *mut ::c_void,
+        pub msg_controllen: ::size_t,
+        pub msg_flags: ::c_int,
+    }
+
+    pub struct cmsghdr {
+        pub cmsg_len: ::size_t,
+        pub cmsg_level: ::c_int,
+        pub cmsg_type: ::c_int,
+    }
+
+    pub struct termios {
+        pub c_iflag: ::tcflag_t,
+        pub c_oflag: ::tcflag_t,
+        pub c_cflag: ::tcflag_t,
+        pub c_lflag: ::tcflag_t,
+        pub c_line: ::cc_t,
+        pub c_cc: [::cc_t; ::NCCS],
+    }
+
+    pub struct flock {
+        pub l_type: ::c_short,
+        pub l_whence: ::c_short,
+        pub l_start: ::off_t,
+        pub l_len: ::off_t,
+        pub l_sysid: ::c_long,
+        pub l_pid: ::pid_t,
+        pad: [::c_long; 4],
+    }
+
+    pub struct sysinfo {
+        pub uptime: ::c_long,
+        pub loads: [::c_ulong; 3],
+        pub totalram: ::c_ulong,
+        pub freeram: ::c_ulong,
+        pub sharedram: ::c_ulong,
+        pub bufferram: ::c_ulong,
+        pub totalswap: ::c_ulong,
+        pub freeswap: ::c_ulong,
+        pub procs: ::c_ushort,
+        pub pad: ::c_ushort,
+        pub totalhigh: ::c_ulong,
+        pub freehigh: ::c_ulong,
+        pub mem_unit: ::c_uint,
+        pub _f: [::c_char; 8],
+    }
+}
+
+pub const __SIZEOF_PTHREAD_ATTR_T: usize = 36;
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
+pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32;
+pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 8;
+pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 20;
+pub const __SIZEOF_PTHREAD_BARRIERATTR_T: usize = 4;
+
+pub const RLIM_INFINITY: ::rlim_t = 0x7fffffff;
+
+pub const SYS_syscall: ::c_long = 4000 + 0;
+pub const SYS_exit: ::c_long = 4000 + 1;
+pub const SYS_fork: ::c_long = 4000 + 2;
+pub const SYS_read: ::c_long = 4000 + 3;
+pub const SYS_write: ::c_long = 4000 + 4;
+pub const SYS_open: ::c_long = 4000 + 5;
+pub const SYS_close: ::c_long = 4000 + 6;
+pub const SYS_waitpid: ::c_long = 4000 + 7;
+pub const SYS_creat: ::c_long = 4000 + 8;
+pub const SYS_link: ::c_long = 4000 + 9;
+pub const SYS_unlink: ::c_long = 4000 + 10;
+pub const SYS_execve: ::c_long = 4000 + 11;
+pub const SYS_chdir: ::c_long = 4000 + 12;
+pub const SYS_time: ::c_long = 4000 + 13;
+pub const SYS_mknod: ::c_long = 4000 + 14;
+pub const SYS_chmod: ::c_long = 4000 + 15;
+pub const SYS_lchown: ::c_long = 4000 + 16;
+pub const SYS_break: ::c_long = 4000 + 17;
+pub const SYS_lseek: ::c_long = 4000 + 19;
+pub const SYS_getpid: ::c_long = 4000 + 20;
+pub const SYS_mount: ::c_long = 4000 + 21;
+pub const SYS_umount: ::c_long = 4000 + 22;
+pub const SYS_setuid: ::c_long = 4000 + 23;
+pub const SYS_getuid: ::c_long = 4000 + 24;
+pub const SYS_stime: ::c_long = 4000 + 25;
+pub const SYS_ptrace: ::c_long = 4000 + 26;
+pub const SYS_alarm: ::c_long = 4000 + 27;
+pub const SYS_pause: ::c_long = 4000 + 29;
+pub const SYS_utime: ::c_long = 4000 + 30;
+pub const SYS_stty: ::c_long = 4000 + 31;
+pub const SYS_gtty: ::c_long = 4000 + 32;
+pub const SYS_access: ::c_long = 4000 + 33;
+pub const SYS_nice: ::c_long = 4000 + 34;
+pub const SYS_ftime: ::c_long = 4000 + 35;
+pub const SYS_sync: ::c_long = 4000 + 36;
+pub const SYS_kill: ::c_long = 4000 + 37;
+pub const SYS_rename: ::c_long = 4000 + 38;
+pub const SYS_mkdir: ::c_long = 4000 + 39;
+pub const SYS_rmdir: ::c_long = 4000 + 40;
+pub const SYS_dup: ::c_long = 4000 + 41;
+pub const SYS_pipe: ::c_long = 4000 + 42;
+pub const SYS_times: ::c_long = 4000 + 43;
+pub const SYS_prof: ::c_long = 4000 + 44;
+pub const SYS_brk: ::c_long = 4000 + 45;
+pub const SYS_setgid: ::c_long = 4000 + 46;
+pub const SYS_getgid: ::c_long = 4000 + 47;
+pub const SYS_signal: ::c_long = 4000 + 48;
+pub const SYS_geteuid: ::c_long = 4000 + 49;
+pub const SYS_getegid: ::c_long = 4000 + 50;
+pub const SYS_acct: ::c_long = 4000 + 51;
+pub const SYS_umount2: ::c_long = 4000 + 52;
+pub const SYS_lock: ::c_long = 4000 + 53;
+pub const SYS_ioctl: ::c_long = 4000 + 54;
+pub const SYS_fcntl: ::c_long = 4000 + 55;
+pub const SYS_mpx: ::c_long = 4000 + 56;
+pub const SYS_setpgid: ::c_long = 4000 + 57;
+pub const SYS_ulimit: ::c_long = 4000 + 58;
+pub const SYS_umask: ::c_long = 4000 + 60;
+pub const SYS_chroot: ::c_long = 4000 + 61;
+pub const SYS_ustat: ::c_long = 4000 + 62;
+pub const SYS_dup2: ::c_long = 4000 + 63;
+pub const SYS_getppid: ::c_long = 4000 + 64;
+pub const SYS_getpgrp: ::c_long = 4000 + 65;
+pub const SYS_setsid: ::c_long = 4000 + 66;
+pub const SYS_sigaction: ::c_long = 4000 + 67;
+pub const SYS_sgetmask: ::c_long = 4000 + 68;
+pub const SYS_ssetmask: ::c_long = 4000 + 69;
+pub const SYS_setreuid: ::c_long = 4000 + 70;
+pub const SYS_setregid: ::c_long = 4000 + 71;
+pub const SYS_sigsuspend: ::c_long = 4000 + 72;
+pub const SYS_sigpending: ::c_long = 4000 + 73;
+pub const SYS_sethostname: ::c_long = 4000 + 74;
+pub const SYS_setrlimit: ::c_long = 4000 + 75;
+pub const SYS_getrlimit: ::c_long = 4000 + 76;
+pub const SYS_getrusage: ::c_long = 4000 + 77;
+pub const SYS_gettimeofday: ::c_long = 4000 + 78;
+pub const SYS_settimeofday: ::c_long = 4000 + 79;
+pub const SYS_getgroups: ::c_long = 4000 + 80;
+pub const SYS_setgroups: ::c_long = 4000 + 81;
+pub const SYS_symlink: ::c_long = 4000 + 83;
+pub const SYS_readlink: ::c_long = 4000 + 85;
+pub const SYS_uselib: ::c_long = 4000 + 86;
+pub const SYS_swapon: ::c_long = 4000 + 87;
+pub const SYS_reboot: ::c_long = 4000 + 88;
+pub const SYS_readdir: ::c_long = 4000 + 89;
+pub const SYS_mmap: ::c_long = 4000 + 90;
+pub const SYS_munmap: ::c_long = 4000 + 91;
+pub const SYS_truncate: ::c_long = 4000 + 92;
+pub const SYS_ftruncate: ::c_long = 4000 + 93;
+pub const SYS_fchmod: ::c_long = 4000 + 94;
+pub const SYS_fchown: ::c_long = 4000 + 95;
+pub const SYS_getpriority: ::c_long = 4000 + 96;
+pub const SYS_setpriority: ::c_long = 4000 + 97;
+pub const SYS_profil: ::c_long = 4000 + 98;
+pub const SYS_statfs: ::c_long = 4000 + 99;
+pub const SYS_fstatfs: ::c_long = 4000 + 100;
+pub const SYS_ioperm: ::c_long = 4000 + 101;
+pub const SYS_socketcall: ::c_long = 4000 + 102;
+pub const SYS_syslog: ::c_long = 4000 + 103;
+pub const SYS_setitimer: ::c_long = 4000 + 104;
+pub const SYS_getitimer: ::c_long = 4000 + 105;
+pub const SYS_stat: ::c_long = 4000 + 106;
+pub const SYS_lstat: ::c_long = 4000 + 107;
+pub const SYS_fstat: ::c_long = 4000 + 108;
+pub const SYS_iopl: ::c_long = 4000 + 110;
+pub const SYS_vhangup: ::c_long = 4000 + 111;
+pub const SYS_idle: ::c_long = 4000 + 112;
+pub const SYS_vm86: ::c_long = 4000 + 113;
+pub const SYS_wait4: ::c_long = 4000 + 114;
+pub const SYS_swapoff: ::c_long = 4000 + 115;
+pub const SYS_sysinfo: ::c_long = 4000 + 116;
+pub const SYS_ipc: ::c_long = 4000 + 117;
+pub const SYS_fsync: ::c_long = 4000 + 118;
+pub const SYS_sigreturn: ::c_long = 4000 + 119;
+pub const SYS_clone: ::c_long = 4000 + 120;
+pub const SYS_setdomainname: ::c_long = 4000 + 121;
+pub const SYS_uname: ::c_long = 4000 + 122;
+pub const SYS_modify_ldt: ::c_long = 4000 + 123;
+pub const SYS_adjtimex: ::c_long = 4000 + 124;
+pub const SYS_mprotect: ::c_long = 4000 + 125;
+pub const SYS_sigprocmask: ::c_long = 4000 + 126;
+pub const SYS_create_module: ::c_long = 4000 + 127;
+pub const SYS_init_module: ::c_long = 4000 + 128;
+pub const SYS_delete_module: ::c_long = 4000 + 129;
+pub const SYS_get_kernel_syms: ::c_long = 4000 + 130;
+pub const SYS_quotactl: ::c_long = 4000 + 131;
+pub const SYS_getpgid: ::c_long = 4000 + 132;
+pub const SYS_fchdir: ::c_long = 4000 + 133;
+pub const SYS_bdflush: ::c_long = 4000 + 134;
+pub const SYS_sysfs: ::c_long = 4000 + 135;
+pub const SYS_personality: ::c_long = 4000 + 136;
+pub const SYS_afs_syscall: ::c_long = 4000 + 137;
+pub const SYS_setfsuid: ::c_long = 4000 + 138;
+pub const SYS_setfsgid: ::c_long = 4000 + 139;
+pub const SYS__llseek: ::c_long = 4000 + 140;
+pub const SYS_getdents: ::c_long = 4000 + 141;
+pub const SYS__newselect: ::c_long = 4000 + 142;
+pub const SYS_flock: ::c_long = 4000 + 143;
+pub const SYS_msync: ::c_long = 4000 + 144;
+pub const SYS_readv: ::c_long = 4000 + 145;
+pub const SYS_writev: ::c_long = 4000 + 146;
+pub const SYS_cacheflush: ::c_long = 4000 + 147;
+pub const SYS_cachectl: ::c_long = 4000 + 148;
+pub const SYS_sysmips: ::c_long = 4000 + 149;
+pub const SYS_getsid: ::c_long = 4000 + 151;
+pub const SYS_fdatasync: ::c_long = 4000 + 152;
+pub const SYS__sysctl: ::c_long = 4000 + 153;
+pub const SYS_mlock: ::c_long = 4000 + 154;
+pub const SYS_munlock: ::c_long = 4000 + 155;
+pub const SYS_mlockall: ::c_long = 4000 + 156;
+pub const SYS_munlockall: ::c_long = 4000 + 157;
+pub const SYS_sched_setparam: ::c_long = 4000 + 158;
+pub const SYS_sched_getparam: ::c_long = 4000 + 159;
+pub const SYS_sched_setscheduler: ::c_long = 4000 + 160;
+pub const SYS_sched_getscheduler: ::c_long = 4000 + 161;
+pub const SYS_sched_yield: ::c_long = 4000 + 162;
+pub const SYS_sched_get_priority_max: ::c_long = 4000 + 163;
+pub const SYS_sched_get_priority_min: ::c_long = 4000 + 164;
+pub const SYS_sched_rr_get_interval: ::c_long = 4000 + 165;
+pub const SYS_nanosleep: ::c_long = 4000 + 166;
+pub const SYS_mremap: ::c_long = 4000 + 167;
+pub const SYS_accept: ::c_long = 4000 + 168;
+pub const SYS_bind: ::c_long = 4000 + 169;
+pub const SYS_connect: ::c_long = 4000 + 170;
+pub const SYS_getpeername: ::c_long = 4000 + 171;
+pub const SYS_getsockname: ::c_long = 4000 + 172;
+pub const SYS_getsockopt: ::c_long = 4000 + 173;
+pub const SYS_listen: ::c_long = 4000 + 174;
+pub const SYS_recv: ::c_long = 4000 + 175;
+pub const SYS_recvfrom: ::c_long = 4000 + 176;
+pub const SYS_recvmsg: ::c_long = 4000 + 177;
+pub const SYS_send: ::c_long = 4000 + 178;
+pub const SYS_sendmsg: ::c_long = 4000 + 179;
+pub const SYS_sendto: ::c_long = 4000 + 180;
+pub const SYS_setsockopt: ::c_long = 4000 + 181;
+pub const SYS_shutdown: ::c_long = 4000 + 182;
+pub const SYS_socket: ::c_long = 4000 + 183;
+pub const SYS_socketpair: ::c_long = 4000 + 184;
+pub const SYS_setresuid: ::c_long = 4000 + 185;
+pub const SYS_getresuid: ::c_long = 4000 + 186;
+pub const SYS_query_module: ::c_long = 4000 + 187;
+pub const SYS_poll: ::c_long = 4000 + 188;
+pub const SYS_nfsservctl: ::c_long = 4000 + 189;
+pub const SYS_setresgid: ::c_long = 4000 + 190;
+pub const SYS_getresgid: ::c_long = 4000 + 191;
+pub const SYS_prctl: ::c_long = 4000 + 192;
+pub const SYS_rt_sigreturn: ::c_long = 4000 + 193;
+pub const SYS_rt_sigaction: ::c_long = 4000 + 194;
+pub const SYS_rt_sigprocmask: ::c_long = 4000 + 195;
+pub const SYS_rt_sigpending: ::c_long = 4000 + 196;
+pub const SYS_rt_sigtimedwait: ::c_long = 4000 + 197;
+pub const SYS_rt_sigqueueinfo: ::c_long = 4000 + 198;
+pub const SYS_rt_sigsuspend: ::c_long = 4000 + 199;
+pub const SYS_pread64: ::c_long = 4000 + 200;
+pub const SYS_pwrite64: ::c_long = 4000 + 201;
+pub const SYS_chown: ::c_long = 4000 + 202;
+pub const SYS_getcwd: ::c_long = 4000 + 203;
+pub const SYS_capget: ::c_long = 4000 + 204;
+pub const SYS_capset: ::c_long = 4000 + 205;
+pub const SYS_sigaltstack: ::c_long = 4000 + 206;
+pub const SYS_sendfile: ::c_long = 4000 + 207;
+pub const SYS_getpmsg: ::c_long = 4000 + 208;
+pub const SYS_putpmsg: ::c_long = 4000 + 209;
+pub const SYS_mmap2: ::c_long = 4000 + 210;
+pub const SYS_truncate64: ::c_long = 4000 + 211;
+pub const SYS_ftruncate64: ::c_long = 4000 + 212;
+pub const SYS_stat64: ::c_long = 4000 + 213;
+pub const SYS_lstat64: ::c_long = 4000 + 214;
+pub const SYS_fstat64: ::c_long = 4000 + 215;
+pub const SYS_pivot_root: ::c_long = 4000 + 216;
+pub const SYS_mincore: ::c_long = 4000 + 217;
+pub const SYS_madvise: ::c_long = 4000 + 218;
+pub const SYS_getdents64: ::c_long = 4000 + 219;
+pub const SYS_fcntl64: ::c_long = 4000 + 220;
+pub const SYS_gettid: ::c_long = 4000 + 222;
+pub const SYS_readahead: ::c_long = 4000 + 223;
+pub const SYS_setxattr: ::c_long = 4000 + 224;
+pub const SYS_lsetxattr: ::c_long = 4000 + 225;
+pub const SYS_fsetxattr: ::c_long = 4000 + 226;
+pub const SYS_getxattr: ::c_long = 4000 + 227;
+pub const SYS_lgetxattr: ::c_long = 4000 + 228;
+pub const SYS_fgetxattr: ::c_long = 4000 + 229;
+pub const SYS_listxattr: ::c_long = 4000 + 230;
+pub const SYS_llistxattr: ::c_long = 4000 + 231;
+pub const SYS_flistxattr: ::c_long = 4000 + 232;
+pub const SYS_removexattr: ::c_long = 4000 + 233;
+pub const SYS_lremovexattr: ::c_long = 4000 + 234;
+pub const SYS_fremovexattr: ::c_long = 4000 + 235;
+pub const SYS_tkill: ::c_long = 4000 + 236;
+pub const SYS_sendfile64: ::c_long = 4000 + 237;
+pub const SYS_futex: ::c_long = 4000 + 238;
+pub const SYS_sched_setaffinity: ::c_long = 4000 + 239;
+pub const SYS_sched_getaffinity: ::c_long = 4000 + 240;
+pub const SYS_io_setup: ::c_long = 4000 + 241;
+pub const SYS_io_destroy: ::c_long = 4000 + 242;
+pub const SYS_io_getevents: ::c_long = 4000 + 243;
+pub const SYS_io_submit: ::c_long = 4000 + 244;
+pub const SYS_io_cancel: ::c_long = 4000 + 245;
+pub const SYS_exit_group: ::c_long = 4000 + 246;
+pub const SYS_lookup_dcookie: ::c_long = 4000 + 247;
+pub const SYS_epoll_create: ::c_long = 4000 + 248;
+pub const SYS_epoll_ctl: ::c_long = 4000 + 249;
+pub const SYS_epoll_wait: ::c_long = 4000 + 250;
+pub const SYS_remap_file_pages: ::c_long = 4000 + 251;
+pub const SYS_set_tid_address: ::c_long = 4000 + 252;
+pub const SYS_restart_syscall: ::c_long = 4000 + 253;
+pub const SYS_fadvise64: ::c_long = 4000 + 254;
+pub const SYS_statfs64: ::c_long = 4000 + 255;
+pub const SYS_fstatfs64: ::c_long = 4000 + 256;
+pub const SYS_timer_create: ::c_long = 4000 + 257;
+pub const SYS_timer_settime: ::c_long = 4000 + 258;
+pub const SYS_timer_gettime: ::c_long = 4000 + 259;
+pub const SYS_timer_getoverrun: ::c_long = 4000 + 260;
+pub const SYS_timer_delete: ::c_long = 4000 + 261;
+pub const SYS_clock_settime: ::c_long = 4000 + 262;
+pub const SYS_clock_gettime: ::c_long = 4000 + 263;
+pub const SYS_clock_getres: ::c_long = 4000 + 264;
+pub const SYS_clock_nanosleep: ::c_long = 4000 + 265;
+pub const SYS_tgkill: ::c_long = 4000 + 266;
+pub const SYS_utimes: ::c_long = 4000 + 267;
+pub const SYS_mbind: ::c_long = 4000 + 268;
+pub const SYS_get_mempolicy: ::c_long = 4000 + 269;
+pub const SYS_set_mempolicy: ::c_long = 4000 + 270;
+pub const SYS_mq_open: ::c_long = 4000 + 271;
+pub const SYS_mq_unlink: ::c_long = 4000 + 272;
+pub const SYS_mq_timedsend: ::c_long = 4000 + 273;
+pub const SYS_mq_timedreceive: ::c_long = 4000 + 274;
+pub const SYS_mq_notify: ::c_long = 4000 + 275;
+pub const SYS_mq_getsetattr: ::c_long = 4000 + 276;
+pub const SYS_vserver: ::c_long = 4000 + 277;
+pub const SYS_waitid: ::c_long = 4000 + 278;
+/* pub const SYS_sys_setaltroot: ::c_long = 4000 + 279; */
+pub const SYS_add_key: ::c_long = 4000 + 280;
+pub const SYS_request_key: ::c_long = 4000 + 281;
+pub const SYS_keyctl: ::c_long = 4000 + 282;
+pub const SYS_set_thread_area: ::c_long = 4000 + 283;
+pub const SYS_inotify_init: ::c_long = 4000 + 284;
+pub const SYS_inotify_add_watch: ::c_long = 4000 + 285;
+pub const SYS_inotify_rm_watch: ::c_long = 4000 + 286;
+pub const SYS_migrate_pages: ::c_long = 4000 + 287;
+pub const SYS_openat: ::c_long = 4000 + 288;
+pub const SYS_mkdirat: ::c_long = 4000 + 289;
+pub const SYS_mknodat: ::c_long = 4000 + 290;
+pub const SYS_fchownat: ::c_long = 4000 + 291;
+pub const SYS_futimesat: ::c_long = 4000 + 292;
+pub const SYS_fstatat64: ::c_long = 4000 + 293;
+pub const SYS_unlinkat: ::c_long = 4000 + 294;
+pub const SYS_renameat: ::c_long = 4000 + 295;
+pub const SYS_linkat: ::c_long = 4000 + 296;
+pub const SYS_symlinkat: ::c_long = 4000 + 297;
+pub const SYS_readlinkat: ::c_long = 4000 + 298;
+pub const SYS_fchmodat: ::c_long = 4000 + 299;
+pub const SYS_faccessat: ::c_long = 4000 + 300;
+pub const SYS_pselect6: ::c_long = 4000 + 301;
+pub const SYS_ppoll: ::c_long = 4000 + 302;
+pub const SYS_unshare: ::c_long = 4000 + 303;
+pub const SYS_splice: ::c_long = 4000 + 304;
+pub const SYS_sync_file_range: ::c_long = 4000 + 305;
+pub const SYS_tee: ::c_long = 4000 + 306;
+pub const SYS_vmsplice: ::c_long = 4000 + 307;
+pub const SYS_move_pages: ::c_long = 4000 + 308;
+pub const SYS_set_robust_list: ::c_long = 4000 + 309;
+pub const SYS_get_robust_list: ::c_long = 4000 + 310;
+pub const SYS_kexec_load: ::c_long = 4000 + 311;
+pub const SYS_getcpu: ::c_long = 4000 + 312;
+pub const SYS_epoll_pwait: ::c_long = 4000 + 313;
+pub const SYS_ioprio_set: ::c_long = 4000 + 314;
+pub const SYS_ioprio_get: ::c_long = 4000 + 315;
+pub const SYS_utimensat: ::c_long = 4000 + 316;
+pub const SYS_signalfd: ::c_long = 4000 + 317;
+pub const SYS_timerfd: ::c_long = 4000 + 318;
+pub const SYS_eventfd: ::c_long = 4000 + 319;
+pub const SYS_fallocate: ::c_long = 4000 + 320;
+pub const SYS_timerfd_create: ::c_long = 4000 + 321;
+pub const SYS_timerfd_gettime: ::c_long = 4000 + 322;
+pub const SYS_timerfd_settime: ::c_long = 4000 + 323;
+pub const SYS_signalfd4: ::c_long = 4000 + 324;
+pub const SYS_eventfd2: ::c_long = 4000 + 325;
+pub const SYS_epoll_create1: ::c_long = 4000 + 326;
+pub const SYS_dup3: ::c_long = 4000 + 327;
+pub const SYS_pipe2: ::c_long = 4000 + 328;
+pub const SYS_inotify_init1: ::c_long = 4000 + 329;
+pub const SYS_preadv: ::c_long = 4000 + 330;
+pub const SYS_pwritev: ::c_long = 4000 + 331;
+pub const SYS_rt_tgsigqueueinfo: ::c_long = 4000 + 332;
+pub const SYS_perf_event_open: ::c_long = 4000 + 333;
+pub const SYS_accept4: ::c_long = 4000 + 334;
+pub const SYS_recvmmsg: ::c_long = 4000 + 335;
+pub const SYS_fanotify_init: ::c_long = 4000 + 336;
+pub const SYS_fanotify_mark: ::c_long = 4000 + 337;
+pub const SYS_prlimit64: ::c_long = 4000 + 338;
+pub const SYS_name_to_handle_at: ::c_long = 4000 + 339;
+pub const SYS_open_by_handle_at: ::c_long = 4000 + 340;
+pub const SYS_clock_adjtime: ::c_long = 4000 + 341;
+pub const SYS_syncfs: ::c_long = 4000 + 342;
+pub const SYS_sendmmsg: ::c_long = 4000 + 343;
+pub const SYS_setns: ::c_long = 4000 + 344;
+pub const SYS_process_vm_readv: ::c_long = 4000 + 345;
+pub const SYS_process_vm_writev: ::c_long = 4000 + 346;
+pub const SYS_kcmp: ::c_long = 4000 + 347;
+pub const SYS_finit_module: ::c_long = 4000 + 348;
+pub const SYS_sched_setattr: ::c_long = 4000 + 349;
+pub const SYS_sched_getattr: ::c_long = 4000 + 350;
+pub const SYS_renameat2: ::c_long = 4000 + 351;
+pub const SYS_seccomp: ::c_long = 4000 + 352;
+pub const SYS_getrandom: ::c_long = 4000 + 353;
+pub const SYS_memfd_create: ::c_long = 4000 + 354;
+pub const SYS_bpf: ::c_long = 4000 + 355;
+pub const SYS_execveat: ::c_long = 4000 + 356;
+pub const SYS_userfaultfd: ::c_long = 4000 + 357;
+pub const SYS_membarrier: ::c_long = 4000 + 358;
+pub const SYS_mlock2: ::c_long = 4000 + 359;
+pub const SYS_copy_file_range: ::c_long = 4000 + 360;
+pub const SYS_preadv2: ::c_long = 4000 + 361;
+pub const SYS_pwritev2: ::c_long = 4000 + 362;
+pub const SYS_pkey_mprotect: ::c_long = 4000 + 363;
+pub const SYS_pkey_alloc: ::c_long = 4000 + 364;
+pub const SYS_pkey_free: ::c_long = 4000 + 365;
+
+#[link(name = "util")]
+extern "C" {
+    pub fn sysctl(
+        name: *mut ::c_int,
+        namelen: ::c_int,
+        oldp: *mut ::c_void,
+        oldlenp: *mut ::size_t,
+        newp: *mut ::c_void,
+        newlen: ::size_t,
+    ) -> ::c_int;
+    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
+    pub fn glob64(
+        pattern: *const ::c_char,
+        flags: ::c_int,
+        errfunc: ::Option<extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int>,
+        pglob: *mut glob64_t,
+    ) -> ::c_int;
+    pub fn globfree64(pglob: *mut glob64_t);
+    pub fn pthread_attr_getaffinity_np(
+        attr: *const ::pthread_attr_t,
+        cpusetsize: ::size_t,
+        cpuset: *mut ::cpu_set_t,
+    ) -> ::c_int;
+    pub fn pthread_attr_setaffinity_np(
+        attr: *mut ::pthread_attr_t,
+        cpusetsize: ::size_t,
+        cpuset: *const ::cpu_set_t,
+    ) -> ::c_int;
+}
+
+cfg_if! {
+    if #[cfg(libc_align)] {
+        mod align;
+        pub use self::align::*;
+    } else {
+        mod no_align;
+        pub use self::no_align::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+s! {
+    // FIXME this is actually a union
+    pub struct sem_t {
+        #[cfg(target_pointer_width = "32")]
+        __size: [::c_char; 16],
+        #[cfg(target_pointer_width = "64")]
+        __size: [::c_char; 32],
+        __align: [::c_long; 0],
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+s! {
+    // FIXME this is actually a union
+    #[cfg_attr(target_pointer_width = "32",
+               repr(align(4)))]
+    #[cfg_attr(target_pointer_width = "64",
+               repr(align(8)))]
+    pub struct sem_t {
+        __size: [::c_char; 32],
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,213 @@
+pub type blkcnt_t = i64;
+pub type blksize_t = i64;
+pub type c_char = i8;
+pub type c_long = i64;
+pub type c_ulong = u64;
+pub type fsblkcnt_t = ::c_ulong;
+pub type fsfilcnt_t = ::c_ulong;
+pub type ino_t = u64;
+pub type nlink_t = u64;
+pub type off_t = i64;
+pub type rlim_t = ::c_ulong;
+pub type suseconds_t = i64;
+pub type time_t = i64;
+pub type wchar_t = i32;
+
+s! {
+    pub struct stat {
+        pub st_dev: ::c_ulong,
+        st_pad1: [::c_long; 2],
+        pub st_ino: ::ino_t,
+        pub st_mode: ::mode_t,
+        pub st_nlink: ::nlink_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::c_ulong,
+        st_pad2: [::c_ulong; 1],
+        pub st_size: ::off_t,
+        st_pad3: ::c_long,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_blksize: ::blksize_t,
+        st_pad4: ::c_long,
+        pub st_blocks: ::blkcnt_t,
+        st_pad5: [::c_long; 7],
+    }
+
+    pub struct stat64 {
+        pub st_dev: ::c_ulong,
+        st_pad1: [::c_long; 2],
+        pub st_ino: ::ino64_t,
+        pub st_mode: ::mode_t,
+        pub st_nlink: ::nlink_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::c_ulong,
+        st_pad2: [::c_long; 2],
+        pub st_size: ::off64_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_blksize: ::blksize_t,
+        st_pad3: ::c_long,
+        pub st_blocks: ::blkcnt64_t,
+        st_pad5: [::c_long; 7],
+    }
+
+    pub struct pthread_attr_t {
+        __size: [::c_ulong; 7]
+    }
+
+    pub struct sigaction {
+        pub sa_flags: ::c_int,
+        pub sa_sigaction: ::sighandler_t,
+        pub sa_mask: sigset_t,
+        _restorer: *mut ::c_void,
+    }
+
+    pub struct stack_t {
+        pub ss_sp: *mut ::c_void,
+        pub ss_size: ::size_t,
+        pub ss_flags: ::c_int,
+    }
+
+    pub struct sigset_t {
+        __size: [::c_ulong; 16],
+    }
+
+    pub struct siginfo_t {
+        pub si_signo: ::c_int,
+        pub si_code: ::c_int,
+        pub si_errno: ::c_int,
+        _pad: ::c_int,
+        _pad2: [::c_long; 14],
+    }
+
+    pub struct ipc_perm {
+        pub __key: ::key_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
+        pub cuid: ::uid_t,
+        pub cgid: ::gid_t,
+        pub mode: ::c_uint,
+        pub __seq: ::c_ushort,
+        __pad1: ::c_ushort,
+        __unused1: ::c_ulong,
+        __unused2: ::c_ulong
+    }
+
+    pub struct shmid_ds {
+        pub shm_perm: ::ipc_perm,
+        pub shm_segsz: ::size_t,
+        pub shm_atime: ::time_t,
+        pub shm_dtime: ::time_t,
+        pub shm_ctime: ::time_t,
+        pub shm_cpid: ::pid_t,
+        pub shm_lpid: ::pid_t,
+        pub shm_nattch: ::shmatt_t,
+        __unused4: ::c_ulong,
+        __unused5: ::c_ulong
+    }
+
+    pub struct msqid_ds {
+        pub msg_perm: ::ipc_perm,
+        pub msg_stime: ::time_t,
+        pub msg_rtime: ::time_t,
+        pub msg_ctime: ::time_t,
+        __msg_cbytes: ::c_ulong,
+        pub msg_qnum: ::msgqnum_t,
+        pub msg_qbytes: ::msglen_t,
+        pub msg_lspid: ::pid_t,
+        pub msg_lrpid: ::pid_t,
+        __glibc_reserved4: ::c_ulong,
+        __glibc_reserved5: ::c_ulong,
+    }
+
+    pub struct statfs {
+        pub f_type: ::c_long,
+        pub f_bsize: ::c_long,
+        pub f_frsize: ::c_long,
+        pub f_blocks: ::fsblkcnt_t,
+        pub f_bfree: ::fsblkcnt_t,
+        pub f_files: ::fsblkcnt_t,
+        pub f_ffree: ::fsblkcnt_t,
+        pub f_bavail: ::fsblkcnt_t,
+        pub f_fsid: ::fsid_t,
+
+        pub f_namelen: ::c_long,
+        f_spare: [::c_long; 6],
+    }
+
+    pub struct msghdr {
+        pub msg_name: *mut ::c_void,
+        pub msg_namelen: ::socklen_t,
+        pub msg_iov: *mut ::iovec,
+        pub msg_iovlen: ::size_t,
+        pub msg_control: *mut ::c_void,
+        pub msg_controllen: ::size_t,
+        pub msg_flags: ::c_int,
+    }
+
+    pub struct cmsghdr {
+        pub cmsg_len: ::size_t,
+        pub cmsg_level: ::c_int,
+        pub cmsg_type: ::c_int,
+    }
+
+    pub struct termios {
+        pub c_iflag: ::tcflag_t,
+        pub c_oflag: ::tcflag_t,
+        pub c_cflag: ::tcflag_t,
+        pub c_lflag: ::tcflag_t,
+        pub c_line: ::cc_t,
+        pub c_cc: [::cc_t; ::NCCS],
+    }
+
+    pub struct sysinfo {
+        pub uptime: ::c_long,
+        pub loads: [::c_ulong; 3],
+        pub totalram: ::c_ulong,
+        pub freeram: ::c_ulong,
+        pub sharedram: ::c_ulong,
+        pub bufferram: ::c_ulong,
+        pub totalswap: ::c_ulong,
+        pub freeswap: ::c_ulong,
+        pub procs: ::c_ushort,
+        pub pad: ::c_ushort,
+        pub totalhigh: ::c_ulong,
+        pub freehigh: ::c_ulong,
+        pub mem_unit: ::c_uint,
+        pub _f: [::c_char; 0],
+    }
+}
+
+pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
+pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
+
+pub const RLIM_INFINITY: ::rlim_t = 0xffff_ffff_ffff_ffff;
+
+pub const SYS_gettid: ::c_long = 5178; // Valid for n64
+
+#[link(name = "util")]
+extern "C" {
+    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
+}
+
+cfg_if! {
+    if #[cfg(libc_align)] {
+        mod align;
+        pub use self::align::*;
+    } else {
+        mod no_align;
+        pub use self::no_align::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+s! {
+    // FIXME this is actually a union
+    pub struct sem_t {
+        __size: [::c_char; 32],
+        __align: [::c_long; 0],
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mips/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,347 @@
+pub type pthread_t = ::c_ulong;
+
+pub const SFD_CLOEXEC: ::c_int = 0x080000;
+
+pub const NCCS: usize = 32;
+
+pub const O_TRUNC: ::c_int = 512;
+
+pub const O_CLOEXEC: ::c_int = 0x80000;
+
+pub const EBFONT: ::c_int = 59;
+pub const ENOSTR: ::c_int = 60;
+pub const ENODATA: ::c_int = 61;
+pub const ETIME: ::c_int = 62;
+pub const ENOSR: ::c_int = 63;
+pub const ENONET: ::c_int = 64;
+pub const ENOPKG: ::c_int = 65;
+pub const EREMOTE: ::c_int = 66;
+pub const ENOLINK: ::c_int = 67;
+pub const EADV: ::c_int = 68;
+pub const ESRMNT: ::c_int = 69;
+pub const ECOMM: ::c_int = 70;
+pub const EPROTO: ::c_int = 71;
+pub const EDOTDOT: ::c_int = 73;
+
+pub const SA_NODEFER: ::c_int = 0x40000000;
+pub const SA_RESETHAND: ::c_int = 0x80000000;
+pub const SA_RESTART: ::c_int = 0x10000000;
+pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
+
+pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
+
+pub const EFD_CLOEXEC: ::c_int = 0x80000;
+
+pub const BUFSIZ: ::c_uint = 4096;
+pub const TMP_MAX: ::c_uint = 238328;
+pub const FOPEN_MAX: ::c_uint = 16;
+pub const POSIX_MADV_DONTNEED: ::c_int = 4;
+pub const _SC_2_C_VERSION: ::c_int = 96;
+pub const O_ACCMODE: ::c_int = 3;
+pub const O_DIRECT: ::c_int = 0x8000;
+pub const O_DIRECTORY: ::c_int = 0x10000;
+pub const O_NOFOLLOW: ::c_int = 0x20000;
+pub const NI_MAXHOST: ::socklen_t = 1025;
+
+pub const RLIMIT_NOFILE: ::c_int = 5;
+pub const RLIMIT_AS: ::c_int = 6;
+pub const RLIMIT_RSS: ::c_int = 7;
+pub const RLIMIT_NPROC: ::c_int = 8;
+pub const RLIMIT_MEMLOCK: ::c_int = 9;
+pub const RLIMIT_NLIMITS: ::c_int = 15;
+pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
+
+pub const O_APPEND: ::c_int = 8;
+pub const O_CREAT: ::c_int = 256;
+pub const O_EXCL: ::c_int = 1024;
+pub const O_NOCTTY: ::c_int = 2048;
+pub const O_NONBLOCK: ::c_int = 128;
+pub const O_SYNC: ::c_int = 0x10;
+pub const O_RSYNC: ::c_int = 0x10;
+pub const O_DSYNC: ::c_int = 0x10;
+pub const O_FSYNC: ::c_int = 0x10;
+pub const O_ASYNC: ::c_int = 0x1000;
+pub const O_NDELAY: ::c_int = 0x80;
+
+pub const SOCK_NONBLOCK: ::c_int = 128;
+
+pub const EDEADLK: ::c_int = 45;
+pub const ENAMETOOLONG: ::c_int = 78;
+pub const ENOLCK: ::c_int = 46;
+pub const ENOSYS: ::c_int = 89;
+pub const ENOTEMPTY: ::c_int = 93;
+pub const ELOOP: ::c_int = 90;
+pub const ENOMSG: ::c_int = 35;
+pub const EIDRM: ::c_int = 36;
+pub const ECHRNG: ::c_int = 37;
+pub const EL2NSYNC: ::c_int = 38;
+pub const EL3HLT: ::c_int = 39;
+pub const EL3RST: ::c_int = 40;
+pub const ELNRNG: ::c_int = 41;
+pub const EUNATCH: ::c_int = 42;
+pub const ENOCSI: ::c_int = 43;
+pub const EL2HLT: ::c_int = 44;
+pub const EBADE: ::c_int = 50;
+pub const EBADR: ::c_int = 51;
+pub const EXFULL: ::c_int = 52;
+pub const ENOANO: ::c_int = 53;
+pub const EBADRQC: ::c_int = 54;
+pub const EBADSLT: ::c_int = 55;
+pub const EDEADLOCK: ::c_int = 56;
+pub const EMULTIHOP: ::c_int = 74;
+pub const EOVERFLOW: ::c_int = 79;
+pub const ENOTUNIQ: ::c_int = 80;
+pub const EBADFD: ::c_int = 81;
+pub const EBADMSG: ::c_int = 77;
+pub const EREMCHG: ::c_int = 82;
+pub const ELIBACC: ::c_int = 83;
+pub const ELIBBAD: ::c_int = 84;
+pub const ELIBSCN: ::c_int = 85;
+pub const ELIBMAX: ::c_int = 86;
+pub const ELIBEXEC: ::c_int = 87;
+pub const EILSEQ: ::c_int = 88;
+pub const ERESTART: ::c_int = 91;
+pub const ESTRPIPE: ::c_int = 92;
+pub const EUSERS: ::c_int = 94;
+pub const ENOTSOCK: ::c_int = 95;
+pub const EDESTADDRREQ: ::c_int = 96;
+pub const EMSGSIZE: ::c_int = 97;
+pub const EPROTOTYPE: ::c_int = 98;
+pub const ENOPROTOOPT: ::c_int = 99;
+pub const EPROTONOSUPPORT: ::c_int = 120;
+pub const ESOCKTNOSUPPORT: ::c_int = 121;
+pub const EOPNOTSUPP: ::c_int = 122;
+pub const EPFNOSUPPORT: ::c_int = 123;
+pub const EAFNOSUPPORT: ::c_int = 124;
+pub const EADDRINUSE: ::c_int = 125;
+pub const EADDRNOTAVAIL: ::c_int = 126;
+pub const ENETDOWN: ::c_int = 127;
+pub const ENETUNREACH: ::c_int = 128;
+pub const ENETRESET: ::c_int = 129;
+pub const ECONNABORTED: ::c_int = 130;
+pub const ECONNRESET: ::c_int = 131;
+pub const ENOBUFS: ::c_int = 132;
+pub const EISCONN: ::c_int = 133;
+pub const ENOTCONN: ::c_int = 134;
+pub const ESHUTDOWN: ::c_int = 143;
+pub const ETOOMANYREFS: ::c_int = 144;
+pub const ETIMEDOUT: ::c_int = 145;
+pub const ECONNREFUSED: ::c_int = 146;
+pub const EHOSTDOWN: ::c_int = 147;
+pub const EHOSTUNREACH: ::c_int = 148;
+pub const EALREADY: ::c_int = 149;
+pub const EINPROGRESS: ::c_int = 150;
+pub const ESTALE: ::c_int = 151;
+pub const EUCLEAN: ::c_int = 135;
+pub const ENOTNAM: ::c_int = 137;
+pub const ENAVAIL: ::c_int = 138;
+pub const EISNAM: ::c_int = 139;
+pub const EREMOTEIO: ::c_int = 140;
+pub const EDQUOT: ::c_int = 1133;
+pub const ENOMEDIUM: ::c_int = 159;
+pub const EMEDIUMTYPE: ::c_int = 160;
+pub const ECANCELED: ::c_int = 158;
+pub const ENOKEY: ::c_int = 161;
+pub const EKEYEXPIRED: ::c_int = 162;
+pub const EKEYREVOKED: ::c_int = 163;
+pub const EKEYREJECTED: ::c_int = 164;
+pub const EOWNERDEAD: ::c_int = 165;
+pub const ENOTRECOVERABLE: ::c_int = 166;
+pub const ERFKILL: ::c_int = 167;
+
+pub const MAP_NORESERVE: ::c_int = 0x400;
+pub const MAP_ANON: ::c_int = 0x800;
+pub const MAP_ANONYMOUS: ::c_int = 0x800;
+pub const MAP_GROWSDOWN: ::c_int = 0x1000;
+pub const MAP_DENYWRITE: ::c_int = 0x2000;
+pub const MAP_EXECUTABLE: ::c_int = 0x4000;
+pub const MAP_LOCKED: ::c_int = 0x8000;
+pub const MAP_POPULATE: ::c_int = 0x10000;
+pub const MAP_NONBLOCK: ::c_int = 0x20000;
+pub const MAP_STACK: ::c_int = 0x40000;
+
+pub const SOCK_STREAM: ::c_int = 2;
+pub const SOCK_DGRAM: ::c_int = 1;
+pub const SOCK_SEQPACKET: ::c_int = 5;
+
+pub const FIOCLEX: ::c_ulong = 0x6601;
+pub const FIONCLEX: ::c_ulong = 0x6602;
+pub const FIONBIO: ::c_ulong = 0x667e;
+
+pub const SA_ONSTACK: ::c_uint = 0x08000000;
+pub const SA_SIGINFO: ::c_uint = 0x00000008;
+pub const SA_NOCLDWAIT: ::c_int = 0x00010000;
+
+pub const SIGCHLD: ::c_int = 18;
+pub const SIGBUS: ::c_int = 10;
+pub const SIGTTIN: ::c_int = 26;
+pub const SIGTTOU: ::c_int = 27;
+pub const SIGXCPU: ::c_int = 30;
+pub const SIGXFSZ: ::c_int = 31;
+pub const SIGVTALRM: ::c_int = 28;
+pub const SIGPROF: ::c_int = 29;
+pub const SIGWINCH: ::c_int = 20;
+pub const SIGUSR1: ::c_int = 16;
+pub const SIGUSR2: ::c_int = 17;
+pub const SIGCONT: ::c_int = 25;
+pub const SIGSTOP: ::c_int = 23;
+pub const SIGTSTP: ::c_int = 24;
+pub const SIGURG: ::c_int = 21;
+pub const SIGIO: ::c_int = 22;
+pub const SIGSYS: ::c_int = 12;
+pub const SIGPOLL: ::c_int = 22;
+pub const SIGPWR: ::c_int = 19;
+pub const SIG_SETMASK: ::c_int = 3;
+pub const SIG_BLOCK: ::c_int = 0x1;
+pub const SIG_UNBLOCK: ::c_int = 0x2;
+
+pub const POLLWRNORM: ::c_short = 0x004;
+pub const POLLWRBAND: ::c_short = 0x100;
+
+pub const PTHREAD_STACK_MIN: ::size_t = 16384;
+
+pub const VEOF: usize = 16;
+pub const VEOL: usize = 17;
+pub const VEOL2: usize = 6;
+pub const VMIN: usize = 4;
+pub const IEXTEN: ::tcflag_t = 0x00000100;
+pub const TOSTOP: ::tcflag_t = 0x00008000;
+pub const FLUSHO: ::tcflag_t = 0x00002000;
+pub const TCSANOW: ::c_int = 0x540e;
+pub const TCSADRAIN: ::c_int = 0x540f;
+pub const TCSAFLUSH: ::c_int = 0x5410;
+
+pub const CPU_SETSIZE: ::c_int = 0x400;
+
+pub const EFD_NONBLOCK: ::c_int = 0x80;
+
+pub const F_GETLK: ::c_int = 14;
+pub const F_GETOWN: ::c_int = 23;
+pub const F_SETOWN: ::c_int = 24;
+pub const F_SETLK: ::c_int = 6;
+pub const F_SETLKW: ::c_int = 7;
+
+pub const SFD_NONBLOCK: ::c_int = 0x80;
+
+pub const TCGETS: ::c_ulong = 0x540d;
+pub const TCSETS: ::c_ulong = 0x540e;
+pub const TCSETSW: ::c_ulong = 0x540f;
+pub const TCSETSF: ::c_ulong = 0x5410;
+pub const TCGETA: ::c_ulong = 0x5401;
+pub const TCSETA: ::c_ulong = 0x5402;
+pub const TCSETAW: ::c_ulong = 0x5403;
+pub const TCSETAF: ::c_ulong = 0x5404;
+pub const TCSBRK: ::c_ulong = 0x5405;
+pub const TCXONC: ::c_ulong = 0x5406;
+pub const TCFLSH: ::c_ulong = 0x5407;
+pub const TIOCGSOFTCAR: ::c_ulong = 0x5481;
+pub const TIOCSSOFTCAR: ::c_ulong = 0x5482;
+pub const TIOCINQ: ::c_ulong = 0x467f;
+pub const TIOCLINUX: ::c_ulong = 0x5483;
+pub const TIOCGSERIAL: ::c_ulong = 0x5484;
+pub const TIOCEXCL: ::c_ulong = 0x740d;
+pub const TIOCNXCL: ::c_ulong = 0x740e;
+pub const TIOCSCTTY: ::c_ulong = 0x5480;
+pub const TIOCGPGRP: ::c_ulong = 0x40047477;
+pub const TIOCSPGRP: ::c_ulong = 0x80047476;
+pub const TIOCOUTQ: ::c_ulong = 0x7472;
+pub const TIOCSTI: ::c_ulong = 0x5472;
+pub const TIOCGWINSZ: ::c_ulong = 0x40087468;
+pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
+pub const TIOCMGET: ::c_ulong = 0x741d;
+pub const TIOCMBIS: ::c_ulong = 0x741b;
+pub const TIOCMBIC: ::c_ulong = 0x741c;
+pub const TIOCMSET: ::c_ulong = 0x741a;
+pub const FIONREAD: ::c_ulong = 0x467f;
+pub const TIOCCONS: ::c_ulong = 0x80047478;
+
+pub const RTLD_GLOBAL: ::c_int = 0x4;
+pub const RTLD_NOLOAD: ::c_int = 0x8;
+
+pub const SIGSTKSZ: ::size_t = 8192;
+pub const CBAUD: ::tcflag_t = 0o0010017;
+pub const TAB1: ::tcflag_t = 0x00000800;
+pub const TAB2: ::tcflag_t = 0x00001000;
+pub const TAB3: ::tcflag_t = 0x00001800;
+pub const CR1: ::tcflag_t = 0x00000200;
+pub const CR2: ::tcflag_t = 0x00000400;
+pub const CR3: ::tcflag_t = 0x00000600;
+pub const FF1: ::tcflag_t = 0x00008000;
+pub const BS1: ::tcflag_t = 0x00002000;
+pub const VT1: ::tcflag_t = 0x00004000;
+pub const VWERASE: usize = 14;
+pub const VREPRINT: usize = 12;
+pub const VSUSP: usize = 10;
+pub const VSTART: usize = 8;
+pub const VSTOP: usize = 9;
+pub const VDISCARD: usize = 13;
+pub const VTIME: usize = 5;
+pub const IXON: ::tcflag_t = 0x00000400;
+pub const IXOFF: ::tcflag_t = 0x00001000;
+pub const ONLCR: ::tcflag_t = 0x4;
+pub const CSIZE: ::tcflag_t = 0x00000030;
+pub const CS6: ::tcflag_t = 0x00000010;
+pub const CS7: ::tcflag_t = 0x00000020;
+pub const CS8: ::tcflag_t = 0x00000030;
+pub const CSTOPB: ::tcflag_t = 0x00000040;
+pub const CREAD: ::tcflag_t = 0x00000080;
+pub const PARENB: ::tcflag_t = 0x00000100;
+pub const PARODD: ::tcflag_t = 0x00000200;
+pub const HUPCL: ::tcflag_t = 0x00000400;
+pub const CLOCAL: ::tcflag_t = 0x00000800;
+pub const ECHOKE: ::tcflag_t = 0x00000800;
+pub const ECHOE: ::tcflag_t = 0x00000010;
+pub const ECHOK: ::tcflag_t = 0x00000020;
+pub const ECHONL: ::tcflag_t = 0x00000040;
+pub const ECHOPRT: ::tcflag_t = 0x00000400;
+pub const ECHOCTL: ::tcflag_t = 0x00000200;
+pub const ISIG: ::tcflag_t = 0x00000001;
+pub const ICANON: ::tcflag_t = 0x00000002;
+pub const PENDIN: ::tcflag_t = 0x00004000;
+pub const NOFLSH: ::tcflag_t = 0x00000080;
+
+pub const B0: ::speed_t = 0o000000;
+pub const B50: ::speed_t = 0o000001;
+pub const B75: ::speed_t = 0o000002;
+pub const B110: ::speed_t = 0o000003;
+pub const B134: ::speed_t = 0o000004;
+pub const B150: ::speed_t = 0o000005;
+pub const B200: ::speed_t = 0o000006;
+pub const B300: ::speed_t = 0o000007;
+pub const B600: ::speed_t = 0o000010;
+pub const B1200: ::speed_t = 0o000011;
+pub const B1800: ::speed_t = 0o000012;
+pub const B2400: ::speed_t = 0o000013;
+pub const B4800: ::speed_t = 0o000014;
+pub const B9600: ::speed_t = 0o000015;
+pub const B19200: ::speed_t = 0o000016;
+pub const B38400: ::speed_t = 0o000017;
+pub const EXTA: ::speed_t = B19200;
+pub const EXTB: ::speed_t = B38400;
+pub const B57600: ::speed_t = 0o010001;
+pub const B115200: ::speed_t = 0o010002;
+pub const B230400: ::speed_t = 0o010003;
+pub const B460800: ::speed_t = 0o010004;
+pub const B500000: ::speed_t = 0o010005;
+pub const B576000: ::speed_t = 0o010006;
+pub const B921600: ::speed_t = 0o010007;
+pub const B1000000: ::speed_t = 0o010010;
+pub const B1152000: ::speed_t = 0o010011;
+pub const B1500000: ::speed_t = 0o010012;
+pub const B2000000: ::speed_t = 0o010013;
+pub const B2500000: ::speed_t = 0o010014;
+pub const B3000000: ::speed_t = 0o010015;
+pub const B3500000: ::speed_t = 0o010016;
+pub const B4000000: ::speed_t = 0o010017;
+
+cfg_if! {
+    if #[cfg(target_arch = "mips")] {
+        mod mips32;
+        pub use self::mips32::*;
+    } else if #[cfg(target_arch = "mips64")] {
+        mod mips64;
+        pub use self::mips64::*;
+    } else {
+        // Unknown target_arch
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,307 @@
+pub type shmatt_t = ::c_ulong;
+pub type msgqnum_t = ::c_ulong;
+pub type msglen_t = ::c_ulong;
+pub type regoff_t = ::c_int;
+
+s! {
+    pub struct statvfs {  // Different than GNU!
+        pub f_bsize: ::c_ulong,
+        pub f_frsize: ::c_ulong,
+        pub f_blocks: ::fsblkcnt_t,
+        pub f_bfree: ::fsblkcnt_t,
+        pub f_bavail: ::fsblkcnt_t,
+        pub f_files: ::fsfilcnt_t,
+        pub f_ffree: ::fsfilcnt_t,
+        pub f_favail: ::fsfilcnt_t,
+        #[cfg(target_endian = "little")]
+        pub f_fsid: ::c_ulong,
+        #[cfg(target_pointer_width = "32")]
+        __f_unused: ::c_int,
+        #[cfg(target_endian = "big")]
+        pub f_fsid: ::c_ulong,
+        pub f_flag: ::c_ulong,
+        pub f_namemax: ::c_ulong,
+        __f_spare: [::c_int; 6],
+    }
+
+    pub struct regex_t {
+        __buffer: *mut ::c_void,
+        __allocated: ::size_t,
+        __used: ::size_t,
+        __syntax: ::c_ulong,
+        __fastmap: *mut ::c_char,
+        __translate: *mut ::c_char,
+        __re_nsub: ::size_t,
+        __bitfield: u8,
+    }
+}
+
+pub const MCL_CURRENT: ::c_int = 0x0001;
+pub const MCL_FUTURE: ::c_int = 0x0002;
+
+pub const SIGEV_THREAD_ID: ::c_int = 4;
+
+pub const AF_VSOCK: ::c_int = 40;
+
+pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
+pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
+pub const AFS_SUPER_MAGIC: ::c_long = 0x5346414f;
+pub const AUTOFS_SUPER_MAGIC: ::c_long = 0x0187;
+pub const BINDERFS_SUPER_MAGIC: ::c_long = 0x6c6f6f70;
+pub const BPF_FS_MAGIC: ::c_long = 0xcafe4a11;
+pub const BTRFS_SUPER_MAGIC: ::c_long = 0x9123683e;
+pub const CGROUP2_SUPER_MAGIC: ::c_long = 0x63677270;
+pub const CGROUP_SUPER_MAGIC: ::c_long = 0x27e0eb;
+pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
+pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
+pub const DEBUGFS_MAGIC: ::c_long = 0x64626720;
+pub const DEVPTS_SUPER_MAGIC: ::c_long = 0x1cd1;
+pub const ECRYPTFS_SUPER_MAGIC: ::c_long = 0xf15f;
+pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
+pub const EXT2_SUPER_MAGIC: ::c_long = 0x0000ef53;
+pub const EXT3_SUPER_MAGIC: ::c_long = 0x0000ef53;
+pub const EXT4_SUPER_MAGIC: ::c_long = 0x0000ef53;
+pub const F2FS_SUPER_MAGIC: ::c_long = 0xf2f52010;
+pub const FUTEXFS_SUPER_MAGIC: ::c_long = 0xbad1dea;
+pub const HOSTFS_SUPER_MAGIC: ::c_long = 0x00c0ffee;
+pub const HPFS_SUPER_MAGIC: ::c_long = 0xf995e849;
+pub const HUGETLBFS_MAGIC: ::c_long = 0x958458f6;
+pub const ISOFS_SUPER_MAGIC: ::c_long = 0x00009660;
+pub const JFFS2_SUPER_MAGIC: ::c_long = 0x000072b6;
+pub const MINIX2_SUPER_MAGIC2: ::c_long = 0x00002478;
+pub const MINIX2_SUPER_MAGIC: ::c_long = 0x00002468;
+pub const MINIX3_SUPER_MAGIC: ::c_long = 0x4d5a;
+pub const MINIX_SUPER_MAGIC2: ::c_long = 0x0000138f;
+pub const MINIX_SUPER_MAGIC: ::c_long = 0x0000137f;
+pub const MSDOS_SUPER_MAGIC: ::c_long = 0x00004d44;
+pub const NCP_SUPER_MAGIC: ::c_long = 0x0000564c;
+pub const NFS_SUPER_MAGIC: ::c_long = 0x00006969;
+pub const NILFS_SUPER_MAGIC: ::c_long = 0x3434;
+pub const OCFS2_SUPER_MAGIC: ::c_long = 0x7461636f;
+pub const OPENPROM_SUPER_MAGIC: ::c_long = 0x00009fa1;
+pub const OVERLAYFS_SUPER_MAGIC: ::c_long = 0x794c7630;
+pub const PROC_SUPER_MAGIC: ::c_long = 0x00009fa0;
+pub const QNX4_SUPER_MAGIC: ::c_long = 0x0000002f;
+pub const QNX6_SUPER_MAGIC: ::c_long = 0x68191122;
+pub const RDTGROUP_SUPER_MAGIC: ::c_long = 0x7655821;
+pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
+pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
+pub const SYSFS_MAGIC: ::c_long = 0x62656572;
+pub const TMPFS_MAGIC: ::c_long = 0x01021994;
+pub const TRACEFS_MAGIC: ::c_long = 0x74726163;
+pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
+pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
+pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;
+pub const XFS_SUPER_MAGIC: ::c_long = 0x58465342;
+
+pub const PTRACE_TRACEME: ::c_int = 0;
+pub const PTRACE_PEEKTEXT: ::c_int = 1;
+pub const PTRACE_PEEKDATA: ::c_int = 2;
+pub const PTRACE_PEEKUSER: ::c_int = 3;
+pub const PTRACE_POKETEXT: ::c_int = 4;
+pub const PTRACE_POKEDATA: ::c_int = 5;
+pub const PTRACE_POKEUSER: ::c_int = 6;
+pub const PTRACE_CONT: ::c_int = 7;
+pub const PTRACE_KILL: ::c_int = 8;
+pub const PTRACE_SINGLESTEP: ::c_int = 9;
+pub const PTRACE_GETREGS: ::c_int = 12;
+pub const PTRACE_SETREGS: ::c_int = 13;
+pub const PTRACE_GETFPREGS: ::c_int = 14;
+pub const PTRACE_SETFPREGS: ::c_int = 15;
+pub const PTRACE_ATTACH: ::c_int = 16;
+pub const PTRACE_DETACH: ::c_int = 17;
+pub const PTRACE_GETFPXREGS: ::c_int = 18;
+pub const PTRACE_SETFPXREGS: ::c_int = 19;
+pub const PTRACE_SYSCALL: ::c_int = 24;
+pub const PTRACE_SETOPTIONS: ::c_int = 0x4200;
+pub const PTRACE_GETEVENTMSG: ::c_int = 0x4201;
+pub const PTRACE_GETSIGINFO: ::c_int = 0x4202;
+pub const PTRACE_SETSIGINFO: ::c_int = 0x4203;
+pub const PTRACE_GETREGSET: ::c_int = 0x4204;
+pub const PTRACE_SETREGSET: ::c_int = 0x4205;
+pub const PTRACE_SEIZE: ::c_int = 0x4206;
+pub const PTRACE_INTERRUPT: ::c_int = 0x4207;
+pub const PTRACE_LISTEN: ::c_int = 0x4208;
+pub const PTRACE_O_MASK: ::c_int = 0x000000ff;
+
+pub const POSIX_FADV_DONTNEED: ::c_int = 4;
+pub const POSIX_FADV_NOREUSE: ::c_int = 5;
+
+pub const RLIMIT_CPU: ::c_int = 0;
+pub const RLIMIT_FSIZE: ::c_int = 1;
+pub const RLIMIT_DATA: ::c_int = 2;
+pub const RLIMIT_STACK: ::c_int = 3;
+pub const RLIMIT_CORE: ::c_int = 4;
+pub const RLIMIT_LOCKS: ::c_int = 10;
+pub const RLIMIT_SIGPENDING: ::c_int = 11;
+pub const RLIMIT_MSGQUEUE: ::c_int = 12;
+pub const RLIMIT_NICE: ::c_int = 13;
+pub const RLIMIT_RTPRIO: ::c_int = 14;
+
+// These are different than GNU!
+pub const LC_CTYPE: ::c_int = 0;
+pub const LC_NUMERIC: ::c_int = 1;
+pub const LC_TIME: ::c_int = 3;
+pub const LC_COLLATE: ::c_int = 4;
+pub const LC_MONETARY: ::c_int = 2;
+pub const LC_MESSAGES: ::c_int = 5;
+pub const LC_ALL: ::c_int = 6;
+// end different section
+
+// MS_ flags for mount(2)
+pub const MS_RMT_MASK: ::c_ulong = ::MS_RDONLY | ::MS_SYNCHRONOUS | ::MS_MANDLOCK | ::MS_I_VERSION;
+
+pub const ENOTSUP: ::c_int = EOPNOTSUPP;
+
+pub const IPV6_JOIN_GROUP: ::c_int = 20;
+pub const IPV6_LEAVE_GROUP: ::c_int = 21;
+
+// These are different from GNU
+pub const ABDAY_1: ::nl_item = 0x300;
+pub const ABDAY_2: ::nl_item = 0x301;
+pub const ABDAY_3: ::nl_item = 0x302;
+pub const ABDAY_4: ::nl_item = 0x303;
+pub const ABDAY_5: ::nl_item = 0x304;
+pub const ABDAY_6: ::nl_item = 0x305;
+pub const ABDAY_7: ::nl_item = 0x306;
+pub const DAY_1: ::nl_item = 0x307;
+pub const DAY_2: ::nl_item = 0x308;
+pub const DAY_3: ::nl_item = 0x309;
+pub const DAY_4: ::nl_item = 0x30A;
+pub const DAY_5: ::nl_item = 0x30B;
+pub const DAY_6: ::nl_item = 0x30C;
+pub const DAY_7: ::nl_item = 0x30D;
+pub const ABMON_1: ::nl_item = 0x30E;
+pub const ABMON_2: ::nl_item = 0x30F;
+pub const ABMON_3: ::nl_item = 0x310;
+pub const ABMON_4: ::nl_item = 0x311;
+pub const ABMON_5: ::nl_item = 0x312;
+pub const ABMON_6: ::nl_item = 0x313;
+pub const ABMON_7: ::nl_item = 0x314;
+pub const ABMON_8: ::nl_item = 0x315;
+pub const ABMON_9: ::nl_item = 0x316;
+pub const ABMON_10: ::nl_item = 0x317;
+pub const ABMON_11: ::nl_item = 0x318;
+pub const ABMON_12: ::nl_item = 0x319;
+pub const MON_1: ::nl_item = 0x31A;
+pub const MON_2: ::nl_item = 0x31B;
+pub const MON_3: ::nl_item = 0x31C;
+pub const MON_4: ::nl_item = 0x31D;
+pub const MON_5: ::nl_item = 0x31E;
+pub const MON_6: ::nl_item = 0x31F;
+pub const MON_7: ::nl_item = 0x320;
+pub const MON_8: ::nl_item = 0x321;
+pub const MON_9: ::nl_item = 0x322;
+pub const MON_10: ::nl_item = 0x323;
+pub const MON_11: ::nl_item = 0x324;
+pub const MON_12: ::nl_item = 0x325;
+pub const AM_STR: ::nl_item = 0x326;
+pub const PM_STR: ::nl_item = 0x327;
+pub const D_T_FMT: ::nl_item = 0x328;
+pub const D_FMT: ::nl_item = 0x329;
+pub const T_FMT: ::nl_item = 0x32A;
+pub const T_FMT_AMPM: ::nl_item = 0x32B;
+pub const ERA: ::nl_item = 0x32C;
+pub const ERA_D_FMT: ::nl_item = 0x32E;
+pub const ALT_DIGITS: ::nl_item = 0x32F;
+pub const ERA_D_T_FMT: ::nl_item = 0x330;
+pub const ERA_T_FMT: ::nl_item = 0x331;
+pub const CODESET: ::nl_item = 10;
+pub const CRNCYSTR: ::nl_item = 0x215;
+pub const RADIXCHAR: ::nl_item = 0x100;
+pub const THOUSEP: ::nl_item = 0x101;
+pub const NOEXPR: ::nl_item = 0x501;
+pub const YESSTR: ::nl_item = 0x502;
+pub const NOSTR: ::nl_item = 0x503;
+
+// Different than Gnu.
+pub const FILENAME_MAX: ::c_uint = 4095;
+
+pub const PRIO_PROCESS: ::c_int = 0;
+pub const PRIO_PGRP: ::c_int = 1;
+pub const PRIO_USER: ::c_int = 2;
+
+pub const ST_RELATIME: ::c_ulong = 4096;
+
+extern "C" {
+    pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
+
+    pub fn pthread_rwlockattr_getkind_np(
+        attr: *const ::pthread_rwlockattr_t,
+        val: *mut ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_rwlockattr_setkind_np(
+        attr: *mut ::pthread_rwlockattr_t,
+        val: ::c_int,
+    ) -> ::c_int;
+
+    pub fn ptrace(request: ::c_uint, ...) -> ::c_long;
+
+    pub fn sendmmsg(
+        sockfd: ::c_int,
+        msgvec: *mut ::mmsghdr,
+        vlen: ::c_uint,
+        flags: ::c_int,
+    ) -> ::c_int;
+    pub fn recvmmsg(
+        sockfd: ::c_int,
+        msgvec: *mut ::mmsghdr,
+        vlen: ::c_uint,
+        flags: ::c_int,
+        timeout: *mut ::timespec,
+    ) -> ::c_int;
+
+    pub fn openpty(
+        amaster: *mut ::c_int,
+        aslave: *mut ::c_int,
+        name: *mut ::c_char,
+        termp: *mut termios,
+        winp: *mut ::winsize,
+    ) -> ::c_int;
+    pub fn forkpty(
+        amaster: *mut ::c_int,
+        name: *mut ::c_char,
+        termp: *mut termios,
+        winp: *mut ::winsize,
+    ) -> ::pid_t;
+
+    pub fn getnameinfo(
+        sa: *const ::sockaddr,
+        salen: ::socklen_t,
+        host: *mut ::c_char,
+        hostlen: ::socklen_t,
+        serv: *mut ::c_char,
+        sevlen: ::socklen_t,
+        flags: ::c_int,
+    ) -> ::c_int;
+
+    pub fn pwritev(
+        fd: ::c_int,
+        iov: *const ::iovec,
+        iovcnt: ::c_int,
+        offset: ::off64_t,
+    ) -> ::ssize_t;
+    pub fn preadv(
+        fd: ::c_int,
+        iov: *const ::iovec,
+        iovcnt: ::c_int,
+        offset: ::off64_t,
+    ) -> ::ssize_t;
+
+    pub fn sethostid(hostid: ::c_long) -> ::c_int;
+}
+
+cfg_if! {
+    if #[cfg(any(target_arch = "mips", target_arch = "mips64"))] {
+        mod mips;
+        pub use self::mips::*;
+    } else if #[cfg(target_arch = "x86_64")] {
+        mod x86_64;
+        pub use self::x86_64::*;
+    } else if #[cfg(target_arch = "arm")] {
+        mod arm;
+        pub use self::arm::*;
+    } else {
+        pub use unsupported_target;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/no_align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/no_align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+macro_rules! expand_align {
+    () => {
+        s! {
+            pub struct pthread_mutex_t {
+                #[cfg(any(target_arch = "mips",
+                          target_arch = "arm",
+                          target_arch = "powerpc"))]
+                __align: [::c_long; 0],
+                #[cfg(any(libc_align,
+                          target_arch = "mips",
+                          target_arch = "arm",
+                          target_arch = "powerpc"))]
+                __align: [::c_longlong; 0],
+                size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
+            }
+
+            pub struct pthread_rwlock_t {
+                #[cfg(any(target_arch = "mips",
+                          target_arch = "arm",
+                          target_arch = "powerpc"))]
+                __align: [::c_long; 0],
+                #[cfg(not(any(
+                    target_arch = "mips",
+                    target_arch = "arm",
+                    target_arch = "powerpc")))]
+                __align: [::c_longlong; 0],
+                size: [u8; ::__SIZEOF_PTHREAD_RWLOCK_T],
+            }
+
+            pub struct pthread_mutexattr_t {
+                #[cfg(any(target_arch = "x86_64", target_arch = "powerpc64",
+                          target_arch = "mips64", target_arch = "s390x",
+                          target_arch = "sparc64"))]
+                __align: [::c_int; 0],
+                #[cfg(not(any(target_arch = "x86_64", target_arch = "powerpc64",
+                              target_arch = "mips64", target_arch = "s390x",
+                              target_arch = "sparc64")))]
+                __align: [::c_long; 0],
+                size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
+            }
+
+            pub struct pthread_cond_t {
+                __align: [::c_longlong; 0],
+                size: [u8; ::__SIZEOF_PTHREAD_COND_T],
+            }
+
+            pub struct pthread_condattr_t {
+                __align: [::c_int; 0],
+                size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/l4re.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/l4re.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/l4re.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/l4re.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+/// L4Re specifics
+/// This module contains definitions required by various L4Re libc backends.
+/// Some of them are formally not part of the libc, but are a dependency of the
+/// libc and hence we should provide them here.
+
+pub type l4_umword_t = ::c_ulong; // Unsigned machine word.
+pub type pthread_t = *mut ::c_void;
+
+s! {
+    /// CPU sets.
+    pub struct l4_sched_cpu_set_t {
+        // from the L4Re docs
+        /// Combination of granularity and offset.
+        ///
+        /// The granularity defines how many CPUs each bit in map describes.
+        /// The offset is the numer of the first CPU described by the first
+        /// bit in the bitmap.
+        /// offset must be a multiple of 2^graularity.
+        ///
+        /// | MSB              |                 LSB |
+        /// | ---------------- | ------------------- |
+        /// | 8bit granularity | 24bit offset ..     |
+        gran_offset: l4_umword_t ,
+        /// Bitmap of CPUs.
+        map: l4_umword_t ,
+    }
+}
+
+#[cfg(target_os = "l4re")]
+#[allow(missing_debug_implementations)]
+pub struct pthread_attr_t {
+    pub __detachstate: ::c_int,
+    pub __schedpolicy: ::c_int,
+    pub __schedparam: super::__sched_param,
+    pub __inheritsched: ::c_int,
+    pub __scope: ::c_int,
+    pub __guardsize: ::size_t,
+    pub __stackaddr_set: ::c_int,
+    pub __stackaddr: *mut ::c_void, // better don't use it
+    pub __stacksize: ::size_t,
+    // L4Re specifics
+    pub affinity: l4_sched_cpu_set_t,
+    pub create_flags: ::c_uint,
+}
+
+// L4Re requires a min stack size of 64k; that isn't defined in uClibc, but
+// somewhere in the core libraries. uClibc wants 16k, but that's not enough.
+pub const PTHREAD_STACK_MIN: usize = 65536;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,334 @@
+//! Definitions for uclibc on 64bit systems
+pub type blkcnt_t = i64;
+pub type blksize_t = i64;
+pub type clock_t = i64;
+pub type c_char = u8;
+pub type c_long = i64;
+pub type c_ulong = u64;
+pub type fsblkcnt_t = ::c_ulong;
+pub type fsfilcnt_t = ::c_ulong;
+pub type fsword_t = ::c_long;
+pub type ino_t = ::c_ulong;
+pub type nlink_t = ::c_uint;
+pub type off_t = ::c_long;
+pub type rlim_t = c_ulong;
+// [uClibc docs] Note stat64 has the same shape as stat for x86-64.
+pub type stat64 = stat;
+pub type suseconds_t = ::c_long;
+pub type time_t = ::c_int;
+pub type wchar_t = ::c_int;
+
+pub type fsblkcnt64_t = u64;
+pub type fsfilcnt64_t = u64;
+pub type __u64 = ::c_ulong;
+
+s! {
+    pub struct ipc_perm {
+        pub __key: ::key_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
+        pub cuid: ::uid_t,
+        pub cgid: ::gid_t,
+        pub mode: ::c_ushort, // read / write
+        __pad1: ::c_ushort,
+        pub __seq: ::c_ushort,
+        __pad2: ::c_ushort,
+        __unused1: ::c_ulong,
+        __unused2: ::c_ulong
+    }
+
+    #[cfg(not(target_os = "l4re"))]
+    pub struct pthread_attr_t {
+        __detachstate: ::c_int,
+        __schedpolicy: ::c_int,
+        __schedparam: __sched_param,
+        __inheritsched: ::c_int,
+        __scope: ::c_int,
+        __guardsize: ::size_t,
+        __stackaddr_set: ::c_int,
+        __stackaddr: *mut ::c_void, // better don't use it
+        __stacksize: ::size_t,
+    }
+
+    pub struct __sched_param {
+        __sched_priority: ::c_int,
+    }
+
+    pub struct siginfo_t {
+        si_signo: ::c_int, // signal number
+        si_errno: ::c_int, // if not zero: error value of signal, see errno.h
+        si_code: ::c_int,  // signal code
+        pub _pad: [::c_int; 28], // unported union
+        _align: [usize; 0],
+    }
+
+    pub struct shmid_ds {
+        pub shm_perm: ::ipc_perm,
+        pub shm_segsz: ::size_t, // segment size in bytes
+        pub shm_atime: ::time_t, // time of last shmat()
+        pub shm_dtime: ::time_t,
+        pub shm_ctime: ::time_t,
+        pub shm_cpid: ::pid_t,
+        pub shm_lpid: ::pid_t,
+        pub shm_nattch: ::shmatt_t,
+        __unused1: ::c_ulong,
+        __unused2: ::c_ulong
+    }
+
+    pub struct msqid_ds {
+        pub msg_perm: ::ipc_perm,
+        pub msg_stime: ::time_t,
+        pub msg_rtime: ::time_t,
+        pub msg_ctime: ::time_t,
+        __msg_cbytes: ::c_ulong,
+        pub msg_qnum: ::msgqnum_t,
+        pub msg_qbytes: ::msglen_t,
+        pub msg_lspid: ::pid_t,
+        pub msg_lrpid: ::pid_t,
+        __ignored1: ::c_ulong,
+        __ignored2: ::c_ulong,
+    }
+
+    pub struct sockaddr {
+        pub sa_family: ::sa_family_t,
+        pub sa_data: [::c_char; 14],
+    }
+
+    pub struct sockaddr_in {
+        pub sin_family: ::sa_family_t,
+        pub sin_port: ::in_port_t,
+        pub sin_addr: ::in_addr,
+        pub sin_zero: [u8; 8],
+    }
+
+    pub struct sockaddr_in6 {
+        pub sin6_family: ::sa_family_t,
+        pub sin6_port: ::in_port_t,
+        pub sin6_flowinfo: u32,
+        pub sin6_addr: ::in6_addr,
+        pub sin6_scope_id: u32,
+    }
+
+    // ------------------------------------------------------------
+    // definitions below are *unverified* and might **break** the software
+//    pub struct in_addr {
+//        pub s_addr: in_addr_t,
+//    }
+//
+//    pub struct in6_addr {
+//        pub s6_addr: [u8; 16],
+//        #[cfg(not(libc_align))]
+//        __align: [u32; 0],
+//    }
+
+    pub struct stat {
+        pub st_dev: ::c_ulong,
+        pub st_ino: ::ino_t,
+        // According to uclibc/libc/sysdeps/linux/x86_64/bits/stat.h, order of
+        // nlink and mode are swapped on 64 bit systems.
+        pub st_nlink: ::nlink_t,
+        pub st_mode: ::mode_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::c_ulong, // dev_t
+        pub st_size: off_t, // file size
+        pub st_blksize: ::blksize_t,
+        pub st_blocks: ::blkcnt_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_ulong,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_ulong,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_ulong,
+        st_pad4: [::c_long; 3]
+    }
+
+    pub struct sigaction {
+        pub sa_handler: ::sighandler_t,
+        pub sa_flags: ::c_ulong,
+        pub sa_restorer: ::Option<extern fn()>,
+        pub sa_mask: ::sigset_t,
+    }
+
+    pub struct stack_t { // FIXME
+        pub ss_sp: *mut ::c_void,
+        pub ss_flags: ::c_int,
+        pub ss_size: ::size_t
+    }
+
+    pub struct statfs { // FIXME
+        pub f_type: fsword_t,
+        pub f_bsize: fsword_t,
+        pub f_blocks: ::fsblkcnt_t,
+        pub f_bfree: ::fsblkcnt_t,
+        pub f_bavail: ::fsblkcnt_t,
+        pub f_files: ::fsfilcnt_t,
+        pub f_ffree: ::fsfilcnt_t,
+        pub f_fsid: ::fsid_t,
+        pub f_namelen: fsword_t,
+        pub f_frsize: fsword_t,
+        f_spare: [fsword_t; 5],
+    }
+
+    pub struct statfs64 {
+        pub f_type: ::c_int,
+        pub f_bsize: ::c_int,
+        pub f_blocks: ::fsblkcnt64_t,
+        pub f_bfree: ::fsblkcnt64_t,
+        pub f_bavail: ::fsblkcnt64_t,
+        pub f_files: ::fsfilcnt64_t,
+        pub f_ffree: ::fsfilcnt64_t,
+        pub f_fsid: ::fsid_t,
+        pub f_namelen: ::c_int,
+        pub f_frsize: ::c_int,
+        pub f_flags: ::c_int,
+        pub f_spare: [::c_int; 4],
+    }
+
+    pub struct statvfs64 {
+        pub f_bsize: ::c_ulong,
+        pub f_frsize: ::c_ulong,
+        pub f_blocks: u64,
+        pub f_bfree: u64,
+        pub f_bavail: u64,
+        pub f_files: u64,
+        pub f_ffree: u64,
+        pub f_favail: u64,
+        pub f_fsid: ::c_ulong,
+        __f_unused: ::c_int,
+        pub f_flag: ::c_ulong,
+        pub f_namemax: ::c_ulong,
+        __f_spare: [::c_int; 6],
+    }
+
+    pub struct msghdr { // FIXME
+        pub msg_name: *mut ::c_void,
+        pub msg_namelen: ::socklen_t,
+        pub msg_iov: *mut ::iovec,
+        pub msg_iovlen: ::size_t,
+        pub msg_control: *mut ::c_void,
+        pub msg_controllen: ::size_t,
+        pub msg_flags: ::c_int,
+    }
+
+    pub struct termios { // FIXME
+        pub c_iflag: ::tcflag_t,
+        pub c_oflag: ::tcflag_t,
+        pub c_cflag: ::tcflag_t,
+        pub c_lflag: ::tcflag_t,
+        pub c_line: ::cc_t,
+        pub c_cc: [::cc_t; ::NCCS],
+    }
+
+    pub struct sigset_t { // FIXME
+        __val: [::c_ulong; 16],
+    }
+
+    pub struct sysinfo { // FIXME
+        pub uptime: ::c_long,
+        pub loads: [::c_ulong; 3],
+        pub totalram: ::c_ulong,
+        pub freeram: ::c_ulong,
+        pub sharedram: ::c_ulong,
+        pub bufferram: ::c_ulong,
+        pub totalswap: ::c_ulong,
+        pub freeswap: ::c_ulong,
+        pub procs: ::c_ushort,
+        pub pad: ::c_ushort,
+        pub totalhigh: ::c_ulong,
+        pub freehigh: ::c_ulong,
+        pub mem_unit: ::c_uint,
+        pub _f: [::c_char; 0],
+    }
+
+    pub struct glob_t { // FIXME
+        pub gl_pathc: ::size_t,
+        pub gl_pathv: *mut *mut c_char,
+        pub gl_offs: ::size_t,
+        pub gl_flags: ::c_int,
+        __unused1: *mut ::c_void,
+        __unused2: *mut ::c_void,
+        __unused3: *mut ::c_void,
+        __unused4: *mut ::c_void,
+        __unused5: *mut ::c_void,
+    }
+
+    pub struct cpu_set_t { // FIXME
+        #[cfg(target_pointer_width = "32")]
+        bits: [u32; 32],
+        #[cfg(target_pointer_width = "64")]
+        bits: [u64; 16],
+    }
+
+    pub struct fsid_t { // FIXME
+        __val: [::c_int; 2],
+    }
+
+    // FIXME this is actually a union
+    pub struct sem_t {
+        #[cfg(target_pointer_width = "32")]
+        __size: [::c_char; 16],
+        #[cfg(target_pointer_width = "64")]
+        __size: [::c_char; 32],
+        __align: [::c_long; 0],
+    }
+
+    pub struct cmsghdr {
+        pub cmsg_len: ::size_t,
+        pub cmsg_level: ::c_int,
+        pub cmsg_type: ::c_int,
+    }
+}
+
+s_no_extra_traits! {
+    #[allow(missing_debug_implementations)]
+    pub struct dirent {
+        pub d_ino: ::ino64_t,
+        pub d_off: ::off64_t,
+        pub d_reclen: u16,
+        pub d_type: u8,
+        pub d_name: [::c_char; 256],
+    }
+}
+
+// constants
+pub const EADDRINUSE: ::c_int = 98; // Address already in use
+pub const EADDRNOTAVAIL: ::c_int = 99; // Cannot assign requested address
+pub const ECONNABORTED: ::c_int = 103; // Software caused connection abort
+pub const ECONNREFUSED: ::c_int = 111; // Connection refused
+pub const ECONNRESET: ::c_int = 104; // Connection reset by peer
+pub const EDEADLK: ::c_int = 35; // Resource deadlock would occur
+pub const ENOSYS: ::c_int = 38; // Function not implemented
+pub const ENOTCONN: ::c_int = 107; // Transport endpoint is not connected
+pub const ETIMEDOUT: ::c_int = 110; // connection timed out
+pub const EOPNOTSUPP: ::c_int = 0x5f;
+pub const ENODATA: ::c_int = 0x3d;
+pub const O_APPEND: ::c_int = 02000;
+pub const O_ACCMODE: ::c_int = 0003;
+pub const O_CLOEXEC: ::c_int = 0x80000;
+pub const O_CREAT: ::c_int = 0100;
+pub const O_DIRECTORY: ::c_int = 0200000;
+pub const O_EXCL: ::c_int = 0200;
+pub const O_NONBLOCK: ::c_int = 04000;
+pub const O_TRUNC: ::c_int = 01000;
+pub const NCCS: usize = 32;
+pub const SIG_SETMASK: ::c_int = 2; // Set the set of blocked signals
+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
+pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
+pub const SOCK_DGRAM: ::c_int = 2; // connectionless, unreliable datagrams
+pub const SOCK_STREAM: ::c_int = 1; // …/common/bits/socket_type.h
+pub const RLIM_INFINITY: u64 = 0xffffffffffffffff;
+pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
+pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
+pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
+pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 8;
+
+cfg_if! {
+    if #[cfg(target_os = "l4re")] {
+        mod l4re;
+        pub use self::l4re::*;
+    } else {
+        mod other;
+        pub use other::*;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/other.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/other.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/other.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/linux/uclibc/x86_64/other.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5 @@
+// Thestyle checker discourages the use of #[cfg], so this has to go into a
+// separate module
+pub type pthread_t = ::c_ulong;
+
+pub const PTHREAD_STACK_MIN: usize = 16384;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/linux_like/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/linux_like/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,7 @@
 pub type speed_t = ::c_uint;
 pub type tcflag_t = ::c_uint;
 pub type clockid_t = ::c_int;
+pub type timer_t = *mut ::c_void;
 pub type key_t = ::c_int;
 pub type id_t = ::c_uint;
 
@@ -546,13 +547,21 @@
 pub const PROT_WRITE: ::c_int = 2;
 pub const PROT_EXEC: ::c_int = 4;
 
-pub const LC_CTYPE: ::c_int = 0;
-pub const LC_NUMERIC: ::c_int = 1;
-pub const LC_TIME: ::c_int = 2;
-pub const LC_COLLATE: ::c_int = 3;
-pub const LC_MONETARY: ::c_int = 4;
-pub const LC_MESSAGES: ::c_int = 5;
-pub const LC_ALL: ::c_int = 6;
+pub const XATTR_CREATE: ::c_int = 0x1;
+pub const XATTR_REPLACE: ::c_int = 0x2;
+
+cfg_if! {
+    if #[cfg(not(target_env = "uclibc"))] {
+        pub const LC_CTYPE: ::c_int = 0;
+        pub const LC_NUMERIC: ::c_int = 1;
+        pub const LC_TIME: ::c_int = 2;
+        pub const LC_COLLATE: ::c_int = 3;
+        pub const LC_MONETARY: ::c_int = 4;
+        pub const LC_MESSAGES: ::c_int = 5;
+        pub const LC_ALL: ::c_int = 6;
+    }
+}
+
 pub const LC_CTYPE_MASK: ::c_int = 1 << LC_CTYPE;
 pub const LC_NUMERIC_MASK: ::c_int = 1 << LC_NUMERIC;
 pub const LC_TIME_MASK: ::c_int = 1 << LC_TIME;
@@ -597,6 +606,7 @@
 pub const MS_KERNMOUNT: ::c_ulong = 0x400000;
 pub const MS_I_VERSION: ::c_ulong = 0x800000;
 pub const MS_STRICTATIME: ::c_ulong = 0x1000000;
+pub const MS_LAZYTIME: ::c_ulong = 0x2000000;
 pub const MS_ACTIVE: ::c_ulong = 0x40000000;
 pub const MS_MGC_VAL: ::c_ulong = 0xc0ed0000;
 pub const MS_MGC_MSK: ::c_ulong = 0xffff0000;
@@ -855,7 +865,6 @@
 /// IP6 destination option
 pub const IPPROTO_DSTOPTS: ::c_int = 60;
 pub const IPPROTO_MTP: ::c_int = 92;
-pub const IPPROTO_BEETPH: ::c_int = 94;
 /// encapsulation header
 pub const IPPROTO_ENCAP: ::c_int = 98;
 /// Protocol indep. multicast
@@ -866,7 +875,6 @@
 pub const IPPROTO_SCTP: ::c_int = 132;
 pub const IPPROTO_MH: ::c_int = 135;
 pub const IPPROTO_UDPLITE: ::c_int = 136;
-pub const IPPROTO_MPLS: ::c_int = 137;
 /// raw IP packet
 pub const IPPROTO_RAW: ::c_int = 255;
 
@@ -905,7 +913,6 @@
 pub const IPV6_LEAVE_ANYCAST: ::c_int = 28;
 pub const IPV6_IPSEC_POLICY: ::c_int = 34;
 pub const IPV6_XFRM_POLICY: ::c_int = 35;
-pub const IPV6_HDRINCL: ::c_int = 36;
 pub const IPV6_RECVPKTINFO: ::c_int = 49;
 pub const IPV6_PKTINFO: ::c_int = 50;
 pub const IPV6_RECVHOPLIMIT: ::c_int = 51;
@@ -941,8 +948,6 @@
 pub const IPV6_PMTUDISC_WANT: ::c_int = 1;
 pub const IPV6_PMTUDISC_DO: ::c_int = 2;
 pub const IPV6_PMTUDISC_PROBE: ::c_int = 3;
-pub const IPV6_PMTUDISC_INTERFACE: ::c_int = 4;
-pub const IPV6_PMTUDISC_OMIT: ::c_int = 5;
 
 pub const TCP_NODELAY: ::c_int = 1;
 pub const TCP_MAXSEG: ::c_int = 2;
@@ -957,6 +962,43 @@
 pub const TCP_INFO: ::c_int = 11;
 pub const TCP_QUICKACK: ::c_int = 12;
 pub const TCP_CONGESTION: ::c_int = 13;
+pub const TCP_MD5SIG: ::c_int = 14;
+cfg_if! {
+    if #[cfg(all(target_os = "linux", any(target_env = "gnu", target_env = "musl")))] {
+        // WARN: deprecated
+        pub const TCP_COOKIE_TRANSACTIONS: ::c_int = 15;
+    }
+}
+pub const TCP_THIN_LINEAR_TIMEOUTS: ::c_int = 16;
+pub const TCP_THIN_DUPACK: ::c_int = 17;
+pub const TCP_USER_TIMEOUT: ::c_int = 18;
+pub const TCP_REPAIR: ::c_int = 19;
+pub const TCP_REPAIR_QUEUE: ::c_int = 20;
+pub const TCP_QUEUE_SEQ: ::c_int = 21;
+pub const TCP_REPAIR_OPTIONS: ::c_int = 22;
+pub const TCP_FASTOPEN: ::c_int = 23;
+pub const TCP_TIMESTAMP: ::c_int = 24;
+pub const TCP_NOTSENT_LOWAT: ::c_int = 25;
+pub const TCP_CC_INFO: ::c_int = 26;
+pub const TCP_SAVE_SYN: ::c_int = 27;
+pub const TCP_SAVED_SYN: ::c_int = 28;
+cfg_if! {
+    if #[cfg(not(target_os = "emscripten"))] {
+        // NOTE: emscripten doesn't support these options yet.
+
+        pub const TCP_REPAIR_WINDOW: ::c_int = 29;
+        pub const TCP_FASTOPEN_CONNECT: ::c_int = 30;
+        pub const TCP_ULP: ::c_int = 31;
+        pub const TCP_MD5SIG_EXT: ::c_int = 32;
+        pub const TCP_FASTOPEN_KEY: ::c_int = 33;
+        pub const TCP_FASTOPEN_NO_COOKIE: ::c_int = 34;
+        pub const TCP_ZEROCOPY_RECEIVE: ::c_int = 35;
+        pub const TCP_INQ: ::c_int = 36;
+        pub const TCP_CM_INQ: ::c_int = TCP_INQ;
+        // NOTE: Some CI images doesn't have this option yet.
+        // pub const TCP_TX_DELAY: ::c_int = 37;
+    }
+}
 
 pub const SO_DEBUG: ::c_int = 1;
 
@@ -1081,7 +1123,6 @@
 pub const CLONE_NEWPID: ::c_int = 0x20000000;
 pub const CLONE_NEWNET: ::c_int = 0x40000000;
 pub const CLONE_IO: ::c_int = 0x80000000;
-pub const CLONE_NEWCGROUP: ::c_int = 0x02000000;
 
 pub const WNOHANG: ::c_int = 0x00000001;
 pub const WUNTRACED: ::c_int = 0x00000002;
@@ -1091,15 +1132,11 @@
 pub const WNOWAIT: ::c_int = 0x01000000;
 
 // Options for personality(2).
-pub const ADDR_NO_RANDOMIZE: ::c_int = 0x0040000;
 pub const MMAP_PAGE_ZERO: ::c_int = 0x0100000;
-pub const ADDR_COMPAT_LAYOUT: ::c_int = 0x0200000;
-pub const READ_IMPLIES_EXEC: ::c_int = 0x0400000;
 pub const ADDR_LIMIT_32BIT: ::c_int = 0x0800000;
 pub const SHORT_INODE: ::c_int = 0x1000000;
 pub const WHOLE_SECONDS: ::c_int = 0x2000000;
 pub const STICKY_TIMEOUTS: ::c_int = 0x4000000;
-pub const ADDR_LIMIT_3GB: ::c_int = 0x8000000;
 
 // Options set using PTRACE_SETOPTIONS.
 pub const PTRACE_O_TRACESYSGOOD: ::c_int = 0x00000001;
@@ -1110,9 +1147,6 @@
 pub const PTRACE_O_TRACEVFORKDONE: ::c_int = 0x00000020;
 pub const PTRACE_O_TRACEEXIT: ::c_int = 0x00000040;
 pub const PTRACE_O_TRACESECCOMP: ::c_int = 0x00000080;
-pub const PTRACE_O_EXITKILL: ::c_int = 0x00100000;
-pub const PTRACE_O_SUSPEND_SECCOMP: ::c_int = 0x00200000;
-pub const PTRACE_O_MASK: ::c_int = 0x003000ff;
 
 // Wait extended result codes for the above trace options.
 pub const PTRACE_EVENT_FORK: ::c_int = 1;
@@ -1273,6 +1307,7 @@
 pub const ARPHRD_ROSE: u16 = 270;
 pub const ARPHRD_X25: u16 = 271;
 pub const ARPHRD_HWX25: u16 = 272;
+pub const ARPHRD_CAN: u16 = 280;
 pub const ARPHRD_PPP: u16 = 512;
 pub const ARPHRD_CISCO: u16 = 513;
 pub const ARPHRD_HDLC: u16 = ARPHRD_CISCO;
@@ -1309,6 +1344,24 @@
 pub const ARPHRD_VOID: u16 = 0xFFFF;
 pub const ARPHRD_NONE: u16 = 0xFFFE;
 
+cfg_if! {
+    if #[cfg(not(target_env = "uclibc"))] {
+        pub const IPPROTO_BEETPH: ::c_int = 94;
+        pub const IPPROTO_MPLS: ::c_int = 137;
+        pub const IPV6_HDRINCL: ::c_int = 36;
+        pub const IPV6_PMTUDISC_INTERFACE: ::c_int = 4;
+        pub const IPV6_PMTUDISC_OMIT: ::c_int = 5;
+        pub const CLONE_NEWCGROUP: ::c_int = 0x02000000;
+        pub const ADDR_NO_RANDOMIZE: ::c_int = 0x0040000;
+        pub const ADDR_COMPAT_LAYOUT: ::c_int = 0x0200000;
+        pub const READ_IMPLIES_EXEC: ::c_int = 0x0400000;
+        pub const ADDR_LIMIT_3GB: ::c_int = 0x8000000;
+        pub const PTRACE_O_EXITKILL: ::c_int = 0x00100000;
+        pub const PTRACE_O_SUSPEND_SECCOMP: ::c_int = 0x00200000;
+        pub const PTRACE_O_MASK: ::c_int = 0x003000ff;
+    }
+}
+
 const_fn! {
     {const} fn CMSG_ALIGN(len: usize) -> usize {
         len + ::mem::size_of::<usize>() - 1 & !(::mem::size_of::<usize>() - 1)
@@ -1344,7 +1397,7 @@
         return
     }
 
-    pub fn FD_ISSET(fd: ::c_int, set: *mut fd_set) -> bool {
+    pub fn FD_ISSET(fd: ::c_int, set: *const fd_set) -> bool {
         let fd = fd as usize;
         let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
         return ((*set).fds_bits[fd / size] & (1 << (fd % size))) != 0
@@ -1365,6 +1418,14 @@
 }
 
 safe_f! {
+    pub fn SIGRTMAX() -> ::c_int {
+        unsafe { __libc_current_sigrtmax() }
+    }
+
+    pub fn SIGRTMIN() -> ::c_int {
+        unsafe { __libc_current_sigrtmin() }
+    }
+
     pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
         (status & 0xff) == 0x7f
     }
@@ -1427,36 +1488,24 @@
 }
 
 extern "C" {
+    #[doc(hidden)]
+    pub fn __libc_current_sigrtmax() -> ::c_int;
+    #[doc(hidden)]
+    pub fn __libc_current_sigrtmin() -> ::c_int;
+
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
     pub fn fdatasync(fd: ::c_int) -> ::c_int;
-    pub fn mincore(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        vec: *mut ::c_uchar,
-    ) -> ::c_int;
+    pub fn mincore(addr: *mut ::c_void, len: ::size_t, vec: *mut ::c_uchar) -> ::c_int;
 
     pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
     pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
-    pub fn clock_settime(
-        clk_id: ::clockid_t,
-        tp: *const ::timespec,
-    ) -> ::c_int;
-    pub fn clock_getcpuclockid(
-        pid: ::pid_t,
-        clk_id: *mut ::clockid_t,
-    ) -> ::c_int;
+    pub fn clock_settime(clk_id: ::clockid_t, tp: *const ::timespec) -> ::c_int;
+    pub fn clock_getcpuclockid(pid: ::pid_t, clk_id: *mut ::clockid_t) -> ::c_int;
 
     pub fn dirfd(dirp: *mut ::DIR) -> ::c_int;
 
-    pub fn pthread_getattr_np(
-        native: ::pthread_t,
-        attr: *mut ::pthread_attr_t,
-    ) -> ::c_int;
+    pub fn pthread_getattr_np(native: ::pthread_t, attr: *mut ::pthread_attr_t) -> ::c_int;
     pub fn pthread_attr_getstack(
         attr: *const ::pthread_attr_t,
         stackaddr: *mut *mut ::c_void,
@@ -1471,18 +1520,9 @@
     pub fn fstatfs64(fd: ::c_int, buf: *mut statfs64) -> ::c_int;
     pub fn statvfs64(path: *const ::c_char, buf: *mut statvfs64) -> ::c_int;
     pub fn fstatvfs64(fd: ::c_int, buf: *mut statvfs64) -> ::c_int;
-    pub fn memrchr(
-        cx: *const ::c_void,
-        c: ::c_int,
-        n: ::size_t,
-    ) -> *mut ::c_void;
+    pub fn memrchr(cx: *const ::c_void, c: ::c_int, n: ::size_t) -> *mut ::c_void;
 
-    pub fn posix_fadvise(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-        advise: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t, advise: ::c_int) -> ::c_int;
     pub fn posix_fadvise64(
         fd: ::c_int,
         offset: ::off64_t,
@@ -1498,11 +1538,7 @@
     ) -> ::c_int;
     pub fn duplocale(base: ::locale_t) -> ::locale_t;
     pub fn freelocale(loc: ::locale_t);
-    pub fn newlocale(
-        mask: ::c_int,
-        locale: *const ::c_char,
-        base: ::locale_t,
-    ) -> ::locale_t;
+    pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
     pub fn uselocale(loc: ::locale_t) -> ::locale_t;
     pub fn creat64(path: *const c_char, mode: mode_t) -> ::c_int;
     pub fn fstat64(fildes: ::c_int, buf: *mut stat64) -> ::c_int;
@@ -1524,36 +1560,14 @@
         offset: off64_t,
     ) -> *mut ::c_void;
     pub fn open64(path: *const c_char, oflag: ::c_int, ...) -> ::c_int;
-    pub fn openat64(
-        fd: ::c_int,
-        path: *const c_char,
-        oflag: ::c_int,
-        ...
-    ) -> ::c_int;
-    pub fn pread64(
-        fd: ::c_int,
-        buf: *mut ::c_void,
-        count: ::size_t,
-        offset: off64_t,
-    ) -> ::ssize_t;
-    pub fn preadv64(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off64_t,
-    ) -> ::ssize_t;
+    pub fn openat64(fd: ::c_int, path: *const c_char, oflag: ::c_int, ...) -> ::c_int;
+    pub fn pread64(fd: ::c_int, buf: *mut ::c_void, count: ::size_t, offset: off64_t) -> ::ssize_t;
     pub fn pwrite64(
         fd: ::c_int,
         buf: *const ::c_void,
         count: ::size_t,
         offset: off64_t,
     ) -> ::ssize_t;
-    pub fn pwritev64(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off64_t,
-    ) -> ::ssize_t;
     pub fn readdir64(dirp: *mut ::DIR) -> *mut ::dirent64;
     pub fn readdir64_r(
         dirp: *mut ::DIR,
@@ -1577,10 +1591,7 @@
         attr: *mut pthread_condattr_t,
         clock_id: ::clockid_t,
     ) -> ::c_int;
-    pub fn pthread_condattr_setpshared(
-        attr: *mut pthread_condattr_t,
-        pshared: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_condattr_setpshared(attr: *mut pthread_condattr_t, pshared: ::c_int) -> ::c_int;
     pub fn pthread_mutexattr_setpshared(
         attr: *mut pthread_mutexattr_t,
         pshared: ::c_int,
@@ -1589,34 +1600,15 @@
         attr: *const pthread_rwlockattr_t,
         val: *mut ::c_int,
     ) -> ::c_int;
-    pub fn pthread_rwlockattr_setpshared(
-        attr: *mut pthread_rwlockattr_t,
-        val: ::c_int,
-    ) -> ::c_int;
-    pub fn ptsname_r(
-        fd: ::c_int,
-        buf: *mut ::c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn pthread_rwlockattr_setpshared(attr: *mut pthread_rwlockattr_t, val: ::c_int) -> ::c_int;
+    pub fn ptsname_r(fd: ::c_int, buf: *mut ::c_char, buflen: ::size_t) -> ::c_int;
     pub fn clearenv() -> ::c_int;
-    pub fn waitid(
-        idtype: idtype_t,
-        id: id_t,
-        infop: *mut ::siginfo_t,
-        options: ::c_int,
-    ) -> ::c_int;
+    pub fn waitid(idtype: idtype_t, id: id_t, infop: *mut ::siginfo_t, options: ::c_int)
+        -> ::c_int;
     pub fn setreuid(ruid: ::uid_t, euid: ::uid_t) -> ::c_int;
     pub fn setregid(rgid: ::gid_t, egid: ::gid_t) -> ::c_int;
-    pub fn getresuid(
-        ruid: *mut ::uid_t,
-        euid: *mut ::uid_t,
-        suid: *mut ::uid_t,
-    ) -> ::c_int;
-    pub fn getresgid(
-        rgid: *mut ::gid_t,
-        egid: *mut ::gid_t,
-        sgid: *mut ::gid_t,
-    ) -> ::c_int;
+    pub fn getresuid(ruid: *mut ::uid_t, euid: *mut ::uid_t, suid: *mut ::uid_t) -> ::c_int;
+    pub fn getresgid(rgid: *mut ::gid_t, egid: *mut ::gid_t, sgid: *mut ::gid_t) -> ::c_int;
     pub fn acct(filename: *const ::c_char) -> ::c_int;
     pub fn brk(addr: *mut ::c_void) -> ::c_int;
     pub fn sbrk(increment: ::intptr_t) -> *mut ::c_void;
@@ -1633,19 +1625,6 @@
         options: ::c_int,
         rusage: *mut ::rusage,
     ) -> ::pid_t;
-    pub fn openpty(
-        amaster: *mut ::c_int,
-        aslave: *mut ::c_int,
-        name: *mut ::c_char,
-        termp: *const termios,
-        winp: *const ::winsize,
-    ) -> ::c_int;
-    pub fn forkpty(
-        amaster: *mut ::c_int,
-        name: *mut ::c_char,
-        termp: *const termios,
-        winp: *const ::winsize,
-    ) -> ::pid_t;
     pub fn login_tty(fd: ::c_int) -> ::c_int;
     pub fn execvpe(
         file: *const ::c_char,
@@ -1659,43 +1638,60 @@
     ) -> ::c_int;
     pub fn getifaddrs(ifap: *mut *mut ::ifaddrs) -> ::c_int;
     pub fn freeifaddrs(ifa: *mut ::ifaddrs);
-    pub fn bind(
-        socket: ::c_int,
-        address: *const ::sockaddr,
-        address_len: ::socklen_t,
-    ) -> ::c_int;
+    pub fn bind(socket: ::c_int, address: *const ::sockaddr, address_len: ::socklen_t) -> ::c_int;
 
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
+    pub fn readv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
 
-    pub fn sendmsg(
-        fd: ::c_int,
-        msg: *const ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn recvmsg(
-        fd: ::c_int,
-        msg: *mut ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn sendmsg(fd: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
+    pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
     pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
 
 cfg_if! {
+    if #[cfg(not(target_env = "uclibc"))] {
+        extern "C" {
+            pub fn preadv64(
+                fd: ::c_int,
+                iov: *const ::iovec,
+                iovcnt: ::c_int,
+                offset: ::off64_t,
+            ) -> ::ssize_t;
+            pub fn pwritev64(
+                fd: ::c_int,
+                iov: *const ::iovec,
+                iovcnt: ::c_int,
+                offset: ::off64_t,
+            ) -> ::ssize_t;
+            // uclibc has separate non-const version of this function
+            pub fn forkpty(
+                amaster: *mut ::c_int,
+                name: *mut ::c_char,
+                termp: *const termios,
+                winp: *const ::winsize,
+            ) -> ::pid_t;
+            // uclibc has separate non-const version of this function
+            pub fn openpty(
+                amaster: *mut ::c_int,
+                aslave: *mut ::c_int,
+                name: *mut ::c_char,
+                termp: *const termios,
+                winp: *const ::winsize,
+            ) -> ::c_int;
+        }
+    }
+}
+
+cfg_if! {
     if #[cfg(target_os = "emscripten")] {
         mod emscripten;
         pub use self::emscripten::*;
     } else if #[cfg(target_os = "linux")] {
         mod linux;
         pub use self::linux::*;
+    } else if #[cfg(target_os = "l4re")] {
+        mod linux;
+        pub use self::linux::*;
     } else if #[cfg(target_os = "android")] {
         mod android;
         pub use self::android::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -227,7 +227,8 @@
 pub const S_ISVTX: ::mode_t = 0x200;
 
 cfg_if! {
-    if #[cfg(not(any(target_os = "illumos", target_os = "solaris")))] {
+    if #[cfg(not(any(target_os = "haiku", target_os = "illumos",
+                     target_os = "solaris")))] {
         pub const IF_NAMESIZE: ::size_t = 16;
         pub const IFNAMSIZ: ::size_t = IF_NAMESIZE;
     }
@@ -260,12 +261,15 @@
 pub const LOG_LOCAL6: ::c_int = 22 << 3;
 pub const LOG_LOCAL7: ::c_int = 23 << 3;
 
-pub const LOG_PID: ::c_int = 0x01;
-pub const LOG_CONS: ::c_int = 0x02;
-pub const LOG_ODELAY: ::c_int = 0x04;
-pub const LOG_NDELAY: ::c_int = 0x08;
-pub const LOG_NOWAIT: ::c_int = 0x10;
-
+cfg_if! {
+    if #[cfg(not(target_os = "haiku"))] {
+        pub const LOG_PID: ::c_int = 0x01;
+        pub const LOG_CONS: ::c_int = 0x02;
+        pub const LOG_ODELAY: ::c_int = 0x04;
+        pub const LOG_NDELAY: ::c_int = 0x08;
+        pub const LOG_NOWAIT: ::c_int = 0x10;
+    }
+}
 pub const LOG_PRIMASK: ::c_int = 7;
 pub const LOG_FACMASK: ::c_int = 0x3f8;
 
@@ -293,13 +297,13 @@
 pub const ATF_USETRAILERS: ::c_int = 0x10;
 
 cfg_if! {
-    if #[cfg(target_os = "l4re")] {
-        // required libraries for L4Re are linked externally, ATM
+    if #[cfg(any(target_os = "l4re", target_os = "espidf"))] {
+        // required libraries for L4Re and the ESP-IDF framework are linked externally, ATM
     } else if #[cfg(feature = "std")] {
         // cargo build, don't pull in anything extra as the libstd dep
         // already pulls in all libs.
     } else if #[cfg(all(target_os = "linux",
-                        target_env = "gnu",
+                        any(target_env = "gnu", target_env = "uclibc"),
                         feature = "rustc-dep-of-std"))] {
         #[link(name = "util", kind = "static-nobundle",
             cfg(target_feature = "crt-static"))]
@@ -418,18 +422,14 @@
         base: *mut c_void,
         num: size_t,
         size: size_t,
-        compar: ::Option<
-            unsafe extern "C" fn(*const c_void, *const c_void) -> c_int,
-        >,
+        compar: ::Option<unsafe extern "C" fn(*const c_void, *const c_void) -> c_int>,
     );
     pub fn bsearch(
         key: *const c_void,
         base: *const c_void,
         num: size_t,
         size: size_t,
-        compar: ::Option<
-            unsafe extern "C" fn(*const c_void, *const c_void) -> c_int,
-        >,
+        compar: ::Option<unsafe extern "C" fn(*const c_void, *const c_void) -> c_int>,
     ) -> *mut c_void;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
@@ -440,41 +440,21 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "freopen$UNIX2003"
     )]
-    pub fn freopen(
-        filename: *const c_char,
-        mode: *const c_char,
-        file: *mut FILE,
-    ) -> *mut FILE;
-    pub fn fmemopen(
-        buf: *mut c_void,
-        size: size_t,
-        mode: *const c_char,
-    ) -> *mut FILE;
-    pub fn open_memstream(
-        ptr: *mut *mut c_char,
-        sizeloc: *mut size_t,
-    ) -> *mut FILE;
-    pub fn open_wmemstream(
-        ptr: *mut *mut wchar_t,
-        sizeloc: *mut size_t,
-    ) -> *mut FILE;
+    pub fn freopen(filename: *const c_char, mode: *const c_char, file: *mut FILE) -> *mut FILE;
+    pub fn fmemopen(buf: *mut c_void, size: size_t, mode: *const c_char) -> *mut FILE;
+    pub fn open_memstream(ptr: *mut *mut c_char, sizeloc: *mut size_t) -> *mut FILE;
+
     pub fn fflush(file: *mut FILE) -> c_int;
     pub fn fclose(file: *mut FILE) -> c_int;
     pub fn remove(filename: *const c_char) -> c_int;
     pub fn rename(oldname: *const c_char, newname: *const c_char) -> c_int;
     pub fn tmpfile() -> *mut FILE;
-    pub fn setvbuf(
-        stream: *mut FILE,
-        buffer: *mut c_char,
-        mode: c_int,
-        size: size_t,
-    ) -> c_int;
+    pub fn setvbuf(stream: *mut FILE, buffer: *mut c_char, mode: c_int, size: size_t) -> c_int;
     pub fn setbuf(stream: *mut FILE, buf: *mut c_char);
     pub fn getchar() -> c_int;
     pub fn putchar(c: c_int) -> c_int;
     pub fn fgetc(stream: *mut FILE) -> c_int;
-    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE)
-        -> *mut c_char;
+    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE) -> *mut c_char;
     pub fn fputc(c: c_int, stream: *mut FILE) -> c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
@@ -483,22 +463,12 @@
     pub fn fputs(s: *const c_char, stream: *mut FILE) -> c_int;
     pub fn puts(s: *const c_char) -> c_int;
     pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
-    pub fn fread(
-        ptr: *mut c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
+    pub fn fread(ptr: *mut c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "fwrite$UNIX2003"
     )]
-    pub fn fwrite(
-        ptr: *const c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
+    pub fn fwrite(ptr: *const c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
     pub fn fseek(stream: *mut FILE, offset: c_long, whence: c_int) -> c_int;
     pub fn ftell(stream: *mut FILE) -> c_long;
     pub fn rewind(stream: *mut FILE);
@@ -516,16 +486,9 @@
         link_name = "strtod$UNIX2003"
     )]
     pub fn strtod(s: *const c_char, endp: *mut *mut c_char) -> c_double;
-    pub fn strtol(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_long;
-    pub fn strtoul(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_ulong;
+    pub fn strtof(s: *const c_char, endp: *mut *mut c_char) -> c_float;
+    pub fn strtol(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_long;
+    pub fn strtoul(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_ulong;
     pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
     pub fn malloc(size: size_t) -> *mut c_void;
     pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
@@ -542,17 +505,9 @@
     pub fn getenv(s: *const c_char) -> *mut c_char;
 
     pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
-    pub fn strncpy(
-        dst: *mut c_char,
-        src: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strncat(
-        s: *mut c_char,
-        ct: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncat(s: *mut c_char, ct: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
     pub fn strncmp(cs: *const c_char, ct: *const c_char, n: size_t) -> c_int;
     pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
@@ -565,11 +520,7 @@
     pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
-    pub fn strncasecmp(
-        s1: *const c_char,
-        s2: *const c_char,
-        n: size_t,
-    ) -> c_int;
+    pub fn strncasecmp(s1: *const c_char, s2: *const c_char, n: size_t) -> c_int;
     pub fn strlen(cs: *const c_char) -> size_t;
     pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
     #[cfg_attr(
@@ -581,25 +532,13 @@
     pub fn strxfrm(s: *mut c_char, ct: *const c_char, n: size_t) -> size_t;
     pub fn strsignal(sig: c_int) -> *mut c_char;
     pub fn wcslen(buf: *const wchar_t) -> size_t;
-    pub fn wcstombs(
-        dest: *mut c_char,
-        src: *const wchar_t,
-        n: size_t,
-    ) -> ::size_t;
+    pub fn wcstombs(dest: *mut c_char, src: *const wchar_t, n: size_t) -> ::size_t;
 
     pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
     pub fn wmemchr(cx: *const wchar_t, c: wchar_t, n: size_t) -> *mut wchar_t;
     pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
-    pub fn memcpy(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
-    pub fn memmove(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
+    pub fn memcpy(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
+    pub fn memmove(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
     pub fn memset(dest: *mut c_void, c: c_int, n: size_t) -> *mut c_void;
 }
 
@@ -609,88 +548,97 @@
     #[cfg_attr(target_os = "netbsd", link_name = "__getpwuid50")]
     pub fn getpwuid(uid: ::uid_t) -> *mut passwd;
 
-    pub fn fprintf(
-        stream: *mut ::FILE,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn fprintf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
     pub fn printf(format: *const ::c_char, ...) -> ::c_int;
-    pub fn snprintf(
-        s: *mut ::c_char,
-        n: ::size_t,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn snprintf(s: *mut ::c_char, n: ::size_t, format: *const ::c_char, ...) -> ::c_int;
     pub fn sprintf(s: *mut ::c_char, format: *const ::c_char, ...) -> ::c_int;
-    #[cfg_attr(target_os = "linux", link_name = "__isoc99_fscanf")]
-    pub fn fscanf(
-        stream: *mut ::FILE,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
-    #[cfg_attr(target_os = "linux", link_name = "__isoc99_scanf")]
+    #[cfg_attr(
+        all(target_os = "linux", not(target_env = "uclibc")),
+        link_name = "__isoc99_fscanf"
+    )]
+    pub fn fscanf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
+    #[cfg_attr(
+        all(target_os = "linux", not(target_env = "uclibc")),
+        link_name = "__isoc99_scanf"
+    )]
     pub fn scanf(format: *const ::c_char, ...) -> ::c_int;
-    #[cfg_attr(target_os = "linux", link_name = "__isoc99_sscanf")]
-    pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...)
-        -> ::c_int;
+    #[cfg_attr(
+        all(target_os = "linux", not(target_env = "uclibc")),
+        link_name = "__isoc99_sscanf"
+    )]
+    pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...) -> ::c_int;
     pub fn getchar_unlocked() -> ::c_int;
     pub fn putchar_unlocked(c: ::c_int) -> ::c_int;
 
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     #[cfg_attr(target_os = "netbsd", link_name = "__socket30")]
     #[cfg_attr(target_os = "illumos", link_name = "__xnet_socket")]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_socket")]
     pub fn socket(domain: ::c_int, ty: ::c_int, protocol: ::c_int) -> ::c_int;
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "connect$UNIX2003"
     )]
     #[cfg_attr(target_os = "illumos", link_name = "__xnet_connect")]
-    pub fn connect(
-        socket: ::c_int,
-        address: *const sockaddr,
-        len: socklen_t,
-    ) -> ::c_int;
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_connect")]
+    pub fn connect(socket: ::c_int, address: *const sockaddr, len: socklen_t) -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "listen$UNIX2003"
     )]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_listen")]
     pub fn listen(socket: ::c_int, backlog: ::c_int) -> ::c_int;
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "accept$UNIX2003"
     )]
-    pub fn accept(
-        socket: ::c_int,
-        address: *mut sockaddr,
-        address_len: *mut socklen_t,
-    ) -> ::c_int;
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_accept")]
+    pub fn accept(socket: ::c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> ::c_int;
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "getpeername$UNIX2003"
     )]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_getpeername")]
     pub fn getpeername(
         socket: ::c_int,
         address: *mut sockaddr,
         address_len: *mut socklen_t,
     ) -> ::c_int;
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "getsockname$UNIX2003"
     )]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_getsockname")]
     pub fn getsockname(
         socket: ::c_int,
         address: *mut sockaddr,
         address_len: *mut socklen_t,
     ) -> ::c_int;
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_setsockopt")]
     pub fn setsockopt(
         socket: ::c_int,
         level: ::c_int,
@@ -709,13 +657,17 @@
         protocol: ::c_int,
         socket_vector: *mut ::c_int,
     ) -> ::c_int;
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "sendto$UNIX2003"
     )]
     #[cfg_attr(target_os = "illumos", link_name = "__xnet_sendto")]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_sendto")]
     pub fn sendto(
         socket: ::c_int,
         buf: *const ::c_void,
@@ -724,6 +676,7 @@
         addr: *const sockaddr,
         addrlen: socklen_t,
     ) -> ::ssize_t;
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_shutdown")]
     pub fn shutdown(socket: ::c_int, how: ::c_int) -> ::c_int;
 
     #[cfg_attr(
@@ -867,11 +820,7 @@
         newdirfd: ::c_int,
         linkpath: *const ::c_char,
     ) -> ::c_int;
-    pub fn unlinkat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn unlinkat(dirfd: ::c_int, pathname: *const ::c_char, flags: ::c_int) -> ::c_int;
 
     pub fn access(path: *const c_char, amode: ::c_int) -> ::c_int;
     pub fn alarm(seconds: ::c_uint) -> ::c_uint;
@@ -895,16 +844,8 @@
     pub fn dup(fd: ::c_int) -> ::c_int;
     pub fn dup2(src: ::c_int, dst: ::c_int) -> ::c_int;
     pub fn execl(path: *const c_char, arg0: *const c_char, ...) -> ::c_int;
-    pub fn execle(
-        path: *const ::c_char,
-        arg0: *const ::c_char,
-        ...
-    ) -> ::c_int;
-    pub fn execlp(
-        file: *const ::c_char,
-        arg0: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn execle(path: *const ::c_char, arg0: *const ::c_char, ...) -> ::c_int;
+    pub fn execlp(file: *const ::c_char, arg0: *const ::c_char, ...) -> ::c_int;
     pub fn execv(prog: *const c_char, argv: *const *const c_char) -> ::c_int;
     pub fn execve(
         prog: *const c_char,
@@ -925,11 +866,7 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "getopt$UNIX2003"
     )]
-    pub fn getopt(
-        argc: ::c_int,
-        argv: *const *mut c_char,
-        optstr: *const c_char,
-    ) -> ::c_int;
+    pub fn getopt(argc: ::c_int, argv: *const *mut c_char, optstr: *const c_char) -> ::c_int;
     pub fn getpgid(pid: pid_t) -> pid_t;
     pub fn getpgrp() -> pid_t;
     pub fn getpid() -> pid_t;
@@ -940,17 +877,12 @@
     pub fn lseek(fd: ::c_int, offset: off_t, whence: ::c_int) -> off_t;
     pub fn pathconf(path: *const c_char, name: ::c_int) -> c_long;
     pub fn pipe(fds: *mut ::c_int) -> ::c_int;
-    pub fn posix_memalign(
-        memptr: *mut *mut ::c_void,
-        align: ::size_t,
-        size: ::size_t,
-    ) -> ::c_int;
+    pub fn posix_memalign(memptr: *mut *mut ::c_void, align: ::size_t, size: ::size_t) -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "read$UNIX2003"
     )]
-    pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t)
-        -> ::ssize_t;
+    pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t) -> ::ssize_t;
     pub fn rmdir(path: *const c_char) -> ::c_int;
     pub fn seteuid(uid: uid_t) -> ::c_int;
     pub fn setegid(gid: gid_t) -> ::c_int;
@@ -977,11 +909,7 @@
         link_name = "ttyname_r$UNIX2003"
     )]
     #[cfg_attr(target_os = "illumos", link_name = "__posix_ttyname_r")]
-    pub fn ttyname_r(
-        fd: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn ttyname_r(fd: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
     pub fn unlink(c: *const c_char) -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
@@ -992,40 +920,22 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "waitpid$UNIX2003"
     )]
-    pub fn waitpid(
-        pid: pid_t,
-        status: *mut ::c_int,
-        options: ::c_int,
-    ) -> pid_t;
+    pub fn waitpid(pid: pid_t, status: *mut ::c_int, options: ::c_int) -> pid_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "write$UNIX2003"
     )]
-    pub fn write(
-        fd: ::c_int,
-        buf: *const ::c_void,
-        count: ::size_t,
-    ) -> ::ssize_t;
+    pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::size_t) -> ::ssize_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "pread$UNIX2003"
     )]
-    pub fn pread(
-        fd: ::c_int,
-        buf: *mut ::c_void,
-        count: ::size_t,
-        offset: off_t,
-    ) -> ::ssize_t;
+    pub fn pread(fd: ::c_int, buf: *mut ::c_void, count: ::size_t, offset: off_t) -> ::ssize_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "pwrite$UNIX2003"
     )]
-    pub fn pwrite(
-        fd: ::c_int,
-        buf: *const ::c_void,
-        count: ::size_t,
-        offset: off_t,
-    ) -> ::ssize_t;
+    pub fn pwrite(fd: ::c_int, buf: *const ::c_void, count: ::size_t, offset: off_t) -> ::ssize_t;
     pub fn umask(mask: mode_t) -> mode_t;
 
     #[cfg_attr(target_os = "netbsd", link_name = "__utime50")]
@@ -1066,10 +976,7 @@
     pub fn munmap(addr: *mut ::c_void, len: ::size_t) -> ::c_int;
 
     pub fn if_nametoindex(ifname: *const c_char) -> ::c_uint;
-    pub fn if_indextoname(
-        ifindex: ::c_uint,
-        ifname: *mut ::c_char,
-    ) -> *mut ::c_char;
+    pub fn if_indextoname(ifindex: ::c_uint, ifname: *mut ::c_char) -> *mut ::c_char;
 
     #[cfg_attr(
         all(target_os = "macos", not(target_arch = "aarch64")),
@@ -1092,11 +999,7 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "setenv$UNIX2003"
     )]
-    pub fn setenv(
-        name: *const c_char,
-        val: *const c_char,
-        overwrite: ::c_int,
-    ) -> ::c_int;
+    pub fn setenv(name: *const c_char, val: *const c_char, overwrite: ::c_int) -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "unsetenv$UNIX2003"
@@ -1117,10 +1020,7 @@
         any(target_os = "macos", target_os = "ios"),
         link_name = "realpath$DARWIN_EXTSN"
     )]
-    pub fn realpath(
-        pathname: *const ::c_char,
-        resolved: *mut ::c_char,
-    ) -> *mut ::c_char;
+    pub fn realpath(pathname: *const ::c_char, resolved: *mut ::c_char) -> *mut ::c_char;
 
     pub fn flock(fd: ::c_int, operation: ::c_int) -> ::c_int;
 
@@ -1132,21 +1032,12 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "pthread_join$UNIX2003"
     )]
-    pub fn pthread_join(
-        native: ::pthread_t,
-        value: *mut *mut ::c_void,
-    ) -> ::c_int;
+    pub fn pthread_join(native: ::pthread_t, value: *mut *mut ::c_void) -> ::c_int;
     pub fn pthread_exit(value: *mut ::c_void) -> !;
     pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int;
     pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int;
-    pub fn pthread_attr_setstacksize(
-        attr: *mut ::pthread_attr_t,
-        stack_size: ::size_t,
-    ) -> ::c_int;
-    pub fn pthread_attr_setdetachstate(
-        attr: *mut ::pthread_attr_t,
-        state: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_attr_setstacksize(attr: *mut ::pthread_attr_t, stack_size: ::size_t) -> ::c_int;
+    pub fn pthread_attr_setdetachstate(attr: *mut ::pthread_attr_t, state: ::c_int) -> ::c_int;
     pub fn pthread_detach(thread: ::pthread_t) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__libc_thr_yield")]
     pub fn sched_yield() -> ::c_int;
@@ -1156,10 +1047,7 @@
     ) -> ::c_int;
     pub fn pthread_key_delete(key: pthread_key_t) -> ::c_int;
     pub fn pthread_getspecific(key: pthread_key_t) -> *mut ::c_void;
-    pub fn pthread_setspecific(
-        key: pthread_key_t,
-        value: *const ::c_void,
-    ) -> ::c_int;
+    pub fn pthread_setspecific(key: pthread_key_t, value: *const ::c_void) -> ::c_int;
     pub fn pthread_mutex_init(
         lock: *mut pthread_mutex_t,
         attr: *const pthread_mutexattr_t,
@@ -1174,30 +1062,20 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "pthread_mutexattr_destroy$UNIX2003"
     )]
-    pub fn pthread_mutexattr_destroy(
-        attr: *mut pthread_mutexattr_t,
-    ) -> ::c_int;
-    pub fn pthread_mutexattr_settype(
-        attr: *mut pthread_mutexattr_t,
-        _type: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_mutexattr_destroy(attr: *mut pthread_mutexattr_t) -> ::c_int;
+    pub fn pthread_mutexattr_settype(attr: *mut pthread_mutexattr_t, _type: ::c_int) -> ::c_int;
 
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "pthread_cond_init$UNIX2003"
     )]
-    pub fn pthread_cond_init(
-        cond: *mut pthread_cond_t,
-        attr: *const pthread_condattr_t,
-    ) -> ::c_int;
+    pub fn pthread_cond_init(cond: *mut pthread_cond_t, attr: *const pthread_condattr_t)
+        -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "pthread_cond_wait$UNIX2003"
     )]
-    pub fn pthread_cond_wait(
-        cond: *mut pthread_cond_t,
-        lock: *mut pthread_mutex_t,
-    ) -> ::c_int;
+    pub fn pthread_cond_wait(cond: *mut pthread_cond_t, lock: *mut pthread_mutex_t) -> ::c_int;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "pthread_cond_timedwait$UNIX2003"
@@ -1250,13 +1128,11 @@
         link_name = "pthread_rwlock_unlock$UNIX2003"
     )]
     pub fn pthread_rwlock_unlock(lock: *mut pthread_rwlock_t) -> ::c_int;
-    pub fn pthread_rwlockattr_init(attr: *mut pthread_rwlockattr_t)
-        -> ::c_int;
-    pub fn pthread_rwlockattr_destroy(
-        attr: *mut pthread_rwlockattr_t,
-    ) -> ::c_int;
+    pub fn pthread_rwlockattr_init(attr: *mut pthread_rwlockattr_t) -> ::c_int;
+    pub fn pthread_rwlockattr_destroy(attr: *mut pthread_rwlockattr_t) -> ::c_int;
 
     #[cfg_attr(target_os = "illumos", link_name = "__xnet_getsockopt")]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_getsockopt")]
     pub fn getsockopt(
         sockfd: ::c_int,
         level: ::c_int,
@@ -1266,38 +1142,37 @@
     ) -> ::c_int;
     pub fn raise(signum: ::c_int) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__sigaction14")]
-    pub fn sigaction(
-        signum: ::c_int,
-        act: *const sigaction,
-        oldact: *mut sigaction,
-    ) -> ::c_int;
+    pub fn sigaction(signum: ::c_int, act: *const sigaction, oldact: *mut sigaction) -> ::c_int;
 
     #[cfg_attr(target_os = "netbsd", link_name = "__utimes50")]
-    pub fn utimes(
-        filename: *const ::c_char,
-        times: *const ::timeval,
-    ) -> ::c_int;
+    pub fn utimes(filename: *const ::c_char, times: *const ::timeval) -> ::c_int;
     pub fn dlopen(filename: *const ::c_char, flag: ::c_int) -> *mut ::c_void;
     pub fn dlerror() -> *mut ::c_char;
-    pub fn dlsym(
-        handle: *mut ::c_void,
-        symbol: *const ::c_char,
-    ) -> *mut ::c_void;
+    pub fn dlsym(handle: *mut ::c_void, symbol: *const ::c_char) -> *mut ::c_void;
     pub fn dlclose(handle: *mut ::c_void) -> ::c_int;
     pub fn dladdr(addr: *const ::c_void, info: *mut Dl_info) -> ::c_int;
 
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     #[cfg_attr(target_os = "illumos", link_name = "__xnet_getaddrinfo")]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_getaddrinfo")]
     pub fn getaddrinfo(
         node: *const c_char,
         service: *const c_char,
         hints: *const addrinfo,
         res: *mut *mut addrinfo,
     ) -> ::c_int;
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_freeaddrinfo")]
     pub fn freeaddrinfo(res: *mut addrinfo);
+    pub fn hstrerror(errcode: ::c_int) -> *const ::c_char;
     pub fn gai_strerror(errcode: ::c_int) -> *const ::c_char;
     #[cfg_attr(
         any(
@@ -1308,39 +1183,44 @@
         ),
         link_name = "__res_init"
     )]
-    #[cfg_attr(
-        any(target_os = "macos", target_os = "ios"),
-        link_name = "res_9_init"
-    )]
+    #[cfg_attr(any(target_os = "macos", target_os = "ios"), link_name = "res_9_init")]
     pub fn res_init() -> ::c_int;
 
     #[cfg_attr(target_os = "netbsd", link_name = "__gmtime_r50")]
-    #[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
+    #[cfg_attr(target_env = "musl", allow(deprecated))]
+    // FIXME: for `time_t`
     pub fn gmtime_r(time_p: *const time_t, result: *mut tm) -> *mut tm;
     #[cfg_attr(target_os = "netbsd", link_name = "__localtime_r50")]
-    #[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
+    #[cfg_attr(target_env = "musl", allow(deprecated))]
+    // FIXME: for `time_t`
     pub fn localtime_r(time_p: *const time_t, result: *mut tm) -> *mut tm;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "mktime$UNIX2003"
     )]
     #[cfg_attr(target_os = "netbsd", link_name = "__mktime50")]
-    #[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
+    #[cfg_attr(target_env = "musl", allow(deprecated))]
+    // FIXME: for `time_t`
     pub fn mktime(tm: *mut tm) -> time_t;
     #[cfg_attr(target_os = "netbsd", link_name = "__time50")]
-    #[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
+    #[cfg_attr(target_env = "musl", allow(deprecated))]
+    // FIXME: for `time_t`
     pub fn time(time: *mut time_t) -> time_t;
     #[cfg_attr(target_os = "netbsd", link_name = "__gmtime50")]
-    #[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
+    #[cfg_attr(target_env = "musl", allow(deprecated))]
+    // FIXME: for `time_t`
     pub fn gmtime(time_p: *const time_t) -> *mut tm;
     #[cfg_attr(target_os = "netbsd", link_name = "__locatime50")]
-    #[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
+    #[cfg_attr(target_env = "musl", allow(deprecated))]
+    // FIXME: for `time_t`
     pub fn localtime(time_p: *const time_t) -> *mut tm;
     #[cfg_attr(target_os = "netbsd", link_name = "__difftime50")]
-    #[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
+    #[cfg_attr(target_env = "musl", allow(deprecated))]
+    // FIXME: for `time_t`
     pub fn difftime(time1: time_t, time0: time_t) -> ::c_double;
     #[cfg_attr(target_os = "netbsd", link_name = "__timegm50")]
-    #[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
+    #[cfg_attr(target_env = "musl", allow(deprecated))]
+    // FIXME: for `time_t`
     pub fn timegm(tm: *mut ::tm) -> time_t;
 
     #[cfg_attr(target_os = "netbsd", link_name = "__mknod50")]
@@ -1348,21 +1228,11 @@
         all(target_os = "freebsd", any(freebsd11, freebsd10)),
         link_name = "mknod@FBSD_1.0"
     )]
-    pub fn mknod(
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-        dev: ::dev_t,
-    ) -> ::c_int;
+    pub fn mknod(pathname: *const ::c_char, mode: ::mode_t, dev: ::dev_t) -> ::c_int;
     pub fn gethostname(name: *mut ::c_char, len: ::size_t) -> ::c_int;
     pub fn endservent();
-    pub fn getservbyname(
-        name: *const ::c_char,
-        proto: *const ::c_char,
-    ) -> *mut servent;
-    pub fn getservbyport(
-        port: ::c_int,
-        proto: *const ::c_char,
-    ) -> *mut servent;
+    pub fn getservbyname(name: *const ::c_char, proto: *const ::c_char) -> *mut servent;
+    pub fn getservbyport(port: ::c_int, proto: *const ::c_char) -> *mut servent;
     pub fn getservent() -> *mut servent;
     pub fn setservent(stayopen: ::c_int);
     pub fn getprotobyname(name: *const ::c_char) -> *mut protoent;
@@ -1377,22 +1247,14 @@
         all(target_os = "macos", target_arch = "x86"),
         link_name = "send$UNIX2003"
     )]
-    pub fn send(
-        socket: ::c_int,
-        buf: *const ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_send")]
+    pub fn send(socket: ::c_int, buf: *const ::c_void, len: ::size_t, flags: ::c_int) -> ::ssize_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "recv$UNIX2003"
     )]
-    pub fn recv(
-        socket: ::c_int,
-        buf: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    #[cfg_attr(target_os = "espidf", link_name = "lwip_recv")]
+    pub fn recv(socket: ::c_int, buf: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::ssize_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "putenv$UNIX2003"
@@ -1421,10 +1283,7 @@
         timeout: *mut timeval,
     ) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__setlocale50")]
-    pub fn setlocale(
-        category: ::c_int,
-        locale: *const ::c_char,
-    ) -> *mut ::c_char;
+    pub fn setlocale(category: ::c_int, locale: *const ::c_char) -> *mut ::c_char;
     pub fn localeconv() -> *mut lconv;
 
     #[cfg_attr(
@@ -1437,11 +1296,7 @@
     pub fn statvfs(path: *const c_char, buf: *mut statvfs) -> ::c_int;
     pub fn fstatvfs(fd: ::c_int, buf: *mut statvfs) -> ::c_int;
 
-    pub fn readlink(
-        path: *const c_char,
-        buf: *mut c_char,
-        bufsz: ::size_t,
-    ) -> ::ssize_t;
+    pub fn readlink(path: *const c_char, buf: *mut c_char, bufsz: ::size_t) -> ::ssize_t;
 
     #[cfg_attr(target_os = "netbsd", link_name = "__sigemptyset14")]
     pub fn sigemptyset(set: *mut sigset_t) -> ::c_int;
@@ -1455,11 +1310,7 @@
     pub fn sigismember(set: *const sigset_t, signum: ::c_int) -> ::c_int;
 
     #[cfg_attr(target_os = "netbsd", link_name = "__sigprocmask14")]
-    pub fn sigprocmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn sigprocmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__sigpending14")]
     pub fn sigpending(set: *mut sigset_t) -> ::c_int;
 
@@ -1484,11 +1335,7 @@
         timeout: *const timespec,
         sigmask: *const sigset_t,
     ) -> ::c_int;
-    pub fn fseeko(
-        stream: *mut ::FILE,
-        offset: ::off_t,
-        whence: ::c_int,
-    ) -> ::c_int;
+    pub fn fseeko(stream: *mut ::FILE, offset: ::off_t, whence: ::c_int) -> ::c_int;
     pub fn ftello(stream: *mut ::FILE) -> ::off_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
@@ -1500,11 +1347,7 @@
     pub fn cfsetispeed(termios: *mut ::termios, speed: ::speed_t) -> ::c_int;
     pub fn cfsetospeed(termios: *mut ::termios, speed: ::speed_t) -> ::c_int;
     pub fn tcgetattr(fd: ::c_int, termios: *mut ::termios) -> ::c_int;
-    pub fn tcsetattr(
-        fd: ::c_int,
-        optional_actions: ::c_int,
-        termios: *const ::termios,
-    ) -> ::c_int;
+    pub fn tcsetattr(fd: ::c_int, optional_actions: ::c_int, termios: *const ::termios) -> ::c_int;
     pub fn tcflow(fd: ::c_int, action: ::c_int) -> ::c_int;
     pub fn tcflush(fd: ::c_int, action: ::c_int) -> ::c_int;
     pub fn tcgetsid(fd: ::c_int) -> ::pid_t;
@@ -1531,17 +1374,20 @@
     pub fn unlockpt(fd: ::c_int) -> ::c_int;
 
     pub fn strcasestr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
-    pub fn getline(
-        lineptr: *mut *mut c_char,
-        n: *mut size_t,
-        stream: *mut FILE,
-    ) -> ssize_t;
+    pub fn getline(lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
 
-    pub fn lockf(
-        fd: ::c_int,
-        cmd: ::c_int,
-        len: ::off_t,
-    ) -> ::c_int;
+    pub fn lockf(fd: ::c_int, cmd: ::c_int, len: ::off_t) -> ::c_int;
+}
+
+cfg_if! {
+    if #[cfg(not(target_env = "uclibc"))] {
+        extern "C" {
+            pub fn open_wmemstream(
+                ptr: *mut *mut wchar_t,
+                sizeloc: *mut size_t,
+            ) -> *mut FILE;
+        }
+    }
 }
 
 cfg_if! {
@@ -1599,13 +1445,11 @@
 }
 
 cfg_if! {
-    if #[cfg(target_env = "uclibc")] {
-        mod uclibc;
-        pub use self::uclibc::*;
-    } else if #[cfg(target_env = "newlib")] {
+    if #[cfg(target_env = "newlib")] {
         mod newlib;
         pub use self::newlib::*;
     } else if #[cfg(any(target_os = "linux",
+                        target_os = "l4re",
                         target_os = "android",
                         target_os = "emscripten"))] {
         mod linux_like;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/newlib/espidf/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/newlib/espidf/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/newlib/espidf/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/newlib/espidf/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,103 @@
+pub type clock_t = ::c_ulong;
+pub type c_char = i8;
+pub type wchar_t = u32;
+
+pub type c_long = i32;
+pub type c_ulong = u32;
+
+s! {
+    pub struct cmsghdr {
+        pub cmsg_len: ::socklen_t,
+        pub cmsg_level: ::c_int,
+        pub cmsg_type: ::c_int,
+    }
+
+    pub struct msghdr {
+        pub msg_name: *mut ::c_void,
+        pub msg_namelen: ::socklen_t,
+        pub msg_iov: *mut ::iovec,
+        pub msg_iovlen: ::c_int,
+        pub msg_control: *mut ::c_void,
+        pub msg_controllen: ::socklen_t,
+        pub msg_flags: ::c_int,
+    }
+
+    pub struct sockaddr_un {
+        pub sun_family: ::sa_family_t,
+        pub sun_path: [::c_char; 108],
+    }
+
+    pub struct sockaddr {
+        pub sa_len: u8,
+        pub sa_family: ::sa_family_t,
+        pub sa_data: [::c_char; 14],
+    }
+
+    pub struct sockaddr_in6 {
+        pub sin6_len: u8,
+        pub sin6_family: ::sa_family_t,
+        pub sin6_port: ::in_port_t,
+        pub sin6_flowinfo: u32,
+        pub sin6_addr: ::in6_addr,
+        pub sin6_scope_id: u32,
+    }
+
+    pub struct sockaddr_in {
+        pub sin_len: u8,
+        pub sin_family: ::sa_family_t,
+        pub sin_port: ::in_port_t,
+        pub sin_addr: ::in_addr,
+        pub sin_zero: [::c_char; 8],
+    }
+
+    pub struct sockaddr_storage {
+        pub s2_len: u8,
+        pub ss_family: ::sa_family_t,
+        pub s2_data1: [::c_char; 2],
+        pub s2_data2: [u32; 3],
+        pub s2_data3: [u32; 3],
+    }
+}
+
+pub const AF_UNIX: ::c_int = 1;
+pub const AF_INET6: ::c_int = 10;
+
+pub const FIONBIO: ::c_ulong = 2147772030;
+
+pub const POLLIN: ::c_short = 1 << 0;
+pub const POLLRDNORM: ::c_short = 1 << 1;
+pub const POLLRDBAND: ::c_short = 1 << 2;
+pub const POLLPRI: ::c_short = POLLRDBAND;
+pub const POLLOUT: ::c_short = 1 << 3;
+pub const POLLWRNORM: ::c_short = POLLOUT;
+pub const POLLWRBAND: ::c_short = 1 << 4;
+pub const POLLERR: ::c_short = 1 << 5;
+pub const POLLHUP: ::c_short = 1 << 6;
+
+pub const SOL_SOCKET: ::c_int = 0xfff;
+
+pub const MSG_OOB: ::c_int = 0x04;
+pub const MSG_PEEK: ::c_int = 0x01;
+pub const MSG_DONTWAIT: ::c_int = 0x08;
+pub const MSG_DONTROUTE: ::c_int = 0x4;
+pub const MSG_WAITALL: ::c_int = 0x02;
+pub const MSG_MORE: ::c_int = 0x10;
+pub const MSG_NOSIGNAL: ::c_int = 0x20;
+
+pub const PTHREAD_STACK_MIN: ::size_t = 768;
+
+extern "C" {
+    pub fn pthread_create(
+        native: *mut ::pthread_t,
+        attr: *const ::pthread_attr_t,
+        f: extern "C" fn(_: *mut ::c_void) -> *mut ::c_void,
+        value: *mut ::c_void,
+    ) -> ::c_int;
+
+    pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
+
+    #[link_name = "lwip_sendmsg"]
+    pub fn sendmsg(s: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
+    #[link_name = "lwip_recvmsg"]
+    pub fn recvmsg(s: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/newlib/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/newlib/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/newlib/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/newlib/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,16 +33,14 @@
         pub ai_protocol: ::c_int,
         pub ai_addrlen: socklen_t,
 
-        #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-              target_vendor = "nintendo")))]
-        #[cfg(target_arch = "xtensa")]
+        #[cfg(target_os = "espidf")]
         pub ai_addr: *mut sockaddr,
 
         pub ai_canonname: *mut ::c_char,
 
-        #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-              target_vendor = "nintendo")))]
-        #[cfg(not(target_arch = "xtensa"))]
+        #[cfg(not(any(
+            target_os = "espidf",
+            all(libc_cfg_target_vendor, target_arch = "powerpc", target_vendor = "nintendo"))))]
         pub ai_addr: *mut sockaddr,
 
         pub ai_next: *mut addrinfo,
@@ -232,23 +230,37 @@
 // unverified constants
 align_const! {
     pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
-        size: [0; __SIZEOF_PTHREAD_MUTEX_T],
+        size: [__PTHREAD_INITIALIZER_BYTE; __SIZEOF_PTHREAD_MUTEX_T],
     };
     pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t {
-        size: [0; __SIZEOF_PTHREAD_COND_T],
+        size: [__PTHREAD_INITIALIZER_BYTE; __SIZEOF_PTHREAD_COND_T],
     };
     pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
-        size: [0; __SIZEOF_PTHREAD_RWLOCK_T],
+        size: [__PTHREAD_INITIALIZER_BYTE; __SIZEOF_PTHREAD_RWLOCK_T],
     };
 }
 pub const NCCS: usize = 32;
-pub const __SIZEOF_PTHREAD_ATTR_T: usize = 56;
-pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
-pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
-pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
-pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
-pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
-pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 8;
+cfg_if! {
+    if #[cfg(target_os = "espidf")] {
+        const __PTHREAD_INITIALIZER_BYTE: u8 = 0xff;
+        pub const __SIZEOF_PTHREAD_ATTR_T: usize = 32;
+        pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 4;
+        pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 12;
+        pub const __SIZEOF_PTHREAD_COND_T: usize = 4;
+        pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 8;
+        pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 4;
+        pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 12;
+    } else {
+        const __PTHREAD_INITIALIZER_BYTE: u8 = 0;
+        pub const __SIZEOF_PTHREAD_ATTR_T: usize = 56;
+        pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
+        pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
+        pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
+        pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
+        pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
+        pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 8;
+    }
+}
 pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 32;
 pub const __SIZEOF_PTHREAD_BARRIERATTR_T: usize = 4;
 pub const __PTHREAD_MUTEX_HAVE_PREV: usize = 1;
@@ -558,7 +570,7 @@
         return
     }
 
-    pub fn FD_ISSET(fd: ::c_int, set: *mut fd_set) -> bool {
+    pub fn FD_ISSET(fd: ::c_int, set: *const fd_set) -> bool {
         let bits = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
         let fd = fd as usize;
         return ((*set).fds_bits[fd / bits] & (1 << (fd % bits))) != 0
@@ -583,18 +595,10 @@
     pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
 
     #[cfg_attr(target_os = "linux", link_name = "__xpg_strerror_r")]
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
 
     pub fn abs(i: ::c_int) -> ::c_int;
     pub fn atof(s: *const ::c_char) -> ::c_double;
@@ -602,26 +606,22 @@
     pub fn rand() -> ::c_int;
     pub fn srand(seed: ::c_uint);
 
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
-    pub fn bind(fd: ::c_int, addr: *const sockaddr, len: socklen_t)
-        -> ::c_int;
-    pub fn clock_settime(
-        clock_id: ::clockid_t,
-        tp: *const ::timespec,
-    ) -> ::c_int;
-    pub fn clock_gettime(
-        clock_id: ::clockid_t,
-        tp: *mut ::timespec,
-    ) -> ::c_int;
-    pub fn clock_getres(
-        clock_id: ::clockid_t,
-        res: *mut ::timespec,
-    ) -> ::c_int;
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
+    pub fn bind(fd: ::c_int, addr: *const sockaddr, len: socklen_t) -> ::c_int;
+    pub fn clock_settime(clock_id: ::clockid_t, tp: *const ::timespec) -> ::c_int;
+    pub fn clock_gettime(clock_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
+    pub fn clock_getres(clock_id: ::clockid_t, res: *mut ::timespec) -> ::c_int;
     pub fn closesocket(sockfd: ::c_int) -> ::c_int;
     pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     pub fn recvfrom(
         fd: ::c_int,
         buf: *mut ::c_void,
@@ -630,8 +630,11 @@
         addr: *mut sockaddr,
         addr_len: *mut socklen_t,
     ) -> isize;
-    #[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
-          target_vendor = "nintendo")))]
+    #[cfg(not(all(
+        libc_cfg_target_vendor,
+        target_arch = "powerpc",
+        target_vendor = "nintendo"
+    )))]
     pub fn getnameinfo(
         sa: *const sockaddr,
         salen: socklen_t,
@@ -665,11 +668,7 @@
         buflen: ::size_t,
         result: *mut *mut ::group,
     ) -> ::c_int;
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sem_open(name: *const ::c_char, oflag: ::c_int, ...) -> *mut sem_t;
     pub fn getgrnam(name: *const ::c_char) -> *mut ::group;
     pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
@@ -701,15 +700,15 @@
 }
 
 cfg_if! {
-    if #[cfg(target_arch = "arm")] {
+    if #[cfg(target_os = "espidf")] {
+        mod espidf;
+        pub use self::espidf::*;
+    } else if #[cfg(target_arch = "arm")] {
         mod arm;
         pub use self::arm::*;
     } else if #[cfg(target_arch = "aarch64")] {
         mod aarch64;
         pub use self::aarch64::*;
-    } else if #[cfg(target_arch = "xtensa")] {
-        mod xtensa;
-        pub use self::xtensa::*;
     } else if #[cfg(target_arch = "powerpc")] {
         mod powerpc;
         pub use self::powerpc::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/newlib/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/newlib/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/newlib/no_align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/newlib/no_align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,5 +47,5 @@
                 size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
             }
         }
-    }
+    };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/newlib/xtensa/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/newlib/xtensa/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/newlib/xtensa/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/newlib/xtensa/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-pub type clock_t = ::c_ulong;
-pub type c_char = i8;
-pub type wchar_t = u32;
-
-pub type c_long = i32;
-pub type c_ulong = u32;
-
-s! {
-    pub struct cmsghdr {
-        pub cmsg_len: ::socklen_t,
-        pub cmsg_level: ::c_int,
-        pub cmsg_type: ::c_int,
-    }
-
-    pub struct msghdr {
-        pub msg_name: *mut ::c_void,
-        pub msg_namelen: ::socklen_t,
-        pub msg_iov: *mut ::iovec,
-        pub msg_iovlen: ::c_int,
-        pub msg_control: *mut ::c_void,
-        pub msg_controllen: ::socklen_t,
-        pub msg_flags: ::c_int,
-    }
-
-    pub struct sockaddr_un {
-        pub sun_family: ::sa_family_t,
-        pub sun_path: [::c_char; 108],
-    }
-
-    pub struct sockaddr {
-        pub sa_len: u8,
-        pub sa_family: ::sa_family_t,
-        pub sa_data: [::c_char; 14],
-    }
-
-    pub struct sockaddr_in6 {
-        pub sin6_len: u8,
-        pub sin6_family: ::sa_family_t,
-        pub sin6_port: ::in_port_t,
-        pub sin6_flowinfo: u32,
-        pub sin6_addr: ::in6_addr,
-        pub sin6_scope_id: u32,
-    }
-
-    pub struct sockaddr_in {
-        pub sin_len: u8,
-        pub sin_family: ::sa_family_t,
-        pub sin_port: ::in_port_t,
-        pub sin_addr: ::in_addr,
-        pub sin_zero: [::c_char; 8],
-    }
-
-    pub struct sockaddr_storage {
-        pub s2_len: u8,
-        pub ss_family: ::sa_family_t,
-        pub s2_data1: [::c_char; 2],
-        pub s2_data2: [u32; 3],
-        pub s2_data3: [u32; 3],
-    }
-}
-
-pub const AF_UNIX: ::c_int = 1;
-pub const AF_INET6: ::c_int = 10;
-
-pub const FIONBIO: ::c_ulong = 2147772030;
-
-pub const POLLIN: ::c_short = 1 << 0;
-pub const POLLRDNORM: ::c_short = 1 << 1;
-pub const POLLRDBAND: ::c_short = 1 << 2;
-pub const POLLPRI: ::c_short = POLLRDBAND;
-pub const POLLOUT: ::c_short = 1 << 3;
-pub const POLLWRNORM: ::c_short = POLLOUT;
-pub const POLLWRBAND: ::c_short = 1 << 4;
-pub const POLLERR: ::c_short = 1 << 5;
-pub const POLLHUP: ::c_short = 1 << 6;
-
-pub const SOL_SOCKET: ::c_int = 0xfff;
-
-pub const MSG_OOB: ::c_int = 0x04;
-pub const MSG_PEEK: ::c_int = 0x01;
-pub const MSG_DONTWAIT: ::c_int = 0x08;
-pub const MSG_DONTROUTE: ::c_int = 0x4;
-pub const MSG_WAITALL: ::c_int = 0x02;
-pub const MSG_MORE: ::c_int = 0x10;
-pub const MSG_NOSIGNAL: ::c_int = 0x20;
-
-extern "C" {
-    pub fn sendmsg(
-        s: ::c_int,
-        msg: *const ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn recvmsg(
-        s: ::c_int,
-        msg: *mut ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-
-    pub fn writev(s: ::c_int, iov: *const ::iovec, iovcnt: ::c_int)
-        -> ::c_int;
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/redox/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/redox/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/redox/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/redox/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -439,7 +439,25 @@
 pub const O_NOFOLLOW: ::c_int = -0x8000_0000;
 
 // netdb.h
+pub const AI_PASSIVE: ::c_int = 0x0001;
+pub const AI_CANONNAME: ::c_int = 0x0002;
+pub const AI_NUMERICHOST: ::c_int = 0x0004;
+pub const AI_V4MAPPED: ::c_int = 0x0008;
+pub const AI_ALL: ::c_int = 0x0010;
+pub const AI_ADDRCONFIG: ::c_int = 0x0020;
+pub const AI_NUMERICSERV: ::c_int = 0x0400;
+pub const EAI_BADFLAGS: ::c_int = -1;
+pub const EAI_NONAME: ::c_int = -2;
+pub const EAI_AGAIN: ::c_int = -3;
+pub const EAI_FAIL: ::c_int = -4;
+pub const EAI_NODATA: ::c_int = -5;
+pub const EAI_FAMILY: ::c_int = -6;
+pub const EAI_SOCKTYPE: ::c_int = -7;
+pub const EAI_SERVICE: ::c_int = -8;
+pub const EAI_ADDRFAMILY: ::c_int = -9;
+pub const EAI_MEMORY: ::c_int = -10;
 pub const EAI_SYSTEM: ::c_int = -11;
+pub const EAI_OVERFLOW: ::c_int = -12;
 pub const NI_MAXHOST: ::c_int = 1025;
 pub const NI_MAXSERV: ::c_int = 32;
 pub const NI_NUMERICHOST: ::c_int = 0x0001;
@@ -674,25 +692,24 @@
 pub const SOL_SOCKET: ::c_int = 1;
 
 // sys/termios.h
-pub const NCCS: usize = 32;
-
-pub const VINTR: usize = 0;
-pub const VQUIT: usize = 1;
-pub const VERASE: usize = 2;
-pub const VKILL: usize = 3;
-pub const VEOF: usize = 4;
-pub const VTIME: usize = 5;
-pub const VMIN: usize = 6;
+pub const VEOF: usize = 0;
+pub const VEOL: usize = 1;
+pub const VEOL2: usize = 2;
+pub const VERASE: usize = 3;
+pub const VWERASE: usize = 4;
+pub const VKILL: usize = 5;
+pub const VREPRINT: usize = 6;
 pub const VSWTC: usize = 7;
-pub const VSTART: usize = 8;
-pub const VSTOP: usize = 9;
+pub const VINTR: usize = 8;
+pub const VQUIT: usize = 9;
 pub const VSUSP: usize = 10;
-pub const VEOL: usize = 11;
-pub const VREPRINT: usize = 12;
-pub const VDISCARD: usize = 13;
-pub const VWERASE: usize = 14;
-pub const VLNEXT: usize = 15;
-pub const VEOL2: usize = 16;
+pub const VSTART: usize = 12;
+pub const VSTOP: usize = 13;
+pub const VLNEXT: usize = 14;
+pub const VDISCARD: usize = 15;
+pub const VMIN: usize = 16;
+pub const VTIME: usize = 17;
+pub const NCCS: usize = 32;
 
 pub const IGNBRK: ::tcflag_t = 0o000_001;
 pub const BRKINT: ::tcflag_t = 0o000_002;
@@ -703,25 +720,17 @@
 pub const INLCR: ::tcflag_t = 0o000_100;
 pub const IGNCR: ::tcflag_t = 0o000_200;
 pub const ICRNL: ::tcflag_t = 0o000_400;
-pub const IUCLC: ::tcflag_t = 0o001_000;
-pub const IXON: ::tcflag_t = 0o002_000;
-pub const IXANY: ::tcflag_t = 0o004_000;
-pub const IXOFF: ::tcflag_t = 0o010_000;
-pub const IMAXBEL: ::tcflag_t = 0o020_000;
-pub const IUTF8: ::tcflag_t = 0o040_000;
+pub const IXON: ::tcflag_t = 0o001_000;
+pub const IXOFF: ::tcflag_t = 0o002_000;
 
 pub const OPOST: ::tcflag_t = 0o000_001;
-pub const OLCUC: ::tcflag_t = 0o000_002;
-pub const ONLCR: ::tcflag_t = 0o000_004;
+pub const ONLCR: ::tcflag_t = 0o000_002;
+pub const OLCUC: ::tcflag_t = 0o000_004;
 pub const OCRNL: ::tcflag_t = 0o000_010;
 pub const ONOCR: ::tcflag_t = 0o000_020;
-pub const ONLRET: ::tcflag_t = 0o00_0040;
-pub const OFILL: ::tcflag_t = 0o000_100;
-pub const OFDEL: ::tcflag_t = 0o000_200;
-
-pub const VTDLY: usize = 0o040_000;
-pub const VT0: usize = 0o000_000;
-pub const VT1: usize = 0o040_000;
+pub const ONLRET: ::tcflag_t = 0o000_040;
+pub const OFILL: ::tcflag_t = 0o0000_100;
+pub const OFDEL: ::tcflag_t = 0o0000_200;
 
 pub const B0: speed_t = 0o000_000;
 pub const B50: speed_t = 0o000_001;
@@ -740,43 +749,45 @@
 pub const B19200: speed_t = 0o000_016;
 pub const B38400: speed_t = 0o000_017;
 
-pub const B57600: speed_t = 0o010_001;
-pub const B115200: speed_t = 0o010_002;
-pub const B230400: speed_t = 0o010_003;
-pub const B460800: speed_t = 0o010_004;
-pub const B500000: speed_t = 0o010_005;
-pub const B576000: speed_t = 0o010_006;
-pub const B921600: speed_t = 0o010_007;
-pub const B1000000: speed_t = 0o010_010;
-pub const B1152000: speed_t = 0o010_011;
-pub const B1500000: speed_t = 0o010_012;
-pub const B2000000: speed_t = 0o010_013;
-pub const B2500000: speed_t = 0o010_014;
-pub const B3000000: speed_t = 0o010_015;
-pub const B3500000: speed_t = 0o010_016;
-pub const B4000000: speed_t = 0o010_017;
+pub const B57600: speed_t = 0o0_020;
+pub const B115200: speed_t = 0o0_021;
+pub const B230400: speed_t = 0o0_022;
+pub const B460800: speed_t = 0o0_023;
+pub const B500000: speed_t = 0o0_024;
+pub const B576000: speed_t = 0o0_025;
+pub const B921600: speed_t = 0o0_026;
+pub const B1000000: speed_t = 0o0_027;
+pub const B1152000: speed_t = 0o0_030;
+pub const B1500000: speed_t = 0o0_031;
+pub const B2000000: speed_t = 0o0_032;
+pub const B2500000: speed_t = 0o0_033;
+pub const B3000000: speed_t = 0o0_034;
+pub const B3500000: speed_t = 0o0_035;
+pub const B4000000: speed_t = 0o0_036;
 
-pub const CSIZE: ::tcflag_t = 0o000_060;
+pub const CSIZE: ::tcflag_t = 0o001_400;
 pub const CS5: ::tcflag_t = 0o000_000;
-pub const CS6: ::tcflag_t = 0o000_020;
-pub const CS7: ::tcflag_t = 0o000_040;
-pub const CS8: ::tcflag_t = 0o000_060;
-pub const CSTOPB: ::tcflag_t = 0o000_100;
-pub const CREAD: ::tcflag_t = 0o000_200;
-pub const PARENB: ::tcflag_t = 0o000_400;
-pub const PARODD: ::tcflag_t = 0o001_000;
-pub const HUPCL: ::tcflag_t = 0o002_000;
-pub const CLOCAL: ::tcflag_t = 0o004_000;
-
-pub const ISIG: ::tcflag_t = 0o000_001;
-pub const ICANON: ::tcflag_t = 0o000_002;
-pub const ECHO: ::tcflag_t = 0o000_010;
-pub const ECHOE: ::tcflag_t = 0o000_020;
-pub const ECHOK: ::tcflag_t = 0o000_040;
-pub const ECHONL: ::tcflag_t = 0o000_100;
-pub const NOFLSH: ::tcflag_t = 0o000_200;
-pub const TOSTOP: ::tcflag_t = 0o000_400;
-pub const IEXTEN: ::tcflag_t = 0o100_000;
+pub const CS6: ::tcflag_t = 0o000_400;
+pub const CS7: ::tcflag_t = 0o001_000;
+pub const CS8: ::tcflag_t = 0o001_400;
+
+pub const CSTOPB: ::tcflag_t = 0o002_000;
+pub const CREAD: ::tcflag_t = 0o004_000;
+pub const PARENB: ::tcflag_t = 0o010_000;
+pub const PARODD: ::tcflag_t = 0o020_000;
+pub const HUPCL: ::tcflag_t = 0o040_000;
+
+pub const CLOCAL: ::tcflag_t = 0o0100000;
+
+pub const ISIG: ::tcflag_t = 0x0000_0080;
+pub const ICANON: ::tcflag_t = 0x0000_0100;
+pub const ECHO: ::tcflag_t = 0x0000_0008;
+pub const ECHOE: ::tcflag_t = 0x0000_0002;
+pub const ECHOK: ::tcflag_t = 0x0000_0004;
+pub const ECHONL: ::tcflag_t = 0x0000_0010;
+pub const NOFLSH: ::tcflag_t = 0x8000_0000;
+pub const TOSTOP: ::tcflag_t = 0x0040_0000;
+pub const IEXTEN: ::tcflag_t = 0x0000_0400;
 
 pub const TCOOFF: ::c_int = 0;
 pub const TCOON: ::c_int = 1;
@@ -880,7 +891,7 @@
         return
     }
 
-    pub fn FD_ISSET(fd: ::c_int, set: *mut fd_set) -> bool {
+    pub fn FD_ISSET(fd: ::c_int, set: *const fd_set) -> bool {
         let fd = fd as usize;
         let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
         return ((*set).fds_bits[fd / size] & (1 << (fd % size))) != 0
@@ -937,11 +948,7 @@
 extern "C" {
     // errno.h
     pub fn __errno_location() -> *mut ::c_int;
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     // unistd.h
     pub fn pipe2(fds: *mut ::c_int, flags: ::c_int) -> ::c_int;
@@ -949,6 +956,17 @@
     // malloc.h
     pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
 
+    // netdb.h
+    pub fn getnameinfo(
+        addr: *const ::sockaddr,
+        addrlen: ::socklen_t,
+        host: *mut ::c_char,
+        hostlen: ::socklen_t,
+        serv: *mut ::c_char,
+        servlen: ::socklen_t,
+        flags: ::c_int,
+    ) -> ::c_int;
+
     // pthread.h
     pub fn pthread_atfork(
         prepare: ::Option<unsafe extern "C" fn()>,
@@ -991,32 +1009,16 @@
         maxevents: ::c_int,
         timeout: ::c_int,
     ) -> ::c_int;
-    pub fn epoll_ctl(
-        epfd: ::c_int,
-        op: ::c_int,
-        fd: ::c_int,
-        event: *mut ::epoll_event,
-    ) -> ::c_int;
+    pub fn epoll_ctl(epfd: ::c_int, op: ::c_int, fd: ::c_int, event: *mut ::epoll_event)
+        -> ::c_int;
 
     // sys/ioctl.h
     pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
 
     // sys/mman.h
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
-    pub fn shm_open(
-        name: *const c_char,
-        oflag: ::c_int,
-        mode: mode_t,
-    ) -> ::c_int;
+    pub fn msync(addr: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::c_int;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
+    pub fn shm_open(name: *const c_char, oflag: ::c_int, mode: mode_t) -> ::c_int;
     pub fn shm_unlink(name: *const ::c_char) -> ::c_int;
 
     // sys/resource.h
@@ -1024,11 +1026,7 @@
     pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
 
     // sys/socket.h
-    pub fn bind(
-        socket: ::c_int,
-        address: *const ::sockaddr,
-        address_len: ::socklen_t,
-    ) -> ::c_int;
+    pub fn bind(socket: ::c_int, address: *const ::sockaddr, address_len: ::socklen_t) -> ::c_int;
     pub fn recvfrom(
         socket: ::c_int,
         buf: *mut ::c_void,
@@ -1042,16 +1040,8 @@
     pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
 
     // sys/uio.h
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
+    pub fn readv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
 
     // sys/utsname.h
     pub fn uname(utsname: *mut utsname) -> ::c_int;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/solarish/compat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/solarish/compat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/solarish/compat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/solarish/compat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,15 +7,8 @@
 const LDTERM: &[u8] = b"ldterm\0";
 
 pub unsafe fn cfmakeraw(termios: *mut ::termios) {
-    (*termios).c_iflag &= !(IMAXBEL
-        | IGNBRK
-        | BRKINT
-        | PARMRK
-        | ISTRIP
-        | INLCR
-        | IGNCR
-        | ICRNL
-        | IXON);
+    (*termios).c_iflag &=
+        !(IMAXBEL | IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
     (*termios).c_oflag &= !OPOST;
     (*termios).c_lflag &= !(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
     (*termios).c_cflag &= !(CSIZE | PARENB);
@@ -38,10 +31,7 @@
     (*termios).c_cc[VTIME] = 0;
 }
 
-pub unsafe fn cfsetspeed(
-    termios: *mut ::termios,
-    speed: ::speed_t,
-) -> ::c_int {
+pub unsafe fn cfsetspeed(termios: *mut ::termios, speed: ::speed_t) -> ::c_int {
     // Neither of these functions on illumos or Solaris actually ever
     // return an error
     ::cfsetispeed(termios, speed);
@@ -100,9 +90,7 @@
     } else if setup == 0 {
         // The line discipline is not present, so push the appropriate STREAMS
         // modules for the subordinate device:
-        if ::ioctl(fds, I_PUSH, PTEM.as_ptr()) < 0
-            || ::ioctl(fds, I_PUSH, LDTERM.as_ptr()) < 0
-        {
+        if ::ioctl(fds, I_PUSH, PTEM.as_ptr()) < 0 || ::ioctl(fds, I_PUSH, LDTERM.as_ptr()) < 0 {
             return bail(fdm, fds);
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/solarish/illumos.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/solarish/illumos.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/solarish/illumos.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/solarish/illumos.rs	2021-12-09 12:01:26.000000000 +0000
@@ -27,12 +27,22 @@
 pub const TCP_KEEPINTVL: ::c_int = 36;
 pub const TCP_CONGESTION: ::c_int = 37;
 
+pub const F_OFD_GETLK: ::c_int = 50;
+pub const F_OFD_SETLKL: ::c_int = 51;
+pub const F_OFD_SETLKW: ::c_int = 52;
+pub const F_FLOCK: ::c_int = 55;
+pub const F_FLOCKW: ::c_int = 56;
+
 extern "C" {
     pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int;
 
-    pub fn mincore(
-        addr: ::caddr_t,
-        len: ::size_t,
-        vec: *mut ::c_char,
+    pub fn mincore(addr: ::caddr_t, len: ::size_t, vec: *mut ::c_char) -> ::c_int;
+
+    pub fn pset_bind_lwp(
+        pset: ::psetid_t,
+        id: ::id_t,
+        pid: ::pid_t,
+        opset: *mut ::psetid_t,
     ) -> ::c_int;
+    pub fn pset_getloadavg(pset: ::psetid_t, load: *mut ::c_double, num: ::c_int) -> ::c_int;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/solarish/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/solarish/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/solarish/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/solarish/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,10 +20,13 @@
 pub type speed_t = ::c_uint;
 pub type tcflag_t = ::c_uint;
 pub type time_t = ::c_long;
+pub type timer_t = ::c_int;
 pub type wchar_t = ::c_int;
 pub type nfds_t = ::c_ulong;
 pub type projid_t = ::c_int;
 pub type zoneid_t = ::c_int;
+pub type psetid_t = ::c_int;
+pub type processorid_t = ::c_int;
 
 pub type suseconds_t = ::c_long;
 pub type off_t = ::c_long;
@@ -120,6 +123,11 @@
         pub ifa_data: *mut ::c_void
     }
 
+    pub struct itimerspec {
+        pub it_interval: ::timespec,
+        pub it_value: ::timespec,
+    }
+
     pub struct tm {
         pub tm_sec: ::c_int,
         pub tm_min: ::c_int,
@@ -364,6 +372,11 @@
         pub portev_user: *mut ::c_void,
     }
 
+    pub struct port_notify {
+        pub portnfy_port: ::c_int,
+        pub portnfy_user: *mut ::c_void,
+    }
+
     pub struct exit_status {
         e_termination: ::c_short,
         e_exit: ::c_short,
@@ -935,10 +948,15 @@
 pub const SIGEV_SIGNAL: ::c_int = 2;
 pub const SIGEV_THREAD: ::c_int = 3;
 
+pub const IP_RECVDSTADDR: ::c_int = 0x7;
+pub const IP_SEC_OPT: ::c_int = 0x22;
+
 pub const IPV6_UNICAST_HOPS: ::c_int = 0x5;
 pub const IPV6_MULTICAST_IF: ::c_int = 0x6;
 pub const IPV6_MULTICAST_HOPS: ::c_int = 0x7;
 pub const IPV6_MULTICAST_LOOP: ::c_int = 0x8;
+pub const IPV6_RECVPKTINFO: ::c_int = 0x12;
+pub const IPV6_SEC_OPT: ::c_int = 0x22;
 pub const IPV6_V6ONLY: ::c_int = 0x27;
 
 cfg_if! {
@@ -972,6 +990,9 @@
 pub const L_tmpnam: ::c_uint = 25;
 pub const TMP_MAX: ::c_uint = 17576;
 
+pub const GRND_NONBLOCK: ::c_int = 0x0001;
+pub const GRND_RANDOM: ::c_int = 0x0002;
+
 pub const O_RDONLY: ::c_int = 0;
 pub const O_WRONLY: ::c_int = 1;
 pub const O_RDWR: ::c_int = 2;
@@ -983,10 +1004,12 @@
 pub const O_NOCTTY: ::c_int = 2048;
 pub const O_TRUNC: ::c_int = 512;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
+pub const O_DIRECTORY: ::c_int = 0x1000000;
 pub const O_SEARCH: ::c_int = 0x200000;
 pub const O_EXEC: ::c_int = 0x400000;
 pub const O_CLOEXEC: ::c_int = 0x800000;
 pub const O_ACCMODE: ::c_int = 0x600003;
+pub const O_XATTR: ::c_int = 0x4000;
 pub const S_IFIFO: mode_t = 4096;
 pub const S_IFCHR: mode_t = 8192;
 pub const S_IFBLK: mode_t = 24576;
@@ -1025,6 +1048,12 @@
 pub const F_SETLK: ::c_int = 6;
 pub const F_SETLKW: ::c_int = 7;
 pub const F_GETLK: ::c_int = 14;
+pub const F_ALLOCSP: ::c_int = 10;
+pub const F_FREESP: ::c_int = 11;
+pub const F_BLOCKS: ::c_int = 18;
+pub const F_BLKSIZE: ::c_int = 19;
+pub const F_SHARE: ::c_int = 40;
+pub const F_UNSHARE: ::c_int = 41;
 pub const SIGHUP: ::c_int = 1;
 pub const SIGINT: ::c_int = 2;
 pub const SIGQUIT: ::c_int = 3;
@@ -1088,6 +1117,15 @@
 pub const P_CPUID: idtype_t = 14;
 pub const P_PSETID: idtype_t = 15;
 
+pub const PS_NONE: ::c_int = -1;
+pub const PS_QUERY: ::c_int = -2;
+pub const PS_MYID: ::c_int = -3;
+pub const PS_SOFT: ::c_int = -4;
+pub const PS_HARD: ::c_int = -5;
+pub const PS_QUERY_TIME: ::c_int = -6;
+pub const PS_SYSTEM: ::c_int = 1;
+pub const PS_PRIVATE: ::c_int = 2;
+
 pub const UTIME_OMIT: c_long = -2;
 pub const UTIME_NOW: c_long = -1;
 
@@ -1253,10 +1291,13 @@
 pub const EAI_OVERFLOW: ::c_int = 12;
 
 pub const F_DUPFD: ::c_int = 0;
+pub const F_DUP2FD: ::c_int = 9;
+pub const F_DUP2FD_CLOEXEC: ::c_int = 36;
 pub const F_GETFD: ::c_int = 1;
 pub const F_SETFD: ::c_int = 2;
 pub const F_GETFL: ::c_int = 3;
 pub const F_SETFL: ::c_int = 4;
+pub const F_GETXFL: ::c_int = 45;
 
 pub const SIGTRAP: ::c_int = 5;
 
@@ -1404,6 +1445,8 @@
 pub const TCP_RTO_MAX: ::c_int = 0x1b;
 pub const TCP_LINGER2: ::c_int = 0x1c;
 
+pub const UDP_NAT_T_ENDPOINT: ::c_int = 0x0103;
+
 pub const SOL_SOCKET: ::c_int = 0xffff;
 pub const SO_DEBUG: ::c_int = 0x01;
 pub const SO_ACCEPTCONN: ::c_int = 0x0002;
@@ -2049,11 +2092,8 @@
 pub const STA_PPSWANDER: i32 = 0x0400;
 pub const STA_PPSERROR: i32 = 0x0800;
 pub const STA_CLOCKERR: i32 = 0x1000;
-pub const STA_RONLY: i32 = STA_PPSSIGNAL
-    | STA_PPSJITTER
-    | STA_PPSWANDER
-    | STA_PPSERROR
-    | STA_CLOCKERR;
+pub const STA_RONLY: i32 =
+    STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | STA_PPSERROR | STA_CLOCKERR;
 pub const TIME_OK: i32 = 0;
 pub const TIME_INS: i32 = 1;
 pub const TIME_DEL: i32 = 2;
@@ -2065,6 +2105,14 @@
 pub const PRIO_PGRP: ::c_int = 1;
 pub const PRIO_USER: ::c_int = 2;
 
+pub const SCHED_OTHER: ::c_int = 0;
+pub const SCHED_FIFO: ::c_int = 1;
+pub const SCHED_RR: ::c_int = 2;
+pub const SCHED_SYS: ::c_int = 3;
+pub const SCHED_IA: ::c_int = 4;
+pub const SCHED_FSS: ::c_int = 5;
+pub const SCHED_FX: ::c_int = 6;
+
 // As per sys/socket.h, header alignment must be 8 bytes on SPARC
 // and 4 bytes everywhere else:
 #[cfg(target_arch = "sparc64")]
@@ -2074,12 +2122,14 @@
 
 const _CMSG_DATA_ALIGNMENT: usize = ::mem::size_of::<::c_int>();
 
-fn _CMSG_HDR_ALIGN(p: usize) -> usize {
-    (p + _CMSG_HDR_ALIGNMENT - 1) & !(_CMSG_HDR_ALIGNMENT - 1)
-}
+const_fn! {
+    {const} fn _CMSG_HDR_ALIGN(p: usize) -> usize {
+        (p + _CMSG_HDR_ALIGNMENT - 1) & !(_CMSG_HDR_ALIGNMENT - 1)
+    }
 
-fn _CMSG_DATA_ALIGN(p: usize) -> usize {
-    (p + _CMSG_DATA_ALIGNMENT - 1) & !(_CMSG_DATA_ALIGNMENT - 1)
+    {const} fn _CMSG_DATA_ALIGN(p: usize) -> usize {
+        (p + _CMSG_DATA_ALIGNMENT - 1) & !(_CMSG_DATA_ALIGNMENT - 1)
+    }
 }
 
 f! {
@@ -2117,7 +2167,7 @@
         }
     }
 
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+    pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
         _CMSG_HDR_ALIGN(::mem::size_of::<::cmsghdr>() as usize
             + length as usize) as ::c_uint
     }
@@ -2129,7 +2179,7 @@
         return
     }
 
-    pub fn FD_ISSET(fd: ::c_int, set: *mut fd_set) -> bool {
+    pub fn FD_ISSET(fd: ::c_int, set: *const fd_set) -> bool {
         let bits = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
         let fd = fd as usize;
         return ((*set).fds_bits[fd / bits] & (1 << (fd % bits))) != 0
@@ -2187,18 +2237,10 @@
     pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;
     pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
 
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
+    pub fn sem_init(sem: *mut sem_t, pshared: ::c_int, value: ::c_uint) -> ::c_int;
 
     pub fn abs(i: ::c_int) -> ::c_int;
     pub fn acct(filename: *const ::c_char) -> ::c_int;
@@ -2207,6 +2249,8 @@
     pub fn labs(i: ::c_long) -> ::c_long;
     pub fn rand() -> ::c_int;
     pub fn srand(seed: ::c_uint);
+    pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int;
+    pub fn getrandom(bbuf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
 
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
     pub fn settimeofday(tp: *const ::timeval, tz: *const ::c_void) -> ::c_int;
@@ -2214,14 +2258,16 @@
     pub fn freeifaddrs(ifa: *mut ::ifaddrs);
 
     pub fn stack_getbounds(sp: *mut ::stack_t) -> ::c_int;
+    pub fn getgrouplist(
+        name: *const ::c_char,
+        basegid: ::gid_t,
+        groups: *mut ::gid_t,
+        ngroups: *mut ::c_int,
+    ) -> ::c_int;
     pub fn initgroups(name: *const ::c_char, basegid: ::gid_t) -> ::c_int;
     pub fn setgroups(ngroups: ::c_int, ptr: *const ::gid_t) -> ::c_int;
     pub fn ioctl(fildes: ::c_int, request: ::c_int, ...) -> ::c_int;
-    pub fn mprotect(
-        addr: *const ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
+    pub fn mprotect(addr: *const ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
     pub fn ___errno() -> *mut ::c_int;
     pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
     pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
@@ -2231,10 +2277,7 @@
         rqtp: *const ::timespec,
         rmtp: *mut ::timespec,
     ) -> ::c_int;
-    pub fn clock_settime(
-        clk_id: ::clockid_t,
-        tp: *const ::timespec,
-    ) -> ::c_int;
+    pub fn clock_settime(clk_id: ::clockid_t, tp: *const ::timespec) -> ::c_int;
     pub fn getnameinfo(
         sa: *const ::sockaddr,
         salen: ::socklen_t,
@@ -2248,22 +2291,16 @@
     pub fn endpwent();
     pub fn getpwent() -> *mut passwd;
     pub fn fdatasync(fd: ::c_int) -> ::c_int;
-    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t)
-        -> *mut ::c_char;
+    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t) -> *mut ::c_char;
     pub fn duplocale(base: ::locale_t) -> ::locale_t;
     pub fn freelocale(loc: ::locale_t);
-    pub fn newlocale(
-        mask: ::c_int,
-        locale: *const ::c_char,
-        base: ::locale_t,
-    ) -> ::locale_t;
+    pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
     pub fn uselocale(loc: ::locale_t) -> ::locale_t;
     pub fn getprogname() -> *const ::c_char;
     pub fn setprogname(name: *const ::c_char);
     pub fn getloadavg(loadavg: *mut ::c_double, nelem: ::c_int) -> ::c_int;
     pub fn getpriority(which: ::c_int, who: ::c_int) -> ::c_int;
-    pub fn setpriority(which: ::c_int, who: ::c_int, prio: ::c_int)
-        -> ::c_int;
+    pub fn setpriority(which: ::c_int, who: ::c_int, prio: ::c_int) -> ::c_int;
 
     pub fn mknodat(
         dirfd: ::c_int,
@@ -2271,11 +2308,7 @@
         mode: ::mode_t,
         dev: dev_t,
     ) -> ::c_int;
-    pub fn mkfifoat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
     pub fn sethostname(name: *const ::c_char, len: ::c_int) -> ::c_int;
     pub fn if_nameindex() -> *mut if_nameindex;
     pub fn if_freenameindex(ptr: *mut if_nameindex);
@@ -2298,78 +2331,45 @@
         attr: *mut pthread_condattr_t,
         clock_id: ::clockid_t,
     ) -> ::c_int;
-    pub fn sem_timedwait(
-        sem: *mut sem_t,
-        abstime: *const ::timespec,
-    ) -> ::c_int;
+    pub fn sem_timedwait(sem: *mut sem_t, abstime: *const ::timespec) -> ::c_int;
     pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int;
     pub fn pthread_mutex_timedlock(
         lock: *mut pthread_mutex_t,
         abstime: *const ::timespec,
     ) -> ::c_int;
-    pub fn waitid(
-        idtype: idtype_t,
-        id: id_t,
-        infop: *mut ::siginfo_t,
-        options: ::c_int,
-    ) -> ::c_int;
+    pub fn waitid(idtype: idtype_t, id: id_t, infop: *mut ::siginfo_t, options: ::c_int)
+        -> ::c_int;
 
     #[cfg_attr(target_os = "illumos", link_name = "_glob_ext")]
     pub fn glob(
         pattern: *const ::c_char,
         flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int,
-        >,
+        errfunc: ::Option<extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int>,
         pglob: *mut ::glob_t,
     ) -> ::c_int;
 
     #[cfg_attr(target_os = "illumos", link_name = "_globfree_ext")]
     pub fn globfree(pglob: *mut ::glob_t);
 
-    pub fn posix_madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn posix_madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
-    pub fn shmat(
-        shmid: ::c_int,
-        shmaddr: *const ::c_void,
-        shmflg: ::c_int,
-    ) -> *mut ::c_void;
-
-    pub fn shmctl(
-        shmid: ::c_int,
-        cmd: ::c_int,
-        buf: *mut ::shmid_ds,
-    ) -> ::c_int;
+    pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
+
+    pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
 
     pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
 
     pub fn shmget(key: key_t, size: ::size_t, shmflg: ::c_int) -> ::c_int;
 
-    pub fn shm_open(
-        name: *const ::c_char,
-        oflag: ::c_int,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn shm_open(name: *const ::c_char, oflag: ::c_int, mode: ::mode_t) -> ::c_int;
     pub fn shm_unlink(name: *const ::c_char) -> ::c_int;
 
     pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long);
 
     pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
-    pub fn madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
+    pub fn madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int) -> ::c_int;
 
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn msync(addr: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::c_int;
 
     pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
 
@@ -2382,11 +2382,7 @@
         addrlen: *mut ::socklen_t,
     ) -> ::ssize_t;
     pub fn mkstemps(template: *mut ::c_char, suffixlen: ::c_int) -> ::c_int;
-    pub fn futimesat(
-        fd: ::c_int,
-        path: *const ::c_char,
-        times: *const ::timeval,
-    ) -> ::c_int;
+    pub fn futimesat(fd: ::c_int, path: *const ::c_char, times: *const ::timeval) -> ::c_int;
     pub fn futimens(dirfd: ::c_int, times: *const ::timespec) -> ::c_int;
     pub fn utimensat(
         dirfd: ::c_int,
@@ -2397,35 +2393,15 @@
     pub fn nl_langinfo(item: ::nl_item) -> *mut ::c_char;
 
     #[cfg_attr(target_os = "illumos", link_name = "__xnet_bind")]
-    pub fn bind(
-        socket: ::c_int,
-        address: *const ::sockaddr,
-        address_len: ::socklen_t,
-    ) -> ::c_int;
+    pub fn bind(socket: ::c_int, address: *const ::sockaddr, address_len: ::socklen_t) -> ::c_int;
 
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
+    pub fn readv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
 
     #[cfg_attr(target_os = "illumos", link_name = "__xnet_sendmsg")]
-    pub fn sendmsg(
-        fd: ::c_int,
-        msg: *const ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn sendmsg(fd: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
     #[cfg_attr(target_os = "illumos", link_name = "__xnet_recvmsg")]
-    pub fn recvmsg(
-        fd: ::c_int,
-        msg: *mut ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
     pub fn accept4(
         fd: ::c_int,
         address: *mut sockaddr,
@@ -2463,11 +2439,7 @@
         abs_timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
-    pub fn mq_setattr(
-        mqd: ::mqd_t,
-        newattr: *const ::mq_attr,
-        oldattr: *mut ::mq_attr,
-    ) -> ::c_int;
+    pub fn mq_setattr(mqd: ::mqd_t, newattr: *const ::mq_attr, oldattr: *mut ::mq_attr) -> ::c_int;
     pub fn port_create() -> ::c_int;
     pub fn port_associate(
         port: ::c_int,
@@ -2476,16 +2448,8 @@
         events: ::c_int,
         user: *mut ::c_void,
     ) -> ::c_int;
-    pub fn port_dissociate(
-        port: ::c_int,
-        source: ::c_int,
-        object: ::uintptr_t,
-    ) -> ::c_int;
-    pub fn port_get(
-        port: ::c_int,
-        pe: *mut port_event,
-        timeout: *mut ::timespec,
-    ) -> ::c_int;
+    pub fn port_dissociate(port: ::c_int, source: ::c_int, object: ::uintptr_t) -> ::c_int;
+    pub fn port_get(port: ::c_int, pe: *mut port_event, timeout: *mut ::timespec) -> ::c_int;
     pub fn port_getn(
         port: ::c_int,
         pe_list: *mut port_event,
@@ -2493,11 +2457,7 @@
         nget: *mut ::c_uint,
         timeout: *mut ::timespec,
     ) -> ::c_int;
-    pub fn port_send(
-        port: ::c_int,
-        events: ::c_int,
-        user: *mut ::c_void,
-    ) -> ::c_int;
+    pub fn port_send(port: ::c_int, events: ::c_int, user: *mut ::c_void) -> ::c_int;
     pub fn port_sendn(
         port_list: *mut ::c_int,
         error_list: *mut ::c_int,
@@ -2522,7 +2482,7 @@
 
     // The epoll functions are actually only present on illumos.  However,
     // there are things using epoll on illumos (built using the
-    // x86_64-sun-solaris target) which would break until the illumos target is
+    // x86_64-pc-solaris target) which would break until the illumos target is
     // present in rustc.
     pub fn epoll_pwait(
         epfd: ::c_int,
@@ -2540,12 +2500,8 @@
         maxevents: ::c_int,
         timeout: ::c_int,
     ) -> ::c_int;
-    pub fn epoll_ctl(
-        epfd: ::c_int,
-        op: ::c_int,
-        fd: ::c_int,
-        event: *mut ::epoll_event,
-    ) -> ::c_int;
+    pub fn epoll_ctl(epfd: ::c_int, op: ::c_int, fd: ::c_int, event: *mut ::epoll_event)
+        -> ::c_int;
 
     #[cfg_attr(
         any(target_os = "solaris", target_os = "illumos"),
@@ -2558,14 +2514,20 @@
         buflen: ::size_t,
         result: *mut *mut ::group,
     ) -> ::c_int;
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sem_open(name: *const ::c_char, oflag: ::c_int, ...) -> *mut sem_t;
     pub fn getgrnam(name: *const ::c_char) -> *mut ::group;
     pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
+    pub fn sched_get_priority_min(policy: ::c_int) -> ::c_int;
+    pub fn sched_get_priority_max(policy: ::c_int) -> ::c_int;
+    pub fn sched_getparam(pid: ::pid_t, param: *mut sched_param) -> ::c_int;
+    pub fn sched_setparam(pid: ::pid_t, param: *const sched_param) -> ::c_int;
+    pub fn sched_getscheduler(pid: ::pid_t) -> ::c_int;
+    pub fn sched_setscheduler(
+        pid: ::pid_t,
+        policy: ::c_int,
+        param: *const ::sched_param,
+    ) -> ::c_int;
     pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
     pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
     #[cfg_attr(
@@ -2656,6 +2618,17 @@
     pub fn ntp_adjtime(buf: *mut timex) -> ::c_int;
     pub fn ntp_gettime(buf: *mut ntptimeval) -> ::c_int;
 
+    pub fn timer_create(clock_id: clockid_t, evp: *mut sigevent, timerid: *mut timer_t) -> ::c_int;
+    pub fn timer_delete(timerid: timer_t) -> ::c_int;
+    pub fn timer_getoverrun(timerid: timer_t) -> ::c_int;
+    pub fn timer_gettime(timerid: timer_t, value: *mut itimerspec) -> ::c_int;
+    pub fn timer_settime(
+        timerid: timer_t,
+        flags: ::c_int,
+        value: *const itimerspec,
+        ovalue: *mut itimerspec,
+    ) -> ::c_int;
+
     pub fn ucred_get(pid: ::pid_t) -> *mut ucred_t;
     pub fn getpeerucred(fd: ::c_int, ucred: *mut *mut ucred_t) -> ::c_int;
 
@@ -2667,17 +2640,44 @@
     pub fn ucred_getegid(ucred: *const ucred_t) -> ::gid_t;
     pub fn ucred_getrgid(ucred: *const ucred_t) -> ::gid_t;
     pub fn ucred_getsgid(ucred: *const ucred_t) -> ::gid_t;
-    pub fn ucred_getgroups(
-        ucred: *const ucred_t,
-        groups: *mut *const ::gid_t,
-    ) -> ::c_int;
+    pub fn ucred_getgroups(ucred: *const ucred_t, groups: *mut *const ::gid_t) -> ::c_int;
     pub fn ucred_getpid(ucred: *const ucred_t) -> ::pid_t;
     pub fn ucred_getprojid(ucred: *const ucred_t) -> projid_t;
     pub fn ucred_getzoneid(ucred: *const ucred_t) -> zoneid_t;
-    pub fn ucred_getpflags(ucred: *const ucred_t, flags: ::c_uint)
-        -> ::c_uint;
+    pub fn ucred_getpflags(ucred: *const ucred_t, flags: ::c_uint) -> ::c_uint;
 
     pub fn ucred_size() -> ::size_t;
+
+    pub fn pset_create(newpset: *mut ::psetid_t) -> ::c_int;
+    pub fn pset_destroy(pset: ::psetid_t) -> ::c_int;
+    pub fn pset_assign(pset: ::psetid_t, cpu: ::processorid_t, opset: *mut psetid_t) -> ::c_int;
+    pub fn pset_info(
+        pset: ::psetid_t,
+        tpe: *mut ::c_int,
+        numcpus: *mut ::c_uint,
+        cpulist: *mut processorid_t,
+    ) -> ::c_int;
+    pub fn pset_bind(
+        pset: ::psetid_t,
+        idtype: ::idtype_t,
+        id: ::id_t,
+        opset: *mut psetid_t,
+    ) -> ::c_int;
+    pub fn pset_list(pset: *mut psetid_t, numpsets: *mut ::c_uint) -> ::c_int;
+    pub fn pset_setattr(pset: psetid_t, attr: ::c_uint) -> ::c_int;
+    pub fn pset_getattr(pset: psetid_t, attr: *mut ::c_uint) -> ::c_int;
+    pub fn processor_bind(
+        idtype: ::idtype_t,
+        id: ::id_t,
+        new_binding: ::processorid_t,
+        old_binding: *mut processorid_t,
+    ) -> ::c_int;
+    pub fn p_online(processorid: ::processorid_t, flag: ::c_int) -> ::c_int;
+
+    pub fn getexecname() -> *const ::c_char;
+
+    pub fn gethostid() -> ::c_long;
+    pub fn sethostid(hostid: ::c_long) -> ::c_int;
 }
 
 mod compat;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/solarish/solaris.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/solarish/solaris.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/solarish/solaris.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/solarish/solaris.rs	2021-12-09 12:01:26.000000000 +0000
@@ -43,11 +43,7 @@
         envp: *const *const ::c_char,
     ) -> ::c_int;
 
-    pub fn mincore(
-        addr: *const ::c_void,
-        len: ::size_t,
-        vec: *mut ::c_char,
-    ) -> ::c_int;
+    pub fn mincore(addr: *const ::c_void, len: ::size_t, vec: *mut ::c_char) -> ::c_int;
 
     pub fn door_call(d: ::c_int, params: *const door_arg_t) -> ::c_int;
     pub fn door_return(
@@ -70,10 +66,7 @@
 
     pub fn fattach(fildes: ::c_int, path: *const ::c_char) -> ::c_int;
 
-    pub fn pthread_getattr_np(
-        thread: ::pthread_t,
-        attr: *mut ::pthread_attr_t,
-    ) -> ::c_int;
+    pub fn pthread_getattr_np(thread: ::pthread_t, attr: *mut ::pthread_attr_t) -> ::c_int;
 }
 
 s_no_extra_traits! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-macro_rules! expand_align {
-    () => {
-        s! {
-            #[cfg_attr(any(target_pointer_width = "32",
-                           target_arch = "x86_64",
-                           target_arch = "powerpc64",
-                           target_arch = "mips64",
-                           target_arch = "s390x",
-                           target_arch = "sparc64"),
-                       repr(align(4)))]
-            #[cfg_attr(not(any(target_pointer_width = "32",
-                               target_arch = "x86_64",
-                               target_arch = "powerpc64",
-                               target_arch = "mips64",
-                               target_arch = "s390x",
-                               target_arch = "sparc64")),
-                       repr(align(8)))]
-            pub struct pthread_mutexattr_t {
-                size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
-            }
-
-            #[repr(align(4))]
-            pub struct pthread_condattr_t {
-                size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
-            }
-        }
-
-        s_no_extra_traits! {
-            #[repr(align(8))]
-            #[allow(missing_debug_implementations)]
-            pub struct pthread_cond_t {
-                size: [u8; ::__SIZEOF_PTHREAD_COND_T],
-            }
-
-            #[cfg_attr(all(target_pointer_width = "32",
-                           any(target_arch = "mips",
-                               target_arch = "arm",
-                               target_arch = "powerpc")),
-                       repr(align(4)))]
-            #[cfg_attr(any(target_pointer_width = "64",
-                           not(any(target_arch = "mips",
-                                   target_arch = "arm",
-                                   target_arch = "powerpc"))),
-                       repr(align(8)))]
-            #[allow(missing_debug_implementations)]
-            pub struct pthread_mutex_t {
-                size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
-            }
-
-            #[cfg_attr(all(target_pointer_width = "32",
-                           any(target_arch = "mips",
-                               target_arch = "arm",
-                               target_arch = "powerpc")),
-                       repr(align(4)))]
-            #[cfg_attr(any(target_pointer_width = "64",
-                           not(any(target_arch = "mips",
-                                   target_arch = "arm",
-                                   target_arch = "powerpc"))),
-                       repr(align(8)))]
-            #[allow(missing_debug_implementations)]
-            pub struct pthread_rwlock_t {
-                size: [u8; ::__SIZEOF_PTHREAD_RWLOCK_T],
-            }
-        }
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-s! {
-    // FIXME this is actually a union
-    #[cfg_attr(target_pointer_width = "32",
-               repr(align(4)))]
-    #[cfg_attr(target_pointer_width = "64",
-               repr(align(8)))]
-    pub struct sem_t {
-        #[cfg(target_pointer_width = "32")]
-        __size: [::c_char; 16],
-        #[cfg(target_pointer_width = "64")]
-        __size: [::c_char; 32],
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1049 +0,0 @@
-pub type c_char = u8;
-pub type wchar_t = ::c_uint;
-pub type c_long = i32;
-pub type c_ulong = u32;
-pub type time_t = ::c_long;
-
-pub type clock_t = ::c_long;
-pub type fsblkcnt_t = ::c_ulong;
-pub type fsfilcnt_t = ::c_ulong;
-pub type ino_t = ::c_ulong;
-pub type off_t = ::c_long;
-pub type pthread_t = ::c_ulong;
-pub type rlim_t = ::c_ulong;
-pub type suseconds_t = ::c_long;
-
-pub type nlink_t = ::c_uint;
-pub type blksize_t = ::c_long;
-pub type blkcnt_t = ::c_long;
-
-s! {
-    pub struct cmsghdr {
-        pub cmsg_len: ::size_t,
-        pub cmsg_level: ::c_int,
-        pub cmsg_type: ::c_int,
-    }
-
-    pub struct msghdr {
-        pub msg_name: *mut ::c_void,
-        pub msg_namelen: ::socklen_t,
-        pub msg_iov: *mut ::iovec,
-        pub msg_iovlen: ::c_int,
-        pub msg_control: *mut ::c_void,
-        pub msg_controllen: ::socklen_t,
-        pub msg_flags: ::c_int,
-    }
-
-    pub struct pthread_attr_t {
-        __size: [::c_long; 9],
-    }
-
-    pub struct stat {
-        pub st_dev: ::c_ulonglong,
-        pub __pad1: ::c_ushort,
-        pub st_ino: ::ino_t,
-        pub st_mode: ::mode_t,
-        pub st_nlink: ::nlink_t,
-        pub st_uid: ::uid_t,
-        pub st_gid: ::gid_t,
-        pub st_rdev: ::c_ulonglong,
-        pub __pad2: ::c_ushort,
-        pub st_size: ::off_t,
-        pub st_blksize: ::blksize_t,
-        pub st_blocks: ::blkcnt_t,
-        pub st_atime: ::time_t,
-        pub st_atime_nsec: ::c_ulong,
-        pub st_mtime: ::time_t,
-        pub st_mtime_nsec: ::c_ulong,
-        pub st_ctime: ::time_t,
-        pub st_ctime_nsec: ::c_ulong,
-        pub __unused4: ::c_ulong,
-        pub __unused5: ::c_ulong,
-    }
-
-    pub struct stat64
-    {
-        pub st_dev: ::c_ulonglong,
-        pub __pad1: ::c_uint,
-        pub __st_ino: ::ino_t,
-        pub st_mode: ::mode_t,
-        pub st_nlink: ::nlink_t,
-        pub st_uid: ::uid_t,
-        pub st_gid: ::gid_t,
-        pub st_rdev: ::c_ulonglong,
-        pub __pad2: ::c_uint,
-        pub st_size: ::off64_t,
-        pub st_blksize: ::blksize_t,
-        pub st_blocks: ::blkcnt64_t,
-        pub st_atime: ::time_t,
-        pub st_atime_nsec: ::c_ulong,
-        pub st_mtime: ::time_t,
-        pub st_mtime_nsec: ::c_ulong,
-        pub st_ctime: ::time_t,
-        pub st_ctime_nsec: ::c_ulong,
-        pub st_ino: ::ino64_t,
-    }
-
-    pub struct flock {
-        pub l_type: ::c_short,
-        pub l_whence: ::c_short,
-        pub l_start: ::off_t,
-        pub l_len: ::off_t,
-        pub l_pid: ::pid_t,
-    }
-
-    pub struct statfs {
-        pub f_type: ::c_int,
-        pub f_bsize: ::c_int,
-        pub f_blocks: ::fsblkcnt_t,
-        pub f_bfree: ::fsblkcnt_t,
-        pub f_bavail: ::fsblkcnt_t,
-        pub f_files: ::fsfilcnt_t,
-        pub f_ffree: ::fsfilcnt_t,
-
-        pub f_fsid: ::fsid_t,
-        pub f_namelen: ::c_int,
-        pub f_frsize: ::c_int,
-        pub f_spare: [::c_int; 5],
-    }
-
-    pub struct sigset_t {
-        __val: [::c_ulong; 2],
-    }
-
-    pub struct sigaction {
-        pub sa_sigaction: ::sighandler_t,
-        // uClibc defines sa_flags as `unsigned long int`,
-        // but nix crate expects `int`
-        pub sa_flags: ::c_int,
-        pub sa_restorer: *mut ::c_void,
-        pub sa_mask: sigset_t,
-    }
-
-    pub struct termios {
-        pub c_iflag: ::tcflag_t,
-        pub c_oflag: ::tcflag_t,
-        pub c_cflag: ::tcflag_t,
-        pub c_lflag: ::tcflag_t,
-        pub c_line: ::cc_t,
-        pub c_cc: [::cc_t; ::NCCS],
-        pub c_ispeed: ::speed_t,
-        pub c_ospeed: ::speed_t,
-    }
-
-    pub struct siginfo_t {
-        pub si_signo: ::c_int,
-        pub si_errno: ::c_int,
-        pub si_code: ::c_int,
-        pub _pad: [::c_int; 29],
-    }
-
-    pub struct stack_t {
-        pub ss_sp: *mut ::c_void,
-        pub ss_flags: ::c_int,
-        pub ss_size: ::size_t,
-    }
-
-    pub struct ipc_perm {
-        pub __key: ::key_t,
-        pub uid: ::uid_t,
-        pub gid: ::gid_t,
-        pub cuid: ::uid_t,
-        pub cgid: ::gid_t,
-        pub mode: ::c_ushort,
-        pub __pad1: ::c_ushort,
-        pub __seq: ::c_ushort,
-        pub __pad2: ::c_ushort,
-        pub __unused1: ::c_ulong,
-        pub __unused2: ::c_ulong,
-    }
-
-    pub struct msqid_ds {
-        pub msg_perm: ::ipc_perm,
-        pub msg_stime: ::time_t,
-        pub __unused1: ::c_ulong,
-        pub msg_rtime: ::time_t,
-        pub __unused2: ::c_ulong,
-        pub msg_ctime: ::time_t,
-        pub __unused3: ::c_ulong,
-        pub __msg_cbytes: ::c_ulong,
-        pub msg_qnum: ::msgqnum_t,
-        pub msg_qbytes: ::msglen_t,
-        pub msg_lspid: ::pid_t,
-        pub msg_lrpid: ::pid_t,
-        pub __unused4: ::c_ulong,
-        pub __unused5: ::c_ulong,
-    }
-
-    pub struct shmid_ds {
-        pub shm_perm: ::ipc_perm,
-        pub shm_segsz: ::size_t,
-        pub shm_atime: ::time_t,
-        pub __unused1: ::c_ulong,
-        pub shm_dtime: ::time_t,
-        pub __unused2: ::c_ulong,
-        pub shm_ctime: ::time_t,
-        pub __unused3: ::c_ulong,
-        pub shm_cpid: ::pid_t,
-        pub shm_lpid: ::pid_t,
-        pub shm_nattch: ::shmatt_t,
-        pub __unused4: ::c_ulong,
-        pub __unused5: ::c_ulong,
-    }
-
-    pub struct ucred {
-        pub pid: ::pid_t,
-        pub uid: ::uid_t,
-        pub gid: ::gid_t,
-    }
-
-}
-
-pub const O_CLOEXEC: ::c_int = 0o2000000;
-pub const RLIM_INFINITY: rlim_t = !0;
-pub const __SIZEOF_PTHREAD_ATTR_T: usize = 36;
-pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
-pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
-pub const __SIZEOF_PTHREAD_COND_COMPAT_T: usize = 12;
-pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
-pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32;
-pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 8;
-pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 20;
-pub const __SIZEOF_PTHREAD_BARRIERATTR_T: usize = 4;
-pub const NCCS: usize = 32;
-
-// I wasn't able to find those constants
-// in uclibc build environment for armv7
-pub const AIO_ALLDONE: ::c_int = 2; // from linux/mod.rs
-pub const AIO_CANCELED: ::c_int = 0; // from linux/mod.rs
-pub const AIO_NOTCANCELED: ::c_int = 1; // from linux/mod.rs
-pub const CLONE_NEWCGROUP: ::c_int = 0x02000000; // from linux/mod.rs
-pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000; // from linux/mod.rs
-pub const EPOLLWAKEUP: ::c_int = 0x20000000; // from linux/other/mod.rs
-pub const EXTPROC: ::tcflag_t = 0o200000; // from asm-generic/termbits.h
-pub const F_GETPIPE_SZ: ::c_int = 1032; // from linux_like/mod.rs
-pub const F_SETPIPE_SZ: ::c_int = 1031; // from linux_like/mod.rs
-pub const LIO_NOP: ::c_int = 2; // from linux/mod.rs
-pub const LIO_NOWAIT: ::c_int = 1; // from linux/mod.rs
-pub const LIO_READ: ::c_int = 0; // from linux/mod.rs
-pub const LIO_WAIT: ::c_int = 0; // from linux/mod.rs
-pub const LIO_WRITE: ::c_int = 1; // from linux/mod.rs
-pub const MAP_HUGETLB: ::c_int = 0x040000; // from linux/other/mod.rs
-pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
-pub const RB_KEXEC: ::c_int = 0x45584543u32 as i32; // from linux/mod.rs
-pub const RB_SW_SUSPEND: ::c_int = 0xd000fce2u32 as i32; // from linux/mod.rs
-pub const SO_BUSY_POLL: ::c_int = 46; // from src/unix/linux_like/mod.rs
-pub const SO_PEEK_OFF: ::c_int = 42; // from src/unix/linux_like/mod.rs
-pub const SO_REUSEPORT: ::c_int = 15; // from src/unix/linux_like/mod.rs
-pub const SOL_NETLINK: ::c_int = 270; // from src/unix/linux_like/mod.rs
-pub const _POSIX_VDISABLE: ::cc_t = 0; // from linux/mod.rs
-pub const AT_EMPTY_PATH: ::c_int = 0x1000; // from linux_like/mod.rs
-
-// autogenerated constants with hand tuned types
-pub const AT_NO_AUTOMOUNT: ::c_int = 0x800;
-pub const B0: ::speed_t = 0;
-pub const B1000000: ::speed_t = 0x1008;
-pub const B110: ::speed_t = 0x3;
-pub const B115200: ::speed_t = 0x1002;
-pub const B1152000: ::speed_t = 0x1009;
-pub const B1200: ::speed_t = 0x9;
-pub const B134: ::speed_t = 0x4;
-pub const B150: ::speed_t = 0x5;
-pub const B1500000: ::speed_t = 0x100a;
-pub const B1800: ::speed_t = 0xa;
-pub const B19200: ::speed_t = 0xe;
-pub const B200: ::speed_t = 0x6;
-pub const B2000000: ::speed_t = 0x100b;
-pub const B230400: ::speed_t = 0x1003;
-pub const B2400: ::speed_t = 0xb;
-pub const B2500000: ::speed_t = 0x100c;
-pub const B300: ::speed_t = 0x7;
-pub const B3000000: ::speed_t = 0x100d;
-pub const B3500000: ::speed_t = 0x100e;
-pub const B38400: ::speed_t = 0xf;
-pub const B4000000: ::speed_t = 0x100f;
-pub const B460800: ::speed_t = 0x1004;
-pub const B4800: ::speed_t = 0xc;
-pub const B50: ::speed_t = 0x1;
-pub const B500000: ::speed_t = 0x1005;
-pub const B57600: ::speed_t = 0x1001;
-pub const B576000: ::speed_t = 0x1006;
-pub const B600: ::speed_t = 0x8;
-pub const B75: ::speed_t = 0x2;
-pub const B921600: ::speed_t = 0x1007;
-pub const B9600: ::speed_t = 0xd;
-pub const BS1: ::c_int = 0x2000;
-pub const BSDLY: ::c_int = 0x2000;
-pub const CBAUD: ::tcflag_t = 0x100f;
-pub const CBAUDEX: ::tcflag_t = 0x1000;
-pub const CIBAUD: ::tcflag_t = 0x100f0000;
-pub const CLOCAL: ::tcflag_t = 0x800;
-pub const CMSPAR: ::tcflag_t = 0x40000000;
-pub const CPU_SETSIZE: ::c_int = 0x400;
-pub const CR1: ::c_int = 0x200;
-pub const CR2: ::c_int = 0x400;
-pub const CR3: ::c_int = 0x600;
-pub const CRDLY: ::c_int = 0x600;
-pub const CREAD: ::tcflag_t = 0x80;
-pub const CS6: ::tcflag_t = 0x10;
-pub const CS7: ::tcflag_t = 0x20;
-pub const CS8: ::tcflag_t = 0x30;
-pub const CSIZE: ::tcflag_t = 0x30;
-pub const CSTOPB: ::tcflag_t = 0x40;
-pub const EADDRINUSE: ::c_int = 0x62;
-pub const EADDRNOTAVAIL: ::c_int = 0x63;
-pub const EADV: ::c_int = 0x44;
-pub const EAFNOSUPPORT: ::c_int = 0x61;
-pub const EALREADY: ::c_int = 0x72;
-pub const EBADE: ::c_int = 0x34;
-pub const EBADFD: ::c_int = 0x4d;
-pub const EBADMSG: ::c_int = 0x4a;
-pub const EBADR: ::c_int = 0x35;
-pub const EBADRQC: ::c_int = 0x38;
-pub const EBADSLT: ::c_int = 0x39;
-pub const EBFONT: ::c_int = 0x3b;
-pub const ECANCELED: ::c_int = 0x7d;
-pub const ECHOCTL: ::tcflag_t = 0x200;
-pub const ECHOE: ::tcflag_t = 0x10;
-pub const ECHOK: ::tcflag_t = 0x20;
-pub const ECHOKE: ::tcflag_t = 0x800;
-pub const ECHONL: ::tcflag_t = 0x40;
-pub const ECHOPRT: ::tcflag_t = 0x400;
-pub const ECHRNG: ::c_int = 0x2c;
-pub const ECOMM: ::c_int = 0x46;
-pub const ECONNABORTED: ::c_int = 0x67;
-pub const ECONNREFUSED: ::c_int = 0x6f;
-pub const ECONNRESET: ::c_int = 0x68;
-pub const EDEADLK: ::c_int = 0x23;
-pub const EDESTADDRREQ: ::c_int = 0x59;
-pub const EDOTDOT: ::c_int = 0x49;
-pub const EDQUOT: ::c_int = 0x7a;
-pub const EFD_CLOEXEC: ::c_int = 0x80000;
-pub const EFD_NONBLOCK: ::c_int = 0x800;
-pub const EHOSTDOWN: ::c_int = 0x70;
-pub const EHOSTUNREACH: ::c_int = 0x71;
-pub const EHWPOISON: ::c_int = 0x85;
-pub const EIDRM: ::c_int = 0x2b;
-pub const EILSEQ: ::c_int = 0x54;
-pub const EINPROGRESS: ::c_int = 0x73;
-pub const EISCONN: ::c_int = 0x6a;
-pub const EISNAM: ::c_int = 0x78;
-pub const EKEYEXPIRED: ::c_int = 0x7f;
-pub const EKEYREJECTED: ::c_int = 0x81;
-pub const EKEYREVOKED: ::c_int = 0x80;
-pub const EL2HLT: ::c_int = 0x33;
-pub const EL2NSYNC: ::c_int = 0x2d;
-pub const EL3HLT: ::c_int = 0x2e;
-pub const EL3RST: ::c_int = 0x2f;
-pub const ELIBACC: ::c_int = 0x4f;
-pub const ELIBBAD: ::c_int = 0x50;
-pub const ELIBEXEC: ::c_int = 0x53;
-pub const ELIBMAX: ::c_int = 0x52;
-pub const ELIBSCN: ::c_int = 0x51;
-pub const ELNRNG: ::c_int = 0x30;
-pub const ELOOP: ::c_int = 0x28;
-pub const EMEDIUMTYPE: ::c_int = 0x7c;
-pub const EMSGSIZE: ::c_int = 0x5a;
-pub const EMULTIHOP: ::c_int = 0x48;
-pub const ENAMETOOLONG: ::c_int = 0x24;
-pub const ENAVAIL: ::c_int = 0x77;
-pub const ENETDOWN: ::c_int = 0x64;
-pub const ENETRESET: ::c_int = 0x66;
-pub const ENETUNREACH: ::c_int = 0x65;
-pub const ENOANO: ::c_int = 0x37;
-pub const ENOBUFS: ::c_int = 0x69;
-pub const ENOCSI: ::c_int = 0x32;
-pub const ENODATA: ::c_int = 0x3d;
-pub const ENOKEY: ::c_int = 0x7e;
-pub const ENOLCK: ::c_int = 0x25;
-pub const ENOLINK: ::c_int = 0x43;
-pub const ENOMEDIUM: ::c_int = 0x7b;
-pub const ENOMSG: ::c_int = 0x2a;
-pub const ENONET: ::c_int = 0x40;
-pub const ENOPKG: ::c_int = 0x41;
-pub const ENOPROTOOPT: ::c_int = 0x5c;
-pub const ENOSR: ::c_int = 0x3f;
-pub const ENOSTR: ::c_int = 0x3c;
-pub const ENOSYS: ::c_int = 0x26;
-pub const ENOTCONN: ::c_int = 0x6b;
-pub const ENOTEMPTY: ::c_int = 0x27;
-pub const ENOTNAM: ::c_int = 0x76;
-pub const ENOTRECOVERABLE: ::c_int = 0x83;
-pub const ENOTSOCK: ::c_int = 0x58;
-pub const ENOTUNIQ: ::c_int = 0x4c;
-pub const EOPNOTSUPP: ::c_int = 0x5f;
-pub const EOVERFLOW: ::c_int = 0x4b;
-pub const EOWNERDEAD: ::c_int = 0x82;
-pub const EPFNOSUPPORT: ::c_int = 0x60;
-pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
-pub const EPROTO: ::c_int = 0x47;
-pub const EPROTONOSUPPORT: ::c_int = 0x5d;
-pub const EPROTOTYPE: ::c_int = 0x5b;
-pub const EREMCHG: ::c_int = 0x4e;
-pub const EREMOTE: ::c_int = 0x42;
-pub const EREMOTEIO: ::c_int = 0x79;
-pub const ERESTART: ::c_int = 0x55;
-pub const ERFKILL: ::c_int = 0x84;
-pub const ESHUTDOWN: ::c_int = 0x6c;
-pub const ESOCKTNOSUPPORT: ::c_int = 0x5e;
-pub const ESRMNT: ::c_int = 0x45;
-pub const ESTALE: ::c_int = 0x74;
-pub const ESTRPIPE: ::c_int = 0x56;
-pub const ETIME: ::c_int = 0x3e;
-pub const ETIMEDOUT: ::c_int = 0x6e;
-pub const ETOOMANYREFS: ::c_int = 0x6d;
-pub const EUCLEAN: ::c_int = 0x75;
-pub const EUNATCH: ::c_int = 0x31;
-pub const EUSERS: ::c_int = 0x57;
-pub const EXFULL: ::c_int = 0x36;
-pub const FF1: ::c_int = 0x8000;
-pub const FFDLY: ::c_int = 0x8000;
-pub const FIONBIO: ::c_ulong = 0x5421;
-pub const FIOCLEX: ::c_ulong = 0x5451;
-pub const FIONCLEX: ::c_ulong = 0x5450;
-pub const FLUSHO: ::tcflag_t = 0x1000;
-pub const F_GETLK: ::c_int = 0x5;
-pub const F_SETLK: ::c_int = 0x6;
-pub const F_SETLKW: ::c_int = 0x7;
-pub const HUPCL: ::tcflag_t = 0x400;
-pub const ICANON: ::tcflag_t = 0x2;
-pub const IEXTEN: ::tcflag_t = 0x8000;
-pub const ISIG: ::tcflag_t = 0x1;
-pub const IUTF8: ::tcflag_t = 0x4000;
-pub const IXOFF: ::tcflag_t = 0x1000;
-pub const IXON: ::tcflag_t = 0x400;
-pub const MAP_ANON: ::c_int = 0x20;
-pub const MAP_ANONYMOUS: ::c_int = 0x20;
-pub const MAP_DENYWRITE: ::c_int = 0x800;
-pub const MAP_EXECUTABLE: ::c_int = 0x1000;
-pub const MAP_GROWSDOWN: ::c_int = 0x100;
-pub const MAP_LOCKED: ::c_int = 0x2000;
-pub const MAP_NONBLOCK: ::c_int = 0x10000;
-pub const MAP_NORESERVE: ::c_int = 0x4000;
-pub const MAP_POPULATE: ::c_int = 0x8000;
-pub const MAP_STACK: ::c_int = 0x20000;
-pub const MS_ACTIVE: u32 = 0x40000000;
-pub const MS_DIRSYNC: u32 = 0x80;
-pub const MS_I_VERSION: u32 = 0x800000;
-pub const MS_KERNMOUNT: u32 = 0x400000;
-pub const MS_MOVE: u32 = 0x2000;
-pub const MS_POSIXACL: u32 = 0x10000;
-pub const MS_PRIVATE: u32 = 0x40000;
-pub const MS_REC: u32 = 0x4000;
-pub const MS_RELATIME: u32 = 0x200000;
-pub const MS_SHARED: u32 = 0x100000;
-pub const MS_SILENT: u32 = 0x8000;
-pub const MS_SLAVE: u32 = 0x80000;
-pub const MS_STRICTATIME: u32 = 0x1000000;
-pub const MS_UNBINDABLE: u32 = 0x20000;
-pub const NLDLY: ::tcflag_t = 0x100;
-pub const NOFLSH: ::tcflag_t = 0x80;
-pub const OCRNL: ::c_int = 0x8;
-pub const OFDEL: ::c_int = 0x80;
-pub const OFILL: ::c_int = 0x40;
-pub const OLCUC: ::tcflag_t = 0x2;
-pub const ONLCR: ::tcflag_t = 0x4;
-pub const ONLRET: ::tcflag_t = 0x20;
-pub const ONOCR: ::tcflag_t = 0x10;
-pub const O_ACCMODE: ::c_int = 0x3;
-pub const O_APPEND: ::c_int = 0x400;
-pub const O_CREAT: ::c_int = 0x40;
-pub const O_DIRECT: ::c_int = 0x10000;
-pub const O_DIRECTORY: ::c_int = 0x4000;
-pub const O_DSYNC: ::c_int = 0x1000;
-pub const O_EXCL: ::c_int = 0x80;
-pub const O_NDELAY: ::c_int = 0x800;
-pub const O_NOCTTY: ::c_int = 0x100;
-pub const O_NOFOLLOW: ::c_int = 0x8000;
-pub const O_NONBLOCK: ::c_int = 0x800;
-pub const O_SYNC: ::c_int = 0o10000;
-pub const O_TRUNC: ::c_int = 0x200;
-pub const PARENB: ::tcflag_t = 0x100;
-pub const PARODD: ::tcflag_t = 0x200;
-pub const PENDIN: ::tcflag_t = 0x4000;
-pub const POLLRDBAND: ::c_short = 0x80;
-pub const POLLRDNORM: ::c_short = 0x40;
-pub const POLLWRBAND: ::c_short = 0x200;
-pub const POLLWRNORM: ::c_short = 0x100;
-pub const PTHREAD_STACK_MIN: ::size_t = 16384;
-pub const QIF_ALL: u32 = 0x3f;
-pub const QIF_BLIMITS: u32 = 0x1;
-pub const QIF_BTIME: u32 = 0x10;
-pub const QIF_ILIMITS: u32 = 0x4;
-pub const QIF_INODES: u32 = 0x8;
-pub const QIF_ITIME: u32 = 0x20;
-pub const QIF_LIMITS: u32 = 0x5;
-pub const QIF_SPACE: u32 = 0x2;
-pub const QIF_TIMES: u32 = 0x30;
-pub const QIF_USAGE: u32 = 0xa;
-pub const SA_NOCLDSTOP: ::c_int = 0x1;
-pub const SA_NOCLDWAIT: ::c_int = 0x2;
-pub const SA_NODEFER: ::c_int = 0x40000000;
-pub const SA_ONSTACK: ::c_int = 0x8000000;
-pub const SA_RESETHAND: ::c_int = 0x80000000;
-pub const SA_RESTART: ::c_int = 0x10000000;
-pub const SA_SIGINFO: ::c_int = 0x4;
-pub const SFD_CLOEXEC: ::c_int = 0x80000;
-pub const SFD_NONBLOCK: ::c_int = 0x800;
-pub const SIGBUS: ::c_int = 0x7;
-pub const SIGCHLD: ::c_int = 0x11;
-pub const SIGCONT: ::c_int = 0x12;
-pub const SIGIO: ::c_int = 0x1d;
-pub const SIGPROF: ::c_int = 0x1b;
-pub const SIGPWR: ::c_int = 0x1e;
-pub const SIGSTKFLT: ::c_int = 0x10;
-pub const SIGSTKSZ: ::size_t = 8192;
-pub const SIGSTOP: ::c_int = 0x13;
-pub const SIGSYS: ::c_int = 0x1f;
-pub const SIGTSTP: ::c_int = 0x14;
-pub const SIGTTIN: ::c_int = 0x15;
-pub const SIGTTOU: ::c_int = 0x16;
-pub const SIGURG: ::c_int = 0x17;
-pub const SIGUSR1: ::c_int = 0xa;
-pub const SIGUSR2: ::c_int = 0xc;
-pub const SIGVTALRM: ::c_int = 0x1a;
-pub const SIGWINCH: ::c_int = 0x1c;
-pub const SIGXCPU: ::c_int = 0x18;
-pub const SIGXFSZ: ::c_int = 0x19;
-pub const SIG_BLOCK: ::c_int = 0;
-pub const SIG_SETMASK: ::c_int = 0x2;
-pub const SIG_UNBLOCK: ::c_int = 0x1;
-pub const SOCK_DGRAM: ::c_int = 0x2;
-pub const SOCK_NONBLOCK: ::c_int = 0o0004000;
-pub const SOCK_SEQPACKET: ::c_int = 0x5;
-pub const SOCK_STREAM: ::c_int = 0x1;
-pub const SOL_SOCKET: ::c_int = 0x1;
-pub const SO_ACCEPTCONN: ::c_int = 0x1e;
-pub const SO_BINDTODEVICE: ::c_int = 0x19;
-pub const SO_BROADCAST: ::c_int = 0x6;
-pub const SO_BSDCOMPAT: ::c_int = 0xe;
-pub const SO_DOMAIN: ::c_int = 0x27;
-pub const SO_DONTROUTE: ::c_int = 0x5;
-pub const SO_ERROR: ::c_int = 0x4;
-pub const SO_KEEPALIVE: ::c_int = 0x9;
-pub const SO_LINGER: ::c_int = 0xd;
-pub const SO_MARK: ::c_int = 0x24;
-pub const SO_OOBINLINE: ::c_int = 0xa;
-pub const SO_PASSCRED: ::c_int = 0x10;
-pub const SO_PEERCRED: ::c_int = 0x11;
-pub const SO_PRIORITY: ::c_int = 0xc;
-pub const SO_PROTOCOL: ::c_int = 0x26;
-pub const SO_RCVBUF: ::c_int = 0x8;
-pub const SO_RCVLOWAT: ::c_int = 0x12;
-pub const SO_RCVTIMEO: ::c_int = 0x14;
-pub const SO_REUSEADDR: ::c_int = 0x2;
-pub const SO_RXQ_OVFL: ::c_int = 0x28;
-pub const SO_SNDBUF: ::c_int = 0x7;
-pub const SO_SNDBUFFORCE: ::c_int = 0x20;
-pub const SO_SNDLOWAT: ::c_int = 0x13;
-pub const SO_SNDTIMEO: ::c_int = 0x15;
-pub const SO_TIMESTAMP: ::c_int = 0x1d;
-pub const SO_TYPE: ::c_int = 0x3;
-pub const TAB1: ::c_int = 0x800;
-pub const TAB2: ::c_int = 0x1000;
-pub const TAB3: ::c_int = 0x1800;
-pub const TABDLY: ::c_int = 0x1800;
-pub const TCSADRAIN: ::c_int = 0x1;
-pub const TCSAFLUSH: ::c_int = 0x2;
-pub const TCSANOW: ::c_int = 0;
-pub const TOSTOP: ::tcflag_t = 0x100;
-pub const VDISCARD: usize = 0xd;
-pub const VEOF: usize = 0x4;
-pub const VEOL: usize = 0xb;
-pub const VEOL2: usize = 0x10;
-pub const VMIN: usize = 0x6;
-pub const VREPRINT: usize = 0xc;
-pub const VSTART: usize = 0x8;
-pub const VSTOP: usize = 0x9;
-pub const VSUSP: usize = 0xa;
-pub const VSWTC: usize = 0x7;
-pub const VT1: ::c_int = 0x4000;
-pub const VTDLY: ::c_int = 0x4000;
-pub const VTIME: usize = 0x5;
-pub const VWERASE: usize = 0xe;
-pub const XTABS: ::tcflag_t = 0x1800;
-pub const _PC_2_SYMLINKS: ::c_int = 0x14;
-pub const _PC_ALLOC_SIZE_MIN: ::c_int = 0x12;
-pub const _PC_ASYNC_IO: ::c_int = 0xa;
-pub const _PC_FILESIZEBITS: ::c_int = 0xd;
-pub const _PC_PRIO_IO: ::c_int = 0xb;
-pub const _PC_REC_INCR_XFER_SIZE: ::c_int = 0xe;
-pub const _PC_REC_MAX_XFER_SIZE: ::c_int = 0xf;
-pub const _PC_REC_MIN_XFER_SIZE: ::c_int = 0x10;
-pub const _PC_REC_XFER_ALIGN: ::c_int = 0x11;
-pub const _PC_SYMLINK_MAX: ::c_int = 0x13;
-pub const _PC_SYNC_IO: ::c_int = 0x9;
-pub const _SC_2_PBS: ::c_int = 0xa8;
-pub const _SC_2_PBS_ACCOUNTING: ::c_int = 0xa9;
-pub const _SC_2_PBS_CHECKPOINT: ::c_int = 0xaf;
-pub const _SC_2_PBS_LOCATE: ::c_int = 0xaa;
-pub const _SC_2_PBS_MESSAGE: ::c_int = 0xab;
-pub const _SC_2_PBS_TRACK: ::c_int = 0xac;
-pub const _SC_ADVISORY_INFO: ::c_int = 0x84;
-pub const _SC_BARRIERS: ::c_int = 0x85;
-pub const _SC_CLOCK_SELECTION: ::c_int = 0x89;
-pub const _SC_CPUTIME: ::c_int = 0x8a;
-pub const _SC_IPV6: ::c_int = 0xeb;
-pub const _SC_MONOTONIC_CLOCK: ::c_int = 0x95;
-pub const _SC_RAW_SOCKETS: ::c_int = 0xec;
-pub const _SC_READER_WRITER_LOCKS: ::c_int = 0x99;
-pub const _SC_REGEXP: ::c_int = 0x9b;
-pub const _SC_SHELL: ::c_int = 0x9d;
-pub const _SC_SPAWN: ::c_int = 0x9f;
-pub const _SC_SPIN_LOCKS: ::c_int = 0x9a;
-pub const _SC_SPORADIC_SERVER: ::c_int = 0xa0;
-pub const _SC_SS_REPL_MAX: ::c_int = 0xf1;
-pub const _SC_SYMLOOP_MAX: ::c_int = 0xad;
-pub const _SC_THREAD_CPUTIME: ::c_int = 0x8b;
-pub const _SC_THREAD_PROCESS_SHARED: ::c_int = 0x52;
-pub const _SC_THREAD_ROBUST_PRIO_INHERIT: ::c_int = 0xf7;
-pub const _SC_THREAD_ROBUST_PRIO_PROTECT: ::c_int = 0xf8;
-pub const _SC_THREAD_SPORADIC_SERVER: ::c_int = 0xa1;
-pub const _SC_TIMEOUTS: ::c_int = 0xa4;
-pub const _SC_TRACE: ::c_int = 0xb5;
-pub const _SC_TRACE_EVENT_FILTER: ::c_int = 0xb6;
-pub const _SC_TRACE_EVENT_NAME_MAX: ::c_int = 0xf2;
-pub const _SC_TRACE_INHERIT: ::c_int = 0xb7;
-pub const _SC_TRACE_LOG: ::c_int = 0xb8;
-pub const _SC_TRACE_NAME_MAX: ::c_int = 0xf3;
-pub const _SC_TRACE_SYS_MAX: ::c_int = 0xf4;
-pub const _SC_TRACE_USER_EVENT_MAX: ::c_int = 0xf5;
-pub const _SC_TYPED_MEMORY_OBJECTS: ::c_int = 0xa5;
-pub const _SC_V6_ILP32_OFF32: ::c_int = 0xb0;
-pub const _SC_V6_ILP32_OFFBIG: ::c_int = 0xb1;
-pub const _SC_V6_LP64_OFF64: ::c_int = 0xb2;
-pub const _SC_V6_LPBIG_OFFBIG: ::c_int = 0xb3;
-pub const _SC_XOPEN_STREAMS: ::c_int = 0xf6;
-
-// Syscall table is copied from src/unix/notbsd/linux/musl/b32/arm.rs
-pub const SYS_restart_syscall: ::c_long = 0;
-pub const SYS_exit: ::c_long = 1;
-pub const SYS_fork: ::c_long = 2;
-pub const SYS_read: ::c_long = 3;
-pub const SYS_write: ::c_long = 4;
-pub const SYS_open: ::c_long = 5;
-pub const SYS_close: ::c_long = 6;
-pub const SYS_creat: ::c_long = 8;
-pub const SYS_link: ::c_long = 9;
-pub const SYS_unlink: ::c_long = 10;
-pub const SYS_execve: ::c_long = 11;
-pub const SYS_chdir: ::c_long = 12;
-pub const SYS_mknod: ::c_long = 14;
-pub const SYS_chmod: ::c_long = 15;
-pub const SYS_lchown: ::c_long = 16;
-pub const SYS_lseek: ::c_long = 19;
-pub const SYS_getpid: ::c_long = 20;
-pub const SYS_mount: ::c_long = 21;
-pub const SYS_setuid: ::c_long = 23;
-pub const SYS_getuid: ::c_long = 24;
-pub const SYS_ptrace: ::c_long = 26;
-pub const SYS_pause: ::c_long = 29;
-pub const SYS_access: ::c_long = 33;
-pub const SYS_nice: ::c_long = 34;
-pub const SYS_sync: ::c_long = 36;
-pub const SYS_kill: ::c_long = 37;
-pub const SYS_rename: ::c_long = 38;
-pub const SYS_mkdir: ::c_long = 39;
-pub const SYS_rmdir: ::c_long = 40;
-pub const SYS_dup: ::c_long = 41;
-pub const SYS_pipe: ::c_long = 42;
-pub const SYS_times: ::c_long = 43;
-pub const SYS_brk: ::c_long = 45;
-pub const SYS_setgid: ::c_long = 46;
-pub const SYS_getgid: ::c_long = 47;
-pub const SYS_geteuid: ::c_long = 49;
-pub const SYS_getegid: ::c_long = 50;
-pub const SYS_acct: ::c_long = 51;
-pub const SYS_umount2: ::c_long = 52;
-pub const SYS_ioctl: ::c_long = 54;
-pub const SYS_fcntl: ::c_long = 55;
-pub const SYS_setpgid: ::c_long = 57;
-pub const SYS_umask: ::c_long = 60;
-pub const SYS_chroot: ::c_long = 61;
-pub const SYS_ustat: ::c_long = 62;
-pub const SYS_dup2: ::c_long = 63;
-pub const SYS_getppid: ::c_long = 64;
-pub const SYS_getpgrp: ::c_long = 65;
-pub const SYS_setsid: ::c_long = 66;
-pub const SYS_sigaction: ::c_long = 67;
-pub const SYS_setreuid: ::c_long = 70;
-pub const SYS_setregid: ::c_long = 71;
-pub const SYS_sigsuspend: ::c_long = 72;
-pub const SYS_sigpending: ::c_long = 73;
-pub const SYS_sethostname: ::c_long = 74;
-pub const SYS_setrlimit: ::c_long = 75;
-pub const SYS_getrusage: ::c_long = 77;
-pub const SYS_gettimeofday: ::c_long = 78;
-pub const SYS_settimeofday: ::c_long = 79;
-pub const SYS_getgroups: ::c_long = 80;
-pub const SYS_setgroups: ::c_long = 81;
-pub const SYS_symlink: ::c_long = 83;
-pub const SYS_readlink: ::c_long = 85;
-pub const SYS_uselib: ::c_long = 86;
-pub const SYS_swapon: ::c_long = 87;
-pub const SYS_reboot: ::c_long = 88;
-pub const SYS_munmap: ::c_long = 91;
-pub const SYS_truncate: ::c_long = 92;
-pub const SYS_ftruncate: ::c_long = 93;
-pub const SYS_fchmod: ::c_long = 94;
-pub const SYS_fchown: ::c_long = 95;
-pub const SYS_getpriority: ::c_long = 96;
-pub const SYS_setpriority: ::c_long = 97;
-pub const SYS_statfs: ::c_long = 99;
-pub const SYS_fstatfs: ::c_long = 100;
-pub const SYS_syslog: ::c_long = 103;
-pub const SYS_setitimer: ::c_long = 104;
-pub const SYS_getitimer: ::c_long = 105;
-pub const SYS_stat: ::c_long = 106;
-pub const SYS_lstat: ::c_long = 107;
-pub const SYS_fstat: ::c_long = 108;
-pub const SYS_vhangup: ::c_long = 111;
-pub const SYS_wait4: ::c_long = 114;
-pub const SYS_swapoff: ::c_long = 115;
-pub const SYS_sysinfo: ::c_long = 116;
-pub const SYS_fsync: ::c_long = 118;
-pub const SYS_sigreturn: ::c_long = 119;
-pub const SYS_clone: ::c_long = 120;
-pub const SYS_setdomainname: ::c_long = 121;
-pub const SYS_uname: ::c_long = 122;
-pub const SYS_adjtimex: ::c_long = 124;
-pub const SYS_mprotect: ::c_long = 125;
-pub const SYS_sigprocmask: ::c_long = 126;
-pub const SYS_init_module: ::c_long = 128;
-pub const SYS_delete_module: ::c_long = 129;
-pub const SYS_quotactl: ::c_long = 131;
-pub const SYS_getpgid: ::c_long = 132;
-pub const SYS_fchdir: ::c_long = 133;
-pub const SYS_bdflush: ::c_long = 134;
-pub const SYS_sysfs: ::c_long = 135;
-pub const SYS_personality: ::c_long = 136;
-pub const SYS_setfsuid: ::c_long = 138;
-pub const SYS_setfsgid: ::c_long = 139;
-pub const SYS__llseek: ::c_long = 140;
-pub const SYS_getdents: ::c_long = 141;
-pub const SYS__newselect: ::c_long = 142;
-pub const SYS_flock: ::c_long = 143;
-pub const SYS_msync: ::c_long = 144;
-pub const SYS_readv: ::c_long = 145;
-pub const SYS_writev: ::c_long = 146;
-pub const SYS_getsid: ::c_long = 147;
-pub const SYS_fdatasync: ::c_long = 148;
-pub const SYS__sysctl: ::c_long = 149;
-pub const SYS_mlock: ::c_long = 150;
-pub const SYS_munlock: ::c_long = 151;
-pub const SYS_mlockall: ::c_long = 152;
-pub const SYS_munlockall: ::c_long = 153;
-pub const SYS_sched_setparam: ::c_long = 154;
-pub const SYS_sched_getparam: ::c_long = 155;
-pub const SYS_sched_setscheduler: ::c_long = 156;
-pub const SYS_sched_getscheduler: ::c_long = 157;
-pub const SYS_sched_yield: ::c_long = 158;
-pub const SYS_sched_get_priority_max: ::c_long = 159;
-pub const SYS_sched_get_priority_min: ::c_long = 160;
-pub const SYS_sched_rr_get_interval: ::c_long = 161;
-pub const SYS_nanosleep: ::c_long = 162;
-pub const SYS_mremap: ::c_long = 163;
-pub const SYS_setresuid: ::c_long = 164;
-pub const SYS_getresuid: ::c_long = 165;
-pub const SYS_poll: ::c_long = 168;
-pub const SYS_nfsservctl: ::c_long = 169;
-pub const SYS_setresgid: ::c_long = 170;
-pub const SYS_getresgid: ::c_long = 171;
-pub const SYS_prctl: ::c_long = 172;
-pub const SYS_rt_sigreturn: ::c_long = 173;
-pub const SYS_rt_sigaction: ::c_long = 174;
-pub const SYS_rt_sigprocmask: ::c_long = 175;
-pub const SYS_rt_sigpending: ::c_long = 176;
-pub const SYS_rt_sigtimedwait: ::c_long = 177;
-pub const SYS_rt_sigqueueinfo: ::c_long = 178;
-pub const SYS_rt_sigsuspend: ::c_long = 179;
-pub const SYS_pread64: ::c_long = 180;
-pub const SYS_pwrite64: ::c_long = 181;
-pub const SYS_chown: ::c_long = 182;
-pub const SYS_getcwd: ::c_long = 183;
-pub const SYS_capget: ::c_long = 184;
-pub const SYS_capset: ::c_long = 185;
-pub const SYS_sigaltstack: ::c_long = 186;
-pub const SYS_sendfile: ::c_long = 187;
-pub const SYS_vfork: ::c_long = 190;
-pub const SYS_ugetrlimit: ::c_long = 191;
-pub const SYS_mmap2: ::c_long = 192;
-pub const SYS_truncate64: ::c_long = 193;
-pub const SYS_ftruncate64: ::c_long = 194;
-pub const SYS_stat64: ::c_long = 195;
-pub const SYS_lstat64: ::c_long = 196;
-pub const SYS_fstat64: ::c_long = 197;
-pub const SYS_lchown32: ::c_long = 198;
-pub const SYS_getuid32: ::c_long = 199;
-pub const SYS_getgid32: ::c_long = 200;
-pub const SYS_geteuid32: ::c_long = 201;
-pub const SYS_getegid32: ::c_long = 202;
-pub const SYS_setreuid32: ::c_long = 203;
-pub const SYS_setregid32: ::c_long = 204;
-pub const SYS_getgroups32: ::c_long = 205;
-pub const SYS_setgroups32: ::c_long = 206;
-pub const SYS_fchown32: ::c_long = 207;
-pub const SYS_setresuid32: ::c_long = 208;
-pub const SYS_getresuid32: ::c_long = 209;
-pub const SYS_setresgid32: ::c_long = 210;
-pub const SYS_getresgid32: ::c_long = 211;
-pub const SYS_chown32: ::c_long = 212;
-pub const SYS_setuid32: ::c_long = 213;
-pub const SYS_setgid32: ::c_long = 214;
-pub const SYS_setfsuid32: ::c_long = 215;
-pub const SYS_setfsgid32: ::c_long = 216;
-pub const SYS_getdents64: ::c_long = 217;
-pub const SYS_pivot_root: ::c_long = 218;
-pub const SYS_mincore: ::c_long = 219;
-pub const SYS_madvise: ::c_long = 220;
-pub const SYS_fcntl64: ::c_long = 221;
-pub const SYS_gettid: ::c_long = 224;
-pub const SYS_readahead: ::c_long = 225;
-pub const SYS_setxattr: ::c_long = 226;
-pub const SYS_lsetxattr: ::c_long = 227;
-pub const SYS_fsetxattr: ::c_long = 228;
-pub const SYS_getxattr: ::c_long = 229;
-pub const SYS_lgetxattr: ::c_long = 230;
-pub const SYS_fgetxattr: ::c_long = 231;
-pub const SYS_listxattr: ::c_long = 232;
-pub const SYS_llistxattr: ::c_long = 233;
-pub const SYS_flistxattr: ::c_long = 234;
-pub const SYS_removexattr: ::c_long = 235;
-pub const SYS_lremovexattr: ::c_long = 236;
-pub const SYS_fremovexattr: ::c_long = 237;
-pub const SYS_tkill: ::c_long = 238;
-pub const SYS_sendfile64: ::c_long = 239;
-pub const SYS_futex: ::c_long = 240;
-pub const SYS_sched_setaffinity: ::c_long = 241;
-pub const SYS_sched_getaffinity: ::c_long = 242;
-pub const SYS_io_setup: ::c_long = 243;
-pub const SYS_io_destroy: ::c_long = 244;
-pub const SYS_io_getevents: ::c_long = 245;
-pub const SYS_io_submit: ::c_long = 246;
-pub const SYS_io_cancel: ::c_long = 247;
-pub const SYS_exit_group: ::c_long = 248;
-pub const SYS_lookup_dcookie: ::c_long = 249;
-pub const SYS_epoll_create: ::c_long = 250;
-pub const SYS_epoll_ctl: ::c_long = 251;
-pub const SYS_epoll_wait: ::c_long = 252;
-pub const SYS_remap_file_pages: ::c_long = 253;
-pub const SYS_set_tid_address: ::c_long = 256;
-pub const SYS_timer_create: ::c_long = 257;
-pub const SYS_timer_settime: ::c_long = 258;
-pub const SYS_timer_gettime: ::c_long = 259;
-pub const SYS_timer_getoverrun: ::c_long = 260;
-pub const SYS_timer_delete: ::c_long = 261;
-pub const SYS_clock_settime: ::c_long = 262;
-pub const SYS_clock_gettime: ::c_long = 263;
-pub const SYS_clock_getres: ::c_long = 264;
-pub const SYS_clock_nanosleep: ::c_long = 265;
-pub const SYS_statfs64: ::c_long = 266;
-pub const SYS_fstatfs64: ::c_long = 267;
-pub const SYS_tgkill: ::c_long = 268;
-pub const SYS_utimes: ::c_long = 269;
-pub const SYS_pciconfig_iobase: ::c_long = 271;
-pub const SYS_pciconfig_read: ::c_long = 272;
-pub const SYS_pciconfig_write: ::c_long = 273;
-pub const SYS_mq_open: ::c_long = 274;
-pub const SYS_mq_unlink: ::c_long = 275;
-pub const SYS_mq_timedsend: ::c_long = 276;
-pub const SYS_mq_timedreceive: ::c_long = 277;
-pub const SYS_mq_notify: ::c_long = 278;
-pub const SYS_mq_getsetattr: ::c_long = 279;
-pub const SYS_waitid: ::c_long = 280;
-pub const SYS_socket: ::c_long = 281;
-pub const SYS_bind: ::c_long = 282;
-pub const SYS_connect: ::c_long = 283;
-pub const SYS_listen: ::c_long = 284;
-pub const SYS_accept: ::c_long = 285;
-pub const SYS_getsockname: ::c_long = 286;
-pub const SYS_getpeername: ::c_long = 287;
-pub const SYS_socketpair: ::c_long = 288;
-pub const SYS_send: ::c_long = 289;
-pub const SYS_sendto: ::c_long = 290;
-pub const SYS_recv: ::c_long = 291;
-pub const SYS_recvfrom: ::c_long = 292;
-pub const SYS_shutdown: ::c_long = 293;
-pub const SYS_setsockopt: ::c_long = 294;
-pub const SYS_getsockopt: ::c_long = 295;
-pub const SYS_sendmsg: ::c_long = 296;
-pub const SYS_recvmsg: ::c_long = 297;
-pub const SYS_semop: ::c_long = 298;
-pub const SYS_semget: ::c_long = 299;
-pub const SYS_semctl: ::c_long = 300;
-pub const SYS_msgsnd: ::c_long = 301;
-pub const SYS_msgrcv: ::c_long = 302;
-pub const SYS_msgget: ::c_long = 303;
-pub const SYS_msgctl: ::c_long = 304;
-pub const SYS_shmat: ::c_long = 305;
-pub const SYS_shmdt: ::c_long = 306;
-pub const SYS_shmget: ::c_long = 307;
-pub const SYS_shmctl: ::c_long = 308;
-pub const SYS_add_key: ::c_long = 309;
-pub const SYS_request_key: ::c_long = 310;
-pub const SYS_keyctl: ::c_long = 311;
-pub const SYS_semtimedop: ::c_long = 312;
-pub const SYS_vserver: ::c_long = 313;
-pub const SYS_ioprio_set: ::c_long = 314;
-pub const SYS_ioprio_get: ::c_long = 315;
-pub const SYS_inotify_init: ::c_long = 316;
-pub const SYS_inotify_add_watch: ::c_long = 317;
-pub const SYS_inotify_rm_watch: ::c_long = 318;
-pub const SYS_mbind: ::c_long = 319;
-pub const SYS_get_mempolicy: ::c_long = 320;
-pub const SYS_set_mempolicy: ::c_long = 321;
-pub const SYS_openat: ::c_long = 322;
-pub const SYS_mkdirat: ::c_long = 323;
-pub const SYS_mknodat: ::c_long = 324;
-pub const SYS_fchownat: ::c_long = 325;
-pub const SYS_futimesat: ::c_long = 326;
-pub const SYS_fstatat64: ::c_long = 327;
-pub const SYS_unlinkat: ::c_long = 328;
-pub const SYS_renameat: ::c_long = 329;
-pub const SYS_linkat: ::c_long = 330;
-pub const SYS_symlinkat: ::c_long = 331;
-pub const SYS_readlinkat: ::c_long = 332;
-pub const SYS_fchmodat: ::c_long = 333;
-pub const SYS_faccessat: ::c_long = 334;
-pub const SYS_pselect6: ::c_long = 335;
-pub const SYS_ppoll: ::c_long = 336;
-pub const SYS_unshare: ::c_long = 337;
-pub const SYS_set_robust_list: ::c_long = 338;
-pub const SYS_get_robust_list: ::c_long = 339;
-pub const SYS_splice: ::c_long = 340;
-pub const SYS_tee: ::c_long = 342;
-pub const SYS_vmsplice: ::c_long = 343;
-pub const SYS_move_pages: ::c_long = 344;
-pub const SYS_getcpu: ::c_long = 345;
-pub const SYS_epoll_pwait: ::c_long = 346;
-pub const SYS_kexec_load: ::c_long = 347;
-pub const SYS_utimensat: ::c_long = 348;
-pub const SYS_signalfd: ::c_long = 349;
-pub const SYS_timerfd_create: ::c_long = 350;
-pub const SYS_eventfd: ::c_long = 351;
-pub const SYS_fallocate: ::c_long = 352;
-pub const SYS_timerfd_settime: ::c_long = 353;
-pub const SYS_timerfd_gettime: ::c_long = 354;
-pub const SYS_signalfd4: ::c_long = 355;
-pub const SYS_eventfd2: ::c_long = 356;
-pub const SYS_epoll_create1: ::c_long = 357;
-pub const SYS_dup3: ::c_long = 358;
-pub const SYS_pipe2: ::c_long = 359;
-pub const SYS_inotify_init1: ::c_long = 360;
-pub const SYS_preadv: ::c_long = 361;
-pub const SYS_pwritev: ::c_long = 362;
-pub const SYS_rt_tgsigqueueinfo: ::c_long = 363;
-pub const SYS_perf_event_open: ::c_long = 364;
-pub const SYS_recvmmsg: ::c_long = 365;
-pub const SYS_accept4: ::c_long = 366;
-pub const SYS_fanotify_init: ::c_long = 367;
-pub const SYS_fanotify_mark: ::c_long = 368;
-pub const SYS_prlimit64: ::c_long = 369;
-pub const SYS_name_to_handle_at: ::c_long = 370;
-pub const SYS_open_by_handle_at: ::c_long = 371;
-pub const SYS_clock_adjtime: ::c_long = 372;
-pub const SYS_syncfs: ::c_long = 373;
-pub const SYS_sendmmsg: ::c_long = 374;
-pub const SYS_setns: ::c_long = 375;
-pub const SYS_process_vm_readv: ::c_long = 376;
-pub const SYS_process_vm_writev: ::c_long = 377;
-pub const SYS_kcmp: ::c_long = 378;
-pub const SYS_finit_module: ::c_long = 379;
-pub const SYS_sched_setattr: ::c_long = 380;
-pub const SYS_sched_getattr: ::c_long = 381;
-pub const SYS_renameat2: ::c_long = 382;
-pub const SYS_seccomp: ::c_long = 383;
-pub const SYS_getrandom: ::c_long = 384;
-pub const SYS_memfd_create: ::c_long = 385;
-pub const SYS_bpf: ::c_long = 386;
-pub const SYS_execveat: ::c_long = 387;
-pub const SYS_userfaultfd: ::c_long = 388;
-pub const SYS_membarrier: ::c_long = 389;
-pub const SYS_mlock2: ::c_long = 390;
-pub const SYS_copy_file_range: ::c_long = 391;
-pub const SYS_preadv2: ::c_long = 392;
-pub const SYS_pwritev2: ::c_long = 393;
-pub const SYS_pkey_mprotect: ::c_long = 394;
-pub const SYS_pkey_alloc: ::c_long = 395;
-pub const SYS_pkey_free: ::c_long = 396;
-
-fn CMSG_ALIGN(len: usize) -> usize {
-    len + ::mem::size_of::<usize>() - 1 & !(::mem::size_of::<usize>() - 1)
-}
-
-f! {
-    pub fn CMSG_FIRSTHDR(mhdr: *const msghdr) -> *mut cmsghdr {
-        if (*mhdr).msg_controllen as usize >= ::mem::size_of::<cmsghdr>() {
-            (*mhdr).msg_control as *mut cmsghdr
-        } else {
-            0 as *mut cmsghdr
-        }
-    }
-
-    pub fn CMSG_DATA(cmsg: *const cmsghdr) -> *mut ::c_uchar {
-        cmsg.offset(1) as *mut ::c_uchar
-    }
-
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
-        (CMSG_ALIGN(length as usize) + CMSG_ALIGN(::mem::size_of::<cmsghdr>()))
-            as ::c_uint
-    }
-
-    pub fn CMSG_LEN(length: ::c_uint) -> ::c_uint {
-        CMSG_ALIGN(::mem::size_of::<cmsghdr>()) as ::c_uint + length
-    }
-
-    pub fn CMSG_NXTHDR(mhdr: *const msghdr,
-                       cmsg: *const cmsghdr) -> *mut cmsghdr {
-        if ((*cmsg).cmsg_len as usize) < ::mem::size_of::<cmsghdr>() {
-            return 0 as *mut cmsghdr;
-        };
-        let next = (cmsg as usize +
-                    CMSG_ALIGN((*cmsg).cmsg_len as usize))
-            as *mut cmsghdr;
-        let max = (*mhdr).msg_control as usize
-            + (*mhdr).msg_controllen as usize;
-        if (next.offset(1)) as usize > max ||
-            next as usize + CMSG_ALIGN((*next).cmsg_len as usize) > max
-        {
-            0 as *mut cmsghdr
-        } else {
-            next as *mut cmsghdr
-        }
-    }
-
-}
-
-extern "C" {
-    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
-    pub fn openpty(
-        amaster: *mut ::c_int,
-        aslave: *mut ::c_int,
-        name: *mut ::c_char,
-        termp: *mut termios,
-        winp: *mut ::winsize,
-    ) -> ::c_int;
-    pub fn setns(fd: ::c_int, nstype: ::c_int) -> ::c_int;
-    pub fn pwritev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn preadv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-}
-
-cfg_if! {
-    if #[cfg(libc_align)] {
-        mod align;
-        pub use self::align::*;
-    } else {
-        mod no_align;
-        pub use self::no_align::*;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/no_align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/arm/no_align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-s! {
-    // FIXME this is actually a union
-    pub struct sem_t {
-        #[cfg(target_pointer_width = "32")]
-        __size: [::c_char; 16],
-        #[cfg(target_pointer_width = "64")]
-        __size: [::c_char; 32],
-        __align: [::c_long; 0],
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-s! {
-    // FIXME this is actually a union
-    #[cfg_attr(target_pointer_width = "32",
-               repr(align(4)))]
-    #[cfg_attr(target_pointer_width = "64",
-               repr(align(8)))]
-    pub struct sem_t {
-        #[cfg(target_pointer_width = "32")]
-        __size: [::c_char; 16],
-        #[cfg(target_pointer_width = "64")]
-        __size: [::c_char; 32],
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,633 +0,0 @@
-pub type c_char = i8;
-pub type c_long = i32;
-pub type c_ulong = u32;
-pub type clock_t = i32;
-pub type time_t = i32;
-pub type suseconds_t = i32;
-pub type wchar_t = i32;
-pub type off_t = i32;
-pub type ino_t = u32;
-pub type blkcnt_t = i32;
-pub type blksize_t = i32;
-pub type nlink_t = u32;
-pub type fsblkcnt_t = ::c_ulong;
-pub type fsfilcnt_t = ::c_ulong;
-pub type rlim_t = c_ulong;
-
-s! {
-    pub struct stat {
-        pub st_dev: ::dev_t,
-        st_pad1: [::c_long; 2],
-        pub st_ino: ::ino_t,
-        pub st_mode: ::mode_t,
-        pub st_nlink: ::nlink_t,
-        pub st_uid: ::uid_t,
-        pub st_gid: ::gid_t,
-        pub st_rdev: ::dev_t,
-        pub st_pad2: [::c_long; 1],
-        pub st_size: ::off_t,
-        st_pad3: ::c_long,
-        pub st_atime: ::time_t,
-        pub st_atime_nsec: ::c_long,
-        pub st_mtime: ::time_t,
-        pub st_mtime_nsec: ::c_long,
-        pub st_ctime: ::time_t,
-        pub st_ctime_nsec: ::c_long,
-        pub st_blksize: ::blksize_t,
-        pub st_blocks: ::blkcnt_t,
-        st_pad5: [::c_long; 14],
-    }
-
-    pub struct stat64 {
-        pub st_dev: ::dev_t,
-        st_pad1: [::c_long; 2],
-        pub st_ino: ::ino64_t,
-        pub st_mode: ::mode_t,
-        pub st_nlink: ::nlink_t,
-        pub st_uid: ::uid_t,
-        pub st_gid: ::gid_t,
-        pub st_rdev: ::dev_t,
-        st_pad2: [::c_long; 2],
-        pub st_size: ::off64_t,
-        pub st_atime: ::time_t,
-        pub st_atime_nsec: ::c_long,
-        pub st_mtime: ::time_t,
-        pub st_mtime_nsec: ::c_long,
-        pub st_ctime: ::time_t,
-        pub st_ctime_nsec: ::c_long,
-        pub st_blksize: ::blksize_t,
-        st_pad3: ::c_long,
-        pub st_blocks: ::blkcnt64_t,
-        st_pad5: [::c_long; 14],
-    }
-
-    pub struct pthread_attr_t {
-        __size: [u32; 9]
-    }
-
-    pub struct sigaction {
-        pub sa_flags: ::c_uint,
-        pub sa_sigaction: ::sighandler_t,
-        pub sa_mask: sigset_t,
-        _restorer: *mut ::c_void,
-    }
-
-    pub struct stack_t {
-        pub ss_sp: *mut ::c_void,
-        pub ss_size: ::size_t,
-        pub ss_flags: ::c_int,
-    }
-
-    pub struct sigset_t {
-        __val: [::c_ulong; 4],
-    }
-
-    pub struct siginfo_t {
-        pub si_signo: ::c_int,
-        pub si_code: ::c_int,
-        pub si_errno: ::c_int,
-        pub _pad: [::c_int; 29],
-    }
-
-    pub struct glob64_t {
-        pub gl_pathc: ::size_t,
-        pub gl_pathv: *mut *mut ::c_char,
-        pub gl_offs: ::size_t,
-        pub gl_flags: ::c_int,
-
-        __unused1: *mut ::c_void,
-        __unused2: *mut ::c_void,
-        __unused3: *mut ::c_void,
-        __unused4: *mut ::c_void,
-        __unused5: *mut ::c_void,
-    }
-
-    pub struct ipc_perm {
-        pub __key: ::key_t,
-        pub uid: ::uid_t,
-        pub gid: ::gid_t,
-        pub cuid: ::uid_t,
-        pub cgid: ::gid_t,
-        pub mode: ::c_uint,
-        pub __seq: ::c_ushort,
-        __pad1: ::c_ushort,
-        __unused1: ::c_ulong,
-        __unused2: ::c_ulong
-    }
-
-    pub struct shmid_ds {
-        pub shm_perm: ::ipc_perm,
-        pub shm_segsz: ::size_t,
-        pub shm_atime: ::time_t,
-        pub shm_dtime: ::time_t,
-        pub shm_ctime: ::time_t,
-        pub shm_cpid: ::pid_t,
-        pub shm_lpid: ::pid_t,
-        pub shm_nattch: ::shmatt_t,
-        __unused4: ::c_ulong,
-        __unused5: ::c_ulong
-    }
-
-    pub struct msqid_ds {
-        pub msg_perm: ::ipc_perm,
-        #[cfg(target_endian = "big")]
-        __glibc_reserved1: ::c_ulong,
-        pub msg_stime: ::time_t,
-        #[cfg(target_endian = "little")]
-        __glibc_reserved1: ::c_ulong,
-        #[cfg(target_endian = "big")]
-        __glibc_reserved2: ::c_ulong,
-        pub msg_rtime: ::time_t,
-        #[cfg(target_endian = "little")]
-        __glibc_reserved2: ::c_ulong,
-        #[cfg(target_endian = "big")]
-        __glibc_reserved3: ::c_ulong,
-        pub msg_ctime: ::time_t,
-        #[cfg(target_endian = "little")]
-        __glibc_reserved3: ::c_ulong,
-        __msg_cbytes: ::c_ulong,
-        pub msg_qnum: ::msgqnum_t,
-        pub msg_qbytes: ::msglen_t,
-        pub msg_lspid: ::pid_t,
-        pub msg_lrpid: ::pid_t,
-        __glibc_reserved4: ::c_ulong,
-        __glibc_reserved5: ::c_ulong,
-    }
-
-    pub struct statfs {
-        pub f_type: ::c_long,
-        pub f_bsize: ::c_long,
-        pub f_frsize: ::c_long,
-        pub f_blocks: ::fsblkcnt_t,
-        pub f_bfree: ::fsblkcnt_t,
-        pub f_files: ::fsblkcnt_t,
-        pub f_ffree: ::fsblkcnt_t,
-        pub f_bavail: ::fsblkcnt_t,
-        pub f_fsid: ::fsid_t,
-
-        pub f_namelen: ::c_long,
-        f_spare: [::c_long; 6],
-    }
-
-    pub struct msghdr {
-        pub msg_name: *mut ::c_void,
-        pub msg_namelen: ::socklen_t,
-        pub msg_iov: *mut ::iovec,
-        pub msg_iovlen: ::c_int,
-        pub msg_control: *mut ::c_void,
-        pub msg_controllen: ::size_t,
-        pub msg_flags: ::c_int,
-    }
-
-    pub struct cmsghdr {
-        pub cmsg_len: ::size_t,
-        pub cmsg_level: ::c_int,
-        pub cmsg_type: ::c_int,
-    }
-
-    pub struct termios {
-        pub c_iflag: ::tcflag_t,
-        pub c_oflag: ::tcflag_t,
-        pub c_cflag: ::tcflag_t,
-        pub c_lflag: ::tcflag_t,
-        pub c_line: ::cc_t,
-        pub c_cc: [::cc_t; ::NCCS],
-    }
-
-    pub struct flock {
-        pub l_type: ::c_short,
-        pub l_whence: ::c_short,
-        pub l_start: ::off_t,
-        pub l_len: ::off_t,
-        pub l_sysid: ::c_long,
-        pub l_pid: ::pid_t,
-        pad: [::c_long; 4],
-    }
-
-    pub struct sysinfo {
-        pub uptime: ::c_long,
-        pub loads: [::c_ulong; 3],
-        pub totalram: ::c_ulong,
-        pub freeram: ::c_ulong,
-        pub sharedram: ::c_ulong,
-        pub bufferram: ::c_ulong,
-        pub totalswap: ::c_ulong,
-        pub freeswap: ::c_ulong,
-        pub procs: ::c_ushort,
-        pub pad: ::c_ushort,
-        pub totalhigh: ::c_ulong,
-        pub freehigh: ::c_ulong,
-        pub mem_unit: ::c_uint,
-        pub _f: [::c_char; 8],
-    }
-}
-
-pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
-pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
-pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32;
-pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
-
-pub const RLIM_INFINITY: ::rlim_t = 0x7fffffff;
-
-pub const SYS_syscall: ::c_long = 4000 + 0;
-pub const SYS_exit: ::c_long = 4000 + 1;
-pub const SYS_fork: ::c_long = 4000 + 2;
-pub const SYS_read: ::c_long = 4000 + 3;
-pub const SYS_write: ::c_long = 4000 + 4;
-pub const SYS_open: ::c_long = 4000 + 5;
-pub const SYS_close: ::c_long = 4000 + 6;
-pub const SYS_waitpid: ::c_long = 4000 + 7;
-pub const SYS_creat: ::c_long = 4000 + 8;
-pub const SYS_link: ::c_long = 4000 + 9;
-pub const SYS_unlink: ::c_long = 4000 + 10;
-pub const SYS_execve: ::c_long = 4000 + 11;
-pub const SYS_chdir: ::c_long = 4000 + 12;
-pub const SYS_time: ::c_long = 4000 + 13;
-pub const SYS_mknod: ::c_long = 4000 + 14;
-pub const SYS_chmod: ::c_long = 4000 + 15;
-pub const SYS_lchown: ::c_long = 4000 + 16;
-pub const SYS_break: ::c_long = 4000 + 17;
-pub const SYS_lseek: ::c_long = 4000 + 19;
-pub const SYS_getpid: ::c_long = 4000 + 20;
-pub const SYS_mount: ::c_long = 4000 + 21;
-pub const SYS_umount: ::c_long = 4000 + 22;
-pub const SYS_setuid: ::c_long = 4000 + 23;
-pub const SYS_getuid: ::c_long = 4000 + 24;
-pub const SYS_stime: ::c_long = 4000 + 25;
-pub const SYS_ptrace: ::c_long = 4000 + 26;
-pub const SYS_alarm: ::c_long = 4000 + 27;
-pub const SYS_pause: ::c_long = 4000 + 29;
-pub const SYS_utime: ::c_long = 4000 + 30;
-pub const SYS_stty: ::c_long = 4000 + 31;
-pub const SYS_gtty: ::c_long = 4000 + 32;
-pub const SYS_access: ::c_long = 4000 + 33;
-pub const SYS_nice: ::c_long = 4000 + 34;
-pub const SYS_ftime: ::c_long = 4000 + 35;
-pub const SYS_sync: ::c_long = 4000 + 36;
-pub const SYS_kill: ::c_long = 4000 + 37;
-pub const SYS_rename: ::c_long = 4000 + 38;
-pub const SYS_mkdir: ::c_long = 4000 + 39;
-pub const SYS_rmdir: ::c_long = 4000 + 40;
-pub const SYS_dup: ::c_long = 4000 + 41;
-pub const SYS_pipe: ::c_long = 4000 + 42;
-pub const SYS_times: ::c_long = 4000 + 43;
-pub const SYS_prof: ::c_long = 4000 + 44;
-pub const SYS_brk: ::c_long = 4000 + 45;
-pub const SYS_setgid: ::c_long = 4000 + 46;
-pub const SYS_getgid: ::c_long = 4000 + 47;
-pub const SYS_signal: ::c_long = 4000 + 48;
-pub const SYS_geteuid: ::c_long = 4000 + 49;
-pub const SYS_getegid: ::c_long = 4000 + 50;
-pub const SYS_acct: ::c_long = 4000 + 51;
-pub const SYS_umount2: ::c_long = 4000 + 52;
-pub const SYS_lock: ::c_long = 4000 + 53;
-pub const SYS_ioctl: ::c_long = 4000 + 54;
-pub const SYS_fcntl: ::c_long = 4000 + 55;
-pub const SYS_mpx: ::c_long = 4000 + 56;
-pub const SYS_setpgid: ::c_long = 4000 + 57;
-pub const SYS_ulimit: ::c_long = 4000 + 58;
-pub const SYS_umask: ::c_long = 4000 + 60;
-pub const SYS_chroot: ::c_long = 4000 + 61;
-pub const SYS_ustat: ::c_long = 4000 + 62;
-pub const SYS_dup2: ::c_long = 4000 + 63;
-pub const SYS_getppid: ::c_long = 4000 + 64;
-pub const SYS_getpgrp: ::c_long = 4000 + 65;
-pub const SYS_setsid: ::c_long = 4000 + 66;
-pub const SYS_sigaction: ::c_long = 4000 + 67;
-pub const SYS_sgetmask: ::c_long = 4000 + 68;
-pub const SYS_ssetmask: ::c_long = 4000 + 69;
-pub const SYS_setreuid: ::c_long = 4000 + 70;
-pub const SYS_setregid: ::c_long = 4000 + 71;
-pub const SYS_sigsuspend: ::c_long = 4000 + 72;
-pub const SYS_sigpending: ::c_long = 4000 + 73;
-pub const SYS_sethostname: ::c_long = 4000 + 74;
-pub const SYS_setrlimit: ::c_long = 4000 + 75;
-pub const SYS_getrlimit: ::c_long = 4000 + 76;
-pub const SYS_getrusage: ::c_long = 4000 + 77;
-pub const SYS_gettimeofday: ::c_long = 4000 + 78;
-pub const SYS_settimeofday: ::c_long = 4000 + 79;
-pub const SYS_getgroups: ::c_long = 4000 + 80;
-pub const SYS_setgroups: ::c_long = 4000 + 81;
-pub const SYS_symlink: ::c_long = 4000 + 83;
-pub const SYS_readlink: ::c_long = 4000 + 85;
-pub const SYS_uselib: ::c_long = 4000 + 86;
-pub const SYS_swapon: ::c_long = 4000 + 87;
-pub const SYS_reboot: ::c_long = 4000 + 88;
-pub const SYS_readdir: ::c_long = 4000 + 89;
-pub const SYS_mmap: ::c_long = 4000 + 90;
-pub const SYS_munmap: ::c_long = 4000 + 91;
-pub const SYS_truncate: ::c_long = 4000 + 92;
-pub const SYS_ftruncate: ::c_long = 4000 + 93;
-pub const SYS_fchmod: ::c_long = 4000 + 94;
-pub const SYS_fchown: ::c_long = 4000 + 95;
-pub const SYS_getpriority: ::c_long = 4000 + 96;
-pub const SYS_setpriority: ::c_long = 4000 + 97;
-pub const SYS_profil: ::c_long = 4000 + 98;
-pub const SYS_statfs: ::c_long = 4000 + 99;
-pub const SYS_fstatfs: ::c_long = 4000 + 100;
-pub const SYS_ioperm: ::c_long = 4000 + 101;
-pub const SYS_socketcall: ::c_long = 4000 + 102;
-pub const SYS_syslog: ::c_long = 4000 + 103;
-pub const SYS_setitimer: ::c_long = 4000 + 104;
-pub const SYS_getitimer: ::c_long = 4000 + 105;
-pub const SYS_stat: ::c_long = 4000 + 106;
-pub const SYS_lstat: ::c_long = 4000 + 107;
-pub const SYS_fstat: ::c_long = 4000 + 108;
-pub const SYS_iopl: ::c_long = 4000 + 110;
-pub const SYS_vhangup: ::c_long = 4000 + 111;
-pub const SYS_idle: ::c_long = 4000 + 112;
-pub const SYS_vm86: ::c_long = 4000 + 113;
-pub const SYS_wait4: ::c_long = 4000 + 114;
-pub const SYS_swapoff: ::c_long = 4000 + 115;
-pub const SYS_sysinfo: ::c_long = 4000 + 116;
-pub const SYS_ipc: ::c_long = 4000 + 117;
-pub const SYS_fsync: ::c_long = 4000 + 118;
-pub const SYS_sigreturn: ::c_long = 4000 + 119;
-pub const SYS_clone: ::c_long = 4000 + 120;
-pub const SYS_setdomainname: ::c_long = 4000 + 121;
-pub const SYS_uname: ::c_long = 4000 + 122;
-pub const SYS_modify_ldt: ::c_long = 4000 + 123;
-pub const SYS_adjtimex: ::c_long = 4000 + 124;
-pub const SYS_mprotect: ::c_long = 4000 + 125;
-pub const SYS_sigprocmask: ::c_long = 4000 + 126;
-pub const SYS_create_module: ::c_long = 4000 + 127;
-pub const SYS_init_module: ::c_long = 4000 + 128;
-pub const SYS_delete_module: ::c_long = 4000 + 129;
-pub const SYS_get_kernel_syms: ::c_long = 4000 + 130;
-pub const SYS_quotactl: ::c_long = 4000 + 131;
-pub const SYS_getpgid: ::c_long = 4000 + 132;
-pub const SYS_fchdir: ::c_long = 4000 + 133;
-pub const SYS_bdflush: ::c_long = 4000 + 134;
-pub const SYS_sysfs: ::c_long = 4000 + 135;
-pub const SYS_personality: ::c_long = 4000 + 136;
-pub const SYS_afs_syscall: ::c_long = 4000 + 137;
-pub const SYS_setfsuid: ::c_long = 4000 + 138;
-pub const SYS_setfsgid: ::c_long = 4000 + 139;
-pub const SYS__llseek: ::c_long = 4000 + 140;
-pub const SYS_getdents: ::c_long = 4000 + 141;
-pub const SYS__newselect: ::c_long = 4000 + 142;
-pub const SYS_flock: ::c_long = 4000 + 143;
-pub const SYS_msync: ::c_long = 4000 + 144;
-pub const SYS_readv: ::c_long = 4000 + 145;
-pub const SYS_writev: ::c_long = 4000 + 146;
-pub const SYS_cacheflush: ::c_long = 4000 + 147;
-pub const SYS_cachectl: ::c_long = 4000 + 148;
-pub const SYS_sysmips: ::c_long = 4000 + 149;
-pub const SYS_getsid: ::c_long = 4000 + 151;
-pub const SYS_fdatasync: ::c_long = 4000 + 152;
-pub const SYS__sysctl: ::c_long = 4000 + 153;
-pub const SYS_mlock: ::c_long = 4000 + 154;
-pub const SYS_munlock: ::c_long = 4000 + 155;
-pub const SYS_mlockall: ::c_long = 4000 + 156;
-pub const SYS_munlockall: ::c_long = 4000 + 157;
-pub const SYS_sched_setparam: ::c_long = 4000 + 158;
-pub const SYS_sched_getparam: ::c_long = 4000 + 159;
-pub const SYS_sched_setscheduler: ::c_long = 4000 + 160;
-pub const SYS_sched_getscheduler: ::c_long = 4000 + 161;
-pub const SYS_sched_yield: ::c_long = 4000 + 162;
-pub const SYS_sched_get_priority_max: ::c_long = 4000 + 163;
-pub const SYS_sched_get_priority_min: ::c_long = 4000 + 164;
-pub const SYS_sched_rr_get_interval: ::c_long = 4000 + 165;
-pub const SYS_nanosleep: ::c_long = 4000 + 166;
-pub const SYS_mremap: ::c_long = 4000 + 167;
-pub const SYS_accept: ::c_long = 4000 + 168;
-pub const SYS_bind: ::c_long = 4000 + 169;
-pub const SYS_connect: ::c_long = 4000 + 170;
-pub const SYS_getpeername: ::c_long = 4000 + 171;
-pub const SYS_getsockname: ::c_long = 4000 + 172;
-pub const SYS_getsockopt: ::c_long = 4000 + 173;
-pub const SYS_listen: ::c_long = 4000 + 174;
-pub const SYS_recv: ::c_long = 4000 + 175;
-pub const SYS_recvfrom: ::c_long = 4000 + 176;
-pub const SYS_recvmsg: ::c_long = 4000 + 177;
-pub const SYS_send: ::c_long = 4000 + 178;
-pub const SYS_sendmsg: ::c_long = 4000 + 179;
-pub const SYS_sendto: ::c_long = 4000 + 180;
-pub const SYS_setsockopt: ::c_long = 4000 + 181;
-pub const SYS_shutdown: ::c_long = 4000 + 182;
-pub const SYS_socket: ::c_long = 4000 + 183;
-pub const SYS_socketpair: ::c_long = 4000 + 184;
-pub const SYS_setresuid: ::c_long = 4000 + 185;
-pub const SYS_getresuid: ::c_long = 4000 + 186;
-pub const SYS_query_module: ::c_long = 4000 + 187;
-pub const SYS_poll: ::c_long = 4000 + 188;
-pub const SYS_nfsservctl: ::c_long = 4000 + 189;
-pub const SYS_setresgid: ::c_long = 4000 + 190;
-pub const SYS_getresgid: ::c_long = 4000 + 191;
-pub const SYS_prctl: ::c_long = 4000 + 192;
-pub const SYS_rt_sigreturn: ::c_long = 4000 + 193;
-pub const SYS_rt_sigaction: ::c_long = 4000 + 194;
-pub const SYS_rt_sigprocmask: ::c_long = 4000 + 195;
-pub const SYS_rt_sigpending: ::c_long = 4000 + 196;
-pub const SYS_rt_sigtimedwait: ::c_long = 4000 + 197;
-pub const SYS_rt_sigqueueinfo: ::c_long = 4000 + 198;
-pub const SYS_rt_sigsuspend: ::c_long = 4000 + 199;
-pub const SYS_pread64: ::c_long = 4000 + 200;
-pub const SYS_pwrite64: ::c_long = 4000 + 201;
-pub const SYS_chown: ::c_long = 4000 + 202;
-pub const SYS_getcwd: ::c_long = 4000 + 203;
-pub const SYS_capget: ::c_long = 4000 + 204;
-pub const SYS_capset: ::c_long = 4000 + 205;
-pub const SYS_sigaltstack: ::c_long = 4000 + 206;
-pub const SYS_sendfile: ::c_long = 4000 + 207;
-pub const SYS_getpmsg: ::c_long = 4000 + 208;
-pub const SYS_putpmsg: ::c_long = 4000 + 209;
-pub const SYS_mmap2: ::c_long = 4000 + 210;
-pub const SYS_truncate64: ::c_long = 4000 + 211;
-pub const SYS_ftruncate64: ::c_long = 4000 + 212;
-pub const SYS_stat64: ::c_long = 4000 + 213;
-pub const SYS_lstat64: ::c_long = 4000 + 214;
-pub const SYS_fstat64: ::c_long = 4000 + 215;
-pub const SYS_pivot_root: ::c_long = 4000 + 216;
-pub const SYS_mincore: ::c_long = 4000 + 217;
-pub const SYS_madvise: ::c_long = 4000 + 218;
-pub const SYS_getdents64: ::c_long = 4000 + 219;
-pub const SYS_fcntl64: ::c_long = 4000 + 220;
-pub const SYS_gettid: ::c_long = 4000 + 222;
-pub const SYS_readahead: ::c_long = 4000 + 223;
-pub const SYS_setxattr: ::c_long = 4000 + 224;
-pub const SYS_lsetxattr: ::c_long = 4000 + 225;
-pub const SYS_fsetxattr: ::c_long = 4000 + 226;
-pub const SYS_getxattr: ::c_long = 4000 + 227;
-pub const SYS_lgetxattr: ::c_long = 4000 + 228;
-pub const SYS_fgetxattr: ::c_long = 4000 + 229;
-pub const SYS_listxattr: ::c_long = 4000 + 230;
-pub const SYS_llistxattr: ::c_long = 4000 + 231;
-pub const SYS_flistxattr: ::c_long = 4000 + 232;
-pub const SYS_removexattr: ::c_long = 4000 + 233;
-pub const SYS_lremovexattr: ::c_long = 4000 + 234;
-pub const SYS_fremovexattr: ::c_long = 4000 + 235;
-pub const SYS_tkill: ::c_long = 4000 + 236;
-pub const SYS_sendfile64: ::c_long = 4000 + 237;
-pub const SYS_futex: ::c_long = 4000 + 238;
-pub const SYS_sched_setaffinity: ::c_long = 4000 + 239;
-pub const SYS_sched_getaffinity: ::c_long = 4000 + 240;
-pub const SYS_io_setup: ::c_long = 4000 + 241;
-pub const SYS_io_destroy: ::c_long = 4000 + 242;
-pub const SYS_io_getevents: ::c_long = 4000 + 243;
-pub const SYS_io_submit: ::c_long = 4000 + 244;
-pub const SYS_io_cancel: ::c_long = 4000 + 245;
-pub const SYS_exit_group: ::c_long = 4000 + 246;
-pub const SYS_lookup_dcookie: ::c_long = 4000 + 247;
-pub const SYS_epoll_create: ::c_long = 4000 + 248;
-pub const SYS_epoll_ctl: ::c_long = 4000 + 249;
-pub const SYS_epoll_wait: ::c_long = 4000 + 250;
-pub const SYS_remap_file_pages: ::c_long = 4000 + 251;
-pub const SYS_set_tid_address: ::c_long = 4000 + 252;
-pub const SYS_restart_syscall: ::c_long = 4000 + 253;
-pub const SYS_fadvise64: ::c_long = 4000 + 254;
-pub const SYS_statfs64: ::c_long = 4000 + 255;
-pub const SYS_fstatfs64: ::c_long = 4000 + 256;
-pub const SYS_timer_create: ::c_long = 4000 + 257;
-pub const SYS_timer_settime: ::c_long = 4000 + 258;
-pub const SYS_timer_gettime: ::c_long = 4000 + 259;
-pub const SYS_timer_getoverrun: ::c_long = 4000 + 260;
-pub const SYS_timer_delete: ::c_long = 4000 + 261;
-pub const SYS_clock_settime: ::c_long = 4000 + 262;
-pub const SYS_clock_gettime: ::c_long = 4000 + 263;
-pub const SYS_clock_getres: ::c_long = 4000 + 264;
-pub const SYS_clock_nanosleep: ::c_long = 4000 + 265;
-pub const SYS_tgkill: ::c_long = 4000 + 266;
-pub const SYS_utimes: ::c_long = 4000 + 267;
-pub const SYS_mbind: ::c_long = 4000 + 268;
-pub const SYS_get_mempolicy: ::c_long = 4000 + 269;
-pub const SYS_set_mempolicy: ::c_long = 4000 + 270;
-pub const SYS_mq_open: ::c_long = 4000 + 271;
-pub const SYS_mq_unlink: ::c_long = 4000 + 272;
-pub const SYS_mq_timedsend: ::c_long = 4000 + 273;
-pub const SYS_mq_timedreceive: ::c_long = 4000 + 274;
-pub const SYS_mq_notify: ::c_long = 4000 + 275;
-pub const SYS_mq_getsetattr: ::c_long = 4000 + 276;
-pub const SYS_vserver: ::c_long = 4000 + 277;
-pub const SYS_waitid: ::c_long = 4000 + 278;
-/* pub const SYS_sys_setaltroot: ::c_long = 4000 + 279; */
-pub const SYS_add_key: ::c_long = 4000 + 280;
-pub const SYS_request_key: ::c_long = 4000 + 281;
-pub const SYS_keyctl: ::c_long = 4000 + 282;
-pub const SYS_set_thread_area: ::c_long = 4000 + 283;
-pub const SYS_inotify_init: ::c_long = 4000 + 284;
-pub const SYS_inotify_add_watch: ::c_long = 4000 + 285;
-pub const SYS_inotify_rm_watch: ::c_long = 4000 + 286;
-pub const SYS_migrate_pages: ::c_long = 4000 + 287;
-pub const SYS_openat: ::c_long = 4000 + 288;
-pub const SYS_mkdirat: ::c_long = 4000 + 289;
-pub const SYS_mknodat: ::c_long = 4000 + 290;
-pub const SYS_fchownat: ::c_long = 4000 + 291;
-pub const SYS_futimesat: ::c_long = 4000 + 292;
-pub const SYS_fstatat64: ::c_long = 4000 + 293;
-pub const SYS_unlinkat: ::c_long = 4000 + 294;
-pub const SYS_renameat: ::c_long = 4000 + 295;
-pub const SYS_linkat: ::c_long = 4000 + 296;
-pub const SYS_symlinkat: ::c_long = 4000 + 297;
-pub const SYS_readlinkat: ::c_long = 4000 + 298;
-pub const SYS_fchmodat: ::c_long = 4000 + 299;
-pub const SYS_faccessat: ::c_long = 4000 + 300;
-pub const SYS_pselect6: ::c_long = 4000 + 301;
-pub const SYS_ppoll: ::c_long = 4000 + 302;
-pub const SYS_unshare: ::c_long = 4000 + 303;
-pub const SYS_splice: ::c_long = 4000 + 304;
-pub const SYS_sync_file_range: ::c_long = 4000 + 305;
-pub const SYS_tee: ::c_long = 4000 + 306;
-pub const SYS_vmsplice: ::c_long = 4000 + 307;
-pub const SYS_move_pages: ::c_long = 4000 + 308;
-pub const SYS_set_robust_list: ::c_long = 4000 + 309;
-pub const SYS_get_robust_list: ::c_long = 4000 + 310;
-pub const SYS_kexec_load: ::c_long = 4000 + 311;
-pub const SYS_getcpu: ::c_long = 4000 + 312;
-pub const SYS_epoll_pwait: ::c_long = 4000 + 313;
-pub const SYS_ioprio_set: ::c_long = 4000 + 314;
-pub const SYS_ioprio_get: ::c_long = 4000 + 315;
-pub const SYS_utimensat: ::c_long = 4000 + 316;
-pub const SYS_signalfd: ::c_long = 4000 + 317;
-pub const SYS_timerfd: ::c_long = 4000 + 318;
-pub const SYS_eventfd: ::c_long = 4000 + 319;
-pub const SYS_fallocate: ::c_long = 4000 + 320;
-pub const SYS_timerfd_create: ::c_long = 4000 + 321;
-pub const SYS_timerfd_gettime: ::c_long = 4000 + 322;
-pub const SYS_timerfd_settime: ::c_long = 4000 + 323;
-pub const SYS_signalfd4: ::c_long = 4000 + 324;
-pub const SYS_eventfd2: ::c_long = 4000 + 325;
-pub const SYS_epoll_create1: ::c_long = 4000 + 326;
-pub const SYS_dup3: ::c_long = 4000 + 327;
-pub const SYS_pipe2: ::c_long = 4000 + 328;
-pub const SYS_inotify_init1: ::c_long = 4000 + 329;
-pub const SYS_preadv: ::c_long = 4000 + 330;
-pub const SYS_pwritev: ::c_long = 4000 + 331;
-pub const SYS_rt_tgsigqueueinfo: ::c_long = 4000 + 332;
-pub const SYS_perf_event_open: ::c_long = 4000 + 333;
-pub const SYS_accept4: ::c_long = 4000 + 334;
-pub const SYS_recvmmsg: ::c_long = 4000 + 335;
-pub const SYS_fanotify_init: ::c_long = 4000 + 336;
-pub const SYS_fanotify_mark: ::c_long = 4000 + 337;
-pub const SYS_prlimit64: ::c_long = 4000 + 338;
-pub const SYS_name_to_handle_at: ::c_long = 4000 + 339;
-pub const SYS_open_by_handle_at: ::c_long = 4000 + 340;
-pub const SYS_clock_adjtime: ::c_long = 4000 + 341;
-pub const SYS_syncfs: ::c_long = 4000 + 342;
-pub const SYS_sendmmsg: ::c_long = 4000 + 343;
-pub const SYS_setns: ::c_long = 4000 + 344;
-pub const SYS_process_vm_readv: ::c_long = 4000 + 345;
-pub const SYS_process_vm_writev: ::c_long = 4000 + 346;
-pub const SYS_kcmp: ::c_long = 4000 + 347;
-pub const SYS_finit_module: ::c_long = 4000 + 348;
-pub const SYS_sched_setattr: ::c_long = 4000 + 349;
-pub const SYS_sched_getattr: ::c_long = 4000 + 350;
-pub const SYS_renameat2: ::c_long = 4000 + 351;
-pub const SYS_seccomp: ::c_long = 4000 + 352;
-pub const SYS_getrandom: ::c_long = 4000 + 353;
-pub const SYS_memfd_create: ::c_long = 4000 + 354;
-pub const SYS_bpf: ::c_long = 4000 + 355;
-pub const SYS_execveat: ::c_long = 4000 + 356;
-pub const SYS_userfaultfd: ::c_long = 4000 + 357;
-pub const SYS_membarrier: ::c_long = 4000 + 358;
-pub const SYS_mlock2: ::c_long = 4000 + 359;
-pub const SYS_copy_file_range: ::c_long = 4000 + 360;
-pub const SYS_preadv2: ::c_long = 4000 + 361;
-pub const SYS_pwritev2: ::c_long = 4000 + 362;
-pub const SYS_pkey_mprotect: ::c_long = 4000 + 363;
-pub const SYS_pkey_alloc: ::c_long = 4000 + 364;
-pub const SYS_pkey_free: ::c_long = 4000 + 365;
-
-#[link(name = "util")]
-extern "C" {
-    pub fn sysctl(
-        name: *mut ::c_int,
-        namelen: ::c_int,
-        oldp: *mut ::c_void,
-        oldlenp: *mut ::size_t,
-        newp: *mut ::c_void,
-        newlen: ::size_t,
-    ) -> ::c_int;
-    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
-    pub fn backtrace(buf: *mut *mut ::c_void, sz: ::c_int) -> ::c_int;
-    pub fn glob64(
-        pattern: *const ::c_char,
-        flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int,
-        >,
-        pglob: *mut glob64_t,
-    ) -> ::c_int;
-    pub fn globfree64(pglob: *mut glob64_t);
-    pub fn ptrace(request: ::c_uint, ...) -> ::c_long;
-    pub fn pthread_attr_getaffinity_np(
-        attr: *const ::pthread_attr_t,
-        cpusetsize: ::size_t,
-        cpuset: *mut ::cpu_set_t,
-    ) -> ::c_int;
-    pub fn pthread_attr_setaffinity_np(
-        attr: *mut ::pthread_attr_t,
-        cpusetsize: ::size_t,
-        cpuset: *const ::cpu_set_t,
-    ) -> ::c_int;
-}
-
-cfg_if! {
-    if #[cfg(libc_align)] {
-        mod align;
-        pub use self::align::*;
-    } else {
-        mod no_align;
-        pub use self::no_align::*;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/no_align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips32/no_align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-s! {
-    // FIXME this is actually a union
-    pub struct sem_t {
-        #[cfg(target_pointer_width = "32")]
-        __size: [::c_char; 16],
-        #[cfg(target_pointer_width = "64")]
-        __size: [::c_char; 32],
-        __align: [::c_long; 0],
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-s! {
-    // FIXME this is actually a union
-    #[cfg_attr(target_pointer_width = "32",
-               repr(align(4)))]
-    #[cfg_attr(target_pointer_width = "64",
-               repr(align(8)))]
-    pub struct sem_t {
-        __size: [::c_char; 32],
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,213 +0,0 @@
-pub type blkcnt_t = i64;
-pub type blksize_t = i64;
-pub type c_char = i8;
-pub type c_long = i64;
-pub type c_ulong = u64;
-pub type fsblkcnt_t = ::c_ulong;
-pub type fsfilcnt_t = ::c_ulong;
-pub type ino_t = u64;
-pub type nlink_t = u64;
-pub type off_t = i64;
-pub type rlim_t = ::c_ulong;
-pub type suseconds_t = i64;
-pub type time_t = i64;
-pub type wchar_t = i32;
-
-s! {
-    pub struct stat {
-        pub st_dev: ::c_ulong,
-        st_pad1: [::c_long; 2],
-        pub st_ino: ::ino_t,
-        pub st_mode: ::mode_t,
-        pub st_nlink: ::nlink_t,
-        pub st_uid: ::uid_t,
-        pub st_gid: ::gid_t,
-        pub st_rdev: ::c_ulong,
-        st_pad2: [::c_ulong; 1],
-        pub st_size: ::off_t,
-        st_pad3: ::c_long,
-        pub st_atime: ::time_t,
-        pub st_atime_nsec: ::c_long,
-        pub st_mtime: ::time_t,
-        pub st_mtime_nsec: ::c_long,
-        pub st_ctime: ::time_t,
-        pub st_ctime_nsec: ::c_long,
-        pub st_blksize: ::blksize_t,
-        st_pad4: ::c_long,
-        pub st_blocks: ::blkcnt_t,
-        st_pad5: [::c_long; 7],
-    }
-
-    pub struct stat64 {
-        pub st_dev: ::c_ulong,
-        st_pad1: [::c_long; 2],
-        pub st_ino: ::ino64_t,
-        pub st_mode: ::mode_t,
-        pub st_nlink: ::nlink_t,
-        pub st_uid: ::uid_t,
-        pub st_gid: ::gid_t,
-        pub st_rdev: ::c_ulong,
-        st_pad2: [::c_long; 2],
-        pub st_size: ::off64_t,
-        pub st_atime: ::time_t,
-        pub st_atime_nsec: ::c_long,
-        pub st_mtime: ::time_t,
-        pub st_mtime_nsec: ::c_long,
-        pub st_ctime: ::time_t,
-        pub st_ctime_nsec: ::c_long,
-        pub st_blksize: ::blksize_t,
-        st_pad3: ::c_long,
-        pub st_blocks: ::blkcnt64_t,
-        st_pad5: [::c_long; 7],
-    }
-
-    pub struct pthread_attr_t {
-        __size: [::c_ulong; 7]
-    }
-
-    pub struct sigaction {
-        pub sa_flags: ::c_int,
-        pub sa_sigaction: ::sighandler_t,
-        pub sa_mask: sigset_t,
-        _restorer: *mut ::c_void,
-    }
-
-    pub struct stack_t {
-        pub ss_sp: *mut ::c_void,
-        pub ss_size: ::size_t,
-        pub ss_flags: ::c_int,
-    }
-
-    pub struct sigset_t {
-        __size: [::c_ulong; 16],
-    }
-
-    pub struct siginfo_t {
-        pub si_signo: ::c_int,
-        pub si_code: ::c_int,
-        pub si_errno: ::c_int,
-        _pad: ::c_int,
-        _pad2: [::c_long; 14],
-    }
-
-    pub struct ipc_perm {
-        pub __key: ::key_t,
-        pub uid: ::uid_t,
-        pub gid: ::gid_t,
-        pub cuid: ::uid_t,
-        pub cgid: ::gid_t,
-        pub mode: ::c_uint,
-        pub __seq: ::c_ushort,
-        __pad1: ::c_ushort,
-        __unused1: ::c_ulong,
-        __unused2: ::c_ulong
-    }
-
-    pub struct shmid_ds {
-        pub shm_perm: ::ipc_perm,
-        pub shm_segsz: ::size_t,
-        pub shm_atime: ::time_t,
-        pub shm_dtime: ::time_t,
-        pub shm_ctime: ::time_t,
-        pub shm_cpid: ::pid_t,
-        pub shm_lpid: ::pid_t,
-        pub shm_nattch: ::shmatt_t,
-        __unused4: ::c_ulong,
-        __unused5: ::c_ulong
-    }
-
-    pub struct msqid_ds {
-        pub msg_perm: ::ipc_perm,
-        pub msg_stime: ::time_t,
-        pub msg_rtime: ::time_t,
-        pub msg_ctime: ::time_t,
-        __msg_cbytes: ::c_ulong,
-        pub msg_qnum: ::msgqnum_t,
-        pub msg_qbytes: ::msglen_t,
-        pub msg_lspid: ::pid_t,
-        pub msg_lrpid: ::pid_t,
-        __glibc_reserved4: ::c_ulong,
-        __glibc_reserved5: ::c_ulong,
-    }
-
-    pub struct statfs {
-        pub f_type: ::c_long,
-        pub f_bsize: ::c_long,
-        pub f_frsize: ::c_long,
-        pub f_blocks: ::fsblkcnt_t,
-        pub f_bfree: ::fsblkcnt_t,
-        pub f_files: ::fsblkcnt_t,
-        pub f_ffree: ::fsblkcnt_t,
-        pub f_bavail: ::fsblkcnt_t,
-        pub f_fsid: ::fsid_t,
-
-        pub f_namelen: ::c_long,
-        f_spare: [::c_long; 6],
-    }
-
-    pub struct msghdr {
-        pub msg_name: *mut ::c_void,
-        pub msg_namelen: ::socklen_t,
-        pub msg_iov: *mut ::iovec,
-        pub msg_iovlen: ::size_t,
-        pub msg_control: *mut ::c_void,
-        pub msg_controllen: ::size_t,
-        pub msg_flags: ::c_int,
-    }
-
-    pub struct cmsghdr {
-        pub cmsg_len: ::size_t,
-        pub cmsg_level: ::c_int,
-        pub cmsg_type: ::c_int,
-    }
-
-    pub struct termios {
-        pub c_iflag: ::tcflag_t,
-        pub c_oflag: ::tcflag_t,
-        pub c_cflag: ::tcflag_t,
-        pub c_lflag: ::tcflag_t,
-        pub c_line: ::cc_t,
-        pub c_cc: [::cc_t; ::NCCS],
-    }
-
-    pub struct sysinfo {
-        pub uptime: ::c_long,
-        pub loads: [::c_ulong; 3],
-        pub totalram: ::c_ulong,
-        pub freeram: ::c_ulong,
-        pub sharedram: ::c_ulong,
-        pub bufferram: ::c_ulong,
-        pub totalswap: ::c_ulong,
-        pub freeswap: ::c_ulong,
-        pub procs: ::c_ushort,
-        pub pad: ::c_ushort,
-        pub totalhigh: ::c_ulong,
-        pub freehigh: ::c_ulong,
-        pub mem_unit: ::c_uint,
-        pub _f: [::c_char; 0],
-    }
-}
-
-pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
-pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
-pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
-pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
-
-pub const RLIM_INFINITY: ::rlim_t = 0xffff_ffff_ffff_ffff;
-
-pub const SYS_gettid: ::c_long = 5178; // Valid for n64
-
-#[link(name = "util")]
-extern "C" {
-    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
-}
-
-cfg_if! {
-    if #[cfg(libc_align)] {
-        mod align;
-        pub use self::align::*;
-    } else {
-        mod no_align;
-        pub use self::no_align::*;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/no_align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mips64/no_align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-s! {
-    // FIXME this is actually a union
-    pub struct sem_t {
-        __size: [::c_char; 32],
-        __align: [::c_long; 0],
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mips/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,479 +0,0 @@
-pub type pthread_t = ::c_ulong;
-
-pub const SFD_CLOEXEC: ::c_int = 0x080000;
-
-pub const NCCS: usize = 32;
-
-pub const O_TRUNC: ::c_int = 512;
-
-pub const O_CLOEXEC: ::c_int = 0x80000;
-
-pub const EBFONT: ::c_int = 59;
-pub const ENOSTR: ::c_int = 60;
-pub const ENODATA: ::c_int = 61;
-pub const ETIME: ::c_int = 62;
-pub const ENOSR: ::c_int = 63;
-pub const ENONET: ::c_int = 64;
-pub const ENOPKG: ::c_int = 65;
-pub const EREMOTE: ::c_int = 66;
-pub const ENOLINK: ::c_int = 67;
-pub const EADV: ::c_int = 68;
-pub const ESRMNT: ::c_int = 69;
-pub const ECOMM: ::c_int = 70;
-pub const EPROTO: ::c_int = 71;
-pub const EDOTDOT: ::c_int = 73;
-
-pub const SA_NODEFER: ::c_int = 0x40000000;
-pub const SA_RESETHAND: ::c_int = 0x80000000;
-pub const SA_RESTART: ::c_int = 0x10000000;
-pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
-
-pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
-
-pub const EFD_CLOEXEC: ::c_int = 0x80000;
-
-pub const BUFSIZ: ::c_uint = 4096;
-pub const TMP_MAX: ::c_uint = 238328;
-pub const FOPEN_MAX: ::c_uint = 16;
-pub const POSIX_FADV_DONTNEED: ::c_int = 4;
-pub const POSIX_FADV_NOREUSE: ::c_int = 5;
-pub const POSIX_MADV_DONTNEED: ::c_int = 4;
-pub const _SC_2_C_VERSION: ::c_int = 96;
-pub const O_ACCMODE: ::c_int = 3;
-pub const O_DIRECT: ::c_int = 0x8000;
-pub const O_DIRECTORY: ::c_int = 0x10000;
-pub const O_NOFOLLOW: ::c_int = 0x20000;
-pub const ST_RELATIME: ::c_ulong = 4096;
-pub const NI_MAXHOST: ::socklen_t = 1025;
-
-pub const RLIMIT_NOFILE: ::c_int = 5;
-pub const RLIMIT_AS: ::c_int = 6;
-pub const RLIMIT_RSS: ::c_int = 7;
-pub const RLIMIT_NPROC: ::c_int = 8;
-pub const RLIMIT_MEMLOCK: ::c_int = 9;
-pub const RLIMIT_NLIMITS: ::c_int = 15;
-
-pub const O_APPEND: ::c_int = 8;
-pub const O_CREAT: ::c_int = 256;
-pub const O_EXCL: ::c_int = 1024;
-pub const O_NOCTTY: ::c_int = 2048;
-pub const O_NONBLOCK: ::c_int = 128;
-pub const O_SYNC: ::c_int = 0x10;
-pub const O_RSYNC: ::c_int = 0x10;
-pub const O_DSYNC: ::c_int = 0x10;
-pub const O_FSYNC: ::c_int = 0x10;
-pub const O_ASYNC: ::c_int = 0x1000;
-pub const O_NDELAY: ::c_int = 0x80;
-
-pub const SOCK_NONBLOCK: ::c_int = 128;
-
-pub const EDEADLK: ::c_int = 45;
-pub const ENAMETOOLONG: ::c_int = 78;
-pub const ENOLCK: ::c_int = 46;
-pub const ENOSYS: ::c_int = 89;
-pub const ENOTEMPTY: ::c_int = 93;
-pub const ELOOP: ::c_int = 90;
-pub const ENOMSG: ::c_int = 35;
-pub const EIDRM: ::c_int = 36;
-pub const ECHRNG: ::c_int = 37;
-pub const EL2NSYNC: ::c_int = 38;
-pub const EL3HLT: ::c_int = 39;
-pub const EL3RST: ::c_int = 40;
-pub const ELNRNG: ::c_int = 41;
-pub const EUNATCH: ::c_int = 42;
-pub const ENOCSI: ::c_int = 43;
-pub const EL2HLT: ::c_int = 44;
-pub const EBADE: ::c_int = 50;
-pub const EBADR: ::c_int = 51;
-pub const EXFULL: ::c_int = 52;
-pub const ENOANO: ::c_int = 53;
-pub const EBADRQC: ::c_int = 54;
-pub const EBADSLT: ::c_int = 55;
-pub const EDEADLOCK: ::c_int = 56;
-pub const EMULTIHOP: ::c_int = 74;
-pub const EOVERFLOW: ::c_int = 79;
-pub const ENOTUNIQ: ::c_int = 80;
-pub const EBADFD: ::c_int = 81;
-pub const EBADMSG: ::c_int = 77;
-pub const EREMCHG: ::c_int = 82;
-pub const ELIBACC: ::c_int = 83;
-pub const ELIBBAD: ::c_int = 84;
-pub const ELIBSCN: ::c_int = 85;
-pub const ELIBMAX: ::c_int = 86;
-pub const ELIBEXEC: ::c_int = 87;
-pub const EILSEQ: ::c_int = 88;
-pub const ERESTART: ::c_int = 91;
-pub const ESTRPIPE: ::c_int = 92;
-pub const EUSERS: ::c_int = 94;
-pub const ENOTSOCK: ::c_int = 95;
-pub const EDESTADDRREQ: ::c_int = 96;
-pub const EMSGSIZE: ::c_int = 97;
-pub const EPROTOTYPE: ::c_int = 98;
-pub const ENOPROTOOPT: ::c_int = 99;
-pub const EPROTONOSUPPORT: ::c_int = 120;
-pub const ESOCKTNOSUPPORT: ::c_int = 121;
-pub const EOPNOTSUPP: ::c_int = 122;
-pub const ENOTSUP: ::c_int = EOPNOTSUPP;
-pub const EPFNOSUPPORT: ::c_int = 123;
-pub const EAFNOSUPPORT: ::c_int = 124;
-pub const EADDRINUSE: ::c_int = 125;
-pub const EADDRNOTAVAIL: ::c_int = 126;
-pub const ENETDOWN: ::c_int = 127;
-pub const ENETUNREACH: ::c_int = 128;
-pub const ENETRESET: ::c_int = 129;
-pub const ECONNABORTED: ::c_int = 130;
-pub const ECONNRESET: ::c_int = 131;
-pub const ENOBUFS: ::c_int = 132;
-pub const EISCONN: ::c_int = 133;
-pub const ENOTCONN: ::c_int = 134;
-pub const ESHUTDOWN: ::c_int = 143;
-pub const ETOOMANYREFS: ::c_int = 144;
-pub const ETIMEDOUT: ::c_int = 145;
-pub const ECONNREFUSED: ::c_int = 146;
-pub const EHOSTDOWN: ::c_int = 147;
-pub const EHOSTUNREACH: ::c_int = 148;
-pub const EALREADY: ::c_int = 149;
-pub const EINPROGRESS: ::c_int = 150;
-pub const ESTALE: ::c_int = 151;
-pub const EUCLEAN: ::c_int = 135;
-pub const ENOTNAM: ::c_int = 137;
-pub const ENAVAIL: ::c_int = 138;
-pub const EISNAM: ::c_int = 139;
-pub const EREMOTEIO: ::c_int = 140;
-pub const EDQUOT: ::c_int = 1133;
-pub const ENOMEDIUM: ::c_int = 159;
-pub const EMEDIUMTYPE: ::c_int = 160;
-pub const ECANCELED: ::c_int = 158;
-pub const ENOKEY: ::c_int = 161;
-pub const EKEYEXPIRED: ::c_int = 162;
-pub const EKEYREVOKED: ::c_int = 163;
-pub const EKEYREJECTED: ::c_int = 164;
-pub const EOWNERDEAD: ::c_int = 165;
-pub const ENOTRECOVERABLE: ::c_int = 166;
-pub const ERFKILL: ::c_int = 167;
-
-pub const MAP_NORESERVE: ::c_int = 0x400;
-pub const MAP_ANON: ::c_int = 0x800;
-pub const MAP_ANONYMOUS: ::c_int = 0x800;
-pub const MAP_GROWSDOWN: ::c_int = 0x1000;
-pub const MAP_DENYWRITE: ::c_int = 0x2000;
-pub const MAP_EXECUTABLE: ::c_int = 0x4000;
-pub const MAP_LOCKED: ::c_int = 0x8000;
-pub const MAP_POPULATE: ::c_int = 0x10000;
-pub const MAP_NONBLOCK: ::c_int = 0x20000;
-pub const MAP_STACK: ::c_int = 0x40000;
-
-pub const SOCK_STREAM: ::c_int = 2;
-pub const SOCK_DGRAM: ::c_int = 1;
-pub const SOCK_SEQPACKET: ::c_int = 5;
-
-pub const SOL_SOCKET: ::c_int = 0xffff;
-
-pub const SO_REUSEADDR: ::c_int = 0x0004;
-pub const SO_KEEPALIVE: ::c_int = 0x0008;
-pub const SO_DONTROUTE: ::c_int = 0x0010;
-pub const SO_BROADCAST: ::c_int = 0x0020;
-pub const SO_LINGER: ::c_int = 0x0080;
-pub const SO_OOBINLINE: ::c_int = 0x0100;
-pub const SO_REUSEPORT: ::c_int = 0x0200;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_STYLE: ::c_int = SO_TYPE;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDLOWAT: ::c_int = 0x1003;
-pub const SO_RCVLOWAT: ::c_int = 0x1004;
-pub const SO_SNDTIMEO: ::c_int = 0x1005;
-pub const SO_RCVTIMEO: ::c_int = 0x1006;
-pub const SO_ACCEPTCONN: ::c_int = 0x1009;
-pub const SO_PROTOCOL: ::c_int = 0x1028;
-pub const SO_DOMAIN: ::c_int = 0x1029;
-pub const SO_NO_CHECK: ::c_int = 11;
-pub const SO_PRIORITY: ::c_int = 12;
-pub const SO_BSDCOMPAT: ::c_int = 14;
-pub const SO_PASSCRED: ::c_int = 17;
-pub const SO_PEERCRED: ::c_int = 18;
-pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22;
-pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23;
-pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24;
-pub const SO_BINDTODEVICE: ::c_int = 25;
-pub const SO_ATTACH_FILTER: ::c_int = 26;
-pub const SO_DETACH_FILTER: ::c_int = 27;
-pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER;
-pub const SO_PEERNAME: ::c_int = 28;
-pub const SO_TIMESTAMP: ::c_int = 29;
-pub const SCM_TIMESTAMP: ::c_int = SO_TIMESTAMP;
-pub const SO_PEERSEC: ::c_int = 30;
-pub const SO_SNDBUFFORCE: ::c_int = 31;
-pub const SO_RCVBUFFORCE: ::c_int = 33;
-pub const SO_PASSSEC: ::c_int = 34;
-pub const SO_TIMESTAMPNS: ::c_int = 35;
-pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS;
-pub const SO_MARK: ::c_int = 36;
-pub const SO_TIMESTAMPING: ::c_int = 37;
-pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
-pub const SO_RXQ_OVFL: ::c_int = 40;
-pub const SO_WIFI_STATUS: ::c_int = 41;
-pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS;
-pub const SO_PEEK_OFF: ::c_int = 42;
-pub const SO_NOFCS: ::c_int = 43;
-pub const SO_LOCK_FILTER: ::c_int = 44;
-pub const SO_SELECT_ERR_QUEUE: ::c_int = 45;
-pub const SO_BUSY_POLL: ::c_int = 46;
-pub const SO_MAX_PACING_RATE: ::c_int = 47;
-pub const SO_BPF_EXTENSIONS: ::c_int = 48;
-
-pub const FIOCLEX: ::c_ulong = 0x6601;
-pub const FIONCLEX: ::c_ulong = 0x6602;
-pub const FIONBIO: ::c_ulong = 0x667e;
-
-pub const SA_ONSTACK: ::c_uint = 0x08000000;
-pub const SA_SIGINFO: ::c_uint = 0x00000008;
-pub const SA_NOCLDWAIT: ::c_int = 0x00010000;
-
-pub const SIGCHLD: ::c_int = 18;
-pub const SIGBUS: ::c_int = 10;
-pub const SIGTTIN: ::c_int = 26;
-pub const SIGTTOU: ::c_int = 27;
-pub const SIGXCPU: ::c_int = 30;
-pub const SIGXFSZ: ::c_int = 31;
-pub const SIGVTALRM: ::c_int = 28;
-pub const SIGPROF: ::c_int = 29;
-pub const SIGWINCH: ::c_int = 20;
-pub const SIGUSR1: ::c_int = 16;
-pub const SIGUSR2: ::c_int = 17;
-pub const SIGCONT: ::c_int = 25;
-pub const SIGSTOP: ::c_int = 23;
-pub const SIGTSTP: ::c_int = 24;
-pub const SIGURG: ::c_int = 21;
-pub const SIGIO: ::c_int = 22;
-pub const SIGSYS: ::c_int = 12;
-pub const SIGPOLL: ::c_int = 22;
-pub const SIGPWR: ::c_int = 19;
-pub const SIG_SETMASK: ::c_int = 3;
-pub const SIG_BLOCK: ::c_int = 0x1;
-pub const SIG_UNBLOCK: ::c_int = 0x2;
-
-pub const POLLRDNORM: ::c_short = 0x040;
-pub const POLLWRNORM: ::c_short = 0x004;
-pub const POLLRDBAND: ::c_short = 0x080;
-pub const POLLWRBAND: ::c_short = 0x100;
-
-pub const PTHREAD_STACK_MIN: ::size_t = 16384;
-
-pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
-pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
-pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
-pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
-pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
-pub const EXT2_SUPER_MAGIC: ::c_long = 0x0000ef53;
-pub const EXT3_SUPER_MAGIC: ::c_long = 0x0000ef53;
-pub const EXT4_SUPER_MAGIC: ::c_long = 0x0000ef53;
-pub const HPFS_SUPER_MAGIC: ::c_long = 0xf995e849;
-pub const HUGETLBFS_MAGIC: ::c_long = 0x958458f6;
-pub const ISOFS_SUPER_MAGIC: ::c_long = 0x00009660;
-pub const JFFS2_SUPER_MAGIC: ::c_long = 0x000072b6;
-pub const MINIX_SUPER_MAGIC: ::c_long = 0x0000137f;
-pub const MINIX_SUPER_MAGIC2: ::c_long = 0x0000138f;
-pub const MINIX2_SUPER_MAGIC: ::c_long = 0x00002468;
-pub const MINIX2_SUPER_MAGIC2: ::c_long = 0x00002478;
-pub const MSDOS_SUPER_MAGIC: ::c_long = 0x00004d44;
-pub const NCP_SUPER_MAGIC: ::c_long = 0x0000564c;
-pub const NFS_SUPER_MAGIC: ::c_long = 0x00006969;
-pub const OPENPROM_SUPER_MAGIC: ::c_long = 0x00009fa1;
-pub const PROC_SUPER_MAGIC: ::c_long = 0x00009fa0;
-pub const QNX4_SUPER_MAGIC: ::c_long = 0x0000002f;
-pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
-pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
-pub const TMPFS_MAGIC: ::c_long = 0x01021994;
-pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
-
-pub const VEOF: usize = 16;
-pub const VEOL: usize = 17;
-pub const VEOL2: usize = 6;
-pub const VMIN: usize = 4;
-pub const IEXTEN: ::tcflag_t = 0x00000100;
-pub const TOSTOP: ::tcflag_t = 0x00008000;
-pub const FLUSHO: ::tcflag_t = 0x00002000;
-pub const IUTF8: ::tcflag_t = 0x00004000;
-pub const TCSANOW: ::c_int = 0x540e;
-pub const TCSADRAIN: ::c_int = 0x540f;
-pub const TCSAFLUSH: ::c_int = 0x5410;
-
-pub const CPU_SETSIZE: ::c_int = 0x400;
-
-pub const PTRACE_TRACEME: ::c_uint = 0;
-pub const PTRACE_PEEKTEXT: ::c_uint = 1;
-pub const PTRACE_PEEKDATA: ::c_uint = 2;
-pub const PTRACE_PEEKUSER: ::c_uint = 3;
-pub const PTRACE_POKETEXT: ::c_uint = 4;
-pub const PTRACE_POKEDATA: ::c_uint = 5;
-pub const PTRACE_POKEUSER: ::c_uint = 6;
-pub const PTRACE_CONT: ::c_uint = 7;
-pub const PTRACE_KILL: ::c_uint = 8;
-pub const PTRACE_SINGLESTEP: ::c_uint = 9;
-pub const PTRACE_ATTACH: ::c_uint = 16;
-pub const PTRACE_DETACH: ::c_uint = 17;
-pub const PTRACE_SYSCALL: ::c_uint = 24;
-pub const PTRACE_SETOPTIONS: ::c_uint = 0x4200;
-pub const PTRACE_GETEVENTMSG: ::c_uint = 0x4201;
-pub const PTRACE_GETSIGINFO: ::c_uint = 0x4202;
-pub const PTRACE_SETSIGINFO: ::c_uint = 0x4203;
-pub const PTRACE_GETFPREGS: ::c_uint = 14;
-pub const PTRACE_SETFPREGS: ::c_uint = 15;
-pub const PTRACE_GETFPXREGS: ::c_uint = 18;
-pub const PTRACE_SETFPXREGS: ::c_uint = 19;
-pub const PTRACE_GETREGS: ::c_uint = 12;
-pub const PTRACE_SETREGS: ::c_uint = 13;
-
-pub const EFD_NONBLOCK: ::c_int = 0x80;
-
-pub const F_GETLK: ::c_int = 14;
-pub const F_GETOWN: ::c_int = 23;
-pub const F_SETOWN: ::c_int = 24;
-pub const F_SETLK: ::c_int = 6;
-pub const F_SETLKW: ::c_int = 7;
-
-pub const SFD_NONBLOCK: ::c_int = 0x80;
-
-pub const TCGETS: ::c_ulong = 0x540d;
-pub const TCSETS: ::c_ulong = 0x540e;
-pub const TCSETSW: ::c_ulong = 0x540f;
-pub const TCSETSF: ::c_ulong = 0x5410;
-pub const TCGETA: ::c_ulong = 0x5401;
-pub const TCSETA: ::c_ulong = 0x5402;
-pub const TCSETAW: ::c_ulong = 0x5403;
-pub const TCSETAF: ::c_ulong = 0x5404;
-pub const TCSBRK: ::c_ulong = 0x5405;
-pub const TCXONC: ::c_ulong = 0x5406;
-pub const TCFLSH: ::c_ulong = 0x5407;
-pub const TIOCGSOFTCAR: ::c_ulong = 0x5481;
-pub const TIOCSSOFTCAR: ::c_ulong = 0x5482;
-pub const TIOCINQ: ::c_ulong = 0x467f;
-pub const TIOCLINUX: ::c_ulong = 0x5483;
-pub const TIOCGSERIAL: ::c_ulong = 0x5484;
-pub const TIOCEXCL: ::c_ulong = 0x740d;
-pub const TIOCNXCL: ::c_ulong = 0x740e;
-pub const TIOCSCTTY: ::c_ulong = 0x5480;
-pub const TIOCGPGRP: ::c_ulong = 0x40047477;
-pub const TIOCSPGRP: ::c_ulong = 0x80047476;
-pub const TIOCOUTQ: ::c_ulong = 0x7472;
-pub const TIOCSTI: ::c_ulong = 0x5472;
-pub const TIOCGWINSZ: ::c_ulong = 0x40087468;
-pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
-pub const TIOCMGET: ::c_ulong = 0x741d;
-pub const TIOCMBIS: ::c_ulong = 0x741b;
-pub const TIOCMBIC: ::c_ulong = 0x741c;
-pub const TIOCMSET: ::c_ulong = 0x741a;
-pub const FIONREAD: ::c_ulong = 0x467f;
-pub const TIOCCONS: ::c_ulong = 0x80047478;
-
-pub const RTLD_DEEPBIND: ::c_int = 0x10;
-pub const RTLD_GLOBAL: ::c_int = 0x4;
-pub const RTLD_NOLOAD: ::c_int = 0x8;
-
-pub const LINUX_REBOOT_MAGIC1: ::c_int = 0xfee1dead;
-pub const LINUX_REBOOT_MAGIC2: ::c_int = 672274793;
-pub const LINUX_REBOOT_MAGIC2A: ::c_int = 85072278;
-pub const LINUX_REBOOT_MAGIC2B: ::c_int = 369367448;
-pub const LINUX_REBOOT_MAGIC2C: ::c_int = 537993216;
-
-pub const LINUX_REBOOT_CMD_RESTART: ::c_int = 0x01234567;
-pub const LINUX_REBOOT_CMD_HALT: ::c_int = 0xCDEF0123;
-pub const LINUX_REBOOT_CMD_CAD_ON: ::c_int = 0x89ABCDEF;
-pub const LINUX_REBOOT_CMD_CAD_OFF: ::c_int = 0x00000000;
-pub const LINUX_REBOOT_CMD_POWER_OFF: ::c_int = 0x4321FEDC;
-pub const LINUX_REBOOT_CMD_RESTART2: ::c_int = 0xA1B2C3D4;
-pub const LINUX_REBOOT_CMD_SW_SUSPEND: ::c_int = 0xD000FCE2;
-pub const LINUX_REBOOT_CMD_KEXEC: ::c_int = 0x45584543;
-
-pub const MCL_CURRENT: ::c_int = 0x0001;
-pub const MCL_FUTURE: ::c_int = 0x0002;
-
-pub const SIGSTKSZ: ::size_t = 8192;
-pub const CBAUD: ::tcflag_t = 0o0010017;
-pub const TAB1: ::tcflag_t = 0x00000800;
-pub const TAB2: ::tcflag_t = 0x00001000;
-pub const TAB3: ::tcflag_t = 0x00001800;
-pub const CR1: ::tcflag_t = 0x00000200;
-pub const CR2: ::tcflag_t = 0x00000400;
-pub const CR3: ::tcflag_t = 0x00000600;
-pub const FF1: ::tcflag_t = 0x00008000;
-pub const BS1: ::tcflag_t = 0x00002000;
-pub const VT1: ::tcflag_t = 0x00004000;
-pub const VWERASE: usize = 14;
-pub const VREPRINT: usize = 12;
-pub const VSUSP: usize = 10;
-pub const VSTART: usize = 8;
-pub const VSTOP: usize = 9;
-pub const VDISCARD: usize = 13;
-pub const VTIME: usize = 5;
-pub const IXON: ::tcflag_t = 0x00000400;
-pub const IXOFF: ::tcflag_t = 0x00001000;
-pub const ONLCR: ::tcflag_t = 0x4;
-pub const CSIZE: ::tcflag_t = 0x00000030;
-pub const CS6: ::tcflag_t = 0x00000010;
-pub const CS7: ::tcflag_t = 0x00000020;
-pub const CS8: ::tcflag_t = 0x00000030;
-pub const CSTOPB: ::tcflag_t = 0x00000040;
-pub const CREAD: ::tcflag_t = 0x00000080;
-pub const PARENB: ::tcflag_t = 0x00000100;
-pub const PARODD: ::tcflag_t = 0x00000200;
-pub const HUPCL: ::tcflag_t = 0x00000400;
-pub const CLOCAL: ::tcflag_t = 0x00000800;
-pub const ECHOKE: ::tcflag_t = 0x00000800;
-pub const ECHOE: ::tcflag_t = 0x00000010;
-pub const ECHOK: ::tcflag_t = 0x00000020;
-pub const ECHONL: ::tcflag_t = 0x00000040;
-pub const ECHOPRT: ::tcflag_t = 0x00000400;
-pub const ECHOCTL: ::tcflag_t = 0x00000200;
-pub const ISIG: ::tcflag_t = 0x00000001;
-pub const ICANON: ::tcflag_t = 0x00000002;
-pub const PENDIN: ::tcflag_t = 0x00004000;
-pub const NOFLSH: ::tcflag_t = 0x00000080;
-
-pub const B0: ::speed_t = 0o000000;
-pub const B50: ::speed_t = 0o000001;
-pub const B75: ::speed_t = 0o000002;
-pub const B110: ::speed_t = 0o000003;
-pub const B134: ::speed_t = 0o000004;
-pub const B150: ::speed_t = 0o000005;
-pub const B200: ::speed_t = 0o000006;
-pub const B300: ::speed_t = 0o000007;
-pub const B600: ::speed_t = 0o000010;
-pub const B1200: ::speed_t = 0o000011;
-pub const B1800: ::speed_t = 0o000012;
-pub const B2400: ::speed_t = 0o000013;
-pub const B4800: ::speed_t = 0o000014;
-pub const B9600: ::speed_t = 0o000015;
-pub const B19200: ::speed_t = 0o000016;
-pub const B38400: ::speed_t = 0o000017;
-pub const EXTA: ::speed_t = B19200;
-pub const EXTB: ::speed_t = B38400;
-pub const B57600: ::speed_t = 0o010001;
-pub const B115200: ::speed_t = 0o010002;
-pub const B230400: ::speed_t = 0o010003;
-pub const B460800: ::speed_t = 0o010004;
-pub const B500000: ::speed_t = 0o010005;
-pub const B576000: ::speed_t = 0o010006;
-pub const B921600: ::speed_t = 0o010007;
-pub const B1000000: ::speed_t = 0o010010;
-pub const B1152000: ::speed_t = 0o010011;
-pub const B1500000: ::speed_t = 0o010012;
-pub const B2000000: ::speed_t = 0o010013;
-pub const B2500000: ::speed_t = 0o010014;
-pub const B3000000: ::speed_t = 0o010015;
-pub const B3500000: ::speed_t = 0o010016;
-pub const B4000000: ::speed_t = 0o010017;
-
-cfg_if! {
-    if #[cfg(target_arch = "mips")] {
-        mod mips32;
-        pub use self::mips32::*;
-    } else if #[cfg(target_arch = "mips64")] {
-        mod mips64;
-        pub use self::mips64::*;
-    } else {
-        // Unknown target_arch
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2358 +0,0 @@
-pub type sa_family_t = u16;
-pub type pthread_key_t = ::c_uint;
-pub type speed_t = ::c_uint;
-pub type tcflag_t = ::c_uint;
-pub type loff_t = ::c_longlong;
-pub type clockid_t = ::c_int;
-pub type key_t = ::c_int;
-pub type id_t = ::c_uint;
-pub type useconds_t = u32;
-pub type dev_t = u64;
-pub type socklen_t = u32;
-pub type mode_t = u32;
-pub type ino64_t = u64;
-pub type off64_t = i64;
-pub type blkcnt64_t = i64;
-pub type rlim64_t = u64;
-pub type shmatt_t = ::c_ulong;
-pub type mqd_t = ::c_int;
-pub type msgqnum_t = ::c_ulong;
-pub type msglen_t = ::c_ulong;
-pub type nfds_t = ::c_ulong;
-pub type nl_item = ::c_int;
-pub type idtype_t = ::c_uint;
-pub type Elf32_Half = u16;
-pub type Elf32_Word = u32;
-pub type Elf32_Off = u32;
-pub type Elf32_Addr = u32;
-pub type Elf64_Half = u16;
-pub type Elf64_Word = u32;
-pub type Elf64_Off = u64;
-pub type Elf64_Addr = u64;
-pub type Elf64_Xword = u64;
-pub type Elf64_Sxword = i64;
-
-#[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // FIXME: fill this out with a struct
-impl ::Copy for fpos64_t {}
-impl ::Clone for fpos64_t {
-    fn clone(&self) -> fpos64_t {
-        *self
-    }
-}
-
-#[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum timezone {}
-impl ::Copy for timezone {}
-impl ::Clone for timezone {
-    fn clone(&self) -> timezone {
-        *self
-    }
-}
-
-s! {
-    pub struct in_addr {
-        pub s_addr: ::in_addr_t,
-    }
-
-    pub struct ip_mreq {
-        pub imr_multiaddr: in_addr,
-        pub imr_interface: in_addr,
-    }
-
-    pub struct sockaddr {
-        pub sa_family: sa_family_t,
-        pub sa_data: [::c_char; 14],
-    }
-
-    pub struct sockaddr_in {
-        pub sin_family: sa_family_t,
-        pub sin_port: ::in_port_t,
-        pub sin_addr: ::in_addr,
-        pub sin_zero: [u8; 8],
-    }
-
-    pub struct sockaddr_in6 {
-        pub sin6_family: sa_family_t,
-        pub sin6_port: ::in_port_t,
-        pub sin6_flowinfo: u32,
-        pub sin6_addr: ::in6_addr,
-        pub sin6_scope_id: u32,
-    }
-
-    pub struct addrinfo {
-        pub ai_flags: ::c_int,
-        pub ai_family: ::c_int,
-        pub ai_socktype: ::c_int,
-        pub ai_protocol: ::c_int,
-        pub ai_addrlen: socklen_t,
-
-        pub ai_addr: *mut ::sockaddr,
-
-        pub ai_canonname: *mut c_char,
-
-        pub ai_next: *mut addrinfo,
-    }
-
-    pub struct sockaddr_ll {
-        pub sll_family: ::c_ushort,
-        pub sll_protocol: ::c_ushort,
-        pub sll_ifindex: ::c_int,
-        pub sll_hatype: ::c_ushort,
-        pub sll_pkttype: ::c_uchar,
-        pub sll_halen: ::c_uchar,
-        pub sll_addr: [::c_uchar; 8]
-    }
-
-    pub struct fd_set {
-        fds_bits: [::c_ulong; FD_SETSIZE / ULONG_SIZE],
-    }
-
-    pub struct tm {
-        pub tm_sec: ::c_int,
-        pub tm_min: ::c_int,
-        pub tm_hour: ::c_int,
-        pub tm_mday: ::c_int,
-        pub tm_mon: ::c_int,
-        pub tm_year: ::c_int,
-        pub tm_wday: ::c_int,
-        pub tm_yday: ::c_int,
-        pub tm_isdst: ::c_int,
-        pub tm_gmtoff: ::c_long,
-        pub tm_zone: *const ::c_char,
-    }
-
-    pub struct sched_param {
-        pub sched_priority: ::c_int,
-    }
-
-    pub struct Dl_info {
-        pub dli_fname: *const ::c_char,
-        pub dli_fbase: *mut ::c_void,
-        pub dli_sname: *const ::c_char,
-        pub dli_saddr: *mut ::c_void,
-    }
-
-    pub struct lconv {
-        pub decimal_point: *mut ::c_char,
-        pub thousands_sep: *mut ::c_char,
-        pub grouping: *mut ::c_char,
-        pub int_curr_symbol: *mut ::c_char,
-        pub currency_symbol: *mut ::c_char,
-        pub mon_decimal_point: *mut ::c_char,
-        pub mon_thousands_sep: *mut ::c_char,
-        pub mon_grouping: *mut ::c_char,
-        pub positive_sign: *mut ::c_char,
-        pub negative_sign: *mut ::c_char,
-        pub int_frac_digits: ::c_char,
-        pub frac_digits: ::c_char,
-        pub p_cs_precedes: ::c_char,
-        pub p_sep_by_space: ::c_char,
-        pub n_cs_precedes: ::c_char,
-        pub n_sep_by_space: ::c_char,
-        pub p_sign_posn: ::c_char,
-        pub n_sign_posn: ::c_char,
-        pub int_p_cs_precedes: ::c_char,
-        pub int_p_sep_by_space: ::c_char,
-        pub int_n_cs_precedes: ::c_char,
-        pub int_n_sep_by_space: ::c_char,
-        pub int_p_sign_posn: ::c_char,
-        pub int_n_sign_posn: ::c_char,
-    }
-
-    pub struct rlimit64 {
-        pub rlim_cur: rlim64_t,
-        pub rlim_max: rlim64_t,
-    }
-
-    pub struct glob_t {
-        pub gl_pathc: ::size_t,
-        pub gl_pathv: *mut *mut c_char,
-        pub gl_offs: ::size_t,
-        pub gl_flags: ::c_int,
-
-        __unused1: *mut ::c_void,
-        __unused2: *mut ::c_void,
-        __unused3: *mut ::c_void,
-        __unused4: *mut ::c_void,
-        __unused5: *mut ::c_void,
-    }
-
-    pub struct ifaddrs {
-        pub ifa_next: *mut ifaddrs,
-        pub ifa_name: *mut c_char,
-        pub ifa_flags: ::c_uint,
-        pub ifa_addr: *mut ::sockaddr,
-        pub ifa_netmask: *mut ::sockaddr,
-        pub ifa_ifu: *mut ::sockaddr, // FIXME This should be a union
-        pub ifa_data: *mut ::c_void
-    }
-
-    pub struct pthread_rwlockattr_t {
-        __lockkind: ::c_int,
-        __pshared: ::c_int,
-    }
-
-    pub struct passwd {
-        pub pw_name: *mut ::c_char,
-        pub pw_passwd: *mut ::c_char,
-        pub pw_uid: ::uid_t,
-        pub pw_gid: ::gid_t,
-        pub pw_gecos: *mut ::c_char,
-        pub pw_dir: *mut ::c_char,
-        pub pw_shell: *mut ::c_char,
-    }
-
-    pub struct spwd {
-        pub sp_namp: *mut ::c_char,
-        pub sp_pwdp: *mut ::c_char,
-        pub sp_lstchg: ::c_long,
-        pub sp_min: ::c_long,
-        pub sp_max: ::c_long,
-        pub sp_warn: ::c_long,
-        pub sp_inact: ::c_long,
-        pub sp_expire: ::c_long,
-        pub sp_flag: ::c_ulong,
-    }
-
-    pub struct statvfs {
-        pub f_bsize: ::c_ulong,
-        pub f_frsize: ::c_ulong,
-        pub f_blocks: ::fsblkcnt_t,
-        pub f_bfree: ::fsblkcnt_t,
-        pub f_bavail: ::fsblkcnt_t,
-        pub f_files: ::fsfilcnt_t,
-        pub f_ffree: ::fsfilcnt_t,
-        pub f_favail: ::fsfilcnt_t,
-        #[cfg(target_endian = "little")]
-        pub f_fsid: ::c_ulong,
-        #[cfg(target_pointer_width = "32")]
-        __f_unused: ::c_int,
-        #[cfg(target_endian = "big")]
-        pub f_fsid: ::c_ulong,
-        pub f_flag: ::c_ulong,
-        pub f_namemax: ::c_ulong,
-        __f_spare: [::c_int; 6],
-    }
-
-    pub struct dqblk {
-        pub dqb_bhardlimit: u32,
-        pub dqb_bsoftlimit: u32,
-        pub dqb_curblocks: u32,
-        pub dqb_ihardlimit: u32,
-        pub dqb_isoftlimit: u32,
-        pub dqb_curinodes: u32,
-        pub dqb_btime: ::time_t,
-        pub dqb_itime: ::time_t,
-    }
-
-    pub struct signalfd_siginfo {
-        pub ssi_signo: u32,
-        pub ssi_errno: i32,
-        pub ssi_code: i32,
-        pub ssi_pid: u32,
-        pub ssi_uid: u32,
-        pub ssi_fd: i32,
-        pub ssi_tid: u32,
-        pub ssi_band: u32,
-        pub ssi_overrun: u32,
-        pub ssi_trapno: u32,
-        pub ssi_status: i32,
-        pub ssi_int: i32,
-        pub ssi_ptr: u64,
-        pub ssi_utime: u64,
-        pub ssi_stime: u64,
-        pub ssi_addr: u64,
-        pub ssi_addr_lsb: u16,
-        _pad2: u16,
-        pub ssi_syscall: i32,
-        pub ssi_call_addr: u64,
-        pub ssi_arch: u32,
-        _pad: [u8; 28],
-    }
-
-    pub struct fsid_t {
-        __val: [::c_int; 2],
-    }
-
-    pub struct cpu_set_t {
-        #[cfg(target_pointer_width = "32")]
-        bits: [u32; 32],
-        #[cfg(target_pointer_width = "64")]
-        bits: [u64; 16],
-    }
-
-    pub struct if_nameindex {
-        pub if_index: ::c_uint,
-        pub if_name: *mut ::c_char,
-    }
-
-    // System V IPC
-    pub struct msginfo {
-        pub msgpool: ::c_int,
-        pub msgmap: ::c_int,
-        pub msgmax: ::c_int,
-        pub msgmnb: ::c_int,
-        pub msgmni: ::c_int,
-        pub msgssz: ::c_int,
-        pub msgtql: ::c_int,
-        pub msgseg: ::c_ushort,
-    }
-
-    pub struct Elf32_Phdr {
-        pub p_type: Elf32_Word,
-        pub p_offset: Elf32_Off,
-        pub p_vaddr: Elf32_Addr,
-        pub p_paddr: Elf32_Addr,
-        pub p_filesz: Elf32_Word,
-        pub p_memsz: Elf32_Word,
-        pub p_flags: Elf32_Word,
-        pub p_align: Elf32_Word,
-    }
-
-    pub struct Elf64_Phdr {
-        pub p_type: Elf64_Word,
-        pub p_flags: Elf64_Word,
-        pub p_offset: Elf64_Off,
-        pub p_vaddr: Elf64_Addr,
-        pub p_paddr: Elf64_Addr,
-        pub p_filesz: Elf64_Xword,
-        pub p_memsz: Elf64_Xword,
-        pub p_align: Elf64_Xword,
-    }
-
-    pub struct dl_phdr_info {
-        #[cfg(target_pointer_width = "64")]
-        pub dlpi_addr: Elf64_Addr,
-        #[cfg(target_pointer_width = "32")]
-        pub dlpi_addr: Elf32_Addr,
-        pub dlpi_name: *const ::c_char,
-        #[cfg(target_pointer_width = "64")]
-        pub dlpi_phdr: *const Elf64_Phdr,
-        #[cfg(target_pointer_width = "32")]
-        pub dlpi_phdr: *const Elf32_Phdr,
-        #[cfg(target_pointer_width = "64")]
-        pub dlpi_phnum: Elf64_Half,
-        #[cfg(target_pointer_width = "32")]
-        pub dlpi_phnum: Elf32_Half,
-        // As of uClibc 1.0.36, the following fields are
-        // gated behind a "#if 0" block which always evaluates
-        // to false. So I'm just commenting these out and if uClibc changes
-        // the #if block in the future to include the following fields, these
-        // will probably need including here. tsidea
-        //
-        // pub dlpi_adds: ::c_ulonglong,
-        // pub dlpi_subs: ::c_ulonglong,
-        // pub dlpi_tls_modid: ::size_t,
-        // pub dlpi_tls_data: *mut ::c_void,
-    }
-
-    pub struct ucred {
-        pub pid: ::pid_t,
-        pub uid: ::uid_t,
-        pub gid: ::gid_t,
-    }
-}
-
-s_no_extra_traits! {
-    #[cfg_attr(
-        any(target_arch = "x86", target_arch = "x86_64"),
-        repr(packed)
-    )]
-    #[allow(missing_debug_implementations)]
-    pub struct epoll_event {
-        pub events: u32,
-        pub u64: u64,
-    }
-
-    #[allow(missing_debug_implementations)]
-    pub struct sockaddr_un {
-        pub sun_family: sa_family_t,
-        pub sun_path: [::c_char; 108]
-    }
-
-    #[allow(missing_debug_implementations)]
-    pub struct sockaddr_storage {
-        pub ss_family: sa_family_t,
-        __ss_align: ::size_t,
-        #[cfg(target_pointer_width = "32")]
-        __ss_pad2: [u8; 128 - 2 * 4],
-        #[cfg(target_pointer_width = "64")]
-        __ss_pad2: [u8; 128 - 2 * 8],
-    }
-
-    #[allow(missing_debug_implementations)]
-    pub struct utsname {
-        pub sysname: [::c_char; 65],
-        pub nodename: [::c_char; 65],
-        pub release: [::c_char; 65],
-        pub version: [::c_char; 65],
-        pub machine: [::c_char; 65],
-        pub domainname: [::c_char; 65]
-    }
-
-    #[allow(missing_debug_implementations)]
-    pub struct dirent {
-        pub d_ino: ::ino_t,
-        pub d_off: ::off_t,
-        pub d_reclen: ::c_ushort,
-        pub d_type: ::c_uchar,
-        pub d_name: [::c_char; 256],
-    }
-
-    #[allow(missing_debug_implementations)]
-    pub struct dirent64 {
-        pub d_ino: ::ino64_t,
-        pub d_off: ::off64_t,
-        pub d_reclen: ::c_ushort,
-        pub d_type: ::c_uchar,
-        pub d_name: [::c_char; 256],
-    }
-
-    pub struct mq_attr {
-        pub mq_flags: ::c_long,
-        pub mq_maxmsg: ::c_long,
-        pub mq_msgsize: ::c_long,
-        pub mq_curmsgs: ::c_long,
-        pad: [::c_long; 4]
-    }
-
-    pub struct sockaddr_nl {
-        pub nl_family: ::sa_family_t,
-        nl_pad: ::c_ushort,
-        pub nl_pid: u32,
-        pub nl_groups: u32
-    }
-
-    pub struct sigevent {
-        pub sigev_value: ::sigval,
-        pub sigev_signo: ::c_int,
-        pub sigev_notify: ::c_int,
-        // Actually a union.  We only expose sigev_notify_thread_id because it's
-        // the most useful member
-        pub sigev_notify_thread_id: ::c_int,
-        #[cfg(target_pointer_width = "64")]
-        __unused1: [::c_int; 11],
-        #[cfg(target_pointer_width = "32")]
-        __unused1: [::c_int; 12]
-    }
-}
-
-cfg_if! {
-    if #[cfg(feature = "extra_traits")] {
-        impl PartialEq for mq_attr {
-            fn eq(&self, other: &mq_attr) -> bool {
-                self.mq_flags == other.mq_flags &&
-                self.mq_maxmsg == other.mq_maxmsg &&
-                self.mq_msgsize == other.mq_msgsize &&
-                self.mq_curmsgs == other.mq_curmsgs
-            }
-        }
-        impl Eq for mq_attr {}
-        impl ::fmt::Debug for mq_attr {
-            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
-                f.debug_struct("mq_attr")
-                    .field("mq_flags", &self.mq_flags)
-                    .field("mq_maxmsg", &self.mq_maxmsg)
-                    .field("mq_msgsize", &self.mq_msgsize)
-                    .field("mq_curmsgs", &self.mq_curmsgs)
-                    .finish()
-            }
-        }
-        impl ::hash::Hash for mq_attr {
-            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
-                self.mq_flags.hash(state);
-                self.mq_maxmsg.hash(state);
-                self.mq_msgsize.hash(state);
-                self.mq_curmsgs.hash(state);
-            }
-        }
-
-        impl PartialEq for sockaddr_nl {
-            fn eq(&self, other: &sockaddr_nl) -> bool {
-                self.nl_family == other.nl_family &&
-                self.nl_pid == other.nl_pid &&
-                self.nl_groups == other.nl_groups
-            }
-        }
-        impl Eq for sockaddr_nl {}
-        impl ::fmt::Debug for sockaddr_nl {
-            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
-                f.debug_struct("sockaddr_nl")
-                    .field("nl_family", &self.nl_family)
-                    .field("nl_pid", &self.nl_pid)
-                    .field("nl_groups", &self.nl_groups)
-                    .finish()
-            }
-        }
-        impl ::hash::Hash for sockaddr_nl {
-            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
-                self.nl_family.hash(state);
-                self.nl_pid.hash(state);
-                self.nl_groups.hash(state);
-            }
-        }
-
-        impl PartialEq for sigevent {
-            fn eq(&self, other: &sigevent) -> bool {
-                self.sigev_value == other.sigev_value
-                    && self.sigev_signo == other.sigev_signo
-                    && self.sigev_notify == other.sigev_notify
-                    && self.sigev_notify_thread_id
-                        == other.sigev_notify_thread_id
-            }
-        }
-        impl Eq for sigevent {}
-        impl ::fmt::Debug for sigevent {
-            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
-                f.debug_struct("sigevent")
-                    .field("sigev_value", &self.sigev_value)
-                    .field("sigev_signo", &self.sigev_signo)
-                    .field("sigev_notify", &self.sigev_notify)
-                    .field("sigev_notify_thread_id",
-                           &self.sigev_notify_thread_id)
-                    .finish()
-            }
-        }
-        impl ::hash::Hash for sigevent {
-            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
-                self.sigev_value.hash(state);
-                self.sigev_signo.hash(state);
-                self.sigev_notify.hash(state);
-                self.sigev_notify_thread_id.hash(state);
-            }
-        }
-    }
-}
-
-// intentionally not public, only used for fd_set
-cfg_if! {
-    if #[cfg(target_pointer_width = "32")] {
-        const ULONG_SIZE: usize = 32;
-    } else if #[cfg(target_pointer_width = "64")] {
-        const ULONG_SIZE: usize = 64;
-    } else {
-        // Unknown target_pointer_width
-    }
-}
-
-pub const EXIT_FAILURE: ::c_int = 1;
-pub const EXIT_SUCCESS: ::c_int = 0;
-pub const RAND_MAX: ::c_int = 2147483647;
-pub const EOF: ::c_int = -1;
-pub const SEEK_SET: ::c_int = 0;
-pub const SEEK_CUR: ::c_int = 1;
-pub const SEEK_END: ::c_int = 2;
-pub const _IOFBF: ::c_int = 0;
-pub const _IONBF: ::c_int = 2;
-pub const _IOLBF: ::c_int = 1;
-
-pub const F_DUPFD: ::c_int = 0;
-pub const F_GETFD: ::c_int = 1;
-pub const F_SETFD: ::c_int = 2;
-pub const F_GETFL: ::c_int = 3;
-pub const F_SETFL: ::c_int = 4;
-
-// Linux-specific fcntls
-pub const F_SETLEASE: ::c_int = 1024;
-pub const F_GETLEASE: ::c_int = 1025;
-pub const F_NOTIFY: ::c_int = 1026;
-pub const F_DUPFD_CLOEXEC: ::c_int = 1030;
-
-// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
-
-pub const SIGTRAP: ::c_int = 5;
-
-pub const PTHREAD_CREATE_JOINABLE: ::c_int = 0;
-pub const PTHREAD_CREATE_DETACHED: ::c_int = 1;
-
-pub const CLOCK_REALTIME: ::clockid_t = 0;
-pub const CLOCK_MONOTONIC: ::clockid_t = 1;
-pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 2;
-pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 3;
-// FIXME: Add these constants once uclibc gets them.
-// pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
-// pub const CLOCK_TAI: ::clockid_t = 11;
-pub const TIMER_ABSTIME: ::c_int = 1;
-
-pub const RLIMIT_CPU: ::c_int = 0;
-pub const RLIMIT_FSIZE: ::c_int = 1;
-pub const RLIMIT_DATA: ::c_int = 2;
-pub const RLIMIT_STACK: ::c_int = 3;
-pub const RLIMIT_CORE: ::c_int = 4;
-pub const RLIMIT_LOCKS: ::c_int = 10;
-pub const RLIMIT_SIGPENDING: ::c_int = 11;
-pub const RLIMIT_MSGQUEUE: ::c_int = 12;
-pub const RLIMIT_NICE: ::c_int = 13;
-pub const RLIMIT_RTPRIO: ::c_int = 14;
-
-pub const RUSAGE_SELF: ::c_int = 0;
-
-pub const O_RDONLY: ::c_int = 0;
-pub const O_WRONLY: ::c_int = 1;
-pub const O_RDWR: ::c_int = 2;
-
-pub const SOCK_CLOEXEC: ::c_int = O_CLOEXEC;
-
-pub const S_IFIFO: ::mode_t = 4096;
-pub const S_IFCHR: ::mode_t = 8192;
-pub const S_IFBLK: ::mode_t = 24576;
-pub const S_IFDIR: ::mode_t = 16384;
-pub const S_IFREG: ::mode_t = 32768;
-pub const S_IFLNK: ::mode_t = 40960;
-pub const S_IFSOCK: ::mode_t = 49152;
-pub const S_IFMT: ::mode_t = 61440;
-pub const S_IRWXU: ::mode_t = 448;
-pub const S_IXUSR: ::mode_t = 64;
-pub const S_IWUSR: ::mode_t = 128;
-pub const S_IRUSR: ::mode_t = 256;
-pub const S_IRWXG: ::mode_t = 56;
-pub const S_IXGRP: ::mode_t = 8;
-pub const S_IWGRP: ::mode_t = 16;
-pub const S_IRGRP: ::mode_t = 32;
-pub const S_IRWXO: ::mode_t = 7;
-pub const S_IXOTH: ::mode_t = 1;
-pub const S_IWOTH: ::mode_t = 2;
-pub const S_IROTH: ::mode_t = 4;
-pub const F_OK: ::c_int = 0;
-pub const R_OK: ::c_int = 4;
-pub const W_OK: ::c_int = 2;
-pub const X_OK: ::c_int = 1;
-pub const STDIN_FILENO: ::c_int = 0;
-pub const STDOUT_FILENO: ::c_int = 1;
-pub const STDERR_FILENO: ::c_int = 2;
-pub const SIGHUP: ::c_int = 1;
-pub const SIGINT: ::c_int = 2;
-pub const SIGQUIT: ::c_int = 3;
-pub const SIGILL: ::c_int = 4;
-pub const SIGABRT: ::c_int = 6;
-pub const SIGFPE: ::c_int = 8;
-pub const SIGKILL: ::c_int = 9;
-pub const SIGSEGV: ::c_int = 11;
-pub const SIGPIPE: ::c_int = 13;
-pub const SIGALRM: ::c_int = 14;
-pub const SIGTERM: ::c_int = 15;
-
-pub const PROT_NONE: ::c_int = 0;
-pub const PROT_READ: ::c_int = 1;
-pub const PROT_WRITE: ::c_int = 2;
-pub const PROT_EXEC: ::c_int = 4;
-
-pub const LC_CTYPE: ::c_int = 0;
-pub const LC_NUMERIC: ::c_int = 1;
-pub const LC_MONETARY: ::c_int = 2;
-pub const LC_TIME: ::c_int = 3;
-pub const LC_COLLATE: ::c_int = 4;
-pub const LC_MESSAGES: ::c_int = 5;
-pub const LC_ALL: ::c_int = 6;
-pub const LC_CTYPE_MASK: ::c_int = 1 << LC_CTYPE;
-pub const LC_NUMERIC_MASK: ::c_int = 1 << LC_NUMERIC;
-pub const LC_TIME_MASK: ::c_int = 1 << LC_TIME;
-pub const LC_COLLATE_MASK: ::c_int = 1 << LC_COLLATE;
-pub const LC_MONETARY_MASK: ::c_int = 1 << LC_MONETARY;
-pub const LC_MESSAGES_MASK: ::c_int = 1 << LC_MESSAGES;
-// LC_ALL_MASK defined per platform
-
-pub const MAP_FILE: ::c_int = 0x0000;
-pub const MAP_SHARED: ::c_int = 0x0001;
-pub const MAP_PRIVATE: ::c_int = 0x0002;
-pub const MAP_FIXED: ::c_int = 0x0010;
-
-pub const MAP_FAILED: *mut ::c_void = !0 as *mut ::c_void;
-
-// MS_ flags for msync(2)
-pub const MS_ASYNC: ::c_int = 0x0001;
-pub const MS_INVALIDATE: ::c_int = 0x0002;
-pub const MS_SYNC: ::c_int = 0x0004;
-
-// MS_ flags for mount(2)
-pub const MS_RDONLY: ::c_ulong = 0x01;
-pub const MS_NOSUID: ::c_ulong = 0x02;
-pub const MS_NODEV: ::c_ulong = 0x04;
-pub const MS_NOEXEC: ::c_ulong = 0x08;
-pub const MS_SYNCHRONOUS: ::c_ulong = 0x10;
-pub const MS_REMOUNT: ::c_ulong = 0x20;
-pub const MS_MANDLOCK: ::c_ulong = 0x40;
-pub const MS_NOATIME: ::c_ulong = 0x0400;
-pub const MS_NODIRATIME: ::c_ulong = 0x0800;
-pub const MS_BIND: ::c_ulong = 0x1000;
-pub const MS_NOUSER: ::c_ulong = 0x80000000;
-pub const MS_MGC_VAL: ::c_ulong = 0xc0ed0000;
-pub const MS_MGC_MSK: ::c_ulong = 0xffff0000;
-pub const MS_RMT_MASK: ::c_ulong = 0x800051;
-
-pub const EPERM: ::c_int = 1;
-pub const ENOENT: ::c_int = 2;
-pub const ESRCH: ::c_int = 3;
-pub const EINTR: ::c_int = 4;
-pub const EIO: ::c_int = 5;
-pub const ENXIO: ::c_int = 6;
-pub const E2BIG: ::c_int = 7;
-pub const ENOEXEC: ::c_int = 8;
-pub const EBADF: ::c_int = 9;
-pub const ECHILD: ::c_int = 10;
-pub const EAGAIN: ::c_int = 11;
-pub const ENOMEM: ::c_int = 12;
-pub const EACCES: ::c_int = 13;
-pub const EFAULT: ::c_int = 14;
-pub const ENOTBLK: ::c_int = 15;
-pub const EBUSY: ::c_int = 16;
-pub const EEXIST: ::c_int = 17;
-pub const EXDEV: ::c_int = 18;
-pub const ENODEV: ::c_int = 19;
-pub const ENOTDIR: ::c_int = 20;
-pub const EISDIR: ::c_int = 21;
-pub const EINVAL: ::c_int = 22;
-pub const ENFILE: ::c_int = 23;
-pub const EMFILE: ::c_int = 24;
-pub const ENOTTY: ::c_int = 25;
-pub const ETXTBSY: ::c_int = 26;
-pub const EFBIG: ::c_int = 27;
-pub const ENOSPC: ::c_int = 28;
-pub const ESPIPE: ::c_int = 29;
-pub const EROFS: ::c_int = 30;
-pub const EMLINK: ::c_int = 31;
-pub const EPIPE: ::c_int = 32;
-pub const EDOM: ::c_int = 33;
-pub const ERANGE: ::c_int = 34;
-pub const EWOULDBLOCK: ::c_int = EAGAIN;
-
-pub const SCM_RIGHTS: ::c_int = 0x01;
-pub const SCM_CREDENTIALS: ::c_int = 0x02;
-
-// netinet/in.h
-// NOTE: These are in addition to the constants defined in src/unix/mod.rs
-
-// IPPROTO_IP defined in src/unix/mod.rs
-/// Hop-by-hop option header
-pub const IPPROTO_HOPOPTS: ::c_int = 0;
-// IPPROTO_ICMP defined in src/unix/mod.rs
-/// group mgmt protocol
-pub const IPPROTO_IGMP: ::c_int = 2;
-/// for compatibility
-pub const IPPROTO_IPIP: ::c_int = 4;
-// IPPROTO_TCP defined in src/unix/mod.rs
-/// exterior gateway protocol
-pub const IPPROTO_EGP: ::c_int = 8;
-/// pup
-pub const IPPROTO_PUP: ::c_int = 12;
-// IPPROTO_UDP defined in src/unix/mod.rs
-/// xns idp
-pub const IPPROTO_IDP: ::c_int = 22;
-/// tp-4 w/ class negotiation
-pub const IPPROTO_TP: ::c_int = 29;
-/// DCCP
-pub const IPPROTO_DCCP: ::c_int = 33;
-// IPPROTO_IPV6 defined in src/unix/mod.rs
-/// IP6 routing header
-pub const IPPROTO_ROUTING: ::c_int = 43;
-/// IP6 fragmentation header
-pub const IPPROTO_FRAGMENT: ::c_int = 44;
-/// resource reservation
-pub const IPPROTO_RSVP: ::c_int = 46;
-/// General Routing Encap.
-pub const IPPROTO_GRE: ::c_int = 47;
-/// IP6 Encap Sec. Payload
-pub const IPPROTO_ESP: ::c_int = 50;
-/// IP6 Auth Header
-pub const IPPROTO_AH: ::c_int = 51;
-// IPPROTO_ICMPV6 defined in src/unix/mod.rs
-/// IP6 no next header
-pub const IPPROTO_NONE: ::c_int = 59;
-/// IP6 destination option
-pub const IPPROTO_DSTOPTS: ::c_int = 60;
-pub const IPPROTO_MTP: ::c_int = 92;
-pub const IPPROTO_BEETPH: ::c_int = 94;
-/// encapsulation header
-pub const IPPROTO_ENCAP: ::c_int = 98;
-/// Protocol indep. multicast
-pub const IPPROTO_PIM: ::c_int = 103;
-/// IP Payload Comp. Protocol
-pub const IPPROTO_COMP: ::c_int = 108;
-/// SCTP
-pub const IPPROTO_SCTP: ::c_int = 132;
-pub const IPPROTO_MH: ::c_int = 135;
-pub const IPPROTO_UDPLITE: ::c_int = 136;
-pub const IPPROTO_MPLS: ::c_int = 137;
-/// raw IP packet
-pub const IPPROTO_RAW: ::c_int = 255;
-pub const IPPROTO_MAX: ::c_int = 256;
-
-pub const PROT_GROWSDOWN: ::c_int = 0x1000000;
-pub const PROT_GROWSUP: ::c_int = 0x2000000;
-
-pub const MAP_TYPE: ::c_int = 0x000f;
-
-pub const MADV_NORMAL: ::c_int = 0;
-pub const MADV_RANDOM: ::c_int = 1;
-pub const MADV_SEQUENTIAL: ::c_int = 2;
-pub const MADV_WILLNEED: ::c_int = 3;
-pub const MADV_DONTNEED: ::c_int = 4;
-pub const MADV_REMOVE: ::c_int = 9;
-pub const MADV_DONTFORK: ::c_int = 10;
-pub const MADV_DOFORK: ::c_int = 11;
-pub const MADV_MERGEABLE: ::c_int = 12;
-pub const MADV_UNMERGEABLE: ::c_int = 13;
-pub const MADV_HWPOISON: ::c_int = 100;
-
-// https://github.com/kraj/uClibc/blob/master/include/net/if.h#L44
-pub const IFF_UP: ::c_int = 0x1; // Interface is up.
-pub const IFF_BROADCAST: ::c_int = 0x2; // Broadcast address valid.
-pub const IFF_DEBUG: ::c_int = 0x4; // Turn on debugging.
-pub const IFF_LOOPBACK: ::c_int = 0x8; // Is a loopback net.
-pub const IFF_POINTOPOINT: ::c_int = 0x10; // Interface is point-to-point link.
-pub const IFF_NOTRAILERS: ::c_int = 0x20; // Avoid use of trailers.
-pub const IFF_RUNNING: ::c_int = 0x40; // Resources allocated.
-pub const IFF_NOARP: ::c_int = 0x80; // No address resolution protocol.
-pub const IFF_PROMISC: ::c_int = 0x100; // Receive all packets.
-
-// Not supported
-pub const IFF_ALLMULTI: ::c_int = 0x200; // Receive all multicast packets.
-pub const IFF_MASTER: ::c_int = 0x400; // Master of a load balancer.
-pub const IFF_SLAVE: ::c_int = 0x800; // Slave of a load balancer.
-pub const IFF_MULTICAST: ::c_int = 0x1000; // Supports multicast.
-pub const IFF_PORTSEL: ::c_int = 0x2000; // Can set media type.
-pub const IFF_AUTOMEDIA: ::c_int = 0x4000; // Auto media select active.
-
-// Dialup device with changing addresses.
-pub const IFF_DYNAMIC: ::c_int = 0x8000;
-
-pub const SOL_IP: ::c_int = 0;
-pub const SOL_TCP: ::c_int = 6;
-pub const SOL_IPV6: ::c_int = 41;
-pub const SOL_ICMPV6: ::c_int = 58;
-pub const SOL_RAW: ::c_int = 255;
-pub const SOL_DECNET: ::c_int = 261;
-pub const SOL_X25: ::c_int = 262;
-pub const SOL_PACKET: ::c_int = 263;
-pub const SOL_ATM: ::c_int = 264;
-pub const SOL_AAL: ::c_int = 265;
-pub const SOL_IRDA: ::c_int = 266;
-
-pub const AF_UNSPEC: ::c_int = 0;
-pub const AF_UNIX: ::c_int = 1;
-pub const AF_LOCAL: ::c_int = 1;
-pub const AF_INET: ::c_int = 2;
-pub const AF_AX25: ::c_int = 3;
-pub const AF_IPX: ::c_int = 4;
-pub const AF_APPLETALK: ::c_int = 5;
-pub const AF_NETROM: ::c_int = 6;
-pub const AF_BRIDGE: ::c_int = 7;
-pub const AF_ATMPVC: ::c_int = 8;
-pub const AF_X25: ::c_int = 9;
-pub const AF_INET6: ::c_int = 10;
-pub const AF_ROSE: ::c_int = 11;
-pub const AF_DECnet: ::c_int = 12;
-pub const AF_NETBEUI: ::c_int = 13;
-pub const AF_SECURITY: ::c_int = 14;
-pub const AF_KEY: ::c_int = 15;
-pub const AF_NETLINK: ::c_int = 16;
-pub const AF_ROUTE: ::c_int = AF_NETLINK;
-pub const AF_PACKET: ::c_int = 17;
-pub const AF_ASH: ::c_int = 18;
-pub const AF_ECONET: ::c_int = 19;
-pub const AF_ATMSVC: ::c_int = 20;
-pub const AF_SNA: ::c_int = 22;
-pub const AF_IRDA: ::c_int = 23;
-pub const AF_PPPOX: ::c_int = 24;
-pub const AF_WANPIPE: ::c_int = 25;
-pub const AF_LLC: ::c_int = 26;
-pub const AF_CAN: ::c_int = 29;
-pub const AF_TIPC: ::c_int = 30;
-pub const AF_BLUETOOTH: ::c_int = 31;
-pub const AF_IUCV: ::c_int = 32;
-pub const AF_RXRPC: ::c_int = 33;
-pub const AF_ISDN: ::c_int = 34;
-pub const AF_PHONET: ::c_int = 35;
-pub const AF_IEEE802154: ::c_int = 36;
-pub const AF_CAIF: ::c_int = 37;
-pub const AF_ALG: ::c_int = 38;
-
-pub const PF_UNSPEC: ::c_int = AF_UNSPEC;
-pub const PF_UNIX: ::c_int = AF_UNIX;
-pub const PF_LOCAL: ::c_int = AF_LOCAL;
-pub const PF_INET: ::c_int = AF_INET;
-pub const PF_AX25: ::c_int = AF_AX25;
-pub const PF_IPX: ::c_int = AF_IPX;
-pub const PF_APPLETALK: ::c_int = AF_APPLETALK;
-pub const PF_NETROM: ::c_int = AF_NETROM;
-pub const PF_BRIDGE: ::c_int = AF_BRIDGE;
-pub const PF_ATMPVC: ::c_int = AF_ATMPVC;
-pub const PF_X25: ::c_int = AF_X25;
-pub const PF_INET6: ::c_int = AF_INET6;
-pub const PF_ROSE: ::c_int = AF_ROSE;
-pub const PF_DECnet: ::c_int = AF_DECnet;
-pub const PF_NETBEUI: ::c_int = AF_NETBEUI;
-pub const PF_SECURITY: ::c_int = AF_SECURITY;
-pub const PF_KEY: ::c_int = AF_KEY;
-pub const PF_NETLINK: ::c_int = AF_NETLINK;
-pub const PF_ROUTE: ::c_int = AF_ROUTE;
-pub const PF_PACKET: ::c_int = AF_PACKET;
-pub const PF_ASH: ::c_int = AF_ASH;
-pub const PF_ECONET: ::c_int = AF_ECONET;
-pub const PF_ATMSVC: ::c_int = AF_ATMSVC;
-pub const PF_SNA: ::c_int = AF_SNA;
-pub const PF_IRDA: ::c_int = AF_IRDA;
-pub const PF_PPPOX: ::c_int = AF_PPPOX;
-pub const PF_WANPIPE: ::c_int = AF_WANPIPE;
-pub const PF_LLC: ::c_int = AF_LLC;
-pub const PF_CAN: ::c_int = AF_CAN;
-pub const PF_TIPC: ::c_int = AF_TIPC;
-pub const PF_BLUETOOTH: ::c_int = AF_BLUETOOTH;
-pub const PF_IUCV: ::c_int = AF_IUCV;
-pub const PF_RXRPC: ::c_int = AF_RXRPC;
-pub const PF_ISDN: ::c_int = AF_ISDN;
-pub const PF_PHONET: ::c_int = AF_PHONET;
-pub const PF_IEEE802154: ::c_int = AF_IEEE802154;
-pub const PF_CAIF: ::c_int = AF_CAIF;
-pub const PF_ALG: ::c_int = AF_ALG;
-
-pub const SOMAXCONN: ::c_int = 128;
-
-pub const MSG_OOB: ::c_int = 1;
-pub const MSG_PEEK: ::c_int = 2;
-pub const MSG_DONTROUTE: ::c_int = 4;
-pub const MSG_CTRUNC: ::c_int = 8;
-pub const MSG_TRUNC: ::c_int = 0x20;
-pub const MSG_DONTWAIT: ::c_int = 0x40;
-pub const MSG_EOR: ::c_int = 0x80;
-pub const MSG_WAITALL: ::c_int = 0x100;
-pub const MSG_FIN: ::c_int = 0x200;
-pub const MSG_SYN: ::c_int = 0x400;
-pub const MSG_CONFIRM: ::c_int = 0x800;
-pub const MSG_RST: ::c_int = 0x1000;
-pub const MSG_ERRQUEUE: ::c_int = 0x2000;
-pub const MSG_NOSIGNAL: ::c_int = 0x4000;
-pub const MSG_MORE: ::c_int = 0x8000;
-pub const MSG_WAITFORONE: ::c_int = 0x10000;
-pub const MSG_CMSG_CLOEXEC: ::c_int = 0x40000000;
-
-pub const SOCK_RAW: ::c_int = 3;
-pub const SOCK_RDM: ::c_int = 4;
-pub const IP_MULTICAST_TTL: ::c_int = 33;
-pub const IP_MULTICAST_LOOP: ::c_int = 34;
-pub const IP_TTL: ::c_int = 2;
-pub const IP_HDRINCL: ::c_int = 3;
-pub const IP_ADD_MEMBERSHIP: ::c_int = 35;
-pub const IP_DROP_MEMBERSHIP: ::c_int = 36;
-pub const IPV6_ADD_MEMBERSHIP: ::c_int = 20;
-pub const IPV6_DROP_MEMBERSHIP: ::c_int = 21;
-
-pub const IPV6_JOIN_GROUP: ::c_int = 20;
-pub const IPV6_LEAVE_GROUP: ::c_int = 21;
-
-pub const TCP_NODELAY: ::c_int = 1;
-pub const TCP_MAXSEG: ::c_int = 2;
-pub const TCP_CORK: ::c_int = 3;
-pub const TCP_KEEPIDLE: ::c_int = 4;
-pub const TCP_KEEPINTVL: ::c_int = 5;
-pub const TCP_KEEPCNT: ::c_int = 6;
-pub const TCP_SYNCNT: ::c_int = 7;
-pub const TCP_LINGER2: ::c_int = 8;
-pub const TCP_DEFER_ACCEPT: ::c_int = 9;
-pub const TCP_WINDOW_CLAMP: ::c_int = 10;
-pub const TCP_INFO: ::c_int = 11;
-pub const TCP_QUICKACK: ::c_int = 12;
-pub const TCP_CONGESTION: ::c_int = 13;
-
-// Source:
-// https://github.com/kraj/uClibc/blob/ca1c74d67dd115d059a875150e10b8560a9c35a8
-// /libc/sysdeps/linux/common/bits/in.h
-// Same for all architectures
-pub const IPV6_MULTICAST_HOPS: ::c_int = 18;
-pub const IP_MULTICAST_IF: ::c_int = 32;
-pub const IPV6_MULTICAST_IF: ::c_int = 17;
-pub const IPV6_UNICAST_HOPS: ::c_int = 16;
-
-// Source:
-// https://github.com/kraj/uClibc/tree/ca1c74d67dd115d059a875150e10b8560a9c35a8
-// Same for all architectures
-pub const FUTEX_WAIT: ::c_int = 0;
-pub const FUTEX_PRIVATE_FLAG: ::c_int = 128;
-pub const FUTEX_WAKE: ::c_int = 1;
-
-pub const IPV6_MULTICAST_LOOP: ::c_int = 19;
-pub const IPV6_V6ONLY: ::c_int = 26;
-
-pub const SO_DEBUG: ::c_int = 1;
-
-pub const SHUT_RD: ::c_int = 0;
-pub const SHUT_WR: ::c_int = 1;
-pub const SHUT_RDWR: ::c_int = 2;
-
-pub const LOCK_SH: ::c_int = 1;
-pub const LOCK_EX: ::c_int = 2;
-pub const LOCK_NB: ::c_int = 4;
-pub const LOCK_UN: ::c_int = 8;
-
-pub const SS_ONSTACK: ::c_int = 1;
-pub const SS_DISABLE: ::c_int = 2;
-
-pub const PATH_MAX: ::c_int = 4096;
-
-pub const UIO_MAXIOV: ::c_int = 1024;
-
-pub const FD_SETSIZE: usize = 1024;
-
-pub const EPOLLIN: ::c_int = 0x1;
-pub const EPOLLPRI: ::c_int = 0x2;
-pub const EPOLLOUT: ::c_int = 0x4;
-pub const EPOLLRDNORM: ::c_int = 0x40;
-pub const EPOLLRDBAND: ::c_int = 0x80;
-pub const EPOLLWRNORM: ::c_int = 0x100;
-pub const EPOLLWRBAND: ::c_int = 0x200;
-pub const EPOLLMSG: ::c_int = 0x400;
-pub const EPOLLERR: ::c_int = 0x8;
-pub const EPOLLHUP: ::c_int = 0x10;
-pub const EPOLLET: ::c_int = 0x80000000;
-
-pub const EPOLL_CTL_ADD: ::c_int = 1;
-pub const EPOLL_CTL_MOD: ::c_int = 3;
-pub const EPOLL_CTL_DEL: ::c_int = 2;
-
-pub const MNT_DETACH: ::c_int = 0x2;
-pub const MNT_EXPIRE: ::c_int = 0x4;
-
-pub const MNT_FORCE: ::c_int = 0x1;
-
-pub const Q_SYNC: ::c_int = 0x600;
-pub const Q_QUOTAON: ::c_int = 0x100;
-pub const Q_QUOTAOFF: ::c_int = 0x200;
-pub const Q_GETQUOTA: ::c_int = 0x300;
-pub const Q_SETQUOTA: ::c_int = 0x400;
-
-pub const TCIOFF: ::c_int = 2;
-pub const TCION: ::c_int = 3;
-pub const TCOOFF: ::c_int = 0;
-pub const TCOON: ::c_int = 1;
-pub const TCIFLUSH: ::c_int = 0;
-pub const TCOFLUSH: ::c_int = 1;
-pub const TCIOFLUSH: ::c_int = 2;
-pub const NL0: ::tcflag_t = 0x00000000;
-pub const NL1: ::tcflag_t = 0x00000100;
-pub const TAB0: ::tcflag_t = 0x00000000;
-pub const CR0: ::tcflag_t = 0x00000000;
-pub const FF0: ::tcflag_t = 0x00000000;
-pub const BS0: ::tcflag_t = 0x00000000;
-pub const VT0: ::tcflag_t = 0x00000000;
-pub const VERASE: usize = 2;
-pub const VKILL: usize = 3;
-pub const VINTR: usize = 0;
-pub const VQUIT: usize = 1;
-pub const VLNEXT: usize = 15;
-pub const IGNBRK: ::tcflag_t = 0x00000001;
-pub const BRKINT: ::tcflag_t = 0x00000002;
-pub const IGNPAR: ::tcflag_t = 0x00000004;
-pub const PARMRK: ::tcflag_t = 0x00000008;
-pub const INPCK: ::tcflag_t = 0x00000010;
-pub const ISTRIP: ::tcflag_t = 0x00000020;
-pub const INLCR: ::tcflag_t = 0x00000040;
-pub const IGNCR: ::tcflag_t = 0x00000080;
-pub const ICRNL: ::tcflag_t = 0x00000100;
-pub const IXANY: ::tcflag_t = 0x00000800;
-pub const IMAXBEL: ::tcflag_t = 0x00002000;
-pub const OPOST: ::tcflag_t = 0x1;
-pub const CS5: ::tcflag_t = 0x00000000;
-pub const CRTSCTS: ::tcflag_t = 0x80000000;
-pub const ECHO: ::tcflag_t = 0x00000008;
-
-pub const CLONE_VM: ::c_int = 0x100;
-pub const CLONE_FS: ::c_int = 0x200;
-pub const CLONE_FILES: ::c_int = 0x400;
-pub const CLONE_SIGHAND: ::c_int = 0x800;
-pub const CLONE_PTRACE: ::c_int = 0x2000;
-pub const CLONE_VFORK: ::c_int = 0x4000;
-pub const CLONE_PARENT: ::c_int = 0x8000;
-pub const CLONE_THREAD: ::c_int = 0x10000;
-pub const CLONE_NEWNS: ::c_int = 0x20000;
-pub const CLONE_SYSVSEM: ::c_int = 0x40000;
-pub const CLONE_SETTLS: ::c_int = 0x80000;
-pub const CLONE_PARENT_SETTID: ::c_int = 0x100000;
-pub const CLONE_CHILD_CLEARTID: ::c_int = 0x200000;
-pub const CLONE_DETACHED: ::c_int = 0x400000;
-pub const CLONE_UNTRACED: ::c_int = 0x800000;
-pub const CLONE_CHILD_SETTID: ::c_int = 0x01000000;
-pub const CLONE_NEWUTS: ::c_int = 0x04000000;
-pub const CLONE_NEWIPC: ::c_int = 0x08000000;
-pub const CLONE_NEWUSER: ::c_int = 0x10000000;
-pub const CLONE_NEWPID: ::c_int = 0x20000000;
-pub const CLONE_NEWNET: ::c_int = 0x40000000;
-pub const CLONE_IO: ::c_int = 0x80000000;
-
-pub const WNOHANG: ::c_int = 0x00000001;
-pub const WUNTRACED: ::c_int = 0x00000002;
-pub const WSTOPPED: ::c_int = WUNTRACED;
-pub const WEXITED: ::c_int = 0x00000004;
-pub const WCONTINUED: ::c_int = 0x00000008;
-pub const WNOWAIT: ::c_int = 0x01000000;
-
-pub const __WNOTHREAD: ::c_int = 0x20000000;
-pub const __WALL: ::c_int = 0x40000000;
-pub const __WCLONE: ::c_int = 0x80000000;
-
-pub const SPLICE_F_MOVE: ::c_uint = 0x01;
-pub const SPLICE_F_NONBLOCK: ::c_uint = 0x02;
-pub const SPLICE_F_MORE: ::c_uint = 0x04;
-pub const SPLICE_F_GIFT: ::c_uint = 0x08;
-
-pub const RTLD_LOCAL: ::c_int = 0;
-pub const RTLD_LAZY: ::c_int = 1;
-
-pub const POSIX_FADV_NORMAL: ::c_int = 0;
-pub const POSIX_FADV_RANDOM: ::c_int = 1;
-pub const POSIX_FADV_SEQUENTIAL: ::c_int = 2;
-pub const POSIX_FADV_WILLNEED: ::c_int = 3;
-
-pub const AT_FDCWD: ::c_int = -100;
-pub const AT_SYMLINK_NOFOLLOW: ::c_int = 0x100;
-pub const AT_REMOVEDIR: ::c_int = 0x200;
-pub const AT_EACCESS: ::c_int = 0x200;
-pub const AT_SYMLINK_FOLLOW: ::c_int = 0x400;
-
-pub const LOG_CRON: ::c_int = 9 << 3;
-pub const LOG_AUTHPRIV: ::c_int = 10 << 3;
-pub const LOG_FTP: ::c_int = 11 << 3;
-pub const LOG_PERROR: ::c_int = 0x20;
-
-pub const POLLIN: ::c_short = 0x1;
-pub const POLLPRI: ::c_short = 0x2;
-pub const POLLOUT: ::c_short = 0x4;
-pub const POLLERR: ::c_short = 0x8;
-pub const POLLHUP: ::c_short = 0x10;
-pub const POLLNVAL: ::c_short = 0x20;
-
-pub const PIPE_BUF: usize = 4096;
-
-pub const SI_LOAD_SHIFT: ::c_uint = 16;
-
-pub const SIGEV_SIGNAL: ::c_int = 0;
-pub const SIGEV_NONE: ::c_int = 1;
-pub const SIGEV_THREAD: ::c_int = 2;
-
-pub const P_ALL: idtype_t = 0;
-pub const P_PID: idtype_t = 1;
-pub const P_PGID: idtype_t = 2;
-
-pub const UTIME_OMIT: c_long = 1073741822;
-pub const UTIME_NOW: c_long = 1073741823;
-
-pub const L_tmpnam: ::c_uint = 20;
-pub const _PC_LINK_MAX: ::c_int = 0;
-pub const _PC_MAX_CANON: ::c_int = 1;
-pub const _PC_MAX_INPUT: ::c_int = 2;
-pub const _PC_NAME_MAX: ::c_int = 3;
-pub const _PC_PATH_MAX: ::c_int = 4;
-pub const _PC_PIPE_BUF: ::c_int = 5;
-pub const _PC_CHOWN_RESTRICTED: ::c_int = 6;
-pub const _PC_NO_TRUNC: ::c_int = 7;
-pub const _PC_VDISABLE: ::c_int = 8;
-
-pub const _SC_ARG_MAX: ::c_int = 0;
-pub const _SC_CHILD_MAX: ::c_int = 1;
-pub const _SC_CLK_TCK: ::c_int = 2;
-pub const _SC_NGROUPS_MAX: ::c_int = 3;
-pub const _SC_OPEN_MAX: ::c_int = 4;
-pub const _SC_STREAM_MAX: ::c_int = 5;
-pub const _SC_TZNAME_MAX: ::c_int = 6;
-pub const _SC_JOB_CONTROL: ::c_int = 7;
-pub const _SC_SAVED_IDS: ::c_int = 8;
-pub const _SC_REALTIME_SIGNALS: ::c_int = 9;
-pub const _SC_PRIORITY_SCHEDULING: ::c_int = 10;
-pub const _SC_TIMERS: ::c_int = 11;
-pub const _SC_ASYNCHRONOUS_IO: ::c_int = 12;
-pub const _SC_PRIORITIZED_IO: ::c_int = 13;
-pub const _SC_SYNCHRONIZED_IO: ::c_int = 14;
-pub const _SC_FSYNC: ::c_int = 15;
-pub const _SC_MAPPED_FILES: ::c_int = 16;
-pub const _SC_MEMLOCK: ::c_int = 17;
-pub const _SC_MEMLOCK_RANGE: ::c_int = 18;
-pub const _SC_MEMORY_PROTECTION: ::c_int = 19;
-pub const _SC_MESSAGE_PASSING: ::c_int = 20;
-pub const _SC_SEMAPHORES: ::c_int = 21;
-pub const _SC_SHARED_MEMORY_OBJECTS: ::c_int = 22;
-pub const _SC_AIO_LISTIO_MAX: ::c_int = 23;
-pub const _SC_AIO_MAX: ::c_int = 24;
-pub const _SC_AIO_PRIO_DELTA_MAX: ::c_int = 25;
-pub const _SC_DELAYTIMER_MAX: ::c_int = 26;
-pub const _SC_MQ_OPEN_MAX: ::c_int = 27;
-pub const _SC_MQ_PRIO_MAX: ::c_int = 28;
-pub const _SC_VERSION: ::c_int = 29;
-pub const _SC_PAGESIZE: ::c_int = 30;
-pub const _SC_PAGE_SIZE: ::c_int = _SC_PAGESIZE;
-pub const _SC_RTSIG_MAX: ::c_int = 31;
-pub const _SC_SEM_NSEMS_MAX: ::c_int = 32;
-pub const _SC_SEM_VALUE_MAX: ::c_int = 33;
-pub const _SC_SIGQUEUE_MAX: ::c_int = 34;
-pub const _SC_TIMER_MAX: ::c_int = 35;
-pub const _SC_BC_BASE_MAX: ::c_int = 36;
-pub const _SC_BC_DIM_MAX: ::c_int = 37;
-pub const _SC_BC_SCALE_MAX: ::c_int = 38;
-pub const _SC_BC_STRING_MAX: ::c_int = 39;
-pub const _SC_COLL_WEIGHTS_MAX: ::c_int = 40;
-pub const _SC_EXPR_NEST_MAX: ::c_int = 42;
-pub const _SC_LINE_MAX: ::c_int = 43;
-pub const _SC_RE_DUP_MAX: ::c_int = 44;
-pub const _SC_2_VERSION: ::c_int = 46;
-pub const _SC_2_C_BIND: ::c_int = 47;
-pub const _SC_2_C_DEV: ::c_int = 48;
-pub const _SC_2_FORT_DEV: ::c_int = 49;
-pub const _SC_2_FORT_RUN: ::c_int = 50;
-pub const _SC_2_SW_DEV: ::c_int = 51;
-pub const _SC_2_LOCALEDEF: ::c_int = 52;
-pub const _SC_IOV_MAX: ::c_int = 60;
-pub const _SC_THREADS: ::c_int = 67;
-pub const _SC_THREAD_SAFE_FUNCTIONS: ::c_int = 68;
-pub const _SC_GETGR_R_SIZE_MAX: ::c_int = 69;
-pub const _SC_GETPW_R_SIZE_MAX: ::c_int = 70;
-pub const _SC_LOGIN_NAME_MAX: ::c_int = 71;
-pub const _SC_TTY_NAME_MAX: ::c_int = 72;
-pub const _SC_THREAD_DESTRUCTOR_ITERATIONS: ::c_int = 73;
-pub const _SC_THREAD_KEYS_MAX: ::c_int = 74;
-pub const _SC_THREAD_STACK_MIN: ::c_int = 75;
-pub const _SC_THREAD_THREADS_MAX: ::c_int = 76;
-pub const _SC_THREAD_ATTR_STACKADDR: ::c_int = 77;
-pub const _SC_THREAD_ATTR_STACKSIZE: ::c_int = 78;
-pub const _SC_THREAD_PRIORITY_SCHEDULING: ::c_int = 79;
-pub const _SC_THREAD_PRIO_INHERIT: ::c_int = 80;
-pub const _SC_THREAD_PRIO_PROTECT: ::c_int = 81;
-pub const _SC_NPROCESSORS_ONLN: ::c_int = 84;
-pub const _SC_ATEXIT_MAX: ::c_int = 87;
-pub const _SC_XOPEN_VERSION: ::c_int = 89;
-pub const _SC_XOPEN_XCU_VERSION: ::c_int = 90;
-pub const _SC_XOPEN_UNIX: ::c_int = 91;
-pub const _SC_XOPEN_CRYPT: ::c_int = 92;
-pub const _SC_XOPEN_ENH_I18N: ::c_int = 93;
-pub const _SC_XOPEN_SHM: ::c_int = 94;
-pub const _SC_2_CHAR_TERM: ::c_int = 95;
-pub const _SC_2_UPE: ::c_int = 97;
-pub const _SC_XBS5_ILP32_OFF32: ::c_int = 125;
-pub const _SC_XBS5_ILP32_OFFBIG: ::c_int = 126;
-pub const _SC_XBS5_LPBIG_OFFBIG: ::c_int = 128;
-pub const _SC_XOPEN_LEGACY: ::c_int = 129;
-pub const _SC_XOPEN_REALTIME: ::c_int = 130;
-pub const _SC_XOPEN_REALTIME_THREADS: ::c_int = 131;
-pub const _SC_HOST_NAME_MAX: ::c_int = 180;
-
-pub const RLIM_SAVED_MAX: ::rlim_t = RLIM_INFINITY;
-pub const RLIM_SAVED_CUR: ::rlim_t = RLIM_INFINITY;
-
-pub const GLOB_ERR: ::c_int = 1 << 0;
-pub const GLOB_MARK: ::c_int = 1 << 1;
-pub const GLOB_NOSORT: ::c_int = 1 << 2;
-pub const GLOB_DOOFFS: ::c_int = 1 << 3;
-pub const GLOB_NOCHECK: ::c_int = 1 << 4;
-pub const GLOB_APPEND: ::c_int = 1 << 5;
-pub const GLOB_NOESCAPE: ::c_int = 1 << 6;
-
-pub const GLOB_NOSPACE: ::c_int = 1;
-pub const GLOB_ABORTED: ::c_int = 2;
-pub const GLOB_NOMATCH: ::c_int = 3;
-
-pub const POSIX_MADV_NORMAL: ::c_int = 0;
-pub const POSIX_MADV_RANDOM: ::c_int = 1;
-pub const POSIX_MADV_SEQUENTIAL: ::c_int = 2;
-pub const POSIX_MADV_WILLNEED: ::c_int = 3;
-
-pub const S_IEXEC: mode_t = 64;
-pub const S_IWRITE: mode_t = 128;
-pub const S_IREAD: mode_t = 256;
-
-pub const F_LOCK: ::c_int = 1;
-pub const F_TEST: ::c_int = 3;
-pub const F_TLOCK: ::c_int = 2;
-pub const F_ULOCK: ::c_int = 0;
-
-pub const ST_RDONLY: ::c_ulong = 1;
-pub const ST_NOSUID: ::c_ulong = 2;
-pub const ST_NODEV: ::c_ulong = 4;
-pub const ST_NOEXEC: ::c_ulong = 8;
-pub const ST_SYNCHRONOUS: ::c_ulong = 16;
-pub const ST_MANDLOCK: ::c_ulong = 64;
-pub const ST_WRITE: ::c_ulong = 128;
-pub const ST_APPEND: ::c_ulong = 256;
-pub const ST_IMMUTABLE: ::c_ulong = 512;
-pub const ST_NOATIME: ::c_ulong = 1024;
-pub const ST_NODIRATIME: ::c_ulong = 2048;
-
-pub const RTLD_NEXT: *mut ::c_void = -1i64 as *mut ::c_void;
-pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void;
-pub const RTLD_NODELETE: ::c_int = 0x1000;
-pub const RTLD_NOW: ::c_int = 0x2;
-
-pub const TCP_MD5SIG: ::c_int = 14;
-
-align_const! {
-    pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
-        size: [0; __SIZEOF_PTHREAD_MUTEX_T],
-    };
-    pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t {
-        size: [0; __SIZEOF_PTHREAD_COND_T],
-    };
-    pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
-        size: [0; __SIZEOF_PTHREAD_RWLOCK_T],
-    };
-}
-pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
-pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 1;
-pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
-pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
-pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
-
-pub const SCHED_OTHER: ::c_int = 0;
-pub const SCHED_FIFO: ::c_int = 1;
-pub const SCHED_RR: ::c_int = 2;
-pub const SCHED_BATCH: ::c_int = 3;
-pub const SCHED_IDLE: ::c_int = 5;
-
-// System V IPC
-pub const IPC_PRIVATE: ::key_t = 0;
-
-pub const IPC_CREAT: ::c_int = 0o1000;
-pub const IPC_EXCL: ::c_int = 0o2000;
-pub const IPC_NOWAIT: ::c_int = 0o4000;
-
-pub const IPC_RMID: ::c_int = 0;
-pub const IPC_SET: ::c_int = 1;
-pub const IPC_STAT: ::c_int = 2;
-pub const IPC_INFO: ::c_int = 3;
-pub const MSG_STAT: ::c_int = 11;
-pub const MSG_INFO: ::c_int = 12;
-
-pub const MSG_NOERROR: ::c_int = 0o10000;
-pub const MSG_EXCEPT: ::c_int = 0o20000;
-
-pub const SHM_R: ::c_int = 0o400;
-pub const SHM_W: ::c_int = 0o200;
-
-pub const SHM_RDONLY: ::c_int = 0o10000;
-pub const SHM_RND: ::c_int = 0o20000;
-pub const SHM_REMAP: ::c_int = 0o40000;
-
-pub const SHM_LOCK: ::c_int = 11;
-pub const SHM_UNLOCK: ::c_int = 12;
-
-pub const SHM_HUGETLB: ::c_int = 0o4000;
-pub const SHM_NORESERVE: ::c_int = 0o10000;
-
-pub const EPOLLRDHUP: ::c_int = 0x2000;
-pub const EPOLLONESHOT: ::c_int = 0x40000000;
-
-pub const QFMT_VFS_OLD: ::c_int = 1;
-pub const QFMT_VFS_V0: ::c_int = 2;
-
-pub const EFD_SEMAPHORE: ::c_int = 0x1;
-
-pub const LOG_NFACILITIES: ::c_int = 24;
-
-pub const SEM_FAILED: *mut ::sem_t = 0 as *mut sem_t;
-
-pub const RB_AUTOBOOT: ::c_int = 0x01234567u32 as i32;
-pub const RB_HALT_SYSTEM: ::c_int = 0xcdef0123u32 as i32;
-pub const RB_ENABLE_CAD: ::c_int = 0x89abcdefu32 as i32;
-pub const RB_DISABLE_CAD: ::c_int = 0x00000000u32 as i32;
-pub const RB_POWER_OFF: ::c_int = 0x4321fedcu32 as i32;
-
-pub const AI_PASSIVE: ::c_int = 0x0001;
-pub const AI_CANONNAME: ::c_int = 0x0002;
-pub const AI_NUMERICHOST: ::c_int = 0x0004;
-pub const AI_V4MAPPED: ::c_int = 0x0008;
-pub const AI_ALL: ::c_int = 0x0010;
-pub const AI_ADDRCONFIG: ::c_int = 0x0020;
-
-pub const AI_NUMERICSERV: ::c_int = 0x0400;
-
-pub const EAI_BADFLAGS: ::c_int = -1;
-pub const EAI_NONAME: ::c_int = -2;
-pub const EAI_AGAIN: ::c_int = -3;
-pub const EAI_FAIL: ::c_int = -4;
-pub const EAI_NODATA: ::c_int = -5;
-pub const EAI_FAMILY: ::c_int = -6;
-pub const EAI_SOCKTYPE: ::c_int = -7;
-pub const EAI_SERVICE: ::c_int = -8;
-pub const EAI_MEMORY: ::c_int = -10;
-pub const EAI_OVERFLOW: ::c_int = -12;
-
-pub const NI_NUMERICHOST: ::c_int = 1;
-pub const NI_NUMERICSERV: ::c_int = 2;
-pub const NI_NOFQDN: ::c_int = 4;
-pub const NI_NAMEREQD: ::c_int = 8;
-pub const NI_DGRAM: ::c_int = 16;
-
-pub const SYNC_FILE_RANGE_WAIT_BEFORE: ::c_uint = 1;
-pub const SYNC_FILE_RANGE_WRITE: ::c_uint = 2;
-pub const SYNC_FILE_RANGE_WAIT_AFTER: ::c_uint = 4;
-
-pub const EAI_SYSTEM: ::c_int = -11;
-
-pub const MREMAP_MAYMOVE: ::c_int = 1;
-pub const MREMAP_FIXED: ::c_int = 2;
-
-pub const PR_SET_PDEATHSIG: ::c_int = 1;
-pub const PR_GET_PDEATHSIG: ::c_int = 2;
-
-pub const PR_GET_DUMPABLE: ::c_int = 3;
-pub const PR_SET_DUMPABLE: ::c_int = 4;
-
-pub const PR_GET_UNALIGN: ::c_int = 5;
-pub const PR_SET_UNALIGN: ::c_int = 6;
-pub const PR_UNALIGN_NOPRINT: ::c_int = 1;
-pub const PR_UNALIGN_SIGBUS: ::c_int = 2;
-
-pub const PR_GET_KEEPCAPS: ::c_int = 7;
-pub const PR_SET_KEEPCAPS: ::c_int = 8;
-
-pub const PR_GET_FPEMU: ::c_int = 9;
-pub const PR_SET_FPEMU: ::c_int = 10;
-pub const PR_FPEMU_NOPRINT: ::c_int = 1;
-pub const PR_FPEMU_SIGFPE: ::c_int = 2;
-
-pub const PR_GET_FPEXC: ::c_int = 11;
-pub const PR_SET_FPEXC: ::c_int = 12;
-pub const PR_FP_EXC_SW_ENABLE: ::c_int = 0x80;
-pub const PR_FP_EXC_DIV: ::c_int = 0x010000;
-pub const PR_FP_EXC_OVF: ::c_int = 0x020000;
-pub const PR_FP_EXC_UND: ::c_int = 0x040000;
-pub const PR_FP_EXC_RES: ::c_int = 0x080000;
-pub const PR_FP_EXC_INV: ::c_int = 0x100000;
-pub const PR_FP_EXC_DISABLED: ::c_int = 0;
-pub const PR_FP_EXC_NONRECOV: ::c_int = 1;
-pub const PR_FP_EXC_ASYNC: ::c_int = 2;
-pub const PR_FP_EXC_PRECISE: ::c_int = 3;
-
-pub const PR_GET_TIMING: ::c_int = 13;
-pub const PR_SET_TIMING: ::c_int = 14;
-pub const PR_TIMING_STATISTICAL: ::c_int = 0;
-pub const PR_TIMING_TIMESTAMP: ::c_int = 1;
-
-pub const PR_SET_NAME: ::c_int = 15;
-pub const PR_GET_NAME: ::c_int = 16;
-
-pub const PR_GET_ENDIAN: ::c_int = 19;
-pub const PR_SET_ENDIAN: ::c_int = 20;
-pub const PR_ENDIAN_BIG: ::c_int = 0;
-pub const PR_ENDIAN_LITTLE: ::c_int = 1;
-pub const PR_ENDIAN_PPC_LITTLE: ::c_int = 2;
-
-pub const PR_GET_SECCOMP: ::c_int = 21;
-pub const PR_SET_SECCOMP: ::c_int = 22;
-
-pub const PR_CAPBSET_READ: ::c_int = 23;
-pub const PR_CAPBSET_DROP: ::c_int = 24;
-
-pub const PR_GET_TSC: ::c_int = 25;
-pub const PR_SET_TSC: ::c_int = 26;
-pub const PR_TSC_ENABLE: ::c_int = 1;
-pub const PR_TSC_SIGSEGV: ::c_int = 2;
-
-pub const PR_GET_SECUREBITS: ::c_int = 27;
-pub const PR_SET_SECUREBITS: ::c_int = 28;
-
-pub const PR_SET_TIMERSLACK: ::c_int = 29;
-pub const PR_GET_TIMERSLACK: ::c_int = 30;
-
-pub const PR_TASK_PERF_EVENTS_DISABLE: ::c_int = 31;
-pub const PR_TASK_PERF_EVENTS_ENABLE: ::c_int = 32;
-
-pub const PR_MCE_KILL: ::c_int = 33;
-pub const PR_MCE_KILL_CLEAR: ::c_int = 0;
-pub const PR_MCE_KILL_SET: ::c_int = 1;
-
-pub const PR_MCE_KILL_LATE: ::c_int = 0;
-pub const PR_MCE_KILL_EARLY: ::c_int = 1;
-pub const PR_MCE_KILL_DEFAULT: ::c_int = 2;
-
-pub const PR_MCE_KILL_GET: ::c_int = 34;
-
-pub const PR_SET_MM: ::c_int = 35;
-pub const PR_SET_MM_START_CODE: ::c_int = 1;
-pub const PR_SET_MM_END_CODE: ::c_int = 2;
-pub const PR_SET_MM_START_DATA: ::c_int = 3;
-pub const PR_SET_MM_END_DATA: ::c_int = 4;
-pub const PR_SET_MM_START_STACK: ::c_int = 5;
-pub const PR_SET_MM_START_BRK: ::c_int = 6;
-pub const PR_SET_MM_BRK: ::c_int = 7;
-pub const PR_SET_MM_ARG_START: ::c_int = 8;
-pub const PR_SET_MM_ARG_END: ::c_int = 9;
-pub const PR_SET_MM_ENV_START: ::c_int = 10;
-pub const PR_SET_MM_ENV_END: ::c_int = 11;
-pub const PR_SET_MM_AUXV: ::c_int = 12;
-pub const PR_SET_MM_EXE_FILE: ::c_int = 13;
-pub const PR_SET_MM_MAP: ::c_int = 14;
-pub const PR_SET_MM_MAP_SIZE: ::c_int = 15;
-
-pub const PR_SET_PTRACER: ::c_int = 0x59616d61;
-
-pub const PR_SET_CHILD_SUBREAPER: ::c_int = 36;
-pub const PR_GET_CHILD_SUBREAPER: ::c_int = 37;
-
-pub const PR_SET_NO_NEW_PRIVS: ::c_int = 38;
-pub const PR_GET_NO_NEW_PRIVS: ::c_int = 39;
-
-pub const PR_GET_TID_ADDRESS: ::c_int = 40;
-
-pub const PR_SET_THP_DISABLE: ::c_int = 41;
-pub const PR_GET_THP_DISABLE: ::c_int = 42;
-
-pub const GRND_NONBLOCK: ::c_uint = 0x0001;
-pub const GRND_RANDOM: ::c_uint = 0x0002;
-
-pub const ABDAY_1: ::nl_item = 0x300;
-pub const ABDAY_2: ::nl_item = 0x301;
-pub const ABDAY_3: ::nl_item = 0x302;
-pub const ABDAY_4: ::nl_item = 0x303;
-pub const ABDAY_5: ::nl_item = 0x304;
-pub const ABDAY_6: ::nl_item = 0x305;
-pub const ABDAY_7: ::nl_item = 0x306;
-
-pub const DAY_1: ::nl_item = 0x307;
-pub const DAY_2: ::nl_item = 0x308;
-pub const DAY_3: ::nl_item = 0x309;
-pub const DAY_4: ::nl_item = 0x30A;
-pub const DAY_5: ::nl_item = 0x30B;
-pub const DAY_6: ::nl_item = 0x30C;
-pub const DAY_7: ::nl_item = 0x30D;
-
-pub const ABMON_1: ::nl_item = 0x30E;
-pub const ABMON_2: ::nl_item = 0x30F;
-pub const ABMON_3: ::nl_item = 0x310;
-pub const ABMON_4: ::nl_item = 0x311;
-pub const ABMON_5: ::nl_item = 0x312;
-pub const ABMON_6: ::nl_item = 0x313;
-pub const ABMON_7: ::nl_item = 0x314;
-pub const ABMON_8: ::nl_item = 0x315;
-pub const ABMON_9: ::nl_item = 0x316;
-pub const ABMON_10: ::nl_item = 0x317;
-pub const ABMON_11: ::nl_item = 0x318;
-pub const ABMON_12: ::nl_item = 0x319;
-
-pub const MON_1: ::nl_item = 0x31A;
-pub const MON_2: ::nl_item = 0x31B;
-pub const MON_3: ::nl_item = 0x31C;
-pub const MON_4: ::nl_item = 0x31D;
-pub const MON_5: ::nl_item = 0x31E;
-pub const MON_6: ::nl_item = 0x31F;
-pub const MON_7: ::nl_item = 0x320;
-pub const MON_8: ::nl_item = 0x321;
-pub const MON_9: ::nl_item = 0x322;
-pub const MON_10: ::nl_item = 0x323;
-pub const MON_11: ::nl_item = 0x324;
-pub const MON_12: ::nl_item = 0x325;
-
-pub const AM_STR: ::nl_item = 0x326;
-pub const PM_STR: ::nl_item = 0x327;
-
-pub const D_T_FMT: ::nl_item = 0x328;
-pub const D_FMT: ::nl_item = 0x329;
-pub const T_FMT: ::nl_item = 0x32A;
-pub const T_FMT_AMPM: ::nl_item = 0x32B;
-
-pub const ERA: ::nl_item = 0x32C;
-pub const ERA_D_FMT: ::nl_item = 0x32E;
-pub const ALT_DIGITS: ::nl_item = 0x32F;
-pub const ERA_D_T_FMT: ::nl_item = 0x330;
-pub const ERA_T_FMT: ::nl_item = 0x331;
-
-pub const CODESET: ::nl_item = 10;
-
-pub const CRNCYSTR: ::nl_item = 0x215;
-
-pub const RADIXCHAR: ::nl_item = 0x100;
-pub const THOUSEP: ::nl_item = 0x101;
-
-pub const NOEXPR: ::nl_item = 0x501;
-pub const YESSTR: ::nl_item = 0x502;
-pub const NOSTR: ::nl_item = 0x503;
-
-pub const FILENAME_MAX: ::c_uint = 4095;
-
-pub const PRIO_PROCESS: ::c_int = 0;
-pub const PRIO_PGRP: ::c_int = 1;
-pub const PRIO_USER: ::c_int = 2;
-
-f! {
-    pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
-        let fd = fd as usize;
-        let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
-        (*set).fds_bits[fd / size] &= !(1 << (fd % size));
-        return
-    }
-
-    pub fn FD_ISSET(fd: ::c_int, set: *mut fd_set) -> bool {
-        let fd = fd as usize;
-        let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
-        return ((*set).fds_bits[fd / size] & (1 << (fd % size))) != 0
-    }
-
-    pub fn FD_SET(fd: ::c_int, set: *mut fd_set) -> () {
-        let fd = fd as usize;
-        let size = ::mem::size_of_val(&(*set).fds_bits[0]) * 8;
-        (*set).fds_bits[fd / size] |= 1 << (fd % size);
-        return
-    }
-
-    pub fn FD_ZERO(set: *mut fd_set) -> () {
-        for slot in (*set).fds_bits.iter_mut() {
-            *slot = 0;
-        }
-    }
-
-    pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
-        for slot in cpuset.bits.iter_mut() {
-            *slot = 0;
-        }
-    }
-
-    pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) -> () {
-        let size_in_bits
-            = 8 * ::mem::size_of_val(&cpuset.bits[0]); // 32, 64 etc
-        let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
-        cpuset.bits[idx] |= 1 << offset;
-        ()
-    }
-
-    pub fn CPU_CLR(cpu: usize, cpuset: &mut cpu_set_t) -> () {
-        let size_in_bits
-            = 8 * ::mem::size_of_val(&cpuset.bits[0]); // 32, 64 etc
-        let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
-        cpuset.bits[idx] &= !(1 << offset);
-        ()
-    }
-
-    pub fn CPU_ISSET(cpu: usize, cpuset: &cpu_set_t) -> bool {
-        let size_in_bits = 8 * ::mem::size_of_val(&cpuset.bits[0]);
-        let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
-        0 != (cpuset.bits[idx] & (1 << offset))
-    }
-
-    pub fn CPU_EQUAL(set1: &cpu_set_t, set2: &cpu_set_t) -> bool {
-        set1.bits == set2.bits
-    }
-}
-
-safe_f! {
-    pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
-        (status & 0xff) == 0x7f
-    }
-
-    pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {
-        (status >> 8) & 0xff
-    }
-
-    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
-        status == 0xffff
-    }
-
-    pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {
-        ((status & 0x7f) + 1) as i8 >= 2
-    }
-
-    pub {const} fn WTERMSIG(status: ::c_int) -> ::c_int {
-        status & 0x7f
-    }
-
-    pub {const} fn WIFEXITED(status: ::c_int) -> bool {
-        (status & 0x7f) == 0
-    }
-
-    pub {const} fn WEXITSTATUS(status: ::c_int) -> ::c_int {
-        (status >> 8) & 0xff
-    }
-
-    pub {const} fn WCOREDUMP(status: ::c_int) -> bool {
-        (status & 0x80) != 0
-    }
-
-    pub {const} fn QCMD(cmd: ::c_int, type_: ::c_int) -> ::c_int {
-        (cmd << 8) | (type_ & 0x00ff)
-    }
-}
-
-extern "C" {
-    #[cfg_attr(target_os = "linux", link_name = "__xpg_strerror_r")]
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
-
-    pub fn sem_destroy(sem: *mut sem_t) -> ::c_int;
-    pub fn sem_init(
-        sem: *mut sem_t,
-        pshared: ::c_int,
-        value: ::c_uint,
-    ) -> ::c_int;
-
-    pub fn abs(i: ::c_int) -> ::c_int;
-    pub fn atof(s: *const ::c_char) -> ::c_double;
-    pub fn labs(i: ::c_long) -> ::c_long;
-    pub fn rand() -> ::c_int;
-    pub fn srand(seed: ::c_uint);
-
-    pub fn fdatasync(fd: ::c_int) -> ::c_int;
-    pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
-    pub fn mincore(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        vec: *mut ::c_uchar,
-    ) -> ::c_int;
-    pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
-    pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
-    pub fn clock_nanosleep(
-        clk_id: ::clockid_t,
-        flags: ::c_int,
-        rqtp: *const ::timespec,
-        rmtp: *mut ::timespec,
-    ) -> ::c_int;
-    pub fn clock_settime(
-        clk_id: ::clockid_t,
-        tp: *const ::timespec,
-    ) -> ::c_int;
-    pub fn prctl(option: ::c_int, ...) -> ::c_int;
-    pub fn pthread_getattr_np(
-        native: ::pthread_t,
-        attr: *mut ::pthread_attr_t,
-    ) -> ::c_int;
-    pub fn pthread_attr_getguardsize(
-        attr: *const ::pthread_attr_t,
-        guardsize: *mut ::size_t,
-    ) -> ::c_int;
-    pub fn pthread_attr_getstack(
-        attr: *const ::pthread_attr_t,
-        stackaddr: *mut *mut ::c_void,
-        stacksize: *mut ::size_t,
-    ) -> ::c_int;
-    pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
-    pub fn setgroups(ngroups: ::size_t, ptr: *const ::gid_t) -> ::c_int;
-    pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
-    pub fn sched_setscheduler(
-        pid: ::pid_t,
-        policy: ::c_int,
-        param: *const ::sched_param,
-    ) -> ::c_int;
-    pub fn sched_getscheduler(pid: ::pid_t) -> ::c_int;
-    pub fn sched_get_priority_max(policy: ::c_int) -> ::c_int;
-    pub fn sched_get_priority_min(policy: ::c_int) -> ::c_int;
-    pub fn epoll_create(size: ::c_int) -> ::c_int;
-    pub fn epoll_create1(flags: ::c_int) -> ::c_int;
-    pub fn epoll_ctl(
-        epfd: ::c_int,
-        op: ::c_int,
-        fd: ::c_int,
-        event: *mut ::epoll_event,
-    ) -> ::c_int;
-    pub fn epoll_wait(
-        epfd: ::c_int,
-        events: *mut ::epoll_event,
-        maxevents: ::c_int,
-        timeout: ::c_int,
-    ) -> ::c_int;
-    pub fn pipe2(fds: *mut ::c_int, flags: ::c_int) -> ::c_int;
-    pub fn mount(
-        src: *const ::c_char,
-        target: *const ::c_char,
-        fstype: *const ::c_char,
-        flags: ::c_ulong,
-        data: *const ::c_void,
-    ) -> ::c_int;
-    pub fn umount(target: *const ::c_char) -> ::c_int;
-    pub fn umount2(target: *const ::c_char, flags: ::c_int) -> ::c_int;
-    pub fn clone(
-        cb: extern "C" fn(*mut ::c_void) -> ::c_int,
-        child_stack: *mut ::c_void,
-        flags: ::c_int,
-        arg: *mut ::c_void,
-        ...
-    ) -> ::c_int;
-    pub fn statfs(path: *const ::c_char, buf: *mut statfs) -> ::c_int;
-    pub fn fstatfs(fd: ::c_int, buf: *mut statfs) -> ::c_int;
-    pub fn memrchr(
-        cx: *const ::c_void,
-        c: ::c_int,
-        n: ::size_t,
-    ) -> *mut ::c_void;
-    pub fn syscall(num: ::c_long, ...) -> ::c_long;
-    pub fn sendfile(
-        out_fd: ::c_int,
-        in_fd: ::c_int,
-        offset: *mut off_t,
-        count: ::size_t,
-    ) -> ::ssize_t;
-    pub fn splice(
-        fd_in: ::c_int,
-        off_in: *mut ::loff_t,
-        fd_out: ::c_int,
-        off_out: *mut ::loff_t,
-        len: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
-    pub fn tee(
-        fd_in: ::c_int,
-        fd_out: ::c_int,
-        len: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
-    pub fn vmsplice(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        nr_segs: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
-
-    pub fn posix_fadvise(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-        advise: ::c_int,
-    ) -> ::c_int;
-    pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;
-    pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
-    pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
-    pub fn utimensat(
-        dirfd: ::c_int,
-        path: *const ::c_char,
-        times: *const ::timespec,
-        flag: ::c_int,
-    ) -> ::c_int;
-    pub fn duplocale(base: ::locale_t) -> ::locale_t;
-    pub fn freelocale(loc: ::locale_t);
-    pub fn newlocale(
-        mask: ::c_int,
-        locale: *const ::c_char,
-        base: ::locale_t,
-    ) -> ::locale_t;
-    pub fn uselocale(loc: ::locale_t) -> ::locale_t;
-    pub fn creat64(path: *const c_char, mode: mode_t) -> ::c_int;
-    pub fn fstat64(fildes: ::c_int, buf: *mut stat64) -> ::c_int;
-    pub fn fstatat64(
-        fildes: ::c_int,
-        path: *const ::c_char,
-        buf: *mut stat64,
-        flag: ::c_int,
-    ) -> ::c_int;
-    pub fn ftruncate64(fd: ::c_int, length: off64_t) -> ::c_int;
-    pub fn getrlimit64(resource: ::c_int, rlim: *mut rlimit64) -> ::c_int;
-    pub fn lseek64(fd: ::c_int, offset: off64_t, whence: ::c_int) -> off64_t;
-    pub fn lstat64(path: *const c_char, buf: *mut stat64) -> ::c_int;
-    pub fn mmap64(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-        flags: ::c_int,
-        fd: ::c_int,
-        offset: off64_t,
-    ) -> *mut ::c_void;
-    pub fn open64(path: *const c_char, oflag: ::c_int, ...) -> ::c_int;
-    pub fn openat64(
-        fd: ::c_int,
-        path: *const c_char,
-        oflag: ::c_int,
-        ...
-    ) -> ::c_int;
-    pub fn pread64(
-        fd: ::c_int,
-        buf: *mut ::c_void,
-        count: ::size_t,
-        offset: off64_t,
-    ) -> ::ssize_t;
-    pub fn pwrite64(
-        fd: ::c_int,
-        buf: *const ::c_void,
-        count: ::size_t,
-        offset: off64_t,
-    ) -> ::ssize_t;
-    pub fn readdir64(dirp: *mut ::DIR) -> *mut ::dirent64;
-    pub fn readdir64_r(
-        dirp: *mut ::DIR,
-        entry: *mut ::dirent64,
-        result: *mut *mut ::dirent64,
-    ) -> ::c_int;
-    pub fn setrlimit64(resource: ::c_int, rlim: *const rlimit64) -> ::c_int;
-    pub fn stat64(path: *const c_char, buf: *mut stat64) -> ::c_int;
-    pub fn truncate64(path: *const c_char, length: off64_t) -> ::c_int;
-    pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int;
-
-    pub fn mknodat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-        dev: dev_t,
-    ) -> ::c_int;
-    pub fn ppoll(
-        fds: *mut ::pollfd,
-        nfds: nfds_t,
-        timeout: *const ::timespec,
-        sigmask: *const sigset_t,
-    ) -> ::c_int;
-    pub fn pthread_condattr_getclock(
-        attr: *const pthread_condattr_t,
-        clock_id: *mut clockid_t,
-    ) -> ::c_int;
-    pub fn pthread_condattr_setclock(
-        attr: *mut pthread_condattr_t,
-        clock_id: ::clockid_t,
-    ) -> ::c_int;
-    pub fn pthread_condattr_setpshared(
-        attr: *mut pthread_condattr_t,
-        pshared: ::c_int,
-    ) -> ::c_int;
-    pub fn pthread_condattr_getpshared(
-        attr: *const pthread_condattr_t,
-        pshared: *mut ::c_int,
-    ) -> ::c_int;
-    pub fn sched_getaffinity(
-        pid: ::pid_t,
-        cpusetsize: ::size_t,
-        cpuset: *mut cpu_set_t,
-    ) -> ::c_int;
-    pub fn sched_setaffinity(
-        pid: ::pid_t,
-        cpusetsize: ::size_t,
-        cpuset: *const cpu_set_t,
-    ) -> ::c_int;
-    pub fn unshare(flags: ::c_int) -> ::c_int;
-    pub fn sem_timedwait(
-        sem: *mut sem_t,
-        abstime: *const ::timespec,
-    ) -> ::c_int;
-    pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int;
-    pub fn accept4(
-        fd: ::c_int,
-        addr: *mut ::sockaddr,
-        len: *mut ::socklen_t,
-        flg: ::c_int,
-    ) -> ::c_int;
-    pub fn pthread_mutex_timedlock(
-        lock: *mut pthread_mutex_t,
-        abstime: *const ::timespec,
-    ) -> ::c_int;
-    pub fn pthread_mutexattr_setpshared(
-        attr: *mut pthread_mutexattr_t,
-        pshared: ::c_int,
-    ) -> ::c_int;
-    pub fn pthread_mutexattr_getpshared(
-        attr: *const pthread_mutexattr_t,
-        pshared: *mut ::c_int,
-    ) -> ::c_int;
-    pub fn pthread_rwlockattr_getkind_np(
-        attr: *const pthread_rwlockattr_t,
-        val: *mut ::c_int,
-    ) -> ::c_int;
-    pub fn pthread_rwlockattr_setkind_np(
-        attr: *mut pthread_rwlockattr_t,
-        val: ::c_int,
-    ) -> ::c_int;
-    pub fn pthread_rwlockattr_getpshared(
-        attr: *const pthread_rwlockattr_t,
-        val: *mut ::c_int,
-    ) -> ::c_int;
-    pub fn pthread_rwlockattr_setpshared(
-        attr: *mut pthread_rwlockattr_t,
-        val: ::c_int,
-    ) -> ::c_int;
-    pub fn ptsname_r(
-        fd: ::c_int,
-        buf: *mut ::c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
-    pub fn clearenv() -> ::c_int;
-    pub fn waitid(
-        idtype: idtype_t,
-        id: id_t,
-        infop: *mut ::siginfo_t,
-        options: ::c_int,
-    ) -> ::c_int;
-
-    pub fn lutimes(file: *const ::c_char, times: *const ::timeval) -> ::c_int;
-
-    pub fn setpwent();
-    pub fn endpwent();
-    pub fn getpwent() -> *mut passwd;
-    pub fn setspent();
-    pub fn endspent();
-    pub fn getspent() -> *mut spwd;
-    pub fn getspnam(__name: *const ::c_char) -> *mut spwd;
-
-    pub fn shm_open(
-        name: *const c_char,
-        oflag: ::c_int,
-        mode: mode_t,
-    ) -> ::c_int;
-
-    // System V IPC
-    pub fn shmget(key: ::key_t, size: ::size_t, shmflg: ::c_int) -> ::c_int;
-    pub fn shmat(
-        shmid: ::c_int,
-        shmaddr: *const ::c_void,
-        shmflg: ::c_int,
-    ) -> *mut ::c_void;
-    pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
-    pub fn shmctl(
-        shmid: ::c_int,
-        cmd: ::c_int,
-        buf: *mut ::shmid_ds,
-    ) -> ::c_int;
-    pub fn ftok(pathname: *const ::c_char, proj_id: ::c_int) -> ::key_t;
-    pub fn msgctl(msqid: ::c_int, cmd: ::c_int, buf: *mut msqid_ds)
-        -> ::c_int;
-    pub fn msgget(key: ::key_t, msgflg: ::c_int) -> ::c_int;
-    pub fn msgrcv(
-        msqid: ::c_int,
-        msgp: *mut ::c_void,
-        msgsz: ::size_t,
-        msgtyp: ::c_long,
-        msgflg: ::c_int,
-    ) -> ::ssize_t;
-    pub fn msgsnd(
-        msqid: ::c_int,
-        msgp: *const ::c_void,
-        msgsz: ::size_t,
-        msgflg: ::c_int,
-    ) -> ::c_int;
-
-    pub fn mprotect(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        prot: ::c_int,
-    ) -> ::c_int;
-    pub fn __errno_location() -> *mut ::c_int;
-
-    pub fn fopen64(
-        filename: *const c_char,
-        mode: *const c_char,
-    ) -> *mut ::FILE;
-    pub fn freopen64(
-        filename: *const c_char,
-        mode: *const c_char,
-        file: *mut ::FILE,
-    ) -> *mut ::FILE;
-    pub fn tmpfile64() -> *mut ::FILE;
-    pub fn fgetpos64(stream: *mut ::FILE, ptr: *mut fpos64_t) -> ::c_int;
-    pub fn fsetpos64(stream: *mut ::FILE, ptr: *const fpos64_t) -> ::c_int;
-    pub fn fseeko64(
-        stream: *mut ::FILE,
-        offset: ::off64_t,
-        whence: ::c_int,
-    ) -> ::c_int;
-    pub fn ftello64(stream: *mut ::FILE) -> ::off64_t;
-    pub fn readahead(
-        fd: ::c_int,
-        offset: ::off64_t,
-        count: ::size_t,
-    ) -> ::ssize_t;
-    pub fn getxattr(
-        path: *const c_char,
-        name: *const c_char,
-        value: *mut ::c_void,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn lgetxattr(
-        path: *const c_char,
-        name: *const c_char,
-        value: *mut ::c_void,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn fgetxattr(
-        filedes: ::c_int,
-        name: *const c_char,
-        value: *mut ::c_void,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn setxattr(
-        path: *const c_char,
-        name: *const c_char,
-        value: *const ::c_void,
-        size: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn lsetxattr(
-        path: *const c_char,
-        name: *const c_char,
-        value: *const ::c_void,
-        size: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn fsetxattr(
-        filedes: ::c_int,
-        name: *const c_char,
-        value: *const ::c_void,
-        size: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn listxattr(
-        path: *const c_char,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn llistxattr(
-        path: *const c_char,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn flistxattr(
-        filedes: ::c_int,
-        list: *mut c_char,
-        size: ::size_t,
-    ) -> ::ssize_t;
-    pub fn removexattr(path: *const c_char, name: *const c_char) -> ::c_int;
-    pub fn lremovexattr(path: *const c_char, name: *const c_char) -> ::c_int;
-    pub fn fremovexattr(filedes: ::c_int, name: *const c_char) -> ::c_int;
-    pub fn signalfd(
-        fd: ::c_int,
-        mask: *const ::sigset_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn quotactl(
-        cmd: ::c_int,
-        special: *const ::c_char,
-        id: ::c_int,
-        data: *mut ::c_char,
-    ) -> ::c_int;
-    pub fn mq_open(name: *const ::c_char, oflag: ::c_int, ...) -> ::mqd_t;
-    pub fn mq_close(mqd: ::mqd_t) -> ::c_int;
-    pub fn mq_unlink(name: *const ::c_char) -> ::c_int;
-    pub fn mq_receive(
-        mqd: ::mqd_t,
-        msg_ptr: *mut ::c_char,
-        msg_len: ::size_t,
-        msg_prio: *mut ::c_uint,
-    ) -> ::ssize_t;
-    pub fn mq_send(
-        mqd: ::mqd_t,
-        msg_ptr: *const ::c_char,
-        msg_len: ::size_t,
-        msg_prio: ::c_uint,
-    ) -> ::c_int;
-    pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
-    pub fn mq_setattr(
-        mqd: ::mqd_t,
-        newattr: *const ::mq_attr,
-        oldattr: *mut ::mq_attr,
-    ) -> ::c_int;
-    pub fn epoll_pwait(
-        epfd: ::c_int,
-        events: *mut ::epoll_event,
-        maxevents: ::c_int,
-        timeout: ::c_int,
-        sigmask: *const ::sigset_t,
-    ) -> ::c_int;
-    pub fn sethostname(name: *const ::c_char, len: ::size_t) -> ::c_int;
-    pub fn sigtimedwait(
-        set: *const sigset_t,
-        info: *mut siginfo_t,
-        timeout: *const ::timespec,
-    ) -> ::c_int;
-    pub fn sigwaitinfo(set: *const sigset_t, info: *mut siginfo_t) -> ::c_int;
-    pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t)
-        -> *mut ::c_char;
-    pub fn prlimit(
-        pid: ::pid_t,
-        resource: ::c_int,
-        new_limit: *const ::rlimit,
-        old_limit: *mut ::rlimit,
-    ) -> ::c_int;
-    pub fn prlimit64(
-        pid: ::pid_t,
-        resource: ::c_int,
-        new_limit: *const ::rlimit64,
-        old_limit: *mut ::rlimit64,
-    ) -> ::c_int;
-    pub fn reboot(how_to: ::c_int) -> ::c_int;
-    pub fn setfsgid(gid: ::gid_t) -> ::c_int;
-    pub fn setfsuid(uid: ::uid_t) -> ::c_int;
-    pub fn setresgid(rgid: ::gid_t, egid: ::gid_t, sgid: ::gid_t) -> ::c_int;
-    pub fn setresuid(ruid: ::uid_t, euid: ::uid_t, suid: ::uid_t) -> ::c_int;
-
-    // Not available now on Android
-    pub fn mkfifoat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
-    pub fn if_nameindex() -> *mut if_nameindex;
-    pub fn if_freenameindex(ptr: *mut if_nameindex);
-    pub fn sync_file_range(
-        fd: ::c_int,
-        offset: ::off64_t,
-        nbytes: ::off64_t,
-        flags: ::c_uint,
-    ) -> ::c_int;
-    pub fn getifaddrs(ifap: *mut *mut ::ifaddrs) -> ::c_int;
-    pub fn freeifaddrs(ifa: *mut ::ifaddrs);
-
-    pub fn mremap(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        new_len: ::size_t,
-        flags: ::c_int,
-        ...
-    ) -> *mut ::c_void;
-
-    pub fn glob(
-        pattern: *const c_char,
-        flags: ::c_int,
-        errfunc: ::Option<
-            extern "C" fn(epath: *const c_char, errno: ::c_int) -> ::c_int,
-        >,
-        pglob: *mut ::glob_t,
-    ) -> ::c_int;
-    pub fn globfree(pglob: *mut ::glob_t);
-
-    pub fn shm_unlink(name: *const ::c_char) -> ::c_int;
-
-    pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long);
-
-    pub fn dirfd(dirp: *mut ::DIR) -> ::c_int;
-
-    pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
-    pub fn madvise(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        advice: ::c_int,
-    ) -> ::c_int;
-
-    pub fn msync(
-        addr: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::c_int;
-
-    pub fn recvfrom(
-        socket: ::c_int,
-        buf: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-        addr: *mut ::sockaddr,
-        addrlen: *mut ::socklen_t,
-    ) -> ::ssize_t;
-    pub fn nl_langinfo(item: ::nl_item) -> *mut ::c_char;
-
-    pub fn bind(
-        socket: ::c_int,
-        address: *const ::sockaddr,
-        address_len: ::socklen_t,
-    ) -> ::c_int;
-
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-
-    pub fn sendmsg(
-        fd: ::c_int,
-        msg: *const ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn recvmsg(
-        fd: ::c_int,
-        msg: *mut ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn getgrgid_r(
-        gid: ::gid_t,
-        grp: *mut ::group,
-        buf: *mut ::c_char,
-        buflen: ::size_t,
-        result: *mut *mut ::group,
-    ) -> ::c_int;
-    pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
-    pub fn sem_close(sem: *mut sem_t) -> ::c_int;
-    pub fn getdtablesize() -> ::c_int;
-    pub fn getgrnam_r(
-        name: *const ::c_char,
-        grp: *mut ::group,
-        buf: *mut ::c_char,
-        buflen: ::size_t,
-        result: *mut *mut ::group,
-    ) -> ::c_int;
-    pub fn pthread_sigmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
-    pub fn sem_open(name: *const ::c_char, oflag: ::c_int, ...) -> *mut sem_t;
-    pub fn getgrnam(name: *const ::c_char) -> *mut ::group;
-    pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
-    pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
-    pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
-    pub fn getpwnam_r(
-        name: *const ::c_char,
-        pwd: *mut passwd,
-        buf: *mut ::c_char,
-        buflen: ::size_t,
-        result: *mut *mut passwd,
-    ) -> ::c_int;
-    pub fn getpwuid_r(
-        uid: ::uid_t,
-        pwd: *mut passwd,
-        buf: *mut ::c_char,
-        buflen: ::size_t,
-        result: *mut *mut passwd,
-    ) -> ::c_int;
-    pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
-    pub fn pthread_atfork(
-        prepare: ::Option<unsafe extern "C" fn()>,
-        parent: ::Option<unsafe extern "C" fn()>,
-        child: ::Option<unsafe extern "C" fn()>,
-    ) -> ::c_int;
-    pub fn pthread_create(
-        native: *mut ::pthread_t,
-        attr: *const ::pthread_attr_t,
-        f: extern "C" fn(*mut ::c_void) -> *mut ::c_void,
-        value: *mut ::c_void,
-    ) -> ::c_int;
-    pub fn dl_iterate_phdr(
-        callback: ::Option<
-            unsafe extern "C" fn(
-                info: *mut ::dl_phdr_info,
-                size: ::size_t,
-                data: *mut ::c_void,
-            ) -> ::c_int,
-        >,
-        data: *mut ::c_void,
-    ) -> ::c_int;
-    pub fn getgrgid(gid: ::gid_t) -> *mut ::group;
-    pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE;
-    pub fn uname(buf: *mut ::utsname) -> ::c_int;
-    pub fn getnameinfo(
-        sa: *const ::sockaddr,
-        salen: ::socklen_t,
-        host: *mut ::c_char,
-        hostlen: ::socklen_t,
-        serv: *mut ::c_char,
-        sevlen: ::socklen_t,
-        flags: ::c_uint,
-    ) -> ::c_int;
-}
-
-cfg_if! {
-    if #[cfg(any(target_arch = "mips", target_arch = "mips64"))] {
-        mod mips;
-        pub use self::mips::*;
-    } else if #[cfg(target_arch = "x86_64")] {
-        mod x86_64;
-        pub use self::x86_64::*;
-    } else if #[cfg(target_arch = "arm")] {
-        mod arm;
-        pub use self::arm::*;
-    } else {
-        pub use unsupported_target;
-    }
-}
-
-cfg_if! {
-    if #[cfg(libc_align)] {
-        #[macro_use]
-        mod align;
-    } else {
-        #[macro_use]
-        mod no_align;
-    }
-}
-
-expand_align!();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/no_align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/no_align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-macro_rules! expand_align {
-    () => {
-        s! {
-            pub struct pthread_mutex_t {
-                #[cfg(any(target_arch = "mips",
-                          target_arch = "arm",
-                          target_arch = "powerpc"))]
-                __align: [::c_long; 0],
-                #[cfg(any(libc_align,
-                          target_arch = "mips",
-                          target_arch = "arm",
-                          target_arch = "powerpc"))]
-                __align: [::c_longlong; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
-            }
-
-            pub struct pthread_rwlock_t {
-                #[cfg(any(target_arch = "mips",
-                          target_arch = "arm",
-                          target_arch = "powerpc"))]
-                __align: [::c_long; 0],
-                #[cfg(not(any(
-                    target_arch = "mips",
-                    target_arch = "arm",
-                    target_arch = "powerpc")))]
-                __align: [::c_longlong; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_RWLOCK_T],
-            }
-
-            pub struct pthread_mutexattr_t {
-                #[cfg(any(target_arch = "x86_64", target_arch = "powerpc64",
-                          target_arch = "mips64", target_arch = "s390x",
-                          target_arch = "sparc64"))]
-                __align: [::c_int; 0],
-                #[cfg(not(any(target_arch = "x86_64", target_arch = "powerpc64",
-                              target_arch = "mips64", target_arch = "s390x",
-                              target_arch = "sparc64")))]
-                __align: [::c_long; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
-            }
-
-            pub struct pthread_cond_t {
-                __align: [::c_longlong; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_COND_T],
-            }
-
-            pub struct pthread_condattr_t {
-                __align: [::c_int; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-macro_rules! expand_align {
-    () => {
-        s! {
-            #[cfg_attr(target_pointer_width = "32",
-                       repr(align(4)))]
-            #[cfg_attr(target_pointer_width = "64",
-                       repr(align(8)))]
-            pub struct sem_t { // FIXME
-                #[cfg(target_pointer_width = "32")]
-                __size: [::c_char; 16],
-                #[cfg(target_pointer_width = "64")]
-                __size: [::c_char; 32],
-            }
-
-            #[cfg_attr(any(target_pointer_width = "32",
-                           target_arch = "x86_64",
-                           target_arch = "powerpc64",
-                           target_arch = "mips64",
-                           target_arch = "s390x",
-                           target_arch = "sparc64"),
-                       repr(align(4)))]
-            #[cfg_attr(not(any(target_pointer_width = "32",
-                               target_arch = "x86_64",
-                               target_arch = "powerpc64",
-                               target_arch = "mips64",
-                               target_arch = "s390x",
-                               target_arch = "sparc64")),
-                       repr(align(8)))]
-            pub struct pthread_mutexattr_t { // FIXME
-                size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
-            }
-
-            #[repr(align(4))]
-            pub struct pthread_condattr_t { // FIXME
-                size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
-            }
-        }
-
-        s_no_extra_traits! {
-            #[cfg_attr(all(target_pointer_width = "32",
-                           any(target_arch = "mips",
-                               target_arch = "arm",
-                               target_arch = "powerpc")),
-                       repr(align(4)))]
-            #[cfg_attr(all(any(target_pointer_width = "64",
-                               not(any(target_arch = "mips",
-                                       target_arch = "arm",
-                                       target_arch = "powerpc")))),
-                       repr(align(8)))]
-            #[allow(missing_debug_implementations)]
-            pub struct pthread_mutex_t { // FIXME
-                size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
-            }
-
-            #[repr(align(8))]
-            #[allow(missing_debug_implementations)]
-            pub struct pthread_cond_t { // FIXME
-                size: [u8; ::__SIZEOF_PTHREAD_COND_T],
-            }
-
-            #[cfg_attr(all(target_pointer_width = "32",
-                           any(target_arch = "mips",
-                               target_arch = "arm",
-                               target_arch = "powerpc")),
-                       repr(align(4)))]
-            #[cfg_attr(any(target_pointer_width = "64",
-                           not(any(target_arch = "mips",
-                                   target_arch = "arm",
-                                   target_arch = "powerpc"))),
-                       repr(align(8)))]
-            #[allow(missing_debug_implementations)]
-            pub struct pthread_rwlock_t { // FIXME
-                size: [u8; ::__SIZEOF_PTHREAD_RWLOCK_T],
-            }
-        }
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/l4re.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/l4re.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/l4re.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/l4re.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/// L4Re specifics
-/// This module contains definitions required by various L4Re libc backends.
-/// Some of them are formally not part of the libc, but are a dependency of the
-/// libc and hence we should provide them here.
-
-pub type l4_umword_t = ::c_ulong; // Unsigned machine word.
-pub type pthread_t = *mut ::c_void;
-
-s! {
-    /// CPU sets.
-    pub struct l4_sched_cpu_set_t {
-        // from the L4Re docs
-        /// Combination of granularity and offset.
-        ///
-        /// The granularity defines how many CPUs each bit in map describes.
-        /// The offset is the numer of the first CPU described by the first
-        /// bit in the bitmap.
-        /// offset must be a multiple of 2^graularity.
-        ///
-        /// | MSB              |                 LSB |
-        /// | ---------------- | ------------------- |
-        /// | 8bit granularity | 24bit offset ..     |
-        gran_offset: l4_umword_t ,
-        /// Bitmap of CPUs.
-        map: l4_umword_t ,
-    }
-}
-
-#[cfg(target_os = "l4re")]
-#[allow(missing_debug_implementations)]
-pub struct pthread_attr_t {
-    pub __detachstate: ::c_int,
-    pub __schedpolicy: ::c_int,
-    pub __schedparam: super::__sched_param,
-    pub __inheritsched: ::c_int,
-    pub __scope: ::c_int,
-    pub __guardsize: ::size_t,
-    pub __stackaddr_set: ::c_int,
-    pub __stackaddr: *mut ::c_void, // better don't use it
-    pub __stacksize: ::size_t,
-    // L4Re specifics
-    pub affinity: l4_sched_cpu_set_t,
-    pub create_flags: ::c_uint,
-}
-
-// L4Re requires a min stack size of 64k; that isn't defined in uClibc, but
-// somewhere in the core libraries. uClibc wants 16k, but that's not enough.
-pub const PTHREAD_STACK_MIN: usize = 65536;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,312 +0,0 @@
-//! Definitions for uclibc on 64bit systems
-pub type blkcnt_t = i64;
-pub type blksize_t = i64;
-pub type clock_t = i64;
-pub type c_char = u8;
-pub type c_long = i64;
-pub type c_ulong = u64;
-pub type fsblkcnt_t = ::c_ulong;
-pub type fsfilcnt_t = ::c_ulong;
-pub type fsword_t = ::c_long;
-pub type ino_t = ::c_ulong;
-pub type nlink_t = ::c_uint;
-pub type off_t = ::c_long;
-pub type rlim_t = c_ulong;
-pub type rlim64_t = u64;
-// [uClibc docs] Note stat64 has the same shape as stat for x86-64.
-pub type stat64 = stat;
-pub type suseconds_t = ::c_long;
-pub type time_t = ::c_int;
-pub type wchar_t = ::c_int;
-
-s! {
-    pub struct ipc_perm {
-        pub __key: ::key_t,
-        pub uid: ::uid_t,
-        pub gid: ::gid_t,
-        pub cuid: ::uid_t,
-        pub cgid: ::gid_t,
-        pub mode: ::c_ushort, // read / write
-        __pad1: ::c_ushort,
-        pub __seq: ::c_ushort,
-        __pad2: ::c_ushort,
-        __unused1: ::c_ulong,
-        __unused2: ::c_ulong
-    }
-
-    #[cfg(not(target_os = "l4re"))]
-    pub struct pthread_attr_t {
-        __detachstate: ::c_int,
-        __schedpolicy: ::c_int,
-        __schedparam: __sched_param,
-        __inheritsched: ::c_int,
-        __scope: ::c_int,
-        __guardsize: ::size_t,
-        __stackaddr_set: ::c_int,
-        __stackaddr: *mut ::c_void, // better don't use it
-        __stacksize: ::size_t,
-    }
-
-    pub struct __sched_param {
-        __sched_priority: ::c_int,
-    }
-
-    pub struct siginfo_t {
-        si_signo: ::c_int, // signal number
-        si_errno: ::c_int, // if not zero: error value of signal, see errno.h
-        si_code: ::c_int,  // signal code
-        pub _pad: [::c_int; 28], // unported union
-        _align: [usize; 0],
-    }
-
-    pub struct shmid_ds {
-        pub shm_perm: ::ipc_perm,
-        pub shm_segsz: ::size_t, // segment size in bytes
-        pub shm_atime: ::time_t, // time of last shmat()
-        pub shm_dtime: ::time_t,
-        pub shm_ctime: ::time_t,
-        pub shm_cpid: ::pid_t,
-        pub shm_lpid: ::pid_t,
-        pub shm_nattch: ::shmatt_t,
-        __unused1: ::c_ulong,
-        __unused2: ::c_ulong
-    }
-
-    pub struct msqid_ds {
-        pub msg_perm: ::ipc_perm,
-        pub msg_stime: ::time_t,
-        pub msg_rtime: ::time_t,
-        pub msg_ctime: ::time_t,
-        __msg_cbytes: ::c_ulong,
-        pub msg_qnum: ::msgqnum_t,
-        pub msg_qbytes: ::msglen_t,
-        pub msg_lspid: ::pid_t,
-        pub msg_lrpid: ::pid_t,
-        __ignored1: ::c_ulong,
-        __ignored2: ::c_ulong,
-    }
-
-    pub struct sockaddr {
-        pub sa_family: ::sa_family_t,
-        pub sa_data: [::c_char; 14],
-    }
-
-    pub struct sockaddr_in {
-        pub sin_family: ::sa_family_t,
-        pub sin_port: ::in_port_t,
-        pub sin_addr: ::in_addr,
-        pub sin_zero: [u8; 8],
-    }
-
-    pub struct sockaddr_in6 {
-        pub sin6_family: ::sa_family_t,
-        pub sin6_port: ::in_port_t,
-        pub sin6_flowinfo: u32,
-        pub sin6_addr: ::in6_addr,
-        pub sin6_scope_id: u32,
-    }
-
-    // ------------------------------------------------------------
-    // definitions below are *unverified* and might **break** the software
-//    pub struct in_addr {
-//        pub s_addr: in_addr_t,
-//    }
-//
-//    pub struct in6_addr {
-//        pub s6_addr: [u8; 16],
-//        #[cfg(not(libc_align))]
-//        __align: [u32; 0],
-//    }
-
-    pub struct stat {
-        pub st_dev: ::c_ulong,
-        pub st_ino: ::ino_t,
-        // According to uclibc/libc/sysdeps/linux/x86_64/bits/stat.h, order of
-        // nlink and mode are swapped on 64 bit systems.
-        pub st_nlink: ::nlink_t,
-        pub st_mode: ::mode_t,
-        pub st_uid: ::uid_t,
-        pub st_gid: ::gid_t,
-        pub st_rdev: ::c_ulong, // dev_t
-        pub st_size: off_t, // file size
-        pub st_blksize: ::blksize_t,
-        pub st_blocks: ::blkcnt_t,
-        pub st_atime: ::time_t,
-        pub st_atime_nsec: ::c_ulong,
-        pub st_mtime: ::time_t,
-        pub st_mtime_nsec: ::c_ulong,
-        pub st_ctime: ::time_t,
-        pub st_ctime_nsec: ::c_ulong,
-        st_pad4: [::c_long; 3]
-    }
-
-    pub struct sigaction {
-        pub sa_handler: ::sighandler_t,
-        pub sa_flags: ::c_ulong,
-        pub sa_restorer: *mut ::c_void,
-        pub sa_mask: ::sigset_t,
-    }
-
-    pub struct stack_t { // FIXME
-        pub ss_sp: *mut ::c_void,
-        pub ss_flags: ::c_int,
-        pub ss_size: ::size_t
-    }
-
-    pub struct statfs { // FIXME
-        pub f_type: fsword_t,
-        pub f_bsize: fsword_t,
-        pub f_blocks: ::fsblkcnt_t,
-        pub f_bfree: ::fsblkcnt_t,
-        pub f_bavail: ::fsblkcnt_t,
-        pub f_files: ::fsfilcnt_t,
-        pub f_ffree: ::fsfilcnt_t,
-        pub f_fsid: ::fsid_t,
-        pub f_namelen: fsword_t,
-        pub f_frsize: fsword_t,
-        f_spare: [fsword_t; 5],
-    }
-
-    pub struct msghdr { // FIXME
-        pub msg_name: *mut ::c_void,
-        pub msg_namelen: ::socklen_t,
-        pub msg_iov: *mut ::iovec,
-        pub msg_iovlen: ::size_t,
-        pub msg_control: *mut ::c_void,
-        pub msg_controllen: ::size_t,
-        pub msg_flags: ::c_int,
-    }
-
-    pub struct termios { // FIXME
-        pub c_iflag: ::tcflag_t,
-        pub c_oflag: ::tcflag_t,
-        pub c_cflag: ::tcflag_t,
-        pub c_lflag: ::tcflag_t,
-        pub c_line: ::cc_t,
-        pub c_cc: [::cc_t; ::NCCS],
-    }
-
-    pub struct sigset_t { // FIXME
-        __val: [::c_ulong; 16],
-    }
-
-    pub struct sysinfo { // FIXME
-        pub uptime: ::c_long,
-        pub loads: [::c_ulong; 3],
-        pub totalram: ::c_ulong,
-        pub freeram: ::c_ulong,
-        pub sharedram: ::c_ulong,
-        pub bufferram: ::c_ulong,
-        pub totalswap: ::c_ulong,
-        pub freeswap: ::c_ulong,
-        pub procs: ::c_ushort,
-        pub pad: ::c_ushort,
-        pub totalhigh: ::c_ulong,
-        pub freehigh: ::c_ulong,
-        pub mem_unit: ::c_uint,
-        pub _f: [::c_char; 0],
-    }
-
-    pub struct glob_t { // FIXME
-        pub gl_pathc: ::size_t,
-        pub gl_pathv: *mut *mut c_char,
-        pub gl_offs: ::size_t,
-        pub gl_flags: ::c_int,
-        __unused1: *mut ::c_void,
-        __unused2: *mut ::c_void,
-        __unused3: *mut ::c_void,
-        __unused4: *mut ::c_void,
-        __unused5: *mut ::c_void,
-    }
-
-    pub struct rlimit64 { // FIXME
-        pub rlim_cur: rlim64_t,
-        pub rlim_max: rlim64_t,
-    }
-
-    pub struct cpu_set_t { // FIXME
-        #[cfg(target_pointer_width = "32")]
-        bits: [u32; 32],
-        #[cfg(target_pointer_width = "64")]
-        bits: [u64; 16],
-    }
-
-    pub struct fsid_t { // FIXME
-        __val: [::c_int; 2],
-    }
-}
-
-s_no_extra_traits! {
-    #[allow(missing_debug_implementations)]
-    pub struct dirent {
-        pub d_ino: ::ino64_t,
-        pub d_off: ::off64_t,
-        pub d_reclen: u16,
-        pub d_type: u8,
-        pub d_name: [::c_char; 256],
-    }
-    #[allow(missing_debug_implementations)]
-    pub struct dirent64 {
-        pub d_ino: ::ino64_t,
-        pub d_off: ::off64_t,
-        pub d_reclen: u16,
-        pub d_type: u8,
-        pub d_name: [::c_char; 256],
-    }
-}
-
-// constants
-pub const EADDRINUSE: ::c_int = 98; // Address already in use
-pub const EADDRNOTAVAIL: ::c_int = 99; // Cannot assign requested address
-pub const ECONNABORTED: ::c_int = 103; // Software caused connection abort
-pub const ECONNREFUSED: ::c_int = 111; // Connection refused
-pub const ECONNRESET: ::c_int = 104; // Connection reset by peer
-pub const EDEADLK: ::c_int = 35; // Resource deadlock would occur
-pub const ENOSYS: ::c_int = 38; // Function not implemented
-pub const ENOTCONN: ::c_int = 107; // Transport endpoint is not connected
-pub const ETIMEDOUT: ::c_int = 110; // connection timed out
-pub const O_APPEND: ::c_int = 02000;
-pub const O_ACCMODE: ::c_int = 0003;
-pub const O_CLOEXEC: ::c_int = 0x80000;
-pub const O_CREAT: ::c_int = 0100;
-pub const O_DIRECTORY: ::c_int = 0200000;
-pub const O_EXCL: ::c_int = 0200;
-pub const O_NONBLOCK: ::c_int = 04000;
-pub const O_TRUNC: ::c_int = 01000;
-pub const NCCS: usize = 32;
-pub const SIG_SETMASK: ::c_int = 2; // Set the set of blocked signals
-pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
-pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
-pub const SO_BROADCAST: ::c_int = 6;
-pub const SOCK_DGRAM: ::c_int = 2; // connectionless, unreliable datagrams
-pub const SOCK_STREAM: ::c_int = 1; // …/common/bits/socket_type.h
-pub const SO_ERROR: ::c_int = 4;
-pub const SOL_SOCKET: ::c_int = 1;
-pub const SO_RCVTIMEO: ::c_int = 20;
-pub const SO_REUSEADDR: ::c_int = 2;
-pub const SO_SNDTIMEO: ::c_int = 21;
-pub const RLIM_INFINITY: u64 = 0xffffffffffffffff;
-pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
-pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
-pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
-
-cfg_if! {
-    if #[cfg(target_os = "l4re")] {
-        mod l4re;
-        pub use self::l4re::*;
-    } else {
-        mod other;
-        pub use other::*;
-    }
-}
-
-cfg_if! {
-    if #[cfg(libc_align)] {
-        #[macro_use]
-        mod align;
-    } else {
-        #[macro_use]
-        mod no_align;
-    }
-}
-expand_align!();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/no_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/no_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/no_align.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/no_align.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-macro_rules! expand_align {
-    () => {
-        s! {
-            pub struct sem_t { // FIXME
-                #[cfg(target_pointer_width = "32")]
-                __size: [::c_char; 16],
-                #[cfg(target_pointer_width = "64")]
-                __size: [::c_char; 32],
-                __align: [::c_long; 0],
-            }
-
-            pub struct pthread_mutex_t { // FIXME
-                #[cfg(any(target_arch = "mips",
-                          target_arch = "arm",
-                          target_arch = "powerpc"))]
-                __align: [::c_long; 0],
-                #[cfg(not(any(target_arch = "mips",
-                              target_arch = "arm",
-                              target_arch = "powerpc")))]
-                __align: [::c_longlong; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
-            }
-
-            pub struct pthread_mutexattr_t { // FIXME
-                #[cfg(any(target_arch = "x86_64", target_arch = "powerpc64",
-                          target_arch = "mips64", target_arch = "s390x",
-                          target_arch = "sparc64"))]
-                __align: [::c_int; 0],
-                #[cfg(not(any(target_arch = "x86_64", target_arch = "powerpc64",
-                              target_arch = "mips64", target_arch = "s390x",
-                              target_arch = "sparc64")))]
-                __align: [::c_long; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
-            }
-
-            pub struct pthread_cond_t { // FIXME
-                __align: [::c_longlong; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_COND_T],
-            }
-
-            pub struct pthread_condattr_t { // FIXME
-                __align: [::c_int; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
-            }
-
-            pub struct pthread_rwlock_t { // FIXME
-                #[cfg(any(target_arch = "mips",
-                          target_arch = "arm",
-                          target_arch = "powerpc"))]
-                __align: [::c_long; 0],
-                #[cfg(not(any(target_arch = "mips",
-                              target_arch = "arm",
-                              target_arch = "powerpc")))]
-                __align: [::c_longlong; 0],
-                size: [u8; ::__SIZEOF_PTHREAD_RWLOCK_T],
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/other.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/other.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/other.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/unix/uclibc/x86_64/other.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-// Thestyle checker discourages the use of #[cfg], so this has to go into a
-// separate module
-pub type pthread_t = ::c_ulong;
-
-pub const PTHREAD_STACK_MIN: usize = 16384;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/vxworks/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/vxworks/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/vxworks/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/vxworks/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -128,6 +128,10 @@
     pub unsafe fn si_uid(&self) -> ::uid_t {
         self.si_uid
     }
+
+    pub unsafe fn si_status(&self) -> ::c_int {
+        self.si_status
+    }
 }
 
 s! {
@@ -627,6 +631,7 @@
 pub const ENOTEMPTY: ::c_int = 15;
 pub const EBUSY: ::c_int = 16;
 pub const EEXIST: ::c_int = 17;
+pub const EXDEV: ::c_int = 18;
 pub const ENODEV: ::c_int = 19;
 pub const ENOTDIR: ::c_int = 20;
 pub const EISDIR: ::c_int = 21;
@@ -634,7 +639,9 @@
 pub const ENAMETOOLONG: ::c_int = 26;
 pub const EFBIG: ::c_int = 27;
 pub const ENOSPC: ::c_int = 28;
+pub const ESPIPE: ::c_int = 29;
 pub const EROFS: ::c_int = 30;
+pub const EMLINK: ::c_int = 31;
 pub const EPIPE: ::c_int = 32;
 pub const EDEADLK: ::c_int = 33;
 pub const ERANGE: ::c_int = 38;
@@ -660,6 +667,10 @@
 pub const ETOOMANYREFS: ::c_int = 59;
 pub const ETIMEDOUT: ::c_int = 60;
 pub const ECONNREFUSED: ::c_int = 61;
+pub const ENETDOWN: ::c_int = 62;
+pub const ETXTBSY: ::c_int = 63;
+pub const ELOOP: ::c_int = 64;
+pub const EHOSTUNREACH: ::c_int = 65;
 pub const EINPROGRESS: ::c_int = 68;
 pub const EALREADY: ::c_int = 69;
 pub const EWOULDBLOCK: ::c_int = 70;
@@ -698,24 +709,16 @@
 pub const S_nfsLib_NFSERR_NOTEMPTY: ::c_int = ENOTEMPTY;
 pub const S_nfsLib_NFSERR_DQUOT: ::c_int = EDQUOT;
 pub const S_nfsLib_NFSERR_STALE: ::c_int = ESTALE;
-pub const S_nfsLib_NFSERR_WFLUSH: ::c_int =
-    M_nfsStat | nfsstat::NFSERR_WFLUSH as ::c_int;
-pub const S_nfsLib_NFSERR_REMOTE: ::c_int =
-    M_nfsStat | nfsstat::NFSERR_REMOTE as ::c_int;
-pub const S_nfsLib_NFSERR_BADHANDLE: ::c_int =
-    M_nfsStat | nfsstat::NFSERR_BADHANDLE as ::c_int;
-pub const S_nfsLib_NFSERR_NOT_SYNC: ::c_int =
-    M_nfsStat | nfsstat::NFSERR_NOT_SYNC as ::c_int;
-pub const S_nfsLib_NFSERR_BAD_COOKIE: ::c_int =
-    M_nfsStat | nfsstat::NFSERR_BAD_COOKIE as ::c_int;
+pub const S_nfsLib_NFSERR_WFLUSH: ::c_int = M_nfsStat | nfsstat::NFSERR_WFLUSH as ::c_int;
+pub const S_nfsLib_NFSERR_REMOTE: ::c_int = M_nfsStat | nfsstat::NFSERR_REMOTE as ::c_int;
+pub const S_nfsLib_NFSERR_BADHANDLE: ::c_int = M_nfsStat | nfsstat::NFSERR_BADHANDLE as ::c_int;
+pub const S_nfsLib_NFSERR_NOT_SYNC: ::c_int = M_nfsStat | nfsstat::NFSERR_NOT_SYNC as ::c_int;
+pub const S_nfsLib_NFSERR_BAD_COOKIE: ::c_int = M_nfsStat | nfsstat::NFSERR_BAD_COOKIE as ::c_int;
 pub const S_nfsLib_NFSERR_NOTSUPP: ::c_int = EOPNOTSUPP;
-pub const S_nfsLib_NFSERR_TOOSMALL: ::c_int =
-    M_nfsStat | nfsstat::NFSERR_TOOSMALL as ::c_int;
+pub const S_nfsLib_NFSERR_TOOSMALL: ::c_int = M_nfsStat | nfsstat::NFSERR_TOOSMALL as ::c_int;
 pub const S_nfsLib_NFSERR_SERVERFAULT: ::c_int = EIO;
-pub const S_nfsLib_NFSERR_BADTYPE: ::c_int =
-    M_nfsStat | nfsstat::NFSERR_BADTYPE as ::c_int;
-pub const S_nfsLib_NFSERR_JUKEBOX: ::c_int =
-    M_nfsStat | nfsstat::NFSERR_JUKEBOX as ::c_int;
+pub const S_nfsLib_NFSERR_BADTYPE: ::c_int = M_nfsStat | nfsstat::NFSERR_BADTYPE as ::c_int;
+pub const S_nfsLib_NFSERR_JUKEBOX: ::c_int = M_nfsStat | nfsstat::NFSERR_JUKEBOX as ::c_int;
 
 // in.h
 pub const IPPROTO_IP: ::c_int = 0;
@@ -799,8 +802,7 @@
 
 pub const _SS_MAXSIZE: usize = 128;
 pub const _SS_ALIGNSIZE: usize = size_of::<u32>();
-pub const _SS_PAD1SIZE: usize =
-    _SS_ALIGNSIZE - size_of::<::c_uchar>() - size_of::<::sa_family_t>();
+pub const _SS_PAD1SIZE: usize = _SS_ALIGNSIZE - size_of::<::c_uchar>() - size_of::<::sa_family_t>();
 pub const _SS_PAD2SIZE: usize = _SS_MAXSIZE
     - size_of::<::c_uchar>()
     - size_of::<::sa_family_t>()
@@ -947,14 +949,13 @@
 pub const WNOHANG: ::c_int = 0x01;
 pub const WUNTRACED: ::c_int = 0x02;
 
-const PTHREAD_MUTEXATTR_INITIALIZER: pthread_mutexattr_t =
-    pthread_mutexattr_t {
-        mutexAttrStatus: PTHREAD_INITIALIZED_OBJ,
-        mutexAttrProtocol: PTHREAD_PRIO_NONE,
-        mutexAttrPrioceiling: 0,
-        mutexAttrType: PTHREAD_MUTEX_DEFAULT,
-        mutexAttrPshared: 1,
-    };
+const PTHREAD_MUTEXATTR_INITIALIZER: pthread_mutexattr_t = pthread_mutexattr_t {
+    mutexAttrStatus: PTHREAD_INITIALIZED_OBJ,
+    mutexAttrProtocol: PTHREAD_PRIO_NONE,
+    mutexAttrPrioceiling: 0,
+    mutexAttrType: PTHREAD_MUTEX_DEFAULT,
+    mutexAttrPshared: 1,
+};
 pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
     mutexSemId: null_mut(),
     mutexValid: PTHREAD_VALID_OBJ,
@@ -980,13 +981,12 @@
     condSemName: [0; _PTHREAD_SHARED_SEM_NAME_MAX],
 };
 
-const PTHREAD_RWLOCKATTR_INITIALIZER: pthread_rwlockattr_t =
-    pthread_rwlockattr_t {
-        rwlockAttrStatus: PTHREAD_INITIALIZED_OBJ,
-        rwlockAttrPshared: 1,
-        rwlockAttrMaxReaders: 0,
-        rwlockAttrConformOpt: 1,
-    };
+const PTHREAD_RWLOCKATTR_INITIALIZER: pthread_rwlockattr_t = pthread_rwlockattr_t {
+    rwlockAttrStatus: PTHREAD_INITIALIZED_OBJ,
+    rwlockAttrPshared: 1,
+    rwlockAttrMaxReaders: 0,
+    rwlockAttrConformOpt: 1,
+};
 pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
     rwlockSemId: null_mut(),
     rwlockReadersRefCount: 0,
@@ -1036,7 +1036,7 @@
 }
 
 f! {
-    pub fn CMSG_ALIGN(len: usize) -> usize {
+    pub {const} fn CMSG_ALIGN(len: usize) -> usize {
         len + ::mem::size_of::<usize>() - 1 & !(::mem::size_of::<usize>() - 1)
     }
 
@@ -1067,7 +1067,7 @@
             .offset(CMSG_ALIGN(::mem::size_of::<::cmsghdr>()) as isize)
     }
 
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+    pub {const} fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
         (CMSG_ALIGN(length as usize) + CMSG_ALIGN(::mem::size_of::<cmsghdr>()))
             as ::c_uint
     }
@@ -1093,44 +1093,24 @@
     pub fn tolower(c: c_int) -> c_int;
     pub fn toupper(c: c_int) -> c_int;
     pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;
-    pub fn freopen(
-        filename: *const c_char,
-        mode: *const c_char,
-        file: *mut FILE,
-    ) -> *mut FILE;
+    pub fn freopen(filename: *const c_char, mode: *const c_char, file: *mut FILE) -> *mut FILE;
     pub fn fflush(file: *mut FILE) -> c_int;
     pub fn fclose(file: *mut FILE) -> c_int;
     pub fn remove(filename: *const c_char) -> c_int;
     pub fn rename(oldname: *const c_char, newname: *const c_char) -> c_int;
     pub fn tmpfile() -> *mut FILE;
-    pub fn setvbuf(
-        stream: *mut FILE,
-        buffer: *mut c_char,
-        mode: c_int,
-        size: size_t,
-    ) -> c_int;
+    pub fn setvbuf(stream: *mut FILE, buffer: *mut c_char, mode: c_int, size: size_t) -> c_int;
     pub fn setbuf(stream: *mut FILE, buf: *mut c_char);
     pub fn getchar() -> c_int;
     pub fn putchar(c: c_int) -> c_int;
     pub fn fgetc(stream: *mut FILE) -> c_int;
-    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE)
-        -> *mut c_char;
+    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE) -> *mut c_char;
     pub fn fputc(c: c_int, stream: *mut FILE) -> c_int;
     pub fn fputs(s: *const c_char, stream: *mut FILE) -> c_int;
     pub fn puts(s: *const c_char) -> c_int;
     pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
-    pub fn fread(
-        ptr: *mut c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
-    pub fn fwrite(
-        ptr: *const c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
+    pub fn fread(ptr: *mut c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
+    pub fn fwrite(ptr: *const c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
     pub fn fseek(stream: *mut FILE, offset: c_long, whence: c_int) -> c_int;
     pub fn ftell(stream: *mut FILE) -> c_long;
     pub fn rewind(stream: *mut FILE);
@@ -1141,16 +1121,9 @@
     pub fn perror(s: *const c_char);
     pub fn atoi(s: *const c_char) -> c_int;
     pub fn strtod(s: *const c_char, endp: *mut *mut c_char) -> c_double;
-    pub fn strtol(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_long;
-    pub fn strtoul(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_ulong;
+    pub fn strtof(s: *const c_char, endp: *mut *mut c_char) -> c_float;
+    pub fn strtol(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_long;
+    pub fn strtoul(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_ulong;
     pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
     pub fn malloc(size: size_t) -> *mut c_void;
     pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
@@ -1162,17 +1135,9 @@
     pub fn getenv(s: *const c_char) -> *mut c_char;
 
     pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
-    pub fn strncpy(
-        dst: *mut c_char,
-        src: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strncat(
-        s: *mut c_char,
-        ct: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncat(s: *mut c_char, ct: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
     pub fn strncmp(cs: *const c_char, ct: *const c_char, n: size_t) -> c_int;
     pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
@@ -1184,60 +1149,30 @@
     pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
-    pub fn strncasecmp(
-        s1: *const c_char,
-        s2: *const c_char,
-        n: size_t,
-    ) -> c_int;
+    pub fn strncasecmp(s1: *const c_char, s2: *const c_char, n: size_t) -> c_int;
     pub fn strlen(cs: *const c_char) -> size_t;
     pub fn strerror(n: c_int) -> *mut c_char;
     pub fn strtok(s: *mut c_char, t: *const c_char) -> *mut c_char;
     pub fn strxfrm(s: *mut c_char, ct: *const c_char, n: size_t) -> size_t;
     pub fn wcslen(buf: *const wchar_t) -> size_t;
-    pub fn wcstombs(
-        dest: *mut c_char,
-        src: *const wchar_t,
-        n: size_t,
-    ) -> ::size_t;
+    pub fn wcstombs(dest: *mut c_char, src: *const wchar_t, n: size_t) -> ::size_t;
 
     pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
     pub fn wmemchr(cx: *const wchar_t, c: wchar_t, n: size_t) -> *mut wchar_t;
     pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
-    pub fn memcpy(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
-    pub fn memmove(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
+    pub fn memcpy(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
+    pub fn memmove(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
     pub fn memset(dest: *mut c_void, c: c_int, n: size_t) -> *mut c_void;
 }
 
 extern "C" {
-    pub fn fprintf(
-        stream: *mut ::FILE,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn fprintf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
     pub fn printf(format: *const ::c_char, ...) -> ::c_int;
-    pub fn snprintf(
-        s: *mut ::c_char,
-        n: ::size_t,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn snprintf(s: *mut ::c_char, n: ::size_t, format: *const ::c_char, ...) -> ::c_int;
     pub fn sprintf(s: *mut ::c_char, format: *const ::c_char, ...) -> ::c_int;
-    pub fn fscanf(
-        stream: *mut ::FILE,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn fscanf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
     pub fn scanf(format: *const ::c_char, ...) -> ::c_int;
-    pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...)
-        -> ::c_int;
+    pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...) -> ::c_int;
     pub fn getchar_unlocked() -> ::c_int;
     pub fn putchar_unlocked(c: ::c_int) -> ::c_int;
     pub fn stat(path: *const c_char, buf: *mut stat) -> ::c_int;
@@ -1255,11 +1190,7 @@
     pub fn geteuid() -> uid_t;
     pub fn getgroups(ngroups_max: ::c_int, groups: *mut gid_t) -> ::c_int;
     pub fn getlogin() -> *mut c_char;
-    pub fn getopt(
-        argc: ::c_int,
-        argv: *const *mut c_char,
-        optstr: *const c_char,
-    ) -> ::c_int;
+    pub fn getopt(argc: ::c_int, argv: *const *mut c_char, optstr: *const c_char) -> ::c_int;
     pub fn pathconf(path: *const c_char, name: ::c_int) -> c_long;
     pub fn pause() -> ::c_int;
     pub fn seteuid(uid: uid_t) -> ::c_int;
@@ -1285,27 +1216,15 @@
 
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
     pub fn pthread_exit(value: *mut ::c_void) -> !;
-    pub fn pthread_attr_setdetachstate(
-        attr: *mut ::pthread_attr_t,
-        state: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_attr_setdetachstate(attr: *mut ::pthread_attr_t, state: ::c_int) -> ::c_int;
 
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
-    pub fn sigaction(
-        signum: ::c_int,
-        act: *const sigaction,
-        oldact: *mut sigaction,
-    ) -> ::c_int;
+    pub fn sigaddset(set: *mut sigset_t, signum: ::c_int) -> ::c_int;
 
-    pub fn utimes(
-        filename: *const ::c_char,
-        times: *const ::timeval,
-    ) -> ::c_int;
+    pub fn sigaction(signum: ::c_int, act: *const sigaction, oldact: *mut sigaction) -> ::c_int;
+
+    pub fn utimes(filename: *const ::c_char, times: *const ::timeval) -> ::c_int;
 
     #[link_name = "_rtld_dlopen"]
     pub fn dlopen(filename: *const ::c_char, flag: ::c_int) -> *mut ::c_void;
@@ -1314,10 +1233,7 @@
     pub fn dlerror() -> *mut ::c_char;
 
     #[link_name = "_rtld_dlsym"]
-    pub fn dlsym(
-        handle: *mut ::c_void,
-        symbol: *const ::c_char,
-    ) -> *mut ::c_void;
+    pub fn dlsym(handle: *mut ::c_void, symbol: *const ::c_char) -> *mut ::c_void;
 
     #[link_name = "_rtld_dlclose"]
     pub fn dlclose(handle: *mut ::c_void) -> ::c_int;
@@ -1337,25 +1253,14 @@
     pub fn gethostname(name: *mut ::c_char, len: ::size_t) -> ::c_int;
     pub fn usleep(secs: ::useconds_t) -> ::c_int;
     pub fn putenv(string: *mut c_char) -> ::c_int;
-    pub fn setlocale(
-        category: ::c_int,
-        locale: *const ::c_char,
-    ) -> *mut ::c_char;
-
-    pub fn sigprocmask(
-        how: ::c_int,
-        set: *const sigset_t,
-        oldset: *mut sigset_t,
-    ) -> ::c_int;
+    pub fn setlocale(category: ::c_int, locale: *const ::c_char) -> *mut ::c_char;
+
+    pub fn sigprocmask(how: ::c_int, set: *const sigset_t, oldset: *mut sigset_t) -> ::c_int;
     pub fn sigpending(set: *mut sigset_t) -> ::c_int;
 
     pub fn mkfifo(path: *const c_char, mode: mode_t) -> ::c_int;
 
-    pub fn fseeko(
-        stream: *mut ::FILE,
-        offset: ::off_t,
-        whence: ::c_int,
-    ) -> ::c_int;
+    pub fn fseeko(stream: *mut ::FILE, offset: ::off_t, whence: ::c_int) -> ::c_int;
     pub fn ftello(stream: *mut ::FILE) -> ::off_t;
     pub fn mkstemp(template: *mut ::c_char) -> ::c_int;
 
@@ -1365,18 +1270,13 @@
     pub fn closelog();
     pub fn setlogmask(maskpri: ::c_int) -> ::c_int;
     pub fn syslog(priority: ::c_int, message: *const ::c_char, ...);
-    pub fn getline(
-        lineptr: *mut *mut c_char,
-        n: *mut size_t,
-        stream: *mut FILE,
-    ) -> ssize_t;
+    pub fn getline(lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
 
 }
 
 extern "C" {
     // stdlib.h
-    pub fn memalign(block_size: ::size_t, size_arg: ::size_t)
-        -> *mut ::c_void;
+    pub fn memalign(block_size: ::size_t, size_arg: ::size_t) -> *mut ::c_void;
 
     // ioLib.h
     pub fn getcwd(buf: *mut ::c_char, size: ::size_t) -> *mut ::c_char;
@@ -1388,15 +1288,10 @@
     pub fn pthread_mutexattr_init(attr: *mut pthread_mutexattr_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_mutexattr_destroy(
-        attr: *mut pthread_mutexattr_t,
-    ) -> ::c_int;
+    pub fn pthread_mutexattr_destroy(attr: *mut pthread_mutexattr_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_mutexattr_settype(
-        pAttr: *mut ::pthread_mutexattr_t,
-        pType: ::c_int,
-    ) -> ::c_int;
+    pub fn pthread_mutexattr_settype(pAttr: *mut ::pthread_mutexattr_t, pType: ::c_int) -> ::c_int;
 
     // pthread.h
     pub fn pthread_mutex_init(
@@ -1414,31 +1309,20 @@
     pub fn pthread_mutex_trylock(mutex: *mut pthread_mutex_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_mutex_timedlock(
-        attr: *mut pthread_mutex_t,
-        spec: *const timespec,
-    ) -> ::c_int;
+    pub fn pthread_mutex_timedlock(attr: *mut pthread_mutex_t, spec: *const timespec) -> ::c_int;
 
     // pthread.h
     pub fn pthread_mutex_unlock(mutex: *mut pthread_mutex_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_attr_setname(
-        pAttr: *mut ::pthread_attr_t,
-        name: *mut ::c_char,
-    ) -> ::c_int;
+    pub fn pthread_attr_setname(pAttr: *mut ::pthread_attr_t, name: *mut ::c_char) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_attr_setstacksize(
-        attr: *mut ::pthread_attr_t,
-        stacksize: ::size_t,
-    ) -> ::c_int;
+    pub fn pthread_attr_setstacksize(attr: *mut ::pthread_attr_t, stacksize: ::size_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_attr_getstacksize(
-        attr: *const ::pthread_attr_t,
-        size: *mut ::size_t,
-    ) -> ::c_int;
+    pub fn pthread_attr_getstacksize(attr: *const ::pthread_attr_t, size: *mut ::size_t)
+        -> ::c_int;
 
     // pthread.h
     pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int;
@@ -1473,11 +1357,8 @@
     pub fn ftruncate(fd: ::c_int, length: off_t) -> ::c_int;
 
     // dirent.h
-    pub fn readdir_r(
-        pDir: *mut ::DIR,
-        entry: *mut ::dirent,
-        result: *mut *mut ::dirent,
-    ) -> ::c_int;
+    pub fn readdir_r(pDir: *mut ::DIR, entry: *mut ::dirent, result: *mut *mut ::dirent)
+        -> ::c_int;
 
     // dirent.h
     pub fn readdir(pDir: *mut ::DIR) -> *mut ::dirent;
@@ -1493,9 +1374,7 @@
     pub fn pthread_condattr_init(attr: *mut ::pthread_condattr_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_condattr_destroy(
-        attr: *mut ::pthread_condattr_t,
-    ) -> ::c_int;
+    pub fn pthread_condattr_destroy(attr: *mut ::pthread_condattr_t) -> ::c_int;
 
     // pthread.h
     pub fn pthread_condattr_getclock(
@@ -1525,20 +1404,14 @@
     pub fn pthread_cond_broadcast(cond: *mut ::pthread_cond_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_cond_wait(
-        cond: *mut ::pthread_cond_t,
-        mutex: *mut ::pthread_mutex_t,
-    ) -> ::c_int;
+    pub fn pthread_cond_wait(cond: *mut ::pthread_cond_t, mutex: *mut ::pthread_mutex_t)
+        -> ::c_int;
 
     // pthread.h
-    pub fn pthread_rwlockattr_init(
-        attr: *mut ::pthread_rwlockattr_t,
-    ) -> ::c_int;
+    pub fn pthread_rwlockattr_init(attr: *mut ::pthread_rwlockattr_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_rwlockattr_destroy(
-        attr: *mut ::pthread_rwlockattr_t,
-    ) -> ::c_int;
+    pub fn pthread_rwlockattr_destroy(attr: *mut ::pthread_rwlockattr_t) -> ::c_int;
 
     // pthread.h
     pub fn pthread_rwlockattr_setmaxreaders(
@@ -1592,10 +1465,7 @@
     pub fn pthread_key_delete(key: ::pthread_key_t) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_setspecific(
-        key: ::pthread_key_t,
-        value: *const ::c_void,
-    ) -> ::c_int;
+    pub fn pthread_setspecific(key: ::pthread_key_t, value: *const ::c_void) -> ::c_int;
 
     // pthread.h
     pub fn pthread_getspecific(key: ::pthread_key_t) -> *mut ::c_void;
@@ -1608,37 +1478,22 @@
     ) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_attr_getname(
-        attr: *mut ::pthread_attr_t,
-        name: *mut *mut ::c_char,
-    ) -> ::c_int;
+    pub fn pthread_attr_getname(attr: *mut ::pthread_attr_t, name: *mut *mut ::c_char) -> ::c_int;
 
     // pthread.h
-    pub fn pthread_join(
-        thread: ::pthread_t,
-        status: *mut *mut ::c_void,
-    ) -> ::c_int;
+    pub fn pthread_join(thread: ::pthread_t, status: *mut *mut ::c_void) -> ::c_int;
 
     // pthread.h
     pub fn pthread_self() -> ::pthread_t;
 
     // clockLib.h
-    pub fn clock_gettime(
-        clock_id: ::clockid_t,
-        tp: *mut ::timespec,
-    ) -> ::c_int;
+    pub fn clock_gettime(clock_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
 
     // clockLib.h
-    pub fn clock_settime(
-        clock_id: ::clockid_t,
-        tp: *const ::timespec,
-    ) -> ::c_int;
+    pub fn clock_settime(clock_id: ::clockid_t, tp: *const ::timespec) -> ::c_int;
 
     // clockLib.h
-    pub fn clock_getres(
-        clock_id: ::clockid_t,
-        res: *mut ::timespec,
-    ) -> ::c_int;
+    pub fn clock_getres(clock_id: ::clockid_t, res: *mut ::timespec) -> ::c_int;
 
     // clockLib.h
     pub fn clock_nanosleep(
@@ -1649,35 +1504,19 @@
     ) -> ::c_int;
 
     // timerLib.h
-    pub fn nanosleep(
-        rqtp: *const ::timespec,
-        rmtp: *mut ::timespec,
-    ) -> ::c_int;
+    pub fn nanosleep(rqtp: *const ::timespec, rmtp: *mut ::timespec) -> ::c_int;
 
     // socket.h
-    pub fn accept(
-        s: ::c_int,
-        addr: *mut ::sockaddr,
-        addrlen: *mut ::socklen_t,
-    ) -> ::c_int;
+    pub fn accept(s: ::c_int, addr: *mut ::sockaddr, addrlen: *mut ::socklen_t) -> ::c_int;
 
     // socket.h
-    pub fn bind(fd: ::c_int, addr: *const sockaddr, len: socklen_t)
-        -> ::c_int;
+    pub fn bind(fd: ::c_int, addr: *const sockaddr, len: socklen_t) -> ::c_int;
 
     // socket.h
-    pub fn connect(
-        s: ::c_int,
-        name: *const ::sockaddr,
-        namelen: ::socklen_t,
-    ) -> ::c_int;
+    pub fn connect(s: ::c_int, name: *const ::sockaddr, namelen: ::socklen_t) -> ::c_int;
 
     // socket.h
-    pub fn getpeername(
-        s: ::c_int,
-        name: *mut ::sockaddr,
-        namelen: *mut ::socklen_t,
-    ) -> ::c_int;
+    pub fn getpeername(s: ::c_int, name: *mut ::sockaddr, namelen: *mut ::socklen_t) -> ::c_int;
 
     // socket.h
     pub fn getsockname(
@@ -1699,12 +1538,7 @@
     pub fn listen(socket: ::c_int, backlog: ::c_int) -> ::c_int;
 
     // socket.h
-    pub fn recv(
-        s: ::c_int,
-        buf: *mut ::c_void,
-        bufLen: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn recv(s: ::c_int, buf: *mut ::c_void, bufLen: ::size_t, flags: ::c_int) -> ::ssize_t;
 
     // socket.h
     pub fn recvfrom(
@@ -1716,25 +1550,12 @@
         pFromLen: *mut ::socklen_t,
     ) -> ::ssize_t;
 
-    pub fn recvmsg(
-        socket: ::c_int,
-        mp: *mut ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn recvmsg(socket: ::c_int, mp: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
 
     // socket.h
-    pub fn send(
-        socket: ::c_int,
-        buf: *const ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn send(socket: ::c_int, buf: *const ::c_void, len: ::size_t, flags: ::c_int) -> ::ssize_t;
 
-    pub fn sendmsg(
-        socket: ::c_int,
-        mp: *const ::msghdr,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn sendmsg(socket: ::c_int, mp: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
 
     // socket.h
     pub fn sendto(
@@ -1759,11 +1580,7 @@
     pub fn shutdown(s: ::c_int, how: ::c_int) -> ::c_int;
 
     // socket.h
-    pub fn socket(
-        domain: ::c_int,
-        _type: ::c_int,
-        protocol: ::c_int,
-    ) -> ::c_int;
+    pub fn socket(domain: ::c_int, _type: ::c_int, protocol: ::c_int) -> ::c_int;
 
     // icotl.h
     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
@@ -1781,16 +1598,11 @@
 
     // ioLib.h or
     // unistd.h
-    pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t)
-        -> ::ssize_t;
+    pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t) -> ::ssize_t;
 
     // ioLib.h or
     // unistd.h
-    pub fn write(
-        fd: ::c_int,
-        buf: *const ::c_void,
-        count: ::size_t,
-    ) -> ::ssize_t;
+    pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::size_t) -> ::ssize_t;
 
     // ioLib.h or
     // unistd.h
@@ -1837,8 +1649,7 @@
     pub fn getppid() -> pid_t;
 
     // wait.h
-    pub fn waitpid(pid: pid_t, status: *mut ::c_int, optons: ::c_int)
-        -> pid_t;
+    pub fn waitpid(pid: pid_t, status: *mut ::c_int, optons: ::c_int) -> pid_t;
 
     // unistd.h
     pub fn sysconf(attr: ::c_int) -> ::c_long;
@@ -1858,20 +1669,13 @@
     ) -> ::c_int;
 
     // stdlib.h
-    pub fn realpath(
-        fileName: *const ::c_char,
-        resolvedName: *mut ::c_char,
-    ) -> *mut ::c_char;
+    pub fn realpath(fileName: *const ::c_char, resolvedName: *mut ::c_char) -> *mut ::c_char;
 
     // unistd.h
     pub fn link(src: *const ::c_char, dst: *const ::c_char) -> ::c_int;
 
     // unistd.h
-    pub fn readlink(
-        path: *const ::c_char,
-        buf: *mut ::c_char,
-        bufsize: ::size_t,
-    ) -> ::ssize_t;
+    pub fn readlink(path: *const ::c_char, buf: *mut ::c_char, bufsize: ::size_t) -> ::ssize_t;
 
     // unistd.h
     pub fn symlink(path1: *const ::c_char, path2: *const ::c_char) -> ::c_int;
@@ -1936,11 +1740,7 @@
     pub fn kill(__pid: pid_t, __signo: ::c_int) -> ::c_int;
 
     // signal.h for user
-    pub fn sigqueue(
-        __pid: pid_t,
-        __signo: ::c_int,
-        __value: ::sigval,
-    ) -> ::c_int;
+    pub fn sigqueue(__pid: pid_t, __signo: ::c_int, __value: ::sigval) -> ::c_int;
 
     // signal.h for user
     pub fn _sigqueue(
@@ -1973,27 +1773,13 @@
     ) -> RTP_ID;
 
     // ioLib.h
-    pub fn _realpath(
-        fileName: *const ::c_char,
-        resolvedName: *mut ::c_char,
-    ) -> *mut ::c_char;
+    pub fn _realpath(fileName: *const ::c_char, resolvedName: *mut ::c_char) -> *mut ::c_char;
 
     // pathLib.h
-    pub fn _pathIsAbsolute(
-        filepath: *const ::c_char,
-        pNameTail: *mut *const ::c_char,
-    ) -> BOOL;
+    pub fn _pathIsAbsolute(filepath: *const ::c_char, pNameTail: *mut *const ::c_char) -> BOOL;
 
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
+    pub fn readv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
 
     // randomNumGen.h
     pub fn randBytes(buf: *mut c_uchar, length: c_int) -> c_int;
@@ -2032,11 +1818,7 @@
         abs_timeout: *const ::timespec,
     ) -> ::c_int;
     pub fn mq_getattr(mqd: ::mqd_t, attr: *mut ::mq_attr) -> ::c_int;
-    pub fn mq_setattr(
-        mqd: ::mqd_t,
-        newattr: *const ::mq_attr,
-        oldattr: *mut ::mq_attr,
-    ) -> ::c_int;
+    pub fn mq_setattr(mqd: ::mqd_t, newattr: *const ::mq_attr, oldattr: *mut ::mq_attr) -> ::c_int;
 }
 
 //Dummy functions, these don't really exist in VxWorks.
@@ -2063,12 +1845,7 @@
     }
 }
 
-pub fn pread(
-    _fd: ::c_int,
-    _buf: *mut ::c_void,
-    _count: ::size_t,
-    _offset: off64_t,
-) -> ::ssize_t {
+pub fn pread(_fd: ::c_int, _buf: *mut ::c_void, _count: ::size_t, _offset: off64_t) -> ::ssize_t {
     -1
 }
 
@@ -2080,16 +1857,10 @@
 ) -> ::ssize_t {
     -1
 }
-pub fn posix_memalign(
-    memptr: *mut *mut ::c_void,
-    align: ::size_t,
-    size: ::size_t,
-) -> ::c_int {
+pub fn posix_memalign(memptr: *mut *mut ::c_void, align: ::size_t, size: ::size_t) -> ::c_int {
     // check to see if align is a power of 2 and if align is a multiple
     //  of sizeof(void *)
-    if (align & align - 1 != 0)
-        || (align as usize % size_of::<::size_t>() != 0)
-    {
+    if (align & align - 1 != 0) || (align as usize % size_of::<::size_t>() != 0) {
         return ::EINVAL;
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/wasi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/wasi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/wasi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/wasi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -35,6 +35,7 @@
 pub type blksize_t = c_long;
 pub type blkcnt_t = i64;
 pub type nfds_t = c_ulong;
+pub type wchar_t = i32;
 
 pub type __wasi_rights_t = u64;
 
@@ -200,6 +201,7 @@
 pub const O_RDONLY: c_int = 0x04000000;
 pub const O_SEARCH: c_int = 0x08000000;
 pub const O_WRONLY: c_int = 0x10000000;
+pub const O_CLOEXEC: c_int = 0x0;
 pub const O_RDWR: c_int = O_WRONLY | O_RDONLY;
 pub const O_ACCMODE: c_int = O_EXEC | O_RDWR | O_SEARCH;
 pub const O_NOCTTY: c_int = 0x0;
@@ -209,6 +211,7 @@
 pub const POSIX_FADV_RANDOM: c_int = 2;
 pub const POSIX_FADV_SEQUENTIAL: c_int = 1;
 pub const POSIX_FADV_WILLNEED: c_int = 3;
+pub const AT_FDCWD: ::c_int = -2;
 pub const AT_EACCESS: c_int = 0x0;
 pub const AT_SYMLINK_NOFOLLOW: c_int = 0x1;
 pub const AT_SYMLINK_FOLLOW: c_int = 0x2;
@@ -223,6 +226,18 @@
 pub const S_IFLNK: mode_t = 40960;
 pub const S_IFSOCK: mode_t = 49152;
 pub const S_IFMT: mode_t = 57344;
+pub const S_IXOTH: mode_t = 0x1;
+pub const S_IWOTH: mode_t = 0x2;
+pub const S_IROTH: mode_t = 0x4;
+pub const S_IXGRP: mode_t = 0x8;
+pub const S_IWGRP: mode_t = 0x10;
+pub const S_IRGRP: mode_t = 0x20;
+pub const S_IXUSR: mode_t = 0x40;
+pub const S_IWUSR: mode_t = 0x80;
+pub const S_IRUSR: mode_t = 0x100;
+pub const S_ISVTX: mode_t = 0x200;
+pub const S_ISGID: mode_t = 0x400;
+pub const S_ISUID: mode_t = 0x800;
 pub const DT_UNKNOWN: u8 = 0;
 pub const DT_BLK: u8 = 1;
 pub const DT_CHR: u8 = 2;
@@ -356,11 +371,7 @@
     pub fn write(fd: c_int, ptr: *const c_void, size: size_t) -> ssize_t;
     pub static mut environ: *mut *mut c_char;
     pub fn fopen(a: *const c_char, b: *const c_char) -> *mut FILE;
-    pub fn freopen(
-        a: *const c_char,
-        b: *const c_char,
-        f: *mut FILE,
-    ) -> *mut FILE;
+    pub fn freopen(a: *const c_char, b: *const c_char, f: *mut FILE) -> *mut FILE;
     pub fn fclose(f: *mut FILE) -> c_int;
     pub fn remove(a: *const c_char) -> c_int;
     pub fn rename(a: *const c_char, b: *const c_char) -> c_int;
@@ -373,18 +384,8 @@
     pub fn rewind(f: *mut FILE);
     pub fn fgetpos(f: *mut FILE, pos: *mut fpos_t) -> c_int;
     pub fn fsetpos(f: *mut FILE, pos: *const fpos_t) -> c_int;
-    pub fn fread(
-        buf: *mut c_void,
-        a: size_t,
-        b: size_t,
-        f: *mut FILE,
-    ) -> size_t;
-    pub fn fwrite(
-        buf: *const c_void,
-        a: size_t,
-        b: size_t,
-        f: *mut FILE,
-    ) -> size_t;
+    pub fn fread(buf: *mut c_void, a: size_t, b: size_t, f: *mut FILE) -> size_t;
+    pub fn fwrite(buf: *const c_void, a: size_t, b: size_t, f: *mut FILE) -> size_t;
     pub fn fgetc(f: *mut FILE) -> c_int;
     pub fn getc(f: *mut FILE) -> c_int;
     pub fn getchar() -> c_int;
@@ -408,12 +409,7 @@
     pub fn time(a: *mut time_t) -> time_t;
     pub fn difftime(a: time_t, b: time_t) -> c_double;
     pub fn mktime(a: *mut tm) -> time_t;
-    pub fn strftime(
-        a: *mut c_char,
-        b: size_t,
-        c: *const c_char,
-        d: *const tm,
-    ) -> size_t;
+    pub fn strftime(a: *mut c_char, b: size_t, c: *const c_char, d: *const tm) -> size_t;
     pub fn gmtime(a: *const time_t) -> *mut tm;
     pub fn gmtime_r(a: *const time_t, b: *mut tm) -> *mut tm;
     pub fn localtime(a: *const time_t) -> *mut tm;
@@ -445,41 +441,20 @@
     pub fn isblank(c: c_int) -> c_int;
     pub fn tolower(c: c_int) -> c_int;
     pub fn toupper(c: c_int) -> c_int;
-    pub fn setvbuf(
-        stream: *mut FILE,
-        buffer: *mut c_char,
-        mode: c_int,
-        size: size_t,
-    ) -> c_int;
+    pub fn setvbuf(stream: *mut FILE, buffer: *mut c_char, mode: c_int, size: size_t) -> c_int;
     pub fn setbuf(stream: *mut FILE, buf: *mut c_char);
-    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE)
-        -> *mut c_char;
+    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE) -> *mut c_char;
     pub fn atoi(s: *const c_char) -> c_int;
     pub fn atof(s: *const c_char) -> c_double;
     pub fn strtod(s: *const c_char, endp: *mut *mut c_char) -> c_double;
-    pub fn strtol(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_long;
-    pub fn strtoul(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_ulong;
+    pub fn strtof(s: *const c_char, endp: *mut *mut c_char) -> c_float;
+    pub fn strtol(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_long;
+    pub fn strtoul(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_ulong;
 
     pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
-    pub fn strncpy(
-        dst: *mut c_char,
-        src: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strncat(
-        s: *mut c_char,
-        ct: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncat(s: *mut c_char, ct: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
     pub fn strncmp(cs: *const c_char, ct: *const c_char, n: size_t) -> c_int;
     pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
@@ -492,11 +467,7 @@
     pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
-    pub fn strncasecmp(
-        s1: *const c_char,
-        s2: *const c_char,
-        n: size_t,
-    ) -> c_int;
+    pub fn strncasecmp(s1: *const c_char, s2: *const c_char, n: size_t) -> c_int;
     pub fn strlen(cs: *const c_char) -> size_t;
     pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
     pub fn strerror(n: c_int) -> *mut c_char;
@@ -505,39 +476,17 @@
 
     pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
     pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
-    pub fn memcpy(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
-    pub fn memmove(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
+    pub fn memcpy(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
+    pub fn memmove(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
     pub fn memset(dest: *mut c_void, c: c_int, n: size_t) -> *mut c_void;
 
-    pub fn fprintf(
-        stream: *mut ::FILE,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn fprintf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
     pub fn printf(format: *const ::c_char, ...) -> ::c_int;
-    pub fn snprintf(
-        s: *mut ::c_char,
-        n: ::size_t,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn snprintf(s: *mut ::c_char, n: ::size_t, format: *const ::c_char, ...) -> ::c_int;
     pub fn sprintf(s: *mut ::c_char, format: *const ::c_char, ...) -> ::c_int;
-    pub fn fscanf(
-        stream: *mut ::FILE,
-        format: *const ::c_char,
-        ...
-    ) -> ::c_int;
+    pub fn fscanf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
     pub fn scanf(format: *const ::c_char, ...) -> ::c_int;
-    pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...)
-        -> ::c_int;
+    pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...) -> ::c_int;
     pub fn getchar_unlocked() -> ::c_int;
     pub fn putchar_unlocked(c: ::c_int) -> ::c_int;
 
@@ -559,12 +508,7 @@
     pub fn seekdir(dirp: *mut ::DIR, loc: ::c_long);
     pub fn telldir(dirp: *mut ::DIR) -> ::c_long;
 
-    pub fn openat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        flags: ::c_int,
-        ...
-    ) -> ::c_int;
+    pub fn openat(dirfd: ::c_int, pathname: *const ::c_char, flags: ::c_int, ...) -> ::c_int;
     pub fn fstatat(
         dirfd: ::c_int,
         pathname: *const ::c_char,
@@ -578,11 +522,7 @@
         newpath: *const ::c_char,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn mkdirat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        mode: ::mode_t,
-    ) -> ::c_int;
+    pub fn mkdirat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
     pub fn readlinkat(
         dirfd: ::c_int,
         pathname: *const ::c_char,
@@ -600,20 +540,12 @@
         newdirfd: ::c_int,
         linkpath: *const ::c_char,
     ) -> ::c_int;
-    pub fn unlinkat(
-        dirfd: ::c_int,
-        pathname: *const ::c_char,
-        flags: ::c_int,
-    ) -> ::c_int;
+    pub fn unlinkat(dirfd: ::c_int, pathname: *const ::c_char, flags: ::c_int) -> ::c_int;
 
     pub fn access(path: *const c_char, amode: ::c_int) -> ::c_int;
     pub fn close(fd: ::c_int) -> ::c_int;
     pub fn fpathconf(filedes: ::c_int, name: ::c_int) -> c_long;
-    pub fn getopt(
-        argc: ::c_int,
-        argv: *const *mut c_char,
-        optstr: *const c_char,
-    ) -> ::c_int;
+    pub fn getopt(argc: ::c_int, argv: *const *mut c_char, optstr: *const c_char) -> ::c_int;
     pub fn isatty(fd: ::c_int) -> ::c_int;
     pub fn link(src: *const c_char, dst: *const c_char) -> ::c_int;
     pub fn lseek(fd: ::c_int, offset: off_t, whence: ::c_int) -> off_t;
@@ -621,18 +553,8 @@
     pub fn rmdir(path: *const c_char) -> ::c_int;
     pub fn sleep(secs: ::c_uint) -> ::c_uint;
     pub fn unlink(c: *const c_char) -> ::c_int;
-    pub fn pread(
-        fd: ::c_int,
-        buf: *mut ::c_void,
-        count: ::size_t,
-        offset: off_t,
-    ) -> ::ssize_t;
-    pub fn pwrite(
-        fd: ::c_int,
-        buf: *const ::c_void,
-        count: ::size_t,
-        offset: off_t,
-    ) -> ::ssize_t;
+    pub fn pread(fd: ::c_int, buf: *mut ::c_void, count: ::size_t, offset: off_t) -> ::ssize_t;
+    pub fn pwrite(fd: ::c_int, buf: *const ::c_void, count: ::size_t, offset: off_t) -> ::ssize_t;
 
     pub fn lstat(path: *const c_char, buf: *mut stat) -> ::c_int;
 
@@ -649,37 +571,16 @@
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
     pub fn times(buf: *mut ::tms) -> ::clock_t;
 
-    pub fn strerror_r(
-        errnum: ::c_int,
-        buf: *mut c_char,
-        buflen: ::size_t,
-    ) -> ::c_int;
+    pub fn strerror_r(errnum: ::c_int, buf: *mut c_char, buflen: ::size_t) -> ::c_int;
 
     pub fn usleep(secs: ::c_uint) -> ::c_int;
-    pub fn send(
-        socket: ::c_int,
-        buf: *const ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
-    pub fn recv(
-        socket: ::c_int,
-        buf: *mut ::c_void,
-        len: ::size_t,
-        flags: ::c_int,
-    ) -> ::ssize_t;
+    pub fn send(socket: ::c_int, buf: *const ::c_void, len: ::size_t, flags: ::c_int) -> ::ssize_t;
+    pub fn recv(socket: ::c_int, buf: *mut ::c_void, len: ::size_t, flags: ::c_int) -> ::ssize_t;
     pub fn poll(fds: *mut pollfd, nfds: nfds_t, timeout: ::c_int) -> ::c_int;
-    pub fn setlocale(
-        category: ::c_int,
-        locale: *const ::c_char,
-    ) -> *mut ::c_char;
+    pub fn setlocale(category: ::c_int, locale: *const ::c_char) -> *mut ::c_char;
     pub fn localeconv() -> *mut lconv;
 
-    pub fn readlink(
-        path: *const c_char,
-        buf: *mut c_char,
-        bufsz: ::size_t,
-    ) -> ::ssize_t;
+    pub fn readlink(path: *const c_char, buf: *mut c_char, bufsz: ::size_t) -> ::ssize_t;
 
     pub fn timegm(tm: *mut ::tm) -> time_t;
 
@@ -687,24 +588,12 @@
 
     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
 
-    pub fn fseeko(
-        stream: *mut ::FILE,
-        offset: ::off_t,
-        whence: ::c_int,
-    ) -> ::c_int;
+    pub fn fseeko(stream: *mut ::FILE, offset: ::off_t, whence: ::c_int) -> ::c_int;
     pub fn ftello(stream: *mut ::FILE) -> ::off_t;
-    pub fn posix_fallocate(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-    ) -> ::c_int;
+    pub fn posix_fallocate(fd: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
 
     pub fn strcasestr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
-    pub fn getline(
-        lineptr: *mut *mut c_char,
-        n: *mut size_t,
-        stream: *mut FILE,
-    ) -> ssize_t;
+    pub fn getline(lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
 
     pub fn faccessat(
         dirfd: ::c_int,
@@ -712,34 +601,12 @@
         mode: ::c_int,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn writev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn readv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-    ) -> ::ssize_t;
-    pub fn pwritev(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn preadv(
-        fd: ::c_int,
-        iov: *const ::iovec,
-        iovcnt: ::c_int,
-        offset: ::off_t,
-    ) -> ::ssize_t;
-    pub fn posix_fadvise(
-        fd: ::c_int,
-        offset: ::off_t,
-        len: ::off_t,
-        advise: ::c_int,
-    ) -> ::c_int;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
+    pub fn readv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
+    pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
+        -> ::ssize_t;
+    pub fn preadv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t) -> ::ssize_t;
+    pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t, advise: ::c_int) -> ::c_int;
     pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
     pub fn utimensat(
         dirfd: ::c_int,
@@ -748,35 +615,104 @@
         flag: ::c_int,
     ) -> ::c_int;
     pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int;
-    pub fn memrchr(
-        cx: *const ::c_void,
-        c: ::c_int,
-        n: ::size_t,
-    ) -> *mut ::c_void;
+    pub fn memrchr(cx: *const ::c_void, c: ::c_int, n: ::size_t) -> *mut ::c_void;
     pub fn abs(i: c_int) -> c_int;
     pub fn labs(i: c_long) -> c_long;
     pub fn duplocale(base: ::locale_t) -> ::locale_t;
     pub fn freelocale(loc: ::locale_t);
-    pub fn newlocale(
-        mask: ::c_int,
-        locale: *const ::c_char,
-        base: ::locale_t,
-    ) -> ::locale_t;
+    pub fn newlocale(mask: ::c_int, locale: *const ::c_char, base: ::locale_t) -> ::locale_t;
     pub fn uselocale(loc: ::locale_t) -> ::locale_t;
     pub fn sched_yield() -> ::c_int;
 
-    pub fn __wasilibc_register_preopened_fd(
-        fd: c_int,
-        path: *const c_char,
-    ) -> c_int;
+    pub fn __wasilibc_register_preopened_fd(fd: c_int, path: *const c_char) -> c_int;
     pub fn __wasilibc_fd_renumber(fd: c_int, newfd: c_int) -> c_int;
     pub fn __wasilibc_unlinkat(fd: c_int, path: *const c_char) -> c_int;
     pub fn __wasilibc_rmdirat(fd: c_int, path: *const c_char) -> c_int;
     pub fn __wasilibc_find_relpath(
         path: *const c_char,
-        relative_path: *mut *const c_char,
+        abs_prefix: *mut *const c_char,
+        relative_path: *mut *mut c_char,
+        relative_path_len: usize,
     ) -> c_int;
     pub fn __wasilibc_tell(fd: c_int) -> ::off_t;
+    pub fn __wasilibc_nocwd___wasilibc_unlinkat(dirfd: c_int, path: *const c_char) -> c_int;
+    pub fn __wasilibc_nocwd___wasilibc_rmdirat(dirfd: c_int, path: *const c_char) -> c_int;
+    pub fn __wasilibc_nocwd_linkat(
+        olddirfd: c_int,
+        oldpath: *const c_char,
+        newdirfd: c_int,
+        newpath: *const c_char,
+        flags: c_int,
+    ) -> c_int;
+    pub fn __wasilibc_nocwd_symlinkat(
+        target: *const c_char,
+        dirfd: c_int,
+        path: *const c_char,
+    ) -> c_int;
+    pub fn __wasilibc_nocwd_readlinkat(
+        dirfd: c_int,
+        path: *const c_char,
+        buf: *mut c_char,
+        bufsize: usize,
+    ) -> isize;
+    pub fn __wasilibc_nocwd_faccessat(
+        dirfd: c_int,
+        path: *const c_char,
+        mode: c_int,
+        flags: c_int,
+    ) -> c_int;
+    pub fn __wasilibc_nocwd_renameat(
+        olddirfd: c_int,
+        oldpath: *const c_char,
+        newdirfd: c_int,
+        newpath: *const c_char,
+    ) -> c_int;
+    pub fn __wasilibc_nocwd_openat_nomode(dirfd: c_int, path: *const c_char, flags: c_int)
+        -> c_int;
+    pub fn __wasilibc_nocwd_fstatat(
+        dirfd: c_int,
+        path: *const c_char,
+        buf: *mut stat,
+        flags: c_int,
+    ) -> c_int;
+    pub fn __wasilibc_nocwd_mkdirat_nomode(dirfd: c_int, path: *const c_char) -> c_int;
+    pub fn __wasilibc_nocwd_utimensat(
+        dirfd: c_int,
+        path: *const c_char,
+        times: *const ::timespec,
+        flags: c_int,
+    ) -> c_int;
+    pub fn __wasilibc_nocwd_opendirat(dirfd: c_int, path: *const c_char) -> *mut ::DIR;
+    pub fn __wasilibc_access(pathname: *const c_char, mode: c_int, flags: c_int) -> c_int;
+    pub fn __wasilibc_stat(pathname: *const c_char, buf: *mut stat, flags: c_int) -> c_int;
+    pub fn __wasilibc_utimens(
+        pathname: *const c_char,
+        times: *const ::timespec,
+        flags: c_int,
+    ) -> c_int;
+    pub fn __wasilibc_link(oldpath: *const c_char, newpath: *const c_char, flags: c_int) -> c_int;
+    pub fn __wasilibc_link_oldat(
+        olddirfd: c_int,
+        oldpath: *const c_char,
+        newpath: *const c_char,
+        flags: c_int,
+    ) -> c_int;
+    pub fn __wasilibc_link_newat(
+        oldpath: *const c_char,
+        newdirfd: c_int,
+        newpath: *const c_char,
+        flags: c_int,
+    ) -> c_int;
+    pub fn __wasilibc_rename_oldat(
+        olddirfd: c_int,
+        oldpath: *const c_char,
+        newpath: *const c_char,
+    ) -> c_int;
+    pub fn __wasilibc_rename_newat(
+        oldpath: *const c_char,
+        newdirfd: c_int,
+        newpath: *const c_char,
+    ) -> c_int;
 
     pub fn arc4random() -> u32;
     pub fn arc4random_buf(a: *mut c_void, b: size_t);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/windows/gnu/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/windows/gnu/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/windows/gnu/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/windows/gnu/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,19 +8,11 @@
 
 extern "C" {
     pub fn strcasecmp(s1: *const ::c_char, s2: *const ::c_char) -> ::c_int;
-    pub fn strncasecmp(
-        s1: *const ::c_char,
-        s2: *const ::c_char,
-        n: ::size_t,
-    ) -> ::c_int;
+    pub fn strncasecmp(s1: *const ::c_char, s2: *const ::c_char, n: ::size_t) -> ::c_int;
 
     // NOTE: For MSVC target, `wmemchr` is only a inline function in `<wchar.h>`
     //      header file. We cannot find a way to link to that symbol from Rust.
-    pub fn wmemchr(
-        cx: *const ::wchar_t,
-        c: ::wchar_t,
-        n: ::size_t,
-    ) -> *mut ::wchar_t;
+    pub fn wmemchr(cx: *const ::wchar_t, c: ::wchar_t, n: ::size_t) -> *mut ::wchar_t;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/windows/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/windows/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/windows/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/windows/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -117,16 +117,27 @@
 pub const FOPEN_MAX: ::c_uint = 20;
 pub const FILENAME_MAX: ::c_uint = 260;
 
-pub const O_RDONLY: ::c_int = 0;
-pub const O_WRONLY: ::c_int = 1;
-pub const O_RDWR: ::c_int = 2;
-pub const O_APPEND: ::c_int = 8;
-pub const O_CREAT: ::c_int = 256;
-pub const O_EXCL: ::c_int = 1024;
-pub const O_TEXT: ::c_int = 16384;
-pub const O_BINARY: ::c_int = 32768;
-pub const O_NOINHERIT: ::c_int = 128;
-pub const O_TRUNC: ::c_int = 512;
+// fcntl.h
+pub const O_RDONLY: ::c_int = 0x0000;
+pub const O_WRONLY: ::c_int = 0x0001;
+pub const O_RDWR: ::c_int = 0x0002;
+pub const O_APPEND: ::c_int = 0x0008;
+pub const O_CREAT: ::c_int = 0x0100;
+pub const O_TRUNC: ::c_int = 0x0200;
+pub const O_EXCL: ::c_int = 0x0400;
+pub const O_TEXT: ::c_int = 0x4000;
+pub const O_BINARY: ::c_int = 0x8000;
+pub const _O_WTEXT: ::c_int = 0x10000;
+pub const _O_U16TEXT: ::c_int = 0x20000;
+pub const _O_U8TEXT: ::c_int = 0x40000;
+pub const O_RAW: ::c_int = O_BINARY;
+pub const O_NOINHERIT: ::c_int = 0x0080;
+pub const O_TEMPORARY: ::c_int = 0x0040;
+pub const _O_SHORT_LIVED: ::c_int = 0x1000;
+pub const _O_OBTAIN_DIR: ::c_int = 0x2000;
+pub const O_SEQUENTIAL: ::c_int = 0x0020;
+pub const O_RANDOM: ::c_int = 0x0010;
+
 pub const S_IFCHR: ::c_int = 8192;
 pub const S_IFDIR: ::c_int = 16384;
 pub const S_IFREG: ::c_int = 32768;
@@ -233,7 +244,13 @@
 pub const SIGTERM: ::c_int = 15;
 pub const SIGABRT: ::c_int = 22;
 pub const NSIG: ::c_int = 23;
+
 pub const SIG_ERR: ::c_int = -1;
+pub const SIG_DFL: ::sighandler_t = 0;
+pub const SIG_IGN: ::sighandler_t = 1;
+pub const SIG_GET: ::sighandler_t = 2;
+pub const SIG_SGE: ::sighandler_t = 3;
+pub const SIG_ACK: ::sighandler_t = 4;
 
 // inline comment below appeases style checker
 #[cfg(all(target_env = "msvc", feature = "rustc-dep-of-std"))] // " if "
@@ -274,44 +291,24 @@
     pub fn tolower(c: c_int) -> c_int;
     pub fn toupper(c: c_int) -> c_int;
     pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;
-    pub fn freopen(
-        filename: *const c_char,
-        mode: *const c_char,
-        file: *mut FILE,
-    ) -> *mut FILE;
+    pub fn freopen(filename: *const c_char, mode: *const c_char, file: *mut FILE) -> *mut FILE;
     pub fn fflush(file: *mut FILE) -> c_int;
     pub fn fclose(file: *mut FILE) -> c_int;
     pub fn remove(filename: *const c_char) -> c_int;
     pub fn rename(oldname: *const c_char, newname: *const c_char) -> c_int;
     pub fn tmpfile() -> *mut FILE;
-    pub fn setvbuf(
-        stream: *mut FILE,
-        buffer: *mut c_char,
-        mode: c_int,
-        size: size_t,
-    ) -> c_int;
+    pub fn setvbuf(stream: *mut FILE, buffer: *mut c_char, mode: c_int, size: size_t) -> c_int;
     pub fn setbuf(stream: *mut FILE, buf: *mut c_char);
     pub fn getchar() -> c_int;
     pub fn putchar(c: c_int) -> c_int;
     pub fn fgetc(stream: *mut FILE) -> c_int;
-    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE)
-        -> *mut c_char;
+    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE) -> *mut c_char;
     pub fn fputc(c: c_int, stream: *mut FILE) -> c_int;
     pub fn fputs(s: *const c_char, stream: *mut FILE) -> c_int;
     pub fn puts(s: *const c_char) -> c_int;
     pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
-    pub fn fread(
-        ptr: *mut c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
-    pub fn fwrite(
-        ptr: *const c_void,
-        size: size_t,
-        nobj: size_t,
-        stream: *mut FILE,
-    ) -> size_t;
+    pub fn fread(ptr: *mut c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
+    pub fn fwrite(ptr: *const c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
     pub fn fseek(stream: *mut FILE, offset: c_long, whence: c_int) -> c_int;
     pub fn ftell(stream: *mut FILE) -> c_long;
     pub fn rewind(stream: *mut FILE);
@@ -322,16 +319,9 @@
     pub fn perror(s: *const c_char);
     pub fn atoi(s: *const c_char) -> c_int;
     pub fn strtod(s: *const c_char, endp: *mut *mut c_char) -> c_double;
-    pub fn strtol(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_long;
-    pub fn strtoul(
-        s: *const c_char,
-        endp: *mut *mut c_char,
-        base: c_int,
-    ) -> c_ulong;
+    pub fn strtof(s: *const c_char, endp: *mut *mut c_char) -> c_float;
+    pub fn strtol(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_long;
+    pub fn strtoul(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_ulong;
     pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
     pub fn malloc(size: size_t) -> *mut c_void;
     pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
@@ -344,17 +334,9 @@
     pub fn getenv(s: *const c_char) -> *mut c_char;
 
     pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
-    pub fn strncpy(
-        dst: *mut c_char,
-        src: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strncat(
-        s: *mut c_char,
-        ct: *const c_char,
-        n: size_t,
-    ) -> *mut c_char;
+    pub fn strncat(s: *mut c_char, ct: *const c_char, n: size_t) -> *mut c_char;
     pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
     pub fn strncmp(cs: *const c_char, ct: *const c_char, n: size_t) -> c_int;
     pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
@@ -371,24 +353,12 @@
     pub fn strtok(s: *mut c_char, t: *const c_char) -> *mut c_char;
     pub fn strxfrm(s: *mut c_char, ct: *const c_char, n: size_t) -> size_t;
     pub fn wcslen(buf: *const wchar_t) -> size_t;
-    pub fn wcstombs(
-        dest: *mut c_char,
-        src: *const wchar_t,
-        n: size_t,
-    ) -> ::size_t;
+    pub fn wcstombs(dest: *mut c_char, src: *const wchar_t, n: size_t) -> ::size_t;
 
     pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
     pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
-    pub fn memcpy(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
-    pub fn memmove(
-        dest: *mut c_void,
-        src: *const c_void,
-        n: size_t,
-    ) -> *mut c_void;
+    pub fn memcpy(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
+    pub fn memmove(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
     pub fn memset(dest: *mut c_void, c: c_int, n: size_t) -> *mut c_void;
 
     pub fn abs(i: c_int) -> c_int;
@@ -447,37 +417,21 @@
     #[link_name = "_execl"]
     pub fn execl(path: *const c_char, arg0: *const c_char, ...) -> intptr_t;
     #[link_name = "_wexecl"]
-    pub fn wexecl(path: *const wchar_t, arg0: *const wchar_t, ...)
-        -> intptr_t;
+    pub fn wexecl(path: *const wchar_t, arg0: *const wchar_t, ...) -> intptr_t;
     #[link_name = "_execle"]
     pub fn execle(path: *const c_char, arg0: *const c_char, ...) -> intptr_t;
     #[link_name = "_wexecle"]
-    pub fn wexecle(
-        path: *const wchar_t,
-        arg0: *const wchar_t,
-        ...
-    ) -> intptr_t;
+    pub fn wexecle(path: *const wchar_t, arg0: *const wchar_t, ...) -> intptr_t;
     #[link_name = "_execlp"]
     pub fn execlp(path: *const c_char, arg0: *const c_char, ...) -> intptr_t;
     #[link_name = "_wexeclp"]
-    pub fn wexeclp(
-        path: *const wchar_t,
-        arg0: *const wchar_t,
-        ...
-    ) -> intptr_t;
+    pub fn wexeclp(path: *const wchar_t, arg0: *const wchar_t, ...) -> intptr_t;
     #[link_name = "_execlpe"]
     pub fn execlpe(path: *const c_char, arg0: *const c_char, ...) -> intptr_t;
     #[link_name = "_wexeclpe"]
-    pub fn wexeclpe(
-        path: *const wchar_t,
-        arg0: *const wchar_t,
-        ...
-    ) -> intptr_t;
+    pub fn wexeclpe(path: *const wchar_t, arg0: *const wchar_t, ...) -> intptr_t;
     #[link_name = "_execv"]
-    pub fn execv(
-        prog: *const c_char,
-        argv: *const *const c_char,
-    ) -> ::intptr_t;
+    pub fn execv(prog: *const c_char, argv: *const *const c_char) -> ::intptr_t;
     #[link_name = "_execve"]
     pub fn execve(
         prog: *const c_char,
@@ -493,10 +447,7 @@
         envp: *const *const c_char,
     ) -> ::c_int;
     #[link_name = "_wexecv"]
-    pub fn wexecv(
-        prog: *const wchar_t,
-        argv: *const *const wchar_t,
-    ) -> ::intptr_t;
+    pub fn wexecv(prog: *const wchar_t, argv: *const *const wchar_t) -> ::intptr_t;
     #[link_name = "_wexecve"]
     pub fn wexecve(
         prog: *const wchar_t,
@@ -504,10 +455,7 @@
         envp: *const *const wchar_t,
     ) -> ::intptr_t;
     #[link_name = "_wexecvp"]
-    pub fn wexecvp(
-        c: *const wchar_t,
-        argv: *const *const wchar_t,
-    ) -> ::intptr_t;
+    pub fn wexecvp(c: *const wchar_t, argv: *const *const wchar_t) -> ::intptr_t;
     #[link_name = "_wexecvpe"]
     pub fn wexecvpe(
         c: *const wchar_t,
@@ -523,17 +471,9 @@
     #[link_name = "_lseek"]
     pub fn lseek(fd: ::c_int, offset: c_long, origin: ::c_int) -> c_long;
     #[link_name = "_lseeki64"]
-    pub fn lseek64(
-        fd: ::c_int,
-        offset: c_longlong,
-        origin: ::c_int,
-    ) -> c_longlong;
+    pub fn lseek64(fd: ::c_int, offset: c_longlong, origin: ::c_int) -> c_longlong;
     #[link_name = "_pipe"]
-    pub fn pipe(
-        fds: *mut ::c_int,
-        psize: ::c_uint,
-        textmode: ::c_int,
-    ) -> ::c_int;
+    pub fn pipe(fds: *mut ::c_int, psize: ::c_uint, textmode: ::c_int) -> ::c_int;
     #[link_name = "_read"]
     pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::c_uint) -> ::c_int;
     #[link_name = "_rmdir"]
@@ -541,11 +481,7 @@
     #[link_name = "_unlink"]
     pub fn unlink(c: *const c_char) -> ::c_int;
     #[link_name = "_write"]
-    pub fn write(
-        fd: ::c_int,
-        buf: *const ::c_void,
-        count: ::c_uint,
-    ) -> ::c_int;
+    pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::c_uint) -> ::c_int;
     #[link_name = "_commit"]
     pub fn commit(fd: ::c_int) -> ::c_int;
     #[link_name = "_get_osfhandle"]
@@ -554,41 +490,20 @@
     pub fn open_osfhandle(osfhandle: ::intptr_t, flags: ::c_int) -> ::c_int;
     pub fn setlocale(category: ::c_int, locale: *const c_char) -> *mut c_char;
     #[link_name = "_wsetlocale"]
-    pub fn wsetlocale(
-        category: ::c_int,
-        locale: *const wchar_t,
-    ) -> *mut wchar_t;
+    pub fn wsetlocale(category: ::c_int, locale: *const wchar_t) -> *mut wchar_t;
     #[link_name = "_aligned_malloc"]
     pub fn aligned_malloc(size: size_t, alignment: size_t) -> *mut c_void;
+    #[link_name = "_aligned_free"]
+    pub fn aligned_free(ptr: *mut ::c_void);
 }
 
 extern "system" {
     pub fn listen(s: SOCKET, backlog: ::c_int) -> ::c_int;
-    pub fn accept(
-        s: SOCKET,
-        addr: *mut ::sockaddr,
-        addrlen: *mut ::c_int,
-    ) -> SOCKET;
-    pub fn bind(
-        s: SOCKET,
-        name: *const ::sockaddr,
-        namelen: ::c_int,
-    ) -> ::c_int;
-    pub fn connect(
-        s: SOCKET,
-        name: *const ::sockaddr,
-        namelen: ::c_int,
-    ) -> ::c_int;
-    pub fn getpeername(
-        s: SOCKET,
-        name: *mut ::sockaddr,
-        nameln: *mut ::c_int,
-    ) -> ::c_int;
-    pub fn getsockname(
-        s: SOCKET,
-        name: *mut ::sockaddr,
-        nameln: *mut ::c_int,
-    ) -> ::c_int;
+    pub fn accept(s: SOCKET, addr: *mut ::sockaddr, addrlen: *mut ::c_int) -> SOCKET;
+    pub fn bind(s: SOCKET, name: *const ::sockaddr, namelen: ::c_int) -> ::c_int;
+    pub fn connect(s: SOCKET, name: *const ::sockaddr, namelen: ::c_int) -> ::c_int;
+    pub fn getpeername(s: SOCKET, name: *mut ::sockaddr, nameln: *mut ::c_int) -> ::c_int;
+    pub fn getsockname(s: SOCKET, name: *mut ::sockaddr, nameln: *mut ::c_int) -> ::c_int;
     pub fn getsockopt(
         s: SOCKET,
         level: ::c_int,
@@ -619,11 +534,7 @@
         optval: *const ::c_char,
         optlen: ::c_int,
     ) -> ::c_int;
-    pub fn socket(
-        af: ::c_int,
-        socket_type: ::c_int,
-        protocol: ::c_int,
-    ) -> SOCKET;
+    pub fn socket(af: ::c_int, socket_type: ::c_int, protocol: ::c_int) -> SOCKET;
 }
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/windows/msvc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/windows/msvc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/libc/src/windows/msvc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/libc/src/windows/msvc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,9 +9,5 @@
     #[link_name = "_stricmp"]
     pub fn stricmp(s1: *const ::c_char, s2: *const ::c_char) -> ::c_int;
     #[link_name = "_strnicmp"]
-    pub fn strnicmp(
-        s1: *const ::c_char,
-        s2: *const ::c_char,
-        n: ::size_t,
-    ) -> ::c_int;
+    pub fn strnicmp(s1: *const ::c_char, s2: *const ::c_char, n: ::size_t) -> ::c_int;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"0b7ec1020d4c5b58310956b970789207f7e257062d4045786773b4a34338161f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","src/lib.rs":"e30eee3009000171f340316683699e7a6bcbb63e241fc29f836acf3be5544fb7","src/mutex.rs":"db7f0dcb09fc5aaab2b04d6eac7b80b799da8fdb669fa43ddbb7007663760782","src/remutex.rs":"1049b5c824a1f2df4e0ed348fbe8a9d5697f9ad4779b174ad7a02610d23bcf7c","src/rwlock.rs":"6639e140c50ee81e212647e5a2596c0e247a0a062ee8471c79d268c1280c7330"},"package":"dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"}
\ No newline at end of file
+{"files":{"Cargo.toml":"480236b01449b56dad945652b3af7f73faea452dca132da3f1c90ba3ca4f984c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","src/lib.rs":"32992cb77fba83d77e979e328953ce3da21b4005d595857f006c8bd65fb6a9ee","src/mutex.rs":"789106fe52c17b706bac5b69ef1cb656d4cef1ce4ef147872d78504dad307705","src/remutex.rs":"03708cd1aa5b982ce278c7b3ef7b97a89253eb92dc96d229ecb1602ff8373b38","src/rwlock.rs":"242db97a58018101dab370f2d0551a4172f15bc5385ecd283bfc37d11891d83b"},"package":"712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "lock_api"
-version = "0.4.2"
+version = "0.4.5"
 authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
 description = "Wrappers to create fully-featured Mutex and RwLock types. Compatible with no_std."
 keywords = ["mutex", "rwlock", "lock", "no_std"]
@@ -29,9 +28,10 @@
 default-features = false
 
 [dependencies.serde]
-version = "1.0.114"
+version = "1.0.126"
 optional = true
 default-features = false
 
 [features]
+arc_lock = []
 nightly = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -79,20 +79,25 @@
 //!
 //! # Cargo features
 //!
-//! This crate supports two cargo features:
+//! This crate supports three cargo features:
 //!
 //! - `owning_ref`: Allows your lock types to be used with the `owning_ref` crate.
+//! - `arc_lock`: Enables locking from an `Arc`. This enables types such as `ArcMutexGuard`. Note that this
+//!   requires the `alloc` crate to be present.
 //! - `nightly`: Enables nightly-only features. At the moment the only such
 //!   feature is `const fn` constructors for lock types.
 
 #![no_std]
 #![warn(missing_docs)]
 #![warn(rust_2018_idioms)]
-#![cfg_attr(feature = "nightly", feature(const_fn))]
+#![cfg_attr(feature = "nightly", feature(const_fn_trait_bound))]
 
 #[macro_use]
 extern crate scopeguard;
 
+#[cfg(feature = "arc_lock")]
+extern crate alloc;
+
 /// Marker type which indicates that the Guard type for a lock is `Send`.
 pub struct GuardSend(());
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/src/mutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/src/mutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/src/mutex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/src/mutex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,13 @@
 use core::mem;
 use core::ops::{Deref, DerefMut};
 
+#[cfg(feature = "arc_lock")]
+use alloc::sync::Arc;
+#[cfg(feature = "arc_lock")]
+use core::mem::ManuallyDrop;
+#[cfg(feature = "arc_lock")]
+use core::ptr;
+
 #[cfg(feature = "owning_ref")]
 use owning_ref::StableAddress;
 
@@ -286,6 +293,45 @@
     pub fn data_ptr(&self) -> *mut T {
         self.data.get()
     }
+
+    /// # Safety
+    ///
+    /// The lock needs to be held for the behavior of this function to be defined.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    unsafe fn guard_arc(self: &Arc<Self>) -> ArcMutexGuard<R, T> {
+        ArcMutexGuard {
+            mutex: self.clone(),
+            marker: PhantomData,
+        }
+    }
+
+    /// Acquires a lock through an `Arc`.
+    ///
+    /// This method is similar to the `lock` method; however, it requires the `Mutex` to be inside of an `Arc`
+    /// and the resulting mutex guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn lock_arc(self: &Arc<Self>) -> ArcMutexGuard<R, T> {
+        self.raw.lock();
+        // SAFETY: the locking guarantee is upheld
+        unsafe { self.guard_arc() }
+    }
+
+    /// Attempts to acquire a lock through an `Arc`.
+    ///
+    /// This method is similar to the `try_lock` method; however, it requires the `Mutex` to be inside of an
+    /// `Arc` and the resulting mutex guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_lock_arc(self: &Arc<Self>) -> Option<ArcMutexGuard<R, T>> {
+        if self.raw.try_lock() {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawMutexFair, T: ?Sized> Mutex<R, T> {
@@ -336,6 +382,39 @@
             None
         }
     }
+
+    /// Attempts to acquire this lock through an `Arc` until a timeout is reached.
+    ///
+    /// This method is similar to the `try_lock_for` method; however, it requires the `Mutex` to be inside of an
+    /// `Arc` and the resulting mutex guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_lock_arc_for(self: &Arc<Self>, timeout: R::Duration) -> Option<ArcMutexGuard<R, T>> {
+        if self.raw.try_lock_for(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.guard_arc() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this lock through an `Arc` until a timeout is reached.
+    ///
+    /// This method is similar to the `try_lock_until` method; however, it requires the `Mutex` to be inside of
+    /// an `Arc` and the resulting mutex guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_lock_arc_until(
+        self: &Arc<Self>,
+        timeout: R::Instant,
+    ) -> Option<ArcMutexGuard<R, T>> {
+        if self.raw.try_lock_until(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawMutex, T: ?Sized + Default> Default for Mutex<R, T> {
@@ -583,6 +662,116 @@
 #[cfg(feature = "owning_ref")]
 unsafe impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> StableAddress for MutexGuard<'a, R, T> {}
 
+/// An RAII mutex guard returned by the `Arc` locking operations on `Mutex`.
+/// 
+/// This is similar to the `MutexGuard` struct, except instead of using a reference to unlock the `Mutex` it 
+/// uses an `Arc<Mutex>`. This has several advantages, most notably that it has an `'static` lifetime.
+#[cfg(feature = "arc_lock")]
+#[must_use = "if unused the Mutex will immediately unlock"]
+pub struct ArcMutexGuard<R: RawMutex, T: ?Sized> {
+    mutex: Arc<Mutex<R, T>>,
+    marker: PhantomData<R::GuardMarker>,
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutex, T: ?Sized> ArcMutexGuard<R, T> {
+    /// Returns a reference to the `Mutex` this is guarding, contained in its `Arc`.
+    #[inline]
+    pub fn mutex(&self) -> &Arc<Mutex<R, T>> {
+        &self.mutex
+    }
+
+    /// Temporarily unlocks the mutex to execute the given function.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the mutex.
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: A MutexGuard always holds the lock.
+        unsafe {
+            s.mutex.raw.unlock();
+        }
+        defer!(s.mutex.raw.lock());
+        f()
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutexFair, T: ?Sized> ArcMutexGuard<R, T> {
+    /// Unlocks the mutex using a fair unlock protocol.
+    ///
+    /// This is functionally identical to the `unlock_fair` method on [`MutexGuard`].
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        // Safety: A MutexGuard always holds the lock.
+        unsafe {
+            s.mutex.raw.unlock_fair();
+        }
+
+        // SAFETY: make sure the Arc gets it reference decremented
+        let mut s = ManuallyDrop::new(s);
+        unsafe { ptr::drop_in_place(&mut s.mutex) }; 
+    }
+
+    /// Temporarily unlocks the mutex to execute the given function.
+    ///
+    /// This is functionally identical to the `unlocked_fair` method on [`MutexGuard`].
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: A MutexGuard always holds the lock.
+        unsafe {
+            s.mutex.raw.unlock_fair();
+        }
+        defer!(s.mutex.raw.lock());
+        f()
+    }
+
+    /// Temporarily yields the mutex to a waiting thread if there is one.
+    ///
+    /// This is functionally identical to the `bump` method on [`MutexGuard`].
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        // Safety: A MutexGuard always holds the lock.
+        unsafe {
+            s.mutex.raw.bump();
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutex, T: ?Sized> Deref for ArcMutexGuard<R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.mutex.data.get() }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutex, T: ?Sized> DerefMut for ArcMutexGuard<R, T> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.mutex.data.get() }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutex, T: ?Sized> Drop for ArcMutexGuard<R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        // Safety: A MutexGuard always holds the lock.
+        unsafe {
+            self.mutex.raw.unlock();
+        }
+    }
+}
+
 /// An RAII mutex guard returned by `MutexGuard::map`, which can point to a
 /// subfield of the protected data.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/src/remutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/src/remutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/src/remutex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/src/remutex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,6 +19,13 @@
     sync::atomic::{AtomicUsize, Ordering},
 };
 
+#[cfg(feature = "arc_lock")]
+use alloc::sync::Arc;
+#[cfg(feature = "arc_lock")]
+use core::mem::ManuallyDrop;
+#[cfg(feature = "arc_lock")]
+use core::ptr;
+
 #[cfg(feature = "owning_ref")]
 use owning_ref::StableAddress;
 
@@ -135,6 +142,13 @@
     pub fn is_locked(&self) -> bool {
         self.mutex.is_locked()
     }
+
+    /// Checks whether the mutex is currently held by the current thread.
+    #[inline]
+    pub fn is_owned_by_current_thread(&self) -> bool {
+        let id = self.get_thread_id.nonzero_thread_id().get();
+        self.owner.load(Ordering::Relaxed) == id
+    }
 }
 
 impl<R: RawMutexFair, G: GetThreadId> RawReentrantMutex<R, G> {
@@ -333,6 +347,12 @@
         self.raw.is_locked()
     }
 
+    /// Checks whether the mutex is currently held by the current thread.
+    #[inline]
+    pub fn is_owned_by_current_thread(&self) -> bool {
+        self.raw.is_owned_by_current_thread()
+    }
+
     /// Forcibly unlocks the mutex.
     ///
     /// This is useful when combined with `mem::forget` to hold a lock without
@@ -379,6 +399,45 @@
     pub fn data_ptr(&self) -> *mut T {
         self.data.get()
     }
+
+    /// # Safety
+    /// 
+    /// The lock must be held before calling this method.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    unsafe fn guard_arc(self: &Arc<Self>) -> ArcReentrantMutexGuard<R, G, T> {
+        ArcReentrantMutexGuard {
+            remutex: self.clone(),
+            marker: PhantomData,
+        }
+    }
+
+    /// Acquires a reentrant mutex through an `Arc`.
+    /// 
+    /// This method is similar to the `lock` method; however, it requires the `ReentrantMutex` to be inside of an
+    /// `Arc` and the resulting mutex guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn lock_arc(self: &Arc<Self>) -> ArcReentrantMutexGuard<R, G, T> {
+        self.raw.lock();
+        // SAFETY: locking guarantee is upheld
+        unsafe { self.guard_arc() }
+    }
+
+    /// Attempts to acquire a reentrant mutex through an `Arc`.
+    /// 
+    /// This method is similar to the `try_lock` method; however, it requires the `ReentrantMutex` to be inside
+    /// of an `Arc` and the resulting mutex guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_lock_arc(self: &Arc<Self>) -> Option<ArcReentrantMutexGuard<R, G, T>> {
+        if self.raw.try_lock() {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawMutexFair, G: GetThreadId, T: ?Sized> ReentrantMutex<R, G, T> {
@@ -429,6 +488,36 @@
             None
         }
     }
+
+    /// Attempts to acquire this lock until a timeout is reached, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_lock_for` method; however, it requires the `ReentrantMutex` to be
+    /// inside of an `Arc` and the resulting mutex guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_lock_arc_for(self: &Arc<Self>, timeout: R::Duration) -> Option<ArcReentrantMutexGuard<R, G, T>> {
+        if self.raw.try_lock_for(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.guard_arc() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this lock until a timeout is reached, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_lock_until` method; however, it requires the `ReentrantMutex` to be
+    /// inside of an `Arc` and the resulting mutex guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_lock_arc_until(self: &Arc<Self>, timeout: R::Instant) -> Option<ArcReentrantMutexGuard<R, G, T>> {
+        if self.raw.try_lock_until(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawMutex, G: GetThreadId, T: ?Sized + Default> Default for ReentrantMutex<R, G, T> {
@@ -647,6 +736,7 @@
             s.remutex.raw.bump();
         }
     }
+
 }
 
 impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Deref
@@ -693,6 +783,114 @@
 {
 }
 
+/// An RAII mutex guard returned by the `Arc` locking operations on `ReentrantMutex`. 
+/// 
+/// This is similar to the `ReentrantMutexGuard` struct, except instead of using a reference to unlock the 
+/// `Mutex` it uses an `Arc<ReentrantMutex>`. This has several advantages, most notably that it has an `'static`
+/// lifetime.
+#[cfg(feature = "arc_lock")]
+#[must_use = "if unused the ReentrantMutex will immediately unlock"]
+pub struct ArcReentrantMutexGuard<R: RawMutex, G: GetThreadId, T: ?Sized> {
+    remutex: Arc<ReentrantMutex<R, G, T>>,
+    marker: PhantomData<GuardNoSend>,
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutex, G: GetThreadId, T: ?Sized> ArcReentrantMutexGuard<R, G, T> {
+    /// Returns a reference to the `ReentrantMutex` this object is guarding, contained in its `Arc`.
+    pub fn remutex(s: &Self) -> &Arc<ReentrantMutex<R, G, T>> {
+        &s.remutex
+    }
+
+    /// Temporarily unlocks the mutex to execute the given function.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the mutex.
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: A ReentrantMutexGuard always holds the lock.
+        unsafe {
+            s.remutex.raw.unlock();
+        }
+        defer!(s.remutex.raw.lock());
+        f()
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutexFair, G: GetThreadId, T: ?Sized>
+    ArcReentrantMutexGuard<R, G, T>
+{
+    /// Unlocks the mutex using a fair unlock protocol.
+    ///
+    /// This is functionally identical to the `unlock_fair` method on [`ReentrantMutexGuard`].
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        // Safety: A ReentrantMutexGuard always holds the lock
+        unsafe {
+            s.remutex.raw.unlock_fair();
+        }
+
+        // SAFETY: ensure that the Arc's refcount is decremented
+        let mut s = ManuallyDrop::new(s);
+        unsafe { ptr::drop_in_place(&mut s.remutex) };
+    }
+
+    /// Temporarily unlocks the mutex to execute the given function.
+    ///
+    /// This is functionally identical to the `unlocked_fair` method on [`ReentrantMutexGuard`].
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: A ReentrantMutexGuard always holds the lock
+        unsafe {
+            s.remutex.raw.unlock_fair();
+        }
+        defer!(s.remutex.raw.lock());
+        f()
+    }
+
+    /// Temporarily yields the mutex to a waiting thread if there is one.
+    ///
+    /// This is functionally equivalent to the `bump` method on [`ReentrantMutexGuard`].
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        // Safety: A ReentrantMutexGuard always holds the lock
+        unsafe {
+            s.remutex.raw.bump();
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutex, G: GetThreadId, T: ?Sized> Deref
+    for ArcReentrantMutexGuard<R, G, T>
+{
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.remutex.data.get() }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawMutex, G: GetThreadId, T: ?Sized> Drop
+    for ArcReentrantMutexGuard<R, G, T>
+{
+    #[inline]
+    fn drop(&mut self) {
+        // Safety: A ReentrantMutexGuard always holds the lock.
+        unsafe {
+            self.remutex.raw.unlock();
+        }
+    }
+}
+
 /// An RAII mutex guard returned by `ReentrantMutexGuard::map`, which can point to a
 /// subfield of the protected data.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/src/rwlock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/src/rwlock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/lock_api/src/rwlock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/lock_api/src/rwlock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,13 @@
 use core::mem;
 use core::ops::{Deref, DerefMut};
 
+#[cfg(feature = "arc_lock")]
+use alloc::sync::Arc;
+#[cfg(feature = "arc_lock")]
+use core::mem::ManuallyDrop;
+#[cfg(feature = "arc_lock")]
+use core::ptr;
+
 #[cfg(feature = "owning_ref")]
 use owning_ref::StableAddress;
 
@@ -557,6 +564,84 @@
     pub fn data_ptr(&self) -> *mut T {
         self.data.get()
     }
+
+    /// # Safety
+    ///
+    /// The lock must be held when calling this method.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    unsafe fn read_guard_arc(self: &Arc<Self>) -> ArcRwLockReadGuard<R, T> {
+        ArcRwLockReadGuard {
+            rwlock: self.clone(),
+            marker: PhantomData,
+        }
+    }
+
+    /// # Safety
+    ///
+    /// The lock must be held when calling this method.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    unsafe fn write_guard_arc(self: &Arc<Self>) -> ArcRwLockWriteGuard<R, T> {
+        ArcRwLockWriteGuard {
+            rwlock: self.clone(),
+            marker: PhantomData,
+        }
+    }
+
+    /// Locks this `RwLock` with read access, through an `Arc`.
+    /// 
+    /// This method is similar to the `read` method; however, it requires the `RwLock` to be inside of an `Arc`
+    /// and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn read_arc(self: &Arc<Self>) -> ArcRwLockReadGuard<R, T> {
+        self.raw.lock_shared();
+        // SAFETY: locking guarantee is upheld
+        unsafe { self.read_guard_arc() }
+    }
+
+    /// Attempts to lock this `RwLock` with read access, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_read` method; however, it requires the `RwLock` to be inside of an 
+    /// `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_read_arc(self: &Arc<Self>) -> Option<ArcRwLockReadGuard<R, T>> {
+        if self.raw.try_lock_shared() {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.read_guard_arc() })
+        } else {
+            None
+        }
+    }
+
+    /// Locks this `RwLock` with write access, through an `Arc`.
+    /// 
+    /// This method is similar to the `write` method; however, it requires the `RwLock` to be inside of an `Arc`
+    /// and the resulting write guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn write_arc(self: &Arc<Self>) -> ArcRwLockWriteGuard<R, T> {
+        self.raw.lock_exclusive();
+        // SAFETY: locking guarantee is upheld
+        unsafe { self.write_guard_arc() }
+    }
+
+    /// Attempts to lock this `RwLock` with writ access, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_write` method; however, it requires the `RwLock` to be inside of an 
+    /// `Arc` and the resulting write guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_write_arc(self: &Arc<Self>) -> Option<ArcRwLockWriteGuard<R, T>> {
+        if self.raw.try_lock_exclusive() {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.write_guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawRwLockFair, T: ?Sized> RwLock<R, T> {
@@ -657,6 +742,66 @@
             None
         }
     }
+
+    /// Attempts to acquire this `RwLock` with read access until a timeout is reached, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_read_for` method; however, it requires the `RwLock` to be inside of an
+    /// `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_read_arc_for(self: &Arc<Self>, timeout: R::Duration) -> Option<ArcRwLockReadGuard<R, T>> {
+        if self.raw.try_lock_shared_for(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.read_guard_arc() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with read access until a timeout is reached, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_read_until` method; however, it requires the `RwLock` to be inside of
+    /// an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_read_arc_until(self: &Arc<Self>, timeout: R::Instant) -> Option<ArcRwLockReadGuard<R, T>> {
+        if self.raw.try_lock_shared_until(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.read_guard_arc() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with write access until a timeout is reached, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_write_for` method; however, it requires the `RwLock` to be inside of
+    /// an `Arc` and the resulting write guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_write_arc_for(self: &Arc<Self>, timeout: R::Duration) -> Option<ArcRwLockWriteGuard<R, T>> {
+        if self.raw.try_lock_exclusive_for(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.write_guard_arc() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with read access until a timeout is reached, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_write_until` method; however, it requires the `RwLock` to be inside of
+    /// an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_write_arc_until(self: &Arc<Self>, timeout: R::Instant) -> Option<ArcRwLockWriteGuard<R, T>> {
+        if self.raw.try_lock_exclusive_until(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.write_guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawRwLockRecursive, T: ?Sized> RwLock<R, T> {
@@ -701,6 +846,33 @@
             None
         }
     }
+
+    /// Locks this `RwLock` with shared read access, through an `Arc`.
+    /// 
+    /// This method is similar to the `read_recursive` method; however, it requires the `RwLock` to be inside of
+    /// an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn read_arc_recursive(self: &Arc<Self>) -> ArcRwLockReadGuard<R, T> {
+        self.raw.lock_shared_recursive();
+        // SAFETY: locking guarantee is upheld
+        unsafe { self.read_guard_arc() }
+    }
+
+    /// Attempts to lock this `RwLock` with shared read access, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_read_recursive` method; however, it requires the `RwLock` to be inside
+    /// of an `Arc` and the resulting read guard has no lifetime requirements.   
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_read_recursive_arc(self: &Arc<Self>) -> Option<ArcRwLockReadGuard<R, T>> {
+        if self.raw.try_lock_shared_recursive() {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.read_guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawRwLockRecursiveTimed, T: ?Sized> RwLock<R, T> {
@@ -745,6 +917,36 @@
             None
         }
     }
+
+    /// Attempts to lock this `RwLock` with read access until a timeout is reached, through an `Arc`.
+    ///
+    /// This method is similar to the `try_read_recursive_for` method; however, it requires the `RwLock` to be
+    /// inside of an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_read_arc_recursive_for(self: &Arc<Self>, timeout: R::Duration) -> Option<ArcRwLockReadGuard<R, T>> {
+        if self.raw.try_lock_shared_recursive_for(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.read_guard_arc() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to lock this `RwLock` with read access until a timeout is reached, through an `Arc`.
+    ///
+    /// This method is similar to the `try_read_recursive_until` method; however, it requires the `RwLock` to be
+    /// inside of an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_read_arc_recursive_until(self: &Arc<Self>, timeout: R::Instant) -> Option<ArcRwLockReadGuard<R, T>> {
+        if self.raw.try_lock_shared_recursive_until(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.read_guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawRwLockUpgrade, T: ?Sized> RwLock<R, T> {
@@ -791,6 +993,45 @@
             None
         }
     }
+
+    /// # Safety
+    /// 
+    /// The lock must be held when calling this method.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    unsafe fn upgradable_guard_arc(self: &Arc<Self>) -> ArcRwLockUpgradableReadGuard<R, T> {
+        ArcRwLockUpgradableReadGuard {
+            rwlock: self.clone(),
+            marker: PhantomData 
+        }
+    }
+
+    /// Locks this `RwLock` with upgradable read access, through an `Arc`.
+    /// 
+    /// This method is similar to the `upgradable_read` method; however, it requires the `RwLock` to be
+    /// inside of an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn upgradable_read_arc(self: &Arc<Self>) -> ArcRwLockUpgradableReadGuard<R, T> {
+        self.raw.lock_upgradable();
+        // SAFETY: locking guarantee is upheld
+        unsafe { self.upgradable_guard_arc() }
+    }
+
+    /// Attempts to lock this `RwLock` with upgradable read access, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_upgradable_read` method; however, it requires the `RwLock` to be
+    /// inside of an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_upgradable_read_arc(self: &Arc<Self>) -> Option<ArcRwLockUpgradableReadGuard<R, T>> {
+        if self.raw.try_lock_upgradable() {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.upgradable_guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawRwLockUpgradeTimed, T: ?Sized> RwLock<R, T> {
@@ -831,6 +1072,42 @@
             None
         }
     }
+
+    /// Attempts to lock this `RwLock` with upgradable access until a timeout is reached, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_upgradable_read_for` method; however, it requires the `RwLock` to be
+    /// inside of an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_upgradable_read_arc_for(
+        self: &Arc<Self>,
+        timeout: R::Duration,
+    ) -> Option<ArcRwLockUpgradableReadGuard<R, T>> {
+        if self.raw.try_lock_upgradable_for(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.upgradable_guard_arc() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to lock this `RwLock` with upgradable access until a timeout is reached, through an `Arc`.
+    /// 
+    /// This method is similar to the `try_upgradable_read_until` method; however, it requires the `RwLock` to be
+    /// inside of an `Arc` and the resulting read guard has no lifetime requirements.
+    #[cfg(feature = "arc_lock")]
+    #[inline]
+    pub fn try_upgradable_read_arc_until(
+        self: &Arc<Self>,
+        timeout: R::Instant,
+    ) -> Option<ArcRwLockUpgradableReadGuard<R, T>> {
+        if self.raw.try_lock_upgradable_until(timeout) {
+            // SAFETY: locking guarantee is upheld
+            Some(unsafe { self.upgradable_guard_arc() })
+        } else {
+            None
+        }
+    }
 }
 
 impl<R: RawRwLock, T: ?Sized + Default> Default for RwLock<R, T> {
@@ -1041,6 +1318,122 @@
 #[cfg(feature = "owning_ref")]
 unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress for RwLockReadGuard<'a, R, T> {}
 
+/// An RAII rwlock guard returned by the `Arc` locking operations on `RwLock`. 
+/// 
+/// This is similar to the `RwLockReadGuard` struct, except instead of using a reference to unlock the `RwLock` 
+/// it uses an `Arc<RwLock>`. This has several advantages, most notably that it has an `'static` lifetime.
+#[cfg(feature = "arc_lock")]
+#[must_use = "if unused the RwLock will immediately unlock"]
+pub struct ArcRwLockReadGuard<R: RawRwLock, T: ?Sized> {
+    rwlock: Arc<RwLock<R, T>>,
+    marker: PhantomData<R::GuardMarker>,
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: ?Sized> ArcRwLockReadGuard<R, T> {
+    /// Returns a reference to the rwlock, contained in its `Arc`.
+    pub fn rwlock(s: &Self) -> &Arc<RwLock<R, T>> {
+        &s.rwlock
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// This is functionally identical to the `unlocked` method on [`RwLockReadGuard`].
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: An RwLockReadGuard always holds a shared lock.
+        unsafe {
+            s.rwlock.raw.unlock_shared();
+        }
+        defer!(s.rwlock.raw.lock_shared());
+        f()
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockFair, T: ?Sized> ArcRwLockReadGuard<R, T> {
+    /// Unlocks the `RwLock` using a fair unlock protocol.
+    ///
+    /// This is functionally identical to the `unlock_fair` method on [`RwLockReadGuard`].
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        // Safety: An RwLockReadGuard always holds a shared lock.
+        unsafe {
+            s.rwlock.raw.unlock_shared_fair();
+        }
+
+        // SAFETY: ensure the Arc has its refcount decremented
+        let mut s = ManuallyDrop::new(s);
+        unsafe { ptr::drop_in_place(&mut s.rwlock) };
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// This is functionally identical to the `unlocked_fair` method on [`RwLockReadGuard`].
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: An RwLockReadGuard always holds a shared lock.
+        unsafe {
+            s.rwlock.raw.unlock_shared_fair();
+        }
+        defer!(s.rwlock.raw.lock_shared());
+        f()
+    }
+
+    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
+    ///
+    /// This is functionally identical to the `bump` method on [`RwLockReadGuard`].
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        // Safety: An RwLockReadGuard always holds a shared lock.
+        unsafe {
+            s.rwlock.raw.bump_shared();
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: ?Sized> Deref for ArcRwLockReadGuard<R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.rwlock.data.get() }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: ?Sized> Drop for ArcRwLockReadGuard<R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        // Safety: An RwLockReadGuard always holds a shared lock.
+        unsafe {
+            self.rwlock.raw.unlock_shared();
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: fmt::Debug + ?Sized> fmt::Debug for ArcRwLockReadGuard<R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: fmt::Display + ?Sized> fmt::Display
+    for ArcRwLockReadGuard<R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
 /// RAII structure used to release the exclusive write access of a lock when
 /// dropped.
 #[must_use = "if unused the RwLock will immediately unlock"]
@@ -1262,6 +1655,175 @@
 #[cfg(feature = "owning_ref")]
 unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress for RwLockWriteGuard<'a, R, T> {}
 
+/// An RAII rwlock guard returned by the `Arc` locking operations on `RwLock`. 
+/// This is similar to the `RwLockWriteGuard` struct, except instead of using a reference to unlock the `RwLock` 
+/// it uses an `Arc<RwLock>`. This has several advantages, most notably that it has an `'static` lifetime.
+#[cfg(feature = "arc_lock")]
+#[must_use = "if unused the RwLock will immediately unlock"]
+pub struct ArcRwLockWriteGuard<R: RawRwLock, T: ?Sized> {
+    rwlock: Arc<RwLock<R, T>>,
+    marker: PhantomData<R::GuardMarker>,
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: ?Sized> ArcRwLockWriteGuard<R, T> {
+    /// Returns a reference to the rwlock, contained in its `Arc`.
+    pub fn rwlock(s: &Self) -> &Arc<RwLock<R, T>> {
+        &s.rwlock
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// This is functionally equivalent to the `unlocked` method on [`RwLockWriteGuard`].
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: An RwLockWriteGuard always holds a shared lock.
+        unsafe {
+            s.rwlock.raw.unlock_exclusive();
+        }
+        defer!(s.rwlock.raw.lock_exclusive());
+        f()
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockDowngrade, T: ?Sized> ArcRwLockWriteGuard<R, T> {
+    /// Atomically downgrades a write lock into a read lock without allowing any
+    /// writers to take exclusive access of the lock in the meantime.
+    ///
+    /// This is functionally equivalent to the `downgrade` method on [`RwLockWriteGuard`].
+    pub fn downgrade(s: Self) -> ArcRwLockReadGuard<R, T> {
+        // Safety: An RwLockWriteGuard always holds an exclusive lock.
+        unsafe {
+            s.rwlock.raw.downgrade();
+        }
+
+        // SAFETY: prevent the arc's refcount from changing using ManuallyDrop and ptr::read
+        let s = ManuallyDrop::new(s);
+        let rwlock = unsafe { ptr::read(&s.rwlock) };
+
+        ArcRwLockReadGuard {
+            rwlock,
+            marker: PhantomData,
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgradeDowngrade, T: ?Sized> ArcRwLockWriteGuard<R, T> {
+    /// Atomically downgrades a write lock into an upgradable read lock without allowing any
+    /// writers to take exclusive access of the lock in the meantime.
+    ///
+    /// This is functionally identical to the `downgrade_to_upgradable` method on [`RwLockWriteGuard`].
+    pub fn downgrade_to_upgradable(s: Self) -> ArcRwLockUpgradableReadGuard<R, T> {
+        // Safety: An RwLockWriteGuard always holds an exclusive lock.
+        unsafe {
+            s.rwlock.raw.downgrade_to_upgradable();
+        }
+
+        // SAFETY: same as above
+        let s = ManuallyDrop::new(s);
+        let rwlock = unsafe { ptr::read(&s.rwlock) };
+
+        ArcRwLockUpgradableReadGuard {
+            rwlock,
+            marker: PhantomData,
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockFair, T: ?Sized> ArcRwLockWriteGuard<R, T> {
+    /// Unlocks the `RwLock` using a fair unlock protocol.
+    ///
+    /// This is functionally equivalent to the `unlock_fair` method on [`RwLockWriteGuard`].
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        // Safety: An RwLockWriteGuard always holds an exclusive lock.
+        unsafe {
+            s.rwlock.raw.unlock_exclusive_fair();
+        }
+
+        // SAFETY: prevent the Arc from leaking memory
+        let mut s = ManuallyDrop::new(s);
+        unsafe { ptr::drop_in_place(&mut s.rwlock) };
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// This is functionally equivalent to the `unlocked_fair` method on [`RwLockWriteGuard`].
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: An RwLockWriteGuard always holds an exclusive lock.
+        unsafe {
+            s.rwlock.raw.unlock_exclusive_fair();
+        }
+        defer!(s.rwlock.raw.lock_exclusive());
+        f()
+    }
+
+    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to the `bump` method on [`RwLockWriteGuard`]. 
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        // Safety: An RwLockWriteGuard always holds an exclusive lock.
+        unsafe {
+            s.rwlock.raw.bump_exclusive();
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: ?Sized> Deref for ArcRwLockWriteGuard<R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.rwlock.data.get() }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: ?Sized> DerefMut for ArcRwLockWriteGuard<R, T> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.rwlock.data.get() }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: ?Sized> Drop for ArcRwLockWriteGuard<R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        // Safety: An RwLockWriteGuard always holds an exclusive lock.
+        unsafe {
+            self.rwlock.raw.unlock_exclusive();
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: fmt::Debug + ?Sized> fmt::Debug for ArcRwLockWriteGuard<R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLock, T: fmt::Display + ?Sized> fmt::Display
+    for ArcRwLockWriteGuard<R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
 /// RAII structure used to release the upgradable read access of a lock when
 /// dropped.
 #[must_use = "if unused the RwLock will immediately unlock"]
@@ -1495,6 +2057,241 @@
 {
 }
 
+/// An RAII rwlock guard returned by the `Arc` locking operations on `RwLock`.
+/// This is similar to the `RwLockUpgradableReadGuard` struct, except instead of using a reference to unlock the
+/// `RwLock` it uses an `Arc<RwLock>`. This has several advantages, most notably that it has an `'static` 
+/// lifetime.
+#[cfg(feature = "arc_lock")]
+#[must_use = "if unused the RwLock will immediately unlock"]
+pub struct ArcRwLockUpgradableReadGuard<R: RawRwLockUpgrade, T: ?Sized> {
+    rwlock: Arc<RwLock<R, T>>,
+    marker: PhantomData<R::GuardMarker>,
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgrade , T: ?Sized> ArcRwLockUpgradableReadGuard<R, T> {
+    /// Returns a reference to the rwlock, contained in its original `Arc`.
+    pub fn rwlock(s: &Self) -> &Arc<RwLock<R, T>> {
+        &s.rwlock
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// This is functionally identical to the `unlocked` method on [`RwLockUpgradableReadGuard`].
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        unsafe {
+            s.rwlock.raw.unlock_upgradable();
+        }
+        defer!(s.rwlock.raw.lock_upgradable());
+        f()
+    }
+
+    /// Atomically upgrades an upgradable read lock lock into a exclusive write lock,
+    /// blocking the current thread until it can be acquired.
+    pub fn upgrade(s: Self) -> ArcRwLockWriteGuard<R, T> {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        unsafe {
+            s.rwlock.raw.upgrade();
+        }
+
+        // SAFETY: avoid incrementing or decrementing the refcount using ManuallyDrop and reading the Arc out
+        //         of the struct
+        let s = ManuallyDrop::new(s);
+        let rwlock = unsafe { ptr::read(&s.rwlock) };
+
+        ArcRwLockWriteGuard {
+            rwlock,
+            marker: PhantomData,
+        }
+    }
+
+    /// Tries to atomically upgrade an upgradable read lock into a exclusive write lock.
+    ///
+    /// If the access could not be granted at this time, then the current guard is returned.
+    pub fn try_upgrade(s: Self) -> Result<ArcRwLockWriteGuard<R, T>, Self> {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        if unsafe { s.rwlock.raw.try_upgrade() } {
+            // SAFETY: same as above
+            let s = ManuallyDrop::new(s);
+            let rwlock = unsafe { ptr::read(&s.rwlock) };
+
+            Ok(ArcRwLockWriteGuard {
+                rwlock,
+                marker: PhantomData,
+            })
+        } else {
+            Err(s)
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgradeFair, T: ?Sized> ArcRwLockUpgradableReadGuard<R, T> {
+    /// Unlocks the `RwLock` using a fair unlock protocol.
+    ///
+    /// This is functionally identical to the `unlock_fair` method on [`RwLockUpgradableReadGuard`].
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        unsafe {
+            s.rwlock.raw.unlock_upgradable_fair();
+        }
+
+        // SAFETY: make sure we decrement the refcount properly
+        let mut s = ManuallyDrop::new(s);
+        unsafe { ptr::drop_in_place(&mut s.rwlock) }; 
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// This is functionally equivalent to the `unlocked_fair` method on [`RwLockUpgradableReadGuard`].
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        unsafe {
+            s.rwlock.raw.unlock_upgradable_fair();
+        }
+        defer!(s.rwlock.raw.lock_upgradable());
+        f()
+    }
+
+    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `bump` on [`RwLockUpgradableReadGuard`].
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        unsafe {
+            s.rwlock.raw.bump_upgradable();
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgradeDowngrade, T: ?Sized> ArcRwLockUpgradableReadGuard<R, T> {
+    /// Atomically downgrades an upgradable read lock lock into a shared read lock
+    /// without allowing any writers to take exclusive access of the lock in the
+    /// meantime.
+    ///
+    /// Note that if there are any writers currently waiting to take the lock
+    /// then other readers may not be able to acquire the lock even if it was
+    /// downgraded.
+    pub fn downgrade(s: Self) -> ArcRwLockReadGuard<R, T> {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        unsafe {
+            s.rwlock.raw.downgrade_upgradable();
+        }
+
+        // SAFETY: use ManuallyDrop and ptr::read to ensure the refcount is not changed
+        let s = ManuallyDrop::new(s);
+        let rwlock = unsafe { ptr::read(&s.rwlock) };
+
+        ArcRwLockReadGuard {
+            rwlock,
+            marker: PhantomData,
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgradeTimed, T: ?Sized> ArcRwLockUpgradableReadGuard<R, T> {
+    /// Tries to atomically upgrade an upgradable read lock into a exclusive
+    /// write lock, until a timeout is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// the current guard is returned.
+    pub fn try_upgrade_for(
+        s: Self,
+        timeout: R::Duration,
+    ) -> Result<ArcRwLockWriteGuard<R, T>, Self> {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        if unsafe { s.rwlock.raw.try_upgrade_for(timeout) } {
+            // SAFETY: same as above
+            let s = ManuallyDrop::new(s);
+            let rwlock = unsafe { ptr::read(&s.rwlock) };
+
+            Ok(ArcRwLockWriteGuard {
+                rwlock,
+                marker: PhantomData,
+            })
+        } else {
+            Err(s)
+        }
+    }
+
+    /// Tries to atomically upgrade an upgradable read lock into a exclusive
+    /// write lock, until a timeout is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// the current guard is returned.
+    #[inline]
+    pub fn try_upgrade_until(
+        s: Self,
+        timeout: R::Instant,
+    ) -> Result<ArcRwLockWriteGuard<R, T>, Self> {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        if unsafe { s.rwlock.raw.try_upgrade_until(timeout) } {
+            // SAFETY: same as above
+            let s = ManuallyDrop::new(s);
+            let rwlock = unsafe { ptr::read(&s.rwlock) };
+
+            Ok(ArcRwLockWriteGuard {
+                rwlock,
+                marker: PhantomData,
+            })
+        } else {
+            Err(s)
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgrade, T: ?Sized> Deref for ArcRwLockUpgradableReadGuard<R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.rwlock.data.get() }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgrade, T: ?Sized> Drop for ArcRwLockUpgradableReadGuard<R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        // Safety: An RwLockUpgradableReadGuard always holds an upgradable lock.
+        unsafe {
+            self.rwlock.raw.unlock_upgradable();
+        }
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgrade, T: fmt::Debug + ?Sized> fmt::Debug
+    for ArcRwLockUpgradableReadGuard<R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+#[cfg(feature = "arc_lock")]
+impl<R: RawRwLockUpgrade, T: fmt::Display + ?Sized> fmt::Display
+    for ArcRwLockUpgradableReadGuard<R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+
 /// An RAII read lock guard returned by `RwLockReadGuard::map`, which can point to a
 /// subfield of the protected data.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/benches/value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/benches/value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/benches/value.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/benches/value.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+#![cfg(feature = "kv_unstable")]
+#![feature(test)]
+
+extern crate log;
+extern crate test;
+
+use log::kv::Value;
+
+#[bench]
+fn u8_to_value(b: &mut test::Bencher) {
+    b.iter(|| Value::from(1u8))
+}
+
+#[bench]
+fn u8_to_value_debug(b: &mut test::Bencher) {
+    b.iter(|| Value::from_debug(&1u8))
+}
+
+#[bench]
+fn str_to_value_debug(b: &mut test::Bencher) {
+    b.iter(|| Value::from_debug(&"a string"))
+}
+
+#[bench]
+fn custom_to_value_debug(b: &mut test::Bencher) {
+    #[derive(Debug)]
+    struct A;
+
+    b.iter(|| Value::from_debug(&A))
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,13 +2,42 @@
 //! atomics and sets `cfg` flags accordingly.
 
 use std::env;
+use std::str;
 
 fn main() {
-    let target = env::var("TARGET").unwrap();
+    let target = match rustc_target() {
+        Some(target) => target,
+        None => return,
+    };
 
-    if !target.starts_with("thumbv6") {
+    if target_has_atomic_cas(&target) {
         println!("cargo:rustc-cfg=atomic_cas");
     }
 
+    if target_has_atomics(&target) {
+        println!("cargo:rustc-cfg=has_atomics");
+    }
+
     println!("cargo:rerun-if-changed=build.rs");
 }
+
+fn target_has_atomic_cas(target: &str) -> bool {
+    match &target[..] {
+        "thumbv6m-none-eabi"
+        | "msp430-none-elf"
+        | "riscv32i-unknown-none-elf"
+        | "riscv32imc-unknown-none-elf" => false,
+        _ => true,
+    }
+}
+
+fn target_has_atomics(target: &str) -> bool {
+    match &target[..] {
+        "msp430-none-elf" | "riscv32i-unknown-none-elf" | "riscv32imc-unknown-none-elf" => false,
+        _ => true,
+    }
+}
+
+fn rustc_target() -> Option<String> {
+    env::var("TARGET").ok()
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"6bfd384195d8e9c46af91ae2a1fdd1c591abd0c972ccd06458218dcde1203450","Cargo.toml":"469ba284ed309c18436265d65d1c7e457a3049c8f36d19b0fce656f12b01be6f","LICENSE-APACHE":"7cfd738c53d61c79f07e348f622bf7707c9084237054d37fbe07788a75f5881c","LICENSE-MIT":"705aaaaecefa087c187bd2eacdb01b8ac1c5ee95b1d5d04d8d7efe0363207df8","README.md":"ca758a44f4a226f21b3bc997d27a5356b5e77ee13a1daad24ee8bbbebb301c5d","build.rs":"dcfc572577b8e4284562d25e918911f4f9d74eb2c1cec6d07ee69930e3ee2dd5","src/kv/error.rs":"ba46a4bcac717e6dc58fc5101833c825d7b95777c1dd907be46c8fa573a27d2d","src/kv/key.rs":"d51bda7b2f044b88bcb7ae931832ac4ad41a9dd57c0cacd9194bda36515ee282","src/kv/mod.rs":"c52735bf5f0af0941f5ad33b27591eaaccfd37e95b5988b2c1286c4c7b37b4fb","src/kv/source.rs":"7d71d5986bedd9fe89fbf27ba32f4f7e26450147b44aa61cbc0a14bb4c97821e","src/kv/value/fill.rs":"36d278d8ce276106d15a2f1577284b17be63a9206997196a7b4fe40d853dfd24","src/kv/value/impls.rs":"32e0f5a71555b93537bd1ce478f60edc7c9f061769781f2d1e78d6bf7735645d","src/kv/value/internal/cast.rs":"8ba168778a20a5f94910e7921d4c5779dd45c0abdb78d57e25524e5a80368fca","src/kv/value/internal/fmt.rs":"7529e1969b077b0e1d1f54ed8ed393e51553404344202bccad52121f49616ee0","src/kv/value/internal/mod.rs":"a86190763dd30dedf6197b5f2c79f6ff607f6b540119cf7cef0d2a5c3796f2e5","src/kv/value/internal/sval.rs":"602770bb9dcdb67cd89495999079f66b814e5c489c626ab123ba3892e868b5c8","src/kv/value/mod.rs":"79bebb51f6a66a6e599e1c38938f9deb327d256e9d755ee95d79bdae03c117ea","src/kv/value/test.rs":"0d882f045fd5d989ac56ddb6a44ef12dae238452373c41578785af7da590f257","src/lib.rs":"1e54bf3628310b6a8543cedd3138e9bebe19a2798560dcacfab9027428e17a0c","src/macros.rs":"eeb0758b8d1d712d2e4d143612fe866c74c988c502d58bc4d4c86b25f4de2ca6","src/serde.rs":"4423fb062f6f63cf53c8161645feaef17154ce435bddd211b19b87c4ddd9e565","tests/filters.rs":"c31150132042e0263e9d26b4a7d56dad67dd449e54a5ed135a4432646e98ee2a","tests/macros.rs":"5b9cd4041b9e23ac06ba7ead57c60105c1e69bb55e0e3557b11994d865b6d438","triagebot.toml":"2d1d46d069bc4e3739069676707ca2801e0e0ba58a784a264392362ff9ac4a77"},"package":"4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"5fa3f03a8dfa3934f5b1cfba9a41781700ed6e67afe0f10717cc16b6855ceb16","Cargo.toml":"2863cdd3382ede73ecc608ad22a4d8ee476abed3b0016f9724deba59e9317338","LICENSE-APACHE":"7cfd738c53d61c79f07e348f622bf7707c9084237054d37fbe07788a75f5881c","LICENSE-MIT":"705aaaaecefa087c187bd2eacdb01b8ac1c5ee95b1d5d04d8d7efe0363207df8","README.md":"ca758a44f4a226f21b3bc997d27a5356b5e77ee13a1daad24ee8bbbebb301c5d","benches/value.rs":"55bd5f795a524f0699b2858eb14cc456abebeb43d50c90d2bfc77cd7856e8050","build.rs":"2bfb7564209da7c4d10433d9639d33541a89d63fc52cbe47d479a967cf746769","src/kv/error.rs":"ba46a4bcac717e6dc58fc5101833c825d7b95777c1dd907be46c8fa573a27d2d","src/kv/key.rs":"e74b489cde28960f76d4038b02867b4cb724c206d31abd461abeaa04e73cf7ef","src/kv/mod.rs":"9d916f43fd9c2829991fcff6db32f23bb7864e1113a622d49e59f110e2f290cf","src/kv/source.rs":"3f7aadc5f30c0c821fd20d899d8529eba8088eeda0c8603814de689da25dd4e8","src/kv/value.rs":"4d46ced0adbe385701c1d80d03c0f2abde2e43acf16521a9d26f058462f43799","src/lib.rs":"320a18401e7f9edc812a52b5be029fb9ef8c6d7435ab7b52650878477d21103b","src/macros.rs":"b0174b17f5e06b6a7bafb7873c79c7f8e2c70a531686adf03c027739ee040a44","src/serde.rs":"d8190561ed64398fe45142b261000255ea1bcda8707e6f1b07ef4b805da6829b","triagebot.toml":"2d1d46d069bc4e3739069676707ca2801e0e0ba58a784a264392362ff9ac4a77"},"package":"51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 authors = ["The Rust Project Developers"]
 build = "build.rs"
 exclude = ["rfcs/**/*", "/.travis.yml", "/appveyor.yml"]
@@ -24,17 +24,19 @@
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/log"
 [package.metadata.docs.rs]
-features = ["std", "serde", "kv_unstable_sval"]
+features = ["std", "serde", "kv_unstable_std", "kv_unstable_sval", "kv_unstable_serde"]
 
 [[test]]
 name = "filters"
+path = "tests/filters.rs"
 harness = false
 
 [[test]]
 name = "macros"
+path = "tests/macros.rs"
 harness = true
 [dependencies.cfg-if]
-version = "0.1.2"
+version = "1.0"
 
 [dependencies.serde]
 version = "1.0"
@@ -42,19 +44,34 @@
 default-features = false
 
 [dependencies.sval]
-version = "0.5.2"
+version = "1.0.0-alpha.5"
+optional = true
+default-features = false
+
+[dependencies.value-bag]
+version = "1.0.0-alpha.6"
 optional = true
 default-features = false
+[dev-dependencies.serde]
+version = "1.0"
+features = ["derive"]
+
 [dev-dependencies.serde_test]
 version = "1.0"
 
 [dev-dependencies.sval]
-version = "0.5.2"
+version = "1.0.0-alpha.5"
+features = ["derive"]
+
+[dev-dependencies.value-bag]
+version = "1.0.0-alpha.6"
 features = ["test"]
 
 [features]
-kv_unstable = []
-kv_unstable_sval = ["kv_unstable", "sval/fmt"]
+kv_unstable = ["value-bag"]
+kv_unstable_serde = ["kv_unstable_std", "value-bag/serde", "serde"]
+kv_unstable_std = ["std", "kv_unstable", "value-bag/error"]
+kv_unstable_sval = ["kv_unstable", "value-bag/sval", "sval"]
 max_level_debug = []
 max_level_error = []
 max_level_info = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,32 @@
 
 ## [Unreleased]
 
+## [0.4.14] - 2021-01-27
+
+* Remove the `__private_api_log_lit` special case.
+* Fixed incorrect combination of `kv_unstable` and `std` features causing compile failures.
+* Remove unstable `Value::to_*` conversions that were incorrectly using `as`.
+* Rename unstable `Value::to_error` to `Value::to_borrowed_error`.
+
+## [0.4.13] - 2021-01-11
+
+* This is the same as `0.4.11`, except with a `kv_unstable_std` feature added to aid migrating current dependents to `0.4.14` (which was originally going to be `0.4.13` until it was decided to create a patch from `0.4.11` to minimize disruption).
+
+## [0.4.12] - 2020-12-24
+
+### New
+
+* Support platforms without atomics by racing instead of failing to compile
+* Implement `Log` for `Box<T: Log>`
+* Update `cfg-if` to `1.0`
+* Internal reworks of the structured logging API. Removed the `Fill` API
+and added `source::as_map` and `source::as_list` to easily serialize a `Source`
+as either a map of `{key: value, ..}` or as a list of `[(key, value), ..]`.
+
+### Fixed
+
+* Fixed deserialization of `LevelFilter` to use their `u64` index variants
+
 ## [0.4.11] - 2020-07-09
 
 ### New
@@ -170,7 +196,10 @@
 
 Look at the [release tags] for information about older releases.
 
-[Unreleased]: https://github.com/rust-lang-nursery/log/compare/0.4.11...HEAD
+[Unreleased]: https://github.com/rust-lang-nursery/log/compare/0.4.14...HEAD
+[0.4.14]: https://github.com/rust-lang-nursery/log/compare/0.4.13...0.4.14
+[0.4.13]: https://github.com/rust-lang-nursery/log/compare/0.4.11...0.4.13
+[0.4.12]: https://github.com/rust-lang-nursery/log/compare/0.4.11...0.4.12
 [0.4.11]: https://github.com/rust-lang-nursery/log/compare/0.4.10...0.4.11
 [0.4.10]: https://github.com/rust-lang-nursery/log/compare/0.4.9...0.4.10
 [0.4.9]: https://github.com/rust-lang-nursery/log/compare/0.4.8...0.4.9
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/key.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/key.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/key.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/key.rs	2021-12-09 12:01:26.000000000 +0000
@@ -128,6 +128,39 @@
     }
 }
 
+#[cfg(feature = "kv_unstable_sval")]
+mod sval_support {
+    use super::*;
+
+    extern crate sval;
+
+    use self::sval::value::{self, Value};
+
+    impl<'a> Value for Key<'a> {
+        fn stream(&self, stream: &mut value::Stream) -> value::Result {
+            self.key.stream(stream)
+        }
+    }
+}
+
+#[cfg(feature = "kv_unstable_serde")]
+mod serde_support {
+    use super::*;
+
+    extern crate serde;
+
+    use self::serde::{Serialize, Serializer};
+
+    impl<'a> Serialize for Key<'a> {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            self.key.serialize(serializer)
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,7 @@
 
 mod error;
 mod key;
-mod source;
+pub mod source;
 
 pub mod value;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/source.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/source.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/source.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/source.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,11 @@
 //! Sources for key-value pairs.
 
+#[cfg(feature = "kv_unstable_sval")]
+extern crate sval;
+
+#[cfg(feature = "kv_unstable_serde")]
+extern crate serde;
+
 use kv::{Error, Key, ToKey, ToValue, Value};
 use std::fmt;
 
@@ -30,28 +36,14 @@
     ///
     /// A source that can provide a more efficient implementation of this method
     /// should override it.
+    #[cfg(not(test))]
     fn get<'v>(&'v self, key: Key) -> Option<Value<'v>> {
-        struct Get<'k, 'v> {
-            key: Key<'k>,
-            found: Option<Value<'v>>,
-        }
-
-        impl<'k, 'kvs> Visitor<'kvs> for Get<'k, 'kvs> {
-            fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error> {
-                if self.key == key {
-                    self.found = Some(value);
-                }
-
-                Ok(())
-            }
-        }
-
-        let mut get = Get { key, found: None };
-
-        let _ = self.visit(&mut get);
-        get.found
+        get_default(self, key)
     }
 
+    #[cfg(test)]
+    fn get<'v>(&'v self, key: Key) -> Option<Value<'v>>;
+
     /// Count the number of key-value pairs that can be visited.
     ///
     /// # Implementation notes
@@ -61,21 +53,53 @@
     ///
     /// A subsequent call to `visit` should yield the same number of key-value pairs
     /// to the visitor, unless that visitor fails part way through.
+    #[cfg(not(test))]
     fn count(&self) -> usize {
-        struct Count(usize);
+        count_default(self)
+    }
 
-        impl<'kvs> Visitor<'kvs> for Count {
-            fn visit_pair(&mut self, _: Key<'kvs>, _: Value<'kvs>) -> Result<(), Error> {
-                self.0 += 1;
+    #[cfg(test)]
+    fn count(&self) -> usize;
+}
+
+/// The default implemention of `Source::get`
+pub(crate) fn get_default<'v>(source: &'v (impl Source + ?Sized), key: Key) -> Option<Value<'v>> {
+    struct Get<'k, 'v> {
+        key: Key<'k>,
+        found: Option<Value<'v>>,
+    }
 
-                Ok(())
+    impl<'k, 'kvs> Visitor<'kvs> for Get<'k, 'kvs> {
+        fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error> {
+            if self.key == key {
+                self.found = Some(value);
             }
+
+            Ok(())
         }
+    }
+
+    let mut get = Get { key, found: None };
+
+    let _ = source.visit(&mut get);
+    get.found
+}
+
+/// The default implementation of `Source::count`.
+pub(crate) fn count_default(source: impl Source) -> usize {
+    struct Count(usize);
 
-        let mut count = Count(0);
-        let _ = self.visit(&mut count);
-        count.0
+    impl<'kvs> Visitor<'kvs> for Count {
+        fn visit_pair(&mut self, _: Key<'kvs>, _: Value<'kvs>) -> Result<(), Error> {
+            self.0 += 1;
+
+            Ok(())
+        }
     }
+
+    let mut count = Count(0);
+    let _ = source.visit(&mut count);
+    count.0
 }
 
 impl<'a, T> Source for &'a T
@@ -129,6 +153,16 @@
         Ok(())
     }
 
+    fn get<'v>(&'v self, key: Key) -> Option<Value<'v>> {
+        for source in self {
+            if let Some(found) = source.get(key.clone()) {
+                return Some(found);
+            }
+        }
+
+        None
+    }
+
     fn count(&self) -> usize {
         self.len()
     }
@@ -146,6 +180,10 @@
         Ok(())
     }
 
+    fn get<'v>(&'v self, key: Key) -> Option<Value<'v>> {
+        self.as_ref().and_then(|s| s.get(key))
+    }
+
     fn count(&self) -> usize {
         self.as_ref().map(Source::count).unwrap_or(0)
     }
@@ -291,7 +329,7 @@
     #[cfg(test)]
     mod tests {
         use super::*;
-        use kv::value::test::Token;
+        use kv::value::tests::Token;
         use std::collections::{BTreeMap, HashMap};
 
         #[test]
@@ -340,10 +378,313 @@
     }
 }
 
+/// The result of calling `Source::as_map`.
+pub struct AsMap<S>(S);
+
+/// Visit this source as a map.
+pub fn as_map<S>(source: S) -> AsMap<S>
+where
+    S: Source,
+{
+    AsMap(source)
+}
+
+impl<S> Source for AsMap<S>
+where
+    S: Source,
+{
+    fn visit<'kvs>(&'kvs self, visitor: &mut dyn Visitor<'kvs>) -> Result<(), Error> {
+        self.0.visit(visitor)
+    }
+
+    fn get<'v>(&'v self, key: Key) -> Option<Value<'v>> {
+        self.0.get(key)
+    }
+
+    fn count(&self) -> usize {
+        self.0.count()
+    }
+}
+
+impl<S> fmt::Debug for AsMap<S>
+where
+    S: Source,
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let mut f = f.debug_map();
+        self.0.visit(&mut f).map_err(|_| fmt::Error)?;
+        f.finish()
+    }
+}
+
+/// The result of calling `Source::as_list`
+pub struct AsList<S>(S);
+
+/// Visit this source as a list.
+pub fn as_list<S>(source: S) -> AsList<S>
+where
+    S: Source,
+{
+    AsList(source)
+}
+
+impl<S> Source for AsList<S>
+where
+    S: Source,
+{
+    fn visit<'kvs>(&'kvs self, visitor: &mut dyn Visitor<'kvs>) -> Result<(), Error> {
+        self.0.visit(visitor)
+    }
+
+    fn get<'v>(&'v self, key: Key) -> Option<Value<'v>> {
+        self.0.get(key)
+    }
+
+    fn count(&self) -> usize {
+        self.0.count()
+    }
+}
+
+impl<S> fmt::Debug for AsList<S>
+where
+    S: Source,
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let mut f = f.debug_list();
+        self.0.visit(&mut f).map_err(|_| fmt::Error)?;
+        f.finish()
+    }
+}
+
+#[cfg(feature = "kv_unstable_sval")]
+mod sval_support {
+    use super::*;
+
+    use self::sval::value;
+
+    impl<S> value::Value for AsMap<S>
+    where
+        S: Source,
+    {
+        fn stream(&self, stream: &mut value::Stream) -> value::Result {
+            struct StreamVisitor<'a, 'b>(&'a mut value::Stream<'b>);
+
+            impl<'a, 'b, 'kvs> Visitor<'kvs> for StreamVisitor<'a, 'b> {
+                fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error> {
+                    self.0
+                        .map_key(key)
+                        .map_err(|_| Error::msg("failed to stream map key"))?;
+                    self.0
+                        .map_value(value)
+                        .map_err(|_| Error::msg("failed to stream map value"))?;
+                    Ok(())
+                }
+            }
+
+            stream
+                .map_begin(Some(self.count()))
+                .map_err(|_| self::sval::Error::msg("failed to begin map"))?;
+
+            self.visit(&mut StreamVisitor(stream))
+                .map_err(|_| self::sval::Error::msg("failed to visit key-values"))?;
+
+            stream
+                .map_end()
+                .map_err(|_| self::sval::Error::msg("failed to end map"))
+        }
+    }
+
+    impl<S> value::Value for AsList<S>
+    where
+        S: Source,
+    {
+        fn stream(&self, stream: &mut value::Stream) -> value::Result {
+            struct StreamVisitor<'a, 'b>(&'a mut value::Stream<'b>);
+
+            impl<'a, 'b, 'kvs> Visitor<'kvs> for StreamVisitor<'a, 'b> {
+                fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error> {
+                    self.0
+                        .seq_elem((key, value))
+                        .map_err(|_| Error::msg("failed to stream seq entry"))?;
+                    Ok(())
+                }
+            }
+
+            stream
+                .seq_begin(Some(self.count()))
+                .map_err(|_| self::sval::Error::msg("failed to begin seq"))?;
+
+            self.visit(&mut StreamVisitor(stream))
+                .map_err(|_| self::sval::Error::msg("failed to visit key-values"))?;
+
+            stream
+                .seq_end()
+                .map_err(|_| self::sval::Error::msg("failed to end seq"))
+        }
+    }
+
+    #[cfg(test)]
+    mod tests {
+        use super::*;
+
+        use self::sval::Value;
+
+        use crate::kv::source;
+
+        #[test]
+        fn derive_stream() {
+            #[derive(Value)]
+            pub struct MyRecordAsMap<'a> {
+                msg: &'a str,
+                kvs: source::AsMap<&'a dyn Source>,
+            }
+
+            #[derive(Value)]
+            pub struct MyRecordAsList<'a> {
+                msg: &'a str,
+                kvs: source::AsList<&'a dyn Source>,
+            }
+        }
+    }
+}
+
+#[cfg(feature = "kv_unstable_serde")]
+pub mod as_map {
+    //! `serde` adapters for serializing a `Source` as a map.
+
+    use super::*;
+
+    use self::serde::{Serialize, Serializer};
+
+    /// Serialize a `Source` as a map.
+    pub fn serialize<T, S>(source: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: Source,
+        S: Serializer,
+    {
+        as_map(source).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "kv_unstable_serde")]
+pub mod as_list {
+    //! `serde` adapters for serializing a `Source` as a list.
+
+    use super::*;
+
+    use self::serde::{Serialize, Serializer};
+
+    /// Serialize a `Source` as a list.
+    pub fn serialize<T, S>(source: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: Source,
+        S: Serializer,
+    {
+        as_list(source).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "kv_unstable_serde")]
+mod serde_support {
+    use super::*;
+
+    use self::serde::ser::{Error as SerError, Serialize, SerializeMap, SerializeSeq, Serializer};
+
+    impl<T> Serialize for AsMap<T>
+    where
+        T: Source,
+    {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            struct SerializerVisitor<'a, S>(&'a mut S);
+
+            impl<'a, 'kvs, S> Visitor<'kvs> for SerializerVisitor<'a, S>
+            where
+                S: SerializeMap,
+            {
+                fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error> {
+                    self.0
+                        .serialize_entry(&key, &value)
+                        .map_err(|_| Error::msg("failed to serialize map entry"))?;
+                    Ok(())
+                }
+            }
+
+            let mut map = serializer.serialize_map(Some(self.count()))?;
+
+            self.visit(&mut SerializerVisitor(&mut map))
+                .map_err(|_| S::Error::custom("failed to visit key-values"))?;
+
+            map.end()
+        }
+    }
+
+    impl<T> Serialize for AsList<T>
+    where
+        T: Source,
+    {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            struct SerializerVisitor<'a, S>(&'a mut S);
+
+            impl<'a, 'kvs, S> Visitor<'kvs> for SerializerVisitor<'a, S>
+            where
+                S: SerializeSeq,
+            {
+                fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error> {
+                    self.0
+                        .serialize_element(&(key, value))
+                        .map_err(|_| Error::msg("failed to serialize seq entry"))?;
+                    Ok(())
+                }
+            }
+
+            let mut seq = serializer.serialize_seq(Some(self.count()))?;
+
+            self.visit(&mut SerializerVisitor(&mut seq))
+                .map_err(|_| S::Error::custom("failed to visit seq"))?;
+
+            seq.end()
+        }
+    }
+
+    #[cfg(test)]
+    mod tests {
+        use super::*;
+
+        use self::serde::Serialize;
+
+        use crate::kv::source;
+
+        #[test]
+        fn derive_serialize() {
+            #[derive(Serialize)]
+            pub struct MyRecordAsMap<'a> {
+                msg: &'a str,
+                #[serde(flatten)]
+                #[serde(with = "source::as_map")]
+                kvs: &'a dyn Source,
+            }
+
+            #[derive(Serialize)]
+            pub struct MyRecordAsList<'a> {
+                msg: &'a str,
+                #[serde(flatten)]
+                #[serde(with = "source::as_list")]
+                kvs: &'a dyn Source,
+            }
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
-    use kv::value::test::Token;
+    use kv::value::tests::Token;
 
     #[test]
     fn source_is_object_safe() {
@@ -366,6 +707,14 @@
             fn visit<'kvs>(&'kvs self, visitor: &mut dyn Visitor<'kvs>) -> Result<(), Error> {
                 visitor.visit_pair(self.key.to_key(), self.value.to_value())
             }
+
+            fn get<'v>(&'v self, key: Key) -> Option<Value<'v>> {
+                get_default(self, key)
+            }
+
+            fn count(&self) -> usize {
+                count_default(self)
+            }
         }
 
         assert_eq!(1, Source::count(&("a", 1)));
@@ -390,4 +739,16 @@
         let source = Option::None::<(&str, i32)>;
         assert!(Source::get(&source, Key::from_str("a")).is_none());
     }
+
+    #[test]
+    fn as_map() {
+        let _ = crate::kv::source::as_map(("a", 1));
+        let _ = crate::kv::source::as_map(&("a", 1) as &dyn Source);
+    }
+
+    #[test]
+    fn as_list() {
+        let _ = crate::kv::source::as_list(("a", 1));
+        let _ = crate::kv::source::as_list(&("a", 1) as &dyn Source);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/fill.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/fill.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/fill.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/fill.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-//! Lazy value initialization.
-
-use std::fmt;
-
-use super::internal::{Erased, Inner, Visitor};
-use super::{Error, Value};
-
-impl<'v> Value<'v> {
-    /// Get a value from a fillable slot.
-    pub fn from_fill<T>(value: &'v T) -> Self
-    where
-        T: Fill + 'static,
-    {
-        Value {
-            inner: Inner::Fill(unsafe { Erased::new_unchecked::<T>(value) }),
-        }
-    }
-}
-
-/// A type that requires extra work to convert into a [`Value`](struct.Value.html).
-///
-/// This trait is a more advanced initialization API than [`ToValue`](trait.ToValue.html).
-/// It's intended for erased values coming from other logging frameworks that may need
-/// to perform extra work to determine the concrete type to use.
-pub trait Fill {
-    /// Fill a value.
-    fn fill(&self, slot: &mut Slot) -> Result<(), Error>;
-}
-
-impl<'a, T> Fill for &'a T
-where
-    T: Fill + ?Sized,
-{
-    fn fill(&self, slot: &mut Slot) -> Result<(), Error> {
-        (**self).fill(slot)
-    }
-}
-
-/// A value slot to fill using the [`Fill`](trait.Fill.html) trait.
-pub struct Slot<'s, 'f> {
-    filled: bool,
-    visitor: &'s mut dyn Visitor<'f>,
-}
-
-impl<'s, 'f> fmt::Debug for Slot<'s, 'f> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Slot").finish()
-    }
-}
-
-impl<'s, 'f> Slot<'s, 'f> {
-    pub(super) fn new(visitor: &'s mut dyn Visitor<'f>) -> Self {
-        Slot {
-            visitor,
-            filled: false,
-        }
-    }
-
-    pub(super) fn fill<F>(&mut self, f: F) -> Result<(), Error>
-    where
-        F: FnOnce(&mut dyn Visitor<'f>) -> Result<(), Error>,
-    {
-        assert!(!self.filled, "the slot has already been filled");
-        self.filled = true;
-
-        f(self.visitor)
-    }
-
-    /// Fill the slot with a value.
-    ///
-    /// The given value doesn't need to satisfy any particular lifetime constraints.
-    ///
-    /// # Panics
-    ///
-    /// Calling more than a single `fill` method on this slot will panic.
-    pub fn fill_any<T>(&mut self, value: T) -> Result<(), Error>
-    where
-        T: Into<Value<'f>>,
-    {
-        self.fill(|visitor| value.into().inner.visit(visitor))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn fill_value_borrowed() {
-        struct TestFill;
-
-        impl Fill for TestFill {
-            fn fill(&self, slot: &mut Slot) -> Result<(), Error> {
-                let dbg: &dyn fmt::Debug = &1;
-
-                slot.fill_debug(&dbg)
-            }
-        }
-
-        assert_eq!("1", Value::from_fill(&TestFill).to_string());
-    }
-
-    #[test]
-    fn fill_value_owned() {
-        struct TestFill;
-
-        impl Fill for TestFill {
-            fn fill(&self, slot: &mut Slot) -> Result<(), Error> {
-                slot.fill_any("a string")
-            }
-        }
-    }
-
-    #[test]
-    #[should_panic]
-    fn fill_multiple_times_panics() {
-        struct BadFill;
-
-        impl Fill for BadFill {
-            fn fill(&self, slot: &mut Slot) -> Result<(), Error> {
-                slot.fill_any(42)?;
-                slot.fill_any(6789)?;
-
-                Ok(())
-            }
-        }
-
-        let _ = Value::from_fill(&BadFill).to_string();
-    }
-
-    #[test]
-    fn fill_cast() {
-        struct TestFill;
-
-        impl Fill for TestFill {
-            fn fill(&self, slot: &mut Slot) -> Result<(), Error> {
-                slot.fill_any("a string")
-            }
-        }
-
-        assert_eq!(
-            "a string",
-            Value::from_fill(&TestFill)
-                .to_borrowed_str()
-                .expect("invalid value")
-        );
-    }
-
-    #[test]
-    fn fill_debug() {
-        struct TestFill;
-
-        impl Fill for TestFill {
-            fn fill(&self, slot: &mut Slot) -> Result<(), Error> {
-                slot.fill_any(42u64)
-            }
-        }
-
-        assert_eq!(
-            format!("{:04?}", 42u64),
-            format!("{:04?}", Value::from_fill(&TestFill)),
-        )
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/impls.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,159 +0,0 @@
-//! Converting standard types into `Value`s.
-//!
-//! This module provides `ToValue` implementations for commonly
-//! logged types from the standard library.
-
-use std::fmt;
-
-use super::{Primitive, ToValue, Value};
-
-macro_rules! impl_into_owned {
-    ($($into_ty:ty => $convert:ident,)*) => {
-        $(
-            impl ToValue for $into_ty {
-                fn to_value(&self) -> Value {
-                    Value::from(*self)
-                }
-            }
-
-            impl<'v> From<$into_ty> for Value<'v> {
-                fn from(value: $into_ty) -> Self {
-                    Value::from_primitive(value as $convert)
-                }
-            }
-        )*
-    };
-}
-
-impl<'v> ToValue for &'v str {
-    fn to_value(&self) -> Value {
-        Value::from(*self)
-    }
-}
-
-impl<'v> From<&'v str> for Value<'v> {
-    fn from(value: &'v str) -> Self {
-        Value::from_primitive(value)
-    }
-}
-
-impl<'v> ToValue for fmt::Arguments<'v> {
-    fn to_value(&self) -> Value {
-        Value::from(*self)
-    }
-}
-
-impl<'v> From<fmt::Arguments<'v>> for Value<'v> {
-    fn from(value: fmt::Arguments<'v>) -> Self {
-        Value::from_primitive(value)
-    }
-}
-
-impl ToValue for () {
-    fn to_value(&self) -> Value {
-        Value::from_primitive(Primitive::None)
-    }
-}
-
-impl<T> ToValue for Option<T>
-where
-    T: ToValue,
-{
-    fn to_value(&self) -> Value {
-        match *self {
-            Some(ref value) => value.to_value(),
-            None => Value::from_primitive(Primitive::None),
-        }
-    }
-}
-
-impl_into_owned! [
-    usize => u64,
-    u8 => u64,
-    u16 => u64,
-    u32 => u64,
-    u64 => u64,
-
-    isize => i64,
-    i8 => i64,
-    i16 => i64,
-    i32 => i64,
-    i64 => i64,
-
-    f32 => f64,
-    f64 => f64,
-
-    char => char,
-    bool => bool,
-];
-
-#[cfg(feature = "std")]
-mod std_support {
-    use super::*;
-
-    use std::borrow::Cow;
-
-    impl<T> ToValue for Box<T>
-    where
-        T: ToValue + ?Sized,
-    {
-        fn to_value(&self) -> Value {
-            (**self).to_value()
-        }
-    }
-
-    impl ToValue for String {
-        fn to_value(&self) -> Value {
-            Value::from_primitive(Primitive::Str(&*self))
-        }
-    }
-
-    impl<'v> ToValue for Cow<'v, str> {
-        fn to_value(&self) -> Value {
-            Value::from_primitive(Primitive::Str(&*self))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use kv::value::test::Token;
-
-    #[test]
-    fn test_to_value_display() {
-        assert_eq!(42u64.to_value().to_string(), "42");
-        assert_eq!(42i64.to_value().to_string(), "42");
-        assert_eq!(42.01f64.to_value().to_string(), "42.01");
-        assert_eq!(true.to_value().to_string(), "true");
-        assert_eq!('a'.to_value().to_string(), "a");
-        assert_eq!(
-            format_args!("a {}", "value").to_value().to_string(),
-            "a value"
-        );
-        assert_eq!("a loong string".to_value().to_string(), "a loong string");
-        assert_eq!(Some(true).to_value().to_string(), "true");
-        assert_eq!(().to_value().to_string(), "None");
-        assert_eq!(Option::None::<bool>.to_value().to_string(), "None");
-    }
-
-    #[test]
-    fn test_to_value_structured() {
-        assert_eq!(42u64.to_value().to_token(), Token::U64(42));
-        assert_eq!(42i64.to_value().to_token(), Token::I64(42));
-        assert_eq!(42.01f64.to_value().to_token(), Token::F64(42.01));
-        assert_eq!(true.to_value().to_token(), Token::Bool(true));
-        assert_eq!('a'.to_value().to_token(), Token::Char('a'));
-        assert_eq!(
-            format_args!("a {}", "value").to_value().to_token(),
-            Token::Str("a value".into())
-        );
-        assert_eq!(
-            "a loong string".to_value().to_token(),
-            Token::Str("a loong string".into())
-        );
-        assert_eq!(Some(true).to_value().to_token(), Token::Bool(true));
-        assert_eq!(().to_value().to_token(), Token::None);
-        assert_eq!(Option::None::<bool>.to_value().to_token(), Token::None);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/internal/cast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/internal/cast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/internal/cast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/internal/cast.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,475 +0,0 @@
-//! Coerce a `Value` into some concrete types.
-//!
-//! These operations are cheap when the captured value is a simple primitive,
-//! but may end up executing arbitrary caller code if the value is complex.
-//! They will also attempt to downcast erased types into a primitive where possible.
-
-use std::any::TypeId;
-use std::fmt;
-
-use super::{Erased, Inner, Primitive, Visitor};
-use crate::kv::value::{Error, Value};
-
-impl<'v> Value<'v> {
-    /// Try get a `usize` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_usize(&self) -> Option<usize> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_u64()
-            .map(|v| v as usize)
-    }
-
-    /// Try get a `u8` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_u8(&self) -> Option<u8> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_u64()
-            .map(|v| v as u8)
-    }
-
-    /// Try get a `u16` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_u16(&self) -> Option<u16> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_u64()
-            .map(|v| v as u16)
-    }
-
-    /// Try get a `u32` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_u32(&self) -> Option<u32> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_u64()
-            .map(|v| v as u32)
-    }
-
-    /// Try get a `u64` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_u64(&self) -> Option<u64> {
-        self.inner.cast().into_primitive().into_u64()
-    }
-
-    /// Try get a `isize` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_isize(&self) -> Option<isize> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_i64()
-            .map(|v| v as isize)
-    }
-
-    /// Try get a `i8` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_i8(&self) -> Option<i8> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_i64()
-            .map(|v| v as i8)
-    }
-
-    /// Try get a `i16` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_i16(&self) -> Option<i16> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_i64()
-            .map(|v| v as i16)
-    }
-
-    /// Try get a `i32` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_i32(&self) -> Option<i32> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_i64()
-            .map(|v| v as i32)
-    }
-
-    /// Try get a `i64` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_i64(&self) -> Option<i64> {
-        self.inner.cast().into_primitive().into_i64()
-    }
-
-    /// Try get a `f32` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_f32(&self) -> Option<f32> {
-        self.inner
-            .cast()
-            .into_primitive()
-            .into_f64()
-            .map(|v| v as f32)
-    }
-
-    /// Try get a `f64` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_f64(&self) -> Option<f64> {
-        self.inner.cast().into_primitive().into_f64()
-    }
-
-    /// Try get a `bool` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_bool(&self) -> Option<bool> {
-        self.inner.cast().into_primitive().into_bool()
-    }
-
-    /// Try get a `char` from this value.
-    ///
-    /// This method is cheap for primitive types, but may call arbitrary
-    /// serialization implementations for complex ones.
-    pub fn to_char(&self) -> Option<char> {
-        self.inner.cast().into_primitive().into_char()
-    }
-
-    /// Try get a `str` from this value.
-    ///
-    /// This method is cheap for primitive types. It won't allocate an owned
-    /// `String` if the value is a complex type.
-    pub fn to_borrowed_str(&self) -> Option<&str> {
-        self.inner.cast().into_primitive().into_borrowed_str()
-    }
-}
-
-impl<'v> Inner<'v> {
-    /// Cast the inner value to another type.
-    fn cast(self) -> Cast<'v> {
-        struct CastVisitor<'v>(Cast<'v>);
-
-        impl<'v> Visitor<'v> for CastVisitor<'v> {
-            fn debug(&mut self, _: &dyn fmt::Debug) -> Result<(), Error> {
-                Ok(())
-            }
-
-            fn u64(&mut self, v: u64) -> Result<(), Error> {
-                self.0 = Cast::Primitive(Primitive::Unsigned(v));
-                Ok(())
-            }
-
-            fn i64(&mut self, v: i64) -> Result<(), Error> {
-                self.0 = Cast::Primitive(Primitive::Signed(v));
-                Ok(())
-            }
-
-            fn f64(&mut self, v: f64) -> Result<(), Error> {
-                self.0 = Cast::Primitive(Primitive::Float(v));
-                Ok(())
-            }
-
-            fn bool(&mut self, v: bool) -> Result<(), Error> {
-                self.0 = Cast::Primitive(Primitive::Bool(v));
-                Ok(())
-            }
-
-            fn char(&mut self, v: char) -> Result<(), Error> {
-                self.0 = Cast::Primitive(Primitive::Char(v));
-                Ok(())
-            }
-
-            fn borrowed_str(&mut self, v: &'v str) -> Result<(), Error> {
-                self.0 = Cast::Primitive(Primitive::Str(v));
-                Ok(())
-            }
-
-            #[cfg(not(feature = "std"))]
-            fn str(&mut self, _: &str) -> Result<(), Error> {
-                Ok(())
-            }
-
-            #[cfg(feature = "std")]
-            fn str(&mut self, v: &str) -> Result<(), Error> {
-                self.0 = Cast::String(v.into());
-                Ok(())
-            }
-
-            fn none(&mut self) -> Result<(), Error> {
-                self.0 = Cast::Primitive(Primitive::None);
-                Ok(())
-            }
-
-            #[cfg(feature = "kv_unstable_sval")]
-            fn sval(&mut self, v: &dyn super::sval::Value) -> Result<(), Error> {
-                self.0 = super::sval::cast(v);
-                Ok(())
-            }
-        }
-
-        // Try downcast an erased value first
-        // It also lets us avoid the Visitor infrastructure for simple primitives
-        let primitive = match self {
-            Inner::Primitive(value) => Some(value),
-            Inner::Fill(value) => value.downcast_primitive(),
-            Inner::Debug(value) => value.downcast_primitive(),
-            Inner::Display(value) => value.downcast_primitive(),
-
-            #[cfg(feature = "sval")]
-            Inner::Sval(value) => value.downcast_primitive(),
-        };
-
-        primitive.map(Cast::Primitive).unwrap_or_else(|| {
-            // If the erased value isn't a primitive then we visit it
-            let mut cast = CastVisitor(Cast::Primitive(Primitive::None));
-            let _ = self.visit(&mut cast);
-            cast.0
-        })
-    }
-}
-
-pub(super) enum Cast<'v> {
-    Primitive(Primitive<'v>),
-    #[cfg(feature = "std")]
-    String(String),
-}
-
-impl<'v> Cast<'v> {
-    fn into_primitive(self) -> Primitive<'v> {
-        match self {
-            Cast::Primitive(value) => value,
-            #[cfg(feature = "std")]
-            _ => Primitive::None,
-        }
-    }
-}
-
-impl<'v> Primitive<'v> {
-    fn into_borrowed_str(self) -> Option<&'v str> {
-        if let Primitive::Str(value) = self {
-            Some(value)
-        } else {
-            None
-        }
-    }
-
-    fn into_u64(self) -> Option<u64> {
-        match self {
-            Primitive::Unsigned(value) => Some(value),
-            Primitive::Signed(value) => Some(value as u64),
-            Primitive::Float(value) => Some(value as u64),
-            _ => None,
-        }
-    }
-
-    fn into_i64(self) -> Option<i64> {
-        match self {
-            Primitive::Signed(value) => Some(value),
-            Primitive::Unsigned(value) => Some(value as i64),
-            Primitive::Float(value) => Some(value as i64),
-            _ => None,
-        }
-    }
-
-    fn into_f64(self) -> Option<f64> {
-        match self {
-            Primitive::Float(value) => Some(value),
-            Primitive::Unsigned(value) => Some(value as f64),
-            Primitive::Signed(value) => Some(value as f64),
-            _ => None,
-        }
-    }
-
-    fn into_char(self) -> Option<char> {
-        if let Primitive::Char(value) = self {
-            Some(value)
-        } else {
-            None
-        }
-    }
-
-    fn into_bool(self) -> Option<bool> {
-        if let Primitive::Bool(value) = self {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl<'v, T: ?Sized + 'static> Erased<'v, T> {
-    // NOTE: This function is a perfect candidate for memoization
-    // The outcome could be stored in a `Cell<Primitive>`
-    fn downcast_primitive(self) -> Option<Primitive<'v>> {
-        macro_rules! type_ids {
-            ($($value:ident : $ty:ty => $cast:expr,)*) => {{
-                struct TypeIds;
-
-                impl TypeIds {
-                    fn downcast_primitive<'v, T: ?Sized>(&self, value: Erased<'v, T>) -> Option<Primitive<'v>> {
-                        $(
-                            if TypeId::of::<$ty>() == value.type_id {
-                                let $value = unsafe { value.downcast_unchecked::<$ty>() };
-                                return Some(Primitive::from($cast));
-                            }
-                        )*
-
-                        None
-                    }
-                }
-
-                TypeIds
-            }};
-        }
-
-        let type_ids = type_ids![
-            value: usize => *value as u64,
-            value: u8 => *value as u64,
-            value: u16 => *value as u64,
-            value: u32 => *value as u64,
-            value: u64 => *value,
-
-            value: isize => *value as i64,
-            value: i8 => *value as i64,
-            value: i16 => *value as i64,
-            value: i32 => *value as i64,
-            value: i64 => *value,
-
-            value: f32 => *value as f64,
-            value: f64 => *value,
-
-            value: char => *value,
-            value: bool => *value,
-
-            value: &str => *value,
-        ];
-
-        type_ids.downcast_primitive(self)
-    }
-}
-
-#[cfg(feature = "std")]
-mod std_support {
-    use super::*;
-
-    use std::borrow::Cow;
-
-    impl<'v> Value<'v> {
-        /// Try get a `usize` from this value.
-        ///
-        /// This method is cheap for primitive types, but may call arbitrary
-        /// serialization implementations for complex ones. If the serialization
-        /// implementation produces a short lived string it will be allocated.
-        pub fn to_str(&self) -> Option<Cow<str>> {
-            self.inner.cast().into_str()
-        }
-    }
-
-    impl<'v> Cast<'v> {
-        pub(super) fn into_str(self) -> Option<Cow<'v, str>> {
-            match self {
-                Cast::Primitive(Primitive::Str(value)) => Some(value.into()),
-                Cast::String(value) => Some(value.into()),
-                _ => None,
-            }
-        }
-    }
-
-    #[cfg(test)]
-    mod tests {
-        use crate::kv::ToValue;
-
-        #[test]
-        fn primitive_cast() {
-            assert_eq!(
-                "a string",
-                "a string"
-                    .to_owned()
-                    .to_value()
-                    .to_borrowed_str()
-                    .expect("invalid value")
-            );
-            assert_eq!(
-                "a string",
-                &*"a string".to_value().to_str().expect("invalid value")
-            );
-            assert_eq!(
-                "a string",
-                &*"a string"
-                    .to_owned()
-                    .to_value()
-                    .to_str()
-                    .expect("invalid value")
-            );
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::kv::ToValue;
-
-    #[test]
-    fn primitive_cast() {
-        assert_eq!(
-            "a string",
-            "a string"
-                .to_value()
-                .to_borrowed_str()
-                .expect("invalid value")
-        );
-        assert_eq!(
-            "a string",
-            Some("a string")
-                .to_value()
-                .to_borrowed_str()
-                .expect("invalid value")
-        );
-
-        assert_eq!(1u8, 1u64.to_value().to_u8().expect("invalid value"));
-        assert_eq!(1u16, 1u64.to_value().to_u16().expect("invalid value"));
-        assert_eq!(1u32, 1u64.to_value().to_u32().expect("invalid value"));
-        assert_eq!(1u64, 1u64.to_value().to_u64().expect("invalid value"));
-        assert_eq!(1usize, 1u64.to_value().to_usize().expect("invalid value"));
-
-        assert_eq!(-1i8, -1i64.to_value().to_i8().expect("invalid value"));
-        assert_eq!(-1i16, -1i64.to_value().to_i16().expect("invalid value"));
-        assert_eq!(-1i32, -1i64.to_value().to_i32().expect("invalid value"));
-        assert_eq!(-1i64, -1i64.to_value().to_i64().expect("invalid value"));
-        assert_eq!(-1isize, -1i64.to_value().to_isize().expect("invalid value"));
-
-        assert!(1f32.to_value().to_f32().is_some(), "invalid value");
-        assert!(1f64.to_value().to_f64().is_some(), "invalid value");
-
-        assert_eq!(1u32, 1i64.to_value().to_u32().expect("invalid value"));
-        assert_eq!(1i32, 1u64.to_value().to_i32().expect("invalid value"));
-        assert!(1f32.to_value().to_i32().is_some(), "invalid value");
-
-        assert_eq!('a', 'a'.to_value().to_char().expect("invalid value"));
-        assert_eq!(true, true.to_value().to_bool().expect("invalid value"));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/internal/fmt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/internal/fmt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/internal/fmt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/internal/fmt.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,249 +0,0 @@
-//! Integration between `Value` and `std::fmt`.
-//!
-//! This module allows any `Value` to implement the `fmt::Debug` and `fmt::Display` traits,
-//! and for any `fmt::Debug` or `fmt::Display` to be captured as a `Value`.
-
-use std::fmt;
-
-use super::{Erased, Inner, Visitor};
-use crate::kv;
-use crate::kv::value::{Error, Slot};
-
-impl<'v> kv::Value<'v> {
-    /// Get a value from a debuggable type.
-    pub fn from_debug<T>(value: &'v T) -> Self
-    where
-        T: fmt::Debug + 'static,
-    {
-        kv::Value {
-            inner: Inner::Debug(unsafe { Erased::new_unchecked::<T>(value) }),
-        }
-    }
-
-    /// Get a value from a displayable type.
-    pub fn from_display<T>(value: &'v T) -> Self
-    where
-        T: fmt::Display + 'static,
-    {
-        kv::Value {
-            inner: Inner::Display(unsafe { Erased::new_unchecked::<T>(value) }),
-        }
-    }
-}
-
-impl<'s, 'f> Slot<'s, 'f> {
-    /// Fill the slot with a debuggable value.
-    ///
-    /// The given value doesn't need to satisfy any particular lifetime constraints.
-    ///
-    /// # Panics
-    ///
-    /// Calling more than a single `fill` method on this slot will panic.
-    pub fn fill_debug<T>(&mut self, value: T) -> Result<(), Error>
-    where
-        T: fmt::Debug,
-    {
-        self.fill(|visitor| visitor.debug(&value))
-    }
-
-    /// Fill the slot with a displayable value.
-    ///
-    /// The given value doesn't need to satisfy any particular lifetime constraints.
-    ///
-    /// # Panics
-    ///
-    /// Calling more than a single `fill` method on this slot will panic.
-    pub fn fill_display<T>(&mut self, value: T) -> Result<(), Error>
-    where
-        T: fmt::Display,
-    {
-        self.fill(|visitor| visitor.display(&value))
-    }
-}
-
-pub(in kv::value) use self::fmt::{Arguments, Debug, Display};
-
-impl<'v> fmt::Debug for kv::Value<'v> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        struct DebugVisitor<'a, 'b: 'a>(&'a mut fmt::Formatter<'b>);
-
-        impl<'a, 'b: 'a, 'v> Visitor<'v> for DebugVisitor<'a, 'b> {
-            fn debug(&mut self, v: &dyn fmt::Debug) -> Result<(), Error> {
-                fmt::Debug::fmt(v, self.0)?;
-
-                Ok(())
-            }
-
-            fn display(&mut self, v: &dyn fmt::Display) -> Result<(), Error> {
-                fmt::Display::fmt(v, self.0)?;
-
-                Ok(())
-            }
-
-            fn u64(&mut self, v: u64) -> Result<(), Error> {
-                fmt::Debug::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn i64(&mut self, v: i64) -> Result<(), Error> {
-                fmt::Debug::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn f64(&mut self, v: f64) -> Result<(), Error> {
-                fmt::Debug::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn bool(&mut self, v: bool) -> Result<(), Error> {
-                fmt::Debug::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn char(&mut self, v: char) -> Result<(), Error> {
-                fmt::Debug::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn str(&mut self, v: &str) -> Result<(), Error> {
-                fmt::Debug::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn none(&mut self) -> Result<(), Error> {
-                self.debug(&format_args!("None"))
-            }
-
-            #[cfg(feature = "kv_unstable_sval")]
-            fn sval(&mut self, v: &dyn super::sval::Value) -> Result<(), Error> {
-                super::sval::fmt(self.0, v)
-            }
-        }
-
-        self.visit(&mut DebugVisitor(f)).map_err(|_| fmt::Error)?;
-
-        Ok(())
-    }
-}
-
-impl<'v> fmt::Display for kv::Value<'v> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        struct DisplayVisitor<'a, 'b: 'a>(&'a mut fmt::Formatter<'b>);
-
-        impl<'a, 'b: 'a, 'v> Visitor<'v> for DisplayVisitor<'a, 'b> {
-            fn debug(&mut self, v: &dyn fmt::Debug) -> Result<(), Error> {
-                fmt::Debug::fmt(v, self.0)?;
-
-                Ok(())
-            }
-
-            fn display(&mut self, v: &dyn fmt::Display) -> Result<(), Error> {
-                fmt::Display::fmt(v, self.0)?;
-
-                Ok(())
-            }
-
-            fn u64(&mut self, v: u64) -> Result<(), Error> {
-                fmt::Display::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn i64(&mut self, v: i64) -> Result<(), Error> {
-                fmt::Display::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn f64(&mut self, v: f64) -> Result<(), Error> {
-                fmt::Display::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn bool(&mut self, v: bool) -> Result<(), Error> {
-                fmt::Display::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn char(&mut self, v: char) -> Result<(), Error> {
-                fmt::Display::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn str(&mut self, v: &str) -> Result<(), Error> {
-                fmt::Display::fmt(&v, self.0)?;
-
-                Ok(())
-            }
-
-            fn none(&mut self) -> Result<(), Error> {
-                self.debug(&format_args!("None"))
-            }
-
-            #[cfg(feature = "kv_unstable_sval")]
-            fn sval(&mut self, v: &dyn super::sval::Value) -> Result<(), Error> {
-                super::sval::fmt(self.0, v)
-            }
-        }
-
-        self.visit(&mut DisplayVisitor(f)).map_err(|_| fmt::Error)?;
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::kv::value::ToValue;
-
-    #[test]
-    fn fmt_cast() {
-        assert_eq!(
-            42u32,
-            kv::Value::from_debug(&42u64)
-                .to_u32()
-                .expect("invalid value")
-        );
-
-        assert_eq!(
-            "a string",
-            kv::Value::from_display(&"a string")
-                .to_borrowed_str()
-                .expect("invalid value")
-        );
-    }
-
-    #[test]
-    fn fmt_debug() {
-        assert_eq!(
-            format!("{:?}", "a string"),
-            format!("{:?}", "a string".to_value()),
-        );
-
-        assert_eq!(
-            format!("{:04?}", 42u64),
-            format!("{:04?}", 42u64.to_value()),
-        );
-    }
-
-    #[test]
-    fn fmt_display() {
-        assert_eq!(
-            format!("{}", "a string"),
-            format!("{}", "a string".to_value()),
-        );
-
-        assert_eq!(format!("{:04}", 42u64), format!("{:04}", 42u64.to_value()),);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/internal/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/internal/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/internal/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/internal/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-//! The internal `Value` serialization API.
-//!
-//! This implementation isn't intended to be public. It may need to change
-//! for optimizations or to support new external serialization frameworks.
-
-use std::any::TypeId;
-
-use super::{Error, Fill, Slot};
-
-pub(super) mod cast;
-pub(super) mod fmt;
-#[cfg(feature = "kv_unstable_sval")]
-pub(super) mod sval;
-
-/// A container for a structured value for a specific kind of visitor.
-#[derive(Clone, Copy)]
-pub(super) enum Inner<'v> {
-    /// A simple primitive value that can be copied without allocating.
-    Primitive(Primitive<'v>),
-    /// A value that can be filled.
-    Fill(Erased<'v, dyn Fill + 'static>),
-    /// A debuggable value.
-    Debug(Erased<'v, dyn fmt::Debug + 'static>),
-    /// A displayable value.
-    Display(Erased<'v, dyn fmt::Display + 'static>),
-
-    #[cfg(feature = "kv_unstable_sval")]
-    /// A structured value from `sval`.
-    Sval(Erased<'v, dyn sval::Value + 'static>),
-}
-
-impl<'v> Inner<'v> {
-    pub(super) fn visit(self, visitor: &mut dyn Visitor<'v>) -> Result<(), Error> {
-        match self {
-            Inner::Primitive(value) => value.visit(visitor),
-            Inner::Fill(value) => value.get().fill(&mut Slot::new(visitor)),
-            Inner::Debug(value) => visitor.debug(value.get()),
-            Inner::Display(value) => visitor.display(value.get()),
-
-            #[cfg(feature = "kv_unstable_sval")]
-            Inner::Sval(value) => visitor.sval(value.get()),
-        }
-    }
-}
-
-/// The internal serialization contract.
-pub(super) trait Visitor<'v> {
-    fn debug(&mut self, v: &dyn fmt::Debug) -> Result<(), Error>;
-    fn display(&mut self, v: &dyn fmt::Display) -> Result<(), Error> {
-        self.debug(&format_args!("{}", v))
-    }
-
-    fn u64(&mut self, v: u64) -> Result<(), Error>;
-    fn i64(&mut self, v: i64) -> Result<(), Error>;
-    fn f64(&mut self, v: f64) -> Result<(), Error>;
-    fn bool(&mut self, v: bool) -> Result<(), Error>;
-    fn char(&mut self, v: char) -> Result<(), Error>;
-
-    fn str(&mut self, v: &str) -> Result<(), Error>;
-    fn borrowed_str(&mut self, v: &'v str) -> Result<(), Error> {
-        self.str(v)
-    }
-
-    fn none(&mut self) -> Result<(), Error>;
-
-    #[cfg(feature = "kv_unstable_sval")]
-    fn sval(&mut self, v: &dyn sval::Value) -> Result<(), Error>;
-}
-
-/// A captured primitive value.
-///
-/// These values are common and cheap to copy around.
-#[derive(Clone, Copy)]
-pub(super) enum Primitive<'v> {
-    Signed(i64),
-    Unsigned(u64),
-    Float(f64),
-    Bool(bool),
-    Char(char),
-    Str(&'v str),
-    Fmt(fmt::Arguments<'v>),
-    None,
-}
-
-impl<'v> Primitive<'v> {
-    fn visit(self, visitor: &mut dyn Visitor<'v>) -> Result<(), Error> {
-        match self {
-            Primitive::Signed(value) => visitor.i64(value),
-            Primitive::Unsigned(value) => visitor.u64(value),
-            Primitive::Float(value) => visitor.f64(value),
-            Primitive::Bool(value) => visitor.bool(value),
-            Primitive::Char(value) => visitor.char(value),
-            Primitive::Str(value) => visitor.borrowed_str(value),
-            Primitive::Fmt(value) => visitor.debug(&value),
-            Primitive::None => visitor.none(),
-        }
-    }
-}
-
-impl<'v> From<u64> for Primitive<'v> {
-    fn from(v: u64) -> Self {
-        Primitive::Unsigned(v)
-    }
-}
-
-impl<'v> From<i64> for Primitive<'v> {
-    fn from(v: i64) -> Self {
-        Primitive::Signed(v)
-    }
-}
-
-impl<'v> From<f64> for Primitive<'v> {
-    fn from(v: f64) -> Self {
-        Primitive::Float(v)
-    }
-}
-
-impl<'v> From<bool> for Primitive<'v> {
-    fn from(v: bool) -> Self {
-        Primitive::Bool(v)
-    }
-}
-
-impl<'v> From<char> for Primitive<'v> {
-    fn from(v: char) -> Self {
-        Primitive::Char(v)
-    }
-}
-
-impl<'v> From<&'v str> for Primitive<'v> {
-    fn from(v: &'v str) -> Self {
-        Primitive::Str(v)
-    }
-}
-
-impl<'v> From<fmt::Arguments<'v>> for Primitive<'v> {
-    fn from(v: fmt::Arguments<'v>) -> Self {
-        Primitive::Fmt(v)
-    }
-}
-
-/// A downcastable dynamic type.
-pub(super) struct Erased<'v, T: ?Sized> {
-    type_id: TypeId,
-    inner: &'v T,
-}
-
-impl<'v, T: ?Sized> Clone for Erased<'v, T> {
-    fn clone(&self) -> Self {
-        Erased {
-            type_id: self.type_id,
-            inner: self.inner,
-        }
-    }
-}
-
-impl<'v, T: ?Sized> Copy for Erased<'v, T> {}
-
-impl<'v, T: ?Sized> Erased<'v, T> {
-    // SAFETY: `U: Unsize<T>` and the underlying value `T` must not change
-    // We could add a safe variant of this method with the `Unsize` trait
-    pub(super) unsafe fn new_unchecked<U>(inner: &'v T) -> Self
-    where
-        U: 'static,
-        T: 'static,
-    {
-        Erased {
-            type_id: TypeId::of::<U>(),
-            inner,
-        }
-    }
-
-    pub(super) fn get(self) -> &'v T {
-        self.inner
-    }
-
-    // SAFETY: The underlying type of `T` is `U`
-    pub(super) unsafe fn downcast_unchecked<U>(self) -> &'v U {
-        &*(self.inner as *const T as *const U)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/internal/sval.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/internal/sval.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/internal/sval.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/internal/sval.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,210 +0,0 @@
-//! Integration between `Value` and `sval`.
-//!
-//! This module allows any `Value` to implement the `sval::Value` trait,
-//! and for any `sval::Value` to be captured as a `Value`.
-
-extern crate sval;
-
-use std::fmt;
-
-use super::cast::Cast;
-use super::{Erased, Inner, Primitive, Visitor};
-use crate::kv;
-use crate::kv::value::{Error, Slot};
-
-impl<'v> kv::Value<'v> {
-    /// Get a value from a structured type.
-    pub fn from_sval<T>(value: &'v T) -> Self
-    where
-        T: sval::Value + 'static,
-    {
-        kv::Value {
-            inner: Inner::Sval(unsafe { Erased::new_unchecked::<T>(value) }),
-        }
-    }
-}
-
-impl<'s, 'f> Slot<'s, 'f> {
-    /// Fill the slot with a structured value.
-    ///
-    /// The given value doesn't need to satisfy any particular lifetime constraints.
-    ///
-    /// # Panics
-    ///
-    /// Calling more than a single `fill` method on this slot will panic.
-    pub fn fill_sval<T>(&mut self, value: T) -> Result<(), Error>
-    where
-        T: sval::Value,
-    {
-        self.fill(|visitor| visitor.sval(&value))
-    }
-}
-
-impl<'v> sval::Value for kv::Value<'v> {
-    fn stream(&self, s: &mut sval::value::Stream) -> sval::value::Result {
-        struct SvalVisitor<'a, 'b: 'a>(&'a mut sval::value::Stream<'b>);
-
-        impl<'a, 'b: 'a, 'v> Visitor<'v> for SvalVisitor<'a, 'b> {
-            fn debug(&mut self, v: &dyn fmt::Debug) -> Result<(), Error> {
-                self.0
-                    .fmt(format_args!("{:?}", v))
-                    .map_err(Error::from_sval)
-            }
-
-            fn u64(&mut self, v: u64) -> Result<(), Error> {
-                self.0.u64(v).map_err(Error::from_sval)
-            }
-
-            fn i64(&mut self, v: i64) -> Result<(), Error> {
-                self.0.i64(v).map_err(Error::from_sval)
-            }
-
-            fn f64(&mut self, v: f64) -> Result<(), Error> {
-                self.0.f64(v).map_err(Error::from_sval)
-            }
-
-            fn bool(&mut self, v: bool) -> Result<(), Error> {
-                self.0.bool(v).map_err(Error::from_sval)
-            }
-
-            fn char(&mut self, v: char) -> Result<(), Error> {
-                self.0.char(v).map_err(Error::from_sval)
-            }
-
-            fn str(&mut self, v: &str) -> Result<(), Error> {
-                self.0.str(v).map_err(Error::from_sval)
-            }
-
-            fn none(&mut self) -> Result<(), Error> {
-                self.0.none().map_err(Error::from_sval)
-            }
-
-            fn sval(&mut self, v: &dyn sval::Value) -> Result<(), Error> {
-                self.0.any(v).map_err(Error::from_sval)
-            }
-        }
-
-        self.visit(&mut SvalVisitor(s)).map_err(Error::into_sval)?;
-
-        Ok(())
-    }
-}
-
-pub(in kv::value) use self::sval::Value;
-
-pub(super) fn fmt(f: &mut fmt::Formatter, v: &dyn sval::Value) -> Result<(), Error> {
-    sval::fmt::debug(f, v)?;
-    Ok(())
-}
-
-pub(super) fn cast<'v>(v: &dyn sval::Value) -> Cast<'v> {
-    struct CastStream<'v>(Cast<'v>);
-
-    impl<'v> sval::Stream for CastStream<'v> {
-        fn u64(&mut self, v: u64) -> sval::stream::Result {
-            self.0 = Cast::Primitive(Primitive::Unsigned(v));
-            Ok(())
-        }
-
-        fn i64(&mut self, v: i64) -> sval::stream::Result {
-            self.0 = Cast::Primitive(Primitive::Signed(v));
-            Ok(())
-        }
-
-        fn f64(&mut self, v: f64) -> sval::stream::Result {
-            self.0 = Cast::Primitive(Primitive::Float(v));
-            Ok(())
-        }
-
-        fn char(&mut self, v: char) -> sval::stream::Result {
-            self.0 = Cast::Primitive(Primitive::Char(v));
-            Ok(())
-        }
-
-        fn bool(&mut self, v: bool) -> sval::stream::Result {
-            self.0 = Cast::Primitive(Primitive::Bool(v));
-            Ok(())
-        }
-
-        #[cfg(feature = "std")]
-        fn str(&mut self, s: &str) -> sval::stream::Result {
-            self.0 = Cast::String(s.into());
-            Ok(())
-        }
-    }
-
-    let mut cast = CastStream(Cast::Primitive(Primitive::None));
-    let _ = sval::stream(&mut cast, v);
-
-    cast.0
-}
-
-impl Error {
-    fn from_sval(_: sval::value::Error) -> Self {
-        Error::msg("`sval` serialization failed")
-    }
-
-    fn into_sval(self) -> sval::value::Error {
-        sval::value::Error::msg("`sval` serialization failed")
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use kv::value::test::Token;
-
-    #[test]
-    fn test_from_sval() {
-        assert_eq!(kv::Value::from_sval(&42u64).to_token(), Token::Sval);
-    }
-
-    #[test]
-    fn test_sval_structured() {
-        let value = kv::Value::from(42u64);
-        let expected = vec![sval::test::Token::Unsigned(42)];
-
-        assert_eq!(sval::test::tokens(value), expected);
-    }
-
-    #[test]
-    fn sval_cast() {
-        assert_eq!(
-            42u32,
-            kv::Value::from_sval(&42u64)
-                .to_u32()
-                .expect("invalid value")
-        );
-
-        assert_eq!(
-            "a string",
-            kv::Value::from_sval(&"a string")
-                .to_borrowed_str()
-                .expect("invalid value")
-        );
-
-        #[cfg(feature = "std")]
-        assert_eq!(
-            "a string",
-            kv::Value::from_sval(&"a string")
-                .to_str()
-                .expect("invalid value")
-        );
-    }
-
-    #[test]
-    fn sval_debug() {
-        struct TestSval;
-
-        impl sval::Value for TestSval {
-            fn stream(&self, stream: &mut sval::value::Stream) -> sval::value::Result {
-                stream.u64(42)
-            }
-        }
-
-        assert_eq!(
-            format!("{:04?}", 42u64),
-            format!("{:04?}", kv::Value::from_sval(&TestSval)),
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-//! Structured values.
-
-mod fill;
-mod impls;
-mod internal;
-
-#[cfg(test)]
-pub(in kv) mod test;
-
-pub use self::fill::{Fill, Slot};
-pub use kv::Error;
-
-use self::internal::{Inner, Primitive, Visitor};
-
-/// A type that can be converted into a [`Value`](struct.Value.html).
-pub trait ToValue {
-    /// Perform the conversion.
-    fn to_value(&self) -> Value;
-}
-
-impl<'a, T> ToValue for &'a T
-where
-    T: ToValue + ?Sized,
-{
-    fn to_value(&self) -> Value {
-        (**self).to_value()
-    }
-}
-
-impl<'v> ToValue for Value<'v> {
-    fn to_value(&self) -> Value {
-        Value { inner: self.inner }
-    }
-}
-
-/// A value in a structured key-value pair.
-pub struct Value<'v> {
-    inner: Inner<'v>,
-}
-
-impl<'v> Value<'v> {
-    /// Get a value from an internal primitive.
-    fn from_primitive<T>(value: T) -> Self
-    where
-        T: Into<Primitive<'v>>,
-    {
-        Value {
-            inner: Inner::Primitive(value.into()),
-        }
-    }
-
-    /// Visit the value using an internal visitor.
-    fn visit<'a>(&'a self, visitor: &mut dyn Visitor<'a>) -> Result<(), Error> {
-        self.inner.visit(visitor)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value/test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value/test.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-// Test support for inspecting Values
-
-use std::fmt;
-use std::str;
-
-use super::internal;
-use super::{Error, Value};
-
-#[derive(Debug, PartialEq)]
-pub(in kv) enum Token {
-    U64(u64),
-    I64(i64),
-    F64(f64),
-    Char(char),
-    Bool(bool),
-    Str(String),
-    None,
-
-    #[cfg(feature = "kv_unstable_sval")]
-    Sval,
-}
-
-#[cfg(test)]
-impl<'v> Value<'v> {
-    pub(in kv) fn to_token(&self) -> Token {
-        struct TestVisitor(Option<Token>);
-
-        impl<'v> internal::Visitor<'v> for TestVisitor {
-            fn debug(&mut self, v: &dyn fmt::Debug) -> Result<(), Error> {
-                self.0 = Some(Token::Str(format!("{:?}", v)));
-                Ok(())
-            }
-
-            fn u64(&mut self, v: u64) -> Result<(), Error> {
-                self.0 = Some(Token::U64(v));
-                Ok(())
-            }
-
-            fn i64(&mut self, v: i64) -> Result<(), Error> {
-                self.0 = Some(Token::I64(v));
-                Ok(())
-            }
-
-            fn f64(&mut self, v: f64) -> Result<(), Error> {
-                self.0 = Some(Token::F64(v));
-                Ok(())
-            }
-
-            fn bool(&mut self, v: bool) -> Result<(), Error> {
-                self.0 = Some(Token::Bool(v));
-                Ok(())
-            }
-
-            fn char(&mut self, v: char) -> Result<(), Error> {
-                self.0 = Some(Token::Char(v));
-                Ok(())
-            }
-
-            fn str(&mut self, v: &str) -> Result<(), Error> {
-                self.0 = Some(Token::Str(v.into()));
-                Ok(())
-            }
-
-            fn none(&mut self) -> Result<(), Error> {
-                self.0 = Some(Token::None);
-                Ok(())
-            }
-
-            #[cfg(feature = "kv_unstable_sval")]
-            fn sval(&mut self, _: &dyn internal::sval::Value) -> Result<(), Error> {
-                self.0 = Some(Token::Sval);
-                Ok(())
-            }
-        }
-
-        let mut visitor = TestVisitor(None);
-        self.visit(&mut visitor).unwrap();
-
-        visitor.0.unwrap()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/kv/value.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/kv/value.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,655 @@
+//! Structured values.
+
+use std::fmt;
+
+extern crate value_bag;
+
+#[cfg(feature = "kv_unstable_sval")]
+extern crate sval;
+
+#[cfg(feature = "kv_unstable_serde")]
+extern crate serde;
+
+use self::value_bag::ValueBag;
+
+pub use kv::Error;
+
+/// A type that can be converted into a [`Value`](struct.Value.html).
+pub trait ToValue {
+    /// Perform the conversion.
+    fn to_value(&self) -> Value;
+}
+
+impl<'a, T> ToValue for &'a T
+where
+    T: ToValue + ?Sized,
+{
+    fn to_value(&self) -> Value {
+        (**self).to_value()
+    }
+}
+
+impl<'v> ToValue for Value<'v> {
+    fn to_value(&self) -> Value {
+        Value {
+            inner: self.inner.clone(),
+        }
+    }
+}
+
+/// A value in a structured key-value pair.
+///
+/// # Capturing values
+///
+/// There are a few ways to capture a value:
+///
+/// - Using the `Value::capture_*` methods.
+/// - Using the `Value::from_*` methods.
+/// - Using the `ToValue` trait.
+/// - Using the standard `From` trait.
+///
+/// ## Using the `Value::capture_*` methods
+///
+/// `Value` offers a few constructor methods that capture values of different kinds.
+/// These methods require a `T: 'static` to support downcasting.
+///
+/// ```
+/// use log::kv::Value;
+///
+/// let value = Value::capture_debug(&42i32);
+///
+/// assert_eq!(Some(42), value.to_i64());
+/// ```
+///
+/// ## Using the `Value::from_*` methods
+///
+/// `Value` offers a few constructor methods that capture values of different kinds.
+/// These methods don't require `T: 'static`, but can't support downcasting.
+///
+/// ```
+/// use log::kv::Value;
+///
+/// let value = Value::from_debug(&42i32);
+///
+/// assert_eq!(None, value.to_i64());
+/// ```
+///
+/// ## Using the `ToValue` trait
+///
+/// The `ToValue` trait can be used to capture values generically.
+/// It's the bound used by `Source`.
+///
+/// ```
+/// # use log::kv::ToValue;
+/// let value = 42i32.to_value();
+///
+/// assert_eq!(Some(42), value.to_i64());
+/// ```
+///
+/// ```
+/// # use std::fmt::Debug;
+/// use log::kv::ToValue;
+///
+/// let value = (&42i32 as &dyn Debug).to_value();
+///
+/// assert_eq!(None, value.to_i64());
+/// ```
+///
+/// ## Using the standard `From` trait
+///
+/// Standard types that implement `ToValue` also implement `From`.
+///
+/// ```
+/// use log::kv::Value;
+///
+/// let value = Value::from(42i32);
+///
+/// assert_eq!(Some(42), value.to_i64());
+/// ```
+pub struct Value<'v> {
+    inner: ValueBag<'v>,
+}
+
+impl<'v> Value<'v> {
+    /// Get a value from a type implementing `ToValue`.
+    pub fn from_any<T>(value: &'v T) -> Self
+    where
+        T: ToValue,
+    {
+        value.to_value()
+    }
+
+    /// Get a value from a type implementing `std::fmt::Debug`.
+    pub fn capture_debug<T>(value: &'v T) -> Self
+    where
+        T: fmt::Debug + 'static,
+    {
+        Value {
+            inner: ValueBag::capture_debug(value),
+        }
+    }
+
+    /// Get a value from a type implementing `std::fmt::Display`.
+    pub fn capture_display<T>(value: &'v T) -> Self
+    where
+        T: fmt::Display + 'static,
+    {
+        Value {
+            inner: ValueBag::capture_display(value),
+        }
+    }
+
+    /// Get a value from an error.
+    #[cfg(feature = "kv_unstable_std")]
+    pub fn capture_error<T>(err: &'v T) -> Self
+    where
+        T: std::error::Error + 'static,
+    {
+        Value {
+            inner: ValueBag::capture_error(err),
+        }
+    }
+
+    #[cfg(feature = "kv_unstable_serde")]
+    /// Get a value from a type implementing `serde::Serialize`.
+    pub fn capture_serde<T>(value: &'v T) -> Self
+    where
+        T: self::serde::Serialize + 'static,
+    {
+        Value {
+            inner: ValueBag::capture_serde1(value),
+        }
+    }
+
+    /// Get a value from a type implementing `sval::value::Value`.
+    #[cfg(feature = "kv_unstable_sval")]
+    pub fn capture_sval<T>(value: &'v T) -> Self
+    where
+        T: self::sval::value::Value + 'static,
+    {
+        Value {
+            inner: ValueBag::capture_sval1(value),
+        }
+    }
+
+    /// Get a value from a type implementing `std::fmt::Debug`.
+    pub fn from_debug<T>(value: &'v T) -> Self
+    where
+        T: fmt::Debug,
+    {
+        Value {
+            inner: ValueBag::from_debug(value),
+        }
+    }
+
+    /// Get a value from a type implementing `std::fmt::Display`.
+    pub fn from_display<T>(value: &'v T) -> Self
+    where
+        T: fmt::Display,
+    {
+        Value {
+            inner: ValueBag::from_display(value),
+        }
+    }
+
+    /// Get a value from a type implementing `serde::Serialize`.
+    #[cfg(feature = "kv_unstable_serde")]
+    pub fn from_serde<T>(value: &'v T) -> Self
+    where
+        T: self::serde::Serialize,
+    {
+        Value {
+            inner: ValueBag::from_serde1(value),
+        }
+    }
+
+    /// Get a value from a type implementing `sval::value::Value`.
+    #[cfg(feature = "kv_unstable_sval")]
+    pub fn from_sval<T>(value: &'v T) -> Self
+    where
+        T: self::sval::value::Value,
+    {
+        Value {
+            inner: ValueBag::from_sval1(value),
+        }
+    }
+
+    /// Get a value from a dynamic `std::fmt::Debug`.
+    pub fn from_dyn_debug(value: &'v dyn fmt::Debug) -> Self {
+        Value {
+            inner: ValueBag::from_dyn_debug(value),
+        }
+    }
+
+    /// Get a value from a dynamic `std::fmt::Display`.
+    pub fn from_dyn_display(value: &'v dyn fmt::Display) -> Self {
+        Value {
+            inner: ValueBag::from_dyn_display(value),
+        }
+    }
+
+    /// Get a value from a dynamic error.
+    #[cfg(feature = "kv_unstable_std")]
+    pub fn from_dyn_error(err: &'v (dyn std::error::Error + 'static)) -> Self {
+        Value {
+            inner: ValueBag::from_dyn_error(err),
+        }
+    }
+
+    /// Get a value from a type implementing `sval::value::Value`.
+    #[cfg(feature = "kv_unstable_sval")]
+    pub fn from_dyn_sval(value: &'v dyn self::sval::value::Value) -> Self {
+        Value {
+            inner: ValueBag::from_dyn_sval1(value),
+        }
+    }
+
+    /// Get a value from an internal primitive.
+    fn from_value_bag<T>(value: T) -> Self
+    where
+        T: Into<ValueBag<'v>>,
+    {
+        Value {
+            inner: value.into(),
+        }
+    }
+
+    /// Check whether this value can be downcast to `T`.
+    pub fn is<T: 'static>(&self) -> bool {
+        self.inner.is::<T>()
+    }
+
+    /// Try downcast this value to `T`.
+    pub fn downcast_ref<T: 'static>(&self) -> Option<&T> {
+        self.inner.downcast_ref::<T>()
+    }
+}
+
+impl<'v> fmt::Debug for Value<'v> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Debug::fmt(&self.inner, f)
+    }
+}
+
+impl<'v> fmt::Display for Value<'v> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(&self.inner, f)
+    }
+}
+
+impl ToValue for dyn fmt::Debug {
+    fn to_value(&self) -> Value {
+        Value::from_dyn_debug(self)
+    }
+}
+
+impl ToValue for dyn fmt::Display {
+    fn to_value(&self) -> Value {
+        Value::from_dyn_display(self)
+    }
+}
+
+#[cfg(feature = "kv_unstable_std")]
+impl ToValue for dyn std::error::Error + 'static {
+    fn to_value(&self) -> Value {
+        Value::from_dyn_error(self)
+    }
+}
+
+#[cfg(feature = "kv_unstable_serde")]
+impl<'v> self::serde::Serialize for Value<'v> {
+    fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
+    where
+        S: self::serde::Serializer,
+    {
+        self.inner.serialize(s)
+    }
+}
+
+#[cfg(feature = "kv_unstable_sval")]
+impl<'v> self::sval::value::Value for Value<'v> {
+    fn stream(&self, stream: &mut self::sval::value::Stream) -> self::sval::value::Result {
+        self::sval::value::Value::stream(&self.inner, stream)
+    }
+}
+
+#[cfg(feature = "kv_unstable_sval")]
+impl ToValue for dyn self::sval::value::Value {
+    fn to_value(&self) -> Value {
+        Value::from_dyn_sval(self)
+    }
+}
+
+impl ToValue for str {
+    fn to_value(&self) -> Value {
+        Value::from(self)
+    }
+}
+
+impl<'v> From<&'v str> for Value<'v> {
+    fn from(value: &'v str) -> Self {
+        Value::from_value_bag(value)
+    }
+}
+
+impl ToValue for () {
+    fn to_value(&self) -> Value {
+        Value::from_value_bag(())
+    }
+}
+
+impl<T> ToValue for Option<T>
+where
+    T: ToValue,
+{
+    fn to_value(&self) -> Value {
+        match *self {
+            Some(ref value) => value.to_value(),
+            None => Value::from_value_bag(()),
+        }
+    }
+}
+
+macro_rules! impl_to_value_primitive {
+    ($($into_ty:ty,)*) => {
+        $(
+            impl ToValue for $into_ty {
+                fn to_value(&self) -> Value {
+                    Value::from(*self)
+                }
+            }
+
+            impl<'v> From<$into_ty> for Value<'v> {
+                fn from(value: $into_ty) -> Self {
+                    Value::from_value_bag(value)
+                }
+            }
+        )*
+    };
+}
+
+macro_rules! impl_value_to_primitive {
+    ($(#[doc = $doc:tt] $into_name:ident -> $into_ty:ty,)*) => {
+        impl<'v> Value<'v> {
+            $(
+                #[doc = $doc]
+                pub fn $into_name(&self) -> Option<$into_ty> {
+                    self.inner.$into_name()
+                }
+            )*
+        }
+    }
+}
+
+impl_to_value_primitive![
+    usize, u8, u16, u32, u64, u128, isize, i8, i16, i32, i64, i128, f32, f64, char, bool,
+];
+
+impl_value_to_primitive![
+    #[doc = "Try convert this value into a `u64`."]
+    to_u64 -> u64,
+    #[doc = "Try convert this value into a `i64`."]
+    to_i64 -> i64,
+    #[doc = "Try convert this value into a `u128`."]
+    to_u128 -> u128,
+    #[doc = "Try convert this value into a `i128`."]
+    to_i128 -> i128,
+    #[doc = "Try convert this value into a `f64`."]
+    to_f64 -> f64,
+    #[doc = "Try convert this value into a `char`."]
+    to_char -> char,
+    #[doc = "Try convert this value into a `bool`."]
+    to_bool -> bool,
+];
+
+impl<'v> Value<'v> {
+    /// Try convert this value into an error.
+    #[cfg(feature = "kv_unstable_std")]
+    pub fn to_borrowed_error(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        self.inner.to_borrowed_error()
+    }
+
+    /// Try convert this value into a borrowed string.
+    pub fn to_borrowed_str(&self) -> Option<&str> {
+        self.inner.to_borrowed_str()
+    }
+}
+
+#[cfg(feature = "kv_unstable_std")]
+mod std_support {
+    use super::*;
+
+    use std::borrow::Cow;
+
+    impl<T> ToValue for Box<T>
+    where
+        T: ToValue + ?Sized,
+    {
+        fn to_value(&self) -> Value {
+            (**self).to_value()
+        }
+    }
+
+    impl ToValue for String {
+        fn to_value(&self) -> Value {
+            Value::from(&**self)
+        }
+    }
+
+    impl<'v> ToValue for Cow<'v, str> {
+        fn to_value(&self) -> Value {
+            Value::from(&**self)
+        }
+    }
+
+    impl<'v> Value<'v> {
+        /// Try convert this value into a string.
+        pub fn to_str(&self) -> Option<Cow<str>> {
+            self.inner.to_str()
+        }
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+
+    pub(crate) use super::value_bag::test::Token;
+
+    impl<'v> Value<'v> {
+        pub(crate) fn to_token(&self) -> Token {
+            self.inner.to_token()
+        }
+    }
+
+    fn unsigned() -> impl Iterator<Item = Value<'static>> {
+        vec![
+            Value::from(8u8),
+            Value::from(16u16),
+            Value::from(32u32),
+            Value::from(64u64),
+            Value::from(1usize),
+        ]
+        .into_iter()
+    }
+
+    fn signed() -> impl Iterator<Item = Value<'static>> {
+        vec![
+            Value::from(-8i8),
+            Value::from(-16i16),
+            Value::from(-32i32),
+            Value::from(-64i64),
+            Value::from(-1isize),
+        ]
+        .into_iter()
+    }
+
+    fn float() -> impl Iterator<Item = Value<'static>> {
+        vec![Value::from(32.32f32), Value::from(64.64f64)].into_iter()
+    }
+
+    fn bool() -> impl Iterator<Item = Value<'static>> {
+        vec![Value::from(true), Value::from(false)].into_iter()
+    }
+
+    fn str() -> impl Iterator<Item = Value<'static>> {
+        vec![Value::from("a string"), Value::from("a loong string")].into_iter()
+    }
+
+    fn char() -> impl Iterator<Item = Value<'static>> {
+        vec![Value::from('a'), Value::from('â›°')].into_iter()
+    }
+
+    #[test]
+    fn test_capture_fmt() {
+        assert_eq!(Some(42u64), Value::capture_display(&42).to_u64());
+        assert_eq!(Some(42u64), Value::capture_debug(&42).to_u64());
+
+        assert!(Value::from_display(&42).to_u64().is_none());
+        assert!(Value::from_debug(&42).to_u64().is_none());
+    }
+
+    #[cfg(feature = "kv_unstable_std")]
+    #[test]
+    fn test_capture_error() {
+        let err = std::io::Error::from(std::io::ErrorKind::Other);
+
+        assert!(Value::capture_error(&err).to_borrowed_error().is_some());
+        assert!(Value::from_dyn_error(&err).to_borrowed_error().is_some());
+    }
+
+    #[cfg(feature = "kv_unstable_serde")]
+    #[test]
+    fn test_capture_serde() {
+        assert_eq!(Some(42u64), Value::capture_serde(&42).to_u64());
+
+        assert_eq!(Some(42u64), Value::from_serde(&42).to_u64());
+    }
+
+    #[cfg(feature = "kv_unstable_sval")]
+    #[test]
+    fn test_capture_sval() {
+        assert_eq!(Some(42u64), Value::capture_sval(&42).to_u64());
+
+        assert_eq!(Some(42u64), Value::from_sval(&42).to_u64());
+    }
+
+    #[test]
+    fn test_to_value_display() {
+        assert_eq!(42u64.to_value().to_string(), "42");
+        assert_eq!(42i64.to_value().to_string(), "42");
+        assert_eq!(42.01f64.to_value().to_string(), "42.01");
+        assert_eq!(true.to_value().to_string(), "true");
+        assert_eq!('a'.to_value().to_string(), "a");
+        assert_eq!("a loong string".to_value().to_string(), "a loong string");
+        assert_eq!(Some(true).to_value().to_string(), "true");
+        assert_eq!(().to_value().to_string(), "None");
+        assert_eq!(Option::None::<bool>.to_value().to_string(), "None");
+    }
+
+    #[test]
+    fn test_to_value_structured() {
+        assert_eq!(42u64.to_value().to_token(), Token::U64(42));
+        assert_eq!(42i64.to_value().to_token(), Token::I64(42));
+        assert_eq!(42.01f64.to_value().to_token(), Token::F64(42.01));
+        assert_eq!(true.to_value().to_token(), Token::Bool(true));
+        assert_eq!('a'.to_value().to_token(), Token::Char('a'));
+        assert_eq!(
+            "a loong string".to_value().to_token(),
+            Token::Str("a loong string".into())
+        );
+        assert_eq!(Some(true).to_value().to_token(), Token::Bool(true));
+        assert_eq!(().to_value().to_token(), Token::None);
+        assert_eq!(Option::None::<bool>.to_value().to_token(), Token::None);
+    }
+
+    #[test]
+    fn test_to_number() {
+        for v in unsigned() {
+            assert!(v.to_u64().is_some());
+            assert!(v.to_i64().is_some());
+        }
+
+        for v in signed() {
+            assert!(v.to_i64().is_some());
+        }
+
+        for v in unsigned().chain(signed()).chain(float()) {
+            assert!(v.to_f64().is_some());
+        }
+
+        for v in bool().chain(str()).chain(char()) {
+            assert!(v.to_u64().is_none());
+            assert!(v.to_i64().is_none());
+            assert!(v.to_f64().is_none());
+        }
+    }
+
+    #[test]
+    fn test_to_str() {
+        for v in str() {
+            assert!(v.to_borrowed_str().is_some());
+
+            #[cfg(feature = "kv_unstable_std")]
+            assert!(v.to_str().is_some());
+        }
+
+        let short_lived = String::from("short lived");
+        let v = Value::from(&*short_lived);
+
+        assert!(v.to_borrowed_str().is_some());
+
+        #[cfg(feature = "kv_unstable_std")]
+        assert!(v.to_str().is_some());
+
+        for v in unsigned().chain(signed()).chain(float()).chain(bool()) {
+            assert!(v.to_borrowed_str().is_none());
+
+            #[cfg(feature = "kv_unstable_std")]
+            assert!(v.to_str().is_none());
+        }
+    }
+
+    #[test]
+    fn test_to_bool() {
+        for v in bool() {
+            assert!(v.to_bool().is_some());
+        }
+
+        for v in unsigned()
+            .chain(signed())
+            .chain(float())
+            .chain(str())
+            .chain(char())
+        {
+            assert!(v.to_bool().is_none());
+        }
+    }
+
+    #[test]
+    fn test_to_char() {
+        for v in char() {
+            assert!(v.to_char().is_some());
+        }
+
+        for v in unsigned()
+            .chain(signed())
+            .chain(float())
+            .chain(str())
+            .chain(bool())
+        {
+            assert!(v.to_char().is_none());
+        }
+    }
+
+    #[test]
+    fn test_downcast_ref() {
+        #[derive(Debug)]
+        struct Foo(u64);
+
+        let v = Value::capture_debug(&Foo(42));
+
+        assert!(v.is::<Foo>());
+        assert_eq!(42u64, v.downcast_ref::<Foo>().expect("invalid downcast").0);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -266,7 +266,7 @@
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
     html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://docs.rs/log/0.4.11"
+    html_root_url = "https://docs.rs/log/0.4.14"
 )]
 #![warn(missing_docs)]
 #![deny(missing_debug_implementations)]
@@ -288,7 +288,6 @@
 use std::fmt;
 use std::mem;
 use std::str::FromStr;
-use std::sync::atomic::{AtomicUsize, Ordering};
 
 #[macro_use]
 mod macros;
@@ -297,6 +296,54 @@
 #[cfg(feature = "kv_unstable")]
 pub mod kv;
 
+#[cfg(has_atomics)]
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+#[cfg(not(has_atomics))]
+use std::cell::Cell;
+#[cfg(not(has_atomics))]
+use std::sync::atomic::Ordering;
+
+#[cfg(not(has_atomics))]
+struct AtomicUsize {
+    v: Cell<usize>,
+}
+
+#[cfg(not(has_atomics))]
+impl AtomicUsize {
+    const fn new(v: usize) -> AtomicUsize {
+        AtomicUsize { v: Cell::new(v) }
+    }
+
+    fn load(&self, _order: Ordering) -> usize {
+        self.v.get()
+    }
+
+    fn store(&self, val: usize, _order: Ordering) {
+        self.v.set(val)
+    }
+
+    #[cfg(atomic_cas)]
+    fn compare_exchange(
+        &self,
+        current: usize,
+        new: usize,
+        _success: Ordering,
+        _failure: Ordering,
+    ) -> Result<usize, usize> {
+        let prev = self.v.get();
+        if current == prev {
+            self.v.set(new);
+        }
+        Ok(prev)
+    }
+}
+
+// Any platform without atomics is unlikely to have multiple cores, so
+// writing via Cell will not be a race condition.
+#[cfg(not(has_atomics))]
+unsafe impl Sync for AtomicUsize {}
+
 // The LOGGER static holds a pointer to the global logger. It is protected by
 // the STATE static which determines whether LOGGER has been initialized yet.
 static mut LOGGER: &dyn Log = &NopLogger;
@@ -479,7 +526,7 @@
 
 impl fmt::Display for Level {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.pad(LOG_LEVEL_NAMES[*self as usize])
+        fmt.pad(self.as_str())
     }
 }
 
@@ -506,6 +553,13 @@
     pub fn to_level_filter(&self) -> LevelFilter {
         LevelFilter::from_usize(*self as usize).unwrap()
     }
+
+    /// Returns the string representation of the `Level`.
+    ///
+    /// This returns the same string as the `fmt::Display` implementation.
+    pub fn as_str(&self) -> &'static str {
+        LOG_LEVEL_NAMES[*self as usize]
+    }
 }
 
 /// An enum representing the available verbosity level filters of the logger.
@@ -632,7 +686,7 @@
 
 impl fmt::Display for LevelFilter {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.pad(LOG_LEVEL_NAMES[*self as usize])
+        fmt.pad(self.as_str())
     }
 }
 
@@ -661,6 +715,13 @@
     pub fn to_level(&self) -> Option<Level> {
         Level::from_usize(*self as usize)
     }
+
+    /// Returns the string representation of the `LevelFilter`.
+    ///
+    /// This returns the same string as the `fmt::Display` implementation.
+    pub fn as_str(&self) -> &'static str {
+        LOG_LEVEL_NAMES[*self as usize]
+    }
 }
 
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
@@ -1153,6 +1214,23 @@
     fn flush(&self) {}
 }
 
+#[cfg(feature = "std")]
+impl<T> Log for std::boxed::Box<T>
+where
+    T: ?Sized + Log,
+{
+    fn enabled(&self, metadata: &Metadata) -> bool {
+        self.as_ref().enabled(metadata)
+    }
+
+    fn log(&self, record: &Record) {
+        self.as_ref().log(record)
+    }
+    fn flush(&self) {
+        self.as_ref().flush()
+    }
+}
+
 /// Sets the global maximum log level.
 ///
 /// Generally, this should only be called by the active logging implementation.
@@ -1266,7 +1344,15 @@
 where
     F: FnOnce() -> &'static dyn Log,
 {
-    match STATE.compare_and_swap(UNINITIALIZED, INITIALIZING, Ordering::SeqCst) {
+    let old_state = match STATE.compare_exchange(
+        UNINITIALIZED,
+        INITIALIZING,
+        Ordering::SeqCst,
+        Ordering::SeqCst,
+    ) {
+        Ok(s) | Err(s) => s,
+    };
+    match old_state {
         UNINITIALIZED => {
             unsafe {
                 LOGGER = make_logger();
@@ -1385,25 +1471,6 @@
 
 // WARNING: this is not part of the crate's public API and is subject to change at any time
 #[doc(hidden)]
-pub fn __private_api_log_lit(
-    message: &str,
-    level: Level,
-    &(target, module_path, file, line): &(&str, &'static str, &'static str, u32),
-) {
-    logger().log(
-        &Record::builder()
-            .args(format_args!("{}", message))
-            .level(level)
-            .target(target)
-            .module_path_static(Some(module_path))
-            .file_static(Some(file))
-            .line(Some(line))
-            .build(),
-    );
-}
-
-// WARNING: this is not part of the crate's public API and is subject to change at any time
-#[doc(hidden)]
 pub fn __private_api_enabled(level: Level, target: &str) -> bool {
     logger().enabled(&Metadata::builder().level(level).target(target).build())
 }
@@ -1497,6 +1564,20 @@
     }
 
     #[test]
+    fn test_level_as_str() {
+        let tests = &[
+            (Level::Error, "ERROR"),
+            (Level::Warn, "WARN"),
+            (Level::Info, "INFO"),
+            (Level::Debug, "DEBUG"),
+            (Level::Trace, "TRACE"),
+        ];
+        for (input, expected) in tests {
+            assert_eq!(*expected, input.as_str());
+        }
+    }
+
+    #[test]
     fn test_level_show() {
         assert_eq!("INFO", Level::Info.to_string());
         assert_eq!("ERROR", Level::Error.to_string());
@@ -1536,6 +1617,21 @@
     }
 
     #[test]
+    fn test_level_filter_as_str() {
+        let tests = &[
+            (LevelFilter::Off, "OFF"),
+            (LevelFilter::Error, "ERROR"),
+            (LevelFilter::Warn, "WARN"),
+            (LevelFilter::Info, "INFO"),
+            (LevelFilter::Debug, "DEBUG"),
+            (LevelFilter::Trace, "TRACE"),
+        ];
+        for (input, expected) in tests {
+            assert_eq!(*expected, input.as_str());
+        }
+    }
+
+    #[test]
     #[cfg(feature = "std")]
     fn test_error_trait() {
         use super::SetLoggerError;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,18 +29,6 @@
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! log {
-    (target: $target:expr, $lvl:expr, $message:expr) => ({
-        let lvl = $lvl;
-        if lvl <= $crate::STATIC_MAX_LEVEL && lvl <= $crate::max_level() {
-            // ensure that $message is a valid format string literal
-            let _ = __log_format_args!($message);
-            $crate::__private_api_log_lit(
-                $message,
-                lvl,
-                &($target, __log_module_path!(), __log_file!(), __log_line!()),
-            );
-        }
-    });
     (target: $target:expr, $lvl:expr, $($arg:tt)+) => ({
         let lvl = $lvl;
         if lvl <= $crate::STATIC_MAX_LEVEL && lvl <= $crate::max_level() {
@@ -71,10 +59,10 @@
 #[macro_export(local_inner_macros)]
 macro_rules! error {
     (target: $target:expr, $($arg:tt)+) => (
-        log!(target: $target, $crate::Level::Error, $($arg)+);
+        log!(target: $target, $crate::Level::Error, $($arg)+)
     );
     ($($arg:tt)+) => (
-        log!($crate::Level::Error, $($arg)+);
+        log!($crate::Level::Error, $($arg)+)
     )
 }
 
@@ -95,10 +83,10 @@
 #[macro_export(local_inner_macros)]
 macro_rules! warn {
     (target: $target:expr, $($arg:tt)+) => (
-        log!(target: $target, $crate::Level::Warn, $($arg)+);
+        log!(target: $target, $crate::Level::Warn, $($arg)+)
     );
     ($($arg:tt)+) => (
-        log!($crate::Level::Warn, $($arg)+);
+        log!($crate::Level::Warn, $($arg)+)
     )
 }
 
@@ -121,10 +109,10 @@
 #[macro_export(local_inner_macros)]
 macro_rules! info {
     (target: $target:expr, $($arg:tt)+) => (
-        log!(target: $target, $crate::Level::Info, $($arg)+);
+        log!(target: $target, $crate::Level::Info, $($arg)+)
     );
     ($($arg:tt)+) => (
-        log!($crate::Level::Info, $($arg)+);
+        log!($crate::Level::Info, $($arg)+)
     )
 }
 
@@ -146,10 +134,10 @@
 #[macro_export(local_inner_macros)]
 macro_rules! debug {
     (target: $target:expr, $($arg:tt)+) => (
-        log!(target: $target, $crate::Level::Debug, $($arg)+);
+        log!(target: $target, $crate::Level::Debug, $($arg)+)
     );
     ($($arg:tt)+) => (
-        log!($crate::Level::Debug, $($arg)+);
+        log!($crate::Level::Debug, $($arg)+)
     )
 }
 
@@ -173,10 +161,10 @@
 #[macro_export(local_inner_macros)]
 macro_rules! trace {
     (target: $target:expr, $($arg:tt)+) => (
-        log!(target: $target, $crate::Level::Trace, $($arg)+);
+        log!(target: $target, $crate::Level::Trace, $($arg)+)
     );
     ($($arg:tt)+) => (
-        log!($crate::Level::Trace, $($arg)+);
+        log!($crate::Level::Trace, $($arg)+)
     )
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/serde.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/serde.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/src/serde.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/src/serde.rs	2021-12-09 12:01:26.000000000 +0000
@@ -60,6 +60,17 @@
 
                 self.visit_str(variant)
             }
+
+            fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                let variant = LOG_LEVEL_NAMES[1..]
+                    .get(v as usize)
+                    .ok_or_else(|| Error::invalid_value(Unexpected::Unsigned(v), &self))?;
+
+                self.visit_str(variant)
+            }
         }
 
         impl<'de> DeserializeSeed<'de> for LevelIdentifier {
@@ -144,6 +155,17 @@
 
                 self.visit_str(variant)
             }
+
+            fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                let variant = LOG_LEVEL_NAMES
+                    .get(v as usize)
+                    .ok_or_else(|| Error::invalid_value(Unexpected::Unsigned(v), &self))?;
+
+                self.visit_str(variant)
+            }
         }
 
         impl<'de> DeserializeSeed<'de> for LevelFilterIdentifier {
@@ -203,6 +225,14 @@
         ]
     }
 
+    fn level_variant_tokens(variant: u32) -> [Token; 3] {
+        [
+            Token::Enum { name: "Level" },
+            Token::U32(variant),
+            Token::Unit,
+        ]
+    }
+
     fn level_filter_token(variant: &'static str) -> Token {
         Token::UnitVariant {
             name: "LevelFilter",
@@ -220,6 +250,16 @@
         ]
     }
 
+    fn level_filter_variant_tokens(variant: u32) -> [Token; 3] {
+        [
+            Token::Enum {
+                name: "LevelFilter",
+            },
+            Token::U32(variant),
+            Token::Unit,
+        ]
+    }
+
     #[test]
     fn test_level_ser_de() {
         let cases = [
@@ -266,6 +306,21 @@
     }
 
     #[test]
+    fn test_level_de_variant_index() {
+        let cases = [
+            (Level::Error, level_variant_tokens(0)),
+            (Level::Warn, level_variant_tokens(1)),
+            (Level::Info, level_variant_tokens(2)),
+            (Level::Debug, level_variant_tokens(3)),
+            (Level::Trace, level_variant_tokens(4)),
+        ];
+
+        for &(value, tokens) in &cases {
+            assert_de_tokens(&value, &tokens);
+        }
+    }
+
+    #[test]
     fn test_level_de_error() {
         let msg = "unknown variant `errorx`, expected one of \
                    `ERROR`, `WARN`, `INFO`, `DEBUG`, `TRACE`";
@@ -316,6 +371,22 @@
         ];
 
         for &(value, tokens) in &cases {
+            assert_de_tokens(&value, &tokens);
+        }
+    }
+
+    #[test]
+    fn test_level_filter_de_variant_index() {
+        let cases = [
+            (LevelFilter::Off, level_filter_variant_tokens(0)),
+            (LevelFilter::Error, level_filter_variant_tokens(1)),
+            (LevelFilter::Warn, level_filter_variant_tokens(2)),
+            (LevelFilter::Info, level_filter_variant_tokens(3)),
+            (LevelFilter::Debug, level_filter_variant_tokens(4)),
+            (LevelFilter::Trace, level_filter_variant_tokens(5)),
+        ];
+
+        for &(value, tokens) in &cases {
             assert_de_tokens(&value, &tokens);
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/tests/filters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/tests/filters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/tests/filters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/tests/filters.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#[macro_use]
-extern crate log;
-
-use log::{Level, LevelFilter, Log, Metadata, Record};
-use std::sync::{Arc, Mutex};
-
-#[cfg(feature = "std")]
-use log::set_boxed_logger;
-
-#[cfg(not(feature = "std"))]
-fn set_boxed_logger(logger: Box<dyn Log>) -> Result<(), log::SetLoggerError> {
-    log::set_logger(Box::leak(logger))
-}
-
-struct State {
-    last_log: Mutex<Option<Level>>,
-}
-
-struct Logger(Arc<State>);
-
-impl Log for Logger {
-    fn enabled(&self, _: &Metadata) -> bool {
-        true
-    }
-
-    fn log(&self, record: &Record) {
-        *self.0.last_log.lock().unwrap() = Some(record.level());
-    }
-    fn flush(&self) {}
-}
-
-fn main() {
-    let me = Arc::new(State {
-        last_log: Mutex::new(None),
-    });
-    let a = me.clone();
-    set_boxed_logger(Box::new(Logger(me))).unwrap();
-
-    test(&a, LevelFilter::Off);
-    test(&a, LevelFilter::Error);
-    test(&a, LevelFilter::Warn);
-    test(&a, LevelFilter::Info);
-    test(&a, LevelFilter::Debug);
-    test(&a, LevelFilter::Trace);
-}
-
-fn test(a: &State, filter: LevelFilter) {
-    log::set_max_level(filter);
-    error!("");
-    last(&a, t(Level::Error, filter));
-    warn!("");
-    last(&a, t(Level::Warn, filter));
-    info!("");
-    last(&a, t(Level::Info, filter));
-    debug!("");
-    last(&a, t(Level::Debug, filter));
-    trace!("");
-    last(&a, t(Level::Trace, filter));
-
-    fn t(lvl: Level, filter: LevelFilter) -> Option<Level> {
-        if lvl <= filter {
-            Some(lvl)
-        } else {
-            None
-        }
-    }
-}
-
-fn last(state: &State, expected: Option<Level>) {
-    let lvl = state.last_log.lock().unwrap().take();
-    assert_eq!(lvl, expected);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/tests/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/tests/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/log/tests/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/log/tests/macros.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#[macro_use]
-extern crate log;
-
-#[test]
-fn base() {
-    info!("hello");
-    info!("hello",);
-}
-
-#[test]
-fn base_expr_context() {
-    let _ = info!("hello");
-}
-
-#[test]
-fn with_args() {
-    info!("hello {}", "cats");
-    info!("hello {}", "cats",);
-    info!("hello {}", "cats",);
-}
-
-#[test]
-fn with_args_expr_context() {
-    match "cats" {
-        cats => info!("hello {}", cats),
-    };
-}
-
-#[test]
-fn with_named_args() {
-    let cats = "cats";
-
-    info!("hello {cats}", cats = cats);
-    info!("hello {cats}", cats = cats,);
-    info!("hello {cats}", cats = cats,);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"4281e55a6ade6ea883936f2325599d7050c823118a641bb549cf0d47bf4d861e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7576269ea71f767b99297934c0b2367532690f8c4badc695edf8e04ab6a1e545","README.rst":"a3896d941360244037c0e1bf82e6f8def2ddaea13381e7165b26cbf9502a311c","src/lib.rs":"20592121c8ee5365ba967e1c09c46d7f09c247b0a7f7d7ad7066e262b70f1af2","tests/tests.rs":"f7fc8b9ed33f3b14eee34cacbb99d1f435666b52445eb7b41e5bde8dffae759d"},"package":"3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "maplit"
-version = "1.0.2"
-authors = ["bluss"]
-description = "Collection “literal� macros for HashMap, HashSet, BTreeMap, and BTreeSet."
-documentation = "https://docs.rs/maplit/"
-keywords = ["literal", "data-structure", "hashmap", "macro"]
-categories = ["rust-patterns"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/bluss/maplit"
-[package.metadata.release]
-no-dev-version = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2015
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/README.rst thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/README.rst
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/README.rst	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-maplit
-======
-
-Container / collection literal macros for `HashMap <https://doc.rust-lang.org/beta/std/collections/struct.HashMap.html>`_, `HashSet <https://doc.rust-lang.org/beta/std/collections/struct.HashSet.html>`_, `BTreeMap <https://doc.rust-lang.org/beta/std/collections/struct.BTreeMap.html>`_, `BTreeSet <https://doc.rust-lang.org/beta/std/collections/struct.BTreeSet.html>`_.
-
-You can use these for convenience. Using them has no other implications.
-
-Please read the `API documentation here`__
-
-__ https://docs.rs/maplit/
-
-|build_status|_ |crates|_
-
-.. |build_status| image:: https://travis-ci.org/bluss/maplit.svg?branch=master
-.. _build_status: https://travis-ci.org/bluss/maplit
-
-.. |crates| image:: http://meritbadge.herokuapp.com/maplit
-.. _crates: https://crates.io/crates/maplit
-
-
-Recent Changes
---------------
-
-- 1.0.2
-
-  - Fix usage of the macros through full paths, like `maplit::hashmap!(..)` (#27)
-
-- 1.0.1
-
-  - Fix ``unused_results`` lint in the macros by @povilasb
-
-- 1.0.0
-
-  - maplit 1.0!
-  - Only documentation changes since the last version
-
-- 0.1.6
-
-  - Add macro ``convert_args!`` for composable opt-in conversion of the
-    expressions being used for the maplit macros.
-
-- 0.1.5
-
-  - Add license files correctly
-  - Add crates.io category
-  - Small doc improvements by @seeekr and @sanmai-NL
-
-- 0.1.4
-
-  - Update docs to point to docs.rs
-
-- 0.1.2
-
-  - Now supports more arguments in hashset!{} and hashmap!{}
-
-- 0.1.0
-
-  - Initial release
-
-FAQ
----
-
-**Question:** Very large maps take a long time to compile?
-
-**Answer:** Rustc is very slow to compile big expressions with many literals
-(including integers and float literals). Work around this by either
-using explicitly typed literals, or explicitly typed conversions.
-See https://github.com/bluss/maplit/issues/14 for more information.
-
-
-License
--------
-
-Dual-licensed to be compatible with the Rust project.
-
-Licensed under the Apache License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0 or the MIT license
-http://opensource.org/licenses/MIT, at your
-option. This file may not be copied, modified, or distributed
-except according to those terms.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,324 +0,0 @@
-#![warn(missing_docs)]
-#![warn(unused_results)]
-#![doc(html_root_url="https://docs.rs/maplit/1/")]
-
-//! Macros for container literals with specific type.
-//!
-//! ```
-//! #[macro_use] extern crate maplit;
-//!
-//! # fn main() {
-//! let map = hashmap!{
-//!     "a" => 1,
-//!     "b" => 2,
-//! };
-//! # }
-//! ```
-//!
-//! The **maplit** crate uses `=>` syntax to separate the key and value for the
-//! mapping macros. (It was not possible to use `:` as separator due to syntactic
-//! restrictions in regular `macro_rules!` macros.)
-//!
-//! Note that rust macros are flexible in which brackets you use for the invocation.
-//! You can use them as `hashmap!{}` or `hashmap![]` or `hashmap!()`.
-//!
-//! Generic container macros already exist elsewhere, so those are not provided
-//! here at the moment.
-
-#[macro_export(local_inner_macros)]
-/// Create a **HashMap** from a list of key-value pairs
-///
-/// ## Example
-///
-/// ```
-/// #[macro_use] extern crate maplit;
-/// # fn main() {
-///
-/// let map = hashmap!{
-///     "a" => 1,
-///     "b" => 2,
-/// };
-/// assert_eq!(map["a"], 1);
-/// assert_eq!(map["b"], 2);
-/// assert_eq!(map.get("c"), None);
-/// # }
-/// ```
-macro_rules! hashmap {
-    (@single $($x:tt)*) => (());
-    (@count $($rest:expr),*) => (<[()]>::len(&[$(hashmap!(@single $rest)),*]));
-
-    ($($key:expr => $value:expr,)+) => { hashmap!($($key => $value),+) };
-    ($($key:expr => $value:expr),*) => {
-        {
-            let _cap = hashmap!(@count $($key),*);
-            let mut _map = ::std::collections::HashMap::with_capacity(_cap);
-            $(
-                let _ = _map.insert($key, $value);
-            )*
-            _map
-        }
-    };
-}
-
-/// Create a **HashSet** from a list of elements.
-///
-/// ## Example
-///
-/// ```
-/// #[macro_use] extern crate maplit;
-/// # fn main() {
-///
-/// let set = hashset!{"a", "b"};
-/// assert!(set.contains("a"));
-/// assert!(set.contains("b"));
-/// assert!(!set.contains("c"));
-/// # }
-/// ```
-#[macro_export(local_inner_macros)]
-macro_rules! hashset {
-    (@single $($x:tt)*) => (());
-    (@count $($rest:expr),*) => (<[()]>::len(&[$(hashset!(@single $rest)),*]));
-
-    ($($key:expr,)+) => { hashset!($($key),+) };
-    ($($key:expr),*) => {
-        {
-            let _cap = hashset!(@count $($key),*);
-            let mut _set = ::std::collections::HashSet::with_capacity(_cap);
-            $(
-                let _ = _set.insert($key);
-            )*
-            _set
-        }
-    };
-}
-
-#[macro_export(local_inner_macros)]
-/// Create a **BTreeMap** from a list of key-value pairs
-///
-/// ## Example
-///
-/// ```
-/// #[macro_use] extern crate maplit;
-/// # fn main() {
-///
-/// let map = btreemap!{
-///     "a" => 1,
-///     "b" => 2,
-/// };
-/// assert_eq!(map["a"], 1);
-/// assert_eq!(map["b"], 2);
-/// assert_eq!(map.get("c"), None);
-/// # }
-/// ```
-macro_rules! btreemap {
-    // trailing comma case
-    ($($key:expr => $value:expr,)+) => (btreemap!($($key => $value),+));
-
-    ( $($key:expr => $value:expr),* ) => {
-        {
-            let mut _map = ::std::collections::BTreeMap::new();
-            $(
-                let _ = _map.insert($key, $value);
-            )*
-            _map
-        }
-    };
-}
-
-#[macro_export(local_inner_macros)]
-/// Create a **BTreeSet** from a list of elements.
-///
-/// ## Example
-///
-/// ```
-/// #[macro_use] extern crate maplit;
-/// # fn main() {
-///
-/// let set = btreeset!{"a", "b"};
-/// assert!(set.contains("a"));
-/// assert!(set.contains("b"));
-/// assert!(!set.contains("c"));
-/// # }
-/// ```
-macro_rules! btreeset {
-    ($($key:expr,)+) => (btreeset!($($key),+));
-
-    ( $($key:expr),* ) => {
-        {
-            let mut _set = ::std::collections::BTreeSet::new();
-            $(
-                _set.insert($key);
-            )*
-            _set
-        }
-    };
-}
-
-/// Identity function. Used as the fallback for conversion.
-#[doc(hidden)]
-pub fn __id<T>(t: T) -> T { t }
-
-/// Macro that converts the keys or key-value pairs passed to another maplit
-/// macro. The default conversion is to use the [`Into`] trait, if no
-/// custom conversion is passed.
-///
-/// The syntax is:
-///
-/// `convert_args!(` `keys=` *function* `,` `values=` *function* `,`
-///     *macro_name* `!(` [ *key* => *value* [, *key* => *value* ... ] ] `))`
-///
-/// Here *macro_name* is any other maplit macro and either or both of the
-/// explicit `keys=` and `values=` parameters can be omitted.
-///
-/// [`Into`]: https://doc.rust-lang.org/std/convert/trait.Into.html
-///
-/// **Note** To use `convert_args`, the macro that is being wrapped
-/// must itself be brought into the current scope with `#[macro_use]` or `use`.
-///
-/// # Examples
-///
-/// ```
-/// #[macro_use] extern crate maplit;
-/// # fn main() {
-///
-/// use std::collections::HashMap;
-/// use std::collections::BTreeSet;
-///
-/// // a. Use the default conversion with the Into trait.
-/// // Here this converts both the key and value string literals to `String`,
-/// // but we need to specify the map type exactly!
-///
-/// let map1: HashMap<String, String> = convert_args!(hashmap!(
-///     "a" => "b",
-///     "c" => "d",
-/// ));
-///
-/// // b. Specify an explicit custom conversion for the keys. If we don't specify
-/// // a conversion for the values, they are not converted at all.
-///
-/// let map2 = convert_args!(keys=String::from, hashmap!(
-///     "a" => 1,
-///     "c" => 2,
-/// ));
-///
-/// // Note: map2 is a HashMap<String, i32>, but we didn't need to specify the type
-/// let _: HashMap<String, i32> = map2;
-///
-/// // c. convert_args! works with all the maplit macros -- and macros from other
-/// // crates that have the same "signature".
-/// // For example, btreeset and conversion from &str to Vec<u8>.
-///
-/// let set: BTreeSet<Vec<u8>> = convert_args!(btreeset!(
-///     "a", "b", "c", "d", "a", "e", "f",
-/// ));
-/// assert_eq!(set.len(), 6);
-///
-///
-/// # }
-/// ```
-#[macro_export(local_inner_macros)]
-macro_rules! convert_args {
-    (keys=$kf:expr, $macro_name:ident !($($k:expr),* $(,)*)) => {
-        $macro_name! { $(($kf)($k)),* }
-    };
-    (keys=$kf:expr, values=$vf:expr, $macro_name:ident !($($k:expr),* $(,)*)) => {
-        $macro_name! { $(($kf)($k)),* }
-    };
-    (keys=$kf:expr, values=$vf:expr, $macro_name:ident !( $($k:expr => $v:expr),* $(,)*)) => {
-        $macro_name! { $(($kf)($k) => ($vf)($v)),* }
-    };
-    (keys=$kf:expr, $macro_name:ident !($($rest:tt)*)) => {
-        convert_args! {
-            keys=$kf, values=$crate::__id,
-            $macro_name !(
-                $($rest)*
-            )
-        }
-    };
-    (values=$vf:expr, $macro_name:ident !($($rest:tt)*)) => {
-        convert_args! {
-            keys=$crate::__id, values=$vf,
-            $macro_name !(
-                $($rest)*
-            )
-        }
-    };
-    ($macro_name:ident ! $($rest:tt)*) => {
-        convert_args! {
-            keys=::std::convert::Into::into, values=::std::convert::Into::into,
-            $macro_name !
-            $($rest)*
-        }
-    };
-}
-
-#[test]
-fn test_hashmap() {
-    use std::collections::HashMap;
-    use std::collections::HashSet;
-    let names = hashmap!{
-        1 => "one",
-        2 => "two",
-    };
-    assert_eq!(names.len(), 2);
-    assert_eq!(names[&1], "one");
-    assert_eq!(names[&2], "two");
-    assert_eq!(names.get(&3), None);
-
-    let empty: HashMap<i32, i32> = hashmap!{};
-    assert_eq!(empty.len(), 0);
-
-    let _nested_compiles = hashmap!{
-        1 => hashmap!{0 => 1 + 2,},
-        2 => hashmap!{1 => 1,},
-    };
-
-    let _: HashMap<String, i32> = convert_args!(keys=String::from, hashmap!(
-        "one" => 1,
-        "two" => 2,
-    ));
-
-    let _: HashMap<String, i32> = convert_args!(keys=String::from, values=__id, hashmap!(
-        "one" => 1,
-        "two" => 2,
-    ));
-
-    let names: HashSet<String> = convert_args!(hashset!(
-        "one",
-        "two",
-    ));
-    assert!(names.contains("one"));
-    assert!(names.contains("two"));
-
-    let lengths: HashSet<usize> = convert_args!(keys=str::len, hashset!(
-        "one",
-        "two",
-    ));
-    assert_eq!(lengths.len(), 1);
-
-    let _no_trailing: HashSet<usize> = convert_args!(keys=str::len, hashset!(
-        "one",
-        "two"
-    ));
-}
-
-#[test]
-fn test_btreemap() {
-    use std::collections::BTreeMap;
-    let names = btreemap!{
-        1 => "one",
-        2 => "two",
-    };
-    assert_eq!(names.len(), 2);
-    assert_eq!(names[&1], "one");
-    assert_eq!(names[&2], "two");
-    assert_eq!(names.get(&3), None);
-
-    let empty: BTreeMap<i32, i32> = btreemap!{};
-    assert_eq!(empty.len(), 0);
-
-    let _nested_compiles = btreemap!{
-        1 => btreemap!{0 => 1 + 2,},
-        2 => btreemap!{1 => 1,},
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/tests/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/tests/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/maplit/tests/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/maplit/tests/tests.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-
-#[macro_use] extern crate maplit;
-
-#[test]
-#[allow(unused_parens)]
-fn test_parse() {
-    let mut m = hashmap!{};
-    m.insert(1, 1);
-    hashmap!{1 => 1};
-    hashmap!{1 => 1,};
-    hashmap!{1 + 1 => 1, 2 + 1 => 2};
-    hashmap!{1 + 1 => 1, 2 + 1 => 2,};
-    hashmap!{{1 + 2} => 1, (1 + 3) => {0 + 2}};
-    let m = hashmap!{"a".to_string() => 1 + 2, "b".to_string() => 1 + 3};
-    assert_eq!(m["a"], 3);
-    assert_eq!(m["b"], 4);
-    let m = hashmap!{"a".to_string() => 1 + 2, "b".to_string() => 1 + 3, };
-    assert_eq!(m["a"], 3);
-    assert_eq!(m["b"], 4);
-
-    let mut s = hashset!{};
-    s.insert(1);
-    hashset!{1};
-    hashset!{1,};
-    hashset!{1, 2};
-    hashset!{1, 2,};
-    hashset!{1 + 1, 2 + 1};
-    hashset!{1 + 1, 2 + 1,};
-    hashset!{{1 + 1}, (2 + 1)};
-}
-
-#[test]
-fn hashset() {
-    let mut set = hashset!{};
-    assert!(set.is_empty());
-    set.insert(2);
-    let set = hashset!{1};
-    assert_eq!(set.len(), 1);
-    let set = hashset!{2, 3};
-    assert_eq!(set.len(), 2);
-    // Test that we can use many elements without hitting the macro recursion limit
-    let set = hashset!{1,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-        2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,
-    };
-    assert_eq!(set.len(), 10);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/matches/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/matches/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/matches/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/matches/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b54a1f583b0b495de45e38e226e76827fd136dbda6f08e8aaab1131effa962ae","LICENSE":"d7b49708075b5f43f8e108464f1970c8c66fa8b6afce4f9c944da3af77cc1460","lib.rs":"a78ab8c8db5af687988fedf40e9de77e5f52b6891f4c87190103b852ba6bef4e","tests/macro_use_one.rs":"4f599fae16f1aef369050bf0ad74cbefec06c430b29e0c9ab0811ac9592e997a"},"package":"7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"}
\ No newline at end of file
+{"files":{"Cargo.toml":"194024a82bba1c84226ac827330511fba74474a7914b1319e6700285c15f5812","LICENSE":"d7b49708075b5f43f8e108464f1970c8c66fa8b6afce4f9c944da3af77cc1460","lib.rs":"9f4187510972f5fc356ca60d19daa0e69643dd6b530edf7c928cbd75a2b990c5","tests/macro_use_one.rs":"4f599fae16f1aef369050bf0ad74cbefec06c430b29e0c9ab0811ac9592e997a","tests/use_star.rs":"39a23b8002544f65e7a896e2cefe8e0af7404151fa65d327e748f5c1101badf8"},"package":"a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/matches/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/matches/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/matches/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/matches/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -12,7 +12,7 @@
 
 [package]
 name = "matches"
-version = "0.1.8"
+version = "0.1.9"
 authors = ["Simon Sapin <simon.sapin@exyr.org>"]
 description = "A macro to evaluate, as a boolean, whether an expression matches a pattern."
 documentation = "https://docs.rs/matches/"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/matches/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/matches/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/matches/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/matches/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![no_std]
+
 /// Check if an expression matches a refutable pattern.
 ///
 /// Syntax: `matches!(` *expression* `,` *pattern* `)`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/matches/tests/use_star.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/matches/tests/use_star.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/matches/tests/use_star.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/matches/tests/use_star.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+//! https://github.com/SimonSapin/rust-std-candidates/issues/22
+
+extern crate matches;
+
+use matches::*;
+
+#[test]
+fn test_assert_matches() {
+    assert_matches!(4, 4)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"97791f3b1dcca115ef7340a312aad0320a79ff91b93cc8fc50b7dcd652721aa3","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"d2ab7c9c77235b68d1cc856ab5ef7b5115312098469edcac9d5611c5b74d3cd1","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","build.rs":"740225b5280e53e8d73971c6ccc55152d6af32e94132bc6980fdc0eb1fb3ab48","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/c.rs":"86fe35cbb46c8bece9927fbde20f1ca3af526defdde05ac969ad2f4bc9bb25e9","src/fallback.rs":"79519255d480a9c2667c06f9287931cfc2b85f6af6fcf92d453a11ee161dcb74","src/iter.rs":"23b1066d6b40159fe944388db7743c89422b1110ddb44667fde6d722f178ed4e","src/lib.rs":"8278d5f65db8081fa5ad3a0d17dac54d30de3d7a01b0dc4479927156e40b225c","src/naive.rs":"c7453bc99cc4e58eb37cf5a50c88688833e50a270ee1849baefddb8acc0ccd94","src/tests/iter.rs":"8d5999a2a5b8a3228c76cd82cd3ee86dfa6f7b4022405b1f06eedf7d74e4c704","src/tests/memchr.rs":"f30074eeab99a16ce5ca8a30f1890f86c43c0422523a7195cbb3ca5f3e465b67","src/tests/miri.rs":"27859a7ac1d0a9305b2d114e6dd8876f3d5e47fc46a81be96239c793ac6edb1f","src/tests/mod.rs":"2ad0c82d33b32562087254522641ea7bfa2a283130152be5e927a33f1978ebc7","src/tests/x86_64-soft_float.json":"c0e416487fe9b4809534edb7db2a9eff3453dc40d9f1e23362c37f45a77ec717","src/x86/avx.rs":"b19987410e49a079f33162424c42494626c91303c41824961e478be3b537c9c9","src/x86/mod.rs":"0b13becaabc150a0099f7528226c82e288136cc7ebcdb8e96cf5ee9aae0f05b6","src/x86/sse2.rs":"7c1b8248a8cd48396cb70a862d77f9a972f1e16324d65c260f39d13af73bf638","src/x86/sse42.rs":"f671ae9dd2b518a823e499a09ce32d4957bc5ae043db90d61c027e32f688f2b2"},"package":"0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"}
\ No newline at end of file
+{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"79d36439427134dd97c1a648579acb179dc594f960ab31abd0f447fdea4e7886","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"8e0a803533f359a91e0cedb0e664b4d880d5e571543eed2b58888dd84555cf0f","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","build.rs":"740225b5280e53e8d73971c6ccc55152d6af32e94132bc6980fdc0eb1fb3ab48","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","scripts/make-byte-frequency-table":"21d1ded41fe5a780507bb88e1910d471b4081cc626a48891a408712e45b7b2bf","src/cow.rs":"a23c3b009e5215b5c3ac46627a5dd844235bef0136d76b3fc1eeeb744565c125","src/lib.rs":"9430cd37b13399df8f8c27a752ccdf6422a563e24171d1b4802424f9193a8f37","src/memchr/c.rs":"34f7caf79316f4b03908832fdbd4aff367f2bc30eae291478cc5a0a108ce6e76","src/memchr/fallback.rs":"48764f18b7ff1f00a9ac1c4ed8ec96ad11f7b09b2d062a8ed3fe81160add627d","src/memchr/iter.rs":"61463e7fa22ca8f212c2cbfb882af0c87b0fb1bc6b4676678a4822a581ec1037","src/memchr/mod.rs":"d5bfc881c7c089e1a0825209a4d21c3f792f38c6f16f3bc715d0d539477376b6","src/memchr/naive.rs":"c7453bc99cc4e58eb37cf5a50c88688833e50a270ee1849baefddb8acc0ccd94","src/memchr/x86/avx.rs":"3c2750174ce7ff033daa4096e7961bbee9a2da898068266b27dee22ef8cfddad","src/memchr/x86/mod.rs":"a642d5aefdb7452ead4ab7946b5c6cfb6cc6df636dcd0ebbd6f5e6e1ac8305c0","src/memchr/x86/sse2.rs":"79ede1aba71a655e86eb5873d682c5da26933bffa4fffd7042a2313f18cf4675","src/memchr/x86/sse42.rs":"de4c6f354dbfec170876cddb8d9157b35928f96ed2339a0c5d094cc953a2f52d","src/memmem/byte_frequencies.rs":"2fb85b381c038c1e44ce94294531cdcd339dca48b1e61f41455666e802cbbc9e","src/memmem/genericsimd.rs":"9ce7283db0994438eb6df2bea6ad984e80512b6f643ebae7ae7d82eb5d39fa11","src/memmem/mod.rs":"c265518c0d9e6afca1536306de707e5817f81bc1528ca6956d92c8f5a1ed9248","src/memmem/prefilter/fallback.rs":"d32248c41aa09701c2410c52f948bbe009dd1b13a01b444ce0fb8c4b4e404ede","src/memmem/prefilter/genericsimd.rs":"57d5523cf0299b37ef1dd1b351e3d387d5070f2f7ecffc9a9ca66528101ebd3f","src/memmem/prefilter/mod.rs":"108bbab9ccca2843996c4e5def7db9210841c610d28493a18163ea1b63e6a785","src/memmem/prefilter/x86/avx.rs":"e344cae36a88b59c07a1c1d395edeb9c636a399e1528ce69b2bc7c94d8d8bb0b","src/memmem/prefilter/x86/mod.rs":"df2d84b23b22574383c281d33671a121b5faf7b1a48dd6f67c3085cd02cd4498","src/memmem/prefilter/x86/sse.rs":"d39af926e3d0f19dbf447f28d8b9833c470224fb3109f5500ef8de6f4bb1568b","src/memmem/rabinkarp.rs":"9b44eb092524a51792eba4deaca6c6d3cbc51db98cb548ea4fa7e5d8988cc71a","src/memmem/rarebytes.rs":"571082c71fc3dca5e4304171d41fb3c44e241df6dcd88bac4d7a15b52f9521e0","src/memmem/twoway.rs":"102f8bbb29696d5656cd2f5a1769a3af96d044fb09972881455cfb6424d6b50a","src/memmem/util.rs":"0194d40b912137e2352863af9cc1c0273baf97fdf6b27799628680846c06febd","src/memmem/vector.rs":"7925496f273e8d8837e7850d7d0592f5a3f0472a0e0f5d8852b6d6f8e2c45ecd","src/memmem/x86/avx.rs":"de85dbc415603c844baf94fbc92d676a738dd4b99246be468bd5f7be5921b25f","src/memmem/x86/mod.rs":"5012fca41b91caf229278aa221e8dd514ede497fe4938d64562d03fef2fc46e6","src/memmem/x86/sse.rs":"148a40c0952aca8b16d9eb3e724a5b9b60693bc7b2bcc5209bcc43c94faf560a","src/tests/memchr/iter.rs":"b68c7ecdb6222c5dbf61212e6863f78f98ad343868a74cb8612692fc790240b2","src/tests/memchr/memchr.rs":"09589c5899324c9b26ea4513c80389a2ffdf6ddc460031e2ca8da43bd493ae3f","src/tests/memchr/mod.rs":"29e0855f946c7babf603b3d610a29235a56a26a4c867fef0768542388eac4c95","src/tests/memchr/simple.rs":"b9997903ede972272c01c1750522a20692a28488cc7c5cf745ea83ff96d65fe3","src/tests/memchr/testdata.rs":"3e34377fe60eca3687d1ebc66127bd631af27ceaccc8f08806a293199b69a83f","src/tests/mod.rs":"9054a2a2f9af140f305ca29155d942fafbac9fb0874067611adc8a5990546be4","src/tests/x86_64-soft_float.json":"c0e416487fe9b4809534edb7db2a9eff3453dc40d9f1e23362c37f45a77ec717"},"package":"308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,40 +3,57 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "memchr"
-version = "2.3.4"
+version = "2.4.1"
 authors = ["Andrew Gallant <jamslam@gmail.com>", "bluss"]
-exclude = ["/ci/*", "/.travis.yml", "/Makefile", "/appveyor.yml"]
+exclude = ["/bench", "/.github", "/fuzz"]
 description = "Safe interface to memchr."
-homepage = "https://github.com/BurntSushi/rust-memchr"
+homepage = "https://github.com/BurntSushi/memchr"
 documentation = "https://docs.rs/memchr/"
 readme = "README.md"
 keywords = ["memchr", "char", "scan", "strchr", "string"]
 license = "Unlicense/MIT"
-repository = "https://github.com/BurntSushi/rust-memchr"
+repository = "https://github.com/BurntSushi/memchr"
+[profile.bench]
+debug = true
+
+[profile.release]
+debug = true
+
 [profile.test]
 opt-level = 3
+debug = true
 
 [lib]
 name = "memchr"
 bench = false
+[dependencies.compiler_builtins]
+version = "0.1.2"
+optional = true
+
+[dependencies.core]
+version = "1.0.0"
+optional = true
+package = "rustc-std-workspace-core"
+
 [dependencies.libc]
 version = "0.2.18"
 optional = true
 default-features = false
 [dev-dependencies.quickcheck]
-version = "0.9"
+version = "1.0.3"
 default-features = false
 
 [features]
 default = ["std"]
+rustc-dep-of-std = ["core", "compiler_builtins"]
 std = []
 use_std = ["std"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
 memchr
 ======
-The `memchr` crate provides heavily optimized routines for searching bytes.
+This library provides heavily optimized routines for string search primitives.
 
-[![Build status](https://github.com/BurntSushi/rust-memchr/workflows/ci/badge.svg)](https://github.com/BurntSushi/rust-memchr/actions)
-[![](http://meritbadge.herokuapp.com/memchr)](https://crates.io/crates/memchr)
+[![Build status](https://github.com/BurntSushi/memchr/workflows/ci/badge.svg)](https://github.com/BurntSushi/memchr/actions)
+[![](https://meritbadge.herokuapp.com/memchr)](https://crates.io/crates/memchr)
 
-Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org).
+Dual-licensed under MIT or the [UNLICENSE](https://unlicense.org/).
 
 
 ### Documentation
@@ -15,23 +15,15 @@
 
 ### Overview
 
-The `memchr` function is traditionally provided by libc, but its
-performance can vary significantly depending on the specific
-implementation of libc that is used. They can range from manually tuned
-Assembly implementations (like that found in GNU's libc) all the way to
-non-vectorized C implementations (like that found in MUSL).
-
-To smooth out the differences between implementations of libc, at least
-on `x86_64` for Rust 1.27+, this crate provides its own implementation of
-`memchr` that should perform competitively with the one found in GNU's libc.
-The implementation is in pure Rust and has no dependency on a C compiler or an
-Assembler.
-
-Additionally, GNU libc also provides an extension, `memrchr`. This crate
-provides its own implementation of `memrchr` as well, on top of `memchr2`,
-`memchr3`, `memrchr2` and `memrchr3`. The difference between `memchr` and
-`memchr2` is that `memchr2` permits finding all occurrences of two bytes
-instead of one. Similarly for `memchr3`.
+* The top-level module provides routines for searching for 1, 2 or 3 bytes
+  in the forward or reverse direction. When searching for more than one byte,
+  positions are considered a match if the byte at that position matches any
+  of the bytes.
+* The `memmem` sub-module provides forward and reverse substring search
+  routines.
+
+In all such cases, routines operate on `&[u8]` without regard to encoding. This
+is exactly what you want when searching either UTF-8 or arbitrary bytes.
 
 ### Compiling without the standard library
 
@@ -43,10 +35,9 @@
 memchr = { version = "2", default-features = false }
 ```
 
-On x86 platforms, when the `std` feature is disabled, the SSE2
-implementation of memchr will be used in compilers that support it. When
-`std` is enabled, the AVX implementation of memchr will be used if the CPU
-is determined to support it at runtime.
+On x86 platforms, when the `std` feature is disabled, the SSE2 accelerated
+implementations will be used. When `std` is enabled, AVX accelerated
+implementations will be used if the CPU is determined to support it at runtime.
 
 ### Using libc
 
@@ -58,16 +49,16 @@
 available in this crate, then enabling the `libc` feature will use libc's
 version of `memchr`.
 
-The rest of the functions in this crate, e.g., `memchr2` or `memrchr3`, are not
-a standard part of libc, so they will always use the implementations in this
-crate. One exception to this is `memrchr`, which is an extension commonly found
-on Linux. On Linux, `memrchr` is used in precisely the same scenario as
-`memchr`, as described above.
+The rest of the functions in this crate, e.g., `memchr2` or `memrchr3` and the
+substring search routines, will always use the implementations in this crate.
+One exception to this is `memrchr`, which is an extension in `libc` found on
+Linux. On Linux, `memrchr` is used in precisely the same scenario as `memchr`,
+as described above.
 
 
 ### Minimum Rust version policy
 
-This crate's minimum supported `rustc` version is `1.28.0`.
+This crate's minimum supported `rustc` version is `1.41.1`.
 
 The current policy is that the minimum Rust version required to use this crate
 can be increased in minor version updates. For example, if `crate 1.0` requires
@@ -77,3 +68,40 @@
 
 In general, this crate will be conservative with respect to the minimum
 supported version of Rust.
+
+
+### Testing strategy
+
+Given the complexity of the code in this crate, along with the pervasive use
+of `unsafe`, this crate has an extensive testing strategy. It combines multiple
+approaches:
+
+* Hand-written tests.
+* Exhaustive-style testing meant to exercise all possible branching and offset
+  calculations.
+* Property based testing through [`quickcheck`](https://github.com/BurntSushi/quickcheck).
+* Fuzz testing through [`cargo fuzz`](https://github.com/rust-fuzz/cargo-fuzz).
+* A huge suite of benchmarks that are also run as tests. Benchmarks always
+  confirm that the expected result occurs.
+
+Improvements to the testing infrastructure are very welcome.
+
+
+### Algorithms used
+
+At time of writing, this crate's implementation of substring search actually
+has a few different algorithms to choose from depending on the situation.
+
+* For very small haystacks,
+  [Rabin-Karp](https://en.wikipedia.org/wiki/Rabin%E2%80%93Karp_algorithm)
+  is used to reduce latency. Rabin-Karp has very small overhead and can often
+  complete before other searchers have even been constructed.
+* For small needles, a variant of the
+  ["Generic SIMD"](http://0x80.pl/articles/simd-strfind.html#algorithm-1-generic-simd)
+  algorithm is used. Instead of using the first and last bytes, a heuristic is
+  used to select bytes based on a background distribution of byte frequencies.
+* In all other cases,
+  [Two-Way](https://en.wikipedia.org/wiki/Two-way_string-matching_algorithm)
+  is used. If possible, a prefilter based on the "Generic SIMD" algorithm
+  linked above is used to find candidates quickly. A dynamic heuristic is used
+  to detect if the prefilter is ineffective, and if so, disables it.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/scripts/make-byte-frequency-table thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/scripts/make-byte-frequency-table
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/scripts/make-byte-frequency-table	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/scripts/make-byte-frequency-table	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+
+# This does simple normalized frequency analysis on UTF-8 encoded text. The
+# result of the analysis is translated to a ranked list, where every byte is
+# assigned a rank. This list is written to src/freqs.rs.
+#
+# Currently, the frequencies are generated from the following corpuses:
+#
+#   * The CIA world fact book
+#   * The source code of rustc
+#   * Septuaginta
+
+from __future__ import absolute_import, division, print_function
+
+import argparse
+from collections import Counter
+import sys
+
+preamble = '''
+// NOTE: The following code was generated by "scripts/frequencies.py", do not
+// edit directly
+'''.lstrip()
+
+
+def eprint(*args, **kwargs):
+    kwargs['file'] = sys.stderr
+    print(*args, **kwargs)
+
+
+def main():
+    p = argparse.ArgumentParser()
+    p.add_argument('corpus', metavar='FILE', nargs='+')
+    args = p.parse_args()
+
+    # Get frequency counts of each byte.
+    freqs = Counter()
+    for i in range(0, 256):
+        freqs[i] = 0
+
+    eprint('reading entire corpus into memory')
+    corpus = []
+    for fpath in args.corpus:
+        corpus.append(open(fpath, 'rb').read())
+
+    eprint('computing byte frequencies')
+    for c in corpus:
+        for byte in c:
+            freqs[byte] += 1.0 / float(len(c))
+
+    eprint('writing Rust code')
+    # Get the rank of each byte. A lower rank => lower relative frequency.
+    rank = [0] * 256
+    for i, (byte, _) in enumerate(freqs.most_common()):
+        # print(byte)
+        rank[byte] = 255 - i
+
+    # Forcefully set the highest rank possible for bytes that start multi-byte
+    # UTF-8 sequences. The idea here is that a continuation byte will be more
+    # discerning in a homogenous haystack.
+    for byte in range(0xC0, 0xFF + 1):
+        rank[byte] = 255
+
+    # Now write Rust.
+    olines = ['pub const BYTE_FREQUENCIES: [u8; 256] = [']
+    for byte in range(256):
+        olines.append('    %3d, // %r' % (rank[byte], chr(byte)))
+    olines.append('];')
+
+    print(preamble)
+    print('\n'.join(olines))
+
+
+if __name__ == '__main__':
+    main()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/cow.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/cow.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/cow.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/cow.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,97 @@
+use core::ops;
+
+/// A specialized copy-on-write byte string.
+///
+/// The purpose of this type is to permit usage of a "borrowed or owned
+/// byte string" in a way that keeps std/no-std compatibility. That is, in
+/// no-std mode, this type devolves into a simple &[u8] with no owned variant
+/// available. We can't just use a plain Cow because Cow is not in core.
+#[derive(Clone, Debug)]
+pub struct CowBytes<'a>(Imp<'a>);
+
+// N.B. We don't use std::borrow::Cow here since we can get away with a
+// Box<[u8]> for our use case, which is 1/3 smaller than the Vec<u8> that
+// a Cow<[u8]> would use.
+#[cfg(feature = "std")]
+#[derive(Clone, Debug)]
+enum Imp<'a> {
+    Borrowed(&'a [u8]),
+    Owned(Box<[u8]>),
+}
+
+#[cfg(not(feature = "std"))]
+#[derive(Clone, Debug)]
+struct Imp<'a>(&'a [u8]);
+
+impl<'a> ops::Deref for CowBytes<'a> {
+    type Target = [u8];
+
+    #[inline(always)]
+    fn deref(&self) -> &[u8] {
+        self.as_slice()
+    }
+}
+
+impl<'a> CowBytes<'a> {
+    /// Create a new borrowed CowBytes.
+    #[inline(always)]
+    pub fn new<B: ?Sized + AsRef<[u8]>>(bytes: &'a B) -> CowBytes<'a> {
+        CowBytes(Imp::new(bytes.as_ref()))
+    }
+
+    /// Create a new owned CowBytes.
+    #[cfg(feature = "std")]
+    #[inline(always)]
+    pub fn new_owned(bytes: Box<[u8]>) -> CowBytes<'static> {
+        CowBytes(Imp::Owned(bytes))
+    }
+
+    /// Return a borrowed byte string, regardless of whether this is an owned
+    /// or borrowed byte string internally.
+    #[inline(always)]
+    pub fn as_slice(&self) -> &[u8] {
+        self.0.as_slice()
+    }
+
+    /// Return an owned version of this copy-on-write byte string.
+    ///
+    /// If this is already an owned byte string internally, then this is a
+    /// no-op. Otherwise, the internal byte string is copied.
+    #[cfg(feature = "std")]
+    #[inline(always)]
+    pub fn into_owned(self) -> CowBytes<'static> {
+        match self.0 {
+            Imp::Borrowed(b) => CowBytes::new_owned(Box::from(b)),
+            Imp::Owned(b) => CowBytes::new_owned(b),
+        }
+    }
+}
+
+impl<'a> Imp<'a> {
+    #[cfg(feature = "std")]
+    #[inline(always)]
+    pub fn new(bytes: &'a [u8]) -> Imp<'a> {
+        Imp::Borrowed(bytes)
+    }
+
+    #[cfg(not(feature = "std"))]
+    #[inline(always)]
+    pub fn new(bytes: &'a [u8]) -> Imp<'a> {
+        Imp(bytes)
+    }
+
+    #[cfg(feature = "std")]
+    #[inline(always)]
+    pub fn as_slice(&self) -> &[u8] {
+        match self {
+            Imp::Owned(ref x) => x,
+            Imp::Borrowed(x) => x,
+        }
+    }
+
+    #[cfg(not(feature = "std"))]
+    #[inline(always)]
+    pub fn as_slice(&self) -> &[u8] {
+        self.0
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/c.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/c.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/c.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/c.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// This module defines safe wrappers around memchr (POSIX) and memrchr (GNU
-// extension).
-
-#![allow(dead_code)]
-
-extern crate libc;
-
-use self::libc::{c_int, c_void, size_t};
-
-pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    let p = unsafe {
-        libc::memchr(
-            haystack.as_ptr() as *const c_void,
-            needle as c_int,
-            haystack.len() as size_t,
-        )
-    };
-    if p.is_null() {
-        None
-    } else {
-        Some(p as usize - (haystack.as_ptr() as usize))
-    }
-}
-
-// memrchr is a GNU extension. We know it's available on Linux, so start there.
-#[cfg(target_os = "linux")]
-pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    // GNU's memrchr() will - unlike memchr() - error if haystack is empty.
-    if haystack.is_empty() {
-        return None;
-    }
-    let p = unsafe {
-        libc::memrchr(
-            haystack.as_ptr() as *const c_void,
-            needle as c_int,
-            haystack.len() as size_t,
-        )
-    };
-    if p.is_null() {
-        None
-    } else {
-        Some(p as usize - (haystack.as_ptr() as usize))
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/fallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/fallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/fallback.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/fallback.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,330 +0,0 @@
-// This module defines pure Rust platform independent implementations of all
-// the memchr routines. We do our best to make them fast. Some of them may even
-// get auto-vectorized.
-
-use core::cmp;
-use core::usize;
-
-#[cfg(target_pointer_width = "16")]
-const USIZE_BYTES: usize = 2;
-
-#[cfg(target_pointer_width = "32")]
-const USIZE_BYTES: usize = 4;
-
-#[cfg(target_pointer_width = "64")]
-const USIZE_BYTES: usize = 8;
-
-// The number of bytes to loop at in one iteration of memchr/memrchr.
-const LOOP_SIZE: usize = 2 * USIZE_BYTES;
-
-/// Return `true` if `x` contains any zero byte.
-///
-/// From *Matters Computational*, J. Arndt
-///
-/// "The idea is to subtract one from each of the bytes and then look for
-/// bytes where the borrow propagated all the way to the most significant
-/// bit."
-#[inline(always)]
-fn contains_zero_byte(x: usize) -> bool {
-    const LO_U64: u64 = 0x0101010101010101;
-    const HI_U64: u64 = 0x8080808080808080;
-
-    const LO_USIZE: usize = LO_U64 as usize;
-    const HI_USIZE: usize = HI_U64 as usize;
-
-    x.wrapping_sub(LO_USIZE) & !x & HI_USIZE != 0
-}
-
-/// Repeat the given byte into a word size number. That is, every 8 bits
-/// is equivalent to the given byte. For example, if `b` is `\x4E` or
-/// `01001110` in binary, then the returned value on a 32-bit system would be:
-/// `01001110_01001110_01001110_01001110`.
-#[inline(always)]
-fn repeat_byte(b: u8) -> usize {
-    (b as usize) * (usize::MAX / 255)
-}
-
-pub fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = repeat_byte(n1);
-    let confirm = |byte| byte == n1;
-    let loop_size = cmp::min(LOOP_SIZE, haystack.len());
-    let align = USIZE_BYTES - 1;
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    unsafe {
-        if haystack.len() < USIZE_BYTES {
-            return forward_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        let chunk = (ptr as *const usize).read_unaligned();
-        if contains_zero_byte(chunk ^ vn1) {
-            return forward_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
-        debug_assert!(ptr > start_ptr);
-        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
-        while loop_size == LOOP_SIZE && ptr <= end_ptr.sub(loop_size) {
-            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
-
-            let a = *(ptr as *const usize);
-            let b = *(ptr.add(USIZE_BYTES) as *const usize);
-            let eqa = contains_zero_byte(a ^ vn1);
-            let eqb = contains_zero_byte(b ^ vn1);
-            if eqa || eqb {
-                break;
-            }
-            ptr = ptr.add(LOOP_SIZE);
-        }
-        forward_search(start_ptr, end_ptr, ptr, confirm)
-    }
-}
-
-/// Like `memchr`, but searches for two bytes instead of one.
-pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = repeat_byte(n1);
-    let vn2 = repeat_byte(n2);
-    let confirm = |byte| byte == n1 || byte == n2;
-    let align = USIZE_BYTES - 1;
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    unsafe {
-        if haystack.len() < USIZE_BYTES {
-            return forward_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        let chunk = (ptr as *const usize).read_unaligned();
-        let eq1 = contains_zero_byte(chunk ^ vn1);
-        let eq2 = contains_zero_byte(chunk ^ vn2);
-        if eq1 || eq2 {
-            return forward_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
-        debug_assert!(ptr > start_ptr);
-        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
-        while ptr <= end_ptr.sub(USIZE_BYTES) {
-            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
-
-            let chunk = *(ptr as *const usize);
-            let eq1 = contains_zero_byte(chunk ^ vn1);
-            let eq2 = contains_zero_byte(chunk ^ vn2);
-            if eq1 || eq2 {
-                break;
-            }
-            ptr = ptr.add(USIZE_BYTES);
-        }
-        forward_search(start_ptr, end_ptr, ptr, confirm)
-    }
-}
-
-/// Like `memchr`, but searches for three bytes instead of one.
-pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = repeat_byte(n1);
-    let vn2 = repeat_byte(n2);
-    let vn3 = repeat_byte(n3);
-    let confirm = |byte| byte == n1 || byte == n2 || byte == n3;
-    let align = USIZE_BYTES - 1;
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    unsafe {
-        if haystack.len() < USIZE_BYTES {
-            return forward_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        let chunk = (ptr as *const usize).read_unaligned();
-        let eq1 = contains_zero_byte(chunk ^ vn1);
-        let eq2 = contains_zero_byte(chunk ^ vn2);
-        let eq3 = contains_zero_byte(chunk ^ vn3);
-        if eq1 || eq2 || eq3 {
-            return forward_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
-        debug_assert!(ptr > start_ptr);
-        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
-        while ptr <= end_ptr.sub(USIZE_BYTES) {
-            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
-
-            let chunk = *(ptr as *const usize);
-            let eq1 = contains_zero_byte(chunk ^ vn1);
-            let eq2 = contains_zero_byte(chunk ^ vn2);
-            let eq3 = contains_zero_byte(chunk ^ vn3);
-            if eq1 || eq2 || eq3 {
-                break;
-            }
-            ptr = ptr.add(USIZE_BYTES);
-        }
-        forward_search(start_ptr, end_ptr, ptr, confirm)
-    }
-}
-
-/// Return the last index matching the byte `x` in `text`.
-pub fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = repeat_byte(n1);
-    let confirm = |byte| byte == n1;
-    let loop_size = cmp::min(LOOP_SIZE, haystack.len());
-    let align = USIZE_BYTES - 1;
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    unsafe {
-        if haystack.len() < USIZE_BYTES {
-            return reverse_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
-        if contains_zero_byte(chunk ^ vn1) {
-            return reverse_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        ptr = (end_ptr as usize & !align) as *const u8;
-        debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-        while loop_size == LOOP_SIZE && ptr >= start_ptr.add(loop_size) {
-            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
-
-            let a = *(ptr.sub(2 * USIZE_BYTES) as *const usize);
-            let b = *(ptr.sub(1 * USIZE_BYTES) as *const usize);
-            let eqa = contains_zero_byte(a ^ vn1);
-            let eqb = contains_zero_byte(b ^ vn1);
-            if eqa || eqb {
-                break;
-            }
-            ptr = ptr.sub(loop_size);
-        }
-        reverse_search(start_ptr, end_ptr, ptr, confirm)
-    }
-}
-
-/// Like `memrchr`, but searches for two bytes instead of one.
-pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = repeat_byte(n1);
-    let vn2 = repeat_byte(n2);
-    let confirm = |byte| byte == n1 || byte == n2;
-    let align = USIZE_BYTES - 1;
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    unsafe {
-        if haystack.len() < USIZE_BYTES {
-            return reverse_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
-        let eq1 = contains_zero_byte(chunk ^ vn1);
-        let eq2 = contains_zero_byte(chunk ^ vn2);
-        if eq1 || eq2 {
-            return reverse_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        ptr = (end_ptr as usize & !align) as *const u8;
-        debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-        while ptr >= start_ptr.add(USIZE_BYTES) {
-            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
-
-            let chunk = *(ptr.sub(USIZE_BYTES) as *const usize);
-            let eq1 = contains_zero_byte(chunk ^ vn1);
-            let eq2 = contains_zero_byte(chunk ^ vn2);
-            if eq1 || eq2 {
-                break;
-            }
-            ptr = ptr.sub(USIZE_BYTES);
-        }
-        reverse_search(start_ptr, end_ptr, ptr, confirm)
-    }
-}
-
-/// Like `memrchr`, but searches for three bytes instead of one.
-pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = repeat_byte(n1);
-    let vn2 = repeat_byte(n2);
-    let vn3 = repeat_byte(n3);
-    let confirm = |byte| byte == n1 || byte == n2 || byte == n3;
-    let align = USIZE_BYTES - 1;
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    unsafe {
-        if haystack.len() < USIZE_BYTES {
-            return reverse_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
-        let eq1 = contains_zero_byte(chunk ^ vn1);
-        let eq2 = contains_zero_byte(chunk ^ vn2);
-        let eq3 = contains_zero_byte(chunk ^ vn3);
-        if eq1 || eq2 || eq3 {
-            return reverse_search(start_ptr, end_ptr, ptr, confirm);
-        }
-
-        ptr = (end_ptr as usize & !align) as *const u8;
-        debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-        while ptr >= start_ptr.add(USIZE_BYTES) {
-            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
-
-            let chunk = *(ptr.sub(USIZE_BYTES) as *const usize);
-            let eq1 = contains_zero_byte(chunk ^ vn1);
-            let eq2 = contains_zero_byte(chunk ^ vn2);
-            let eq3 = contains_zero_byte(chunk ^ vn3);
-            if eq1 || eq2 || eq3 {
-                break;
-            }
-            ptr = ptr.sub(USIZE_BYTES);
-        }
-        reverse_search(start_ptr, end_ptr, ptr, confirm)
-    }
-}
-
-#[inline(always)]
-unsafe fn forward_search<F: Fn(u8) -> bool>(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    mut ptr: *const u8,
-    confirm: F,
-) -> Option<usize> {
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr);
-
-    while ptr < end_ptr {
-        if confirm(*ptr) {
-            return Some(sub(ptr, start_ptr));
-        }
-        ptr = ptr.offset(1);
-    }
-    None
-}
-
-#[inline(always)]
-unsafe fn reverse_search<F: Fn(u8) -> bool>(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    mut ptr: *const u8,
-    confirm: F,
-) -> Option<usize> {
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr);
-
-    while ptr > start_ptr {
-        ptr = ptr.offset(-1);
-        if confirm(*ptr) {
-            return Some(sub(ptr, start_ptr));
-        }
-    }
-    None
-}
-
-/// Subtract `b` from `a` and return the difference. `a` should be greater than
-/// or equal to `b`.
-fn sub(a: *const u8, b: *const u8) -> usize {
-    debug_assert!(a >= b);
-    (a as usize) - (b as usize)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/iter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-use {memchr, memchr2, memchr3, memrchr, memrchr2, memrchr3};
-
-macro_rules! iter_next {
-    // Common code for the memchr iterators:
-    // update haystack and position and produce the index
-    //
-    // self: &mut Self where Self is the iterator
-    // search_result: Option<usize> which is the result of the corresponding
-    // memchr function.
-    //
-    // Returns Option<usize> (the next iterator element)
-    ($self_:expr, $search_result:expr) => {
-        $search_result.map(move |index| {
-            // split and take the remaining back half
-            $self_.haystack = $self_.haystack.split_at(index + 1).1;
-            let found_position = $self_.position + index;
-            $self_.position = found_position + 1;
-            found_position
-        })
-    };
-}
-
-macro_rules! iter_next_back {
-    ($self_:expr, $search_result:expr) => {
-        $search_result.map(move |index| {
-            // split and take the remaining front half
-            $self_.haystack = $self_.haystack.split_at(index).0;
-            $self_.position + index
-        })
-    };
-}
-
-/// An iterator for `memchr`.
-pub struct Memchr<'a> {
-    needle: u8,
-    // The haystack to iterate over
-    haystack: &'a [u8],
-    // The index
-    position: usize,
-}
-
-impl<'a> Memchr<'a> {
-    /// Creates a new iterator that yields all positions of needle in haystack.
-    #[inline]
-    pub fn new(needle: u8, haystack: &[u8]) -> Memchr {
-        Memchr { needle: needle, haystack: haystack, position: 0 }
-    }
-}
-
-impl<'a> Iterator for Memchr<'a> {
-    type Item = usize;
-
-    #[inline]
-    fn next(&mut self) -> Option<usize> {
-        iter_next!(self, memchr(self.needle, self.haystack))
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, Some(self.haystack.len()))
-    }
-}
-
-impl<'a> DoubleEndedIterator for Memchr<'a> {
-    #[inline]
-    fn next_back(&mut self) -> Option<Self::Item> {
-        iter_next_back!(self, memrchr(self.needle, self.haystack))
-    }
-}
-
-/// An iterator for `memchr2`.
-pub struct Memchr2<'a> {
-    needle1: u8,
-    needle2: u8,
-    // The haystack to iterate over
-    haystack: &'a [u8],
-    // The index
-    position: usize,
-}
-
-impl<'a> Memchr2<'a> {
-    /// Creates a new iterator that yields all positions of needle in haystack.
-    #[inline]
-    pub fn new(needle1: u8, needle2: u8, haystack: &[u8]) -> Memchr2 {
-        Memchr2 {
-            needle1: needle1,
-            needle2: needle2,
-            haystack: haystack,
-            position: 0,
-        }
-    }
-}
-
-impl<'a> Iterator for Memchr2<'a> {
-    type Item = usize;
-
-    #[inline]
-    fn next(&mut self) -> Option<usize> {
-        iter_next!(self, memchr2(self.needle1, self.needle2, self.haystack))
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, Some(self.haystack.len()))
-    }
-}
-
-impl<'a> DoubleEndedIterator for Memchr2<'a> {
-    #[inline]
-    fn next_back(&mut self) -> Option<Self::Item> {
-        iter_next_back!(
-            self,
-            memrchr2(self.needle1, self.needle2, self.haystack)
-        )
-    }
-}
-
-/// An iterator for `memchr3`.
-pub struct Memchr3<'a> {
-    needle1: u8,
-    needle2: u8,
-    needle3: u8,
-    // The haystack to iterate over
-    haystack: &'a [u8],
-    // The index
-    position: usize,
-}
-
-impl<'a> Memchr3<'a> {
-    /// Create a new `Memchr3` that's initialized to zero with a haystack
-    #[inline]
-    pub fn new(
-        needle1: u8,
-        needle2: u8,
-        needle3: u8,
-        haystack: &[u8],
-    ) -> Memchr3 {
-        Memchr3 {
-            needle1: needle1,
-            needle2: needle2,
-            needle3: needle3,
-            haystack: haystack,
-            position: 0,
-        }
-    }
-}
-
-impl<'a> Iterator for Memchr3<'a> {
-    type Item = usize;
-
-    #[inline]
-    fn next(&mut self) -> Option<usize> {
-        iter_next!(
-            self,
-            memchr3(self.needle1, self.needle2, self.needle3, self.haystack)
-        )
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, Some(self.haystack.len()))
-    }
-}
-
-impl<'a> DoubleEndedIterator for Memchr3<'a> {
-    #[inline]
-    fn next_back(&mut self) -> Option<Self::Item> {
-        iter_next_back!(
-            self,
-            memrchr3(self.needle1, self.needle2, self.needle3, self.haystack)
-        )
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,451 +1,181 @@
 /*!
-The `memchr` crate provides heavily optimized routines for searching bytes.
+This library provides heavily optimized routines for string search primitives.
 
-The `memchr` function is traditionally provided by libc, however, the
-performance of `memchr` can vary significantly depending on the specific
-implementation of libc that is used. They can range from manually tuned
-Assembly implementations (like that found in GNU's libc) all the way to
-non-vectorized C implementations (like that found in MUSL).
-
-To smooth out the differences between implementations of libc, at least
-on `x86_64` for Rust 1.27+, this crate provides its own implementation of
-`memchr` that should perform competitively with the one found in GNU's libc.
-The implementation is in pure Rust and has no dependency on a C compiler or an
-Assembler.
-
-Additionally, GNU libc also provides an extension, `memrchr`. This crate
-provides its own implementation of `memrchr` as well, on top of `memchr2`,
-`memchr3`, `memrchr2` and `memrchr3`. The difference between `memchr` and
-`memchr2` is that that `memchr2` permits finding all occurrences of two bytes
-instead of one. Similarly for `memchr3`.
-*/
+# Overview
 
-#![cfg_attr(not(feature = "std"), no_std)]
-#![deny(missing_docs)]
-#![doc(html_root_url = "https://docs.rs/memchr/2.0.0")]
+This section gives a brief high level overview of what this crate offers.
 
-// Supporting 8-bit (or others) would be fine. If you need it, please submit a
-// bug report at https://github.com/BurntSushi/rust-memchr
-#[cfg(not(any(
-    target_pointer_width = "16",
-    target_pointer_width = "32",
-    target_pointer_width = "64"
-)))]
-compile_error!("memchr currently not supported on non-32 or non-64 bit");
+* The top-level module provides routines for searching for 1, 2 or 3 bytes
+  in the forward or reverse direction. When searching for more than one byte,
+  positions are considered a match if the byte at that position matches any
+  of the bytes.
+* The [`memmem`] sub-module provides forward and reverse substring search
+  routines.
 
-#[cfg(feature = "std")]
-extern crate core;
+In all such cases, routines operate on `&[u8]` without regard to encoding. This
+is exactly what you want when searching either UTF-8 or arbitrary bytes.
 
-#[cfg(all(test, all(not(miri), feature = "std")))]
-#[macro_use]
-extern crate quickcheck;
-
-use core::iter::Rev;
-
-pub use iter::{Memchr, Memchr2, Memchr3};
-
-// N.B. If you're looking for the cfg knobs for libc, see build.rs.
-#[cfg(memchr_libc)]
-mod c;
-#[allow(dead_code)]
-mod fallback;
-mod iter;
-mod naive;
-#[cfg(all(test, all(not(miri), feature = "std")))]
-mod tests;
-#[cfg(all(test, any(miri, not(feature = "std"))))]
-#[path = "tests/miri.rs"]
-mod tests;
-#[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
-mod x86;
+# Example: using `memchr`
 
-/// An iterator over all occurrences of the needle in a haystack.
-#[inline]
-pub fn memchr_iter(needle: u8, haystack: &[u8]) -> Memchr {
-    Memchr::new(needle, haystack)
-}
+This example shows how to use `memchr` to find the first occurrence of `z` in
+a haystack:
 
-/// An iterator over all occurrences of the needles in a haystack.
-#[inline]
-pub fn memchr2_iter(needle1: u8, needle2: u8, haystack: &[u8]) -> Memchr2 {
-    Memchr2::new(needle1, needle2, haystack)
-}
+```
+use memchr::memchr;
 
-/// An iterator over all occurrences of the needles in a haystack.
-#[inline]
-pub fn memchr3_iter(
-    needle1: u8,
-    needle2: u8,
-    needle3: u8,
-    haystack: &[u8],
-) -> Memchr3 {
-    Memchr3::new(needle1, needle2, needle3, haystack)
-}
+let haystack = b"foo bar baz quuz";
+assert_eq!(Some(10), memchr(b'z', haystack));
+```
 
-/// An iterator over all occurrences of the needle in a haystack, in reverse.
-#[inline]
-pub fn memrchr_iter(needle: u8, haystack: &[u8]) -> Rev<Memchr> {
-    Memchr::new(needle, haystack).rev()
-}
+# Example: matching one of three possible bytes
 
-/// An iterator over all occurrences of the needles in a haystack, in reverse.
-#[inline]
-pub fn memrchr2_iter(
-    needle1: u8,
-    needle2: u8,
-    haystack: &[u8],
-) -> Rev<Memchr2> {
-    Memchr2::new(needle1, needle2, haystack).rev()
-}
+This examples shows how to use `memrchr3` to find occurrences of `a`, `b` or
+`c`, starting at the end of the haystack.
 
-/// An iterator over all occurrences of the needles in a haystack, in reverse.
-#[inline]
-pub fn memrchr3_iter(
-    needle1: u8,
-    needle2: u8,
-    needle3: u8,
-    haystack: &[u8],
-) -> Rev<Memchr3> {
-    Memchr3::new(needle1, needle2, needle3, haystack).rev()
-}
+```
+use memchr::memchr3_iter;
 
-/// Search for the first occurrence of a byte in a slice.
-///
-/// This returns the index corresponding to the first occurrence of `needle` in
-/// `haystack`, or `None` if one is not found.
-///
-/// While this is operationally the same as something like
-/// `haystack.iter().position(|&b| b == needle)`, `memchr` will use a highly
-/// optimized routine that can be up to an order of magnitude faster in some
-/// cases.
-///
-/// # Example
-///
-/// This shows how to find the first position of a byte in a byte string.
-///
-/// ```
-/// use memchr::memchr;
-///
-/// let haystack = b"the quick brown fox";
-/// assert_eq!(memchr(b'k', haystack), Some(8));
-/// ```
-#[inline]
-pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    #[cfg(miri)]
-    #[inline(always)]
-    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
-        naive::memchr(n1, haystack)
-    }
-
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
-    #[inline(always)]
-    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
-        x86::memchr(n1, haystack)
-    }
-
-    #[cfg(all(
-        memchr_libc,
-        not(all(target_arch = "x86_64", memchr_runtime_simd)),
-        not(miri),
-    ))]
-    #[inline(always)]
-    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
-        c::memchr(n1, haystack)
-    }
-
-    #[cfg(all(
-        not(memchr_libc),
-        not(all(target_arch = "x86_64", memchr_runtime_simd)),
-        not(miri),
-    ))]
-    #[inline(always)]
-    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
-        fallback::memchr(n1, haystack)
-    }
-
-    if haystack.is_empty() {
-        None
-    } else {
-        imp(needle, haystack)
-    }
-}
+let haystack = b"xyzaxyzbxyzc";
 
-/// Like `memchr`, but searches for either of two bytes instead of just one.
-///
-/// This returns the index corresponding to the first occurrence of `needle1`
-/// or the first occurrence of `needle2` in `haystack` (whichever occurs
-/// earlier), or `None` if neither one is found.
-///
-/// While this is operationally the same as something like
-/// `haystack.iter().position(|&b| b == needle1 || b == needle2)`, `memchr2`
-/// will use a highly optimized routine that can be up to an order of magnitude
-/// faster in some cases.
-///
-/// # Example
-///
-/// This shows how to find the first position of either of two bytes in a byte
-/// string.
-///
-/// ```
-/// use memchr::memchr2;
-///
-/// let haystack = b"the quick brown fox";
-/// assert_eq!(memchr2(b'k', b'q', haystack), Some(4));
-/// ```
-#[inline]
-pub fn memchr2(needle1: u8, needle2: u8, haystack: &[u8]) -> Option<usize> {
-    #[cfg(miri)]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-        naive::memchr2(n1, n2, haystack)
-    }
-
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-        x86::memchr2(n1, n2, haystack)
-    }
-
-    #[cfg(all(
-        not(all(target_arch = "x86_64", memchr_runtime_simd)),
-        not(miri),
-    ))]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-        fallback::memchr2(n1, n2, haystack)
-    }
-
-    if haystack.is_empty() {
-        None
-    } else {
-        imp(needle1, needle2, haystack)
-    }
-}
+let mut it = memchr3_iter(b'a', b'b', b'c', haystack).rev();
+assert_eq!(Some(11), it.next());
+assert_eq!(Some(7), it.next());
+assert_eq!(Some(3), it.next());
+assert_eq!(None, it.next());
+```
 
-/// Like `memchr`, but searches for any of three bytes instead of just one.
-///
-/// This returns the index corresponding to the first occurrence of `needle1`,
-/// the first occurrence of `needle2`, or the first occurrence of `needle3` in
-/// `haystack` (whichever occurs earliest), or `None` if none are found.
-///
-/// While this is operationally the same as something like
-/// `haystack.iter().position(|&b| b == needle1 || b == needle2 ||
-/// b == needle3)`, `memchr3` will use a highly optimized routine that can be
-/// up to an order of magnitude faster in some cases.
-///
-/// # Example
-///
-/// This shows how to find the first position of any of three bytes in a byte
-/// string.
-///
-/// ```
-/// use memchr::memchr3;
-///
-/// let haystack = b"the quick brown fox";
-/// assert_eq!(memchr3(b'k', b'q', b'e', haystack), Some(2));
-/// ```
-#[inline]
-pub fn memchr3(
-    needle1: u8,
-    needle2: u8,
-    needle3: u8,
-    haystack: &[u8],
-) -> Option<usize> {
-    #[cfg(miri)]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-        naive::memchr3(n1, n2, n3, haystack)
-    }
-
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-        x86::memchr3(n1, n2, n3, haystack)
-    }
-
-    #[cfg(all(
-        not(all(target_arch = "x86_64", memchr_runtime_simd)),
-        not(miri),
-    ))]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-        fallback::memchr3(n1, n2, n3, haystack)
-    }
-
-    if haystack.is_empty() {
-        None
-    } else {
-        imp(needle1, needle2, needle3, haystack)
-    }
-}
+# Example: iterating over substring matches
 
-/// Search for the last occurrence of a byte in a slice.
-///
-/// This returns the index corresponding to the last occurrence of `needle` in
-/// `haystack`, or `None` if one is not found.
-///
-/// While this is operationally the same as something like
-/// `haystack.iter().rposition(|&b| b == needle)`, `memrchr` will use a highly
-/// optimized routine that can be up to an order of magnitude faster in some
-/// cases.
-///
-/// # Example
-///
-/// This shows how to find the last position of a byte in a byte string.
-///
-/// ```
-/// use memchr::memrchr;
-///
-/// let haystack = b"the quick brown fox";
-/// assert_eq!(memrchr(b'o', haystack), Some(17));
-/// ```
-#[inline]
-pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    #[cfg(miri)]
-    #[inline(always)]
-    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
-        naive::memrchr(n1, haystack)
-    }
-
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
-    #[inline(always)]
-    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
-        x86::memrchr(n1, haystack)
-    }
-
-    #[cfg(all(
-        memchr_libc,
-        target_os = "linux",
-        not(all(target_arch = "x86_64", memchr_runtime_simd)),
-        not(miri)
-    ))]
-    #[inline(always)]
-    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
-        c::memrchr(n1, haystack)
-    }
-
-    #[cfg(all(
-        not(all(memchr_libc, target_os = "linux")),
-        not(all(target_arch = "x86_64", memchr_runtime_simd)),
-        not(miri),
-    ))]
-    #[inline(always)]
-    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
-        fallback::memrchr(n1, haystack)
-    }
-
-    if haystack.is_empty() {
-        None
-    } else {
-        imp(needle, haystack)
-    }
-}
+This example shows how to use the [`memmem`] sub-module to find occurrences of
+a substring in a haystack.
+
+```
+use memchr::memmem;
+
+let haystack = b"foo bar foo baz foo";
+
+let mut it = memmem::find_iter(haystack, "foo");
+assert_eq!(Some(0), it.next());
+assert_eq!(Some(8), it.next());
+assert_eq!(Some(16), it.next());
+assert_eq!(None, it.next());
+```
+
+# Example: repeating a search for the same needle
+
+It may be possible for the overhead of constructing a substring searcher to be
+measurable in some workloads. In cases where the same needle is used to search
+many haystacks, it is possible to do construction once and thus to avoid it for
+subsequent searches. This can be done with a [`memmem::Finder`]:
+
+```
+use memchr::memmem;
 
-/// Like `memrchr`, but searches for either of two bytes instead of just one.
-///
-/// This returns the index corresponding to the last occurrence of `needle1`
-/// or the last occurrence of `needle2` in `haystack` (whichever occurs later),
-/// or `None` if neither one is found.
-///
-/// While this is operationally the same as something like
-/// `haystack.iter().rposition(|&b| b == needle1 || b == needle2)`, `memrchr2`
-/// will use a highly optimized routine that can be up to an order of magnitude
-/// faster in some cases.
-///
-/// # Example
-///
-/// This shows how to find the last position of either of two bytes in a byte
-/// string.
-///
-/// ```
-/// use memchr::memrchr2;
-///
-/// let haystack = b"the quick brown fox";
-/// assert_eq!(memrchr2(b'k', b'q', haystack), Some(8));
-/// ```
-#[inline]
-pub fn memrchr2(needle1: u8, needle2: u8, haystack: &[u8]) -> Option<usize> {
-    #[cfg(miri)]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-        naive::memrchr2(n1, n2, haystack)
-    }
-
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-        x86::memrchr2(n1, n2, haystack)
-    }
-
-    #[cfg(all(
-        not(all(target_arch = "x86_64", memchr_runtime_simd)),
-        not(miri),
-    ))]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-        fallback::memrchr2(n1, n2, haystack)
-    }
-
-    if haystack.is_empty() {
-        None
-    } else {
-        imp(needle1, needle2, haystack)
-    }
+let finder = memmem::Finder::new("foo");
+
+assert_eq!(Some(4), finder.find(b"baz foo quux"));
+assert_eq!(None, finder.find(b"quux baz bar"));
+```
+
+# Why use this crate?
+
+At first glance, the APIs provided by this crate might seem weird. Why provide
+a dedicated routine like `memchr` for something that could be implemented
+clearly and trivially in one line:
+
+```
+fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
+    haystack.iter().position(|&b| b == needle)
 }
+```
 
-/// Like `memrchr`, but searches for any of three bytes instead of just one.
-///
-/// This returns the index corresponding to the last occurrence of `needle1`,
-/// the last occurrence of `needle2`, or the last occurrence of `needle3` in
-/// `haystack` (whichever occurs later), or `None` if none are found.
-///
-/// While this is operationally the same as something like
-/// `haystack.iter().rposition(|&b| b == needle1 || b == needle2 ||
-/// b == needle3)`, `memrchr3` will use a highly optimized routine that can be
-/// up to an order of magnitude faster in some cases.
-///
-/// # Example
-///
-/// This shows how to find the last position of any of three bytes in a byte
-/// string.
-///
-/// ```
-/// use memchr::memrchr3;
-///
-/// let haystack = b"the quick brown fox";
-/// assert_eq!(memrchr3(b'k', b'q', b'e', haystack), Some(8));
-/// ```
-#[inline]
-pub fn memrchr3(
-    needle1: u8,
-    needle2: u8,
-    needle3: u8,
-    haystack: &[u8],
-) -> Option<usize> {
-    #[cfg(miri)]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-        naive::memrchr3(n1, n2, n3, haystack)
-    }
-
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-        x86::memrchr3(n1, n2, n3, haystack)
-    }
-
-    #[cfg(all(
-        not(all(target_arch = "x86_64", memchr_runtime_simd)),
-        not(miri),
-    ))]
-    #[inline(always)]
-    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-        fallback::memrchr3(n1, n2, n3, haystack)
-    }
-
-    if haystack.is_empty() {
-        None
-    } else {
-        imp(needle1, needle2, needle3, haystack)
-    }
+Or similarly, why does this crate provide substring search routines when Rust's
+core library already provides them?
+
+```
+fn search(haystack: &str, needle: &str) -> Option<usize> {
+    haystack.find(needle)
 }
+```
+
+The primary reason for both of them to exist is performance. When it comes to
+performance, at a high level at least, there are two primary ways to look at
+it:
+
+* **Throughput**: For this, think about it as, "given some very large haystack
+  and a byte that never occurs in that haystack, how long does it take to
+  search through it and determine that it, in fact, does not occur?"
+* **Latency**: For this, think about it as, "given a tiny haystack---just a
+  few bytes---how long does it take to determine if a byte is in it?"
+
+The `memchr` routine in this crate has _slightly_ worse latency than the
+solution presented above, however, its throughput can easily be over an
+order of magnitude faster. This is a good general purpose trade off to make.
+You rarely lose, but often gain big.
+
+**NOTE:** The name `memchr` comes from the corresponding routine in libc. A key
+advantage of using this library is that its performance is not tied to its
+quality of implementation in the libc you happen to be using, which can vary
+greatly from platform to platform.
+
+But what about substring search? This one is a bit more complicated. The
+primary reason for its existence is still indeed performance, but it's also
+useful because Rust's core library doesn't actually expose any substring
+search routine on arbitrary bytes. The only substring search routine that
+exists works exclusively on valid UTF-8.
+
+So if you have valid UTF-8, is there a reason to use this over the standard
+library substring search routine? Yes. This routine is faster on almost every
+metric, including latency. The natural question then, is why isn't this
+implementation in the standard library, even if only for searching on UTF-8?
+The reason is that the implementation details for using SIMD in the standard
+library haven't quite been worked out yet.
+
+**NOTE:** Currently, only `x86_64` targets have highly accelerated
+implementations of substring search. For `memchr`, all targets have
+somewhat-accelerated implementations, while only `x86_64` targets have highly
+accelerated implementations. This limitation is expected to be lifted once the
+standard library exposes a platform independent SIMD API.
+
+# Crate features
+
+* **std** - When enabled (the default), this will permit this crate to use
+  features specific to the standard library. Currently, the only thing used
+  from the standard library is runtime SIMD CPU feature detection. This means
+  that this feature must be enabled to get AVX accelerated routines. When
+  `std` is not enabled, this crate will still attempt to use SSE2 accelerated
+  routines on `x86_64`.
+* **libc** - When enabled (**not** the default), this library will use your
+  platform's libc implementation of `memchr` (and `memrchr` on Linux). This
+  can be useful on non-`x86_64` targets where the fallback implementation in
+  this crate is not as good as the one found in your libc. All other routines
+  (e.g., `memchr[23]` and substring search) unconditionally use the
+  implementation in this crate.
+*/
+
+#![deny(missing_docs)]
+#![cfg_attr(not(feature = "std"), no_std)]
+// It's not worth trying to gate all code on just miri, so turn off relevant
+// dead code warnings.
+#![cfg_attr(miri, allow(dead_code, unused_macros))]
+
+// Supporting 8-bit (or others) would be fine. If you need it, please submit a
+// bug report at https://github.com/BurntSushi/memchr
+#[cfg(not(any(
+    target_pointer_width = "16",
+    target_pointer_width = "32",
+    target_pointer_width = "64"
+)))]
+compile_error!("memchr currently not supported on non-{16,32,64}");
+
+pub use crate::memchr::{
+    memchr, memchr2, memchr2_iter, memchr3, memchr3_iter, memchr_iter,
+    memrchr, memrchr2, memrchr2_iter, memrchr3, memrchr3_iter, memrchr_iter,
+    Memchr, Memchr2, Memchr3,
+};
+
+mod cow;
+mod memchr;
+pub mod memmem;
+#[cfg(test)]
+mod tests;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/c.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/c.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/c.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/c.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+// This module defines safe wrappers around memchr (POSIX) and memrchr (GNU
+// extension).
+
+#![allow(dead_code)]
+
+use libc::{c_int, c_void, size_t};
+
+pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
+    // SAFETY: This is safe to call since all pointers are valid.
+    let p = unsafe {
+        libc::memchr(
+            haystack.as_ptr() as *const c_void,
+            needle as c_int,
+            haystack.len() as size_t,
+        )
+    };
+    if p.is_null() {
+        None
+    } else {
+        Some(p as usize - (haystack.as_ptr() as usize))
+    }
+}
+
+// memrchr is a GNU extension. We know it's available on Linux at least.
+#[cfg(target_os = "linux")]
+pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
+    // GNU's memrchr() will - unlike memchr() - error if haystack is empty.
+    if haystack.is_empty() {
+        return None;
+    }
+    // SAFETY: This is safe to call since all pointers are valid.
+    let p = unsafe {
+        libc::memrchr(
+            haystack.as_ptr() as *const c_void,
+            needle as c_int,
+            haystack.len() as size_t,
+        )
+    };
+    if p.is_null() {
+        None
+    } else {
+        Some(p as usize - (haystack.as_ptr() as usize))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/fallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/fallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/fallback.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/fallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,329 @@
+// This module defines pure Rust platform independent implementations of all
+// the memchr routines. We do our best to make them fast. Some of them may even
+// get auto-vectorized.
+
+use core::{cmp, usize};
+
+#[cfg(target_pointer_width = "16")]
+const USIZE_BYTES: usize = 2;
+
+#[cfg(target_pointer_width = "32")]
+const USIZE_BYTES: usize = 4;
+
+#[cfg(target_pointer_width = "64")]
+const USIZE_BYTES: usize = 8;
+
+// The number of bytes to loop at in one iteration of memchr/memrchr.
+const LOOP_SIZE: usize = 2 * USIZE_BYTES;
+
+/// Return `true` if `x` contains any zero byte.
+///
+/// From *Matters Computational*, J. Arndt
+///
+/// "The idea is to subtract one from each of the bytes and then look for
+/// bytes where the borrow propagated all the way to the most significant
+/// bit."
+#[inline(always)]
+fn contains_zero_byte(x: usize) -> bool {
+    const LO_U64: u64 = 0x0101010101010101;
+    const HI_U64: u64 = 0x8080808080808080;
+
+    const LO_USIZE: usize = LO_U64 as usize;
+    const HI_USIZE: usize = HI_U64 as usize;
+
+    x.wrapping_sub(LO_USIZE) & !x & HI_USIZE != 0
+}
+
+/// Repeat the given byte into a word size number. That is, every 8 bits
+/// is equivalent to the given byte. For example, if `b` is `\x4E` or
+/// `01001110` in binary, then the returned value on a 32-bit system would be:
+/// `01001110_01001110_01001110_01001110`.
+#[inline(always)]
+fn repeat_byte(b: u8) -> usize {
+    (b as usize) * (usize::MAX / 255)
+}
+
+pub fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = repeat_byte(n1);
+    let confirm = |byte| byte == n1;
+    let loop_size = cmp::min(LOOP_SIZE, haystack.len());
+    let align = USIZE_BYTES - 1;
+    let start_ptr = haystack.as_ptr();
+    let mut ptr = start_ptr;
+
+    unsafe {
+        let end_ptr = start_ptr.add(haystack.len());
+        if haystack.len() < USIZE_BYTES {
+            return forward_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        let chunk = (ptr as *const usize).read_unaligned();
+        if contains_zero_byte(chunk ^ vn1) {
+            return forward_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
+        debug_assert!(ptr > start_ptr);
+        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
+        while loop_size == LOOP_SIZE && ptr <= end_ptr.sub(loop_size) {
+            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
+
+            let a = *(ptr as *const usize);
+            let b = *(ptr.add(USIZE_BYTES) as *const usize);
+            let eqa = contains_zero_byte(a ^ vn1);
+            let eqb = contains_zero_byte(b ^ vn1);
+            if eqa || eqb {
+                break;
+            }
+            ptr = ptr.add(LOOP_SIZE);
+        }
+        forward_search(start_ptr, end_ptr, ptr, confirm)
+    }
+}
+
+/// Like `memchr`, but searches for two bytes instead of one.
+pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = repeat_byte(n1);
+    let vn2 = repeat_byte(n2);
+    let confirm = |byte| byte == n1 || byte == n2;
+    let align = USIZE_BYTES - 1;
+    let start_ptr = haystack.as_ptr();
+    let mut ptr = start_ptr;
+
+    unsafe {
+        let end_ptr = start_ptr.add(haystack.len());
+        if haystack.len() < USIZE_BYTES {
+            return forward_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        let chunk = (ptr as *const usize).read_unaligned();
+        let eq1 = contains_zero_byte(chunk ^ vn1);
+        let eq2 = contains_zero_byte(chunk ^ vn2);
+        if eq1 || eq2 {
+            return forward_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
+        debug_assert!(ptr > start_ptr);
+        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
+        while ptr <= end_ptr.sub(USIZE_BYTES) {
+            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
+
+            let chunk = *(ptr as *const usize);
+            let eq1 = contains_zero_byte(chunk ^ vn1);
+            let eq2 = contains_zero_byte(chunk ^ vn2);
+            if eq1 || eq2 {
+                break;
+            }
+            ptr = ptr.add(USIZE_BYTES);
+        }
+        forward_search(start_ptr, end_ptr, ptr, confirm)
+    }
+}
+
+/// Like `memchr`, but searches for three bytes instead of one.
+pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = repeat_byte(n1);
+    let vn2 = repeat_byte(n2);
+    let vn3 = repeat_byte(n3);
+    let confirm = |byte| byte == n1 || byte == n2 || byte == n3;
+    let align = USIZE_BYTES - 1;
+    let start_ptr = haystack.as_ptr();
+    let mut ptr = start_ptr;
+
+    unsafe {
+        let end_ptr = start_ptr.add(haystack.len());
+        if haystack.len() < USIZE_BYTES {
+            return forward_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        let chunk = (ptr as *const usize).read_unaligned();
+        let eq1 = contains_zero_byte(chunk ^ vn1);
+        let eq2 = contains_zero_byte(chunk ^ vn2);
+        let eq3 = contains_zero_byte(chunk ^ vn3);
+        if eq1 || eq2 || eq3 {
+            return forward_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
+        debug_assert!(ptr > start_ptr);
+        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
+        while ptr <= end_ptr.sub(USIZE_BYTES) {
+            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
+
+            let chunk = *(ptr as *const usize);
+            let eq1 = contains_zero_byte(chunk ^ vn1);
+            let eq2 = contains_zero_byte(chunk ^ vn2);
+            let eq3 = contains_zero_byte(chunk ^ vn3);
+            if eq1 || eq2 || eq3 {
+                break;
+            }
+            ptr = ptr.add(USIZE_BYTES);
+        }
+        forward_search(start_ptr, end_ptr, ptr, confirm)
+    }
+}
+
+/// Return the last index matching the byte `x` in `text`.
+pub fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = repeat_byte(n1);
+    let confirm = |byte| byte == n1;
+    let loop_size = cmp::min(LOOP_SIZE, haystack.len());
+    let align = USIZE_BYTES - 1;
+    let start_ptr = haystack.as_ptr();
+
+    unsafe {
+        let end_ptr = start_ptr.add(haystack.len());
+        let mut ptr = end_ptr;
+        if haystack.len() < USIZE_BYTES {
+            return reverse_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
+        if contains_zero_byte(chunk ^ vn1) {
+            return reverse_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        ptr = (end_ptr as usize & !align) as *const u8;
+        debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+        while loop_size == LOOP_SIZE && ptr >= start_ptr.add(loop_size) {
+            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
+
+            let a = *(ptr.sub(2 * USIZE_BYTES) as *const usize);
+            let b = *(ptr.sub(1 * USIZE_BYTES) as *const usize);
+            let eqa = contains_zero_byte(a ^ vn1);
+            let eqb = contains_zero_byte(b ^ vn1);
+            if eqa || eqb {
+                break;
+            }
+            ptr = ptr.sub(loop_size);
+        }
+        reverse_search(start_ptr, end_ptr, ptr, confirm)
+    }
+}
+
+/// Like `memrchr`, but searches for two bytes instead of one.
+pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = repeat_byte(n1);
+    let vn2 = repeat_byte(n2);
+    let confirm = |byte| byte == n1 || byte == n2;
+    let align = USIZE_BYTES - 1;
+    let start_ptr = haystack.as_ptr();
+
+    unsafe {
+        let end_ptr = start_ptr.add(haystack.len());
+        let mut ptr = end_ptr;
+        if haystack.len() < USIZE_BYTES {
+            return reverse_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
+        let eq1 = contains_zero_byte(chunk ^ vn1);
+        let eq2 = contains_zero_byte(chunk ^ vn2);
+        if eq1 || eq2 {
+            return reverse_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        ptr = (end_ptr as usize & !align) as *const u8;
+        debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+        while ptr >= start_ptr.add(USIZE_BYTES) {
+            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
+
+            let chunk = *(ptr.sub(USIZE_BYTES) as *const usize);
+            let eq1 = contains_zero_byte(chunk ^ vn1);
+            let eq2 = contains_zero_byte(chunk ^ vn2);
+            if eq1 || eq2 {
+                break;
+            }
+            ptr = ptr.sub(USIZE_BYTES);
+        }
+        reverse_search(start_ptr, end_ptr, ptr, confirm)
+    }
+}
+
+/// Like `memrchr`, but searches for three bytes instead of one.
+pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = repeat_byte(n1);
+    let vn2 = repeat_byte(n2);
+    let vn3 = repeat_byte(n3);
+    let confirm = |byte| byte == n1 || byte == n2 || byte == n3;
+    let align = USIZE_BYTES - 1;
+    let start_ptr = haystack.as_ptr();
+
+    unsafe {
+        let end_ptr = start_ptr.add(haystack.len());
+        let mut ptr = end_ptr;
+        if haystack.len() < USIZE_BYTES {
+            return reverse_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
+        let eq1 = contains_zero_byte(chunk ^ vn1);
+        let eq2 = contains_zero_byte(chunk ^ vn2);
+        let eq3 = contains_zero_byte(chunk ^ vn3);
+        if eq1 || eq2 || eq3 {
+            return reverse_search(start_ptr, end_ptr, ptr, confirm);
+        }
+
+        ptr = (end_ptr as usize & !align) as *const u8;
+        debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+        while ptr >= start_ptr.add(USIZE_BYTES) {
+            debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
+
+            let chunk = *(ptr.sub(USIZE_BYTES) as *const usize);
+            let eq1 = contains_zero_byte(chunk ^ vn1);
+            let eq2 = contains_zero_byte(chunk ^ vn2);
+            let eq3 = contains_zero_byte(chunk ^ vn3);
+            if eq1 || eq2 || eq3 {
+                break;
+            }
+            ptr = ptr.sub(USIZE_BYTES);
+        }
+        reverse_search(start_ptr, end_ptr, ptr, confirm)
+    }
+}
+
+#[inline(always)]
+unsafe fn forward_search<F: Fn(u8) -> bool>(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    mut ptr: *const u8,
+    confirm: F,
+) -> Option<usize> {
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr);
+
+    while ptr < end_ptr {
+        if confirm(*ptr) {
+            return Some(sub(ptr, start_ptr));
+        }
+        ptr = ptr.offset(1);
+    }
+    None
+}
+
+#[inline(always)]
+unsafe fn reverse_search<F: Fn(u8) -> bool>(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    mut ptr: *const u8,
+    confirm: F,
+) -> Option<usize> {
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr);
+
+    while ptr > start_ptr {
+        ptr = ptr.offset(-1);
+        if confirm(*ptr) {
+            return Some(sub(ptr, start_ptr));
+        }
+    }
+    None
+}
+
+/// Subtract `b` from `a` and return the difference. `a` should be greater than
+/// or equal to `b`.
+fn sub(a: *const u8, b: *const u8) -> usize {
+    debug_assert!(a >= b);
+    (a as usize) - (b as usize)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/iter.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,173 @@
+use crate::{memchr, memchr2, memchr3, memrchr, memrchr2, memrchr3};
+
+macro_rules! iter_next {
+    // Common code for the memchr iterators:
+    // update haystack and position and produce the index
+    //
+    // self: &mut Self where Self is the iterator
+    // search_result: Option<usize> which is the result of the corresponding
+    // memchr function.
+    //
+    // Returns Option<usize> (the next iterator element)
+    ($self_:expr, $search_result:expr) => {
+        $search_result.map(move |index| {
+            // split and take the remaining back half
+            $self_.haystack = $self_.haystack.split_at(index + 1).1;
+            let found_position = $self_.position + index;
+            $self_.position = found_position + 1;
+            found_position
+        })
+    };
+}
+
+macro_rules! iter_next_back {
+    ($self_:expr, $search_result:expr) => {
+        $search_result.map(move |index| {
+            // split and take the remaining front half
+            $self_.haystack = $self_.haystack.split_at(index).0;
+            $self_.position + index
+        })
+    };
+}
+
+/// An iterator for `memchr`.
+pub struct Memchr<'a> {
+    needle: u8,
+    // The haystack to iterate over
+    haystack: &'a [u8],
+    // The index
+    position: usize,
+}
+
+impl<'a> Memchr<'a> {
+    /// Creates a new iterator that yields all positions of needle in haystack.
+    #[inline]
+    pub fn new(needle: u8, haystack: &[u8]) -> Memchr<'_> {
+        Memchr { needle: needle, haystack: haystack, position: 0 }
+    }
+}
+
+impl<'a> Iterator for Memchr<'a> {
+    type Item = usize;
+
+    #[inline]
+    fn next(&mut self) -> Option<usize> {
+        iter_next!(self, memchr(self.needle, self.haystack))
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (0, Some(self.haystack.len()))
+    }
+}
+
+impl<'a> DoubleEndedIterator for Memchr<'a> {
+    #[inline]
+    fn next_back(&mut self) -> Option<Self::Item> {
+        iter_next_back!(self, memrchr(self.needle, self.haystack))
+    }
+}
+
+/// An iterator for `memchr2`.
+pub struct Memchr2<'a> {
+    needle1: u8,
+    needle2: u8,
+    // The haystack to iterate over
+    haystack: &'a [u8],
+    // The index
+    position: usize,
+}
+
+impl<'a> Memchr2<'a> {
+    /// Creates a new iterator that yields all positions of needle in haystack.
+    #[inline]
+    pub fn new(needle1: u8, needle2: u8, haystack: &[u8]) -> Memchr2<'_> {
+        Memchr2 {
+            needle1: needle1,
+            needle2: needle2,
+            haystack: haystack,
+            position: 0,
+        }
+    }
+}
+
+impl<'a> Iterator for Memchr2<'a> {
+    type Item = usize;
+
+    #[inline]
+    fn next(&mut self) -> Option<usize> {
+        iter_next!(self, memchr2(self.needle1, self.needle2, self.haystack))
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (0, Some(self.haystack.len()))
+    }
+}
+
+impl<'a> DoubleEndedIterator for Memchr2<'a> {
+    #[inline]
+    fn next_back(&mut self) -> Option<Self::Item> {
+        iter_next_back!(
+            self,
+            memrchr2(self.needle1, self.needle2, self.haystack)
+        )
+    }
+}
+
+/// An iterator for `memchr3`.
+pub struct Memchr3<'a> {
+    needle1: u8,
+    needle2: u8,
+    needle3: u8,
+    // The haystack to iterate over
+    haystack: &'a [u8],
+    // The index
+    position: usize,
+}
+
+impl<'a> Memchr3<'a> {
+    /// Create a new `Memchr3` that's initialized to zero with a haystack
+    #[inline]
+    pub fn new(
+        needle1: u8,
+        needle2: u8,
+        needle3: u8,
+        haystack: &[u8],
+    ) -> Memchr3<'_> {
+        Memchr3 {
+            needle1: needle1,
+            needle2: needle2,
+            needle3: needle3,
+            haystack: haystack,
+            position: 0,
+        }
+    }
+}
+
+impl<'a> Iterator for Memchr3<'a> {
+    type Item = usize;
+
+    #[inline]
+    fn next(&mut self) -> Option<usize> {
+        iter_next!(
+            self,
+            memchr3(self.needle1, self.needle2, self.needle3, self.haystack)
+        )
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (0, Some(self.haystack.len()))
+    }
+}
+
+impl<'a> DoubleEndedIterator for Memchr3<'a> {
+    #[inline]
+    fn next_back(&mut self) -> Option<Self::Item> {
+        iter_next_back!(
+            self,
+            memrchr3(self.needle1, self.needle2, self.needle3, self.haystack)
+        )
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,410 @@
+use core::iter::Rev;
+
+pub use self::iter::{Memchr, Memchr2, Memchr3};
+
+// N.B. If you're looking for the cfg knobs for libc, see build.rs.
+#[cfg(memchr_libc)]
+mod c;
+#[allow(dead_code)]
+pub mod fallback;
+mod iter;
+pub mod naive;
+#[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
+mod x86;
+
+/// An iterator over all occurrences of the needle in a haystack.
+#[inline]
+pub fn memchr_iter(needle: u8, haystack: &[u8]) -> Memchr<'_> {
+    Memchr::new(needle, haystack)
+}
+
+/// An iterator over all occurrences of the needles in a haystack.
+#[inline]
+pub fn memchr2_iter(needle1: u8, needle2: u8, haystack: &[u8]) -> Memchr2<'_> {
+    Memchr2::new(needle1, needle2, haystack)
+}
+
+/// An iterator over all occurrences of the needles in a haystack.
+#[inline]
+pub fn memchr3_iter(
+    needle1: u8,
+    needle2: u8,
+    needle3: u8,
+    haystack: &[u8],
+) -> Memchr3<'_> {
+    Memchr3::new(needle1, needle2, needle3, haystack)
+}
+
+/// An iterator over all occurrences of the needle in a haystack, in reverse.
+#[inline]
+pub fn memrchr_iter(needle: u8, haystack: &[u8]) -> Rev<Memchr<'_>> {
+    Memchr::new(needle, haystack).rev()
+}
+
+/// An iterator over all occurrences of the needles in a haystack, in reverse.
+#[inline]
+pub fn memrchr2_iter(
+    needle1: u8,
+    needle2: u8,
+    haystack: &[u8],
+) -> Rev<Memchr2<'_>> {
+    Memchr2::new(needle1, needle2, haystack).rev()
+}
+
+/// An iterator over all occurrences of the needles in a haystack, in reverse.
+#[inline]
+pub fn memrchr3_iter(
+    needle1: u8,
+    needle2: u8,
+    needle3: u8,
+    haystack: &[u8],
+) -> Rev<Memchr3<'_>> {
+    Memchr3::new(needle1, needle2, needle3, haystack).rev()
+}
+
+/// Search for the first occurrence of a byte in a slice.
+///
+/// This returns the index corresponding to the first occurrence of `needle` in
+/// `haystack`, or `None` if one is not found. If an index is returned, it is
+/// guaranteed to be less than `usize::MAX`.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().position(|&b| b == needle)`, `memchr` will use a highly
+/// optimized routine that can be up to an order of magnitude faster in some
+/// cases.
+///
+/// # Example
+///
+/// This shows how to find the first position of a byte in a byte string.
+///
+/// ```
+/// use memchr::memchr;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memchr(b'k', haystack), Some(8));
+/// ```
+#[inline]
+pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memchr(n1, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        x86::memchr(n1, haystack)
+    }
+
+    #[cfg(all(
+        memchr_libc,
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        c::memchr(n1, haystack)
+    }
+
+    #[cfg(all(
+        not(memchr_libc),
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        fallback::memchr(n1, haystack)
+    }
+
+    if haystack.is_empty() {
+        None
+    } else {
+        imp(needle, haystack)
+    }
+}
+
+/// Like `memchr`, but searches for either of two bytes instead of just one.
+///
+/// This returns the index corresponding to the first occurrence of `needle1`
+/// or the first occurrence of `needle2` in `haystack` (whichever occurs
+/// earlier), or `None` if neither one is found. If an index is returned, it is
+/// guaranteed to be less than `usize::MAX`.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().position(|&b| b == needle1 || b == needle2)`, `memchr2`
+/// will use a highly optimized routine that can be up to an order of magnitude
+/// faster in some cases.
+///
+/// # Example
+///
+/// This shows how to find the first position of either of two bytes in a byte
+/// string.
+///
+/// ```
+/// use memchr::memchr2;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memchr2(b'k', b'q', haystack), Some(4));
+/// ```
+#[inline]
+pub fn memchr2(needle1: u8, needle2: u8, haystack: &[u8]) -> Option<usize> {
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memchr2(n1, n2, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+        x86::memchr2(n1, n2, haystack)
+    }
+
+    #[cfg(all(
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+        fallback::memchr2(n1, n2, haystack)
+    }
+
+    if haystack.is_empty() {
+        None
+    } else {
+        imp(needle1, needle2, haystack)
+    }
+}
+
+/// Like `memchr`, but searches for any of three bytes instead of just one.
+///
+/// This returns the index corresponding to the first occurrence of `needle1`,
+/// the first occurrence of `needle2`, or the first occurrence of `needle3` in
+/// `haystack` (whichever occurs earliest), or `None` if none are found. If an
+/// index is returned, it is guaranteed to be less than `usize::MAX`.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().position(|&b| b == needle1 || b == needle2 ||
+/// b == needle3)`, `memchr3` will use a highly optimized routine that can be
+/// up to an order of magnitude faster in some cases.
+///
+/// # Example
+///
+/// This shows how to find the first position of any of three bytes in a byte
+/// string.
+///
+/// ```
+/// use memchr::memchr3;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memchr3(b'k', b'q', b'e', haystack), Some(2));
+/// ```
+#[inline]
+pub fn memchr3(
+    needle1: u8,
+    needle2: u8,
+    needle3: u8,
+    haystack: &[u8],
+) -> Option<usize> {
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memchr3(n1, n2, n3, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+        x86::memchr3(n1, n2, n3, haystack)
+    }
+
+    #[cfg(all(
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+        fallback::memchr3(n1, n2, n3, haystack)
+    }
+
+    if haystack.is_empty() {
+        None
+    } else {
+        imp(needle1, needle2, needle3, haystack)
+    }
+}
+
+/// Search for the last occurrence of a byte in a slice.
+///
+/// This returns the index corresponding to the last occurrence of `needle` in
+/// `haystack`, or `None` if one is not found. If an index is returned, it is
+/// guaranteed to be less than `usize::MAX`.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().rposition(|&b| b == needle)`, `memrchr` will use a highly
+/// optimized routine that can be up to an order of magnitude faster in some
+/// cases.
+///
+/// # Example
+///
+/// This shows how to find the last position of a byte in a byte string.
+///
+/// ```
+/// use memchr::memrchr;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memrchr(b'o', haystack), Some(17));
+/// ```
+#[inline]
+pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memrchr(n1, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        x86::memrchr(n1, haystack)
+    }
+
+    #[cfg(all(
+        memchr_libc,
+        target_os = "linux",
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri)
+    ))]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        c::memrchr(n1, haystack)
+    }
+
+    #[cfg(all(
+        not(all(memchr_libc, target_os = "linux")),
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        fallback::memrchr(n1, haystack)
+    }
+
+    if haystack.is_empty() {
+        None
+    } else {
+        imp(needle, haystack)
+    }
+}
+
+/// Like `memrchr`, but searches for either of two bytes instead of just one.
+///
+/// This returns the index corresponding to the last occurrence of `needle1` or
+/// the last occurrence of `needle2` in `haystack` (whichever occurs later), or
+/// `None` if neither one is found. If an index is returned, it is guaranteed
+/// to be less than `usize::MAX`.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().rposition(|&b| b == needle1 || b == needle2)`, `memrchr2`
+/// will use a highly optimized routine that can be up to an order of magnitude
+/// faster in some cases.
+///
+/// # Example
+///
+/// This shows how to find the last position of either of two bytes in a byte
+/// string.
+///
+/// ```
+/// use memchr::memrchr2;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memrchr2(b'k', b'q', haystack), Some(8));
+/// ```
+#[inline]
+pub fn memrchr2(needle1: u8, needle2: u8, haystack: &[u8]) -> Option<usize> {
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memrchr2(n1, n2, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+        x86::memrchr2(n1, n2, haystack)
+    }
+
+    #[cfg(all(
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+        fallback::memrchr2(n1, n2, haystack)
+    }
+
+    if haystack.is_empty() {
+        None
+    } else {
+        imp(needle1, needle2, haystack)
+    }
+}
+
+/// Like `memrchr`, but searches for any of three bytes instead of just one.
+///
+/// This returns the index corresponding to the last occurrence of `needle1`,
+/// the last occurrence of `needle2`, or the last occurrence of `needle3` in
+/// `haystack` (whichever occurs later), or `None` if none are found. If an
+/// index is returned, it is guaranteed to be less than `usize::MAX`.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().rposition(|&b| b == needle1 || b == needle2 ||
+/// b == needle3)`, `memrchr3` will use a highly optimized routine that can be
+/// up to an order of magnitude faster in some cases.
+///
+/// # Example
+///
+/// This shows how to find the last position of any of three bytes in a byte
+/// string.
+///
+/// ```
+/// use memchr::memrchr3;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memrchr3(b'k', b'q', b'e', haystack), Some(8));
+/// ```
+#[inline]
+pub fn memrchr3(
+    needle1: u8,
+    needle2: u8,
+    needle3: u8,
+    haystack: &[u8],
+) -> Option<usize> {
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memrchr3(n1, n2, n3, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+        x86::memrchr3(n1, n2, n3, haystack)
+    }
+
+    #[cfg(all(
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+        fallback::memrchr3(n1, n2, n3, haystack)
+    }
+
+    if haystack.is_empty() {
+        None
+    } else {
+        imp(needle1, needle2, needle3, haystack)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/naive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/naive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/naive.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/naive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+#![allow(dead_code)]
+
+pub fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    haystack.iter().position(|&b| b == n1)
+}
+
+pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    haystack.iter().position(|&b| b == n1 || b == n2)
+}
+
+pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+    haystack.iter().position(|&b| b == n1 || b == n2 || b == n3)
+}
+
+pub fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    haystack.iter().rposition(|&b| b == n1)
+}
+
+pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    haystack.iter().rposition(|&b| b == n1 || b == n2)
+}
+
+pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+    haystack.iter().rposition(|&b| b == n1 || b == n2 || b == n3)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/x86/avx.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/x86/avx.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/x86/avx.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/x86/avx.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,755 @@
+use core::{arch::x86_64::*, cmp, mem::size_of};
+
+use super::sse2;
+
+const VECTOR_SIZE: usize = size_of::<__m256i>();
+const VECTOR_ALIGN: usize = VECTOR_SIZE - 1;
+
+// The number of bytes to loop at in one iteration of memchr/memrchr.
+const LOOP_SIZE: usize = 4 * VECTOR_SIZE;
+
+// The number of bytes to loop at in one iteration of memchr2/memrchr2 and
+// memchr3/memrchr3. There was no observable difference between 128 and 64
+// bytes in benchmarks. memchr3 in particular only gets a very slight speed up
+// from the loop unrolling.
+const LOOP_SIZE2: usize = 2 * VECTOR_SIZE;
+
+#[target_feature(enable = "avx2")]
+pub unsafe fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    // For a high level explanation for how this algorithm works, see the
+    // sse2 implementation. The avx implementation here is the same, but with
+    // 256-bit vectors instead of 128-bit vectors.
+
+    // This routine is called whenever a match is detected. It is specifically
+    // marked as unlineable because it improves the codegen of the unrolled
+    // loop below. Inlining this seems to cause codegen with some extra adds
+    // and a load that aren't necessary. This seems to result in about a 10%
+    // improvement for the memchr1/crate/huge/never benchmark.
+    //
+    // Interestingly, I couldn't observe a similar improvement for memrchr.
+    #[cold]
+    #[inline(never)]
+    #[target_feature(enable = "avx2")]
+    unsafe fn matched(
+        start_ptr: *const u8,
+        ptr: *const u8,
+        eqa: __m256i,
+        eqb: __m256i,
+        eqc: __m256i,
+        eqd: __m256i,
+    ) -> usize {
+        let mut at = sub(ptr, start_ptr);
+        let mask = _mm256_movemask_epi8(eqa);
+        if mask != 0 {
+            return at + forward_pos(mask);
+        }
+
+        at += VECTOR_SIZE;
+        let mask = _mm256_movemask_epi8(eqb);
+        if mask != 0 {
+            return at + forward_pos(mask);
+        }
+
+        at += VECTOR_SIZE;
+        let mask = _mm256_movemask_epi8(eqc);
+        if mask != 0 {
+            return at + forward_pos(mask);
+        }
+
+        at += VECTOR_SIZE;
+        let mask = _mm256_movemask_epi8(eqd);
+        debug_assert!(mask != 0);
+        at + forward_pos(mask)
+    }
+
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = start_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        // For small haystacks, defer to the SSE2 implementation. Codegen
+        // suggests this completely avoids touching the AVX vectors.
+        return sse2::memchr(n1, haystack);
+    }
+
+    let vn1 = _mm256_set1_epi8(n1 as i8);
+    let loop_size = cmp::min(LOOP_SIZE, haystack.len());
+    if let Some(i) = forward_search1(start_ptr, end_ptr, ptr, vn1) {
+        return Some(i);
+    }
+
+    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
+    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
+    while loop_size == LOOP_SIZE && ptr <= end_ptr.sub(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        let a = _mm256_load_si256(ptr as *const __m256i);
+        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
+        let c = _mm256_load_si256(ptr.add(2 * VECTOR_SIZE) as *const __m256i);
+        let d = _mm256_load_si256(ptr.add(3 * VECTOR_SIZE) as *const __m256i);
+        let eqa = _mm256_cmpeq_epi8(vn1, a);
+        let eqb = _mm256_cmpeq_epi8(vn1, b);
+        let eqc = _mm256_cmpeq_epi8(vn1, c);
+        let eqd = _mm256_cmpeq_epi8(vn1, d);
+        let or1 = _mm256_or_si256(eqa, eqb);
+        let or2 = _mm256_or_si256(eqc, eqd);
+        let or3 = _mm256_or_si256(or1, or2);
+
+        if _mm256_movemask_epi8(or3) != 0 {
+            return Some(matched(start_ptr, ptr, eqa, eqb, eqc, eqd));
+        }
+        ptr = ptr.add(loop_size);
+    }
+    while ptr <= end_ptr.sub(VECTOR_SIZE) {
+        debug_assert!(sub(end_ptr, ptr) >= VECTOR_SIZE);
+
+        if let Some(i) = forward_search1(start_ptr, end_ptr, ptr, vn1) {
+            return Some(i);
+        }
+        ptr = ptr.add(VECTOR_SIZE);
+    }
+    if ptr < end_ptr {
+        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
+        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
+        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
+
+        return forward_search1(start_ptr, end_ptr, ptr, vn1);
+    }
+    None
+}
+
+#[target_feature(enable = "avx2")]
+pub unsafe fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    #[cold]
+    #[inline(never)]
+    #[target_feature(enable = "avx2")]
+    unsafe fn matched(
+        start_ptr: *const u8,
+        ptr: *const u8,
+        eqa1: __m256i,
+        eqa2: __m256i,
+        eqb1: __m256i,
+        eqb2: __m256i,
+    ) -> usize {
+        let mut at = sub(ptr, start_ptr);
+        let mask1 = _mm256_movemask_epi8(eqa1);
+        let mask2 = _mm256_movemask_epi8(eqa2);
+        if mask1 != 0 || mask2 != 0 {
+            return at + forward_pos2(mask1, mask2);
+        }
+
+        at += VECTOR_SIZE;
+        let mask1 = _mm256_movemask_epi8(eqb1);
+        let mask2 = _mm256_movemask_epi8(eqb2);
+        at + forward_pos2(mask1, mask2)
+    }
+
+    let vn1 = _mm256_set1_epi8(n1 as i8);
+    let vn2 = _mm256_set1_epi8(n2 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE2, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = start_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr < end_ptr {
+            if *ptr == n1 || *ptr == n2 {
+                return Some(sub(ptr, start_ptr));
+            }
+            ptr = ptr.offset(1);
+        }
+        return None;
+    }
+
+    if let Some(i) = forward_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
+        return Some(i);
+    }
+
+    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
+    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
+    while loop_size == LOOP_SIZE2 && ptr <= end_ptr.sub(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        let a = _mm256_load_si256(ptr as *const __m256i);
+        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
+        let eqa1 = _mm256_cmpeq_epi8(vn1, a);
+        let eqb1 = _mm256_cmpeq_epi8(vn1, b);
+        let eqa2 = _mm256_cmpeq_epi8(vn2, a);
+        let eqb2 = _mm256_cmpeq_epi8(vn2, b);
+        let or1 = _mm256_or_si256(eqa1, eqb1);
+        let or2 = _mm256_or_si256(eqa2, eqb2);
+        let or3 = _mm256_or_si256(or1, or2);
+        if _mm256_movemask_epi8(or3) != 0 {
+            return Some(matched(start_ptr, ptr, eqa1, eqa2, eqb1, eqb2));
+        }
+        ptr = ptr.add(loop_size);
+    }
+    while ptr <= end_ptr.sub(VECTOR_SIZE) {
+        if let Some(i) = forward_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
+            return Some(i);
+        }
+        ptr = ptr.add(VECTOR_SIZE);
+    }
+    if ptr < end_ptr {
+        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
+        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
+        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
+
+        return forward_search2(start_ptr, end_ptr, ptr, vn1, vn2);
+    }
+    None
+}
+
+#[target_feature(enable = "avx2")]
+pub unsafe fn memchr3(
+    n1: u8,
+    n2: u8,
+    n3: u8,
+    haystack: &[u8],
+) -> Option<usize> {
+    #[cold]
+    #[inline(never)]
+    #[target_feature(enable = "avx2")]
+    unsafe fn matched(
+        start_ptr: *const u8,
+        ptr: *const u8,
+        eqa1: __m256i,
+        eqa2: __m256i,
+        eqa3: __m256i,
+        eqb1: __m256i,
+        eqb2: __m256i,
+        eqb3: __m256i,
+    ) -> usize {
+        let mut at = sub(ptr, start_ptr);
+        let mask1 = _mm256_movemask_epi8(eqa1);
+        let mask2 = _mm256_movemask_epi8(eqa2);
+        let mask3 = _mm256_movemask_epi8(eqa3);
+        if mask1 != 0 || mask2 != 0 || mask3 != 0 {
+            return at + forward_pos3(mask1, mask2, mask3);
+        }
+
+        at += VECTOR_SIZE;
+        let mask1 = _mm256_movemask_epi8(eqb1);
+        let mask2 = _mm256_movemask_epi8(eqb2);
+        let mask3 = _mm256_movemask_epi8(eqb3);
+        at + forward_pos3(mask1, mask2, mask3)
+    }
+
+    let vn1 = _mm256_set1_epi8(n1 as i8);
+    let vn2 = _mm256_set1_epi8(n2 as i8);
+    let vn3 = _mm256_set1_epi8(n3 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE2, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = start_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr < end_ptr {
+            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
+                return Some(sub(ptr, start_ptr));
+            }
+            ptr = ptr.offset(1);
+        }
+        return None;
+    }
+
+    if let Some(i) = forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
+        return Some(i);
+    }
+
+    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
+    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
+    while loop_size == LOOP_SIZE2 && ptr <= end_ptr.sub(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        let a = _mm256_load_si256(ptr as *const __m256i);
+        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
+        let eqa1 = _mm256_cmpeq_epi8(vn1, a);
+        let eqb1 = _mm256_cmpeq_epi8(vn1, b);
+        let eqa2 = _mm256_cmpeq_epi8(vn2, a);
+        let eqb2 = _mm256_cmpeq_epi8(vn2, b);
+        let eqa3 = _mm256_cmpeq_epi8(vn3, a);
+        let eqb3 = _mm256_cmpeq_epi8(vn3, b);
+        let or1 = _mm256_or_si256(eqa1, eqb1);
+        let or2 = _mm256_or_si256(eqa2, eqb2);
+        let or3 = _mm256_or_si256(eqa3, eqb3);
+        let or4 = _mm256_or_si256(or1, or2);
+        let or5 = _mm256_or_si256(or3, or4);
+        if _mm256_movemask_epi8(or5) != 0 {
+            return Some(matched(
+                start_ptr, ptr, eqa1, eqa2, eqa3, eqb1, eqb2, eqb3,
+            ));
+        }
+        ptr = ptr.add(loop_size);
+    }
+    while ptr <= end_ptr.sub(VECTOR_SIZE) {
+        if let Some(i) =
+            forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
+        {
+            return Some(i);
+        }
+        ptr = ptr.add(VECTOR_SIZE);
+    }
+    if ptr < end_ptr {
+        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
+        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
+        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
+
+        return forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3);
+    }
+    None
+}
+
+#[target_feature(enable = "avx2")]
+pub unsafe fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = _mm256_set1_epi8(n1 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = end_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr > start_ptr {
+            ptr = ptr.offset(-1);
+            if *ptr == n1 {
+                return Some(sub(ptr, start_ptr));
+            }
+        }
+        return None;
+    }
+
+    ptr = ptr.sub(VECTOR_SIZE);
+    if let Some(i) = reverse_search1(start_ptr, end_ptr, ptr, vn1) {
+        return Some(i);
+    }
+
+    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
+    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+    while loop_size == LOOP_SIZE && ptr >= start_ptr.add(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        ptr = ptr.sub(loop_size);
+        let a = _mm256_load_si256(ptr as *const __m256i);
+        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
+        let c = _mm256_load_si256(ptr.add(2 * VECTOR_SIZE) as *const __m256i);
+        let d = _mm256_load_si256(ptr.add(3 * VECTOR_SIZE) as *const __m256i);
+        let eqa = _mm256_cmpeq_epi8(vn1, a);
+        let eqb = _mm256_cmpeq_epi8(vn1, b);
+        let eqc = _mm256_cmpeq_epi8(vn1, c);
+        let eqd = _mm256_cmpeq_epi8(vn1, d);
+        let or1 = _mm256_or_si256(eqa, eqb);
+        let or2 = _mm256_or_si256(eqc, eqd);
+        let or3 = _mm256_or_si256(or1, or2);
+        if _mm256_movemask_epi8(or3) != 0 {
+            let mut at = sub(ptr.add(3 * VECTOR_SIZE), start_ptr);
+            let mask = _mm256_movemask_epi8(eqd);
+            if mask != 0 {
+                return Some(at + reverse_pos(mask));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask = _mm256_movemask_epi8(eqc);
+            if mask != 0 {
+                return Some(at + reverse_pos(mask));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask = _mm256_movemask_epi8(eqb);
+            if mask != 0 {
+                return Some(at + reverse_pos(mask));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask = _mm256_movemask_epi8(eqa);
+            debug_assert!(mask != 0);
+            return Some(at + reverse_pos(mask));
+        }
+    }
+    while ptr >= start_ptr.add(VECTOR_SIZE) {
+        ptr = ptr.sub(VECTOR_SIZE);
+        if let Some(i) = reverse_search1(start_ptr, end_ptr, ptr, vn1) {
+            return Some(i);
+        }
+    }
+    if ptr > start_ptr {
+        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
+        return reverse_search1(start_ptr, end_ptr, start_ptr, vn1);
+    }
+    None
+}
+
+#[target_feature(enable = "avx2")]
+pub unsafe fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = _mm256_set1_epi8(n1 as i8);
+    let vn2 = _mm256_set1_epi8(n2 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE2, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = end_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr > start_ptr {
+            ptr = ptr.offset(-1);
+            if *ptr == n1 || *ptr == n2 {
+                return Some(sub(ptr, start_ptr));
+            }
+        }
+        return None;
+    }
+
+    ptr = ptr.sub(VECTOR_SIZE);
+    if let Some(i) = reverse_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
+        return Some(i);
+    }
+
+    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
+    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+    while loop_size == LOOP_SIZE2 && ptr >= start_ptr.add(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        ptr = ptr.sub(loop_size);
+        let a = _mm256_load_si256(ptr as *const __m256i);
+        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
+        let eqa1 = _mm256_cmpeq_epi8(vn1, a);
+        let eqb1 = _mm256_cmpeq_epi8(vn1, b);
+        let eqa2 = _mm256_cmpeq_epi8(vn2, a);
+        let eqb2 = _mm256_cmpeq_epi8(vn2, b);
+        let or1 = _mm256_or_si256(eqa1, eqb1);
+        let or2 = _mm256_or_si256(eqa2, eqb2);
+        let or3 = _mm256_or_si256(or1, or2);
+        if _mm256_movemask_epi8(or3) != 0 {
+            let mut at = sub(ptr.add(VECTOR_SIZE), start_ptr);
+            let mask1 = _mm256_movemask_epi8(eqb1);
+            let mask2 = _mm256_movemask_epi8(eqb2);
+            if mask1 != 0 || mask2 != 0 {
+                return Some(at + reverse_pos2(mask1, mask2));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask1 = _mm256_movemask_epi8(eqa1);
+            let mask2 = _mm256_movemask_epi8(eqa2);
+            return Some(at + reverse_pos2(mask1, mask2));
+        }
+    }
+    while ptr >= start_ptr.add(VECTOR_SIZE) {
+        ptr = ptr.sub(VECTOR_SIZE);
+        if let Some(i) = reverse_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
+            return Some(i);
+        }
+    }
+    if ptr > start_ptr {
+        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
+        return reverse_search2(start_ptr, end_ptr, start_ptr, vn1, vn2);
+    }
+    None
+}
+
+#[target_feature(enable = "avx2")]
+pub unsafe fn memrchr3(
+    n1: u8,
+    n2: u8,
+    n3: u8,
+    haystack: &[u8],
+) -> Option<usize> {
+    let vn1 = _mm256_set1_epi8(n1 as i8);
+    let vn2 = _mm256_set1_epi8(n2 as i8);
+    let vn3 = _mm256_set1_epi8(n3 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE2, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = end_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr > start_ptr {
+            ptr = ptr.offset(-1);
+            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
+                return Some(sub(ptr, start_ptr));
+            }
+        }
+        return None;
+    }
+
+    ptr = ptr.sub(VECTOR_SIZE);
+    if let Some(i) = reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
+        return Some(i);
+    }
+
+    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
+    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+    while loop_size == LOOP_SIZE2 && ptr >= start_ptr.add(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        ptr = ptr.sub(loop_size);
+        let a = _mm256_load_si256(ptr as *const __m256i);
+        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
+        let eqa1 = _mm256_cmpeq_epi8(vn1, a);
+        let eqb1 = _mm256_cmpeq_epi8(vn1, b);
+        let eqa2 = _mm256_cmpeq_epi8(vn2, a);
+        let eqb2 = _mm256_cmpeq_epi8(vn2, b);
+        let eqa3 = _mm256_cmpeq_epi8(vn3, a);
+        let eqb3 = _mm256_cmpeq_epi8(vn3, b);
+        let or1 = _mm256_or_si256(eqa1, eqb1);
+        let or2 = _mm256_or_si256(eqa2, eqb2);
+        let or3 = _mm256_or_si256(eqa3, eqb3);
+        let or4 = _mm256_or_si256(or1, or2);
+        let or5 = _mm256_or_si256(or3, or4);
+        if _mm256_movemask_epi8(or5) != 0 {
+            let mut at = sub(ptr.add(VECTOR_SIZE), start_ptr);
+            let mask1 = _mm256_movemask_epi8(eqb1);
+            let mask2 = _mm256_movemask_epi8(eqb2);
+            let mask3 = _mm256_movemask_epi8(eqb3);
+            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
+                return Some(at + reverse_pos3(mask1, mask2, mask3));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask1 = _mm256_movemask_epi8(eqa1);
+            let mask2 = _mm256_movemask_epi8(eqa2);
+            let mask3 = _mm256_movemask_epi8(eqa3);
+            return Some(at + reverse_pos3(mask1, mask2, mask3));
+        }
+    }
+    while ptr >= start_ptr.add(VECTOR_SIZE) {
+        ptr = ptr.sub(VECTOR_SIZE);
+        if let Some(i) =
+            reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
+        {
+            return Some(i);
+        }
+    }
+    if ptr > start_ptr {
+        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
+        return reverse_search3(start_ptr, end_ptr, start_ptr, vn1, vn2, vn3);
+    }
+    None
+}
+
+#[target_feature(enable = "avx2")]
+unsafe fn forward_search1(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m256i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
+    let mask = _mm256_movemask_epi8(_mm256_cmpeq_epi8(chunk, vn1));
+    if mask != 0 {
+        Some(sub(ptr, start_ptr) + forward_pos(mask))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "avx2")]
+unsafe fn forward_search2(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m256i,
+    vn2: __m256i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
+    let eq1 = _mm256_cmpeq_epi8(chunk, vn1);
+    let eq2 = _mm256_cmpeq_epi8(chunk, vn2);
+    if _mm256_movemask_epi8(_mm256_or_si256(eq1, eq2)) != 0 {
+        let mask1 = _mm256_movemask_epi8(eq1);
+        let mask2 = _mm256_movemask_epi8(eq2);
+        Some(sub(ptr, start_ptr) + forward_pos2(mask1, mask2))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "avx2")]
+unsafe fn forward_search3(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m256i,
+    vn2: __m256i,
+    vn3: __m256i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
+    let eq1 = _mm256_cmpeq_epi8(chunk, vn1);
+    let eq2 = _mm256_cmpeq_epi8(chunk, vn2);
+    let eq3 = _mm256_cmpeq_epi8(chunk, vn3);
+    let or = _mm256_or_si256(eq1, eq2);
+    if _mm256_movemask_epi8(_mm256_or_si256(or, eq3)) != 0 {
+        let mask1 = _mm256_movemask_epi8(eq1);
+        let mask2 = _mm256_movemask_epi8(eq2);
+        let mask3 = _mm256_movemask_epi8(eq3);
+        Some(sub(ptr, start_ptr) + forward_pos3(mask1, mask2, mask3))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "avx2")]
+unsafe fn reverse_search1(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m256i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
+    let mask = _mm256_movemask_epi8(_mm256_cmpeq_epi8(vn1, chunk));
+    if mask != 0 {
+        Some(sub(ptr, start_ptr) + reverse_pos(mask))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "avx2")]
+unsafe fn reverse_search2(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m256i,
+    vn2: __m256i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
+    let eq1 = _mm256_cmpeq_epi8(chunk, vn1);
+    let eq2 = _mm256_cmpeq_epi8(chunk, vn2);
+    if _mm256_movemask_epi8(_mm256_or_si256(eq1, eq2)) != 0 {
+        let mask1 = _mm256_movemask_epi8(eq1);
+        let mask2 = _mm256_movemask_epi8(eq2);
+        Some(sub(ptr, start_ptr) + reverse_pos2(mask1, mask2))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "avx2")]
+unsafe fn reverse_search3(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m256i,
+    vn2: __m256i,
+    vn3: __m256i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
+    let eq1 = _mm256_cmpeq_epi8(chunk, vn1);
+    let eq2 = _mm256_cmpeq_epi8(chunk, vn2);
+    let eq3 = _mm256_cmpeq_epi8(chunk, vn3);
+    let or = _mm256_or_si256(eq1, eq2);
+    if _mm256_movemask_epi8(_mm256_or_si256(or, eq3)) != 0 {
+        let mask1 = _mm256_movemask_epi8(eq1);
+        let mask2 = _mm256_movemask_epi8(eq2);
+        let mask3 = _mm256_movemask_epi8(eq3);
+        Some(sub(ptr, start_ptr) + reverse_pos3(mask1, mask2, mask3))
+    } else {
+        None
+    }
+}
+
+/// Compute the position of the first matching byte from the given mask. The
+/// position returned is always in the range [0, 31].
+///
+/// The mask given is expected to be the result of _mm256_movemask_epi8.
+fn forward_pos(mask: i32) -> usize {
+    // We are dealing with little endian here, where the most significant byte
+    // is at a higher address. That means the least significant bit that is set
+    // corresponds to the position of our first matching byte. That position
+    // corresponds to the number of zeros after the least significant bit.
+    mask.trailing_zeros() as usize
+}
+
+/// Compute the position of the first matching byte from the given masks. The
+/// position returned is always in the range [0, 31]. Each mask corresponds to
+/// the equality comparison of a single byte.
+///
+/// The masks given are expected to be the result of _mm256_movemask_epi8,
+/// where at least one of the masks is non-zero (i.e., indicates a match).
+fn forward_pos2(mask1: i32, mask2: i32) -> usize {
+    debug_assert!(mask1 != 0 || mask2 != 0);
+
+    forward_pos(mask1 | mask2)
+}
+
+/// Compute the position of the first matching byte from the given masks. The
+/// position returned is always in the range [0, 31]. Each mask corresponds to
+/// the equality comparison of a single byte.
+///
+/// The masks given are expected to be the result of _mm256_movemask_epi8,
+/// where at least one of the masks is non-zero (i.e., indicates a match).
+fn forward_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
+    debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
+
+    forward_pos(mask1 | mask2 | mask3)
+}
+
+/// Compute the position of the last matching byte from the given mask. The
+/// position returned is always in the range [0, 31].
+///
+/// The mask given is expected to be the result of _mm256_movemask_epi8.
+fn reverse_pos(mask: i32) -> usize {
+    // We are dealing with little endian here, where the most significant byte
+    // is at a higher address. That means the most significant bit that is set
+    // corresponds to the position of our last matching byte. The position from
+    // the end of the mask is therefore the number of leading zeros in a 32
+    // bit integer, and the position from the start of the mask is therefore
+    // 32 - (leading zeros) - 1.
+    VECTOR_SIZE - (mask as u32).leading_zeros() as usize - 1
+}
+
+/// Compute the position of the last matching byte from the given masks. The
+/// position returned is always in the range [0, 31]. Each mask corresponds to
+/// the equality comparison of a single byte.
+///
+/// The masks given are expected to be the result of _mm256_movemask_epi8,
+/// where at least one of the masks is non-zero (i.e., indicates a match).
+fn reverse_pos2(mask1: i32, mask2: i32) -> usize {
+    debug_assert!(mask1 != 0 || mask2 != 0);
+
+    reverse_pos(mask1 | mask2)
+}
+
+/// Compute the position of the last matching byte from the given masks. The
+/// position returned is always in the range [0, 31]. Each mask corresponds to
+/// the equality comparison of a single byte.
+///
+/// The masks given are expected to be the result of _mm256_movemask_epi8,
+/// where at least one of the masks is non-zero (i.e., indicates a match).
+fn reverse_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
+    debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
+
+    reverse_pos(mask1 | mask2 | mask3)
+}
+
+/// Subtract `b` from `a` and return the difference. `a` should be greater than
+/// or equal to `b`.
+fn sub(a: *const u8, b: *const u8) -> usize {
+    debug_assert!(a >= b);
+    (a as usize) - (b as usize)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/x86/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/x86/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/x86/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/x86/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,148 @@
+use super::fallback;
+
+// We only use AVX when we can detect at runtime whether it's available, which
+// requires std.
+#[cfg(feature = "std")]
+mod avx;
+mod sse2;
+
+/// This macro employs a gcc-like "ifunc" trick where by upon first calling
+/// `memchr` (for example), CPU feature detection will be performed at runtime
+/// to determine the best implementation to use. After CPU feature detection
+/// is done, we replace `memchr`'s function pointer with the selection. Upon
+/// subsequent invocations, the CPU-specific routine is invoked directly, which
+/// skips the CPU feature detection and subsequent branch that's required.
+///
+/// While this typically doesn't matter for rare occurrences or when used on
+/// larger haystacks, `memchr` can be called in tight loops where the overhead
+/// of this branch can actually add up *and is measurable*. This trick was
+/// necessary to bring this implementation up to glibc's speeds for the 'tiny'
+/// benchmarks, for example.
+///
+/// At some point, I expect the Rust ecosystem will get a nice macro for doing
+/// exactly this, at which point, we can replace our hand-jammed version of it.
+///
+/// N.B. The ifunc strategy does prevent function inlining of course, but
+/// on modern CPUs, you'll probably end up with the AVX2 implementation,
+/// which probably can't be inlined anyway---unless you've compiled your
+/// entire program with AVX2 enabled. However, even then, the various memchr
+/// implementations aren't exactly small, so inlining might not help anyway!
+///
+/// # Safety
+///
+/// Callers must ensure that fnty is function pointer type.
+#[cfg(feature = "std")]
+macro_rules! unsafe_ifunc {
+    ($fnty:ty, $name:ident, $haystack:ident, $($needle:ident),+) => {{
+        use std::{mem, sync::atomic::{AtomicPtr, Ordering}};
+
+        type FnRaw = *mut ();
+
+        static FN: AtomicPtr<()> = AtomicPtr::new(detect as FnRaw);
+
+        fn detect($($needle: u8),+, haystack: &[u8]) -> Option<usize> {
+            let fun =
+                if cfg!(memchr_runtime_avx) && is_x86_feature_detected!("avx2") {
+                    avx::$name as FnRaw
+                } else if cfg!(memchr_runtime_sse2) {
+                    sse2::$name as FnRaw
+                } else {
+                    fallback::$name as FnRaw
+                };
+            FN.store(fun as FnRaw, Ordering::Relaxed);
+            // SAFETY: By virtue of the caller contract, $fnty is a function
+            // pointer, which is always safe to transmute with a *mut ().
+            // Also, if 'fun is the AVX routine, then it is guaranteed to be
+            // supported since we checked the avx2 feature.
+            unsafe {
+                mem::transmute::<FnRaw, $fnty>(fun)($($needle),+, haystack)
+            }
+        }
+
+        // SAFETY: By virtue of the caller contract, $fnty is a function
+        // pointer, which is always safe to transmute with a *mut (). Also, if
+        // 'fun is the AVX routine, then it is guaranteed to be supported since
+        // we checked the avx2 feature.
+        unsafe {
+            let fun = FN.load(Ordering::Relaxed);
+            mem::transmute::<FnRaw, $fnty>(fun)($($needle),+, $haystack)
+        }
+    }}
+}
+
+/// When std isn't available to provide runtime CPU feature detection, or if
+/// runtime CPU feature detection has been explicitly disabled, then just
+/// call our optimized SSE2 routine directly. SSE2 is avalbale on all x86_64
+/// targets, so no CPU feature detection is necessary.
+///
+/// # Safety
+///
+/// There are no safety requirements for this definition of the macro. It is
+/// safe for all inputs since it is restricted to either the fallback routine
+/// or the SSE routine, which is always safe to call on x86_64.
+#[cfg(not(feature = "std"))]
+macro_rules! unsafe_ifunc {
+    ($fnty:ty, $name:ident, $haystack:ident, $($needle:ident),+) => {{
+        if cfg!(memchr_runtime_sse2) {
+            unsafe { sse2::$name($($needle),+, $haystack) }
+        } else {
+            fallback::$name($($needle),+, $haystack)
+        }
+    }}
+}
+
+#[inline(always)]
+pub fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    unsafe_ifunc!(fn(u8, &[u8]) -> Option<usize>, memchr, haystack, n1)
+}
+
+#[inline(always)]
+pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    unsafe_ifunc!(
+        fn(u8, u8, &[u8]) -> Option<usize>,
+        memchr2,
+        haystack,
+        n1,
+        n2
+    )
+}
+
+#[inline(always)]
+pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+    unsafe_ifunc!(
+        fn(u8, u8, u8, &[u8]) -> Option<usize>,
+        memchr3,
+        haystack,
+        n1,
+        n2,
+        n3
+    )
+}
+
+#[inline(always)]
+pub fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    unsafe_ifunc!(fn(u8, &[u8]) -> Option<usize>, memrchr, haystack, n1)
+}
+
+#[inline(always)]
+pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    unsafe_ifunc!(
+        fn(u8, u8, &[u8]) -> Option<usize>,
+        memrchr2,
+        haystack,
+        n1,
+        n2
+    )
+}
+
+#[inline(always)]
+pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+    unsafe_ifunc!(
+        fn(u8, u8, u8, &[u8]) -> Option<usize>,
+        memrchr3,
+        haystack,
+        n1,
+        n2,
+        n3
+    )
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/x86/sse2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/x86/sse2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/x86/sse2.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/x86/sse2.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,791 @@
+use core::{arch::x86_64::*, cmp, mem::size_of};
+
+const VECTOR_SIZE: usize = size_of::<__m128i>();
+const VECTOR_ALIGN: usize = VECTOR_SIZE - 1;
+
+// The number of bytes to loop at in one iteration of memchr/memrchr.
+const LOOP_SIZE: usize = 4 * VECTOR_SIZE;
+
+// The number of bytes to loop at in one iteration of memchr2/memrchr2 and
+// memchr3/memrchr3. There was no observable difference between 64 and 32 bytes
+// in benchmarks. memchr3 in particular only gets a very slight speed up from
+// the loop unrolling.
+const LOOP_SIZE2: usize = 2 * VECTOR_SIZE;
+
+#[target_feature(enable = "sse2")]
+pub unsafe fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    // What follows is a fast SSE2-only algorithm to detect the position of
+    // `n1` in `haystack` if it exists. From what I know, this is the "classic"
+    // algorithm. I believe it can be found in places like glibc and Go's
+    // standard library. It appears to be well known and is elaborated on in
+    // more detail here: https://gms.tf/stdfind-and-memchr-optimizations.html
+    //
+    // While this routine is very long, the basic idea is actually very simple
+    // and can be expressed straight-forwardly in pseudo code:
+    //
+    //     needle = (n1 << 15) | (n1 << 14) | ... | (n1 << 1) | n1
+    //     // Note: shift amount in bytes
+    //
+    //     while i <= haystack.len() - 16:
+    //       // A 16 byte vector. Each byte in chunk corresponds to a byte in
+    //       // the haystack.
+    //       chunk = haystack[i:i+16]
+    //       // Compare bytes in needle with bytes in chunk. The result is a 16
+    //       // byte chunk where each byte is 0xFF if the corresponding bytes
+    //       // in needle and chunk were equal, or 0x00 otherwise.
+    //       eqs = cmpeq(needle, chunk)
+    //       // Return a 32 bit integer where the most significant 16 bits
+    //       // are always 0 and the lower 16 bits correspond to whether the
+    //       // most significant bit in the correspond byte in `eqs` is set.
+    //       // In other words, `mask as u16` has bit i set if and only if
+    //       // needle[i] == chunk[i].
+    //       mask = movemask(eqs)
+    //
+    //       // Mask is 0 if there is no match, and non-zero otherwise.
+    //       if mask != 0:
+    //         // trailing_zeros tells us the position of the least significant
+    //         // bit that is set.
+    //         return i + trailing_zeros(mask)
+    //
+    //     // haystack length may not be a multiple of 16, so search the rest.
+    //     while i < haystack.len():
+    //       if haystack[i] == n1:
+    //         return i
+    //
+    //     // No match found.
+    //     return NULL
+    //
+    // In fact, we could loosely translate the above code to Rust line-for-line
+    // and it would be a pretty fast algorithm. But, we pull out all the stops
+    // to go as fast as possible:
+    //
+    // 1. We use aligned loads. That is, we do some finagling to make sure our
+    //    primary loop not only proceeds in increments of 16 bytes, but that
+    //    the address of haystack's pointer that we dereference is aligned to
+    //    16 bytes. 16 is a magic number here because it is the size of SSE2
+    //    128-bit vector. (For the AVX2 algorithm, 32 is the magic number.)
+    //    Therefore, to get aligned loads, our pointer's address must be evenly
+    //    divisible by 16.
+    // 2. Our primary loop proceeds 64 bytes at a time instead of 16. It's
+    //    kind of like loop unrolling, but we combine the equality comparisons
+    //    using a vector OR such that we only need to extract a single mask to
+    //    determine whether a match exists or not. If so, then we do some
+    //    book-keeping to determine the precise location but otherwise mush on.
+    // 3. We use our "chunk" comparison routine in as many places as possible,
+    //    even if it means using unaligned loads. In particular, if haystack
+    //    starts with an unaligned address, then we do an unaligned load to
+    //    search the first 16 bytes. We then start our primary loop at the
+    //    smallest subsequent aligned address, which will actually overlap with
+    //    previously searched bytes. But we're OK with that. We do a similar
+    //    dance at the end of our primary loop. Finally, to avoid a
+    //    byte-at-a-time loop at the end, we do a final 16 byte unaligned load
+    //    that may overlap with a previous load. This is OK because it converts
+    //    a loop into a small number of very fast vector instructions.
+    //
+    // The primary downside of this algorithm is that it's effectively
+    // completely unsafe. Therefore, we have to be super careful to avoid
+    // undefined behavior:
+    //
+    // 1. We use raw pointers everywhere. Not only does dereferencing a pointer
+    //    require the pointer to be valid, but we actually can't even store the
+    //    address of an invalid pointer (unless it's 1 past the end of
+    //    haystack) without sacrificing performance.
+    // 2. _mm_loadu_si128 is used when you don't care about alignment, and
+    //    _mm_load_si128 is used when you do care. You cannot use the latter
+    //    on unaligned pointers.
+    // 3. We make liberal use of debug_assert! to check assumptions.
+    // 4. We make a concerted effort to stick with pointers instead of indices.
+    //    Indices are nicer because there's less to worry about with them (see
+    //    above about pointer offsets), but I could not get the compiler to
+    //    produce as good of code as what the below produces. In any case,
+    //    pointers are what we really care about here, and alignment is
+    //    expressed a bit more naturally with them.
+    //
+    // In general, most of the algorithms in this crate have a similar
+    // structure to what you see below, so this comment applies fairly well to
+    // all of them.
+
+    let vn1 = _mm_set1_epi8(n1 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = start_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr < end_ptr {
+            if *ptr == n1 {
+                return Some(sub(ptr, start_ptr));
+            }
+            ptr = ptr.offset(1);
+        }
+        return None;
+    }
+
+    if let Some(i) = forward_search1(start_ptr, end_ptr, ptr, vn1) {
+        return Some(i);
+    }
+
+    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
+    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
+    while loop_size == LOOP_SIZE && ptr <= end_ptr.sub(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        let a = _mm_load_si128(ptr as *const __m128i);
+        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
+        let c = _mm_load_si128(ptr.add(2 * VECTOR_SIZE) as *const __m128i);
+        let d = _mm_load_si128(ptr.add(3 * VECTOR_SIZE) as *const __m128i);
+        let eqa = _mm_cmpeq_epi8(vn1, a);
+        let eqb = _mm_cmpeq_epi8(vn1, b);
+        let eqc = _mm_cmpeq_epi8(vn1, c);
+        let eqd = _mm_cmpeq_epi8(vn1, d);
+        let or1 = _mm_or_si128(eqa, eqb);
+        let or2 = _mm_or_si128(eqc, eqd);
+        let or3 = _mm_or_si128(or1, or2);
+        if _mm_movemask_epi8(or3) != 0 {
+            let mut at = sub(ptr, start_ptr);
+            let mask = _mm_movemask_epi8(eqa);
+            if mask != 0 {
+                return Some(at + forward_pos(mask));
+            }
+
+            at += VECTOR_SIZE;
+            let mask = _mm_movemask_epi8(eqb);
+            if mask != 0 {
+                return Some(at + forward_pos(mask));
+            }
+
+            at += VECTOR_SIZE;
+            let mask = _mm_movemask_epi8(eqc);
+            if mask != 0 {
+                return Some(at + forward_pos(mask));
+            }
+
+            at += VECTOR_SIZE;
+            let mask = _mm_movemask_epi8(eqd);
+            debug_assert!(mask != 0);
+            return Some(at + forward_pos(mask));
+        }
+        ptr = ptr.add(loop_size);
+    }
+    while ptr <= end_ptr.sub(VECTOR_SIZE) {
+        debug_assert!(sub(end_ptr, ptr) >= VECTOR_SIZE);
+
+        if let Some(i) = forward_search1(start_ptr, end_ptr, ptr, vn1) {
+            return Some(i);
+        }
+        ptr = ptr.add(VECTOR_SIZE);
+    }
+    if ptr < end_ptr {
+        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
+        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
+        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
+
+        return forward_search1(start_ptr, end_ptr, ptr, vn1);
+    }
+    None
+}
+
+#[target_feature(enable = "sse2")]
+pub unsafe fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = _mm_set1_epi8(n1 as i8);
+    let vn2 = _mm_set1_epi8(n2 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE2, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = start_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr < end_ptr {
+            if *ptr == n1 || *ptr == n2 {
+                return Some(sub(ptr, start_ptr));
+            }
+            ptr = ptr.offset(1);
+        }
+        return None;
+    }
+
+    if let Some(i) = forward_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
+        return Some(i);
+    }
+
+    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
+    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
+    while loop_size == LOOP_SIZE2 && ptr <= end_ptr.sub(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        let a = _mm_load_si128(ptr as *const __m128i);
+        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
+        let eqa1 = _mm_cmpeq_epi8(vn1, a);
+        let eqb1 = _mm_cmpeq_epi8(vn1, b);
+        let eqa2 = _mm_cmpeq_epi8(vn2, a);
+        let eqb2 = _mm_cmpeq_epi8(vn2, b);
+        let or1 = _mm_or_si128(eqa1, eqb1);
+        let or2 = _mm_or_si128(eqa2, eqb2);
+        let or3 = _mm_or_si128(or1, or2);
+        if _mm_movemask_epi8(or3) != 0 {
+            let mut at = sub(ptr, start_ptr);
+            let mask1 = _mm_movemask_epi8(eqa1);
+            let mask2 = _mm_movemask_epi8(eqa2);
+            if mask1 != 0 || mask2 != 0 {
+                return Some(at + forward_pos2(mask1, mask2));
+            }
+
+            at += VECTOR_SIZE;
+            let mask1 = _mm_movemask_epi8(eqb1);
+            let mask2 = _mm_movemask_epi8(eqb2);
+            return Some(at + forward_pos2(mask1, mask2));
+        }
+        ptr = ptr.add(loop_size);
+    }
+    while ptr <= end_ptr.sub(VECTOR_SIZE) {
+        if let Some(i) = forward_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
+            return Some(i);
+        }
+        ptr = ptr.add(VECTOR_SIZE);
+    }
+    if ptr < end_ptr {
+        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
+        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
+        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
+
+        return forward_search2(start_ptr, end_ptr, ptr, vn1, vn2);
+    }
+    None
+}
+
+#[target_feature(enable = "sse2")]
+pub unsafe fn memchr3(
+    n1: u8,
+    n2: u8,
+    n3: u8,
+    haystack: &[u8],
+) -> Option<usize> {
+    let vn1 = _mm_set1_epi8(n1 as i8);
+    let vn2 = _mm_set1_epi8(n2 as i8);
+    let vn3 = _mm_set1_epi8(n3 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE2, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = start_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr < end_ptr {
+            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
+                return Some(sub(ptr, start_ptr));
+            }
+            ptr = ptr.offset(1);
+        }
+        return None;
+    }
+
+    if let Some(i) = forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
+        return Some(i);
+    }
+
+    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
+    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
+    while loop_size == LOOP_SIZE2 && ptr <= end_ptr.sub(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        let a = _mm_load_si128(ptr as *const __m128i);
+        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
+        let eqa1 = _mm_cmpeq_epi8(vn1, a);
+        let eqb1 = _mm_cmpeq_epi8(vn1, b);
+        let eqa2 = _mm_cmpeq_epi8(vn2, a);
+        let eqb2 = _mm_cmpeq_epi8(vn2, b);
+        let eqa3 = _mm_cmpeq_epi8(vn3, a);
+        let eqb3 = _mm_cmpeq_epi8(vn3, b);
+        let or1 = _mm_or_si128(eqa1, eqb1);
+        let or2 = _mm_or_si128(eqa2, eqb2);
+        let or3 = _mm_or_si128(eqa3, eqb3);
+        let or4 = _mm_or_si128(or1, or2);
+        let or5 = _mm_or_si128(or3, or4);
+        if _mm_movemask_epi8(or5) != 0 {
+            let mut at = sub(ptr, start_ptr);
+            let mask1 = _mm_movemask_epi8(eqa1);
+            let mask2 = _mm_movemask_epi8(eqa2);
+            let mask3 = _mm_movemask_epi8(eqa3);
+            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
+                return Some(at + forward_pos3(mask1, mask2, mask3));
+            }
+
+            at += VECTOR_SIZE;
+            let mask1 = _mm_movemask_epi8(eqb1);
+            let mask2 = _mm_movemask_epi8(eqb2);
+            let mask3 = _mm_movemask_epi8(eqb3);
+            return Some(at + forward_pos3(mask1, mask2, mask3));
+        }
+        ptr = ptr.add(loop_size);
+    }
+    while ptr <= end_ptr.sub(VECTOR_SIZE) {
+        if let Some(i) =
+            forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
+        {
+            return Some(i);
+        }
+        ptr = ptr.add(VECTOR_SIZE);
+    }
+    if ptr < end_ptr {
+        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
+        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
+        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
+
+        return forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3);
+    }
+    None
+}
+
+#[target_feature(enable = "sse2")]
+pub unsafe fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = _mm_set1_epi8(n1 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = end_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr > start_ptr {
+            ptr = ptr.offset(-1);
+            if *ptr == n1 {
+                return Some(sub(ptr, start_ptr));
+            }
+        }
+        return None;
+    }
+
+    ptr = ptr.sub(VECTOR_SIZE);
+    if let Some(i) = reverse_search1(start_ptr, end_ptr, ptr, vn1) {
+        return Some(i);
+    }
+
+    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
+    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+    while loop_size == LOOP_SIZE && ptr >= start_ptr.add(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        ptr = ptr.sub(loop_size);
+        let a = _mm_load_si128(ptr as *const __m128i);
+        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
+        let c = _mm_load_si128(ptr.add(2 * VECTOR_SIZE) as *const __m128i);
+        let d = _mm_load_si128(ptr.add(3 * VECTOR_SIZE) as *const __m128i);
+        let eqa = _mm_cmpeq_epi8(vn1, a);
+        let eqb = _mm_cmpeq_epi8(vn1, b);
+        let eqc = _mm_cmpeq_epi8(vn1, c);
+        let eqd = _mm_cmpeq_epi8(vn1, d);
+        let or1 = _mm_or_si128(eqa, eqb);
+        let or2 = _mm_or_si128(eqc, eqd);
+        let or3 = _mm_or_si128(or1, or2);
+        if _mm_movemask_epi8(or3) != 0 {
+            let mut at = sub(ptr.add(3 * VECTOR_SIZE), start_ptr);
+            let mask = _mm_movemask_epi8(eqd);
+            if mask != 0 {
+                return Some(at + reverse_pos(mask));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask = _mm_movemask_epi8(eqc);
+            if mask != 0 {
+                return Some(at + reverse_pos(mask));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask = _mm_movemask_epi8(eqb);
+            if mask != 0 {
+                return Some(at + reverse_pos(mask));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask = _mm_movemask_epi8(eqa);
+            debug_assert!(mask != 0);
+            return Some(at + reverse_pos(mask));
+        }
+    }
+    while ptr >= start_ptr.add(VECTOR_SIZE) {
+        ptr = ptr.sub(VECTOR_SIZE);
+        if let Some(i) = reverse_search1(start_ptr, end_ptr, ptr, vn1) {
+            return Some(i);
+        }
+    }
+    if ptr > start_ptr {
+        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
+        return reverse_search1(start_ptr, end_ptr, start_ptr, vn1);
+    }
+    None
+}
+
+#[target_feature(enable = "sse2")]
+pub unsafe fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+    let vn1 = _mm_set1_epi8(n1 as i8);
+    let vn2 = _mm_set1_epi8(n2 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE2, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = end_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr > start_ptr {
+            ptr = ptr.offset(-1);
+            if *ptr == n1 || *ptr == n2 {
+                return Some(sub(ptr, start_ptr));
+            }
+        }
+        return None;
+    }
+
+    ptr = ptr.sub(VECTOR_SIZE);
+    if let Some(i) = reverse_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
+        return Some(i);
+    }
+
+    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
+    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+    while loop_size == LOOP_SIZE2 && ptr >= start_ptr.add(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        ptr = ptr.sub(loop_size);
+        let a = _mm_load_si128(ptr as *const __m128i);
+        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
+        let eqa1 = _mm_cmpeq_epi8(vn1, a);
+        let eqb1 = _mm_cmpeq_epi8(vn1, b);
+        let eqa2 = _mm_cmpeq_epi8(vn2, a);
+        let eqb2 = _mm_cmpeq_epi8(vn2, b);
+        let or1 = _mm_or_si128(eqa1, eqb1);
+        let or2 = _mm_or_si128(eqa2, eqb2);
+        let or3 = _mm_or_si128(or1, or2);
+        if _mm_movemask_epi8(or3) != 0 {
+            let mut at = sub(ptr.add(VECTOR_SIZE), start_ptr);
+            let mask1 = _mm_movemask_epi8(eqb1);
+            let mask2 = _mm_movemask_epi8(eqb2);
+            if mask1 != 0 || mask2 != 0 {
+                return Some(at + reverse_pos2(mask1, mask2));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask1 = _mm_movemask_epi8(eqa1);
+            let mask2 = _mm_movemask_epi8(eqa2);
+            return Some(at + reverse_pos2(mask1, mask2));
+        }
+    }
+    while ptr >= start_ptr.add(VECTOR_SIZE) {
+        ptr = ptr.sub(VECTOR_SIZE);
+        if let Some(i) = reverse_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
+            return Some(i);
+        }
+    }
+    if ptr > start_ptr {
+        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
+        return reverse_search2(start_ptr, end_ptr, start_ptr, vn1, vn2);
+    }
+    None
+}
+
+#[target_feature(enable = "sse2")]
+pub unsafe fn memrchr3(
+    n1: u8,
+    n2: u8,
+    n3: u8,
+    haystack: &[u8],
+) -> Option<usize> {
+    let vn1 = _mm_set1_epi8(n1 as i8);
+    let vn2 = _mm_set1_epi8(n2 as i8);
+    let vn3 = _mm_set1_epi8(n3 as i8);
+    let len = haystack.len();
+    let loop_size = cmp::min(LOOP_SIZE2, len);
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let mut ptr = end_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr > start_ptr {
+            ptr = ptr.offset(-1);
+            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
+                return Some(sub(ptr, start_ptr));
+            }
+        }
+        return None;
+    }
+
+    ptr = ptr.sub(VECTOR_SIZE);
+    if let Some(i) = reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
+        return Some(i);
+    }
+
+    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
+    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
+    while loop_size == LOOP_SIZE2 && ptr >= start_ptr.add(loop_size) {
+        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
+
+        ptr = ptr.sub(loop_size);
+        let a = _mm_load_si128(ptr as *const __m128i);
+        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
+        let eqa1 = _mm_cmpeq_epi8(vn1, a);
+        let eqb1 = _mm_cmpeq_epi8(vn1, b);
+        let eqa2 = _mm_cmpeq_epi8(vn2, a);
+        let eqb2 = _mm_cmpeq_epi8(vn2, b);
+        let eqa3 = _mm_cmpeq_epi8(vn3, a);
+        let eqb3 = _mm_cmpeq_epi8(vn3, b);
+        let or1 = _mm_or_si128(eqa1, eqb1);
+        let or2 = _mm_or_si128(eqa2, eqb2);
+        let or3 = _mm_or_si128(eqa3, eqb3);
+        let or4 = _mm_or_si128(or1, or2);
+        let or5 = _mm_or_si128(or3, or4);
+        if _mm_movemask_epi8(or5) != 0 {
+            let mut at = sub(ptr.add(VECTOR_SIZE), start_ptr);
+            let mask1 = _mm_movemask_epi8(eqb1);
+            let mask2 = _mm_movemask_epi8(eqb2);
+            let mask3 = _mm_movemask_epi8(eqb3);
+            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
+                return Some(at + reverse_pos3(mask1, mask2, mask3));
+            }
+
+            at -= VECTOR_SIZE;
+            let mask1 = _mm_movemask_epi8(eqa1);
+            let mask2 = _mm_movemask_epi8(eqa2);
+            let mask3 = _mm_movemask_epi8(eqa3);
+            return Some(at + reverse_pos3(mask1, mask2, mask3));
+        }
+    }
+    while ptr >= start_ptr.add(VECTOR_SIZE) {
+        ptr = ptr.sub(VECTOR_SIZE);
+        if let Some(i) =
+            reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
+        {
+            return Some(i);
+        }
+    }
+    if ptr > start_ptr {
+        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
+        return reverse_search3(start_ptr, end_ptr, start_ptr, vn1, vn2, vn3);
+    }
+    None
+}
+
+#[target_feature(enable = "sse2")]
+pub unsafe fn forward_search1(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m128i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm_loadu_si128(ptr as *const __m128i);
+    let mask = _mm_movemask_epi8(_mm_cmpeq_epi8(chunk, vn1));
+    if mask != 0 {
+        Some(sub(ptr, start_ptr) + forward_pos(mask))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "sse2")]
+unsafe fn forward_search2(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m128i,
+    vn2: __m128i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm_loadu_si128(ptr as *const __m128i);
+    let eq1 = _mm_cmpeq_epi8(chunk, vn1);
+    let eq2 = _mm_cmpeq_epi8(chunk, vn2);
+    if _mm_movemask_epi8(_mm_or_si128(eq1, eq2)) != 0 {
+        let mask1 = _mm_movemask_epi8(eq1);
+        let mask2 = _mm_movemask_epi8(eq2);
+        Some(sub(ptr, start_ptr) + forward_pos2(mask1, mask2))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "sse2")]
+pub unsafe fn forward_search3(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m128i,
+    vn2: __m128i,
+    vn3: __m128i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm_loadu_si128(ptr as *const __m128i);
+    let eq1 = _mm_cmpeq_epi8(chunk, vn1);
+    let eq2 = _mm_cmpeq_epi8(chunk, vn2);
+    let eq3 = _mm_cmpeq_epi8(chunk, vn3);
+    let or = _mm_or_si128(eq1, eq2);
+    if _mm_movemask_epi8(_mm_or_si128(or, eq3)) != 0 {
+        let mask1 = _mm_movemask_epi8(eq1);
+        let mask2 = _mm_movemask_epi8(eq2);
+        let mask3 = _mm_movemask_epi8(eq3);
+        Some(sub(ptr, start_ptr) + forward_pos3(mask1, mask2, mask3))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "sse2")]
+unsafe fn reverse_search1(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m128i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm_loadu_si128(ptr as *const __m128i);
+    let mask = _mm_movemask_epi8(_mm_cmpeq_epi8(vn1, chunk));
+    if mask != 0 {
+        Some(sub(ptr, start_ptr) + reverse_pos(mask))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "sse2")]
+unsafe fn reverse_search2(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m128i,
+    vn2: __m128i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm_loadu_si128(ptr as *const __m128i);
+    let eq1 = _mm_cmpeq_epi8(chunk, vn1);
+    let eq2 = _mm_cmpeq_epi8(chunk, vn2);
+    if _mm_movemask_epi8(_mm_or_si128(eq1, eq2)) != 0 {
+        let mask1 = _mm_movemask_epi8(eq1);
+        let mask2 = _mm_movemask_epi8(eq2);
+        Some(sub(ptr, start_ptr) + reverse_pos2(mask1, mask2))
+    } else {
+        None
+    }
+}
+
+#[target_feature(enable = "sse2")]
+unsafe fn reverse_search3(
+    start_ptr: *const u8,
+    end_ptr: *const u8,
+    ptr: *const u8,
+    vn1: __m128i,
+    vn2: __m128i,
+    vn3: __m128i,
+) -> Option<usize> {
+    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
+    debug_assert!(start_ptr <= ptr);
+    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
+
+    let chunk = _mm_loadu_si128(ptr as *const __m128i);
+    let eq1 = _mm_cmpeq_epi8(chunk, vn1);
+    let eq2 = _mm_cmpeq_epi8(chunk, vn2);
+    let eq3 = _mm_cmpeq_epi8(chunk, vn3);
+    let or = _mm_or_si128(eq1, eq2);
+    if _mm_movemask_epi8(_mm_or_si128(or, eq3)) != 0 {
+        let mask1 = _mm_movemask_epi8(eq1);
+        let mask2 = _mm_movemask_epi8(eq2);
+        let mask3 = _mm_movemask_epi8(eq3);
+        Some(sub(ptr, start_ptr) + reverse_pos3(mask1, mask2, mask3))
+    } else {
+        None
+    }
+}
+
+/// Compute the position of the first matching byte from the given mask. The
+/// position returned is always in the range [0, 15].
+///
+/// The mask given is expected to be the result of _mm_movemask_epi8.
+fn forward_pos(mask: i32) -> usize {
+    // We are dealing with little endian here, where the most significant byte
+    // is at a higher address. That means the least significant bit that is set
+    // corresponds to the position of our first matching byte. That position
+    // corresponds to the number of zeros after the least significant bit.
+    mask.trailing_zeros() as usize
+}
+
+/// Compute the position of the first matching byte from the given masks. The
+/// position returned is always in the range [0, 15]. Each mask corresponds to
+/// the equality comparison of a single byte.
+///
+/// The masks given are expected to be the result of _mm_movemask_epi8, where
+/// at least one of the masks is non-zero (i.e., indicates a match).
+fn forward_pos2(mask1: i32, mask2: i32) -> usize {
+    debug_assert!(mask1 != 0 || mask2 != 0);
+
+    forward_pos(mask1 | mask2)
+}
+
+/// Compute the position of the first matching byte from the given masks. The
+/// position returned is always in the range [0, 15]. Each mask corresponds to
+/// the equality comparison of a single byte.
+///
+/// The masks given are expected to be the result of _mm_movemask_epi8, where
+/// at least one of the masks is non-zero (i.e., indicates a match).
+fn forward_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
+    debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
+
+    forward_pos(mask1 | mask2 | mask3)
+}
+
+/// Compute the position of the last matching byte from the given mask. The
+/// position returned is always in the range [0, 15].
+///
+/// The mask given is expected to be the result of _mm_movemask_epi8.
+fn reverse_pos(mask: i32) -> usize {
+    // We are dealing with little endian here, where the most significant byte
+    // is at a higher address. That means the most significant bit that is set
+    // corresponds to the position of our last matching byte. The position from
+    // the end of the mask is therefore the number of leading zeros in a 16
+    // bit integer, and the position from the start of the mask is therefore
+    // 16 - (leading zeros) - 1.
+    VECTOR_SIZE - (mask as u16).leading_zeros() as usize - 1
+}
+
+/// Compute the position of the last matching byte from the given masks. The
+/// position returned is always in the range [0, 15]. Each mask corresponds to
+/// the equality comparison of a single byte.
+///
+/// The masks given are expected to be the result of _mm_movemask_epi8, where
+/// at least one of the masks is non-zero (i.e., indicates a match).
+fn reverse_pos2(mask1: i32, mask2: i32) -> usize {
+    debug_assert!(mask1 != 0 || mask2 != 0);
+
+    reverse_pos(mask1 | mask2)
+}
+
+/// Compute the position of the last matching byte from the given masks. The
+/// position returned is always in the range [0, 15]. Each mask corresponds to
+/// the equality comparison of a single byte.
+///
+/// The masks given are expected to be the result of _mm_movemask_epi8, where
+/// at least one of the masks is non-zero (i.e., indicates a match).
+fn reverse_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
+    debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
+
+    reverse_pos(mask1 | mask2 | mask3)
+}
+
+/// Subtract `b` from `a` and return the difference. `a` should be greater than
+/// or equal to `b`.
+fn sub(a: *const u8, b: *const u8) -> usize {
+    debug_assert!(a >= b);
+    (a as usize) - (b as usize)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/x86/sse42.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/x86/sse42.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memchr/x86/sse42.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memchr/x86/sse42.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,72 @@
+// This code is unused. PCMPESTRI is gratuitously slow. I imagine it might
+// start winning with a hypothetical memchr4 (or greater). This technique might
+// also be good for exposing searches over ranges of bytes, but that departs
+// from the standard memchr API, so it's not clear whether we actually want
+// that or not.
+//
+// N.B. PCMPISTRI appears to be about twice as fast as PCMPESTRI, which is kind
+// of neat. Unfortunately, UTF-8 strings can contain NUL bytes, which means
+// I don't see a way of effectively using PCMPISTRI unless there's some fast
+// way to replace zero bytes with a byte that is not not a needle byte.
+
+use core::{arch::x86_64::*, mem::size_of};
+
+use x86::sse2;
+
+const VECTOR_SIZE: usize = size_of::<__m128i>();
+const CONTROL_ANY: i32 = _SIDD_UBYTE_OPS
+    | _SIDD_CMP_EQUAL_ANY
+    | _SIDD_POSITIVE_POLARITY
+    | _SIDD_LEAST_SIGNIFICANT;
+
+#[target_feature(enable = "sse4.2")]
+pub unsafe fn memchr3(
+    n1: u8,
+    n2: u8,
+    n3: u8,
+    haystack: &[u8],
+) -> Option<usize> {
+    let vn1 = _mm_set1_epi8(n1 as i8);
+    let vn2 = _mm_set1_epi8(n2 as i8);
+    let vn3 = _mm_set1_epi8(n3 as i8);
+    let vn = _mm_setr_epi8(
+        n1 as i8, n2 as i8, n3 as i8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    );
+    let len = haystack.len();
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = haystack[haystack.len()..].as_ptr();
+    let mut ptr = start_ptr;
+
+    if haystack.len() < VECTOR_SIZE {
+        while ptr < end_ptr {
+            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
+                return Some(sub(ptr, start_ptr));
+            }
+            ptr = ptr.offset(1);
+        }
+        return None;
+    }
+    while ptr <= end_ptr.sub(VECTOR_SIZE) {
+        let chunk = _mm_loadu_si128(ptr as *const __m128i);
+        let res = _mm_cmpestri(vn, 3, chunk, 16, CONTROL_ANY);
+        if res < 16 {
+            return Some(sub(ptr, start_ptr) + res as usize);
+        }
+        ptr = ptr.add(VECTOR_SIZE);
+    }
+    if ptr < end_ptr {
+        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
+        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
+        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
+
+        return sse2::forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3);
+    }
+    None
+}
+
+/// Subtract `b` from `a` and return the difference. `a` should be greater than
+/// or equal to `b`.
+fn sub(a: *const u8, b: *const u8) -> usize {
+    debug_assert!(a >= b);
+    (a as usize) - (b as usize)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/byte_frequencies.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/byte_frequencies.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/byte_frequencies.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/byte_frequencies.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,258 @@
+pub const BYTE_FREQUENCIES: [u8; 256] = [
+    55,  // '\x00'
+    52,  // '\x01'
+    51,  // '\x02'
+    50,  // '\x03'
+    49,  // '\x04'
+    48,  // '\x05'
+    47,  // '\x06'
+    46,  // '\x07'
+    45,  // '\x08'
+    103, // '\t'
+    242, // '\n'
+    66,  // '\x0b'
+    67,  // '\x0c'
+    229, // '\r'
+    44,  // '\x0e'
+    43,  // '\x0f'
+    42,  // '\x10'
+    41,  // '\x11'
+    40,  // '\x12'
+    39,  // '\x13'
+    38,  // '\x14'
+    37,  // '\x15'
+    36,  // '\x16'
+    35,  // '\x17'
+    34,  // '\x18'
+    33,  // '\x19'
+    56,  // '\x1a'
+    32,  // '\x1b'
+    31,  // '\x1c'
+    30,  // '\x1d'
+    29,  // '\x1e'
+    28,  // '\x1f'
+    255, // ' '
+    148, // '!'
+    164, // '"'
+    149, // '#'
+    136, // '$'
+    160, // '%'
+    155, // '&'
+    173, // "'"
+    221, // '('
+    222, // ')'
+    134, // '*'
+    122, // '+'
+    232, // ','
+    202, // '-'
+    215, // '.'
+    224, // '/'
+    208, // '0'
+    220, // '1'
+    204, // '2'
+    187, // '3'
+    183, // '4'
+    179, // '5'
+    177, // '6'
+    168, // '7'
+    178, // '8'
+    200, // '9'
+    226, // ':'
+    195, // ';'
+    154, // '<'
+    184, // '='
+    174, // '>'
+    126, // '?'
+    120, // '@'
+    191, // 'A'
+    157, // 'B'
+    194, // 'C'
+    170, // 'D'
+    189, // 'E'
+    162, // 'F'
+    161, // 'G'
+    150, // 'H'
+    193, // 'I'
+    142, // 'J'
+    137, // 'K'
+    171, // 'L'
+    176, // 'M'
+    185, // 'N'
+    167, // 'O'
+    186, // 'P'
+    112, // 'Q'
+    175, // 'R'
+    192, // 'S'
+    188, // 'T'
+    156, // 'U'
+    140, // 'V'
+    143, // 'W'
+    123, // 'X'
+    133, // 'Y'
+    128, // 'Z'
+    147, // '['
+    138, // '\\'
+    146, // ']'
+    114, // '^'
+    223, // '_'
+    151, // '`'
+    249, // 'a'
+    216, // 'b'
+    238, // 'c'
+    236, // 'd'
+    253, // 'e'
+    227, // 'f'
+    218, // 'g'
+    230, // 'h'
+    247, // 'i'
+    135, // 'j'
+    180, // 'k'
+    241, // 'l'
+    233, // 'm'
+    246, // 'n'
+    244, // 'o'
+    231, // 'p'
+    139, // 'q'
+    245, // 'r'
+    243, // 's'
+    251, // 't'
+    235, // 'u'
+    201, // 'v'
+    196, // 'w'
+    240, // 'x'
+    214, // 'y'
+    152, // 'z'
+    182, // '{'
+    205, // '|'
+    181, // '}'
+    127, // '~'
+    27,  // '\x7f'
+    212, // '\x80'
+    211, // '\x81'
+    210, // '\x82'
+    213, // '\x83'
+    228, // '\x84'
+    197, // '\x85'
+    169, // '\x86'
+    159, // '\x87'
+    131, // '\x88'
+    172, // '\x89'
+    105, // '\x8a'
+    80,  // '\x8b'
+    98,  // '\x8c'
+    96,  // '\x8d'
+    97,  // '\x8e'
+    81,  // '\x8f'
+    207, // '\x90'
+    145, // '\x91'
+    116, // '\x92'
+    115, // '\x93'
+    144, // '\x94'
+    130, // '\x95'
+    153, // '\x96'
+    121, // '\x97'
+    107, // '\x98'
+    132, // '\x99'
+    109, // '\x9a'
+    110, // '\x9b'
+    124, // '\x9c'
+    111, // '\x9d'
+    82,  // '\x9e'
+    108, // '\x9f'
+    118, // '\xa0'
+    141, // '¡'
+    113, // '¢'
+    129, // '£'
+    119, // '¤'
+    125, // 'Â¥'
+    165, // '¦'
+    117, // '§'
+    92,  // '¨'
+    106, // '©'
+    83,  // 'ª'
+    72,  // '«'
+    99,  // '¬'
+    93,  // '\xad'
+    65,  // '®'
+    79,  // '¯'
+    166, // '°'
+    237, // '±'
+    163, // '²'
+    199, // '³'
+    190, // '´'
+    225, // 'µ'
+    209, // '¶'
+    203, // '·'
+    198, // '¸'
+    217, // '¹'
+    219, // 'º'
+    206, // '»'
+    234, // '¼'
+    248, // '½'
+    158, // '¾'
+    239, // '¿'
+    255, // 'À'
+    255, // '�'
+    255, // 'Â'
+    255, // 'Ã'
+    255, // 'Ä'
+    255, // 'Ã…'
+    255, // 'Æ'
+    255, // 'Ç'
+    255, // 'È'
+    255, // 'É'
+    255, // 'Ê'
+    255, // 'Ë'
+    255, // 'Ì'
+    255, // '�'
+    255, // 'ÃŽ'
+    255, // '�'
+    255, // '�'
+    255, // 'Ñ'
+    255, // 'Ã’'
+    255, // 'Ó'
+    255, // 'Ô'
+    255, // 'Õ'
+    255, // 'Ö'
+    255, // '×'
+    255, // 'Ø'
+    255, // 'Ù'
+    255, // 'Ú'
+    255, // 'Û'
+    255, // 'Ü'
+    255, // '�'
+    255, // 'Þ'
+    255, // 'ß'
+    255, // 'à'
+    255, // 'á'
+    255, // 'â'
+    255, // 'ã'
+    255, // 'ä'
+    255, // 'Ã¥'
+    255, // 'æ'
+    255, // 'ç'
+    255, // 'è'
+    255, // 'é'
+    255, // 'ê'
+    255, // 'ë'
+    255, // 'ì'
+    255, // 'í'
+    255, // 'î'
+    255, // 'ï'
+    255, // 'ð'
+    255, // 'ñ'
+    255, // 'ò'
+    255, // 'ó'
+    255, // 'ô'
+    255, // 'õ'
+    255, // 'ö'
+    255, // '÷'
+    255, // 'ø'
+    255, // 'ù'
+    255, // 'ú'
+    255, // 'û'
+    255, // 'ü'
+    255, // 'ý'
+    255, // 'þ'
+    255, // 'ÿ'
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/genericsimd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/genericsimd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/genericsimd.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/genericsimd.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,266 @@
+use core::mem::size_of;
+
+use crate::memmem::{util::memcmp, vector::Vector, NeedleInfo};
+
+/// The minimum length of a needle required for this algorithm. The minimum
+/// is 2 since a length of 1 should just use memchr and a length of 0 isn't
+/// a case handled by this searcher.
+pub(crate) const MIN_NEEDLE_LEN: usize = 2;
+
+/// The maximum length of a needle required for this algorithm.
+///
+/// In reality, there is no hard max here. The code below can handle any
+/// length needle. (Perhaps that suggests there are missing optimizations.)
+/// Instead, this is a heuristic and a bound guaranteeing our linear time
+/// complexity.
+///
+/// It is a heuristic because when a candidate match is found, memcmp is run.
+/// For very large needles with lots of false positives, memcmp can make the
+/// code run quite slow.
+///
+/// It is a bound because the worst case behavior with memcmp is multiplicative
+/// in the size of the needle and haystack, and we want to keep that additive.
+/// This bound ensures we still meet that bound theoretically, since it's just
+/// a constant. We aren't acting in bad faith here, memcmp on tiny needles
+/// is so fast that even in pathological cases (see pathological vector
+/// benchmarks), this is still just as fast or faster in practice.
+///
+/// This specific number was chosen by tweaking a bit and running benchmarks.
+/// The rare-medium-needle, for example, gets about 5% faster by using this
+/// algorithm instead of a prefilter-accelerated Two-Way. There's also a
+/// theoretical desire to keep this number reasonably low, to mitigate the
+/// impact of pathological cases. I did try 64, and some benchmarks got a
+/// little better, and others (particularly the pathological ones), got a lot
+/// worse. So... 32 it is?
+pub(crate) const MAX_NEEDLE_LEN: usize = 32;
+
+/// The implementation of the forward vector accelerated substring search.
+///
+/// This is extremely similar to the prefilter vector module by the same name.
+/// The key difference is that this is not a prefilter. Instead, it handles
+/// confirming its own matches. The trade off is that this only works with
+/// smaller needles. The speed up here is that an inlined memcmp on a tiny
+/// needle is very quick, even on pathological inputs. This is much better than
+/// combining a prefilter with Two-Way, where using Two-Way to confirm the
+/// match has higher latency.
+///
+/// So why not use this for all needles? We could, and it would probably work
+/// really well on most inputs. But its worst case is multiplicative and we
+/// want to guarantee worst case additive time. Some of the benchmarks try to
+/// justify this (see the pathological ones).
+///
+/// The prefilter variant of this has more comments. Also note that we only
+/// implement this for forward searches for now. If you have a compelling use
+/// case for accelerated reverse search, please file an issue.
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct Forward {
+    rare1i: u8,
+    rare2i: u8,
+}
+
+impl Forward {
+    /// Create a new "generic simd" forward searcher. If one could not be
+    /// created from the given inputs, then None is returned.
+    pub(crate) fn new(ninfo: &NeedleInfo, needle: &[u8]) -> Option<Forward> {
+        let (rare1i, rare2i) = ninfo.rarebytes.as_rare_ordered_u8();
+        // If the needle is too short or too long, give up. Also, give up
+        // if the rare bytes detected are at the same position. (It likely
+        // suggests a degenerate case, although it should technically not be
+        // possible.)
+        if needle.len() < MIN_NEEDLE_LEN
+            || needle.len() > MAX_NEEDLE_LEN
+            || rare1i == rare2i
+        {
+            return None;
+        }
+        Some(Forward { rare1i, rare2i })
+    }
+
+    /// Returns the minimum length of haystack that is needed for this searcher
+    /// to work for a particular vector. Passing a haystack with a length
+    /// smaller than this will cause `fwd_find` to panic.
+    #[inline(always)]
+    pub(crate) fn min_haystack_len<V: Vector>(&self) -> usize {
+        self.rare2i as usize + size_of::<V>()
+    }
+}
+
+/// Searches the given haystack for the given needle. The needle given should
+/// be the same as the needle that this searcher was initialized with.
+///
+/// # Panics
+///
+/// When the given haystack has a length smaller than `min_haystack_len`.
+///
+/// # Safety
+///
+/// Since this is meant to be used with vector functions, callers need to
+/// specialize this inside of a function with a `target_feature` attribute.
+/// Therefore, callers must ensure that whatever target feature is being used
+/// supports the vector functions that this function is specialized for. (For
+/// the specific vector functions used, see the Vector trait implementations.)
+#[inline(always)]
+pub(crate) unsafe fn fwd_find<V: Vector>(
+    fwd: &Forward,
+    haystack: &[u8],
+    needle: &[u8],
+) -> Option<usize> {
+    // It would be nice if we didn't have this check here, since the meta
+    // searcher should handle it for us. But without this, I don't think we
+    // guarantee that end_ptr.sub(needle.len()) won't result in UB. We could
+    // put it as part of the safety contract, but it makes it more complicated
+    // than necessary.
+    if haystack.len() < needle.len() {
+        return None;
+    }
+    let min_haystack_len = fwd.min_haystack_len::<V>();
+    assert!(haystack.len() >= min_haystack_len, "haystack too small");
+    debug_assert!(needle.len() <= haystack.len());
+    debug_assert!(
+        needle.len() >= MIN_NEEDLE_LEN,
+        "needle must be at least {} bytes",
+        MIN_NEEDLE_LEN,
+    );
+    debug_assert!(
+        needle.len() <= MAX_NEEDLE_LEN,
+        "needle must be at most {} bytes",
+        MAX_NEEDLE_LEN,
+    );
+
+    let (rare1i, rare2i) = (fwd.rare1i as usize, fwd.rare2i as usize);
+    let rare1chunk = V::splat(needle[rare1i]);
+    let rare2chunk = V::splat(needle[rare2i]);
+
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let max_ptr = end_ptr.sub(min_haystack_len);
+    let mut ptr = start_ptr;
+
+    // N.B. I did experiment with unrolling the loop to deal with size(V)
+    // bytes at a time and 2*size(V) bytes at a time. The double unroll was
+    // marginally faster while the quadruple unroll was unambiguously slower.
+    // In the end, I decided the complexity from unrolling wasn't worth it. I
+    // used the memmem/krate/prebuilt/huge-en/ benchmarks to compare.
+    while ptr <= max_ptr {
+        let m = fwd_find_in_chunk(
+            fwd, needle, ptr, end_ptr, rare1chunk, rare2chunk, !0,
+        );
+        if let Some(chunki) = m {
+            return Some(matched(start_ptr, ptr, chunki));
+        }
+        ptr = ptr.add(size_of::<V>());
+    }
+    if ptr < end_ptr {
+        let remaining = diff(end_ptr, ptr);
+        debug_assert!(
+            remaining < min_haystack_len,
+            "remaining bytes should be smaller than the minimum haystack \
+             length of {}, but there are {} bytes remaining",
+            min_haystack_len,
+            remaining,
+        );
+        if remaining < needle.len() {
+            return None;
+        }
+        debug_assert!(
+            max_ptr < ptr,
+            "after main loop, ptr should have exceeded max_ptr",
+        );
+        let overlap = diff(ptr, max_ptr);
+        debug_assert!(
+            overlap > 0,
+            "overlap ({}) must always be non-zero",
+            overlap,
+        );
+        debug_assert!(
+            overlap < size_of::<V>(),
+            "overlap ({}) cannot possibly be >= than a vector ({})",
+            overlap,
+            size_of::<V>(),
+        );
+        // The mask has all of its bits set except for the first N least
+        // significant bits, where N=overlap. This way, any matches that
+        // occur in find_in_chunk within the overlap are automatically
+        // ignored.
+        let mask = !((1 << overlap) - 1);
+        ptr = max_ptr;
+        let m = fwd_find_in_chunk(
+            fwd, needle, ptr, end_ptr, rare1chunk, rare2chunk, mask,
+        );
+        if let Some(chunki) = m {
+            return Some(matched(start_ptr, ptr, chunki));
+        }
+    }
+    None
+}
+
+/// Search for an occurrence of two rare bytes from the needle in the chunk
+/// pointed to by ptr, with the end of the haystack pointed to by end_ptr. When
+/// an occurrence is found, memcmp is run to check if a match occurs at the
+/// corresponding position.
+///
+/// rare1chunk and rare2chunk correspond to vectors with the rare1 and rare2
+/// bytes repeated in each 8-bit lane, respectively.
+///
+/// mask should have bits set corresponding the positions in the chunk in which
+/// matches are considered. This is only used for the last vector load where
+/// the beginning of the vector might have overlapped with the last load in
+/// the main loop. The mask lets us avoid visiting positions that have already
+/// been discarded as matches.
+///
+/// # Safety
+///
+/// It must be safe to do an unaligned read of size(V) bytes starting at both
+/// (ptr + rare1i) and (ptr + rare2i). It must also be safe to do unaligned
+/// loads on ptr up to (end_ptr - needle.len()).
+#[inline(always)]
+unsafe fn fwd_find_in_chunk<V: Vector>(
+    fwd: &Forward,
+    needle: &[u8],
+    ptr: *const u8,
+    end_ptr: *const u8,
+    rare1chunk: V,
+    rare2chunk: V,
+    mask: u32,
+) -> Option<usize> {
+    let chunk0 = V::load_unaligned(ptr.add(fwd.rare1i as usize));
+    let chunk1 = V::load_unaligned(ptr.add(fwd.rare2i as usize));
+
+    let eq0 = chunk0.cmpeq(rare1chunk);
+    let eq1 = chunk1.cmpeq(rare2chunk);
+
+    let mut match_offsets = eq0.and(eq1).movemask() & mask;
+    while match_offsets != 0 {
+        let offset = match_offsets.trailing_zeros() as usize;
+        let ptr = ptr.add(offset);
+        if end_ptr.sub(needle.len()) < ptr {
+            return None;
+        }
+        let chunk = core::slice::from_raw_parts(ptr, needle.len());
+        if memcmp(needle, chunk) {
+            return Some(offset);
+        }
+        match_offsets &= match_offsets - 1;
+    }
+    None
+}
+
+/// Accepts a chunk-relative offset and returns a haystack relative offset
+/// after updating the prefilter state.
+///
+/// See the same function with the same name in the prefilter variant of this
+/// algorithm to learned why it's tagged with inline(never). Even here, where
+/// the function is simpler, inlining it leads to poorer codegen. (Although
+/// it does improve some benchmarks, like prebuiltiter/huge-en/common-you.)
+#[cold]
+#[inline(never)]
+fn matched(start_ptr: *const u8, ptr: *const u8, chunki: usize) -> usize {
+    diff(ptr, start_ptr) + chunki
+}
+
+/// Subtract `b` from `a` and return the difference. `a` must be greater than
+/// or equal to `b`.
+fn diff(a: *const u8, b: *const u8) -> usize {
+    debug_assert!(a >= b);
+    (a as usize) - (b as usize)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1296 @@
+/*!
+This module provides forward and reverse substring search routines.
+
+Unlike the standard library's substring search routines, these work on
+arbitrary bytes. For all non-empty needles, these routines will report exactly
+the same values as the corresponding routines in the standard library. For
+the empty needle, the standard library reports matches only at valid UTF-8
+boundaries, where as these routines will report matches at every position.
+
+Other than being able to work on arbitrary bytes, the primary reason to prefer
+these routines over the standard library routines is that these will generally
+be faster. In some cases, significantly so.
+
+# Example: iterating over substring matches
+
+This example shows how to use [`find_iter`] to find occurrences of a substring
+in a haystack.
+
+```
+use memchr::memmem;
+
+let haystack = b"foo bar foo baz foo";
+
+let mut it = memmem::find_iter(haystack, "foo");
+assert_eq!(Some(0), it.next());
+assert_eq!(Some(8), it.next());
+assert_eq!(Some(16), it.next());
+assert_eq!(None, it.next());
+```
+
+# Example: iterating over substring matches in reverse
+
+This example shows how to use [`rfind_iter`] to find occurrences of a substring
+in a haystack starting from the end of the haystack.
+
+**NOTE:** This module does not implement double ended iterators, so reverse
+searches aren't done by calling `rev` on a forward iterator.
+
+```
+use memchr::memmem;
+
+let haystack = b"foo bar foo baz foo";
+
+let mut it = memmem::rfind_iter(haystack, "foo");
+assert_eq!(Some(16), it.next());
+assert_eq!(Some(8), it.next());
+assert_eq!(Some(0), it.next());
+assert_eq!(None, it.next());
+```
+
+# Example: repeating a search for the same needle
+
+It may be possible for the overhead of constructing a substring searcher to be
+measurable in some workloads. In cases where the same needle is used to search
+many haystacks, it is possible to do construction once and thus to avoid it for
+subsequent searches. This can be done with a [`Finder`] (or a [`FinderRev`] for
+reverse searches).
+
+```
+use memchr::memmem;
+
+let finder = memmem::Finder::new("foo");
+
+assert_eq!(Some(4), finder.find(b"baz foo quux"));
+assert_eq!(None, finder.find(b"quux baz bar"));
+```
+*/
+
+pub use self::prefilter::Prefilter;
+
+use crate::{
+    cow::CowBytes,
+    memmem::{
+        prefilter::{Pre, PrefilterFn, PrefilterState},
+        rabinkarp::NeedleHash,
+        rarebytes::RareNeedleBytes,
+    },
+};
+
+/// Defines a suite of quickcheck properties for forward and reverse
+/// substring searching.
+///
+/// This is defined in this specific spot so that it can be used freely among
+/// the different substring search implementations. I couldn't be bothered to
+/// fight with the macro-visibility rules enough to figure out how to stuff it
+/// somewhere more convenient.
+#[cfg(all(test, feature = "std"))]
+macro_rules! define_memmem_quickcheck_tests {
+    ($fwd:expr, $rev:expr) => {
+        use crate::memmem::proptests;
+
+        quickcheck::quickcheck! {
+            fn qc_fwd_prefix_is_substring(bs: Vec<u8>) -> bool {
+                proptests::prefix_is_substring(false, &bs, $fwd)
+            }
+
+            fn qc_fwd_suffix_is_substring(bs: Vec<u8>) -> bool {
+                proptests::suffix_is_substring(false, &bs, $fwd)
+            }
+
+            fn qc_fwd_matches_naive(
+                haystack: Vec<u8>,
+                needle: Vec<u8>
+            ) -> bool {
+                proptests::matches_naive(false, &haystack, &needle, $fwd)
+            }
+
+            fn qc_rev_prefix_is_substring(bs: Vec<u8>) -> bool {
+                proptests::prefix_is_substring(true, &bs, $rev)
+            }
+
+            fn qc_rev_suffix_is_substring(bs: Vec<u8>) -> bool {
+                proptests::suffix_is_substring(true, &bs, $rev)
+            }
+
+            fn qc_rev_matches_naive(
+                haystack: Vec<u8>,
+                needle: Vec<u8>
+            ) -> bool {
+                proptests::matches_naive(true, &haystack, &needle, $rev)
+            }
+        }
+    };
+}
+
+/// Defines a suite of "simple" hand-written tests for a substring
+/// implementation.
+///
+/// This is defined here for the same reason that
+/// define_memmem_quickcheck_tests is defined here.
+#[cfg(test)]
+macro_rules! define_memmem_simple_tests {
+    ($fwd:expr, $rev:expr) => {
+        use crate::memmem::testsimples;
+
+        #[test]
+        fn simple_forward() {
+            testsimples::run_search_tests_fwd($fwd);
+        }
+
+        #[test]
+        fn simple_reverse() {
+            testsimples::run_search_tests_rev($rev);
+        }
+    };
+}
+
+mod byte_frequencies;
+#[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
+mod genericsimd;
+mod prefilter;
+mod rabinkarp;
+mod rarebytes;
+mod twoway;
+mod util;
+// SIMD is only supported on x86_64 currently.
+#[cfg(target_arch = "x86_64")]
+mod vector;
+#[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
+mod x86;
+
+/// Returns an iterator over all occurrences of a substring in a haystack.
+///
+/// # Complexity
+///
+/// This routine is guaranteed to have worst case linear time complexity
+/// with respect to both the needle and the haystack. That is, this runs
+/// in `O(needle.len() + haystack.len())` time.
+///
+/// This routine is also guaranteed to have worst case constant space
+/// complexity.
+///
+/// # Examples
+///
+/// Basic usage:
+///
+/// ```
+/// use memchr::memmem;
+///
+/// let haystack = b"foo bar foo baz foo";
+/// let mut it = memmem::find_iter(haystack, b"foo");
+/// assert_eq!(Some(0), it.next());
+/// assert_eq!(Some(8), it.next());
+/// assert_eq!(Some(16), it.next());
+/// assert_eq!(None, it.next());
+/// ```
+#[inline]
+pub fn find_iter<'h, 'n, N: 'n + ?Sized + AsRef<[u8]>>(
+    haystack: &'h [u8],
+    needle: &'n N,
+) -> FindIter<'h, 'n> {
+    FindIter::new(haystack, Finder::new(needle))
+}
+
+/// Returns a reverse iterator over all occurrences of a substring in a
+/// haystack.
+///
+/// # Complexity
+///
+/// This routine is guaranteed to have worst case linear time complexity
+/// with respect to both the needle and the haystack. That is, this runs
+/// in `O(needle.len() + haystack.len())` time.
+///
+/// This routine is also guaranteed to have worst case constant space
+/// complexity.
+///
+/// # Examples
+///
+/// Basic usage:
+///
+/// ```
+/// use memchr::memmem;
+///
+/// let haystack = b"foo bar foo baz foo";
+/// let mut it = memmem::rfind_iter(haystack, b"foo");
+/// assert_eq!(Some(16), it.next());
+/// assert_eq!(Some(8), it.next());
+/// assert_eq!(Some(0), it.next());
+/// assert_eq!(None, it.next());
+/// ```
+#[inline]
+pub fn rfind_iter<'h, 'n, N: 'n + ?Sized + AsRef<[u8]>>(
+    haystack: &'h [u8],
+    needle: &'n N,
+) -> FindRevIter<'h, 'n> {
+    FindRevIter::new(haystack, FinderRev::new(needle))
+}
+
+/// Returns the index of the first occurrence of the given needle.
+///
+/// Note that if you're are searching for the same needle in many different
+/// small haystacks, it may be faster to initialize a [`Finder`] once,
+/// and reuse it for each search.
+///
+/// # Complexity
+///
+/// This routine is guaranteed to have worst case linear time complexity
+/// with respect to both the needle and the haystack. That is, this runs
+/// in `O(needle.len() + haystack.len())` time.
+///
+/// This routine is also guaranteed to have worst case constant space
+/// complexity.
+///
+/// # Examples
+///
+/// Basic usage:
+///
+/// ```
+/// use memchr::memmem;
+///
+/// let haystack = b"foo bar baz";
+/// assert_eq!(Some(0), memmem::find(haystack, b"foo"));
+/// assert_eq!(Some(4), memmem::find(haystack, b"bar"));
+/// assert_eq!(None, memmem::find(haystack, b"quux"));
+/// ```
+#[inline]
+pub fn find(haystack: &[u8], needle: &[u8]) -> Option<usize> {
+    if haystack.len() < 64 {
+        rabinkarp::find(haystack, needle)
+    } else {
+        Finder::new(needle).find(haystack)
+    }
+}
+
+/// Returns the index of the last occurrence of the given needle.
+///
+/// Note that if you're are searching for the same needle in many different
+/// small haystacks, it may be faster to initialize a [`FinderRev`] once,
+/// and reuse it for each search.
+///
+/// # Complexity
+///
+/// This routine is guaranteed to have worst case linear time complexity
+/// with respect to both the needle and the haystack. That is, this runs
+/// in `O(needle.len() + haystack.len())` time.
+///
+/// This routine is also guaranteed to have worst case constant space
+/// complexity.
+///
+/// # Examples
+///
+/// Basic usage:
+///
+/// ```
+/// use memchr::memmem;
+///
+/// let haystack = b"foo bar baz";
+/// assert_eq!(Some(0), memmem::rfind(haystack, b"foo"));
+/// assert_eq!(Some(4), memmem::rfind(haystack, b"bar"));
+/// assert_eq!(Some(8), memmem::rfind(haystack, b"ba"));
+/// assert_eq!(None, memmem::rfind(haystack, b"quux"));
+/// ```
+#[inline]
+pub fn rfind(haystack: &[u8], needle: &[u8]) -> Option<usize> {
+    if haystack.len() < 64 {
+        rabinkarp::rfind(haystack, needle)
+    } else {
+        FinderRev::new(needle).rfind(haystack)
+    }
+}
+
+/// An iterator over non-overlapping substring matches.
+///
+/// Matches are reported by the byte offset at which they begin.
+///
+/// `'h` is the lifetime of the haystack while `'n` is the lifetime of the
+/// needle.
+#[derive(Debug)]
+pub struct FindIter<'h, 'n> {
+    haystack: &'h [u8],
+    prestate: PrefilterState,
+    finder: Finder<'n>,
+    pos: usize,
+}
+
+impl<'h, 'n> FindIter<'h, 'n> {
+    #[inline(always)]
+    pub(crate) fn new(
+        haystack: &'h [u8],
+        finder: Finder<'n>,
+    ) -> FindIter<'h, 'n> {
+        let prestate = finder.searcher.prefilter_state();
+        FindIter { haystack, prestate, finder, pos: 0 }
+    }
+}
+
+impl<'h, 'n> Iterator for FindIter<'h, 'n> {
+    type Item = usize;
+
+    fn next(&mut self) -> Option<usize> {
+        if self.pos > self.haystack.len() {
+            return None;
+        }
+        let result = self
+            .finder
+            .searcher
+            .find(&mut self.prestate, &self.haystack[self.pos..]);
+        match result {
+            None => None,
+            Some(i) => {
+                let pos = self.pos + i;
+                self.pos = pos + core::cmp::max(1, self.finder.needle().len());
+                Some(pos)
+            }
+        }
+    }
+}
+
+/// An iterator over non-overlapping substring matches in reverse.
+///
+/// Matches are reported by the byte offset at which they begin.
+///
+/// `'h` is the lifetime of the haystack while `'n` is the lifetime of the
+/// needle.
+#[derive(Debug)]
+pub struct FindRevIter<'h, 'n> {
+    haystack: &'h [u8],
+    finder: FinderRev<'n>,
+    /// When searching with an empty needle, this gets set to `None` after
+    /// we've yielded the last element at `0`.
+    pos: Option<usize>,
+}
+
+impl<'h, 'n> FindRevIter<'h, 'n> {
+    #[inline(always)]
+    pub(crate) fn new(
+        haystack: &'h [u8],
+        finder: FinderRev<'n>,
+    ) -> FindRevIter<'h, 'n> {
+        let pos = Some(haystack.len());
+        FindRevIter { haystack, finder, pos }
+    }
+}
+
+impl<'h, 'n> Iterator for FindRevIter<'h, 'n> {
+    type Item = usize;
+
+    fn next(&mut self) -> Option<usize> {
+        let pos = match self.pos {
+            None => return None,
+            Some(pos) => pos,
+        };
+        let result = self.finder.rfind(&self.haystack[..pos]);
+        match result {
+            None => None,
+            Some(i) => {
+                if pos == i {
+                    self.pos = pos.checked_sub(1);
+                } else {
+                    self.pos = Some(i);
+                }
+                Some(i)
+            }
+        }
+    }
+}
+
+/// A single substring searcher fixed to a particular needle.
+///
+/// The purpose of this type is to permit callers to construct a substring
+/// searcher that can be used to search haystacks without the overhead of
+/// constructing the searcher in the first place. This is a somewhat niche
+/// concern when it's necessary to re-use the same needle to search multiple
+/// different haystacks with as little overhead as possible. In general, using
+/// [`find`] is good enough, but `Finder` is useful when you can meaningfully
+/// observe searcher construction time in a profile.
+///
+/// When the `std` feature is enabled, then this type has an `into_owned`
+/// version which permits building a `Finder` that is not connected to
+/// the lifetime of its needle.
+#[derive(Clone, Debug)]
+pub struct Finder<'n> {
+    searcher: Searcher<'n>,
+}
+
+impl<'n> Finder<'n> {
+    /// Create a new finder for the given needle.
+    #[inline]
+    pub fn new<B: ?Sized + AsRef<[u8]>>(needle: &'n B) -> Finder<'n> {
+        FinderBuilder::new().build_forward(needle)
+    }
+
+    /// Returns the index of the first occurrence of this needle in the given
+    /// haystack.
+    ///
+    /// # Complexity
+    ///
+    /// This routine is guaranteed to have worst case linear time complexity
+    /// with respect to both the needle and the haystack. That is, this runs
+    /// in `O(needle.len() + haystack.len())` time.
+    ///
+    /// This routine is also guaranteed to have worst case constant space
+    /// complexity.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use memchr::memmem::Finder;
+    ///
+    /// let haystack = b"foo bar baz";
+    /// assert_eq!(Some(0), Finder::new("foo").find(haystack));
+    /// assert_eq!(Some(4), Finder::new("bar").find(haystack));
+    /// assert_eq!(None, Finder::new("quux").find(haystack));
+    /// ```
+    pub fn find(&self, haystack: &[u8]) -> Option<usize> {
+        self.searcher.find(&mut self.searcher.prefilter_state(), haystack)
+    }
+
+    /// Returns an iterator over all occurrences of a substring in a haystack.
+    ///
+    /// # Complexity
+    ///
+    /// This routine is guaranteed to have worst case linear time complexity
+    /// with respect to both the needle and the haystack. That is, this runs
+    /// in `O(needle.len() + haystack.len())` time.
+    ///
+    /// This routine is also guaranteed to have worst case constant space
+    /// complexity.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use memchr::memmem::Finder;
+    ///
+    /// let haystack = b"foo bar foo baz foo";
+    /// let finder = Finder::new(b"foo");
+    /// let mut it = finder.find_iter(haystack);
+    /// assert_eq!(Some(0), it.next());
+    /// assert_eq!(Some(8), it.next());
+    /// assert_eq!(Some(16), it.next());
+    /// assert_eq!(None, it.next());
+    /// ```
+    #[inline]
+    pub fn find_iter<'a, 'h>(
+        &'a self,
+        haystack: &'h [u8],
+    ) -> FindIter<'h, 'a> {
+        FindIter::new(haystack, self.as_ref())
+    }
+
+    /// Convert this finder into its owned variant, such that it no longer
+    /// borrows the needle.
+    ///
+    /// If this is already an owned finder, then this is a no-op. Otherwise,
+    /// this copies the needle.
+    ///
+    /// This is only available when the `std` feature is enabled.
+    #[cfg(feature = "std")]
+    #[inline]
+    pub fn into_owned(self) -> Finder<'static> {
+        Finder { searcher: self.searcher.into_owned() }
+    }
+
+    /// Convert this finder into its borrowed variant.
+    ///
+    /// This is primarily useful if your finder is owned and you'd like to
+    /// store its borrowed variant in some intermediate data structure.
+    ///
+    /// Note that the lifetime parameter of the returned finder is tied to the
+    /// lifetime of `self`, and may be shorter than the `'n` lifetime of the
+    /// needle itself. Namely, a finder's needle can be either borrowed or
+    /// owned, so the lifetime of the needle returned must necessarily be the
+    /// shorter of the two.
+    #[inline]
+    pub fn as_ref(&self) -> Finder<'_> {
+        Finder { searcher: self.searcher.as_ref() }
+    }
+
+    /// Returns the needle that this finder searches for.
+    ///
+    /// Note that the lifetime of the needle returned is tied to the lifetime
+    /// of the finder, and may be shorter than the `'n` lifetime. Namely, a
+    /// finder's needle can be either borrowed or owned, so the lifetime of the
+    /// needle returned must necessarily be the shorter of the two.
+    #[inline]
+    pub fn needle(&self) -> &[u8] {
+        self.searcher.needle()
+    }
+}
+
+/// A single substring reverse searcher fixed to a particular needle.
+///
+/// The purpose of this type is to permit callers to construct a substring
+/// searcher that can be used to search haystacks without the overhead of
+/// constructing the searcher in the first place. This is a somewhat niche
+/// concern when it's necessary to re-use the same needle to search multiple
+/// different haystacks with as little overhead as possible. In general,
+/// using [`rfind`] is good enough, but `FinderRev` is useful when you can
+/// meaningfully observe searcher construction time in a profile.
+///
+/// When the `std` feature is enabled, then this type has an `into_owned`
+/// version which permits building a `FinderRev` that is not connected to
+/// the lifetime of its needle.
+#[derive(Clone, Debug)]
+pub struct FinderRev<'n> {
+    searcher: SearcherRev<'n>,
+}
+
+impl<'n> FinderRev<'n> {
+    /// Create a new reverse finder for the given needle.
+    #[inline]
+    pub fn new<B: ?Sized + AsRef<[u8]>>(needle: &'n B) -> FinderRev<'n> {
+        FinderBuilder::new().build_reverse(needle)
+    }
+
+    /// Returns the index of the last occurrence of this needle in the given
+    /// haystack.
+    ///
+    /// The haystack may be any type that can be cheaply converted into a
+    /// `&[u8]`. This includes, but is not limited to, `&str` and `&[u8]`.
+    ///
+    /// # Complexity
+    ///
+    /// This routine is guaranteed to have worst case linear time complexity
+    /// with respect to both the needle and the haystack. That is, this runs
+    /// in `O(needle.len() + haystack.len())` time.
+    ///
+    /// This routine is also guaranteed to have worst case constant space
+    /// complexity.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use memchr::memmem::FinderRev;
+    ///
+    /// let haystack = b"foo bar baz";
+    /// assert_eq!(Some(0), FinderRev::new("foo").rfind(haystack));
+    /// assert_eq!(Some(4), FinderRev::new("bar").rfind(haystack));
+    /// assert_eq!(None, FinderRev::new("quux").rfind(haystack));
+    /// ```
+    pub fn rfind<B: AsRef<[u8]>>(&self, haystack: B) -> Option<usize> {
+        self.searcher.rfind(haystack.as_ref())
+    }
+
+    /// Returns a reverse iterator over all occurrences of a substring in a
+    /// haystack.
+    ///
+    /// # Complexity
+    ///
+    /// This routine is guaranteed to have worst case linear time complexity
+    /// with respect to both the needle and the haystack. That is, this runs
+    /// in `O(needle.len() + haystack.len())` time.
+    ///
+    /// This routine is also guaranteed to have worst case constant space
+    /// complexity.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use memchr::memmem::FinderRev;
+    ///
+    /// let haystack = b"foo bar foo baz foo";
+    /// let finder = FinderRev::new(b"foo");
+    /// let mut it = finder.rfind_iter(haystack);
+    /// assert_eq!(Some(16), it.next());
+    /// assert_eq!(Some(8), it.next());
+    /// assert_eq!(Some(0), it.next());
+    /// assert_eq!(None, it.next());
+    /// ```
+    #[inline]
+    pub fn rfind_iter<'a, 'h>(
+        &'a self,
+        haystack: &'h [u8],
+    ) -> FindRevIter<'h, 'a> {
+        FindRevIter::new(haystack, self.as_ref())
+    }
+
+    /// Convert this finder into its owned variant, such that it no longer
+    /// borrows the needle.
+    ///
+    /// If this is already an owned finder, then this is a no-op. Otherwise,
+    /// this copies the needle.
+    ///
+    /// This is only available when the `std` feature is enabled.
+    #[cfg(feature = "std")]
+    #[inline]
+    pub fn into_owned(self) -> FinderRev<'static> {
+        FinderRev { searcher: self.searcher.into_owned() }
+    }
+
+    /// Convert this finder into its borrowed variant.
+    ///
+    /// This is primarily useful if your finder is owned and you'd like to
+    /// store its borrowed variant in some intermediate data structure.
+    ///
+    /// Note that the lifetime parameter of the returned finder is tied to the
+    /// lifetime of `self`, and may be shorter than the `'n` lifetime of the
+    /// needle itself. Namely, a finder's needle can be either borrowed or
+    /// owned, so the lifetime of the needle returned must necessarily be the
+    /// shorter of the two.
+    #[inline]
+    pub fn as_ref(&self) -> FinderRev<'_> {
+        FinderRev { searcher: self.searcher.as_ref() }
+    }
+
+    /// Returns the needle that this finder searches for.
+    ///
+    /// Note that the lifetime of the needle returned is tied to the lifetime
+    /// of the finder, and may be shorter than the `'n` lifetime. Namely, a
+    /// finder's needle can be either borrowed or owned, so the lifetime of the
+    /// needle returned must necessarily be the shorter of the two.
+    #[inline]
+    pub fn needle(&self) -> &[u8] {
+        self.searcher.needle()
+    }
+}
+
+/// A builder for constructing non-default forward or reverse memmem finders.
+///
+/// A builder is primarily useful for configuring a substring searcher.
+/// Currently, the only configuration exposed is the ability to disable
+/// heuristic prefilters used to speed up certain searches.
+#[derive(Clone, Debug, Default)]
+pub struct FinderBuilder {
+    config: SearcherConfig,
+}
+
+impl FinderBuilder {
+    /// Create a new finder builder with default settings.
+    pub fn new() -> FinderBuilder {
+        FinderBuilder::default()
+    }
+
+    /// Build a forward finder using the given needle from the current
+    /// settings.
+    pub fn build_forward<'n, B: ?Sized + AsRef<[u8]>>(
+        &self,
+        needle: &'n B,
+    ) -> Finder<'n> {
+        Finder { searcher: Searcher::new(self.config, needle.as_ref()) }
+    }
+
+    /// Build a reverse finder using the given needle from the current
+    /// settings.
+    pub fn build_reverse<'n, B: ?Sized + AsRef<[u8]>>(
+        &self,
+        needle: &'n B,
+    ) -> FinderRev<'n> {
+        FinderRev { searcher: SearcherRev::new(needle.as_ref()) }
+    }
+
+    /// Configure the prefilter setting for the finder.
+    ///
+    /// See the documentation for [`Prefilter`] for more discussion on why
+    /// you might want to configure this.
+    pub fn prefilter(&mut self, prefilter: Prefilter) -> &mut FinderBuilder {
+        self.config.prefilter = prefilter;
+        self
+    }
+}
+
+/// The internal implementation of a forward substring searcher.
+///
+/// The reality is that this is a "meta" searcher. Namely, depending on a
+/// variety of parameters (CPU support, target, needle size, haystack size and
+/// even dynamic properties such as prefilter effectiveness), the actual
+/// algorithm employed to do substring search may change.
+#[derive(Clone, Debug)]
+struct Searcher<'n> {
+    /// The actual needle we're searching for.
+    ///
+    /// A CowBytes is like a Cow<[u8]>, except in no_std environments, it is
+    /// specialized to a single variant (the borrowed form).
+    needle: CowBytes<'n>,
+    /// A collection of facts computed on the needle that are useful for more
+    /// than one substring search algorithm.
+    ninfo: NeedleInfo,
+    /// A prefilter function, if it was deemed appropriate.
+    ///
+    /// Some substring search implementations (like Two-Way) benefit greatly
+    /// if we can quickly find candidate starting positions for a match.
+    prefn: Option<PrefilterFn>,
+    /// The actual substring implementation in use.
+    kind: SearcherKind,
+}
+
+/// A collection of facts computed about a search needle.
+///
+/// We group these things together because it's useful to be able to hand them
+/// to prefilters or substring algorithms that want them.
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct NeedleInfo {
+    /// The offsets of "rare" bytes detected in the needle.
+    ///
+    /// This is meant to be a heuristic in order to maximize the effectiveness
+    /// of vectorized code. Namely, vectorized code tends to focus on only
+    /// one or two bytes. If we pick bytes from the needle that occur
+    /// infrequently, then more time will be spent in the vectorized code and
+    /// will likely make the overall search (much) faster.
+    ///
+    /// Of course, this is only a heuristic based on a background frequency
+    /// distribution of bytes. But it tends to work very well in practice.
+    pub(crate) rarebytes: RareNeedleBytes,
+    /// A Rabin-Karp hash of the needle.
+    ///
+    /// This is store here instead of in a more specific Rabin-Karp search
+    /// since Rabin-Karp may be used even if another SearchKind corresponds
+    /// to some other search implementation. e.g., If measurements suggest RK
+    /// is faster in some cases or if a search implementation can't handle
+    /// particularly small haystack. (Moreover, we cannot use RK *generally*,
+    /// since its worst case time is multiplicative. Instead, we only use it
+    /// some small haystacks, where "small" is a constant.)
+    pub(crate) nhash: NeedleHash,
+}
+
+/// Configuration for substring search.
+#[derive(Clone, Copy, Debug, Default)]
+struct SearcherConfig {
+    /// This permits changing the behavior of the prefilter, since it can have
+    /// a variable impact on performance.
+    prefilter: Prefilter,
+}
+
+#[derive(Clone, Debug)]
+enum SearcherKind {
+    /// A special case for empty needles. An empty needle always matches, even
+    /// in an empty haystack.
+    Empty,
+    /// This is used whenever the needle is a single byte. In this case, we
+    /// always use memchr.
+    OneByte(u8),
+    /// Two-Way is the generic work horse and is what provides our additive
+    /// linear time guarantee. In general, it's used when the needle is bigger
+    /// than 8 bytes or so.
+    TwoWay(twoway::Forward),
+    #[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
+    GenericSIMD128(x86::sse::Forward),
+    #[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
+    GenericSIMD256(x86::avx::Forward),
+}
+
+impl<'n> Searcher<'n> {
+    #[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
+    fn new(config: SearcherConfig, needle: &'n [u8]) -> Searcher<'n> {
+        use self::SearcherKind::*;
+
+        let ninfo = NeedleInfo::new(needle);
+        let prefn =
+            prefilter::forward(&config.prefilter, &ninfo.rarebytes, needle);
+        let kind = if needle.len() == 0 {
+            Empty
+        } else if needle.len() == 1 {
+            OneByte(needle[0])
+        } else if let Some(fwd) = x86::avx::Forward::new(&ninfo, needle) {
+            GenericSIMD256(fwd)
+        } else if let Some(fwd) = x86::sse::Forward::new(&ninfo, needle) {
+            GenericSIMD128(fwd)
+        } else {
+            TwoWay(twoway::Forward::new(needle))
+        };
+        Searcher { needle: CowBytes::new(needle), ninfo, prefn, kind }
+    }
+
+    #[cfg(not(all(not(miri), target_arch = "x86_64", memchr_runtime_simd)))]
+    fn new(config: SearcherConfig, needle: &'n [u8]) -> Searcher<'n> {
+        use self::SearcherKind::*;
+
+        let ninfo = NeedleInfo::new(needle);
+        let prefn =
+            prefilter::forward(&config.prefilter, &ninfo.rarebytes, needle);
+        let kind = if needle.len() == 0 {
+            Empty
+        } else if needle.len() == 1 {
+            OneByte(needle[0])
+        } else {
+            TwoWay(twoway::Forward::new(needle))
+        };
+        Searcher { needle: CowBytes::new(needle), ninfo, prefn, kind }
+    }
+
+    /// Return a fresh prefilter state that can be used with this searcher.
+    /// A prefilter state is used to track the effectiveness of a searcher's
+    /// prefilter for speeding up searches. Therefore, the prefilter state
+    /// should generally be reused on subsequent searches (such as in an
+    /// iterator). For searches on a different haystack, then a new prefilter
+    /// state should be used.
+    ///
+    /// This always initializes a valid (but possibly inert) prefilter state
+    /// even if this searcher does not have a prefilter enabled.
+    fn prefilter_state(&self) -> PrefilterState {
+        if self.prefn.is_none() {
+            PrefilterState::inert()
+        } else {
+            PrefilterState::new()
+        }
+    }
+
+    fn needle(&self) -> &[u8] {
+        self.needle.as_slice()
+    }
+
+    fn as_ref(&self) -> Searcher<'_> {
+        use self::SearcherKind::*;
+
+        let kind = match self.kind {
+            Empty => Empty,
+            OneByte(b) => OneByte(b),
+            TwoWay(tw) => TwoWay(tw),
+            #[cfg(all(
+                not(miri),
+                target_arch = "x86_64",
+                memchr_runtime_simd
+            ))]
+            GenericSIMD128(gs) => GenericSIMD128(gs),
+            #[cfg(all(
+                not(miri),
+                target_arch = "x86_64",
+                memchr_runtime_simd
+            ))]
+            GenericSIMD256(gs) => GenericSIMD256(gs),
+        };
+        Searcher {
+            needle: CowBytes::new(self.needle()),
+            ninfo: self.ninfo,
+            prefn: self.prefn,
+            kind,
+        }
+    }
+
+    #[cfg(feature = "std")]
+    fn into_owned(self) -> Searcher<'static> {
+        use self::SearcherKind::*;
+
+        let kind = match self.kind {
+            Empty => Empty,
+            OneByte(b) => OneByte(b),
+            TwoWay(tw) => TwoWay(tw),
+            #[cfg(all(
+                not(miri),
+                target_arch = "x86_64",
+                memchr_runtime_simd
+            ))]
+            GenericSIMD128(gs) => GenericSIMD128(gs),
+            #[cfg(all(
+                not(miri),
+                target_arch = "x86_64",
+                memchr_runtime_simd
+            ))]
+            GenericSIMD256(gs) => GenericSIMD256(gs),
+        };
+        Searcher {
+            needle: self.needle.into_owned(),
+            ninfo: self.ninfo,
+            prefn: self.prefn,
+            kind,
+        }
+    }
+
+    /// Implements forward substring search by selecting the implementation
+    /// chosen at construction and executing it on the given haystack with the
+    /// prefilter's current state of effectiveness.
+    #[inline(always)]
+    fn find(
+        &self,
+        state: &mut PrefilterState,
+        haystack: &[u8],
+    ) -> Option<usize> {
+        use self::SearcherKind::*;
+
+        let needle = self.needle();
+        if haystack.len() < needle.len() {
+            return None;
+        }
+        match self.kind {
+            Empty => Some(0),
+            OneByte(b) => crate::memchr(b, haystack),
+            TwoWay(ref tw) => {
+                // For very short haystacks (e.g., where the prefilter probably
+                // can't run), it's faster to just run RK.
+                if rabinkarp::is_fast(haystack, needle) {
+                    rabinkarp::find_with(&self.ninfo.nhash, haystack, needle)
+                } else {
+                    self.find_tw(tw, state, haystack, needle)
+                }
+            }
+            #[cfg(all(
+                not(miri),
+                target_arch = "x86_64",
+                memchr_runtime_simd
+            ))]
+            GenericSIMD128(ref gs) => {
+                // The SIMD matcher can't handle particularly short haystacks,
+                // so we fall back to RK in these cases.
+                if haystack.len() < gs.min_haystack_len() {
+                    rabinkarp::find_with(&self.ninfo.nhash, haystack, needle)
+                } else {
+                    gs.find(haystack, needle)
+                }
+            }
+            #[cfg(all(
+                not(miri),
+                target_arch = "x86_64",
+                memchr_runtime_simd
+            ))]
+            GenericSIMD256(ref gs) => {
+                // The SIMD matcher can't handle particularly short haystacks,
+                // so we fall back to RK in these cases.
+                if haystack.len() < gs.min_haystack_len() {
+                    rabinkarp::find_with(&self.ninfo.nhash, haystack, needle)
+                } else {
+                    gs.find(haystack, needle)
+                }
+            }
+        }
+    }
+
+    /// Calls Two-Way on the given haystack/needle.
+    ///
+    /// This is marked as unlineable since it seems to have a better overall
+    /// effect on benchmarks. However, this is one of those cases where
+    /// inlining it results an improvement in other benchmarks too, so I
+    /// suspect we just don't have enough data yet to make the right call here.
+    ///
+    /// I suspect the main problem is that this function contains two different
+    /// inlined copies of Two-Way: one with and one without prefilters enabled.
+    #[inline(never)]
+    fn find_tw(
+        &self,
+        tw: &twoway::Forward,
+        state: &mut PrefilterState,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        if let Some(prefn) = self.prefn {
+            // We used to look at the length of a haystack here. That is, if
+            // it was too small, then don't bother with the prefilter. But two
+            // things changed: the prefilter falls back to memchr for small
+            // haystacks, and, above, Rabin-Karp is employed for tiny haystacks
+            // anyway.
+            if state.is_effective() {
+                let mut pre = Pre { state, prefn, ninfo: &self.ninfo };
+                return tw.find(Some(&mut pre), haystack, needle);
+            }
+        }
+        tw.find(None, haystack, needle)
+    }
+}
+
+impl NeedleInfo {
+    pub(crate) fn new(needle: &[u8]) -> NeedleInfo {
+        NeedleInfo {
+            rarebytes: RareNeedleBytes::forward(needle),
+            nhash: NeedleHash::forward(needle),
+        }
+    }
+}
+
+/// The internal implementation of a reverse substring searcher.
+///
+/// See the forward searcher docs for more details. Currently, the reverse
+/// searcher is considerably simpler since it lacks prefilter support. This
+/// was done because it adds a lot of code, and more surface area to test. And
+/// in particular, it's not clear whether a prefilter on reverse searching is
+/// worth it. (If you have a compelling use case, please file an issue!)
+#[derive(Clone, Debug)]
+struct SearcherRev<'n> {
+    /// The actual needle we're searching for.
+    needle: CowBytes<'n>,
+    /// A Rabin-Karp hash of the needle.
+    nhash: NeedleHash,
+    /// The actual substring implementation in use.
+    kind: SearcherRevKind,
+}
+
+#[derive(Clone, Debug)]
+enum SearcherRevKind {
+    /// A special case for empty needles. An empty needle always matches, even
+    /// in an empty haystack.
+    Empty,
+    /// This is used whenever the needle is a single byte. In this case, we
+    /// always use memchr.
+    OneByte(u8),
+    /// Two-Way is the generic work horse and is what provides our additive
+    /// linear time guarantee. In general, it's used when the needle is bigger
+    /// than 8 bytes or so.
+    TwoWay(twoway::Reverse),
+}
+
+impl<'n> SearcherRev<'n> {
+    fn new(needle: &'n [u8]) -> SearcherRev<'n> {
+        use self::SearcherRevKind::*;
+
+        let kind = if needle.len() == 0 {
+            Empty
+        } else if needle.len() == 1 {
+            OneByte(needle[0])
+        } else {
+            TwoWay(twoway::Reverse::new(needle))
+        };
+        SearcherRev {
+            needle: CowBytes::new(needle),
+            nhash: NeedleHash::reverse(needle),
+            kind,
+        }
+    }
+
+    fn needle(&self) -> &[u8] {
+        self.needle.as_slice()
+    }
+
+    fn as_ref(&self) -> SearcherRev<'_> {
+        use self::SearcherRevKind::*;
+
+        let kind = match self.kind {
+            Empty => Empty,
+            OneByte(b) => OneByte(b),
+            TwoWay(tw) => TwoWay(tw),
+        };
+        SearcherRev {
+            needle: CowBytes::new(self.needle()),
+            nhash: self.nhash,
+            kind,
+        }
+    }
+
+    #[cfg(feature = "std")]
+    fn into_owned(self) -> SearcherRev<'static> {
+        use self::SearcherRevKind::*;
+
+        let kind = match self.kind {
+            Empty => Empty,
+            OneByte(b) => OneByte(b),
+            TwoWay(tw) => TwoWay(tw),
+        };
+        SearcherRev {
+            needle: self.needle.into_owned(),
+            nhash: self.nhash,
+            kind,
+        }
+    }
+
+    /// Implements reverse substring search by selecting the implementation
+    /// chosen at construction and executing it on the given haystack with the
+    /// prefilter's current state of effectiveness.
+    #[inline(always)]
+    fn rfind(&self, haystack: &[u8]) -> Option<usize> {
+        use self::SearcherRevKind::*;
+
+        let needle = self.needle();
+        if haystack.len() < needle.len() {
+            return None;
+        }
+        match self.kind {
+            Empty => Some(haystack.len()),
+            OneByte(b) => crate::memrchr(b, haystack),
+            TwoWay(ref tw) => {
+                // For very short haystacks (e.g., where the prefilter probably
+                // can't run), it's faster to just run RK.
+                if rabinkarp::is_fast(haystack, needle) {
+                    rabinkarp::rfind_with(&self.nhash, haystack, needle)
+                } else {
+                    tw.rfind(haystack, needle)
+                }
+            }
+        }
+    }
+}
+
+/// This module defines some generic quickcheck properties useful for testing
+/// any substring search algorithm. It also runs those properties for the
+/// top-level public API memmem routines. (The properties are also used to
+/// test various substring search implementations more granularly elsewhere as
+/// well.)
+#[cfg(all(test, feature = "std", not(miri)))]
+mod proptests {
+    // N.B. This defines the quickcheck tests using the properties defined
+    // below. Because of macro-visibility weirdness, the actual macro is
+    // defined at the top of this file.
+    define_memmem_quickcheck_tests!(super::find, super::rfind);
+
+    /// Check that every prefix of the given byte string is a substring.
+    pub(crate) fn prefix_is_substring(
+        reverse: bool,
+        bs: &[u8],
+        mut search: impl FnMut(&[u8], &[u8]) -> Option<usize>,
+    ) -> bool {
+        if bs.is_empty() {
+            return true;
+        }
+        for i in 0..(bs.len() - 1) {
+            let prefix = &bs[..i];
+            if reverse {
+                assert_eq!(naive_rfind(bs, prefix), search(bs, prefix));
+            } else {
+                assert_eq!(naive_find(bs, prefix), search(bs, prefix));
+            }
+        }
+        true
+    }
+
+    /// Check that every suffix of the given byte string is a substring.
+    pub(crate) fn suffix_is_substring(
+        reverse: bool,
+        bs: &[u8],
+        mut search: impl FnMut(&[u8], &[u8]) -> Option<usize>,
+    ) -> bool {
+        if bs.is_empty() {
+            return true;
+        }
+        for i in 0..(bs.len() - 1) {
+            let suffix = &bs[i..];
+            if reverse {
+                assert_eq!(naive_rfind(bs, suffix), search(bs, suffix));
+            } else {
+                assert_eq!(naive_find(bs, suffix), search(bs, suffix));
+            }
+        }
+        true
+    }
+
+    /// Check that naive substring search matches the result of the given search
+    /// algorithm.
+    pub(crate) fn matches_naive(
+        reverse: bool,
+        haystack: &[u8],
+        needle: &[u8],
+        mut search: impl FnMut(&[u8], &[u8]) -> Option<usize>,
+    ) -> bool {
+        if reverse {
+            naive_rfind(haystack, needle) == search(haystack, needle)
+        } else {
+            naive_find(haystack, needle) == search(haystack, needle)
+        }
+    }
+
+    /// Naively search forwards for the given needle in the given haystack.
+    fn naive_find(haystack: &[u8], needle: &[u8]) -> Option<usize> {
+        if needle.is_empty() {
+            return Some(0);
+        } else if haystack.len() < needle.len() {
+            return None;
+        }
+        for i in 0..(haystack.len() - needle.len() + 1) {
+            if needle == &haystack[i..i + needle.len()] {
+                return Some(i);
+            }
+        }
+        None
+    }
+
+    /// Naively search in reverse for the given needle in the given haystack.
+    fn naive_rfind(haystack: &[u8], needle: &[u8]) -> Option<usize> {
+        if needle.is_empty() {
+            return Some(haystack.len());
+        } else if haystack.len() < needle.len() {
+            return None;
+        }
+        for i in (0..(haystack.len() - needle.len() + 1)).rev() {
+            if needle == &haystack[i..i + needle.len()] {
+                return Some(i);
+            }
+        }
+        None
+    }
+}
+
+/// This module defines some hand-written "simple" substring tests. It
+/// also provides routines for easily running them on any substring search
+/// implementation.
+#[cfg(test)]
+mod testsimples {
+    define_memmem_simple_tests!(super::find, super::rfind);
+
+    /// Each test is a (needle, haystack, expected_fwd, expected_rev) tuple.
+    type SearchTest =
+        (&'static str, &'static str, Option<usize>, Option<usize>);
+
+    const SEARCH_TESTS: &'static [SearchTest] = &[
+        ("", "", Some(0), Some(0)),
+        ("", "a", Some(0), Some(1)),
+        ("", "ab", Some(0), Some(2)),
+        ("", "abc", Some(0), Some(3)),
+        ("a", "", None, None),
+        ("a", "a", Some(0), Some(0)),
+        ("a", "aa", Some(0), Some(1)),
+        ("a", "ba", Some(1), Some(1)),
+        ("a", "bba", Some(2), Some(2)),
+        ("a", "bbba", Some(3), Some(3)),
+        ("a", "bbbab", Some(3), Some(3)),
+        ("a", "bbbabb", Some(3), Some(3)),
+        ("a", "bbbabbb", Some(3), Some(3)),
+        ("a", "bbbbbb", None, None),
+        ("ab", "", None, None),
+        ("ab", "a", None, None),
+        ("ab", "b", None, None),
+        ("ab", "ab", Some(0), Some(0)),
+        ("ab", "aab", Some(1), Some(1)),
+        ("ab", "aaab", Some(2), Some(2)),
+        ("ab", "abaab", Some(0), Some(3)),
+        ("ab", "baaab", Some(3), Some(3)),
+        ("ab", "acb", None, None),
+        ("ab", "abba", Some(0), Some(0)),
+        ("abc", "ab", None, None),
+        ("abc", "abc", Some(0), Some(0)),
+        ("abc", "abcz", Some(0), Some(0)),
+        ("abc", "abczz", Some(0), Some(0)),
+        ("abc", "zabc", Some(1), Some(1)),
+        ("abc", "zzabc", Some(2), Some(2)),
+        ("abc", "azbc", None, None),
+        ("abc", "abzc", None, None),
+        ("abczdef", "abczdefzzzzzzzzzzzzzzzzzzzz", Some(0), Some(0)),
+        ("abczdef", "zzzzzzzzzzzzzzzzzzzzabczdef", Some(20), Some(20)),
+        ("xyz", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxyz", Some(32), Some(32)),
+        // Failures caught by quickcheck.
+        ("\u{0}\u{15}", "\u{0}\u{15}\u{15}\u{0}", Some(0), Some(0)),
+        ("\u{0}\u{1e}", "\u{1e}\u{0}", None, None),
+    ];
+
+    /// Run the substring search tests. `search` should be a closure that
+    /// accepts a haystack and a needle and returns the starting position
+    /// of the first occurrence of needle in the haystack, or `None` if one
+    /// doesn't exist.
+    pub(crate) fn run_search_tests_fwd(
+        mut search: impl FnMut(&[u8], &[u8]) -> Option<usize>,
+    ) {
+        for &(needle, haystack, expected_fwd, _) in SEARCH_TESTS {
+            let (n, h) = (needle.as_bytes(), haystack.as_bytes());
+            assert_eq!(
+                expected_fwd,
+                search(h, n),
+                "needle: {:?}, haystack: {:?}, expected: {:?}",
+                n,
+                h,
+                expected_fwd
+            );
+        }
+    }
+
+    /// Run the substring search tests. `search` should be a closure that
+    /// accepts a haystack and a needle and returns the starting position of
+    /// the last occurrence of needle in the haystack, or `None` if one doesn't
+    /// exist.
+    pub(crate) fn run_search_tests_rev(
+        mut search: impl FnMut(&[u8], &[u8]) -> Option<usize>,
+    ) {
+        for &(needle, haystack, _, expected_rev) in SEARCH_TESTS {
+            let (n, h) = (needle.as_bytes(), haystack.as_bytes());
+            assert_eq!(
+                expected_rev,
+                search(h, n),
+                "needle: {:?}, haystack: {:?}, expected: {:?}",
+                n,
+                h,
+                expected_rev
+            );
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/fallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/fallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/fallback.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/fallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,122 @@
+/*
+This module implements a "fallback" prefilter that only relies on memchr to
+function. While memchr works best when it's explicitly vectorized, its
+fallback implementations are fast enough to make a prefilter like this
+worthwhile.
+
+The essence of this implementation is to identify two rare bytes in a needle
+based on a background frequency distribution of bytes. We then run memchr on the
+rarer byte. For each match, we use the second rare byte as a guard to quickly
+check if a match is possible. If the position passes the guard test, then we do
+a naive memcmp to confirm the match.
+
+In practice, this formulation works amazingly well, primarily because of the
+heuristic use of a background frequency distribution. However, it does have a
+number of weaknesses where it can get quite slow when its background frequency
+distribution doesn't line up with the haystack being searched. This is why we
+have specialized vector routines that essentially take this idea and move the
+guard check into vectorized code. (Those specialized vector routines do still
+make use of the background frequency distribution of bytes though.)
+
+This fallback implementation was originally formulated in regex many moons ago:
+https://github.com/rust-lang/regex/blob/3db8722d0b204a85380fe2a65e13d7065d7dd968/src/literal/imp.rs#L370-L501
+Prior to that, I'm not aware of anyone using this technique in any prominent
+substring search implementation. Although, I'm sure folks have had this same
+insight long before me.
+
+Another version of this also appeared in bstr:
+https://github.com/BurntSushi/bstr/blob/a444256ca7407fe180ee32534688549655b7a38e/src/search/prefilter.rs#L83-L340
+*/
+
+use crate::memmem::{
+    prefilter::{PrefilterFnTy, PrefilterState},
+    NeedleInfo,
+};
+
+// Check that the functions below satisfy the Prefilter function type.
+const _: PrefilterFnTy = find;
+
+/// Look for a possible occurrence of needle. The position returned
+/// corresponds to the beginning of the occurrence, if one exists.
+///
+/// Callers may assume that this never returns false negatives (i.e., it
+/// never misses an actual occurrence), but must check that the returned
+/// position corresponds to a match. That is, it can return false
+/// positives.
+///
+/// This should only be used when Freqy is constructed for forward
+/// searching.
+pub(crate) fn find(
+    prestate: &mut PrefilterState,
+    ninfo: &NeedleInfo,
+    haystack: &[u8],
+    needle: &[u8],
+) -> Option<usize> {
+    let mut i = 0;
+    let (rare1i, rare2i) = ninfo.rarebytes.as_rare_usize();
+    let (rare1, rare2) = ninfo.rarebytes.as_rare_bytes(needle);
+    while prestate.is_effective() {
+        // Use a fast vectorized implementation to skip to the next
+        // occurrence of the rarest byte (heuristically chosen) in the
+        // needle.
+        let found = crate::memchr(rare1, &haystack[i..])?;
+        prestate.update(found);
+        i += found;
+
+        // If we can't align our first match with the haystack, then a
+        // match is impossible.
+        if i < rare1i {
+            i += 1;
+            continue;
+        }
+
+        // Align our rare2 byte with the haystack. A mismatch means that
+        // a match is impossible.
+        let aligned_rare2i = i - rare1i + rare2i;
+        if haystack.get(aligned_rare2i) != Some(&rare2) {
+            i += 1;
+            continue;
+        }
+
+        // We've done what we can. There might be a match here.
+        return Some(i - rare1i);
+    }
+    // The only way we get here is if we believe our skipping heuristic
+    // has become ineffective. We're allowed to return false positives,
+    // so return the position at which we advanced to, aligned to the
+    // haystack.
+    Some(i.saturating_sub(rare1i))
+}
+
+#[cfg(all(test, feature = "std"))]
+mod tests {
+    use super::*;
+
+    fn freqy_find(haystack: &[u8], needle: &[u8]) -> Option<usize> {
+        let ninfo = NeedleInfo::new(needle);
+        let mut prestate = PrefilterState::new();
+        find(&mut prestate, &ninfo, haystack, needle)
+    }
+
+    #[test]
+    fn freqy_forward() {
+        assert_eq!(Some(0), freqy_find(b"BARFOO", b"BAR"));
+        assert_eq!(Some(3), freqy_find(b"FOOBAR", b"BAR"));
+        assert_eq!(Some(0), freqy_find(b"zyzz", b"zyzy"));
+        assert_eq!(Some(2), freqy_find(b"zzzy", b"zyzy"));
+        assert_eq!(None, freqy_find(b"zazb", b"zyzy"));
+        assert_eq!(Some(0), freqy_find(b"yzyy", b"yzyz"));
+        assert_eq!(Some(2), freqy_find(b"yyyz", b"yzyz"));
+        assert_eq!(None, freqy_find(b"yayb", b"yzyz"));
+    }
+
+    #[test]
+    #[cfg(not(miri))]
+    fn prefilter_permutations() {
+        use crate::memmem::prefilter::tests::PrefilterTest;
+
+        // SAFETY: super::find is safe to call for all inputs and on all
+        // platforms.
+        unsafe { PrefilterTest::run_all_tests(super::find) };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/genericsimd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/genericsimd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/genericsimd.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/genericsimd.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,207 @@
+use core::mem::size_of;
+
+use crate::memmem::{
+    prefilter::{PrefilterFnTy, PrefilterState},
+    vector::Vector,
+    NeedleInfo,
+};
+
+/// The implementation of the forward vector accelerated candidate finder.
+///
+/// This is inspired by the "generic SIMD" algorithm described here:
+/// http://0x80.pl/articles/simd-strfind.html#algorithm-1-generic-simd
+///
+/// The main difference is that this is just a prefilter. That is, it reports
+/// candidates once they are seen and doesn't attempt to confirm them. Also,
+/// the bytes this routine uses to check for candidates are selected based on
+/// an a priori background frequency distribution. This means that on most
+/// haystacks, this will on average spend more time in vectorized code than you
+/// would if you just selected the first and last bytes of the needle.
+///
+/// Note that a non-prefilter variant of this algorithm can be found in the
+/// parent module, but it only works on smaller needles.
+///
+/// `prestate`, `ninfo`, `haystack` and `needle` are the four prefilter
+/// function parameters. `fallback` is a prefilter that is used if the haystack
+/// is too small to be handled with the given vector size.
+///
+/// This routine is not safe because it is intended for callers to specialize
+/// this with a particular vector (e.g., __m256i) and then call it with the
+/// relevant target feature (e.g., avx2) enabled.
+///
+/// # Panics
+///
+/// If `needle.len() <= 1`, then this panics.
+///
+/// # Safety
+///
+/// Since this is meant to be used with vector functions, callers need to
+/// specialize this inside of a function with a `target_feature` attribute.
+/// Therefore, callers must ensure that whatever target feature is being used
+/// supports the vector functions that this function is specialized for. (For
+/// the specific vector functions used, see the Vector trait implementations.)
+#[inline(always)]
+pub(crate) unsafe fn find<V: Vector>(
+    prestate: &mut PrefilterState,
+    ninfo: &NeedleInfo,
+    haystack: &[u8],
+    needle: &[u8],
+    fallback: PrefilterFnTy,
+) -> Option<usize> {
+    assert!(needle.len() >= 2, "needle must be at least 2 bytes");
+    let (rare1i, rare2i) = ninfo.rarebytes.as_rare_ordered_usize();
+    let min_haystack_len = rare2i + size_of::<V>();
+    if haystack.len() < min_haystack_len {
+        return fallback(prestate, ninfo, haystack, needle);
+    }
+
+    let start_ptr = haystack.as_ptr();
+    let end_ptr = start_ptr.add(haystack.len());
+    let max_ptr = end_ptr.sub(min_haystack_len);
+    let mut ptr = start_ptr;
+
+    let rare1chunk = V::splat(needle[rare1i]);
+    let rare2chunk = V::splat(needle[rare2i]);
+
+    // N.B. I did experiment with unrolling the loop to deal with size(V)
+    // bytes at a time and 2*size(V) bytes at a time. The double unroll
+    // was marginally faster while the quadruple unroll was unambiguously
+    // slower. In the end, I decided the complexity from unrolling wasn't
+    // worth it. I used the memmem/krate/prebuilt/huge-en/ benchmarks to
+    // compare.
+    while ptr <= max_ptr {
+        let m = find_in_chunk2(ptr, rare1i, rare2i, rare1chunk, rare2chunk);
+        if let Some(chunki) = m {
+            return Some(matched(prestate, start_ptr, ptr, chunki));
+        }
+        ptr = ptr.add(size_of::<V>());
+    }
+    if ptr < end_ptr {
+        // This routine immediately quits if a candidate match is found.
+        // That means that if we're here, no candidate matches have been
+        // found at or before 'ptr'. Thus, we don't need to mask anything
+        // out even though we might technically search part of the haystack
+        // that we've already searched (because we know it can't match).
+        ptr = max_ptr;
+        let m = find_in_chunk2(ptr, rare1i, rare2i, rare1chunk, rare2chunk);
+        if let Some(chunki) = m {
+            return Some(matched(prestate, start_ptr, ptr, chunki));
+        }
+    }
+    prestate.update(haystack.len());
+    None
+}
+
+// Below are two different techniques for checking whether a candidate
+// match exists in a given chunk or not. find_in_chunk2 checks two bytes
+// where as find_in_chunk3 checks three bytes. The idea behind checking
+// three bytes is that while we do a bit more work per iteration, we
+// decrease the chances of a false positive match being reported and thus
+// make the search faster overall. This actually works out for the
+// memmem/krate/prebuilt/huge-en/never-all-common-bytes benchmark, where
+// using find_in_chunk3 is about 25% faster than find_in_chunk2. However,
+// it turns out that find_in_chunk2 is faster for all other benchmarks, so
+// perhaps the extra check isn't worth it in practice.
+//
+// For now, we go with find_in_chunk2, but we leave find_in_chunk3 around
+// to make it easy to switch to and benchmark when possible.
+
+/// Search for an occurrence of two rare bytes from the needle in the current
+/// chunk pointed to by ptr.
+///
+/// rare1chunk and rare2chunk correspond to vectors with the rare1 and rare2
+/// bytes repeated in each 8-bit lane, respectively.
+///
+/// # Safety
+///
+/// It must be safe to do an unaligned read of size(V) bytes starting at both
+/// (ptr + rare1i) and (ptr + rare2i).
+#[inline(always)]
+unsafe fn find_in_chunk2<V: Vector>(
+    ptr: *const u8,
+    rare1i: usize,
+    rare2i: usize,
+    rare1chunk: V,
+    rare2chunk: V,
+) -> Option<usize> {
+    let chunk0 = V::load_unaligned(ptr.add(rare1i));
+    let chunk1 = V::load_unaligned(ptr.add(rare2i));
+
+    let eq0 = chunk0.cmpeq(rare1chunk);
+    let eq1 = chunk1.cmpeq(rare2chunk);
+
+    let match_offsets = eq0.and(eq1).movemask();
+    if match_offsets == 0 {
+        return None;
+    }
+    Some(match_offsets.trailing_zeros() as usize)
+}
+
+/// Search for an occurrence of two rare bytes and the first byte (even if one
+/// of the rare bytes is equivalent to the first byte) from the needle in the
+/// current chunk pointed to by ptr.
+///
+/// firstchunk, rare1chunk and rare2chunk correspond to vectors with the first,
+/// rare1 and rare2 bytes repeated in each 8-bit lane, respectively.
+///
+/// # Safety
+///
+/// It must be safe to do an unaligned read of size(V) bytes starting at ptr,
+/// (ptr + rare1i) and (ptr + rare2i).
+#[allow(dead_code)]
+#[inline(always)]
+unsafe fn find_in_chunk3<V: Vector>(
+    ptr: *const u8,
+    rare1i: usize,
+    rare2i: usize,
+    firstchunk: V,
+    rare1chunk: V,
+    rare2chunk: V,
+) -> Option<usize> {
+    let chunk0 = V::load_unaligned(ptr);
+    let chunk1 = V::load_unaligned(ptr.add(rare1i));
+    let chunk2 = V::load_unaligned(ptr.add(rare2i));
+
+    let eq0 = chunk0.cmpeq(firstchunk);
+    let eq1 = chunk1.cmpeq(rare1chunk);
+    let eq2 = chunk2.cmpeq(rare2chunk);
+
+    let match_offsets = eq0.and(eq1).and(eq2).movemask();
+    if match_offsets == 0 {
+        return None;
+    }
+    Some(match_offsets.trailing_zeros() as usize)
+}
+
+/// Accepts a chunk-relative offset and returns a haystack relative offset
+/// after updating the prefilter state.
+///
+/// Why do we use this unlineable function when a search completes? Well,
+/// I don't know. Really. Obviously this function was not here initially.
+/// When doing profiling, the codegen for the inner loop here looked bad and
+/// I didn't know why. There were a couple extra 'add' instructions and an
+/// extra 'lea' instruction that I couldn't explain. I hypothesized that the
+/// optimizer was having trouble untangling the hot code in the loop from the
+/// code that deals with a candidate match. By putting the latter into an
+/// unlineable function, it kind of forces the issue and it had the intended
+/// effect: codegen improved measurably. It's good for a ~10% improvement
+/// across the board on the memmem/krate/prebuilt/huge-en/ benchmarks.
+#[cold]
+#[inline(never)]
+fn matched(
+    prestate: &mut PrefilterState,
+    start_ptr: *const u8,
+    ptr: *const u8,
+    chunki: usize,
+) -> usize {
+    let found = diff(ptr, start_ptr) + chunki;
+    prestate.update(found);
+    found
+}
+
+/// Subtract `b` from `a` and return the difference. `a` must be greater than
+/// or equal to `b`.
+fn diff(a: *const u8, b: *const u8) -> usize {
+    debug_assert!(a >= b);
+    (a as usize) - (b as usize)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,562 @@
+use crate::memmem::{rarebytes::RareNeedleBytes, NeedleInfo};
+
+mod fallback;
+#[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
+mod genericsimd;
+#[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
+mod x86;
+
+/// The maximum frequency rank permitted for the fallback prefilter. If the
+/// rarest byte in the needle has a frequency rank above this value, then no
+/// prefilter is used if the fallback prefilter would otherwise be selected.
+const MAX_FALLBACK_RANK: usize = 250;
+
+/// A combination of prefilter effectiveness state, the prefilter function and
+/// the needle info required to run a prefilter.
+///
+/// For the most part, these are grouped into a single type for convenience,
+/// instead of needing to pass around all three as distinct function
+/// parameters.
+pub(crate) struct Pre<'a> {
+    /// State that tracks the effectiveness of a prefilter.
+    pub(crate) state: &'a mut PrefilterState,
+    /// The actual prefilter function.
+    pub(crate) prefn: PrefilterFn,
+    /// Information about a needle, such as its RK hash and rare byte offsets.
+    pub(crate) ninfo: &'a NeedleInfo,
+}
+
+impl<'a> Pre<'a> {
+    /// Call this prefilter on the given haystack with the given needle.
+    #[inline(always)]
+    pub(crate) fn call(
+        &mut self,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        self.prefn.call(self.state, self.ninfo, haystack, needle)
+    }
+
+    /// Return true if and only if this prefilter should be used.
+    #[inline(always)]
+    pub(crate) fn should_call(&mut self) -> bool {
+        self.state.is_effective()
+    }
+}
+
+/// A prefilter function.
+///
+/// A prefilter function describes both forward and reverse searches.
+/// (Although, we don't currently implement prefilters for reverse searching.)
+/// In the case of a forward search, the position returned corresponds to
+/// the starting offset of a match (confirmed or possible). Its minimum
+/// value is `0`, and its maximum value is `haystack.len() - 1`. In the case
+/// of a reverse search, the position returned corresponds to the position
+/// immediately after a match (confirmed or possible). Its minimum value is `1`
+/// and its maximum value is `haystack.len()`.
+///
+/// In both cases, the position returned is the starting (or ending) point of a
+/// _possible_ match. That is, returning a false positive is okay. A prefilter,
+/// however, must never return any false negatives. That is, if a match exists
+/// at a particular position `i`, then a prefilter _must_ return that position.
+/// It cannot skip past it.
+///
+/// # Safety
+///
+/// A prefilter function is not safe to create, since not all prefilters are
+/// safe to call in all contexts. (e.g., A prefilter that uses AVX instructions
+/// may only be called on x86_64 CPUs with the relevant AVX feature enabled.)
+/// Thus, callers must ensure that when a prefilter function is created that it
+/// is safe to call for the current environment.
+#[derive(Clone, Copy)]
+pub(crate) struct PrefilterFn(PrefilterFnTy);
+
+/// The type of a prefilter function. All prefilters must satisfy this
+/// signature.
+///
+/// Using a function pointer like this does inhibit inlining, but it does
+/// eliminate branching and the extra costs associated with copying a larger
+/// enum. Note also, that using Box<dyn SomePrefilterTrait> can't really work
+/// here, since we want to work in contexts that don't have dynamic memory
+/// allocation. Moreover, in the default configuration of this crate on x86_64
+/// CPUs released in the past ~decade, we will use an AVX2-optimized prefilter,
+/// which generally won't be inlineable into the surrounding code anyway.
+/// (Unless AVX2 is enabled at compile time, but this is typically rare, since
+/// it produces a non-portable binary.)
+pub(crate) type PrefilterFnTy = unsafe fn(
+    prestate: &mut PrefilterState,
+    ninfo: &NeedleInfo,
+    haystack: &[u8],
+    needle: &[u8],
+) -> Option<usize>;
+
+impl PrefilterFn {
+    /// Create a new prefilter function from the function pointer given.
+    ///
+    /// # Safety
+    ///
+    /// Callers must ensure that the given prefilter function is safe to call
+    /// for all inputs in the current environment. For example, if the given
+    /// prefilter function uses AVX instructions, then the caller must ensure
+    /// that the appropriate AVX CPU features are enabled.
+    pub(crate) unsafe fn new(prefn: PrefilterFnTy) -> PrefilterFn {
+        PrefilterFn(prefn)
+    }
+
+    /// Call the underlying prefilter function with the given arguments.
+    pub fn call(
+        self,
+        prestate: &mut PrefilterState,
+        ninfo: &NeedleInfo,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        // SAFETY: Callers have the burden of ensuring that a prefilter
+        // function is safe to call for all inputs in the current environment.
+        unsafe { (self.0)(prestate, ninfo, haystack, needle) }
+    }
+}
+
+impl core::fmt::Debug for PrefilterFn {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+        "<prefilter-fn(...)>".fmt(f)
+    }
+}
+
+/// Prefilter controls whether heuristics are used to accelerate searching.
+///
+/// A prefilter refers to the idea of detecting candidate matches very quickly,
+/// and then confirming whether those candidates are full matches. This
+/// idea can be quite effective since it's often the case that looking for
+/// candidates can be a lot faster than running a complete substring search
+/// over the entire input. Namely, looking for candidates can be done with
+/// extremely fast vectorized code.
+///
+/// The downside of a prefilter is that it assumes false positives (which are
+/// candidates generated by a prefilter that aren't matches) are somewhat rare
+/// relative to the frequency of full matches. That is, if a lot of false
+/// positives are generated, then it's possible for search time to be worse
+/// than if the prefilter wasn't enabled in the first place.
+///
+/// Another downside of a prefilter is that it can result in highly variable
+/// performance, where some cases are extraordinarily fast and others aren't.
+/// Typically, variable performance isn't a problem, but it may be for your use
+/// case.
+///
+/// The use of prefilters in this implementation does use a heuristic to detect
+/// when a prefilter might not be carrying its weight, and will dynamically
+/// disable its use. Nevertheless, this configuration option gives callers
+/// the ability to disable prefilters if you have knowledge that they won't be
+/// useful.
+#[derive(Clone, Copy, Debug)]
+#[non_exhaustive]
+pub enum Prefilter {
+    /// Never used a prefilter in substring search.
+    None,
+    /// Automatically detect whether a heuristic prefilter should be used. If
+    /// it is used, then heuristics will be used to dynamically disable the
+    /// prefilter if it is believed to not be carrying its weight.
+    Auto,
+}
+
+impl Default for Prefilter {
+    fn default() -> Prefilter {
+        Prefilter::Auto
+    }
+}
+
+impl Prefilter {
+    pub(crate) fn is_none(&self) -> bool {
+        match *self {
+            Prefilter::None => true,
+            _ => false,
+        }
+    }
+}
+
+/// PrefilterState tracks state associated with the effectiveness of a
+/// prefilter. It is used to track how many bytes, on average, are skipped by
+/// the prefilter. If this average dips below a certain threshold over time,
+/// then the state renders the prefilter inert and stops using it.
+///
+/// A prefilter state should be created for each search. (Where creating an
+/// iterator is treated as a single search.) A prefilter state should only be
+/// created from a `Freqy`. e.g., An inert `Freqy` will produce an inert
+/// `PrefilterState`.
+#[derive(Clone, Debug)]
+pub(crate) struct PrefilterState {
+    /// The number of skips that has been executed. This is always 1 greater
+    /// than the actual number of skips. The special sentinel value of 0
+    /// indicates that the prefilter is inert. This is useful to avoid
+    /// additional checks to determine whether the prefilter is still
+    /// "effective." Once a prefilter becomes inert, it should no longer be
+    /// used (according to our heuristics).
+    skips: u32,
+    /// The total number of bytes that have been skipped.
+    skipped: u32,
+}
+
+impl PrefilterState {
+    /// The minimum number of skip attempts to try before considering whether
+    /// a prefilter is effective or not.
+    const MIN_SKIPS: u32 = 50;
+
+    /// The minimum amount of bytes that skipping must average.
+    ///
+    /// This value was chosen based on varying it and checking
+    /// the microbenchmarks. In particular, this can impact the
+    /// pathological/repeated-{huge,small} benchmarks quite a bit if it's set
+    /// too low.
+    const MIN_SKIP_BYTES: u32 = 8;
+
+    /// Create a fresh prefilter state.
+    pub(crate) fn new() -> PrefilterState {
+        PrefilterState { skips: 1, skipped: 0 }
+    }
+
+    /// Create a fresh prefilter state that is always inert.
+    pub(crate) fn inert() -> PrefilterState {
+        PrefilterState { skips: 0, skipped: 0 }
+    }
+
+    /// Update this state with the number of bytes skipped on the last
+    /// invocation of the prefilter.
+    #[inline]
+    pub(crate) fn update(&mut self, skipped: usize) {
+        self.skips = self.skips.saturating_add(1);
+        // We need to do this dance since it's technically possible for
+        // `skipped` to overflow a `u32`. (And we use a `u32` to reduce the
+        // size of a prefilter state.)
+        if skipped > core::u32::MAX as usize {
+            self.skipped = core::u32::MAX;
+        } else {
+            self.skipped = self.skipped.saturating_add(skipped as u32);
+        }
+    }
+
+    /// Return true if and only if this state indicates that a prefilter is
+    /// still effective.
+    #[inline]
+    pub(crate) fn is_effective(&mut self) -> bool {
+        if self.is_inert() {
+            return false;
+        }
+        if self.skips() < PrefilterState::MIN_SKIPS {
+            return true;
+        }
+        if self.skipped >= PrefilterState::MIN_SKIP_BYTES * self.skips() {
+            return true;
+        }
+
+        // We're inert.
+        self.skips = 0;
+        false
+    }
+
+    #[inline]
+    fn is_inert(&self) -> bool {
+        self.skips == 0
+    }
+
+    #[inline]
+    fn skips(&self) -> u32 {
+        self.skips.saturating_sub(1)
+    }
+}
+
+/// Determine which prefilter function, if any, to use.
+///
+/// This only applies to x86_64 when runtime SIMD detection is enabled (which
+/// is the default). In general, we try to use an AVX prefilter, followed by
+/// SSE and then followed by a generic one based on memchr.
+#[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
+#[inline(always)]
+pub(crate) fn forward(
+    config: &Prefilter,
+    rare: &RareNeedleBytes,
+    needle: &[u8],
+) -> Option<PrefilterFn> {
+    if config.is_none() || needle.len() <= 1 {
+        return None;
+    }
+
+    #[cfg(feature = "std")]
+    {
+        if cfg!(memchr_runtime_avx) {
+            if is_x86_feature_detected!("avx2") {
+                // SAFETY: x86::avx::find only requires the avx2 feature,
+                // which we've just checked above.
+                return unsafe { Some(PrefilterFn::new(x86::avx::find)) };
+            }
+        }
+    }
+    if cfg!(memchr_runtime_sse2) {
+        // SAFETY: x86::sse::find only requires the sse2 feature, which is
+        // guaranteed to be available on x86_64.
+        return unsafe { Some(PrefilterFn::new(x86::sse::find)) };
+    }
+    // Check that our rarest byte has a reasonably low rank. The main issue
+    // here is that the fallback prefilter can perform pretty poorly if it's
+    // given common bytes. So we try to avoid the worst cases here.
+    let (rare1_rank, _) = rare.as_ranks(needle);
+    if rare1_rank <= MAX_FALLBACK_RANK {
+        // SAFETY: fallback::find is safe to call in all environments.
+        return unsafe { Some(PrefilterFn::new(fallback::find)) };
+    }
+    None
+}
+
+/// Determine which prefilter function, if any, to use.
+///
+/// Since SIMD is currently only supported on x86_64, this will just select
+/// the fallback prefilter if the rare bytes provided have a low enough rank.
+#[cfg(not(all(not(miri), target_arch = "x86_64", memchr_runtime_simd)))]
+#[inline(always)]
+pub(crate) fn forward(
+    config: &Prefilter,
+    rare: &RareNeedleBytes,
+    needle: &[u8],
+) -> Option<PrefilterFn> {
+    if config.is_none() || needle.len() <= 1 {
+        return None;
+    }
+    let (rare1_rank, _) = rare.as_ranks(needle);
+    if rare1_rank <= MAX_FALLBACK_RANK {
+        // SAFETY: fallback::find is safe to call in all environments.
+        return unsafe { Some(PrefilterFn::new(fallback::find)) };
+    }
+    None
+}
+
+/// Return the minimum length of the haystack in which a prefilter should be
+/// used. If the haystack is below this length, then it's probably not worth
+/// the overhead of running the prefilter.
+///
+/// We used to look at the length of a haystack here. That is, if it was too
+/// small, then don't bother with the prefilter. But two things changed:
+/// the prefilter falls back to memchr for small haystacks, and, at the
+/// meta-searcher level, Rabin-Karp is employed for tiny haystacks anyway.
+///
+/// We keep it around for now in case we want to bring it back.
+#[allow(dead_code)]
+pub(crate) fn minimum_len(_haystack: &[u8], needle: &[u8]) -> usize {
+    // If the haystack length isn't greater than needle.len() * FACTOR, then
+    // no prefilter will be used. The presumption here is that since there
+    // are so few bytes to check, it's not worth running the prefilter since
+    // there will need to be a validation step anyway. Thus, the prefilter is
+    // largely redundant work.
+    //
+    // Increase the factor noticeably hurts the
+    // memmem/krate/prebuilt/teeny-*/never-john-watson benchmarks.
+    const PREFILTER_LENGTH_FACTOR: usize = 2;
+    const VECTOR_MIN_LENGTH: usize = 16;
+    let min = core::cmp::max(
+        VECTOR_MIN_LENGTH,
+        PREFILTER_LENGTH_FACTOR * needle.len(),
+    );
+    // For haystacks with length==min, we still want to avoid the prefilter,
+    // so add 1.
+    min + 1
+}
+
+#[cfg(all(test, feature = "std", not(miri)))]
+pub(crate) mod tests {
+    use std::convert::{TryFrom, TryInto};
+
+    use super::*;
+    use crate::memmem::{
+        prefilter::PrefilterFnTy, rabinkarp, rarebytes::RareNeedleBytes,
+    };
+
+    // Below is a small jig that generates prefilter tests. The main purpose
+    // of this jig is to generate tests of varying needle/haystack lengths
+    // in order to try and exercise all code paths in our prefilters. And in
+    // particular, this is especially important for vectorized prefilters where
+    // certain code paths might only be exercised at certain lengths.
+
+    /// A test that represents the input and expected output to a prefilter
+    /// function. The test should be able to run with any prefilter function
+    /// and get the expected output.
+    pub(crate) struct PrefilterTest {
+        // These fields represent the inputs and expected output of a forwards
+        // prefilter function.
+        pub(crate) ninfo: NeedleInfo,
+        pub(crate) haystack: Vec<u8>,
+        pub(crate) needle: Vec<u8>,
+        pub(crate) output: Option<usize>,
+    }
+
+    impl PrefilterTest {
+        /// Run all generated forward prefilter tests on the given prefn.
+        ///
+        /// # Safety
+        ///
+        /// Callers must ensure that the given prefilter function pointer is
+        /// safe to call for all inputs in the current environment.
+        pub(crate) unsafe fn run_all_tests(prefn: PrefilterFnTy) {
+            PrefilterTest::run_all_tests_filter(prefn, |_| true)
+        }
+
+        /// Run all generated forward prefilter tests that pass the given
+        /// predicate on the given prefn.
+        ///
+        /// # Safety
+        ///
+        /// Callers must ensure that the given prefilter function pointer is
+        /// safe to call for all inputs in the current environment.
+        pub(crate) unsafe fn run_all_tests_filter(
+            prefn: PrefilterFnTy,
+            mut predicate: impl FnMut(&PrefilterTest) -> bool,
+        ) {
+            for seed in PREFILTER_TEST_SEEDS {
+                for test in seed.generate() {
+                    if predicate(&test) {
+                        test.run(prefn);
+                    }
+                }
+            }
+        }
+
+        /// Create a new prefilter test from a seed and some chose offsets to
+        /// rare bytes in the seed's needle.
+        ///
+        /// If a valid test could not be constructed, then None is returned.
+        /// (Currently, we take the approach of massaging tests to be valid
+        /// instead of rejecting them outright.)
+        fn new(
+            seed: &PrefilterTestSeed,
+            rare1i: usize,
+            rare2i: usize,
+            haystack_len: usize,
+            needle_len: usize,
+            output: Option<usize>,
+        ) -> Option<PrefilterTest> {
+            let mut rare1i: u8 = rare1i.try_into().unwrap();
+            let mut rare2i: u8 = rare2i.try_into().unwrap();
+            // The '#' byte is never used in a haystack (unless we're expecting
+            // a match), while the '@' byte is never used in a needle.
+            let mut haystack = vec![b'@'; haystack_len];
+            let mut needle = vec![b'#'; needle_len];
+            needle[0] = seed.first;
+            needle[rare1i as usize] = seed.rare1;
+            needle[rare2i as usize] = seed.rare2;
+            // If we're expecting a match, then make sure the needle occurs
+            // in the haystack at the expected position.
+            if let Some(i) = output {
+                haystack[i..i + needle.len()].copy_from_slice(&needle);
+            }
+            // If the operations above lead to rare offsets pointing to the
+            // non-first occurrence of a byte, then adjust it. This might lead
+            // to redundant tests, but it's simpler than trying to change the
+            // generation process I think.
+            if let Some(i) = crate::memchr(seed.rare1, &needle) {
+                rare1i = u8::try_from(i).unwrap();
+            }
+            if let Some(i) = crate::memchr(seed.rare2, &needle) {
+                rare2i = u8::try_from(i).unwrap();
+            }
+            let ninfo = NeedleInfo {
+                rarebytes: RareNeedleBytes::new(rare1i, rare2i),
+                nhash: rabinkarp::NeedleHash::forward(&needle),
+            };
+            Some(PrefilterTest { ninfo, haystack, needle, output })
+        }
+
+        /// Run this specific test on the given prefilter function. If the
+        /// outputs do no match, then this routine panics with a failure
+        /// message.
+        ///
+        /// # Safety
+        ///
+        /// Callers must ensure that the given prefilter function pointer is
+        /// safe to call for all inputs in the current environment.
+        unsafe fn run(&self, prefn: PrefilterFnTy) {
+            let mut prestate = PrefilterState::new();
+            assert_eq!(
+                self.output,
+                prefn(
+                    &mut prestate,
+                    &self.ninfo,
+                    &self.haystack,
+                    &self.needle
+                ),
+                "ninfo: {:?}, haystack(len={}): {:?}, needle(len={}): {:?}",
+                self.ninfo,
+                self.haystack.len(),
+                std::str::from_utf8(&self.haystack).unwrap(),
+                self.needle.len(),
+                std::str::from_utf8(&self.needle).unwrap(),
+            );
+        }
+    }
+
+    /// A set of prefilter test seeds. Each seed serves as the base for the
+    /// generation of many other tests. In essence, the seed captures the
+    /// "rare" and first bytes among our needle. The tests generated from each
+    /// seed essentially vary the length of the needle and haystack, while
+    /// using the rare/first byte configuration from the seed.
+    ///
+    /// The purpose of this is to test many different needle/haystack lengths.
+    /// In particular, some of the vector optimizations might only have bugs
+    /// in haystacks of a certain size.
+    const PREFILTER_TEST_SEEDS: &[PrefilterTestSeed] = &[
+        PrefilterTestSeed { first: b'x', rare1: b'y', rare2: b'z' },
+        PrefilterTestSeed { first: b'x', rare1: b'x', rare2: b'z' },
+        PrefilterTestSeed { first: b'x', rare1: b'y', rare2: b'x' },
+        PrefilterTestSeed { first: b'x', rare1: b'x', rare2: b'x' },
+        PrefilterTestSeed { first: b'x', rare1: b'y', rare2: b'y' },
+    ];
+
+    /// Data that describes a single prefilter test seed.
+    struct PrefilterTestSeed {
+        first: u8,
+        rare1: u8,
+        rare2: u8,
+    }
+
+    impl PrefilterTestSeed {
+        /// Generate a series of prefilter tests from this seed.
+        fn generate(&self) -> Vec<PrefilterTest> {
+            let mut tests = vec![];
+            let mut push = |test: Option<PrefilterTest>| {
+                if let Some(test) = test {
+                    tests.push(test);
+                }
+            };
+            let len_start = 2;
+            // The loop below generates *a lot* of tests. The number of tests
+            // was chosen somewhat empirically to be "bearable" when running
+            // the test suite.
+            for needle_len in len_start..=40 {
+                let rare_start = len_start - 1;
+                for rare1i in rare_start..needle_len {
+                    for rare2i in rare1i..needle_len {
+                        for haystack_len in needle_len..=66 {
+                            push(PrefilterTest::new(
+                                self,
+                                rare1i,
+                                rare2i,
+                                haystack_len,
+                                needle_len,
+                                None,
+                            ));
+                            // Test all possible match scenarios for this
+                            // needle and haystack.
+                            for output in 0..=(haystack_len - needle_len) {
+                                push(PrefilterTest::new(
+                                    self,
+                                    rare1i,
+                                    rare2i,
+                                    haystack_len,
+                                    needle_len,
+                                    Some(output),
+                                ));
+                            }
+                        }
+                    }
+                }
+            }
+            tests
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/avx.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/avx.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/avx.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/avx.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,46 @@
+use core::arch::x86_64::__m256i;
+
+use crate::memmem::{
+    prefilter::{PrefilterFnTy, PrefilterState},
+    NeedleInfo,
+};
+
+// Check that the functions below satisfy the Prefilter function type.
+const _: PrefilterFnTy = find;
+
+/// An AVX2 accelerated candidate finder for single-substring search.
+///
+/// # Safety
+///
+/// Callers must ensure that the avx2 CPU feature is enabled in the current
+/// environment.
+#[target_feature(enable = "avx2")]
+pub(crate) unsafe fn find(
+    prestate: &mut PrefilterState,
+    ninfo: &NeedleInfo,
+    haystack: &[u8],
+    needle: &[u8],
+) -> Option<usize> {
+    super::super::genericsimd::find::<__m256i>(
+        prestate,
+        ninfo,
+        haystack,
+        needle,
+        super::sse::find,
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    #[cfg(not(miri))]
+    fn prefilter_permutations() {
+        use crate::memmem::prefilter::tests::PrefilterTest;
+        if !is_x86_feature_detected!("avx2") {
+            return;
+        }
+        // SAFETY: The safety of super::find only requires that the current
+        // CPU support AVX2, which we checked above.
+        unsafe { PrefilterTest::run_all_tests(super::find) };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5 @@
+// We only use AVX when we can detect at runtime whether it's available, which
+// requires std.
+#[cfg(feature = "std")]
+pub(crate) mod avx;
+pub(crate) mod sse;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/sse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/sse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/sse.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/prefilter/x86/sse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,55 @@
+use core::arch::x86_64::__m128i;
+
+use crate::memmem::{
+    prefilter::{PrefilterFnTy, PrefilterState},
+    NeedleInfo,
+};
+
+// Check that the functions below satisfy the Prefilter function type.
+const _: PrefilterFnTy = find;
+
+/// An SSE2 accelerated candidate finder for single-substring search.
+///
+/// # Safety
+///
+/// Callers must ensure that the sse2 CPU feature is enabled in the current
+/// environment. This feature should be enabled in all x86_64 targets.
+#[target_feature(enable = "sse2")]
+pub(crate) unsafe fn find(
+    prestate: &mut PrefilterState,
+    ninfo: &NeedleInfo,
+    haystack: &[u8],
+    needle: &[u8],
+) -> Option<usize> {
+    // If the haystack is too small for SSE2, then just run memchr on the
+    // rarest byte and be done with it. (It is likely that this code path is
+    // rarely exercised, since a higher level routine will probably dispatch to
+    // Rabin-Karp for such a small haystack.)
+    fn simple_memchr_fallback(
+        _prestate: &mut PrefilterState,
+        ninfo: &NeedleInfo,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        let (rare, _) = ninfo.rarebytes.as_rare_ordered_usize();
+        crate::memchr(needle[rare], haystack).map(|i| i.saturating_sub(rare))
+    }
+    super::super::genericsimd::find::<__m128i>(
+        prestate,
+        ninfo,
+        haystack,
+        needle,
+        simple_memchr_fallback,
+    )
+}
+
+#[cfg(all(test, feature = "std"))]
+mod tests {
+    #[test]
+    #[cfg(not(miri))]
+    fn prefilter_permutations() {
+        use crate::memmem::prefilter::tests::PrefilterTest;
+        // SAFETY: super::find is safe to call for all inputs on x86.
+        unsafe { PrefilterTest::run_all_tests(super::find) };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/rabinkarp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/rabinkarp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/rabinkarp.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/rabinkarp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,233 @@
+/*
+This module implements the classical Rabin-Karp substring search algorithm,
+with no extra frills. While its use would seem to break our time complexity
+guarantee of O(m+n) (RK's time complexity is O(mn)), we are careful to only
+ever use RK on a constant subset of haystacks. The main point here is that
+RK has good latency properties for small needles/haystacks. It's very quick
+to compute a needle hash and zip through the haystack when compared to
+initializing Two-Way, for example. And this is especially useful for cases
+where the haystack is just too short for vector instructions to do much good.
+
+The hashing function used here is the same one recommended by ESMAJ.
+
+Another choice instead of Rabin-Karp would be Shift-Or. But its latency
+isn't quite as good since its preprocessing time is a bit more expensive
+(both in practice and in theory). However, perhaps Shift-Or has a place
+somewhere else for short patterns. I think the main problem is that it
+requires space proportional to the alphabet and the needle. If we, for
+example, supported needles up to length 16, then the total table size would be
+len(alphabet)*size_of::<u16>()==512 bytes. Which isn't exactly small, and it's
+probably bad to put that on the stack. So ideally, we'd throw it on the heap,
+but we'd really like to write as much code without using alloc/std as possible.
+But maybe it's worth the special casing. It's a TODO to benchmark.
+
+Wikipedia has a decent explanation, if a bit heavy on the theory:
+https://en.wikipedia.org/wiki/Rabin%E2%80%93Karp_algorithm
+
+But ESMAJ provides something a bit more concrete:
+http://www-igm.univ-mlv.fr/~lecroq/string/node5.html
+
+Finally, aho-corasick uses Rabin-Karp for multiple pattern match in some cases:
+https://github.com/BurntSushi/aho-corasick/blob/3852632f10587db0ff72ef29e88d58bf305a0946/src/packed/rabinkarp.rs
+*/
+
+/// Whether RK is believed to be very fast for the given needle/haystack.
+pub(crate) fn is_fast(haystack: &[u8], _needle: &[u8]) -> bool {
+    haystack.len() < 16
+}
+
+/// Search for the first occurrence of needle in haystack using Rabin-Karp.
+pub(crate) fn find(haystack: &[u8], needle: &[u8]) -> Option<usize> {
+    find_with(&NeedleHash::forward(needle), haystack, needle)
+}
+
+/// Search for the first occurrence of needle in haystack using Rabin-Karp with
+/// a pre-computed needle hash.
+pub(crate) fn find_with(
+    nhash: &NeedleHash,
+    mut haystack: &[u8],
+    needle: &[u8],
+) -> Option<usize> {
+    if haystack.len() < needle.len() {
+        return None;
+    }
+    let start = haystack.as_ptr() as usize;
+    let mut hash = Hash::from_bytes_fwd(&haystack[..needle.len()]);
+    // N.B. I've experimented with unrolling this loop, but couldn't realize
+    // any obvious gains.
+    loop {
+        if nhash.eq(hash) && is_prefix(haystack, needle) {
+            return Some(haystack.as_ptr() as usize - start);
+        }
+        if needle.len() >= haystack.len() {
+            return None;
+        }
+        hash.roll(&nhash, haystack[0], haystack[needle.len()]);
+        haystack = &haystack[1..];
+    }
+}
+
+/// Search for the last occurrence of needle in haystack using Rabin-Karp.
+pub(crate) fn rfind(haystack: &[u8], needle: &[u8]) -> Option<usize> {
+    rfind_with(&NeedleHash::reverse(needle), haystack, needle)
+}
+
+/// Search for the last occurrence of needle in haystack using Rabin-Karp with
+/// a pre-computed needle hash.
+pub(crate) fn rfind_with(
+    nhash: &NeedleHash,
+    mut haystack: &[u8],
+    needle: &[u8],
+) -> Option<usize> {
+    if haystack.len() < needle.len() {
+        return None;
+    }
+    let mut hash =
+        Hash::from_bytes_rev(&haystack[haystack.len() - needle.len()..]);
+    loop {
+        if nhash.eq(hash) && is_suffix(haystack, needle) {
+            return Some(haystack.len() - needle.len());
+        }
+        if needle.len() >= haystack.len() {
+            return None;
+        }
+        hash.roll(
+            &nhash,
+            haystack[haystack.len() - 1],
+            haystack[haystack.len() - needle.len() - 1],
+        );
+        haystack = &haystack[..haystack.len() - 1];
+    }
+}
+
+/// A hash derived from a needle.
+#[derive(Clone, Copy, Debug, Default)]
+pub(crate) struct NeedleHash {
+    /// The actual hash.
+    hash: Hash,
+    /// The factor needed to multiply a byte by in order to subtract it from
+    /// the hash. It is defined to be 2^(n-1) (using wrapping exponentiation),
+    /// where n is the length of the needle. This is how we "remove" a byte
+    /// from the hash once the hash window rolls past it.
+    hash_2pow: u32,
+}
+
+impl NeedleHash {
+    /// Create a new Rabin-Karp hash for the given needle for use in forward
+    /// searching.
+    pub(crate) fn forward(needle: &[u8]) -> NeedleHash {
+        let mut nh = NeedleHash { hash: Hash::new(), hash_2pow: 1 };
+        if needle.is_empty() {
+            return nh;
+        }
+        nh.hash.add(needle[0]);
+        for &b in needle.iter().skip(1) {
+            nh.hash.add(b);
+            nh.hash_2pow = nh.hash_2pow.wrapping_shl(1);
+        }
+        nh
+    }
+
+    /// Create a new Rabin-Karp hash for the given needle for use in reverse
+    /// searching.
+    pub(crate) fn reverse(needle: &[u8]) -> NeedleHash {
+        let mut nh = NeedleHash { hash: Hash::new(), hash_2pow: 1 };
+        if needle.is_empty() {
+            return nh;
+        }
+        nh.hash.add(needle[needle.len() - 1]);
+        for &b in needle.iter().rev().skip(1) {
+            nh.hash.add(b);
+            nh.hash_2pow = nh.hash_2pow.wrapping_shl(1);
+        }
+        nh
+    }
+
+    /// Return true if the hashes are equivalent.
+    fn eq(&self, hash: Hash) -> bool {
+        self.hash == hash
+    }
+}
+
+/// A Rabin-Karp hash. This might represent the hash of a needle, or the hash
+/// of a rolling window in the haystack.
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub(crate) struct Hash(u32);
+
+impl Hash {
+    /// Create a new hash that represents the empty string.
+    pub(crate) fn new() -> Hash {
+        Hash(0)
+    }
+
+    /// Create a new hash from the bytes given for use in forward searches.
+    pub(crate) fn from_bytes_fwd(bytes: &[u8]) -> Hash {
+        let mut hash = Hash::new();
+        for &b in bytes {
+            hash.add(b);
+        }
+        hash
+    }
+
+    /// Create a new hash from the bytes given for use in reverse searches.
+    fn from_bytes_rev(bytes: &[u8]) -> Hash {
+        let mut hash = Hash::new();
+        for &b in bytes.iter().rev() {
+            hash.add(b);
+        }
+        hash
+    }
+
+    /// Add 'new' and remove 'old' from this hash. The given needle hash should
+    /// correspond to the hash computed for the needle being searched for.
+    ///
+    /// This is meant to be used when the rolling window of the haystack is
+    /// advanced.
+    fn roll(&mut self, nhash: &NeedleHash, old: u8, new: u8) {
+        self.del(nhash, old);
+        self.add(new);
+    }
+
+    /// Add a byte to this hash.
+    fn add(&mut self, byte: u8) {
+        self.0 = self.0.wrapping_shl(1).wrapping_add(byte as u32);
+    }
+
+    /// Remove a byte from this hash. The given needle hash should correspond
+    /// to the hash computed for the needle being searched for.
+    fn del(&mut self, nhash: &NeedleHash, byte: u8) {
+        let factor = nhash.hash_2pow;
+        self.0 = self.0.wrapping_sub((byte as u32).wrapping_mul(factor));
+    }
+}
+
+/// Returns true if the given needle is a prefix of the given haystack.
+///
+/// We forcefully don't inline the is_prefix call and hint at the compiler that
+/// it is unlikely to be called. This causes the inner rabinkarp loop above
+/// to be a bit tighter and leads to some performance improvement. See the
+/// memmem/krate/prebuilt/sliceslice-words/words benchmark.
+#[cold]
+#[inline(never)]
+fn is_prefix(haystack: &[u8], needle: &[u8]) -> bool {
+    crate::memmem::util::is_prefix(haystack, needle)
+}
+
+/// Returns true if the given needle is a suffix of the given haystack.
+///
+/// See is_prefix for why this is forcefully not inlined.
+#[cold]
+#[inline(never)]
+fn is_suffix(haystack: &[u8], needle: &[u8]) -> bool {
+    crate::memmem::util::is_suffix(haystack, needle)
+}
+
+#[cfg(test)]
+mod simpletests {
+    define_memmem_simple_tests!(super::find, super::rfind);
+}
+
+#[cfg(all(test, feature = "std", not(miri)))]
+mod proptests {
+    define_memmem_quickcheck_tests!(super::find, super::rfind);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/rarebytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/rarebytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/rarebytes.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/rarebytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,136 @@
+/// A heuristic frequency based detection of rare bytes for substring search.
+///
+/// This detector attempts to pick out two bytes in a needle that are predicted
+/// to occur least frequently. The purpose is to use these bytes to implement
+/// fast candidate search using vectorized code.
+///
+/// A set of offsets is only computed for needles of length 2 or greater.
+/// Smaller needles should be special cased by the substring search algorithm
+/// in use. (e.g., Use memchr for single byte needles.)
+///
+/// Note that we use `u8` to represent the offsets of the rare bytes in a
+/// needle to reduce space usage. This means that rare byte occurring after the
+/// first 255 bytes in a needle will never be used.
+#[derive(Clone, Copy, Debug, Default)]
+pub(crate) struct RareNeedleBytes {
+    /// The leftmost offset of the rarest byte in the needle, according to
+    /// pre-computed frequency analysis. The "leftmost offset" means that
+    /// rare1i <= i for all i where needle[i] == needle[rare1i].
+    rare1i: u8,
+    /// The leftmost offset of the second rarest byte in the needle, according
+    /// to pre-computed frequency analysis. The "leftmost offset" means that
+    /// rare2i <= i for all i where needle[i] == needle[rare2i].
+    ///
+    /// The second rarest byte is used as a type of guard for quickly detecting
+    /// a mismatch if the first byte matches. This is a hedge against
+    /// pathological cases where the pre-computed frequency analysis may be
+    /// off. (But of course, does not prevent *all* pathological cases.)
+    ///
+    /// In general, rare1i != rare2i by construction, although there is no hard
+    /// requirement that they be different. However, since the case of a single
+    /// byte needle is handled specially by memchr itself, rare2i generally
+    /// always should be different from rare1i since it would otherwise be
+    /// ineffective as a guard.
+    rare2i: u8,
+}
+
+impl RareNeedleBytes {
+    /// Create a new pair of rare needle bytes with the given offsets. This is
+    /// only used in tests for generating input data.
+    #[cfg(all(test, feature = "std"))]
+    pub(crate) fn new(rare1i: u8, rare2i: u8) -> RareNeedleBytes {
+        RareNeedleBytes { rare1i, rare2i }
+    }
+
+    /// Detect the leftmost offsets of the two rarest bytes in the given
+    /// needle.
+    pub(crate) fn forward(needle: &[u8]) -> RareNeedleBytes {
+        if needle.len() <= 1 || needle.len() > core::u8::MAX as usize {
+            // For needles bigger than u8::MAX, our offsets aren't big enough.
+            // (We make our offsets small to reduce stack copying.)
+            // If you have a use case for it, please file an issue. In that
+            // case, we should probably just adjust the routine below to pick
+            // some rare bytes from the first 255 bytes of the needle.
+            //
+            // Also note that for needles of size 0 or 1, they are special
+            // cased in Two-Way.
+            //
+            // TODO: Benchmar this.
+            return RareNeedleBytes { rare1i: 0, rare2i: 0 };
+        }
+
+        // Find the rarest two bytes. We make them distinct by construction.
+        let (mut rare1, mut rare1i) = (needle[0], 0);
+        let (mut rare2, mut rare2i) = (needle[1], 1);
+        if rank(rare2) < rank(rare1) {
+            core::mem::swap(&mut rare1, &mut rare2);
+            core::mem::swap(&mut rare1i, &mut rare2i);
+        }
+        for (i, &b) in needle.iter().enumerate().skip(2) {
+            if rank(b) < rank(rare1) {
+                rare2 = rare1;
+                rare2i = rare1i;
+                rare1 = b;
+                rare1i = i as u8;
+            } else if b != rare1 && rank(b) < rank(rare2) {
+                rare2 = b;
+                rare2i = i as u8;
+            }
+        }
+        // While not strictly required, we really don't want these to be
+        // equivalent. If they were, it would reduce the effectiveness of
+        // candidate searching using these rare bytes by increasing the rate of
+        // false positives.
+        assert_ne!(rare1i, rare2i);
+        RareNeedleBytes { rare1i, rare2i }
+    }
+
+    /// Return the rare bytes in the given needle in the forward direction.
+    /// The needle given must be the same one given to the RareNeedleBytes
+    /// constructor.
+    pub(crate) fn as_rare_bytes(&self, needle: &[u8]) -> (u8, u8) {
+        (needle[self.rare1i as usize], needle[self.rare2i as usize])
+    }
+
+    /// Return the rare offsets such that the first offset is always <= to the
+    /// second offset. This is useful when the caller doesn't care whether
+    /// rare1 is rarer than rare2, but just wants to ensure that they are
+    /// ordered with respect to one another.
+    #[cfg(memchr_runtime_simd)]
+    pub(crate) fn as_rare_ordered_usize(&self) -> (usize, usize) {
+        let (rare1i, rare2i) = self.as_rare_ordered_u8();
+        (rare1i as usize, rare2i as usize)
+    }
+
+    /// Like as_rare_ordered_usize, but returns the offsets as their native
+    /// u8 values.
+    #[cfg(memchr_runtime_simd)]
+    pub(crate) fn as_rare_ordered_u8(&self) -> (u8, u8) {
+        if self.rare1i <= self.rare2i {
+            (self.rare1i, self.rare2i)
+        } else {
+            (self.rare2i, self.rare1i)
+        }
+    }
+
+    /// Return the rare offsets as usize values in the order in which they were
+    /// constructed. rare1, for example, is constructed as the "rarer" byte,
+    /// and thus, callers may want to treat it differently from rare2.
+    pub(crate) fn as_rare_usize(&self) -> (usize, usize) {
+        (self.rare1i as usize, self.rare2i as usize)
+    }
+
+    /// Return the byte frequency rank of each byte. The higher the rank, the
+    /// more frequency the byte is predicted to be. The needle given must be
+    /// the same one given to the RareNeedleBytes constructor.
+    pub(crate) fn as_ranks(&self, needle: &[u8]) -> (usize, usize) {
+        let (b1, b2) = self.as_rare_bytes(needle);
+        (rank(b1), rank(b2))
+    }
+}
+
+/// Return the heuristical frequency rank of the given byte. A lower rank
+/// means the byte is believed to occur less frequently.
+fn rank(b: u8) -> usize {
+    crate::memmem::byte_frequencies::BYTE_FREQUENCIES[b as usize] as usize
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/twoway.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/twoway.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/twoway.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/twoway.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,878 @@
+use core::cmp;
+
+use crate::memmem::{prefilter::Pre, util};
+
+/// Two-Way search in the forward direction.
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct Forward(TwoWay);
+
+/// Two-Way search in the reverse direction.
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct Reverse(TwoWay);
+
+/// An implementation of the TwoWay substring search algorithm, with heuristics
+/// for accelerating search based on frequency analysis.
+///
+/// This searcher supports forward and reverse search, although not
+/// simultaneously. It runs in O(n + m) time and O(1) space, where
+/// `n ~ len(needle)` and `m ~ len(haystack)`.
+///
+/// The implementation here roughly matches that which was developed by
+/// Crochemore and Perrin in their 1991 paper "Two-way string-matching." The
+/// changes in this implementation are 1) the use of zero-based indices, 2) a
+/// heuristic skip table based on the last byte (borrowed from Rust's standard
+/// library) and 3) the addition of heuristics for a fast skip loop. That is,
+/// (3) this will detect bytes that are believed to be rare in the needle and
+/// use fast vectorized instructions to find their occurrences quickly. The
+/// Two-Way algorithm is then used to confirm whether a match at that location
+/// occurred.
+///
+/// The heuristic for fast skipping is automatically shut off if it's
+/// detected to be ineffective at search time. Generally, this only occurs in
+/// pathological cases. But this is generally necessary in order to preserve
+/// a `O(n + m)` time bound.
+///
+/// The code below is fairly complex and not obviously correct at all. It's
+/// likely necessary to read the Two-Way paper cited above in order to fully
+/// grok this code. The essence of it is:
+///
+/// 1) Do something to detect a "critical" position in the needle.
+/// 2) For the current position in the haystack, look if needle[critical..]
+///    matches at that position.
+/// 3) If so, look if needle[..critical] matches.
+/// 4) If a mismatch occurs, shift the search by some amount based on the
+///    critical position and a pre-computed shift.
+///
+/// This type is wrapped in Forward and Reverse types that expose consistent
+/// forward or reverse APIs.
+#[derive(Clone, Copy, Debug)]
+struct TwoWay {
+    /// A small bitset used as a quick prefilter (in addition to the faster
+    /// SIMD based prefilter). Namely, a bit 'i' is set if and only if b%64==i
+    /// for any b in the needle.
+    ///
+    /// When used as a prefilter, if the last byte at the current candidate
+    /// position is NOT in this set, then we can skip that entire candidate
+    /// position (the length of the needle). This is essentially the shift
+    /// trick found in Boyer-Moore, but only applied to bytes that don't appear
+    /// in the needle.
+    ///
+    /// N.B. This trick was inspired by something similar in std's
+    /// implementation of Two-Way.
+    byteset: ApproximateByteSet,
+    /// A critical position in needle. Specifically, this position corresponds
+    /// to beginning of either the minimal or maximal suffix in needle. (N.B.
+    /// See SuffixType below for why "minimal" isn't quite the correct word
+    /// here.)
+    ///
+    /// This is the position at which every search begins. Namely, search
+    /// starts by scanning text to the right of this position, and only if
+    /// there's a match does the text to the left of this position get scanned.
+    critical_pos: usize,
+    /// The amount we shift by in the Two-Way search algorithm. This
+    /// corresponds to the "small period" and "large period" cases.
+    shift: Shift,
+}
+
+impl Forward {
+    /// Create a searcher that uses the Two-Way algorithm by searching forwards
+    /// through any haystack.
+    pub(crate) fn new(needle: &[u8]) -> Forward {
+        if needle.is_empty() {
+            return Forward(TwoWay::empty());
+        }
+
+        let byteset = ApproximateByteSet::new(needle);
+        let min_suffix = Suffix::forward(needle, SuffixKind::Minimal);
+        let max_suffix = Suffix::forward(needle, SuffixKind::Maximal);
+        let (period_lower_bound, critical_pos) =
+            if min_suffix.pos > max_suffix.pos {
+                (min_suffix.period, min_suffix.pos)
+            } else {
+                (max_suffix.period, max_suffix.pos)
+            };
+        let shift = Shift::forward(needle, period_lower_bound, critical_pos);
+        Forward(TwoWay { byteset, critical_pos, shift })
+    }
+
+    /// Find the position of the first occurrence of this searcher's needle in
+    /// the given haystack. If one does not exist, then return None.
+    ///
+    /// This accepts prefilter state that is useful when using the same
+    /// searcher multiple times, such as in an iterator.
+    ///
+    /// Callers must guarantee that the needle is non-empty and its length is
+    /// <= the haystack's length.
+    #[inline(always)]
+    pub(crate) fn find(
+        &self,
+        pre: Option<&mut Pre<'_>>,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        debug_assert!(!needle.is_empty(), "needle should not be empty");
+        debug_assert!(needle.len() <= haystack.len(), "haystack too short");
+
+        match self.0.shift {
+            Shift::Small { period } => {
+                self.find_small_imp(pre, haystack, needle, period)
+            }
+            Shift::Large { shift } => {
+                self.find_large_imp(pre, haystack, needle, shift)
+            }
+        }
+    }
+
+    /// Like find, but handles the degenerate substring test cases. This is
+    /// only useful for conveniently testing this substring implementation in
+    /// isolation.
+    #[cfg(test)]
+    fn find_general(
+        &self,
+        pre: Option<&mut Pre<'_>>,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        if needle.is_empty() {
+            Some(0)
+        } else if haystack.len() < needle.len() {
+            None
+        } else {
+            self.find(pre, haystack, needle)
+        }
+    }
+
+    // Each of the two search implementations below can be accelerated by a
+    // prefilter, but it is not always enabled. To avoid its overhead when
+    // its disabled, we explicitly inline each search implementation based on
+    // whether a prefilter will be used or not. The decision on which to use
+    // is made in the parent meta searcher.
+
+    #[inline(always)]
+    fn find_small_imp(
+        &self,
+        mut pre: Option<&mut Pre<'_>>,
+        haystack: &[u8],
+        needle: &[u8],
+        period: usize,
+    ) -> Option<usize> {
+        let last_byte = needle.len() - 1;
+        let mut pos = 0;
+        let mut shift = 0;
+        while pos + needle.len() <= haystack.len() {
+            let mut i = cmp::max(self.0.critical_pos, shift);
+            if let Some(pre) = pre.as_mut() {
+                if pre.should_call() {
+                    pos += pre.call(&haystack[pos..], needle)?;
+                    shift = 0;
+                    i = self.0.critical_pos;
+                    if pos + needle.len() > haystack.len() {
+                        return None;
+                    }
+                }
+            }
+            if !self.0.byteset.contains(haystack[pos + last_byte]) {
+                pos += needle.len();
+                shift = 0;
+                continue;
+            }
+            while i < needle.len() && needle[i] == haystack[pos + i] {
+                i += 1;
+            }
+            if i < needle.len() {
+                pos += i - self.0.critical_pos + 1;
+                shift = 0;
+            } else {
+                let mut j = self.0.critical_pos;
+                while j > shift && needle[j] == haystack[pos + j] {
+                    j -= 1;
+                }
+                if j <= shift && needle[shift] == haystack[pos + shift] {
+                    return Some(pos);
+                }
+                pos += period;
+                shift = needle.len() - period;
+            }
+        }
+        None
+    }
+
+    #[inline(always)]
+    fn find_large_imp(
+        &self,
+        mut pre: Option<&mut Pre<'_>>,
+        haystack: &[u8],
+        needle: &[u8],
+        shift: usize,
+    ) -> Option<usize> {
+        let last_byte = needle.len() - 1;
+        let mut pos = 0;
+        'outer: while pos + needle.len() <= haystack.len() {
+            if let Some(pre) = pre.as_mut() {
+                if pre.should_call() {
+                    pos += pre.call(&haystack[pos..], needle)?;
+                    if pos + needle.len() > haystack.len() {
+                        return None;
+                    }
+                }
+            }
+
+            if !self.0.byteset.contains(haystack[pos + last_byte]) {
+                pos += needle.len();
+                continue;
+            }
+            let mut i = self.0.critical_pos;
+            while i < needle.len() && needle[i] == haystack[pos + i] {
+                i += 1;
+            }
+            if i < needle.len() {
+                pos += i - self.0.critical_pos + 1;
+            } else {
+                for j in (0..self.0.critical_pos).rev() {
+                    if needle[j] != haystack[pos + j] {
+                        pos += shift;
+                        continue 'outer;
+                    }
+                }
+                return Some(pos);
+            }
+        }
+        None
+    }
+}
+
+impl Reverse {
+    /// Create a searcher that uses the Two-Way algorithm by searching in
+    /// reverse through any haystack.
+    pub(crate) fn new(needle: &[u8]) -> Reverse {
+        if needle.is_empty() {
+            return Reverse(TwoWay::empty());
+        }
+
+        let byteset = ApproximateByteSet::new(needle);
+        let min_suffix = Suffix::reverse(needle, SuffixKind::Minimal);
+        let max_suffix = Suffix::reverse(needle, SuffixKind::Maximal);
+        let (period_lower_bound, critical_pos) =
+            if min_suffix.pos < max_suffix.pos {
+                (min_suffix.period, min_suffix.pos)
+            } else {
+                (max_suffix.period, max_suffix.pos)
+            };
+        // let critical_pos = needle.len() - critical_pos;
+        let shift = Shift::reverse(needle, period_lower_bound, critical_pos);
+        Reverse(TwoWay { byteset, critical_pos, shift })
+    }
+
+    /// Find the position of the last occurrence of this searcher's needle
+    /// in the given haystack. If one does not exist, then return None.
+    ///
+    /// This will automatically initialize prefilter state. This should only
+    /// be used for one-off searches.
+    ///
+    /// Callers must guarantee that the needle is non-empty and its length is
+    /// <= the haystack's length.
+    #[inline(always)]
+    pub(crate) fn rfind(
+        &self,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        debug_assert!(!needle.is_empty(), "needle should not be empty");
+        debug_assert!(needle.len() <= haystack.len(), "haystack too short");
+        // For the reverse case, we don't use a prefilter. It's plausible that
+        // perhaps we should, but it's a lot of additional code to do it, and
+        // it's not clear that it's actually worth it. If you have a really
+        // compelling use case for this, please file an issue.
+        match self.0.shift {
+            Shift::Small { period } => {
+                self.rfind_small_imp(haystack, needle, period)
+            }
+            Shift::Large { shift } => {
+                self.rfind_large_imp(haystack, needle, shift)
+            }
+        }
+    }
+
+    /// Like rfind, but handles the degenerate substring test cases. This is
+    /// only useful for conveniently testing this substring implementation in
+    /// isolation.
+    #[cfg(test)]
+    fn rfind_general(&self, haystack: &[u8], needle: &[u8]) -> Option<usize> {
+        if needle.is_empty() {
+            Some(haystack.len())
+        } else if haystack.len() < needle.len() {
+            None
+        } else {
+            self.rfind(haystack, needle)
+        }
+    }
+
+    #[inline(always)]
+    fn rfind_small_imp(
+        &self,
+        haystack: &[u8],
+        needle: &[u8],
+        period: usize,
+    ) -> Option<usize> {
+        let nlen = needle.len();
+        let mut pos = haystack.len();
+        let mut shift = nlen;
+        while pos >= nlen {
+            if !self.0.byteset.contains(haystack[pos - nlen]) {
+                pos -= nlen;
+                shift = nlen;
+                continue;
+            }
+            let mut i = cmp::min(self.0.critical_pos, shift);
+            while i > 0 && needle[i - 1] == haystack[pos - nlen + i - 1] {
+                i -= 1;
+            }
+            if i > 0 || needle[0] != haystack[pos - nlen] {
+                pos -= self.0.critical_pos - i + 1;
+                shift = nlen;
+            } else {
+                let mut j = self.0.critical_pos;
+                while j < shift && needle[j] == haystack[pos - nlen + j] {
+                    j += 1;
+                }
+                if j >= shift {
+                    return Some(pos - nlen);
+                }
+                pos -= period;
+                shift = period;
+            }
+        }
+        None
+    }
+
+    #[inline(always)]
+    fn rfind_large_imp(
+        &self,
+        haystack: &[u8],
+        needle: &[u8],
+        shift: usize,
+    ) -> Option<usize> {
+        let nlen = needle.len();
+        let mut pos = haystack.len();
+        while pos >= nlen {
+            if !self.0.byteset.contains(haystack[pos - nlen]) {
+                pos -= nlen;
+                continue;
+            }
+            let mut i = self.0.critical_pos;
+            while i > 0 && needle[i - 1] == haystack[pos - nlen + i - 1] {
+                i -= 1;
+            }
+            if i > 0 || needle[0] != haystack[pos - nlen] {
+                pos -= self.0.critical_pos - i + 1;
+            } else {
+                let mut j = self.0.critical_pos;
+                while j < nlen && needle[j] == haystack[pos - nlen + j] {
+                    j += 1;
+                }
+                if j == nlen {
+                    return Some(pos - nlen);
+                }
+                pos -= shift;
+            }
+        }
+        None
+    }
+}
+
+impl TwoWay {
+    fn empty() -> TwoWay {
+        TwoWay {
+            byteset: ApproximateByteSet::new(b""),
+            critical_pos: 0,
+            shift: Shift::Large { shift: 0 },
+        }
+    }
+}
+
+/// A representation of the amount we're allowed to shift by during Two-Way
+/// search.
+///
+/// When computing a critical factorization of the needle, we find the position
+/// of the critical factorization by finding the needle's maximal (or minimal)
+/// suffix, along with the period of that suffix. It turns out that the period
+/// of that suffix is a lower bound on the period of the needle itself.
+///
+/// This lower bound is equivalent to the actual period of the needle in
+/// some cases. To describe that case, we denote the needle as `x` where
+/// `x = uv` and `v` is the lexicographic maximal suffix of `v`. The lower
+/// bound given here is always the period of `v`, which is `<= period(x)`. The
+/// case where `period(v) == period(x)` occurs when `len(u) < (len(x) / 2)` and
+/// where `u` is a suffix of `v[0..period(v)]`.
+///
+/// This case is important because the search algorithm for when the
+/// periods are equivalent is slightly different than the search algorithm
+/// for when the periods are not equivalent. In particular, when they aren't
+/// equivalent, we know that the period of the needle is no less than half its
+/// length. In this case, we shift by an amount less than or equal to the
+/// period of the needle (determined by the maximum length of the components
+/// of the critical factorization of `x`, i.e., `max(len(u), len(v))`)..
+///
+/// The above two cases are represented by the variants below. Each entails
+/// a different instantiation of the Two-Way search algorithm.
+///
+/// N.B. If we could find a way to compute the exact period in all cases,
+/// then we could collapse this case analysis and simplify the algorithm. The
+/// Two-Way paper suggests this is possible, but more reading is required to
+/// grok why the authors didn't pursue that path.
+#[derive(Clone, Copy, Debug)]
+enum Shift {
+    Small { period: usize },
+    Large { shift: usize },
+}
+
+impl Shift {
+    /// Compute the shift for a given needle in the forward direction.
+    ///
+    /// This requires a lower bound on the period and a critical position.
+    /// These can be computed by extracting both the minimal and maximal
+    /// lexicographic suffixes, and choosing the right-most starting position.
+    /// The lower bound on the period is then the period of the chosen suffix.
+    fn forward(
+        needle: &[u8],
+        period_lower_bound: usize,
+        critical_pos: usize,
+    ) -> Shift {
+        let large = cmp::max(critical_pos, needle.len() - critical_pos);
+        if critical_pos * 2 >= needle.len() {
+            return Shift::Large { shift: large };
+        }
+
+        let (u, v) = needle.split_at(critical_pos);
+        if !util::is_suffix(&v[..period_lower_bound], u) {
+            return Shift::Large { shift: large };
+        }
+        Shift::Small { period: period_lower_bound }
+    }
+
+    /// Compute the shift for a given needle in the reverse direction.
+    ///
+    /// This requires a lower bound on the period and a critical position.
+    /// These can be computed by extracting both the minimal and maximal
+    /// lexicographic suffixes, and choosing the left-most starting position.
+    /// The lower bound on the period is then the period of the chosen suffix.
+    fn reverse(
+        needle: &[u8],
+        period_lower_bound: usize,
+        critical_pos: usize,
+    ) -> Shift {
+        let large = cmp::max(critical_pos, needle.len() - critical_pos);
+        if (needle.len() - critical_pos) * 2 >= needle.len() {
+            return Shift::Large { shift: large };
+        }
+
+        let (v, u) = needle.split_at(critical_pos);
+        if !util::is_prefix(&v[v.len() - period_lower_bound..], u) {
+            return Shift::Large { shift: large };
+        }
+        Shift::Small { period: period_lower_bound }
+    }
+}
+
+/// A suffix extracted from a needle along with its period.
+#[derive(Debug)]
+struct Suffix {
+    /// The starting position of this suffix.
+    ///
+    /// If this is a forward suffix, then `&bytes[pos..]` can be used. If this
+    /// is a reverse suffix, then `&bytes[..pos]` can be used. That is, for
+    /// forward suffixes, this is an inclusive starting position, where as for
+    /// reverse suffixes, this is an exclusive ending position.
+    pos: usize,
+    /// The period of this suffix.
+    ///
+    /// Note that this is NOT necessarily the period of the string from which
+    /// this suffix comes from. (It is always less than or equal to the period
+    /// of the original string.)
+    period: usize,
+}
+
+impl Suffix {
+    fn forward(needle: &[u8], kind: SuffixKind) -> Suffix {
+        debug_assert!(!needle.is_empty());
+
+        // suffix represents our maximal (or minimal) suffix, along with
+        // its period.
+        let mut suffix = Suffix { pos: 0, period: 1 };
+        // The start of a suffix in `needle` that we are considering as a
+        // more maximal (or minimal) suffix than what's in `suffix`.
+        let mut candidate_start = 1;
+        // The current offset of our suffixes that we're comparing.
+        //
+        // When the characters at this offset are the same, then we mush on
+        // to the next position since no decision is possible. When the
+        // candidate's character is greater (or lesser) than the corresponding
+        // character than our current maximal (or minimal) suffix, then the
+        // current suffix is changed over to the candidate and we restart our
+        // search. Otherwise, the candidate suffix is no good and we restart
+        // our search on the next candidate.
+        //
+        // The three cases above correspond to the three cases in the loop
+        // below.
+        let mut offset = 0;
+
+        while candidate_start + offset < needle.len() {
+            let current = needle[suffix.pos + offset];
+            let candidate = needle[candidate_start + offset];
+            match kind.cmp(current, candidate) {
+                SuffixOrdering::Accept => {
+                    suffix = Suffix { pos: candidate_start, period: 1 };
+                    candidate_start += 1;
+                    offset = 0;
+                }
+                SuffixOrdering::Skip => {
+                    candidate_start += offset + 1;
+                    offset = 0;
+                    suffix.period = candidate_start - suffix.pos;
+                }
+                SuffixOrdering::Push => {
+                    if offset + 1 == suffix.period {
+                        candidate_start += suffix.period;
+                        offset = 0;
+                    } else {
+                        offset += 1;
+                    }
+                }
+            }
+        }
+        suffix
+    }
+
+    fn reverse(needle: &[u8], kind: SuffixKind) -> Suffix {
+        debug_assert!(!needle.is_empty());
+
+        // See the comments in `forward` for how this works.
+        let mut suffix = Suffix { pos: needle.len(), period: 1 };
+        if needle.len() == 1 {
+            return suffix;
+        }
+        let mut candidate_start = needle.len() - 1;
+        let mut offset = 0;
+
+        while offset < candidate_start {
+            let current = needle[suffix.pos - offset - 1];
+            let candidate = needle[candidate_start - offset - 1];
+            match kind.cmp(current, candidate) {
+                SuffixOrdering::Accept => {
+                    suffix = Suffix { pos: candidate_start, period: 1 };
+                    candidate_start -= 1;
+                    offset = 0;
+                }
+                SuffixOrdering::Skip => {
+                    candidate_start -= offset + 1;
+                    offset = 0;
+                    suffix.period = suffix.pos - candidate_start;
+                }
+                SuffixOrdering::Push => {
+                    if offset + 1 == suffix.period {
+                        candidate_start -= suffix.period;
+                        offset = 0;
+                    } else {
+                        offset += 1;
+                    }
+                }
+            }
+        }
+        suffix
+    }
+}
+
+/// The kind of suffix to extract.
+#[derive(Clone, Copy, Debug)]
+enum SuffixKind {
+    /// Extract the smallest lexicographic suffix from a string.
+    ///
+    /// Technically, this doesn't actually pick the smallest lexicographic
+    /// suffix. e.g., Given the choice between `a` and `aa`, this will choose
+    /// the latter over the former, even though `a < aa`. The reasoning for
+    /// this isn't clear from the paper, but it still smells like a minimal
+    /// suffix.
+    Minimal,
+    /// Extract the largest lexicographic suffix from a string.
+    ///
+    /// Unlike `Minimal`, this really does pick the maximum suffix. e.g., Given
+    /// the choice between `z` and `zz`, this will choose the latter over the
+    /// former.
+    Maximal,
+}
+
+/// The result of comparing corresponding bytes between two suffixes.
+#[derive(Clone, Copy, Debug)]
+enum SuffixOrdering {
+    /// This occurs when the given candidate byte indicates that the candidate
+    /// suffix is better than the current maximal (or minimal) suffix. That is,
+    /// the current candidate suffix should supplant the current maximal (or
+    /// minimal) suffix.
+    Accept,
+    /// This occurs when the given candidate byte excludes the candidate suffix
+    /// from being better than the current maximal (or minimal) suffix. That
+    /// is, the current candidate suffix should be dropped and the next one
+    /// should be considered.
+    Skip,
+    /// This occurs when no decision to accept or skip the candidate suffix
+    /// can be made, e.g., when corresponding bytes are equivalent. In this
+    /// case, the next corresponding bytes should be compared.
+    Push,
+}
+
+impl SuffixKind {
+    /// Returns true if and only if the given candidate byte indicates that
+    /// it should replace the current suffix as the maximal (or minimal)
+    /// suffix.
+    fn cmp(self, current: u8, candidate: u8) -> SuffixOrdering {
+        use self::SuffixOrdering::*;
+
+        match self {
+            SuffixKind::Minimal if candidate < current => Accept,
+            SuffixKind::Minimal if candidate > current => Skip,
+            SuffixKind::Minimal => Push,
+            SuffixKind::Maximal if candidate > current => Accept,
+            SuffixKind::Maximal if candidate < current => Skip,
+            SuffixKind::Maximal => Push,
+        }
+    }
+}
+
+/// A bitset used to track whether a particular byte exists in a needle or not.
+///
+/// Namely, bit 'i' is set if and only if byte%64==i for any byte in the
+/// needle. If a particular byte in the haystack is NOT in this set, then one
+/// can conclude that it is also not in the needle, and thus, one can advance
+/// in the haystack by needle.len() bytes.
+#[derive(Clone, Copy, Debug)]
+struct ApproximateByteSet(u64);
+
+impl ApproximateByteSet {
+    /// Create a new set from the given needle.
+    fn new(needle: &[u8]) -> ApproximateByteSet {
+        let mut bits = 0;
+        for &b in needle {
+            bits |= 1 << (b % 64);
+        }
+        ApproximateByteSet(bits)
+    }
+
+    /// Return true if and only if the given byte might be in this set. This
+    /// may return a false positive, but will never return a false negative.
+    #[inline(always)]
+    fn contains(&self, byte: u8) -> bool {
+        self.0 & (1 << (byte % 64)) != 0
+    }
+}
+
+#[cfg(all(test, feature = "std", not(miri)))]
+mod tests {
+    use quickcheck::quickcheck;
+
+    use super::*;
+
+    define_memmem_quickcheck_tests!(
+        super::simpletests::twoway_find,
+        super::simpletests::twoway_rfind
+    );
+
+    /// Convenience wrapper for computing the suffix as a byte string.
+    fn get_suffix_forward(needle: &[u8], kind: SuffixKind) -> (&[u8], usize) {
+        let s = Suffix::forward(needle, kind);
+        (&needle[s.pos..], s.period)
+    }
+
+    /// Convenience wrapper for computing the reverse suffix as a byte string.
+    fn get_suffix_reverse(needle: &[u8], kind: SuffixKind) -> (&[u8], usize) {
+        let s = Suffix::reverse(needle, kind);
+        (&needle[..s.pos], s.period)
+    }
+
+    /// Return all of the non-empty suffixes in the given byte string.
+    fn suffixes(bytes: &[u8]) -> Vec<&[u8]> {
+        (0..bytes.len()).map(|i| &bytes[i..]).collect()
+    }
+
+    /// Return the lexicographically maximal suffix of the given byte string.
+    fn naive_maximal_suffix_forward(needle: &[u8]) -> &[u8] {
+        let mut sufs = suffixes(needle);
+        sufs.sort();
+        sufs.pop().unwrap()
+    }
+
+    /// Return the lexicographically maximal suffix of the reverse of the given
+    /// byte string.
+    fn naive_maximal_suffix_reverse(needle: &[u8]) -> Vec<u8> {
+        let mut reversed = needle.to_vec();
+        reversed.reverse();
+        let mut got = naive_maximal_suffix_forward(&reversed).to_vec();
+        got.reverse();
+        got
+    }
+
+    #[test]
+    fn suffix_forward() {
+        macro_rules! assert_suffix_min {
+            ($given:expr, $expected:expr, $period:expr) => {
+                let (got_suffix, got_period) =
+                    get_suffix_forward($given.as_bytes(), SuffixKind::Minimal);
+                let got_suffix = std::str::from_utf8(got_suffix).unwrap();
+                assert_eq!(($expected, $period), (got_suffix, got_period));
+            };
+        }
+
+        macro_rules! assert_suffix_max {
+            ($given:expr, $expected:expr, $period:expr) => {
+                let (got_suffix, got_period) =
+                    get_suffix_forward($given.as_bytes(), SuffixKind::Maximal);
+                let got_suffix = std::str::from_utf8(got_suffix).unwrap();
+                assert_eq!(($expected, $period), (got_suffix, got_period));
+            };
+        }
+
+        assert_suffix_min!("a", "a", 1);
+        assert_suffix_max!("a", "a", 1);
+
+        assert_suffix_min!("ab", "ab", 2);
+        assert_suffix_max!("ab", "b", 1);
+
+        assert_suffix_min!("ba", "a", 1);
+        assert_suffix_max!("ba", "ba", 2);
+
+        assert_suffix_min!("abc", "abc", 3);
+        assert_suffix_max!("abc", "c", 1);
+
+        assert_suffix_min!("acb", "acb", 3);
+        assert_suffix_max!("acb", "cb", 2);
+
+        assert_suffix_min!("cba", "a", 1);
+        assert_suffix_max!("cba", "cba", 3);
+
+        assert_suffix_min!("abcabc", "abcabc", 3);
+        assert_suffix_max!("abcabc", "cabc", 3);
+
+        assert_suffix_min!("abcabcabc", "abcabcabc", 3);
+        assert_suffix_max!("abcabcabc", "cabcabc", 3);
+
+        assert_suffix_min!("abczz", "abczz", 5);
+        assert_suffix_max!("abczz", "zz", 1);
+
+        assert_suffix_min!("zzabc", "abc", 3);
+        assert_suffix_max!("zzabc", "zzabc", 5);
+
+        assert_suffix_min!("aaa", "aaa", 1);
+        assert_suffix_max!("aaa", "aaa", 1);
+
+        assert_suffix_min!("foobar", "ar", 2);
+        assert_suffix_max!("foobar", "r", 1);
+    }
+
+    #[test]
+    fn suffix_reverse() {
+        macro_rules! assert_suffix_min {
+            ($given:expr, $expected:expr, $period:expr) => {
+                let (got_suffix, got_period) =
+                    get_suffix_reverse($given.as_bytes(), SuffixKind::Minimal);
+                let got_suffix = std::str::from_utf8(got_suffix).unwrap();
+                assert_eq!(($expected, $period), (got_suffix, got_period));
+            };
+        }
+
+        macro_rules! assert_suffix_max {
+            ($given:expr, $expected:expr, $period:expr) => {
+                let (got_suffix, got_period) =
+                    get_suffix_reverse($given.as_bytes(), SuffixKind::Maximal);
+                let got_suffix = std::str::from_utf8(got_suffix).unwrap();
+                assert_eq!(($expected, $period), (got_suffix, got_period));
+            };
+        }
+
+        assert_suffix_min!("a", "a", 1);
+        assert_suffix_max!("a", "a", 1);
+
+        assert_suffix_min!("ab", "a", 1);
+        assert_suffix_max!("ab", "ab", 2);
+
+        assert_suffix_min!("ba", "ba", 2);
+        assert_suffix_max!("ba", "b", 1);
+
+        assert_suffix_min!("abc", "a", 1);
+        assert_suffix_max!("abc", "abc", 3);
+
+        assert_suffix_min!("acb", "a", 1);
+        assert_suffix_max!("acb", "ac", 2);
+
+        assert_suffix_min!("cba", "cba", 3);
+        assert_suffix_max!("cba", "c", 1);
+
+        assert_suffix_min!("abcabc", "abca", 3);
+        assert_suffix_max!("abcabc", "abcabc", 3);
+
+        assert_suffix_min!("abcabcabc", "abcabca", 3);
+        assert_suffix_max!("abcabcabc", "abcabcabc", 3);
+
+        assert_suffix_min!("abczz", "a", 1);
+        assert_suffix_max!("abczz", "abczz", 5);
+
+        assert_suffix_min!("zzabc", "zza", 3);
+        assert_suffix_max!("zzabc", "zz", 1);
+
+        assert_suffix_min!("aaa", "aaa", 1);
+        assert_suffix_max!("aaa", "aaa", 1);
+    }
+
+    quickcheck! {
+        fn qc_suffix_forward_maximal(bytes: Vec<u8>) -> bool {
+            if bytes.is_empty() {
+                return true;
+            }
+
+            let (got, _) = get_suffix_forward(&bytes, SuffixKind::Maximal);
+            let expected = naive_maximal_suffix_forward(&bytes);
+            got == expected
+        }
+
+        fn qc_suffix_reverse_maximal(bytes: Vec<u8>) -> bool {
+            if bytes.is_empty() {
+                return true;
+            }
+
+            let (got, _) = get_suffix_reverse(&bytes, SuffixKind::Maximal);
+            let expected = naive_maximal_suffix_reverse(&bytes);
+            expected == got
+        }
+    }
+}
+
+#[cfg(test)]
+mod simpletests {
+    use super::*;
+
+    pub(crate) fn twoway_find(
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        Forward::new(needle).find_general(None, haystack, needle)
+    }
+
+    pub(crate) fn twoway_rfind(
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        Reverse::new(needle).rfind_general(haystack, needle)
+    }
+
+    define_memmem_simple_tests!(twoway_find, twoway_rfind);
+
+    // This is a regression test caught by quickcheck that exercised a bug in
+    // the reverse small period handling. The bug was that we were using 'if j
+    // == shift' to determine if a match occurred, but the correct guard is 'if
+    // j >= shift', which matches the corresponding guard in the forward impl.
+    #[test]
+    fn regression_rev_small_period() {
+        let rfind = super::simpletests::twoway_rfind;
+        let haystack = "ababaz";
+        let needle = "abab";
+        assert_eq!(Some(0), rfind(haystack.as_bytes(), needle.as_bytes()));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/util.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,88 @@
+// These routines are meant to be optimized specifically for low latency as
+// compared to the equivalent routines offered by std. (Which may invoke the
+// dynamic linker and call out to libc, which introduces a bit more latency
+// than we'd like.)
+
+/// Returns true if and only if needle is a prefix of haystack.
+#[inline(always)]
+pub(crate) fn is_prefix(haystack: &[u8], needle: &[u8]) -> bool {
+    needle.len() <= haystack.len() && memcmp(&haystack[..needle.len()], needle)
+}
+
+/// Returns true if and only if needle is a suffix of haystack.
+#[inline(always)]
+pub(crate) fn is_suffix(haystack: &[u8], needle: &[u8]) -> bool {
+    needle.len() <= haystack.len()
+        && memcmp(&haystack[haystack.len() - needle.len()..], needle)
+}
+
+/// Return true if and only if x.len() == y.len() && x[i] == y[i] for all
+/// 0 <= i < x.len().
+///
+/// Why not just use actual memcmp for this? Well, memcmp requires calling out
+/// to libc, and this routine is called in fairly hot code paths. Other than
+/// just calling out to libc, it also seems to result in worse codegen. By
+/// rolling our own memcmp in pure Rust, it seems to appear more friendly to
+/// the optimizer.
+///
+/// We mark this as inline always, although, some callers may not want it
+/// inlined for better codegen (like Rabin-Karp). In that case, callers are
+/// advised to create a non-inlineable wrapper routine that calls memcmp.
+#[inline(always)]
+pub(crate) fn memcmp(x: &[u8], y: &[u8]) -> bool {
+    if x.len() != y.len() {
+        return false;
+    }
+    // If we don't have enough bytes to do 4-byte at a time loads, then
+    // fall back to the naive slow version.
+    //
+    // TODO: We could do a copy_nonoverlapping combined with a mask instead
+    // of a loop. Benchmark it.
+    if x.len() < 4 {
+        for (&b1, &b2) in x.iter().zip(y) {
+            if b1 != b2 {
+                return false;
+            }
+        }
+        return true;
+    }
+    // When we have 4 or more bytes to compare, then proceed in chunks of 4 at
+    // a time using unaligned loads.
+    //
+    // Also, why do 4 byte loads instead of, say, 8 byte loads? The reason is
+    // that this particular version of memcmp is likely to be called with tiny
+    // needles. That means that if we do 8 byte loads, then a higher proportion
+    // of memcmp calls will use the slower variant above. With that said, this
+    // is a hypothesis and is only loosely supported by benchmarks. There's
+    // likely some improvement that could be made here. The main thing here
+    // though is to optimize for latency, not throughput.
+
+    // SAFETY: Via the conditional above, we know that both `px` and `py`
+    // have the same length, so `px < pxend` implies that `py < pyend`.
+    // Thus, derefencing both `px` and `py` in the loop below is safe.
+    //
+    // Moreover, we set `pxend` and `pyend` to be 4 bytes before the actual
+    // end of of `px` and `py`. Thus, the final dereference outside of the
+    // loop is guaranteed to be valid. (The final comparison will overlap with
+    // the last comparison done in the loop for lengths that aren't multiples
+    // of four.)
+    //
+    // Finally, we needn't worry about alignment here, since we do unaligned
+    // loads.
+    unsafe {
+        let (mut px, mut py) = (x.as_ptr(), y.as_ptr());
+        let (pxend, pyend) = (px.add(x.len() - 4), py.add(y.len() - 4));
+        while px < pxend {
+            let vx = (px as *const u32).read_unaligned();
+            let vy = (py as *const u32).read_unaligned();
+            if vx != vy {
+                return false;
+            }
+            px = px.add(4);
+            py = py.add(4);
+        }
+        let vx = (pxend as *const u32).read_unaligned();
+        let vy = (pyend as *const u32).read_unaligned();
+        vx == vy
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/vector.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/vector.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/vector.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/vector.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,98 @@
+/// A trait for describing vector operations used by vectorized searchers.
+///
+/// The trait is highly constrained to low level vector operations needed. In
+/// general, it was invented mostly to be generic over x86's __m128i and
+/// __m256i types. It's likely that once std::simd becomes a thing, we can
+/// migrate to that since the operations required are quite simple.
+///
+/// TODO: Consider moving this trait up a level and using it to implement
+/// memchr as well. The trait might need to grow one or two methods, but
+/// otherwise should be close to sufficient already.
+///
+/// # Safety
+///
+/// All methods are not safe since they are intended to be implemented using
+/// vendor intrinsics, which are also not safe. Callers must ensure that the
+/// appropriate target features are enabled in the calling function, and that
+/// the current CPU supports them. All implementations should avoid marking the
+/// routines with #[target_feature] and instead mark them as #[inline(always)]
+/// to ensure they get appropriately inlined. (inline(always) cannot be used
+/// with target_feature.)
+pub(crate) trait Vector: Copy + core::fmt::Debug {
+    /// _mm_set1_epi8 or _mm256_set1_epi8
+    unsafe fn splat(byte: u8) -> Self;
+    /// _mm_loadu_si128 or _mm256_loadu_si256
+    unsafe fn load_unaligned(data: *const u8) -> Self;
+    /// _mm_movemask_epi8 or _mm256_movemask_epi8
+    unsafe fn movemask(self) -> u32;
+    /// _mm_cmpeq_epi8 or _mm256_cmpeq_epi8
+    unsafe fn cmpeq(self, vector2: Self) -> Self;
+    /// _mm_and_si128 or _mm256_and_si256
+    unsafe fn and(self, vector2: Self) -> Self;
+}
+
+#[cfg(target_arch = "x86_64")]
+mod x86sse {
+    use super::Vector;
+    use core::arch::x86_64::*;
+
+    impl Vector for __m128i {
+        #[inline(always)]
+        unsafe fn splat(byte: u8) -> __m128i {
+            _mm_set1_epi8(byte as i8)
+        }
+
+        #[inline(always)]
+        unsafe fn load_unaligned(data: *const u8) -> __m128i {
+            _mm_loadu_si128(data as *const __m128i)
+        }
+
+        #[inline(always)]
+        unsafe fn movemask(self) -> u32 {
+            _mm_movemask_epi8(self) as u32
+        }
+
+        #[inline(always)]
+        unsafe fn cmpeq(self, vector2: Self) -> __m128i {
+            _mm_cmpeq_epi8(self, vector2)
+        }
+
+        #[inline(always)]
+        unsafe fn and(self, vector2: Self) -> __m128i {
+            _mm_and_si128(self, vector2)
+        }
+    }
+}
+
+#[cfg(all(feature = "std", target_arch = "x86_64"))]
+mod x86avx {
+    use super::Vector;
+    use core::arch::x86_64::*;
+
+    impl Vector for __m256i {
+        #[inline(always)]
+        unsafe fn splat(byte: u8) -> __m256i {
+            _mm256_set1_epi8(byte as i8)
+        }
+
+        #[inline(always)]
+        unsafe fn load_unaligned(data: *const u8) -> __m256i {
+            _mm256_loadu_si256(data as *const __m256i)
+        }
+
+        #[inline(always)]
+        unsafe fn movemask(self) -> u32 {
+            _mm256_movemask_epi8(self) as u32
+        }
+
+        #[inline(always)]
+        unsafe fn cmpeq(self, vector2: Self) -> __m256i {
+            _mm256_cmpeq_epi8(self, vector2)
+        }
+
+        #[inline(always)]
+        unsafe fn and(self, vector2: Self) -> __m256i {
+            _mm256_and_si256(self, vector2)
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/x86/avx.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/x86/avx.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/x86/avx.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/x86/avx.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,139 @@
+#[cfg(not(feature = "std"))]
+pub(crate) use self::nostd::Forward;
+#[cfg(feature = "std")]
+pub(crate) use self::std::Forward;
+
+#[cfg(feature = "std")]
+mod std {
+    use core::arch::x86_64::{__m128i, __m256i};
+
+    use crate::memmem::{genericsimd, NeedleInfo};
+
+    /// An AVX accelerated vectorized substring search routine that only works
+    /// on small needles.
+    #[derive(Clone, Copy, Debug)]
+    pub(crate) struct Forward(genericsimd::Forward);
+
+    impl Forward {
+        /// Create a new "generic simd" forward searcher. If one could not be
+        /// created from the given inputs, then None is returned.
+        pub(crate) fn new(
+            ninfo: &NeedleInfo,
+            needle: &[u8],
+        ) -> Option<Forward> {
+            if !cfg!(memchr_runtime_avx) || !is_x86_feature_detected!("avx2") {
+                return None;
+            }
+            genericsimd::Forward::new(ninfo, needle).map(Forward)
+        }
+
+        /// Returns the minimum length of haystack that is needed for this
+        /// searcher to work. Passing a haystack with a length smaller than
+        /// this will cause `find` to panic.
+        #[inline(always)]
+        pub(crate) fn min_haystack_len(&self) -> usize {
+            self.0.min_haystack_len::<__m128i>()
+        }
+
+        #[inline(always)]
+        pub(crate) fn find(
+            &self,
+            haystack: &[u8],
+            needle: &[u8],
+        ) -> Option<usize> {
+            // SAFETY: The only way a Forward value can exist is if the avx2
+            // target feature is enabled. This is the only safety requirement
+            // for calling the genericsimd searcher.
+            unsafe { self.find_impl(haystack, needle) }
+        }
+
+        /// The implementation of find marked with the appropriate target
+        /// feature.
+        ///
+        /// # Safety
+        ///
+        /// Callers must ensure that the avx2 CPU feature is enabled in the
+        /// current environment.
+        #[target_feature(enable = "avx2")]
+        unsafe fn find_impl(
+            &self,
+            haystack: &[u8],
+            needle: &[u8],
+        ) -> Option<usize> {
+            if haystack.len() < self.0.min_haystack_len::<__m256i>() {
+                genericsimd::fwd_find::<__m128i>(&self.0, haystack, needle)
+            } else {
+                genericsimd::fwd_find::<__m256i>(&self.0, haystack, needle)
+            }
+        }
+    }
+}
+
+// We still define the avx "forward" type on nostd to make caller code a bit
+// simpler. This avoids needing a lot more conditional compilation.
+#[cfg(not(feature = "std"))]
+mod nostd {
+    use crate::memmem::NeedleInfo;
+
+    #[derive(Clone, Copy, Debug)]
+    pub(crate) struct Forward(());
+
+    impl Forward {
+        pub(crate) fn new(
+            ninfo: &NeedleInfo,
+            needle: &[u8],
+        ) -> Option<Forward> {
+            None
+        }
+
+        pub(crate) fn min_haystack_len(&self) -> usize {
+            unreachable!()
+        }
+
+        pub(crate) fn find(
+            &self,
+            haystack: &[u8],
+            needle: &[u8],
+        ) -> Option<usize> {
+            unreachable!()
+        }
+    }
+}
+
+#[cfg(all(test, feature = "std", not(miri)))]
+mod tests {
+    use crate::memmem::{prefilter::PrefilterState, NeedleInfo};
+
+    fn find(
+        _: &mut PrefilterState,
+        ninfo: &NeedleInfo,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        super::Forward::new(ninfo, needle).unwrap().find(haystack, needle)
+    }
+
+    #[test]
+    fn prefilter_permutations() {
+        use crate::memmem::prefilter::tests::PrefilterTest;
+
+        if !is_x86_feature_detected!("avx2") {
+            return;
+        }
+        // SAFETY: The safety of find only requires that the current CPU
+        // support AVX2, which we checked above.
+        unsafe {
+            PrefilterTest::run_all_tests_filter(find, |t| {
+                // This substring searcher only works on certain configs, so
+                // filter our tests such that Forward::new will be guaranteed
+                // to succeed. (And also remove tests with a haystack that is
+                // too small.)
+                let fwd = match super::Forward::new(&t.ninfo, &t.needle) {
+                    None => return false,
+                    Some(fwd) => fwd,
+                };
+                t.haystack.len() >= fwd.min_haystack_len()
+            })
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/x86/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/x86/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/x86/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/x86/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2 @@
+pub(crate) mod avx;
+pub(crate) mod sse;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/x86/sse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/x86/sse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/memmem/x86/sse.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/memmem/x86/sse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,89 @@
+use core::arch::x86_64::__m128i;
+
+use crate::memmem::{genericsimd, NeedleInfo};
+
+/// An SSE accelerated vectorized substring search routine that only works on
+/// small needles.
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct Forward(genericsimd::Forward);
+
+impl Forward {
+    /// Create a new "generic simd" forward searcher. If one could not be
+    /// created from the given inputs, then None is returned.
+    pub(crate) fn new(ninfo: &NeedleInfo, needle: &[u8]) -> Option<Forward> {
+        if !cfg!(memchr_runtime_sse2) {
+            return None;
+        }
+        genericsimd::Forward::new(ninfo, needle).map(Forward)
+    }
+
+    /// Returns the minimum length of haystack that is needed for this searcher
+    /// to work. Passing a haystack with a length smaller than this will cause
+    /// `find` to panic.
+    #[inline(always)]
+    pub(crate) fn min_haystack_len(&self) -> usize {
+        self.0.min_haystack_len::<__m128i>()
+    }
+
+    #[inline(always)]
+    pub(crate) fn find(
+        &self,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        // SAFETY: sse2 is enabled on all x86_64 targets, so this is always
+        // safe to call.
+        unsafe { self.find_impl(haystack, needle) }
+    }
+
+    /// The implementation of find marked with the appropriate target feature.
+    ///
+    /// # Safety
+    ///
+    /// This is safe to call in all cases since sse2 is guaranteed to be part
+    /// of x86_64. It is marked as unsafe because of the target feature
+    /// attribute.
+    #[target_feature(enable = "sse2")]
+    unsafe fn find_impl(
+        &self,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        genericsimd::fwd_find::<__m128i>(&self.0, haystack, needle)
+    }
+}
+
+#[cfg(all(test, feature = "std", not(miri)))]
+mod tests {
+    use crate::memmem::{prefilter::PrefilterState, NeedleInfo};
+
+    fn find(
+        _: &mut PrefilterState,
+        ninfo: &NeedleInfo,
+        haystack: &[u8],
+        needle: &[u8],
+    ) -> Option<usize> {
+        super::Forward::new(ninfo, needle).unwrap().find(haystack, needle)
+    }
+
+    #[test]
+    fn prefilter_permutations() {
+        use crate::memmem::prefilter::tests::PrefilterTest;
+
+        // SAFETY: sse2 is enabled on all x86_64 targets, so this is always
+        // safe to call.
+        unsafe {
+            PrefilterTest::run_all_tests_filter(find, |t| {
+                // This substring searcher only works on certain configs, so
+                // filter our tests such that Forward::new will be guaranteed
+                // to succeed. (And also remove tests with a haystack that is
+                // too small.)
+                let fwd = match super::Forward::new(&t.ninfo, &t.needle) {
+                    None => return false,
+                    Some(fwd) => fwd,
+                };
+                t.haystack.len() >= fwd.min_haystack_len()
+            })
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/naive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/naive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/naive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/naive.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-#![allow(dead_code)]
-
-pub fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    haystack.iter().position(|&b| b == n1)
-}
-
-pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    haystack.iter().position(|&b| b == n1 || b == n2)
-}
-
-pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    haystack.iter().position(|&b| b == n1 || b == n2 || b == n3)
-}
-
-pub fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    haystack.iter().rposition(|&b| b == n1)
-}
-
-pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    haystack.iter().rposition(|&b| b == n1 || b == n2)
-}
-
-pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    haystack.iter().rposition(|&b| b == n1 || b == n2 || b == n3)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/iter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,229 +0,0 @@
-use tests::memchr_tests;
-use {Memchr, Memchr2, Memchr3};
-
-#[test]
-fn memchr1_iter() {
-    for test in memchr_tests() {
-        test.iter_one(false, Memchr::new);
-    }
-}
-
-#[test]
-fn memchr2_iter() {
-    for test in memchr_tests() {
-        test.iter_two(false, Memchr2::new);
-    }
-}
-
-#[test]
-fn memchr3_iter() {
-    for test in memchr_tests() {
-        test.iter_three(false, Memchr3::new);
-    }
-}
-
-#[test]
-fn memrchr1_iter() {
-    for test in memchr_tests() {
-        test.iter_one(true, |n1, corpus| Memchr::new(n1, corpus).rev());
-    }
-}
-
-#[test]
-fn memrchr2_iter() {
-    for test in memchr_tests() {
-        test.iter_two(true, |n1, n2, corpus| {
-            Memchr2::new(n1, n2, corpus).rev()
-        })
-    }
-}
-
-#[test]
-fn memrchr3_iter() {
-    for test in memchr_tests() {
-        test.iter_three(true, |n1, n2, n3, corpus| {
-            Memchr3::new(n1, n2, n3, corpus).rev()
-        })
-    }
-}
-
-quickcheck! {
-    fn qc_memchr_double_ended_iter(
-        needle: u8, data: Vec<u8>, take_side: Vec<bool>
-    ) -> bool {
-        // make nonempty
-        let mut take_side = take_side;
-        if take_side.is_empty() { take_side.push(true) };
-
-        let iter = Memchr::new(needle, &data);
-        let all_found = double_ended_take(
-            iter, take_side.iter().cycle().cloned());
-
-        all_found.iter().cloned().eq(positions1(needle, &data))
-    }
-
-    fn qc_memchr2_double_ended_iter(
-        needle1: u8, needle2: u8, data: Vec<u8>, take_side: Vec<bool>
-    ) -> bool {
-        // make nonempty
-        let mut take_side = take_side;
-        if take_side.is_empty() { take_side.push(true) };
-
-        let iter = Memchr2::new(needle1, needle2, &data);
-        let all_found = double_ended_take(
-            iter, take_side.iter().cycle().cloned());
-
-        all_found.iter().cloned().eq(positions2(needle1, needle2, &data))
-    }
-
-    fn qc_memchr3_double_ended_iter(
-        needle1: u8, needle2: u8, needle3: u8,
-        data: Vec<u8>, take_side: Vec<bool>
-    ) -> bool {
-        // make nonempty
-        let mut take_side = take_side;
-        if take_side.is_empty() { take_side.push(true) };
-
-        let iter = Memchr3::new(needle1, needle2, needle3, &data);
-        let all_found = double_ended_take(
-            iter, take_side.iter().cycle().cloned());
-
-        all_found
-            .iter()
-            .cloned()
-            .eq(positions3(needle1, needle2, needle3, &data))
-    }
-
-    fn qc_memchr1_iter(data: Vec<u8>) -> bool {
-        let needle = 0;
-        let answer = positions1(needle, &data);
-        answer.eq(Memchr::new(needle, &data))
-    }
-
-    fn qc_memchr1_rev_iter(data: Vec<u8>) -> bool {
-        let needle = 0;
-        let answer = positions1(needle, &data);
-        answer.rev().eq(Memchr::new(needle, &data).rev())
-    }
-
-    fn qc_memchr2_iter(data: Vec<u8>) -> bool {
-        let needle1 = 0;
-        let needle2 = 1;
-        let answer = positions2(needle1, needle2, &data);
-        answer.eq(Memchr2::new(needle1, needle2, &data))
-    }
-
-    fn qc_memchr2_rev_iter(data: Vec<u8>) -> bool {
-        let needle1 = 0;
-        let needle2 = 1;
-        let answer = positions2(needle1, needle2, &data);
-        answer.rev().eq(Memchr2::new(needle1, needle2, &data).rev())
-    }
-
-    fn qc_memchr3_iter(data: Vec<u8>) -> bool {
-        let needle1 = 0;
-        let needle2 = 1;
-        let needle3 = 2;
-        let answer = positions3(needle1, needle2, needle3, &data);
-        answer.eq(Memchr3::new(needle1, needle2, needle3, &data))
-    }
-
-    fn qc_memchr3_rev_iter(data: Vec<u8>) -> bool {
-        let needle1 = 0;
-        let needle2 = 1;
-        let needle3 = 2;
-        let answer = positions3(needle1, needle2, needle3, &data);
-        answer.rev().eq(Memchr3::new(needle1, needle2, needle3, &data).rev())
-    }
-
-    fn qc_memchr1_iter_size_hint(data: Vec<u8>) -> bool {
-        // test that the size hint is within reasonable bounds
-        let needle = 0;
-        let mut iter = Memchr::new(needle, &data);
-        let mut real_count = data
-            .iter()
-            .filter(|&&elt| elt == needle)
-            .count();
-
-        while let Some(index) = iter.next() {
-            real_count -= 1;
-            let (lower, upper) = iter.size_hint();
-            assert!(lower <= real_count);
-            assert!(upper.unwrap() >= real_count);
-            assert!(upper.unwrap() <= data.len() - index);
-        }
-        true
-    }
-}
-
-// take items from a DEI, taking front for each true and back for each false.
-// Return a vector with the concatenation of the fronts and the reverse of the
-// backs.
-fn double_ended_take<I, J>(mut iter: I, take_side: J) -> Vec<I::Item>
-where
-    I: DoubleEndedIterator,
-    J: Iterator<Item = bool>,
-{
-    let mut found_front = Vec::new();
-    let mut found_back = Vec::new();
-
-    for take_front in take_side {
-        if take_front {
-            if let Some(pos) = iter.next() {
-                found_front.push(pos);
-            } else {
-                break;
-            }
-        } else {
-            if let Some(pos) = iter.next_back() {
-                found_back.push(pos);
-            } else {
-                break;
-            }
-        };
-    }
-
-    let mut all_found = found_front;
-    all_found.extend(found_back.into_iter().rev());
-    all_found
-}
-
-// return an iterator of the 0-based indices of haystack that match the needle
-fn positions1<'a>(
-    n1: u8,
-    haystack: &'a [u8],
-) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
-    let it = haystack
-        .iter()
-        .enumerate()
-        .filter(move |&(_, &b)| b == n1)
-        .map(|t| t.0);
-    Box::new(it)
-}
-
-fn positions2<'a>(
-    n1: u8,
-    n2: u8,
-    haystack: &'a [u8],
-) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
-    let it = haystack
-        .iter()
-        .enumerate()
-        .filter(move |&(_, &b)| b == n1 || b == n2)
-        .map(|t| t.0);
-    Box::new(it)
-}
-
-fn positions3<'a>(
-    n1: u8,
-    n2: u8,
-    n3: u8,
-    haystack: &'a [u8],
-) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
-    let it = haystack
-        .iter()
-        .enumerate()
-        .filter(move |&(_, &b)| b == n1 || b == n2 || b == n3)
-        .map(|t| t.0);
-    Box::new(it)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/iter.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,230 @@
+use quickcheck::quickcheck;
+
+use crate::{tests::memchr::testdata::memchr_tests, Memchr, Memchr2, Memchr3};
+
+#[test]
+fn memchr1_iter() {
+    for test in memchr_tests() {
+        test.iter_one(false, Memchr::new);
+    }
+}
+
+#[test]
+fn memchr2_iter() {
+    for test in memchr_tests() {
+        test.iter_two(false, Memchr2::new);
+    }
+}
+
+#[test]
+fn memchr3_iter() {
+    for test in memchr_tests() {
+        test.iter_three(false, Memchr3::new);
+    }
+}
+
+#[test]
+fn memrchr1_iter() {
+    for test in memchr_tests() {
+        test.iter_one(true, |n1, corpus| Memchr::new(n1, corpus).rev());
+    }
+}
+
+#[test]
+fn memrchr2_iter() {
+    for test in memchr_tests() {
+        test.iter_two(true, |n1, n2, corpus| {
+            Memchr2::new(n1, n2, corpus).rev()
+        })
+    }
+}
+
+#[test]
+fn memrchr3_iter() {
+    for test in memchr_tests() {
+        test.iter_three(true, |n1, n2, n3, corpus| {
+            Memchr3::new(n1, n2, n3, corpus).rev()
+        })
+    }
+}
+
+quickcheck! {
+    fn qc_memchr_double_ended_iter(
+        needle: u8, data: Vec<u8>, take_side: Vec<bool>
+    ) -> bool {
+        // make nonempty
+        let mut take_side = take_side;
+        if take_side.is_empty() { take_side.push(true) };
+
+        let iter = Memchr::new(needle, &data);
+        let all_found = double_ended_take(
+            iter, take_side.iter().cycle().cloned());
+
+        all_found.iter().cloned().eq(positions1(needle, &data))
+    }
+
+    fn qc_memchr2_double_ended_iter(
+        needle1: u8, needle2: u8, data: Vec<u8>, take_side: Vec<bool>
+    ) -> bool {
+        // make nonempty
+        let mut take_side = take_side;
+        if take_side.is_empty() { take_side.push(true) };
+
+        let iter = Memchr2::new(needle1, needle2, &data);
+        let all_found = double_ended_take(
+            iter, take_side.iter().cycle().cloned());
+
+        all_found.iter().cloned().eq(positions2(needle1, needle2, &data))
+    }
+
+    fn qc_memchr3_double_ended_iter(
+        needle1: u8, needle2: u8, needle3: u8,
+        data: Vec<u8>, take_side: Vec<bool>
+    ) -> bool {
+        // make nonempty
+        let mut take_side = take_side;
+        if take_side.is_empty() { take_side.push(true) };
+
+        let iter = Memchr3::new(needle1, needle2, needle3, &data);
+        let all_found = double_ended_take(
+            iter, take_side.iter().cycle().cloned());
+
+        all_found
+            .iter()
+            .cloned()
+            .eq(positions3(needle1, needle2, needle3, &data))
+    }
+
+    fn qc_memchr1_iter(data: Vec<u8>) -> bool {
+        let needle = 0;
+        let answer = positions1(needle, &data);
+        answer.eq(Memchr::new(needle, &data))
+    }
+
+    fn qc_memchr1_rev_iter(data: Vec<u8>) -> bool {
+        let needle = 0;
+        let answer = positions1(needle, &data);
+        answer.rev().eq(Memchr::new(needle, &data).rev())
+    }
+
+    fn qc_memchr2_iter(data: Vec<u8>) -> bool {
+        let needle1 = 0;
+        let needle2 = 1;
+        let answer = positions2(needle1, needle2, &data);
+        answer.eq(Memchr2::new(needle1, needle2, &data))
+    }
+
+    fn qc_memchr2_rev_iter(data: Vec<u8>) -> bool {
+        let needle1 = 0;
+        let needle2 = 1;
+        let answer = positions2(needle1, needle2, &data);
+        answer.rev().eq(Memchr2::new(needle1, needle2, &data).rev())
+    }
+
+    fn qc_memchr3_iter(data: Vec<u8>) -> bool {
+        let needle1 = 0;
+        let needle2 = 1;
+        let needle3 = 2;
+        let answer = positions3(needle1, needle2, needle3, &data);
+        answer.eq(Memchr3::new(needle1, needle2, needle3, &data))
+    }
+
+    fn qc_memchr3_rev_iter(data: Vec<u8>) -> bool {
+        let needle1 = 0;
+        let needle2 = 1;
+        let needle3 = 2;
+        let answer = positions3(needle1, needle2, needle3, &data);
+        answer.rev().eq(Memchr3::new(needle1, needle2, needle3, &data).rev())
+    }
+
+    fn qc_memchr1_iter_size_hint(data: Vec<u8>) -> bool {
+        // test that the size hint is within reasonable bounds
+        let needle = 0;
+        let mut iter = Memchr::new(needle, &data);
+        let mut real_count = data
+            .iter()
+            .filter(|&&elt| elt == needle)
+            .count();
+
+        while let Some(index) = iter.next() {
+            real_count -= 1;
+            let (lower, upper) = iter.size_hint();
+            assert!(lower <= real_count);
+            assert!(upper.unwrap() >= real_count);
+            assert!(upper.unwrap() <= data.len() - index);
+        }
+        true
+    }
+}
+
+// take items from a DEI, taking front for each true and back for each false.
+// Return a vector with the concatenation of the fronts and the reverse of the
+// backs.
+fn double_ended_take<I, J>(mut iter: I, take_side: J) -> Vec<I::Item>
+where
+    I: DoubleEndedIterator,
+    J: Iterator<Item = bool>,
+{
+    let mut found_front = Vec::new();
+    let mut found_back = Vec::new();
+
+    for take_front in take_side {
+        if take_front {
+            if let Some(pos) = iter.next() {
+                found_front.push(pos);
+            } else {
+                break;
+            }
+        } else {
+            if let Some(pos) = iter.next_back() {
+                found_back.push(pos);
+            } else {
+                break;
+            }
+        };
+    }
+
+    let mut all_found = found_front;
+    all_found.extend(found_back.into_iter().rev());
+    all_found
+}
+
+// return an iterator of the 0-based indices of haystack that match the needle
+fn positions1<'a>(
+    n1: u8,
+    haystack: &'a [u8],
+) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
+    let it = haystack
+        .iter()
+        .enumerate()
+        .filter(move |&(_, &b)| b == n1)
+        .map(|t| t.0);
+    Box::new(it)
+}
+
+fn positions2<'a>(
+    n1: u8,
+    n2: u8,
+    haystack: &'a [u8],
+) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
+    let it = haystack
+        .iter()
+        .enumerate()
+        .filter(move |&(_, &b)| b == n1 || b == n2)
+        .map(|t| t.0);
+    Box::new(it)
+}
+
+fn positions3<'a>(
+    n1: u8,
+    n2: u8,
+    n3: u8,
+    haystack: &'a [u8],
+) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
+    let it = haystack
+        .iter()
+        .enumerate()
+        .filter(move |&(_, &b)| b == n1 || b == n2 || b == n3)
+        .map(|t| t.0);
+    Box::new(it)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/memchr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/memchr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/memchr.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/memchr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,134 @@
+use quickcheck::quickcheck;
+
+use crate::{
+    memchr,
+    memchr::{fallback, naive},
+    memchr2, memchr3, memrchr, memrchr2, memrchr3,
+    tests::memchr::testdata::memchr_tests,
+};
+
+#[test]
+fn memchr1_find() {
+    for test in memchr_tests() {
+        test.one(false, memchr);
+    }
+}
+
+#[test]
+fn memchr1_fallback_find() {
+    for test in memchr_tests() {
+        test.one(false, fallback::memchr);
+    }
+}
+
+#[test]
+fn memchr2_find() {
+    for test in memchr_tests() {
+        test.two(false, memchr2);
+    }
+}
+
+#[test]
+fn memchr2_fallback_find() {
+    for test in memchr_tests() {
+        test.two(false, fallback::memchr2);
+    }
+}
+
+#[test]
+fn memchr3_find() {
+    for test in memchr_tests() {
+        test.three(false, memchr3);
+    }
+}
+
+#[test]
+fn memchr3_fallback_find() {
+    for test in memchr_tests() {
+        test.three(false, fallback::memchr3);
+    }
+}
+
+#[test]
+fn memrchr1_find() {
+    for test in memchr_tests() {
+        test.one(true, memrchr);
+    }
+}
+
+#[test]
+fn memrchr1_fallback_find() {
+    for test in memchr_tests() {
+        test.one(true, fallback::memrchr);
+    }
+}
+
+#[test]
+fn memrchr2_find() {
+    for test in memchr_tests() {
+        test.two(true, memrchr2);
+    }
+}
+
+#[test]
+fn memrchr2_fallback_find() {
+    for test in memchr_tests() {
+        test.two(true, fallback::memrchr2);
+    }
+}
+
+#[test]
+fn memrchr3_find() {
+    for test in memchr_tests() {
+        test.three(true, memrchr3);
+    }
+}
+
+#[test]
+fn memrchr3_fallback_find() {
+    for test in memchr_tests() {
+        test.three(true, fallback::memrchr3);
+    }
+}
+
+quickcheck! {
+    fn qc_memchr1_matches_naive(n1: u8, corpus: Vec<u8>) -> bool {
+        memchr(n1, &corpus) == naive::memchr(n1, &corpus)
+    }
+}
+
+quickcheck! {
+    fn qc_memchr2_matches_naive(n1: u8, n2: u8, corpus: Vec<u8>) -> bool {
+        memchr2(n1, n2, &corpus) == naive::memchr2(n1, n2, &corpus)
+    }
+}
+
+quickcheck! {
+    fn qc_memchr3_matches_naive(
+        n1: u8, n2: u8, n3: u8,
+        corpus: Vec<u8>
+    ) -> bool {
+        memchr3(n1, n2, n3, &corpus) == naive::memchr3(n1, n2, n3, &corpus)
+    }
+}
+
+quickcheck! {
+    fn qc_memrchr1_matches_naive(n1: u8, corpus: Vec<u8>) -> bool {
+        memrchr(n1, &corpus) == naive::memrchr(n1, &corpus)
+    }
+}
+
+quickcheck! {
+    fn qc_memrchr2_matches_naive(n1: u8, n2: u8, corpus: Vec<u8>) -> bool {
+        memrchr2(n1, n2, &corpus) == naive::memrchr2(n1, n2, &corpus)
+    }
+}
+
+quickcheck! {
+    fn qc_memrchr3_matches_naive(
+        n1: u8, n2: u8, n3: u8,
+        corpus: Vec<u8>
+    ) -> bool {
+        memrchr3(n1, n2, n3, &corpus) == naive::memrchr3(n1, n2, n3, &corpus)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+#[cfg(all(feature = "std", not(miri)))]
+mod iter;
+#[cfg(all(feature = "std", not(miri)))]
+mod memchr;
+mod simple;
+#[cfg(all(feature = "std", not(miri)))]
+mod testdata;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/simple.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/simple.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/simple.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/simple.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+// Simple tests using MIRI. These are intended only to be a simple exercise of
+// memchr when tests are run under miri. These are mostly necessary because the
+// other tests are far more extensive and take too long to run under miri.
+//
+// These tests are also run when the 'std' feature is not enabled.
+
+use crate::{memchr, memchr2, memchr3, memrchr, memrchr2, memrchr3};
+
+#[test]
+fn simple() {
+    assert_eq!(memchr(b'a', b"abcda"), Some(0));
+    assert_eq!(memchr(b'z', b"abcda"), None);
+    assert_eq!(memchr2(b'a', b'z', b"abcda"), Some(0));
+    assert_eq!(memchr2(b'z', b'y', b"abcda"), None);
+    assert_eq!(memchr3(b'a', b'z', b'b', b"abcda"), Some(0));
+    assert_eq!(memchr3(b'z', b'y', b'x', b"abcda"), None);
+    assert_eq!(memrchr(b'a', b"abcda"), Some(4));
+    assert_eq!(memrchr(b'z', b"abcda"), None);
+    assert_eq!(memrchr2(b'a', b'z', b"abcda"), Some(4));
+    assert_eq!(memrchr2(b'z', b'y', b"abcda"), None);
+    assert_eq!(memrchr3(b'a', b'z', b'b', b"abcda"), Some(4));
+    assert_eq!(memrchr3(b'z', b'y', b'x', b"abcda"), None);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/testdata.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/testdata.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr/testdata.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr/testdata.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,351 @@
+use std::iter::repeat;
+
+/// Create a sequence of tests that should be run by memchr implementations.
+pub fn memchr_tests() -> Vec<MemchrTest> {
+    let mut tests = Vec::new();
+    for statict in MEMCHR_TESTS {
+        assert!(!statict.corpus.contains("%"), "% is not allowed in corpora");
+        assert!(!statict.corpus.contains("#"), "# is not allowed in corpora");
+        assert!(!statict.needles.contains(&b'%'), "% is an invalid needle");
+        assert!(!statict.needles.contains(&b'#'), "# is an invalid needle");
+
+        let t = MemchrTest {
+            corpus: statict.corpus.to_string(),
+            needles: statict.needles.to_vec(),
+            positions: statict.positions.to_vec(),
+        };
+        tests.push(t.clone());
+        tests.extend(t.expand());
+    }
+    tests
+}
+
+/// A set of tests for memchr-like functions.
+///
+/// These tests mostly try to cover the short string cases. We cover the longer
+/// string cases via the benchmarks (which are tests themselves), via
+/// quickcheck tests and via automatic expansion of each test case (by
+/// increasing the corpus size). Finally, we cover different alignment cases
+/// in the tests by varying the starting point of the slice.
+const MEMCHR_TESTS: &[MemchrTestStatic] = &[
+    // one needle (applied to memchr + memchr2 + memchr3)
+    MemchrTestStatic { corpus: "a", needles: &[b'a'], positions: &[0] },
+    MemchrTestStatic { corpus: "aa", needles: &[b'a'], positions: &[0, 1] },
+    MemchrTestStatic {
+        corpus: "aaa",
+        needles: &[b'a'],
+        positions: &[0, 1, 2],
+    },
+    MemchrTestStatic { corpus: "", needles: &[b'a'], positions: &[] },
+    MemchrTestStatic { corpus: "z", needles: &[b'a'], positions: &[] },
+    MemchrTestStatic { corpus: "zz", needles: &[b'a'], positions: &[] },
+    MemchrTestStatic { corpus: "zza", needles: &[b'a'], positions: &[2] },
+    MemchrTestStatic { corpus: "zaza", needles: &[b'a'], positions: &[1, 3] },
+    MemchrTestStatic { corpus: "zzza", needles: &[b'a'], positions: &[3] },
+    MemchrTestStatic { corpus: "\x00a", needles: &[b'a'], positions: &[1] },
+    MemchrTestStatic { corpus: "\x00", needles: &[b'\x00'], positions: &[0] },
+    MemchrTestStatic {
+        corpus: "\x00\x00",
+        needles: &[b'\x00'],
+        positions: &[0, 1],
+    },
+    MemchrTestStatic {
+        corpus: "\x00a\x00",
+        needles: &[b'\x00'],
+        positions: &[0, 2],
+    },
+    MemchrTestStatic {
+        corpus: "zzzzzzzzzzzzzzzza",
+        needles: &[b'a'],
+        positions: &[16],
+    },
+    MemchrTestStatic {
+        corpus: "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzza",
+        needles: &[b'a'],
+        positions: &[32],
+    },
+    // two needles (applied to memchr2 + memchr3)
+    MemchrTestStatic {
+        corpus: "az",
+        needles: &[b'a', b'z'],
+        positions: &[0, 1],
+    },
+    MemchrTestStatic {
+        corpus: "az",
+        needles: &[b'a', b'z'],
+        positions: &[0, 1],
+    },
+    MemchrTestStatic { corpus: "az", needles: &[b'x', b'y'], positions: &[] },
+    MemchrTestStatic { corpus: "az", needles: &[b'a', b'y'], positions: &[0] },
+    MemchrTestStatic { corpus: "az", needles: &[b'x', b'z'], positions: &[1] },
+    MemchrTestStatic {
+        corpus: "yyyyaz",
+        needles: &[b'a', b'z'],
+        positions: &[4, 5],
+    },
+    MemchrTestStatic {
+        corpus: "yyyyaz",
+        needles: &[b'z', b'a'],
+        positions: &[4, 5],
+    },
+    // three needles (applied to memchr3)
+    MemchrTestStatic {
+        corpus: "xyz",
+        needles: &[b'x', b'y', b'z'],
+        positions: &[0, 1, 2],
+    },
+    MemchrTestStatic {
+        corpus: "zxy",
+        needles: &[b'x', b'y', b'z'],
+        positions: &[0, 1, 2],
+    },
+    MemchrTestStatic {
+        corpus: "zxy",
+        needles: &[b'x', b'a', b'z'],
+        positions: &[0, 1],
+    },
+    MemchrTestStatic {
+        corpus: "zxy",
+        needles: &[b't', b'a', b'z'],
+        positions: &[0],
+    },
+    MemchrTestStatic {
+        corpus: "yxz",
+        needles: &[b't', b'a', b'z'],
+        positions: &[2],
+    },
+];
+
+/// A description of a test on a memchr like function.
+#[derive(Clone, Debug)]
+pub struct MemchrTest {
+    /// The thing to search. We use `&str` instead of `&[u8]` because they
+    /// are nicer to write in tests, and we don't miss much since memchr
+    /// doesn't care about UTF-8.
+    ///
+    /// Corpora cannot contain either '%' or '#'. We use these bytes when
+    /// expanding test cases into many test cases, and we assume they are not
+    /// used. If they are used, `memchr_tests` will panic.
+    corpus: String,
+    /// The needles to search for. This is intended to be an "alternation" of
+    /// needles. The number of needles may cause this test to be skipped for
+    /// some memchr variants. For example, a test with 2 needles cannot be used
+    /// to test `memchr`, but can be used to test `memchr2` and `memchr3`.
+    /// However, a test with only 1 needle can be used to test all of `memchr`,
+    /// `memchr2` and `memchr3`. We achieve this by filling in the needles with
+    /// bytes that we never used in the corpus (such as '#').
+    needles: Vec<u8>,
+    /// The positions expected to match for all of the needles.
+    positions: Vec<usize>,
+}
+
+/// Like MemchrTest, but easier to define as a constant.
+#[derive(Clone, Debug)]
+pub struct MemchrTestStatic {
+    corpus: &'static str,
+    needles: &'static [u8],
+    positions: &'static [usize],
+}
+
+impl MemchrTest {
+    pub fn one<F: Fn(u8, &[u8]) -> Option<usize>>(&self, reverse: bool, f: F) {
+        let needles = match self.needles(1) {
+            None => return,
+            Some(needles) => needles,
+        };
+        // We test different alignments here. Since some implementations use
+        // AVX2, which can read 32 bytes at a time, we test at least that.
+        // Moreover, with loop unrolling, we sometimes process 64 (sse2) or 128
+        // (avx) bytes at a time, so we include that in our offsets as well.
+        //
+        // You might think this would cause most needles to not be found, but
+        // we actually expand our tests to include corpus sizes all the way up
+        // to >500 bytes, so we should exercise most branches.
+        for align in 0..130 {
+            let corpus = self.corpus(align);
+            assert_eq!(
+                self.positions(align, reverse).get(0).cloned(),
+                f(needles[0], corpus.as_bytes()),
+                "search for {:?} failed in: {:?} (len: {}, alignment: {})",
+                needles[0] as char,
+                corpus,
+                corpus.len(),
+                align
+            );
+        }
+    }
+
+    pub fn two<F: Fn(u8, u8, &[u8]) -> Option<usize>>(
+        &self,
+        reverse: bool,
+        f: F,
+    ) {
+        let needles = match self.needles(2) {
+            None => return,
+            Some(needles) => needles,
+        };
+        for align in 0..130 {
+            let corpus = self.corpus(align);
+            assert_eq!(
+                self.positions(align, reverse).get(0).cloned(),
+                f(needles[0], needles[1], corpus.as_bytes()),
+                "search for {:?}|{:?} failed in: {:?} \
+                 (len: {}, alignment: {})",
+                needles[0] as char,
+                needles[1] as char,
+                corpus,
+                corpus.len(),
+                align
+            );
+        }
+    }
+
+    pub fn three<F: Fn(u8, u8, u8, &[u8]) -> Option<usize>>(
+        &self,
+        reverse: bool,
+        f: F,
+    ) {
+        let needles = match self.needles(3) {
+            None => return,
+            Some(needles) => needles,
+        };
+        for align in 0..130 {
+            let corpus = self.corpus(align);
+            assert_eq!(
+                self.positions(align, reverse).get(0).cloned(),
+                f(needles[0], needles[1], needles[2], corpus.as_bytes()),
+                "search for {:?}|{:?}|{:?} failed in: {:?} \
+                 (len: {}, alignment: {})",
+                needles[0] as char,
+                needles[1] as char,
+                needles[2] as char,
+                corpus,
+                corpus.len(),
+                align
+            );
+        }
+    }
+
+    pub fn iter_one<'a, I, F>(&'a self, reverse: bool, f: F)
+    where
+        F: FnOnce(u8, &'a [u8]) -> I,
+        I: Iterator<Item = usize>,
+    {
+        if let Some(ns) = self.needles(1) {
+            self.iter(reverse, f(ns[0], self.corpus.as_bytes()));
+        }
+    }
+
+    pub fn iter_two<'a, I, F>(&'a self, reverse: bool, f: F)
+    where
+        F: FnOnce(u8, u8, &'a [u8]) -> I,
+        I: Iterator<Item = usize>,
+    {
+        if let Some(ns) = self.needles(2) {
+            self.iter(reverse, f(ns[0], ns[1], self.corpus.as_bytes()));
+        }
+    }
+
+    pub fn iter_three<'a, I, F>(&'a self, reverse: bool, f: F)
+    where
+        F: FnOnce(u8, u8, u8, &'a [u8]) -> I,
+        I: Iterator<Item = usize>,
+    {
+        if let Some(ns) = self.needles(3) {
+            self.iter(reverse, f(ns[0], ns[1], ns[2], self.corpus.as_bytes()));
+        }
+    }
+
+    /// Test that the positions yielded by the given iterator match the
+    /// positions in this test. If reverse is true, then reverse the positions
+    /// before comparing them.
+    fn iter<I: Iterator<Item = usize>>(&self, reverse: bool, it: I) {
+        assert_eq!(
+            self.positions(0, reverse),
+            it.collect::<Vec<usize>>(),
+            r"search for {:?} failed in: {:?}",
+            self.needles.iter().map(|&b| b as char).collect::<Vec<char>>(),
+            self.corpus
+        );
+    }
+
+    /// Expand this test into many variations of the same test.
+    ///
+    /// In particular, this will generate more tests with larger corpus sizes.
+    /// The expected positions are updated to maintain the integrity of the
+    /// test.
+    ///
+    /// This is important in testing a memchr implementation, because there are
+    /// often different cases depending on the length of the corpus.
+    ///
+    /// Note that we extend the corpus by adding `%` bytes, which we
+    /// don't otherwise use as a needle.
+    fn expand(&self) -> Vec<MemchrTest> {
+        let mut more = Vec::new();
+
+        // Add bytes to the start of the corpus.
+        for i in 1..515 {
+            let mut t = self.clone();
+            let mut new_corpus: String = repeat('%').take(i).collect();
+            new_corpus.push_str(&t.corpus);
+            t.corpus = new_corpus;
+            t.positions = t.positions.into_iter().map(|p| p + i).collect();
+            more.push(t);
+        }
+        // Add bytes to the end of the corpus.
+        for i in 1..515 {
+            let mut t = self.clone();
+            let padding: String = repeat('%').take(i).collect();
+            t.corpus.push_str(&padding);
+            more.push(t);
+        }
+
+        more
+    }
+
+    /// Return the corpus at the given alignment.
+    ///
+    /// If the alignment exceeds the length of the corpus, then this returns
+    /// an empty slice.
+    fn corpus(&self, align: usize) -> &str {
+        self.corpus.get(align..).unwrap_or("")
+    }
+
+    /// Return exactly `count` needles from this test. If this test has less
+    /// than `count` needles, then add `#` until the number of needles
+    /// matches `count`. If this test has more than `count` needles, then
+    /// return `None` (because there is no way to use this test data for a
+    /// search using fewer needles).
+    fn needles(&self, count: usize) -> Option<Vec<u8>> {
+        if self.needles.len() > count {
+            return None;
+        }
+
+        let mut needles = self.needles.to_vec();
+        for _ in needles.len()..count {
+            // we assume # is never used in tests.
+            needles.push(b'#');
+        }
+        Some(needles)
+    }
+
+    /// Return the positions in this test, reversed if `reverse` is true.
+    ///
+    /// If alignment is given, then all positions greater than or equal to that
+    /// alignment are offset by the alignment. Positions less than the
+    /// alignment are dropped.
+    fn positions(&self, align: usize, reverse: bool) -> Vec<usize> {
+        let positions = if reverse {
+            let mut positions = self.positions.to_vec();
+            positions.reverse();
+            positions
+        } else {
+            self.positions.to_vec()
+        };
+        positions
+            .into_iter()
+            .filter(|&p| p >= align)
+            .map(|p| p - align)
+            .collect()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/memchr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/memchr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-use fallback;
-use naive;
-use {memchr, memchr2, memchr3, memrchr, memrchr2, memrchr3};
-
-use tests::memchr_tests;
-
-#[test]
-fn memchr1_find() {
-    for test in memchr_tests() {
-        test.one(false, memchr);
-    }
-}
-
-#[test]
-fn memchr1_fallback_find() {
-    for test in memchr_tests() {
-        test.one(false, fallback::memchr);
-    }
-}
-
-#[test]
-fn memchr2_find() {
-    for test in memchr_tests() {
-        test.two(false, memchr2);
-    }
-}
-
-#[test]
-fn memchr2_fallback_find() {
-    for test in memchr_tests() {
-        test.two(false, fallback::memchr2);
-    }
-}
-
-#[test]
-fn memchr3_find() {
-    for test in memchr_tests() {
-        test.three(false, memchr3);
-    }
-}
-
-#[test]
-fn memchr3_fallback_find() {
-    for test in memchr_tests() {
-        test.three(false, fallback::memchr3);
-    }
-}
-
-#[test]
-fn memrchr1_find() {
-    for test in memchr_tests() {
-        test.one(true, memrchr);
-    }
-}
-
-#[test]
-fn memrchr1_fallback_find() {
-    for test in memchr_tests() {
-        test.one(true, fallback::memrchr);
-    }
-}
-
-#[test]
-fn memrchr2_find() {
-    for test in memchr_tests() {
-        test.two(true, memrchr2);
-    }
-}
-
-#[test]
-fn memrchr2_fallback_find() {
-    for test in memchr_tests() {
-        test.two(true, fallback::memrchr2);
-    }
-}
-
-#[test]
-fn memrchr3_find() {
-    for test in memchr_tests() {
-        test.three(true, memrchr3);
-    }
-}
-
-#[test]
-fn memrchr3_fallback_find() {
-    for test in memchr_tests() {
-        test.three(true, fallback::memrchr3);
-    }
-}
-
-quickcheck! {
-    fn qc_memchr1_matches_naive(n1: u8, corpus: Vec<u8>) -> bool {
-        memchr(n1, &corpus) == naive::memchr(n1, &corpus)
-    }
-}
-
-quickcheck! {
-    fn qc_memchr2_matches_naive(n1: u8, n2: u8, corpus: Vec<u8>) -> bool {
-        memchr2(n1, n2, &corpus) == naive::memchr2(n1, n2, &corpus)
-    }
-}
-
-quickcheck! {
-    fn qc_memchr3_matches_naive(
-        n1: u8, n2: u8, n3: u8,
-        corpus: Vec<u8>
-    ) -> bool {
-        memchr3(n1, n2, n3, &corpus) == naive::memchr3(n1, n2, n3, &corpus)
-    }
-}
-
-quickcheck! {
-    fn qc_memrchr1_matches_naive(n1: u8, corpus: Vec<u8>) -> bool {
-        memrchr(n1, &corpus) == naive::memrchr(n1, &corpus)
-    }
-}
-
-quickcheck! {
-    fn qc_memrchr2_matches_naive(n1: u8, n2: u8, corpus: Vec<u8>) -> bool {
-        memrchr2(n1, n2, &corpus) == naive::memrchr2(n1, n2, &corpus)
-    }
-}
-
-quickcheck! {
-    fn qc_memrchr3_matches_naive(
-        n1: u8, n2: u8, n3: u8,
-        corpus: Vec<u8>
-    ) -> bool {
-        memrchr3(n1, n2, n3, &corpus) == naive::memrchr3(n1, n2, n3, &corpus)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/miri.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/miri.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/miri.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/miri.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// Simple tests using MIRI
-
-use crate::{memchr, memchr2, memchr3, memrchr, memrchr2, memrchr3};
-
-#[test]
-fn test_with_miri() {
-    assert_eq!(memchr(b'a', b"abcda"), Some(0));
-    assert_eq!(memchr(b'z', b"abcda"), None);
-    assert_eq!(memchr2(b'a', b'z', b"abcda"), Some(0));
-    assert_eq!(memchr2(b'z', b'y', b"abcda"), None);
-    assert_eq!(memchr3(b'a', b'z', b'b', b"abcda"), Some(0));
-    assert_eq!(memchr3(b'z', b'y', b'x', b"abcda"), None);
-    assert_eq!(memrchr(b'a', b"abcda"), Some(4));
-    assert_eq!(memrchr(b'z', b"abcda"), None);
-    assert_eq!(memrchr2(b'a', b'z', b"abcda"), Some(4));
-    assert_eq!(memrchr2(b'z', b'y', b"abcda"), None);
-    assert_eq!(memrchr3(b'a', b'z', b'b', b"abcda"), Some(4));
-    assert_eq!(memrchr3(b'z', b'y', b'x', b"abcda"), None);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/tests/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/tests/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,362 +1,15 @@
-use std::iter::repeat;
-
-mod iter;
 mod memchr;
 
-#[cfg(target_endian = "little")]
+// For debugging, particularly in CI, print out the byte order of the current
+// target.
+#[cfg(all(feature = "std", target_endian = "little"))]
 #[test]
 fn byte_order() {
     eprintln!("LITTLE ENDIAN");
 }
 
-#[cfg(target_endian = "big")]
+#[cfg(all(feature = "std", target_endian = "big"))]
 #[test]
 fn byte_order() {
     eprintln!("BIG ENDIAN");
 }
-
-/// Create a sequence of tests that should be run by memchr implementations.
-fn memchr_tests() -> Vec<MemchrTest> {
-    let mut tests = Vec::new();
-    for statict in MEMCHR_TESTS {
-        assert!(!statict.corpus.contains("%"), "% is not allowed in corpora");
-        assert!(!statict.corpus.contains("#"), "# is not allowed in corpora");
-        assert!(!statict.needles.contains(&b'%'), "% is an invalid needle");
-        assert!(!statict.needles.contains(&b'#'), "# is an invalid needle");
-
-        let t = MemchrTest {
-            corpus: statict.corpus.to_string(),
-            needles: statict.needles.to_vec(),
-            positions: statict.positions.to_vec(),
-        };
-        tests.push(t.clone());
-        tests.extend(t.expand());
-    }
-    tests
-}
-
-/// A set of tests for memchr-like functions.
-///
-/// These tests mostly try to cover the short string cases. We cover the longer
-/// string cases via the benchmarks (which are tests themselves), via
-/// quickcheck tests and via automatic expansion of each test case (by
-/// increasing the corpus size). Finally, we cover different alignment cases
-/// in the tests by varying the starting point of the slice.
-const MEMCHR_TESTS: &[MemchrTestStatic] = &[
-    // one needle (applied to memchr + memchr2 + memchr3)
-    MemchrTestStatic { corpus: "a", needles: &[b'a'], positions: &[0] },
-    MemchrTestStatic { corpus: "aa", needles: &[b'a'], positions: &[0, 1] },
-    MemchrTestStatic {
-        corpus: "aaa",
-        needles: &[b'a'],
-        positions: &[0, 1, 2],
-    },
-    MemchrTestStatic { corpus: "", needles: &[b'a'], positions: &[] },
-    MemchrTestStatic { corpus: "z", needles: &[b'a'], positions: &[] },
-    MemchrTestStatic { corpus: "zz", needles: &[b'a'], positions: &[] },
-    MemchrTestStatic { corpus: "zza", needles: &[b'a'], positions: &[2] },
-    MemchrTestStatic { corpus: "zaza", needles: &[b'a'], positions: &[1, 3] },
-    MemchrTestStatic { corpus: "zzza", needles: &[b'a'], positions: &[3] },
-    MemchrTestStatic { corpus: "\x00a", needles: &[b'a'], positions: &[1] },
-    MemchrTestStatic { corpus: "\x00", needles: &[b'\x00'], positions: &[0] },
-    MemchrTestStatic {
-        corpus: "\x00\x00",
-        needles: &[b'\x00'],
-        positions: &[0, 1],
-    },
-    MemchrTestStatic {
-        corpus: "\x00a\x00",
-        needles: &[b'\x00'],
-        positions: &[0, 2],
-    },
-    MemchrTestStatic {
-        corpus: "zzzzzzzzzzzzzzzza",
-        needles: &[b'a'],
-        positions: &[16],
-    },
-    MemchrTestStatic {
-        corpus: "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzza",
-        needles: &[b'a'],
-        positions: &[32],
-    },
-    // two needles (applied to memchr2 + memchr3)
-    MemchrTestStatic {
-        corpus: "az",
-        needles: &[b'a', b'z'],
-        positions: &[0, 1],
-    },
-    MemchrTestStatic {
-        corpus: "az",
-        needles: &[b'a', b'z'],
-        positions: &[0, 1],
-    },
-    MemchrTestStatic { corpus: "az", needles: &[b'x', b'y'], positions: &[] },
-    MemchrTestStatic { corpus: "az", needles: &[b'a', b'y'], positions: &[0] },
-    MemchrTestStatic { corpus: "az", needles: &[b'x', b'z'], positions: &[1] },
-    MemchrTestStatic {
-        corpus: "yyyyaz",
-        needles: &[b'a', b'z'],
-        positions: &[4, 5],
-    },
-    MemchrTestStatic {
-        corpus: "yyyyaz",
-        needles: &[b'z', b'a'],
-        positions: &[4, 5],
-    },
-    // three needles (applied to memchr3)
-    MemchrTestStatic {
-        corpus: "xyz",
-        needles: &[b'x', b'y', b'z'],
-        positions: &[0, 1, 2],
-    },
-    MemchrTestStatic {
-        corpus: "zxy",
-        needles: &[b'x', b'y', b'z'],
-        positions: &[0, 1, 2],
-    },
-    MemchrTestStatic {
-        corpus: "zxy",
-        needles: &[b'x', b'a', b'z'],
-        positions: &[0, 1],
-    },
-    MemchrTestStatic {
-        corpus: "zxy",
-        needles: &[b't', b'a', b'z'],
-        positions: &[0],
-    },
-    MemchrTestStatic {
-        corpus: "yxz",
-        needles: &[b't', b'a', b'z'],
-        positions: &[2],
-    },
-];
-
-/// A description of a test on a memchr like function.
-#[derive(Clone, Debug)]
-struct MemchrTest {
-    /// The thing to search. We use `&str` instead of `&[u8]` because they
-    /// are nicer to write in tests, and we don't miss much since memchr
-    /// doesn't care about UTF-8.
-    ///
-    /// Corpora cannot contain either '%' or '#'. We use these bytes when
-    /// expanding test cases into many test cases, and we assume they are not
-    /// used. If they are used, `memchr_tests` will panic.
-    corpus: String,
-    /// The needles to search for. This is intended to be an "alternation" of
-    /// needles. The number of needles may cause this test to be skipped for
-    /// some memchr variants. For example, a test with 2 needles cannot be used
-    /// to test `memchr`, but can be used to test `memchr2` and `memchr3`.
-    /// However, a test with only 1 needle can be used to test all of `memchr`,
-    /// `memchr2` and `memchr3`. We achieve this by filling in the needles with
-    /// bytes that we never used in the corpus (such as '#').
-    needles: Vec<u8>,
-    /// The positions expected to match for all of the needles.
-    positions: Vec<usize>,
-}
-
-/// Like MemchrTest, but easier to define as a constant.
-#[derive(Clone, Debug)]
-struct MemchrTestStatic {
-    corpus: &'static str,
-    needles: &'static [u8],
-    positions: &'static [usize],
-}
-
-impl MemchrTest {
-    fn one<F: Fn(u8, &[u8]) -> Option<usize>>(&self, reverse: bool, f: F) {
-        let needles = match self.needles(1) {
-            None => return,
-            Some(needles) => needles,
-        };
-        // We test different alignments here. Since some implementations use
-        // AVX2, which can read 32 bytes at a time, we test at least that.
-        // Moreover, with loop unrolling, we sometimes process 64 (sse2) or 128
-        // (avx) bytes at a time, so we include that in our offsets as well.
-        //
-        // You might think this would cause most needles to not be found, but
-        // we actually expand our tests to include corpus sizes all the way up
-        // to >500 bytes, so we should exericse most branches.
-        for align in 0..130 {
-            let corpus = self.corpus(align);
-            assert_eq!(
-                self.positions(align, reverse).get(0).cloned(),
-                f(needles[0], corpus.as_bytes()),
-                "search for {:?} failed in: {:?} (len: {}, alignment: {})",
-                needles[0] as char,
-                corpus,
-                corpus.len(),
-                align
-            );
-        }
-    }
-
-    fn two<F: Fn(u8, u8, &[u8]) -> Option<usize>>(&self, reverse: bool, f: F) {
-        let needles = match self.needles(2) {
-            None => return,
-            Some(needles) => needles,
-        };
-        for align in 0..130 {
-            let corpus = self.corpus(align);
-            assert_eq!(
-                self.positions(align, reverse).get(0).cloned(),
-                f(needles[0], needles[1], corpus.as_bytes()),
-                "search for {:?}|{:?} failed in: {:?} \
-                 (len: {}, alignment: {})",
-                needles[0] as char,
-                needles[1] as char,
-                corpus,
-                corpus.len(),
-                align
-            );
-        }
-    }
-
-    fn three<F: Fn(u8, u8, u8, &[u8]) -> Option<usize>>(
-        &self,
-        reverse: bool,
-        f: F,
-    ) {
-        let needles = match self.needles(3) {
-            None => return,
-            Some(needles) => needles,
-        };
-        for align in 0..130 {
-            let corpus = self.corpus(align);
-            assert_eq!(
-                self.positions(align, reverse).get(0).cloned(),
-                f(needles[0], needles[1], needles[2], corpus.as_bytes()),
-                "search for {:?}|{:?}|{:?} failed in: {:?} \
-                 (len: {}, alignment: {})",
-                needles[0] as char,
-                needles[1] as char,
-                needles[2] as char,
-                corpus,
-                corpus.len(),
-                align
-            );
-        }
-    }
-
-    fn iter_one<'a, I, F>(&'a self, reverse: bool, f: F)
-    where
-        F: FnOnce(u8, &'a [u8]) -> I,
-        I: Iterator<Item = usize>,
-    {
-        if let Some(ns) = self.needles(1) {
-            self.iter(reverse, f(ns[0], self.corpus.as_bytes()));
-        }
-    }
-
-    fn iter_two<'a, I, F>(&'a self, reverse: bool, f: F)
-    where
-        F: FnOnce(u8, u8, &'a [u8]) -> I,
-        I: Iterator<Item = usize>,
-    {
-        if let Some(ns) = self.needles(2) {
-            self.iter(reverse, f(ns[0], ns[1], self.corpus.as_bytes()));
-        }
-    }
-
-    fn iter_three<'a, I, F>(&'a self, reverse: bool, f: F)
-    where
-        F: FnOnce(u8, u8, u8, &'a [u8]) -> I,
-        I: Iterator<Item = usize>,
-    {
-        if let Some(ns) = self.needles(3) {
-            self.iter(reverse, f(ns[0], ns[1], ns[2], self.corpus.as_bytes()));
-        }
-    }
-
-    /// Test that the positions yielded by the given iterator match the
-    /// positions in this test. If reverse is true, then reverse the positions
-    /// before comparing them.
-    fn iter<I: Iterator<Item = usize>>(&self, reverse: bool, it: I) {
-        assert_eq!(
-            self.positions(0, reverse),
-            it.collect::<Vec<usize>>(),
-            r"search for {:?} failed in: {:?}",
-            self.needles.iter().map(|&b| b as char).collect::<Vec<char>>(),
-            self.corpus
-        );
-    }
-
-    /// Expand this test into many variations of the same test.
-    ///
-    /// In particular, this will generate more tests with larger corpus sizes.
-    /// The expected positions are updated to maintain the integrity of the
-    /// test.
-    ///
-    /// This is important in testing a memchr implementation, because there are
-    /// often different cases depending on the length of the corpus.
-    ///
-    /// Note that we extend the corpus by adding `%` bytes, which we
-    /// don't otherwise use as a needle.
-    fn expand(&self) -> Vec<MemchrTest> {
-        let mut more = Vec::new();
-
-        // Add bytes to the start of the corpus.
-        for i in 1..515 {
-            let mut t = self.clone();
-            let mut new_corpus: String = repeat('%').take(i).collect();
-            new_corpus.push_str(&t.corpus);
-            t.corpus = new_corpus;
-            t.positions = t.positions.into_iter().map(|p| p + i).collect();
-            more.push(t);
-        }
-        // Add bytes to the end of the corpus.
-        for i in 1..515 {
-            let mut t = self.clone();
-            let padding: String = repeat('%').take(i).collect();
-            t.corpus.push_str(&padding);
-            more.push(t);
-        }
-
-        more
-    }
-
-    /// Return the corpus at the given alignment.
-    ///
-    /// If the alignment exceeds the length of the corpus, then this returns
-    /// an empty slice.
-    fn corpus(&self, align: usize) -> &str {
-        self.corpus.get(align..).unwrap_or("")
-    }
-
-    /// Return exactly `count` needles from this test. If this test has less
-    /// than `count` needles, then add `#` until the number of needles
-    /// matches `count`. If this test has more than `count` needles, then
-    /// return `None` (because there is no way to use this test data for a
-    /// search using fewer needles).
-    fn needles(&self, count: usize) -> Option<Vec<u8>> {
-        if self.needles.len() > count {
-            return None;
-        }
-
-        let mut needles = self.needles.to_vec();
-        for _ in needles.len()..count {
-            // we assume # is never used in tests.
-            needles.push(b'#');
-        }
-        Some(needles)
-    }
-
-    /// Return the positions in this test, reversed if `reverse` is true.
-    ///
-    /// If alignment is given, then all positions greater than or equal to that
-    /// alignment are offset by the alignment. Positions less than the
-    /// alignment are dropped.
-    fn positions(&self, align: usize, reverse: bool) -> Vec<usize> {
-        let positions = if reverse {
-            let mut positions = self.positions.to_vec();
-            positions.reverse();
-            positions
-        } else {
-            self.positions.to_vec()
-        };
-        positions
-            .into_iter()
-            .filter(|&p| p >= align)
-            .map(|p| p - align)
-            .collect()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/x86/avx.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/x86/avx.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/x86/avx.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/x86/avx.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,703 +0,0 @@
-use core::arch::x86_64::*;
-use core::cmp;
-use core::mem::size_of;
-
-use x86::sse2;
-
-const VECTOR_SIZE: usize = size_of::<__m256i>();
-const VECTOR_ALIGN: usize = VECTOR_SIZE - 1;
-
-// The number of bytes to loop at in one iteration of memchr/memrchr.
-const LOOP_SIZE: usize = 4 * VECTOR_SIZE;
-
-// The number of bytes to loop at in one iteration of memchr2/memrchr2 and
-// memchr3/memrchr3. There was no observable difference between 128 and 64
-// bytes in benchmarks. memchr3 in particular only gets a very slight speed up
-// from the loop unrolling.
-const LOOP_SIZE2: usize = 2 * VECTOR_SIZE;
-
-#[target_feature(enable = "avx2")]
-pub unsafe fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    // For a high level explanation for how this algorithm works, see the
-    // sse2 implementation. The avx implementation here is the same, but with
-    // 256-bit vectors instead of 128-bit vectors.
-
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        // For small haystacks, defer to the SSE2 implementation. Codegen
-        // suggests this completely avoids touching the AVX vectors.
-        return sse2::memchr(n1, haystack);
-    }
-
-    let vn1 = _mm256_set1_epi8(n1 as i8);
-    let loop_size = cmp::min(LOOP_SIZE, haystack.len());
-    if let Some(i) = forward_search1(start_ptr, end_ptr, ptr, vn1) {
-        return Some(i);
-    }
-
-    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
-    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
-    while loop_size == LOOP_SIZE && ptr <= end_ptr.sub(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        let a = _mm256_load_si256(ptr as *const __m256i);
-        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
-        let c = _mm256_load_si256(ptr.add(2 * VECTOR_SIZE) as *const __m256i);
-        let d = _mm256_load_si256(ptr.add(3 * VECTOR_SIZE) as *const __m256i);
-        let eqa = _mm256_cmpeq_epi8(vn1, a);
-        let eqb = _mm256_cmpeq_epi8(vn1, b);
-        let eqc = _mm256_cmpeq_epi8(vn1, c);
-        let eqd = _mm256_cmpeq_epi8(vn1, d);
-        let or1 = _mm256_or_si256(eqa, eqb);
-        let or2 = _mm256_or_si256(eqc, eqd);
-        let or3 = _mm256_or_si256(or1, or2);
-        if _mm256_movemask_epi8(or3) != 0 {
-            let mut at = sub(ptr, start_ptr);
-            let mask = _mm256_movemask_epi8(eqa);
-            if mask != 0 {
-                return Some(at + forward_pos(mask));
-            }
-
-            at += VECTOR_SIZE;
-            let mask = _mm256_movemask_epi8(eqb);
-            if mask != 0 {
-                return Some(at + forward_pos(mask));
-            }
-
-            at += VECTOR_SIZE;
-            let mask = _mm256_movemask_epi8(eqc);
-            if mask != 0 {
-                return Some(at + forward_pos(mask));
-            }
-
-            at += VECTOR_SIZE;
-            let mask = _mm256_movemask_epi8(eqd);
-            debug_assert!(mask != 0);
-            return Some(at + forward_pos(mask));
-        }
-        ptr = ptr.add(loop_size);
-    }
-    while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        debug_assert!(sub(end_ptr, ptr) >= VECTOR_SIZE);
-
-        if let Some(i) = forward_search1(start_ptr, end_ptr, ptr, vn1) {
-            return Some(i);
-        }
-        ptr = ptr.add(VECTOR_SIZE);
-    }
-    if ptr < end_ptr {
-        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
-        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
-        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
-
-        return forward_search1(start_ptr, end_ptr, ptr, vn1);
-    }
-    None
-}
-
-#[target_feature(enable = "avx2")]
-pub unsafe fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = _mm256_set1_epi8(n1 as i8);
-    let vn2 = _mm256_set1_epi8(n2 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE2, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr < end_ptr {
-            if *ptr == n1 || *ptr == n2 {
-                return Some(sub(ptr, start_ptr));
-            }
-            ptr = ptr.offset(1);
-        }
-        return None;
-    }
-
-    if let Some(i) = forward_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
-        return Some(i);
-    }
-
-    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
-    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
-    while loop_size == LOOP_SIZE2 && ptr <= end_ptr.sub(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        let a = _mm256_load_si256(ptr as *const __m256i);
-        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
-        let eqa1 = _mm256_cmpeq_epi8(vn1, a);
-        let eqb1 = _mm256_cmpeq_epi8(vn1, b);
-        let eqa2 = _mm256_cmpeq_epi8(vn2, a);
-        let eqb2 = _mm256_cmpeq_epi8(vn2, b);
-        let or1 = _mm256_or_si256(eqa1, eqb1);
-        let or2 = _mm256_or_si256(eqa2, eqb2);
-        let or3 = _mm256_or_si256(or1, or2);
-        if _mm256_movemask_epi8(or3) != 0 {
-            let mut at = sub(ptr, start_ptr);
-            let mask1 = _mm256_movemask_epi8(eqa1);
-            let mask2 = _mm256_movemask_epi8(eqa2);
-            if mask1 != 0 || mask2 != 0 {
-                return Some(at + forward_pos2(mask1, mask2));
-            }
-
-            at += VECTOR_SIZE;
-            let mask1 = _mm256_movemask_epi8(eqb1);
-            let mask2 = _mm256_movemask_epi8(eqb2);
-            return Some(at + forward_pos2(mask1, mask2));
-        }
-        ptr = ptr.add(loop_size);
-    }
-    while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        if let Some(i) = forward_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
-            return Some(i);
-        }
-        ptr = ptr.add(VECTOR_SIZE);
-    }
-    if ptr < end_ptr {
-        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
-        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
-        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
-
-        return forward_search2(start_ptr, end_ptr, ptr, vn1, vn2);
-    }
-    None
-}
-
-#[target_feature(enable = "avx2")]
-pub unsafe fn memchr3(
-    n1: u8,
-    n2: u8,
-    n3: u8,
-    haystack: &[u8],
-) -> Option<usize> {
-    let vn1 = _mm256_set1_epi8(n1 as i8);
-    let vn2 = _mm256_set1_epi8(n2 as i8);
-    let vn3 = _mm256_set1_epi8(n3 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE2, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr < end_ptr {
-            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
-                return Some(sub(ptr, start_ptr));
-            }
-            ptr = ptr.offset(1);
-        }
-        return None;
-    }
-
-    if let Some(i) = forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
-        return Some(i);
-    }
-
-    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
-    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
-    while loop_size == LOOP_SIZE2 && ptr <= end_ptr.sub(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        let a = _mm256_load_si256(ptr as *const __m256i);
-        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
-        let eqa1 = _mm256_cmpeq_epi8(vn1, a);
-        let eqb1 = _mm256_cmpeq_epi8(vn1, b);
-        let eqa2 = _mm256_cmpeq_epi8(vn2, a);
-        let eqb2 = _mm256_cmpeq_epi8(vn2, b);
-        let eqa3 = _mm256_cmpeq_epi8(vn3, a);
-        let eqb3 = _mm256_cmpeq_epi8(vn3, b);
-        let or1 = _mm256_or_si256(eqa1, eqb1);
-        let or2 = _mm256_or_si256(eqa2, eqb2);
-        let or3 = _mm256_or_si256(eqa3, eqb3);
-        let or4 = _mm256_or_si256(or1, or2);
-        let or5 = _mm256_or_si256(or3, or4);
-        if _mm256_movemask_epi8(or5) != 0 {
-            let mut at = sub(ptr, start_ptr);
-            let mask1 = _mm256_movemask_epi8(eqa1);
-            let mask2 = _mm256_movemask_epi8(eqa2);
-            let mask3 = _mm256_movemask_epi8(eqa3);
-            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
-                return Some(at + forward_pos3(mask1, mask2, mask3));
-            }
-
-            at += VECTOR_SIZE;
-            let mask1 = _mm256_movemask_epi8(eqb1);
-            let mask2 = _mm256_movemask_epi8(eqb2);
-            let mask3 = _mm256_movemask_epi8(eqb3);
-            return Some(at + forward_pos3(mask1, mask2, mask3));
-        }
-        ptr = ptr.add(loop_size);
-    }
-    while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        if let Some(i) =
-            forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
-        {
-            return Some(i);
-        }
-        ptr = ptr.add(VECTOR_SIZE);
-    }
-    if ptr < end_ptr {
-        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
-        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
-        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
-
-        return forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3);
-    }
-    None
-}
-
-#[target_feature(enable = "avx2")]
-pub unsafe fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = _mm256_set1_epi8(n1 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr > start_ptr {
-            ptr = ptr.offset(-1);
-            if *ptr == n1 {
-                return Some(sub(ptr, start_ptr));
-            }
-        }
-        return None;
-    }
-
-    ptr = ptr.sub(VECTOR_SIZE);
-    if let Some(i) = reverse_search1(start_ptr, end_ptr, ptr, vn1) {
-        return Some(i);
-    }
-
-    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
-    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-    while loop_size == LOOP_SIZE && ptr >= start_ptr.add(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        ptr = ptr.sub(loop_size);
-        let a = _mm256_load_si256(ptr as *const __m256i);
-        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
-        let c = _mm256_load_si256(ptr.add(2 * VECTOR_SIZE) as *const __m256i);
-        let d = _mm256_load_si256(ptr.add(3 * VECTOR_SIZE) as *const __m256i);
-        let eqa = _mm256_cmpeq_epi8(vn1, a);
-        let eqb = _mm256_cmpeq_epi8(vn1, b);
-        let eqc = _mm256_cmpeq_epi8(vn1, c);
-        let eqd = _mm256_cmpeq_epi8(vn1, d);
-        let or1 = _mm256_or_si256(eqa, eqb);
-        let or2 = _mm256_or_si256(eqc, eqd);
-        let or3 = _mm256_or_si256(or1, or2);
-        if _mm256_movemask_epi8(or3) != 0 {
-            let mut at = sub(ptr.add(3 * VECTOR_SIZE), start_ptr);
-            let mask = _mm256_movemask_epi8(eqd);
-            if mask != 0 {
-                return Some(at + reverse_pos(mask));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask = _mm256_movemask_epi8(eqc);
-            if mask != 0 {
-                return Some(at + reverse_pos(mask));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask = _mm256_movemask_epi8(eqb);
-            if mask != 0 {
-                return Some(at + reverse_pos(mask));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask = _mm256_movemask_epi8(eqa);
-            debug_assert!(mask != 0);
-            return Some(at + reverse_pos(mask));
-        }
-    }
-    while ptr >= start_ptr.add(VECTOR_SIZE) {
-        ptr = ptr.sub(VECTOR_SIZE);
-        if let Some(i) = reverse_search1(start_ptr, end_ptr, ptr, vn1) {
-            return Some(i);
-        }
-    }
-    if ptr > start_ptr {
-        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
-        return reverse_search1(start_ptr, end_ptr, start_ptr, vn1);
-    }
-    None
-}
-
-#[target_feature(enable = "avx2")]
-pub unsafe fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = _mm256_set1_epi8(n1 as i8);
-    let vn2 = _mm256_set1_epi8(n2 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE2, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr > start_ptr {
-            ptr = ptr.offset(-1);
-            if *ptr == n1 || *ptr == n2 {
-                return Some(sub(ptr, start_ptr));
-            }
-        }
-        return None;
-    }
-
-    ptr = ptr.sub(VECTOR_SIZE);
-    if let Some(i) = reverse_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
-        return Some(i);
-    }
-
-    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
-    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-    while loop_size == LOOP_SIZE2 && ptr >= start_ptr.add(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        ptr = ptr.sub(loop_size);
-        let a = _mm256_load_si256(ptr as *const __m256i);
-        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
-        let eqa1 = _mm256_cmpeq_epi8(vn1, a);
-        let eqb1 = _mm256_cmpeq_epi8(vn1, b);
-        let eqa2 = _mm256_cmpeq_epi8(vn2, a);
-        let eqb2 = _mm256_cmpeq_epi8(vn2, b);
-        let or1 = _mm256_or_si256(eqa1, eqb1);
-        let or2 = _mm256_or_si256(eqa2, eqb2);
-        let or3 = _mm256_or_si256(or1, or2);
-        if _mm256_movemask_epi8(or3) != 0 {
-            let mut at = sub(ptr.add(VECTOR_SIZE), start_ptr);
-            let mask1 = _mm256_movemask_epi8(eqb1);
-            let mask2 = _mm256_movemask_epi8(eqb2);
-            if mask1 != 0 || mask2 != 0 {
-                return Some(at + reverse_pos2(mask1, mask2));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask1 = _mm256_movemask_epi8(eqa1);
-            let mask2 = _mm256_movemask_epi8(eqa2);
-            return Some(at + reverse_pos2(mask1, mask2));
-        }
-    }
-    while ptr >= start_ptr.add(VECTOR_SIZE) {
-        ptr = ptr.sub(VECTOR_SIZE);
-        if let Some(i) = reverse_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
-            return Some(i);
-        }
-    }
-    if ptr > start_ptr {
-        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
-        return reverse_search2(start_ptr, end_ptr, start_ptr, vn1, vn2);
-    }
-    None
-}
-
-#[target_feature(enable = "avx2")]
-pub unsafe fn memrchr3(
-    n1: u8,
-    n2: u8,
-    n3: u8,
-    haystack: &[u8],
-) -> Option<usize> {
-    let vn1 = _mm256_set1_epi8(n1 as i8);
-    let vn2 = _mm256_set1_epi8(n2 as i8);
-    let vn3 = _mm256_set1_epi8(n3 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE2, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr > start_ptr {
-            ptr = ptr.offset(-1);
-            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
-                return Some(sub(ptr, start_ptr));
-            }
-        }
-        return None;
-    }
-
-    ptr = ptr.sub(VECTOR_SIZE);
-    if let Some(i) = reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
-        return Some(i);
-    }
-
-    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
-    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-    while loop_size == LOOP_SIZE2 && ptr >= start_ptr.add(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        ptr = ptr.sub(loop_size);
-        let a = _mm256_load_si256(ptr as *const __m256i);
-        let b = _mm256_load_si256(ptr.add(VECTOR_SIZE) as *const __m256i);
-        let eqa1 = _mm256_cmpeq_epi8(vn1, a);
-        let eqb1 = _mm256_cmpeq_epi8(vn1, b);
-        let eqa2 = _mm256_cmpeq_epi8(vn2, a);
-        let eqb2 = _mm256_cmpeq_epi8(vn2, b);
-        let eqa3 = _mm256_cmpeq_epi8(vn3, a);
-        let eqb3 = _mm256_cmpeq_epi8(vn3, b);
-        let or1 = _mm256_or_si256(eqa1, eqb1);
-        let or2 = _mm256_or_si256(eqa2, eqb2);
-        let or3 = _mm256_or_si256(eqa3, eqb3);
-        let or4 = _mm256_or_si256(or1, or2);
-        let or5 = _mm256_or_si256(or3, or4);
-        if _mm256_movemask_epi8(or5) != 0 {
-            let mut at = sub(ptr.add(VECTOR_SIZE), start_ptr);
-            let mask1 = _mm256_movemask_epi8(eqb1);
-            let mask2 = _mm256_movemask_epi8(eqb2);
-            let mask3 = _mm256_movemask_epi8(eqb3);
-            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
-                return Some(at + reverse_pos3(mask1, mask2, mask3));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask1 = _mm256_movemask_epi8(eqa1);
-            let mask2 = _mm256_movemask_epi8(eqa2);
-            let mask3 = _mm256_movemask_epi8(eqa3);
-            return Some(at + reverse_pos3(mask1, mask2, mask3));
-        }
-    }
-    while ptr >= start_ptr.add(VECTOR_SIZE) {
-        ptr = ptr.sub(VECTOR_SIZE);
-        if let Some(i) =
-            reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
-        {
-            return Some(i);
-        }
-    }
-    if ptr > start_ptr {
-        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
-        return reverse_search3(start_ptr, end_ptr, start_ptr, vn1, vn2, vn3);
-    }
-    None
-}
-
-#[target_feature(enable = "avx2")]
-unsafe fn forward_search1(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m256i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
-    let mask = _mm256_movemask_epi8(_mm256_cmpeq_epi8(chunk, vn1));
-    if mask != 0 {
-        Some(sub(ptr, start_ptr) + forward_pos(mask))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "avx2")]
-unsafe fn forward_search2(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m256i,
-    vn2: __m256i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
-    let eq1 = _mm256_cmpeq_epi8(chunk, vn1);
-    let eq2 = _mm256_cmpeq_epi8(chunk, vn2);
-    if _mm256_movemask_epi8(_mm256_or_si256(eq1, eq2)) != 0 {
-        let mask1 = _mm256_movemask_epi8(eq1);
-        let mask2 = _mm256_movemask_epi8(eq2);
-        Some(sub(ptr, start_ptr) + forward_pos2(mask1, mask2))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "avx2")]
-unsafe fn forward_search3(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m256i,
-    vn2: __m256i,
-    vn3: __m256i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
-    let eq1 = _mm256_cmpeq_epi8(chunk, vn1);
-    let eq2 = _mm256_cmpeq_epi8(chunk, vn2);
-    let eq3 = _mm256_cmpeq_epi8(chunk, vn3);
-    let or = _mm256_or_si256(eq1, eq2);
-    if _mm256_movemask_epi8(_mm256_or_si256(or, eq3)) != 0 {
-        let mask1 = _mm256_movemask_epi8(eq1);
-        let mask2 = _mm256_movemask_epi8(eq2);
-        let mask3 = _mm256_movemask_epi8(eq3);
-        Some(sub(ptr, start_ptr) + forward_pos3(mask1, mask2, mask3))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "avx2")]
-unsafe fn reverse_search1(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m256i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
-    let mask = _mm256_movemask_epi8(_mm256_cmpeq_epi8(vn1, chunk));
-    if mask != 0 {
-        Some(sub(ptr, start_ptr) + reverse_pos(mask))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "avx2")]
-unsafe fn reverse_search2(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m256i,
-    vn2: __m256i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
-    let eq1 = _mm256_cmpeq_epi8(chunk, vn1);
-    let eq2 = _mm256_cmpeq_epi8(chunk, vn2);
-    if _mm256_movemask_epi8(_mm256_or_si256(eq1, eq2)) != 0 {
-        let mask1 = _mm256_movemask_epi8(eq1);
-        let mask2 = _mm256_movemask_epi8(eq2);
-        Some(sub(ptr, start_ptr) + reverse_pos2(mask1, mask2))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "avx2")]
-unsafe fn reverse_search3(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m256i,
-    vn2: __m256i,
-    vn3: __m256i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm256_loadu_si256(ptr as *const __m256i);
-    let eq1 = _mm256_cmpeq_epi8(chunk, vn1);
-    let eq2 = _mm256_cmpeq_epi8(chunk, vn2);
-    let eq3 = _mm256_cmpeq_epi8(chunk, vn3);
-    let or = _mm256_or_si256(eq1, eq2);
-    if _mm256_movemask_epi8(_mm256_or_si256(or, eq3)) != 0 {
-        let mask1 = _mm256_movemask_epi8(eq1);
-        let mask2 = _mm256_movemask_epi8(eq2);
-        let mask3 = _mm256_movemask_epi8(eq3);
-        Some(sub(ptr, start_ptr) + reverse_pos3(mask1, mask2, mask3))
-    } else {
-        None
-    }
-}
-
-/// Compute the position of the first matching byte from the given mask. The
-/// position returned is always in the range [0, 31].
-///
-/// The mask given is expected to be the result of _mm256_movemask_epi8.
-fn forward_pos(mask: i32) -> usize {
-    // We are dealing with little endian here, where the most significant byte
-    // is at a higher address. That means the least significant bit that is set
-    // corresponds to the position of our first matching byte. That position
-    // corresponds to the number of zeros after the least significant bit.
-    mask.trailing_zeros() as usize
-}
-
-/// Compute the position of the first matching byte from the given masks. The
-/// position returned is always in the range [0, 31]. Each mask corresponds to
-/// the equality comparison of a single byte.
-///
-/// The masks given are expected to be the result of _mm256_movemask_epi8,
-/// where at least one of the masks is non-zero (i.e., indicates a match).
-fn forward_pos2(mask1: i32, mask2: i32) -> usize {
-    debug_assert!(mask1 != 0 || mask2 != 0);
-
-    forward_pos(mask1 | mask2)
-}
-
-/// Compute the position of the first matching byte from the given masks. The
-/// position returned is always in the range [0, 31]. Each mask corresponds to
-/// the equality comparison of a single byte.
-///
-/// The masks given are expected to be the result of _mm256_movemask_epi8,
-/// where at least one of the masks is non-zero (i.e., indicates a match).
-fn forward_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
-    debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
-
-    forward_pos(mask1 | mask2 | mask3)
-}
-
-/// Compute the position of the last matching byte from the given mask. The
-/// position returned is always in the range [0, 31].
-///
-/// The mask given is expected to be the result of _mm256_movemask_epi8.
-fn reverse_pos(mask: i32) -> usize {
-    // We are dealing with little endian here, where the most significant byte
-    // is at a higher address. That means the most significant bit that is set
-    // corresponds to the position of our last matching byte. The position from
-    // the end of the mask is therefore the number of leading zeros in a 32
-    // bit integer, and the position from the start of the mask is therefore
-    // 32 - (leading zeros) - 1.
-    VECTOR_SIZE - (mask as u32).leading_zeros() as usize - 1
-}
-
-/// Compute the position of the last matching byte from the given masks. The
-/// position returned is always in the range [0, 31]. Each mask corresponds to
-/// the equality comparison of a single byte.
-///
-/// The masks given are expected to be the result of _mm256_movemask_epi8,
-/// where at least one of the masks is non-zero (i.e., indicates a match).
-fn reverse_pos2(mask1: i32, mask2: i32) -> usize {
-    debug_assert!(mask1 != 0 || mask2 != 0);
-
-    reverse_pos(mask1 | mask2)
-}
-
-/// Compute the position of the last matching byte from the given masks. The
-/// position returned is always in the range [0, 31]. Each mask corresponds to
-/// the equality comparison of a single byte.
-///
-/// The masks given are expected to be the result of _mm256_movemask_epi8,
-/// where at least one of the masks is non-zero (i.e., indicates a match).
-fn reverse_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
-    debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
-
-    reverse_pos(mask1 | mask2 | mask3)
-}
-
-/// Subtract `b` from `a` and return the difference. `a` should be greater than
-/// or equal to `b`.
-fn sub(a: *const u8, b: *const u8) -> usize {
-    debug_assert!(a >= b);
-    (a as usize) - (b as usize)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/x86/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/x86/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/x86/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/x86/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-use fallback;
-
-// We only use AVX when we can detect at runtime whether it's available, which
-// requires std.
-#[cfg(feature = "std")]
-mod avx;
-mod sse2;
-
-// This macro employs a gcc-like "ifunc" trick where by upon first calling
-// `memchr` (for example), CPU feature detection will be performed at runtime
-// to determine the best implementation to use. After CPU feature detection
-// is done, we replace `memchr`'s function pointer with the selection. Upon
-// subsequent invocations, the CPU-specific routine is invoked directly, which
-// skips the CPU feature detection and subsequent branch that's required.
-//
-// While this typically doesn't matter for rare occurrences or when used on
-// larger haystacks, `memchr` can be called in tight loops where the overhead
-// of this branch can actually add up *and is measurable*. This trick was
-// necessary to bring this implementation up to glibc's speeds for the 'tiny'
-// benchmarks, for example.
-//
-// At some point, I expect the Rust ecosystem will get a nice macro for doing
-// exactly this, at which point, we can replace our hand-jammed version of it.
-//
-// N.B. The ifunc strategy does prevent function inlining of course, but on
-// modern CPUs, you'll probably end up with the AVX2 implementation, which
-// probably can't be inlined anyway---unless you've compiled your entire
-// program with AVX2 enabled. However, even then, the various memchr
-// implementations aren't exactly small, so inlining might not help anyway!
-#[cfg(feature = "std")]
-macro_rules! ifunc {
-    ($fnty:ty, $name:ident, $haystack:ident, $($needle:ident),+) => {{
-        use std::mem;
-        use std::sync::atomic::{AtomicPtr, Ordering};
-
-        type FnRaw = *mut ();
-
-        static FN: AtomicPtr<()> = AtomicPtr::new(detect as FnRaw);
-
-        fn detect($($needle: u8),+, haystack: &[u8]) -> Option<usize> {
-            let fun =
-                if cfg!(memchr_runtime_avx) && is_x86_feature_detected!("avx2") {
-                    avx::$name as FnRaw
-                } else if cfg!(memchr_runtime_sse2) {
-                    sse2::$name as FnRaw
-                } else {
-                    fallback::$name as FnRaw
-                };
-            FN.store(fun as FnRaw, Ordering::Relaxed);
-            unsafe {
-                mem::transmute::<FnRaw, $fnty>(fun)($($needle),+, haystack)
-            }
-        }
-
-        unsafe {
-            let fun = FN.load(Ordering::Relaxed);
-            mem::transmute::<FnRaw, $fnty>(fun)($($needle),+, $haystack)
-        }
-    }}
-}
-
-// When std isn't available to provide runtime CPU feature detection, or if
-// runtime CPU feature detection has been explicitly disabled, then just call
-// our optimized SSE2 routine directly. SSE2 is avalbale on all x86_64 targets,
-// so no CPU feature detection is necessary.
-#[cfg(not(feature = "std"))]
-macro_rules! ifunc {
-    ($fnty:ty, $name:ident, $haystack:ident, $($needle:ident),+) => {{
-        if cfg!(memchr_runtime_sse2) {
-            unsafe { sse2::$name($($needle),+, $haystack) }
-        } else {
-            fallback::$name($($needle),+, $haystack)
-        }
-    }}
-}
-
-#[inline(always)]
-pub fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    ifunc!(fn(u8, &[u8]) -> Option<usize>, memchr, haystack, n1)
-}
-
-#[inline(always)]
-pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    ifunc!(fn(u8, u8, &[u8]) -> Option<usize>, memchr2, haystack, n1, n2)
-}
-
-#[inline(always)]
-pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    ifunc!(
-        fn(u8, u8, u8, &[u8]) -> Option<usize>,
-        memchr3,
-        haystack,
-        n1,
-        n2,
-        n3
-    )
-}
-
-#[inline(always)]
-pub fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    ifunc!(fn(u8, &[u8]) -> Option<usize>, memrchr, haystack, n1)
-}
-
-#[inline(always)]
-pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    ifunc!(fn(u8, u8, &[u8]) -> Option<usize>, memrchr2, haystack, n1, n2)
-}
-
-#[inline(always)]
-pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    ifunc!(
-        fn(u8, u8, u8, &[u8]) -> Option<usize>,
-        memrchr3,
-        haystack,
-        n1,
-        n2,
-        n3
-    )
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/x86/sse2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/x86/sse2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/x86/sse2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/x86/sse2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,793 +0,0 @@
-use core::arch::x86_64::*;
-use core::cmp;
-use core::mem::size_of;
-
-const VECTOR_SIZE: usize = size_of::<__m128i>();
-const VECTOR_ALIGN: usize = VECTOR_SIZE - 1;
-
-// The number of bytes to loop at in one iteration of memchr/memrchr.
-const LOOP_SIZE: usize = 4 * VECTOR_SIZE;
-
-// The number of bytes to loop at in one iteration of memchr2/memrchr2 and
-// memchr3/memrchr3. There was no observable difference between 64 and 32 bytes
-// in benchmarks. memchr3 in particular only gets a very slight speed up from
-// the loop unrolling.
-const LOOP_SIZE2: usize = 2 * VECTOR_SIZE;
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    // What follows is a fast SSE2-only algorithm to detect the position of
-    // `n1` in `haystack` if it exists. From what I know, this is the "classic"
-    // algorithm. I believe it can be found in places like glibc and Go's
-    // standard library. It appears to be well known and is elaborated on in
-    // more detail here: https://gms.tf/stdfind-and-memchr-optimizations.html
-    //
-    // While this routine is very long, the basic idea is actually very simple
-    // and can be expressed straight-forwardly in pseudo code:
-    //
-    //     needle = (n1 << 15) | (n1 << 14) | ... | (n1 << 1) | n1
-    //     // Note: shift amount in bytes
-    //
-    //     while i <= haystack.len() - 16:
-    //       // A 16 byte vector. Each byte in chunk corresponds to a byte in
-    //       // the haystack.
-    //       chunk = haystack[i:i+16]
-    //       // Compare bytes in needle with bytes in chunk. The result is a 16
-    //       // byte chunk where each byte is 0xFF if the corresponding bytes
-    //       // in needle and chunk were equal, or 0x00 otherwise.
-    //       eqs = cmpeq(needle, chunk)
-    //       // Return a 32 bit integer where the most significant 16 bits
-    //       // are always 0 and the lower 16 bits correspond to whether the
-    //       // most significant bit in the correspond byte in `eqs` is set.
-    //       // In other words, `mask as u16` has bit i set if and only if
-    //       // needle[i] == chunk[i].
-    //       mask = movemask(eqs)
-    //
-    //       // Mask is 0 if there is no match, and non-zero otherwise.
-    //       if mask != 0:
-    //         // trailing_zeros tells us the position of the least significant
-    //         // bit that is set.
-    //         return i + trailing_zeros(mask)
-    //
-    //     // haystack length may not be a multiple of 16, so search the rest.
-    //     while i < haystack.len():
-    //       if haystack[i] == n1:
-    //         return i
-    //
-    //     // No match found.
-    //     return NULL
-    //
-    // In fact, we could loosely translate the above code to Rust line-for-line
-    // and it would be a pretty fast algorithm. But, we pull out all the stops
-    // to go as fast as possible:
-    //
-    // 1. We use aligned loads. That is, we do some finagling to make sure our
-    //    primary loop not only proceeds in increments of 16 bytes, but that
-    //    the address of haystack's pointer that we dereference is aligned to
-    //    16 bytes. 16 is a magic number here because it is the size of SSE2
-    //    128-bit vector. (For the AVX2 algorithm, 32 is the magic number.)
-    //    Therefore, to get aligned loads, our pointer's address must be evenly
-    //    divisible by 16.
-    // 2. Our primary loop proceeds 64 bytes at a time instead of 16. It's
-    //    kind of like loop unrolling, but we combine the equality comparisons
-    //    using a vector OR such that we only need to extract a single mask to
-    //    determine whether a match exists or not. If so, then we do some
-    //    book-keeping to determine the precise location but otherwise mush on.
-    // 3. We use our "chunk" comparison routine in as many places as possible,
-    //    even if it means using unaligned loads. In particular, if haystack
-    //    starts with an unaligned address, then we do an unaligned load to
-    //    search the first 16 bytes. We then start our primary loop at the
-    //    smallest subsequent aligned address, which will actually overlap with
-    //    previously searched bytes. But we're OK with that. We do a similar
-    //    dance at the end of our primary loop. Finally, to avoid a
-    //    byte-at-a-time loop at the end, we do a final 16 byte unaligned load
-    //    that may overlap with a previous load. This is OK because it converts
-    //    a loop into a small number of very fast vector instructions.
-    //
-    // The primary downside of this algorithm is that it's effectively
-    // completely unsafe. Therefore, we have to be super careful to avoid
-    // undefined behavior:
-    //
-    // 1. We use raw pointers everywhere. Not only does dereferencing a pointer
-    //    require the pointer to be valid, but we actually can't even store the
-    //    address of an invalid pointer (unless it's 1 past the end of
-    //    haystack) without sacrificing performance.
-    // 2. _mm_loadu_si128 is used when you don't care about alignment, and
-    //    _mm_load_si128 is used when you do care. You cannot use the latter
-    //    on unaligned pointers.
-    // 3. We make liberal use of debug_assert! to check assumptions.
-    // 4. We make a concerted effort to stick with pointers instead of indices.
-    //    Indices are nicer because there's less to worry about with them (see
-    //    above about pointer offsets), but I could not get the compiler to
-    //    produce as good of code as what the below produces. In any case,
-    //    pointers are what we really care about here, and alignment is
-    //    expressed a bit more naturally with them.
-    //
-    // In general, most of the algorithms in this crate have a similar
-    // structure to what you see below, so this comment applies fairly well to
-    // all of them.
-
-    let vn1 = _mm_set1_epi8(n1 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr < end_ptr {
-            if *ptr == n1 {
-                return Some(sub(ptr, start_ptr));
-            }
-            ptr = ptr.offset(1);
-        }
-        return None;
-    }
-
-    if let Some(i) = forward_search1(start_ptr, end_ptr, ptr, vn1) {
-        return Some(i);
-    }
-
-    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
-    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
-    while loop_size == LOOP_SIZE && ptr <= end_ptr.sub(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        let a = _mm_load_si128(ptr as *const __m128i);
-        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
-        let c = _mm_load_si128(ptr.add(2 * VECTOR_SIZE) as *const __m128i);
-        let d = _mm_load_si128(ptr.add(3 * VECTOR_SIZE) as *const __m128i);
-        let eqa = _mm_cmpeq_epi8(vn1, a);
-        let eqb = _mm_cmpeq_epi8(vn1, b);
-        let eqc = _mm_cmpeq_epi8(vn1, c);
-        let eqd = _mm_cmpeq_epi8(vn1, d);
-        let or1 = _mm_or_si128(eqa, eqb);
-        let or2 = _mm_or_si128(eqc, eqd);
-        let or3 = _mm_or_si128(or1, or2);
-        if _mm_movemask_epi8(or3) != 0 {
-            let mut at = sub(ptr, start_ptr);
-            let mask = _mm_movemask_epi8(eqa);
-            if mask != 0 {
-                return Some(at + forward_pos(mask));
-            }
-
-            at += VECTOR_SIZE;
-            let mask = _mm_movemask_epi8(eqb);
-            if mask != 0 {
-                return Some(at + forward_pos(mask));
-            }
-
-            at += VECTOR_SIZE;
-            let mask = _mm_movemask_epi8(eqc);
-            if mask != 0 {
-                return Some(at + forward_pos(mask));
-            }
-
-            at += VECTOR_SIZE;
-            let mask = _mm_movemask_epi8(eqd);
-            debug_assert!(mask != 0);
-            return Some(at + forward_pos(mask));
-        }
-        ptr = ptr.add(loop_size);
-    }
-    while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        debug_assert!(sub(end_ptr, ptr) >= VECTOR_SIZE);
-
-        if let Some(i) = forward_search1(start_ptr, end_ptr, ptr, vn1) {
-            return Some(i);
-        }
-        ptr = ptr.add(VECTOR_SIZE);
-    }
-    if ptr < end_ptr {
-        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
-        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
-        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
-
-        return forward_search1(start_ptr, end_ptr, ptr, vn1);
-    }
-    None
-}
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = _mm_set1_epi8(n1 as i8);
-    let vn2 = _mm_set1_epi8(n2 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE2, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr < end_ptr {
-            if *ptr == n1 || *ptr == n2 {
-                return Some(sub(ptr, start_ptr));
-            }
-            ptr = ptr.offset(1);
-        }
-        return None;
-    }
-
-    if let Some(i) = forward_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
-        return Some(i);
-    }
-
-    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
-    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
-    while loop_size == LOOP_SIZE2 && ptr <= end_ptr.sub(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        let a = _mm_load_si128(ptr as *const __m128i);
-        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
-        let eqa1 = _mm_cmpeq_epi8(vn1, a);
-        let eqb1 = _mm_cmpeq_epi8(vn1, b);
-        let eqa2 = _mm_cmpeq_epi8(vn2, a);
-        let eqb2 = _mm_cmpeq_epi8(vn2, b);
-        let or1 = _mm_or_si128(eqa1, eqb1);
-        let or2 = _mm_or_si128(eqa2, eqb2);
-        let or3 = _mm_or_si128(or1, or2);
-        if _mm_movemask_epi8(or3) != 0 {
-            let mut at = sub(ptr, start_ptr);
-            let mask1 = _mm_movemask_epi8(eqa1);
-            let mask2 = _mm_movemask_epi8(eqa2);
-            if mask1 != 0 || mask2 != 0 {
-                return Some(at + forward_pos2(mask1, mask2));
-            }
-
-            at += VECTOR_SIZE;
-            let mask1 = _mm_movemask_epi8(eqb1);
-            let mask2 = _mm_movemask_epi8(eqb2);
-            return Some(at + forward_pos2(mask1, mask2));
-        }
-        ptr = ptr.add(loop_size);
-    }
-    while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        if let Some(i) = forward_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
-            return Some(i);
-        }
-        ptr = ptr.add(VECTOR_SIZE);
-    }
-    if ptr < end_ptr {
-        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
-        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
-        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
-
-        return forward_search2(start_ptr, end_ptr, ptr, vn1, vn2);
-    }
-    None
-}
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn memchr3(
-    n1: u8,
-    n2: u8,
-    n3: u8,
-    haystack: &[u8],
-) -> Option<usize> {
-    let vn1 = _mm_set1_epi8(n1 as i8);
-    let vn2 = _mm_set1_epi8(n2 as i8);
-    let vn3 = _mm_set1_epi8(n3 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE2, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr < end_ptr {
-            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
-                return Some(sub(ptr, start_ptr));
-            }
-            ptr = ptr.offset(1);
-        }
-        return None;
-    }
-
-    if let Some(i) = forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
-        return Some(i);
-    }
-
-    ptr = ptr.add(VECTOR_SIZE - (start_ptr as usize & VECTOR_ALIGN));
-    debug_assert!(ptr > start_ptr && end_ptr.sub(VECTOR_SIZE) >= start_ptr);
-    while loop_size == LOOP_SIZE2 && ptr <= end_ptr.sub(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        let a = _mm_load_si128(ptr as *const __m128i);
-        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
-        let eqa1 = _mm_cmpeq_epi8(vn1, a);
-        let eqb1 = _mm_cmpeq_epi8(vn1, b);
-        let eqa2 = _mm_cmpeq_epi8(vn2, a);
-        let eqb2 = _mm_cmpeq_epi8(vn2, b);
-        let eqa3 = _mm_cmpeq_epi8(vn3, a);
-        let eqb3 = _mm_cmpeq_epi8(vn3, b);
-        let or1 = _mm_or_si128(eqa1, eqb1);
-        let or2 = _mm_or_si128(eqa2, eqb2);
-        let or3 = _mm_or_si128(eqa3, eqb3);
-        let or4 = _mm_or_si128(or1, or2);
-        let or5 = _mm_or_si128(or3, or4);
-        if _mm_movemask_epi8(or5) != 0 {
-            let mut at = sub(ptr, start_ptr);
-            let mask1 = _mm_movemask_epi8(eqa1);
-            let mask2 = _mm_movemask_epi8(eqa2);
-            let mask3 = _mm_movemask_epi8(eqa3);
-            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
-                return Some(at + forward_pos3(mask1, mask2, mask3));
-            }
-
-            at += VECTOR_SIZE;
-            let mask1 = _mm_movemask_epi8(eqb1);
-            let mask2 = _mm_movemask_epi8(eqb2);
-            let mask3 = _mm_movemask_epi8(eqb3);
-            return Some(at + forward_pos3(mask1, mask2, mask3));
-        }
-        ptr = ptr.add(loop_size);
-    }
-    while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        if let Some(i) =
-            forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
-        {
-            return Some(i);
-        }
-        ptr = ptr.add(VECTOR_SIZE);
-    }
-    if ptr < end_ptr {
-        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
-        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
-        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
-
-        return forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3);
-    }
-    None
-}
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = _mm_set1_epi8(n1 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr > start_ptr {
-            ptr = ptr.offset(-1);
-            if *ptr == n1 {
-                return Some(sub(ptr, start_ptr));
-            }
-        }
-        return None;
-    }
-
-    ptr = ptr.sub(VECTOR_SIZE);
-    if let Some(i) = reverse_search1(start_ptr, end_ptr, ptr, vn1) {
-        return Some(i);
-    }
-
-    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
-    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-    while loop_size == LOOP_SIZE && ptr >= start_ptr.add(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        ptr = ptr.sub(loop_size);
-        let a = _mm_load_si128(ptr as *const __m128i);
-        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
-        let c = _mm_load_si128(ptr.add(2 * VECTOR_SIZE) as *const __m128i);
-        let d = _mm_load_si128(ptr.add(3 * VECTOR_SIZE) as *const __m128i);
-        let eqa = _mm_cmpeq_epi8(vn1, a);
-        let eqb = _mm_cmpeq_epi8(vn1, b);
-        let eqc = _mm_cmpeq_epi8(vn1, c);
-        let eqd = _mm_cmpeq_epi8(vn1, d);
-        let or1 = _mm_or_si128(eqa, eqb);
-        let or2 = _mm_or_si128(eqc, eqd);
-        let or3 = _mm_or_si128(or1, or2);
-        if _mm_movemask_epi8(or3) != 0 {
-            let mut at = sub(ptr.add(3 * VECTOR_SIZE), start_ptr);
-            let mask = _mm_movemask_epi8(eqd);
-            if mask != 0 {
-                return Some(at + reverse_pos(mask));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask = _mm_movemask_epi8(eqc);
-            if mask != 0 {
-                return Some(at + reverse_pos(mask));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask = _mm_movemask_epi8(eqb);
-            if mask != 0 {
-                return Some(at + reverse_pos(mask));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask = _mm_movemask_epi8(eqa);
-            debug_assert!(mask != 0);
-            return Some(at + reverse_pos(mask));
-        }
-    }
-    while ptr >= start_ptr.add(VECTOR_SIZE) {
-        ptr = ptr.sub(VECTOR_SIZE);
-        if let Some(i) = reverse_search1(start_ptr, end_ptr, ptr, vn1) {
-            return Some(i);
-        }
-    }
-    if ptr > start_ptr {
-        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
-        return reverse_search1(start_ptr, end_ptr, start_ptr, vn1);
-    }
-    None
-}
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    let vn1 = _mm_set1_epi8(n1 as i8);
-    let vn2 = _mm_set1_epi8(n2 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE2, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr > start_ptr {
-            ptr = ptr.offset(-1);
-            if *ptr == n1 || *ptr == n2 {
-                return Some(sub(ptr, start_ptr));
-            }
-        }
-        return None;
-    }
-
-    ptr = ptr.sub(VECTOR_SIZE);
-    if let Some(i) = reverse_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
-        return Some(i);
-    }
-
-    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
-    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-    while loop_size == LOOP_SIZE2 && ptr >= start_ptr.add(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        ptr = ptr.sub(loop_size);
-        let a = _mm_load_si128(ptr as *const __m128i);
-        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
-        let eqa1 = _mm_cmpeq_epi8(vn1, a);
-        let eqb1 = _mm_cmpeq_epi8(vn1, b);
-        let eqa2 = _mm_cmpeq_epi8(vn2, a);
-        let eqb2 = _mm_cmpeq_epi8(vn2, b);
-        let or1 = _mm_or_si128(eqa1, eqb1);
-        let or2 = _mm_or_si128(eqa2, eqb2);
-        let or3 = _mm_or_si128(or1, or2);
-        if _mm_movemask_epi8(or3) != 0 {
-            let mut at = sub(ptr.add(VECTOR_SIZE), start_ptr);
-            let mask1 = _mm_movemask_epi8(eqb1);
-            let mask2 = _mm_movemask_epi8(eqb2);
-            if mask1 != 0 || mask2 != 0 {
-                return Some(at + reverse_pos2(mask1, mask2));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask1 = _mm_movemask_epi8(eqa1);
-            let mask2 = _mm_movemask_epi8(eqa2);
-            return Some(at + reverse_pos2(mask1, mask2));
-        }
-    }
-    while ptr >= start_ptr.add(VECTOR_SIZE) {
-        ptr = ptr.sub(VECTOR_SIZE);
-        if let Some(i) = reverse_search2(start_ptr, end_ptr, ptr, vn1, vn2) {
-            return Some(i);
-        }
-    }
-    if ptr > start_ptr {
-        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
-        return reverse_search2(start_ptr, end_ptr, start_ptr, vn1, vn2);
-    }
-    None
-}
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn memrchr3(
-    n1: u8,
-    n2: u8,
-    n3: u8,
-    haystack: &[u8],
-) -> Option<usize> {
-    let vn1 = _mm_set1_epi8(n1 as i8);
-    let vn2 = _mm_set1_epi8(n2 as i8);
-    let vn3 = _mm_set1_epi8(n3 as i8);
-    let len = haystack.len();
-    let loop_size = cmp::min(LOOP_SIZE2, len);
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = end_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr > start_ptr {
-            ptr = ptr.offset(-1);
-            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
-                return Some(sub(ptr, start_ptr));
-            }
-        }
-        return None;
-    }
-
-    ptr = ptr.sub(VECTOR_SIZE);
-    if let Some(i) = reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
-        return Some(i);
-    }
-
-    ptr = (end_ptr as usize & !VECTOR_ALIGN) as *const u8;
-    debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-    while loop_size == LOOP_SIZE2 && ptr >= start_ptr.add(loop_size) {
-        debug_assert_eq!(0, (ptr as usize) % VECTOR_SIZE);
-
-        ptr = ptr.sub(loop_size);
-        let a = _mm_load_si128(ptr as *const __m128i);
-        let b = _mm_load_si128(ptr.add(VECTOR_SIZE) as *const __m128i);
-        let eqa1 = _mm_cmpeq_epi8(vn1, a);
-        let eqb1 = _mm_cmpeq_epi8(vn1, b);
-        let eqa2 = _mm_cmpeq_epi8(vn2, a);
-        let eqb2 = _mm_cmpeq_epi8(vn2, b);
-        let eqa3 = _mm_cmpeq_epi8(vn3, a);
-        let eqb3 = _mm_cmpeq_epi8(vn3, b);
-        let or1 = _mm_or_si128(eqa1, eqb1);
-        let or2 = _mm_or_si128(eqa2, eqb2);
-        let or3 = _mm_or_si128(eqa3, eqb3);
-        let or4 = _mm_or_si128(or1, or2);
-        let or5 = _mm_or_si128(or3, or4);
-        if _mm_movemask_epi8(or5) != 0 {
-            let mut at = sub(ptr.add(VECTOR_SIZE), start_ptr);
-            let mask1 = _mm_movemask_epi8(eqb1);
-            let mask2 = _mm_movemask_epi8(eqb2);
-            let mask3 = _mm_movemask_epi8(eqb3);
-            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
-                return Some(at + reverse_pos3(mask1, mask2, mask3));
-            }
-
-            at -= VECTOR_SIZE;
-            let mask1 = _mm_movemask_epi8(eqa1);
-            let mask2 = _mm_movemask_epi8(eqa2);
-            let mask3 = _mm_movemask_epi8(eqa3);
-            return Some(at + reverse_pos3(mask1, mask2, mask3));
-        }
-    }
-    while ptr >= start_ptr.add(VECTOR_SIZE) {
-        ptr = ptr.sub(VECTOR_SIZE);
-        if let Some(i) =
-            reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
-        {
-            return Some(i);
-        }
-    }
-    if ptr > start_ptr {
-        debug_assert!(sub(ptr, start_ptr) < VECTOR_SIZE);
-        return reverse_search3(start_ptr, end_ptr, start_ptr, vn1, vn2, vn3);
-    }
-    None
-}
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn forward_search1(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m128i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm_loadu_si128(ptr as *const __m128i);
-    let mask = _mm_movemask_epi8(_mm_cmpeq_epi8(chunk, vn1));
-    if mask != 0 {
-        Some(sub(ptr, start_ptr) + forward_pos(mask))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn forward_search2(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m128i,
-    vn2: __m128i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm_loadu_si128(ptr as *const __m128i);
-    let eq1 = _mm_cmpeq_epi8(chunk, vn1);
-    let eq2 = _mm_cmpeq_epi8(chunk, vn2);
-    if _mm_movemask_epi8(_mm_or_si128(eq1, eq2)) != 0 {
-        let mask1 = _mm_movemask_epi8(eq1);
-        let mask2 = _mm_movemask_epi8(eq2);
-        Some(sub(ptr, start_ptr) + forward_pos2(mask1, mask2))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn forward_search3(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m128i,
-    vn2: __m128i,
-    vn3: __m128i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm_loadu_si128(ptr as *const __m128i);
-    let eq1 = _mm_cmpeq_epi8(chunk, vn1);
-    let eq2 = _mm_cmpeq_epi8(chunk, vn2);
-    let eq3 = _mm_cmpeq_epi8(chunk, vn3);
-    let or = _mm_or_si128(eq1, eq2);
-    if _mm_movemask_epi8(_mm_or_si128(or, eq3)) != 0 {
-        let mask1 = _mm_movemask_epi8(eq1);
-        let mask2 = _mm_movemask_epi8(eq2);
-        let mask3 = _mm_movemask_epi8(eq3);
-        Some(sub(ptr, start_ptr) + forward_pos3(mask1, mask2, mask3))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn reverse_search1(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m128i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm_loadu_si128(ptr as *const __m128i);
-    let mask = _mm_movemask_epi8(_mm_cmpeq_epi8(vn1, chunk));
-    if mask != 0 {
-        Some(sub(ptr, start_ptr) + reverse_pos(mask))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn reverse_search2(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m128i,
-    vn2: __m128i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm_loadu_si128(ptr as *const __m128i);
-    let eq1 = _mm_cmpeq_epi8(chunk, vn1);
-    let eq2 = _mm_cmpeq_epi8(chunk, vn2);
-    if _mm_movemask_epi8(_mm_or_si128(eq1, eq2)) != 0 {
-        let mask1 = _mm_movemask_epi8(eq1);
-        let mask2 = _mm_movemask_epi8(eq2);
-        Some(sub(ptr, start_ptr) + reverse_pos2(mask1, mask2))
-    } else {
-        None
-    }
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn reverse_search3(
-    start_ptr: *const u8,
-    end_ptr: *const u8,
-    ptr: *const u8,
-    vn1: __m128i,
-    vn2: __m128i,
-    vn3: __m128i,
-) -> Option<usize> {
-    debug_assert!(sub(end_ptr, start_ptr) >= VECTOR_SIZE);
-    debug_assert!(start_ptr <= ptr);
-    debug_assert!(ptr <= end_ptr.sub(VECTOR_SIZE));
-
-    let chunk = _mm_loadu_si128(ptr as *const __m128i);
-    let eq1 = _mm_cmpeq_epi8(chunk, vn1);
-    let eq2 = _mm_cmpeq_epi8(chunk, vn2);
-    let eq3 = _mm_cmpeq_epi8(chunk, vn3);
-    let or = _mm_or_si128(eq1, eq2);
-    if _mm_movemask_epi8(_mm_or_si128(or, eq3)) != 0 {
-        let mask1 = _mm_movemask_epi8(eq1);
-        let mask2 = _mm_movemask_epi8(eq2);
-        let mask3 = _mm_movemask_epi8(eq3);
-        Some(sub(ptr, start_ptr) + reverse_pos3(mask1, mask2, mask3))
-    } else {
-        None
-    }
-}
-
-/// Compute the position of the first matching byte from the given mask. The
-/// position returned is always in the range [0, 15].
-///
-/// The mask given is expected to be the result of _mm_movemask_epi8.
-fn forward_pos(mask: i32) -> usize {
-    // We are dealing with little endian here, where the most significant byte
-    // is at a higher address. That means the least significant bit that is set
-    // corresponds to the position of our first matching byte. That position
-    // corresponds to the number of zeros after the least significant bit.
-    mask.trailing_zeros() as usize
-}
-
-/// Compute the position of the first matching byte from the given masks. The
-/// position returned is always in the range [0, 15]. Each mask corresponds to
-/// the equality comparison of a single byte.
-///
-/// The masks given are expected to be the result of _mm_movemask_epi8, where
-/// at least one of the masks is non-zero (i.e., indicates a match).
-fn forward_pos2(mask1: i32, mask2: i32) -> usize {
-    debug_assert!(mask1 != 0 || mask2 != 0);
-
-    forward_pos(mask1 | mask2)
-}
-
-/// Compute the position of the first matching byte from the given masks. The
-/// position returned is always in the range [0, 15]. Each mask corresponds to
-/// the equality comparison of a single byte.
-///
-/// The masks given are expected to be the result of _mm_movemask_epi8, where
-/// at least one of the masks is non-zero (i.e., indicates a match).
-fn forward_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
-    debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
-
-    forward_pos(mask1 | mask2 | mask3)
-}
-
-/// Compute the position of the last matching byte from the given mask. The
-/// position returned is always in the range [0, 15].
-///
-/// The mask given is expected to be the result of _mm_movemask_epi8.
-fn reverse_pos(mask: i32) -> usize {
-    // We are dealing with little endian here, where the most significant byte
-    // is at a higher address. That means the most significant bit that is set
-    // corresponds to the position of our last matching byte. The position from
-    // the end of the mask is therefore the number of leading zeros in a 16
-    // bit integer, and the position from the start of the mask is therefore
-    // 16 - (leading zeros) - 1.
-    VECTOR_SIZE - (mask as u16).leading_zeros() as usize - 1
-}
-
-/// Compute the position of the last matching byte from the given masks. The
-/// position returned is always in the range [0, 15]. Each mask corresponds to
-/// the equality comparison of a single byte.
-///
-/// The masks given are expected to be the result of _mm_movemask_epi8, where
-/// at least one of the masks is non-zero (i.e., indicates a match).
-fn reverse_pos2(mask1: i32, mask2: i32) -> usize {
-    debug_assert!(mask1 != 0 || mask2 != 0);
-
-    reverse_pos(mask1 | mask2)
-}
-
-/// Compute the position of the last matching byte from the given masks. The
-/// position returned is always in the range [0, 15]. Each mask corresponds to
-/// the equality comparison of a single byte.
-///
-/// The masks given are expected to be the result of _mm_movemask_epi8, where
-/// at least one of the masks is non-zero (i.e., indicates a match).
-fn reverse_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
-    debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
-
-    reverse_pos(mask1 | mask2 | mask3)
-}
-
-/// Subtract `b` from `a` and return the difference. `a` should be greater than
-/// or equal to `b`.
-fn sub(a: *const u8, b: *const u8) -> usize {
-    debug_assert!(a >= b);
-    (a as usize) - (b as usize)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/x86/sse42.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/x86/sse42.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memchr/src/x86/sse42.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memchr/src/x86/sse42.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-// This code is unused. PCMPESTRI is gratuitously slow. I imagine it might
-// start winning with a hypothetical memchr4 (or greater). This technique might
-// also be good for exposing searches over ranges of bytes, but that departs
-// from the standard memchr API, so it's not clear whether we actually want
-// that or not.
-//
-// N.B. PCMPISTRI appears to be about twice as fast as PCMPESTRI, which is kind
-// of neat. Unfortunately, UTF-8 strings can contain NUL bytes, which means
-// I don't see a way of effectively using PCMPISTRI unless there's some fast
-// way to replace zero bytes with a byte that is not not a needle byte.
-
-use core::arch::x86_64::*;
-use core::mem::size_of;
-
-use x86::sse2;
-
-const VECTOR_SIZE: usize = size_of::<__m128i>();
-const CONTROL_ANY: i32 =
-    _SIDD_UBYTE_OPS
-    | _SIDD_CMP_EQUAL_ANY
-    | _SIDD_POSITIVE_POLARITY
-    | _SIDD_LEAST_SIGNIFICANT;
-
-#[target_feature(enable = "sse4.2")]
-pub unsafe fn memchr3(
-    n1: u8, n2: u8, n3: u8,
-    haystack: &[u8]
-) -> Option<usize> {
-    let vn1 = _mm_set1_epi8(n1 as i8);
-    let vn2 = _mm_set1_epi8(n2 as i8);
-    let vn3 = _mm_set1_epi8(n3 as i8);
-    let vn = _mm_setr_epi8(
-        n1 as i8, n2 as i8, n3 as i8, 0,
-        0, 0, 0, 0,
-        0, 0, 0, 0,
-        0, 0, 0, 0,
-    );
-    let len = haystack.len();
-    let start_ptr = haystack.as_ptr();
-    let end_ptr = haystack[haystack.len()..].as_ptr();
-    let mut ptr = start_ptr;
-
-    if haystack.len() < VECTOR_SIZE {
-        while ptr < end_ptr {
-            if *ptr == n1 || *ptr == n2 || *ptr == n3 {
-                return Some(sub(ptr, start_ptr));
-            }
-            ptr = ptr.offset(1);
-        }
-        return None;
-    }
-    while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        let chunk = _mm_loadu_si128(ptr as *const __m128i);
-        let res = _mm_cmpestri(vn, 3, chunk, 16, CONTROL_ANY);
-        if res < 16 {
-            return Some(sub(ptr, start_ptr) + res as usize);
-        }
-        ptr = ptr.add(VECTOR_SIZE);
-    }
-    if ptr < end_ptr {
-        debug_assert!(sub(end_ptr, ptr) < VECTOR_SIZE);
-        ptr = ptr.sub(VECTOR_SIZE - sub(end_ptr, ptr));
-        debug_assert_eq!(sub(end_ptr, ptr), VECTOR_SIZE);
-
-        return sse2::forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3);
-    }
-    None
-}
-
-/// Subtract `b` from `a` and return the difference. `a` should be greater than
-/// or equal to `b`.
-fn sub(a: *const u8, b: *const u8) -> usize {
-    debug_assert!(a >= b);
-    (a as usize) - (b as usize)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,4 +16,7 @@
     if ac.probe_rustc_version(1, 40) {
         println!("cargo:rustc-cfg=doctests");
     }
+    if ac.probe_rustc_version(1, 51) {
+        println!("cargo:rustc-cfg=raw_ref_macros");
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"333c7595740d7640056444df0ecc255393a198098f4a464902e2ec5fc6579086","LICENSE":"3234ac55816264ee7b6c7ee27efd61cf0a1fe775806870e3d9b4c41ea73c5cb1","README.md":"ab1f5d43646dda8a433f5b39e176007d6d3a19348cdb1e6a525e9d3f287223cf","build.rs":"35fa2f5fabdaba3ad8ad311bf4c402530e01b3103b6376c0a7249d9635be3c54","ci/miri.sh":"ad7410b0a5bd6e346f55e9d96ec0719a085a2d1ce266bddfe6fe73333a1eb8ec","src/lib.rs":"0621a03c51702403e46846f871bab0f576c9557f33b94c37431a57ce81c665d1","src/offset_of.rs":"e1836cde12a430c7639630efb1635a43321ec0a4d8cdeb6d0d9080b75e607fb7","src/raw_field.rs":"c19ff6ccbe40f9c1e2fa62e39bb4e4ac1b9a1c020a1ffdbc790c47615b37c010","src/span_of.rs":"2d9216b794327e95f55bad04ba7d8e76ff5313713c187b319348d8e5620aa0a9"},"package":"157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"}
\ No newline at end of file
+{"files":{"Cargo.toml":"3fd9136d039b26466b945ea2df9d1bbbff4070224c6c23985ba3e820a0a0de81","LICENSE":"3234ac55816264ee7b6c7ee27efd61cf0a1fe775806870e3d9b4c41ea73c5cb1","README.md":"4b12b99b8512f7da8178a33fdafe101e3342b82e035f41d1f354ee4926c3b4f5","build.rs":"6d677e33a1c98d588c97ec7985d4d5c3b954683e0a73c3dc53d79db4fbb5e638","ci/miri.sh":"ad7410b0a5bd6e346f55e9d96ec0719a085a2d1ce266bddfe6fe73333a1eb8ec","src/lib.rs":"abd194ab03259289876277152f7e26a6aadf12c877db8018743f976eae13d389","src/offset_of.rs":"fd69824267580c3a6981660fb533704e46850df64d756a4677239b6845e99ca6","src/raw_field.rs":"295cc971d64e51f3d053e56c692ae6ef3bb58915298f1ec49bb695b767daff46","src/span_of.rs":"e9e8eb985f51de0915351365f451d9b9e45385dc1d374f3d59373fa774939fe5"},"package":"59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "memoffset"
-version = "0.6.1"
+version = "0.6.4"
 authors = ["Gilad Naaman <gilad.naaman@gmail.com>"]
 description = "offset_of functionality for Rust structs."
 readme = "README.md"
@@ -28,4 +28,3 @@
 [features]
 default = []
 unstable_const = []
-unstable_raw = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -69,12 +69,5 @@
 
 Your crate root: (`lib.rs`/`main.rs`)
 ```rust,ignore
-#![feature(ptr_offset_from, const_ptr_offset_from, const_maybe_uninit_as_ptr, const_raw_ptr_deref)]
+#![feature(const_ptr_offset_from, const_maybe_uninit_as_ptr, const_raw_ptr_deref, const_refs_to_cell)]
 ```
-
-If you intend to use `offset_of!` inside a `const fn`, also add the `const_fn` compiler feature.
-
-### Raw references ###
-Recent nightlies support [a way to create raw pointers](https://github.com/rust-lang/rust/issues/73394) that avoids creating intermediate safe references.
-`memoffset` can make use of that feature to avoid what is technically Undefined Behavior.
-Use the `unstable_raw` feature to enable this.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -60,14 +60,12 @@
 #![cfg_attr(
     feature = "unstable_const",
     feature(
-        ptr_offset_from,
-        const_fn,
         const_ptr_offset_from,
         const_maybe_uninit_as_ptr,
         const_raw_ptr_deref,
+        const_refs_to_cell,
     )
 )]
-#![cfg_attr(feature = "unstable_raw", feature(raw_ref_macros))]
 
 #[macro_use]
 #[cfg(doctests)]
@@ -77,12 +75,20 @@
 #[cfg(doctest)]
 doctest!("../README.md");
 
-// This `use` statement enables the macros to use `$crate::mem`.
-// Doing this enables this crate to function under both std and no-std crates.
+/// Hiden module for things the macros need to access.
 #[doc(hidden)]
-pub use core::mem;
-#[doc(hidden)]
-pub use core::ptr;
+pub mod __priv {
+    #[doc(hidden)]
+    pub use core::mem;
+    #[doc(hidden)]
+    pub use core::ptr;
+
+    /// Use type inference to obtain the size of the pointee (without actually using the pointer).
+    #[doc(hidden)]
+    pub fn size_of_pointee<T>(_ptr: *const T) -> usize {
+        mem::size_of::<T>()
+    }
+}
 
 #[macro_use]
 mod raw_field;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/src/offset_of.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/src/offset_of.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/src/offset_of.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/src/offset_of.rs	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,7 @@
         // so it has to be in the same scope as `$name`. That's why
         // `let_base_ptr` declares a variable (several, actually)
         // instead of returning one.
-        let uninit = $crate::mem::MaybeUninit::<$type>::uninit();
+        let uninit = $crate::__priv::mem::MaybeUninit::<$type>::uninit();
         let $name: *const $type = uninit.as_ptr();
     };
 }
@@ -41,7 +41,7 @@
     ($name:ident, $type:ty) => {
         // No UB right here, but we will later dereference this pointer to
         // offset into a field, and that is UB because the pointer is dangling.
-        let $name = $crate::mem::align_of::<$type>() as *const $type;
+        let $name = $crate::__priv::mem::align_of::<$type>() as *const $type;
     };
 }
 
@@ -49,17 +49,19 @@
 #[cfg(feature = "unstable_const")]
 #[macro_export]
 #[doc(hidden)]
-macro_rules! _memoffset_offset_from {
-    ($field:expr, $base:expr) => {
+macro_rules! _memoffset_offset_from_unsafe {
+    ($field:expr, $base:expr) => {{
+        let field = $field; // evaluate $field outside the `unsafe` block
+        let base = $base; // evaluate $base outside the `unsafe` block
         // Compute offset, with unstable `offset_from` for const-compatibility.
         // (Requires the pointers to not dangle, but we already need that for `raw_field!` anyway.)
-        unsafe { ($field as *const u8).offset_from($base as *const u8) as usize }
-    };
+        unsafe { (field as *const u8).offset_from(base as *const u8) as usize }
+    }};
 }
 #[cfg(not(feature = "unstable_const"))]
 #[macro_export]
 #[doc(hidden)]
-macro_rules! _memoffset_offset_from {
+macro_rules! _memoffset_offset_from_unsafe {
     ($field:expr, $base:expr) => {
         // Compute offset.
         ($field as usize) - ($base as usize)
@@ -93,7 +95,7 @@
         // Get field pointer.
         let field_ptr = raw_field!(base_ptr, $parent, $field);
         // Compute offset.
-        _memoffset_offset_from!(field_ptr, base_ptr)
+        _memoffset_offset_from_unsafe!(field_ptr, base_ptr)
     }};
 }
 
@@ -117,7 +119,7 @@
         // Get field pointer.
         let field_ptr = raw_field_tuple!(base_ptr, $parent, $field);
         // Compute offset.
-        _memoffset_offset_from!(field_ptr, base_ptr)
+        _memoffset_offset_from_unsafe!(field_ptr, base_ptr)
     }};
 }
 
@@ -249,6 +251,18 @@
         }
 
         assert_eq!([0; offset_of!(Foo, b)].len(), 4);
+    }
+
+    #[cfg(feature = "unstable_const")]
+    #[test]
+    fn const_offset_interior_mutable() {
+        #[repr(C)]
+        struct Foo {
+            a: u32,
+            b: core::cell::Cell<u32>,
+        }
+
+        assert_eq!([0; offset_of!(Foo, b)].len(), 4);
     }
 
     #[cfg(feature = "unstable_const")]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/src/raw_field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/src/raw_field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/src/raw_field.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/src/raw_field.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,22 +18,22 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-/// `raw_const!`, or just ref-then-cast when that is not available.
-#[cfg(feature = "unstable_raw")]
+/// `addr_of!`, or just ref-then-cast when that is not available.
+#[cfg(raw_ref_macros)]
 #[macro_export]
 #[doc(hidden)]
-macro_rules! _memoffset__raw_const {
+macro_rules! _memoffset__addr_of {
     ($path:expr) => {{
-        $crate::ptr::raw_const!($path)
+        $crate::__priv::ptr::addr_of!($path)
     }};
 }
-#[cfg(not(feature = "unstable_raw"))]
+#[cfg(not(raw_ref_macros))]
 #[macro_export]
 #[doc(hidden)]
-macro_rules! _memoffset__raw_const {
+macro_rules! _memoffset__addr_of {
     ($path:expr) => {{
         // This is UB because we create an intermediate reference to uninitialized memory.
-        // Nothing we can do about that without `raw_const!` though.
+        // Nothing we can do about that without `addr_of!` though.
         &$path as *const _
     }};
 }
@@ -82,13 +82,14 @@
 macro_rules! raw_field {
     ($base:expr, $parent:path, $field:tt) => {{
         _memoffset__field_check!($parent, $field);
+        let base = $base; // evaluate $base outside the `unsafe` block
 
         // Get the field address.
         // Crucially, we know that this will not trigger a deref coercion because
         // of the field check we did above.
         #[allow(unused_unsafe)] // for when the macro is used in an unsafe block
         unsafe {
-            _memoffset__raw_const!((*($base as *const $parent)).$field)
+            _memoffset__addr_of!((*(base as *const $parent)).$field)
         }
     }};
 }
@@ -103,13 +104,14 @@
 macro_rules! raw_field_tuple {
     ($base:expr, $parent:ty, $field:tt) => {{
         _memoffset__field_check_tuple!($parent, $field);
+        let base = $base; // evaluate $base outside the `unsafe` block
 
         // Get the field address.
         // Crucially, we know that this will not trigger a deref coercion because
         // of the field check we did above.
         #[allow(unused_unsafe)] // for when the macro is used in an unsafe block
         unsafe {
-            _memoffset__raw_const!((*($base as *const $parent)).$field)
+            _memoffset__addr_of!((*(base as *const $parent)).$field)
         }
     }};
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/src/span_of.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/src/span_of.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/memoffset/src/span_of.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/memoffset/src/span_of.rs	2021-12-09 12:01:26.000000000 +0000
@@ -95,23 +95,21 @@
     };
     // No explicit begin for range.
     (@helper $root:ident, $parent:path, [] ..) => {{
-        // UB due to taking references to uninitialized fields for `size_of_val`.
         ($root as usize,
-         $root as usize + $crate::mem::size_of_val(&(*$root)))
+         $root as usize + $crate::__priv::size_of_pointee($root))
     }};
-    (@helper $root:ident, $parent:path, [] ..= $field:tt) => {{
-        // UB due to taking references to uninitialized fields for `size_of_val`.
-        ($root as usize,
-         raw_field!($root, $parent, $field) as usize + $crate::mem::size_of_val(&(*$root).$field))
+    (@helper $root:ident, $parent:path, [] ..= $end:tt) => {{
+        let end = raw_field!($root, $parent, $end);
+        ($root as usize, end as usize + $crate::__priv::size_of_pointee(end))
     }};
-    (@helper $root:ident, $parent:path, [] .. $field:tt) => {{
-        ($root as usize, raw_field!($root, $parent, $field) as usize)
+    (@helper $root:ident, $parent:path, [] .. $end:tt) => {{
+        ($root as usize, raw_field!($root, $parent, $end) as usize)
     }};
     // Explicit begin and end for range.
     (@helper $root:ident, $parent:path, # $begin:tt [] ..= $end:tt) => {{
-        // UB due to taking references to uninitialized fields for `size_of_val`.
-        (raw_field!($root, $parent, $begin) as usize,
-         raw_field!($root, $parent, $end) as usize + $crate::mem::size_of_val(&(*$root).$end))
+        let begin = raw_field!($root, $parent, $begin);
+        let end = raw_field!($root, $parent, $end);
+        (begin as usize, end as usize + $crate::__priv::size_of_pointee(end))
     }};
     (@helper $root:ident, $parent:path, # $begin:tt [] .. $end:tt) => {{
         (raw_field!($root, $parent, $begin) as usize,
@@ -119,19 +117,17 @@
     }};
     // No explicit end for range.
     (@helper $root:ident, $parent:path, # $begin:tt [] ..) => {{
-        // UB due to taking references to uninitialized fields for `size_of_val`.
         (raw_field!($root, $parent, $begin) as usize,
-         $root as usize + $crate::mem::size_of_val(&*$root))
+         $root as usize + $crate::__priv::size_of_pointee($root))
     }};
     (@helper $root:ident, $parent:path, # $begin:tt [] ..=) => {{
         _memoffset__compile_error!(
             "Found inclusive range to the end of a struct. Did you mean '..' instead of '..='?")
     }};
     // Just one field.
-    (@helper $root:ident, $parent:path, # $begin:tt []) => {{
-        // UB due to taking references to uninitialized fields for `size_of_val`.
-        (raw_field!($root, $parent, $begin) as usize,
-         raw_field!($root, $parent, $begin) as usize + $crate::mem::size_of_val(&(*$root).$begin))
+    (@helper $root:ident, $parent:path, # $field:tt []) => {{
+        let field = raw_field!($root, $parent, $field);
+        (field as usize, field as usize + $crate::__priv::size_of_pointee(field))
     }};
     // Parsing.
     (@helper $root:ident, $parent:path, $(# $begin:tt)+ [] $tt:tt $($rest:tt)*) => {{
@@ -143,13 +139,11 @@
 
     // Entry point.
     ($sty:path, $($exp:tt)+) => ({
-        unsafe {
-            // Get a base pointer.
-            _memoffset__let_base_ptr!(root, $sty);
-            let base = root as usize;
-            let (begin, end) = span_of!(@helper root, $sty, [] $($exp)*);
-            begin-base..end-base
-        }
+        // Get a base pointer.
+        _memoffset__let_base_ptr!(root, $sty);
+        let base = root as usize;
+        let (begin, end) = span_of!(@helper root, $sty, [] $($exp)*);
+        begin-base..end-base
     });
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/benches/benchmark.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/benches/benchmark.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/benches/benchmark.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/benches/benchmark.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-#[macro_use]
-extern crate criterion;
-extern crate mime_guess;
-
-use self::criterion::Criterion;
-
-use mime_guess::from_ext;
-
-include!("../src/mime_types.rs");
-
-/// WARNING: this may take a while!
-fn bench_mime_str(c: &mut Criterion) {
-    c.bench_function("from_ext", |b| {
-        for (mime_ext, _) in MIME_TYPES {
-            b.iter(|| from_ext(mime_ext).first_raw());
-        }
-    });
-}
-
-fn bench_mime_str_uppercase(c: &mut Criterion) {
-    c.bench_function("from_ext uppercased", |b| {
-        let uppercased = MIME_TYPES.into_iter().map(|(s, _)| s.to_uppercase());
-
-        for mime_ext in uppercased {
-            b.iter(|| from_ext(&mime_ext).first_raw());
-        }
-    });
-}
-
-criterion_group!(benches, bench_mime_str, bench_mime_str_uppercase);
-criterion_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,191 +0,0 @@
-#[cfg(feature = "phf")]
-extern crate phf_codegen;
-extern crate unicase;
-
-use unicase::UniCase;
-
-use std::env;
-use std::fs::File;
-use std::io::prelude::*;
-use std::io::BufWriter;
-use std::path::Path;
-
-use std::collections::BTreeMap;
-
-use mime_types::MIME_TYPES;
-
-#[path = "src/mime_types.rs"]
-mod mime_types;
-
-#[cfg(feature = "phf")]
-const PHF_PATH: &str = "::impl_::phf";
-
-fn main() {
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let dest_path = Path::new(&out_dir).join("mime_types_generated.rs");
-    let mut outfile = BufWriter::new(File::create(dest_path).unwrap());
-
-    #[cfg(feature = "phf")]
-    build_forward_map(&mut outfile);
-
-    #[cfg(feature = "rev-mappings")]
-    build_rev_map(&mut outfile);
-}
-
-// Build forward mappings (ext -> mime type)
-#[cfg(feature = "phf")]
-fn build_forward_map<W: Write>(out: &mut W) {
-    use phf_codegen::Map as PhfMap;
-
-    let mut forward_map = PhfMap::new();
-    forward_map.phf_path(PHF_PATH);
-
-    let mut map_entries: Vec<(&str, Vec<&str>)> = Vec::new();
-
-    for &(key, types) in MIME_TYPES {
-        if let Some(&mut (key_, ref mut values)) = map_entries.last_mut() {
-            // deduplicate extensions
-            if key == key_ {
-                values.extend_from_slice(types);
-                continue;
-            }
-        }
-
-        map_entries.push((key, types.into()));
-    }
-
-    for (key, values) in map_entries {
-        forward_map.entry(
-            UniCase::new(key),
-            &format!("&{:?}", values),
-        );
-    }
-
-    writeln!(
-        out,
-        "static MIME_TYPES: phf::Map<UniCase<&'static str>, &'static [&'static str]> = \n{};",
-        forward_map.build()
-    )
-        .unwrap();
-}
-
-// Build reverse mappings (mime type -> ext)
-#[cfg(all(feature = "phf", feature = "rev-mappings"))]
-fn build_rev_map<W: Write>(out: &mut W) {
-    use phf_codegen::Map as PhfMap;
-
-    let dyn_map = get_rev_mappings();
-
-    let mut rev_map = PhfMap::new();
-    rev_map.phf_path(PHF_PATH);
-
-    let mut exts = Vec::new();
-
-    for (top, subs) in dyn_map {
-        let top_start = exts.len();
-
-        let mut sub_map = PhfMap::new();
-        sub_map.phf_path(PHF_PATH);
-
-        for (sub, sub_exts) in subs {
-            let sub_start = exts.len();
-            exts.extend(sub_exts);
-            let sub_end = exts.len();
-
-            sub_map.entry(sub, &format!("({}, {})", sub_start, sub_end));
-        }
-
-        let top_end = exts.len();
-
-        rev_map.entry(
-            top,
-            &format!(
-                "TopLevelExts {{ start: {}, end: {}, subs: {} }}",
-                top_start, top_end, sub_map.build()
-            ),
-        );
-    }
-
-    writeln!(
-        out,
-        "static REV_MAPPINGS: phf::Map<UniCase<&'static str>, TopLevelExts> = \n{};",
-        rev_map.build()
-    ).unwrap();
-
-    writeln!(out, "const EXTS: &'static [&'static str] = &{:?};", exts).unwrap();
-}
-
-#[cfg(all(not(feature = "phf"), feature = "rev-mappings"))]
-fn build_rev_map<W: Write>(out: &mut W) {
-    use std::fmt::Write as _;
-
-    macro_rules! unicase_const {
-        ($s:expr) => ({
-            format_args!("{}({:?})", (if $s.is_ascii() {
-                "UniCase::ascii"
-            } else {
-                "UniCase::unicode"
-            }), $s)
-        })
-    }
-
-    let dyn_map = get_rev_mappings();
-
-    write!(out, "static REV_MAPPINGS: &'static [(UniCase<&'static str>, TopLevelExts)] = &[").unwrap();
-
-    let mut exts = Vec::new();
-
-    for (top, subs) in dyn_map {
-        let top_start = exts.len();
-
-        let mut sub_map = String::new();
-
-        for (sub, sub_exts) in subs {
-            let sub_start = exts.len();
-            exts.extend(sub_exts);
-            let sub_end = exts.len();
-
-            write!(
-                sub_map,
-                "({}, ({}, {})),",
-                unicase_const!(sub), sub_start, sub_end
-            ).unwrap();
-        }
-
-        let top_end = exts.len();
-
-        write!(
-            out,
-            "({}, TopLevelExts {{ start: {}, end: {}, subs: &[{}] }}),",
-            unicase_const!(top), top_start, top_end, sub_map
-        ).unwrap();
-    }
-
-    writeln!(out, "];").unwrap();
-
-    writeln!(out, "const EXTS: &'static [&'static str] = &{:?};", exts).unwrap();
-}
-
-#[cfg(feature = "rev-mappings")]
-fn get_rev_mappings(
-) -> BTreeMap<UniCase<&'static str>, BTreeMap<UniCase<&'static str>, Vec<&'static str>>> {
-    // First, collect all the mime type -> ext mappings)
-    let mut dyn_map = BTreeMap::new();
-    for &(key, types) in MIME_TYPES {
-        for val in types {
-            let (top, sub) = split_mime(val);
-            dyn_map
-                .entry(UniCase::new(top))
-                .or_insert_with(BTreeMap::new)
-                .entry(UniCase::new(sub))
-                .or_insert_with(Vec::new)
-                .push(key);
-        }
-    }
-    dyn_map
-}
-
-fn split_mime(mime: &str) -> (&str, &str) {
-    let split_idx = mime.find('/').unwrap();
-    (&mime[..split_idx], &mime[split_idx + 1..])
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.lock":"68df26849ead62e10cc255ca2009ddba651d393be3499aefa24d25538922768f","Cargo.toml":"b7877455bb621228f87ed556f04c007d2704ad3193d1aabeb7526d4006008699","LICENSE":"6919f1acec82afc721be2d9907b993267f433a44d25d8aedf1003b5f59ebfd46","README.md":"8e1db7c6f134caf08edd05732f61de07a322446c58f081cfc0220e7447ab051c","benches/benchmark.rs":"2287c7233cf78a9af98b2b53cd20e221e4a785209bd70a87030f1ade34a02507","build.rs":"8e47254c0a927eeb243058cfc0da413f34a958226707c941e8634e4514562f04","examples/rev_map.rs":"0bab6cc20b9eace741c6cc4a8c67ebfa124df1bf213038c5e34976081ffd2ebc","src/impl_bin_search.rs":"32a89409690d57f074f11eb93a9d6e422f73788af63fc29f980e13d1c2d2fa6f","src/impl_phf.rs":"321028cc657364c6f7c5b5f538b0033bcfd6f3b5ef711304d806c0644466a964","src/lib.rs":"8c8db560605b46a13062a168283e8b0f459242718682642b1f167bec686e5606","src/mime_types.rs":"06223533119bc845dece004db99b2cdc6d43ba5bad19f65628438bc36adb9b2d"},"package":"2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,686 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "anyhow"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bitflags"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bstr"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cast"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "clap"
-version = "2.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "criterion"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "criterion-plot 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
- "tinytemplate 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "csv"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bstr 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "csv-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "either"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "heck"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "itertools"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "js-sys"
-version = "0.3.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "log"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memchr"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memoffset"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.3"
-dependencies = [
- "criterion 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "nom"
-version = "4.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "oorandom"
-version = "11.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "plotters"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rayon"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde"
-version = "1.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde_derive"
-version = "1.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "sourcefile"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "syn"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "version_check"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "walkdir"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wasm-bindgen-webidl"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-webidl 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "weedle"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"
-"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
-"checksum bstr 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "502ae1441a0a5adb8fbd38a5955a6416b9493e92b465de5e4a9bde6a539c2c48"
-"checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
-"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-"checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-"checksum criterion 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1"
-"checksum criterion-plot 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a01e15e0ea58e8234f96146b1f91fa9d0e4dd7a38da93ff7a75d42c0b9d3a545"
-"checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
-"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-"checksum csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
-"checksum csv-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-"checksum hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
-"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
-"checksum js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7889c7c36282151f6bf465be4700359318aef36baa951462382eae49e9577cf9"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
-"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
-"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
-"checksum oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
-"checksum plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
-"checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
-"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
-"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
-"checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
-"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
-"checksum serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25"
-"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
-"checksum syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum tinytemplate 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "57a3c6667d3e65eb1bc3aed6fd14011c6cbc3a0665218ab7f5daf040b9ec371a"
-"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
-"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-"checksum wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c"
-"checksum wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "11cdb95816290b525b32587d76419facd99662a07e59d3cdb560488a819d9a45"
-"checksum wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3"
-"checksum wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
-"checksum wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f5e7e61fc929f4c0dddb748b102ebf9f632e2b8d739f2016542b4de2965a9601"
-"checksum wasm-bindgen-webidl 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "ef012a0d93fc0432df126a8eaf547b2dce25a8ce9212e1d3cbeef5c11157975d"
-"checksum web-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "aaf97caf6aa8c2b1dac90faf0db529d9d63c93846cca4911856f78a83cebf53b"
-"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
-"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "mime_guess"
-version = "2.0.3"
-authors = ["Austin Bonander <austin.bonander@gmail.com>"]
-description = "A simple crate for detection of a file's MIME type by its extension."
-documentation = "https://docs.rs/mime_guess/"
-readme = "README.md"
-keywords = ["mime", "filesystem", "extension"]
-license = "MIT"
-repository = "https://github.com/abonander/mime_guess"
-
-[[example]]
-name = "rev_map"
-required-features = ["rev-mappings"]
-
-[[bench]]
-name = "benchmark"
-harness = false
-[dependencies.mime]
-version = "0.3"
-
-[dependencies.unicase]
-version = "2.4.0"
-[dev-dependencies.criterion]
-version = "0.3"
-[build-dependencies.unicase]
-version = "2.4.0"
-
-[features]
-default = ["rev-mappings"]
-rev-mappings = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/examples/rev_map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/examples/rev_map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/examples/rev_map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/examples/rev_map.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-extern crate mime_guess;
-
-fn main() {
-    print_exts("video/*");
-    print_exts("video/x-matroska");
-}
-
-fn print_exts(mime_type: &str) {
-    println!(
-        "Exts for {:?}: {:?}",
-        mime_type,
-        mime_guess::get_mime_extensions_str(mime_type)
-    );
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Austin Bonander
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-# mime_guess [![Build Status](https://travis-ci.org/abonander/mime_guess.svg?branch=master)](https://travis-ci.org/abonander/mime_guess) [![Crates.io](https://img.shields.io/crates/v/mime_guess.svg)](https://crates.io/crates/mime_guess)
-
-MIME/MediaType guessing by file extension. 
-Uses a static map of known file extension -> MIME type mappings.
-
-**Returning Contributors: New Requirements for Submissions Below**
-
-##### Required Rust Version: 1.33
-
-#### [Documentation](https://docs.rs/mime_guess/)
-
-### Versioning
-
-Due to a mistaken premature release, `mime_guess` currently publicly depends on a pre-1.0 `mime`,
-which means `mime` upgrades are breaking changes and necessitate a major version bump. 
-Refer to the following table to find a version of `mime_guess` which matches your version of `mime`:
-
-| `mime` version | `mime_guess` version |
-|----------------|----------------------|
-| `0.1.x, 0.2.x` | `1.x.y` |
-| `0.3.x`        | `2.x.y` |
-
-#### Note: MIME Types Returned Are Not Stable/Guaranteed
-The media types returned for a given extension are not considered to be part of the crate's
- stable API and are often updated in patch (`x.y.z + 1`) releases to be as correct as possible. MIME
- changes are backported to previous major releases on a best-effort basis.
- 
-Note that only the extensions of paths/filenames are inspected in order to guess the MIME type. The
-file that may or may not reside at that path may or may not be a valid file of the returned MIME type.
-Be wary of unsafe or un-validated assumptions about file structure or length.
-
-An extension may also have multiple applicable MIME types. When more than one is returned, the first
-is considered to be the most "correct"--see below for elaboration.
-
-Contributing
------------
-
-#### Adding or correcting MIME types for extensions
-
-Is the MIME type for a file extension wrong or missing? Great! 
-Well, not great for us, but great for you if you'd like to open a pull request! 
-
-The file extension -> MIME type mappings are listed in `src/mime_types.rs`. 
-**The list is sorted lexicographically by file extension, and all extensions are lowercase (where applicable).** 
-The former is necessary to support fallback to binary search when the 
-`phf-map` feature is turned off, and for the maintainers' sanity.
-The latter is only for consistency's sake; the search is case-insensitive.
-
-Simply add or update the appropriate string pair(s) to make the correction(s) needed. 
-Run `cargo test` to make sure the library continues to work correctly.
-
-#### Important! Citing the corrected MIME type 
-
-When opening a pull request, please include a link to an official document or RFC noting 
-the correct MIME type for the file type in question **in the commit message** so
-that the commit history can be used as an audit trail.
-
-Though we're only guessing here, we like to be as correct as we can. 
-It makes it much easier to vet your contribution if we don't have to search for corroborating material.
-
-#### Multiple MIME types per extension
-As of `2.0.0`, multiple MIME types per extension are supported. The first MIME type in the list for 
-a given extension should be the most "correct" so users who only care about getting a single MIME 
-type can use the `first*()` methods.
-
-The definition of "correct" is open to debate, however. In the author's opinion this should be 
-whatever is defined by the latest IETF RFC for the given file format, or otherwise explicitly 
-supercedes all others.
-
-If an official IANA registration replaces an older "experimental" style media type, please
-place the new type before the old type in the list, but keep the old type for reference.
-
-#### Changes to the API or operation of the crate
-
-We're open to changes to the crate's API or its inner workings, breaking or not, if it improves the overall operation, efficiency, or ergonomics of the crate. However, it would be a good idea to open an issue on the repository so we can discuss your proposed changes and decide how best to approach them.
-
-
-License
--------
-
-MIT (See the `LICENSE` file in this repository for more information.)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/src/impl_bin_search.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/src/impl_bin_search.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/src/impl_bin_search.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/src/impl_bin_search.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-use unicase::UniCase;
-
-include!("mime_types.rs");
-include!(concat!(env!("OUT_DIR"), "/mime_types_generated.rs"));
-
-#[cfg(feature = "rev-mappings")]
-#[derive(Copy, Clone)]
-struct TopLevelExts {
-    start: usize,
-    end: usize,
-    subs: &'static [(UniCase<&'static str>, (usize, usize))],
-}
-
-pub fn get_mime_types(ext: &str) -> Option<&'static [&'static str]> {
-    let ext = UniCase::new(ext);
-
-    map_lookup(MIME_TYPES, &ext)
-}
-
-#[cfg(feature = "rev-mappings")]
-pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
-    if toplevel == "*" {
-        return Some(EXTS);
-    }
-
-    let top = map_lookup(REV_MAPPINGS, toplevel)?;
-
-    if sublevel == "*" {
-        return Some(&EXTS[top.start..top.end]);
-    }
-
-    let sub = map_lookup(&top.subs, sublevel)?;
-    Some(&EXTS[sub.0..sub.1])
-}
-
-fn map_lookup<K, V>(map: &'static [(K, V)], key: &str) -> Option<V>
-    where K: Copy + Into<UniCase<&'static str>>, V: Copy {
-    map.binary_search_by_key(&UniCase::new(key), |(k, _)| (*k).into())
-        .ok()
-        .map(|i| map[i].1)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/src/impl_phf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/src/impl_phf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/src/impl_phf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/src/impl_phf.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-extern crate phf;
-
-use unicase::UniCase;
-
-include!(concat!(env!("OUT_DIR"), "/mime_types_generated.rs"));
-
-#[cfg(feature = "rev-mappings")]
-struct TopLevelExts {
-    start: usize,
-    end: usize,
-    subs: phf::Map<UniCase<&'static str>, (usize, usize)>,
-}
-
-pub fn get_mime_types(ext: &str) -> Option<&'static [&'static str]> {
-    map_lookup(&MIME_TYPES, ext).cloned()
-}
-
-pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
-    if toplevel == "*" {
-        return Some(EXTS);
-    }
-
-    let top = map_lookup(&REV_MAPPINGS, toplevel)?;
-
-    if sublevel == "*" {
-        return Some(&EXTS[top.start..top.end]);
-    }
-
-    let sub = map_lookup(&top.subs, sublevel)?;
-    Some(&EXTS[sub.0..sub.1])
-}
-
-fn map_lookup<'key, 'map: 'key, V>(
-    map: &'map phf::Map<UniCase<&'static str>, V>,
-    key: &'key str,
-) -> Option<&'map V> {
-    // FIXME: this doesn't compile unless we transmute `key` to `UniCase<&'static str>`
-    // https://github.com/sfackler/rust-phf/issues/169
-    map.get(&UniCase::new(key))
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,526 +0,0 @@
-//! Guessing of MIME types by file extension.
-//!
-//! Uses a static list of file-extension : MIME type mappings.
-//!
-//! ```
-//! # extern crate mime;
-//! // the file doesn't have to exist, it just looks at the path
-//! let guess = mime_guess::from_path("some_file.gif");
-//! assert_eq!(guess.first(), Some(mime::IMAGE_GIF));
-//!
-//! ```
-//!
-//! #### Note: MIME Types Returned Are Not Stable/Guaranteed
-//! The media types returned for a given extension are not considered to be part of the crate's
-//! stable API and are often updated in patch <br /> (`x.y.[z + 1]`) releases to be as correct as
-//! possible.
-//!
-//! Additionally, only the extensions of paths/filenames are inspected in order to guess the MIME
-//! type. The file that may or may not reside at that path may or may not be a valid file of the
-//! returned MIME type.  Be wary of unsafe or un-validated assumptions about file structure or
-//! length.
-pub extern crate mime;
-extern crate unicase;
-
-pub use mime::Mime;
-
-use std::ffi::OsStr;
-use std::iter::FusedIterator;
-use std::path::Path;
-use std::{iter, slice};
-
-#[cfg(feature = "phf")]
-#[path = "impl_phf.rs"]
-mod impl_;
-
-#[cfg(not(feature = "phf"))]
-#[path = "impl_bin_search.rs"]
-mod impl_;
-
-/// A "guess" of the MIME/Media Type(s) of an extension or path as one or more
-/// [`Mime`](struct.Mime.html) instances.
-///
-/// ### Note: Ordering
-/// A given file format may have one or more applicable Media Types; in this case
-/// the first Media Type returned is whatever is declared in the latest IETF RFC for the
-/// presumed file format or the one that explicitly supercedes all others.
-/// Ordering of additional Media Types is arbitrary.
-///
-/// ### Note: Values Not Stable
-/// The exact Media Types returned in any given guess are not considered to be stable and are often
-/// updated in patch releases in order to reflect the most up-to-date information possible.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-// FIXME: change repr when `mime` gains macro/const fn constructor
-pub struct MimeGuess(&'static [&'static str]);
-
-impl MimeGuess {
-    /// Guess the MIME type of a file (real or otherwise) with the given extension.
-    ///
-    /// The search is case-insensitive.
-    ///
-    /// If `ext` is empty or has no (currently) known MIME type mapping, then an empty guess is
-    /// returned.
-    pub fn from_ext(ext: &str) -> MimeGuess {
-        if ext.is_empty() {
-            return MimeGuess(&[]);
-        }
-
-        impl_::get_mime_types(ext).map_or(MimeGuess(&[]), |v| MimeGuess(v))
-    }
-
-    /// Guess the MIME type of `path` by its extension (as defined by
-    /// [`Path::extension()`]). **No disk access is performed.**
-    ///
-    /// If `path` has no extension, the extension cannot be converted to `str`, or has
-    /// no known MIME type mapping, then an empty guess is returned.
-    ///
-    /// The search is case-insensitive.
-    ///
-    /// ## Note
-    /// **Guess** is the operative word here, as there are no guarantees that the contents of the
-    /// file that `path` points to match the MIME type associated with the path's extension.
-    ///
-    /// Take care when processing files with assumptions based on the return value of this function.
-    ///
-    /// [`Path::extension()`]: https://doc.rust-lang.org/std/path/struct.Path.html#method.extension
-    pub fn from_path<P: AsRef<Path>>(path: P) -> MimeGuess {
-        path.as_ref()
-            .extension()
-            .and_then(OsStr::to_str)
-            .map_or(MimeGuess(&[]), Self::from_ext)
-    }
-
-    /// `true` if the guess did not return any known mappings for the given path or extension.
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    /// Get the number of MIME types in the current guess.
-    pub fn count(&self) -> usize {
-        self.0.len()
-    }
-
-    /// Get the first guessed `Mime`, if applicable.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first(&self) -> Option<Mime> {
-        self.first_raw().map(expect_mime)
-    }
-
-    /// Get the first guessed Media Type as a string, if applicable.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first_raw(&self) -> Option<&'static str> {
-        self.0.get(0).cloned()
-    }
-
-    /// Get the first guessed `Mime`, or if the guess is empty, return
-    /// [`application/octet-stream`] instead.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    ///
-    /// ### Note: HTTP Applications
-    /// For HTTP request and response bodies if a value for the `Content-Type` header
-    /// cannot be determined it might be preferable to not send one at all instead of defaulting to
-    /// `application/content-stream` as the recipient will expect to infer the format directly from
-    /// the content instead. ([RFC 7231, Section 3.1.1.5][rfc7231])
-    ///
-    /// On the contrary, for `multipart/form-data` bodies, the `Content-Type` of a form-data part is
-    /// assumed to be `text/plain` unless specified so a default of `application/content-stream`
-    /// for non-text parts is safer. ([RFC 7578, Section 4.4][rfc7578])
-    ///
-    /// [`application/octet-stream`]: https://docs.rs/mime/0.3/mime/constant.APPLICATION_OCTET_STREAM.html
-    /// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
-    /// [rfc7578]: https://tools.ietf.org/html/rfc7578#section-4.4
-    pub fn first_or_octet_stream(&self) -> Mime {
-        self.first_or(mime::APPLICATION_OCTET_STREAM)
-    }
-
-    /// Get the first guessed `Mime`, or if the guess is empty, return
-    /// [`text/plain`](::mime::TEXT_PLAIN) instead.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first_or_text_plain(&self) -> Mime {
-        self.first_or(mime::TEXT_PLAIN)
-    }
-
-    /// Get the first guessed `Mime`, or if the guess is empty, return the given `Mime` instead.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first_or(&self, default: Mime) -> Mime {
-        self.first().unwrap_or(default)
-    }
-
-    /// Get the first guessed `Mime`, or if the guess is empty, execute the closure and return its
-    /// result.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first_or_else<F>(&self, default_fn: F) -> Mime
-    where
-        F: FnOnce() -> Mime,
-    {
-        self.first().unwrap_or_else(default_fn)
-    }
-
-    /// Get an iterator over the `Mime` values contained in this guess.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn iter(&self) -> Iter {
-        Iter(self.iter_raw().map(expect_mime))
-    }
-
-    /// Get an iterator over the raw media-type strings in this guess.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn iter_raw(&self) -> IterRaw {
-        IterRaw(self.0.iter().cloned())
-    }
-}
-
-impl IntoIterator for MimeGuess {
-    type Item = Mime;
-    type IntoIter = Iter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-impl<'a> IntoIterator for &'a MimeGuess {
-    type Item = Mime;
-    type IntoIter = Iter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-/// An iterator over the `Mime` types of a `MimeGuess`.
-///
-/// See [Note: Ordering on `MimeGuess`](struct.MimeGuess.html#note-ordering).
-#[derive(Clone, Debug)]
-pub struct Iter(iter::Map<IterRaw, fn(&'static str) -> Mime>);
-
-impl Iterator for Iter {
-    type Item = Mime;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next()
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.0.size_hint()
-    }
-}
-
-impl DoubleEndedIterator for Iter {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        self.0.next_back()
-    }
-}
-
-impl FusedIterator for Iter {}
-
-impl ExactSizeIterator for Iter {
-    fn len(&self) -> usize {
-        self.0.len()
-    }
-}
-
-/// An iterator over the raw media type strings of a `MimeGuess`.
-///
-/// See [Note: Ordering on `MimeGuess`](struct.MimeGuess.html#note-ordering).
-#[derive(Clone, Debug)]
-pub struct IterRaw(iter::Cloned<slice::Iter<'static, &'static str>>);
-
-impl Iterator for IterRaw {
-    type Item = &'static str;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next()
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.0.size_hint()
-    }
-}
-
-impl DoubleEndedIterator for IterRaw {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        self.0.next_back()
-    }
-}
-
-impl FusedIterator for IterRaw {}
-
-impl ExactSizeIterator for IterRaw {
-    fn len(&self) -> usize {
-        self.0.len()
-    }
-}
-
-fn expect_mime(s: &str) -> Mime {
-    // `.parse()` should be checked at compile time to never fail
-    s.parse()
-        .unwrap_or_else(|e| panic!("failed to parse media-type {:?}: {}", s, e))
-}
-
-/// Wrapper of [`MimeGuess::from_ext()`](struct.MimeGuess.html#method.from_ext).
-pub fn from_ext(ext: &str) -> MimeGuess {
-    MimeGuess::from_ext(ext)
-}
-
-/// Wrapper of [`MimeGuess::from_path()`](struct.MimeGuess.html#method.from_path).
-pub fn from_path<P: AsRef<Path>>(path: P) -> MimeGuess {
-    MimeGuess::from_path(path)
-}
-
-/// Guess the MIME type of `path` by its extension (as defined by `Path::extension()`).
-///
-/// If `path` has no extension, or its extension has no known MIME type mapping,
-/// then the MIME type is assumed to be `application/octet-stream`.
-///
-/// ## Note
-/// **Guess** is the operative word here, as there are no guarantees that the contents of the file
-/// that `path` points to match the MIME type associated with the path's extension.
-///
-/// Take care when processing files with assumptions based on the return value of this function.
-///
-/// In HTTP applications, it might be [preferable][rfc7231] to not send a `Content-Type`
-/// header at all instead of defaulting to `application/content-stream`.
-///
-/// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
-#[deprecated(
-    since = "2.0.0",
-    note = "Use `from_path(path).first_or_octet_stream()` instead"
-)]
-pub fn guess_mime_type<P: AsRef<Path>>(path: P) -> Mime {
-    from_path(path).first_or_octet_stream()
-}
-
-/// Guess the MIME type of `path` by its extension (as defined by `Path::extension()`).
-///
-/// If `path` has no extension, or its extension has no known MIME type mapping,
-/// then `None` is returned.
-///
-#[deprecated(since = "2.0.0", note = "Use `from_path(path).first()` instead")]
-pub fn guess_mime_type_opt<P: AsRef<Path>>(path: P) -> Option<Mime> {
-    from_path(path).first()
-}
-
-/// Guess the MIME type string of `path` by its extension (as defined by `Path::extension()`).
-///
-/// If `path` has no extension, or its extension has no known MIME type mapping,
-/// then `None` is returned.
-///
-/// ## Note
-/// **Guess** is the operative word here, as there are no guarantees that the contents of the file
-/// that `path` points to match the MIME type associated with the path's extension.
-///
-/// Take care when processing files with assumptions based on the return value of this function.
-#[deprecated(since = "2.0.0", note = "Use `from_path(path).first_raw()` instead")]
-pub fn mime_str_for_path_ext<P: AsRef<Path>>(path: P) -> Option<&'static str> {
-    from_path(path).first_raw()
-}
-
-/// Get the MIME type associated with a file extension.
-///
-/// If there is no association for the extension, or `ext` is empty,
-/// `application/octet-stream` is returned.
-///
-/// ## Note
-/// In HTTP applications, it might be [preferable][rfc7231] to not send a `Content-Type`
-/// header at all instead of defaulting to `application/content-stream`.
-///
-/// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
-#[deprecated(
-    since = "2.0.0",
-    note = "use `from_ext(search_ext).first_or_octet_stream()` instead"
-)]
-pub fn get_mime_type(search_ext: &str) -> Mime {
-    from_ext(search_ext).first_or_octet_stream()
-}
-
-/// Get the MIME type associated with a file extension.
-///
-/// If there is no association for the extension, or `ext` is empty,
-/// `None` is returned.
-#[deprecated(since = "2.0.0", note = "use `from_ext(search_ext).first()` instead")]
-pub fn get_mime_type_opt(search_ext: &str) -> Option<Mime> {
-    from_ext(search_ext).first()
-}
-
-/// Get the MIME type string associated with a file extension. Case-insensitive.
-///
-/// If `search_ext` is not already lowercase,
-/// it will be converted to lowercase to facilitate the search.
-///
-/// Returns `None` if `search_ext` is empty or an associated extension was not found.
-#[deprecated(
-    since = "2.0.0",
-    note = "use `from_ext(search_ext).first_raw()` instead"
-)]
-pub fn get_mime_type_str(search_ext: &str) -> Option<&'static str> {
-    from_ext(search_ext).first_raw()
-}
-
-/// Get a list of known extensions for a given `Mime`.
-///
-/// Ignores parameters (only searches with `<main type>/<subtype>`). Case-insensitive (for extension types).
-///
-/// Returns `None` if the MIME type is unknown.
-///
-/// ### Wildcards
-/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
-///
-/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
-#[cfg(feature = "rev-mappings")]
-pub fn get_mime_extensions(mime: &Mime) -> Option<&'static [&'static str]> {
-    get_extensions(mime.type_().as_ref(), mime.subtype().as_ref())
-}
-
-/// Get a list of known extensions for a MIME type string.
-///
-/// Ignores parameters (only searches `<main type>/<subtype>`). Case-insensitive.
-///
-/// Returns `None` if the MIME type is unknown.
-///
-/// ### Wildcards
-/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
-///
-/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
-///
-/// ### Panics
-/// If `mime_str` is not a valid MIME type specifier (naive).
-#[cfg(feature = "rev-mappings")]
-pub fn get_mime_extensions_str(mut mime_str: &str) -> Option<&'static [&'static str]> {
-    mime_str = mime_str.trim();
-
-    if let Some(sep_idx) = mime_str.find(';') {
-        mime_str = &mime_str[..sep_idx];
-    }
-
-    let (top, sub) = {
-        let split_idx = mime_str.find('/').unwrap();
-        (&mime_str[..split_idx], &mime_str[split_idx + 1..])
-    };
-
-    get_extensions(top, sub)
-}
-
-/// Get the extensions for a given top-level and sub-level of a MIME type
-/// (`{toplevel}/{sublevel}`).
-///
-/// Returns `None` if `toplevel` or `sublevel` are unknown.
-///
-/// ### Wildcards
-/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
-///
-/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
-#[cfg(feature = "rev-mappings")]
-pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
-    impl_::get_extensions(toplevel, sublevel)
-}
-
-/// Get the MIME type for `application/octet-stream` (generic binary stream)
-#[deprecated(since = "2.0.0", note = "use `mime::APPLICATION_OCTET_STREAM` instead")]
-pub fn octet_stream() -> Mime {
-    "application/octet-stream".parse().unwrap()
-}
-
-#[cfg(test)]
-mod tests {
-    include!("mime_types.rs");
-
-    use super::{from_ext, from_path, expect_mime};
-    #[allow(deprecated, unused_imports)]
-    use std::ascii::AsciiExt;
-
-    use std::fmt::Debug;
-    use std::path::Path;
-
-
-    #[test]
-    fn check_type_bounds() {
-        fn assert_type_bounds<T: Clone + Debug + Send + Sync + 'static>() {}
-
-        assert_type_bounds::<super::MimeGuess>();
-        assert_type_bounds::<super::Iter>();
-        assert_type_bounds::<super::IterRaw>();
-    }
-
-    #[test]
-    fn test_mime_type_guessing() {
-        assert_eq!(
-            from_ext("gif").first_or_octet_stream().to_string(),
-            "image/gif".to_string()
-        );
-        assert_eq!(
-            from_ext("TXT").first_or_octet_stream().to_string(),
-            "text/plain".to_string()
-        );
-        assert_eq!(
-            from_ext("blahblah").first_or_octet_stream().to_string(),
-            "application/octet-stream".to_string()
-        );
-
-        assert_eq!(
-            from_path(Path::new("/path/to/file.gif"))
-                .first_or_octet_stream()
-                .to_string(),
-            "image/gif".to_string()
-        );
-        assert_eq!(
-            from_path("/path/to/file.gif").first_or_octet_stream().to_string(),
-            "image/gif".to_string()
-        );
-    }
-
-    #[test]
-    fn test_mime_type_guessing_opt() {
-        assert_eq!(
-            from_ext("gif").first().unwrap().to_string(),
-            "image/gif".to_string()
-        );
-        assert_eq!(
-            from_ext("TXT").first().unwrap().to_string(),
-            "text/plain".to_string()
-        );
-        assert_eq!(from_ext("blahblah").first(), None);
-
-        assert_eq!(
-            from_path("/path/to/file.gif").first().unwrap().to_string(),
-            "image/gif".to_string()
-        );
-        assert_eq!(from_path("/path/to/file").first(), None);
-    }
-
-    #[test]
-    fn test_are_mime_types_parseable() {
-        for (_, mimes) in MIME_TYPES {
-            mimes.iter().for_each(|s| { expect_mime(s); });
-        }
-    }
-
-    // RFC: Is this test necessary anymore? --@cybergeek94, 2/1/2016
-    #[test]
-    fn test_are_extensions_ascii() {
-        for (ext, _) in MIME_TYPES {
-            assert!(ext.is_ascii(), "Extension not ASCII: {:?}", ext);
-        }
-    }
-
-    #[test]
-    fn test_are_extensions_sorted() {
-        // simultaneously checks the requirement that duplicate extension entries are adjacent
-        for (&(ext, _), &(n_ext, _)) in MIME_TYPES.iter().zip(MIME_TYPES.iter().skip(1)) {
-            assert!(
-                ext <= n_ext,
-                "Extensions in src/mime_types should be sorted lexicographically
-                in ascending order. Failed assert: {:?} <= {:?}",
-                ext,
-                n_ext
-            );
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/src/mime_types.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/src/mime_types.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mime_guess/src/mime_types.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mime_guess/src/mime_types.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1489 +0,0 @@
-/// A mapping of known file extensions and their MIME types.
-///
-/// Required to be sorted lexicographically by extension for ease of maintenance.
-///
-/// Multiple MIME types per extension are supported; the order is arbitrary but the first should be
-/// the most prevalent by most recent RFC declaration or explicit succession of other media types.
-///
-/// NOTE: when adding or modifying entries, please include a citation in the commit message.
-/// If a media type for an extension changed, please keep the old entry but add the new one before
-/// it in the slice literal, e.g.:
-///
-///
-///
-/// Sourced from:
-/// https://github.com/samuelneff/MimeTypeMap/blob/master/src/MimeTypes/MimeTypeMap.cs
-/// https://github.com/jshttp/mime-db extracted with https://gist.github.com/soyuka/b7e29d359b2c14c21bdead923c01cc81
-pub static MIME_TYPES: &[(&str, &[&str])] = &[
-    ("123", &["application/vnd.lotus-1-2-3"]),
-    ("323", &["text/h323"]),
-    ("3dml", &["text/vnd.in3d.3dml"]),
-    ("3ds", &["image/x-3ds"]),
-    ("3g2", &["video/3gpp2"]),
-    ("3gp", &["video/3gpp"]),
-    ("3gp2", &["video/3gpp2"]),
-    ("3gpp", &["video/3gpp"]),
-    ("7z", &["application/x-7z-compressed"]),
-    ("aa", &["audio/audible"]),
-    ("aab", &["application/x-authorware-bin"]),
-    ("aac", &["audio/aac"]),
-    ("aaf", &["application/octet-stream"]),
-    ("aam", &["application/x-authorware-map"]),
-    ("aas", &["application/x-authorware-seg"]),
-    ("aax", &["audio/vnd.audible.aax"]),
-    ("abw", &["application/x-abiword"]),
-    ("ac", &["application/pkix-attr-cert"]),
-    ("ac3", &["audio/ac3"]),
-    ("aca", &["application/octet-stream"]),
-    ("acc", &["application/vnd.americandynamics.acc"]),
-    ("accda", &["application/msaccess.addin"]),
-    ("accdb", &["application/msaccess"]),
-    ("accdc", &["application/msaccess.cab"]),
-    ("accde", &["application/msaccess"]),
-    ("accdr", &["application/msaccess.runtime"]),
-    ("accdt", &["application/msaccess"]),
-    ("accdw", &["application/msaccess.webapplication"]),
-    ("accft", &["application/msaccess.ftemplate"]),
-    ("ace", &["application/x-ace-compressed"]),
-    ("acu", &["application/vnd.acucobol"]),
-    ("acutc", &["application/vnd.acucorp"]),
-    ("acx", &["application/internet-property-stream"]),
-    ("addin", &["text/xml"]),
-    ("ade", &["application/msaccess"]),
-    ("adobebridge", &["application/x-bridge-url"]),
-    ("adp", &["application/msaccess"]),
-    ("adt", &["audio/vnd.dlna.adts"]),
-    ("adts", &["audio/aac"]),
-    ("aep", &["application/vnd.audiograph"]),
-    ("afm", &["application/octet-stream"]),
-    ("afp", &["application/vnd.ibm.modcap"]),
-    ("ahead", &["application/vnd.ahead.space"]),
-    ("ai", &["application/postscript"]),
-    ("aif", &["audio/aiff"]),
-    ("aifc", &["audio/aiff"]),
-    ("aiff", &["audio/aiff"]),
-    (
-        "air",
-        &["application/vnd.adobe.air-application-installer-package+zip"],
-    ),
-    ("ait", &["application/vnd.dvb.ait"]),
-    ("amc", &["application/mpeg"]),
-    ("ami", &["application/vnd.amiga.ami"]),
-    ("anx", &["application/annodex"]),
-    ("apk", &["application/vnd.android.package-archive"]),
-    ("apng", &["image/apng"]),
-    ("appcache", &["text/cache-manifest"]),
-    ("application", &["application/x-ms-application"]),
-    ("apr", &["application/vnd.lotus-approach"]),
-    ("arc", &["application/x-freearc"]),
-    ("arj", &["application/x-arj"]),
-    ("art", &["image/x-jg"]),
-    ("asa", &["application/xml"]),
-    ("asax", &["application/xml"]),
-    ("asc", &["application/pgp-signature"]),
-    ("ascx", &["application/xml"]),
-    ("asd", &["application/octet-stream"]),
-    ("asf", &["video/x-ms-asf"]),
-    ("ashx", &["application/xml"]),
-    ("asi", &["application/octet-stream"]),
-    ("asm", &["text/plain"]),
-    ("asmx", &["application/xml"]),
-    ("aso", &["application/vnd.accpac.simply.aso"]),
-    ("aspx", &["application/xml"]),
-    ("asr", &["video/x-ms-asf"]),
-    ("asx", &["video/x-ms-asf"]),
-    ("atc", &["application/vnd.acucorp"]),
-    ("atom", &["application/atom+xml"]),
-    ("atomcat", &["application/atomcat+xml"]),
-    ("atomsvc", &["application/atomsvc+xml"]),
-    ("atx", &["application/vnd.antix.game-component"]),
-    ("au", &["audio/basic"]),
-    ("avi", &["video/x-msvideo"]),
-    ("aw", &["application/applixware"]),
-    ("axa", &["audio/annodex"]),
-    ("axs", &["application/olescript"]),
-    ("axv", &["video/annodex"]),
-    ("azf", &["application/vnd.airzip.filesecure.azf"]),
-    ("azs", &["application/vnd.airzip.filesecure.azs"]),
-    ("azw", &["application/vnd.amazon.ebook"]),
-    ("bas", &["text/plain"]),
-    ("bat", &["application/x-msdownload"]),
-    ("bcpio", &["application/x-bcpio"]),
-    ("bdf", &["application/x-font-bdf"]),
-    ("bdm", &["application/vnd.syncml.dm+wbxml"]),
-    ("bdoc", &["application/bdoc"]),
-    ("bed", &["application/vnd.realvnc.bed"]),
-    ("bh2", &["application/vnd.fujitsu.oasysprs"]),
-    ("bin", &["application/octet-stream"]),
-    ("blb", &["application/x-blorb"]),
-    ("blorb", &["application/x-blorb"]),
-    ("bmi", &["application/vnd.bmi"]),
-    ("bmp", &["image/bmp"]),
-    ("book", &["application/vnd.framemaker"]),
-    ("box", &["application/vnd.previewsystems.box"]),
-    ("boz", &["application/x-bzip2"]),
-    ("bpk", &["application/octet-stream"]),
-    ("btif", &["image/prs.btif"]),
-    ("buffer", &["application/octet-stream"]),
-    ("bz", &["application/x-bzip"]),
-    ("bz2", &["application/x-bzip2"]),
-    ("c", &["text/plain"]),
-    ("c11amc", &["application/vnd.cluetrust.cartomobile-config"]),
-    (
-        "c11amz",
-        &["application/vnd.cluetrust.cartomobile-config-pkg"],
-    ),
-    ("c4d", &["application/vnd.clonk.c4group"]),
-    ("c4f", &["application/vnd.clonk.c4group"]),
-    ("c4g", &["application/vnd.clonk.c4group"]),
-    ("c4p", &["application/vnd.clonk.c4group"]),
-    ("c4u", &["application/vnd.clonk.c4group"]),
-    ("cab", &["application/octet-stream"]),
-    ("caf", &["audio/x-caf"]),
-    ("calx", &["application/vnd.ms-office.calx"]),
-    ("cap", &["application/vnd.tcpdump.pcap"]),
-    ("car", &["application/vnd.curl.car"]),
-    ("cat", &["application/vnd.ms-pki.seccat"]),
-    ("cb7", &["application/x-cbr"]),
-    ("cba", &["application/x-cbr"]),
-    ("cbr", &["application/x-cbr"]),
-    ("cbt", &["application/x-cbr"]),
-    ("cbz", &["application/x-cbr"]),
-    ("cc", &["text/plain"]),
-    ("cco", &["application/x-cocoa"]),
-    ("cct", &["application/x-director"]),
-    ("ccxml", &["application/ccxml+xml"]),
-    ("cd", &["text/plain"]),
-    ("cdbcmsg", &["application/vnd.contact.cmsg"]),
-    ("cdda", &["audio/aiff"]),
-    ("cdf", &["application/x-cdf"]),
-    ("cdkey", &["application/vnd.mediastation.cdkey"]),
-    ("cdmia", &["application/cdmi-capability"]),
-    ("cdmic", &["application/cdmi-container"]),
-    ("cdmid", &["application/cdmi-domain"]),
-    ("cdmio", &["application/cdmi-object"]),
-    ("cdmiq", &["application/cdmi-queue"]),
-    ("cdx", &["chemical/x-cdx"]),
-    ("cdxml", &["application/vnd.chemdraw+xml"]),
-    ("cdy", &["application/vnd.cinderella"]),
-    ("cer", &["application/x-x509-ca-cert"]),
-    ("cfg", &["text/plain"]),
-    ("cfs", &["application/x-cfs-compressed"]),
-    ("cgm", &["image/cgm"]),
-    ("chat", &["application/x-chat"]),
-    ("chm", &["application/octet-stream"]),
-    ("chrt", &["application/vnd.kde.kchart"]),
-    ("cif", &["chemical/x-cif"]),
-    (
-        "cii",
-        &["application/vnd.anser-web-certificate-issue-initiation"],
-    ),
-    ("cil", &["application/vnd.ms-artgalry"]),
-    ("cla", &["application/vnd.claymore"]),
-    ("class", &["application/x-java-applet"]),
-    ("clkk", &["application/vnd.crick.clicker.keyboard"]),
-    ("clkp", &["application/vnd.crick.clicker.palette"]),
-    ("clkt", &["application/vnd.crick.clicker.template"]),
-    ("clkw", &["application/vnd.crick.clicker.wordbank"]),
-    ("clkx", &["application/vnd.crick.clicker"]),
-    ("clp", &["application/x-msclip"]),
-    ("cmc", &["application/vnd.cosmocaller"]),
-    ("cmd", &["text/plain"]),
-    ("cmdf", &["chemical/x-cmdf"]),
-    ("cml", &["chemical/x-cml"]),
-    ("cmp", &["application/vnd.yellowriver-custom-menu"]),
-    ("cmx", &["image/x-cmx"]),
-    ("cnf", &["text/plain"]),
-    ("cod", &["image/cis-cod"]),
-    ("coffee", &["text/coffeescript"]),
-    ("com", &["application/x-msdownload"]),
-    ("conf", &["text/plain"]),
-    ("config", &["application/xml"]),
-    ("contact", &["text/x-ms-contact"]),
-    ("coverage", &["application/xml"]),
-    ("cpio", &["application/x-cpio"]),
-    ("cpp", &["text/plain"]),
-    ("cpt", &["application/mac-compactpro"]),
-    ("crd", &["application/x-mscardfile"]),
-    ("crl", &["application/pkix-crl"]),
-    ("crt", &["application/x-x509-ca-cert"]),
-    ("crx", &["application/x-chrome-extension"]),
-    ("cryptonote", &["application/vnd.rig.cryptonote"]),
-    ("cs", &["text/plain"]),
-    ("csdproj", &["text/plain"]),
-    ("csh", &["application/x-csh"]),
-    ("csl", &["application/vnd.citationstyles.style+xml"]),
-    ("csml", &["chemical/x-csml"]),
-    ("csp", &["application/vnd.commonspace"]),
-    ("csproj", &["text/plain"]),
-    ("css", &["text/css"]),
-    ("cst", &["application/x-director"]),
-    ("csv", &["text/csv"]),
-    ("cu", &["application/cu-seeme"]),
-    ("cur", &["application/octet-stream"]),
-    ("curl", &["text/vnd.curl"]),
-    ("cww", &["application/prs.cww"]),
-    ("cxt", &["application/x-director"]),
-    ("cxx", &["text/plain"]),
-    ("dae", &["model/vnd.collada+xml"]),
-    ("daf", &["application/vnd.mobius.daf"]),
-    ("dart", &["application/vnd.dart"]),
-    ("dat", &["application/octet-stream"]),
-    ("dataless", &["application/vnd.fdsn.seed"]),
-    ("datasource", &["application/xml"]),
-    ("davmount", &["application/davmount+xml"]),
-    ("dbk", &["application/docbook+xml"]),
-    ("dbproj", &["text/plain"]),
-    ("dcr", &["application/x-director"]),
-    ("dcurl", &["text/vnd.curl.dcurl"]),
-    ("dd2", &["application/vnd.oma.dd2+xml"]),
-    ("ddd", &["application/vnd.fujixerox.ddd"]),
-    ("deb", &["application/octet-stream"]),
-    ("def", &["text/plain"]),
-    ("deploy", &["application/octet-stream"]),
-    ("der", &["application/x-x509-ca-cert"]),
-    ("dfac", &["application/vnd.dreamfactory"]),
-    ("dgc", &["application/x-dgc-compressed"]),
-    ("dgml", &["application/xml"]),
-    ("dib", &["image/bmp"]),
-    ("dic", &["text/x-c"]),
-    ("dif", &["video/x-dv"]),
-    ("dir", &["application/x-director"]),
-    ("dis", &["application/vnd.mobius.dis"]),
-    ("disco", &["text/xml"]),
-    (
-        "disposition-notification",
-        &["message/disposition-notification"],
-    ),
-    ("dist", &["application/octet-stream"]),
-    ("distz", &["application/octet-stream"]),
-    ("divx", &["video/divx"]),
-    ("djv", &["image/vnd.djvu"]),
-    ("djvu", &["image/vnd.djvu"]),
-    ("dll", &["application/x-msdownload"]),
-    ("dll.config", &["text/xml"]),
-    ("dlm", &["text/dlm"]),
-    ("dmg", &["application/octet-stream"]),
-    ("dmp", &["application/vnd.tcpdump.pcap"]),
-    ("dms", &["application/octet-stream"]),
-    ("dna", &["application/vnd.dna"]),
-    ("doc", &["application/msword"]),
-    (
-        "docm",
-        &["application/vnd.ms-word.document.macroEnabled.12"],
-    ),
-    (
-        "docx",
-        &["application/vnd.openxmlformats-officedocument.wordprocessingml.document"],
-    ),
-    ("dot", &["application/msword"]),
-    (
-        "dotm",
-        &["application/vnd.ms-word.template.macroEnabled.12"],
-    ),
-    (
-        "dotx",
-        &["application/vnd.openxmlformats-officedocument.wordprocessingml.template"],
-    ),
-    ("dp", &["application/vnd.osgi.dp"]),
-    ("dpg", &["application/vnd.dpgraph"]),
-    ("dra", &["audio/vnd.dra"]),
-    ("dsc", &["text/prs.lines.tag"]),
-    ("dsp", &["application/octet-stream"]),
-    ("dssc", &["application/dssc+der"]),
-    ("dsw", &["text/plain"]),
-    ("dtb", &["application/x-dtbook+xml"]),
-    ("dtd", &["text/xml"]),
-    ("dts", &["audio/vnd.dts"]),
-    ("dtsconfig", &["text/xml"]),
-    ("dtshd", &["audio/vnd.dts.hd"]),
-    ("dump", &["application/octet-stream"]),
-    ("dv", &["video/x-dv"]),
-    ("dvb", &["video/vnd.dvb.file"]),
-    ("dvi", &["application/x-dvi"]),
-    ("dwf", &["drawing/x-dwf"]),
-    ("dwg", &["application/acad"]),
-    ("dwp", &["application/octet-stream"]),
-    ("dxf", &["application/x-dxf"]),
-    ("dxp", &["application/vnd.spotfire.dxp"]),
-    ("dxr", &["application/x-director"]),
-    ("ear", &["application/java-archive"]),
-    ("ecelp4800", &["audio/vnd.nuera.ecelp4800"]),
-    ("ecelp7470", &["audio/vnd.nuera.ecelp7470"]),
-    ("ecelp9600", &["audio/vnd.nuera.ecelp9600"]),
-    ("ecma", &["application/ecmascript"]),
-    ("edm", &["application/vnd.novadigm.edm"]),
-    ("edx", &["application/vnd.novadigm.edx"]),
-    ("efif", &["application/vnd.picsel"]),
-    ("ei6", &["application/vnd.pg.osasli"]),
-    ("elc", &["application/octet-stream"]),
-    ("emf", &["application/x-msmetafile"]),
-    ("eml", &["message/rfc822"]),
-    ("emma", &["application/emma+xml"]),
-    ("emz", &["application/octet-stream"]),
-    ("eol", &["audio/vnd.digital-winds"]),
-    ("eot", &["application/vnd.ms-fontobject"]),
-    ("eps", &["application/postscript"]),
-    ("epub", &["application/epub+zip"]),
-    ("es", &["application/ecmascript"]),
-    ("es3", &["application/vnd.eszigno3+xml"]),
-    ("esa", &["application/vnd.osgi.subsystem"]),
-    ("esf", &["application/vnd.epson.esf"]),
-    ("et3", &["application/vnd.eszigno3+xml"]),
-    ("etl", &["application/etl"]),
-    ("etx", &["text/x-setext"]),
-    ("eva", &["application/x-eva"]),
-    ("evy", &["application/envoy"]),
-    ("exe", &["application/octet-stream"]),
-    ("exe.config", &["text/xml"]),
-    ("exi", &["application/exi"]),
-    ("ext", &["application/vnd.novadigm.ext"]),
-    ("ez", &["application/andrew-inset"]),
-    ("ez2", &["application/vnd.ezpix-album"]),
-    ("ez3", &["application/vnd.ezpix-package"]),
-    ("f", &["text/x-fortran"]),
-    ("f4v", &["video/x-f4v"]),
-    ("f77", &["text/x-fortran"]),
-    ("f90", &["text/x-fortran"]),
-    ("fbs", &["image/vnd.fastbidsheet"]),
-    ("fcdt", &["application/vnd.adobe.formscentral.fcdt"]),
-    ("fcs", &["application/vnd.isac.fcs"]),
-    ("fdf", &["application/vnd.fdf"]),
-    ("fe_launch", &["application/vnd.denovo.fcselayout-link"]),
-    ("fg5", &["application/vnd.fujitsu.oasysgp"]),
-    ("fgd", &["application/x-director"]),
-    ("fh", &["image/x-freehand"]),
-    ("fh4", &["image/x-freehand"]),
-    ("fh5", &["image/x-freehand"]),
-    ("fh7", &["image/x-freehand"]),
-    ("fhc", &["image/x-freehand"]),
-    ("fif", &["application/fractals"]),
-    ("fig", &["application/x-xfig"]),
-    ("filters", &["application/xml"]),
-    ("fla", &["application/octet-stream"]),
-    ("flac", &["audio/flac"]),
-    ("fli", &["video/x-fli"]),
-    ("flo", &["application/vnd.micrografx.flo"]),
-    ("flr", &["x-world/x-vrml"]),
-    ("flv", &["video/x-flv"]),
-    ("flw", &["application/vnd.kde.kivio"]),
-    ("flx", &["text/vnd.fmi.flexstor"]),
-    ("fly", &["text/vnd.fly"]),
-    ("fm", &["application/vnd.framemaker"]),
-    ("fnc", &["application/vnd.frogans.fnc"]),
-    ("for", &["text/x-fortran"]),
-    ("fpx", &["image/vnd.fpx"]),
-    ("frame", &["application/vnd.framemaker"]),
-    ("fsc", &["application/vnd.fsc.weblaunch"]),
-    ("fsscript", &["application/fsharp-script"]),
-    ("fst", &["image/vnd.fst"]),
-    ("fsx", &["application/fsharp-script"]),
-    ("ftc", &["application/vnd.fluxtime.clip"]),
-    (
-        "fti",
-        &["application/vnd.anser-web-funds-transfer-initiation"],
-    ),
-    ("fvt", &["video/vnd.fvt"]),
-    ("fxp", &["application/vnd.adobe.fxp"]),
-    ("fxpl", &["application/vnd.adobe.fxp"]),
-    ("fzs", &["application/vnd.fuzzysheet"]),
-    ("g2w", &["application/vnd.geoplan"]),
-    ("g3", &["image/g3fax"]),
-    ("g3w", &["application/vnd.geospace"]),
-    ("gac", &["application/vnd.groove-account"]),
-    ("gam", &["application/x-tads"]),
-    ("gbr", &["application/rpki-ghostbusters"]),
-    ("gca", &["application/x-gca-compressed"]),
-    ("gdl", &["model/vnd.gdl"]),
-    ("gdoc", &["application/vnd.google-apps.document"]),
-    ("generictest", &["application/xml"]),
-    ("geo", &["application/vnd.dynageo"]),
-    ("geojson", &["application/geo+json"]),
-    ("gex", &["application/vnd.geometry-explorer"]),
-    ("ggb", &["application/vnd.geogebra.file"]),
-    ("ggt", &["application/vnd.geogebra.tool"]),
-    ("ghf", &["application/vnd.groove-help"]),
-    ("gif", &["image/gif"]),
-    ("gim", &["application/vnd.groove-identity-message"]),
-    ("glb", &["model/gltf-binary"]),
-    ("gltf", &["model/gltf+json"]),
-    ("gml", &["application/gml+xml"]),
-    ("gmx", &["application/vnd.gmx"]),
-    ("gnumeric", &["application/x-gnumeric"]),
-    ("gph", &["application/vnd.flographit"]),
-    ("gpx", &["application/gpx+xml"]),
-    ("gqf", &["application/vnd.grafeq"]),
-    ("gqs", &["application/vnd.grafeq"]),
-    ("gram", &["application/srgs"]),
-    ("gramps", &["application/x-gramps-xml"]),
-    ("gre", &["application/vnd.geometry-explorer"]),
-    ("group", &["text/x-ms-group"]),
-    ("grv", &["application/vnd.groove-injector"]),
-    ("grxml", &["application/srgs+xml"]),
-    ("gsf", &["application/x-font-ghostscript"]),
-    ("gsheet", &["application/vnd.google-apps.spreadsheet"]),
-    ("gslides", &["application/vnd.google-apps.presentation"]),
-    ("gsm", &["audio/x-gsm"]),
-    ("gtar", &["application/x-gtar"]),
-    ("gtm", &["application/vnd.groove-tool-message"]),
-    ("gtw", &["model/vnd.gtw"]),
-    ("gv", &["text/vnd.graphviz"]),
-    ("gxf", &["application/gxf"]),
-    ("gxt", &["application/vnd.geonext"]),
-    ("gz", &["application/x-gzip"]),
-    ("h", &["text/plain"]),
-    ("h261", &["video/h261"]),
-    ("h263", &["video/h263"]),
-    ("h264", &["video/h264"]),
-    ("hal", &["application/vnd.hal+xml"]),
-    ("hbci", &["application/vnd.hbci"]),
-    ("hbs", &["text/x-handlebars-template"]),
-    ("hdd", &["application/x-virtualbox-hdd"]),
-    ("hdf", &["application/x-hdf"]),
-    ("hdml", &["text/x-hdml"]),
-    ("hdr", &["image/vnd.radiance"]),
-    ("hh", &["text/plain"]),
-    ("hhc", &["application/x-oleobject"]),
-    ("hhk", &["application/octet-stream"]),
-    ("hhp", &["application/octet-stream"]),
-    ("hjson", &["application/hjson"]),
-    ("hlp", &["application/winhlp"]),
-    ("hpgl", &["application/vnd.hp-hpgl"]),
-    ("hpid", &["application/vnd.hp-hpid"]),
-    ("hpp", &["text/plain"]),
-    ("hps", &["application/vnd.hp-hps"]),
-    ("hqx", &["application/mac-binhex40"]),
-    ("hta", &["application/hta"]),
-    ("htc", &["text/x-component"]),
-    ("htke", &["application/vnd.kenameaapp"]),
-    ("htm", &["text/html"]),
-    ("html", &["text/html"]),
-    ("htt", &["text/webviewhtml"]),
-    ("hvd", &["application/vnd.yamaha.hv-dic"]),
-    ("hvp", &["application/vnd.yamaha.hv-voice"]),
-    ("hvs", &["application/vnd.yamaha.hv-script"]),
-    ("hxa", &["application/xml"]),
-    ("hxc", &["application/xml"]),
-    ("hxd", &["application/octet-stream"]),
-    ("hxe", &["application/xml"]),
-    ("hxf", &["application/xml"]),
-    ("hxh", &["application/octet-stream"]),
-    ("hxi", &["application/octet-stream"]),
-    ("hxk", &["application/xml"]),
-    ("hxq", &["application/octet-stream"]),
-    ("hxr", &["application/octet-stream"]),
-    ("hxs", &["application/octet-stream"]),
-    ("hxt", &["text/html"]),
-    ("hxv", &["application/xml"]),
-    ("hxw", &["application/octet-stream"]),
-    ("hxx", &["text/plain"]),
-    ("i", &["text/plain"]),
-    ("i2g", &["application/vnd.intergeo"]),
-    ("icc", &["application/vnd.iccprofile"]),
-    ("ice", &["x-conference/x-cooltalk"]),
-    ("icm", &["application/vnd.iccprofile"]),
-    ("ico", &["image/x-icon"]),
-    ("ics", &["application/octet-stream"]),
-    ("idl", &["text/plain"]),
-    ("ief", &["image/ief"]),
-    ("ifb", &["text/calendar"]),
-    ("ifm", &["application/vnd.shana.informed.formdata"]),
-    ("iges", &["model/iges"]),
-    ("igl", &["application/vnd.igloader"]),
-    ("igm", &["application/vnd.insors.igm"]),
-    ("igs", &["model/iges"]),
-    ("igx", &["application/vnd.micrografx.igx"]),
-    ("iif", &["application/vnd.shana.informed.interchange"]),
-    ("iii", &["application/x-iphone"]),
-    ("img", &["application/octet-stream"]),
-    ("imp", &["application/vnd.accpac.simply.imp"]),
-    ("ims", &["application/vnd.ms-ims"]),
-    ("in", &["text/plain"]),
-    ("inc", &["text/plain"]),
-    ("inf", &["application/octet-stream"]),
-    ("ini", &["text/plain"]),
-    ("ink", &["application/inkml+xml"]),
-    ("inkml", &["application/inkml+xml"]),
-    ("inl", &["text/plain"]),
-    ("ins", &["application/x-internet-signup"]),
-    ("install", &["application/x-install-instructions"]),
-    ("iota", &["application/vnd.astraea-software.iota"]),
-    ("ipa", &["application/x-itunes-ipa"]),
-    ("ipfix", &["application/ipfix"]),
-    ("ipg", &["application/x-itunes-ipg"]),
-    ("ipk", &["application/vnd.shana.informed.package"]),
-    ("ipproj", &["text/plain"]),
-    ("ipsw", &["application/x-itunes-ipsw"]),
-    ("iqy", &["text/x-ms-iqy"]),
-    ("irm", &["application/vnd.ibm.rights-management"]),
-    ("irp", &["application/vnd.irepository.package+xml"]),
-    ("iso", &["application/octet-stream"]),
-    ("isp", &["application/x-internet-signup"]),
-    ("ite", &["application/x-itunes-ite"]),
-    ("itlp", &["application/x-itunes-itlp"]),
-    ("itms", &["application/x-itunes-itms"]),
-    ("itp", &["application/vnd.shana.informed.formtemplate"]),
-    ("itpc", &["application/x-itunes-itpc"]),
-    ("ivf", &["video/x-ivf"]),
-    ("ivp", &["application/vnd.immervision-ivp"]),
-    ("ivu", &["application/vnd.immervision-ivu"]),
-    ("jad", &["text/vnd.sun.j2me.app-descriptor"]),
-    ("jade", &["text/jade"]),
-    ("jam", &["application/vnd.jam"]),
-    ("jar", &["application/java-archive"]),
-    ("jardiff", &["application/x-java-archive-diff"]),
-    ("java", &["application/octet-stream"]),
-    ("jck", &["application/liquidmotion"]),
-    ("jcz", &["application/liquidmotion"]),
-    ("jfif", &["image/pjpeg"]),
-    ("jisp", &["application/vnd.jisp"]),
-    ("jlt", &["application/vnd.hp-jlyt"]),
-    ("jng", &["image/x-jng"]),
-    ("jnlp", &["application/x-java-jnlp-file"]),
-    ("joda", &["application/vnd.joost.joda-archive"]),
-    ("jp2", &["image/jp2"]),
-    ("jpb", &["application/octet-stream"]),
-    ("jpe", &["image/jpeg"]),
-    ("jpeg", &["image/jpeg"]),
-    ("jpf", &["image/jpx"]),
-    ("jpg", &["image/jpeg"]),
-    ("jpg2", &["image/jp2"]),
-    ("jpgm", &["video/jpm"]),
-    ("jpgv", &["video/jpeg"]),
-    ("jpm", &["image/jpm"]),
-    ("jpx", &["image/jpx"]),
-    ("js", &["application/javascript"]),
-    ("jsm", &["application/javascript"]),
-    ("json", &["application/json"]),
-    ("json5", &["application/json5"]),
-    ("jsonld", &["application/ld+json"]),
-    ("jsonml", &["application/jsonml+json"]),
-    ("jsx", &["text/jscript"]),
-    ("jsxbin", &["text/plain"]),
-    ("kar", &["audio/midi"]),
-    ("karbon", &["application/vnd.kde.karbon"]),
-    ("kfo", &["application/vnd.kde.kformula"]),
-    ("kia", &["application/vnd.kidspiration"]),
-    ("kml", &["application/vnd.google-earth.kml+xml"]),
-    ("kmz", &["application/vnd.google-earth.kmz"]),
-    ("kne", &["application/vnd.kinar"]),
-    ("knp", &["application/vnd.kinar"]),
-    ("kon", &["application/vnd.kde.kontour"]),
-    ("kpr", &["application/vnd.kde.kpresenter"]),
-    ("kpt", &["application/vnd.kde.kpresenter"]),
-    ("kpxx", &["application/vnd.ds-keypoint"]),
-    ("ksp", &["application/vnd.kde.kspread"]),
-    ("ktr", &["application/vnd.kahootz"]),
-    ("ktx", &["image/ktx"]),
-    ("ktz", &["application/vnd.kahootz"]),
-    ("kwd", &["application/vnd.kde.kword"]),
-    ("kwt", &["application/vnd.kde.kword"]),
-    ("lasxml", &["application/vnd.las.las+xml"]),
-    ("latex", &["application/x-latex"]),
-    (
-        "lbd",
-        &["application/vnd.llamagraphics.life-balance.desktop"],
-    ),
-    (
-        "lbe",
-        &["application/vnd.llamagraphics.life-balance.exchange+xml"],
-    ),
-    ("les", &["application/vnd.hhe.lesson-player"]),
-    ("less", &["text/less"]),
-    ("lha", &["application/x-lzh-compressed"]),
-    ("library-ms", &["application/windows-library+xml"]),
-    ("link66", &["application/vnd.route66.link66+xml"]),
-    ("list", &["text/plain"]),
-    ("list3820", &["application/vnd.ibm.modcap"]),
-    ("listafp", &["application/vnd.ibm.modcap"]),
-    ("lit", &["application/x-ms-reader"]),
-    ("litcoffee", &["text/coffeescript"]),
-    ("lnk", &["application/x-ms-shortcut"]),
-    ("loadtest", &["application/xml"]),
-    ("log", &["text/plain"]),
-    ("lostxml", &["application/lost+xml"]),
-    ("lpk", &["application/octet-stream"]),
-    ("lrf", &["application/octet-stream"]),
-    ("lrm", &["application/vnd.ms-lrm"]),
-    ("lsf", &["video/x-la-asf"]),
-    ("lst", &["text/plain"]),
-    ("lsx", &["video/x-la-asf"]),
-    ("ltf", &["application/vnd.frogans.ltf"]),
-    ("lua", &["text/x-lua"]),
-    ("luac", &["application/x-lua-bytecode"]),
-    ("lvp", &["audio/vnd.lucent.voice"]),
-    ("lwp", &["application/vnd.lotus-wordpro"]),
-    ("lzh", &["application/octet-stream"]),
-    ("m13", &["application/x-msmediaview"]),
-    ("m14", &["application/x-msmediaview"]),
-    ("m1v", &["video/mpeg"]),
-    ("m21", &["application/mp21"]),
-    ("m2a", &["audio/mpeg"]),
-    ("m2t", &["video/vnd.dlna.mpeg-tts"]),
-    ("m2ts", &["video/vnd.dlna.mpeg-tts"]),
-    ("m2v", &["video/mpeg"]),
-    ("m3a", &["audio/mpeg"]),
-    ("m3u", &["audio/x-mpegurl"]),
-    ("m3u8", &["audio/x-mpegurl"]),
-    ("m4a", &["audio/m4a"]),
-    ("m4b", &["audio/m4b"]),
-    ("m4p", &["audio/m4p"]),
-    ("m4r", &["audio/x-m4r"]),
-    ("m4u", &["video/vnd.mpegurl"]),
-    ("m4v", &["video/x-m4v"]),
-    ("ma", &["application/mathematica"]),
-    ("mac", &["image/x-macpaint"]),
-    ("mads", &["application/mads+xml"]),
-    ("mag", &["application/vnd.ecowin.chart"]),
-    ("mak", &["text/plain"]),
-    ("maker", &["application/vnd.framemaker"]),
-    ("man", &["application/x-troff-man"]),
-    ("manifest", &["application/x-ms-manifest"]),
-    ("map", &["text/plain"]),
-    ("mar", &["application/octet-stream"]),
-    ("markdown", &["text/markdown"]),
-    ("master", &["application/xml"]),
-    ("mathml", &["application/mathml+xml"]),
-    ("mb", &["application/mathematica"]),
-    ("mbk", &["application/vnd.mobius.mbk"]),
-    ("mbox", &["application/mbox"]),
-    ("mc1", &["application/vnd.medcalcdata"]),
-    ("mcd", &["application/vnd.mcd"]),
-    ("mcurl", &["text/vnd.curl.mcurl"]),
-    ("md", &["text/markdown", "text/x-markdown"]),
-    ("mda", &["application/msaccess"]),
-    ("mdb", &["application/x-msaccess"]),
-    ("mde", &["application/msaccess"]),
-    ("mdi", &["image/vnd.ms-modi"]),
-    ("mdp", &["application/octet-stream"]),
-    ("me", &["application/x-troff-me"]),
-    ("mesh", &["model/mesh"]),
-    ("meta4", &["application/metalink4+xml"]),
-    ("metalink", &["application/metalink+xml"]),
-    ("mets", &["application/mets+xml"]),
-    ("mfm", &["application/vnd.mfmp"]),
-    ("mfp", &["application/x-shockwave-flash"]),
-    ("mft", &["application/rpki-manifest"]),
-    ("mgp", &["application/vnd.osgeo.mapguide.package"]),
-    ("mgz", &["application/vnd.proteus.magazine"]),
-    ("mht", &["message/rfc822"]),
-    ("mhtml", &["message/rfc822"]),
-    ("mid", &["audio/mid"]),
-    ("midi", &["audio/mid"]),
-    ("mie", &["application/x-mie"]),
-    ("mif", &["application/vnd.mif"]),
-    ("mime", &["message/rfc822"]),
-    ("mix", &["application/octet-stream"]),
-    ("mj2", &["video/mj2"]),
-    ("mjp2", &["video/mj2"]),
-    ("mjs", &["application/javascript"]),
-    ("mk", &["text/plain"]),
-    ("mk3d", &["video/x-matroska"]),
-    ("mka", &["audio/x-matroska"]),
-    ("mkd", &["text/x-markdown"]),
-    ("mks", &["video/x-matroska"]),
-    ("mkv", &["video/x-matroska"]),
-    ("mlp", &["application/vnd.dolby.mlp"]),
-    ("mmd", &["application/vnd.chipnuts.karaoke-mmd"]),
-    ("mmf", &["application/x-smaf"]),
-    ("mml", &["text/mathml"]),
-    ("mmr", &["image/vnd.fujixerox.edmics-mmr"]),
-    ("mng", &["video/x-mng"]),
-    ("mno", &["text/xml"]),
-    ("mny", &["application/x-msmoney"]),
-    ("mobi", &["application/x-mobipocket-ebook"]),
-    ("mod", &["video/mpeg"]),
-    ("mods", &["application/mods+xml"]),
-    ("mov", &["video/quicktime"]),
-    ("movie", &["video/x-sgi-movie"]),
-    ("mp2", &["video/mpeg"]),
-    ("mp21", &["application/mp21"]),
-    ("mp2a", &["audio/mpeg"]),
-    ("mp2v", &["video/mpeg"]),
-    ("mp3", &["audio/mpeg"]),
-    ("mp4", &["video/mp4"]),
-    ("mp4a", &["audio/mp4"]),
-    ("mp4s", &["application/mp4"]),
-    ("mp4v", &["video/mp4"]),
-    ("mpa", &["video/mpeg"]),
-    ("mpc", &["application/vnd.mophun.certificate"]),
-    ("mpd", &["application/dash+xml"]),
-    ("mpe", &["video/mpeg"]),
-    ("mpeg", &["video/mpeg"]),
-    ("mpf", &["application/vnd.ms-mediapackage"]),
-    ("mpg", &["video/mpeg"]),
-    ("mpg4", &["video/mp4"]),
-    ("mpga", &["audio/mpeg"]),
-    ("mpkg", &["application/vnd.apple.installer+xml"]),
-    ("mpm", &["application/vnd.blueice.multipass"]),
-    ("mpn", &["application/vnd.mophun.application"]),
-    ("mpp", &["application/vnd.ms-project"]),
-    ("mpt", &["application/vnd.ms-project"]),
-    ("mpv2", &["video/mpeg"]),
-    ("mpy", &["application/vnd.ibm.minipay"]),
-    ("mqv", &["video/quicktime"]),
-    ("mqy", &["application/vnd.mobius.mqy"]),
-    ("mrc", &["application/marc"]),
-    ("mrcx", &["application/marcxml+xml"]),
-    ("ms", &["application/x-troff-ms"]),
-    ("mscml", &["application/mediaservercontrol+xml"]),
-    ("mseed", &["application/vnd.fdsn.mseed"]),
-    ("mseq", &["application/vnd.mseq"]),
-    ("msf", &["application/vnd.epson.msf"]),
-    ("msg", &["application/vnd.ms-outlook"]),
-    ("msh", &["model/mesh"]),
-    ("msi", &["application/octet-stream"]),
-    ("msl", &["application/vnd.mobius.msl"]),
-    ("msm", &["application/octet-stream"]),
-    ("mso", &["application/octet-stream"]),
-    ("msp", &["application/octet-stream"]),
-    ("msty", &["application/vnd.muvee.style"]),
-    ("mts", &["video/vnd.dlna.mpeg-tts"]),
-    ("mtx", &["application/xml"]),
-    ("mus", &["application/vnd.musician"]),
-    ("musicxml", &["application/vnd.recordare.musicxml+xml"]),
-    ("mvb", &["application/x-msmediaview"]),
-    ("mvc", &["application/x-miva-compiled"]),
-    ("mwf", &["application/vnd.mfer"]),
-    ("mxf", &["application/mxf"]),
-    ("mxl", &["application/vnd.recordare.musicxml"]),
-    ("mxml", &["application/xv+xml"]),
-    ("mxp", &["application/x-mmxp"]),
-    ("mxs", &["application/vnd.triscape.mxs"]),
-    ("mxu", &["video/vnd.mpegurl"]),
-    ("n-gage", &["application/vnd.nokia.n-gage.symbian.install"]),
-    ("n3", &["text/n3"]),
-    ("nb", &["application/mathematica"]),
-    ("nbp", &["application/vnd.wolfram.player"]),
-    ("nc", &["application/x-netcdf"]),
-    ("ncx", &["application/x-dtbncx+xml"]),
-    ("nfo", &["text/x-nfo"]),
-    ("ngdat", &["application/vnd.nokia.n-gage.data"]),
-    ("nitf", &["application/vnd.nitf"]),
-    ("nlu", &["application/vnd.neurolanguage.nlu"]),
-    ("nml", &["application/vnd.enliven"]),
-    ("nnd", &["application/vnd.noblenet-directory"]),
-    ("nns", &["application/vnd.noblenet-sealer"]),
-    ("nnw", &["application/vnd.noblenet-web"]),
-    ("npx", &["image/vnd.net-fpx"]),
-    ("nsc", &["video/x-ms-asf"]),
-    ("nsf", &["application/vnd.lotus-notes"]),
-    ("ntf", &["application/vnd.nitf"]),
-    ("nws", &["message/rfc822"]),
-    ("nzb", &["application/x-nzb"]),
-    ("oa2", &["application/vnd.fujitsu.oasys2"]),
-    ("oa3", &["application/vnd.fujitsu.oasys3"]),
-    ("oas", &["application/vnd.fujitsu.oasys"]),
-    ("obd", &["application/x-msbinder"]),
-    ("obj", &["application/x-tgif"]),
-    ("ocx", &["application/octet-stream"]),
-    ("oda", &["application/oda"]),
-    ("odb", &["application/vnd.oasis.opendocument.database"]),
-    ("odc", &["application/vnd.oasis.opendocument.chart"]),
-    ("odf", &["application/vnd.oasis.opendocument.formula"]),
-    (
-        "odft",
-        &["application/vnd.oasis.opendocument.formula-template"],
-    ),
-    ("odg", &["application/vnd.oasis.opendocument.graphics"]),
-    ("odh", &["text/plain"]),
-    ("odi", &["application/vnd.oasis.opendocument.image"]),
-    ("odl", &["text/plain"]),
-    ("odm", &["application/vnd.oasis.opendocument.text-master"]),
-    ("odp", &["application/vnd.oasis.opendocument.presentation"]),
-    ("ods", &["application/vnd.oasis.opendocument.spreadsheet"]),
-    ("odt", &["application/vnd.oasis.opendocument.text"]),
-    ("oga", &["audio/ogg"]),
-    ("ogg", &["audio/ogg"]),
-    ("ogv", &["video/ogg"]),
-    ("ogx", &["application/ogg"]),
-    ("omdoc", &["application/omdoc+xml"]),
-    ("one", &["application/onenote"]),
-    ("onea", &["application/onenote"]),
-    ("onepkg", &["application/onenote"]),
-    ("onetmp", &["application/onenote"]),
-    ("onetoc", &["application/onenote"]),
-    ("onetoc2", &["application/onenote"]),
-    ("opf", &["application/oebps-package+xml"]),
-    ("opml", &["text/x-opml"]),
-    ("oprc", &["application/vnd.palm"]),
-    ("opus", &["audio/ogg"]),
-    ("orderedtest", &["application/xml"]),
-    ("org", &["application/vnd.lotus-organizer"]),
-    ("osdx", &["application/opensearchdescription+xml"]),
-    ("osf", &["application/vnd.yamaha.openscoreformat"]),
-    (
-        "osfpvg",
-        &["application/vnd.yamaha.openscoreformat.osfpvg+xml"],
-    ),
-    (
-        "otc",
-        &["application/vnd.oasis.opendocument.chart-template"],
-    ),
-    ("otf", &["application/font-sfnt"]),
-    (
-        "otg",
-        &["application/vnd.oasis.opendocument.graphics-template"],
-    ),
-    ("oth", &["application/vnd.oasis.opendocument.text-web"]),
-    (
-        "oti",
-        &["application/vnd.oasis.opendocument.image-template"],
-    ),
-    (
-        "otp",
-        &["application/vnd.oasis.opendocument.presentation-template"],
-    ),
-    (
-        "ots",
-        &["application/vnd.oasis.opendocument.spreadsheet-template"],
-    ),
-    ("ott", &["application/vnd.oasis.opendocument.text-template"]),
-    ("ova", &["application/x-virtualbox-ova"]),
-    ("ovf", &["application/x-virtualbox-ovf"]),
-    ("oxps", &["application/oxps"]),
-    ("oxt", &["application/vnd.openofficeorg.extension"]),
-    ("p", &["text/x-pascal"]),
-    ("p10", &["application/pkcs10"]),
-    ("p12", &["application/x-pkcs12"]),
-    ("p7b", &["application/x-pkcs7-certificates"]),
-    ("p7c", &["application/pkcs7-mime"]),
-    ("p7m", &["application/pkcs7-mime"]),
-    ("p7r", &["application/x-pkcs7-certreqresp"]),
-    ("p7s", &["application/pkcs7-signature"]),
-    ("p8", &["application/pkcs8"]),
-    ("pac", &["application/x-ns-proxy-autoconfig"]),
-    ("pas", &["text/x-pascal"]),
-    ("paw", &["application/vnd.pawaafile"]),
-    ("pbd", &["application/vnd.powerbuilder6"]),
-    ("pbm", &["image/x-portable-bitmap"]),
-    ("pcap", &["application/vnd.tcpdump.pcap"]),
-    ("pcast", &["application/x-podcast"]),
-    ("pcf", &["application/x-font-pcf"]),
-    ("pcl", &["application/vnd.hp-pcl"]),
-    ("pclxl", &["application/vnd.hp-pclxl"]),
-    ("pct", &["image/pict"]),
-    ("pcurl", &["application/vnd.curl.pcurl"]),
-    ("pcx", &["application/octet-stream"]),
-    ("pcz", &["application/octet-stream"]),
-    ("pdb", &["application/vnd.palm"]),
-    ("pde", &["text/x-processing"]),
-    ("pdf", &["application/pdf"]),
-    ("pem", &["application/x-x509-ca-cert"]),
-    ("pfa", &["application/x-font-type1"]),
-    ("pfb", &["application/octet-stream"]),
-    ("pfm", &["application/octet-stream"]),
-    ("pfr", &["application/font-tdpfr"]),
-    ("pfx", &["application/x-pkcs12"]),
-    ("pgm", &["image/x-portable-graymap"]),
-    ("pgn", &["application/x-chess-pgn"]),
-    ("pgp", &["application/pgp-encrypted"]),
-    ("php", &["application/x-httpd-php"]),
-    ("pic", &["image/pict"]),
-    ("pict", &["image/pict"]),
-    ("pkg", &["application/octet-stream"]),
-    ("pkgdef", &["text/plain"]),
-    ("pkgundef", &["text/plain"]),
-    ("pki", &["application/pkixcmp"]),
-    ("pkipath", &["application/pkix-pkipath"]),
-    ("pko", &["application/vnd.ms-pki.pko"]),
-    ("pkpass", &["application/vnd.apple.pkpass"]),
-    ("pl", &["application/x-perl"]),
-    ("plb", &["application/vnd.3gpp.pic-bw-large"]),
-    ("plc", &["application/vnd.mobius.plc"]),
-    ("plf", &["application/vnd.pocketlearn"]),
-    ("pls", &["audio/scpls"]),
-    ("pm", &["application/x-perl"]),
-    ("pma", &["application/x-perfmon"]),
-    ("pmc", &["application/x-perfmon"]),
-    ("pml", &["application/x-perfmon"]),
-    ("pmr", &["application/x-perfmon"]),
-    ("pmw", &["application/x-perfmon"]),
-    ("png", &["image/png"]),
-    ("pnm", &["image/x-portable-anymap"]),
-    ("pnt", &["image/x-macpaint"]),
-    ("pntg", &["image/x-macpaint"]),
-    ("pnz", &["image/png"]),
-    ("portpkg", &["application/vnd.macports.portpkg"]),
-    ("pot", &["application/vnd.ms-powerpoint"]),
-    (
-        "potm",
-        &["application/vnd.ms-powerpoint.template.macroEnabled.12"],
-    ),
-    (
-        "potx",
-        &["application/vnd.openxmlformats-officedocument.presentationml.template"],
-    ),
-    ("ppa", &["application/vnd.ms-powerpoint"]),
-    (
-        "ppam",
-        &["application/vnd.ms-powerpoint.addin.macroEnabled.12"],
-    ),
-    ("ppd", &["application/vnd.cups-ppd"]),
-    ("ppm", &["image/x-portable-pixmap"]),
-    ("pps", &["application/vnd.ms-powerpoint"]),
-    (
-        "ppsm",
-        &["application/vnd.ms-powerpoint.slideshow.macroEnabled.12"],
-    ),
-    (
-        "ppsx",
-        &["application/vnd.openxmlformats-officedocument.presentationml.slideshow"],
-    ),
-    ("ppt", &["application/vnd.ms-powerpoint"]),
-    (
-        "pptm",
-        &["application/vnd.ms-powerpoint.presentation.macroEnabled.12"],
-    ),
-    (
-        "pptx",
-        &["application/vnd.openxmlformats-officedocument.presentationml.presentation"],
-    ),
-    ("pqa", &["application/vnd.palm"]),
-    ("prc", &["application/x-mobipocket-ebook"]),
-    ("pre", &["application/vnd.lotus-freelance"]),
-    ("prf", &["application/pics-rules"]),
-    ("prm", &["application/octet-stream"]),
-    ("prx", &["application/octet-stream"]),
-    ("ps", &["application/postscript"]),
-    ("psb", &["application/vnd.3gpp.pic-bw-small"]),
-    ("psc1", &["application/PowerShell"]),
-    ("psd", &["application/octet-stream"]),
-    ("psess", &["application/xml"]),
-    ("psf", &["application/x-font-linux-psf"]),
-    ("pskcxml", &["application/pskc+xml"]),
-    ("psm", &["application/octet-stream"]),
-    ("psp", &["application/octet-stream"]),
-    ("pst", &["application/vnd.ms-outlook"]),
-    ("ptid", &["application/vnd.pvi.ptid1"]),
-    ("pub", &["application/x-mspublisher"]),
-    ("pvb", &["application/vnd.3gpp.pic-bw-var"]),
-    ("pwn", &["application/vnd.3m.post-it-notes"]),
-    ("pwz", &["application/vnd.ms-powerpoint"]),
-    ("py", &["text/plain"]),
-    ("pya", &["audio/vnd.ms-playready.media.pya"]),
-    ("pyv", &["video/vnd.ms-playready.media.pyv"]),
-    ("qam", &["application/vnd.epson.quickanime"]),
-    ("qbo", &["application/vnd.intu.qbo"]),
-    ("qfx", &["application/vnd.intu.qfx"]),
-    ("qht", &["text/x-html-insertion"]),
-    ("qhtm", &["text/x-html-insertion"]),
-    ("qps", &["application/vnd.publishare-delta-tree"]),
-    ("qt", &["video/quicktime"]),
-    ("qti", &["image/x-quicktime"]),
-    ("qtif", &["image/x-quicktime"]),
-    ("qtl", &["application/x-quicktimeplayer"]),
-    ("qwd", &["application/vnd.quark.quarkxpress"]),
-    ("qwt", &["application/vnd.quark.quarkxpress"]),
-    ("qxb", &["application/vnd.quark.quarkxpress"]),
-    ("qxd", &["application/octet-stream"]),
-    ("qxl", &["application/vnd.quark.quarkxpress"]),
-    ("qxt", &["application/vnd.quark.quarkxpress"]),
-    ("ra", &["audio/x-pn-realaudio"]),
-    ("ram", &["audio/x-pn-realaudio"]),
-    ("raml", &["application/raml+yaml"]),
-    ("rar", &["application/x-rar-compressed"]),
-    ("ras", &["image/x-cmu-raster"]),
-    ("rat", &["application/rat-file"]),
-    ("rc", &["text/plain"]),
-    ("rc2", &["text/plain"]),
-    ("rcprofile", &["application/vnd.ipunplugged.rcprofile"]),
-    ("rct", &["text/plain"]),
-    ("rdf", &["application/rdf+xml"]),
-    ("rdlc", &["application/xml"]),
-    ("rdz", &["application/vnd.data-vision.rdz"]),
-    ("reg", &["text/plain"]),
-    ("rep", &["application/vnd.businessobjects"]),
-    ("res", &["application/x-dtbresource+xml"]),
-    ("resx", &["application/xml"]),
-    ("rf", &["image/vnd.rn-realflash"]),
-    ("rgb", &["image/x-rgb"]),
-    ("rgs", &["text/plain"]),
-    ("rif", &["application/reginfo+xml"]),
-    ("rip", &["audio/vnd.rip"]),
-    ("ris", &["application/x-research-info-systems"]),
-    ("rl", &["application/resource-lists+xml"]),
-    ("rlc", &["image/vnd.fujixerox.edmics-rlc"]),
-    ("rld", &["application/resource-lists-diff+xml"]),
-    ("rm", &["application/vnd.rn-realmedia"]),
-    ("rmi", &["audio/mid"]),
-    ("rmp", &["application/vnd.rn-rn_music_package"]),
-    ("rms", &["application/vnd.jcp.javame.midlet-rms"]),
-    ("rmvb", &["application/vnd.rn-realmedia-vbr"]),
-    ("rnc", &["application/relax-ng-compact-syntax"]),
-    ("rng", &["application/xml"]),
-    ("roa", &["application/rpki-roa"]),
-    ("roff", &["application/x-troff"]),
-    ("rp9", &["application/vnd.cloanto.rp9"]),
-    ("rpm", &["audio/x-pn-realaudio-plugin"]),
-    ("rpss", &["application/vnd.nokia.radio-presets"]),
-    ("rpst", &["application/vnd.nokia.radio-preset"]),
-    ("rq", &["application/sparql-query"]),
-    ("rqy", &["text/x-ms-rqy"]),
-    ("rs", &["text/x-rust"]),
-    ("rsd", &["application/rsd+xml"]),
-    ("rss", &["application/rss+xml"]),
-    ("rtf", &["application/rtf"]),
-    ("rtx", &["text/richtext"]),
-    ("ruleset", &["application/xml"]),
-    ("run", &["application/x-makeself"]),
-    ("rvt", &["application/octet-stream"]),
-    ("s", &["text/plain"]),
-    ("s3m", &["audio/s3m"]),
-    ("saf", &["application/vnd.yamaha.smaf-audio"]),
-    ("safariextz", &["application/x-safari-safariextz"]),
-    ("sass", &["text/x-sass"]),
-    ("sbml", &["application/sbml+xml"]),
-    ("sc", &["application/vnd.ibm.secure-container"]),
-    ("scd", &["application/x-msschedule"]),
-    ("scm", &["application/vnd.lotus-screencam"]),
-    ("scq", &["application/scvp-cv-request"]),
-    ("scr", &["text/plain"]),
-    ("scs", &["application/scvp-cv-response"]),
-    ("scss", &["text/x-scss"]),
-    ("sct", &["text/scriptlet"]),
-    ("scurl", &["text/vnd.curl.scurl"]),
-    ("sd2", &["audio/x-sd2"]),
-    ("sda", &["application/vnd.stardivision.draw"]),
-    ("sdc", &["application/vnd.stardivision.calc"]),
-    ("sdd", &["application/vnd.stardivision.impress"]),
-    ("sdkd", &["application/vnd.solent.sdkm+xml"]),
-    ("sdkm", &["application/vnd.solent.sdkm+xml"]),
-    ("sdp", &["application/sdp"]),
-    ("sdw", &["application/vnd.stardivision.writer"]),
-    ("sea", &["application/octet-stream"]),
-    (
-        "searchconnector-ms",
-        &["application/windows-search-connector+xml"],
-    ),
-    ("see", &["application/vnd.seemail"]),
-    ("seed", &["application/vnd.fdsn.seed"]),
-    ("sema", &["application/vnd.sema"]),
-    ("semd", &["application/vnd.semd"]),
-    ("semf", &["application/vnd.semf"]),
-    ("ser", &["application/java-serialized-object"]),
-    ("setpay", &["application/set-payment-initiation"]),
-    ("setreg", &["application/set-registration-initiation"]),
-    ("settings", &["application/xml"]),
-    ("sfd-hdstx", &["application/vnd.hydrostatix.sof-data"]),
-    ("sfs", &["application/vnd.spotfire.sfs"]),
-    ("sfv", &["text/x-sfv"]),
-    ("sgi", &["image/sgi"]),
-    ("sgimb", &["application/x-sgimb"]),
-    ("sgl", &["application/vnd.stardivision.writer-global"]),
-    ("sgm", &["text/sgml"]),
-    ("sgml", &["text/sgml"]),
-    ("sh", &["application/x-sh"]),
-    ("shar", &["application/x-shar"]),
-    ("shex", &["text/shex"]),
-    ("shf", &["application/shf+xml"]),
-    ("shtml", &["text/html"]),
-    ("sid", &["image/x-mrsid-image"]),
-    ("sig", &["application/pgp-signature"]),
-    ("sil", &["audio/silk"]),
-    ("silo", &["model/mesh"]),
-    ("sis", &["application/vnd.symbian.install"]),
-    ("sisx", &["application/vnd.symbian.install"]),
-    ("sit", &["application/x-stuffit"]),
-    ("sitemap", &["application/xml"]),
-    ("sitx", &["application/x-stuffitx"]),
-    ("skd", &["application/vnd.koan"]),
-    ("skin", &["application/xml"]),
-    ("skm", &["application/vnd.koan"]),
-    ("skp", &["application/x-koan"]),
-    ("skt", &["application/vnd.koan"]),
-    (
-        "sldm",
-        &["application/vnd.ms-powerpoint.slide.macroEnabled.12"],
-    ),
-    (
-        "sldx",
-        &["application/vnd.openxmlformats-officedocument.presentationml.slide"],
-    ),
-    ("slim", &["text/slim"]),
-    ("slk", &["application/vnd.ms-excel"]),
-    ("slm", &["text/slim"]),
-    ("sln", &["text/plain"]),
-    ("slt", &["application/vnd.epson.salt"]),
-    ("slupkg-ms", &["application/x-ms-license"]),
-    ("sm", &["application/vnd.stepmania.stepchart"]),
-    ("smd", &["audio/x-smd"]),
-    ("smf", &["application/vnd.stardivision.math"]),
-    ("smi", &["application/octet-stream"]),
-    ("smil", &["application/smil+xml"]),
-    ("smv", &["video/x-smv"]),
-    ("smx", &["audio/x-smd"]),
-    ("smz", &["audio/x-smd"]),
-    ("smzip", &["application/vnd.stepmania.package"]),
-    ("snd", &["audio/basic"]),
-    ("snf", &["application/x-font-snf"]),
-    ("snippet", &["application/xml"]),
-    ("snp", &["application/octet-stream"]),
-    ("so", &["application/octet-stream"]),
-    ("sol", &["text/plain"]),
-    ("sor", &["text/plain"]),
-    ("spc", &["application/x-pkcs7-certificates"]),
-    ("spf", &["application/vnd.yamaha.smaf-phrase"]),
-    ("spl", &["application/futuresplash"]),
-    ("spot", &["text/vnd.in3d.spot"]),
-    ("spp", &["application/scvp-vp-response"]),
-    ("spq", &["application/scvp-vp-request"]),
-    ("spx", &["audio/ogg"]),
-    ("sql", &["application/x-sql"]),
-    ("src", &["application/x-wais-source"]),
-    ("srf", &["text/plain"]),
-    ("srt", &["application/x-subrip"]),
-    ("sru", &["application/sru+xml"]),
-    ("srx", &["application/sparql-results+xml"]),
-    ("ssdl", &["application/ssdl+xml"]),
-    ("sse", &["application/vnd.kodak-descriptor"]),
-    ("ssf", &["application/vnd.epson.ssf"]),
-    ("ssisdeploymentmanifest", &["text/xml"]),
-    ("ssm", &["application/streamingmedia"]),
-    ("ssml", &["application/ssml+xml"]),
-    ("sst", &["application/vnd.ms-pki.certstore"]),
-    ("st", &["application/vnd.sailingtracker.track"]),
-    ("stc", &["application/vnd.sun.xml.calc.template"]),
-    ("std", &["application/vnd.sun.xml.draw.template"]),
-    ("step", &["application/step"]),
-    ("stf", &["application/vnd.wt.stf"]),
-    ("sti", &["application/vnd.sun.xml.impress.template"]),
-    ("stk", &["application/hyperstudio"]),
-    ("stl", &["application/vnd.ms-pki.stl"]),
-    ("stp", &["application/step"]),
-    ("str", &["application/vnd.pg.format"]),
-    ("stw", &["application/vnd.sun.xml.writer.template"]),
-    ("styl", &["text/stylus"]),
-    ("stylus", &["text/stylus"]),
-    ("sub", &["text/vnd.dvb.subtitle"]),
-    ("sus", &["application/vnd.sus-calendar"]),
-    ("susp", &["application/vnd.sus-calendar"]),
-    ("sv4cpio", &["application/x-sv4cpio"]),
-    ("sv4crc", &["application/x-sv4crc"]),
-    ("svc", &["application/xml"]),
-    ("svd", &["application/vnd.svd"]),
-    ("svg", &["image/svg+xml"]),
-    ("svgz", &["image/svg+xml"]),
-    ("swa", &["application/x-director"]),
-    ("swf", &["application/x-shockwave-flash"]),
-    ("swi", &["application/vnd.aristanetworks.swi"]),
-    ("sxc", &["application/vnd.sun.xml.calc"]),
-    ("sxd", &["application/vnd.sun.xml.draw"]),
-    ("sxg", &["application/vnd.sun.xml.writer.global"]),
-    ("sxi", &["application/vnd.sun.xml.impress"]),
-    ("sxm", &["application/vnd.sun.xml.math"]),
-    ("sxw", &["application/vnd.sun.xml.writer"]),
-    ("t", &["application/x-troff"]),
-    ("t3", &["application/x-t3vm-image"]),
-    ("taglet", &["application/vnd.mynfc"]),
-    ("tao", &["application/vnd.tao.intent-module-archive"]),
-    ("tar", &["application/x-tar"]),
-    ("tcap", &["application/vnd.3gpp2.tcap"]),
-    ("tcl", &["application/x-tcl"]),
-    ("teacher", &["application/vnd.smart.teacher"]),
-    ("tei", &["application/tei+xml"]),
-    ("teicorpus", &["application/tei+xml"]),
-    ("testrunconfig", &["application/xml"]),
-    ("testsettings", &["application/xml"]),
-    ("tex", &["application/x-tex"]),
-    ("texi", &["application/x-texinfo"]),
-    ("texinfo", &["application/x-texinfo"]),
-    ("text", &["text/plain"]),
-    ("tfi", &["application/thraud+xml"]),
-    ("tfm", &["application/x-tex-tfm"]),
-    ("tga", &["image/x-tga"]),
-    ("tgz", &["application/x-compressed"]),
-    ("thmx", &["application/vnd.ms-officetheme"]),
-    ("thn", &["application/octet-stream"]),
-    ("tif", &["image/tiff"]),
-    ("tiff", &["image/tiff"]),
-    ("tk", &["application/x-tcl"]),
-    ("tlh", &["text/plain"]),
-    ("tli", &["text/plain"]),
-    ("tmo", &["application/vnd.tmobile-livetv"]),
-    ("toc", &["application/octet-stream"]),
-    ("toml", &["text/x-toml"]),
-    ("torrent", &["application/x-bittorrent"]),
-    ("tpl", &["application/vnd.groove-tool-template"]),
-    ("tpt", &["application/vnd.trid.tpt"]),
-    ("tr", &["application/x-troff"]),
-    ("tra", &["application/vnd.trueapp"]),
-    ("trm", &["application/x-msterminal"]),
-    ("trx", &["application/xml"]),
-    ("ts", &["video/vnd.dlna.mpeg-tts"]),
-    ("tsd", &["application/timestamped-data"]),
-    ("tsv", &["text/tab-separated-values"]),
-    ("ttc", &["font/collection"]),
-    ("ttf", &["application/font-sfnt"]),
-    ("ttl", &["text/turtle"]),
-    ("tts", &["video/vnd.dlna.mpeg-tts"]),
-    ("twd", &["application/vnd.simtech-mindmapper"]),
-    ("twds", &["application/vnd.simtech-mindmapper"]),
-    ("txd", &["application/vnd.genomatix.tuxedo"]),
-    ("txf", &["application/vnd.mobius.txf"]),
-    ("txt", &["text/plain"]),
-    ("u32", &["application/octet-stream"]),
-    ("u8dsn", &["message/global-delivery-status"]),
-    ("u8hdr", &["message/global-headers"]),
-    ("u8mdn", &["message/global-disposition-notification"]),
-    ("u8msg", &["message/global"]),
-    ("udeb", &["application/x-debian-package"]),
-    ("ufd", &["application/vnd.ufdl"]),
-    ("ufdl", &["application/vnd.ufdl"]),
-    ("uls", &["text/iuls"]),
-    ("ulx", &["application/x-glulx"]),
-    ("umj", &["application/vnd.umajin"]),
-    ("unityweb", &["application/vnd.unity"]),
-    ("uoml", &["application/vnd.uoml+xml"]),
-    ("uri", &["text/uri-list"]),
-    ("uris", &["text/uri-list"]),
-    ("urls", &["text/uri-list"]),
-    ("user", &["text/plain"]),
-    ("ustar", &["application/x-ustar"]),
-    ("utz", &["application/vnd.uiq.theme"]),
-    ("uu", &["text/x-uuencode"]),
-    ("uva", &["audio/vnd.dece.audio"]),
-    ("uvd", &["application/vnd.dece.data"]),
-    ("uvf", &["application/vnd.dece.data"]),
-    ("uvg", &["image/vnd.dece.graphic"]),
-    ("uvh", &["video/vnd.dece.hd"]),
-    ("uvi", &["image/vnd.dece.graphic"]),
-    ("uvm", &["video/vnd.dece.mobile"]),
-    ("uvp", &["video/vnd.dece.pd"]),
-    ("uvs", &["video/vnd.dece.sd"]),
-    ("uvt", &["application/vnd.dece.ttml+xml"]),
-    ("uvu", &["video/vnd.uvvu.mp4"]),
-    ("uvv", &["video/vnd.dece.video"]),
-    ("uvva", &["audio/vnd.dece.audio"]),
-    ("uvvd", &["application/vnd.dece.data"]),
-    ("uvvf", &["application/vnd.dece.data"]),
-    ("uvvg", &["image/vnd.dece.graphic"]),
-    ("uvvh", &["video/vnd.dece.hd"]),
-    ("uvvi", &["image/vnd.dece.graphic"]),
-    ("uvvm", &["video/vnd.dece.mobile"]),
-    ("uvvp", &["video/vnd.dece.pd"]),
-    ("uvvs", &["video/vnd.dece.sd"]),
-    ("uvvt", &["application/vnd.dece.ttml+xml"]),
-    ("uvvu", &["video/vnd.uvvu.mp4"]),
-    ("uvvv", &["video/vnd.dece.video"]),
-    ("uvvx", &["application/vnd.dece.unspecified"]),
-    ("uvvz", &["application/vnd.dece.zip"]),
-    ("uvx", &["application/vnd.dece.unspecified"]),
-    ("uvz", &["application/vnd.dece.zip"]),
-    ("vb", &["text/plain"]),
-    ("vbdproj", &["text/plain"]),
-    ("vbk", &["video/mpeg"]),
-    ("vbox", &["application/x-virtualbox-vbox"]),
-    ("vbox-extpack", &["application/x-virtualbox-vbox-extpack"]),
-    ("vbproj", &["text/plain"]),
-    ("vbs", &["text/vbscript"]),
-    ("vcard", &["text/vcard"]),
-    ("vcd", &["application/x-cdlink"]),
-    ("vcf", &["text/x-vcard"]),
-    ("vcg", &["application/vnd.groove-vcard"]),
-    ("vcproj", &["application/xml"]),
-    ("vcs", &["text/plain"]),
-    ("vcx", &["application/vnd.vcx"]),
-    ("vcxproj", &["application/xml"]),
-    ("vddproj", &["text/plain"]),
-    ("vdi", &["application/x-virtualbox-vdi"]),
-    ("vdp", &["text/plain"]),
-    ("vdproj", &["text/plain"]),
-    ("vdx", &["application/vnd.ms-visio.viewer"]),
-    ("vhd", &["application/x-virtualbox-vhd"]),
-    ("vis", &["application/vnd.visionary"]),
-    ("viv", &["video/vnd.vivo"]),
-    ("vmdk", &["application/x-virtualbox-vmdk"]),
-    ("vml", &["text/xml"]),
-    ("vob", &["video/x-ms-vob"]),
-    ("vor", &["application/vnd.stardivision.writer"]),
-    ("vox", &["application/x-authorware-bin"]),
-    ("vrml", &["model/vrml"]),
-    ("vscontent", &["application/xml"]),
-    ("vsct", &["text/xml"]),
-    ("vsd", &["application/vnd.visio"]),
-    ("vsf", &["application/vnd.vsf"]),
-    ("vsi", &["application/ms-vsi"]),
-    ("vsix", &["application/vsix"]),
-    ("vsixlangpack", &["text/xml"]),
-    ("vsixmanifest", &["text/xml"]),
-    ("vsmdi", &["application/xml"]),
-    ("vspscc", &["text/plain"]),
-    ("vss", &["application/vnd.visio"]),
-    ("vsscc", &["text/plain"]),
-    ("vssettings", &["text/xml"]),
-    ("vssscc", &["text/plain"]),
-    ("vst", &["application/vnd.visio"]),
-    ("vstemplate", &["text/xml"]),
-    ("vsto", &["application/x-ms-vsto"]),
-    ("vsw", &["application/vnd.visio"]),
-    ("vsx", &["application/vnd.visio"]),
-    ("vtt", &["text/vtt"]),
-    ("vtu", &["model/vnd.vtu"]),
-    ("vtx", &["application/vnd.visio"]),
-    ("vxml", &["application/voicexml+xml"]),
-    ("w3d", &["application/x-director"]),
-    ("wad", &["application/x-doom"]),
-    ("wadl", &["application/vnd.sun.wadl+xml"]),
-    ("war", &["application/java-archive"]),
-    ("wasm", &["application/wasm"]),
-    ("wav", &["audio/wav"]),
-    ("wave", &["audio/wav"]),
-    ("wax", &["audio/x-ms-wax"]),
-    ("wbk", &["application/msword"]),
-    ("wbmp", &["image/vnd.wap.wbmp"]),
-    ("wbs", &["application/vnd.criticaltools.wbs+xml"]),
-    ("wbxml", &["application/vnd.wap.wbxml"]),
-    ("wcm", &["application/vnd.ms-works"]),
-    ("wdb", &["application/vnd.ms-works"]),
-    ("wdp", &["image/vnd.ms-photo"]),
-    ("weba", &["audio/webm"]),
-    ("webapp", &["application/x-web-app-manifest+json"]),
-    ("webarchive", &["application/x-safari-webarchive"]),
-    ("webm", &["video/webm"]),
-    ("webmanifest", &["application/manifest+json"]),
-    ("webp", &["image/webp"]),
-    ("webtest", &["application/xml"]),
-    ("wg", &["application/vnd.pmi.widget"]),
-    ("wgt", &["application/widget"]),
-    ("wiq", &["application/xml"]),
-    ("wiz", &["application/msword"]),
-    ("wks", &["application/vnd.ms-works"]),
-    ("wlmp", &["application/wlmoviemaker"]),
-    ("wlpginstall", &["application/x-wlpg-detect"]),
-    ("wlpginstall3", &["application/x-wlpg3-detect"]),
-    ("wm", &["video/x-ms-wm"]),
-    ("wma", &["audio/x-ms-wma"]),
-    ("wmd", &["application/x-ms-wmd"]),
-    ("wmf", &["application/x-msmetafile"]),
-    ("wml", &["text/vnd.wap.wml"]),
-    ("wmlc", &["application/vnd.wap.wmlc"]),
-    ("wmls", &["text/vnd.wap.wmlscript"]),
-    ("wmlsc", &["application/vnd.wap.wmlscriptc"]),
-    ("wmp", &["video/x-ms-wmp"]),
-    ("wmv", &["video/x-ms-wmv"]),
-    ("wmx", &["video/x-ms-wmx"]),
-    ("wmz", &["application/x-ms-wmz"]),
-    ("woff", &["application/font-woff"]),
-    ("woff2", &["font/woff2"]),
-    ("wpd", &["application/vnd.wordperfect"]),
-    ("wpl", &["application/vnd.ms-wpl"]),
-    ("wps", &["application/vnd.ms-works"]),
-    ("wqd", &["application/vnd.wqd"]),
-    ("wri", &["application/x-mswrite"]),
-    ("wrl", &["x-world/x-vrml"]),
-    ("wrz", &["x-world/x-vrml"]),
-    ("wsc", &["text/scriptlet"]),
-    ("wsdl", &["text/xml"]),
-    ("wspolicy", &["application/wspolicy+xml"]),
-    ("wtb", &["application/vnd.webturbo"]),
-    ("wvx", &["video/x-ms-wvx"]),
-    ("x", &["application/directx"]),
-    ("x32", &["application/x-authorware-bin"]),
-    ("x3d", &["model/x3d+xml"]),
-    ("x3db", &["model/x3d+binary"]),
-    ("x3dbz", &["model/x3d+binary"]),
-    ("x3dv", &["model/x3d+vrml"]),
-    ("x3dvz", &["model/x3d+vrml"]),
-    ("x3dz", &["model/x3d+xml"]),
-    ("xaf", &["x-world/x-vrml"]),
-    ("xaml", &["application/xaml+xml"]),
-    ("xap", &["application/x-silverlight-app"]),
-    ("xar", &["application/vnd.xara"]),
-    ("xbap", &["application/x-ms-xbap"]),
-    ("xbd", &["application/vnd.fujixerox.docuworks.binder"]),
-    ("xbm", &["image/x-xbitmap"]),
-    ("xdf", &["application/xcap-diff+xml"]),
-    ("xdm", &["application/vnd.syncml.dm+xml"]),
-    ("xdp", &["application/vnd.adobe.xdp+xml"]),
-    ("xdr", &["text/plain"]),
-    ("xdssc", &["application/dssc+xml"]),
-    ("xdw", &["application/vnd.fujixerox.docuworks"]),
-    ("xenc", &["application/xenc+xml"]),
-    ("xer", &["application/patch-ops-error+xml"]),
-    ("xfdf", &["application/vnd.adobe.xfdf"]),
-    ("xfdl", &["application/vnd.xfdl"]),
-    ("xht", &["application/xhtml+xml"]),
-    ("xhtml", &["application/xhtml+xml"]),
-    ("xhvml", &["application/xv+xml"]),
-    ("xif", &["image/vnd.xiff"]),
-    ("xla", &["application/vnd.ms-excel"]),
-    ("xlam", &["application/vnd.ms-excel.addin.macroEnabled.12"]),
-    ("xlc", &["application/vnd.ms-excel"]),
-    ("xld", &["application/vnd.ms-excel"]),
-    ("xlf", &["application/x-xliff+xml"]),
-    ("xlk", &["application/vnd.ms-excel"]),
-    ("xll", &["application/vnd.ms-excel"]),
-    ("xlm", &["application/vnd.ms-excel"]),
-    ("xls", &["application/vnd.ms-excel"]),
-    (
-        "xlsb",
-        &["application/vnd.ms-excel.sheet.binary.macroEnabled.12"],
-    ),
-    ("xlsm", &["application/vnd.ms-excel.sheet.macroEnabled.12"]),
-    (
-        "xlsx",
-        &["application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"],
-    ),
-    ("xlt", &["application/vnd.ms-excel"]),
-    (
-        "xltm",
-        &["application/vnd.ms-excel.template.macroEnabled.12"],
-    ),
-    (
-        "xltx",
-        &["application/vnd.openxmlformats-officedocument.spreadsheetml.template"],
-    ),
-    ("xlw", &["application/vnd.ms-excel"]),
-    ("xm", &["audio/xm"]),
-    ("xml", &["text/xml"]),
-    ("xmp", &["application/octet-stream"]),
-    ("xmta", &["application/xml"]),
-    ("xo", &["application/vnd.olpc-sugar"]),
-    ("xof", &["x-world/x-vrml"]),
-    ("xoml", &["text/plain"]),
-    ("xop", &["application/xop+xml"]),
-    ("xpi", &["application/x-xpinstall"]),
-    ("xpl", &["application/xproc+xml"]),
-    ("xpm", &["image/x-xpixmap"]),
-    ("xpr", &["application/vnd.is-xpr"]),
-    ("xps", &["application/vnd.ms-xpsdocument"]),
-    ("xpw", &["application/vnd.intercon.formnet"]),
-    ("xpx", &["application/vnd.intercon.formnet"]),
-    ("xrm-ms", &["text/xml"]),
-    ("xsc", &["application/xml"]),
-    ("xsd", &["text/xml"]),
-    ("xsf", &["text/xml"]),
-    ("xsl", &["text/xml"]),
-    ("xslt", &["text/xml"]),
-    ("xsm", &["application/vnd.syncml+xml"]),
-    ("xsn", &["application/octet-stream"]),
-    ("xspf", &["application/xspf+xml"]),
-    ("xss", &["application/xml"]),
-    ("xtp", &["application/octet-stream"]),
-    ("xul", &["application/vnd.mozilla.xul+xml"]),
-    ("xvm", &["application/xv+xml"]),
-    ("xvml", &["application/xv+xml"]),
-    ("xwd", &["image/x-xwindowdump"]),
-    ("xyz", &["chemical/x-xyz"]),
-    ("xz", &["application/x-xz"]),
-    ("yaml", &["text/x-yaml"]),
-    ("yang", &["application/yang"]),
-    ("yin", &["application/yin+xml"]),
-    ("yml", &["text/x-yaml"]),
-    ("ymp", &["text/x-suse-ymp"]),
-    ("z", &["application/x-compress"]),
-    ("z1", &["application/x-zmachine"]),
-    ("z2", &["application/x-zmachine"]),
-    ("z3", &["application/x-zmachine"]),
-    ("z4", &["application/x-zmachine"]),
-    ("z5", &["application/x-zmachine"]),
-    ("z6", &["application/x-zmachine"]),
-    ("z7", &["application/x-zmachine"]),
-    ("z8", &["application/x-zmachine"]),
-    ("zaz", &["application/vnd.zzazz.deck+xml"]),
-    ("zip", &["application/zip"]),
-    ("zir", &["application/vnd.zul"]),
-    ("zirz", &["application/vnd.zul"]),
-    ("zmm", &["application/vnd.handheld-entertainment+xml"]),
-];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"3f120d38e87608d6cefbe0ba08225f8205a1419d512afb840233d56c86725ced","LICENSE":"e190940e8ad3cdd4fca962a6508ed6865d589d314b1cb055f86000e124b88d8d","LICENSE-APACHE.md":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT.md":"e190940e8ad3cdd4fca962a6508ed6865d589d314b1cb055f86000e124b88d8d","LICENSE-ZLIB.md":"c89bcc058da12a0fb24402b8ea4542a21515dd1da2e8c67bba4ed9bd269f1c96","Readme.md":"fca5f9500a8caf5a334dc53925fa3dda063a8a4de88fe107251998300b432c0d","build.rs":"028882f1da195677e4729e5a07d3593a333297bb8c0f92789fadb3669cb3ed62","src/deflate/buffer.rs":"2953214307677f33f901f8e52256b6e7a296f4234238179613168ddad106645c","src/deflate/core.rs":"db40c9a95f5a9ad72c17eef934e163d90768b2a0f8fa53cf37d71e550cdf84f9","src/deflate/mod.rs":"d17cd7a576be570cf948d2fbf0ce535be35cc4ef94cbfbfaefc17c6641bd412a","src/deflate/stream.rs":"49120444fb12b58191c2bb0dda598cd3614cbc329eb3720a50ce8f5017c04838","src/inflate/core.rs":"a4d8c3cf20ec3b89b12f7ac1df37b521d29e910f854cb1ccb2b8c7bb23244b25","src/inflate/mod.rs":"9252ddf7edf6b8205ff5820dcc22eaeb244130e135f5bbb416c9701ca6118e23","src/inflate/output_buffer.rs":"3948c26897a8d30a356fc8e9ce1df7513c21d186838220ad63a69b6b1d985eab","src/inflate/stream.rs":"c77a867022f9d79749d610e64762aa9203accb975d498ece0f34974cd07cd5e2","src/lib.rs":"08b54d4c675f3c2901d493ce85895952b639781faa40bf0b620da6dff0a1fb91","src/shared.rs":"889b9d9d3b4bc0693f94c850806e9cf68ed9079e0ada2b2f51bfffe388e02c6a"},"package":"0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"}
\ No newline at end of file
+{"files":{"Cargo.toml":"ce39c1ad4f1b3dfca82915366f8095fbe5f6025867c7829df16758bbb826a9cd","LICENSE":"e190940e8ad3cdd4fca962a6508ed6865d589d314b1cb055f86000e124b88d8d","LICENSE-APACHE.md":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT.md":"e190940e8ad3cdd4fca962a6508ed6865d589d314b1cb055f86000e124b88d8d","LICENSE-ZLIB.md":"c89bcc058da12a0fb24402b8ea4542a21515dd1da2e8c67bba4ed9bd269f1c96","Readme.md":"fca5f9500a8caf5a334dc53925fa3dda063a8a4de88fe107251998300b432c0d","build.rs":"028882f1da195677e4729e5a07d3593a333297bb8c0f92789fadb3669cb3ed62","src/deflate/buffer.rs":"2953214307677f33f901f8e52256b6e7a296f4234238179613168ddad106645c","src/deflate/core.rs":"68139f9839717877fee1f17bb5a6bef2c3e79e19268c7369bbbbb0c15647cd79","src/deflate/mod.rs":"d17cd7a576be570cf948d2fbf0ce535be35cc4ef94cbfbfaefc17c6641bd412a","src/deflate/stream.rs":"49120444fb12b58191c2bb0dda598cd3614cbc329eb3720a50ce8f5017c04838","src/inflate/core.rs":"2dce0b86e821a0587fab466220815bb90b3d5336a97580a7b890c53947bd0d53","src/inflate/mod.rs":"9252ddf7edf6b8205ff5820dcc22eaeb244130e135f5bbb416c9701ca6118e23","src/inflate/output_buffer.rs":"0081b3fde84d8d0045e281fb143793eca8e9043733314e5cf6f37f51ac97021c","src/inflate/stream.rs":"7c91db58a7076e95117d533c151881f1339536525121f58c4b59d17a634e17ba","src/lib.rs":"08b54d4c675f3c2901d493ce85895952b639781faa40bf0b620da6dff0a1fb91","src/shared.rs":"889b9d9d3b4bc0693f94c850806e9cf68ed9079e0ada2b2f51bfffe388e02c6a"},"package":"a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "miniz_oxide"
-version = "0.4.3"
+version = "0.4.4"
 authors = ["Frommi <daniil.liferenko@gmail.com>", "oyvindln <oyvindln@users.noreply.github.com>"]
 build = "build.rs"
 exclude = ["benches/*", "tests/*"]
@@ -29,7 +29,7 @@
 [lib]
 name = "miniz_oxide"
 [dependencies.adler]
-version = "0.2.3"
+version = "1.0"
 default-features = false
 
 [dependencies.alloc]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/src/deflate/core.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/src/deflate/core.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/src/deflate/core.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/src/deflate/core.rs	2021-12-09 12:01:26.000000000 +0000
@@ -385,7 +385,7 @@
 
 // Read the two bytes starting at pos and interpret them as an u16.
 #[inline]
-fn read_u16_le(slice: &[u8], pos: usize) -> u16 {
+const fn read_u16_le(slice: &[u8], pos: usize) -> u16 {
     // The compiler is smart enough to optimize this into an unaligned load.
     slice[pos] as u16 | ((slice[pos + 1] as u16) << 8)
 }
@@ -675,7 +675,7 @@
         }
     }
 
-    fn save(&self) -> SavedOutputBufferOxide {
+    const fn save(&self) -> SavedOutputBufferOxide {
         SavedOutputBufferOxide {
             pos: self.inner_pos,
             bit_buffer: self.bit_buffer,
@@ -1184,7 +1184,7 @@
     pub size: usize,
 }
 
-fn probes_from_flags(flags: u32) -> [u32; 2] {
+const fn probes_from_flags(flags: u32) -> [u32; 2] {
     [
         1 + ((flags & 0xFFF) + 2) / 3,
         1 + (((flags & 0xFFF) >> 2) + 2) / 3,
@@ -1446,7 +1446,7 @@
 }
 
 impl LZOxide {
-    fn new() -> Self {
+    const fn new() -> Self {
         LZOxide {
             codes: [0; LZ_CODE_BUF_SIZE],
             code_position: 1,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/src/inflate/core.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/src/inflate/core.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/src/inflate/core.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/src/inflate/core.rs	2021-12-09 12:01:26.000000000 +0000
@@ -26,7 +26,7 @@
 }
 
 impl HuffmanTable {
-    fn new() -> HuffmanTable {
+    const fn new() -> HuffmanTable {
         HuffmanTable {
             code_size: [0; MAX_HUFF_SYMBOLS_0],
             look_up: [0; FAST_LOOKUP_SIZE as usize],
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/src/inflate/output_buffer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/src/inflate/output_buffer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/src/inflate/output_buffer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/src/inflate/output_buffer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,7 +15,7 @@
     }
 
     #[inline]
-    pub fn position(&self) -> usize {
+    pub const fn position(&self) -> usize {
         self.position
     }
 
@@ -49,7 +49,7 @@
     }
 
     #[inline]
-    pub fn get_ref(&self) -> &[u8] {
+    pub const fn get_ref(&self) -> &[u8] {
         self.slice
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/src/inflate/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/src/inflate/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miniz_oxide/src/inflate/stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miniz_oxide/src/inflate/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -126,7 +126,7 @@
     }
 
     /// Return the status of the last call to `inflate` with this `InflateState`.
-    pub fn last_status(&self) -> TINFLStatus {
+    pub const fn last_status(&self) -> TINFLStatus {
         self.last_status
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"4ba3d031a78895b4251cc75585215ded07c2d4ca84b79dea5c55a68fd973a29d","Cargo.toml":"1cebd8a3a1509948b24b4de3ed6eedd2441f1a36e4831a2b2b3c38539b7ead70","LICENSE":"07919255c7e04793d8ea760d6c2ce32d19f9ff02bdbdde3ce90b1e1880929a9b","README.md":"eedc84973c97348ea27f93ac7d3232098438d4455c7eaedf6fcc7f105ac9f321","src/channel.rs":"b16493a2b74334156e153b1f4143b0e98d43cd4d7bff0275066dfa575dde2402","src/deprecated/event_loop.rs":"ba931d256e6e57d5635c6cfc6e3a4add4551c87f16457d901b334a129f9cf41d","src/deprecated/handler.rs":"13cbc0c193f43a331e125e05d5eddf3712fe86e41a8721186d3672518ef8a9cc","src/deprecated/io.rs":"4948217ffeeba4f508cc89744da5d6af858b4ad7b4be23f927a00df93bdf2984","src/deprecated/mod.rs":"4310471b5a1313dbf53b492769a3031b15353eb269333b7c1a890bc2709def7c","src/deprecated/notify.rs":"8cb108387ebcfb75764e4dd2868d80eb00d793c4b7c867c08cd86ef10b91b023","src/deprecated/unix.rs":"76c832e7db8263395b576930186fe1a3c472589bed41810d445d89f0eed684eb","src/event_imp.rs":"f8cff47dedc52dab9c7cc2d707f2c2d86d7185f942f02ace4c60353cc6094035","src/io.rs":"9207ffc93ea744b09bc6872fa4d378d7c75640f9ac38b1fa67b940c7cb5d0ade","src/lazycell.rs":"871dbd89f6918a354c2ec2d2a8b89e4aa30754e7e3e8dfcf2f5a6071156e39cf","src/lib.rs":"b875273d1852b6ef11a112fb27147587f5ed699e2c3ce99da3175358a8ff6fdd","src/net/mod.rs":"340c63a8efe9ee774b7bf8ed8c0f72fc7563e5c4b35f6a8b243f92d366e145a2","src/net/tcp.rs":"8b06dc8d2dd9fb7cd52db582fd7fe608b6a50cdf7ce18cf0abb9992956e95f6d","src/net/udp.rs":"8b5728924a07917d2845bbfb060cadb842b36a74d5372ac7707eb7f169a67d4d","src/poll.rs":"e76bb316deedbd9306f91ca8ab394d02b5676fa767746bd9770c5c9dff490426","src/sys/fuchsia/awakener.rs":"71a4a0083242457b0a96326c69c0f98b23dfdb97be96deb26ee02fa9d1dfb212","src/sys/fuchsia/eventedfd.rs":"bd8f43d2b61cdd6a5d0df9c0dc1cb43e1708140d01a05611055277ed55a33b63","src/sys/fuchsia/handles.rs":"161a69e8a8d7f71326a9c53bcb7685d0a81d184aba8e20da27c64aa27dfd56b2","src/sys/fuchsia/mod.rs":"9d80f1214abc93f48b6b6c12ce5b6cfaddbda592c8f3410564d0237228cae2d0","src/sys/fuchsia/net.rs":"50340191dd9cbe317bd6e6ae0170c03daa9141f15c96782b96484e3d8b8301b1","src/sys/fuchsia/ready.rs":"7e6bb7235c52ab4a2134d36cf982f6a4fd6e18050e737b40ee84c89a10a9faac","src/sys/fuchsia/selector.rs":"f3be7f8d683d43e4a8313246e4cacb9444549bf66ecb2234f0d0f53172043bf5","src/sys/mod.rs":"64bea046e4a9feb1f2e2fb8326452c1be8b9d56cf8794df0af4fbdf565204255","src/sys/unix/awakener.rs":"20a61d8f39b2f2abf4f166a3ed46fa0d79907ddf92758eaddb880c67321db56c","src/sys/unix/dlsym.rs":"559337d1f6c10e6c1172bd3908a9dcfa5a0828b53b04f7ca3a0d926afa85cd63","src/sys/unix/epoll.rs":"26b34910c87883f1b8170b95aed1bf3d9ecd9442c7afd23ff1b87d54391e2c88","src/sys/unix/eventedfd.rs":"a0bd2096ab5acf42c48110f024bc8ea052ba62c707345c7db46fea7a494388df","src/sys/unix/io.rs":"a518f09020f821e87bcf9c2ecb4bf501d428619ddfd7b35a26629b614919b14c","src/sys/unix/kqueue.rs":"3bf9f9635a8607569e3176998b61d1801e5bb35a94588c827a0a954656eee3ea","src/sys/unix/mod.rs":"15ddcfab101e7dfb926f82fd2d6eebb30c66f43fc2af00e4bb2f687c7059e0d0","src/sys/unix/ready.rs":"8494e27731d6842a90e01ec783d37001802f472f81358177e047d43b4bc68c43","src/sys/unix/tcp.rs":"19d483762fc8c8a1cb182b2f2ead85534f99394cf605a14d5ed46db7f3354667","src/sys/unix/udp.rs":"bc2e8ad142b17797a7d038e720ff57ac9840eb5b2b26696c854180085ccd1873","src/sys/unix/uds.rs":"5223d4d35048019d175679686cc65a08baf027df0b2127428e2f322bbb533309","src/sys/unix/uio.rs":"3942a49548dd3a37e5fd6044a103d92e2635965ace1ab370be10c82245b41f66","src/sys/windows/awakener.rs":"2d3cdaf8b523675e2f64c5fd81e1197d5255384517b9753b718c5c47acf0cabd","src/sys/windows/buffer_pool.rs":"636f4b7510a507f9985987699ce8ec140b2ed852abb231443ee1486c80759eed","src/sys/windows/from_raw_arc.rs":"659dabdf5037546e3783aacc422992b4248b0ba2ddcce52b149d35bc723550e5","src/sys/windows/mod.rs":"afeec8cd4e3adeaf6ffe68b134ad1b4ba07faa3abae96f6f9a00bbc20ff5f2c5","src/sys/windows/selector.rs":"0137276cff457f84511e007bb9527f5e082ec04e898b8f8e0acd39fe65c00148","src/sys/windows/tcp.rs":"9942db351f91229d01a0b9f52dd6c9680050d3abcee9fbb6b4f2f14896dc2c58","src/sys/windows/udp.rs":"1ef869b660bcf89ea6498552474abf8f540946631e14d5b610ca31014cd9045f","src/timer.rs":"540d521c5b4a79f3b1c01296ef2e14e2e3743192f25180ee6e71e367692ce762","src/token.rs":"4a56f851709470df2eed803c57c68b0a4b12ea86fa1b8d2c999bec7a85d58ec0","src/udp.rs":"442e620f3ea0cf010497d3ad775debd585f28e79a025993d40471c8e6839dc98"},"package":"4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"20af3dc4a30dc94d6de24ad6a4af2a2d3e28c30ea0da993982ce4d3097a49780","Cargo.lock":"6b12b6030c8764081b6795e3d284018dd27a2c65ed6b0f72f77e9881cffc6707","Cargo.toml":"a52881fa6626b5efd42c87abac22025626147e3590ccc4c9c141334541ec0806","LICENSE":"07919255c7e04793d8ea760d6c2ce32d19f9ff02bdbdde3ce90b1e1880929a9b","README.md":"82e4ccb5a33551e3372cf4bed2e38696b722dbd3cba133666bb73bebf15a3a43","examples/tcp_server.rs":"53de2e3077327485505e84fe3b0bdf93a3258e4d4deb13988dd9f8577cc071ae","examples/udp_server.rs":"852629aa194926bcb36d86793a36256ac1e4958e3bb5ae255550f1b197409971","src/event/event.rs":"286447271c1a7c41dd2083fe38798956e40f395cceb940afc17489824b5fbdce","src/event/events.rs":"5cad85e0d0c9e619b6017f868c681ed0dc023e7aae8c0c5c0c7337b2fa96a8a6","src/event/mod.rs":"c129c42114867e3e7337a6605952db8cef8a7ef0938f67a28fa68e73fc420c6a","src/event/source.rs":"1f991439b52380a6b45c09cb7e5319df1216e544add97877405d629118def823","src/interest.rs":"f4a3adc629956199a4580e3bcfcdad5dc13518c4141ce7d4f08d2569aa7ddec5","src/io_source.rs":"6946ab1bc749324739f2b51962efdaa0051f6da3df2381d0c8f79109daa99434","src/lib.rs":"b7d046fe377be963e452fa5f1b087387b4c11d93f2f6acae13a5bc6666a68251","src/macros.rs":"c484744396b163555c8593cf15929201dd23b3ff75a4be03b8dc34e46f6d9caa","src/net/mod.rs":"d7154b9b579c0d8f40e1b2e9e68dea157f69e301ba00ad703f3451b507466f30","src/net/tcp/listener.rs":"841c9c778a98c501d20bf557de40192762aaa3ecf5c20710bc9c71d40fbb89aa","src/net/tcp/mod.rs":"300214b6ff47e818c72907742fa993abd9664a6e7bc9ae34ad42ae793abfbfd9","src/net/tcp/socket.rs":"9cd43120610937c8929fd41b4c3eec60fb31a63fdb93034a5eb5b807861ffd4f","src/net/tcp/stream.rs":"793ceb378819cc3b4cbeceddbee5043a224d8d2905986fc3c9b4b83de97d1fd9","src/net/udp.rs":"2d0009f7cda073ff490b113b4a2a32c15328ae3c12352c765801549ab3a4acc6","src/net/uds/datagram.rs":"980944654a03f61311a7208043011db4831d40b92bd440ed57515cac6104ff2f","src/net/uds/listener.rs":"714b1638a522cc95bb70b137441bc1282684fbcde4432b6872ad052f66670164","src/net/uds/mod.rs":"70d4368adae74652d46771b29e633396e5f1b70e9b7d1370cf5fec9a78605c04","src/net/uds/stream.rs":"fa6dd11e5736c8372037945f96c5b0c7adee1a29c2b194bc9bf9f7cc2db7f1f4","src/poll.rs":"f5c839be5daff54c8d8e0e7e1967936693c899b18bfc0ecdada1da18b6bea551","src/sys/mod.rs":"58d6750b37d4bd94ac90e9aaeb88aa79a65f379931857691ae5e7df16a55c15d","src/sys/shell/mod.rs":"6c8b107397e110e916c02e0f1f1f03344974456a7e929a731eeb462d5ba13968","src/sys/shell/selector.rs":"9f6eee2b858c68012962cfcd7ed747acd198c518ddb807ada2a30eb1faf4c052","src/sys/shell/tcp.rs":"bb0696538c7dfd22e96d5285e33d606ce5519952e4a3c1fe2b9f7b9eca3c965b","src/sys/shell/udp.rs":"fc830fea77935d141f87179c5ceec95318c67d24060051c155deb5ace14d7134","src/sys/shell/uds.rs":"10c2933423e251fca678322ff9fc7501fcaacdfa769307399cb5dfc7bef63ec3","src/sys/shell/waker.rs":"81bc18cf52345a8d17e8142291e43dd70a36dfd9f5eb486f3e787998ee4451dc","src/sys/unix/mod.rs":"d2b03e3d166d174f1ad283e6a2aa1c3287b4d6e0affb3ed7ea7e033fbbfc5f1d","src/sys/unix/net.rs":"f09760a7d039c7ae7a04184051973b63a8ca2d9fbfa78268743173ed4569fefa","src/sys/unix/pipe.rs":"30b85b750b96c5dfa3e45334d5ee8ab9ccd58a27b5b06279dc2d57354b6d018f","src/sys/unix/selector/epoll.rs":"b179284751fe409e4ebe23bb44c8cebeb317afa569504d3d8d5e8cbda5a66728","src/sys/unix/selector/kqueue.rs":"7baad92dce647024e993e5a6c6a5da9d81632f85b333eb1ca4d32eeba920cbde","src/sys/unix/selector/mod.rs":"ee617b86483def04fb9e75e5ed8f5c71a7148511f1c289749b7a77100bae6829","src/sys/unix/sourcefd.rs":"3ef7c2817bc1d2424ec55e41209b6cd0a2634c4ac17bacdc47dbac8e91255944","src/sys/unix/tcp.rs":"fe0ae1da5c9b08dd6bf06fbdb592bfc6d613e57910bb7ffe4733acd44cfd13cf","src/sys/unix/udp.rs":"babf7d444eba0db29b130f0e254b0715e2566e7ea5b0f0e35cddf72d83f40b3b","src/sys/unix/uds/datagram.rs":"a7da7e4292ac42ccc2be5ad5909ced1d20377ace0198868fed89e086edc016f7","src/sys/unix/uds/listener.rs":"ee26d73cc02e455aed0635f4874fe3df94f9e9ef9425ce7918422e86503c6bfb","src/sys/unix/uds/mod.rs":"fcdab5bd2a889e5157e2b93f065d0a4c1df7b5dd681e9b83a664e4269facb4a8","src/sys/unix/uds/socketaddr.rs":"ccf87531398c8bbde9eff8c9ee0186ebd486be59052343c6957fb515384345d7","src/sys/unix/uds/stream.rs":"f785ff59f9e8ddec8519f5bfbd93150f26674efa91742909eb839d44250fe334","src/sys/unix/waker.rs":"5233c7d353c34f06da24f9f7db9eb9408d2dca221b255f0080ebcf258ac659e2","src/sys/windows/afd.rs":"954287fa361f4c4bb6af9b61d8d21325fc80301afd7e4c2c36415355dde0dbeb","src/sys/windows/event.rs":"75539e2db54858605e565742a68242b2a69fe9b8cd8d60ff7a109cf43e5b5930","src/sys/windows/io_status_block.rs":"9920f2b12ebd90f1c42cd73fff775d015321dd2186d58fd10bca8f349489e5e0","src/sys/windows/mod.rs":"96217f0a3a90788b081684c0f3e704ee117c500f20564606cd630cdfaa57decd","src/sys/windows/named_pipe.rs":"4e2e8a0db834b9ec6e6c70651e92bac36960f6563b30e25b7ee7393d9f72c6f1","src/sys/windows/net.rs":"facfd513f2d59daee38d644c7494874daf5b0a78e6d2742665d497e25d6495f1","src/sys/windows/overlapped.rs":"a041d2a6f03eb5e005ed14f23bc5cdf12dfc33036a7644dc925518ad944987f0","src/sys/windows/selector.rs":"2e9c300f2e3b156294aa08e961ceb49674ebaa2177174a67be33cc3b057e119a","src/sys/windows/tcp.rs":"acd1797c94ebb0acab6a989bd80004b6f092d051b050a7f8d21d9676f0a2bad2","src/sys/windows/udp.rs":"07b104a6be6cba40acf9933cd6283260a2e272b7d50743d836aa13f4bc4b07f3","src/sys/windows/waker.rs":"acae348778e4f60762b9e4cf083ff02305d9a7a14216456154a9be7f7af4c6c9","src/token.rs":"e883c0f8e3c8ce7de01e577e91271af7242d1e0254437345d85458d8d9b77973","src/waker.rs":"04f34d2148516945052dfe4c0930100b45f5ebabc838e90b162cb2904d361f74"},"package":"8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,141 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "env_logger"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
+[[package]]
+name = "libc"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "mio"
+version = "0.7.13"
+dependencies = [
+ "env_logger",
+ "libc",
+ "log",
+ "miow",
+ "ntapi",
+ "rand",
+ "winapi",
+]
+
+[[package]]
+name = "miow"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
+dependencies = [
+ "socket2",
+ "winapi",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "rand"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
+dependencies = [
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "rdrand",
+ "winapi",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+dependencies = [
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "socket2"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -11,61 +11,62 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "mio"
-version = "0.6.23"
-authors = ["Carl Lerche <me@carllerche.com>"]
-include = ["Cargo.toml", "LICENSE", "README.md", "CHANGELOG.md", "src/**/*.rs"]
+version = "0.7.13"
+authors = ["Carl Lerche <me@carllerche.com>", "Thomas de Zeeuw <thomasdezeeuw@gmail.com>", "Tokio Contributors <team@tokio.rs>"]
+include = ["Cargo.toml", "LICENSE", "README.md", "CHANGELOG.md", "src/**/*.rs", "examples/**/*.rs"]
 description = "Lightweight non-blocking IO"
 homepage = "https://github.com/tokio-rs/mio"
-documentation = "https://docs.rs/mio/0.6.23/mio/"
+documentation = "https://docs.rs/mio/0.7.13"
 readme = "README.md"
 keywords = ["io", "async", "non-blocking"]
 categories = ["asynchronous"]
 license = "MIT"
 repository = "https://github.com/tokio-rs/mio"
-
-[[test]]
-name = "test"
-path = "test/mod.rs"
-[dependencies.cfg-if]
-version = "0.1.9"
-
-[dependencies.iovec]
-version = "0.1.1"
-
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+targets = ["aarch64-apple-ios", "aarch64-linux-android", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-sun-solaris", "x86_64-unknown-dragonfly", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu", "x86_64-unknown-netbsd", "x86_64-unknown-openbsd"]
+
+[package.metadata.playground]
+features = ["os-poll", "os-ext", "net"]
+
+[[example]]
+name = "tcp_server"
+required-features = ["os-poll", "net"]
+
+[[example]]
+name = "udp_server"
+required-features = ["os-poll", "net"]
 [dependencies.log]
-version = "0.4"
-
-[dependencies.net2]
-version = "0.2.36"
-
-[dependencies.slab]
-version = "0.4.0"
-[dev-dependencies.bytes]
-version = "0.3.0"
-
+version = "0.4.8"
 [dev-dependencies.env_logger]
-version = "0.4.0"
+version = "0.6.2"
 default-features = false
 
-[dev-dependencies.tempdir]
-version = "0.3.4"
+[dev-dependencies.rand]
+version = "0.4"
 
 [features]
-default = ["with-deprecated"]
-with-deprecated = []
-[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-zircon]
-version = "0.3.2"
-
-[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-zircon-sys]
-version = "0.3.2"
+default = []
+extra-docs = []
+net = []
+os-ext = ["os-poll"]
+os-poll = []
+os-util = ["os-ext"]
+pipe = ["os-ext"]
+tcp = ["net"]
+udp = ["net"]
+uds = ["net"]
 [target."cfg(unix)".dependencies.libc]
-version = "0.2.54"
-[target."cfg(windows)".dependencies.kernel32-sys]
-version = "0.2"
-
+version = "0.2.86"
 [target."cfg(windows)".dependencies.miow]
-version = "0.2.2"
+version = "0.3.6"
+
+[target."cfg(windows)".dependencies.ntapi]
+version = "0.3"
 
 [target."cfg(windows)".dependencies.winapi]
-version = "0.2.6"
+version = "0.3"
+features = ["winsock2", "mswsock", "mstcpip"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,265 @@
+# 0.7.13
+
+## Fixes
+
+* Fix `Registry::try_clone` invalid usage of `F_DUPFD_CLOEXEC` (#1497,
+  https://github.com/tokio-rs/mio/commit/2883f5c1f35bf1a59682c5ffc4afe6b97d7d6e68).
+
+# 0.7.12 (yanked)
+
+## Fixes
+
+* Set `FD_CLOEXEC` when calling `Registry::try_clone`
+  (https://github.com/tokio-rs/mio/commit/d1617b567ff6bc669d71e367d22e0e93ff7e2e24 for epoll and
+  (https://github.com/tokio-rs/mio/commit/b367a05e408ca90a26383c3aa16d8a16f019dc59 for kqueue).
+
+# 0.7.11
+
+## Fixes
+
+* Fix missing feature of winapi.
+  (https://github.com/tokio-rs/mio/commit/a7e61db9e3c2b929ef1a33532bfcc22045d163ce).
+
+# 0.7.10
+
+## Fixes
+
+* Fix an instance of not doc(cfg(.*))
+  (https://github.com/tokio-rs/mio/commit/25e8f911357c740034f10a170dfa4ea1b28234ce).
+
+## Fixes
+
+* Fix error handling in `NamedPipe::write`
+  (https://github.com/tokio-rs/mio/commit/aec872be9732e5c6685100674278be27f54a271b).
+* Use `accept(2)` on x86 Android instead of `accept4(2)`
+  (https://github.com/tokio-rs/mio/commit/6f86b925d3e48f30905d5cfa54348acf3f1fa036,
+  https://github.com/tokio-rs/mio/commit/8d5414880ab82178305ac1d2c16d715e58633d3e).
+* Improve error message when opening AFD device
+  (https://github.com/tokio-rs/mio/commit/139f7c4422321eb4a17b14ae2c296fddd19a8804).
+
+# 0.7.8
+
+## Fixes
+
+* Fix `TcpStream::set_linger` on macOS
+  (https://github.com/tokio-rs/mio/commit/175773ce02e85977db81224c782c8d140aba8543).
+* Fix compilation on DragonFlyBSD
+  (https://github.com/tokio-rs/mio/commit/b51af46b28871f8dd3233b490ee62237ffed6a26).
+
+# 0.7.7
+
+## Added
+
+* `UdpSocket::only_v6`
+  (https://github.com/tokio-rs/mio/commit/0101e05a800f17fb88f4315d9b9fe0f08cca6e57).
+* `Clone` implementation for `Event`
+  (https://github.com/tokio-rs/mio/commit/26540ebbae89df6d4d08465c56f715d8f2addfc3).
+* `AsRawFd` implementation for `Registry`
+  (https://github.com/tokio-rs/mio/commit/f70daa72da0042b1880256164774c3286d315a02).
+* `Read` and `Write` implementation for `&unix::pipe::Sender` and `Receiver`,
+  that is on the reference to them, an implementation existed on the types
+  themselves already
+  (https://github.com/tokio-rs/mio/commit/1be481dcbbcb6906364008b5d61e7f53cddc3eb3).
+
+
+## Fixes
+
+* Underflow in `SocketAddr::address`
+  (https://github.com/tokio-rs/mio/commit/6d3fa69240cd4bb95e9d34605c660c30245a18bd).
+* Android build with the net feature enabled, but with os-poll disabled
+  (https://github.com/tokio-rs/mio/commit/49d8fd33e026ad6e2c055d05d6667180ba2af7be).
+* Solaris build with the net feature enabled, but with os-poll disabled
+  (https://github.com/tokio-rs/mio/commit/a6e025e9d9511639ec106ebedc0dd312bdc9be12).
+* Ensure that `Waker::wake` works on illumos systems with poor `pipe(2)` and
+  `epoll(2)` interaction using `EPOLLET`
+  (https://github.com/tokio-rs/mio/commit/943d4249dcc17cd8b4d2250c4fa19116097248fa).
+* Fix `unix::pipe` on illumos
+  (https://github.com/tokio-rs/mio/commit/0db49f6d5caf54b12176821363d154384357e70a).
+
+# 0.7.6
+
+## Added
+
+* `net` feature, replaces `tcp`, `udp` and `uds` features
+  (https://github.com/tokio-rs/mio/commit/a301ba520a8479b459c4acdcefa4a7c5eea818c7).
+* `os-ext` feature, replaces `os-util` and `pipe` features
+  (https://github.com/tokio-rs/mio/commit/f5017fae8a3d3bb4b4cada25b01a2d76a406badc).
+* Added keepalive support to `TcpSocket`
+  (https://github.com/tokio-rs/mio/commit/290c43a96662d54ab7c4b8814e5a9f9a9e523fda).
+* `TcpSocket::set_{send, recv}_buffer_size`
+  (https://github.com/tokio-rs/mio/commit/40c4af79bf5b32b8fbdbf6f2e5c16290e1d3d406).
+* `TcpSocket::get_linger`
+  (https://github.com/tokio-rs/mio/commit/13e82ced655bbb6e2729226e485a7de9f2c2ccd9).
+* Implement `IntoRawFd` for `TcpSocket`
+  (https://github.com/tokio-rs/mio/commit/50548ed45d0b2c98f1f2e003e210d14195284ef4).
+
+## Deprecated
+
+* The `tcp`, `udp` and `uds` features, replaced by a new `net` feature.
+  (https://github.com/tokio-rs/mio/commit/a301ba520a8479b459c4acdcefa4a7c5eea818c7).
+* The `extra-docs` feature, now enabled by default.
+  (https://github.com/tokio-rs/mio/commit/25731e8688a2d91c5c700674a2c2d3841240ece1).
+* The `os-util` and `pipe` features, replaced by a new `os-ext` feature.
+  (https://github.com/tokio-rs/mio/commit/f5017fae8a3d3bb4b4cada25b01a2d76a406badc).
+
+## Fixes
+
+* Incorrect assumption of the layout of `std::net::SocketAddr`. Previously Mio
+  would assume that `SocketAddrV{4,6}` had the same layout as
+  `libc::sockaddr_in(6)`, however this is not guaranteed by the standard
+  library.
+  (https://github.com/tokio-rs/mio/commit/152e0751f0be1c9b0cbd6778645b76bcb0eba93c).
+* Also bumped the miow dependency to version 0.3.6 to solve the same problem as
+  above.
+
+# 0.7.5
+
+## Added
+
+* `TcpSocket::get_localaddr()` retrieves local address
+  (https://github.com/tokio-rs/mio/commit/b41a022b2242eef1969c70c8ba93e04c528dba47).
+* `TcpSocket::set_reuseport()` & `TcpSocket::get_reuseport()` configures and reads `SO_REUSEPORT`
+  (https://github.com/tokio-rs/mio/commit/183bbe409ab69cbf9db41d0263b41ec86202d9a0).
+* `unix:pipe()` a wrapper around pipe(2) sys call
+  (https://github.com/tokio-rs/mio/commit/2b7c0967a7362303946deb3d4ca2ae507af6c72d).
+* Add a check that a single Waker is active per Poll instance (only in debug mode)
+  (https://github.com/tokio-rs/mio/commit/f4874f28b32efcf4841691884c65a89734d96a56).
+* Added `Interest:remove()`
+  (https://github.com/tokio-rs/mio/commit/b8639c3d9ac07bb7e2e27685680c8a6510fa1357).
+
+# 0.7.4
+
+## Fixes
+
+* lost "socket closed" events on windows
+  (https://github.com/tokio-rs/mio/commit/50c299aca56c4a26e5ed20c283007239fbe6a7a7).
+
+## Added
+
+* `TcpSocket::set_linger()` configures SO_LINGER
+  (https://github.com/tokio-rs/mio/commit/3b4096565c1a879f651b8f8282ecdcbdbd5c92d3).
+
+# 0.7.3
+
+## Added
+
+* `TcpSocket` for configuring a TCP socket before connecting or listening
+  (https://github.com/tokio-rs/mio/commit/5b09e60d0f64419b989bda88c86a3147334a03b3).
+
+# 0.7.2
+
+## Added
+
+* Windows named pipe support.
+  (https://github.com/tokio-rs/mio/commit/52e8c2220e87696d20f13561402bcaabba4136ed).
+
+# 0.7.1
+
+## Reduced support for 32-bit Apple targets
+
+In January 2020 Rust reduced its support for 32-bit Apple targets
+(https://blog.rust-lang.org/2020/01/03/reducing-support-for-32-bit-apple-targets.html).
+Starting with v0.7.1 Mio will do the same as we're no longer checking 32 bit
+iOS/macOS on our CI.
+
+## Added
+
+* Support for illumos
+  (https://github.com/tokio-rs/mio/commit/976f2354d0e8fbbb64fba3bf017d7131f9c369a0).
+* Report `epoll(2)`'s `EPOLLERR` event as `Event::is_write_closed` if it's the
+  only event
+  (https://github.com/tokio-rs/mio/commit/0c77b5712d675eeb9bd43928b5dd7d22b2c7ac0c).
+* Optimised event::Iter::{size_hint, count}
+  (https://github.com/tokio-rs/mio/commit/40df934a11b05233a7796c4de19a4ee06bc4e03e).
+
+## Fixed
+
+* Work around Linux kernel < 2.6.37 bug on 32-bits making timeouts longer then
+  ~30 minutes effectively infinite
+  (https://github.com/tokio-rs/mio/commit/d555991f5ee81f6c1eec0fe481557d3d5b8d5ff4).
+* Set `SO_NOSIGPIPE` on all sockets (not just UDP) on for Apple targets
+  (https://github.com/tokio-rs/mio/commit/b8bbdcb0d3236f4c4acb257996d42a88dc9987d9).
+* Properly handle `POLL_ABORT` on Windows
+  (https://github.com/tokio-rs/mio/commit/a98da62b3ed1eeed1770aaca12f46d647e4fa749).
+* Improved error handling around failing `SIO_BASE_HANDLE` calls on Windows
+  (https://github.com/tokio-rs/mio/commit/b15fc18458a79ef8a51f73effa92548650f4e5dc).
+
+## Changed
+
+* On NetBSD we now use `accept4(2)`
+  (https://github.com/tokio-rs/mio/commit/4e306addc7144f2e02a7e8397c220b179a006a19).
+* The package uploaded to crates.io should be slightly smaller
+  (https://github.com/tokio-rs/mio/commit/eef8d3b9500bc0db957cd1ac68ee128ebc68351f).
+
+## Removed
+
+* Dependency on `lazy_static` on Windows
+  (https://github.com/tokio-rs/mio/commit/57e4c2a8ac153bc7bb87829e22cf0a21e3927e8a).
+
+# 0.7.0
+
+Version 0.7 of Mio contains various major changes compared to version 0.6.
+Overall a large number of API changes have been made to reduce the complexity of
+the implementation and remove overhead where possible.
+
+Please refer to the [blog post about
+0.7-alpha.1](https://tokio.rs/blog/2019-12-mio-v0.7-alpha.1/) for additional
+information.
+
+## Added
+
+* `Interest` structure that replaces `Ready` in registering event sources.
+* `Registry` structure that separates the registering and polling functionality.
+* `Waker` structure that allows another thread to wake a thread polling `Poll`.
+* Unix Domain Socket (UDS) types: `UnixDatagram`, `UnixListener` and
+  `UnixStream`.
+
+## Removed
+
+* All code deprecated in 0.6 was removed in 0.7.
+* Support for Fuchsia was removed as the code was unmaintained.
+* Support for Bitrig was removed, rustc dropped support for it also.
+* `UnixReady` was merged into `Ready`.
+* Custom user-space readiness queue was removed, this includes the public
+  `Registration` and `SetReadiness` types.
+* `PollOpt` was removed and all registrations use edge-triggers. See the upgrade
+  guide on how to process event using edge-triggers.
+* The network types (types in the `net` module) now support only the same API as
+  found in the standard library, various methods on the types were removed.
+* `TcpStream` now supports vectored I/O.
+* `Poll::poll_interruptible` was removed. Instead `Poll::poll` will now return
+  an error if one occurs.
+* `From<usize>` is removed from `Token`, the internal field is still public, so
+  `Token(my_token)` can still be used.
+
+## Changed
+
+* Various documentation improvements were made around correct usage of `Poll`
+  and registered event sources. It is recommended to reread the documentation of
+  at least `event::Source` and `Poll`.
+* Mio now uses Rust 2018 and rustfmt for all code.
+* `Event` was changed to be a wrapper around the OS event. This means it can be
+  significantly larger on some OSes.
+* `Ready` was removed and replaced with various `is_*` methods on `Event`. For
+  example instead checking for readable readiness using
+  `Event::ready().is_readable()`, you would call `Event::is_readable()`.
+* `Ready::is_hup` was removed in favour of `Event::is_read_closed` and
+  `Event::is_write_closed`.
+* The Iterator implementation of `Events` was changed to return `&Event`.
+* `Evented` was renamed to `event::Source` and now takes mutable reference to
+  the source.
+* Minimum supported Rust version was increased to 1.39.
+* By default Mio now uses a shim implementation. To enable the full
+  implementation, that uses the OS, enable the `os-oll` feature. To enable the
+  network types use `tcp`, `udp` and/or `uds`. For more documentation on the
+  features see the `feature` module in the API documentation (requires the
+  `extra-docs` feature).
+* The entire Windows implementation was rewritten.
+* Various optimisation were made to reduce the number of system calls in
+  creating and using sockets, e.g. making use of `accept4(2)`.
+* The `fmt::Debug` implementation of `Events` is now actually useful as it
+  prints all `Event`s.
+
 # 0.6.23 (Dec 01, 2020)
 
 ### Changed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/examples/tcp_server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/examples/tcp_server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/examples/tcp_server.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/examples/tcp_server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,181 @@
+// You can run this example from the root of the mio repo:
+// cargo run --example tcp_server --features="os-poll tcp"
+use mio::event::Event;
+use mio::net::{TcpListener, TcpStream};
+use mio::{Events, Interest, Poll, Registry, Token};
+use std::collections::HashMap;
+use std::io::{self, Read, Write};
+use std::str::from_utf8;
+
+// Setup some tokens to allow us to identify which event is for which socket.
+const SERVER: Token = Token(0);
+
+// Some data we'll send over the connection.
+const DATA: &[u8] = b"Hello world!\n";
+
+fn main() -> io::Result<()> {
+    env_logger::init();
+
+    // Create a poll instance.
+    let mut poll = Poll::new()?;
+    // Create storage for events.
+    let mut events = Events::with_capacity(128);
+
+    // Setup the TCP server socket.
+    let addr = "127.0.0.1:9000".parse().unwrap();
+    let mut server = TcpListener::bind(addr)?;
+
+    // Register the server with poll we can receive events for it.
+    poll.registry()
+        .register(&mut server, SERVER, Interest::READABLE)?;
+
+    // Map of `Token` -> `TcpStream`.
+    let mut connections = HashMap::new();
+    // Unique token for each incoming connection.
+    let mut unique_token = Token(SERVER.0 + 1);
+
+    println!("You can connect to the server using `nc`:");
+    println!(" $ nc 127.0.0.1 9000");
+    println!("You'll see our welcome message and anything you type we'll be printed here.");
+
+    loop {
+        poll.poll(&mut events, None)?;
+
+        for event in events.iter() {
+            match event.token() {
+                SERVER => loop {
+                    // Received an event for the TCP server socket, which
+                    // indicates we can accept an connection.
+                    let (mut connection, address) = match server.accept() {
+                        Ok((connection, address)) => (connection, address),
+                        Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+                            // If we get a `WouldBlock` error we know our
+                            // listener has no more incoming connections queued,
+                            // so we can return to polling and wait for some
+                            // more.
+                            break;
+                        }
+                        Err(e) => {
+                            // If it was any other kind of error, something went
+                            // wrong and we terminate with an error.
+                            return Err(e);
+                        }
+                    };
+
+                    println!("Accepted connection from: {}", address);
+
+                    let token = next(&mut unique_token);
+                    poll.registry().register(
+                        &mut connection,
+                        token,
+                        Interest::READABLE.add(Interest::WRITABLE),
+                    )?;
+
+                    connections.insert(token, connection);
+                },
+                token => {
+                    // Maybe received an event for a TCP connection.
+                    let done = if let Some(connection) = connections.get_mut(&token) {
+                        handle_connection_event(poll.registry(), connection, event)?
+                    } else {
+                        // Sporadic events happen, we can safely ignore them.
+                        false
+                    };
+                    if done {
+                        connections.remove(&token);
+                    }
+                }
+            }
+        }
+    }
+}
+
+fn next(current: &mut Token) -> Token {
+    let next = current.0;
+    current.0 += 1;
+    Token(next)
+}
+
+/// Returns `true` if the connection is done.
+fn handle_connection_event(
+    registry: &Registry,
+    connection: &mut TcpStream,
+    event: &Event,
+) -> io::Result<bool> {
+    if event.is_writable() {
+        // We can (maybe) write to the connection.
+        match connection.write(DATA) {
+            // We want to write the entire `DATA` buffer in a single go. If we
+            // write less we'll return a short write error (same as
+            // `io::Write::write_all` does).
+            Ok(n) if n < DATA.len() => return Err(io::ErrorKind::WriteZero.into()),
+            Ok(_) => {
+                // After we've written something we'll reregister the connection
+                // to only respond to readable events.
+                registry.reregister(connection, event.token(), Interest::READABLE)?
+            }
+            // Would block "errors" are the OS's way of saying that the
+            // connection is not actually ready to perform this I/O operation.
+            Err(ref err) if would_block(err) => {}
+            // Got interrupted (how rude!), we'll try again.
+            Err(ref err) if interrupted(err) => {
+                return handle_connection_event(registry, connection, event)
+            }
+            // Other errors we'll consider fatal.
+            Err(err) => return Err(err),
+        }
+    }
+
+    if event.is_readable() {
+        let mut connection_closed = false;
+        let mut received_data = vec![0; 4096];
+        let mut bytes_read = 0;
+        // We can (maybe) read from the connection.
+        loop {
+            match connection.read(&mut received_data[bytes_read..]) {
+                Ok(0) => {
+                    // Reading 0 bytes means the other side has closed the
+                    // connection or is done writing, then so are we.
+                    connection_closed = true;
+                    break;
+                }
+                Ok(n) => {
+                    bytes_read += n;
+                    if bytes_read == received_data.len() {
+                        received_data.resize(received_data.len() + 1024, 0);
+                    }
+                }
+                // Would block "errors" are the OS's way of saying that the
+                // connection is not actually ready to perform this I/O operation.
+                Err(ref err) if would_block(err) => break,
+                Err(ref err) if interrupted(err) => continue,
+                // Other errors we'll consider fatal.
+                Err(err) => return Err(err),
+            }
+        }
+
+        if bytes_read != 0 {
+            let received_data = &received_data[..bytes_read];
+            if let Ok(str_buf) = from_utf8(received_data) {
+                println!("Received data: {}", str_buf.trim_end());
+            } else {
+                println!("Received (none UTF-8) data: {:?}", received_data);
+            }
+        }
+
+        if connection_closed {
+            println!("Connection closed");
+            return Ok(true);
+        }
+    }
+
+    Ok(false)
+}
+
+fn would_block(err: &io::Error) -> bool {
+    err.kind() == io::ErrorKind::WouldBlock
+}
+
+fn interrupted(err: &io::Error) -> bool {
+    err.kind() == io::ErrorKind::Interrupted
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/examples/udp_server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/examples/udp_server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/examples/udp_server.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/examples/udp_server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,77 @@
+// You can run this example from the root of the mio repo:
+// cargo run --example udp_server --features="os-poll udp"
+use log::warn;
+use mio::net::UdpSocket;
+use mio::{Events, Interest, Poll, Token};
+use std::io;
+
+// A token to allow us to identify which event is for the `UdpSocket`.
+const UDP_SOCKET: Token = Token(0);
+
+fn main() -> io::Result<()> {
+    env_logger::init();
+
+    // Create a poll instance.
+    let mut poll = Poll::new()?;
+    // Create storage for events. Since we will only register a single socket, a
+    // capacity of 1 will do.
+    let mut events = Events::with_capacity(1);
+
+    // Setup the UDP socket.
+    let addr = "127.0.0.1:9000".parse().unwrap();
+    let mut socket = UdpSocket::bind(addr)?;
+
+    // Register our socket with the token defined above and an interest in being
+    // `READABLE`.
+    poll.registry()
+        .register(&mut socket, UDP_SOCKET, Interest::READABLE)?;
+
+    println!("You can connect to the server using `nc`:");
+    println!(" $ nc -u 127.0.0.1 9000");
+    println!("Anything you type will be echoed back to you.");
+
+    // Initialize a buffer for the UDP packet. We use the maximum size of a UDP
+    // packet, which is the maximum value of 16 a bit integer.
+    let mut buf = [0; 1 << 16];
+
+    // Our event loop.
+    loop {
+        // Poll to check if we have events waiting for us.
+        poll.poll(&mut events, None)?;
+
+        // Process each event.
+        for event in events.iter() {
+            // Validate the token we registered our socket with,
+            // in this example it will only ever be one but we
+            // make sure it's valid none the less.
+            match event.token() {
+                UDP_SOCKET => loop {
+                    // In this loop we receive all packets queued for the socket.
+                    match socket.recv_from(&mut buf) {
+                        Ok((packet_size, source_address)) => {
+                            // Echo the data.
+                            socket.send_to(&buf[..packet_size], source_address)?;
+                        }
+                        Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+                            // If we get a `WouldBlock` error we know our socket
+                            // has no more packets queued, so we can return to
+                            // polling and wait for some more.
+                            break;
+                        }
+                        Err(e) => {
+                            // If it was any other kind of error, something went
+                            // wrong and we terminate with an error.
+                            return Err(e);
+                        }
+                    }
+                },
+                _ => {
+                    // This should never happen as we only registered our
+                    // `UdpSocket` using the `UDP_SOCKET` token, but if it ever
+                    // does we'll log it.
+                    warn!("Got event for unexpected token: {:?}", event);
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 # Mio – Metal IO
 
-Mio is a lightweight I/O library for Rust with a focus on adding as little
+Mio is a fast, low-level I/O library for Rust focusing on non-blocking APIs and
+event notification for building high performance I/O apps with as little
 overhead as possible over the OS abstractions.
 
 [![Crates.io][crates-badge]][crates-url]
@@ -14,12 +15,13 @@
 [mit-url]: LICENSE
 [azure-badge]: https://dev.azure.com/tokio-rs/Tokio/_apis/build/status/tokio-rs.mio?branchName=master
 [azure-url]: https://dev.azure.com/tokio-rs/Tokio/_build/latest?definitionId=2&branchName=master
-[cirrus-badge]: https://api.cirrus-ci.com/github/carllerche/mio.svg
-[cirrus-url]: https://cirrus-ci.com/github/carllerche/mio
+[cirrus-badge]: https://api.cirrus-ci.com/github/tokio-rs/mio.svg
+[cirrus-url]: https://cirrus-ci.com/github/tokio-rs/mio
 
 **API documentation**
 
 * [master](https://tokio-rs.github.io/mio/doc/mio/)
+* [v0.7](https://docs.rs/mio/^0.7)
 * [v0.6](https://docs.rs/mio/^0.6)
 
 This is a low level library, if you are looking for something easier to get
@@ -31,21 +33,88 @@
 
 ```toml
 [dependencies]
-mio = "0.6"
+mio = "0.7"
 ```
 
-Then, add this to your crate root:
+Next we can start using Mio. The following is quick introduction using
+`TcpListener` and `TcpStream`. Note that `features = ["os-poll", "net"]` must be
+specified for this example.
 
 ```rust
-extern crate mio;
+use std::error::Error;
+
+use mio::net::{TcpListener, TcpStream};
+use mio::{Events, Interest, Poll, Token};
+
+// Some tokens to allow us to identify which event is for which socket.
+const SERVER: Token = Token(0);
+const CLIENT: Token = Token(1);
+
+fn main() -> Result<(), Box<dyn Error>> {
+    // Create a poll instance.
+    let mut poll = Poll::new()?;
+    // Create storage for events.
+    let mut events = Events::with_capacity(128);
+
+    // Setup the server socket.
+    let addr = "127.0.0.1:13265".parse()?;
+    let mut server = TcpListener::bind(addr)?;
+    // Start listening for incoming connections.
+    poll.registry()
+        .register(&mut server, SERVER, Interest::READABLE)?;
+
+    // Setup the client socket.
+    let mut client = TcpStream::connect(addr)?;
+    // Register the socket.
+    poll.registry()
+        .register(&mut client, CLIENT, Interest::READABLE | Interest::WRITABLE)?;
+
+    // Start an event loop.
+    loop {
+        // Poll Mio for events, blocking until we get an event.
+        poll.poll(&mut events, None)?;
+
+        // Process each event.
+        for event in events.iter() {
+            // We can use the token we previously provided to `register` to
+            // determine for which socket the event is.
+            match event.token() {
+                SERVER => {
+                    // If this is an event for the server, it means a connection
+                    // is ready to be accepted.
+                    //
+                    // Accept the connection and drop it immediately. This will
+                    // close the socket and notify the client of the EOF.
+                    let connection = server.accept();
+                    drop(connection);
+                }
+                CLIENT => {
+                    if event.is_writable() {
+                        // We can (likely) write to the socket without blocking.
+                    }
+
+                    if event.is_readable() {
+                        // We can (likely) read from the socket without blocking.
+                    }
+
+                    // Since the server just shuts down the connection, let's
+                    // just exit from our event loop.
+                    return Ok(());
+                }
+                // We don't expect any events with tokens other than those we provided.
+                _ => unreachable!(),
+            }
+        }
+    }
+}
 ```
 
 ## Features
 
-* Non-blocking TCP, UDP.
-* I/O event notification queue backed by epoll, kqueue, and IOCP.
+* Non-blocking TCP, UDP
+* I/O event queue backed by epoll, kqueue, and IOCP
 * Zero allocations at runtime
-* Platform specific extensions.
+* Platform specific extensions
 
 ## Non-goals
 
@@ -60,22 +129,35 @@
 
 Currently supported platforms:
 
-* Linux
-* OS X
-* Windows
+* Android
+* DragonFly BSD
 * FreeBSD
+* Linux
 * NetBSD
+* OpenBSD
 * Solaris
-* Android
+* Windows
 * iOS
+* macOS
 
 There are potentially others. If you find that Mio works on another
 platform, submit a PR to update the list!
 
+Mio can handle interfacing with each of the event systems of the aforementioned
+platforms. The details of their implementation are further discussed in the
+`Poll` type of the API documentation (see above).
+
+The Windows implementation for polling sockets is using the [wepoll] strategy.
+This uses the Windows AFD system to access socket readiness events.
+
+[wepoll]: https://github.com/piscisaureus/wepoll
+
 ## Community
 
-A group of Mio users hang out in the #mio channel on the Mozilla IRC
-server (irc.mozilla.org). This can be a good place to go for questions.
+A group of Mio users hang out on [Discord], this can be a good place to go for
+questions.
+
+[Discord]: https://discord.gg/tokio
 
 ## Contributing
 
@@ -84,7 +166,6 @@
 directly in the PR. If the fix is more complex, start with an issue.
 
 If you want to propose an API change, create an issue to start a
-discussion with the community. Also, feel free to talk with us in the
-IRC channel.
+discussion with the community. Also, feel free to talk with us in Discord.
 
-Finally, be kind. We support the [Rust Code of Conduct](https://www.rust-lang.org/conduct.html).
+Finally, be kind. We support the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/channel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/channel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/channel.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/channel.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,390 +0,0 @@
-//! Thread safe communication channel implementing `Evented`
-
-#![allow(unused_imports, deprecated, missing_debug_implementations)]
-
-use {io, Ready, Poll, PollOpt, Registration, SetReadiness, Token};
-use event::Evented;
-use lazycell::{LazyCell, AtomicLazyCell};
-use std::any::Any;
-use std::fmt;
-use std::error;
-use std::sync::{mpsc, Arc};
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-/// Creates a new asynchronous channel, where the `Receiver` can be registered
-/// with `Poll`.
-pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
-    let (tx_ctl, rx_ctl) = ctl_pair();
-    let (tx, rx) = mpsc::channel();
-
-    let tx = Sender {
-        tx,
-        ctl: tx_ctl,
-    };
-
-    let rx = Receiver {
-        rx,
-        ctl: rx_ctl,
-    };
-
-    (tx, rx)
-}
-
-/// Creates a new synchronous, bounded channel where the `Receiver` can be
-/// registered with `Poll`.
-pub fn sync_channel<T>(bound: usize) -> (SyncSender<T>, Receiver<T>) {
-    let (tx_ctl, rx_ctl) = ctl_pair();
-    let (tx, rx) = mpsc::sync_channel(bound);
-
-    let tx = SyncSender {
-        tx,
-        ctl: tx_ctl,
-    };
-
-    let rx = Receiver {
-        rx,
-        ctl: rx_ctl,
-    };
-
-    (tx, rx)
-}
-
-pub fn ctl_pair() -> (SenderCtl, ReceiverCtl) {
-    let inner = Arc::new(Inner {
-        pending: AtomicUsize::new(0),
-        senders: AtomicUsize::new(1),
-        set_readiness: AtomicLazyCell::new(),
-    });
-
-    let tx = SenderCtl {
-        inner: inner.clone(),
-    };
-
-    let rx = ReceiverCtl {
-        registration: LazyCell::new(),
-        inner,
-    };
-
-    (tx, rx)
-}
-
-/// Tracks messages sent on a channel in order to update readiness.
-pub struct SenderCtl {
-    inner: Arc<Inner>,
-}
-
-/// Tracks messages received on a channel in order to track readiness.
-pub struct ReceiverCtl {
-    registration: LazyCell<Registration>,
-    inner: Arc<Inner>,
-}
-
-pub struct Sender<T> {
-    tx: mpsc::Sender<T>,
-    ctl: SenderCtl,
-}
-
-pub struct SyncSender<T> {
-    tx: mpsc::SyncSender<T>,
-    ctl: SenderCtl,
-}
-
-pub struct Receiver<T> {
-    rx: mpsc::Receiver<T>,
-    ctl: ReceiverCtl,
-}
-
-pub enum SendError<T> {
-    Io(io::Error),
-    Disconnected(T),
-}
-
-pub enum TrySendError<T> {
-    Io(io::Error),
-    Full(T),
-    Disconnected(T),
-}
-
-struct Inner {
-    // The number of outstanding messages for the receiver to read
-    pending: AtomicUsize,
-    // The number of sender handles
-    senders: AtomicUsize,
-    // The set readiness handle
-    set_readiness: AtomicLazyCell<SetReadiness>,
-}
-
-impl<T> Sender<T> {
-    pub fn send(&self, t: T) -> Result<(), SendError<T>> {
-        self.tx.send(t)
-            .map_err(SendError::from)
-            .and_then(|_| {
-                self.ctl.inc()?;
-                Ok(())
-            })
-    }
-}
-
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Sender<T> {
-        Sender {
-            tx: self.tx.clone(),
-            ctl: self.ctl.clone(),
-        }
-    }
-}
-
-impl<T> SyncSender<T> {
-    pub fn send(&self, t: T) -> Result<(), SendError<T>> {
-        self.tx.send(t)
-            .map_err(From::from)
-            .and_then(|_| {
-                self.ctl.inc()?;
-                Ok(())
-            })
-    }
-
-    pub fn try_send(&self, t: T) -> Result<(), TrySendError<T>> {
-        self.tx.try_send(t)
-            .map_err(From::from)
-            .and_then(|_| {
-                self.ctl.inc()?;
-                Ok(())
-            })
-    }
-}
-
-impl<T> Clone for SyncSender<T> {
-    fn clone(&self) -> SyncSender<T> {
-        SyncSender {
-            tx: self.tx.clone(),
-            ctl: self.ctl.clone(),
-        }
-    }
-}
-
-impl<T> Receiver<T> {
-    pub fn try_recv(&self) -> Result<T, mpsc::TryRecvError> {
-        self.rx.try_recv().and_then(|res| {
-            let _ = self.ctl.dec();
-            Ok(res)
-        })
-    }
-}
-
-impl<T> Evented for Receiver<T> {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.ctl.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.ctl.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.ctl.deregister(poll)
-    }
-}
-
-/*
- *
- * ===== SenderCtl / ReceiverCtl =====
- *
- */
-
-impl SenderCtl {
-    /// Call to track that a message has been sent
-    pub fn inc(&self) -> io::Result<()> {
-        let cnt = self.inner.pending.fetch_add(1, Ordering::Acquire);
-
-        if 0 == cnt {
-            // Toggle readiness to readable
-            if let Some(set_readiness) = self.inner.set_readiness.borrow() {
-                set_readiness.set_readiness(Ready::readable())?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl Clone for SenderCtl {
-    fn clone(&self) -> SenderCtl {
-        self.inner.senders.fetch_add(1, Ordering::Relaxed);
-        SenderCtl { inner: self.inner.clone() }
-    }
-}
-
-impl Drop for SenderCtl {
-    fn drop(&mut self) {
-        if self.inner.senders.fetch_sub(1, Ordering::Release) == 1 {
-            let _ = self.inc();
-        }
-    }
-}
-
-impl ReceiverCtl {
-    pub fn dec(&self) -> io::Result<()> {
-        let first = self.inner.pending.load(Ordering::Acquire);
-
-        if first == 1 {
-            // Unset readiness
-            if let Some(set_readiness) = self.inner.set_readiness.borrow() {
-                set_readiness.set_readiness(Ready::empty())?;
-            }
-        }
-
-        // Decrement
-        let second = self.inner.pending.fetch_sub(1, Ordering::AcqRel);
-
-        if first == 1 && second > 1 {
-            // There are still pending messages. Since readiness was
-            // previously unset, it must be reset here
-            if let Some(set_readiness) = self.inner.set_readiness.borrow() {
-                set_readiness.set_readiness(Ready::readable())?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl Evented for ReceiverCtl {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        if self.registration.borrow().is_some() {
-            return Err(io::Error::new(io::ErrorKind::Other, "receiver already registered"));
-        }
-
-        let (registration, set_readiness) = Registration::new(poll, token, interest, opts);
-
-
-        if self.inner.pending.load(Ordering::Relaxed) > 0 {
-            // TODO: Don't drop readiness
-            let _ = set_readiness.set_readiness(Ready::readable());
-        }
-
-        self.registration.fill(registration).expect("unexpected state encountered");
-        self.inner.set_readiness.fill(set_readiness).expect("unexpected state encountered");
-
-        Ok(())
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        match self.registration.borrow() {
-            Some(registration) => registration.update(poll, token, interest, opts),
-            None => Err(io::Error::new(io::ErrorKind::Other, "receiver not registered")),
-        }
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        match self.registration.borrow() {
-            Some(registration) => registration.deregister(poll),
-            None => Err(io::Error::new(io::ErrorKind::Other, "receiver not registered")),
-        }
-    }
-}
-
-/*
- *
- * ===== Error conversions =====
- *
- */
-
-impl<T> From<mpsc::SendError<T>> for SendError<T> {
-    fn from(src: mpsc::SendError<T>) -> SendError<T> {
-        SendError::Disconnected(src.0)
-    }
-}
-
-impl<T> From<io::Error> for SendError<T> {
-    fn from(src: io::Error) -> SendError<T> {
-        SendError::Io(src)
-    }
-}
-
-impl<T> From<mpsc::TrySendError<T>> for TrySendError<T> {
-    fn from(src: mpsc::TrySendError<T>) -> TrySendError<T> {
-        match src {
-            mpsc::TrySendError::Full(v) => TrySendError::Full(v),
-            mpsc::TrySendError::Disconnected(v) => TrySendError::Disconnected(v),
-        }
-    }
-}
-
-impl<T> From<mpsc::SendError<T>> for TrySendError<T> {
-    fn from(src: mpsc::SendError<T>) -> TrySendError<T> {
-        TrySendError::Disconnected(src.0)
-    }
-}
-
-impl<T> From<io::Error> for TrySendError<T> {
-    fn from(src: io::Error) -> TrySendError<T> {
-        TrySendError::Io(src)
-    }
-}
-
-/*
- *
- * ===== Implement Error, Debug and Display for Errors =====
- *
- */
-
-impl<T: Any> error::Error for SendError<T> {
-    fn description(&self) -> &str {
-        match *self {
-            SendError::Io(ref io_err) => io_err.description(),
-            SendError::Disconnected(..) => "Disconnected",
-        }
-    }
-}
-
-impl<T: Any> error::Error for TrySendError<T> {
-    fn description(&self) -> &str {
-        match *self {
-            TrySendError::Io(ref io_err) => io_err.description(),
-            TrySendError::Full(..) => "Full",
-            TrySendError::Disconnected(..) => "Disconnected",
-        }
-    }
-}
-
-impl<T> fmt::Debug for SendError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_send_error(self, f)
-    }
-}
-
-impl<T> fmt::Display for SendError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_send_error(self, f)
-    }
-}
-
-impl<T> fmt::Debug for TrySendError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_try_send_error(self, f)
-    }
-}
-
-impl<T> fmt::Display for TrySendError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_try_send_error(self, f)
-    }
-}
-
-#[inline]
-fn format_send_error<T>(e: &SendError<T>, f: &mut fmt::Formatter) -> fmt::Result {
-    match *e {
-        SendError::Io(ref io_err) => write!(f, "{}", io_err),
-        SendError::Disconnected(..) => write!(f, "Disconnected"),
-    }
-}
-
-#[inline]
-fn format_try_send_error<T>(e: &TrySendError<T>, f: &mut fmt::Formatter) -> fmt::Result {
-    match *e {
-        TrySendError::Io(ref io_err) => write!(f, "{}", io_err),
-        TrySendError::Full(..) => write!(f, "Full"),
-        TrySendError::Disconnected(..) => write!(f, "Disconnected"),
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/event_loop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/event_loop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/event_loop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/event_loop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-use {channel, Poll, Events, Token};
-use event::Evented;
-use deprecated::{Handler, NotifyError};
-use event_imp::{Event, Ready, PollOpt};
-use timer::{self, Timer, Timeout};
-use std::{io, fmt, usize};
-use std::default::Default;
-use std::time::Duration;
-
-#[derive(Debug, Default, Clone)]
-pub struct EventLoopBuilder {
-    config: Config,
-}
-
-/// `EventLoop` configuration details
-#[derive(Clone, Debug)]
-struct Config {
-    // == Notifications ==
-    notify_capacity: usize,
-    messages_per_tick: usize,
-
-    // == Timer ==
-    timer_tick: Duration,
-    timer_wheel_size: usize,
-    timer_capacity: usize,
-}
-
-impl Default for Config {
-    fn default() -> Config {
-        // Default EventLoop configuration values
-        Config {
-            notify_capacity: 4_096,
-            messages_per_tick: 256,
-            timer_tick: Duration::from_millis(100),
-            timer_wheel_size: 1_024,
-            timer_capacity: 65_536,
-        }
-    }
-}
-
-impl EventLoopBuilder {
-    /// Construct a new `EventLoopBuilder` with the default configuration
-    /// values.
-    pub fn new() -> EventLoopBuilder {
-        EventLoopBuilder::default()
-    }
-
-    /// Sets the maximum number of messages that can be buffered on the event
-    /// loop's notification channel before a send will fail.
-    ///
-    /// The default value for this is 4096.
-    pub fn notify_capacity(&mut self, capacity: usize) -> &mut Self {
-        self.config.notify_capacity = capacity;
-        self
-    }
-
-    /// Sets the maximum number of messages that can be processed on any tick of
-    /// the event loop.
-    ///
-    /// The default value for this is 256.
-    pub fn messages_per_tick(&mut self, messages: usize) -> &mut Self {
-        self.config.messages_per_tick = messages;
-        self
-    }
-
-    pub fn timer_tick(&mut self, val: Duration) -> &mut Self {
-        self.config.timer_tick = val;
-        self
-    }
-
-    pub fn timer_wheel_size(&mut self, size: usize) -> &mut Self {
-        self.config.timer_wheel_size = size;
-        self
-    }
-
-    pub fn timer_capacity(&mut self, cap: usize) -> &mut Self {
-        self.config.timer_capacity = cap;
-        self
-    }
-
-    /// Constructs a new `EventLoop` using the configured values. The
-    /// `EventLoop` will not be running.
-    pub fn build<H: Handler>(self) -> io::Result<EventLoop<H>> {
-        EventLoop::configured(self.config)
-    }
-}
-
-/// Single threaded IO event loop.
-pub struct EventLoop<H: Handler> {
-    run: bool,
-    poll: Poll,
-    events: Events,
-    timer: Timer<H::Timeout>,
-    notify_tx: channel::SyncSender<H::Message>,
-    notify_rx: channel::Receiver<H::Message>,
-    config: Config,
-}
-
-// Token used to represent notifications
-const NOTIFY: Token = Token(usize::MAX - 1);
-const TIMER: Token = Token(usize::MAX - 2);
-
-impl<H: Handler> EventLoop<H> {
-
-    /// Constructs a new `EventLoop` using the default configuration values.
-    /// The `EventLoop` will not be running.
-    pub fn new() -> io::Result<EventLoop<H>> {
-        EventLoop::configured(Config::default())
-    }
-
-    fn configured(config: Config) -> io::Result<EventLoop<H>> {
-        // Create the IO poller
-        let poll = Poll::new()?;
-
-        let timer = timer::Builder::default()
-            .tick_duration(config.timer_tick)
-            .num_slots(config.timer_wheel_size)
-            .capacity(config.timer_capacity)
-            .build();
-
-        // Create cross thread notification queue
-        let (tx, rx) = channel::sync_channel(config.notify_capacity);
-
-        // Register the notification wakeup FD with the IO poller
-        poll.register(&rx, NOTIFY, Ready::readable(), PollOpt::edge() | PollOpt::oneshot())?;
-        poll.register(&timer, TIMER, Ready::readable(), PollOpt::edge())?;
-
-        Ok(EventLoop {
-            run: true,
-            poll,
-            timer,
-            notify_tx: tx,
-            notify_rx: rx,
-            config,
-            events: Events::with_capacity(1024),
-        })
-    }
-
-    /// Returns a sender that allows sending messages to the event loop in a
-    /// thread-safe way, waking up the event loop if needed.
-    ///
-    /// # Implementation Details
-    ///
-    /// Each [EventLoop](#) contains a lock-free queue with a pre-allocated
-    /// buffer size. The size can be changed by modifying
-    /// [EventLoopConfig.notify_capacity](struct.EventLoopConfig.html#method.notify_capacity).
-    /// When a message is sent to the EventLoop, it is first pushed on to the
-    /// queue. Then, if the EventLoop is currently running, an atomic flag is
-    /// set to indicate that the next loop iteration should be started without
-    /// waiting.
-    ///
-    /// If the loop is blocked waiting for IO events, then it is woken up. The
-    /// strategy for waking up the event loop is platform dependent. For
-    /// example, on a modern Linux OS, eventfd is used. On older OSes, a pipe
-    /// is used.
-    ///
-    /// The strategy of setting an atomic flag if the event loop is not already
-    /// sleeping allows avoiding an expensive wakeup operation if at all possible.
-    pub fn channel(&self) -> Sender<H::Message> {
-        Sender::new(self.notify_tx.clone())
-    }
-
-    /// Schedules a timeout after the requested time interval. When the
-    /// duration has been reached,
-    /// [Handler::timeout](trait.Handler.html#method.timeout) will be invoked
-    /// passing in the supplied token.
-    ///
-    /// Returns a handle to the timeout that can be used to cancel the timeout
-    /// using [#clear_timeout](#method.clear_timeout).
-    pub fn timeout(&mut self, token: H::Timeout, delay: Duration) -> timer::Result<Timeout> {
-        self.timer.set_timeout(delay, token)
-    }
-
-    /// If the supplied timeout has not been triggered, cancel it such that it
-    /// will not be triggered in the future.
-    pub fn clear_timeout(&mut self, timeout: &Timeout) -> bool {
-        self.timer.cancel_timeout(&timeout).is_some()
-    }
-
-    /// Tells the event loop to exit after it is done handling all events in the
-    /// current iteration.
-    pub fn shutdown(&mut self) {
-        self.run = false;
-    }
-
-    /// Indicates whether the event loop is currently running. If it's not it has either
-    /// stopped or is scheduled to stop on the next tick.
-    pub fn is_running(&self) -> bool {
-        self.run
-    }
-
-    /// Registers an IO handle with the event loop.
-    pub fn register<E: ?Sized>(&mut self, io: &E, token: Token, interest: Ready, opt: PollOpt) -> io::Result<()>
-        where E: Evented
-    {
-        self.poll.register(io, token, interest, opt)
-    }
-
-    /// Re-Registers an IO handle with the event loop.
-    pub fn reregister<E: ?Sized>(&mut self, io: &E, token: Token, interest: Ready, opt: PollOpt) -> io::Result<()>
-        where E: Evented
-    {
-        self.poll.reregister(io, token, interest, opt)
-    }
-
-    /// Keep spinning the event loop indefinitely, and notify the handler whenever
-    /// any of the registered handles are ready.
-    pub fn run(&mut self, handler: &mut H) -> io::Result<()> {
-        self.run = true;
-
-        while self.run {
-            // Execute ticks as long as the event loop is running
-            self.run_once(handler, None)?;
-        }
-
-        Ok(())
-    }
-
-    /// Deregisters an IO handle with the event loop.
-    ///
-    /// Both kqueue and epoll will automatically clear any pending events when closing a
-    /// file descriptor (socket). In that case, this method does not need to be called
-    /// prior to dropping a connection from the slab.
-    ///
-    /// Warning: kqueue effectively builds in deregister when using edge-triggered mode with
-    /// oneshot. Calling `deregister()` on the socket will cause a TcpStream error.
-    pub fn deregister<E: ?Sized>(&mut self, io: &E) -> io::Result<()> where E: Evented {
-        self.poll.deregister(io)
-    }
-
-    /// Spin the event loop once, with a given timeout (forever if `None`),
-    /// and notify the handler if any of the registered handles become ready
-    /// during that time.
-    pub fn run_once(&mut self, handler: &mut H, timeout: Option<Duration>) -> io::Result<()> {
-        trace!("event loop tick");
-
-        // Check the registered IO handles for any new events. Each poll
-        // is for one second, so a shutdown request can last as long as
-        // one second before it takes effect.
-        let events = match self.io_poll(timeout) {
-            Ok(e) => e,
-            Err(err) => {
-                if err.kind() == io::ErrorKind::Interrupted {
-                    handler.interrupted(self);
-                    0
-                } else {
-                    return Err(err);
-                }
-            }
-        };
-
-        self.io_process(handler, events);
-        handler.tick(self);
-        Ok(())
-    }
-
-    #[inline]
-    fn io_poll(&mut self, timeout: Option<Duration>) -> io::Result<usize> {
-        self.poll.poll(&mut self.events, timeout)
-    }
-
-    // Process IO events that have been previously polled
-    fn io_process(&mut self, handler: &mut H, cnt: usize) {
-        let mut i = 0;
-
-        trace!("io_process(..); cnt={}; len={}", cnt, self.events.len());
-
-        // Iterate over the notifications. Each event provides the token
-        // it was registered with (which usually represents, at least, the
-        // handle that the event is about) as well as information about
-        // what kind of event occurred (readable, writable, signal, etc.)
-        while i < cnt {
-            let evt = self.events.get(i).unwrap();
-
-            trace!("event={:?}; idx={:?}", evt, i);
-
-            match evt.token() {
-                NOTIFY => self.notify(handler),
-                TIMER => self.timer_process(handler),
-                _ => self.io_event(handler, evt)
-            }
-
-            i += 1;
-        }
-    }
-
-    fn io_event(&mut self, handler: &mut H, evt: Event) {
-        handler.ready(self, evt.token(), evt.readiness());
-    }
-
-    fn notify(&mut self, handler: &mut H) {
-        for _ in 0..self.config.messages_per_tick {
-            match self.notify_rx.try_recv() {
-                Ok(msg) => handler.notify(self, msg),
-                _ => break,
-            }
-        }
-
-        // Re-register
-        let _ = self.poll.reregister(&self.notify_rx, NOTIFY, Ready::readable(), PollOpt::edge() | PollOpt::oneshot());
-    }
-
-    fn timer_process(&mut self, handler: &mut H) {
-        while let Some(t) = self.timer.poll() {
-            handler.timeout(self, t);
-        }
-    }
-}
-
-impl<H: Handler> fmt::Debug for EventLoop<H> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("EventLoop")
-            .field("run", &self.run)
-            .field("poll", &self.poll)
-            .field("config", &self.config)
-            .finish()
-    }
-}
-
-/// Sends messages to the EventLoop from other threads.
-pub struct Sender<M> {
-    tx: channel::SyncSender<M>
-}
-
-impl<M> fmt::Debug for Sender<M> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "Sender<?> {{ ... }}")
-    }
-}
-
-impl<M> Clone for Sender <M> {
-    fn clone(&self) -> Sender<M> {
-        Sender { tx: self.tx.clone() }
-    }
-}
-
-impl<M> Sender<M> {
-    fn new(tx: channel::SyncSender<M>) -> Sender<M> {
-        Sender { tx }
-    }
-
-    pub fn send(&self, msg: M) -> Result<(), NotifyError<M>> {
-        self.tx.try_send(msg)?;
-        Ok(())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/handler.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/handler.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/handler.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/handler.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-use {Ready, Token};
-use deprecated::{EventLoop};
-
-#[allow(unused_variables)]
-pub trait Handler: Sized {
-    type Timeout;
-    type Message;
-
-    /// Invoked when the socket represented by `token` is ready to be operated
-    /// on. `events` indicates the specific operations that are
-    /// ready to be performed.
-    ///
-    /// For example, when a TCP socket is ready to be read from, `events` will
-    /// have `readable` set. When the socket is ready to be written to,
-    /// `events` will have `writable` set.
-    ///
-    /// This function will only be invoked a single time per socket per event
-    /// loop tick.
-    fn ready(&mut self, event_loop: &mut EventLoop<Self>, token: Token, events: Ready) {
-    }
-
-    /// Invoked when a message has been received via the event loop's channel.
-    fn notify(&mut self, event_loop: &mut EventLoop<Self>, msg: Self::Message) {
-    }
-
-    /// Invoked when a timeout has completed.
-    fn timeout(&mut self, event_loop: &mut EventLoop<Self>, timeout: Self::Timeout) {
-    }
-
-    /// Invoked when `EventLoop` has been interrupted by a signal interrupt.
-    fn interrupted(&mut self, event_loop: &mut EventLoop<Self>) {
-    }
-
-    /// Invoked at the end of an event loop tick.
-    fn tick(&mut self, event_loop: &mut EventLoop<Self>) {
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/io.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-use ::io::MapNonBlock;
-use std::io::{self, Read, Write};
-
-pub trait TryRead {
-    fn try_read(&mut self, buf: &mut [u8]) -> io::Result<Option<usize>>;
-}
-
-pub trait TryWrite {
-    fn try_write(&mut self, buf: &[u8]) -> io::Result<Option<usize>>;
-}
-
-impl<T: Read> TryRead for T {
-    fn try_read(&mut self, dst: &mut [u8]) -> io::Result<Option<usize>> {
-        self.read(dst).map_non_block()
-    }
-}
-
-impl<T: Write> TryWrite for T {
-    fn try_write(&mut self, src: &[u8]) -> io::Result<Option<usize>> {
-        self.write(src).map_non_block()
-    }
-}
-
-pub trait TryAccept {
-    type Output;
-
-    fn accept(&self) -> io::Result<Option<Self::Output>>;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#![allow(deprecated)]
-
-mod event_loop;
-mod io;
-mod handler;
-mod notify;
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-pub mod unix;
-
-pub use self::event_loop::{
-    EventLoop,
-    EventLoopBuilder,
-    Sender,
-};
-pub use self::io::{
-    TryAccept,
-    TryRead,
-    TryWrite,
-};
-pub use self::handler::{
-    Handler,
-};
-pub use self::notify::{
-    NotifyError,
-};
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-pub use self::unix::{
-    pipe,
-    PipeReader,
-    PipeWriter,
-    UnixListener,
-    UnixSocket,
-    UnixStream,
-    Shutdown,
-};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/notify.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/notify.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/notify.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/notify.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-use {channel};
-use std::{fmt, io, error, any};
-
-pub enum NotifyError<T> {
-    Io(io::Error),
-    Full(T),
-    Closed(Option<T>),
-}
-
-impl<M> fmt::Debug for NotifyError<M> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            NotifyError::Io(ref e) => {
-                write!(fmt, "NotifyError::Io({:?})", e)
-            }
-            NotifyError::Full(..) => {
-                write!(fmt, "NotifyError::Full(..)")
-            }
-            NotifyError::Closed(..) => {
-                write!(fmt, "NotifyError::Closed(..)")
-            }
-        }
-    }
-}
-
-impl<M> fmt::Display for NotifyError<M> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            NotifyError::Io(ref e) => {
-                write!(fmt, "IO error: {}", e)
-            }
-            NotifyError::Full(..) => write!(fmt, "Full"),
-            NotifyError::Closed(..) => write!(fmt, "Closed")
-        }
-    }
-}
-
-impl<M: any::Any> error::Error for NotifyError<M> {
-    fn description(&self) -> &str {
-        match *self {
-            NotifyError::Io(ref err) => err.description(),
-            NotifyError::Closed(..) => "The receiving end has hung up",
-            NotifyError::Full(..) => "Queue is full"
-        }
-    }
-
-    fn cause(&self) -> Option<&error::Error> {
-        match *self {
-            NotifyError::Io(ref err) => Some(err),
-            _ => None
-        }
-    }
-}
-
-impl<M> From<channel::TrySendError<M>> for NotifyError<M> {
-    fn from(src: channel::TrySendError<M>) -> NotifyError<M> {
-        match src {
-            channel::TrySendError::Io(e) => NotifyError::Io(e),
-            channel::TrySendError::Full(v) => NotifyError::Full(v),
-            channel::TrySendError::Disconnected(v) => NotifyError::Closed(Some(v)),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/unix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/unix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/deprecated/unix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/deprecated/unix.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,420 +0,0 @@
-use {io, sys, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use deprecated::TryAccept;
-use io::MapNonBlock;
-use std::io::{Read, Write};
-use std::path::Path;
-pub use std::net::Shutdown;
-use std::process;
-
-pub use sys::Io;
-
-#[derive(Debug)]
-pub struct UnixSocket {
-    sys: sys::UnixSocket,
-}
-
-impl UnixSocket {
-    /// Returns a new, unbound, non-blocking Unix domain socket
-    pub fn stream() -> io::Result<UnixSocket> {
-        sys::UnixSocket::stream()
-            .map(From::from)
-    }
-
-    /// Connect the socket to the specified address
-    pub fn connect<P: AsRef<Path> + ?Sized>(self, addr: &P) -> io::Result<(UnixStream, bool)> {
-        let complete = match self.sys.connect(addr) {
-            Ok(()) => true,
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => false,
-            Err(e) => return Err(e),
-        };
-        Ok((From::from(self.sys), complete))
-    }
-
-    /// Bind the socket to the specified address
-    pub fn bind<P: AsRef<Path> + ?Sized>(&self, addr: &P) -> io::Result<()> {
-        self.sys.bind(addr)
-    }
-
-    /// Listen for incoming requests
-    pub fn listen(self, backlog: usize) -> io::Result<UnixListener> {
-        self.sys.listen(backlog)?;
-        Ok(From::from(self.sys))
-    }
-
-    pub fn try_clone(&self) -> io::Result<UnixSocket> {
-        self.sys.try_clone()
-            .map(From::from)
-    }
-}
-
-impl Evented for UnixSocket {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.sys.deregister(poll)
-    }
-}
-
-impl From<sys::UnixSocket> for UnixSocket {
-    fn from(sys: sys::UnixSocket) -> UnixSocket {
-        UnixSocket { sys }
-    }
-}
-
-/*
- *
- * ===== UnixStream =====
- *
- */
-
-#[derive(Debug)]
-pub struct UnixStream {
-    sys: sys::UnixSocket,
-}
-
-impl UnixStream {
-    pub fn connect<P: AsRef<Path> + ?Sized>(path: &P) -> io::Result<UnixStream> {
-        UnixSocket::stream()
-            .and_then(|sock| sock.connect(path))
-            .map(|(sock, _)| sock)
-    }
-
-    pub fn try_clone(&self) -> io::Result<UnixStream> {
-        self.sys.try_clone()
-            .map(From::from)
-    }
-
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<usize> {
-        self.sys.shutdown(how).map(|_| 0)
-    }
-
-    pub fn read_recv_fd(&mut self, buf: &mut [u8]) -> io::Result<(usize, Option<RawFd>)> {
-        self.sys.read_recv_fd(buf)
-    }
-
-    pub fn try_read_recv_fd(&mut self, buf: &mut [u8]) -> io::Result<Option<(usize, Option<RawFd>)>> {
-        self.read_recv_fd(buf).map_non_block()
-    }
-
-    pub fn write_send_fd(&mut self, buf: &[u8], fd: RawFd) -> io::Result<usize> {
-        self.sys.write_send_fd(buf, fd)
-    }
-
-    pub fn try_write_send_fd(&mut self, buf: &[u8], fd: RawFd) -> io::Result<Option<usize>> {
-        self.write_send_fd(buf, fd).map_non_block()
-    }
-}
-
-impl Read for UnixStream {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.sys.read(buf)
-    }
-}
-
-impl Write for UnixStream {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.sys.write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.sys.flush()
-    }
-}
-
-impl Evented for UnixStream {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.sys.deregister(poll)
-    }
-}
-
-impl From<sys::UnixSocket> for UnixStream {
-    fn from(sys: sys::UnixSocket) -> UnixStream {
-        UnixStream { sys }
-    }
-}
-
-/*
- *
- * ===== UnixListener =====
- *
- */
-
-#[derive(Debug)]
-pub struct UnixListener {
-    sys: sys::UnixSocket,
-}
-
-impl UnixListener {
-    pub fn bind<P: AsRef<Path> + ?Sized>(addr: &P) -> io::Result<UnixListener> {
-        UnixSocket::stream().and_then(|sock| {
-            sock.bind(addr)?;
-            sock.listen(256)
-        })
-    }
-
-    pub fn accept(&self) -> io::Result<UnixStream> {
-        self.sys.accept().map(From::from)
-    }
-
-    pub fn try_clone(&self) -> io::Result<UnixListener> {
-        self.sys.try_clone().map(From::from)
-    }
-}
-
-impl Evented for UnixListener {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.sys.deregister(poll)
-    }
-}
-
-impl TryAccept for UnixListener {
-    type Output = UnixStream;
-
-    fn accept(&self) -> io::Result<Option<UnixStream>> {
-        UnixListener::accept(self).map_non_block()
-    }
-}
-
-impl From<sys::UnixSocket> for UnixListener {
-    fn from(sys: sys::UnixSocket) -> UnixListener {
-        UnixListener { sys }
-    }
-}
-
-/*
- *
- * ===== Pipe =====
- *
- */
-
-pub fn pipe() -> io::Result<(PipeReader, PipeWriter)> {
-    let (rd, wr) = sys::pipe()?;
-    Ok((From::from(rd), From::from(wr)))
-}
-
-#[derive(Debug)]
-pub struct PipeReader {
-    io: Io,
-}
-
-impl PipeReader {
-    pub fn from_stdout(stdout: process::ChildStdout) -> io::Result<Self> {
-        if let Err(e) = sys::set_nonblock(stdout.as_raw_fd()) {
-            return Err(e);
-        }
-        Ok(PipeReader::from(unsafe { Io::from_raw_fd(stdout.into_raw_fd()) }))
-    }
-    pub fn from_stderr(stderr: process::ChildStderr) -> io::Result<Self> {
-        if let Err(e) = sys::set_nonblock(stderr.as_raw_fd()) {
-            return Err(e);
-        }
-        Ok(PipeReader::from(unsafe { Io::from_raw_fd(stderr.into_raw_fd()) }))
-    }
-}
-
-impl Read for PipeReader {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.io.read(buf)
-    }
-}
-
-impl<'a> Read for &'a PipeReader {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        (&self.io).read(buf)
-    }
-}
-
-impl Evented for PipeReader {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.io.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.io.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.io.deregister(poll)
-    }
-}
-
-impl From<Io> for PipeReader {
-    fn from(io: Io) -> PipeReader {
-        PipeReader { io }
-    }
-}
-
-#[derive(Debug)]
-pub struct PipeWriter {
-    io: Io,
-}
-
-impl PipeWriter {
-    pub fn from_stdin(stdin: process::ChildStdin) -> io::Result<Self> {
-        if let Err(e) = sys::set_nonblock(stdin.as_raw_fd()) {
-            return Err(e);
-        }
-        Ok(PipeWriter::from(unsafe { Io::from_raw_fd(stdin.into_raw_fd()) }))
-    }
-}
-
-impl Write for PipeWriter {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.io.write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.io.flush()
-    }
-}
-
-impl<'a> Write for &'a PipeWriter {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        (&self.io).write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&self.io).flush()
-    }
-}
-
-impl Evented for PipeWriter {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.io.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.io.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.io.deregister(poll)
-    }
-}
-
-impl From<Io> for PipeWriter {
-    fn from(io: Io) -> PipeWriter {
-        PipeWriter { io }
-    }
-}
-
-/*
- *
- * ===== Conversions =====
- *
- */
-
-use std::os::unix::io::{RawFd, IntoRawFd, AsRawFd, FromRawFd};
-
-impl IntoRawFd for UnixSocket {
-    fn into_raw_fd(self) -> RawFd {
-        self.sys.into_raw_fd()
-    }
-}
-
-impl AsRawFd for UnixSocket {
-    fn as_raw_fd(&self) -> RawFd {
-        self.sys.as_raw_fd()
-    }
-}
-
-impl FromRawFd for UnixSocket {
-    unsafe fn from_raw_fd(fd: RawFd) -> UnixSocket {
-        UnixSocket { sys: FromRawFd::from_raw_fd(fd) }
-    }
-}
-
-impl IntoRawFd for UnixStream {
-    fn into_raw_fd(self) -> RawFd {
-        self.sys.into_raw_fd()
-    }
-}
-
-impl AsRawFd for UnixStream {
-    fn as_raw_fd(&self) -> RawFd {
-        self.sys.as_raw_fd()
-    }
-}
-
-impl FromRawFd for UnixStream {
-    unsafe fn from_raw_fd(fd: RawFd) -> UnixStream {
-        UnixStream { sys: FromRawFd::from_raw_fd(fd) }
-    }
-}
-
-impl IntoRawFd for UnixListener {
-    fn into_raw_fd(self) -> RawFd {
-        self.sys.into_raw_fd()
-    }
-}
-
-impl AsRawFd for UnixListener {
-    fn as_raw_fd(&self) -> RawFd {
-        self.sys.as_raw_fd()
-    }
-}
-
-impl FromRawFd for UnixListener {
-    unsafe fn from_raw_fd(fd: RawFd) -> UnixListener {
-        UnixListener { sys: FromRawFd::from_raw_fd(fd) }
-    }
-}
-
-impl IntoRawFd for PipeReader {
-    fn into_raw_fd(self) -> RawFd {
-        self.io.into_raw_fd()
-    }
-}
-
-impl AsRawFd for PipeReader {
-    fn as_raw_fd(&self) -> RawFd {
-        self.io.as_raw_fd()
-    }
-}
-
-impl FromRawFd for PipeReader {
-    unsafe fn from_raw_fd(fd: RawFd) -> PipeReader {
-        PipeReader { io: FromRawFd::from_raw_fd(fd) }
-    }
-}
-
-impl IntoRawFd for PipeWriter {
-    fn into_raw_fd(self) -> RawFd {
-        self.io.into_raw_fd()
-    }
-}
-
-impl AsRawFd for PipeWriter {
-    fn as_raw_fd(&self) -> RawFd {
-        self.io.as_raw_fd()
-    }
-}
-
-impl FromRawFd for PipeWriter {
-    unsafe fn from_raw_fd(fd: RawFd) -> PipeWriter {
-        PipeWriter { io: FromRawFd::from_raw_fd(fd) }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event/event.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event/event.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event/event.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event/event.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,221 @@
+use crate::{sys, Token};
+
+use std::fmt;
+
+/// A readiness event.
+///
+/// `Event` is a readiness state paired with a [`Token`]. It is returned by
+/// [`Poll::poll`].
+///
+/// For more documentation on polling and events, see [`Poll`].
+///
+/// [`Poll::poll`]: ../struct.Poll.html#method.poll
+/// [`Poll`]: ../struct.Poll.html
+/// [`Token`]: ../struct.Token.html
+#[derive(Clone)]
+#[repr(transparent)]
+pub struct Event {
+    inner: sys::Event,
+}
+
+impl Event {
+    /// Returns the event's token.
+    pub fn token(&self) -> Token {
+        sys::event::token(&self.inner)
+    }
+
+    /// Returns true if the event contains readable readiness.
+    pub fn is_readable(&self) -> bool {
+        sys::event::is_readable(&self.inner)
+    }
+
+    /// Returns true if the event contains writable readiness.
+    pub fn is_writable(&self) -> bool {
+        sys::event::is_writable(&self.inner)
+    }
+
+    /// Returns true if the event contains error readiness.
+    ///
+    /// Error events occur when the socket enters an error state. In this case,
+    /// the socket will also receive a readable or writable event. Reading or
+    /// writing to the socket will result in an error.
+    ///
+    /// # Notes
+    ///
+    /// Method is available on all platforms, but not all platforms trigger the
+    /// error event.
+    ///
+    /// The table below shows what flags are checked on what OS.
+    ///
+    /// | [OS selector] | Flag(s) checked |
+    /// |---------------|-----------------|
+    /// | [epoll]       | `EPOLLERR`      |
+    /// | [kqueue]      | `EV_ERROR` and `EV_EOF` with `fflags` set to `0`. |
+    ///
+    /// [OS selector]: ../struct.Poll.html#implementation-notes
+    /// [epoll]: http://man7.org/linux/man-pages/man7/epoll.7.html
+    /// [kqueue]: https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
+    pub fn is_error(&self) -> bool {
+        sys::event::is_error(&self.inner)
+    }
+
+    /// Returns true if the event contains read closed readiness.
+    ///
+    /// # Notes
+    ///
+    /// Read closed readiness can be expected after any of the following have
+    /// occurred:
+    /// * The local stream has shutdown the read half of its socket
+    /// * The local stream has shutdown both the read half and the write half
+    ///   of its socket
+    /// * The peer stream has shutdown the write half its socket; this sends a
+    ///   `FIN` packet that has been received by the local stream
+    ///
+    /// Method is a best effort implementation. While some platforms may not
+    /// return readiness when read half is closed, it is guaranteed that
+    /// false-positives will not occur.
+    ///
+    /// The table below shows what flags are checked on what OS.
+    ///
+    /// | [OS selector] | Flag(s) checked |
+    /// |---------------|-----------------|
+    /// | [epoll]       | `EPOLLHUP`, or  |
+    /// |               | `EPOLLIN` and `EPOLLRDHUP` |
+    /// | [kqueue]      | `EV_EOF`        |
+    ///
+    /// [OS selector]: ../struct.Poll.html#implementation-notes
+    /// [epoll]: http://man7.org/linux/man-pages/man7/epoll.7.html
+    /// [kqueue]: https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
+    pub fn is_read_closed(&self) -> bool {
+        sys::event::is_read_closed(&self.inner)
+    }
+
+    /// Returns true if the event contains write closed readiness.
+    ///
+    /// # Notes
+    ///
+    /// On [epoll] this is essentially a check for `EPOLLHUP` flag as the
+    /// local stream shutting down its write half does not trigger this event.
+    ///
+    /// On [kqueue] the local stream shutting down the write half of its
+    /// socket will trigger this event.
+    ///
+    /// Method is a best effort implementation. While some platforms may not
+    /// return readiness when write half is closed, it is guaranteed that
+    /// false-positives will not occur.
+    ///
+    /// The table below shows what flags are checked on what OS.
+    ///
+    /// | [OS selector] | Flag(s) checked |
+    /// |---------------|-----------------|
+    /// | [epoll]       | `EPOLLHUP`, or  |
+    /// |               | only `EPOLLERR`, or |
+    /// |               | `EPOLLOUT` and `EPOLLERR` |
+    /// | [kqueue]      | `EV_EOF`        |
+    ///
+    /// [OS selector]: ../struct.Poll.html#implementation-notes
+    /// [epoll]: http://man7.org/linux/man-pages/man7/epoll.7.html
+    /// [kqueue]: https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
+    pub fn is_write_closed(&self) -> bool {
+        sys::event::is_write_closed(&self.inner)
+    }
+
+    /// Returns true if the event contains priority readiness.
+    ///
+    /// # Notes
+    ///
+    /// Method is available on all platforms, but not all platforms trigger the
+    /// priority event.
+    ///
+    /// The table below shows what flags are checked on what OS.
+    ///
+    /// | [OS selector] | Flag(s) checked |
+    /// |---------------|-----------------|
+    /// | [epoll]       | `EPOLLPRI`      |
+    /// | [kqueue]      | *Not supported* |
+    ///
+    /// [OS selector]: ../struct.Poll.html#implementation-notes
+    /// [epoll]: http://man7.org/linux/man-pages/man7/epoll.7.html
+    /// [kqueue]: https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
+    #[inline]
+    pub fn is_priority(&self) -> bool {
+        sys::event::is_priority(&self.inner)
+    }
+
+    /// Returns true if the event contains AIO readiness.
+    ///
+    /// # Notes
+    ///
+    /// Method is available on all platforms, but not all platforms support AIO.
+    ///
+    /// The table below shows what flags are checked on what OS.
+    ///
+    /// | [OS selector] | Flag(s) checked |
+    /// |---------------|-----------------|
+    /// | [epoll]       | *Not supported* |
+    /// | [kqueue]<sup>1</sup> | `EVFILT_AIO` |
+    ///
+    /// 1: Only supported on DragonFly BSD, FreeBSD, iOS and macOS.
+    ///
+    /// [OS selector]: ../struct.Poll.html#implementation-notes
+    /// [epoll]: http://man7.org/linux/man-pages/man7/epoll.7.html
+    /// [kqueue]: https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
+    pub fn is_aio(&self) -> bool {
+        sys::event::is_aio(&self.inner)
+    }
+
+    /// Returns true if the event contains LIO readiness.
+    ///
+    /// # Notes
+    ///
+    /// Method is available on all platforms, but only FreeBSD supports LIO. On
+    /// FreeBSD this method checks the `EVFILT_LIO` flag.
+    pub fn is_lio(&self) -> bool {
+        sys::event::is_lio(&self.inner)
+    }
+
+    /// Create a reference to an `Event` from a platform specific event.
+    pub(crate) fn from_sys_event_ref(sys_event: &sys::Event) -> &Event {
+        unsafe {
+            // This is safe because the memory layout of `Event` is
+            // the same as `sys::Event` due to the `repr(transparent)` attribute.
+            &*(sys_event as *const sys::Event as *const Event)
+        }
+    }
+}
+
+/// When the [alternate] flag is enabled this will print platform specific
+/// details, for example the fields of the `kevent` structure on platforms that
+/// use `kqueue(2)`. Note however that the output of this implementation is
+/// **not** consider a part of the stable API.
+///
+/// [alternate]: fmt::Formatter::alternate
+impl fmt::Debug for Event {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let alternate = f.alternate();
+        let mut d = f.debug_struct("Event");
+        d.field("token", &self.token())
+            .field("readable", &self.is_readable())
+            .field("writable", &self.is_writable())
+            .field("error", &self.is_error())
+            .field("read_closed", &self.is_read_closed())
+            .field("write_closed", &self.is_write_closed())
+            .field("priority", &self.is_priority())
+            .field("aio", &self.is_aio())
+            .field("lio", &self.is_lio());
+
+        if alternate {
+            struct EventDetails<'a>(&'a sys::Event);
+
+            impl<'a> fmt::Debug for EventDetails<'a> {
+                fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                    sys::event::debug_details(f, self.0)
+                }
+            }
+
+            d.field("details", &EventDetails(&self.inner)).finish()
+        } else {
+            d.finish()
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event/events.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event/events.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event/events.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event/events.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,230 @@
+use crate::event::Event;
+use crate::sys;
+
+use std::fmt;
+
+/// A collection of readiness events.
+///
+/// `Events` is passed as an argument to [`Poll::poll`] and will be used to
+/// receive any new readiness events received since the last poll. Usually, a
+/// single `Events` instance is created at the same time as a [`Poll`] and
+/// reused on each call to [`Poll::poll`].
+///
+/// See [`Poll`] for more documentation on polling.
+///
+/// [`Poll::poll`]: ../struct.Poll.html#method.poll
+/// [`Poll`]: ../struct.Poll.html
+///
+/// # Examples
+///
+#[cfg_attr(feature = "os-poll", doc = "```")]
+#[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+/// # use std::error::Error;
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// use mio::{Events, Poll};
+/// use std::time::Duration;
+///
+/// let mut events = Events::with_capacity(1024);
+/// let mut poll = Poll::new()?;
+/// #
+/// # assert!(events.is_empty());
+///
+/// // Register `event::Source`s with `poll`.
+///
+/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
+///
+/// for event in events.iter() {
+///     println!("Got an event for {:?}", event.token());
+/// }
+/// #     Ok(())
+/// # }
+/// ```
+pub struct Events {
+    inner: sys::Events,
+}
+
+/// [`Events`] iterator.
+///
+/// This struct is created by the [`iter`] method on [`Events`].
+///
+/// [`Events`]: struct.Events.html
+/// [`iter`]: struct.Events.html#method.iter
+///
+/// # Examples
+///
+#[cfg_attr(feature = "os-poll", doc = "```")]
+#[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+/// # use std::error::Error;
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// use mio::{Events, Poll};
+/// use std::time::Duration;
+///
+/// let mut events = Events::with_capacity(1024);
+/// let mut poll = Poll::new()?;
+///
+/// // Register handles with `poll`.
+///
+/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
+///
+/// for event in events.iter() {
+///     println!("Got an event for {:?}", event.token());
+/// }
+/// #     Ok(())
+/// # }
+/// ```
+#[derive(Debug, Clone)]
+pub struct Iter<'a> {
+    inner: &'a Events,
+    pos: usize,
+}
+
+impl Events {
+    /// Return a new `Events` capable of holding up to `capacity` events.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use mio::Events;
+    ///
+    /// let events = Events::with_capacity(1024);
+    /// assert_eq!(1024, events.capacity());
+    /// ```
+    pub fn with_capacity(capacity: usize) -> Events {
+        Events {
+            inner: sys::Events::with_capacity(capacity),
+        }
+    }
+
+    /// Returns the number of `Event` values that `self` can hold.
+    ///
+    /// ```
+    /// use mio::Events;
+    ///
+    /// let events = Events::with_capacity(1024);
+    /// assert_eq!(1024, events.capacity());
+    /// ```
+    pub fn capacity(&self) -> usize {
+        self.inner.capacity()
+    }
+
+    /// Returns `true` if `self` contains no `Event` values.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use mio::Events;
+    ///
+    /// let events = Events::with_capacity(1024);
+    /// assert!(events.is_empty());
+    /// ```
+    pub fn is_empty(&self) -> bool {
+        self.inner.is_empty()
+    }
+
+    /// Returns an iterator over the `Event` values.
+    ///
+    /// # Examples
+    ///
+    #[cfg_attr(feature = "os-poll", doc = "```")]
+    #[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+    /// # use std::error::Error;
+    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// use mio::{Events, Poll};
+    /// use std::time::Duration;
+    ///
+    /// let mut events = Events::with_capacity(1024);
+    /// let mut poll = Poll::new()?;
+    ///
+    /// // Register handles with `poll`.
+    ///
+    /// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
+    ///
+    /// for event in events.iter() {
+    ///     println!("Got an event for {:?}", event.token());
+    /// }
+    /// #     Ok(())
+    /// # }
+    /// ```
+    pub fn iter(&self) -> Iter<'_> {
+        Iter {
+            inner: self,
+            pos: 0,
+        }
+    }
+
+    /// Clearing all `Event` values from container explicitly.
+    ///
+    /// # Notes
+    ///
+    /// Events are cleared before every `poll`, so it is not required to call
+    /// this manually.
+    ///
+    /// # Examples
+    ///
+    #[cfg_attr(feature = "os-poll", doc = "```")]
+    #[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+    /// # use std::error::Error;
+    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// use mio::{Events, Poll};
+    /// use std::time::Duration;
+    ///
+    /// let mut events = Events::with_capacity(1024);
+    /// let mut poll = Poll::new()?;
+    ///
+    /// // Register handles with `poll`.
+    ///
+    /// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
+    ///
+    /// // Clear all events.
+    /// events.clear();
+    /// assert!(events.is_empty());
+    /// #     Ok(())
+    /// # }
+    /// ```
+    pub fn clear(&mut self) {
+        self.inner.clear();
+    }
+
+    /// Returns the inner `sys::Events`.
+    pub(crate) fn sys(&mut self) -> &mut sys::Events {
+        &mut self.inner
+    }
+}
+
+impl<'a> IntoIterator for &'a Events {
+    type Item = &'a Event;
+    type IntoIter = Iter<'a>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<'a> Iterator for Iter<'a> {
+    type Item = &'a Event;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let ret = self
+            .inner
+            .inner
+            .get(self.pos)
+            .map(Event::from_sys_event_ref);
+        self.pos += 1;
+        ret
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let size = self.inner.inner.len();
+        (size, Some(size))
+    }
+
+    fn count(self) -> usize {
+        self.inner.inner.len()
+    }
+}
+
+impl fmt::Debug for Events {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_list().entries(self).finish()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+//! Readiness event types and utilities.
+
+#[allow(clippy::module_inception)]
+mod event;
+mod events;
+mod source;
+
+pub use self::event::Event;
+pub use self::events::{Events, Iter};
+pub use self::source::Source;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event/source.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event/source.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event/source.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event/source.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,139 @@
+use crate::{Interest, Registry, Token};
+
+use std::io;
+
+/// An event source that may be registered with [`Registry`].
+///
+/// Types that implement `event::Source` can be registered with
+/// `Registry`. Users of Mio **should not** use the `event::Source` trait
+/// functions directly. Instead, the equivalent functions on `Registry` should
+/// be used.
+///
+/// See [`Registry`] for more details.
+///
+/// [`Registry`]: ../struct.Registry.html
+///
+/// # Implementing `event::Source`
+///
+/// Event sources are always backed by system handles, such as sockets or other
+/// system handles. These `event::Source`s will be monitored by the system
+/// selector. An implementation of `Source` will almost always delegates to a
+/// lower level handle. Examples of this are [`TcpStream`]s, or the *unix only*
+/// [`SourceFd`].
+///
+/// [`TcpStream`]: ../net/struct.TcpStream.html
+/// [`SourceFd`]: ../unix/struct.SourceFd.html
+///
+/// # Dropping `event::Source`s
+///
+/// All `event::Source`s, unless otherwise specified, need to be [deregistered]
+/// before being dropped for them to not leak resources. This goes against the
+/// normal drop behaviour of types in Rust which cleanup after themselves, e.g.
+/// a `File` will close itself. However since deregistering needs access to
+/// [`Registry`] this cannot be done while being dropped.
+///
+/// [deregistered]: ../struct.Registry.html#method.deregister
+///
+/// # Examples
+///
+/// Implementing `Source` on a struct containing a socket:
+///
+#[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+#[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
+/// use mio::{Interest, Registry, Token};
+/// use mio::event::Source;
+/// use mio::net::TcpStream;
+///
+/// use std::io;
+///
+/// # #[allow(dead_code)]
+/// pub struct MySource {
+///     socket: TcpStream,
+/// }
+///
+/// impl Source for MySource {
+///     fn register(&mut self, registry: &Registry, token: Token, interests: Interest)
+///         -> io::Result<()>
+///     {
+///         // Delegate the `register` call to `socket`
+///         self.socket.register(registry, token, interests)
+///     }
+///
+///     fn reregister(&mut self, registry: &Registry, token: Token, interests: Interest)
+///         -> io::Result<()>
+///     {
+///         // Delegate the `reregister` call to `socket`
+///         self.socket.reregister(registry, token, interests)
+///     }
+///
+///     fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+///         // Delegate the `deregister` call to `socket`
+///         self.socket.deregister(registry)
+///     }
+/// }
+/// ```
+pub trait Source {
+    /// Register `self` with the given `Registry` instance.
+    ///
+    /// This function should not be called directly. Use [`Registry::register`]
+    /// instead. Implementors should handle registration by delegating the call
+    /// to another `Source` type.
+    ///
+    /// [`Registry::register`]: ../struct.Registry.html#method.register
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()>;
+
+    /// Re-register `self` with the given `Registry` instance.
+    ///
+    /// This function should not be called directly. Use
+    /// [`Registry::reregister`] instead. Implementors should handle
+    /// re-registration by either delegating the call to another `Source` type.
+    ///
+    /// [`Registry::reregister`]: ../struct.Registry.html#method.reregister
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()>;
+
+    /// Deregister `self` from the given `Registry` instance.
+    ///
+    /// This function should not be called directly. Use
+    /// [`Registry::deregister`] instead. Implementors should handle
+    /// deregistration by delegating the call to another `Source` type.
+    ///
+    /// [`Registry::deregister`]: ../struct.Registry.html#method.deregister
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()>;
+}
+
+impl<T> Source for Box<T>
+where
+    T: Source + ?Sized,
+{
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        (&mut **self).register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        (&mut **self).reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        (&mut **self).deregister(registry)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event_imp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event_imp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/event_imp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/event_imp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1164 +0,0 @@
-use {Poll, Token};
-use std::{fmt, io, ops};
-
-/// A value that may be registered with `Poll`
-///
-/// Values that implement `Evented` can be registered with `Poll`. Users of Mio
-/// should not use the `Evented` trait functions directly. Instead, the
-/// equivalent functions on `Poll` should be used.
-///
-/// See [`Poll`] for more details.
-///
-/// # Implementing `Evented`
-///
-/// There are two types of `Evented` values.
-///
-/// * **System** handles, which are backed by sockets or other system handles.
-/// These `Evented` handles will be monitored by the system selector. In this
-/// case, an implementation of `Evented` delegates to a lower level handle.
-///
-/// * **User** handles, which are driven entirely in user space using
-/// [`Registration`] and [`SetReadiness`]. In this case, the implementer takes
-/// responsibility for driving the readiness state changes.
-///
-/// [`Poll`]: ../struct.Poll.html
-/// [`Registration`]: ../struct.Registration.html
-/// [`SetReadiness`]: ../struct.SetReadiness.html
-///
-/// # Examples
-///
-/// Implementing `Evented` on a struct containing a socket:
-///
-/// ```
-/// use mio::{Ready, Poll, PollOpt, Token};
-/// use mio::event::Evented;
-/// use mio::net::TcpStream;
-///
-/// use std::io;
-///
-/// pub struct MyEvented {
-///     socket: TcpStream,
-/// }
-///
-/// impl Evented for MyEvented {
-///     fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt)
-///         -> io::Result<()>
-///     {
-///         // Delegate the `register` call to `socket`
-///         self.socket.register(poll, token, interest, opts)
-///     }
-///
-///     fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt)
-///         -> io::Result<()>
-///     {
-///         // Delegate the `reregister` call to `socket`
-///         self.socket.reregister(poll, token, interest, opts)
-///     }
-///
-///     fn deregister(&self, poll: &Poll) -> io::Result<()> {
-///         // Delegate the `deregister` call to `socket`
-///         self.socket.deregister(poll)
-///     }
-/// }
-/// ```
-///
-/// Implement `Evented` using [`Registration`] and [`SetReadiness`].
-///
-/// ```
-/// use mio::{Ready, Registration, Poll, PollOpt, Token};
-/// use mio::event::Evented;
-///
-/// use std::io;
-/// use std::time::Instant;
-/// use std::thread;
-///
-/// pub struct Deadline {
-///     when: Instant,
-///     registration: Registration,
-/// }
-///
-/// impl Deadline {
-///     pub fn new(when: Instant) -> Deadline {
-///         let (registration, set_readiness) = Registration::new2();
-///
-///         thread::spawn(move || {
-///             let now = Instant::now();
-///
-///             if now < when {
-///                 thread::sleep(when - now);
-///             }
-///
-///             set_readiness.set_readiness(Ready::readable());
-///         });
-///
-///         Deadline {
-///             when: when,
-///             registration: registration,
-///         }
-///     }
-///
-///     pub fn is_elapsed(&self) -> bool {
-///         Instant::now() >= self.when
-///     }
-/// }
-///
-/// impl Evented for Deadline {
-///     fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt)
-///         -> io::Result<()>
-///     {
-///         self.registration.register(poll, token, interest, opts)
-///     }
-///
-///     fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt)
-///         -> io::Result<()>
-///     {
-///         self.registration.reregister(poll, token, interest, opts)
-///     }
-///
-///     fn deregister(&self, poll: &Poll) -> io::Result<()> {
-///         self.registration.deregister(poll)
-///     }
-/// }
-/// ```
-pub trait Evented {
-    /// Register `self` with the given `Poll` instance.
-    ///
-    /// This function should not be called directly. Use [`Poll::register`]
-    /// instead. Implementors should handle registration by either delegating
-    /// the call to another `Evented` type or creating a [`Registration`].
-    ///
-    /// [`Poll::register`]: ../struct.Poll.html#method.register
-    /// [`Registration`]: ../struct.Registration.html
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()>;
-
-    /// Re-register `self` with the given `Poll` instance.
-    ///
-    /// This function should not be called directly. Use [`Poll::reregister`]
-    /// instead. Implementors should handle re-registration by either delegating
-    /// the call to another `Evented` type or calling
-    /// [`SetReadiness::set_readiness`].
-    ///
-    /// [`Poll::reregister`]: ../struct.Poll.html#method.reregister
-    /// [`SetReadiness::set_readiness`]: ../struct.SetReadiness.html#method.set_readiness
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()>;
-
-    /// Deregister `self` from the given `Poll` instance
-    ///
-    /// This function should not be called directly. Use [`Poll::deregister`]
-    /// instead. Implementors should handle deregistration by either delegating
-    /// the call to another `Evented` type or by dropping the [`Registration`]
-    /// associated with `self`.
-    ///
-    /// [`Poll::deregister`]: ../struct.Poll.html#method.deregister
-    /// [`Registration`]: ../struct.Registration.html
-    fn deregister(&self, poll: &Poll) -> io::Result<()>;
-}
-
-impl Evented for Box<Evented> {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.as_ref().register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.as_ref().reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.as_ref().deregister(poll)
-    }
-}
-
-impl<T: Evented> Evented for Box<T> {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.as_ref().register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.as_ref().reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.as_ref().deregister(poll)
-    }
-}
-
-impl<T: Evented> Evented for ::std::sync::Arc<T> {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.as_ref().register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.as_ref().reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.as_ref().deregister(poll)
-    }
-}
-
-/// Options supplied when registering an `Evented` handle with `Poll`
-///
-/// `PollOpt` values can be combined together using the various bitwise
-/// operators.
-///
-/// For high level documentation on polling and poll options, see [`Poll`].
-///
-/// # Examples
-///
-/// ```
-/// use mio::PollOpt;
-///
-/// let opts = PollOpt::edge() | PollOpt::oneshot();
-///
-/// assert!(opts.is_edge());
-/// assert!(opts.is_oneshot());
-/// assert!(!opts.is_level());
-/// ```
-///
-/// [`Poll`]: struct.Poll.html
-#[derive(Copy, PartialEq, Eq, Clone, PartialOrd, Ord)]
-pub struct PollOpt(usize);
-
-impl PollOpt {
-    /// Return a `PollOpt` representing no set options.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::empty();
-    ///
-    /// assert!(!opt.is_level());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn empty() -> PollOpt {
-        PollOpt(0)
-    }
-
-    /// Return a `PollOpt` representing edge-triggered notifications.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::edge();
-    ///
-    /// assert!(opt.is_edge());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn edge() -> PollOpt {
-        PollOpt(0b0001)
-    }
-
-    /// Return a `PollOpt` representing level-triggered notifications.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::level();
-    ///
-    /// assert!(opt.is_level());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn level() -> PollOpt {
-        PollOpt(0b0010)
-    }
-
-    /// Return a `PollOpt` representing oneshot notifications.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::oneshot();
-    ///
-    /// assert!(opt.is_oneshot());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn oneshot() -> PollOpt {
-        PollOpt(0b0100)
-    }
-
-    #[deprecated(since = "0.6.5", note = "removed")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn urgent() -> PollOpt {
-        PollOpt(0b1000)
-    }
-
-    #[deprecated(since = "0.6.5", note = "removed")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn all() -> PollOpt {
-        PollOpt::edge() | PollOpt::level() | PollOpt::oneshot()
-    }
-
-    /// Returns true if the options include edge-triggered notifications.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::edge();
-    ///
-    /// assert!(opt.is_edge());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn is_edge(&self) -> bool {
-        self.contains(PollOpt::edge())
-    }
-
-    /// Returns true if the options include level-triggered notifications.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::level();
-    ///
-    /// assert!(opt.is_level());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn is_level(&self) -> bool {
-        self.contains(PollOpt::level())
-    }
-
-    /// Returns true if the options includes oneshot.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::oneshot();
-    ///
-    /// assert!(opt.is_oneshot());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn is_oneshot(&self) -> bool {
-        self.contains(PollOpt::oneshot())
-    }
-
-    #[deprecated(since = "0.6.5", note = "removed")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[allow(deprecated)]
-    #[inline]
-    pub fn is_urgent(&self) -> bool {
-        self.contains(PollOpt::urgent())
-    }
-
-    #[deprecated(since = "0.6.5", note = "removed")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn bits(&self) -> usize {
-        self.0
-    }
-
-    /// Returns true if `self` is a superset of `other`.
-    ///
-    /// `other` may represent more than one option, in which case the function
-    /// only returns true if `self` contains all of the options specified in
-    /// `other`.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::oneshot();
-    ///
-    /// assert!(opt.contains(PollOpt::oneshot()));
-    /// assert!(!opt.contains(PollOpt::edge()));
-    /// ```
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::oneshot() | PollOpt::edge();
-    ///
-    /// assert!(opt.contains(PollOpt::oneshot()));
-    /// assert!(opt.contains(PollOpt::edge()));
-    /// ```
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let opt = PollOpt::oneshot() | PollOpt::edge();
-    ///
-    /// assert!(!PollOpt::oneshot().contains(opt));
-    /// assert!(opt.contains(opt));
-    /// assert!((opt | PollOpt::level()).contains(opt));
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn contains(&self, other: PollOpt) -> bool {
-        (*self & other) == other
-    }
-
-    /// Adds all options represented by `other` into `self`.
-    ///
-    /// This is equivalent to `*self = *self | other`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let mut opt = PollOpt::empty();
-    /// opt.insert(PollOpt::oneshot());
-    ///
-    /// assert!(opt.is_oneshot());
-    /// ```
-    #[inline]
-    pub fn insert(&mut self, other: PollOpt) {
-        self.0 |= other.0;
-    }
-
-    /// Removes all options represented by `other` from `self`.
-    ///
-    /// This is equivalent to `*self = *self & !other`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::PollOpt;
-    ///
-    /// let mut opt = PollOpt::oneshot();
-    /// opt.remove(PollOpt::oneshot());
-    ///
-    /// assert!(!opt.is_oneshot());
-    /// ```
-    #[inline]
-    pub fn remove(&mut self, other: PollOpt) {
-        self.0 &= !other.0;
-    }
-}
-
-impl ops::BitOr for PollOpt {
-    type Output = PollOpt;
-
-    #[inline]
-    fn bitor(self, other: PollOpt) -> PollOpt {
-        PollOpt(self.0 | other.0)
-    }
-}
-
-impl ops::BitXor for PollOpt {
-    type Output = PollOpt;
-
-    #[inline]
-    fn bitxor(self, other: PollOpt) -> PollOpt {
-        PollOpt(self.0 ^ other.0)
-    }
-}
-
-impl ops::BitAnd for PollOpt {
-    type Output = PollOpt;
-
-    #[inline]
-    fn bitand(self, other: PollOpt) -> PollOpt {
-        PollOpt(self.0 & other.0)
-    }
-}
-
-impl ops::Sub for PollOpt {
-    type Output = PollOpt;
-
-    #[inline]
-    fn sub(self, other: PollOpt) -> PollOpt {
-        PollOpt(self.0 & !other.0)
-    }
-}
-
-#[deprecated(since = "0.6.10", note = "removed")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-impl ops::Not for PollOpt {
-    type Output = PollOpt;
-
-    #[inline]
-    fn not(self) -> PollOpt {
-        PollOpt(!self.0)
-    }
-}
-
-impl fmt::Debug for PollOpt {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut one = false;
-        let flags = [
-            (PollOpt::edge(), "Edge-Triggered"),
-            (PollOpt::level(), "Level-Triggered"),
-            (PollOpt::oneshot(), "OneShot")];
-
-        for &(flag, msg) in &flags {
-            if self.contains(flag) {
-                if one { write!(fmt, " | ")? }
-                write!(fmt, "{}", msg)?;
-
-                one = true
-            }
-        }
-
-        if !one {
-            fmt.write_str("(empty)")?;
-        }
-
-        Ok(())
-    }
-}
-
-#[test]
-fn test_debug_pollopt() {
-    assert_eq!("(empty)", format!("{:?}", PollOpt::empty()));
-    assert_eq!("Edge-Triggered", format!("{:?}", PollOpt::edge()));
-    assert_eq!("Level-Triggered", format!("{:?}", PollOpt::level()));
-    assert_eq!("OneShot", format!("{:?}", PollOpt::oneshot()));
-}
-
-/// A set of readiness event kinds
-///
-/// `Ready` is a set of operation descriptors indicating which kind of an
-/// operation is ready to be performed. For example, `Ready::readable()`
-/// indicates that the associated `Evented` handle is ready to perform a
-/// `read` operation.
-///
-/// This struct only represents portable event kinds. Since only readable and
-/// writable events are guaranteed to be raised on all systems, those are the
-/// only ones available via the `Ready` struct. There are also platform specific
-/// extensions to `Ready`, i.e. `UnixReady`, which provide additional readiness
-/// event kinds only available on unix platforms.
-///
-/// `Ready` values can be combined together using the various bitwise operators.
-///
-/// For high level documentation on polling and readiness, see [`Poll`].
-///
-/// # Examples
-///
-/// ```
-/// use mio::Ready;
-///
-/// let ready = Ready::readable() | Ready::writable();
-///
-/// assert!(ready.is_readable());
-/// assert!(ready.is_writable());
-/// ```
-///
-/// [`Poll`]: struct.Poll.html
-/// [`readable`]: #method.readable
-/// [`writable`]: #method.writable
-/// [readiness]: struct.Poll.html#readiness-operations
-#[derive(Copy, PartialEq, Eq, Clone, PartialOrd, Ord)]
-pub struct Ready(usize);
-
-const READABLE: usize = 0b00001;
-const WRITABLE: usize = 0b00010;
-
-// These are deprecated and are moved into platform specific implementations.
-const ERROR: usize = 0b00100;
-const HUP: usize = 0b01000;
-
-impl Ready {
-    /// Returns the empty `Ready` set.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::empty();
-    ///
-    /// assert!(!ready.is_readable());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    pub fn empty() -> Ready {
-        Ready(0)
-    }
-
-    #[deprecated(since = "0.6.5", note = "use Ready::empty instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    pub fn none() -> Ready {
-        Ready::empty()
-    }
-
-    /// Returns a `Ready` representing readable readiness.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::readable();
-    ///
-    /// assert!(ready.is_readable());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn readable() -> Ready {
-        Ready(READABLE)
-    }
-
-    /// Returns a `Ready` representing writable readiness.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::writable();
-    ///
-    /// assert!(ready.is_writable());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn writable() -> Ready {
-        Ready(WRITABLE)
-    }
-
-    #[deprecated(since = "0.6.5", note = "use UnixReady instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn error() -> Ready {
-        Ready(ERROR)
-    }
-
-    #[deprecated(since = "0.6.5", note = "use UnixReady instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn hup() -> Ready {
-        Ready(HUP)
-    }
-
-    /// Returns a `Ready` representing readiness for all operations.
-    ///
-    /// This includes platform specific operations as well (`hup`, `aio`,
-    /// `error`, `lio`, `pri`).
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::all();
-    ///
-    /// assert!(ready.is_readable());
-    /// assert!(ready.is_writable());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn all() -> Ready {
-        Ready(READABLE | WRITABLE | ::sys::READY_ALL)
-    }
-
-    /// Returns true if `Ready` is the empty set
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::empty();
-    /// assert!(ready.is_empty());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        *self == Ready::empty()
-    }
-
-    #[deprecated(since = "0.6.5", note = "use Ready::is_empty instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn is_none(&self) -> bool {
-        self.is_empty()
-    }
-
-    /// Returns true if the value includes readable readiness
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::readable();
-    ///
-    /// assert!(ready.is_readable());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn is_readable(&self) -> bool {
-        self.contains(Ready::readable())
-    }
-
-    /// Returns true if the value includes writable readiness
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::writable();
-    ///
-    /// assert!(ready.is_writable());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn is_writable(&self) -> bool {
-        self.contains(Ready::writable())
-    }
-
-    #[deprecated(since = "0.6.5", note = "use UnixReady instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn is_error(&self) -> bool {
-        self.contains(Ready(ERROR))
-    }
-
-    #[deprecated(since = "0.6.5", note = "use UnixReady instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn is_hup(&self) -> bool {
-        self.contains(Ready(HUP))
-    }
-
-    /// Adds all readiness represented by `other` into `self`.
-    ///
-    /// This is equivalent to `*self = *self | other`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let mut readiness = Ready::empty();
-    /// readiness.insert(Ready::readable());
-    ///
-    /// assert!(readiness.is_readable());
-    /// ```
-    #[inline]
-    pub fn insert<T: Into<Self>>(&mut self, other: T) {
-        let other = other.into();
-        self.0 |= other.0;
-    }
-
-    /// Removes all options represented by `other` from `self`.
-    ///
-    /// This is equivalent to `*self = *self & !other`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let mut readiness = Ready::readable();
-    /// readiness.remove(Ready::readable());
-    ///
-    /// assert!(!readiness.is_readable());
-    /// ```
-    #[inline]
-    pub fn remove<T: Into<Self>>(&mut self, other: T) {
-        let other = other.into();
-        self.0 &= !other.0;
-    }
-
-    #[deprecated(since = "0.6.5", note = "removed")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    #[inline]
-    pub fn bits(&self) -> usize {
-        self.0
-    }
-
-    /// Returns true if `self` is a superset of `other`.
-    ///
-    /// `other` may represent more than one readiness operations, in which case
-    /// the function only returns true if `self` contains all readiness
-    /// specified in `other`.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let readiness = Ready::readable();
-    ///
-    /// assert!(readiness.contains(Ready::readable()));
-    /// assert!(!readiness.contains(Ready::writable()));
-    /// ```
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let readiness = Ready::readable() | Ready::writable();
-    ///
-    /// assert!(readiness.contains(Ready::readable()));
-    /// assert!(readiness.contains(Ready::writable()));
-    /// ```
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let readiness = Ready::readable() | Ready::writable();
-    ///
-    /// assert!(!Ready::readable().contains(readiness));
-    /// assert!(readiness.contains(readiness));
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    pub fn contains<T: Into<Self>>(&self, other: T) -> bool {
-        let other = other.into();
-        (*self & other) == other
-    }
-
-    /// Create a `Ready` instance using the given `usize` representation.
-    ///
-    /// The `usize` representation must have been obtained from a call to
-    /// `Ready::as_usize`.
-    ///
-    /// The `usize` representation must be treated as opaque. There is no
-    /// guaranteed correlation between the returned value and platform defined
-    /// constants. Also, there is no guarantee that the `usize` representation
-    /// will remain constant across patch releases of Mio.
-    ///
-    /// This function is mainly provided to allow the caller to loa a
-    /// readiness value from an `AtomicUsize`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::readable();
-    /// let ready_usize = ready.as_usize();
-    /// let ready2 = Ready::from_usize(ready_usize);
-    ///
-    /// assert_eq!(ready, ready2);
-    /// ```
-    pub fn from_usize(val: usize) -> Ready {
-        Ready(val)
-    }
-
-    /// Returns a `usize` representation of the `Ready` value.
-    ///
-    /// This `usize` representation must be treated as opaque. There is no
-    /// guaranteed correlation between the returned value and platform defined
-    /// constants. Also, there is no guarantee that the `usize` representation
-    /// will remain constant across patch releases of Mio.
-    ///
-    /// This function is mainly provided to allow the caller to store a
-    /// readiness value in an `AtomicUsize`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Ready;
-    ///
-    /// let ready = Ready::readable();
-    /// let ready_usize = ready.as_usize();
-    /// let ready2 = Ready::from_usize(ready_usize);
-    ///
-    /// assert_eq!(ready, ready2);
-    /// ```
-    pub fn as_usize(&self) -> usize {
-        self.0
-    }
-}
-
-impl<T: Into<Ready>> ops::BitOr<T> for Ready {
-    type Output = Ready;
-
-    #[inline]
-    fn bitor(self, other: T) -> Ready {
-        Ready(self.0 | other.into().0)
-    }
-}
-
-impl<T: Into<Ready>> ops::BitOrAssign<T> for Ready {
-    #[inline]
-    fn bitor_assign(&mut self, other: T) {
-        self.0 |= other.into().0;
-    }
-}
-
-impl<T: Into<Ready>> ops::BitXor<T> for Ready {
-    type Output = Ready;
-
-    #[inline]
-    fn bitxor(self, other: T) -> Ready {
-        Ready(self.0 ^ other.into().0)
-    }
-}
-
-impl<T: Into<Ready>> ops::BitXorAssign<T> for Ready {
-    #[inline]
-    fn bitxor_assign(&mut self, other: T) {
-        self.0 ^= other.into().0;
-    }
-}
-
-impl<T: Into<Ready>> ops::BitAnd<T> for Ready {
-    type Output = Ready;
-
-    #[inline]
-    fn bitand(self, other: T) -> Ready {
-        Ready(self.0 & other.into().0)
-    }
-}
-
-impl<T: Into<Ready>> ops::BitAndAssign<T> for Ready {
-    #[inline]
-    fn bitand_assign(&mut self, other: T) {
-        self.0 &= other.into().0
-    }
-}
-
-impl<T: Into<Ready>> ops::Sub<T> for Ready {
-    type Output = Ready;
-
-    #[inline]
-    fn sub(self, other: T) -> Ready {
-        Ready(self.0 & !other.into().0)
-    }
-}
-
-impl<T: Into<Ready>> ops::SubAssign<T> for Ready {
-    #[inline]
-    fn sub_assign(&mut self, other: T) {
-        self.0 &= !other.into().0;
-    }
-}
-
-#[deprecated(since = "0.6.10", note = "removed")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-impl ops::Not for Ready {
-    type Output = Ready;
-
-    #[inline]
-    fn not(self) -> Ready {
-        Ready(!self.0)
-    }
-}
-
-impl fmt::Debug for Ready {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut one = false;
-        let flags = [
-            (Ready::readable(), "Readable"),
-            (Ready::writable(), "Writable"),
-            (Ready(ERROR), "Error"),
-            (Ready(HUP), "Hup")];
-
-        for &(flag, msg) in &flags {
-            if self.contains(flag) {
-                if one { write!(fmt, " | ")? }
-                write!(fmt, "{}", msg)?;
-
-                one = true
-            }
-        }
-
-        if !one {
-            fmt.write_str("(empty)")?;
-        }
-
-        Ok(())
-    }
-}
-
-#[test]
-fn test_debug_ready() {
-    assert_eq!("(empty)", format!("{:?}", Ready::empty()));
-    assert_eq!("Readable", format!("{:?}", Ready::readable()));
-    assert_eq!("Writable", format!("{:?}", Ready::writable()));
-}
-
-/// An readiness event returned by [`Poll::poll`].
-///
-/// `Event` is a [readiness state] paired with a [`Token`]. It is returned by
-/// [`Poll::poll`].
-///
-/// For more documentation on polling and events, see [`Poll`].
-///
-/// # Examples
-///
-/// ```
-/// use mio::{Ready, Token};
-/// use mio::event::Event;
-///
-/// let event = Event::new(Ready::readable() | Ready::writable(), Token(0));
-///
-/// assert_eq!(event.readiness(), Ready::readable() | Ready::writable());
-/// assert_eq!(event.token(), Token(0));
-/// ```
-///
-/// [`Poll::poll`]: ../struct.Poll.html#method.poll
-/// [`Poll`]: ../struct.Poll.html
-/// [readiness state]: ../struct.Ready.html
-/// [`Token`]: ../struct.Token.html
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub struct Event {
-    kind: Ready,
-    token: Token
-}
-
-impl Event {
-    /// Creates a new `Event` containing `readiness` and `token`
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::{Ready, Token};
-    /// use mio::event::Event;
-    ///
-    /// let event = Event::new(Ready::readable() | Ready::writable(), Token(0));
-    ///
-    /// assert_eq!(event.readiness(), Ready::readable() | Ready::writable());
-    /// assert_eq!(event.token(), Token(0));
-    /// ```
-    pub fn new(readiness: Ready, token: Token) -> Event {
-        Event {
-            kind: readiness,
-            token,
-        }
-    }
-
-    /// Returns the event's readiness.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::{Ready, Token};
-    /// use mio::event::Event;
-    ///
-    /// let event = Event::new(Ready::readable() | Ready::writable(), Token(0));
-    ///
-    /// assert_eq!(event.readiness(), Ready::readable() | Ready::writable());
-    /// ```
-    pub fn readiness(&self) -> Ready {
-        self.kind
-    }
-
-    #[deprecated(since = "0.6.5", note = "use Event::readiness()")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    pub fn kind(&self) -> Ready {
-        self.kind
-    }
-
-    /// Returns the event's token.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::{Ready, Token};
-    /// use mio::event::Event;
-    ///
-    /// let event = Event::new(Ready::readable() | Ready::writable(), Token(0));
-    ///
-    /// assert_eq!(event.token(), Token(0));
-    /// ```
-    pub fn token(&self) -> Token {
-        self.token
-    }
-}
-
-/*
- *
- * ===== Mio internal helpers =====
- *
- */
-
-pub fn ready_as_usize(events: Ready) -> usize {
-    events.0
-}
-
-pub fn opt_as_usize(opt: PollOpt) -> usize {
-    opt.0
-}
-
-pub fn ready_from_usize(events: usize) -> Ready {
-    Ready(events)
-}
-
-pub fn opt_from_usize(opt: usize) -> PollOpt {
-    PollOpt(opt)
-}
-
-// Used internally to mutate an `Event` in place
-// Not used on all platforms
-#[allow(dead_code)]
-pub fn kind_mut(event: &mut Event) -> &mut Ready {
-    &mut event.kind
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/interest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/interest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/interest.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/interest.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,179 @@
+use std::num::NonZeroU8;
+use std::{fmt, ops};
+
+/// Interest used in registering.
+///
+/// Interest are used in [registering] [`event::Source`]s with [`Poll`], they
+/// indicate what readiness should be monitored for. For example if a socket is
+/// registered with [readable] interests and the socket becomes writable, no
+/// event will be returned from a call to [`poll`].
+///
+/// [registering]: struct.Registry.html#method.register
+/// [`event::Source`]: ./event/trait.Source.html
+/// [`Poll`]: struct.Poll.html
+/// [readable]: struct.Interest.html#associatedconstant.READABLE
+/// [`poll`]: struct.Poll.html#method.poll
+#[derive(Copy, PartialEq, Eq, Clone, PartialOrd, Ord)]
+pub struct Interest(NonZeroU8);
+
+// These must be unique.
+const READABLE: u8 = 0b0_001;
+const WRITABLE: u8 = 0b0_010;
+// The following are not available on all platforms.
+#[cfg_attr(
+    not(any(
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "ios",
+        target_os = "macos"
+    )),
+    allow(dead_code)
+)]
+const AIO: u8 = 0b0_100;
+#[cfg_attr(not(target_os = "freebsd"), allow(dead_code))]
+const LIO: u8 = 0b1_000;
+
+impl Interest {
+    /// Returns a `Interest` set representing readable interests.
+    pub const READABLE: Interest = Interest(unsafe { NonZeroU8::new_unchecked(READABLE) });
+
+    /// Returns a `Interest` set representing writable interests.
+    pub const WRITABLE: Interest = Interest(unsafe { NonZeroU8::new_unchecked(WRITABLE) });
+
+    /// Returns a `Interest` set representing AIO completion interests.
+    #[cfg(any(
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "ios",
+        target_os = "macos"
+    ))]
+    pub const AIO: Interest = Interest(unsafe { NonZeroU8::new_unchecked(AIO) });
+
+    /// Returns a `Interest` set representing LIO completion interests.
+    #[cfg(target_os = "freebsd")]
+    pub const LIO: Interest = Interest(unsafe { NonZeroU8::new_unchecked(LIO) });
+
+    /// Add together two `Interest`.
+    ///
+    /// This does the same thing as the `BitOr` implementation, but is a
+    /// constant function.
+    ///
+    /// ```
+    /// use mio::Interest;
+    ///
+    /// const INTERESTS: Interest = Interest::READABLE.add(Interest::WRITABLE);
+    /// # fn silent_dead_code_warning(_: Interest) { }
+    /// # silent_dead_code_warning(INTERESTS)
+    /// ```
+    #[allow(clippy::should_implement_trait)]
+    pub const fn add(self, other: Interest) -> Interest {
+        Interest(unsafe { NonZeroU8::new_unchecked(self.0.get() | other.0.get()) })
+    }
+
+    /// Removes `other` `Interest` from `self`.
+    ///
+    /// Returns `None` if the set would be empty after removing `other`.
+    ///
+    /// ```
+    /// use mio::Interest;
+    ///
+    /// const RW_INTERESTS: Interest = Interest::READABLE.add(Interest::WRITABLE);
+    ///
+    /// // As long a one interest remain this will return `Some`.
+    /// let w_interest = RW_INTERESTS.remove(Interest::READABLE).unwrap();
+    /// assert!(!w_interest.is_readable());
+    /// assert!(w_interest.is_writable());
+    ///
+    /// // Removing all interests from the set will return `None`.
+    /// assert_eq!(w_interest.remove(Interest::WRITABLE), None);
+    ///
+    /// // Its also possible to remove multiple interests at once.
+    /// assert_eq!(RW_INTERESTS.remove(RW_INTERESTS), None);
+    /// ```
+    pub fn remove(self, other: Interest) -> Option<Interest> {
+        NonZeroU8::new(self.0.get() & !other.0.get()).map(Interest)
+    }
+
+    /// Returns true if the value includes readable readiness.
+    pub const fn is_readable(self) -> bool {
+        (self.0.get() & READABLE) != 0
+    }
+
+    /// Returns true if the value includes writable readiness.
+    pub const fn is_writable(self) -> bool {
+        (self.0.get() & WRITABLE) != 0
+    }
+
+    /// Returns true if `Interest` contains AIO readiness
+    pub const fn is_aio(self) -> bool {
+        (self.0.get() & AIO) != 0
+    }
+
+    /// Returns true if `Interest` contains LIO readiness
+    pub const fn is_lio(self) -> bool {
+        (self.0.get() & LIO) != 0
+    }
+}
+
+impl ops::BitOr for Interest {
+    type Output = Self;
+
+    #[inline]
+    fn bitor(self, other: Self) -> Self {
+        self.add(other)
+    }
+}
+
+impl ops::BitOrAssign for Interest {
+    #[inline]
+    fn bitor_assign(&mut self, other: Self) {
+        self.0 = (*self | other).0;
+    }
+}
+
+impl fmt::Debug for Interest {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut one = false;
+        if self.is_readable() {
+            if one {
+                write!(fmt, " | ")?
+            }
+            write!(fmt, "READABLE")?;
+            one = true
+        }
+        if self.is_writable() {
+            if one {
+                write!(fmt, " | ")?
+            }
+            write!(fmt, "WRITABLE")?;
+            one = true
+        }
+        #[cfg(any(
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "ios",
+            target_os = "macos"
+        ))]
+        {
+            if self.is_aio() {
+                if one {
+                    write!(fmt, " | ")?
+                }
+                write!(fmt, "AIO")?;
+                one = true
+            }
+        }
+        #[cfg(any(target_os = "freebsd"))]
+        {
+            if self.is_lio() {
+                if one {
+                    write!(fmt, " | ")?
+                }
+                write!(fmt, "LIO")?;
+                one = true
+            }
+        }
+        debug_assert!(one, "printing empty interests");
+        Ok(())
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/io.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// Re-export the io::Result / Error types for convenience
-pub use std::io::{Read, Write, Result, Error, ErrorKind};
-
-// TODO: Delete this
-/// A helper trait to provide the map_non_block function on Results.
-pub trait MapNonBlock<T> {
-    /// Maps a `Result<T>` to a `Result<Option<T>>` by converting
-    /// operation-would-block errors into `Ok(None)`.
-    fn map_non_block(self) -> Result<Option<T>>;
-}
-
-impl<T> MapNonBlock<T> for Result<T> {
-    fn map_non_block(self) -> Result<Option<T>> {
-        use std::io::ErrorKind::WouldBlock;
-
-        match self {
-            Ok(value) => Ok(Some(value)),
-            Err(err) => {
-                if let WouldBlock = err.kind() {
-                    Ok(None)
-                } else {
-                    Err(err)
-                }
-            }
-        }
-    }
-}
-
-#[cfg(feature = "with-deprecated")]
-pub mod deprecated {
-    /// Returns a std `WouldBlock` error without allocating
-    pub fn would_block() -> ::std::io::Error {
-        ::std::io::ErrorKind::WouldBlock.into()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/io_source.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/io_source.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/io_source.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/io_source.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,292 @@
+use std::ops::{Deref, DerefMut};
+#[cfg(unix)]
+use std::os::unix::io::AsRawFd;
+#[cfg(windows)]
+use std::os::windows::io::AsRawSocket;
+#[cfg(debug_assertions)]
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::{fmt, io};
+
+#[cfg(any(unix, debug_assertions))]
+use crate::poll;
+use crate::sys::IoSourceState;
+use crate::{event, Interest, Registry, Token};
+
+/// Adapter for a [`RawFd`] or [`RawSocket`] providing an [`event::Source`]
+/// implementation.
+///
+/// `IoSource` enables registering any FD or socket wrapper with [`Poll`].
+///
+/// While only implementations for TCP, UDP, and UDS (Unix only) are provided,
+/// Mio supports registering any FD or socket that can be registered with the
+/// underlying OS selector. `IoSource` provides the necessary bridge.
+///
+/// [`RawFd`]: std::os::unix::io::RawFd
+/// [`RawSocket`]: std::os::windows::io::RawSocket
+///
+/// # Notes
+///
+/// To handle the registrations and events properly **all** I/O operations (such
+/// as `read`, `write`, etc.) must go through the [`do_io`] method to ensure the
+/// internal state is updated accordingly.
+///
+/// [`Poll`]: crate::Poll
+/// [`do_io`]: IoSource::do_io
+/*
+///
+/// # Examples
+///
+/// Basic usage.
+///
+/// ```
+/// # use std::error::Error;
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// use mio::{Interest, Poll, Token};
+/// use mio::IoSource;
+///
+/// use std::net;
+///
+/// let poll = Poll::new()?;
+///
+/// // Bind a std TCP listener.
+/// let listener = net::TcpListener::bind("127.0.0.1:0")?;
+/// // Wrap it in the `IoSource` type.
+/// let mut listener = IoSource::new(listener);
+///
+/// // Register the listener.
+/// poll.registry().register(&mut listener, Token(0), Interest::READABLE)?;
+/// #     Ok(())
+/// # }
+/// ```
+*/
+pub struct IoSource<T> {
+    state: IoSourceState,
+    inner: T,
+    #[cfg(debug_assertions)]
+    selector_id: SelectorId,
+}
+
+impl<T> IoSource<T> {
+    /// Create a new `IoSource`.
+    pub fn new(io: T) -> IoSource<T> {
+        IoSource {
+            state: IoSourceState::new(),
+            inner: io,
+            #[cfg(debug_assertions)]
+            selector_id: SelectorId::new(),
+        }
+    }
+
+    /// Execute an I/O operations ensuring that the socket receives more events
+    /// if it hits a [`WouldBlock`] error.
+    ///
+    /// # Notes
+    ///
+    /// This method is required to be called for **all** I/O operations to
+    /// ensure the user will receive events once the socket is ready again after
+    /// returning a [`WouldBlock`] error.
+    ///
+    /// [`WouldBlock`]: io::ErrorKind::WouldBlock
+    pub fn do_io<F, R>(&self, f: F) -> io::Result<R>
+    where
+        F: FnOnce(&T) -> io::Result<R>,
+    {
+        self.state.do_io(f, &self.inner)
+    }
+
+    /// Returns the I/O source, dropping the state.
+    ///
+    /// # Notes
+    ///
+    /// To ensure no more events are to be received for this I/O source first
+    /// [`deregister`] it.
+    ///
+    /// [`deregister`]: Registry::deregister
+    pub fn into_inner(self) -> T {
+        self.inner
+    }
+}
+
+/// Be careful when using this method. All I/O operations that may block must go
+/// through the [`do_io`] method.
+///
+/// [`do_io`]: IoSource::do_io
+impl<T> Deref for IoSource<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+/// Be careful when using this method. All I/O operations that may block must go
+/// through the [`do_io`] method.
+///
+/// [`do_io`]: IoSource::do_io
+impl<T> DerefMut for IoSource<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.inner
+    }
+}
+
+#[cfg(unix)]
+impl<T> event::Source for IoSource<T>
+where
+    T: AsRawFd,
+{
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        #[cfg(debug_assertions)]
+        self.selector_id.associate(registry)?;
+        poll::selector(registry).register(self.inner.as_raw_fd(), token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        #[cfg(debug_assertions)]
+        self.selector_id.check_association(registry)?;
+        poll::selector(registry).reregister(self.inner.as_raw_fd(), token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        #[cfg(debug_assertions)]
+        self.selector_id.remove_association(registry)?;
+        poll::selector(registry).deregister(self.inner.as_raw_fd())
+    }
+}
+
+#[cfg(windows)]
+impl<T> event::Source for IoSource<T>
+where
+    T: AsRawSocket,
+{
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        #[cfg(debug_assertions)]
+        self.selector_id.associate(registry)?;
+        self.state
+            .register(registry, token, interests, self.inner.as_raw_socket())
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        #[cfg(debug_assertions)]
+        self.selector_id.check_association(registry)?;
+        self.state.reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, _registry: &Registry) -> io::Result<()> {
+        #[cfg(debug_assertions)]
+        self.selector_id.remove_association(_registry)?;
+        self.state.deregister()
+    }
+}
+
+impl<T> fmt::Debug for IoSource<T>
+where
+    T: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+/// Used to associate an `IoSource` with a `sys::Selector`.
+#[cfg(debug_assertions)]
+#[derive(Debug)]
+struct SelectorId {
+    id: AtomicUsize,
+}
+
+#[cfg(debug_assertions)]
+impl SelectorId {
+    /// Value of `id` if `SelectorId` is not associated with any
+    /// `sys::Selector`. Valid selector ids start at 1.
+    const UNASSOCIATED: usize = 0;
+
+    /// Create a new `SelectorId`.
+    const fn new() -> SelectorId {
+        SelectorId {
+            id: AtomicUsize::new(Self::UNASSOCIATED),
+        }
+    }
+
+    /// Associate an I/O source with `registry`, returning an error if its
+    /// already registered.
+    fn associate(&self, registry: &Registry) -> io::Result<()> {
+        let registry_id = poll::selector(&registry).id();
+        let previous_id = self.id.swap(registry_id, Ordering::AcqRel);
+
+        if previous_id == Self::UNASSOCIATED {
+            Ok(())
+        } else {
+            Err(io::Error::new(
+                io::ErrorKind::AlreadyExists,
+                "I/O source already registered with a `Registry`",
+            ))
+        }
+    }
+
+    /// Check the association of an I/O source with `registry`, returning an
+    /// error if its registered with a different `Registry` or not registered at
+    /// all.
+    fn check_association(&self, registry: &Registry) -> io::Result<()> {
+        let registry_id = poll::selector(&registry).id();
+        let id = self.id.load(Ordering::Acquire);
+
+        if id == registry_id {
+            Ok(())
+        } else if id == Self::UNASSOCIATED {
+            Err(io::Error::new(
+                io::ErrorKind::NotFound,
+                "I/O source not registered with `Registry`",
+            ))
+        } else {
+            Err(io::Error::new(
+                io::ErrorKind::AlreadyExists,
+                "I/O source already registered with a different `Registry`",
+            ))
+        }
+    }
+
+    /// Remove a previously made association from `registry`, returns an error
+    /// if it was not previously associated with `registry`.
+    fn remove_association(&self, registry: &Registry) -> io::Result<()> {
+        let registry_id = poll::selector(&registry).id();
+        let previous_id = self.id.swap(Self::UNASSOCIATED, Ordering::AcqRel);
+
+        if previous_id == registry_id {
+            Ok(())
+        } else {
+            Err(io::Error::new(
+                io::ErrorKind::NotFound,
+                "I/O source not registered with `Registry`",
+            ))
+        }
+    }
+}
+
+#[cfg(debug_assertions)]
+impl Clone for SelectorId {
+    fn clone(&self) -> SelectorId {
+        SelectorId {
+            id: AtomicUsize::new(self.id.load(Ordering::Acquire)),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/lazycell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/lazycell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/lazycell.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/lazycell.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,554 +0,0 @@
-// Original work Copyright (c) 2014 The Rust Project Developers
-// Modified work Copyright (c) 2016-2018 Nikita Pekin and the lazycell contributors
-// See the README.md file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(missing_docs)]
-#![allow(unused)]
-
-//! This crate provides a `LazyCell` struct which acts as a lazily filled
-//! `Cell`.
-//!
-//! With a `RefCell`, the inner contents cannot be borrowed for the lifetime of
-//! the entire object, but only of the borrows returned. A `LazyCell` is a
-//! variation on `RefCell` which allows borrows to be tied to the lifetime of
-//! the outer object.
-//!
-//! `AtomicLazyCell` is a variant that uses an atomic variable to manage
-//! coordination in a thread-safe fashion. The limitation of an `AtomicLazyCell`
-//! is that after it is initialized, it can't be modified.
-
-use std::cell::UnsafeCell;
-use std::mem;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-/// A lazily filled `Cell`, with mutable contents.
-///
-/// A `LazyCell` is completely frozen once filled, **unless** you have `&mut`
-/// access to it, in which case `LazyCell::borrow_mut` may be used to mutate the
-/// contents.
-#[derive(Debug, Default)]
-pub struct LazyCell<T> {
-    inner: UnsafeCell<Option<T>>,
-}
-
-impl<T> LazyCell<T> {
-    /// Creates a new, empty, `LazyCell`.
-    pub fn new() -> LazyCell<T> {
-        LazyCell { inner: UnsafeCell::new(None) }
-    }
-
-    /// Put a value into this cell.
-    ///
-    /// This function will return `Err(value)` is the cell is already full.
-    pub fn fill(&self, value: T) -> Result<(), T> {
-        let slot = unsafe { &mut *self.inner.get() };
-        if slot.is_some() {
-            return Err(value);
-        }
-        *slot = Some(value);
-
-        Ok(())
-    }
-
-    /// Put a value into this cell.
-    ///
-    /// Note that this function is infallible but requires `&mut self`. By
-    /// requiring `&mut self` we're guaranteed that no active borrows to this
-    /// cell can exist so we can always fill in the value. This may not always
-    /// be usable, however, as `&mut self` may not be possible to borrow.
-    ///
-    /// # Return value
-    ///
-    /// This function returns the previous value, if any.
-    pub fn replace(&mut self, value: T) -> Option<T> {
-        mem::replace(unsafe { &mut *self.inner.get() }, Some(value))
-    }
-
-    /// Test whether this cell has been previously filled.
-    pub fn filled(&self) -> bool {
-        self.borrow().is_some()
-    }
-
-    /// Borrows the contents of this lazy cell for the duration of the cell
-    /// itself.
-    ///
-    /// This function will return `Some` if the cell has been previously
-    /// initialized, and `None` if it has not yet been initialized.
-    pub fn borrow(&self) -> Option<&T> {
-        unsafe { &*self.inner.get() }.as_ref()
-    }
-
-    /// Borrows the contents of this lazy cell mutably for the duration of the cell
-    /// itself.
-    ///
-    /// This function will return `Some` if the cell has been previously
-    /// initialized, and `None` if it has not yet been initialized.
-    pub fn borrow_mut(&mut self) -> Option<&mut T> {
-        unsafe { &mut *self.inner.get() }.as_mut()
-    }
-
-    /// Borrows the contents of this lazy cell for the duration of the cell
-    /// itself.
-    ///
-    /// If the cell has not yet been filled, the cell is first filled using the
-    /// function provided.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the cell becomes filled as a side effect of `f`.
-    pub fn borrow_with<F: FnOnce() -> T>(&self, f: F) -> &T {
-        if let Some(value) = self.borrow() {
-            return value;
-        }
-        let value = f();
-        if self.fill(value).is_err() {
-            panic!("borrow_with: cell was filled by closure")
-        }
-        self.borrow().unwrap()
-    }
-
-    /// Borrows the contents of this `LazyCell` mutably for the duration of the
-    /// cell itself.
-    ///
-    /// If the cell has not yet been filled, the cell is first filled using the
-    /// function provided.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the cell becomes filled as a side effect of `f`.
-    pub fn borrow_mut_with<F: FnOnce() -> T>(&mut self, f: F) -> &mut T {
-        if !self.filled() {
-            let value = f();
-            if self.fill(value).is_err() {
-                panic!("borrow_mut_with: cell was filled by closure")
-            }
-        }
-
-        self.borrow_mut().unwrap()
-    }
-
-    /// Same as `borrow_with`, but allows the initializing function to fail.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the cell becomes filled as a side effect of `f`.
-    pub fn try_borrow_with<E, F>(&self, f: F) -> Result<&T, E>
-        where F: FnOnce() -> Result<T, E>
-    {
-        if let Some(value) = self.borrow() {
-            return Ok(value);
-        }
-        let value = f()?;
-        if self.fill(value).is_err() {
-            panic!("try_borrow_with: cell was filled by closure")
-        }
-        Ok(self.borrow().unwrap())
-    }
-
-    /// Same as `borrow_mut_with`, but allows the initializing function to fail.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the cell becomes filled as a side effect of `f`.
-    pub fn try_borrow_mut_with<E, F>(&mut self, f: F) -> Result<&mut T, E>
-        where F: FnOnce() -> Result<T, E>
-    {
-        if self.filled() {
-            return Ok(self.borrow_mut().unwrap());
-        }
-        let value = f()?;
-        if self.fill(value).is_err() {
-            panic!("try_borrow_mut_with: cell was filled by closure")
-        }
-        Ok(self.borrow_mut().unwrap())
-    }
-
-    /// Consumes this `LazyCell`, returning the underlying value.
-    pub fn into_inner(self) -> Option<T> {
-        // Rust 1.25 changed UnsafeCell::into_inner() from unsafe to safe
-        // function. This unsafe can be removed when supporting Rust older than
-        // 1.25 is not needed.
-        #[allow(unused_unsafe)]
-        unsafe { self.inner.into_inner() }
-    }
-}
-
-impl<T: Copy> LazyCell<T> {
-    /// Returns a copy of the contents of the lazy cell.
-    ///
-    /// This function will return `Some` if the cell has been previously initialized,
-    /// and `None` if it has not yet been initialized.
-    pub fn get(&self) -> Option<T> {
-        unsafe { *self.inner.get() }
-    }
-}
-
-// Tracks the AtomicLazyCell inner state
-const NONE: usize = 0;
-const LOCK: usize = 1;
-const SOME: usize = 2;
-
-/// A lazily filled and thread-safe `Cell`, with frozen contents.
-#[derive(Debug, Default)]
-pub struct AtomicLazyCell<T> {
-    inner: UnsafeCell<Option<T>>,
-    state: AtomicUsize,
-}
-
-impl<T> AtomicLazyCell<T> {
-    /// Creates a new, empty, `AtomicLazyCell`.
-    pub fn new() -> AtomicLazyCell<T> {
-        Self {
-            inner: UnsafeCell::new(None),
-            state: AtomicUsize::new(NONE),
-        }
-    }
-
-    /// Put a value into this cell.
-    ///
-    /// This function will return `Err(value)` is the cell is already full.
-    pub fn fill(&self, t: T) -> Result<(), T> {
-        if NONE != self.state.compare_and_swap(NONE, LOCK, Ordering::Acquire) {
-            return Err(t);
-        }
-
-        unsafe { *self.inner.get() = Some(t) };
-
-        if LOCK != self.state.compare_and_swap(LOCK, SOME, Ordering::Release) {
-            panic!("unable to release lock");
-        }
-
-        Ok(())
-    }
-
-    /// Put a value into this cell.
-    ///
-    /// Note that this function is infallible but requires `&mut self`. By
-    /// requiring `&mut self` we're guaranteed that no active borrows to this
-    /// cell can exist so we can always fill in the value. This may not always
-    /// be usable, however, as `&mut self` may not be possible to borrow.
-    ///
-    /// # Return value
-    ///
-    /// This function returns the previous value, if any.
-    pub fn replace(&mut self, value: T) -> Option<T> {
-        match mem::replace(self.state.get_mut(), SOME) {
-            NONE | SOME => {}
-            _ => panic!("cell in inconsistent state"),
-        }
-        mem::replace(unsafe { &mut *self.inner.get() }, Some(value))
-    }
-
-    /// Test whether this cell has been previously filled.
-    pub fn filled(&self) -> bool {
-        self.state.load(Ordering::Acquire) == SOME
-    }
-
-    /// Borrows the contents of this lazy cell for the duration of the cell
-    /// itself.
-    ///
-    /// This function will return `Some` if the cell has been previously
-    /// initialized, and `None` if it has not yet been initialized.
-    pub fn borrow(&self) -> Option<&T> {
-        match self.state.load(Ordering::Acquire) {
-            SOME => unsafe { &*self.inner.get() }.as_ref(),
-            _ => None,
-        }
-    }
-
-    /// Consumes this `LazyCell`, returning the underlying value.
-    pub fn into_inner(self) -> Option<T> {
-        // Rust 1.25 changed UnsafeCell::into_inner() from unsafe to safe
-        // function. This unsafe can be removed when supporting Rust older than
-        // 1.25 is not needed.
-        #[allow(unused_unsafe)]
-        unsafe { self.inner.into_inner() }
-    }
-}
-
-impl<T: Copy> AtomicLazyCell<T> {
-    /// Returns a copy of the contents of the lazy cell.
-    ///
-    /// This function will return `Some` if the cell has been previously initialized,
-    /// and `None` if it has not yet been initialized.
-    pub fn get(&self) -> Option<T> {
-        match self.state.load(Ordering::Acquire) {
-            SOME => unsafe { *self.inner.get() },
-            _ => None,
-        }
-    }
-}
-
-unsafe impl<T: Sync + Send> Sync for AtomicLazyCell<T> {}
-
-unsafe impl<T: Send> Send for AtomicLazyCell<T> {}
-
-#[cfg(test)]
-mod tests {
-    use super::{AtomicLazyCell, LazyCell};
-
-    #[test]
-    fn test_borrow_from_empty() {
-        let lazycell: LazyCell<usize> = LazyCell::new();
-
-        let value = lazycell.borrow();
-        assert_eq!(value, None);
-
-        let value = lazycell.get();
-        assert_eq!(value, None);
-    }
-
-    #[test]
-    fn test_fill_and_borrow() {
-        let lazycell = LazyCell::new();
-
-        assert!(!lazycell.filled());
-        lazycell.fill(1).unwrap();
-        assert!(lazycell.filled());
-
-        let value = lazycell.borrow();
-        assert_eq!(value, Some(&1));
-
-        let value = lazycell.get();
-        assert_eq!(value, Some(1));
-    }
-
-    #[test]
-    fn test_borrow_mut() {
-        let mut lazycell = LazyCell::new();
-        assert!(lazycell.borrow_mut().is_none());
-
-        lazycell.fill(1).unwrap();
-        assert_eq!(lazycell.borrow_mut(), Some(&mut 1));
-
-        *lazycell.borrow_mut().unwrap() = 2;
-        assert_eq!(lazycell.borrow_mut(), Some(&mut 2));
-
-        // official way to reset the cell
-        lazycell = LazyCell::new();
-        assert!(lazycell.borrow_mut().is_none());
-    }
-
-    #[test]
-    fn test_already_filled_error() {
-        let lazycell = LazyCell::new();
-
-        lazycell.fill(1).unwrap();
-        assert_eq!(lazycell.fill(1), Err(1));
-    }
-
-    #[test]
-    fn test_borrow_with() {
-        let lazycell = LazyCell::new();
-
-        let value = lazycell.borrow_with(|| 1);
-        assert_eq!(&1, value);
-    }
-
-    #[test]
-    fn test_borrow_with_already_filled() {
-        let lazycell = LazyCell::new();
-        lazycell.fill(1).unwrap();
-
-        let value = lazycell.borrow_with(|| 1);
-        assert_eq!(&1, value);
-    }
-
-    #[test]
-    fn test_borrow_with_not_called_when_filled() {
-        let lazycell = LazyCell::new();
-
-        lazycell.fill(1).unwrap();
-
-        let value = lazycell.borrow_with(|| 2);
-        assert_eq!(&1, value);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_borrow_with_sound_with_reentrancy() {
-        // Kudos to dbaupp for discovering this issue
-        // https://www.reddit.com/r/rust/comments/5vs9rt/lazycell_a_rust_library_providing_a_lazilyfilled/de527xm/
-        let lazycell: LazyCell<Box<i32>> = LazyCell::new();
-
-        let mut reference: Option<&i32> = None;
-
-        lazycell.borrow_with(|| {
-            let _ = lazycell.fill(Box::new(1));
-            reference = lazycell.borrow().map(|r| &**r);
-            Box::new(2)
-        });
-    }
-
-    #[test]
-    fn test_borrow_mut_with() {
-        let mut lazycell = LazyCell::new();
-
-        {
-            let value = lazycell.borrow_mut_with(|| 1);
-            assert_eq!(&mut 1, value);
-            *value = 2;
-        }
-        assert_eq!(&2, lazycell.borrow().unwrap());
-    }
-
-    #[test]
-    fn test_borrow_mut_with_already_filled() {
-        let mut lazycell = LazyCell::new();
-        lazycell.fill(1).unwrap();
-
-        let value = lazycell.borrow_mut_with(|| 1);
-        assert_eq!(&1, value);
-    }
-
-    #[test]
-    fn test_borrow_mut_with_not_called_when_filled() {
-        let mut lazycell = LazyCell::new();
-
-        lazycell.fill(1).unwrap();
-
-        let value = lazycell.borrow_mut_with(|| 2);
-        assert_eq!(&1, value);
-    }
-
-    #[test]
-    fn test_try_borrow_with_ok() {
-        let lazycell = LazyCell::new();
-        let result = lazycell.try_borrow_with::<(), _>(|| Ok(1));
-        assert_eq!(result, Ok(&1));
-    }
-
-    #[test]
-    fn test_try_borrow_with_err() {
-        let lazycell = LazyCell::<()>::new();
-        let result = lazycell.try_borrow_with(|| Err(1));
-        assert_eq!(result, Err(1));
-    }
-
-    #[test]
-    fn test_try_borrow_with_already_filled() {
-        let lazycell = LazyCell::new();
-        lazycell.fill(1).unwrap();
-        let result = lazycell.try_borrow_with::<(), _>(|| unreachable!());
-        assert_eq!(result, Ok(&1));
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_try_borrow_with_sound_with_reentrancy() {
-        let lazycell: LazyCell<Box<i32>> = LazyCell::new();
-
-        let mut reference: Option<&i32> = None;
-
-        let _ = lazycell.try_borrow_with::<(), _>(|| {
-            let _ = lazycell.fill(Box::new(1));
-            reference = lazycell.borrow().map(|r| &**r);
-            Ok(Box::new(2))
-        });
-    }
-
-    #[test]
-    fn test_try_borrow_mut_with_ok() {
-        let mut lazycell = LazyCell::new();
-        {
-            let result = lazycell.try_borrow_mut_with::<(), _>(|| Ok(1));
-            assert_eq!(result, Ok(&mut 1));
-            *result.unwrap() = 2;
-        }
-        assert_eq!(&mut 2, lazycell.borrow().unwrap());
-    }
-
-    #[test]
-    fn test_try_borrow_mut_with_err() {
-        let mut lazycell = LazyCell::<()>::new();
-        let result = lazycell.try_borrow_mut_with(|| Err(1));
-        assert_eq!(result, Err(1));
-    }
-
-    #[test]
-    fn test_try_borrow_mut_with_already_filled() {
-        let mut lazycell = LazyCell::new();
-        lazycell.fill(1).unwrap();
-        let result = lazycell.try_borrow_mut_with::<(), _>(|| unreachable!());
-        assert_eq!(result, Ok(&mut 1));
-    }
-
-    #[test]
-    fn test_into_inner() {
-        let lazycell = LazyCell::new();
-
-        lazycell.fill(1).unwrap();
-        let value = lazycell.into_inner();
-        assert_eq!(value, Some(1));
-    }
-
-    #[test]
-    fn test_atomic_borrow_from_empty() {
-        let lazycell: AtomicLazyCell<usize> = AtomicLazyCell::new();
-
-        let value = lazycell.borrow();
-        assert_eq!(value, None);
-
-        let value = lazycell.get();
-        assert_eq!(value, None);
-    }
-
-    #[test]
-    fn test_atomic_fill_and_borrow() {
-        let lazycell = AtomicLazyCell::new();
-
-        assert!(!lazycell.filled());
-        lazycell.fill(1).unwrap();
-        assert!(lazycell.filled());
-
-        let value = lazycell.borrow();
-        assert_eq!(value, Some(&1));
-
-        let value = lazycell.get();
-        assert_eq!(value, Some(1));
-    }
-
-    #[test]
-    fn test_atomic_already_filled_panic() {
-        let lazycell = AtomicLazyCell::new();
-
-        lazycell.fill(1).unwrap();
-        assert_eq!(1, lazycell.fill(1).unwrap_err());
-    }
-
-    #[test]
-    fn test_atomic_into_inner() {
-        let lazycell = AtomicLazyCell::new();
-
-        lazycell.fill(1).unwrap();
-        let value = lazycell.into_inner();
-        assert_eq!(value, Some(1));
-    }
-
-    #[test]
-    fn normal_replace() {
-        let mut cell = LazyCell::new();
-        assert_eq!(cell.fill(1), Ok(()));
-        assert_eq!(cell.replace(2), Some(1));
-        assert_eq!(cell.replace(3), Some(2));
-        assert_eq!(cell.borrow(), Some(&3));
-
-        let mut cell = LazyCell::new();
-        assert_eq!(cell.replace(2), None);
-    }
-
-    #[test]
-    fn atomic_replace() {
-        let mut cell = AtomicLazyCell::new();
-        assert_eq!(cell.fill(1), Ok(()));
-        assert_eq!(cell.replace(2), Some(1));
-        assert_eq!(cell.replace(3), Some(2));
-        assert_eq!(cell.borrow(), Some(&3));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,311 +1,265 @@
-#![doc(html_root_url = "https://docs.rs/mio/0.6.23")]
-// Mio targets old versions of the Rust compiler. In order to do this, uses
-// deprecated APIs.
-#![allow(bare_trait_objects, deprecated, unknown_lints)]
-#![deny(missing_docs, missing_debug_implementations)]
+#![doc(html_root_url = "https://docs.rs/mio/0.7.13")]
+#![deny(
+    missing_docs,
+    missing_debug_implementations,
+    rust_2018_idioms,
+    unused_imports,
+    dead_code
+)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
+// Disallow warnings when running tests.
 #![cfg_attr(test, deny(warnings))]
+// Disallow warnings in examples.
+#![doc(test(attr(deny(warnings))))]
 
-// Many of mio's public methods violate this lint, but they can't be fixed
-// without a breaking change.
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::trivially_copy_pass_by_ref))]
-
-//! A fast, low-level IO library for Rust focusing on non-blocking APIs, event
-//! notification, and other useful utilities for building high performance IO
-//! apps.
-//!
-//! # Features
-//!
-//! * Non-blocking TCP, UDP
-//! * I/O event notification queue backed by epoll, kqueue, and IOCP
-//! * Zero allocations at runtime
-//! * Platform specific extensions
-//!
-//! # Non-goals
+//! Mio is a fast, low-level I/O library for Rust focusing on non-blocking APIs
+//! and event notification for building high performance I/O apps with as little
+//! overhead as possible over the OS abstractions.
 //!
-//! The following are specifically omitted from Mio and are left to the user or higher-level libraries.
-//!
-//! * File operations
-//! * Thread pools / multi-threaded event loop
-//! * Timers
+//! # Usage
 //!
-//! # Platforms
+//! Using Mio starts by creating a [`Poll`], which reads events from the OS and
+//! puts them into [`Events`]. You can handle I/O events from the OS with it.
 //!
-//! Currently supported platforms:
+//! For more detail, see [`Poll`].
 //!
-//! * Linux
-//! * OS X
-//! * Windows
-//! * FreeBSD
-//! * NetBSD
-//! * Android
-//! * iOS
+//! [`Poll`]: ../mio/struct.Poll.html
+//! [`Events`]: ../mio/event/struct.Events.html
 //!
-//! mio can handle interfacing with each of the event notification systems of the aforementioned platforms. The details of
-//! their implementation are further discussed in [`Poll`].
+//! ## Examples
 //!
-//! # Usage
+//! Examples can found in the `examples` directory of the source code, or [on
+//! GitHub].
 //!
-//! Using mio starts by creating a [`Poll`], which reads events from the OS and
-//! put them into [`Events`]. You can handle IO events from the OS with it.
+//! [on GitHub]: https://github.com/tokio-rs/mio/tree/master/examples
 //!
-//! For more detail, see [`Poll`].
+//! ## Guide
 //!
-//! [`Poll`]: struct.Poll.html
-//! [`Events`]: struct.Events.html
+//! A getting started guide is available in the [`guide`] module.
 //!
-//! # Example
+//! ## Available features
 //!
-//! ```
-//! use mio::*;
-//! use mio::net::{TcpListener, TcpStream};
-//!
-//! // Setup some tokens to allow us to identify which event is
-//! // for which socket.
-//! const SERVER: Token = Token(0);
-//! const CLIENT: Token = Token(1);
-//!
-//! let addr = "127.0.0.1:13265".parse().unwrap();
-//!
-//! // Setup the server socket
-//! let server = TcpListener::bind(&addr).unwrap();
-//!
-//! // Create a poll instance
-//! let poll = Poll::new().unwrap();
-//!
-//! // Start listening for incoming connections
-//! poll.register(&server, SERVER, Ready::readable(),
-//!               PollOpt::edge()).unwrap();
-//!
-//! // Setup the client socket
-//! let sock = TcpStream::connect(&addr).unwrap();
-//!
-//! // Register the socket
-//! poll.register(&sock, CLIENT, Ready::readable(),
-//!               PollOpt::edge()).unwrap();
-//!
-//! // Create storage for events
-//! let mut events = Events::with_capacity(1024);
-//!
-//! loop {
-//!     poll.poll(&mut events, None).unwrap();
-//!
-//!     for event in events.iter() {
-//!         match event.token() {
-//!             SERVER => {
-//!                 // Accept and drop the socket immediately, this will close
-//!                 // the socket and notify the client of the EOF.
-//!                 let _ = server.accept();
-//!             }
-//!             CLIENT => {
-//!                 // The server just shuts down the socket, let's just exit
-//!                 // from our event loop.
-//!                 return;
-//!             }
-//!             _ => unreachable!(),
-//!         }
-//!     }
-//! }
-//!
-//! ```
-
-extern crate net2;
-extern crate iovec;
-extern crate slab;
-
-#[cfg(target_os = "fuchsia")]
-extern crate fuchsia_zircon as zircon;
-#[cfg(target_os = "fuchsia")]
-extern crate fuchsia_zircon_sys as zircon_sys;
-
-#[cfg(unix)]
-extern crate libc;
-
-#[cfg(windows)]
-extern crate miow;
-
-#[cfg(windows)]
-extern crate winapi;
-
-#[cfg(windows)]
-extern crate kernel32;
+//! The available features are described in the [`features`] module.
 
+// macros used internally
 #[macro_use]
-extern crate log;
+mod macros;
 
-mod event_imp;
-mod io;
+mod interest;
 mod poll;
 mod sys;
 mod token;
-mod lazycell;
+mod waker;
 
-pub mod net;
+pub mod event;
 
-#[deprecated(since = "0.6.5", note = "use mio-extras instead")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub mod channel;
-
-#[deprecated(since = "0.6.5", note = "use mio-extras instead")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub mod timer;
-
-#[deprecated(since = "0.6.5", note = "update to use `Poll`")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub mod deprecated;
-
-#[deprecated(since = "0.6.5", note = "use iovec crate directly")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub use iovec::IoVec;
-
-#[deprecated(since = "0.6.6", note = "use net module instead")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub mod tcp {
-    pub use net::{TcpListener, TcpStream};
-    pub use std::net::Shutdown;
+cfg_io_source! {
+    mod io_source;
 }
 
-#[deprecated(since = "0.6.6", note = "use net module instead")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub mod udp;
-
-pub use poll::{
-    Poll,
-    Registration,
-    SetReadiness,
-};
-pub use event_imp::{
-    PollOpt,
-    Ready,
-};
-pub use token::Token;
-
-pub mod event {
-    //! Readiness event types and utilities.
-
-    pub use super::poll::{Events, Iter};
-    pub use super::event_imp::{Event, Evented};
+cfg_net! {
+    pub mod net;
 }
 
-pub use event::{
-    Events,
-};
-
-#[deprecated(since = "0.6.5", note = "use events:: instead")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub use event::{Event, Evented};
-
-#[deprecated(since = "0.6.5", note = "use events::Iter instead")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub use poll::Iter as EventsIter;
-
-#[deprecated(since = "0.6.5", note = "std::io::Error can avoid the allocation now")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-pub use io::deprecated::would_block;
+#[doc(no_inline)]
+pub use event::Events;
+pub use interest::Interest;
+pub use poll::{Poll, Registry};
+pub use token::Token;
+pub use waker::Waker;
 
-#[cfg(all(unix, not(target_os = "fuchsia")))]
+#[cfg(all(unix, feature = "os-ext"))]
+#[cfg_attr(docsrs, doc(cfg(all(unix, feature = "os-ext"))))]
 pub mod unix {
-    //! Unix only extensions
-    pub use sys::{
-        EventedFd,
-    };
-    pub use sys::unix::UnixReady;
-}
+    //! Unix only extensions.
+
+    pub mod pipe {
+        //! Unix pipe.
+        //!
+        //! See the [`new`] function for documentation.
 
-#[cfg(target_os = "fuchsia")]
-pub mod fuchsia {
-    //! Fuchsia-only extensions
-    //!
-    //! # Stability
-    //!
-    //! This module depends on the [magenta-sys crate](https://crates.io/crates/magenta-sys)
-    //! and so might introduce breaking changes, even on minor releases,
-    //! so long as that crate remains unstable.
-    pub use sys::{
-        EventedHandle,
-    };
-    pub use sys::fuchsia::{FuchsiaReady, zx_signals_t};
+        pub use crate::sys::pipe::{new, Receiver, Sender};
+    }
+
+    pub use crate::sys::SourceFd;
 }
 
-/// Windows-only extensions to the mio crate.
-///
-/// Mio on windows is currently implemented with IOCP for a high-performance
-/// implementation of asynchronous I/O. Mio then provides TCP and UDP as sample
-/// bindings for the system to connect networking types to asynchronous I/O. On
-/// Unix this scheme is then also extensible to all other file descriptors with
-/// the `EventedFd` type, but on Windows no such analog is available. The
-/// purpose of this module, however, is to similarly provide a mechanism for
-/// foreign I/O types to get hooked up into the IOCP event loop.
-///
-/// This module provides two types for interfacing with a custom IOCP handle:
-///
-/// * `Binding` - this type is intended to govern binding with mio's `Poll`
-///   type. Each I/O object should contain an instance of `Binding` that's
-///   interfaced with for the implementation of the `Evented` trait. The
-///   `register`, `reregister`, and `deregister` methods for the `Evented` trait
-///   all have rough analogs with `Binding`.
-///
-///   Note that this type **does not handle readiness**. That is, this type does
-///   not handle whether sockets are readable/writable/etc. It's intended that
-///   IOCP types will internally manage this state with a `SetReadiness` type
-///   from the `poll` module. The `SetReadiness` is typically lazily created on
-///   the first time that `Evented::register` is called and then stored in the
-///   I/O object.
-///
-///   Also note that for types which represent streams of bytes the mio
-///   interface of *readiness* doesn't map directly to the Windows model of
-///   *completion*. This means that types will have to perform internal
-///   buffering to ensure that a readiness interface can be provided. For a
-///   sample implementation see the TCP/UDP modules in mio itself.
-///
-/// * `Overlapped` - this type is intended to be used as the concrete instances
-///   of the `OVERLAPPED` type that most win32 methods expect. It's crucial, for
-///   safety, that all asynchronous operations are initiated with an instance of
-///   `Overlapped` and not another instantiation of `OVERLAPPED`.
-///
-///   Mio's `Overlapped` type is created with a function pointer that receives
-///   a `OVERLAPPED_ENTRY` type when called. This `OVERLAPPED_ENTRY` type is
-///   defined in the `winapi` crate. Whenever a completion is posted to an IOCP
-///   object the `OVERLAPPED` that was signaled will be interpreted as
-///   `Overlapped` in the mio crate and this function pointer will be invoked.
-///   Through this function pointer, and through the `OVERLAPPED` pointer,
-///   implementations can handle management of I/O events.
-///
-/// When put together these two types enable custom Windows handles to be
-/// registered with mio's event loops. The `Binding` type is used to associate
-/// handles and the `Overlapped` type is used to execute I/O operations. When
-/// the I/O operations are completed a custom function pointer is called which
-/// typically modifies a `SetReadiness` set by `Evented` methods which will get
-/// later hooked into the mio event loop.
-#[cfg(windows)]
+#[cfg(all(windows, feature = "os-ext"))]
+#[cfg_attr(docsrs, doc(cfg(all(windows, feature = "os-ext"))))]
 pub mod windows {
+    //! Windows only extensions.
 
-    pub use sys::{Overlapped, Binding};
+    pub use crate::sys::named_pipe::NamedPipe;
 }
 
-#[cfg(feature = "with-deprecated")]
-mod convert {
-    use std::time::Duration;
-
-    const NANOS_PER_MILLI: u32 = 1_000_000;
-    const MILLIS_PER_SEC: u64 = 1_000;
-
-    /// Convert a `Duration` to milliseconds, rounding up and saturating at
-    /// `u64::MAX`.
-    ///
-    /// The saturating is fine because `u64::MAX` milliseconds are still many
-    /// million years.
-    pub fn millis(duration: Duration) -> u64 {
-        // Round up.
-        let millis = (duration.subsec_nanos() + NANOS_PER_MILLI - 1) / NANOS_PER_MILLI;
-        duration.as_secs().saturating_mul(MILLIS_PER_SEC).saturating_add(u64::from(millis))
-    }
+pub mod features {
+    //! # Mio's optional features.
+    //!
+    //! This document describes the available features in Mio.
+    //!
+    #![cfg_attr(feature = "os-poll", doc = "## `os-poll` (enabled)")]
+    #![cfg_attr(not(feature = "os-poll"), doc = "## `os-poll` (disabled)")]
+    //!
+    //! Mio by default provides only a shell implementation, that `panic!`s the
+    //! moment it is actually run. To run it requires OS support, this is
+    //! enabled by activating the `os-poll` feature.
+    //!
+    //! This makes `Poll`, `Registry` and `Waker` functional.
+    //!
+    #![cfg_attr(feature = "os-ext", doc = "## `os-ext` (enabled)")]
+    #![cfg_attr(not(feature = "os-ext"), doc = "## `os-ext` (disabled)")]
+    //!
+    //! `os-ext` enables additional OS specific facilities. These facilities can
+    //! be found in the `unix` and `windows` module.
+    //!
+    #![cfg_attr(feature = "net", doc = "## Network types (enabled)")]
+    #![cfg_attr(not(feature = "net"), doc = "## Network types (disabled)")]
+    //!
+    //! The `net` feature enables networking primitives in the `net` module.
+}
+
+pub mod guide {
+    //! # Getting started guide.
+    //!
+    //! In this guide we'll do the following:
+    //!
+    //! 1. Create a [`Poll`] instance (and learn what it is).
+    //! 2. Register an [event source].
+    //! 3. Create an event loop.
+    //!
+    //! At the end you'll have a very small (but quick) TCP server that accepts
+    //! connections and then drops (disconnects) them.
+    //!
+    //! ## 1. Creating a `Poll` instance
+    //!
+    //! Using Mio starts by creating a [`Poll`] instance, which monitors events
+    //! from the OS and puts them into [`Events`]. This allows us to execute I/O
+    //! operations based on what operations are ready.
+    //!
+    //! [`Poll`]: ../struct.Poll.html
+    //! [`Events`]: ../event/struct.Events.html
+    //!
+    #![cfg_attr(feature = "os-poll", doc = "```")]
+    #![cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+    //! # use mio::{Poll, Events};
+    //! # fn main() -> std::io::Result<()> {
+    //! // `Poll` allows for polling of readiness events.
+    //! let poll = Poll::new()?;
+    //! // `Events` is collection of readiness `Event`s and can be filled by
+    //! // calling `Poll::poll`.
+    //! let events = Events::with_capacity(128);
+    //! # drop((poll, events));
+    //! # Ok(())
+    //! # }
+    //! ```
+    //!
+    //! For example if we're using a [`TcpListener`],  we'll only want to
+    //! attempt to accept an incoming connection *iff* any connections are
+    //! queued and ready to be accepted. We don't want to waste our time if no
+    //! connections are ready.
+    //!
+    //! [`TcpListener`]: ../net/struct.TcpListener.html
+    //!
+    //! ## 2. Registering event source
+    //!
+    //! After we've created a [`Poll`] instance that monitors events from the OS
+    //! for us, we need to provide it with a source of events. This is done by
+    //! registering an [event source]. As the name “event source� suggests it is
+    //! a source of events which can be polled using a `Poll` instance. On Unix
+    //! systems this is usually a file descriptor, or a socket/handle on
+    //! Windows.
+    //!
+    //! In the example below we'll use a [`TcpListener`] for which we'll receive
+    //! an event (from [`Poll`]) once a connection is ready to be accepted.
+    //!
+    //! [event source]: ../event/trait.Source.html
+    //!
+    #![cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+    #![cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
+    //! # use mio::net::TcpListener;
+    //! # use mio::{Poll, Token, Interest};
+    //! # fn main() -> std::io::Result<()> {
+    //! # let poll = Poll::new()?;
+    //! # let address = "127.0.0.1:0".parse().unwrap();
+    //! // Create a `TcpListener`, binding it to `address`.
+    //! let mut listener = TcpListener::bind(address)?;
+    //!
+    //! // Next we register it with `Poll` to receive events for it. The `SERVER`
+    //! // `Token` is used to determine that we received an event for the listener
+    //! // later on.
+    //! const SERVER: Token = Token(0);
+    //! poll.registry().register(&mut listener, SERVER, Interest::READABLE)?;
+    //! # Ok(())
+    //! # }
+    //! ```
+    //!
+    //! Multiple event sources can be [registered] (concurrently), so we can
+    //! monitor multiple sources at a time.
+    //!
+    //! [registered]: ../struct.Registry.html#method.register
+    //!
+    //! ## 3. Creating the event loop
+    //!
+    //! After we've created a [`Poll`] instance and registered one or more
+    //! [event sources] with it, we can [poll] it for events. Polling for events
+    //! is simple, we need a container to store the events: [`Events`] and need
+    //! to do something based on the polled events (this part is up to you, we
+    //! can't do it all!). If we do this in a loop we've got ourselves an event
+    //! loop.
+    //!
+    //! The example below shows the event loop in action, completing our small
+    //! TCP server.
+    //!
+    //! [poll]: ../struct.Poll.html#method.poll
+    //! [event sources]: ../event/trait.Source.html
+    //!
+    #![cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+    #![cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
+    //! # use std::io;
+    //! # use std::time::Duration;
+    //! # use mio::net::TcpListener;
+    //! # use mio::{Poll, Token, Interest, Events};
+    //! # fn main() -> io::Result<()> {
+    //! # let mut poll = Poll::new()?;
+    //! # let mut events = Events::with_capacity(128);
+    //! # let address = "127.0.0.1:0".parse().unwrap();
+    //! # let mut listener = TcpListener::bind(address)?;
+    //! # const SERVER: Token = Token(0);
+    //! # poll.registry().register(&mut listener, SERVER, Interest::READABLE)?;
+    //! // Start our event loop.
+    //! loop {
+    //!     // Poll the OS for events, waiting at most 100 milliseconds.
+    //!     poll.poll(&mut events, Some(Duration::from_millis(100)))?;
+    //!
+    //!     // Process each event.
+    //!     for event in events.iter() {
+    //!         // We can use the token we previously provided to `register` to
+    //!         // determine for which type the event is.
+    //!         match event.token() {
+    //!             SERVER => loop {
+    //!                 // One or more connections are ready, so we'll attempt to
+    //!                 // accept them (in a loop).
+    //!                 match listener.accept() {
+    //!                     Ok((connection, address)) => {
+    //!                         println!("Got a connection from: {}", address);
+    //! #                       drop(connection);
+    //!                     },
+    //!                     // A "would block error" is returned if the operation
+    //!                     // is not ready, so we'll stop trying to accept
+    //!                     // connections.
+    //!                     Err(ref err) if would_block(err) => break,
+    //!                     Err(err) => return Err(err),
+    //!                 }
+    //!             }
+    //! #           _ => unreachable!(),
+    //!         }
+    //!     }
+    //! #   return Ok(());
+    //! }
+    //!
+    //! fn would_block(err: &io::Error) -> bool {
+    //!     err.kind() == io::ErrorKind::WouldBlock
+    //! }
+    //! # }
+    //! ```
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,70 @@
+//! Macros to ease conditional code based on enabled features.
+
+// Depending on the features not all macros are used.
+#![allow(unused_macros)]
+
+/// The `os-poll` feature is enabled.
+macro_rules! cfg_os_poll {
+    ($($item:item)*) => {
+        $(
+            #[cfg(feature = "os-poll")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "os-poll")))]
+            $item
+        )*
+    }
+}
+
+/// The `os-poll` feature is disabled.
+macro_rules! cfg_not_os_poll {
+    ($($item:item)*) => {
+        $(
+            #[cfg(not(feature = "os-poll"))]
+            $item
+        )*
+    }
+}
+
+/// The `os-ext` feature is enabled.
+macro_rules! cfg_os_ext {
+    ($($item:item)*) => {
+        $(
+            #[cfg(feature = "os-ext")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "os-ext")))]
+            $item
+        )*
+    }
+}
+
+/// The `net` feature is enabled.
+macro_rules! cfg_net {
+    ($($item:item)*) => {
+        $(
+            #[cfg(feature = "net")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "net")))]
+            $item
+        )*
+    }
+}
+
+/// One of the features enabled that needs `IoSource`. That is `net` or `os-ext`
+/// on Unix (for `pipe`).
+macro_rules! cfg_io_source {
+    ($($item:item)*) => {
+        $(
+            #[cfg(any(feature = "net", all(unix, feature = "os-ext")))]
+            #[cfg_attr(docsrs, doc(cfg(any(feature = "net", all(unix, feature = "os-ext")))))]
+            $item
+        )*
+    }
+}
+
+/// The `os-ext` feature is enabled, or one of the features that need `os-ext`.
+macro_rules! cfg_any_os_ext {
+    ($($item:item)*) => {
+        $(
+            #[cfg(any(feature = "os-ext", feature = "net"))]
+            #[cfg_attr(docsrs, doc(cfg(any(feature = "os-ext", feature = "net"))))]
+            $item
+        )*
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-//! Networking primitives
+//! Networking primitives.
 //!
 //! The types provided in this module are non-blocking by default and are
 //! designed to be portable across all supported Mio platforms. As long as the
@@ -8,7 +8,12 @@
 //! [portability guidelines]: ../struct.Poll.html#portability
 
 mod tcp;
-mod udp;
+pub use self::tcp::{TcpListener, TcpSocket, TcpStream, TcpKeepalive};
 
-pub use self::tcp::{TcpListener, TcpStream};
+mod udp;
 pub use self::udp::UdpSocket;
+
+#[cfg(unix)]
+mod uds;
+#[cfg(unix)]
+pub use self::uds::{SocketAddr, UnixDatagram, UnixListener, UnixStream};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp/listener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp/listener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp/listener.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp/listener.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,209 @@
+use std::net::{self, SocketAddr};
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+#[cfg(windows)]
+use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
+use std::{fmt, io};
+
+use super::{TcpSocket, TcpStream};
+use crate::io_source::IoSource;
+use crate::{event, sys, Interest, Registry, Token};
+
+/// A structure representing a socket server
+///
+/// # Examples
+///
+#[cfg_attr(feature = "os-poll", doc = "```")]
+#[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+/// # use std::error::Error;
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// use mio::{Events, Interest, Poll, Token};
+/// use mio::net::TcpListener;
+/// use std::time::Duration;
+///
+/// let mut listener = TcpListener::bind("127.0.0.1:34255".parse()?)?;
+///
+/// let mut poll = Poll::new()?;
+/// let mut events = Events::with_capacity(128);
+///
+/// // Register the socket with `Poll`
+/// poll.registry().register(&mut listener, Token(0), Interest::READABLE)?;
+///
+/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
+///
+/// // There may be a socket ready to be accepted
+/// #     Ok(())
+/// # }
+/// ```
+pub struct TcpListener {
+    inner: IoSource<net::TcpListener>,
+}
+
+impl TcpListener {
+    /// Convenience method to bind a new TCP listener to the specified address
+    /// to receive new connections.
+    ///
+    /// This function will take the following steps:
+    ///
+    /// 1. Create a new TCP socket.
+    /// 2. Set the `SO_REUSEADDR` option on the socket on Unix.
+    /// 3. Bind the socket to the specified address.
+    /// 4. Calls `listen` on the socket to prepare it to receive new connections.
+    pub fn bind(addr: SocketAddr) -> io::Result<TcpListener> {
+        let socket = TcpSocket::new_for_addr(addr)?;
+
+        // On platforms with Berkeley-derived sockets, this allows to quickly
+        // rebind a socket, without needing to wait for the OS to clean up the
+        // previous one.
+        //
+        // On Windows, this allows rebinding sockets which are actively in use,
+        // which allows “socket hijacking�, so we explicitly don't set it here.
+        // https://docs.microsoft.com/en-us/windows/win32/winsock/using-so-reuseaddr-and-so-exclusiveaddruse
+        #[cfg(not(windows))]
+        socket.set_reuseaddr(true)?;
+
+        socket.bind(addr)?;
+        socket.listen(1024)
+    }
+
+    /// Creates a new `TcpListener` from a standard `net::TcpListener`.
+    ///
+    /// This function is intended to be used to wrap a TCP listener from the
+    /// standard library in the Mio equivalent. The conversion assumes nothing
+    /// about the underlying listener; ; it is left up to the user to set it
+    /// in non-blocking mode.
+    pub fn from_std(listener: net::TcpListener) -> TcpListener {
+        TcpListener {
+            inner: IoSource::new(listener),
+        }
+    }
+
+    /// Accepts a new `TcpStream`.
+    ///
+    /// This may return an `Err(e)` where `e.kind()` is
+    /// `io::ErrorKind::WouldBlock`. This means a stream may be ready at a later
+    /// point and one should wait for an event before calling `accept` again.
+    ///
+    /// If an accepted stream is returned, the remote address of the peer is
+    /// returned along with it.
+    pub fn accept(&self) -> io::Result<(TcpStream, SocketAddr)> {
+        self.inner.do_io(|inner| {
+            sys::tcp::accept(inner).map(|(stream, addr)| (TcpStream::from_std(stream), addr))
+        })
+    }
+
+    /// Returns the local socket address of this listener.
+    pub fn local_addr(&self) -> io::Result<SocketAddr> {
+        self.inner.local_addr()
+    }
+
+    /// Sets the value for the `IP_TTL` option on this socket.
+    ///
+    /// This value sets the time-to-live field that is used in every packet sent
+    /// from this socket.
+    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
+        self.inner.set_ttl(ttl)
+    }
+
+    /// Gets the value of the `IP_TTL` option for this socket.
+    ///
+    /// For more information about this option, see [`set_ttl`][link].
+    ///
+    /// [link]: #method.set_ttl
+    pub fn ttl(&self) -> io::Result<u32> {
+        self.inner.ttl()
+    }
+
+    /// Get the value of the `SO_ERROR` option on this socket.
+    ///
+    /// This will retrieve the stored error in the underlying socket, clearing
+    /// the field in the process. This can be useful for checking errors between
+    /// calls.
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        self.inner.take_error()
+    }
+}
+
+impl event::Source for TcpListener {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        self.inner.deregister(registry)
+    }
+}
+
+impl fmt::Debug for TcpListener {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+#[cfg(unix)]
+impl IntoRawFd for TcpListener {
+    fn into_raw_fd(self) -> RawFd {
+        self.inner.into_inner().into_raw_fd()
+    }
+}
+
+#[cfg(unix)]
+impl AsRawFd for TcpListener {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+#[cfg(unix)]
+impl FromRawFd for TcpListener {
+    /// Converts a `RawFd` to a `TcpListener`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_fd(fd: RawFd) -> TcpListener {
+        TcpListener::from_std(FromRawFd::from_raw_fd(fd))
+    }
+}
+
+#[cfg(windows)]
+impl IntoRawSocket for TcpListener {
+    fn into_raw_socket(self) -> RawSocket {
+        self.inner.into_inner().into_raw_socket()
+    }
+}
+
+#[cfg(windows)]
+impl AsRawSocket for TcpListener {
+    fn as_raw_socket(&self) -> RawSocket {
+        self.inner.as_raw_socket()
+    }
+}
+
+#[cfg(windows)]
+impl FromRawSocket for TcpListener {
+    /// Converts a `RawSocket` to a `TcpListener`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_socket(socket: RawSocket) -> TcpListener {
+        TcpListener::from_std(FromRawSocket::from_raw_socket(socket))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+mod listener;
+pub use self::listener::TcpListener;
+
+mod socket;
+pub use self::socket::{TcpSocket, TcpKeepalive};
+
+mod stream;
+pub use self::stream::TcpStream;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp/socket.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp/socket.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp/socket.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp/socket.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,490 @@
+use std::io;
+use std::mem;
+use std::net::SocketAddr;
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+#[cfg(windows)]
+use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
+use std::time::Duration;
+
+use crate::net::{TcpListener, TcpStream};
+use crate::sys;
+
+/// A non-blocking TCP socket used to configure a stream or listener.
+///
+/// The `TcpSocket` type wraps the operating-system's socket handle. This type
+/// is used to configure the socket before establishing a connection or start
+/// listening for inbound connections.
+///
+/// The socket will be closed when the value is dropped.
+#[derive(Debug)]
+pub struct TcpSocket {
+    sys: sys::tcp::TcpSocket,
+}
+
+/// Configures a socket's TCP keepalive parameters.
+#[derive(Debug, Default, Clone)]
+pub struct TcpKeepalive {
+    pub(crate) time: Option<Duration>,
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "macos",
+        target_os = "ios",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "windows",
+    ))]
+    pub(crate) interval: Option<Duration>,
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "macos",
+        target_os = "ios",
+        target_os = "freebsd",
+        target_os = "netbsd",
+    ))]
+    pub(crate) retries: Option<u32>,
+}
+
+impl TcpSocket {
+    /// Create a new IPv4 TCP socket.
+    ///
+    /// This calls `socket(2)`.
+    pub fn new_v4() -> io::Result<TcpSocket> {
+        sys::tcp::new_v4_socket().map(|sys| TcpSocket { sys })
+    }
+
+    /// Create a new IPv6 TCP socket.
+    ///
+    /// This calls `socket(2)`.
+    pub fn new_v6() -> io::Result<TcpSocket> {
+        sys::tcp::new_v6_socket().map(|sys| TcpSocket { sys })
+    }
+
+    pub(crate) fn new_for_addr(addr: SocketAddr) -> io::Result<TcpSocket> {
+        if addr.is_ipv4() {
+            TcpSocket::new_v4()
+        } else {
+            TcpSocket::new_v6()
+        }
+    }
+
+    /// Bind `addr` to the TCP socket.
+    pub fn bind(&self, addr: SocketAddr) -> io::Result<()> {
+        sys::tcp::bind(self.sys, addr)
+    }
+
+    /// Connect the socket to `addr`.
+    ///
+    /// This consumes the socket and performs the connect operation. Once the
+    /// connection completes, the socket is now a non-blocking `TcpStream` and
+    /// can be used as such.
+    pub fn connect(self, addr: SocketAddr) -> io::Result<TcpStream> {
+        let stream = sys::tcp::connect(self.sys, addr)?;
+
+        // Don't close the socket
+        mem::forget(self);
+        Ok(TcpStream::from_std(stream))
+    }
+
+    /// Listen for inbound connections, converting the socket to a
+    /// `TcpListener`.
+    pub fn listen(self, backlog: u32) -> io::Result<TcpListener> {
+        let listener = sys::tcp::listen(self.sys, backlog)?;
+
+        // Don't close the socket
+        mem::forget(self);
+        Ok(TcpListener::from_std(listener))
+    }
+
+    /// Sets the value of `SO_REUSEADDR` on this socket.
+    pub fn set_reuseaddr(&self, reuseaddr: bool) -> io::Result<()> {
+        sys::tcp::set_reuseaddr(self.sys, reuseaddr)
+    }
+
+    /// Get the value of `SO_REUSEADDR` set on this socket.
+    pub fn get_reuseaddr(&self) -> io::Result<bool> {
+        sys::tcp::get_reuseaddr(self.sys)
+    }
+
+    /// Sets the value of `SO_REUSEPORT` on this socket.
+    /// Only supported available in unix
+    #[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
+    pub fn set_reuseport(&self, reuseport: bool) -> io::Result<()> {
+        sys::tcp::set_reuseport(self.sys, reuseport)
+    }
+
+    /// Get the value of `SO_REUSEPORT` set on this socket.
+    /// Only supported available in unix
+    #[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
+    pub fn get_reuseport(&self) -> io::Result<bool> {
+        sys::tcp::get_reuseport(self.sys)
+    }
+
+    /// Sets the value of `SO_LINGER` on this socket.
+    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
+        sys::tcp::set_linger(self.sys, dur)
+    }
+
+    /// Gets the value of `SO_LINGER` on this socket
+    pub fn get_linger(&self) -> io::Result<Option<Duration>> {
+        sys::tcp::get_linger(self.sys)
+    }
+
+    /// Sets the value of `SO_RCVBUF` on this socket.
+    pub fn set_recv_buffer_size(&self, size: u32) -> io::Result<()> {
+        sys::tcp::set_recv_buffer_size(self.sys, size)
+    }
+
+    /// Get the value of `SO_RCVBUF` set on this socket.
+    ///
+    /// Note that if [`set_recv_buffer_size`] has been called on this socket
+    /// previously, the value returned by this function may not be the same as
+    /// the argument provided to `set_recv_buffer_size`. This is for the
+    /// following reasons:
+    ///
+    /// * Most operating systems have minimum and maximum allowed sizes for the
+    ///   receive buffer, and will clamp the provided value if it is below the
+    ///   minimum or above the maximum. The minimum and maximum buffer sizes are
+    ///   OS-dependent.
+    /// * Linux will double the buffer size to account for internal bookkeeping
+    ///   data, and returns the doubled value from `getsockopt(2)`. As per `man
+    ///   7 socket`:
+    ///   > Sets or gets the maximum socket receive buffer in bytes. The
+    ///   > kernel doubles this value (to allow space for bookkeeping
+    ///   > overhead) when it is set using `setsockopt(2)`, and this doubled
+    ///   > value is returned by `getsockopt(2)`.
+    ///
+    /// [`set_recv_buffer_size`]: #method.set_recv_buffer_size
+    pub fn get_recv_buffer_size(&self) -> io::Result<u32> {
+        sys::tcp::get_recv_buffer_size(self.sys)
+    }
+
+    /// Sets the value of `SO_SNDBUF` on this socket.
+    pub fn set_send_buffer_size(&self, size: u32) -> io::Result<()> {
+        sys::tcp::set_send_buffer_size(self.sys, size)
+    }
+
+    /// Get the value of `SO_SNDBUF` set on this socket.
+    ///
+    /// Note that if [`set_send_buffer_size`] has been called on this socket
+    /// previously, the value returned by this function may not be the same as
+    /// the argument provided to `set_send_buffer_size`. This is for the
+    /// following reasons:
+    ///
+    /// * Most operating systems have minimum and maximum allowed sizes for the
+    ///   receive buffer, and will clamp the provided value if it is below the
+    ///   minimum or above the maximum. The minimum and maximum buffer sizes are
+    ///   OS-dependent.
+    /// * Linux will double the buffer size to account for internal bookkeeping
+    ///   data, and returns the doubled value from `getsockopt(2)`. As per `man
+    ///   7 socket`:
+    ///   > Sets or gets the maximum socket send buffer in bytes. The
+    ///   > kernel doubles this value (to allow space for bookkeeping
+    ///   > overhead) when it is set using `setsockopt(2)`, and this doubled
+    ///   > value is returned by `getsockopt(2)`.
+    ///
+    /// [`set_send_buffer_size`]: #method.set_send_buffer_size
+    pub fn get_send_buffer_size(&self) -> io::Result<u32> {
+        sys::tcp::get_send_buffer_size(self.sys)
+    }
+
+    /// Sets whether keepalive messages are enabled to be sent on this socket.
+    ///
+    /// This will set the `SO_KEEPALIVE` option on this socket.
+    pub fn set_keepalive(&self, keepalive: bool) -> io::Result<()> {
+        sys::tcp::set_keepalive(self.sys, keepalive)
+    }
+
+    /// Returns whether or not TCP keepalive probes will be sent by this socket.
+    pub fn get_keepalive(&self) -> io::Result<bool> {
+        sys::tcp::get_keepalive(self.sys)
+    }
+
+    /// Sets parameters configuring TCP keepalive probes for this socket.
+    ///
+    /// The supported parameters depend on the operating system, and are
+    /// configured using the [`TcpKeepalive`] struct. At a minimum, all systems
+    /// support configuring the [keepalive time]: the time after which the OS
+    /// will start sending keepalive messages on an idle connection.
+    ///
+    /// # Notes
+    ///
+    /// * This will enable TCP keepalive on this socket, if it is not already
+    ///   enabled.
+    /// * On some platforms, such as Windows, any keepalive parameters *not*
+    ///   configured by the `TcpKeepalive` struct passed to this function may be
+    ///   overwritten with their default values. Therefore, this function should
+    ///   either only be called once per socket, or the same parameters should
+    ///   be passed every time it is called.
+    ///
+    /// # Examples
+    #[cfg_attr(feature = "os-poll", doc = "```")]
+    #[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+    /// use mio::net::{TcpSocket, TcpKeepalive};
+    /// use std::time::Duration;
+    ///
+    /// # fn main() -> Result<(), std::io::Error> {
+    /// let socket = TcpSocket::new_v6()?;
+    /// let keepalive = TcpKeepalive::default()
+    ///     .with_time(Duration::from_secs(4));
+    ///     // Depending on the target operating system, we may also be able to
+    ///     // configure the keepalive probe interval and/or the number of retries
+    ///     // here as well.
+    ///
+    /// socket.set_keepalive_params(keepalive)?;
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// [`TcpKeepalive`]: ../struct.TcpKeepalive.html
+    /// [keepalive time]: ../struct.TcpKeepalive.html#method.with_time
+    pub fn set_keepalive_params(&self, keepalive: TcpKeepalive) -> io::Result<()> {
+        self.set_keepalive(true)?;
+        sys::tcp::set_keepalive_params(self.sys, keepalive)
+    }
+
+    /// Returns the amount of time after which TCP keepalive probes will be sent
+    /// on idle connections.
+    ///
+    /// If `None`, then keepalive messages are disabled.
+    ///
+    /// This returns the value of `SO_KEEPALIVE` + `IPPROTO_TCP` on OpenBSD,
+    /// NetBSD, and Haiku, `TCP_KEEPALIVE` on macOS and iOS, and `TCP_KEEPIDLE`
+    /// on all other Unix operating systems. On Windows, it is not possible to
+    /// access the value of TCP keepalive parameters after they have been set.
+    ///
+    /// Some platforms specify this value in seconds, so sub-second
+    /// specifications may be omitted.
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "windows"))))]
+    #[cfg(not(target_os = "windows"))]
+    pub fn get_keepalive_time(&self) -> io::Result<Option<Duration>> {
+        sys::tcp::get_keepalive_time(self.sys)
+    }
+
+    /// Returns the time interval between TCP keepalive probes, if TCP keepalive is
+    /// enabled on this socket.
+    ///
+    /// If `None`, then keepalive messages are disabled.
+    ///
+    /// This returns the value of `TCP_KEEPINTVL` on supported Unix operating
+    /// systems. On Windows, it is not possible to access the value of TCP
+    /// keepalive parameters after they have been set..
+    ///
+    /// Some platforms specify this value in seconds, so sub-second
+    /// specifications may be omitted.
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            target_os = "linux",
+            target_os = "macos",
+            target_os = "ios",
+            target_os = "freebsd",
+            target_os = "netbsd",
+        )))
+    )]
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "macos",
+        target_os = "ios",
+        target_os = "freebsd",
+        target_os = "netbsd",
+    ))]
+    pub fn get_keepalive_interval(&self) -> io::Result<Option<Duration>> {
+        sys::tcp::get_keepalive_interval(self.sys)
+    }
+
+    /// Returns the maximum number of TCP keepalive probes that will be sent before
+    /// dropping a connection, if TCP keepalive is enabled on this socket.
+    ///
+    /// If `None`, then keepalive messages are disabled.
+    ///
+    /// This returns the value of `TCP_KEEPCNT` on Unix operating systems that
+    /// support this option. On Windows, it is not possible to access the value
+    /// of TCP keepalive parameters after they have been set.
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            target_os = "linux",
+            target_os = "macos",
+            target_os = "ios",
+            target_os = "freebsd",
+            target_os = "netbsd",
+        )))
+    )]
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "macos",
+        target_os = "ios",
+        target_os = "freebsd",
+        target_os = "netbsd",
+    ))]
+    pub fn get_keepalive_retries(&self) -> io::Result<Option<u32>> {
+        sys::tcp::get_keepalive_retries(self.sys)
+    }
+
+    /// Returns the local address of this socket
+    ///
+    /// Will return `Err` result in windows if called before calling `bind`
+    pub fn get_localaddr(&self) -> io::Result<SocketAddr> {
+        sys::tcp::get_localaddr(self.sys)
+    }
+}
+
+impl Drop for TcpSocket {
+    fn drop(&mut self) {
+        sys::tcp::close(self.sys);
+    }
+}
+
+#[cfg(unix)]
+impl IntoRawFd for TcpSocket {
+    fn into_raw_fd(self) -> RawFd {
+        let ret = self.sys;
+        // Avoid closing the socket
+        mem::forget(self);
+        ret
+    }
+}
+
+#[cfg(unix)]
+impl AsRawFd for TcpSocket {
+    fn as_raw_fd(&self) -> RawFd {
+        self.sys
+    }
+}
+
+#[cfg(unix)]
+impl FromRawFd for TcpSocket {
+    /// Converts a `RawFd` to a `TcpSocket`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_fd(fd: RawFd) -> TcpSocket {
+        TcpSocket { sys: fd }
+    }
+}
+
+#[cfg(windows)]
+impl IntoRawSocket for TcpSocket {
+    fn into_raw_socket(self) -> RawSocket {
+        // The winapi crate defines `SOCKET` as `usize`. The Rust std
+        // conditionally defines `RawSocket` as a fixed size unsigned integer
+        // matching the pointer width. These end up being the same type but we
+        // must cast between them.
+        let ret = self.sys as RawSocket;
+
+        // Avoid closing the socket
+        mem::forget(self);
+
+        ret
+    }
+}
+
+#[cfg(windows)]
+impl AsRawSocket for TcpSocket {
+    fn as_raw_socket(&self) -> RawSocket {
+        self.sys as RawSocket
+    }
+}
+
+#[cfg(windows)]
+impl FromRawSocket for TcpSocket {
+    /// Converts a `RawSocket` to a `TcpSocket`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_socket(socket: RawSocket) -> TcpSocket {
+        TcpSocket {
+            sys: socket as sys::tcp::TcpSocket,
+        }
+    }
+}
+
+impl TcpKeepalive {
+    // Sets the amount of time after which TCP keepalive probes will be sent
+    /// on idle connections.
+    ///
+    /// This will set the value of `SO_KEEPALIVE` + `IPPROTO_TCP` on OpenBSD,
+    /// NetBSD, and Haiku, `TCP_KEEPALIVE` on macOS and iOS, and `TCP_KEEPIDLE`
+    /// on all other Unix operating systems. On Windows, this sets the value of
+    /// the `tcp_keepalive` struct's `keepalivetime` field.
+    ///
+    /// Some platforms specify this value in seconds, so sub-second
+    /// specifications may be omitted.
+    pub fn with_time(self, time: Duration) -> Self {
+        Self {
+            time: Some(time),
+            ..self
+        }
+    }
+
+    /// Sets the time interval between TCP keepalive probes.
+    /// This sets the value of `TCP_KEEPINTVL` on supported Unix operating
+    /// systems. On Windows, this sets the value of the `tcp_keepalive` struct's
+    /// `keepaliveinterval` field.
+    ///
+    /// Some platforms specify this value in seconds, so sub-second
+    /// specifications may be omitted.
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            target_os = "linux",
+            target_os = "macos",
+            target_os = "ios",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "windows"
+        )))
+    )]
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "macos",
+        target_os = "ios",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "windows"
+    ))]
+    pub fn with_interval(self, interval: Duration) -> Self {
+        Self {
+            interval: Some(interval),
+            ..self
+        }
+    }
+
+    /// Sets the maximum number of TCP keepalive probes that will be sent before
+    /// dropping a connection, if TCP keepalive is enabled on this socket.
+    ///
+    /// This will set the value of `TCP_KEEPCNT` on Unix operating systems that
+    /// support this option.
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            target_os = "linux",
+            target_os = "macos",
+            target_os = "ios",
+            target_os = "freebsd",
+            target_os = "netbsd",
+        )))
+    )]
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "macos",
+        target_os = "ios",
+        target_os = "freebsd",
+        target_os = "netbsd",
+    ))]
+    pub fn with_retries(self, retries: u32) -> Self {
+        Self {
+            retries: Some(retries),
+            ..self
+        }
+    }
+
+    /// Returns a new, empty set of TCP keepalive parameters.
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp/stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,305 @@
+use std::fmt;
+use std::io::{self, IoSlice, IoSliceMut, Read, Write};
+use std::net::{self, Shutdown, SocketAddr};
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+#[cfg(windows)]
+use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
+
+use crate::io_source::IoSource;
+use crate::net::TcpSocket;
+use crate::{event, Interest, Registry, Token};
+
+/// A non-blocking TCP stream between a local socket and a remote socket.
+///
+/// The socket will be closed when the value is dropped.
+///
+/// # Examples
+///
+#[cfg_attr(feature = "os-poll", doc = "```")]
+#[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+/// # use std::net::{TcpListener, SocketAddr};
+/// # use std::error::Error;
+/// #
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// let address: SocketAddr = "127.0.0.1:0".parse()?;
+/// let listener = TcpListener::bind(address)?;
+/// use mio::{Events, Interest, Poll, Token};
+/// use mio::net::TcpStream;
+/// use std::time::Duration;
+///
+/// let mut stream = TcpStream::connect(listener.local_addr()?)?;
+///
+/// let mut poll = Poll::new()?;
+/// let mut events = Events::with_capacity(128);
+///
+/// // Register the socket with `Poll`
+/// poll.registry().register(&mut stream, Token(0), Interest::WRITABLE)?;
+///
+/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
+///
+/// // The socket might be ready at this point
+/// #     Ok(())
+/// # }
+/// ```
+pub struct TcpStream {
+    inner: IoSource<net::TcpStream>,
+}
+
+impl TcpStream {
+    /// Create a new TCP stream and issue a non-blocking connect to the
+    /// specified address.
+    pub fn connect(addr: SocketAddr) -> io::Result<TcpStream> {
+        let socket = TcpSocket::new_for_addr(addr)?;
+        socket.connect(addr)
+    }
+
+    /// Creates a new `TcpStream` from a standard `net::TcpStream`.
+    ///
+    /// This function is intended to be used to wrap a TCP stream from the
+    /// standard library in the Mio equivalent. The conversion assumes nothing
+    /// about the underlying stream; it is left up to the user to set it in
+    /// non-blocking mode.
+    ///
+    /// # Note
+    ///
+    /// The TCP stream here will not have `connect` called on it, so it
+    /// should already be connected via some other means (be it manually, or
+    /// the standard library).
+    pub fn from_std(stream: net::TcpStream) -> TcpStream {
+        TcpStream {
+            inner: IoSource::new(stream),
+        }
+    }
+
+    /// Returns the socket address of the remote peer of this TCP connection.
+    pub fn peer_addr(&self) -> io::Result<SocketAddr> {
+        self.inner.peer_addr()
+    }
+
+    /// Returns the socket address of the local half of this TCP connection.
+    pub fn local_addr(&self) -> io::Result<SocketAddr> {
+        self.inner.local_addr()
+    }
+
+    /// Shuts down the read, write, or both halves of this connection.
+    ///
+    /// This function will cause all pending and future I/O on the specified
+    /// portions to return immediately with an appropriate value (see the
+    /// documentation of `Shutdown`).
+    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
+        self.inner.shutdown(how)
+    }
+
+    /// Sets the value of the `TCP_NODELAY` option on this socket.
+    ///
+    /// If set, this option disables the Nagle algorithm. This means that
+    /// segments are always sent as soon as possible, even if there is only a
+    /// small amount of data. When not set, data is buffered until there is a
+    /// sufficient amount to send out, thereby avoiding the frequent sending of
+    /// small packets.
+    ///
+    /// # Notes
+    ///
+    /// On Windows make sure the stream is connected before calling this method,
+    /// by receiving an (writable) event. Trying to set `nodelay` on an
+    /// unconnected `TcpStream` is undefined behavior.
+    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
+        self.inner.set_nodelay(nodelay)
+    }
+
+    /// Gets the value of the `TCP_NODELAY` option on this socket.
+    ///
+    /// For more information about this option, see [`set_nodelay`][link].
+    ///
+    /// [link]: #method.set_nodelay
+    ///
+    /// # Notes
+    ///
+    /// On Windows make sure the stream is connected before calling this method,
+    /// by receiving an (writable) event. Trying to get `nodelay` on an
+    /// unconnected `TcpStream` is undefined behavior.
+    pub fn nodelay(&self) -> io::Result<bool> {
+        self.inner.nodelay()
+    }
+
+    /// Sets the value for the `IP_TTL` option on this socket.
+    ///
+    /// This value sets the time-to-live field that is used in every packet sent
+    /// from this socket.
+    ///
+    /// # Notes
+    ///
+    /// On Windows make sure the stream is connected before calling this method,
+    /// by receiving an (writable) event. Trying to set `ttl` on an
+    /// unconnected `TcpStream` is undefined behavior.
+    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
+        self.inner.set_ttl(ttl)
+    }
+
+    /// Gets the value of the `IP_TTL` option for this socket.
+    ///
+    /// For more information about this option, see [`set_ttl`][link].
+    ///
+    /// # Notes
+    ///
+    /// On Windows make sure the stream is connected before calling this method,
+    /// by receiving an (writable) event. Trying to get `ttl` on an
+    /// unconnected `TcpStream` is undefined behavior.
+    ///
+    /// [link]: #method.set_ttl
+    pub fn ttl(&self) -> io::Result<u32> {
+        self.inner.ttl()
+    }
+
+    /// Get the value of the `SO_ERROR` option on this socket.
+    ///
+    /// This will retrieve the stored error in the underlying socket, clearing
+    /// the field in the process. This can be useful for checking errors between
+    /// calls.
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        self.inner.take_error()
+    }
+
+    /// Receives data on the socket from the remote address to which it is
+    /// connected, without removing that data from the queue. On success,
+    /// returns the number of bytes peeked.
+    ///
+    /// Successive calls return the same data. This is accomplished by passing
+    /// `MSG_PEEK` as a flag to the underlying recv system call.
+    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.peek(buf)
+    }
+}
+
+impl Read for TcpStream {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).read(buf))
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).read_vectored(bufs))
+    }
+}
+
+impl<'a> Read for &'a TcpStream {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).read(buf))
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).read_vectored(bufs))
+    }
+}
+
+impl Write for TcpStream {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).write(buf))
+    }
+
+    fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).write_vectored(bufs))
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.do_io(|inner| (&*inner).flush())
+    }
+}
+
+impl<'a> Write for &'a TcpStream {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).write(buf))
+    }
+
+    fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).write_vectored(bufs))
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.do_io(|inner| (&*inner).flush())
+    }
+}
+
+impl event::Source for TcpStream {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        self.inner.deregister(registry)
+    }
+}
+
+impl fmt::Debug for TcpStream {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+#[cfg(unix)]
+impl IntoRawFd for TcpStream {
+    fn into_raw_fd(self) -> RawFd {
+        self.inner.into_inner().into_raw_fd()
+    }
+}
+
+#[cfg(unix)]
+impl AsRawFd for TcpStream {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+#[cfg(unix)]
+impl FromRawFd for TcpStream {
+    /// Converts a `RawFd` to a `TcpStream`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_fd(fd: RawFd) -> TcpStream {
+        TcpStream::from_std(FromRawFd::from_raw_fd(fd))
+    }
+}
+
+#[cfg(windows)]
+impl IntoRawSocket for TcpStream {
+    fn into_raw_socket(self) -> RawSocket {
+        self.inner.into_inner().into_raw_socket()
+    }
+}
+
+#[cfg(windows)]
+impl AsRawSocket for TcpStream {
+    fn as_raw_socket(&self) -> RawSocket {
+        self.inner.as_raw_socket()
+    }
+}
+
+#[cfg(windows)]
+impl FromRawSocket for TcpStream {
+    /// Converts a `RawSocket` to a `TcpStream`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_socket(socket: RawSocket) -> TcpStream {
+        TcpStream::from_std(FromRawSocket::from_raw_socket(socket))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/tcp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/tcp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,737 +0,0 @@
-//! Primitives for working with TCP
-//!
-//! The types provided in this module are non-blocking by default and are
-//! designed to be portable across all supported Mio platforms. As long as the
-//! [portability guidelines] are followed, the behavior should be identical no
-//! matter the target platform.
-//!
-/// [portability guidelines]: ../struct.Poll.html#portability
-
-use std::fmt;
-use std::io::{Read, Write};
-use std::net::{self, SocketAddr, SocketAddrV4, SocketAddrV6, Ipv4Addr, Ipv6Addr};
-use std::time::Duration;
-
-use net2::TcpBuilder;
-use iovec::IoVec;
-
-use {io, sys, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use poll::SelectorId;
-
-/*
- *
- * ===== TcpStream =====
- *
- */
-
-/// A non-blocking TCP stream between a local socket and a remote socket.
-///
-/// The socket will be closed when the value is dropped.
-///
-/// # Examples
-///
-/// ```
-/// # use std::net::TcpListener;
-/// # use std::error::Error;
-/// #
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// #     let _listener = TcpListener::bind("127.0.0.1:34254")?;
-/// use mio::{Events, Ready, Poll, PollOpt, Token};
-/// use mio::net::TcpStream;
-/// use std::time::Duration;
-///
-/// let stream = TcpStream::connect(&"127.0.0.1:34254".parse()?)?;
-///
-/// let poll = Poll::new()?;
-/// let mut events = Events::with_capacity(128);
-///
-/// // Register the socket with `Poll`
-/// poll.register(&stream, Token(0), Ready::writable(),
-///               PollOpt::edge())?;
-///
-/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
-///
-/// // The socket might be ready at this point
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-pub struct TcpStream {
-    sys: sys::TcpStream,
-    selector_id: SelectorId,
-}
-
-use std::net::Shutdown;
-
-// TODO: remove when fuchsia's set_nonblocking is fixed in libstd
-#[cfg(target_os = "fuchsia")]
-fn set_nonblocking(stream: &net::TcpStream) -> io::Result<()> {
-    sys::set_nonblock(
-        ::std::os::unix::io::AsRawFd::as_raw_fd(stream))
-}
-#[cfg(not(target_os = "fuchsia"))]
-fn set_nonblocking(stream: &net::TcpStream) -> io::Result<()> {
-    stream.set_nonblocking(true)
-}
-
-
-impl TcpStream {
-    /// Create a new TCP stream and issue a non-blocking connect to the
-    /// specified address.
-    ///
-    /// This convenience method is available and uses the system's default
-    /// options when creating a socket which is then connected. If fine-grained
-    /// control over the creation of the socket is desired, you can use
-    /// `net2::TcpBuilder` to configure a socket and then pass its socket to
-    /// `TcpStream::connect_stream` to transfer ownership into mio and schedule
-    /// the connect operation.
-    pub fn connect(addr: &SocketAddr) -> io::Result<TcpStream> {
-        let sock = match *addr {
-            SocketAddr::V4(..) => TcpBuilder::new_v4(),
-            SocketAddr::V6(..) => TcpBuilder::new_v6(),
-        }?;
-        // Required on Windows for a future `connect_overlapped` operation to be
-        // executed successfully.
-        if cfg!(windows) {
-            sock.bind(&inaddr_any(addr))?;
-        }
-        TcpStream::connect_stream(sock.to_tcp_stream()?, addr)
-    }
-
-    /// Creates a new `TcpStream` from the pending socket inside the given
-    /// `std::net::TcpBuilder`, connecting it to the address specified.
-    ///
-    /// This constructor allows configuring the socket before it's actually
-    /// connected, and this function will transfer ownership to the returned
-    /// `TcpStream` if successful. An unconnected `TcpStream` can be created
-    /// with the `net2::TcpBuilder` type (and also configured via that route).
-    ///
-    /// The platform specific behavior of this function looks like:
-    ///
-    /// * On Unix, the socket is placed into nonblocking mode and then a
-    ///   `connect` call is issued.
-    ///
-    /// * On Windows, the address is stored internally and the connect operation
-    ///   is issued when the returned `TcpStream` is registered with an event
-    ///   loop. Note that on Windows you must `bind` a socket before it can be
-    ///   connected, so if a custom `TcpBuilder` is used it should be bound
-    ///   (perhaps to `INADDR_ANY`) before this method is called.
-    pub fn connect_stream(stream: net::TcpStream,
-                          addr: &SocketAddr) -> io::Result<TcpStream> {
-        Ok(TcpStream {
-            sys: sys::TcpStream::connect(stream, addr)?,
-            selector_id: SelectorId::new(),
-        })
-    }
-
-    /// Creates a new `TcpStream` from a standard `net::TcpStream`.
-    ///
-    /// This function is intended to be used to wrap a TCP stream from the
-    /// standard library in the mio equivalent. The conversion here will
-    /// automatically set `stream` to nonblocking and the returned object should
-    /// be ready to get associated with an event loop.
-    ///
-    /// Note that the TCP stream here will not have `connect` called on it, so
-    /// it should already be connected via some other means (be it manually, the
-    /// net2 crate, or the standard library).
-    pub fn from_stream(stream: net::TcpStream) -> io::Result<TcpStream> {
-        set_nonblocking(&stream)?;
-
-        Ok(TcpStream {
-            sys: sys::TcpStream::from_stream(stream),
-            selector_id: SelectorId::new(),
-        })
-    }
-
-    /// Returns the socket address of the remote peer of this TCP connection.
-    pub fn peer_addr(&self) -> io::Result<SocketAddr> {
-        self.sys.peer_addr()
-    }
-
-    /// Returns the socket address of the local half of this TCP connection.
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.sys.local_addr()
-    }
-
-    /// Creates a new independently owned handle to the underlying socket.
-    ///
-    /// The returned `TcpStream` is a reference to the same stream that this
-    /// object references. Both handles will read and write the same stream of
-    /// data, and options set on one stream will be propagated to the other
-    /// stream.
-    pub fn try_clone(&self) -> io::Result<TcpStream> {
-        self.sys.try_clone().map(|s| {
-            TcpStream {
-                sys: s,
-                selector_id: self.selector_id.clone(),
-            }
-        })
-    }
-
-    /// Shuts down the read, write, or both halves of this connection.
-    ///
-    /// This function will cause all pending and future I/O on the specified
-    /// portions to return immediately with an appropriate value (see the
-    /// documentation of `Shutdown`).
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        self.sys.shutdown(how)
-    }
-
-    /// Sets the value of the `TCP_NODELAY` option on this socket.
-    ///
-    /// If set, this option disables the Nagle algorithm. This means that
-    /// segments are always sent as soon as possible, even if there is only a
-    /// small amount of data. When not set, data is buffered until there is a
-    /// sufficient amount to send out, thereby avoiding the frequent sending of
-    /// small packets.
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        self.sys.set_nodelay(nodelay)
-    }
-
-    /// Gets the value of the `TCP_NODELAY` option on this socket.
-    ///
-    /// For more information about this option, see [`set_nodelay`][link].
-    ///
-    /// [link]: #method.set_nodelay
-    pub fn nodelay(&self) -> io::Result<bool> {
-        self.sys.nodelay()
-    }
-
-    /// Sets the value of the `SO_RCVBUF` option on this socket.
-    ///
-    /// Changes the size of the operating system's receive buffer associated
-    /// with the socket.
-    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.sys.set_recv_buffer_size(size)
-    }
-
-    /// Gets the value of the `SO_RCVBUF` option on this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_recv_buffer_size`][link].
-    ///
-    /// [link]: #method.set_recv_buffer_size
-    pub fn recv_buffer_size(&self) -> io::Result<usize> {
-        self.sys.recv_buffer_size()
-    }
-
-    /// Sets the value of the `SO_SNDBUF` option on this socket.
-    ///
-    /// Changes the size of the operating system's send buffer associated with
-    /// the socket.
-    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.sys.set_send_buffer_size(size)
-    }
-
-    /// Gets the value of the `SO_SNDBUF` option on this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_send_buffer_size`][link].
-    ///
-    /// [link]: #method.set_send_buffer_size
-    pub fn send_buffer_size(&self) -> io::Result<usize> {
-        self.sys.send_buffer_size()
-    }
-
-    /// Sets whether keepalive messages are enabled to be sent on this socket.
-    ///
-    /// On Unix, this option will set the `SO_KEEPALIVE` as well as the
-    /// `TCP_KEEPALIVE` or `TCP_KEEPIDLE` option (depending on your platform).
-    /// On Windows, this will set the `SIO_KEEPALIVE_VALS` option.
-    ///
-    /// If `None` is specified then keepalive messages are disabled, otherwise
-    /// the duration specified will be the time to remain idle before sending a
-    /// TCP keepalive probe.
-    ///
-    /// Some platforms specify this value in seconds, so sub-second
-    /// specifications may be omitted.
-    pub fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
-        self.sys.set_keepalive(keepalive)
-    }
-
-    /// Returns whether keepalive messages are enabled on this socket, and if so
-    /// the duration of time between them.
-    ///
-    /// For more information about this option, see [`set_keepalive`][link].
-    ///
-    /// [link]: #method.set_keepalive
-    pub fn keepalive(&self) -> io::Result<Option<Duration>> {
-        self.sys.keepalive()
-    }
-
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This value sets the time-to-live field that is used in every packet sent
-    /// from this socket.
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.sys.set_ttl(ttl)
-    }
-
-    /// Gets the value of the `IP_TTL` option for this socket.
-    ///
-    /// For more information about this option, see [`set_ttl`][link].
-    ///
-    /// [link]: #method.set_ttl
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.sys.ttl()
-    }
-
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
-    ///
-    /// If this is set to `true` then the socket is restricted to sending and
-    /// receiving IPv6 packets only. In this case two IPv4 and IPv6 applications
-    /// can bind the same port at the same time.
-    ///
-    /// If this is set to `false` then the socket can be used to send and
-    /// receive packets from an IPv4-mapped IPv6 address.
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.sys.set_only_v6(only_v6)
-    }
-
-    /// Gets the value of the `IPV6_V6ONLY` option for this socket.
-    ///
-    /// For more information about this option, see [`set_only_v6`][link].
-    ///
-    /// [link]: #method.set_only_v6
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.sys.only_v6()
-    }
-
-    /// Sets the value for the `SO_LINGER` option on this socket.
-    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.sys.set_linger(dur)
-    }
-
-    /// Gets the value of the `SO_LINGER` option on this socket.
-    ///
-    /// For more information about this option, see [`set_linger`][link].
-    ///
-    /// [link]: #method.set_linger
-    pub fn linger(&self) -> io::Result<Option<Duration>> {
-        self.sys.linger()
-    }
-
-    #[deprecated(since = "0.6.9", note = "use set_keepalive")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    pub fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
-        self.set_keepalive(keepalive.map(|v| {
-            Duration::from_millis(u64::from(v))
-        }))
-    }
-
-    #[deprecated(since = "0.6.9", note = "use keepalive")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    pub fn keepalive_ms(&self) -> io::Result<Option<u32>> {
-        self.keepalive().map(|v| {
-            v.map(|v| {
-                ::convert::millis(v) as u32
-            })
-        })
-    }
-
-    /// Get the value of the `SO_ERROR` option on this socket.
-    ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.sys.take_error()
-    }
-
-    /// Receives data on the socket from the remote address to which it is
-    /// connected, without removing that data from the queue. On success,
-    /// returns the number of bytes peeked.
-    ///
-    /// Successive calls return the same data. This is accomplished by passing
-    /// `MSG_PEEK` as a flag to the underlying recv system call.
-    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.sys.peek(buf)
-    }
-
-    /// Read in a list of buffers all at once.
-    ///
-    /// This operation will attempt to read bytes from this socket and place
-    /// them into the list of buffers provided. Note that each buffer is an
-    /// `IoVec` which can be created from a byte slice.
-    ///
-    /// The buffers provided will be filled in sequentially. A buffer will be
-    /// entirely filled up before the next is written to.
-    ///
-    /// The number of bytes read is returned, if successful, or an error is
-    /// returned otherwise. If no bytes are available to be read yet then
-    /// a "would block" error is returned. This operation does not block.
-    ///
-    /// On Unix this corresponds to the `readv` syscall.
-    pub fn read_bufs(&self, bufs: &mut [&mut IoVec]) -> io::Result<usize> {
-        self.sys.readv(bufs)
-    }
-
-    /// Write a list of buffers all at once.
-    ///
-    /// This operation will attempt to write a list of byte buffers to this
-    /// socket. Note that each buffer is an `IoVec` which can be created from a
-    /// byte slice.
-    ///
-    /// The buffers provided will be written sequentially. A buffer will be
-    /// entirely written before the next is written.
-    ///
-    /// The number of bytes written is returned, if successful, or an error is
-    /// returned otherwise. If the socket is not currently writable then a
-    /// "would block" error is returned. This operation does not block.
-    ///
-    /// On Unix this corresponds to the `writev` syscall.
-    pub fn write_bufs(&self, bufs: &[&IoVec]) -> io::Result<usize> {
-        self.sys.writev(bufs)
-    }
-}
-
-fn inaddr_any(other: &SocketAddr) -> SocketAddr {
-    match *other {
-        SocketAddr::V4(..) => {
-            let any = Ipv4Addr::new(0, 0, 0, 0);
-            let addr = SocketAddrV4::new(any, 0);
-            SocketAddr::V4(addr)
-        }
-        SocketAddr::V6(..) => {
-            let any = Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0);
-            let addr = SocketAddrV6::new(any, 0, 0, 0);
-            SocketAddr::V6(addr)
-        }
-    }
-}
-
-impl Read for TcpStream {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        (&self.sys).read(buf)
-    }
-}
-
-impl<'a> Read for &'a TcpStream {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        (&self.sys).read(buf)
-    }
-}
-
-impl Write for TcpStream {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        (&self.sys).write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&self.sys).flush()
-    }
-}
-
-impl<'a> Write for &'a TcpStream {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        (&self.sys).write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&self.sys).flush()
-    }
-}
-
-impl Evented for TcpStream {
-    fn register(&self, poll: &Poll, token: Token,
-                interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.selector_id.associate_selector(poll)?;
-        self.sys.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token,
-                  interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.sys.deregister(poll)
-    }
-}
-
-impl fmt::Debug for TcpStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(&self.sys, f)
-    }
-}
-
-/*
- *
- * ===== TcpListener =====
- *
- */
-
-/// A structure representing a socket server
-///
-/// # Examples
-///
-/// ```
-/// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Events, Ready, Poll, PollOpt, Token};
-/// use mio::net::TcpListener;
-/// use std::time::Duration;
-///
-/// let listener = TcpListener::bind(&"127.0.0.1:34255".parse()?)?;
-///
-/// let poll = Poll::new()?;
-/// let mut events = Events::with_capacity(128);
-///
-/// // Register the socket with `Poll`
-/// poll.register(&listener, Token(0), Ready::readable(),
-///               PollOpt::edge())?;
-///
-/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
-///
-/// // There may be a socket ready to be accepted
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-pub struct TcpListener {
-    sys: sys::TcpListener,
-    selector_id: SelectorId,
-}
-
-impl TcpListener {
-    /// Convenience method to bind a new TCP listener to the specified address
-    /// to receive new connections.
-    ///
-    /// This function will take the following steps:
-    ///
-    /// 1. Create a new TCP socket.
-    /// 2. Set the `SO_REUSEADDR` option on the socket.
-    /// 3. Bind the socket to the specified address.
-    /// 4. Call `listen` on the socket to prepare it to receive new connections.
-    ///
-    /// If fine-grained control over the binding and listening process for a
-    /// socket is desired then the `net2::TcpBuilder` methods can be used in
-    /// combination with the `TcpListener::from_listener` method to transfer
-    /// ownership into mio.
-    pub fn bind(addr: &SocketAddr) -> io::Result<TcpListener> {
-        // Create the socket
-        let sock = match *addr {
-            SocketAddr::V4(..) => TcpBuilder::new_v4(),
-            SocketAddr::V6(..) => TcpBuilder::new_v6(),
-        }?;
-
-        // Set SO_REUSEADDR, but only on Unix (mirrors what libstd does)
-        if cfg!(unix) {
-            sock.reuse_address(true)?;
-        }
-
-        // Bind the socket
-        sock.bind(addr)?;
-
-        // listen
-        let listener = sock.listen(1024)?;
-        Ok(TcpListener {
-            sys: sys::TcpListener::new(listener)?,
-            selector_id: SelectorId::new(),
-        })
-    }
-
-    #[deprecated(since = "0.6.13", note = "use from_std instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    pub fn from_listener(listener: net::TcpListener, _: &SocketAddr)
-                         -> io::Result<TcpListener> {
-        TcpListener::from_std(listener)
-    }
-
-    /// Creates a new `TcpListener` from an instance of a
-    /// `std::net::TcpListener` type.
-    ///
-    /// This function will set the `listener` provided into nonblocking mode on
-    /// Unix, and otherwise the stream will just be wrapped up in an mio stream
-    /// ready to accept new connections and become associated with an event
-    /// loop.
-    ///
-    /// The address provided must be the address that the listener is bound to.
-    pub fn from_std(listener: net::TcpListener) -> io::Result<TcpListener> {
-        sys::TcpListener::new(listener).map(|s| {
-            TcpListener {
-                sys: s,
-                selector_id: SelectorId::new(),
-            }
-        })
-    }
-
-    /// Accepts a new `TcpStream`.
-    ///
-    /// This may return an `Err(e)` where `e.kind()` is
-    /// `io::ErrorKind::WouldBlock`. This means a stream may be ready at a later
-    /// point and one should wait for a notification before calling `accept`
-    /// again.
-    ///
-    /// If an accepted stream is returned, the remote address of the peer is
-    /// returned along with it.
-    pub fn accept(&self) -> io::Result<(TcpStream, SocketAddr)> {
-        let (s, a) = try!(self.accept_std());
-        Ok((TcpStream::from_stream(s)?, a))
-    }
-
-    /// Accepts a new `std::net::TcpStream`.
-    ///
-    /// This method is the same as `accept`, except that it returns a TCP socket
-    /// *in blocking mode* which isn't bound to `mio`. This can be later then
-    /// converted to a `mio` type, if necessary.
-    pub fn accept_std(&self) -> io::Result<(net::TcpStream, SocketAddr)> {
-        self.sys.accept()
-    }
-
-    /// Returns the local socket address of this listener.
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.sys.local_addr()
-    }
-
-    /// Creates a new independently owned handle to the underlying socket.
-    ///
-    /// The returned `TcpListener` is a reference to the same socket that this
-    /// object references. Both handles can be used to accept incoming
-    /// connections and options set on one listener will affect the other.
-    pub fn try_clone(&self) -> io::Result<TcpListener> {
-        self.sys.try_clone().map(|s| {
-            TcpListener {
-                sys: s,
-                selector_id: self.selector_id.clone(),
-            }
-        })
-    }
-
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This value sets the time-to-live field that is used in every packet sent
-    /// from this socket.
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.sys.set_ttl(ttl)
-    }
-
-    /// Gets the value of the `IP_TTL` option for this socket.
-    ///
-    /// For more information about this option, see [`set_ttl`][link].
-    ///
-    /// [link]: #method.set_ttl
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.sys.ttl()
-    }
-
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
-    ///
-    /// If this is set to `true` then the socket is restricted to sending and
-    /// receiving IPv6 packets only. In this case two IPv4 and IPv6 applications
-    /// can bind the same port at the same time.
-    ///
-    /// If this is set to `false` then the socket can be used to send and
-    /// receive packets from an IPv4-mapped IPv6 address.
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.sys.set_only_v6(only_v6)
-    }
-
-    /// Gets the value of the `IPV6_V6ONLY` option for this socket.
-    ///
-    /// For more information about this option, see [`set_only_v6`][link].
-    ///
-    /// [link]: #method.set_only_v6
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.sys.only_v6()
-    }
-
-    /// Get the value of the `SO_ERROR` option on this socket.
-    ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.sys.take_error()
-    }
-}
-
-impl Evented for TcpListener {
-    fn register(&self, poll: &Poll, token: Token,
-                interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.selector_id.associate_selector(poll)?;
-        self.sys.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token,
-                  interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.sys.deregister(poll)
-    }
-}
-
-impl fmt::Debug for TcpListener {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(&self.sys, f)
-    }
-}
-
-/*
- *
- * ===== UNIX ext =====
- *
- */
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-use std::os::unix::io::{IntoRawFd, AsRawFd, FromRawFd, RawFd};
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl IntoRawFd for TcpStream {
-    fn into_raw_fd(self) -> RawFd {
-        self.sys.into_raw_fd()
-    }
-}
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl AsRawFd for TcpStream {
-    fn as_raw_fd(&self) -> RawFd {
-        self.sys.as_raw_fd()
-    }
-}
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl FromRawFd for TcpStream {
-    unsafe fn from_raw_fd(fd: RawFd) -> TcpStream {
-        TcpStream {
-            sys: FromRawFd::from_raw_fd(fd),
-            selector_id: SelectorId::new(),
-        }
-    }
-}
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl IntoRawFd for TcpListener {
-    fn into_raw_fd(self) -> RawFd {
-        self.sys.into_raw_fd()
-    }
-}
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl AsRawFd for TcpListener {
-    fn as_raw_fd(&self) -> RawFd {
-        self.sys.as_raw_fd()
-    }
-}
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl FromRawFd for TcpListener {
-    unsafe fn from_raw_fd(fd: RawFd) -> TcpListener {
-        TcpListener {
-            sys: FromRawFd::from_raw_fd(fd),
-            selector_id: SelectorId::new(),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/udp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/udp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,23 @@
-//! Primitives for working with UDP
+//! Primitives for working with UDP.
 //!
 //! The types provided in this module are non-blocking by default and are
 //! designed to be portable across all supported Mio platforms. As long as the
 //! [portability guidelines] are followed, the behavior should be identical no
 //! matter the target platform.
 //!
-/// [portability guidelines]: ../struct.Poll.html#portability
+//! [portability guidelines]: ../struct.Poll.html#portability
 
-use {io, sys, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use poll::SelectorId;
-use std::fmt;
-use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr};
+use crate::io_source::IoSource;
+use crate::{event, sys, Interest, Registry, Token};
 
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-use iovec::IoVec;
+use std::fmt;
+use std::io;
+use std::net;
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+#[cfg(windows)]
+use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
 
 /// A User Datagram Protocol socket.
 ///
@@ -24,16 +27,17 @@
 ///
 /// # Examples
 ///
-/// ```
+#[cfg_attr(feature = "os-poll", doc = "```")]
+#[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
 /// # use std::error::Error;
 /// #
-/// # fn try_main() -> Result<(), Box<Error>> {
+/// # fn main() -> Result<(), Box<dyn Error>> {
 /// // An Echo program:
 /// // SENDER -> sends a message.
 /// // ECHOER -> listens and prints the message received.
 ///
 /// use mio::net::UdpSocket;
-/// use mio::{Events, Ready, Poll, PollOpt, Token};
+/// use mio::{Events, Interest, Poll, Token};
 /// use std::time::Duration;
 ///
 /// const SENDER: Token = Token(0);
@@ -41,20 +45,20 @@
 ///
 /// // This operation will fail if the address is in use, so we select different ports for each
 /// // socket.
-/// let sender_socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
-/// let echoer_socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
+/// let mut sender_socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
+/// let mut echoer_socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
 ///
 /// // If we do not use connect here, SENDER and ECHOER would need to call send_to and recv_from
 /// // respectively.
-/// sender_socket.connect(echoer_socket.local_addr().unwrap())?;
+/// sender_socket.connect(echoer_socket.local_addr()?)?;
 ///
 /// // We need a Poll to check if SENDER is ready to be written into, and if ECHOER is ready to be
 /// // read from.
-/// let poll = Poll::new()?;
+/// let mut poll = Poll::new()?;
 ///
 /// // We register our sockets here so that we can check if they are ready to be written/read.
-/// poll.register(&sender_socket, SENDER, Ready::writable(), PollOpt::edge())?;
-/// poll.register(&echoer_socket, ECHOER, Ready::readable(), PollOpt::edge())?;
+/// poll.registry().register(&mut sender_socket, SENDER, Interest::WRITABLE)?;
+/// poll.registry().register(&mut echoer_socket, ECHOER, Interest::READABLE)?;
 ///
 /// let msg_to_send = [9; 9];
 /// let mut buffer = [0; 9];
@@ -75,23 +79,17 @@
 ///                 let num_recv = echoer_socket.recv(&mut buffer)?;
 ///                 println!("echo {:?} -> {:?}", buffer, num_recv);
 ///                 buffer = [0; 9];
+///                 # drop(buffer); // Silence unused assignment warning.
 ///                 # return Ok(());
 ///             }
 ///             _ => unreachable!()
 ///         }
 ///     }
 /// }
-/// #
-/// #   Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #   try_main().unwrap();
 /// # }
 /// ```
 pub struct UdpSocket {
-    sys: sys::UdpSocket,
-    selector_id: SelectorId,
+    inner: IoSource<net::UdpSocket>,
 }
 
 impl UdpSocket {
@@ -99,14 +97,15 @@
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(feature = "os-poll", doc = "```")]
+    #[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
     /// # use std::error::Error;
     /// #
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
     /// // We must bind it to an open address.
-    /// let socket = match UdpSocket::bind(&"127.0.0.1:0".parse()?) {
+    /// let socket = match UdpSocket::bind("127.0.0.1:0".parse()?) {
     ///     Ok(new_socket) => new_socket,
     ///     Err(fail) => {
     ///         // We panic! here, but you could try to bind it again on another address.
@@ -115,33 +114,24 @@
     /// };
     ///
     /// // Our socket was created, but we should not use it before checking it's readiness.
+    /// #    drop(socket); // Silence unused variable warning.
     /// #    Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
-    /// # }
     /// ```
-    pub fn bind(addr: &SocketAddr) -> io::Result<UdpSocket> {
-        let socket = net::UdpSocket::bind(addr)?;
-        UdpSocket::from_socket(socket)
-    }
-
-    /// Creates a new mio-wrapped socket from an underlying and bound std
-    /// socket.
-    ///
-    /// This function requires that `socket` has previously been bound to an
-    /// address to work correctly, and returns an I/O object which can be used
-    /// with mio to send/receive UDP messages.
-    ///
-    /// This can be used in conjunction with net2's `UdpBuilder` interface to
-    /// configure a socket before it's handed off to mio, such as setting
-    /// options like `reuse_address` or binding to multiple addresses.
-    pub fn from_socket(socket: net::UdpSocket) -> io::Result<UdpSocket> {
-        Ok(UdpSocket {
-            sys: sys::UdpSocket::new(socket)?,
-            selector_id: SelectorId::new(),
-        })
+    pub fn bind(addr: SocketAddr) -> io::Result<UdpSocket> {
+        sys::udp::bind(addr).map(UdpSocket::from_std)
+    }
+
+    /// Creates a new `UdpSocket` from a standard `net::UdpSocket`.
+    ///
+    /// This function is intended to be used to wrap a UDP socket from the
+    /// standard library in the Mio equivalent. The conversion assumes nothing
+    /// about the underlying socket; it is left up to the user to set it in
+    /// non-blocking mode.
+    pub fn from_std(socket: net::UdpSocket) -> UdpSocket {
+        UdpSocket {
+            inner: IoSource::new(socket),
+        }
     }
 
     /// Returns the socket address that this socket was created from.
@@ -151,143 +141,164 @@
     // This assertion is almost, but not quite, universal.  It fails on
     // shared-IP FreeBSD jails.  It's hard for mio to know whether we're jailed,
     // so simply disable the test on FreeBSD.
-    #[cfg_attr(not(target_os = "freebsd"), doc = " ```")]
-    #[cfg_attr(target_os = "freebsd", doc = " ```no_run")]
+    #[cfg_attr(all(feature = "os-poll", not(target_os = "freebsd")), doc = "```")]
+    #[cfg_attr(
+        any(not(feature = "os-poll"), target_os = "freebsd"),
+        doc = "```ignore"
+    )]
     /// # use std::error::Error;
     /// #
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
     /// let addr = "127.0.0.1:0".parse()?;
-    /// let socket = UdpSocket::bind(&addr)?;
+    /// let socket = UdpSocket::bind(addr)?;
+    /// assert_eq!(socket.local_addr()?.ip(), addr.ip());
     /// #    Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
-    /// # }
     /// ```
     pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.sys.local_addr()
+        self.inner.local_addr()
     }
 
-    /// Creates a new independently owned handle to the underlying socket.
+    /// Sends data on the socket to the given address. On success, returns the
+    /// number of bytes written.
     ///
-    /// The returned `UdpSocket` is a reference to the same socket that this
-    /// object references. Both handles will read and write the same port, and
-    /// options set on one socket will be propagated to the other.
+    /// Address type can be any implementor of `ToSocketAddrs` trait. See its
+    /// documentation for concrete examples.
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # use std::error::Error;
-    /// #
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
-    /// // We must bind it to an open address.
-    /// let socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
-    /// let cloned_socket = socket.try_clone()?;
+    /// let socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
     ///
-    /// assert_eq!(socket.local_addr()?, cloned_socket.local_addr()?);
+    /// // We must check if the socket is writable before calling send_to,
+    /// // or we could run into a WouldBlock error.
     ///
-    /// #    Ok(())
-    /// # }
+    /// let bytes_sent = socket.send_to(&[9; 9], "127.0.0.1:11100".parse()?)?;
+    /// assert_eq!(bytes_sent, 9);
     /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
+    /// #    Ok(())
     /// # }
     /// ```
-    pub fn try_clone(&self) -> io::Result<UdpSocket> {
-        self.sys.try_clone()
-            .map(|s| {
-                UdpSocket {
-                    sys: s,
-                    selector_id: self.selector_id.clone(),
-                }
-            })
+    pub fn send_to(&self, buf: &[u8], target: SocketAddr) -> io::Result<usize> {
+        self.inner.do_io(|inner| inner.send_to(buf, target))
     }
 
-    /// Sends data on the socket to the given address. On success, returns the
-    /// number of bytes written.
+    /// Receives data from the socket. On success, returns the number of bytes
+    /// read and the address from whence the data came.
     ///
-    /// Address type can be any implementor of `ToSocketAddrs` trait. See its
-    /// documentation for concrete examples.
+    /// # Notes
+    ///
+    /// On Windows, if the data is larger than the buffer specified, the buffer
+    /// is filled with the first part of the data, and recv_from returns the error
+    /// WSAEMSGSIZE(10040). The excess data is lost.
+    /// Make sure to always use a sufficiently large buffer to hold the
+    /// maximum UDP packet size, which can be up to 65536 bytes in size.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// #
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
-    /// let socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
+    /// let socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
     ///
-    /// // We must check if the socket is writable before calling send_to,
+    /// // We must check if the socket is readable before calling recv_from,
     /// // or we could run into a WouldBlock error.
     ///
-    /// let bytes_sent = socket.send_to(&[9; 9], &"127.0.0.1:11100".parse()?)?;
-    /// assert_eq!(bytes_sent, 9);
+    /// let mut buf = [0; 9];
+    /// let (num_recv, from_addr) = socket.recv_from(&mut buf)?;
+    /// println!("Received {:?} -> {:?} bytes from {:?}", buf, num_recv, from_addr);
     /// #
     /// #    Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
-    /// # }
     /// ```
-    pub fn send_to(&self, buf: &[u8], target: &SocketAddr) -> io::Result<usize> {
-        self.sys.send_to(buf, target)
+    pub fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
+        self.inner.do_io(|inner| inner.recv_from(buf))
     }
 
-    /// Receives data from the socket. On success, returns the number of bytes
-    /// read and the address from whence the data came.
+    /// Receives data from the socket, without removing it from the input queue.
+    /// On success, returns the number of bytes read and the address from whence
+    /// the data came.
+    ///
+    /// # Notes
+    ///
+    /// On Windows, if the data is larger than the buffer specified, the buffer
+    /// is filled with the first part of the data, and peek_from returns the error
+    /// WSAEMSGSIZE(10040). The excess data is lost.
+    /// Make sure to always use a sufficiently large buffer to hold the
+    /// maximum UDP packet size, which can be up to 65536 bytes in size.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// # use std::error::Error;
     /// #
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
-    /// let socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
+    /// let socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
     ///
     /// // We must check if the socket is readable before calling recv_from,
     /// // or we could run into a WouldBlock error.
     ///
     /// let mut buf = [0; 9];
-    /// let (num_recv, from_addr) = socket.recv_from(&mut buf)?;
+    /// let (num_recv, from_addr) = socket.peek_from(&mut buf)?;
     /// println!("Received {:?} -> {:?} bytes from {:?}", buf, num_recv, from_addr);
     /// #
     /// #    Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
-    /// # }
     /// ```
-    pub fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        self.sys.recv_from(buf)
+    pub fn peek_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
+        self.inner.do_io(|inner| inner.peek_from(buf))
     }
 
     /// Sends data on the socket to the address previously bound via connect(). On success,
     /// returns the number of bytes written.
     pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        self.sys.send(buf)
+        self.inner.do_io(|inner| inner.send(buf))
     }
 
     /// Receives data from the socket previously bound with connect(). On success, returns
     /// the number of bytes read.
+    ///
+    /// # Notes
+    ///
+    /// On Windows, if the data is larger than the buffer specified, the buffer
+    /// is filled with the first part of the data, and recv returns the error
+    /// WSAEMSGSIZE(10040). The excess data is lost.
+    /// Make sure to always use a sufficiently large buffer to hold the
+    /// maximum UDP packet size, which can be up to 65536 bytes in size.
     pub fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.sys.recv(buf)
+        self.inner.do_io(|inner| inner.recv(buf))
+    }
+
+    /// Receives data from the socket, without removing it from the input queue.
+    /// On success, returns the number of bytes read.
+    ///
+    /// # Notes
+    ///
+    /// On Windows, if the data is larger than the buffer specified, the buffer
+    /// is filled with the first part of the data, and peek returns the error
+    /// WSAEMSGSIZE(10040). The excess data is lost.
+    /// Make sure to always use a sufficiently large buffer to hold the
+    /// maximum UDP packet size, which can be up to 65536 bytes in size.
+    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| inner.peek(buf))
     }
 
     /// Connects the UDP socket setting the default destination for `send()`
     /// and limiting packets that are read via `recv` from the address specified
     /// in `addr`.
     pub fn connect(&self, addr: SocketAddr) -> io::Result<()> {
-        self.sys.connect(addr)
+        self.inner.connect(addr)
     }
 
     /// Sets the value of the `SO_BROADCAST` option for this socket.
@@ -297,13 +308,14 @@
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(feature = "os-poll", doc = "```")]
+    #[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
     /// # use std::error::Error;
     /// #
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
-    /// let broadcast_socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
+    /// let broadcast_socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
     /// if broadcast_socket.broadcast()? == false {
     ///     broadcast_socket.set_broadcast(true)?;
     /// }
@@ -312,13 +324,9 @@
     /// #
     /// #    Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
-    /// # }
     /// ```
     pub fn set_broadcast(&self, on: bool) -> io::Result<()> {
-        self.sys.set_broadcast(on)
+        self.inner.set_broadcast(on)
     }
 
     /// Gets the value of the `SO_BROADCAST` option for this socket.
@@ -330,24 +338,21 @@
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(feature = "os-poll", doc = "```")]
+    #[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
     /// # use std::error::Error;
     /// #
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
-    /// let broadcast_socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
+    /// let broadcast_socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
     /// assert_eq!(broadcast_socket.broadcast()?, false);
     /// #
     /// #    Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
-    /// # }
     /// ```
     pub fn broadcast(&self) -> io::Result<bool> {
-        self.sys.broadcast()
+        self.inner.broadcast()
     }
 
     /// Sets the value of the `IP_MULTICAST_LOOP` option for this socket.
@@ -355,7 +360,7 @@
     /// If enabled, multicast packets will be looped back to the local socket.
     /// Note that this may not have any affect on IPv6 sockets.
     pub fn set_multicast_loop_v4(&self, on: bool) -> io::Result<()> {
-        self.sys.set_multicast_loop_v4(on)
+        self.inner.set_multicast_loop_v4(on)
     }
 
     /// Gets the value of the `IP_MULTICAST_LOOP` option for this socket.
@@ -365,7 +370,7 @@
     ///
     /// [link]: #method.set_multicast_loop_v4
     pub fn multicast_loop_v4(&self) -> io::Result<bool> {
-        self.sys.multicast_loop_v4()
+        self.inner.multicast_loop_v4()
     }
 
     /// Sets the value of the `IP_MULTICAST_TTL` option for this socket.
@@ -376,7 +381,7 @@
     ///
     /// Note that this may not have any affect on IPv6 sockets.
     pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
-        self.sys.set_multicast_ttl_v4(ttl)
+        self.inner.set_multicast_ttl_v4(ttl)
     }
 
     /// Gets the value of the `IP_MULTICAST_TTL` option for this socket.
@@ -386,7 +391,7 @@
     ///
     /// [link]: #method.set_multicast_ttl_v4
     pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        self.sys.multicast_ttl_v4()
+        self.inner.multicast_ttl_v4()
     }
 
     /// Sets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
@@ -394,7 +399,7 @@
     /// Controls whether this socket sees the multicast packets it sends itself.
     /// Note that this may not have any affect on IPv4 sockets.
     pub fn set_multicast_loop_v6(&self, on: bool) -> io::Result<()> {
-        self.sys.set_multicast_loop_v6(on)
+        self.inner.set_multicast_loop_v6(on)
     }
 
     /// Gets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
@@ -404,7 +409,7 @@
     ///
     /// [link]: #method.set_multicast_loop_v6
     pub fn multicast_loop_v6(&self) -> io::Result<bool> {
-        self.sys.multicast_loop_v6()
+        self.inner.multicast_loop_v6()
     }
 
     /// Sets the value for the `IP_TTL` option on this socket.
@@ -414,13 +419,14 @@
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(feature = "os-poll", doc = "```")]
+    #[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
     /// # use std::error::Error;
     /// #
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
-    /// let socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
+    /// let socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
     /// if socket.ttl()? < 255 {
     ///     socket.set_ttl(255)?;
     /// }
@@ -429,13 +435,9 @@
     /// #
     /// #    Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
-    /// # }
     /// ```
     pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.sys.set_ttl(ttl)
+        self.inner.set_ttl(ttl)
     }
 
     /// Gets the value of the `IP_TTL` option for this socket.
@@ -446,26 +448,23 @@
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(feature = "os-poll", doc = "```")]
+    #[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
     /// # use std::error::Error;
     /// #
-    /// # fn try_main() -> Result<(), Box<Error>> {
+    /// # fn main() -> Result<(), Box<dyn Error>> {
     /// use mio::net::UdpSocket;
     ///
-    /// let socket = UdpSocket::bind(&"127.0.0.1:0".parse()?)?;
+    /// let socket = UdpSocket::bind("127.0.0.1:0".parse()?)?;
     /// socket.set_ttl(255)?;
     ///
     /// assert_eq!(socket.ttl()?, 255);
     /// #
     /// #    Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #   try_main().unwrap();
-    /// # }
     /// ```
     pub fn ttl(&self) -> io::Result<u32> {
-        self.sys.ttl()
+        self.inner.ttl()
     }
 
     /// Executes an operation of the `IP_ADD_MEMBERSHIP` type.
@@ -475,10 +474,9 @@
     /// address of the local interface with which the system should join the
     /// multicast group. If it's equal to `INADDR_ANY` then an appropriate
     /// interface is chosen by the system.
-    pub fn join_multicast_v4(&self,
-                             multiaddr: &Ipv4Addr,
-                             interface: &Ipv4Addr) -> io::Result<()> {
-        self.sys.join_multicast_v4(multiaddr, interface)
+    #[allow(clippy::trivially_copy_pass_by_ref)]
+    pub fn join_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
+        self.inner.join_multicast_v4(multiaddr, interface)
     }
 
     /// Executes an operation of the `IPV6_ADD_MEMBERSHIP` type.
@@ -486,10 +484,9 @@
     /// This function specifies a new multicast group for this socket to join.
     /// The address must be a valid multicast address, and `interface` is the
     /// index of the interface to join/leave (or 0 to indicate any interface).
-    pub fn join_multicast_v6(&self,
-                             multiaddr: &Ipv6Addr,
-                             interface: u32) -> io::Result<()> {
-        self.sys.join_multicast_v6(multiaddr, interface)
+    #[allow(clippy::trivially_copy_pass_by_ref)]
+    pub fn join_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
+        self.inner.join_multicast_v6(multiaddr, interface)
     }
 
     /// Executes an operation of the `IP_DROP_MEMBERSHIP` type.
@@ -498,10 +495,9 @@
     /// [`join_multicast_v4`][link].
     ///
     /// [link]: #method.join_multicast_v4
-    pub fn leave_multicast_v4(&self,
-                              multiaddr: &Ipv4Addr,
-                              interface: &Ipv4Addr) -> io::Result<()> {
-        self.sys.leave_multicast_v4(multiaddr, interface)
+    #[allow(clippy::trivially_copy_pass_by_ref)]
+    pub fn leave_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
+        self.inner.leave_multicast_v4(multiaddr, interface)
     }
 
     /// Executes an operation of the `IPV6_DROP_MEMBERSHIP` type.
@@ -510,31 +506,15 @@
     /// [`join_multicast_v6`][link].
     ///
     /// [link]: #method.join_multicast_v6
-    pub fn leave_multicast_v6(&self,
-                              multiaddr: &Ipv6Addr,
-                              interface: u32) -> io::Result<()> {
-        self.sys.leave_multicast_v6(multiaddr, interface)
+    #[allow(clippy::trivially_copy_pass_by_ref)]
+    pub fn leave_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
+        self.inner.leave_multicast_v6(multiaddr, interface)
     }
 
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
-    ///
-    /// If this is set to `true` then the socket is restricted to sending and
-    /// receiving IPv6 packets only. In this case two IPv4 and IPv6 applications
-    /// can bind the same port at the same time.
-    ///
-    /// If this is set to `false` then the socket can be used to send and
-    /// receive packets from an IPv4-mapped IPv6 address.
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.sys.set_only_v6(only_v6)
-    }
-
-    /// Gets the value of the `IPV6_V6ONLY` option for this socket.
-    ///
-    /// For more information about this option, see [`set_only_v6`][link].
-    ///
-    /// [link]: #method.set_only_v6
+    /// Get the value of the `IPV6_V6ONLY` option on this socket.
+    #[allow(clippy::trivially_copy_pass_by_ref)]
     pub fn only_v6(&self) -> io::Result<bool> {
-        self.sys.only_v6()
+        sys::udp::only_v6(&self.inner)
     }
 
     /// Get the value of the `SO_ERROR` option on this socket.
@@ -543,103 +523,90 @@
     /// the field in the process. This can be useful for checking errors between
     /// calls.
     pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.sys.take_error()
-    }
-
-    /// Receives a single datagram message socket previously bound with connect.
-    ///
-    /// This operation will attempt to read bytes from this socket and place
-    /// them into the list of buffers provided. Note that each buffer is an
-    /// `IoVec` which can be created from a byte slice.
-    ///
-    /// The buffers provided will be filled sequentially. A buffer will be
-    /// entirely filled up before the next is written to.
-    ///
-    /// The number of bytes read is returned, if successful, or an error is
-    /// returned otherwise. If no bytes are available to be read yet then
-    /// a [`WouldBlock`][link] error is returned. This operation does not block.
-    ///
-    /// On Unix this corresponds to the `readv` syscall.
-    ///
-    /// [link]: https://doc.rust-lang.org/nightly/std/io/enum.ErrorKind.html#variant.WouldBlock
-    #[cfg(all(unix, not(target_os = "fuchsia")))]
-    pub fn recv_bufs(&self, bufs: &mut [&mut IoVec]) -> io::Result<usize> {
-        self.sys.readv(bufs)
-    }
-
-    /// Sends data on the socket to the address previously bound via connect.
-    ///
-    /// This operation will attempt to send a list of byte buffers to this
-    /// socket in a single datagram. Note that each buffer is an `IoVec`
-    /// which can be created from a byte slice.
-    ///
-    /// The buffers provided will be written sequentially. A buffer will be
-    /// entirely written before the next is written.
-    ///
-    /// The number of bytes written is returned, if successful, or an error is
-    /// returned otherwise. If the socket is not currently writable then a
-    /// [`WouldBlock`][link] error is returned. This operation does not block.
-    ///
-    /// On Unix this corresponds to the `writev` syscall.
-    ///
-    /// [link]: https://doc.rust-lang.org/nightly/std/io/enum.ErrorKind.html#variant.WouldBlock
-    #[cfg(all(unix, not(target_os = "fuchsia")))]
-    pub fn send_bufs(&self, bufs: &[&IoVec]) -> io::Result<usize> {
-        self.sys.writev(bufs)
+        self.inner.take_error()
     }
 }
 
-impl Evented for UdpSocket {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.selector_id.associate_selector(poll)?;
-        self.sys.register(poll, token, interest, opts)
+impl event::Source for UdpSocket {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.reregister(registry, token, interests)
     }
 
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.sys.deregister(poll)
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        self.inner.deregister(registry)
     }
 }
 
 impl fmt::Debug for UdpSocket {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(&self.sys, f)
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.fmt(f)
     }
 }
 
-/*
- *
- * ===== UNIX ext =====
- *
- */
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-use std::os::unix::io::{IntoRawFd, AsRawFd, FromRawFd, RawFd};
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
+#[cfg(unix)]
 impl IntoRawFd for UdpSocket {
     fn into_raw_fd(self) -> RawFd {
-        self.sys.into_raw_fd()
+        self.inner.into_inner().into_raw_fd()
     }
 }
 
-#[cfg(all(unix, not(target_os = "fuchsia")))]
+#[cfg(unix)]
 impl AsRawFd for UdpSocket {
     fn as_raw_fd(&self) -> RawFd {
-        self.sys.as_raw_fd()
+        self.inner.as_raw_fd()
     }
 }
 
-#[cfg(all(unix, not(target_os = "fuchsia")))]
+#[cfg(unix)]
 impl FromRawFd for UdpSocket {
+    /// Converts a `RawFd` to a `UdpSocket`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
     unsafe fn from_raw_fd(fd: RawFd) -> UdpSocket {
-        UdpSocket {
-            sys: FromRawFd::from_raw_fd(fd),
-            selector_id: SelectorId::new(),
-        }
+        UdpSocket::from_std(FromRawFd::from_raw_fd(fd))
     }
 }
 
+#[cfg(windows)]
+impl IntoRawSocket for UdpSocket {
+    fn into_raw_socket(self) -> RawSocket {
+        self.inner.into_inner().into_raw_socket()
+    }
+}
+
+#[cfg(windows)]
+impl AsRawSocket for UdpSocket {
+    fn as_raw_socket(&self) -> RawSocket {
+        self.inner.as_raw_socket()
+    }
+}
+
+#[cfg(windows)]
+impl FromRawSocket for UdpSocket {
+    /// Converts a `RawSocket` to a `UdpSocket`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_socket(socket: RawSocket) -> UdpSocket {
+        UdpSocket::from_std(FromRawSocket::from_raw_socket(socket))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/uds/datagram.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/uds/datagram.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/uds/datagram.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/uds/datagram.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,165 @@
+use crate::io_source::IoSource;
+use crate::{event, sys, Interest, Registry, Token};
+
+use std::net::Shutdown;
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::net;
+use std::path::Path;
+use std::{fmt, io};
+
+/// A Unix datagram socket.
+pub struct UnixDatagram {
+    inner: IoSource<net::UnixDatagram>,
+}
+
+impl UnixDatagram {
+    /// Creates a Unix datagram socket bound to the given path.
+    pub fn bind<P: AsRef<Path>>(path: P) -> io::Result<UnixDatagram> {
+        sys::uds::datagram::bind(path.as_ref()).map(UnixDatagram::from_std)
+    }
+
+    /// Creates a new `UnixDatagram` from a standard `net::UnixDatagram`.
+    ///
+    /// This function is intended to be used to wrap a Unix datagram from the
+    /// standard library in the Mio equivalent. The conversion assumes nothing
+    /// about the underlying datagram; ; it is left up to the user to set it
+    /// in non-blocking mode.
+    pub fn from_std(socket: net::UnixDatagram) -> UnixDatagram {
+        UnixDatagram {
+            inner: IoSource::new(socket),
+        }
+    }
+
+    /// Connects the socket to the specified address.
+    pub fn connect<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+        self.inner.connect(path)
+    }
+
+    /// Creates a Unix Datagram socket which is not bound to any address.
+    pub fn unbound() -> io::Result<UnixDatagram> {
+        sys::uds::datagram::unbound().map(UnixDatagram::from_std)
+    }
+
+    /// Create an unnamed pair of connected sockets.
+    pub fn pair() -> io::Result<(UnixDatagram, UnixDatagram)> {
+        sys::uds::datagram::pair().map(|(socket1, socket2)| {
+            (
+                UnixDatagram::from_std(socket1),
+                UnixDatagram::from_std(socket2),
+            )
+        })
+    }
+
+    /// Returns the address of this socket.
+    pub fn local_addr(&self) -> io::Result<sys::SocketAddr> {
+        sys::uds::datagram::local_addr(&self.inner)
+    }
+
+    /// Returns the address of this socket's peer.
+    ///
+    /// The `connect` method will connect the socket to a peer.
+    pub fn peer_addr(&self) -> io::Result<sys::SocketAddr> {
+        sys::uds::datagram::peer_addr(&self.inner)
+    }
+
+    /// Receives data from the socket.
+    ///
+    /// On success, returns the number of bytes read and the address from
+    /// whence the data came.
+    pub fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, sys::SocketAddr)> {
+        self.inner
+            .do_io(|inner| sys::uds::datagram::recv_from(inner, buf))
+    }
+
+    /// Receives data from the socket.
+    ///
+    /// On success, returns the number of bytes read.
+    pub fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| inner.recv(buf))
+    }
+
+    /// Sends data on the socket to the specified address.
+    ///
+    /// On success, returns the number of bytes written.
+    pub fn send_to<P: AsRef<Path>>(&self, buf: &[u8], path: P) -> io::Result<usize> {
+        self.inner.do_io(|inner| inner.send_to(buf, path))
+    }
+
+    /// Sends data on the socket to the socket's peer.
+    ///
+    /// The peer address may be set by the `connect` method, and this method
+    /// will return an error if the socket has not already been connected.
+    ///
+    /// On success, returns the number of bytes written.
+    pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| inner.send(buf))
+    }
+
+    /// Returns the value of the `SO_ERROR` option.
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        self.inner.take_error()
+    }
+
+    /// Shut down the read, write, or both halves of this connection.
+    ///
+    /// This function will cause all pending and future I/O calls on the
+    /// specified portions to immediately return with an appropriate value
+    /// (see the documentation of `Shutdown`).
+    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
+        self.inner.shutdown(how)
+    }
+}
+
+impl event::Source for UnixDatagram {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        self.inner.deregister(registry)
+    }
+}
+
+impl fmt::Debug for UnixDatagram {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+impl IntoRawFd for UnixDatagram {
+    fn into_raw_fd(self) -> RawFd {
+        self.inner.into_inner().into_raw_fd()
+    }
+}
+
+impl AsRawFd for UnixDatagram {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+impl FromRawFd for UnixDatagram {
+    /// Converts a `RawFd` to a `UnixDatagram`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_fd(fd: RawFd) -> UnixDatagram {
+        UnixDatagram::from_std(FromRawFd::from_raw_fd(fd))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/uds/listener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/uds/listener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/uds/listener.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/uds/listener.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,104 @@
+use crate::io_source::IoSource;
+use crate::net::{SocketAddr, UnixStream};
+use crate::{event, sys, Interest, Registry, Token};
+
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::net;
+use std::path::Path;
+use std::{fmt, io};
+
+/// A non-blocking Unix domain socket server.
+pub struct UnixListener {
+    inner: IoSource<net::UnixListener>,
+}
+
+impl UnixListener {
+    /// Creates a new `UnixListener` bound to the specified socket.
+    pub fn bind<P: AsRef<Path>>(path: P) -> io::Result<UnixListener> {
+        sys::uds::listener::bind(path.as_ref()).map(UnixListener::from_std)
+    }
+
+    /// Creates a new `UnixListener` from a standard `net::UnixListener`.
+    ///
+    /// This function is intended to be used to wrap a Unix listener from the
+    /// standard library in the Mio equivalent. The conversion assumes nothing
+    /// about the underlying listener; it is left up to the user to set it in
+    /// non-blocking mode.
+    pub fn from_std(listener: net::UnixListener) -> UnixListener {
+        UnixListener {
+            inner: IoSource::new(listener),
+        }
+    }
+
+    /// Accepts a new incoming connection to this listener.
+    ///
+    /// The call is responsible for ensuring that the listening socket is in
+    /// non-blocking mode.
+    pub fn accept(&self) -> io::Result<(UnixStream, SocketAddr)> {
+        sys::uds::listener::accept(&self.inner)
+    }
+
+    /// Returns the local socket address of this listener.
+    pub fn local_addr(&self) -> io::Result<sys::SocketAddr> {
+        sys::uds::listener::local_addr(&self.inner)
+    }
+
+    /// Returns the value of the `SO_ERROR` option.
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        self.inner.take_error()
+    }
+}
+
+impl event::Source for UnixListener {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        self.inner.deregister(registry)
+    }
+}
+
+impl fmt::Debug for UnixListener {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+impl IntoRawFd for UnixListener {
+    fn into_raw_fd(self) -> RawFd {
+        self.inner.into_inner().into_raw_fd()
+    }
+}
+
+impl AsRawFd for UnixListener {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+impl FromRawFd for UnixListener {
+    /// Converts a `RawFd` to a `UnixListener`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_fd(fd: RawFd) -> UnixListener {
+        UnixListener::from_std(FromRawFd::from_raw_fd(fd))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/uds/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/uds/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/uds/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/uds/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+mod datagram;
+pub use self::datagram::UnixDatagram;
+
+mod listener;
+pub use self::listener::UnixListener;
+
+mod stream;
+pub use self::stream::UnixStream;
+
+pub use crate::sys::SocketAddr;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/uds/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/uds/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/net/uds/stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/net/uds/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,174 @@
+use crate::io_source::IoSource;
+use crate::{event, sys, Interest, Registry, Token};
+
+use std::fmt;
+use std::io::{self, IoSlice, IoSliceMut, Read, Write};
+use std::net::Shutdown;
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::net;
+use std::path::Path;
+
+/// A non-blocking Unix stream socket.
+pub struct UnixStream {
+    inner: IoSource<net::UnixStream>,
+}
+
+impl UnixStream {
+    /// Connects to the socket named by `path`.
+    pub fn connect<P: AsRef<Path>>(path: P) -> io::Result<UnixStream> {
+        sys::uds::stream::connect(path.as_ref()).map(UnixStream::from_std)
+    }
+
+    /// Creates a new `UnixStream` from a standard `net::UnixStream`.
+    ///
+    /// This function is intended to be used to wrap a Unix stream from the
+    /// standard library in the Mio equivalent. The conversion assumes nothing
+    /// about the underlying stream; it is left up to the user to set it in
+    /// non-blocking mode.
+    ///
+    /// # Note
+    ///
+    /// The Unix stream here will not have `connect` called on it, so it
+    /// should already be connected via some other means (be it manually, or
+    /// the standard library).
+    pub fn from_std(stream: net::UnixStream) -> UnixStream {
+        UnixStream {
+            inner: IoSource::new(stream),
+        }
+    }
+
+    /// Creates an unnamed pair of connected sockets.
+    ///
+    /// Returns two `UnixStream`s which are connected to each other.
+    pub fn pair() -> io::Result<(UnixStream, UnixStream)> {
+        sys::uds::stream::pair().map(|(stream1, stream2)| {
+            (UnixStream::from_std(stream1), UnixStream::from_std(stream2))
+        })
+    }
+
+    /// Returns the socket address of the local half of this connection.
+    pub fn local_addr(&self) -> io::Result<sys::SocketAddr> {
+        sys::uds::stream::local_addr(&self.inner)
+    }
+
+    /// Returns the socket address of the remote half of this connection.
+    pub fn peer_addr(&self) -> io::Result<sys::SocketAddr> {
+        sys::uds::stream::peer_addr(&self.inner)
+    }
+
+    /// Returns the value of the `SO_ERROR` option.
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        self.inner.take_error()
+    }
+
+    /// Shuts down the read, write, or both halves of this connection.
+    ///
+    /// This function will cause all pending and future I/O calls on the
+    /// specified portions to immediately return with an appropriate value
+    /// (see the documentation of `Shutdown`).
+    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
+        self.inner.shutdown(how)
+    }
+}
+
+impl Read for UnixStream {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).read(buf))
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).read_vectored(bufs))
+    }
+}
+
+impl<'a> Read for &'a UnixStream {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).read(buf))
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).read_vectored(bufs))
+    }
+}
+
+impl Write for UnixStream {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).write(buf))
+    }
+
+    fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).write_vectored(bufs))
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.do_io(|inner| (&*inner).flush())
+    }
+}
+
+impl<'a> Write for &'a UnixStream {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).write(buf))
+    }
+
+    fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|inner| (&*inner).write_vectored(bufs))
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.do_io(|inner| (&*inner).flush())
+    }
+}
+
+impl event::Source for UnixStream {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        self.inner.deregister(registry)
+    }
+}
+
+impl fmt::Debug for UnixStream {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+impl IntoRawFd for UnixStream {
+    fn into_raw_fd(self) -> RawFd {
+        self.inner.into_inner().into_raw_fd()
+    }
+}
+
+impl AsRawFd for UnixStream {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+impl FromRawFd for UnixStream {
+    /// Converts a `RawFd` to a `UnixStream`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_fd(fd: RawFd) -> UnixStream {
+        UnixStream::from_std(FromRawFd::from_raw_fd(fd))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/poll.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/poll.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/poll.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/poll.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,113 +1,57 @@
-use {sys, Token};
-use event_imp::{self as event, Ready, Event, Evented, PollOpt};
-use std::{fmt, io, ptr, usize};
-use std::cell::UnsafeCell;
-use std::{mem, ops, isize};
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-use std::os::unix::io::AsRawFd;
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-use std::os::unix::io::RawFd;
-use std::process;
-use std::sync::{Arc, Mutex, Condvar};
-use std::sync::atomic::{AtomicUsize, AtomicPtr, AtomicBool};
-use std::sync::atomic::Ordering::{self, Acquire, Release, AcqRel, Relaxed, SeqCst};
-use std::time::{Duration, Instant};
-
-// Poll is backed by two readiness queues. The first is a system readiness queue
-// represented by `sys::Selector`. The system readiness queue handles events
-// provided by the system, such as TCP and UDP. The second readiness queue is
-// implemented in user space by `ReadinessQueue`. It provides a way to implement
-// purely user space `Evented` types.
-//
-// `ReadinessQueue` is backed by a MPSC queue that supports reuse of linked
-// list nodes. This significantly reduces the number of required allocations.
-// Each `Registration` / `SetReadiness` pair allocates a single readiness node
-// that is used for the lifetime of the registration.
-//
-// The readiness node also includes a single atomic variable, `state` that
-// tracks most of the state associated with the registration. This includes the
-// current readiness, interest, poll options, and internal state. When the node
-// state is mutated, it is queued in the MPSC channel. A call to
-// `ReadinessQueue::poll` will dequeue and process nodes. The node state can
-// still be mutated while it is queued in the channel for processing.
-// Intermediate state values do not matter as long as the final state is
-// included in the call to `poll`. This is the eventually consistent nature of
-// the readiness queue.
-//
-// The readiness node is ref counted using the `ref_count` field. On creation,
-// the ref_count is initialized to 3: one `Registration` handle, one
-// `SetReadiness` handle, and one for the readiness queue. Since the readiness queue
-// doesn't *always* hold a handle to the node, we don't use the Arc type for
-// managing ref counts (this is to avoid constantly incrementing and
-// decrementing the ref count when pushing & popping from the queue). When the
-// `Registration` handle is dropped, the `dropped` flag is set on the node, then
-// the node is pushed into the registration queue. When Poll::poll pops the
-// node, it sees the drop flag is set, and decrements it's ref count.
-//
-// The MPSC queue is a modified version of the intrusive MPSC node based queue
-// described by 1024cores [1].
-//
-// The first modification is that two markers are used instead of a single
-// `stub`. The second marker is a `sleep_marker` which is used to signal to
-// producers that the consumer is going to sleep. This sleep_marker is only used
-// when the queue is empty, implying that the only node in the queue is
-// `end_marker`.
-//
-// The second modification is an `until` argument passed to the dequeue
-// function. When `poll` encounters a level-triggered node, the node will be
-// immediately pushed back into the queue. In order to avoid an infinite loop,
-// `poll` before pushing the node, the pointer is saved off and then passed
-// again as the `until` argument. If the next node to pop is `until`, then
-// `Dequeue::Empty` is returned.
-//
-// [1] http://www.1024cores.net/home/lock-free-algorithms/queues/intrusive-mpsc-node-based-queue
-
+use crate::{event, sys, Events, Interest, Token};
+use log::trace;
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, RawFd};
+use std::time::Duration;
+use std::{fmt, io};
 
 /// Polls for readiness events on all registered values.
 ///
-/// `Poll` allows a program to monitor a large number of `Evented` types,
+/// `Poll` allows a program to monitor a large number of [`event::Source`]s,
 /// waiting until one or more become "ready" for some class of operations; e.g.
-/// reading and writing. An `Evented` type is considered ready if it is possible
+/// reading and writing. An event source is considered ready if it is possible
 /// to immediately perform a corresponding operation; e.g. [`read`] or
 /// [`write`].
 ///
-/// To use `Poll`, an `Evented` type must first be registered with the `Poll`
-/// instance using the [`register`] method, supplying readiness interest. The
-/// readiness interest tells `Poll` which specific operations on the handle to
-/// monitor for readiness. A `Token` is also passed to the [`register`]
-/// function. When `Poll` returns a readiness event, it will include this token.
-/// This associates the event with the `Evented` handle that generated the
-/// event.
-///
-/// [`read`]: tcp/struct.TcpStream.html#method.read
-/// [`write`]: tcp/struct.TcpStream.html#method.write
-/// [`register`]: #method.register
+/// To use `Poll`, an `event::Source` must first be registered with the `Poll`
+/// instance using the [`register`] method on its associated `Register`,
+/// supplying readiness interest. The readiness interest tells `Poll` which
+/// specific operations on the handle to monitor for readiness. A `Token` is
+/// also passed to the [`register`] function. When `Poll` returns a readiness
+/// event, it will include this token.  This associates the event with the
+/// event source that generated the event.
+///
+/// [`event::Source`]: ./event/trait.Source.html
+/// [`read`]: ./net/struct.TcpStream.html#method.read
+/// [`write`]: ./net/struct.TcpStream.html#method.write
+/// [`register`]: struct.Registry.html#method.register
 ///
 /// # Examples
 ///
 /// A basic example -- establishing a `TcpStream` connection.
 ///
-/// ```
+#[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+#[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
 /// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Events, Poll, Ready, PollOpt, Token};
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// use mio::{Events, Poll, Interest, Token};
 /// use mio::net::TcpStream;
 ///
-/// use std::net::{TcpListener, SocketAddr};
+/// use std::net::{self, SocketAddr};
 ///
 /// // Bind a server socket to connect to.
 /// let addr: SocketAddr = "127.0.0.1:0".parse()?;
-/// let server = TcpListener::bind(&addr)?;
+/// let server = net::TcpListener::bind(addr)?;
 ///
 /// // Construct a new `Poll` handle as well as the `Events` we'll store into
-/// let poll = Poll::new()?;
+/// let mut poll = Poll::new()?;
 /// let mut events = Events::with_capacity(1024);
 ///
 /// // Connect the stream
-/// let stream = TcpStream::connect(&server.local_addr()?)?;
+/// let mut stream = TcpStream::connect(server.local_addr()?)?;
 ///
 /// // Register the stream with `Poll`
-/// poll.register(&stream, Token(0), Ready::readable() | Ready::writable(), PollOpt::edge())?;
+/// poll.registry().register(&mut stream, Token(0), Interest::READABLE | Interest::WRITABLE)?;
 ///
 /// // Wait for the socket to become ready. This has to happens in a loop to
 /// // handle spurious wakeups.
@@ -115,96 +59,16 @@
 ///     poll.poll(&mut events, None)?;
 ///
 ///     for event in &events {
-///         if event.token() == Token(0) && event.readiness().is_writable() {
+///         if event.token() == Token(0) && event.is_writable() {
 ///             // The socket connected (probably, it could still be a spurious
 ///             // wakeup)
 ///             return Ok(());
 ///         }
 ///     }
 /// }
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
 /// # }
 /// ```
 ///
-/// # Edge-triggered and level-triggered
-///
-/// An [`Evented`] registration may request edge-triggered events or
-/// level-triggered events. This is done by setting `register`'s
-/// [`PollOpt`] argument to either [`edge`] or [`level`].
-///
-/// The difference between the two can be described as follows. Supposed that
-/// this scenario happens:
-///
-/// 1. A [`TcpStream`] is registered with `Poll`.
-/// 2. The socket receives 2kb of data.
-/// 3. A call to [`Poll::poll`] returns the token associated with the socket
-///    indicating readable readiness.
-/// 4. 1kb is read from the socket.
-/// 5. Another call to [`Poll::poll`] is made.
-///
-/// If when the socket was registered with `Poll`, edge triggered events were
-/// requested, then the call to [`Poll::poll`] done in step **5** will
-/// (probably) hang despite there being another 1kb still present in the socket
-/// read buffer. The reason for this is that edge-triggered mode delivers events
-/// only when changes occur on the monitored [`Evented`]. So, in step *5* the
-/// caller might end up waiting for some data that is already present inside the
-/// socket buffer.
-///
-/// With edge-triggered events, operations **must** be performed on the
-/// `Evented` type until [`WouldBlock`] is returned. In other words, after
-/// receiving an event indicating readiness for a certain operation, one should
-/// assume that [`Poll::poll`] may never return another event for the same token
-/// and readiness until the operation returns [`WouldBlock`].
-///
-/// By contrast, when level-triggered notifications was requested, each call to
-/// [`Poll::poll`] will return an event for the socket as long as data remains
-/// in the socket buffer. Generally, level-triggered events should be avoided if
-/// high performance is a concern.
-///
-/// Since even with edge-triggered events, multiple events can be generated upon
-/// receipt of multiple chunks of data, the caller has the option to set the
-/// [`oneshot`] flag. This tells `Poll` to disable the associated [`Evented`]
-/// after the event is returned from [`Poll::poll`]. The subsequent calls to
-/// [`Poll::poll`] will no longer include events for [`Evented`] handles that
-/// are disabled even if the readiness state changes. The handle can be
-/// re-enabled by calling [`reregister`]. When handles are disabled, internal
-/// resources used to monitor the handle are maintained until the handle is
-/// dropped or deregistered. This makes re-registering the handle a fast
-/// operation.
-///
-/// For example, in the following scenario:
-///
-/// 1. A [`TcpStream`] is registered with `Poll`.
-/// 2. The socket receives 2kb of data.
-/// 3. A call to [`Poll::poll`] returns the token associated with the socket
-///    indicating readable readiness.
-/// 4. 2kb is read from the socket.
-/// 5. Another call to read is issued and [`WouldBlock`] is returned
-/// 6. The socket receives another 2kb of data.
-/// 7. Another call to [`Poll::poll`] is made.
-///
-/// Assuming the socket was registered with `Poll` with the [`edge`] and
-/// [`oneshot`] options, then the call to [`Poll::poll`] in step 7 would block. This
-/// is because, [`oneshot`] tells `Poll` to disable events for the socket after
-/// returning an event.
-///
-/// In order to receive the event for the data received in step 6, the socket
-/// would need to be reregistered using [`reregister`].
-///
-/// [`PollOpt`]: struct.PollOpt.html
-/// [`edge`]: struct.PollOpt.html#method.edge
-/// [`level`]: struct.PollOpt.html#method.level
-/// [`Poll::poll`]: struct.Poll.html#method.poll
-/// [`WouldBlock`]: https://doc.rust-lang.org/std/io/enum.ErrorKind.html#variant.WouldBlock
-/// [`Evented`]: event/trait.Evented.html
-/// [`TcpStream`]: tcp/struct.TcpStream.html
-/// [`reregister`]: #method.reregister
-/// [`oneshot`]: struct.PollOpt.html#method.oneshot
-///
 /// # Portability
 ///
 /// Using `Poll` provides a portable interface across supported platforms as
@@ -213,10 +77,10 @@
 /// ### Spurious events
 ///
 /// [`Poll::poll`] may return readiness events even if the associated
-/// [`Evented`] handle is not actually ready. Given the same code, this may
+/// event source is not actually ready. Given the same code, this may
 /// happen more on some platforms than others. It is important to never assume
-/// that, just because a readiness notification was received, that the
-/// associated operation will succeed as well.
+/// that, just because a readiness event was received, that the associated
+/// operation will succeed as well.
 ///
 /// If operation fails with [`WouldBlock`], then the caller should not treat
 /// this as an error, but instead should wait until another readiness event is
@@ -224,55 +88,59 @@
 ///
 /// ### Draining readiness
 ///
-/// When using edge-triggered mode, once a readiness event is received, the
-/// corresponding operation must be performed repeatedly until it returns
-/// [`WouldBlock`]. Unless this is done, there is no guarantee that another
-/// readiness event will be delivered, even if further data is received for the
-/// [`Evented`] handle.
-///
-/// For example, in the first scenario described above, after step 5, even if
-/// the socket receives more data there is no guarantee that another readiness
-/// event will be delivered.
+/// Once a readiness event is received, the corresponding operation must be
+/// performed repeatedly until it returns [`WouldBlock`]. Unless this is done,
+/// there is no guarantee that another readiness event will be delivered, even
+/// if further data is received for the event source.
+///
+/// [`WouldBlock`]: std::io::ErrorKind::WouldBlock
 ///
 /// ### Readiness operations
 ///
 /// The only readiness operations that are guaranteed to be present on all
 /// supported platforms are [`readable`] and [`writable`]. All other readiness
 /// operations may have false negatives and as such should be considered
-/// **hints**. This means that if a socket is registered with [`readable`],
-/// [`error`], and [`hup`] interest, and either an error or hup is received, a
-/// readiness event will be generated for the socket, but it **may** only
-/// include `readable` readiness. Also note that, given the potential for
-/// spurious events, receiving a readiness event with `hup` or `error` doesn't
-/// actually mean that a `read` on the socket will return a result matching the
-/// readiness event.
-///
-/// In other words, portable programs that explicitly check for [`hup`] or
-/// [`error`] readiness should be doing so as an **optimization** and always be
-/// able to handle an error or HUP situation when performing the actual read
-/// operation.
-///
-/// [`readable`]: struct.Ready.html#method.readable
-/// [`writable`]: struct.Ready.html#method.writable
-/// [`error`]: unix/struct.UnixReady.html#method.error
-/// [`hup`]: unix/struct.UnixReady.html#method.hup
+/// **hints**. This means that if a socket is registered with [`readable`]
+/// interest and either an error or close is received, a readiness event will
+/// be generated for the socket, but it **may** only include `readable`
+/// readiness. Also note that, given the potential for spurious events,
+/// receiving a readiness event with `read_closed`, `write_closed`, or `error`
+/// doesn't actually mean that a `read` on the socket will return a result
+/// matching the readiness event.
+///
+/// In other words, portable programs that explicitly check for [`read_closed`],
+/// [`write_closed`], or [`error`] readiness should be doing so as an
+/// **optimization** and always be able to handle an error or close situation
+/// when performing the actual read operation.
+///
+/// [`readable`]: ./event/struct.Event.html#method.is_readable
+/// [`writable`]: ./event/struct.Event.html#method.is_writable
+/// [`error`]: ./event/struct.Event.html#method.is_error
+/// [`read_closed`]: ./event/struct.Event.html#method.is_read_closed
+/// [`write_closed`]: ./event/struct.Event.html#method.is_write_closed
 ///
 /// ### Registering handles
 ///
 /// Unless otherwise noted, it should be assumed that types implementing
-/// [`Evented`] will never become ready unless they are registered with `Poll`.
+/// [`event::Source`] will never become ready unless they are registered with
+/// `Poll`.
 ///
 /// For example:
 ///
-/// ```
+#[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+#[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
 /// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Poll, Ready, PollOpt, Token};
+/// # use std::net;
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// use mio::{Poll, Interest, Token};
 /// use mio::net::TcpStream;
+/// use std::net::SocketAddr;
 /// use std::time::Duration;
 /// use std::thread;
 ///
-/// let sock = TcpStream::connect(&"216.58.193.100:80".parse()?)?;
+/// let address: SocketAddr = "127.0.0.1:0".parse()?;
+/// let listener = net::TcpListener::bind(address)?;
+/// let mut sock = TcpStream::connect(listener.local_addr()?)?;
 ///
 /// thread::sleep(Duration::from_secs(1));
 ///
@@ -280,32 +148,44 @@
 ///
 /// // The connect is not guaranteed to have started until it is registered at
 /// // this point
-/// poll.register(&sock, Token(0), Ready::readable() | Ready::writable(), PollOpt::edge())?;
+/// poll.registry().register(&mut sock, Token(0), Interest::READABLE | Interest::WRITABLE)?;
 /// #     Ok(())
 /// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
 /// ```
 ///
+/// ### Dropping `Poll`
+///
+/// When the `Poll` instance is dropped it may cancel in-flight operations for
+/// the registered [event sources], meaning that no further events for them may
+/// be received. It also means operations on the registered event sources may no
+/// longer work. It is up to the user to keep the `Poll` instance alive while
+/// registered event sources are being used.
+///
+/// [event sources]: ./event/trait.Source.html
+///
 /// # Implementation notes
 ///
 /// `Poll` is backed by the selector provided by the operating system.
 ///
-/// |      OS    |  Selector |
-/// |------------|-----------|
-/// | Linux      | [epoll]   |
-/// | OS X, iOS  | [kqueue]  |
-/// | Windows    | [IOCP]    |
-/// | FreeBSD    | [kqueue]  |
-/// | Android    | [epoll]   |
+/// |      OS       |  Selector |
+/// |---------------|-----------|
+/// | Android       | [epoll]   |
+/// | DragonFly BSD | [kqueue]  |
+/// | FreeBSD       | [kqueue]  |
+/// | Linux         | [epoll]   |
+/// | NetBSD        | [kqueue]  |
+/// | OpenBSD       | [kqueue]  |
+/// | Solaris       | [epoll]   |
+/// | illumos       | [epoll]   |
+/// | Windows       | [IOCP]    |
+/// | iOS           | [kqueue]  |
+/// | macOS         | [kqueue]  |
 ///
 /// On all supported platforms, socket operations are handled by using the
-/// system selector. Platform specific extensions (e.g. [`EventedFd`]) allow
+/// system selector. Platform specific extensions (e.g. [`SourceFd`]) allow
 /// accessing other features provided by individual system selectors. For
 /// example, Linux's [`signalfd`] feature can be used by registering the FD with
-/// `Poll` via [`EventedFd`].
+/// `Poll` via [`SourceFd`].
 ///
 /// On all platforms except windows, a call to [`Poll::poll`] is mostly just a
 /// direct call to the system selector. However, [IOCP] uses a completion model
@@ -315,435 +195,257 @@
 /// data to be copied into an intermediate buffer before it is passed to the
 /// kernel.
 ///
-/// Notifications generated by [`SetReadiness`] are handled by an internal
-/// readiness queue. A single call to [`Poll::poll`] will collect events from
-/// both from the system selector and the internal readiness queue.
-///
 /// [epoll]: http://man7.org/linux/man-pages/man7/epoll.7.html
 /// [kqueue]: https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
 /// [IOCP]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365198(v=vs.85).aspx
 /// [`signalfd`]: http://man7.org/linux/man-pages/man2/signalfd.2.html
-/// [`EventedFd`]: unix/struct.EventedFd.html
-/// [`SetReadiness`]: struct.SetReadiness.html
+/// [`SourceFd`]: unix/struct.SourceFd.html
 /// [`Poll::poll`]: struct.Poll.html#method.poll
 pub struct Poll {
-    // Platform specific IO selector
-    selector: sys::Selector,
-
-    // Custom readiness queue
-    readiness_queue: ReadinessQueue,
-
-    // Use an atomic to first check if a full lock will be required. This is a
-    // fast-path check for single threaded cases avoiding the extra syscall
-    lock_state: AtomicUsize,
-
-    // Sequences concurrent calls to `Poll::poll`
-    lock: Mutex<()>,
-
-    // Wakeup the next waiter
-    condvar: Condvar,
-}
-
-/// Handle to a user space `Poll` registration.
-///
-/// `Registration` allows implementing [`Evented`] for types that cannot work
-/// with the [system selector]. A `Registration` is always paired with a
-/// `SetReadiness`, which allows updating the registration's readiness state.
-/// When [`set_readiness`] is called and the `Registration` is associated with a
-/// [`Poll`] instance, a readiness event will be created and eventually returned
-/// by [`poll`].
-///
-/// A `Registration` / `SetReadiness` pair is created by calling
-/// [`Registration::new2`]. At this point, the registration is not being
-/// monitored by a [`Poll`] instance, so calls to `set_readiness` will not
-/// result in any readiness notifications.
-///
-/// `Registration` implements [`Evented`], so it can be used with [`Poll`] using
-/// the same [`register`], [`reregister`], and [`deregister`] functions used
-/// with TCP, UDP, etc... types. Once registered with [`Poll`], readiness state
-/// changes result in readiness events being dispatched to the [`Poll`] instance
-/// with which `Registration` is registered.
-///
-/// **Note**, before using `Registration` be sure to read the
-/// [`set_readiness`] documentation and the [portability] notes. The
-/// guarantees offered by `Registration` may be weaker than expected.
-///
-/// For high level documentation, see [`Poll`].
-///
-/// # Examples
-///
-/// ```
-/// use mio::{Ready, Registration, Poll, PollOpt, Token};
-/// use mio::event::Evented;
-///
-/// use std::io;
-/// use std::time::Instant;
-/// use std::thread;
-///
-/// pub struct Deadline {
-///     when: Instant,
-///     registration: Registration,
-/// }
-///
-/// impl Deadline {
-///     pub fn new(when: Instant) -> Deadline {
-///         let (registration, set_readiness) = Registration::new2();
-///
-///         thread::spawn(move || {
-///             let now = Instant::now();
-///
-///             if now < when {
-///                 thread::sleep(when - now);
-///             }
-///
-///             set_readiness.set_readiness(Ready::readable());
-///         });
-///
-///         Deadline {
-///             when: when,
-///             registration: registration,
-///         }
-///     }
-///
-///     pub fn is_elapsed(&self) -> bool {
-///         Instant::now() >= self.when
-///     }
-/// }
-///
-/// impl Evented for Deadline {
-///     fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt)
-///         -> io::Result<()>
-///     {
-///         self.registration.register(poll, token, interest, opts)
-///     }
-///
-///     fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt)
-///         -> io::Result<()>
-///     {
-///         self.registration.reregister(poll, token, interest, opts)
-///     }
-///
-///     fn deregister(&self, poll: &Poll) -> io::Result<()> {
-///         poll.deregister(&self.registration)
-///     }
-/// }
-/// ```
-///
-/// [system selector]: struct.Poll.html#implementation-notes
-/// [`Poll`]: struct.Poll.html
-/// [`Registration::new2`]: struct.Registration.html#method.new2
-/// [`Evented`]: event/trait.Evented.html
-/// [`set_readiness`]: struct.SetReadiness.html#method.set_readiness
-/// [`register`]: struct.Poll.html#method.register
-/// [`reregister`]: struct.Poll.html#method.reregister
-/// [`deregister`]: struct.Poll.html#method.deregister
-/// [portability]: struct.Poll.html#portability
-pub struct Registration {
-    inner: RegistrationInner,
-}
-
-unsafe impl Send for Registration {}
-unsafe impl Sync for Registration {}
-
-/// Updates the readiness state of the associated `Registration`.
-///
-/// See [`Registration`] for more documentation on using `SetReadiness` and
-/// [`Poll`] for high level polling documentation.
-///
-/// [`Poll`]: struct.Poll.html
-/// [`Registration`]: struct.Registration.html
-#[derive(Clone)]
-pub struct SetReadiness {
-    inner: RegistrationInner,
-}
-
-unsafe impl Send for SetReadiness {}
-unsafe impl Sync for SetReadiness {}
-
-/// Used to associate an IO type with a Selector
-#[derive(Debug)]
-pub struct SelectorId {
-    id: AtomicUsize,
-}
-
-struct RegistrationInner {
-    // Unsafe pointer to the registration's node. The node is ref counted. This
-    // cannot "simply" be tracked by an Arc because `Poll::poll` has an implicit
-    // handle though it isn't stored anywhere. In other words, `Poll::poll`
-    // needs to decrement the ref count before the node is freed.
-    node: *mut ReadinessNode,
-}
-
-#[derive(Clone)]
-struct ReadinessQueue {
-    inner: Arc<ReadinessQueueInner>,
-}
-
-unsafe impl Send for ReadinessQueue {}
-unsafe impl Sync for ReadinessQueue {}
-
-struct ReadinessQueueInner {
-    // Used to wake up `Poll` when readiness is set in another thread.
-    awakener: sys::Awakener,
-
-    // Head of the MPSC queue used to signal readiness to `Poll::poll`.
-    head_readiness: AtomicPtr<ReadinessNode>,
-
-    // Tail of the readiness queue.
-    //
-    // Only accessed by Poll::poll. Coordination will be handled by the poll fn
-    tail_readiness: UnsafeCell<*mut ReadinessNode>,
-
-    // Fake readiness node used to punctuate the end of the readiness queue.
-    // Before attempting to read from the queue, this node is inserted in order
-    // to partition the queue between nodes that are "owned" by the dequeue end
-    // and nodes that will be pushed on by producers.
-    end_marker: Box<ReadinessNode>,
-
-    // Similar to `end_marker`, but this node signals to producers that `Poll`
-    // has gone to sleep and must be woken up.
-    sleep_marker: Box<ReadinessNode>,
-
-    // Similar to `end_marker`, but the node signals that the queue is closed.
-    // This happens when `ReadyQueue` is dropped and signals to producers that
-    // the nodes should no longer be pushed into the queue.
-    closed_marker: Box<ReadinessNode>,
-}
-
-/// Node shared by a `Registration` / `SetReadiness` pair as well as the node
-/// queued into the MPSC channel.
-struct ReadinessNode {
-    // Node state, see struct docs for `ReadinessState`
-    //
-    // This variable is the primary point of coordination between all the
-    // various threads concurrently accessing the node.
-    state: AtomicState,
-
-    // The registration token cannot fit into the `state` variable, so it is
-    // broken out here. In order to atomically update both the state and token
-    // we have to jump through a few hoops.
-    //
-    // First, `state` includes `token_read_pos` and `token_write_pos`. These can
-    // either be 0, 1, or 2 which represent a token slot. `token_write_pos` is
-    // the token slot that contains the most up to date registration token.
-    // `token_read_pos` is the token slot that `poll` is currently reading from.
-    //
-    // When a call to `update` includes a different token than the one currently
-    // associated with the registration (token_write_pos), first an unused token
-    // slot is found. The unused slot is the one not represented by
-    // `token_read_pos` OR `token_write_pos`. The new token is written to this
-    // slot, then `state` is updated with the new `token_write_pos` value. This
-    // requires that there is only a *single* concurrent call to `update`.
-    //
-    // When `poll` reads a node state, it checks that `token_read_pos` matches
-    // `token_write_pos`. If they do not match, then it atomically updates
-    // `state` such that `token_read_pos` is set to `token_write_pos`. It will
-    // then read the token at the newly updated `token_read_pos`.
-    token_0: UnsafeCell<Token>,
-    token_1: UnsafeCell<Token>,
-    token_2: UnsafeCell<Token>,
-
-    // Used when the node is queued in the readiness linked list. Accessing
-    // this field requires winning the "queue" lock
-    next_readiness: AtomicPtr<ReadinessNode>,
-
-    // Ensures that there is only one concurrent call to `update`.
-    //
-    // Each call to `update` will attempt to swap `update_lock` from `false` to
-    // `true`. If the CAS succeeds, the thread has obtained the update lock. If
-    // the CAS fails, then the `update` call returns immediately and the update
-    // is discarded.
-    update_lock: AtomicBool,
-
-    // Pointer to Arc<ReadinessQueueInner>
-    readiness_queue: AtomicPtr<()>,
-
-    // Tracks the number of `ReadyRef` pointers
-    ref_count: AtomicUsize,
-}
-
-/// Stores the ReadinessNode state in an AtomicUsize. This wrapper around the
-/// atomic variable handles encoding / decoding `ReadinessState` values.
-struct AtomicState {
-    inner: AtomicUsize,
+    registry: Registry,
 }
 
-const MASK_2: usize = 4 - 1;
-const MASK_4: usize = 16 - 1;
-const QUEUED_MASK: usize = 1 << QUEUED_SHIFT;
-const DROPPED_MASK: usize = 1 << DROPPED_SHIFT;
-
-const READINESS_SHIFT: usize = 0;
-const INTEREST_SHIFT: usize = 4;
-const POLL_OPT_SHIFT: usize = 8;
-const TOKEN_RD_SHIFT: usize = 12;
-const TOKEN_WR_SHIFT: usize = 14;
-const QUEUED_SHIFT: usize = 16;
-const DROPPED_SHIFT: usize = 17;
-
-/// Tracks all state for a single `ReadinessNode`. The state is packed into a
-/// `usize` variable from low to high bit as follows:
-///
-/// 4 bits: Registration current readiness
-/// 4 bits: Registration interest
-/// 4 bits: Poll options
-/// 2 bits: Token position currently being read from by `poll`
-/// 2 bits: Token position last written to by `update`
-/// 1 bit:  Queued flag, set when node is being pushed into MPSC queue.
-/// 1 bit:  Dropped flag, set when all `Registration` handles have been dropped.
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-struct ReadinessState(usize);
-
-/// Returned by `dequeue_node`. Represents the different states as described by
-/// the queue documentation on 1024cores.net.
-enum Dequeue {
-    Data(*mut ReadinessNode),
-    Empty,
-    Inconsistent,
+/// Registers I/O resources.
+pub struct Registry {
+    selector: sys::Selector,
 }
 
-const AWAKEN: Token = Token(usize::MAX);
-const MAX_REFCOUNT: usize = (isize::MAX) as usize;
-
-/*
- *
- * ===== Poll =====
- *
- */
-
 impl Poll {
-    /// Return a new `Poll` handle.
+    /// Create a separate `Registry` which can be used to register
+    /// `event::Source`s.
+    pub fn registry(&self) -> &Registry {
+        &self.registry
+    }
+
+    /// Wait for readiness events
+    ///
+    /// Blocks the current thread and waits for readiness events for any of the
+    /// [`event::Source`]s that have been registered with this `Poll` instance.
+    /// The function will block until either at least one readiness event has
+    /// been received or `timeout` has elapsed. A `timeout` of `None` means that
+    /// `poll` will block until a readiness event has been received.
+    ///
+    /// The supplied `events` will be cleared and newly received readiness events
+    /// will be pushed onto the end. At most `events.capacity()` events will be
+    /// returned. If there are further pending readiness events, they will be
+    /// returned on the next call to `poll`.
+    ///
+    /// A single call to `poll` may result in multiple readiness events being
+    /// returned for a single event source. For example, if a TCP socket becomes
+    /// both readable and writable, it may be possible for a single readiness
+    /// event to be returned with both [`readable`] and [`writable`] readiness
+    /// **OR** two separate events may be returned, one with [`readable`] set
+    /// and one with [`writable`] set.
     ///
-    /// This function will make a syscall to the operating system to create the
-    /// system selector. If this syscall fails, `Poll::new` will return with the
-    /// error.
+    /// Note that the `timeout` will be rounded up to the system clock
+    /// granularity (usually 1ms), and kernel scheduling delays mean that
+    /// the blocking interval may be overrun by a small amount.
     ///
-    /// See [struct] level docs for more details.
+    /// See the [struct] level documentation for a higher level discussion of
+    /// polling.
     ///
+    /// [`event::Source`]: ./event/trait.Source.html
+    /// [`readable`]: struct.Interest.html#associatedconstant.READABLE
+    /// [`writable`]: struct.Interest.html#associatedconstant.WRITABLE
     /// [struct]: struct.Poll.html
+    /// [`iter`]: ./event/struct.Events.html#method.iter
+    ///
+    /// # Notes
+    ///
+    /// This returns any errors without attempting to retry, previous versions
+    /// of Mio would automatically retry the poll call if it was interrupted
+    /// (if `EINTR` was returned).
     ///
     /// # Examples
     ///
-    /// ```
+    /// A basic example -- establishing a `TcpStream` connection.
+    ///
+    #[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+    #[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
     /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Poll, Events};
-    /// use std::time::Duration;
+    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// use mio::{Events, Poll, Interest, Token};
+    /// use mio::net::TcpStream;
     ///
-    /// let poll = match Poll::new() {
-    ///     Ok(poll) => poll,
-    ///     Err(e) => panic!("failed to create Poll instance; err={:?}", e),
-    /// };
+    /// use std::net::{TcpListener, SocketAddr};
+    /// use std::thread;
+    ///
+    /// // Bind a server socket to connect to.
+    /// let addr: SocketAddr = "127.0.0.1:0".parse()?;
+    /// let server = TcpListener::bind(addr)?;
+    /// let addr = server.local_addr()?.clone();
+    ///
+    /// // Spawn a thread to accept the socket
+    /// thread::spawn(move || {
+    ///     let _ = server.accept();
+    /// });
     ///
-    /// // Create a structure to receive polled events
+    /// // Construct a new `Poll` handle as well as the `Events` we'll store into
+    /// let mut poll = Poll::new()?;
     /// let mut events = Events::with_capacity(1024);
     ///
-    /// // Wait for events, but none will be received because no `Evented`
-    /// // handles have been registered with this `Poll` instance.
-    /// let n = poll.poll(&mut events, Some(Duration::from_millis(500)))?;
-    /// assert_eq!(n, 0);
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
+    /// // Connect the stream
+    /// let mut stream = TcpStream::connect(addr)?;
+    ///
+    /// // Register the stream with `Poll`
+    /// poll.registry().register(
+    ///     &mut stream,
+    ///     Token(0),
+    ///     Interest::READABLE | Interest::WRITABLE)?;
+    ///
+    /// // Wait for the socket to become ready. This has to happens in a loop to
+    /// // handle spurious wakeups.
+    /// loop {
+    ///     poll.poll(&mut events, None)?;
+    ///
+    ///     for event in &events {
+    ///         if event.token() == Token(0) && event.is_writable() {
+    ///             // The socket connected (probably, it could still be a spurious
+    ///             // wakeup)
+    ///             return Ok(());
+    ///         }
+    ///     }
+    /// }
     /// # }
     /// ```
-    pub fn new() -> io::Result<Poll> {
-        is_send::<Poll>();
-        is_sync::<Poll>();
+    ///
+    /// [struct]: #
+    pub fn poll(&mut self, events: &mut Events, timeout: Option<Duration>) -> io::Result<()> {
+        self.registry.selector.select(events.sys(), timeout)
+    }
+}
 
-        let poll = Poll {
-            selector: sys::Selector::new()?,
-            readiness_queue: ReadinessQueue::new()?,
-            lock_state: AtomicUsize::new(0),
-            lock: Mutex::new(()),
-            condvar: Condvar::new(),
-        };
+cfg_os_poll! {
+    impl Poll {
+        /// Return a new `Poll` handle.
+        ///
+        /// This function will make a syscall to the operating system to create
+        /// the system selector. If this syscall fails, `Poll::new` will return
+        /// with the error.
+        ///
+        /// See [struct] level docs for more details.
+        ///
+        /// [struct]: struct.Poll.html
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # use std::error::Error;
+        /// # fn main() -> Result<(), Box<dyn Error>> {
+        /// use mio::{Poll, Events};
+        /// use std::time::Duration;
+        ///
+        /// let mut poll = match Poll::new() {
+        ///     Ok(poll) => poll,
+        ///     Err(e) => panic!("failed to create Poll instance; err={:?}", e),
+        /// };
+        ///
+        /// // Create a structure to receive polled events
+        /// let mut events = Events::with_capacity(1024);
+        ///
+        /// // Wait for events, but none will be received because no
+        /// // `event::Source`s have been registered with this `Poll` instance.
+        /// poll.poll(&mut events, Some(Duration::from_millis(500)))?;
+        /// assert!(events.is_empty());
+        /// #     Ok(())
+        /// # }
+        /// ```
+        pub fn new() -> io::Result<Poll> {
+            sys::Selector::new().map(|selector| Poll {
+                registry: Registry { selector },
+            })
+        }
+    }
+}
 
-        // Register the notification wakeup FD with the IO poller
-        poll.readiness_queue.inner.awakener.register(&poll, AWAKEN, Ready::readable(), PollOpt::edge())?;
+#[cfg(unix)]
+impl AsRawFd for Poll {
+    fn as_raw_fd(&self) -> RawFd {
+        self.registry.as_raw_fd()
+    }
+}
 
-        Ok(poll)
+impl fmt::Debug for Poll {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Poll").finish()
     }
+}
 
-    /// Register an `Evented` handle with the `Poll` instance.
+impl Registry {
+    /// Register an [`event::Source`] with the `Poll` instance.
     ///
-    /// Once registered, the `Poll` instance will monitor the `Evented` handle
-    /// for readiness state changes. When it notices a state change, it will
-    /// return a readiness event for the handle the next time [`poll`] is
-    /// called.
+    /// Once registered, the `Poll` instance will monitor the event source for
+    /// readiness state changes. When it notices a state change, it will return
+    /// a readiness event for the handle the next time [`poll`] is called.
     ///
-    /// See the [`struct`] docs for a high level overview.
+    /// See [`Poll`] docs for a high level overview.
     ///
     /// # Arguments
     ///
-    /// `handle: &E: Evented`: This is the handle that the `Poll` instance
-    /// should monitor for readiness state changes.
+    /// `source: &S: event::Source`: This is the source of events that the
+    /// `Poll` instance should monitor for readiness state changes.
     ///
     /// `token: Token`: The caller picks a token to associate with the socket.
     /// When [`poll`] returns an event for the handle, this token is included.
-    /// This allows the caller to map the event to its handle. The token
-    /// associated with the `Evented` handle can be changed at any time by
+    /// This allows the caller to map the event to its source. The token
+    /// associated with the `event::Source` can be changed at any time by
     /// calling [`reregister`].
     ///
-    /// `token` cannot be `Token(usize::MAX)` as it is reserved for internal
-    /// usage.
-    ///
     /// See documentation on [`Token`] for an example showing how to pick
     /// [`Token`] values.
     ///
-    /// `interest: Ready`: Specifies which operations `Poll` should monitor for
-    /// readiness. `Poll` will only return readiness events for operations
+    /// `interest: Interest`: Specifies which operations `Poll` should monitor
+    /// for readiness. `Poll` will only return readiness events for operations
     /// specified by this argument.
     ///
     /// If a socket is registered with readable interest and the socket becomes
     /// writable, no event will be returned from [`poll`].
     ///
-    /// The readiness interest for an `Evented` handle can be changed at any
-    /// time by calling [`reregister`].
-    ///
-    /// `opts: PollOpt`: Specifies the registration options. The most common
-    /// options being [`level`] for level-triggered events, [`edge`] for
-    /// edge-triggered events, and [`oneshot`].
-    ///
-    /// The registration options for an `Evented` handle can be changed at any
-    /// time by calling [`reregister`].
+    /// The readiness interest for an `event::Source` can be changed at any time
+    /// by calling [`reregister`].
     ///
     /// # Notes
     ///
-    /// Unless otherwise specified, the caller should assume that once an
-    /// `Evented` handle is registered with a `Poll` instance, it is bound to
-    /// that `Poll` instance for the lifetime of the `Evented` handle. This
-    /// remains true even if the `Evented` handle is deregistered from the poll
-    /// instance using [`deregister`].
-    ///
-    /// This function is **thread safe**. It can be called concurrently from
-    /// multiple threads.
-    ///
-    /// [`struct`]: #
-    /// [`reregister`]: #method.reregister
-    /// [`deregister`]: #method.deregister
-    /// [`poll`]: #method.poll
-    /// [`level`]: struct.PollOpt.html#method.level
-    /// [`edge`]: struct.PollOpt.html#method.edge
-    /// [`oneshot`]: struct.PollOpt.html#method.oneshot
+    /// Callers must ensure that if a source being registered with a `Poll`
+    /// instance was previously registered with that `Poll` instance, then a
+    /// call to [`deregister`] has already occurred. Consecutive calls to
+    /// `register` is undefined behavior.
+    ///
+    /// Unless otherwise specified, the caller should assume that once an event
+    /// source is registered with a `Poll` instance, it is bound to that `Poll`
+    /// instance for the lifetime of the event source. This remains true even
+    /// if the event source is deregistered from the poll instance using
+    /// [`deregister`].
+    ///
+    /// [`event::Source`]: ./event/trait.Source.html
+    /// [`poll`]: struct.Poll.html#method.poll
+    /// [`reregister`]: struct.Registry.html#method.reregister
+    /// [`deregister`]: struct.Registry.html#method.deregister
     /// [`Token`]: struct.Token.html
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+    #[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
     /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Events, Poll, Ready, PollOpt, Token};
+    /// # use std::net;
+    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// use mio::{Events, Poll, Interest, Token};
     /// use mio::net::TcpStream;
+    /// use std::net::SocketAddr;
     /// use std::time::{Duration, Instant};
     ///
-    /// let poll = Poll::new()?;
-    /// let socket = TcpStream::connect(&"216.58.193.100:80".parse()?)?;
+    /// let mut poll = Poll::new()?;
+    ///
+    /// let address: SocketAddr = "127.0.0.1:0".parse()?;
+    /// let listener = net::TcpListener::bind(address)?;
+    /// let mut socket = TcpStream::connect(listener.local_addr()?)?;
     ///
     /// // Register the socket with `poll`
-    /// poll.register(&socket, Token(0), Ready::readable() | Ready::writable(), PollOpt::edge())?;
+    /// poll.registry().register(
+    ///     &mut socket,
+    ///     Token(0),
+    ///     Interest::READABLE | Interest::WRITABLE)?;
     ///
     /// let mut events = Events::with_capacity(1024);
     /// let start = Instant::now();
@@ -767,49 +469,33 @@
     ///         }
     ///     }
     /// }
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
     /// # }
     /// ```
-    pub fn register<E: ?Sized>(&self, handle: &E, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()>
-        where E: Evented
+    pub fn register<S>(&self, source: &mut S, token: Token, interests: Interest) -> io::Result<()>
+    where
+        S: event::Source + ?Sized,
     {
-        validate_args(token)?;
-
-        /*
-         * Undefined behavior:
-         * - Reusing a token with a different `Evented` without deregistering
-         * (or closing) the original `Evented`.
-         */
-        trace!("registering with poller");
-
-        // Register interests for this socket
-        handle.register(self, token, interest, opts)?;
-
-        Ok(())
+        trace!(
+            "registering event source with poller: token={:?}, interests={:?}",
+            token,
+            interests
+        );
+        source.register(self, token, interests)
     }
 
-    /// Re-register an `Evented` handle with the `Poll` instance.
-    ///
-    /// Re-registering an `Evented` handle allows changing the details of the
-    /// registration. Specifically, it allows updating the associated `token`,
-    /// `interest`, and `opts` specified in previous `register` and `reregister`
-    /// calls.
+    /// Re-register an [`event::Source`] with the `Poll` instance.
+    ///
+    /// Re-registering an event source allows changing the details of the
+    /// registration. Specifically, it allows updating the associated `token`
+    /// and `interests` specified in previous `register` and `reregister` calls.
     ///
     /// The `reregister` arguments fully override the previous values. In other
     /// words, if a socket is registered with [`readable`] interest and the call
     /// to `reregister` specifies [`writable`], then read interest is no longer
     /// requested for the handle.
     ///
-    /// The `Evented` handle must have previously been registered with this
-    /// instance of `Poll` otherwise the call to `reregister` will return with
-    /// an error.
-    ///
-    /// `token` cannot be `Token(usize::MAX)` as it is reserved for internal
-    /// usage.
+    /// The event source must have previously been registered with this instance
+    /// of `Poll`, otherwise the behavior is undefined.
     ///
     /// See the [`register`] documentation for details about the function
     /// arguments and see the [`struct`] docs for a high level overview of
@@ -817,1967 +503,156 @@
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+    #[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
     /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Poll, Ready, PollOpt, Token};
+    /// # use std::net;
+    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// use mio::{Poll, Interest, Token};
     /// use mio::net::TcpStream;
+    /// use std::net::SocketAddr;
     ///
     /// let poll = Poll::new()?;
-    /// let socket = TcpStream::connect(&"216.58.193.100:80".parse()?)?;
     ///
-    /// // Register the socket with `poll`, requesting readable
-    /// poll.register(&socket, Token(0), Ready::readable(), PollOpt::edge())?;
+    /// let address: SocketAddr = "127.0.0.1:0".parse()?;
+    /// let listener = net::TcpListener::bind(address)?;
+    /// let mut socket = TcpStream::connect(listener.local_addr()?)?;
     ///
-    /// // Reregister the socket specifying a different token and write interest
-    /// // instead. `PollOpt::edge()` must be specified even though that value
-    /// // is not being changed.
-    /// poll.reregister(&socket, Token(2), Ready::writable(), PollOpt::edge())?;
+    /// // Register the socket with `poll`, requesting readable
+    /// poll.registry().register(
+    ///     &mut socket,
+    ///     Token(0),
+    ///     Interest::READABLE)?;
+    ///
+    /// // Reregister the socket specifying write interest instead. Even though
+    /// // the token is the same it must be specified.
+    /// poll.registry().reregister(
+    ///     &mut socket,
+    ///     Token(0),
+    ///     Interest::WRITABLE)?;
     /// #     Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
     /// ```
     ///
-    /// [`struct`]: #
-    /// [`register`]: #method.register
-    /// [`readable`]: struct.Ready.html#method.readable
-    /// [`writable`]: struct.Ready.html#method.writable
-    pub fn reregister<E: ?Sized>(&self, handle: &E, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()>
-        where E: Evented
+    /// [`event::Source`]: ./event/trait.Source.html
+    /// [`struct`]: struct.Poll.html
+    /// [`register`]: struct.Registry.html#method.register
+    /// [`readable`]: ./event/struct.Event.html#is_readable
+    /// [`writable`]: ./event/struct.Event.html#is_writable
+    pub fn reregister<S>(&self, source: &mut S, token: Token, interests: Interest) -> io::Result<()>
+    where
+        S: event::Source + ?Sized,
     {
-        validate_args(token)?;
-
-        trace!("registering with poller");
-
-        // Register interests for this socket
-        handle.reregister(self, token, interest, opts)?;
-
-        Ok(())
-    }
-
-    /// Deregister an `Evented` handle with the `Poll` instance.
+        trace!(
+            "reregistering event source with poller: token={:?}, interests={:?}",
+            token,
+            interests
+        );
+        source.reregister(self, token, interests)
+    }
+
+    /// Deregister an [`event::Source`] with the `Poll` instance.
+    ///
+    /// When an event source is deregistered, the `Poll` instance will no longer
+    /// monitor it for readiness state changes. Deregistering clears up any
+    /// internal resources needed to track the handle.  After an explicit call
+    /// to this method completes, it is guaranteed that the token previously
+    /// registered to this handle will not be returned by a future poll, so long
+    /// as a happens-before relationship is established between this call and
+    /// the poll.
     ///
-    /// When an `Evented` handle is deregistered, the `Poll` instance will
-    /// no longer monitor it for readiness state changes. Unlike disabling
-    /// handles with oneshot, deregistering clears up any internal resources
-    /// needed to track the handle.
+    /// The event source must have previously been registered with this instance
+    /// of `Poll`, otherwise the behavior is undefined.
     ///
     /// A handle can be passed back to `register` after it has been
     /// deregistered; however, it must be passed back to the **same** `Poll`
-    /// instance.
-    ///
-    /// `Evented` handles are automatically deregistered when they are dropped.
-    /// It is common to never need to explicitly call `deregister`.
+    /// instance, otherwise the behavior is undefined.
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+    #[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
     /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Events, Poll, Ready, PollOpt, Token};
+    /// # use std::net;
+    /// # fn main() -> Result<(), Box<dyn Error>> {
+    /// use mio::{Events, Poll, Interest, Token};
     /// use mio::net::TcpStream;
+    /// use std::net::SocketAddr;
     /// use std::time::Duration;
     ///
-    /// let poll = Poll::new()?;
-    /// let socket = TcpStream::connect(&"216.58.193.100:80".parse()?)?;
+    /// let mut poll = Poll::new()?;
+    ///
+    /// let address: SocketAddr = "127.0.0.1:0".parse()?;
+    /// let listener = net::TcpListener::bind(address)?;
+    /// let mut socket = TcpStream::connect(listener.local_addr()?)?;
     ///
     /// // Register the socket with `poll`
-    /// poll.register(&socket, Token(0), Ready::readable(), PollOpt::edge())?;
+    /// poll.registry().register(
+    ///     &mut socket,
+    ///     Token(0),
+    ///     Interest::READABLE)?;
     ///
-    /// poll.deregister(&socket)?;
+    /// poll.registry().deregister(&mut socket)?;
     ///
     /// let mut events = Events::with_capacity(1024);
     ///
     /// // Set a timeout because this poll should never receive any events.
-    /// let n = poll.poll(&mut events, Some(Duration::from_secs(1)))?;
-    /// assert_eq!(0, n);
+    /// poll.poll(&mut events, Some(Duration::from_secs(1)))?;
+    /// assert!(events.is_empty());
     /// #     Ok(())
     /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
     /// ```
-    pub fn deregister<E: ?Sized>(&self, handle: &E) -> io::Result<()>
-        where E: Evented
+    pub fn deregister<S>(&self, source: &mut S) -> io::Result<()>
+    where
+        S: event::Source + ?Sized,
     {
-        trace!("deregistering handle with poller");
-
-        // Deregister interests for this socket
-        handle.deregister(self)?;
-
-        Ok(())
+        trace!("deregistering event source from poller");
+        source.deregister(self)
     }
 
-    /// Wait for readiness events
-    ///
-    /// Blocks the current thread and waits for readiness events for any of the
-    /// `Evented` handles that have been registered with this `Poll` instance.
-    /// The function will block until either at least one readiness event has
-    /// been received or `timeout` has elapsed. A `timeout` of `None` means that
-    /// `poll` will block until a readiness event has been received.
-    ///
-    /// The supplied `events` will be cleared and newly received readiness events
-    /// will be pushed onto the end. At most `events.capacity()` events will be
-    /// returned. If there are further pending readiness events, they will be
-    /// returned on the next call to `poll`.
-    ///
-    /// A single call to `poll` may result in multiple readiness events being
-    /// returned for a single `Evented` handle. For example, if a TCP socket
-    /// becomes both readable and writable, it may be possible for a single
-    /// readiness event to be returned with both [`readable`] and [`writable`]
-    /// readiness **OR** two separate events may be returned, one with
-    /// [`readable`] set and one with [`writable`] set.
-    ///
-    /// Note that the `timeout` will be rounded up to the system clock
-    /// granularity (usually 1ms), and kernel scheduling delays mean that
-    /// the blocking interval may be overrun by a small amount.
-    ///
-    /// `poll` returns the number of readiness events that have been pushed into
-    /// `events` or `Err` when an error has been encountered with the system
-    /// selector.  The value returned is deprecated and will be removed in 0.7.0.
-    /// Accessing the events by index is also deprecated.  Events can be
-    /// inserted by other events triggering, thus making sequential access
-    /// problematic.  Use the iterator API instead.  See [`iter`].
-    ///
-    /// See the [struct] level documentation for a higher level discussion of
-    /// polling.
-    ///
-    /// [`readable`]: struct.Ready.html#method.readable
-    /// [`writable`]: struct.Ready.html#method.writable
-    /// [struct]: #
-    /// [`iter`]: struct.Events.html#method.iter
-    ///
-    /// # Examples
-    ///
-    /// A basic example -- establishing a `TcpStream` connection.
-    ///
-    /// ```
-    /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Events, Poll, Ready, PollOpt, Token};
-    /// use mio::net::TcpStream;
-    ///
-    /// use std::net::{TcpListener, SocketAddr};
-    /// use std::thread;
-    ///
-    /// // Bind a server socket to connect to.
-    /// let addr: SocketAddr = "127.0.0.1:0".parse()?;
-    /// let server = TcpListener::bind(&addr)?;
-    /// let addr = server.local_addr()?.clone();
-    ///
-    /// // Spawn a thread to accept the socket
-    /// thread::spawn(move || {
-    ///     let _ = server.accept();
-    /// });
-    ///
-    /// // Construct a new `Poll` handle as well as the `Events` we'll store into
-    /// let poll = Poll::new()?;
-    /// let mut events = Events::with_capacity(1024);
-    ///
-    /// // Connect the stream
-    /// let stream = TcpStream::connect(&addr)?;
-    ///
-    /// // Register the stream with `Poll`
-    /// poll.register(&stream, Token(0), Ready::readable() | Ready::writable(), PollOpt::edge())?;
-    ///
-    /// // Wait for the socket to become ready. This has to happens in a loop to
-    /// // handle spurious wakeups.
-    /// loop {
-    ///     poll.poll(&mut events, None)?;
-    ///
-    ///     for event in &events {
-    ///         if event.token() == Token(0) && event.readiness().is_writable() {
-    ///             // The socket connected (probably, it could still be a spurious
-    ///             // wakeup)
-    ///             return Ok(());
-    ///         }
-    ///     }
-    /// }
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
-    /// ```
+    /// Creates a new independently owned `Registry`.
     ///
-    /// [struct]: #
-    pub fn poll(&self, events: &mut Events, timeout: Option<Duration>) -> io::Result<usize> {
-        self.poll1(events, timeout, false)
+    /// Event sources registered with this `Registry` will be registered with
+    /// the original `Registry` and `Poll` instance.
+    pub fn try_clone(&self) -> io::Result<Registry> {
+        self.selector
+            .try_clone()
+            .map(|selector| Registry { selector })
     }
 
-    /// Like `poll`, but may be interrupted by a signal
-    ///
-    /// If `poll` is inturrupted while blocking, it will transparently retry the syscall.  If you
-    /// want to handle signals yourself, however, use `poll_interruptible`.
-    pub fn poll_interruptible(&self, events: &mut Events, timeout: Option<Duration>) -> io::Result<usize> {
-        self.poll1(events, timeout, true)
-    }
-
-    fn poll1(&self, events: &mut Events, mut timeout: Option<Duration>, interruptible: bool) -> io::Result<usize> {
-        let zero = Some(Duration::from_millis(0));
-
-        // At a high level, the synchronization strategy is to acquire access to
-        // the critical section by transitioning the atomic from unlocked ->
-        // locked. If the attempt fails, the thread will wait on the condition
-        // variable.
-        //
-        // # Some more detail
-        //
-        // The `lock_state` atomic usize combines:
-        //
-        // - locked flag, stored in the least significant bit
-        // - number of waiting threads, stored in the rest of the bits.
-        //
-        // When a thread transitions the locked flag from 0 -> 1, it has
-        // obtained access to the critical section.
-        //
-        // When entering `poll`, a compare-and-swap from 0 -> 1 is attempted.
-        // This is a fast path for the case when there are no concurrent calls
-        // to poll, which is very common.
-        //
-        // On failure, the mutex is locked, and the thread attempts to increment
-        // the number of waiting threads component of `lock_state`. If this is
-        // successfully done while the locked flag is set, then the thread can
-        // wait on the condition variable.
-        //
-        // When a thread exits the critical section, it unsets the locked flag.
-        // If there are any waiters, which is atomically determined while
-        // unsetting the locked flag, then the condvar is notified.
-
-        let mut curr = self.lock_state.compare_and_swap(0, 1, SeqCst);
-
-        if 0 != curr {
-            // Enter slower path
-            let mut lock = self.lock.lock().unwrap();
-            let mut inc = false;
-
-            loop {
-                if curr & 1 == 0 {
-                    // The lock is currently free, attempt to grab it
-                    let mut next = curr | 1;
-
-                    if inc {
-                        // The waiter count has previously been incremented, so
-                        // decrement it here
-                        next -= 2;
-                    }
-
-                    let actual = self.lock_state.compare_and_swap(curr, next, SeqCst);
-
-                    if actual != curr {
-                        curr = actual;
-                        continue;
-                    }
-
-                    // Lock acquired, break from the loop
-                    break;
-                }
-
-                if timeout == zero {
-                    if inc {
-                        self.lock_state.fetch_sub(2, SeqCst);
-                    }
-
-                    return Ok(0);
-                }
-
-                // The lock is currently held, so wait for it to become
-                // free. If the waiter count hasn't been incremented yet, do
-                // so now
-                if !inc {
-                    let next = curr.checked_add(2).expect("overflow");
-                    let actual = self.lock_state.compare_and_swap(curr, next, SeqCst);
-
-                    if actual != curr {
-                        curr = actual;
-                        continue;
-                    }
-
-                    // Track that the waiter count has been incremented for
-                    // this thread and fall through to the condvar waiting
-                    inc = true;
-                }
-
-                lock = match timeout {
-                    Some(to) => {
-                        let now = Instant::now();
-
-                        // Wait to be notified
-                        let (l, _) = self.condvar.wait_timeout(lock, to).unwrap();
-
-                        // See how much time was elapsed in the wait
-                        let elapsed = now.elapsed();
-
-                        // Update `timeout` to reflect how much time is left to
-                        // wait.
-                        if elapsed >= to {
-                            timeout = zero;
-                        } else {
-                            // Update the timeout
-                            timeout = Some(to - elapsed);
-                        }
-
-                        l
-                    }
-                    None => {
-                        self.condvar.wait(lock).unwrap()
-                    }
-                };
-
-                // Reload the state
-                curr = self.lock_state.load(SeqCst);
-
-                // Try to lock again...
-            }
-        }
-
-        let ret = self.poll2(events, timeout, interruptible);
-
-        // Release the lock
-        if 1 != self.lock_state.fetch_and(!1, Release) {
-            // Acquire the mutex
-            let _lock = self.lock.lock().unwrap();
-
-            // There is at least one waiting thread, so notify one
-            self.condvar.notify_one();
-        }
-
-        ret
-    }
-
-    #[inline]
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::if_same_then_else))]
-    fn poll2(&self, events: &mut Events, mut timeout: Option<Duration>, interruptible: bool) -> io::Result<usize> {
-        // Compute the timeout value passed to the system selector. If the
-        // readiness queue has pending nodes, we still want to poll the system
-        // selector for new events, but we don't want to block the thread to
-        // wait for new events.
-        if timeout == Some(Duration::from_millis(0)) {
-            // If blocking is not requested, then there is no need to prepare
-            // the queue for sleep
-            //
-            // The sleep_marker should be removed by readiness_queue.poll().
-        } else if self.readiness_queue.prepare_for_sleep() {
-            // The readiness queue is empty. The call to `prepare_for_sleep`
-            // inserts `sleep_marker` into the queue. This signals to any
-            // threads setting readiness that the `Poll::poll` is going to
-            // sleep, so the awakener should be used.
-        } else {
-            // The readiness queue is not empty, so do not block the thread.
-            timeout = Some(Duration::from_millis(0));
-        }
-
-        loop {
-            let now = Instant::now();
-            // First get selector events
-            let res = self.selector.select(&mut events.inner, AWAKEN, timeout);
-            match res {
-                Ok(true) => {
-                    // Some awakeners require reading from a FD.
-                    self.readiness_queue.inner.awakener.cleanup();
-                    break;
-                }
-                Ok(false) => break,
-                Err(ref e) if e.kind() == io::ErrorKind::Interrupted && !interruptible => {
-                    // Interrupted by a signal; update timeout if necessary and retry
-                    if let Some(to) = timeout {
-                        let elapsed = now.elapsed();
-                        if elapsed >= to {
-                            break;
-                        } else {
-                            timeout = Some(to - elapsed);
-                        }
-                    }
-                }
-                Err(e) => return Err(e),
-            }
+    /// Internal check to ensure only a single `Waker` is active per [`Poll`]
+    /// instance.
+    #[cfg(debug_assertions)]
+    pub(crate) fn register_waker(&self) {
+        if self.selector.register_waker() {
+            panic!("Only a single `Waker` can be active per `Poll` instance");
         }
-
-        // Poll custom event queue
-        self.readiness_queue.poll(&mut events.inner);
-
-        // Return number of polled events
-        Ok(events.inner.len())
     }
 }
 
-fn validate_args(token: Token) -> io::Result<()> {
-    if token == AWAKEN {
-        return Err(io::Error::new(io::ErrorKind::Other, "invalid token"));
-    }
-
-    Ok(())
-}
-
-impl fmt::Debug for Poll {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("Poll")
-            .finish()
+impl fmt::Debug for Registry {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Registry").finish()
     }
 }
 
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl AsRawFd for Poll {
+#[cfg(unix)]
+impl AsRawFd for Registry {
     fn as_raw_fd(&self) -> RawFd {
         self.selector.as_raw_fd()
     }
 }
 
-/// A collection of readiness events.
-///
-/// `Events` is passed as an argument to [`Poll::poll`] and will be used to
-/// receive any new readiness events received since the last poll. Usually, a
-/// single `Events` instance is created at the same time as a [`Poll`] and
-/// reused on each call to [`Poll::poll`].
-///
-/// See [`Poll`] for more documentation on polling.
-///
-/// # Examples
-///
-/// ```
-/// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Events, Poll};
-/// use std::time::Duration;
-///
-/// let mut events = Events::with_capacity(1024);
-/// let poll = Poll::new()?;
-///
-/// assert_eq!(0, events.len());
-///
-/// // Register `Evented` handles with `poll`
-///
-/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
-///
-/// for event in &events {
-///     println!("event={:?}", event);
-/// }
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-///
-/// [`Poll::poll`]: struct.Poll.html#method.poll
-/// [`Poll`]: struct.Poll.html
-pub struct Events {
-    inner: sys::Events,
-}
-
-/// [`Events`] iterator.
-///
-/// This struct is created by the [`iter`] method on [`Events`].
-///
-/// # Examples
-///
-/// ```
-/// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Events, Poll};
-/// use std::time::Duration;
-///
-/// let mut events = Events::with_capacity(1024);
-/// let poll = Poll::new()?;
-///
-/// // Register handles with `poll`
-///
-/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
-///
-/// for event in events.iter() {
-///     println!("event={:?}", event);
-/// }
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-///
-/// [`Events`]: struct.Events.html
-/// [`iter`]: struct.Events.html#method.iter
-#[derive(Debug, Clone)]
-pub struct Iter<'a> {
-    inner: &'a Events,
-    pos: usize,
-}
-
-/// Owned [`Events`] iterator.
-///
-/// This struct is created by the `into_iter` method on [`Events`].
-///
-/// # Examples
-///
-/// ```
-/// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Events, Poll};
-/// use std::time::Duration;
-///
-/// let mut events = Events::with_capacity(1024);
-/// let poll = Poll::new()?;
-///
-/// // Register handles with `poll`
-///
-/// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
-///
-/// for event in events {
-///     println!("event={:?}", event);
-/// }
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-/// [`Events`]: struct.Events.html
-#[derive(Debug)]
-pub struct IntoIter {
-    inner: Events,
-    pos: usize,
-}
-
-impl Events {
-    /// Return a new `Events` capable of holding up to `capacity` events.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Events;
-    ///
-    /// let events = Events::with_capacity(1024);
-    ///
-    /// assert_eq!(1024, events.capacity());
-    /// ```
-    pub fn with_capacity(capacity: usize) -> Events {
-        Events {
-            inner: sys::Events::with_capacity(capacity),
-        }
-    }
-
-    #[deprecated(since="0.6.10", note="Index access removed in favor of iterator only API.")]
-    #[doc(hidden)]
-    pub fn get(&self, idx: usize) -> Option<Event> {
-        self.inner.get(idx)
-    }
-
-    #[doc(hidden)]
-    #[deprecated(since="0.6.10", note="Index access removed in favor of iterator only API.")]
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    /// Returns the number of `Event` values that `self` can hold.
-    ///
-    /// ```
-    /// use mio::Events;
-    ///
-    /// let events = Events::with_capacity(1024);
-    ///
-    /// assert_eq!(1024, events.capacity());
-    /// ```
-    pub fn capacity(&self) -> usize {
-        self.inner.capacity()
-    }
-
-    /// Returns `true` if `self` contains no `Event` values.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::Events;
-    ///
-    /// let events = Events::with_capacity(1024);
-    ///
-    /// assert!(events.is_empty());
-    /// ```
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
-
-    /// Returns an iterator over the `Event` values.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Events, Poll};
-    /// use std::time::Duration;
-    ///
-    /// let mut events = Events::with_capacity(1024);
-    /// let poll = Poll::new()?;
-    ///
-    /// // Register handles with `poll`
-    ///
-    /// poll.poll(&mut events, Some(Duration::from_millis(100)))?;
-    ///
-    /// for event in events.iter() {
-    ///     println!("event={:?}", event);
-    /// }
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
-    /// ```
-    pub fn iter(&self) -> Iter {
-        Iter {
-            inner: self,
-            pos: 0
-        }
-    }
-
-    /// Clearing all `Event` values from container explicitly.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Events, Poll};
-    /// use std::time::Duration;
-    ///
-    /// let mut events = Events::with_capacity(1024);
-    /// let poll = Poll::new()?;
-    ///
-    /// // Register handles with `poll`
-    /// for _ in 0..2 {
-    ///     events.clear();
-    ///     poll.poll(&mut events, Some(Duration::from_millis(100)))?;
-    ///
-    ///     for event in events.iter() {
-    ///         println!("event={:?}", event);
-    ///     }
-    /// }
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
-    /// ```
-    pub fn clear(&mut self) {
-        self.inner.clear();
-    }
-}
-
-impl<'a> IntoIterator for &'a Events {
-    type Item = Event;
-    type IntoIter = Iter<'a>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-impl<'a> Iterator for Iter<'a> {
-    type Item = Event;
-
-    fn next(&mut self) -> Option<Event> {
-        let ret = self.inner.inner.get(self.pos);
-        self.pos += 1;
-        ret
-    }
-}
-
-impl IntoIterator for Events {
-    type Item = Event;
-    type IntoIter = IntoIter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        IntoIter {
-            inner: self,
-            pos: 0,
-        }
-    }
-}
-
-impl Iterator for IntoIter {
-    type Item = Event;
-
-    fn next(&mut self) -> Option<Event> {
-        let ret = self.inner.inner.get(self.pos);
-        self.pos += 1;
-        ret
-    }
-}
-
-impl fmt::Debug for Events {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Events")
-            .field("capacity", &self.capacity())
-            .finish()
-    }
-}
-
-// ===== Accessors for internal usage =====
-
-pub fn selector(poll: &Poll) -> &sys::Selector {
-    &poll.selector
-}
-
-/*
- *
- * ===== Registration =====
- *
- */
-
-// TODO: get rid of this, windows depends on it for now
-#[allow(dead_code)]
-pub fn new_registration(poll: &Poll, token: Token, ready: Ready, opt: PollOpt)
-        -> (Registration, SetReadiness)
-{
-    Registration::new_priv(poll, token, ready, opt)
-}
-
-impl Registration {
-    /// Create and return a new `Registration` and the associated
-    /// `SetReadiness`.
-    ///
-    /// See [struct] documentation for more detail and [`Poll`]
-    /// for high level documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Events, Ready, Registration, Poll, PollOpt, Token};
-    /// use std::thread;
-    ///
-    /// let (registration, set_readiness) = Registration::new2();
-    ///
-    /// thread::spawn(move || {
-    ///     use std::time::Duration;
-    ///     thread::sleep(Duration::from_millis(500));
-    ///
-    ///     set_readiness.set_readiness(Ready::readable());
-    /// });
-    ///
-    /// let poll = Poll::new()?;
-    /// poll.register(&registration, Token(0), Ready::readable() | Ready::writable(), PollOpt::edge())?;
-    ///
-    /// let mut events = Events::with_capacity(256);
-    ///
-    /// loop {
-    ///     poll.poll(&mut events, None);
-    ///
-    ///     for event in &events {
-    ///         if event.token() == Token(0) && event.readiness().is_readable() {
-    ///             return Ok(());
-    ///         }
-    ///     }
-    /// }
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
-    /// ```
-    /// [struct]: #
-    /// [`Poll`]: struct.Poll.html
-    pub fn new2() -> (Registration, SetReadiness) {
-        // Allocate the registration node. The new node will have `ref_count`
-        // set to 2: one SetReadiness, one Registration.
-        let node = Box::into_raw(Box::new(ReadinessNode::new(
-                    ptr::null_mut(), Token(0), Ready::empty(), PollOpt::empty(), 2)));
-
-        let registration = Registration {
-            inner: RegistrationInner {
-                node,
-            },
-        };
-
-        let set_readiness = SetReadiness {
-            inner: RegistrationInner {
-                node,
-            },
-        };
-
-        (registration, set_readiness)
-    }
-
-    #[deprecated(since = "0.6.5", note = "use `new2` instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    pub fn new(poll: &Poll, token: Token, interest: Ready, opt: PollOpt)
-        -> (Registration, SetReadiness)
-    {
-        Registration::new_priv(poll, token, interest, opt)
-    }
-
-    // TODO: Get rid of this (windows depends on it for now)
-    fn new_priv(poll: &Poll, token: Token, interest: Ready, opt: PollOpt)
-        -> (Registration, SetReadiness)
-    {
-        is_send::<Registration>();
-        is_sync::<Registration>();
-        is_send::<SetReadiness>();
-        is_sync::<SetReadiness>();
-
-        // Clone handle to the readiness queue, this bumps the ref count
-        let queue = poll.readiness_queue.inner.clone();
-
-        // Convert to a *mut () pointer
-        let queue: *mut () = unsafe { mem::transmute(queue) };
-
-        // Allocate the registration node. The new node will have `ref_count`
-        // set to 3: one SetReadiness, one Registration, and one Poll handle.
-        let node = Box::into_raw(Box::new(ReadinessNode::new(
-                    queue, token, interest, opt, 3)));
-
-        let registration = Registration {
-            inner: RegistrationInner {
-                node,
-            },
-        };
-
-        let set_readiness = SetReadiness {
-            inner: RegistrationInner {
-                node,
-            },
-        };
-
-        (registration, set_readiness)
-    }
-
-    #[deprecated(since = "0.6.5", note = "use `Evented` impl")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    pub fn update(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.inner.update(poll, token, interest, opts)
-    }
-
-    #[deprecated(since = "0.6.5", note = "use `Poll::deregister` instead")]
-    #[cfg(feature = "with-deprecated")]
-    #[doc(hidden)]
-    pub fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.inner.update(poll, Token(0), Ready::empty(), PollOpt::empty())
-    }
+/// Get access to the `sys::Selector` from `Registry`.
+pub(crate) fn selector(registry: &Registry) -> &sys::Selector {
+    &registry.selector
 }
 
-impl Evented for Registration {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.inner.update(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.inner.update(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.inner.update(poll, Token(0), Ready::empty(), PollOpt::empty())
+cfg_os_poll! {
+    #[cfg(unix)]
+    #[test]
+    pub fn as_raw_fd() {
+        let poll = Poll::new().unwrap();
+        assert!(poll.as_raw_fd() > 0);
     }
 }
-
-impl Drop for Registration {
-    fn drop(&mut self) {
-        // `flag_as_dropped` toggles the `dropped` flag and notifies
-        // `Poll::poll` to release its handle (which is just decrementing
-        // the ref count).
-        if self.inner.state.flag_as_dropped() {
-            // Can't do anything if the queuing fails
-            let _ = self.inner.enqueue_with_wakeup();
-        }
-    }
-}
-
-impl fmt::Debug for Registration {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("Registration")
-            .finish()
-    }
-}
-
-impl SetReadiness {
-    /// Returns the registration's current readiness.
-    ///
-    /// # Note
-    ///
-    /// There is no guarantee that `readiness` establishes any sort of memory
-    /// ordering. Any concurrent data access must be synchronized using another
-    /// strategy.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Registration, Ready};
-    ///
-    /// let (registration, set_readiness) = Registration::new2();
-    ///
-    /// assert!(set_readiness.readiness().is_empty());
-    ///
-    /// set_readiness.set_readiness(Ready::readable())?;
-    /// assert!(set_readiness.readiness().is_readable());
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
-    /// ```
-    pub fn readiness(&self) -> Ready {
-        self.inner.readiness()
-    }
-
-    /// Set the registration's readiness
-    ///
-    /// If the associated `Registration` is registered with a [`Poll`] instance
-    /// and has requested readiness events that include `ready`, then a future
-    /// call to [`Poll::poll`] will receive a readiness event representing the
-    /// readiness state change.
-    ///
-    /// # Note
-    ///
-    /// There is no guarantee that `readiness` establishes any sort of memory
-    /// ordering. Any concurrent data access must be synchronized using another
-    /// strategy.
-    ///
-    /// There is also no guarantee as to when the readiness event will be
-    /// delivered to poll. A best attempt will be made to make the delivery in a
-    /// "timely" fashion. For example, the following is **not** guaranteed to
-    /// work:
-    ///
-    /// ```
-    /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Events, Registration, Ready, Poll, PollOpt, Token};
-    ///
-    /// let poll = Poll::new()?;
-    /// let (registration, set_readiness) = Registration::new2();
-    ///
-    /// poll.register(&registration,
-    ///               Token(0),
-    ///               Ready::readable(),
-    ///               PollOpt::edge())?;
-    ///
-    /// // Set the readiness, then immediately poll to try to get the readiness
-    /// // event
-    /// set_readiness.set_readiness(Ready::readable())?;
-    ///
-    /// let mut events = Events::with_capacity(1024);
-    /// poll.poll(&mut events, None)?;
-    ///
-    /// // There is NO guarantee that the following will work. It is possible
-    /// // that the readiness event will be delivered at a later time.
-    /// let event = events.get(0).unwrap();
-    /// assert_eq!(event.token(), Token(0));
-    /// assert!(event.readiness().is_readable());
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
-    /// ```
-    ///
-    /// # Examples
-    ///
-    /// A simple example, for a more elaborate example, see the [`Evented`]
-    /// documentation.
-    ///
-    /// ```
-    /// # use std::error::Error;
-    /// # fn try_main() -> Result<(), Box<Error>> {
-    /// use mio::{Registration, Ready};
-    ///
-    /// let (registration, set_readiness) = Registration::new2();
-    ///
-    /// assert!(set_readiness.readiness().is_empty());
-    ///
-    /// set_readiness.set_readiness(Ready::readable())?;
-    /// assert!(set_readiness.readiness().is_readable());
-    /// #     Ok(())
-    /// # }
-    /// #
-    /// # fn main() {
-    /// #     try_main().unwrap();
-    /// # }
-    /// ```
-    ///
-    /// [`Registration`]: struct.Registration.html
-    /// [`Evented`]: event/trait.Evented.html#examples
-    /// [`Poll`]: struct.Poll.html
-    /// [`Poll::poll`]: struct.Poll.html#method.poll
-    pub fn set_readiness(&self, ready: Ready) -> io::Result<()> {
-        self.inner.set_readiness(ready)
-    }
-}
-
-impl fmt::Debug for SetReadiness {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("SetReadiness")
-            .finish()
-    }
-}
-
-impl RegistrationInner {
-    /// Get the registration's readiness.
-    fn readiness(&self) -> Ready {
-        self.state.load(Relaxed).readiness()
-    }
-
-    /// Set the registration's readiness.
-    ///
-    /// This function can be called concurrently by an arbitrary number of
-    /// SetReadiness handles.
-    fn set_readiness(&self, ready: Ready) -> io::Result<()> {
-        // Load the current atomic state.
-        let mut state = self.state.load(Acquire);
-        let mut next;
-
-        loop {
-            next = state;
-
-            if state.is_dropped() {
-                // Node is dropped, no more notifications
-                return Ok(());
-            }
-
-            // Update the readiness
-            next.set_readiness(ready);
-
-            // If the readiness is not blank, try to obtain permission to
-            // push the node into the readiness queue.
-            if !next.effective_readiness().is_empty() {
-                next.set_queued();
-            }
-
-            let actual = self.state.compare_and_swap(state, next, AcqRel);
-
-            if state == actual {
-                break;
-            }
-
-            state = actual;
-        }
-
-        if !state.is_queued() && next.is_queued() {
-            // We toggled the queued flag, making us responsible for queuing the
-            // node in the MPSC readiness queue.
-            self.enqueue_with_wakeup()?;
-        }
-
-        Ok(())
-    }
-
-    /// Update the registration details associated with the node
-    fn update(&self, poll: &Poll, token: Token, interest: Ready, opt: PollOpt) -> io::Result<()> {
-        // First, ensure poll instances match
-        //
-        // Load the queue pointer, `Relaxed` is sufficient here as only the
-        // pointer is being operated on. The actual memory is guaranteed to be
-        // visible the `poll: &Poll` ref passed as an argument to the function.
-        let mut queue = self.readiness_queue.load(Relaxed);
-        let other: &*mut () = unsafe {
-            &*(&poll.readiness_queue.inner as *const _ as *const *mut ())
-        };
-        let other = *other;
-
-        debug_assert!(mem::size_of::<Arc<ReadinessQueueInner>>() == mem::size_of::<*mut ()>());
-
-        if queue.is_null() {
-            // Attempt to set the queue pointer. `Release` ordering synchronizes
-            // with `Acquire` in `ensure_with_wakeup`.
-            let actual = self.readiness_queue.compare_and_swap(
-                queue, other, Release);
-
-            if actual.is_null() {
-                // The CAS succeeded, this means that the node's ref count
-                // should be incremented to reflect that the `poll` function
-                // effectively owns the node as well.
-                //
-                // `Relaxed` ordering used for the same reason as in
-                // RegistrationInner::clone
-                self.ref_count.fetch_add(1, Relaxed);
-
-                // Note that the `queue` reference stored in our
-                // `readiness_queue` field is intended to be a strong reference,
-                // so now that we've successfully claimed the reference we bump
-                // the refcount here.
-                //
-                // Down below in `release_node` when we deallocate this
-                // `RegistrationInner` is where we'll transmute this back to an
-                // arc and decrement the reference count.
-                mem::forget(poll.readiness_queue.clone());
-            } else {
-                // The CAS failed, another thread set the queue pointer, so ensure
-                // that the pointer and `other` match
-                if actual != other {
-                    return Err(io::Error::new(io::ErrorKind::Other, "registration handle associated with another `Poll` instance"));
-                }
-            }
-
-            queue = other;
-        } else if queue != other {
-            return Err(io::Error::new(io::ErrorKind::Other, "registration handle associated with another `Poll` instance"));
-        }
-
-        unsafe {
-            let actual = &poll.readiness_queue.inner as *const _ as *const usize;
-            debug_assert_eq!(queue as usize, *actual);
-        }
-
-        // The `update_lock` atomic is used as a flag ensuring only a single
-        // thread concurrently enters the `update` critical section. Any
-        // concurrent calls to update are discarded. If coordinated updates are
-        // required, the Mio user is responsible for handling that.
-        //
-        // Acquire / Release ordering is used on `update_lock` to ensure that
-        // data access to the `token_*` variables are scoped to the critical
-        // section.
-
-        // Acquire the update lock.
-        if self.update_lock.compare_and_swap(false, true, Acquire) {
-            // The lock is already held. Discard the update
-            return Ok(());
-        }
-
-        // Relaxed ordering is acceptable here as the only memory that needs to
-        // be visible as part of the update are the `token_*` variables, and
-        // ordering has already been handled by the `update_lock` access.
-        let mut state = self.state.load(Relaxed);
-        let mut next;
-
-        // Read the current token, again this memory has been ordered by the
-        // acquire on `update_lock`.
-        let curr_token_pos = state.token_write_pos();
-        let curr_token = unsafe { self::token(self, curr_token_pos) };
-
-        let mut next_token_pos = curr_token_pos;
-
-        // If the `update` call is changing the token, then compute the next
-        // available token slot and write the token there.
-        //
-        // Note that this computation is happening *outside* of the
-        // compare-and-swap loop. The update lock ensures that only a single
-        // thread could be mutating the write_token_position, so the
-        // `next_token_pos` will never need to be recomputed even if
-        // `token_read_pos` concurrently changes. This is because
-        // `token_read_pos` can ONLY concurrently change to the current value of
-        // `token_write_pos`, so `next_token_pos` will always remain valid.
-        if token != curr_token {
-            next_token_pos = state.next_token_pos();
-
-            // Update the token
-            match next_token_pos {
-                0 => unsafe { *self.token_0.get() = token },
-                1 => unsafe { *self.token_1.get() = token },
-                2 => unsafe { *self.token_2.get() = token },
-                _ => unreachable!(),
-            }
-        }
-
-        // Now enter the compare-and-swap loop
-        loop {
-            next = state;
-
-            // The node is only dropped once all `Registration` handles are
-            // dropped. Only `Registration` can call `update`.
-            debug_assert!(!state.is_dropped());
-
-            // Update the write token position, this will also release the token
-            // to Poll::poll.
-            next.set_token_write_pos(next_token_pos);
-
-            // Update readiness and poll opts
-            next.set_interest(interest);
-            next.set_poll_opt(opt);
-
-            // If there is effective readiness, the node will need to be queued
-            // for processing. This exact behavior is still TBD, so we are
-            // conservative for now and always fire.
-            //
-            // See https://github.com/carllerche/mio/issues/535.
-            if !next.effective_readiness().is_empty() {
-                next.set_queued();
-            }
-
-            // compare-and-swap the state values. Only `Release` is needed here.
-            // The `Release` ensures that `Poll::poll` will see the token
-            // update and the update function doesn't care about any other
-            // memory visibility.
-            let actual = self.state.compare_and_swap(state, next, Release);
-
-            if actual == state {
-                break;
-            }
-
-            // CAS failed, but `curr_token_pos` should not have changed given
-            // that we still hold the update lock.
-            debug_assert_eq!(curr_token_pos, actual.token_write_pos());
-
-            state = actual;
-        }
-
-        // Release the lock
-        self.update_lock.store(false, Release);
-
-        if !state.is_queued() && next.is_queued() {
-            // We are responsible for enqueing the node.
-            enqueue_with_wakeup(queue, self)?;
-        }
-
-        Ok(())
-    }
-}
-
-impl ops::Deref for RegistrationInner {
-    type Target = ReadinessNode;
-
-    fn deref(&self) -> &ReadinessNode {
-        unsafe { &*self.node }
-    }
-}
-
-impl Clone for RegistrationInner {
-    fn clone(&self) -> RegistrationInner {
-        // Using a relaxed ordering is alright here, as knowledge of the
-        // original reference prevents other threads from erroneously deleting
-        // the object.
-        //
-        // As explained in the [Boost documentation][1], Increasing the
-        // reference counter can always be done with memory_order_relaxed: New
-        // references to an object can only be formed from an existing
-        // reference, and passing an existing reference from one thread to
-        // another must already provide any required synchronization.
-        //
-        // [1]: (www.boost.org/doc/libs/1_55_0/doc/html/atomic/usage_examples.html)
-        let old_size = self.ref_count.fetch_add(1, Relaxed);
-
-        // However we need to guard against massive refcounts in case someone
-        // is `mem::forget`ing Arcs. If we don't do this the count can overflow
-        // and users will use-after free. We racily saturate to `isize::MAX` on
-        // the assumption that there aren't ~2 billion threads incrementing
-        // the reference count at once. This branch will never be taken in
-        // any realistic program.
-        //
-        // We abort because such a program is incredibly degenerate, and we
-        // don't care to support it.
-        if old_size & !MAX_REFCOUNT != 0 {
-            process::abort();
-        }
-
-        RegistrationInner {
-            node: self.node,
-        }
-    }
-}
-
-impl Drop for RegistrationInner {
-    fn drop(&mut self) {
-        // Only handles releasing from `Registration` and `SetReadiness`
-        // handles. Poll has to call this itself.
-        release_node(self.node);
-    }
-}
-
-/*
- *
- * ===== ReadinessQueue =====
- *
- */
-
-impl ReadinessQueue {
-    /// Create a new `ReadinessQueue`.
-    fn new() -> io::Result<ReadinessQueue> {
-        is_send::<Self>();
-        is_sync::<Self>();
-
-        let end_marker = Box::new(ReadinessNode::marker());
-        let sleep_marker = Box::new(ReadinessNode::marker());
-        let closed_marker = Box::new(ReadinessNode::marker());
-
-        let ptr = &*end_marker as *const _ as *mut _;
-
-        Ok(ReadinessQueue {
-            inner: Arc::new(ReadinessQueueInner {
-                awakener: sys::Awakener::new()?,
-                head_readiness: AtomicPtr::new(ptr),
-                tail_readiness: UnsafeCell::new(ptr),
-                end_marker,
-                sleep_marker,
-                closed_marker,
-            })
-        })
-    }
-
-    /// Poll the queue for new events
-    fn poll(&self, dst: &mut sys::Events) {
-        // `until` is set with the first node that gets re-enqueued due to being
-        // set to have level-triggered notifications. This prevents an infinite
-        // loop where `Poll::poll` will keep dequeuing nodes it enqueues.
-        let mut until = ptr::null_mut();
-
-        if dst.len() == dst.capacity() {
-            // If `dst` is already full, the readiness queue won't be drained.
-            // This might result in `sleep_marker` staying in the queue and
-            // unecessary pipe writes occuring.
-            self.inner.clear_sleep_marker();
-        }
-
-        'outer:
-        while dst.len() < dst.capacity() {
-            // Dequeue a node. If the queue is in an inconsistent state, then
-            // stop polling. `Poll::poll` will be called again shortly and enter
-            // a syscall, which should be enough to enable the other thread to
-            // finish the queuing process.
-            let ptr = match unsafe { self.inner.dequeue_node(until) } {
-                Dequeue::Empty | Dequeue::Inconsistent => break,
-                Dequeue::Data(ptr) => ptr,
-            };
-
-            let node = unsafe { &*ptr };
-
-            // Read the node state with Acquire ordering. This allows reading
-            // the token variables.
-            let mut state = node.state.load(Acquire);
-            let mut next;
-            let mut readiness;
-            let mut opt;
-
-            loop {
-                // Build up any changes to the readiness node's state and
-                // attempt the CAS at the end
-                next = state;
-
-                // Given that the node was just read from the queue, the
-                // `queued` flag should still be set.
-                debug_assert!(state.is_queued());
-
-                // The dropped flag means we need to release the node and
-                // perform no further processing on it.
-                if state.is_dropped() {
-                    // Release the node and continue
-                    release_node(ptr);
-                    continue 'outer;
-                }
-
-                // Process the node
-                readiness = state.effective_readiness();
-                opt = state.poll_opt();
-
-                if opt.is_edge() {
-                    // Mark the node as dequeued
-                    next.set_dequeued();
-
-                    if opt.is_oneshot() && !readiness.is_empty() {
-                        next.disarm();
-                    }
-                } else if readiness.is_empty() {
-                    next.set_dequeued();
-                }
-
-                // Ensure `token_read_pos` is set to `token_write_pos` so that
-                // we read the most up to date token value.
-                next.update_token_read_pos();
-
-                if state == next {
-                    break;
-                }
-
-                let actual = node.state.compare_and_swap(state, next, AcqRel);
-
-                if actual == state {
-                    break;
-                }
-
-                state = actual;
-            }
-
-            // If the queued flag is still set, then the node must be requeued.
-            // This typically happens when using level-triggered notifications.
-            if next.is_queued() {
-                if until.is_null() {
-                    // We never want to see the node again
-                    until = ptr;
-                }
-
-                // Requeue the node
-                self.inner.enqueue_node(node);
-            }
-
-            if !readiness.is_empty() {
-                // Get the token
-                let token = unsafe { token(node, next.token_read_pos()) };
-
-                // Push the event
-                dst.push_event(Event::new(readiness, token));
-            }
-        }
-    }
-
-    /// Prepare the queue for the `Poll::poll` thread to block in the system
-    /// selector. This involves changing `head_readiness` to `sleep_marker`.
-    /// Returns true if successful and `poll` can block.
-    fn prepare_for_sleep(&self) -> bool {
-        let end_marker = self.inner.end_marker();
-        let sleep_marker = self.inner.sleep_marker();
-
-        let tail = unsafe { *self.inner.tail_readiness.get() };
-
-        // If the tail is currently set to the sleep_marker, then check if the
-        // head is as well. If it is, then the queue is currently ready to
-        // sleep. If it is not, then the queue is not empty and there should be
-        // no sleeping.
-        if tail == sleep_marker {
-            return self.inner.head_readiness.load(Acquire) == sleep_marker;
-        }
-
-        // If the tail is not currently set to `end_marker`, then the queue is
-        // not empty.
-        if tail != end_marker {
-            return false;
-        }
-
-        // The sleep marker is *not* currently in the readiness queue.
-        //
-        // The sleep marker is only inserted in this function. It is also only
-        // inserted in the tail position. This is guaranteed by first checking
-        // that the end marker is in the tail position, pushing the sleep marker
-        // after the end marker, then removing the end marker.
-        //
-        // Before inserting a node into the queue, the next pointer has to be
-        // set to null. Again, this is only safe to do when the node is not
-        // currently in the queue, but we already have ensured this.
-        self.inner.sleep_marker.next_readiness.store(ptr::null_mut(), Relaxed);
-
-        let actual = self.inner.head_readiness.compare_and_swap(
-            end_marker, sleep_marker, AcqRel);
-
-        debug_assert!(actual != sleep_marker);
-
-        if actual != end_marker {
-            // The readiness queue is not empty
-            return false;
-        }
-
-        // The current tail should be pointing to `end_marker`
-        debug_assert!(unsafe { *self.inner.tail_readiness.get() == end_marker });
-        // The `end_marker` next pointer should be null
-        debug_assert!(self.inner.end_marker.next_readiness.load(Relaxed).is_null());
-
-        // Update tail pointer.
-        unsafe { *self.inner.tail_readiness.get() = sleep_marker; }
-        true
-    }
-}
-
-impl Drop for ReadinessQueue {
-    fn drop(&mut self) {
-        // Close the queue by enqueuing the closed node
-        self.inner.enqueue_node(&*self.inner.closed_marker);
-
-        loop {
-            // Free any nodes that happen to be left in the readiness queue
-            let ptr = match unsafe { self.inner.dequeue_node(ptr::null_mut()) } {
-                Dequeue::Empty => break,
-                Dequeue::Inconsistent => {
-                    // This really shouldn't be possible as all other handles to
-                    // `ReadinessQueueInner` are dropped, but handle this by
-                    // spinning I guess?
-                    continue;
-                }
-                Dequeue::Data(ptr) => ptr,
-            };
-
-            let node = unsafe { &*ptr };
-
-            let state = node.state.load(Acquire);
-
-            debug_assert!(state.is_queued());
-
-            release_node(ptr);
-        }
-    }
-}
-
-impl ReadinessQueueInner {
-    fn wakeup(&self) -> io::Result<()> {
-        self.awakener.wakeup()
-    }
-
-    /// Prepend the given node to the head of the readiness queue. This is done
-    /// with relaxed ordering. Returns true if `Poll` needs to be woken up.
-    fn enqueue_node_with_wakeup(&self, node: &ReadinessNode) -> io::Result<()> {
-        if self.enqueue_node(node) {
-            self.wakeup()?;
-        }
-
-        Ok(())
-    }
-
-    /// Push the node into the readiness queue
-    fn enqueue_node(&self, node: &ReadinessNode) -> bool {
-        // This is the 1024cores.net intrusive MPSC queue [1] "push" function.
-        let node_ptr = node as *const _ as *mut _;
-
-        // Relaxed used as the ordering is "released" when swapping
-        // `head_readiness`
-        node.next_readiness.store(ptr::null_mut(), Relaxed);
-
-        unsafe {
-            let mut prev = self.head_readiness.load(Acquire);
-
-            loop {
-                if prev == self.closed_marker() {
-                    debug_assert!(node_ptr != self.closed_marker());
-                    // debug_assert!(node_ptr != self.end_marker());
-                    debug_assert!(node_ptr != self.sleep_marker());
-
-                    if node_ptr != self.end_marker() {
-                        // The readiness queue is shutdown, but the enqueue flag was
-                        // set. This means that we are responsible for decrementing
-                        // the ready queue's ref count
-                        debug_assert!(node.ref_count.load(Relaxed) >= 2);
-                        release_node(node_ptr);
-                    }
-
-                    return false;
-                }
-
-                let act = self.head_readiness.compare_and_swap(prev, node_ptr, AcqRel);
-
-                if prev == act {
-                    break;
-                }
-
-                prev = act;
-            }
-
-            debug_assert!((*prev).next_readiness.load(Relaxed).is_null());
-
-            (*prev).next_readiness.store(node_ptr, Release);
-
-            prev == self.sleep_marker()
-        }
-    }
-
-    fn clear_sleep_marker(&self) {
-        let end_marker = self.end_marker();
-        let sleep_marker = self.sleep_marker();
-
-        unsafe {
-            let tail = *self.tail_readiness.get();
-
-            if tail != self.sleep_marker() {
-                return;
-            }
-
-            // The empty markeer is *not* currently in the readiness queue
-            // (since the sleep markeris).
-            self.end_marker.next_readiness.store(ptr::null_mut(), Relaxed);
-
-            let actual = self.head_readiness.compare_and_swap(
-                sleep_marker, end_marker, AcqRel);
-
-            debug_assert!(actual != end_marker);
-
-            if actual != sleep_marker {
-                // The readiness queue is not empty, we cannot remove the sleep
-                // markeer
-                return;
-            }
-
-            // Update the tail pointer.
-            *self.tail_readiness.get() = end_marker;
-        }
-    }
-
-    /// Must only be called in `poll` or `drop`
-    unsafe fn dequeue_node(&self, until: *mut ReadinessNode) -> Dequeue {
-        // This is the 1024cores.net intrusive MPSC queue [1] "pop" function
-        // with the modifications mentioned at the top of the file.
-        let mut tail = *self.tail_readiness.get();
-        let mut next = (*tail).next_readiness.load(Acquire);
-
-        if tail == self.end_marker() || tail == self.sleep_marker() || tail == self.closed_marker() {
-            if next.is_null() {
-                // Make sure the sleep marker is removed (as we are no longer
-                // sleeping
-                self.clear_sleep_marker();
-
-                return Dequeue::Empty;
-            }
-
-            *self.tail_readiness.get() = next;
-            tail = next;
-            next = (*next).next_readiness.load(Acquire);
-        }
-
-        // Only need to check `until` at this point. `until` is either null,
-        // which will never match tail OR it is a node that was pushed by
-        // the current thread. This means that either:
-        //
-        // 1) The queue is inconsistent, which is handled explicitly
-        // 2) We encounter `until` at this point in dequeue
-        // 3) we will pop a different node
-        if tail == until {
-            return Dequeue::Empty;
-        }
-
-        if !next.is_null() {
-            *self.tail_readiness.get() = next;
-            return Dequeue::Data(tail);
-        }
-
-        if self.head_readiness.load(Acquire) != tail {
-            return Dequeue::Inconsistent;
-        }
-
-        // Push the stub node
-        self.enqueue_node(&*self.end_marker);
-
-        next = (*tail).next_readiness.load(Acquire);
-
-        if !next.is_null() {
-            *self.tail_readiness.get() = next;
-            return Dequeue::Data(tail);
-        }
-
-        Dequeue::Inconsistent
-    }
-
-    fn end_marker(&self) -> *mut ReadinessNode {
-        &*self.end_marker as *const ReadinessNode as *mut ReadinessNode
-    }
-
-    fn sleep_marker(&self) -> *mut ReadinessNode {
-        &*self.sleep_marker as *const ReadinessNode as *mut ReadinessNode
-    }
-
-    fn closed_marker(&self) -> *mut ReadinessNode {
-        &*self.closed_marker as *const ReadinessNode as *mut ReadinessNode
-    }
-}
-
-impl ReadinessNode {
-    /// Return a new `ReadinessNode`, initialized with a ref_count of 3.
-    fn new(queue: *mut (),
-           token: Token,
-           interest: Ready,
-           opt: PollOpt,
-           ref_count: usize) -> ReadinessNode
-    {
-        ReadinessNode {
-            state: AtomicState::new(interest, opt),
-            // Only the first token is set, the others are initialized to 0
-            token_0: UnsafeCell::new(token),
-            token_1: UnsafeCell::new(Token(0)),
-            token_2: UnsafeCell::new(Token(0)),
-            next_readiness: AtomicPtr::new(ptr::null_mut()),
-            update_lock: AtomicBool::new(false),
-            readiness_queue: AtomicPtr::new(queue),
-            ref_count: AtomicUsize::new(ref_count),
-        }
-    }
-
-    fn marker() -> ReadinessNode {
-        ReadinessNode {
-            state: AtomicState::new(Ready::empty(), PollOpt::empty()),
-            token_0: UnsafeCell::new(Token(0)),
-            token_1: UnsafeCell::new(Token(0)),
-            token_2: UnsafeCell::new(Token(0)),
-            next_readiness: AtomicPtr::new(ptr::null_mut()),
-            update_lock: AtomicBool::new(false),
-            readiness_queue: AtomicPtr::new(ptr::null_mut()),
-            ref_count: AtomicUsize::new(0),
-        }
-    }
-
-    fn enqueue_with_wakeup(&self) -> io::Result<()> {
-        let queue = self.readiness_queue.load(Acquire);
-
-        if queue.is_null() {
-            // Not associated with a queue, nothing to do
-            return Ok(());
-        }
-
-        enqueue_with_wakeup(queue, self)
-    }
-}
-
-fn enqueue_with_wakeup(queue: *mut (), node: &ReadinessNode) -> io::Result<()> {
-    debug_assert!(!queue.is_null());
-    // This is ugly... but we don't want to bump the ref count.
-    let queue: &Arc<ReadinessQueueInner> = unsafe {
-        &*(&queue as *const *mut () as *const Arc<ReadinessQueueInner>)
-    };
-    queue.enqueue_node_with_wakeup(node)
-}
-
-unsafe fn token(node: &ReadinessNode, pos: usize) -> Token {
-    match pos {
-        0 => *node.token_0.get(),
-        1 => *node.token_1.get(),
-        2 => *node.token_2.get(),
-        _ => unreachable!(),
-    }
-}
-
-fn release_node(ptr: *mut ReadinessNode) {
-    unsafe {
-        // `AcqRel` synchronizes with other `release_node` functions and ensures
-        // that the drop happens after any reads / writes on other threads.
-        if (*ptr).ref_count.fetch_sub(1, AcqRel) != 1 {
-            return;
-        }
-
-        let node = Box::from_raw(ptr);
-
-        // Decrement the readiness_queue Arc
-        let queue = node.readiness_queue.load(Acquire);
-
-        if queue.is_null() {
-            return;
-        }
-
-        let _: Arc<ReadinessQueueInner> = mem::transmute(queue);
-    }
-}
-
-impl AtomicState {
-    fn new(interest: Ready, opt: PollOpt) -> AtomicState {
-        let state = ReadinessState::new(interest, opt);
-
-        AtomicState {
-            inner: AtomicUsize::new(state.into()),
-        }
-    }
-
-    /// Loads the current `ReadinessState`
-    fn load(&self, order: Ordering) -> ReadinessState {
-        self.inner.load(order).into()
-    }
-
-    /// Stores a state if the current state is the same as `current`.
-    fn compare_and_swap(&self, current: ReadinessState, new: ReadinessState, order: Ordering) -> ReadinessState {
-        self.inner.compare_and_swap(current.into(), new.into(), order).into()
-    }
-
-    // Returns `true` if the node should be queued
-    fn flag_as_dropped(&self) -> bool {
-        let prev: ReadinessState = self.inner.fetch_or(DROPPED_MASK | QUEUED_MASK, Release).into();
-        // The flag should not have been previously set
-        debug_assert!(!prev.is_dropped());
-
-        !prev.is_queued()
-    }
-}
-
-impl ReadinessState {
-    // Create a `ReadinessState` initialized with the provided arguments
-    #[inline]
-    fn new(interest: Ready, opt: PollOpt) -> ReadinessState {
-        let interest = event::ready_as_usize(interest);
-        let opt = event::opt_as_usize(opt);
-
-        debug_assert!(interest <= MASK_4);
-        debug_assert!(opt <= MASK_4);
-
-        let mut val = interest << INTEREST_SHIFT;
-        val |= opt << POLL_OPT_SHIFT;
-
-        ReadinessState(val)
-    }
-
-    #[inline]
-    fn get(self, mask: usize, shift: usize) -> usize{
-        (self.0 >> shift) & mask
-    }
-
-    #[inline]
-    fn set(&mut self, val: usize, mask: usize, shift: usize) {
-        self.0 = (self.0 & !(mask << shift)) | (val << shift)
-    }
-
-    /// Get the readiness
-    #[inline]
-    fn readiness(self) -> Ready {
-        let v = self.get(MASK_4, READINESS_SHIFT);
-        event::ready_from_usize(v)
-    }
-
-    #[inline]
-    fn effective_readiness(self) -> Ready {
-        self.readiness() & self.interest()
-    }
-
-    /// Set the readiness
-    #[inline]
-    fn set_readiness(&mut self, v: Ready) {
-        self.set(event::ready_as_usize(v), MASK_4, READINESS_SHIFT);
-    }
-
-    /// Get the interest
-    #[inline]
-    fn interest(self) -> Ready {
-        let v = self.get(MASK_4, INTEREST_SHIFT);
-        event::ready_from_usize(v)
-    }
-
-    /// Set the interest
-    #[inline]
-    fn set_interest(&mut self, v: Ready) {
-        self.set(event::ready_as_usize(v), MASK_4, INTEREST_SHIFT);
-    }
-
-    #[inline]
-    fn disarm(&mut self) {
-        self.set_interest(Ready::empty());
-    }
-
-    /// Get the poll options
-    #[inline]
-    fn poll_opt(self) -> PollOpt {
-        let v = self.get(MASK_4, POLL_OPT_SHIFT);
-        event::opt_from_usize(v)
-    }
-
-    /// Set the poll options
-    #[inline]
-    fn set_poll_opt(&mut self, v: PollOpt) {
-        self.set(event::opt_as_usize(v), MASK_4, POLL_OPT_SHIFT);
-    }
-
-    #[inline]
-    fn is_queued(self) -> bool {
-        self.0 & QUEUED_MASK == QUEUED_MASK
-    }
-
-    /// Set the queued flag
-    #[inline]
-    fn set_queued(&mut self) {
-        // Dropped nodes should never be queued
-        debug_assert!(!self.is_dropped());
-        self.0 |= QUEUED_MASK;
-    }
-
-    #[inline]
-    fn set_dequeued(&mut self) {
-        debug_assert!(self.is_queued());
-        self.0 &= !QUEUED_MASK
-    }
-
-    #[inline]
-    fn is_dropped(self) -> bool {
-        self.0 & DROPPED_MASK == DROPPED_MASK
-    }
-
-    #[inline]
-    fn token_read_pos(self) -> usize {
-        self.get(MASK_2, TOKEN_RD_SHIFT)
-    }
-
-    #[inline]
-    fn token_write_pos(self) -> usize {
-        self.get(MASK_2, TOKEN_WR_SHIFT)
-    }
-
-    #[inline]
-    fn next_token_pos(self) -> usize {
-        let rd = self.token_read_pos();
-        let wr = self.token_write_pos();
-
-        match wr {
-            0 => {
-                match rd {
-                    1 => 2,
-                    2 => 1,
-                    0 => 1,
-                    _ => unreachable!(),
-                }
-            }
-            1 => {
-                match rd {
-                    0 => 2,
-                    2 => 0,
-                    1 => 2,
-                    _ => unreachable!(),
-                }
-            }
-            2 => {
-                match rd {
-                    0 => 1,
-                    1 => 0,
-                    2 => 0,
-                    _ => unreachable!(),
-                }
-            }
-            _ => unreachable!(),
-        }
-    }
-
-    #[inline]
-    fn set_token_write_pos(&mut self, val: usize) {
-        self.set(val, MASK_2, TOKEN_WR_SHIFT);
-    }
-
-    #[inline]
-    fn update_token_read_pos(&mut self) {
-        let val = self.token_write_pos();
-        self.set(val, MASK_2, TOKEN_RD_SHIFT);
-    }
-}
-
-impl From<ReadinessState> for usize {
-    fn from(src: ReadinessState) -> usize {
-        src.0
-    }
-}
-
-impl From<usize> for ReadinessState {
-    fn from(src: usize) -> ReadinessState {
-        ReadinessState(src)
-    }
-}
-
-fn is_send<T: Send>() {}
-fn is_sync<T: Sync>() {}
-
-impl SelectorId {
-    pub fn new() -> SelectorId {
-        SelectorId {
-            id: AtomicUsize::new(0),
-        }
-    }
-
-    pub fn associate_selector(&self, poll: &Poll) -> io::Result<()> {
-        let selector_id = self.id.load(Ordering::SeqCst);
-
-        if selector_id != 0 && selector_id != poll.selector.id() {
-            Err(io::Error::new(io::ErrorKind::Other, "socket already registered"))
-        } else {
-            self.id.store(poll.selector.id(), Ordering::SeqCst);
-            Ok(())
-        }
-    }
-}
-
-impl Clone for SelectorId {
-    fn clone(&self) -> SelectorId {
-        SelectorId {
-            id: AtomicUsize::new(self.id.load(Ordering::SeqCst)),
-        }
-    }
-}
-
-#[test]
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-pub fn as_raw_fd() {
-    let poll = Poll::new().unwrap();
-    assert!(poll.as_raw_fd() > 0);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/awakener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/awakener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/awakener.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/awakener.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-use {io, poll, Evented, Ready, Poll, PollOpt, Token};
-use zircon;
-use std::sync::{Arc, Mutex, Weak};
-
-pub struct Awakener {
-    /// Token and weak reference to the port on which Awakener was registered.
-    ///
-    /// When `Awakener::wakeup` is called, these are used to send a wakeup message to the port.
-    inner: Mutex<Option<(Token, Weak<zircon::Port>)>>,
-}
-
-impl Awakener {
-    /// Create a new `Awakener`.
-    pub fn new() -> io::Result<Awakener> {
-        Ok(Awakener {
-            inner: Mutex::new(None)
-        })
-    }
-
-    /// Send a wakeup signal to the `Selector` on which the `Awakener` was registered.
-    pub fn wakeup(&self) -> io::Result<()> {
-        let inner_locked = self.inner.lock().unwrap();
-        let &(token, ref weak_port) =
-            inner_locked.as_ref().expect("Called wakeup on unregistered awakener.");
-
-        let port = weak_port.upgrade().expect("Tried to wakeup a closed port.");
-
-        let status = 0; // arbitrary
-        let packet = zircon::Packet::from_user_packet(
-            token.0 as u64, status, zircon::UserPacket::from_u8_array([0; 32]));
-
-        Ok(port.queue(&packet)?)
-    }
-
-    pub fn cleanup(&self) {}
-}
-
-impl Evented for Awakener {
-    fn register(&self,
-                poll: &Poll,
-                token: Token,
-                _events: Ready,
-                _opts: PollOpt) -> io::Result<()>
-    {
-        let mut inner_locked = self.inner.lock().unwrap();
-        if inner_locked.is_some() {
-            panic!("Called register on already-registered Awakener.");
-        }
-        *inner_locked = Some((token, Arc::downgrade(poll::selector(poll).port())));
-
-        Ok(())
-    }
-
-    fn reregister(&self,
-                  poll: &Poll,
-                  token: Token,
-                  _events: Ready,
-                  _opts: PollOpt) -> io::Result<()>
-    {
-        let mut inner_locked = self.inner.lock().unwrap();
-        *inner_locked = Some((token, Arc::downgrade(poll::selector(poll).port())));
-
-        Ok(())
-    }
-
-    fn deregister(&self, _poll: &Poll) -> io::Result<()>
-    {
-        let mut inner_locked = self.inner.lock().unwrap();
-        *inner_locked = None;
-
-        Ok(())
-    }
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/eventedfd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/eventedfd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/eventedfd.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/eventedfd.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,263 +0,0 @@
-use {io, poll, Evented, Ready, Poll, PollOpt, Token};
-use libc;
-use zircon;
-use zircon::AsHandleRef;
-use sys::fuchsia::{DontDrop, poll_opts_to_wait_async, sys};
-use std::mem;
-use std::os::unix::io::RawFd;
-use std::sync::{Arc, Mutex};
-
-/// Properties of an `EventedFd`'s current registration
-#[derive(Debug)]
-pub struct EventedFdRegistration {
-    token: Token,
-    handle: DontDrop<zircon::Handle>,
-    rereg_signals: Option<(zircon::Signals, zircon::WaitAsyncOpts)>,
-}
-
-impl EventedFdRegistration {
-    unsafe fn new(token: Token,
-                  raw_handle: sys::zx_handle_t,
-                  rereg_signals: Option<(zircon::Signals, zircon::WaitAsyncOpts)>,
-                  ) -> Self
-    {
-        EventedFdRegistration {
-            token: token,
-            handle: DontDrop::new(zircon::Handle::from_raw(raw_handle)),
-            rereg_signals: rereg_signals
-        }
-    }
-
-    pub fn rereg_signals(&self) -> Option<(zircon::Signals, zircon::WaitAsyncOpts)> {
-        self.rereg_signals
-    }
-}
-
-/// An event-ed file descriptor. The file descriptor is owned by this structure.
-#[derive(Debug)]
-pub struct EventedFdInner {
-    /// Properties of the current registration.
-    registration: Mutex<Option<EventedFdRegistration>>,
-
-    /// Owned file descriptor.
-    ///
-    /// `fd` is closed on `Drop`, so modifying `fd` is a memory-unsafe operation.
-    fd: RawFd,
-
-    /// Owned `fdio_t` pointer.
-    fdio: *const sys::fdio_t,
-}
-
-impl EventedFdInner {
-    pub fn rereg_for_level(&self, port: &zircon::Port) {
-        let registration_opt = self.registration.lock().unwrap();
-        if let Some(ref registration) = *registration_opt {
-            if let Some((rereg_signals, rereg_opts)) = registration.rereg_signals {
-                let _res =
-                    registration
-                        .handle.inner_ref()
-                        .wait_async_handle(
-                            port,
-                            registration.token.0 as u64,
-                            rereg_signals,
-                            rereg_opts);
-            }
-        }
-    }
-
-    pub fn registration(&self) -> &Mutex<Option<EventedFdRegistration>> {
-        &self.registration
-    }
-
-    pub fn fdio(&self) -> &sys::fdio_t {
-        unsafe { &*self.fdio }
-    }
-}
-
-impl Drop for EventedFdInner {
-    fn drop(&mut self) {
-        unsafe {
-            sys::__fdio_release(self.fdio);
-            let _ = libc::close(self.fd);
-        }
-    }
-}
-
-// `EventedInner` must be manually declared `Send + Sync` because it contains a `RawFd` and a
-// `*const sys::fdio_t`. These are only used to make thread-safe system calls, so accessing
-// them is entirely thread-safe.
-//
-// Note: one minor exception to this are the calls to `libc::close` and `__fdio_release`, which
-// happen on `Drop`. These accesses are safe because `drop` can only be called at most once from
-// a single thread, and after it is called no other functions can be called on the `EventedFdInner`.
-unsafe impl Sync for EventedFdInner {}
-unsafe impl Send for EventedFdInner {}
-
-#[derive(Clone, Debug)]
-pub struct EventedFd {
-    pub inner: Arc<EventedFdInner>
-}
-
-impl EventedFd {
-    pub unsafe fn new(fd: RawFd) -> Self {
-        let fdio = sys::__fdio_fd_to_io(fd);
-        assert!(fdio != ::std::ptr::null(), "FileDescriptor given to EventedFd must be valid.");
-
-        EventedFd {
-            inner: Arc::new(EventedFdInner {
-                registration: Mutex::new(None),
-                fd: fd,
-                fdio: fdio,
-            })
-        }
-    }
-
-    fn handle_and_signals_for_events(&self, interest: Ready, opts: PollOpt)
-                -> (sys::zx_handle_t, zircon::Signals)
-    {
-        let epoll_events = ioevent_to_epoll(interest, opts);
-
-        unsafe {
-            let mut raw_handle: sys::zx_handle_t = mem::uninitialized();
-            let mut signals: sys::zx_signals_t = mem::uninitialized();
-            sys::__fdio_wait_begin(self.inner.fdio, epoll_events, &mut raw_handle, &mut signals);
-
-            (raw_handle, signals)
-        }
-    }
-
-    fn register_with_lock(
-        &self,
-        registration: &mut Option<EventedFdRegistration>,
-        poll: &Poll,
-        token: Token,
-        interest: Ready,
-        opts: PollOpt) -> io::Result<()>
-    {
-        if registration.is_some() {
-            return Err(io::Error::new(
-                io::ErrorKind::AlreadyExists,
-                "Called register on an already registered file descriptor."));
-        }
-
-        let (raw_handle, signals) = self.handle_and_signals_for_events(interest, opts);
-
-        let needs_rereg = opts.is_level() && !opts.is_oneshot();
-
-        // If we need to reregister, then each registration should be `oneshot`
-        let opts = opts | if needs_rereg { PollOpt::oneshot() } else { PollOpt::empty() };
-
-        let rereg_signals = if needs_rereg {
-            Some((signals, poll_opts_to_wait_async(opts)))
-        } else {
-            None
-        };
-
-        *registration = Some(
-            unsafe { EventedFdRegistration::new(token, raw_handle, rereg_signals) }
-        );
-
-        // We don't have ownership of the handle, so we can't drop it
-        let handle = DontDrop::new(unsafe { zircon::Handle::from_raw(raw_handle) });
-
-        let registered = poll::selector(poll)
-            .register_fd(handle.inner_ref(), self, token, signals, opts);
-
-        if registered.is_err() {
-            *registration = None;
-        }
-
-        registered
-    }
-
-    fn deregister_with_lock(
-        &self,
-        registration: &mut Option<EventedFdRegistration>,
-        poll: &Poll) -> io::Result<()>
-    {
-        let old_registration = if let Some(old_reg) = registration.take() {
-            old_reg
-        } else {
-            return Err(io::Error::new(
-                io::ErrorKind::NotFound,
-                "Called rereregister on an unregistered file descriptor."))
-        };
-
-        poll::selector(poll)
-            .deregister_fd(old_registration.handle.inner_ref(), old_registration.token)
-    }
-}
-
-impl Evented for EventedFd {
-    fn register(&self,
-                poll: &Poll,
-                token: Token,
-                interest: Ready,
-                opts: PollOpt) -> io::Result<()>
-    {
-        self.register_with_lock(
-            &mut *self.inner.registration.lock().unwrap(),
-            poll,
-            token,
-            interest,
-            opts)
-    }
-
-    fn reregister(&self,
-                  poll: &Poll,
-                  token: Token,
-                  interest: Ready,
-                  opts: PollOpt) -> io::Result<()>
-    {
-        // Take out the registration lock
-        let mut registration_lock = self.inner.registration.lock().unwrap();
-
-        // Deregister
-        self.deregister_with_lock(&mut *registration_lock, poll)?;
-
-        self.register_with_lock(
-            &mut *registration_lock,
-            poll,
-            token,
-            interest,
-            opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        let mut registration_lock = self.inner.registration.lock().unwrap();
-        self.deregister_with_lock(&mut *registration_lock, poll)
-    }
-}
-
-fn ioevent_to_epoll(interest: Ready, opts: PollOpt) -> u32 {
-    use event_imp::ready_from_usize;
-    const HUP: usize   = 0b01000;
-
-    let mut kind = 0;
-
-    if interest.is_readable() {
-        kind |= libc::EPOLLIN;
-    }
-
-    if interest.is_writable() {
-        kind |= libc::EPOLLOUT;
-    }
-
-    if interest.contains(ready_from_usize(HUP)) {
-        kind |= libc::EPOLLRDHUP;
-    }
-
-    if opts.is_edge() {
-        kind |= libc::EPOLLET;
-    }
-
-    if opts.is_oneshot() {
-        kind |= libc::EPOLLONESHOT;
-    }
-
-    if opts.is_level() {
-        kind &= !libc::EPOLLET;
-    }
-
-    kind as u32
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/handles.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/handles.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/handles.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/handles.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-use {io, poll, Evented, Ready, Poll, PollOpt, Token};
-use zircon_sys::zx_handle_t;
-use std::sync::Mutex;
-
-/// Wrapper for registering a `HandleBase` type with mio.
-#[derive(Debug)]
-pub struct EventedHandle {
-    /// The handle to be registered.
-    handle: zx_handle_t,
-
-    /// The current `Token` with which the handle is registered with mio.
-    token: Mutex<Option<Token>>,
-}
-
-impl EventedHandle {
-    /// Create a new `EventedHandle` which can be registered with mio
-    /// in order to receive event notifications.
-    ///
-    /// The underlying handle must not be dropped while the
-    /// `EventedHandle` still exists.
-    pub unsafe fn new(handle: zx_handle_t) -> Self {
-        EventedHandle {
-            handle: handle,
-            token: Mutex::new(None),
-        }
-    }
-
-    /// Get the underlying handle being registered.
-    pub fn get_handle(&self) -> zx_handle_t {
-        self.handle
-    }
-}
-
-impl Evented for EventedHandle {
-    fn register(&self,
-                poll: &Poll,
-                token: Token,
-                interest: Ready,
-                opts: PollOpt) -> io::Result<()>
-    {
-        let mut this_token = self.token.lock().unwrap();
-        {
-            poll::selector(poll).register_handle(self.handle, token, interest, opts)?;
-            *this_token = Some(token);
-        }
-        Ok(())
-    }
-
-    fn reregister(&self,
-        poll: &Poll,
-        token: Token,
-        interest: Ready,
-        opts: PollOpt) -> io::Result<()>
-    {
-        let mut this_token = self.token.lock().unwrap();
-        {
-            poll::selector(poll).deregister_handle(self.handle, token)?;
-            *this_token = None;
-            poll::selector(poll).register_handle(self.handle, token, interest, opts)?;
-            *this_token = Some(token);
-        }
-        Ok(())
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        let mut this_token = self.token.lock().unwrap();
-        let token = if let Some(token) = *this_token { token } else {
-            return Err(io::Error::new(
-                io::ErrorKind::NotFound,
-                "Attempted to deregister an unregistered handle."))
-        };
-        {
-            poll::selector(poll).deregister_handle(self.handle, token)?;
-            *this_token = None;
-        }
-        Ok(())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-use {io, Ready, PollOpt};
-use libc;
-use zircon;
-use std::mem;
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use std::ops::{Deref, DerefMut};
-use std::os::unix::io::RawFd;
-
-mod awakener;
-mod handles;
-mod eventedfd;
-mod net;
-mod ready;
-mod selector;
-
-use self::eventedfd::{EventedFd, EventedFdInner};
-use self::ready::assert_fuchsia_ready_repr;
-
-pub use self::awakener::Awakener;
-pub use self::handles::EventedHandle;
-pub use self::net::{TcpListener, TcpStream, UdpSocket};
-pub use self::selector::{Events, Selector};
-pub use self::ready::{FuchsiaReady, zx_signals_t};
-
-// Set non-blocking (workaround since the std version doesn't work in fuchsia)
-// TODO: fix the std version and replace this
-pub fn set_nonblock(fd: RawFd) -> io::Result<()> {
-    cvt(unsafe { libc::fcntl(fd, libc::F_SETFL, libc::O_NONBLOCK) }).map(|_| ())
-}
-
-/// Workaround until fuchsia's recv_from is fixed
-unsafe fn recv_from(fd: RawFd, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-    let flags = 0;
-
-    let n = cvt(
-        libc::recv(fd,
-                   buf.as_mut_ptr() as *mut libc::c_void,
-                   buf.len(),
-                   flags)
-    )?;
-
-    // random address-- we don't use it
-    let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);
-    Ok((n as usize, addr))
-}
-
-mod sys {
-    #![allow(non_camel_case_types)]
-    use std::os::unix::io::RawFd;
-    pub use zircon_sys::{zx_handle_t, zx_signals_t};
-
-    // 17 fn pointers we don't need for mio :)
-    pub type fdio_ops_t = [usize; 17];
-
-    pub type atomic_int_fast32_t = usize; // TODO: https://github.com/rust-lang/libc/issues/631
-
-    #[repr(C)]
-    pub struct fdio_t {
-        pub ops: *const fdio_ops_t,
-        pub magic: u32,
-        pub refcount: atomic_int_fast32_t,
-        pub dupcount: u32,
-        pub flags: u32,
-    }
-
-    #[link(name="fdio")]
-    extern {
-        pub fn __fdio_fd_to_io(fd: RawFd) -> *const fdio_t;
-        pub fn __fdio_release(io: *const fdio_t);
-
-        pub fn __fdio_wait_begin(
-            io: *const fdio_t,
-            events: u32,
-            handle_out: &mut zx_handle_t,
-            signals_out: &mut zx_signals_t,
-        );
-        pub fn __fdio_wait_end(
-            io: *const fdio_t,
-            signals: zx_signals_t,
-            events_out: &mut u32,
-        );
-    }
-}
-
-fn epoll_event_to_ready(epoll: u32) -> Ready {
-    let epoll = epoll as i32; // casts the bits directly
-    let mut kind = Ready::empty();
-
-    if (epoll & libc::EPOLLIN) != 0 || (epoll & libc::EPOLLPRI) != 0 {
-        kind = kind | Ready::readable();
-    }
-
-    if (epoll & libc::EPOLLOUT) != 0 {
-        kind = kind | Ready::writable();
-    }
-
-    kind
-
-    /* TODO: support?
-    // EPOLLHUP - Usually means a socket error happened
-    if (epoll & libc::EPOLLERR) != 0 {
-        kind = kind | UnixReady::error();
-    }
-
-    if (epoll & libc::EPOLLRDHUP) != 0 || (epoll & libc::EPOLLHUP) != 0 {
-        kind = kind | UnixReady::hup();
-    }
-    */
-}
-
-fn poll_opts_to_wait_async(poll_opts: PollOpt) -> zircon::WaitAsyncOpts {
-    if poll_opts.is_oneshot() {
-        zircon::WaitAsyncOpts::Once
-    } else {
-        zircon::WaitAsyncOpts::Repeating
-    }
-}
-
-trait IsMinusOne {
-    fn is_minus_one(&self) -> bool;
-}
-
-impl IsMinusOne for i32 {
-    fn is_minus_one(&self) -> bool { *self == -1 }
-}
-
-impl IsMinusOne for isize {
-    fn is_minus_one(&self) -> bool { *self == -1 }
-}
-
-fn cvt<T: IsMinusOne>(t: T) -> ::io::Result<T> {
-    use std::io;
-
-    if t.is_minus_one() {
-        Err(io::Error::last_os_error())
-    } else {
-        Ok(t)
-    }
-}
-
-/// Utility type to prevent the type inside of it from being dropped.
-#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
-struct DontDrop<T>(Option<T>);
-
-impl<T> DontDrop<T> {
-    fn new(t: T) -> DontDrop<T> {
-        DontDrop(Some(t))
-    }
-
-    fn inner_ref(&self) -> &T {
-        self.0.as_ref().unwrap()
-    }
-
-    fn inner_mut(&mut self) -> &mut T {
-        self.0.as_mut().unwrap()
-    }
-}
-
-impl<T> Deref for DontDrop<T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        self.inner_ref()
-    }
-}
-
-impl<T> DerefMut for DontDrop<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.inner_mut()
-    }
-}
-
-impl<T> Drop for DontDrop<T> {
-    fn drop(&mut self) {
-        let inner = self.0.take();
-        mem::forget(inner);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/net.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/net.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/net.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/net.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,444 +0,0 @@
-use {io, Evented, Ready, Poll, PollOpt, Token};
-use iovec::IoVec;
-use iovec::unix as iovec;
-use libc;
-use net2::TcpStreamExt;
-#[allow(unused_imports)] // only here for Rust 1.8
-use net2::UdpSocketExt;
-use sys::fuchsia::{recv_from, set_nonblock, EventedFd, DontDrop};
-use std::cmp;
-use std::io::{Read, Write};
-use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr};
-use std::os::unix::io::AsRawFd;
-use std::time::Duration;
-
-#[derive(Debug)]
-pub struct TcpStream {
-    io: DontDrop<net::TcpStream>,
-    evented_fd: EventedFd,
-}
-
-impl TcpStream {
-    pub fn connect(stream: net::TcpStream, addr: &SocketAddr) -> io::Result<TcpStream> {
-        try!(set_nonblock(stream.as_raw_fd()));
-
-        let connected = stream.connect(addr);
-        match connected {
-            Ok(..) => {}
-            Err(ref e) if e.raw_os_error() == Some(libc::EINPROGRESS) => {}
-            Err(e) => return Err(e),
-        }
-
-        let evented_fd = unsafe { EventedFd::new(stream.as_raw_fd()) };
-
-        return Ok(TcpStream {
-            io: DontDrop::new(stream),
-            evented_fd: evented_fd,
-        })
-    }
-
-    pub fn from_stream(stream: net::TcpStream) -> TcpStream {
-        let evented_fd = unsafe { EventedFd::new(stream.as_raw_fd()) };
-
-        TcpStream {
-            io: DontDrop::new(stream),
-            evented_fd: evented_fd,
-        }
-    }
-
-    pub fn peer_addr(&self) -> io::Result<SocketAddr> {
-        self.io.peer_addr()
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<TcpStream> {
-        self.io.try_clone().map(|s| {
-            let evented_fd = unsafe { EventedFd::new(s.as_raw_fd()) };
-            TcpStream {
-                io: DontDrop::new(s),
-                evented_fd: evented_fd,
-            }
-        })
-    }
-
-    pub fn shutdown(&self, how: net::Shutdown) -> io::Result<()> {
-        self.io.shutdown(how)
-    }
-
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        self.io.set_nodelay(nodelay)
-    }
-
-    pub fn nodelay(&self) -> io::Result<bool> {
-        self.io.nodelay()
-    }
-
-    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.io.set_recv_buffer_size(size)
-    }
-
-    pub fn recv_buffer_size(&self) -> io::Result<usize> {
-        self.io.recv_buffer_size()
-    }
-
-    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.io.set_send_buffer_size(size)
-    }
-
-    pub fn send_buffer_size(&self) -> io::Result<usize> {
-        self.io.send_buffer_size()
-    }
-
-    pub fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
-        self.io.set_keepalive(keepalive)
-    }
-
-    pub fn keepalive(&self) -> io::Result<Option<Duration>> {
-        self.io.keepalive()
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.io.set_ttl(ttl)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.io.ttl()
-    }
-
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.io.set_only_v6(only_v6)
-    }
-
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.io.only_v6()
-    }
-
-    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.io.set_linger(dur)
-    }
-
-    pub fn linger(&self) -> io::Result<Option<Duration>> {
-        self.io.linger()
-    }
-
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.io.take_error()
-    }
-
-    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.io.peek(buf)
-    }
-
-    pub fn readv(&self, bufs: &mut [&mut IoVec]) -> io::Result<usize> {
-        unsafe {
-            let slice = iovec::as_os_slice_mut(bufs);
-            let len = cmp::min(<libc::c_int>::max_value() as usize, slice.len());
-            let rc = libc::readv(self.io.as_raw_fd(),
-                                 slice.as_ptr(),
-                                 len as libc::c_int);
-            if rc < 0 {
-                Err(io::Error::last_os_error())
-            } else {
-                Ok(rc as usize)
-            }
-        }
-    }
-
-    pub fn writev(&self, bufs: &[&IoVec]) -> io::Result<usize> {
-        unsafe {
-            let slice = iovec::as_os_slice(bufs);
-            let len = cmp::min(<libc::c_int>::max_value() as usize, slice.len());
-            let rc = libc::writev(self.io.as_raw_fd(),
-                                  slice.as_ptr(),
-                                  len as libc::c_int);
-            if rc < 0 {
-                Err(io::Error::last_os_error())
-            } else {
-                Ok(rc as usize)
-            }
-        }
-    }
-}
-
-impl<'a> Read for &'a TcpStream {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.io.inner_ref().read(buf)
-    }
-}
-
-impl<'a> Write for &'a TcpStream {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.io.inner_ref().write(buf)
-    }
-    fn flush(&mut self) -> io::Result<()> {
-        self.io.inner_ref().flush()
-    }
-}
-
-impl Evented for TcpStream {
-    fn register(&self,
-                poll: &Poll,
-                token: Token,
-                interest: Ready,
-                opts: PollOpt) -> io::Result<()>
-    {
-        self.evented_fd.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self,
-                  poll: &Poll,
-                  token: Token,
-                  interest: Ready,
-                  opts: PollOpt) -> io::Result<()>
-    {
-        self.evented_fd.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.evented_fd.deregister(poll)
-    }
-}
-
-#[derive(Debug)]
-pub struct TcpListener {
-    io: DontDrop<net::TcpListener>,
-    evented_fd: EventedFd,
-}
-
-impl TcpListener {
-    pub fn new(inner: net::TcpListener) -> io::Result<TcpListener> {
-        set_nonblock(inner.as_raw_fd())?;
-
-        let evented_fd = unsafe { EventedFd::new(inner.as_raw_fd()) };
-
-        Ok(TcpListener {
-            io: DontDrop::new(inner),
-            evented_fd: evented_fd,
-        })
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<TcpListener> {
-        self.io.try_clone().map(|io| {
-            let evented_fd = unsafe { EventedFd::new(io.as_raw_fd()) };
-            TcpListener {
-                io: DontDrop::new(io),
-                evented_fd: evented_fd,
-            }
-        })
-    }
-
-    pub fn accept(&self) -> io::Result<(TcpStream, SocketAddr)> {
-        self.io.accept().and_then(|(s, a)| {
-            set_nonblock(s.as_raw_fd())?;
-            let evented_fd = unsafe { EventedFd::new(s.as_raw_fd()) };
-            return Ok((TcpStream {
-                io: DontDrop::new(s),
-                evented_fd: evented_fd,
-            }, a))
-        })
-    }
-
-    #[allow(deprecated)]
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.io.set_only_v6(only_v6)
-    }
-
-    #[allow(deprecated)]
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.io.only_v6()
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.io.set_ttl(ttl)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.io.ttl()
-    }
-
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.io.take_error()
-    }
-}
-
-impl Evented for TcpListener {
-    fn register(&self,
-                poll: &Poll,
-                token: Token,
-                interest: Ready,
-                opts: PollOpt) -> io::Result<()>
-    {
-        self.evented_fd.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self,
-                  poll: &Poll,
-                  token: Token,
-                  interest: Ready,
-                  opts: PollOpt) -> io::Result<()>
-    {
-        self.evented_fd.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.evented_fd.deregister(poll)
-    }
-}
-
-#[derive(Debug)]
-pub struct UdpSocket {
-    io: DontDrop<net::UdpSocket>,
-    evented_fd: EventedFd,
-}
-
-impl UdpSocket {
-    pub fn new(socket: net::UdpSocket) -> io::Result<UdpSocket> {
-        set_nonblock(socket.as_raw_fd())?;
-
-        let evented_fd = unsafe { EventedFd::new(socket.as_raw_fd()) };
-
-        Ok(UdpSocket {
-            io: DontDrop::new(socket),
-            evented_fd: evented_fd,
-        })
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<UdpSocket> {
-        self.io.try_clone().and_then(|io| {
-            UdpSocket::new(io)
-        })
-    }
-
-    pub fn send_to(&self, buf: &[u8], target: &SocketAddr) -> io::Result<usize> {
-        self.io.send_to(buf, target)
-    }
-
-    pub fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        unsafe { recv_from(self.io.as_raw_fd(), buf) }
-    }
-
-    pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        self.io.send(buf)
-    }
-
-    pub fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.io.recv(buf)
-    }
-
-    pub fn connect(&self, addr: SocketAddr)
-                   -> io::Result<()> {
-        self.io.connect(addr)
-    }
-
-    pub fn broadcast(&self) -> io::Result<bool> {
-        self.io.broadcast()
-    }
-
-    pub fn set_broadcast(&self, on: bool) -> io::Result<()> {
-        self.io.set_broadcast(on)
-    }
-
-    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
-        self.io.multicast_loop_v4()
-    }
-
-    pub fn set_multicast_loop_v4(&self, on: bool) -> io::Result<()> {
-        self.io.set_multicast_loop_v4(on)
-    }
-
-    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        self.io.multicast_ttl_v4()
-    }
-
-    pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
-        self.io.set_multicast_ttl_v4(ttl)
-    }
-
-    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
-        self.io.multicast_loop_v6()
-    }
-
-    pub fn set_multicast_loop_v6(&self, on: bool) -> io::Result<()> {
-        self.io.set_multicast_loop_v6(on)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.io.ttl()
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.io.set_ttl(ttl)
-    }
-
-    pub fn join_multicast_v4(&self,
-                             multiaddr: &Ipv4Addr,
-                             interface: &Ipv4Addr) -> io::Result<()> {
-        self.io.join_multicast_v4(multiaddr, interface)
-    }
-
-    pub fn join_multicast_v6(&self,
-                             multiaddr: &Ipv6Addr,
-                             interface: u32) -> io::Result<()> {
-        self.io.join_multicast_v6(multiaddr, interface)
-    }
-
-    pub fn leave_multicast_v4(&self,
-                              multiaddr: &Ipv4Addr,
-                              interface: &Ipv4Addr) -> io::Result<()> {
-        self.io.leave_multicast_v4(multiaddr, interface)
-    }
-
-    pub fn leave_multicast_v6(&self,
-                              multiaddr: &Ipv6Addr,
-                              interface: u32) -> io::Result<()> {
-        self.io.leave_multicast_v6(multiaddr, interface)
-    }
-
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.io.set_only_v6(only_v6)
-    }
-
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.io.only_v6()
-    }
-
-
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.io.take_error()
-    }
-}
-
-impl Evented for UdpSocket {
-    fn register(&self,
-                poll: &Poll,
-                token: Token,
-                interest: Ready,
-                opts: PollOpt) -> io::Result<()>
-    {
-        self.evented_fd.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self,
-                  poll: &Poll,
-                  token: Token,
-                  interest: Ready,
-                  opts: PollOpt) -> io::Result<()>
-    {
-        self.evented_fd.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.evented_fd.deregister(poll)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/ready.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/ready.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/ready.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/ready.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-use event_imp::{Ready, ready_as_usize, ready_from_usize};
-pub use zircon_sys::{
-    zx_signals_t,
-    ZX_OBJECT_READABLE,
-    ZX_OBJECT_WRITABLE,
-};
-use std::ops;
-
-// The following impls are valid because Fuchsia and mio both represent
-// "readable" as `1 << 0` and "writable" as `1 << 2`.
-// We define this assertion here and call it from `Selector::new`,
-// since `Selector:;new` is guaranteed to be called during a standard mio runtime,
-// unlike the functions in this file.
-#[inline]
-pub fn assert_fuchsia_ready_repr() {
-    debug_assert!(
-        ZX_OBJECT_READABLE.bits() as usize == ready_as_usize(Ready::readable()),
-        "Zircon ZX_OBJECT_READABLE should have the same repr as Ready::readable()"
-    );
-    debug_assert!(
-        ZX_OBJECT_WRITABLE.bits() as usize == ready_as_usize(Ready::writable()),
-        "Zircon ZX_OBJECT_WRITABLE should have the same repr as Ready::writable()"
-    );
-}
-
-/// Fuchsia specific extensions to `Ready`
-///
-/// Provides additional readiness event kinds that are available on Fuchsia.
-///
-/// Conversion traits are implemented between `Ready` and `FuchsiaReady`.
-///
-/// For high level documentation on polling and readiness, see [`Poll`].
-///
-/// [`Poll`]: struct.Poll.html
-#[derive(Debug, Copy, PartialEq, Eq, Clone, PartialOrd, Ord)]
-pub struct FuchsiaReady(Ready);
-
-impl FuchsiaReady {
-    /// Returns the `FuchsiaReady` as raw zircon signals.
-    /// This function is just a more explicit, non-generic version of
-    /// `FuchsiaReady::into`.
-    #[inline]
-    pub fn into_zx_signals(self) -> zx_signals_t {
-        zx_signals_t::from_bits_truncate(ready_as_usize(self.0) as u32)
-    }
-}
-
-impl Into<zx_signals_t> for FuchsiaReady {
-    #[inline]
-    fn into(self) -> zx_signals_t {
-        self.into_zx_signals()
-    }
-}
-
-impl From<zx_signals_t> for FuchsiaReady {
-    #[inline]
-    fn from(src: zx_signals_t) -> Self {
-        FuchsiaReady(src.into())
-    }
-}
-
-impl From<zx_signals_t> for Ready {
-    #[inline]
-    fn from(src: zx_signals_t) -> Self {
-        ready_from_usize(src.bits() as usize)
-    }
-}
-
-impl From<Ready> for FuchsiaReady {
-    #[inline]
-    fn from(src: Ready) -> FuchsiaReady {
-        FuchsiaReady(src)
-    }
-}
-
-impl From<FuchsiaReady> for Ready {
-    #[inline]
-    fn from(src: FuchsiaReady) -> Ready {
-        src.0
-    }
-}
-
-impl ops::Deref for FuchsiaReady {
-    type Target = Ready;
-
-    #[inline]
-    fn deref(&self) -> &Ready {
-        &self.0
-    }
-}
-
-impl ops::DerefMut for FuchsiaReady {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut Ready {
-        &mut self.0
-    }
-}
-
-impl ops::BitOr for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn bitor(self, other: FuchsiaReady) -> FuchsiaReady {
-        (self.0 | other.0).into()
-    }
-}
-
-impl ops::BitXor for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn bitxor(self, other: FuchsiaReady) -> FuchsiaReady {
-        (self.0 ^ other.0).into()
-    }
-}
-
-impl ops::BitAnd for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn bitand(self, other: FuchsiaReady) -> FuchsiaReady {
-        (self.0 & other.0).into()
-    }
-}
-
-impl ops::Sub for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn sub(self, other: FuchsiaReady) -> FuchsiaReady {
-        (self.0 & !other.0).into()
-    }
-}
-
-#[deprecated(since = "0.6.10", note = "removed")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-impl ops::Not for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn not(self) -> FuchsiaReady {
-        (!self.0).into()
-    }
-}
-
-impl ops::BitOr<zx_signals_t> for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn bitor(self, other: zx_signals_t) -> FuchsiaReady {
-        self | FuchsiaReady::from(other)
-    }
-}
-
-impl ops::BitXor<zx_signals_t> for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn bitxor(self, other: zx_signals_t) -> FuchsiaReady {
-        self ^ FuchsiaReady::from(other)
-    }
-}
-
-impl ops::BitAnd<zx_signals_t> for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn bitand(self, other: zx_signals_t) -> FuchsiaReady {
-        self & FuchsiaReady::from(other)
-    }
-}
-
-impl ops::Sub<zx_signals_t> for FuchsiaReady {
-    type Output = FuchsiaReady;
-
-    #[inline]
-    fn sub(self, other: zx_signals_t) -> FuchsiaReady {
-        self - FuchsiaReady::from(other)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/selector.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/selector.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/fuchsia/selector.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/fuchsia/selector.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,353 +0,0 @@
-use {io, Event, PollOpt, Ready, Token};
-use sys::fuchsia::{
-    assert_fuchsia_ready_repr,
-    epoll_event_to_ready,
-    poll_opts_to_wait_async,
-    EventedFd,
-    EventedFdInner,
-    FuchsiaReady,
-};
-use zircon;
-use zircon::AsHandleRef;
-use zircon_sys::zx_handle_t;
-use std::collections::hash_map;
-use std::fmt;
-use std::mem;
-use std::sync::atomic::{AtomicBool, AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
-use std::sync::{Arc, Mutex, Weak};
-use std::time::Duration;
-use sys;
-
-/// The kind of registration-- file descriptor or handle.
-///
-/// The last bit of a token is set to indicate the type of the registration.
-#[derive(Copy, Clone, Eq, PartialEq)]
-enum RegType {
-    Fd,
-    Handle,
-}
-
-fn key_from_token_and_type(token: Token, reg_type: RegType) -> io::Result<u64> {
-    let key = token.0 as u64;
-    let msb = 1u64 << 63;
-    if (key & msb) != 0 {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidInput,
-            "Most-significant bit of token must remain unset."));
-    }
-
-    Ok(match reg_type {
-        RegType::Fd => key,
-        RegType::Handle => key | msb,
-    })
-}
-
-fn token_and_type_from_key(key: u64) -> (Token, RegType) {
-    let msb = 1u64 << 63;
-    (
-        Token((key & !msb) as usize),
-        if (key & msb) == 0 {
-            RegType::Fd
-        } else {
-            RegType::Handle
-        }
-    )
-}
-
-/// Each Selector has a globally unique(ish) ID associated with it. This ID
-/// gets tracked by `TcpStream`, `TcpListener`, etc... when they are first
-/// registered with the `Selector`. If a type that is previously associated with
-/// a `Selector` attempts to register itself with a different `Selector`, the
-/// operation will return with an error. This matches windows behavior.
-static NEXT_ID: AtomicUsize = ATOMIC_USIZE_INIT;
-
-pub struct Selector {
-    id: usize,
-
-    /// Zircon object on which the handles have been registered, and on which events occur
-    port: Arc<zircon::Port>,
-
-    /// Whether or not `tokens_to_rereg` contains any elements. This is a best-effort attempt
-    /// used to prevent having to lock `tokens_to_rereg` when it is empty.
-    has_tokens_to_rereg: AtomicBool,
-
-    /// List of `Token`s corresponding to registrations that need to be reregistered before the
-    /// next `port::wait`. This is necessary to provide level-triggered behavior for
-    /// `Async::repeating` registrations.
-    ///
-    /// When a level-triggered `Async::repeating` event is seen, its token is added to this list so
-    /// that it will be reregistered before the next `port::wait` call, making `port::wait` return
-    /// immediately if the signal was high during the reregistration.
-    ///
-    /// Note: when used at the same time, the `tokens_to_rereg` lock should be taken out _before_
-    /// `token_to_fd`.
-    tokens_to_rereg: Mutex<Vec<Token>>,
-
-    /// Map from tokens to weak references to `EventedFdInner`-- a structure describing a
-    /// file handle, its associated `fdio` object, and its current registration.
-    token_to_fd: Mutex<hash_map::HashMap<Token, Weak<EventedFdInner>>>,
-}
-
-impl Selector {
-    pub fn new() -> io::Result<Selector> {
-        // Assertion from fuchsia/ready.rs to make sure that FuchsiaReady's representation is
-        // compatible with Ready.
-        assert_fuchsia_ready_repr();
-
-        let port = Arc::new(
-            zircon::Port::create(zircon::PortOpts::Default)?
-        );
-
-        // offset by 1 to avoid choosing 0 as the id of a selector
-        let id = NEXT_ID.fetch_add(1, Ordering::Relaxed) + 1;
-
-        let has_tokens_to_rereg = AtomicBool::new(false);
-        let tokens_to_rereg = Mutex::new(Vec::new());
-        let token_to_fd = Mutex::new(hash_map::HashMap::new());
-
-        Ok(Selector {
-            id: id,
-            port: port,
-            has_tokens_to_rereg: has_tokens_to_rereg,
-            tokens_to_rereg: tokens_to_rereg,
-            token_to_fd: token_to_fd,
-        })
-    }
-
-    pub fn id(&self) -> usize {
-        self.id
-    }
-
-    /// Returns a reference to the underlying port `Arc`.
-    pub fn port(&self) -> &Arc<zircon::Port> { &self.port }
-
-    /// Reregisters all registrations pointed to by the `tokens_to_rereg` list
-    /// if `has_tokens_to_rereg`.
-    fn reregister_handles(&self) -> io::Result<()> {
-        // We use `Ordering::Acquire` to make sure that we see all `tokens_to_rereg`
-        // written before the store using `Ordering::Release`.
-        if self.has_tokens_to_rereg.load(Ordering::Acquire) {
-            let mut tokens = self.tokens_to_rereg.lock().unwrap();
-            let token_to_fd = self.token_to_fd.lock().unwrap();
-            for token in tokens.drain(0..) {
-                if let Some(eventedfd) = token_to_fd.get(&token)
-                    .and_then(|h| h.upgrade()) {
-                    eventedfd.rereg_for_level(&self.port);
-                }
-            }
-            self.has_tokens_to_rereg.store(false, Ordering::Release);
-        }
-        Ok(())
-    }
-
-    pub fn select(&self,
-                  evts: &mut Events,
-                  _awakener: Token,
-                  timeout: Option<Duration>) -> io::Result<bool>
-    {
-        evts.clear();
-
-        self.reregister_handles()?;
-
-        let deadline = match timeout {
-            Some(duration) => {
-                let nanos = duration.as_secs().saturating_mul(1_000_000_000)
-                                .saturating_add(duration.subsec_nanos() as u64);
-
-                zircon::deadline_after(nanos)
-            }
-            None => zircon::ZX_TIME_INFINITE,
-        };
-
-        let packet = match self.port.wait(deadline) {
-            Ok(packet) => packet,
-            Err(zircon::Status::ErrTimedOut) => return Ok(false),
-            Err(e) => Err(e)?,
-        };
-
-        let observed_signals = match packet.contents() {
-            zircon::PacketContents::SignalOne(signal_packet) => {
-                signal_packet.observed()
-            }
-            zircon::PacketContents::SignalRep(signal_packet) => {
-                signal_packet.observed()
-            }
-            zircon::PacketContents::User(_user_packet) => {
-                // User packets are only ever sent by an Awakener
-                return Ok(true);
-            }
-        };
-
-        let key = packet.key();
-        let (token, reg_type) = token_and_type_from_key(key);
-
-        match reg_type {
-            RegType::Handle => {
-                // We can return immediately-- no lookup or registration necessary.
-                evts.events.push(Event::new(Ready::from(observed_signals), token));
-                Ok(false)
-            },
-            RegType::Fd => {
-                // Convert the signals to epoll events using __fdio_wait_end,
-                // and add to reregistration list if necessary.
-                let events: u32;
-                {
-                    let handle = if let Some(handle) =
-                    self.token_to_fd.lock().unwrap()
-                        .get(&token)
-                        .and_then(|h| h.upgrade()) {
-                        handle
-                    } else {
-                        // This handle is apparently in the process of removal.
-                        // It has been removed from the list, but port_cancel has not been called.
-                        return Ok(false);
-                    };
-
-                    events = unsafe {
-                        let mut events: u32 = mem::uninitialized();
-                        sys::fuchsia::sys::__fdio_wait_end(handle.fdio(), observed_signals, &mut events);
-                        events
-                    };
-
-                    // If necessary, queue to be reregistered before next port_await
-                    let needs_to_rereg = {
-                        let registration_lock = handle.registration().lock().unwrap();
-
-                        registration_lock
-                            .as_ref()
-                            .and_then(|r| r.rereg_signals())
-                            .is_some()
-                    };
-
-                    if needs_to_rereg {
-                        let mut tokens_to_rereg_lock = self.tokens_to_rereg.lock().unwrap();
-                        tokens_to_rereg_lock.push(token);
-                        // We use `Ordering::Release` to make sure that we see all `tokens_to_rereg`
-                        // written before the store.
-                        self.has_tokens_to_rereg.store(true, Ordering::Release);
-                    }
-                }
-
-                evts.events.push(Event::new(epoll_event_to_ready(events), token));
-                Ok(false)
-            },
-        }
-    }
-
-    /// Register event interests for the given IO handle with the OS
-    pub fn register_fd(&self,
-                       handle: &zircon::Handle,
-                       fd: &EventedFd,
-                       token: Token,
-                       signals: zircon::Signals,
-                       poll_opts: PollOpt) -> io::Result<()>
-    {
-        {
-            let mut token_to_fd = self.token_to_fd.lock().unwrap();
-            match token_to_fd.entry(token) {
-                hash_map::Entry::Occupied(_) =>
-                    return Err(io::Error::new(io::ErrorKind::AlreadyExists,
-                               "Attempted to register a filedescriptor on an existing token.")),
-                hash_map::Entry::Vacant(slot) => slot.insert(Arc::downgrade(&fd.inner)),
-            };
-        }
-
-        let wait_async_opts = poll_opts_to_wait_async(poll_opts);
-
-        let wait_res = handle.wait_async_handle(&self.port, token.0 as u64, signals, wait_async_opts);
-
-        if wait_res.is_err() {
-            self.token_to_fd.lock().unwrap().remove(&token);
-        }
-
-        Ok(wait_res?)
-    }
-
-    /// Deregister event interests for the given IO handle with the OS
-    pub fn deregister_fd(&self, handle: &zircon::Handle, token: Token) -> io::Result<()> {
-        self.token_to_fd.lock().unwrap().remove(&token);
-
-        // We ignore NotFound errors since oneshots are automatically deregistered,
-        // but mio will attempt to deregister them manually.
-        self.port.cancel(&*handle, token.0 as u64)
-            .map_err(io::Error::from)
-            .or_else(|e| if e.kind() == io::ErrorKind::NotFound {
-                Ok(())
-            } else {
-                Err(e)
-            })
-    }
-
-    pub fn register_handle(&self,
-                           handle: zx_handle_t,
-                           token: Token,
-                           interests: Ready,
-                           poll_opts: PollOpt) -> io::Result<()>
-    {
-        if poll_opts.is_level() && !poll_opts.is_oneshot() {
-            return Err(io::Error::new(io::ErrorKind::InvalidInput,
-                      "Repeated level-triggered events are not supported on Fuchsia handles."));
-        }
-
-        let temp_handle = unsafe { zircon::Handle::from_raw(handle) };
-
-        let res = temp_handle.wait_async_handle(
-                    &self.port,
-                    key_from_token_and_type(token, RegType::Handle)?,
-                    FuchsiaReady::from(interests).into_zx_signals(),
-                    poll_opts_to_wait_async(poll_opts));
-
-        mem::forget(temp_handle);
-
-        Ok(res?)
-    }
-
-
-    pub fn deregister_handle(&self, handle: zx_handle_t, token: Token) -> io::Result<()>
-    {
-        let temp_handle = unsafe { zircon::Handle::from_raw(handle) };
-        let res = self.port.cancel(&temp_handle, key_from_token_and_type(token, RegType::Handle)?);
-
-        mem::forget(temp_handle);
-
-        Ok(res?)
-    }
-}
-
-pub struct Events {
-    events: Vec<Event>
-}
-
-impl Events {
-    pub fn with_capacity(_u: usize) -> Events {
-        // The Fuchsia selector only handles one event at a time,
-        // so we ignore the default capacity and set it to one.
-        Events { events: Vec::with_capacity(1) }
-    }
-    pub fn len(&self) -> usize {
-        self.events.len()
-    }
-    pub fn capacity(&self) -> usize {
-        self.events.capacity()
-    }
-    pub fn is_empty(&self) -> bool {
-        self.events.is_empty()
-    }
-    pub fn get(&self, idx: usize) -> Option<Event> {
-        self.events.get(idx).map(|e| *e)
-    }
-    pub fn push_event(&mut self, event: Event) {
-        self.events.push(event)
-    }
-    pub fn clear(&mut self) {
-        self.events.events.drain(0..);
-    }
-}
-
-impl fmt::Debug for Events {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("Events")
-            .field("len", &self.len())
-            .finish()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,56 +1,80 @@
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-pub use self::unix::{
-    Awakener,
-    EventedFd,
-    Events,
-    Io,
-    Selector,
-    TcpStream,
-    TcpListener,
-    UdpSocket,
-    pipe,
-    set_nonblock,
-};
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-pub use self::unix::READY_ALL;
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-#[cfg(feature = "with-deprecated")]
-pub use self::unix::UnixSocket;
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-pub mod unix;
-
-#[cfg(windows)]
-pub use self::windows::{
-    Awakener,
-    Events,
-    Selector,
-    TcpStream,
-    TcpListener,
-    UdpSocket,
-    Overlapped,
-    Binding,
-};
+//! Module with system specific types.
+//!
+//! Required types:
+//!
+//! * `Event`: a type alias for the system specific event, e.g. `kevent` or
+//!            `epoll_event`.
+//! * `event`: a module with various helper functions for `Event`, see
+//!            [`crate::event::Event`] for the required functions.
+//! * `Events`: collection of `Event`s, see [`crate::Events`].
+//! * `IoSourceState`: state for the `IoSource` type.
+//! * `Selector`: selector used to register event sources and poll for events,
+//!               see [`crate::Poll`] and [`crate::Registry`] for required
+//!               methods.
+//! * `tcp` and `udp` modules: see the [`crate::net`] module.
+//! * `Waker`: see [`crate::Waker`].
+
+cfg_os_poll! {
+    macro_rules! debug_detail {
+        (
+            $type: ident ($event_type: ty), $test: path,
+            $($(#[$target: meta])* $libc: ident :: $flag: ident),+ $(,)*
+        ) => {
+            struct $type($event_type);
+
+            impl fmt::Debug for $type {
+                fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                    let mut written_one = false;
+                    $(
+                        $(#[$target])*
+                        #[allow(clippy::bad_bit_mask)] // Apparently some flags are zero.
+                        {
+                            // Windows doesn't use `libc` but the `afd` module.
+                            if $test(&self.0, &$libc :: $flag) {
+                                if !written_one {
+                                    write!(f, "{}", stringify!($flag))?;
+                                    written_one = true;
+                                } else {
+                                    write!(f, "|{}", stringify!($flag))?;
+                                }
+                            }
+                        }
+                    )+
+                    if !written_one {
+                        write!(f, "(empty)")
+                    } else {
+                        Ok(())
+                    }
+                }
+            }
+        };
+    }
+}
+
+#[cfg(unix)]
+cfg_os_poll! {
+    mod unix;
+    pub use self::unix::*;
+}
 
 #[cfg(windows)]
-mod windows;
-
-#[cfg(target_os = "fuchsia")]
-pub use self::fuchsia::{
-    Awakener,
-    Events,
-    EventedHandle,
-    Selector,
-    TcpStream,
-    TcpListener,
-    UdpSocket,
-    set_nonblock,
-};
-
-#[cfg(target_os = "fuchsia")]
-pub mod fuchsia;
-
-#[cfg(not(all(unix, not(target_os = "fuchsia"))))]
-pub const READY_ALL: usize = 0;
+cfg_os_poll! {
+    mod windows;
+    pub use self::windows::*;
+}
+
+cfg_not_os_poll! {
+    mod shell;
+    pub(crate) use self::shell::*;
+
+    #[cfg(unix)]
+    cfg_any_os_ext! {
+        mod unix;
+        pub use self::unix::SourceFd;
+    }
+
+    #[cfg(unix)]
+    cfg_net! {
+        pub use self::unix::SocketAddr;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,70 @@
+macro_rules! os_required {
+    () => {
+        panic!("mio must be compiled with `os-poll` to run.")
+    };
+}
+
+mod selector;
+pub(crate) use self::selector::{event, Event, Events, Selector};
+
+mod waker;
+pub(crate) use self::waker::Waker;
+
+cfg_net! {
+    pub(crate) mod tcp;
+    pub(crate) mod udp;
+    #[cfg(unix)]
+    pub(crate) mod uds;
+}
+
+cfg_io_source! {
+    use std::io;
+    #[cfg(windows)]
+    use std::os::windows::io::RawSocket;
+
+    #[cfg(windows)]
+    use crate::{Registry, Token, Interest};
+
+    pub(crate) struct IoSourceState;
+
+    impl IoSourceState {
+        pub fn new() -> IoSourceState {
+            IoSourceState
+        }
+
+        pub fn do_io<T, F, R>(&self, f: F, io: &T) -> io::Result<R>
+        where
+            F: FnOnce(&T) -> io::Result<R>,
+        {
+            // We don't hold state, so we can just call the function and
+            // return.
+            f(io)
+        }
+    }
+
+    #[cfg(windows)]
+    impl IoSourceState {
+         pub fn register(
+            &mut self,
+            _: &Registry,
+            _: Token,
+            _: Interest,
+            _: RawSocket,
+        ) -> io::Result<()> {
+            os_required!()
+        }
+
+        pub fn reregister(
+            &mut self,
+            _: &Registry,
+            _: Token,
+            _: Interest,
+        ) -> io::Result<()> {
+           os_required!()
+        }
+
+        pub fn deregister(&mut self) -> io::Result<()> {
+            os_required!()
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/selector.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/selector.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/selector.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/selector.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,108 @@
+use std::io;
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, RawFd};
+use std::time::Duration;
+
+pub type Event = usize;
+
+pub type Events = Vec<Event>;
+
+#[derive(Debug)]
+pub struct Selector {}
+
+impl Selector {
+    pub fn try_clone(&self) -> io::Result<Selector> {
+        os_required!();
+    }
+
+    pub fn select(&self, _: &mut Events, _: Option<Duration>) -> io::Result<()> {
+        os_required!();
+    }
+
+    #[cfg(debug_assertions)]
+    pub fn register_waker(&self) -> bool {
+        os_required!();
+    }
+}
+
+#[cfg(unix)]
+cfg_any_os_ext! {
+    use crate::{Interest, Token};
+
+    impl Selector {
+        pub fn register(&self, _: RawFd, _: Token, _: Interest) -> io::Result<()> {
+            os_required!();
+        }
+
+        pub fn reregister(&self, _: RawFd, _: Token, _: Interest) -> io::Result<()> {
+            os_required!();
+        }
+
+        pub fn deregister(&self, _: RawFd) -> io::Result<()> {
+            os_required!();
+        }
+    }
+}
+
+cfg_io_source! {
+    #[cfg(debug_assertions)]
+    impl Selector {
+        pub fn id(&self) -> usize {
+            os_required!();
+        }
+    }
+}
+
+#[cfg(unix)]
+impl AsRawFd for Selector {
+    fn as_raw_fd(&self) -> RawFd {
+        os_required!()
+    }
+}
+
+#[allow(clippy::trivially_copy_pass_by_ref)]
+pub mod event {
+    use crate::sys::Event;
+    use crate::Token;
+    use std::fmt;
+
+    pub fn token(_: &Event) -> Token {
+        os_required!();
+    }
+
+    pub fn is_readable(_: &Event) -> bool {
+        os_required!();
+    }
+
+    pub fn is_writable(_: &Event) -> bool {
+        os_required!();
+    }
+
+    pub fn is_error(_: &Event) -> bool {
+        os_required!();
+    }
+
+    pub fn is_read_closed(_: &Event) -> bool {
+        os_required!();
+    }
+
+    pub fn is_write_closed(_: &Event) -> bool {
+        os_required!();
+    }
+
+    pub fn is_priority(_: &Event) -> bool {
+        os_required!();
+    }
+
+    pub fn is_aio(_: &Event) -> bool {
+        os_required!();
+    }
+
+    pub fn is_lio(_: &Event) -> bool {
+        os_required!();
+    }
+
+    pub fn debug_details(_: &mut fmt::Formatter<'_>, _: &Event) -> fmt::Result {
+        os_required!();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/tcp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/tcp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/tcp.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/tcp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,127 @@
+use crate::net::TcpKeepalive;
+use std::io;
+use std::net::{self, SocketAddr};
+use std::time::Duration;
+
+pub(crate) type TcpSocket = i32;
+
+pub(crate) fn new_v4_socket() -> io::Result<TcpSocket> {
+    os_required!();
+}
+
+pub(crate) fn new_v6_socket() -> io::Result<TcpSocket> {
+    os_required!();
+}
+
+pub(crate) fn bind(_socket: TcpSocket, _addr: SocketAddr) -> io::Result<()> {
+    os_required!();
+}
+
+pub(crate) fn connect(_: TcpSocket, _addr: SocketAddr) -> io::Result<net::TcpStream> {
+    os_required!();
+}
+
+pub(crate) fn listen(_: TcpSocket, _: u32) -> io::Result<net::TcpListener> {
+    os_required!();
+}
+
+pub(crate) fn close(_: TcpSocket) {
+    os_required!();
+}
+
+pub(crate) fn set_reuseaddr(_: TcpSocket, _: bool) -> io::Result<()> {
+    os_required!();
+}
+
+pub(crate) fn get_reuseaddr(_: TcpSocket) -> io::Result<bool> {
+    os_required!();
+}
+
+#[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
+pub(crate) fn set_reuseport(_: TcpSocket, _: bool) -> io::Result<()> {
+    os_required!();
+}
+
+#[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
+pub(crate) fn get_reuseport(_: TcpSocket) -> io::Result<bool> {
+    os_required!();
+}
+
+pub(crate) fn set_linger(_: TcpSocket, _: Option<Duration>) -> io::Result<()> {
+    os_required!();
+}
+
+pub(crate) fn get_linger(_: TcpSocket) -> io::Result<Option<Duration>> {
+    os_required!();
+}
+
+pub(crate) fn set_recv_buffer_size(_: TcpSocket, _: u32) -> io::Result<()> {
+    os_required!();
+}
+
+pub(crate) fn get_recv_buffer_size(_: TcpSocket) -> io::Result<u32> {
+    os_required!();
+}
+
+pub(crate) fn set_send_buffer_size(_: TcpSocket, _: u32) -> io::Result<()> {
+    os_required!();
+}
+
+pub(crate) fn get_send_buffer_size(_: TcpSocket) -> io::Result<u32> {
+    os_required!();
+}
+
+pub(crate) fn set_keepalive(_: TcpSocket, _: bool) -> io::Result<()> {
+    os_required!();
+}
+
+pub(crate) fn get_keepalive(_: TcpSocket) -> io::Result<bool> {
+    os_required!();
+}
+
+pub(crate) fn set_keepalive_params(_: TcpSocket, _: TcpKeepalive) -> io::Result<()> {
+    os_required!()
+}
+
+#[cfg(any(
+    target_os = "android",
+    target_os = "linux",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "solaris",
+))]
+pub(crate) fn get_keepalive_time(_: TcpSocket) -> io::Result<Option<Duration>> {
+    os_required!()
+}
+
+#[cfg(any(
+    target_os = "linux",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "freebsd",
+    target_os = "netbsd",
+))]
+pub(crate) fn get_keepalive_interval(_: TcpSocket) -> io::Result<Option<Duration>> {
+    os_required!()
+}
+
+#[cfg(any(
+    target_os = "linux",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "freebsd",
+    target_os = "netbsd",
+))]
+pub(crate) fn get_keepalive_retries(_: TcpSocket) -> io::Result<Option<u32>> {
+    os_required!()
+}
+
+pub fn accept(_: &net::TcpListener) -> io::Result<(net::TcpStream, SocketAddr)> {
+    os_required!();
+}
+
+pub(crate) fn get_localaddr(_: TcpSocket) -> io::Result<SocketAddr> {
+    os_required!();
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/udp.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/udp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+use std::io;
+use std::net::{self, SocketAddr};
+
+pub fn bind(_: SocketAddr) -> io::Result<net::UdpSocket> {
+    os_required!()
+}
+
+pub(crate) fn only_v6(_: &net::UdpSocket) -> io::Result<bool> {
+    os_required!()
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/uds.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/uds.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/uds.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/uds.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,75 @@
+pub(crate) mod datagram {
+    use crate::net::SocketAddr;
+    use std::io;
+    use std::os::unix::net;
+    use std::path::Path;
+
+    pub(crate) fn bind(_: &Path) -> io::Result<net::UnixDatagram> {
+        os_required!()
+    }
+
+    pub(crate) fn unbound() -> io::Result<net::UnixDatagram> {
+        os_required!()
+    }
+
+    pub(crate) fn pair() -> io::Result<(net::UnixDatagram, net::UnixDatagram)> {
+        os_required!()
+    }
+
+    pub(crate) fn local_addr(_: &net::UnixDatagram) -> io::Result<SocketAddr> {
+        os_required!()
+    }
+
+    pub(crate) fn peer_addr(_: &net::UnixDatagram) -> io::Result<SocketAddr> {
+        os_required!()
+    }
+
+    pub(crate) fn recv_from(
+        _: &net::UnixDatagram,
+        _: &mut [u8],
+    ) -> io::Result<(usize, SocketAddr)> {
+        os_required!()
+    }
+}
+
+pub(crate) mod listener {
+    use crate::net::{SocketAddr, UnixStream};
+    use std::io;
+    use std::os::unix::net;
+    use std::path::Path;
+
+    pub(crate) fn bind(_: &Path) -> io::Result<net::UnixListener> {
+        os_required!()
+    }
+
+    pub(crate) fn accept(_: &net::UnixListener) -> io::Result<(UnixStream, SocketAddr)> {
+        os_required!()
+    }
+
+    pub(crate) fn local_addr(_: &net::UnixListener) -> io::Result<SocketAddr> {
+        os_required!()
+    }
+}
+
+pub(crate) mod stream {
+    use crate::net::SocketAddr;
+    use std::io;
+    use std::os::unix::net;
+    use std::path::Path;
+
+    pub(crate) fn connect(_: &Path) -> io::Result<net::UnixStream> {
+        os_required!()
+    }
+
+    pub(crate) fn pair() -> io::Result<(net::UnixStream, net::UnixStream)> {
+        os_required!()
+    }
+
+    pub(crate) fn local_addr(_: &net::UnixStream) -> io::Result<SocketAddr> {
+        os_required!()
+    }
+
+    pub(crate) fn peer_addr(_: &net::UnixStream) -> io::Result<SocketAddr> {
+        os_required!()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/shell/waker.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/shell/waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+use crate::sys::Selector;
+use crate::Token;
+use std::io;
+
+#[derive(Debug)]
+pub struct Waker {}
+
+impl Waker {
+    pub fn new(_: &Selector, _: Token) -> io::Result<Waker> {
+        os_required!();
+    }
+
+    pub fn wake(&self) -> io::Result<()> {
+        os_required!();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/awakener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/awakener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/awakener.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/awakener.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-pub use self::pipe::Awakener;
-
-/// Default awakener backed by a pipe
-mod pipe {
-    use sys::unix;
-    use {io, Ready, Poll, PollOpt, Token};
-    use event::Evented;
-    use std::io::{Read, Write};
-
-    /*
-     *
-     * ===== Awakener =====
-     *
-     */
-
-    pub struct Awakener {
-        reader: unix::Io,
-        writer: unix::Io,
-    }
-
-    impl Awakener {
-        pub fn new() -> io::Result<Awakener> {
-            let (rd, wr) = unix::pipe()?;
-
-            Ok(Awakener {
-                reader: rd,
-                writer: wr,
-            })
-        }
-
-        pub fn wakeup(&self) -> io::Result<()> {
-            match (&self.writer).write(&[1]) {
-                Ok(_) => Ok(()),
-                Err(e) => {
-                    if e.kind() == io::ErrorKind::WouldBlock {
-                        Ok(())
-                    } else {
-                        Err(e)
-                    }
-                }
-            }
-        }
-
-        pub fn cleanup(&self) {
-            let mut buf = [0; 128];
-
-            loop {
-                // Consume data until all bytes are purged
-                match (&self.reader).read(&mut buf) {
-                    Ok(i) if i > 0 => {},
-                    _ => return,
-                }
-            }
-        }
-
-        fn reader(&self) -> &unix::Io {
-            &self.reader
-        }
-    }
-
-    impl Evented for Awakener {
-        fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-            self.reader().register(poll, token, interest, opts)
-        }
-
-        fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-            self.reader().reregister(poll, token, interest, opts)
-        }
-
-        fn deregister(&self, poll: &Poll) -> io::Result<()> {
-            self.reader().deregister(poll)
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/dlsym.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/dlsym.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/dlsym.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/dlsym.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-use std::marker;
-use std::mem;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-use libc;
-
-macro_rules! dlsym {
-    (fn $name:ident($($t:ty),*) -> $ret:ty) => (
-        #[allow(bad_style)]
-        static $name: ::sys::unix::dlsym::DlSym<unsafe extern fn($($t),*) -> $ret> =
-            ::sys::unix::dlsym::DlSym {
-                name: concat!(stringify!($name), "\0"),
-                addr: ::std::sync::atomic::ATOMIC_USIZE_INIT,
-                _marker: ::std::marker::PhantomData,
-            };
-    )
-}
-
-pub struct DlSym<F> {
-    pub name: &'static str,
-    pub addr: AtomicUsize,
-    pub _marker: marker::PhantomData<F>,
-}
-
-impl<F> DlSym<F> {
-    pub fn get(&self) -> Option<&F> {
-        assert_eq!(mem::size_of::<F>(), mem::size_of::<usize>());
-        unsafe {
-            if self.addr.load(Ordering::SeqCst) == 0 {
-                self.addr.store(fetch(self.name), Ordering::SeqCst);
-            }
-            if self.addr.load(Ordering::SeqCst) == 1 {
-                None
-            } else {
-                mem::transmute::<&AtomicUsize, Option<&F>>(&self.addr)
-            }
-        }
-    }
-}
-
-unsafe fn fetch(name: &str) -> usize {
-    assert_eq!(name.as_bytes()[name.len() - 1], 0);
-    match libc::dlsym(libc::RTLD_DEFAULT, name.as_ptr() as *const _) as usize {
-        0 => 1,
-        n => n,
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/epoll.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/epoll.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/epoll.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/epoll.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,268 +0,0 @@
-#![allow(deprecated)]
-use std::os::unix::io::AsRawFd;
-use std::os::unix::io::RawFd;
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
-use std::time::Duration;
-use std::{cmp, i32};
-
-use libc::{self, c_int};
-use libc::{EPOLLERR, EPOLLHUP, EPOLLONESHOT};
-use libc::{EPOLLET, EPOLLOUT, EPOLLIN, EPOLLPRI};
-
-use {io, Ready, PollOpt, Token};
-use event_imp::Event;
-use sys::unix::{cvt, UnixReady};
-use sys::unix::io::set_cloexec;
-
-/// Each Selector has a globally unique(ish) ID associated with it. This ID
-/// gets tracked by `TcpStream`, `TcpListener`, etc... when they are first
-/// registered with the `Selector`. If a type that is previously associated with
-/// a `Selector` attempts to register itself with a different `Selector`, the
-/// operation will return with an error. This matches windows behavior.
-static NEXT_ID: AtomicUsize = ATOMIC_USIZE_INIT;
-
-#[derive(Debug)]
-pub struct Selector {
-    id: usize,
-    epfd: RawFd,
-}
-
-impl Selector {
-    pub fn new() -> io::Result<Selector> {
-        let epfd = unsafe {
-            // Emulate `epoll_create` by using `epoll_create1` if it's available
-            // and otherwise falling back to `epoll_create` followed by a call to
-            // set the CLOEXEC flag.
-            dlsym!(fn epoll_create1(c_int) -> c_int);
-
-            match epoll_create1.get() {
-                Some(epoll_create1_fn) => {
-                    cvt(epoll_create1_fn(libc::EPOLL_CLOEXEC))?
-                }
-                None => {
-                    let fd = cvt(libc::epoll_create(1024))?;
-                    drop(set_cloexec(fd));
-                    fd
-                }
-            }
-        };
-
-        // offset by 1 to avoid choosing 0 as the id of a selector
-        let id = NEXT_ID.fetch_add(1, Ordering::Relaxed) + 1;
-
-        Ok(Selector {
-            id: id,
-            epfd: epfd,
-        })
-    }
-
-    pub fn id(&self) -> usize {
-        self.id
-    }
-
-    /// Wait for events from the OS
-    pub fn select(&self, evts: &mut Events, awakener: Token, timeout: Option<Duration>) -> io::Result<bool> {
-        // A bug in kernels < 2.6.37 makes timeouts larger than LONG_MAX / CONFIG_HZ
-        // (approx. 30 minutes with CONFIG_HZ=1200) effectively infinite on 32 bits
-        // architectures. The magic number is the same constant used by libuv.
-        #[cfg(target_pointer_width = "32")]
-        const MAX_SAFE_TIMEOUT: u64 = 1789569;
-        #[cfg(not(target_pointer_width = "32"))]
-        const MAX_SAFE_TIMEOUT: u64 = c_int::max_value() as u64;
-
-        let timeout_ms = timeout
-            .map(|to| cmp::min(millis(to), MAX_SAFE_TIMEOUT) as c_int)
-            .unwrap_or(-1);
-
-        // Wait for epoll events for at most timeout_ms milliseconds
-        evts.clear();
-        unsafe {
-            let cnt = cvt(libc::epoll_wait(self.epfd,
-                                           evts.events.as_mut_ptr(),
-                                           evts.events.capacity() as i32,
-                                           timeout_ms))?;
-            let cnt = cnt as usize;
-            evts.events.set_len(cnt);
-
-            for i in 0..cnt {
-                if evts.events[i].u64 as usize == awakener.into() {
-                    evts.events.remove(i);
-                    return Ok(true);
-                }
-            }
-        }
-
-        Ok(false)
-    }
-
-    /// Register event interests for the given IO handle with the OS
-    pub fn register(&self, fd: RawFd, token: Token, interests: Ready, opts: PollOpt) -> io::Result<()> {
-        let mut info = libc::epoll_event {
-            events: ioevent_to_epoll(interests, opts),
-            u64: usize::from(token) as u64
-        };
-
-        unsafe {
-            cvt(libc::epoll_ctl(self.epfd, libc::EPOLL_CTL_ADD, fd, &mut info))?;
-            Ok(())
-        }
-    }
-
-    /// Register event interests for the given IO handle with the OS
-    pub fn reregister(&self, fd: RawFd, token: Token, interests: Ready, opts: PollOpt) -> io::Result<()> {
-        let mut info = libc::epoll_event {
-            events: ioevent_to_epoll(interests, opts),
-            u64: usize::from(token) as u64
-        };
-
-        unsafe {
-            cvt(libc::epoll_ctl(self.epfd, libc::EPOLL_CTL_MOD, fd, &mut info))?;
-            Ok(())
-        }
-    }
-
-    /// Deregister event interests for the given IO handle with the OS
-    pub fn deregister(&self, fd: RawFd) -> io::Result<()> {
-        // The &info argument should be ignored by the system,
-        // but linux < 2.6.9 required it to be not null.
-        // For compatibility, we provide a dummy EpollEvent.
-        let mut info = libc::epoll_event {
-            events: 0,
-            u64: 0,
-        };
-
-        unsafe {
-            cvt(libc::epoll_ctl(self.epfd, libc::EPOLL_CTL_DEL, fd, &mut info))?;
-            Ok(())
-        }
-    }
-}
-
-fn ioevent_to_epoll(interest: Ready, opts: PollOpt) -> u32 {
-    let mut kind = 0;
-
-    if interest.is_readable() {
-        kind |= EPOLLIN;
-    }
-
-    if interest.is_writable() {
-        kind |= EPOLLOUT;
-    }
-
-    if UnixReady::from(interest).is_priority() {
-        kind |= EPOLLPRI;
-    }
-
-    if opts.is_edge() {
-        kind |= EPOLLET;
-    }
-
-    if opts.is_oneshot() {
-        kind |= EPOLLONESHOT;
-    }
-
-    if opts.is_level() {
-        kind &= !EPOLLET;
-    }
-
-    kind as u32
-}
-
-impl AsRawFd for Selector {
-    fn as_raw_fd(&self) -> RawFd {
-        self.epfd
-    }
-}
-
-impl Drop for Selector {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libc::close(self.epfd);
-        }
-    }
-}
-
-pub struct Events {
-    events: Vec<libc::epoll_event>,
-}
-
-impl Events {
-    pub fn with_capacity(u: usize) -> Events {
-        Events {
-            events: Vec::with_capacity(u)
-        }
-    }
-
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.events.len()
-    }
-
-    #[inline]
-    pub fn capacity(&self) -> usize {
-        self.events.capacity()
-    }
-
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.events.is_empty()
-    }
-
-    #[inline]
-    pub fn get(&self, idx: usize) -> Option<Event> {
-        self.events.get(idx).map(|event| {
-            let epoll = event.events as c_int;
-            let mut kind = Ready::empty();
-
-            if (epoll & EPOLLIN) != 0 {
-                kind = kind | Ready::readable();
-            }
-
-            if (epoll & EPOLLPRI) != 0 {
-                kind = kind | Ready::readable() | UnixReady::priority();
-            }
-
-            if (epoll & EPOLLOUT) != 0 {
-                kind = kind | Ready::writable();
-            }
-
-            // EPOLLHUP - Usually means a socket error happened
-            if (epoll & EPOLLERR) != 0 {
-                kind = kind | UnixReady::error();
-            }
-
-            if (epoll & EPOLLHUP) != 0 {
-                kind = kind | UnixReady::hup();
-            }
-
-            let token = self.events[idx].u64;
-
-            Event::new(kind, Token(token as usize))
-        })
-    }
-
-    pub fn push_event(&mut self, event: Event) {
-        self.events.push(libc::epoll_event {
-            events: ioevent_to_epoll(event.readiness(), PollOpt::empty()),
-            u64: usize::from(event.token()) as u64
-        });
-    }
-
-    pub fn clear(&mut self) {
-        unsafe { self.events.set_len(0); }
-    }
-}
-
-const NANOS_PER_MILLI: u32 = 1_000_000;
-const MILLIS_PER_SEC: u64 = 1_000;
-
-/// Convert a `Duration` to milliseconds, rounding up and saturating at
-/// `u64::MAX`.
-///
-/// The saturating is fine because `u64::MAX` milliseconds are still many
-/// million years.
-pub fn millis(duration: Duration) -> u64 {
-    // Round up.
-    let millis = (duration.subsec_nanos() + NANOS_PER_MILLI - 1) / NANOS_PER_MILLI;
-    duration.as_secs().saturating_mul(MILLIS_PER_SEC).saturating_add(millis as u64)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/eventedfd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/eventedfd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/eventedfd.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/eventedfd.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-use {io, poll, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use std::os::unix::io::RawFd;
-
-/*
- *
- * ===== EventedFd =====
- *
- */
-
-#[derive(Debug)]
-
-/// Adapter for [`RawFd`] providing an [`Evented`] implementation.
-///
-/// `EventedFd` enables registering any type with an FD with [`Poll`].
-///
-/// While only implementations for TCP and UDP are provided, Mio supports
-/// registering any FD that can be registered with the underlying OS selector.
-/// `EventedFd` provides the necessary bridge.
-///
-/// Note that `EventedFd` takes a `&RawFd`. This is because `EventedFd` **does
-/// not** take ownership of the FD. Specifically, it will not manage any
-/// lifecycle related operations, such as closing the FD on drop. It is expected
-/// that the `EventedFd` is constructed right before a call to
-/// [`Poll::register`]. See the examples for more detail.
-///
-/// # Examples
-///
-/// Basic usage
-///
-/// ```
-/// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Ready, Poll, PollOpt, Token};
-/// use mio::unix::EventedFd;
-///
-/// use std::os::unix::io::AsRawFd;
-/// use std::net::TcpListener;
-///
-/// // Bind a std listener
-/// let listener = TcpListener::bind("127.0.0.1:0")?;
-///
-/// let poll = Poll::new()?;
-///
-/// // Register the listener
-/// poll.register(&EventedFd(&listener.as_raw_fd()),
-///              Token(0), Ready::readable(), PollOpt::edge())?;
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-///
-/// Implementing [`Evented`] for a custom type backed by a [`RawFd`].
-///
-/// ```
-/// use mio::{Ready, Poll, PollOpt, Token};
-/// use mio::event::Evented;
-/// use mio::unix::EventedFd;
-///
-/// use std::os::unix::io::RawFd;
-/// use std::io;
-///
-/// pub struct MyIo {
-///     fd: RawFd,
-/// }
-///
-/// impl Evented for MyIo {
-///     fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt)
-///         -> io::Result<()>
-///     {
-///         EventedFd(&self.fd).register(poll, token, interest, opts)
-///     }
-///
-///     fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt)
-///         -> io::Result<()>
-///     {
-///         EventedFd(&self.fd).reregister(poll, token, interest, opts)
-///     }
-///
-///     fn deregister(&self, poll: &Poll) -> io::Result<()> {
-///         EventedFd(&self.fd).deregister(poll)
-///     }
-/// }
-/// ```
-///
-/// [`RawFd`]: https://doc.rust-lang.org/std/os/unix/io/type.RawFd.html
-/// [`Evented`]: ../event/trait.Evented.html
-/// [`Poll`]: ../struct.Poll.html
-/// [`Poll::register`]: ../struct.Poll.html#method.register
-pub struct EventedFd<'a>(pub &'a RawFd);
-
-impl<'a> Evented for EventedFd<'a> {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        poll::selector(poll).register(*self.0, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        poll::selector(poll).reregister(*self.0, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        poll::selector(poll).deregister(*self.0)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/io.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-use std::fs::File;
-use std::io::{Read, Write};
-use std::os::unix::io::{IntoRawFd, AsRawFd, FromRawFd, RawFd};
-
-use libc;
-
-use {io, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use unix::EventedFd;
-use sys::unix::cvt;
-
-pub fn set_nonblock(fd: libc::c_int) -> io::Result<()> {
-    unsafe {
-        let flags = libc::fcntl(fd, libc::F_GETFL);
-        cvt(libc::fcntl(fd, libc::F_SETFL, flags | libc::O_NONBLOCK)).map(|_|())
-    }
-}
-
-pub fn set_cloexec(fd: libc::c_int) -> io::Result<()> {
-    unsafe {
-        let flags = libc::fcntl(fd, libc::F_GETFD);
-        cvt(libc::fcntl(fd, libc::F_SETFD, flags | libc::FD_CLOEXEC)).map(|_| ())
-    }
-}
-
-/*
- *
- * ===== Basic IO type =====
- *
- */
-
-/// Manages a FD
-#[derive(Debug)]
-pub struct Io {
-    fd: File,
-}
-
-impl Io {
-    /// Try to clone the FD
-    pub fn try_clone(&self) -> io::Result<Io> {
-        Ok(Io { fd: self.fd.try_clone()? })
-    }
-}
-
-impl FromRawFd for Io {
-    unsafe fn from_raw_fd(fd: RawFd) -> Io {
-        Io { fd: File::from_raw_fd(fd) }
-    }
-}
-
-impl IntoRawFd for Io {
-    fn into_raw_fd(self) -> RawFd {
-        self.fd.into_raw_fd()
-    }
-}
-
-impl AsRawFd for Io {
-    fn as_raw_fd(&self) -> RawFd {
-        self.fd.as_raw_fd()
-    }
-}
-
-impl Evented for Io {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).deregister(poll)
-    }
-}
-
-impl Read for Io {
-    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
-        (&self.fd).read(dst)
-    }
-}
-
-impl<'a> Read for &'a Io {
-    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
-        (&self.fd).read(dst)
-    }
-}
-
-impl Write for Io {
-    fn write(&mut self, src: &[u8]) -> io::Result<usize> {
-        (&self.fd).write(src)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&self.fd).flush()
-    }
-}
-
-impl<'a> Write for &'a Io {
-    fn write(&mut self, src: &[u8]) -> io::Result<usize> {
-        (&self.fd).write(src)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&self.fd).flush()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/kqueue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/kqueue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/kqueue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/kqueue.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,360 +0,0 @@
-use std::{cmp, fmt, ptr};
-#[cfg(not(target_os = "netbsd"))]
-use std::os::raw::{c_int, c_short};
-use std::os::unix::io::AsRawFd;
-use std::os::unix::io::RawFd;
-use std::collections::HashMap;
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
-use std::time::Duration;
-
-use libc::{self, time_t};
-
-use {io, Ready, PollOpt, Token};
-use event_imp::{self as event, Event};
-use sys::unix::{cvt, UnixReady};
-use sys::unix::io::set_cloexec;
-
-/// Each Selector has a globally unique(ish) ID associated with it. This ID
-/// gets tracked by `TcpStream`, `TcpListener`, etc... when they are first
-/// registered with the `Selector`. If a type that is previously associated with
-/// a `Selector` attempts to register itself with a different `Selector`, the
-/// operation will return with an error. This matches windows behavior.
-static NEXT_ID: AtomicUsize = ATOMIC_USIZE_INIT;
-
-#[cfg(not(target_os = "netbsd"))]
-type Filter = c_short;
-#[cfg(not(target_os = "netbsd"))]
-type UData = *mut ::libc::c_void;
-#[cfg(not(target_os = "netbsd"))]
-type Count = c_int;
-
-#[cfg(target_os = "netbsd")]
-type Filter = u32;
-#[cfg(target_os = "netbsd")]
-type UData = ::libc::intptr_t;
-#[cfg(target_os = "netbsd")]
-type Count = usize;
-
-macro_rules! kevent {
-    ($id: expr, $filter: expr, $flags: expr, $data: expr) => {
-        libc::kevent {
-            ident: $id as ::libc::uintptr_t,
-            filter: $filter as Filter,
-            flags: $flags,
-            fflags: 0,
-            data: 0,
-            udata: $data as UData,
-        }
-    }
-}
-
-pub struct Selector {
-    id: usize,
-    kq: RawFd,
-}
-
-impl Selector {
-    pub fn new() -> io::Result<Selector> {
-        // offset by 1 to avoid choosing 0 as the id of a selector
-        let id = NEXT_ID.fetch_add(1, Ordering::Relaxed) + 1;
-        let kq = unsafe { cvt(libc::kqueue())? };
-        drop(set_cloexec(kq));
-
-        Ok(Selector {
-            id,
-            kq,
-        })
-    }
-
-    pub fn id(&self) -> usize {
-        self.id
-    }
-
-    pub fn select(&self, evts: &mut Events, awakener: Token, timeout: Option<Duration>) -> io::Result<bool> {
-        let timeout = timeout.map(|to| {
-            libc::timespec {
-                tv_sec: cmp::min(to.as_secs(), time_t::max_value() as u64) as time_t,
-                // `Duration::subsec_nanos` is guaranteed to be less than one
-                // billion (the number of nanoseconds in a second), making the
-                // cast to i32 safe. The cast itself is needed for platforms
-                // where C's long is only 32 bits.
-                tv_nsec: libc::c_long::from(to.subsec_nanos() as i32),
-            }
-        });
-        let timeout = timeout.as_ref().map(|s| s as *const _).unwrap_or(ptr::null_mut());
-
-        evts.clear();
-        unsafe {
-            let cnt = cvt(libc::kevent(self.kq,
-                                            ptr::null(),
-                                            0,
-                                            evts.sys_events.0.as_mut_ptr(),
-                                            evts.sys_events.0.capacity() as Count,
-                                            timeout))?;
-            evts.sys_events.0.set_len(cnt as usize);
-            Ok(evts.coalesce(awakener))
-        }
-    }
-
-    pub fn register(&self, fd: RawFd, token: Token, interests: Ready, opts: PollOpt) -> io::Result<()> {
-        trace!("registering; token={:?}; interests={:?}", token, interests);
-
-        let flags = if opts.contains(PollOpt::edge()) { libc::EV_CLEAR } else { 0 } |
-                    if opts.contains(PollOpt::oneshot()) { libc::EV_ONESHOT } else { 0 } |
-                    libc::EV_RECEIPT;
-
-        unsafe {
-            let r = if interests.contains(Ready::readable()) { libc::EV_ADD } else { libc::EV_DELETE };
-            let w = if interests.contains(Ready::writable()) { libc::EV_ADD } else { libc::EV_DELETE };
-            let mut changes = [
-                kevent!(fd, libc::EVFILT_READ, flags | r, usize::from(token)),
-                kevent!(fd, libc::EVFILT_WRITE, flags | w, usize::from(token)),
-            ];
-
-            cvt(libc::kevent(self.kq,
-                             changes.as_ptr(),
-                             changes.len() as Count,
-                             changes.as_mut_ptr(),
-                             changes.len() as Count,
-                             ::std::ptr::null()))?;
-
-            for change in changes.iter() {
-                debug_assert_eq!(change.flags & libc::EV_ERROR, libc::EV_ERROR);
-
-                // Test to see if an error happened
-                if change.data == 0 {
-                    continue
-                }
-
-                // Older versions of OSX (10.11 and 10.10 have been witnessed)
-                // can return EPIPE when registering a pipe file descriptor
-                // where the other end has already disappeared. For example code
-                // that creates a pipe, closes a file descriptor, and then
-                // registers the other end will see an EPIPE returned from
-                // `register`.
-                //
-                // It also turns out that kevent will still report events on the
-                // file descriptor, telling us that it's readable/hup at least
-                // after we've done this registration. As a result we just
-                // ignore `EPIPE` here instead of propagating it.
-                //
-                // More info can be found at carllerche/mio#582
-                if change.data as i32 == libc::EPIPE &&
-                   change.filter == libc::EVFILT_WRITE as Filter {
-                    continue
-                }
-
-                // ignore ENOENT error for EV_DELETE
-                let orig_flags = if change.filter == libc::EVFILT_READ as Filter { r } else { w };
-                if change.data as i32 == libc::ENOENT && orig_flags & libc::EV_DELETE != 0 {
-                    continue
-                }
-
-                return Err(::std::io::Error::from_raw_os_error(change.data as i32));
-            }
-            Ok(())
-        }
-    }
-
-    pub fn reregister(&self, fd: RawFd, token: Token, interests: Ready, opts: PollOpt) -> io::Result<()> {
-        // Just need to call register here since EV_ADD is a mod if already
-        // registered
-        self.register(fd, token, interests, opts)
-    }
-
-    pub fn deregister(&self, fd: RawFd) -> io::Result<()> {
-        unsafe {
-            // EV_RECEIPT is a nice way to apply changes and get back per-event results while not
-            // draining the actual changes.
-            let filter = libc::EV_DELETE | libc::EV_RECEIPT;
-#[cfg(not(target_os = "netbsd"))]
-            let mut changes = [
-                kevent!(fd, libc::EVFILT_READ, filter, ptr::null_mut()),
-                kevent!(fd, libc::EVFILT_WRITE, filter, ptr::null_mut()),
-            ];
-
-#[cfg(target_os = "netbsd")]
-            let mut changes = [
-                kevent!(fd, libc::EVFILT_READ, filter, 0),
-                kevent!(fd, libc::EVFILT_WRITE, filter, 0),
-            ];
-
-            cvt(libc::kevent(self.kq,
-                             changes.as_ptr(),
-                             changes.len() as Count,
-                             changes.as_mut_ptr(),
-                             changes.len() as Count,
-                             ::std::ptr::null())).map(|_| ())?;
-
-            if changes[0].data as i32 == libc::ENOENT && changes[1].data as i32 == libc::ENOENT {
-                return Err(::std::io::Error::from_raw_os_error(changes[0].data as i32));
-            }
-            for change in changes.iter() {
-                debug_assert_eq!(libc::EV_ERROR & change.flags, libc::EV_ERROR);
-                if change.data != 0 && change.data as i32 != libc::ENOENT {
-                    return Err(::std::io::Error::from_raw_os_error(changes[0].data as i32));
-                }
-            }
-            Ok(())
-        }
-    }
-}
-
-impl fmt::Debug for Selector {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("Selector")
-            .field("id", &self.id)
-            .field("kq", &self.kq)
-            .finish()
-    }
-}
-
-impl AsRawFd for Selector {
-    fn as_raw_fd(&self) -> RawFd {
-        self.kq
-    }
-}
-
-impl Drop for Selector {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libc::close(self.kq);
-        }
-    }
-}
-
-pub struct Events {
-    sys_events: KeventList,
-    events: Vec<Event>,
-    event_map: HashMap<Token, usize>,
-}
-
-struct KeventList(Vec<libc::kevent>);
-
-unsafe impl Send for KeventList {}
-unsafe impl Sync for KeventList {}
-
-impl Events {
-    pub fn with_capacity(cap: usize) -> Events {
-        Events {
-            sys_events: KeventList(Vec::with_capacity(cap)),
-            events: Vec::with_capacity(cap),
-            event_map: HashMap::with_capacity(cap)
-        }
-    }
-
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.events.len()
-    }
-
-    #[inline]
-    pub fn capacity(&self) -> usize {
-        self.events.capacity()
-    }
-
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.events.is_empty()
-    }
-
-    pub fn get(&self, idx: usize) -> Option<Event> {
-        self.events.get(idx).cloned()
-    }
-
-    fn coalesce(&mut self, awakener: Token) -> bool {
-        let mut ret = false;
-        self.events.clear();
-        self.event_map.clear();
-
-        for e in self.sys_events.0.iter() {
-            let token = Token(e.udata as usize);
-            let len = self.events.len();
-
-            if token == awakener {
-                // TODO: Should this return an error if event is an error. It
-                // is not critical as spurious wakeups are permitted.
-                ret = true;
-                continue;
-            }
-
-            let idx = *self.event_map.entry(token)
-                .or_insert(len);
-
-            if idx == len {
-                // New entry, insert the default
-                self.events.push(Event::new(Ready::empty(), token));
-
-            }
-
-            if e.flags & libc::EV_ERROR != 0 {
-                event::kind_mut(&mut self.events[idx]).insert(*UnixReady::error());
-            }
-
-            if e.filter == libc::EVFILT_READ as Filter {
-                event::kind_mut(&mut self.events[idx]).insert(Ready::readable());
-            } else if e.filter == libc::EVFILT_WRITE as Filter {
-                event::kind_mut(&mut self.events[idx]).insert(Ready::writable());
-            }
-#[cfg(any(target_os = "dragonfly",
-    target_os = "freebsd", target_os = "ios", target_os = "macos"))]
-            {
-                if e.filter == libc::EVFILT_AIO {
-                    event::kind_mut(&mut self.events[idx]).insert(UnixReady::aio());
-                }
-            }
-#[cfg(any(target_os = "freebsd"))]
-            {
-                if e.filter == libc::EVFILT_LIO {
-                    event::kind_mut(&mut self.events[idx]).insert(UnixReady::lio());
-                }
-            }
-        }
-
-        ret
-    }
-
-    pub fn push_event(&mut self, event: Event) {
-        self.events.push(event);
-    }
-
-    pub fn clear(&mut self) {
-        self.sys_events.0.truncate(0);
-        self.events.truncate(0);
-        self.event_map.clear();
-    }
-}
-
-impl fmt::Debug for Events {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("Events")
-            .field("len", &self.sys_events.0.len())
-            .finish()
-    }
-}
-
-#[test]
-fn does_not_register_rw() {
-    use {Poll, Ready, PollOpt, Token};
-    use unix::EventedFd;
-
-    let kq = unsafe { libc::kqueue() };
-    let kqf = EventedFd(&kq);
-    let poll = Poll::new().unwrap();
-
-    // registering kqueue fd will fail if write is requested (On anything but some versions of OS
-    // X)
-    poll.register(&kqf, Token(1234), Ready::readable(),
-                  PollOpt::edge() | PollOpt::oneshot()).unwrap();
-}
-
-#[cfg(any(target_os = "dragonfly",
-    target_os = "freebsd", target_os = "ios", target_os = "macos"))]
-#[test]
-fn test_coalesce_aio() {
-    let mut events = Events::with_capacity(1);
-    events.sys_events.0.push(kevent!(0x1234, libc::EVFILT_AIO, 0, 42));
-    events.coalesce(Token(0));
-    assert!(events.events[0].readiness() == UnixReady::aio().into());
-    assert!(events.events[0].token() == Token(42));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,105 +1,72 @@
-use libc::{self, c_int};
+/// Helper macro to execute a system call that returns an `io::Result`.
+//
+// Macro must be defined before any modules that uses them.
+#[allow(unused_macros)]
+macro_rules! syscall {
+    ($fn: ident ( $($arg: expr),* $(,)* ) ) => {{
+        let res = unsafe { libc::$fn($($arg, )*) };
+        if res == -1 {
+            Err(std::io::Error::last_os_error())
+        } else {
+            Ok(res)
+        }
+    }};
+}
+
+cfg_os_poll! {
+    mod selector;
+    pub(crate) use self::selector::{event, Event, Events, Selector};
+
+    mod sourcefd;
+    pub use self::sourcefd::SourceFd;
+
+    mod waker;
+    pub(crate) use self::waker::Waker;
+
+    cfg_net! {
+        mod net;
+
+        pub(crate) mod tcp;
+        pub(crate) mod udp;
+        pub(crate) mod uds;
+        pub use self::uds::SocketAddr;
+    }
+
+    cfg_io_source! {
+        use std::io;
 
-#[macro_use]
-pub mod dlsym;
+        // Both `kqueue` and `epoll` don't need to hold any user space state.
+        pub(crate) struct IoSourceState;
 
-#[cfg(any(
-    target_os = "android",
-    target_os = "illumos",
-    target_os = "linux",
-    target_os = "solaris"
-))]
-mod epoll;
-
-#[cfg(any(
-    target_os = "android",
-    target_os = "illumos",
-    target_os = "linux",
-    target_os = "solaris"
-))]
-pub use self::epoll::{Events, Selector};
-
-#[cfg(any(target_os = "bitrig", target_os = "dragonfly",
-          target_os = "freebsd", target_os = "ios", target_os = "macos",
-          target_os = "netbsd", target_os = "openbsd"))]
-mod kqueue;
-
-#[cfg(any(target_os = "bitrig", target_os = "dragonfly",
-          target_os = "freebsd", target_os = "ios", target_os = "macos",
-          target_os = "netbsd", target_os = "openbsd"))]
-pub use self::kqueue::{Events, Selector};
-
-mod awakener;
-mod eventedfd;
-mod io;
-mod ready;
-mod tcp;
-mod udp;
-mod uio;
-
-#[cfg(feature = "with-deprecated")]
-mod uds;
-
-pub use self::awakener::Awakener;
-pub use self::eventedfd::EventedFd;
-pub use self::io::{Io, set_nonblock};
-pub use self::ready::{UnixReady, READY_ALL};
-pub use self::tcp::{TcpStream, TcpListener};
-pub use self::udp::UdpSocket;
-
-#[cfg(feature = "with-deprecated")]
-pub use self::uds::UnixSocket;
-
-pub use iovec::IoVec;
-
-use std::os::unix::io::FromRawFd;
-
-pub fn pipe() -> ::io::Result<(Io, Io)> {
-    // Use pipe2 for atomically setting O_CLOEXEC if we can, but otherwise
-    // just fall back to using `pipe`.
-    dlsym!(fn pipe2(*mut c_int, c_int) -> c_int);
-
-    let mut pipes = [0; 2];
-    unsafe {
-        match pipe2.get() {
-            Some(pipe2_fn) => {
-                let flags = libc::O_NONBLOCK | libc::O_CLOEXEC;
-                cvt(pipe2_fn(pipes.as_mut_ptr(), flags))?;
-                Ok((Io::from_raw_fd(pipes[0]), Io::from_raw_fd(pipes[1])))
+        impl IoSourceState {
+            pub fn new() -> IoSourceState {
+                IoSourceState
             }
-            None => {
-                cvt(libc::pipe(pipes.as_mut_ptr()))?;
-                // Ensure the pipe are closed if any of the system calls below
-                // fail.
-                let r = Io::from_raw_fd(pipes[0]);
-                let w = Io::from_raw_fd(pipes[1]);
-                cvt(libc::fcntl(pipes[0], libc::F_SETFD, libc::FD_CLOEXEC))?;
-                cvt(libc::fcntl(pipes[1], libc::F_SETFD, libc::FD_CLOEXEC))?;
-                cvt(libc::fcntl(pipes[0], libc::F_SETFL, libc::O_NONBLOCK))?;
-                cvt(libc::fcntl(pipes[1], libc::F_SETFL, libc::O_NONBLOCK))?;
-                Ok((r, w))
+
+            pub fn do_io<T, F, R>(&self, f: F, io: &T) -> io::Result<R>
+            where
+                F: FnOnce(&T) -> io::Result<R>,
+            {
+                // We don't hold state, so we can just call the function and
+                // return.
+                f(io)
             }
         }
     }
-}
-
-trait IsMinusOne {
-    fn is_minus_one(&self) -> bool;
-}
 
-impl IsMinusOne for i32 {
-    fn is_minus_one(&self) -> bool { *self == -1 }
-}
-impl IsMinusOne for isize {
-    fn is_minus_one(&self) -> bool { *self == -1 }
+    cfg_os_ext! {
+        pub(crate) mod pipe;
+    }
 }
 
-fn cvt<T: IsMinusOne>(t: T) -> ::io::Result<T> {
-    use std::io;
+cfg_not_os_poll! {
+    cfg_net! {
+        mod uds;
+        pub use self::uds::SocketAddr;
+    }
 
-    if t.is_minus_one() {
-        Err(io::Error::last_os_error())
-    } else {
-        Ok(t)
+    cfg_any_os_ext! {
+        mod sourcefd;
+        pub use self::sourcefd::SourceFd;
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/net.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/net.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/net.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/net.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,169 @@
+use std::io;
+use std::mem::size_of;
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
+
+pub(crate) fn new_ip_socket(addr: SocketAddr, socket_type: libc::c_int) -> io::Result<libc::c_int> {
+    let domain = match addr {
+        SocketAddr::V4(..) => libc::AF_INET,
+        SocketAddr::V6(..) => libc::AF_INET6,
+    };
+
+    new_socket(domain, socket_type)
+}
+
+/// Create a new non-blocking socket.
+pub(crate) fn new_socket(domain: libc::c_int, socket_type: libc::c_int) -> io::Result<libc::c_int> {
+    #[cfg(any(
+        target_os = "android",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "illumos",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    let socket_type = socket_type | libc::SOCK_NONBLOCK | libc::SOCK_CLOEXEC;
+
+    // Gives a warning for platforms without SOCK_NONBLOCK.
+    #[allow(clippy::let_and_return)]
+    let socket = syscall!(socket(domain, socket_type, 0));
+
+    // Mimick `libstd` and set `SO_NOSIGPIPE` on apple systems.
+    #[cfg(target_vendor = "apple")]
+    let socket = socket.and_then(|socket| {
+        syscall!(setsockopt(
+            socket,
+            libc::SOL_SOCKET,
+            libc::SO_NOSIGPIPE,
+            &1 as *const libc::c_int as *const libc::c_void,
+            size_of::<libc::c_int>() as libc::socklen_t
+        ))
+        .map(|_| socket)
+    });
+
+    // Darwin doesn't have SOCK_NONBLOCK or SOCK_CLOEXEC. Not sure about
+    // Solaris, couldn't find anything online.
+    #[cfg(any(target_os = "ios", target_os = "macos", target_os = "solaris"))]
+    let socket = socket.and_then(|socket| {
+        // For platforms that don't support flags in socket, we need to
+        // set the flags ourselves.
+        syscall!(fcntl(socket, libc::F_SETFL, libc::O_NONBLOCK))
+            .and_then(|_| syscall!(fcntl(socket, libc::F_SETFD, libc::FD_CLOEXEC)).map(|_| socket))
+            .map_err(|e| {
+                // If either of the `fcntl` calls failed, ensure the socket is
+                // closed and return the error.
+                let _ = syscall!(close(socket));
+                e
+            })
+    });
+
+    socket
+}
+
+/// A type with the same memory layout as `libc::sockaddr`. Used in converting Rust level
+/// SocketAddr* types into their system representation. The benefit of this specific
+/// type over using `libc::sockaddr_storage` is that this type is exactly as large as it
+/// needs to be and not a lot larger. And it can be initialized cleaner from Rust.
+#[repr(C)]
+pub(crate) union SocketAddrCRepr {
+    v4: libc::sockaddr_in,
+    v6: libc::sockaddr_in6,
+}
+
+impl SocketAddrCRepr {
+    pub(crate) fn as_ptr(&self) -> *const libc::sockaddr {
+        self as *const _ as *const libc::sockaddr
+    }
+}
+
+/// Converts a Rust `SocketAddr` into the system representation.
+pub(crate) fn socket_addr(addr: &SocketAddr) -> (SocketAddrCRepr, libc::socklen_t) {
+    match addr {
+        SocketAddr::V4(ref addr) => {
+            // `s_addr` is stored as BE on all machine and the array is in BE order.
+            // So the native endian conversion method is used so that it's never swapped.
+            let sin_addr = libc::in_addr {
+                s_addr: u32::from_ne_bytes(addr.ip().octets()),
+            };
+
+            let sockaddr_in = libc::sockaddr_in {
+                sin_family: libc::AF_INET as libc::sa_family_t,
+                sin_port: addr.port().to_be(),
+                sin_addr,
+                sin_zero: [0; 8],
+                #[cfg(any(
+                    target_os = "dragonfly",
+                    target_os = "freebsd",
+                    target_os = "ios",
+                    target_os = "macos",
+                    target_os = "netbsd",
+                    target_os = "openbsd"
+                ))]
+                sin_len: 0,
+            };
+
+            let sockaddr = SocketAddrCRepr { v4: sockaddr_in };
+            let socklen = size_of::<libc::sockaddr_in>() as libc::socklen_t;
+            (sockaddr, socklen)
+        }
+        SocketAddr::V6(ref addr) => {
+            let sockaddr_in6 = libc::sockaddr_in6 {
+                sin6_family: libc::AF_INET6 as libc::sa_family_t,
+                sin6_port: addr.port().to_be(),
+                sin6_addr: libc::in6_addr {
+                    s6_addr: addr.ip().octets(),
+                },
+                sin6_flowinfo: addr.flowinfo(),
+                sin6_scope_id: addr.scope_id(),
+                #[cfg(any(
+                    target_os = "dragonfly",
+                    target_os = "freebsd",
+                    target_os = "ios",
+                    target_os = "macos",
+                    target_os = "netbsd",
+                    target_os = "openbsd"
+                ))]
+                sin6_len: 0,
+                #[cfg(any(target_os = "solaris", target_os = "illumos"))]
+                __sin6_src_id: 0,
+            };
+
+            let sockaddr = SocketAddrCRepr { v6: sockaddr_in6 };
+            let socklen = size_of::<libc::sockaddr_in6>() as libc::socklen_t;
+            (sockaddr, socklen)
+        }
+    }
+}
+
+/// Converts a `libc::sockaddr` compatible struct into a native Rust `SocketAddr`.
+///
+/// # Safety
+///
+/// `storage` must have the `ss_family` field correctly initialized.
+/// `storage` must be initialised to a `sockaddr_in` or `sockaddr_in6`.
+pub(crate) unsafe fn to_socket_addr(
+    storage: *const libc::sockaddr_storage,
+) -> io::Result<SocketAddr> {
+    match (*storage).ss_family as libc::c_int {
+        libc::AF_INET => {
+            // Safety: if the ss_family field is AF_INET then storage must be a sockaddr_in.
+            let addr: &libc::sockaddr_in = &*(storage as *const libc::sockaddr_in);
+            let ip = Ipv4Addr::from(addr.sin_addr.s_addr.to_ne_bytes());
+            let port = u16::from_be(addr.sin_port);
+            Ok(SocketAddr::V4(SocketAddrV4::new(ip, port)))
+        }
+        libc::AF_INET6 => {
+            // Safety: if the ss_family field is AF_INET6 then storage must be a sockaddr_in6.
+            let addr: &libc::sockaddr_in6 = &*(storage as *const libc::sockaddr_in6);
+            let ip = Ipv6Addr::from(addr.sin6_addr.s6_addr);
+            let port = u16::from_be(addr.sin6_port);
+            Ok(SocketAddr::V6(SocketAddrV6::new(
+                ip,
+                port,
+                addr.sin6_flowinfo,
+                addr.sin6_scope_id,
+            )))
+        }
+        _ => Err(io::ErrorKind::InvalidInput.into()),
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/pipe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/pipe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/pipe.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/pipe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,432 @@
+//! Unix pipe.
+//!
+//! See the [`new`] function for documentation.
+
+use std::fs::File;
+use std::io::{self, IoSlice, IoSliceMut, Read, Write};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::process::{ChildStderr, ChildStdin, ChildStdout};
+
+use crate::io_source::IoSource;
+use crate::{event, Interest, Registry, Token};
+
+/// Create a new non-blocking Unix pipe.
+///
+/// This is a wrapper around Unix's [`pipe(2)`] system call and can be used as
+/// inter-process or thread communication channel.
+///
+/// This channel may be created before forking the process and then one end used
+/// in each process, e.g. the parent process has the sending end to send command
+/// to the child process.
+///
+/// [`pipe(2)`]: https://pubs.opengroup.org/onlinepubs/9699919799/functions/pipe.html
+///
+/// # Events
+///
+/// The [`Sender`] can be registered with [`WRITABLE`] interest to receive
+/// [writable events], the [`Receiver`] with [`READABLE`] interest. Once data is
+/// written to the `Sender` the `Receiver` will receive an [readable event].
+///
+/// In addition to those events, events will also be generated if the other side
+/// is dropped. To check if the `Sender` is dropped you'll need to check
+/// [`is_read_closed`] on events for the `Receiver`, if it returns true the
+/// `Sender` is dropped. On the `Sender` end check [`is_write_closed`], if it
+/// returns true the `Receiver` was dropped. Also see the second example below.
+///
+/// [`WRITABLE`]: Interest::WRITABLE
+/// [writable events]: event::Event::is_writable
+/// [`READABLE`]: Interest::READABLE
+/// [readable event]: event::Event::is_readable
+/// [`is_read_closed`]: event::Event::is_read_closed
+/// [`is_write_closed`]: event::Event::is_write_closed
+///
+/// # Deregistering
+///
+/// Both `Sender` and `Receiver` will deregister themselves when dropped,
+/// **iff** the file descriptors are not duplicated (via [`dup(2)`]).
+///
+/// [`dup(2)`]: https://pubs.opengroup.org/onlinepubs/9699919799/functions/dup.html
+///
+/// # Examples
+///
+/// Simple example that writes data into the sending end and read it from the
+/// receiving end.
+///
+/// ```
+/// use std::io::{self, Read, Write};
+///
+/// use mio::{Poll, Events, Interest, Token};
+/// use mio::unix::pipe;
+///
+/// // Unique tokens for the two ends of the channel.
+/// const PIPE_RECV: Token = Token(0);
+/// const PIPE_SEND: Token = Token(1);
+///
+/// # fn main() -> io::Result<()> {
+/// // Create our `Poll` instance and the `Events` container.
+/// let mut poll = Poll::new()?;
+/// let mut events = Events::with_capacity(8);
+///
+/// // Create a new pipe.
+/// let (mut sender, mut receiver) = pipe::new()?;
+///
+/// // Register both ends of the channel.
+/// poll.registry().register(&mut receiver, PIPE_RECV, Interest::READABLE)?;
+/// poll.registry().register(&mut sender, PIPE_SEND, Interest::WRITABLE)?;
+///
+/// const MSG: &[u8; 11] = b"Hello world";
+///
+/// loop {
+///     poll.poll(&mut events, None)?;
+///
+///     for event in events.iter() {
+///         match event.token() {
+///             PIPE_SEND => sender.write(MSG)
+///                 .and_then(|n| if n != MSG.len() {
+///                         // We'll consider a short write an error in this
+///                         // example. NOTE: we can't use `write_all` with
+///                         // non-blocking I/O.
+///                         Err(io::ErrorKind::WriteZero.into())
+///                     } else {
+///                         Ok(())
+///                     })?,
+///             PIPE_RECV => {
+///                 let mut buf = [0; 11];
+///                 let n = receiver.read(&mut buf)?;
+///                 println!("received: {:?}", &buf[0..n]);
+///                 assert_eq!(n, MSG.len());
+///                 assert_eq!(&buf, &*MSG);
+///                 return Ok(());
+///             },
+///             _ => unreachable!(),
+///         }
+///     }
+/// }
+/// # }
+/// ```
+///
+/// Example that receives an event once the `Sender` is dropped.
+///
+/// ```
+/// # use std::io;
+/// #
+/// # use mio::{Poll, Events, Interest, Token};
+/// # use mio::unix::pipe;
+/// #
+/// # const PIPE_RECV: Token = Token(0);
+/// # const PIPE_SEND: Token = Token(1);
+/// #
+/// # fn main() -> io::Result<()> {
+/// // Same setup as in the example above.
+/// let mut poll = Poll::new()?;
+/// let mut events = Events::with_capacity(8);
+///
+/// let (mut sender, mut receiver) = pipe::new()?;
+///
+/// poll.registry().register(&mut receiver, PIPE_RECV, Interest::READABLE)?;
+/// poll.registry().register(&mut sender, PIPE_SEND, Interest::WRITABLE)?;
+///
+/// // Drop the sender.
+/// drop(sender);
+///
+/// poll.poll(&mut events, None)?;
+///
+/// for event in events.iter() {
+///     match event.token() {
+///         PIPE_RECV if event.is_read_closed() => {
+///             // Detected that the sender was dropped.
+///             println!("Sender dropped!");
+///             return Ok(());
+///         },
+///         _ => unreachable!(),
+///     }
+/// }
+/// # unreachable!();
+/// # }
+/// ```
+pub fn new() -> io::Result<(Sender, Receiver)> {
+    let mut fds: [RawFd; 2] = [-1, -1];
+
+    #[cfg(any(
+        target_os = "android",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_os = "openbsd",
+        target_os = "illumos",
+    ))]
+    unsafe {
+        if libc::pipe2(fds.as_mut_ptr(), libc::O_CLOEXEC | libc::O_NONBLOCK) != 0 {
+            return Err(io::Error::last_os_error());
+        }
+    }
+
+    #[cfg(any(target_os = "ios", target_os = "macos", target_os = "solaris"))]
+    unsafe {
+        // For platforms that don't have `pipe2(2)` we need to manually set the
+        // correct flags on the file descriptor.
+        if libc::pipe(fds.as_mut_ptr()) != 0 {
+            return Err(io::Error::last_os_error());
+        }
+
+        for fd in &fds {
+            if libc::fcntl(*fd, libc::F_SETFL, libc::O_NONBLOCK) != 0
+                || libc::fcntl(*fd, libc::F_SETFD, libc::FD_CLOEXEC) != 0
+            {
+                let err = io::Error::last_os_error();
+                // Don't leak file descriptors. Can't handle error though.
+                let _ = libc::close(fds[0]);
+                let _ = libc::close(fds[1]);
+                return Err(err);
+            }
+        }
+    }
+
+    #[cfg(not(any(
+        target_os = "android",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_os = "openbsd",
+        target_os = "ios",
+        target_os = "macos",
+        target_os = "solaris",
+        target_os = "illumos",
+    )))]
+    compile_error!("unsupported target for `mio::unix::pipe`");
+
+    // Safety: we just initialised the `fds` above.
+    let r = unsafe { Receiver::from_raw_fd(fds[0]) };
+    let w = unsafe { Sender::from_raw_fd(fds[1]) };
+    Ok((w, r))
+}
+
+/// Sending end of an Unix pipe.
+///
+/// See [`new`] for documentation, including examples.
+#[derive(Debug)]
+pub struct Sender {
+    inner: IoSource<File>,
+}
+
+impl Sender {
+    /// Set the `Sender` into or out of non-blocking mode.
+    pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
+        set_nonblocking(self.inner.as_raw_fd(), nonblocking)
+    }
+}
+
+impl event::Source for Sender {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        self.inner.deregister(registry)
+    }
+}
+
+impl Write for Sender {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.inner.do_io(|sender| (&*sender).write(buf))
+    }
+
+    fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|sender| (&*sender).write_vectored(bufs))
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.do_io(|sender| (&*sender).flush())
+    }
+}
+
+impl Write for &Sender {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.inner.do_io(|sender| (&*sender).write(buf))
+    }
+
+    fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|sender| (&*sender).write_vectored(bufs))
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.do_io(|sender| (&*sender).flush())
+    }
+}
+
+/// # Notes
+///
+/// The underlying pipe is **not** set to non-blocking.
+impl From<ChildStdin> for Sender {
+    fn from(stdin: ChildStdin) -> Sender {
+        // Safety: `ChildStdin` is guaranteed to be a valid file descriptor.
+        unsafe { Sender::from_raw_fd(stdin.into_raw_fd()) }
+    }
+}
+
+impl FromRawFd for Sender {
+    unsafe fn from_raw_fd(fd: RawFd) -> Sender {
+        Sender {
+            inner: IoSource::new(File::from_raw_fd(fd)),
+        }
+    }
+}
+
+impl AsRawFd for Sender {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+impl IntoRawFd for Sender {
+    fn into_raw_fd(self) -> RawFd {
+        self.inner.into_inner().into_raw_fd()
+    }
+}
+
+/// Receiving end of an Unix pipe.
+///
+/// See [`new`] for documentation, including examples.
+#[derive(Debug)]
+pub struct Receiver {
+    inner: IoSource<File>,
+}
+
+impl Receiver {
+    /// Set the `Receiver` into or out of non-blocking mode.
+    pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
+        set_nonblocking(self.inner.as_raw_fd(), nonblocking)
+    }
+}
+
+impl event::Source for Receiver {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.register(registry, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        self.inner.reregister(registry, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        self.inner.deregister(registry)
+    }
+}
+
+impl Read for Receiver {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.do_io(|sender| (&*sender).read(buf))
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|sender| (&*sender).read_vectored(bufs))
+    }
+}
+
+impl Read for &Receiver {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.inner.do_io(|sender| (&*sender).read(buf))
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        self.inner.do_io(|sender| (&*sender).read_vectored(bufs))
+    }
+}
+
+/// # Notes
+///
+/// The underlying pipe is **not** set to non-blocking.
+impl From<ChildStdout> for Receiver {
+    fn from(stdout: ChildStdout) -> Receiver {
+        // Safety: `ChildStdout` is guaranteed to be a valid file descriptor.
+        unsafe { Receiver::from_raw_fd(stdout.into_raw_fd()) }
+    }
+}
+
+/// # Notes
+///
+/// The underlying pipe is **not** set to non-blocking.
+impl From<ChildStderr> for Receiver {
+    fn from(stderr: ChildStderr) -> Receiver {
+        // Safety: `ChildStderr` is guaranteed to be a valid file descriptor.
+        unsafe { Receiver::from_raw_fd(stderr.into_raw_fd()) }
+    }
+}
+
+impl FromRawFd for Receiver {
+    unsafe fn from_raw_fd(fd: RawFd) -> Receiver {
+        Receiver {
+            inner: IoSource::new(File::from_raw_fd(fd)),
+        }
+    }
+}
+
+impl AsRawFd for Receiver {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+impl IntoRawFd for Receiver {
+    fn into_raw_fd(self) -> RawFd {
+        self.inner.into_inner().into_raw_fd()
+    }
+}
+
+#[cfg(not(target_os = "illumos"))]
+fn set_nonblocking(fd: RawFd, nonblocking: bool) -> io::Result<()> {
+    let value = nonblocking as libc::c_int;
+    if unsafe { libc::ioctl(fd, libc::FIONBIO, &value) } == -1 {
+        Err(io::Error::last_os_error())
+    } else {
+        Ok(())
+    }
+}
+
+#[cfg(target_os = "illumos")]
+fn set_nonblocking(fd: RawFd, nonblocking: bool) -> io::Result<()> {
+    let flags = unsafe { libc::fcntl(fd, libc::F_GETFL) };
+    if flags < 0 {
+        return Err(io::Error::last_os_error());
+    }
+
+    let nflags = if nonblocking {
+        flags | libc::O_NONBLOCK
+    } else {
+        flags & !libc::O_NONBLOCK
+    };
+
+    if flags != nflags {
+        if unsafe { libc::fcntl(fd, libc::F_SETFL, nflags) } < 0 {
+            return Err(io::Error::last_os_error());
+        }
+    }
+
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/ready.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/ready.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/ready.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/ready.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,526 +0,0 @@
-use event_imp::{Ready, ready_as_usize, ready_from_usize};
-
-use std::ops;
-use std::fmt;
-
-/// Unix specific extensions to `Ready`
-///
-/// Provides additional readiness event kinds that are available on unix
-/// platforms. Unix platforms are able to provide readiness events for
-/// additional socket events, such as HUP and error.
-///
-/// HUP events occur when the remote end of a socket hangs up. In the TCP case,
-/// this occurs when the remote end of a TCP socket shuts down writes.
-///
-/// Error events occur when the socket enters an error state. In this case, the
-/// socket will also receive a readable or writable event. Reading or writing to
-/// the socket will result in an error.
-///
-/// Conversion traits are implemented between `Ready` and `UnixReady`. See the
-/// examples.
-///
-/// For high level documentation on polling and readiness, see [`Poll`].
-///
-/// # Examples
-///
-/// Most of the time, all that is needed is using bit operations
-///
-/// ```
-/// use mio::Ready;
-/// use mio::unix::UnixReady;
-///
-/// let ready = Ready::readable() | UnixReady::hup();
-///
-/// assert!(ready.is_readable());
-/// assert!(UnixReady::from(ready).is_hup());
-/// ```
-///
-/// Basic conversion between ready types.
-///
-/// ```
-/// use mio::Ready;
-/// use mio::unix::UnixReady;
-///
-/// // Start with a portable ready
-/// let ready = Ready::readable();
-///
-/// // Convert to a unix ready, adding HUP
-/// let mut unix_ready = UnixReady::from(ready) | UnixReady::hup();
-///
-/// unix_ready.insert(UnixReady::error());
-///
-/// // `unix_ready` maintains readable interest
-/// assert!(unix_ready.is_readable());
-/// assert!(unix_ready.is_hup());
-/// assert!(unix_ready.is_error());
-///
-/// // Convert back to `Ready`
-/// let ready = Ready::from(unix_ready);
-///
-/// // Readable is maintained
-/// assert!(ready.is_readable());
-/// ```
-///
-/// Registering readable and error interest on a socket
-///
-/// ```
-/// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Ready, Poll, PollOpt, Token};
-/// use mio::net::TcpStream;
-/// use mio::unix::UnixReady;
-///
-/// let addr = "216.58.193.68:80".parse()?;
-/// let socket = TcpStream::connect(&addr)?;
-///
-/// let poll = Poll::new()?;
-///
-/// poll.register(&socket,
-///               Token(0),
-///               Ready::readable() | UnixReady::error(),
-///               PollOpt::edge())?;
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-///
-/// [`Poll`]: ../struct.Poll.html
-/// [readiness]: struct.Poll.html#readiness-operations
-#[derive(Copy, PartialEq, Eq, Clone, PartialOrd, Ord)]
-pub struct UnixReady(Ready);
-
-const ERROR: usize = 0b00_0100;
-const HUP: usize   = 0b00_1000;
-
-#[cfg(any(target_os = "dragonfly",
-    target_os = "freebsd", target_os = "ios", target_os = "macos"))]
-const AIO: usize   = 0b01_0000;
-
-#[cfg(not(any(target_os = "dragonfly",
-    target_os = "freebsd", target_os = "ios", target_os = "macos")))]
-const AIO: usize   = 0b00_0000;
-
-#[cfg(any(target_os = "freebsd"))]
-const LIO: usize   = 0b10_0000;
-
-#[cfg(not(any(target_os = "freebsd")))]
-const LIO: usize   = 0b00_0000;
-
-#[cfg(any(
-    target_os = "android",
-    target_os = "illumos",
-    target_os = "linux",
-    target_os = "solaris"
-))]
-const PRI: usize = 0b100_0000;
-
-#[cfg(not(any(
-    target_os = "android",
-    target_os = "illumos",
-    target_os = "linux",
-    target_os = "solaris"
-)))]
-const PRI: usize = 0;
-
-// Export to support `Ready::all`
-pub const READY_ALL: usize = ERROR | HUP | AIO | LIO | PRI;
-
-#[test]
-fn test_ready_all() {
-    let readable = Ready::readable().as_usize();
-    let writable = Ready::writable().as_usize();
-
-    assert_eq!(
-        READY_ALL | readable | writable,
-        ERROR + HUP + AIO + LIO + PRI + readable + writable
-    );
-
-    // Issue #896.
-    #[cfg(any(
-        target_os = "android",
-        target_os = "illumos",
-        target_os = "linux",
-        target_os = "solaris"
-    ))]
-    assert!(!Ready::from(UnixReady::priority()).is_writable());
-}
-
-impl UnixReady {
-    /// Returns a `Ready` representing AIO completion readiness
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::aio();
-    ///
-    /// assert!(ready.is_aio());
-    /// ```
-    ///
-    /// [`Poll`]: ../struct.Poll.html
-    #[inline]
-    #[cfg(any(target_os = "dragonfly",
-        target_os = "freebsd", target_os = "ios", target_os = "macos"))]
-    pub fn aio() -> UnixReady {
-        UnixReady(ready_from_usize(AIO))
-    }
-
-    #[cfg(not(any(target_os = "dragonfly",
-        target_os = "freebsd", target_os = "ios", target_os = "macos")))]
-    #[deprecated(since = "0.6.12", note = "this function is now platform specific")]
-    #[doc(hidden)]
-    pub fn aio() -> UnixReady {
-        UnixReady(Ready::empty())
-    }
-
-    /// Returns a `Ready` representing error readiness.
-    ///
-    /// **Note that only readable and writable readiness is guaranteed to be
-    /// supported on all platforms**. This means that `error` readiness
-    /// should be treated as a hint. For more details, see [readiness] in the
-    /// poll documentation.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::error();
-    ///
-    /// assert!(ready.is_error());
-    /// ```
-    ///
-    /// [`Poll`]: ../struct.Poll.html
-    /// [readiness]: ../struct.Poll.html#readiness-operations
-    #[inline]
-    pub fn error() -> UnixReady {
-        UnixReady(ready_from_usize(ERROR))
-    }
-
-    /// Returns a `Ready` representing HUP readiness.
-    ///
-    /// A HUP (or hang-up) signifies that a stream socket **peer** closed the
-    /// connection, or shut down the writing half of the connection.
-    ///
-    /// **Note that only readable and writable readiness is guaranteed to be
-    /// supported on all platforms**. This means that `hup` readiness
-    /// should be treated as a hint. For more details, see [readiness] in the
-    /// poll documentation. It is also unclear if HUP readiness will remain in 0.7. See
-    /// [here][issue-941].
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::hup();
-    ///
-    /// assert!(ready.is_hup());
-    /// ```
-    ///
-    /// [`Poll`]: ../struct.Poll.html
-    /// [readiness]: ../struct.Poll.html#readiness-operations
-    /// [issue-941]: https://github.com/tokio-rs/mio/issues/941
-    #[inline]
-    pub fn hup() -> UnixReady {
-        UnixReady(ready_from_usize(HUP))
-    }
-
-    /// Returns a `Ready` representing LIO completion readiness
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::lio();
-    ///
-    /// assert!(ready.is_lio());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    #[cfg(any(target_os = "freebsd"))]
-    pub fn lio() -> UnixReady {
-        UnixReady(ready_from_usize(LIO))
-    }
-
-    /// Returns a `Ready` representing priority (`EPOLLPRI`) readiness
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::priority();
-    ///
-    /// assert!(ready.is_priority());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    #[cfg(any(
-        target_os = "android",
-        target_os = "illumos",
-        target_os = "linux",
-        target_os = "solaris"
-    ))]
-    pub fn priority() -> UnixReady {
-        UnixReady(ready_from_usize(PRI))
-    }
-
-    /// Returns true if `Ready` contains AIO readiness
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::aio();
-    ///
-    /// assert!(ready.is_aio());
-    /// ```
-    ///
-    /// [`Poll`]: ../struct.Poll.html
-    #[inline]
-    #[cfg(any(target_os = "dragonfly",
-        target_os = "freebsd", target_os = "ios", target_os = "macos"))]
-    pub fn is_aio(&self) -> bool {
-        self.contains(ready_from_usize(AIO))
-    }
-
-    #[deprecated(since = "0.6.12", note = "this function is now platform specific")]
-    #[cfg(feature = "with-deprecated")]
-    #[cfg(not(any(target_os = "dragonfly",
-        target_os = "freebsd", target_os = "ios", target_os = "macos")))]
-    #[doc(hidden)]
-    pub fn is_aio(&self) -> bool {
-        false
-    }
-
-    /// Returns true if the value includes error readiness
-    ///
-    /// **Note that only readable and writable readiness is guaranteed to be
-    /// supported on all platforms**. This means that `error` readiness should
-    /// be treated as a hint. For more details, see [readiness] in the poll
-    /// documentation.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::error();
-    ///
-    /// assert!(ready.is_error());
-    /// ```
-    ///
-    /// [`Poll`]: ../struct.Poll.html
-    /// [readiness]: ../struct.Poll.html#readiness-operations
-    #[inline]
-    pub fn is_error(&self) -> bool {
-        self.contains(ready_from_usize(ERROR))
-    }
-
-    /// Returns true if the value includes HUP readiness
-    ///
-    /// A HUP (or hang-up) signifies that a stream socket **peer** closed the
-    /// connection, or shut down the writing half of the connection.
-    ///
-    /// **Note that only readable and writable readiness is guaranteed to be
-    /// supported on all platforms**. This means that `hup` readiness
-    /// should be treated as a hint. For more details, see [readiness] in the
-    /// poll documentation.
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::hup();
-    ///
-    /// assert!(ready.is_hup());
-    /// ```
-    ///
-    /// [`Poll`]: ../struct.Poll.html
-    /// [readiness]: ../struct.Poll.html#readiness-operations
-    #[inline]
-    pub fn is_hup(&self) -> bool {
-        self.contains(ready_from_usize(HUP))
-    }
-
-    /// Returns true if `Ready` contains LIO readiness
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::lio();
-    ///
-    /// assert!(ready.is_lio());
-    /// ```
-    #[inline]
-    #[cfg(any(target_os = "freebsd"))]
-    pub fn is_lio(&self) -> bool {
-        self.contains(ready_from_usize(LIO))
-    }
-
-    /// Returns true if `Ready` contains priority (`EPOLLPRI`) readiness
-    ///
-    /// See [`Poll`] for more documentation on polling.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use mio::unix::UnixReady;
-    ///
-    /// let ready = UnixReady::priority();
-    ///
-    /// assert!(ready.is_priority());
-    /// ```
-    ///
-    /// [`Poll`]: struct.Poll.html
-    #[inline]
-    #[cfg(any(
-        target_os = "android",
-        target_os = "illumos",
-        target_os = "linux",
-        target_os = "solaris"
-    ))]
-    pub fn is_priority(&self) -> bool {
-        self.contains(ready_from_usize(PRI))
-    }
-}
-
-impl From<Ready> for UnixReady {
-    fn from(src: Ready) -> UnixReady {
-        UnixReady(src)
-    }
-}
-
-impl From<UnixReady> for Ready {
-    fn from(src: UnixReady) -> Ready {
-        src.0
-    }
-}
-
-impl ops::Deref for UnixReady {
-    type Target = Ready;
-
-    fn deref(&self) -> &Ready {
-        &self.0
-    }
-}
-
-impl ops::DerefMut for UnixReady {
-    fn deref_mut(&mut self) -> &mut Ready {
-        &mut self.0
-    }
-}
-
-impl ops::BitOr for UnixReady {
-    type Output = UnixReady;
-
-    #[inline]
-    fn bitor(self, other: UnixReady) -> UnixReady {
-        (self.0 | other.0).into()
-    }
-}
-
-impl ops::BitXor for UnixReady {
-    type Output = UnixReady;
-
-    #[inline]
-    fn bitxor(self, other: UnixReady) -> UnixReady {
-        (self.0 ^ other.0).into()
-    }
-}
-
-impl ops::BitAnd for UnixReady {
-    type Output = UnixReady;
-
-    #[inline]
-    fn bitand(self, other: UnixReady) -> UnixReady {
-        (self.0 & other.0).into()
-    }
-}
-
-impl ops::Sub for UnixReady {
-    type Output = UnixReady;
-
-    #[inline]
-    fn sub(self, other: UnixReady) -> UnixReady {
-        ready_from_usize(ready_as_usize(self.0) & !ready_as_usize(other.0)).into()
-    }
-}
-
-#[deprecated(since = "0.6.10", note = "removed")]
-#[cfg(feature = "with-deprecated")]
-#[doc(hidden)]
-impl ops::Not for UnixReady {
-    type Output = UnixReady;
-
-    #[inline]
-    fn not(self) -> UnixReady {
-        (!self.0).into()
-    }
-}
-
-impl fmt::Debug for UnixReady {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut one = false;
-        let flags = [
-            (UnixReady(Ready::readable()), "Readable"),
-            (UnixReady(Ready::writable()), "Writable"),
-            (UnixReady::error(), "Error"),
-            (UnixReady::hup(), "Hup"),
-            #[allow(deprecated)]
-            (UnixReady::aio(), "Aio"),
-            #[cfg(any(
-                target_os = "android",
-                target_os = "illumos",
-                target_os = "linux",
-                target_os = "solaris"
-            ))]
-            (UnixReady::priority(), "Priority"),
-        ];
-
-        for &(flag, msg) in &flags {
-            if self.contains(flag) {
-                if one { write!(fmt, " | ")? }
-                write!(fmt, "{}", msg)?;
-
-                one = true
-            }
-        }
-
-        if !one {
-            fmt.write_str("(empty)")?;
-        }
-
-        Ok(())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/selector/epoll.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/selector/epoll.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/selector/epoll.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/selector/epoll.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,246 @@
+use crate::{Interest, Token};
+
+use libc::{EPOLLET, EPOLLIN, EPOLLOUT, EPOLLRDHUP};
+use log::error;
+use std::os::unix::io::{AsRawFd, RawFd};
+#[cfg(debug_assertions)]
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::time::Duration;
+use std::{cmp, i32, io, ptr};
+
+/// Unique id for use as `SelectorId`.
+#[cfg(debug_assertions)]
+static NEXT_ID: AtomicUsize = AtomicUsize::new(1);
+
+#[derive(Debug)]
+pub struct Selector {
+    #[cfg(debug_assertions)]
+    id: usize,
+    ep: RawFd,
+    #[cfg(debug_assertions)]
+    has_waker: AtomicBool,
+}
+
+impl Selector {
+    pub fn new() -> io::Result<Selector> {
+        // According to libuv, `EPOLL_CLOEXEC` is not defined on Android API <
+        // 21. But `EPOLL_CLOEXEC` is an alias for `O_CLOEXEC` on that platform,
+        // so we use it instead.
+        #[cfg(target_os = "android")]
+        let flag = libc::O_CLOEXEC;
+        #[cfg(not(target_os = "android"))]
+        let flag = libc::EPOLL_CLOEXEC;
+
+        syscall!(epoll_create1(flag)).map(|ep| Selector {
+            #[cfg(debug_assertions)]
+            id: NEXT_ID.fetch_add(1, Ordering::Relaxed),
+            ep,
+            #[cfg(debug_assertions)]
+            has_waker: AtomicBool::new(false),
+        })
+    }
+
+    pub fn try_clone(&self) -> io::Result<Selector> {
+        syscall!(fcntl(self.ep, libc::F_DUPFD_CLOEXEC, super::LOWEST_FD)).map(|ep| Selector {
+            // It's the same selector, so we use the same id.
+            #[cfg(debug_assertions)]
+            id: self.id,
+            ep,
+            #[cfg(debug_assertions)]
+            has_waker: AtomicBool::new(self.has_waker.load(Ordering::Acquire)),
+        })
+    }
+
+    pub fn select(&self, events: &mut Events, timeout: Option<Duration>) -> io::Result<()> {
+        // A bug in kernels < 2.6.37 makes timeouts larger than LONG_MAX / CONFIG_HZ
+        // (approx. 30 minutes with CONFIG_HZ=1200) effectively infinite on 32 bits
+        // architectures. The magic number is the same constant used by libuv.
+        #[cfg(target_pointer_width = "32")]
+        const MAX_SAFE_TIMEOUT: u128 = 1789569;
+        #[cfg(not(target_pointer_width = "32"))]
+        const MAX_SAFE_TIMEOUT: u128 = libc::c_int::max_value() as u128;
+
+        let timeout = timeout
+            .map(|to| cmp::min(to.as_millis(), MAX_SAFE_TIMEOUT) as libc::c_int)
+            .unwrap_or(-1);
+
+        events.clear();
+        syscall!(epoll_wait(
+            self.ep,
+            events.as_mut_ptr(),
+            events.capacity() as i32,
+            timeout,
+        ))
+        .map(|n_events| {
+            // This is safe because `epoll_wait` ensures that `n_events` are
+            // assigned.
+            unsafe { events.set_len(n_events as usize) };
+        })
+    }
+
+    pub fn register(&self, fd: RawFd, token: Token, interests: Interest) -> io::Result<()> {
+        let mut event = libc::epoll_event {
+            events: interests_to_epoll(interests),
+            u64: usize::from(token) as u64,
+        };
+
+        syscall!(epoll_ctl(self.ep, libc::EPOLL_CTL_ADD, fd, &mut event)).map(|_| ())
+    }
+
+    pub fn reregister(&self, fd: RawFd, token: Token, interests: Interest) -> io::Result<()> {
+        let mut event = libc::epoll_event {
+            events: interests_to_epoll(interests),
+            u64: usize::from(token) as u64,
+        };
+
+        syscall!(epoll_ctl(self.ep, libc::EPOLL_CTL_MOD, fd, &mut event)).map(|_| ())
+    }
+
+    pub fn deregister(&self, fd: RawFd) -> io::Result<()> {
+        syscall!(epoll_ctl(self.ep, libc::EPOLL_CTL_DEL, fd, ptr::null_mut())).map(|_| ())
+    }
+
+    #[cfg(debug_assertions)]
+    pub fn register_waker(&self) -> bool {
+        self.has_waker.swap(true, Ordering::AcqRel)
+    }
+}
+
+cfg_io_source! {
+    impl Selector {
+        #[cfg(debug_assertions)]
+        pub fn id(&self) -> usize {
+            self.id
+        }
+    }
+}
+
+impl AsRawFd for Selector {
+    fn as_raw_fd(&self) -> RawFd {
+        self.ep
+    }
+}
+
+impl Drop for Selector {
+    fn drop(&mut self) {
+        if let Err(err) = syscall!(close(self.ep)) {
+            error!("error closing epoll: {}", err);
+        }
+    }
+}
+
+fn interests_to_epoll(interests: Interest) -> u32 {
+    let mut kind = EPOLLET;
+
+    if interests.is_readable() {
+        kind = kind | EPOLLIN | EPOLLRDHUP;
+    }
+
+    if interests.is_writable() {
+        kind |= EPOLLOUT;
+    }
+
+    kind as u32
+}
+
+pub type Event = libc::epoll_event;
+pub type Events = Vec<Event>;
+
+pub mod event {
+    use std::fmt;
+
+    use crate::sys::Event;
+    use crate::Token;
+
+    pub fn token(event: &Event) -> Token {
+        Token(event.u64 as usize)
+    }
+
+    pub fn is_readable(event: &Event) -> bool {
+        (event.events as libc::c_int & libc::EPOLLIN) != 0
+            || (event.events as libc::c_int & libc::EPOLLPRI) != 0
+    }
+
+    pub fn is_writable(event: &Event) -> bool {
+        (event.events as libc::c_int & libc::EPOLLOUT) != 0
+    }
+
+    pub fn is_error(event: &Event) -> bool {
+        (event.events as libc::c_int & libc::EPOLLERR) != 0
+    }
+
+    pub fn is_read_closed(event: &Event) -> bool {
+        // Both halves of the socket have closed
+        event.events as libc::c_int & libc::EPOLLHUP != 0
+            // Socket has received FIN or called shutdown(SHUT_RD)
+            || (event.events as libc::c_int & libc::EPOLLIN != 0
+                && event.events as libc::c_int & libc::EPOLLRDHUP != 0)
+    }
+
+    pub fn is_write_closed(event: &Event) -> bool {
+        // Both halves of the socket have closed
+        event.events as libc::c_int & libc::EPOLLHUP != 0
+            // Unix pipe write end has closed
+            || (event.events as libc::c_int & libc::EPOLLOUT != 0
+                && event.events as libc::c_int & libc::EPOLLERR != 0)
+            // The other side (read end) of a Unix pipe has closed.
+            || event.events as libc::c_int == libc::EPOLLERR
+    }
+
+    pub fn is_priority(event: &Event) -> bool {
+        (event.events as libc::c_int & libc::EPOLLPRI) != 0
+    }
+
+    pub fn is_aio(_: &Event) -> bool {
+        // Not supported in the kernel, only in libc.
+        false
+    }
+
+    pub fn is_lio(_: &Event) -> bool {
+        // Not supported.
+        false
+    }
+
+    pub fn debug_details(f: &mut fmt::Formatter<'_>, event: &Event) -> fmt::Result {
+        #[allow(clippy::trivially_copy_pass_by_ref)]
+        fn check_events(got: &u32, want: &libc::c_int) -> bool {
+            (*got as libc::c_int & want) != 0
+        }
+        debug_detail!(
+            EventsDetails(u32),
+            check_events,
+            libc::EPOLLIN,
+            libc::EPOLLPRI,
+            libc::EPOLLOUT,
+            libc::EPOLLRDNORM,
+            libc::EPOLLRDBAND,
+            libc::EPOLLWRNORM,
+            libc::EPOLLWRBAND,
+            libc::EPOLLMSG,
+            libc::EPOLLERR,
+            libc::EPOLLHUP,
+            libc::EPOLLET,
+            libc::EPOLLRDHUP,
+            libc::EPOLLONESHOT,
+            #[cfg(any(target_os = "linux", target_os = "solaris"))]
+            libc::EPOLLEXCLUSIVE,
+            #[cfg(any(target_os = "android", target_os = "linux"))]
+            libc::EPOLLWAKEUP,
+            libc::EPOLL_CLOEXEC,
+        );
+
+        // Can't reference fields in packed structures.
+        let e_u64 = event.u64;
+        f.debug_struct("epoll_event")
+            .field("events", &EventsDetails(event.events))
+            .field("u64", &e_u64)
+            .finish()
+    }
+}
+
+#[cfg(target_os = "android")]
+#[test]
+fn assert_close_on_exec_flag() {
+    // This assertion need to be true for Selector::new.
+    assert_eq!(libc::O_CLOEXEC, libc::EPOLL_CLOEXEC);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/selector/kqueue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/selector/kqueue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/selector/kqueue.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/selector/kqueue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,688 @@
+use crate::{Interest, Token};
+use log::error;
+use std::mem::MaybeUninit;
+use std::ops::{Deref, DerefMut};
+use std::os::unix::io::{AsRawFd, RawFd};
+#[cfg(debug_assertions)]
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::time::Duration;
+use std::{cmp, io, ptr, slice};
+
+/// Unique id for use as `SelectorId`.
+#[cfg(debug_assertions)]
+static NEXT_ID: AtomicUsize = AtomicUsize::new(1);
+
+// Type of the `nchanges` and `nevents` parameters in the `kevent` function.
+#[cfg(not(target_os = "netbsd"))]
+type Count = libc::c_int;
+#[cfg(target_os = "netbsd")]
+type Count = libc::size_t;
+
+// Type of the `filter` field in the `kevent` structure.
+#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+type Filter = libc::c_short;
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+type Filter = i16;
+#[cfg(target_os = "netbsd")]
+type Filter = u32;
+
+// Type of the `flags` field in the `kevent` structure.
+#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+type Flags = libc::c_ushort;
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+type Flags = u16;
+#[cfg(target_os = "netbsd")]
+type Flags = u32;
+
+// Type of the `data` field in the `kevent` structure.
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "ios",
+    target_os = "macos"
+))]
+type Data = libc::intptr_t;
+#[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
+type Data = i64;
+
+// Type of the `udata` field in the `kevent` structure.
+#[cfg(not(target_os = "netbsd"))]
+type UData = *mut libc::c_void;
+#[cfg(target_os = "netbsd")]
+type UData = libc::intptr_t;
+
+macro_rules! kevent {
+    ($id: expr, $filter: expr, $flags: expr, $data: expr) => {
+        libc::kevent {
+            ident: $id as libc::uintptr_t,
+            filter: $filter as Filter,
+            flags: $flags,
+            fflags: 0,
+            data: 0,
+            udata: $data as UData,
+        }
+    };
+}
+
+#[derive(Debug)]
+pub struct Selector {
+    #[cfg(debug_assertions)]
+    id: usize,
+    kq: RawFd,
+    #[cfg(debug_assertions)]
+    has_waker: AtomicBool,
+}
+
+impl Selector {
+    pub fn new() -> io::Result<Selector> {
+        syscall!(kqueue())
+            .and_then(|kq| syscall!(fcntl(kq, libc::F_SETFD, libc::FD_CLOEXEC)).map(|_| kq))
+            .map(|kq| Selector {
+                #[cfg(debug_assertions)]
+                id: NEXT_ID.fetch_add(1, Ordering::Relaxed),
+                kq,
+                #[cfg(debug_assertions)]
+                has_waker: AtomicBool::new(false),
+            })
+    }
+
+    pub fn try_clone(&self) -> io::Result<Selector> {
+        syscall!(fcntl(self.kq, libc::F_DUPFD_CLOEXEC, super::LOWEST_FD)).map(|kq| Selector {
+            // It's the same selector, so we use the same id.
+            #[cfg(debug_assertions)]
+            id: self.id,
+            kq,
+            #[cfg(debug_assertions)]
+            has_waker: AtomicBool::new(self.has_waker.load(Ordering::Acquire)),
+        })
+    }
+
+    pub fn select(&self, events: &mut Events, timeout: Option<Duration>) -> io::Result<()> {
+        let timeout = timeout.map(|to| libc::timespec {
+            tv_sec: cmp::min(to.as_secs(), libc::time_t::max_value() as u64) as libc::time_t,
+            // `Duration::subsec_nanos` is guaranteed to be less than one
+            // billion (the number of nanoseconds in a second), making the
+            // cast to i32 safe. The cast itself is needed for platforms
+            // where C's long is only 32 bits.
+            tv_nsec: libc::c_long::from(to.subsec_nanos() as i32),
+        });
+        let timeout = timeout
+            .as_ref()
+            .map(|s| s as *const _)
+            .unwrap_or(ptr::null_mut());
+
+        events.clear();
+        syscall!(kevent(
+            self.kq,
+            ptr::null(),
+            0,
+            events.as_mut_ptr(),
+            events.capacity() as Count,
+            timeout,
+        ))
+        .map(|n_events| {
+            // This is safe because `kevent` ensures that `n_events` are
+            // assigned.
+            unsafe { events.set_len(n_events as usize) };
+        })
+    }
+
+    pub fn register(&self, fd: RawFd, token: Token, interests: Interest) -> io::Result<()> {
+        let flags = libc::EV_CLEAR | libc::EV_RECEIPT | libc::EV_ADD;
+        // At most we need two changes, but maybe we only need 1.
+        let mut changes: [MaybeUninit<libc::kevent>; 2] =
+            [MaybeUninit::uninit(), MaybeUninit::uninit()];
+        let mut n_changes = 0;
+
+        if interests.is_writable() {
+            let kevent = kevent!(fd, libc::EVFILT_WRITE, flags, token.0);
+            changes[n_changes] = MaybeUninit::new(kevent);
+            n_changes += 1;
+        }
+
+        if interests.is_readable() {
+            let kevent = kevent!(fd, libc::EVFILT_READ, flags, token.0);
+            changes[n_changes] = MaybeUninit::new(kevent);
+            n_changes += 1;
+        }
+
+        // Older versions of macOS (OS X 10.11 and 10.10 have been witnessed)
+        // can return EPIPE when registering a pipe file descriptor where the
+        // other end has already disappeared. For example code that creates a
+        // pipe, closes a file descriptor, and then registers the other end will
+        // see an EPIPE returned from `register`.
+        //
+        // It also turns out that kevent will still report events on the file
+        // descriptor, telling us that it's readable/hup at least after we've
+        // done this registration. As a result we just ignore `EPIPE` here
+        // instead of propagating it.
+        //
+        // More info can be found at tokio-rs/mio#582.
+        let changes = unsafe {
+            // This is safe because we ensure that at least `n_changes` are in
+            // the array.
+            slice::from_raw_parts_mut(changes[0].as_mut_ptr(), n_changes)
+        };
+        kevent_register(self.kq, changes, &[libc::EPIPE as Data])
+    }
+
+    pub fn reregister(&self, fd: RawFd, token: Token, interests: Interest) -> io::Result<()> {
+        let flags = libc::EV_CLEAR | libc::EV_RECEIPT;
+        let write_flags = if interests.is_writable() {
+            flags | libc::EV_ADD
+        } else {
+            flags | libc::EV_DELETE
+        };
+        let read_flags = if interests.is_readable() {
+            flags | libc::EV_ADD
+        } else {
+            flags | libc::EV_DELETE
+        };
+
+        let mut changes: [libc::kevent; 2] = [
+            kevent!(fd, libc::EVFILT_WRITE, write_flags, token.0),
+            kevent!(fd, libc::EVFILT_READ, read_flags, token.0),
+        ];
+
+        // Since there is no way to check with which interests the fd was
+        // registered we modify both readable and write, adding it when required
+        // and removing it otherwise, ignoring the ENOENT error when it comes
+        // up. The ENOENT error informs us that a filter we're trying to remove
+        // wasn't there in first place, but we don't really care since our goal
+        // is accomplished.
+        //
+        // For the explanation of ignoring `EPIPE` see `register`.
+        kevent_register(
+            self.kq,
+            &mut changes,
+            &[libc::ENOENT as Data, libc::EPIPE as Data],
+        )
+    }
+
+    pub fn deregister(&self, fd: RawFd) -> io::Result<()> {
+        let flags = libc::EV_DELETE | libc::EV_RECEIPT;
+        let mut changes: [libc::kevent; 2] = [
+            kevent!(fd, libc::EVFILT_WRITE, flags, 0),
+            kevent!(fd, libc::EVFILT_READ, flags, 0),
+        ];
+
+        // Since there is no way to check with which interests the fd was
+        // registered we remove both filters (readable and writeable) and ignore
+        // the ENOENT error when it comes up. The ENOENT error informs us that
+        // the filter wasn't there in first place, but we don't really care
+        // about that since our goal is to remove it.
+        kevent_register(self.kq, &mut changes, &[libc::ENOENT as Data])
+    }
+
+    #[cfg(debug_assertions)]
+    pub fn register_waker(&self) -> bool {
+        self.has_waker.swap(true, Ordering::AcqRel)
+    }
+
+    // Used by `Waker`.
+    #[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+    pub fn setup_waker(&self, token: Token) -> io::Result<()> {
+        // First attempt to accept user space notifications.
+        let mut kevent = kevent!(
+            0,
+            libc::EVFILT_USER,
+            libc::EV_ADD | libc::EV_CLEAR | libc::EV_RECEIPT,
+            token.0
+        );
+
+        syscall!(kevent(self.kq, &kevent, 1, &mut kevent, 1, ptr::null())).and_then(|_| {
+            if (kevent.flags & libc::EV_ERROR) != 0 && kevent.data != 0 {
+                Err(io::Error::from_raw_os_error(kevent.data as i32))
+            } else {
+                Ok(())
+            }
+        })
+    }
+
+    // Used by `Waker`.
+    #[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+    pub fn wake(&self, token: Token) -> io::Result<()> {
+        let mut kevent = kevent!(
+            0,
+            libc::EVFILT_USER,
+            libc::EV_ADD | libc::EV_RECEIPT,
+            token.0
+        );
+        kevent.fflags = libc::NOTE_TRIGGER;
+
+        syscall!(kevent(self.kq, &kevent, 1, &mut kevent, 1, ptr::null())).and_then(|_| {
+            if (kevent.flags & libc::EV_ERROR) != 0 && kevent.data != 0 {
+                Err(io::Error::from_raw_os_error(kevent.data as i32))
+            } else {
+                Ok(())
+            }
+        })
+    }
+}
+
+/// Register `changes` with `kq`ueue.
+fn kevent_register(
+    kq: RawFd,
+    changes: &mut [libc::kevent],
+    ignored_errors: &[Data],
+) -> io::Result<()> {
+    syscall!(kevent(
+        kq,
+        changes.as_ptr(),
+        changes.len() as Count,
+        changes.as_mut_ptr(),
+        changes.len() as Count,
+        ptr::null(),
+    ))
+    .map(|_| ())
+    .or_else(|err| {
+        // According to the manual page of FreeBSD: "When kevent() call fails
+        // with EINTR error, all changes in the changelist have been applied",
+        // so we can safely ignore it.
+        if err.raw_os_error() == Some(libc::EINTR) {
+            Ok(())
+        } else {
+            Err(err)
+        }
+    })
+    .and_then(|()| check_errors(&changes, ignored_errors))
+}
+
+/// Check all events for possible errors, it returns the first error found.
+fn check_errors(events: &[libc::kevent], ignored_errors: &[Data]) -> io::Result<()> {
+    for event in events {
+        // We can't use references to packed structures (in checking the ignored
+        // errors), so we need copy the data out before use.
+        let data = event.data;
+        // Check for the error flag, the actual error will be in the `data`
+        // field.
+        if (event.flags & libc::EV_ERROR != 0) && data != 0 && !ignored_errors.contains(&data) {
+            return Err(io::Error::from_raw_os_error(data as i32));
+        }
+    }
+    Ok(())
+}
+
+cfg_io_source! {
+    #[cfg(debug_assertions)]
+    impl Selector {
+        pub fn id(&self) -> usize {
+            self.id
+        }
+    }
+}
+
+impl AsRawFd for Selector {
+    fn as_raw_fd(&self) -> RawFd {
+        self.kq
+    }
+}
+
+impl Drop for Selector {
+    fn drop(&mut self) {
+        if let Err(err) = syscall!(close(self.kq)) {
+            error!("error closing kqueue: {}", err);
+        }
+    }
+}
+
+pub type Event = libc::kevent;
+pub struct Events(Vec<libc::kevent>);
+
+impl Events {
+    pub fn with_capacity(capacity: usize) -> Events {
+        Events(Vec::with_capacity(capacity))
+    }
+}
+
+impl Deref for Events {
+    type Target = Vec<libc::kevent>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for Events {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+// `Events` cannot derive `Send` or `Sync` because of the
+// `udata: *mut ::c_void` field in `libc::kevent`. However, `Events`'s public
+// API treats the `udata` field as a `uintptr_t` which is `Send`. `Sync` is
+// safe because with a `events: &Events` value, the only access to the `udata`
+// field is through `fn token(event: &Event)` which cannot mutate the field.
+unsafe impl Send for Events {}
+unsafe impl Sync for Events {}
+
+pub mod event {
+    use std::fmt;
+
+    use crate::sys::Event;
+    use crate::Token;
+
+    use super::{Filter, Flags};
+
+    pub fn token(event: &Event) -> Token {
+        Token(event.udata as usize)
+    }
+
+    pub fn is_readable(event: &Event) -> bool {
+        event.filter == libc::EVFILT_READ || {
+            #[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+            // Used by the `Awakener`. On platforms that use `eventfd` or a unix
+            // pipe it will emit a readable event so we'll fake that here as
+            // well.
+            {
+                event.filter == libc::EVFILT_USER
+            }
+            #[cfg(not(any(target_os = "freebsd", target_os = "ios", target_os = "macos")))]
+            {
+                false
+            }
+        }
+    }
+
+    pub fn is_writable(event: &Event) -> bool {
+        event.filter == libc::EVFILT_WRITE
+    }
+
+    pub fn is_error(event: &Event) -> bool {
+        (event.flags & libc::EV_ERROR) != 0 ||
+            // When the read end of the socket is closed, EV_EOF is set on
+            // flags, and fflags contains the error if there is one.
+            (event.flags & libc::EV_EOF) != 0 && event.fflags != 0
+    }
+
+    pub fn is_read_closed(event: &Event) -> bool {
+        event.filter == libc::EVFILT_READ && event.flags & libc::EV_EOF != 0
+    }
+
+    pub fn is_write_closed(event: &Event) -> bool {
+        event.filter == libc::EVFILT_WRITE && event.flags & libc::EV_EOF != 0
+    }
+
+    pub fn is_priority(_: &Event) -> bool {
+        // kqueue doesn't have priority indicators.
+        false
+    }
+
+    #[allow(unused_variables)] // `event` is not used on some platforms.
+    pub fn is_aio(event: &Event) -> bool {
+        #[cfg(any(
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "ios",
+            target_os = "macos"
+        ))]
+        {
+            event.filter == libc::EVFILT_AIO
+        }
+        #[cfg(not(any(
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "ios",
+            target_os = "macos"
+        )))]
+        {
+            false
+        }
+    }
+
+    #[allow(unused_variables)] // `event` is only used on FreeBSD.
+    pub fn is_lio(event: &Event) -> bool {
+        #[cfg(target_os = "freebsd")]
+        {
+            event.filter == libc::EVFILT_LIO
+        }
+        #[cfg(not(target_os = "freebsd"))]
+        {
+            false
+        }
+    }
+
+    pub fn debug_details(f: &mut fmt::Formatter<'_>, event: &Event) -> fmt::Result {
+        debug_detail!(
+            FilterDetails(Filter),
+            PartialEq::eq,
+            libc::EVFILT_READ,
+            libc::EVFILT_WRITE,
+            libc::EVFILT_AIO,
+            libc::EVFILT_VNODE,
+            libc::EVFILT_PROC,
+            libc::EVFILT_SIGNAL,
+            libc::EVFILT_TIMER,
+            #[cfg(target_os = "freebsd")]
+            libc::EVFILT_PROCDESC,
+            #[cfg(any(
+                target_os = "freebsd",
+                target_os = "dragonfly",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::EVFILT_FS,
+            #[cfg(target_os = "freebsd")]
+            libc::EVFILT_LIO,
+            #[cfg(any(
+                target_os = "freebsd",
+                target_os = "dragonfly",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::EVFILT_USER,
+            #[cfg(target_os = "freebsd")]
+            libc::EVFILT_SENDFILE,
+            #[cfg(target_os = "freebsd")]
+            libc::EVFILT_EMPTY,
+            #[cfg(target_os = "dragonfly")]
+            libc::EVFILT_EXCEPT,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::EVFILT_MACHPORT,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::EVFILT_VM,
+        );
+
+        #[allow(clippy::trivially_copy_pass_by_ref)]
+        fn check_flag(got: &Flags, want: &Flags) -> bool {
+            (got & want) != 0
+        }
+        debug_detail!(
+            FlagsDetails(Flags),
+            check_flag,
+            libc::EV_ADD,
+            libc::EV_DELETE,
+            libc::EV_ENABLE,
+            libc::EV_DISABLE,
+            libc::EV_ONESHOT,
+            libc::EV_CLEAR,
+            libc::EV_RECEIPT,
+            libc::EV_DISPATCH,
+            #[cfg(target_os = "freebsd")]
+            libc::EV_DROP,
+            libc::EV_FLAG1,
+            libc::EV_ERROR,
+            libc::EV_EOF,
+            libc::EV_SYSFLAGS,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::EV_FLAG0,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::EV_POLL,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::EV_OOBAND,
+            #[cfg(target_os = "dragonfly")]
+            libc::EV_NODATA,
+        );
+
+        #[allow(clippy::trivially_copy_pass_by_ref)]
+        fn check_fflag(got: &u32, want: &u32) -> bool {
+            (got & want) != 0
+        }
+        debug_detail!(
+            FflagsDetails(u32),
+            check_fflag,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::NOTE_TRIGGER,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::NOTE_FFNOP,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::NOTE_FFAND,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::NOTE_FFOR,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::NOTE_FFCOPY,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::NOTE_FFCTRLMASK,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "ios",
+                target_os = "macos"
+            ))]
+            libc::NOTE_FFLAGSMASK,
+            libc::NOTE_LOWAT,
+            libc::NOTE_DELETE,
+            libc::NOTE_WRITE,
+            #[cfg(target_os = "dragonfly")]
+            libc::NOTE_OOB,
+            #[cfg(target_os = "openbsd")]
+            libc::NOTE_EOF,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_EXTEND,
+            libc::NOTE_ATTRIB,
+            libc::NOTE_LINK,
+            libc::NOTE_RENAME,
+            libc::NOTE_REVOKE,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_NONE,
+            #[cfg(any(target_os = "openbsd"))]
+            libc::NOTE_TRUNCATE,
+            libc::NOTE_EXIT,
+            libc::NOTE_FORK,
+            libc::NOTE_EXEC,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_SIGNAL,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_EXITSTATUS,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_EXIT_DETAIL,
+            libc::NOTE_PDATAMASK,
+            libc::NOTE_PCTRLMASK,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            ))]
+            libc::NOTE_TRACK,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            ))]
+            libc::NOTE_TRACKERR,
+            #[cfg(any(
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            ))]
+            libc::NOTE_CHILD,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_EXIT_DETAIL_MASK,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_EXIT_DECRYPTFAIL,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_EXIT_MEMORY,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_EXIT_CSERROR,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_VM_PRESSURE,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_VM_PRESSURE_TERMINATE,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_VM_PRESSURE_SUDDEN_TERMINATE,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_VM_ERROR,
+            #[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+            libc::NOTE_SECONDS,
+            #[cfg(any(target_os = "freebsd"))]
+            libc::NOTE_MSECONDS,
+            #[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+            libc::NOTE_USECONDS,
+            #[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+            libc::NOTE_NSECONDS,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            #[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+            libc::NOTE_ABSOLUTE,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_LEEWAY,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_CRITICAL,
+            #[cfg(any(target_os = "ios", target_os = "macos"))]
+            libc::NOTE_BACKGROUND,
+        );
+
+        // Can't reference fields in packed structures.
+        let ident = event.ident;
+        let data = event.data;
+        let udata = event.udata;
+        f.debug_struct("kevent")
+            .field("ident", &ident)
+            .field("filter", &FilterDetails(event.filter))
+            .field("flags", &FlagsDetails(event.flags))
+            .field("fflags", &FflagsDetails(event.fflags))
+            .field("data", &data)
+            .field("udata", &udata)
+            .finish()
+    }
+}
+
+#[test]
+#[cfg(feature = "os-ext")]
+fn does_not_register_rw() {
+    use crate::unix::SourceFd;
+    use crate::{Poll, Token};
+
+    let kq = unsafe { libc::kqueue() };
+    let mut kqf = SourceFd(&kq);
+    let poll = Poll::new().unwrap();
+
+    // Registering kqueue fd will fail if write is requested (On anything but
+    // some versions of macOS).
+    poll.registry()
+        .register(&mut kqf, Token(1234), Interest::READABLE)
+        .unwrap();
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/selector/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/selector/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/selector/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/selector/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+#[cfg(any(
+    target_os = "android",
+    target_os = "illumos",
+    target_os = "linux",
+    target_os = "solaris"
+))]
+mod epoll;
+
+#[cfg(any(
+    target_os = "android",
+    target_os = "illumos",
+    target_os = "linux",
+    target_os = "solaris"
+))]
+pub(crate) use self::epoll::{event, Event, Events, Selector};
+
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
+mod kqueue;
+
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
+pub(crate) use self::kqueue::{event, Event, Events, Selector};
+
+/// Lowest file descriptor used in `Selector::try_clone`.
+///
+/// # Notes
+///
+/// Usually fds 0, 1 and 2 are standard in, out and error. Some application
+/// blindly assume this to be true, which means using any one of those a select
+/// could result in some interesting and unexpected errors. Avoid that by using
+/// an fd that doesn't have a pre-determined usage.
+const LOWEST_FD: libc::c_int = 3;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/sourcefd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/sourcefd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/sourcefd.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/sourcefd.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,110 @@
+use crate::{event, poll, Interest, Registry, Token};
+
+use std::io;
+use std::os::unix::io::RawFd;
+
+/// Adapter for [`RawFd`] providing an [`event::Source`] implementation.
+///
+/// `SourceFd` enables registering any type with an FD with [`Poll`].
+///
+/// While only implementations for TCP and UDP are provided, Mio supports
+/// registering any FD that can be registered with the underlying OS selector.
+/// `SourceFd` provides the necessary bridge.
+///
+/// Note that `SourceFd` takes a `&RawFd`. This is because `SourceFd` **does
+/// not** take ownership of the FD. Specifically, it will not manage any
+/// lifecycle related operations, such as closing the FD on drop. It is expected
+/// that the `SourceFd` is constructed right before a call to
+/// [`Registry::register`]. See the examples for more detail.
+///
+/// [`event::Source`]: ../event/trait.Source.html
+/// [`Poll`]: ../struct.Poll.html
+/// [`Registry::register`]: ../struct.Registry.html#method.register
+///
+/// # Examples
+///
+/// Basic usage.
+///
+#[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+#[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
+/// # use std::error::Error;
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// use mio::{Interest, Poll, Token};
+/// use mio::unix::SourceFd;
+///
+/// use std::os::unix::io::AsRawFd;
+/// use std::net::TcpListener;
+///
+/// // Bind a std listener
+/// let listener = TcpListener::bind("127.0.0.1:0")?;
+///
+/// let poll = Poll::new()?;
+///
+/// // Register the listener
+/// poll.registry().register(
+///     &mut SourceFd(&listener.as_raw_fd()),
+///     Token(0),
+///     Interest::READABLE)?;
+/// #     Ok(())
+/// # }
+/// ```
+///
+/// Implementing [`event::Source`] for a custom type backed by a [`RawFd`].
+///
+#[cfg_attr(all(feature = "os-poll", features = "os-ext"), doc = "```")]
+#[cfg_attr(not(all(feature = "os-poll", features = "os-ext")), doc = "```ignore")]
+/// use mio::{event, Interest, Registry, Token};
+/// use mio::unix::SourceFd;
+///
+/// use std::os::unix::io::RawFd;
+/// use std::io;
+///
+/// # #[allow(dead_code)]
+/// pub struct MyIo {
+///     fd: RawFd,
+/// }
+///
+/// impl event::Source for MyIo {
+///     fn register(&mut self, registry: &Registry, token: Token, interests: Interest)
+///         -> io::Result<()>
+///     {
+///         SourceFd(&self.fd).register(registry, token, interests)
+///     }
+///
+///     fn reregister(&mut self, registry: &Registry, token: Token, interests: Interest)
+///         -> io::Result<()>
+///     {
+///         SourceFd(&self.fd).reregister(registry, token, interests)
+///     }
+///
+///     fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+///         SourceFd(&self.fd).deregister(registry)
+///     }
+/// }
+/// ```
+#[derive(Debug)]
+pub struct SourceFd<'a>(pub &'a RawFd);
+
+impl<'a> event::Source for SourceFd<'a> {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        poll::selector(registry).register(*self.0, token, interests)
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interests: Interest,
+    ) -> io::Result<()> {
+        poll::selector(registry).reregister(*self.0, token, interests)
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        poll::selector(registry).deregister(*self.0)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/tcp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/tcp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/tcp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/tcp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,286 +1,488 @@
-use std::fmt;
-use std::io::{Read, Write};
+use std::convert::TryInto;
+use std::io;
+use std::mem;
+use std::mem::{size_of, MaybeUninit};
 use std::net::{self, SocketAddr};
-use std::os::unix::io::{RawFd, FromRawFd, IntoRawFd, AsRawFd};
+use std::os::unix::io::{AsRawFd, FromRawFd};
 use std::time::Duration;
 
-use libc;
-use net2::TcpStreamExt;
-use iovec::IoVec;
+use crate::sys::unix::net::{new_socket, socket_addr, to_socket_addr};
+use crate::net::TcpKeepalive;
 
-use {io, Ready, Poll, PollOpt, Token};
-use event::Evented;
-
-use sys::unix::eventedfd::EventedFd;
-use sys::unix::io::set_nonblock;
-use sys::unix::uio::VecIo;
-
-pub struct TcpStream {
-    inner: net::TcpStream,
-}
-
-pub struct TcpListener {
-    inner: net::TcpListener,
-}
-
-impl TcpStream {
-    pub fn connect(stream: net::TcpStream, addr: &SocketAddr) -> io::Result<TcpStream> {
-        set_nonblock(stream.as_raw_fd())?;
-
-        match stream.connect(addr) {
-            Ok(..) => {}
-            Err(ref e) if e.raw_os_error() == Some(libc::EINPROGRESS) => {}
-            Err(e) => return Err(e),
+#[cfg(any(target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))]
+use libc::SO_KEEPALIVE as KEEPALIVE_TIME;
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+use libc::TCP_KEEPALIVE as KEEPALIVE_TIME;
+#[cfg(not(any(
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "openbsd",
+    target_os = "netbsd",
+    target_os = "haiku"
+)))]
+use libc::TCP_KEEPIDLE as KEEPALIVE_TIME;
+pub type TcpSocket = libc::c_int;
+
+pub(crate) fn new_v4_socket() -> io::Result<TcpSocket> {
+    new_socket(libc::AF_INET, libc::SOCK_STREAM)
+}
+
+pub(crate) fn new_v6_socket() -> io::Result<TcpSocket> {
+    new_socket(libc::AF_INET6, libc::SOCK_STREAM)
+}
+
+pub(crate) fn bind(socket: TcpSocket, addr: SocketAddr) -> io::Result<()> {
+    let (raw_addr, raw_addr_length) = socket_addr(&addr);
+    syscall!(bind(socket, raw_addr.as_ptr(), raw_addr_length))?;
+    Ok(())
+}
+
+pub(crate) fn connect(socket: TcpSocket, addr: SocketAddr) -> io::Result<net::TcpStream> {
+    let (raw_addr, raw_addr_length) = socket_addr(&addr);
+
+    match syscall!(connect(socket, raw_addr.as_ptr(), raw_addr_length)) {
+        Err(err) if err.raw_os_error() != Some(libc::EINPROGRESS) => {
+            Err(err)
         }
-
-        Ok(TcpStream {
-            inner: stream,
-        })
-    }
-
-    pub fn from_stream(stream: net::TcpStream) -> TcpStream {
-        TcpStream {
-            inner: stream,
+        _ => {
+            Ok(unsafe { net::TcpStream::from_raw_fd(socket) })
         }
     }
-
-    pub fn peer_addr(&self) -> io::Result<SocketAddr> {
-        self.inner.peer_addr()
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.inner.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<TcpStream> {
-        self.inner.try_clone().map(|s| {
-            TcpStream {
-                inner: s,
-            }
-        })
-    }
-
-    pub fn shutdown(&self, how: net::Shutdown) -> io::Result<()> {
-        self.inner.shutdown(how)
-    }
-
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        self.inner.set_nodelay(nodelay)
-    }
-
-    pub fn nodelay(&self) -> io::Result<bool> {
-        self.inner.nodelay()
-    }
-
-    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.inner.set_recv_buffer_size(size)
-    }
-
-    pub fn recv_buffer_size(&self) -> io::Result<usize> {
-        self.inner.recv_buffer_size()
-    }
-
-    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.inner.set_send_buffer_size(size)
-    }
-
-    pub fn send_buffer_size(&self) -> io::Result<usize> {
-        self.inner.send_buffer_size()
-    }
-
-    pub fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
-        self.inner.set_keepalive(keepalive)
-    }
-
-    pub fn keepalive(&self) -> io::Result<Option<Duration>> {
-        self.inner.keepalive()
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.inner.set_ttl(ttl)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.inner.ttl()
-    }
-
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.inner.set_only_v6(only_v6)
-    }
-
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.inner.only_v6()
-    }
-
-    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.inner.set_linger(dur)
-    }
-
-    pub fn linger(&self) -> io::Result<Option<Duration>> {
-        self.inner.linger()
-    }
-
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.inner.take_error()
-    }
-
-    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.inner.peek(buf)
-    }
-
-    pub fn readv(&self, bufs: &mut [&mut IoVec]) -> io::Result<usize> {
-        self.inner.readv(bufs)
-    }
-
-    pub fn writev(&self, bufs: &[&IoVec]) -> io::Result<usize> {
-        self.inner.writev(bufs)
-    }
-}
-
-impl<'a> Read for &'a TcpStream {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        (&self.inner).read(buf)
-    }
 }
 
-impl<'a> Write for &'a TcpStream {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        (&self.inner).write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&self.inner).flush()
-    }
-}
-
-impl Evented for TcpStream {
-    fn register(&self, poll: &Poll, token: Token,
-                interest: Ready, opts: PollOpt) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token,
-                  interest: Ready, opts: PollOpt) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).deregister(poll)
-    }
-}
-
-impl fmt::Debug for TcpStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(&self.inner, f)
-    }
-}
-
-impl FromRawFd for TcpStream {
-    unsafe fn from_raw_fd(fd: RawFd) -> TcpStream {
-        TcpStream {
-            inner: net::TcpStream::from_raw_fd(fd),
+pub(crate) fn listen(socket: TcpSocket, backlog: u32) -> io::Result<net::TcpListener> {
+    let backlog = backlog.try_into().unwrap_or(i32::max_value());
+    syscall!(listen(socket, backlog))?;
+    Ok(unsafe { net::TcpListener::from_raw_fd(socket) })
+}
+
+pub(crate) fn close(socket: TcpSocket) {
+    let _ = unsafe { net::TcpStream::from_raw_fd(socket) };
+}
+
+pub(crate) fn set_reuseaddr(socket: TcpSocket, reuseaddr: bool) -> io::Result<()> {
+    let val: libc::c_int = if reuseaddr { 1 } else { 0 };
+    syscall!(setsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_REUSEADDR,
+        &val as *const libc::c_int as *const libc::c_void,
+        size_of::<libc::c_int>() as libc::socklen_t,
+    ))
+    .map(|_| ())
+}
+
+pub(crate) fn get_reuseaddr(socket: TcpSocket) -> io::Result<bool> {
+    let mut optval: libc::c_int = 0;
+    let mut optlen = mem::size_of::<libc::c_int>() as libc::socklen_t;
+
+    syscall!(getsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_REUSEADDR,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
+
+    Ok(optval != 0)
+}
+
+#[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
+pub(crate) fn set_reuseport(socket: TcpSocket, reuseport: bool) -> io::Result<()> {
+    let val: libc::c_int = if reuseport { 1 } else { 0 };
+
+    syscall!(setsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_REUSEPORT,
+        &val as *const libc::c_int as *const libc::c_void,
+        size_of::<libc::c_int>() as libc::socklen_t,
+    ))
+    .map(|_| ())
+}
+
+#[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
+pub(crate) fn get_reuseport(socket: TcpSocket) -> io::Result<bool> {
+    let mut optval: libc::c_int = 0;
+    let mut optlen = mem::size_of::<libc::c_int>() as libc::socklen_t;
+
+    syscall!(getsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_REUSEPORT,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
+
+    Ok(optval != 0)
+}
+
+pub(crate) fn get_localaddr(socket: TcpSocket) -> io::Result<SocketAddr> {
+    let mut addr: libc::sockaddr_storage = unsafe { std::mem::zeroed() };
+    let mut length = size_of::<libc::sockaddr_storage>() as libc::socklen_t;
+
+    syscall!(getsockname(
+        socket,
+        &mut addr as *mut _ as *mut _,
+        &mut length
+    ))?;
+
+    unsafe { to_socket_addr(&addr) }
+}
+
+pub(crate) fn set_linger(socket: TcpSocket, dur: Option<Duration>) -> io::Result<()> {
+    let val: libc::linger = libc::linger {
+        l_onoff: if dur.is_some() { 1 } else { 0 },
+        l_linger: dur
+            .map(|dur| dur.as_secs() as libc::c_int)
+            .unwrap_or_default(),
+    };
+    syscall!(setsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        #[cfg(target_vendor = "apple")]
+        libc::SO_LINGER_SEC,
+        #[cfg(not(target_vendor = "apple"))]
+        libc::SO_LINGER,
+        &val as *const libc::linger as *const libc::c_void,
+        size_of::<libc::linger>() as libc::socklen_t,
+    ))
+    .map(|_| ())
+}
+
+pub(crate) fn get_linger(socket: TcpSocket) -> io::Result<Option<Duration>> {
+    let mut val: libc::linger =  unsafe { std::mem::zeroed() };
+    let mut len = mem::size_of::<libc::linger>() as libc::socklen_t;
+
+    syscall!(getsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        #[cfg(target_vendor = "apple")]
+        libc::SO_LINGER_SEC,
+        #[cfg(not(target_vendor = "apple"))]
+        libc::SO_LINGER,
+        &mut val as *mut _ as *mut _,
+        &mut len,
+    ))?;
+
+    if val.l_onoff == 0 {
+        Ok(None)
+    } else {
+        Ok(Some(Duration::from_secs(val.l_linger as u64)))
+    }
+}
+
+pub(crate) fn set_recv_buffer_size(socket: TcpSocket, size: u32) -> io::Result<()> {
+    let size = size.try_into().ok().unwrap_or_else(i32::max_value);
+    syscall!(setsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_RCVBUF,
+        &size as *const _ as *const libc::c_void,
+        size_of::<libc::c_int>() as libc::socklen_t
+    ))
+    .map(|_| ())
+}
+
+pub(crate) fn get_recv_buffer_size(socket: TcpSocket) -> io::Result<u32> {
+    let mut optval: libc::c_int = 0;
+    let mut optlen = size_of::<libc::c_int>() as libc::socklen_t;
+    syscall!(getsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_RCVBUF,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
+
+    Ok(optval as u32)
+}
+
+pub(crate) fn set_send_buffer_size(socket: TcpSocket, size: u32) -> io::Result<()> {
+    let size = size.try_into().ok().unwrap_or_else(i32::max_value);
+    syscall!(setsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_SNDBUF,
+        &size as *const _ as *const libc::c_void,
+        size_of::<libc::c_int>() as libc::socklen_t
+    ))
+    .map(|_| ())
+}
+
+pub(crate) fn get_send_buffer_size(socket: TcpSocket) -> io::Result<u32> {
+    let mut optval: libc::c_int = 0;
+    let mut optlen = size_of::<libc::c_int>() as libc::socklen_t;
+
+    syscall!(getsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_SNDBUF,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
+
+    Ok(optval as u32)
+}
+
+pub(crate) fn set_keepalive(socket: TcpSocket, keepalive: bool) -> io::Result<()> {
+    let val: libc::c_int = if keepalive { 1 } else { 0 };
+    syscall!(setsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_KEEPALIVE,
+        &val as *const _ as *const libc::c_void,
+        size_of::<libc::c_int>() as libc::socklen_t
+    ))
+    .map(|_| ())
+}
+
+pub(crate) fn get_keepalive(socket: TcpSocket) -> io::Result<bool> {
+    let mut optval: libc::c_int = 0;
+    let mut optlen = mem::size_of::<libc::c_int>() as libc::socklen_t;
+
+    syscall!(getsockopt(
+        socket,
+        libc::SOL_SOCKET,
+        libc::SO_KEEPALIVE,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
+
+    Ok(optval != 0)
+}
+
+pub(crate) fn set_keepalive_params(socket: TcpSocket, keepalive: TcpKeepalive) -> io::Result<()> {
+    if let Some(dur) = keepalive.time {
+        set_keepalive_time(socket, dur)?;
+    }
+
+    #[cfg(any(
+        target_os = "linux",
+        target_os = "macos",
+        target_os = "ios",
+        target_os = "freebsd",
+        target_os = "netbsd",
+    ))]
+    {
+        if let Some(dur) = keepalive.interval {
+            set_keepalive_interval(socket, dur)?;
+        }
+    
+        if let Some(retries) = keepalive.retries {
+            set_keepalive_retries(socket, retries)?;
         }
     }
-}
 
-impl IntoRawFd for TcpStream {
-    fn into_raw_fd(self) -> RawFd {
-        self.inner.into_raw_fd()
-    }
-}
 
-impl AsRawFd for TcpStream {
-    fn as_raw_fd(&self) -> RawFd {
-        self.inner.as_raw_fd()
-    }
+    Ok(())
 }
 
-impl TcpListener {
-    pub fn new(inner: net::TcpListener) -> io::Result<TcpListener> {
-        set_nonblock(inner.as_raw_fd())?;
-        Ok(TcpListener {
-            inner,
-        })
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.inner.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<TcpListener> {
-        self.inner.try_clone().map(|s| {
-            TcpListener {
-                inner: s,
-            }
+fn set_keepalive_time(socket: TcpSocket, time: Duration) -> io::Result<()> {
+    let time_secs = time
+        .as_secs()
+        .try_into()
+        .ok()
+        .unwrap_or_else(i32::max_value);
+    syscall!(setsockopt(
+        socket,
+        libc::IPPROTO_TCP,
+        KEEPALIVE_TIME,
+        &(time_secs as libc::c_int) as *const _ as *const libc::c_void,
+        size_of::<libc::c_int>() as libc::socklen_t
+    ))
+    .map(|_| ())
+}
+
+pub(crate) fn get_keepalive_time(socket: TcpSocket) -> io::Result<Option<Duration>> {
+    if !get_keepalive(socket)? {
+        return Ok(None);
+    }
+
+    let mut optval: libc::c_int = 0;
+    let mut optlen = mem::size_of::<libc::c_int>() as libc::socklen_t;
+    syscall!(getsockopt(
+        socket,
+        libc::IPPROTO_TCP,
+        KEEPALIVE_TIME,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
+
+    Ok(Some(Duration::from_secs(optval as u64)))
+}
+
+/// Linux, FreeBSD, and NetBSD support setting the keepalive interval via
+/// `TCP_KEEPINTVL`.
+/// See:
+/// - https://man7.org/linux/man-pages/man7/tcp.7.html
+/// - https://www.freebsd.org/cgi/man.cgi?query=tcp#end
+/// - http://man.netbsd.org/tcp.4#DESCRIPTION
+///
+/// OpenBSD does not:
+/// https://man.openbsd.org/tcp
+#[cfg(any(
+    target_os = "linux",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "freebsd",
+    target_os = "netbsd",
+))]
+fn set_keepalive_interval(socket: TcpSocket, interval: Duration) -> io::Result<()> {
+    let interval_secs = interval
+        .as_secs()
+        .try_into()
+        .ok()
+        .unwrap_or_else(i32::max_value);
+    syscall!(setsockopt(
+        socket,
+        libc::IPPROTO_TCP,
+        libc::TCP_KEEPINTVL,
+        &(interval_secs as libc::c_int) as *const _ as *const libc::c_void,
+        size_of::<libc::c_int>() as libc::socklen_t
+    ))
+    .map(|_| ())
+}
+
+#[cfg(any(
+    target_os = "linux",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "freebsd",
+    target_os = "netbsd",
+))]
+pub(crate) fn get_keepalive_interval(socket: TcpSocket) -> io::Result<Option<Duration>> {
+    if !get_keepalive(socket)? {
+        return Ok(None);
+    }
+
+    let mut optval: libc::c_int = 0;
+    let mut optlen = mem::size_of::<libc::c_int>() as libc::socklen_t;
+    syscall!(getsockopt(
+        socket,
+        libc::IPPROTO_TCP,
+        libc::TCP_KEEPINTVL,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
+
+    Ok(Some(Duration::from_secs(optval as u64)))
+}
+
+/// Linux, macOS/iOS, FreeBSD, and NetBSD support setting the number of TCP
+/// keepalive retries via `TCP_KEEPCNT`.
+/// See:
+/// - https://man7.org/linux/man-pages/man7/tcp.7.html
+/// - https://www.freebsd.org/cgi/man.cgi?query=tcp#end
+/// - http://man.netbsd.org/tcp.4#DESCRIPTION
+///
+/// OpenBSD does not:
+/// https://man.openbsd.org/tcp
+#[cfg(any(
+    target_os = "linux",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "freebsd",
+    target_os = "netbsd",
+))]
+fn set_keepalive_retries(socket: TcpSocket, retries: u32) -> io::Result<()> {
+    let retries = retries.try_into().ok().unwrap_or_else(i32::max_value);
+    syscall!(setsockopt(
+        socket,
+        libc::IPPROTO_TCP,
+        libc::TCP_KEEPCNT,
+        &(retries as libc::c_int) as *const _ as *const libc::c_void,
+        size_of::<libc::c_int>() as libc::socklen_t
+    ))
+    .map(|_| ())
+}
+
+#[cfg(any(
+    target_os = "linux",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "freebsd",
+    target_os = "netbsd",
+))]
+pub(crate) fn get_keepalive_retries(socket: TcpSocket) -> io::Result<Option<u32>> {
+    if !get_keepalive(socket)? {
+        return Ok(None);
+    }
+
+    let mut optval: libc::c_int = 0;
+    let mut optlen = mem::size_of::<libc::c_int>() as libc::socklen_t;
+    syscall!(getsockopt(
+        socket,
+        libc::IPPROTO_TCP,
+        libc::TCP_KEEPCNT,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
+
+    Ok(Some(optval as u32))
+}
+
+pub fn accept(listener: &net::TcpListener) -> io::Result<(net::TcpStream, SocketAddr)> {
+    let mut addr: MaybeUninit<libc::sockaddr_storage> = MaybeUninit::uninit();
+    let mut length = size_of::<libc::sockaddr_storage>() as libc::socklen_t;
+
+    // On platforms that support it we can use `accept4(2)` to set `NONBLOCK`
+    // and `CLOEXEC` in the call to accept the connection.
+    #[cfg(any(
+        // Android x86's seccomp profile forbids calls to `accept4(2)`
+        // See https://github.com/tokio-rs/mio/issues/1445 for details
+        all(
+            not(target_arch="x86"),
+            target_os = "android"
+        ),
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "illumos",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    let stream = {
+        syscall!(accept4(
+            listener.as_raw_fd(),
+            addr.as_mut_ptr() as *mut _,
+            &mut length,
+            libc::SOCK_CLOEXEC | libc::SOCK_NONBLOCK,
+        ))
+        .map(|socket| unsafe { net::TcpStream::from_raw_fd(socket) })
+    }?;
+
+    // But not all platforms have the `accept4(2)` call. Luckily BSD (derived)
+    // OSes inherit the non-blocking flag from the listener, so we just have to
+    // set `CLOEXEC`.
+    #[cfg(any(
+        all(
+            target_arch = "x86",
+            target_os = "android"
+        ),
+        target_os = "ios", 
+        target_os = "macos", 
+        target_os = "solaris"
+    ))]
+    let stream = {
+        syscall!(accept(
+            listener.as_raw_fd(),
+            addr.as_mut_ptr() as *mut _,
+            &mut length
+        ))
+        .map(|socket| unsafe { net::TcpStream::from_raw_fd(socket) })
+        .and_then(|s| {
+            syscall!(fcntl(s.as_raw_fd(), libc::F_SETFD, libc::FD_CLOEXEC))?;
+    
+            // See https://github.com/tokio-rs/mio/issues/1450
+            #[cfg(all(target_arch = "x86",target_os = "android"))]
+            syscall!(fcntl(s.as_raw_fd(), libc::F_SETFL, libc::O_NONBLOCK))?;
+            
+            Ok(s)
         })
-    }
-
-    pub fn accept(&self) -> io::Result<(net::TcpStream, SocketAddr)> {
-        self.inner.accept()
-    }
-
-    #[allow(deprecated)]
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.inner.set_only_v6(only_v6)
-    }
-
-    #[allow(deprecated)]
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.inner.only_v6()
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.inner.set_ttl(ttl)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.inner.ttl()
-    }
+    }?;
 
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.inner.take_error()
-    }
-}
-
-impl Evented for TcpListener {
-    fn register(&self, poll: &Poll, token: Token,
-                interest: Ready, opts: PollOpt) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token,
-                  interest: Ready, opts: PollOpt) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).deregister(poll)
-    }
+    // This is safe because `accept` calls above ensures the address
+    // initialised.
+    unsafe { to_socket_addr(addr.as_ptr()) }.map(|addr| (stream, addr))
 }
-
-impl fmt::Debug for TcpListener {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(&self.inner, f)
-    }
-}
-
-impl FromRawFd for TcpListener {
-    unsafe fn from_raw_fd(fd: RawFd) -> TcpListener {
-        TcpListener {
-            inner: net::TcpListener::from_raw_fd(fd),
-        }
-    }
-}
-
-impl IntoRawFd for TcpListener {
-    fn into_raw_fd(self) -> RawFd {
-        self.inner.into_raw_fd()
-    }
-}
-
-impl AsRawFd for TcpListener {
-    fn as_raw_fd(&self) -> RawFd {
-        self.inner.as_raw_fd()
-    }
-}
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/udp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/udp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,181 +1,39 @@
-use {io, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use unix::EventedFd;
-use sys::unix::uio::VecIo;
-use std::fmt;
-use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr};
-use std::os::unix::io::{RawFd, IntoRawFd, AsRawFd, FromRawFd};
-
-#[allow(unused_imports)] // only here for Rust 1.8
-use net2::UdpSocketExt;
-use iovec::IoVec;
+use crate::sys::unix::net::{new_ip_socket, socket_addr};
 
-pub struct UdpSocket {
-    io: net::UdpSocket,
-}
-
-impl UdpSocket {
-    pub fn new(socket: net::UdpSocket) -> io::Result<UdpSocket> {
-        socket.set_nonblocking(true)?;
-        Ok(UdpSocket {
-            io: socket,
-        })
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<UdpSocket> {
-        self.io.try_clone().map(|io| {
-            UdpSocket {
-                io,
-            }
-        })
-    }
-
-    pub fn send_to(&self, buf: &[u8], target: &SocketAddr) -> io::Result<usize> {
-        self.io.send_to(buf, target)
-    }
-
-    pub fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        self.io.recv_from(buf)
-    }
-
-    pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        self.io.send(buf)
-    }
-
-    pub fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.io.recv(buf)
-    }
-
-    pub fn connect(&self, addr: SocketAddr)
-                     -> io::Result<()> {
-        self.io.connect(addr)
-    }
-
-    pub fn broadcast(&self) -> io::Result<bool> {
-        self.io.broadcast()
-    }
-
-    pub fn set_broadcast(&self, on: bool) -> io::Result<()> {
-        self.io.set_broadcast(on)
-    }
-
-    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
-        self.io.multicast_loop_v4()
-    }
-
-    pub fn set_multicast_loop_v4(&self, on: bool) -> io::Result<()> {
-        self.io.set_multicast_loop_v4(on)
-    }
-
-    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        self.io.multicast_ttl_v4()
-    }
-
-    pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
-        self.io.set_multicast_ttl_v4(ttl)
-    }
-
-    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
-        self.io.multicast_loop_v6()
-    }
-
-    pub fn set_multicast_loop_v6(&self, on: bool) -> io::Result<()> {
-        self.io.set_multicast_loop_v6(on)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.io.ttl()
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.io.set_ttl(ttl)
-    }
-
-    pub fn join_multicast_v4(&self,
-                             multiaddr: &Ipv4Addr,
-                             interface: &Ipv4Addr) -> io::Result<()> {
-        self.io.join_multicast_v4(multiaddr, interface)
-    }
-
-    pub fn join_multicast_v6(&self,
-                             multiaddr: &Ipv6Addr,
-                             interface: u32) -> io::Result<()> {
-        self.io.join_multicast_v6(multiaddr, interface)
-    }
-
-    pub fn leave_multicast_v4(&self,
-                              multiaddr: &Ipv4Addr,
-                              interface: &Ipv4Addr) -> io::Result<()> {
-        self.io.leave_multicast_v4(multiaddr, interface)
-    }
-
-    pub fn leave_multicast_v6(&self,
-                              multiaddr: &Ipv6Addr,
-                              interface: u32) -> io::Result<()> {
-        self.io.leave_multicast_v6(multiaddr, interface)
-    }
-
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.io.set_only_v6(only_v6)
-    }
-
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.io.only_v6()
-    }
-
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.io.take_error()
-    }
-
-    pub fn readv(&self, bufs: &mut [&mut IoVec]) -> io::Result<usize> {
-        self.io.readv(bufs)
-    }
-
-    pub fn writev(&self, bufs: &[&IoVec]) -> io::Result<usize> {
-        self.io.writev(bufs)
-    }
-}
-
-impl Evented for UdpSocket {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).deregister(poll)
-    }
-}
-
-impl fmt::Debug for UdpSocket {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(&self.io, f)
-    }
-}
-
-impl FromRawFd for UdpSocket {
-    unsafe fn from_raw_fd(fd: RawFd) -> UdpSocket {
-        UdpSocket {
-            io: net::UdpSocket::from_raw_fd(fd),
-        }
-    }
-}
-
-impl IntoRawFd for UdpSocket {
-    fn into_raw_fd(self) -> RawFd {
-        self.io.into_raw_fd()
-    }
-}
+use std::io;
+use std::mem;
+use std::net::{self, SocketAddr};
+use std::os::unix::io::{AsRawFd, FromRawFd};
+
+pub fn bind(addr: SocketAddr) -> io::Result<net::UdpSocket> {
+    // Gives a warning for non Apple platforms.
+    #[allow(clippy::let_and_return)]
+    let socket = new_ip_socket(addr, libc::SOCK_DGRAM);
+
+    socket.and_then(|socket| {
+        let (raw_addr, raw_addr_length) = socket_addr(&addr);
+        syscall!(bind(socket, raw_addr.as_ptr(), raw_addr_length))
+            .map_err(|err| {
+                // Close the socket if we hit an error, ignoring the error
+                // from closing since we can't pass back two errors.
+                let _ = unsafe { libc::close(socket) };
+                err
+            })
+            .map(|_| unsafe { net::UdpSocket::from_raw_fd(socket) })
+    })
+}
+
+pub(crate) fn only_v6(socket: &net::UdpSocket) -> io::Result<bool> {
+    let mut optval: libc::c_int = 0;
+    let mut optlen = mem::size_of::<libc::c_int>() as libc::socklen_t;
+
+    syscall!(getsockopt(
+        socket.as_raw_fd(),
+        libc::IPPROTO_IPV6,
+        libc::IPV6_V6ONLY,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ))?;
 
-impl AsRawFd for UdpSocket {
-    fn as_raw_fd(&self) -> RawFd {
-        self.io.as_raw_fd()
-    }
+    Ok(optval != 0)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/datagram.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/datagram.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/datagram.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/datagram.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,56 @@
+use super::{socket_addr, SocketAddr};
+use crate::sys::unix::net::new_socket;
+
+use std::io;
+use std::os::unix::io::{AsRawFd, FromRawFd};
+use std::os::unix::net;
+use std::path::Path;
+
+pub(crate) fn bind(path: &Path) -> io::Result<net::UnixDatagram> {
+    let fd = new_socket(libc::AF_UNIX, libc::SOCK_DGRAM)?;
+    // Ensure the fd is closed.
+    let socket = unsafe { net::UnixDatagram::from_raw_fd(fd) };
+    let (sockaddr, socklen) = socket_addr(path)?;
+    let sockaddr = &sockaddr as *const libc::sockaddr_un as *const _;
+    syscall!(bind(fd, sockaddr, socklen))?;
+    Ok(socket)
+}
+
+pub(crate) fn unbound() -> io::Result<net::UnixDatagram> {
+    new_socket(libc::AF_UNIX, libc::SOCK_DGRAM)
+        .map(|socket| unsafe { net::UnixDatagram::from_raw_fd(socket) })
+}
+
+pub(crate) fn pair() -> io::Result<(net::UnixDatagram, net::UnixDatagram)> {
+    super::pair(libc::SOCK_DGRAM)
+}
+
+pub(crate) fn local_addr(socket: &net::UnixDatagram) -> io::Result<SocketAddr> {
+    super::local_addr(socket.as_raw_fd())
+}
+
+pub(crate) fn peer_addr(socket: &net::UnixDatagram) -> io::Result<SocketAddr> {
+    super::peer_addr(socket.as_raw_fd())
+}
+
+pub(crate) fn recv_from(
+    socket: &net::UnixDatagram,
+    dst: &mut [u8],
+) -> io::Result<(usize, SocketAddr)> {
+    let mut count = 0;
+    let socketaddr = SocketAddr::new(|sockaddr, socklen| {
+        syscall!(recvfrom(
+            socket.as_raw_fd(),
+            dst.as_mut_ptr() as *mut _,
+            dst.len(),
+            0,
+            sockaddr,
+            socklen,
+        ))
+        .map(|c| {
+            count = c;
+            c as libc::c_int
+        })
+    })?;
+    Ok((count as usize, socketaddr))
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/listener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/listener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/listener.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/listener.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,99 @@
+use super::socket_addr;
+use crate::net::{SocketAddr, UnixStream};
+use crate::sys::unix::net::new_socket;
+use std::os::unix::io::{AsRawFd, FromRawFd};
+use std::os::unix::net;
+use std::path::Path;
+use std::{io, mem};
+
+pub(crate) fn bind(path: &Path) -> io::Result<net::UnixListener> {
+    let socket = new_socket(libc::AF_UNIX, libc::SOCK_STREAM)?;
+    let (sockaddr, socklen) = socket_addr(path)?;
+    let sockaddr = &sockaddr as *const libc::sockaddr_un as *const libc::sockaddr;
+
+    syscall!(bind(socket, sockaddr, socklen))
+        .and_then(|_| syscall!(listen(socket, 1024)))
+        .map_err(|err| {
+            // Close the socket if we hit an error, ignoring the error from
+            // closing since we can't pass back two errors.
+            let _ = unsafe { libc::close(socket) };
+            err
+        })
+        .map(|_| unsafe { net::UnixListener::from_raw_fd(socket) })
+}
+
+pub(crate) fn accept(listener: &net::UnixListener) -> io::Result<(UnixStream, SocketAddr)> {
+    let sockaddr = mem::MaybeUninit::<libc::sockaddr_un>::zeroed();
+
+    // This is safe to assume because a `libc::sockaddr_un` filled with `0`
+    // bytes is properly initialized.
+    //
+    // `0` is a valid value for `sockaddr_un::sun_family`; it is
+    // `libc::AF_UNSPEC`.
+    //
+    // `[0; 108]` is a valid value for `sockaddr_un::sun_path`; it begins an
+    // abstract path.
+    let mut sockaddr = unsafe { sockaddr.assume_init() };
+
+    sockaddr.sun_family = libc::AF_UNIX as libc::sa_family_t;
+    let mut socklen = mem::size_of_val(&sockaddr) as libc::socklen_t;
+
+    #[cfg(not(any(
+        target_os = "ios",
+        target_os = "macos",
+        target_os = "netbsd",
+        target_os = "solaris",
+        // Android x86's seccomp profile forbids calls to `accept4(2)`
+        // See https://github.com/tokio-rs/mio/issues/1445 for details
+        all(
+            target_arch = "x86",
+            target_os = "android"
+        )
+    )))]
+    let socket = {
+        let flags = libc::SOCK_NONBLOCK | libc::SOCK_CLOEXEC;
+        syscall!(accept4(
+            listener.as_raw_fd(),
+            &mut sockaddr as *mut libc::sockaddr_un as *mut libc::sockaddr,
+            &mut socklen,
+            flags
+        ))
+        .map(|socket| unsafe { net::UnixStream::from_raw_fd(socket) })
+    };
+
+    #[cfg(any(
+        target_os = "ios",
+        target_os = "macos",
+        target_os = "netbsd",
+        target_os = "solaris",
+        all(
+            target_arch = "x86",
+            target_os = "android"
+        )
+    ))]
+    let socket = syscall!(accept(
+        listener.as_raw_fd(),
+        &mut sockaddr as *mut libc::sockaddr_un as *mut libc::sockaddr,
+        &mut socklen,
+    ))
+    .and_then(|socket| {
+        // Ensure the socket is closed if either of the `fcntl` calls
+        // error below.
+        let s = unsafe { net::UnixStream::from_raw_fd(socket) };
+        syscall!(fcntl(socket, libc::F_SETFD, libc::FD_CLOEXEC))?;
+
+        // See https://github.com/tokio-rs/mio/issues/1450
+        #[cfg(all(target_arch = "x86",target_os = "android"))]
+        syscall!(fcntl(socket, libc::F_SETFL, libc::O_NONBLOCK))?;
+        
+        Ok(s)
+    });
+
+    socket
+        .map(UnixStream::from_std)
+        .map(|stream| (stream, SocketAddr::from_parts(sockaddr, socklen)))
+}
+
+pub(crate) fn local_addr(listener: &net::UnixListener) -> io::Result<SocketAddr> {
+    super::local_addr(listener.as_raw_fd())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,149 @@
+mod socketaddr;
+pub use self::socketaddr::SocketAddr;
+
+/// Get the `sun_path` field offset of `sockaddr_un` for the target OS.
+///
+/// On Linux, this funtion equates to the same value as
+/// `size_of::<sa_family_t>()`, but some other implementations include
+/// other fields before `sun_path`, so the expression more portably
+/// describes the size of the address structure.
+pub(in crate::sys) fn path_offset(sockaddr: &libc::sockaddr_un) -> usize {
+    let base = sockaddr as *const _ as usize;
+    let path = &sockaddr.sun_path as *const _ as usize;
+    path - base
+}
+
+cfg_os_poll! {
+    use std::cmp::Ordering;
+    use std::os::unix::ffi::OsStrExt;
+    use std::os::unix::io::{RawFd, FromRawFd};
+    use std::path::Path;
+    use std::{io, mem};
+
+    pub(crate) mod datagram;
+    pub(crate) mod listener;
+    pub(crate) mod stream;
+
+    pub(in crate::sys) fn socket_addr(path: &Path) -> io::Result<(libc::sockaddr_un, libc::socklen_t)> {
+        let sockaddr = mem::MaybeUninit::<libc::sockaddr_un>::zeroed();
+
+        // This is safe to assume because a `libc::sockaddr_un` filled with `0`
+        // bytes is properly initialized.
+        //
+        // `0` is a valid value for `sockaddr_un::sun_family`; it is
+        // `libc::AF_UNSPEC`.
+        //
+        // `[0; 108]` is a valid value for `sockaddr_un::sun_path`; it begins an
+        // abstract path.
+        let mut sockaddr = unsafe { sockaddr.assume_init() };
+
+        sockaddr.sun_family = libc::AF_UNIX as libc::sa_family_t;
+
+        let bytes = path.as_os_str().as_bytes();
+        match (bytes.get(0), bytes.len().cmp(&sockaddr.sun_path.len())) {
+            // Abstract paths don't need a null terminator
+            (Some(&0), Ordering::Greater) => {
+                return Err(io::Error::new(
+                    io::ErrorKind::InvalidInput,
+                    "path must be no longer than libc::sockaddr_un.sun_path",
+                ));
+            }
+            (_, Ordering::Greater) | (_, Ordering::Equal) => {
+                return Err(io::Error::new(
+                    io::ErrorKind::InvalidInput,
+                    "path must be shorter than libc::sockaddr_un.sun_path",
+                ));
+            }
+            _ => {}
+        }
+
+        for (dst, src) in sockaddr.sun_path.iter_mut().zip(bytes.iter()) {
+            *dst = *src as libc::c_char;
+        }
+
+        let offset = path_offset(&sockaddr);
+        let mut socklen = offset + bytes.len();
+
+        match bytes.get(0) {
+            // The struct has already been zeroes so the null byte for pathname
+            // addresses is already there.
+            Some(&0) | None => {}
+            Some(_) => socklen += 1,
+        }
+
+        Ok((sockaddr, socklen as libc::socklen_t))
+    }
+
+    fn pair<T>(flags: libc::c_int) -> io::Result<(T, T)>
+        where T: FromRawFd,
+    {
+        #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "solaris")))]
+        let flags = flags | libc::SOCK_NONBLOCK | libc::SOCK_CLOEXEC;
+
+        let mut fds = [-1; 2];
+        syscall!(socketpair(libc::AF_UNIX, flags, 0, fds.as_mut_ptr()))?;
+        let pair = unsafe { (T::from_raw_fd(fds[0]), T::from_raw_fd(fds[1])) };
+
+        // Darwin and Solaris do not have SOCK_NONBLOCK or SOCK_CLOEXEC.
+        //
+        // In order to set those flags, additional `fcntl` sys calls must be
+        // performed. If a `fnctl` fails after the sockets have been created,
+        // the file descriptors will leak. Creating `pair` above ensures that if
+        // there is an error, the file descriptors are closed.
+        #[cfg(any(target_os = "ios", target_os = "macos", target_os = "solaris"))]
+        {
+            syscall!(fcntl(fds[0], libc::F_SETFL, libc::O_NONBLOCK))?;
+            syscall!(fcntl(fds[0], libc::F_SETFD, libc::FD_CLOEXEC))?;
+            syscall!(fcntl(fds[1], libc::F_SETFL, libc::O_NONBLOCK))?;
+            syscall!(fcntl(fds[1], libc::F_SETFD, libc::FD_CLOEXEC))?;
+        }
+        Ok(pair)
+    }
+
+    // The following functions can't simply be replaced with a call to
+    // `net::UnixDatagram` because of our `SocketAddr` type.
+
+    fn local_addr(socket: RawFd) -> io::Result<SocketAddr> {
+        SocketAddr::new(|sockaddr, socklen| syscall!(getsockname(socket, sockaddr, socklen)))
+    }
+
+    fn peer_addr(socket: RawFd) -> io::Result<SocketAddr> {
+        SocketAddr::new(|sockaddr, socklen| syscall!(getpeername(socket, sockaddr, socklen)))
+    }
+
+    #[cfg(test)]
+    mod tests {
+        use super::{path_offset, socket_addr};
+        use std::path::Path;
+        use std::str;
+
+        #[test]
+        fn pathname_address() {
+            const PATH: &str = "./foo/bar.txt";
+            const PATH_LEN: usize = 13;
+
+            // Pathname addresses do have a null terminator, so `socklen` is
+            // expected to be `PATH_LEN` + `offset` + 1.
+            let path = Path::new(PATH);
+            let (sockaddr, actual) = socket_addr(path).unwrap();
+            let offset = path_offset(&sockaddr);
+            let expected = PATH_LEN + offset + 1;
+            assert_eq!(expected as libc::socklen_t, actual)
+        }
+
+        #[test]
+        fn abstract_address() {
+            const PATH: &[u8] = &[0, 116, 111, 107, 105, 111];
+            const PATH_LEN: usize = 6;
+
+            // Abstract addresses do not have a null terminator, so `socklen` is
+            // expected to be `PATH_LEN` + `offset`.
+            let abstract_path = str::from_utf8(PATH).unwrap();
+            let path = Path::new(abstract_path);
+            let (sockaddr, actual) = socket_addr(path).unwrap();
+            let offset = path_offset(&sockaddr);
+            let expected = PATH_LEN + offset;
+            assert_eq!(expected as libc::socklen_t, actual)
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/socketaddr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/socketaddr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/socketaddr.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/socketaddr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,124 @@
+use super::path_offset;
+use std::ffi::OsStr;
+use std::os::unix::ffi::OsStrExt;
+use std::path::Path;
+use std::{ascii, fmt};
+
+/// An address associated with a `mio` specific Unix socket.
+///
+/// This is implemented instead of imported from [`net::SocketAddr`] because
+/// there is no way to create a [`net::SocketAddr`]. One must be returned by
+/// [`accept`], so this is returned instead.
+///
+/// [`net::SocketAddr`]: std::os::unix::net::SocketAddr
+/// [`accept`]: #method.accept
+pub struct SocketAddr {
+    sockaddr: libc::sockaddr_un,
+    socklen: libc::socklen_t,
+}
+
+struct AsciiEscaped<'a>(&'a [u8]);
+
+enum AddressKind<'a> {
+    Unnamed,
+    Pathname(&'a Path),
+    Abstract(&'a [u8]),
+}
+
+impl SocketAddr {
+    fn address(&self) -> AddressKind<'_> {
+        let offset = path_offset(&self.sockaddr);
+        // Don't underflow in `len` below.
+        if (self.socklen as usize) < offset {
+            return AddressKind::Unnamed;
+        }
+        let len = self.socklen as usize - offset;
+        let path = unsafe { &*(&self.sockaddr.sun_path as *const [libc::c_char] as *const [u8]) };
+
+        // macOS seems to return a len of 16 and a zeroed sun_path for unnamed addresses
+        if len == 0
+            || (cfg!(not(any(target_os = "linux", target_os = "android")))
+                && self.sockaddr.sun_path[0] == 0)
+        {
+            AddressKind::Unnamed
+        } else if self.sockaddr.sun_path[0] == 0 {
+            AddressKind::Abstract(&path[1..len])
+        } else {
+            AddressKind::Pathname(OsStr::from_bytes(&path[..len - 1]).as_ref())
+        }
+    }
+}
+
+cfg_os_poll! {
+    use std::{io, mem};
+
+    impl SocketAddr {
+        pub(crate) fn new<F>(f: F) -> io::Result<SocketAddr>
+        where
+            F: FnOnce(*mut libc::sockaddr, &mut libc::socklen_t) -> io::Result<libc::c_int>,
+        {
+            let mut sockaddr = {
+                let sockaddr = mem::MaybeUninit::<libc::sockaddr_un>::zeroed();
+                unsafe { sockaddr.assume_init() }
+            };
+
+            let raw_sockaddr = &mut sockaddr as *mut libc::sockaddr_un as *mut libc::sockaddr;
+            let mut socklen = mem::size_of_val(&sockaddr) as libc::socklen_t;
+
+            f(raw_sockaddr, &mut socklen)?;
+            Ok(SocketAddr::from_parts(sockaddr, socklen))
+        }
+
+        pub(crate) fn from_parts(sockaddr: libc::sockaddr_un, socklen: libc::socklen_t) -> SocketAddr {
+            SocketAddr { sockaddr, socklen }
+        }
+
+        /// Returns `true` if the address is unnamed.
+        ///
+        /// Documentation reflected in [`SocketAddr`]
+        ///
+        /// [`SocketAddr`]: std::os::unix::net::SocketAddr
+        // FIXME: The matches macro requires rust 1.42.0 and we still support 1.39.0
+        #[allow(clippy::match_like_matches_macro)]
+        pub fn is_unnamed(&self) -> bool {
+            if let AddressKind::Unnamed = self.address() {
+                true
+            } else {
+                false
+            }
+        }
+
+        /// Returns the contents of this address if it is a `pathname` address.
+        ///
+        /// Documentation reflected in [`SocketAddr`]
+        ///
+        /// [`SocketAddr`]: std::os::unix::net::SocketAddr
+        pub fn as_pathname(&self) -> Option<&Path> {
+            if let AddressKind::Pathname(path) = self.address() {
+                Some(path)
+            } else {
+                None
+            }
+        }
+    }
+}
+
+impl fmt::Debug for SocketAddr {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.address() {
+            AddressKind::Unnamed => write!(fmt, "(unnamed)"),
+            AddressKind::Abstract(name) => write!(fmt, "{} (abstract)", AsciiEscaped(name)),
+            AddressKind::Pathname(path) => write!(fmt, "{:?} (pathname)", path),
+        }
+    }
+}
+
+impl<'a> fmt::Display for AsciiEscaped<'a> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "\"")?;
+        for byte in self.0.iter().cloned().flat_map(ascii::escape_default) {
+            write!(fmt, "{}", byte as char)?;
+        }
+        write!(fmt, "\"")
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds/stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,39 @@
+use super::{socket_addr, SocketAddr};
+use crate::sys::unix::net::new_socket;
+
+use std::io;
+use std::os::unix::io::{AsRawFd, FromRawFd};
+use std::os::unix::net;
+use std::path::Path;
+
+pub(crate) fn connect(path: &Path) -> io::Result<net::UnixStream> {
+    let socket = new_socket(libc::AF_UNIX, libc::SOCK_STREAM)?;
+    let (sockaddr, socklen) = socket_addr(path)?;
+    let sockaddr = &sockaddr as *const libc::sockaddr_un as *const libc::sockaddr;
+
+    match syscall!(connect(socket, sockaddr, socklen)) {
+        Ok(_) => {}
+        Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {}
+        Err(e) => {
+            // Close the socket if we hit an error, ignoring the error
+            // from closing since we can't pass back two errors.
+            let _ = unsafe { libc::close(socket) };
+
+            return Err(e);
+        }
+    }
+
+    Ok(unsafe { net::UnixStream::from_raw_fd(socket) })
+}
+
+pub(crate) fn pair() -> io::Result<(net::UnixStream, net::UnixStream)> {
+    super::pair(libc::SOCK_STREAM)
+}
+
+pub(crate) fn local_addr(socket: &net::UnixStream) -> io::Result<SocketAddr> {
+    super::local_addr(socket.as_raw_fd())
+}
+
+pub(crate) fn peer_addr(socket: &net::UnixStream) -> io::Result<SocketAddr> {
+    super::peer_addr(socket.as_raw_fd())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uds.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uds.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,262 +0,0 @@
-use std::io::{Read, Write};
-use std::mem;
-use std::net::Shutdown;
-use std::os::unix::prelude::*;
-use std::path::Path;
-use std::ptr;
-
-use libc;
-
-use {io, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use sys::unix::{cvt, Io};
-use sys::unix::io::{set_nonblock, set_cloexec};
-
-trait MyInto<T> {
-    fn my_into(self) -> T;
-}
-
-impl MyInto<u32> for usize {
-    fn my_into(self) -> u32 { self as u32 }
-}
-
-impl MyInto<usize> for usize {
-    fn my_into(self) -> usize { self }
-}
-
-unsafe fn sockaddr_un(path: &Path)
-                      -> io::Result<(libc::sockaddr_un, libc::socklen_t)> {
-    let mut addr: libc::sockaddr_un = mem::zeroed();
-    addr.sun_family = libc::AF_UNIX as libc::sa_family_t;
-
-    let bytes = path.as_os_str().as_bytes();
-
-    if bytes.len() >= addr.sun_path.len() {
-        return Err(io::Error::new(io::ErrorKind::InvalidInput,
-                                  "path must be shorter than SUN_LEN"))
-    }
-    for (dst, src) in addr.sun_path.iter_mut().zip(bytes.iter()) {
-        *dst = *src as libc::c_char;
-    }
-    // null byte for pathname addresses is already there because we zeroed the
-    // struct
-
-    let mut len = sun_path_offset() + bytes.len();
-    match bytes.get(0) {
-        Some(&0) | None => {}
-        Some(_) => len += 1,
-    }
-    Ok((addr, len as libc::socklen_t))
-}
-
-fn sun_path_offset() -> usize {
-    unsafe {
-        // Work with an actual instance of the type since using a null pointer is UB
-        let addr: libc::sockaddr_un = mem::uninitialized();
-        let base = &addr as *const _ as usize;
-        let path = &addr.sun_path as *const _ as usize;
-        path - base
-    }
-}
-
-#[derive(Debug)]
-pub struct UnixSocket {
-    io: Io,
-}
-
-impl UnixSocket {
-    /// Returns a new, unbound, non-blocking Unix domain socket
-    pub fn stream() -> io::Result<UnixSocket> {
-        #[cfg(target_os = "linux")]
-        use libc::{SOCK_CLOEXEC, SOCK_NONBLOCK};
-        #[cfg(not(target_os = "linux"))]
-        const SOCK_CLOEXEC: libc::c_int = 0;
-        #[cfg(not(target_os = "linux"))]
-        const SOCK_NONBLOCK: libc::c_int = 0;
-
-        unsafe {
-            if cfg!(target_os = "linux") {
-                let flags = libc::SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK;
-                match cvt(libc::socket(libc::AF_UNIX, flags, 0)) {
-                    Ok(fd) => return Ok(UnixSocket::from_raw_fd(fd)),
-                    Err(ref e) if e.raw_os_error() == Some(libc::EINVAL) => {}
-                    Err(e) => return Err(e),
-                }
-            }
-
-            let fd = cvt(libc::socket(libc::AF_UNIX, libc::SOCK_STREAM, 0))?;
-            let fd = UnixSocket::from_raw_fd(fd);
-            set_cloexec(fd.as_raw_fd())?;
-            set_nonblock(fd.as_raw_fd())?;
-            Ok(fd)
-        }
-    }
-
-    /// Connect the socket to the specified address
-    pub fn connect<P: AsRef<Path> + ?Sized>(&self, addr: &P) -> io::Result<()> {
-        unsafe {
-            let (addr, len) = sockaddr_un(addr.as_ref())?;
-            cvt(libc::connect(self.as_raw_fd(),
-                                   &addr as *const _ as *const _,
-                                   len))?;
-            Ok(())
-        }
-    }
-
-    /// Listen for incoming requests
-    pub fn listen(&self, backlog: usize) -> io::Result<()> {
-        unsafe {
-            cvt(libc::listen(self.as_raw_fd(), backlog as i32))?;
-            Ok(())
-        }
-    }
-
-    pub fn accept(&self) -> io::Result<UnixSocket> {
-        unsafe {
-            let fd = cvt(libc::accept(self.as_raw_fd(),
-                                           ptr::null_mut(),
-                                           ptr::null_mut()))?;
-            let fd = Io::from_raw_fd(fd);
-            set_cloexec(fd.as_raw_fd())?;
-            set_nonblock(fd.as_raw_fd())?;
-            Ok(UnixSocket { io: fd })
-        }
-    }
-
-    /// Bind the socket to the specified address
-    pub fn bind<P: AsRef<Path> + ?Sized>(&self, addr: &P) -> io::Result<()> {
-        unsafe {
-            let (addr, len) = sockaddr_un(addr.as_ref())?;
-            cvt(libc::bind(self.as_raw_fd(),
-                                &addr as *const _ as *const _,
-                                len))?;
-            Ok(())
-        }
-    }
-
-    pub fn try_clone(&self) -> io::Result<UnixSocket> {
-        Ok(UnixSocket { io: self.io.try_clone()? })
-    }
-
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        let how = match how {
-            Shutdown::Read => libc::SHUT_RD,
-            Shutdown::Write => libc::SHUT_WR,
-            Shutdown::Both => libc::SHUT_RDWR,
-        };
-        unsafe {
-            cvt(libc::shutdown(self.as_raw_fd(), how))?;
-            Ok(())
-        }
-    }
-
-    pub fn read_recv_fd(&mut self, buf: &mut [u8]) -> io::Result<(usize, Option<RawFd>)> {
-        unsafe {
-            let mut iov = libc::iovec {
-                iov_base: buf.as_mut_ptr() as *mut _,
-                iov_len: buf.len(),
-            };
-            struct Cmsg {
-                hdr: libc::cmsghdr,
-                data: [libc::c_int; 1],
-            }
-            let mut cmsg: Cmsg = mem::zeroed();
-            let mut msg: libc::msghdr = mem::zeroed();
-            msg.msg_iov = &mut iov;
-            msg.msg_iovlen = 1;
-            msg.msg_control = &mut cmsg as *mut _ as *mut _;
-            msg.msg_controllen = mem::size_of_val(&cmsg).my_into();
-            let bytes = cvt(libc::recvmsg(self.as_raw_fd(), &mut msg, 0))?;
-
-            const SCM_RIGHTS: libc::c_int = 1;
-
-            let fd = if cmsg.hdr.cmsg_level == libc::SOL_SOCKET &&
-                        cmsg.hdr.cmsg_type == SCM_RIGHTS {
-                Some(cmsg.data[0])
-            } else {
-                None
-            };
-            Ok((bytes as usize, fd))
-        }
-    }
-
-    pub fn write_send_fd(&mut self, buf: &[u8], fd: RawFd) -> io::Result<usize> {
-        unsafe {
-            let mut iov = libc::iovec {
-                iov_base: buf.as_ptr() as *mut _,
-                iov_len: buf.len(),
-            };
-            struct Cmsg {
-                hdr: libc::cmsghdr,
-                data: [libc::c_int; 1],
-            }
-            let mut cmsg: Cmsg = mem::zeroed();
-            cmsg.hdr.cmsg_len = mem::size_of_val(&cmsg).my_into();
-            cmsg.hdr.cmsg_level = libc::SOL_SOCKET;
-            cmsg.hdr.cmsg_type = 1; // SCM_RIGHTS
-            cmsg.data[0] = fd;
-            let mut msg: libc::msghdr = mem::zeroed();
-            msg.msg_iov = &mut iov;
-            msg.msg_iovlen = 1;
-            msg.msg_control = &mut cmsg as *mut _ as *mut _;
-            msg.msg_controllen = mem::size_of_val(&cmsg).my_into();
-            let bytes = cvt(libc::sendmsg(self.as_raw_fd(), &msg, 0))?;
-            Ok(bytes as usize)
-        }
-    }
-}
-
-impl Read for UnixSocket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.io.read(buf)
-    }
-}
-
-impl Write for UnixSocket {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.io.write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.io.flush()
-    }
-}
-
-impl Evented for UnixSocket {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.io.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.io.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.io.deregister(poll)
-    }
-}
-
-
-impl From<Io> for UnixSocket {
-    fn from(io: Io) -> UnixSocket {
-        UnixSocket { io }
-    }
-}
-
-impl FromRawFd for UnixSocket {
-    unsafe fn from_raw_fd(fd: RawFd) -> UnixSocket {
-        UnixSocket { io: Io::from_raw_fd(fd) }
-    }
-}
-
-impl IntoRawFd for UnixSocket {
-    fn into_raw_fd(self) -> RawFd {
-        self.io.into_raw_fd()
-    }
-}
-
-impl AsRawFd for UnixSocket {
-    fn as_raw_fd(&self) -> RawFd {
-        self.io.as_raw_fd()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uio.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uio.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/uio.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/uio.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-use std::cmp;
-use std::io;
-use std::os::unix::io::AsRawFd;
-use libc;
-use iovec::IoVec;
-use iovec::unix as iovec;
-
-pub trait VecIo {
-    fn readv(&self, bufs: &mut [&mut IoVec]) -> io::Result<usize>;
-
-    fn writev(&self, bufs: &[&IoVec]) -> io::Result<usize>;
-}
-
-impl<T: AsRawFd> VecIo for T {
-    fn readv(&self, bufs: &mut [&mut IoVec]) -> io::Result<usize> {
-        unsafe {
-            let slice = iovec::as_os_slice_mut(bufs);
-            let len = cmp::min(<libc::c_int>::max_value() as usize, slice.len());
-            let rc = libc::readv(self.as_raw_fd(),
-                                 slice.as_ptr(),
-                                 len as libc::c_int);
-            if rc < 0 {
-                Err(io::Error::last_os_error())
-            } else {
-                Ok(rc as usize)
-            }
-        }
-    }
-
-    fn writev(&self, bufs: &[&IoVec]) -> io::Result<usize> {
-        unsafe {
-            let slice = iovec::as_os_slice(bufs);
-            let len = cmp::min(<libc::c_int>::max_value() as usize, slice.len());
-            let rc = libc::writev(self.as_raw_fd(),
-                                  slice.as_ptr(),
-                                  len as libc::c_int);
-            if rc < 0 {
-                Err(io::Error::last_os_error())
-            } else {
-                Ok(rc as usize)
-            }
-        }
-    }
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/unix/waker.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/unix/waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,180 @@
+#[cfg(any(target_os = "linux", target_os = "android"))]
+mod eventfd {
+    use crate::sys::Selector;
+    use crate::{Interest, Token};
+
+    use std::fs::File;
+    use std::io::{self, Read, Write};
+    use std::os::unix::io::FromRawFd;
+
+    /// Waker backed by `eventfd`.
+    ///
+    /// `eventfd` is effectively an 64 bit counter. All writes must be of 8
+    /// bytes (64 bits) and are converted (native endian) into an 64 bit
+    /// unsigned integer and added to the count. Reads must also be 8 bytes and
+    /// reset the count to 0, returning the count.
+    #[derive(Debug)]
+    pub struct Waker {
+        fd: File,
+    }
+
+    impl Waker {
+        pub fn new(selector: &Selector, token: Token) -> io::Result<Waker> {
+            syscall!(eventfd(0, libc::EFD_CLOEXEC | libc::EFD_NONBLOCK)).and_then(|fd| {
+                // Turn the file descriptor into a file first so we're ensured
+                // it's closed when dropped, e.g. when register below fails.
+                let file = unsafe { File::from_raw_fd(fd) };
+                selector
+                    .register(fd, token, Interest::READABLE)
+                    .map(|()| Waker { fd: file })
+            })
+        }
+
+        pub fn wake(&self) -> io::Result<()> {
+            let buf: [u8; 8] = 1u64.to_ne_bytes();
+            match (&self.fd).write(&buf) {
+                Ok(_) => Ok(()),
+                Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => {
+                    // Writing only blocks if the counter is going to overflow.
+                    // So we'll reset the counter to 0 and wake it again.
+                    self.reset()?;
+                    self.wake()
+                }
+                Err(err) => Err(err),
+            }
+        }
+
+        /// Reset the eventfd object, only need to call this if `wake` fails.
+        fn reset(&self) -> io::Result<()> {
+            let mut buf: [u8; 8] = 0u64.to_ne_bytes();
+            match (&self.fd).read(&mut buf) {
+                Ok(_) => Ok(()),
+                // If the `Waker` hasn't been awoken yet this will return a
+                // `WouldBlock` error which we can safely ignore.
+                Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => Ok(()),
+                Err(err) => Err(err),
+            }
+        }
+    }
+}
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+pub use self::eventfd::Waker;
+
+#[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+mod kqueue {
+    use crate::sys::Selector;
+    use crate::Token;
+
+    use std::io;
+
+    /// Waker backed by kqueue user space notifications (`EVFILT_USER`).
+    ///
+    /// The implementation is fairly simple, first the kqueue must be setup to
+    /// receive waker events this done by calling `Selector.setup_waker`. Next
+    /// we need access to kqueue, thus we need to duplicate the file descriptor.
+    /// Now waking is as simple as adding an event to the kqueue.
+    #[derive(Debug)]
+    pub struct Waker {
+        selector: Selector,
+        token: Token,
+    }
+
+    impl Waker {
+        pub fn new(selector: &Selector, token: Token) -> io::Result<Waker> {
+            selector.try_clone().and_then(|selector| {
+                selector
+                    .setup_waker(token)
+                    .map(|()| Waker { selector, token })
+            })
+        }
+
+        pub fn wake(&self) -> io::Result<()> {
+            self.selector.wake(self.token)
+        }
+    }
+}
+
+#[cfg(any(target_os = "freebsd", target_os = "ios", target_os = "macos"))]
+pub use self::kqueue::Waker;
+
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "openbsd",
+    target_os = "solaris"
+))]
+mod pipe {
+    use crate::sys::unix::Selector;
+    use crate::{Interest, Token};
+
+    use std::fs::File;
+    use std::io::{self, Read, Write};
+    use std::os::unix::io::FromRawFd;
+
+    /// Waker backed by a unix pipe.
+    ///
+    /// Waker controls both the sending and receiving ends and empties the pipe
+    /// if writing to it (waking) fails.
+    #[derive(Debug)]
+    pub struct Waker {
+        sender: File,
+        receiver: File,
+    }
+
+    impl Waker {
+        pub fn new(selector: &Selector, token: Token) -> io::Result<Waker> {
+            let mut fds = [-1; 2];
+            syscall!(pipe2(fds.as_mut_ptr(), libc::O_NONBLOCK | libc::O_CLOEXEC))?;
+            // Turn the file descriptors into files first so we're ensured
+            // they're closed when dropped, e.g. when register below fails.
+            let sender = unsafe { File::from_raw_fd(fds[1]) };
+            let receiver = unsafe { File::from_raw_fd(fds[0]) };
+            selector
+                .register(fds[0], token, Interest::READABLE)
+                .map(|()| Waker { sender, receiver })
+        }
+
+        pub fn wake(&self) -> io::Result<()> {
+            // The epoll emulation on some illumos systems currently requires
+            // the pipe buffer to be completely empty for an edge-triggered
+            // wakeup on the pipe read side.
+            #[cfg(target_os = "illumos")]
+            self.empty();
+
+            match (&self.sender).write(&[1]) {
+                Ok(_) => Ok(()),
+                Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => {
+                    // The reading end is full so we'll empty the buffer and try
+                    // again.
+                    self.empty();
+                    self.wake()
+                }
+                Err(ref err) if err.kind() == io::ErrorKind::Interrupted => self.wake(),
+                Err(err) => Err(err),
+            }
+        }
+
+        /// Empty the pipe's buffer, only need to call this if `wake` fails.
+        /// This ignores any errors.
+        fn empty(&self) {
+            let mut buf = [0; 4096];
+            loop {
+                match (&self.receiver).read(&mut buf) {
+                    Ok(n) if n > 0 => continue,
+                    _ => return,
+                }
+            }
+        }
+    }
+}
+
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "openbsd",
+    target_os = "solaris"
+))]
+pub use self::pipe::Waker;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/afd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/afd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/afd.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/afd.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,237 @@
+use ntapi::ntioapi::{IO_STATUS_BLOCK_u, IO_STATUS_BLOCK};
+use ntapi::ntioapi::{NtCancelIoFileEx, NtDeviceIoControlFile};
+use ntapi::ntrtl::RtlNtStatusToDosError;
+use std::fmt;
+use std::fs::File;
+use std::io;
+use std::mem::size_of;
+use std::os::windows::io::AsRawHandle;
+use std::ptr::null_mut;
+use winapi::shared::ntdef::{HANDLE, LARGE_INTEGER, NTSTATUS, PVOID, ULONG};
+use winapi::shared::ntstatus::{STATUS_NOT_FOUND, STATUS_PENDING, STATUS_SUCCESS};
+
+const IOCTL_AFD_POLL: ULONG = 0x00012024;
+
+/// Winsock2 AFD driver instance.
+///
+/// All operations are unsafe due to IO_STATUS_BLOCK parameter are being used by Afd driver during STATUS_PENDING before I/O Completion Port returns its result.
+#[derive(Debug)]
+pub struct Afd {
+    fd: File,
+}
+
+#[repr(C)]
+#[derive(Debug)]
+pub struct AfdPollHandleInfo {
+    pub handle: HANDLE,
+    pub events: ULONG,
+    pub status: NTSTATUS,
+}
+
+unsafe impl Send for AfdPollHandleInfo {}
+
+#[repr(C)]
+pub struct AfdPollInfo {
+    pub timeout: LARGE_INTEGER,
+    // Can have only value 1.
+    pub number_of_handles: ULONG,
+    pub exclusive: ULONG,
+    pub handles: [AfdPollHandleInfo; 1],
+}
+
+impl fmt::Debug for AfdPollInfo {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("AfdPollInfo").finish()
+    }
+}
+
+impl Afd {
+    /// Poll `Afd` instance with `AfdPollInfo`.
+    ///
+    /// # Unsafety
+    ///
+    /// This function is unsafe due to memory of `IO_STATUS_BLOCK` still being used by `Afd` instance while `Ok(false)` (`STATUS_PENDING`).
+    /// `iosb` needs to be untouched after the call while operation is in effective at ALL TIME except for `cancel` method.
+    /// So be careful not to `poll` twice while polling.
+    /// User should deallocate there overlapped value when error to prevent memory leak.
+    pub unsafe fn poll(
+        &self,
+        info: &mut AfdPollInfo,
+        iosb: *mut IO_STATUS_BLOCK,
+        overlapped: PVOID,
+    ) -> io::Result<bool> {
+        let info_ptr: PVOID = info as *mut _ as PVOID;
+        (*iosb).u.Status = STATUS_PENDING;
+        let status = NtDeviceIoControlFile(
+            self.fd.as_raw_handle(),
+            null_mut(),
+            None,
+            overlapped,
+            iosb,
+            IOCTL_AFD_POLL,
+            info_ptr,
+            size_of::<AfdPollInfo>() as u32,
+            info_ptr,
+            size_of::<AfdPollInfo>() as u32,
+        );
+        match status {
+            STATUS_SUCCESS => Ok(true),
+            STATUS_PENDING => Ok(false),
+            _ => Err(io::Error::from_raw_os_error(
+                RtlNtStatusToDosError(status) as i32
+            )),
+        }
+    }
+
+    /// Cancel previous polled request of `Afd`.
+    ///
+    /// iosb needs to be used by `poll` first for valid `cancel`.
+    ///
+    /// # Unsafety
+    ///
+    /// This function is unsafe due to memory of `IO_STATUS_BLOCK` still being used by `Afd` instance while `Ok(false)` (`STATUS_PENDING`).
+    /// Use it only with request is still being polled so that you have valid `IO_STATUS_BLOCK` to use.
+    /// User should NOT deallocate there overlapped value after the `cancel` to prevent double free.
+    pub unsafe fn cancel(&self, iosb: *mut IO_STATUS_BLOCK) -> io::Result<()> {
+        if (*iosb).u.Status != STATUS_PENDING {
+            return Ok(());
+        }
+
+        let mut cancel_iosb = IO_STATUS_BLOCK {
+            u: IO_STATUS_BLOCK_u { Status: 0 },
+            Information: 0,
+        };
+        let status = NtCancelIoFileEx(self.fd.as_raw_handle(), iosb, &mut cancel_iosb);
+        if status == STATUS_SUCCESS || status == STATUS_NOT_FOUND {
+            return Ok(());
+        }
+        Err(io::Error::from_raw_os_error(
+            RtlNtStatusToDosError(status) as i32
+        ))
+    }
+}
+
+cfg_io_source! {
+    use std::mem::zeroed;
+    use std::os::windows::io::{FromRawHandle, RawHandle};
+    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    use miow::iocp::CompletionPort;
+    use ntapi::ntioapi::{NtCreateFile, FILE_OPEN};
+    use winapi::shared::ntdef::{OBJECT_ATTRIBUTES, UNICODE_STRING, USHORT, WCHAR};
+    use winapi::um::handleapi::INVALID_HANDLE_VALUE;
+    use winapi::um::winbase::{SetFileCompletionNotificationModes, FILE_SKIP_SET_EVENT_ON_HANDLE};
+    use winapi::um::winnt::{SYNCHRONIZE, FILE_SHARE_READ, FILE_SHARE_WRITE};
+
+    const AFD_HELPER_ATTRIBUTES: OBJECT_ATTRIBUTES = OBJECT_ATTRIBUTES {
+        Length: size_of::<OBJECT_ATTRIBUTES>() as ULONG,
+        RootDirectory: null_mut(),
+        ObjectName: &AFD_OBJ_NAME as *const _ as *mut _,
+        Attributes: 0,
+        SecurityDescriptor: null_mut(),
+        SecurityQualityOfService: null_mut(),
+    };
+
+    const AFD_OBJ_NAME: UNICODE_STRING = UNICODE_STRING {
+        Length: (AFD_HELPER_NAME.len() * size_of::<WCHAR>()) as USHORT,
+        MaximumLength: (AFD_HELPER_NAME.len() * size_of::<WCHAR>()) as USHORT,
+        Buffer: AFD_HELPER_NAME.as_ptr() as *mut _,
+    };
+
+    const AFD_HELPER_NAME: &[WCHAR] = &[
+        '\\' as _,
+        'D' as _,
+        'e' as _,
+        'v' as _,
+        'i' as _,
+        'c' as _,
+        'e' as _,
+        '\\' as _,
+        'A' as _,
+        'f' as _,
+        'd' as _,
+        '\\' as _,
+        'M' as _,
+        'i' as _,
+        'o' as _
+    ];
+
+    static NEXT_TOKEN: AtomicUsize = AtomicUsize::new(0);
+
+    impl AfdPollInfo {
+        pub fn zeroed() -> AfdPollInfo {
+            unsafe { zeroed() }
+        }
+    }
+
+    impl Afd {
+        /// Create new Afd instance.
+        pub fn new(cp: &CompletionPort) -> io::Result<Afd> {
+            let mut afd_helper_handle: HANDLE = INVALID_HANDLE_VALUE;
+            let mut iosb = IO_STATUS_BLOCK {
+                u: IO_STATUS_BLOCK_u { Status: 0 },
+                Information: 0,
+            };
+
+            unsafe {
+                let status = NtCreateFile(
+                    &mut afd_helper_handle as *mut _,
+                    SYNCHRONIZE,
+                    &AFD_HELPER_ATTRIBUTES as *const _ as *mut _,
+                    &mut iosb,
+                    null_mut(),
+                    0 as ULONG,
+                    FILE_SHARE_READ | FILE_SHARE_WRITE,
+                    FILE_OPEN,
+                    0 as ULONG,
+                    null_mut(),
+                    0 as ULONG,
+                );
+                if status != STATUS_SUCCESS {
+                    let raw_err = io::Error::from_raw_os_error(
+                        RtlNtStatusToDosError(status) as i32
+                    );
+                    let msg = format!("Failed to open \\Device\\Afd\\Mio: {}", raw_err);
+                    return Err(io::Error::new(raw_err.kind(), msg));
+                }
+                let fd = File::from_raw_handle(afd_helper_handle as RawHandle);
+                // Increment by 2 to reserve space for other types of handles.
+                // Non-AFD types (currently only NamedPipe), use odd numbered
+                // tokens. This allows the selector to differentate between them
+                // and dispatch events accordingly.
+                let token = NEXT_TOKEN.fetch_add(2, Ordering::Relaxed) + 2;
+                let afd = Afd { fd };
+                cp.add_handle(token, &afd.fd)?;
+                match SetFileCompletionNotificationModes(
+                    afd_helper_handle,
+                    FILE_SKIP_SET_EVENT_ON_HANDLE,
+                ) {
+                    0 => Err(io::Error::last_os_error()),
+                    _ => Ok(afd),
+                }
+            }
+        }
+    }
+}
+
+pub const POLL_RECEIVE: u32 = 0b000_000_001;
+pub const POLL_RECEIVE_EXPEDITED: u32 = 0b000_000_010;
+pub const POLL_SEND: u32 = 0b000_000_100;
+pub const POLL_DISCONNECT: u32 = 0b000_001_000;
+pub const POLL_ABORT: u32 = 0b000_010_000;
+pub const POLL_LOCAL_CLOSE: u32 = 0b000_100_000;
+// Not used as it indicated in each event where a connection is connected, not
+// just the first time a connection is established.
+// Also see https://github.com/piscisaureus/wepoll/commit/8b7b340610f88af3d83f40fb728e7b850b090ece.
+pub const POLL_CONNECT: u32 = 0b001_000_000;
+pub const POLL_ACCEPT: u32 = 0b010_000_000;
+pub const POLL_CONNECT_FAIL: u32 = 0b100_000_000;
+
+pub const KNOWN_EVENTS: u32 = POLL_RECEIVE
+    | POLL_RECEIVE_EXPEDITED
+    | POLL_SEND
+    | POLL_DISCONNECT
+    | POLL_ABORT
+    | POLL_LOCAL_CLOSE
+    | POLL_ACCEPT
+    | POLL_CONNECT_FAIL;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/awakener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/awakener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/awakener.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/awakener.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-use std::sync::Mutex;
-
-use miow::iocp::CompletionStatus;
-use {io, poll, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use sys::windows::Selector;
-
-pub struct Awakener {
-    inner: Mutex<Option<AwakenerInner>>,
-}
-
-struct AwakenerInner {
-    token: Token,
-    selector: Selector,
-}
-
-impl Awakener {
-    pub fn new() -> io::Result<Awakener> {
-        Ok(Awakener {
-            inner: Mutex::new(None),
-        })
-    }
-
-    pub fn wakeup(&self) -> io::Result<()> {
-        // Each wakeup notification has NULL as its `OVERLAPPED` pointer to
-        // indicate that it's from this awakener and not part of an I/O
-        // operation. This is specially recognized by the selector.
-        //
-        // If we haven't been registered with an event loop yet just silently
-        // succeed.
-        if let Some(inner) = self.inner.lock().unwrap().as_ref() {
-            let status = CompletionStatus::new(0,
-                                               usize::from(inner.token),
-                                               0 as *mut _);
-            inner.selector.port().post(status)?;
-        }
-        Ok(())
-    }
-
-    pub fn cleanup(&self) {
-        // noop
-    }
-}
-
-impl Evented for Awakener {
-    fn register(&self, poll: &Poll, token: Token, events: Ready,
-                opts: PollOpt) -> io::Result<()> {
-        assert_eq!(opts, PollOpt::edge());
-        assert_eq!(events, Ready::readable());
-        *self.inner.lock().unwrap() = Some(AwakenerInner {
-            selector: poll::selector(poll).clone_ref(),
-            token: token,
-        });
-        Ok(())
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, events: Ready,
-                  opts: PollOpt) -> io::Result<()> {
-        self.register(poll, token, events, opts)
-    }
-
-    fn deregister(&self, _poll: &Poll) -> io::Result<()> {
-        *self.inner.lock().unwrap() = None;
-        Ok(())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/buffer_pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/buffer_pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/buffer_pool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/buffer_pool.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-pub struct BufferPool {
-    pool: Vec<Vec<u8>>,
-}
-
-impl BufferPool {
-    pub fn new(cap: usize) -> BufferPool {
-        BufferPool { pool: Vec::with_capacity(cap) }
-    }
-
-    pub fn get(&mut self, default_cap: usize) -> Vec<u8> {
-        self.pool.pop().unwrap_or_else(|| Vec::with_capacity(default_cap))
-    }
-
-    pub fn put(&mut self, mut buf: Vec<u8>) {
-        if self.pool.len() < self.pool.capacity(){
-            unsafe { buf.set_len(0); }
-            self.pool.push(buf);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/event.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/event.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/event.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/event.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,162 @@
+use std::fmt;
+
+use miow::iocp::CompletionStatus;
+
+use super::afd;
+use crate::Token;
+
+#[derive(Clone)]
+pub struct Event {
+    pub flags: u32,
+    pub data: u64,
+}
+
+pub fn token(event: &Event) -> Token {
+    Token(event.data as usize)
+}
+
+impl Event {
+    pub(super) fn new(token: Token) -> Event {
+        Event {
+            flags: 0,
+            data: usize::from(token) as u64,
+        }
+    }
+
+    pub(super) fn set_readable(&mut self) {
+        self.flags |= afd::POLL_RECEIVE
+    }
+
+    #[cfg(feature = "os-ext")]
+    pub(super) fn set_writable(&mut self) {
+        self.flags |= afd::POLL_SEND;
+    }
+
+    pub(super) fn from_completion_status(status: &CompletionStatus) -> Event {
+        Event {
+            flags: status.bytes_transferred(),
+            data: status.token() as u64,
+        }
+    }
+
+    pub(super) fn to_completion_status(&self) -> CompletionStatus {
+        CompletionStatus::new(self.flags, self.data as usize, std::ptr::null_mut())
+    }
+}
+
+pub(crate) const READABLE_FLAGS: u32 = afd::POLL_RECEIVE
+    | afd::POLL_DISCONNECT
+    | afd::POLL_ACCEPT
+    | afd::POLL_ABORT
+    | afd::POLL_CONNECT_FAIL;
+pub(crate) const WRITABLE_FLAGS: u32 = afd::POLL_SEND | afd::POLL_ABORT | afd::POLL_CONNECT_FAIL;
+pub(crate) const ERROR_FLAGS: u32 = afd::POLL_CONNECT_FAIL;
+pub(crate) const READ_CLOSED_FLAGS: u32 =
+    afd::POLL_DISCONNECT | afd::POLL_ABORT | afd::POLL_CONNECT_FAIL;
+pub(crate) const WRITE_CLOSED_FLAGS: u32 = afd::POLL_ABORT | afd::POLL_CONNECT_FAIL;
+
+pub fn is_readable(event: &Event) -> bool {
+    event.flags & READABLE_FLAGS != 0
+}
+
+pub fn is_writable(event: &Event) -> bool {
+    event.flags & WRITABLE_FLAGS != 0
+}
+
+pub fn is_error(event: &Event) -> bool {
+    event.flags & ERROR_FLAGS != 0
+}
+
+pub fn is_read_closed(event: &Event) -> bool {
+    event.flags & READ_CLOSED_FLAGS != 0
+}
+
+pub fn is_write_closed(event: &Event) -> bool {
+    event.flags & WRITE_CLOSED_FLAGS != 0
+}
+
+pub fn is_priority(event: &Event) -> bool {
+    event.flags & afd::POLL_RECEIVE_EXPEDITED != 0
+}
+
+pub fn is_aio(_: &Event) -> bool {
+    // Not supported.
+    false
+}
+
+pub fn is_lio(_: &Event) -> bool {
+    // Not supported.
+    false
+}
+
+pub fn debug_details(f: &mut fmt::Formatter<'_>, event: &Event) -> fmt::Result {
+    #[allow(clippy::trivially_copy_pass_by_ref)]
+    fn check_flags(got: &u32, want: &u32) -> bool {
+        (got & want) != 0
+    }
+    debug_detail!(
+        FlagsDetails(u32),
+        check_flags,
+        afd::POLL_RECEIVE,
+        afd::POLL_RECEIVE_EXPEDITED,
+        afd::POLL_SEND,
+        afd::POLL_DISCONNECT,
+        afd::POLL_ABORT,
+        afd::POLL_LOCAL_CLOSE,
+        afd::POLL_CONNECT,
+        afd::POLL_ACCEPT,
+        afd::POLL_CONNECT_FAIL,
+    );
+
+    f.debug_struct("event")
+        .field("flags", &FlagsDetails(event.flags))
+        .field("data", &event.data)
+        .finish()
+}
+
+pub struct Events {
+    /// Raw I/O event completions are filled in here by the call to `get_many`
+    /// on the completion port above. These are then processed to run callbacks
+    /// which figure out what to do after the event is done.
+    pub statuses: Box<[CompletionStatus]>,
+
+    /// Literal events returned by `get` to the upwards `EventLoop`. This file
+    /// doesn't really modify this (except for the waker), instead almost all
+    /// events are filled in by the `ReadinessQueue` from the `poll` module.
+    pub events: Vec<Event>,
+}
+
+impl Events {
+    pub fn with_capacity(cap: usize) -> Events {
+        // Note that it's possible for the output `events` to grow beyond the
+        // capacity as it can also include deferred events, but that's certainly
+        // not the end of the world!
+        Events {
+            statuses: vec![CompletionStatus::zero(); cap].into_boxed_slice(),
+            events: Vec::with_capacity(cap),
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.events.is_empty()
+    }
+
+    pub fn capacity(&self) -> usize {
+        self.events.capacity()
+    }
+
+    pub fn len(&self) -> usize {
+        self.events.len()
+    }
+
+    pub fn get(&self, idx: usize) -> Option<&Event> {
+        self.events.get(idx)
+    }
+
+    pub fn clear(&mut self) {
+        self.events.clear();
+        for status in self.statuses.iter_mut() {
+            *status = CompletionStatus::zero();
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/from_raw_arc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/from_raw_arc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/from_raw_arc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/from_raw_arc.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-//! A "Manual Arc" which allows manually frobbing the reference count
-//!
-//! This module contains a copy of the `Arc` found in the standard library,
-//! stripped down to the bare bones of what we actually need. The reason this is
-//! done is for the ability to concretely know the memory layout of the `Inner`
-//! structure of the arc pointer itself (e.g. `ArcInner` in the standard
-//! library).
-//!
-//! We do some unsafe casting from `*mut OVERLAPPED` to a `FromRawArc<T>` to
-//! ensure that data lives for the length of an I/O operation, but this means
-//! that we have to know the layouts of the structures involved. This
-//! representation primarily guarantees that the data, `T` is at the front of
-//! the inner pointer always.
-//!
-//! Note that we're missing out on some various optimizations implemented in the
-//! standard library:
-//!
-//! * The size of `FromRawArc` is actually two words because of the drop flag
-//! * The compiler doesn't understand that the pointer in `FromRawArc` is never
-//!   null, so Option<FromRawArc<T>> is not a nullable pointer.
-
-use std::ops::Deref;
-use std::mem;
-use std::sync::atomic::{self, AtomicUsize, Ordering};
-
-pub struct FromRawArc<T> {
-    _inner: *mut Inner<T>,
-}
-
-unsafe impl<T: Sync + Send> Send for FromRawArc<T> { }
-unsafe impl<T: Sync + Send> Sync for FromRawArc<T> { }
-
-#[repr(C)]
-struct Inner<T> {
-    data: T,
-    cnt: AtomicUsize,
-}
-
-impl<T> FromRawArc<T> {
-    pub fn new(data: T) -> FromRawArc<T> {
-        let x = Box::new(Inner {
-            data: data,
-            cnt: AtomicUsize::new(1),
-        });
-        FromRawArc { _inner: unsafe { mem::transmute(x) } }
-    }
-
-    pub unsafe fn from_raw(ptr: *mut T) -> FromRawArc<T> {
-        // Note that if we could use `mem::transmute` here to get a libstd Arc
-        // (guaranteed) then we could just use std::sync::Arc, but this is the
-        // crucial reason this currently exists.
-        FromRawArc { _inner: ptr as *mut Inner<T> }
-    }
-}
-
-impl<T> Clone for FromRawArc<T> {
-    fn clone(&self) -> FromRawArc<T> {
-        // Atomic ordering of Relaxed lifted from libstd, but the general idea
-        // is that you need synchronization to communicate this increment to
-        // another thread, so this itself doesn't need to be synchronized.
-        unsafe {
-            (*self._inner).cnt.fetch_add(1, Ordering::Relaxed);
-        }
-        FromRawArc { _inner: self._inner }
-    }
-}
-
-impl<T> Deref for FromRawArc<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        unsafe { &(*self._inner).data }
-    }
-}
-
-impl<T> Drop for FromRawArc<T> {
-    fn drop(&mut self) {
-        unsafe {
-            // Atomic orderings lifted from the standard library
-            if (*self._inner).cnt.fetch_sub(1, Ordering::Release) != 1 {
-                return
-            }
-            atomic::fence(Ordering::Acquire);
-            drop(mem::transmute::<_, Box<T>>(self._inner));
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromRawArc;
-
-    #[test]
-    fn smoke() {
-        let a = FromRawArc::new(1);
-        assert_eq!(*a, 1);
-        assert_eq!(*a.clone(), 1);
-    }
-
-    #[test]
-    fn drops() {
-        struct A<'a>(&'a mut bool);
-        impl<'a> Drop for A<'a> {
-            fn drop(&mut self) {
-                *self.0 = true;
-            }
-        }
-        let mut a = false;
-        {
-            let a = FromRawArc::new(A(&mut a));
-            let _ = a.clone();
-            assert!(!*a.0);
-        }
-        assert!(a);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/io_status_block.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/io_status_block.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/io_status_block.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/io_status_block.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+use std::fmt;
+use std::ops::{Deref, DerefMut};
+
+use ntapi::ntioapi::IO_STATUS_BLOCK;
+
+pub struct IoStatusBlock(IO_STATUS_BLOCK);
+
+cfg_io_source! {
+    use ntapi::ntioapi::IO_STATUS_BLOCK_u;
+
+    impl IoStatusBlock {
+        pub fn zeroed() -> Self {
+            Self(IO_STATUS_BLOCK {
+                u: IO_STATUS_BLOCK_u { Status: 0 },
+                Information: 0,
+            })
+        }
+    }
+}
+
+unsafe impl Send for IoStatusBlock {}
+
+impl Deref for IoStatusBlock {
+    type Target = IO_STATUS_BLOCK;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for IoStatusBlock {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl fmt::Debug for IoStatusBlock {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("IoStatusBlock").finish()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,187 +1,145 @@
-//! Implementation of mio for Windows using IOCP
-//!
-//! This module uses I/O Completion Ports (IOCP) on Windows to implement mio's
-//! Unix epoll-like interface. Unfortunately these two I/O models are
-//! fundamentally incompatible:
-//!
-//! * IOCP is a completion-based model where work is submitted to the kernel and
-//!   a program is notified later when the work finished.
-//! * epoll is a readiness-based model where the kernel is queried as to what
-//!   work can be done, and afterwards the work is done.
-//!
-//! As a result, this implementation for Windows is much less "low level" than
-//! the Unix implementation of mio. This design decision was intentional,
-//! however.
-//!
-//! ## What is IOCP?
-//!
-//! The [official docs][docs] have a comprehensive explanation of what IOCP is,
-//! but at a high level it requires the following operations to be executed to
-//! perform some I/O:
-//!
-//! 1. A completion port is created
-//! 2. An I/O handle and a token is registered with this completion port
-//! 3. Some I/O is issued on the handle. This generally means that an API was
-//!    invoked with a zeroed `OVERLAPPED` structure. The API will immediately
-//!    return.
-//! 4. After some time, the application queries the I/O port for completed
-//!    events. The port will returned a pointer to the `OVERLAPPED` along with
-//!    the token presented at registration time.
-//!
-//! Many I/O operations can be fired off before waiting on a port, and the port
-//! will block execution of the calling thread until an I/O event has completed
-//! (or a timeout has elapsed).
-//!
-//! Currently all of these low-level operations are housed in a separate `miow`
-//! crate to provide a 0-cost abstraction over IOCP. This crate uses that to
-//! implement all fiddly bits so there's very few actual Windows API calls or
-//! `unsafe` blocks as a result.
-//!
-//! [docs]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365198%28v=vs.85%29.aspx
-//!
-//! ## Safety of IOCP
-//!
-//! Unfortunately for us, IOCP is pretty unsafe in terms of Rust lifetimes and
-//! such. When an I/O operation is submitted to the kernel, it involves handing
-//! the kernel a few pointers like a buffer to read/write, an `OVERLAPPED`
-//! structure pointer, and perhaps some other buffers such as for socket
-//! addresses. These pointers all have to remain valid **for the entire I/O
-//! operation's duration**.
-//!
-//! There's no way to define a safe lifetime for these pointers/buffers over
-//! the span of an I/O operation, so we're forced to add a layer of abstraction
-//! (not 0-cost) to make these APIs safe. Currently this implementation
-//! basically just boxes everything up on the heap to give it a stable address
-//! and then keys off that most of the time.
-//!
-//! ## From completion to readiness
-//!
-//! Translating a completion-based model to a readiness-based model is also no
-//! easy task, and a significant portion of this implementation is managing this
-//! translation. The basic idea behind this implementation is to issue I/O
-//! operations preemptively and then translate their completions to a "I'm
-//! ready" event.
-//!
-//! For example, in the case of reading a `TcpSocket`, as soon as a socket is
-//! connected (or registered after an accept) a read operation is executed.
-//! While the read is in progress calls to `read` will return `WouldBlock`, and
-//! once the read is completed we translate the completion notification into a
-//! `readable` event. Once the internal buffer is drained (e.g. all data from it
-//! has been read) a read operation is re-issued.
-//!
-//! Write operations are a little different from reads, and the current
-//! implementation is to just schedule a write as soon as `write` is first
-//! called. While that write operation is in progress all future calls to
-//! `write` will return `WouldBlock`. Completion of the write then translates to
-//! a `writable` event. Note that this will probably want to add some layer of
-//! internal buffering in the future.
-//!
-//! ## Buffer Management
-//!
-//! As there's lots of I/O operations in flight at any one point in time,
-//! there's lots of live buffers that need to be juggled around (e.g. this
-//! implementation's own internal buffers).
-//!
-//! Currently all buffers are created for the I/O operation at hand and are then
-//! discarded when it completes (this is listed as future work below).
-//!
-//! ## Callback Management
-//!
-//! When the main event loop receives a notification that an I/O operation has
-//! completed, some work needs to be done to translate that to a set of events
-//! or perhaps some more I/O needs to be scheduled. For example after a
-//! `TcpStream` is connected it generates a writable event and also schedules a
-//! read.
-//!
-//! To manage all this the `Selector` uses the `OVERLAPPED` pointer from the
-//! completion status. The selector assumes that all `OVERLAPPED` pointers are
-//! actually pointers to the interior of a `selector::Overlapped` which means
-//! that right after the `OVERLAPPED` itself there's a function pointer. This
-//! function pointer is given the completion status as well as another callback
-//! to push events onto the selector.
-//!
-//! The callback for each I/O operation doesn't have any environment, so it
-//! relies on memory layout and unsafe casting to translate an `OVERLAPPED`
-//! pointer (or in this case a `selector::Overlapped` pointer) to a type of
-//! `FromRawArc<T>` (see module docs for why this type exists).
-//!
-//! ## Thread Safety
-//!
-//! Currently all of the I/O primitives make liberal use of `Arc` and `Mutex`
-//! as an implementation detail. The main reason for this is to ensure that the
-//! types are `Send` and `Sync`, but the implementations have not been stressed
-//! in multithreaded situations yet. As a result, there are bound to be
-//! functional surprises in using these concurrently.
-//!
-//! ## Future Work
-//!
-//! First up, let's take a look at unimplemented portions of this module:
-//!
-//! * The `PollOpt::level()` option is currently entirely unimplemented.
-//! * Each `EventLoop` currently owns its completion port, but this prevents an
-//!   I/O handle from being added to multiple event loops (something that can be
-//!   done on Unix). Additionally, it hinders event loops moving across threads.
-//!   This should be solved by likely having a global `Selector` which all
-//!   others then communicate with.
-//! * Although Unix sockets don't exist on Windows, there are named pipes and
-//!   those should likely be bound here in a similar fashion to `TcpStream`.
-//!
-//! Next up, there are a few performance improvements and optimizations that can
-//! still be implemented
-//!
-//! * Buffer management right now is pretty bad, they're all just allocated
-//!   right before an I/O operation and discarded right after. There should at
-//!   least be some form of buffering buffers.
-//! * No calls to `write` are internally buffered before being scheduled, which
-//!   means that writing performance is abysmal compared to Unix. There should
-//!   be some level of buffering of writes probably.
+mod afd;
+mod io_status_block;
 
-use std::io;
-use std::os::windows::prelude::*;
+pub mod event;
+pub use event::{Event, Events};
 
-use kernel32;
-use winapi;
-
-mod awakener;
-#[macro_use]
 mod selector;
-mod tcp;
-mod udp;
-mod from_raw_arc;
-mod buffer_pool;
-
-pub use self::awakener::Awakener;
-pub use self::selector::{Events, Selector, Overlapped, Binding};
-pub use self::tcp::{TcpStream, TcpListener};
-pub use self::udp::UdpSocket;
-
-#[derive(Copy, Clone)]
-enum Family {
-    V4, V6,
-}
+pub use selector::{Selector, SelectorInner, SockState};
 
-unsafe fn cancel(socket: &AsRawSocket,
-                 overlapped: &Overlapped) -> io::Result<()> {
-    let handle = socket.as_raw_socket() as winapi::HANDLE;
-    let ret = kernel32::CancelIoEx(handle, overlapped.as_mut_ptr());
-    if ret == 0 {
-        Err(io::Error::last_os_error())
-    } else {
-        Ok(())
+mod overlapped;
+use overlapped::Overlapped;
+
+// Macros must be defined before the modules that use them
+cfg_net! {
+    /// Helper macro to execute a system call that returns an `io::Result`.
+    //
+    // Macro must be defined before any modules that uses them.
+    macro_rules! syscall {
+        ($fn: ident ( $($arg: expr),* $(,)* ), $err_test: path, $err_value: expr) => {{
+            let res = unsafe { $fn($($arg, )*) };
+            if $err_test(&res, &$err_value) {
+                Err(io::Error::last_os_error())
+            } else {
+                Ok(res)
+            }
+        }};
     }
+
+    mod net;
+
+    pub(crate) mod tcp;
+    pub(crate) mod udp;
+}
+
+cfg_os_ext! {
+    pub(crate) mod named_pipe;
 }
 
-unsafe fn no_notify_on_instant_completion(handle: winapi::HANDLE) -> io::Result<()> {
-    // TODO: move those to winapi
-    const FILE_SKIP_COMPLETION_PORT_ON_SUCCESS: winapi::UCHAR = 1;
-    const FILE_SKIP_SET_EVENT_ON_HANDLE: winapi::UCHAR = 2;
-
-    let flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE;
-
-    let r = kernel32::SetFileCompletionNotificationModes(handle, flags);
-    if r == winapi::TRUE {
-        Ok(())
-    } else {
-        Err(io::Error::last_os_error())
+mod waker;
+pub(crate) use waker::Waker;
+
+cfg_io_source! {
+    use std::io;
+    use std::os::windows::io::RawSocket;
+    use std::pin::Pin;
+    use std::sync::{Arc, Mutex};
+
+    use crate::{poll, Interest, Registry, Token};
+
+    struct InternalState {
+        selector: Arc<SelectorInner>,
+        token: Token,
+        interests: Interest,
+        sock_state: Pin<Arc<Mutex<SockState>>>,
+    }
+
+    impl Drop for InternalState {
+        fn drop(&mut self) {
+            let mut sock_state = self.sock_state.lock().unwrap();
+            sock_state.mark_delete();
+        }
+    }
+
+    pub struct IoSourceState {
+        // This is `None` if the socket has not yet been registered.
+        //
+        // We box the internal state to not increase the size on the stack as the
+        // type might move around a lot.
+        inner: Option<Box<InternalState>>,
+    }
+
+    impl IoSourceState {
+        pub fn new() -> IoSourceState {
+            IoSourceState { inner: None }
+        }
+
+        pub fn do_io<T, F, R>(&self, f: F, io: &T) -> io::Result<R>
+        where
+            F: FnOnce(&T) -> io::Result<R>,
+        {
+            let result = f(io);
+            if let Err(ref e) = result {
+                if e.kind() == io::ErrorKind::WouldBlock {
+                    self.inner.as_ref().map_or(Ok(()), |state| {
+                        state
+                            .selector
+                            .reregister(state.sock_state.clone(), state.token, state.interests)
+                    })?;
+                }
+            }
+            result
+        }
+
+        pub fn register(
+            &mut self,
+            registry: &Registry,
+            token: Token,
+            interests: Interest,
+            socket: RawSocket,
+        ) -> io::Result<()> {
+            if self.inner.is_some() {
+                Err(io::ErrorKind::AlreadyExists.into())
+            } else {
+                poll::selector(registry)
+                    .register(socket, token, interests)
+                    .map(|state| {
+                        self.inner = Some(Box::new(state));
+                    })
+            }
+        }
+
+        pub fn reregister(
+            &mut self,
+            registry: &Registry,
+            token: Token,
+            interests: Interest,
+        ) -> io::Result<()> {
+            match self.inner.as_mut() {
+                Some(state) => {
+                    poll::selector(registry)
+                        .reregister(state.sock_state.clone(), token, interests)
+                        .map(|()| {
+                            state.token = token;
+                            state.interests = interests;
+                        })
+                }
+                None => Err(io::ErrorKind::NotFound.into()),
+            }
+        }
+
+        pub fn deregister(&mut self) -> io::Result<()> {
+            match self.inner.as_mut() {
+                Some(state) => {
+                    {
+                        let mut sock_state = state.sock_state.lock().unwrap();
+                        sock_state.mark_delete();
+                    }
+                    self.inner = None;
+                    Ok(())
+                }
+                None => Err(io::ErrorKind::NotFound.into()),
+            }
+        }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/named_pipe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/named_pipe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/named_pipe.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/named_pipe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,770 @@
+use crate::event::Source;
+use crate::sys::windows::{Event, Overlapped};
+use crate::{poll, Registry};
+use winapi::um::minwinbase::OVERLAPPED_ENTRY;
+
+use std::ffi::OsStr;
+use std::fmt;
+use std::io::{self, Read, Write};
+use std::mem;
+use std::os::windows::io::{AsRawHandle, FromRawHandle, IntoRawHandle, RawHandle};
+use std::slice;
+use std::sync::atomic::Ordering::{Relaxed, SeqCst};
+use std::sync::atomic::{AtomicBool, AtomicUsize};
+use std::sync::{Arc, Mutex};
+
+use crate::{Interest, Token};
+use miow::iocp::{CompletionPort, CompletionStatus};
+use miow::pipe;
+use winapi::shared::winerror::{ERROR_BROKEN_PIPE, ERROR_PIPE_LISTENING};
+use winapi::um::ioapiset::CancelIoEx;
+
+/// # Safety
+///
+/// Only valid if the strict is annotated with `#[repr(C)]`. This is only used
+/// with `Overlapped` and `Inner`, which are correctly annotated.
+macro_rules! offset_of {
+    ($t:ty, $($field:ident).+) => (
+        &(*(0 as *const $t)).$($field).+ as *const _ as usize
+    )
+}
+
+macro_rules! overlapped2arc {
+    ($e:expr, $t:ty, $($field:ident).+) => ({
+        let offset = offset_of!($t, $($field).+);
+        debug_assert!(offset < mem::size_of::<$t>());
+        Arc::from_raw(($e as usize - offset) as *mut $t)
+    })
+}
+
+/// Non-blocking windows named pipe.
+///
+/// This structure internally contains a `HANDLE` which represents the named
+/// pipe, and also maintains state associated with the mio event loop and active
+/// I/O operations that have been scheduled to translate IOCP to a readiness
+/// model.
+///
+/// Note, IOCP is a *completion* based model whereas mio is a *readiness* based
+/// model. To bridge this, `NamedPipe` performs internal buffering. Writes are
+/// written to an internal buffer and the buffer is submitted to IOCP. IOCP
+/// reads are submitted using internal buffers and `NamedPipe::read` reads from
+/// this internal buffer.
+///
+/// # Trait implementations
+///
+/// The `Read` and `Write` traits are implemented for `NamedPipe` and for
+/// `&NamedPipe`. This represents that a named pipe can be concurrently read and
+/// written to and also can be read and written to at all. Typically a named
+/// pipe needs to be connected to a client before it can be read or written,
+/// however.
+///
+/// Note that for I/O operations on a named pipe to succeed then the named pipe
+/// needs to be associated with an event loop. Until this happens all I/O
+/// operations will return a "would block" error.
+///
+/// # Managing connections
+///
+/// The `NamedPipe` type supports a `connect` method to connect to a client and
+/// a `disconnect` method to disconnect from that client. These two methods only
+/// work once a named pipe is associated with an event loop.
+///
+/// The `connect` method will succeed asynchronously and a completion can be
+/// detected once the object receives a writable notification.
+///
+/// # Named pipe clients
+///
+/// Currently to create a client of a named pipe server then you can use the
+/// `OpenOptions` type in the standard library to create a `File` that connects
+/// to a named pipe. Afterwards you can use the `into_raw_handle` method coupled
+/// with the `NamedPipe::from_raw_handle` method to convert that to a named pipe
+/// that can operate asynchronously. Don't forget to pass the
+/// `FILE_FLAG_OVERLAPPED` flag when opening the `File`.
+pub struct NamedPipe {
+    inner: Arc<Inner>,
+}
+
+#[repr(C)]
+struct Inner {
+    handle: pipe::NamedPipe,
+
+    connect: Overlapped,
+    connecting: AtomicBool,
+
+    read: Overlapped,
+    write: Overlapped,
+
+    io: Mutex<Io>,
+
+    pool: Mutex<BufferPool>,
+}
+
+struct Io {
+    // Uniquely identifies the selector associated with this named pipe
+    cp: Option<Arc<CompletionPort>>,
+    // Token used to identify events
+    token: Option<Token>,
+    read: State,
+    read_interest: bool,
+    write: State,
+    write_interest: bool,
+    connect_error: Option<io::Error>,
+}
+
+#[derive(Debug)]
+enum State {
+    None,
+    Pending(Vec<u8>, usize),
+    Ok(Vec<u8>, usize),
+    Err(io::Error),
+}
+
+// Odd tokens are for named pipes
+static NEXT_TOKEN: AtomicUsize = AtomicUsize::new(1);
+
+fn would_block() -> io::Error {
+    io::ErrorKind::WouldBlock.into()
+}
+
+impl NamedPipe {
+    /// Creates a new named pipe at the specified `addr` given a "reasonable
+    /// set" of initial configuration options.
+    pub fn new<A: AsRef<OsStr>>(addr: A) -> io::Result<NamedPipe> {
+        let pipe = pipe::NamedPipe::new(addr)?;
+        // Safety: nothing actually unsafe about this. The trait fn includes
+        // `unsafe`.
+        Ok(unsafe { NamedPipe::from_raw_handle(pipe.into_raw_handle()) })
+    }
+
+    /// Attempts to call `ConnectNamedPipe`, if possible.
+    ///
+    /// This function will attempt to connect this pipe to a client in an
+    /// asynchronous fashion. If the function immediately establishes a
+    /// connection to a client then `Ok(())` is returned. Otherwise if a
+    /// connection attempt was issued and is now in progress then a "would
+    /// block" error is returned.
+    ///
+    /// When the connection is finished then this object will be flagged as
+    /// being ready for a write, or otherwise in the writable state.
+    ///
+    /// # Errors
+    ///
+    /// This function will return a "would block" error if the pipe has not yet
+    /// been registered with an event loop, if the connection operation has
+    /// previously been issued but has not yet completed, or if the connect
+    /// itself was issued and didn't finish immediately.
+    ///
+    /// Normal I/O errors from the call to `ConnectNamedPipe` are returned
+    /// immediately.
+    pub fn connect(&self) -> io::Result<()> {
+        // "Acquire the connecting lock" or otherwise just make sure we're the
+        // only operation that's using the `connect` overlapped instance.
+        if self.inner.connecting.swap(true, SeqCst) {
+            return Err(would_block());
+        }
+
+        // Now that we've flagged ourselves in the connecting state, issue the
+        // connection attempt. Afterwards interpret the return value and set
+        // internal state accordingly.
+        let res = unsafe {
+            let overlapped = self.inner.connect.as_ptr() as *mut _;
+            self.inner.handle.connect_overlapped(overlapped)
+        };
+
+        match res {
+            // The connection operation finished immediately, so let's schedule
+            // reads/writes and such.
+            Ok(true) => {
+                self.inner.connecting.store(false, SeqCst);
+                Inner::post_register(&self.inner, None);
+                Ok(())
+            }
+
+            // If the overlapped operation was successful and didn't finish
+            // immediately then we forget a copy of the arc we hold
+            // internally. This ensures that when the completion status comes
+            // in for the I/O operation finishing it'll have a reference
+            // associated with it and our data will still be valid. The
+            // `connect_done` function will "reify" this forgotten pointer to
+            // drop the refcount on the other side.
+            Ok(false) => {
+                mem::forget(self.inner.clone());
+                Err(would_block())
+            }
+
+            Err(e) => {
+                self.inner.connecting.store(false, SeqCst);
+                Err(e)
+            }
+        }
+    }
+
+    /// Takes any internal error that has happened after the last I/O operation
+    /// which hasn't been retrieved yet.
+    ///
+    /// This is particularly useful when detecting failed attempts to `connect`.
+    /// After a completed `connect` flags this pipe as writable then callers
+    /// must invoke this method to determine whether the connection actually
+    /// succeeded. If this function returns `None` then a client is connected,
+    /// otherwise it returns an error of what happened and a client shouldn't be
+    /// connected.
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        Ok(self.inner.io.lock().unwrap().connect_error.take())
+    }
+
+    /// Disconnects this named pipe from a connected client.
+    ///
+    /// This function will disconnect the pipe from a connected client, if any,
+    /// transitively calling the `DisconnectNamedPipe` function.
+    ///
+    /// After a `disconnect` is issued, then a `connect` may be called again to
+    /// connect to another client.
+    pub fn disconnect(&self) -> io::Result<()> {
+        self.inner.handle.disconnect()
+    }
+}
+
+impl FromRawHandle for NamedPipe {
+    unsafe fn from_raw_handle(handle: RawHandle) -> NamedPipe {
+        NamedPipe {
+            inner: Arc::new(Inner {
+                // Safety: not really unsafe
+                handle: pipe::NamedPipe::from_raw_handle(handle),
+                // transmutes to straddle winapi versions (mio 0.6 is on an
+                // older winapi)
+                connect: Overlapped::new(connect_done),
+                connecting: AtomicBool::new(false),
+                read: Overlapped::new(read_done),
+                write: Overlapped::new(write_done),
+                io: Mutex::new(Io {
+                    cp: None,
+                    token: None,
+                    read: State::None,
+                    read_interest: false,
+                    write: State::None,
+                    write_interest: false,
+                    connect_error: None,
+                }),
+                pool: Mutex::new(BufferPool::with_capacity(2)),
+            }),
+        }
+    }
+}
+
+impl Read for NamedPipe {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        <&NamedPipe as Read>::read(&mut &*self, buf)
+    }
+}
+
+impl Write for NamedPipe {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        <&NamedPipe as Write>::write(&mut &*self, buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        <&NamedPipe as Write>::flush(&mut &*self)
+    }
+}
+
+impl<'a> Read for &'a NamedPipe {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let mut state = self.inner.io.lock().unwrap();
+
+        if state.token.is_none() {
+            return Err(would_block());
+        }
+
+        match mem::replace(&mut state.read, State::None) {
+            // In theory not possible with `token` checked above,
+            // but return would block for now.
+            State::None => Err(would_block()),
+
+            // A read is in flight, still waiting for it to finish
+            State::Pending(buf, amt) => {
+                state.read = State::Pending(buf, amt);
+                Err(would_block())
+            }
+
+            // We previously read something into `data`, try to copy out some
+            // data. If we copy out all the data schedule a new read and
+            // otherwise store the buffer to get read later.
+            State::Ok(data, cur) => {
+                let n = {
+                    let mut remaining = &data[cur..];
+                    remaining.read(buf)?
+                };
+                let next = cur + n;
+                if next != data.len() {
+                    state.read = State::Ok(data, next);
+                } else {
+                    self.inner.put_buffer(data);
+                    Inner::schedule_read(&self.inner, &mut state, None);
+                }
+                Ok(n)
+            }
+
+            // Looks like an in-flight read hit an error, return that here while
+            // we schedule a new one.
+            State::Err(e) => {
+                Inner::schedule_read(&self.inner, &mut state, None);
+                if e.raw_os_error() == Some(ERROR_BROKEN_PIPE as i32) {
+                    Ok(0)
+                } else {
+                    Err(e)
+                }
+            }
+        }
+    }
+}
+
+impl<'a> Write for &'a NamedPipe {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        // Make sure there's no writes pending
+        let mut io = self.inner.io.lock().unwrap();
+
+        if io.token.is_none() {
+            return Err(would_block());
+        }
+
+        match io.write {
+            State::None => {}
+            State::Err(_) => match mem::replace(&mut io.write, State::None) {
+                State::Err(e) => return Err(e),
+                // `io` is locked, so this branch is unreachable
+                _ => unreachable!(),
+            },
+            // any other state should be handled in `write_done`
+            _ => {
+                return Err(would_block());
+            }
+        }
+
+        // Move `buf` onto the heap and fire off the write
+        let mut owned_buf = self.inner.get_buffer();
+        owned_buf.extend(buf);
+        match Inner::maybe_schedule_write(&self.inner, owned_buf, 0, &mut io)? {
+            // Some bytes are written immediately
+            Some(n) => Ok(n),
+            // Write operation is anqueued for whole buffer
+            None => Ok(buf.len()),
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl Source for NamedPipe {
+    fn register(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interest: Interest,
+    ) -> io::Result<()> {
+        let mut io = self.inner.io.lock().unwrap();
+
+        io.check_association(registry, false)?;
+
+        if io.token.is_some() {
+            return Err(io::Error::new(
+                io::ErrorKind::AlreadyExists,
+                "I/O source already registered with a `Registry`",
+            ));
+        }
+
+        if io.cp.is_none() {
+            io.cp = Some(poll::selector(registry).clone_port());
+
+            let inner_token = NEXT_TOKEN.fetch_add(2, Relaxed) + 2;
+            poll::selector(registry)
+                .inner
+                .cp
+                .add_handle(inner_token, &self.inner.handle)?;
+        }
+
+        io.token = Some(token);
+        io.read_interest = interest.is_readable();
+        io.write_interest = interest.is_writable();
+        drop(io);
+
+        Inner::post_register(&self.inner, None);
+
+        Ok(())
+    }
+
+    fn reregister(
+        &mut self,
+        registry: &Registry,
+        token: Token,
+        interest: Interest,
+    ) -> io::Result<()> {
+        let mut io = self.inner.io.lock().unwrap();
+
+        io.check_association(registry, true)?;
+
+        io.token = Some(token);
+        io.read_interest = interest.is_readable();
+        io.write_interest = interest.is_writable();
+        drop(io);
+
+        Inner::post_register(&self.inner, None);
+
+        Ok(())
+    }
+
+    fn deregister(&mut self, registry: &Registry) -> io::Result<()> {
+        let mut io = self.inner.io.lock().unwrap();
+
+        io.check_association(registry, true)?;
+
+        if io.token.is_none() {
+            return Err(io::Error::new(
+                io::ErrorKind::NotFound,
+                "I/O source not registered with `Registry`",
+            ));
+        }
+
+        io.token = None;
+        Ok(())
+    }
+}
+
+impl AsRawHandle for NamedPipe {
+    fn as_raw_handle(&self) -> RawHandle {
+        self.inner.handle.as_raw_handle()
+    }
+}
+
+impl fmt::Debug for NamedPipe {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.handle.fmt(f)
+    }
+}
+
+impl Drop for NamedPipe {
+    fn drop(&mut self) {
+        // Cancel pending reads/connects, but don't cancel writes to ensure that
+        // everything is flushed out.
+        unsafe {
+            if self.inner.connecting.load(SeqCst) {
+                drop(cancel(&self.inner.handle, &self.inner.connect));
+            }
+
+            let io = self.inner.io.lock().unwrap();
+
+            match io.read {
+                State::Pending(..) => {
+                    drop(cancel(&self.inner.handle, &self.inner.read));
+                }
+                _ => {}
+            }
+        }
+    }
+}
+
+impl Inner {
+    /// Schedules a read to happen in the background, executing an overlapped
+    /// operation.
+    ///
+    /// This function returns `true` if a normal error happens or if the read
+    /// is scheduled in the background. If the pipe is no longer connected
+    /// (ERROR_PIPE_LISTENING) then `false` is returned and no read is
+    /// scheduled.
+    fn schedule_read(me: &Arc<Inner>, io: &mut Io, events: Option<&mut Vec<Event>>) -> bool {
+        // Check to see if a read is already scheduled/completed
+        match io.read {
+            State::None => {}
+            _ => return true,
+        }
+
+        // Allocate a buffer and schedule the read.
+        let mut buf = me.get_buffer();
+        let e = unsafe {
+            let overlapped = me.read.as_ptr() as *mut _;
+            let slice = slice::from_raw_parts_mut(buf.as_mut_ptr(), buf.capacity());
+            me.handle.read_overlapped(slice, overlapped)
+        };
+
+        match e {
+            // See `NamedPipe::connect` above for the rationale behind `forget`
+            Ok(_) => {
+                io.read = State::Pending(buf, 0); // 0 is ignored on read side
+                mem::forget(me.clone());
+                true
+            }
+
+            // If ERROR_PIPE_LISTENING happens then it's not a real read error,
+            // we just need to wait for a connect.
+            Err(ref e) if e.raw_os_error() == Some(ERROR_PIPE_LISTENING as i32) => false,
+
+            // If some other error happened, though, we're now readable to give
+            // out the error.
+            Err(e) => {
+                io.read = State::Err(e);
+                io.notify_readable(events);
+                true
+            }
+        }
+    }
+
+    /// Maybe schedules overlapped write operation.
+    ///
+    /// * `None` means that overlapped operation was enqueued
+    /// * `Some(n)` means that `n` bytes was immediately written.
+    ///   Note, that `write_done` will fire anyway to clean up the state.
+    fn maybe_schedule_write(
+        me: &Arc<Inner>,
+        buf: Vec<u8>,
+        pos: usize,
+        io: &mut Io,
+    ) -> io::Result<Option<usize>> {
+        // Very similar to `schedule_read` above, just done for the write half.
+        let e = unsafe {
+            let overlapped = me.write.as_ptr() as *mut _;
+            me.handle.write_overlapped(&buf[pos..], overlapped)
+        };
+
+        // See `connect` above for the rationale behind `forget`
+        match e {
+            // `n` bytes are written immediately
+            Ok(Some(n)) => {
+                io.write = State::Ok(buf, pos);
+                mem::forget(me.clone());
+                Ok(Some(n))
+            }
+            // write operation is enqueued
+            Ok(None) => {
+                io.write = State::Pending(buf, pos);
+                mem::forget(me.clone());
+                Ok(None)
+            }
+            Err(e) => Err(e),
+        }
+    }
+
+    fn schedule_write(
+        me: &Arc<Inner>,
+        buf: Vec<u8>,
+        pos: usize,
+        io: &mut Io,
+        events: Option<&mut Vec<Event>>,
+    ) {
+        match Inner::maybe_schedule_write(me, buf, pos, io) {
+            Ok(Some(_)) => {
+                // immediate result will be handled in `write_done`,
+                // so we'll reinterpret the `Ok` state
+                let state = mem::replace(&mut io.write, State::None);
+                io.write = match state {
+                    State::Ok(buf, pos) => State::Pending(buf, pos),
+                    // io is locked, so this branch is unreachable
+                    _ => unreachable!(),
+                };
+                mem::forget(me.clone());
+            }
+            Ok(None) => (),
+            Err(e) => {
+                io.write = State::Err(e);
+                io.notify_writable(events);
+            }
+        }
+    }
+
+    fn post_register(me: &Arc<Inner>, mut events: Option<&mut Vec<Event>>) {
+        let mut io = me.io.lock().unwrap();
+        if Inner::schedule_read(&me, &mut io, events.as_mut().map(|ptr| &mut **ptr)) {
+            if let State::None = io.write {
+                io.notify_writable(events);
+            }
+        }
+    }
+
+    fn get_buffer(&self) -> Vec<u8> {
+        self.pool.lock().unwrap().get(4 * 1024)
+    }
+
+    fn put_buffer(&self, buf: Vec<u8>) {
+        self.pool.lock().unwrap().put(buf)
+    }
+}
+
+unsafe fn cancel<T: AsRawHandle>(handle: &T, overlapped: &Overlapped) -> io::Result<()> {
+    let ret = CancelIoEx(handle.as_raw_handle(), overlapped.as_ptr() as *mut _);
+    // `CancelIoEx` returns 0 on error:
+    // https://docs.microsoft.com/en-us/windows/win32/fileio/cancelioex-func
+    if ret == 0 {
+        Err(io::Error::last_os_error())
+    } else {
+        Ok(())
+    }
+}
+
+fn connect_done(status: &OVERLAPPED_ENTRY, events: Option<&mut Vec<Event>>) {
+    let status = CompletionStatus::from_entry(status);
+
+    // Acquire the `Arc<Inner>`. Note that we should be guaranteed that
+    // the refcount is available to us due to the `mem::forget` in
+    // `connect` above.
+    let me = unsafe { overlapped2arc!(status.overlapped(), Inner, connect) };
+
+    // Flag ourselves as no longer using the `connect` overlapped instances.
+    let prev = me.connecting.swap(false, SeqCst);
+    assert!(prev, "NamedPipe was not previously connecting");
+
+    // Stash away our connect error if one happened
+    debug_assert_eq!(status.bytes_transferred(), 0);
+    unsafe {
+        match me.handle.result(status.overlapped()) {
+            Ok(n) => debug_assert_eq!(n, 0),
+            Err(e) => me.io.lock().unwrap().connect_error = Some(e),
+        }
+    }
+
+    // We essentially just finished a registration, so kick off a
+    // read and register write readiness.
+    Inner::post_register(&me, events);
+}
+
+fn read_done(status: &OVERLAPPED_ENTRY, events: Option<&mut Vec<Event>>) {
+    let status = CompletionStatus::from_entry(status);
+
+    // Acquire the `FromRawArc<Inner>`. Note that we should be guaranteed that
+    // the refcount is available to us due to the `mem::forget` in
+    // `schedule_read` above.
+    let me = unsafe { overlapped2arc!(status.overlapped(), Inner, read) };
+
+    // Move from the `Pending` to `Ok` state.
+    let mut io = me.io.lock().unwrap();
+    let mut buf = match mem::replace(&mut io.read, State::None) {
+        State::Pending(buf, _) => buf,
+        _ => unreachable!(),
+    };
+    unsafe {
+        match me.handle.result(status.overlapped()) {
+            Ok(n) => {
+                debug_assert_eq!(status.bytes_transferred() as usize, n);
+                buf.set_len(status.bytes_transferred() as usize);
+                io.read = State::Ok(buf, 0);
+            }
+            Err(e) => {
+                debug_assert_eq!(status.bytes_transferred(), 0);
+                io.read = State::Err(e);
+            }
+        }
+    }
+
+    // Flag our readiness that we've got data.
+    io.notify_readable(events);
+}
+
+fn write_done(status: &OVERLAPPED_ENTRY, events: Option<&mut Vec<Event>>) {
+    let status = CompletionStatus::from_entry(status);
+
+    // Acquire the `Arc<Inner>`. Note that we should be guaranteed that
+    // the refcount is available to us due to the `mem::forget` in
+    // `schedule_write` above.
+    let me = unsafe { overlapped2arc!(status.overlapped(), Inner, write) };
+
+    // Make the state change out of `Pending`. If we wrote the entire buffer
+    // then we're writable again and otherwise we schedule another write.
+    let mut io = me.io.lock().unwrap();
+    let (buf, pos) = match mem::replace(&mut io.write, State::None) {
+        // `Ok` here means, that the operation was completed immediately
+        // `bytes_transferred` is already reported to a client
+        State::Ok(..) => {
+            io.notify_writable(events);
+            return;
+        }
+        State::Pending(buf, pos) => (buf, pos),
+        _ => unreachable!(),
+    };
+
+    unsafe {
+        match me.handle.result(status.overlapped()) {
+            Ok(n) => {
+                debug_assert_eq!(status.bytes_transferred() as usize, n);
+                let new_pos = pos + (status.bytes_transferred() as usize);
+                if new_pos == buf.len() {
+                    me.put_buffer(buf);
+                    io.notify_writable(events);
+                } else {
+                    Inner::schedule_write(&me, buf, new_pos, &mut io, events);
+                }
+            }
+            Err(e) => {
+                debug_assert_eq!(status.bytes_transferred(), 0);
+                io.write = State::Err(e);
+                io.notify_writable(events);
+            }
+        }
+    }
+}
+
+impl Io {
+    fn check_association(&self, registry: &Registry, required: bool) -> io::Result<()> {
+        match self.cp {
+            Some(ref cp) if !poll::selector(registry).same_port(cp) => Err(io::Error::new(
+                io::ErrorKind::AlreadyExists,
+                "I/O source already registered with a different `Registry`",
+            )),
+            None if required => Err(io::Error::new(
+                io::ErrorKind::NotFound,
+                "I/O source not registered with `Registry`",
+            )),
+            _ => Ok(()),
+        }
+    }
+
+    fn notify_readable(&self, events: Option<&mut Vec<Event>>) {
+        if let Some(token) = self.token {
+            let mut ev = Event::new(token);
+            ev.set_readable();
+
+            if let Some(events) = events {
+                events.push(ev);
+            } else {
+                let _ = self.cp.as_ref().unwrap().post(ev.to_completion_status());
+            }
+        }
+    }
+
+    fn notify_writable(&self, events: Option<&mut Vec<Event>>) {
+        if let Some(token) = self.token {
+            let mut ev = Event::new(token);
+            ev.set_writable();
+
+            if let Some(events) = events {
+                events.push(ev);
+            } else {
+                let _ = self.cp.as_ref().unwrap().post(ev.to_completion_status());
+            }
+        }
+    }
+}
+
+struct BufferPool {
+    pool: Vec<Vec<u8>>,
+}
+
+impl BufferPool {
+    fn with_capacity(cap: usize) -> BufferPool {
+        BufferPool {
+            pool: Vec::with_capacity(cap),
+        }
+    }
+
+    fn get(&mut self, default_cap: usize) -> Vec<u8> {
+        self.pool
+            .pop()
+            .unwrap_or_else(|| Vec::with_capacity(default_cap))
+    }
+
+    fn put(&mut self, mut buf: Vec<u8>) {
+        if self.pool.len() < self.pool.capacity() {
+            unsafe {
+                buf.set_len(0);
+            }
+            self.pool.push(buf);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/net.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/net.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/net.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/net.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,108 @@
+use std::io;
+use std::mem;
+use std::net::SocketAddr;
+use std::sync::Once;
+
+use winapi::ctypes::c_int;
+use winapi::shared::inaddr::{in_addr_S_un, IN_ADDR};
+use winapi::shared::in6addr::{in6_addr_u, IN6_ADDR};
+use winapi::shared::ws2def::{AF_INET, AF_INET6, ADDRESS_FAMILY, SOCKADDR, SOCKADDR_IN};
+use winapi::shared::ws2ipdef::{SOCKADDR_IN6_LH, SOCKADDR_IN6_LH_u};
+use winapi::um::winsock2::{ioctlsocket, socket, FIONBIO, INVALID_SOCKET, SOCKET};
+
+/// Initialise the network stack for Windows.
+pub(crate) fn init() {
+    static INIT: Once = Once::new();
+    INIT.call_once(|| {
+        // Let standard library call `WSAStartup` for us, we can't do it
+        // ourselves because otherwise using any type in `std::net` would panic
+        // when it tries to call `WSAStartup` a second time.
+        drop(std::net::UdpSocket::bind("127.0.0.1:0"));
+    });
+}
+
+/// Create a new non-blocking socket.
+pub(crate) fn new_ip_socket(addr: SocketAddr, socket_type: c_int) -> io::Result<SOCKET> {
+    use winapi::um::winsock2::{PF_INET, PF_INET6};
+
+    let domain = match addr {
+        SocketAddr::V4(..) => PF_INET,
+        SocketAddr::V6(..) => PF_INET6,
+    };
+
+    new_socket(domain, socket_type)
+}
+
+pub(crate) fn new_socket(domain: c_int, socket_type: c_int) -> io::Result<SOCKET> {
+    syscall!(
+        socket(domain, socket_type, 0),
+        PartialEq::eq,
+        INVALID_SOCKET
+    )
+    .and_then(|socket| {
+        syscall!(ioctlsocket(socket, FIONBIO, &mut 1), PartialEq::ne, 0).map(|_| socket as SOCKET)
+    })
+}
+
+/// A type with the same memory layout as `SOCKADDR`. Used in converting Rust level
+/// SocketAddr* types into their system representation. The benefit of this specific
+/// type over using `SOCKADDR_STORAGE` is that this type is exactly as large as it
+/// needs to be and not a lot larger. And it can be initialized cleaner from Rust.
+#[repr(C)]
+pub(crate) union SocketAddrCRepr {
+    v4: SOCKADDR_IN,
+    v6: SOCKADDR_IN6_LH,
+}
+
+impl SocketAddrCRepr {
+    pub(crate) fn as_ptr(&self) -> *const SOCKADDR {
+        self as *const _ as *const SOCKADDR
+    }
+}
+
+pub(crate) fn socket_addr(addr: &SocketAddr) -> (SocketAddrCRepr, c_int) {
+    match addr {
+        SocketAddr::V4(ref addr) => {
+            // `s_addr` is stored as BE on all machine and the array is in BE order.
+            // So the native endian conversion method is used so that it's never swapped.
+            let sin_addr = unsafe {
+                let mut s_un = mem::zeroed::<in_addr_S_un>();
+                *s_un.S_addr_mut() = u32::from_ne_bytes(addr.ip().octets());
+                IN_ADDR { S_un: s_un }
+            };
+
+            let sockaddr_in = SOCKADDR_IN {
+                sin_family: AF_INET as ADDRESS_FAMILY,
+                sin_port: addr.port().to_be(),
+                sin_addr,
+                sin_zero: [0; 8],
+            };
+
+            let sockaddr = SocketAddrCRepr { v4: sockaddr_in };
+            (sockaddr, mem::size_of::<SOCKADDR_IN>() as c_int)
+        },
+        SocketAddr::V6(ref addr) => {
+            let sin6_addr = unsafe {
+                let mut u = mem::zeroed::<in6_addr_u>();
+                *u.Byte_mut() = addr.ip().octets();
+                IN6_ADDR { u }
+            };
+            let u = unsafe {
+                let mut u = mem::zeroed::<SOCKADDR_IN6_LH_u>();
+                *u.sin6_scope_id_mut() = addr.scope_id();
+                u
+            };
+
+            let sockaddr_in6 = SOCKADDR_IN6_LH {
+                sin6_family: AF_INET6 as ADDRESS_FAMILY,
+                sin6_port: addr.port().to_be(),
+                sin6_addr,
+                sin6_flowinfo: addr.flowinfo(),
+                u,
+            };
+
+            let sockaddr = SocketAddrCRepr { v6: sockaddr_in6 };
+            (sockaddr, mem::size_of::<SOCKADDR_IN6_LH>() as c_int)
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/overlapped.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/overlapped.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/overlapped.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/overlapped.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,37 @@
+use crate::sys::windows::Event;
+
+use std::cell::UnsafeCell;
+use std::fmt;
+
+#[cfg(feature = "os-ext")]
+use winapi::um::minwinbase::OVERLAPPED;
+use winapi::um::minwinbase::OVERLAPPED_ENTRY;
+
+#[repr(C)]
+pub(crate) struct Overlapped {
+    inner: UnsafeCell<miow::Overlapped>,
+    pub(crate) callback: fn(&OVERLAPPED_ENTRY, Option<&mut Vec<Event>>),
+}
+
+#[cfg(feature = "os-ext")]
+impl Overlapped {
+    pub(crate) fn new(cb: fn(&OVERLAPPED_ENTRY, Option<&mut Vec<Event>>)) -> Overlapped {
+        Overlapped {
+            inner: UnsafeCell::new(miow::Overlapped::zero()),
+            callback: cb,
+        }
+    }
+
+    pub(crate) fn as_ptr(&self) -> *const OVERLAPPED {
+        unsafe { (*self.inner.get()).raw() }
+    }
+}
+
+impl fmt::Debug for Overlapped {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Overlapped").finish()
+    }
+}
+
+unsafe impl Send for Overlapped {}
+unsafe impl Sync for Overlapped {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/selector.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/selector.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/selector.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/selector.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,534 +1,752 @@
-#![allow(deprecated)]
+use super::afd::{self, Afd, AfdPollInfo};
+use super::io_status_block::IoStatusBlock;
+use super::Event;
+use crate::sys::Events;
+
+cfg_net! {
+    use crate::sys::event::{
+        ERROR_FLAGS, READABLE_FLAGS, READ_CLOSED_FLAGS, WRITABLE_FLAGS, WRITE_CLOSED_FLAGS,
+    };
+    use crate::Interest;
+}
 
-use std::{fmt, io};
-use std::cell::UnsafeCell;
-use std::os::windows::prelude::*;
+use miow::iocp::{CompletionPort, CompletionStatus};
+use std::collections::VecDeque;
+use std::io;
+use std::marker::PhantomPinned;
+use std::os::windows::io::RawSocket;
+use std::pin::Pin;
+#[cfg(debug_assertions)]
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
 use std::time::Duration;
+use winapi::shared::ntdef::NT_SUCCESS;
+use winapi::shared::ntdef::{HANDLE, PVOID};
+use winapi::shared::ntstatus::STATUS_CANCELLED;
+use winapi::shared::winerror::{ERROR_INVALID_HANDLE, ERROR_IO_PENDING, WAIT_TIMEOUT};
+use winapi::um::minwinbase::OVERLAPPED;
 
-use lazycell::AtomicLazyCell;
-
-use winapi::*;
-use miow;
-use miow::iocp::{CompletionPort, CompletionStatus};
-
-use event_imp::{Event, Evented, Ready};
-use poll::{self, Poll};
-use sys::windows::buffer_pool::BufferPool;
-use {Token, PollOpt};
+#[derive(Debug)]
+struct AfdGroup {
+    cp: Arc<CompletionPort>,
+    afd_group: Mutex<Vec<Arc<Afd>>>,
+}
 
-/// Each Selector has a globally unique(ish) ID associated with it. This ID
-/// gets tracked by `TcpStream`, `TcpListener`, etc... when they are first
-/// registered with the `Selector`. If a type that is previously associated with
-/// a `Selector` attempts to register itself with a different `Selector`, the
-/// operation will return with an error. This matches windows behavior.
-static NEXT_ID: AtomicUsize = ATOMIC_USIZE_INIT;
+impl AfdGroup {
+    pub fn new(cp: Arc<CompletionPort>) -> AfdGroup {
+        AfdGroup {
+            afd_group: Mutex::new(Vec::new()),
+            cp,
+        }
+    }
 
-/// The guts of the Windows event loop, this is the struct which actually owns
-/// a completion port.
-///
-/// Internally this is just an `Arc`, and this allows handing out references to
-/// the internals to I/O handles registered on this selector. This is
-/// required to schedule I/O operations independently of being inside the event
-/// loop (e.g. when a call to `write` is seen we're not "in the event loop").
-pub struct Selector {
-    inner: Arc<SelectorInner>,
+    pub fn release_unused_afd(&self) {
+        let mut afd_group = self.afd_group.lock().unwrap();
+        afd_group.retain(|g| Arc::strong_count(&g) > 1);
+    }
 }
 
-struct SelectorInner {
-    /// Unique identifier of the `Selector`
-    id: usize,
+cfg_io_source! {
+    const POLL_GROUP__MAX_GROUP_SIZE: usize = 32;
 
-    /// The actual completion port that's used to manage all I/O
-    port: CompletionPort,
+    impl AfdGroup {
+        pub fn acquire(&self) -> io::Result<Arc<Afd>> {
+            let mut afd_group = self.afd_group.lock().unwrap();
+            if afd_group.len() == 0 {
+                self._alloc_afd_group(&mut afd_group)?;
+            } else {
+                // + 1 reference in Vec
+                if Arc::strong_count(afd_group.last().unwrap()) >= POLL_GROUP__MAX_GROUP_SIZE + 1 {
+                    self._alloc_afd_group(&mut afd_group)?;
+                }
+            }
 
-    /// A pool of buffers usable by this selector.
-    ///
-    /// Primitives will take buffers from this pool to perform I/O operations,
-    /// and once complete they'll be put back in.
-    buffers: Mutex<BufferPool>,
+            match afd_group.last() {
+                Some(arc) => Ok(arc.clone()),
+                None => unreachable!(
+                    "Cannot acquire afd, {:#?}, afd_group: {:#?}",
+                    self, afd_group
+                ),
+            }
+        }
+
+        fn _alloc_afd_group(&self, afd_group: &mut Vec<Arc<Afd>>) -> io::Result<()> {
+            let afd = Afd::new(&self.cp)?;
+            let arc = Arc::new(afd);
+            afd_group.push(arc);
+            Ok(())
+        }
+    }
 }
 
-impl Selector {
-    pub fn new() -> io::Result<Selector> {
-        // offset by 1 to avoid choosing 0 as the id of a selector
-        let id = NEXT_ID.fetch_add(1, Ordering::Relaxed) + 1;
+#[derive(Debug)]
+enum SockPollStatus {
+    Idle,
+    Pending,
+    Cancelled,
+}
 
-        CompletionPort::new(0).map(|cp| {
-            Selector {
-                inner: Arc::new(SelectorInner {
-                    id: id,
-                    port: cp,
-                    buffers: Mutex::new(BufferPool::new(256)),
-                }),
+#[derive(Debug)]
+pub struct SockState {
+    iosb: IoStatusBlock,
+    poll_info: AfdPollInfo,
+    afd: Arc<Afd>,
+
+    raw_socket: RawSocket,
+    base_socket: RawSocket,
+
+    user_evts: u32,
+    pending_evts: u32,
+
+    user_data: u64,
+
+    poll_status: SockPollStatus,
+    delete_pending: bool,
+
+    // last raw os error
+    error: Option<i32>,
+
+    pinned: PhantomPinned,
+}
+
+impl SockState {
+    fn update(&mut self, self_arc: &Pin<Arc<Mutex<SockState>>>) -> io::Result<()> {
+        assert!(!self.delete_pending);
+
+        // make sure to reset previous error before a new update
+        self.error = None;
+
+        if let SockPollStatus::Pending = self.poll_status {
+            if (self.user_evts & afd::KNOWN_EVENTS & !self.pending_evts) == 0 {
+                /* All the events the user is interested in are already being monitored by
+                 * the pending poll operation. It might spuriously complete because of an
+                 * event that we're no longer interested in; when that happens we'll submit
+                 * a new poll operation with the updated event mask. */
+            } else {
+                /* A poll operation is already pending, but it's not monitoring for all the
+                 * events that the user is interested in. Therefore, cancel the pending
+                 * poll operation; when we receive it's completion package, a new poll
+                 * operation will be submitted with the correct event mask. */
+                if let Err(e) = self.cancel() {
+                    self.error = e.raw_os_error();
+                    return Err(e);
+                }
+                return Ok(());
+            }
+        } else if let SockPollStatus::Cancelled = self.poll_status {
+            /* The poll operation has already been cancelled, we're still waiting for
+             * it to return. For now, there's nothing that needs to be done. */
+        } else if let SockPollStatus::Idle = self.poll_status {
+            /* No poll operation is pending; start one. */
+            self.poll_info.exclusive = 0;
+            self.poll_info.number_of_handles = 1;
+            *unsafe { self.poll_info.timeout.QuadPart_mut() } = std::i64::MAX;
+            self.poll_info.handles[0].handle = self.base_socket as HANDLE;
+            self.poll_info.handles[0].status = 0;
+            self.poll_info.handles[0].events = self.user_evts | afd::POLL_LOCAL_CLOSE;
+
+            // Increase the ref count as the memory will be used by the kernel.
+            let overlapped_ptr = into_overlapped(self_arc.clone());
+
+            let result = unsafe {
+                self.afd
+                    .poll(&mut self.poll_info, &mut *self.iosb, overlapped_ptr)
+            };
+            if let Err(e) = result {
+                let code = e.raw_os_error().unwrap();
+                if code == ERROR_IO_PENDING as i32 {
+                    /* Overlapped poll operation in progress; this is expected. */
+                } else {
+                    // Since the operation failed it means the kernel won't be
+                    // using the memory any more.
+                    drop(from_overlapped(overlapped_ptr as *mut _));
+                    if code == ERROR_INVALID_HANDLE as i32 {
+                        /* Socket closed; it'll be dropped. */
+                        self.mark_delete();
+                        return Ok(());
+                    } else {
+                        self.error = e.raw_os_error();
+                        return Err(e);
+                    }
+                }
             }
-        })
-    }
 
-    pub fn select(&self,
-                  events: &mut Events,
-                  awakener: Token,
-                  timeout: Option<Duration>) -> io::Result<bool> {
-        trace!("select; timeout={:?}", timeout);
+            self.poll_status = SockPollStatus::Pending;
+            self.pending_evts = self.user_evts;
+        } else {
+            unreachable!("Invalid poll status during update, {:#?}", self)
+        }
 
-        // Clear out the previous list of I/O events and get some more!
-        events.clear();
+        Ok(())
+    }
 
-        trace!("polling IOCP");
-        let n = match self.inner.port.get_many(&mut events.statuses, timeout) {
-            Ok(statuses) => statuses.len(),
-            Err(ref e) if e.raw_os_error() == Some(WAIT_TIMEOUT as i32) => 0,
-            Err(e) => return Err(e),
+    fn cancel(&mut self) -> io::Result<()> {
+        match self.poll_status {
+            SockPollStatus::Pending => {}
+            _ => unreachable!("Invalid poll status during cancel, {:#?}", self),
         };
+        unsafe {
+            self.afd.cancel(&mut *self.iosb)?;
+        }
+        self.poll_status = SockPollStatus::Cancelled;
+        self.pending_evts = 0;
+        Ok(())
+    }
 
-        let mut ret = false;
-        for status in events.statuses[..n].iter() {
-            // This should only ever happen from the awakener, and we should
-            // only ever have one awakener right now, so assert as such.
-            if status.overlapped() as usize == 0 {
-                assert_eq!(status.token(), usize::from(awakener));
-                ret = true;
-                continue;
+    // This is the function called from the overlapped using as Arc<Mutex<SockState>>. Watch out for reference counting.
+    fn feed_event(&mut self) -> Option<Event> {
+        self.poll_status = SockPollStatus::Idle;
+        self.pending_evts = 0;
+
+        let mut afd_events = 0;
+        // We use the status info in IO_STATUS_BLOCK to determine the socket poll status. It is unsafe to use a pointer of IO_STATUS_BLOCK.
+        unsafe {
+            if self.delete_pending {
+                return None;
+            } else if self.iosb.u.Status == STATUS_CANCELLED {
+                /* The poll request was cancelled by CancelIoEx. */
+            } else if !NT_SUCCESS(self.iosb.u.Status) {
+                /* The overlapped request itself failed in an unexpected way. */
+                afd_events = afd::POLL_CONNECT_FAIL;
+            } else if self.poll_info.number_of_handles < 1 {
+                /* This poll operation succeeded but didn't report any socket events. */
+            } else if self.poll_info.handles[0].events & afd::POLL_LOCAL_CLOSE != 0 {
+                /* The poll operation reported that the socket was closed. */
+                self.mark_delete();
+                return None;
+            } else {
+                afd_events = self.poll_info.handles[0].events;
             }
+        }
 
-            let callback = unsafe {
-                (*(status.overlapped() as *mut Overlapped)).callback
-            };
+        afd_events &= self.user_evts;
 
-            trace!("select; -> got overlapped");
-            callback(status.entry());
+        if afd_events == 0 {
+            return None;
         }
 
-        trace!("returning");
-        Ok(ret)
+        // In mio, we have to simulate Edge-triggered behavior to match API usage.
+        // The strategy here is to intercept all read/write from user that could cause WouldBlock usage,
+        // then reregister the socket to reset the interests.
+        self.user_evts &= !afd_events;
+
+        Some(Event {
+            data: self.user_data,
+            flags: afd_events,
+        })
     }
 
-    /// Gets a reference to the underlying `CompletionPort` structure.
-    pub fn port(&self) -> &CompletionPort {
-        &self.inner.port
+    pub fn is_pending_deletion(&self) -> bool {
+        self.delete_pending
+    }
+
+    pub fn mark_delete(&mut self) {
+        if !self.delete_pending {
+            if let SockPollStatus::Pending = self.poll_status {
+                drop(self.cancel());
+            }
+
+            self.delete_pending = true;
+        }
     }
 
-    /// Gets a new reference to this selector, although all underlying data
-    /// structures will refer to the same completion port.
-    pub fn clone_ref(&self) -> Selector {
-        Selector { inner: self.inner.clone() }
+    fn has_error(&self) -> bool {
+        self.error.is_some()
     }
+}
+
+cfg_io_source! {
+    impl SockState {
+        fn new(raw_socket: RawSocket, afd: Arc<Afd>) -> io::Result<SockState> {
+            Ok(SockState {
+                iosb: IoStatusBlock::zeroed(),
+                poll_info: AfdPollInfo::zeroed(),
+                afd,
+                raw_socket,
+                base_socket: get_base_socket(raw_socket)?,
+                user_evts: 0,
+                pending_evts: 0,
+                user_data: 0,
+                poll_status: SockPollStatus::Idle,
+                delete_pending: false,
+                error: None,
+                pinned: PhantomPinned,
+            })
+        }
+
+        /// True if need to be added on update queue, false otherwise.
+        fn set_event(&mut self, ev: Event) -> bool {
+            /* afd::POLL_CONNECT_FAIL and afd::POLL_ABORT are always reported, even when not requested by the caller. */
+            let events = ev.flags | afd::POLL_CONNECT_FAIL | afd::POLL_ABORT;
 
-    /// Return the `Selector`'s identifier
-    pub fn id(&self) -> usize {
-        self.inner.id
+            self.user_evts = events;
+            self.user_data = ev.data;
+
+            (events & !self.pending_evts) != 0
+        }
     }
 }
 
-impl SelectorInner {
-    fn identical(&self, other: &SelectorInner) -> bool {
-        (self as *const SelectorInner) == (other as *const SelectorInner)
+impl Drop for SockState {
+    fn drop(&mut self) {
+        self.mark_delete();
     }
 }
 
-// A registration is stored in each I/O object which keeps track of how it is
-// associated with a `Selector` above.
-//
-// Once associated with a `Selector`, a registration can never be un-associated
-// (due to IOCP requirements). This is actually implemented through the
-// `poll::Registration` and `poll::SetReadiness` APIs to keep track of all the
-// level/edge/filtering business.
-/// A `Binding` is embedded in all I/O objects associated with a `Poll`
-/// object.
-///
-/// Each registration keeps track of which selector the I/O object is
-/// associated with, ensuring that implementations of `Evented` can be
-/// conformant for the various methods on Windows.
+/// Converts the pointer to a `SockState` into a raw pointer.
+/// To revert see `from_overlapped`.
+fn into_overlapped(sock_state: Pin<Arc<Mutex<SockState>>>) -> PVOID {
+    let overlapped_ptr: *const Mutex<SockState> =
+        unsafe { Arc::into_raw(Pin::into_inner_unchecked(sock_state)) };
+    overlapped_ptr as *mut _
+}
+
+/// Convert a raw overlapped pointer into a reference to `SockState`.
+/// Reverts `into_overlapped`.
+fn from_overlapped(ptr: *mut OVERLAPPED) -> Pin<Arc<Mutex<SockState>>> {
+    let sock_ptr: *const Mutex<SockState> = ptr as *const _;
+    unsafe { Pin::new_unchecked(Arc::from_raw(sock_ptr)) }
+}
+
+/// Each Selector has a globally unique(ish) ID associated with it. This ID
+/// gets tracked by `TcpStream`, `TcpListener`, etc... when they are first
+/// registered with the `Selector`. If a type that is previously associated with
+/// a `Selector` attempts to register itself with a different `Selector`, the
+/// operation will return with an error. This matches windows behavior.
+#[cfg(debug_assertions)]
+static NEXT_ID: AtomicUsize = AtomicUsize::new(0);
+
+/// Windows implementaion of `sys::Selector`
 ///
-/// If you're working with custom IOCP-enabled objects then you'll want to
-/// ensure that one of these instances is stored in your object and used in the
-/// implementation of `Evented`.
+/// Edge-triggered event notification is simulated by resetting internal event flag of each socket state `SockState`
+/// and setting all events back by intercepting all requests that could cause `io::ErrorKind::WouldBlock` happening.
 ///
-/// For more information about how to use this see the `windows` module
-/// documentation in this crate.
-pub struct Binding {
-    selector: AtomicLazyCell<Arc<SelectorInner>>,
+/// This selector is currently only support socket due to `Afd` driver is winsock2 specific.
+#[derive(Debug)]
+pub struct Selector {
+    #[cfg(debug_assertions)]
+    id: usize,
+    pub(super) inner: Arc<SelectorInner>,
+    #[cfg(debug_assertions)]
+    has_waker: AtomicBool,
 }
 
-impl Binding {
-    /// Creates a new blank binding ready to be inserted into an I/O
-    /// object.
-    ///
-    /// Won't actually do anything until associated with a `Poll` loop.
-    pub fn new() -> Binding {
-        Binding { selector: AtomicLazyCell::new() }
+impl Selector {
+    pub fn new() -> io::Result<Selector> {
+        SelectorInner::new().map(|inner| {
+            #[cfg(debug_assertions)]
+            let id = NEXT_ID.fetch_add(1, Ordering::Relaxed) + 1;
+            Selector {
+                #[cfg(debug_assertions)]
+                id,
+                inner: Arc::new(inner),
+                #[cfg(debug_assertions)]
+                has_waker: AtomicBool::new(false),
+            }
+        })
     }
 
-    /// Registers a new handle with the `Poll` specified, also assigning the
-    /// `token` specified.
-    ///
-    /// This function is intended to be used as part of `Evented::register` for
-    /// custom IOCP objects. It will add the specified handle to the internal
-    /// IOCP object with the provided `token`. All future events generated by
-    /// the handled provided will be received by the `Poll`'s internal IOCP
-    /// object.
-    ///
-    /// # Unsafety
-    ///
-    /// This function is unsafe as the `Poll` instance has assumptions about
-    /// what the `OVERLAPPED` pointer used for each I/O operation looks like.
-    /// Specifically they must all be instances of the `Overlapped` type in
-    /// this crate. More information about this can be found on the
-    /// `windows` module in this crate.
-    pub unsafe fn register_handle(&self,
-                                  handle: &AsRawHandle,
-                                  token: Token,
-                                  poll: &Poll) -> io::Result<()> {
-        let selector = poll::selector(poll);
-
-        // Ignore errors, we'll see them on the next line.
-        drop(self.selector.fill(selector.inner.clone()));
-        self.check_same_selector(poll)?;
-
-        selector.inner.port.add_handle(usize::from(token), handle)
-    }
-
-    /// Same as `register_handle` but for sockets.
-    pub unsafe fn register_socket(&self,
-                                  handle: &AsRawSocket,
-                                  token: Token,
-                                  poll: &Poll) -> io::Result<()> {
-        let selector = poll::selector(poll);
-        drop(self.selector.fill(selector.inner.clone()));
-        self.check_same_selector(poll)?;
-        selector.inner.port.add_socket(usize::from(token), handle)
+    pub fn try_clone(&self) -> io::Result<Selector> {
+        Ok(Selector {
+            #[cfg(debug_assertions)]
+            id: self.id,
+            inner: Arc::clone(&self.inner),
+            #[cfg(debug_assertions)]
+            has_waker: AtomicBool::new(self.has_waker.load(Ordering::Acquire)),
+        })
     }
 
-    /// Reregisters the handle provided from the `Poll` provided.
-    ///
-    /// This is intended to be used as part of `Evented::reregister` but note
-    /// that this function does not currently reregister the provided handle
-    /// with the `poll` specified. IOCP has a special binding for changing the
-    /// token which has not yet been implemented. Instead this function should
-    /// be used to assert that the call to `reregister` happened on the same
-    /// `Poll` that was passed into to `register`.
-    ///
-    /// Eventually, though, the provided `handle` will be re-assigned to have
-    /// the token `token` on the given `poll` assuming that it's been
-    /// previously registered with it.
+    /// # Safety
     ///
-    /// # Unsafety
-    ///
-    /// This function is unsafe for similar reasons to `register`. That is,
-    /// there may be pending I/O events and such which aren't handled correctly.
-    pub unsafe fn reregister_handle(&self,
-                                    _handle: &AsRawHandle,
-                                    _token: Token,
-                                    poll: &Poll) -> io::Result<()> {
-        self.check_same_selector(poll)
-    }
-
-    /// Same as `reregister_handle`, but for sockets.
-    pub unsafe fn reregister_socket(&self,
-                                    _socket: &AsRawSocket,
-                                    _token: Token,
-                                    poll: &Poll) -> io::Result<()> {
-        self.check_same_selector(poll)
+    /// This requires a mutable reference to self because only a single thread
+    /// can poll IOCP at a time.
+    pub fn select(&mut self, events: &mut Events, timeout: Option<Duration>) -> io::Result<()> {
+        self.inner.select(events, timeout)
     }
 
-    /// Deregisters the handle provided from the `Poll` provided.
-    ///
-    /// This is intended to be used as part of `Evented::deregister` but note
-    /// that this function does not currently deregister the provided handle
-    /// from the `poll` specified. IOCP has a special binding for that which has
-    /// not yet been implemented. Instead this function should be used to assert
-    /// that the call to `deregister` happened on the same `Poll` that was
-    /// passed into to `register`.
-    ///
-    /// # Unsafety
-    ///
-    /// This function is unsafe for similar reasons to `register`. That is,
-    /// there may be pending I/O events and such which aren't handled correctly.
-    pub unsafe fn deregister_handle(&self,
-                                    _handle: &AsRawHandle,
-                                    poll: &Poll) -> io::Result<()> {
-        self.check_same_selector(poll)
+    #[cfg(debug_assertions)]
+    pub fn register_waker(&self) -> bool {
+        self.has_waker.swap(true, Ordering::AcqRel)
     }
 
-    /// Same as `deregister_handle`, but for sockets.
-    pub unsafe fn deregister_socket(&self,
-                                    _socket: &AsRawSocket,
-                                    poll: &Poll) -> io::Result<()> {
-        self.check_same_selector(poll)
+    pub(super) fn clone_port(&self) -> Arc<CompletionPort> {
+        self.inner.cp.clone()
     }
 
-    fn check_same_selector(&self, poll: &Poll) -> io::Result<()> {
-        let selector = poll::selector(poll);
-        match self.selector.borrow() {
-            Some(prev) if prev.identical(&selector.inner) => Ok(()),
-            Some(_) |
-            None => Err(other("socket already registered")),
-        }
+    #[cfg(feature = "os-ext")]
+    pub(super) fn same_port(&self, other: &Arc<CompletionPort>) -> bool {
+        Arc::ptr_eq(&self.inner.cp, other)
     }
 }
 
-impl fmt::Debug for Binding {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Binding")
-            .finish()
+cfg_io_source! {
+    use super::InternalState;
+    use crate::Token;
+
+    impl Selector {
+        pub(super) fn register(
+            &self,
+            socket: RawSocket,
+            token: Token,
+            interests: Interest,
+        ) -> io::Result<InternalState> {
+            SelectorInner::register(&self.inner, socket, token, interests)
+        }
+
+        pub(super) fn reregister(
+            &self,
+            state: Pin<Arc<Mutex<SockState>>>,
+            token: Token,
+            interests: Interest,
+        ) -> io::Result<()> {
+            self.inner.reregister(state, token, interests)
+        }
+
+        #[cfg(debug_assertions)]
+        pub fn id(&self) -> usize {
+            self.id
+        }
     }
 }
 
-/// Helper struct used for TCP and UDP which bundles a `binding` with a
-/// `SetReadiness` handle.
-pub struct ReadyBinding {
-    binding: Binding,
-    readiness: Option<poll::SetReadiness>,
+#[derive(Debug)]
+pub struct SelectorInner {
+    pub(super) cp: Arc<CompletionPort>,
+    update_queue: Mutex<VecDeque<Pin<Arc<Mutex<SockState>>>>>,
+    afd_group: AfdGroup,
+    is_polling: AtomicBool,
 }
 
-impl ReadyBinding {
-    /// Creates a new blank binding ready to be inserted into an I/O object.
-    ///
-    /// Won't actually do anything until associated with an `Selector` loop.
-    pub fn new() -> ReadyBinding {
-        ReadyBinding {
-            binding: Binding::new(),
-            readiness: None,
-        }
-    }
+// We have ensured thread safety by introducing lock manually.
+unsafe impl Sync for SelectorInner {}
 
-    /// Returns whether this binding has been associated with a selector
-    /// yet.
-    pub fn registered(&self) -> bool {
-        self.readiness.is_some()
-    }
+impl SelectorInner {
+    pub fn new() -> io::Result<SelectorInner> {
+        CompletionPort::new(0).map(|cp| {
+            let cp = Arc::new(cp);
+            let cp_afd = Arc::clone(&cp);
 
-    /// Acquires a buffer with at least `size` capacity.
-    ///
-    /// If associated with a selector, this will attempt to pull a buffer from
-    /// that buffer pool. If not associated with a selector, this will allocate
-    /// a fresh buffer.
-    pub fn get_buffer(&self, size: usize) -> Vec<u8> {
-        match self.binding.selector.borrow() {
-            Some(i) => i.buffers.lock().unwrap().get(size),
-            None => Vec::with_capacity(size),
-        }
+            SelectorInner {
+                cp,
+                update_queue: Mutex::new(VecDeque::new()),
+                afd_group: AfdGroup::new(cp_afd),
+                is_polling: AtomicBool::new(false),
+            }
+        })
     }
 
-    /// Returns a buffer to this binding.
+    /// # Safety
     ///
-    /// If associated with a selector, this will push the buffer back into the
-    /// selector's pool of buffers. Otherwise this will just drop the buffer.
-    pub fn put_buffer(&self, buf: Vec<u8>) {
-        if let Some(i) = self.binding.selector.borrow() {
-            i.buffers.lock().unwrap().put(buf);
-        }
-    }
+    /// May only be calling via `Selector::select`.
+    pub fn select(&self, events: &mut Events, timeout: Option<Duration>) -> io::Result<()> {
+        events.clear();
 
-    /// Sets the readiness of this I/O object to a particular `set`.
-    ///
-    /// This is later used to fill out and respond to requests to `poll`. Note
-    /// that this is all implemented through the `SetReadiness` structure in the
-    /// `poll` module.
-    pub fn set_readiness(&self, set: Ready) {
-        if let Some(ref i) = self.readiness {
-            trace!("set readiness to {:?}", set);
-            i.set_readiness(set).expect("event loop disappeared?");
+        if timeout.is_none() {
+            loop {
+                let len = self.select2(&mut events.statuses, &mut events.events, None)?;
+                if len == 0 {
+                    continue;
+                }
+                return Ok(());
+            }
+        } else {
+            self.select2(&mut events.statuses, &mut events.events, timeout)?;
+            return Ok(());
         }
     }
 
-    /// Queries what the current readiness of this I/O object is.
-    ///
-    /// This is what's being used to generate events returned by `poll`.
-    pub fn readiness(&self) -> Ready {
-        match self.readiness {
-            Some(ref i) => i.readiness(),
-            None => Ready::empty(),
+    pub fn select2(
+        &self,
+        statuses: &mut [CompletionStatus],
+        events: &mut Vec<Event>,
+        timeout: Option<Duration>,
+    ) -> io::Result<usize> {
+        assert_eq!(self.is_polling.swap(true, Ordering::AcqRel), false);
+
+        unsafe { self.update_sockets_events() }?;
+
+        let result = self.cp.get_many(statuses, timeout);
+
+        self.is_polling.store(false, Ordering::Relaxed);
+
+        match result {
+            Ok(iocp_events) => Ok(unsafe { self.feed_events(events, iocp_events) }),
+            Err(ref e) if e.raw_os_error() == Some(WAIT_TIMEOUT as i32) => Ok(0),
+            Err(e) => Err(e),
         }
     }
 
-    /// Implementation of the `Evented::register` function essentially.
-    ///
-    /// Returns an error if we're already registered with another event loop,
-    /// and otherwise just reassociates ourselves with the event loop to
-    /// possible change tokens.
-    pub fn register_socket(&mut self,
-                           socket: &AsRawSocket,
-                           poll: &Poll,
-                           token: Token,
-                           events: Ready,
-                           opts: PollOpt,
-                           registration: &Mutex<Option<poll::Registration>>)
-                           -> io::Result<()> {
-        trace!("register {:?} {:?}", token, events);
-        unsafe {
-            self.binding.register_socket(socket, token, poll)?;
+    unsafe fn update_sockets_events(&self) -> io::Result<()> {
+        let mut update_queue = self.update_queue.lock().unwrap();
+        for sock in update_queue.iter_mut() {
+            let mut sock_internal = sock.lock().unwrap();
+            if !sock_internal.is_pending_deletion() {
+                sock_internal.update(&sock)?;
+            }
         }
 
-        let (r, s) = poll::new_registration(poll, token, events, opts);
-        self.readiness = Some(s);
-        *registration.lock().unwrap() = Some(r);
+        // remove all sock which do not have error, they have afd op pending
+        update_queue.retain(|sock| sock.lock().unwrap().has_error());
+
+        self.afd_group.release_unused_afd();
         Ok(())
     }
 
-    /// Implementation of `Evented::reregister` function.
-    pub fn reregister_socket(&mut self,
-                             socket: &AsRawSocket,
-                             poll: &Poll,
-                             token: Token,
-                             events: Ready,
-                             opts: PollOpt,
-                             registration: &Mutex<Option<poll::Registration>>)
-                             -> io::Result<()> {
-        trace!("reregister {:?} {:?}", token, events);
-        unsafe {
-            self.binding.reregister_socket(socket, token, poll)?;
-        }
+    // It returns processed count of iocp_events rather than the events itself.
+    unsafe fn feed_events(
+        &self,
+        events: &mut Vec<Event>,
+        iocp_events: &[CompletionStatus],
+    ) -> usize {
+        let mut n = 0;
+        let mut update_queue = self.update_queue.lock().unwrap();
+        for iocp_event in iocp_events.iter() {
+            if iocp_event.overlapped().is_null() {
+                events.push(Event::from_completion_status(iocp_event));
+                n += 1;
+                continue;
+            } else if iocp_event.token() % 2 == 1 {
+                // Handle is a named pipe. This could be extended to be any non-AFD event.
+                let callback = (*(iocp_event.overlapped() as *mut super::Overlapped)).callback;
+
+                let len = events.len();
+                callback(iocp_event.entry(), Some(events));
+                n += events.len() - len;
+                continue;
+            }
 
-        registration.lock().unwrap()
-                    .as_mut().unwrap()
-                    .reregister(poll, token, events, opts)
-    }
+            let sock_state = from_overlapped(iocp_event.overlapped());
+            let mut sock_guard = sock_state.lock().unwrap();
+            match sock_guard.feed_event() {
+                Some(e) => {
+                    events.push(e);
+                    n += 1;
+                }
+                None => {}
+            }
 
-    /// Implementation of the `Evented::deregister` function.
-    ///
-    /// Doesn't allow registration with another event loop, just shuts down
-    /// readiness notifications and such.
-    pub fn deregister(&mut self,
-                      socket: &AsRawSocket,
-                      poll: &Poll,
-                      registration: &Mutex<Option<poll::Registration>>)
-                      -> io::Result<()> {
-        trace!("deregistering");
-        unsafe {
-            self.binding.deregister_socket(socket, poll)?;
+            if !sock_guard.is_pending_deletion() {
+                update_queue.push_back(sock_state.clone());
+            }
         }
-
-        registration.lock().unwrap()
-                    .as_ref().unwrap()
-                    .deregister(poll)
+        self.afd_group.release_unused_afd();
+        n
     }
 }
 
-fn other(s: &str) -> io::Error {
-    io::Error::new(io::ErrorKind::Other, s)
-}
+cfg_io_source! {
+    use std::mem::size_of;
+    use std::ptr::null_mut;
+    use winapi::um::mswsock;
+    use winapi::um::winsock2::WSAGetLastError;
+    use winapi::um::winsock2::{WSAIoctl, SOCKET_ERROR};
+
+    impl SelectorInner {
+        fn register(
+            this: &Arc<Self>,
+            socket: RawSocket,
+            token: Token,
+            interests: Interest,
+        ) -> io::Result<InternalState> {
+            let flags = interests_to_afd_flags(interests);
+
+            let sock = {
+                let sock = this._alloc_sock_for_rawsocket(socket)?;
+                let event = Event {
+                    flags,
+                    data: token.0 as u64,
+                };
+                sock.lock().unwrap().set_event(event);
+                sock
+            };
 
-#[derive(Debug)]
-pub struct Events {
-    /// Raw I/O event completions are filled in here by the call to `get_many`
-    /// on the completion port above. These are then processed to run callbacks
-    /// which figure out what to do after the event is done.
-    statuses: Box<[CompletionStatus]>,
+            let state = InternalState {
+                selector: this.clone(),
+                token,
+                interests,
+                sock_state: sock.clone(),
+            };
 
-    /// Literal events returned by `get` to the upwards `EventLoop`. This file
-    /// doesn't really modify this (except for the awakener), instead almost all
-    /// events are filled in by the `ReadinessQueue` from the `poll` module.
-    events: Vec<Event>,
-}
+            this.queue_state(sock);
+            unsafe { this.update_sockets_events_if_polling()? };
 
-impl Events {
-    pub fn with_capacity(cap: usize) -> Events {
-        // Note that it's possible for the output `events` to grow beyond the
-        // capacity as it can also include deferred events, but that's certainly
-        // not the end of the world!
-        Events {
-            statuses: vec![CompletionStatus::zero(); cap].into_boxed_slice(),
-            events: Vec::with_capacity(cap),
+            Ok(state)
         }
-    }
 
-    pub fn is_empty(&self) -> bool {
-        self.events.is_empty()
-    }
+        // Directly accessed in `IoSourceState::do_io`.
+        pub(super) fn reregister(
+            &self,
+            state: Pin<Arc<Mutex<SockState>>>,
+            token: Token,
+            interests: Interest,
+        ) -> io::Result<()> {
+            {
+                let event = Event {
+                    flags: interests_to_afd_flags(interests),
+                    data: token.0 as u64,
+                };
 
-    pub fn len(&self) -> usize {
-        self.events.len()
-    }
+                state.lock().unwrap().set_event(event);
+            }
 
-    pub fn capacity(&self) -> usize {
-        self.events.capacity()
-    }
+            // FIXME: a sock which has_error true should not be re-added to
+            // the update queue because it's already there.
+            self.queue_state(state);
+            unsafe { self.update_sockets_events_if_polling() }
+        }
+
+        /// This function is called by register() and reregister() to start an
+        /// IOCTL_AFD_POLL operation corresponding to the registered events, but
+        /// only if necessary.
+        ///
+        /// Since it is not possible to modify or synchronously cancel an AFD_POLL
+        /// operation, and there can be only one active AFD_POLL operation per
+        /// (socket, completion port) pair at any time, it is expensive to change
+        /// a socket's event registration after it has been submitted to the kernel.
+        ///
+        /// Therefore, if no other threads are polling when interest in a socket
+        /// event is (re)registered, the socket is added to the 'update queue', but
+        /// the actual syscall to start the IOCTL_AFD_POLL operation is deferred
+        /// until just before the GetQueuedCompletionStatusEx() syscall is made.
+        ///
+        /// However, when another thread is already blocked on
+        /// GetQueuedCompletionStatusEx() we tell the kernel about the registered
+        /// socket event(s) immediately.
+        unsafe fn update_sockets_events_if_polling(&self) -> io::Result<()> {
+            if self.is_polling.load(Ordering::Acquire) {
+                self.update_sockets_events()
+            } else {
+                Ok(())
+            }
+        }
 
-    pub fn get(&self, idx: usize) -> Option<Event> {
-        self.events.get(idx).map(|e| *e)
+        fn queue_state(&self, sock_state: Pin<Arc<Mutex<SockState>>>) {
+            let mut update_queue = self.update_queue.lock().unwrap();
+            update_queue.push_back(sock_state);
+        }
+
+        fn _alloc_sock_for_rawsocket(
+            &self,
+            raw_socket: RawSocket,
+        ) -> io::Result<Pin<Arc<Mutex<SockState>>>> {
+            let afd = self.afd_group.acquire()?;
+            Ok(Arc::pin(Mutex::new(SockState::new(raw_socket, afd)?)))
+        }
     }
 
-    pub fn push_event(&mut self, event: Event) {
-        self.events.push(event);
+    fn try_get_base_socket(raw_socket: RawSocket, ioctl: u32) -> Result<RawSocket, i32> {
+        let mut base_socket: RawSocket = 0;
+        let mut bytes: u32 = 0;
+        unsafe {
+            if WSAIoctl(
+                raw_socket as usize,
+                ioctl,
+                null_mut(),
+                0,
+                &mut base_socket as *mut _ as PVOID,
+                size_of::<RawSocket>() as u32,
+                &mut bytes,
+                null_mut(),
+                None,
+            ) != SOCKET_ERROR
+            {
+                Ok(base_socket)
+            } else {
+                Err(WSAGetLastError())
+            }
+        }
     }
 
-    pub fn clear(&mut self) {
-        self.events.truncate(0);
+    fn get_base_socket(raw_socket: RawSocket) -> io::Result<RawSocket> {
+        let res = try_get_base_socket(raw_socket, mswsock::SIO_BASE_HANDLE);
+        if let Ok(base_socket) = res {
+            return Ok(base_socket);
+        }
+
+        // The `SIO_BASE_HANDLE` should not be intercepted by LSPs, therefore
+        // it should not fail as long as `raw_socket` is a valid socket. See
+        // https://docs.microsoft.com/en-us/windows/win32/winsock/winsock-ioctls.
+        // However, at least one known LSP deliberately breaks it, so we try
+        // some alternative IOCTLs, starting with the most appropriate one.
+        for &ioctl in &[
+            mswsock::SIO_BSP_HANDLE_SELECT,
+            mswsock::SIO_BSP_HANDLE_POLL,
+            mswsock::SIO_BSP_HANDLE,
+        ] {
+            if let Ok(base_socket) = try_get_base_socket(raw_socket, ioctl) {
+                // Since we know now that we're dealing with an LSP (otherwise
+                // SIO_BASE_HANDLE would't have failed), only return any result
+                // when it is different from the original `raw_socket`.
+                if base_socket != raw_socket {
+                    return Ok(base_socket);
+                }
+            }
+        }
+
+        // If the alternative IOCTLs also failed, return the original error.
+        let os_error = res.unwrap_err();
+        let err = io::Error::from_raw_os_error(os_error);
+        Err(err)
     }
 }
 
-macro_rules! overlapped2arc {
-    ($e:expr, $t:ty, $($field:ident).+) => ({
-        let offset = offset_of!($t, $($field).+);
-        debug_assert!(offset < mem::size_of::<$t>());
-        FromRawArc::from_raw(($e as usize - offset) as *mut $t)
-    })
-}
+impl Drop for SelectorInner {
+    fn drop(&mut self) {
+        loop {
+            let events_num: usize;
+            let mut statuses: [CompletionStatus; 1024] = [CompletionStatus::zero(); 1024];
+
+            let result = self
+                .cp
+                .get_many(&mut statuses, Some(std::time::Duration::from_millis(0)));
+            match result {
+                Ok(iocp_events) => {
+                    events_num = iocp_events.iter().len();
+                    for iocp_event in iocp_events.iter() {
+                        if iocp_event.overlapped().is_null() {
+                            // Custom event
+                        } else if iocp_event.token() % 2 == 1 {
+                            // Named pipe, dispatch the event so it can release resources
+                            let callback = unsafe {
+                                (*(iocp_event.overlapped() as *mut super::Overlapped)).callback
+                            };
+
+                            callback(iocp_event.entry(), None);
+                        } else {
+                            // drain sock state to release memory of Arc reference
+                            let _sock_state = from_overlapped(iocp_event.overlapped());
+                        }
+                    }
+                }
+
+                Err(_) => {
+                    break;
+                }
+            }
 
-macro_rules! offset_of {
-    ($t:ty, $($field:ident).+) => (
-        &(*(0 as *const $t)).$($field).+ as *const _ as usize
-    )
-}
+            if events_num == 0 {
+                // continue looping until all completion statuses have been drained
+                break;
+            }
+        }
 
-// See sys::windows module docs for why this exists.
-//
-// The gist of it is that `Selector` assumes that all `OVERLAPPED` pointers are
-// actually inside one of these structures so it can use the `Callback` stored
-// right after it.
-//
-// We use repr(C) here to ensure that we can assume the overlapped pointer is
-// at the start of the structure so we can just do a cast.
-/// A wrapper around an internal instance over `miow::Overlapped` which is in
-/// turn a wrapper around the Windows type `OVERLAPPED`.
-///
-/// This type is required to be used for all IOCP operations on handles that are
-/// registered with an event loop. The event loop will receive notifications
-/// over `OVERLAPPED` pointers that have completed, and it will cast that
-/// pointer to a pointer to this structure and invoke the associated callback.
-#[repr(C)]
-pub struct Overlapped {
-    inner: UnsafeCell<miow::Overlapped>,
-    callback: fn(&OVERLAPPED_ENTRY),
+        self.afd_group.release_unused_afd();
+    }
 }
 
-impl Overlapped {
-    /// Creates a new `Overlapped` which will invoke the provided `cb` callback
-    /// whenever it's triggered.
-    ///
-    /// The returned `Overlapped` must be used as the `OVERLAPPED` passed to all
-    /// I/O operations that are registered with mio's event loop. When the I/O
-    /// operation associated with an `OVERLAPPED` pointer completes the event
-    /// loop will invoke the function pointer provided by `cb`.
-    pub fn new(cb: fn(&OVERLAPPED_ENTRY)) -> Overlapped {
-        Overlapped {
-            inner: UnsafeCell::new(miow::Overlapped::zero()),
-            callback: cb,
+cfg_net! {
+    fn interests_to_afd_flags(interests: Interest) -> u32 {
+        let mut flags = 0;
+
+        if interests.is_readable() {
+            flags |= READABLE_FLAGS | READ_CLOSED_FLAGS | ERROR_FLAGS;
         }
-    }
 
-    /// Get the underlying `Overlapped` instance as a raw pointer.
-    ///
-    /// This can be useful when only a shared borrow is held and the overlapped
-    /// pointer needs to be passed down to winapi.
-    pub fn as_mut_ptr(&self) -> *mut OVERLAPPED {
-        unsafe {
-            (*self.inner.get()).raw()
+        if interests.is_writable() {
+            flags |= WRITABLE_FLAGS | WRITE_CLOSED_FLAGS | ERROR_FLAGS;
         }
-    }
-}
 
-impl fmt::Debug for Overlapped {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Overlapped")
-            .finish()
+        flags
     }
 }
-
-// Overlapped's APIs are marked as unsafe Overlapped's APIs are marked as
-// unsafe as they must be used with caution to ensure thread safety. The
-// structure itself is safe to send across threads.
-unsafe impl Send for Overlapped {}
-unsafe impl Sync for Overlapped {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/tcp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/tcp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/tcp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/tcp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,851 +1,325 @@
-use std::fmt;
-use std::io::{self, Read, ErrorKind};
-use std::mem;
-use std::net::{self, SocketAddr, Shutdown};
-use std::os::windows::prelude::*;
-use std::sync::{Mutex, MutexGuard};
+use std::io;
+use std::convert::TryInto;
+use std::mem::size_of;
+use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::time::Duration;
+use std::ptr;
+use std::os::windows::io::FromRawSocket;
+use std::os::windows::raw::SOCKET as StdSocket; // winapi uses usize, stdlib uses u32/u64.
 
-use miow::iocp::CompletionStatus;
-use miow::net::*;
-use net2::{TcpBuilder, TcpStreamExt as Net2TcpExt};
-use winapi::*;
-use iovec::IoVec;
-
-use {poll, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use sys::windows::from_raw_arc::FromRawArc;
-use sys::windows::selector::{Overlapped, ReadyBinding};
-use sys::windows::Family;
-
-pub struct TcpStream {
-    /// Separately stored implementation to ensure that the `Drop`
-    /// implementation on this type is only executed when it's actually dropped
-    /// (many clones of this `imp` are made).
-    imp: StreamImp,
-    registration: Mutex<Option<poll::Registration>>,
-}
-
-pub struct TcpListener {
-    imp: ListenerImp,
-    registration: Mutex<Option<poll::Registration>>,
-}
-
-#[derive(Clone)]
-struct StreamImp {
-    /// A stable address and synchronized access for all internals. This serves
-    /// to ensure that all `Overlapped` pointers are valid for a long period of
-    /// time as well as allowing completion callbacks to have access to the
-    /// internals without having ownership.
-    ///
-    /// Note that the reference count also allows us "loan out" copies to
-    /// completion ports while I/O is running to guarantee that this stays alive
-    /// until the I/O completes. You'll notice a number of calls to
-    /// `mem::forget` below, and these only happen on successful scheduling of
-    /// I/O and are paired with `overlapped2arc!` macro invocations in the
-    /// completion callbacks (to have a decrement match the increment).
-    inner: FromRawArc<StreamIo>,
-}
-
-#[derive(Clone)]
-struct ListenerImp {
-    inner: FromRawArc<ListenerIo>,
-}
-
-struct StreamIo {
-    inner: Mutex<StreamInner>,
-    read: Overlapped, // also used for connect
-    write: Overlapped,
-    socket: net::TcpStream,
-}
-
-struct ListenerIo {
-    inner: Mutex<ListenerInner>,
-    accept: Overlapped,
-    family: Family,
-    socket: net::TcpListener,
-}
-
-struct StreamInner {
-    iocp: ReadyBinding,
-    deferred_connect: Option<SocketAddr>,
-    read: State<(), ()>,
-    write: State<(Vec<u8>, usize), (Vec<u8>, usize)>,
-    /// whether we are instantly notified of success
-    /// (FILE_SKIP_COMPLETION_PORT_ON_SUCCESS,
-    ///  without a roundtrip through the event loop)
-    instant_notify: bool,
-}
-
-struct ListenerInner {
-    iocp: ReadyBinding,
-    accept: State<net::TcpStream, (net::TcpStream, SocketAddr)>,
-    accept_buf: AcceptAddrsBuf,
-    instant_notify: bool,
-}
-
-enum State<T, U> {
-    Empty,              // no I/O operation in progress
-    Pending(T),         // an I/O operation is in progress
-    Ready(U),           // I/O has finished with this value
-    Error(io::Error),   // there was an I/O error
-}
-
-impl TcpStream {
-    fn new(socket: net::TcpStream,
-           deferred_connect: Option<SocketAddr>) -> TcpStream {
-        TcpStream {
-            registration: Mutex::new(None),
-            imp: StreamImp {
-                inner: FromRawArc::new(StreamIo {
-                    read: Overlapped::new(read_done),
-                    write: Overlapped::new(write_done),
-                    socket: socket,
-                    inner: Mutex::new(StreamInner {
-                        iocp: ReadyBinding::new(),
-                        deferred_connect: deferred_connect,
-                        read: State::Empty,
-                        write: State::Empty,
-                        instant_notify: false,
-                    }),
-                }),
-            },
-        }
-    }
-
-    pub fn connect(socket: net::TcpStream, addr: &SocketAddr)
-                   -> io::Result<TcpStream> {
-        socket.set_nonblocking(true)?;
-        Ok(TcpStream::new(socket, Some(*addr)))
-    }
-
-    pub fn from_stream(stream: net::TcpStream) -> TcpStream {
-        TcpStream::new(stream, None)
-    }
-
-    pub fn peer_addr(&self) -> io::Result<SocketAddr> {
-        self.imp.inner.socket.peer_addr()
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.imp.inner.socket.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<TcpStream> {
-        self.imp.inner.socket.try_clone().map(|s| TcpStream::new(s, None))
-    }
-
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        self.imp.inner.socket.shutdown(how)
-    }
-
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        self.imp.inner.socket.set_nodelay(nodelay)
-    }
-
-    pub fn nodelay(&self) -> io::Result<bool> {
-        self.imp.inner.socket.nodelay()
-    }
-
-    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.imp.inner.socket.set_recv_buffer_size(size)
-    }
-
-    pub fn recv_buffer_size(&self) -> io::Result<usize> {
-        self.imp.inner.socket.recv_buffer_size()
-    }
-
-    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.imp.inner.socket.set_send_buffer_size(size)
-    }
+use winapi::ctypes::{c_char, c_int, c_ushort, c_ulong};
+use winapi::shared::ws2def::{SOCKADDR_STORAGE, AF_INET, AF_INET6, SOCKADDR_IN};
+use winapi::shared::ws2ipdef::SOCKADDR_IN6_LH;
+use winapi::shared::mstcpip;
 
-    pub fn send_buffer_size(&self) -> io::Result<usize> {
-        self.imp.inner.socket.send_buffer_size()
-    }
+use winapi::shared::minwindef::{BOOL, TRUE, FALSE, DWORD, LPVOID, LPDWORD};
+use winapi::um::winsock2::{
+    self, closesocket, linger, setsockopt, getsockopt, getsockname, PF_INET, PF_INET6, SOCKET, SOCKET_ERROR,
+    SOCK_STREAM, SOL_SOCKET, SO_LINGER, SO_REUSEADDR, SO_RCVBUF, SO_SNDBUF, SO_KEEPALIVE, WSAIoctl, LPWSAOVERLAPPED,
+};
 
-    pub fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
-        self.imp.inner.socket.set_keepalive(keepalive)
-    }
+use crate::sys::windows::net::{init, new_socket, socket_addr};
+use crate::net::TcpKeepalive;
 
-    pub fn keepalive(&self) -> io::Result<Option<Duration>> {
-        self.imp.inner.socket.keepalive()
-    }
+pub(crate) type TcpSocket = SOCKET;
 
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.imp.inner.socket.set_ttl(ttl)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.imp.inner.socket.ttl()
-    }
-
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.imp.inner.socket.set_only_v6(only_v6)
-    }
-
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.imp.inner.socket.only_v6()
-    }
-
-    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.imp.inner.socket.set_linger(dur)
-    }
-
-    pub fn linger(&self) -> io::Result<Option<Duration>> {
-        self.imp.inner.socket.linger()
-    }
-
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        if let Some(e) = self.imp.inner.socket.take_error()? {
-            return Ok(Some(e))
-        }
-
-        // If the syscall didn't return anything then also check to see if we've
-        // squirreled away an error elsewhere for example as part of a connect
-        // operation.
-        //
-        // Typically this is used like so:
-        //
-        // 1. A `connect` is issued
-        // 2. Wait for the socket to be writable
-        // 3. Call `take_error` to see if the connect succeeded.
-        //
-        // Right now the `connect` operation finishes in `read_done` below and
-        // fill will in `State::Error` in the `read` slot if it fails, so we
-        // extract that here.
-        let mut me = self.inner();
-        match mem::replace(&mut me.read, State::Empty) {
-            State::Error(e) => {
-                self.imp.schedule_read(&mut me);
-                Ok(Some(e))
-            }
-            other => {
-                me.read = other;
-                Ok(None)
-            }
-        }
-    }
-
-    fn inner(&self) -> MutexGuard<StreamInner> {
-        self.imp.inner()
-    }
-
-    fn before_read(&self) -> io::Result<MutexGuard<StreamInner>> {
-        let mut me = self.inner();
-
-        match me.read {
-            // Empty == we're not associated yet, and if we're pending then
-            // these are both cases where we return "would block"
-            State::Empty |
-            State::Pending(()) => return Err(io::ErrorKind::WouldBlock.into()),
-
-            // If we got a delayed error as part of a `read_overlapped` below,
-            // return that here. Also schedule another read in case it was
-            // transient.
-            State::Error(_) => {
-                let e = match mem::replace(&mut me.read, State::Empty) {
-                    State::Error(e) => e,
-                    _ => panic!(),
-                };
-                self.imp.schedule_read(&mut me);
-                return Err(e)
-            }
-
-            // If we're ready for a read then some previous 0-byte read has
-            // completed. In that case the OS's socket buffer has something for
-            // us, so we just keep pulling out bytes while we can in the loop
-            // below.
-            State::Ready(()) => {}
-        }
-
-        Ok(me)
-    }
-
-    fn post_register(&self, interest: Ready, me: &mut StreamInner) {
-        if interest.is_readable() {
-            self.imp.schedule_read(me);
-        }
-
-        // At least with epoll, if a socket is registered with an interest in
-        // writing and it's immediately writable then a writable event is
-        // generated immediately, so do so here.
-        if interest.is_writable() {
-            if let State::Empty = me.write {
-                self.imp.add_readiness(me, Ready::writable());
-            }
-        }
-    }
-
-    pub fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
-        match IoVec::from_bytes_mut(buf) {
-            Some(vec) => self.readv(&mut [vec]),
-            None => Ok(0),
-        }
-    }
-
-    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
-        let mut me = self.before_read()?;
-
-        match (&self.imp.inner.socket).peek(buf) {
-            Ok(n) => Ok(n),
-            Err(e) => {
-                me.read = State::Empty;
-                self.imp.schedule_read(&mut me);
-                Err(e)
-            }
-        }
-    }
-
-    pub fn readv(&self, bufs: &mut [&mut IoVec]) -> io::Result<usize> {
-        let mut me = self.before_read()?;
-
-        // TODO: Does WSARecv work on a nonblocking sockets? We ideally want to
-        //       call that instead of looping over all the buffers and calling
-        //       `recv` on each buffer. I'm not sure though if an overlapped
-        //       socket in nonblocking mode would work with that use case,
-        //       however, so for now we just call `recv`.
-
-        let mut amt = 0;
-        for buf in bufs {
-            match (&self.imp.inner.socket).read(buf) {
-                // If we did a partial read, then return what we've read so far
-                Ok(n) if n < buf.len() => return Ok(amt + n),
-
-                // Otherwise filled this buffer entirely, so try to fill the
-                // next one as well.
-                Ok(n) => amt += n,
-
-                // If we hit an error then things get tricky if we've already
-                // read some data. If the error is "would block" then we just
-                // return the data we've read so far while scheduling another
-                // 0-byte read.
-                //
-                // If we've read data and the error kind is not "would block",
-                // then we stash away the error to get returned later and return
-                // the data that we've read.
-                //
-                // Finally if we haven't actually read any data we just
-                // reschedule a 0-byte read to happen again and then return the
-                // error upwards.
-                Err(e) => {
-                    if amt > 0 && e.kind() == io::ErrorKind::WouldBlock {
-                        me.read = State::Empty;
-                        self.imp.schedule_read(&mut me);
-                        return Ok(amt)
-                    } else if amt > 0 {
-                        me.read = State::Error(e);
-                        return Ok(amt)
-                    } else {
-                        me.read = State::Empty;
-                        self.imp.schedule_read(&mut me);
-                        return Err(e)
-                    }
-                }
-            }
-        }
-
-        Ok(amt)
-    }
-
-    pub fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        match IoVec::from_bytes(buf) {
-            Some(vec) => self.writev(&[vec]),
-            None => Ok(0),
-        }
-    }
-
-    pub fn writev(&self, bufs: &[&IoVec]) -> io::Result<usize> {
-        let mut me = self.inner();
-        let me = &mut *me;
-
-        match mem::replace(&mut me.write, State::Empty) {
-            State::Empty => {}
-            State::Error(e) => return Err(e),
-            other => {
-                me.write = other;
-                return Err(io::ErrorKind::WouldBlock.into())
-            }
-        }
-
-        if !me.iocp.registered() {
-            return Err(io::ErrorKind::WouldBlock.into())
-        }
+pub(crate) fn new_v4_socket() -> io::Result<TcpSocket> {
+    init();
+    new_socket(PF_INET, SOCK_STREAM)
+}
 
-        if bufs.is_empty() {
-            return Ok(0)
-        }
+pub(crate) fn new_v6_socket() -> io::Result<TcpSocket> {
+    init();
+    new_socket(PF_INET6, SOCK_STREAM)
+}
 
-        let len = bufs.iter().map(|b| b.len()).fold(0, |a, b| a + b);
-        let mut intermediate = me.iocp.get_buffer(len);
-        for buf in bufs {
-            intermediate.extend_from_slice(buf);
-        }
-        self.imp.schedule_write(intermediate, 0, me);
-        Ok(len)
-    }
+pub(crate) fn bind(socket: TcpSocket, addr: SocketAddr) -> io::Result<()> {
+    use winsock2::bind;
 
-    pub fn flush(&self) -> io::Result<()> {
-        Ok(())
-    }
+    let (raw_addr, raw_addr_length) = socket_addr(&addr);
+    syscall!(
+        bind(socket, raw_addr.as_ptr(), raw_addr_length),
+        PartialEq::eq,
+        SOCKET_ERROR
+    )?;
+    Ok(())
 }
 
-impl StreamImp {
-    fn inner(&self) -> MutexGuard<StreamInner> {
-        self.inner.inner.lock().unwrap()
-    }
+pub(crate) fn connect(socket: TcpSocket, addr: SocketAddr) -> io::Result<net::TcpStream> {
+    use winsock2::connect;
 
-    fn schedule_connect(&self, addr: &SocketAddr) -> io::Result<()> {
-        unsafe {
-            trace!("scheduling a connect");
-            self.inner.socket.connect_overlapped(addr, &[], self.inner.read.as_mut_ptr())?;
-        }
-        // see docs above on StreamImp.inner for rationale on forget
-        mem::forget(self.clone());
-        Ok(())
-    }
-
-    /// Schedule a read to happen on this socket, enqueuing us to receive a
-    /// notification when a read is ready.
-    ///
-    /// Note that this does *not* work with a buffer. When reading a TCP stream
-    /// we actually read into a 0-byte buffer so Windows will send us a
-    /// notification when the socket is otherwise ready for reading. This allows
-    /// us to avoid buffer allocations for in-flight reads.
-    fn schedule_read(&self, me: &mut StreamInner) {
-        match me.read {
-            State::Empty => {}
-            State::Ready(_) | State::Error(_) => {
-                self.add_readiness(me, Ready::readable());
-                return;
-            }
-            _ => return,
-        }
+    let (raw_addr, raw_addr_length) = socket_addr(&addr);
 
-        me.iocp.set_readiness(me.iocp.readiness() - Ready::readable());
+    let res = syscall!(
+        connect(socket, raw_addr.as_ptr(), raw_addr_length),
+        PartialEq::eq,
+        SOCKET_ERROR
+    );
 
-        trace!("scheduling a read");
-        let res = unsafe {
-            self.inner.socket.read_overlapped(&mut [], self.inner.read.as_mut_ptr())
-        };
-        match res {
-            // Note that `Ok(true)` means that this completed immediately and
-            // our socket is readable. This typically means that the caller of
-            // this function (likely `read` above) can try again as an
-            // optimization and return bytes quickly.
-            //
-            // Normally, though, although the read completed immediately
-            // there's still an IOCP completion packet enqueued that we're going
-            // to receive.
-            //
-            // You can configure this behavior (miow) with
-            // SetFileCompletionNotificationModes to indicate that `Ok(true)`
-            // does **not** enqueue a completion packet. (This is the case
-            // for me.instant_notify)
-            //
-            // Note that apparently libuv has scary code to work around bugs in
-            // `WSARecv` for UDP sockets apparently for handles which have had
-            // the `SetFileCompletionNotificationModes` function called on them,
-            // worth looking into!
-            Ok(Some(_)) if me.instant_notify => {
-                me.read = State::Ready(());
-                self.add_readiness(me, Ready::readable());
-            }
-            Ok(_) => {
-                // see docs above on StreamImp.inner for rationale on forget
-                me.read = State::Pending(());
-                mem::forget(self.clone());
-            }
-            Err(e) => {
-                me.read = State::Error(e);
-                self.add_readiness(me, Ready::readable());
-            }
+    match res {
+        Err(err) if err.kind() != io::ErrorKind::WouldBlock => {
+            Err(err)
         }
-    }
-
-    /// Similar to `schedule_read`, except that this issues, well, writes.
-    ///
-    /// This function will continually attempt to write the entire contents of
-    /// the buffer `buf` until they have all been written. The `pos` argument is
-    /// the current offset within the buffer up to which the contents have
-    /// already been written.
-    ///
-    /// A new writable event (e.g. allowing another write) will only happen once
-    /// the buffer has been written completely (or hit an error).
-    fn schedule_write(&self,
-                      buf: Vec<u8>,
-                      mut pos: usize,
-                      me: &mut StreamInner) {
-
-        // About to write, clear any pending level triggered events
-        me.iocp.set_readiness(me.iocp.readiness() - Ready::writable());
-
-        loop {
-            trace!("scheduling a write of {} bytes", buf[pos..].len());
-            let ret = unsafe {
-                self.inner.socket.write_overlapped(&buf[pos..], self.inner.write.as_mut_ptr())
-            };
-            match ret {
-                Ok(Some(transferred_bytes)) if me.instant_notify => {
-                    trace!("done immediately with {} bytes", transferred_bytes);
-                    if transferred_bytes == buf.len() - pos {
-                        self.add_readiness(me, Ready::writable());
-                        me.write = State::Empty;
-                        break;
-                    }
-                    pos += transferred_bytes;
-                }
-                Ok(_) => {
-                    trace!("scheduled for later");
-                    // see docs above on StreamImp.inner for rationale on forget
-                    me.write = State::Pending((buf, pos));
-                    mem::forget(self.clone());
-                    break;
-                }
-                Err(e) => {
-                    trace!("write error: {}", e);
-                    me.write = State::Error(e);
-                    self.add_readiness(me, Ready::writable());
-                    me.iocp.put_buffer(buf);
-                    break;
-                }
-            }
+        _ => {
+            Ok(unsafe { net::TcpStream::from_raw_socket(socket as StdSocket) })
         }
     }
-
-    /// Pushes an event for this socket onto the selector its registered for.
-    ///
-    /// When an event is generated on this socket, if it happened after the
-    /// socket was closed then we don't want to actually push the event onto our
-    /// selector as otherwise it's just a spurious notification.
-    fn add_readiness(&self, me: &mut StreamInner, set: Ready) {
-        me.iocp.set_readiness(set | me.iocp.readiness());
-    }
 }
 
-fn read_done(status: &OVERLAPPED_ENTRY) {
-    let status = CompletionStatus::from_entry(status);
-    let me2 = StreamImp {
-        inner: unsafe { overlapped2arc!(status.overlapped(), StreamIo, read) },
-    };
-
-    let mut me = me2.inner();
-    match mem::replace(&mut me.read, State::Empty) {
-        State::Pending(()) => {
-            trace!("finished a read: {}", status.bytes_transferred());
-            assert_eq!(status.bytes_transferred(), 0);
-            me.read = State::Ready(());
-            return me2.add_readiness(&mut me, Ready::readable())
-        }
-        s => me.read = s,
-    }
-
-    // If a read didn't complete, then the connect must have just finished.
-    trace!("finished a connect");
+pub(crate) fn listen(socket: TcpSocket, backlog: u32) -> io::Result<net::TcpListener> {
+    use winsock2::listen;
+    use std::convert::TryInto;
 
-    // By guarding with socket.result(), we ensure that a connection
-    // was successfully made before performing operations requiring a
-    // connected socket.
-    match unsafe { me2.inner.socket.result(status.overlapped()) }
-        .and_then(|_| me2.inner.socket.connect_complete())
-    {
-        Ok(()) => {
-            me2.add_readiness(&mut me, Ready::writable());
-            me2.schedule_read(&mut me);
-        }
-        Err(e) => {
-            me2.add_readiness(&mut me, Ready::readable() | Ready::writable());
-            me.read = State::Error(e);
-        }
-    }
+    let backlog = backlog.try_into().unwrap_or(i32::max_value());
+    syscall!(listen(socket, backlog), PartialEq::eq, SOCKET_ERROR)?;
+    Ok(unsafe { net::TcpListener::from_raw_socket(socket as StdSocket) })
 }
 
-fn write_done(status: &OVERLAPPED_ENTRY) {
-    let status = CompletionStatus::from_entry(status);
-    trace!("finished a write {}", status.bytes_transferred());
-    let me2 = StreamImp {
-        inner: unsafe { overlapped2arc!(status.overlapped(), StreamIo, write) },
-    };
-    let mut me = me2.inner();
-    let (buf, pos) = match mem::replace(&mut me.write, State::Empty) {
-        State::Pending(pair) => pair,
-        _ => unreachable!(),
-    };
-    let new_pos = pos + (status.bytes_transferred() as usize);
-    if new_pos == buf.len() {
-        me2.add_readiness(&mut me, Ready::writable());
-    } else {
-        me2.schedule_write(buf, new_pos, &mut me);
-    }
+pub(crate) fn close(socket: TcpSocket) {
+    let _ = unsafe { closesocket(socket) };
 }
 
-impl Evented for TcpStream {
-    fn register(&self, poll: &Poll, token: Token,
-                interest: Ready, opts: PollOpt) -> io::Result<()> {
-        let mut me = self.inner();
-        me.iocp.register_socket(&self.imp.inner.socket, poll, token,
-                                     interest, opts, &self.registration)?;
-
-        unsafe {
-            super::no_notify_on_instant_completion(self.imp.inner.socket.as_raw_socket() as HANDLE)?;
-            me.instant_notify = true;
-        }
+pub(crate) fn set_reuseaddr(socket: TcpSocket, reuseaddr: bool) -> io::Result<()> {
+    let val: BOOL = if reuseaddr { TRUE } else { FALSE };
 
-        // If we were connected before being registered process that request
-        // here and go along our merry ways. Note that the callback for a
-        // successful connect will worry about generating writable/readable
-        // events and scheduling a new read.
-        if let Some(addr) = me.deferred_connect.take() {
-            return self.imp.schedule_connect(&addr).map(|_| ())
-        }
-        self.post_register(interest, &mut me);
-        Ok(())
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token,
-                  interest: Ready, opts: PollOpt) -> io::Result<()> {
-        let mut me = self.inner();
-        me.iocp.reregister_socket(&self.imp.inner.socket, poll, token,
-                                       interest, opts, &self.registration)?;
-        self.post_register(interest, &mut me);
-        Ok(())
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.inner().iocp.deregister(&self.imp.inner.socket,
-                                     poll, &self.registration)
+    match unsafe { setsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_REUSEADDR,
+        &val as *const _ as *const c_char,
+        size_of::<BOOL>() as c_int,
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(()),
     }
 }
 
-impl fmt::Debug for TcpStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("TcpStream")
-            .finish()
-    }
-}
+pub(crate) fn get_reuseaddr(socket: TcpSocket) -> io::Result<bool> {
+    let mut optval: c_char = 0;
+    let mut optlen = size_of::<BOOL>() as c_int;
 
-impl Drop for TcpStream {
-    fn drop(&mut self) {
-        // If we're still internally reading, we're no longer interested. Note
-        // though that we don't cancel any writes which may have been issued to
-        // preserve the same semantics as Unix.
-        //
-        // Note that "Empty" here may mean that a connect is pending, so we
-        // cancel even if that happens as well.
-        unsafe {
-            match self.inner().read {
-                State::Pending(_) | State::Empty => {
-                    trace!("cancelling active TCP read");
-                    drop(super::cancel(&self.imp.inner.socket,
-                                       &self.imp.inner.read));
-                }
-                State::Ready(_) | State::Error(_) => {}
-            }
-        }
+    match unsafe { getsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_REUSEADDR,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(optval != 0),
     }
 }
 
-impl TcpListener {
-    pub fn new(socket: net::TcpListener)
-               -> io::Result<TcpListener> {
-        let addr = socket.local_addr()?;
-        Ok(TcpListener::new_family(socket, match addr {
-            SocketAddr::V4(..) => Family::V4,
-            SocketAddr::V6(..) => Family::V6,
-        }))
-    }
-
-    fn new_family(socket: net::TcpListener, family: Family) -> TcpListener {
-        TcpListener {
-            registration: Mutex::new(None),
-            imp: ListenerImp {
-                inner: FromRawArc::new(ListenerIo {
-                    accept: Overlapped::new(accept_done),
-                    family: family,
-                    socket: socket,
-                    inner: Mutex::new(ListenerInner {
-                        iocp: ReadyBinding::new(),
-                        accept: State::Empty,
-                        accept_buf: AcceptAddrsBuf::new(),
-                        instant_notify: false,
-                    }),
-                }),
-            },
-        }
-    }
-
-    pub fn accept(&self) -> io::Result<(net::TcpStream, SocketAddr)> {
-        let mut me = self.inner();
+pub(crate) fn get_localaddr(socket: TcpSocket) -> io::Result<SocketAddr> {
+    let mut storage: SOCKADDR_STORAGE = unsafe { std::mem::zeroed() };
+    let mut length = std::mem::size_of_val(&storage) as c_int;
 
-        let ret = match mem::replace(&mut me.accept, State::Empty) {
-            State::Empty => return Err(io::ErrorKind::WouldBlock.into()),
-            State::Pending(t) => {
-                me.accept = State::Pending(t);
-                return Err(io::ErrorKind::WouldBlock.into());
+    match unsafe { getsockname(
+        socket,
+        &mut storage as *mut _ as *mut _,
+        &mut length
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => {
+            if storage.ss_family as c_int == AF_INET {
+                // Safety: if the ss_family field is AF_INET then storage must be a sockaddr_in.
+                let addr: &SOCKADDR_IN = unsafe { &*(&storage as *const _ as *const SOCKADDR_IN) };
+                let ip_bytes = unsafe { addr.sin_addr.S_un.S_un_b() };
+                let ip = Ipv4Addr::from([ip_bytes.s_b1, ip_bytes.s_b2, ip_bytes.s_b3, ip_bytes.s_b4]);
+                let port = u16::from_be(addr.sin_port);
+                Ok(SocketAddr::V4(SocketAddrV4::new(ip, port)))
+            } else if storage.ss_family as c_int == AF_INET6 {
+                // Safety: if the ss_family field is AF_INET6 then storage must be a sockaddr_in6.
+                let addr: &SOCKADDR_IN6_LH = unsafe { &*(&storage as *const _ as *const SOCKADDR_IN6_LH) };
+                let ip = Ipv6Addr::from(*unsafe { addr.sin6_addr.u.Byte() });
+                let port = u16::from_be(addr.sin6_port);
+                let scope_id = unsafe { *addr.u.sin6_scope_id() };
+                Ok(SocketAddr::V6(SocketAddrV6::new(ip, port, addr.sin6_flowinfo, scope_id)))
+            } else {
+                Err(std::io::ErrorKind::InvalidInput.into())
             }
-            State::Ready((s, a)) => Ok((s, a)),
-            State::Error(e) => Err(e),
-        };
-
-        self.imp.schedule_accept(&mut me);
-
-        return ret
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.imp.inner.socket.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<TcpListener> {
-        self.imp.inner.socket.try_clone().map(|s| {
-            TcpListener::new_family(s, self.imp.inner.family)
-        })
-    }
-
-    #[allow(deprecated)]
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.imp.inner.socket.set_only_v6(only_v6)
-    }
-
-    #[allow(deprecated)]
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.imp.inner.socket.only_v6()
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.imp.inner.socket.set_ttl(ttl)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.imp.inner.socket.ttl()
+        },
     }
+}
 
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.imp.inner.socket.take_error()
-    }
+pub(crate) fn set_linger(socket: TcpSocket, dur: Option<Duration>) -> io::Result<()> {
+    let val: linger = linger {
+        l_onoff: if dur.is_some() { 1 } else { 0 },
+        l_linger: dur.map(|dur| dur.as_secs() as c_ushort).unwrap_or_default(),
+    };
 
-    fn inner(&self) -> MutexGuard<ListenerInner> {
-        self.imp.inner()
+    match unsafe { setsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_LINGER,
+        &val as *const _ as *const c_char,
+        size_of::<linger>() as c_int,
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(()),
     }
 }
 
-impl ListenerImp {
-    fn inner(&self) -> MutexGuard<ListenerInner> {
-        self.inner.inner.lock().unwrap()
-    }
-
-    fn schedule_accept(&self, me: &mut ListenerInner) {
-        match me.accept {
-            State::Empty => {}
-            _ => return
-        }
-
-        me.iocp.set_readiness(me.iocp.readiness() - Ready::readable());
-
-        let res = match self.inner.family {
-            Family::V4 => TcpBuilder::new_v4(),
-            Family::V6 => TcpBuilder::new_v6(),
-        }.and_then(|builder| unsafe {
-            trace!("scheduling an accept");
-            self.inner.socket.accept_overlapped(&builder, &mut me.accept_buf,
-                                                self.inner.accept.as_mut_ptr())
-        });
-        match res {
-            Ok((socket, _)) => {
-                // see docs above on StreamImp.inner for rationale on forget
-                me.accept = State::Pending(socket);
-                mem::forget(self.clone());
-            }
-            Err(e) => {
-                me.accept = State::Error(e);
-                self.add_readiness(me, Ready::readable());
+pub(crate) fn get_linger(socket: TcpSocket) -> io::Result<Option<Duration>> {
+    let mut val: linger = unsafe { std::mem::zeroed() };
+    let mut len = size_of::<linger>() as c_int;
+
+    match unsafe { getsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_LINGER,
+        &mut val as *mut _ as *mut _,
+        &mut len,
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => {
+            if val.l_onoff == 0 {
+                Ok(None)
+            } else {
+                Ok(Some(Duration::from_secs(val.l_linger as u64)))
             }
-        }
-    }
-
-    // See comments in StreamImp::push
-    fn add_readiness(&self, me: &mut ListenerInner, set: Ready) {
-        me.iocp.set_readiness(set | me.iocp.readiness());
+        },
     }
 }
 
-fn accept_done(status: &OVERLAPPED_ENTRY) {
-    let status = CompletionStatus::from_entry(status);
-    let me2 = ListenerImp {
-        inner: unsafe { overlapped2arc!(status.overlapped(), ListenerIo, accept) },
-    };
 
-    let mut me = me2.inner();
-    let socket = match mem::replace(&mut me.accept, State::Empty) {
-        State::Pending(s) => s,
-        _ => unreachable!(),
-    };
-    trace!("finished an accept");
-    let result = me2.inner.socket.accept_complete(&socket).and_then(|()| {
-        me.accept_buf.parse(&me2.inner.socket)
-    }).and_then(|buf| {
-        buf.remote().ok_or_else(|| {
-            io::Error::new(ErrorKind::Other, "could not obtain remote address")
-        })
+pub(crate) fn set_recv_buffer_size(socket: TcpSocket, size: u32) -> io::Result<()> {
+    let size = size.try_into().ok().unwrap_or_else(i32::max_value);
+    match unsafe { setsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_RCVBUF,
+        &size as *const _ as *const c_char,
+        size_of::<c_int>() as c_int
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(()),
+    }
+}
+
+pub(crate) fn get_recv_buffer_size(socket: TcpSocket) -> io::Result<u32> {
+    let mut optval: c_int = 0;
+    let mut optlen = size_of::<c_int>() as c_int;
+    match unsafe { getsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_RCVBUF,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen as *mut _,
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(optval as u32),
+    }
+}
+
+pub(crate) fn set_send_buffer_size(socket: TcpSocket, size: u32) -> io::Result<()> {
+    let size = size.try_into().ok().unwrap_or_else(i32::max_value);
+    match unsafe { setsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_SNDBUF,
+        &size as *const _ as *const c_char,
+        size_of::<c_int>() as c_int
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(()),
+    }
+}
+
+pub(crate) fn get_send_buffer_size(socket: TcpSocket) -> io::Result<u32> {
+    let mut optval: c_int = 0;
+    let mut optlen = size_of::<c_int>() as c_int;
+    match unsafe { getsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_SNDBUF,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen as *mut _,
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(optval as u32),
+    }
+}
+
+pub(crate) fn set_keepalive(socket: TcpSocket, keepalive: bool) -> io::Result<()> {
+    let val: BOOL = if keepalive { TRUE } else { FALSE };
+    match unsafe { setsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_KEEPALIVE,
+        &val as *const _ as *const c_char,
+        size_of::<BOOL>() as c_int
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(()),
+    }
+}
+
+pub(crate) fn get_keepalive(socket: TcpSocket) -> io::Result<bool> {
+    let mut optval: c_char = 0;
+    let mut optlen = size_of::<BOOL>() as c_int;
+
+    match unsafe { getsockopt(
+        socket,
+        SOL_SOCKET,
+        SO_KEEPALIVE,
+        &mut optval as *mut _ as *mut _,
+        &mut optlen,
+    ) } {
+        SOCKET_ERROR => Err(io::Error::last_os_error()),
+        _ => Ok(optval != FALSE as c_char),
+    }
+}
+
+pub(crate) fn set_keepalive_params(socket: TcpSocket, keepalive: TcpKeepalive) -> io::Result<()> {
+    /// Windows configures keepalive time/interval in a u32 of milliseconds.
+    fn dur_to_ulong_ms(dur: Duration) -> c_ulong {
+        dur.as_millis().try_into().ok().unwrap_or_else(u32::max_value)
+    }
+
+    // If any of the fields on the `tcp_keepalive` struct were not provided by
+    // the user, just leaving them zero will clobber any existing value.
+    // Unfortunately, we can't access the current value, so we will use the
+    // defaults if a value for the time or interval was not not provided.
+    let time = keepalive.time.unwrap_or_else(|| {
+        // The default value is two hours, as per
+        // https://docs.microsoft.com/en-us/windows/win32/winsock/sio-keepalive-vals
+        let two_hours = 2 * 60 * 60;
+        Duration::from_secs(two_hours)
     });
-    me.accept = match result {
-        Ok(remote_addr) => State::Ready((socket, remote_addr)),
-        Err(e) => State::Error(e),
-    };
-    me2.add_readiness(&mut me, Ready::readable());
-}
-
-impl Evented for TcpListener {
-    fn register(&self, poll: &Poll, token: Token,
-                interest: Ready, opts: PollOpt) -> io::Result<()> {
-        let mut me = self.inner();
-        me.iocp.register_socket(&self.imp.inner.socket, poll, token,
-                                     interest, opts, &self.registration)?;
-
-        unsafe {
-            super::no_notify_on_instant_completion(self.imp.inner.socket.as_raw_socket() as HANDLE)?;
-            me.instant_notify = true;
-        }
 
-        self.imp.schedule_accept(&mut me);
-        Ok(())
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token,
-                  interest: Ready, opts: PollOpt) -> io::Result<()> {
-        let mut me = self.inner();
-        me.iocp.reregister_socket(&self.imp.inner.socket, poll, token,
-                                       interest, opts, &self.registration)?;
-        self.imp.schedule_accept(&mut me);
-        Ok(())
-    }
+    let interval = keepalive.interval.unwrap_or_else(|| {
+        // The default value is one second, as per
+        // https://docs.microsoft.com/en-us/windows/win32/winsock/sio-keepalive-vals
+        Duration::from_secs(1)
+    });
 
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.inner().iocp.deregister(&self.imp.inner.socket,
-                                     poll, &self.registration)
-    }
-}
+    let mut keepalive = mstcpip::tcp_keepalive {
+        // Enable keepalive
+        onoff: 1,
+        keepalivetime: dur_to_ulong_ms(time),
+        keepaliveinterval: dur_to_ulong_ms(interval),
+    };
 
-impl fmt::Debug for TcpListener {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("TcpListener")
-            .finish()
+    let mut out = 0;
+    match unsafe { WSAIoctl(
+        socket,
+        mstcpip::SIO_KEEPALIVE_VALS,
+        &mut keepalive as *mut _ as LPVOID,
+        size_of::<mstcpip::tcp_keepalive>() as DWORD,
+        ptr::null_mut() as LPVOID,
+        0 as DWORD,
+        &mut out as *mut _ as LPDWORD,
+        0 as LPWSAOVERLAPPED,
+        None,
+    ) } {
+        0 => Ok(()),
+        _ => Err(io::Error::last_os_error())
     }
 }
 
-impl Drop for TcpListener {
-    fn drop(&mut self) {
-        // If we're still internally reading, we're no longer interested.
-        unsafe {
-            match self.inner().accept {
-                State::Pending(_) => {
-                    trace!("cancelling active TCP accept");
-                    drop(super::cancel(&self.imp.inner.socket,
-                                       &self.imp.inner.accept));
-                }
-                State::Empty |
-                State::Ready(_) |
-                State::Error(_) => {}
-            }
-        }
-    }
+pub(crate) fn accept(listener: &net::TcpListener) -> io::Result<(net::TcpStream, SocketAddr)> {
+    // The non-blocking state of `listener` is inherited. See
+    // https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-accept#remarks.
+    listener.accept()
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/udp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/udp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,413 +1,53 @@
-//! UDP for IOCP
-//!
-//! Note that most of this module is quite similar to the TCP module, so if
-//! something seems odd you may also want to try the docs over there.
-
-use std::fmt;
-use std::io::prelude::*;
 use std::io;
-use std::mem;
-use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr};
-use std::sync::{Mutex, MutexGuard};
-
-#[allow(unused_imports)]
-use net2::{UdpBuilder, UdpSocketExt};
-use winapi::*;
-use miow::iocp::CompletionStatus;
-use miow::net::SocketAddrBuf;
-use miow::net::UdpSocketExt as MiowUdpSocketExt;
-
-use {poll, Ready, Poll, PollOpt, Token};
-use event::Evented;
-use sys::windows::from_raw_arc::FromRawArc;
-use sys::windows::selector::{Overlapped, ReadyBinding};
-
-pub struct UdpSocket {
-    imp: Imp,
-    registration: Mutex<Option<poll::Registration>>,
-}
-
-#[derive(Clone)]
-struct Imp {
-    inner: FromRawArc<Io>,
-}
-
-struct Io {
-    read: Overlapped,
-    write: Overlapped,
-    socket: net::UdpSocket,
-    inner: Mutex<Inner>,
-}
-
-struct Inner {
-    iocp: ReadyBinding,
-    read: State<Vec<u8>, Vec<u8>>,
-    write: State<Vec<u8>, (Vec<u8>, usize)>,
-    read_buf: SocketAddrBuf,
-}
-
-enum State<T, U> {
-    Empty,
-    Pending(T),
-    Ready(U),
-    Error(io::Error),
-}
-
-impl UdpSocket {
-    pub fn new(socket: net::UdpSocket) -> io::Result<UdpSocket> {
-        Ok(UdpSocket {
-            registration: Mutex::new(None),
-            imp: Imp {
-                inner: FromRawArc::new(Io {
-                    read: Overlapped::new(recv_done),
-                    write: Overlapped::new(send_done),
-                    socket: socket,
-                    inner: Mutex::new(Inner {
-                        iocp: ReadyBinding::new(),
-                        read: State::Empty,
-                        write: State::Empty,
-                        read_buf: SocketAddrBuf::new(),
-                    }),
-                }),
-            },
+use std::mem::{self, MaybeUninit};
+use std::net::{self, SocketAddr};
+use std::os::windows::io::{AsRawSocket, FromRawSocket};
+use std::os::windows::raw::SOCKET as StdSocket; // winapi uses usize, stdlib uses u32/u64.
+
+use winapi::ctypes::c_int;
+use winapi::shared::ws2def::IPPROTO_IPV6;
+use winapi::shared::ws2ipdef::IPV6_V6ONLY;
+use winapi::um::winsock2::{bind as win_bind, closesocket, getsockopt, SOCKET_ERROR, SOCK_DGRAM};
+
+use crate::sys::windows::net::{init, new_ip_socket, socket_addr};
+
+pub fn bind(addr: SocketAddr) -> io::Result<net::UdpSocket> {
+    init();
+    new_ip_socket(addr, SOCK_DGRAM).and_then(|socket| {
+        let (raw_addr, raw_addr_length) = socket_addr(&addr);
+        syscall!(
+            win_bind(socket, raw_addr.as_ptr(), raw_addr_length,),
+            PartialEq::eq,
+            SOCKET_ERROR
+        )
+        .map_err(|err| {
+            // Close the socket if we hit an error, ignoring the error
+            // from closing since we can't pass back two errors.
+            let _ = unsafe { closesocket(socket) };
+            err
         })
-    }
-
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.imp.inner.socket.local_addr()
-    }
-
-    pub fn try_clone(&self) -> io::Result<UdpSocket> {
-        self.imp.inner.socket.try_clone().and_then(UdpSocket::new)
-    }
-
-    /// Note that unlike `TcpStream::write` this function will not attempt to
-    /// continue writing `buf` until its entirely written.
-    ///
-    /// TODO: This... may be wrong in the long run. We're reporting that we
-    ///       successfully wrote all of the bytes in `buf` but it's possible
-    ///       that we don't actually end up writing all of them!
-    pub fn send_to(&self, buf: &[u8], target: &SocketAddr)
-                   -> io::Result<usize> {
-        let mut me = self.inner();
-        let me = &mut *me;
-
-        match me.write {
-            State::Empty => {}
-            _ => return Err(io::ErrorKind::WouldBlock.into()),
-        }
-
-        if !me.iocp.registered() {
-            return Err(io::ErrorKind::WouldBlock.into())
-        }
-
-        let interest = me.iocp.readiness();
-        me.iocp.set_readiness(interest - Ready::writable());
-
-        let mut owned_buf = me.iocp.get_buffer(64 * 1024);
-        let amt = owned_buf.write(buf)?;
-        unsafe {
-            trace!("scheduling a send");
-            self.imp.inner.socket.send_to_overlapped(&owned_buf, target,
-                                                     self.imp.inner.write.as_mut_ptr())
-        }?;
-        me.write = State::Pending(owned_buf);
-        mem::forget(self.imp.clone());
-        Ok(amt)
-    }
-
-    /// Note that unlike `TcpStream::write` this function will not attempt to
-    /// continue writing `buf` until its entirely written.
-    ///
-    /// TODO: This... may be wrong in the long run. We're reporting that we
-    ///       successfully wrote all of the bytes in `buf` but it's possible
-    ///       that we don't actually end up writing all of them!
-    pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        let mut me = self.inner();
-        let me = &mut *me;
-
-        match me.write {
-            State::Empty => {}
-            _ => return Err(io::ErrorKind::WouldBlock.into()),
-        }
-
-        if !me.iocp.registered() {
-            return Err(io::ErrorKind::WouldBlock.into())
-        }
-
-        let interest = me.iocp.readiness();
-        me.iocp.set_readiness(interest - Ready::writable());
-
-        let mut owned_buf = me.iocp.get_buffer(64 * 1024);
-        let amt = owned_buf.write(buf)?;
-        unsafe {
-            trace!("scheduling a send");
-            self.imp.inner.socket.send_overlapped(&owned_buf, self.imp.inner.write.as_mut_ptr())
-
-        }?;
-        me.write = State::Pending(owned_buf);
-        mem::forget(self.imp.clone());
-        Ok(amt)
-    }
-
-    pub fn recv_from(&self, mut buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        let mut me = self.inner();
-        match mem::replace(&mut me.read, State::Empty) {
-            State::Empty => Err(io::ErrorKind::WouldBlock.into()),
-            State::Pending(b) => { me.read = State::Pending(b); Err(io::ErrorKind::WouldBlock.into()) }
-            State::Ready(data) => {
-                // If we weren't provided enough space to receive the message
-                // then don't actually read any data, just return an error.
-                if buf.len() < data.len() {
-                    me.read = State::Ready(data);
-                    Err(io::Error::from_raw_os_error(WSAEMSGSIZE as i32))
-                } else {
-                    let r = if let Some(addr) = me.read_buf.to_socket_addr() {
-                        buf.write(&data).unwrap();
-                        Ok((data.len(), addr))
-                    } else {
-                        Err(io::Error::new(io::ErrorKind::Other,
-                                           "failed to parse socket address"))
-                    };
-                    me.iocp.put_buffer(data);
-                    self.imp.schedule_read_from(&mut me);
-                    r
-                }
-            }
-            State::Error(e) => {
-                self.imp.schedule_read_from(&mut me);
-                Err(e)
-            }
-        }
-    }
-
-    pub fn recv(&self, buf: &mut [u8])
-                     -> io::Result<usize> {
-        //Since recv_from can be used on connected sockets just call it and drop the address.
-        self.recv_from(buf).map(|(size,_)| size)
-    }
-
-    pub fn connect(&self, addr: SocketAddr) -> io::Result<()> {
-        self.imp.inner.socket.connect(addr)
-    }
-
-    pub fn broadcast(&self) -> io::Result<bool> {
-        self.imp.inner.socket.broadcast()
-    }
-
-    pub fn set_broadcast(&self, on: bool) -> io::Result<()> {
-        self.imp.inner.socket.set_broadcast(on)
-    }
-
-    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
-        self.imp.inner.socket.multicast_loop_v4()
-    }
-
-    pub fn set_multicast_loop_v4(&self, on: bool) -> io::Result<()> {
-        self.imp.inner.socket.set_multicast_loop_v4(on)
-    }
-
-    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        self.imp.inner.socket.multicast_ttl_v4()
-    }
-
-    pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
-        self.imp.inner.socket.set_multicast_ttl_v4(ttl)
-    }
-
-    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
-        self.imp.inner.socket.multicast_loop_v6()
-    }
-
-    pub fn set_multicast_loop_v6(&self, on: bool) -> io::Result<()> {
-        self.imp.inner.socket.set_multicast_loop_v6(on)
-    }
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.imp.inner.socket.ttl()
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.imp.inner.socket.set_ttl(ttl)
-    }
-
-    pub fn join_multicast_v4(&self,
-                             multiaddr: &Ipv4Addr,
-                             interface: &Ipv4Addr) -> io::Result<()> {
-        self.imp.inner.socket.join_multicast_v4(multiaddr, interface)
-    }
-
-    pub fn join_multicast_v6(&self,
-                             multiaddr: &Ipv6Addr,
-                             interface: u32) -> io::Result<()> {
-        self.imp.inner.socket.join_multicast_v6(multiaddr, interface)
-    }
-
-    pub fn leave_multicast_v4(&self,
-                              multiaddr: &Ipv4Addr,
-                              interface: &Ipv4Addr) -> io::Result<()> {
-        self.imp.inner.socket.leave_multicast_v4(multiaddr, interface)
-    }
-
-    pub fn leave_multicast_v6(&self,
-                              multiaddr: &Ipv6Addr,
-                              interface: u32) -> io::Result<()> {
-        self.imp.inner.socket.leave_multicast_v6(multiaddr, interface)
-    }
-
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.imp.inner.socket.set_only_v6(only_v6)
-    }
-
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.imp.inner.socket.only_v6()
-    }
-
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.imp.inner.socket.take_error()
-    }
-
-    fn inner(&self) -> MutexGuard<Inner> {
-        self.imp.inner()
-    }
-
-    fn post_register(&self, interest: Ready, me: &mut Inner) {
-        if interest.is_readable() {
-            //We use recv_from here since it is well specified for both
-            //connected and non-connected sockets and we can discard the address
-            //when calling recv().
-            self.imp.schedule_read_from(me);
-        }
-        // See comments in TcpSocket::post_register for what's going on here
-        if interest.is_writable() {
-            if let State::Empty = me.write {
-                self.imp.add_readiness(me, Ready::writable());
-            }
-        }
-    }
-}
-
-impl Imp {
-    fn inner(&self) -> MutexGuard<Inner> {
-        self.inner.inner.lock().unwrap()
-    }
-
-    fn schedule_read_from(&self, me: &mut Inner) {
-        match me.read {
-            State::Empty => {}
-            _ => return,
-        }
-
-        let interest = me.iocp.readiness();
-        me.iocp.set_readiness(interest - Ready::readable());
-
-        let mut buf = me.iocp.get_buffer(64 * 1024);
-        let res = unsafe {
-            trace!("scheduling a read");
-            let cap = buf.capacity();
-            buf.set_len(cap);
-            self.inner.socket.recv_from_overlapped(&mut buf, &mut me.read_buf,
-                                                   self.inner.read.as_mut_ptr())
-        };
-        match res {
-            Ok(_) => {
-                me.read = State::Pending(buf);
-                mem::forget(self.clone());
-            }
-            Err(e) => {
-                me.read = State::Error(e);
-                self.add_readiness(me, Ready::readable());
-                me.iocp.put_buffer(buf);
-            }
-        }
-    }
-
-    // See comments in tcp::StreamImp::push
-    fn add_readiness(&self, me: &Inner, set: Ready) {
-        me.iocp.set_readiness(set | me.iocp.readiness());
-    }
-}
-
-impl Evented for UdpSocket {
-    fn register(&self, poll: &Poll, token: Token,
-                interest: Ready, opts: PollOpt) -> io::Result<()> {
-        let mut me = self.inner();
-        me.iocp.register_socket(&self.imp.inner.socket,
-                                     poll, token, interest, opts,
-                                     &self.registration)?;
-        self.post_register(interest, &mut me);
-        Ok(())
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token,
-                  interest: Ready, opts: PollOpt) -> io::Result<()> {
-        let mut me = self.inner();
-        me.iocp.reregister_socket(&self.imp.inner.socket,
-                                       poll, token, interest,
-                                       opts, &self.registration)?;
-        self.post_register(interest, &mut me);
-        Ok(())
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.inner().iocp.deregister(&self.imp.inner.socket,
-                                     poll, &self.registration)
-    }
-}
-
-impl fmt::Debug for UdpSocket {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("UdpSocket")
-            .finish()
-    }
-}
-
-impl Drop for UdpSocket {
-    fn drop(&mut self) {
-        let inner = self.inner();
-
-        // If we're still internally reading, we're no longer interested. Note
-        // though that we don't cancel any writes which may have been issued to
-        // preserve the same semantics as Unix.
-        unsafe {
-            match inner.read {
-                State::Pending(_) => {
-                    drop(super::cancel(&self.imp.inner.socket,
-                                       &self.imp.inner.read));
-                }
-                State::Empty |
-                State::Ready(_) |
-                State::Error(_) => {}
-            }
-        }
-    }
-}
-
-fn send_done(status: &OVERLAPPED_ENTRY) {
-    let status = CompletionStatus::from_entry(status);
-    trace!("finished a send {}", status.bytes_transferred());
-    let me2 = Imp {
-        inner: unsafe { overlapped2arc!(status.overlapped(), Io, write) },
-    };
-    let mut me = me2.inner();
-    me.write = State::Empty;
-    me2.add_readiness(&mut me, Ready::writable());
+        .map(|_| unsafe { net::UdpSocket::from_raw_socket(socket as StdSocket) })
+    })
 }
 
-fn recv_done(status: &OVERLAPPED_ENTRY) {
-    let status = CompletionStatus::from_entry(status);
-    trace!("finished a recv {}", status.bytes_transferred());
-    let me2 = Imp {
-        inner: unsafe { overlapped2arc!(status.overlapped(), Io, read) },
-    };
-    let mut me = me2.inner();
-    let mut buf = match mem::replace(&mut me.read, State::Empty) {
-        State::Pending(buf) => buf,
-        _ => unreachable!(),
-    };
-    unsafe {
-        buf.set_len(status.bytes_transferred() as usize);
-    }
-    me.read = State::Ready(buf);
-    me2.add_readiness(&mut me, Ready::readable());
+pub(crate) fn only_v6(socket: &net::UdpSocket) -> io::Result<bool> {
+    let mut optval: MaybeUninit<c_int> = MaybeUninit::uninit();
+    let mut optlen = mem::size_of::<c_int>() as c_int;
+
+    syscall!(
+        getsockopt(
+            socket.as_raw_socket() as usize,
+            IPPROTO_IPV6 as c_int,
+            IPV6_V6ONLY as c_int,
+            optval.as_mut_ptr().cast(),
+            &mut optlen,
+        ),
+        PartialEq::eq,
+        SOCKET_ERROR
+    )?;
+
+    debug_assert_eq!(optlen as usize, mem::size_of::<c_int>());
+    // Safety: `getsockopt` initialised `optval` for us.
+    let optval = unsafe { optval.assume_init() };
+    Ok(optval != 0)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/sys/windows/waker.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/sys/windows/waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,29 @@
+use crate::sys::windows::Event;
+use crate::sys::windows::Selector;
+use crate::Token;
+
+use miow::iocp::CompletionPort;
+use std::io;
+use std::sync::Arc;
+
+#[derive(Debug)]
+pub struct Waker {
+    token: Token,
+    port: Arc<CompletionPort>,
+}
+
+impl Waker {
+    pub fn new(selector: &Selector, token: Token) -> io::Result<Waker> {
+        Ok(Waker {
+            token,
+            port: selector.clone_port(),
+        })
+    }
+
+    pub fn wake(&self) -> io::Result<()> {
+        let mut ev = Event::new(self.token);
+        ev.set_readable();
+
+        self.port.post(ev.to_completion_status())
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/timer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/timer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/timer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/timer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,516 +0,0 @@
-//! Timer optimized for I/O related operations
-
-#![allow(deprecated, missing_debug_implementations)]
-
-use {convert, io, Ready, Poll, PollOpt, Registration, SetReadiness, Token};
-use event::Evented;
-use lazycell::LazyCell;
-use slab::Slab;
-use std::{cmp, error, fmt, u64, usize, iter, thread};
-use std::sync::Arc;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::time::{Duration, Instant};
-
-use self::TimerErrorKind::TimerOverflow;
-
-pub struct Timer<T> {
-    // Size of each tick in milliseconds
-    tick_ms: u64,
-    // Slab of timeout entries
-    entries: Slab<Entry<T>>,
-    // Timeout wheel. Each tick, the timer will look at the next slot for
-    // timeouts that match the current tick.
-    wheel: Vec<WheelEntry>,
-    // Tick 0's time instant
-    start: Instant,
-    // The current tick
-    tick: Tick,
-    // The next entry to possibly timeout
-    next: Token,
-    // Masks the target tick to get the slot
-    mask: u64,
-    // Set on registration with Poll
-    inner: LazyCell<Inner>,
-}
-
-pub struct Builder {
-    // Approximate duration of each tick
-    tick: Duration,
-    // Number of slots in the timer wheel
-    num_slots: usize,
-    // Max number of timeouts that can be in flight at a given time.
-    capacity: usize,
-}
-
-#[derive(Clone, Debug)]
-pub struct Timeout {
-    // Reference into the timer entry slab
-    token: Token,
-    // Tick that it should match up with
-    tick: u64,
-}
-
-struct Inner {
-    registration: Registration,
-    set_readiness: SetReadiness,
-    wakeup_state: WakeupState,
-    wakeup_thread: thread::JoinHandle<()>,
-}
-
-impl Drop for Inner {
-    fn drop(&mut self) {
-        // 1. Set wakeup state to TERMINATE_THREAD (https://github.com/carllerche/mio/blob/master/src/timer.rs#L451)
-        self.wakeup_state.store(TERMINATE_THREAD, Ordering::Release);
-        // 2. Wake him up
-        self.wakeup_thread.thread().unpark();
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-struct WheelEntry {
-    next_tick: Tick,
-    head: Token,
-}
-
-// Doubly linked list of timer entries. Allows for efficient insertion /
-// removal of timeouts.
-struct Entry<T> {
-    state: T,
-    links: EntryLinks,
-}
-
-#[derive(Copy, Clone)]
-struct EntryLinks {
-    tick: Tick,
-    prev: Token,
-    next: Token
-}
-
-type Tick = u64;
-
-const TICK_MAX: Tick = u64::MAX;
-
-// Manages communication with wakeup thread
-type WakeupState = Arc<AtomicUsize>;
-
-pub type Result<T> = ::std::result::Result<T, TimerError>;
-// TODO: remove
-pub type TimerResult<T> = Result<T>;
-
-
-/// Deprecated and unused.
-#[derive(Debug)]
-pub struct TimerError;
-
-/// Deprecated and unused.
-#[derive(Debug)]
-pub enum TimerErrorKind {
-    TimerOverflow,
-}
-
-// TODO: Remove
-pub type OldTimerResult<T> = Result<T>;
-
-const TERMINATE_THREAD: usize = 0;
-const EMPTY: Token = Token(usize::MAX);
-
-impl Builder {
-    pub fn tick_duration(mut self, duration: Duration) -> Builder {
-        self.tick = duration;
-        self
-    }
-
-    pub fn num_slots(mut self, num_slots: usize) -> Builder {
-        self.num_slots = num_slots;
-        self
-    }
-
-    pub fn capacity(mut self, capacity: usize) -> Builder {
-        self.capacity = capacity;
-        self
-    }
-
-    pub fn build<T>(self) -> Timer<T> {
-        Timer::new(convert::millis(self.tick), self.num_slots, self.capacity, Instant::now())
-    }
-}
-
-impl Default for Builder {
-    fn default() -> Builder {
-        Builder {
-            tick: Duration::from_millis(100),
-            num_slots: 256,
-            capacity: 65_536,
-        }
-    }
-}
-
-impl<T> Timer<T> {
-    fn new(tick_ms: u64, num_slots: usize, capacity: usize, start: Instant) -> Timer<T> {
-        let num_slots = num_slots.next_power_of_two();
-        let capacity = capacity.next_power_of_two();
-        let mask = (num_slots as u64) - 1;
-        let wheel = iter::repeat(WheelEntry { next_tick: TICK_MAX, head: EMPTY })
-            .take(num_slots).collect();
-
-        Timer {
-            tick_ms,
-            entries: Slab::with_capacity(capacity),
-            wheel,
-            start,
-            tick: 0,
-            next: EMPTY,
-            mask,
-            inner: LazyCell::new(),
-        }
-    }
-
-    pub fn set_timeout(&mut self, delay_from_now: Duration, state: T) -> Result<Timeout> {
-        let delay_from_start = self.start.elapsed() + delay_from_now;
-        self.set_timeout_at(delay_from_start, state)
-    }
-
-    fn set_timeout_at(&mut self, delay_from_start: Duration, state: T) -> Result<Timeout> {
-        let mut tick = duration_to_tick(delay_from_start, self.tick_ms);
-        trace!("setting timeout; delay={:?}; tick={:?}; current-tick={:?}", delay_from_start, tick, self.tick);
-
-        // Always target at least 1 tick in the future
-        if tick <= self.tick {
-            tick = self.tick + 1;
-        }
-
-        self.insert(tick, state)
-    }
-
-    fn insert(&mut self, tick: Tick, state: T) -> Result<Timeout> {
-        // Get the slot for the requested tick
-        let slot = (tick & self.mask) as usize;
-        let curr = self.wheel[slot];
-
-        // Insert the new entry
-        let entry = Entry::new(state, tick, curr.head);
-        let token = Token(self.entries.insert(entry));
-
-        if curr.head != EMPTY {
-            // If there was a previous entry, set its prev pointer to the new
-            // entry
-            self.entries[curr.head.into()].links.prev = token;
-        }
-
-        // Update the head slot
-        self.wheel[slot] = WheelEntry {
-            next_tick: cmp::min(tick, curr.next_tick),
-            head: token,
-        };
-
-        self.schedule_readiness(tick);
-
-        trace!("inserted timeout; slot={}; token={:?}", slot, token);
-
-        // Return the new timeout
-        Ok(Timeout {
-            token,
-            tick
-        })
-    }
-
-    pub fn cancel_timeout(&mut self, timeout: &Timeout) -> Option<T> {
-        let links = match self.entries.get(timeout.token.into()) {
-            Some(e) => e.links,
-            None => return None
-        };
-
-        // Sanity check
-        if links.tick != timeout.tick {
-            return None;
-        }
-
-        self.unlink(&links, timeout.token);
-        Some(self.entries.remove(timeout.token.into()).state)
-    }
-
-    pub fn poll(&mut self) -> Option<T> {
-        let target_tick = current_tick(self.start, self.tick_ms);
-        self.poll_to(target_tick)
-    }
-
-    fn poll_to(&mut self, mut target_tick: Tick) -> Option<T> {
-        trace!("tick_to; target_tick={}; current_tick={}", target_tick, self.tick);
-
-        if target_tick < self.tick {
-            target_tick = self.tick;
-        }
-
-        while self.tick <= target_tick {
-            let curr = self.next;
-
-            trace!("ticking; curr={:?}", curr);
-
-            if curr == EMPTY {
-                self.tick += 1;
-
-                let slot = self.slot_for(self.tick);
-                self.next = self.wheel[slot].head;
-
-                // Handle the case when a slot has a single timeout which gets
-                // canceled before the timeout expires. In this case, the
-                // slot's head is EMPTY but there is a value for next_tick. Not
-                // resetting next_tick here causes the timer to get stuck in a
-                // loop.
-                if self.next == EMPTY {
-                    self.wheel[slot].next_tick = TICK_MAX;
-                }
-            } else {
-                let slot = self.slot_for(self.tick);
-
-                if curr == self.wheel[slot].head {
-                    self.wheel[slot].next_tick = TICK_MAX;
-                }
-
-                let links = self.entries[curr.into()].links;
-
-                if links.tick <= self.tick {
-                    trace!("triggering; token={:?}", curr);
-
-                    // Unlink will also advance self.next
-                    self.unlink(&links, curr);
-
-                    // Remove and return the token
-                    return Some(self.entries.remove(curr.into()).state);
-                } else {
-                    let next_tick = self.wheel[slot].next_tick;
-                    self.wheel[slot].next_tick = cmp::min(next_tick, links.tick);
-                    self.next = links.next;
-                }
-            }
-        }
-
-        // No more timeouts to poll
-        if let Some(inner) = self.inner.borrow() {
-            trace!("unsetting readiness");
-            let _ = inner.set_readiness.set_readiness(Ready::empty());
-
-            if let Some(tick) = self.next_tick() {
-                self.schedule_readiness(tick);
-            }
-        }
-
-        None
-    }
-
-    fn unlink(&mut self, links: &EntryLinks, token: Token) {
-       trace!("unlinking timeout; slot={}; token={:?}",
-               self.slot_for(links.tick), token);
-
-        if links.prev == EMPTY {
-            let slot = self.slot_for(links.tick);
-            self.wheel[slot].head = links.next;
-        } else {
-            self.entries[links.prev.into()].links.next = links.next;
-        }
-
-        if links.next != EMPTY {
-            self.entries[links.next.into()].links.prev = links.prev;
-
-            if token == self.next {
-                self.next = links.next;
-            }
-        } else if token == self.next {
-            self.next = EMPTY;
-        }
-    }
-
-    fn schedule_readiness(&self, tick: Tick) {
-        if let Some(inner) = self.inner.borrow() {
-            // Coordinate setting readiness w/ the wakeup thread
-            let mut curr = inner.wakeup_state.load(Ordering::Acquire);
-
-            loop {
-                if curr as Tick <= tick {
-                    // Nothing to do, wakeup is already scheduled
-                    return;
-                }
-
-                // Attempt to move the wakeup time forward
-                trace!("advancing the wakeup time; target={}; curr={}", tick, curr);
-                let actual = inner.wakeup_state.compare_and_swap(curr, tick as usize, Ordering::Release);
-
-                if actual == curr {
-                    // Signal to the wakeup thread that the wakeup time has
-                    // been changed.
-                    trace!("unparking wakeup thread");
-                    inner.wakeup_thread.thread().unpark();
-                    return;
-                }
-
-                curr = actual;
-            }
-        }
-    }
-
-    // Next tick containing a timeout
-    fn next_tick(&self) -> Option<Tick> {
-        if self.next != EMPTY {
-            let slot = self.slot_for(self.entries[self.next.into()].links.tick);
-
-            if self.wheel[slot].next_tick == self.tick {
-                // There is data ready right now
-                return Some(self.tick);
-            }
-        }
-
-        self.wheel.iter().map(|e| e.next_tick).min()
-    }
-
-    fn slot_for(&self, tick: Tick) -> usize {
-        (self.mask & tick) as usize
-    }
-}
-
-impl<T> Default for Timer<T> {
-    fn default() -> Timer<T> {
-        Builder::default().build()
-    }
-}
-
-impl<T> Evented for Timer<T> {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        if self.inner.borrow().is_some() {
-            return Err(io::Error::new(io::ErrorKind::Other, "timer already registered"));
-        }
-
-        let (registration, set_readiness) = Registration::new(poll, token, interest, opts);
-        let wakeup_state = Arc::new(AtomicUsize::new(usize::MAX));
-        let thread_handle = spawn_wakeup_thread(
-            wakeup_state.clone(),
-            set_readiness.clone(),
-            self.start, self.tick_ms);
-
-        self.inner.fill(Inner {
-            registration,
-            set_readiness,
-            wakeup_state,
-            wakeup_thread: thread_handle,
-        }).expect("timer already registered");
-
-        if let Some(next_tick) = self.next_tick() {
-            self.schedule_readiness(next_tick);
-        }
-
-        Ok(())
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        match self.inner.borrow() {
-            Some(inner) => inner.registration.update(poll, token, interest, opts),
-            None => Err(io::Error::new(io::ErrorKind::Other, "receiver not registered")),
-        }
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        match self.inner.borrow() {
-            Some(inner) => inner.registration.deregister(poll),
-            None => Err(io::Error::new(io::ErrorKind::Other, "receiver not registered")),
-        }
-    }
-}
-
-impl fmt::Debug for Inner {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("Inner")
-            .field("registration", &self.registration)
-            .field("wakeup_state", &self.wakeup_state.load(Ordering::Relaxed))
-            .finish()
-    }
-}
-
-fn spawn_wakeup_thread(state: WakeupState, set_readiness: SetReadiness, start: Instant, tick_ms: u64) -> thread::JoinHandle<()> {
-    thread::spawn(move || {
-        let mut sleep_until_tick = state.load(Ordering::Acquire) as Tick;
-
-        loop {
-            if sleep_until_tick == TERMINATE_THREAD as Tick {
-                return;
-            }
-
-            let now_tick = current_tick(start, tick_ms);
-
-            trace!("wakeup thread: sleep_until_tick={:?}; now_tick={:?}", sleep_until_tick, now_tick);
-
-            if now_tick < sleep_until_tick {
-                // Calling park_timeout with u64::MAX leads to undefined
-                // behavior in pthread, causing the park to return immediately
-                // and causing the thread to tightly spin. Instead of u64::MAX
-                // on large values, simply use a blocking park.
-                match tick_ms.checked_mul(sleep_until_tick - now_tick) {
-                    Some(sleep_duration) => {
-                        trace!("sleeping; tick_ms={}; now_tick={}; sleep_until_tick={}; duration={:?}",
-                               tick_ms, now_tick, sleep_until_tick, sleep_duration);
-                        thread::park_timeout(Duration::from_millis(sleep_duration));
-                    }
-                    None => {
-                        trace!("sleeping; tick_ms={}; now_tick={}; blocking sleep",
-                               tick_ms, now_tick);
-                        thread::park();
-                    }
-                }
-                sleep_until_tick = state.load(Ordering::Acquire) as Tick;
-            } else {
-                let actual = state.compare_and_swap(sleep_until_tick as usize, usize::MAX, Ordering::AcqRel) as Tick;
-
-                if actual == sleep_until_tick {
-                    trace!("setting readiness from wakeup thread");
-                    let _ = set_readiness.set_readiness(Ready::readable());
-                    sleep_until_tick = usize::MAX as Tick;
-                } else {
-                    sleep_until_tick = actual as Tick;
-                }
-            }
-        }
-    })
-}
-
-fn duration_to_tick(elapsed: Duration, tick_ms: u64) -> Tick {
-    // Calculate tick rounding up to the closest one
-    let elapsed_ms = convert::millis(elapsed);
-    elapsed_ms.saturating_add(tick_ms / 2) / tick_ms
-}
-
-fn current_tick(start: Instant, tick_ms: u64) -> Tick {
-    duration_to_tick(start.elapsed(), tick_ms)
-}
-
-impl<T> Entry<T> {
-    fn new(state: T, tick: u64, next: Token) -> Entry<T> {
-        Entry {
-            state,
-            links: EntryLinks {
-                tick,
-                prev: EMPTY,
-                next,
-            },
-        }
-    }
-}
-
-impl fmt::Display for TimerError {
-    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
-        // `TimerError` will never be constructed.
-        unreachable!();
-    }
-}
-
-impl error::Error for TimerError {
-    fn description(&self) -> &str {
-        // `TimerError` will never be constructed.
-        unreachable!();
-    }
-}
-
-impl fmt::Display for TimerErrorKind {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            TimerOverflow => write!(fmt, "TimerOverflow"),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/token.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/token.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,27 @@
-/// Associates readiness notifications with [`Evented`] handles.
+/// Associates readiness events with [`event::Source`]s.
 ///
 /// `Token` is a wrapper around `usize` and is used as an argument to
-/// [`Poll::register`] and [`Poll::reregister`].
+/// [`Registry::register`] and [`Registry::reregister`].
 ///
 /// See [`Poll`] for more documentation on polling.
 ///
+/// [`event::Source`]: ./event/trait.Source.html
+/// [`Poll`]: struct.Poll.html
+/// [`Registry::register`]: struct.Registry.html#method.register
+/// [`Registry::reregister`]: struct.Registry.html#method.reregister
+///
 /// # Example
 ///
-/// Using `Token` to track which socket generated the notification. In this
-/// example, `HashMap` is used, but usually something like [`slab`] is better.
+/// Using `Token` to track which socket generated the event. In this example,
+/// `HashMap` is used, but usually something like [`slab`] is better.
 ///
-/// ```
+/// [`slab`]: https://crates.io/crates/slab
+///
+#[cfg_attr(all(feature = "os-poll", features = "net"), doc = "```")]
+#[cfg_attr(not(all(feature = "os-poll", features = "net")), doc = "```ignore")]
 /// # use std::error::Error;
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// use mio::{Events, Ready, Poll, PollOpt, Token};
+/// # fn main() -> Result<(), Box<dyn Error>> {
+/// use mio::{Events, Interest, Poll, Token};
 /// use mio::net::TcpListener;
 ///
 /// use std::thread;
@@ -34,16 +42,13 @@
 /// let mut next_socket_index = 0;
 ///
 /// // The `Poll` instance
-/// let poll = Poll::new()?;
+/// let mut poll = Poll::new()?;
 ///
 /// // Tcp listener
-/// let listener = TcpListener::bind(&"127.0.0.1:0".parse()?)?;
+/// let mut listener = TcpListener::bind("127.0.0.1:0".parse()?)?;
 ///
 /// // Register the listener
-/// poll.register(&listener,
-///               LISTENER,
-///               Ready::readable(),
-///               PollOpt::edge())?;
+/// poll.registry().register(&mut listener, LISTENER, Interest::READABLE)?;
 ///
 /// // Spawn a thread that will connect a bunch of sockets then close them
 /// let addr = listener.local_addr()?;
@@ -53,7 +58,7 @@
 ///     // +1 here is to connect an extra socket to signal the socket to close
 ///     for _ in 0..(MAX_SOCKETS+1) {
 ///         // Connect then drop the socket
-///         let _ = TcpStream::connect(&addr).unwrap();
+///         let _ = TcpStream::connect(addr).unwrap();
 ///     }
 /// });
 ///
@@ -75,7 +80,7 @@
 ///                 // encountered.
 ///                 loop {
 ///                     match listener.accept() {
-///                         Ok((socket, _)) => {
+///                         Ok((mut socket, _)) => {
 ///                             // Shutdown the server
 ///                             if next_socket_index == MAX_SOCKETS {
 ///                                 return Ok(());
@@ -86,10 +91,7 @@
 ///                             next_socket_index += 1;
 ///
 ///                             // Register the new socket w/ poll
-///                             poll.register(&socket,
-///                                          token,
-///                                          Ready::readable(),
-///                                          PollOpt::edge())?;
+///                             poll.registry().register(&mut socket, token, Interest::READABLE)?;
 ///
 ///                             // Store the socket
 ///                             sockets.insert(token, socket);
@@ -124,28 +126,11 @@
 ///         }
 ///     }
 /// }
-/// #     Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
 /// # }
 /// ```
-///
-/// [`Evented`]: event/trait.Evented.html
-/// [`Poll`]: struct.Poll.html
-/// [`Poll::register`]: struct.Poll.html#method.register
-/// [`Poll::reregister`]: struct.Poll.html#method.reregister
-/// [`slab`]: https://crates.io/crates/slab
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Token(pub usize);
 
-impl From<usize> for Token {
-    fn from(val: usize) -> Token {
-        Token(val)
-    }
-}
-
 impl From<Token> for usize {
     fn from(val: Token) -> usize {
         val.0
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/udp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/udp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,326 +0,0 @@
-//! Primitives for working with UDP
-//!
-//! The types provided in this module are non-blocking by default and are
-//! designed to be portable across all supported Mio platforms. As long as the
-//! [portability guidelines] are followed, the behavior should be identical no
-//! matter the target platform.
-//!
-//! [portability guidelines]: ../struct.Poll.html#portability
-
-#![allow(deprecated)]
-
-use {sys, Ready, Poll, PollOpt, Token};
-use io::{self, MapNonBlock};
-use event::Evented;
-use poll::SelectorId;
-use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr};
-
-/// A User Datagram Protocol socket.
-///
-/// This is an implementation of a bound UDP socket. This supports both IPv4 and
-/// IPv6 addresses, and there is no corresponding notion of a server because UDP
-/// is a datagram protocol.
-#[derive(Debug)]
-pub struct UdpSocket {
-    sys: sys::UdpSocket,
-    selector_id: SelectorId,
-}
-
-impl UdpSocket {
-    /// Creates a UDP socket from the given address.
-    pub fn bind(addr: &SocketAddr) -> io::Result<UdpSocket> {
-        let socket = net::UdpSocket::bind(addr)?;
-        UdpSocket::from_socket(socket)
-    }
-
-    /// Creates a new mio-wrapped socket from an underlying and bound std
-    /// socket.
-    ///
-    /// This function requires that `socket` has previously been bound to an
-    /// address to work correctly, and returns an I/O object which can be used
-    /// with mio to send/receive UDP messages.
-    ///
-    /// This can be used in conjunction with net2's `UdpBuilder` interface to
-    /// configure a socket before it's handed off to mio, such as setting
-    /// options like `reuse_address` or binding to multiple addresses.
-    pub fn from_socket(socket: net::UdpSocket) -> io::Result<UdpSocket> {
-        Ok(UdpSocket {
-            sys: sys::UdpSocket::new(socket)?,
-            selector_id: SelectorId::new(),
-        })
-    }
-
-    /// Returns the socket address that this socket was created from.
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.sys.local_addr()
-    }
-
-    /// Creates a new independently owned handle to the underlying socket.
-    ///
-    /// The returned `UdpSocket` is a reference to the same socket that this
-    /// object references. Both handles will read and write the same port, and
-    /// options set on one socket will be propagated to the other.
-    pub fn try_clone(&self) -> io::Result<UdpSocket> {
-        self.sys.try_clone()
-            .map(|s| {
-                UdpSocket {
-                    sys: s,
-                    selector_id: self.selector_id.clone(),
-                }
-            })
-    }
-
-    /// Sends data on the socket to the given address. On success, returns the
-    /// number of bytes written.
-    ///
-    /// Address type can be any implementor of `ToSocketAddrs` trait. See its
-    /// documentation for concrete examples.
-    pub fn send_to(&self, buf: &[u8], target: &SocketAddr)
-                   -> io::Result<Option<usize>> {
-        self.sys.send_to(buf, target).map_non_block()
-    }
-
-    /// Receives data from the socket and stores data in the supplied buffer `buf`. On success,
-    /// returns the number of bytes read and the address from whence the data came.
-    ///
-    /// The function must be called with valid byte array `buf` of sufficient size to
-    /// hold the message bytes. If a message is too long to fit in the supplied buffer,
-    /// excess bytes may be discarded.
-    ///
-    /// The function does not read from `buf`, but is overwriting previous content of `buf`.
-    ///
-    /// Assuming the function has read `n` bytes, slicing `&buf[..n]` provides
-    /// efficient access with iterators and boundary checks.
-    pub fn recv_from(&self, buf: &mut [u8])
-                     -> io::Result<Option<(usize, SocketAddr)>> {
-        self.sys.recv_from(buf).map_non_block()
-    }
-
-    /// Sends data on the socket to the address previously bound via connect(). On success,
-    /// returns the number of bytes written.
-    pub fn send(&self, buf: &[u8])
-                   -> io::Result<Option<usize>> {
-        self.sys.send(buf).map_non_block()
-    }
-
-    /// Receives data from the socket previously bound with connect() and stores data in
-    /// the supplied buffer `buf`. On success, returns the number of bytes read.
-    ///
-    /// The function must be called with valid byte array `buf` of sufficient size to
-    /// hold the message bytes. If a message is too long to fit in the supplied buffer,
-    /// excess bytes may be discarded.
-    ///
-    /// The function does not read from `buf`, but is overwriting previous content of `buf`.
-    ///
-    /// Assuming the function has read `n` bytes, slicing `&buf[..n]` provides
-    /// efficient access with iterators and boundary checks.
-    pub fn recv(&self, buf: &mut [u8])
-                     -> io::Result<Option<usize>> {
-        self.sys.recv(buf).map_non_block()
-    }
-
-    /// Connects the UDP socket setting the default destination for `send()` 
-    /// and limiting packets that are read via `recv` from the address specified
-    /// in `addr`.
-    pub fn connect(&self, addr: SocketAddr)
-                 -> io::Result<()> {
-        self.sys.connect(addr)
-    }
-
-    /// Gets the value of the `SO_BROADCAST` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_broadcast`][link].
-    ///
-    /// [link]: #method.set_broadcast
-    pub fn broadcast(&self) -> io::Result<bool> {
-        self.sys.broadcast()
-    }
-
-    /// Sets the value of the `SO_BROADCAST` option for this socket.
-    ///
-    /// When enabled, this socket is allowed to send packets to a broadcast
-    /// address.
-    pub fn set_broadcast(&self, on: bool) -> io::Result<()> {
-        self.sys.set_broadcast(on)
-    }
-
-    /// Gets the value of the `IP_MULTICAST_LOOP` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_multicast_loop_v4`][link].
-    ///
-    /// [link]: #method.set_multicast_loop_v4
-    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
-        self.sys.multicast_loop_v4()
-    }
-
-    /// Sets the value of the `IP_MULTICAST_LOOP` option for this socket.
-    ///
-    /// If enabled, multicast packets will be looped back to the local socket.
-    /// Note that this may not have any affect on IPv6 sockets.
-    pub fn set_multicast_loop_v4(&self, on: bool) -> io::Result<()> {
-        self.sys.set_multicast_loop_v4(on)
-    }
-
-    /// Gets the value of the `IP_MULTICAST_TTL` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_multicast_ttl_v4`][link].
-    ///
-    /// [link]: #method.set_multicast_ttl_v4
-    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        self.sys.multicast_ttl_v4()
-    }
-
-    /// Sets the value of the `IP_MULTICAST_TTL` option for this socket.
-    ///
-    /// Indicates the time-to-live value of outgoing multicast packets for
-    /// this socket. The default value is 1 which means that multicast packets
-    /// don't leave the local network unless explicitly requested.
-    ///
-    /// Note that this may not have any affect on IPv6 sockets.
-    pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
-        self.sys.set_multicast_ttl_v4(ttl)
-    }
-
-    /// Gets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_multicast_loop_v6`][link].
-    ///
-    /// [link]: #method.set_multicast_loop_v6
-    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
-        self.sys.multicast_loop_v6()
-    }
-
-    /// Sets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
-    ///
-    /// Controls whether this socket sees the multicast packets it sends itself.
-    /// Note that this may not have any affect on IPv4 sockets.
-    pub fn set_multicast_loop_v6(&self, on: bool) -> io::Result<()> {
-        self.sys.set_multicast_loop_v6(on)
-    }
-
-    /// Gets the value of the `IP_TTL` option for this socket.
-    ///
-    /// For more information about this option, see [`set_ttl`][link].
-    ///
-    /// [link]: #method.set_ttl
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.sys.ttl()
-    }
-
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This value sets the time-to-live field that is used in every packet sent
-    /// from this socket.
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.sys.set_ttl(ttl)
-    }
-
-    /// Executes an operation of the `IP_ADD_MEMBERSHIP` type.
-    ///
-    /// This function specifies a new multicast group for this socket to join.
-    /// The address must be a valid multicast address, and `interface` is the
-    /// address of the local interface with which the system should join the
-    /// multicast group. If it's equal to `INADDR_ANY` then an appropriate
-    /// interface is chosen by the system.
-    pub fn join_multicast_v4(&self,
-                             multiaddr: &Ipv4Addr,
-                             interface: &Ipv4Addr) -> io::Result<()> {
-        self.sys.join_multicast_v4(multiaddr, interface)
-    }
-
-    /// Executes an operation of the `IPV6_ADD_MEMBERSHIP` type.
-    ///
-    /// This function specifies a new multicast group for this socket to join.
-    /// The address must be a valid multicast address, and `interface` is the
-    /// index of the interface to join/leave (or 0 to indicate any interface).
-    pub fn join_multicast_v6(&self,
-                             multiaddr: &Ipv6Addr,
-                             interface: u32) -> io::Result<()> {
-        self.sys.join_multicast_v6(multiaddr, interface)
-    }
-
-    /// Executes an operation of the `IP_DROP_MEMBERSHIP` type.
-    ///
-    /// For more information about this option, see
-    /// [`join_multicast_v4`][link].
-    ///
-    /// [link]: #method.join_multicast_v4
-    pub fn leave_multicast_v4(&self,
-                              multiaddr: &Ipv4Addr,
-                              interface: &Ipv4Addr) -> io::Result<()> {
-        self.sys.leave_multicast_v4(multiaddr, interface)
-    }
-
-    /// Executes an operation of the `IPV6_DROP_MEMBERSHIP` type.
-    ///
-    /// For more information about this option, see
-    /// [`join_multicast_v6`][link].
-    ///
-    /// [link]: #method.join_multicast_v6
-    pub fn leave_multicast_v6(&self,
-                              multiaddr: &Ipv6Addr,
-                              interface: u32) -> io::Result<()> {
-        self.sys.leave_multicast_v6(multiaddr, interface)
-    }
-
-    /// Get the value of the `SO_ERROR` option on this socket.
-    ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.sys.take_error()
-    }
-}
-
-impl Evented for UdpSocket {
-    fn register(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.selector_id.associate_selector(poll)?;
-        self.sys.register(poll, token, interest, opts)
-    }
-
-    fn reregister(&self, poll: &Poll, token: Token, interest: Ready, opts: PollOpt) -> io::Result<()> {
-        self.sys.reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &Poll) -> io::Result<()> {
-        self.sys.deregister(poll)
-    }
-}
-
-/*
- *
- * ===== UNIX ext =====
- *
- */
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-use std::os::unix::io::{IntoRawFd, AsRawFd, FromRawFd, RawFd};
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl IntoRawFd for UdpSocket {
-    fn into_raw_fd(self) -> RawFd {
-        self.sys.into_raw_fd()
-    }
-}
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl AsRawFd for UdpSocket {
-    fn as_raw_fd(&self) -> RawFd {
-        self.sys.as_raw_fd()
-    }
-}
-
-#[cfg(all(unix, not(target_os = "fuchsia")))]
-impl FromRawFd for UdpSocket {
-    unsafe fn from_raw_fd(fd: RawFd) -> UdpSocket {
-        UdpSocket {
-            sys: FromRawFd::from_raw_fd(fd),
-            selector_id: SelectorId::new(),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/mio/src/waker.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/mio/src/waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+use crate::{poll, sys, Registry, Token};
+
+use std::io;
+
+/// Waker allows cross-thread waking of [`Poll`].
+///
+/// When created it will cause events with [`readable`] readiness and the
+/// provided `token` if [`wake`] is called, possibly from another thread.
+///
+/// [`Poll`]: struct.Poll.html
+/// [`readable`]: ./event/struct.Event.html#method.is_readable
+/// [`wake`]: struct.Waker.html#method.wake
+///
+/// # Notes
+///
+/// `Waker` events are only guaranteed to be delivered while the `Waker` value
+/// is alive.
+///
+/// Only a single `Waker` can be active per [`Poll`], if multiple threads need
+/// access to the `Waker` it can be shared via for example an `Arc`. What
+/// happens if multiple `Waker`s are registered with the same `Poll` is
+/// undefined.
+///
+/// # Implementation notes
+///
+/// On platforms that support kqueue this will use the `EVFILT_USER` event
+/// filter, see [implementation notes of `Poll`] to see what platforms support
+/// kqueue. On Linux it uses [eventfd].
+///
+/// [implementation notes of `Poll`]: struct.Poll.html#implementation-notes
+/// [eventfd]: http://man7.org/linux/man-pages/man2/eventfd.2.html
+///
+/// # Examples
+///
+/// Wake a [`Poll`] instance from another thread.
+///
+#[cfg_attr(feature = "os-poll", doc = "```")]
+#[cfg_attr(not(feature = "os-poll"), doc = "```ignore")]
+/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
+/// use std::thread;
+/// use std::time::Duration;
+/// use std::sync::Arc;
+///
+/// use mio::{Events, Token, Poll, Waker};
+///
+/// const WAKE_TOKEN: Token = Token(10);
+///
+/// let mut poll = Poll::new()?;
+/// let mut events = Events::with_capacity(2);
+///
+/// let waker = Arc::new(Waker::new(poll.registry(), WAKE_TOKEN)?);
+///
+/// // We need to keep the Waker alive, so we'll create a clone for the
+/// // thread we create below.
+/// let waker1 = waker.clone();
+/// let handle = thread::spawn(move || {
+///     // Working hard, or hardly working?
+///     thread::sleep(Duration::from_millis(500));
+///
+///     // Now we'll wake the queue on the other thread.
+///     waker1.wake().expect("unable to wake");
+/// });
+///
+/// // On our current thread we'll poll for events, without a timeout.
+/// poll.poll(&mut events, None)?;
+///
+/// // After about 500 milliseconds we should be awoken by the other thread and
+/// // get a single event.
+/// assert!(!events.is_empty());
+/// let waker_event = events.iter().next().unwrap();
+/// assert!(waker_event.is_readable());
+/// assert_eq!(waker_event.token(), WAKE_TOKEN);
+/// # handle.join().unwrap();
+/// #     Ok(())
+/// # }
+/// ```
+#[derive(Debug)]
+pub struct Waker {
+    inner: sys::Waker,
+}
+
+impl Waker {
+    /// Create a new `Waker`.
+    pub fn new(registry: &Registry, token: Token) -> io::Result<Waker> {
+        #[cfg(debug_assertions)]
+        registry.register_waker();
+        sys::Waker::new(poll::selector(&registry), token).map(|inner| Waker { inner })
+    }
+
+    /// Wake up the [`Poll`] associated with this `Waker`.
+    ///
+    /// [`Poll`]: struct.Poll.html
+    pub fn wake(&self) -> io::Result<()> {
+        self.inner.wake()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"6a9125dc62ffd725ad579f608f7a291233682d03f707bc406f37ef42c08fa738","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"73d396be3c50186c96af495d7fbfe1818ca34bc9f297c32f56b8caf0508ad557","appveyor.yml":"ffdfb9572a6362866bea6787a726b0d4e43f6bb6516f3a38ebdd561859531602","src/handle.rs":"ada6cf8482d49bc7be6d26adeb8ae47df9ff0a5637424474aa4a86ad699be63d","src/iocp.rs":"002fef559bbaf52ada0fcb7b94d6dbbaaedc94840b5870c186243e79120b7cfc","src/lib.rs":"0d30428e89c7a2be7e479148211360a56d6c6b3b5a86d5ee7254277484506efa","src/net.rs":"43c2cc3c983d1a7de8d5651d3705be62221bfd0ef726bc9ebd02744b1af0a139","src/overlapped.rs":"b3c7f7b45fd9b22090bd11563decb09e9c412db8757c0e7484cfaa9ec5e29b9c","src/pipe.rs":"97ef5d456d7e5a72af2c4509a8155bd45a2a755275524ce1cd2d79f44f264c65"},"package":"ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"588aa2a1146d5f0a0fe15b633a07b047f0dd333c8beb6fd9eb959a7493f3fdbc","Cargo.toml":"4ef0d55cf903edac87248410e260dfb8fef8fe19322e2917053a1fd757448876","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"3ea75d353de268b9dbec44e2e9f56c12cd391579ec4ac5855a4eb68dea216ef2","appveyor.yml":"ffdfb9572a6362866bea6787a726b0d4e43f6bb6516f3a38ebdd561859531602","src/handle.rs":"683af650dcd2975e066891bcd570454e14958f9fb291e0d6ee1d563d2ac1e4ce","src/iocp.rs":"7d11b2269ec05288f0ad693142186f90da60a11dcda264aca3f4ff2f2f78fc57","src/lib.rs":"816e6b1806daa5bf6c354829b974f3ec8bf021fa82e1dd11ef8a4030d6868163","src/net.rs":"a3477bf3f4da11dd062d2f1a482588c9f85d7c9218554516a6a0d64aba66bc03","src/overlapped.rs":"90c65c36dbeb95fb1b402b06e97f957c01be2ebb9d43b612bd735ca6e60d3c14","src/pipe.rs":"ee1aecf7114919cec801465a9ce355b18a5cfddeb9cde3a7ad3153ebe717675d"},"package":"b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,27 +11,25 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "miow"
-version = "0.2.2"
+version = "0.3.7"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "A zero overhead I/O library for Windows, focusing on IOCP and Async I/O\nabstractions.\n"
-homepage = "https://github.com/alexcrichton/miow"
-documentation = "https://docs.rs/miow/0.1/x86_64-pc-windows-msvc/miow/"
+homepage = "https://github.com/yoshuawuyts/miow"
+documentation = "https://docs.rs/miow/0.3/x86_64-pc-windows-msvc/miow/"
 readme = "README.md"
 keywords = ["iocp", "windows", "io", "overlapped"]
 license = "MIT/Apache-2.0"
-repository = "https://github.com/alexcrichton/miow"
-[dependencies.kernel32-sys]
-version = "0.2"
-
-[dependencies.net2]
-version = "0.2.36"
-default-features = false
-
+repository = "https://github.com/yoshuawuyts/miow"
+[package.metadata.docs.rs]
+default-target = "x86_64-pc-windows-msvc"
+targets = ["aarch64-pc-windows-msvc", "i686-pc-windows-msvc", "x86_64-pc-windows-msvc"]
 [dependencies.winapi]
-version = "0.2"
-
-[dependencies.ws2_32-sys]
-version = "0.2"
+version = "0.3.3"
+features = ["std", "fileapi", "handleapi", "ioapiset", "minwindef", "namedpipeapi", "ntdef", "synchapi", "winerror", "winsock2", "ws2def", "ws2ipdef"]
 [dev-dependencies.rand]
-version = "0.3"
+version = "0.8.0"
+
+[dev-dependencies.socket2]
+version = "0.4.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5 @@
+
+## [v0.3.7] - 2021-03-22
+### Changed
+- Upgrade `rand` dev-dependency from 0.4 -> 0.8
+- Upgrade `socket2` dependency from 0.3 to 0.4 and make it a dev-dependency
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 [![Build status](https://ci.appveyor.com/api/projects/status/tc5lsxokjk86949l?svg=true)](https://ci.appveyor.com/project/alexcrichton/miow)
 
-[Documentation](https://docs.rs/miow/0.1/x86_64-pc-windows-msvc/miow/)
+[Documentation](https://docs.rs/miow/0.3/x86_64-pc-windows-msvc/miow/)
 
 A zero overhead Windows I/O library focusing on IOCP and other async I/O
 features.
@@ -10,7 +10,7 @@
 ```toml
 # Cargo.toml
 [dependencies]
-miow = "0.1"
+miow = "0.3.6"
 ```
 
 # License
@@ -27,5 +27,5 @@
 ### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
+for inclusion in miow by you, as defined in the Apache-2.0 license, shall be
 dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/handle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/handle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/handle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/handle.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,14 @@
-use std::io;
 use std::cmp;
+use std::io;
+use std::ptr;
 
-use winapi::*;
-use kernel32::*;
+use winapi::shared::minwindef::*;
+use winapi::shared::ntdef::{BOOLEAN, FALSE, HANDLE, TRUE};
+use winapi::shared::winerror::*;
+use winapi::um::fileapi::*;
+use winapi::um::handleapi::*;
+use winapi::um::ioapiset::*;
+use winapi::um::minwinbase::*;
 
 #[derive(Debug)]
 pub struct Handle(HANDLE);
@@ -15,7 +21,9 @@
         Handle(handle)
     }
 
-    pub fn raw(&self) -> HANDLE { self.0 }
+    pub fn raw(&self) -> HANDLE {
+        self.0
+    }
 
     pub fn into_raw(self) -> HANDLE {
         use std::mem;
@@ -28,59 +36,135 @@
     pub fn write(&self, buf: &[u8]) -> io::Result<usize> {
         let mut bytes = 0;
         let len = cmp::min(buf.len(), <DWORD>::max_value() as usize) as DWORD;
-        try!(::cvt(unsafe {
-            WriteFile(self.0, buf.as_ptr() as *const _, len, &mut bytes,
-                      0 as *mut _)
-        }));
+        crate::cvt(unsafe {
+            WriteFile(
+                self.0,
+                buf.as_ptr() as *const _,
+                len,
+                &mut bytes,
+                0 as *mut _,
+            )
+        })?;
         Ok(bytes as usize)
     }
 
     pub fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
         let mut bytes = 0;
         let len = cmp::min(buf.len(), <DWORD>::max_value() as usize) as DWORD;
-        try!(::cvt(unsafe {
-            ReadFile(self.0, buf.as_mut_ptr() as *mut _, len, &mut bytes,
-                     0 as *mut _)
-        }));
+        crate::cvt(unsafe {
+            ReadFile(
+                self.0,
+                buf.as_mut_ptr() as *mut _,
+                len,
+                &mut bytes,
+                0 as *mut _,
+            )
+        })?;
         Ok(bytes as usize)
     }
 
-    pub unsafe fn read_overlapped(&self, buf: &mut [u8],
-                                  overlapped: *mut OVERLAPPED)
-                                  -> io::Result<Option<usize>> {
+    pub unsafe fn read_overlapped(
+        &self,
+        buf: &mut [u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
+        self.read_overlapped_helper(buf, overlapped, FALSE)
+    }
+
+    pub unsafe fn read_overlapped_wait(
+        &self,
+        buf: &mut [u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<usize> {
+        match self.read_overlapped_helper(buf, overlapped, TRUE) {
+            Ok(Some(bytes)) => Ok(bytes),
+            Ok(None) => panic!("logic error"),
+            Err(e) => Err(e),
+        }
+    }
+
+    pub unsafe fn read_overlapped_helper(
+        &self,
+        buf: &mut [u8],
+        overlapped: *mut OVERLAPPED,
+        wait: BOOLEAN,
+    ) -> io::Result<Option<usize>> {
         let len = cmp::min(buf.len(), <DWORD>::max_value() as usize) as DWORD;
-        let mut bytes = 0;
-        let res = ::cvt({
-            ReadFile(self.0,
-                     buf.as_mut_ptr() as *mut _,
-                     len,
-                     &mut bytes,
-                     overlapped)
+        let res = crate::cvt({
+            ReadFile(
+                self.0,
+                buf.as_mut_ptr() as *mut _,
+                len,
+                ptr::null_mut(),
+                overlapped,
+            )
         });
         match res {
+            Ok(_) => (),
+            Err(ref e) if e.raw_os_error() == Some(ERROR_IO_PENDING as i32) => (),
+            Err(e) => return Err(e),
+        }
+
+        let mut bytes = 0;
+        let res = crate::cvt({ GetOverlappedResult(self.0, overlapped, &mut bytes, wait as BOOL) });
+        match res {
             Ok(_) => Ok(Some(bytes as usize)),
-            Err(ref e) if e.raw_os_error() == Some(ERROR_IO_PENDING as i32)
-                => Ok(None),
+            Err(ref e) if e.raw_os_error() == Some(ERROR_IO_INCOMPLETE as i32) && wait == FALSE => {
+                Ok(None)
+            }
+            Err(e) => Err(e),
+        }
+    }
+
+    pub unsafe fn write_overlapped(
+        &self,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
+        self.write_overlapped_helper(buf, overlapped, FALSE)
+    }
+
+    pub unsafe fn write_overlapped_wait(
+        &self,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<usize> {
+        match self.write_overlapped_helper(buf, overlapped, TRUE) {
+            Ok(Some(bytes)) => Ok(bytes),
+            Ok(None) => panic!("logic error"),
             Err(e) => Err(e),
         }
     }
 
-    pub unsafe fn write_overlapped(&self, buf: &[u8],
-                                   overlapped: *mut OVERLAPPED)
-                                   -> io::Result<Option<usize>> {
+    unsafe fn write_overlapped_helper(
+        &self,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+        wait: BOOLEAN,
+    ) -> io::Result<Option<usize>> {
         let len = cmp::min(buf.len(), <DWORD>::max_value() as usize) as DWORD;
-        let mut bytes = 0;
-        let res = ::cvt({
-            WriteFile(self.0,
-                      buf.as_ptr() as *const _,
-                      len,
-                      &mut bytes,
-                      overlapped)
+        let res = crate::cvt({
+            WriteFile(
+                self.0,
+                buf.as_ptr() as *const _,
+                len,
+                ptr::null_mut(),
+                overlapped,
+            )
         });
         match res {
+            Ok(_) => (),
+            Err(ref e) if e.raw_os_error() == Some(ERROR_IO_PENDING as i32) => (),
+            Err(e) => return Err(e),
+        }
+
+        let mut bytes = 0;
+        let res = crate::cvt({ GetOverlappedResult(self.0, overlapped, &mut bytes, wait as BOOL) });
+        match res {
             Ok(_) => Ok(Some(bytes as usize)),
-            Err(ref e) if e.raw_os_error() == Some(ERROR_IO_PENDING as i32)
-                => Ok(None),
+            Err(ref e) if e.raw_os_error() == Some(ERROR_IO_INCOMPLETE as i32) && wait == FALSE => {
+                Ok(None)
+            }
             Err(e) => Err(e),
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/iocp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/iocp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/iocp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/iocp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,19 @@
 //! Bindings to IOCP, I/O Completion Ports
 
 use std::cmp;
+use std::fmt;
 use std::io;
 use std::mem;
 use std::os::windows::io::*;
 use std::time::Duration;
 
-use handle::Handle;
-use winapi::*;
-use kernel32::*;
-use Overlapped;
+use crate::handle::Handle;
+use crate::Overlapped;
+use winapi::shared::basetsd::*;
+use winapi::shared::ntdef::*;
+use winapi::um::handleapi::*;
+use winapi::um::ioapiset::*;
+use winapi::um::minwinbase::*;
 
 /// A handle to an Windows I/O Completion Port.
 #[derive(Debug)]
@@ -22,9 +26,15 @@
 /// These statuses can be created via the `new` or `empty` constructors and then
 /// provided to a completion port, or they are read out of a completion port.
 /// The fields of each status are read through its accessor methods.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy)]
 pub struct CompletionStatus(OVERLAPPED_ENTRY);
 
+impl fmt::Debug for CompletionStatus {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "CompletionStatus(OVERLAPPED_ENTRY)")
+    }
+}
+
 unsafe impl Send for CompletionStatus {}
 unsafe impl Sync for CompletionStatus {}
 
@@ -35,14 +45,13 @@
     /// allowed for threads associated with this port. Consult the Windows
     /// documentation for more information about this value.
     pub fn new(threads: u32) -> io::Result<CompletionPort> {
-        let ret = unsafe {
-            CreateIoCompletionPort(INVALID_HANDLE_VALUE, 0 as *mut _,
-                                   0, threads)
-        };
+        let ret = unsafe { CreateIoCompletionPort(INVALID_HANDLE_VALUE, 0 as *mut _, 0, threads) };
         if ret.is_null() {
             Err(io::Error::last_os_error())
         } else {
-            Ok(CompletionPort { handle: Handle::new(ret) })
+            Ok(CompletionPort {
+                handle: Handle::new(ret),
+            })
         }
     }
 
@@ -55,8 +64,7 @@
     /// Any object which is convertible to a `HANDLE` via the `AsRawHandle`
     /// trait can be provided to this function, such as `std::fs::File` and
     /// friends.
-    pub fn add_handle<T: AsRawHandle + ?Sized>(&self, token: usize,
-                                               t: &T) -> io::Result<()> {
+    pub fn add_handle<T: AsRawHandle + ?Sized>(&self, token: usize, t: &T) -> io::Result<()> {
         self._add(token, t.as_raw_handle())
     }
 
@@ -69,17 +77,14 @@
     /// Any object which is convertible to a `SOCKET` via the `AsRawSocket`
     /// trait can be provided to this function, such as `std::net::TcpStream`
     /// and friends.
-    pub fn add_socket<T: AsRawSocket + ?Sized>(&self, token: usize,
-                                               t: &T) -> io::Result<()> {
+    pub fn add_socket<T: AsRawSocket + ?Sized>(&self, token: usize, t: &T) -> io::Result<()> {
         self._add(token, t.as_raw_socket() as HANDLE)
     }
 
     fn _add(&self, token: usize, handle: HANDLE) -> io::Result<()> {
         assert_eq!(mem::size_of_val(&token), mem::size_of::<ULONG_PTR>());
-        let ret = unsafe {
-            CreateIoCompletionPort(handle, self.handle.raw(),
-                                   token as ULONG_PTR, 0)
-        };
+        let ret =
+            unsafe { CreateIoCompletionPort(handle, self.handle.raw(), token as ULONG_PTR, 0) };
         if ret.is_null() {
             Err(io::Error::last_os_error())
         } else {
@@ -105,15 +110,17 @@
         let mut bytes = 0;
         let mut token = 0;
         let mut overlapped = 0 as *mut _;
-        let timeout = ::dur2ms(timeout);
+        let timeout = crate::dur2ms(timeout);
         let ret = unsafe {
-            GetQueuedCompletionStatus(self.handle.raw(),
-                                      &mut bytes,
-                                      &mut token,
-                                      &mut overlapped,
-                                      timeout)
+            GetQueuedCompletionStatus(
+                self.handle.raw(),
+                &mut bytes,
+                &mut token,
+                &mut overlapped,
+                timeout,
+            )
         };
-        ::cvt(ret).map(|_| {
+        crate::cvt(ret).map(|_| {
             CompletionStatus(OVERLAPPED_ENTRY {
                 dwNumberOfBytesTransferred: bytes,
                 lpCompletionKey: token,
@@ -132,25 +139,29 @@
     /// function does not wait to fill up the entire list of statuses provided.
     ///
     /// Like with `get`, a timeout may be specified for this operation.
-    pub fn get_many<'a>(&self,
-                        list: &'a mut [CompletionStatus],
-                        timeout: Option<Duration>)
-                        -> io::Result<&'a mut [CompletionStatus]>
-    {
-        debug_assert_eq!(mem::size_of::<CompletionStatus>(),
-                         mem::size_of::<OVERLAPPED_ENTRY>());
+    pub fn get_many<'a>(
+        &self,
+        list: &'a mut [CompletionStatus],
+        timeout: Option<Duration>,
+    ) -> io::Result<&'a mut [CompletionStatus]> {
+        debug_assert_eq!(
+            mem::size_of::<CompletionStatus>(),
+            mem::size_of::<OVERLAPPED_ENTRY>()
+        );
         let mut removed = 0;
-        let timeout = ::dur2ms(timeout);
+        let timeout = crate::dur2ms(timeout);
         let len = cmp::min(list.len(), <ULONG>::max_value() as usize) as ULONG;
         let ret = unsafe {
-            GetQueuedCompletionStatusEx(self.handle.raw(),
-                                        list.as_ptr() as *mut _,
-                                        len,
-                                        &mut removed,
-                                        timeout,
-                                        FALSE)
+            GetQueuedCompletionStatusEx(
+                self.handle.raw(),
+                list.as_ptr() as *mut _,
+                len,
+                &mut removed,
+                timeout,
+                FALSE as i32,
+            )
         };
-        match ::cvt(ret) {
+        match crate::cvt(ret) {
             Ok(_) => Ok(&mut list[..removed as usize]),
             Err(e) => Err(e),
         }
@@ -163,12 +174,14 @@
     /// this status.
     pub fn post(&self, status: CompletionStatus) -> io::Result<()> {
         let ret = unsafe {
-            PostQueuedCompletionStatus(self.handle.raw(),
-                                       status.0.dwNumberOfBytesTransferred,
-                                       status.0.lpCompletionKey,
-                                       status.0.lpOverlapped)
+            PostQueuedCompletionStatus(
+                self.handle.raw(),
+                status.0.dwNumberOfBytesTransferred,
+                status.0.lpCompletionKey,
+                status.0.lpOverlapped,
+            )
         };
-        ::cvt(ret).map(|_| ())
+        crate::cvt(ret).map(|_| ())
     }
 }
 
@@ -180,7 +193,9 @@
 
 impl FromRawHandle for CompletionPort {
     unsafe fn from_raw_handle(handle: HANDLE) -> CompletionPort {
-        CompletionPort { handle: Handle::new(handle) }
+        CompletionPort {
+            handle: Handle::new(handle),
+        }
     }
 }
 
@@ -196,8 +211,7 @@
     /// This function is useful when creating a status to send to a port with
     /// the `post` method. The parameters are opaquely passed through and not
     /// interpreted by the system at all.
-    pub fn new(bytes: u32, token: usize, overlapped: *mut Overlapped)
-               -> CompletionStatus {
+    pub fn new(bytes: u32, token: usize, overlapped: *mut Overlapped) -> CompletionStatus {
         assert_eq!(mem::size_of_val(&token), mem::size_of::<ULONG_PTR>());
         CompletionStatus(OVERLAPPED_ENTRY {
             dwNumberOfBytesTransferred: bytes,
@@ -256,9 +270,10 @@
     use std::mem;
     use std::time::Duration;
 
-    use winapi::*;
+    use winapi::shared::basetsd::*;
+    use winapi::shared::winerror::*;
 
-    use iocp::{CompletionPort, CompletionStatus};
+    use crate::iocp::{CompletionPort, CompletionStatus};
 
     #[test]
     fn is_send_sync() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,26 +3,23 @@
 #![cfg(windows)]
 #![deny(missing_docs)]
 #![allow(bad_style)]
-#![doc(html_root_url = "https://docs.rs/miow/0.1/x86_64-pc-windows-msvc/")]
-
-extern crate kernel32;
-extern crate net2;
-extern crate winapi;
-extern crate ws2_32;
-
-#[cfg(test)] extern crate rand;
+#![doc(html_root_url = "https://docs.rs/miow/0.3/x86_64-pc-windows-msvc/")]
 
 use std::cmp;
 use std::io;
 use std::time::Duration;
 
-use winapi::*;
+use winapi::shared::minwindef::*;
+use winapi::um::winbase::*;
 
+#[cfg(test)]
 macro_rules! t {
-    ($e:expr) => (match $e {
-        Ok(e) => e,
-        Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
-    })
+    ($e:expr) => {
+        match $e {
+            Ok(e) => e,
+            Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
+        }
+    };
 }
 
 mod handle;
@@ -32,7 +29,7 @@
 pub mod net;
 pub mod pipe;
 
-pub use overlapped::Overlapped;
+pub use crate::overlapped::Overlapped;
 
 fn cvt(i: BOOL) -> io::Result<BOOL> {
     if i == 0 {
@@ -49,9 +46,7 @@
     };
     let ms = dur.as_secs().checked_mul(1_000);
     let ms_extra = dur.subsec_nanos() / 1_000_000;
-    ms.and_then(|ms| {
-        ms.checked_add(ms_extra as u64)
-    }).map(|ms| {
-        cmp::min(u32::max_value() as u64, ms) as u32
-    }).unwrap_or(INFINITE - 1)
+    ms.and_then(|ms| ms.checked_add(ms_extra as u64))
+        .map(|ms| cmp::min(u32::max_value() as u64, ms) as u32)
+        .unwrap_or(INFINITE - 1)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/net.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/net.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/net.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/net.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,17 +6,23 @@
 use std::cmp;
 use std::io;
 use std::mem;
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
-use std::net::{TcpStream, UdpSocket, SocketAddr, TcpListener};
-use std::net::{SocketAddrV4, Ipv4Addr, SocketAddrV6, Ipv6Addr};
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddrV4, SocketAddrV6};
+use std::net::{SocketAddr, TcpListener, TcpStream, UdpSocket};
 use std::os::windows::prelude::*;
+use std::sync::atomic::{AtomicUsize, Ordering};
 
-use net2::TcpBuilder;
-use winapi::*;
-use winapi::inaddr::IN_ADDR;
-use winapi::ws2def::SOCKADDR_IN;
-use winapi::ws2ipdef::{in6_addr, sockaddr_in6};
-use ws2_32::*;
+use winapi::ctypes::*;
+use winapi::shared::guiddef::*;
+use winapi::shared::in6addr::{in6_addr_u, IN6_ADDR};
+use winapi::shared::inaddr::{in_addr_S_un, IN_ADDR};
+use winapi::shared::minwindef::*;
+use winapi::shared::minwindef::{FALSE, TRUE};
+use winapi::shared::ntdef::*;
+use winapi::shared::ws2def::SOL_SOCKET;
+use winapi::shared::ws2def::*;
+use winapi::shared::ws2ipdef::*;
+use winapi::um::minwinbase::*;
+use winapi::um::winsock2::*;
 
 /// A type to represent a buffer in which a socket address will be stored.
 ///
@@ -89,10 +95,11 @@
     /// pointers are valid until the I/O operation is completed, typically via
     /// completion ports and waiting to receive the completion notification on
     /// the port.
-    unsafe fn read_overlapped(&self,
-                              buf: &mut [u8],
-                              overlapped: *mut OVERLAPPED)
-                              -> io::Result<Option<usize>>;
+    unsafe fn read_overlapped(
+        &self,
+        buf: &mut [u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>>;
 
     /// Execute an overlapped write I/O operation on this TCP stream.
     ///
@@ -121,22 +128,48 @@
     /// pointers are valid until the I/O operation is completed, typically via
     /// completion ports and waiting to receive the completion notification on
     /// the port.
-    unsafe fn write_overlapped(&self,
-                               buf: &[u8],
-                               overlapped: *mut OVERLAPPED)
-                               -> io::Result<Option<usize>>;
-
-    /// Execute a connection operation for this socket.
-    ///
-    /// For more information about this method, see the
-    /// [`TcpBuilderExt::connect_overlapped`][link] documentation.
-    ///
-    /// [link]: trait.TcpBuilderExt.html#tymethod.connect_overlapped
-    unsafe fn connect_overlapped(&self,
-                                 addr: &SocketAddr,
-                                 buf: &[u8],
-                                 overlapped: *mut OVERLAPPED)
-                                 -> io::Result<Option<usize>>;
+    unsafe fn write_overlapped(
+        &self,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>>;
+
+    /// Attempt to consume the internal socket in this builder by executing an
+    /// overlapped connect operation.
+    ///
+    /// This function will issue a connect operation to the address specified on
+    /// the underlying socket, flagging it as an overlapped operation which will
+    /// complete asynchronously. If successful this function will return the
+    /// corresponding TCP stream.
+    ///
+    /// The `buf` argument provided is an initial buffer of data that should be
+    /// sent after the connection is initiated. It's acceptable to
+    /// pass an empty slice here.
+    ///
+    /// This function will also return whether the connect immediately
+    /// succeeded or not. If `None` is returned then the I/O operation is still
+    /// pending and will complete at a later date, and if `Some(bytes)` is
+    /// returned then that many bytes were transferred.
+    ///
+    /// Note that to succeed this requires that the underlying socket has
+    /// previously been bound via a call to `bind` to a local address.
+    ///
+    /// # Unsafety
+    ///
+    /// This function is unsafe because the kernel requires that the
+    /// `overlapped` and `buf` pointers to be  valid until the end of the I/O
+    /// operation. The kernel also requires that `overlapped` is unique for
+    /// this I/O operation and is not in use for any other I/O.
+    ///
+    /// To safely use this function callers must ensure that this pointer is
+    /// valid until the I/O operation is completed, typically via completion
+    /// ports and waiting to receive the completion notification on the port.
+    unsafe fn connect_overlapped(
+        &self,
+        addr: &SocketAddr,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>>;
 
     /// Once a `connect_overlapped` has finished, this function needs to be
     /// called to finish the connect operation.
@@ -164,8 +197,7 @@
     /// # Panics
     ///
     /// This function will panic
-    unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                     -> io::Result<(usize, u32)>;
+    unsafe fn result(&self, overlapped: *mut OVERLAPPED) -> io::Result<(usize, u32)>;
 }
 
 /// Additional methods for the `UdpSocket` type in the standard library.
@@ -198,11 +230,12 @@
     /// pointers are valid until the I/O operation is completed, typically via
     /// completion ports and waiting to receive the completion notification on
     /// the port.
-    unsafe fn recv_from_overlapped(&self,
-                                   buf: &mut [u8],
-                                   addr: *mut SocketAddrBuf,
-                                   overlapped: *mut OVERLAPPED)
-                                   -> io::Result<Option<usize>>;
+    unsafe fn recv_from_overlapped(
+        &self,
+        buf: &mut [u8],
+        addr: *mut SocketAddrBuf,
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>>;
 
     /// Execute an overlapped receive I/O operation on this UDP socket.
     ///
@@ -232,10 +265,11 @@
     /// pointers are valid until the I/O operation is completed, typically via
     /// completion ports and waiting to receive the completion notification on
     /// the port.
-    unsafe fn recv_overlapped(&self,
-                              buf: &mut [u8],
-                              overlapped: *mut OVERLAPPED)
-                              -> io::Result<Option<usize>>;
+    unsafe fn recv_overlapped(
+        &self,
+        buf: &mut [u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>>;
 
     /// Execute an overlapped send I/O operation on this UDP socket.
     ///
@@ -264,16 +298,17 @@
     /// pointers are valid until the I/O operation is completed, typically via
     /// completion ports and waiting to receive the completion notification on
     /// the port.
-    unsafe fn send_to_overlapped(&self,
-                                 buf: &[u8],
-                                 addr: &SocketAddr,
-                                 overlapped: *mut OVERLAPPED)
-                                 -> io::Result<Option<usize>>;
+    unsafe fn send_to_overlapped(
+        &self,
+        buf: &[u8],
+        addr: &SocketAddr,
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>>;
 
     /// Execute an overlapped send I/O operation on this UDP socket.
     ///
     /// This function will issue an overlapped I/O write (via `WSASend`) on
-    /// this socket to the address it was previously connected to. The provided 
+    /// this socket to the address it was previously connected to. The provided
     /// buffer will be written when the operation completes and the given `OVERLAPPED`
     /// instance is used to track the overlapped operation.
     ///
@@ -297,70 +332,11 @@
     /// pointers are valid until the I/O operation is completed, typically via
     /// completion ports and waiting to receive the completion notification on
     /// the port.
-    unsafe fn send_overlapped(&self,
-                                 buf: &[u8],
-                                 overlapped: *mut OVERLAPPED)
-                                 -> io::Result<Option<usize>>;
- 
-    /// Calls the `GetOverlappedResult` function to get the result of an
-    /// overlapped operation for this handle.
-    ///
-    /// This function takes the `OVERLAPPED` argument which must have been used
-    /// to initiate an overlapped I/O operation, and returns either the
-    /// successful number of bytes transferred during the operation or an error
-    /// if one occurred, along with the results of the `lpFlags` parameter of
-    /// the relevant operation, if applicable.
-    ///
-    /// # Unsafety
-    ///
-    /// This function is unsafe as `overlapped` must have previously been used
-    /// to execute an operation for this handle, and it must also be a valid
-    /// pointer to an `OVERLAPPED` instance.
-    ///
-    /// # Panics
-    ///
-    /// This function will panic
-    unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                     -> io::Result<(usize, u32)>;
-}
-
-/// Additional methods for the `TcpBuilder` type in the `net2` library.
-pub trait TcpBuilderExt {
-    /// Attempt to consume the internal socket in this builder by executing an
-    /// overlapped connect operation.
-    ///
-    /// This function will issue a connect operation to the address specified on
-    /// the underlying socket, flagging it as an overlapped operation which will
-    /// complete asynchronously. If successful this function will return the
-    /// corresponding TCP stream.
-    ///
-    /// The `buf` argument provided is an initial buffer of data that should be
-    /// sent after the connection is initiated. It's acceptable to
-    /// pass an empty slice here.
-    ///
-    /// This function will also return whether the connect immediately
-    /// succeeded or not. If `None` is returned then the I/O operation is still
-    /// pending and will complete at a later date, and if `Some(bytes)` is
-    /// returned then that many bytes were transferred.
-    ///
-    /// Note that to succeed this requires that the underlying socket has
-    /// previously been bound via a call to `bind` to a local address.
-    ///
-    /// # Unsafety
-    ///
-    /// This function is unsafe because the kernel requires that the
-    /// `overlapped` and `buf` pointers to be  valid until the end of the I/O
-    /// operation. The kernel also requires that `overlapped` is unique for
-    /// this I/O operation and is not in use for any other I/O.
-    ///
-    /// To safely use this function callers must ensure that this pointer is
-    /// valid until the I/O operation is completed, typically via completion
-    /// ports and waiting to receive the completion notification on the port.
-    unsafe fn connect_overlapped(&self,
-                                 addr: &SocketAddr,
-                                 buf: &[u8],
-                                 overlapped: *mut OVERLAPPED)
-                                 -> io::Result<(TcpStream, Option<usize>)>;
+    unsafe fn send_overlapped(
+        &self,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>>;
 
     /// Calls the `GetOverlappedResult` function to get the result of an
     /// overlapped operation for this handle.
@@ -380,8 +356,7 @@
     /// # Panics
     ///
     /// This function will panic
-    unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                     -> io::Result<(usize, u32)>;
+    unsafe fn result(&self, overlapped: *mut OVERLAPPED) -> io::Result<(usize, u32)>;
 }
 
 /// Additional methods for the `TcpListener` type in the standard library.
@@ -397,10 +372,10 @@
     /// The `addrs` buffer provided will be filled in with the local and remote
     /// addresses of the connection upon completion.
     ///
-    /// If the accept succeeds immediately, `Ok(stream, true)` is returned. If
-    /// the connect indicates that the I/O is currently pending, `Ok(stream,
-    /// false)` is returned. Otherwise, the error associated with the operation
-    /// is returned and no overlapped operation is enqueued.
+    /// If the accept succeeds immediately, `Ok(true)` is returned. If
+    /// the connect indicates that the I/O is currently pending, `Ok(false)` is
+    /// returned. Otherwise, the error associated with the operation is
+    /// returned and no overlapped operation is enqueued.
     ///
     /// # Unsafety
     ///
@@ -412,11 +387,12 @@
     /// To safely use this function callers must ensure that the pointers are
     /// valid until the I/O operation is completed, typically via completion
     /// ports and waiting to receive the completion notification on the port.
-    unsafe fn accept_overlapped(&self,
-                                socket: &TcpBuilder,
-                                addrs: &mut AcceptAddrsBuf,
-                                overlapped: *mut OVERLAPPED)
-                                -> io::Result<(TcpStream, bool)>;
+    unsafe fn accept_overlapped(
+        &self,
+        socket: &TcpStream,
+        addrs: &mut AcceptAddrsBuf,
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<bool>;
 
     /// Once an `accept_overlapped` has finished, this function needs to be
     /// called to finish the accept operation.
@@ -444,8 +420,7 @@
     /// # Panics
     ///
     /// This function will panic
-    unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                     -> io::Result<(usize, u32)>;
+    unsafe fn result(&self, overlapped: *mut OVERLAPPED) -> io::Result<(usize, u32)>;
 }
 
 #[doc(hidden)]
@@ -462,7 +437,9 @@
 doit! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
 
 // fn hton<I: NetInt>(i: I) -> I { i.to_be() }
-fn ntoh<I: NetInt>(i: I) -> I { I::from_be(i) }
+fn ntoh<I: NetInt>(i: I) -> I {
+    I::from_be(i)
+}
 
 fn last_err() -> io::Result<Option<usize>> {
     let err = unsafe { WSAGetLastError() };
@@ -488,7 +465,7 @@
 #[repr(C)]
 pub(crate) union SocketAddrCRepr {
     v4: SOCKADDR_IN,
-    v6: sockaddr_in6,
+    v6: SOCKADDR_IN6_LH,
 }
 
 impl SocketAddrCRepr {
@@ -500,10 +477,16 @@
 fn socket_addr_to_ptrs(addr: &SocketAddr) -> (SocketAddrCRepr, c_int) {
     match *addr {
         SocketAddr::V4(ref a) => {
+            let sin_addr = unsafe {
+                let mut s_un = mem::zeroed::<in_addr_S_un>();
+                *s_un.S_addr_mut() = u32::from_ne_bytes(a.ip().octets());
+                IN_ADDR { S_un: s_un }
+            };
+
             let sockaddr_in = SOCKADDR_IN {
                 sin_family: AF_INET as ADDRESS_FAMILY,
                 sin_port: a.port().to_be(),
-                sin_addr: IN_ADDR { S_un: u32::from(*a.ip()).to_be() },
+                sin_addr,
                 sin_zero: [0; 8],
             };
 
@@ -511,38 +494,50 @@
             (sockaddr, mem::size_of::<SOCKADDR_IN>() as c_int)
         }
         SocketAddr::V6(ref a) => {
-            let sockaddr_in6 = sockaddr_in6 {
-                sin6_family: AF_INET6 as i16,
+            let sin6_addr = unsafe {
+                let mut u = mem::zeroed::<in6_addr_u>();
+                *u.Byte_mut() = a.ip().octets();
+                IN6_ADDR { u }
+            };
+            let u = unsafe {
+                let mut u = mem::zeroed::<SOCKADDR_IN6_LH_u>();
+                *u.sin6_scope_id_mut() = a.scope_id();
+                u
+            };
+
+            let sockaddr_in6 = SOCKADDR_IN6_LH {
+                sin6_family: AF_INET6 as ADDRESS_FAMILY,
                 sin6_port: a.port().to_be(),
-                sin6_addr: in6_addr { s6_addr: a.ip().octets() },
+                sin6_addr,
                 sin6_flowinfo: a.flowinfo(),
-                sin6_scope_id: a.scope_id(),
+                u,
             };
 
             let sockaddr = SocketAddrCRepr { v6: sockaddr_in6 };
-            (sockaddr, mem::size_of::<sockaddr_in6>() as c_int)
+            (sockaddr, mem::size_of::<SOCKADDR_IN6_LH>() as c_int)
         }
     }
 }
 
-unsafe fn ptrs_to_socket_addr(ptr: *const SOCKADDR,
-                              len: c_int) -> Option<SocketAddr> {
+unsafe fn ptrs_to_socket_addr(ptr: *const SOCKADDR, len: c_int) -> Option<SocketAddr> {
     if (len as usize) < mem::size_of::<c_int>() {
-        return None
+        return None;
     }
     match (*ptr).sa_family as i32 {
         AF_INET if len as usize >= mem::size_of::<SOCKADDR_IN>() => {
             let b = &*(ptr as *const SOCKADDR_IN);
-            let ip = ntoh(b.sin_addr.S_un);
-            let ip = Ipv4Addr::new((ip >> 24) as u8,
-                                   (ip >> 16) as u8,
-                                   (ip >>  8) as u8,
-                                   (ip >>  0) as u8);
+            let ip = ntoh(*b.sin_addr.S_un.S_addr());
+            let ip = Ipv4Addr::new(
+                (ip >> 24) as u8,
+                (ip >> 16) as u8,
+                (ip >> 8) as u8,
+                (ip >> 0) as u8,
+            );
             Some(SocketAddr::V4(SocketAddrV4::new(ip, ntoh(b.sin_port))))
         }
-        AF_INET6 if len as usize >= mem::size_of::<sockaddr_in6>() => {
-            let b = &*(ptr as *const sockaddr_in6);
-            let arr = &b.sin6_addr.s6_addr;
+        AF_INET6 if len as usize >= mem::size_of::<SOCKADDR_IN6_LH>() => {
+            let b = &*(ptr as *const SOCKADDR_IN6_LH);
+            let arr = b.sin6_addr.u.Byte();
             let ip = Ipv6Addr::new(
                 ((arr[0] as u16) << 8) | (arr[1] as u16),
                 ((arr[2] as u16) << 8) | (arr[3] as u16),
@@ -551,13 +546,17 @@
                 ((arr[8] as u16) << 8) | (arr[9] as u16),
                 ((arr[10] as u16) << 8) | (arr[11] as u16),
                 ((arr[12] as u16) << 8) | (arr[13] as u16),
-                ((arr[14] as u16) << 8) | (arr[15] as u16));
-            let addr = SocketAddrV6::new(ip, ntoh(b.sin6_port),
-                                         ntoh(b.sin6_flowinfo),
-                                         ntoh(b.sin6_scope_id));
+                ((arr[14] as u16) << 8) | (arr[15] as u16),
+            );
+            let addr = SocketAddrV6::new(
+                ip,
+                ntoh(b.sin6_port),
+                ntoh(b.sin6_flowinfo),
+                ntoh(*b.u.sin6_scope_id()),
+            );
             Some(SocketAddr::V6(addr))
         }
-        _ => None
+        _ => None,
     }
 }
 
@@ -568,15 +567,10 @@
     }
 }
 
-unsafe fn result(socket: SOCKET, overlapped: *mut OVERLAPPED)
-                 -> io::Result<(usize, u32)> {
+unsafe fn result(socket: SOCKET, overlapped: *mut OVERLAPPED) -> io::Result<(usize, u32)> {
     let mut transferred = 0;
     let mut flags = 0;
-    let r = WSAGetOverlappedResult(socket,
-                                   overlapped,
-                                   &mut transferred,
-                                   FALSE,
-                                   &mut flags);
+    let r = WSAGetOverlappedResult(socket, overlapped, &mut transferred, FALSE, &mut flags);
     if r == 0 {
         Err(io::Error::last_os_error())
     } else {
@@ -585,22 +579,31 @@
 }
 
 impl TcpStreamExt for TcpStream {
-    unsafe fn read_overlapped(&self,
-                              buf: &mut [u8],
-                              overlapped: *mut OVERLAPPED)
-                              -> io::Result<Option<usize>> {
+    unsafe fn read_overlapped(
+        &self,
+        buf: &mut [u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
         let mut buf = slice2buf(buf);
         let mut flags = 0;
         let mut bytes_read: DWORD = 0;
-        let r = WSARecv(self.as_raw_socket(), &mut buf, 1,
-                        &mut bytes_read, &mut flags, overlapped, None);
+        let r = WSARecv(
+            self.as_raw_socket() as SOCKET,
+            &mut buf,
+            1,
+            &mut bytes_read,
+            &mut flags,
+            overlapped,
+            None,
+        );
         cvt(r, bytes_read)
     }
 
-    unsafe fn write_overlapped(&self,
-                               buf: &[u8],
-                               overlapped: *mut OVERLAPPED)
-                               -> io::Result<Option<usize>> {
+    unsafe fn write_overlapped(
+        &self,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
         let mut buf = slice2buf(buf);
         let mut bytes_written = 0;
 
@@ -620,27 +623,37 @@
         // As a result we use this to and report back the result.
         //
         // [1]: https://github.com/carllerche/mio/pull/520#issuecomment-273983823
-        let r = WSASend(self.as_raw_socket(), &mut buf, 1,
-                        &mut bytes_written, 0, overlapped, None);
+        let r = WSASend(
+            self.as_raw_socket() as SOCKET,
+            &mut buf,
+            1,
+            &mut bytes_written,
+            0,
+            overlapped,
+            None,
+        );
         cvt(r, bytes_written)
     }
 
-    unsafe fn connect_overlapped(&self,
-                                 addr: &SocketAddr,
-                                 buf: &[u8],
-                                 overlapped: *mut OVERLAPPED)
-                                 -> io::Result<Option<usize>> {
-        connect_overlapped(self.as_raw_socket(), addr, buf, overlapped)
+    unsafe fn connect_overlapped(
+        &self,
+        addr: &SocketAddr,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
+        connect_overlapped(self.as_raw_socket() as SOCKET, addr, buf, overlapped)
     }
 
     fn connect_complete(&self) -> io::Result<()> {
         const SO_UPDATE_CONNECT_CONTEXT: c_int = 0x7010;
         let result = unsafe {
-            setsockopt(self.as_raw_socket(),
-                       SOL_SOCKET,
-                       SO_UPDATE_CONNECT_CONTEXT,
-                       0 as *const _,
-                       0)
+            setsockopt(
+                self.as_raw_socket() as SOCKET,
+                SOL_SOCKET,
+                SO_UPDATE_CONNECT_CONTEXT,
+                0 as *const _,
+                0,
+            )
         };
         if result == 0 {
             Ok(())
@@ -649,17 +662,17 @@
         }
     }
 
-    unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                     -> io::Result<(usize, u32)> {
-        result(self.as_raw_socket(), overlapped)
+    unsafe fn result(&self, overlapped: *mut OVERLAPPED) -> io::Result<(usize, u32)> {
+        result(self.as_raw_socket() as SOCKET, overlapped)
     }
 }
 
-unsafe fn connect_overlapped(socket: SOCKET,
-                             addr: &SocketAddr,
-                             buf: &[u8],
-                             overlapped: *mut OVERLAPPED)
-                             -> io::Result<Option<usize>> {
+unsafe fn connect_overlapped(
+    socket: SOCKET,
+    addr: &SocketAddr,
+    buf: &[u8],
+    overlapped: *mut OVERLAPPED,
+) -> io::Result<Option<usize>> {
     static CONNECTEX: WsaExtension = WsaExtension {
         guid: GUID {
             Data1: 0x25a207b9,
@@ -667,22 +680,33 @@
             Data3: 0x4660,
             Data4: [0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e],
         },
-        val: ATOMIC_USIZE_INIT,
+        val: AtomicUsize::new(0),
     };
-    type ConnectEx = unsafe extern "system" fn(SOCKET, *const SOCKADDR,
-                                               c_int, PVOID, DWORD, LPDWORD,
-                                               LPOVERLAPPED) -> BOOL;
+    type ConnectEx = unsafe extern "system" fn(
+        SOCKET,
+        *const SOCKADDR,
+        c_int,
+        PVOID,
+        DWORD,
+        LPDWORD,
+        LPOVERLAPPED,
+    ) -> BOOL;
 
-    let ptr = try!(CONNECTEX.get(socket));
+    let ptr = CONNECTEX.get(socket)?;
     assert!(ptr != 0);
     let connect_ex = mem::transmute::<_, ConnectEx>(ptr);
 
     let (addr_buf, addr_len) = socket_addr_to_ptrs(addr);
     let mut bytes_sent: DWORD = 0;
-    let r = connect_ex(socket, addr_buf.as_ptr(), addr_len,
-                       buf.as_ptr() as *mut _,
-                       buf.len() as u32,
-                       &mut bytes_sent, overlapped);
+    let r = connect_ex(
+        socket,
+        addr_buf.as_ptr(),
+        addr_len,
+        buf.as_ptr() as *mut _,
+        buf.len() as u32,
+        &mut bytes_sent,
+        overlapped,
+    );
     if r == TRUE {
         Ok(Some(bytes_sent as usize))
     } else {
@@ -691,91 +715,103 @@
 }
 
 impl UdpSocketExt for UdpSocket {
-    unsafe fn recv_from_overlapped(&self,
-                                   buf: &mut [u8],
-                                   addr: *mut SocketAddrBuf,
-                                   overlapped: *mut OVERLAPPED)
-                                   -> io::Result<Option<usize>> {
+    unsafe fn recv_from_overlapped(
+        &self,
+        buf: &mut [u8],
+        addr: *mut SocketAddrBuf,
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
         let mut buf = slice2buf(buf);
         let mut flags = 0;
         let mut received_bytes: DWORD = 0;
-        let r = WSARecvFrom(self.as_raw_socket(), &mut buf, 1,
-                            &mut received_bytes, &mut flags,
-                            &mut (*addr).buf as *mut _ as *mut _,
-                            &mut (*addr).len,
-                            overlapped, None);
+        let r = WSARecvFrom(
+            self.as_raw_socket() as SOCKET,
+            &mut buf,
+            1,
+            &mut received_bytes,
+            &mut flags,
+            &mut (*addr).buf as *mut _ as *mut _,
+            &mut (*addr).len,
+            overlapped,
+            None,
+        );
         cvt(r, received_bytes)
     }
 
-    unsafe fn recv_overlapped(&self,
-                              buf: &mut [u8],
-                              overlapped: *mut OVERLAPPED)
-                              -> io::Result<Option<usize>> {
+    unsafe fn recv_overlapped(
+        &self,
+        buf: &mut [u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
         let mut buf = slice2buf(buf);
         let mut flags = 0;
         let mut received_bytes: DWORD = 0;
-        let r = WSARecv(self.as_raw_socket(), &mut buf, 1,
-                            &mut received_bytes, &mut flags,
-                            overlapped, None);
+        let r = WSARecv(
+            self.as_raw_socket() as SOCKET,
+            &mut buf,
+            1,
+            &mut received_bytes,
+            &mut flags,
+            overlapped,
+            None,
+        );
         cvt(r, received_bytes)
     }
 
-    unsafe fn send_to_overlapped(&self,
-                                 buf: &[u8],
-                                 addr: &SocketAddr,
-                                 overlapped: *mut OVERLAPPED)
-                                 -> io::Result<Option<usize>> {
+    unsafe fn send_to_overlapped(
+        &self,
+        buf: &[u8],
+        addr: &SocketAddr,
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
         let (addr_buf, addr_len) = socket_addr_to_ptrs(addr);
         let mut buf = slice2buf(buf);
         let mut sent_bytes = 0;
-        let r = WSASendTo(self.as_raw_socket(), &mut buf, 1,
-                          &mut sent_bytes, 0,
-                          addr_buf.as_ptr() as *const _, addr_len,
-                          overlapped, None);
+        let r = WSASendTo(
+            self.as_raw_socket() as SOCKET,
+            &mut buf,
+            1,
+            &mut sent_bytes,
+            0,
+            addr_buf.as_ptr() as *const _,
+            addr_len,
+            overlapped,
+            None,
+        );
         cvt(r, sent_bytes)
     }
 
-    unsafe fn send_overlapped(&self,
-                              buf: &[u8],
-                              overlapped: *mut OVERLAPPED)
-                              -> io::Result<Option<usize>> {
+    unsafe fn send_overlapped(
+        &self,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
         let mut buf = slice2buf(buf);
         let mut sent_bytes = 0;
-        let r = WSASend(self.as_raw_socket(), &mut buf, 1,
-                          &mut sent_bytes, 0,
-                          overlapped, None);
+        let r = WSASend(
+            self.as_raw_socket() as SOCKET,
+            &mut buf,
+            1,
+            &mut sent_bytes,
+            0,
+            overlapped,
+            None,
+        );
         cvt(r, sent_bytes)
     }
 
-    unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                     -> io::Result<(usize, u32)> {
-        result(self.as_raw_socket(), overlapped)
-    }
-}
-
-impl TcpBuilderExt for TcpBuilder {
-    unsafe fn connect_overlapped(&self,
-                                 addr: &SocketAddr,
-                                 buf: &[u8],
-                                 overlapped: *mut OVERLAPPED)
-                                 -> io::Result<(TcpStream, Option<usize>)> {
-        connect_overlapped(self.as_raw_socket(), addr, buf, overlapped).map(|s| {
-            (self.to_tcp_stream().unwrap(), s)
-        })
-    }
-
-    unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                     -> io::Result<(usize, u32)> {
-        result(self.as_raw_socket(), overlapped)
+    unsafe fn result(&self, overlapped: *mut OVERLAPPED) -> io::Result<(usize, u32)> {
+        result(self.as_raw_socket() as SOCKET, overlapped)
     }
 }
 
 impl TcpListenerExt for TcpListener {
-    unsafe fn accept_overlapped(&self,
-                                socket: &TcpBuilder,
-                                addrs: &mut AcceptAddrsBuf,
-                                overlapped: *mut OVERLAPPED)
-                                -> io::Result<(TcpStream, bool)> {
+    unsafe fn accept_overlapped(
+        &self,
+        socket: &TcpStream,
+        addrs: &mut AcceptAddrsBuf,
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<bool> {
         static ACCEPTEX: WsaExtension = WsaExtension {
             guid: GUID {
                 Data1: 0xb5367df1,
@@ -783,40 +819,55 @@
                 Data3: 0x11cf,
                 Data4: [0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92],
             },
-            val: ATOMIC_USIZE_INIT,
+            val: AtomicUsize::new(0),
         };
-        type AcceptEx = unsafe extern "system" fn(SOCKET, SOCKET, PVOID,
-                                                  DWORD, DWORD, DWORD, LPDWORD,
-                                                  LPOVERLAPPED) -> BOOL;
+        type AcceptEx = unsafe extern "system" fn(
+            SOCKET,
+            SOCKET,
+            PVOID,
+            DWORD,
+            DWORD,
+            DWORD,
+            LPDWORD,
+            LPOVERLAPPED,
+        ) -> BOOL;
 
-        let ptr = try!(ACCEPTEX.get(self.as_raw_socket()));
+        let ptr = ACCEPTEX.get(self.as_raw_socket() as SOCKET)?;
         assert!(ptr != 0);
         let accept_ex = mem::transmute::<_, AcceptEx>(ptr);
 
         let mut bytes = 0;
         let (a, b, c, d) = (*addrs).args();
-        let r = accept_ex(self.as_raw_socket(), socket.as_raw_socket(),
-                          a, b, c, d, &mut bytes, overlapped);
+        let r = accept_ex(
+            self.as_raw_socket() as SOCKET,
+            socket.as_raw_socket() as SOCKET,
+            a,
+            b,
+            c,
+            d,
+            &mut bytes,
+            overlapped,
+        );
         let succeeded = if r == TRUE {
             true
         } else {
-            try!(last_err());
+            last_err()?;
             false
         };
-        // NB: this unwrap() should be guaranteed to succeed, and this is an
-        // assert that it does indeed succeed.
-        Ok((socket.to_tcp_stream().unwrap(), succeeded))
+        Ok(succeeded)
     }
 
     fn accept_complete(&self, socket: &TcpStream) -> io::Result<()> {
         const SO_UPDATE_ACCEPT_CONTEXT: c_int = 0x700B;
         let me = self.as_raw_socket();
         let result = unsafe {
-            setsockopt(socket.as_raw_socket(),
-                       SOL_SOCKET,
-                       SO_UPDATE_ACCEPT_CONTEXT,
-                       &me as *const _ as *const _,
-                       mem::size_of_val(&me) as c_int)
+            setsockopt(
+                socket.as_raw_socket() as SOCKET,
+                SOL_SOCKET,
+                SO_UPDATE_ACCEPT_CONTEXT,
+                &me as *const _ as *const _,
+                mem::size_of_val(&me) as c_int,
+            )
         };
         if result == 0 {
             Ok(())
@@ -825,9 +876,8 @@
         }
     }
 
-    unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                     -> io::Result<(usize, u32)> {
-        result(self.as_raw_socket(), overlapped)
+    unsafe fn result(&self, overlapped: *mut OVERLAPPED) -> io::Result<(usize, u32)> {
+        result(self.as_raw_socket() as SOCKET, overlapped)
     }
 }
 
@@ -851,9 +901,7 @@
     ///
     /// If an error is encountered then `None` is returned.
     pub fn to_socket_addr(&self) -> Option<SocketAddr> {
-        unsafe {
-            ptrs_to_socket_addr(&self.buf as *const _ as *const _, self.len)
-        }
+        unsafe { ptrs_to_socket_addr(&self.buf as *const _ as *const _, self.len) }
     }
 }
 
@@ -864,11 +912,18 @@
         Data3: 0x11cf,
         Data4: [0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92],
     },
-    val: ATOMIC_USIZE_INIT,
+    val: AtomicUsize::new(0),
 };
-type GetAcceptExSockaddrs = unsafe extern "system" fn(PVOID, DWORD, DWORD, DWORD,
-                                                      *mut LPSOCKADDR, LPINT,
-                                                      *mut LPSOCKADDR, LPINT);
+type GetAcceptExSockaddrs = unsafe extern "system" fn(
+    PVOID,
+    DWORD,
+    DWORD,
+    DWORD,
+    *mut LPSOCKADDR,
+    LPINT,
+    *mut LPSOCKADDR,
+    LPINT,
+);
 
 impl AcceptAddrsBuf {
     /// Creates a new blank buffer ready to be passed to a call to
@@ -884,28 +939,39 @@
     /// succeeded to parse out the data that was written in.
     pub fn parse(&self, socket: &TcpListener) -> io::Result<AcceptAddrs> {
         let mut ret = AcceptAddrs {
-            local: 0 as *mut _, local_len: 0,
-            remote: 0 as *mut _, remote_len: 0,
+            local: 0 as *mut _,
+            local_len: 0,
+            remote: 0 as *mut _,
+            remote_len: 0,
             _data: self,
         };
-        let ptr = try!(GETACCEPTEXSOCKADDRS.get(socket.as_raw_socket()));
+        let ptr = GETACCEPTEXSOCKADDRS.get(socket.as_raw_socket() as SOCKET)?;
         assert!(ptr != 0);
         unsafe {
             let get_sockaddrs = mem::transmute::<_, GetAcceptExSockaddrs>(ptr);
             let (a, b, c, d) = self.args();
-            get_sockaddrs(a, b, c, d,
-                          &mut ret.local, &mut ret.local_len,
-                          &mut ret.remote, &mut ret.remote_len);
+            get_sockaddrs(
+                a,
+                b,
+                c,
+                d,
+                &mut ret.local,
+                &mut ret.local_len,
+                &mut ret.remote,
+                &mut ret.remote_len,
+            );
             Ok(ret)
         }
     }
 
     fn args(&self) -> (PVOID, DWORD, DWORD, DWORD) {
-        let remote_offset = unsafe {
-            &(*(0 as *const AcceptAddrsBuf)).remote as *const _ as usize
-        };
-        (self as *const _ as *mut _, 0, remote_offset as DWORD,
-         (mem::size_of_val(self) - remote_offset) as DWORD)
+        let remote_offset = unsafe { &(*(0 as *const AcceptAddrsBuf)).remote as *const _ as usize };
+        (
+            self as *const _ as *mut _,
+            0,
+            remote_offset as DWORD,
+            (mem::size_of_val(self) - remote_offset) as DWORD,
+        )
     }
 }
 
@@ -925,18 +991,22 @@
     fn get(&self, socket: SOCKET) -> io::Result<usize> {
         let prev = self.val.load(Ordering::SeqCst);
         if prev != 0 && !cfg!(debug_assertions) {
-            return Ok(prev)
+            return Ok(prev);
         }
         let mut ret = 0 as usize;
         let mut bytes = 0;
         let r = unsafe {
-            WSAIoctl(socket, SIO_GET_EXTENSION_FUNCTION_POINTER,
-                     &self.guid as *const _ as *mut _,
-                     mem::size_of_val(&self.guid) as DWORD,
-                     &mut ret as *mut _ as *mut _,
-                     mem::size_of_val(&ret) as DWORD,
-                     &mut bytes,
-                     0 as *mut _, None)
+            WSAIoctl(
+                socket,
+                SIO_GET_EXTENSION_FUNCTION_POINTER,
+                &self.guid as *const _ as *mut _,
+                mem::size_of_val(&self.guid) as DWORD,
+                &mut ret as *mut _ as *mut _,
+                mem::size_of_val(&ret) as DWORD,
+                &mut bytes,
+                0 as *mut _,
+                None,
+            )
         };
         cvt(r, 0).map(|_| {
             debug_assert_eq!(bytes as usize, mem::size_of_val(&ret));
@@ -944,23 +1014,26 @@
             self.val.store(ret, Ordering::SeqCst);
             ret
         })
-
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use std::net::{TcpListener, UdpSocket, TcpStream, SocketAddr};
-    use std::thread;
     use std::io::prelude::*;
+    use std::net::{
+        IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV6, TcpListener, TcpStream, UdpSocket,
+    };
+    use std::slice;
+    use std::thread;
+
+    use socket2::{Domain, Socket, Type};
 
-    use Overlapped;
-    use iocp::CompletionPort;
-    use net::{TcpStreamExt, UdpSocketExt, SocketAddrBuf};
-    use net::{TcpBuilderExt, TcpListenerExt, AcceptAddrsBuf};
-    use net2::TcpBuilder;
+    use crate::iocp::CompletionPort;
+    use crate::net::{AcceptAddrsBuf, TcpListenerExt};
+    use crate::net::{SocketAddrBuf, TcpStreamExt, UdpSocketExt};
+    use crate::Overlapped;
 
-    fn each_ip(f: &mut FnMut(SocketAddr)) {
+    fn each_ip(f: &mut dyn FnMut(SocketAddr)) {
         f(t!("127.0.0.1:0".parse()));
         f(t!("[::1]:0".parse()));
     }
@@ -1035,22 +1108,21 @@
             });
 
             let cp = t!(CompletionPort::new(1));
-            let builder = match addr {
-                SocketAddr::V4(..) => t!(TcpBuilder::new_v4()),
-                SocketAddr::V6(..) => t!(TcpBuilder::new_v6()),
-            };
-            t!(cp.add_socket(1, &builder));
+            let domain = Domain::for_address(addr);
+            let socket = t!(Socket::new(domain, Type::STREAM, None));
+            t!(socket.bind(&addr_template.into()));
+            let socket = TcpStream::from(socket);
+            t!(cp.add_socket(1, &socket));
 
             let a = Overlapped::zero();
-            t!(builder.bind(addr_template));
-            let (s, _) = unsafe {
-                t!(builder.connect_overlapped(&addr, &[], a.raw()))
-            };
+            unsafe {
+                t!(socket.connect_overlapped(&addr, &[], a.raw()));
+            }
             let status = t!(cp.get(None));
             assert_eq!(status.bytes_transferred(), 0);
             assert_eq!(status.token(), 1);
             assert_eq!(status.overlapped(), a.raw());
-            t!(s.connect_complete());
+            t!(socket.connect_complete());
 
             t!(t.join());
         })
@@ -1193,22 +1265,20 @@
             });
 
             let cp = t!(CompletionPort::new(1));
-            let builder = match addr {
-                SocketAddr::V4(..) => t!(TcpBuilder::new_v4()),
-                SocketAddr::V6(..) => t!(TcpBuilder::new_v6()),
-            };
+            let domain = Domain::for_address(addr);
+            let socket = TcpStream::from(t!(Socket::new(domain, Type::STREAM, None)));
             t!(cp.add_socket(1, &l));
 
             let a = Overlapped::zero();
             let mut addrs = AcceptAddrsBuf::new();
-            let (s, _) = unsafe {
-                t!(l.accept_overlapped(&builder, &mut addrs, a.raw()))
-            };
+            unsafe {
+                t!(l.accept_overlapped(&socket, &mut addrs, a.raw()));
+            }
             let status = t!(cp.get(None));
             assert_eq!(status.bytes_transferred(), 0);
             assert_eq!(status.token(), 1);
             assert_eq!(status.overlapped(), a.raw());
-            t!(l.accept_complete(&s));
+            t!(l.accept_complete(&socket));
 
             let (remote, local) = t!(t.join());
             let addrs = addrs.parse(&l).unwrap();
@@ -1216,4 +1286,47 @@
             assert_eq!(addrs.remote(), Some(remote));
         })
     }
+
+    #[test]
+    fn sockaddr_convert_4() {
+        let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(3, 4, 5, 6)), 0xabcd);
+        let (raw_addr, addr_len) = super::socket_addr_to_ptrs(&addr);
+        assert_eq!(addr_len, 16);
+        let addr_bytes =
+            unsafe { slice::from_raw_parts(raw_addr.as_ptr() as *const u8, addr_len as usize) };
+        assert_eq!(
+            addr_bytes,
+            &[2, 0, 0xab, 0xcd, 3, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0]
+        );
+    }
+
+    #[test]
+    fn sockaddr_convert_v6() {
+        let port = 0xabcd;
+        let flowinfo = 0x12345678;
+        let scope_id = 0x87654321;
+        let addr = SocketAddr::V6(SocketAddrV6::new(
+            Ipv6Addr::new(
+                0x0102, 0x0304, 0x0506, 0x0708, 0x090a, 0x0b0c, 0x0d0e, 0x0f10,
+            ),
+            port,
+            flowinfo,
+            scope_id,
+        ));
+        let (raw_addr, addr_len) = super::socket_addr_to_ptrs(&addr);
+        assert_eq!(addr_len, 28);
+        let addr_bytes =
+            unsafe { slice::from_raw_parts(raw_addr.as_ptr() as *const u8, addr_len as usize) };
+        assert_eq!(
+            addr_bytes,
+            &[
+                23, 0, // AF_INET6
+                0xab, 0xcd, // Port
+                0x78, 0x56, 0x34, 0x12, // flowinfo
+                0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+                0x0f, 0x10, // IP
+                0x21, 0x43, 0x65, 0x87, // scope_id
+            ]
+        );
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/overlapped.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/overlapped.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/overlapped.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/overlapped.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,22 @@
+use std::fmt;
+use std::io;
 use std::mem;
+use std::ptr;
 
-use winapi::*;
+use winapi::shared::ntdef::{HANDLE, NULL};
+use winapi::um::minwinbase::*;
+use winapi::um::synchapi::*;
 
 /// A wrapper around `OVERLAPPED` to provide "rustic" accessors and
 /// initializers.
-#[derive(Debug)]
 pub struct Overlapped(OVERLAPPED);
 
+impl fmt::Debug for Overlapped {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "OVERLAPPED")
+    }
+}
+
 unsafe impl Send for Overlapped {}
 unsafe impl Sync for Overlapped {}
 
@@ -19,6 +29,20 @@
         Overlapped(unsafe { mem::zeroed() })
     }
 
+    /// Creates a new `Overlapped` with an initialized non-null `hEvent`.  The caller is
+    /// responsible for calling `CloseHandle` on the `hEvent` field of the returned
+    /// `Overlapped`.  The event is created with `bManualReset` set to `FALSE`, meaning after a
+    /// single thread waits on the event, it will be reset.
+    pub fn initialize_with_autoreset_event() -> io::Result<Overlapped> {
+        let event = unsafe { CreateEventW(ptr::null_mut(), 0i32, 0i32, ptr::null()) };
+        if event == NULL {
+            return Err(io::Error::last_os_error());
+        }
+        let mut overlapped = Self::zero();
+        overlapped.set_event(event);
+        Ok(overlapped)
+    }
+
     /// Creates a new `Overlapped` function pointer from the underlying
     /// `OVERLAPPED`, wrapping in the "rusty" wrapper for working with
     /// accessors.
@@ -43,13 +67,15 @@
     /// handles that are on a seeking device that supports the concept of an
     /// offset.
     pub fn set_offset(&mut self, offset: u64) {
-        self.0.Offset = offset as u32;
-        self.0.OffsetHigh = (offset >> 32) as u32;
+        let s = unsafe { self.0.u.s_mut() };
+        s.Offset = offset as u32;
+        s.OffsetHigh = (offset >> 32) as u32;
     }
 
     /// Reads the offset inside this overlapped structure.
     pub fn offset(&self) -> u64 {
-        (self.0.Offset as u64) | ((self.0.OffsetHigh as u64) << 32)
+        let s = unsafe { self.0.u.s() };
+        (s.Offset as u64) | ((s.OffsetHigh as u64) << 32)
     }
 
     /// Sets the `hEvent` field of this structure.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/pipe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/pipe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/miow/src/pipe.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/miow/src/pipe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,68 @@
-//! Named pipes
+//! Interprocess Communication pipes
+//!          
+//! A pipe is a section of shared memory that processes use for communication.
+//! The process that creates a pipe is the _pipe server_. A process that connects
+//! to a pipe is a _pipe client_. One process writes information to the pipe, then
+//! the other process reads the information from the pipe. This overview
+//! describes how to create, manage, and use pipes.
+//!
+//! There are two types of pipes: [anonymous pipes](#fn.anonymous.html) and
+//! [named pipes](#fn.named.html). Anonymous pipes require less overhead than
+//! named pipes, but offer limited services.
+//!
+//! # Anonymous pipes
+//!
+//! An anonymous pipe is an unnamed, one-way pipe that typically transfers data
+//! between a parent process and a child process. Anonymous pipes are always
+//! local; they cannot be used for communication over a network.
+//!
+//! # Named pipes
+//!
+//! A *named pipe* is a named, one-way or duplex pipe for communication between
+//! the pipe server and one or more pipe clients. All instances of a named pipe
+//! share the same pipe name, but each instance has its own buffers and handles,
+//! and provides a separate conduit for client/server communication. The use of
+//! instances enables multiple pipe clients to use the same named pipe
+//! simultaneously.
+//!
+//! Any process can access named pipes, subject to security checks, making named
+//! pipes an easy form of communication between related or unrelated processes.
+//!
+//! Any process can act as both a server and a client, making peer-to-peer
+//! communication possible. As used here, the term pipe server refers to a
+//! process that creates a named pipe, and the term pipe client refers to a
+//! process that connects to an instance of a named pipe.
+//!
+//! Named pipes can be used to provide communication between processes on the
+//! same computer or between processes on different computers across a network.
+//! If the server service is running, all named pipes are accessible remotely. If
+//! you intend to use a named pipe locally only, deny access to NT
+//! AUTHORITY\\NETWORK or switch to local RPC.
+//!
+//! # References
+//!
+//! - [win32 pipe docs](https://github.com/MicrosoftDocs/win32/blob/docs/desktop-src/ipc/pipes.md)
 
+use std::cell::RefCell;
 use std::ffi::OsStr;
-use std::fs::{OpenOptions, File};
-use std::io::prelude::*;
+use std::fs::{File, OpenOptions};
 use std::io;
+use std::io::prelude::*;
 use std::os::windows::ffi::*;
 use std::os::windows::io::*;
 use std::time::Duration;
 
-use winapi::*;
-use kernel32::*;
-use handle::Handle;
+use crate::handle::Handle;
+use crate::overlapped::Overlapped;
+use winapi::shared::minwindef::*;
+use winapi::shared::ntdef::HANDLE;
+use winapi::shared::winerror::*;
+use winapi::um::fileapi::*;
+use winapi::um::handleapi::*;
+use winapi::um::ioapiset::*;
+use winapi::um::minwinbase::*;
+use winapi::um::namedpipeapi::*;
+use winapi::um::winbase::*;
 
 /// Readable half of an anonymous pipe.
 #[derive(Debug)]
@@ -45,21 +97,25 @@
 pub fn anonymous(buffer_size: u32) -> io::Result<(AnonRead, AnonWrite)> {
     let mut read = 0 as HANDLE;
     let mut write = 0 as HANDLE;
-    try!(::cvt(unsafe {
-        CreatePipe(&mut read, &mut write, 0 as *mut _, buffer_size)
-    }));
+    crate::cvt(unsafe { CreatePipe(&mut read, &mut write, 0 as *mut _, buffer_size) })?;
     Ok((AnonRead(Handle::new(read)), AnonWrite(Handle::new(write))))
 }
 
 impl Read for AnonRead {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { self.0.read(buf) }
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.0.read(buf)
+    }
 }
 impl<'a> Read for &'a AnonRead {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { self.0.read(buf) }
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.0.read(buf)
+    }
 }
 
 impl AsRawHandle for AnonRead {
-    fn as_raw_handle(&self) -> HANDLE { self.0.raw() }
+    fn as_raw_handle(&self) -> HANDLE {
+        self.0.raw()
+    }
 }
 impl FromRawHandle for AnonRead {
     unsafe fn from_raw_handle(handle: HANDLE) -> AnonRead {
@@ -67,20 +123,32 @@
     }
 }
 impl IntoRawHandle for AnonRead {
-    fn into_raw_handle(self) -> HANDLE { self.0.into_raw() }
+    fn into_raw_handle(self) -> HANDLE {
+        self.0.into_raw()
+    }
 }
 
 impl Write for AnonWrite {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) }
-    fn flush(&mut self) -> io::Result<()> { Ok(()) }
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.0.write(buf)
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
 }
 impl<'a> Write for &'a AnonWrite {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) }
-    fn flush(&mut self) -> io::Result<()> { Ok(()) }
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.0.write(buf)
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
 }
 
 impl AsRawHandle for AnonWrite {
-    fn as_raw_handle(&self) -> HANDLE { self.0.raw() }
+    fn as_raw_handle(&self) -> HANDLE {
+        self.0.raw()
+    }
 }
 impl FromRawHandle for AnonWrite {
     unsafe fn from_raw_handle(handle: HANDLE) -> AnonWrite {
@@ -88,7 +156,9 @@
     }
 }
 impl IntoRawHandle for AnonWrite {
-    fn into_raw_handle(self) -> HANDLE { self.0.into_raw() }
+    fn into_raw_handle(self) -> HANDLE {
+        self.0.into_raw()
+    }
 }
 
 /// A convenience function to connect to a named pipe.
@@ -108,16 +178,17 @@
     w.write(true);
     rw.read(true).write(true);
     loop {
-        let res = rw.open(addr).or_else(|_| r.open(addr))
-                               .or_else(|_| w.open(addr));
+        let res = rw
+            .open(addr)
+            .or_else(|_| r.open(addr))
+            .or_else(|_| w.open(addr));
         match res {
             Ok(f) => return Ok(f),
-            Err(ref e) if e.raw_os_error() == Some(ERROR_PIPE_BUSY as i32)
-                => {}
+            Err(ref e) if e.raw_os_error() == Some(ERROR_PIPE_BUSY as i32) => {}
             Err(e) => return Err(e),
         }
 
-        try!(NamedPipe::wait(addr, Some(Duration::new(20, 0))));
+        NamedPipe::wait(addr, Some(Duration::new(20, 0)))?;
     }
 }
 
@@ -147,17 +218,14 @@
     ///
     /// If this function succeeds the process can create a `File` to connect to
     /// the named pipe.
-    pub fn wait<A: AsRef<OsStr>>(addr: A, timeout: Option<Duration>)
-                                 -> io::Result<()> {
+    pub fn wait<A: AsRef<OsStr>>(addr: A, timeout: Option<Duration>) -> io::Result<()> {
         NamedPipe::_wait(addr.as_ref(), timeout)
     }
 
     fn _wait(addr: &OsStr, timeout: Option<Duration>) -> io::Result<()> {
         let addr = addr.encode_wide().chain(Some(0)).collect::<Vec<_>>();
-        let timeout = ::dur2ms(timeout);
-        ::cvt(unsafe {
-            WaitNamedPipeW(addr.as_ptr(), timeout)
-        }).map(|_| ())
+        let timeout = crate::dur2ms(timeout);
+        crate::cvt(unsafe { WaitNamedPipeW(addr.as_ptr(), timeout) }).map(|_| ())
     }
 
     /// Connects this named pipe to a client, blocking until one becomes
@@ -167,10 +235,9 @@
     /// client to connect. This can be called immediately after the pipe is
     /// created, or after it has been disconnected from a previous client.
     pub fn connect(&self) -> io::Result<()> {
-        match ::cvt(unsafe { ConnectNamedPipe(self.0.raw(), 0 as *mut _) }) {
+        match crate::cvt(unsafe { ConnectNamedPipe(self.0.raw(), 0 as *mut _) }) {
             Ok(_) => Ok(()),
-            Err(ref e) if e.raw_os_error() == Some(ERROR_PIPE_CONNECTED as i32)
-                => Ok(()),
+            Err(ref e) if e.raw_os_error() == Some(ERROR_PIPE_CONNECTED as i32) => Ok(()),
             Err(e) => Err(e),
         }
     }
@@ -194,23 +261,19 @@
     /// To safely use this function callers must ensure that this pointer is
     /// valid until the I/O operation is completed, typically via completion
     /// ports and waiting to receive the completion notification on the port.
-    pub unsafe fn connect_overlapped(&self, overlapped: *mut OVERLAPPED)
-                                     -> io::Result<bool> {
-        match ::cvt(ConnectNamedPipe(self.0.raw(), overlapped)) {
+    pub unsafe fn connect_overlapped(&self, overlapped: *mut OVERLAPPED) -> io::Result<bool> {
+        match crate::cvt(ConnectNamedPipe(self.0.raw(), overlapped)) {
             Ok(_) => Ok(true),
-            Err(ref e) if e.raw_os_error() == Some(ERROR_PIPE_CONNECTED as i32)
-                => Ok(true),
-            Err(ref e) if e.raw_os_error() == Some(ERROR_IO_PENDING as i32)
-                => Ok(false),
+            Err(ref e) if e.raw_os_error() == Some(ERROR_PIPE_CONNECTED as i32) => Ok(true),
+            Err(ref e) if e.raw_os_error() == Some(ERROR_IO_PENDING as i32) => Ok(false),
+            Err(ref e) if e.raw_os_error() == Some(ERROR_NO_DATA as i32) => Ok(true),
             Err(e) => Err(e),
         }
     }
 
     /// Disconnects this named pipe from any connected client.
     pub fn disconnect(&self) -> io::Result<()> {
-        ::cvt(unsafe {
-            DisconnectNamedPipe(self.0.raw())
-        }).map(|_| ())
+        crate::cvt(unsafe { DisconnectNamedPipe(self.0.raw()) }).map(|_| ())
     }
 
     /// Issues an overlapped read operation to occur on this pipe.
@@ -239,10 +302,11 @@
     /// To safely use this function callers must ensure that the pointers are
     /// valid until the I/O operation is completed, typically via completion
     /// ports and waiting to receive the completion notification on the port.
-    pub unsafe fn read_overlapped(&self,
-                                  buf: &mut [u8],
-                                  overlapped: *mut OVERLAPPED)
-                                  -> io::Result<Option<usize>> {
+    pub unsafe fn read_overlapped(
+        &self,
+        buf: &mut [u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
         self.0.read_overlapped(buf, overlapped)
     }
 
@@ -272,10 +336,11 @@
     /// To safely use this function callers must ensure that the pointers are
     /// valid until the I/O operation is completed, typically via completion
     /// ports and waiting to receive the completion notification on the port.
-    pub unsafe fn write_overlapped(&self,
-                                   buf: &[u8],
-                                   overlapped: *mut OVERLAPPED)
-                                   -> io::Result<Option<usize>> {
+    pub unsafe fn write_overlapped(
+        &self,
+        buf: &[u8],
+        overlapped: *mut OVERLAPPED,
+    ) -> io::Result<Option<usize>> {
         self.0.write_overlapped(buf, overlapped)
     }
 
@@ -296,13 +361,9 @@
     /// # Panics
     ///
     /// This function will panic
-    pub unsafe fn result(&self, overlapped: *mut OVERLAPPED)
-                         -> io::Result<usize> {
+    pub unsafe fn result(&self, overlapped: *mut OVERLAPPED) -> io::Result<usize> {
         let mut transferred = 0;
-        let r = GetOverlappedResult(self.0.raw(),
-                                    overlapped,
-                                    &mut transferred,
-                                    FALSE);
+        let r = GetOverlappedResult(self.0.raw(), overlapped, &mut transferred, FALSE);
         if r == 0 {
             Err(io::Error::last_os_error())
         } else {
@@ -311,28 +372,74 @@
     }
 }
 
+thread_local! {
+    static NAMED_PIPE_OVERLAPPED: RefCell<Option<Overlapped>> = RefCell::new(None);
+}
+
+/// Call a function with a threadlocal `Overlapped`.  The function `f` should be
+/// sure that the event is reset, either manually or by a thread being released.
+fn with_threadlocal_overlapped<F>(f: F) -> io::Result<usize>
+where
+    F: FnOnce(&Overlapped) -> io::Result<usize>,
+{
+    NAMED_PIPE_OVERLAPPED.with(|overlapped| {
+        let mut mborrow = overlapped.borrow_mut();
+        if let None = *mborrow {
+            let op = Overlapped::initialize_with_autoreset_event()?;
+            *mborrow = Some(op);
+        }
+        f(mborrow.as_ref().unwrap())
+    })
+}
+
 impl Read for NamedPipe {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { self.0.read(buf) }
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        // This is necessary because the pipe is opened with `FILE_FLAG_OVERLAPPED`.
+        with_threadlocal_overlapped(|overlapped| unsafe {
+            self.0
+                .read_overlapped_wait(buf, overlapped.raw() as *mut OVERLAPPED)
+        })
+    }
 }
 impl<'a> Read for &'a NamedPipe {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { self.0.read(buf) }
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        // This is necessary because the pipe is opened with `FILE_FLAG_OVERLAPPED`.
+        with_threadlocal_overlapped(|overlapped| unsafe {
+            self.0
+                .read_overlapped_wait(buf, overlapped.raw() as *mut OVERLAPPED)
+        })
+    }
 }
 
 impl Write for NamedPipe {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) }
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        // This is necessary because the pipe is opened with `FILE_FLAG_OVERLAPPED`.
+        with_threadlocal_overlapped(|overlapped| unsafe {
+            self.0
+                .write_overlapped_wait(buf, overlapped.raw() as *mut OVERLAPPED)
+        })
+    }
     fn flush(&mut self) -> io::Result<()> {
         <&NamedPipe as Write>::flush(&mut &*self)
     }
 }
 impl<'a> Write for &'a NamedPipe {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) }
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        // This is necessary because the pipe is opened with `FILE_FLAG_OVERLAPPED`.
+        with_threadlocal_overlapped(|overlapped| unsafe {
+            self.0
+                .write_overlapped_wait(buf, overlapped.raw() as *mut OVERLAPPED)
+        })
+    }
     fn flush(&mut self) -> io::Result<()> {
-        ::cvt(unsafe { FlushFileBuffers(self.0.raw()) }).map(|_| ())
+        crate::cvt(unsafe { FlushFileBuffers(self.0.raw()) }).map(|_| ())
     }
 }
 
 impl AsRawHandle for NamedPipe {
-    fn as_raw_handle(&self) -> HANDLE { self.0.raw() }
+    fn as_raw_handle(&self) -> HANDLE {
+        self.0.raw()
+    }
 }
 impl FromRawHandle for NamedPipe {
     unsafe fn from_raw_handle(handle: HANDLE) -> NamedPipe {
@@ -340,7 +447,9 @@
     }
 }
 impl IntoRawHandle for NamedPipe {
-    fn into_raw_handle(self) -> HANDLE { self.0.into_raw() }
+    fn into_raw_handle(self) -> HANDLE {
+        self.0.into_raw()
+    }
 }
 
 fn flag(slot: &mut DWORD, on: bool, val: DWORD) {
@@ -356,8 +465,7 @@
     pub fn new<A: AsRef<OsStr>>(addr: A) -> NamedPipeBuilder {
         NamedPipeBuilder {
             name: addr.as_ref().encode_wide().chain(Some(0)).collect(),
-            dwOpenMode: PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE |
-                        FILE_FLAG_OVERLAPPED,
+            dwOpenMode: PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE | FILE_FLAG_OVERLAPPED,
             dwPipeMode: PIPE_TYPE_BYTE,
             nMaxInstances: PIPE_UNLIMITED_INSTANCES,
             nOutBufferSize: 65536,
@@ -420,13 +528,31 @@
     /// This function will call the `CreateNamedPipe` function and return the
     /// result.
     pub fn create(&mut self) -> io::Result<NamedPipe> {
-        let h = unsafe {
-            CreateNamedPipeW(self.name.as_ptr(),
-                             self.dwOpenMode, self.dwPipeMode,
-                             self.nMaxInstances, self.nOutBufferSize,
-                             self.nInBufferSize, self.nDefaultTimeOut,
-                             0 as *mut _)
-        };
+        unsafe { self.with_security_attributes(::std::ptr::null_mut()) }
+    }
+
+    /// Using the options in the builder and the provided security attributes, attempt to create a
+    /// new named pipe. This function has to be called with a valid pointer to a
+    /// `SECURITY_ATTRIBUTES` struct that will stay valid for the lifetime of this function or a
+    /// null pointer.
+    ///
+    /// This function will call the `CreateNamedPipe` function and return the
+    /// result.
+    pub unsafe fn with_security_attributes(
+        &mut self,
+        attrs: *mut SECURITY_ATTRIBUTES,
+    ) -> io::Result<NamedPipe> {
+        let h = CreateNamedPipeW(
+            self.name.as_ptr(),
+            self.dwOpenMode,
+            self.dwPipeMode,
+            self.nMaxInstances,
+            self.nOutBufferSize,
+            self.nInBufferSize,
+            self.nDefaultTimeOut,
+            attrs,
+        );
+
         if h == INVALID_HANDLE_VALUE {
             Err(io::Error::last_os_error())
         } else {
@@ -443,14 +569,18 @@
     use std::thread;
     use std::time::Duration;
 
-    use rand::{thread_rng, Rng};
+    use rand::{distributions::Alphanumeric, thread_rng, Rng};
 
     use super::{anonymous, NamedPipe, NamedPipeBuilder};
-    use iocp::CompletionPort;
-    use Overlapped;
+    use crate::iocp::CompletionPort;
+    use crate::Overlapped;
 
     fn name() -> String {
-        let name = thread_rng().gen_ascii_chars().take(30).collect::<String>();
+        let name = thread_rng()
+            .sample_iter(Alphanumeric)
+            .take(30)
+            .map(char::from)
+            .collect::<String>();
         format!(r"\\.\pipe\{}", name)
     }
 
@@ -552,6 +682,53 @@
         t!(t.join());
     }
 
+    #[test]
+    fn named_read_write_multi() {
+        for _ in 0..5 {
+            named_read_write()
+        }
+    }
+
+    #[test]
+    fn named_read_write_multi_same_thread() {
+        let name1 = name();
+        let mut a1 = t!(NamedPipe::new(&name1));
+        let name2 = name();
+        let mut a2 = t!(NamedPipe::new(&name2));
+
+        let t = thread::spawn(move || {
+            let mut f = t!(OpenOptions::new().read(true).write(true).open(name1));
+            t!(f.write_all(&[1, 2, 3]));
+            let mut b = [0; 10];
+            assert_eq!(t!(f.read(&mut b)), 3);
+            assert_eq!(&b[..3], &[1, 2, 3]);
+
+            let mut f = t!(OpenOptions::new().read(true).write(true).open(name2));
+            t!(f.write_all(&[1, 2, 3]));
+            let mut b = [0; 10];
+            assert_eq!(t!(f.read(&mut b)), 3);
+            assert_eq!(&b[..3], &[1, 2, 3]);
+        });
+
+        t!(a1.connect());
+        let mut b = [0; 10];
+        assert_eq!(t!(a1.read(&mut b)), 3);
+        assert_eq!(&b[..3], &[1, 2, 3]);
+        t!(a1.write_all(&[1, 2, 3]));
+        t!(a1.flush());
+        t!(a1.disconnect());
+
+        t!(a2.connect());
+        let mut b = [0; 10];
+        assert_eq!(t!(a2.read(&mut b)), 3);
+        assert_eq!(&b[..3], &[1, 2, 3]);
+        t!(a2.write_all(&[1, 2, 3]));
+        t!(a2.flush());
+        t!(a2.disconnect());
+
+        t!(t.join());
+    }
+
     #[test]
     fn named_read_overlapped() {
         let name = name();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"74f21666ba6002cd52f385fa3c94ab72c23a922bd68d76eee1b796de3eddfbb3","LICENSE.LLVM":"abd4d8794808bacb1eb6924d49efafd9ab6eef88faaaeb5d3cfa13ee3670d672","LICENSE.MIT":"5744b514ce80118fb3845fb49d801db98b52ade79d26cc73b63d3f04de986408","Makefile":"86890e68207bb8fee896ffad038816a9386c17076d3bb82631a2720760faee19","README.md":"96a2aeacfe8a8d373b678305ec3eb6d85abb5030a8e724e716bdb40d01adb456","examples/msvc-demangle.rs":"376ec79cbd8453aadac5d165d5fd39e057daa041b2a5faed9efafc96effc71d2","src/bin/undname.rs":"4d55fb98a4ad4c515853d1ba5d792bbb5ec27d213a528ae0b5a664607a47b014","src/lib.rs":"5353d8a201aca160741b3ff1a3c551844c5b32a5e49d295d8fafe587db4d4ac7","tests/llvm-cases/ms-back-references.test":"265891f0b53cefc5b2778a6a2b95aeb453b3772f0d7379f65aafff3a90350a72","tests/llvm-cases/ms-basic.test":"49636892419661904b4b9f3f6a054db7b24912379081c0467200a8efee39dea1","tests/llvm-cases/ms-cxx11.test":"a7c6bb95a5aea816073e9d28ce9a085d65f16c1ffd04a0bbbab63173b443a5ab","tests/llvm-cases/ms-operators.test":"ea04b4fe2a4314d5eb215f40755c0f9489aa1f7179c5861571992dd4ec13e8a5","tests/llvm-cases/ms-windows.test":"e8ffa437b99b029e64e4b47a4beee69e3267da8a50d79a38ab6cca978b148e79","tests/llvm-cases/unused/invalid-manglings.test":"e3f250b6785622755badff19509b3c854bc9b7732b6a6b9ef965e63270550d91","tests/llvm-cases/unused/ms-arg-qualifiers.test":"729feb914641446d40810b39519e2b07dc77728df714acee711df8584efb4604","tests/llvm-cases/unused/ms-conversion-operators.test":"4984b4dc8dfa57d2b83fed61438fc8718e0b170cce5fe3ae630d5f0718dd5fc7","tests/llvm-cases/unused/ms-cxx14.test":"68a9c2bbe2389a5c22f55c0c34bb1e079bebba0f50940109c52bd53474c0d371","tests/llvm-cases/unused/ms-cxx17-noexcept.test":"57a49ae7f33064364062f676d3d41fa37f819c6334f46698e7fca78dae1b0370","tests/llvm-cases/unused/ms-cxx20.test":"a4db71d57d70bd464b19acd16d1ad83e09da88601217b737dcea31263d6b61f4","tests/llvm-cases/unused/ms-mangle.test":"cb120340f802651addcf45bf68197f76d73adedd7d1a12e70dcacd1863a87b3c","tests/llvm-cases/unused/ms-md5.test":"d2fd3320dae1ba53ba3afc50d9421630f2096b1689b88cc137d7d0ea53d3ed57","tests/llvm-cases/unused/ms-nested-scopes.test":"da109d92e5d667b1a69fcf18d70ff61fc7cf01ec1a110713165843904ad25388","tests/llvm-cases/unused/ms-return-qualifiers.test":"1bc0765a172870ca56e8d716854969bd2696f2d341a769e98bf05e80c796e659","tests/llvm-cases/unused/ms-string-literals.test":"30f50af81ca94a77b549eed018492e3230f694be6ef89885458d08a96329029f","tests/llvm-cases/unused/ms-template-callback.test":"d457735649c0cd6c4051adfecf15253d9cf11c45c67631d68922fa35a76a2438","tests/llvm-cases/unused/ms-templates-memptrs-2.test":"94f32f333e1e3655115bc43262bef0b3d8f801ba5a4c91021cbc6211c4202d97","tests/llvm-cases/unused/ms-templates-memptrs.test":"76d0b1e1d971ab742c16434a7590dfad29365a17e6707889c7aab5ba1eeb6805","tests/llvm-cases/unused/ms-templates.test":"a986ab43805f053cdeed084cf66e067f58871c4ae935a1dd0a1ae5307f216887","tests/llvm-cases/unused/ms-thunks.test":"67af1ad5a2d8b36d7946740e8c793f273fdf6d10529201f0a966954ccb8f33bf","tests/test_basics.rs":"1c3608e342ba8c0d532ea83413c9d1ba420d659d3fa2bf396b4093d6124bb1fb","tests/test_llvm.rs":"4c50fe9793667a0fed80d0042ccdaade7a51eda5bc07e1560096ba707ab9dc1d"},"package":"6584cf122f02fc0396420a116cd395a9a776ec4347dffe1c5119c3fcc917c060"}
\ No newline at end of file
+{"files":{"Cargo.lock":"626c10d709f7c300b9af29b22a50356694f3fa9a56feade27850b7f1edb62772","Cargo.toml":"1df0e220b9d2407517d0e50f666dce86ff296892e962af487290d025e2e2c44c","LICENSE.LLVM":"abd4d8794808bacb1eb6924d49efafd9ab6eef88faaaeb5d3cfa13ee3670d672","LICENSE.MIT":"5744b514ce80118fb3845fb49d801db98b52ade79d26cc73b63d3f04de986408","Makefile":"86890e68207bb8fee896ffad038816a9386c17076d3bb82631a2720760faee19","README.md":"96a2aeacfe8a8d373b678305ec3eb6d85abb5030a8e724e716bdb40d01adb456","examples/msvc-demangle.rs":"376ec79cbd8453aadac5d165d5fd39e057daa041b2a5faed9efafc96effc71d2","src/bin/undname.rs":"4d55fb98a4ad4c515853d1ba5d792bbb5ec27d213a528ae0b5a664607a47b014","src/lib.rs":"460d0c352d8d60b1aa6b319845b71e5955cc2fbf5b1b9602d03a33910c1db356","tests/llvm-cases/ms-back-references.test":"265891f0b53cefc5b2778a6a2b95aeb453b3772f0d7379f65aafff3a90350a72","tests/llvm-cases/ms-basic.test":"49636892419661904b4b9f3f6a054db7b24912379081c0467200a8efee39dea1","tests/llvm-cases/ms-cxx11.test":"a7c6bb95a5aea816073e9d28ce9a085d65f16c1ffd04a0bbbab63173b443a5ab","tests/llvm-cases/ms-operators.test":"ea04b4fe2a4314d5eb215f40755c0f9489aa1f7179c5861571992dd4ec13e8a5","tests/llvm-cases/ms-windows.test":"e8ffa437b99b029e64e4b47a4beee69e3267da8a50d79a38ab6cca978b148e79","tests/llvm-cases/unused/invalid-manglings.test":"e3f250b6785622755badff19509b3c854bc9b7732b6a6b9ef965e63270550d91","tests/llvm-cases/unused/ms-arg-qualifiers.test":"729feb914641446d40810b39519e2b07dc77728df714acee711df8584efb4604","tests/llvm-cases/unused/ms-conversion-operators.test":"4984b4dc8dfa57d2b83fed61438fc8718e0b170cce5fe3ae630d5f0718dd5fc7","tests/llvm-cases/unused/ms-cxx14.test":"68a9c2bbe2389a5c22f55c0c34bb1e079bebba0f50940109c52bd53474c0d371","tests/llvm-cases/unused/ms-cxx17-noexcept.test":"57a49ae7f33064364062f676d3d41fa37f819c6334f46698e7fca78dae1b0370","tests/llvm-cases/unused/ms-cxx20.test":"a4db71d57d70bd464b19acd16d1ad83e09da88601217b737dcea31263d6b61f4","tests/llvm-cases/unused/ms-mangle.test":"cb120340f802651addcf45bf68197f76d73adedd7d1a12e70dcacd1863a87b3c","tests/llvm-cases/unused/ms-md5.test":"d2fd3320dae1ba53ba3afc50d9421630f2096b1689b88cc137d7d0ea53d3ed57","tests/llvm-cases/unused/ms-nested-scopes.test":"da109d92e5d667b1a69fcf18d70ff61fc7cf01ec1a110713165843904ad25388","tests/llvm-cases/unused/ms-return-qualifiers.test":"1bc0765a172870ca56e8d716854969bd2696f2d341a769e98bf05e80c796e659","tests/llvm-cases/unused/ms-string-literals.test":"30f50af81ca94a77b549eed018492e3230f694be6ef89885458d08a96329029f","tests/llvm-cases/unused/ms-template-callback.test":"d457735649c0cd6c4051adfecf15253d9cf11c45c67631d68922fa35a76a2438","tests/llvm-cases/unused/ms-templates-memptrs-2.test":"94f32f333e1e3655115bc43262bef0b3d8f801ba5a4c91021cbc6211c4202d97","tests/llvm-cases/unused/ms-templates-memptrs.test":"76d0b1e1d971ab742c16434a7590dfad29365a17e6707889c7aab5ba1eeb6805","tests/llvm-cases/unused/ms-templates.test":"a986ab43805f053cdeed084cf66e067f58871c4ae935a1dd0a1ae5307f216887","tests/llvm-cases/unused/ms-thunks.test":"67af1ad5a2d8b36d7946740e8c793f273fdf6d10529201f0a966954ccb8f33bf","tests/test_basics.rs":"4a42f10779e2f1a9505d73edce86d22e70afdae73f2f1c6d6fd4c8934420ba0e","tests/test_llvm.rs":"fa6c7646abd712e2df29a2e0cfc77eb871a788e863ca5d8da9fa9b3f54da3e6e"},"package":"bfb67c6dd0fa9b00619c41c5700b6f92d5f418be49b45ddb9970fbd4569df3c8"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "msvc-demangler"
+version = "0.9.0"
+dependencies = [
+ "bitflags",
+]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "msvc-demangler"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Markus Stange <mstange@themasta.com>", "Jeff Muizelaar <jrmuizel@gmail.com>"]
 description = "A rust library that demangles / undecorates C++ symbols mangled by MSVC"
 documentation = "https://docs.rs/msvc-demangler/"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -204,7 +204,7 @@
         const SPACE_BEFORE_POINTER = 0x80_0000;
         /// Add ptr64 to output.  This is disabled by default because it's also not
         /// added by LLVM.  This is in a way the inverse of the DIA `UNDNAME_NO_PTR64`
-        const WITH_PTR64 = 0x100_000;
+        const WITH_PTR64 = 0x100_0000;
     }
 }
 
@@ -255,8 +255,10 @@
 // Represents an identifier which may be a template.
 #[derive(Clone, PartialEq)]
 pub enum Name<'a> {
+    Md5(&'a [u8]),
     Operator(Operator<'a>),
     NonTemplate(&'a [u8]),
+    AsInterface(&'a [u8]),
     Template(Box<Name<'a>>, Params<'a>),
     Discriminator(i32),
     ParsedName(Box<ParseResult<'a>>),
@@ -266,11 +268,19 @@
 impl<'a> fmt::Debug for Name<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
+            Name::Md5(s) => f
+                .debug_tuple("Md5")
+                .field(&String::from_utf8_lossy(s))
+                .finish(),
             Name::Operator(ref op) => f.debug_tuple("Operator").field(&op).finish(),
             Name::NonTemplate(s) => f
                 .debug_tuple("NonTemplate")
                 .field(&String::from_utf8_lossy(s))
                 .finish(),
+            Name::AsInterface(s) => f
+                .debug_tuple("AsInterface")
+                .field(&String::from_utf8_lossy(s))
+                .finish(),
             Name::Template(ref name, ref params) => {
                 f.debug_tuple("Template").field(name).field(params).finish()
             }
@@ -495,6 +505,17 @@
             return Err(self.fail("does not start with b'?'"));
         }
 
+        if self.consume(b"?@") {
+            let name = self.read_md5_name()?;
+            return Ok(ParseResult {
+                symbol: Symbol {
+                    name,
+                    scope: NameSequence { names: Vec::new() },
+                },
+                symbol_type: Type::None,
+            });
+        }
+
         if self.consume(b"$") {
             if self.consume(b"TSS") {
                 let mut guard_num: i32 = i32::from(
@@ -551,7 +572,7 @@
 
         if let Ok(c) = self.get() {
             let symbol_type = match c {
-                b'0'...b'4' => {
+                b'0'..=b'4' => {
                     // Read a variable.
                     let kind = match c {
                         b'0' => VarStorageKind::PrivateStatic,
@@ -682,6 +703,21 @@
         }
     }
 
+    /// An MD5 mangled name is `??@` followed by 32 characters and a terminating `@`.
+    ///
+    /// See https://github.com/llvm/llvm-project/blob/818cf30b83305fa4a2f75821349210b0f7aff4a4/llvm/lib/Demangle/MicrosoftDemangle.cpp#L754
+    fn read_md5_name(&mut self) -> Result<Name<'a>> {
+        let start_offset = self.offset;
+
+        while self.read_hex_digit().is_some() {}
+        let end_offset = self.offset;
+
+        if self.offset - start_offset != 32 || !self.consume(b"@") {
+            return Err(self.fail("expected MD5 mangled name of length 32"));
+        }
+        Ok(Name::Md5(&self.input.as_bytes()[start_offset..end_offset]))
+    }
+
     fn read_digit(&mut self) -> Option<u8> {
         match self.peek() {
             Some(first) => {
@@ -719,13 +755,13 @@
         for _i in 0..bytes {
             let c = self.get()?;
             let byte: u8 = match c {
-                b'0'...b'9' | b'a'...b'z' | b'A'...b'Z' | b'_' | b'$' => c,
+                b'0'..=b'9' | b'a'..=b'z' | b'A'..=b'Z' | b'_' | b'$' => c,
                 b'?' => {
                     let c = self.get()?;
                     match c {
-                        b'A'...b'Z' => c - b'A' + 0xe1,
-                        b'a'...b'z' => c - b'A' + 0xc1,
-                        b'0'...b'9' => {
+                        b'A'..=b'Z' => c - b'A' + 0xe1,
+                        b'a'..=b'z' => c - b'A' + 0xc1,
+                        b'0'..=b'9' => {
                             let v = &[
                                 b',', b'/', b'\\', b':', b'.', b' ', b'\n', b'\t', b'\'', b'-',
                             ];
@@ -784,7 +820,7 @@
                     self.advance(i + 1);
                     return Ok(if neg { -(ret as i32) } else { ret as i32 });
                 }
-                b'A'...b'P' => {
+                b'A'..=b'P' => {
                     ret = (ret << 4) + i32::from(c - b'A');
                     i += 1;
                 }
@@ -834,8 +870,8 @@
 
     fn read_template_name(&mut self) -> Result<Name<'a>> {
         // Templates have their own context for backreferences.
-        let saved_memorized_names = mem::replace(&mut self.memorized_names, vec![]);
-        let saved_memorized_types = mem::replace(&mut self.memorized_types, vec![]);
+        let saved_memorized_names = mem::take(&mut self.memorized_names);
+        let saved_memorized_types = mem::take(&mut self.memorized_types);
         let name = self.read_unqualified_name(false)?; // how does wine deal with ??$?DM@std@@YA?AV?$complex@M@0@ABMABV10@@Z
         let template_params = self.read_params()?;
         let _ = mem::replace(&mut self.memorized_names, saved_memorized_names);
@@ -875,6 +911,12 @@
                             self.memorize_name(&name);
                         }
                         name
+                    } else if self.consume(b"Q") {
+                        let name = self.read_string()?;
+                        self.expect(b"@")?;
+                        let name = Name::AsInterface(name);
+                        self.memorize_name(&name);
+                        name
                     } else {
                         let discriminator = self.read_number()?;
                         Name::Discriminator(discriminator)
@@ -1292,7 +1334,7 @@
                 return Ok(Type::TemplateParameterWithIndex(n));
             }
             if self.consume(b"$BY") {
-                return Ok(self.read_array()?);
+                return self.read_array();
             }
             if self.consume(b"$Q") {
                 return Ok(Type::RValueRef(Box::new(self.read_pointee()?), sc));
@@ -2169,6 +2211,11 @@
 
     fn write_one_name(&mut self, name: &Name) -> Result<()> {
         match *name {
+            Name::Md5(ref name) => {
+                write!(self.w, "??@")?;
+                self.w.write_all(name)?;
+                write!(self.w, "@")?;
+            }
             Name::Operator(ref op) => {
                 self.write_space()?;
                 self.write_operator_name(op)?;
@@ -2176,6 +2223,11 @@
             Name::NonTemplate(ref name) => {
                 self.w.write_all(name)?;
             }
+            Name::AsInterface(ref name) => {
+                write!(self.w, "[")?;
+                self.w.write_all(name)?;
+                write!(self.w, "]")?;
+            }
             Name::Template(ref name, ref params) => {
                 self.write_one_name(name)?;
                 self.write_tmpl_params(&params)?;
@@ -2228,10 +2280,15 @@
         }
 
         match names.name {
+            Name::Md5(ref name) => {
+                write!(self.w, "??@")?;
+                self.w.write_all(name)?;
+                write!(self.w, "@")?;
+            }
             Name::Operator(ref op) => {
                 match *op {
                     Operator::Ctor => {
-                        let prev = names.scope.names.iter().next().ok_or_else(|| {
+                        let prev = names.scope.names.get(0).ok_or_else(|| {
                             Error::new(
                                 "If there's a ctor, there should be another name in this sequence",
                             )
@@ -2239,7 +2296,7 @@
                         self.write_one_name(prev)?;
                     }
                     Operator::Dtor => {
-                        let prev = names.scope.names.iter().next().ok_or_else(|| {
+                        let prev = names.scope.names.get(0).ok_or_else(|| {
                             Error::new(
                                 "If there's a dtor, there should be another name in this sequence",
                             )
@@ -2273,6 +2330,11 @@
             Name::NonTemplate(ref name) => {
                 self.w.write_all(name)?;
             }
+            Name::AsInterface(ref name) => {
+                write!(self.w, "[")?;
+                self.w.write_all(name)?;
+                write!(self.w, "]")?;
+            }
             Name::Template(ref name, ref params) => {
                 self.write_one_name(name)?;
                 self.write_tmpl_params(&params)?;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/tests/test_basics.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/tests/test_basics.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/tests/test_basics.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/tests/test_basics.rs	2021-12-09 12:01:26.000000000 +0000
@@ -181,6 +181,16 @@
         "?getFactory@SkImageShader@@UBEP6A?AV?$sk_sp@VSkFlattenable@@@@AAVSkReadBuffer@@@ZXZ",
         "public: virtual class sk_sp<class SkFlattenable> (__cdecl * __thiscall SkImageShader::getFactory(void) const)(class SkReadBuffer &)"
     );
+
+    expect(
+        "?Present1@?QIDXGISwapChain4@@CDXGISwapChain@@UAGJIIPBUDXGI_PRESENT_PARAMETERS@@@Z", 
+        "public: virtual long __stdcall CDXGISwapChain::[IDXGISwapChain4]::Present1(unsigned int,unsigned int,struct DXGI_PRESENT_PARAMETERS const *)");
+
+    // An MD5 mangled name is "valid" but output as-is
+    expect(
+        "??@8ba8d245c9eca390356129098dbe9f73@",
+        "??@8ba8d245c9eca390356129098dbe9f73@",
+    );
 }
 
 #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/tests/test_llvm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/tests/test_llvm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/msvc-demangler/tests/test_llvm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/msvc-demangler/tests/test_llvm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,8 +29,8 @@
             Some(LineRule::CheckNotInvalid)
         } else if item.starts_with("; CHECK-NOT: ") {
             panic!("unsupported rule: {}", &item[2..]);
-        } else if item.starts_with("; CHECK: ") {
-            Some(LineRule::Check(&item[9..]))
+        } else if let Some(item) = item.strip_prefix("; CHECK: ") {
+            Some(LineRule::Check(item))
         } else if item.starts_with(';') {
             None
         } else {
@@ -45,7 +45,9 @@
             Some(LineRule::CheckNotInvalid) => {
                 not_invalid = true;
             }
-            Some(LineRule::Input(input)) => {
+            Some(LineRule::Input(input)) =>
+            {
+                #[allow(clippy::while_let_on_iterator)]
                 while let Some(next) = rule_iter.next() {
                     match next {
                         LineRule::CheckNotInvalid => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/appveyor.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/appveyor.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/appveyor.yml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-environment:
-  RUST_VERSION: 1.37.0
-  TARGET: x86_64-pc-windows-msvc
-install:
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:RUST_VERSION}-${env:TARGET}.exe"
-  - rust-%RUST_VERSION%-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files\Rust"
-  - SET PATH=%PATH%;C:\Program Files\Rust\bin
-  - rustc -V
-  - cargo -V
-build: false
-test_script:
-  - cargo test
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"e6a381dd90316ccb85806b6df184b21931b9bba4e195a5c96db7621600b8b172","Cargo.lock":"4a2a07c3992cb03cc0034631872918dd9733449272091f12354ccc390f3f9f2c","Cargo.toml":"717b6fc4b1dfe57ea02ab99707657d3f85e79c4e845236cc481a7106c7b139fa","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"f2ad7982ddbfa8c45eb965315718c55b70b9cc311b49afacb50d5fe84173ae2c","README.md":"473cb274fb72efdded91693e1ab0e9e4d5ca5bac9af39eaef98b66fd5dc714e7","appveyor.yml":"f0ca160d37a329957e7ed6750c9d670c916df251d5d3f0bef2f32f9d7de61214","build.rs":"46cfae159ca20d37b04f4250eb538e60dc1981c39133f98a3e7691f002a18b91","examples/google-connect.rs":"339a8cb9c9b8c472f8cac96711950114528c8700e5e48d6f61d59b636b69eb0c","examples/simple-server.rs":"f26fdcca641d03ecb7881fbc94ed1b5fe5db38531c1e8b4cd4a6bed3e3653ee8","src/imp/openssl.rs":"30d08f0a1951ba135960ae308f7ace29e36804c7023ef24e9d2d82a6ec7302fd","src/imp/schannel.rs":"788c57e6caa8d681c2c533c9a252238402f48d03a90b7f4d6b012cacb70e3fa7","src/imp/security_framework.rs":"946d91cc6ff5f4d8a7add0345fa7e7d9e0a15d14c88736f24c80d3a4d2a94261","src/lib.rs":"c14e800c22e8eedb4f67393f91d143cddfc9a88be1f4b662e74c2583403e77db","src/test.rs":"3b34db25f2de525fe922b0ea75fc850ea8269293094c97dc731f0c1adce46b67","test/cert.der":"4712b939fbcb42a6b5101b42139a25b14f81b418facabd378746f12f85cc6544","test/cert.pem":"4a08760c6799454ce468ca46a615b6c7fad0936c8ec5d30ee8dcb7cedb898097","test/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","test/root-ca.der":"063d70aef5de8fa5a9c35cdd46aea1cb4368ae50e99debd2049e7fa02568d7cc","test/root-ca.pem":"59b9200c35e818bf21be4aaa97ba87bb6a18fd780527a9f9c51cc74212c631a0","tests-ios/prelude.rs":"5247e63ec7b088c1eb585bdc10d78c1736c4f3d5dd4651eafacbddb507ecad51"},"package":"6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"acd253b95f67b6d363a8f9878e43a9626e8a16fae246f2eac2ff0b97abcd3035","Cargo.lock":"7b0a25ec1a38239b7bc8ba7477a7775808a8cf9413085849f9f19796100bb1d6","Cargo.toml":"263d5a75c3117be86d3878339126fb51a451af8d6c804926b9c37612718edee0","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"f2ad7982ddbfa8c45eb965315718c55b70b9cc311b49afacb50d5fe84173ae2c","README.md":"3b90e49abcf675573aff1793c5b1ec261c11db7c9367c444fcbd116423d9d2f8","build.rs":"46cfae159ca20d37b04f4250eb538e60dc1981c39133f98a3e7691f002a18b91","examples/google-connect.rs":"339a8cb9c9b8c472f8cac96711950114528c8700e5e48d6f61d59b636b69eb0c","examples/simple-server.rs":"f26fdcca641d03ecb7881fbc94ed1b5fe5db38531c1e8b4cd4a6bed3e3653ee8","src/imp/openssl.rs":"a41ded87d7a28a3e8f687e4ad33b38054fd15a46ee255b109406e8d55fbd4944","src/imp/schannel.rs":"cca22615189ddc784857263c8ba88b14fbdbf0d978acf828a27f55396aa19a6c","src/imp/security_framework.rs":"f8df3984ef0b65f25b5b5b10d188267fa0755f29212189bc18c089e7f199121f","src/lib.rs":"00ba7f6bb041628d12475abca035c7dfcc557b47ad1bce8ab20b30c004677966","src/test.rs":"3db19709f26971abaf83d5653887161c08e85b2c80a82bfb9166adbb3817ee0a"},"package":"48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -14,9 +16,9 @@
 
 [[package]]
 name = "cc"
-version = "1.0.60"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
 
 [[package]]
 name = "cfg-if"
@@ -25,6 +27,12 @@
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
 name = "core-foundation"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -36,9 +44,9 @@
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0af3b5e4601de3837c9332e29e0aae47a0d46ebfa246d12b82f564bac233393"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
 
 [[package]]
 name = "foreign-types"
@@ -61,18 +69,12 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "wasi",
 ]
 
 [[package]]
-name = "hex"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
-
-[[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -80,9 +82,9 @@
 
 [[package]]
 name = "libc"
-version = "0.2.77"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
 
 [[package]]
 name = "log"
@@ -90,14 +92,13 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.6"
+version = "0.2.8"
 dependencies = [
- "hex",
  "lazy_static",
  "libc",
  "log",
@@ -108,16 +109,17 @@
  "security-framework",
  "security-framework-sys",
  "tempfile",
+ "test-cert-gen",
 ]
 
 [[package]]
 name = "openssl"
-version = "0.10.30"
+version = "0.10.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
 dependencies = [
  "bitflags",
- "cfg-if",
+ "cfg-if 1.0.0",
  "foreign-types",
  "lazy_static",
  "libc",
@@ -132,18 +134,18 @@
 
 [[package]]
 name = "openssl-src"
-version = "111.10.2+1.1.1g"
+version = "111.13.0+1.1.1i"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70"
+checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.58"
+version = "0.9.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
+checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
 dependencies = [
  "autocfg",
  "cc",
@@ -155,15 +157,15 @@
 
 [[package]]
 name = "pkg-config"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "rand"
@@ -260,7 +262,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "rand",
  "redox_syscall",
@@ -269,10 +271,16 @@
 ]
 
 [[package]]
+name = "test-cert-gen"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51476ae2ac834824c5123f8f85c02a9f10ff58e135c1c05ce090e83608e37d3"
+
+[[package]]
 name = "vcpkg"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
 
 [[package]]
 name = "wasi"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,16 +12,23 @@
 
 [package]
 name = "native-tls"
-version = "0.2.6"
+version = "0.2.8"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 description = "A wrapper over a platform's native TLS implementation"
 readme = "README.md"
 license = "MIT/Apache-2.0"
 repository = "https://github.com/sfackler/rust-native-tls"
-[dev-dependencies.hex]
-version = "0.4.2"
+[package.metadata.docs.rs]
+features = ["alpn"]
+rustdoc-args = ["--cfg", "docsrs"]
+[dev-dependencies.tempfile]
+version = "3.0"
+
+[dev-dependencies.test-cert-gen]
+version = "0.1"
 
 [features]
+alpn = ["security-framework/alpn"]
 vendored = ["openssl/vendored"]
 [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.lazy_static]
 version = "1.4.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [v0.2.8]
+
+### Fixed
+
+* Fixed an off by one error in the schannel backend's handling of max_protocol_version.
+
+## [v0.2.7]
+
+### Added
+
+* Added support for ALPN in client APIs flagged under the `alpn` Cargo feature.
+
 ## [v0.2.6]
 
 ### Fixed
@@ -93,7 +105,9 @@
 
 Look at the [release tags] for information about older releases.
 
-[Unreleased]: https://github.com/sfackler/rust-native-tls/compare/v0.2.6...master
+[Unreleased]: https://github.com/sfackler/rust-native-tls/compare/v0.2.8...master
+[v0.2.8]: https://github.com/sfackler/rust-native-tls/compare/v0.2.7...v0.2.8
+[v0.2.7]: https://github.com/sfackler/rust-native-tls/compare/v0.2.6...v0.2.7
 [v0.2.6]: https://github.com/sfackler/rust-native-tls/compare/v0.2.5...v0.2.6
 [v0.2.5]: https://github.com/sfackler/rust-native-tls/compare/v0.2.4...v0.2.5
 [v0.2.4]: https://github.com/sfackler/rust-native-tls/compare/v0.2.3...v0.2.4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,5 @@
 # rust-native-tls
 
-[![CircleCI](https://circleci.com/gh/sfackler/rust-native-tls.svg?style=shield)](https://circleci.com/gh/sfackler/rust-native-tls) [![Build Status](https://travis-ci.org/sfackler/rust-native-tls.svg?branch=master)](https://travis-ci.org/sfackler/rust-native-tls)
-
 [Documentation](https://docs.rs/native-tls)
 
 An abstraction over platform-specific TLS implementations.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/imp/openssl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/imp/openssl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/imp/openssl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/imp/openssl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,14 +10,14 @@
     self, MidHandshakeSslStream, SslAcceptor, SslConnector, SslContextBuilder, SslMethod,
     SslVerifyMode,
 };
-use self::openssl::x509::{X509, store::X509StoreBuilder, X509VerifyResult};
+use self::openssl::x509::{store::X509StoreBuilder, X509VerifyResult, X509};
 use std::error;
 use std::fmt;
 use std::io;
 use std::sync::Once;
 
-use {Protocol, TlsAcceptorBuilder, TlsConnectorBuilder};
 use self::openssl::pkey::Private;
+use {Protocol, TlsAcceptorBuilder, TlsConnectorBuilder};
 
 #[cfg(have_min_max_version)]
 fn supported_protocols(
@@ -274,6 +274,26 @@
             }
         }
 
+        #[cfg(feature = "alpn")]
+        {
+            if !builder.alpn.is_empty() {
+                // Wire format is each alpn preceded by its length as a byte.
+                let mut alpn_wire_format = Vec::with_capacity(
+                    builder
+                        .alpn
+                        .iter()
+                        .map(|s| s.as_bytes().len())
+                        .sum::<usize>()
+                        + builder.alpn.len(),
+                );
+                for alpn in builder.alpn.iter().map(|s| s.as_bytes()) {
+                    alpn_wire_format.push(alpn.len() as u8);
+                    alpn_wire_format.extend(alpn);
+                }
+                connector.set_alpn_protos(&alpn_wire_format)?;
+            }
+        }
+
         #[cfg(target_os = "android")]
         load_android_root_certs(&mut connector)?;
 
@@ -305,8 +325,7 @@
 
 impl fmt::Debug for TlsConnector {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt
-            .debug_struct("TlsConnector")
+        fmt.debug_struct("TlsConnector")
             // n.b. SslConnector is a newtype on SslContext which implements a noop Debug so it's omitted
             .field("use_sni", &self.use_sni)
             .field("accept_invalid_hostnames", &self.accept_invalid_hostnames)
@@ -367,6 +386,15 @@
         Ok(self.0.ssl().peer_certificate().map(Certificate))
     }
 
+    #[cfg(feature = "alpn")]
+    pub fn negotiated_alpn(&self) -> Result<Option<Vec<u8>>, Error> {
+        Ok(self
+            .0
+            .ssl()
+            .selected_alpn_protocol()
+            .map(|alpn| alpn.to_vec()))
+    }
+
     pub fn tls_server_end_point(&self) -> Result<Option<Vec<u8>>, Error> {
         let cert = if self.0.ssl().is_server() {
             self.0.ssl().certificate().map(|x| x.to_owned())
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/imp/schannel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/imp/schannel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/imp/schannel.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/imp/schannel.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,7 @@
 
 fn convert_protocols(min: Option<::Protocol>, max: Option<::Protocol>) -> &'static [Protocol] {
     let mut protocols = PROTOCOLS;
-    if let Some(p) = max.and_then(|max| protocols.get(..max as usize)) {
+    if let Some(p) = max.and_then(|max| protocols.get(..=max as usize)) {
         protocols = p;
     }
     if let Some(p) = min.and_then(|min| protocols.get(min as usize..)) {
@@ -86,7 +86,8 @@
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
                     "No identity found in PKCS #12 archive",
-                ).into());
+                )
+                .into());
             }
         };
 
@@ -112,7 +113,8 @@
             Err(_) => Err(io::Error::new(
                 io::ErrorKind::InvalidInput,
                 "PEM representation contains non-UTF-8 bytes",
-            ).into()),
+            )
+            .into()),
         }
     }
 
@@ -186,6 +188,8 @@
     accept_invalid_hostnames: bool,
     accept_invalid_certs: bool,
     disable_built_in_roots: bool,
+    #[cfg(feature = "alpn")]
+    alpn: Vec<String>,
 }
 
 impl TlsConnector {
@@ -205,6 +209,8 @@
             accept_invalid_hostnames: builder.accept_invalid_hostnames,
             accept_invalid_certs: builder.accept_invalid_certs,
             disable_built_in_roots: builder.disable_built_in_roots,
+            #[cfg(feature = "alpn")]
+            alpn: builder.alpn.clone(),
         })
     }
 
@@ -249,6 +255,14 @@
                 ))
             });
         }
+        #[cfg(feature = "alpn")]
+        {
+            if !self.alpn.is_empty() {
+                builder.request_application_protocols(
+                    &self.alpn.iter().map(|s| s.as_bytes()).collect::<Vec<_>>(),
+                );
+            }
+        }
         match builder.connect(cred, stream) {
             Ok(s) => Ok(TlsStream(s)),
             Err(e) => Err(e.into()),
@@ -319,6 +333,11 @@
         }
     }
 
+    #[cfg(feature = "alpn")]
+    pub fn negotiated_alpn(&self) -> Result<Option<Vec<u8>>, Error> {
+        Ok(self.0.negotiated_application_protocol()?)
+    }
+
     pub fn tls_server_end_point(&self) -> Result<Option<Vec<u8>>, Error> {
         let cert = if self.0.is_server() {
             self.0.certificate()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/imp/security_framework.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/imp/security_framework.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/imp/security_framework.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/imp/security_framework.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,11 +10,12 @@
 use self::security_framework::secure_transport::{
     self, ClientBuilder, SslConnectionType, SslContext, SslProtocol, SslProtocolSide,
 };
-use self::security_framework_sys::base::errSecIO;
+use self::security_framework_sys::base::{errSecIO, errSecParam};
 use self::tempfile::TempDir;
 use std::error;
 use std::fmt;
 use std::io;
+use std::str;
 use std::sync::Mutex;
 use std::sync::Once;
 
@@ -23,11 +24,11 @@
 #[cfg(not(target_os = "ios"))]
 use self::security_framework::os::macos::certificate_oids::CertificateOid;
 #[cfg(not(target_os = "ios"))]
-use self::security_framework::os::macos::import_export::{ImportOptions, SecItems, Pkcs12ImportOptionsExt};
+use self::security_framework::os::macos::import_export::{
+    ImportOptions, Pkcs12ImportOptionsExt, SecItems,
+};
 #[cfg(not(target_os = "ios"))]
 use self::security_framework::os::macos::keychain::{self, KeychainSettings, SecKeychain};
-#[cfg(not(target_os = "ios"))]
-use self::security_framework_sys::base::errSecParam;
 
 use {Protocol, TlsAcceptorBuilder, TlsConnectorBuilder};
 
@@ -128,10 +129,10 @@
                 keychain
             }
         };
-        let imports = Pkcs12ImportOptions::new()
-            .passphrase(pass)
-            .keychain(keychain)
-            .import(buf)?;
+        let mut import_opts = Pkcs12ImportOptions::new();
+        // Method shadowed by deprecated method.
+        <Pkcs12ImportOptions as Pkcs12ImportOptionsExt>::keychain(&mut import_opts, keychain);
+        let imports = import_opts.passphrase(pass).import(buf)?;
         Ok(imports)
     }
 
@@ -263,6 +264,8 @@
     danger_accept_invalid_hostnames: bool,
     danger_accept_invalid_certs: bool,
     disable_built_in_roots: bool,
+    #[cfg(feature = "alpn")]
+    alpn: Vec<String>,
 }
 
 impl TlsConnector {
@@ -280,6 +283,8 @@
             danger_accept_invalid_hostnames: builder.accept_invalid_hostnames,
             danger_accept_invalid_certs: builder.accept_invalid_certs,
             disable_built_in_roots: builder.disable_built_in_roots,
+            #[cfg(feature = "alpn")]
+            alpn: builder.alpn.clone(),
         })
     }
 
@@ -303,6 +308,13 @@
         builder.danger_accept_invalid_certs(self.danger_accept_invalid_certs);
         builder.trust_anchor_certificates_only(self.disable_built_in_roots);
 
+        #[cfg(feature = "alpn")]
+        {
+            if !self.alpn.is_empty() {
+                builder.alpn_protocols(&self.alpn.iter().map(String::as_str).collect::<Vec<_>>());
+            }
+        }
+
         match builder.handshake(domain, stream) {
             Ok(stream) => Ok(TlsStream { stream, cert: None }),
             Err(e) => Err(e.into()),
@@ -388,6 +400,27 @@
         Ok(trust.certificate_at_index(0).map(Certificate))
     }
 
+    #[cfg(feature = "alpn")]
+    pub fn negotiated_alpn(&self) -> Result<Option<Vec<u8>>, Error> {
+        match self.stream.context().alpn_protocols() {
+            Ok(protocols) => {
+                // Per RFC7301, "ProtocolNameList" MUST contain exactly one "ProtocolName".
+                assert!(protocols.len() < 2);
+
+                if protocols.is_empty() {
+                    // Not sure this is actually possible.
+                    Ok(None)
+                } else {
+                    Ok(Some(protocols.into_iter().next().unwrap().into_bytes()))
+                }
+            }
+            // The macOS API appears to return `errSecParam` whenever no ALPN was negotiated, both
+            // when it isn't attempted and when it isn't successful.
+            Err(e) if e.code() == errSecParam => Ok(None),
+            Err(other) => Err(Error::from(other)),
+        }
+    }
+
     #[cfg(target_os = "ios")]
     pub fn tls_server_end_point(&self) -> Result<Option<Vec<u8>>, Error> {
         Ok(None)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -95,14 +95,12 @@
 //! ```
 #![doc(html_root_url = "https://docs.rs/native-tls/0.2")]
 #![warn(missing_docs)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 #[macro_use]
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 extern crate lazy_static;
 
-#[cfg(test)]
-extern crate hex;
-
 use std::any::Any;
 use std::error;
 use std::fmt;
@@ -328,6 +326,8 @@
     accept_invalid_hostnames: bool,
     use_sni: bool,
     disable_built_in_roots: bool,
+    #[cfg(feature = "alpn")]
+    alpn: Vec<String>,
 }
 
 impl TlsConnectorBuilder {
@@ -376,6 +376,16 @@
         self
     }
 
+    /// Request specific protocols through ALPN (Application-Layer Protocol Negotiation).
+    ///
+    /// Defaults to no protocols.
+    #[cfg(feature = "alpn")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "alpn")))]
+    pub fn request_alpns(&mut self, protocols: &[&str]) -> &mut TlsConnectorBuilder {
+        self.alpn = protocols.iter().map(|s| (*s).to_owned()).collect();
+        self
+    }
+
     /// Controls the use of certificate validation.
     ///
     /// Defaults to `false`.
@@ -464,6 +474,8 @@
             accept_invalid_certs: false,
             accept_invalid_hostnames: false,
             disable_built_in_roots: false,
+            #[cfg(feature = "alpn")]
+            alpn: vec![],
         }
     }
 
@@ -644,6 +656,13 @@
         Ok(self.0.tls_server_end_point()?)
     }
 
+    /// Returns the negotiated ALPN protocol.
+    #[cfg(feature = "alpn")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "alpn")))]
+    pub fn negotiated_alpn(&self) -> Result<Option<Vec<u8>>> {
+        Ok(self.0.negotiated_alpn()?)
+    }
+
     /// Shuts down the TLS session.
     pub fn shutdown(&mut self) -> io::Result<()> {
         self.0.shutdown()?;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/src/test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/src/test.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,8 @@
-use hex;
-#[allow(unused_imports)]
+use std::fs;
 use std::io::{Read, Write};
 use std::net::{TcpListener, TcpStream};
+use std::process::{Command, Stdio};
+use std::string::String;
 use std::thread;
 
 use super::*;
@@ -15,406 +16,403 @@
     };
 }
 
-// This nested mod is needed for ios testing with rust-test-ios
-mod tests {
-    use super::*;
-
-    #[test]
-    fn connect_google() {
-        let builder = p!(TlsConnector::new());
-        let s = p!(TcpStream::connect("google.com:443"));
-        let mut socket = p!(builder.connect("google.com", s));
-
-        p!(socket.write_all(b"GET / HTTP/1.0\r\n\r\n"));
-        let mut result = vec![];
-        p!(socket.read_to_end(&mut result));
-
-        println!("{}", String::from_utf8_lossy(&result));
-        assert!(result.starts_with(b"HTTP/1.0"));
-        assert!(result.ends_with(b"</HTML>\r\n") || result.ends_with(b"</html>"));
-    }
-
-    #[test]
-    fn connect_bad_hostname() {
-        let builder = p!(TlsConnector::new());
-        let s = p!(TcpStream::connect("google.com:443"));
-        builder.connect("goggle.com", s).unwrap_err();
-    }
-
-    #[test]
-    fn connect_bad_hostname_ignored() {
-        let builder = p!(TlsConnector::builder()
-            .danger_accept_invalid_hostnames(true)
-            .build());
-        let s = p!(TcpStream::connect("google.com:443"));
-        builder.connect("goggle.com", s).unwrap();
-    }
-
-    #[test]
-    fn connect_no_root_certs() {
-        let builder = p!(TlsConnector::builder().disable_built_in_roots(true).build());
-        let s = p!(TcpStream::connect("google.com:443"));
-        assert!(builder.connect("google.com", s).is_err());
-    }
-
-    #[test]
-    fn server_no_root_certs() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::new(identity));
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            let mut socket = p!(builder.accept(socket));
-
-            let mut buf = [0; 5];
-            p!(socket.read_exact(&mut buf));
-            assert_eq!(&buf, b"hello");
-
-            p!(socket.write_all(b"world"));
-        });
-
-        let root_ca = include_bytes!("../test/root-ca.der");
-        let root_ca = Certificate::from_der(root_ca).unwrap();
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .disable_built_in_roots(true)
-            .add_root_certificate(root_ca)
-            .build());
-        let mut socket = p!(builder.connect("foobar.com", socket));
-
-        p!(socket.write_all(b"hello"));
-        let mut buf = vec![];
-        p!(socket.read_to_end(&mut buf));
-        assert_eq!(buf, b"world");
-
-        p!(j.join());
-    }
-
-    #[test]
-    fn server() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::new(identity));
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            let mut socket = p!(builder.accept(socket));
-
-            let mut buf = [0; 5];
-            p!(socket.read_exact(&mut buf));
-            assert_eq!(&buf, b"hello");
-
-            p!(socket.write_all(b"world"));
-        });
-
-        let root_ca = include_bytes!("../test/root-ca.der");
-        let root_ca = Certificate::from_der(root_ca).unwrap();
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .add_root_certificate(root_ca)
-            .build());
-        let mut socket = p!(builder.connect("foobar.com", socket));
-
-        p!(socket.write_all(b"hello"));
-        let mut buf = vec![];
-        p!(socket.read_to_end(&mut buf));
-        assert_eq!(buf, b"world");
-
-        p!(j.join());
-    }
-
-    #[test]
-    #[cfg(not(target_os = "ios"))]
-    fn server_pem() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::new(identity));
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            let mut socket = p!(builder.accept(socket));
-
-            let mut buf = [0; 5];
-            p!(socket.read_exact(&mut buf));
-            assert_eq!(&buf, b"hello");
-
-            p!(socket.write_all(b"world"));
-        });
-
-        let root_ca = include_bytes!("../test/root-ca.pem");
-        let root_ca = Certificate::from_pem(root_ca).unwrap();
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .add_root_certificate(root_ca)
-            .build());
-        let mut socket = p!(builder.connect("foobar.com", socket));
-
-        p!(socket.write_all(b"hello"));
-        let mut buf = vec![];
-        p!(socket.read_to_end(&mut buf));
-        assert_eq!(buf, b"world");
-
-        p!(j.join());
-    }
-
-    #[test]
-    fn peer_certificate() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::new(identity));
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            let socket = p!(builder.accept(socket));
-            assert!(socket.peer_certificate().unwrap().is_none());
-        });
-
-        let root_ca = include_bytes!("../test/root-ca.der");
-        let root_ca = Certificate::from_der(root_ca).unwrap();
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .add_root_certificate(root_ca)
-            .build());
-        let socket = p!(builder.connect("foobar.com", socket));
-
-        let cert_der = include_bytes!("../test/cert.der");
-        let cert = socket.peer_certificate().unwrap().unwrap();
-        assert_eq!(cert.to_der().unwrap(), &cert_der[..]);
-
-        p!(j.join());
-    }
-
-    #[test]
-    fn server_tls11_only() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::builder(identity)
-            .min_protocol_version(Some(Protocol::Tlsv11))
-            .max_protocol_version(Some(Protocol::Tlsv11))
-            .build());
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            let mut socket = p!(builder.accept(socket));
-
-            let mut buf = [0; 5];
-            p!(socket.read_exact(&mut buf));
-            assert_eq!(&buf, b"hello");
-
-            p!(socket.write_all(b"world"));
-        });
-
-        let root_ca = include_bytes!("../test/root-ca.der");
-        let root_ca = Certificate::from_der(root_ca).unwrap();
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .add_root_certificate(root_ca)
-            .min_protocol_version(Some(Protocol::Tlsv11))
-            .max_protocol_version(Some(Protocol::Tlsv11))
-            .build());
-        let mut socket = p!(builder.connect("foobar.com", socket));
-
-        p!(socket.write_all(b"hello"));
-        let mut buf = vec![];
-        p!(socket.read_to_end(&mut buf));
-        assert_eq!(buf, b"world");
-
-        p!(j.join());
-    }
-
-    #[test]
-    fn server_no_shared_protocol() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::builder(identity)
-            .min_protocol_version(Some(Protocol::Tlsv12))
-            .build());
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            assert!(builder.accept(socket).is_err());
-        });
-
-        let root_ca = include_bytes!("../test/root-ca.der");
-        let root_ca = Certificate::from_der(root_ca).unwrap();
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .add_root_certificate(root_ca)
-            .max_protocol_version(Some(Protocol::Tlsv11))
-            .build());
-        assert!(builder.connect("foobar.com", socket).is_err());
-
-        p!(j.join());
-    }
-
-    #[test]
-    fn server_untrusted() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::new(identity));
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            // FIXME should assert error
-            // https://github.com/steffengy/schannel-rs/issues/20
-            let _ = builder.accept(socket);
-        });
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::new());
-        builder.connect("foobar.com", socket).unwrap_err();
-
-        p!(j.join());
-    }
-
-    #[test]
-    fn server_untrusted_unverified() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::new(identity));
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            let mut socket = p!(builder.accept(socket));
-
-            let mut buf = [0; 5];
-            p!(socket.read_exact(&mut buf));
-            assert_eq!(&buf, b"hello");
-
-            p!(socket.write_all(b"world"));
-        });
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .danger_accept_invalid_certs(true)
-            .build());
-        let mut socket = p!(builder.connect("foobar.com", socket));
-
-        p!(socket.write_all(b"hello"));
-        let mut buf = vec![];
-        p!(socket.read_to_end(&mut buf));
-        assert_eq!(buf, b"world");
-
-        p!(j.join());
-    }
-
-    #[test]
-    fn import_same_identity_multiple_times() {
-        let buf = include_bytes!("../test/identity.p12");
-        let _ = p!(Identity::from_pkcs12(buf, "mypass"));
-        let _ = p!(Identity::from_pkcs12(buf, "mypass"));
-    }
-
-    #[test]
-    fn shutdown() {
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::new(identity));
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            let mut socket = p!(builder.accept(socket));
-
-            let mut buf = [0; 5];
-            p!(socket.read_exact(&mut buf));
-            assert_eq!(&buf, b"hello");
-
-            assert_eq!(p!(socket.read(&mut buf)), 0);
-            p!(socket.shutdown());
-        });
-
-        let root_ca = include_bytes!("../test/root-ca.der");
-        let root_ca = Certificate::from_der(root_ca).unwrap();
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .add_root_certificate(root_ca)
-            .build());
-        let mut socket = p!(builder.connect("foobar.com", socket));
+#[test]
+fn connect_google() {
+    let builder = p!(TlsConnector::new());
+    let s = p!(TcpStream::connect("google.com:443"));
+    let mut socket = p!(builder.connect("google.com", s));
+
+    p!(socket.write_all(b"GET / HTTP/1.0\r\n\r\n"));
+    let mut result = vec![];
+    p!(socket.read_to_end(&mut result));
+
+    println!("{}", String::from_utf8_lossy(&result));
+    assert!(result.starts_with(b"HTTP/1.0"));
+    assert!(result.ends_with(b"</HTML>\r\n") || result.ends_with(b"</html>"));
+}
+
+#[test]
+fn connect_bad_hostname() {
+    let builder = p!(TlsConnector::new());
+    let s = p!(TcpStream::connect("google.com:443"));
+    builder.connect("goggle.com", s).unwrap_err();
+}
+
+#[test]
+fn connect_bad_hostname_ignored() {
+    let builder = p!(TlsConnector::builder()
+        .danger_accept_invalid_hostnames(true)
+        .build());
+    let s = p!(TcpStream::connect("google.com:443"));
+    builder.connect("goggle.com", s).unwrap();
+}
+
+#[test]
+fn connect_no_root_certs() {
+    let builder = p!(TlsConnector::builder().disable_built_in_roots(true).build());
+    let s = p!(TcpStream::connect("google.com:443"));
+    assert!(builder.connect("google.com", s).is_err());
+}
+
+#[test]
+fn server_no_root_certs() {
+    let keys = test_cert_gen::keys();
+
+    let identity = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let builder = p!(TlsAcceptor::new(identity));
+
+    let listener = p!(TcpListener::bind("0.0.0.0:0"));
+    let port = p!(listener.local_addr()).port();
+
+    let j = thread::spawn(move || {
+        let socket = p!(listener.accept()).0;
+        let mut socket = p!(builder.accept(socket));
+
+        let mut buf = [0; 5];
+        p!(socket.read_exact(&mut buf));
+        assert_eq!(&buf, b"hello");
+
+        p!(socket.write_all(b"world"));
+    });
+
+    let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
+
+    let socket = p!(TcpStream::connect(("localhost", port)));
+    let builder = p!(TlsConnector::builder()
+        .disable_built_in_roots(true)
+        .add_root_certificate(root_ca)
+        .build());
+    let mut socket = p!(builder.connect("localhost", socket));
+
+    p!(socket.write_all(b"hello"));
+    let mut buf = vec![];
+    p!(socket.read_to_end(&mut buf));
+    assert_eq!(buf, b"world");
+
+    p!(j.join());
+}
+
+#[test]
+fn server() {
+    let keys = test_cert_gen::keys();
+
+    let identity = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let builder = p!(TlsAcceptor::new(identity));
+
+    let listener = p!(TcpListener::bind("0.0.0.0:0"));
+    let port = p!(listener.local_addr()).port();
+
+    let j = thread::spawn(move || {
+        let socket = p!(listener.accept()).0;
+        let mut socket = p!(builder.accept(socket));
+
+        let mut buf = [0; 5];
+        p!(socket.read_exact(&mut buf));
+        assert_eq!(&buf, b"hello");
+
+        p!(socket.write_all(b"world"));
+    });
+
+    let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
+
+    let socket = p!(TcpStream::connect(("localhost", port)));
+    let builder = p!(TlsConnector::builder()
+        .add_root_certificate(root_ca)
+        .build());
+    let mut socket = p!(builder.connect("localhost", socket));
+
+    p!(socket.write_all(b"hello"));
+    let mut buf = vec![];
+    p!(socket.read_to_end(&mut buf));
+    assert_eq!(buf, b"world");
+
+    p!(j.join());
+}
+
+#[test]
+fn certificate_from_pem() {
+    let dir = tempfile::tempdir().unwrap();
+    let keys = test_cert_gen::keys();
+
+    let der_path = dir.path().join("cert.der");
+    fs::write(&der_path, &keys.client.cert_der).unwrap();
+    let output = Command::new("openssl")
+        .arg("x509")
+        .arg("-in")
+        .arg(der_path)
+        .arg("-inform")
+        .arg("der")
+        .stderr(Stdio::piped())
+        .output()
+        .unwrap();
+
+    assert!(output.status.success());
+
+    let cert = Certificate::from_pem(&output.stdout).unwrap();
+    assert_eq!(cert.to_der().unwrap(), keys.client.cert_der);
+}
+
+#[test]
+fn peer_certificate() {
+    let keys = test_cert_gen::keys();
+
+    let identity = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let builder = p!(TlsAcceptor::new(identity));
+
+    let listener = p!(TcpListener::bind("0.0.0.0:0"));
+    let port = p!(listener.local_addr()).port();
+
+    let j = thread::spawn(move || {
+        let socket = p!(listener.accept()).0;
+        let socket = p!(builder.accept(socket));
+        assert!(socket.peer_certificate().unwrap().is_none());
+    });
+
+    let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
+
+    let socket = p!(TcpStream::connect(("localhost", port)));
+    let builder = p!(TlsConnector::builder()
+        .add_root_certificate(root_ca)
+        .build());
+    let socket = p!(builder.connect("localhost", socket));
+
+    let cert = socket.peer_certificate().unwrap().unwrap();
+    assert_eq!(cert.to_der().unwrap(), keys.client.cert_der);
+
+    p!(j.join());
+}
+
+#[test]
+fn server_tls11_only() {
+    let keys = test_cert_gen::keys();
+
+    let identity = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let builder = p!(TlsAcceptor::builder(identity)
+        .min_protocol_version(Some(Protocol::Tlsv11))
+        .max_protocol_version(Some(Protocol::Tlsv11))
+        .build());
+
+    let listener = p!(TcpListener::bind("0.0.0.0:0"));
+    let port = p!(listener.local_addr()).port();
+
+    let j = thread::spawn(move || {
+        let socket = p!(listener.accept()).0;
+        let mut socket = p!(builder.accept(socket));
+
+        let mut buf = [0; 5];
+        p!(socket.read_exact(&mut buf));
+        assert_eq!(&buf, b"hello");
+
+        p!(socket.write_all(b"world"));
+    });
+
+    let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
+
+    let socket = p!(TcpStream::connect(("localhost", port)));
+    let builder = p!(TlsConnector::builder()
+        .add_root_certificate(root_ca)
+        .min_protocol_version(Some(Protocol::Tlsv11))
+        .max_protocol_version(Some(Protocol::Tlsv11))
+        .build());
+    let mut socket = p!(builder.connect("localhost", socket));
+
+    p!(socket.write_all(b"hello"));
+    let mut buf = vec![];
+    p!(socket.read_to_end(&mut buf));
+    assert_eq!(buf, b"world");
 
-        p!(socket.write_all(b"hello"));
+    p!(j.join());
+}
+
+#[test]
+fn server_no_shared_protocol() {
+    let keys = test_cert_gen::keys();
+
+    let identity = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let builder = p!(TlsAcceptor::builder(identity)
+        .min_protocol_version(Some(Protocol::Tlsv12))
+        .build());
+
+    let listener = p!(TcpListener::bind("0.0.0.0:0"));
+    let port = p!(listener.local_addr()).port();
+
+    let j = thread::spawn(move || {
+        let socket = p!(listener.accept()).0;
+        assert!(builder.accept(socket).is_err());
+    });
+
+    let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
+
+    let socket = p!(TcpStream::connect(("localhost", port)));
+    let builder = p!(TlsConnector::builder()
+        .add_root_certificate(root_ca)
+        .min_protocol_version(Some(Protocol::Tlsv11))
+        .max_protocol_version(Some(Protocol::Tlsv11))
+        .build());
+    assert!(builder.connect("localhost", socket).is_err());
+
+    p!(j.join());
+}
+
+#[test]
+fn server_untrusted() {
+    let keys = test_cert_gen::keys();
+
+    let identity = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let builder = p!(TlsAcceptor::new(identity));
+
+    let listener = p!(TcpListener::bind("0.0.0.0:0"));
+    let port = p!(listener.local_addr()).port();
+
+    let j = thread::spawn(move || {
+        let socket = p!(listener.accept()).0;
+        // FIXME should assert error
+        // https://github.com/steffengy/schannel-rs/issues/20
+        let _ = builder.accept(socket);
+    });
+
+    let socket = p!(TcpStream::connect(("localhost", port)));
+    let builder = p!(TlsConnector::new());
+    builder.connect("localhost", socket).unwrap_err();
+
+    p!(j.join());
+}
+
+#[test]
+fn server_untrusted_unverified() {
+    let keys = test_cert_gen::keys();
+
+    let identity = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let builder = p!(TlsAcceptor::new(identity));
+
+    let listener = p!(TcpListener::bind("0.0.0.0:0"));
+    let port = p!(listener.local_addr()).port();
+
+    let j = thread::spawn(move || {
+        let socket = p!(listener.accept()).0;
+        let mut socket = p!(builder.accept(socket));
+
+        let mut buf = [0; 5];
+        p!(socket.read_exact(&mut buf));
+        assert_eq!(&buf, b"hello");
+
+        p!(socket.write_all(b"world"));
+    });
+
+    let socket = p!(TcpStream::connect(("localhost", port)));
+    let builder = p!(TlsConnector::builder()
+        .danger_accept_invalid_certs(true)
+        .build());
+    let mut socket = p!(builder.connect("localhost", socket));
+
+    p!(socket.write_all(b"hello"));
+    let mut buf = vec![];
+    p!(socket.read_to_end(&mut buf));
+    assert_eq!(buf, b"world");
+
+    p!(j.join());
+}
+
+#[test]
+fn import_same_identity_multiple_times() {
+    let keys = test_cert_gen::keys();
+
+    let _ = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let _ = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+}
+
+#[test]
+fn shutdown() {
+    let keys = test_cert_gen::keys();
+
+    let identity = p!(Identity::from_pkcs12(
+        &keys.server.pkcs12,
+        &keys.server.pkcs12_password
+    ));
+    let builder = p!(TlsAcceptor::new(identity));
+
+    let listener = p!(TcpListener::bind("0.0.0.0:0"));
+    let port = p!(listener.local_addr()).port();
+
+    let j = thread::spawn(move || {
+        let socket = p!(listener.accept()).0;
+        let mut socket = p!(builder.accept(socket));
+
+        let mut buf = [0; 5];
+        p!(socket.read_exact(&mut buf));
+        assert_eq!(&buf, b"hello");
+
+        assert_eq!(p!(socket.read(&mut buf)), 0);
         p!(socket.shutdown());
+    });
+
+    let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
+
+    let socket = p!(TcpStream::connect(("localhost", port)));
+    let builder = p!(TlsConnector::builder()
+        .add_root_certificate(root_ca)
+        .build());
+    let mut socket = p!(builder.connect("localhost", socket));
 
-        p!(j.join());
-    }
+    p!(socket.write_all(b"hello"));
+    p!(socket.shutdown());
 
-    #[test]
-    #[cfg_attr(target_os = "ios", ignore)]
-    fn tls_server_end_point() {
-        let expected = "4712b939fbcb42a6b5101b42139a25b14f81b418facabd378746f12f85cc6544";
-
-        let buf = include_bytes!("../test/identity.p12");
-        let identity = p!(Identity::from_pkcs12(buf, "mypass"));
-        let builder = p!(TlsAcceptor::new(identity));
-
-        let listener = p!(TcpListener::bind("0.0.0.0:0"));
-        let port = p!(listener.local_addr()).port();
-
-        let j = thread::spawn(move || {
-            let socket = p!(listener.accept()).0;
-            let mut socket = p!(builder.accept(socket));
-
-            let binding = socket.tls_server_end_point().unwrap().unwrap();
-            assert_eq!(hex::encode(binding), expected);
-
-            let mut buf = [0; 5];
-            p!(socket.read_exact(&mut buf));
-            assert_eq!(&buf, b"hello");
-
-            p!(socket.write_all(b"world"));
-        });
-
-        let root_ca = include_bytes!("../test/root-ca.der");
-        let root_ca = Certificate::from_der(root_ca).unwrap();
-
-        let socket = p!(TcpStream::connect(("localhost", port)));
-        let builder = p!(TlsConnector::builder()
-            .add_root_certificate(root_ca)
-            .build());
-        let mut socket = p!(builder.connect("foobar.com", socket));
-
-        let binding = socket.tls_server_end_point().unwrap().unwrap();
-        assert_eq!(hex::encode(binding), expected);
-
-        p!(socket.write_all(b"hello"));
-        let mut buf = vec![];
-        p!(socket.read_to_end(&mut buf));
-        assert_eq!(buf, b"world");
+    p!(j.join());
+}
+
+#[test]
+#[cfg(feature = "alpn")]
+fn alpn_google_h2() {
+    let builder = p!(TlsConnector::builder().request_alpns(&["h2"]).build());
+    let s = p!(TcpStream::connect("google.com:443"));
+    let socket = p!(builder.connect("google.com", s));
+    let alpn = p!(socket.negotiated_alpn());
+    assert_eq!(alpn, Some(b"h2".to_vec()));
+}
+
+#[test]
+#[cfg(feature = "alpn")]
+fn alpn_google_invalid() {
+    let builder = p!(TlsConnector::builder().request_alpns(&["h2c"]).build());
+    let s = p!(TcpStream::connect("google.com:443"));
+    let socket = p!(builder.connect("google.com", s));
+    let alpn = p!(socket.negotiated_alpn());
+    assert_eq!(alpn, None);
+}
 
-        p!(j.join());
-    }
+#[test]
+#[cfg(feature = "alpn")]
+fn alpn_google_none() {
+    let builder = p!(TlsConnector::new());
+    let s = p!(TcpStream::connect("google.com:443"));
+    let socket = p!(builder.connect("google.com", s));
+    let alpn = p!(socket.negotiated_alpn());
+    assert_eq!(alpn, None);
 }
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/test/cert.der and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/test/cert.der differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/test/cert.pem thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/test/cert.pem
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/test/cert.pem	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/test/cert.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDGzCCAgMCCQCHcfe97pgvpTANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB
-VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMB4XDTE2MDgxNDE3MDAwM1oXDTI2MDgxMjE3MDAwM1owWjELMAkG
-A1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0
-IFdpZGdpdHMgUHR5IEx0ZDETMBEGA1UEAwwKZm9vYmFyLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKj0JYxEsxejUIX+I5GH0Hg2G0kX/y1H0+Ub
-3mw2/Ja5BD/yN96/7zMSumXF8uS3SkmpyiJkbyD01TSRTqjlP7/VCBlyUIChlpLQ
-mrGaijZiT/VCyPXqmcwFzXS5IOTpX1olJfW8rA41U1LCIcDUyFf6LtZ/v8rSeKr6
-TuE6SGV4WRaBm1SrjWBeHVV866CRrtSS1ieT2asFsAyOZqWhk2fakwwBDFWDhOGI
-ubfO+5aq9cBJbNRlzsgB3UZs3gC0O6GzbnZ6oT0TiJMeTsXXjABLUlaq/rrqFF4Y
-euZkkbHTFBMz288PUc3m3ZTcpN+E7+ZOUBRZXKD20K07NugqCzUCAwEAATANBgkq
-hkiG9w0BAQsFAAOCAQEASvYHuIl5C0NHBELPpVHNuLbQsDQNKVj3a54+9q1JkiMM
-6taEJYfw7K1Xjm4RoiFSHpQBh+PWZS3hToToL2Zx8JfMR5MuAirdPAy1Sia/J/qE
-wQdJccqmvuLkLTSlsGbEJ/LUUgOAgrgHOZM5lUgIhCneA0/dWJ3PsN0zvn69/faY
-oo1iiolWiIHWWBUSdr3jM2AJaVAsTmLh00cKaDNk37JB940xConBGSl98JPrNrf9
-dUAiT0iIBngDBdHnn/yTj+InVEFyZSKrNtiDSObFHxPcxGteHNrCPJdP1e+GqkHp
-HJMRZVCQpSMzvHlofHSNgzWV1MX5h1CP4SGZdBDTfA==
------END CERTIFICATE-----
-
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/test/identity.p12 and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/test/identity.p12 differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/test/root-ca.der and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/test/root-ca.der differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/test/root-ca.pem thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/test/root-ca.pem
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/test/root-ca.pem	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/test/root-ca.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDXTCCAkWgAwIBAgIJAOIvDiVb18eVMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTYwODE0MTY1NjExWhcNMjYwODEyMTY1NjExWjBF
-MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
-ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEArVHWFn52Lbl1l59exduZntVSZyDYpzDND+S2LUcO6fRBWhV/1Kzox+2G
-ZptbuMGmfI3iAnb0CFT4uC3kBkQQlXonGATSVyaFTFR+jq/lc0SP+9Bd7SBXieIV
-eIXlY1TvlwIvj3Ntw9zX+scTA4SXxH6M0rKv9gTOub2vCMSHeF16X8DQr4XsZuQr
-7Cp7j1I4aqOJyap5JTl5ijmG8cnu0n+8UcRlBzy99dLWJG0AfI3VRJdWpGTNVZ92
-aFff3RpK3F/WI2gp3qV1ynRAKuvmncGC3LDvYfcc2dgsc1N6Ffq8GIrkgRob6eBc
-klDHp1d023Lwre+VaVDSo1//Y72UFwIDAQABo1AwTjAdBgNVHQ4EFgQUbNOlA6sN
-XyzJjYqciKeId7g3/ZowHwYDVR0jBBgwFoAUbNOlA6sNXyzJjYqciKeId7g3/Zow
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVVaR5QWLZIRR4Dw6TSBn
-BQiLpBSXN6oAxdDw6n4PtwW6CzydaA+creiK6LfwEsiifUfQe9f+T+TBSpdIYtMv
-Z2H2tjlFX8VrjUFvPrvn5c28CuLI0foBgY8XGSkR2YMYzWw2jPEq3Th/KM5Catn3
-AFm3bGKWMtGPR4v+90chEN0jzaAmJYRrVUh9vea27bOCn31Nse6XXQPmSI6Gyncy
-OAPUsvPClF3IjeL1tmBotWqSGn1cYxLo+Lwjk22A9h6vjcNQRyZF2VLVvtwYrNU3
-mwJ6GCLsLHpwW/yjyvn8iEltnJvByM/eeRnfXV6WDObyiZsE/n6DxIRJodQzFqy9
-GA==
------END CERTIFICATE-----
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/tests-ios/prelude.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/tests-ios/prelude.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/native-tls/tests-ios/prelude.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/native-tls/tests-ios/prelude.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-extern crate hex;
-extern crate native_tls;
-
-pub use native_tls::*;
-
-use std::io::{Read, Write};
-use std::net::{TcpListener, TcpStream};
-use std::thread;
-
-macro_rules! p {
-    ($e:expr) => {
-        match $e {
-            Ok(r) => r,
-            Err(e) => panic!("{:?}", e),
-        }
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"3ef21068c8bd6d2afddf710600ae305511544f5e1ce86a8f715834ab9c3ff8b9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"a99cb0401bd49e68c945f6a249175dd5c4a5117b2c8cc5d5fb7dea369002574e","src/ext.rs":"fd072307ebbaa01cfe1fd7553d7f42d27093b2bd32dd81d419d2e1c9423495a0","src/lib.rs":"a5e429c904fa13291dee5ed5df6c20adcebbaa56fc0312d475fd2056e9974153","src/socket.rs":"1468f54b4ce8ec2f94d8a23fba4c59752cbd2f447f29e7f0ae032785fdd916f4","src/sys/redox/impls.rs":"90059116f0514bd44dbf282a3e8d7b192c99e1a78a34ebacb00f2d325ca0f8b0","src/sys/redox/mod.rs":"137013d409fd174fed0ceb3eceb2c17d15f34a3af70c7d237c06dd3a144affc1","src/sys/unix/impls.rs":"05f123226e8fe7559317d50864021650b2455d25d01a9aff1c65c01ae26cf4ef","src/sys/unix/mod.rs":"e06b26bad48c815b9a2af4509d1873333e2aad0031980f6d2625f72542698d56","src/sys/wasi/impls.rs":"da4e95a27a765b64fbbebce55b860020ac891456085ed706d5f8f391e0d1cddf","src/sys/wasi/mod.rs":"e88b02f4d5e0ae558f093d49cc0bb1b3cdf86ede625d00ed9231f0ab414e483f","src/sys/windows/impls.rs":"bee70b7cd45055c4eaa1967f7aad7ec46639de458c71ed6f3e97a2f7b2c49281","src/sys/windows/mod.rs":"31a73007ea65a4905e93395f86105d2ef9fb84d3d795511c6cfdc8cba595cb0c","src/tcp.rs":"0bebf5cca75714151de30c8f2d7697ca519c57da065e93ba81796bce04673f8d","src/udp.rs":"8af5a55a4ae5e4120ffe18dcc4dc24072e18da34bf3591a02b18653e5d3e8ac8","src/unix.rs":"1156707694cb1f002a2eb2144bf205a73412e1661fd196a8a2a7bc8ea5aaad2d","src/utils.rs":"d31de5333a6fa2f5c99b64cc937be596888d9863264632e6bc6b36b30197fa5b"},"package":"391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "net2"
-version = "0.2.37"
-authors = ["Alex Crichton <alex@alexcrichton.com>"]
-include = ["Cargo.toml", "LICENSE-APACHE", "LICENSE-MIT", "README.md", "src/**/*.rs"]
-description = "Extensions to the standard library's networking types as proposed in RFC 1158.\n"
-homepage = "https://github.com/deprecrated/net2-rs"
-documentation = "https://docs.rs/net2/~0.2"
-readme = "README.md"
-license = "MIT/Apache-2.0"
-repository = "https://github.com/deprecrated/net2-rs"
-[dependencies.cfg-if]
-version = "0.1"
-
-[features]
-default = ["duration"]
-duration = []
-nightly = []
-[target."cfg(any(target_os=\"redox\", unix, target_os=\"wasi\"))".dependencies.libc]
-version = "0.2.54"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["handleapi", "winsock2", "ws2def", "ws2ipdef", "ws2tcpip"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2014 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# net2
-
-Extensions to the standard library's networking types, proposed in [RFC 1158][rfc].
-
-[rfc]: https://github.com/alexcrichton/rfcs/blob/net2.1/text/0000-io-net-2.1.md
-
-[![Build Status](https://github.com/deprecrated/net2-rs/workflows/CI/badge.svg)](https://github.com/deprecrated/net2-rs/actions?query=workflow%3ACI+branch%3Amaster)
-[![Documentation](https://docs.rs/net2/badge.svg?version=0.2)](https://docs.rs/net2/~0.2)
-
-# net2 is Deprecated
-
-Prospective and existing consumers are encouraged to consider
-[socket2](https://crates.io/crates/socket2) instead.
-
-
-# License
-
-This project is licensed under either of
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
-dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/ext.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/ext.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1561 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(bad_style, dead_code)]
-
-use std::io;
-use std::mem;
-use std::net::{TcpStream, TcpListener, UdpSocket, Ipv4Addr, Ipv6Addr};
-use std::net::ToSocketAddrs;
-
-use {TcpBuilder, UdpBuilder, FromInner};
-use sys;
-use sys::c;
-use socket;
-
-cfg_if! {
-    if #[cfg(any(target_os = "dragonfly",
-                 target_os = "freebsd",
-                 target_os = "haiku",
-                 target_os = "ios",
-                 target_os = "macos",
-                 target_os = "netbsd",
-                 target_os = "openbsd",
-                 target_os = "solaris",
-                 target_os = "illumos",
-                 target_env = "uclibc"))] {
-        use libc::IPV6_JOIN_GROUP as IPV6_ADD_MEMBERSHIP;
-        use libc::IPV6_LEAVE_GROUP as IPV6_DROP_MEMBERSHIP;
-    } else {
-        // ...
-    }
-}
-
-use std::time::Duration;
-
-#[cfg(any(unix, target_os = "redox", target_os = "wasi"))] use libc::*;
-#[cfg(any(unix, target_os = "redox"))] use std::os::unix::prelude::*;
-#[cfg(target_os = "wasi")] use std::os::wasi::prelude::*;
-#[cfg(target_os = "redox")] pub type Socket = usize;
-#[cfg(unix)] pub type Socket = c_int;
-#[cfg(target_os = "wasi")] pub type Socket = std::os::wasi::io::RawFd;
-#[cfg(windows)] pub type Socket = SOCKET;
-#[cfg(windows)] use std::os::windows::prelude::*;
-#[cfg(any(windows, target_os = "wasi"))] use sys::c::*;
-
-#[cfg(windows)] const SIO_KEEPALIVE_VALS: DWORD = 0x98000004;
-#[cfg(windows)]
-#[repr(C)]
-struct tcp_keepalive {
-    onoff: c_ulong,
-    keepalivetime: c_ulong,
-    keepaliveinterval: c_ulong,
-}
-
-#[cfg(any(unix, target_os = "redox", target_os = "wasi"))] fn v(opt: c_int) -> c_int { opt }
-#[cfg(windows)] fn v(opt: IPPROTO) -> c_int { opt as c_int }
-
-#[cfg(target_os = "wasi")]
-pub fn set_opt<T: Copy>(_sock: Socket, _opt: c_int, _val: c_int,
-                       _payload: T) -> io::Result<()> {
-    Ok(())
-}
-
-#[cfg(not(target_os = "wasi"))]
-pub fn set_opt<T: Copy>(sock: Socket, opt: c_int, val: c_int,
-                       payload: T) -> io::Result<()> {
-    unsafe {
-        let payload = &payload as *const T as *const c_void;
-        #[cfg(target_os = "redox")]
-        let sock = sock as c_int;
-        try!(::cvt(setsockopt(sock, opt, val, payload as *const _,
-                              mem::size_of::<T>() as socklen_t)));
-    }
-    Ok(())
-}
-
-#[cfg(target_os = "wasi")]
-pub fn get_opt<T: Copy>(_sock: Socket, _opt: c_int, _val: c_int) -> io::Result<T> {
-    unimplemented!()
-}
-#[cfg(not(target_os = "wasi"))]
-pub fn get_opt<T: Copy>(sock: Socket, opt: c_int, val: c_int) -> io::Result<T> {
-    unsafe {
-        let mut slot: T = mem::zeroed();
-        let mut len = mem::size_of::<T>() as socklen_t;
-        #[cfg(target_os = "redox")]
-        let sock = sock as c_int;
-        try!(::cvt(getsockopt(sock, opt, val,
-                              &mut slot as *mut _ as *mut _,
-                              &mut len)));
-        assert_eq!(len as usize, mem::size_of::<T>());
-        Ok(slot)
-    }
-}
-
-/// Extension methods for the standard [`TcpStream` type][link] in `std::net`.
-///
-/// [link]: https://doc.rust-lang.org/std/net/struct.TcpStream.html
-pub trait TcpStreamExt {
-    /// Sets the value of the `TCP_NODELAY` option on this socket.
-    ///
-    /// If set, this option disables the Nagle algorithm. This means that
-    /// segments are always sent as soon as possible, even if there is only a
-    /// small amount of data. When not set, data is buffered until there is a
-    /// sufficient amount to send out, thereby avoiding the frequent sending of
-    /// small packets.
-    fn set_nodelay(&self, nodelay: bool) -> io::Result<()>;
-
-    /// Gets the value of the `TCP_NODELAY` option on this socket.
-    ///
-    /// For more information about this option, see [`set_nodelay`][link].
-    ///
-    /// [link]: #tymethod.set_nodelay
-    fn nodelay(&self) -> io::Result<bool>;
-
-    /// Sets the value of the `SO_RCVBUF` option on this socket.
-    ///
-    /// Changes the size of the operating system's receive buffer associated with the socket.
-    fn set_recv_buffer_size(&self, size: usize) -> io::Result<()>;
-
-    /// Gets the value of the `SO_RCVBUF` option on this socket.
-    ///
-    /// For more information about this option, see [`set_recv_buffer_size`][link].
-    ///
-    /// [link]: #tymethod.set_recv_buffer_size
-    fn recv_buffer_size(&self) -> io::Result<usize>;
-
-    /// Sets the value of the `SO_SNDBUF` option on this socket.
-    ///
-    /// Changes the size of the operating system's send buffer associated with the socket.
-    fn set_send_buffer_size(&self, size: usize) -> io::Result<()>;
-
-    /// Gets the value of the `SO_SNDBUF` option on this socket.
-    ///
-    /// For more information about this option, see [`set_send_buffer`][link].
-    ///
-    /// [link]: #tymethod.set_send_buffer
-    fn send_buffer_size(&self) -> io::Result<usize>;
-
-    /// Sets whether keepalive messages are enabled to be sent on this socket.
-    ///
-    /// On Unix, this option will set the `SO_KEEPALIVE` as well as the
-    /// `TCP_KEEPALIVE` or `TCP_KEEPIDLE` option (depending on your platform).
-    /// On Windows, this will set the `SIO_KEEPALIVE_VALS` option.
-    ///
-    /// If `None` is specified then keepalive messages are disabled, otherwise
-    /// the number of milliseconds specified will be the time to remain idle
-    /// before sending a TCP keepalive probe.
-    ///
-    /// Some platforms specify this value in seconds, so sub-second millisecond
-    /// specifications may be omitted.
-    fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()>;
-
-    /// Returns whether keepalive messages are enabled on this socket, and if so
-    /// the amount of milliseconds between them.
-    ///
-    /// For more information about this option, see [`set_keepalive_ms`][link].
-    ///
-    /// [link]: #tymethod.set_keepalive_ms
-    fn keepalive_ms(&self) -> io::Result<Option<u32>>;
-
-    /// Sets whether keepalive messages are enabled to be sent on this socket.
-    ///
-    /// On Unix, this option will set the `SO_KEEPALIVE` as well as the
-    /// `TCP_KEEPALIVE` or `TCP_KEEPIDLE` option (depending on your platform).
-    /// On Windows, this will set the `SIO_KEEPALIVE_VALS` option.
-    ///
-    /// If `None` is specified then keepalive messages are disabled, otherwise
-    /// the duration specified will be the time to remain idle before sending a
-    /// TCP keepalive probe.
-    ///
-    /// Some platforms specify this value in seconds, so sub-second
-    /// specifications may be omitted.
-    fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()>;
-
-    /// Returns whether keepalive messages are enabled on this socket, and if so
-    /// the duration of time between them.
-    ///
-    /// For more information about this option, see [`set_keepalive`][link].
-    ///
-    /// [link]: #tymethod.set_keepalive
-    fn keepalive(&self) -> io::Result<Option<Duration>>;
-
-    /// Sets the `SO_RCVTIMEO` option for this socket.
-    ///
-    /// This option specifies the timeout, in milliseconds, of how long calls to
-    /// this socket's `read` function will wait before returning a timeout. A
-    /// value of `None` means that no read timeout should be specified and
-    /// otherwise `Some` indicates the number of milliseconds for the timeout.
-    fn set_read_timeout_ms(&self, val: Option<u32>) -> io::Result<()>;
-
-    /// Sets the `SO_RCVTIMEO` option for this socket.
-    ///
-    /// This option specifies the timeout of how long calls to this socket's
-    /// `read` function will wait before returning a timeout. A value of `None`
-    /// means that no read timeout should be specified and otherwise `Some`
-    /// indicates the number of duration of the timeout.
-    fn set_read_timeout(&self, val: Option<Duration>) -> io::Result<()>;
-
-    /// Gets the value of the `SO_RCVTIMEO` option for this socket.
-    ///
-    /// For more information about this option, see [`set_read_timeout_ms`][link].
-    ///
-    /// [link]: #tymethod.set_read_timeout_ms
-    fn read_timeout_ms(&self) -> io::Result<Option<u32>>;
-
-    /// Gets the value of the `SO_RCVTIMEO` option for this socket.
-    ///
-    /// For more information about this option, see [`set_read_timeout`][link].
-    ///
-    /// [link]: #tymethod.set_read_timeout
-    fn read_timeout(&self) -> io::Result<Option<Duration>>;
-
-    /// Sets the `SO_SNDTIMEO` option for this socket.
-    ///
-    /// This option specifies the timeout, in milliseconds, of how long calls to
-    /// this socket's `write` function will wait before returning a timeout. A
-    /// value of `None` means that no read timeout should be specified and
-    /// otherwise `Some` indicates the number of milliseconds for the timeout.
-    fn set_write_timeout_ms(&self, val: Option<u32>) -> io::Result<()>;
-
-    /// Sets the `SO_SNDTIMEO` option for this socket.
-    ///
-    /// This option specifies the timeout of how long calls to this socket's
-    /// `write` function will wait before returning a timeout. A value of `None`
-    /// means that no read timeout should be specified and otherwise `Some`
-    /// indicates the duration of the timeout.
-    fn set_write_timeout(&self, val: Option<Duration>) -> io::Result<()>;
-
-    /// Gets the value of the `SO_SNDTIMEO` option for this socket.
-    ///
-    /// For more information about this option, see [`set_write_timeout_ms`][link].
-    ///
-    /// [link]: #tymethod.set_write_timeout_ms
-    fn write_timeout_ms(&self) -> io::Result<Option<u32>>;
-
-    /// Gets the value of the `SO_SNDTIMEO` option for this socket.
-    ///
-    /// For more information about this option, see [`set_write_timeout`][link].
-    ///
-    /// [link]: #tymethod.set_write_timeout
-    fn write_timeout(&self) -> io::Result<Option<Duration>>;
-
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This value sets the time-to-live field that is used in every packet sent
-    /// from this socket.
-    fn set_ttl(&self, ttl: u32) -> io::Result<()>;
-
-    /// Gets the value of the `IP_TTL` option for this socket.
-    ///
-    /// For more information about this option, see [`set_ttl`][link].
-    ///
-    /// [link]: #tymethod.set_ttl
-    fn ttl(&self) -> io::Result<u32>;
-
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
-    ///
-    /// If this is set to `true` then the socket is restricted to sending and
-    /// receiving IPv6 packets only. In this case two IPv4 and IPv6 applications
-    /// can bind the same port at the same time.
-    ///
-    /// If this is set to `false` then the socket can be used to send and
-    /// receive packets from an IPv4-mapped IPv6 address.
-    fn set_only_v6(&self, only_v6: bool) -> io::Result<()>;
-
-    /// Gets the value of the `IPV6_V6ONLY` option for this socket.
-    ///
-    /// For more information about this option, see [`set_only_v6`][link].
-    ///
-    /// [link]: #tymethod.set_only_v6
-    fn only_v6(&self) -> io::Result<bool>;
-
-    /// Executes a `connect` operation on this socket, establishing a connection
-    /// to the host specified by `addr`.
-    ///
-    /// Note that this normally does not need to be called on a `TcpStream`,
-    /// it's typically automatically done as part of a normal
-    /// `TcpStream::connect` function call or `TcpBuilder::connect` method call.
-    ///
-    /// This should only be necessary if an unconnected socket was extracted
-    /// from a `TcpBuilder` and then needs to be connected.
-    fn connect<T: ToSocketAddrs>(&self, addr: T) -> io::Result<()>;
-
-    /// Get the value of the `SO_ERROR` option on this socket.
-    ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    fn take_error(&self) -> io::Result<Option<io::Error>>;
-
-    /// Moves this TCP stream into or out of nonblocking mode.
-    ///
-    /// On Unix this corresponds to calling fcntl, and on Windows this
-    /// corresponds to calling ioctlsocket.
-    fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()>;
-
-    /// Sets the linger duration of this socket by setting the SO_LINGER option
-    fn set_linger(&self, dur: Option<Duration>) -> io::Result<()>;
-
-    /// reads the linger duration for this socket by getting the SO_LINGER option
-    fn linger(&self) -> io::Result<Option<Duration>>;
-}
-
-/// Extension methods for the standard [`TcpListener` type][link] in `std::net`.
-///
-/// [link]: https://doc.rust-lang.org/std/net/struct.TcpListener.html
-pub trait TcpListenerExt {
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This is the same as [`TcpStreamExt::set_ttl`][other].
-    ///
-    /// [other]: trait.TcpStreamExt.html#tymethod.set_ttl
-    fn set_ttl(&self, ttl: u32) -> io::Result<()>;
-
-    /// Gets the value of the `IP_TTL` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`TcpStreamExt::set_ttl`][link].
-    ///
-    /// [link]: trait.TcpStreamExt.html#tymethod.set_ttl
-    fn ttl(&self) -> io::Result<u32>;
-
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
-    ///
-    /// For more information about this option, see
-    /// [`TcpStreamExt::set_only_v6`][link].
-    ///
-    /// [link]: trait.TcpStreamExt.html#tymethod.set_only_v6
-    fn set_only_v6(&self, only_v6: bool) -> io::Result<()>;
-
-    /// Gets the value of the `IPV6_V6ONLY` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`TcpStreamExt::set_only_v6`][link].
-    ///
-    /// [link]: trait.TcpStreamExt.html#tymethod.set_only_v6
-    fn only_v6(&self) -> io::Result<bool>;
-
-    /// Get the value of the `SO_ERROR` option on this socket.
-    ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    fn take_error(&self) -> io::Result<Option<io::Error>>;
-
-    /// Moves this TCP listener into or out of nonblocking mode.
-    ///
-    /// For more information about this option, see
-    /// [`TcpStreamExt::set_nonblocking`][link].
-    ///
-    /// [link]: trait.TcpStreamExt.html#tymethod.set_nonblocking
-    fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()>;
-
-    /// Sets the linger duration of this socket by setting the SO_LINGER option
-    fn set_linger(&self, dur: Option<Duration>) -> io::Result<()>;
-
-    /// reads the linger duration for this socket by getting the SO_LINGER option
-    fn linger(&self) -> io::Result<Option<Duration>>;
-}
-
-/// Extension methods for the standard [`UdpSocket` type][link] in `std::net`.
-///
-/// [link]: https://doc.rust-lang.org/std/net/struct.UdpSocket.html
-pub trait UdpSocketExt {
-    /// Sets the value of the `SO_RCVBUF` option on this socket.
-    ///
-    /// Changes the size of the operating system's receive buffer associated with the socket.
-    fn set_recv_buffer_size(&self, size: usize) -> io::Result<()>;
-
-    /// Gets the value of the `SO_RCVBUF` option on this socket.
-    ///
-    /// For more information about this option, see [`set_recv_buffer_size`][link].
-    ///
-    /// [link]: #tymethod.set_recv_buffer_size
-    fn recv_buffer_size(&self) -> io::Result<usize>;
-
-    /// Sets the value of the `SO_SNDBUF` option on this socket.
-    ///
-    /// Changes the size of the operating system's send buffer associated with the socket.
-    fn set_send_buffer_size(&self, size: usize) -> io::Result<()>;
-
-    /// Gets the value of the `SO_SNDBUF` option on this socket.
-    ///
-    /// For more information about this option, see [`set_send_buffer`][link].
-    ///
-    /// [link]: #tymethod.set_send_buffer
-    fn send_buffer_size(&self) -> io::Result<usize>;
-
-    /// Sets the value of the `SO_BROADCAST` option for this socket.
-    ///
-    /// When enabled, this socket is allowed to send packets to a broadcast
-    /// address.
-    fn set_broadcast(&self, broadcast: bool) -> io::Result<()>;
-
-    /// Gets the value of the `SO_BROADCAST` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_broadcast`][link].
-    ///
-    /// [link]: #tymethod.set_broadcast
-    fn broadcast(&self) -> io::Result<bool>;
-
-    /// Sets the value of the `IP_MULTICAST_LOOP` option for this socket.
-    ///
-    /// If enabled, multicast packets will be looped back to the local socket.
-    /// Note that this may not have any affect on IPv6 sockets.
-    fn set_multicast_loop_v4(&self, multicast_loop_v4: bool) -> io::Result<()>;
-
-    /// Gets the value of the `IP_MULTICAST_LOOP` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_multicast_loop_v4`][link].
-    ///
-    /// [link]: #tymethod.set_multicast_loop_v4
-    fn multicast_loop_v4(&self) -> io::Result<bool>;
-
-    /// Sets the value of the `IP_MULTICAST_TTL` option for this socket.
-    ///
-    /// Indicates the time-to-live value of outgoing multicast packets for
-    /// this socket. The default value is 1 which means that multicast packets
-    /// don't leave the local network unless explicitly requested.
-    ///
-    /// Note that this may not have any affect on IPv6 sockets.
-    fn set_multicast_ttl_v4(&self, multicast_ttl_v4: u32) -> io::Result<()>;
-
-    /// Gets the value of the `IP_MULTICAST_TTL` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_multicast_ttl_v4`][link].
-    ///
-    /// [link]: #tymethod.set_multicast_ttl_v4
-    fn multicast_ttl_v4(&self) -> io::Result<u32>;
-
-    /// Sets the value of the `IPV6_MULTICAST_HOPS` option for this socket
-    fn set_multicast_hops_v6(&self, hops: u32) -> io::Result<()>;
-
-    /// Gets the value of the `IPV6_MULTICAST_HOPS` option for this socket
-    fn multicast_hops_v6(&self) -> io::Result<u32>;
-
-    /// Sets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
-    ///
-    /// Controls whether this socket sees the multicast packets it sends itself.
-    /// Note that this may not have any affect on IPv4 sockets.
-    fn set_multicast_loop_v6(&self, multicast_loop_v6: bool) -> io::Result<()>;
-
-    /// Gets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_multicast_loop_v6`][link].
-    ///
-    /// [link]: #tymethod.set_multicast_loop_v6
-    fn multicast_loop_v6(&self) -> io::Result<bool>;
-
-    /// Sets the value of the `IP_MULTICAST_IF` option for this socket.
-    ///
-    /// Specifies the interface to use for routing multicast packets.
-    fn set_multicast_if_v4(&self, interface: &Ipv4Addr) -> io::Result<()>;
-
-    /// Gets the value of the `IP_MULTICAST_IF` option for this socket.
-    ///
-    /// Returns the interface to use for routing multicast packets.
-    fn multicast_if_v4(&self) -> io::Result<Ipv4Addr>;
-
-
-    /// Sets the value of the `IPV6_MULTICAST_IF` option for this socket.
-    ///
-    /// Specifies the interface to use for routing multicast packets.
-    fn set_multicast_if_v6(&self, interface: u32) -> io::Result<()>;
-
-    /// Gets the value of the `IPV6_MULTICAST_IF` option for this socket.
-    ///
-    /// Returns the interface to use for routing multicast packets.
-    fn multicast_if_v6(&self) -> io::Result<u32>;
-
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This is the same as [`TcpStreamExt::set_ttl`][other].
-    ///
-    /// [other]: trait.TcpStreamExt.html#tymethod.set_ttl
-    fn set_ttl(&self, ttl: u32) -> io::Result<()>;
-
-    /// Gets the value of the `IP_TTL` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`TcpStreamExt::set_ttl`][link].
-    ///
-    /// [link]: trait.TcpStreamExt.html#tymethod.set_ttl
-    fn ttl(&self) -> io::Result<u32>;
-
-    /// Sets the value for the `IPV6_UNICAST_HOPS` option on this socket.
-    ///
-    /// Specifies the hop limit for ipv6 unicast packets
-    fn set_unicast_hops_v6(&self, ttl: u32) -> io::Result<()>;
-
-    /// Gets the value of the `IPV6_UNICAST_HOPS` option for this socket.
-    ///
-    /// Specifies the hop limit for ipv6 unicast packets
-    fn unicast_hops_v6(&self) -> io::Result<u32>;
-
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
-    ///
-    /// For more information about this option, see
-    /// [`TcpStreamExt::set_only_v6`][link].
-    ///
-    /// [link]: trait.TcpStreamExt.html#tymethod.set_only_v6
-    fn set_only_v6(&self, only_v6: bool) -> io::Result<()>;
-
-    /// Gets the value of the `IPV6_V6ONLY` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`TcpStreamExt::set_only_v6`][link].
-    ///
-    /// [link]: trait.TcpStreamExt.html#tymethod.set_only_v6
-    fn only_v6(&self) -> io::Result<bool>;
-
-    /// Executes an operation of the `IP_ADD_MEMBERSHIP` type.
-    ///
-    /// This function specifies a new multicast group for this socket to join.
-    /// The address must be a valid multicast address, and `interface` is the
-    /// address of the local interface with which the system should join the
-    /// multicast group. If it's equal to `INADDR_ANY` then an appropriate
-    /// interface is chosen by the system.
-    fn join_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr)
-                         -> io::Result<()>;
-
-    /// Executes an operation of the `IPV6_ADD_MEMBERSHIP` type.
-    ///
-    /// This function specifies a new multicast group for this socket to join.
-    /// The address must be a valid multicast address, and `interface` is the
-    /// index of the interface to join/leave (or 0 to indicate any interface).
-    fn join_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32)
-                         -> io::Result<()>;
-
-    /// Executes an operation of the `IP_DROP_MEMBERSHIP` type.
-    ///
-    /// For more information about this option, see
-    /// [`join_multicast_v4`][link].
-    ///
-    /// [link]: #tymethod.join_multicast_v4
-    fn leave_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr)
-                          -> io::Result<()>;
-
-    /// Executes an operation of the `IPV6_DROP_MEMBERSHIP` type.
-    ///
-    /// For more information about this option, see
-    /// [`join_multicast_v6`][link].
-    ///
-    /// [link]: #tymethod.join_multicast_v6
-    fn leave_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32)
-                          -> io::Result<()>;
-
-    /// Sets the `SO_RCVTIMEO` option for this socket.
-    ///
-    /// This option specifies the timeout, in milliseconds, of how long calls to
-    /// this socket's `read` function will wait before returning a timeout. A
-    /// value of `None` means that no read timeout should be specified and
-    /// otherwise `Some` indicates the number of milliseconds for the timeout.
-    fn set_read_timeout_ms(&self, val: Option<u32>) -> io::Result<()>;
-
-    /// Sets the `SO_RCVTIMEO` option for this socket.
-    ///
-    /// This option specifies the timeout of how long calls to this socket's
-    /// `read` function will wait before returning a timeout. A value of `None`
-    /// means that no read timeout should be specified and otherwise `Some`
-    /// indicates the number of duration of the timeout.
-    fn set_read_timeout(&self, val: Option<Duration>) -> io::Result<()>;
-
-    /// Gets the value of the `SO_RCVTIMEO` option for this socket.
-    ///
-    /// For more information about this option, see [`set_read_timeout_ms`][link].
-    ///
-    /// [link]: #tymethod.set_read_timeout_ms
-    fn read_timeout_ms(&self) -> io::Result<Option<u32>>;
-
-    /// Gets the value of the `SO_RCVTIMEO` option for this socket.
-    ///
-    /// For more information about this option, see [`set_read_timeout`][link].
-    ///
-    /// [link]: #tymethod.set_read_timeout
-    fn read_timeout(&self) -> io::Result<Option<Duration>>;
-
-    /// Sets the `SO_SNDTIMEO` option for this socket.
-    ///
-    /// This option specifies the timeout, in milliseconds, of how long calls to
-    /// this socket's `write` function will wait before returning a timeout. A
-    /// value of `None` means that no read timeout should be specified and
-    /// otherwise `Some` indicates the number of milliseconds for the timeout.
-    fn set_write_timeout_ms(&self, val: Option<u32>) -> io::Result<()>;
-
-    /// Sets the `SO_SNDTIMEO` option for this socket.
-    ///
-    /// This option specifies the timeout of how long calls to this socket's
-    /// `write` function will wait before returning a timeout. A value of `None`
-    /// means that no read timeout should be specified and otherwise `Some`
-    /// indicates the duration of the timeout.
-    fn set_write_timeout(&self, val: Option<Duration>) -> io::Result<()>;
-
-    /// Gets the value of the `SO_SNDTIMEO` option for this socket.
-    ///
-    /// For more information about this option, see [`set_write_timeout_ms`][link].
-    ///
-    /// [link]: #tymethod.set_write_timeout_ms
-    fn write_timeout_ms(&self) -> io::Result<Option<u32>>;
-
-    /// Gets the value of the `SO_SNDTIMEO` option for this socket.
-    ///
-    /// For more information about this option, see [`set_write_timeout`][link].
-    ///
-    /// [link]: #tymethod.set_write_timeout
-    fn write_timeout(&self) -> io::Result<Option<Duration>>;
-
-    /// Get the value of the `SO_ERROR` option on this socket.
-    ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    fn take_error(&self) -> io::Result<Option<io::Error>>;
-
-    /// Connects this UDP socket to a remote address, allowing the `send` and
-    /// `recv` syscalls to be used to send data and also applies filters to only
-    /// receive data from the specified address.
-    fn connect<A: ToSocketAddrs>(&self, addr: A) -> io::Result<()>;
-
-    /// Sends data on the socket to the remote address to which it is connected.
-    ///
-    /// The `connect` method will connect this socket to a remote address. This
-    /// method will fail if the socket is not connected.
-    fn send(&self, buf: &[u8]) -> io::Result<usize>;
-
-    /// Receives data on the socket from the remote address to which it is
-    /// connected.
-    ///
-    /// The `connect` method will connect this socket to a remote address. This
-    /// method will fail if the socket is not connected.
-    fn recv(&self, buf: &mut [u8]) -> io::Result<usize>;
-
-    /// Moves this UDP socket into or out of nonblocking mode.
-    ///
-    /// For more information about this option, see
-    /// [`TcpStreamExt::set_nonblocking`][link].
-    ///
-    /// [link]: trait.TcpStreamExt.html#tymethod.set_nonblocking
-    fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()>;
-}
-
-#[doc(hidden)]
-pub trait AsSock {
-    fn as_sock(&self) -> Socket;
-}
-
-#[cfg(any(unix, target_os = "redox", target_os = "wasi"))]
-impl<T: AsRawFd> AsSock for T {
-    fn as_sock(&self) -> Socket { self.as_raw_fd() }
-}
-#[cfg(windows)]
-impl<T: AsRawSocket> AsSock for T {
-    fn as_sock(&self) -> Socket { self.as_raw_socket() as Socket }
-}
-
-cfg_if! {
-    if #[cfg(any(target_os = "macos", target_os = "ios"))] {
-        use libc::TCP_KEEPALIVE as KEEPALIVE_OPTION;
-    } else if #[cfg(any(target_os = "haiku", target_os = "netbsd", target_os = "openbsd"))] {
-        use libc::SO_KEEPALIVE as KEEPALIVE_OPTION;
-    } else if #[cfg(unix)] {
-        use libc::TCP_KEEPIDLE as KEEPALIVE_OPTION;
-    } else if #[cfg(target_os = "redox")] {
-        use libc::TCP_KEEPIDLE as KEEPALIVE_OPTION;
-    } else {
-        // ...
-    }
-}
-
-impl TcpStreamExt for TcpStream {
-
-    fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        // TODO: casting usize to a c_int should be a checked cast
-        set_opt(self.as_sock(), SOL_SOCKET, SO_RCVBUF, size as c_int)
-    }
-
-    fn recv_buffer_size(&self) -> io::Result<usize> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_RCVBUF).map(int2usize)
-    }
-
-    fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_SNDBUF, size as c_int)
-    }
-
-    fn send_buffer_size(&self) -> io::Result<usize> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_SNDBUF).map(int2usize)
-    }
-
-    fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        set_opt(self.as_sock(), v(IPPROTO_TCP), TCP_NODELAY,
-               nodelay as c_int)
-    }
-    fn nodelay(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), v(IPPROTO_TCP), TCP_NODELAY)
-            .map(int2bool)
-    }
-
-    fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
-        self.set_keepalive_ms(keepalive.map(dur2ms))
-    }
-
-    fn keepalive(&self) -> io::Result<Option<Duration>> {
-        self.keepalive_ms().map(|o| o.map(ms2dur))
-    }
-
-    #[cfg(target_os = "redox")]
-    fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
-        try!(set_opt(self.as_sock(), SOL_SOCKET, SO_KEEPALIVE,
-                    keepalive.is_some() as c_int));
-        if let Some(dur) = keepalive {
-            try!(set_opt(self.as_sock(), v(IPPROTO_TCP), KEEPALIVE_OPTION,
-                        (dur / 1000) as c_int));
-        }
-        Ok(())
-    }
-
-    #[cfg(target_os = "redox")]
-    fn keepalive_ms(&self) -> io::Result<Option<u32>> {
-        let keepalive = try!(get_opt::<c_int>(self.as_sock(), SOL_SOCKET,
-                                             SO_KEEPALIVE));
-        if keepalive == 0 {
-            return Ok(None)
-        }
-        let secs = try!(get_opt::<c_int>(self.as_sock(), v(IPPROTO_TCP),
-                                        KEEPALIVE_OPTION));
-        Ok(Some((secs as u32) * 1000))
-    }
-
-    #[cfg(unix)]
-    fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
-        try!(set_opt(self.as_sock(), SOL_SOCKET, SO_KEEPALIVE,
-                    keepalive.is_some() as c_int));
-        if let Some(dur) = keepalive {
-            try!(set_opt(self.as_sock(), v(IPPROTO_TCP), KEEPALIVE_OPTION,
-                        (dur / 1000) as c_int));
-        }
-        Ok(())
-    }
-
-    #[cfg(unix)]
-    fn keepalive_ms(&self) -> io::Result<Option<u32>> {
-        let keepalive = try!(get_opt::<c_int>(self.as_sock(), SOL_SOCKET,
-                                             SO_KEEPALIVE));
-        if keepalive == 0 {
-            return Ok(None)
-        }
-        let secs = try!(get_opt::<c_int>(self.as_sock(), v(IPPROTO_TCP),
-                                        KEEPALIVE_OPTION));
-        Ok(Some((secs as u32) * 1000))
-    }
-
-     #[cfg(target_os = "wasi")]
-    fn set_keepalive_ms(&self, _keepalive: Option<u32>) -> io::Result<()> {
-        unimplemented!()
-    }
-
-    #[cfg(target_os = "wasi")]
-    fn keepalive_ms(&self) -> io::Result<Option<u32>> {
-        unimplemented!()
-    }
-
-    #[cfg(windows)]
-    fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
-        let ms = keepalive.unwrap_or(INFINITE);
-        let ka = tcp_keepalive {
-            onoff: keepalive.is_some() as c_ulong,
-            keepalivetime: ms as c_ulong,
-            keepaliveinterval: ms as c_ulong,
-        };
-        unsafe {
-            ::cvt_win(WSAIoctl(self.as_sock(),
-                               SIO_KEEPALIVE_VALS,
-                               &ka as *const _ as *mut _,
-                               mem::size_of_val(&ka) as DWORD,
-                               0 as *mut _,
-                               0,
-                               0 as *mut _,
-                               0 as *mut _,
-                               None)).map(|_| ())
-        }
-    }
-
-    #[cfg(windows)]
-    fn keepalive_ms(&self) -> io::Result<Option<u32>> {
-        let mut ka = tcp_keepalive {
-            onoff: 0,
-            keepalivetime: 0,
-            keepaliveinterval: 0,
-        };
-        unsafe {
-            try!(::cvt_win(WSAIoctl(self.as_sock(),
-                                    SIO_KEEPALIVE_VALS,
-                                    0 as *mut _,
-                                    0,
-                                    &mut ka as *mut _ as *mut _,
-                                    mem::size_of_val(&ka) as DWORD,
-                                    0 as *mut _,
-                                    0 as *mut _,
-                                    None)));
-        }
-        Ok({
-            if ka.onoff == 0 {
-                None
-            } else {
-                timeout2ms(ka.keepaliveinterval as DWORD)
-            }
-        })
-    }
-
-    fn set_read_timeout_ms(&self, dur: Option<u32>) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_RCVTIMEO,
-               ms2timeout(dur))
-    }
-
-    fn read_timeout_ms(&self) -> io::Result<Option<u32>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_RCVTIMEO)
-            .map(timeout2ms)
-    }
-
-    fn set_write_timeout_ms(&self, dur: Option<u32>) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_SNDTIMEO,
-               ms2timeout(dur))
-    }
-
-    fn write_timeout_ms(&self) -> io::Result<Option<u32>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_SNDTIMEO)
-            .map(timeout2ms)
-    }
-
-    fn set_read_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.set_read_timeout_ms(dur.map(dur2ms))
-    }
-
-    fn read_timeout(&self) -> io::Result<Option<Duration>> {
-        self.read_timeout_ms().map(|o| o.map(ms2dur))
-    }
-
-    fn set_write_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.set_write_timeout_ms(dur.map(dur2ms))
-    }
-
-    fn write_timeout(&self) -> io::Result<Option<Duration>> {
-        self.write_timeout_ms().map(|o| o.map(ms2dur))
-    }
-
-    fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        set_opt(self.as_sock(), IPPROTO_IP, IP_TTL, ttl as c_int)
-    }
-
-    fn ttl(&self) -> io::Result<u32> {
-        get_opt::<c_int>(self.as_sock(), IPPROTO_IP, IP_TTL)
-            .map(|b| b as u32)
-    }
-
-    fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_V6ONLY, only_v6 as c_int)
-    }
-
-    fn only_v6(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_V6ONLY).map(int2bool)
-    }
-
-    fn connect<T: ToSocketAddrs>(&self, addr: T) -> io::Result<()> {
-        do_connect(self.as_sock(), addr)
-    }
-
-    fn take_error(&self) -> io::Result<Option<io::Error>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_ERROR).map(int2err)
-    }
-
-    fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
-        set_nonblocking(self.as_sock(), nonblocking)
-    }
-
-    fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_LINGER, dur2linger(dur))
-    }
-
-    fn linger(&self) -> io::Result<Option<Duration>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_LINGER).map(linger2dur)
-    }
-}
-
-#[cfg(any(target_os = "redox", unix, target_os = "wasi"))]
-fn ms2timeout(dur: Option<u32>) -> timeval {
-    // TODO: be more rigorous
-    match dur {
-        Some(d) => timeval {
-            tv_sec: (d / 1000) as time_t,
-            tv_usec: (d % 1000) as suseconds_t,
-        },
-        None => timeval { tv_sec: 0, tv_usec: 0 },
-    }
-}
-
-#[cfg(any(target_os = "redox", unix, target_os = "wasi"))]
-fn timeout2ms(dur: timeval) -> Option<u32> {
-    if dur.tv_sec == 0 && dur.tv_usec == 0 {
-        None
-    } else {
-        Some(dur.tv_sec as u32 * 1000 + dur.tv_usec as u32 / 1000)
-    }
-}
-
-#[cfg(windows)]
-fn ms2timeout(dur: Option<u32>) -> DWORD {
-    dur.unwrap_or(0)
-}
-
-#[cfg(windows)]
-fn timeout2ms(dur: DWORD) -> Option<u32> {
-    if dur == 0 {
-        None
-    } else {
-        Some(dur)
-    }
-}
-
-fn linger2dur(linger_opt: linger) -> Option<Duration> {
-    if linger_opt.l_onoff == 0 {
-        None
-    }
-    else {
-        Some(Duration::from_secs(linger_opt.l_linger as u64))
-    }
-}
-
-#[cfg(windows)]
-fn dur2linger(dur: Option<Duration>) -> linger {
-    match dur {
-        Some(d) => {
-            linger {
-                l_onoff: 1,
-                l_linger: d.as_secs() as u16,
-            }
-        },
-        None => linger { l_onoff: 0, l_linger: 0 },
-    }
-}
-
-#[cfg(any(target_os = "redox", unix, target_os = "wasi"))]
-fn dur2linger(dur: Option<Duration>) -> linger {
-    match dur {
-        Some(d) => {
-            linger {
-                l_onoff: 1,
-                l_linger: d.as_secs() as c_int,
-            }
-        },
-        None => linger { l_onoff: 0, l_linger: 0 },
-    }
-}
-
-fn ms2dur(ms: u32) -> Duration {
-    Duration::new((ms as u64) / 1000, (ms as u32) % 1000 * 1_000_000)
-}
-
-fn dur2ms(dur: Duration) -> u32 {
-    (dur.as_secs() as u32 * 1000) + (dur.subsec_nanos() / 1_000_000)
-}
-
-pub fn int2bool(n: c_int) -> bool {
-    if n == 0 {false} else {true}
-}
-
-pub fn int2usize(n: c_int) -> usize {
-    // TODO: casting c_int to a usize should be a checked cast
-    n as usize
-}
-
-pub fn int2err(n: c_int) -> Option<io::Error> {
-    if n == 0 {
-        None
-    } else {
-        Some(io::Error::from_raw_os_error(n as i32))
-    }
-}
-
-impl UdpSocketExt for UdpSocket {
-
-    fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_RCVBUF, size as c_int)
-    }
-
-    fn recv_buffer_size(&self) -> io::Result<usize> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_RCVBUF).map(int2usize)
-    }
-
-    fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_SNDBUF, size as c_int)
-    }
-
-    fn send_buffer_size(&self) -> io::Result<usize> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_SNDBUF).map(int2usize)
-    }
-
-    fn set_broadcast(&self, broadcast: bool) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_BROADCAST,
-               broadcast as c_int)
-    }
-    fn broadcast(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_BROADCAST)
-            .map(int2bool)
-    }
-    fn set_multicast_loop_v4(&self, multicast_loop_v4: bool) -> io::Result<()> {
-        set_opt(self.as_sock(), IPPROTO_IP, IP_MULTICAST_LOOP,
-               multicast_loop_v4 as c_int)
-    }
-    fn multicast_loop_v4(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), IPPROTO_IP, IP_MULTICAST_LOOP)
-            .map(int2bool)
-    }
-
-    fn set_multicast_ttl_v4(&self, multicast_ttl_v4: u32) -> io::Result<()> {
-        set_opt(self.as_sock(), IPPROTO_IP, IP_MULTICAST_TTL,
-               multicast_ttl_v4 as c_int)
-    }
-    
-    fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        get_opt::<c_int>(self.as_sock(), IPPROTO_IP, IP_MULTICAST_TTL)
-            .map(|b| b as u32)
-    }
-
-    fn set_multicast_hops_v6(&self, _hops: u32) -> io::Result<()> {
-        #[cfg(target_os = "redox")]
-        return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
-        #[cfg(not(target_os = "redox"))]
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_HOPS,
-               _hops as c_int)
-    }
-
-    fn multicast_hops_v6(&self) -> io::Result<u32> {
-        #[cfg(target_os = "redox")]
-        return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
-        #[cfg(not(target_os = "redox"))]
-        get_opt::<c_int>(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_HOPS)
-            .map(|b| b as u32)
-    }
-
-    fn set_multicast_loop_v6(&self, multicast_loop_v6: bool) -> io::Result<()> {
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_LOOP,
-               multicast_loop_v6 as c_int)
-    }
-    fn multicast_loop_v6(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_LOOP)
-            .map(int2bool)
-    }
-
-    fn set_multicast_if_v4(&self, _interface: &Ipv4Addr) -> io::Result<()> {
-        #[cfg(target_os = "redox")]
-        return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
-        #[cfg(not(target_os = "redox"))]
-        set_opt(self.as_sock(), IPPROTO_IP, IP_MULTICAST_IF, ip2in_addr(_interface))
-    }
-
-    fn multicast_if_v4(&self) -> io::Result<Ipv4Addr> {
-        #[cfg(target_os = "redox")]
-        return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
-        #[cfg(not(target_os = "redox"))]
-        get_opt(self.as_sock(), IPPROTO_IP, IP_MULTICAST_IF).map(in_addr2ip)
-    }
-
-    fn set_multicast_if_v6(&self, _interface: u32) -> io::Result<()> {
-        #[cfg(target_os = "redox")]
-        return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
-        #[cfg(not(target_os = "redox"))]
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_IF, to_ipv6mr_interface(_interface))
-    }
-
-    fn multicast_if_v6(&self) -> io::Result<u32> {
-        #[cfg(target_os = "redox")]
-        return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
-        #[cfg(not(target_os = "redox"))]
-        get_opt::<c_int>(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_IF).map(|b| b as u32)
-    }
-
-    fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        set_opt(self.as_sock(), IPPROTO_IP, IP_TTL, ttl as c_int)
-    }
-
-    fn ttl(&self) -> io::Result<u32> {
-        get_opt::<c_int>(self.as_sock(), IPPROTO_IP, IP_TTL)
-            .map(|b| b as u32)
-    }
-
-    fn set_unicast_hops_v6(&self, _ttl: u32) -> io::Result<()> {
-        #[cfg(target_os = "redox")]
-        return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
-        #[cfg(not(target_os = "redox"))]
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_UNICAST_HOPS, _ttl as c_int)
-    }
-
-    fn unicast_hops_v6(&self) -> io::Result<u32> {
-        #[cfg(target_os = "redox")]
-        return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
-        #[cfg(not(target_os = "redox"))]
-        get_opt::<c_int>(self.as_sock(), IPPROTO_IP, IPV6_UNICAST_HOPS)
-            .map(|b| b as u32)
-    }
-
-    fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_V6ONLY, only_v6 as c_int)
-    }
-
-    fn only_v6(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_V6ONLY).map(int2bool)
-    }
-
-    fn join_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr)
-                         -> io::Result<()> {
-        let mreq = ip_mreq {
-            imr_multiaddr: ip2in_addr(multiaddr),
-            imr_interface: ip2in_addr(interface),
-        };
-        set_opt(self.as_sock(), IPPROTO_IP, IP_ADD_MEMBERSHIP, mreq)
-    }
-
-    fn join_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32)
-                         -> io::Result<()> {
-        let mreq = ipv6_mreq {
-            ipv6mr_multiaddr: ip2in6_addr(multiaddr),
-            ipv6mr_interface: to_ipv6mr_interface(interface),
-        };
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_ADD_MEMBERSHIP,
-               mreq)
-    }
-
-    fn leave_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr)
-                          -> io::Result<()> {
-        let mreq = ip_mreq {
-            imr_multiaddr: ip2in_addr(multiaddr),
-            imr_interface: ip2in_addr(interface),
-        };
-        set_opt(self.as_sock(), IPPROTO_IP, IP_DROP_MEMBERSHIP, mreq)
-    }
-
-    fn leave_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32)
-                          -> io::Result<()> {
-        let mreq = ipv6_mreq {
-            ipv6mr_multiaddr: ip2in6_addr(multiaddr),
-            ipv6mr_interface: to_ipv6mr_interface(interface),
-        };
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_DROP_MEMBERSHIP,
-               mreq)
-    }
-
-    fn set_read_timeout_ms(&self, dur: Option<u32>) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_RCVTIMEO,
-               ms2timeout(dur))
-    }
-
-    fn read_timeout_ms(&self) -> io::Result<Option<u32>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_RCVTIMEO)
-            .map(timeout2ms)
-    }
-
-    fn set_write_timeout_ms(&self, dur: Option<u32>) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_SNDTIMEO,
-               ms2timeout(dur))
-    }
-
-    fn write_timeout_ms(&self) -> io::Result<Option<u32>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_SNDTIMEO)
-            .map(timeout2ms)
-    }
-
-    fn set_read_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.set_read_timeout_ms(dur.map(dur2ms))
-    }
-
-    fn read_timeout(&self) -> io::Result<Option<Duration>> {
-        self.read_timeout_ms().map(|o| o.map(ms2dur))
-    }
-
-    fn set_write_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.set_write_timeout_ms(dur.map(dur2ms))
-    }
-
-    fn write_timeout(&self) -> io::Result<Option<Duration>> {
-        self.write_timeout_ms().map(|o| o.map(ms2dur))
-    }
-
-    fn take_error(&self) -> io::Result<Option<io::Error>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_ERROR).map(int2err)
-    }
-
-    fn connect<A: ToSocketAddrs>(&self, addr: A) -> io::Result<()> {
-        do_connect(self.as_sock(), addr)
-    }
-
-    #[cfg(target_os = "redox")]
-    fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        unsafe {
-            ::cvt(write(self.as_sock() as c_int, buf.as_ptr() as *const _, buf.len())).map(|n| n as usize)
-        }
-    }
-
-    #[cfg(unix)]
-    fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        unsafe {
-            ::cvt(send(self.as_sock() as c_int, buf.as_ptr() as *const _, buf.len(), 0)).map(|n| n as usize)
-        }
-    }
-
-     #[cfg(target_os = "wasi")]
-    fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        let _so_datalen: *mut sys::c::size_t = &mut 0;
-        unsafe {
-            let _errno = libc::__wasi_sock_send(
-                self.as_sock() as libc::__wasi_fd_t,
-                buf.as_ptr() as *const _,
-                buf.len(),
-                0,
-                _so_datalen,
-            );
-            // TODO: handle errno
-            Ok((*_so_datalen) as usize)
-        }
-    }
-
-    #[cfg(windows)]
-    fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        let len = ::std::cmp::min(buf.len(), c_int::max_value() as usize);
-        let buf = &buf[..len];
-        unsafe {
-            ::cvt(send(self.as_sock(), buf.as_ptr() as *const _, len as c_int, 0))
-                .map(|n| n as usize)
-        }
-    }
-
-    #[cfg(target_os = "redox")]
-    fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
-        unsafe {
-            ::cvt(read(self.as_sock() as c_int, buf.as_mut_ptr() as *mut _, buf.len()))
-                .map(|n| n as usize)
-        }
-    }
-
-    #[cfg(unix)]
-    fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
-        unsafe {
-            ::cvt(recv(self.as_sock(), buf.as_mut_ptr() as *mut _, buf.len(), 0))
-                .map(|n| n as usize)
-        }
-    }
-
-    #[cfg(target_os = "wasi")]
-    fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
-        let _ro_datalen: *mut sys::c::size_t = &mut 0;
-        let _ro_flags: *mut sys::c::__wasi_roflags_t = &mut 0;
-        unsafe {
-            let _errno = __wasi_sock_recv(
-                self.as_sock(),
-                buf.as_mut_ptr() as *mut _,
-                buf.len(),
-                0,
-                _ro_datalen,
-                _ro_flags,
-            );
-            // TODO: handle errno
-            Ok((*_ro_datalen) as usize)
-        }
-    }
-
-    #[cfg(windows)]
-    fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
-        let len = ::std::cmp::min(buf.len(), c_int::max_value() as usize);
-        let buf = &mut buf[..len];
-        unsafe {
-            ::cvt(recv(self.as_sock(), buf.as_mut_ptr() as *mut _, buf.len() as c_int, 0))
-                .map(|n| n as usize)
-        }
-    }
-
-    fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
-        set_nonblocking(self.as_sock(), nonblocking)
-    }
-}
-
-fn do_connect<A: ToSocketAddrs>(sock: Socket, addr: A) -> io::Result<()> {
-    let err = io::Error::new(io::ErrorKind::Other,
-                             "no socket addresses resolved");
-    let addrs = try!(addr.to_socket_addrs());
-    let sys = sys::Socket::from_inner(sock);
-    let sock = socket::Socket::from_inner(sys);
-    let ret = addrs.fold(Err(err), |prev, addr| {
-        prev.or_else(|_| sock.connect(&addr))
-    });
-    mem::forget(sock);
-    return ret
-}
-
-#[cfg(target_os = "redox")]
-fn set_nonblocking(sock: Socket, nonblocking: bool) -> io::Result<()> {
-    let mut flags = ::cvt(unsafe {
-        fcntl(sock as c_int, F_GETFL)
-    })?;
-    if nonblocking {
-        flags |= O_NONBLOCK;
-    } else {
-        flags &= !O_NONBLOCK;
-    }
-    ::cvt(unsafe {
-        fcntl(sock as c_int, F_SETFL, flags)
-    }).and(Ok(()))
-}
-
-#[cfg(unix)]
-fn set_nonblocking(sock: Socket, nonblocking: bool) -> io::Result<()> {
-    let mut nonblocking = nonblocking as c_ulong;
-    ::cvt(unsafe {
-        ioctl(sock, FIONBIO, &mut nonblocking)
-    }).map(|_| ())
-}
-
-#[cfg(target_os = "wasi")]
-fn set_nonblocking(_sock: Socket, _nonblocking: bool) -> io::Result<()> {
-    Ok(())
-}
-
-#[cfg(windows)]
-fn set_nonblocking(sock: Socket, nonblocking: bool) -> io::Result<()> {
-    let mut nonblocking = nonblocking as c_ulong;
-    ::cvt(unsafe {
-        ioctlsocket(sock, FIONBIO as c_int, &mut nonblocking)
-    }).map(|_| ())
-}
-
-#[cfg(target_os = "redox")]
-fn ip2in_addr(ip: &Ipv4Addr) -> in_addr {
-    let oct = ip.octets();
-    in_addr {
-        s_addr: ::hton(((oct[0] as u32) << 24) |
-                       ((oct[1] as u32) << 16) |
-                       ((oct[2] as u32) <<  8) |
-                       ((oct[3] as u32) <<  0)),
-    }
-}
-
-#[cfg(any(unix, target_os = "wasi"))]
-fn ip2in_addr(ip: &Ipv4Addr) -> in_addr {
-    let oct = ip.octets();
-    in_addr {
-        s_addr: ::hton(((oct[0] as u32) << 24) |
-                       ((oct[1] as u32) << 16) |
-                       ((oct[2] as u32) <<  8) |
-                       ((oct[3] as u32) <<  0)),
-    }
-}
-
-#[cfg(windows)]
-fn ip2in_addr(ip: &Ipv4Addr) -> in_addr {
-    let oct = ip.octets();
-    unsafe {
-        let mut S_un: in_addr_S_un = mem::zeroed();
-        *S_un.S_addr_mut() = ::hton(((oct[0] as u32) << 24) |
-                                ((oct[1] as u32) << 16) |
-                                ((oct[2] as u32) <<  8) |
-                                ((oct[3] as u32) <<  0));
-        in_addr {
-            S_un: S_un,
-        }
-    }
-}
-
-fn in_addr2ip(ip: &in_addr) -> Ipv4Addr {
-    let h_addr = c::in_addr_to_u32(ip);
-    
-    let a: u8 = (h_addr >> 24) as u8;
-    let b: u8 = (h_addr >> 16) as u8;
-    let c: u8 = (h_addr >> 8) as u8;
-    let d: u8 = (h_addr >> 0) as u8;
-
-    Ipv4Addr::new(a,b,c,d)
-}
-
-#[cfg(target_os = "android")]
-fn to_ipv6mr_interface(value: u32) -> c_int {
-    value as c_int
-}
-
-#[cfg(not(target_os = "android"))]
-fn to_ipv6mr_interface(value: u32) -> c_uint {
-    value as c_uint
-}
-
-fn ip2in6_addr(ip: &Ipv6Addr) -> in6_addr {
-    let mut ret: in6_addr = unsafe { mem::zeroed() };
-    let seg = ip.segments();
-    let bytes = [
-        (seg[0] >> 8) as u8,
-        (seg[0] >> 0) as u8,
-        (seg[1] >> 8) as u8,
-        (seg[1] >> 0) as u8,
-        (seg[2] >> 8) as u8,
-        (seg[2] >> 0) as u8,
-        (seg[3] >> 8) as u8,
-        (seg[3] >> 0) as u8,
-        (seg[4] >> 8) as u8,
-        (seg[4] >> 0) as u8,
-        (seg[5] >> 8) as u8,
-        (seg[5] >> 0) as u8,
-        (seg[6] >> 8) as u8,
-        (seg[6] >> 0) as u8,
-        (seg[7] >> 8) as u8,
-        (seg[7] >> 0) as u8,
-    ];
-    #[cfg(windows)] unsafe { *ret.u.Byte_mut() = bytes; }
-    #[cfg(not(windows))]   { ret.s6_addr = bytes; }
-
-    return ret
-}
-
-impl TcpListenerExt for TcpListener {
-    fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        set_opt(self.as_sock(), IPPROTO_IP, IP_TTL, ttl as c_int)
-    }
-
-    fn ttl(&self) -> io::Result<u32> {
-        get_opt::<c_int>(self.as_sock(), IPPROTO_IP, IP_TTL)
-            .map(|b| b as u32)
-    }
-
-    fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_V6ONLY, only_v6 as c_int)
-    }
-
-    fn only_v6(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_V6ONLY).map(int2bool)
-    }
-
-    fn take_error(&self) -> io::Result<Option<io::Error>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_ERROR).map(int2err)
-    }
-
-    fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
-        set_nonblocking(self.as_sock(), nonblocking)
-    }
-
-    fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_LINGER, dur2linger(dur))
-    }
-
-    fn linger(&self) -> io::Result<Option<Duration>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_LINGER).map(linger2dur)
-    }
-}
-
-impl TcpBuilder {
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This is the same as [`TcpStreamExt::set_ttl`][other].
-    ///
-    /// [other]: trait.TcpStreamExt.html#tymethod.set_ttl
-    pub fn ttl(&self, ttl: u32) -> io::Result<&Self> {
-        set_opt(self.as_sock(), IPPROTO_IP, IP_TTL, ttl as c_int)
-            .map(|()| self)
-    }
-
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
-    ///
-    /// This is the same as [`TcpStreamExt::set_only_v6`][other].
-    ///
-    /// [other]: trait.TcpStreamExt.html#tymethod.set_only_v6
-    pub fn only_v6(&self, only_v6: bool) -> io::Result<&Self> {
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_V6ONLY, only_v6 as c_int)
-            .map(|()| self)
-    }
-
-    /// Set value for the `SO_REUSEADDR` option on this socket.
-    ///
-    /// This indicates that further calls to `bind` may allow reuse of local
-    /// addresses. For IPv4 sockets this means that a socket may bind even when
-    /// there's a socket already listening on this port.
-    pub fn reuse_address(&self, reuse: bool) -> io::Result<&Self> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_REUSEADDR,
-               reuse as c_int).map(|()| self)
-    }
-
-    /// Check the `SO_REUSEADDR` option on this socket.
-    pub fn get_reuse_address(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_REUSEADDR).map(int2bool)
-    }
-
-    /// Get the value of the `SO_ERROR` option on this socket.
-    ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_ERROR).map(int2err)
-    }
-
-    /// Sets the linger option for this socket
-    fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_LINGER, dur2linger(dur))
-    }
-
-    /// Gets the linger option for this socket
-    fn linger(&self) -> io::Result<Option<Duration>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_LINGER).map(linger2dur)
-    }
-}
-
-impl UdpBuilder {
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This is the same as [`TcpStreamExt::set_ttl`][other].
-    ///
-    /// [other]: trait.TcpStreamExt.html#tymethod.set_ttl
-    pub fn ttl(&self, ttl: u32) -> io::Result<&Self> {
-        set_opt(self.as_sock(), IPPROTO_IP, IP_TTL, ttl as c_int)
-            .map(|()| self)
-    }
-
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
-    ///
-    /// This is the same as [`TcpStream::only_v6`][other].
-    ///
-    /// [other]: struct.TcpBuilder.html#method.only_v6
-    pub fn only_v6(&self, only_v6: bool) -> io::Result<&Self> {
-        set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_V6ONLY, only_v6 as c_int)
-            .map(|()| self)
-    }
-
-    /// Set value for the `SO_REUSEADDR` option on this socket.
-    ///
-    /// This is the same as [`TcpBuilder::reuse_address`][other].
-    ///
-    /// [other]: struct.TcpBuilder.html#method.reuse_address
-    pub fn reuse_address(&self, reuse: bool) -> io::Result<&Self> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_REUSEADDR,
-               reuse as c_int).map(|()| self)
-    }
-
-    /// Check the `SO_REUSEADDR` option on this socket.
-    pub fn get_reuse_address(&self) -> io::Result<bool> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_REUSEADDR).map(int2bool)
-    }
-
-    /// Get the value of the `SO_ERROR` option on this socket.
-    ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        get_opt(self.as_sock(), SOL_SOCKET, SO_ERROR).map(int2err)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Extensions to `std::net` networking types.
-//!
-//! This crate implements a number of extensions to the standard `std::net`
-//! networking types, hopefully being slated for inclusion into the standard
-//! library in the future. The goal of this crate is to expose all sorts of
-//! cross-platform and platform-specific configuration options of UDP/TCP
-//! sockets. System APIs are wrapped with as thin a layer as possible instead of
-//! bundling multiple actions into one API call.
-//!
-//! More information about the design of this crate can be found in the
-//! [associated rfc][rfc]
-//!
-//! [rfc]: https://github.com/rust-lang/rfcs/pull/1158
-//!
-//! # Examples
-//!
-//! ```no_run
-//! use net2::TcpBuilder;
-//!
-//! let tcp = TcpBuilder::new_v4().unwrap();
-//! tcp.reuse_address(true).unwrap()
-//!    .only_v6(false).unwrap();
-//!
-//! let mut stream = tcp.connect("127.0.0.1:80").unwrap();
-//!
-//! // use `stream` as a TcpStream
-//! ```
-
-#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
-       html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
-       html_root_url = "https://doc.rust-lang.org/net2-rs")]
-#![deny(missing_docs, warnings)]
-
-// Silence warnings about deprecated try!() usage
-#![allow(deprecated)]
-
-#![cfg_attr(target_os = "wasi", feature(wasi_ext))]
-
-#[cfg(any(target_os = "redox", target_os = "wasi", unix))] extern crate libc;
-
-#[cfg(windows)] extern crate winapi;
-
-#[macro_use] extern crate cfg_if;
-
-use std::io;
-use std::ops::Neg;
-use std::net::{ToSocketAddrs, SocketAddr};
-
-use utils::{One, NetInt};
-
-mod tcp;
-mod udp;
-mod socket;
-mod ext;
-mod utils;
-
-#[cfg(target_os="redox")] #[path = "sys/redox/mod.rs"] mod sys;
-#[cfg(unix)] #[path = "sys/unix/mod.rs"] mod sys;
-#[cfg(windows)] #[path = "sys/windows/mod.rs"] mod sys;
-#[cfg(target_os = "wasi")] #[path = "sys/wasi/mod.rs"] mod sys;
-#[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))] pub mod unix;
-
-pub use tcp::TcpBuilder;
-pub use udp::UdpBuilder;
-pub use ext::{TcpStreamExt, TcpListenerExt, UdpSocketExt};
-
-fn one_addr<T: ToSocketAddrs>(tsa: T) -> io::Result<SocketAddr> {
-    let mut addrs = try!(tsa.to_socket_addrs());
-    let addr = match addrs.next() {
-        Some(addr) => addr,
-        None => return Err(io::Error::new(io::ErrorKind::Other,
-                                          "no socket addresses could be resolved"))
-    };
-    if addrs.next().is_none() {
-        Ok(addr)
-    } else {
-        Err(io::Error::new(io::ErrorKind::Other,
-                           "more than one address resolved"))
-    }
-}
-
-fn cvt<T: One + PartialEq + Neg<Output=T>>(t: T) -> io::Result<T> {
-    let one: T = T::one();
-    if t == -one {
-        Err(io::Error::last_os_error())
-    } else {
-        Ok(t)
-    }
-}
-
-#[cfg(windows)]
-fn cvt_win<T: PartialEq + utils::Zero>(t: T) -> io::Result<T> {
-    if t == T::zero() {
-        Err(io::Error::last_os_error())
-    } else {
-        Ok(t)
-    }
-}
-
-fn hton<I: NetInt>(i: I) -> I { i.to_be() }
-
-fn ntoh<I: NetInt>(i: I) -> I { I::from_be(i) }
-
-trait AsInner {
-    type Inner;
-    fn as_inner(&self) -> &Self::Inner;
-}
-
-trait FromInner {
-    type Inner;
-    fn from_inner(inner: Self::Inner) -> Self;
-}
-
-trait IntoInner {
-    type Inner;
-    fn into_inner(self) -> Self::Inner;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/socket.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/socket.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/socket.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/socket.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::fmt;
-use std::io;
-use std::mem;
-use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
-#[cfg(any(unix, target_os = "redox", target_os = "wasi"))]
-use libc::c_int;
-#[cfg(windows)]
-use winapi::ctypes::c_int;
-
-use sys;
-use sys::c;
-
-pub struct Socket {
-    inner: sys::Socket,
-}
-
-impl Socket {
-    pub fn new(family: c_int, ty: c_int) -> io::Result<Socket> {
-        Ok(Socket { inner: try!(sys::Socket::new(family, ty)) })
-    }
-
-    pub fn bind(&self, addr: &SocketAddr) -> io::Result<()> {
-        let (addr, len) = addr2raw(addr);
-        unsafe {
-            ::cvt(c::bind(self.inner.raw(), addr.as_ptr(), len as c::socklen_t)).map(|_| ())
-        }
-    }
-
-    pub fn listen(&self, backlog: i32) -> io::Result<()> {
-        unsafe {
-            ::cvt(c::listen(self.inner.raw(), backlog)).map(|_| ())
-        }
-    }
-
-    pub fn connect(&self, addr: &SocketAddr) -> io::Result<()> {
-        let (addr, len) = addr2raw(addr);
-        unsafe {
-            ::cvt(c::connect(self.inner.raw(), addr.as_ptr(), len)).map(|_| ())
-        }
-    }
-
-    pub fn getsockname(&self) -> io::Result<SocketAddr> {
-        unsafe {
-            let mut storage: c::sockaddr_storage = mem::zeroed();
-            let mut len = mem::size_of_val(&storage) as c::socklen_t;
-            try!(::cvt(c::getsockname(self.inner.raw(),
-                                      &mut storage as *mut _ as *mut _,
-                                      &mut len)));
-            raw2addr(&storage, len)
-        }
-    }
-}
-
-impl fmt::Debug for Socket {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.raw().fmt(f)
-    }
-}
-
-impl ::AsInner for Socket {
-    type Inner = sys::Socket;
-    fn as_inner(&self) -> &sys::Socket { &self.inner }
-}
-
-impl ::FromInner for Socket {
-    type Inner = sys::Socket;
-    fn from_inner(sock: sys::Socket) -> Socket {
-        Socket { inner: sock }
-    }
-}
-
-impl ::IntoInner for Socket {
-    type Inner = sys::Socket;
-    fn into_inner(self) -> sys::Socket { self.inner }
-}
-
-/// A type with the same memory layout as `c::sockaddr`. Used in converting Rust level
-/// SocketAddr* types into their system representation. The benefit of this specific
-/// type over using `c::sockaddr_storage` is that this type is exactly as large as it
-/// needs to be and not a lot larger.
-#[repr(C)]
-pub(crate) union SocketAddrCRepr {
-    v4: c::sockaddr_in,
-    v6: c::sockaddr_in6,
-}
-
-impl SocketAddrCRepr {
-    pub(crate) fn as_ptr(&self) -> *const c::sockaddr {
-        self as *const _ as *const c::sockaddr
-    }
-}
-
-fn addr2raw(addr: &SocketAddr) -> (SocketAddrCRepr, c::socklen_t) {
-    match addr {
-        &SocketAddr::V4(ref v4) => addr2raw_v4(v4),
-        &SocketAddr::V6(ref v6) => addr2raw_v6(v6),
-    }
-}
-
-#[cfg(unix)]
-fn addr2raw_v4(addr: &SocketAddrV4) -> (SocketAddrCRepr, c::socklen_t) {
-    let sin_addr = c::in_addr {
-        s_addr: u32::from(*addr.ip()).to_be(),
-    };
-
-    let sockaddr = SocketAddrCRepr {
-        v4: c::sockaddr_in {
-            sin_family: c::AF_INET as c::sa_family_t,
-            sin_port: addr.port().to_be(),
-            sin_addr,
-            #[cfg(not(target_os = "haiku"))]
-            sin_zero: [0; 8],
-            #[cfg(target_os = "haiku")]
-            sin_zero: [0; 24],
-            #[cfg(any(
-                target_os = "dragonfly",
-                target_os = "freebsd",
-                target_os = "ios",
-                target_os = "macos",
-                target_os = "netbsd",
-                target_os = "openbsd",
-                target_os = "haiku",
-            ))]
-            sin_len: 0,
-        },
-    };
-    (sockaddr, mem::size_of::<c::sockaddr_in>() as c::socklen_t)
-}
-
-#[cfg(windows)]
-fn addr2raw_v4(addr: &SocketAddrV4) -> (SocketAddrCRepr, c::socklen_t) {
-    let sin_addr = unsafe {
-        let mut s_un = mem::zeroed::<c::in_addr_S_un>();
-        *s_un.S_addr_mut() = u32::from(*addr.ip()).to_be();
-        c::IN_ADDR { S_un: s_un }
-    };
-
-    let sockaddr = SocketAddrCRepr {
-        v4: c::sockaddr_in {
-            sin_family: c::AF_INET as c::sa_family_t,
-            sin_port: addr.port().to_be(),
-            sin_addr,
-            sin_zero: [0; 8],
-        },
-    };
-    (sockaddr, mem::size_of::<c::sockaddr_in>() as c::socklen_t)
-}
-
-#[cfg(unix)]
-fn addr2raw_v6(addr: &SocketAddrV6) -> (SocketAddrCRepr, c::socklen_t) {
-    let sin6_addr = {
-        let mut sin6_addr = unsafe { mem::zeroed::<c::in6_addr>() };
-        sin6_addr.s6_addr = addr.ip().octets();
-        sin6_addr
-    };
-
-    let sockaddr = SocketAddrCRepr {
-        v6: c::sockaddr_in6 {
-            sin6_family: c::AF_INET6 as c::sa_family_t,
-            sin6_port: addr.port().to_be(),
-            sin6_addr,
-            sin6_flowinfo: addr.flowinfo(),
-            sin6_scope_id: addr.scope_id(),
-            #[cfg(any(
-                target_os = "dragonfly",
-                target_os = "freebsd",
-                target_os = "ios",
-                target_os = "macos",
-                target_os = "netbsd",
-                target_os = "openbsd",
-                target_os = "haiku",
-            ))]
-            sin6_len: 0,
-            #[cfg(any(target_os = "solaris", target_os = "illumos"))]
-            __sin6_src_id: 0,
-        },
-    };
-    (sockaddr, mem::size_of::<c::sockaddr_in6>() as c::socklen_t)
-}
-
-#[cfg(windows)]
-fn addr2raw_v6(addr: &SocketAddrV6) -> (SocketAddrCRepr, c::socklen_t) {
-    let sin6_addr = unsafe {
-        let mut u = mem::zeroed::<c::in6_addr_u>();
-        *u.Byte_mut() = addr.ip().octets();
-        c::IN6_ADDR { u }
-    };
-    let scope_id = unsafe {
-        let mut u = mem::zeroed::<c::SOCKADDR_IN6_LH_u>();
-        *u.sin6_scope_id_mut() = addr.scope_id();
-        u
-    };
-
-    let sockaddr = SocketAddrCRepr {
-        v6: c::sockaddr_in6 {
-            sin6_family: c::AF_INET6 as c::sa_family_t,
-            sin6_port: addr.port().to_be(),
-            sin6_addr,
-            sin6_flowinfo: addr.flowinfo(),
-            u: scope_id,
-        },
-    };
-    (sockaddr, mem::size_of::<c::sockaddr_in6>() as c::socklen_t)
-}
-
-fn raw2addr(storage: &c::sockaddr_storage, len: c::socklen_t) -> io::Result<SocketAddr> {
-    match storage.ss_family as c_int {
-        c::AF_INET => {
-            unsafe {
-                assert!(len as usize >= mem::size_of::<c::sockaddr_in>());
-                let sa = storage as *const _ as *const c::sockaddr_in;
-                let bits = c::sockaddr_in_u32(&(*sa));
-                let ip = Ipv4Addr::new((bits >> 24) as u8,
-                                       (bits >> 16) as u8,
-                                       (bits >> 8) as u8,
-                                       bits as u8);
-                Ok(SocketAddr::V4(SocketAddrV4::new(ip, ::ntoh((*sa).sin_port))))
-            }
-        }
-        c::AF_INET6 => {
-            unsafe {
-                assert!(len as usize >= mem::size_of::<c::sockaddr_in6>());
-
-                let sa = storage as *const _ as *const c::sockaddr_in6;
-                #[cfg(windows)]      let arr = (*sa).sin6_addr.u.Byte();
-                #[cfg(not(windows))] let arr = (*sa).sin6_addr.s6_addr;
-
-                let ip = Ipv6Addr::new(
-                    (arr[0] as u16) << 8 | (arr[1] as u16),
-                    (arr[2] as u16) << 8 | (arr[3] as u16),
-                    (arr[4] as u16) << 8 | (arr[5] as u16),
-                    (arr[6] as u16) << 8 | (arr[7] as u16),
-                    (arr[8] as u16) << 8 | (arr[9] as u16),
-                    (arr[10] as u16) << 8 | (arr[11] as u16),
-                    (arr[12] as u16) << 8 | (arr[13] as u16),
-                    (arr[14] as u16) << 8 | (arr[15] as u16),
-                );
-
-                #[cfg(windows)]      let sin6_scope_id = *(*sa).u.sin6_scope_id();
-                #[cfg(not(windows))] let sin6_scope_id = (*sa).sin6_scope_id;
-
-                Ok(SocketAddr::V6(SocketAddrV6::new(ip,
-                                                    ::ntoh((*sa).sin6_port),
-                                                    (*sa).sin6_flowinfo,
-                                                    sin6_scope_id)))
-            }
-        }
-        _ => Err(io::Error::new(io::ErrorKind::InvalidInput, "invalid argument")),
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/redox/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/redox/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/redox/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/redox/impls.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::os::unix::io::{FromRawFd, AsRawFd};
-
-use {TcpBuilder, UdpBuilder, FromInner, AsInner};
-use socket::Socket;
-use sys;
-
-impl FromRawFd for TcpBuilder {
-    unsafe fn from_raw_fd(fd: usize) -> TcpBuilder {
-        let sock = sys::Socket::from_inner(fd);
-        TcpBuilder::from_inner(Socket::from_inner(sock))
-    }
-}
-
-impl AsRawFd for TcpBuilder {
-    fn as_raw_fd(&self) -> usize {
-        // TODO: this unwrap() is very bad
-        self.as_inner().borrow().as_ref().unwrap().as_inner().raw() as usize
-    }
-}
-
-impl FromRawFd for UdpBuilder {
-    unsafe fn from_raw_fd(fd: usize) -> UdpBuilder {
-        let sock = sys::Socket::from_inner(fd);
-        UdpBuilder::from_inner(Socket::from_inner(sock))
-    }
-}
-
-impl AsRawFd for UdpBuilder {
-    fn as_raw_fd(&self) -> usize {
-        // TODO: this unwrap() is very bad
-        self.as_inner().borrow().as_ref().unwrap().as_inner().raw() as usize
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/redox/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/redox/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/redox/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/redox/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-use std::io;
-use std::mem;
-use std::net::{TcpListener, TcpStream, UdpSocket};
-use std::os::unix::io::FromRawFd;
-use libc::{self, c_int};
-
-mod impls;
-
-pub mod c {
-    pub use libc::*;
-
-    pub fn sockaddr_in_u32(sa: &sockaddr_in) -> u32 {
-        ::ntoh((*sa).sin_addr.s_addr)
-    }
-
-    pub fn in_addr_to_u32(addr: &in_addr) -> u32 {
-        ::ntoh(addr.s_addr)
-    }
-}
-
-pub struct Socket {
-    fd: c_int,
-}
-
-impl Socket {
-    pub fn new(family: c_int, ty: c_int) -> io::Result<Socket> {
-        unsafe {
-            let fd = ::cvt(libc::socket(family, ty, 0))?;
-            let mut flags = ::cvt(libc::fcntl(fd, libc::F_GETFD))?;
-            flags |= libc::O_CLOEXEC;
-            ::cvt(libc::fcntl(fd, libc::F_SETFD, flags))?;
-            Ok(Socket { fd: fd })
-        }
-    }
-
-    pub fn raw(&self) -> c_int { self.fd }
-
-    fn into_fd(self) -> c_int {
-        let fd = self.fd;
-        mem::forget(self);
-        fd
-    }
-
-    pub fn into_tcp_listener(self) -> TcpListener {
-        unsafe { TcpListener::from_raw_fd(self.into_fd() as usize) }
-    }
-
-    pub fn into_tcp_stream(self) -> TcpStream {
-        unsafe { TcpStream::from_raw_fd(self.into_fd() as usize) }
-    }
-
-    pub fn into_udp_socket(self) -> UdpSocket {
-        unsafe { UdpSocket::from_raw_fd(self.into_fd() as usize) }
-    }
-}
-
-impl ::FromInner for Socket {
-    type Inner = usize;
-    fn from_inner(fd: usize) -> Socket {
-        Socket { fd: fd as c_int }
-    }
-}
-
-impl Drop for Socket {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libc::close(self.fd);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/unix/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/unix/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/unix/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/unix/impls.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::os::unix::io::{FromRawFd, AsRawFd};
-use libc::c_int;
-
-use {TcpBuilder, UdpBuilder, FromInner, AsInner};
-use socket::Socket;
-use sys;
-
-impl FromRawFd for TcpBuilder {
-    unsafe fn from_raw_fd(fd: c_int) -> TcpBuilder {
-        let sock = sys::Socket::from_inner(fd);
-        TcpBuilder::from_inner(Socket::from_inner(sock))
-    }
-}
-
-impl AsRawFd for TcpBuilder {
-    fn as_raw_fd(&self) -> c_int {
-        // TODO: this unwrap() is very bad
-        self.as_inner().borrow().as_ref().unwrap().as_inner().raw()
-    }
-}
-
-impl FromRawFd for UdpBuilder {
-    unsafe fn from_raw_fd(fd: c_int) -> UdpBuilder {
-        let sock = sys::Socket::from_inner(fd);
-        UdpBuilder::from_inner(Socket::from_inner(sock))
-    }
-}
-
-impl AsRawFd for UdpBuilder {
-    fn as_raw_fd(&self) -> c_int {
-        // TODO: this unwrap() is very bad
-        self.as_inner().borrow().as_ref().unwrap().as_inner().raw()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/unix/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/unix/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/unix/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/unix/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-use std::io;
-use std::mem;
-use std::net::{TcpListener, TcpStream, UdpSocket};
-use std::os::unix::io::FromRawFd;
-use libc::{self, c_int};
-#[cfg(not(any(target_os = "emscripten", target_os = "haiku", target_os = "illumos", target_os = "solaris")))]
-use libc::{ioctl, FIOCLEX};
-
-mod impls;
-
-pub mod c {
-    pub use libc::*;
-
-    pub fn sockaddr_in_u32(sa: &sockaddr_in) -> u32 {
-        ::ntoh((*sa).sin_addr.s_addr)
-    }
-
-    pub fn in_addr_to_u32(addr: &in_addr) -> u32 {
-        ::ntoh(addr.s_addr)
-    }
-}
-
-pub struct Socket {
-    fd: c_int,
-}
-
-impl Socket {
-    #[cfg(not(any(target_os = "emscripten", target_os = "haiku", target_os = "illumos", target_os = "solaris")))]
-    pub fn new(family: c_int, ty: c_int) -> io::Result<Socket> {
-        unsafe {
-            // Linux >2.6.26 overloads the type argument to accept SOCK_CLOEXEC,
-            // avoiding a race with another thread running fork/exec between
-            // socket() and ioctl()
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            match ::cvt(libc::socket(family, ty | libc::SOCK_CLOEXEC, 0)) {
-                Ok(fd) => return Ok(Socket { fd: fd }),
-                // Older versions of Linux return EINVAL; fall back to ioctl
-                Err(ref e) if e.raw_os_error() == Some(libc::EINVAL) => {}
-                Err(e) => return Err(e),
-            }
-
-            let fd = try!(::cvt(libc::socket(family, ty, 0)));
-            ioctl(fd, FIOCLEX);
-            Ok(Socket { fd: fd })
-        }
-    }
-
-    // ioctl(FIOCLEX) is not supported by Solaris/illumos or emscripten,
-    // use fcntl(FD_CLOEXEC) instead
-    #[cfg(any(target_os = "emscripten", target_os = "haiku", target_os = "illumos", target_os = "solaris"))]
-    pub fn new(family: c_int, ty: c_int) -> io::Result<Socket> {
-        unsafe {
-            let fd = try!(::cvt(libc::socket(family, ty, 0)));
-            libc::fcntl(fd, libc::FD_CLOEXEC);
-            Ok(Socket { fd: fd })
-        }
-    }
-
-    pub fn raw(&self) -> c_int { self.fd }
-
-    fn into_fd(self) -> c_int {
-        let fd = self.fd;
-        mem::forget(self);
-        fd
-    }
-
-    pub fn into_tcp_listener(self) -> TcpListener {
-        unsafe { TcpListener::from_raw_fd(self.into_fd()) }
-    }
-
-    pub fn into_tcp_stream(self) -> TcpStream {
-        unsafe { TcpStream::from_raw_fd(self.into_fd()) }
-    }
-
-    pub fn into_udp_socket(self) -> UdpSocket {
-        unsafe { UdpSocket::from_raw_fd(self.into_fd()) }
-    }
-}
-
-impl ::FromInner for Socket {
-    type Inner = c_int;
-    fn from_inner(fd: c_int) -> Socket {
-        Socket { fd: fd }
-    }
-}
-
-impl Drop for Socket {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libc::close(self.fd);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/wasi/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/wasi/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/wasi/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/wasi/impls.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-use std::os::wasi::io::{FromRawFd, AsRawFd};
-
-use {TcpBuilder, UdpBuilder, FromInner, AsInner};
-use socket::Socket;
-use sys::{self, c::__wasi_fd_t};
-
-impl FromRawFd for TcpBuilder {
-    unsafe fn from_raw_fd(fd: __wasi_fd_t) -> TcpBuilder {
-        let sock = sys::Socket::from_inner(fd);
-        TcpBuilder::from_inner(Socket::from_inner(sock))
-    }
-}
-
-impl AsRawFd for TcpBuilder {
-    fn as_raw_fd(&self) -> __wasi_fd_t {
-        // TODO: this unwrap() is very bad
-        self.as_inner().borrow().as_ref().unwrap().as_inner().raw() as __wasi_fd_t
-    }
-}
-
-impl FromRawFd for UdpBuilder {
-    unsafe fn from_raw_fd(fd: __wasi_fd_t) -> UdpBuilder {
-        let sock = sys::Socket::from_inner(fd);
-        UdpBuilder::from_inner(Socket::from_inner(sock))
-    }
-}
-
-impl AsRawFd for UdpBuilder {
-    fn as_raw_fd(&self) -> __wasi_fd_t {
-        // TODO: this unwrap() is very bad
-        self.as_inner().borrow().as_ref().unwrap().as_inner().raw() as __wasi_fd_t
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/wasi/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/wasi/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/wasi/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/wasi/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(non_camel_case_types)]
-use libc::{self, c_int, __wasi_fd_t};
-use std::io;
-use std::mem;
-use std::net::{TcpListener, TcpStream, UdpSocket};
-use std::os::wasi::io::FromRawFd;
-
-mod impls;
-
-pub mod c {
-    pub use libc::*;
-
-    pub type sa_family_t = u16;
-    pub type socklen_t = u32;
-    pub type in_port_t = u16;
-
-    pub const SOCK_DGRAM: c_int = 0x00;
-    pub const SOL_SOCKET: c_int = 0x00;
-    pub const SO_RCVBUF: c_int = 0x00;
-    pub const SO_SNDBUF: c_int = 0x00;
-    pub const TCP_NODELAY: c_int = 0x00;
-    pub const IPPROTO_TCP: c_int = 0x00;
-    pub const SO_RCVTIMEO: c_int = 0x00;
-    pub const SO_SNDTIMEO: c_int = 0x00;
-    pub const IPPROTO_IP: c_int = 0x00;
-    pub const IP_TTL: c_int = 0x00;
-    pub const IPPROTO_IPV6: c_int = 0x00;
-    pub const IPV6_V6ONLY: c_int = 0x00;
-    pub const SO_ERROR: c_int = 0x00;
-    pub const SO_LINGER: c_int = 0x00;
-    pub const SO_BROADCAST: c_int = 0x00;
-    pub const IP_MULTICAST_LOOP: c_int = 0x00;
-    pub const IP_MULTICAST_TTL: c_int = 0x00;
-    pub const IPV6_MULTICAST_HOPS: c_int = 0x00;
-    pub const IPV6_MULTICAST_LOOP: c_int = 0x00;
-    pub const IP_MULTICAST_IF: c_int = 0x00;
-    pub const IPV6_MULTICAST_IF: c_int = 0x00;
-    pub const IPV6_UNICAST_HOPS: c_int = 0x00;
-    pub const IP_ADD_MEMBERSHIP: c_int = 0x00;
-    pub const IPV6_ADD_MEMBERSHIP: c_int = 0x00;
-    pub const IP_DROP_MEMBERSHIP: c_int = 0x00;
-    pub const IPV6_DROP_MEMBERSHIP: c_int = 0x00;
-    pub const SO_REUSEADDR: c_int = 0x00;
-    pub const SOCK_STREAM: c_int = 0x00;
-    pub const AF_INET: c_int = 0x00;
-    pub const AF_INET6: c_int = 0x01;
-
-    #[repr(C)]
-    pub struct sockaddr_storage {
-        pub ss_family: sa_family_t,
-    }
-    #[repr(C)]
-    pub struct sockaddr {
-        pub sa_family: sa_family_t,
-        pub sa_data: [c_char; 14],
-    }
-
-    #[repr(C)]
-    pub struct sockaddr_in6 {
-        pub sin6_family: sa_family_t,
-        pub sin6_port: in_port_t,
-        pub sin6_flowinfo: u32,
-        pub sin6_addr: in6_addr,
-        pub sin6_scope_id: u32,
-    }
-
-    #[repr(C)]
-    pub struct sockaddr_in {
-        pub sin_family: sa_family_t,
-        pub sin_port: in_port_t,
-        pub sin_addr: in_addr,
-        pub sin_zero: [u8; 8],
-    }
-
-    #[repr(align(4))]
-    #[derive(Copy, Clone)]
-    pub struct in6_addr {
-        pub s6_addr: [u8; 16],
-    }
-
-    #[derive(Copy, Clone)]
-    pub struct ipv6_mreq {
-        pub ipv6mr_multiaddr: in6_addr,
-        pub ipv6mr_interface: c_uint,
-    }
-
-    pub type in_addr_t = u32;
-    #[derive(Copy, Clone)]
-    pub struct in_addr {
-        pub s_addr: in_addr_t,
-    }
-
-    #[derive(Copy, Clone)]
-    pub struct linger {
-        pub l_onoff: c_int,
-        pub l_linger: c_int,
-    }
-
-    #[derive(Copy, Clone)]
-    pub struct ip_mreq {
-        pub imr_multiaddr: in_addr,
-        pub imr_interface: in_addr,
-    }
-
-    pub unsafe fn getsockname(_socket: __wasi_fd_t, _address: *mut sockaddr,
-                    _address_len: *mut socklen_t) -> c_int {
-        unimplemented!()
-    }
-    pub unsafe fn connect(_socket: __wasi_fd_t, _address: *const sockaddr,
-                _len: socklen_t) -> c_int {
-        unimplemented!()
-    }
-    pub unsafe fn listen(_socket: __wasi_fd_t, _backlog: c_int) -> c_int {
-        unimplemented!()
-    }
-    pub unsafe fn bind(_socket: __wasi_fd_t, _address: *const sockaddr,
-            _address_len: socklen_t) -> c_int {
-        unimplemented!()
-    }
-
-    pub fn sockaddr_in_u32(sa: &sockaddr_in) -> u32 {
-        ::ntoh((*sa).sin_addr.s_addr)
-    }
-
-    pub fn in_addr_to_u32(addr: &in_addr) -> u32 {
-        ::ntoh(addr.s_addr)
-    }
-}
-
-pub struct Socket {
-    fd: __wasi_fd_t,
-}
-
-impl Socket {
-    pub fn new(_family: c_int, _ty: c_int) -> io::Result<Socket> {
-        unimplemented!()
-    }
-
-    pub fn raw(&self) -> libc::__wasi_fd_t {
-        self.fd
-    }
-
-    fn into_fd(self) -> libc::__wasi_fd_t {
-        let fd = self.fd;
-        mem::forget(self);
-        fd
-    }
-
-    pub fn into_tcp_listener(self) -> TcpListener {
-        unsafe { TcpListener::from_raw_fd(self.into_fd()) }
-    }
-
-    pub fn into_tcp_stream(self) -> TcpStream {
-        unsafe { TcpStream::from_raw_fd(self.into_fd()) }
-    }
-
-    pub fn into_udp_socket(self) -> UdpSocket {
-        unsafe { UdpSocket::from_raw_fd(self.into_fd()) }
-    }
-}
-
-impl ::FromInner for Socket {
-    type Inner = libc::__wasi_fd_t;
-    fn from_inner(fd: libc::__wasi_fd_t) -> Socket {
-        Socket { fd: fd }
-    }
-}
-
-impl Drop for Socket {
-    fn drop(&mut self) {
-        // unsafe {
-        //     let _ = libc::close(self.fd);
-        // }
-    }
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/windows/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/windows/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/windows/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/windows/impls.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::os::windows::io::{FromRawSocket, RawSocket, AsRawSocket};
-use winapi::um::winsock2::SOCKET;
-
-use {TcpBuilder, UdpBuilder, FromInner, AsInner};
-use socket::Socket;
-use sys;
-
-impl FromRawSocket for TcpBuilder {
-    unsafe fn from_raw_socket(fd: RawSocket) -> TcpBuilder {
-        let sock = sys::Socket::from_inner(fd as SOCKET);
-        TcpBuilder::from_inner(Socket::from_inner(sock))
-    }
-}
-
-impl AsRawSocket for TcpBuilder {
-    fn as_raw_socket(&self) -> RawSocket {
-        // TODO: this unwrap() is very bad
-        self.as_inner().borrow().as_ref().unwrap().as_inner().raw() as RawSocket
-    }
-}
-
-impl FromRawSocket for UdpBuilder {
-    unsafe fn from_raw_socket(fd: RawSocket) -> UdpBuilder {
-        let sock = sys::Socket::from_inner(fd as SOCKET);
-        UdpBuilder::from_inner(Socket::from_inner(sock))
-    }
-}
-
-impl AsRawSocket for UdpBuilder {
-    fn as_raw_socket(&self) -> RawSocket {
-        // TODO: this unwrap() is very bad
-        self.as_inner().borrow().as_ref().unwrap().as_inner().raw() as RawSocket
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/windows/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/windows/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/sys/windows/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/sys/windows/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(bad_style)]
-
-use std::io;
-use std::mem;
-use std::net::{TcpListener, TcpStream, UdpSocket};
-use std::os::windows::io::{RawSocket, FromRawSocket};
-use std::sync::{Once, ONCE_INIT};
-
-const HANDLE_FLAG_INHERIT: DWORD = 0x00000001;
-
-pub mod c {
-    pub use winapi::ctypes::*;
-    pub use winapi::um::handleapi::*;
-    pub use winapi::um::winbase::*;
-    pub use winapi::um::winsock2::*;
-    pub use winapi::um::ws2tcpip::*;
-    
-    pub use winapi::shared::inaddr::*;
-    pub use winapi::shared::in6addr::*;
-    pub use winapi::shared::minwindef::*;
-    pub use winapi::shared::ntdef::*;
-    pub use winapi::shared::ws2def::*;
-    pub use winapi::shared::ws2def::{SOCK_STREAM, SOCK_DGRAM};
-    pub use winapi::shared::ws2def::SOCKADDR as sockaddr;
-    pub use winapi::shared::ws2def::SOCKADDR_STORAGE as sockaddr_storage;
-    pub use winapi::shared::ws2def::SOCKADDR_IN as sockaddr_in;
-    pub use winapi::shared::ws2def::ADDRESS_FAMILY as sa_family_t;
-    pub use winapi::shared::ws2ipdef::*;
-    pub use winapi::shared::ws2ipdef::SOCKADDR_IN6_LH as sockaddr_in6;
-    pub use winapi::shared::ws2ipdef::IP_MREQ as ip_mreq;
-    pub use winapi::shared::ws2ipdef::IPV6_MREQ as ipv6_mreq;
-
-    pub fn sockaddr_in_u32(sa: &sockaddr_in) -> u32 {
-        ::ntoh(unsafe { *sa.sin_addr.S_un.S_addr() })
-    }
-
-    pub fn in_addr_to_u32(addr: &in_addr) -> u32 {
-        ::ntoh(unsafe { *addr.S_un.S_addr() })
-    }
-}
-
-use self::c::*;
-
-mod impls;
-
-fn init() {
-    static INIT: Once = ONCE_INIT;
-
-    INIT.call_once(|| {
-        // Initialize winsock through the standard library by just creating a
-        // dummy socket. Whether this is successful or not we drop the result as
-        // libstd will be sure to have initialized winsock.
-        let _ = UdpSocket::bind("127.0.0.1:34254");
-    });
-}
-
-pub struct Socket {
-    socket: SOCKET,
-}
-
-impl Socket {
-    pub fn new(family: c_int, ty: c_int) -> io::Result<Socket> {
-        init();
-        let socket = try!(unsafe {
-            match WSASocketW(family, ty, 0, 0 as *mut _, 0,
-                             WSA_FLAG_OVERLAPPED) {
-                INVALID_SOCKET => Err(io::Error::last_os_error()),
-                n => Ok(Socket { socket: n }),
-            }
-        });
-        try!(socket.set_no_inherit());
-        Ok(socket)
-    }
-
-    pub fn raw(&self) -> SOCKET { self.socket }
-
-    fn into_socket(self) -> SOCKET {
-        let socket = self.socket;
-        mem::forget(self);
-        socket
-    }
-
-    pub fn into_tcp_listener(self) -> TcpListener {
-        unsafe { TcpListener::from_raw_socket(self.into_socket() as RawSocket) }
-    }
-
-    pub fn into_tcp_stream(self) -> TcpStream {
-        unsafe { TcpStream::from_raw_socket(self.into_socket() as RawSocket) }
-    }
-
-    pub fn into_udp_socket(self) -> UdpSocket {
-        unsafe { UdpSocket::from_raw_socket(self.into_socket() as RawSocket) }
-    }
-
-    fn set_no_inherit(&self) -> io::Result<()> {
-        ::cvt_win(unsafe {
-            SetHandleInformation(self.socket as HANDLE, HANDLE_FLAG_INHERIT, 0)
-        }).map(|_| ())
-    }
-}
-
-impl ::FromInner for Socket {
-    type Inner = SOCKET;
-    fn from_inner(socket: SOCKET) -> Socket {
-        Socket { socket: socket }
-    }
-}
-
-impl Drop for Socket {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = closesocket(self.socket);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/tcp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/tcp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/tcp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/tcp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::cell::RefCell;
-use std::io;
-use std::net::{SocketAddr, ToSocketAddrs, TcpListener, TcpStream};
-use std::fmt;
-
-use IntoInner;
-use socket::Socket;
-use sys::c;
-
-/// An "in progress" TCP socket which has not yet been connected or listened.
-///
-/// Allows configuration of a socket before one of these operations is executed.
-pub struct TcpBuilder {
-    socket: RefCell<Option<Socket>>,
-}
-
-impl TcpBuilder {
-    /// Constructs a new TcpBuilder with the `AF_INET` domain, the `SOCK_STREAM`
-    /// type, and with a protocol argument of 0.
-    ///
-    /// Note that passing other kinds of flags or arguments can be done through
-    /// the `FromRaw{Fd,Socket}` implementation.
-    pub fn new_v4() -> io::Result<TcpBuilder> {
-        Socket::new(c::AF_INET, c::SOCK_STREAM).map(::FromInner::from_inner)
-    }
-
-    /// Constructs a new TcpBuilder with the `AF_INET6` domain, the `SOCK_STREAM`
-    /// type, and with a protocol argument of 0.
-    ///
-    /// Note that passing other kinds of flags or arguments can be done through
-    /// the `FromRaw{Fd,Socket}` implementation.
-    pub fn new_v6() -> io::Result<TcpBuilder> {
-        Socket::new(c::AF_INET6, c::SOCK_STREAM).map(::FromInner::from_inner)
-    }
-
-    /// Binds this socket to the specified address.
-    ///
-    /// This function directly corresponds to the bind(2) function on Windows
-    /// and Unix.
-    pub fn bind<T>(&self, addr: T) -> io::Result<&TcpBuilder>
-        where T: ToSocketAddrs
-    {
-        self.with_socket(|sock| {
-            let addr = try!(::one_addr(addr));
-            sock.bind(&addr)
-        }).map(|()| self)
-    }
-
-    /// Mark a socket as ready to accept incoming connection requests using
-    /// accept()
-    ///
-    /// This function directly corresponds to the listen(2) function on Windows
-    /// and Unix.
-    ///
-    /// An error will be returned if `listen` or `connect` has already been
-    /// called on this builder.
-    pub fn listen(&self, backlog: i32) -> io::Result<TcpListener> {
-        self.with_socket(|sock| {
-            sock.listen(backlog)
-        }).and_then(|()| {
-            self.to_tcp_listener()
-        })
-    }
-
-    /// Initiate a connection on this socket to the specified address.
-    ///
-    /// This function directly corresponds to the connect(2) function on Windows
-    /// and Unix.
-    ///
-    /// An error will be returned if `listen` or `connect` has already been
-    /// called on this builder.
-    pub fn connect<T>(&self, addr: T) -> io::Result<TcpStream>
-        where T: ToSocketAddrs
-    {
-        self.with_socket(|sock| {
-            let err = io::Error::new(io::ErrorKind::Other,
-                                     "no socket addresses resolved");
-            try!(addr.to_socket_addrs()).fold(Err(err), |prev, addr| {
-                prev.or_else(|_| sock.connect(&addr))
-            })
-        }).and_then(|()| {
-            self.to_tcp_stream()
-        })
-    }
-
-    /// Converts this builder into a `TcpStream`
-    ///
-    /// This function will consume the internal socket and return it re-wrapped
-    /// as a `TcpStream`. An error will be returned if the internal socket has
-    /// already been consumed from a successful call to `connect`, `listen`,
-    /// etc.
-    pub fn to_tcp_stream(&self) -> io::Result<TcpStream> {
-        self.socket.borrow_mut().take().map(|s| s.into_inner().into_tcp_stream())
-            .ok_or(io::Error::new(io::ErrorKind::Other,
-                                  "socket has already been consumed"))
-    }
-
-    /// Converts this builder into a `TcpListener`
-    ///
-    /// This function will consume the internal socket and return it re-wrapped
-    /// as a `TcpListener`. An error will be returned if the internal socket has
-    /// already been consumed from a successful call to `connect`, `listen`,
-    /// etc.
-    pub fn to_tcp_listener(&self) -> io::Result<TcpListener> {
-        self.socket.borrow_mut().take()
-            .map(|s| s.into_inner().into_tcp_listener())
-            .ok_or(io::Error::new(io::ErrorKind::Other,
-                                  "socket has already been consumed"))
-    }
-
-    /// Returns the address of the local half of this TCP socket.
-    ///
-    /// An error will be returned if `listen` or `connect` has already been
-    /// called on this builder.
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        match *self.socket.borrow() {
-            Some(ref s) => s.getsockname(),
-            None => Err(io::Error::new(io::ErrorKind::Other,
-                                       "builder has already finished its socket")),
-        }
-    }
-
-    fn with_socket<F>(&self, f: F) -> io::Result<()>
-        where F: FnOnce(&Socket) -> io::Result<()>
-    {
-        match *self.socket.borrow() {
-            Some(ref s) => f(s),
-            None => Err(io::Error::new(io::ErrorKind::Other,
-                                       "builder has already finished its socket")),
-        }
-    }
-}
-
-impl fmt::Debug for TcpBuilder {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "TcpBuilder {{ socket: {:?} }}",
-               self.socket.borrow().as_ref().unwrap())
-    }
-}
-
-impl ::AsInner for TcpBuilder {
-    type Inner = RefCell<Option<Socket>>;
-    fn as_inner(&self) -> &RefCell<Option<Socket>> { &self.socket }
-}
-
-impl ::FromInner for TcpBuilder {
-    type Inner = Socket;
-    fn from_inner(sock: Socket) -> TcpBuilder {
-        TcpBuilder { socket: RefCell::new(Some(sock)) }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/udp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/udp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::cell::RefCell;
-use std::fmt;
-use std::io;
-use std::net::{ToSocketAddrs, UdpSocket};
-
-use IntoInner;
-use socket::Socket;
-use sys::c;
-
-/// An "in progress" UDP socket which has not yet been connected.
-///
-/// Allows configuration of a socket before the socket is connected.
-pub struct UdpBuilder {
-    socket: RefCell<Option<Socket>>,
-}
-
-impl UdpBuilder {
-    /// Constructs a new UdpBuilder with the `AF_INET` domain, the `SOCK_DGRAM`
-    /// type, and with a protocol argument of 0.
-    ///
-    /// Note that passing other kinds of flags or arguments can be done through
-    /// the `FromRaw{Fd,Socket}` implementation.
-    pub fn new_v4() -> io::Result<UdpBuilder> {
-        Socket::new(c::AF_INET, c::SOCK_DGRAM).map(::FromInner::from_inner)
-    }
-
-    /// Constructs a new UdpBuilder with the `AF_INET6` domain, the `SOCK_DGRAM`
-    /// type, and with a protocol argument of 0.
-    ///
-    /// Note that passing other kinds of flags or arguments can be done through
-    /// the `FromRaw{Fd,Socket}` implementation.
-    pub fn new_v6() -> io::Result<UdpBuilder> {
-        Socket::new(c::AF_INET6, c::SOCK_DGRAM).map(::FromInner::from_inner)
-    }
-
-    /// Binds this socket to the specified address.
-    ///
-    /// This function directly corresponds to the bind(2) function on Windows
-    /// and Unix.
-    pub fn bind<T>(&self, addr: T) -> io::Result<UdpSocket>
-        where T: ToSocketAddrs
-    {
-        try!(self.with_socket(|sock| {
-            let addr = try!(::one_addr(addr));
-            sock.bind(&addr)
-        }));
-        Ok(self.socket.borrow_mut().take().unwrap().into_inner().into_udp_socket())
-    }
-
-    fn with_socket<F>(&self, f: F) -> io::Result<()>
-        where F: FnOnce(&Socket) -> io::Result<()>
-    {
-        match *self.socket.borrow() {
-            Some(ref s) => f(s),
-            None => Err(io::Error::new(io::ErrorKind::Other,
-                                       "builder has already finished its socket")),
-        }
-    }
-}
-
-impl fmt::Debug for UdpBuilder {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "UdpBuilder {{ socket: {:?} }}",
-               self.socket.borrow().as_ref().unwrap())
-    }
-}
-
-impl ::AsInner for UdpBuilder {
-    type Inner = RefCell<Option<Socket>>;
-    fn as_inner(&self) -> &RefCell<Option<Socket>> { &self.socket }
-}
-
-impl ::FromInner for UdpBuilder {
-    type Inner = Socket;
-    fn from_inner(sock: Socket) -> UdpBuilder {
-        UdpBuilder { socket: RefCell::new(Some(sock)) }
-    }
-}
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/unix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/unix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/unix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/unix.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-//! Unix-specific extensions to the `std::net` types.
-
-use std::io;
-use sys::c::{self, c_int};
-
-use {TcpBuilder, UdpBuilder};
-use ext::{self, AsSock};
-
-/// Unix-specific extensions for the `TcpBuilder` type in this library.
-pub trait UnixTcpBuilderExt {
-    /// Set value for the `SO_REUSEPORT` option on this socket.
-    ///
-    /// This indicates that further calls to `bind` may allow reuse of local
-    /// addresses. For IPv4 sockets this means that a socket may bind even when
-    /// there's a socket already listening on this port.
-    fn reuse_port(&self, reuse: bool) -> io::Result<&Self>;
-
-    /// Check the value of the `SO_REUSEPORT` option on this socket.
-    fn get_reuse_port(&self) -> io::Result<bool>;
-}
-
-impl UnixTcpBuilderExt for TcpBuilder {
-    fn reuse_port(&self, reuse: bool) -> io::Result<&Self> {
-        ext::set_opt(self.as_sock(), c::SOL_SOCKET, c::SO_REUSEPORT,
-                    reuse as c_int).map(|()| self)
-    }
-
-    fn get_reuse_port(&self) -> io::Result<bool> {
-        ext::get_opt(self.as_sock(), c::SOL_SOCKET, c::SO_REUSEPORT)
-            .map(ext::int2bool)
-    }
-}
-
-/// Unix-specific extensions for the `UdpBuilder` type in this library.
-pub trait UnixUdpBuilderExt {
-    /// Set value for the `SO_REUSEPORT` option on this socket.
-    ///
-    /// This indicates that further calls to `bind` may allow reuse of local
-    /// addresses. For IPv4 sockets this means that a socket may bind even when
-    /// there's a socket already listening on this port.
-    fn reuse_port(&self, reuse: bool) -> io::Result<&Self>;
-
-    /// Check the value of the `SO_REUSEPORT` option on this socket.
-    fn get_reuse_port(&self) -> io::Result<bool>;
-}
-
-impl UnixUdpBuilderExt for UdpBuilder {
-    fn reuse_port(&self, reuse: bool) -> io::Result<&Self> {
-        ext::set_opt(self.as_sock(), c::SOL_SOCKET, c::SO_REUSEPORT,
-                    reuse as c_int).map(|()| self)
-    }
-
-    fn get_reuse_port(&self) -> io::Result<bool> {
-        ext::get_opt(self.as_sock(), c::SOL_SOCKET, c::SO_REUSEPORT)
-            .map(ext::int2bool)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/net2/src/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/net2/src/utils.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-#[doc(hidden)]
-pub trait NetInt {
-    fn from_be(i: Self) -> Self;
-    fn to_be(&self) -> Self;
-}
-macro_rules! doit {
-    ($($t:ident)*) => ($(impl NetInt for $t {
-        fn from_be(i: Self) -> Self { <$t>::from_be(i) }
-        fn to_be(&self) -> Self { <$t>::to_be(*self) }
-    })*)
-}
-doit! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
-
-#[doc(hidden)]
-pub trait One {
-    fn one() -> Self;
-}
-
-macro_rules! one {
-    ($($t:ident)*) => ($(
-        impl One for $t { fn one() -> $t { 1 } }
-    )*)
-}
-
-one! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
-
-
-#[doc(hidden)]
-pub trait Zero {
-    fn zero() -> Self;
-}
-
-macro_rules! zero {
-    ($($t:ident)*) => ($(
-        impl Zero for $t { fn zero() -> $t { 0 } }
-    )*)
-}
-
-zero! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.lock":"438cea17a96e11f787f827aab8c4fe2d096d75b1db95b5749339b9d2b2554d5b","Cargo.toml":"bcaf0900427df4f1e1f61bfaf99ec22422be14b97432ace1287e52803e9c6f0b","LICENSE-MIT":"f7715d38a3fa1b4ac97c5729740752505a39cb92ee83ab5b102aeb5eaa7cdea4","README.md":"614d60e78bd8c3d8172b2650f86d44c703471dab8a35805736861f09158e5501","examples/simple.rs":"f1fac7f8308469568b601218ea03d213584f0a51b779a3bcb78ecb40ede72483","src/lib.rs":"5a2cbd34e3a52ea1a8e1b31dd34c5ec31ce549fec30f60a0e20b87d8138da416","tests/check.rs":"323e500890599105193b6b07563a2c570ea0cc56342c81670075e5fd2ff467d1"},"package":"e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "new_debug_unreachable"
+version = "1.0.4"
+authors = ["Matt Brubeck <mbrubeck@limpet.net>", "Jonathan Reem <jonathan.reem@gmail.com>"]
+description = "panic in debug, intrinsics::unreachable() in release (fork of debug_unreachable)"
+documentation = "https://docs.rs/new_debug_unreachable"
+readme = "README.md"
+license = "MIT"
+repository = "https://github.com/mbrubeck/rust-debug-unreachable"
+
+[lib]
+name = "debug_unreachable"
+path = "src/lib.rs"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/examples/simple.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/examples/simple.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/examples/simple.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/examples/simple.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+use debug_unreachable::debug_unreachable;
+
+fn main() {
+    if 0 > 100 {
+        // Can't happen!
+        unsafe { debug_unreachable!() }
+    } else {
+        println!("Good, 0 <= 100.");
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2015 Jonathan Reem
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+# new_debug_unreachable
+
+> unreachable!() in debug, std::intrinsics::unreachable() in release.
+
+This is a fork of [`debug_unreachable`](https://crates.io/crates/debug_unreachable).
+
+## [Documentation](https://docs.rs/new_debug_unreachable)
+
+## Usage
+
+Use the crates.io repository; add this to your `Cargo.toml` along
+with the rest of your dependencies:
+
+```toml
+[dependencies]
+new_debug_unreachable = "1.0"
+```
+
+In your Rust code, the library name is still `debug_unreachable`:
+
+```rust
+use debug_unreachable::debug_unreachable;
+
+fn main() {
+    if 0 > 100 {
+        // Can't happen!
+        unsafe { debug_unreachable!() }
+    } else {
+        println!("Good, 0 <= 100.");
+    }
+}
+```
+
+## Author
+
+[Jonathan Reem](https://medium.com/@jreem) is the original author of debug-unreachable.
+
+[Matt Brubeck](https://limpet.net/mbrubeck/) is the maintainer of this fork.
+
+## License
+
+MIT
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+#![deny(missing_docs, warnings)]
+
+#![no_std]
+
+//! `panic!()` in debug builds, optimization hint in release.
+
+#[doc(hidden)] pub mod _internal { pub use core::hint::unreachable_unchecked; }
+
+#[macro_export]
+/// `panic!()` in debug builds, optimization hint in release.
+///
+/// Example:
+///
+/// ```
+/// use debug_unreachable::debug_unreachable;
+///
+/// fn main() {
+///     if 0 > 100 {
+///         // Can't happen!
+///         unsafe { debug_unreachable!() }
+///     } else {
+///         println!("Good, 0 <= 100.");
+///     }
+/// }
+/// ```
+macro_rules! debug_unreachable {
+    () => { debug_unreachable!("entered unreachable code") };
+    ($e:expr) => {
+        if cfg!(debug_assertions) {
+            panic!($e)
+        } else {
+            $crate::_internal::unreachable_unchecked()
+        }
+    }
+}
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/tests/check.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/tests/check.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/new_debug_unreachable/tests/check.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/new_debug_unreachable/tests/check.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+#[test]
+#[should_panic]
+#[cfg(debug_assertions)]
+fn explodes_in_debug() {
+    use debug_unreachable::debug_unreachable;
+    unsafe { debug_unreachable!() }
+}
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+extern crate version_check;
+
+fn main() {
+  if version_check::is_min_version("1.44.0").unwrap_or(true) {
+    println!("cargo:rustc-cfg=stable_i128");
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{".travis.yml":"d42be3314463c8292b8007849abbcfa7eb2859d725208bab29f8e6f5b4350d9b","CHANGELOG.md":"b394a89cd25428f9e50b38d37568bf21308c64f8584f6f4bf57daafb7678da22","Cargo.lock":"73ee56320ac53ea573c0b5c9c439c70eef4d4ca198e175b780465a1d40f60353","Cargo.toml":"a85416a91ebdb8cebae50d31c1ce77517de2bcaac6ad9561b3e54a2902315990","LICENSE":"4dbda04344456f09a7a588140455413a9ac59b6b26a1ef7cdf9c800c012d87f0","README.md":"1877d3bf37aa2ad1cbb7126d125a3d05dddc5845b68395a39014020b864fe2fe","build.rs":"a5af84de9e65e08b88127f99f6cb5ed9a84506b115f60be4a59c918471cc8c48","doc/nom_recipes.md":"9e0313c79b97fe9678b0d13bb666793170dcdffb9257a2d597a4a733c0551d4d","src/bits/complete.rs":"f5e35d32c3c370510445c7708ec5ff55ce3387aaf8a147b73b26b1bc5a5e171c","src/bits/macros.rs":"82896ae14c47735b906b81517cd49eb87423a5b874dff5a685383fb80427a3aa","src/bits/mod.rs":"490a8595bec6ad0c64ba088452f6a7ebd8846e7d3d48d61432af651e912d186c","src/bits/streaming.rs":"de63b314a893e414b61ba989bfc368136ea2759556d676cb2caad492c3ab7a34","src/branch/macros.rs":"2575b30b2b4a280014cce9b150b25180129ca3df22eb108a59fc4e6e840aeb2e","src/branch/mod.rs":"f2ff0eb5118ea3ecfc64cd522d6c25fabfc3ad4ce5c3ec66b24b80df116e951a","src/bytes/complete.rs":"7a8262ecd25cb4de5c4633681ad2d6e8953fd30545bafd5fc08ba175e8fe7160","src/bytes/macros.rs":"45e2d5c34daff2b1cc667a7908412f5ce05168fb3921e803f6464b49c03f916d","src/bytes/mod.rs":"2eea884d8b95f7caa831f29e918a1cfba112ca22fb842d1999e53aecacc8f6b7","src/bytes/streaming.rs":"7518cbd11f74f392dca9a707196618a909bc9ac6858a78f1efbb0c2ab4f96a2e","src/character/complete.rs":"61a35ab0ba05c2d230bfb4ee580dd44c352cbe3e00c10cddac59867dc835a619","src/character/macros.rs":"46f520da5d8c9443ed0a7e6f7f887729add4f444625727cf4931425c0e1b3afa","src/character/mod.rs":"4758410eb87ec505e616109f8b4bab0c28ce0cec6dd0f200c712d19e0d64f159","src/character/streaming.rs":"011edf543463456e808a7bdd07da2b97ba189270cddad57eb0965ed63987a6af","src/combinator/macros.rs":"67c598cb9568724b9701c4b400314f06faf81379f9c4cd3631860f727636a1ab","src/combinator/mod.rs":"4569cfe8e84d49dff348c8e65f75a870af1e9acd14d76c217e5ed577df6e1ca1","src/error.rs":"6524cada484c5a9eade3271f9c711c9b49bea7d84985c617e2afa6094cb3d474","src/internal.rs":"a03a2f50a661b79f74591b87438dd65c446f237102db5ff3d8033cee5079568e","src/lib.rs":"f653ce94b759a6e1faa9675e848150ae89641f5ea2c9377386adca4e8d78822b","src/multi/macros.rs":"e2cfd7daca17e4d994e17d6636774ed75ce9a0588fdada09f3026d515d06981b","src/multi/mod.rs":"da98e73e0eb9d245f04faf2d4bb346fdcf95f7349fbdfe409f5690a004b3a900","src/number/complete.rs":"fb7d1153ac6795acf8639e2d072ebb6b66a9c0d7b4aec56bed79dfe7f3598a5b","src/number/macros.rs":"565bdd351415a10f72d0d954e41d6edcc12d1f5d315ec952b163f208a9e2849f","src/number/mod.rs":"250acd33777fbb110db438c1be023335a46cf35859ae658b6ce5edf477d95d36","src/number/streaming.rs":"9b3c4002fee0802d5923fdcc0f40af9aee65116057034978784bd1ba0e57d47e","src/regexp/macros.rs":"3455d52e2564b8ab9a440c512ce3bc8370ecaf8dc314d360721ee202882ac458","src/regexp/mod.rs":"60ce2214dceb8b83f9a38d9124ed2855ddff26992ddc3c3674eafb9c22b7e3c3","src/sequence/macros.rs":"c53b433ed41f4823b7316a450d43de567db01ea5d16288afa7352889d4e44615","src/sequence/mod.rs":"87e5397fc633892ce80c184f4ac48c063d07b636d5f912c13b94195dd16a9cac","src/str.rs":"005fa4185bd1b05244b5d038a9b616a46c308160561ba0a91d625e8152c8fbe9","src/traits.rs":"1701402896d4350fc7068a893a2e8cc04a07ea35f3c5d87fe6e8c07b63e4d6b5","src/util.rs":"581d7c5d2fca708e7c04bb519e09e1a95920618082f0c79123ed5c18427bcf86","tests/arithmetic.rs":"7e49c0f01edcb4395c465b817fdfb0be650939dd23ba5cd39fa450ea963febfd","tests/arithmetic_ast.rs":"0fd86cf6fd674d999057e8ea0c37c07c5db5462f2449bb892d63390f312bc02b","tests/bitstream.rs":"ccaa880c6bf22a1672615e379ae14519d796df5e374eb97eefe05e7a56aab1e0","tests/blockbuf-arithmetic.rs":"099fdf75da97ae032006d8c82ea2207265c5161a08d1370e1ddddb01e73afaf4","tests/css.rs":"25225bbc0dcc5df42938b1a0b122277d01134356e8da106c0885336fb48d8f1c","tests/custom_errors.rs":"3ed0bdf11d25c9763e7a8e6d483d078761dd935d504042097c4d99c71e631dfe","tests/escaped.rs":"c25987ea6d9a7dde74d58a49c332d223da3a495569cb79e3fe921bce51729ead","tests/float.rs":"544a71e78594990c335f6e57e8c648918ca9f0de97625886a946ad90bc020300","tests/fnmut.rs":"c8ee3f9f4036a7bc1662c10e370c092c269529afd878ef7a4bd20460fd083db8","tests/inference.rs":"5a042bca67efe102de271ad2141b8c62340abfc2616722d34c199479da22eefe","tests/ini.rs":"89220678c57e15432b9e4df13729aeb26373e27c0149fa2afb8252a3664f0a20","tests/ini_str.rs":"5d06688889fecabd77a43d428776eab6c3c1941626416178da8fae246c66ca17","tests/issues.rs":"194799d06880cabf56d30e1693139013a1003530adadf1d718198c95993e72de","tests/json.rs":"2a5227216036e28bcff982d2c691346bae2a8d8678e0c088798cb3c773caf4ee","tests/mp4.rs":"802168de1363c42883076a4122d292d8c6f675546f595ad29e1f1b9a34b97c93","tests/multiline.rs":"6a89d3e2cc9b59c0b10993088b396f26a4ef4ad218a44d22284421376a498ec4","tests/named_args.rs":"8b4265ac687eadcac1ef93be3a10ea2ca31aa7119afc14fc4463af3c70e7324c","tests/overflow.rs":"124d503e66e05bb027c332ad5050cc7f5aea4492c8db74430c34b9af12bee1ec","tests/reborrow_fold.rs":"9328deafc2143c2a2d1a0be86e2448b644cffcb5f0935c8b24eb469f1f9477c0","tests/test1.rs":"06fc9e52638f16bfc3ef69cd26b927e0cf55706d6f132ab7c0f1072208475853"},"package":"e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,774 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "bitvec"
+version = "0.19.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "bstr"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
+dependencies = [
+ "lazy_static",
+ "memchr",
+ "regex-automata",
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "099e596ef14349721d9016f6b80dd3419ea1bf289ab9b44df8e4dfd3a005d5d9"
+
+[[package]]
+name = "byteorder"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
+
+[[package]]
+name = "cast"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
+dependencies = [
+ "rustc_version",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "bitflags",
+ "textwrap",
+ "unicode-width",
+]
+
+[[package]]
+name = "const_fn"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
+
+[[package]]
+name = "criterion"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
+dependencies = [
+ "atty",
+ "cast",
+ "clap",
+ "criterion-plot",
+ "csv",
+ "itertools 0.10.0",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_cbor",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
+dependencies = [
+ "cast",
+ "itertools 0.9.0",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
+dependencies = [
+ "cfg-if",
+ "const_fn",
+ "crossbeam-utils",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "lazy_static",
+]
+
+[[package]]
+name = "csv"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97"
+dependencies = [
+ "bstr",
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "fs_extra"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
+
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
+[[package]]
+name = "half"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itertools"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+
+[[package]]
+name = "jemalloc-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
+dependencies = [
+ "cc",
+ "fs_extra",
+ "libc",
+]
+
+[[package]]
+name = "jemallocator"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
+dependencies = [
+ "jemalloc-sys",
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cfb73131c35423a367daf8cbd24100af0d077668c8c2943f0e7dd775fef0f65"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lexical-core"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374"
+dependencies = [
+ "arrayvec",
+ "bitflags",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "memoffset"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "nom"
+version = "6.1.2"
+dependencies = [
+ "bitvec",
+ "criterion",
+ "doc-comment",
+ "funty",
+ "jemallocator",
+ "lazy_static",
+ "lexical-core",
+ "memchr",
+ "regex",
+ "version_check",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+
+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+
+[[package]]
+name = "plotters"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
+[[package]]
+name = "rayon"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
+]
+
+[[package]]
+name = "regex"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.123"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
+
+[[package]]
+name = "serde_cbor"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
+dependencies = [
+ "half",
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.123"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "syn"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2ada8616fad06a2d0c455adc530de4ef57605a8120cc65da9653e0e9623ca74"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "version_check"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+
+[[package]]
+name = "walkdir"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+dependencies = [
+ "same-file",
+ "winapi",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7"
+dependencies = [
+ "bumpalo",
+ "lazy_static",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
+
+[[package]]
+name = "web-sys"
+version = "0.3.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c40dc691fc48003eba817c38da7113c15698142da971298003cac3ef175680b3"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,200 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "nom"
+version = "6.1.2"
+authors = ["contact@geoffroycouprie.com"]
+include = ["CHANGELOG.md", "LICENSE", "README.md", ".gitignore", ".travis.yml", "Cargo.toml", "src/*.rs", "src/*/*.rs", "tests/*.rs", "doc/nom_recipes.md", "build.rs"]
+autoexamples = false
+description = "A byte-oriented, zero-copy, parser combinators library"
+documentation = "https://docs.rs/nom"
+readme = "README.md"
+keywords = ["parser", "parser-combinators", "parsing", "streaming", "bit"]
+categories = ["parsing"]
+license = "MIT"
+repository = "https://github.com/Geal/nom"
+[package.metadata.docs.rs]
+all-features = true
+features = ["alloc", "std", "regexp", "lexical", "docsrs"]
+[profile.bench]
+lto = true
+codegen-units = 1
+debug = true
+
+[lib]
+bench = false
+
+[[example]]
+name = "json"
+path = "examples/json.rs"
+required-features = ["alloc"]
+
+[[example]]
+name = "s_expression"
+path = "examples/s_expression.rs"
+required-features = ["alloc"]
+
+[[example]]
+name = "string"
+path = "examples/string.rs"
+required-features = ["alloc"]
+
+[[test]]
+name = "arithmetic"
+
+[[test]]
+name = "arithmetic_ast"
+required-features = ["alloc"]
+
+[[test]]
+name = "blockbuf-arithmetic"
+
+[[test]]
+name = "css"
+
+[[test]]
+name = "custom_errors"
+
+[[test]]
+name = "float"
+
+[[test]]
+name = "inference"
+
+[[test]]
+name = "ini"
+required-features = ["alloc"]
+
+[[test]]
+name = "ini_str"
+required-features = ["alloc"]
+
+[[test]]
+name = "issues"
+required-features = ["alloc"]
+
+[[test]]
+name = "json"
+
+[[test]]
+name = "mp4"
+required-features = ["alloc"]
+
+[[test]]
+name = "multiline"
+required-features = ["alloc"]
+
+[[test]]
+name = "named_args"
+
+[[test]]
+name = "overflow"
+
+[[test]]
+name = "reborrow_fold"
+
+[[test]]
+name = "test1"
+
+[[test]]
+name = "fnmut"
+required-features = ["alloc"]
+
+[[bench]]
+name = "arithmetic"
+path = "benches/arithmetic.rs"
+harness = false
+
+[[bench]]
+name = "number"
+path = "benches/number.rs"
+harness = false
+
+[[bench]]
+name = "http"
+path = "benches/http.rs"
+harness = false
+
+[[bench]]
+name = "ini"
+path = "benches/ini.rs"
+harness = false
+
+[[bench]]
+name = "ini_complete"
+path = "benches/ini_complete.rs"
+harness = false
+
+[[bench]]
+name = "ini_str"
+path = "benches/ini_str.rs"
+harness = false
+
+[[bench]]
+name = "json"
+path = "benches/json.rs"
+harness = false
+[dependencies.bitvec]
+version = "0.19.3"
+optional = true
+default-features = false
+
+[dependencies.funty]
+version = ">1.0, <=1.1"
+optional = true
+default-features = false
+
+[dependencies.lazy_static]
+version = "^1.0"
+optional = true
+
+[dependencies.lexical-core]
+version = ">= 0.6, < 0.8"
+optional = true
+
+[dependencies.memchr]
+version = "^2.0"
+default-features = false
+
+[dependencies.regex]
+version = "^1.0"
+optional = true
+[dev-dependencies.criterion]
+version = "0.3"
+
+[dev-dependencies.doc-comment]
+version = "0.3"
+
+[dev-dependencies.jemallocator]
+version = "^0.3"
+[build-dependencies.version_check]
+version = "0.9"
+
+[features]
+alloc = ["bitvec/alloc", "funty"]
+default = ["std", "bitvec", "lexical"]
+docsrs = []
+lexical = ["lexical-core"]
+regexp = ["regex"]
+std = ["alloc", "bitvec/std", "memchr/use_std"]
+[badges.coveralls]
+branch = "master"
+repository = "Geal/nom"
+service = "github"
+
+[badges.maintenance]
+status = "actively-developed"
+
+[badges.travis-ci]
+repository = "Geal/nom"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1324 @@
+# Change Log
+
+## [Unreleased][unreleased]
+
+### Thanks
+
+### Changed
+
+## 6.0.1 - 2020-11-24
+
+### Thanks
+
+This release was done thanks to the hard work of (by order of appearance in the commit list):
+
+- @Leonqn
+- @nickelc
+- @toshokan
+- @juchiast
+- @shssoichiro
+- @jlkiri
+- @chifflier
+- @fkloiber
+- @Kaoet
+- @Matthew Plant
+
+### Added
+
+- `ErrorConvert` implementation for `VerboseError`
+
+### Changed
+
+- CI fixes
+- `fold_many*` now accept `FnMut` for the accumulation function
+- relaxed input bounds on `length_count`
+
+# Fixed
+
+- documentation fixes
+- the `#[deprecated]` attribute was removed from traits because it does not compile anymore on nightly
+- bits and bytes combinators from the bits modules are now converted to use `FnMut`
+
+## 6.0.0 - 2020-10-31
+
+### Thanks
+
+This release was done thanks to the hard work of (by order of appearance in the commit list):
+- @chifflier
+- @shepmaster
+- @amerelo
+- @razican
+- @Palladinium
+- @0ndorio
+- Sebastian Zivota
+- @keruspe
+- @devonhollowood
+- @parasyte
+- @nnt0
+- @AntoineCezar
+- @GuillaumeGomez
+- @eijebong
+- @stadelmanma
+- @sphynx
+- @snawaz
+- @fosskers
+- @JamesHarrison
+- @calebsander
+- @jthornber
+- @ahmedcharles
+- @rljacobson
+- @benkay86
+- @georgeclaghorn
+- @TianyiShi2001
+- @shnewto
+- @alfriadox
+- @resistor
+- @myrrlyn
+- @chipsenkbeil
+- @ruza-net
+- @fanf2
+- @jameysharp
+- @FallenWarrior2k
+- @jmg-duarte
+- @ericseppanen
+- @hbina
+- Andreas Molzer
+- @nickelc
+- @bgourlie
+
+## Notable changes
+
+This release is a more polished version of nom 5, that came with a focus on
+function parsers, by relaxing the requirements: combinators will return a
+`impl FnMut` instead of `impl Fn`, allowing closures that change their context,
+and parsers can be any type now, as long as they implement the new `Parser` trait.
+That parser trait also comes with a few helper methods.
+
+Error management was often a pain point, so a lot of work went into making it easier.
+Now it integrates with `std:error::Error`, the `IResult::finish()` method allows you
+to convert to a more usable type, the `into` combinator can convert the error type
+if there's a `From` implementation, and there are more specific error traits like
+`ContextError` for the `context` combinator, and `FromExternalError` for `map_res`.
+While the `VerboseError` type and its `convert_error` function saw some changes,
+not many features ill be added to it, instead you are encouraged to build the error
+type that corresponds to your needs if you are building a language parser.
+
+This version also integrates with the excellent [bitvec](https://crates.io/crates/bitvec)
+crate for better bit level parsing. This part of nom was not great and a bit of a hack,
+so this will give better options for those parsers.
+
+At last, documentation! There are now more code examples, functions and macros that require
+specific cargo features are now clearly indicated, and there's a new `recipes` module
+containing example patterns.
+
+### Breaking changes
+
+- the minimal Rust version is now 1.44 (1.37 if building without the `alloc` or `std` features)
+- streaming parsers return the number of additional bytes they need, not the total. This was supposed to be the case everywhere, but some parsers were forgotten
+- removed the `regexp_macros` cargo feature
+- the `context` combinator is not linked to `ParseError` anymore, instead it come with its own `ContextError` trait
+- `Needed::Size` now contains a `NonZeroUsize`, so we can reduce the structure's size by 8 bytes. When upgrading, `Needed::Size(number)` can be replaced with `Needed::new(number)`
+- there is now a more general `Parser` trait, so parsers can be something else than a function. This trait also comes with combinator methods like `map`, `flat_map`, `or`. Since it is implemented on `Fn*` traits, it should not affect existing code too much
+- combinators that returned a `impl Fn` now return a `impl FnMut` to allow parser closures that capture some mutable value from the context
+- `separated_list` is now `separated_list0`
+- removed the deprecated `methods` module
+- removed the deprecated `whitespace` module
+- the default error type is now a struct (`nom::error::Error`) instead of a tuple
+- the `FromExternalError` allows wrapping the error returned by the function in the `map_res` combinator
+- renamed the `dbg!` macro to avoid conficts with `std::dbg!`
+- `separated_list` now allows empty elements
+
+
+### Added
+
+- function version of regex parsers
+- `fill`: attempts to fill the output slice passed as argument
+- `success`: returns a value without consuming the input
+- `satisfy`: checks a predicate over the next character
+- `eof` function combinator
+- `consumed`: returnes the produced value and the consumed input
+- `length_count` function combinator
+- `into`: converts a parser's output and error values if `From` implementations are available
+- `IResult::finish()`: converts a parser's result to `Result<(I, O), E>` by removing the distinction between `Error` and `Failure` and panicking on `Incomplete`
+- non macro versions of `u16`, `i32`, etc, with configurable endianness
+- `is_newline` function
+- `std::error::Error` implementation for nom's error types
+- recipes section of the documentation, outlining common patterns in nom
+- custom errors example
+- bitstream parsing with the `BitSlice` type from the bitvec crate
+- native endianness parsers
+- github actions for CI
+
+### Changed
+
+- allows lexical-core 0.7
+- number parsers are now generic over the input type
+- stabilized the `alloc` feature
+- `convert_error` accepts a type that derefs to `&str`
+- the JSON example now follows the spec better
+
+### Fixed
+- use `fold_many0c` in the `fold_many0` macro
+
+## 5.1.1 - 2020-02-24
+
+### Thanks
+
+- @Alexhuszagh for float fixes
+- @AlexanderEkdahl, @JoshOrndorff, @akitsu-sanae for docs fixes
+- @ignatenkobrain: dependency update
+- @derekdreery: `map` implementation for errors
+- @Lucretiel for docs fixes and compilation fixes
+- adytzu2007: warning fixes
+- @lo48576: error management fixes
+
+### Fixed
+
+- C symbols compilation errors due to old lexical-core version
+
+### Added
+
+- `Err` now has a `map` function
+
+### Changed
+
+- Make `error::context()` available without `alloc` feature
+
+## 5.1.0 - 2020-01-07
+
+### Thanks
+
+- @Hywan, @nickmooney, @jplatte, @ngortheone, @ejmg, @SirWindfield, @demurgos, @spazm, @nyarly, @guedou, @adamnemecek, for docs fixes
+- @Alxandr for error management bugfixes
+- @Lucretiel for example fixes and optimizations
+- @adytzu2007 for optimizations
+- @audunhalland for utf8 fixes
+
+### Fixed
+
+- panic in `convert_error`
+- `compile_error` macro usage
+
+### Added
+
+- `std::error::Error`, `std::fmt::Display`, `Eq`, `ToOwned` implementations for errors
+- inline attribute for  `ToUsize`
+
+### Changed
+
+- `convert_error` optimization
+- `alt` optimization
+
+## 5.0.1 - 2019-08-22
+
+### Thanks
+
+- @waywardmonkeys, @phaazon, @dalance for docs fixes
+- @kali for `many0_m_n` fixes
+- @ia0 for macros fixes
+
+### Fixed
+
+- `many0_m_n` now supports the n=1 case
+- relaxed trait requirements in `cut`
+- `peek!` macro reimplementation
+- type inference in `value!`
+
+## 5.0.0 - 2019-06-24
+
+This version comes with a complete rewrite of nom internals to use functions as a base
+for parsers, instead of macros. Macros have been updated to use functions under
+the hood, so that most existing parsers will work directly or require minimal changes.
+
+The `CompleteByteSlice` and `CompleteStr` input types were removed. To get different
+behaviour related to streaming or complete input, there are different versions of some
+parsers in different submodules, like `nom::character::streaming::alpha0` and
+`nom::character::complete::alpha0`.
+
+The `verbose-errors` feature is gone, now the error type is decided through a generic
+bound. To get equivalent behaviour to `verbose-errors`, check out `nom::error::VerboseError`
+
+### Thanks
+
+- @lowenheim helped in refactoring and error management
+- @Keruspe helped in refactoring and fixing tests
+- @pingiun, @Songbird0, @jeremystucki, @BeatButton, @NamsooCho, @Waelwindows, @rbtcollins, @MarkMcCaskey for a lot of help in rewriting the documentation and adding code examples
+- @GuillaumeGomez for documentation rewriting and checking
+- @iosmanthus for bug fixes
+- @lo48576 for error management fixes
+- @vaffeine for macros visibility fixes
+- @webholik and @Havvy for `escaped` and `escaped_transform` fixes
+- @proman21 for help on porting bits parsers
+
+### Added
+
+- the `VerboseError` type accumulates position info and error codes, and can generate a trace with span information
+- the `lexical-core` crate is now used by default (through the `lexical` compilation feature) to parse floats from text
+- documentation and code examples for all functions and macros
+
+### Changed
+
+- nom now uses functions instead of macros to generate parsers
+- macros now use the functions under the hood
+- the minimal Rust version is now 1.31
+- the verify combinator's condition function now takes its argument by reference
+- `cond` will now return the error of the parser instead of None
+- `alpha*`, `digit*`, `hex_digit*`, `alphanumeric*` now recognize only ASCII characters
+
+### Removed
+
+- deprecated string parsers (with the `_s` suffix), the normal version can be used instead
+- `verbose-errors` is not needed anymore, now the error type can be decided when writing the parsers, and parsers provided by nom are generic over the error type
+- `AtEof`, `CompleteByteSlice` and `CompleteStr` are gone, instead some parsers are specialized to work on streaming or complete input, and provided in different modules
+- character parsers that were aliases to their `*1` version: eol, alpha, digit, hex_digit, oct_digit, alphanumeric, space, multispace
+- `count_fixed` macro
+- `whitespace::sp` can be replaced by `character::complete::multispace0`
+- method combinators are now in the nom-methods crate
+- `take_until_either`, `take_until_either1`, `take_until_either_and_consume` and `take_until_either_and_consume1`: they can be replaced with `is_not` (possibly combined with something else)
+- `take_until_and_consume`, `take_until_and_consume1`: they can be replaced with `take_until` combined with `take`
+- `sized_buffer` and `length_bytes!`: they can be replaced with the `length_data` function
+- `non_empty`, `begin` and `rest_s` function
+- `cond_reduce!`, `cond_with_error!`, `closure!`, `apply`, `map_res_err!`, `expr_opt!`, `expr_res!`
+- `alt_complete`, `separated_list_complete`, `separated_nonempty_list_complete`
+
+## 4.2.3 - 2019-03-23
+
+### Fixed
+
+- add missing `build.rs` file to the package
+- fix code comparison links in changelog
+
+## 4.2.2 - 2019-03-04
+
+### Fixed
+
+- regression in do_parse macro import for edition 2018
+
+## 4.2.1 - 2019-02-27
+
+### Fixed
+
+- macro expansion error in `do_parse` due to `compile_error` macro usage
+
+## 4.2.0 - 2019-01-29
+
+### Thanks
+
+- @JoshMcguigan for unit test fixes
+- @oza for documentation fixes
+- @wackywendell for better error conversion
+- @Zebradil for documentation fixes
+- @tsraom for new combinators
+- @hcpl for minimum Rust version tests
+- @KellerFuchs for removing some unsafe uses in float parsing
+
+### Changed
+
+- macro import in edition 2018 code should work without importing internal macros now
+- the regex parsers do not require the calling code to have imported the regex crate anymore
+- error conversions are more ergonomic
+- method combinators are now deprecated. They might be moved to a separate crate
+- nom now specifies Rust 1.24.1 as minimum version. This was already the case before, now it is made explicit
+
+### Added
+
+- `many0_count` and `many1_count` to count applications of a parser instead of
+accumulating its results in a `Vec`
+
+### Fixed
+
+- overflow in the byte wrapper for bit level parsers
+- `f64` parsing does not use `transmute` anymore
+
+## 4.1.1 - 2018-10-14
+
+### Fixed
+
+- compilation issue in verbose-errors mode for `add_return_error`
+
+## 4.1.0 - 2018-10-06
+
+### Thanks
+
+- @xfix for fixing warnings, simplifying examples and performance fixes
+- @dvberkel for documentation fixes
+- @chifflier for fixing warnings
+- @myrrlyn for dead code elimination
+- @petrochenkov for removing redundant test macros
+- @tbelaire for documentation fixes
+- @khernyo for fixing warnings
+- @linkmauve for documentation fixes
+- @ProgVal for documentation fixes, warning fixes and error management
+- @Nemo157 for compilation fixes
+- @RReverser for documentation fixes
+- @xpayn for fixing warnings
+- Blas Rodriguez Irizar for documentation fixes
+- @badboy for documentation fixes
+- @kyrias for compilation fixes
+- @kurnevsky for the `rest_len` parser
+- @hjr3 for new documentation examples
+- @fengalin for error management
+- @ithinuel for the pcap example project
+- @phaazon for documentation fixes
+- @juchiast for documentation fixes
+- @jrakow for the `u128` and `i128` parsers
+- @smarnach for documentation fixes
+- @derekdreery for `pub(crate)` support
+- @YaLTeR for `map_res_err!`
+
+### Added
+
+- `rest_len` parser, returns the length of the remaining input
+- `parse_to` has its own error code now
+- `u128` and `i128` parsers in big and little endian modes
+- support for `pub(crate)` syntax
+- `map_res_err!` combinator that appends the error of its argument function in verbose errors mode
+
+### Fixed
+
+- lots of unused imports warnings were removed
+- the `bytes` combinator was not compiling in some cases
+- the big and little endian combinators now work without external imports
+- CI is now faster and uses less cache
+- in `add_return_error`, the provided error code is now evaluated only once
+
+### Changed
+
+- `fold_many1` will now transmit a `Failure` instead of transforming it to an `Error`
+- `float` and `double` now work on all of nom's input types (`&[u8]`, `&str`, `CompleteByteSlice`, `CompleteStr` and any type that implements the required traits). `float_s` and `double_s` got the same modification, but are now deprecated
+- `CompleteByteSlice` and `CompleteStr` get a small optimization by inlining some functions
+
+
+## 4.0.0 - 2018-05-14
+
+### Thanks
+
+- @jsgf for the new `AtEof` trait
+- @tmccombs for fixes on `escaped*` combinators
+- @s3bk for fixes around non Copy input types and documentation help
+- @kamarkiewicz for fixes to no_std and CI
+- @bheisler for documentation and examples
+- @target-san for simplifying the `InputIter` trait for `&[u8]`
+- @willmurphyscode for documentation and examples
+- @Chaitanya1416 for typo fixes
+- @fflorent for `input_len()` usage fixes
+- @dbrgn for typo fixes
+- @iBelieve for no_std fixes
+- @kpp for warning fixes and clippy fixes
+- @keruspe for fixes on FindToken
+- @dtrebbien for fixes on take_until_and_consume1
+- @Henning-K for typo fixes
+- @vthriller for documentation fixes
+- @federicomenaquintero and @veprbl for their help fixing the float parsers
+- @vmchale for new named_args versions
+- @hywan for documentation fixes
+- @fbenkstein for typo fixes
+- @CAD97 for catching missing trait implementations
+- @goldenlentils for &str optimizations
+- @passy for typo fixes
+- @ayrat555 for typo fixes
+- @GuillaumeGomez for documentation fixes
+- @jrakow for documentation fixes and fixes for `switch!`
+- @phlosioneer for documentation fixes
+- @creativcoder for typo fixes
+- @derekdreery for typo fixes
+- @lucasem for implementing `Deref` on `CompleteStr` and `CompleteByteSlice`
+- @lowenheim for `parse_to!` fixes
+- @myrrlyn for trait fixes around `CompleteStr` and `CompleteByteSlice`
+- @NotBad4U for fixing code coverage analysis
+- @murarth for code formatting
+- @glandium for fixing build in no_std
+- @csharad for regex compatibility with `CompleteStr`
+- @FauxFaux for implementing `AsRef<str>` on `CompleteStr`
+- @jaje for implementing `std::Error` on `nom:Err`
+- @fengalin for warning fixes
+- @@khernyo for doc formatting
+
+Special thanks to @corkami for the logo :)
+
+### Breaking changes
+
+- the `IResult` type now becomes a `Result` from the standard library
+- `Incomplete` now returns the additional data size needed, not the total data size needed
+- verbose-errors is now a superset of basic errors
+- all the errors now include  the related input slice
+- the arguments from `error_position` and other such macros were swapped to be more consistent with the rest of nom
+- automatic error conversion: to fix error type inference issues, a custom error type must now implement `std::convert::From<u32>`
+- the `not!` combinator returns unit `()`
+- FindToken's calling convention was swapped
+- the `take_*` combinators are now more coherent and stricter, see commit 484f6724ea3ccb for more information
+- `many0` and other related parsers will now return `Incomplete` if the reach the end of input without an error of the child parser. They will also return `Incomplete` on an empty input
+- the `sep!` combinator for whitespace only consumes whitespace in the prefix, while the `ws!` combinator takes care of consuming the remaining whitespace
+
+### Added
+
+- the `AtEof` trait for input type: indicate if we can get more input data later (related to streaming parsers and `Incomplete` handling)
+- the `escaped*` parsers now support the `&str`input type
+- the `Failure` error variant represents an unrecoverable error, for which `alt` and other combinators will not try other branches. This error means we got in the right part of the code (like, a prefix was checked correctly), but there was an error in the following parts
+- the `CompleteByteSlice` and `CompleteStr` input types consider there will be no more refill of the input. They fixed the `Incomplete` related issues when we have all of the data
+- the `exact!()` combinator will fail if we did not consume the whole input
+- the `take_while_m_n!` combinator will match a specified number of characters
+- `ErrorKind::TakeUntilAndConsume1`
+- the `recognize_float` parser will match a float number's characters, but will not transform to a `f32` or `f64`
+- `alpha` and other basic parsers are now much stricter about partial inputs. We also introduce the  `*0` and `*1` versions of those parsers
+- `named_args` can now specify the input type as well
+- `HexDisplay` is now implemented for `&str`
+- `alloc` feature
+- the `InputTakeAtposition` trait allows specialized implementations of parsers like `take_while!`
+
+### Removed
+
+- the producers and consumers were removed
+- the `error_code` and `error_node` macros are not used anymore
+
+### Fixed
+
+- `anychar!` now works correctly with multibyte characters
+- `take_until_and_consume1!` no longer results in "no method named \`find_substring\`" and "no method named \`slice\`" compilation errors
+- `take_until_and_consume1!` returns the correct Incomplete(Needed) amount
+- `no_std` compiles properly, and nom can work with `alloc` too
+- `parse_to!` now consumes its input
+
+### Changed
+
+- `alt` and other combinators will now clone the input if necessary. If the input is already `Copy` there is no performance impact
+- the `rest` parser now works on various input types
+- `InputIter::Item` for `&[u8]` is now a `u8` directly, not a reference
+- we now use the `compile_error` macro to return a compile time error if there was a syntax issue
+- the permutation combinator now supports optional child parsers
+- the float numbers parsers have been refactored to use one common implementation that is nearly 2 times faster than the previous one
+- the float number parsers now accept more variants
+
+
+## 3.2.1 - 2017-10-27
+
+### Thanks
+
+- @ordian for `alt_complete` fixes
+- @friedm for documentation fixes
+- @kali for improving error management
+
+### Fixed
+
+- there were cases where `alt_complete` could return `Incomplete`
+
+### Added
+
+- an `into_error_kind` method can be used to transform any error to a common value. This helps when the library is included multiple times as dependency with different feature sets
+
+
+## 3.2.0 - 2017-07-24
+
+### Thanks
+
+- @jedireza for documentation fixes
+- @gmorenz for the `bytes` combinator
+- @meh for character combinator fixes for UTF-8
+- @jethrogb for avoiding move issues in `separated_list`
+
+### Changed
+
+- new layout for the main page of documentation
+- `anychar` can now work on any input type
+- `length_bytes` is now an alias for `length_data`
+
+### Fixed
+
+- `one_of`, `none_of` and `char` will now index correctly UTF-8 characters
+- the `compiler_error` macro is now correctly exported
+
+
+### Added
+
+- the `bytes` combinator transforms a bit stream back to a byte slice for child parsers
+
+## 3.1.0 - 2017-06-16
+
+### Thanks
+
+- @sdroege: implementing be_i24 and le_i24
+- @Hywan: integrating faster substring search using memchr
+- @nizox: fixing type issues in bit stream parsing
+- @grissiom: documentation fixes
+- @doomrobo: implementing separated_list_complete and separated_nonempty_list_complete
+- @CWood1: fixing memchr integration in no_std
+- @lu_zero: integrating the compiler_error crate
+- @dtolnay: helping debug a type inference issue in map
+
+### Changed
+
+- memchr is used for substring search if possible
+- if building on nightly, some common syntax errors will display a specific error message. If building no stable, display the documentation to activate those messages
+- `count` no longer preallocates its vector
+
+### Fixed
+
+- better type inference in alt_complete
+- `alt` should now work with whitespace parsing
+- `map` should not make type inference errors anymore
+
+### Added
+
+- be_i24 and le_i24, parsing big endian and little endian signed 24 bit integers
+- `separated_list_complete` and `separated_nonempty_list_complete` will treat incomplete from sub parsers as error
+
+## 3.0.0 - 2017-05-12
+
+### Thanks
+
+- Chris Pick for some `Incomplete` related refactors
+- @dbrgn for documentation fixes
+- @valarauca for adding `be_u24`
+- @ithinuel for usability fixes
+- @evuez for README readability fixes and improvements to `IResult`
+- @s3bk for allowing non-`Copy` types as input
+- @keruspe for documentation fixes
+- @0xd34d10cc for trait fixes on `InputIter`
+- @sdleffler for lifetime shenanigans on `named_args`
+- @chengsun for type inference fixes in `alt`
+- @iBelieve for adding str to no_std
+- @Hywan for simplifying code in input traits
+- @azerupi for extensive documentation of `alt` and `alt_complete`
+
+### Breaking Changes
+
+- `escaped`, `separated_list` and `separated_nonempty_list` can now return `Incomplete` when necessary
+- `InputIter` does not require `AsChar` on its `Item` type anymore
+- the `core` feature that was putting nom in `no_std` mode has been removed. There is now a `std` feature, activated by default. If it is not activated, nom is in `no_std`
+- in `verbose-errors` mode, the error list is now stored in a `Vec` instead of a box based linked list
+- `chain!` has finally been removed
+
+### Changed
+
+- `Endianness` now implements `Debug`, `PartialEq`, `Eq`, `Clone` and `Copy`
+- custom input types can now be cloned if they're not `Copy`
+- the infamous 'Cannot infer type for E' error should happen less often now
+- `str` is now available in `no_std` mode
+
+### Fixed
+
+- `FileProducer` will be marked as `Eof` on full buffer
+- `named_args!` now has lifetimes that cannot conflict with the lifetimes from other arguments
+
+### Added
+
+- `be_u24`: big endian 24 bit unsigned integer parsing
+- `IResult` now has a `unwrap_or` method
+
+
+## 2.2.1 - 2017-04-03
+
+### Thanks
+
+- @Victor-Savu for formatting fixes in the README
+- @chifflier for detecting and fixing integer overflows
+- @utkarshkukreti for some performance improvements in benchmarks
+
+### Changed
+
+- when calculating how much data is needed in `IResult::Incomplete`, the addition could overflow (it is stored as a usize). This would apparently not result in any security vulnerability on release code
+
+## 2.2.0 - 2017-03-20
+
+### Thanks
+
+- @seppo0010 for fixing `named_args`
+- @keruspe for implementing or() on `IResult`, adding the option of default cases in `switch!`, adding support for `cargo-travis`
+- @timlyo for documentation fixes
+- @JayKickliter for extending `hex_u32`
+- @1011X for fixing regex integration
+- @Kerollmops for actually marking `chain!` as deprecated
+- @joliss for documentation fixes
+- @utkarshkukreti for tests refactoring and performance improvement
+- @tmccombs for documentation fixes
+
+### Added
+
+- `IResult` gets an `or()` method
+- `take_until1`, `take_until_and_consume1`, `take_till1!` and `take_till1_s!` require at least 1 character
+
+### Changed
+
+- `hex_u32` accepts uppercase digits as well
+- the character based combinators leverage the input traits
+- the whitespace parsers now work on &str and other types
+- `take_while1` returns `Incomplete` on empty input
+- `switch!` can now take a default case
+
+### Fixed
+
+- `named_args!` now imports `IResult` directly
+- the upgrade to regex 0.2 broke the regex combinators, they work now
+
+## 2.1.0 - 2017-01-27
+
+### Thanks
+
+- @nickbabcock for documentation fixes
+- @derekdreery for documentation fixes
+- @DirkyJerky for documentation fixes
+- @saschagrunert for documentation fixes
+- @lucab for documentation fixes
+- @hyone for documentation fixes
+- @tstorch for factoring `Slice`
+- @shepmaster for adding crate categories
+- @antoyo for adding `named_args!`
+
+### Added
+
+- `verify!` uses a first parser, then applies a function to check that its result satisfies some conditions
+- `named_args!` creates a parser function that can accept other arguments along with the input
+- `parse_to!` will use the `parse` method from `FromStr` to parse a value. It will automatically translate the input to a string if necessary
+- `float`, `float_s`, `double`, `double_s` can recognize floating point numbers in text
+
+### Changed
+
+- `escaped!` will now return `Incomplete` if needed
+- `permutation!` supports up to 20 child parsers
+
+## 2.0.1 - 2016-12-10
+
+Bugfix release
+
+*Warning*: there is a small breaking change, `add_error!` is renamed to `add_return_error!`. This was planned for the 2.0 release but was forgotten. This is a small change in a feature that not many people use, for a release that is not yet widely in use, so there will be no 3.0 release for that change.
+
+### Thanks
+
+- @nickbabcock for catching and fixing the `add_error!` mixup
+- @lucab for documentation fixes
+- @jtdowney for noticing that `tag_no_case!` was not working at all for byte slices
+
+### Fixed
+
+- `add_error!` has been renamed to `add_return_error!`
+- the `not!` combinator now accepts functions
+- `tag_no_case!` is now working as accepted (before, it accepted everything)
+
+
+## 2.0 - 2016-11-25
+
+The 2.0 release is one of the biggest yet. It was a good opportunity to clean up some badly named combinators and fix invalid behaviours.
+
+Since this version introduces a few breaking changes, an [upgrade documentation](https://github.com/Geal/nom/blob/master/doc/upgrading_to_nom_2.md) is available, detailing the steps to fix the most common migration issues. After testing on a set of 30 crates, most of them will build directly, a large part will just need to activate the "verbose-errors" compilation feature. The remaining fixes are documented.
+
+This version also adds a lot of interesting features, like the permutation combinator or whitespace separated formats support.
+
+### Thanks
+
+- @lu-zero for license help
+- @adamgreig for type inference fixes
+- @keruspe for documentation and example fixes, for the `IResult => Result` conversion work, making `AsChar`'s method more consistent, and adding `many_till!`
+- @jdeeny for implementing `Offset` on `&str`
+- @vickenty for documentation fixes and his refactoring of `length_value!` and `length_bytes!`
+- @overdrivenpotato for refactoring some combinators
+- @taralx for documentation fixes
+- @keeperofdakeys for fixing eol behaviour, writing documentation and adding `named_attr!`
+- @jturner314 for writing documentation
+- @bozaro for fixing compilation errors
+- @uniphil for adding a `crates.io` badge
+- @badboy for documentation fixes
+- @jugglerchris for fixing `take_s!`
+- @AndyShiue for implementing `Error` and `Display` on `ErrorKind` and detecting incorrect UTF-8 string indexing
+
+### Added
+
+- the "simple" error management system does not accumulates errors when backtracking. This is a big perf gain, and is activated by default in nom 2.0
+- nom can now work on any type that implement the traits defined in `src/traits.rs`: `InputLength`, `InputIter`, `InputTake`, `Compare`, `FindToken`, `FindSubstring`, `Slice`
+- the documentation from Github's wiki has been moved to the `doc/` directory. They are markdown files that you can build with [cargo-external-doc](https://crates.io/crates/cargo-external-doc)
+- whitespace separated format support: with the `ws!` combinator, you can automatically introduce whitespace parsers between all parsers and combinators
+- the `permutation!` combinator applies its child parsers in any order, as long as they all succeed once, and return a tuple of the results
+- `do_parse!` is a simpler alternative to `chain!`, which is now deprecated
+- you can now transform an `IResult` in a `std::result::Result`
+- `length_data!` parses a length, and returns a subslice of that length
+- `tag_no_case!` provides case independent comparison. It works nicely, without any allocation, for ASCII strings, but for UTF-8 strings, it defaults to an unsatisfying (and incorrect) comparison by lowercasing both strings
+- `named_attr!` creates functions like `named!` but can add attributes like documentation
+- `many_till!` applies repeatedly its first child parser until the second succeeds
+
+### Changed
+
+- the "verbose" error management that was available in previous versions is now activated by the "verbose-errors" compilation feature
+- code reorganization: most of the parsers were moved in separate files to make the source easier to navigate
+- most of the combinators are now independent from the input type
+- the `eof` function was replaced with the `eof!` macro
+- `error!` and `add_error!` were replaced with `return_error!` and `add_return_error!` to fix the name conflict with the log crate
+- the `offset()` method is now in the `Offset` trait
+- `length_value!` has been renamed to `length_count!`. The new `length_value!` selects a slice and applies the second parser once on that slice
+- `AsChar::is_0_to_9` is now `AsChar::is_dec_digit`
+- the combinators with configurable endianness now take an enum instead of a boolean as parameter
+
+### Fixed
+- the `count!`, `count_fixed!` and `length_*!` combinator calculate incomplete data needs correctly
+- `eol`, `line_ending` and `not_line_ending` now have a consistent behaviour that works correctly with incomplete data
+- `take_s!` didn't correctly handle the case when the slice is exactly the right length
+
+## 1.2.4 - 2016-07-20
+
+### Thanks
+- @Phlosioneer for documentation fixes
+- @sourrust for fixing offsets in `take_bits!`
+- @ChrisMacNaughton for the XFS crate
+- @pwoolcoc for `rest_s`
+- @fitzgen for more `IResult` methods
+- @gtors for the negative lookahead feature
+- @frk1 and @jeandudey for little endian float parsing
+- @jethrogb for fixing input usage in `many1`
+- @acatton for beating me at nom golf :D
+
+### Added
+- the `rest_s` method on `IResult` returns the remaining `&str` input
+- `unwrap_err` and `unwrap_inc` methods on `IResult`
+- `not!` will peek at the input and return `Done` if the underlying parser returned `Error` or `Incomplete`, without consuming the input
+- `le_f32` and `le_f64` parse little endian floating point numbers (IEEE 754)
+-
+
+### Fixed
+- documentation fixes
+- `take_bits!` is now more precise
+- `many1` inccorectly used the `len` function instead of `input_len`
+- the INI parser is simpler
+- `recognize!` had an early `return` that is removed now
+
+## 1.2.3 - 2016-05-10
+
+### Thanks
+- @lu-zero for the contribution guidelines
+- @GuillaumeGomez for fixes on `length_bytes` and some documentation
+- @Hywan for documentation and test fixes
+- @Xirdus for correct trait import issues
+- @mspiegel for the new AST example
+- @cholcombe973 for adding the `cond_with_error!` combinator
+- @tstorch for refactoring `many0!`
+- @panicbit for the folding combinators
+- @evestera for `separated_list!` fixes
+- @DanielKeep for correcting some enum imports
+
+### Added
+- Regular expression combinators starting with `re_bytes_` work on byte slices
+- example parsing arithmetic expressions to an AST
+- `cond_with_error!` works like `cond!` but will return `None` if the condition is false, and `Some(value)` if the underlying parser succeeded
+- `fold_many0!`, `fold_many1!` and `fold_many_m_n!` will take a parser, an initial value and a combining function, and fold over the successful applications of the parser
+
+### Fixed
+- `length_bytes!` converts the result of its child parser to usize
+- `take_till!` now imports `InputLength` instead of assuming it's in scope
+- `separated_list!` and `separated_nonempty_list!` will not consume the separator if there's no following successfully parsed value
+- no more warnings on build
+
+### Changed
+- simpler implementation of `many0!`
+
+## 1.2.2 - 2016-03-09
+
+### Thanks
+- @conradev for fixing `take_until_s!`
+- @GuillaumeGomez for some documentation fixes
+- @frewsxcv for some documentation fixes
+- @tstorch for some test refactorings
+
+### Added
+- `nom::Err` now implements `std::error::Error`
+
+### Fixed
+- `hex_u32` does not parses more than 8 chars now
+- `take_while!` and `take_while1!` will not perturb the behaviour of `recognize!` anymore
+
+## 1.2.1 - 2016-02-23
+
+### Thanks
+- @sourrust for adding methods to `IResult`
+- @tstorch for the test refactoring, and for adding methods to `IResult` and `Needed`
+- @joelself for fixing the method system
+
+### Added
+
+- mapping methods over `IResult` and `Needed`
+
+### Changed
+
+- `apply_rf` is renamed to `apply_m`. This will not warrant a major version, since it is part missing from the methods feture added in the 1.2.0 release
+- the `regexp_macros` feature that used `regex!` to precompile regular expressions has been replaced by the normal regex engine combined with `lazy_static`
+
+### Fixed
+
+- when a parser or combinator was returning an empty buffer as remaining part, it was generating one from a static empty string. This was messing with buffer offset calculation. Now, that empty slice is taken like this: `&input[input.len()..]`.
+- The `regexp_macros` and `no_std` feature build again and are now tested with Travis CI
+
+## 1.2.0 - 2016-02-08
+
+### Thanks
+- @zentner-kyle for type inference fixes
+- @joelself for his work on `&str` parsing and method parsers
+- @GuillaumeGomez for implementing methods on `IResult`
+- @dirk for the `alt_complete!` combinator
+- @tstorch for a lot of refactoring work and unit tests additions
+- @jansegre for the hex digit parsers
+- @belgum for some documentation fixes
+- @lwandrebeck for some documentation fixes and code fixes in `hex_digit`
+
+### Added
+- `take_until_and_consume_s!` for consumption of string data until a tag
+- more function patterns in `named!`. The error type can now be specified
+- `alt_complete!` works like the `alt!` combinator, but tries the next branch if the current one returned `Incomplete`, instead of returning directly
+- more unit tests for a lot of combinators
+- hexadecimal digit parsers
+- the `tuple!` combinator takes a list of parsers as argument, and applies them serially on the input. If all of them are successful, it willr eturn a tuple accumulating all the values. This combinator will (hopefully) replace most uses of `chain!`
+- parsers can now be implemented as a method for a struct thanks to the `method!`, `call_m!` and `apply_rf!` combinators
+
+### Fixed
+- there were type inference issues in a few combinators. They will now be easier to compile
+- `peek!` compilation with bare functions
+- `&str` parsers were splitting data at the byte level, not at the char level, which can result in inconsistencies in parsing UTF-8 characters. They now use character indexes
+- some method implementations were missing on `IResult<I,O,E>` (with specified error type instead of implicit)
+
+## 1.1.0 - 2016-01-01
+
+This release adds a lot of features related to `&str` parsing. The previous versions
+were focused on `&[u8]` and bit streams parsing, but there's a need for more text
+parsing with nom. The parsing functions like `alpha`, `digit` and others will now
+accept either a `&[u8]` or a `&str`, so there is no breaking change on that part.
+
+There are also a few performance improvements and documentation fixes.
+
+### Thanks
+- @Binero for pushing the work on `&str` parsing
+- @meh for fixing `Option` and `Vec` imports
+- @hoodie for a documentation fix
+- @joelself for some documentation fixes
+- @vberger for his traits magic making nom functions more generic
+
+### Added
+
+- string related parsers: `tag_s!`, `take_s!`, `is_a_s!`, `is_not_s!`, `take_while_s!`, `take_while1_s!`, `take_till_s!`
+- `value!` is a combinator that always returns the same value. If a child parser is passed as second argument, that value is returned when the child parser succeeds
+
+### Changed
+
+- `tag!` will now compare even on partial input. If it expects "abcd" but receives "ef", it will now return an `Error` instead of `Incomplete`
+- `many0!` and others will preallocate a larger vector to avoid some copies and reallocations
+- `alpha`, `digit`, `alphanumeric`, `space` and `multispace` now accept as input a `&[u8]` or a `&str`. Additionally, they return an error if they receive an empty input
+- `take_while!`, `take_while1!`, `take_while_s!`, `take_while1_s!` wilreturn an error on empty input
+
+### Fixed
+
+- if the child parser of `many0!` or `many1!` returns `Incomplete`, it will return `Incomplete` too, possibly updating the needed size
+- `Option,` `Some`, `None` and `Vec` are now used with full path imports
+
+## 1.0.1 - 2015-11-22
+
+This releases makes the 1.0 version compatible with Rust 1.2 and 1.3
+
+### Thanks
+- @steveklabnik for fixing lifetime issues in Producers and Consumers
+
+## 1.0.0 - 2015-11-16
+
+Stable release for nom. A lot of new features, a few breaking changes
+
+### Thanks
+- @ahenry for macro fixes
+- @bluss for fixing documentation
+- @sourrust for cleaning code and debugging the new streaming utilities
+- @meh for inline optimizations
+- @ccmtaylor for fixing function imports
+- @soro for improvements to the streaming utilities
+- @breard-r for catching my typos
+- @nelsonjchen for catching my typos too
+- @divarvel for hex string parsers
+- @mrordinaire for the `length_bytes!` combinator
+
+### Breaking changes
+- `IResult::Error` can now use custom error types, and is generic over the input type
+- Producers and consumers have been replaced. The new implementation uses less memory and integrates more with parsers
+- `nom::ErrorCode` is now `nom::ErrorKind`
+- `filter!` has been renamed to `take_while!`
+- `chain!` will count how much data is consumed and use that number to calculate how much data is needed if a parser returned `Incomplete`
+- `alt!` returns `Incomplete` if a child parser returned `Incomplete`, instead of skipping to the next parser
+- `IResult` does not require a lifetime tag anymore, yay!
+
+### Added
+
+- `complete!` will return an error if the child parser returned `Incomplete`
+- `add_error!` will wrap an error, but allow backtracking
+- `hex_u32` parser
+
+### Fixed
+- the behaviour around `Incomplete` is better for most parsers now
+
+## 0.5.0 - 2015-10-16
+
+This release fixes a few issues and stabilizes the code.
+
+### Thanks
+- @nox for documentation fixes
+- @daboross for linting fixes
+- @ahenry for fixing `tap!` and extending `dbg!` and `dbg_dmp!`
+- @bluss for tracking down and fixing issues with unsafe code
+- @meh for inlining parser functions
+- @ccmtaylor for fixing import of `str::from_utf8`
+
+### Fixed
+- `tap!`, `dbg!` and `dbg_dmp!` now accept function parameters
+
+### Changed
+- the type used in `count_fixed!` must be `Copy`
+- `chain!` calculates how much data is needed if one of the parsers returns `Incomplete
+- optional parsers in `chain!` can return `Incomplete`
+
+## 0.4.0 - 2015-09-08
+
+Considering the number of changes since the last release, this version can contain breaking changes, so the version number becomes 0.4.0. A lot of new features and performance improvements!
+
+### Thanks
+- @frewsxcv for documentation fixes
+- @ngrewe for his work on producers and consumers
+- @meh for fixes on `chain!` and for the `rest` parser
+- @daboross for refactoring `many0!` and `many1!`
+- @aleksander for the `switch!` combinator idea
+- @TechnoMancer for his help with bit level parsing
+- @sxeraverx for pointing out a bug in `is_a!`
+
+### Fixed
+- `count_fixed!` must take an explicit type as argument to generate the fixed-size array
+- optional parsing behaviour in `chain!`
+- `count!` can take 0 elements
+- `is_a!` and `is_not!` can now consume the whole input
+
+### Added
+- it is now possible to seek to the end of a `MemProducer`
+- `opt!` returns `Done(input, None)` if `the child parser returned `Incomplete`
+- `rest` will return the remaining input
+- consumers can now seek to and from the end of input
+- `switch!` applies a first parser then matches on its result to choose the next parser
+- bit-level parsers
+- character-level parsers
+- regular expression parsers
+- implementation of `take_till!`, `take_while!` and `take_while1!`
+
+### Changed
+- `alt!` can return `Incomplete`
+- the error analysis functions will now take references to functions instead of moving them
+- performance improvements on producers
+- performance improvement for `filter!`
+- performance improvement for `count!`: a `Vec` of the right size is directly allocated
+
+## 0.3.11 - 2015-08-04
+
+### Thanks
+- @bluss for remarking that the crate included random junk lying non commited in my local repository
+
+### Fixed
+- cleanup of my local repository will ship less files in the crates, resulting in a smaller download
+
+## 0.3.10 - 2015-08-03
+
+### Added
+
+- `bits!` for bit level parsing. It indicates that all child parsers will take a `(&[u8], usize)`as input, with the second parameter indicating the bit offset in the first byte. This allows viewing a byte slice as a bit stream. Most combinators can be used directly under `bits!`
+- `take_bits!` takes an integer type and a number of bits, consumes that number of bits and updates the offset, possibly by crossing byte boundaries
+- bit level parsers are all written in `src/bits.rs`
+
+### Changed
+
+- Parsers that specifically handle bytes have been moved to src/bytes.rs`. This applies to `tag!`, `is_not!`, `is_a!`, `filter!`, `take!`, `take_str!`, `take_until_and_consume!`, `take_until!`, `take_until_either_and_consume!`, `take_until_either!`
+
+## 0.3.9 - 2015-07-20
+
+### Thanks
+- @badboy for fixing `filter!`
+- @idmit for some documentation fixes
+
+### Added
+- `opt_res!` applies a parser and transform its result in a Result. This parser never fails
+- `cond_reduce!` takes an expression as parameter, applies the parser if the expression is true, and returns an error if the expression is false
+- `tap!` pass the result of a parser to a block to manipulate it, but do not affect the parser's result
+- `AccReader` is a Read+BufRead that supports data accumulation and partial consumption. The `consume` method must be called afterwardsto indicate how much was consumed
+- Arithmetic expression evaluation and parsing example
+- `u16!`, `u32!`, `u64!`, `i16!`, `i32!`, `i64!` take an expression as parameter, if the expression is true, apply the big endian integer parser, if false, the little endian version
+- type information for combinators. This will make the documentation a bit easier to navigate
+
+### Fixed
+- `map_opt!` and `map_res!` had issues with argument order due to bad macros
+- `delimited!` did not compile for certain combinations of arguments
+- `filter!` did not return a byte slice but a fixed array
+
+## 0.3.8 - 2015-07-03
+
+### Added
+- code coverage is now calculated automatically on Travis CI
+- `Stepper`: wrap a `Producer`, and call the method `step` with a parser. This method will buffer data if there is not enough, apply the parser if there is, and keep the rest of the input in memory for the next call
+- `ReadProducer`: takes something implementing `Read`, and makes a `Producer` out of it
+
+### Fixed
+- the combinators `separated_pair!` and `delimited!` did not work because an implementation macro was not exported
+- if a `MemProducer` reached its end, it should always return `Eof`
+- `map!` had issues with argument matching
+
+## 0.3.7 - 2015-06-24
+
+### Added
+- `expr_res!` and `expr_opt!` evaluate an expression returning a Result or Opt and convert it to IResult
+- `AsBytes` is implemented for fixed size arrays. This allows `tag!([41u8, 42u8])`
+
+### Fixed
+- `count_fixed!` argument parsing works again
+
+## 0.3.6 - 2015-06-15
+
+### Added
+- documentation for a few functions
+- the consumer trait now requires the `failed(&self, error_code)` method in case of parsing error
+- `named!` now handles thge alternative `named!(pub fun_name<OutputType>, ...)`
+
+### Fixed
+- `filter!` now returns the whole input if the filter function never returned false
+- `take!` casts its argument as usize, so it can accepts any integer type now
+
+## 0.3.5 - 2015-06-10
+
+### Thanks
+- @cmr for some documentation fixes
+
+### Added
+- `count_fixed!` returns a fixed array
+
+### Fixed
+- `count!` is back to the previous behaviour, returning a `Vec` for sizes known at runtime
+
+### Changed
+- functions and traits exported from `nom::util` are now directly in `nom::`
+
+## 0.3.4 - 2015-06-09
+
+### Thanks
+- @andrew-d for fixes on `cond!`
+- @keruspe for features in `chain!`
+
+### Added
+- `chain!` can now have mutable fields
+
+### Fixed
+- `cond!` had an infinite macro recursion
+
+### Changed
+- `chain!` generates less code now. No apprent compilation time improvement
+
+## 0.3.3 - 2015-06-09
+
+### Thanks
+- @andrew-d for the little endian signed integer parsers
+- @keruspe for fixes on `count!`
+
+### Added
+- `le_i8`, `le_i16`, `le_i32`, `le_i64`: little endian signed integer parsers
+
+### Changed
+- the `alt!` parser compiles much faster, even with more than 8 branches
+- `count!` can now return a fixed size array instead of a growable vector
+
+## 0.3.2 - 2015-05-31
+
+### Thanks
+- @keruspe for the `take_str` parser and the function application combinator
+
+### Added
+- `take_str!`: takes the specified number of bytes and return a UTF-8 string
+- `apply!`: do partial application on the parameters of a function
+
+### Changed
+- `Needed::Size` now contains a `usize` instead of a `u32`
+
+## 0.3.1 - 2015-05-21
+
+### Thanks
+- @divarvel for the big endian signed integer parsers
+
+### Added
+- `be_i8`, `be_i16`, `be_i32`, `be_i64`: big endian signed integer parsers
+- the `core` feature can be passed to cargo to build with `no_std`
+- colored hexdump can be generated from error chains
+
+## 0.3.0 - 2015-05-07
+
+### Thanks
+- @filipegoncalves for some documentation and the new eof parser
+- @CrimsonVoid for putting fully qualified types in the macros
+- @lu_zero for some documentation fixes
+
+### Added
+- new error types that can contain an error code, an input slice, and a list of following errors
+- `error!` will cut backtracking and return directly from the parser, with a specified error code
+- `eof` parser, successful if there is no more input
+- specific error codes for the parsers provided by nom
+
+### Changed
+- fully qualified types in macros. A lot of imports are not needed anymore
+
+### Removed
+- `FlatMap`, `FlatpMapOpt` and `Functor` traits (replaced by `map!`, `map_opt!` and `map_res!`)
+
+## 0.2.2 - 2015-04-12
+
+### Thanks
+- @filipegoncalves and @thehydroimpulse for debugging an infinite loop in many0 and many1
+- @thehydroimpulse for suggesting public named parsers
+- @skade for removing the dependency on the collections gate
+
+### Added
+- `named!` can now declare public functions like this: `named!(pub tst, tag!("abcd"));`
+- `pair!(X,Y)` returns a tuple `(x, y)`
+- `separated_pair!(X, sep, Y)` returns a tuple `(x, y)`
+- `preceded!(opening, X)` returns `x`
+- `terminated!(X, closing)` returns `x`
+- `delimited(opening, X, closing)` returns `x`
+- `separated_list(sep, X)` returns a `Vec<X>`
+- `separated_nonempty_list(sep, X)` returns a `Vec<X>` of at list one element
+
+### Changed
+- `many0!` and `many1!` forbid parsers that do not consume input
+- `is_a!`, `is_not!`, `alpha`, `digit`, `space`, `multispace` will now return an error if they do not consume at least one byte
+
+## 0.2.1 - 2015-04-04
+
+### Thanks
+- @mtsr for catching the remaining debug println!
+- @jag426 who killed a lot of warnings
+- @skade for removing the dependency on the core feature gate
+
+
+### Added
+- little endian unsigned int parsers le_u8, le_u16, le_u32, le_u64
+- `count!` to apply a parser a specified number of times
+- `cond!` applies a parser if the condition is met
+- more parser development tools in `util::*`
+
+### Fixed
+- in one case, `opt!` would not compile
+
+### Removed
+- most of the feature gates are now removed. The only one still needed is `collections`
+
+## 0.2.0 - 2015-03-24
+*works with `rustc 1.0.0-dev (81e2396c7 2015-03-19) (built 2015-03-19)`*
+
+### Thanks
+- Ryman for the AsBytes implementation
+- jag426 and jaredly for documentation fixes
+- eternaleye on #rust IRC for his help on the new macro syntax
+
+### Changed
+- the AsBytes trait improves readability, no more b"...", but "..." instead
+- Incomplete will now hold either Needed;;Unknown, or Needed::Size(u32). Matching on Incomplete without caring for the value is done with `Incomplete(_)`, but if more granularity is mandatory, `Needed` can be matched too
+- `alt!` can pass the result of the parser to a closure
+- the `take_*` macros changed behaviour, the default case is now not to consume the separator. The macros have been renamed as follows: `take_until!` -> `take_until_and_consume!`, `take_until_and_leave!` -> `take_until!`, `take_until_either_and_leave!` -> `take_until_either!`, `take_until_either!` -> `take_until_either_and_consume!`
+
+### Added
+- `peek!` macro: matches the future input but does not consume it
+- `length_value!` macro: the first argument is a parser returning a `n` that can cast to usize, then applies the second parser `n` times. The macro has a variant with a third argument indicating the expected input size for the second parser
+- benchmarks are available at https://github.com/Geal/nom_benchmarks
+- more documentation
+- **Unnamed parser syntax**: warning, this is a breaking change. With this new syntax, the macro combinators do not generate functions anymore, they create blocks. That way, they can be nested, for better readability. The `named!` macro is provided to create functions from parsers. Please be aware that nesting parsers comes with a small cost of compilation time, negligible in most cases, but can quickly get to the minutes scale if not careful. If this happens, separate your parsers in multiple subfunctions.
+- `named!`, `closure!` and `call!` macros used to support the unnamed syntax
+- `map!`, `map_opt!` and `map_res!` to combine a parser with a normal function, transforming the input directly, or returning an `Option` or `Result`
+
+### Fixed
+- `is_a!` is now working properly
+
+### Removed
+- the `o!` macro does less than `chain!`, so it has been removed
+- the `fold0!` and `fold1!` macros were too complex and awkward to use, the `many*` combinators will be useful for most uses for now
+
+## 0.1.6 - 2015-02-24
+### Changed
+- consumers must have an end method that will be called after parsing
+
+### Added
+- big endian unsigned int and float parsers: be_u8, be_u16, be_u32, be_u64, be_f32, be_f64
+- producers can seek
+- function and macros documentation
+- README documentation
+### Fixed
+- lifetime declarations
+- tag! can return Incomplete
+
+## 0.1.5 - 2015-02-17
+### Changed
+- traits were renamed: FlatMapper -> FlatMap, Mapper -> FlatMapOpt, Mapper2 -> Functor
+
+### Fixed
+- woeks with rustc f1bb6c2f4
+
+## 0.1.4 - 2015-02-17
+### Changed
+- the chaining macro can take optional arguments with '?'
+
+## 0.1.3 - 2015-02-16
+### Changed
+- the chaining macro now takes the closure at the end of the argument list
+
+## 0.1.2 - 2015-02-16
+### Added
+- flat_map implementation for <&[u8], &[u8]>
+- chaining macro
+- partial MP4 parser example
+
+
+## 0.1.1 - 2015-02-06
+### Fixed
+- closure syntax change
+
+## Compare code
+
+* [unreleased](https://github.com/Geal/nom/compare/6.0.1...HEAD)
+* [6.0.0](https://github.com/Geal/nom/compare/6.0.0...6.0.1)
+* [6.0.0](https://github.com/Geal/nom/compare/5.1.1...6.0.0)
+* [5.1.1](https://github.com/Geal/nom/compare/5.1.0...5.1.1)
+* [5.1.0](https://github.com/Geal/nom/compare/5.0.1...5.1.0)
+* [5.0.1](https://github.com/Geal/nom/compare/5.0.0...5.0.1)
+* [5.0.0](https://github.com/Geal/nom/compare/4.2.3...5.0.0)
+* [4.2.3](https://github.com/Geal/nom/compare/4.2.2...4.2.3)
+* [4.2.2](https://github.com/Geal/nom/compare/4.2.1...4.2.2)
+* [4.2.1](https://github.com/Geal/nom/compare/4.2.0...4.2.1)
+* [4.2.0](https://github.com/Geal/nom/compare/4.1.1...4.2.0)
+* [4.1.1](https://github.com/Geal/nom/compare/4.1.0...4.1.1)
+* [4.1.0](https://github.com/Geal/nom/compare/4.0.0...4.1.0)
+* [4.0.0](https://github.com/Geal/nom/compare/3.2.1...4.0.0)
+* [3.2.1](https://github.com/Geal/nom/compare/3.2.0...3.2.1)
+* [3.2.0](https://github.com/Geal/nom/compare/3.1.0...3.2.0)
+* [3.1.0](https://github.com/Geal/nom/compare/3.0.0...3.1.0)
+* [3.0.0](https://github.com/Geal/nom/compare/2.2.1...3.0.0)
+* [2.2.1](https://github.com/Geal/nom/compare/2.2.0...2.2.1)
+* [2.2.0](https://github.com/Geal/nom/compare/2.1.0...2.2.0)
+* [2.1.0](https://github.com/Geal/nom/compare/2.0.1...2.1.0)
+* [2.0.1](https://github.com/Geal/nom/compare/2.0.0...2.0.1)
+* [2.0.0](https://github.com/Geal/nom/compare/1.2.4...2.0.0)
+* [1.2.4](https://github.com/Geal/nom/compare/1.2.3...1.2.4)
+* [1.2.3](https://github.com/Geal/nom/compare/1.2.2...1.2.3)
+* [1.2.2](https://github.com/Geal/nom/compare/1.2.1...1.2.2)
+* [1.2.1](https://github.com/Geal/nom/compare/1.2.0...1.2.1)
+* [1.2.0](https://github.com/Geal/nom/compare/1.1.0...1.2.0)
+* [1.1.0](https://github.com/Geal/nom/compare/1.0.1...1.1.0)
+* [1.0.1](https://github.com/Geal/nom/compare/1.0.0...1.0.1)
+* [1.0.0](https://github.com/Geal/nom/compare/0.5.0...1.0.0)
+* [0.5.0](https://github.com/geal/nom/compare/0.4.0...0.5.0)
+* [0.4.0](https://github.com/geal/nom/compare/0.3.11...0.4.0)
+* [0.3.11](https://github.com/geal/nom/compare/0.3.10...0.3.11)
+* [0.3.10](https://github.com/geal/nom/compare/0.3.9...0.3.10)
+* [0.3.9](https://github.com/geal/nom/compare/0.3.8...0.3.9)
+* [0.3.8](https://github.com/Geal/nom/compare/0.3.7...0.3.8)
+* [0.3.7](https://github.com/Geal/nom/compare/0.3.6...0.3.7)
+* [0.3.6](https://github.com/Geal/nom/compare/0.3.5...0.3.6)
+* [0.3.5](https://github.com/Geal/nom/compare/0.3.4...0.3.5)
+* [0.3.4](https://github.com/Geal/nom/compare/0.3.3...0.3.4)
+* [0.3.3](https://github.com/Geal/nom/compare/0.3.2...0.3.3)
+* [0.3.2](https://github.com/Geal/nom/compare/0.3.1...0.3.2)
+* [0.3.1](https://github.com/Geal/nom/compare/0.3.0...0.3.1)
+* [0.3.0](https://github.com/Geal/nom/compare/0.2.2...0.3.0)
+* [0.2.2](https://github.com/Geal/nom/compare/0.2.1...0.2.2)
+* [0.2.1](https://github.com/Geal/nom/compare/0.2.0...0.2.1)
+* [0.2.0](https://github.com/Geal/nom/compare/0.1.6...0.2.0)
+* [0.1.6](https://github.com/Geal/nom/compare/0.1.5...0.1.6)
+* [0.1.5](https://github.com/Geal/nom/compare/0.1.4...0.1.5)
+* [0.1.4](https://github.com/Geal/nom/compare/0.1.3...0.1.4)
+* [0.1.3](https://github.com/Geal/nom/compare/0.1.2...0.1.3)
+* [0.1.2](https://github.com/Geal/nom/compare/0.1.1...0.1.2)
+* [0.1.1](https://github.com/Geal/nom/compare/0.1.0...0.1.1)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/doc/nom_recipes.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/doc/nom_recipes.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/doc/nom_recipes.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/doc/nom_recipes.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,295 @@
+# Nom Recipes
+
+These are short recipes for accomplishing common tasks with nom.
+
+* [Whitespace](#whitespace)
+  + [Wrapper combinators that eat whitespace before and after a parser](#wrapper-combinators-that-eat-whitespace-before-and-after-a-parser)
+* [Comments](#comments)
+  + [`// C++/EOL-style comments`](#-ceol-style-comments)
+  + [`/* C-style comments */`](#-c-style-comments-)
+* [Identifiers](#identifiers)
+  + [`Rust-Style Identifiers`](#rust-style-identifiers)
+* [Literal Values](#literal-values)
+  + [Escaped Strings](#escaped-strings)
+  + [Integers](#integers)
+    - [Hexadecimal](#hexadecimal)
+    - [Octal](#octal)
+    - [Binary](#binary)
+    - [Decimal](#decimal)
+  + [Floating Point Numbers](#floating-point-numbers)
+
+## Whitespace
+
+
+
+### Wrapper combinators that eat whitespace before and after a parser
+
+```rust
+/// A combinator that takes a parser `inner` and produces a parser that also consumes both leading and 
+/// trailing whitespace, returning the output of `inner`.
+fn ws<'a, F: 'a, O, E: ParseError<&'a str>>(inner: F) -> impl FnMut(&'a str) -> IResult<&'a str, O, E>
+  where
+  F: Fn(&'a str) -> IResult<&'a str, O, E>,
+{
+  delimited(
+    multispace0,
+    inner,
+    multispace0
+  )
+}
+```
+
+To eat only trailing whitespace, replace `delimited(...)` with `terminated(&inner, multispace0)`.
+Likewise, the eat only leading whitespace, replace `delimited(...)` with `preceded(multispace0,
+&inner)`. You can use your own parser instead of `multispace0` if you want to skip a different set
+of lexemes.
+
+## Comments
+
+### `// C++/EOL-style comments`
+
+This version uses `%` to start a comment, does not consume the newline character, and returns an
+output of `()`.
+
+```rust
+pub fn peol_comment<'a, E: ParseError<&'a str>>(i: &'a str) -> IResult<&'a str, (), E>
+{
+  value(
+    (), // Output is thrown away.
+    pair(char('%'), is_not("\n\r"))
+  )(i)
+}
+```
+
+### `/* C-style comments */`
+
+Inline comments surrounded with sentinel tags `(*` and `*)`. This version returns an output of `()`
+and does not handle nested comments.
+
+```rust
+pub fn pinline_comment<'a, E: ParseError<&'a str>>(i: &'a str) -> IResult<&'a str, (), E> {
+  value(
+    (), // Output is thrown away.
+    tuple((
+      tag("(*"),
+      take_until("*)"),
+      tag("*)")
+    ))
+  )(i)
+}
+```
+
+## Identifiers
+
+### `Rust-Style Identifiers`
+
+Parsing identifiers that may start with a letter (or underscore) and may contain underscores,
+letters and numbers may be parsed like this:
+
+```rust
+pub fn identifier(input: &str) -> IResult<&str, &str> {
+  recognize(
+    pair(
+      alt((alpha1, tag("_"))),
+      many0(alt((alphanumeric1, tag("_"))))
+    )
+  )(input)
+}
+```
+
+Let's say we apply this to the identifier `hello_world123abc`. The first `alt` parser would
+recognize `h`. The `pair` combinator ensures that `ello_world123abc` will be piped to the next
+`alphanumeric0` parser, which recognizes every remaining character. However, the `pair` combinator
+returns a tuple of the results of its sub-parsers. The `recognize` parser produces a `&str` of the
+input text that was parsed, which in this case is the entire `&str` `hello_world123abc`.
+
+## Literal Values
+
+### Escaped Strings
+
+This is [one of the examples](https://github.com/Geal/nom/blob/master/examples/string.rs) in the
+examples directory.
+
+### Integers
+
+The following recipes all return string slices rather than integer values. How to obtain an
+integer value instead is demonstrated for hexadecimal integers. The others are similar.
+
+The parsers allow the grouping character `_`, which allows one to group the digits by byte, for
+example: `0xA4_3F_11_28`. If you prefer to exclude the `_` character, the lambda to convert from a
+string slice to an integer value is slightly simpler. You can also strip the `_` from the string
+slice that is returned, which is demonstrated in the second hexdecimal number parser.
+
+If you wish to limit the number of digits in a valid integer literal, replace `many1` with
+`many_m_n` in the recipes.
+
+#### Hexadecimal
+
+The parser outputs the string slice of the digits without the leading `0x`/`0X`.
+
+```rust
+fn hexadecimal(input: &str) -> IResult<&str, &str> { // <'a, E: ParseError<&'a str>>
+  preceded(
+    alt((tag("0x"), tag("0X"))),
+    recognize(
+      many1(
+        terminated(one_of("0123456789abcdefABCDEF"), many0(char('_')))
+      )
+    )
+  )(input)
+}
+```
+
+If you want it to return the integer value instead, use map:
+
+```rust
+fn hexadecimal_value(input: &str) -> IResult<&str, i64> {
+  map_res(
+    preceded(
+      alt((tag("0x"), tag("0X"))),
+      recognize(
+        many1(
+          terminated(one_of("0123456789abcdefABCDEF"), many0(char('_')))
+        )
+      )
+    ),
+    |out: &str| i64::from_str_radix(&str::replace(&out, "_", ""), 16)
+  )(input)
+}
+```
+
+#### Octal
+
+```rust
+fn octal(input: &str) -> IResult<&str, &str> {
+  preceded(
+    alt((tag("0o"), tag("0O"))),
+    recognize(
+      many1(
+        terminated(one_of("01234567"), many0(char('_')))
+      )
+    )
+  )(input)
+}
+```
+
+#### Binary
+
+```rust
+fn binary(input: &str) -> IResult<&str, &str> {
+  preceded(
+    alt((tag("0b"), tag("0B"))),
+    recognize(
+      many1(
+        terminated(one_of("01"), many0(char('_')))
+      )
+    )
+  )(input)
+}
+```
+
+#### Decimal
+
+```rust
+fn decimal(input: &str) -> IResult<&str, &str> {
+  recognize(
+    many1(
+      terminated(one_of("0123456789"), many0(char('_')))
+    )
+  )(input)
+}
+```
+
+### Floating Point Numbers
+
+The following is adapted from [the Python parser by Valentin Lorentz (ProgVal)](https://github.com/ProgVal/rust-python-parser/blob/master/src/numbers.rs).
+
+```rust
+fn float(input: &str) -> IResult<&str, &str> {
+  alt((
+    // Case one: .42
+    recognize(
+      tuple((
+        char('.'),
+        decimal,
+        opt(tuple((
+          one_of("eE"),
+          opt(one_of("+-")),
+          decimal
+        )))
+      ))
+    )
+    , // Case two: 42e42 and 42.42e42
+    recognize(
+      tuple((
+        decimal,
+        opt(preceded(
+          char('.'),
+          decimal,
+        )),
+        one_of("eE"),
+        opt(one_of("+-")),
+        decimal
+      ))
+    )
+    , // Case three: 42. and 42.42
+    recognize(
+      tuple((
+        decimal,
+        char('.'),
+        opt(decimal)
+      ))
+    )
+  ))(input)
+}
+```
+
+# implementing FromStr
+
+The [FromStr trait](https://doc.rust-lang.org/std/str/trait.FromStr.html) provides
+a common interface to parse from a string.
+
+```rust
+use nom::{
+  IResult, Finish, error::Error,
+  bytes::complete::{tag, take_while},
+};
+use std::str::FromStr;
+
+// will recognize the name in "Hello, name!"
+fn parse_name(input: &str) -> IResult<&str, &str> {
+  let (i, _) = tag("Hello, ")(input)?;
+  let (i, name) = take_while(|c:char| c.is_alphabetic())(i)?;
+  let (i, _) = tag("!")(i)?;
+
+  Ok((i, name))
+}
+
+// with FromStr, the result cannot be a reference to the input, it must be owned
+#[derive(Debug)]
+pub struct Name(pub String);
+
+impl FromStr for Name {
+  // the error must be owned as well
+  type Err = Error<String>;
+
+  fn from_str(s: &str) -> Result<Self, Self::Err> {
+      match parse_name(s).finish() {
+          Ok((_remaining, name)) => Ok(Name(name.to_string())),
+          Err(Error { input, code }) => Err(Error {
+              input: input.to_string(),
+              code,
+          })
+      }
+  }
+}
+
+fn main() {
+  // parsed: Ok(Name("nom"))
+  println!("parsed: {:?}", "Hello, nom!".parse::<Name>());
+
+  // parsed: Err(Error { input: "123!", code: Tag })
+  println!("parsed: {:?}", "Hello, 123!".parse::<Name>());
+}
+```
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+Copyright (c) 2014-2019 Geoffroy Couprie
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,318 @@
+# nom, eating data byte by byte
+
+[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+[![Join the chat at https://gitter.im/Geal/nom](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Geal/nom?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/Geal/nom.svg?branch=master)](https://travis-ci.org/Geal/nom)
+[![Coverage Status](https://coveralls.io/repos/Geal/nom/badge.svg?branch=master)](https://coveralls.io/r/Geal/nom?branch=master)
+[![Crates.io Version](https://img.shields.io/crates/v/nom.svg)](https://crates.io/crates/nom)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.44.0+-lightgray.svg)](#rust-version-requirements)
+
+nom is a parser combinators library written in Rust. Its goal is to provide tools
+to build safe parsers without compromising the speed or memory consumption. To
+that end, it uses extensively Rust's *strong typing* and *memory safety* to produce
+fast and correct parsers, and provides functions, macros and traits to abstract most of the
+error prone plumbing.
+
+![nom logo in CC0 license, by Ange Albertini](https://raw.githubusercontent.com/Geal/nom/master/assets/nom.png)
+
+*nom will happily take a byte out of your files :)*
+
+## Example
+
+[Hexadecimal color](https://developer.mozilla.org/en-US/docs/Web/CSS/color) parser:
+
+```rust
+extern crate nom;
+use nom::{
+  IResult,
+  bytes::complete::{tag, take_while_m_n},
+  combinator::map_res,
+  sequence::tuple
+};
+
+#[derive(Debug,PartialEq)]
+pub struct Color {
+  pub red:   u8,
+  pub green: u8,
+  pub blue:  u8,
+}
+
+fn from_hex(input: &str) -> Result<u8, std::num::ParseIntError> {
+  u8::from_str_radix(input, 16)
+}
+
+fn is_hex_digit(c: char) -> bool {
+  c.is_digit(16)
+}
+
+fn hex_primary(input: &str) -> IResult<&str, u8> {
+  map_res(
+    take_while_m_n(2, 2, is_hex_digit),
+    from_hex
+  )(input)
+}
+
+fn hex_color(input: &str) -> IResult<&str, Color> {
+  let (input, _) = tag("#")(input)?;
+  let (input, (red, green, blue)) = tuple((hex_primary, hex_primary, hex_primary))(input)?;
+
+  Ok((input, Color { red, green, blue }))
+}
+
+fn main() {}
+
+#[test]
+fn parse_color() {
+  assert_eq!(hex_color("#2F14DF"), Ok(("", Color {
+    red: 47,
+    green: 20,
+    blue: 223,
+  })));
+}
+```
+
+## Documentation
+
+- [Reference documentation](https://docs.rs/nom)
+- [Various design documents and tutorials](https://github.com/Geal/nom/tree/master/doc)
+- [List of combinators and their behaviour](https://github.com/Geal/nom/blob/master/doc/choosing_a_combinator.md)
+
+If you need any help developing your parsers, please ping `geal` on IRC (freenode, geeknode, oftc), go to `#nom-parsers` on Freenode IRC, or on the [Gitter chat room](https://gitter.im/Geal/nom).
+
+## Why use nom
+
+If you want to write:
+
+### Binary format parsers
+
+nom was designed to properly parse binary formats from the beginning. Compared
+to the usual handwritten C parsers, nom parsers are just as fast, free from
+buffer overflow vulnerabilities, and handle common patterns for you:
+
+- [TLV](https://en.wikipedia.org/wiki/Type-length-value)
+- Bit level parsing
+- Hexadecimal viewer in the debugging macros for easy data analysis
+- Streaming parsers for network formats and huge files
+
+Example projects:
+
+- [FLV parser](https://github.com/rust-av/flavors)
+- [Matroska parser](https://github.com/rust-av/matroska)
+- [tar parser](https://github.com/Keruspe/tar-parser.rs)
+
+### Text format parsers
+
+While nom was made for binary format at first, it soon grew to work just as
+well with text formats. From line based formats like CSV, to more complex, nested
+formats such as JSON, nom can manage it, and provides you with useful tools:
+
+- Fast case insensitive comparison
+- Recognizers for escaped strings
+- Regular expressions can be embedded in nom parsers to represent complex character patterns succinctly
+- Special care has been given to managing non ASCII characters properly
+
+Example projects:
+
+- [HTTP proxy](https://github.com/sozu-proxy/sozu/blob/master/lib/src/protocol/http/parser.rs)
+- [TOML parser](https://github.com/joelself/tomllib)
+
+### Programming language parsers
+
+While programming language parsers are usually written manually for more
+flexibility and performance, nom can be (and has been successfully) used
+as a prototyping parser for a language.
+
+nom will get you started quickly with powerful custom error types, that you
+can leverage with [nom_locate](https://github.com/fflorent/nom_locate) to
+pinpoint the exact line and column of the error. No need for separate
+tokenizing, lexing and parsing phases: nom can automatically handle whitespace
+parsing, and construct an AST in place.
+
+Example projects:
+
+- [PHP VM](https://github.com/tagua-vm/parser)
+- eve language prototype
+- [xshade shading language](https://github.com/xshade-lang/xshade/)
+
+### Streaming formats
+
+While a lot of formats (and the code handling them) assume that they can fit
+the complete data in memory, there are formats for which we only get a part
+of the data at once, like network formats, or huge files.
+nom has been designed for a correct behaviour with partial data: If there is
+not enough data to decide, nom will tell you it needs more instead of silently
+returning a wrong result. Whether your data comes entirely or in chunks, the
+result should be the same.
+
+It allows you to build powerful, deterministic state machines for your protocols.
+
+Example projects:
+
+- [HTTP proxy](https://github.com/sozu-proxy/sozu/blob/master/lib/src/protocol/http/parser.rs)
+- [Using nom with generators](https://github.com/Geal/generator_nom)
+
+## Parser combinators
+
+Parser combinators are an approach to parsers that is very different from
+software like [lex](https://en.wikipedia.org/wiki/Lex_(software)) and
+[yacc](https://en.wikipedia.org/wiki/Yacc). Instead of writing the grammar
+in a separate file and generating the corresponding code, you use very
+small functions with very specific purpose, like "take 5 bytes", or
+"recognize the word 'HTTP'", and assemble then in meaningful patterns
+like "recognize 'HTTP', then a space, then a version".
+The resulting code is small, and looks like the grammar you would have
+written with other parser approaches.
+
+This has a few advantages:
+
+- The parsers are small and easy to write
+- The parsers components are easy to reuse (if they're general enough, please add them to nom!)
+- The parsers components are easy to test separately (unit tests and property-based tests)
+- The parser combination code looks close to the grammar you would have written
+- You can build partial parsers, specific to the data you need at the moment, and ignore the rest
+
+## Technical features
+
+nom parsers are for:
+- [x] **byte-oriented**: The basic type is `&[u8]` and parsers will work as much as possible on byte array slices (but are not limited to them)
+- [x] **bit-oriented**: nom can address a byte slice as a bit stream
+- [x] **string-oriented**: The same kind of combinators can apply on UTF-8 strings as well
+- [x] **zero-copy**: If a parser returns a subset of its input data, it will return a slice of that input, without copying
+- [x] **streaming**: nom can work on partial data and detect when it needs more data to produce a correct result
+- [x] **descriptive errors**: The parsers can aggregate a list of error codes with pointers to the incriminated input slice. Those error lists can be pattern matched to provide useful messages.
+- [x] **custom error types**: You can provide a specific type to improve errors returned by parsers
+- [x] **safe parsing**: nom leverages Rust's safe memory handling and powerful types, and parsers are routinely fuzzed and tested with real world data. So far, the only flaws found by fuzzing were in code written outside of nom
+- [x] **speed**: Benchmarks have shown that nom parsers often outperform many parser combinators library like Parsec and attoparsec, some regular expression engines and even handwritten C parsers
+
+Some benchmarks are available on [Github](https://github.com/Geal/nom_benchmarks).
+
+## Rust version requirements
+
+The 6.0 series of nom requires **Rustc version 1.44 or greater** (compatible with 1.37 if building without the `alloc` or `std` features, ie `--no-default-features --features="regex,lexical"`).
+
+Travis CI always has a build with a pinned version of Rustc matching the oldest supported Rust release.
+The current policy is that this will only be updated in the next major nom release.
+
+## Installation
+
+nom is available on [crates.io](https://crates.io/crates/nom) and can be included in your Cargo enabled project like this:
+
+```toml
+[dependencies]
+nom = "6"
+```
+
+Then include it in your code like this:
+
+```rust,ignore
+#[macro_use]
+extern crate nom;
+```
+
+**NOTE: If you have existing code using nom below the 5.0 version, please take a look
+at the [upgrade documentation](https://github.com/Geal/nom/blob/master/doc/upgrading_to_nom_5.md)
+to handle the breaking changes.**
+
+There are a few compilation features:
+
+* `std`: (activated by default) if disabled, nom can work in `no_std` builds
+* `regexp`: Enables regular expression parsers with the `regex` crate
+
+You can activate those features like this:
+
+```toml
+[dependencies.nom]
+version = "6"
+features = ["regexp"]
+```
+
+# Related projects
+
+- [Get line and column info in nom's input type](https://github.com/fflorent/nom_locate)
+- [Using nom as lexer and parser](https://github.com/Rydgel/monkey-rust)
+
+# Parsers written with nom
+
+Here is a (non exhaustive) list of known projects using nom:
+
+- Text file formats: [Ceph Crush](https://github.com/cholcombe973/crushtool),
+[Cronenberg](https://github.com/ayrat555/cronenberg),
+[XFS Runtime Stats](https://github.com/ChrisMacNaughton/xfs-rs),
+[CSV](https://github.com/GuillaumeGomez/csv-parser),
+[FASTA](https://github.com/TianyiShi2001/nom-fasta),
+[FASTQ](https://github.com/elij/fastq.rs),
+[INI](https://github.com/Geal/nom/blob/master/tests/ini.rs),
+[ISO 8601 dates](https://github.com/badboy/iso8601),
+[libconfig-like configuration file format](https://github.com/filipegoncalves/rust-config),
+[Web archive](https://github.com/sbeckeriv/warc_nom_parser),
+[PDB](https://github.com/TianyiShi2001/nom-pdb),
+[proto files](https://github.com/tafia/protobuf-parser),
+[Fountain screenplay markup](https://github.com/adamchalmers/fountain-rs),
+[vimwiki](https://github.com/chipsenkbeil/vimwiki-server/tree/master/vimwiki) & [vimwiki_macros](https://github.com/chipsenkbeil/vimwiki-server/tree/master/vimwiki_macros)
+- Programming languages:
+[PHP](https://github.com/tagua-vm/parser),
+[Basic Calculator](https://github.com/balajisivaraman/basic_calculator_rs),
+[GLSL](https://github.com/phaazon/glsl),
+[Lua](https://github.com/doomrobo/nom-lua53),
+[Python](https://github.com/ProgVal/rust-python-parser),
+[SQL](https://github.com/ms705/nom-sql),
+[Elm](https://github.com/cout970/Elm-interpreter),
+[SystemVerilog](https://github.com/dalance/sv-parser),
+[Turtle](https://github.com/vandenoever/rome/tree/master/src/io/turtle),
+[CSML](https://github.com/CSML-by-Clevy/csml-interpreter)
+- Interface definition formats: [Thrift](https://github.com/thehydroimpulse/thrust)
+- Audio, video and image formats:
+[GIF](https://github.com/Geal/gif.rs),
+[MagicaVoxel .vox](https://github.com/davidedmonds/dot_vox),
+[midi](https://github.com/derekdreery/nom-midi-rs),
+[SWF](https://github.com/open-flash/swf-parser),
+[WAVE](http://github.com/noise-Labs/wave),
+[Matroska (MKV)](https://github.com/rust-av/matroska)
+- Document formats:
+[TAR](https://github.com/Keruspe/tar-parser.rs),
+[GZ](https://github.com/nharward/nom-gzip)
+- Cryptographic formats:
+[X.509](https://github.com/rusticata/x509-parser)
+- Network protocol formats:
+[Bencode](https://github.com/jbaum98/bencode.rs),
+[D-Bus](https://github.com/toshokan/misato),
+[DHCP](https://github.com/rusticata/dhcp-parser),
+[HTTP](https://github.com/sozu-proxy/sozu/tree/master/lib/src/protocol/http),
+[URI](https://github.com/santifa/rrp/blob/master/src/uri.rs),
+[IMAP](https://github.com/djc/tokio-imap),
+[IRC](https://github.com/Detegr/RBot-parser),
+[Pcap-NG](https://github.com/richo/pcapng-rs),
+[Pcap](https://github.com/ithinuel/pcap-rs),
+[Pcap + PcapNG](https://github.com/rusticata/pcap-parser),
+[IKEv2](https://github.com/rusticata/ipsec-parser),
+[NTP](https://github.com/rusticata/ntp-parser),
+[SNMP](https://github.com/rusticata/snmp-parser),
+[Kerberos v5](https://github.com/rusticata/kerberos-parser),
+[DER](https://github.com/rusticata/der-parser),
+[TLS](https://github.com/rusticata/tls-parser),
+[IPFIX / Netflow v10](https://github.com/dominotree/rs-ipfix),
+[GTP](https://github.com/fuerstenau/gorrosion-gtp),
+[SIP](https://github.com/armatusmiles/sipcore/tree/master/crates/sipmsg),
+[Prometheus](https://github.com/timberio/vector/blob/master/lib/prometheus-parser/src/line.rs)
+- Language specifications:
+[BNF](https://github.com/snewt/bnf)
+- Misc formats:
+[Gameboy ROM](https://github.com/MarkMcCaskey/gameboy-rom-parser),
+[ANT FIT](https://github.com/stadelmanma/fitparse-rs),
+[Version Numbers](https://github.com/fosskers/rs-versions),
+[Telcordia/Bellcore SR-4731 SOR OTDR files](https://github.com/JamesHarrison/otdrs),
+[MySQL binary log](https://github.com/PrivateRookie/boxercrab),
+[URI](https://github.com/Skasselbard/nom-uri),
+[Furigana](https://github.com/sachaarbonel/furigana.rs)
+
+Want to create a new parser using `nom`? A list of not yet implemented formats is available [here](https://github.com/Geal/nom/issues/14).
+
+Want to add your parser here? Create a pull request for it!
+
+# Contributors
+
+nom is the fruit of the work of many contributors over the years, many thanks for your help!
+
+<a href="https://github.com/geal/nom/graphs/contributors">
+  <img src="https://contributors-img.web.app/image?repo=geal/nom" />
+</a>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bits/complete.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bits/complete.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bits/complete.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bits/complete.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,83 @@
+//! Bit level parsers
+//!
+
+use crate::error::{ErrorKind, ParseError};
+use crate::internal::{Err, IResult};
+use crate::lib::std::ops::{AddAssign, Div, RangeFrom, Shl, Shr};
+use crate::traits::{InputIter, InputLength, Slice, ToUsize};
+
+/// Generates a parser taking `count` bits
+pub fn take<I, O, C, E: ParseError<(I, usize)>>(
+  count: C,
+) -> impl Fn((I, usize)) -> IResult<(I, usize), O, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+  C: ToUsize,
+  O: From<u8> + AddAssign + Shl<usize, Output = O> + Shr<usize, Output = O>,
+{
+  let count = count.to_usize();
+  move |(input, bit_offset): (I, usize)| {
+    if count == 0 {
+      Ok(((input, bit_offset), 0u8.into()))
+    } else {
+      let cnt = (count + bit_offset).div(8);
+      if input.input_len() * 8 < count + bit_offset {
+        Err(Err::Error(E::from_error_kind(
+          (input, bit_offset),
+          ErrorKind::Eof,
+        )))
+      } else {
+        let mut acc: O = (0 as u8).into();
+        let mut offset: usize = bit_offset;
+        let mut remaining: usize = count;
+        let mut end_offset: usize = 0;
+
+        for byte in input.iter_elements().take(cnt + 1) {
+          if remaining == 0 {
+            break;
+          }
+          let val: O = if offset == 0 {
+            byte.into()
+          } else {
+            ((byte << offset) as u8 >> offset).into()
+          };
+
+          if remaining < 8 - offset {
+            acc += val >> (8 - offset - remaining);
+            end_offset = remaining + offset;
+            break;
+          } else {
+            acc += val << (remaining - (8 - offset));
+            remaining -= 8 - offset;
+            offset = 0;
+          }
+        }
+        Ok(((input.slice(cnt..), end_offset), acc))
+      }
+    }
+  }
+}
+
+/// Generates a parser taking `count` bits and comparing them to `pattern`
+pub fn tag<I, O, C, E: ParseError<(I, usize)>>(
+  pattern: O,
+  count: C,
+) -> impl Fn((I, usize)) -> IResult<(I, usize), O, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength + Clone,
+  C: ToUsize,
+  O: From<u8> + AddAssign + Shl<usize, Output = O> + Shr<usize, Output = O> + PartialEq,
+{
+  let count = count.to_usize();
+  move |input: (I, usize)| {
+    let inp = input.clone();
+
+    take(count)(input).and_then(|(i, o)| {
+      if pattern == o {
+        Ok((i, o))
+      } else {
+        Err(Err::Error(error_position!(inp, ErrorKind::TagBits)))
+      }
+    })
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bits/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bits/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bits/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bits/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,265 @@
+//! Bit level parsers and combinators
+//!
+//! Bit parsing is handled by tweaking the input in most macros.
+//! In byte level parsing, the input is generally a `&[u8]` passed from combinator
+//! to combinator as the slices are manipulated.
+//!
+//! Bit parsers take a `(&[u8], usize)` as input. The first part of the tuple is a byte slice,
+//! the second part is a bit offset in the first byte of the slice.
+//!
+//! By passing a pair like this, we can leverage most of the existing combinators, and avoid
+//! transforming the whole slice to a vector of booleans. This should make it easy
+//! to see a byte slice as a bit stream, and parse code points of arbitrary bit length.
+//!
+
+/// Transforms its byte slice input into a bit stream for the underlying parser. This allows the
+/// given bit stream parser to work on a byte slice input.
+///
+/// Signature:
+/// `bits!( parser ) => ( &[u8], (&[u8], usize) -> IResult<(&[u8], usize), T> ) -> IResult<&[u8], T>`
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// # fn main() {
+///  named!( take_4_bits<u8>, bits!( take_bits!( 4u8 ) ) );
+///
+///  let input = vec![0xAB, 0xCD, 0xEF, 0x12];
+///  let sl    = &input[..];
+///
+///  assert_eq!(take_4_bits( sl ), Ok( (&sl[1..], 0xA) ));
+///  assert_eq!(take_4_bits( &b""[..] ), Err(Err::Incomplete(Needed::new(1))));
+/// # }
+#[macro_export(local_inner_macros)]
+macro_rules! bits (
+  ($i:expr, $submac:ident!( $($args:tt)* )) => ({
+    $crate::bits::bitsc($i, move |i| { $submac!(i, $($args)*) })
+  });
+  ($i:expr, $f:expr) => (
+    bits!($i, call!($f))
+  );
+);
+
+/// Counterpart to `bits`, `bytes!` transforms its bit stream input into a byte slice for the underlying
+/// parser, allowing byte-slice parsers to work on bit streams.
+///
+/// Signature:
+/// `bytes!( parser ) => ( (&[u8], usize), &[u8] -> IResult<&[u8], T> ) -> IResult<(&[u8], usize), T>`,
+///
+/// A partial byte remaining in the input will be ignored and the given parser will start parsing
+/// at the next full byte.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::combinator::rest;
+/// # use nom::error::{Error, ErrorKind};
+/// # fn main() {
+///
+/// named!( parse<(u8, u8, &[u8])>,  bits!( tuple!(
+///    take_bits!(4u8),
+///    take_bits!(8u8),
+///    bytes!(rest::<_, Error<_>>)
+/// )));
+///
+///  let input = &[0xde, 0xad, 0xbe, 0xaf];
+///
+///  assert_eq!(parse( input ), Ok(( &[][..], (0xd, 0xea, &[0xbe, 0xaf][..]) )));
+/// # }
+#[macro_export(local_inner_macros)]
+macro_rules! bytes (
+  ($i:expr, $submac:ident!( $($args:tt)* )) => ({
+    $crate::bits::bytesc($i, move |i| { $submac!(i, $($args)*) })
+  });
+  ($i:expr, $f:expr) => (
+    bytes!($i, call!($f))
+  );
+);
+
+/// Consumes the specified number of bits and returns them as the specified type.
+///
+/// Signature:
+/// `take_bits!(type, count) => ( (&[T], usize), U, usize) -> IResult<(&[T], usize), U>`
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+/// named!(bits_pair<(&[u8], usize), (u8, u8)>, pair!( take_bits!(4u8), take_bits!(4u8) ) );
+/// named!( take_pair<(u8, u8)>, bits!( bits_pair ) );
+///
+/// let input = vec![0xAB, 0xCD, 0xEF];
+/// let sl    = &input[..];
+///
+/// assert_eq!(take_pair( sl ),       Ok((&sl[1..], (0xA, 0xB))) );
+/// assert_eq!(take_pair( &sl[1..] ), Ok((&sl[2..], (0xC, 0xD))) );
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_bits (
+  ($i:expr, $count:expr) => (
+    {
+      let res: $crate::IResult<_, _> = $crate::bits::streaming::take($count)($i);
+      res
+    }
+  );
+);
+
+/// Matches the given bit pattern.
+///
+/// Signature:
+/// `tag_bits!(type, count, pattern) => ( (&[T], usize), U, usize, U) -> IResult<(&[T], usize), U>`
+///
+/// The caller must specify the number of bits to consume. The matched value is included in the
+/// result on success.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!( take_a<u8>, bits!( tag_bits!(4usize, 0xA) ) );
+///
+///  let input = vec![0xAB, 0xCD, 0xEF];
+///  let sl    = &input[..];
+///
+///  assert_eq!(take_a( sl ),       Ok((&sl[1..], 0xA)) );
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! tag_bits (
+  ($i:expr, $count:expr, $p: expr) => (
+    {
+      let res: $crate::IResult<_, _> = $crate::bits::streaming::tag($p, $count)($i);
+      res
+    }
+  )
+);
+
+#[cfg(test)]
+mod tests {
+  use crate::error::ErrorKind;
+  use crate::internal::{Err, IResult, Needed};
+  use crate::lib::std::ops::{AddAssign, Shl, Shr};
+
+  #[test]
+  fn take_bits() {
+    let input = [0b10_10_10_10, 0b11_11_00_00, 0b00_11_00_11];
+    let sl = &input[..];
+
+    assert_eq!(take_bits!((sl, 0), 0u8), Ok(((sl, 0), 0)));
+    assert_eq!(take_bits!((sl, 0), 8u8), Ok(((&sl[1..], 0), 170)));
+    assert_eq!(take_bits!((sl, 0), 3u8), Ok(((&sl[0..], 3), 5)));
+    assert_eq!(take_bits!((sl, 0), 6u8), Ok(((&sl[0..], 6), 42)));
+    assert_eq!(take_bits!((sl, 1), 1u8), Ok(((&sl[0..], 2), 0)));
+    assert_eq!(take_bits!((sl, 1), 2u8), Ok(((&sl[0..], 3), 1)));
+    assert_eq!(take_bits!((sl, 1), 3u8), Ok(((&sl[0..], 4), 2)));
+    assert_eq!(take_bits!((sl, 6), 3u8), Ok(((&sl[1..], 1), 5)));
+    assert_eq!(take_bits!((sl, 0), 10u8), Ok(((&sl[1..], 2), 683)));
+    assert_eq!(take_bits!((sl, 0), 8u8), Ok(((&sl[1..], 0), 170)));
+    assert_eq!(take_bits!((sl, 6), 10u8), Ok(((&sl[2..], 0), 752)));
+    assert_eq!(take_bits!((sl, 6), 11u8), Ok(((&sl[2..], 1), 1504)));
+    assert_eq!(take_bits!((sl, 0), 20u8), Ok(((&sl[2..], 4), 700_163)));
+    assert_eq!(take_bits!((sl, 4), 20u8), Ok(((&sl[3..], 0), 716_851)));
+    let r: IResult<_, u32> = take_bits!((sl, 4), 22u8);
+    assert_eq!(r, Err(Err::Incomplete(Needed::new(22))));
+  }
+
+  #[test]
+  fn tag_bits() {
+    let input = [0b10_10_10_10, 0b11_11_00_00, 0b00_11_00_11];
+    let sl = &input[..];
+
+    assert_eq!(tag_bits!((sl, 0), 3u8, 0b101), Ok(((&sl[0..], 3), 5)));
+    assert_eq!(tag_bits!((sl, 0), 4u8, 0b1010), Ok(((&sl[0..], 4), 10)));
+  }
+
+  named!(ch<(&[u8],usize),(u8,u8)>,
+    do_parse!(
+      tag_bits!(3u8, 0b101) >>
+      x: take_bits!(4u8)    >>
+      y: take_bits!(5u8)    >>
+      (x,y)
+    )
+  );
+
+  #[test]
+  fn chain_bits() {
+    let input = [0b10_10_10_10, 0b11_11_00_00, 0b00_11_00_11];
+    let sl = &input[..];
+    assert_eq!(ch((&input[..], 0)), Ok(((&sl[1..], 4), (5, 15))));
+    assert_eq!(ch((&input[..], 4)), Ok(((&sl[2..], 0), (7, 16))));
+    assert_eq!(ch((&input[..1], 0)), Err(Err::Incomplete(Needed::new(5))));
+  }
+
+  named!(ch_bytes<(u8, u8)>, bits!(ch));
+  #[test]
+  fn bits_to_bytes() {
+    let input = [0b10_10_10_10, 0b11_11_00_00, 0b00_11_00_11];
+    assert_eq!(ch_bytes(&input[..]), Ok((&input[2..], (5, 15))));
+    assert_eq!(ch_bytes(&input[..1]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(
+      ch_bytes(&input[1..]),
+      Err(Err::Error(error_position!(&input[1..], ErrorKind::TagBits)))
+    );
+  }
+
+  named!(
+    bits_bytes_bs,
+    bits!(bytes!(
+      crate::combinator::rest::<_, crate::error::Error<&[u8]>>
+    ))
+  );
+  #[test]
+  fn bits_bytes() {
+    let input = [0b10_10_10_10];
+    assert_eq!(
+      bits_bytes_bs(&input[..]),
+      Ok((&[][..], &[0b10_10_10_10][..]))
+    );
+  }
+
+  #[derive(PartialEq, Debug)]
+  struct FakeUint(u32);
+
+  impl AddAssign for FakeUint {
+    fn add_assign(&mut self, other: FakeUint) {
+      *self = FakeUint(self.0 + other.0);
+    }
+  }
+
+  impl Shr<usize> for FakeUint {
+    type Output = FakeUint;
+
+    fn shr(self, shift: usize) -> FakeUint {
+      FakeUint(self.0 >> shift)
+    }
+  }
+
+  impl Shl<usize> for FakeUint {
+    type Output = FakeUint;
+
+    fn shl(self, shift: usize) -> FakeUint {
+      FakeUint(self.0 << shift)
+    }
+  }
+
+  impl From<u8> for FakeUint {
+    fn from(i: u8) -> FakeUint {
+      FakeUint(u32::from(i))
+    }
+  }
+
+  #[test]
+  fn non_privitive_type() {
+    let input = [0b10_10_10_10, 0b11_11_00_00, 0b00_11_00_11];
+    let sl = &input[..];
+
+    assert_eq!(
+      take_bits!((sl, 0), 20u8),
+      Ok(((&sl[2..], 4), FakeUint(700_163)))
+    );
+    assert_eq!(
+      take_bits!((sl, 4), 20u8),
+      Ok(((&sl[3..], 0), FakeUint(716_851)))
+    );
+    let r3: IResult<_, FakeUint> = take_bits!((sl, 4), 22u8);
+    assert_eq!(r3, Err(Err::Incomplete(Needed::new(22))));
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bits/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bits/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bits/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bits/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,129 @@
+//! Bit level parsers
+//!
+
+#[macro_use]
+mod macros;
+
+pub mod complete;
+pub mod streaming;
+
+use crate::error::{ErrorKind, ParseError};
+use crate::internal::{Err, IResult, Needed};
+use crate::lib::std::ops::RangeFrom;
+use crate::traits::{ErrorConvert, Slice};
+
+/// Converts a byte-level input to a bit-level input, for consumption by a parser that uses bits.
+///
+/// Afterwards, the input is converted back to a byte-level parser, with any remaining bits thrown
+/// away.
+///
+/// # Example
+/// ```ignore
+/// # #[macro_use] extern crate nom;
+/// # use nom::IResult;
+/// use nom::bits::bits;
+/// use nom::bits::complete::take;
+/// use nom::error::Error;
+///
+/// fn take_4_bits(input: &[u8]) -> IResult<&[u8], u64> {
+///   bits(take::<_, _, _, Error<_>>(4usize))(input)
+/// }
+///
+/// let input = vec![0xAB, 0xCD, 0xEF, 0x12];
+/// let sl    = &input[..];
+///
+/// assert_eq!(take_4_bits( sl ), Ok( (&sl[1..], 0xA) ));
+/// ```
+pub fn bits<I, O, E1: ParseError<(I, usize)> + ErrorConvert<E2>, E2: ParseError<I>, P>(
+  mut parser: P,
+) -> impl FnMut(I) -> IResult<I, O, E2>
+where
+  I: Slice<RangeFrom<usize>>,
+  P: FnMut((I, usize)) -> IResult<(I, usize), O, E1>,
+{
+  move |input: I| match parser((input, 0)) {
+    Ok(((rest, offset), res)) => {
+      let byte_index = offset / 8 + if offset % 8 == 0 { 0 } else { 1 };
+      Ok((rest.slice(byte_index..), res))
+    }
+    Err(Err::Incomplete(n)) => Err(Err::Incomplete(n.map(|u| u.get() / 8 + 1))),
+    Err(Err::Error(e)) => Err(Err::Error(e.convert())),
+    Err(Err::Failure(e)) => Err(Err::Failure(e.convert())),
+  }
+}
+
+#[doc(hidden)]
+pub fn bitsc<I, O, E1: ParseError<(I, usize)> + ErrorConvert<E2>, E2: ParseError<I>, P>(
+  input: I,
+  parser: P,
+) -> IResult<I, O, E2>
+where
+  I: Slice<RangeFrom<usize>>,
+  P: FnMut((I, usize)) -> IResult<(I, usize), O, E1>,
+{
+  bits(parser)(input)
+}
+
+/// Counterpart to `bits`, `bytes` transforms its bit stream input into a byte slice for the underlying
+/// parser, allowing byte-slice parsers to work on bit streams.
+///
+/// A partial byte remaining in the input will be ignored and the given parser will start parsing
+/// at the next full byte.
+///
+/// ```ignore
+/// # #[macro_use] extern crate nom;
+/// # use nom::IResult;
+/// # use nom::combinator::rest;
+/// # use nom::sequence::tuple;
+/// use nom::bits::{bits, bytes, streaming::take_bits};
+///
+/// fn parse(input: &[u8]) -> IResult<&[u8], (u8, u8, &[u8])> {
+///   bits(tuple((
+///     take_bits(4usize),
+///     take_bits(8usize),
+///     bytes(rest)
+///   )))(input)
+/// }
+///
+/// let input = &[0xde, 0xad, 0xbe, 0xaf];
+///
+/// assert_eq!(parse( input ), Ok(( &[][..], (0xd, 0xea, &[0xbe, 0xaf][..]) )));
+/// ```
+pub fn bytes<I, O, E1: ParseError<I> + ErrorConvert<E2>, E2: ParseError<(I, usize)>, P>(
+  mut parser: P,
+) -> impl FnMut((I, usize)) -> IResult<(I, usize), O, E2>
+where
+  I: Slice<RangeFrom<usize>> + Clone,
+  P: FnMut(I) -> IResult<I, O, E1>,
+{
+  move |(input, offset): (I, usize)| {
+    let inner = if offset % 8 != 0 {
+      input.slice((1 + offset / 8)..)
+    } else {
+      input.slice((offset / 8)..)
+    };
+    let i = (input, offset);
+    match parser(inner) {
+      Ok((rest, res)) => Ok(((rest, 0), res)),
+      Err(Err::Incomplete(Needed::Unknown)) => Err(Err::Incomplete(Needed::Unknown)),
+      Err(Err::Incomplete(Needed::Size(sz))) => Err(match sz.get().checked_mul(8) {
+        Some(v) => Err::Incomplete(Needed::new(v)),
+        None => Err::Failure(E2::from_error_kind(i, ErrorKind::TooLarge)),
+      }),
+      Err(Err::Error(e)) => Err(Err::Error(e.convert())),
+      Err(Err::Failure(e)) => Err(Err::Failure(e.convert())),
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn bytesc<I, O, E1: ParseError<I> + ErrorConvert<E2>, E2: ParseError<(I, usize)>, P>(
+  input: (I, usize),
+  parser: P,
+) -> IResult<(I, usize), O, E2>
+where
+  I: Slice<RangeFrom<usize>> + Clone,
+  P: FnMut(I) -> IResult<I, O, E1>,
+{
+  bytes(parser)(input)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bits/streaming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bits/streaming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bits/streaming.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bits/streaming.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,80 @@
+//! Bit level parsers
+//!
+
+use crate::error::{ErrorKind, ParseError};
+use crate::internal::{Err, IResult, Needed};
+use crate::lib::std::ops::{AddAssign, Div, RangeFrom, Shl, Shr};
+use crate::traits::{InputIter, InputLength, Slice, ToUsize};
+
+/// Generates a parser taking `count` bits
+pub fn take<I, O, C, E: ParseError<(I, usize)>>(
+  count: C,
+) -> impl Fn((I, usize)) -> IResult<(I, usize), O, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+  C: ToUsize,
+  O: From<u8> + AddAssign + Shl<usize, Output = O> + Shr<usize, Output = O>,
+{
+  let count = count.to_usize();
+  move |(input, bit_offset): (I, usize)| {
+    if count == 0 {
+      Ok(((input, bit_offset), 0u8.into()))
+    } else {
+      let cnt = (count + bit_offset).div(8);
+      if input.input_len() * 8 < count + bit_offset {
+        Err(Err::Incomplete(Needed::new(count as usize)))
+      } else {
+        let mut acc: O = (0 as u8).into();
+        let mut offset: usize = bit_offset;
+        let mut remaining: usize = count;
+        let mut end_offset: usize = 0;
+
+        for byte in input.iter_elements().take(cnt + 1) {
+          if remaining == 0 {
+            break;
+          }
+          let val: O = if offset == 0 {
+            byte.into()
+          } else {
+            ((byte << offset) as u8 >> offset).into()
+          };
+
+          if remaining < 8 - offset {
+            acc += val >> (8 - offset - remaining);
+            end_offset = remaining + offset;
+            break;
+          } else {
+            acc += val << (remaining - (8 - offset));
+            remaining -= 8 - offset;
+            offset = 0;
+          }
+        }
+        Ok(((input.slice(cnt..), end_offset), acc))
+      }
+    }
+  }
+}
+
+/// Generates a parser taking `count` bits and comparing them to `pattern`
+pub fn tag<I, O, C, E: ParseError<(I, usize)>>(
+  pattern: O,
+  count: C,
+) -> impl Fn((I, usize)) -> IResult<(I, usize), O, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength + Clone,
+  C: ToUsize,
+  O: From<u8> + AddAssign + Shl<usize, Output = O> + Shr<usize, Output = O> + PartialEq,
+{
+  let count = count.to_usize();
+  move |input: (I, usize)| {
+    let inp = input.clone();
+
+    take(count)(input).and_then(|(i, o)| {
+      if pattern == o {
+        Ok((i, o))
+      } else {
+        Err(Err::Error(error_position!(inp, ErrorKind::TagBits)))
+      }
+    })
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/branch/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/branch/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/branch/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/branch/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,954 @@
+/// Try a list of parsers and return the result of the first successful one
+///
+/// ```rust,ignore
+/// alt!(I -> IResult<I,O> | I -> IResult<I,O> | ... | I -> IResult<I,O> ) => I -> IResult<I, O>
+/// ```
+/// All the parsers must have the same return type.
+///
+/// If one of the parsers returns `Incomplete`, `alt!` will return `Incomplete`, to retry
+/// once you get more input. Note that it is better for performance to know the
+/// minimum size of data you need before you get into `alt!`.
+///
+/// The `alt!` combinator is used in the following way:
+///
+/// ```rust,ignore
+/// alt!(parser_1 | parser_2 | ... | parser_n)
+/// ```
+///
+/// # Basic example
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  // Create a parser that will match either "dragon" or "beast"
+///  named!( dragon_or_beast, alt!( tag!( "dragon" ) | tag!( "beast" ) ) );
+///
+///  // Given the input "dragon slayer", the parser will match "dragon"
+///  // and the rest will be " slayer"
+///  let (rest, result) = dragon_or_beast(b"dragon slayer").unwrap();
+///  assert_eq!(result, b"dragon");
+///  assert_eq!(rest, b" slayer");
+///
+///  // Given the input "beast of Gevaudan", the parser will match "beast"
+///  // and the rest will be " of Gevaudan"
+///  let (rest, result) = dragon_or_beast(&b"beast of Gevaudan"[..]).unwrap();
+///  assert_eq!(result, b"beast");
+///  assert_eq!(rest, b" of Gevaudan");
+///  # }
+/// ```
+///
+/// # Manipulate results
+///
+/// There exists another syntax for `alt!` that gives you the ability to
+/// manipulate the result from each parser:
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+/// #
+/// // We create an enum to represent our creatures
+/// #[derive(Debug,PartialEq,Eq)]
+/// enum Creature {
+///     Dragon,
+///     Beast,
+///     Unknown(usize)
+/// }
+///
+/// // Let's make a helper function that returns true when not a space
+/// // we are required to do this because the `take_while!` macro is limited
+/// // to idents, so we can't negate `ìs_space` at the call site
+/// fn is_not_space(c: u8) -> bool { ! nom::character::is_space(c) }
+///
+/// // Our parser will return the `Dragon` variant when matching "dragon",
+/// // the `Beast` variant when matching "beast" and otherwise it will consume
+/// // the input until a space is found and return an `Unknown` creature with
+/// // the size of it's name.
+/// named!(creature<Creature>, alt!(
+///     tag!("dragon")            => { |_| Creature::Dragon } |
+///     tag!("beast")             => { |_| Creature::Beast }  |
+///     take_while!(is_not_space) => { |r: &[u8]| Creature::Unknown(r.len()) }
+///     // the closure takes the result as argument if the parser is successful
+/// ));
+///
+/// // Given the input "dragon slayer" the parser will return `Creature::Dragon`
+/// // and the rest will be " slayer"
+/// let (rest, result) = creature(b"dragon slayer").unwrap();
+/// assert_eq!(result, Creature::Dragon);
+/// assert_eq!(rest, b" slayer");
+///
+/// // Given the input "beast of Gevaudan" the parser will return `Creature::Beast`
+/// // and the rest will be " of Gevaudan"
+/// let (rest, result) = creature(b"beast of Gevaudan").unwrap();
+/// assert_eq!(result, Creature::Beast);
+/// assert_eq!(rest, b" of Gevaudan");
+///
+/// // Given the input "demon hunter" the parser will return `Creature::Unknown(5)`
+/// // and the rest will be " hunter"
+/// let (rest, result) = creature(b"demon hunter").unwrap();
+/// assert_eq!(result, Creature::Unknown(5));
+/// assert_eq!(rest, b" hunter");
+/// # }
+/// ```
+///
+/// # Behaviour of `alt!`
+///
+/// **BE CAREFUL** there is a case where the behaviour of `alt!` can be confusing:
+///
+/// When the alternatives have different lengths, like this case:
+///
+/// ```ignore
+///  named!( test, alt!( tag!( "abcd" ) | tag!( "ef" ) | tag!( "ghi" ) | tag!( "kl" ) ) );
+/// ```
+///
+/// With this parser, if you pass `"abcd"` as input, the first alternative parses it correctly,
+/// but if you pass `"efg"`, the first alternative will return `Incomplete`, since it needs an input
+/// of 4 bytes. This behaviour of `alt!` is expected: if you get a partial input that isn't matched
+/// by the first alternative, but would match if the input was complete, you want `alt!` to indicate
+/// that it cannot decide with limited information.
+///
+/// There are two ways to fix this behaviour. The first one consists in ordering the alternatives
+/// by size, like this:
+///
+/// ```ignore
+///  named!( test, alt!( tag!( "ef" ) | tag!( "kl") | tag!( "ghi" ) | tag!( "abcd" ) ) );
+/// ```
+///
+/// With this solution, the largest alternative will be tested last.
+///
+/// The other solution uses the `complete!` combinator, which transforms an `Incomplete` in an
+/// `Error`. If one of the alternatives returns `Incomplete` but is wrapped by `complete!`,
+/// `alt!` will try the next alternative. This is useful when you know that
+/// you will not get partial input:
+///
+/// ```ignore
+///  named!( test,
+///    alt!(
+///      complete!( tag!( "abcd" ) ) |
+///      complete!( tag!( "ef"   ) ) |
+///      complete!( tag!( "ghi"  ) ) |
+///      complete!( tag!( "kl"   ) )
+///    )
+///  );
+/// ```
+///
+/// This behaviour of `alt!` can get especially confusing if multiple alternatives have different
+/// sizes but a common prefix, like this:
+///
+/// ```ignore
+///  named!( test, alt!( tag!( "abcd" ) | tag!( "ab" ) | tag!( "ef" ) ) );
+/// ```
+///
+/// In that case, if you order by size, passing `"abcd"` as input will always be matched by the
+/// smallest parser, so the solution using `complete!` is better suited.
+///
+/// You can also nest multiple `alt!`, like this:
+///
+/// ```ignore
+///  named!( test,
+///    alt!(
+///      preceded!(
+///        tag!("ab"),
+///        alt!(
+///          tag!( "cd" ) |
+///          eof!()
+///        )
+///      )
+///    | tag!( "ef" )
+///    )
+///  );
+/// ```
+///
+///  `preceded!` will first parse `"ab"` then, if successful, try the alternatives "cd",
+///  or empty input (End Of File). If none of them work, `preceded!` will fail and
+///  "ef" will be tested.
+///
+#[macro_export(local_inner_macros)]
+macro_rules! alt (
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)* ) => (
+    nom_compile_error!("alt uses '|' as separator, not ',':
+
+      alt!(
+        tag!(\"abcd\") |
+        tag!(\"efgh\") |
+        tag!(\"ijkl\")
+      )
+    ");
+  );
+  (__impl $i:expr, $e:path, $($rest:tt)* ) => (
+    alt!(__impl $i, call!($e) , $($rest)*);
+  );
+  (__impl $i:expr, $e:path | $($rest:tt)*) => (
+    alt!(__impl $i, call!($e) | $($rest)*);
+  );
+
+  (__impl $i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::Err;
+
+      let i_ = $i.clone();
+      let res = $subrule!(i_, $($args)*);
+      match res {
+        Ok(o) => Ok(o),
+        Err(Err::Error(e))      => {
+          let out = alt!(__impl $i, $($rest)*);
+
+          // Compile-time hack to ensure that res's E type is not under-specified.
+          // This all has no effect at runtime.
+          #[allow(dead_code)]
+          fn unify_types<T>(_: &T, _: &T) {}
+          if let Err(Err::Error(ref e2)) = out {
+            unify_types(&e, e2);
+          }
+
+          out
+        },
+        Err(e) => Err(e),
+      }
+    }
+  );
+
+  (__impl $i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)*) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::Err;
+
+      let i_ = $i.clone();
+      match $subrule!(i_, $($args)* ) {
+        Ok((i,o))         => Ok((i,$gen(o))),
+        Err(Err::Error(e)) => {
+          let out = alt!(__impl $i, $($rest)*);
+
+          // Compile-time hack to ensure that res's E type is not under-specified.
+          // This all has no effect at runtime.
+          fn unify_types<T>(_: &T, _: &T) {}
+          if let Err(Err::Error(ref e2)) = out {
+            unify_types(&e, e2);
+          }
+
+          out
+        },
+        Err(e) => Err(e),
+      }
+    }
+  );
+
+  (__impl $i:expr, $e:path => { $gen:expr } | $($rest:tt)*) => (
+    alt!(__impl $i, call!($e) => { $gen } | $($rest)*);
+  );
+
+  (__impl $i:expr, __end) => (
+    {
+      use $crate::{Err,error::ErrorKind};
+      let e2 = ErrorKind::Alt;
+      let err = Err::Error(error_position!($i, e2));
+
+      Err(err)
+    }
+  );
+
+  ($i:expr, $($rest:tt)*) => (
+    {
+      alt!(__impl $i, $($rest)* | __end)
+    }
+  );
+);
+
+/// `switch!(I -> IResult<I,P>, P => I -> IResult<I,O> | ... | P => I -> IResult<I,O> ) => I -> IResult<I, O>`
+/// choose the next parser depending on the result of the first one, if successful,
+/// and returns the result of the second parser
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///  named!(sw,
+///    switch!(take!(4),
+///      b"abcd" => tag!("XYZ") |
+///      b"efgh" => tag!("123")
+///    )
+///  );
+///
+///  let a = b"abcdXYZ123";
+///  let b = b"abcdef";
+///  let c = b"efgh123";
+///  let d = b"blah";
+///
+///  assert_eq!(sw(&a[..]), Ok((&b"123"[..], &b"XYZ"[..])));
+///  assert_eq!(sw(&b[..]), Err(Err::Error(error_node_position!(&b"abcdef"[..], ErrorKind::Switch,
+///    error_position!(&b"ef"[..], ErrorKind::Tag)))));
+///  assert_eq!(sw(&c[..]), Ok((&b""[..], &b"123"[..])));
+///  assert_eq!(sw(&d[..]), Err(Err::Error(error_position!(&b"blah"[..], ErrorKind::Switch))));
+///  # }
+/// ```
+///
+/// You can specify a default case like with a normal match, using `_`
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(sw,
+///    switch!(take!(4),
+///      b"abcd" => tag!("XYZ") |
+///      _       => value!(&b"default"[..])
+///    )
+///  );
+///
+///  let a = b"abcdXYZ123";
+///  let b = b"blah";
+///
+///  assert_eq!(sw(&a[..]), Ok((&b"123"[..], &b"XYZ"[..])));
+///  assert_eq!(sw(&b[..]), Ok((&b""[..], &b"default"[..])));
+///  # }
+/// ```
+///
+/// Due to limitations in Rust macros, it is not possible to have simple functions on the right hand
+/// side of pattern, like this:
+///
+/// ```ignore
+///  named!(xyz, tag!("XYZ"));
+///  named!(num, tag!("123"));
+///  named!(sw,
+///    switch!(take!(4),
+///      b"abcd" => xyz |
+///      b"efgh" => 123
+///    )
+///  );
+/// ```
+///
+/// If you want to pass your own functions instead, you can use the `call!` combinator as follows:
+///
+/// ```ignore
+///  named!(xyz, tag!("XYZ"));
+///  named!(num, tag!("123"));
+///  named!(sw,
+///    switch!(take!(4),
+///      b"abcd" => call!(xyz) |
+///      b"efgh" => call!(num)
+///    )
+///  );
+/// ```
+///
+#[macro_export(local_inner_macros)]
+macro_rules! switch (
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ), $( $($p:pat)|+ => $subrule:ident!( $($args2:tt)* ))|* ) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::lib::std::option::Option::*;
+      use $crate::{Err,error::ErrorKind};
+
+      let i_ = $i.clone();
+      match map!(i_, $submac!($($args)*), Some) {
+        Err(Err::Error(err))      => {
+          fn unify_types<T>(_: &T, _: &T) {}
+          let e1 = ErrorKind::Switch;
+          let e2 = error_position!($i, e1.clone());
+          unify_types(&err, &e2);
+
+          Err(Err::Error(error_node_position!($i, e1, err)))
+        },
+        Err(e) => Err(e),
+        Ok((i, o))    => {
+
+          match o {
+            $($(Some($p) )|+ => match $subrule!(i, $($args2)*) {
+              Err(Err::Error(err)) => {
+                fn unify_types<T>(_: &T, _: &T) {}
+                let e1 = ErrorKind::Switch;
+                let e2 = error_position!($i, e1.clone());
+                unify_types(&err, &e2);
+
+                Err(Err::Error(error_node_position!($i, e1, err)))
+              },
+              Ok(o) => Ok(o),
+              Err(e) => Err(e),
+            }),*,
+            _    => Err(Err::convert(Err::Error(error_position!($i, ErrorKind::Switch))))
+          }
+        }
+      }
+    }
+  );
+  ($i:expr, $submac:ident!( $($args:tt)*), $($rest:tt)*) => (
+    {
+      switch!(__impl $i, $submac!($($args)*), $($rest)*)
+    }
+  );
+  ($i:expr, $e:path, $($rest:tt)*) => (
+    {
+      switch!(__impl $i, call!($e), $($rest)*)
+    }
+  );
+);
+
+/// `permutation!(I -> IResult<I,A>, I -> IResult<I,B>, ... I -> IResult<I,X> ) => I -> IResult<I, (A,B,...X)>`
+/// applies its sub parsers in a sequence, but independent from their order
+/// this parser will only succeed if all of its sub parsers succeed.
+///
+/// The tuple of results is in the same order as the parsers are declared
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind,Needed};
+/// # fn main() {
+/// named!(perm<(&[u8], &[u8], &[u8])>,
+///   permutation!(tag!("abcd"), tag!("efg"), tag!("hi"))
+/// );
+///
+/// // whatever the order, if the parser succeeds, each
+/// // tag should have matched correctly
+/// let expected = (&b"abcd"[..], &b"efg"[..], &b"hi"[..]);
+///
+/// let a = &b"abcdefghijk"[..];
+/// assert_eq!(perm(a), Ok((&b"jk"[..], expected)));
+/// let b = &b"efgabcdhijkl"[..];
+/// assert_eq!(perm(b), Ok((&b"jkl"[..], expected)));
+/// let c = &b"hiefgabcdjklm"[..];
+/// assert_eq!(perm(c), Ok((&b"jklm"[..], expected)));
+///
+/// let d = &b"efgxyzabcdefghi"[..];
+/// assert_eq!(perm(d), Err(Err::Error(error_node_position!(&b"efgxyzabcdefghi"[..], ErrorKind::Permutation,
+///   error_position!(&b"xyzabcdefghi"[..], ErrorKind::Permutation)))));
+///
+/// let e = &b"efgabc"[..];
+/// assert_eq!(perm(e), Err(Err::Incomplete(Needed::new(1))));
+/// # }
+/// ```
+///
+/// If one of the child parsers is followed by a `?`, that parser is now
+/// optional:
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind,Needed};
+/// # fn main() {
+/// named!(perm<&str, (Option<&str>, &str, &str)>,
+///   permutation!(tag!("abcd")?, tag!("efg"), tag!("hi"))
+/// );
+///
+/// // whatever the order, if the parser succeeds, each
+/// // tag should have matched correctly
+/// let expected = (Some("abcd"), "efg", "hi");
+///
+/// let a = "abcdefghijk";
+/// assert_eq!(perm(a), Ok(("jk", expected)));
+/// let b = "efgabcdhijkl";
+/// assert_eq!(perm(b), Ok(("jkl", expected)));
+/// let c = "hiefgabcdjklm";
+/// assert_eq!(perm(c), Ok(("jklm", expected)));
+///
+/// // if `abcd` is missing:
+/// let expected = (None, "efg", "hi");
+///
+/// let a = "efghijk";
+/// assert_eq!(perm(a), Ok(("jk", expected)));
+/// let b = "efghijkl";
+/// assert_eq!(perm(b), Ok(("jkl", expected)));
+/// let c = "hiefgjklm";
+/// assert_eq!(perm(c), Ok(("jklm", expected)));
+///
+/// let e = "efgabc";
+/// assert_eq!(perm(e), Err(Err::Incomplete(Needed::new(1))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! permutation (
+  ($i:expr, $($rest:tt)*) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::lib::std::option::Option::*;
+      use $crate::{Err,error::ErrorKind};
+
+      let mut res    = permutation_init!((), $($rest)*);
+      let mut input  = $i;
+      let mut error  = None;
+      let mut needed = None;
+
+      loop {
+        let mut all_done = true;
+        permutation_iterator!(0, input, all_done, needed, res, $($rest)*);
+
+        //if we reach that part, it means none of the parsers were able to read anything
+        if !all_done {
+          //FIXME: should wrap the error returned by the child parser
+          error = Some(error_position!(input, ErrorKind::Permutation));
+        }
+        break;
+      }
+
+      if let Some(need) = needed {
+        Err(Err::convert(need))
+      } else {
+        if let Some(unwrapped_res) = { permutation_unwrap!(0, (), res, $($rest)*) } {
+          Ok((input, unwrapped_res))
+        } else {
+          if let Some(e) = error {
+            Err(Err::Error(error_node_position!($i, ErrorKind::Permutation, e)))
+          } else {
+            Err(Err::Error(error_position!($i, ErrorKind::Permutation)))
+          }
+        }
+      }
+    }
+  );
+);
+
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! permutation_init (
+  ((), $e:ident?, $($rest:tt)*) => (
+    permutation_init!(($crate::lib::std::option::Option::None), $($rest)*)
+  );
+  ((), $e:ident, $($rest:tt)*) => (
+    permutation_init!(($crate::lib::std::option::Option::None), $($rest)*)
+  );
+
+  ((), $submac:ident!( $($args:tt)* )?, $($rest:tt)*) => (
+    permutation_init!(($crate::lib::std::option::Option::None), $($rest)*)
+  );
+  ((), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => (
+    permutation_init!(($crate::lib::std::option::Option::None), $($rest)*)
+  );
+
+  (($($parsed:expr),*), $e:ident?, $($rest:tt)*) => (
+    permutation_init!(($($parsed),* , $crate::lib::std::option::Option::None), $($rest)*);
+  );
+  (($($parsed:expr),*), $e:ident, $($rest:tt)*) => (
+    permutation_init!(($($parsed),* , $crate::lib::std::option::Option::None), $($rest)*);
+  );
+
+  (($($parsed:expr),*), $submac:ident!( $($args:tt)* )?, $($rest:tt)*) => (
+    permutation_init!(($($parsed),* , $crate::lib::std::option::Option::None), $($rest)*);
+  );
+  (($($parsed:expr),*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => (
+    permutation_init!(($($parsed),* , $crate::lib::std::option::Option::None), $($rest)*);
+  );
+
+  (($($parsed:expr),*), $e:ident) => (
+    ($($parsed),* , $crate::lib::std::option::Option::None)
+  );
+  (($($parsed:expr),*), $e:ident?) => (
+    ($($parsed),* , $crate::lib::std::option::Option::None)
+  );
+
+  (($($parsed:expr),*), $submac:ident!( $($args:tt)* )?) => (
+    ($($parsed),* , $crate::lib::std::option::Option::None)
+  );
+  (($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => (
+    ($($parsed),* , $crate::lib::std::option::Option::None)
+  );
+  (($($parsed:expr),*),) => (
+    ($($parsed),*)
+  );
+);
+
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! succ (
+  (0, $submac:ident ! ($($rest:tt)*)) => ($submac!(1, $($rest)*));
+  (1, $submac:ident ! ($($rest:tt)*)) => ($submac!(2, $($rest)*));
+  (2, $submac:ident ! ($($rest:tt)*)) => ($submac!(3, $($rest)*));
+  (3, $submac:ident ! ($($rest:tt)*)) => ($submac!(4, $($rest)*));
+  (4, $submac:ident ! ($($rest:tt)*)) => ($submac!(5, $($rest)*));
+  (5, $submac:ident ! ($($rest:tt)*)) => ($submac!(6, $($rest)*));
+  (6, $submac:ident ! ($($rest:tt)*)) => ($submac!(7, $($rest)*));
+  (7, $submac:ident ! ($($rest:tt)*)) => ($submac!(8, $($rest)*));
+  (8, $submac:ident ! ($($rest:tt)*)) => ($submac!(9, $($rest)*));
+  (9, $submac:ident ! ($($rest:tt)*)) => ($submac!(10, $($rest)*));
+  (10, $submac:ident ! ($($rest:tt)*)) => ($submac!(11, $($rest)*));
+  (11, $submac:ident ! ($($rest:tt)*)) => ($submac!(12, $($rest)*));
+  (12, $submac:ident ! ($($rest:tt)*)) => ($submac!(13, $($rest)*));
+  (13, $submac:ident ! ($($rest:tt)*)) => ($submac!(14, $($rest)*));
+  (14, $submac:ident ! ($($rest:tt)*)) => ($submac!(15, $($rest)*));
+  (15, $submac:ident ! ($($rest:tt)*)) => ($submac!(16, $($rest)*));
+  (16, $submac:ident ! ($($rest:tt)*)) => ($submac!(17, $($rest)*));
+  (17, $submac:ident ! ($($rest:tt)*)) => ($submac!(18, $($rest)*));
+  (18, $submac:ident ! ($($rest:tt)*)) => ($submac!(19, $($rest)*));
+  (19, $submac:ident ! ($($rest:tt)*)) => ($submac!(20, $($rest)*));
+  (20, $submac:ident ! ($($rest:tt)*)) => ($submac!(21, $($rest)*));
+);
+
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! permutation_unwrap (
+  ($it:tt,  (), $res:ident, $e:ident?, $($rest:tt)*) => (
+    succ!($it, permutation_unwrap!(($res.$it), $res, $($rest)*));
+  );
+  ($it:tt,  (), $res:ident, $e:ident, $($rest:tt)*) => ({
+    let res = $res.$it;
+    if res.is_some() {
+      succ!($it, permutation_unwrap!((res.unwrap()), $res, $($rest)*))
+    } else {
+      $crate::lib::std::option::Option::None
+    }
+  });
+
+  ($it:tt,  (), $res:ident, $submac:ident!( $($args:tt)* )?, $($rest:tt)*) => (
+    succ!($it, permutation_unwrap!(($res.$it), $res, $($rest)*));
+  );
+  ($it:tt,  (), $res:ident, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ({
+    let res = $res.$it;
+    if res.is_some() {
+      succ!($it, permutation_unwrap!((res.unwrap()), $res, $($rest)*))
+    } else {
+      $crate::lib::std::option::Option::None
+    }
+  });
+
+  ($it:tt, ($($parsed:expr),*), $res:ident, $e:ident?, $($rest:tt)*) => (
+    succ!($it, permutation_unwrap!(($($parsed),* , $res.$it), $res, $($rest)*));
+  );
+  ($it:tt, ($($parsed:expr),*), $res:ident, $e:ident, $($rest:tt)*) => ({
+    let res = $res.$it;
+    if res.is_some() {
+      succ!($it, permutation_unwrap!(($($parsed),* , res.unwrap()), $res, $($rest)*))
+    } else {
+      $crate::lib::std::option::Option::None
+    }
+  });
+
+  ($it:tt, ($($parsed:expr),*), $res:ident, $submac:ident!( $($args:tt)* )?, $($rest:tt)*) => (
+    succ!($it, permutation_unwrap!(($($parsed),* , $res.$it), $res, $($rest)*));
+  );
+  ($it:tt, ($($parsed:expr),*), $res:ident, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ({
+    let res = $res.$it;
+    if res.is_some() {
+      succ!($it, permutation_unwrap!(($($parsed),* , res.unwrap()), $res, $($rest)*))
+    } else {
+      $crate::lib::std::option::Option::None
+    }
+  });
+
+  ($it:tt, ($($parsed:expr),*), $res:ident?, $e:ident) => (
+    $crate::lib::std::option::Option::Some(($($parsed),* , { $res.$it }))
+  );
+  ($it:tt, ($($parsed:expr),*), $res:ident, $e:ident) => ({
+    let res = $res.$it;
+    if res.is_some() {
+      $crate::lib::std::option::Option::Some(($($parsed),* , res.unwrap() ))
+    } else {
+      $crate::lib::std::option::Option::None
+    }
+  });
+
+  ($it:tt, ($($parsed:expr),*), $res:ident, $submac:ident!( $($args:tt)* )?) => (
+    $crate::lib::std::option::Option::Some(($($parsed),* , { $res.$it }))
+  );
+  ($it:tt, ($($parsed:expr),*), $res:ident, $submac:ident!( $($args:tt)* )) => ({
+    let res = $res.$it;
+    if res.is_some() {
+      $crate::lib::std::option::Option::Some(($($parsed),* , res.unwrap() ))
+    } else {
+      $crate::lib::std::option::Option::None
+    }
+  });
+);
+
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! permutation_iterator (
+  ($it:tt,$i:expr, $all_done:expr, $needed:expr, $res:expr, $e:ident?, $($rest:tt)*) => (
+    permutation_iterator!($it, $i, $all_done, $needed, $res, call!($e), $($rest)*);
+  );
+  ($it:tt,$i:expr, $all_done:expr, $needed:expr, $res:expr, $e:ident, $($rest:tt)*) => (
+    permutation_iterator!($it, $i, $all_done, $needed, $res, call!($e), $($rest)*);
+  );
+
+  ($it:tt, $i:expr, $all_done:expr, $needed:expr, $res:expr, $submac:ident!( $($args:tt)* )?, $($rest:tt)*) => {
+    permutation_iterator!($it, $i, $all_done, $needed, $res, $submac!($($args)*) , $($rest)*);
+  };
+  ($it:tt, $i:expr, $all_done:expr, $needed:expr, $res:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => ({
+    use $crate::lib::std::result::Result::*;
+    use $crate::lib::std::option::Option::*;
+    use $crate::Err;
+
+    if $res.$it.is_none() {
+      match $submac!($i, $($args)*) {
+        Ok((i,o))     => {
+          $i = i;
+          $res.$it = Some(o);
+          continue;
+        },
+        Err(Err::Error(_)) => {
+          $all_done = false;
+        },
+        Err(e) => {
+          $needed = Some(e);
+          break;
+        }
+      };
+    }
+    succ!($it, permutation_iterator!($i, $all_done, $needed, $res, $($rest)*));
+  });
+
+  ($it:tt,$i:expr, $all_done:expr, $needed:expr, $res:expr, $e:ident?) => (
+    permutation_iterator!($it, $i, $all_done, $needed, $res, call!($e));
+  );
+  ($it:tt,$i:expr, $all_done:expr, $needed:expr, $res:expr, $e:ident) => (
+    permutation_iterator!($it, $i, $all_done, $needed, $res, call!($e));
+  );
+
+  ($it:tt, $i:expr, $all_done:expr, $needed:expr, $res:expr, $submac:ident!( $($args:tt)* )?) => {
+    permutation_iterator!($it, $i, $all_done, $needed, $res, $submac!($($args)*));
+  };
+  ($it:tt, $i:expr, $all_done:expr, $needed:expr, $res:expr, $submac:ident!( $($args:tt)* )) => ({
+    use $crate::lib::std::result::Result::*;
+    use $crate::lib::std::option::Option::*;
+    use $crate::Err;
+
+    if $res.$it.is_none() {
+      match $submac!($i, $($args)*) {
+        Ok((i,o))     => {
+          $i = i;
+          $res.$it = Some(o);
+          continue;
+        },
+        Err(Err::Error(_)) => {
+          $all_done = false;
+        },
+        Err(e) => {
+          $needed = Some(e);
+          break;
+        }
+      };
+    }
+  });
+);
+
+#[cfg(test)]
+mod tests {
+  use crate::error::ErrorKind;
+  use crate::internal::{Err, IResult, Needed};
+  #[cfg(feature = "alloc")]
+  use crate::{
+    error::ParseError,
+    lib::std::{
+      fmt::Debug,
+      string::{String, ToString},
+    },
+  };
+
+  // reproduce the tag and take macros, because of module import order
+  macro_rules! tag (
+    ($i:expr, $inp: expr) => (
+      {
+        #[inline(always)]
+        fn as_bytes<T: $crate::AsBytes>(b: &T) -> &[u8] {
+          b.as_bytes()
+        }
+
+        let expected = $inp;
+        let bytes    = as_bytes(&expected);
+
+        tag_bytes!($i,bytes)
+      }
+    );
+  );
+
+  macro_rules! tag_bytes (
+    ($i:expr, $bytes: expr) => (
+      {
+        use $crate::lib::std::cmp::min;
+
+        let len = $i.len();
+        let blen = $bytes.len();
+        let m   = min(len, blen);
+        let reduced = &$i[..m];
+        let b       = &$bytes[..m];
+
+        let res: IResult<_,_,_> = if reduced != b {
+          let e: ErrorKind = ErrorKind::Tag;
+          Err(Err::Error(error_position!($i, e)))
+        } else if m < blen {
+          Err(Err::Incomplete(Needed::new(blen)))
+        } else {
+          Ok((&$i[blen..], reduced))
+        };
+        res
+      }
+    );
+  );
+
+  macro_rules! take(
+    ($i:expr, $count:expr) => (
+      {
+        let cnt = $count as usize;
+        let res:IResult<&[u8],&[u8],_> = if $i.len() < cnt {
+          Err(Err::Incomplete(Needed::new(cnt)))
+        } else {
+          Ok((&$i[cnt..],&$i[0..cnt]))
+        };
+        res
+      }
+    );
+  );
+
+  #[cfg(feature = "alloc")]
+  #[derive(Debug, Clone, PartialEq)]
+  pub struct ErrorStr(String);
+
+  #[cfg(feature = "alloc")]
+  impl From<u32> for ErrorStr {
+    fn from(i: u32) -> Self {
+      ErrorStr(format!("custom error code: {}", i))
+    }
+  }
+
+  #[cfg(feature = "alloc")]
+  impl<'a> From<&'a str> for ErrorStr {
+    fn from(i: &'a str) -> Self {
+      ErrorStr(format!("custom error message: {}", i))
+    }
+  }
+
+  #[cfg(feature = "alloc")]
+  impl<I: Debug> ParseError<I> for ErrorStr {
+    fn from_error_kind(input: I, kind: ErrorKind) -> Self {
+      ErrorStr(format!("custom error message: ({:?}, {:?})", input, kind))
+    }
+
+    fn append(input: I, kind: ErrorKind, other: Self) -> Self {
+      ErrorStr(format!(
+        "custom error message: ({:?}, {:?}) - {:?}",
+        input, kind, other
+      ))
+    }
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn alt() {
+    fn work(input: &[u8]) -> IResult<&[u8], &[u8], ErrorStr> {
+      Ok((&b""[..], input))
+    }
+
+    #[allow(unused_variables)]
+    fn dont_work(input: &[u8]) -> IResult<&[u8], &[u8], ErrorStr> {
+      Err(Err::Error(ErrorStr("abcd".to_string())))
+    }
+
+    fn work2(input: &[u8]) -> IResult<&[u8], &[u8], ErrorStr> {
+      Ok((input, &b""[..]))
+    }
+
+    fn alt1(i: &[u8]) -> IResult<&[u8], &[u8], ErrorStr> {
+      alt!(i, dont_work | dont_work)
+    }
+    fn alt2(i: &[u8]) -> IResult<&[u8], &[u8], ErrorStr> {
+      alt!(i, dont_work | work)
+    }
+    fn alt3(i: &[u8]) -> IResult<&[u8], &[u8], ErrorStr> {
+      alt!(i, dont_work | dont_work | work2 | dont_work)
+    }
+    //named!(alt1, alt!(dont_work | dont_work));
+    //named!(alt2, alt!(dont_work | work));
+    //named!(alt3, alt!(dont_work | dont_work | work2 | dont_work));
+
+    let a = &b"abcd"[..];
+    assert_eq!(alt1(a), Err(Err::Error(error_position!(a, ErrorKind::Alt))));
+    assert_eq!(alt2(a), Ok((&b""[..], a)));
+    assert_eq!(alt3(a), Ok((a, &b""[..])));
+
+    named!(alt4, alt!(tag!("abcd") | tag!("efgh")));
+    let b = &b"efgh"[..];
+    assert_eq!(alt4(a), Ok((&b""[..], a)));
+    assert_eq!(alt4(b), Ok((&b""[..], b)));
+
+    // test the alternative syntax
+    named!(
+      alt5<bool>,
+      alt!(tag!("abcd") => { |_| false } | tag!("efgh") => { |_| true })
+    );
+    assert_eq!(alt5(a), Ok((&b""[..], false)));
+    assert_eq!(alt5(b), Ok((&b""[..], true)));
+
+    // compile-time test guarding against an underspecified E generic type (#474)
+    named!(alt_eof1, alt!(eof!() | eof!()));
+    named!(alt_eof2, alt!(eof!() => {|x| x} | eof!() => {|x| x}));
+    let _ = (alt_eof1, alt_eof2);
+  }
+
+  #[test]
+  fn alt_incomplete() {
+    named!(alt1, alt!(tag!("a") | tag!("bc") | tag!("def")));
+
+    let a = &b""[..];
+    assert_eq!(alt1(a), Err(Err::Incomplete(Needed::new(1))));
+    let a = &b"b"[..];
+    assert_eq!(alt1(a), Err(Err::Incomplete(Needed::new(2))));
+    let a = &b"bcd"[..];
+    assert_eq!(alt1(a), Ok((&b"d"[..], &b"bc"[..])));
+    let a = &b"cde"[..];
+    assert_eq!(alt1(a), Err(Err::Error(error_position!(a, ErrorKind::Alt))));
+    let a = &b"de"[..];
+    assert_eq!(alt1(a), Err(Err::Incomplete(Needed::new(3))));
+    let a = &b"defg"[..];
+    assert_eq!(alt1(a), Ok((&b"g"[..], &b"def"[..])));
+  }
+
+  #[allow(unused_variables)]
+  #[test]
+  fn switch() {
+    named!(
+      sw,
+      switch!(take!(4),
+        b"abcd" | b"xxxx" => take!(2) |
+        b"efgh" => take!(4)
+      )
+    );
+
+    let a = &b"abcdefgh"[..];
+    assert_eq!(sw(a), Ok((&b"gh"[..], &b"ef"[..])));
+
+    let b = &b"efghijkl"[..];
+    assert_eq!(sw(b), Ok((&b""[..], &b"ijkl"[..])));
+    let c = &b"afghijkl"[..];
+    assert_eq!(
+      sw(c),
+      Err(Err::Error(error_position!(
+        &b"afghijkl"[..],
+        ErrorKind::Switch
+      )))
+    );
+
+    let a = &b"xxxxefgh"[..];
+    assert_eq!(sw(a), Ok((&b"gh"[..], &b"ef"[..])));
+  }
+
+  #[test]
+  fn permutation() {
+    named!(
+      perm<(&[u8], &[u8], &[u8])>,
+      permutation!(tag!("abcd"), tag!("efg"), tag!("hi"))
+    );
+
+    let expected = (&b"abcd"[..], &b"efg"[..], &b"hi"[..]);
+
+    let a = &b"abcdefghijk"[..];
+    assert_eq!(perm(a), Ok((&b"jk"[..], expected)));
+    let b = &b"efgabcdhijk"[..];
+    assert_eq!(perm(b), Ok((&b"jk"[..], expected)));
+    let c = &b"hiefgabcdjk"[..];
+    assert_eq!(perm(c), Ok((&b"jk"[..], expected)));
+
+    let d = &b"efgxyzabcdefghi"[..];
+    assert_eq!(
+      perm(d),
+      Err(Err::Error(error_node_position!(
+        &b"efgxyzabcdefghi"[..],
+        ErrorKind::Permutation,
+        error_position!(&b"xyzabcdefghi"[..], ErrorKind::Permutation)
+      )))
+    );
+
+    let e = &b"efgabc"[..];
+    assert_eq!(perm(e), Err(Err::Incomplete(Needed::new(4))));
+  }
+
+  /*
+  named!(does_not_compile,
+    alt!(tag!("abcd"), tag!("efgh"))
+  );
+  */
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/branch/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/branch/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/branch/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/branch/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,259 @@
+//! Choice combinators
+
+#[macro_use]
+mod macros;
+
+use crate::error::ErrorKind;
+use crate::error::ParseError;
+use crate::internal::{Err, IResult, Parser};
+
+/// Helper trait for the [alt()] combinator.
+///
+/// This trait is implemented for tuples of up to 21 elements
+pub trait Alt<I, O, E> {
+  /// Tests each parser in the tuple and returns the result of the first one that succeeds
+  fn choice(&mut self, input: I) -> IResult<I, O, E>;
+}
+
+/// Tests a list of parsers one by one until one succeeds.
+///
+/// It takes as argument a tuple of parsers. There is a maximum of 21
+/// parsers. If you need more, it is possible to nest them in other `alt` calls,
+/// like this: `alt(parser_a, alt(parser_b, parser_c))`
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, Needed, IResult};
+/// use nom::character::complete::{alpha1, digit1};
+/// use nom::branch::alt;
+/// # fn main() {
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///   alt((alpha1, digit1))(input)
+/// };
+///
+/// // the first parser, alpha1, recognizes the input
+/// assert_eq!(parser("abc"), Ok(("", "abc")));
+///
+/// // the first parser returns an error, so alt tries the second one
+/// assert_eq!(parser("123456"), Ok(("", "123456")));
+///
+/// // both parsers failed, and with the default error type, alt will return the last error
+/// assert_eq!(parser(" "), Err(Err::Error(error_position!(" ", ErrorKind::Digit))));
+/// # }
+/// ```
+///
+/// With a custom error type, it is possible to have alt return the error of the parser
+/// that went the farthest in the input data
+pub fn alt<I: Clone, O, E: ParseError<I>, List: Alt<I, O, E>>(
+  mut l: List,
+) -> impl FnMut(I) -> IResult<I, O, E> {
+  move |i: I| l.choice(i)
+}
+
+/// Helper trait for the [permutation()] combinator.
+///
+/// This trait is implemented for tuples of up to 21 elements
+pub trait Permutation<I, O, E> {
+  /// Tries to apply all parsers in the tuple in various orders until all of them succeed
+  fn permutation(&mut self, input: I) -> IResult<I, O, E>;
+}
+
+/// Applies a list of parsers in any order.
+///
+/// Permutation will succeed if all of the child parsers succeeded.
+/// It takes as argument a tuple of parsers, and returns a
+/// tuple of the parser results.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::character::complete::{alpha1, digit1};
+/// use nom::branch::permutation;
+/// # fn main() {
+/// fn parser(input: &str) -> IResult<&str, (&str, &str)> {
+///   permutation((alpha1, digit1))(input)
+/// }
+///
+/// // permutation recognizes alphabetic characters then digit
+/// assert_eq!(parser("abc123"), Ok(("", ("abc", "123"))));
+///
+/// // but also in inverse order
+/// assert_eq!(parser("123abc"), Ok(("", ("abc", "123"))));
+///
+/// // it will fail if one of the parsers failed
+/// assert_eq!(parser("abc;"), Err(Err::Error(Error::new(";", ErrorKind::Digit))));
+/// # }
+/// ```
+///
+/// The parsers are applied greedily: if there are multiple unapplied parsers
+/// that could parse the next slice of input, the first one is used.
+/// ```rust
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult};
+/// use nom::branch::permutation;
+/// use nom::character::complete::{anychar, char};
+///
+/// fn parser(input: &str) -> IResult<&str, (char, char)> {
+///   permutation((anychar, char('a')))(input)
+/// }
+///
+/// // anychar parses 'b', then char('a') parses 'a'
+/// assert_eq!(parser("ba"), Ok(("", ('b', 'a'))));
+///
+/// // anychar parses 'a', then char('a') fails on 'b',
+/// // even though char('a') followed by anychar would succeed
+/// assert_eq!(parser("ab"), Err(Err::Error(Error::new("b", ErrorKind::Char))));
+/// ```
+///
+pub fn permutation<I: Clone, O, E: ParseError<I>, List: Permutation<I, O, E>>(
+  mut l: List,
+) -> impl FnMut(I) -> IResult<I, O, E> {
+  move |i: I| l.permutation(i)
+}
+
+macro_rules! alt_trait(
+  ($first:ident $second:ident $($id: ident)+) => (
+    alt_trait!(__impl $first $second; $($id)+);
+  );
+  (__impl $($current:ident)*; $head:ident $($id: ident)+) => (
+    alt_trait_impl!($($current)*);
+
+    alt_trait!(__impl $($current)* $head; $($id)+);
+  );
+  (__impl $($current:ident)*; $head:ident) => (
+    alt_trait_impl!($($current)*);
+    alt_trait_impl!($($current)* $head);
+  );
+);
+
+macro_rules! alt_trait_impl(
+  ($($id:ident)+) => (
+    impl<
+      Input: Clone, Output, Error: ParseError<Input>,
+      $($id: Parser<Input, Output, Error>),+
+    > Alt<Input, Output, Error> for ( $($id),+ ) {
+
+      fn choice(&mut self, input: Input) -> IResult<Input, Output, Error> {
+        match self.0.parse(input.clone()) {
+          Err(Err::Error(e)) => alt_trait_inner!(1, self, input, e, $($id)+),
+          res => res,
+        }
+      }
+    }
+  );
+);
+
+macro_rules! alt_trait_inner(
+  ($it:tt, $self:expr, $input:expr, $err:expr, $head:ident $($id:ident)+) => (
+    match $self.$it.parse($input.clone()) {
+      Err(Err::Error(e)) => {
+        let err = $err.or(e);
+        succ!($it, alt_trait_inner!($self, $input, err, $($id)+))
+      }
+      res => res,
+    }
+  );
+  ($it:tt, $self:expr, $input:expr, $err:expr, $head:ident) => (
+    Err(Err::Error(Error::append($input, ErrorKind::Alt, $err)))
+  );
+);
+
+alt_trait!(A B C D E F G H I J K L M N O P Q R S T U);
+
+macro_rules! permutation_trait(
+  (
+    $name1:ident $ty1:ident $item1:ident
+    $name2:ident $ty2:ident $item2:ident
+    $($name3:ident $ty3:ident $item3:ident)*
+  ) => (
+    permutation_trait!(__impl $name1 $ty1 $item1, $name2 $ty2 $item2; $($name3 $ty3 $item3)*);
+  );
+  (
+    __impl $($name:ident $ty:ident $item:ident),+;
+    $name1:ident $ty1:ident $item1:ident $($name2:ident $ty2:ident $item2:ident)*
+  ) => (
+    permutation_trait_impl!($($name $ty $item),+);
+    permutation_trait!(__impl $($name $ty $item),+ , $name1 $ty1 $item1; $($name2 $ty2 $item2)*);
+  );
+  (__impl $($name:ident $ty:ident $item:ident),+;) => (
+    permutation_trait_impl!($($name $ty $item),+);
+  );
+);
+
+macro_rules! permutation_trait_impl(
+  ($($name:ident $ty:ident $item:ident),+) => (
+    impl<
+      Input: Clone, $($ty),+ , Error: ParseError<Input>,
+      $($name: Parser<Input, $ty, Error>),+
+    > Permutation<Input, ( $($ty),+ ), Error> for ( $($name),+ ) {
+
+      fn permutation(&mut self, mut input: Input) -> IResult<Input, ( $($ty),+ ), Error> {
+        let mut res = ($(Option::<$ty>::None),+);
+
+        loop {
+          let mut err: Option<Error> = None;
+          permutation_trait_inner!(0, self, input, res, err, $($name)+);
+
+          // If we reach here, every iterator has either been applied before,
+          // or errored on the remaining input
+          if let Some(err) = err {
+            // There are remaining parsers, and all errored on the remaining input
+            return Err(Err::Error(Error::append(input, ErrorKind::Permutation, err)));
+          }
+
+          // All parsers were applied
+          match res {
+            ($(Some($item)),+) => return Ok((input, ($($item),+))),
+            _ => unreachable!(),
+          }
+        }
+      }
+    }
+  );
+);
+
+macro_rules! permutation_trait_inner(
+  ($it:tt, $self:expr, $input:ident, $res:expr, $err:expr, $head:ident $($id:ident)*) => (
+    if $res.$it.is_none() {
+      match $self.$it.parse($input.clone()) {
+        Ok((i, o)) => {
+          $input = i;
+          $res.$it = Some(o);
+          continue;
+        }
+        Err(Err::Error(e)) => {
+          $err = Some(match $err {
+            Some(err) => err.or(e),
+            None => e,
+          });
+        }
+        Err(e) => return Err(e),
+      };
+    }
+    succ!($it, permutation_trait_inner!($self, $input, $res, $err, $($id)*));
+  );
+  ($it:tt, $self:expr, $input:ident, $res:expr, $err:expr,) => ();
+);
+
+permutation_trait!(
+  FnA A a
+  FnB B b
+  FnC C c
+  FnD D d
+  FnE E e
+  FnF F f
+  FnG G g
+  FnH H h
+  FnI I i
+  FnJ J j
+  FnK K k
+  FnL L l
+  FnM M m
+  FnN N n
+  FnO O o
+  FnP P p
+  FnQ Q q
+  FnR R r
+  FnS S s
+  FnT T t
+  FnU U u
+);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bytes/complete.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bytes/complete.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bytes/complete.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bytes/complete.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,728 @@
+//! Parsers recognizing bytes streams, complete input version
+
+use crate::error::ErrorKind;
+use crate::error::ParseError;
+use crate::internal::{Err, IResult, Parser};
+use crate::lib::std::ops::RangeFrom;
+use crate::lib::std::result::Result::*;
+use crate::traits::{
+  Compare, CompareResult, FindSubstring, FindToken, InputIter, InputLength, InputTake,
+  InputTakeAtPosition, Slice, ToUsize,
+};
+
+/// Recognizes a pattern
+///
+/// The input data will be compared to the tag combinator's argument and will return the part of
+/// the input that matches the argument
+///
+/// It will return `Err(Err::Error((_, ErrorKind::Tag)))` if the input doesn't match the pattern
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, &str> {
+///   tag("Hello")(s)
+/// }
+///
+/// assert_eq!(parser("Hello, World!"), Ok((", World!", "Hello")));
+/// assert_eq!(parser("Something"), Err(Err::Error(Error::new("Something", ErrorKind::Tag))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Tag))));
+/// ```
+pub fn tag<T, Input, Error: ParseError<Input>>(
+  tag: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTake + Compare<T>,
+  T: InputLength + Clone,
+{
+  move |i: Input| {
+    let tag_len = tag.input_len();
+    let t = tag.clone();
+    let res: IResult<_, _, Error> = match i.compare(t) {
+      CompareResult::Ok => Ok(i.take_split(tag_len)),
+      _ => {
+        let e: ErrorKind = ErrorKind::Tag;
+        Err(Err::Error(Error::from_error_kind(i, e)))
+      }
+    };
+    res
+  }
+}
+
+/// Recognizes a case insensitive pattern.
+///
+/// The input data will be compared to the tag combinator's argument and will return the part of
+/// the input that matches the argument with no regard to case.
+///
+/// It will return `Err(Err::Error((_, ErrorKind::Tag)))` if the input doesn't match the pattern.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::tag_no_case;
+///
+/// fn parser(s: &str) -> IResult<&str, &str> {
+///   tag_no_case("hello")(s)
+/// }
+///
+/// assert_eq!(parser("Hello, World!"), Ok((", World!", "Hello")));
+/// assert_eq!(parser("hello, World!"), Ok((", World!", "hello")));
+/// assert_eq!(parser("HeLlO, World!"), Ok((", World!", "HeLlO")));
+/// assert_eq!(parser("Something"), Err(Err::Error(Error::new("Something", ErrorKind::Tag))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Tag))));
+/// ```
+pub fn tag_no_case<T, Input, Error: ParseError<Input>>(
+  tag: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTake + Compare<T>,
+  T: InputLength + Clone,
+{
+  move |i: Input| {
+    let tag_len = tag.input_len();
+    let t = tag.clone();
+
+    let res: IResult<_, _, Error> = match (i).compare_no_case(t) {
+      CompareResult::Ok => Ok(i.take_split(tag_len)),
+      _ => {
+        let e: ErrorKind = ErrorKind::Tag;
+        Err(Err::Error(Error::from_error_kind(i, e)))
+      }
+    };
+    res
+  }
+}
+
+/// Parse till certain characters are met.
+///
+/// The parser will return the longest slice till one of the characters of the combinator's argument are met.
+///
+/// It doesn't consume the matched character.
+///
+/// It will return a `Err::Error(("", ErrorKind::IsNot))` if the pattern wasn't met.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::is_not;
+///
+/// fn not_space(s: &str) -> IResult<&str, &str> {
+///   is_not(" \t\r\n")(s)
+/// }
+///
+/// assert_eq!(not_space("Hello, World!"), Ok((" World!", "Hello,")));
+/// assert_eq!(not_space("Sometimes\t"), Ok(("\t", "Sometimes")));
+/// assert_eq!(not_space("Nospace"), Ok(("", "Nospace")));
+/// assert_eq!(not_space(""), Err(Err::Error(Error::new("", ErrorKind::IsNot))));
+/// ```
+pub fn is_not<T, Input, Error: ParseError<Input>>(
+  arr: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  T: FindToken<<Input as InputTakeAtPosition>::Item>,
+{
+  move |i: Input| {
+    let e: ErrorKind = ErrorKind::IsNot;
+    i.split_at_position1_complete(|c| arr.find_token(c), e)
+  }
+}
+
+/// Returns the longest slice of the matches the pattern.
+///
+/// The parser will return the longest slice consisting of the characters in provided in the
+/// combinator's argument.
+///
+/// It will return a `Err(Err::Error((_, ErrorKind::IsA)))` if the pattern wasn't met.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::is_a;
+///
+/// fn hex(s: &str) -> IResult<&str, &str> {
+///   is_a("1234567890ABCDEF")(s)
+/// }
+///
+/// assert_eq!(hex("123 and voila"), Ok((" and voila", "123")));
+/// assert_eq!(hex("DEADBEEF and others"), Ok((" and others", "DEADBEEF")));
+/// assert_eq!(hex("BADBABEsomething"), Ok(("something", "BADBABE")));
+/// assert_eq!(hex("D15EA5E"), Ok(("", "D15EA5E")));
+/// assert_eq!(hex(""), Err(Err::Error(Error::new("", ErrorKind::IsA))));
+/// ```
+pub fn is_a<T, Input, Error: ParseError<Input>>(
+  arr: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  T: FindToken<<Input as InputTakeAtPosition>::Item>,
+{
+  move |i: Input| {
+    let e: ErrorKind = ErrorKind::IsA;
+    i.split_at_position1_complete(|c| !arr.find_token(c), e)
+  }
+}
+
+/// Returns the longest input slice (if any) that matches the predicate.
+///
+/// The parser will return the longest slice that matches the given predicate *(a function that
+/// takes the input and returns a bool)*.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::bytes::complete::take_while;
+/// use nom::character::is_alphabetic;
+///
+/// fn alpha(s: &[u8]) -> IResult<&[u8], &[u8]> {
+///   take_while(is_alphabetic)(s)
+/// }
+///
+/// assert_eq!(alpha(b"latin123"), Ok((&b"123"[..], &b"latin"[..])));
+/// assert_eq!(alpha(b"12345"), Ok((&b"12345"[..], &b""[..])));
+/// assert_eq!(alpha(b"latin"), Ok((&b""[..], &b"latin"[..])));
+/// assert_eq!(alpha(b""), Ok((&b""[..], &b""[..])));
+/// ```
+pub fn take_while<F, Input, Error: ParseError<Input>>(
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  F: Fn(<Input as InputTakeAtPosition>::Item) -> bool,
+{
+  move |i: Input| i.split_at_position_complete(|c| !cond(c))
+}
+
+/// Returns the longest (at least 1) input slice that matches the predicate.
+///
+/// The parser will return the longest slice that matches the given predicate *(a function that
+/// takes the input and returns a bool)*.
+///
+/// It will return an `Err(Err::Error((_, ErrorKind::TakeWhile1)))` if the pattern wasn't met.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::take_while1;
+/// use nom::character::is_alphabetic;
+///
+/// fn alpha(s: &[u8]) -> IResult<&[u8], &[u8]> {
+///   take_while1(is_alphabetic)(s)
+/// }
+///
+/// assert_eq!(alpha(b"latin123"), Ok((&b"123"[..], &b"latin"[..])));
+/// assert_eq!(alpha(b"latin"), Ok((&b""[..], &b"latin"[..])));
+/// assert_eq!(alpha(b"12345"), Err(Err::Error(Error::new(&b"12345"[..], ErrorKind::TakeWhile1))));
+/// ```
+pub fn take_while1<F, Input, Error: ParseError<Input>>(
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  F: Fn(<Input as InputTakeAtPosition>::Item) -> bool,
+{
+  move |i: Input| {
+    let e: ErrorKind = ErrorKind::TakeWhile1;
+    i.split_at_position1_complete(|c| !cond(c), e)
+  }
+}
+
+/// Returns the longest (m <= len <= n) input slice  that matches the predicate.
+///
+/// The parser will return the longest slice that matches the given predicate *(a function that
+/// takes the input and returns a bool)*.
+///
+/// It will return an `Err::Error((_, ErrorKind::TakeWhileMN))` if the pattern wasn't met or is out
+/// of range (m <= len <= n).
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::take_while_m_n;
+/// use nom::character::is_alphabetic;
+///
+/// fn short_alpha(s: &[u8]) -> IResult<&[u8], &[u8]> {
+///   take_while_m_n(3, 6, is_alphabetic)(s)
+/// }
+///
+/// assert_eq!(short_alpha(b"latin123"), Ok((&b"123"[..], &b"latin"[..])));
+/// assert_eq!(short_alpha(b"lengthy"), Ok((&b"y"[..], &b"length"[..])));
+/// assert_eq!(short_alpha(b"latin"), Ok((&b""[..], &b"latin"[..])));
+/// assert_eq!(short_alpha(b"ed"), Err(Err::Error(Error::new(&b"ed"[..], ErrorKind::TakeWhileMN))));
+/// assert_eq!(short_alpha(b"12345"), Err(Err::Error(Error::new(&b"12345"[..], ErrorKind::TakeWhileMN))));
+/// ```
+pub fn take_while_m_n<F, Input, Error: ParseError<Input>>(
+  m: usize,
+  n: usize,
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTake + InputIter + InputLength + Slice<RangeFrom<usize>>,
+  F: Fn(<Input as InputIter>::Item) -> bool,
+{
+  move |i: Input| {
+    let input = i;
+
+    match input.position(|c| !cond(c)) {
+      Some(idx) => {
+        if idx >= m {
+          if idx <= n {
+            let res: IResult<_, _, Error> = if let Ok(index) = input.slice_index(idx) {
+              Ok(input.take_split(index))
+            } else {
+              Err(Err::Error(Error::from_error_kind(
+                input,
+                ErrorKind::TakeWhileMN,
+              )))
+            };
+            res
+          } else {
+            let res: IResult<_, _, Error> = if let Ok(index) = input.slice_index(n) {
+              Ok(input.take_split(index))
+            } else {
+              Err(Err::Error(Error::from_error_kind(
+                input,
+                ErrorKind::TakeWhileMN,
+              )))
+            };
+            res
+          }
+        } else {
+          let e = ErrorKind::TakeWhileMN;
+          Err(Err::Error(Error::from_error_kind(input, e)))
+        }
+      }
+      None => {
+        let len = input.input_len();
+        if len >= n {
+          match input.slice_index(n) {
+            Ok(index) => Ok(input.take_split(index)),
+            Err(_needed) => Err(Err::Error(Error::from_error_kind(
+              input,
+              ErrorKind::TakeWhileMN,
+            ))),
+          }
+        } else if len >= m && len <= n {
+          let res: IResult<_, _, Error> = Ok((input.slice(len..), input));
+          res
+        } else {
+          let e = ErrorKind::TakeWhileMN;
+          Err(Err::Error(Error::from_error_kind(input, e)))
+        }
+      }
+    }
+  }
+}
+
+/// Returns the longest input slice (if any) till a predicate is met.
+///
+/// The parser will return the longest slice till the given predicate *(a function that
+/// takes the input and returns a bool)*.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::bytes::complete::take_till;
+///
+/// fn till_colon(s: &str) -> IResult<&str, &str> {
+///   take_till(|c| c == ':')(s)
+/// }
+///
+/// assert_eq!(till_colon("latin:123"), Ok((":123", "latin")));
+/// assert_eq!(till_colon(":empty matched"), Ok((":empty matched", ""))); //allowed
+/// assert_eq!(till_colon("12345"), Ok(("", "12345")));
+/// assert_eq!(till_colon(""), Ok(("", "")));
+/// ```
+pub fn take_till<F, Input, Error: ParseError<Input>>(
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  F: Fn(<Input as InputTakeAtPosition>::Item) -> bool,
+{
+  move |i: Input| i.split_at_position_complete(|c| cond(c))
+}
+
+/// Returns the longest (at least 1) input slice till a predicate is met.
+///
+/// The parser will return the longest slice till the given predicate *(a function that
+/// takes the input and returns a bool)*.
+///
+/// It will return `Err(Err::Error((_, ErrorKind::TakeTill1)))` if the input is empty or the
+/// predicate matches the first input.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::take_till1;
+///
+/// fn till_colon(s: &str) -> IResult<&str, &str> {
+///   take_till1(|c| c == ':')(s)
+/// }
+///
+/// assert_eq!(till_colon("latin:123"), Ok((":123", "latin")));
+/// assert_eq!(till_colon(":empty matched"), Err(Err::Error(Error::new(":empty matched", ErrorKind::TakeTill1))));
+/// assert_eq!(till_colon("12345"), Ok(("", "12345")));
+/// assert_eq!(till_colon(""), Err(Err::Error(Error::new("", ErrorKind::TakeTill1))));
+/// ```
+pub fn take_till1<F, Input, Error: ParseError<Input>>(
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  F: Fn(<Input as InputTakeAtPosition>::Item) -> bool,
+{
+  move |i: Input| {
+    let e: ErrorKind = ErrorKind::TakeTill1;
+    i.split_at_position1_complete(|c| cond(c), e)
+  }
+}
+
+/// Returns an input slice containing the first N input elements (Input[..N]).
+///
+/// It will return `Err(Err::Error((_, ErrorKind::Eof)))` if the input is shorter than the argument.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::take;
+///
+/// fn take6(s: &str) -> IResult<&str, &str> {
+///   take(6usize)(s)
+/// }
+///
+/// assert_eq!(take6("1234567"), Ok(("7", "123456")));
+/// assert_eq!(take6("things"), Ok(("", "things")));
+/// assert_eq!(take6("short"), Err(Err::Error(Error::new("short", ErrorKind::Eof))));
+/// assert_eq!(take6(""), Err(Err::Error(Error::new("", ErrorKind::Eof))));
+/// ```
+pub fn take<C, Input, Error: ParseError<Input>>(
+  count: C,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputIter + InputTake,
+  C: ToUsize,
+{
+  let c = count.to_usize();
+  move |i: Input| match i.slice_index(c) {
+    Err(_needed) => Err(Err::Error(Error::from_error_kind(i, ErrorKind::Eof))),
+    Ok(index) => Ok(i.take_split(index)),
+  }
+}
+
+/// Returns the input slice up to the first occurrence of the pattern.
+///
+/// It doesn't consume the pattern. It will return `Err(Err::Error((_, ErrorKind::TakeUntil)))`
+/// if the pattern wasn't met.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::complete::take_until;
+///
+/// fn until_eof(s: &str) -> IResult<&str, &str> {
+///   take_until("eof")(s)
+/// }
+///
+/// assert_eq!(until_eof("hello, worldeof"), Ok(("eof", "hello, world")));
+/// assert_eq!(until_eof("hello, world"), Err(Err::Error(Error::new("hello, world", ErrorKind::TakeUntil))));
+/// assert_eq!(until_eof(""), Err(Err::Error(Error::new("", ErrorKind::TakeUntil))));
+/// assert_eq!(until_eof("1eof2eof"), Ok(("eof2eof", "1")));
+/// ```
+pub fn take_until<T, Input, Error: ParseError<Input>>(
+  tag: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTake + FindSubstring<T>,
+  T: InputLength + Clone,
+{
+  move |i: Input| {
+    let t = tag.clone();
+    let res: IResult<_, _, Error> = match i.find_substring(t) {
+      None => Err(Err::Error(Error::from_error_kind(i, ErrorKind::TakeUntil))),
+      Some(index) => Ok(i.take_split(index)),
+    };
+    res
+  }
+}
+
+/// Matches a byte string with escaped characters.
+///
+/// * The first argument matches the normal characters (it must not accept the control character)
+/// * The second argument is the control character (like `\` in most languages)
+/// * The third argument matches the escaped characters
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// # use nom::character::complete::digit1;
+/// use nom::bytes::complete::escaped;
+/// use nom::character::complete::one_of;
+///
+/// fn esc(s: &str) -> IResult<&str, &str> {
+///   escaped(digit1, '\\', one_of(r#""n\"#))(s)
+/// }
+///
+/// assert_eq!(esc("123;"), Ok((";", "123")));
+/// assert_eq!(esc(r#"12\"34;"#), Ok((";", r#"12\"34"#)));
+/// ```
+///
+pub fn escaped<'a, Input: 'a, Error, F, G, O1, O2>(
+  mut normal: F,
+  control_char: char,
+  mut escapable: G,
+) -> impl FnMut(Input) -> IResult<Input, Input, Error>
+where
+  Input: Clone
+    + crate::traits::Offset
+    + InputLength
+    + InputTake
+    + InputTakeAtPosition
+    + Slice<RangeFrom<usize>>
+    + InputIter,
+  <Input as InputIter>::Item: crate::traits::AsChar,
+  F: Parser<Input, O1, Error>,
+  G: Parser<Input, O2, Error>,
+  Error: ParseError<Input>,
+{
+  use crate::traits::AsChar;
+
+  move |input: Input| {
+    let mut i = input.clone();
+
+    while i.input_len() > 0 {
+      match normal.parse(i.clone()) {
+        Ok((i2, _)) => {
+          if i2.input_len() == 0 {
+            return Ok((input.slice(input.input_len()..), input));
+          } else {
+            i = i2;
+          }
+        }
+        Err(Err::Error(_)) => {
+          // unwrap() should be safe here since index < $i.input_len()
+          if i.iter_elements().next().unwrap().as_char() == control_char {
+            let next = control_char.len_utf8();
+            if next >= i.input_len() {
+              return Err(Err::Error(Error::from_error_kind(
+                input,
+                ErrorKind::Escaped,
+              )));
+            } else {
+              match escapable.parse(i.slice(next..)) {
+                Ok((i2, _)) => {
+                  if i2.input_len() == 0 {
+                    return Ok((input.slice(input.input_len()..), input));
+                  } else {
+                    i = i2;
+                  }
+                }
+                Err(e) => return Err(e),
+              }
+            }
+          } else {
+            let index = input.offset(&i);
+            if index == 0 {
+              return Err(Err::Error(Error::from_error_kind(
+                input,
+                ErrorKind::Escaped,
+              )));
+            }
+            return Ok(input.take_split(index));
+          }
+        }
+        Err(e) => {
+          return Err(e);
+        }
+      }
+    }
+
+    Ok((input.slice(input.input_len()..), input))
+  }
+}
+
+#[doc(hidden)]
+pub fn escapedc<Input, Error, F, G, O1, O2>(
+  i: Input,
+  normal: F,
+  control_char: char,
+  escapable: G,
+) -> IResult<Input, Input, Error>
+where
+  Input: Clone
+    + crate::traits::Offset
+    + InputLength
+    + InputTake
+    + InputTakeAtPosition
+    + Slice<RangeFrom<usize>>
+    + InputIter,
+  <Input as InputIter>::Item: crate::traits::AsChar,
+  F: Fn(Input) -> IResult<Input, O1, Error>,
+  G: Fn(Input) -> IResult<Input, O2, Error>,
+  Error: ParseError<Input>,
+{
+  escaped(normal, control_char, escapable)(i)
+}
+
+/// Matches a byte string with escaped characters.
+///
+/// * The first argument matches the normal characters (it must not match the control character)
+/// * The second argument is the control character (like `\` in most languages)
+/// * The third argument matches the escaped characters and transforms them
+///
+/// As an example, the chain `abc\tdef` could be `abc    def` (it also consumes the control character)
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// # use std::str::from_utf8;
+/// use nom::bytes::complete::{escaped_transform, tag};
+/// use nom::character::complete::alpha1;
+/// use nom::branch::alt;
+/// use nom::combinator::value;
+///
+/// fn parser(input: &str) -> IResult<&str, String> {
+///   escaped_transform(
+///     alpha1,
+///     '\\',
+///     alt((
+///       value("\\", tag("\\")),
+///       value("\"", tag("\"")),
+///       value("n", tag("\n")),
+///     ))
+///   )(input)
+/// }
+///
+/// assert_eq!(parser("ab\\\"cd"), Ok(("", String::from("ab\"cd"))));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn escaped_transform<Input, Error, F, G, O1, O2, ExtendItem, Output>(
+  mut normal: F,
+  control_char: char,
+  mut transform: G,
+) -> impl FnMut(Input) -> IResult<Input, Output, Error>
+where
+  Input: Clone
+    + crate::traits::Offset
+    + InputLength
+    + InputTake
+    + InputTakeAtPosition
+    + Slice<RangeFrom<usize>>
+    + InputIter,
+  Input: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  O1: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  O2: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  <Input as InputIter>::Item: crate::traits::AsChar,
+  F: Parser<Input, O1, Error>,
+  G: Parser<Input, O2, Error>,
+  Error: ParseError<Input>,
+{
+  use crate::traits::AsChar;
+
+  move |input: Input| {
+    let mut index = 0;
+    let mut res = input.new_builder();
+
+    let i = input.clone();
+
+    while index < i.input_len() {
+      let remainder = i.slice(index..);
+      match normal.parse(remainder.clone()) {
+        Ok((i2, o)) => {
+          o.extend_into(&mut res);
+          if i2.input_len() == 0 {
+            return Ok((i.slice(i.input_len()..), res));
+          } else {
+            index = input.offset(&i2);
+          }
+        }
+        Err(Err::Error(_)) => {
+          // unwrap() should be safe here since index < $i.input_len()
+          if remainder.iter_elements().next().unwrap().as_char() == control_char {
+            let next = index + control_char.len_utf8();
+            let input_len = input.input_len();
+
+            if next >= input_len {
+              return Err(Err::Error(Error::from_error_kind(
+                remainder,
+                ErrorKind::EscapedTransform,
+              )));
+            } else {
+              match transform.parse(i.slice(next..)) {
+                Ok((i2, o)) => {
+                  o.extend_into(&mut res);
+                  if i2.input_len() == 0 {
+                    return Ok((i.slice(i.input_len()..), res));
+                  } else {
+                    index = input.offset(&i2);
+                  }
+                }
+                Err(e) => return Err(e),
+              }
+            }
+          } else {
+            if index == 0 {
+              return Err(Err::Error(Error::from_error_kind(
+                remainder,
+                ErrorKind::EscapedTransform,
+              )));
+            }
+            return Ok((remainder, res));
+          }
+        }
+        Err(e) => return Err(e),
+      }
+    }
+    Ok((input.slice(index..), res))
+  }
+}
+
+#[doc(hidden)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn escaped_transformc<Input, Error, F, G, O1, O2, ExtendItem, Output>(
+  i: Input,
+  normal: F,
+  control_char: char,
+  transform: G,
+) -> IResult<Input, Output, Error>
+where
+  Input: Clone
+    + crate::traits::Offset
+    + InputLength
+    + InputTake
+    + InputTakeAtPosition
+    + Slice<RangeFrom<usize>>
+    + InputIter,
+  Input: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  O1: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  O2: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  <Input as InputIter>::Item: crate::traits::AsChar,
+  F: Fn(Input) -> IResult<Input, O1, Error>,
+  G: Fn(Input) -> IResult<Input, O2, Error>,
+  Error: ParseError<Input>,
+{
+  escaped_transform(normal, control_char, transform)(i)
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  fn complete_take_while_m_n_utf8_all_matching() {
+    let result: IResult<&str, &str> =
+      super::take_while_m_n(1, 4, |c: char| c.is_alphabetic())("øn");
+    assert_eq!(result, Ok(("", "øn")));
+  }
+
+  #[test]
+  fn complete_take_while_m_n_utf8_all_matching_substring() {
+    let result: IResult<&str, &str> =
+      super::take_while_m_n(1, 1, |c: char| c.is_alphabetic())("øn");
+    assert_eq!(result, Ok(("n", "ø")));
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bytes/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bytes/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bytes/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bytes/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,994 @@
+//! Byte level parsers and combinators
+//!
+#[allow(unused_variables)]
+
+/// `tag!(&[T]: nom::AsBytes) => &[T] -> IResult<&[T], &[T]>`
+/// declares a byte array as a suite to recognize.
+///
+/// Consumes the recognized characters.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(x, tag!("abcd"));
+///  let r = x(&b"abcdefgh"[..]);
+///  assert_eq!(r, Ok((&b"efgh"[..], &b"abcd"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! tag (
+  ($i:expr, $tag: expr) => ({
+    $crate::bytes::streaming::tag($tag)($i)
+  });
+);
+
+/// `tag_no_case!(&[T]) => &[T] -> IResult<&[T], &[T]>`
+/// declares a case insensitive ascii string as a suite to recognize.
+///
+/// Consumes the recognized characters.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(test, tag_no_case!("ABcd"));
+///
+///  let r = test(&b"aBCdefgh"[..]);
+///  assert_eq!(r, Ok((&b"efgh"[..], &b"aBCd"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! tag_no_case (
+  ($i:expr, $tag: expr) => ({
+    $crate::bytes::streaming::tag_no_case($tag)($i)
+  });
+);
+
+/// `is_not!(&[T:AsBytes]) => &[T] -> IResult<&[T], &[T]>`
+/// returns the longest list of bytes that do not appear in the provided array.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!( not_space, is_not!( " \t\r\n" ) );
+///
+///  let r = not_space(&b"abcdefgh\nijkl"[..]);
+///  assert_eq!(r, Ok((&b"\nijkl"[..], &b"abcdefgh"[..])));
+///  # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! is_not (
+  ($input:expr, $arr:expr) => ({
+    $crate::bytes::streaming::is_not($arr)($input)
+  });
+);
+
+/// `is_a!(&[T]) => &[T] -> IResult<&[T], &[T]>`
+/// returns the longest list of bytes that appear in the provided array.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(abcd, is_a!( "abcd" ));
+///
+///  let r1 = abcd(&b"aaaaefgh"[..]);
+///  assert_eq!(r1, Ok((&b"efgh"[..], &b"aaaa"[..])));
+///
+///  let r2 = abcd(&b"dcbaefgh"[..]);
+///  assert_eq!(r2, Ok((&b"efgh"[..], &b"dcba"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! is_a (
+  ($input:expr, $arr:expr) => ({
+    $crate::bytes::streaming::is_a($arr)($input)
+  });
+);
+
+/// `escaped!(T -> IResult<T, T>, U, T -> IResult<T, T>) => T -> IResult<T, T> where T: InputIter,
+/// U: AsChar`
+/// matches a byte string with escaped characters.
+///
+/// * The first argument matches the normal characters (it must not accept the control character)
+/// * The second argument is the control character (like `\` in most languages)
+/// * The third argument matches the escaped characters
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::character::complete::digit1;
+/// # fn main() {
+///  named!(esc, escaped!(call!(digit1), '\\', one_of!("\"n\\")));
+///  assert_eq!(esc(&b"123;"[..]), Ok((&b";"[..], &b"123"[..])));
+///  assert_eq!(esc(&b"12\\\"34;"[..]), Ok((&b";"[..], &b"12\\\"34"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! escaped (
+  ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => (
+    {
+     escaped!($i, |i| $submac1!(i, $($args)*), $control_char,  |i| $submac2!(i, $($args2)*))
+    }
+  );
+  ($i:expr, $normal:expr, $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => (
+    {
+     escaped!($i, $normal, $control_char,  |i| $submac2!(i, $($args2)*))
+    }
+  );
+  ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $escapable:expr ) => (
+    {
+     escaped!($i, |i| $submac1!(i, $($args)*), $control_char,  $escapable)
+    }
+  );
+  ($i:expr, $normal:expr, $control_char: expr, $escapable:expr) => (
+    {
+      $crate::bytes::complete::escapedc($i, $normal, $control_char, $escapable)
+    }
+  );
+);
+
+/// `escaped_transform!(&[T] -> IResult<&[T], &[T]>, T, &[T] -> IResult<&[T], &[T]>) => &[T] -> IResult<&[T], Vec<T>>`
+/// matches a byte string with escaped characters.
+///
+/// * The first argument matches the normal characters (it must not match the control character)
+/// * The second argument is the control character (like `\` in most languages)
+/// * The third argument matches the escaped characters and transforms them
+///
+/// As an example, the chain `abc\tdef` could be `abc    def` (it also consumes the control character).
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::character::complete::alpha1;
+/// # use nom::lib::std::str::from_utf8;
+/// # fn main() {
+/// fn to_s(i:Vec<u8>) -> String {
+///   String::from_utf8_lossy(&i).into_owned()
+/// }
+///
+///  named!(transform < String >,
+///    map!(
+///      escaped_transform!(call!(alpha1), '\\',
+///        alt!(
+///            tag!("\\")       => { |_| &b"\\"[..] }
+///          | tag!("\"")       => { |_| &b"\""[..] }
+///          | tag!("n")        => { |_| &b"\n"[..] }
+///        )
+///      ), to_s
+///    )
+///  );
+///  assert_eq!(transform(&b"ab\\\"cd"[..]), Ok((&b""[..], String::from("ab\"cd"))));
+/// # }
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[macro_export(local_inner_macros)]
+macro_rules! escaped_transform (
+  ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => (
+    {
+     escaped_transform!($i, |i| $submac1!(i, $($args)*), $control_char,  |i| $submac2!(i, $($args2)*))
+    }
+  );
+  ($i:expr, $normal:expr, $control_char: expr, $submac2:ident!( $($args2:tt)*) ) => (
+    {
+     escaped_transform!($i, $normal, $control_char,  |i| $submac2!(i, $($args2)*))
+    }
+  );
+  ($i:expr, $submac1:ident!( $($args:tt)* ), $control_char: expr, $transform:expr ) => (
+    {
+     escaped_transform!($i, |i| $submac1!(i, $($args)*), $control_char,  $transform)
+    }
+  );
+  ($i:expr, $normal:expr, $control_char: expr, $transform:expr) => (
+    {
+      $crate::bytes::complete::escaped_transformc($i, $normal, $control_char, $transform)
+    }
+  );
+);
+
+/// `take_while!(T -> bool) => &[T] -> IResult<&[T], &[T]>`
+/// returns the longest list of bytes until the provided function fails.
+///
+/// The argument is either a function `T -> bool` or a macro returning a `bool`.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::character::is_alphanumeric;
+/// # fn main() {
+///  named!( alpha, take_while!( is_alphanumeric ) );
+///
+///  let r = alpha(&b"abcd\nefgh"[..]);
+///  assert_eq!(r, Ok((&b"\nefgh"[..], &b"abcd"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_while (
+  ($input:expr, $submac:ident!( $($args:tt)* )) => ({
+    let res: $crate::IResult<_, _, _> = take_while!($input, (|c| $submac!(c, $($args)*)));
+    res
+  });
+  ($input:expr, $f:expr) => (
+    $crate::bytes::streaming::take_while($f)($input)
+  );
+);
+
+/// `take_while1!(T -> bool) => &[T] -> IResult<&[T], &[T]>`
+/// returns the longest (non empty) list of bytes until the provided function fails.
+///
+/// The argument is either a function `&[T] -> bool` or a macro returning a `bool`.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind};
+/// # use nom::character::is_alphanumeric;
+/// # fn main() {
+///  named!( alpha, take_while1!( is_alphanumeric ) );
+///
+///  let r = alpha(&b"abcd\nefgh"[..]);
+///  assert_eq!(r, Ok((&b"\nefgh"[..], &b"abcd"[..])));
+///  let r = alpha(&b"\nefgh"[..]);
+///  assert_eq!(r, Err(Err::Error(error_position!(&b"\nefgh"[..], ErrorKind::TakeWhile1))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_while1 (
+  ($input:expr, $submac:ident!( $($args:tt)* )) => ({
+    let res: $crate::IResult<_, _, _> = take_while1!($input, (|c| $submac!(c, $($args)*)));
+    res
+  });
+  ($input:expr, $f:expr) => (
+    $crate::bytes::streaming::take_while1($f)($input)
+  );
+);
+
+/// `take_while_m_n!(m: usize, n: usize, T -> bool) => &[T] -> IResult<&[T], &[T]>`
+/// returns a list of bytes or characters for which the provided function returns true.
+/// The returned list's size will be at least m, and at most n.
+///
+/// The argument is either a function `T -> bool` or a macro returning a `bool`.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::character::is_alphanumeric;
+/// # fn main() {
+///  named!( alpha, take_while_m_n!(3, 6, is_alphanumeric ) );
+///
+///  let r = alpha(&b"abcd\nefgh"[..]);
+///  assert_eq!(r, Ok((&b"\nefgh"[..], &b"abcd"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_while_m_n (
+  ($input:expr, $m:expr, $n: expr, $submac:ident!( $($args:tt)* )) => ({
+    let res: $crate::IResult<_, _, _> = take_while_m_n!($input, $m, $n, (|c| $submac!(c, $($args)*)));
+    res
+  });
+  ($input:expr, $m:expr, $n:expr, $f:expr) => (
+    $crate::bytes::streaming::take_while_m_n($m, $n, $f)($input)
+  );
+);
+
+/// `take_till!(T -> bool) => &[T] -> IResult<&[T], &[T]>`
+/// returns the longest list of bytes until the provided function succeeds.
+///
+/// The argument is either a function `&[T] -> bool` or a macro returning a `bool`.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!( till_colon, take_till!(|ch| ch == b':') );
+///
+///  let r = till_colon(&b"abcd:efgh"[..]);
+///  assert_eq!(r, Ok((&b":efgh"[..], &b"abcd"[..])));
+///  let r2 = till_colon(&b":abcdefgh"[..]); // empty match is allowed
+///  assert_eq!(r2, Ok((&b":abcdefgh"[..], &b""[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_till (
+  ($input:expr, $submac:ident!( $($args:tt)* )) => ({
+    let res: $crate::IResult<_, _, _> = take_till!($input, (|c| $submac!(c, $($args)*)));
+    res
+  });
+  ($input:expr, $f:expr) => (
+    $crate::bytes::streaming::take_till($f)($input)
+  );
+);
+
+/// `take_till1!(T -> bool) => &[T] -> IResult<&[T], &[T]>`
+/// returns the longest non empty list of bytes until the provided function succeeds.
+///
+/// The argument is either a function `&[T] -> bool` or a macro returning a `bool`.
+///
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind};
+/// # fn main() {
+///  named!( till1_colon, take_till1!(|ch| ch == b':') );
+///
+///  let r = till1_colon(&b"abcd:efgh"[..]);
+///  assert_eq!(r, Ok((&b":efgh"[..], &b"abcd"[..])));
+///
+///  let r2 = till1_colon(&b":abcdefgh"[..]); // empty match is error
+///  assert_eq!(r2, Err(Err::Error(error_position!(&b":abcdefgh"[..], ErrorKind::TakeTill1))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_till1 (
+  ($input:expr, $submac:ident!( $($args:tt)* )) => ({
+    let res: $crate::IResult<_, _, _> = take_till1!($input, (|c| $submac!(c, $($args)*)));
+    res
+  });
+  ($input:expr, $f:expr) => (
+    $crate::bytes::streaming::take_till1($f)($input)
+  );
+);
+
+/// `take!(nb) => &[T] -> IResult<&[T], &[T]>`
+/// generates a parser consuming the specified number of bytes.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  // Desmond parser
+///  named!(take5, take!( 5 ) );
+///
+///  let a = b"abcdefgh";
+///
+///  assert_eq!(take5(&a[..]), Ok((&b"fgh"[..], &b"abcde"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take (
+  ($i:expr, $count:expr) => ({
+    let c = $count as usize;
+    let res: $crate::IResult<_,_,_> = $crate::bytes::streaming::take(c)($i);
+    res
+  });
+);
+
+/// `take_str!(nb) => &[T] -> IResult<&[T], &str>`
+/// same as `take!` but returning a `&str`.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(take5( &[u8] ) -> &str, take_str!( 5 ) );
+///
+///  let a = b"abcdefgh";
+///
+///  assert_eq!(take5(&a[..]), Ok((&b"fgh"[..], "abcde")));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_str (
+ ( $i:expr, $size:expr ) => (
+    {
+      let input: &[u8] = $i;
+
+      map_res!(input, take!($size), $crate::lib::std::str::from_utf8)
+    }
+  );
+);
+
+/// `take_until!(tag) => &[T] -> IResult<&[T], &[T]>`
+/// consumes data until it finds the specified tag.
+///
+/// The remainder still contains the tag.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(x, take_until!("foo"));
+///  let r = x(&b"abcd foo efgh"[..]);
+///  assert_eq!(r, Ok((&b"foo efgh"[..], &b"abcd "[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_until (
+  ($i:expr, $substr:expr) => ({
+    let res: $crate::IResult<_,_,_> = $crate::bytes::streaming::take_until($substr)($i);
+    res
+  });
+);
+
+/// `take_until1!(tag) => &[T] -> IResult<&[T], &[T]>`
+/// consumes data (at least one byte) until it finds the specified tag.
+///
+/// The remainder still contains the tag.
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(x, take_until1!("foo"));
+///
+///  let r = x(&b"abcd foo efgh"[..]);
+///
+///  assert_eq!(r, Ok((&b"foo efgh"[..], &b"abcd "[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! take_until1 (
+  ($i:expr, $substr:expr) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::lib::std::option::Option::*;
+      use $crate::{Err,Needed,IResult,error::ErrorKind};
+      use $crate::InputLength;
+      use $crate::FindSubstring;
+      use $crate::InputTake;
+      let input = $i;
+
+      let res: IResult<_,_> = match input.find_substring($substr) {
+        None => {
+          Err(Err::Incomplete(Needed::new(1 + $substr.input_len())))
+        },
+        Some(0) => {
+          let e = ErrorKind::TakeUntil;
+          Err(Err::Error(error_position!($i, e)))
+        },
+        Some(index) => {
+          Ok($i.take_split(index))
+        },
+      };
+      res
+    }
+  );
+);
+
+#[cfg(test)]
+mod tests {
+  use crate::character::is_alphabetic;
+  use crate::character::streaming::{
+    alpha1 as alpha, alphanumeric1 as alphanumeric, digit1 as digit, hex_digit1 as hex_digit,
+    multispace1 as multispace, oct_digit1 as oct_digit, space1 as space,
+  };
+  use crate::error::ErrorKind;
+  use crate::internal::{Err, IResult, Needed};
+  #[cfg(feature = "alloc")]
+  use crate::lib::std::string::String;
+  #[cfg(feature = "alloc")]
+  use crate::lib::std::vec::Vec;
+
+  #[cfg(feature = "alloc")]
+  macro_rules! one_of (
+    ($i:expr, $inp: expr) => (
+      {
+        use $crate::Err;
+        use $crate::Slice;
+        use $crate::AsChar;
+        use $crate::FindToken;
+        use $crate::InputIter;
+
+        match ($i).iter_elements().next().map(|c| {
+          $inp.find_token(c)
+        }) {
+          None        => Err::<_,_>(Err::Incomplete(Needed::new(1))),
+          Some(false) => Err(Err::Error(error_position!($i, ErrorKind::OneOf))),
+          //the unwrap should be safe here
+          Some(true)  => Ok(($i.slice(1..), $i.iter_elements().next().unwrap().as_char()))
+        }
+      }
+    );
+  );
+
+  #[test]
+  fn is_a() {
+    named!(a_or_b, is_a!(&b"ab"[..]));
+
+    let a = &b"abcd"[..];
+    assert_eq!(a_or_b(a), Ok((&b"cd"[..], &b"ab"[..])));
+
+    let b = &b"bcde"[..];
+    assert_eq!(a_or_b(b), Ok((&b"cde"[..], &b"b"[..])));
+
+    let c = &b"cdef"[..];
+    assert_eq!(
+      a_or_b(c),
+      Err(Err::Error(error_position!(c, ErrorKind::IsA)))
+    );
+
+    let d = &b"bacdef"[..];
+    assert_eq!(a_or_b(d), Ok((&b"cdef"[..], &b"ba"[..])));
+  }
+
+  #[test]
+  fn is_not() {
+    named!(a_or_b, is_not!(&b"ab"[..]));
+
+    let a = &b"cdab"[..];
+    assert_eq!(a_or_b(a), Ok((&b"ab"[..], &b"cd"[..])));
+
+    let b = &b"cbde"[..];
+    assert_eq!(a_or_b(b), Ok((&b"bde"[..], &b"c"[..])));
+
+    let c = &b"abab"[..];
+    assert_eq!(
+      a_or_b(c),
+      Err(Err::Error(error_position!(c, ErrorKind::IsNot)))
+    );
+
+    let d = &b"cdefba"[..];
+    assert_eq!(a_or_b(d), Ok((&b"ba"[..], &b"cdef"[..])));
+
+    let e = &b"e"[..];
+    assert_eq!(a_or_b(e), Err(Err::Incomplete(Needed::new(1))));
+  }
+
+  #[cfg(feature = "alloc")]
+  #[allow(unused_variables)]
+  #[test]
+  fn escaping() {
+    named!(esc, escaped!(call!(alpha), '\\', one_of!("\"n\\")));
+    assert_eq!(esc(&b"abcd;"[..]), Ok((&b";"[..], &b"abcd"[..])));
+    assert_eq!(esc(&b"ab\\\"cd;"[..]), Ok((&b";"[..], &b"ab\\\"cd"[..])));
+    assert_eq!(esc(&b"\\\"abcd;"[..]), Ok((&b";"[..], &b"\\\"abcd"[..])));
+    assert_eq!(esc(&b"\\n;"[..]), Ok((&b";"[..], &b"\\n"[..])));
+    assert_eq!(esc(&b"ab\\\"12"[..]), Ok((&b"12"[..], &b"ab\\\""[..])));
+    assert_eq!(
+      esc(&b"AB\\"[..]),
+      Err(Err::Error(error_position!(
+        &b"AB\\"[..],
+        ErrorKind::Escaped
+      )))
+    );
+    assert_eq!(
+      esc(&b"AB\\A"[..]),
+      Err(Err::Error(error_node_position!(
+        &b"AB\\A"[..],
+        ErrorKind::Escaped,
+        error_position!(&b"A"[..], ErrorKind::OneOf)
+      )))
+    );
+
+    named!(esc2, escaped!(call!(digit), '\\', one_of!("\"n\\")));
+    assert_eq!(esc2(&b"12\\nnn34"[..]), Ok((&b"nn34"[..], &b"12\\n"[..])));
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn escaping_str() {
+    named!(esc<&str, &str>, escaped!(call!(alpha), '\\', one_of!("\"n\\")));
+    assert_eq!(esc("abcd;"), Ok((";", "abcd")));
+    assert_eq!(esc("ab\\\"cd;"), Ok((";", "ab\\\"cd")));
+    assert_eq!(esc("\\\"abcd;"), Ok((";", "\\\"abcd")));
+    assert_eq!(esc("\\n;"), Ok((";", "\\n")));
+    assert_eq!(esc("ab\\\"12"), Ok(("12", "ab\\\"")));
+    assert_eq!(
+      esc("AB\\"),
+      Err(Err::Error(error_position!("AB\\", ErrorKind::Escaped)))
+    );
+    assert_eq!(
+      esc("AB\\A"),
+      Err(Err::Error(error_node_position!(
+        "AB\\A",
+        ErrorKind::Escaped,
+        error_position!("A", ErrorKind::OneOf)
+      )))
+    );
+
+    named!(esc2<&str, &str>, escaped!(call!(digit), '\\', one_of!("\"n\\")));
+    assert_eq!(esc2("12\\nnn34"), Ok(("nn34", "12\\n")));
+
+    named!(esc3<&str, &str>, escaped!(call!(alpha), '\u{241b}', one_of!("\"n")));
+    assert_eq!(esc3("ab�ncd;"), Ok((";", "ab�ncd")));
+  }
+
+  #[cfg(feature = "alloc")]
+  fn to_s(i: Vec<u8>) -> String {
+    String::from_utf8_lossy(&i).into_owned()
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn escape_transform() {
+    use crate::lib::std::str;
+
+    named!(
+      esc<String>,
+      map!(
+        escaped_transform!(
+          alpha,
+          '\\',
+          alt!(
+              tag!("\\")       => { |_| &b"\\"[..] }
+            | tag!("\"")       => { |_| &b"\""[..] }
+            | tag!("n")        => { |_| &b"\n"[..] }
+          )
+        ),
+        to_s
+      )
+    );
+
+    assert_eq!(esc(&b"abcd;"[..]), Ok((&b";"[..], String::from("abcd"))));
+    assert_eq!(
+      esc(&b"ab\\\"cd;"[..]),
+      Ok((&b";"[..], String::from("ab\"cd")))
+    );
+    assert_eq!(
+      esc(&b"\\\"abcd;"[..]),
+      Ok((&b";"[..], String::from("\"abcd")))
+    );
+    assert_eq!(esc(&b"\\n;"[..]), Ok((&b";"[..], String::from("\n"))));
+    assert_eq!(
+      esc(&b"ab\\\"12"[..]),
+      Ok((&b"12"[..], String::from("ab\"")))
+    );
+    assert_eq!(
+      esc(&b"AB\\"[..]),
+      Err(Err::Error(error_position!(
+        &b"\\"[..],
+        ErrorKind::EscapedTransform
+      )))
+    );
+    assert_eq!(
+      esc(&b"AB\\A"[..]),
+      Err(Err::Error(error_node_position!(
+        &b"AB\\A"[..],
+        ErrorKind::EscapedTransform,
+        error_position!(&b"A"[..], ErrorKind::Alt)
+      )))
+    );
+
+    named!(
+      esc2<String>,
+      map!(
+        escaped_transform!(
+          call!(alpha),
+          '&',
+          alt!(
+              tag!("egrave;") => { |_| str::as_bytes("è") }
+            | tag!("agrave;") => { |_| str::as_bytes("à") }
+          )
+        ),
+        to_s
+      )
+    );
+    assert_eq!(
+      esc2(&b"ab&egrave;DEF;"[..]),
+      Ok((&b";"[..], String::from("abèDEF")))
+    );
+    assert_eq!(
+      esc2(&b"ab&egrave;D&agrave;EF;"[..]),
+      Ok((&b";"[..], String::from("abèDàEF")))
+    );
+  }
+
+  #[cfg(feature = "std")]
+  #[test]
+  fn escape_transform_str() {
+    named!(esc<&str, String>, escaped_transform!(alpha, '\\',
+      alt!(
+          tag!("\\")       => { |_| "\\" }
+        | tag!("\"")       => { |_| "\"" }
+        | tag!("n")        => { |_| "\n" }
+      ))
+    );
+
+    assert_eq!(esc("abcd;"), Ok((";", String::from("abcd"))));
+    assert_eq!(esc("ab\\\"cd;"), Ok((";", String::from("ab\"cd"))));
+    assert_eq!(esc("\\\"abcd;"), Ok((";", String::from("\"abcd"))));
+    assert_eq!(esc("\\n;"), Ok((";", String::from("\n"))));
+    assert_eq!(esc("ab\\\"12"), Ok(("12", String::from("ab\""))));
+    assert_eq!(
+      esc("AB\\"),
+      Err(Err::Error(error_position!(
+        "\\",
+        ErrorKind::EscapedTransform
+      )))
+    );
+    assert_eq!(
+      esc("AB\\A"),
+      Err(Err::Error(error_node_position!(
+        "AB\\A",
+        ErrorKind::EscapedTransform,
+        error_position!("A", ErrorKind::Alt)
+      )))
+    );
+
+    named!(esc2<&str, String>, escaped_transform!(alpha, '&',
+      alt!(
+          tag!("egrave;") => { |_| "è" }
+        | tag!("agrave;") => { |_| "à" }
+      ))
+    );
+    assert_eq!(esc2("ab&egrave;DEF;"), Ok((";", String::from("abèDEF"))));
+    assert_eq!(
+      esc2("ab&egrave;D&agrave;EF;"),
+      Ok((";", String::from("abèDàEF")))
+    );
+
+    named!(esc3<&str, String>, escaped_transform!(alpha, '�',
+      alt!(
+        tag!("0") => { |_| "\0" } |
+        tag!("n") => { |_| "\n" })));
+    assert_eq!(esc3("a�0bc�n"), Ok(("", String::from("a\0bc\n"))));
+  }
+
+  #[test]
+  fn take_str_test() {
+    let a = b"omnomnom";
+
+    let res: IResult<_, _, (&[u8], ErrorKind)> = take_str!(&a[..], 5u32);
+    assert_eq!(res, Ok((&b"nom"[..], "omnom")));
+
+    let res: IResult<_, _, (&[u8], ErrorKind)> = take_str!(&a[..], 9u32);
+    assert_eq!(res, Err(Err::Incomplete(Needed::new(1))));
+  }
+
+  #[test]
+  fn take_until_incomplete() {
+    named!(y, take_until!("end"));
+    assert_eq!(y(&b"nd"[..]), Err(Err::Incomplete(Needed::Unknown)));
+    assert_eq!(y(&b"123"[..]), Err(Err::Incomplete(Needed::Unknown)));
+    assert_eq!(y(&b"123en"[..]), Err(Err::Incomplete(Needed::Unknown)));
+  }
+
+  #[test]
+  fn take_until_incomplete_s() {
+    named!(ys<&str, &str>, take_until!("end"));
+    assert_eq!(ys("123en"), Err(Err::Incomplete(Needed::Unknown)));
+  }
+
+  #[test]
+  fn recognize() {
+    named!(
+      x,
+      recognize!(delimited!(tag!("<!--"), take!(5usize), tag!("-->")))
+    );
+    let r = x(&b"<!-- abc --> aaa"[..]);
+    assert_eq!(r, Ok((&b" aaa"[..], &b"<!-- abc -->"[..])));
+
+    let semicolon = &b";"[..];
+
+    named!(ya, recognize!(alpha));
+    let ra = ya(&b"abc;"[..]);
+    assert_eq!(ra, Ok((semicolon, &b"abc"[..])));
+
+    named!(yd, recognize!(digit));
+    let rd = yd(&b"123;"[..]);
+    assert_eq!(rd, Ok((semicolon, &b"123"[..])));
+
+    named!(yhd, recognize!(hex_digit));
+    let rhd = yhd(&b"123abcDEF;"[..]);
+    assert_eq!(rhd, Ok((semicolon, &b"123abcDEF"[..])));
+
+    named!(yod, recognize!(oct_digit));
+    let rod = yod(&b"1234567;"[..]);
+    assert_eq!(rod, Ok((semicolon, &b"1234567"[..])));
+
+    named!(yan, recognize!(alphanumeric));
+    let ran = yan(&b"123abc;"[..]);
+    assert_eq!(ran, Ok((semicolon, &b"123abc"[..])));
+
+    named!(ys, recognize!(space));
+    let rs = ys(&b" \t;"[..]);
+    assert_eq!(rs, Ok((semicolon, &b" \t"[..])));
+
+    named!(yms, recognize!(multispace));
+    let rms = yms(&b" \t\r\n;"[..]);
+    assert_eq!(rms, Ok((semicolon, &b" \t\r\n"[..])));
+  }
+
+  #[test]
+  fn take_while() {
+    named!(f, take_while!(is_alphabetic));
+    let a = b"";
+    let b = b"abcd";
+    let c = b"abcd123";
+    let d = b"123";
+
+    assert_eq!(f(&a[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&b[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&c[..]), Ok((&d[..], &b[..])));
+    assert_eq!(f(&d[..]), Ok((&d[..], &a[..])));
+  }
+
+  #[test]
+  fn take_while1() {
+    named!(f, take_while1!(is_alphabetic));
+    let a = b"";
+    let b = b"abcd";
+    let c = b"abcd123";
+    let d = b"123";
+
+    assert_eq!(f(&a[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&b[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&c[..]), Ok((&b"123"[..], &b[..])));
+    assert_eq!(
+      f(&d[..]),
+      Err(Err::Error(error_position!(&d[..], ErrorKind::TakeWhile1)))
+    );
+  }
+
+  #[test]
+  fn take_while_m_n() {
+    named!(x, take_while_m_n!(2, 4, is_alphabetic));
+    let a = b"";
+    let b = b"a";
+    let c = b"abc";
+    let d = b"abc123";
+    let e = b"abcde";
+    let f = b"123";
+
+    assert_eq!(x(&a[..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(x(&b[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(x(&c[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(x(&d[..]), Ok((&b"123"[..], &c[..])));
+    assert_eq!(x(&e[..]), Ok((&b"e"[..], &b"abcd"[..])));
+    assert_eq!(
+      x(&f[..]),
+      Err(Err::Error(error_position!(&f[..], ErrorKind::TakeWhileMN)))
+    );
+  }
+
+  #[test]
+  fn take_till() {
+    named!(f, take_till!(is_alphabetic));
+    let a = b"";
+    let b = b"abcd";
+    let c = b"123abcd";
+    let d = b"123";
+
+    assert_eq!(f(&a[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&b[..]), Ok((&b"abcd"[..], &b""[..])));
+    assert_eq!(f(&c[..]), Ok((&b"abcd"[..], &b"123"[..])));
+    assert_eq!(f(&d[..]), Err(Err::Incomplete(Needed::new(1))));
+  }
+
+  #[test]
+  fn take_till1() {
+    named!(f, take_till1!(is_alphabetic));
+    let a = b"";
+    let b = b"abcd";
+    let c = b"123abcd";
+    let d = b"123";
+
+    assert_eq!(f(&a[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(
+      f(&b[..]),
+      Err(Err::Error(error_position!(&b[..], ErrorKind::TakeTill1)))
+    );
+    assert_eq!(f(&c[..]), Ok((&b"abcd"[..], &b"123"[..])));
+    assert_eq!(f(&d[..]), Err(Err::Incomplete(Needed::new(1))));
+  }
+
+  #[test]
+  fn take_while_utf8() {
+    named!(f<&str,&str>, take_while!(|c:char| { c != '點' }));
+
+    assert_eq!(f(""), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f("abcd"), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f("abcd點"), Ok(("點", "abcd")));
+    assert_eq!(f("abcd點a"), Ok(("點a", "abcd")));
+
+    named!(g<&str,&str>, take_while!(|c:char| { c == '點' }));
+
+    assert_eq!(g(""), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(g("點abcd"), Ok(("abcd", "點")));
+    assert_eq!(g("點點點a"), Ok(("a", "點點點")));
+  }
+
+  #[test]
+  fn take_till_utf8() {
+    named!(f<&str,&str>, take_till!(|c:char| { c == '點' }));
+
+    assert_eq!(f(""), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f("abcd"), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f("abcd點"), Ok(("點", "abcd")));
+    assert_eq!(f("abcd點a"), Ok(("點a", "abcd")));
+
+    named!(g<&str,&str>, take_till!(|c:char| { c != '點' }));
+
+    assert_eq!(g(""), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(g("點abcd"), Ok(("abcd", "點")));
+    assert_eq!(g("點點點a"), Ok(("a", "點點點")));
+  }
+
+  #[test]
+  fn take_utf8() {
+    named!(f<&str,&str>, take!(3));
+
+    assert_eq!(f(""), Err(Err::Incomplete(Needed::Unknown)));
+    assert_eq!(f("ab"), Err(Err::Incomplete(Needed::Unknown)));
+    assert_eq!(f("點"), Err(Err::Incomplete(Needed::Unknown)));
+    assert_eq!(f("ab點cd"), Ok(("cd", "ab點")));
+    assert_eq!(f("a點bcd"), Ok(("cd", "a點b")));
+    assert_eq!(f("a點b"), Ok(("", "a點b")));
+
+    named!(g<&str,&str>, take_while!(|c:char| { c == '點' }));
+
+    assert_eq!(g(""), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(g("點abcd"), Ok(("abcd", "點")));
+    assert_eq!(g("點點點a"), Ok(("a", "點點點")));
+  }
+
+  #[test]
+  fn take_while_m_n_utf8() {
+    named!(parser<&str, &str>, take_while_m_n!(1, 1, |c| c == 'A' || c == '😃'));
+    assert_eq!(parser("A!"), Ok(("!", "A")));
+    assert_eq!(parser("😃!"), Ok(("!", "😃")));
+  }
+
+  #[test]
+  fn take_while_m_n_utf8_full_match() {
+    named!(parser<&str, &str>, take_while_m_n!(1, 1, |c: char| c.is_alphabetic()));
+    assert_eq!(parser("øn"), Ok(("n", "ø")));
+  }
+
+  #[cfg(nightly)]
+  use test::Bencher;
+
+  #[cfg(nightly)]
+  #[bench]
+  fn take_while_bench(b: &mut Bencher) {
+    named!(f, take_while!(is_alphabetic));
+    b.iter(|| f(&b"abcdefghijklABCDEejfrfrjgro12aa"[..]));
+  }
+
+  #[test]
+  #[cfg(feature = "std")]
+  fn recognize_take_while() {
+    use crate::character::is_alphanumeric;
+    named!(x, take_while!(is_alphanumeric));
+    named!(y, recognize!(x));
+    assert_eq!(x(&b"ab."[..]), Ok((&b"."[..], &b"ab"[..])));
+    println!("X: {:?}", x(&b"ab"[..]));
+    assert_eq!(y(&b"ab."[..]), Ok((&b"."[..], &b"ab"[..])));
+  }
+
+  #[test]
+  fn length_bytes() {
+    use crate::number::streaming::le_u8;
+    named!(x, length_data!(le_u8));
+    assert_eq!(x(b"\x02..>>"), Ok((&b">>"[..], &b".."[..])));
+    assert_eq!(x(b"\x02.."), Ok((&[][..], &b".."[..])));
+    assert_eq!(x(b"\x02."), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(x(b"\x02"), Err(Err::Incomplete(Needed::new(2))));
+
+    named!(y, do_parse!(tag!("magic") >> b: length_data!(le_u8) >> (b)));
+    assert_eq!(y(b"magic\x02..>>"), Ok((&b">>"[..], &b".."[..])));
+    assert_eq!(y(b"magic\x02.."), Ok((&[][..], &b".."[..])));
+    assert_eq!(y(b"magic\x02."), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(y(b"magic\x02"), Err(Err::Incomplete(Needed::new(2))));
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn case_insensitive() {
+    named!(test, tag_no_case!("ABcd"));
+    assert_eq!(test(&b"aBCdefgh"[..]), Ok((&b"efgh"[..], &b"aBCd"[..])));
+    assert_eq!(test(&b"abcdefgh"[..]), Ok((&b"efgh"[..], &b"abcd"[..])));
+    assert_eq!(test(&b"ABCDefgh"[..]), Ok((&b"efgh"[..], &b"ABCD"[..])));
+    assert_eq!(test(&b"ab"[..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(
+      test(&b"Hello"[..]),
+      Err(Err::Error(error_position!(&b"Hello"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      test(&b"Hel"[..]),
+      Err(Err::Error(error_position!(&b"Hel"[..], ErrorKind::Tag)))
+    );
+
+    named!(test2<&str, &str>, tag_no_case!("ABcd"));
+    assert_eq!(test2("aBCdefgh"), Ok(("efgh", "aBCd")));
+    assert_eq!(test2("abcdefgh"), Ok(("efgh", "abcd")));
+    assert_eq!(test2("ABCDefgh"), Ok(("efgh", "ABCD")));
+    assert_eq!(test2("ab"), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(
+      test2("Hello"),
+      Err(Err::Error(error_position!(&"Hello"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      test2("Hel"),
+      Err(Err::Error(error_position!(&"Hel"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn tag_fixed_size_array() {
+    named!(test, tag!([0x42]));
+    named!(test2, tag!(&[0x42]));
+    let input = [0x42, 0x00];
+    assert_eq!(test(&input), Ok((&b"\x00"[..], &b"\x42"[..])));
+    assert_eq!(test2(&input), Ok((&b"\x00"[..], &b"\x42"[..])));
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bytes/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bytes/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bytes/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bytes/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+//! Parsers recognizing bytes streams
+
+#[macro_use]
+mod macros;
+pub mod complete;
+pub mod streaming;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bytes/streaming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bytes/streaming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/bytes/streaming.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/bytes/streaming.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,715 @@
+//! Parsers recognizing bytes streams, streaming version
+
+use crate::error::ErrorKind;
+use crate::error::ParseError;
+use crate::internal::{Err, IResult, Needed, Parser};
+use crate::lib::std::ops::RangeFrom;
+use crate::lib::std::result::Result::*;
+use crate::traits::{
+  Compare, CompareResult, FindSubstring, FindToken, InputIter, InputLength, InputTake,
+  InputTakeAtPosition, Slice, ToUsize,
+};
+
+/// Recognizes a pattern.
+///
+/// The input data will be compared to the tag combinator's argument and will return the part of
+/// the input that matches the argument.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::streaming::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, &str> {
+///   tag("Hello")(s)
+/// }
+///
+/// assert_eq!(parser("Hello, World!"), Ok((", World!", "Hello")));
+/// assert_eq!(parser("Something"), Err(Err::Error(Error::new("Something", ErrorKind::Tag))));
+/// assert_eq!(parser("S"), Err(Err::Error(Error::new("S", ErrorKind::Tag))));
+/// assert_eq!(parser("H"), Err(Err::Incomplete(Needed::new(4))));
+/// ```
+pub fn tag<T, Input, Error: ParseError<Input>>(
+  tag: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTake + InputLength + Compare<T>,
+  T: InputLength + Clone,
+{
+  move |i: Input| {
+    let tag_len = tag.input_len();
+    let t = tag.clone();
+
+    let res: IResult<_, _, Error> = match i.compare(t) {
+      CompareResult::Ok => Ok(i.take_split(tag_len)),
+      CompareResult::Incomplete => Err(Err::Incomplete(Needed::new(tag_len - i.input_len()))),
+      CompareResult::Error => {
+        let e: ErrorKind = ErrorKind::Tag;
+        Err(Err::Error(Error::from_error_kind(i, e)))
+      }
+    };
+    res
+  }
+}
+
+/// Recognizes a case insensitive pattern.
+///
+/// The input data will be compared to the tag combinator's argument and will return the part of
+/// the input that matches the argument with no regard to case.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::streaming::tag_no_case;
+///
+/// fn parser(s: &str) -> IResult<&str, &str> {
+///   tag_no_case("hello")(s)
+/// }
+///
+/// assert_eq!(parser("Hello, World!"), Ok((", World!", "Hello")));
+/// assert_eq!(parser("hello, World!"), Ok((", World!", "hello")));
+/// assert_eq!(parser("HeLlO, World!"), Ok((", World!", "HeLlO")));
+/// assert_eq!(parser("Something"), Err(Err::Error(Error::new("Something", ErrorKind::Tag))));
+/// assert_eq!(parser(""), Err(Err::Incomplete(Needed::new(5))));
+/// ```
+pub fn tag_no_case<T, Input, Error: ParseError<Input>>(
+  tag: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTake + InputLength + Compare<T>,
+  T: InputLength + Clone,
+{
+  move |i: Input| {
+    let tag_len = tag.input_len();
+    let t = tag.clone();
+
+    let res: IResult<_, _, Error> = match (i).compare_no_case(t) {
+      CompareResult::Ok => Ok(i.take_split(tag_len)),
+      CompareResult::Incomplete => Err(Err::Incomplete(Needed::new(tag_len - i.input_len()))),
+      CompareResult::Error => {
+        let e: ErrorKind = ErrorKind::Tag;
+        Err(Err::Error(Error::from_error_kind(i, e)))
+      }
+    };
+    res
+  }
+}
+
+/// Parse till certain characters are met.
+///
+/// The parser will return the longest slice till one of the characters of the combinator's argument are met.
+///
+/// It doesn't consume the matched character.
+///
+/// It will return a `Err::Incomplete(Needed::new(1))` if the pattern wasn't met.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::bytes::streaming::is_not;
+///
+/// fn not_space(s: &str) -> IResult<&str, &str> {
+///   is_not(" \t\r\n")(s)
+/// }
+///
+/// assert_eq!(not_space("Hello, World!"), Ok((" World!", "Hello,")));
+/// assert_eq!(not_space("Sometimes\t"), Ok(("\t", "Sometimes")));
+/// assert_eq!(not_space("Nospace"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(not_space(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn is_not<T, Input, Error: ParseError<Input>>(
+  arr: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  T: FindToken<<Input as InputTakeAtPosition>::Item>,
+{
+  move |i: Input| {
+    let e: ErrorKind = ErrorKind::IsNot;
+    i.split_at_position1(|c| arr.find_token(c), e)
+  }
+}
+
+/// Returns the longest slice of the matches the pattern.
+///
+/// The parser will return the longest slice consisting of the characters in provided in the
+/// combinator's argument.
+///
+/// # Streaming specific
+/// *Streaming version* will return a `Err::Incomplete(Needed::new(1))` if the pattern wasn't met
+/// or if the pattern reaches the end of the input.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::bytes::streaming::is_a;
+///
+/// fn hex(s: &str) -> IResult<&str, &str> {
+///   is_a("1234567890ABCDEF")(s)
+/// }
+///
+/// assert_eq!(hex("123 and voila"), Ok((" and voila", "123")));
+/// assert_eq!(hex("DEADBEEF and others"), Ok((" and others", "DEADBEEF")));
+/// assert_eq!(hex("BADBABEsomething"), Ok(("something", "BADBABE")));
+/// assert_eq!(hex("D15EA5E"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(hex(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn is_a<T, Input, Error: ParseError<Input>>(
+  arr: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  T: FindToken<<Input as InputTakeAtPosition>::Item>,
+{
+  move |i: Input| {
+    let e: ErrorKind = ErrorKind::IsA;
+    i.split_at_position1(|c| !arr.find_token(c), e)
+  }
+}
+
+/// Returns the longest input slice (if any) that matches the predicate.
+///
+/// The parser will return the longest slice that matches the given predicate *(a function that
+/// takes the input and returns a bool)*.
+///
+/// # Streaming Specific
+/// *Streaming version* will return a `Err::Incomplete(Needed::new(1))` if the pattern reaches the end of the input.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::bytes::streaming::take_while;
+/// use nom::character::is_alphabetic;
+///
+/// fn alpha(s: &[u8]) -> IResult<&[u8], &[u8]> {
+///   take_while(is_alphabetic)(s)
+/// }
+///
+/// assert_eq!(alpha(b"latin123"), Ok((&b"123"[..], &b"latin"[..])));
+/// assert_eq!(alpha(b"12345"), Ok((&b"12345"[..], &b""[..])));
+/// assert_eq!(alpha(b"latin"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(alpha(b""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn take_while<F, Input, Error: ParseError<Input>>(
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  F: Fn(<Input as InputTakeAtPosition>::Item) -> bool,
+{
+  move |i: Input| i.split_at_position(|c| !cond(c))
+}
+
+/// Returns the longest (at least 1) input slice that matches the predicate.
+///
+/// The parser will return the longest slice that matches the given predicate *(a function that
+/// takes the input and returns a bool)*.
+///
+/// It will return an `Err(Err::Error((_, ErrorKind::TakeWhile1)))` if the pattern wasn't met.
+///
+/// # Streaming Specific
+/// *Streaming version* will return a `Err::Incomplete(Needed::new(1))` or if the pattern reaches the end of the input.
+///
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::streaming::take_while1;
+/// use nom::character::is_alphabetic;
+///
+/// fn alpha(s: &[u8]) -> IResult<&[u8], &[u8]> {
+///   take_while1(is_alphabetic)(s)
+/// }
+///
+/// assert_eq!(alpha(b"latin123"), Ok((&b"123"[..], &b"latin"[..])));
+/// assert_eq!(alpha(b"latin"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(alpha(b"12345"), Err(Err::Error(Error::new(&b"12345"[..], ErrorKind::TakeWhile1))));
+/// ```
+pub fn take_while1<F, Input, Error: ParseError<Input>>(
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  F: Fn(<Input as InputTakeAtPosition>::Item) -> bool,
+{
+  move |i: Input| {
+    let e: ErrorKind = ErrorKind::TakeWhile1;
+    i.split_at_position1(|c| !cond(c), e)
+  }
+}
+
+/// Returns the longest (m <= len <= n) input slice  that matches the predicate.
+///
+/// The parser will return the longest slice that matches the given predicate *(a function that
+/// takes the input and returns a bool)*.
+///
+/// It will return an `Err::Error((_, ErrorKind::TakeWhileMN))` if the pattern wasn't met.
+/// # Streaming Specific
+/// *Streaming version* will return a `Err::Incomplete(Needed::new(1))`  if the pattern reaches the end of the input or is too short.
+///
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::streaming::take_while_m_n;
+/// use nom::character::is_alphabetic;
+///
+/// fn short_alpha(s: &[u8]) -> IResult<&[u8], &[u8]> {
+///   take_while_m_n(3, 6, is_alphabetic)(s)
+/// }
+///
+/// assert_eq!(short_alpha(b"latin123"), Ok((&b"123"[..], &b"latin"[..])));
+/// assert_eq!(short_alpha(b"lengthy"), Ok((&b"y"[..], &b"length"[..])));
+/// assert_eq!(short_alpha(b"latin"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(short_alpha(b"ed"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(short_alpha(b"12345"), Err(Err::Error(Error::new(&b"12345"[..], ErrorKind::TakeWhileMN))));
+/// ```
+pub fn take_while_m_n<F, Input, Error: ParseError<Input>>(
+  m: usize,
+  n: usize,
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTake + InputIter + InputLength,
+  F: Fn(<Input as InputIter>::Item) -> bool,
+{
+  move |i: Input| {
+    let input = i;
+
+    match input.position(|c| !cond(c)) {
+      Some(idx) => {
+        if idx >= m {
+          if idx <= n {
+            let res: IResult<_, _, Error> = if let Ok(index) = input.slice_index(idx) {
+              Ok(input.take_split(index))
+            } else {
+              Err(Err::Error(Error::from_error_kind(
+                input,
+                ErrorKind::TakeWhileMN,
+              )))
+            };
+            res
+          } else {
+            let res: IResult<_, _, Error> = if let Ok(index) = input.slice_index(n) {
+              Ok(input.take_split(index))
+            } else {
+              Err(Err::Error(Error::from_error_kind(
+                input,
+                ErrorKind::TakeWhileMN,
+              )))
+            };
+            res
+          }
+        } else {
+          let e = ErrorKind::TakeWhileMN;
+          Err(Err::Error(Error::from_error_kind(input, e)))
+        }
+      }
+      None => {
+        let len = input.input_len();
+        if len >= n {
+          match input.slice_index(n) {
+            Ok(index) => Ok(input.take_split(index)),
+            Err(_needed) => Err(Err::Error(Error::from_error_kind(
+              input,
+              ErrorKind::TakeWhileMN,
+            ))),
+          }
+        } else {
+          let needed = if m > len { m - len } else { 1 };
+          Err(Err::Incomplete(Needed::new(needed)))
+        }
+      }
+    }
+  }
+}
+
+/// Returns the longest input slice (if any) till a predicate is met.
+///
+/// The parser will return the longest slice till the given predicate *(a function that
+/// takes the input and returns a bool)*.
+///
+/// # Streaming Specific
+/// *Streaming version* will return a `Err::Incomplete(Needed::new(1))` if the match reaches the
+/// end of input or if there was not match.
+///
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::bytes::streaming::take_till;
+///
+/// fn till_colon(s: &str) -> IResult<&str, &str> {
+///   take_till(|c| c == ':')(s)
+/// }
+///
+/// assert_eq!(till_colon("latin:123"), Ok((":123", "latin")));
+/// assert_eq!(till_colon(":empty matched"), Ok((":empty matched", ""))); //allowed
+/// assert_eq!(till_colon("12345"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(till_colon(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn take_till<F, Input, Error: ParseError<Input>>(
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  F: Fn(<Input as InputTakeAtPosition>::Item) -> bool,
+{
+  move |i: Input| i.split_at_position(|c| cond(c))
+}
+
+/// Returns the longest (at least 1) input slice till a predicate is met.
+///
+/// The parser will return the longest slice till the given predicate *(a function that
+/// takes the input and returns a bool)*.
+///
+/// # Streaming Specific
+/// *Streaming version* will return a `Err::Incomplete(Needed::new(1))` if the match reaches the
+/// end of input or if there was not match.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::bytes::streaming::take_till1;
+///
+/// fn till_colon(s: &str) -> IResult<&str, &str> {
+///   take_till1(|c| c == ':')(s)
+/// }
+///
+/// assert_eq!(till_colon("latin:123"), Ok((":123", "latin")));
+/// assert_eq!(till_colon(":empty matched"), Err(Err::Error(Error::new(":empty matched", ErrorKind::TakeTill1))));
+/// assert_eq!(till_colon("12345"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(till_colon(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn take_till1<F, Input, Error: ParseError<Input>>(
+  cond: F,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTakeAtPosition,
+  F: Fn(<Input as InputTakeAtPosition>::Item) -> bool,
+{
+  move |i: Input| {
+    let e: ErrorKind = ErrorKind::TakeTill1;
+    i.split_at_position1(|c| cond(c), e)
+  }
+}
+
+/// Returns an input slice containing the first N input elements (Input[..N]).
+///
+/// # Streaming Specific
+/// *Streaming version* if the input has less than N elements, `take` will
+/// return a `Err::Incomplete(Needed::new(M))` where M is the number of
+/// additional bytes the parser would need to succeed.
+/// It is well defined for `&[u8]` as the number of elements is the byte size,
+/// but for types like `&str`, we cannot know how many bytes correspond for
+/// the next few chars, so the result will be `Err::Incomplete(Needed::Unknown)`
+///
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::bytes::streaming::take;
+///
+/// fn take6(s: &str) -> IResult<&str, &str> {
+///   take(6usize)(s)
+/// }
+///
+/// assert_eq!(take6("1234567"), Ok(("7", "123456")));
+/// assert_eq!(take6("things"), Ok(("", "things")));
+/// assert_eq!(take6("short"), Err(Err::Incomplete(Needed::Unknown)));
+/// ```
+pub fn take<C, Input, Error: ParseError<Input>>(
+  count: C,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputIter + InputTake + InputLength,
+  C: ToUsize,
+{
+  let c = count.to_usize();
+  move |i: Input| match i.slice_index(c) {
+    Err(i) => Err(Err::Incomplete(i)),
+    Ok(index) => Ok(i.take_split(index)),
+  }
+}
+
+/// Returns the input slice up to the first occurrence of the pattern.
+///
+/// It doesn't consume the pattern.
+///
+/// # Streaming Specific
+/// *Streaming version* will return a `Err::Incomplete(Needed::new(N))` if the input doesn't
+/// contain the pattern or if the input is smaller than the pattern.
+/// # Example
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::bytes::streaming::take_until;
+///
+/// fn until_eof(s: &str) -> IResult<&str, &str> {
+///   take_until("eof")(s)
+/// }
+///
+/// assert_eq!(until_eof("hello, worldeof"), Ok(("eof", "hello, world")));
+/// assert_eq!(until_eof("hello, world"), Err(Err::Incomplete(Needed::Unknown)));
+/// assert_eq!(until_eof("hello, worldeo"), Err(Err::Incomplete(Needed::Unknown)));
+/// assert_eq!(until_eof("1eof2eof"), Ok(("eof2eof", "1")));
+/// ```
+pub fn take_until<T, Input, Error: ParseError<Input>>(
+  tag: T,
+) -> impl Fn(Input) -> IResult<Input, Input, Error>
+where
+  Input: InputTake + InputLength + FindSubstring<T>,
+  T: Clone,
+{
+  move |i: Input| {
+    let t = tag.clone();
+
+    let res: IResult<_, _, Error> = match i.find_substring(t) {
+      None => Err(Err::Incomplete(Needed::Unknown)),
+      Some(index) => Ok(i.take_split(index)),
+    };
+    res
+  }
+}
+
+/// Matches a byte string with escaped characters.
+///
+/// * The first argument matches the normal characters (it must not accept the control character)
+/// * The second argument is the control character (like `\` in most languages)
+/// * The third argument matches the escaped characters
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// # use nom::character::complete::digit1;
+/// use nom::bytes::streaming::escaped;
+/// use nom::character::streaming::one_of;
+///
+/// fn esc(s: &str) -> IResult<&str, &str> {
+///   escaped(digit1, '\\', one_of("\"n\\"))(s)
+/// }
+///
+/// assert_eq!(esc("123;"), Ok((";", "123")));
+/// assert_eq!(esc("12\\\"34;"), Ok((";", "12\\\"34")));
+/// ```
+///
+pub fn escaped<Input, Error, F, G, O1, O2>(
+  mut normal: F,
+  control_char: char,
+  mut escapable: G,
+) -> impl FnMut(Input) -> IResult<Input, Input, Error>
+where
+  Input: Clone
+    + crate::traits::Offset
+    + InputLength
+    + InputTake
+    + InputTakeAtPosition
+    + Slice<RangeFrom<usize>>
+    + InputIter,
+  <Input as InputIter>::Item: crate::traits::AsChar,
+  F: Parser<Input, O1, Error>,
+  G: Parser<Input, O2, Error>,
+  Error: ParseError<Input>,
+{
+  use crate::traits::AsChar;
+
+  move |input: Input| {
+    let mut i = input.clone();
+
+    while i.input_len() > 0 {
+      match normal.parse(i.clone()) {
+        Ok((i2, _)) => {
+          if i2.input_len() == 0 {
+            return Err(Err::Incomplete(Needed::Unknown));
+          } else {
+            i = i2;
+          }
+        }
+        Err(Err::Error(_)) => {
+          // unwrap() should be safe here since index < $i.input_len()
+          if i.iter_elements().next().unwrap().as_char() == control_char {
+            let next = control_char.len_utf8();
+            if next >= i.input_len() {
+              return Err(Err::Incomplete(Needed::new(1)));
+            } else {
+              match escapable.parse(i.slice(next..)) {
+                Ok((i2, _)) => {
+                  if i2.input_len() == 0 {
+                    return Err(Err::Incomplete(Needed::Unknown));
+                  } else {
+                    i = i2;
+                  }
+                }
+                Err(e) => return Err(e),
+              }
+            }
+          } else {
+            let index = input.offset(&i);
+            return Ok(input.take_split(index));
+          }
+        }
+        Err(e) => {
+          return Err(e);
+        }
+      }
+    }
+
+    Err(Err::Incomplete(Needed::Unknown))
+  }
+}
+
+#[doc(hidden)]
+pub fn escapedc<Input, Error, F, G, O1, O2>(
+  i: Input,
+  normal: F,
+  control_char: char,
+  escapable: G,
+) -> IResult<Input, Input, Error>
+where
+  Input: Clone
+    + crate::traits::Offset
+    + InputLength
+    + InputTake
+    + InputTakeAtPosition
+    + Slice<RangeFrom<usize>>
+    + InputIter,
+  <Input as InputIter>::Item: crate::traits::AsChar,
+  F: Fn(Input) -> IResult<Input, O1, Error>,
+  G: Fn(Input) -> IResult<Input, O2, Error>,
+  Error: ParseError<Input>,
+{
+  escaped(normal, control_char, escapable)(i)
+}
+
+/// Matches a byte string with escaped characters.
+///
+/// * The first argument matches the normal characters (it must not match the control character)
+/// * The second argument is the control character (like `\` in most languages)
+/// * The third argument matches the escaped characters and transforms them
+///
+/// As an example, the chain `abc\tdef` could be `abc    def` (it also consumes the control character)
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// # use std::str::from_utf8;
+/// use nom::bytes::streaming::{escaped_transform, tag};
+/// use nom::character::streaming::alpha1;
+/// use nom::branch::alt;
+/// use nom::combinator::value;
+///
+/// fn parser(input: &str) -> IResult<&str, String> {
+///   escaped_transform(
+///     alpha1,
+///     '\\',
+///     alt((
+///       value("\\", tag("\\")),
+///       value("\"", tag("\"")),
+///       value("n", tag("\n")),
+///     ))
+///   )(input)
+/// }
+///
+/// assert_eq!(parser("ab\\\"cd\""), Ok(("\"", String::from("ab\"cd"))));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn escaped_transform<Input, Error, F, G, O1, O2, ExtendItem, Output>(
+  mut normal: F,
+  control_char: char,
+  mut transform: G,
+) -> impl FnMut(Input) -> IResult<Input, Output, Error>
+where
+  Input: Clone
+    + crate::traits::Offset
+    + InputLength
+    + InputTake
+    + InputTakeAtPosition
+    + Slice<RangeFrom<usize>>
+    + InputIter,
+  Input: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  O1: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  O2: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  <Input as InputIter>::Item: crate::traits::AsChar,
+  F: Parser<Input, O1, Error>,
+  G: Parser<Input, O2, Error>,
+  Error: ParseError<Input>,
+{
+  use crate::traits::AsChar;
+
+  move |input: Input| {
+    let mut index = 0;
+    let mut res = input.new_builder();
+
+    let i = input.clone();
+
+    while index < i.input_len() {
+      let remainder = i.slice(index..);
+      match normal.parse(remainder.clone()) {
+        Ok((i2, o)) => {
+          o.extend_into(&mut res);
+          if i2.input_len() == 0 {
+            return Err(Err::Incomplete(Needed::Unknown));
+          } else {
+            index = input.offset(&i2);
+          }
+        }
+        Err(Err::Error(_)) => {
+          // unwrap() should be safe here since index < $i.input_len()
+          if remainder.iter_elements().next().unwrap().as_char() == control_char {
+            let next = index + control_char.len_utf8();
+            let input_len = input.input_len();
+
+            if next >= input_len {
+              return Err(Err::Incomplete(Needed::Unknown));
+            } else {
+              match transform.parse(i.slice(next..)) {
+                Ok((i2, o)) => {
+                  o.extend_into(&mut res);
+                  if i2.input_len() == 0 {
+                    return Err(Err::Incomplete(Needed::Unknown));
+                  } else {
+                    index = input.offset(&i2);
+                  }
+                }
+                Err(e) => return Err(e),
+              }
+            }
+          } else {
+            return Ok((remainder, res));
+          }
+        }
+        Err(e) => return Err(e),
+      }
+    }
+    Err(Err::Incomplete(Needed::Unknown))
+  }
+}
+
+#[doc(hidden)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn escaped_transformc<Input, Error, F, G, O1, O2, ExtendItem, Output>(
+  i: Input,
+  normal: F,
+  control_char: char,
+  transform: G,
+) -> IResult<Input, Output, Error>
+where
+  Input: Clone
+    + crate::traits::Offset
+    + InputLength
+    + InputTake
+    + InputTakeAtPosition
+    + Slice<RangeFrom<usize>>
+    + InputIter,
+  Input: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  O1: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  O2: crate::traits::ExtendInto<Item = ExtendItem, Extender = Output>,
+  <Input as InputIter>::Item: crate::traits::AsChar,
+  F: Fn(Input) -> IResult<Input, O1, Error>,
+  G: Fn(Input) -> IResult<Input, O2, Error>,
+  Error: ParseError<Input>,
+{
+  escaped_transform(normal, control_char, transform)(i)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/character/complete.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/character/complete.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/character/complete.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/character/complete.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1020 @@
+//! Character specific parsers and combinators, complete input version.
+//!
+//! Functions recognizing specific characters.
+
+use crate::error::ErrorKind;
+use crate::error::ParseError;
+use crate::internal::{Err, IResult};
+use crate::lib::std::ops::{Range, RangeFrom, RangeTo};
+use crate::traits::{AsChar, FindToken, InputIter, InputLength, InputTakeAtPosition, Slice};
+use crate::traits::{Compare, CompareResult};
+
+/// Recognizes one character.
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{ErrorKind, Error}, IResult};
+/// # use nom::character::complete::char;
+/// fn parser(i: &str) -> IResult<&str, char> {
+///     char('a')(i)
+/// }
+/// assert_eq!(parser("abc"), Ok(("bc", 'a')));
+/// assert_eq!(parser(" abc"), Err(Err::Error(Error::new(" abc", ErrorKind::Char))));
+/// assert_eq!(parser("bc"), Err(Err::Error(Error::new("bc", ErrorKind::Char))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Char))));
+/// ```
+pub fn char<I, Error: ParseError<I>>(c: char) -> impl Fn(I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar,
+{
+  move |i: I| match (i).iter_elements().next().map(|t| {
+    let b = t.as_char() == c;
+    (&c, b)
+  }) {
+    Some((c, true)) => Ok((i.slice(c.len()..), c.as_char())),
+    _ => Err(Err::Error(Error::from_char(i, c))),
+  }
+}
+
+/// Recognizes one character and checks that it satisfies a predicate
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{ErrorKind, Error}, Needed, IResult};
+/// # use nom::character::complete::satisfy;
+/// fn parser(i: &str) -> IResult<&str, char> {
+///     satisfy(|c| c == 'a' || c == 'b')(i)
+/// }
+/// assert_eq!(parser("abc"), Ok(("bc", 'a')));
+/// assert_eq!(parser("cd"), Err(Err::Error(Error::new("cd", ErrorKind::Satisfy))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Satisfy))));
+/// ```
+pub fn satisfy<F, I, Error: ParseError<I>>(cond: F) -> impl Fn(I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar,
+  F: Fn(char) -> bool,
+{
+  move |i: I| match (i).iter_elements().next().map(|t| {
+    let c = t.as_char();
+    let b = cond(c);
+    (c, b)
+  }) {
+    Some((c, true)) => Ok((i.slice(c.len()..), c)),
+    _ => Err(Err::Error(Error::from_error_kind(i, ErrorKind::Satisfy))),
+  }
+}
+
+/// Recognizes one of the provided characters.
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind};
+/// # use nom::character::complete::one_of;
+/// assert_eq!(one_of::<_, _, (&str, ErrorKind)>("abc")("b"), Ok(("", 'b')));
+/// assert_eq!(one_of::<_, _, (&str, ErrorKind)>("a")("bc"), Err(Err::Error(("bc", ErrorKind::OneOf))));
+/// assert_eq!(one_of::<_, _, (&str, ErrorKind)>("a")(""), Err(Err::Error(("", ErrorKind::OneOf))));
+/// ```
+pub fn one_of<I, T, Error: ParseError<I>>(list: T) -> impl Fn(I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar + Copy,
+  T: FindToken<<I as InputIter>::Item>,
+{
+  move |i: I| match (i).iter_elements().next().map(|c| (c, list.find_token(c))) {
+    Some((c, true)) => Ok((i.slice(c.len()..), c.as_char())),
+    _ => Err(Err::Error(Error::from_error_kind(i, ErrorKind::OneOf))),
+  }
+}
+
+/// Recognizes a character that is not in the provided characters.
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind};
+/// # use nom::character::complete::none_of;
+/// assert_eq!(none_of::<_, _, (&str, ErrorKind)>("abc")("z"), Ok(("", 'z')));
+/// assert_eq!(none_of::<_, _, (&str, ErrorKind)>("ab")("a"), Err(Err::Error(("a", ErrorKind::NoneOf))));
+/// assert_eq!(none_of::<_, _, (&str, ErrorKind)>("a")(""), Err(Err::Error(("", ErrorKind::NoneOf))));
+/// ```
+pub fn none_of<I, T, Error: ParseError<I>>(list: T) -> impl Fn(I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar + Copy,
+  T: FindToken<<I as InputIter>::Item>,
+{
+  move |i: I| match (i).iter_elements().next().map(|c| (c, !list.find_token(c))) {
+    Some((c, true)) => Ok((i.slice(c.len()..), c.as_char())),
+    _ => Err(Err::Error(Error::from_error_kind(i, ErrorKind::NoneOf))),
+  }
+}
+
+/// Recognizes the string "\r\n".
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult};
+/// # use nom::character::complete::crlf;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     crlf(input)
+/// }
+///
+/// assert_eq!(parser("\r\nc"), Ok(("c", "\r\n")));
+/// assert_eq!(parser("ab\r\nc"), Err(Err::Error(Error::new("ab\r\nc", ErrorKind::CrLf))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::CrLf))));
+/// ```
+pub fn crlf<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<Range<usize>> + Slice<RangeFrom<usize>>,
+  T: InputIter,
+  T: Compare<&'static str>,
+{
+  match input.compare("\r\n") {
+    //FIXME: is this the right index?
+    CompareResult::Ok => Ok((input.slice(2..), input.slice(0..2))),
+    _ => {
+      let e: ErrorKind = ErrorKind::CrLf;
+      Err(Err::Error(E::from_error_kind(input, e)))
+    }
+  }
+}
+
+//FIXME: there's still an incomplete
+/// Recognizes a string of any char except '\r' or '\n'.
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::complete::not_line_ending;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     not_line_ending(input)
+/// }
+///
+/// assert_eq!(parser("ab\r\nc"), Ok(("\r\nc", "ab")));
+/// assert_eq!(parser("abc"), Ok(("", "abc")));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// ```
+pub fn not_line_ending<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<Range<usize>> + Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: InputIter + InputLength,
+  T: Compare<&'static str>,
+  <T as InputIter>::Item: AsChar,
+  <T as InputIter>::Item: AsChar,
+{
+  match input.position(|item| {
+    let c = item.as_char();
+    c == '\r' || c == '\n'
+  }) {
+    None => Ok((input.slice(input.input_len()..), input)),
+    Some(index) => {
+      let mut it = input.slice(index..).iter_elements();
+      let nth = it.next().unwrap().as_char();
+      if nth == '\r' {
+        let sliced = input.slice(index..);
+        let comp = sliced.compare("\r\n");
+        match comp {
+          //FIXME: calculate the right index
+          CompareResult::Ok => Ok((input.slice(index..), input.slice(..index))),
+          _ => {
+            let e: ErrorKind = ErrorKind::Tag;
+            Err(Err::Error(E::from_error_kind(input, e)))
+          }
+        }
+      } else {
+        Ok((input.slice(index..), input.slice(..index)))
+      }
+    }
+  }
+}
+
+/// Recognizes an end of line (both '\n' and '\r\n').
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::line_ending;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     line_ending(input)
+/// }
+///
+/// assert_eq!(parser("\r\nc"), Ok(("c", "\r\n")));
+/// assert_eq!(parser("ab\r\nc"), Err(Err::Error(Error::new("ab\r\nc", ErrorKind::CrLf))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::CrLf))));
+/// ```
+pub fn line_ending<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<Range<usize>> + Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: InputIter + InputLength,
+  T: Compare<&'static str>,
+{
+  match input.compare("\n") {
+    CompareResult::Ok => Ok((input.slice(1..), input.slice(0..1))),
+    CompareResult::Incomplete => Err(Err::Error(E::from_error_kind(input, ErrorKind::CrLf))),
+    CompareResult::Error => {
+      match input.compare("\r\n") {
+        //FIXME: is this the right index?
+        CompareResult::Ok => Ok((input.slice(2..), input.slice(0..2))),
+        _ => Err(Err::Error(E::from_error_kind(input, ErrorKind::CrLf))),
+      }
+    }
+  }
+}
+
+/// Matches a newline character '\n'.
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::newline;
+/// fn parser(input: &str) -> IResult<&str, char> {
+///     newline(input)
+/// }
+///
+/// assert_eq!(parser("\nc"), Ok(("c", '\n')));
+/// assert_eq!(parser("\r\nc"), Err(Err::Error(Error::new("\r\nc", ErrorKind::Char))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Char))));
+/// ```
+pub fn newline<I, Error: ParseError<I>>(input: I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar,
+{
+  char('\n')(input)
+}
+
+/// Matches a tab character '\t'.
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::tab;
+/// fn parser(input: &str) -> IResult<&str, char> {
+///     tab(input)
+/// }
+///
+/// assert_eq!(parser("\tc"), Ok(("c", '\t')));
+/// assert_eq!(parser("\r\nc"), Err(Err::Error(Error::new("\r\nc", ErrorKind::Char))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Char))));
+/// ```
+pub fn tab<I, Error: ParseError<I>>(input: I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar,
+{
+  char('\t')(input)
+}
+
+/// Matches one byte as a character. Note that the input type will
+/// accept a `str`, but not a `&[u8]`, unlike many other nom parsers.
+///
+/// *Complete version*: Will return an error if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{character::complete::anychar, Err, error::{Error, ErrorKind}, IResult};
+/// fn parser(input: &str) -> IResult<&str, char> {
+///     anychar(input)
+/// }
+///
+/// assert_eq!(parser("abc"), Ok(("bc",'a')));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Eof))));
+/// ```
+pub fn anychar<T, E: ParseError<T>>(input: T) -> IResult<T, char, E>
+where
+  T: InputIter + InputLength + Slice<RangeFrom<usize>>,
+  <T as InputIter>::Item: AsChar,
+{
+  let mut it = input.iter_indices();
+  match it.next() {
+    None => Err(Err::Error(E::from_error_kind(input, ErrorKind::Eof))),
+    Some((_, c)) => match it.next() {
+      None => Ok((input.slice(input.input_len()..), c.as_char())),
+      Some((idx, _)) => Ok((input.slice(idx..), c.as_char())),
+    },
+  }
+}
+
+/// Recognizes zero or more lowercase and uppercase ASCII alphabetic characters: a-z, A-Z
+///
+/// *Complete version*: Will return the whole input if no terminating token is found (a non
+/// alphabetic character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::complete::alpha0;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     alpha0(input)
+/// }
+///
+/// assert_eq!(parser("ab1c"), Ok(("1c", "ab")));
+/// assert_eq!(parser("1c"), Ok(("1c", "")));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// ```
+pub fn alpha0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position_complete(|item| !item.is_alpha())
+}
+
+/// Recognizes one or more lowercase and uppercase ASCII alphabetic characters: a-z, A-Z
+///
+/// *Complete version*: Will return an error if there's not enough input data,
+/// or the whole input if no terminating token is found  (a non alphabetic character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::alpha1;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     alpha1(input)
+/// }
+///
+/// assert_eq!(parser("aB1c"), Ok(("1c", "aB")));
+/// assert_eq!(parser("1c"), Err(Err::Error(Error::new("1c", ErrorKind::Alpha))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Alpha))));
+/// ```
+pub fn alpha1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1_complete(|item| !item.is_alpha(), ErrorKind::Alpha)
+}
+
+/// Recognizes zero or more ASCII numerical characters: 0-9
+///
+/// *Complete version*: Will return an error if there's not enough input data,
+/// or the whole input if no terminating token is found (a non digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::complete::digit0;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     digit0(input)
+/// }
+///
+/// assert_eq!(parser("21c"), Ok(("c", "21")));
+/// assert_eq!(parser("21"), Ok(("", "21")));
+/// assert_eq!(parser("a21c"), Ok(("a21c", "")));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// ```
+pub fn digit0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position_complete(|item| !item.is_dec_digit())
+}
+
+/// Recognizes one or more ASCII numerical characters: 0-9
+///
+/// *Complete version*: Will return an error if there's not enough input data,
+/// or the whole input if no terminating token is found (a non digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::digit1;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     digit1(input)
+/// }
+///
+/// assert_eq!(parser("21c"), Ok(("c", "21")));
+/// assert_eq!(parser("c1"), Err(Err::Error(Error::new("c1", ErrorKind::Digit))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Digit))));
+/// ```
+pub fn digit1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1_complete(|item| !item.is_dec_digit(), ErrorKind::Digit)
+}
+
+/// Recognizes zero or more ASCII hexadecimal numerical characters: 0-9, A-F, a-f
+///
+/// *Complete version*: Will return the whole input if no terminating token is found (a non hexadecimal digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::complete::hex_digit0;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     hex_digit0(input)
+/// }
+///
+/// assert_eq!(parser("21cZ"), Ok(("Z", "21c")));
+/// assert_eq!(parser("Z21c"), Ok(("Z21c", "")));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// ```
+pub fn hex_digit0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position_complete(|item| !item.is_hex_digit())
+}
+/// Recognizes one or more ASCII hexadecimal numerical characters: 0-9, A-F, a-f
+///
+/// *Complete version*: Will return an error if there's not enough input data,
+/// or the whole input if no terminating token is found (a non hexadecimal digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::hex_digit1;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     hex_digit1(input)
+/// }
+///
+/// assert_eq!(parser("21cZ"), Ok(("Z", "21c")));
+/// assert_eq!(parser("H2"), Err(Err::Error(Error::new("H2", ErrorKind::HexDigit))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::HexDigit))));
+/// ```
+pub fn hex_digit1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1_complete(|item| !item.is_hex_digit(), ErrorKind::HexDigit)
+}
+
+/// Recognizes zero or more octal characters: 0-7
+///
+/// *Complete version*: Will return the whole input if no terminating token is found (a non octal
+/// digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::complete::oct_digit0;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     oct_digit0(input)
+/// }
+///
+/// assert_eq!(parser("21cZ"), Ok(("cZ", "21")));
+/// assert_eq!(parser("Z21c"), Ok(("Z21c", "")));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// ```
+pub fn oct_digit0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position_complete(|item| !item.is_oct_digit())
+}
+
+/// Recognizes one or more octal characters: 0-7
+///
+/// *Complete version*: Will return an error if there's not enough input data,
+/// or the whole input if no terminating token is found (a non octal digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::oct_digit1;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     oct_digit1(input)
+/// }
+///
+/// assert_eq!(parser("21cZ"), Ok(("cZ", "21")));
+/// assert_eq!(parser("H2"), Err(Err::Error(Error::new("H2", ErrorKind::OctDigit))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::OctDigit))));
+/// ```
+pub fn oct_digit1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1_complete(|item| !item.is_oct_digit(), ErrorKind::OctDigit)
+}
+
+/// Recognizes zero or more ASCII numerical and alphabetic characters: 0-9, a-z, A-Z
+///
+/// *Complete version*: Will return the whole input if no terminating token is found (a non
+/// alphanumerical character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::complete::alphanumeric0;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     alphanumeric0(input)
+/// }
+///
+/// assert_eq!(parser("21cZ%1"), Ok(("%1", "21cZ")));
+/// assert_eq!(parser("&Z21c"), Ok(("&Z21c", "")));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// ```
+pub fn alphanumeric0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position_complete(|item| !item.is_alphanum())
+}
+
+/// Recognizes one or more ASCII numerical and alphabetic characters: 0-9, a-z, A-Z
+///
+/// *Complete version*: Will return an error if there's not enough input data,
+/// or the whole input if no terminating token is found (a non alphanumerical character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::alphanumeric1;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     alphanumeric1(input)
+/// }
+///
+/// assert_eq!(parser("21cZ%1"), Ok(("%1", "21cZ")));
+/// assert_eq!(parser("&H2"), Err(Err::Error(Error::new("&H2", ErrorKind::AlphaNumeric))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::AlphaNumeric))));
+/// ```
+pub fn alphanumeric1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1_complete(|item| !item.is_alphanum(), ErrorKind::AlphaNumeric)
+}
+
+/// Recognizes zero or more spaces and tabs.
+///
+/// *Complete version*: Will return the whole input if no terminating token is found (a non space
+/// character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::complete::space0;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     space0(input)
+/// }
+///
+/// assert_eq!(parser(" \t21c"), Ok(("21c", " \t")));
+/// assert_eq!(parser("Z21c"), Ok(("Z21c", "")));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// ```
+pub fn space0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar + Clone,
+{
+  input.split_at_position_complete(|item| {
+    let c = item.as_char();
+    !(c == ' ' || c == '\t')
+  })
+}
+
+/// Recognizes one or more spaces and tabs.
+///
+/// *Complete version*: Will return an error if there's not enough input data,
+/// or the whole input if no terminating token is found (a non space character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::space1;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     space1(input)
+/// }
+///
+/// assert_eq!(parser(" \t21c"), Ok(("21c", " \t")));
+/// assert_eq!(parser("H2"), Err(Err::Error(Error::new("H2", ErrorKind::Space))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Space))));
+/// ```
+pub fn space1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar + Clone,
+{
+  input.split_at_position1_complete(
+    |item| {
+      let c = item.as_char();
+      !(c == ' ' || c == '\t')
+    },
+    ErrorKind::Space,
+  )
+}
+
+/// Recognizes zero or more spaces, tabs, carriage returns and line feeds.
+///
+/// *Complete version*: will return the whole input if no terminating token is found (a non space
+/// character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::complete::multispace0;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     multispace0(input)
+/// }
+///
+/// assert_eq!(parser(" \t\n\r21c"), Ok(("21c", " \t\n\r")));
+/// assert_eq!(parser("Z21c"), Ok(("Z21c", "")));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// ```
+pub fn multispace0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar + Clone,
+{
+  input.split_at_position_complete(|item| {
+    let c = item.as_char();
+    !(c == ' ' || c == '\t' || c == '\r' || c == '\n')
+  })
+}
+
+/// Recognizes one or more spaces, tabs, carriage returns and line feeds.
+///
+/// *Complete version*: will return an error if there's not enough input data,
+/// or the whole input if no terminating token is found (a non space character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult, Needed};
+/// # use nom::character::complete::multispace1;
+/// fn parser(input: &str) -> IResult<&str, &str> {
+///     multispace1(input)
+/// }
+///
+/// assert_eq!(parser(" \t\n\r21c"), Ok(("21c", " \t\n\r")));
+/// assert_eq!(parser("H2"), Err(Err::Error(Error::new("H2", ErrorKind::MultiSpace))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::MultiSpace))));
+/// ```
+pub fn multispace1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar + Clone,
+{
+  input.split_at_position1_complete(
+    |item| {
+      let c = item.as_char();
+      !(c == ' ' || c == '\t' || c == '\r' || c == '\n')
+    },
+    ErrorKind::MultiSpace,
+  )
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::internal::Err;
+
+  macro_rules! assert_parse(
+    ($left: expr, $right: expr) => {
+      let res: $crate::IResult<_, _, (_, ErrorKind)> = $left;
+      assert_eq!(res, $right);
+    };
+  );
+
+  #[test]
+  fn character() {
+    let empty: &[u8] = b"";
+    let a: &[u8] = b"abcd";
+    let b: &[u8] = b"1234";
+    let c: &[u8] = b"a123";
+    let d: &[u8] = "azé12".as_bytes();
+    let e: &[u8] = b" ";
+    let f: &[u8] = b" ;";
+    //assert_eq!(alpha1::<_, (_, ErrorKind)>(a), Err(Err::Incomplete(Needed::Size(1))));
+    assert_parse!(alpha1(a), Ok((empty, a)));
+    assert_eq!(alpha1(b), Err(Err::Error((b, ErrorKind::Alpha))));
+    assert_eq!(alpha1::<_, (_, ErrorKind)>(c), Ok((&c[1..], &b"a"[..])));
+    assert_eq!(
+      alpha1::<_, (_, ErrorKind)>(d),
+      Ok(("é12".as_bytes(), &b"az"[..]))
+    );
+    assert_eq!(digit1(a), Err(Err::Error((a, ErrorKind::Digit))));
+    assert_eq!(digit1::<_, (_, ErrorKind)>(b), Ok((empty, b)));
+    assert_eq!(digit1(c), Err(Err::Error((c, ErrorKind::Digit))));
+    assert_eq!(digit1(d), Err(Err::Error((d, ErrorKind::Digit))));
+    assert_eq!(hex_digit1::<_, (_, ErrorKind)>(a), Ok((empty, a)));
+    assert_eq!(hex_digit1::<_, (_, ErrorKind)>(b), Ok((empty, b)));
+    assert_eq!(hex_digit1::<_, (_, ErrorKind)>(c), Ok((empty, c)));
+    assert_eq!(
+      hex_digit1::<_, (_, ErrorKind)>(d),
+      Ok(("zé12".as_bytes(), &b"a"[..]))
+    );
+    assert_eq!(hex_digit1(e), Err(Err::Error((e, ErrorKind::HexDigit))));
+    assert_eq!(oct_digit1(a), Err(Err::Error((a, ErrorKind::OctDigit))));
+    assert_eq!(oct_digit1::<_, (_, ErrorKind)>(b), Ok((empty, b)));
+    assert_eq!(oct_digit1(c), Err(Err::Error((c, ErrorKind::OctDigit))));
+    assert_eq!(oct_digit1(d), Err(Err::Error((d, ErrorKind::OctDigit))));
+    assert_eq!(alphanumeric1::<_, (_, ErrorKind)>(a), Ok((empty, a)));
+    //assert_eq!(fix_error!(b,(), alphanumeric), Ok((empty, b)));
+    assert_eq!(alphanumeric1::<_, (_, ErrorKind)>(c), Ok((empty, c)));
+    assert_eq!(
+      alphanumeric1::<_, (_, ErrorKind)>(d),
+      Ok(("é12".as_bytes(), &b"az"[..]))
+    );
+    assert_eq!(space1::<_, (_, ErrorKind)>(e), Ok((empty, e)));
+    assert_eq!(space1::<_, (_, ErrorKind)>(f), Ok((&b";"[..], &b" "[..])));
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn character_s() {
+    let empty = "";
+    let a = "abcd";
+    let b = "1234";
+    let c = "a123";
+    let d = "azé12";
+    let e = " ";
+    assert_eq!(alpha1::<_, (_, ErrorKind)>(a), Ok((empty, a)));
+    assert_eq!(alpha1(b), Err(Err::Error((b, ErrorKind::Alpha))));
+    assert_eq!(alpha1::<_, (_, ErrorKind)>(c), Ok((&c[1..], &"a"[..])));
+    assert_eq!(alpha1::<_, (_, ErrorKind)>(d), Ok(("é12", &"az"[..])));
+    assert_eq!(digit1(a), Err(Err::Error((a, ErrorKind::Digit))));
+    assert_eq!(digit1::<_, (_, ErrorKind)>(b), Ok((empty, b)));
+    assert_eq!(digit1(c), Err(Err::Error((c, ErrorKind::Digit))));
+    assert_eq!(digit1(d), Err(Err::Error((d, ErrorKind::Digit))));
+    assert_eq!(hex_digit1::<_, (_, ErrorKind)>(a), Ok((empty, a)));
+    assert_eq!(hex_digit1::<_, (_, ErrorKind)>(b), Ok((empty, b)));
+    assert_eq!(hex_digit1::<_, (_, ErrorKind)>(c), Ok((empty, c)));
+    assert_eq!(hex_digit1::<_, (_, ErrorKind)>(d), Ok(("zé12", &"a"[..])));
+    assert_eq!(hex_digit1(e), Err(Err::Error((e, ErrorKind::HexDigit))));
+    assert_eq!(oct_digit1(a), Err(Err::Error((a, ErrorKind::OctDigit))));
+    assert_eq!(oct_digit1::<_, (_, ErrorKind)>(b), Ok((empty, b)));
+    assert_eq!(oct_digit1(c), Err(Err::Error((c, ErrorKind::OctDigit))));
+    assert_eq!(oct_digit1(d), Err(Err::Error((d, ErrorKind::OctDigit))));
+    assert_eq!(alphanumeric1::<_, (_, ErrorKind)>(a), Ok((empty, a)));
+    //assert_eq!(fix_error!(b,(), alphanumeric), Ok((empty, b)));
+    assert_eq!(alphanumeric1::<_, (_, ErrorKind)>(c), Ok((empty, c)));
+    assert_eq!(alphanumeric1::<_, (_, ErrorKind)>(d), Ok(("é12", "az")));
+    assert_eq!(space1::<_, (_, ErrorKind)>(e), Ok((empty, e)));
+  }
+
+  use crate::traits::Offset;
+  #[test]
+  fn offset() {
+    let a = &b"abcd;"[..];
+    let b = &b"1234;"[..];
+    let c = &b"a123;"[..];
+    let d = &b" \t;"[..];
+    let e = &b" \t\r\n;"[..];
+    let f = &b"123abcDEF;"[..];
+
+    match alpha1::<_, (_, ErrorKind)>(a) {
+      Ok((i, _)) => {
+        assert_eq!(a.offset(i) + i.len(), a.len());
+      }
+      _ => panic!("wrong return type in offset test for alpha"),
+    }
+    match digit1::<_, (_, ErrorKind)>(b) {
+      Ok((i, _)) => {
+        assert_eq!(b.offset(i) + i.len(), b.len());
+      }
+      _ => panic!("wrong return type in offset test for digit"),
+    }
+    match alphanumeric1::<_, (_, ErrorKind)>(c) {
+      Ok((i, _)) => {
+        assert_eq!(c.offset(i) + i.len(), c.len());
+      }
+      _ => panic!("wrong return type in offset test for alphanumeric"),
+    }
+    match space1::<_, (_, ErrorKind)>(d) {
+      Ok((i, _)) => {
+        assert_eq!(d.offset(i) + i.len(), d.len());
+      }
+      _ => panic!("wrong return type in offset test for space"),
+    }
+    match multispace1::<_, (_, ErrorKind)>(e) {
+      Ok((i, _)) => {
+        assert_eq!(e.offset(i) + i.len(), e.len());
+      }
+      _ => panic!("wrong return type in offset test for multispace"),
+    }
+    match hex_digit1::<_, (_, ErrorKind)>(f) {
+      Ok((i, _)) => {
+        assert_eq!(f.offset(i) + i.len(), f.len());
+      }
+      _ => panic!("wrong return type in offset test for hex_digit"),
+    }
+    match oct_digit1::<_, (_, ErrorKind)>(f) {
+      Ok((i, _)) => {
+        assert_eq!(f.offset(i) + i.len(), f.len());
+      }
+      _ => panic!("wrong return type in offset test for oct_digit"),
+    }
+  }
+
+  #[test]
+  fn is_not_line_ending_bytes() {
+    let a: &[u8] = b"ab12cd\nefgh";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(a),
+      Ok((&b"\nefgh"[..], &b"ab12cd"[..]))
+    );
+
+    let b: &[u8] = b"ab12cd\nefgh\nijkl";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(b),
+      Ok((&b"\nefgh\nijkl"[..], &b"ab12cd"[..]))
+    );
+
+    let c: &[u8] = b"ab12cd\r\nefgh\nijkl";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(c),
+      Ok((&b"\r\nefgh\nijkl"[..], &b"ab12cd"[..]))
+    );
+
+    let d: &[u8] = b"ab12cd";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(d),
+      Ok((&[][..], &d[..]))
+    );
+  }
+
+  #[test]
+  fn is_not_line_ending_str() {
+    /*
+    let a: &str = "ab12cd\nefgh";
+    assert_eq!(not_line_ending(a), Ok((&"\nefgh"[..], &"ab12cd"[..])));
+
+    let b: &str = "ab12cd\nefgh\nijkl";
+    assert_eq!(not_line_ending(b), Ok((&"\nefgh\nijkl"[..], &"ab12cd"[..])));
+
+    let c: &str = "ab12cd\r\nefgh\nijkl";
+    assert_eq!(not_line_ending(c), Ok((&"\r\nefgh\nijkl"[..], &"ab12cd"[..])));
+
+    let d = "βèƒôřè\nÂßÇáƒƭèř";
+    assert_eq!(not_line_ending(d), Ok((&"\nÂßÇáƒƭèř"[..], &"βèƒôřè"[..])));
+
+    let e = "βèƒôřè\r\nÂßÇáƒƭèř";
+    assert_eq!(not_line_ending(e), Ok((&"\r\nÂßÇáƒƭèř"[..], &"βèƒôřè"[..])));
+    */
+
+    let f = "βèƒôřè\rÂßÇáƒƭèř";
+    assert_eq!(not_line_ending(f), Err(Err::Error((f, ErrorKind::Tag))));
+
+    let g2: &str = "ab12cd";
+    assert_eq!(not_line_ending::<_, (_, ErrorKind)>(g2), Ok(("", g2)));
+  }
+
+  #[test]
+  fn hex_digit_test() {
+    let i = &b"0123456789abcdefABCDEF;"[..];
+    assert_parse!(hex_digit1(i), Ok((&b";"[..], &i[..i.len() - 1])));
+
+    let i = &b"g"[..];
+    assert_parse!(
+      hex_digit1(i),
+      Err(Err::Error(error_position!(i, ErrorKind::HexDigit)))
+    );
+
+    let i = &b"G"[..];
+    assert_parse!(
+      hex_digit1(i),
+      Err(Err::Error(error_position!(i, ErrorKind::HexDigit)))
+    );
+
+    assert!(crate::character::is_hex_digit(b'0'));
+    assert!(crate::character::is_hex_digit(b'9'));
+    assert!(crate::character::is_hex_digit(b'a'));
+    assert!(crate::character::is_hex_digit(b'f'));
+    assert!(crate::character::is_hex_digit(b'A'));
+    assert!(crate::character::is_hex_digit(b'F'));
+    assert!(!crate::character::is_hex_digit(b'g'));
+    assert!(!crate::character::is_hex_digit(b'G'));
+    assert!(!crate::character::is_hex_digit(b'/'));
+    assert!(!crate::character::is_hex_digit(b':'));
+    assert!(!crate::character::is_hex_digit(b'@'));
+    assert!(!crate::character::is_hex_digit(b'\x60'));
+  }
+
+  #[test]
+  fn oct_digit_test() {
+    let i = &b"01234567;"[..];
+    assert_parse!(oct_digit1(i), Ok((&b";"[..], &i[..i.len() - 1])));
+
+    let i = &b"8"[..];
+    assert_parse!(
+      oct_digit1(i),
+      Err(Err::Error(error_position!(i, ErrorKind::OctDigit)))
+    );
+
+    assert!(crate::character::is_oct_digit(b'0'));
+    assert!(crate::character::is_oct_digit(b'7'));
+    assert!(!crate::character::is_oct_digit(b'8'));
+    assert!(!crate::character::is_oct_digit(b'9'));
+    assert!(!crate::character::is_oct_digit(b'a'));
+    assert!(!crate::character::is_oct_digit(b'A'));
+    assert!(!crate::character::is_oct_digit(b'/'));
+    assert!(!crate::character::is_oct_digit(b':'));
+    assert!(!crate::character::is_oct_digit(b'@'));
+    assert!(!crate::character::is_oct_digit(b'\x60'));
+  }
+
+  #[test]
+  fn full_line_windows() {
+    //let not_line_ending = |i:&[u8]| take_while(|c| c != b'\r' && c != b'\n')(i);
+
+    named!(
+      take_full_line<(&[u8], &[u8])>,
+      tuple!(not_line_ending, line_ending)
+    );
+    let input = b"abc\r\n";
+    let output = take_full_line(input);
+    assert_eq!(output, Ok((&b""[..], (&b"abc"[..], &b"\r\n"[..]))));
+  }
+
+  #[test]
+  fn full_line_unix() {
+    //let not_line_ending = |i:&[u8]| take_while(|c| c != b'\n')(i);
+    named!(
+      take_full_line<(&[u8], &[u8])>,
+      tuple!(not_line_ending, line_ending)
+    );
+    let input = b"abc\n";
+    let output = take_full_line(input);
+    assert_eq!(output, Ok((&b""[..], (&b"abc"[..], &b"\n"[..]))));
+  }
+
+  #[test]
+  fn check_windows_lineending() {
+    let input = b"\r\n";
+    let output = line_ending(&input[..]);
+    assert_parse!(output, Ok((&b""[..], &b"\r\n"[..])));
+  }
+
+  #[test]
+  fn check_unix_lineending() {
+    let input = b"\n";
+    let output = line_ending(&input[..]);
+    assert_parse!(output, Ok((&b""[..], &b"\n"[..])));
+  }
+
+  #[test]
+  fn cr_lf() {
+    assert_parse!(crlf(&b"\r\na"[..]), Ok((&b"a"[..], &b"\r\n"[..])));
+    assert_parse!(
+      crlf(&b"\r"[..]),
+      Err(Err::Error(error_position!(&b"\r"[..], ErrorKind::CrLf)))
+    );
+    assert_parse!(
+      crlf(&b"\ra"[..]),
+      Err(Err::Error(error_position!(&b"\ra"[..], ErrorKind::CrLf)))
+    );
+
+    assert_parse!(crlf("\r\na"), Ok(("a", "\r\n")));
+    assert_parse!(
+      crlf("\r"),
+      Err(Err::Error(error_position!(&"\r"[..], ErrorKind::CrLf)))
+    );
+    assert_parse!(
+      crlf("\ra"),
+      Err(Err::Error(error_position!("\ra", ErrorKind::CrLf)))
+    );
+  }
+
+  #[test]
+  fn end_of_line() {
+    assert_parse!(line_ending(&b"\na"[..]), Ok((&b"a"[..], &b"\n"[..])));
+    assert_parse!(line_ending(&b"\r\na"[..]), Ok((&b"a"[..], &b"\r\n"[..])));
+    assert_parse!(
+      line_ending(&b"\r"[..]),
+      Err(Err::Error(error_position!(&b"\r"[..], ErrorKind::CrLf)))
+    );
+    assert_parse!(
+      line_ending(&b"\ra"[..]),
+      Err(Err::Error(error_position!(&b"\ra"[..], ErrorKind::CrLf)))
+    );
+
+    assert_parse!(line_ending("\na"), Ok(("a", "\n")));
+    assert_parse!(line_ending("\r\na"), Ok(("a", "\r\n")));
+    assert_parse!(
+      line_ending("\r"),
+      Err(Err::Error(error_position!(&"\r"[..], ErrorKind::CrLf)))
+    );
+    assert_parse!(
+      line_ending("\ra"),
+      Err(Err::Error(error_position!("\ra", ErrorKind::CrLf)))
+    );
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/character/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/character/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/character/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/character/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,112 @@
+/// Character level parsers
+
+/// Matches one of the provided characters.
+///
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+/// named!(simple<char>, one_of!(&b"abc"[..]));
+/// assert_eq!(simple(b"a123"), Ok((&b"123"[..], 'a')));
+///
+/// named!(a_or_b<&str, char>, one_of!("ab汉"));
+/// assert_eq!(a_or_b("汉jiosfe"), Ok(("jiosfe", '汉')));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! one_of (
+  ($i:expr, $inp: expr) => ( $crate::character::streaming::one_of($inp)($i) );
+);
+
+/// Matches anything but the provided characters.
+///
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind};
+/// # fn main() {
+/// named!(no_letter_a<char>, none_of!(&b"abc"[..]));
+/// assert_eq!(no_letter_a(b"123"), Ok((&b"23"[..], '1')));
+///
+/// named!(err_on_single_quote<char>, none_of!(&b"'"[..]));
+/// assert_eq!(err_on_single_quote(b"'jiosfe"), Err(Err::Error(error_position!(&b"'jiosfe"[..], ErrorKind::NoneOf))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! none_of (
+  ($i:expr, $inp: expr) => ( $crate::character::streaming::none_of($inp)($i) );
+);
+
+/// Matches one character: `char!(char) => &[u8] -> IResult<&[u8], char>`.
+///
+/// # Example
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind};
+/// # fn main() {
+/// named!(match_letter_a<char>, char!('a'));
+/// assert_eq!(match_letter_a(b"abc"), Ok((&b"bc"[..],'a')));
+///
+/// assert_eq!(match_letter_a(b"123cdef"), Err(Err::Error(error_position!(&b"123cdef"[..], ErrorKind::Char))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! char (
+  ($i:expr, $c: expr) => ( $crate::character::streaming::char($c)($i) );
+);
+
+#[cfg(test)]
+mod tests {
+  use crate::error::ErrorKind;
+  use crate::internal::Err;
+
+  #[test]
+  fn one_of() {
+    named!(f<char>, one_of!("ab"));
+
+    let a = &b"abcd"[..];
+    assert_eq!(f(a), Ok((&b"bcd"[..], 'a')));
+
+    let b = &b"cde"[..];
+    assert_eq!(f(b), Err(Err::Error(error_position!(b, ErrorKind::OneOf))));
+
+    named!(utf8(&str) -> char,
+      one_of!("+\u{FF0B}"));
+
+    assert!(utf8("+").is_ok());
+    assert!(utf8("\u{FF0B}").is_ok());
+  }
+
+  #[test]
+  fn none_of() {
+    named!(f<char>, none_of!("ab"));
+
+    let a = &b"abcd"[..];
+    assert_eq!(f(a), Err(Err::Error(error_position!(a, ErrorKind::NoneOf))));
+
+    let b = &b"cde"[..];
+    assert_eq!(f(b), Ok((&b"de"[..], 'c')));
+  }
+
+  #[test]
+  fn char() {
+    named!(f<char>, char!('c'));
+
+    let a = &b"abcd"[..];
+    assert_eq!(f(a), Err(Err::Error(error_position!(a, ErrorKind::Char))));
+
+    let b = &b"cde"[..];
+    assert_eq!(f(b), Ok((&b"de"[..], 'c')));
+  }
+
+  #[test]
+  fn char_str() {
+    named!(f<&str, char>, char!('c'));
+
+    let a = &"abcd"[..];
+    assert_eq!(f(a), Err(Err::Error(error_position!(a, ErrorKind::Char))));
+
+    let b = &"cde"[..];
+    assert_eq!(f(b), Ok((&"de"[..], 'c')));
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/character/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/character/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/character/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/character/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,116 @@
+//! Character specific parsers and combinators
+//!
+//! Functions recognizing specific characters
+
+#[macro_use]
+mod macros;
+
+pub mod complete;
+pub mod streaming;
+
+/// Tests if byte is ASCII alphabetic: A-Z, a-z
+///
+/// # Example
+///
+/// ```
+/// # use nom::character::is_alphabetic;
+/// assert_eq!(is_alphabetic(b'9'), false);
+/// assert_eq!(is_alphabetic(b'a'), true);
+/// ```
+#[inline]
+pub fn is_alphabetic(chr: u8) -> bool {
+  (chr >= 0x41 && chr <= 0x5A) || (chr >= 0x61 && chr <= 0x7A)
+}
+
+/// Tests if byte is ASCII digit: 0-9
+///
+/// # Example
+///
+/// ```
+/// # use nom::character::is_digit;
+/// assert_eq!(is_digit(b'a'), false);
+/// assert_eq!(is_digit(b'9'), true);
+/// ```
+#[inline]
+pub fn is_digit(chr: u8) -> bool {
+  chr >= 0x30 && chr <= 0x39
+}
+
+/// Tests if byte is ASCII hex digit: 0-9, A-F, a-f
+///
+/// # Example
+///
+/// ```
+/// # use nom::character::is_hex_digit;
+/// assert_eq!(is_hex_digit(b'a'), true);
+/// assert_eq!(is_hex_digit(b'9'), true);
+/// assert_eq!(is_hex_digit(b'A'), true);
+/// assert_eq!(is_hex_digit(b'x'), false);
+/// ```
+#[inline]
+pub fn is_hex_digit(chr: u8) -> bool {
+  (chr >= 0x30 && chr <= 0x39) || (chr >= 0x41 && chr <= 0x46) || (chr >= 0x61 && chr <= 0x66)
+}
+
+/// Tests if byte is ASCII octal digit: 0-7
+///
+/// # Example
+///
+/// ```
+/// # use nom::character::is_oct_digit;
+/// assert_eq!(is_oct_digit(b'a'), false);
+/// assert_eq!(is_oct_digit(b'9'), false);
+/// assert_eq!(is_oct_digit(b'6'), true);
+/// ```
+#[inline]
+pub fn is_oct_digit(chr: u8) -> bool {
+  chr >= 0x30 && chr <= 0x37
+}
+
+/// Tests if byte is ASCII alphanumeric: A-Z, a-z, 0-9
+///
+/// # Example
+///
+/// ```
+/// # use nom::character::is_alphanumeric;
+/// assert_eq!(is_alphanumeric(b'-'), false);
+/// assert_eq!(is_alphanumeric(b'a'), true);
+/// assert_eq!(is_alphanumeric(b'9'), true);
+/// assert_eq!(is_alphanumeric(b'A'), true);
+/// ```
+#[inline]
+pub fn is_alphanumeric(chr: u8) -> bool {
+  is_alphabetic(chr) || is_digit(chr)
+}
+
+/// Tests if byte is ASCII space or tab
+///
+/// # Example
+///
+/// ```
+/// # use nom::character::is_space;
+/// assert_eq!(is_space(b'\n'), false);
+/// assert_eq!(is_space(b'\r'), false);
+/// assert_eq!(is_space(b' '), true);
+/// assert_eq!(is_space(b'\t'), true);
+/// ```
+#[inline]
+pub fn is_space(chr: u8) -> bool {
+  chr == b' ' || chr == b'\t'
+}
+
+/// Tests if byte is ASCII newline: \n
+///
+/// # Example
+///
+/// ```
+/// # use nom::character::is_newline;
+/// assert_eq!(is_newline(b'\n'), true);
+/// assert_eq!(is_newline(b'\r'), false);
+/// assert_eq!(is_newline(b' '), false);
+/// assert_eq!(is_newline(b'\t'), false);
+/// ```
+#[inline]
+pub fn is_newline(chr: u8) -> bool {
+  chr == b'\n'
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/character/streaming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/character/streaming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/character/streaming.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/character/streaming.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,993 @@
+//! Character specific parsers and combinators, streaming version
+//!
+//! Functions recognizing specific characters
+
+use crate::error::ParseError;
+use crate::internal::{Err, IResult, Needed};
+use crate::lib::std::ops::{Range, RangeFrom, RangeTo};
+use crate::traits::{AsChar, FindToken, InputIter, InputLength, InputTakeAtPosition, Slice};
+use crate::traits::{Compare, CompareResult};
+
+use crate::error::ErrorKind;
+
+/// Recognizes one character.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{ErrorKind, Error}, Needed, IResult};
+/// # use nom::character::streaming::char;
+/// fn parser(i: &str) -> IResult<&str, char> {
+///     char('a')(i)
+/// }
+/// assert_eq!(parser("abc"), Ok(("bc", 'a')));
+/// assert_eq!(parser("bc"), Err(Err::Error(Error::new("bc", ErrorKind::Char))));
+/// assert_eq!(parser(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn char<I, Error: ParseError<I>>(c: char) -> impl Fn(I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter + InputLength,
+  <I as InputIter>::Item: AsChar,
+{
+  move |i: I| match (i).iter_elements().next().map(|t| {
+    let b = t.as_char() == c;
+    (&c, b)
+  }) {
+    None => Err(Err::Incomplete(Needed::new(c.len() - i.input_len()))),
+    Some((_, false)) => Err(Err::Error(Error::from_char(i, c))),
+    Some((c, true)) => Ok((i.slice(c.len()..), c.as_char())),
+  }
+}
+
+/// Recognizes one character and checks that it satisfies a predicate
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::{ErrorKind, Error}, Needed, IResult};
+/// # use nom::character::streaming::satisfy;
+/// fn parser(i: &str) -> IResult<&str, char> {
+///     satisfy(|c| c == 'a' || c == 'b')(i)
+/// }
+/// assert_eq!(parser("abc"), Ok(("bc", 'a')));
+/// assert_eq!(parser("cd"), Err(Err::Error(Error::new("cd", ErrorKind::Satisfy))));
+/// assert_eq!(parser(""), Err(Err::Incomplete(Needed::Unknown)));
+/// ```
+pub fn satisfy<F, I, Error: ParseError<I>>(cond: F) -> impl Fn(I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar,
+  F: Fn(char) -> bool,
+{
+  move |i: I| match (i).iter_elements().next().map(|t| {
+    let c = t.as_char();
+    let b = cond(c);
+    (c, b)
+  }) {
+    None => Err(Err::Incomplete(Needed::Unknown)),
+    Some((_, false)) => Err(Err::Error(Error::from_error_kind(i, ErrorKind::Satisfy))),
+    Some((c, true)) => Ok((i.slice(c.len()..), c)),
+  }
+}
+
+/// Recognizes one of the provided characters.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::character::streaming::one_of;
+/// assert_eq!(one_of::<_, _, (_, ErrorKind)>("abc")("b"), Ok(("", 'b')));
+/// assert_eq!(one_of::<_, _, (_, ErrorKind)>("a")("bc"), Err(Err::Error(("bc", ErrorKind::OneOf))));
+/// assert_eq!(one_of::<_, _, (_, ErrorKind)>("a")(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn one_of<I, T, Error: ParseError<I>>(list: T) -> impl Fn(I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar + Copy,
+  T: FindToken<<I as InputIter>::Item>,
+{
+  move |i: I| match (i).iter_elements().next().map(|c| (c, list.find_token(c))) {
+    None => Err(Err::Incomplete(Needed::new(1))),
+    Some((_, false)) => Err(Err::Error(Error::from_error_kind(i, ErrorKind::OneOf))),
+    Some((c, true)) => Ok((i.slice(c.len()..), c.as_char())),
+  }
+}
+
+/// Recognizes a character that is not in the provided characters.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::character::streaming::none_of;
+/// assert_eq!(none_of::<_, _, (_, ErrorKind)>("abc")("z"), Ok(("", 'z')));
+/// assert_eq!(none_of::<_, _, (_, ErrorKind)>("ab")("a"), Err(Err::Error(("a", ErrorKind::NoneOf))));
+/// assert_eq!(none_of::<_, _, (_, ErrorKind)>("a")(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn none_of<I, T, Error: ParseError<I>>(list: T) -> impl Fn(I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter,
+  <I as InputIter>::Item: AsChar + Copy,
+  T: FindToken<<I as InputIter>::Item>,
+{
+  move |i: I| match (i).iter_elements().next().map(|c| (c, !list.find_token(c))) {
+    None => Err(Err::Incomplete(Needed::new(1))),
+    Some((_, false)) => Err(Err::Error(Error::from_error_kind(i, ErrorKind::NoneOf))),
+    Some((c, true)) => Ok((i.slice(c.len()..), c.as_char())),
+  }
+}
+
+/// Recognizes the string "\r\n".
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::crlf;
+/// assert_eq!(crlf::<_, (_, ErrorKind)>("\r\nc"), Ok(("c", "\r\n")));
+/// assert_eq!(crlf::<_, (_, ErrorKind)>("ab\r\nc"), Err(Err::Error(("ab\r\nc", ErrorKind::CrLf))));
+/// assert_eq!(crlf::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+pub fn crlf<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<Range<usize>> + Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: InputIter,
+  T: Compare<&'static str>,
+{
+  match input.compare("\r\n") {
+    //FIXME: is this the right index?
+    CompareResult::Ok => Ok((input.slice(2..), input.slice(0..2))),
+    CompareResult::Incomplete => Err(Err::Incomplete(Needed::new(2))),
+    CompareResult::Error => {
+      let e: ErrorKind = ErrorKind::CrLf;
+      Err(Err::Error(E::from_error_kind(input, e)))
+    }
+  }
+}
+
+/// Recognizes a string of any char except '\r' or '\n'.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::not_line_ending;
+/// assert_eq!(not_line_ending::<_, (_, ErrorKind)>("ab\r\nc"), Ok(("\r\nc", "ab")));
+/// assert_eq!(not_line_ending::<_, (_, ErrorKind)>("abc"), Err(Err::Incomplete(Needed::Unknown)));
+/// assert_eq!(not_line_ending::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::Unknown)));
+/// ```
+pub fn not_line_ending<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<Range<usize>> + Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: InputIter + InputLength,
+  T: Compare<&'static str>,
+  <T as InputIter>::Item: AsChar,
+  <T as InputIter>::Item: AsChar,
+{
+  match input.position(|item| {
+    let c = item.as_char();
+    c == '\r' || c == '\n'
+  }) {
+    None => Err(Err::Incomplete(Needed::Unknown)),
+    Some(index) => {
+      let mut it = input.slice(index..).iter_elements();
+      let nth = it.next().unwrap().as_char();
+      if nth == '\r' {
+        let sliced = input.slice(index..);
+        let comp = sliced.compare("\r\n");
+        match comp {
+          //FIXME: calculate the right index
+          CompareResult::Incomplete => Err(Err::Incomplete(Needed::Unknown)),
+          CompareResult::Error => {
+            let e: ErrorKind = ErrorKind::Tag;
+            Err(Err::Error(E::from_error_kind(input, e)))
+          }
+          CompareResult::Ok => Ok((input.slice(index..), input.slice(..index))),
+        }
+      } else {
+        Ok((input.slice(index..), input.slice(..index)))
+      }
+    }
+  }
+}
+
+/// Recognizes an end of line (both '\n' and '\r\n').
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::line_ending;
+/// assert_eq!(line_ending::<_, (_, ErrorKind)>("\r\nc"), Ok(("c", "\r\n")));
+/// assert_eq!(line_ending::<_, (_, ErrorKind)>("ab\r\nc"), Err(Err::Error(("ab\r\nc", ErrorKind::CrLf))));
+/// assert_eq!(line_ending::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn line_ending<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<Range<usize>> + Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: InputIter + InputLength,
+  T: Compare<&'static str>,
+{
+  match input.compare("\n") {
+    CompareResult::Ok => Ok((input.slice(1..), input.slice(0..1))),
+    CompareResult::Incomplete => Err(Err::Incomplete(Needed::new(1))),
+    CompareResult::Error => {
+      match input.compare("\r\n") {
+        //FIXME: is this the right index?
+        CompareResult::Ok => Ok((input.slice(2..), input.slice(0..2))),
+        CompareResult::Incomplete => Err(Err::Incomplete(Needed::new(2))),
+        CompareResult::Error => Err(Err::Error(E::from_error_kind(input, ErrorKind::CrLf))),
+      }
+    }
+  }
+}
+
+/// Matches a newline character '\\n'.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::newline;
+/// assert_eq!(newline::<_, (_, ErrorKind)>("\nc"), Ok(("c", '\n')));
+/// assert_eq!(newline::<_, (_, ErrorKind)>("\r\nc"), Err(Err::Error(("\r\nc", ErrorKind::Char))));
+/// assert_eq!(newline::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn newline<I, Error: ParseError<I>>(input: I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter + InputLength,
+  <I as InputIter>::Item: AsChar,
+{
+  char('\n')(input)
+}
+
+/// Matches a tab character '\t'.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::tab;
+/// assert_eq!(tab::<_, (_, ErrorKind)>("\tc"), Ok(("c", '\t')));
+/// assert_eq!(tab::<_, (_, ErrorKind)>("\r\nc"), Err(Err::Error(("\r\nc", ErrorKind::Char))));
+/// assert_eq!(tab::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn tab<I, Error: ParseError<I>>(input: I) -> IResult<I, char, Error>
+where
+  I: Slice<RangeFrom<usize>> + InputIter + InputLength,
+  <I as InputIter>::Item: AsChar,
+{
+  char('\t')(input)
+}
+
+/// Matches one byte as a character. Note that the input type will
+/// accept a `str`, but not a `&[u8]`, unlike many other nom parsers.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data.
+/// # Example
+///
+/// ```
+/// # use nom::{character::streaming::anychar, Err, error::ErrorKind, IResult, Needed};
+/// assert_eq!(anychar::<_, (_, ErrorKind)>("abc"), Ok(("bc",'a')));
+/// assert_eq!(anychar::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn anychar<T, E: ParseError<T>>(input: T) -> IResult<T, char, E>
+where
+  T: InputIter + InputLength + Slice<RangeFrom<usize>>,
+  <T as InputIter>::Item: AsChar,
+{
+  let mut it = input.iter_indices();
+  match it.next() {
+    None => Err(Err::Incomplete(Needed::new(1))),
+    Some((_, c)) => match it.next() {
+      None => Ok((input.slice(input.input_len()..), c.as_char())),
+      Some((idx, _)) => Ok((input.slice(idx..), c.as_char())),
+    },
+  }
+}
+
+/// Recognizes zero or more lowercase and uppercase ASCII alphabetic characters: a-z, A-Z
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non alphabetic character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::alpha0;
+/// assert_eq!(alpha0::<_, (_, ErrorKind)>("ab1c"), Ok(("1c", "ab")));
+/// assert_eq!(alpha0::<_, (_, ErrorKind)>("1c"), Ok(("1c", "")));
+/// assert_eq!(alpha0::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn alpha0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position(|item| !item.is_alpha())
+}
+
+/// Recognizes one or more lowercase and uppercase ASCII alphabetic characters: a-z, A-Z
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non alphabetic character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::alpha1;
+/// assert_eq!(alpha1::<_, (_, ErrorKind)>("aB1c"), Ok(("1c", "aB")));
+/// assert_eq!(alpha1::<_, (_, ErrorKind)>("1c"), Err(Err::Error(("1c", ErrorKind::Alpha))));
+/// assert_eq!(alpha1::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn alpha1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1(|item| !item.is_alpha(), ErrorKind::Alpha)
+}
+
+/// Recognizes zero or more ASCII numerical characters: 0-9
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::digit0;
+/// assert_eq!(digit0::<_, (_, ErrorKind)>("21c"), Ok(("c", "21")));
+/// assert_eq!(digit0::<_, (_, ErrorKind)>("a21c"), Ok(("a21c", "")));
+/// assert_eq!(digit0::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn digit0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position(|item| !item.is_dec_digit())
+}
+
+/// Recognizes one or more ASCII numerical characters: 0-9
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::digit1;
+/// assert_eq!(digit1::<_, (_, ErrorKind)>("21c"), Ok(("c", "21")));
+/// assert_eq!(digit1::<_, (_, ErrorKind)>("c1"), Err(Err::Error(("c1", ErrorKind::Digit))));
+/// assert_eq!(digit1::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn digit1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1(|item| !item.is_dec_digit(), ErrorKind::Digit)
+}
+
+/// Recognizes zero or more ASCII hexadecimal numerical characters: 0-9, A-F, a-f
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non hexadecimal digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::hex_digit0;
+/// assert_eq!(hex_digit0::<_, (_, ErrorKind)>("21cZ"), Ok(("Z", "21c")));
+/// assert_eq!(hex_digit0::<_, (_, ErrorKind)>("Z21c"), Ok(("Z21c", "")));
+/// assert_eq!(hex_digit0::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn hex_digit0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position(|item| !item.is_hex_digit())
+}
+
+/// Recognizes one or more ASCII hexadecimal numerical characters: 0-9, A-F, a-f
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non hexadecimal digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::hex_digit1;
+/// assert_eq!(hex_digit1::<_, (_, ErrorKind)>("21cZ"), Ok(("Z", "21c")));
+/// assert_eq!(hex_digit1::<_, (_, ErrorKind)>("H2"), Err(Err::Error(("H2", ErrorKind::HexDigit))));
+/// assert_eq!(hex_digit1::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn hex_digit1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1(|item| !item.is_hex_digit(), ErrorKind::HexDigit)
+}
+
+/// Recognizes zero or more octal characters: 0-7
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non octal digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::oct_digit0;
+/// assert_eq!(oct_digit0::<_, (_, ErrorKind)>("21cZ"), Ok(("cZ", "21")));
+/// assert_eq!(oct_digit0::<_, (_, ErrorKind)>("Z21c"), Ok(("Z21c", "")));
+/// assert_eq!(oct_digit0::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn oct_digit0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position(|item| !item.is_oct_digit())
+}
+
+/// Recognizes one or more octal characters: 0-7
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non octal digit character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::oct_digit1;
+/// assert_eq!(oct_digit1::<_, (_, ErrorKind)>("21cZ"), Ok(("cZ", "21")));
+/// assert_eq!(oct_digit1::<_, (_, ErrorKind)>("H2"), Err(Err::Error(("H2", ErrorKind::OctDigit))));
+/// assert_eq!(oct_digit1::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn oct_digit1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1(|item| !item.is_oct_digit(), ErrorKind::OctDigit)
+}
+
+/// Recognizes zero or more ASCII numerical and alphabetic characters: 0-9, a-z, A-Z
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non alphanumerical character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::alphanumeric0;
+/// assert_eq!(alphanumeric0::<_, (_, ErrorKind)>("21cZ%1"), Ok(("%1", "21cZ")));
+/// assert_eq!(alphanumeric0::<_, (_, ErrorKind)>("&Z21c"), Ok(("&Z21c", "")));
+/// assert_eq!(alphanumeric0::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn alphanumeric0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position(|item| !item.is_alphanum())
+}
+
+/// Recognizes one or more ASCII numerical and alphabetic characters: 0-9, a-z, A-Z
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non alphanumerical character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::alphanumeric1;
+/// assert_eq!(alphanumeric1::<_, (_, ErrorKind)>("21cZ%1"), Ok(("%1", "21cZ")));
+/// assert_eq!(alphanumeric1::<_, (_, ErrorKind)>("&H2"), Err(Err::Error(("&H2", ErrorKind::AlphaNumeric))));
+/// assert_eq!(alphanumeric1::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn alphanumeric1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  input.split_at_position1(|item| !item.is_alphanum(), ErrorKind::AlphaNumeric)
+}
+
+/// Recognizes zero or more spaces and tabs.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non space character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::space0;
+/// assert_eq!(space0::<_, (_, ErrorKind)>(" \t21c"), Ok(("21c", " \t")));
+/// assert_eq!(space0::<_, (_, ErrorKind)>("Z21c"), Ok(("Z21c", "")));
+/// assert_eq!(space0::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn space0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar + Clone,
+{
+  input.split_at_position(|item| {
+    let c = item.as_char();
+    !(c == ' ' || c == '\t')
+  })
+}
+/// Recognizes one or more spaces and tabs.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non space character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::space1;
+/// assert_eq!(space1::<_, (_, ErrorKind)>(" \t21c"), Ok(("21c", " \t")));
+/// assert_eq!(space1::<_, (_, ErrorKind)>("H2"), Err(Err::Error(("H2", ErrorKind::Space))));
+/// assert_eq!(space1::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn space1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar + Clone,
+{
+  input.split_at_position1(
+    |item| {
+      let c = item.as_char();
+      !(c == ' ' || c == '\t')
+    },
+    ErrorKind::Space,
+  )
+}
+
+/// Recognizes zero or more spaces, tabs, carriage returns and line feeds.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non space character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::multispace0;
+/// assert_eq!(multispace0::<_, (_, ErrorKind)>(" \t\n\r21c"), Ok(("21c", " \t\n\r")));
+/// assert_eq!(multispace0::<_, (_, ErrorKind)>("Z21c"), Ok(("Z21c", "")));
+/// assert_eq!(multispace0::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn multispace0<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar + Clone,
+{
+  input.split_at_position(|item| {
+    let c = item.as_char();
+    !(c == ' ' || c == '\t' || c == '\r' || c == '\n')
+  })
+}
+
+/// Recognizes one or more spaces, tabs, carriage returns and line feeds.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there's not enough input data,
+/// or if no terminating token is found (a non space character).
+/// # Example
+///
+/// ```
+/// # use nom::{Err, error::ErrorKind, IResult, Needed};
+/// # use nom::character::streaming::multispace1;
+/// assert_eq!(multispace1::<_, (_, ErrorKind)>(" \t\n\r21c"), Ok(("21c", " \t\n\r")));
+/// assert_eq!(multispace1::<_, (_, ErrorKind)>("H2"), Err(Err::Error(("H2", ErrorKind::MultiSpace))));
+/// assert_eq!(multispace1::<_, (_, ErrorKind)>(""), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+pub fn multispace1<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar + Clone,
+{
+  input.split_at_position1(
+    |item| {
+      let c = item.as_char();
+      !(c == ' ' || c == '\t' || c == '\r' || c == '\n')
+    },
+    ErrorKind::MultiSpace,
+  )
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::error::ErrorKind;
+  use crate::internal::{Err, Needed};
+
+  macro_rules! assert_parse(
+    ($left: expr, $right: expr) => {
+      let res: $crate::IResult<_, _, (_, ErrorKind)> = $left;
+      assert_eq!(res, $right);
+    };
+  );
+
+  #[test]
+  fn anychar_str() {
+    use super::anychar;
+    assert_eq!(anychar::<_, (&str, ErrorKind)>("Ó˜"), Ok(("", 'Ó˜')));
+  }
+
+  #[test]
+  fn character() {
+    let a: &[u8] = b"abcd";
+    let b: &[u8] = b"1234";
+    let c: &[u8] = b"a123";
+    let d: &[u8] = "azé12".as_bytes();
+    let e: &[u8] = b" ";
+    let f: &[u8] = b" ;";
+    //assert_eq!(alpha1::<_, (_, ErrorKind)>(a), Err(Err::Incomplete(Needed::new(1))));
+    assert_parse!(alpha1(a), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(alpha1(b), Err(Err::Error((b, ErrorKind::Alpha))));
+    assert_eq!(alpha1::<_, (_, ErrorKind)>(c), Ok((&c[1..], &b"a"[..])));
+    assert_eq!(
+      alpha1::<_, (_, ErrorKind)>(d),
+      Ok(("é12".as_bytes(), &b"az"[..]))
+    );
+    assert_eq!(digit1(a), Err(Err::Error((a, ErrorKind::Digit))));
+    assert_eq!(
+      digit1::<_, (_, ErrorKind)>(b),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(digit1(c), Err(Err::Error((c, ErrorKind::Digit))));
+    assert_eq!(digit1(d), Err(Err::Error((d, ErrorKind::Digit))));
+    assert_eq!(
+      hex_digit1::<_, (_, ErrorKind)>(a),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(
+      hex_digit1::<_, (_, ErrorKind)>(b),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(
+      hex_digit1::<_, (_, ErrorKind)>(c),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(
+      hex_digit1::<_, (_, ErrorKind)>(d),
+      Ok(("zé12".as_bytes(), &b"a"[..]))
+    );
+    assert_eq!(hex_digit1(e), Err(Err::Error((e, ErrorKind::HexDigit))));
+    assert_eq!(oct_digit1(a), Err(Err::Error((a, ErrorKind::OctDigit))));
+    assert_eq!(
+      oct_digit1::<_, (_, ErrorKind)>(b),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(oct_digit1(c), Err(Err::Error((c, ErrorKind::OctDigit))));
+    assert_eq!(oct_digit1(d), Err(Err::Error((d, ErrorKind::OctDigit))));
+    assert_eq!(
+      alphanumeric1::<_, (_, ErrorKind)>(a),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    //assert_eq!(fix_error!(b,(), alphanumeric1), Ok((empty, b)));
+    assert_eq!(
+      alphanumeric1::<_, (_, ErrorKind)>(c),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(
+      alphanumeric1::<_, (_, ErrorKind)>(d),
+      Ok(("é12".as_bytes(), &b"az"[..]))
+    );
+    assert_eq!(
+      space1::<_, (_, ErrorKind)>(e),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(space1::<_, (_, ErrorKind)>(f), Ok((&b";"[..], &b" "[..])));
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn character_s() {
+    let a = "abcd";
+    let b = "1234";
+    let c = "a123";
+    let d = "azé12";
+    let e = " ";
+    assert_eq!(
+      alpha1::<_, (_, ErrorKind)>(a),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(alpha1(b), Err(Err::Error((b, ErrorKind::Alpha))));
+    assert_eq!(alpha1::<_, (_, ErrorKind)>(c), Ok((&c[1..], &"a"[..])));
+    assert_eq!(alpha1::<_, (_, ErrorKind)>(d), Ok(("é12", &"az"[..])));
+    assert_eq!(digit1(a), Err(Err::Error((a, ErrorKind::Digit))));
+    assert_eq!(
+      digit1::<_, (_, ErrorKind)>(b),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(digit1(c), Err(Err::Error((c, ErrorKind::Digit))));
+    assert_eq!(digit1(d), Err(Err::Error((d, ErrorKind::Digit))));
+    assert_eq!(
+      hex_digit1::<_, (_, ErrorKind)>(a),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(
+      hex_digit1::<_, (_, ErrorKind)>(b),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(
+      hex_digit1::<_, (_, ErrorKind)>(c),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(hex_digit1::<_, (_, ErrorKind)>(d), Ok(("zé12", &"a"[..])));
+    assert_eq!(hex_digit1(e), Err(Err::Error((e, ErrorKind::HexDigit))));
+    assert_eq!(oct_digit1(a), Err(Err::Error((a, ErrorKind::OctDigit))));
+    assert_eq!(
+      oct_digit1::<_, (_, ErrorKind)>(b),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(oct_digit1(c), Err(Err::Error((c, ErrorKind::OctDigit))));
+    assert_eq!(oct_digit1(d), Err(Err::Error((d, ErrorKind::OctDigit))));
+    assert_eq!(
+      alphanumeric1::<_, (_, ErrorKind)>(a),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    //assert_eq!(fix_error!(b,(), alphanumeric1), Ok((empty, b)));
+    assert_eq!(
+      alphanumeric1::<_, (_, ErrorKind)>(c),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+    assert_eq!(alphanumeric1::<_, (_, ErrorKind)>(d), Ok(("é12", "az")));
+    assert_eq!(
+      space1::<_, (_, ErrorKind)>(e),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+  }
+
+  use crate::traits::Offset;
+  #[test]
+  fn offset() {
+    let a = &b"abcd;"[..];
+    let b = &b"1234;"[..];
+    let c = &b"a123;"[..];
+    let d = &b" \t;"[..];
+    let e = &b" \t\r\n;"[..];
+    let f = &b"123abcDEF;"[..];
+
+    match alpha1::<_, (_, ErrorKind)>(a) {
+      Ok((i, _)) => {
+        assert_eq!(a.offset(i) + i.len(), a.len());
+      }
+      _ => panic!("wrong return type in offset test for alpha"),
+    }
+    match digit1::<_, (_, ErrorKind)>(b) {
+      Ok((i, _)) => {
+        assert_eq!(b.offset(i) + i.len(), b.len());
+      }
+      _ => panic!("wrong return type in offset test for digit"),
+    }
+    match alphanumeric1::<_, (_, ErrorKind)>(c) {
+      Ok((i, _)) => {
+        assert_eq!(c.offset(i) + i.len(), c.len());
+      }
+      _ => panic!("wrong return type in offset test for alphanumeric"),
+    }
+    match space1::<_, (_, ErrorKind)>(d) {
+      Ok((i, _)) => {
+        assert_eq!(d.offset(i) + i.len(), d.len());
+      }
+      _ => panic!("wrong return type in offset test for space"),
+    }
+    match multispace1::<_, (_, ErrorKind)>(e) {
+      Ok((i, _)) => {
+        assert_eq!(e.offset(i) + i.len(), e.len());
+      }
+      _ => panic!("wrong return type in offset test for multispace"),
+    }
+    match hex_digit1::<_, (_, ErrorKind)>(f) {
+      Ok((i, _)) => {
+        assert_eq!(f.offset(i) + i.len(), f.len());
+      }
+      _ => panic!("wrong return type in offset test for hex_digit"),
+    }
+    match oct_digit1::<_, (_, ErrorKind)>(f) {
+      Ok((i, _)) => {
+        assert_eq!(f.offset(i) + i.len(), f.len());
+      }
+      _ => panic!("wrong return type in offset test for oct_digit"),
+    }
+  }
+
+  #[test]
+  fn is_not_line_ending_bytes() {
+    let a: &[u8] = b"ab12cd\nefgh";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(a),
+      Ok((&b"\nefgh"[..], &b"ab12cd"[..]))
+    );
+
+    let b: &[u8] = b"ab12cd\nefgh\nijkl";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(b),
+      Ok((&b"\nefgh\nijkl"[..], &b"ab12cd"[..]))
+    );
+
+    let c: &[u8] = b"ab12cd\r\nefgh\nijkl";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(c),
+      Ok((&b"\r\nefgh\nijkl"[..], &b"ab12cd"[..]))
+    );
+
+    let d: &[u8] = b"ab12cd";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(d),
+      Err(Err::Incomplete(Needed::Unknown))
+    );
+  }
+
+  #[test]
+  fn is_not_line_ending_str() {
+    /*
+    let a: &str = "ab12cd\nefgh";
+    assert_eq!(not_line_ending(a), Ok((&"\nefgh"[..], &"ab12cd"[..])));
+
+    let b: &str = "ab12cd\nefgh\nijkl";
+    assert_eq!(not_line_ending(b), Ok((&"\nefgh\nijkl"[..], &"ab12cd"[..])));
+
+    let c: &str = "ab12cd\r\nefgh\nijkl";
+    assert_eq!(not_line_ending(c), Ok((&"\r\nefgh\nijkl"[..], &"ab12cd"[..])));
+
+    let d = "βèƒôřè\nÂßÇáƒƭèř";
+    assert_eq!(not_line_ending(d), Ok((&"\nÂßÇáƒƭèř"[..], &"βèƒôřè"[..])));
+
+    let e = "βèƒôřè\r\nÂßÇáƒƭèř";
+    assert_eq!(not_line_ending(e), Ok((&"\r\nÂßÇáƒƭèř"[..], &"βèƒôřè"[..])));
+    */
+
+    let f = "βèƒôřè\rÂßÇáƒƭèř";
+    assert_eq!(not_line_ending(f), Err(Err::Error((f, ErrorKind::Tag))));
+
+    let g2: &str = "ab12cd";
+    assert_eq!(
+      not_line_ending::<_, (_, ErrorKind)>(g2),
+      Err(Err::Incomplete(Needed::Unknown))
+    );
+  }
+
+  #[test]
+  fn hex_digit_test() {
+    let i = &b"0123456789abcdefABCDEF;"[..];
+    assert_parse!(hex_digit1(i), Ok((&b";"[..], &i[..i.len() - 1])));
+
+    let i = &b"g"[..];
+    assert_parse!(
+      hex_digit1(i),
+      Err(Err::Error(error_position!(i, ErrorKind::HexDigit)))
+    );
+
+    let i = &b"G"[..];
+    assert_parse!(
+      hex_digit1(i),
+      Err(Err::Error(error_position!(i, ErrorKind::HexDigit)))
+    );
+
+    assert!(crate::character::is_hex_digit(b'0'));
+    assert!(crate::character::is_hex_digit(b'9'));
+    assert!(crate::character::is_hex_digit(b'a'));
+    assert!(crate::character::is_hex_digit(b'f'));
+    assert!(crate::character::is_hex_digit(b'A'));
+    assert!(crate::character::is_hex_digit(b'F'));
+    assert!(!crate::character::is_hex_digit(b'g'));
+    assert!(!crate::character::is_hex_digit(b'G'));
+    assert!(!crate::character::is_hex_digit(b'/'));
+    assert!(!crate::character::is_hex_digit(b':'));
+    assert!(!crate::character::is_hex_digit(b'@'));
+    assert!(!crate::character::is_hex_digit(b'\x60'));
+  }
+
+  #[test]
+  fn oct_digit_test() {
+    let i = &b"01234567;"[..];
+    assert_parse!(oct_digit1(i), Ok((&b";"[..], &i[..i.len() - 1])));
+
+    let i = &b"8"[..];
+    assert_parse!(
+      oct_digit1(i),
+      Err(Err::Error(error_position!(i, ErrorKind::OctDigit)))
+    );
+
+    assert!(crate::character::is_oct_digit(b'0'));
+    assert!(crate::character::is_oct_digit(b'7'));
+    assert!(!crate::character::is_oct_digit(b'8'));
+    assert!(!crate::character::is_oct_digit(b'9'));
+    assert!(!crate::character::is_oct_digit(b'a'));
+    assert!(!crate::character::is_oct_digit(b'A'));
+    assert!(!crate::character::is_oct_digit(b'/'));
+    assert!(!crate::character::is_oct_digit(b':'));
+    assert!(!crate::character::is_oct_digit(b'@'));
+    assert!(!crate::character::is_oct_digit(b'\x60'));
+  }
+
+  #[test]
+  fn full_line_windows() {
+    named!(
+      take_full_line<(&[u8], &[u8])>,
+      tuple!(not_line_ending, line_ending)
+    );
+    let input = b"abc\r\n";
+    let output = take_full_line(input);
+    assert_eq!(output, Ok((&b""[..], (&b"abc"[..], &b"\r\n"[..]))));
+  }
+
+  #[test]
+  fn full_line_unix() {
+    named!(
+      take_full_line<(&[u8], &[u8])>,
+      tuple!(not_line_ending, line_ending)
+    );
+    let input = b"abc\n";
+    let output = take_full_line(input);
+    assert_eq!(output, Ok((&b""[..], (&b"abc"[..], &b"\n"[..]))));
+  }
+
+  #[test]
+  fn check_windows_lineending() {
+    let input = b"\r\n";
+    let output = line_ending(&input[..]);
+    assert_parse!(output, Ok((&b""[..], &b"\r\n"[..])));
+  }
+
+  #[test]
+  fn check_unix_lineending() {
+    let input = b"\n";
+    let output = line_ending(&input[..]);
+    assert_parse!(output, Ok((&b""[..], &b"\n"[..])));
+  }
+
+  #[test]
+  fn cr_lf() {
+    assert_parse!(crlf(&b"\r\na"[..]), Ok((&b"a"[..], &b"\r\n"[..])));
+    assert_parse!(crlf(&b"\r"[..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_parse!(
+      crlf(&b"\ra"[..]),
+      Err(Err::Error(error_position!(&b"\ra"[..], ErrorKind::CrLf)))
+    );
+
+    assert_parse!(crlf("\r\na"), Ok(("a", "\r\n")));
+    assert_parse!(crlf("\r"), Err(Err::Incomplete(Needed::new(2))));
+    assert_parse!(
+      crlf("\ra"),
+      Err(Err::Error(error_position!("\ra", ErrorKind::CrLf)))
+    );
+  }
+
+  #[test]
+  fn end_of_line() {
+    assert_parse!(line_ending(&b"\na"[..]), Ok((&b"a"[..], &b"\n"[..])));
+    assert_parse!(line_ending(&b"\r\na"[..]), Ok((&b"a"[..], &b"\r\n"[..])));
+    assert_parse!(
+      line_ending(&b"\r"[..]),
+      Err(Err::Incomplete(Needed::new(2)))
+    );
+    assert_parse!(
+      line_ending(&b"\ra"[..]),
+      Err(Err::Error(error_position!(&b"\ra"[..], ErrorKind::CrLf)))
+    );
+
+    assert_parse!(line_ending("\na"), Ok(("a", "\n")));
+    assert_parse!(line_ending("\r\na"), Ok(("a", "\r\n")));
+    assert_parse!(line_ending("\r"), Err(Err::Incomplete(Needed::new(2))));
+    assert_parse!(
+      line_ending("\ra"),
+      Err(Err::Error(error_position!("\ra", ErrorKind::CrLf)))
+    );
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/combinator/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/combinator/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/combinator/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/combinator/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1226 @@
+//! Macro combinators
+//!
+//! Macros are used to make combination easier,
+//! since they often do not depend on the type
+//! of the data they manipulate or return.
+//!
+//! There is a trick to make them easier to assemble,
+//! combinators are defined like this:
+//!
+//! ```ignore
+//! macro_rules! tag (
+//!   ($i:expr, $inp: expr) => (
+//!     {
+//!       ...
+//!     }
+//!   );
+//! );
+//! ```
+//!
+//! But when used in other combinators, are used
+//! like this:
+//!
+//! ```ignore
+//! named!(my_function, tag!("abcd"));
+//! ```
+//!
+//! Internally, other combinators will rewrite
+//! that call to pass the input as first argument:
+//!
+//! ```ignore
+//! macro_rules! named (
+//!   ($name:ident, $submac:ident!( $($args:tt)* )) => (
+//!     fn $name<'a>( i: &'a [u8] ) -> IResult<'a,&[u8], &[u8]> {
+//!       $submac!(i, $($args)*)
+//!     }
+//!   );
+//! );
+//! ```
+//!
+//! If you want to call a combinator directly, you can
+//! do it like this:
+//!
+//! ```ignore
+//! let res = { tag!(input, "abcd"); }
+//! ```
+//!
+//! Combinators must have a specific variant for
+//! non-macro arguments. Example: Passing a function
+//! to `take_while!` instead of another combinator.
+//!
+//! ```ignore
+//! macro_rules! take_while(
+//!   ($input:expr, $submac:ident!( $($args:tt)* )) => (
+//!     {
+//!       ...
+//!     }
+//!   );
+//!
+//!   // wrap the function in a macro to pass it to the main implementation
+//!   ($input:expr, $f:expr) => (
+//!     take_while!($input, call!($f));
+//!   );
+//! );
+//! ```
+#[allow(unused_variables)]
+
+/// Makes a function from a parser combination
+///
+/// The type can be set up if the compiler needs
+/// more information.
+///
+/// Function-like declaration:
+/// ```
+/// # use nom::{named, tag};
+/// named!(my_function( &[u8] ) -> &[u8], tag!("abcd"));
+/// ```
+/// Alternative declaration. First type parameter is input, second is output:
+/// ```
+/// # use nom::{named, tag};
+/// named!(my_function<&[u8], &[u8]>, tag!("abcd"));
+/// ```
+/// This one will have `&[u8]` as input type, `&[u8]` as output type:
+/// ```
+/// # use nom::{named, tag};
+/// named!(my_function, tag!("abcd"));
+/// ```
+/// Will use `&[u8]` as output type:
+/// ```
+/// # use nom::{named, tag};
+/// named!(my_function<&[u8]>, tag!("abcd"));
+/// ```
+/// Prefix them with 'pub' to make the functions public:
+/// ```
+/// # use nom::{named, tag};
+/// named!(pub my_function, tag!("abcd"));
+/// ```
+/// Prefix them with 'pub(crate)' to make the functions public within the crate:
+/// ```
+/// # use nom::{named, tag};
+/// named!(pub(crate) my_function, tag!("abcd"));
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! named (
+    (#$($args:tt)*) => (
+        named_attr!(#$($args)*);
+    );
+    ($vis:vis $name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => (
+        $vis fn $name( i: $i ) -> $crate::IResult<$i, $o, $crate::error::Error<$i>> {
+            $submac!(i, $($args)*)
+        }
+    );
+    ($vis:vis $name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => (
+        $vis fn $name( i: $i ) -> $crate::IResult<$i, $o, $e> {
+            $submac!(i, $($args)*)
+        }
+    );
+    ($vis:vis $name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => (
+        $vis fn $name( i: $i ) -> $crate::IResult<$i, $o, $crate::error::Error<$i>> {
+            $submac!(i, $($args)*)
+        }
+    );
+    ($vis:vis $name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => (
+        $vis fn $name( i: &[u8] ) -> $crate::IResult<&[u8], $o, $crate::error::Error<&[u8]>> {
+            $submac!(i, $($args)*)
+        }
+    );
+    ($vis:vis $name:ident, $submac:ident!( $($args:tt)* )) => (
+        $vis fn $name( i: &[u8] ) -> $crate::IResult<&[u8], &[u8], $crate::error::Error<&[u8]>> {
+            $submac!(i, $($args)*)
+        }
+    );
+);
+
+/// Makes a function from a parser combination with arguments.
+///
+/// ```ignore
+/// //takes [`&[u8]`] as input
+/// named_args!(tagged(open_tag: &[u8], close_tag: &[u8])<&str>,
+///   delimited!(tag!(open_tag), map_res!(take!(4), str::from_utf8), tag!(close_tag))
+/// );
+
+/// //takes `&str` as input
+/// named_args!(tagged(open_tag: &str, close_tag: &str)<&str, &str>,
+///   delimited!(tag!(open_tag), take!(4), tag!(close_tag))
+/// );
+/// ```
+///
+/// Note: If using arguments that way gets hard to read, it is always
+/// possible to write the equivalent parser definition manually, like
+/// this:
+///
+/// ```ignore
+/// fn tagged(input: &[u8], open_tag: &[u8], close_tag: &[u8]) -> IResult<&[u8], &str> {
+///   // the first combinator in the tree gets the input as argument. It is then
+///   // passed from one combinator to the next through macro rewriting
+///   delimited!(input,
+///     tag!(open_tag), take!(4), tag!(close_tag)
+///   )
+/// );
+/// ```
+///
+#[macro_export(local_inner_macros)]
+macro_rules! named_args {
+    ($vis:vis $func_name:ident ( $( $arg:ident : $typ:ty ),* ) < $return_type:ty > , $submac:ident!( $($args:tt)* ) ) => {
+        $vis fn $func_name(input: &[u8], $( $arg : $typ ),*) -> $crate::IResult<&[u8], $return_type> {
+            $submac!(input, $($args)*)
+        }
+    };
+
+    ($vis:vis $func_name:ident < 'a > ( $( $arg:ident : $typ:ty ),* ) < $return_type:ty > , $submac:ident!( $($args:tt)* ) ) => {
+        $vis fn $func_name<'this_is_probably_unique_i_hope_please, 'a>(
+          input: &'this_is_probably_unique_i_hope_please [u8], $( $arg : $typ ),*) ->
+          $crate::IResult<&'this_is_probably_unique_i_hope_please [u8], $return_type>
+        {
+          $submac!(input, $($args)*)
+        }
+    };
+
+    ($vis:vis $func_name:ident ( $( $arg:ident : $typ:ty ),* ) < $input_type:ty, $return_type:ty > , $submac:ident!( $($args:tt)* ) ) => {
+        $vis fn $func_name(input: $input_type, $( $arg : $typ ),*) -> $crate::IResult<$input_type, $return_type> {
+            $submac!(input, $($args)*)
+        }
+    };
+
+    ($vis:vis $func_name:ident < 'a > ( $( $arg:ident : $typ:ty ),* ) < $input_type:ty, $return_type:ty > , $submac:ident!( $($args:tt)* ) ) => {
+        $vis fn $func_name<'a>(
+          input: $input_type, $( $arg : $typ ),*)
+          -> $crate::IResult<$input_type, $return_type>
+        {
+            $submac!(input, $($args)*)
+        }
+    };
+}
+
+/// Makes a function from a parser combination, with attributes.
+///
+/// The usage of this macro is almost identical to `named!`, except that
+/// you also pass attributes to be attached to the generated function.
+/// This is ideal for adding documentation to your parser.
+///
+/// Create my_function as if you wrote it with the doc comment /// My Func:
+/// ```
+/// # use nom::{named_attr, tag};
+/// named_attr!(#[doc = "My Func"], my_function( &[u8] ) -> &[u8], tag!("abcd"));
+/// ```
+/// Also works for pub functions, and multiple lines:
+/// ```
+/// # use nom::{named_attr, tag};
+/// named_attr!(#[doc = "My Func\nRecognise abcd"], pub my_function, tag!("abcd"));
+/// ```
+/// Multiple attributes can be passed if required:
+/// ```
+/// # use nom::{named_attr, tag};
+/// named_attr!(#[doc = "My Func"] #[inline(always)], pub my_function, tag!("abcd"));
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! named_attr (
+    ($(#[$attr:meta])*, $vis:vis $name:ident( $i:ty ) -> $o:ty, $submac:ident!( $($args:tt)* )) => (
+        $(#[$attr])*
+        $vis fn $name( i: $i ) -> $crate::IResult<$i,$o, $crate::error::Error<$i>> {
+            $submac!(i, $($args)*)
+        }
+    );
+    ($(#[$attr:meta])*, $vis:vis $name:ident<$i:ty,$o:ty,$e:ty>, $submac:ident!( $($args:tt)* )) => (
+        $(#[$attr])*
+        $vis fn $name( i: $i ) -> $crate::IResult<$i, $o, $e> {
+            $submac!(i, $($args)*)
+        }
+    );
+    ($(#[$attr:meta])*, $vis:vis $name:ident<$i:ty,$o:ty>, $submac:ident!( $($args:tt)* )) => (
+        $(#[$attr])*
+        $vis fn $name( i: $i ) -> $crate::IResult<$i, $o, $crate::error::Error<$i>> {
+            $submac!(i, $($args)*)
+        }
+    );
+    ($(#[$attr:meta])*, $vis:vis $name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => (
+        $(#[$attr])*
+        $vis fn $name( i: &[u8] ) -> $crate::IResult<&[u8], $o, $crate::error::Error<&[u8]>> {
+            $submac!(i, $($args)*)
+        }
+    );
+    ($(#[$attr:meta])*, $vis:vis $name:ident, $submac:ident!( $($args:tt)* )) => (
+        $(#[$attr])*
+        $vis fn $name<'a>( i: &'a [u8] ) -> $crate::IResult<&[u8], &[u8], $crate::error::Error<&[u8]>> {
+            $submac!(i, $($args)*)
+        }
+    );
+);
+
+/// Used to wrap common expressions and function as macros.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::IResult;
+/// # fn main() {
+///   fn take_wrapper(input: &[u8], i: u8) -> IResult<&[u8], &[u8]> { take!(input, i * 10) }
+///
+///   // will make a parser taking 20 bytes
+///   named!(parser, call!(take_wrapper, 2));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! call (
+  ($i:expr, $fun:expr) => ( $fun( $i ) );
+  ($i:expr, $fun:expr, $($args:expr),* ) => ( $fun( $i, $($args),* ) );
+);
+
+//FIXME: error rewrite
+/// Prevents backtracking if the child parser fails.
+///
+/// This parser will do an early return instead of sending
+/// its result to the parent parser.
+///
+/// If another `return_error!` combinator is present in the parent
+/// chain, the error will be wrapped and another early
+/// return will be made.
+///
+/// This makes it easy to build report on which parser failed,
+/// where it failed in the input, and the chain of parsers
+/// that led it there.
+///
+/// Additionally, the error chain contains number identifiers
+/// that can be matched to provide useful error messages.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///     named!(err_test<&[u8], &[u8]>, alt!(
+///       tag!("abcd") |
+///       preceded!(tag!("efgh"), return_error!(ErrorKind::Eof,
+///           do_parse!(
+///                  tag!("ijkl")                                        >>
+///             res: return_error!(ErrorKind::Tag, tag!("mnop")) >>
+///             (res)
+///           )
+///         )
+///       )
+///     ));
+///     let a = &b"efghblah"[..];
+///     let b = &b"efghijklblah"[..];
+///     let c = &b"efghijklmnop"[..];
+///
+///     let blah = &b"blah"[..];
+///
+///     let res_a = err_test(a);
+///     let res_b = err_test(b);
+///     let res_c = err_test(c);
+///     assert_eq!(res_a, Err(Err::Failure(error_node_position!(blah, ErrorKind::Eof, error_position!(blah, ErrorKind::Tag)))));
+///     assert_eq!(res_b, Err(Err::Failure(error_node_position!(&b"ijklblah"[..], ErrorKind::Eof,
+///       error_node_position!(blah, ErrorKind::Tag, error_position!(blah, ErrorKind::Tag))))
+///     ));
+/// # }
+/// ```
+///
+#[macro_export(local_inner_macros)]
+macro_rules! return_error (
+  ($i:expr, $code:expr, $submac:ident!( $($args:tt)* )) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::Err;
+
+      let i_ = $i.clone();
+      let cl = || {
+        $submac!(i_, $($args)*)
+      };
+
+      match cl() {
+        Err(Err::Incomplete(x)) => Err(Err::Incomplete(x)),
+        Ok((i, o))              => Ok((i, o)),
+        Err(Err::Error(e)) | Err(Err::Failure(e)) => {
+          return Err(Err::Failure($crate::error::append_error($i, $code, e)))
+        }
+      }
+    }
+  );
+  ($i:expr, $code:expr, $f:expr) => (
+    return_error!($i, $code, call!($f));
+  );
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::Err;
+
+      let i_ = $i.clone();
+      let cl = || {
+        $submac!(i_, $($args)*)
+      };
+
+      match cl() {
+        Err(Err::Incomplete(x)) => Err(Err::Incomplete(x)),
+        Ok((i, o))              => Ok((i, o)),
+        Err(Err::Error(e)) | Err(Err::Failure(e)) => {
+          return Err(Err::Failure(e))
+        }
+      }
+    }
+  );
+  ($i:expr, $f:expr) => (
+    return_error!($i, call!($f));
+  );
+);
+
+//FIXME: error rewrite
+/// Add an error if the child parser fails.
+///
+/// While `return_error!` does an early return and avoids backtracking,
+/// `add_return_error!` backtracks normally. It just provides more context
+/// for an error.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use std::collections;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///     named!(err_test, add_return_error!(ErrorKind::Tag, tag!("abcd")));
+///
+///     let a = &b"efghblah"[..];
+///     let res_a = err_test(a);
+///     assert_eq!(res_a, Err(Err::Error(error_node_position!(a, ErrorKind::Tag, error_position!(a, ErrorKind::Tag)))));
+/// # }
+/// ```
+///
+#[macro_export(local_inner_macros)]
+macro_rules! add_return_error (
+  ($i:expr, $code:expr, $submac:ident!( $($args:tt)* )) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::{Err,error::ErrorKind};
+
+      match $submac!($i, $($args)*) {
+        Ok((i, o)) => Ok((i, o)),
+        Err(Err::Error(e)) => {
+          Err(Err::Error(error_node_position!($i, $code, e)))
+        },
+        Err(Err::Failure(e)) => {
+          Err(Err::Failure(error_node_position!($i, $code, e)))
+        },
+        Err(e) => Err(e),
+      }
+    }
+  );
+  ($i:expr, $code:expr, $f:expr) => (
+    add_return_error!($i, $code, call!($f));
+  );
+);
+
+/// Replaces a `Incomplete` returned by the child parser
+/// with an `Error`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use std::collections;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///     named!(take_5, complete!(take!(5)));
+///
+///     let a = &b"abcd"[..];
+///     let res_a = take_5(a);
+///     assert_eq!(res_a, Err(Err::Error(error_position!(a, ErrorKind::Complete))));
+/// # }
+/// ```
+///
+#[macro_export(local_inner_macros)]
+macro_rules! complete (
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::combinator::completec($i, move |i| { $submac!(i, $($args)*) })
+  );
+  ($i:expr, $f:expr) => (
+    complete!($i, call!($f));
+  );
+);
+
+/// A bit like `std::try!`, this macro will return the remaining input and
+/// parsed value if the child parser returned `Ok`, and will do an early
+/// return for the `Err` side.
+///
+/// This can provide more flexibility than `do_parse!` if needed.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # use nom::IResult;
+///
+///  fn take_add(input:&[u8], size: u8) -> IResult<&[u8], &[u8]> {
+///    let (i1, length)     = try_parse!(input, map_opt!(nom::number::streaming::be_u8, |sz| size.checked_add(sz)));
+///    let (i2, data)   = try_parse!(i1, take!(length));
+///    return Ok((i2, data));
+///  }
+/// # fn main() {
+/// let arr1 = [1, 2, 3, 4, 5];
+/// let r1 = take_add(&arr1[..], 1);
+/// assert_eq!(r1, Ok((&[4,5][..], &[2,3][..])));
+///
+/// let arr2 = [0xFE, 2, 3, 4, 5];
+/// // size is overflowing
+/// let r1 = take_add(&arr2[..], 42);
+/// assert_eq!(r1, Err(Err::Error(error_position!(&[254, 2,3,4,5][..], ErrorKind::MapOpt))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! try_parse (
+  ($i:expr, $submac:ident!( $($args:tt)* )) => ({
+    use $crate::lib::std::result::Result::*;
+
+    match $submac!($i, $($args)*) {
+      Ok((i,o)) => (i,o),
+      Err(e)    => return Err(e),
+    }
+    });
+  ($i:expr, $f:expr) => (
+    try_parse!($i, call!($f))
+  );
+);
+
+/// `map!(I -> IResult<I, O>, O -> P) => I -> IResult<I, P>`
+///
+/// Maps a function on the result of a parser.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::character::complete::digit1;
+/// # fn main() {
+///
+/// named!(parse<&str, usize>, map!(digit1, |s| s.len()));
+///
+/// // the parser will count how many characters were returned by digit1
+/// assert_eq!(parse("123456"), Ok(("", 6)));
+///
+/// // this will fail if digit1 fails
+/// assert_eq!(parse("abc"), Err(Err::Error(error_position!("abc", ErrorKind::Digit))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! map(
+  // Internal parser, do not use directly
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    $crate::combinator::mapc($i, move |i| {$submac!(i, $($args)*)}, $g)
+  );
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    map!(__impl $i, $submac!($($args)*), $g);
+  );
+  ($i:expr, $f:expr, $g:expr) => (
+    map!(__impl $i, call!($f), $g);
+  );
+);
+
+/// `map_res!(I -> IResult<I, O>, O -> Result<P>) => I -> IResult<I, P>`
+/// maps a function returning a `Result` on the output of a parser.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::character::complete::digit1;
+/// # fn main() {
+///
+/// named!(parse<&str, u8>, map_res!(digit1, |s: &str| s.parse::<u8>()));
+///
+/// // the parser will convert the result of digit1 to a number
+/// assert_eq!(parse("123"), Ok(("", 123)));
+///
+/// // this will fail if digit1 fails
+/// assert_eq!(parse("abc"), Err(Err::Error(error_position!("abc", ErrorKind::Digit))));
+///
+/// // this will fail if the mapped function fails (a `u8` is too small to hold `123456`)
+/// assert_eq!(parse("123456"), Err(Err::Error(error_position!("123456", ErrorKind::MapRes))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! map_res (
+  // Internal parser, do not use directly
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    $crate::combinator::map_resc($i, move |i| {$submac!(i, $($args)*)}, move |i| {$submac2!(i, $($args2)*)})
+  );
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    map_res!(__impl $i, $submac!($($args)*), call!($g));
+  );
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    map_res!(__impl $i, $submac!($($args)*), $submac2!($($args2)*));
+  );
+  ($i:expr, $f:expr, $g:expr) => (
+    map_res!(__impl $i, call!($f), call!($g));
+  );
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    map_res!(__impl $i, call!($f), $submac!($($args)*));
+  );
+);
+
+/// `map_opt!(I -> IResult<I, O>, O -> Option<P>) => I -> IResult<I, P>`
+/// maps a function returning an `Option` on the output of a parser.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::{Error, ErrorKind}, IResult};
+/// use nom::character::complete::digit1;
+/// # fn main() {
+///
+/// named!(parser<&str, u8>, map_opt!(digit1, |s: &str| s.parse::<u8>().ok()));
+///
+/// // the parser will convert the result of digit1 to a number
+/// assert_eq!(parser("123"), Ok(("", 123)));
+///
+/// // this will fail if digit1 fails
+/// assert_eq!(parser("abc"), Err(Err::Error(Error::new("abc", ErrorKind::Digit))));
+///
+/// // this will fail if the mapped function fails (a `u8` is too small to hold `123456`)
+/// assert_eq!(parser("123456"), Err(Err::Error(Error::new("123456", ErrorKind::MapOpt))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! map_opt (
+  // Internal parser, do not use directly
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    $crate::combinator::map_optc($i, move |i| {$submac!(i, $($args)*)}, move |i| {$submac2!(i, $($args2)*)})
+  );
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    map_opt!(__impl $i, $submac!($($args)*), call!($g));
+  );
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    map_opt!(__impl $i, $submac!($($args)*), $submac2!($($args2)*));
+  );
+  ($i:expr, $f:expr, $g:expr) => (
+    map_opt!(__impl $i, call!($f), call!($g));
+  );
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    map_opt!(__impl $i, call!($f), $submac!($($args)*));
+  );
+);
+
+/// `parse_to!(O) => I -> IResult<I, O>`
+/// Uses the `parse` method from `std::str::FromStr` to convert the current
+/// input to the specified type.
+///
+/// This will completely consume the input.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::{Error, ErrorKind}, IResult};
+/// use nom::character::complete::digit1;
+/// # fn main() {
+///
+/// named!(parser<&str, u8>, parse_to!(u8));
+///
+/// assert_eq!(parser("123"), Ok(("", 123)));
+///
+/// assert_eq!(parser("abc"), Err(Err::Error(Error::new("abc", ErrorKind::ParseTo))));
+///
+/// // this will fail if the mapped function fails (a `u8` is too small to hold `123456`)
+/// assert_eq!(parser("123456"), Err(Err::Error(Error::new("123456", ErrorKind::ParseTo))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! parse_to (
+  ($i:expr, $t:ty ) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::lib::std::option::Option;
+      use $crate::lib::std::option::Option::*;
+      use $crate::{Err,error::ErrorKind};
+
+      use $crate::ParseTo;
+      use $crate::Slice;
+      use $crate::InputLength;
+
+      let res: Option<$t> = ($i).parse_to();
+      match res {
+        Some(output) => Ok(($i.slice($i.input_len()..), output)),
+        None         => Err(Err::Error($crate::error::make_error($i, ErrorKind::ParseTo)))
+      }
+    }
+  );
+);
+
+/// `verify!(I -> IResult<I, O>, O -> bool) => I -> IResult<I, O>`
+/// returns the result of the child parser if it satisfies a verification function.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(check<u32>, verify!(nom::number::streaming::be_u32, |val: &u32| *val < 3));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! verify (
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    $crate::combinator::verifyc($i, |i| $submac!(i, $($args)*), $g)
+  );
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    $crate::combinator::verifyc($i, |i| $submac!(i, $($args)*), |&o| $submac2!(o, $($args2)*))
+  );
+  ($i:expr, $f:expr, $g:expr) => (
+    $crate::combinator::verify($f, $g)($i)
+  );
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::combinator::verify($f, |&o| $submac!(o, $($args)*))($i)
+  );
+);
+
+/// `value!(T, R -> IResult<R, S> ) => R -> IResult<R, T>`
+///
+/// or `value!(T) => R -> IResult<R, T>`
+///
+/// If the child parser was successful, return the value.
+/// If no child parser is provided, always return the value.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(x<u8>, value!(42, delimited!(tag!("<!--"), take!(5), tag!("-->"))));
+///  named!(y<u8>, delimited!(tag!("<!--"), value!(42), tag!("-->")));
+///  let r = x(&b"<!-- abc --> aaa"[..]);
+///  assert_eq!(r, Ok((&b" aaa"[..], 42)));
+///
+///  let r2 = y(&b"<!----> aaa"[..]);
+///  assert_eq!(r2, Ok((&b" aaa"[..], 42)));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! value (
+  ($i:expr, $res:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::combinator::valuec($i, $res, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $res:expr, $f:expr) => (
+    $crate::combinator::valuec($i, $res, $f)
+  );
+  ($i:expr, $res:expr) => (
+    Ok(($i, $res))
+  );
+);
+
+/// `opt!(I -> IResult<I,O>) => I -> IResult<I, Option<O>>`
+/// make the underlying parser optional.
+///
+/// Returns an `Option` of the returned type. This parser returns `Some(result)` if the child parser
+/// succeeds, `None` if it fails, and `Incomplete` if it did not have enough data to decide.
+///
+/// *Warning*: if you are using `opt` for some kind of optional ending token (like an end of line),
+/// you should combine it with `complete` to make sure it works.
+///
+/// As an example, `opt!(tag!("\r\n"))` will return `Incomplete` if it receives an empty input,
+/// because `tag` does not have enough input to decide.
+/// On the contrary, `opt!(complete!(tag!("\r\n")))` would return `None` as produced value,
+/// since `complete!` transforms an `Incomplete` in an `Error`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!( o<&[u8], Option<&[u8]> >, opt!( tag!( "abcd" ) ) );
+///
+///  let a = b"abcdef";
+///  let b = b"bcdefg";
+///  assert_eq!(o(&a[..]), Ok((&b"ef"[..], Some(&b"abcd"[..]))));
+///  assert_eq!(o(&b[..]), Ok((&b"bcdefg"[..], None)));
+///  # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! opt(
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    {
+      $crate::combinator::optc($i, |i| $submac!(i, $($args)*))
+    }
+  );
+  ($i:expr, $f:expr) => (
+    $crate::combinator::opt($f)($i)
+  );
+);
+
+/// `opt_res!(I -> IResult<I,O>) => I -> IResult<I, Result<nom::Err,O>>`
+/// make the underlying parser optional.
+///
+/// Returns a `Result`, with `Err` containing the parsing error.
+///
+/// ```ignore
+/// # #[macro_use] extern crate nom;
+/// # use nom::ErrorKind;
+/// # fn main() {
+///  named!( o<&[u8], Result<&[u8], nom::Err<&[u8]> > >, opt_res!( tag!( "abcd" ) ) );
+///
+///  let a = b"abcdef";
+///  let b = b"bcdefg";
+///  assert_eq!(o(&a[..]), Ok((&b"ef"[..], Ok(&b"abcd"[..])));
+///  assert_eq!(o(&b[..]), Ok((&b"bcdefg"[..], Err(error_position!(&b[..], ErrorKind::Tag))));
+///  # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! opt_res (
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::Err;
+
+      let i_ = $i.clone();
+      match $submac!(i_, $($args)*) {
+        Ok((i,o))          => Ok((i,  Ok(o))),
+        Err(Err::Error(e)) => Ok(($i, Err(Err::Error(e)))),
+        // in case of failure, we return a real error
+        Err(e)             => Err(e)
+      }
+    }
+  );
+  ($i:expr, $f:expr) => (
+    opt_res!($i, call!($f));
+  );
+);
+
+/// `cond!(bool, I -> IResult<I,O>) => I -> IResult<I, Option<O>>`
+/// Conditional combinator
+///
+/// Wraps another parser and calls it if the
+/// condition is met. This combinator returns
+/// an Option of the return type of the child
+/// parser.
+///
+/// This is especially useful if a parser depends
+/// on the value returned by a preceding parser in
+/// a `do_parse!`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::IResult;
+/// # fn main() {
+///  fn f_true(i: &[u8]) -> IResult<&[u8], Option<&[u8]>> {
+///    cond!(i, true, tag!("abcd"))
+///  }
+///
+///  fn f_false(i: &[u8]) -> IResult<&[u8], Option<&[u8]>> {
+///    cond!(i, false, tag!("abcd"))
+///  }
+///
+///  let a = b"abcdef";
+///  assert_eq!(f_true(&a[..]), Ok((&b"ef"[..], Some(&b"abcd"[..]))));
+///
+///  assert_eq!(f_false(&a[..]), Ok((&b"abcdef"[..], None)));
+///  # }
+/// ```
+///
+#[macro_export(local_inner_macros)]
+macro_rules! cond(
+  ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::combinator::condc($i, $cond, |i|  $submac!(i, $($args)*) )
+  );
+  ($i:expr, $cond:expr, $f:expr) => (
+    $crate::combinator::cond($cond, $f)($i)
+  );
+);
+
+/// `peek!(I -> IResult<I,O>) => I -> IResult<I, O>`
+/// returns a result without consuming the input.
+///
+/// The embedded parser may return `Err(Err::Incomplete)`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(ptag, peek!( tag!( "abcd" ) ) );
+///
+///  let r = ptag(&b"abcdefgh"[..]);
+///  assert_eq!(r, Ok((&b"abcdefgh"[..], &b"abcd"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! peek(
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::combinator::peekc($i, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $f:expr) => (
+    $crate::combinator::peek($f)($i)
+  );
+);
+
+/// `not!(I -> IResult<I,O>) => I -> IResult<I, ()>`
+/// returns a result only if the embedded parser returns `Error` or `Err(Err::Incomplete)`.
+/// Does not consume the input.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+/// named!(not_e, do_parse!(
+///     res: tag!("abc")      >>
+///          not!(char!('e')) >>
+///     (res)
+/// ));
+///
+/// let r = not_e(&b"abcd"[..]);
+/// assert_eq!(r, Ok((&b"d"[..], &b"abc"[..])));
+///
+/// let r2 = not_e(&b"abce"[..]);
+/// assert_eq!(r2, Err(Err::Error(error_position!(&b"e"[..], ErrorKind::Not))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! not(
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::combinator::notc($i, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $f:expr) => (
+    $crate::combinator::not($f)($i)
+  );
+);
+
+/// `tap!(name: I -> IResult<I,O> => { block }) => I -> IResult<I, O>`
+/// allows access to the parser's result without affecting it.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use std::str;
+/// # fn main() {
+///  named!(ptag, tap!(res: tag!( "abcd" ) => { println!("recognized {}", str::from_utf8(res).unwrap()) } ) );
+///
+///  let r = ptag(&b"abcdefgh"[..]);
+///  assert_eq!(r, Ok((&b"efgh"[..], &b"abcd"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! tap (
+  ($i:expr, $name:ident : $submac:ident!( $($args:tt)* ) => $e:expr) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::{Err,Needed,IResult};
+
+      match $submac!($i, $($args)*) {
+        Ok((i,o)) => {
+          let $name = o;
+          $e;
+          Ok((i, $name))
+        },
+        Err(e)    => Err(Err::convert(e)),
+      }
+    }
+  );
+  ($i:expr, $name: ident: $f:expr => $e:expr) => (
+    tap!($i, $name: call!($f) => $e);
+  );
+);
+
+/// `eof!()` returns its input if it is at the end of input data.
+///
+/// When we're at the end of the data, this combinator
+/// will succeed.
+///
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use std::str;
+/// # use nom::{Err, error::{Error ,ErrorKind}};
+/// # fn main() {
+///  named!(parser, eof!());
+///
+///  assert_eq!(parser(&b"abc"[..]), Err(Err::Error(Error::new(&b"abc"[..], ErrorKind::Eof))));
+///  assert_eq!(parser(&b""[..]), Ok((&b""[..], &b""[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! eof (
+  ($i:expr,) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::{Err,error::ErrorKind};
+
+      use $crate::InputLength;
+      if ($i).input_len() == 0 {
+        let clone = $i.clone();
+        Ok(($i, clone))
+      } else {
+        Err(Err::Error(error_position!($i, ErrorKind::Eof)))
+      }
+    }
+  );
+);
+
+/// `exact!()` will fail if the child parser does not consume the whole data.
+///
+/// TODO: example
+#[macro_export(local_inner_macros)]
+macro_rules! exact (
+  ($i:expr, $submac:ident!( $($args:tt)* )) => ({
+      terminated!($i, $submac!( $($args)*), eof!())
+  });
+  ($i:expr, $f:expr) => (
+    exact!($i, call!($f));
+  );
+);
+
+/// `recognize!(I -> IResult<I, O> ) => I -> IResult<I, I>`
+/// if the child parser was successful, return the consumed input as produced value.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(x, recognize!(delimited!(tag!("<!--"), take!(5), tag!("-->"))));
+///  let r = x(&b"<!-- abc --> aaa"[..]);
+///  assert_eq!(r, Ok((&b" aaa"[..], &b"<!-- abc -->"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! recognize (
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::combinator::recognizec($i, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $f:expr) => (
+    $crate::combinator::recognize($f)($i)
+  );
+);
+
+/// `into!(I -> IResult<I, O1, E1>) => I -> IResult<I, O2, E2>`
+/// automatically converts the child parser's result to another type
+///
+/// it will be able to convert the output value and the error value
+/// as long as the `Into` implementations are available
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::IResult;
+/// # fn main() {
+///  named!(parse_to_str<&str, &str>, take!(4));
+///  named!(parse_to_vec<&str, Vec<u8>>, into!(parse_to_str));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! into (
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::combinator::intoc($i, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $f:expr) => (
+    $crate::combinator::intoc($i, $f)
+  );
+);
+
+#[cfg(test)]
+mod tests {
+  use crate::error::ErrorKind;
+  use crate::error::ParseError;
+  use crate::internal::{Err, IResult, Needed};
+  #[cfg(feature = "alloc")]
+  use crate::lib::std::boxed::Box;
+
+  // reproduce the tag and take macros, because of module import order
+  macro_rules! tag (
+    ($i:expr, $tag: expr) => ({
+      use $crate::lib::std::result::Result::*;
+      use $crate::{Err,Needed,IResult,error::ErrorKind};
+      use $crate::{Compare,CompareResult,InputLength,Slice};
+
+      let res: IResult<_,_> = match ($i).compare($tag) {
+        CompareResult::Ok => {
+          let blen = $tag.input_len();
+          Ok(($i.slice(blen..), $i.slice(..blen)))
+        },
+        CompareResult::Incomplete => {
+          Err(Err::Incomplete(Needed::new($tag.input_len() - $i.input_len())))
+        },
+        CompareResult::Error => {
+          let e:ErrorKind = ErrorKind::Tag;
+          Err(Err::Error($crate::error::make_error($i, e)))
+        }
+      };
+      res
+      });
+  );
+
+  macro_rules! take(
+    ($i:expr, $count:expr) => (
+      {
+        let cnt = $count as usize;
+        let res:IResult<&[u8],&[u8]> = if $i.len() < cnt {
+          Err($crate::Err::Incomplete($crate::Needed::new(cnt - $i.len())))
+        } else {
+          Ok((&$i[cnt..],&$i[0..cnt]))
+        };
+        res
+      }
+    );
+  );
+
+  mod pub_named_mod {
+    named!(pub tst, tag!("abcd"));
+  }
+
+  #[test]
+  fn pub_named_test() {
+    let a = &b"abcd"[..];
+    let res = pub_named_mod::tst(a);
+    assert_eq!(res, Ok((&b""[..], a)));
+  }
+
+  mod pub_crate_named_mod {
+    named!(pub(crate) tst, tag!("abcd"));
+  }
+
+  #[test]
+  fn pub_crate_named_test() {
+    let a = &b"abcd"[..];
+    let res = pub_crate_named_mod::tst(a);
+    assert_eq!(res, Ok((&b""[..], a)));
+  }
+
+  #[test]
+  fn apply_test() {
+    fn sum2(a: u8, b: u8) -> u8 {
+      a + b
+    }
+    fn sum3(a: u8, b: u8, c: u8) -> u8 {
+      a + b + c
+    }
+    let a = call!(1, sum2, 2);
+    let b = call!(1, sum3, 2, 3);
+
+    assert_eq!(a, 3);
+    assert_eq!(b, 6);
+  }
+
+  #[test]
+  fn opt() {
+    named!(opt_abcd<&[u8],Option<&[u8]> >, opt!(tag!("abcd")));
+
+    let a = &b"abcdef"[..];
+    let b = &b"bcdefg"[..];
+    let c = &b"ab"[..];
+    assert_eq!(opt_abcd(a), Ok((&b"ef"[..], Some(&b"abcd"[..]))));
+    assert_eq!(opt_abcd(b), Ok((&b"bcdefg"[..], None)));
+    assert_eq!(opt_abcd(c), Err(Err::Incomplete(Needed::new(2))));
+  }
+
+  #[test]
+  fn opt_res() {
+    named!(opt_res_abcd<&[u8], Result<&[u8], Err<crate::error::Error<&[u8]>>> >, opt_res!(tag!("abcd")));
+
+    let a = &b"abcdef"[..];
+    let b = &b"bcdefg"[..];
+    let c = &b"ab"[..];
+    assert_eq!(opt_res_abcd(a), Ok((&b"ef"[..], Ok(&b"abcd"[..]))));
+    assert_eq!(
+      opt_res_abcd(b),
+      Ok((
+        &b"bcdefg"[..],
+        Err(Err::Error(error_position!(b, ErrorKind::Tag)))
+      ))
+    );
+    assert_eq!(opt_res_abcd(c), Err(Err::Incomplete(Needed::new(2))));
+  }
+
+  use crate::lib::std::convert::From;
+  #[derive(Debug, PartialEq)]
+  pub struct CustomError(&'static str);
+  impl<I> From<(I, ErrorKind)> for CustomError {
+    fn from(_: (I, ErrorKind)) -> Self {
+      CustomError("test")
+    }
+  }
+  impl<I> From<crate::error::Error<I>> for CustomError {
+    fn from(_: crate::error::Error<I>) -> Self {
+      CustomError("test")
+    }
+  }
+
+  impl<I> ParseError<I> for CustomError {
+    fn from_error_kind(_: I, _: ErrorKind) -> Self {
+      CustomError("from_error_kind")
+    }
+
+    fn append(_: I, _: ErrorKind, _: CustomError) -> Self {
+      CustomError("append")
+    }
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn cond() {
+    fn f_true(i: &[u8]) -> IResult<&[u8], Option<&[u8]>, CustomError> {
+      fix_error!(i, CustomError, cond!(true, tag!("abcd")))
+    }
+
+    fn f_false(i: &[u8]) -> IResult<&[u8], Option<&[u8]>, CustomError> {
+      fix_error!(i, CustomError, cond!(false, tag!("abcd")))
+    }
+
+    assert_eq!(f_true(&b"abcdef"[..]), Ok((&b"ef"[..], Some(&b"abcd"[..]))));
+    assert_eq!(f_true(&b"ab"[..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(f_true(&b"xxx"[..]), Err(Err::Error(CustomError("test"))));
+
+    assert_eq!(f_false(&b"abcdef"[..]), Ok((&b"abcdef"[..], None)));
+    assert_eq!(f_false(&b"ab"[..]), Ok((&b"ab"[..], None)));
+    assert_eq!(f_false(&b"xxx"[..]), Ok((&b"xxx"[..], None)));
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn cond_wrapping() {
+    // Test that cond!() will wrap a given identifier in the call!() macro.
+    named!(tag_abcd, tag!("abcd"));
+    fn f_true(i: &[u8]) -> IResult<&[u8], Option<&[u8]>, CustomError> {
+      fix_error!(i, CustomError, cond!(true, tag_abcd))
+    }
+
+    fn f_false(i: &[u8]) -> IResult<&[u8], Option<&[u8]>, CustomError> {
+      fix_error!(i, CustomError, cond!(false, tag_abcd))
+    }
+
+    assert_eq!(f_true(&b"abcdef"[..]), Ok((&b"ef"[..], Some(&b"abcd"[..]))));
+    assert_eq!(f_true(&b"ab"[..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(f_true(&b"xxx"[..]), Err(Err::Error(CustomError("test"))));
+
+    assert_eq!(f_false(&b"abcdef"[..]), Ok((&b"abcdef"[..], None)));
+    assert_eq!(f_false(&b"ab"[..]), Ok((&b"ab"[..], None)));
+    assert_eq!(f_false(&b"xxx"[..]), Ok((&b"xxx"[..], None)));
+  }
+
+  #[test]
+  fn peek() {
+    named!(peek_tag<&[u8],&[u8]>, peek!(tag!("abcd")));
+
+    assert_eq!(peek_tag(&b"abcdef"[..]), Ok((&b"abcdef"[..], &b"abcd"[..])));
+    assert_eq!(peek_tag(&b"ab"[..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(
+      peek_tag(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn not() {
+    named!(not_aaa<()>, not!(tag!("aaa")));
+    assert_eq!(
+      not_aaa(&b"aaa"[..]),
+      Err(Err::Error(error_position!(&b"aaa"[..], ErrorKind::Not)))
+    );
+    assert_eq!(not_aaa(&b"aa"[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(not_aaa(&b"abcd"[..]), Ok((&b"abcd"[..], ())));
+  }
+
+  #[test]
+  fn verify() {
+    named!(test, verify!(take!(5), |slice: &[u8]| slice[0] == b'a'));
+    assert_eq!(test(&b"bcd"[..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(
+      test(&b"bcdefg"[..]),
+      Err(Err::Error(error_position!(
+        &b"bcdefg"[..],
+        ErrorKind::Verify
+      )))
+    );
+    assert_eq!(test(&b"abcdefg"[..]), Ok((&b"fg"[..], &b"abcde"[..])));
+  }
+
+  #[test]
+  fn parse_to() {
+    let res: IResult<_, _, (&str, ErrorKind)> = parse_to!("ab", usize);
+
+    assert_eq!(
+      res,
+      Err(Err::Error(error_position!("ab", ErrorKind::ParseTo)))
+    );
+
+    let res: IResult<_, _, (&str, ErrorKind)> = parse_to!("42", usize);
+
+    assert_eq!(res, Ok(("", 42)));
+    //assert_eq!(ErrorKind::convert(ErrorKind::ParseTo), ErrorKind::ParseTo::<u64>);
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/combinator/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/combinator/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/combinator/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/combinator/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1138 @@
+//! General purpose combinators
+
+#![allow(unused_imports)]
+
+#[cfg(feature = "alloc")]
+use crate::lib::std::boxed::Box;
+
+use crate::error::{ErrorKind, FromExternalError, ParseError};
+use crate::internal::*;
+use crate::lib::std::borrow::Borrow;
+use crate::lib::std::convert::Into;
+#[cfg(feature = "std")]
+use crate::lib::std::fmt::Debug;
+use crate::lib::std::mem::transmute;
+use crate::lib::std::ops::{Range, RangeFrom, RangeTo};
+use crate::traits::{AsChar, InputIter, InputLength, InputTakeAtPosition, ParseTo};
+use crate::traits::{Compare, CompareResult, Offset, Slice};
+
+#[macro_use]
+mod macros;
+
+/// Return the remaining input.
+///
+/// ```rust
+/// # use nom::error::ErrorKind;
+/// use nom::combinator::rest;
+/// assert_eq!(rest::<_,(_, ErrorKind)>("abc"), Ok(("", "abc")));
+/// assert_eq!(rest::<_,(_, ErrorKind)>(""), Ok(("", "")));
+/// ```
+#[inline]
+pub fn rest<T, E: ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<RangeFrom<usize>>,
+  T: InputLength,
+{
+  Ok((input.slice(input.input_len()..), input))
+}
+
+/// Return the length of the remaining input.
+///
+/// ```rust
+/// # use nom::error::ErrorKind;
+/// use nom::combinator::rest_len;
+/// assert_eq!(rest_len::<_,(_, ErrorKind)>("abc"), Ok(("abc", 3)));
+/// assert_eq!(rest_len::<_,(_, ErrorKind)>(""), Ok(("", 0)));
+/// ```
+#[inline]
+pub fn rest_len<T, E: ParseError<T>>(input: T) -> IResult<T, usize, E>
+where
+  T: InputLength,
+{
+  let len = input.input_len();
+  Ok((input, len))
+}
+
+/// Maps a function on the result of a parser.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult,Parser};
+/// use nom::character::complete::digit1;
+/// use nom::combinator::map;
+/// # fn main() {
+///
+/// let mut parser = map(digit1, |s: &str| s.len());
+///
+/// // the parser will count how many characters were returned by digit1
+/// assert_eq!(parser.parse("123456"), Ok(("", 6)));
+///
+/// // this will fail if digit1 fails
+/// assert_eq!(parser.parse("abc"), Err(Err::Error(("abc", ErrorKind::Digit))));
+/// # }
+/// ```
+pub fn map<I, O1, O2, E, F, G>(mut first: F, mut second: G) -> impl FnMut(I) -> IResult<I, O2, E>
+where
+  F: Parser<I, O1, E>,
+  G: FnMut(O1) -> O2,
+{
+  move |input: I| {
+    let (input, o1) = first.parse(input)?;
+    Ok((input, second(o1)))
+  }
+}
+
+#[doc(hidden)]
+pub fn mapc<I, O1, O2, E, F, G>(input: I, first: F, second: G) -> IResult<I, O2, E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(O1) -> O2,
+{
+  map(first, second).parse(input)
+}
+
+/// Applies a function returning a `Result` over the result of a parser.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::character::complete::digit1;
+/// use nom::combinator::map_res;
+/// # fn main() {
+///
+/// let mut parse = map_res(digit1, |s: &str| s.parse::<u8>());
+///
+/// // the parser will convert the result of digit1 to a number
+/// assert_eq!(parse("123"), Ok(("", 123)));
+///
+/// // this will fail if digit1 fails
+/// assert_eq!(parse("abc"), Err(Err::Error(("abc", ErrorKind::Digit))));
+///
+/// // this will fail if the mapped function fails (a `u8` is too small to hold `123456`)
+/// assert_eq!(parse("123456"), Err(Err::Error(("123456", ErrorKind::MapRes))));
+/// # }
+/// ```
+pub fn map_res<I: Clone, O1, O2, E: FromExternalError<I, E2>, E2, F, G>(
+  mut first: F,
+  mut second: G,
+) -> impl FnMut(I) -> IResult<I, O2, E>
+where
+  F: Parser<I, O1, E>,
+  G: FnMut(O1) -> Result<O2, E2>,
+{
+  move |input: I| {
+    let i = input.clone();
+    let (input, o1) = first.parse(input)?;
+    match second(o1) {
+      Ok(o2) => Ok((input, o2)),
+      Err(e) => Err(Err::Error(E::from_external_error(i, ErrorKind::MapRes, e))),
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn map_resc<I: Clone, O1, O2, E: FromExternalError<I, E2>, E2, F, G>(
+  input: I,
+  first: F,
+  second: G,
+) -> IResult<I, O2, E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(O1) -> Result<O2, E2>,
+{
+  map_res(first, second)(input)
+}
+
+/// Applies a function returning an `Option` over the result of a parser.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::character::complete::digit1;
+/// use nom::combinator::map_opt;
+/// # fn main() {
+///
+/// let mut parse = map_opt(digit1, |s: &str| s.parse::<u8>().ok());
+///
+/// // the parser will convert the result of digit1 to a number
+/// assert_eq!(parse("123"), Ok(("", 123)));
+///
+/// // this will fail if digit1 fails
+/// assert_eq!(parse("abc"), Err(Err::Error(("abc", ErrorKind::Digit))));
+///
+/// // this will fail if the mapped function fails (a `u8` is too small to hold `123456`)
+/// assert_eq!(parse("123456"), Err(Err::Error(("123456", ErrorKind::MapOpt))));
+/// # }
+/// ```
+pub fn map_opt<I: Clone, O1, O2, E: ParseError<I>, F, G>(
+  mut first: F,
+  mut second: G,
+) -> impl FnMut(I) -> IResult<I, O2, E>
+where
+  F: Parser<I, O1, E>,
+  G: FnMut(O1) -> Option<O2>,
+{
+  move |input: I| {
+    let i = input.clone();
+    let (input, o1) = first.parse(input)?;
+    match second(o1) {
+      Some(o2) => Ok((input, o2)),
+      None => Err(Err::Error(E::from_error_kind(i, ErrorKind::MapOpt))),
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn map_optc<I: Clone, O1, O2, E: ParseError<I>, F, G>(
+  input: I,
+  first: F,
+  second: G,
+) -> IResult<I, O2, E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(O1) -> Option<O2>,
+{
+  map_opt(first, second)(input)
+}
+
+/// Applies a parser over the result of another one.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::character::complete::digit1;
+/// use nom::bytes::complete::take;
+/// use nom::combinator::map_parser;
+/// # fn main() {
+///
+/// let mut parse = map_parser(take(5u8), digit1);
+///
+/// assert_eq!(parse("12345"), Ok(("", "12345")));
+/// assert_eq!(parse("123ab"), Ok(("", "123")));
+/// assert_eq!(parse("123"), Err(Err::Error(("123", ErrorKind::Eof))));
+/// # }
+/// ```
+pub fn map_parser<I: Clone, O1, O2, E: ParseError<I>, F, G>(
+  mut first: F,
+  mut second: G,
+) -> impl FnMut(I) -> IResult<I, O2, E>
+where
+  F: Parser<I, O1, E>,
+  G: Parser<O1, O2, E>,
+  O1: InputLength,
+{
+  move |input: I| {
+    let (input, o1) = first.parse(input)?;
+    let (_, o2) = second.parse(o1)?;
+    Ok((input, o2))
+  }
+}
+
+#[doc(hidden)]
+pub fn map_parserc<I: Clone, O1, O2, E: ParseError<I>, F, G>(
+  input: I,
+  first: F,
+  second: G,
+) -> IResult<I, O2, E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(O1) -> IResult<O1, O2, E>,
+  O1: InputLength,
+{
+  map_parser(first, second)(input)
+}
+
+/// Creates a new parser from the output of the first parser, then apply that parser over the rest of the input.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::bytes::complete::take;
+/// use nom::number::complete::u8;
+/// use nom::combinator::flat_map;
+/// # fn main() {
+///
+/// let mut parse = flat_map(u8, take);
+///
+/// assert_eq!(parse(&[2, 0, 1, 2][..]), Ok((&[2][..], &[0, 1][..])));
+/// assert_eq!(parse(&[4, 0, 1, 2][..]), Err(Err::Error((&[0, 1, 2][..], ErrorKind::Eof))));
+/// # }
+/// ```
+pub fn flat_map<I, O1, O2, E: ParseError<I>, F, G, H>(
+  mut first: F,
+  second: G,
+) -> impl FnMut(I) -> IResult<I, O2, E>
+where
+  F: Parser<I, O1, E>,
+  G: Fn(O1) -> H,
+  H: Parser<I, O2, E>,
+{
+  move |input: I| {
+    let (input, o1) = first.parse(input)?;
+    second(o1).parse(input)
+  }
+}
+
+/// Optional parser: Will return `None` if not successful.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::opt;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+/// fn parser(i: &str) -> IResult<&str, Option<&str>> {
+///   opt(alpha1)(i)
+/// }
+///
+/// assert_eq!(parser("abcd;"), Ok((";", Some("abcd"))));
+/// assert_eq!(parser("123;"), Ok(("123;", None)));
+/// # }
+/// ```
+pub fn opt<I: Clone, O, E: ParseError<I>, F>(mut f: F) -> impl FnMut(I) -> IResult<I, Option<O>, E>
+where
+  F: Parser<I, O, E>,
+{
+  move |input: I| {
+    let i = input.clone();
+    match f.parse(input) {
+      Ok((i, o)) => Ok((i, Some(o))),
+      Err(Err::Error(_)) => Ok((i, None)),
+      Err(e) => Err(e),
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn optc<I: Clone, O, E: ParseError<I>, F>(input: I, f: F) -> IResult<I, Option<O>, E>
+where
+  F: Fn(I) -> IResult<I, O, E>,
+{
+  opt(f)(input)
+}
+
+/// Calls the parser if the condition is met.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, IResult};
+/// use nom::combinator::cond;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+/// fn parser(b: bool, i: &str) -> IResult<&str, Option<&str>> {
+///   cond(b, alpha1)(i)
+/// }
+///
+/// assert_eq!(parser(true, "abcd;"), Ok((";", Some("abcd"))));
+/// assert_eq!(parser(false, "abcd;"), Ok(("abcd;", None)));
+/// assert_eq!(parser(true, "123;"), Err(Err::Error(Error::new("123;", ErrorKind::Alpha))));
+/// assert_eq!(parser(false, "123;"), Ok(("123;", None)));
+/// # }
+/// ```
+pub fn cond<I, O, E: ParseError<I>, F>(
+  b: bool,
+  mut f: F,
+) -> impl FnMut(I) -> IResult<I, Option<O>, E>
+where
+  F: Parser<I, O, E>,
+{
+  move |input: I| {
+    if b {
+      match f.parse(input) {
+        Ok((i, o)) => Ok((i, Some(o))),
+        Err(e) => Err(e),
+      }
+    } else {
+      Ok((input, None))
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn condc<I, O, E: ParseError<I>, F>(input: I, b: bool, f: F) -> IResult<I, Option<O>, E>
+where
+  F: Fn(I) -> IResult<I, O, E>,
+{
+  cond(b, f)(input)
+}
+
+/// Tries to apply its parser without consuming the input.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::peek;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+/// let mut parser = peek(alpha1);
+///
+/// assert_eq!(parser("abcd;"), Ok(("abcd;", "abcd")));
+/// assert_eq!(parser("123;"), Err(Err::Error(("123;", ErrorKind::Alpha))));
+/// # }
+/// ```
+pub fn peek<I: Clone, O, E: ParseError<I>, F>(mut f: F) -> impl FnMut(I) -> IResult<I, O, E>
+where
+  F: Parser<I, O, E>,
+{
+  move |input: I| {
+    let i = input.clone();
+    match f.parse(input) {
+      Ok((_, o)) => Ok((i, o)),
+      Err(e) => Err(e),
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn peekc<I: Clone, O, E: ParseError<I>, F>(input: I, f: F) -> IResult<I, O, E>
+where
+  F: Fn(I) -> IResult<I, O, E>,
+{
+  peek(f)(input)
+}
+
+/// returns its input if it is at the end of input data
+///
+/// When we're at the end of the data, this combinator
+/// will succeed
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use std::str;
+/// # use nom::{Err, error::ErrorKind, IResult};
+/// # use nom::combinator::eof;
+///
+/// # fn main() {
+/// let parser = eof;
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Eof))));
+/// assert_eq!(parser(""), Ok(("", "")));
+/// # }
+/// ```
+pub fn eof<I: InputLength + Clone, E: ParseError<I>>(input: I) -> IResult<I, I, E> {
+  if input.input_len() == 0 {
+    let clone = input.clone();
+    Ok((input, clone))
+  } else {
+    Err(Err::Error(E::from_error_kind(input, ErrorKind::Eof)))
+  }
+}
+
+/// Transforms Incomplete into `Error`.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::bytes::streaming::take;
+/// use nom::combinator::complete;
+/// # fn main() {
+///
+/// let mut parser = complete(take(5u8));
+///
+/// assert_eq!(parser("abcdefg"), Ok(("fg", "abcde")));
+/// assert_eq!(parser("abcd"), Err(Err::Error(("abcd", ErrorKind::Complete))));
+/// # }
+/// ```
+pub fn complete<I: Clone, O, E: ParseError<I>, F>(mut f: F) -> impl FnMut(I) -> IResult<I, O, E>
+where
+  F: Parser<I, O, E>,
+{
+  move |input: I| {
+    let i = input.clone();
+    match f.parse(input) {
+      Err(Err::Incomplete(_)) => Err(Err::Error(E::from_error_kind(i, ErrorKind::Complete))),
+      rest => rest,
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn completec<I: Clone, O, E: ParseError<I>, F>(input: I, f: F) -> IResult<I, O, E>
+where
+  F: Fn(I) -> IResult<I, O, E>,
+{
+  complete(f)(input)
+}
+
+/// Succeeds if all the input has been consumed by its child parser.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::all_consuming;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+/// let mut parser = all_consuming(alpha1);
+///
+/// assert_eq!(parser("abcd"), Ok(("", "abcd")));
+/// assert_eq!(parser("abcd;"),Err(Err::Error((";", ErrorKind::Eof))));
+/// assert_eq!(parser("123abcd;"),Err(Err::Error(("123abcd;", ErrorKind::Alpha))));
+/// # }
+/// ```
+pub fn all_consuming<I, O, E: ParseError<I>, F>(mut f: F) -> impl FnMut(I) -> IResult<I, O, E>
+where
+  I: InputLength,
+  F: Parser<I, O, E>,
+{
+  move |input: I| {
+    let (input, res) = f.parse(input)?;
+    if input.input_len() == 0 {
+      Ok((input, res))
+    } else {
+      Err(Err::Error(E::from_error_kind(input, ErrorKind::Eof)))
+    }
+  }
+}
+
+/// Returns the result of the child parser if it satisfies a verification function.
+///
+/// The verification function takes as argument a reference to the output of the
+/// parser.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::verify;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+/// let mut parser = verify(alpha1, |s: &str| s.len() == 4);
+///
+/// assert_eq!(parser("abcd"), Ok(("", "abcd")));
+/// assert_eq!(parser("abcde"), Err(Err::Error(("abcde", ErrorKind::Verify))));
+/// assert_eq!(parser("123abcd;"),Err(Err::Error(("123abcd;", ErrorKind::Alpha))));
+/// # }
+/// ```
+pub fn verify<I: Clone, O1, O2, E: ParseError<I>, F, G>(
+  mut first: F,
+  second: G,
+) -> impl FnMut(I) -> IResult<I, O1, E>
+where
+  F: Parser<I, O1, E>,
+  G: Fn(&O2) -> bool,
+  O1: Borrow<O2>,
+  O2: ?Sized,
+{
+  move |input: I| {
+    let i = input.clone();
+    let (input, o) = first.parse(input)?;
+
+    if second(o.borrow()) {
+      Ok((input, o))
+    } else {
+      Err(Err::Error(E::from_error_kind(i, ErrorKind::Verify)))
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn verifyc<I: Clone, O1, O2, E: ParseError<I>, F, G>(
+  input: I,
+  first: F,
+  second: G,
+) -> IResult<I, O1, E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(&O2) -> bool,
+  O1: Borrow<O2>,
+  O2: ?Sized,
+{
+  verify(first, second)(input)
+}
+
+/// Returns the provided value if the child parser succeeds.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::value;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+/// let mut parser = value(1234, alpha1);
+///
+/// assert_eq!(parser("abcd"), Ok(("", 1234)));
+/// assert_eq!(parser("123abcd;"), Err(Err::Error(("123abcd;", ErrorKind::Alpha))));
+/// # }
+/// ```
+pub fn value<I, O1: Clone, O2, E: ParseError<I>, F>(
+  val: O1,
+  mut parser: F,
+) -> impl FnMut(I) -> IResult<I, O1, E>
+where
+  F: Parser<I, O2, E>,
+{
+  move |input: I| parser.parse(input).map(|(i, _)| (i, val.clone()))
+}
+
+#[doc(hidden)]
+pub fn valuec<I, O1: Clone, O2, E: ParseError<I>, F>(
+  input: I,
+  val: O1,
+  parser: F,
+) -> IResult<I, O1, E>
+where
+  F: Fn(I) -> IResult<I, O2, E>,
+{
+  value(val, parser)(input)
+}
+
+/// Succeeds if the child parser returns an error.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::not;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+/// let mut parser = not(alpha1);
+///
+/// assert_eq!(parser("123"), Ok(("123", ())));
+/// assert_eq!(parser("abcd"), Err(Err::Error(("abcd", ErrorKind::Not))));
+/// # }
+/// ```
+pub fn not<I: Clone, O, E: ParseError<I>, F>(mut parser: F) -> impl FnMut(I) -> IResult<I, (), E>
+where
+  F: Parser<I, O, E>,
+{
+  move |input: I| {
+    let i = input.clone();
+    match parser.parse(input) {
+      Ok(_) => Err(Err::Error(E::from_error_kind(i, ErrorKind::Not))),
+      Err(Err::Error(_)) => Ok((i, ())),
+      Err(e) => Err(e),
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn notc<I: Clone, O, E: ParseError<I>, F>(input: I, parser: F) -> IResult<I, (), E>
+where
+  F: Fn(I) -> IResult<I, O, E>,
+{
+  not(parser)(input)
+}
+
+/// If the child parser was successful, return the consumed input as produced value.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::recognize;
+/// use nom::character::complete::{char, alpha1};
+/// use nom::sequence::separated_pair;
+/// # fn main() {
+///
+/// let mut parser = recognize(separated_pair(alpha1, char(','), alpha1));
+///
+/// assert_eq!(parser("abcd,efgh"), Ok(("", "abcd,efgh")));
+/// assert_eq!(parser("abcd;"),Err(Err::Error((";", ErrorKind::Char))));
+/// # }
+/// ```
+pub fn recognize<I: Clone + Offset + Slice<RangeTo<usize>>, O, E: ParseError<I>, F>(
+  mut parser: F,
+) -> impl FnMut(I) -> IResult<I, I, E>
+where
+  F: Parser<I, O, E>,
+{
+  move |input: I| {
+    let i = input.clone();
+    match parser.parse(i) {
+      Ok((i, _)) => {
+        let index = input.offset(&i);
+        Ok((i, input.slice(..index)))
+      }
+      Err(e) => Err(e),
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn recognizec<I: Clone + Offset + Slice<RangeTo<usize>>, O, E: ParseError<I>, F>(
+  input: I,
+  parser: F,
+) -> IResult<I, I, E>
+where
+  F: Fn(I) -> IResult<I, O, E>,
+{
+  recognize(parser)(input)
+}
+
+/// if the child parser was successful, return the consumed input with the output
+/// as a tuple. Functions similarly to [recognize](fn.recognize.html) except it
+/// returns the parser output as well.
+///
+/// This can be useful especially in cases where the output is not the same type
+/// as the input, or the input is a user defined type.
+///
+/// Returned tuple is of the format `(consumed input, produced output)`.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::{consumed, value, recognize, map};
+/// use nom::character::complete::{char, alpha1};
+/// use nom::bytes::complete::tag;
+/// use nom::sequence::separated_pair;
+///
+/// fn inner_parser(input: &str) -> IResult<&str, bool> {
+///     value(true, tag("1234"))(input)
+/// }
+///
+/// # fn main() {
+///
+/// let mut consumed_parser = consumed(value(true, separated_pair(alpha1, char(','), alpha1)));
+///
+/// assert_eq!(consumed_parser("abcd,efgh1"), Ok(("1", ("abcd,efgh", true))));
+/// assert_eq!(consumed_parser("abcd;"),Err(Err::Error((";", ErrorKind::Char))));
+///
+///
+/// // the first output (representing the consumed input)
+/// // should be the same as that of the `recognize` parser.
+/// let mut recognize_parser = recognize(inner_parser);
+/// let mut consumed_parser = map(consumed(inner_parser), |(consumed, output)| consumed);
+///
+/// assert_eq!(recognize_parser("1234"), consumed_parser("1234"));
+/// assert_eq!(recognize_parser("abcd"), consumed_parser("abcd"));
+/// # }
+/// ```
+pub fn consumed<I, O, F, E>(mut parser: F) -> impl FnMut(I) -> IResult<I, (I, O), E>
+where
+  I: Clone + Offset + Slice<RangeTo<usize>>,
+  E: ParseError<I>,
+  F: Parser<I, O, E>,
+{
+  move |input: I| {
+    let i = input.clone();
+    match parser.parse(i) {
+      Ok((remaining, result)) => {
+        let index = input.offset(&remaining);
+        let consumed = input.slice(..index);
+        Ok((remaining, (consumed, result)))
+      }
+      Err(e) => Err(e),
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn consumedc<I, O, E: ParseError<I>, F>(input: I, parser: F) -> IResult<I, (I, O), E>
+where
+  I: Clone + Offset + Slice<RangeTo<usize>>,
+  E: ParseError<E>,
+  F: Fn(I) -> IResult<I, O, E>,
+{
+  consumed(parser)(input)
+}
+
+/// transforms an error to failure
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::combinator::cut;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+/// let mut parser = cut(alpha1);
+///
+/// assert_eq!(parser("abcd;"), Ok((";", "abcd")));
+/// assert_eq!(parser("123;"), Err(Err::Failure(("123;", ErrorKind::Alpha))));
+/// # }
+/// ```
+pub fn cut<I, O, E: ParseError<I>, F>(mut parser: F) -> impl FnMut(I) -> IResult<I, O, E>
+where
+  F: Parser<I, O, E>,
+{
+  move |input: I| match parser.parse(input) {
+    Err(Err::Error(e)) => Err(Err::Failure(e)),
+    rest => rest,
+  }
+}
+
+#[doc(hidden)]
+pub fn cutc<I, O, E: ParseError<I>, F>(input: I, parser: F) -> IResult<I, O, E>
+where
+  F: Fn(I) -> IResult<I, O, E>,
+{
+  cut(parser)(input)
+}
+
+/// automatically converts the child parser's result to another type
+///
+/// it will be able to convert the output value and the error value
+/// as long as the `Into` implementations are available
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::IResult;
+/// use nom::combinator::into;
+/// use nom::character::complete::alpha1;
+/// # fn main() {
+///
+///  fn parser1(i: &str) -> IResult<&str, &str> {
+///    alpha1(i)
+///  }
+///
+///  let mut parser2 = into(parser1);
+///
+/// // the parser converts the &str output of the child parser into a Vec<u8>
+/// let bytes: IResult<&str, Vec<u8>> = parser2("abcd");
+/// assert_eq!(bytes, Ok(("", vec![97, 98, 99, 100])));
+/// # }
+/// ```
+pub fn into<I, O1, O2, E1, E2, F>(mut parser: F) -> impl FnMut(I) -> IResult<I, O2, E2>
+where
+  O1: Into<O2>,
+  E1: Into<E2>,
+  E1: ParseError<I>,
+  E2: ParseError<I>,
+  F: Parser<I, O1, E1>,
+{
+  //map(parser, Into::into)
+  move |input: I| match parser.parse(input) {
+    Ok((i, o)) => Ok((i, o.into())),
+    Err(Err::Error(e)) => Err(Err::Error(e.into())),
+    Err(Err::Failure(e)) => Err(Err::Failure(e.into())),
+    Err(Err::Incomplete(e)) => Err(Err::Incomplete(e)),
+  }
+}
+
+#[doc(hidden)]
+pub fn intoc<I, O1, O2, E1, E2, F>(input: I, parser: F) -> IResult<I, O2, E2>
+where
+  O1: Into<O2>,
+  E1: Into<E2>,
+  E1: ParseError<I>,
+  E2: ParseError<I>,
+  F: Parser<I, O1, E1>,
+{
+  into(parser)(input)
+}
+
+/// Creates an iterator from input data and a parser.
+///
+/// Call the iterator's [ParserIterator::finish] method to get the remaining input if successful,
+/// or the error value if we encountered an error.
+///
+/// ```rust
+/// use nom::{combinator::iterator, IResult, bytes::complete::tag, character::complete::alpha1, sequence::terminated};
+/// use std::collections::HashMap;
+///
+/// let data = "abc|defg|hijkl|mnopqr|123";
+/// let mut it = iterator(data, terminated(alpha1, tag("|")));
+///
+/// let parsed = it.map(|v| (v, v.len())).collect::<HashMap<_,_>>();
+/// let res: IResult<_,_> = it.finish();
+///
+/// assert_eq!(parsed, [("abc", 3usize), ("defg", 4), ("hijkl", 5), ("mnopqr", 6)].iter().cloned().collect());
+/// assert_eq!(res, Ok(("123", ())));
+/// ```
+pub fn iterator<Input, Output, Error, F>(input: Input, f: F) -> ParserIterator<Input, Error, F>
+where
+  F: Parser<Input, Output, Error>,
+  Error: ParseError<Input>,
+{
+  ParserIterator {
+    iterator: f,
+    input,
+    state: Some(State::Running),
+  }
+}
+
+/// Main structure associated to the [iterator] function.
+pub struct ParserIterator<I, E, F> {
+  iterator: F,
+  input: I,
+  state: Option<State<E>>,
+}
+
+impl<I: Clone, E, F> ParserIterator<I, E, F> {
+  /// Returns the remaining input if parsing was successful, or the error if we encountered an error.
+  pub fn finish(mut self) -> IResult<I, (), E> {
+    match self.state.take().unwrap() {
+      State::Running | State::Done => Ok((self.input, ())),
+      State::Failure(e) => Err(Err::Failure(e)),
+      State::Incomplete(i) => Err(Err::Incomplete(i)),
+    }
+  }
+}
+
+impl<'a, Input, Output, Error, F> core::iter::Iterator for &'a mut ParserIterator<Input, Error, F>
+where
+  F: FnMut(Input) -> IResult<Input, Output, Error>,
+  Input: Clone,
+{
+  type Item = Output;
+
+  fn next(&mut self) -> Option<Self::Item> {
+    if let State::Running = self.state.take().unwrap() {
+      let input = self.input.clone();
+
+      match (self.iterator)(input) {
+        Ok((i, o)) => {
+          self.input = i;
+          self.state = Some(State::Running);
+          Some(o)
+        }
+        Err(Err::Error(_)) => {
+          self.state = Some(State::Done);
+          None
+        }
+        Err(Err::Failure(e)) => {
+          self.state = Some(State::Failure(e));
+          None
+        }
+        Err(Err::Incomplete(i)) => {
+          self.state = Some(State::Incomplete(i));
+          None
+        }
+      }
+    } else {
+      None
+    }
+  }
+}
+
+enum State<E> {
+  Running,
+  Done,
+  Failure(E),
+  Incomplete(Needed),
+}
+
+/// a parser which always succeeds with given value without consuming any input.
+///
+/// It can be used for example as the last alternative in `alt` to
+/// specify the default case.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,error::ErrorKind, IResult};
+/// use nom::branch::alt;
+/// use nom::combinator::{success, value};
+/// use nom::character::complete::char;
+/// # fn main() {
+///
+/// let mut parser = success::<_,_,(_,ErrorKind)>(10);
+/// assert_eq!(parser("xyz"), Ok(("xyz", 10)));
+///
+/// let mut sign = alt((value(-1, char('-')), value(1, char('+')), success::<_,_,(_,ErrorKind)>(1)));
+/// assert_eq!(sign("+10"), Ok(("10", 1)));
+/// assert_eq!(sign("-10"), Ok(("10", -1)));
+/// assert_eq!(sign("10"), Ok(("10", 1)));
+/// # }
+/// ```
+pub fn success<I, O: Clone, E: ParseError<I>>(val: O) -> impl Fn(I) -> IResult<I, O, E> {
+  move |input: I| Ok((input, val.clone()))
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::bytes::complete::take;
+  use crate::error::ParseError;
+  use crate::internal::{Err, IResult, Needed};
+  use crate::number::complete::u8;
+
+  macro_rules! assert_parse(
+    ($left: expr, $right: expr) => {
+      let res: $crate::IResult<_, _, (_, ErrorKind)> = $left;
+      assert_eq!(res, $right);
+    };
+  );
+
+  /*#[test]
+  fn t1() {
+    let v1:Vec<u8> = vec![1,2,3];
+    let v2:Vec<u8> = vec![4,5,6];
+    let d = Ok((&v1[..], &v2[..]));
+    let res = d.flat_map(print);
+    assert_eq!(res, Ok((&v2[..], ())));
+  }*/
+
+  #[test]
+  fn eof_on_slices() {
+    let not_over: &[u8] = &b"Hello, world!"[..];
+    let is_over: &[u8] = &b""[..];
+
+    let res_not_over = eof(not_over);
+    assert_parse!(
+      res_not_over,
+      Err(Err::Error(error_position!(not_over, ErrorKind::Eof)))
+    );
+
+    let res_over = eof(is_over);
+    assert_parse!(res_over, Ok((is_over, is_over)));
+  }
+
+  #[test]
+  fn eof_on_strs() {
+    let not_over: &str = "Hello, world!";
+    let is_over: &str = "";
+
+    let res_not_over = eof(not_over);
+    assert_parse!(
+      res_not_over,
+      Err(Err::Error(error_position!(not_over, ErrorKind::Eof)))
+    );
+
+    let res_over = eof(is_over);
+    assert_parse!(res_over, Ok((is_over, is_over)));
+  }
+
+  /*
+  #[test]
+  fn end_of_input() {
+      let not_over = &b"Hello, world!"[..];
+      let is_over = &b""[..];
+      named!(eof_test, eof!());
+
+      let res_not_over = eof_test(not_over);
+      assert_eq!(res_not_over, Err(Err::Error(error_position!(not_over, ErrorKind::Eof))));
+
+      let res_over = eof_test(is_over);
+      assert_eq!(res_over, Ok((is_over, is_over)));
+  }
+  */
+
+  #[test]
+  fn rest_on_slices() {
+    let input: &[u8] = &b"Hello, world!"[..];
+    let empty: &[u8] = &b""[..];
+    assert_parse!(rest(input), Ok((empty, input)));
+  }
+
+  #[test]
+  fn rest_on_strs() {
+    let input: &str = "Hello, world!";
+    let empty: &str = "";
+    assert_parse!(rest(input), Ok((empty, input)));
+  }
+
+  #[test]
+  fn rest_len_on_slices() {
+    let input: &[u8] = &b"Hello, world!"[..];
+    assert_parse!(rest_len(input), Ok((input, input.len())));
+  }
+
+  use crate::lib::std::convert::From;
+  impl From<u32> for CustomError {
+    fn from(_: u32) -> Self {
+      CustomError
+    }
+  }
+
+  impl<I> ParseError<I> for CustomError {
+    fn from_error_kind(_: I, _: ErrorKind) -> Self {
+      CustomError
+    }
+
+    fn append(_: I, _: ErrorKind, _: CustomError) -> Self {
+      CustomError
+    }
+  }
+
+  struct CustomError;
+  #[allow(dead_code)]
+  fn custom_error(input: &[u8]) -> IResult<&[u8], &[u8], CustomError> {
+    //fix_error!(input, CustomError, alphanumeric)
+    crate::character::streaming::alphanumeric1(input)
+  }
+
+  #[test]
+  fn test_flat_map() {
+    let input: &[u8] = &[3, 100, 101, 102, 103, 104][..];
+    assert_parse!(
+      flat_map(u8, take)(input),
+      Ok((&[103, 104][..], &[100, 101, 102][..]))
+    );
+  }
+
+  #[test]
+  fn test_map_opt() {
+    let input: &[u8] = &[50][..];
+    assert_parse!(
+      map_opt(u8, |u| if u < 20 { Some(u) } else { None })(input),
+      Err(Err::Error((&[50][..], ErrorKind::MapOpt)))
+    );
+    assert_parse!(
+      map_opt(u8, |u| if u > 20 { Some(u) } else { None })(input),
+      Ok((&[][..], 50))
+    );
+  }
+
+  #[test]
+  fn test_map_parser() {
+    let input: &[u8] = &[100, 101, 102, 103, 104][..];
+    assert_parse!(
+      map_parser(take(4usize), take(2usize))(input),
+      Ok((&[104][..], &[100, 101][..]))
+    );
+  }
+
+  #[test]
+  fn test_all_consuming() {
+    let input: &[u8] = &[100, 101, 102][..];
+    assert_parse!(
+      all_consuming(take(2usize))(input),
+      Err(Err::Error((&[102][..], ErrorKind::Eof)))
+    );
+    assert_parse!(
+      all_consuming(take(3usize))(input),
+      Ok((&[][..], &[100, 101, 102][..]))
+    );
+  }
+
+  #[test]
+  #[allow(unused)]
+  fn test_verify_ref() {
+    use crate::bytes::complete::take;
+
+    let mut parser1 = verify(take(3u8), |s: &[u8]| s == &b"abc"[..]);
+
+    assert_eq!(parser1(&b"abcd"[..]), Ok((&b"d"[..], &b"abc"[..])));
+    assert_eq!(
+      parser1(&b"defg"[..]),
+      Err(Err::Error((&b"defg"[..], ErrorKind::Verify)))
+    );
+
+    fn parser2(i: &[u8]) -> IResult<&[u8], u32> {
+      verify(crate::number::streaming::be_u32, |val: &u32| *val < 3)(i)
+    }
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn test_verify_alloc() {
+    use crate::bytes::complete::take;
+    let mut parser1 = verify(map(take(3u8), |s: &[u8]| s.to_vec()), |s: &[u8]| {
+      s == &b"abc"[..]
+    });
+
+    assert_eq!(parser1(&b"abcd"[..]), Ok((&b"d"[..], (&b"abc").to_vec())));
+    assert_eq!(
+      parser1(&b"defg"[..]),
+      Err(Err::Error((&b"defg"[..], ErrorKind::Verify)))
+    );
+  }
+
+  #[test]
+  #[cfg(feature = "std")]
+  fn test_into() {
+    use crate::bytes::complete::take;
+    use crate::{
+      error::{Error, ParseError},
+      Err,
+    };
+
+    let mut parser = into(take::<_, _, Error<_>>(3u8));
+    let result: IResult<&[u8], Vec<u8>> = parser(&b"abcdefg"[..]);
+
+    assert_eq!(result, Ok((&b"defg"[..], vec![97, 98, 99])));
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,889 @@
+//! Error management
+//!
+//! Parsers are generic over their error type, requiring that it implements
+//! the `error::ParseError<Input>` trait.
+
+use crate::internal::Parser;
+use crate::lib::std::fmt;
+
+/// This trait must be implemented by the error type of a nom parser.
+///
+/// There are already implementations of it for `(Input, ErrorKind)`
+/// and `VerboseError<Input>`.
+///
+/// It provides methods to create an error from some combinators,
+/// and combine existing errors in combinators like `alt`.
+pub trait ParseError<I>: Sized {
+  /// Creates an error from the input position and an [ErrorKind]
+  fn from_error_kind(input: I, kind: ErrorKind) -> Self;
+
+  /// Combines an existing error with a new one created from the input
+  /// position and an [ErrorKind]. This is useful when backtracking
+  /// through a parse tree, accumulating error context on the way
+  fn append(input: I, kind: ErrorKind, other: Self) -> Self;
+
+  /// Creates an error from an input position and an expected character
+  fn from_char(input: I, _: char) -> Self {
+    Self::from_error_kind(input, ErrorKind::Char)
+  }
+
+  /// Combines two existing errors. This function is used to compare errors
+  /// generated in various branches of [alt]
+  fn or(self, other: Self) -> Self {
+    other
+  }
+}
+
+/// This trait is required by the `context` combinator to add a static string
+/// to an existing error
+pub trait ContextError<I>: Sized {
+  /// Creates a new error from an input position, a static string and an existing error.
+  /// This is used mainly in the [context] combinator, to add user friendly information
+  /// to errors when backtracking through a parse tree
+  fn add_context(_input: I, _ctx: &'static str, other: Self) -> Self {
+    other
+  }
+}
+
+/// This trait is required by the [map_res] combinator to integrate
+/// error types from external functions, like [std::str::FromStr]
+pub trait FromExternalError<I, E> {
+  /// Creates a new error from an input position, an [ErrorKind] indicating the
+  /// wrapping parser, and an external error
+  fn from_external_error(input: I, kind: ErrorKind, e: E) -> Self;
+}
+
+/// default error type, only contains the error' location and code
+#[derive(Debug, PartialEq)]
+pub struct Error<I> {
+  /// position of the error in the input data
+  pub input: I,
+  /// nom error code
+  pub code: ErrorKind,
+}
+
+impl<I> Error<I> {
+  /// creates a new basic error
+  pub fn new(input: I, code: ErrorKind) -> Error<I> {
+    Error { input, code }
+  }
+}
+
+impl<I> ParseError<I> for Error<I> {
+  fn from_error_kind(input: I, kind: ErrorKind) -> Self {
+    Error { input, code: kind }
+  }
+
+  fn append(_: I, _: ErrorKind, other: Self) -> Self {
+    other
+  }
+}
+
+impl<I> ContextError<I> for Error<I> {}
+
+impl<I, E> FromExternalError<I, E> for Error<I> {
+  /// Create a new error from an input position and an external error
+  fn from_external_error(input: I, kind: ErrorKind, _e: E) -> Self {
+    Error { input, code: kind }
+  }
+}
+
+/// The Display implementation allows the std::error::Error implementation
+impl<I: fmt::Display> fmt::Display for Error<I> {
+  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    write!(f, "error {:?} at: {}", self.code, self.input)
+  }
+}
+
+#[cfg(feature = "std")]
+impl<I: fmt::Debug + fmt::Display> std::error::Error for Error<I> {}
+
+// for backward compatibility, keep those trait implementations
+// for the previously used error type
+impl<I> ParseError<I> for (I, ErrorKind) {
+  fn from_error_kind(input: I, kind: ErrorKind) -> Self {
+    (input, kind)
+  }
+
+  fn append(_: I, _: ErrorKind, other: Self) -> Self {
+    other
+  }
+}
+
+impl<I> ContextError<I> for (I, ErrorKind) {}
+
+impl<I, E> FromExternalError<I, E> for (I, ErrorKind) {
+  fn from_external_error(input: I, kind: ErrorKind, _e: E) -> Self {
+    (input, kind)
+  }
+}
+
+impl<I> ParseError<I> for () {
+  fn from_error_kind(_: I, _: ErrorKind) -> Self {}
+
+  fn append(_: I, _: ErrorKind, _: Self) -> Self {}
+}
+
+impl<I> ContextError<I> for () {}
+
+impl<I, E> FromExternalError<I, E> for () {
+  fn from_external_error(_input: I, _kind: ErrorKind, _e: E) -> Self {}
+}
+
+/// Creates an error from the input position and an [ErrorKind]
+pub fn make_error<I, E: ParseError<I>>(input: I, kind: ErrorKind) -> E {
+  E::from_error_kind(input, kind)
+}
+
+/// Combines an existing error with a new one created from the input
+/// position and an [ErrorKind]. This is useful when backtracking
+/// through a parse tree, accumulating error context on the way
+pub fn append_error<I, E: ParseError<I>>(input: I, kind: ErrorKind, other: E) -> E {
+  E::append(input, kind, other)
+}
+
+/// This error type accumulates errors and their position when backtracking
+/// through a parse tree. With some post processing (cf `examples/json.rs`),
+/// it can be used to display user friendly error messages
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[derive(Clone, Debug, PartialEq)]
+pub struct VerboseError<I> {
+  /// List of errors accumulated by `VerboseError`, containing the affected
+  /// part of input data, and some context
+  pub errors: crate::lib::std::vec::Vec<(I, VerboseErrorKind)>,
+}
+
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[derive(Clone, Debug, PartialEq)]
+/// Error context for `VerboseError`
+pub enum VerboseErrorKind {
+  /// Static string added by the `context` function
+  Context(&'static str),
+  /// Indicates which character was expected by the `char` function
+  Char(char),
+  /// Error kind given by various nom parsers
+  Nom(ErrorKind),
+}
+
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+impl<I> ParseError<I> for VerboseError<I> {
+  fn from_error_kind(input: I, kind: ErrorKind) -> Self {
+    VerboseError {
+      errors: vec![(input, VerboseErrorKind::Nom(kind))],
+    }
+  }
+
+  fn append(input: I, kind: ErrorKind, mut other: Self) -> Self {
+    other.errors.push((input, VerboseErrorKind::Nom(kind)));
+    other
+  }
+
+  fn from_char(input: I, c: char) -> Self {
+    VerboseError {
+      errors: vec![(input, VerboseErrorKind::Char(c))],
+    }
+  }
+}
+
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+impl<I> ContextError<I> for VerboseError<I> {
+  fn add_context(input: I, ctx: &'static str, mut other: Self) -> Self {
+    other.errors.push((input, VerboseErrorKind::Context(ctx)));
+    other
+  }
+}
+
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+impl<I, E> FromExternalError<I, E> for VerboseError<I> {
+  /// Create a new error from an input position and an external error
+  fn from_external_error(input: I, kind: ErrorKind, _e: E) -> Self {
+    Self::from_error_kind(input, kind)
+  }
+}
+
+#[cfg(feature = "alloc")]
+impl<I: fmt::Display> fmt::Display for VerboseError<I> {
+  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    writeln!(f, "Parse error:")?;
+    for (input, error) in &self.errors {
+      match error {
+        VerboseErrorKind::Nom(e) => writeln!(f, "{:?} at: {}", e, input)?,
+        VerboseErrorKind::Char(c) => writeln!(f, "expected '{}' at: {}", c, input)?,
+        VerboseErrorKind::Context(s) => writeln!(f, "in section '{}', at: {}", s, input)?,
+      }
+    }
+
+    Ok(())
+  }
+}
+
+#[cfg(feature = "std")]
+impl<I: fmt::Debug + fmt::Display> std::error::Error for VerboseError<I> {}
+
+use crate::internal::{Err, IResult};
+
+/// Create a new error from an input position, a static string and an existing error.
+/// This is used mainly in the [context] combinator, to add user friendly information
+/// to errors when backtracking through a parse tree
+pub fn context<I: Clone, E: ContextError<I>, F, O>(
+  context: &'static str,
+  mut f: F,
+) -> impl FnMut(I) -> IResult<I, O, E>
+where
+  F: Parser<I, O, E>,
+{
+  move |i: I| match f.parse(i.clone()) {
+    Ok(o) => Ok(o),
+    Err(Err::Incomplete(i)) => Err(Err::Incomplete(i)),
+    Err(Err::Error(e)) => Err(Err::Error(E::add_context(i, context, e))),
+    Err(Err::Failure(e)) => Err(Err::Failure(E::add_context(i, context, e))),
+  }
+}
+
+/// Transforms a `VerboseError` into a trace with input position information
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn convert_error<I: core::ops::Deref<Target = str>>(
+  input: I,
+  e: VerboseError<I>,
+) -> crate::lib::std::string::String {
+  use crate::lib::std::fmt::Write;
+  use crate::traits::Offset;
+
+  let mut result = crate::lib::std::string::String::new();
+
+  for (i, (substring, kind)) in e.errors.iter().enumerate() {
+    let offset = input.offset(substring);
+
+    if input.is_empty() {
+      match kind {
+        VerboseErrorKind::Char(c) => {
+          write!(&mut result, "{}: expected '{}', got empty input\n\n", i, c)
+        }
+        VerboseErrorKind::Context(s) => write!(&mut result, "{}: in {}, got empty input\n\n", i, s),
+        VerboseErrorKind::Nom(e) => write!(&mut result, "{}: in {:?}, got empty input\n\n", i, e),
+      }
+    } else {
+      let prefix = &input.as_bytes()[..offset];
+
+      // Count the number of newlines in the first `offset` bytes of input
+      let line_number = prefix.iter().filter(|&&b| b == b'\n').count() + 1;
+
+      // Find the line that includes the subslice:
+      // Find the *last* newline before the substring starts
+      let line_begin = prefix
+        .iter()
+        .rev()
+        .position(|&b| b == b'\n')
+        .map(|pos| offset - pos)
+        .unwrap_or(0);
+
+      // Find the full line after that newline
+      let line = input[line_begin..]
+        .lines()
+        .next()
+        .unwrap_or(&input[line_begin..])
+        .trim_end();
+
+      // The (1-indexed) column number is the offset of our substring into that line
+      let column_number = line.offset(substring) + 1;
+
+      match kind {
+        VerboseErrorKind::Char(c) => {
+          if let Some(actual) = substring.chars().next() {
+            write!(
+              &mut result,
+              "{i}: at line {line_number}:\n\
+               {line}\n\
+               {caret:>column$}\n\
+               expected '{expected}', found {actual}\n\n",
+              i = i,
+              line_number = line_number,
+              line = line,
+              caret = '^',
+              column = column_number,
+              expected = c,
+              actual = actual,
+            )
+          } else {
+            write!(
+              &mut result,
+              "{i}: at line {line_number}:\n\
+               {line}\n\
+               {caret:>column$}\n\
+               expected '{expected}', got end of input\n\n",
+              i = i,
+              line_number = line_number,
+              line = line,
+              caret = '^',
+              column = column_number,
+              expected = c,
+            )
+          }
+        }
+        VerboseErrorKind::Context(s) => write!(
+          &mut result,
+          "{i}: at line {line_number}, in {context}:\n\
+             {line}\n\
+             {caret:>column$}\n\n",
+          i = i,
+          line_number = line_number,
+          context = s,
+          line = line,
+          caret = '^',
+          column = column_number,
+        ),
+        VerboseErrorKind::Nom(e) => write!(
+          &mut result,
+          "{i}: at line {line_number}, in {nom_err:?}:\n\
+             {line}\n\
+             {caret:>column$}\n\n",
+          i = i,
+          line_number = line_number,
+          nom_err = e,
+          line = line,
+          caret = '^',
+          column = column_number,
+        ),
+      }
+    }
+    // Because `write!` to a `String` is infallible, this `unwrap` is fine.
+    .unwrap();
+  }
+
+  result
+}
+
+/// Indicates which parser returned an error
+#[rustfmt::skip]
+#[derive(Debug,PartialEq,Eq,Hash,Clone,Copy)]
+#[allow(deprecated,missing_docs)]
+pub enum ErrorKind {
+  Tag,
+  MapRes,
+  MapOpt,
+  Alt,
+  IsNot,
+  IsA,
+  SeparatedList,
+  SeparatedNonEmptyList,
+  Many0,
+  Many1,
+  ManyTill,
+  Count,
+  TakeUntil,
+  LengthValue,
+  TagClosure,
+  Alpha,
+  Digit,
+  HexDigit,
+  OctDigit,
+  AlphaNumeric,
+  Space,
+  MultiSpace,
+  LengthValueFn,
+  Eof,
+  Switch,
+  TagBits,
+  OneOf,
+  NoneOf,
+  Char,
+  CrLf,
+  RegexpMatch,
+  RegexpMatches,
+  RegexpFind,
+  RegexpCapture,
+  RegexpCaptures,
+  TakeWhile1,
+  Complete,
+  Fix,
+  Escaped,
+  EscapedTransform,
+  NonEmpty,
+  ManyMN,
+  Not,
+  Permutation,
+  Verify,
+  TakeTill1,
+  TakeWhileMN,
+  ParseTo,
+  TooLarge,
+  Many0Count,
+  Many1Count,
+  Float,
+  Satisfy,
+}
+
+#[rustfmt::skip]
+#[allow(deprecated)]
+/// Converts an ErrorKind to a number
+pub fn error_to_u32(e: &ErrorKind) -> u32 {
+  match *e {
+    ErrorKind::Tag                       => 1,
+    ErrorKind::MapRes                    => 2,
+    ErrorKind::MapOpt                    => 3,
+    ErrorKind::Alt                       => 4,
+    ErrorKind::IsNot                     => 5,
+    ErrorKind::IsA                       => 6,
+    ErrorKind::SeparatedList             => 7,
+    ErrorKind::SeparatedNonEmptyList     => 8,
+    ErrorKind::Many1                     => 9,
+    ErrorKind::Count                     => 10,
+    ErrorKind::TakeUntil                 => 12,
+    ErrorKind::LengthValue               => 15,
+    ErrorKind::TagClosure                => 16,
+    ErrorKind::Alpha                     => 17,
+    ErrorKind::Digit                     => 18,
+    ErrorKind::AlphaNumeric              => 19,
+    ErrorKind::Space                     => 20,
+    ErrorKind::MultiSpace                => 21,
+    ErrorKind::LengthValueFn             => 22,
+    ErrorKind::Eof                       => 23,
+    ErrorKind::Switch                    => 27,
+    ErrorKind::TagBits                   => 28,
+    ErrorKind::OneOf                     => 29,
+    ErrorKind::NoneOf                    => 30,
+    ErrorKind::Char                      => 40,
+    ErrorKind::CrLf                      => 41,
+    ErrorKind::RegexpMatch               => 42,
+    ErrorKind::RegexpMatches             => 43,
+    ErrorKind::RegexpFind                => 44,
+    ErrorKind::RegexpCapture             => 45,
+    ErrorKind::RegexpCaptures            => 46,
+    ErrorKind::TakeWhile1                => 47,
+    ErrorKind::Complete                  => 48,
+    ErrorKind::Fix                       => 49,
+    ErrorKind::Escaped                   => 50,
+    ErrorKind::EscapedTransform          => 51,
+    ErrorKind::NonEmpty                  => 56,
+    ErrorKind::ManyMN                    => 57,
+    ErrorKind::HexDigit                  => 59,
+    ErrorKind::OctDigit                  => 61,
+    ErrorKind::Many0                     => 62,
+    ErrorKind::Not                       => 63,
+    ErrorKind::Permutation               => 64,
+    ErrorKind::ManyTill                  => 65,
+    ErrorKind::Verify                    => 66,
+    ErrorKind::TakeTill1                 => 67,
+    ErrorKind::TakeWhileMN               => 69,
+    ErrorKind::ParseTo                   => 70,
+    ErrorKind::TooLarge                  => 71,
+    ErrorKind::Many0Count                => 72,
+    ErrorKind::Many1Count                => 73,
+    ErrorKind::Float                     => 74,
+    ErrorKind::Satisfy                   => 75,
+  }
+}
+
+impl ErrorKind {
+  #[rustfmt::skip]
+  #[allow(deprecated)]
+  /// Converts an ErrorKind to a text description
+  pub fn description(&self) -> &str {
+    match *self {
+      ErrorKind::Tag                       => "Tag",
+      ErrorKind::MapRes                    => "Map on Result",
+      ErrorKind::MapOpt                    => "Map on Option",
+      ErrorKind::Alt                       => "Alternative",
+      ErrorKind::IsNot                     => "IsNot",
+      ErrorKind::IsA                       => "IsA",
+      ErrorKind::SeparatedList             => "Separated list",
+      ErrorKind::SeparatedNonEmptyList     => "Separated non empty list",
+      ErrorKind::Many0                     => "Many0",
+      ErrorKind::Many1                     => "Many1",
+      ErrorKind::Count                     => "Count",
+      ErrorKind::TakeUntil                 => "Take until",
+      ErrorKind::LengthValue               => "Length followed by value",
+      ErrorKind::TagClosure                => "Tag closure",
+      ErrorKind::Alpha                     => "Alphabetic",
+      ErrorKind::Digit                     => "Digit",
+      ErrorKind::AlphaNumeric              => "AlphaNumeric",
+      ErrorKind::Space                     => "Space",
+      ErrorKind::MultiSpace                => "Multiple spaces",
+      ErrorKind::LengthValueFn             => "LengthValueFn",
+      ErrorKind::Eof                       => "End of file",
+      ErrorKind::Switch                    => "Switch",
+      ErrorKind::TagBits                   => "Tag on bitstream",
+      ErrorKind::OneOf                     => "OneOf",
+      ErrorKind::NoneOf                    => "NoneOf",
+      ErrorKind::Char                      => "Char",
+      ErrorKind::CrLf                      => "CrLf",
+      ErrorKind::RegexpMatch               => "RegexpMatch",
+      ErrorKind::RegexpMatches             => "RegexpMatches",
+      ErrorKind::RegexpFind                => "RegexpFind",
+      ErrorKind::RegexpCapture             => "RegexpCapture",
+      ErrorKind::RegexpCaptures            => "RegexpCaptures",
+      ErrorKind::TakeWhile1                => "TakeWhile1",
+      ErrorKind::Complete                  => "Complete",
+      ErrorKind::Fix                       => "Fix",
+      ErrorKind::Escaped                   => "Escaped",
+      ErrorKind::EscapedTransform          => "EscapedTransform",
+      ErrorKind::NonEmpty                  => "NonEmpty",
+      ErrorKind::ManyMN                    => "Many(m, n)",
+      ErrorKind::HexDigit                  => "Hexadecimal Digit",
+      ErrorKind::OctDigit                  => "Octal digit",
+      ErrorKind::Not                       => "Negation",
+      ErrorKind::Permutation               => "Permutation",
+      ErrorKind::ManyTill                  => "ManyTill",
+      ErrorKind::Verify                    => "predicate verification",
+      ErrorKind::TakeTill1                 => "TakeTill1",
+      ErrorKind::TakeWhileMN               => "TakeWhileMN",
+      ErrorKind::ParseTo                   => "Parse string to the specified type",
+      ErrorKind::TooLarge                  => "Needed data size is too large",
+      ErrorKind::Many0Count                => "Count occurrence of >=0 patterns",
+      ErrorKind::Many1Count                => "Count occurrence of >=1 patterns",
+      ErrorKind::Float                     => "Float",
+      ErrorKind::Satisfy                   => "Satisfy",
+    }
+  }
+}
+
+/// Creates a parse error from a `nom::ErrorKind`
+/// and the position in the input
+#[allow(unused_variables)]
+#[macro_export(local_inner_macros)]
+macro_rules! error_position(
+  ($input:expr, $code:expr) => ({
+    $crate::error::make_error($input, $code)
+  });
+);
+
+/// Creates a parse error from a `nom::ErrorKind`,
+/// the position in the input and the next error in
+/// the parsing tree
+#[allow(unused_variables)]
+#[macro_export(local_inner_macros)]
+macro_rules! error_node_position(
+  ($input:expr, $code:expr, $next:expr) => ({
+    $crate::error::append_error($input, $code, $next)
+  });
+);
+
+//FIXME: error rewrite
+/// translate parser result from IResult<I,O,u32> to IResult<I,O,E> with a custom type
+///
+/// ```
+/// # //FIXME
+/// # #[macro_use] extern crate nom;
+/// # use nom::IResult;
+/// # use std::convert::From;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+/// #    /*
+/// #    // will add a Custom(42) error to the error chain
+/// #    named!(err_test, add_return_error!(ErrorKind::Custom(42u32), tag!("abcd")));
+/// #
+/// #    #[derive(Debug,Clone,PartialEq)]
+/// #    pub struct ErrorStr(String);
+/// #
+/// #    // Convert to IResult<&[u8], &[u8], ErrorStr>
+/// #    impl From<u32> for ErrorStr {
+/// #      fn from(i: u32) -> Self {
+/// #        ErrorStr(format!("custom error code: {}", i))
+/// #      }
+/// #    }
+/// #
+/// #    named!(parser<&[u8], &[u8], ErrorStr>,
+/// #        fix_error!(ErrorStr, err_test)
+/// #      );
+/// #
+/// #    let a = &b"efghblah"[..];
+/// #    assert_eq!(parser(a), Err(Err::Error(Context::Code(a, ErrorKind::Custom(ErrorStr("custom error code: 42".to_string()))))));
+/// # */
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! fix_error (
+  ($i:expr, $t:ty, $submac:ident!( $($args:tt)* )) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::Err;
+
+      match $submac!($i, $($args)*) {
+        Ok((i,o)) => Ok((i,o)),
+        Err(e) => {
+          let e2 = match e {
+            Err::Error(err) => {
+              Err::Error(err.into())
+            },
+            Err::Failure(err) => {
+              Err::Failure(err.into())
+            },
+            Err::Incomplete(e) => Err::Incomplete(e),
+          };
+          Err(e2)
+        }
+      }
+    }
+  );
+  ($i:expr, $t:ty, $f:expr) => (
+    fix_error!($i, $t, call!($f));
+  );
+);
+
+/// `flat_map!(R -> IResult<R,S>, S -> IResult<S,T>) => R -> IResult<R, T>`
+///
+/// Combines a parser `R -> IResult<R,S>` and
+/// a parser `S -> IResult<S,T>` to return another
+/// parser `R -> IResult<R,T>`
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}};
+/// use nom::number::complete::recognize_float;
+///
+/// named!(parser<&str, f64>, flat_map!(recognize_float, parse_to!(f64)));
+///
+/// assert_eq!(parser("123.45;"), Ok((";", 123.45)));
+/// assert_eq!(parser("abc"), Err(Err::Error(Error::new("abc", ErrorKind::Char))));
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! flat_map(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    flat_map!(__impl $i, $submac!($($args)*), $submac2!($($args2)*));
+  );
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    flat_map!(__impl $i, $submac!($($args)*), call!($g));
+  );
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    flat_map!(__impl $i, call!($f), $submac!($($args)*));
+  );
+  ($i:expr, $f:expr, $g:expr) => (
+    flat_map!(__impl $i, call!($f), call!($g));
+  );
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    $crate::combinator::map_parserc($i, move |i| {$submac!(i, $($args)*)}, move |i| {$submac2!(i, $($args2)*)})
+  );
+);
+
+#[cfg(test)]
+#[cfg(feature = "alloc")]
+mod tests {
+  use super::*;
+  use crate::character::complete::char;
+
+  #[test]
+  fn convert_error_panic() {
+    let input = "";
+
+    let _result: IResult<_, _, VerboseError<&str>> = char('x')(input);
+  }
+}
+
+/*
+#[cfg(feature = "alloc")]
+use lib::std::{vec::Vec, collections::HashMap};
+
+#[cfg(feature = "std")]
+use lib::std::hash::Hash;
+
+#[cfg(feature = "std")]
+pub fn add_error_pattern<'a, I: Clone + Hash + Eq, O, E: Clone + Hash + Eq>(
+  h: &mut HashMap<VerboseError<I>, &'a str>,
+  e: VerboseError<I>,
+  message: &'a str,
+) -> bool {
+  h.insert(e, message);
+  true
+}
+
+pub fn slice_to_offsets(input: &[u8], s: &[u8]) -> (usize, usize) {
+  let start = input.as_ptr();
+  let off1 = s.as_ptr() as usize - start as usize;
+  let off2 = off1 + s.len();
+  (off1, off2)
+}
+
+#[cfg(feature = "std")]
+pub fn prepare_errors<O, E: Clone>(input: &[u8], e: VerboseError<&[u8]>) -> Option<Vec<(ErrorKind, usize, usize)>> {
+  let mut v: Vec<(ErrorKind, usize, usize)> = Vec::new();
+
+  for (p, kind) in e.errors.drain(..) {
+    let (o1, o2) = slice_to_offsets(input, p);
+    v.push((kind, o1, o2));
+  }
+
+  v.reverse();
+  Some(v)
+}
+
+#[cfg(feature = "std")]
+pub fn print_error<O, E: Clone>(input: &[u8], res: VerboseError<&[u8]>) {
+  if let Some(v) = prepare_errors(input, res) {
+    let colors = generate_colors(&v);
+    println!("parser codes: {}", print_codes(&colors, &HashMap::new()));
+    println!("{}", print_offsets(input, 0, &v));
+  } else {
+    println!("not an error");
+  }
+}
+
+#[cfg(feature = "std")]
+pub fn generate_colors<E>(v: &[(ErrorKind, usize, usize)]) -> HashMap<u32, u8> {
+  let mut h: HashMap<u32, u8> = HashMap::new();
+  let mut color = 0;
+
+  for &(ref c, _, _) in v.iter() {
+    h.insert(error_to_u32(c), color + 31);
+    color = color + 1 % 7;
+  }
+
+  h
+}
+
+pub fn code_from_offset(v: &[(ErrorKind, usize, usize)], offset: usize) -> Option<u32> {
+  let mut acc: Option<(u32, usize, usize)> = None;
+  for &(ref ek, s, e) in v.iter() {
+    let c = error_to_u32(ek);
+    if s <= offset && offset <= e {
+      if let Some((_, start, end)) = acc {
+        if start <= s && e <= end {
+          acc = Some((c, s, e));
+        }
+      } else {
+        acc = Some((c, s, e));
+      }
+    }
+  }
+  if let Some((code, _, _)) = acc {
+    return Some(code);
+  } else {
+    return None;
+  }
+}
+
+#[cfg(feature = "alloc")]
+pub fn reset_color(v: &mut Vec<u8>) {
+  v.push(0x1B);
+  v.push(b'[');
+  v.push(0);
+  v.push(b'm');
+}
+
+#[cfg(feature = "alloc")]
+pub fn write_color(v: &mut Vec<u8>, color: u8) {
+  v.push(0x1B);
+  v.push(b'[');
+  v.push(1);
+  v.push(b';');
+  let s = color.to_string();
+  let bytes = s.as_bytes();
+  v.extend(bytes.iter().cloned());
+  v.push(b'm');
+}
+
+#[cfg(feature = "std")]
+#[cfg_attr(feature = "cargo-clippy", allow(implicit_hasher))]
+pub fn print_codes(colors: &HashMap<u32, u8>, names: &HashMap<u32, &str>) -> String {
+  let mut v = Vec::new();
+  for (code, &color) in colors {
+    if let Some(&s) = names.get(code) {
+      let bytes = s.as_bytes();
+      write_color(&mut v, color);
+      v.extend(bytes.iter().cloned());
+    } else {
+      let s = code.to_string();
+      let bytes = s.as_bytes();
+      write_color(&mut v, color);
+      v.extend(bytes.iter().cloned());
+    }
+    reset_color(&mut v);
+    v.push(b' ');
+  }
+  reset_color(&mut v);
+
+  String::from_utf8_lossy(&v[..]).into_owned()
+}
+
+#[cfg(feature = "std")]
+pub fn print_offsets(input: &[u8], from: usize, offsets: &[(ErrorKind, usize, usize)]) -> String {
+  let mut v = Vec::with_capacity(input.len() * 3);
+  let mut i = from;
+  let chunk_size = 8;
+  let mut current_code: Option<u32> = None;
+  let mut current_code2: Option<u32> = None;
+
+  let colors = generate_colors(&offsets);
+
+  for chunk in input.chunks(chunk_size) {
+    let s = format!("{:08x}", i);
+    for &ch in s.as_bytes().iter() {
+      v.push(ch);
+    }
+    v.push(b'\t');
+
+    let mut k = i;
+    let mut l = i;
+    for &byte in chunk {
+      if let Some(code) = code_from_offset(&offsets, k) {
+        if let Some(current) = current_code {
+          if current != code {
+            reset_color(&mut v);
+            current_code = Some(code);
+            if let Some(&color) = colors.get(&code) {
+              write_color(&mut v, color);
+            }
+          }
+        } else {
+          current_code = Some(code);
+          if let Some(&color) = colors.get(&code) {
+            write_color(&mut v, color);
+          }
+        }
+      }
+      v.push(CHARS[(byte >> 4) as usize]);
+      v.push(CHARS[(byte & 0xf) as usize]);
+      v.push(b' ');
+      k = k + 1;
+    }
+
+    reset_color(&mut v);
+
+    if chunk_size > chunk.len() {
+      for _ in 0..(chunk_size - chunk.len()) {
+        v.push(b' ');
+        v.push(b' ');
+        v.push(b' ');
+      }
+    }
+    v.push(b'\t');
+
+    for &byte in chunk {
+      if let Some(code) = code_from_offset(&offsets, l) {
+        if let Some(current) = current_code2 {
+          if current != code {
+            reset_color(&mut v);
+            current_code2 = Some(code);
+            if let Some(&color) = colors.get(&code) {
+              write_color(&mut v, color);
+            }
+          }
+        } else {
+          current_code2 = Some(code);
+          if let Some(&color) = colors.get(&code) {
+            write_color(&mut v, color);
+          }
+        }
+      }
+      if (byte >= 32 && byte <= 126) || byte >= 128 {
+        v.push(byte);
+      } else {
+        v.push(b'.');
+      }
+      l = l + 1;
+    }
+    reset_color(&mut v);
+
+    v.push(b'\n');
+    i = i + chunk_size;
+  }
+
+  String::from_utf8_lossy(&v[..]).into_owned()
+}
+*/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/internal.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/internal.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/internal.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/internal.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,449 @@
+//! Basic types to build the parsers
+
+use self::Needed::*;
+use crate::error::{self, ErrorKind};
+use crate::lib::std::fmt;
+use core::num::NonZeroUsize;
+
+/// Holds the result of parsing functions
+///
+/// It depends on the input type `I`, the output type `O`, and the error type `E`
+/// (by default `(I, nom::ErrorKind)`)
+///
+/// The `Ok` side is a pair containing the remainder of the input (the part of the data that
+/// was not parsed) and the produced value. The `Err` side contains an instance of `nom::Err`.
+///
+/// Outside of the parsing code, you can use the [Finish::finish] method to convert
+/// it to a more common result type
+pub type IResult<I, O, E = error::Error<I>> = Result<(I, O), Err<E>>;
+
+/// Helper trait to convert a parser's result to a more manageable type
+pub trait Finish<I, O, E> {
+  /// converts the parser's result to a type that is more consumable by error
+  /// management libraries. It keeps the same `Ok` branch, and merges `Err::Error`
+  /// and `Err::Failure` into the `Err` side.
+  ///
+  /// *warning*: if the result is `Err(Err::Incomplete(_))`, this method will panic.
+  /// - "complete" parsers: It will not be an issue, `Incomplete` is never used
+  /// - "streaming" parsers: `Incomplete` will be returned if there's not enough data
+  /// for the parser to decide, and you should gather more data before parsing again.
+  /// Once the parser returns either `Ok(_)`, `Err(Err::Error(_))` or `Err(Err::Failure(_))`,
+  /// you can get out of the parsing loop and call `finish()` on the parser's result
+  fn finish(self) -> Result<(I, O), E>;
+}
+
+impl<I, O, E> Finish<I, O, E> for IResult<I, O, E> {
+  fn finish(self) -> Result<(I, O), E> {
+    match self {
+      Ok(res) => Ok(res),
+      Err(Err::Error(e)) | Err(Err::Failure(e)) => Err(e),
+      Err(Err::Incomplete(_)) => {
+        panic!("Cannot call `finish()` on `Err(Err::Incomplete(_))`: this result means that the parser does not have enough data to decide, you should gather more data and try to reapply  the parser instead")
+      }
+    }
+  }
+}
+
+/// Contains information on needed data if a parser returned `Incomplete`
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+#[allow(missing_doc_code_examples)]
+pub enum Needed {
+  /// Needs more data, but we do not know how much
+  Unknown,
+  /// Contains the required data size in bytes
+  Size(NonZeroUsize),
+}
+
+impl Needed {
+  /// Creates `Needed` instance, returns `Needed::Unknown` if the argument is zero
+  pub fn new(s: usize) -> Self {
+    match NonZeroUsize::new(s) {
+      Some(sz) => Needed::Size(sz),
+      None => Needed::Unknown,
+    }
+  }
+
+  /// Indicates if we know how many bytes we need
+  pub fn is_known(&self) -> bool {
+    *self != Unknown
+  }
+
+  /// Maps a `Needed` to `Needed` by applying a function to a contained `Size` value.
+  #[inline]
+  pub fn map<F: Fn(NonZeroUsize) -> usize>(self, f: F) -> Needed {
+    match self {
+      Unknown => Unknown,
+      Size(n) => Needed::new(f(n)),
+    }
+  }
+}
+
+/// The `Err` enum indicates the parser was not successful
+///
+/// It has three cases:
+///
+/// * `Incomplete` indicates that more data is needed to decide. The `Needed` enum
+/// can contain how many additional bytes are necessary. If you are sure your parser
+/// is working on full data, you can wrap your parser with the `complete` combinator
+/// to transform that case in `Error`
+/// * `Error` means some parser did not succeed, but another one might (as an example,
+/// when testing different branches of an `alt` combinator)
+/// * `Failure` indicates an unrecoverable error. As an example, if you recognize a prefix
+/// to decide on the next parser to apply, and that parser fails, you know there's no need
+/// to try other parsers, you were already in the right branch, so the data is invalid
+///
+#[derive(Debug, Clone, PartialEq)]
+#[allow(missing_doc_code_examples)]
+pub enum Err<E> {
+  /// There was not enough data
+  Incomplete(Needed),
+  /// The parser had an error (recoverable)
+  Error(E),
+  /// The parser had an unrecoverable error: we got to the right
+  /// branch and we know other branches won't work, so backtrack
+  /// as fast as possible
+  Failure(E),
+}
+
+impl<E> Err<E> {
+  /// Tests if the result is Incomplete
+  pub fn is_incomplete(&self) -> bool {
+    if let Err::Incomplete(_) = self {
+      true
+    } else {
+      false
+    }
+  }
+
+  /// Applies the given function to the inner error
+  pub fn map<E2, F>(self, f: F) -> Err<E2>
+  where
+    F: FnOnce(E) -> E2,
+  {
+    match self {
+      Err::Incomplete(n) => Err::Incomplete(n),
+      Err::Failure(t) => Err::Failure(f(t)),
+      Err::Error(t) => Err::Error(f(t)),
+    }
+  }
+
+  /// Automatically converts between errors if the underlying type supports it
+  pub fn convert<F>(e: Err<F>) -> Self
+  where
+    E: From<F>,
+  {
+    e.map(crate::lib::std::convert::Into::into)
+  }
+}
+
+impl<T> Err<(T, ErrorKind)> {
+  /// Maps `Err<(T, ErrorKind)>` to `Err<(U, ErrorKind)>` with the given `F: T -> U`
+  pub fn map_input<U, F>(self, f: F) -> Err<(U, ErrorKind)>
+  where
+    F: FnOnce(T) -> U,
+  {
+    match self {
+      Err::Incomplete(n) => Err::Incomplete(n),
+      Err::Failure((input, k)) => Err::Failure((f(input), k)),
+      Err::Error((input, k)) => Err::Error((f(input), k)),
+    }
+  }
+}
+
+#[cfg(feature = "alloc")]
+use crate::lib::std::{borrow::ToOwned, string::String, vec::Vec};
+#[cfg(feature = "alloc")]
+impl Err<(&[u8], ErrorKind)> {
+  /// Obtaining ownership
+  #[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+  pub fn to_owned(self) -> Err<(Vec<u8>, ErrorKind)> {
+    self.map_input(ToOwned::to_owned)
+  }
+}
+
+#[cfg(feature = "alloc")]
+impl Err<(&str, ErrorKind)> {
+  /// Automatically converts between errors if the underlying type supports it
+  #[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+  pub fn to_owned(self) -> Err<(String, ErrorKind)> {
+    self.map_input(ToOwned::to_owned)
+  }
+}
+
+impl<E: Eq> Eq for Err<E> {}
+
+impl<E> fmt::Display for Err<E>
+where
+  E: fmt::Debug,
+{
+  fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    match self {
+      Err::Incomplete(Needed::Size(u)) => write!(f, "Parsing requires {} bytes/chars", u),
+      Err::Incomplete(Needed::Unknown) => write!(f, "Parsing requires more data"),
+      Err::Failure(c) => write!(f, "Parsing Failure: {:?}", c),
+      Err::Error(c) => write!(f, "Parsing Error: {:?}", c),
+    }
+  }
+}
+
+#[cfg(feature = "std")]
+use std::error::Error;
+
+#[cfg(feature = "std")]
+impl<E> Error for Err<E>
+where
+  E: fmt::Debug,
+{
+  fn source(&self) -> Option<&(dyn Error + 'static)> {
+    None // no underlying error
+  }
+}
+
+/// All nom parsers implement this trait
+pub trait Parser<I, O, E> {
+  /// A parser takes in input type, and returns a `Result` containing
+  /// either the remaining input and the output value, or an error
+  fn parse(&mut self, input: I) -> IResult<I, O, E>;
+
+  /// Maps a function over the result of a parser
+  fn map<G, O2>(self, g: G) -> Map<Self, G, O>
+  where
+    G: Fn(O) -> O2,
+    Self: core::marker::Sized,
+  {
+    Map {
+      f: self,
+      g,
+      phantom: core::marker::PhantomData,
+    }
+  }
+
+  /// Creates a second parser from the output of the first one, then apply over the rest of the input
+  fn flat_map<G, H, O2>(self, g: G) -> FlatMap<Self, G, O>
+  where
+    G: Fn(O) -> H,
+    H: Parser<I, O2, E>,
+    Self: core::marker::Sized,
+  {
+    FlatMap {
+      f: self,
+      g,
+      phantom: core::marker::PhantomData,
+    }
+  }
+
+  /// Applies a second parser over the output of the first one
+  fn and_then<G, O2>(self, g: G) -> AndThen<Self, G, O>
+  where
+    G: Parser<O, O2, E>,
+    Self: core::marker::Sized,
+  {
+    AndThen {
+      f: self,
+      g,
+      phantom: core::marker::PhantomData,
+    }
+  }
+
+  /// Applies a second parser after the first one, return their results as a tuple
+  fn and<G, O2>(self, g: G) -> And<Self, G>
+  where
+    G: Parser<I, O2, E>,
+    Self: core::marker::Sized,
+  {
+    And { f: self, g }
+  }
+
+  /// Applies a second parser over the input if the first one failed
+  fn or<G>(self, g: G) -> Or<Self, G>
+  where
+    G: Parser<I, O, E>,
+    Self: core::marker::Sized,
+  {
+    Or { f: self, g }
+  }
+
+  /// automatically converts the parser's output and error values to another type, as long as they
+  /// implement the `From` trait
+  fn into<O2: From<O>, E2: From<E>>(self) -> Into<Self, O, O2, E, E2>
+  where
+    Self: core::marker::Sized,
+  {
+    Into {
+      f: self,
+      phantom_out1: core::marker::PhantomData,
+      phantom_err1: core::marker::PhantomData,
+      phantom_out2: core::marker::PhantomData,
+      phantom_err2: core::marker::PhantomData,
+    }
+  }
+}
+
+impl<'a, I, O, E, F> Parser<I, O, E> for F
+where
+  F: FnMut(I) -> IResult<I, O, E> + 'a,
+{
+  fn parse(&mut self, i: I) -> IResult<I, O, E> {
+    self(i)
+  }
+}
+
+#[cfg(feature = "alloc")]
+use alloc::boxed::Box;
+
+#[cfg(feature = "alloc")]
+impl<'a, I, O, E> Parser<I, O, E> for Box<dyn Parser<I, O, E> + 'a> {
+  fn parse(&mut self, input: I) -> IResult<I, O, E> {
+    (**self).parse(input)
+  }
+}
+
+/// Implementation of `Parser:::map`
+#[allow(missing_doc_code_examples)]
+pub struct Map<F, G, O1> {
+  f: F,
+  g: G,
+  phantom: core::marker::PhantomData<O1>,
+}
+
+impl<'a, I, O1, O2, E, F: Parser<I, O1, E>, G: Fn(O1) -> O2> Parser<I, O2, E> for Map<F, G, O1> {
+  fn parse(&mut self, i: I) -> IResult<I, O2, E> {
+    match self.f.parse(i) {
+      Err(e) => Err(e),
+      Ok((i, o)) => Ok((i, (self.g)(o))),
+    }
+  }
+}
+
+/// Implementation of `Parser::flat_map`
+#[allow(missing_doc_code_examples)]
+pub struct FlatMap<F, G, O1> {
+  f: F,
+  g: G,
+  phantom: core::marker::PhantomData<O1>,
+}
+
+impl<'a, I, O1, O2, E, F: Parser<I, O1, E>, G: Fn(O1) -> H, H: Parser<I, O2, E>> Parser<I, O2, E>
+  for FlatMap<F, G, O1>
+{
+  fn parse(&mut self, i: I) -> IResult<I, O2, E> {
+    let (i, o1) = self.f.parse(i)?;
+    (self.g)(o1).parse(i)
+  }
+}
+
+/// Implementation of `Parser::and_then`
+#[allow(missing_doc_code_examples)]
+pub struct AndThen<F, G, O1> {
+  f: F,
+  g: G,
+  phantom: core::marker::PhantomData<O1>,
+}
+
+impl<'a, I, O1, O2, E, F: Parser<I, O1, E>, G: Parser<O1, O2, E>> Parser<I, O2, E>
+  for AndThen<F, G, O1>
+{
+  fn parse(&mut self, i: I) -> IResult<I, O2, E> {
+    let (i, o1) = self.f.parse(i)?;
+    let (_, o2) = self.g.parse(o1)?;
+    Ok((i, o2))
+  }
+}
+
+/// Implementation of `Parser::and`
+#[allow(missing_doc_code_examples)]
+pub struct And<F, G> {
+  f: F,
+  g: G,
+}
+
+impl<'a, I, O1, O2, E, F: Parser<I, O1, E>, G: Parser<I, O2, E>> Parser<I, (O1, O2), E>
+  for And<F, G>
+{
+  fn parse(&mut self, i: I) -> IResult<I, (O1, O2), E> {
+    let (i, o1) = self.f.parse(i)?;
+    let (i, o2) = self.g.parse(i)?;
+    Ok((i, (o1, o2)))
+  }
+}
+
+/// Implementation of `Parser::or`
+#[allow(missing_doc_code_examples)]
+pub struct Or<F, G> {
+  f: F,
+  g: G,
+}
+
+impl<'a, I: Clone, O, E: crate::error::ParseError<I>, F: Parser<I, O, E>, G: Parser<I, O, E>>
+  Parser<I, O, E> for Or<F, G>
+{
+  fn parse(&mut self, i: I) -> IResult<I, O, E> {
+    match self.f.parse(i.clone()) {
+      Err(Err::Error(e1)) => match self.g.parse(i) {
+        Err(Err::Error(e2)) => Err(Err::Error(e1.or(e2))),
+        res => res,
+      },
+      res => res,
+    }
+  }
+}
+
+/// Implementation of `Parser::into`
+#[allow(missing_doc_code_examples)]
+pub struct Into<F, O1, O2: From<O1>, E1, E2: From<E1>> {
+  f: F,
+  phantom_out1: core::marker::PhantomData<O1>,
+  phantom_err1: core::marker::PhantomData<E1>,
+  phantom_out2: core::marker::PhantomData<O2>,
+  phantom_err2: core::marker::PhantomData<E2>,
+}
+
+impl<
+    'a,
+    I: Clone,
+    O1,
+    O2: From<O1>,
+    E1,
+    E2: crate::error::ParseError<I> + From<E1>,
+    F: Parser<I, O1, E1>,
+  > Parser<I, O2, E2> for Into<F, O1, O2, E1, E2>
+{
+  fn parse(&mut self, i: I) -> IResult<I, O2, E2> {
+    match self.f.parse(i) {
+      Ok((i, o)) => Ok((i, o.into())),
+      Err(Err::Error(e)) => Err(Err::Error(e.into())),
+      Err(Err::Failure(e)) => Err(Err::Failure(e.into())),
+      Err(Err::Incomplete(e)) => Err(Err::Incomplete(e)),
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::error::ErrorKind;
+
+  #[doc(hidden)]
+  #[macro_export]
+  macro_rules! assert_size (
+    ($t:ty, $sz:expr) => (
+      assert_eq!(crate::lib::std::mem::size_of::<$t>(), $sz);
+    );
+  );
+
+  #[test]
+  #[cfg(target_pointer_width = "64")]
+  fn size_test() {
+    assert_size!(IResult<&[u8], &[u8], (&[u8], u32)>, 40);
+    assert_size!(IResult<&str, &str, u32>, 40);
+    assert_size!(Needed, 8);
+    assert_size!(Err<u32>, 16);
+    assert_size!(ErrorKind, 1);
+  }
+
+  #[test]
+  fn err_map_test() {
+    let e = Err::Error(1);
+    assert_eq!(e.map(|v| v + 1), Err::Error(2));
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,519 @@
+//! # nom, eating data byte by byte
+//!
+//! nom is a parser combinator library with a focus on safe parsing,
+//! streaming patterns, and as much as possible zero copy.
+//!
+//! ## Example
+//!
+//! ```rust
+//! extern crate nom;
+//!
+//! use nom::{
+//!   IResult,
+//!   bytes::complete::{tag, take_while_m_n},
+//!   combinator::map_res,
+//!   sequence::tuple};
+//!
+//! #[derive(Debug,PartialEq)]
+//! pub struct Color {
+//!   pub red:     u8,
+//!   pub green:   u8,
+//!   pub blue:    u8,
+//! }
+//!
+//! fn from_hex(input: &str) -> Result<u8, std::num::ParseIntError> {
+//!   u8::from_str_radix(input, 16)
+//! }
+//!
+//! fn is_hex_digit(c: char) -> bool {
+//!   c.is_digit(16)
+//! }
+//!
+//! fn hex_primary(input: &str) -> IResult<&str, u8> {
+//!   map_res(
+//!     take_while_m_n(2, 2, is_hex_digit),
+//!     from_hex
+//!   )(input)
+//! }
+//!
+//! fn hex_color(input: &str) -> IResult<&str, Color> {
+//!   let (input, _) = tag("#")(input)?;
+//!   let (input, (red, green, blue)) = tuple((hex_primary, hex_primary, hex_primary))(input)?;
+//!
+//!   Ok((input, Color { red, green, blue }))
+//! }
+//!
+//! fn main() {
+//!   assert_eq!(hex_color("#2F14DF"), Ok(("", Color {
+//!     red: 47,
+//!     green: 20,
+//!     blue: 223,
+//!   })));
+//! }
+//! ```
+//!
+//! The code is available on [Github](https://github.com/Geal/nom)
+//!
+//! There are a few [guides](https://github.com/Geal/nom/tree/master/doc) with more details
+//! about [the design of nom macros](https://github.com/Geal/nom/blob/master/doc/how_nom_macros_work.md),
+//! [how to write parsers](https://github.com/Geal/nom/blob/master/doc/making_a_new_parser_from_scratch.md),
+//! or the [error management system](https://github.com/Geal/nom/blob/master/doc/error_management.md).
+//! You can also check out the [recipes] module that contains examples of common patterns.
+//!
+//! **Looking for a specific combinator? Read the
+//! ["choose a combinator" guide](https://github.com/Geal/nom/blob/master/doc/choosing_a_combinator.md)**
+//!
+//! If you are upgrading to nom 5.0, please read the
+//! [migration document](https://github.com/Geal/nom/blob/master/doc/upgrading_to_nom_5.md).
+//!
+//! See also the [FAQ](https://github.com/Geal/nom/blob/master/doc/FAQ.md).
+//!
+//! ## Parser combinators
+//!
+//! Parser combinators are an approach to parsers that is very different from
+//! software like [lex](https://en.wikipedia.org/wiki/Lex_(software)) and
+//! [yacc](https://en.wikipedia.org/wiki/Yacc). Instead of writing the grammar
+//! in a separate syntax and generating the corresponding code, you use very small
+//! functions with very specific purposes, like "take 5 bytes", or "recognize the
+//! word 'HTTP'", and assemble them in meaningful patterns like "recognize
+//! 'HTTP', then a space, then a version".
+//! The resulting code is small, and looks like the grammar you would have
+//! written with other parser approaches.
+//!
+//! This gives us a few advantages:
+//!
+//! - The parsers are small and easy to write
+//! - The parsers components are easy to reuse (if they're general enough, please add them to nom!)
+//! - The parsers components are easy to test separately (unit tests and property-based tests)
+//! - The parser combination code looks close to the grammar you would have written
+//! - You can build partial parsers, specific to the data you need at the moment, and ignore the rest
+//!
+//! Here is an example of one such parser, to recognize text between parentheses:
+//!
+//! ```rust
+//! use nom::{
+//!   IResult,
+//!   sequence::delimited,
+//!   // see the "streaming/complete" paragraph lower for an explanation of these submodules
+//!   character::complete::char,
+//!   bytes::complete::is_not
+//! };
+//!
+//! fn parens(input: &str) -> IResult<&str, &str> {
+//!   delimited(char('('), is_not(")"), char(')'))(input)
+//! }
+//! ```
+//!
+//! It defines a function named `parens` which will recognize a sequence of the
+//! character `(`, the longest byte array not containing `)`, then the character
+//! `)`, and will return the byte array in the middle.
+//!
+//! Here is another parser, written without using nom's combinators this time:
+//!
+//! ```rust
+//! #[macro_use]
+//! extern crate nom;
+//!
+//! use nom::{IResult, Err, Needed};
+//!
+//! # fn main() {
+//! fn take4(i: &[u8]) -> IResult<&[u8], &[u8]>{
+//!   if i.len() < 4 {
+//!     Err(Err::Incomplete(Needed::new(4)))
+//!   } else {
+//!     Ok((&i[4..], &i[0..4]))
+//!   }
+//! }
+//! # }
+//! ```
+//!
+//! This function takes a byte array as input, and tries to consume 4 bytes.
+//! Writing all the parsers manually, like this, is dangerous, despite Rust's
+//! safety features. There are still a lot of mistakes one can make. That's why
+//! nom provides a list of function and macros to help in developing parsers.
+//!
+//! With functions, you would write it like this:
+//!
+//! ```rust
+//! use nom::{IResult, bytes::streaming::take};
+//! fn take4(input: &str) -> IResult<&str, &str> {
+//!   take(4u8)(input)
+//! }
+//! ```
+//!
+//! With macros, you would write it like this:
+//!
+//! ```rust
+//! #[macro_use]
+//! extern crate nom;
+//!
+//! # fn main() {
+//! named!(take4, take!(4));
+//! # }
+//! ```
+//!
+//! nom has used macros for combinators from versions 1 to 4, and from version
+//! 5, it proposes new combinators as functions, but still allows the macros style
+//! (macros have been rewritten to use the functions under the hood).
+//! For new parsers, we recommend using the functions instead of macros, since
+//! rustc messages will be much easier to understand.
+//!
+//!
+//! A parser in nom is a function which, for an input type `I`, an output type `O`
+//! and an optional error type `E`, will have the following signature:
+//!
+//! ```rust,ignore
+//! fn parser(input: I) -> IResult<I, O, E>;
+//! ```
+//!
+//! Or like this, if you don't want to specify a custom error type (it will be `(I, ErrorKind)` by default):
+//!
+//! ```rust,ignore
+//! fn parser(input: I) -> IResult<I, O>;
+//! ```
+//!
+//! `IResult` is an alias for the `Result` type:
+//!
+//! ```rust
+//! use nom::{Needed, error::ErrorKind};
+//!
+//! type IResult<I, O, E = (I,ErrorKind)> = Result<(I, O), Err<E>>;
+//!
+//! enum Err<E> {
+//!   Incomplete(Needed),
+//!   Error(E),
+//!   Failure(E),
+//! }
+//! ```
+//!
+//! It can have the following values:
+//!
+//! - A correct result `Ok((I,O))` with the first element being the remaining of the input (not parsed yet), and the second the output value;
+//! - An error `Err(Err::Error(c))` with `c` an error that can be built from the input position and a parser specific error
+//! - An error `Err(Err::Incomplete(Needed))` indicating that more input is necessary. `Needed` can indicate how much data is needed
+//! - An error `Err(Err::Failure(c))`. It works like the `Error` case, except it indicates an unrecoverable error: We cannot backtrack and test another parser
+//!
+//! Please refer to the ["choose a combinator" guide](https://github.com/Geal/nom/blob/master/doc/choosing_a_combinator.md) for an exhaustive list of parsers.
+//! See also the rest of the documentation [here](https://github.com/Geal/nom/blob/master/doc).
+//!
+//! ## Making new parsers with function combinators
+//!
+//! nom is based on functions that generate parsers, with a signature like
+//! this: `(arguments) -> impl Fn(Input) -> IResult<Input, Output, Error>`.
+//! The arguments of a combinator can be direct values (like `take` which uses
+//! a number of bytes or character as argument) or even other parsers (like
+//! `delimited` which takes as argument 3 parsers, and returns the result of
+//! the second one if all are successful).
+//!
+//! Here are some examples:
+//!
+//! ```rust
+//! use nom::IResult;
+//! use nom::bytes::complete::{tag, take};
+//! fn abcd_parser(i: &str) -> IResult<&str, &str> {
+//!   tag("abcd")(i) // will consume bytes if the input begins with "abcd"
+//! }
+//!
+//! fn take_10(i: &[u8]) -> IResult<&[u8], &[u8]> {
+//!   take(10u8)(i) // will consume and return 10 bytes of input
+//! }
+//! ```
+//!
+//! ## Combining parsers
+//!
+//! There are higher level patterns, like the **`alt`** combinator, which
+//! provides a choice between multiple parsers. If one branch fails, it tries
+//! the next, and returns the result of the first parser that succeeds:
+//!
+//! ```rust
+//! use nom::IResult;
+//! use nom::branch::alt;
+//! use nom::bytes::complete::tag;
+//!
+//! let mut alt_tags = alt((tag("abcd"), tag("efgh")));
+//!
+//! assert_eq!(alt_tags(&b"abcdxxx"[..]), Ok((&b"xxx"[..], &b"abcd"[..])));
+//! assert_eq!(alt_tags(&b"efghxxx"[..]), Ok((&b"xxx"[..], &b"efgh"[..])));
+//! assert_eq!(alt_tags(&b"ijklxxx"[..]), Err(nom::Err::Error((&b"ijklxxx"[..], nom::error::ErrorKind::Tag))));
+//! ```
+//!
+//! The **`opt`** combinator makes a parser optional. If the child parser returns
+//! an error, **`opt`** will still succeed and return None:
+//!
+//! ```rust
+//! use nom::{IResult, combinator::opt, bytes::complete::tag};
+//! fn abcd_opt(i: &[u8]) -> IResult<&[u8], Option<&[u8]>> {
+//!   opt(tag("abcd"))(i)
+//! }
+//!
+//! assert_eq!(abcd_opt(&b"abcdxxx"[..]), Ok((&b"xxx"[..], Some(&b"abcd"[..]))));
+//! assert_eq!(abcd_opt(&b"efghxxx"[..]), Ok((&b"efghxxx"[..], None)));
+//! ```
+//!
+//! **`many0`** applies a parser 0 or more times, and returns a vector of the aggregated results:
+//!
+//! ```rust
+//! # #[macro_use] extern crate nom;
+//! # #[cfg(feature = "alloc")]
+//! # fn main() {
+//! use nom::{IResult, multi::many0, bytes::complete::tag};
+//! use std::str;
+//!
+//! fn multi(i: &str) -> IResult<&str, Vec<&str>> {
+//!   many0(tag("abcd"))(i)
+//! }
+//!
+//! let a = "abcdef";
+//! let b = "abcdabcdef";
+//! let c = "azerty";
+//! assert_eq!(multi(a), Ok(("ef",     vec!["abcd"])));
+//! assert_eq!(multi(b), Ok(("ef",     vec!["abcd", "abcd"])));
+//! assert_eq!(multi(c), Ok(("azerty", Vec::new())));
+//! # }
+//! # #[cfg(not(feature = "alloc"))]
+//! # fn main() {}
+//! ```
+//!
+//! Here are some basic combining macros available:
+//!
+//! - **`opt`**: Will make the parser optional (if it returns the `O` type, the new parser returns `Option<O>`)
+//! - **`many0`**: Will apply the parser 0 or more times (if it returns the `O` type, the new parser returns `Vec<O>`)
+//! - **`many1`**: Will apply the parser 1 or more times
+//!
+//! There are more complex (and more useful) parsers like `tuple!`, which is
+//! used to apply a series of parsers then assemble their results.
+//!
+//! Example with `tuple`:
+//!
+//! ```rust
+//! # #[macro_use] extern crate nom;
+//! # fn main() {
+//! use nom::{error::ErrorKind, Needed,
+//! number::streaming::be_u16,
+//! bytes::streaming::{tag, take},
+//! sequence::tuple};
+//!
+//! let mut tpl = tuple((be_u16, take(3u8), tag("fg")));
+//!
+//! assert_eq!(
+//!   tpl(&b"abcdefgh"[..]),
+//!   Ok((
+//!     &b"h"[..],
+//!     (0x6162u16, &b"cde"[..], &b"fg"[..])
+//!   ))
+//! );
+//! assert_eq!(tpl(&b"abcde"[..]), Err(nom::Err::Incomplete(Needed::new(2))));
+//! let input = &b"abcdejk"[..];
+//! assert_eq!(tpl(input), Err(nom::Err::Error((&input[5..], ErrorKind::Tag))));
+//! # }
+//! ```
+//!
+//! But you can also use a sequence of combinators written in imperative style,
+//! thanks to the `?` operator:
+//!
+//! ```rust
+//! # #[macro_use] extern crate nom;
+//! # fn main() {
+//! use nom::{IResult, bytes::complete::tag};
+//!
+//! #[derive(Debug, PartialEq)]
+//! struct A {
+//!   a: u8,
+//!   b: u8
+//! }
+//!
+//! fn ret_int1(i:&[u8]) -> IResult<&[u8], u8> { Ok((i,1)) }
+//! fn ret_int2(i:&[u8]) -> IResult<&[u8], u8> { Ok((i,2)) }
+//!
+//! fn f(i: &[u8]) -> IResult<&[u8], A> {
+//!   // if successful, the parser returns `Ok((remaining_input, output_value))` that we can destructure
+//!   let (i, _) = tag("abcd")(i)?;
+//!   let (i, a) = ret_int1(i)?;
+//!   let (i, _) = tag("efgh")(i)?;
+//!   let (i, b) = ret_int2(i)?;
+//!
+//!   Ok((i, A { a, b }))
+//! }
+//!
+//! let r = f(b"abcdefghX");
+//! assert_eq!(r, Ok((&b"X"[..], A{a: 1, b: 2})));
+//! # }
+//! ```
+//!
+//! ## Streaming / Complete
+//!
+//! Some of nom's modules have `streaming` or `complete` submodules. They hold
+//! different variants of the same combinators.
+//!
+//! A streaming parser assumes that we might not have all of the input data.
+//! This can happen with some network protocol or large file parsers, where the
+//! input buffer can be full and need to be resized or refilled.
+//!
+//! A complete parser assumes that we already have all of the input data.
+//! This will be the common case with small files that can be read entirely to
+//! memory.
+//!
+//! Here is how it works in practice:
+//!
+//! ```rust
+//! use nom::{IResult, Err, Needed, error::{Error, ErrorKind}, bytes, character};
+//!
+//! fn take_streaming(i: &[u8]) -> IResult<&[u8], &[u8]> {
+//!   bytes::streaming::take(4u8)(i)
+//! }
+//!
+//! fn take_complete(i: &[u8]) -> IResult<&[u8], &[u8]> {
+//!   bytes::complete::take(4u8)(i)
+//! }
+//!
+//! // both parsers will take 4 bytes as expected
+//! assert_eq!(take_streaming(&b"abcde"[..]), Ok((&b"e"[..], &b"abcd"[..])));
+//! assert_eq!(take_complete(&b"abcde"[..]), Ok((&b"e"[..], &b"abcd"[..])));
+//!
+//! // if the input is smaller than 4 bytes, the streaming parser
+//! // will return `Incomplete` to indicate that we need more data
+//! assert_eq!(take_streaming(&b"abc"[..]), Err(Err::Incomplete(Needed::new(1))));
+//!
+//! // but the complete parser will return an error
+//! assert_eq!(take_complete(&b"abc"[..]), Err(Err::Error(Error::new(&b"abc"[..], ErrorKind::Eof))));
+//!
+//! // the alpha0 function recognizes 0 or more alphabetic characters
+//! fn alpha0_streaming(i: &str) -> IResult<&str, &str> {
+//!   character::streaming::alpha0(i)
+//! }
+//!
+//! fn alpha0_complete(i: &str) -> IResult<&str, &str> {
+//!   character::complete::alpha0(i)
+//! }
+//!
+//! // if there's a clear limit to the recognized characters, both parsers work the same way
+//! assert_eq!(alpha0_streaming("abcd;"), Ok((";", "abcd")));
+//! assert_eq!(alpha0_complete("abcd;"), Ok((";", "abcd")));
+//!
+//! // but when there's no limit, the streaming version returns `Incomplete`, because it cannot
+//! // know if more input data should be recognized. The whole input could be "abcd;", or
+//! // "abcde;"
+//! assert_eq!(alpha0_streaming("abcd"), Err(Err::Incomplete(Needed::new(1))));
+//!
+//! // while the complete version knows that all of the data is there
+//! assert_eq!(alpha0_complete("abcd"), Ok(("", "abcd")));
+//! ```
+//! **Going further:** Read the [guides](https://github.com/Geal/nom/tree/master/doc),
+//! check out the [recipes]!
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::doc_markdown))]
+#![cfg_attr(nightly, feature(test))]
+#![cfg_attr(feature = "docsrs", feature(doc_cfg))]
+#![cfg_attr(feature = "docsrs", feature(external_doc))]
+#![deny(missing_docs)]
+#![warn(missing_doc_code_examples)]
+
+#[cfg(feature = "alloc")]
+#[macro_use]
+extern crate alloc;
+#[cfg(feature = "bitvec")]
+pub extern crate bitvec;
+#[cfg(doctest)]
+extern crate doc_comment;
+#[cfg(feature = "lexical")]
+extern crate lexical_core;
+extern crate memchr;
+#[cfg(feature = "regexp")]
+pub extern crate regex;
+#[cfg(nightly)]
+extern crate test;
+
+#[cfg(doctest)]
+doc_comment::doctest!("../README.md");
+
+/// Lib module to re-export everything needed from `std` or `core`/`alloc`. This is how `serde` does
+/// it, albeit there it is not public.
+#[allow(missing_doc_code_examples)]
+pub mod lib {
+  /// `std` facade allowing `std`/`core` to be interchangeable. Reexports `alloc` crate optionally,
+  /// as well as `core` or `std`
+  #[cfg(not(feature = "std"))]
+  #[allow(missing_doc_code_examples)]
+  /// internal std exports for no_std compatibility
+  pub mod std {
+    #[cfg(not(feature = "alloc"))]
+    pub use core::borrow;
+
+    #[cfg(feature = "alloc")]
+    pub use alloc::{borrow, boxed, string, vec};
+
+    pub use core::{cmp, convert, fmt, iter, mem, ops, option, result, slice, str};
+
+    /// internal reproduction of std prelude
+    pub mod prelude {
+      pub use core::prelude as v1;
+    }
+  }
+
+  #[cfg(feature = "std")]
+  #[allow(missing_doc_code_examples)]
+  /// internal std exports for no_std compatibility
+  pub mod std {
+    pub use std::{
+      alloc, borrow, boxed, cmp, collections, convert, fmt, hash, iter, mem, ops, option, result,
+      slice, str, string, vec,
+    };
+
+    /// internal reproduction of std prelude
+    pub mod prelude {
+      pub use std::prelude as v1;
+    }
+  }
+
+  #[cfg(feature = "regexp")]
+  pub use regex;
+}
+
+pub use self::bits::*;
+pub use self::internal::*;
+pub use self::traits::*;
+pub use self::util::*;
+
+#[cfg(feature = "regexp")]
+pub use self::regexp::*;
+pub use self::str::*;
+
+#[macro_use]
+mod util;
+
+#[macro_use]
+pub mod error;
+
+#[macro_use]
+mod internal;
+mod traits;
+#[macro_use]
+pub mod combinator;
+#[macro_use]
+pub mod branch;
+#[macro_use]
+pub mod sequence;
+#[macro_use]
+pub mod multi;
+
+#[macro_use]
+pub mod bytes;
+#[macro_use]
+pub mod bits;
+
+#[macro_use]
+pub mod character;
+
+#[cfg(feature = "regexp")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "regexp")))]
+#[macro_use]
+pub mod regexp;
+
+mod str;
+
+#[macro_use]
+pub mod number;
+
+#[cfg(feature = "docsrs")]
+#[cfg_attr(feature = "docsrs", doc(include = "../doc/nom_recipes.md"))]
+pub mod recipes {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/multi/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/multi/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/multi/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/multi/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1079 @@
+//! Parsers for applying parsers multiple times
+
+/// `separated_list0!(I -> IResult<I,T>, I -> IResult<I,O>) => I -> IResult<I, Vec<O>>`
+/// `separated_list0(sep, X)` returns a `Vec<X>`.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::multi::separated_list0;
+/// use nom::bytes::complete::tag;
+///
+/// # fn main() {
+/// named!(parser<&str, Vec<&str>>, separated_list0!(tag("|"), tag("abc")));
+///
+/// assert_eq!(parser("abc|abc|abc"), Ok(("", vec!["abc", "abc", "abc"])));
+/// assert_eq!(parser("abc123abc"), Ok(("123abc", vec!["abc"])));
+/// assert_eq!(parser("abc|def"), Ok(("|def", vec!["abc"])));
+/// assert_eq!(parser(""), Ok(("", vec![])));
+/// assert_eq!(parser("def|abc"), Ok(("def|abc", vec![])));
+/// # }
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[macro_export(local_inner_macros)]
+macro_rules! separated_list0(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    separated_list0!($i, |i| $submac!(i, $($args)*), |i| $submac2!(i, $($args2)*))
+  );
+
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    separated_list0!($i, |i| $submac!(i, $($args)*), $g);
+  );
+
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    separated_list0!($i, $f, |i| $submac!(i, $($args)*));
+  );
+
+  ($i:expr, $f:expr, $g:expr) => (
+    $crate::multi::separated_list0c($i, $f, $g)
+  );
+);
+
+/// `separated_list1!(I -> IResult<I,T>, I -> IResult<I,O>) => I -> IResult<I, Vec<O>>`
+/// `separated_list1(sep, X)` returns a `Vec<X>`.
+///
+/// It will return an error if there is no element in the list.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::multi::separated_list1;
+/// use nom::bytes::complete::tag;
+///
+/// # fn main() {
+/// named!(parser<&str, Vec<&str>>, separated_list1!(tag("|"), tag("abc")));
+///
+/// assert_eq!(parser("abc|abc|abc"), Ok(("", vec!["abc", "abc", "abc"])));
+/// assert_eq!(parser("abc123abc"), Ok(("123abc", vec!["abc"])));
+/// assert_eq!(parser("abc|def"), Ok(("|def", vec!["abc"])));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Tag))));
+/// assert_eq!(parser("def|abc"), Err(Err::Error(Error::new("def|abc", ErrorKind::Tag))));
+/// # }
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[macro_export(local_inner_macros)]
+macro_rules! separated_list1(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    separated_list1!($i, |i| $submac!(i, $($args)*), |i| $submac2!(i, $($args2)*))
+  );
+
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    separated_list1!($i, |i| $submac!(i, $($args)*), $g);
+  );
+
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    separated_list1!($i, $f, |i| $submac!(i, $($args)*));
+  );
+
+  ($i:expr, $f:expr, $g:expr) => (
+    $crate::multi::separated_list1c($i, $f, $g)
+  );
+);
+
+/// `many0!(I -> IResult<I,O>) => I -> IResult<I, Vec<O>>`
+/// Applies the parser 0 or more times and returns the list of results in a `Vec`.
+///
+/// The embedded parser may return `Incomplete`.
+///
+/// `many0` will only return `Error` if the embedded parser does not consume any input
+/// (to avoid infinite loops).
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(multi<&[u8], Vec<&[u8]> >, many0!( tag!( "abcd" ) ) );
+///
+///  let a = b"abcdabcdefgh";
+///  let b = b"azerty";
+///
+///  let res = vec![&b"abcd"[..], &b"abcd"[..]];
+///  assert_eq!(multi(&a[..]),Ok((&b"efgh"[..], res)));
+///  assert_eq!(multi(&b[..]),Ok((&b"azerty"[..], Vec::new())));
+/// # }
+/// ```
+///
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[macro_export(local_inner_macros)]
+macro_rules! many0(
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    many0!($i, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $f:expr) => (
+    $crate::multi::many0c($i, $f)
+  );
+);
+
+/// `many1!(I -> IResult<I,O>) => I -> IResult<I, Vec<O>>`
+/// Applies the parser 1 or more times and returns the list of results in a `Vec`.
+///
+/// The embedded parser may return `Incomplete`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///  named!(multi<&[u8], Vec<&[u8]> >, many1!( tag!( "abcd" ) ) );
+///
+///  let a = b"abcdabcdefgh";
+///  let b = b"azerty";
+///
+///  let res = vec![&b"abcd"[..], &b"abcd"[..]];
+///  assert_eq!(multi(&a[..]), Ok((&b"efgh"[..], res)));
+///  assert_eq!(multi(&b[..]), Err(Err::Error(error_position!(&b[..], ErrorKind::Tag))));
+/// # }
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[macro_export(local_inner_macros)]
+macro_rules! many1(
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    many1!($i, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $f:expr) => (
+    $crate::multi::many1c($i, $f)
+  );
+);
+
+/// `many_till!(I -> IResult<I,O>, I -> IResult<I,P>) => I -> IResult<I, (Vec<O>, P)>`
+/// Applies the first parser until the second applies. Returns a tuple containing the list
+/// of results from the first in a Vec and the result of the second.
+///
+/// The first embedded parser may return `Incomplete`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///    named!(multi<&[u8], (Vec<&[u8]>, &[u8]) >, many_till!( tag!( "abcd" ), tag!( "efgh" ) ) );
+///
+///    let a = b"abcdabcdefghabcd";
+///    let b = b"efghabcd";
+///    let c = b"azerty";
+///
+///    let res_a = (vec![&b"abcd"[..], &b"abcd"[..]], &b"efgh"[..]);
+///    let res_b: (Vec<&[u8]>, &[u8]) = (Vec::new(), &b"efgh"[..]);
+///    assert_eq!(multi(&a[..]),Ok((&b"abcd"[..], res_a)));
+///    assert_eq!(multi(&b[..]),Ok((&b"abcd"[..], res_b)));
+///    assert_eq!(multi(&c[..]), Err(Err::Error(error_node_position!(&c[..], ErrorKind::ManyTill,
+///      error_position!(&c[..], ErrorKind::Tag)))));
+/// # }
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[macro_export(local_inner_macros)]
+macro_rules! many_till(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    many_till!($i, |i| $submac!(i, $($args)*), |i| $submac2!(i, $($args2)*))
+  );
+
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    many_till!($i, |i| $submac!(i, $($args)*), $g);
+  );
+
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    many_till!($i, $f, |i| $submac!(i, $($args)*));
+  );
+
+  ($i:expr, $f:expr, $g:expr) => (
+    $crate::multi::many_tillc($i, $f, $g)
+  );
+);
+
+/// `many_m_n!(usize, usize, I -> IResult<I,O>) => I -> IResult<I, Vec<O>>`
+/// Applies the parser between m and n times (n included) and returns the list of
+/// results in a `Vec`.
+///
+/// the embedded parser may return Incomplete
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///  named!(multi<&[u8], Vec<&[u8]> >, many_m_n!(2, 4, tag!( "abcd" ) ) );
+///
+///  let a = b"abcdefgh";
+///  let b = b"abcdabcdefgh";
+///  let c = b"abcdabcdabcdabcdabcdefgh";
+///
+///  assert_eq!(multi(&a[..]), Err(Err::Error(error_position!(&b"efgh"[..], ErrorKind::Tag))));
+///  let res = vec![&b"abcd"[..], &b"abcd"[..]];
+///  assert_eq!(multi(&b[..]),Ok((&b"efgh"[..], res)));
+///  let res2 = vec![&b"abcd"[..], &b"abcd"[..], &b"abcd"[..], &b"abcd"[..]];
+///  assert_eq!(multi(&c[..]),Ok((&b"abcdefgh"[..], res2)));
+/// # }
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[macro_export(local_inner_macros)]
+macro_rules! many_m_n(
+  ($i:expr, $m:expr, $n: expr, $submac:ident!( $($args:tt)* )) => (
+    many_m_n!($i, $m, $n, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $m:expr, $n: expr, $f:expr) => (
+    $crate::multi::many_m_nc($i, $m, $n, $f)
+  );
+);
+
+/// `many0_count!(I -> IResult<I,O>) => I -> IResult<I, usize>`
+/// Applies the parser 0 or more times and returns the number of times the parser was applied.
+///
+/// `many0_count` will only return `Error` if the embedded parser does not consume any input
+/// (to avoid infinite loops).
+///
+/// ```
+/// #[macro_use] extern crate nom;
+/// use nom::character::streaming::digit1;
+///
+/// named!(number<&[u8], usize>, many0_count!(pair!(digit1, tag!(","))));
+///
+/// fn main() {
+///     assert_eq!(number(&b"123,45,abc"[..]), Ok((&b"abc"[..], 2)));
+/// }
+/// ```
+///
+#[macro_export]
+macro_rules! many0_count {
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::multi::many0_countc($i, |i| $submac!(i, $($args)*))
+  );
+
+  ($i:expr, $f:expr) => (
+    $crate::multi::many0_countc($i, $f)
+  );
+}
+
+/// `many1_count!(I -> IResult<I,O>) => I -> IResult<I, usize>`
+/// Applies the parser 1 or more times and returns the number of times the parser was applied.
+///
+/// ```
+/// #[macro_use] extern crate nom;
+/// use nom::character::streaming::digit1;
+///
+/// named!(number<&[u8], usize>, many1_count!(pair!(digit1, tag!(","))));
+///
+/// fn main() {
+///     assert_eq!(number(&b"123,45,abc"[..]), Ok((&b"abc"[..], 2)));
+/// }
+/// ```
+///
+#[macro_export]
+macro_rules! many1_count {
+  ($i:expr, $submac:ident!( $($args:tt)* )) => (
+    $crate::multi::many1_countc($i, |i| $submac!(i, $($args)*))
+  );
+
+  ($i:expr, $f:expr) => (
+    $crate::multi::many1_countc($i, $f)
+  );
+}
+
+/// `count!(I -> IResult<I,O>, nb) => I -> IResult<I, Vec<O>>`
+/// Applies the child parser a specified number of times.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///  named!(counter< Vec<&[u8]> >, count!( tag!( "abcd" ), 2 ) );
+///
+///  let a = b"abcdabcdabcdef";
+///  let b = b"abcdefgh";
+///  let res = vec![&b"abcd"[..], &b"abcd"[..]];
+///
+///  assert_eq!(counter(&a[..]),Ok((&b"abcdef"[..], res)));
+///  assert_eq!(counter(&b[..]), Err(Err::Error(error_position!(&b"efgh"[..], ErrorKind::Tag))));
+/// # }
+/// ```
+///
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+#[macro_export(local_inner_macros)]
+macro_rules! count(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $count: expr) => (
+    count!($i, |i| $submac!(i, $($args)*), $count)
+  );
+  ($i:expr, $f:expr, $count: expr) => (
+    $crate::multi::count($f, $count)($i)
+  );
+);
+
+/// `length_count!(I -> IResult<I, nb>, I -> IResult<I,O>) => I -> IResult<I, Vec<O>>`
+/// Gets a number from the first parser, then applies the second parser that many times.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// # use nom::error::ErrorKind;
+/// use nom::number::complete::be_u8;
+/// # fn main() {
+/// named!(parser<Vec<&[u8]>>, length_count!(be_u8, tag!("abc")));
+///
+/// assert_eq!(parser(&b"\x02abcabcabc"[..]), Ok(((&b"abc"[..], vec![&b"abc"[..], &b"abc"[..]]))));
+/// assert_eq!(parser(&b"\x04abcabcabc"[..]), Err(Err::Incomplete(Needed::new(3))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+macro_rules! length_count(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      use $crate::Err;
+
+      match $submac!($i, $($args)*) {
+        Err(e)     => Err(Err::convert(e)),
+        Ok((i, o)) => {
+          match count!(i, $submac2!($($args2)*), o as usize) {
+            Err(e)       => Err(Err::convert(e)),
+            Ok((i2, o2)) => Ok((i2, o2))
+          }
+        }
+      }
+    }
+  );
+
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    length_count!($i, $submac!($($args)*), call!($g));
+  );
+
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    length_count!($i, call!($f), $submac!($($args)*));
+  );
+
+  ($i:expr, $f:expr, $g:expr) => (
+    length_count!($i, call!($f), call!($g));
+  );
+);
+
+/// `length_data!(I -> IResult<I, nb>) => O`
+///
+/// `length_data` gets a number from the first parser, then takes a subslice of the input
+/// of that size and returns that subslice.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// # use nom::error::ErrorKind;
+/// use nom::number::complete::be_u8;
+/// # fn main() {
+/// named!(parser, length_data!(be_u8));
+///
+/// assert_eq!(parser(&b"\x06abcabcabc"[..]), Ok((&b"abc"[..], &b"abcabc"[..])));
+/// assert_eq!(parser(&b"\x06abc"[..]), Err(Err::Incomplete(Needed::new(3))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! length_data(
+  ($i:expr, $submac:ident!( $($args:tt)* )) => ({
+    $crate::multi::length_data(|i| $submac!(i, $($args)*))($i)
+  });
+
+  ($i:expr, $f:expr) => (
+    $crate::multi::length_data($f)($i)
+  );
+);
+
+/// `length_value!(I -> IResult<I, nb>, I -> IResult<I,O>) => I -> IResult<I, O>`
+///
+/// Gets a number from the first parser, takes a subslice of the input of that size,
+/// then applies the second parser on that subslice. If the second parser returns
+/// `Incomplete`, `length_value` will return an error.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// # use nom::error::ErrorKind;
+/// use nom::number::complete::be_u8;
+/// use nom::character::complete::alpha0;
+/// use nom::bytes::complete::tag;
+/// # fn main() {
+/// named!(parser, length_value!(be_u8, alpha0));
+///
+/// assert_eq!(parser(&b"\x06abcabcabc"[..]), Ok((&b"abc"[..], &b"abcabc"[..])));
+/// assert_eq!(parser(&b"\x06abc"[..]), Err(Err::Incomplete(Needed::new(3))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! length_value(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    length_value!($i, |i| $submac!(i, $($args)*), |i| $submac2!(i, $($args2)*))
+  );
+
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    length_value!($i, |i| $submac!(i, $($args)*), $g);
+  );
+
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    length_value!($i, $f, |i| $submac!(i, $($args)*));
+  );
+
+  ($i:expr, $f:expr, $g:expr) => (
+    $crate::multi::length_valuec($i, $f, $g);
+  );
+);
+
+/// `fold_many0!(I -> IResult<I,O>, R, Fn(R, O) -> R) => I -> IResult<I, R>`
+/// Applies the parser 0 or more times and folds the list of return values.
+///
+/// The embedded parser may return `Incomplete`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///  named!(multi<&[u8], Vec<&[u8]> >,
+///    fold_many0!( tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| {
+///      acc.push(item);
+///      acc
+///  }));
+///
+///  let a = b"abcdabcdefgh";
+///  let b = b"azerty";
+///
+///  let res = vec![&b"abcd"[..], &b"abcd"[..]];
+///  assert_eq!(multi(&a[..]),Ok((&b"efgh"[..], res)));
+///  assert_eq!(multi(&b[..]),Ok((&b"azerty"[..], Vec::new())));
+/// # }
+/// ```
+/// 0 or more
+#[macro_export(local_inner_macros)]
+macro_rules! fold_many0(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $init:expr, $fold_f:expr) => (
+    fold_many0!($i, |i| $submac!(i, $($args)*), $init, $fold_f)
+  );
+  ($i:expr, $f:expr, $init:expr, $fold_f:expr) => (
+    $crate::multi::fold_many0c($i, $f, $init, $fold_f)
+  );
+);
+
+/// `fold_many1!(I -> IResult<I,O>, R, Fn(R, O) -> R) => I -> IResult<I, R>`
+/// Applies the parser 1 or more times and folds the list of return values.
+///
+/// The embedded parser may return `Incomplete`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///  named!(multi<&[u8], Vec<&[u8]> >,
+///    fold_many1!( tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| {
+///      acc.push(item);
+///      acc
+///  }));
+///
+///  let a = b"abcdabcdefgh";
+///  let b = b"azerty";
+///
+///  let res = vec![&b"abcd"[..], &b"abcd"[..]];
+///  assert_eq!(multi(&a[..]),Ok((&b"efgh"[..], res)));
+///  assert_eq!(multi(&b[..]), Err(Err::Error(error_position!(&b[..], ErrorKind::Many1))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! fold_many1(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $init:expr, $fold_f:expr) => (
+    fold_many1!($i, |i| $submac!(i, $($args)*), $init, $fold_f)
+  );
+  ($i:expr, $f:expr, $init:expr, $fold_f:expr) => (
+    $crate::multi::fold_many1c($i, $f, $init, $fold_f)
+  );
+  ($i:expr, $f:expr, $init:expr, $fold_f:expr) => (
+    fold_many1!($i, call!($f), $init, $fold_f);
+  );
+);
+
+/// `fold_many_m_n!(usize, usize, I -> IResult<I,O>, R, Fn(R, O) -> R) => I -> IResult<I, R>`
+/// Applies the parser between m and n times (n included) and folds the list of return value.
+///
+/// The embedded parser may return `Incomplete`.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::ErrorKind;
+/// # fn main() {
+///  named!(multi<&[u8], Vec<&[u8]> >,
+///    fold_many_m_n!(2, 4, tag!( "abcd" ), Vec::new(), |mut acc: Vec<_>, item| {
+///      acc.push(item);
+///      acc
+///  }));
+///
+///  let a = b"abcdefgh";
+///  let b = b"abcdabcdefgh";
+///  let c = b"abcdabcdabcdabcdabcdefgh";
+///
+///  assert_eq!(multi(&a[..]), Err(Err::Error(error_position!(&b"efgh"[..], ErrorKind::Tag))));
+///  let res = vec![&b"abcd"[..], &b"abcd"[..]];
+///  assert_eq!(multi(&b[..]),Ok((&b"efgh"[..], res)));
+///  let res2 = vec![&b"abcd"[..], &b"abcd"[..], &b"abcd"[..], &b"abcd"[..]];
+///  assert_eq!(multi(&c[..]),Ok((&b"abcdefgh"[..], res2)));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! fold_many_m_n(
+  ($i:expr, $m:expr, $n:expr, $submac:ident!( $($args:tt)* ), $init:expr, $fold_f:expr) => (
+    fold_many_m_n!($i, $m, $n, |i| $submac!(i, $($args)*), $init, $fold_f)
+  );
+  ($i:expr, $m:expr, $n:expr, $f:expr, $init:expr, $fold_f:expr) => (
+    $crate::multi::fold_many_m_nc($i, $m, $n, $f, $init, $fold_f)
+  );
+);
+
+#[cfg(test)]
+mod tests {
+  use crate::character::streaming::digit1 as digit;
+  use crate::error::ErrorKind;
+  use crate::error::ParseError;
+  use crate::internal::{Err, IResult, Needed};
+  use crate::lib::std::str::{self, FromStr};
+  #[cfg(feature = "alloc")]
+  use crate::lib::std::vec::Vec;
+  use crate::number::streaming::{be_u16, be_u8};
+
+  // reproduce the tag and take macros, because of module import order
+  macro_rules! tag (
+    ($i:expr, $inp: expr) => (
+      {
+        #[inline(always)]
+        fn as_bytes<T: $crate::AsBytes>(b: &T) -> &[u8] {
+          b.as_bytes()
+        }
+
+        let expected = $inp;
+        let bytes    = as_bytes(&expected);
+
+        tag_bytes!($i,bytes)
+      }
+    );
+  );
+
+  macro_rules! tag_bytes (
+    ($i:expr, $bytes: expr) => (
+      {
+        use $crate::lib::std::cmp::min;
+        let len = $i.len();
+        let blen = $bytes.len();
+        let m   = min(len, blen);
+        let reduced = &$i[..m];
+        let b       = &$bytes[..m];
+
+        let res: IResult<_,_,_> = if reduced != b {
+          Err($crate::Err::Error($crate::error::make_error($i, $crate::error::ErrorKind::Tag)))
+        } else if m < blen {
+          Err($crate::Err::Incomplete(Needed::new(blen)))
+        } else {
+          Ok((&$i[blen..], reduced))
+        };
+        res
+      }
+    );
+  );
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn separated_list0() {
+    named!(multi<&[u8],Vec<&[u8]> >, separated_list0!(tag!(","), tag!("abcd")));
+    named!(multi_empty<&[u8],Vec<&[u8]> >, separated_list0!(tag!(","), tag!("")));
+    named!(empty_sep<&[u8],Vec<&[u8]> >, separated_list0!(tag!(""), tag!("abc")));
+    named!(multi_longsep<&[u8],Vec<&[u8]> >, separated_list0!(tag!(".."), tag!("abcd")));
+
+    let a = &b"abcdef"[..];
+    let b = &b"abcd,abcdef"[..];
+    let c = &b"azerty"[..];
+    let d = &b",,abc"[..];
+    let e = &b"abcd,abcd,ef"[..];
+    let f = &b"abc"[..];
+    let g = &b"abcd."[..];
+    let h = &b"abcd,abc"[..];
+    let i = &b"abcabc"[..];
+
+    let res1 = vec![&b"abcd"[..]];
+    assert_eq!(multi(a), Ok((&b"ef"[..], res1)));
+    let res2 = vec![&b"abcd"[..], &b"abcd"[..]];
+    assert_eq!(multi(b), Ok((&b"ef"[..], res2)));
+    assert_eq!(multi(c), Ok((&b"azerty"[..], Vec::new())));
+    let res3 = vec![&b""[..], &b""[..], &b""[..]];
+    assert_eq!(multi_empty(d), Ok((&b"abc"[..], res3)));
+    let i_err_pos = &i[3..];
+    assert_eq!(
+      empty_sep(i),
+      Err(Err::Error(error_position!(
+        i_err_pos,
+        ErrorKind::SeparatedList
+      )))
+    );
+    let res4 = vec![&b"abcd"[..], &b"abcd"[..]];
+    assert_eq!(multi(e), Ok((&b",ef"[..], res4)));
+
+    assert_eq!(multi(f), Err(Err::Incomplete(Needed::new(4))));
+    assert_eq!(multi_longsep(g), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(multi(h), Err(Err::Incomplete(Needed::new(4))));
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn separated_list1() {
+    named!(multi<&[u8],Vec<&[u8]> >, separated_list1!(tag!(","), tag!("abcd")));
+    named!(multi_longsep<&[u8],Vec<&[u8]> >, separated_list1!(tag!(".."), tag!("abcd")));
+
+    let a = &b"abcdef"[..];
+    let b = &b"abcd,abcdef"[..];
+    let c = &b"azerty"[..];
+    let d = &b"abcd,abcd,ef"[..];
+
+    let f = &b"abc"[..];
+    let g = &b"abcd."[..];
+    let h = &b"abcd,abc"[..];
+
+    let res1 = vec![&b"abcd"[..]];
+    assert_eq!(multi(a), Ok((&b"ef"[..], res1)));
+    let res2 = vec![&b"abcd"[..], &b"abcd"[..]];
+    assert_eq!(multi(b), Ok((&b"ef"[..], res2)));
+    assert_eq!(
+      multi(c),
+      Err(Err::Error(error_position!(c, ErrorKind::Tag)))
+    );
+    let res3 = vec![&b"abcd"[..], &b"abcd"[..]];
+    assert_eq!(multi(d), Ok((&b",ef"[..], res3)));
+
+    assert_eq!(multi(f), Err(Err::Incomplete(Needed::new(4))));
+    assert_eq!(multi_longsep(g), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(multi(h), Err(Err::Incomplete(Needed::new(4))));
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn many0() {
+    named!(tag_abcd, tag!("abcd"));
+    named!(tag_empty, tag!(""));
+    named!( multi<&[u8],Vec<&[u8]> >, many0!(tag_abcd) );
+    named!( multi_empty<&[u8],Vec<&[u8]> >, many0!(tag_empty) );
+
+    assert_eq!(multi(&b"abcdef"[..]), Ok((&b"ef"[..], vec![&b"abcd"[..]])));
+    assert_eq!(
+      multi(&b"abcdabcdefgh"[..]),
+      Ok((&b"efgh"[..], vec![&b"abcd"[..], &b"abcd"[..]]))
+    );
+    assert_eq!(multi(&b"azerty"[..]), Ok((&b"azerty"[..], Vec::new())));
+    assert_eq!(multi(&b"abcdab"[..]), Err(Err::Incomplete(Needed::new(4))));
+    assert_eq!(multi(&b"abcd"[..]), Err(Err::Incomplete(Needed::new(4))));
+    assert_eq!(multi(&b""[..]), Err(Err::Incomplete(Needed::new(4))));
+    assert_eq!(
+      multi_empty(&b"abcdef"[..]),
+      Err(Err::Error(error_position!(
+        &b"abcdef"[..],
+        ErrorKind::Many0
+      )))
+    );
+  }
+
+  #[cfg(nightly)]
+  use test::Bencher;
+
+  #[cfg(nightly)]
+  #[bench]
+  fn many0_bench(b: &mut Bencher) {
+    named!(multi<&[u8],Vec<&[u8]> >, many0!(tag!("abcd")));
+    b.iter(|| multi(&b"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"[..]));
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn many1() {
+    named!(multi<&[u8],Vec<&[u8]> >, many1!(tag!("abcd")));
+
+    let a = &b"abcdef"[..];
+    let b = &b"abcdabcdefgh"[..];
+    let c = &b"azerty"[..];
+    let d = &b"abcdab"[..];
+
+    let res1 = vec![&b"abcd"[..]];
+    assert_eq!(multi(a), Ok((&b"ef"[..], res1)));
+    let res2 = vec![&b"abcd"[..], &b"abcd"[..]];
+    assert_eq!(multi(b), Ok((&b"efgh"[..], res2)));
+    assert_eq!(
+      multi(c),
+      Err(Err::Error(error_position!(c, ErrorKind::Tag)))
+    );
+    assert_eq!(multi(d), Err(Err::Incomplete(Needed::new(4))));
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn many_till() {
+    named!(multi<&[u8], (Vec<&[u8]>, &[u8]) >, many_till!( tag!( "abcd" ), tag!( "efgh" ) ) );
+
+    let a = b"abcdabcdefghabcd";
+    let b = b"efghabcd";
+    let c = b"azerty";
+
+    let res_a = (vec![&b"abcd"[..], &b"abcd"[..]], &b"efgh"[..]);
+    let res_b: (Vec<&[u8]>, &[u8]) = (Vec::new(), &b"efgh"[..]);
+    assert_eq!(multi(&a[..]), Ok((&b"abcd"[..], res_a)));
+    assert_eq!(multi(&b[..]), Ok((&b"abcd"[..], res_b)));
+    assert_eq!(
+      multi(&c[..]),
+      Err(Err::Error(error_node_position!(
+        &c[..],
+        ErrorKind::ManyTill,
+        error_position!(&c[..], ErrorKind::Tag)
+      )))
+    );
+  }
+
+  #[test]
+  #[cfg(feature = "std")]
+  fn infinite_many() {
+    fn tst(input: &[u8]) -> IResult<&[u8], &[u8]> {
+      println!("input: {:?}", input);
+      Err(Err::Error(error_position!(input, ErrorKind::Tag)))
+    }
+
+    // should not go into an infinite loop
+    named!(multi0<&[u8],Vec<&[u8]> >, many0!(tst));
+    let a = &b"abcdef"[..];
+    assert_eq!(multi0(a), Ok((a, Vec::new())));
+
+    named!(multi1<&[u8],Vec<&[u8]> >, many1!(tst));
+    let a = &b"abcdef"[..];
+    assert_eq!(
+      multi1(a),
+      Err(Err::Error(error_position!(a, ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn many_m_n() {
+    named!(multi<&[u8],Vec<&[u8]> >, many_m_n!(2, 4, tag!("Abcd")));
+
+    let a = &b"Abcdef"[..];
+    let b = &b"AbcdAbcdefgh"[..];
+    let c = &b"AbcdAbcdAbcdAbcdefgh"[..];
+    let d = &b"AbcdAbcdAbcdAbcdAbcdefgh"[..];
+    let e = &b"AbcdAb"[..];
+
+    assert_eq!(
+      multi(a),
+      Err(Err::Error(error_position!(&b"ef"[..], ErrorKind::Tag)))
+    );
+    let res1 = vec![&b"Abcd"[..], &b"Abcd"[..]];
+    assert_eq!(multi(b), Ok((&b"efgh"[..], res1)));
+    let res2 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]];
+    assert_eq!(multi(c), Ok((&b"efgh"[..], res2)));
+    let res3 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]];
+    assert_eq!(multi(d), Ok((&b"Abcdefgh"[..], res3)));
+    assert_eq!(multi(e), Err(Err::Incomplete(Needed::new(4))));
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn count() {
+    const TIMES: usize = 2;
+    named!(tag_abc, tag!("abc"));
+    named!( cnt_2<&[u8], Vec<&[u8]> >, count!(tag_abc, TIMES ) );
+
+    assert_eq!(
+      cnt_2(&b"abcabcabcdef"[..]),
+      Ok((&b"abcdef"[..], vec![&b"abc"[..], &b"abc"[..]]))
+    );
+    assert_eq!(cnt_2(&b"ab"[..]), Err(Err::Incomplete(Needed::new(3))));
+    assert_eq!(cnt_2(&b"abcab"[..]), Err(Err::Incomplete(Needed::new(3))));
+    assert_eq!(
+      cnt_2(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      cnt_2(&b"xxxabcabcdef"[..]),
+      Err(Err::Error(error_position!(
+        &b"xxxabcabcdef"[..],
+        ErrorKind::Tag
+      )))
+    );
+    assert_eq!(
+      cnt_2(&b"abcxxxabcdef"[..]),
+      Err(Err::Error(error_position!(
+        &b"xxxabcdef"[..],
+        ErrorKind::Tag
+      )))
+    );
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn count_zero() {
+    const TIMES: usize = 0;
+    named!(tag_abc, tag!("abc"));
+    named!( counter_2<&[u8], Vec<&[u8]> >, count!(tag_abc, TIMES ) );
+
+    let done = &b"abcabcabcdef"[..];
+    let parsed_done = Vec::new();
+    let rest = done;
+    let incomplete_1 = &b"ab"[..];
+    let parsed_incompl_1 = Vec::new();
+    let incomplete_2 = &b"abcab"[..];
+    let parsed_incompl_2 = Vec::new();
+    let error = &b"xxx"[..];
+    let error_remain = &b"xxx"[..];
+    let parsed_err = Vec::new();
+    let error_1 = &b"xxxabcabcdef"[..];
+    let parsed_err_1 = Vec::new();
+    let error_1_remain = &b"xxxabcabcdef"[..];
+    let error_2 = &b"abcxxxabcdef"[..];
+    let parsed_err_2 = Vec::new();
+    let error_2_remain = &b"abcxxxabcdef"[..];
+
+    assert_eq!(counter_2(done), Ok((rest, parsed_done)));
+    assert_eq!(
+      counter_2(incomplete_1),
+      Ok((incomplete_1, parsed_incompl_1))
+    );
+    assert_eq!(
+      counter_2(incomplete_2),
+      Ok((incomplete_2, parsed_incompl_2))
+    );
+    assert_eq!(counter_2(error), Ok((error_remain, parsed_err)));
+    assert_eq!(counter_2(error_1), Ok((error_1_remain, parsed_err_1)));
+    assert_eq!(counter_2(error_2), Ok((error_2_remain, parsed_err_2)));
+  }
+
+  #[derive(Debug, Clone, PartialEq)]
+  pub struct NilError;
+
+  impl<I> From<(I, ErrorKind)> for NilError {
+    fn from(_: (I, ErrorKind)) -> Self {
+      NilError
+    }
+  }
+
+  impl<I> ParseError<I> for NilError {
+    fn from_error_kind(_: I, _: ErrorKind) -> NilError {
+      NilError
+    }
+    fn append(_: I, _: ErrorKind, _: NilError) -> NilError {
+      NilError
+    }
+  }
+
+  named!(pub number<u32>, map_res!(
+    map_res!(
+      digit,
+      str::from_utf8
+    ),
+    FromStr::from_str
+  ));
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn length_count() {
+    named!(tag_abc, tag!(&b"abc"[..]));
+    named!( cnt<&[u8], Vec<&[u8]> >, length_count!(number, tag_abc) );
+
+    assert_eq!(
+      cnt(&b"2abcabcabcdef"[..]),
+      Ok((&b"abcdef"[..], vec![&b"abc"[..], &b"abc"[..]]))
+    );
+    assert_eq!(cnt(&b"2ab"[..]), Err(Err::Incomplete(Needed::new(3))));
+    assert_eq!(cnt(&b"3abcab"[..]), Err(Err::Incomplete(Needed::new(3))));
+    assert_eq!(
+      cnt(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Digit)))
+    );
+    assert_eq!(
+      cnt(&b"2abcxxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn length_data() {
+    named!( take<&[u8], &[u8]>, length_data!(number) );
+
+    assert_eq!(
+      take(&b"6abcabcabcdef"[..]),
+      Ok((&b"abcdef"[..], &b"abcabc"[..]))
+    );
+    assert_eq!(take(&b"3ab"[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(
+      take(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Digit)))
+    );
+    assert_eq!(take(&b"2abcxxx"[..]), Ok((&b"cxxx"[..], &b"ab"[..])));
+  }
+
+  #[test]
+  fn length_value_test() {
+    named!(length_value_1<&[u8], u16 >, length_value!(be_u8, be_u16));
+    named!(length_value_2<&[u8], (u8, u8) >, length_value!(be_u8, tuple!(be_u8, be_u8)));
+
+    let i1 = [0, 5, 6];
+    assert_eq!(
+      length_value_1(&i1),
+      Err(Err::Error(error_position!(&b""[..], ErrorKind::Complete)))
+    );
+    assert_eq!(
+      length_value_2(&i1),
+      Err(Err::Error(error_position!(&b""[..], ErrorKind::Complete)))
+    );
+
+    let i2 = [1, 5, 6, 3];
+    assert_eq!(
+      length_value_1(&i2),
+      Err(Err::Error(error_position!(&i2[1..2], ErrorKind::Complete)))
+    );
+    assert_eq!(
+      length_value_2(&i2),
+      Err(Err::Error(error_position!(&i2[1..2], ErrorKind::Complete)))
+    );
+
+    let i3 = [2, 5, 6, 3, 4, 5, 7];
+    assert_eq!(length_value_1(&i3), Ok((&i3[3..], 1286)));
+    assert_eq!(length_value_2(&i3), Ok((&i3[3..], (5, 6))));
+
+    let i4 = [3, 5, 6, 3, 4, 5];
+    assert_eq!(length_value_1(&i4), Ok((&i4[4..], 1286)));
+    assert_eq!(length_value_2(&i4), Ok((&i4[4..], (5, 6))));
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn fold_many0() {
+    fn fold_into_vec<T>(mut acc: Vec<T>, item: T) -> Vec<T> {
+      acc.push(item);
+      acc
+    }
+    named!(tag_abcd, tag!("abcd"));
+    named!(tag_empty, tag!(""));
+    named!( multi<&[u8],Vec<&[u8]> >, fold_many0!(tag_abcd, Vec::new(), fold_into_vec) );
+    named!( multi_empty<&[u8],Vec<&[u8]> >, fold_many0!(tag_empty, Vec::new(), fold_into_vec) );
+
+    assert_eq!(multi(&b"abcdef"[..]), Ok((&b"ef"[..], vec![&b"abcd"[..]])));
+    assert_eq!(
+      multi(&b"abcdabcdefgh"[..]),
+      Ok((&b"efgh"[..], vec![&b"abcd"[..], &b"abcd"[..]]))
+    );
+    assert_eq!(multi(&b"azerty"[..]), Ok((&b"azerty"[..], Vec::new())));
+    assert_eq!(multi(&b"abcdab"[..]), Err(Err::Incomplete(Needed::new(4))));
+    assert_eq!(multi(&b"abcd"[..]), Err(Err::Incomplete(Needed::new(4))));
+    assert_eq!(multi(&b""[..]), Err(Err::Incomplete(Needed::new(4))));
+    assert_eq!(
+      multi_empty(&b"abcdef"[..]),
+      Err(Err::Error(error_position!(
+        &b"abcdef"[..],
+        ErrorKind::Many0
+      )))
+    );
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn fold_many1() {
+    fn fold_into_vec<T>(mut acc: Vec<T>, item: T) -> Vec<T> {
+      acc.push(item);
+      acc
+    }
+    named!(multi<&[u8],Vec<&[u8]> >, fold_many1!(tag!("abcd"), Vec::new(), fold_into_vec));
+
+    let a = &b"abcdef"[..];
+    let b = &b"abcdabcdefgh"[..];
+    let c = &b"azerty"[..];
+    let d = &b"abcdab"[..];
+
+    let res1 = vec![&b"abcd"[..]];
+    assert_eq!(multi(a), Ok((&b"ef"[..], res1)));
+    let res2 = vec![&b"abcd"[..], &b"abcd"[..]];
+    assert_eq!(multi(b), Ok((&b"efgh"[..], res2)));
+    assert_eq!(
+      multi(c),
+      Err(Err::Error(error_position!(c, ErrorKind::Many1)))
+    );
+    assert_eq!(multi(d), Err(Err::Incomplete(Needed::new(4))));
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn fold_many_m_n() {
+    fn fold_into_vec<T>(mut acc: Vec<T>, item: T) -> Vec<T> {
+      acc.push(item);
+      acc
+    }
+    named!(multi<&[u8],Vec<&[u8]> >, fold_many_m_n!(2, 4, tag!("Abcd"), Vec::new(), fold_into_vec));
+
+    let a = &b"Abcdef"[..];
+    let b = &b"AbcdAbcdefgh"[..];
+    let c = &b"AbcdAbcdAbcdAbcdefgh"[..];
+    let d = &b"AbcdAbcdAbcdAbcdAbcdefgh"[..];
+    let e = &b"AbcdAb"[..];
+
+    assert_eq!(
+      multi(a),
+      Err(Err::Error(error_position!(&b"ef"[..], ErrorKind::Tag)))
+    );
+    let res1 = vec![&b"Abcd"[..], &b"Abcd"[..]];
+    assert_eq!(multi(b), Ok((&b"efgh"[..], res1)));
+    let res2 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]];
+    assert_eq!(multi(c), Ok((&b"efgh"[..], res2)));
+    let res3 = vec![&b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..], &b"Abcd"[..]];
+    assert_eq!(multi(d), Ok((&b"Abcdefgh"[..], res3)));
+    assert_eq!(multi(e), Err(Err::Incomplete(Needed::new(4))));
+  }
+
+  #[test]
+  fn many0_count() {
+    named!(
+      count0_nums(&[u8]) -> usize,
+      many0_count!(pair!(digit, tag!(",")))
+    );
+
+    assert_eq!(count0_nums(&b"123,junk"[..]), Ok((&b"junk"[..], 1)));
+
+    assert_eq!(count0_nums(&b"123,45,junk"[..]), Ok((&b"junk"[..], 2)));
+
+    assert_eq!(
+      count0_nums(&b"1,2,3,4,5,6,7,8,9,0,junk"[..]),
+      Ok((&b"junk"[..], 10))
+    );
+
+    assert_eq!(count0_nums(&b"hello"[..]), Ok((&b"hello"[..], 0)));
+  }
+
+  #[test]
+  fn many1_count() {
+    named!(
+      count1_nums(&[u8]) -> usize,
+      many1_count!(pair!(digit, tag!(",")))
+    );
+
+    assert_eq!(count1_nums(&b"123,45,junk"[..]), Ok((&b"junk"[..], 2)));
+
+    assert_eq!(
+      count1_nums(&b"1,2,3,4,5,6,7,8,9,0,junk"[..]),
+      Ok((&b"junk"[..], 10))
+    );
+
+    assert_eq!(
+      count1_nums(&b"hello"[..]),
+      Err(Err::Error(error_position!(
+        &b"hello"[..],
+        ErrorKind::Many1Count
+      )))
+    );
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/multi/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/multi/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/multi/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/multi/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1122 @@
+//! Combinators applying their child parser multiple times
+
+#[macro_use]
+mod macros;
+
+use crate::error::ErrorKind;
+use crate::error::ParseError;
+use crate::internal::{Err, IResult, Needed, Parser};
+#[cfg(feature = "alloc")]
+use crate::lib::std::vec::Vec;
+use crate::traits::{InputLength, InputTake, ToUsize};
+use core::num::NonZeroUsize;
+
+/// Repeats the embedded parser until it fails
+/// and returns the results in a `Vec`.
+///
+/// # Arguments
+/// * `f` The parser to apply.
+///
+/// *Note*: if the parser passed to `many0` accepts empty inputs
+/// (like `alpha0` or `digit0`), `many0` will return an error,
+/// to prevent going into an infinite loop
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::multi::many0;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   many0(tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", vec!["abc", "abc"])));
+/// assert_eq!(parser("abc123"), Ok(("123", vec!["abc"])));
+/// assert_eq!(parser("123123"), Ok(("123123", vec![])));
+/// assert_eq!(parser(""), Ok(("", vec![])));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn many0<I, O, E, F>(mut f: F) -> impl FnMut(I) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  E: ParseError<I>,
+{
+  move |mut i: I| {
+    let mut acc = crate::lib::std::vec::Vec::with_capacity(4);
+    loop {
+      match f.parse(i.clone()) {
+        Err(Err::Error(_)) => return Ok((i, acc)),
+        Err(e) => return Err(e),
+        Ok((i1, o)) => {
+          if i1 == i {
+            return Err(Err::Error(E::from_error_kind(i, ErrorKind::Many0)));
+          }
+
+          i = i1;
+          acc.push(o);
+        }
+      }
+    }
+  }
+}
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn many0c<I, O, E, F>(input: I, f: F) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  E: ParseError<I>,
+{
+  many0(f)(input)
+}
+
+/// Runs the embedded parser until it fails and
+/// returns the results in a `Vec`. Fails if
+/// the embedded parser does not produce at least
+/// one result.
+///
+/// # Arguments
+/// * `f` The parser to apply.
+///
+/// *Note*: If the parser passed to `many1` accepts empty inputs
+/// (like `alpha0` or `digit0`), `many1` will return an error,
+/// to prevent going into an infinite loop.
+///
+/// ```rust
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::multi::many1;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   many1(tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", vec!["abc", "abc"])));
+/// assert_eq!(parser("abc123"), Ok(("123", vec!["abc"])));
+/// assert_eq!(parser("123123"), Err(Err::Error(Error::new("123123", ErrorKind::Tag))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Tag))));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn many1<I, O, E, F>(mut f: F) -> impl FnMut(I) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  E: ParseError<I>,
+{
+  move |mut i: I| match f.parse(i.clone()) {
+    Err(Err::Error(err)) => Err(Err::Error(E::append(i, ErrorKind::Many1, err))),
+    Err(e) => Err(e),
+    Ok((i1, o)) => {
+      let mut acc = crate::lib::std::vec::Vec::with_capacity(4);
+      acc.push(o);
+      i = i1;
+
+      loop {
+        match f.parse(i.clone()) {
+          Err(Err::Error(_)) => return Ok((i, acc)),
+          Err(e) => return Err(e),
+          Ok((i1, o)) => {
+            if i1 == i {
+              return Err(Err::Error(E::from_error_kind(i, ErrorKind::Many1)));
+            }
+
+            i = i1;
+            acc.push(o);
+          }
+        }
+      }
+    }
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn many1c<I, O, E, F>(input: I, f: F) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  E: ParseError<I>,
+{
+  many1(f)(input)
+}
+
+/// Applies the parser `f` until the parser `g` produces
+/// a result. Returns a pair consisting of the results of
+/// `f` in a `Vec` and the result of `g`.
+/// ```rust
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::multi::many_till;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, (Vec<&str>, &str)> {
+///   many_till(tag("abc"), tag("end"))(s)
+/// };
+///
+/// assert_eq!(parser("abcabcend"), Ok(("", (vec!["abc", "abc"], "end"))));
+/// assert_eq!(parser("abc123end"), Err(Err::Error(Error::new("123end", ErrorKind::Tag))));
+/// assert_eq!(parser("123123end"), Err(Err::Error(Error::new("123123end", ErrorKind::Tag))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Tag))));
+/// assert_eq!(parser("abcendefg"), Ok(("efg", (vec!["abc"], "end"))));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn many_till<I, O, P, E, F, G>(
+  mut f: F,
+  mut g: G,
+) -> impl FnMut(I) -> IResult<I, (Vec<O>, P), E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  G: Parser<I, P, E>,
+  E: ParseError<I>,
+{
+  move |mut i: I| {
+    let mut res = crate::lib::std::vec::Vec::new();
+    loop {
+      match g.parse(i.clone()) {
+        Ok((i1, o)) => return Ok((i1, (res, o))),
+        Err(Err::Error(_)) => {
+          match f.parse(i.clone()) {
+            Err(Err::Error(err)) => return Err(Err::Error(E::append(i, ErrorKind::ManyTill, err))),
+            Err(e) => return Err(e),
+            Ok((i1, o)) => {
+              // loop trip must always consume (otherwise infinite loops)
+              if i1 == i {
+                return Err(Err::Error(E::from_error_kind(i1, ErrorKind::ManyTill)));
+              }
+
+              res.push(o);
+              i = i1;
+            }
+          }
+        }
+        Err(e) => return Err(e),
+      }
+    }
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn many_tillc<I, O, P, E, F, G>(i: I, f: F, g: G) -> IResult<I, (Vec<O>, P), E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  G: Fn(I) -> IResult<I, P, E>,
+  E: ParseError<I>,
+{
+  many_till(f, g)(i)
+}
+
+/// Alternates between two parsers to produce
+/// a list of elements.
+/// # Arguments
+/// * `sep` Parses the separator between list elements.
+/// * `f` Parses the elements of the list.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::multi::separated_list0;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   separated_list0(tag("|"), tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser("abc|abc|abc"), Ok(("", vec!["abc", "abc", "abc"])));
+/// assert_eq!(parser("abc123abc"), Ok(("123abc", vec!["abc"])));
+/// assert_eq!(parser("abc|def"), Ok(("|def", vec!["abc"])));
+/// assert_eq!(parser(""), Ok(("", vec![])));
+/// assert_eq!(parser("def|abc"), Ok(("def|abc", vec![])));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn separated_list0<I, O, O2, E, F, G>(
+  mut sep: G,
+  mut f: F,
+) -> impl FnMut(I) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  G: Parser<I, O2, E>,
+  E: ParseError<I>,
+{
+  move |mut i: I| {
+    let mut res = Vec::new();
+
+    match f.parse(i.clone()) {
+      Err(Err::Error(_)) => return Ok((i, res)),
+      Err(e) => return Err(e),
+      Ok((i1, o)) => {
+        res.push(o);
+        i = i1;
+      }
+    }
+
+    loop {
+      match sep.parse(i.clone()) {
+        Err(Err::Error(_)) => return Ok((i, res)),
+        Err(e) => return Err(e),
+        Ok((i1, _)) => {
+          if i1 == i {
+            return Err(Err::Error(E::from_error_kind(i1, ErrorKind::SeparatedList)));
+          }
+
+          match f.parse(i1.clone()) {
+            Err(Err::Error(_)) => return Ok((i, res)),
+            Err(e) => return Err(e),
+            Ok((i2, o)) => {
+              res.push(o);
+              i = i2;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn separated_list0c<I, O, O2, E, F, G>(i: I, sep: G, f: F) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  G: Fn(I) -> IResult<I, O2, E>,
+  E: ParseError<I>,
+{
+  separated_list0(sep, f)(i)
+}
+
+/// Alternates between two parsers to produce
+/// a list of elements. Fails if the element
+/// parser does not produce at least one element.
+/// # Arguments
+/// * `sep` Parses the separator between list elements.
+/// * `f` Parses the elements of the list.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::multi::separated_list1;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   separated_list1(tag("|"), tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser("abc|abc|abc"), Ok(("", vec!["abc", "abc", "abc"])));
+/// assert_eq!(parser("abc123abc"), Ok(("123abc", vec!["abc"])));
+/// assert_eq!(parser("abc|def"), Ok(("|def", vec!["abc"])));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Tag))));
+/// assert_eq!(parser("def|abc"), Err(Err::Error(Error::new("def|abc", ErrorKind::Tag))));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn separated_list1<I, O, O2, E, F, G>(
+  mut sep: G,
+  mut f: F,
+) -> impl FnMut(I) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  G: Parser<I, O2, E>,
+  E: ParseError<I>,
+{
+  move |mut i: I| {
+    let mut res = Vec::new();
+
+    // Parse the first element
+    match f.parse(i.clone()) {
+      Err(e) => return Err(e),
+      Ok((i1, o)) => {
+        res.push(o);
+        i = i1;
+      }
+    }
+
+    loop {
+      match sep.parse(i.clone()) {
+        Err(Err::Error(_)) => return Ok((i, res)),
+        Err(e) => return Err(e),
+        Ok((i1, _)) => {
+          if i1 == i {
+            return Err(Err::Error(E::from_error_kind(i1, ErrorKind::SeparatedList)));
+          }
+
+          match f.parse(i1.clone()) {
+            Err(Err::Error(_)) => return Ok((i, res)),
+            Err(e) => return Err(e),
+            Ok((i2, o)) => {
+              res.push(o);
+              i = i2;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn separated_list1c<I, O, O2, E, F, G>(i: I, sep: G, f: F) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  G: Fn(I) -> IResult<I, O2, E>,
+  E: ParseError<I>,
+{
+  separated_list1(sep, f)(i)
+}
+
+/// Repeats the embedded parser `n` times or until it fails
+/// and returns the results in a `Vec`. Fails if the
+/// embedded parser does not succeed at least `m` times.
+/// # Arguments
+/// * `m` The minimum number of iterations.
+/// * `n` The maximum number of iterations.
+/// * `f` The parser to apply.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::multi::many_m_n;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   many_m_n(0, 2, tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", vec!["abc", "abc"])));
+/// assert_eq!(parser("abc123"), Ok(("123", vec!["abc"])));
+/// assert_eq!(parser("123123"), Ok(("123123", vec![])));
+/// assert_eq!(parser(""), Ok(("", vec![])));
+/// assert_eq!(parser("abcabcabc"), Ok(("abc", vec!["abc", "abc"])));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn many_m_n<I, O, E, F>(
+  min: usize,
+  max: usize,
+  mut parse: F,
+) -> impl FnMut(I) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  E: ParseError<I>,
+{
+  move |mut input: I| {
+    let mut res = crate::lib::std::vec::Vec::with_capacity(min);
+
+    for count in 0..max {
+      match parse.parse(input.clone()) {
+        Ok((tail, value)) => {
+          // do not allow parsers that do not consume input (causes infinite loops)
+          if tail == input {
+            return Err(Err::Error(E::from_error_kind(input, ErrorKind::ManyMN)));
+          }
+
+          res.push(value);
+          input = tail;
+        }
+        Err(Err::Error(e)) => {
+          if count < min {
+            return Err(Err::Error(E::append(input, ErrorKind::ManyMN, e)));
+          } else {
+            return Ok((input, res));
+          }
+        }
+        Err(e) => {
+          return Err(e);
+        }
+      }
+    }
+
+    Ok((input, res))
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+#[cfg(feature = "alloc")]
+pub fn many_m_nc<I, O, E, F>(i: I, m: usize, n: usize, f: F) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  E: ParseError<I>,
+{
+  many_m_n(m, n, f)(i)
+}
+
+/// Repeats the embedded parser until it fails
+/// and returns the number of successful iterations.
+/// # Arguments
+/// * `f` The parser to apply.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::multi::many0_count;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, usize> {
+///   many0_count(tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", 2)));
+/// assert_eq!(parser("abc123"), Ok(("123", 1)));
+/// assert_eq!(parser("123123"), Ok(("123123", 0)));
+/// assert_eq!(parser(""), Ok(("", 0)));
+/// ```
+pub fn many0_count<I, O, E, F>(mut f: F) -> impl FnMut(I) -> IResult<I, usize, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  E: ParseError<I>,
+{
+  move |i: I| {
+    let mut input = i;
+    let mut count = 0;
+
+    loop {
+      let input_ = input.clone();
+      match f.parse(input_) {
+        Ok((i, _)) => {
+          //  loop trip must always consume (otherwise infinite loops)
+          if i == input {
+            return Err(Err::Error(E::from_error_kind(input, ErrorKind::Many0Count)));
+          }
+
+          input = i;
+          count += 1;
+        }
+
+        Err(Err::Error(_)) => return Ok((input, count)),
+
+        Err(e) => return Err(e),
+      }
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn many0_countc<I, O, E, F>(i: I, f: F) -> IResult<I, usize, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  E: ParseError<I>,
+{
+  many0_count(f)(i)
+}
+
+/// Repeats the embedded parser until it fails
+/// and returns the number of successful iterations.
+/// Fails if the embedded parser does not succeed
+/// at least once.
+/// # Arguments
+/// * `f` The parser to apply.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::multi::many1_count;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, usize> {
+///   many1_count(tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", 2)));
+/// assert_eq!(parser("abc123"), Ok(("123", 1)));
+/// assert_eq!(parser("123123"), Err(Err::Error(Error::new("123123", ErrorKind::Many1Count))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Many1Count))));
+/// ```
+pub fn many1_count<I, O, E, F>(mut f: F) -> impl FnMut(I) -> IResult<I, usize, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  E: ParseError<I>,
+{
+  move |i: I| {
+    let i_ = i.clone();
+    match f.parse(i_) {
+      Err(Err::Error(_)) => Err(Err::Error(E::from_error_kind(i, ErrorKind::Many1Count))),
+      Err(i) => Err(i),
+      Ok((i1, _)) => {
+        let mut count = 1;
+        let mut input = i1;
+
+        loop {
+          let input_ = input.clone();
+          match f.parse(input_) {
+            Err(Err::Error(_)) => return Ok((input, count)),
+            Err(e) => return Err(e),
+            Ok((i, _)) => {
+              if i == input {
+                return Err(Err::Error(E::from_error_kind(i, ErrorKind::Many1Count)));
+              }
+
+              count += 1;
+              input = i;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn many1_countc<I, O, E, F>(i: I, f: F) -> IResult<I, usize, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  E: ParseError<I>,
+{
+  many1_count(f)(i)
+}
+
+/// Runs the embedded parser a specified number
+/// of times. Returns the results in a `Vec`.
+/// # Arguments
+/// * `f` The parser to apply.
+/// * `count` How often to apply the parser.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::multi::count;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   count(tag("abc"), 2)(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", vec!["abc", "abc"])));
+/// assert_eq!(parser("abc123"), Err(Err::Error(Error::new("123", ErrorKind::Tag))));
+/// assert_eq!(parser("123123"), Err(Err::Error(Error::new("123123", ErrorKind::Tag))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Tag))));
+/// assert_eq!(parser("abcabcabc"), Ok(("abc", vec!["abc", "abc"])));
+/// ```
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+pub fn count<I, O, E, F>(mut f: F, count: usize) -> impl FnMut(I) -> IResult<I, Vec<O>, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  E: ParseError<I>,
+{
+  move |i: I| {
+    let mut input = i.clone();
+    let mut res = crate::lib::std::vec::Vec::with_capacity(count);
+
+    for _ in 0..count {
+      let input_ = input.clone();
+      match f.parse(input_) {
+        Ok((i, o)) => {
+          res.push(o);
+          input = i;
+        }
+        Err(Err::Error(e)) => {
+          return Err(Err::Error(E::append(i, ErrorKind::Count, e)));
+        }
+        Err(e) => {
+          return Err(e);
+        }
+      }
+    }
+
+    Ok((input, res))
+  }
+}
+
+/// Runs the embedded parser repeatedly, filling the given slice with results. This parser fails if
+/// the input runs out before the given slice is full.
+/// # Arguments
+/// * `f` The parser to apply.
+/// * `buf` The slice to fill
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::multi::fill;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, [&str; 2]> {
+///   let mut buf = ["", ""];
+///   let (rest, ()) = fill(tag("abc"), &mut buf)(s)?;
+///   Ok((rest, buf))
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", ["abc", "abc"])));
+/// assert_eq!(parser("abc123"), Err(Err::Error(Error::new("123", ErrorKind::Tag))));
+/// assert_eq!(parser("123123"), Err(Err::Error(Error::new("123123", ErrorKind::Tag))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Tag))));
+/// assert_eq!(parser("abcabcabc"), Ok(("abc", ["abc", "abc"])));
+/// ```
+pub fn fill<'a, I, O, E, F>(f: F, buf: &'a mut [O]) -> impl FnMut(I) -> IResult<I, (), E> + 'a
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E> + 'a,
+  E: ParseError<I>,
+{
+  move |i: I| {
+    let mut input = i.clone();
+
+    for elem in buf.iter_mut() {
+      let input_ = input.clone();
+      match f(input_) {
+        Ok((i, o)) => {
+          *elem = o;
+          input = i;
+        }
+        Err(Err::Error(e)) => {
+          return Err(Err::Error(E::append(i, ErrorKind::Count, e)));
+        }
+        Err(e) => {
+          return Err(e);
+        }
+      }
+    }
+
+    Ok((input, ()))
+  }
+}
+
+/// Applies a parser until it fails and accumulates
+/// the results using a given function and initial value.
+/// # Arguments
+/// * `f` The parser to apply.
+/// * `init` The initial value.
+/// * `g` The function that combines a result of `f` with
+///       the current accumulator.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::multi::fold_many0;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   fold_many0(
+///     tag("abc"),
+///     Vec::new(),
+///     |mut acc: Vec<_>, item| {
+///       acc.push(item);
+///       acc
+///     }
+///   )(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", vec!["abc", "abc"])));
+/// assert_eq!(parser("abc123"), Ok(("123", vec!["abc"])));
+/// assert_eq!(parser("123123"), Ok(("123123", vec![])));
+/// assert_eq!(parser(""), Ok(("", vec![])));
+/// ```
+pub fn fold_many0<I, O, E, F, G, R>(
+  mut f: F,
+  init: R,
+  mut g: G,
+) -> impl FnMut(I) -> IResult<I, R, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  G: FnMut(R, O) -> R,
+  E: ParseError<I>,
+  R: Clone,
+{
+  move |i: I| {
+    let mut res = init.clone();
+    let mut input = i;
+
+    loop {
+      let i_ = input.clone();
+      match f.parse(i_) {
+        Ok((i, o)) => {
+          // loop trip must always consume (otherwise infinite loops)
+          if i == input {
+            return Err(Err::Error(E::from_error_kind(input, ErrorKind::Many0)));
+          }
+
+          res = g(res, o);
+          input = i;
+        }
+        Err(Err::Error(_)) => {
+          return Ok((input, res));
+        }
+        Err(e) => {
+          return Err(e);
+        }
+      }
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn fold_many0c<I, O, E, F, G, R>(i: I, f: F, init: R, g: G) -> IResult<I, R, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  G: FnMut(R, O) -> R,
+  E: ParseError<I>,
+  R: Clone,
+{
+  fold_many0(f, init, g)(i)
+}
+
+/// Applies a parser until it fails and accumulates
+/// the results using a given function and initial value.
+/// Fails if the embedded parser does not succeed at least
+/// once.
+/// # Arguments
+/// * `f` The parser to apply.
+/// * `init` The initial value.
+/// * `g` The function that combines a result of `f` with
+///       the current accumulator.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::multi::fold_many1;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   fold_many1(
+///     tag("abc"),
+///     Vec::new(),
+///     |mut acc: Vec<_>, item| {
+///       acc.push(item);
+///       acc
+///     }
+///   )(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", vec!["abc", "abc"])));
+/// assert_eq!(parser("abc123"), Ok(("123", vec!["abc"])));
+/// assert_eq!(parser("123123"), Err(Err::Error(Error::new("123123", ErrorKind::Many1))));
+/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Many1))));
+/// ```
+pub fn fold_many1<I, O, E, F, G, R>(
+  mut f: F,
+  init: R,
+  mut g: G,
+) -> impl FnMut(I) -> IResult<I, R, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  G: FnMut(R, O) -> R,
+  E: ParseError<I>,
+  R: Clone,
+{
+  move |i: I| {
+    let _i = i.clone();
+    let init = init.clone();
+    match f.parse(_i) {
+      Err(Err::Error(_)) => Err(Err::Error(E::from_error_kind(i, ErrorKind::Many1))),
+      Err(e) => Err(e),
+      Ok((i1, o1)) => {
+        let mut acc = g(init, o1);
+        let mut input = i1;
+
+        loop {
+          let _input = input.clone();
+          match f.parse(_input) {
+            Err(Err::Error(_)) => {
+              break;
+            }
+            Err(e) => return Err(e),
+            Ok((i, o)) => {
+              if i == input {
+                return Err(Err::Failure(E::from_error_kind(i, ErrorKind::Many1)));
+              }
+
+              acc = g(acc, o);
+              input = i;
+            }
+          }
+        }
+
+        Ok((input, acc))
+      }
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn fold_many1c<I, O, E, F, G, R>(i: I, f: F, init: R, g: G) -> IResult<I, R, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  G: FnMut(R, O) -> R,
+  E: ParseError<I>,
+  R: Clone,
+{
+  fold_many1(f, init, g)(i)
+}
+
+/// Applies a parser `n` times or until it fails and accumulates
+/// the results using a given function and initial value.
+/// Fails if the embedded parser does not succeed at least `m`
+/// times.
+/// # Arguments
+/// * `m` The minimum number of iterations.
+/// * `n` The maximum number of iterations.
+/// * `f` The parser to apply.
+/// * `init` The initial value.
+/// * `g` The function that combines a result of `f` with
+///       the current accumulator.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::multi::fold_many_m_n;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &str) -> IResult<&str, Vec<&str>> {
+///   fold_many_m_n(
+///     0,
+///     2,
+///     tag("abc"),
+///     Vec::new(),
+///     |mut acc: Vec<_>, item| {
+///       acc.push(item);
+///       acc
+///     }
+///   )(s)
+/// }
+///
+/// assert_eq!(parser("abcabc"), Ok(("", vec!["abc", "abc"])));
+/// assert_eq!(parser("abc123"), Ok(("123", vec!["abc"])));
+/// assert_eq!(parser("123123"), Ok(("123123", vec![])));
+/// assert_eq!(parser(""), Ok(("", vec![])));
+/// assert_eq!(parser("abcabcabc"), Ok(("abc", vec!["abc", "abc"])));
+/// ```
+pub fn fold_many_m_n<I, O, E, F, G, R>(
+  min: usize,
+  max: usize,
+  mut parse: F,
+  init: R,
+  fold: G,
+) -> impl FnMut(I) -> IResult<I, R, E>
+where
+  I: Clone + PartialEq,
+  F: Parser<I, O, E>,
+  G: Fn(R, O) -> R,
+  E: ParseError<I>,
+  R: Clone,
+{
+  move |mut input: I| {
+    let mut acc = init.clone();
+    for count in 0..max {
+      match parse.parse(input.clone()) {
+        Ok((tail, value)) => {
+          // do not allow parsers that do not consume input (causes infinite loops)
+          if tail == input {
+            return Err(Err::Error(E::from_error_kind(tail, ErrorKind::ManyMN)));
+          }
+
+          acc = fold(acc, value);
+          input = tail;
+        }
+        //FInputXMError: handle failure properly
+        Err(Err::Error(err)) => {
+          if count < min {
+            return Err(Err::Error(E::append(input, ErrorKind::ManyMN, err)));
+          } else {
+            break;
+          }
+        }
+        Err(e) => return Err(e),
+      }
+    }
+
+    Ok((input, acc))
+  }
+}
+
+#[doc(hidden)]
+pub fn fold_many_m_nc<I, O, E, F, G, R>(
+  input: I,
+  min: usize,
+  max: usize,
+  parse: F,
+  init: R,
+  fold: G,
+) -> IResult<I, R, E>
+where
+  I: Clone + PartialEq,
+  F: Fn(I) -> IResult<I, O, E>,
+  G: Fn(R, O) -> R,
+  E: ParseError<I>,
+  R: Clone,
+{
+  fold_many_m_n(min, max, parse, init, fold)(input)
+}
+
+/// Gets a number from the parser and returns a
+/// subslice of the input of that size.
+/// If the parser returns `Incomplete`,
+/// `length_data` will return an error.
+/// # Arguments
+/// * `f` The parser to apply.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::ErrorKind, Needed, IResult};
+/// use nom::number::complete::be_u16;
+/// use nom::multi::length_data;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &[u8]) -> IResult<&[u8], &[u8]> {
+///   length_data(be_u16)(s)
+/// }
+///
+/// assert_eq!(parser(b"\x00\x03abcefg"), Ok((&b"efg"[..], &b"abc"[..])));
+/// assert_eq!(parser(b"\x00\x03a"), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+pub fn length_data<I, N, E, F>(mut f: F) -> impl FnMut(I) -> IResult<I, I, E>
+where
+  I: InputLength + InputTake,
+  N: ToUsize,
+  F: Parser<I, N, E>,
+  E: ParseError<I>,
+{
+  move |i: I| {
+    let (i, length) = f.parse(i)?;
+
+    let length: usize = length.to_usize();
+
+    if let Some(needed) = length
+      .checked_sub(i.input_len())
+      .and_then(NonZeroUsize::new)
+    {
+      Err(Err::Incomplete(Needed::Size(needed)))
+    } else {
+      Ok(i.take_split(length))
+    }
+  }
+}
+
+/// Gets a number from the first parser,
+/// takes a subslice of the input of that size,
+/// then applies the second parser on that subslice.
+/// If the second parser returns `Incomplete`,
+/// `length_value` will return an error.
+/// # Arguments
+/// * `f` The parser to apply.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::number::complete::be_u16;
+/// use nom::multi::length_value;
+/// use nom::bytes::complete::tag;
+///
+/// fn parser(s: &[u8]) -> IResult<&[u8], &[u8]> {
+///   length_value(be_u16, tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser(b"\x00\x03abcefg"), Ok((&b"efg"[..], &b"abc"[..])));
+/// assert_eq!(parser(b"\x00\x03123123"), Err(Err::Error(Error::new(&b"123"[..], ErrorKind::Tag))));
+/// assert_eq!(parser(b"\x00\x03a"), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+pub fn length_value<I, O, N, E, F, G>(mut f: F, mut g: G) -> impl FnMut(I) -> IResult<I, O, E>
+where
+  I: Clone + InputLength + InputTake,
+  N: ToUsize,
+  F: Parser<I, N, E>,
+  G: Parser<I, O, E>,
+  E: ParseError<I>,
+{
+  move |i: I| {
+    let (i, length) = f.parse(i)?;
+
+    let length: usize = length.to_usize();
+
+    if let Some(needed) = length
+      .checked_sub(i.input_len())
+      .and_then(NonZeroUsize::new)
+    {
+      Err(Err::Incomplete(Needed::Size(needed)))
+    } else {
+      let (rest, i) = i.take_split(length);
+      match g.parse(i.clone()) {
+        Err(Err::Incomplete(_)) => Err(Err::Error(E::from_error_kind(i, ErrorKind::Complete))),
+        Err(e) => Err(e),
+        Ok((_, o)) => Ok((rest, o)),
+      }
+    }
+  }
+}
+
+#[doc(hidden)]
+pub fn length_valuec<I, O, N, E, F, G>(i: I, f: F, g: G) -> IResult<I, O, E>
+where
+  I: Clone + InputLength + InputTake,
+  N: ToUsize,
+  F: Fn(I) -> IResult<I, N, E>,
+  G: Fn(I) -> IResult<I, O, E>,
+  E: ParseError<I>,
+{
+  length_value(f, g)(i)
+}
+
+/// Gets a number from the first parser,
+/// then applies the second parser that many times.
+/// Arguments
+/// * `f` The parser to apply to obtain the count.
+/// * `g` The parser to apply repeatedly.
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, error::{Error, ErrorKind}, Needed, IResult};
+/// use nom::number::complete::u8;
+/// use nom::multi::length_count;
+/// use nom::bytes::complete::tag;
+/// use nom::combinator::map;
+///
+/// fn parser(s: &[u8]) -> IResult<&[u8], Vec<&[u8]>> {
+///   length_count(map(u8, |i| {
+///      println!("got number: {}", i);
+///      i
+///   }), tag("abc"))(s)
+/// }
+///
+/// assert_eq!(parser(&b"\x02abcabcabc"[..]), Ok(((&b"abc"[..], vec![&b"abc"[..], &b"abc"[..]]))));
+/// assert_eq!(parser(b"\x03123123123"), Err(Err::Error(Error::new(&b"123123123"[..], ErrorKind::Tag))));
+/// ```
+#[cfg(feature = "alloc")]
+pub fn length_count<I, O, N, E, F, G>(mut f: F, mut g: G) -> impl FnMut(I) -> IResult<I, Vec<O>, E>
+where
+  I: Clone,
+  N: ToUsize,
+  F: Parser<I, N, E>,
+  G: Parser<I, O, E>,
+  E: ParseError<I>,
+{
+  move |i: I| {
+    let (i, count) = f.parse(i)?;
+    let mut input = i.clone();
+    let mut res = Vec::new();
+
+    for _ in 0..count.to_usize() {
+      let input_ = input.clone();
+      match g.parse(input_) {
+        Ok((i, o)) => {
+          res.push(o);
+          input = i;
+        }
+        Err(Err::Error(e)) => {
+          return Err(Err::Error(E::append(i, ErrorKind::Count, e)));
+        }
+        Err(e) => {
+          return Err(e);
+        }
+      }
+    }
+
+    Ok((input, res))
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/number/complete.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/number/complete.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/number/complete.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/number/complete.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1903 @@
+//! Parsers recognizing numbers, complete input version
+
+use crate::branch::alt;
+use crate::character::complete::{char, digit1};
+use crate::combinator::{cut, map, opt, recognize};
+use crate::error::ParseError;
+use crate::error::{make_error, ErrorKind};
+use crate::internal::*;
+use crate::lib::std::ops::{RangeFrom, RangeTo};
+use crate::sequence::{pair, tuple};
+use crate::traits::{AsChar, InputIter, InputLength, InputTakeAtPosition};
+use crate::traits::{Offset, Slice};
+
+/// Recognizes an unsigned 1 byte integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_u8;
+///
+/// let parser = |s| {
+///   be_u8(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"\x03abcefg"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Error((&[][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_u8<I, E: ParseError<I>>(input: I) -> IResult<I, u8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 1;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let res = input.iter_elements().next().unwrap();
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 2 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_u16;
+///
+/// let parser = |s| {
+///   be_u16(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0003)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_u16<I, E: ParseError<I>>(input: I) -> IResult<I, u16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 2;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u16;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u16;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 3 byte integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_u24;
+///
+/// let parser = |s| {
+///   be_u24(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x000305)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_u24<I, E: ParseError<I>>(input: I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 3;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u32;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u32;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 4 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_u32;
+///
+/// let parser = |s| {
+///   be_u32(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00030507)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_u32<I, E: ParseError<I>>(input: I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 4;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u32;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u32;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 8 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_u64;
+///
+/// let parser = |s| {
+///   be_u64(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0001020304050607)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_u64<I, E: ParseError<I>>(input: I) -> IResult<I, u64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 8;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u64;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u64;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 16 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_u128;
+///
+/// let parser = |s| {
+///   be_u128(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00010203040506070001020304050607)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn be_u128<I, E: ParseError<I>>(input: I) -> IResult<I, u128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 16;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u128;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u128;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a signed 1 byte integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_i8;
+///
+/// let parser = |s| {
+///   be_i8(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"\x03abcefg"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Error((&[][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_i8<I, E: ParseError<I>>(input: I) -> IResult<I, i8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u8, |x| x as i8)
+}
+
+/// Recognizes a big endian signed 2 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_i16;
+///
+/// let parser = |s| {
+///   be_i16(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0003)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_i16<I, E: ParseError<I>>(input: I) -> IResult<I, i16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u16, |x| x as i16)
+}
+
+/// Recognizes a big endian signed 3 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_i24;
+///
+/// let parser = |s| {
+///   be_i24(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x000305)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_i24<I, E: ParseError<I>>(input: I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  // Same as the unsigned version but we need to sign-extend manually here
+  map!(input, be_u24, |x| if x & 0x80_00_00 != 0 {
+    (x | 0xff_00_00_00) as i32
+  } else {
+    x as i32
+  })
+}
+
+/// Recognizes a big endian signed 4 bytes integer.
+///
+/// *Complete version*: Teturns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_i32;
+///
+/// let parser = |s| {
+///   be_i32(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00030507)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_i32<I, E: ParseError<I>>(input: I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u32, |x| x as i32)
+}
+
+/// Recognizes a big endian signed 8 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_i64;
+///
+/// let parser = |s| {
+///   be_i64(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0001020304050607)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_i64<I, E: ParseError<I>>(input: I) -> IResult<I, i64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u64, |x| x as i64)
+}
+
+/// Recognizes a big endian signed 16 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_i128;
+///
+/// let parser = |s| {
+///   be_i128(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00010203040506070001020304050607)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn be_i128<I, E: ParseError<I>>(input: I) -> IResult<I, i128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u128, |x| x as i128)
+}
+
+/// Recognizes an unsigned 1 byte integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_u8;
+///
+/// let parser = |s| {
+///   le_u8(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"\x03abcefg"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Error((&[][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_u8<I, E: ParseError<I>>(input: I) -> IResult<I, u8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 1;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let res = input.iter_elements().next().unwrap();
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 2 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_u16;
+///
+/// let parser = |s| {
+///   le_u16(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0300)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_u16<I, E: ParseError<I>>(input: I) -> IResult<I, u16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 2;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u16;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u16) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 3 byte integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_u24;
+///
+/// let parser = |s| {
+///   le_u24(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x050300)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_u24<I, E: ParseError<I>>(input: I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 3;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u32;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u32) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 4 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_u32;
+///
+/// let parser = |s| {
+///   le_u32(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07050300)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_u32<I, E: ParseError<I>>(input: I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 4;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u32;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u32) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 8 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_u64;
+///
+/// let parser = |s| {
+///   le_u64(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0706050403020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_u64<I, E: ParseError<I>>(input: I) -> IResult<I, u64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 8;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u64;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u64) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 16 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_u128;
+///
+/// let parser = |s| {
+///   le_u128(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07060504030201000706050403020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn le_u128<I, E: ParseError<I>>(input: I) -> IResult<I, u128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 16;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let mut res = 0u128;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u128) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a signed 1 byte integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_i8;
+///
+/// let parser = |s| {
+///   le_i8(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"\x03abcefg"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Error((&[][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_i8<I, E: ParseError<I>>(input: I) -> IResult<I, i8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u8, |x| x as i8)
+}
+
+/// Recognizes a little endian signed 2 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_i16;
+///
+/// let parser = |s| {
+///   le_i16(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0300)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_i16<I, E: ParseError<I>>(input: I) -> IResult<I, i16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u16, |x| x as i16)
+}
+
+/// Recognizes a little endian signed 3 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_i24;
+///
+/// let parser = |s| {
+///   le_i24(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x050300)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_i24<I, E: ParseError<I>>(input: I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  // Same as the unsigned version but we need to sign-extend manually here
+  map!(input, le_u24, |x| if x & 0x80_00_00 != 0 {
+    (x | 0xff_00_00_00) as i32
+  } else {
+    x as i32
+  })
+}
+
+/// Recognizes a little endian signed 4 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_i32;
+///
+/// let parser = |s| {
+///   le_i32(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07050300)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_i32<I, E: ParseError<I>>(input: I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u32, |x| x as i32)
+}
+
+/// Recognizes a little endian signed 8 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_i64;
+///
+/// let parser = |s| {
+///   le_i64(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0706050403020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_i64<I, E: ParseError<I>>(input: I) -> IResult<I, i64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u64, |x| x as i64)
+}
+
+/// Recognizes a little endian signed 16 bytes integer.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_i128;
+///
+/// let parser = |s| {
+///   le_i128(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07060504030201000706050403020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn le_i128<I, E: ParseError<I>>(input: I) -> IResult<I, i128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u128, |x| x as i128)
+}
+
+/// Recognizes an unsigned 1 byte integer
+///
+/// Note that endianness does not apply to 1 byte numbers.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::u8;
+///
+/// let parser = |s| {
+///   u8(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"\x03abcefg"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Error((&[][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn u8<I, E: ParseError<I>>(input: I) -> IResult<I, u8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 1;
+  if input.input_len() < bound {
+    Err(Err::Error(make_error(input, ErrorKind::Eof)))
+  } else {
+    let res = input.iter_elements().next().unwrap();
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes an unsigned 2 bytes integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u16 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u16 integer.
+/// *complete version*: returns an error if there is not enough input data
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::u16;
+///
+/// let be_u16 = |s| {
+///   u16(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u16(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0003)));
+/// assert_eq!(be_u16(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_u16 = |s| {
+///   u16(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u16(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0300)));
+/// assert_eq!(le_u16(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn u16<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u16,
+    crate::number::Endianness::Little => le_u16,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u16,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u16,
+  }
+}
+
+/// Recognizes an unsigned 3 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u24 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u24 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::u24;
+///
+/// let be_u24 = |s| {
+///   u24(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u24(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x000305)));
+/// assert_eq!(be_u24(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_u24 = |s| {
+///   u24(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u24(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x050300)));
+/// assert_eq!(le_u24(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn u24<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u24,
+    crate::number::Endianness::Little => le_u24,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u24,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u24,
+  }
+}
+
+/// Recognizes an unsigned 4 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u32 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u32 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::u32;
+///
+/// let be_u32 = |s| {
+///   u32(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u32(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00030507)));
+/// assert_eq!(be_u32(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_u32 = |s| {
+///   u32(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u32(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07050300)));
+/// assert_eq!(le_u32(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn u32<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u32,
+    crate::number::Endianness::Little => le_u32,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u32,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u32,
+  }
+}
+
+/// Recognizes an unsigned 8 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u64 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u64 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::u64;
+///
+/// let be_u64 = |s| {
+///   u64(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u64(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0001020304050607)));
+/// assert_eq!(be_u64(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_u64 = |s| {
+///   u64(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u64(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0706050403020100)));
+/// assert_eq!(le_u64(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn u64<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u64,
+    crate::number::Endianness::Little => le_u64,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u64,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u64,
+  }
+}
+
+/// Recognizes an unsigned 16 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u128 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u128 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::u128;
+///
+/// let be_u128 = |s| {
+///   u128(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u128(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00010203040506070001020304050607)));
+/// assert_eq!(be_u128(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_u128 = |s| {
+///   u128(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u128(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07060504030201000706050403020100)));
+/// assert_eq!(le_u128(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn u128<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u128,
+    crate::number::Endianness::Little => le_u128,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u128,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u128,
+  }
+}
+
+/// Recognizes a signed 1 byte integer
+///
+/// Note that endianness does not apply to 1 byte numbers.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::i8;
+///
+/// let parser = |s| {
+///   i8(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"\x03abcefg"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Error((&[][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn i8<I, E: ParseError<I>>(i: I) -> IResult<I, i8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(i, u8, |x| x as i8)
+}
+
+/// Recognizes a signed 2 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i16 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i16 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::i16;
+///
+/// let be_i16 = |s| {
+///   i16(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i16(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0003)));
+/// assert_eq!(be_i16(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_i16 = |s| {
+///   i16(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i16(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0300)));
+/// assert_eq!(le_i16(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn i16<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i16,
+    crate::number::Endianness::Little => le_i16,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i16,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i16,
+  }
+}
+
+/// Recognizes a signed 3 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i24 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i24 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::i24;
+///
+/// let be_i24 = |s| {
+///   i24(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i24(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x000305)));
+/// assert_eq!(be_i24(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_i24 = |s| {
+///   i24(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i24(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x050300)));
+/// assert_eq!(le_i24(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn i24<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i24,
+    crate::number::Endianness::Little => le_i24,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i24,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i24,
+  }
+}
+
+/// Recognizes a signed 4 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i32 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i32 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::i32;
+///
+/// let be_i32 = |s| {
+///   i32(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i32(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00030507)));
+/// assert_eq!(be_i32(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_i32 = |s| {
+///   i32(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i32(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07050300)));
+/// assert_eq!(le_i32(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn i32<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i32,
+    crate::number::Endianness::Little => le_i32,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i32,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i32,
+  }
+}
+
+/// Recognizes a signed 8 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i64 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i64 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::i64;
+///
+/// let be_i64 = |s| {
+///   i64(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i64(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0001020304050607)));
+/// assert_eq!(be_i64(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_i64 = |s| {
+///   i64(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i64(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0706050403020100)));
+/// assert_eq!(le_i64(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn i64<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i64,
+    crate::number::Endianness::Little => le_i64,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i64,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i64,
+  }
+}
+
+/// Recognizes a signed 16 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i128 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i128 integer.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::i128;
+///
+/// let be_i128 = |s| {
+///   i128(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i128(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00010203040506070001020304050607)));
+/// assert_eq!(be_i128(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+///
+/// let le_i128 = |s| {
+///   i128(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i128(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07060504030201000706050403020100)));
+/// assert_eq!(le_i128(&b"\x01"[..]), Err(Err::Error((&[0x01][..], ErrorKind::Eof))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn i128<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i128,
+    crate::number::Endianness::Little => le_i128,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i128,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i128,
+  }
+}
+
+/// Recognizes a big endian 4 bytes floating point number.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_f32;
+///
+/// let parser = |s| {
+///   be_f32(s)
+/// };
+///
+/// assert_eq!(parser(&[0x41, 0x48, 0x00, 0x00][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_f32<I, E: ParseError<I>>(input: I) -> IResult<I, f32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match be_u32(input) {
+    Err(e) => Err(e),
+    Ok((i, o)) => Ok((i, f32::from_bits(o))),
+  }
+}
+
+/// Recognizes a big endian 8 bytes floating point number.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::be_f64;
+///
+/// let parser = |s| {
+///   be_f64(s)
+/// };
+///
+/// assert_eq!(parser(&[0x40, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn be_f64<I, E: ParseError<I>>(input: I) -> IResult<I, f64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match be_u64(input) {
+    Err(e) => Err(e),
+    Ok((i, o)) => Ok((i, f64::from_bits(o))),
+  }
+}
+
+/// Recognizes a little endian 4 bytes floating point number.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_f32;
+///
+/// let parser = |s| {
+///   le_f32(s)
+/// };
+///
+/// assert_eq!(parser(&[0x00, 0x00, 0x48, 0x41][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_f32<I, E: ParseError<I>>(input: I) -> IResult<I, f32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match le_u32(input) {
+    Err(e) => Err(e),
+    Ok((i, o)) => Ok((i, f32::from_bits(o))),
+  }
+}
+
+/// Recognizes a little endian 8 bytes floating point number.
+///
+/// *Complete version*: Returns an error if there is not enough input data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::le_f64;
+///
+/// let parser = |s| {
+///   le_f64(s)
+/// };
+///
+/// assert_eq!(parser(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x40][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn le_f64<I, E: ParseError<I>>(input: I) -> IResult<I, f64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match le_u64(input) {
+    Err(e) => Err(e),
+    Ok((i, o)) => Ok((i, f64::from_bits(o))),
+  }
+}
+
+/// Recognizes a 4 byte floating point number
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian f32 float,
+/// otherwise if `nom::Endianness::Little` parse a little endian f32 float.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::f32;
+///
+/// let be_f32 = |s| {
+///   f32(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_f32(&[0x41, 0x48, 0x00, 0x00][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(be_f32(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::Eof))));
+///
+/// let le_f32 = |s| {
+///   f32(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_f32(&[0x00, 0x00, 0x48, 0x41][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(le_f32(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn f32<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, f32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_f32,
+    crate::number::Endianness::Little => le_f32,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_f32,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_f32,
+  }
+}
+
+/// Recognizes an 8 byte floating point number
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian f64 float,
+/// otherwise if `nom::Endianness::Little` parse a little endian f64 float.
+/// *complete version*: returns an error if there is not enough input data
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::f64;
+///
+/// let be_f64 = |s| {
+///   f64(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_f64(&[0x40, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(be_f64(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::Eof))));
+///
+/// let le_f64 = |s| {
+///   f64(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_f64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x40][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(le_f64(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::Eof))));
+/// ```
+#[inline]
+pub fn f64<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, f64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_f64,
+    crate::number::Endianness::Little => le_f64,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_f64,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_f64,
+  }
+}
+
+/// Recognizes a hex-encoded integer.
+///
+/// *Complete version*: Will parse until the end of input if it has less than 8 bytes.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::hex_u32;
+///
+/// let parser = |s| {
+///   hex_u32(s)
+/// };
+///
+/// assert_eq!(parser(&b"01AE"[..]), Ok((&b""[..], 0x01AE)));
+/// assert_eq!(parser(&b"abc"[..]), Ok((&b""[..], 0x0ABC)));
+/// assert_eq!(parser(&b"ggg"[..]), Err(Err::Error((&b"ggg"[..], ErrorKind::IsA))));
+/// ```
+#[inline]
+pub fn hex_u32<'a, E: ParseError<&'a [u8]>>(input: &'a [u8]) -> IResult<&'a [u8], u32, E> {
+  let (i, o) = crate::bytes::complete::is_a(&b"0123456789abcdefABCDEF"[..])(input)?;
+  // Do not parse more than 8 characters for a u32
+  let (parsed, remaining) = if o.len() <= 8 {
+    (o, i)
+  } else {
+    (&input[..8], &input[8..])
+  };
+
+  let res = parsed
+    .iter()
+    .rev()
+    .enumerate()
+    .map(|(k, &v)| {
+      let digit = v as char;
+      digit.to_digit(16).unwrap_or(0) << (k * 4)
+    })
+    .sum();
+
+  Ok((remaining, res))
+}
+
+/// Recognizes floating point number in a byte string and returns the corresponding slice.
+///
+/// *Complete version*: Can parse until the end of input.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::recognize_float;
+///
+/// let parser = |s| {
+///   recognize_float(s)
+/// };
+///
+/// assert_eq!(parser("11e-1"), Ok(("", "11e-1")));
+/// assert_eq!(parser("123E-02"), Ok(("", "123E-02")));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", "123")));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Char))));
+/// ```
+#[allow(unused_imports)]
+#[rustfmt::skip]
+pub fn recognize_float<T, E:ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: Clone + Offset,
+  T: InputIter,
+  <T as InputIter>::Item: AsChar,
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  recognize(
+    tuple((
+      opt(alt((char('+'), char('-')))),
+      alt((
+        map(tuple((digit1, opt(pair(char('.'), opt(digit1))))), |_| ()),
+        map(tuple((char('.'), digit1)), |_| ())
+      )),
+      opt(tuple((
+        alt((char('e'), char('E'))),
+        opt(alt((char('+'), char('-')))),
+        cut(digit1)
+      )))
+    ))
+  )(input)
+}
+
+/// Recognizes floating point number in a byte string and returns a f32.
+///
+/// *Complete version*: Can parse until the end of input.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::float;
+///
+/// let parser = |s| {
+///   float(s)
+/// };
+///
+/// assert_eq!(parser("11e-1"), Ok(("", 1.1)));
+/// assert_eq!(parser("123E-02"), Ok(("", 1.23)));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", 123.0)));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Char))));
+/// ```
+#[cfg(not(feature = "lexical"))]
+pub fn float<T, E: ParseError<T>>(input: T) -> IResult<T, f32, E>
+where
+  T: Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: Clone + Offset,
+  T: InputIter + InputLength + crate::traits::ParseTo<f32>,
+  <T as InputIter>::Item: AsChar,
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  match recognize_float(input) {
+    Err(e) => Err(e),
+    Ok((i, s)) => match s.parse_to() {
+      Some(n) => Ok((i, n)),
+      None => Err(Err::Error(E::from_error_kind(i, ErrorKind::Float))),
+    },
+  }
+}
+
+/// Recognizes floating point number in a byte string and returns a f32.
+///
+/// *Complete version*: Can parse until the end of input.
+///
+/// This function uses the `lexical-core` crate for float parsing by default, you
+/// can deactivate it by removing the "lexical" feature.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::float;
+///
+/// let parser = |s| {
+///   float(s)
+/// };
+///
+/// assert_eq!(parser("1.1"), Ok(("", 1.1)));
+/// assert_eq!(parser("123E-02"), Ok(("", 1.23)));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", 123.0)));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Float))));
+/// ```
+#[cfg(feature = "lexical")]
+pub fn float<T, E: ParseError<T>>(input: T) -> IResult<T, f32, E>
+where
+  T: crate::traits::AsBytes + InputLength + Slice<RangeFrom<usize>>,
+{
+  match ::lexical_core::parse_partial(input.as_bytes()) {
+    Ok((value, processed)) => Ok((input.slice(processed..), value)),
+    Err(_) => Err(Err::Error(E::from_error_kind(input, ErrorKind::Float))),
+  }
+}
+
+/// Recognizes floating point number in a byte string and returns a f64.
+///
+/// *Complete version*: Can parse until the end of input.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::double;
+///
+/// let parser = |s| {
+///   double(s)
+/// };
+///
+/// assert_eq!(parser("11e-1"), Ok(("", 1.1)));
+/// assert_eq!(parser("123E-02"), Ok(("", 1.23)));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", 123.0)));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Char))));
+/// ```
+#[cfg(not(feature = "lexical"))]
+pub fn double<T, E: ParseError<T>>(input: T) -> IResult<T, f64, E>
+where
+  T: Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: Clone + Offset,
+  T: InputIter + InputLength + crate::traits::ParseTo<f64>,
+  <T as InputIter>::Item: AsChar,
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  match recognize_float(input) {
+    Err(e) => Err(e),
+    Ok((i, s)) => match s.parse_to() {
+      Some(n) => Ok((i, n)),
+      None => Err(Err::Error(E::from_error_kind(i, ErrorKind::Float))),
+    },
+  }
+}
+
+/// Recognizes floating point number in a byte string and returns a f64.
+///
+/// *Complete version*: Can parse until the end of input.
+///
+/// This function uses the `lexical-core` crate for float parsing by default, you
+/// can deactivate it by removing the "lexical" feature.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::complete::double;
+///
+/// let parser = |s| {
+///   double(s)
+/// };
+///
+/// assert_eq!(parser("1.1"), Ok(("", 1.1)));
+/// assert_eq!(parser("123E-02"), Ok(("", 1.23)));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", 123.0)));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Float))));
+/// ```
+#[cfg(feature = "lexical")]
+pub fn double<T, E: ParseError<T>>(input: T) -> IResult<T, f64, E>
+where
+  T: crate::traits::AsBytes + InputLength + Slice<RangeFrom<usize>>,
+{
+  match ::lexical_core::parse_partial(input.as_bytes()) {
+    Ok((value, processed)) => Ok((input.slice(processed..), value)),
+    Err(_) => Err(Err::Error(E::from_error_kind(input, ErrorKind::Float))),
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::error::ErrorKind;
+  use crate::internal::Err;
+
+  macro_rules! assert_parse(
+    ($left: expr, $right: expr) => {
+      let res: $crate::IResult<_, _, (_, ErrorKind)> = $left;
+      assert_eq!(res, $right);
+    };
+  );
+
+  #[test]
+  fn i8_tests() {
+    assert_parse!(i8(&[0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(i8(&[0x7f][..]), Ok((&b""[..], 127)));
+    assert_parse!(i8(&[0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(i8(&[0x80][..]), Ok((&b""[..], -128)));
+  }
+
+  #[test]
+  fn be_i8_tests() {
+    assert_parse!(be_i8(&[0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(be_i8(&[0x7f][..]), Ok((&b""[..], 127)));
+    assert_parse!(be_i8(&[0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(be_i8(&[0x80][..]), Ok((&b""[..], -128)));
+  }
+
+  #[test]
+  fn be_i16_tests() {
+    assert_parse!(be_i16(&[0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(be_i16(&[0x7f, 0xff][..]), Ok((&b""[..], 32_767_i16)));
+    assert_parse!(be_i16(&[0xff, 0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(be_i16(&[0x80, 0x00][..]), Ok((&b""[..], -32_768_i16)));
+  }
+
+  #[test]
+  fn be_u24_tests() {
+    assert_parse!(be_u24(&[0x00, 0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(be_u24(&[0x00, 0xFF, 0xFF][..]), Ok((&b""[..], 65_535_u32)));
+    assert_parse!(
+      be_u24(&[0x12, 0x34, 0x56][..]),
+      Ok((&b""[..], 1_193_046_u32))
+    );
+  }
+
+  #[test]
+  fn be_i24_tests() {
+    assert_parse!(be_i24(&[0xFF, 0xFF, 0xFF][..]), Ok((&b""[..], -1_i32)));
+    assert_parse!(be_i24(&[0xFF, 0x00, 0x00][..]), Ok((&b""[..], -65_536_i32)));
+    assert_parse!(
+      be_i24(&[0xED, 0xCB, 0xAA][..]),
+      Ok((&b""[..], -1_193_046_i32))
+    );
+  }
+
+  #[test]
+  fn be_i32_tests() {
+    assert_parse!(be_i32(&[0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(
+      be_i32(&[0x7f, 0xff, 0xff, 0xff][..]),
+      Ok((&b""[..], 2_147_483_647_i32))
+    );
+    assert_parse!(be_i32(&[0xff, 0xff, 0xff, 0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(
+      be_i32(&[0x80, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], -2_147_483_648_i32))
+    );
+  }
+
+  #[test]
+  fn be_i64_tests() {
+    assert_parse!(
+      be_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 0))
+    );
+    assert_parse!(
+      be_i64(&[0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff][..]),
+      Ok((&b""[..], 9_223_372_036_854_775_807_i64))
+    );
+    assert_parse!(
+      be_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff][..]),
+      Ok((&b""[..], -1))
+    );
+    assert_parse!(
+      be_i64(&[0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], -9_223_372_036_854_775_808_i64))
+    );
+  }
+
+  #[test]
+  #[cfg(stable_i128)]
+  fn be_i128_tests() {
+    assert_parse!(
+      be_i128(
+        &[
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00
+        ][..]
+      ),
+      Ok((&b""[..], 0))
+    );
+    assert_parse!(
+      be_i128(
+        &[
+          0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+          0xff
+        ][..]
+      ),
+      Ok((
+        &b""[..],
+        170_141_183_460_469_231_731_687_303_715_884_105_727_i128
+      ))
+    );
+    assert_parse!(
+      be_i128(
+        &[
+          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+          0xff
+        ][..]
+      ),
+      Ok((&b""[..], -1))
+    );
+    assert_parse!(
+      be_i128(
+        &[
+          0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00
+        ][..]
+      ),
+      Ok((
+        &b""[..],
+        -170_141_183_460_469_231_731_687_303_715_884_105_728_i128
+      ))
+    );
+  }
+
+  #[test]
+  fn le_i8_tests() {
+    assert_parse!(le_i8(&[0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(le_i8(&[0x7f][..]), Ok((&b""[..], 127)));
+    assert_parse!(le_i8(&[0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(le_i8(&[0x80][..]), Ok((&b""[..], -128)));
+  }
+
+  #[test]
+  fn le_i16_tests() {
+    assert_parse!(le_i16(&[0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(le_i16(&[0xff, 0x7f][..]), Ok((&b""[..], 32_767_i16)));
+    assert_parse!(le_i16(&[0xff, 0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(le_i16(&[0x00, 0x80][..]), Ok((&b""[..], -32_768_i16)));
+  }
+
+  #[test]
+  fn le_u24_tests() {
+    assert_parse!(le_u24(&[0x00, 0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(le_u24(&[0xFF, 0xFF, 0x00][..]), Ok((&b""[..], 65_535_u32)));
+    assert_parse!(
+      le_u24(&[0x56, 0x34, 0x12][..]),
+      Ok((&b""[..], 1_193_046_u32))
+    );
+  }
+
+  #[test]
+  fn le_i24_tests() {
+    assert_parse!(le_i24(&[0xFF, 0xFF, 0xFF][..]), Ok((&b""[..], -1_i32)));
+    assert_parse!(le_i24(&[0x00, 0x00, 0xFF][..]), Ok((&b""[..], -65_536_i32)));
+    assert_parse!(
+      le_i24(&[0xAA, 0xCB, 0xED][..]),
+      Ok((&b""[..], -1_193_046_i32))
+    );
+  }
+
+  #[test]
+  fn le_i32_tests() {
+    assert_parse!(le_i32(&[0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(
+      le_i32(&[0xff, 0xff, 0xff, 0x7f][..]),
+      Ok((&b""[..], 2_147_483_647_i32))
+    );
+    assert_parse!(le_i32(&[0xff, 0xff, 0xff, 0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(
+      le_i32(&[0x00, 0x00, 0x00, 0x80][..]),
+      Ok((&b""[..], -2_147_483_648_i32))
+    );
+  }
+
+  #[test]
+  fn le_i64_tests() {
+    assert_parse!(
+      le_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 0))
+    );
+    assert_parse!(
+      le_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f][..]),
+      Ok((&b""[..], 9_223_372_036_854_775_807_i64))
+    );
+    assert_parse!(
+      le_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff][..]),
+      Ok((&b""[..], -1))
+    );
+    assert_parse!(
+      le_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80][..]),
+      Ok((&b""[..], -9_223_372_036_854_775_808_i64))
+    );
+  }
+
+  #[test]
+  #[cfg(stable_i128)]
+  fn le_i128_tests() {
+    assert_parse!(
+      le_i128(
+        &[
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00
+        ][..]
+      ),
+      Ok((&b""[..], 0))
+    );
+    assert_parse!(
+      le_i128(
+        &[
+          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+          0x7f
+        ][..]
+      ),
+      Ok((
+        &b""[..],
+        170_141_183_460_469_231_731_687_303_715_884_105_727_i128
+      ))
+    );
+    assert_parse!(
+      le_i128(
+        &[
+          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+          0xff
+        ][..]
+      ),
+      Ok((&b""[..], -1))
+    );
+    assert_parse!(
+      le_i128(
+        &[
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x80
+        ][..]
+      ),
+      Ok((
+        &b""[..],
+        -170_141_183_460_469_231_731_687_303_715_884_105_728_i128
+      ))
+    );
+  }
+
+  #[test]
+  fn be_f32_tests() {
+    assert_parse!(be_f32(&[0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 0_f32)));
+    assert_parse!(
+      be_f32(&[0x4d, 0x31, 0x1f, 0xd8][..]),
+      Ok((&b""[..], 185_728_392_f32))
+    );
+  }
+
+  #[test]
+  fn be_f64_tests() {
+    assert_parse!(
+      be_f64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 0_f64))
+    );
+    assert_parse!(
+      be_f64(&[0x41, 0xa6, 0x23, 0xfb, 0x10, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 185_728_392_f64))
+    );
+  }
+
+  #[test]
+  fn le_f32_tests() {
+    assert_parse!(le_f32(&[0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 0_f32)));
+    assert_parse!(
+      le_f32(&[0xd8, 0x1f, 0x31, 0x4d][..]),
+      Ok((&b""[..], 185_728_392_f32))
+    );
+  }
+
+  #[test]
+  fn le_f64_tests() {
+    assert_parse!(
+      le_f64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 0_f64))
+    );
+    assert_parse!(
+      le_f64(&[0x00, 0x00, 0x00, 0x10, 0xfb, 0x23, 0xa6, 0x41][..]),
+      Ok((&b""[..], 185_728_392_f64))
+    );
+  }
+
+  #[test]
+  fn hex_u32_tests() {
+    assert_parse!(
+      hex_u32(&b";"[..]),
+      Err(Err::Error(error_position!(&b";"[..], ErrorKind::IsA)))
+    );
+    assert_parse!(hex_u32(&b"ff;"[..]), Ok((&b";"[..], 255)));
+    assert_parse!(hex_u32(&b"1be2;"[..]), Ok((&b";"[..], 7138)));
+    assert_parse!(hex_u32(&b"c5a31be2;"[..]), Ok((&b";"[..], 3_315_801_058)));
+    assert_parse!(hex_u32(&b"C5A31be2;"[..]), Ok((&b";"[..], 3_315_801_058)));
+    assert_parse!(hex_u32(&b"00c5a31be2;"[..]), Ok((&b"e2;"[..], 12_952_347)));
+    assert_parse!(
+      hex_u32(&b"c5a31be201;"[..]),
+      Ok((&b"01;"[..], 3_315_801_058))
+    );
+    assert_parse!(hex_u32(&b"ffffffff;"[..]), Ok((&b";"[..], 4_294_967_295)));
+    assert_parse!(hex_u32(&b"0x1be2;"[..]), Ok((&b"x1be2;"[..], 0)));
+    assert_parse!(hex_u32(&b"12af"[..]), Ok((&b""[..], 0x12af)));
+  }
+
+  #[test]
+  #[cfg(feature = "std")]
+  fn float_test() {
+    let mut test_cases = vec![
+      "+3.14",
+      "3.14",
+      "-3.14",
+      "0",
+      "0.0",
+      "1.",
+      ".789",
+      "-.5",
+      "1e7",
+      "-1E-7",
+      ".3e-2",
+      "1.e4",
+      "1.2e4",
+      "12.34",
+      "-1.234E-12",
+      "-1.234e-12",
+    ];
+
+    for test in test_cases.drain(..) {
+      let expected32 = str::parse::<f32>(test).unwrap();
+      let expected64 = str::parse::<f64>(test).unwrap();
+
+      println!("now parsing: {} -> {}", test, expected32);
+
+      let larger = format!("{}", test);
+      assert_parse!(recognize_float(&larger[..]), Ok(("", test)));
+
+      assert_parse!(float(larger.as_bytes()), Ok((&b""[..], expected32)));
+      assert_parse!(float(&larger[..]), Ok(("", expected32)));
+
+      assert_parse!(double(larger.as_bytes()), Ok((&b""[..], expected64)));
+      assert_parse!(double(&larger[..]), Ok(("", expected64)));
+    }
+
+    let remaining_exponent = "-1.234E-";
+    assert_parse!(
+      recognize_float(remaining_exponent),
+      Err(Err::Failure(("", ErrorKind::Digit)))
+    );
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/number/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/number/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/number/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/number/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,265 @@
+//! Parsers recognizing numbers
+
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u16 integer,
+/// otherwise a little endian u16 integer.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// use nom::number::Endianness;
+///
+/// # fn main() {
+/// named!(be<u16>, u16!(Endianness::Big));
+///
+/// assert_eq!(be(b"\x00\x01abcd"), Ok((&b"abcd"[..], 0x0001)));
+/// assert_eq!(be(b"\x01"), Err(Err::Incomplete(Needed::new(1))));
+///
+/// named!(le<u16>, u16!(Endianness::Little));
+///
+/// assert_eq!(le(b"\x00\x01abcd"), Ok((&b"abcd"[..], 0x0100)));
+/// assert_eq!(le(b"\x01"), Err(Err::Incomplete(Needed::new(1))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! u16 ( ($i:expr, $e:expr) => ( {if $crate::number::Endianness::Big == $e { $crate::number::streaming::be_u16($i) } else { $crate::number::streaming::le_u16($i) } } ););
+
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u32 integer,
+/// otherwise a little endian u32 integer.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// use nom::number::Endianness;
+///
+/// # fn main() {
+/// named!(be<u32>, u32!(Endianness::Big));
+///
+/// assert_eq!(be(b"\x00\x01\x02\x03abcd"), Ok((&b"abcd"[..], 0x00010203)));
+/// assert_eq!(be(b"\x01"), Err(Err::Incomplete(Needed::new(3))));
+///
+/// named!(le<u32>, u32!(Endianness::Little));
+///
+/// assert_eq!(le(b"\x00\x01\x02\x03abcd"), Ok((&b"abcd"[..], 0x03020100)));
+/// assert_eq!(le(b"\x01"), Err(Err::Incomplete(Needed::new(3))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! u32 ( ($i:expr, $e:expr) => ( {if $crate::number::Endianness::Big == $e { $crate::number::streaming::be_u32($i) } else { $crate::number::streaming::le_u32($i) } } ););
+
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u64 integer,
+/// otherwise a little endian u64 integer.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// use nom::number::Endianness;
+///
+/// # fn main() {
+/// named!(be<u64>, u64!(Endianness::Big));
+///
+/// assert_eq!(be(b"\x00\x01\x02\x03\x04\x05\x06\x07abcd"), Ok((&b"abcd"[..], 0x0001020304050607)));
+/// assert_eq!(be(b"\x01"), Err(Err::Incomplete(Needed::new(7))));
+///
+/// named!(le<u64>, u64!(Endianness::Little));
+///
+/// assert_eq!(le(b"\x00\x01\x02\x03\x04\x05\x06\x07abcd"), Ok((&b"abcd"[..], 0x0706050403020100)));
+/// assert_eq!(le(b"\x01"), Err(Err::Incomplete(Needed::new(7))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! u64 ( ($i:expr, $e:expr) => ( {if $crate::number::Endianness::Big == $e { $crate::number::streaming::be_u64($i) } else { $crate::number::streaming::le_u64($i) } } ););
+
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u128 integer,
+/// otherwise a little endian u128 integer.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// use nom::number::Endianness;
+///
+/// # fn main() {
+/// named!(be<u128>, u128!(Endianness::Big));
+///
+/// assert_eq!(be(b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15abcd"), Ok((&b"abcd"[..], 0x00010203040506070809101112131415)));
+/// assert_eq!(be(b"\x01"), Err(Err::Incomplete(Needed::new(15))));
+///
+/// named!(le<u128>, u128!(Endianness::Little));
+///
+/// assert_eq!(le(b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15abcd"), Ok((&b"abcd"[..], 0x15141312111009080706050403020100)));
+/// assert_eq!(le(b"\x01"), Err(Err::Incomplete(Needed::new(15))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+#[cfg(stable_i128)]
+macro_rules! u128 ( ($i:expr, $e:expr) => ( {if $crate::number::Endianness::Big == $e { $crate::number::streaming::be_u128($i) } else { $crate::number::streaming::le_u128($i) } } ););
+
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i16 integer,
+/// otherwise a little endian i16 integer.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// use nom::number::Endianness;
+///
+/// # fn main() {
+/// named!(be<i16>, i16!(Endianness::Big));
+///
+/// assert_eq!(be(b"\x00\x01abcd"), Ok((&b"abcd"[..], 0x0001)));
+/// assert_eq!(be(b"\x01"), Err(Err::Incomplete(Needed::new(1))));
+///
+/// named!(le<i16>, i16!(Endianness::Little));
+///
+/// assert_eq!(le(b"\x00\x01abcd"), Ok((&b"abcd"[..], 0x0100)));
+/// assert_eq!(le(b"\x01"), Err(Err::Incomplete(Needed::new(1))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! i16 ( ($i:expr, $e:expr) => ( {if $crate::number::Endianness::Big == $e { $crate::number::streaming::be_i16($i) } else { $crate::number::streaming::le_i16($i) } } ););
+
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i32 integer,
+/// otherwise a little endian i32 integer.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// use nom::number::Endianness;
+///
+/// # fn main() {
+/// named!(be<i32>, i32!(Endianness::Big));
+///
+/// assert_eq!(be(b"\x00\x01\x02\x03abcd"), Ok((&b"abcd"[..], 0x00010203)));
+/// assert_eq!(be(b"\x01"), Err(Err::Incomplete(Needed::new(3))));
+///
+/// named!(le<i32>, i32!(Endianness::Little));
+///
+/// assert_eq!(le(b"\x00\x01\x02\x03abcd"), Ok((&b"abcd"[..], 0x03020100)));
+/// assert_eq!(le(b"\x01"), Err(Err::Incomplete(Needed::new(3))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! i32 ( ($i:expr, $e:expr) => ( {if $crate::number::Endianness::Big == $e { $crate::number::streaming::be_i32($i) } else { $crate::number::streaming::le_i32($i) } } ););
+
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i64 integer,
+/// otherwise a little endian i64 integer.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// use nom::number::Endianness;
+///
+/// # fn main() {
+/// named!(be<i64>, i64!(Endianness::Big));
+///
+/// assert_eq!(be(b"\x00\x01\x02\x03\x04\x05\x06\x07abcd"), Ok((&b"abcd"[..], 0x0001020304050607)));
+/// assert_eq!(be(b"\x01"), Err(Err::Incomplete(Needed::new(7))));
+///
+/// named!(le<i64>, i64!(Endianness::Little));
+///
+/// assert_eq!(le(b"\x00\x01\x02\x03\x04\x05\x06\x07abcd"), Ok((&b"abcd"[..], 0x0706050403020100)));
+/// assert_eq!(le(b"\x01"), Err(Err::Incomplete(Needed::new(7))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! i64 ( ($i:expr, $e:expr) => ( {if $crate::number::Endianness::Big == $e { $crate::number::streaming::be_i64($i) } else { $crate::number::streaming::le_i64($i) } } ););
+
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i64 integer,
+/// otherwise a little endian i64 integer.
+///
+/// ```rust
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err, Needed};
+/// use nom::number::Endianness;
+///
+/// # fn main() {
+/// named!(be<i128>, i128!(Endianness::Big));
+///
+/// assert_eq!(be(b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15abcd"), Ok((&b"abcd"[..], 0x00010203040506070809101112131415)));
+/// assert_eq!(be(b"\x01"), Err(Err::Incomplete(Needed::new(15))));
+///
+/// named!(le<i128>, i128!(Endianness::Little));
+///
+/// assert_eq!(le(b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15abcd"), Ok((&b"abcd"[..], 0x15141312111009080706050403020100)));
+/// assert_eq!(le(b"\x01"), Err(Err::Incomplete(Needed::new(15))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+#[cfg(stable_i128)]
+macro_rules! i128 ( ($i:expr, $e:expr) => ( {if $crate::number::Endianness::Big == $e { $crate::number::streaming::be_i128($i) } else { $crate::number::streaming::le_i128($i) } } ););
+
+#[cfg(test)]
+mod tests {
+  use crate::number::Endianness;
+
+  #[test]
+  fn configurable_endianness() {
+    named!(be_tst16<u16>, u16!(Endianness::Big));
+    named!(le_tst16<u16>, u16!(Endianness::Little));
+    assert_eq!(be_tst16(&[0x80, 0x00]), Ok((&b""[..], 32_768_u16)));
+    assert_eq!(le_tst16(&[0x80, 0x00]), Ok((&b""[..], 128_u16)));
+
+    named!(be_tst32<u32>, u32!(Endianness::Big));
+    named!(le_tst32<u32>, u32!(Endianness::Little));
+    assert_eq!(
+      be_tst32(&[0x12, 0x00, 0x60, 0x00]),
+      Ok((&b""[..], 302_014_464_u32))
+    );
+    assert_eq!(
+      le_tst32(&[0x12, 0x00, 0x60, 0x00]),
+      Ok((&b""[..], 6_291_474_u32))
+    );
+
+    named!(be_tst64<u64>, u64!(Endianness::Big));
+    named!(le_tst64<u64>, u64!(Endianness::Little));
+    assert_eq!(
+      be_tst64(&[0x12, 0x00, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]),
+      Ok((&b""[..], 1_297_142_246_100_992_000_u64))
+    );
+    assert_eq!(
+      le_tst64(&[0x12, 0x00, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]),
+      Ok((&b""[..], 36_028_874_334_666_770_u64))
+    );
+
+    named!(be_tsti16<i16>, i16!(Endianness::Big));
+    named!(le_tsti16<i16>, i16!(Endianness::Little));
+    assert_eq!(be_tsti16(&[0x00, 0x80]), Ok((&b""[..], 128_i16)));
+    assert_eq!(le_tsti16(&[0x00, 0x80]), Ok((&b""[..], -32_768_i16)));
+
+    named!(be_tsti32<i32>, i32!(Endianness::Big));
+    named!(le_tsti32<i32>, i32!(Endianness::Little));
+    assert_eq!(
+      be_tsti32(&[0x00, 0x12, 0x60, 0x00]),
+      Ok((&b""[..], 1_204_224_i32))
+    );
+    assert_eq!(
+      le_tsti32(&[0x00, 0x12, 0x60, 0x00]),
+      Ok((&b""[..], 6_296_064_i32))
+    );
+
+    named!(be_tsti64<i64>, i64!(Endianness::Big));
+    named!(le_tsti64<i64>, i64!(Endianness::Little));
+    assert_eq!(
+      be_tsti64(&[0x00, 0xFF, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]),
+      Ok((&b""[..], 71_881_672_479_506_432_i64))
+    );
+    assert_eq!(
+      le_tsti64(&[0x00, 0xFF, 0x60, 0x00, 0x12, 0x00, 0x80, 0x00]),
+      Ok((&b""[..], 36_028_874_334_732_032_i64))
+    );
+  }
+
+  //FIXME
+  /*
+  #[test]
+  #[cfg(feature = "std")]
+  fn manual_configurable_endianness_test() {
+    let x = 1;
+    let int_parse: Box<Fn(&[u8]) -> IResult<&[u8], u16, (&[u8], ErrorKind)>> = if x == 2 {
+      Box::new(be_u16)
+    } else {
+      Box::new(le_u16)
+    };
+    println!("{:?}", int_parse(&b"3"[..]));
+    assert_eq!(int_parse(&[0x80, 0x00]), Ok((&b""[..], 128_u16)));
+  }
+  */
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/number/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/number/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/number/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/number/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+//! Parsers recognizing numbers
+
+#[macro_use]
+mod macros;
+
+pub mod complete;
+pub mod streaming;
+
+/// Configurable endianness
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum Endianness {
+  /// Big endian
+  Big,
+  /// Little endian
+  Little,
+  /// Will match the host's endianness
+  Native,
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/number/streaming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/number/streaming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/number/streaming.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/number/streaming.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1986 @@
+//! Parsers recognizing numbers, streaming version
+
+use crate::branch::alt;
+use crate::character::streaming::{char, digit1};
+use crate::combinator::{cut, map, opt, recognize};
+use crate::error::{ErrorKind, ParseError};
+use crate::internal::*;
+use crate::lib::std::ops::{RangeFrom, RangeTo};
+use crate::sequence::{pair, tuple};
+use crate::traits::{AsChar, InputIter, InputLength, InputTakeAtPosition};
+use crate::traits::{Offset, Slice};
+
+/// Recognizes an unsigned 1 byte integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_u8;
+///
+/// let parser = |s| {
+///   be_u8::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01abcd"[..]), Ok((&b"\x01abcd"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn be_u8<I, E: ParseError<I>>(input: I) -> IResult<I, u8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 1;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(1)))
+  } else {
+    let res = input.iter_elements().next().unwrap();
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 2 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_u16;
+///
+/// let parser = |s| {
+///   be_u16::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01abcd"[..]), Ok((&b"abcd"[..], 0x0001)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn be_u16<I, E: ParseError<I>>(input: I) -> IResult<I, u16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 2;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u16;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u16;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 3 byte integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_u24;
+///
+/// let parser = |s| {
+///   be_u24::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02abcd"[..]), Ok((&b"abcd"[..], 0x000102)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+#[inline]
+pub fn be_u24<I, E: ParseError<I>>(input: I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 3;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u32;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u32;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 4 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_u32;
+///
+/// let parser = |s| {
+///   be_u32::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03abcd"[..]), Ok((&b"abcd"[..], 0x00010203)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(3))));
+/// ```
+#[inline]
+pub fn be_u32<I, E: ParseError<I>>(input: I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 4;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u32;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u32;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 8 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_u64;
+///
+/// let parser = |s| {
+///   be_u64::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcd"[..]), Ok((&b"abcd"[..], 0x0001020304050607)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(7))));
+/// ```
+#[inline]
+pub fn be_u64<I, E: ParseError<I>>(input: I) -> IResult<I, u64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 8;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u64;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u64;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a big endian unsigned 16 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_u128;
+///
+/// let parser = |s| {
+///   be_u128::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15abcd"[..]), Ok((&b"abcd"[..], 0x00010203040506070809101112131415)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(15))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn be_u128<I, E: ParseError<I>>(input: I) -> IResult<I, u128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 16;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u128;
+    for byte in input.iter_elements().take(bound) {
+      res = (res << 8) + byte as u128;
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a signed 1 byte integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_i8;
+///
+/// let parser = be_i8::<_, (_, ErrorKind)>;
+///
+/// assert_eq!(parser(&b"\x00\x01abcd"[..]), Ok((&b"\x01abcd"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn be_i8<I, E: ParseError<I>>(input: I) -> IResult<I, i8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u8, |x| x as i8)
+}
+
+/// Recognizes a big endian signed 2 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_i16;
+///
+/// let parser = be_i16::<_, (_, ErrorKind)>;
+///
+/// assert_eq!(parser(&b"\x00\x01abcd"[..]), Ok((&b"abcd"[..], 0x0001)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+#[inline]
+pub fn be_i16<I, E: ParseError<I>>(input: I) -> IResult<I, i16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u16, |x| x as i16)
+}
+
+/// Recognizes a big endian signed 3 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_i24;
+///
+/// let parser = be_i24::<_, (_, ErrorKind)>;
+///
+/// assert_eq!(parser(&b"\x00\x01\x02abcd"[..]), Ok((&b"abcd"[..], 0x000102)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(3))));
+/// ```
+#[inline]
+pub fn be_i24<I, E: ParseError<I>>(input: I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  // Same as the unsigned version but we need to sign-extend manually here
+  map!(input, be_u24, |x| if x & 0x80_00_00 != 0 {
+    (x | 0xff_00_00_00) as i32
+  } else {
+    x as i32
+  })
+}
+
+/// Recognizes a big endian signed 4 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_i32;
+///
+/// let parser = be_i32::<_, (_, ErrorKind)>;
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03abcd"[..]), Ok((&b"abcd"[..], 0x00010203)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(4))));
+/// ```
+#[inline]
+pub fn be_i32<I, E: ParseError<I>>(input: I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u32, |x| x as i32)
+}
+
+/// Recognizes a big endian signed 8 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_i64;
+///
+/// let parser = be_i64::<_, (_, ErrorKind)>;
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcd"[..]), Ok((&b"abcd"[..], 0x0001020304050607)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(7))));
+/// ```
+#[inline]
+pub fn be_i64<I, E: ParseError<I>>(input: I) -> IResult<I, i64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u64, |x| x as i64)
+}
+
+/// Recognizes a big endian signed 16 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_i128;
+///
+/// let parser = be_i128::<_, (_, ErrorKind)>;
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15abcd"[..]), Ok((&b"abcd"[..], 0x00010203040506070809101112131415)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(15))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn be_i128<I, E: ParseError<I>>(input: I) -> IResult<I, i128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, be_u128, |x| x as i128)
+}
+
+/// Recognizes an unsigned 1 byte integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_u8;
+///
+/// let parser = le_u8::<_, (_, ErrorKind)>;
+///
+/// assert_eq!(parser(&b"\x00\x01abcd"[..]), Ok((&b"\x01abcd"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn le_u8<I, E: ParseError<I>>(input: I) -> IResult<I, u8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 1;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(1)))
+  } else {
+    let res = input.iter_elements().next().unwrap();
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 2 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_u16;
+///
+/// let parser = |s| {
+///   le_u16::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01abcd"[..]), Ok((&b"abcd"[..], 0x0100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn le_u16<I, E: ParseError<I>>(input: I) -> IResult<I, u16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 2;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u16;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u16) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 3 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_u24;
+///
+/// let parser = |s| {
+///   le_u24::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02abcd"[..]), Ok((&b"abcd"[..], 0x020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+#[inline]
+pub fn le_u24<I, E: ParseError<I>>(input: I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 3;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u32;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u32) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 4 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_u32;
+///
+/// let parser = |s| {
+///   le_u32::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03abcd"[..]), Ok((&b"abcd"[..], 0x03020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(3))));
+/// ```
+#[inline]
+pub fn le_u32<I, E: ParseError<I>>(input: I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 4;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u32;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u32) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 8 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_u64;
+///
+/// let parser = |s| {
+///   le_u64::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcd"[..]), Ok((&b"abcd"[..], 0x0706050403020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(7))));
+/// ```
+#[inline]
+pub fn le_u64<I, E: ParseError<I>>(input: I) -> IResult<I, u64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 8;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u64;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u64) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a little endian unsigned 16 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_u128;
+///
+/// let parser = |s| {
+///   le_u128::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15abcd"[..]), Ok((&b"abcd"[..], 0x15141312111009080706050403020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(15))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn le_u128<I, E: ParseError<I>>(input: I) -> IResult<I, u128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 16;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(bound - input.input_len())))
+  } else {
+    let mut res = 0u128;
+    for (index, byte) in input.iter_indices().take(bound) {
+      res += (byte as u128) << (8 * index);
+    }
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes a signed 1 byte integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_i8;
+///
+/// let parser = le_i8::<_, (_, ErrorKind)>;
+///
+/// assert_eq!(parser(&b"\x00\x01abcd"[..]), Ok((&b"\x01abcd"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn le_i8<I, E: ParseError<I>>(input: I) -> IResult<I, i8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u8, |x| x as i8)
+}
+
+/// Recognizes a little endian signed 2 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_i16;
+///
+/// let parser = |s| {
+///   le_i16::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01abcd"[..]), Ok((&b"abcd"[..], 0x0100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn le_i16<I, E: ParseError<I>>(input: I) -> IResult<I, i16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u16, |x| x as i16)
+}
+
+/// Recognizes a little endian signed 3 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_i24;
+///
+/// let parser = |s| {
+///   le_i24::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02abcd"[..]), Ok((&b"abcd"[..], 0x020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+#[inline]
+pub fn le_i24<I, E: ParseError<I>>(input: I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  // Same as the unsigned version but we need to sign-extend manually here
+  map!(input, le_u24, |x| if x & 0x80_00_00 != 0 {
+    (x | 0xff_00_00_00) as i32
+  } else {
+    x as i32
+  })
+}
+
+/// Recognizes a little endian signed 4 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_i32;
+///
+/// let parser = |s| {
+///   le_i32::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03abcd"[..]), Ok((&b"abcd"[..], 0x03020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(3))));
+/// ```
+#[inline]
+pub fn le_i32<I, E: ParseError<I>>(input: I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u32, |x| x as i32)
+}
+
+/// Recognizes a little endian signed 8 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_i64;
+///
+/// let parser = |s| {
+///   le_i64::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcd"[..]), Ok((&b"abcd"[..], 0x0706050403020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(7))));
+/// ```
+#[inline]
+pub fn le_i64<I, E: ParseError<I>>(input: I) -> IResult<I, i64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u64, |x| x as i64)
+}
+
+/// Recognizes a little endian signed 16 bytes integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_i128;
+///
+/// let parser = |s| {
+///   le_i128::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15abcd"[..]), Ok((&b"abcd"[..], 0x15141312111009080706050403020100)));
+/// assert_eq!(parser(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(15))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn le_i128<I, E: ParseError<I>>(input: I) -> IResult<I, i128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(input, le_u128, |x| x as i128)
+}
+
+/// Recognizes an unsigned 1 byte integer
+///
+/// Note that endianness does not apply to 1 byte numbers.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::u8;
+///
+/// let parser = |s| {
+///   u8::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"\x03abcefg"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn u8<I, E: ParseError<I>>(input: I) -> IResult<I, u8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  let bound: usize = 1;
+  if input.input_len() < bound {
+    Err(Err::Incomplete(Needed::new(1)))
+  } else {
+    let res = input.iter_elements().next().unwrap();
+
+    Ok((input.slice(bound..), res))
+  }
+}
+
+/// Recognizes an unsigned 2 bytes integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u16 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u16 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::u16;
+///
+/// let be_u16 = |s| {
+///   u16::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u16(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0003)));
+/// assert_eq!(be_u16(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(1))));
+///
+/// let le_u16 = |s| {
+///   u16::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u16(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0300)));
+/// assert_eq!(le_u16(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn u16<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u16,
+    crate::number::Endianness::Little => le_u16,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u16,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u16,
+  }
+}
+
+/// Recognizes an unsigned 3 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u24 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u24 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::u24;
+///
+/// let be_u24 = |s| {
+///   u24::<_,(_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u24(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x000305)));
+/// assert_eq!(be_u24(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(2))));
+///
+/// let le_u24 = |s| {
+///   u24::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u24(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x050300)));
+/// assert_eq!(le_u24(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+#[inline]
+pub fn u24<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u24,
+    crate::number::Endianness::Little => le_u24,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u24,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u24,
+  }
+}
+
+/// Recognizes an unsigned 4 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u32 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u32 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::u32;
+///
+/// let be_u32 = |s| {
+///   u32::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u32(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00030507)));
+/// assert_eq!(be_u32(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(3))));
+///
+/// let le_u32 = |s| {
+///   u32::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u32(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07050300)));
+/// assert_eq!(le_u32(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(3))));
+/// ```
+#[inline]
+pub fn u32<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u32,
+    crate::number::Endianness::Little => le_u32,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u32,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u32,
+  }
+}
+
+/// Recognizes an unsigned 8 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u64 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u64 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::u64;
+///
+/// let be_u64 = |s| {
+///   u64::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u64(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0001020304050607)));
+/// assert_eq!(be_u64(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(7))));
+///
+/// let le_u64 = |s| {
+///   u64::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u64(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0706050403020100)));
+/// assert_eq!(le_u64(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(7))));
+/// ```
+#[inline]
+pub fn u64<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u64,
+    crate::number::Endianness::Little => le_u64,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u64,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u64,
+  }
+}
+
+/// Recognizes an unsigned 16 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian u128 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian u128 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::u128;
+///
+/// let be_u128 = |s| {
+///   u128::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_u128(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00010203040506070001020304050607)));
+/// assert_eq!(be_u128(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(15))));
+///
+/// let le_u128 = |s| {
+///   u128::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_u128(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07060504030201000706050403020100)));
+/// assert_eq!(le_u128(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(15))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn u128<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, u128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_u128,
+    crate::number::Endianness::Little => le_u128,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_u128,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_u128,
+  }
+}
+
+/// Recognizes a signed 1 byte integer
+///
+/// Note that endianness does not apply to 1 byte numbers.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::i8;
+///
+/// let parser = |s| {
+///   i8::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&b"\x00\x03abcefg"[..]), Ok((&b"\x03abcefg"[..], 0x00)));
+/// assert_eq!(parser(&b""[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn i8<I, E: ParseError<I>>(i: I) -> IResult<I, i8, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  map!(i, u8, |x| x as i8)
+}
+
+/// Recognizes a signed 2 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i16 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i16 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::i16;
+///
+/// let be_i16 = |s| {
+///   i16::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i16(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0003)));
+/// assert_eq!(be_i16(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(1))));
+///
+/// let le_i16 = |s| {
+///   i16::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i16(&b"\x00\x03abcefg"[..]), Ok((&b"abcefg"[..], 0x0300)));
+/// assert_eq!(le_i16(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn i16<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i16, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i16,
+    crate::number::Endianness::Little => le_i16,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i16,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i16,
+  }
+}
+
+/// Recognizes a signed 3 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i24 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i24 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::i24;
+///
+/// let be_i24 = |s| {
+///   i24::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i24(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x000305)));
+/// assert_eq!(be_i24(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(2))));
+///
+/// let le_i24 = |s| {
+///   i24::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i24(&b"\x00\x03\x05abcefg"[..]), Ok((&b"abcefg"[..], 0x050300)));
+/// assert_eq!(le_i24(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(2))));
+/// ```
+#[inline]
+pub fn i24<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i24,
+    crate::number::Endianness::Little => le_i24,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i24,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i24,
+  }
+}
+
+/// Recognizes a signed 4 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i32 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i32 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::i32;
+///
+/// let be_i32 = |s| {
+///   i32::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i32(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00030507)));
+/// assert_eq!(be_i32(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(3))));
+///
+/// let le_i32 = |s| {
+///   i32::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i32(&b"\x00\x03\x05\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07050300)));
+/// assert_eq!(le_i32(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(3))));
+/// ```
+#[inline]
+pub fn i32<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i32,
+    crate::number::Endianness::Little => le_i32,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i32,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i32,
+  }
+}
+
+/// Recognizes a signed 8 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i64 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i64 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::i64;
+///
+/// let be_i64 = |s| {
+///   i64::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i64(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0001020304050607)));
+/// assert_eq!(be_i64(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(7))));
+///
+/// let le_i64 = |s| {
+///   i64::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i64(&b"\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x0706050403020100)));
+/// assert_eq!(le_i64(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(7))));
+/// ```
+#[inline]
+pub fn i64<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i64,
+    crate::number::Endianness::Little => le_i64,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i64,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i64,
+  }
+}
+
+/// Recognizes a signed 16 byte integer
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian i128 integer,
+/// otherwise if `nom::Endianness::Little` parse a little endian i128 integer.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::i128;
+///
+/// let be_i128 = |s| {
+///   i128::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_i128(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x00010203040506070001020304050607)));
+/// assert_eq!(be_i128(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(15))));
+///
+/// let le_i128 = |s| {
+///   i128::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_i128(&b"\x00\x01\x02\x03\x04\x05\x06\x07\x00\x01\x02\x03\x04\x05\x06\x07abcefg"[..]), Ok((&b"abcefg"[..], 0x07060504030201000706050403020100)));
+/// assert_eq!(le_i128(&b"\x01"[..]), Err(Err::Incomplete(Needed::new(15))));
+/// ```
+#[inline]
+#[cfg(stable_i128)]
+pub fn i128<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, i128, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_i128,
+    crate::number::Endianness::Little => le_i128,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_i128,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_i128,
+  }
+}
+
+/// Recognizes a big endian 4 bytes floating point number.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_f32;
+///
+/// let parser = |s| {
+///   be_f32::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&[0x40, 0x29, 0x00, 0x00][..]), Ok((&b""[..], 2.640625)));
+/// assert_eq!(parser(&[0x01][..]), Err(Err::Incomplete(Needed::new(3))));
+/// ```
+#[inline]
+pub fn be_f32<I, E: ParseError<I>>(input: I) -> IResult<I, f32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match be_u32(input) {
+    Err(e) => Err(e),
+    Ok((i, o)) => Ok((i, f32::from_bits(o))),
+  }
+}
+
+/// Recognizes a big endian 8 bytes floating point number.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::be_f64;
+///
+/// let parser = |s| {
+///   be_f64::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&[0x40, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(parser(&[0x01][..]), Err(Err::Incomplete(Needed::new(7))));
+/// ```
+#[inline]
+pub fn be_f64<I, E: ParseError<I>>(input: I) -> IResult<I, f64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match be_u64(input) {
+    Err(e) => Err(e),
+    Ok((i, o)) => Ok((i, f64::from_bits(o))),
+  }
+}
+
+/// Recognizes a little endian 4 bytes floating point number.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_f32;
+///
+/// let parser = |s| {
+///   le_f32::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&[0x00, 0x00, 0x48, 0x41][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(parser(&[0x01][..]), Err(Err::Incomplete(Needed::new(3))));
+/// ```
+#[inline]
+pub fn le_f32<I, E: ParseError<I>>(input: I) -> IResult<I, f32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match le_u32(input) {
+    Err(e) => Err(e),
+    Ok((i, o)) => Ok((i, f32::from_bits(o))),
+  }
+}
+
+/// Recognizes a little endian 8 bytes floating point number.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::le_f64;
+///
+/// let parser = |s| {
+///   le_f64::<_, (_, ErrorKind)>(s)
+/// };
+///
+/// assert_eq!(parser(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x41][..]), Ok((&b""[..], 3145728.0)));
+/// assert_eq!(parser(&[0x01][..]), Err(Err::Incomplete(Needed::new(7))));
+/// ```
+#[inline]
+pub fn le_f64<I, E: ParseError<I>>(input: I) -> IResult<I, f64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match le_u64(input) {
+    Err(e) => Err(e),
+    Ok((i, o)) => Ok((i, f64::from_bits(o))),
+  }
+}
+
+/// Recognizes a 4 byte floating point number
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian f32 float,
+/// otherwise if `nom::Endianness::Little` parse a little endian f32 float.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::f32;
+///
+/// let be_f32 = |s| {
+///   f32::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_f32(&[0x41, 0x48, 0x00, 0x00][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(be_f32(&b"abc"[..]), Err(Err::Incomplete(Needed::new(1))));
+///
+/// let le_f32 = |s| {
+///   f32::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_f32(&[0x00, 0x00, 0x48, 0x41][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(le_f32(&b"abc"[..]), Err(Err::Incomplete(Needed::new(1))));
+/// ```
+#[inline]
+pub fn f32<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, f32, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_f32,
+    crate::number::Endianness::Little => le_f32,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_f32,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_f32,
+  }
+}
+
+/// Recognizes an 8 byte floating point number
+///
+/// If the parameter is `nom::Endianness::Big`, parse a big endian f64 float,
+/// otherwise if `nom::Endianness::Little` parse a little endian f64 float.
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::number::streaming::f64;
+///
+/// let be_f64 = |s| {
+///   f64::<_, (_, ErrorKind)>(nom::number::Endianness::Big)(s)
+/// };
+///
+/// assert_eq!(be_f64(&[0x40, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(be_f64(&b"abc"[..]), Err(Err::Incomplete(Needed::new(5))));
+///
+/// let le_f64 = |s| {
+///   f64::<_, (_, ErrorKind)>(nom::number::Endianness::Little)(s)
+/// };
+///
+/// assert_eq!(le_f64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x40][..]), Ok((&b""[..], 12.5)));
+/// assert_eq!(le_f64(&b"abc"[..]), Err(Err::Incomplete(Needed::new(5))));
+/// ```
+#[inline]
+pub fn f64<I, E: ParseError<I>>(endian: crate::number::Endianness) -> fn(I) -> IResult<I, f64, E>
+where
+  I: Slice<RangeFrom<usize>> + InputIter<Item = u8> + InputLength,
+{
+  match endian {
+    crate::number::Endianness::Big => be_f64,
+    crate::number::Endianness::Little => le_f64,
+    #[cfg(target_endian = "big")]
+    crate::number::Endianness::Native => be_f64,
+    #[cfg(target_endian = "little")]
+    crate::number::Endianness::Native => le_f64,
+  }
+}
+
+/// Recognizes a hex-encoded integer.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if there is not enough data.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::hex_u32;
+///
+/// let parser = |s| {
+///   hex_u32(s)
+/// };
+///
+/// assert_eq!(parser(b"01AE;"), Ok((&b";"[..], 0x01AE)));
+/// assert_eq!(parser(b"abc"), Err(Err::Incomplete(Needed::new(1))));
+/// assert_eq!(parser(b"ggg"), Err(Err::Error((&b"ggg"[..], ErrorKind::IsA))));
+/// ```
+#[inline]
+pub fn hex_u32<'a, E: ParseError<&'a [u8]>>(input: &'a [u8]) -> IResult<&'a [u8], u32, E> {
+  let (i, o) = crate::bytes::streaming::is_a(&b"0123456789abcdefABCDEF"[..])(input)?;
+
+  // Do not parse more than 8 characters for a u32
+  let (parsed, remaining) = if o.len() <= 8 {
+    (o, i)
+  } else {
+    (&input[..8], &input[8..])
+  };
+
+  let res = parsed
+    .iter()
+    .rev()
+    .enumerate()
+    .map(|(k, &v)| {
+      let digit = v as char;
+      digit.to_digit(16).unwrap_or(0) << (k * 4)
+    })
+    .sum();
+
+  Ok((remaining, res))
+}
+
+/// Recognizes a floating point number in text format and returns the corresponding part of the input.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if it reaches the end of input.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::recognize_float;
+///
+/// let parser = |s| {
+///   recognize_float(s)
+/// };
+///
+/// assert_eq!(parser("11e-1;"), Ok((";", "11e-1")));
+/// assert_eq!(parser("123E-02;"), Ok((";", "123E-02")));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", "123")));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Char))));
+/// ```
+#[allow(unused_imports)]
+#[rustfmt::skip]
+pub fn recognize_float<T, E:ParseError<T>>(input: T) -> IResult<T, T, E>
+where
+  T: Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: Clone + Offset,
+  T: InputIter,
+  <T as InputIter>::Item: AsChar,
+  T: InputTakeAtPosition + InputLength,
+  <T as InputTakeAtPosition>::Item: AsChar
+{
+  recognize(
+    tuple((
+      opt(alt((char('+'), char('-')))),
+      alt((
+        map(tuple((digit1, opt(pair(char('.'), opt(digit1))))), |_| ()),
+        map(tuple((char('.'), digit1)), |_| ())
+      )),
+      opt(tuple((
+        alt((char('e'), char('E'))),
+        opt(alt((char('+'), char('-')))),
+        cut(digit1)
+      )))
+    ))
+  )(input)
+}
+
+/// Recognizes floating point number in a byte string and returns a `f32`.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if it reaches the end of input.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::float;
+///
+/// let parser = |s| {
+///   float(s)
+/// };
+///
+/// assert_eq!(parser("11e-1;"), Ok((";", 1.1)));
+/// assert_eq!(parser("123E-02;"), Ok((";", 1.23)));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", 123.0)));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Char))));
+/// ```
+#[cfg(not(feature = "lexical"))]
+pub fn float<T, E: ParseError<T>>(input: T) -> IResult<T, f32, E>
+where
+  T: Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: Clone + Offset,
+  T: InputIter + InputLength + crate::traits::ParseTo<f32>,
+  <T as InputIter>::Item: AsChar,
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  match recognize_float(input) {
+    Err(e) => Err(e),
+    Ok((i, s)) => match s.parse_to() {
+      Some(n) => Ok((i, n)),
+      None => Err(Err::Error(E::from_error_kind(i, ErrorKind::Float))),
+    },
+  }
+}
+
+/// Recognizes floating point number in a byte string and returns a `f32`.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if it reaches the end of input.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::float;
+///
+/// let parser = |s| {
+///   float(s)
+/// };
+///
+/// assert_eq!(parser("11e-1;"), Ok((";", 1.1)));
+/// assert_eq!(parser("123E-02;"), Ok((";", 1.23)));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", 123.0)));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Float))));
+/// ```
+///
+/// this function uses the lexical-core crate for float parsing by default, you
+/// can deactivate it by removing the "lexical" feature
+#[cfg(feature = "lexical")]
+pub fn float<T, E: ParseError<T>>(input: T) -> IResult<T, f32, E>
+where
+  T: crate::traits::AsBytes + InputLength + Slice<RangeFrom<usize>>,
+{
+  match ::lexical_core::parse_partial(input.as_bytes()) {
+    Ok((value, processed)) => {
+      if processed == input.input_len() {
+        Err(Err::Incomplete(Needed::Unknown))
+      } else {
+        Ok((input.slice(processed..), value))
+      }
+    }
+    Err(_) => Err(Err::Error(E::from_error_kind(input, ErrorKind::Float))),
+  }
+}
+
+/// Recognizes floating point number in a byte string and returns a `f64`.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if it reaches the end of input.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::double;
+///
+/// let parser = |s| {
+///   double(s)
+/// };
+///
+/// assert_eq!(parser("11e-1;"), Ok((";", 1.1)));
+/// assert_eq!(parser("123E-02;"), Ok((";", 1.23)));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", 123.0)));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Char))));
+/// ```
+#[cfg(not(feature = "lexical"))]
+pub fn double<T, E: ParseError<T>>(input: T) -> IResult<T, f64, E>
+where
+  T: Slice<RangeFrom<usize>> + Slice<RangeTo<usize>>,
+  T: Clone + Offset,
+  T: InputIter + InputLength + crate::traits::ParseTo<f64>,
+  <T as InputIter>::Item: AsChar,
+  T: InputTakeAtPosition,
+  <T as InputTakeAtPosition>::Item: AsChar,
+{
+  match recognize_float(input) {
+    Err(e) => Err(e),
+    Ok((i, s)) => match s.parse_to() {
+      Some(n) => Ok((i, n)),
+      None => Err(Err::Error(E::from_error_kind(i, ErrorKind::Float))),
+    },
+  }
+}
+
+/// Recognizes floating point number in a byte string and returns a `f64`.
+///
+/// *Streaming version*: Will return `Err(nom::Err::Incomplete(_))` if it reaches the end of input.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// use nom::number::streaming::double;
+///
+/// let parser = |s| {
+///   double(s)
+/// };
+///
+/// assert_eq!(parser("11e-1;"), Ok((";", 1.1)));
+/// assert_eq!(parser("123E-02;"), Ok((";", 1.23)));
+/// assert_eq!(parser("123K-01"), Ok(("K-01", 123.0)));
+/// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::Float))));
+/// ```
+///
+/// this function uses the lexical-core crate for float parsing by default, you
+/// can deactivate it by removing the "lexical" feature
+#[cfg(feature = "lexical")]
+pub fn double<T, E: ParseError<T>>(input: T) -> IResult<T, f64, E>
+where
+  T: crate::traits::AsBytes + InputLength + Slice<RangeFrom<usize>>,
+{
+  match ::lexical_core::parse_partial(input.as_bytes()) {
+    Ok((value, processed)) => {
+      if processed == input.input_len() {
+        Err(Err::Incomplete(Needed::Unknown))
+      } else {
+        Ok((input.slice(processed..), value))
+      }
+    }
+    Err(_) => Err(Err::Error(E::from_error_kind(input, ErrorKind::Float))),
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::error::ErrorKind;
+  use crate::internal::{Err, Needed};
+
+  macro_rules! assert_parse(
+    ($left: expr, $right: expr) => {
+      let res: $crate::IResult<_, _, (_, ErrorKind)> = $left;
+      assert_eq!(res, $right);
+    };
+  );
+
+  #[test]
+  fn i8_tests() {
+    assert_parse!(be_i8(&[0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(be_i8(&[0x7f][..]), Ok((&b""[..], 127)));
+    assert_parse!(be_i8(&[0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(be_i8(&[0x80][..]), Ok((&b""[..], -128)));
+    assert_parse!(be_i8(&[][..]), Err(Err::Incomplete(Needed::new(1))));
+  }
+
+  #[test]
+  fn i16_tests() {
+    assert_parse!(be_i16(&[0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(be_i16(&[0x7f, 0xff][..]), Ok((&b""[..], 32_767_i16)));
+    assert_parse!(be_i16(&[0xff, 0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(be_i16(&[0x80, 0x00][..]), Ok((&b""[..], -32_768_i16)));
+    assert_parse!(be_i16(&[][..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_parse!(be_i16(&[0x00][..]), Err(Err::Incomplete(Needed::new(1))));
+  }
+
+  #[test]
+  fn u24_tests() {
+    assert_parse!(be_u24(&[0x00, 0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(be_u24(&[0x00, 0xFF, 0xFF][..]), Ok((&b""[..], 65_535_u32)));
+    assert_parse!(
+      be_u24(&[0x12, 0x34, 0x56][..]),
+      Ok((&b""[..], 1_193_046_u32))
+    );
+    assert_parse!(be_u24(&[][..]), Err(Err::Incomplete(Needed::new(3))));
+    assert_parse!(be_u24(&[0x00][..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_parse!(
+      be_u24(&[0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+  }
+
+  #[test]
+  fn i24_tests() {
+    assert_parse!(be_i24(&[0xFF, 0xFF, 0xFF][..]), Ok((&b""[..], -1_i32)));
+    assert_parse!(be_i24(&[0xFF, 0x00, 0x00][..]), Ok((&b""[..], -65_536_i32)));
+    assert_parse!(
+      be_i24(&[0xED, 0xCB, 0xAA][..]),
+      Ok((&b""[..], -1_193_046_i32))
+    );
+    assert_parse!(be_i24(&[][..]), Err(Err::Incomplete(Needed::new(3))));
+    assert_parse!(be_i24(&[0x00][..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_parse!(
+      be_i24(&[0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+  }
+
+  #[test]
+  fn i32_tests() {
+    assert_parse!(be_i32(&[0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(
+      be_i32(&[0x7f, 0xff, 0xff, 0xff][..]),
+      Ok((&b""[..], 2_147_483_647_i32))
+    );
+    assert_parse!(be_i32(&[0xff, 0xff, 0xff, 0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(
+      be_i32(&[0x80, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], -2_147_483_648_i32))
+    );
+    assert_parse!(be_i32(&[][..]), Err(Err::Incomplete(Needed::new(4))));
+    assert_parse!(be_i32(&[0x00][..]), Err(Err::Incomplete(Needed::new(3))));
+    assert_parse!(
+      be_i32(&[0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(2)))
+    );
+    assert_parse!(
+      be_i32(&[0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+  }
+
+  #[test]
+  fn i64_tests() {
+    assert_parse!(
+      be_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 0))
+    );
+    assert_parse!(
+      be_i64(&[0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff][..]),
+      Ok((&b""[..], 9_223_372_036_854_775_807_i64))
+    );
+    assert_parse!(
+      be_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff][..]),
+      Ok((&b""[..], -1))
+    );
+    assert_parse!(
+      be_i64(&[0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], -9_223_372_036_854_775_808_i64))
+    );
+    assert_parse!(be_i64(&[][..]), Err(Err::Incomplete(Needed::new(8))));
+    assert_parse!(be_i64(&[0x00][..]), Err(Err::Incomplete(Needed::new(7))));
+    assert_parse!(
+      be_i64(&[0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(6)))
+    );
+    assert_parse!(
+      be_i64(&[0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(5)))
+    );
+    assert_parse!(
+      be_i64(&[0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(4)))
+    );
+    assert_parse!(
+      be_i64(&[0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_parse!(
+      be_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(2)))
+    );
+    assert_parse!(
+      be_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+  }
+
+  #[test]
+  #[cfg(stable_i128)]
+  fn i128_tests() {
+    assert_parse!(
+      be_i128(
+        &[
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00
+        ][..]
+      ),
+      Ok((&b""[..], 0))
+    );
+    assert_parse!(
+      be_i128(
+        &[
+          0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+          0xff
+        ][..]
+      ),
+      Ok((
+        &b""[..],
+        170_141_183_460_469_231_731_687_303_715_884_105_727_i128
+      ))
+    );
+    assert_parse!(
+      be_i128(
+        &[
+          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+          0xff
+        ][..]
+      ),
+      Ok((&b""[..], -1))
+    );
+    assert_parse!(
+      be_i128(
+        &[
+          0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00
+        ][..]
+      ),
+      Ok((
+        &b""[..],
+        -170_141_183_460_469_231_731_687_303_715_884_105_728_i128
+      ))
+    );
+    assert_parse!(be_i128(&[][..]), Err(Err::Incomplete(Needed::new(16))));
+    assert_parse!(be_i128(&[0x00][..]), Err(Err::Incomplete(Needed::new(15))));
+    assert_parse!(
+      be_i128(&[0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(14)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(13)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(12)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(11)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(10)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(9)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(8)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(7)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(6)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(5)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(4)))
+    );
+    assert_parse!(
+      be_i128(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_parse!(
+      be_i128(
+        &[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]
+      ),
+      Err(Err::Incomplete(Needed::new(2)))
+    );
+    assert_parse!(
+      be_i128(
+        &[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+          [..]
+      ),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+  }
+
+  #[test]
+  fn le_i8_tests() {
+    assert_parse!(le_i8(&[0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(le_i8(&[0x7f][..]), Ok((&b""[..], 127)));
+    assert_parse!(le_i8(&[0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(le_i8(&[0x80][..]), Ok((&b""[..], -128)));
+  }
+
+  #[test]
+  fn le_i16_tests() {
+    assert_parse!(le_i16(&[0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(le_i16(&[0xff, 0x7f][..]), Ok((&b""[..], 32_767_i16)));
+    assert_parse!(le_i16(&[0xff, 0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(le_i16(&[0x00, 0x80][..]), Ok((&b""[..], -32_768_i16)));
+  }
+
+  #[test]
+  fn le_u24_tests() {
+    assert_parse!(le_u24(&[0x00, 0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(le_u24(&[0xFF, 0xFF, 0x00][..]), Ok((&b""[..], 65_535_u32)));
+    assert_parse!(
+      le_u24(&[0x56, 0x34, 0x12][..]),
+      Ok((&b""[..], 1_193_046_u32))
+    );
+  }
+
+  #[test]
+  fn le_i24_tests() {
+    assert_parse!(le_i24(&[0xFF, 0xFF, 0xFF][..]), Ok((&b""[..], -1_i32)));
+    assert_parse!(le_i24(&[0x00, 0x00, 0xFF][..]), Ok((&b""[..], -65_536_i32)));
+    assert_parse!(
+      le_i24(&[0xAA, 0xCB, 0xED][..]),
+      Ok((&b""[..], -1_193_046_i32))
+    );
+  }
+
+  #[test]
+  fn le_i32_tests() {
+    assert_parse!(le_i32(&[0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 0)));
+    assert_parse!(
+      le_i32(&[0xff, 0xff, 0xff, 0x7f][..]),
+      Ok((&b""[..], 2_147_483_647_i32))
+    );
+    assert_parse!(le_i32(&[0xff, 0xff, 0xff, 0xff][..]), Ok((&b""[..], -1)));
+    assert_parse!(
+      le_i32(&[0x00, 0x00, 0x00, 0x80][..]),
+      Ok((&b""[..], -2_147_483_648_i32))
+    );
+  }
+
+  #[test]
+  fn le_i64_tests() {
+    assert_parse!(
+      le_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 0))
+    );
+    assert_parse!(
+      le_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f][..]),
+      Ok((&b""[..], 9_223_372_036_854_775_807_i64))
+    );
+    assert_parse!(
+      le_i64(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff][..]),
+      Ok((&b""[..], -1))
+    );
+    assert_parse!(
+      le_i64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80][..]),
+      Ok((&b""[..], -9_223_372_036_854_775_808_i64))
+    );
+  }
+
+  #[test]
+  #[cfg(stable_i128)]
+  fn le_i128_tests() {
+    assert_parse!(
+      le_i128(
+        &[
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00
+        ][..]
+      ),
+      Ok((&b""[..], 0))
+    );
+    assert_parse!(
+      le_i128(
+        &[
+          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+          0x7f
+        ][..]
+      ),
+      Ok((
+        &b""[..],
+        170_141_183_460_469_231_731_687_303_715_884_105_727_i128
+      ))
+    );
+    assert_parse!(
+      le_i128(
+        &[
+          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+          0xff
+        ][..]
+      ),
+      Ok((&b""[..], -1))
+    );
+    assert_parse!(
+      le_i128(
+        &[
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x80
+        ][..]
+      ),
+      Ok((
+        &b""[..],
+        -170_141_183_460_469_231_731_687_303_715_884_105_728_i128
+      ))
+    );
+  }
+
+  #[test]
+  fn be_f32_tests() {
+    assert_parse!(be_f32(&[0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 0_f32)));
+    assert_parse!(
+      be_f32(&[0x4d, 0x31, 0x1f, 0xd8][..]),
+      Ok((&b""[..], 185_728_392_f32))
+    );
+  }
+
+  #[test]
+  fn be_f64_tests() {
+    assert_parse!(
+      be_f64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 0_f64))
+    );
+    assert_parse!(
+      be_f64(&[0x41, 0xa6, 0x23, 0xfb, 0x10, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 185_728_392_f64))
+    );
+  }
+
+  #[test]
+  fn le_f32_tests() {
+    assert_parse!(le_f32(&[0x00, 0x00, 0x00, 0x00][..]), Ok((&b""[..], 0_f32)));
+    assert_parse!(
+      le_f32(&[0xd8, 0x1f, 0x31, 0x4d][..]),
+      Ok((&b""[..], 185_728_392_f32))
+    );
+  }
+
+  #[test]
+  fn le_f64_tests() {
+    assert_parse!(
+      le_f64(&[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00][..]),
+      Ok((&b""[..], 0_f64))
+    );
+    assert_parse!(
+      le_f64(&[0x00, 0x00, 0x00, 0x10, 0xfb, 0x23, 0xa6, 0x41][..]),
+      Ok((&b""[..], 185_728_392_f64))
+    );
+  }
+
+  #[test]
+  fn hex_u32_tests() {
+    assert_parse!(
+      hex_u32(&b";"[..]),
+      Err(Err::Error(error_position!(&b";"[..], ErrorKind::IsA)))
+    );
+    assert_parse!(hex_u32(&b"ff;"[..]), Ok((&b";"[..], 255)));
+    assert_parse!(hex_u32(&b"1be2;"[..]), Ok((&b";"[..], 7138)));
+    assert_parse!(hex_u32(&b"c5a31be2;"[..]), Ok((&b";"[..], 3_315_801_058)));
+    assert_parse!(hex_u32(&b"C5A31be2;"[..]), Ok((&b";"[..], 3_315_801_058)));
+    assert_parse!(hex_u32(&b"00c5a31be2;"[..]), Ok((&b"e2;"[..], 12_952_347)));
+    assert_parse!(
+      hex_u32(&b"c5a31be201;"[..]),
+      Ok((&b"01;"[..], 3_315_801_058))
+    );
+    assert_parse!(hex_u32(&b"ffffffff;"[..]), Ok((&b";"[..], 4_294_967_295)));
+    assert_parse!(hex_u32(&b"0x1be2;"[..]), Ok((&b"x1be2;"[..], 0)));
+    assert_parse!(hex_u32(&b"12af"[..]), Err(Err::Incomplete(Needed::new(1))));
+  }
+
+  #[test]
+  #[cfg(feature = "std")]
+  fn float_test() {
+    let mut test_cases = vec![
+      "+3.14",
+      "3.14",
+      "-3.14",
+      "0",
+      "0.0",
+      "1.",
+      ".789",
+      "-.5",
+      "1e7",
+      "-1E-7",
+      ".3e-2",
+      "1.e4",
+      "1.2e4",
+      "12.34",
+      "-1.234E-12",
+      "-1.234e-12",
+    ];
+
+    for test in test_cases.drain(..) {
+      let expected32 = str::parse::<f32>(test).unwrap();
+      let expected64 = str::parse::<f64>(test).unwrap();
+
+      println!("now parsing: {} -> {}", test, expected32);
+
+      let larger = format!("{};", test);
+      assert_parse!(recognize_float(&larger[..]), Ok((";", test)));
+
+      assert_parse!(float(larger.as_bytes()), Ok((&b";"[..], expected32)));
+      assert_parse!(float(&larger[..]), Ok((";", expected32)));
+
+      assert_parse!(double(larger.as_bytes()), Ok((&b";"[..], expected64)));
+      assert_parse!(double(&larger[..]), Ok((";", expected64)));
+    }
+
+    let remaining_exponent = "-1.234E-";
+    assert_parse!(
+      recognize_float(remaining_exponent),
+      Err(Err::Incomplete(Needed::new(1)))
+    );
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/regexp/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/regexp/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/regexp/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/regexp/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,409 @@
+/// `re_match!(regexp) => &[T] -> IResult<&[T], &[T]>`
+/// Returns the whole input if a match is found.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "regexp")))]
+macro_rules! re_match (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::Regex::new($re).unwrap();
+      $crate::regexp::str::re_match(r)($i)
+      } )
+);
+
+/// `re_bytes_match!(regexp) => &[T] -> IResult<&[T], &[T]>`
+/// Returns the whole input if a match is found.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "regexp")))]
+macro_rules! re_bytes_match (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::bytes::Regex::new($re).unwrap();
+      $crate::regexp::bytes::re_match(r)($i)
+      } )
+);
+
+/// `re_find!(regexp) => &[T] -> IResult<&[T], &[T]>`
+/// Returns the first match.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "regexp")))]
+macro_rules! re_find (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::Regex::new($re).unwrap();
+      $crate::regexp::str::re_find(r)($i)
+      } )
+);
+
+/// `re_bytes_find!(regexp) => &[T] -> IResult<&[T], &[T]>`
+/// Returns the first match.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "regexp")))]
+macro_rules! re_bytes_find (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::bytes::Regex::new($re).unwrap();
+      $crate::regexp::bytes::re_find(r)($i)
+      } )
+);
+
+/// `re_matches!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>`
+/// Returns all the matched parts.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(
+  feature = "docsrs",
+  doc(cfg(all(feature = "regexp", feature = "alloc")))
+)]
+macro_rules! re_matches (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::Regex::new($re).unwrap();
+      $crate::regexp::str::re_matches(r)($i)
+      } )
+);
+
+/// `re_bytes_matches!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>`
+/// Returns all the matched parts.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(
+  feature = "docsrs",
+  doc(cfg(all(feature = "regexp", feature = "alloc")))
+)]
+macro_rules! re_bytes_matches (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::bytes::Regex::new($re).unwrap();
+      $crate::regexp::bytes::re_matches(r)($i)
+      } )
+);
+
+/// `re_capture!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>`
+/// Returns the capture groups of the first match.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(
+  feature = "docsrs",
+  doc(cfg(all(feature = "regexp", feature = "alloc")))
+)]
+macro_rules! re_capture (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::Regex::new($re).unwrap();
+      $crate::regexp::str::re_capture(r)($i)
+      } )
+);
+
+/// `re_bytes_capture!(regexp) => &[T] -> IResult<&[T], Vec<&[T]>>`
+/// Returns the capture groups of the first match.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(
+  feature = "docsrs",
+  doc(cfg(all(feature = "regexp", feature = "alloc")))
+)]
+macro_rules! re_bytes_capture (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::bytes::Regex::new($re).unwrap();
+      $crate::regexp::bytes::re_capture(r)($i)
+      }
+      )
+);
+
+/// `re_captures!(regexp) => &[T] -> IResult<&[T], Vec<Vec<&[T]>>>`
+/// Returns the capture groups of all matches.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(
+  feature = "docsrs",
+  doc(cfg(all(feature = "regexp", feature = "alloc")))
+)]
+macro_rules! re_captures (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::Regex::new($re).unwrap();
+      $crate::regexp::str::re_captures(r)($i)
+      } )
+);
+
+/// `re_bytes_captures!(regexp) => &[T] -> IResult<&[T], Vec<Vec<&[T]>>>`
+/// Returns the capture groups of all matches.
+///
+/// Requires the `regexp` feature.
+#[macro_export(local_inner_macros)]
+#[cfg_attr(
+  feature = "docsrs",
+  doc(cfg(all(feature = "regexp", feature = "alloc")))
+)]
+macro_rules! re_bytes_captures (
+  ($i:expr, $re:expr) => ( {
+      let r = $crate::lib::regex::bytes::Regex::new($re).unwrap();
+      $crate::regexp::bytes::re_captures(r)($i)
+      } )
+);
+
+#[cfg(test)]
+mod tests {
+  use crate::error::ErrorKind;
+  use crate::internal::Err;
+  #[cfg(feature = "alloc")]
+  use crate::lib::std::vec::Vec;
+
+  #[test]
+  fn re_match() {
+    named!(rm<&str,&str>, re_match!(r"^\d{4}-\d{2}-\d{2}"));
+    assert_eq!(rm("2015-09-07"), Ok(("", "2015-09-07")));
+    assert_eq!(
+      rm("blah"),
+      Err(Err::Error(error_position!(
+        &"blah"[..],
+        ErrorKind::RegexpMatch
+      ),))
+    );
+    assert_eq!(rm("2015-09-07blah"), Ok(("", "2015-09-07blah")));
+  }
+
+  #[test]
+  fn re_find() {
+    named!(rm<&str,&str>, re_find!(r"^\d{4}-\d{2}-\d{2}"));
+    assert_eq!(rm("2015-09-07"), Ok(("", "2015-09-07")));
+    assert_eq!(
+      rm("blah"),
+      Err(Err::Error(error_position!(
+        &"blah"[..],
+        ErrorKind::RegexpFind
+      ),))
+    );
+    assert_eq!(rm("2015-09-07blah"), Ok(("blah", "2015-09-07")));
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn re_matches() {
+    named!(rm< &str,Vec<&str> >, re_matches!(r"\d{4}-\d{2}-\d{2}"));
+    assert_eq!(rm("2015-09-07"), Ok(("", vec!["2015-09-07"])));
+    assert_eq!(
+      rm("blah"),
+      Err(Err::Error(error_position!(
+        &"blah"[..],
+        ErrorKind::RegexpMatches
+      )))
+    );
+    assert_eq!(
+      rm("aaa2015-09-07blah2015-09-09pouet"),
+      Ok(("pouet", vec!["2015-09-07", "2015-09-09"]))
+    );
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn re_capture() {
+    named!(rm< &str,Vec<&str> >, re_capture!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))"));
+    assert_eq!(
+      rm("blah nom 0.3.11pouet"),
+      Ok(("pouet", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]))
+    );
+    assert_eq!(
+      rm("blah"),
+      Err(Err::Error(error_position!(
+        &"blah"[..],
+        ErrorKind::RegexpCapture
+      )))
+    );
+    assert_eq!(
+      rm("hello nom 0.3.11 world regex 0.1.41"),
+      Ok((
+        " world regex 0.1.41",
+        vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]
+      ))
+    );
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn re_captures() {
+    named!(rm< &str,Vec<Vec<&str>> >, re_captures!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))"));
+    assert_eq!(
+      rm("blah nom 0.3.11pouet"),
+      Ok((
+        "pouet",
+        vec![vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]]
+      ))
+    );
+    assert_eq!(
+      rm("blah"),
+      Err(Err::Error(error_position!(
+        &"blah"[..],
+        ErrorKind::RegexpCapture
+      )))
+    );
+    assert_eq!(
+      rm("hello nom 0.3.11 world regex 0.1.41 aaa"),
+      Ok((
+        " aaa",
+        vec![
+          vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"],
+          vec!["regex 0.1.41", "regex", "0.1.41", "0", "1", "41"],
+        ]
+      ))
+    );
+  }
+
+  #[test]
+  fn re_bytes_match() {
+    named!(rm, re_bytes_match!(r"^\d{4}-\d{2}-\d{2}"));
+    assert_eq!(rm(&b"2015-09-07"[..]), Ok((&b""[..], &b"2015-09-07"[..])));
+    assert_eq!(
+      rm(&b"blah"[..]),
+      Err(Err::Error(error_position!(
+        &b"blah"[..],
+        ErrorKind::RegexpMatch
+      )))
+    );
+    assert_eq!(
+      rm(&b"2015-09-07blah"[..]),
+      Ok((&b""[..], &b"2015-09-07blah"[..]))
+    );
+  }
+
+  #[test]
+  fn re_bytes_find() {
+    named!(rm, re_bytes_find!(r"^\d{4}-\d{2}-\d{2}"));
+    assert_eq!(rm(&b"2015-09-07"[..]), Ok((&b""[..], &b"2015-09-07"[..])));
+    assert_eq!(
+      rm(&b"blah"[..]),
+      Err(Err::Error(error_position!(
+        &b"blah"[..],
+        ErrorKind::RegexpFind
+      )))
+    );
+    assert_eq!(
+      rm(&b"2015-09-07blah"[..]),
+      Ok((&b"blah"[..], &b"2015-09-07"[..]))
+    );
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn re_bytes_matches() {
+    named!(rm<Vec<&[u8]>>, re_bytes_matches!(r"\d{4}-\d{2}-\d{2}"));
+    assert_eq!(
+      rm(&b"2015-09-07"[..]),
+      Ok((&b""[..], vec![&b"2015-09-07"[..]]))
+    );
+    assert_eq!(
+      rm(&b"blah"[..]),
+      Err(Err::Error(error_position!(
+        &b"blah"[..],
+        ErrorKind::RegexpMatches
+      )))
+    );
+    assert_eq!(
+      rm(&b"aaa2015-09-07blah2015-09-09pouet"[..]),
+      Ok((&b"pouet"[..], vec![&b"2015-09-07"[..], &b"2015-09-09"[..]]))
+    );
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn re_bytes_capture() {
+    named!(
+      rm<Vec<&[u8]>>,
+      re_bytes_capture!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")
+    );
+    assert_eq!(
+      rm(&b"blah nom 0.3.11pouet"[..]),
+      Ok((
+        &b"pouet"[..],
+        vec![
+          &b"nom 0.3.11"[..],
+          &b"nom"[..],
+          &b"0.3.11"[..],
+          &b"0"[..],
+          &b"3"[..],
+          &b"11"[..],
+        ]
+      ))
+    );
+    assert_eq!(
+      rm(&b"blah"[..]),
+      Err(Err::Error(error_position!(
+        &b"blah"[..],
+        ErrorKind::RegexpCapture
+      )))
+    );
+    assert_eq!(
+      rm(&b"hello nom 0.3.11 world regex 0.1.41"[..]),
+      Ok((
+        &b" world regex 0.1.41"[..],
+        vec![
+          &b"nom 0.3.11"[..],
+          &b"nom"[..],
+          &b"0.3.11"[..],
+          &b"0"[..],
+          &b"3"[..],
+          &b"11"[..],
+        ]
+      ))
+    );
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn re_bytes_captures() {
+    named!(
+      rm<Vec<Vec<&[u8]>>>,
+      re_bytes_captures!(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))")
+    );
+    assert_eq!(
+      rm(&b"blah nom 0.3.11pouet"[..]),
+      Ok((
+        &b"pouet"[..],
+        vec![vec![
+          &b"nom 0.3.11"[..],
+          &b"nom"[..],
+          &b"0.3.11"[..],
+          &b"0"[..],
+          &b"3"[..],
+          &b"11"[..],
+        ],]
+      ))
+    );
+    assert_eq!(
+      rm(&b"blah"[..]),
+      Err(Err::Error(error_position!(
+        &b"blah"[..],
+        ErrorKind::RegexpCapture
+      )))
+    );
+    assert_eq!(
+      rm(&b"hello nom 0.3.11 world regex 0.1.41 aaa"[..]),
+      Ok((
+        &b" aaa"[..],
+        vec![
+          vec![
+            &b"nom 0.3.11"[..],
+            &b"nom"[..],
+            &b"0.3.11"[..],
+            &b"0"[..],
+            &b"3"[..],
+            &b"11"[..],
+          ],
+          vec![
+            &b"regex 0.1.41"[..],
+            &b"regex"[..],
+            &b"0.1.41"[..],
+            &b"0"[..],
+            &b"1"[..],
+            &b"41"[..],
+          ],
+        ]
+      ))
+    );
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/regexp/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/regexp/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/regexp/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/regexp/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,675 @@
+//! Parser combinators that use regular expressions.
+
+mod macros;
+
+///Regular expression parser combinators for strings.
+pub mod str {
+  use crate::error::{ErrorKind, ParseError};
+  use crate::lib::regex::Regex;
+  #[cfg(feature = "alloc")]
+  use crate::lib::std::vec::Vec;
+  use crate::traits::{InputLength, Slice};
+  use crate::{Err, IResult};
+
+  /// Compares the input with a regular expression and returns the
+  /// whole input if a match is found.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::str::re_match;
+  /// # fn main() {
+  /// let re = regex::Regex::new(r"^\d{4}").unwrap();
+  /// let parser = re_match::<(&str, ErrorKind)>(re);
+  /// assert_eq!(parser("2019"), Ok(("", "2019")));
+  /// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::RegexpMatch))));
+  /// assert_eq!(parser("2019-10"), Ok(("", "2019-10")));
+  /// # }
+  /// ```
+  #[cfg(feature = "regexp")]
+  #[cfg_attr(feature = "docsrs", doc(cfg(feature = "regexp")))]
+  pub fn re_match<'a, E>(re: Regex) -> impl Fn(&'a str) -> IResult<&'a str, &'a str, E>
+  where
+    E: ParseError<&'a str>,
+  {
+    move |i| {
+      if re.is_match(i) {
+        Ok((i.slice(i.input_len()..), i))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpMatch)))
+      }
+    }
+  }
+
+  /// Compares the input with a regular expression and returns all matches in a `Vec`.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::str::re_matches;
+  /// # fn main() {
+  /// let re = regex::Regex::new(r"a\d").unwrap();
+  /// let parser = re_matches::<(&str, ErrorKind)>(re);
+  /// assert_eq!(parser("a1ba2"), Ok(("", vec!["a1", "a2"])));
+  /// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::RegexpMatches))));
+  /// # }
+  /// ```
+  #[cfg(all(feature = "regexp", feature = "alloc"))]
+  #[cfg_attr(
+    feature = "docsrs",
+    doc(cfg(all(feature = "regexp", feature = "alloc")))
+  )]
+  pub fn re_matches<'a, E>(re: Regex) -> impl Fn(&'a str) -> IResult<&'a str, Vec<&'a str>, E>
+  where
+    E: ParseError<&'a str>,
+  {
+    move |i| {
+      let v: Vec<_> = re
+        .find_iter(i)
+        .map(|m| i.slice(m.start()..m.end()))
+        .collect();
+      if !v.is_empty() {
+        let offset = {
+          let end = v.last().unwrap();
+          end.as_ptr() as usize + end.len() - i.as_ptr() as usize
+        };
+        Ok((i.slice(offset..), v))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpMatches)))
+      }
+    }
+  }
+
+  /// Compares the input with a regular expression and returns the
+  /// first match.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::str::re_find;
+  /// # fn main() {
+  /// let re = regex::Regex::new(r"\d{4}").unwrap();
+  /// let parser = re_find::<(&str, ErrorKind)>(re);
+  /// assert_eq!(parser("abc2019"), Ok(("", "2019")));
+  /// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::RegexpFind))));
+  /// assert_eq!(parser("2019-10"), Ok(("-10", "2019")));
+  /// # }
+  /// ```
+  #[cfg(feature = "regexp")]
+  #[cfg_attr(feature = "docsrs", doc(cfg(feature = "regexp")))]
+  pub fn re_find<'a, E>(re: Regex) -> impl Fn(&'a str) -> IResult<&'a str, &'a str, E>
+  where
+    E: ParseError<&'a str>,
+  {
+    move |i| {
+      if let Some(m) = re.find(i) {
+        Ok((i.slice(m.end()..), i.slice(m.start()..m.end())))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpFind)))
+      }
+    }
+  }
+
+  /// Compares the input with a regular expression and returns
+  /// the capture groups of the first match in a `Vec`.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::str::re_capture;
+  /// # fn main() {
+  /// let re = regex::Regex::new(r"(a)(\d)").unwrap();
+  /// let parser = re_capture::<(&str, ErrorKind)>(re);
+  /// assert_eq!(parser("a1ba2"), Ok(("ba2", vec!["a1", "a", "1"])));
+  /// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::RegexpCapture))));
+  /// # }
+  /// ```
+  #[cfg(all(feature = "regexp", feature = "alloc"))]
+  #[cfg_attr(
+    feature = "docsrs",
+    doc(cfg(all(feature = "regexp", feature = "alloc")))
+  )]
+  pub fn re_capture<'a, E>(re: Regex) -> impl Fn(&'a str) -> IResult<&'a str, Vec<&'a str>, E>
+  where
+    E: ParseError<&'a str>,
+  {
+    move |i| {
+      if let Some(c) = re.captures(i) {
+        let v: Vec<_> = c
+          .iter()
+          .filter(|el| el.is_some())
+          .map(|el| el.unwrap())
+          .map(|m| i.slice(m.start()..m.end()))
+          .collect();
+        let offset = {
+          let end = v.last().unwrap();
+          end.as_ptr() as usize + end.len() - i.as_ptr() as usize
+        };
+        Ok((i.slice(offset..), v))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpCapture)))
+      }
+    }
+  }
+
+  /// Compares the input with a regular expression and returns
+  /// the capture groups of all matches in a nested `Vec`.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::str::re_captures;
+  /// # fn main() {
+  /// let re = regex::Regex::new(r"(a)(\d)").unwrap();
+  /// let parser = re_captures::<(&str, ErrorKind)>(re);
+  /// assert_eq!(parser("a1ba2"), Ok(("", vec![vec!["a1", "a", "1"], vec!["a2", "a", "2"]])));
+  /// assert_eq!(parser("abc"), Err(Err::Error(("abc", ErrorKind::RegexpCapture))));
+  /// # }
+  /// ```
+  #[cfg(all(feature = "regexp", feature = "alloc"))]
+  #[cfg_attr(
+    feature = "docsrs",
+    doc(cfg(all(feature = "regexp", feature = "alloc")))
+  )]
+  pub fn re_captures<'a, E>(re: Regex) -> impl Fn(&'a str) -> IResult<&'a str, Vec<Vec<&'a str>>, E>
+  where
+    E: ParseError<&'a str>,
+  {
+    move |i| {
+      let v: Vec<Vec<_>> = re
+        .captures_iter(i)
+        .map(|c| {
+          c.iter()
+            .filter(|el| el.is_some())
+            .map(|el| el.unwrap())
+            .map(|m| i.slice(m.start()..m.end()))
+            .collect()
+        })
+        .collect();
+      if !v.is_empty() {
+        let offset = {
+          let end = v.last().unwrap().last().unwrap();
+          end.as_ptr() as usize + end.len() - i.as_ptr() as usize
+        };
+        Ok((i.slice(offset..), v))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpCapture)))
+      }
+    }
+  }
+
+  #[cfg(test)]
+  mod tests {
+    use super::*;
+    use crate::error::ErrorKind;
+    use crate::internal::Err;
+    use crate::lib::regex::Regex;
+
+    macro_rules! assert_parse(
+    ($left: expr, $right: expr) => {
+      let res: $crate::IResult<_, _, (_, ErrorKind)> = $left;
+      assert_eq!(res, $right);
+    };
+  );
+
+    #[test]
+    fn re_match_str() {
+      let re = Regex::new(r"^\d{4}-\d{2}-\d{2}").unwrap();
+      let rm = re_match(re);
+      assert_parse!(rm("2015-09-07"), Ok(("", "2015-09-07")));
+      assert_eq!(
+        rm("blah"),
+        Err(Err::Error((&"blah"[..], ErrorKind::RegexpMatch)))
+      );
+      assert_eq!(rm("2015-09-07blah"), Ok(("", "2015-09-07blah")));
+    }
+
+    #[test]
+    fn re_find_str() {
+      let re = Regex::new(r"^\d{4}-\d{2}-\d{2}").unwrap();
+      let rm = re_find(re);
+      assert_parse!(rm("2015-09-07"), Ok(("", "2015-09-07")));
+      assert_eq!(
+        rm("blah"),
+        Err(Err::Error((&"blah"[..], ErrorKind::RegexpFind)))
+      );
+      assert_eq!(rm("2015-09-07blah"), Ok(("blah", "2015-09-07")));
+    }
+
+    #[cfg(feature = "alloc")]
+    #[test]
+    fn re_matches_str() {
+      let re = Regex::new(r"\d{4}-\d{2}-\d{2}").unwrap();
+      let rm = re_matches(re);
+      assert_parse!(rm("2015-09-07"), Ok(("", vec!["2015-09-07"])));
+      assert_eq!(
+        rm("blah"),
+        Err(Err::Error((&"blah"[..], ErrorKind::RegexpMatches)))
+      );
+      assert_eq!(
+        rm("aaa2015-09-07blah2015-09-09pouet"),
+        Ok(("pouet", vec!["2015-09-07", "2015-09-09"]))
+      );
+    }
+
+    #[cfg(feature = "alloc")]
+    #[test]
+    fn re_capture_str() {
+      let re = Regex::new(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))").unwrap();
+      let rm = re_capture(re);
+      assert_parse!(
+        rm("blah nom 0.3.11pouet"),
+        Ok(("pouet", vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]))
+      );
+      assert_eq!(
+        rm("blah"),
+        Err(Err::Error(("blah", ErrorKind::RegexpCapture)))
+      );
+      assert_eq!(
+        rm("hello nom 0.3.11 world regex 0.1.41"),
+        Ok((
+          " world regex 0.1.41",
+          vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]
+        ))
+      );
+    }
+
+    #[cfg(feature = "alloc")]
+    #[test]
+    fn re_captures_str() {
+      let re = Regex::new(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))").unwrap();
+      let rm = re_captures(re);
+      assert_parse!(
+        rm("blah nom 0.3.11pouet"),
+        Ok((
+          "pouet",
+          vec![vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"]]
+        ))
+      );
+      assert_eq!(
+        rm("blah"),
+        Err(Err::Error((&"blah"[..], ErrorKind::RegexpCapture)))
+      );
+      assert_eq!(
+        rm("hello nom 0.3.11 world regex 0.1.41 aaa"),
+        Ok((
+          " aaa",
+          vec![
+            vec!["nom 0.3.11", "nom", "0.3.11", "0", "3", "11"],
+            vec!["regex 0.1.41", "regex", "0.1.41", "0", "1", "41"],
+          ]
+        ))
+      );
+    }
+  }
+}
+
+///Regular expression parser combinators for bytes.
+pub mod bytes {
+  use crate::error::{ErrorKind, ParseError};
+  use crate::lib::regex::bytes::Regex;
+  #[cfg(feature = "alloc")]
+  use crate::lib::std::vec::Vec;
+  use crate::traits::{InputLength, Slice};
+  use crate::{Err, IResult};
+
+  /// Compares the input with a regular expression and returns the
+  /// whole input if a match is found.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::bytes::re_match;
+  /// # fn main() {
+  /// let re = regex::bytes::Regex::new(r"^\d{4}").unwrap();
+  /// let parser = re_match::<(&[u8], ErrorKind)>(re);
+  /// assert_eq!(parser(&b"2019"[..]), Ok((&b""[..], &b"2019"[..])));
+  /// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::RegexpMatch))));
+  /// assert_eq!(parser(&b"2019-10"[..]), Ok((&b""[..], &b"2019-10"[..])));
+  /// # }
+  /// ```
+  #[cfg(feature = "regexp")]
+  pub fn re_match<'a, E>(re: Regex) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], &'a [u8], E>
+  where
+    E: ParseError<&'a [u8]>,
+  {
+    move |i| {
+      if re.is_match(i) {
+        Ok((i.slice(i.input_len()..), i))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpMatch)))
+      }
+    }
+  }
+
+  /// Compares the input with a regular expression and returns all matches in a `Vec`.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::bytes::re_matches;
+  /// # fn main() {
+  /// let re = regex::bytes::Regex::new(r"a\d").unwrap();
+  /// let parser = re_matches::<(&[u8], ErrorKind)>(re);
+  /// assert_eq!(parser(&b"a1ba2"[..]), Ok((&b""[..], vec![&b"a1"[..], &b"a2"[..]])));
+  /// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::RegexpMatches))));
+  /// # }
+  /// ```
+  #[cfg(all(feature = "regexp", feature = "alloc"))]
+  #[cfg_attr(
+    feature = "docsrs",
+    doc(cfg(all(feature = "regexp", feature = "alloc")))
+  )]
+  pub fn re_matches<'a, E>(re: Regex) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], Vec<&'a [u8]>, E>
+  where
+    E: ParseError<&'a [u8]>,
+  {
+    move |i| {
+      let v: Vec<_> = re
+        .find_iter(i)
+        .map(|m| i.slice(m.start()..m.end()))
+        .collect();
+      if !v.is_empty() {
+        let offset = {
+          let end = v.last().unwrap();
+          end.as_ptr() as usize + end.len() - i.as_ptr() as usize
+        };
+        Ok((i.slice(offset..), v))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpMatches)))
+      }
+    }
+  }
+
+  /// Compares the input with a regular expression and returns the
+  /// first match.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::bytes::re_find;
+  /// # fn main() {
+  /// let re = regex::bytes::Regex::new(r"\d{4}").unwrap();
+  /// let parser = re_find::<(&[u8], ErrorKind)>(re);
+  /// assert_eq!(parser(&b"abc2019"[..]), Ok((&b""[..], &b"2019"[..])));
+  /// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::RegexpFind))));
+  /// assert_eq!(parser(&b"2019-10"[..]), Ok((&b"-10"[..], &b"2019"[..])));
+  /// # }
+  /// ```
+  #[cfg(feature = "regexp")]
+  pub fn re_find<'a, E>(re: Regex) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], &'a [u8], E>
+  where
+    E: ParseError<&'a [u8]>,
+  {
+    move |i| {
+      if let Some(m) = re.find(i) {
+        Ok((i.slice(m.end()..), i.slice(m.start()..m.end())))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpFind)))
+      }
+    }
+  }
+
+  /// Compares the input with a regular expression and returns
+  /// the capture groups of the first match in a `Vec`.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::bytes::re_capture;
+  /// # fn main() {
+  /// let re = regex::bytes::Regex::new(r"(a)(\d)").unwrap();
+  /// let parser = re_capture::<(&[u8], ErrorKind)>(re);
+  /// assert_eq!(parser(&b"a1ba2"[..]), Ok((&b"ba2"[..], vec![&b"a1"[..], &b"a"[..], &b"1"[..]])));
+  /// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::RegexpCapture))));
+  /// # }
+  /// ```
+  #[cfg(all(feature = "regexp", feature = "alloc"))]
+  #[cfg_attr(
+    feature = "docsrs",
+    doc(cfg(all(feature = "regexp", feature = "alloc")))
+  )]
+  pub fn re_capture<'a, E>(re: Regex) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], Vec<&'a [u8]>, E>
+  where
+    E: ParseError<&'a [u8]>,
+  {
+    move |i| {
+      if let Some(c) = re.captures(i) {
+        let v: Vec<_> = c
+          .iter()
+          .filter(|el| el.is_some())
+          .map(|el| el.unwrap())
+          .map(|m| i.slice(m.start()..m.end()))
+          .collect();
+        let offset = {
+          let end = v.last().unwrap();
+          end.as_ptr() as usize + end.len() - i.as_ptr() as usize
+        };
+        Ok((i.slice(offset..), v))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpCapture)))
+      }
+    }
+  }
+
+  /// Compares the input with a regular expression and returns
+  /// the capture groups of all matches in a nested `Vec`.
+  ///
+  /// Requires the `regexp` feature.
+  /// # Example
+  ///
+  /// ```
+  /// # use nom::{Err, error::ErrorKind};
+  /// # use nom::regexp::bytes::re_captures;
+  /// # fn main() {
+  /// let re = regex::bytes::Regex::new(r"(a)(\d)").unwrap();
+  /// let parser = re_captures::<(&[u8], ErrorKind)>(re);
+  /// assert_eq!(parser(&b"a1ba2"[..]), Ok((&b""[..], vec![vec![&b"a1"[..], &b"a"[..], &b"1"[..]], vec![&b"a2"[..], &b"a"[..], &b"2"[..]]])));
+  /// assert_eq!(parser(&b"abc"[..]), Err(Err::Error((&b"abc"[..], ErrorKind::RegexpCapture))));
+  /// # }
+  /// ```
+  #[cfg(all(feature = "regexp", feature = "alloc"))]
+  #[cfg_attr(
+    feature = "docsrs",
+    doc(cfg(all(feature = "regexp", feature = "alloc")))
+  )]
+  pub fn re_captures<'a, E>(
+    re: Regex,
+  ) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], Vec<Vec<&'a [u8]>>, E>
+  where
+    E: ParseError<&'a [u8]>,
+  {
+    move |i| {
+      let v: Vec<Vec<_>> = re
+        .captures_iter(i)
+        .map(|c| {
+          c.iter()
+            .filter(|el| el.is_some())
+            .map(|el| el.unwrap())
+            .map(|m| i.slice(m.start()..m.end()))
+            .collect()
+        })
+        .collect();
+      if !v.is_empty() {
+        let offset = {
+          let end = v.last().unwrap().last().unwrap();
+          end.as_ptr() as usize + end.len() - i.as_ptr() as usize
+        };
+        Ok((i.slice(offset..), v))
+      } else {
+        Err(Err::Error(E::from_error_kind(i, ErrorKind::RegexpCapture)))
+      }
+    }
+  }
+
+  #[cfg(test)]
+  mod tests {
+    use super::*;
+    use crate::error::ErrorKind;
+    use crate::internal::Err;
+    use crate::lib::regex::bytes::Regex;
+
+    macro_rules! assert_parse(
+    ($left: expr, $right: expr) => {
+      let res: $crate::IResult<_, _, (_, ErrorKind)> = $left;
+      assert_eq!(res, $right);
+    };
+  );
+
+    #[test]
+    fn re_match_bytes() {
+      let re = Regex::new(r"^\d{4}-\d{2}-\d{2}").unwrap();
+      let rm = re_match(re);
+      assert_parse!(rm(&b"2015-09-07"[..]), Ok((&b""[..], &b"2015-09-07"[..])));
+      assert_eq!(
+        rm(&b"blah"[..]),
+        Err(Err::Error((&b"blah"[..], ErrorKind::RegexpMatch)))
+      );
+      assert_eq!(
+        rm(&b"2015-09-07blah"[..]),
+        Ok((&b""[..], &b"2015-09-07blah"[..]))
+      );
+    }
+
+    #[test]
+    fn re_find_bytes() {
+      let re = Regex::new(r"^\d{4}-\d{2}-\d{2}").unwrap();
+      let rm = re_find(re);
+      assert_parse!(rm(&b"2015-09-07"[..]), Ok((&b""[..], &b"2015-09-07"[..])));
+      assert_eq!(
+        rm(&b"blah"[..]),
+        Err(Err::Error((&b"blah"[..], ErrorKind::RegexpFind)))
+      );
+      assert_eq!(
+        rm(&b"2015-09-07blah"[..]),
+        Ok((&b"blah"[..], &b"2015-09-07"[..]))
+      );
+    }
+
+    #[cfg(feature = "alloc")]
+    #[test]
+    fn re_matches_bytes() {
+      let re = Regex::new(r"\d{4}-\d{2}-\d{2}").unwrap();
+      let rm = re_matches(re);
+      assert_parse!(
+        rm(&b"2015-09-07"[..]),
+        Ok((&b""[..], vec![&b"2015-09-07"[..]]))
+      );
+      assert_eq!(
+        rm(&b"blah"[..]),
+        Err(Err::Error((&b"blah"[..], ErrorKind::RegexpMatches)))
+      );
+      assert_eq!(
+        rm(&b"aaa2015-09-07blah2015-09-09pouet"[..]),
+        Ok((&b"pouet"[..], vec![&b"2015-09-07"[..], &b"2015-09-09"[..]]))
+      );
+    }
+
+    #[cfg(feature = "alloc")]
+    #[test]
+    fn re_capture_bytes() {
+      let re = Regex::new(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))").unwrap();
+      let rm = re_capture(re);
+      assert_parse!(
+        rm(&b"blah nom 0.3.11pouet"[..]),
+        Ok((
+          &b"pouet"[..],
+          vec![
+            &b"nom 0.3.11"[..],
+            &b"nom"[..],
+            &b"0.3.11"[..],
+            &b"0"[..],
+            &b"3"[..],
+            &b"11"[..]
+          ]
+        ))
+      );
+      assert_eq!(
+        rm(&b"blah"[..]),
+        Err(Err::Error((&b"blah"[..], ErrorKind::RegexpCapture)))
+      );
+      assert_eq!(
+        rm(&b"hello nom 0.3.11 world regex 0.1.41"[..]),
+        Ok((
+          &b" world regex 0.1.41"[..],
+          vec![
+            &b"nom 0.3.11"[..],
+            &b"nom"[..],
+            &b"0.3.11"[..],
+            &b"0"[..],
+            &b"3"[..],
+            &b"11"[..]
+          ]
+        ))
+      );
+    }
+
+    #[cfg(feature = "alloc")]
+    #[test]
+    fn re_captures_bytes() {
+      let re = Regex::new(r"([[:alpha:]]+)\s+((\d+).(\d+).(\d+))").unwrap();
+      let rm = re_captures(re);
+      assert_parse!(
+        rm(&b"blah nom 0.3.11pouet"[..]),
+        Ok((
+          &b"pouet"[..],
+          vec![vec![
+            &b"nom 0.3.11"[..],
+            &b"nom"[..],
+            &b"0.3.11"[..],
+            &b"0"[..],
+            &b"3"[..],
+            &b"11"[..]
+          ]]
+        ))
+      );
+
+      assert_eq!(
+        rm(&b"blah"[..]),
+        Err(Err::Error((&b"blah"[..], ErrorKind::RegexpCapture)))
+      );
+      assert_eq!(
+        rm(&b"hello nom 0.3.11 world regex 0.1.41 aaa"[..]),
+        Ok((
+          &b" aaa"[..],
+          vec![
+            vec![
+              &b"nom 0.3.11"[..],
+              &b"nom"[..],
+              &b"0.3.11"[..],
+              &b"0"[..],
+              &b"3"[..],
+              &b"11"[..]
+            ],
+            vec![
+              &b"regex 0.1.41"[..],
+              &b"regex"[..],
+              &b"0.1.41"[..],
+              &b"0"[..],
+              &b"1"[..],
+              &b"41"[..]
+            ],
+          ]
+        ))
+      );
+    }
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/sequence/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/sequence/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/sequence/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/sequence/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,920 @@
+/// `tuple!(I->IResult<I,A>, I->IResult<I,B>, ... I->IResult<I,X>) => I -> IResult<I, (A, B, ..., X)>`
+/// chains parsers and assemble the sub results in a tuple.
+///
+/// The input type `I` must implement `nom::InputLength`.
+///
+/// This combinator will count how much data is consumed by every child parser
+/// and take it into account if there is not enough data.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::error::ErrorKind;
+/// # use nom::number::streaming::be_u16;
+/// // the return type depends of the children parsers
+/// named!(parser<&[u8], (u16, &[u8], &[u8]) >,
+///   tuple!(
+///     be_u16 ,
+///     take!(3),
+///     tag!("fg")
+///   )
+/// );
+///
+/// # fn main() {
+/// assert_eq!(
+///   parser(&b"abcdefgh"[..]),
+///   Ok((
+///     &b"h"[..],
+///     (0x6162u16, &b"cde"[..], &b"fg"[..])
+///   ))
+/// );
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! tuple (
+  ($i:expr, $($rest:tt)*) => (
+    {
+      tuple_parser!($i, (), $($rest)*)
+    }
+  );
+);
+
+/// Internal parser, do not use directly.
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! tuple_parser (
+  ($i:expr, ($($parsed:tt),*), $e:path, $($rest:tt)*) => (
+    tuple_parser!($i, ($($parsed),*), call!($e), $($rest)*);
+  );
+  ($i:expr, (), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => (
+    {
+      let i_ = $i.clone();
+
+      ( $submac!(i_, $($args)*) ).and_then(|(i,o)| {
+        let i_ = i.clone();
+        tuple_parser!(i_, (o), $($rest)*)
+      })
+    }
+  );
+  ($i:expr, ($($parsed:tt)*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => (
+    {
+      let i_ = $i.clone();
+
+      ( $submac!(i_, $($args)*) ).and_then(|(i,o)| {
+        let i_ = i.clone();
+        tuple_parser!(i_, ($($parsed)* , o), $($rest)*)
+      })
+    }
+  );
+  ($i:expr, ($($parsed:tt),*), $e:path) => (
+    tuple_parser!($i, ($($parsed),*), call!($e));
+  );
+  ($i:expr, (), $submac:ident!( $($args:tt)* )) => (
+    {
+      let i_ = $i.clone();
+      ( $submac!(i_, $($args)*) ).map(|(i,o)| (i, (o)))
+    }
+  );
+  ($i:expr, ($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => (
+    {
+      let i_ = $i.clone();
+      ( $submac!(i_, $($args)*) ).map(|(i,o)| (i, ($($parsed),* , o)))
+    }
+  );
+  ($i:expr, ($($parsed:expr),*)) => (
+    {
+      $crate::lib::std::result::Result::Ok(($i, ($($parsed),*)))
+    }
+  );
+);
+
+/// `pair!(I -> IResult<I,O>, I -> IResult<I,P>) => I -> IResult<I, (O,P)>`
+/// `pair` returns a tuple of the results of its two child parsers of both succeed.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::{Error, ErrorKind};
+/// # use nom::character::complete::{alpha1, digit1};
+/// named!(parser<&str, (&str, &str)>, pair!(alpha1, digit1));
+///
+/// # fn main() {
+/// assert_eq!(parser("abc123"), Ok(("", ("abc", "123"))));
+/// assert_eq!(parser("123abc"), Err(Err::Error(Error::new("123abc", ErrorKind::Alpha))));
+/// assert_eq!(parser("abc;123"), Err(Err::Error(Error::new(";123", ErrorKind::Digit))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! pair(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    pair!($i, |i| $submac!(i, $($args)*), |i| $submac2!(i, $($args2)*))
+  );
+
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    pair!($i, |i| $submac!(i, $($args)*), $g);
+  );
+
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    pair!($i, $f, |i| $submac!(i, $($args)*));
+  );
+
+  ($i:expr, $f:expr, $g:expr) => (
+    $crate::sequence::pairc($i, $f, $g)
+  );
+);
+
+/// `separated_pair!(I -> IResult<I,O>, I -> IResult<I, T>, I -> IResult<I,P>) => I -> IResult<I, (O,P)>`
+/// `separated_pair(X,sep,Y)` returns a tuple of its first and third child parsers
+/// if all 3 succeed.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::{Error, ErrorKind};
+/// # use nom::character::complete::{alpha1, digit1};
+/// named!(parser<&str, (&str, &str)>, separated_pair!(alpha1, char!(','), digit1));
+///
+/// # fn main() {
+/// assert_eq!(parser("abc,123"), Ok(("", ("abc", "123"))));
+/// assert_eq!(parser("123,abc"), Err(Err::Error(Error::new("123,abc", ErrorKind::Alpha))));
+/// assert_eq!(parser("abc;123"), Err(Err::Error(Error::new(";123", ErrorKind::Char))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! separated_pair(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => (
+    separated_pair!($i, |i| $submac!(i, $($args)*), $($rest)*)
+  );
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => (
+    separated_pair!($i, $f, |i| $submac!(i, $($args)*), $($rest)*)
+  );
+  ($i:expr, $f:expr, $g:expr, $submac:ident!( $($args:tt)* )) => (
+    separated_pair!($i, $f, $g, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $f:expr, $g:expr, $h:expr) => (
+    $crate::sequence::separated_pairc($i, $f, $g, $h)
+  );
+);
+
+/// `preceded!(I -> IResult<I,T>, I -> IResult<I,O>) => I -> IResult<I, O>`
+/// `preceded` returns the result of its second parser if both succeed.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::{Error, ErrorKind};
+/// # use nom::character::complete::{alpha1};
+/// named!(parser<&str, &str>, preceded!(char!('-'), alpha1));
+///
+/// # fn main() {
+/// assert_eq!(parser("-abc"), Ok(("", "abc")));
+/// assert_eq!(parser("abc"), Err(Err::Error(Error::new("abc", ErrorKind::Char))));
+/// assert_eq!(parser("-123"), Err(Err::Error(Error::new("123", ErrorKind::Alpha))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! preceded(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    preceded!($i, |i| $submac!(i, $($args)*), |i| $submac2!(i, $($args2)*))
+  );
+
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    preceded!($i, |i| $submac!(i, $($args)*), $g);
+  );
+
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    preceded!($i, $f, |i| $submac!(i, $($args)*));
+  );
+
+  ($i:expr, $f:expr, $g:expr) => (
+    $crate::sequence::precededc($i, $f, $g)
+  );
+);
+
+/// `terminated!(I -> IResult<I,O>, I -> IResult<I,T>) => I -> IResult<I, O>`
+/// `terminated` returns the result of its first parser if both succeed.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::Err;
+/// # use nom::error::{Error, ErrorKind};
+/// # use nom::character::complete::{alpha1};
+/// named!(parser<&str, &str>, terminated!(alpha1, char!(';')));
+///
+/// # fn main() {
+/// assert_eq!(parser("abc;"), Ok(("", "abc")));
+/// assert_eq!(parser("abc,"), Err(Err::Error(Error::new(",", ErrorKind::Char))));
+/// assert_eq!(parser("123;"), Err(Err::Error(Error::new("123;", ErrorKind::Alpha))));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! terminated(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => (
+    terminated!($i, |i| $submac!(i, $($args)*), |i| $submac2!(i, $($args2)*))
+  );
+
+  ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => (
+    terminated!($i, |i| $submac!(i, $($args)*), $g);
+  );
+
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
+    terminated!($i, $f, |i| $submac!(i, $($args)*));
+  );
+
+  ($i:expr, $f:expr, $g:expr) => (
+    $crate::sequence::terminatedc($i, $f, $g)
+  );
+);
+
+/// `delimited!(I -> IResult<I,T>, I -> IResult<I,O>, I -> IResult<I,U>) => I -> IResult<I, O>`
+/// `delimited(opening, X, closing)` returns X.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::character::complete::{alpha1};
+/// named!(parens,
+///     delimited!(
+///         tag!("("),
+///         alpha1,
+///         tag!(")")
+///     )
+/// );
+///
+/// # fn main() {
+/// let input = &b"(test)"[..];
+/// assert_eq!(parens(input), Ok((&b""[..], &b"test"[..])));
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! delimited(
+  ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => (
+    delimited!($i, |i| $submac!(i, $($args)*), $($rest)*)
+  );
+  ($i:expr, $f:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)*) => (
+    delimited!($i, $f, |i| $submac!(i, $($args)*), $($rest)*)
+  );
+  ($i:expr, $f:expr, $g:expr, $submac:ident!( $($args:tt)* )) => (
+    delimited!($i, $f, $g, |i| $submac!(i, $($args)*))
+  );
+  ($i:expr, $f:expr, $g:expr, $h:expr) => (
+    $crate::sequence::delimitedc($i, $f, $g, $h)
+  );
+);
+
+/// `do_parse!(I->IResult<I,A> >> I->IResult<I,B> >> ... I->IResult<I,X> , ( O ) ) => I -> IResult<I, O>`
+/// `do_parse` applies sub parsers in a sequence.
+/// It can store intermediary results and make them available
+/// for later parsers.
+///
+/// The input type `I` must implement `nom::InputLength`.
+///
+/// This combinator will count how much data is consumed by every child parser
+/// and take it into account if there is not enough data.
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # use nom::{Err,Needed};
+/// use nom::number::streaming::be_u8;
+///
+/// // this parser implements a common pattern in binary formats,
+/// // the TAG-LENGTH-VALUE, where you first recognize a specific
+/// // byte slice, then the next bytes indicate the length of
+/// // the data, then you take that slice and return it
+/// //
+/// // here, we match the tag 42, take the length in the next byte
+/// // and store it in `length`, then use `take!` with `length`
+/// // to obtain the subslice that we store in `bytes`, then return
+/// // `bytes`
+/// // you can use other macro combinators inside do_parse (like the `tag`
+/// // one here), or a function (like `be_u8` here), but you cannot use a
+/// // module path (like `nom::be_u8`) there, because of limitations in macros
+/// named!(tag_length_value,
+///   do_parse!(
+///     tag!( &[ 42u8 ][..] ) >>
+///     length: be_u8         >>
+///     bytes:  take!(length) >>
+///     (bytes)
+///   )
+/// );
+///
+/// # fn main() {
+/// let a: Vec<u8>        = vec!(42, 2, 3, 4, 5);
+/// let result_a: Vec<u8> = vec!(3, 4);
+/// let rest_a: Vec<u8>   = vec!(5);
+/// assert_eq!(tag_length_value(&a[..]), Ok((&rest_a[..], &result_a[..])));
+///
+/// // here, the length is 5, but there are only 3 bytes afterwards (3, 4 and 5),
+/// // so the parser will tell you that you need 7 bytes: one for the tag,
+/// // one for the length, then 5 bytes
+/// let b: Vec<u8>     = vec!(42, 5, 3, 4, 5);
+/// assert_eq!(tag_length_value(&b[..]), Err(Err::Incomplete(Needed::new(2))));
+/// # }
+/// ```
+///
+/// the result is a tuple, so you can return multiple sub results, like
+/// this:
+/// `do_parse!(I->IResult<I,A> >> I->IResult<I,B> >> ... I->IResult<I,X> , ( O, P ) ) => I -> IResult<I, (O,P)>`
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// use nom::number::streaming::be_u8;
+/// named!(tag_length_value<(u8, &[u8])>,
+///   do_parse!(
+///     tag!( &[ 42u8 ][..] ) >>
+///     length: be_u8         >>
+///     bytes:  take!(length) >>
+///     (length, bytes)
+///   )
+/// );
+///
+/// # fn main() {
+/// # }
+/// ```
+///
+#[macro_export(local_inner_macros)]
+macro_rules! do_parse (
+  (__impl $i:expr, ( $($rest:expr),* )) => (
+    $crate::lib::std::result::Result::Ok(($i, ( $($rest),* )))
+  );
+
+  (__impl $i:expr, $field:ident : $submac:ident!( $($args:tt)* ) ) => (
+    do_parse!(__impl $i, $submac!( $($args)* ))
+  );
+
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ) ) => (
+    nom_compile_error!("do_parse is missing the return value. A do_parse call must end
+      with a return value between parenthesis, as follows:
+
+      do_parse!(
+        a: tag!(\"abcd\") >>
+        b: tag!(\"efgh\") >>
+
+        ( Value { a: a, b: b } )
+    ");
+  );
+
+  (__impl $i:expr, $field:ident : $submac:ident!( $($args:tt)* ) ~ $($rest:tt)* ) => (
+    nom_compile_error!("do_parse uses >> as separator, not ~");
+  );
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ) ~ $($rest:tt)* ) => (
+    nom_compile_error!("do_parse uses >> as separator, not ~");
+  );
+  (__impl $i:expr, $field:ident : $e:ident ~ $($rest:tt)*) => (
+    do_parse!(__impl $i, $field: call!($e) ~ $($rest)*);
+  );
+  (__impl $i:expr, $e:ident ~ $($rest:tt)*) => (
+    do_parse!(__impl $i, call!($e) ~ $($rest)*);
+  );
+
+  (__impl $i:expr, $e:ident >> $($rest:tt)*) => (
+    do_parse!(__impl $i, call!($e) >> $($rest)*);
+  );
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => (
+    {
+      use $crate::lib::std::result::Result::*;
+
+      let i_ = $i.clone();
+      match $submac!(i_, $($args)*) {
+        Err(e) => Err(e),
+        Ok((i,_))     => {
+          let i_ = i.clone();
+          do_parse!(__impl i_, $($rest)*)
+        },
+      }
+    }
+  );
+
+  (__impl $i:expr, $field:ident : $e:ident >> $($rest:tt)*) => (
+    do_parse!(__impl $i, $field: call!($e) >> $($rest)*);
+  );
+
+  (__impl $i:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => (
+    {
+      use $crate::lib::std::result::Result::*;
+
+      let i_ = $i.clone();
+      match  $submac!(i_, $($args)*) {
+        Err(e) => Err(e),
+        Ok((i,o))     => {
+          let $field = o;
+          let i_ = i.clone();
+          do_parse!(__impl i_, $($rest)*)
+        },
+      }
+    }
+  );
+
+  // ending the chain
+  (__impl $i:expr, $e:ident >> ( $($rest:tt)* )) => (
+    do_parse!(__impl $i, call!($e) >> ( $($rest)* ));
+  );
+
+  (__impl $i:expr, $submac:ident!( $($args:tt)* ) >> ( $($rest:tt)* )) => ({
+    use $crate::lib::std::result::Result::*;
+
+    match $submac!($i, $($args)*) {
+      Err(e) => Err(e),
+      Ok((i,_))     => {
+        do_parse!(__finalize i, $($rest)*)
+      },
+    }
+  });
+
+  (__impl $i:expr, $field:ident : $e:ident >> ( $($rest:tt)* )) => (
+    do_parse!(__impl $i, $field: call!($e) >> ( $($rest)* ) );
+  );
+
+  (__impl $i:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> ( $($rest:tt)* )) => ({
+    use $crate::lib::std::result::Result::*;
+
+    match $submac!($i, $($args)*) {
+      Err(e) => Err(e),
+      Ok((i,o))     => {
+        let $field = o;
+        do_parse!(__finalize i, $($rest)*)
+      },
+    }
+  });
+
+  (__finalize $i:expr, ( $o: expr )) => ({
+    use $crate::lib::std::result::Result::Ok;
+    Ok(($i, $o))
+  });
+
+  (__finalize $i:expr, ( $($rest:tt)* )) => ({
+    use $crate::lib::std::result::Result::Ok;
+    Ok(($i, ( $($rest)* )))
+  });
+
+  ($i:expr, $($rest:tt)*) => (
+    {
+      do_parse!(__impl $i, $($rest)*)
+    }
+  );
+  ($submac:ident!( $($args:tt)* ) >> $($rest:tt)* ) => (
+    nom_compile_error!("if you are using do_parse outside of a named! macro, you must
+        pass the input data as first argument, like this:
+
+        let res = do_parse!(input,
+          a: tag!(\"abcd\") >>
+          b: tag!(\"efgh\") >>
+          ( Value { a: a, b: b } )
+        );");
+  );
+  ($e:ident! >> $($rest:tt)* ) => (
+    do_parse!( call!($e) >> $($rest)*);
+  );
+);
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! nom_compile_error (
+  (( $($args:tt)* )) => ( compile_error!($($args)*) );
+);
+
+#[cfg(test)]
+mod tests {
+  use crate::error::ErrorKind;
+  use crate::internal::{Err, IResult, Needed};
+  use crate::number::streaming::be_u16;
+
+  // reproduce the tag and take macros, because of module import order
+  macro_rules! tag (
+    ($i:expr, $inp: expr) => (
+      {
+        #[inline(always)]
+        fn as_bytes<T: $crate::AsBytes>(b: &T) -> &[u8] {
+          b.as_bytes()
+        }
+
+        let expected = $inp;
+        let bytes    = as_bytes(&expected);
+
+        tag_bytes!($i,bytes)
+      }
+    );
+  );
+
+  macro_rules! tag_bytes (
+    ($i:expr, $bytes: expr) => (
+      {
+        use $crate::lib::std::cmp::min;
+
+        let len = $i.len();
+        let blen = $bytes.len();
+        let m   = min(len, blen);
+        let reduced = &$i[..m];
+        let b       = &$bytes[..m];
+
+        let res: IResult<_,_,_> = if reduced != b {
+          Err($crate::Err::Error(error_position!($i, $crate::error::ErrorKind::Tag)))
+        } else if m < blen {
+          Err($crate::Err::Incomplete(Needed::new(blen)))
+        } else {
+          Ok((&$i[blen..], reduced))
+        };
+        res
+      }
+    );
+  );
+
+  macro_rules! take (
+    ($i:expr, $count:expr) => (
+      {
+        let cnt = $count as usize;
+        let res:IResult<&[u8],&[u8],_> = if $i.len() < cnt {
+          Err($crate::Err::Incomplete(Needed::new(cnt)))
+        } else {
+          Ok((&$i[cnt..],&$i[0..cnt]))
+        };
+        res
+      }
+    );
+  );
+
+  #[derive(PartialEq, Eq, Debug)]
+  struct B {
+    a: u8,
+    b: u8,
+  }
+
+  #[derive(PartialEq, Eq, Debug)]
+  struct C {
+    a: u8,
+    b: Option<u8>,
+  }
+
+  /*FIXME: convert code examples to new error management
+  use util::{add_error_pattern, error_to_list, print_error};
+
+  #[cfg(feature = "std")]
+  #[rustfmt::skip]
+  fn error_to_string<P: Clone + PartialEq>(e: &Context<P, u32>) -> &'static str {
+    let v: Vec<(P, ErrorKind<u32>)> = error_to_list(e);
+    // do it this way if you can use slice patterns
+    //match &v[..] {
+    //  [ErrorKind::Custom(42), ErrorKind::Tag]                         => "missing `ijkl` tag",
+    //  [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag] => "missing `mnop` tag after `ijkl`",
+    //  _            => "unrecognized error"
+    //}
+
+    let collected: Vec<ErrorKind<u32>> = v.iter().map(|&(_, ref e)| e.clone()).collect();
+    if &collected[..] == [ErrorKind::Custom(42), ErrorKind::Tag] {
+      "missing `ijkl` tag"
+    } else if &collected[..] == [ErrorKind::Custom(42), ErrorKind::Custom(128), ErrorKind::Tag] {
+      "missing `mnop` tag after `ijkl`"
+    } else {
+      "unrecognized error"
+    }
+  }
+
+  // do it this way if you can use box patterns
+  //use $crate::lib::std::str;
+  //fn error_to_string(e:Err) -> String
+  //  match e {
+  //    NodePosition(ErrorKind::Custom(42), i1, box Position(ErrorKind::Tag, i2)) => {
+  //      format!("missing `ijkl` tag, found '{}' instead", str::from_utf8(i2).unwrap())
+  //    },
+  //    NodePosition(ErrorKind::Custom(42), i1, box NodePosition(ErrorKind::Custom(128), i2,  box Position(ErrorKind::Tag, i3))) => {
+  //      format!("missing `mnop` tag after `ijkl`, found '{}' instead", str::from_utf8(i3).unwrap())
+  //    },
+  //    _ => "unrecognized error".to_string()
+  //  }
+  //}
+  */
+
+  #[rustfmt::skip]
+  #[allow(unused_variables)]
+  #[test]
+  fn add_err() {
+    named!(err_test,
+      preceded!(
+        tag!("efgh"),
+        add_return_error!(
+          //ErrorKind::Custom(42u32),
+          ErrorKind::Char,
+          do_parse!(
+                 tag!("ijkl")                                     >>
+            //res: add_return_error!(ErrorKind::Custom(128u32), tag!("mnop")) >>
+            res: add_return_error!(ErrorKind::Eof, tag!("mnop")) >>
+            (res)
+          )
+        )
+      )
+    );
+    let a = &b"efghblah"[..];
+    let b = &b"efghijklblah"[..];
+    let c = &b"efghijklmnop"[..];
+
+    let blah = &b"blah"[..];
+
+    let res_a = err_test(a);
+    let res_b = err_test(b);
+    let res_c = err_test(c);
+    assert_eq!(res_a,
+               Err(Err::Error(error_node_position!(blah,
+                                                   //ErrorKind::Custom(42u32),
+                                                   ErrorKind::Eof,
+                                                   error_position!(blah, ErrorKind::Tag)))));
+    //assert_eq!(res_b, Err(Err::Error(error_node_position!(&b"ijklblah"[..], ErrorKind::Custom(42u32),
+    //  error_node_position!(blah, ErrorKind::Custom(128u32), error_position!(blah, ErrorKind::Tag))))));
+    assert_eq!(res_b, Err(Err::Error(error_node_position!(&b"ijklblah"[..], ErrorKind::Eof,
+      error_node_position!(blah, ErrorKind::Eof, error_position!(blah, ErrorKind::Tag))))));
+    assert_eq!(res_c, Ok((&b""[..], &b"mnop"[..])));
+  }
+
+  #[rustfmt::skip]
+  #[test]
+  fn complete() {
+    named!(err_test,
+      do_parse!(
+             tag!("ijkl")            >>
+        res: complete!(tag!("mnop")) >>
+        (res)
+      )
+    );
+    let a = &b"ijklmn"[..];
+
+    let res_a = err_test(a);
+    assert_eq!(res_a,
+               Err(Err::Error(error_position!(&b"mn"[..], ErrorKind::Complete))));
+  }
+
+  #[test]
+  fn pair() {
+    named!(tag_abc, tag!("abc"));
+    named!(tag_def, tag!("def"));
+    named!( pair_abc_def<&[u8],(&[u8], &[u8])>, pair!(tag_abc, tag_def) );
+
+    assert_eq!(
+      pair_abc_def(&b"abcdefghijkl"[..]),
+      Ok((&b"ghijkl"[..], (&b"abc"[..], &b"def"[..])))
+    );
+    assert_eq!(
+      pair_abc_def(&b"ab"[..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_eq!(
+      pair_abc_def(&b"abcd"[..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_eq!(
+      pair_abc_def(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      pair_abc_def(&b"xxxdef"[..]),
+      Err(Err::Error(error_position!(&b"xxxdef"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      pair_abc_def(&b"abcxxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn separated_pair() {
+    named!(tag_abc, tag!("abc"));
+    named!(tag_def, tag!("def"));
+    named!(tag_separator, tag!(","));
+    named!( sep_pair_abc_def<&[u8],(&[u8], &[u8])>, separated_pair!(tag_abc, tag_separator, tag_def) );
+
+    assert_eq!(
+      sep_pair_abc_def(&b"abc,defghijkl"[..]),
+      Ok((&b"ghijkl"[..], (&b"abc"[..], &b"def"[..])))
+    );
+    assert_eq!(
+      sep_pair_abc_def(&b"ab"[..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_eq!(
+      sep_pair_abc_def(&b"abc,d"[..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_eq!(
+      sep_pair_abc_def(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      sep_pair_abc_def(&b"xxx,def"[..]),
+      Err(Err::Error(error_position!(&b"xxx,def"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      sep_pair_abc_def(&b"abc,xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn preceded() {
+    named!(tag_abcd, tag!("abcd"));
+    named!(tag_efgh, tag!("efgh"));
+    named!( preceded_abcd_efgh<&[u8], &[u8]>, preceded!(tag_abcd, tag_efgh) );
+
+    assert_eq!(
+      preceded_abcd_efgh(&b"abcdefghijkl"[..]),
+      Ok((&b"ijkl"[..], &b"efgh"[..]))
+    );
+    assert_eq!(
+      preceded_abcd_efgh(&b"ab"[..]),
+      Err(Err::Incomplete(Needed::new(4)))
+    );
+    assert_eq!(
+      preceded_abcd_efgh(&b"abcde"[..]),
+      Err(Err::Incomplete(Needed::new(4)))
+    );
+    assert_eq!(
+      preceded_abcd_efgh(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      preceded_abcd_efgh(&b"xxxxdef"[..]),
+      Err(Err::Error(error_position!(&b"xxxxdef"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      preceded_abcd_efgh(&b"abcdxxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn terminated() {
+    named!(tag_abcd, tag!("abcd"));
+    named!(tag_efgh, tag!("efgh"));
+    named!( terminated_abcd_efgh<&[u8], &[u8]>, terminated!(tag_abcd, tag_efgh) );
+
+    assert_eq!(
+      terminated_abcd_efgh(&b"abcdefghijkl"[..]),
+      Ok((&b"ijkl"[..], &b"abcd"[..]))
+    );
+    assert_eq!(
+      terminated_abcd_efgh(&b"ab"[..]),
+      Err(Err::Incomplete(Needed::new(4)))
+    );
+    assert_eq!(
+      terminated_abcd_efgh(&b"abcde"[..]),
+      Err(Err::Incomplete(Needed::new(4)))
+    );
+    assert_eq!(
+      terminated_abcd_efgh(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      terminated_abcd_efgh(&b"xxxxdef"[..]),
+      Err(Err::Error(error_position!(&b"xxxxdef"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      terminated_abcd_efgh(&b"abcdxxxx"[..]),
+      Err(Err::Error(error_position!(&b"xxxx"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn delimited() {
+    named!(tag_abc, tag!("abc"));
+    named!(tag_def, tag!("def"));
+    named!(tag_ghi, tag!("ghi"));
+    named!( delimited_abc_def_ghi<&[u8], &[u8]>, delimited!(tag_abc, tag_def, tag_ghi) );
+
+    assert_eq!(
+      delimited_abc_def_ghi(&b"abcdefghijkl"[..]),
+      Ok((&b"jkl"[..], &b"def"[..]))
+    );
+    assert_eq!(
+      delimited_abc_def_ghi(&b"ab"[..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_eq!(
+      delimited_abc_def_ghi(&b"abcde"[..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_eq!(
+      delimited_abc_def_ghi(&b"abcdefgh"[..]),
+      Err(Err::Incomplete(Needed::new(3)))
+    );
+    assert_eq!(
+      delimited_abc_def_ghi(&b"xxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      delimited_abc_def_ghi(&b"xxxdefghi"[..]),
+      Err(Err::Error(error_position!(
+        &b"xxxdefghi"[..],
+        ErrorKind::Tag
+      ),))
+    );
+    assert_eq!(
+      delimited_abc_def_ghi(&b"abcxxxghi"[..]),
+      Err(Err::Error(error_position!(&b"xxxghi"[..], ErrorKind::Tag)))
+    );
+    assert_eq!(
+      delimited_abc_def_ghi(&b"abcdefxxx"[..]),
+      Err(Err::Error(error_position!(&b"xxx"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn tuple_test() {
+    named!(tuple_3<&[u8], (u16, &[u8], &[u8]) >,
+    tuple!( be_u16 , take!(3), tag!("fg") ) );
+
+    assert_eq!(
+      tuple_3(&b"abcdefgh"[..]),
+      Ok((&b"h"[..], (0x6162u16, &b"cde"[..], &b"fg"[..])))
+    );
+    assert_eq!(tuple_3(&b"abcd"[..]), Err(Err::Incomplete(Needed::new(3))));
+    assert_eq!(tuple_3(&b"abcde"[..]), Err(Err::Incomplete(Needed::new(2))));
+    assert_eq!(
+      tuple_3(&b"abcdejk"[..]),
+      Err(Err::Error(error_position!(&b"jk"[..], ErrorKind::Tag)))
+    );
+  }
+
+  #[test]
+  fn do_parse() {
+    fn ret_int1(i: &[u8]) -> IResult<&[u8], u8> {
+      Ok((i, 1))
+    }
+    fn ret_int2(i: &[u8]) -> IResult<&[u8], u8> {
+      Ok((i, 2))
+    }
+
+    //trace_macros!(true);
+    named!(do_parser<&[u8], (u8, u8)>,
+      do_parse!(
+        tag!("abcd")       >>
+        opt!(tag!("abcd")) >>
+        aa: ret_int1       >>
+        tag!("efgh")       >>
+        bb: ret_int2       >>
+        tag!("efgh")       >>
+        (aa, bb)
+      )
+    );
+    //named!(do_parser<&[u8], (u8, u8)>,
+    //  do_parse!(
+    //    tag!("abcd") >> aa: ret_int1 >> tag!("efgh") >> bb: ret_int2 >> tag!("efgh") >> (aa, bb)
+    //  )
+    //);
+
+    //trace_macros!(false);
+
+    assert_eq!(
+      do_parser(&b"abcdabcdefghefghX"[..]),
+      Ok((&b"X"[..], (1, 2)))
+    );
+    assert_eq!(do_parser(&b"abcdefghefghX"[..]), Ok((&b"X"[..], (1, 2))));
+    assert_eq!(
+      do_parser(&b"abcdab"[..]),
+      Err(Err::Incomplete(Needed::new(4)))
+    );
+    assert_eq!(
+      do_parser(&b"abcdefghef"[..]),
+      Err(Err::Incomplete(Needed::new(4)))
+    );
+  }
+
+  #[rustfmt::skip]
+  #[test]
+  fn do_parse_dependency() {
+    use crate::number::streaming::be_u8;
+
+    named!(length_value,
+      do_parse!(
+        length: be_u8         >>
+        bytes:  take!(length) >>
+        (bytes)
+      )
+    );
+
+    let a = [2u8, 3, 4, 5];
+    let res_a = [3u8, 4];
+    assert_eq!(length_value(&a[..]), Ok((&a[3..], &res_a[..])));
+    let b = [5u8, 3, 4, 5];
+    assert_eq!(length_value(&b[..]), Err(Err::Incomplete(Needed::new(5))));
+  }
+
+  /*
+  named!(does_not_compile,
+    do_parse!(
+      length: be_u8         >>
+      bytes:  take!(length)
+    )
+  );
+  named!(does_not_compile_either,
+    do_parse!(
+      length: be_u8         ~
+      bytes:  take!(length) ~
+      ( () )
+    )
+  );
+  fn still_does_not_compile() {
+    let data = b"abcd";
+
+    let res = do_parse!(
+      tag!("abcd") >>
+      tag!("efgh") >>
+      ( () )
+    );
+  }
+  */
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/sequence/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/sequence/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/sequence/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/sequence/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,357 @@
+//! Combinators applying parsers in sequence
+
+#[macro_use]
+mod macros;
+
+use crate::error::ParseError;
+use crate::internal::{IResult, Parser};
+
+/// Gets an object from the first parser,
+/// then gets another object from the second parser.
+///
+/// # Arguments
+/// * `first` The first parser to apply.
+/// * `second` The second parser to apply.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::sequence::pair;
+/// use nom::bytes::complete::tag;
+///
+/// let mut parser = pair(tag("abc"), tag("efg"));
+///
+/// assert_eq!(parser("abcefg"), Ok(("", ("abc", "efg"))));
+/// assert_eq!(parser("abcefghij"), Ok(("hij", ("abc", "efg"))));
+/// assert_eq!(parser(""), Err(Err::Error(("", ErrorKind::Tag))));
+/// assert_eq!(parser("123"), Err(Err::Error(("123", ErrorKind::Tag))));
+/// ```
+pub fn pair<I, O1, O2, E: ParseError<I>, F, G>(
+  mut first: F,
+  mut second: G,
+) -> impl FnMut(I) -> IResult<I, (O1, O2), E>
+where
+  F: Parser<I, O1, E>,
+  G: Parser<I, O2, E>,
+{
+  move |input: I| {
+    let (input, o1) = first.parse(input)?;
+    second.parse(input).map(|(i, o2)| (i, (o1, o2)))
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+pub fn pairc<I, O1, O2, E: ParseError<I>, F, G>(
+  input: I,
+  first: F,
+  second: G,
+) -> IResult<I, (O1, O2), E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(I) -> IResult<I, O2, E>,
+{
+  pair(first, second)(input)
+}
+
+/// Matches an object from the first parser and discards it,
+/// then gets an object from the second parser.
+///
+/// # Arguments
+/// * `first` The opening parser.
+/// * `second` The second parser to get object.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::sequence::preceded;
+/// use nom::bytes::complete::tag;
+///
+/// let mut parser = preceded(tag("abc"), tag("efg"));
+///
+/// assert_eq!(parser("abcefg"), Ok(("", "efg")));
+/// assert_eq!(parser("abcefghij"), Ok(("hij", "efg")));
+/// assert_eq!(parser(""), Err(Err::Error(("", ErrorKind::Tag))));
+/// assert_eq!(parser("123"), Err(Err::Error(("123", ErrorKind::Tag))));
+/// ```
+pub fn preceded<I, O1, O2, E: ParseError<I>, F, G>(
+  mut first: F,
+  mut second: G,
+) -> impl FnMut(I) -> IResult<I, O2, E>
+where
+  F: Parser<I, O1, E>,
+  G: Parser<I, O2, E>,
+{
+  move |input: I| {
+    let (input, _) = first.parse(input)?;
+    second.parse(input)
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+pub fn precededc<I, O1, O2, E: ParseError<I>, F, G>(
+  input: I,
+  first: F,
+  second: G,
+) -> IResult<I, O2, E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(I) -> IResult<I, O2, E>,
+{
+  preceded(first, second)(input)
+}
+
+/// Gets an object from the first parser,
+/// then matches an object from the second parser and discards it.
+///
+/// # Arguments
+/// * `first` The first parser to apply.
+/// * `second` The second parser to match an object.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::sequence::terminated;
+/// use nom::bytes::complete::tag;
+///
+/// let mut parser = terminated(tag("abc"), tag("efg"));
+///
+/// assert_eq!(parser("abcefg"), Ok(("", "abc")));
+/// assert_eq!(parser("abcefghij"), Ok(("hij", "abc")));
+/// assert_eq!(parser(""), Err(Err::Error(("", ErrorKind::Tag))));
+/// assert_eq!(parser("123"), Err(Err::Error(("123", ErrorKind::Tag))));
+/// ```
+pub fn terminated<I, O1, O2, E: ParseError<I>, F, G>(
+  mut first: F,
+  mut second: G,
+) -> impl FnMut(I) -> IResult<I, O1, E>
+where
+  F: Parser<I, O1, E>,
+  G: Parser<I, O2, E>,
+{
+  move |input: I| {
+    let (input, o1) = first.parse(input)?;
+    second.parse(input).map(|(i, _)| (i, o1))
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+pub fn terminatedc<I, O1, O2, E: ParseError<I>, F, G>(
+  input: I,
+  first: F,
+  second: G,
+) -> IResult<I, O1, E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(I) -> IResult<I, O2, E>,
+{
+  terminated(first, second)(input)
+}
+
+/// Gets an object from the first parser,
+/// then matches an object from the sep_parser and discards it,
+/// then gets another object from the second parser.
+///
+/// # Arguments
+/// * `first` The first parser to apply.
+/// * `sep` The separator parser to apply.
+/// * `second` The second parser to apply.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::sequence::separated_pair;
+/// use nom::bytes::complete::tag;
+///
+/// let mut parser = separated_pair(tag("abc"), tag("|"), tag("efg"));
+///
+/// assert_eq!(parser("abc|efg"), Ok(("", ("abc", "efg"))));
+/// assert_eq!(parser("abc|efghij"), Ok(("hij", ("abc", "efg"))));
+/// assert_eq!(parser(""), Err(Err::Error(("", ErrorKind::Tag))));
+/// assert_eq!(parser("123"), Err(Err::Error(("123", ErrorKind::Tag))));
+/// ```
+pub fn separated_pair<I, O1, O2, O3, E: ParseError<I>, F, G, H>(
+  mut first: F,
+  mut sep: G,
+  mut second: H,
+) -> impl FnMut(I) -> IResult<I, (O1, O3), E>
+where
+  F: Parser<I, O1, E>,
+  G: Parser<I, O2, E>,
+  H: Parser<I, O3, E>,
+{
+  move |input: I| {
+    let (input, o1) = first.parse(input)?;
+    let (input, _) = sep.parse(input)?;
+    second.parse(input).map(|(i, o2)| (i, (o1, o2)))
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+pub fn separated_pairc<I, O1, O2, O3, E: ParseError<I>, F, G, H>(
+  input: I,
+  first: F,
+  sep: G,
+  second: H,
+) -> IResult<I, (O1, O3), E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(I) -> IResult<I, O2, E>,
+  H: Fn(I) -> IResult<I, O3, E>,
+{
+  separated_pair(first, sep, second)(input)
+}
+
+/// Matches an object from the first parser and discards it,
+/// then gets an object from the second parser,
+/// and finally matches an object from the third parser and discards it.
+///
+/// # Arguments
+/// * `first` The first parser to apply and discard.
+/// * `second` The second parser to apply.
+/// * `third` The third parser to apply and discard.
+/// ```rust
+/// # use nom::{Err, error::ErrorKind, Needed};
+/// # use nom::Needed::Size;
+/// use nom::sequence::delimited;
+/// use nom::bytes::complete::tag;
+///
+/// let mut parser = delimited(tag("("), tag("abc"), tag(")"));
+///
+/// assert_eq!(parser("(abc)"), Ok(("", "abc")));
+/// assert_eq!(parser("(abc)def"), Ok(("def", "abc")));
+/// assert_eq!(parser(""), Err(Err::Error(("", ErrorKind::Tag))));
+/// assert_eq!(parser("123"), Err(Err::Error(("123", ErrorKind::Tag))));
+/// ```
+pub fn delimited<I, O1, O2, O3, E: ParseError<I>, F, G, H>(
+  mut first: F,
+  mut second: G,
+  mut third: H,
+) -> impl FnMut(I) -> IResult<I, O2, E>
+where
+  F: Parser<I, O1, E>,
+  G: Parser<I, O2, E>,
+  H: Parser<I, O3, E>,
+{
+  move |input: I| {
+    let (input, _) = first.parse(input)?;
+    let (input, o2) = second.parse(input)?;
+    third.parse(input).map(|(i, _)| (i, o2))
+  }
+}
+
+// this implementation is used for type inference issues in macros
+#[doc(hidden)]
+pub fn delimitedc<I, O1, O2, O3, E: ParseError<I>, F, G, H>(
+  input: I,
+  first: F,
+  second: G,
+  third: H,
+) -> IResult<I, O2, E>
+where
+  F: Fn(I) -> IResult<I, O1, E>,
+  G: Fn(I) -> IResult<I, O2, E>,
+  H: Fn(I) -> IResult<I, O3, E>,
+{
+  delimited(first, second, third)(input)
+}
+
+/// Helper trait for the tuple combinator.
+///
+/// This trait is implemented for tuples of parsers of up to 21 elements.
+pub trait Tuple<I, O, E> {
+  /// Parses the input and returns a tuple of results of each parser.
+  fn parse(&mut self, input: I) -> IResult<I, O, E>;
+}
+
+impl<Input, Output, Error: ParseError<Input>, F: Parser<Input, Output, Error>>
+  Tuple<Input, (Output,), Error> for (F,)
+{
+  fn parse(&mut self, input: Input) -> IResult<Input, (Output,), Error> {
+    self.0.parse(input).map(|(i, o)| (i, (o,)))
+  }
+}
+
+macro_rules! tuple_trait(
+  ($name1:ident $ty1:ident, $name2: ident $ty2:ident, $($name:ident $ty:ident),*) => (
+    tuple_trait!(__impl $name1 $ty1, $name2 $ty2; $($name $ty),*);
+  );
+  (__impl $($name:ident $ty: ident),+; $name1:ident $ty1:ident, $($name2:ident $ty2:ident),*) => (
+    tuple_trait_impl!($($name $ty),+);
+    tuple_trait!(__impl $($name $ty),+ , $name1 $ty1; $($name2 $ty2),*);
+  );
+  (__impl $($name:ident $ty: ident),+; $name1:ident $ty1:ident) => (
+    tuple_trait_impl!($($name $ty),+);
+    tuple_trait_impl!($($name $ty),+, $name1 $ty1);
+  );
+);
+
+macro_rules! tuple_trait_impl(
+  ($($name:ident $ty: ident),+) => (
+    impl<
+      Input: Clone, $($ty),+ , Error: ParseError<Input>,
+      $($name: Parser<Input, $ty, Error>),+
+    > Tuple<Input, ( $($ty),+ ), Error> for ( $($name),+ ) {
+
+      fn parse(&mut self, input: Input) -> IResult<Input, ( $($ty),+ ), Error> {
+        tuple_trait_inner!(0, self, input, (), $($name)+)
+
+      }
+    }
+  );
+);
+
+macro_rules! tuple_trait_inner(
+  ($it:tt, $self:expr, $input:expr, (), $head:ident $($id:ident)+) => ({
+    let (i, o) = $self.$it.parse($input.clone())?;
+
+    succ!($it, tuple_trait_inner!($self, i, ( o ), $($id)+))
+  });
+  ($it:tt, $self:expr, $input:expr, ($($parsed:tt)*), $head:ident $($id:ident)+) => ({
+    let (i, o) = $self.$it.parse($input.clone())?;
+
+    succ!($it, tuple_trait_inner!($self, i, ($($parsed)* , o), $($id)+))
+  });
+  ($it:tt, $self:expr, $input:expr, ($($parsed:tt)*), $head:ident) => ({
+    let (i, o) = $self.$it.parse($input.clone())?;
+
+    Ok((i, ($($parsed)* , o)))
+  });
+);
+
+tuple_trait!(FnA A, FnB B, FnC C, FnD D, FnE E, FnF F, FnG G, FnH H, FnI I, FnJ J, FnK K, FnL L,
+  FnM M, FnN N, FnO O, FnP P, FnQ Q, FnR R, FnS S, FnT T, FnU U);
+
+///Applies a tuple of parsers one by one and returns their results as a tuple.
+///
+/// ```rust
+/// # use nom::{Err, error::ErrorKind};
+/// use nom::sequence::tuple;
+/// use nom::character::complete::{alpha1, digit1};
+/// let mut parser = tuple((alpha1, digit1, alpha1));
+///
+/// assert_eq!(parser("abc123def"), Ok(("", ("abc", "123", "def"))));
+/// assert_eq!(parser("123def"), Err(Err::Error(("123def", ErrorKind::Alpha))));
+/// ```
+pub fn tuple<I, O, E: ParseError<I>, List: Tuple<I, O, E>>(
+  mut l: List,
+) -> impl FnMut(I) -> IResult<I, O, E> {
+  move |i: I| l.parse(i)
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  fn single_element_tuples() {
+    use crate::character::complete::alpha1;
+    use crate::{error::ErrorKind, Err};
+
+    let mut parser = tuple((alpha1,));
+    assert_eq!(parser("abc123def"), Ok(("123def", ("abc",))));
+    assert_eq!(
+      parser("123def"),
+      Err(Err::Error(("123def", ErrorKind::Alpha)))
+    );
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/str.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,507 @@
+#[cfg(test)]
+mod test {
+  use crate::{error, error::ErrorKind, Err, IResult};
+
+  #[test]
+  fn tagtr_succeed() {
+    const INPUT: &str = "Hello World!";
+    const TAG: &str = "Hello";
+    fn test(input: &str) -> IResult<&str, &str> {
+      tag!(input, TAG)
+    }
+
+    match test(INPUT) {
+      Ok((extra, output)) => {
+        assert!(extra == " World!", "Parser `tag` consumed leftover input.");
+        assert!(
+          output == TAG,
+          "Parser `tag` doesn't return the tag it matched on success. \
+           Expected `{}`, got `{}`.",
+          TAG,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `tag` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn tagtr_incomplete() {
+    const INPUT: &str = "Hello";
+    const TAG: &str = "Hello World!";
+
+    let res: IResult<_, _, error::Error<_>> = tag!(INPUT, TAG);
+    match res {
+      Err(Err::Incomplete(_)) => (),
+      other => {
+        panic!(
+          "Parser `tag` didn't require more input when it should have. \
+           Got `{:?}`.",
+          other
+        );
+      }
+    };
+  }
+
+  #[test]
+  fn tagtr_error() {
+    const INPUT: &str = "Hello World!";
+    const TAG: &str = "Random"; // TAG must be closer than INPUT.
+
+    let res: IResult<_, _, error::Error<_>> = tag!(INPUT, TAG);
+    match res {
+      Err(Err::Error(_)) => (),
+      other => {
+        panic!(
+          "Parser `tag` didn't fail when it should have. Got `{:?}`.`",
+          other
+        );
+      }
+    };
+  }
+
+  #[test]
+  fn take_s_succeed() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const CONSUMED: &str = "βèƒôřèÂßÇ";
+    const LEFTOVER: &str = "áƒƭèř";
+
+    let res: IResult<_, _, error::Error<_>> = take!(INPUT, 9);
+    match res {
+      Ok((extra, output)) => {
+        assert!(
+          extra == LEFTOVER,
+          "Parser `take_s` consumed leftover input. Leftover `{}`.",
+          extra
+        );
+        assert!(
+          output == CONSUMED,
+          "Parser `take_s` doens't return the string it consumed on success. Expected `{}`, got `{}`.",
+          CONSUMED,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `take_s` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn take_until_succeed() {
+    const INPUT: &str = "βèƒôřèÂßÇ∂áƒƭèř";
+    const FIND: &str = "ÂßÇ∂";
+    const CONSUMED: &str = "βèƒôřè";
+    const LEFTOVER: &str = "ÂßÇ∂áƒƭèř";
+
+    let res: IResult<_, _, (_, ErrorKind)> = take_until!(INPUT, FIND);
+    match res {
+      Ok((extra, output)) => {
+        assert!(
+          extra == LEFTOVER,
+          "Parser `take_until`\
+           consumed leftover input. Leftover `{}`.",
+          extra
+        );
+        assert!(
+          output == CONSUMED,
+          "Parser `take_until`\
+           doens't return the string it consumed on success. Expected `{}`, got `{}`.",
+          CONSUMED,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `take_until` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn take_s_incomplete() {
+    const INPUT: &str = "βèƒôřèÂßÇá";
+
+    let res: IResult<_, _, (_, ErrorKind)> = take!(INPUT, 13);
+    match res {
+      Err(Err::Incomplete(_)) => (),
+      other => panic!(
+        "Parser `take` didn't require more input when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    }
+  }
+
+  use crate::internal::Needed;
+
+  fn is_alphabetic(c: char) -> bool {
+    (c as u8 >= 0x41 && c as u8 <= 0x5A) || (c as u8 >= 0x61 && c as u8 <= 0x7A)
+  }
+
+  #[test]
+  fn take_while() {
+    named!(f<&str,&str>, take_while!(is_alphabetic));
+    let a = "";
+    let b = "abcd";
+    let c = "abcd123";
+    let d = "123";
+
+    assert_eq!(f(&a[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&b[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&c[..]), Ok((&d[..], &b[..])));
+    assert_eq!(f(&d[..]), Ok((&d[..], &a[..])));
+  }
+
+  #[test]
+  fn take_while1() {
+    named!(f<&str,&str>, take_while1!(is_alphabetic));
+    let a = "";
+    let b = "abcd";
+    let c = "abcd123";
+    let d = "123";
+
+    assert_eq!(f(&a[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&b[..]), Err(Err::Incomplete(Needed::new(1))));
+    assert_eq!(f(&c[..]), Ok((&"123"[..], &b[..])));
+    assert_eq!(
+      f(&d[..]),
+      Err(Err::Error(error_position!(&d[..], ErrorKind::TakeWhile1)))
+    );
+  }
+
+  #[test]
+  fn take_till_s_succeed() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const CONSUMED: &str = "βèƒôřèÂßÇ";
+    const LEFTOVER: &str = "áƒƭèř";
+    fn till_s(c: char) -> bool {
+      c == 'á'
+    }
+    fn test(input: &str) -> IResult<&str, &str> {
+      take_till!(input, till_s)
+    }
+    match test(INPUT) {
+      Ok((extra, output)) => {
+        assert!(
+          extra == LEFTOVER,
+          "Parser `take_till` consumed leftover input."
+        );
+        assert!(
+          output == CONSUMED,
+          "Parser `take_till` doesn't return the string it consumed on success. \
+           Expected `{}`, got `{}`.",
+          CONSUMED,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `take_till` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn take_while_succeed_none() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const CONSUMED: &str = "";
+    const LEFTOVER: &str = "βèƒôřèÂßÇáƒƭèř";
+    fn while_s(c: char) -> bool {
+      c == '9'
+    }
+    fn test(input: &str) -> IResult<&str, &str> {
+      take_while!(input, while_s)
+    }
+    match test(INPUT) {
+      Ok((extra, output)) => {
+        assert!(
+          extra == LEFTOVER,
+          "Parser `take_while` consumed leftover input."
+        );
+        assert!(
+          output == CONSUMED,
+          "Parser `take_while` doesn't return the string it consumed on success. \
+           Expected `{}`, got `{}`.",
+          CONSUMED,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `take_while` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn is_not_succeed() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const AVOID: &str = "£úçƙ¥á";
+    const CONSUMED: &str = "βèƒôřèÂßÇ";
+    const LEFTOVER: &str = "áƒƭèř";
+    fn test(input: &str) -> IResult<&str, &str> {
+      is_not!(input, AVOID)
+    }
+    match test(INPUT) {
+      Ok((extra, output)) => {
+        assert!(
+          extra == LEFTOVER,
+          "Parser `is_not` consumed leftover input. Leftover `{}`.",
+          extra
+        );
+        assert!(
+          output == CONSUMED,
+          "Parser `is_not` doens't return the string it consumed on success. Expected `{}`, got `{}`.",
+          CONSUMED,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `is_not` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn take_while_succeed_some() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const CONSUMED: &str = "βèƒôřèÂßÇ";
+    const LEFTOVER: &str = "áƒƭèř";
+    fn while_s(c: char) -> bool {
+      c == 'β'
+        || c == 'è'
+        || c == 'Æ’'
+        || c == 'ô'
+        || c == 'Å™'
+        || c == 'è'
+        || c == 'Â'
+        || c == 'ß'
+        || c == 'Ç'
+    }
+    fn test(input: &str) -> IResult<&str, &str> {
+      take_while!(input, while_s)
+    }
+    match test(INPUT) {
+      Ok((extra, output)) => {
+        assert!(
+          extra == LEFTOVER,
+          "Parser `take_while` consumed leftover input."
+        );
+        assert!(
+          output == CONSUMED,
+          "Parser `take_while` doesn't return the string it consumed on success. \
+           Expected `{}`, got `{}`.",
+          CONSUMED,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `take_while` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn is_not_fail() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const AVOID: &str = "βúçƙ¥";
+    fn test(input: &str) -> IResult<&str, &str> {
+      is_not!(input, AVOID)
+    }
+    match test(INPUT) {
+      Err(Err::Error(_)) => (),
+      other => panic!(
+        "Parser `is_not` didn't fail when it should have. Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn take_while1_succeed() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const CONSUMED: &str = "βèƒôřèÂßÇ";
+    const LEFTOVER: &str = "áƒƭèř";
+    fn while1_s(c: char) -> bool {
+      c == 'β'
+        || c == 'è'
+        || c == 'Æ’'
+        || c == 'ô'
+        || c == 'Å™'
+        || c == 'è'
+        || c == 'Â'
+        || c == 'ß'
+        || c == 'Ç'
+    }
+    fn test(input: &str) -> IResult<&str, &str> {
+      take_while1!(input, while1_s)
+    }
+    match test(INPUT) {
+      Ok((extra, output)) => {
+        assert!(
+          extra == LEFTOVER,
+          "Parser `take_while1` consumed leftover input."
+        );
+        assert!(
+          output == CONSUMED,
+          "Parser `take_while1` doesn't return the string it consumed on success. \
+           Expected `{}`, got `{}`.",
+          CONSUMED,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `take_while1` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn take_until_incomplete() {
+    const INPUT: &str = "βèƒôřè";
+    const FIND: &str = "βèƒôřèÂßÇ";
+
+    let res: IResult<_, _, (_, ErrorKind)> = take_until!(INPUT, FIND);
+    match res {
+      Err(Err::Incomplete(_)) => (),
+      other => panic!(
+        "Parser `take_until` didn't require more input when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn is_a_succeed() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const MATCH: &str = "βèƒôřèÂßÇ";
+    const CONSUMED: &str = "βèƒôřèÂßÇ";
+    const LEFTOVER: &str = "áƒƭèř";
+    fn test(input: &str) -> IResult<&str, &str> {
+      is_a!(input, MATCH)
+    }
+    match test(INPUT) {
+      Ok((extra, output)) => {
+        assert!(
+          extra == LEFTOVER,
+          "Parser `is_a` consumed leftover input. Leftover `{}`.",
+          extra
+        );
+        assert!(
+          output == CONSUMED,
+          "Parser `is_a` doens't return the string it consumed on success. Expected `{}`, got `{}`.",
+          CONSUMED,
+          output
+        );
+      }
+      other => panic!(
+        "Parser `is_a` didn't succeed when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn take_while1_fail() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    fn while1_s(c: char) -> bool {
+      c == '9'
+    }
+    fn test(input: &str) -> IResult<&str, &str> {
+      take_while1!(input, while1_s)
+    }
+    match test(INPUT) {
+      Err(Err::Error(_)) => (),
+      other => panic!(
+        "Parser `take_while1` didn't fail when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn is_a_fail() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const MATCH: &str = "Ûñℓúçƙ¥";
+    fn test(input: &str) -> IResult<&str, &str> {
+      is_a!(input, MATCH)
+    }
+    match test(INPUT) {
+      Err(Err::Error(_)) => (),
+      other => panic!(
+        "Parser `is_a` didn't fail when it should have. Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  fn take_until_error() {
+    const INPUT: &str = "βèƒôřèÂßÇáƒƭèř";
+    const FIND: &str = "Ráñδô₥";
+
+    let res: IResult<_, _, (_, ErrorKind)> = take_until!(INPUT, FIND);
+    match res {
+      Err(Err::Incomplete(_)) => (),
+      other => panic!(
+        "Parser `take_until` didn't fail when it should have. \
+         Got `{:?}`.",
+        other
+      ),
+    };
+  }
+
+  #[test]
+  #[cfg(feature = "alloc")]
+  fn recognize_is_a() {
+    let a = "aabbab";
+    let b = "ababcd";
+
+    named!(f <&str,&str>, recognize!(many1!(complete!(alt!( tag!("a") | tag!("b") )))));
+
+    assert_eq!(f(&a[..]), Ok((&a[6..], &a[..])));
+    assert_eq!(f(&b[..]), Ok((&b[4..], &b[..4])));
+  }
+
+  #[test]
+  fn utf8_indexing() {
+    named!(dot(&str) -> &str,
+      tag!(".")
+    );
+
+    let _ = dot("點");
+  }
+
+  #[cfg(feature = "alloc")]
+  #[test]
+  fn case_insensitive() {
+    named!(test<&str,&str>, tag_no_case!("ABcd"));
+    assert_eq!(test("aBCdefgh"), Ok(("efgh", "aBCd")));
+    assert_eq!(test("abcdefgh"), Ok(("efgh", "abcd")));
+    assert_eq!(test("ABCDefgh"), Ok(("efgh", "ABCD")));
+
+    named!(test2<&str,&str>, tag_no_case!("ABcd"));
+    assert_eq!(test2("aBCdefgh"), Ok(("efgh", "aBCd")));
+    assert_eq!(test2("abcdefgh"), Ok(("efgh", "abcd")));
+    assert_eq!(test2("ABCDefgh"), Ok(("efgh", "ABCD")));
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1658 @@
+//! Traits input types have to implement to work with nom combinators
+use crate::error::{ErrorKind, ParseError};
+use crate::internal::{Err, IResult, Needed};
+use crate::lib::std::iter::{Copied, Enumerate};
+use crate::lib::std::ops::{Range, RangeFrom, RangeFull, RangeTo};
+use crate::lib::std::slice::Iter;
+use crate::lib::std::str::from_utf8;
+use crate::lib::std::str::CharIndices;
+use crate::lib::std::str::Chars;
+use crate::lib::std::str::FromStr;
+
+#[cfg(feature = "alloc")]
+use crate::lib::std::string::String;
+#[cfg(feature = "alloc")]
+use crate::lib::std::vec::Vec;
+
+#[cfg(feature = "bitvec")]
+use bitvec::prelude::*;
+
+/// Abstract method to calculate the input length
+pub trait InputLength {
+  /// Calculates the input length, as indicated by its name,
+  /// and the name of the trait itself
+  fn input_len(&self) -> usize;
+}
+
+impl<'a, T> InputLength for &'a [T] {
+  #[inline]
+  fn input_len(&self) -> usize {
+    self.len()
+  }
+}
+
+impl<'a> InputLength for &'a str {
+  #[inline]
+  fn input_len(&self) -> usize {
+    self.len()
+  }
+}
+
+impl<'a> InputLength for (&'a [u8], usize) {
+  #[inline]
+  fn input_len(&self) -> usize {
+    //println!("bit input length for ({:?}, {}):", self.0, self.1);
+    //println!("-> {}", self.0.len() * 8 - self.1);
+    self.0.len() * 8 - self.1
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, O, T> InputLength for &'a BitSlice<O, T>
+where
+  O: BitOrder,
+  T: 'a + BitStore,
+{
+  #[inline]
+  fn input_len(&self) -> usize {
+    self.len()
+  }
+}
+
+/// Useful functions to calculate the offset between slices and show a hexdump of a slice
+pub trait Offset {
+  /// Offset between the first byte of self and the first byte of the argument
+  fn offset(&self, second: &Self) -> usize;
+}
+
+impl Offset for [u8] {
+  fn offset(&self, second: &Self) -> usize {
+    let fst = self.as_ptr();
+    let snd = second.as_ptr();
+
+    snd as usize - fst as usize
+  }
+}
+
+impl<'a> Offset for &'a [u8] {
+  fn offset(&self, second: &Self) -> usize {
+    let fst = self.as_ptr();
+    let snd = second.as_ptr();
+
+    snd as usize - fst as usize
+  }
+}
+
+impl Offset for str {
+  fn offset(&self, second: &Self) -> usize {
+    let fst = self.as_ptr();
+    let snd = second.as_ptr();
+
+    snd as usize - fst as usize
+  }
+}
+
+impl<'a> Offset for &'a str {
+  fn offset(&self, second: &Self) -> usize {
+    let fst = self.as_ptr();
+    let snd = second.as_ptr();
+
+    snd as usize - fst as usize
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<O, T> Offset for BitSlice<O, T>
+where
+  O: BitOrder,
+  T: BitStore,
+{
+  #[inline(always)]
+  fn offset(&self, second: &Self) -> usize {
+    second.offset_from(self) as usize
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, O, T> Offset for &'a BitSlice<O, T>
+where
+  O: BitOrder,
+  T: 'a + BitStore,
+{
+  #[inline(always)]
+  fn offset(&self, second: &Self) -> usize {
+    second.offset_from(self) as usize
+  }
+}
+
+/// Helper trait for types that can be viewed as a byte slice
+pub trait AsBytes {
+  /// Casts the input type to a byte slice
+  fn as_bytes(&self) -> &[u8];
+}
+
+impl<'a> AsBytes for &'a str {
+  #[inline(always)]
+  fn as_bytes(&self) -> &[u8] {
+    (*self).as_bytes()
+  }
+}
+
+impl AsBytes for str {
+  #[inline(always)]
+  fn as_bytes(&self) -> &[u8] {
+    self.as_ref()
+  }
+}
+
+impl<'a> AsBytes for &'a [u8] {
+  #[inline(always)]
+  fn as_bytes(&self) -> &[u8] {
+    *self
+  }
+}
+
+impl AsBytes for [u8] {
+  #[inline(always)]
+  fn as_bytes(&self) -> &[u8] {
+    self
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, O> AsBytes for &'a BitSlice<O, u8>
+where
+  O: BitOrder,
+{
+  #[inline(always)]
+  fn as_bytes(&self) -> &[u8] {
+    self.as_slice()
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<O> AsBytes for BitSlice<O, u8>
+where
+  O: BitOrder,
+{
+  #[inline(always)]
+  fn as_bytes(&self) -> &[u8] {
+    self.as_slice()
+  }
+}
+
+macro_rules! as_bytes_array_impls {
+  ($($N:expr)+) => {
+    $(
+      impl<'a> AsBytes for &'a [u8; $N] {
+        #[inline(always)]
+        fn as_bytes(&self) -> &[u8] {
+          *self
+        }
+      }
+
+      impl AsBytes for [u8; $N] {
+        #[inline(always)]
+        fn as_bytes(&self) -> &[u8] {
+          self
+        }
+      }
+
+      #[cfg(feature = "bitvec")]
+      impl<'a, O> AsBytes for &'a BitArray<O, [u8; $N]>
+      where O: BitOrder {
+        #[inline(always)]
+        fn as_bytes(&self) -> &[u8] {
+          self.as_slice()
+        }
+      }
+
+      #[cfg(feature = "bitvec")]
+      impl<O> AsBytes for BitArray<O, [u8; $N]>
+      where O: BitOrder {
+        #[inline(always)]
+        fn as_bytes(&self) -> &[u8] {
+          self.as_slice()
+        }
+      }
+    )+
+  };
+}
+
+as_bytes_array_impls! {
+     0  1  2  3  4  5  6  7  8  9
+    10 11 12 13 14 15 16 17 18 19
+    20 21 22 23 24 25 26 27 28 29
+    30 31 32
+}
+
+/// Transforms common types to a char for basic token parsing
+pub trait AsChar {
+  /// makes a char from self
+  fn as_char(self) -> char;
+
+  /// Tests that self is an alphabetic character
+  ///
+  /// Warning: for `&str` it recognizes alphabetic
+  /// characters outside of the 52 ASCII letters
+  fn is_alpha(self) -> bool;
+
+  /// Tests that self is an alphabetic character
+  /// or a decimal digit
+  fn is_alphanum(self) -> bool;
+  /// Tests that self is a decimal digit
+  fn is_dec_digit(self) -> bool;
+  /// Tests that self is an hex digit
+  fn is_hex_digit(self) -> bool;
+  /// Tests that self is an octal digit
+  fn is_oct_digit(self) -> bool;
+  /// Gets the len in bytes for self
+  fn len(self) -> usize;
+}
+
+impl AsChar for u8 {
+  #[inline]
+  fn as_char(self) -> char {
+    self as char
+  }
+  #[inline]
+  fn is_alpha(self) -> bool {
+    (self >= 0x41 && self <= 0x5A) || (self >= 0x61 && self <= 0x7A)
+  }
+  #[inline]
+  fn is_alphanum(self) -> bool {
+    self.is_alpha() || self.is_dec_digit()
+  }
+  #[inline]
+  fn is_dec_digit(self) -> bool {
+    self >= 0x30 && self <= 0x39
+  }
+  #[inline]
+  fn is_hex_digit(self) -> bool {
+    (self >= 0x30 && self <= 0x39)
+      || (self >= 0x41 && self <= 0x46)
+      || (self >= 0x61 && self <= 0x66)
+  }
+  #[inline]
+  fn is_oct_digit(self) -> bool {
+    self >= 0x30 && self <= 0x37
+  }
+  #[inline]
+  fn len(self) -> usize {
+    1
+  }
+}
+impl<'a> AsChar for &'a u8 {
+  #[inline]
+  fn as_char(self) -> char {
+    *self as char
+  }
+  #[inline]
+  fn is_alpha(self) -> bool {
+    (*self >= 0x41 && *self <= 0x5A) || (*self >= 0x61 && *self <= 0x7A)
+  }
+  #[inline]
+  fn is_alphanum(self) -> bool {
+    self.is_alpha() || self.is_dec_digit()
+  }
+  #[inline]
+  fn is_dec_digit(self) -> bool {
+    *self >= 0x30 && *self <= 0x39
+  }
+  #[inline]
+  fn is_hex_digit(self) -> bool {
+    (*self >= 0x30 && *self <= 0x39)
+      || (*self >= 0x41 && *self <= 0x46)
+      || (*self >= 0x61 && *self <= 0x66)
+  }
+  #[inline]
+  fn is_oct_digit(self) -> bool {
+    *self >= 0x30 && *self <= 0x37
+  }
+  #[inline]
+  fn len(self) -> usize {
+    1
+  }
+}
+
+impl AsChar for char {
+  #[inline]
+  fn as_char(self) -> char {
+    self
+  }
+  #[inline]
+  fn is_alpha(self) -> bool {
+    self.is_ascii_alphabetic()
+  }
+  #[inline]
+  fn is_alphanum(self) -> bool {
+    self.is_alpha() || self.is_dec_digit()
+  }
+  #[inline]
+  fn is_dec_digit(self) -> bool {
+    self.is_ascii_digit()
+  }
+  #[inline]
+  fn is_hex_digit(self) -> bool {
+    self.is_ascii_hexdigit()
+  }
+  #[inline]
+  fn is_oct_digit(self) -> bool {
+    self.is_digit(8)
+  }
+  #[inline]
+  fn len(self) -> usize {
+    self.len_utf8()
+  }
+}
+
+impl<'a> AsChar for &'a char {
+  #[inline]
+  fn as_char(self) -> char {
+    *self
+  }
+  #[inline]
+  fn is_alpha(self) -> bool {
+    self.is_ascii_alphabetic()
+  }
+  #[inline]
+  fn is_alphanum(self) -> bool {
+    self.is_alpha() || self.is_dec_digit()
+  }
+  #[inline]
+  fn is_dec_digit(self) -> bool {
+    self.is_ascii_digit()
+  }
+  #[inline]
+  fn is_hex_digit(self) -> bool {
+    self.is_ascii_hexdigit()
+  }
+  #[inline]
+  fn is_oct_digit(self) -> bool {
+    self.is_digit(8)
+  }
+  #[inline]
+  fn len(self) -> usize {
+    self.len_utf8()
+  }
+}
+
+/// Abstracts common iteration operations on the input type
+pub trait InputIter {
+  /// The current input type is a sequence of that `Item` type.
+  ///
+  /// Example: `u8` for `&[u8]` or `char` for `&str`
+  type Item;
+  /// An iterator over the input type, producing the item and its position
+  /// for use with [Slice]. If we're iterating over `&str`, the position
+  /// corresponds to the byte index of the character
+  type Iter: Iterator<Item = (usize, Self::Item)>;
+
+  /// An iterator over the input type, producing the item
+  type IterElem: Iterator<Item = Self::Item>;
+
+  /// Returns an iterator over the elements and their byte offsets
+  fn iter_indices(&self) -> Self::Iter;
+  /// Returns an iterator over the elements
+  fn iter_elements(&self) -> Self::IterElem;
+  /// Finds the byte position of the element
+  fn position<P>(&self, predicate: P) -> Option<usize>
+  where
+    P: Fn(Self::Item) -> bool;
+  /// Get the byte offset from the element's position in the stream
+  fn slice_index(&self, count: usize) -> Result<usize, Needed>;
+}
+
+/// Abstracts slicing operations
+pub trait InputTake: Sized {
+  /// Returns a slice of `count` bytes. panics if count > length
+  fn take(&self, count: usize) -> Self;
+  /// Split the stream at the `count` byte offset. panics if count > length
+  fn take_split(&self, count: usize) -> (Self, Self);
+}
+
+impl<'a> InputIter for &'a [u8] {
+  type Item = u8;
+  type Iter = Enumerate<Self::IterElem>;
+  type IterElem = Copied<Iter<'a, u8>>;
+
+  #[inline]
+  fn iter_indices(&self) -> Self::Iter {
+    self.iter_elements().enumerate()
+  }
+  #[inline]
+  fn iter_elements(&self) -> Self::IterElem {
+    self.iter().copied()
+  }
+  #[inline]
+  fn position<P>(&self, predicate: P) -> Option<usize>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    self.iter().position(|b| predicate(*b))
+  }
+  #[inline]
+  fn slice_index(&self, count: usize) -> Result<usize, Needed> {
+    if self.len() >= count {
+      Ok(count)
+    } else {
+      Err(Needed::new(count - self.len()))
+    }
+  }
+}
+
+impl<'a> InputTake for &'a [u8] {
+  #[inline]
+  fn take(&self, count: usize) -> Self {
+    &self[0..count]
+  }
+  #[inline]
+  fn take_split(&self, count: usize) -> (Self, Self) {
+    let (prefix, suffix) = self.split_at(count);
+    (suffix, prefix)
+  }
+}
+
+impl<'a> InputIter for &'a str {
+  type Item = char;
+  type Iter = CharIndices<'a>;
+  type IterElem = Chars<'a>;
+  #[inline]
+  fn iter_indices(&self) -> Self::Iter {
+    self.char_indices()
+  }
+  #[inline]
+  fn iter_elements(&self) -> Self::IterElem {
+    self.chars()
+  }
+  fn position<P>(&self, predicate: P) -> Option<usize>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    for (o, c) in self.char_indices() {
+      if predicate(c) {
+        return Some(o);
+      }
+    }
+    None
+  }
+  #[inline]
+  fn slice_index(&self, count: usize) -> Result<usize, Needed> {
+    let mut cnt = 0;
+    for (index, _) in self.char_indices() {
+      if cnt == count {
+        return Ok(index);
+      }
+      cnt += 1;
+    }
+    if cnt == count {
+      return Ok(self.len());
+    }
+    Err(Needed::Unknown)
+  }
+}
+
+impl<'a> InputTake for &'a str {
+  #[inline]
+  fn take(&self, count: usize) -> Self {
+    &self[..count]
+  }
+
+  // return byte index
+  #[inline]
+  fn take_split(&self, count: usize) -> (Self, Self) {
+    (&self[count..], &self[..count])
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, O, T> InputIter for &'a BitSlice<O, T>
+where
+  O: BitOrder,
+  T: 'a + BitStore,
+{
+  type Item = bool;
+  type Iter = Enumerate<Self::IterElem>;
+  type IterElem = Copied<bitvec::slice::Iter<'a, O, T>>;
+
+  #[inline]
+  fn iter_indices(&self) -> Self::Iter {
+    self.iter_elements().enumerate()
+  }
+
+  #[inline]
+  fn iter_elements(&self) -> Self::IterElem {
+    self.iter().copied()
+  }
+
+  #[inline]
+  fn position<P>(&self, predicate: P) -> Option<usize>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    self.iter_elements().position(predicate)
+  }
+
+  #[inline]
+  fn slice_index(&self, count: usize) -> Result<usize, Needed> {
+    if self.len() >= count {
+      Ok(count)
+    } else {
+      Err(Needed::new(count - self.len()))
+    }
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, O, T> InputTake for &'a BitSlice<O, T>
+where
+  O: BitOrder,
+  T: 'a + BitStore,
+{
+  #[inline]
+  fn take(&self, count: usize) -> Self {
+    &self[..count]
+  }
+
+  #[inline]
+  fn take_split(&self, count: usize) -> (Self, Self) {
+    let (a, b) = self.split_at(count);
+    (b, a)
+  }
+}
+
+/// Dummy trait used for default implementations (currently only used for `InputTakeAtPosition` and `Compare`).
+///
+/// When implementing a custom input type, it is possible to use directly the
+/// default implementation: If the input type implements `InputLength`, `InputIter`,
+/// `InputTake` and `Clone`, you can implement `UnspecializedInput` and get
+/// a default version of `InputTakeAtPosition` and `Compare`.
+///
+/// For performance reasons, you might want to write a custom implementation of
+/// `InputTakeAtPosition` (like the one for `&[u8]`).
+pub trait UnspecializedInput {}
+
+/// Methods to take as much input as possible until the provided function returns true for the current element.
+///
+/// A large part of nom's basic parsers are built using this trait.
+pub trait InputTakeAtPosition: Sized {
+  /// The current input type is a sequence of that `Item` type.
+  ///
+  /// Example: `u8` for `&[u8]` or `char` for `&str`
+  type Item;
+
+  /// Looks for the first element of the input type for which the condition returns true,
+  /// and returns the input up to this position.
+  ///
+  /// *streaming version*: If no element is found matching the condition, this will return `Incomplete`
+  fn split_at_position<P, E: ParseError<Self>>(&self, predicate: P) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool;
+
+  /// Looks for the first element of the input type for which the condition returns true
+  /// and returns the input up to this position.
+  ///
+  /// Fails if the produced slice is empty.
+  ///
+  /// *streaming version*: If no element is found matching the condition, this will return `Incomplete`
+  fn split_at_position1<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool;
+
+  /// Looks for the first element of the input type for which the condition returns true,
+  /// and returns the input up to this position.
+  ///
+  /// *complete version*: If no element is found matching the condition, this will return the whole input
+  fn split_at_position_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool;
+
+  /// Looks for the first element of the input type for which the condition returns true
+  /// and returns the input up to this position.
+  ///
+  /// Fails if the produced slice is empty.
+  ///
+  /// *complete version*: If no element is found matching the condition, this will return the whole input
+  fn split_at_position1_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool;
+}
+
+impl<T: InputLength + InputIter + InputTake + Clone + UnspecializedInput> InputTakeAtPosition
+  for T
+{
+  type Item = <T as InputIter>::Item;
+
+  fn split_at_position<P, E: ParseError<Self>>(&self, predicate: P) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.position(predicate) {
+      Some(n) => Ok(self.take_split(n)),
+      None => Err(Err::Incomplete(Needed::new(1))),
+    }
+  }
+
+  fn split_at_position1<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.position(predicate) {
+      Some(0) => Err(Err::Error(E::from_error_kind(self.clone(), e))),
+      Some(n) => Ok(self.take_split(n)),
+      None => Err(Err::Incomplete(Needed::new(1))),
+    }
+  }
+
+  fn split_at_position_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.split_at_position(predicate) {
+      Err(Err::Incomplete(_)) => Ok(self.take_split(self.input_len())),
+      res => res,
+    }
+  }
+
+  fn split_at_position1_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.split_at_position1(predicate, e) {
+      Err(Err::Incomplete(_)) => {
+        if self.input_len() == 0 {
+          Err(Err::Error(E::from_error_kind(self.clone(), e)))
+        } else {
+          Ok(self.take_split(self.input_len()))
+        }
+      }
+      res => res,
+    }
+  }
+}
+
+impl<'a> InputTakeAtPosition for &'a [u8] {
+  type Item = u8;
+
+  fn split_at_position<P, E: ParseError<Self>>(&self, predicate: P) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match (0..self.len()).find(|b| predicate(self[*b])) {
+      Some(i) => Ok((&self[i..], &self[..i])),
+      None => Err(Err::Incomplete(Needed::new(1))),
+    }
+  }
+
+  fn split_at_position1<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match (0..self.len()).find(|b| predicate(self[*b])) {
+      Some(0) => Err(Err::Error(E::from_error_kind(self, e))),
+      Some(i) => Ok((&self[i..], &self[..i])),
+      None => Err(Err::Incomplete(Needed::new(1))),
+    }
+  }
+
+  fn split_at_position_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match (0..self.len()).find(|b| predicate(self[*b])) {
+      Some(i) => Ok((&self[i..], &self[..i])),
+      None => Ok(self.take_split(self.input_len())),
+    }
+  }
+
+  fn split_at_position1_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match (0..self.len()).find(|b| predicate(self[*b])) {
+      Some(0) => Err(Err::Error(E::from_error_kind(self, e))),
+      Some(i) => Ok((&self[i..], &self[..i])),
+      None => {
+        if self.is_empty() {
+          Err(Err::Error(E::from_error_kind(self, e)))
+        } else {
+          Ok(self.take_split(self.input_len()))
+        }
+      }
+    }
+  }
+}
+
+impl<'a> InputTakeAtPosition for &'a str {
+  type Item = char;
+
+  fn split_at_position<P, E: ParseError<Self>>(&self, predicate: P) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.find(predicate) {
+      Some(i) => Ok((&self[i..], &self[..i])),
+      None => Err(Err::Incomplete(Needed::new(1))),
+    }
+  }
+
+  fn split_at_position1<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.find(predicate) {
+      Some(0) => Err(Err::Error(E::from_error_kind(self, e))),
+      Some(i) => Ok((&self[i..], &self[..i])),
+      None => Err(Err::Incomplete(Needed::new(1))),
+    }
+  }
+
+  fn split_at_position_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.find(predicate) {
+      Some(i) => Ok((&self[i..], &self[..i])),
+      None => Ok(self.take_split(self.input_len())),
+    }
+  }
+
+  fn split_at_position1_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.find(predicate) {
+      Some(0) => Err(Err::Error(E::from_error_kind(self, e))),
+      Some(i) => Ok((&self[i..], &self[..i])),
+      None => {
+        if self.is_empty() {
+          Err(Err::Error(E::from_error_kind(self, e)))
+        } else {
+          Ok(self.take_split(self.input_len()))
+        }
+      }
+    }
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, O, T> InputTakeAtPosition for &'a BitSlice<O, T>
+where
+  O: BitOrder,
+  T: 'a + BitStore,
+{
+  type Item = bool;
+
+  fn split_at_position<P, E: ParseError<Self>>(&self, predicate: P) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    self
+      .iter()
+      .copied()
+      .position(predicate)
+      .map(|i| self.split_at(i))
+      .ok_or_else(|| Err::Incomplete(Needed::new(1)))
+  }
+
+  fn split_at_position1<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.iter().copied().position(predicate) {
+      Some(0) => Err(Err::Error(E::from_error_kind(self, e))),
+      Some(i) => Ok(self.split_at(i)),
+      None => Err(Err::Incomplete(Needed::new(1))),
+    }
+  }
+
+  fn split_at_position_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    self
+      .iter()
+      .position(|b| predicate(*b))
+      .map(|i| self.split_at(i))
+      .or_else(|| Some((self, Self::default())))
+      .ok_or_else(|| unreachable!())
+  }
+
+  fn split_at_position1_complete<P, E: ParseError<Self>>(
+    &self,
+    predicate: P,
+    e: ErrorKind,
+  ) -> IResult<Self, Self, E>
+  where
+    P: Fn(Self::Item) -> bool,
+  {
+    match self.iter().copied().position(predicate) {
+      Some(0) => Err(Err::Error(E::from_error_kind(self, e))),
+      Some(i) => Ok(self.split_at(i)),
+      None => {
+        if self.is_empty() {
+          Err(Err::Error(E::from_error_kind(self, e)))
+        } else {
+          Ok((self, Self::default()))
+        }
+      }
+    }
+  }
+}
+
+/// Indicates wether a comparison was successful, an error, or
+/// if more data was needed
+#[derive(Debug, PartialEq)]
+pub enum CompareResult {
+  /// Comparison was successful
+  Ok,
+  /// We need more data to be sure
+  Incomplete,
+  /// Comparison failed
+  Error,
+}
+
+/// Abstracts comparison operations
+pub trait Compare<T> {
+  /// Compares self to another value for equality
+  fn compare(&self, t: T) -> CompareResult;
+  /// Compares self to another value for equality
+  /// independently of the case.
+  ///
+  /// Warning: for `&str`, the comparison is done
+  /// by lowercasing both strings and comparing
+  /// the result. This is a temporary solution until
+  /// a better one appears
+  fn compare_no_case(&self, t: T) -> CompareResult;
+}
+
+fn lowercase_byte(c: u8) -> u8 {
+  match c {
+    b'A'..=b'Z' => c - b'A' + b'a',
+    _ => c,
+  }
+}
+
+impl<'a, 'b> Compare<&'b [u8]> for &'a [u8] {
+  #[inline(always)]
+  fn compare(&self, t: &'b [u8]) -> CompareResult {
+    let pos = self.iter().zip(t.iter()).position(|(a, b)| a != b);
+
+    match pos {
+      Some(_) => CompareResult::Error,
+      None => {
+        if self.len() >= t.len() {
+          CompareResult::Ok
+        } else {
+          CompareResult::Incomplete
+        }
+      }
+    }
+
+    /*
+    let len = self.len();
+    let blen = t.len();
+    let m = if len < blen { len } else { blen };
+    let reduced = &self[..m];
+    let b = &t[..m];
+
+    if reduced != b {
+      CompareResult::Error
+    } else if m < blen {
+      CompareResult::Incomplete
+    } else {
+      CompareResult::Ok
+    }
+    */
+  }
+
+  #[inline(always)]
+  fn compare_no_case(&self, t: &'b [u8]) -> CompareResult {
+    if self
+      .iter()
+      .zip(t)
+      .any(|(a, b)| lowercase_byte(*a) != lowercase_byte(*b))
+    {
+      CompareResult::Error
+    } else if self.len() < t.len() {
+      CompareResult::Incomplete
+    } else {
+      CompareResult::Ok
+    }
+  }
+}
+
+impl<
+    T: InputLength + InputIter<Item = u8> + InputTake + UnspecializedInput,
+    O: InputLength + InputIter<Item = u8> + InputTake,
+  > Compare<O> for T
+{
+  #[inline(always)]
+  fn compare(&self, t: O) -> CompareResult {
+    let pos = self
+      .iter_elements()
+      .zip(t.iter_elements())
+      .position(|(a, b)| a != b);
+
+    match pos {
+      Some(_) => CompareResult::Error,
+      None => {
+        if self.input_len() >= t.input_len() {
+          CompareResult::Ok
+        } else {
+          CompareResult::Incomplete
+        }
+      }
+    }
+  }
+
+  #[inline(always)]
+  fn compare_no_case(&self, t: O) -> CompareResult {
+    if self
+      .iter_elements()
+      .zip(t.iter_elements())
+      .any(|(a, b)| lowercase_byte(a) != lowercase_byte(b))
+    {
+      CompareResult::Error
+    } else if self.input_len() < t.input_len() {
+      CompareResult::Incomplete
+    } else {
+      CompareResult::Ok
+    }
+  }
+}
+
+impl<'a, 'b> Compare<&'b str> for &'a [u8] {
+  #[inline(always)]
+  fn compare(&self, t: &'b str) -> CompareResult {
+    self.compare(AsBytes::as_bytes(t))
+  }
+  #[inline(always)]
+  fn compare_no_case(&self, t: &'b str) -> CompareResult {
+    self.compare_no_case(AsBytes::as_bytes(t))
+  }
+}
+
+impl<'a, 'b> Compare<&'b str> for &'a str {
+  #[inline(always)]
+  fn compare(&self, t: &'b str) -> CompareResult {
+    self.as_bytes().compare(t.as_bytes())
+  }
+
+  //FIXME: this version is too simple and does not use the current locale
+  #[inline(always)]
+  fn compare_no_case(&self, t: &'b str) -> CompareResult {
+    let pos = self
+      .chars()
+      .zip(t.chars())
+      .position(|(a, b)| a.to_lowercase().ne(b.to_lowercase()));
+
+    match pos {
+      Some(_) => CompareResult::Error,
+      None => {
+        if self.len() >= t.len() {
+          CompareResult::Ok
+        } else {
+          CompareResult::Incomplete
+        }
+      }
+    }
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, 'b, O1, O2, T1, T2> Compare<&'b BitSlice<O2, T2>> for &'a BitSlice<O1, T1>
+where
+  O1: BitOrder,
+  O2: BitOrder,
+  T1: 'a + BitStore,
+  T2: 'a + BitStore,
+{
+  #[inline]
+  fn compare(&self, other: &'b BitSlice<O2, T2>) -> CompareResult {
+    match self.iter().zip(other.iter()).position(|(a, b)| a != b) {
+      Some(_) => CompareResult::Error,
+      None => {
+        if self.len() >= other.len() {
+          CompareResult::Ok
+        } else {
+          CompareResult::Incomplete
+        }
+      }
+    }
+  }
+
+  #[inline(always)]
+  fn compare_no_case(&self, other: &'b BitSlice<O2, T2>) -> CompareResult {
+    self.compare(other)
+  }
+}
+
+/// Look for a token in self
+pub trait FindToken<T> {
+  /// Returns true if self contains the token
+  fn find_token(&self, token: T) -> bool;
+}
+
+impl<'a> FindToken<u8> for &'a [u8] {
+  fn find_token(&self, token: u8) -> bool {
+    memchr::memchr(token, self).is_some()
+  }
+}
+
+impl<'a> FindToken<u8> for &'a str {
+  fn find_token(&self, token: u8) -> bool {
+    self.as_bytes().find_token(token)
+  }
+}
+
+impl<'a, 'b> FindToken<&'a u8> for &'b [u8] {
+  fn find_token(&self, token: &u8) -> bool {
+    self.find_token(*token)
+  }
+}
+
+impl<'a, 'b> FindToken<&'a u8> for &'b str {
+  fn find_token(&self, token: &u8) -> bool {
+    self.as_bytes().find_token(token)
+  }
+}
+
+impl<'a> FindToken<char> for &'a [u8] {
+  fn find_token(&self, token: char) -> bool {
+    self.iter().any(|i| *i == token as u8)
+  }
+}
+
+impl<'a> FindToken<char> for &'a str {
+  fn find_token(&self, token: char) -> bool {
+    self.chars().any(|i| i == token)
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, O, T> FindToken<bool> for &'a BitSlice<O, T>
+where
+  O: BitOrder,
+  T: 'a + BitStore,
+{
+  fn find_token(&self, token: bool) -> bool {
+    self.iter().copied().any(|i| i == token)
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, O, T> FindToken<(usize, bool)> for &'a BitSlice<O, T>
+where
+  O: BitOrder,
+  T: 'a + BitStore,
+{
+  fn find_token(&self, token: (usize, bool)) -> bool {
+    self.iter().copied().enumerate().any(|i| i == token)
+  }
+}
+
+/// Look for a substring in self
+pub trait FindSubstring<T> {
+  /// Returns the byte position of the substring if it is found
+  fn find_substring(&self, substr: T) -> Option<usize>;
+}
+
+impl<'a, 'b> FindSubstring<&'b [u8]> for &'a [u8] {
+  fn find_substring(&self, substr: &'b [u8]) -> Option<usize> {
+    if substr.len() > self.len() {
+      return None;
+    }
+
+    let (&substr_first, substr_rest) = match substr.split_first() {
+      Some(split) => split,
+      // an empty substring is found at position 0
+      // This matches the behavior of str.find("").
+      None => return Some(0),
+    };
+
+    if substr_rest.is_empty() {
+      return memchr::memchr(substr_first, self);
+    }
+
+    let mut offset = 0;
+    let haystack = &self[..self.len() - substr_rest.len()];
+
+    while let Some(position) = memchr::memchr(substr_first, &haystack[offset..]) {
+      offset += position;
+      let next_offset = offset + 1;
+      if &self[next_offset..][..substr_rest.len()] == substr_rest {
+        return Some(offset);
+      }
+
+      offset = next_offset;
+    }
+
+    None
+  }
+}
+
+impl<'a, 'b> FindSubstring<&'b str> for &'a [u8] {
+  fn find_substring(&self, substr: &'b str) -> Option<usize> {
+    self.find_substring(AsBytes::as_bytes(substr))
+  }
+}
+
+impl<'a, 'b> FindSubstring<&'b str> for &'a str {
+  //returns byte index
+  fn find_substring(&self, substr: &'b str) -> Option<usize> {
+    self.find(substr)
+  }
+}
+
+#[cfg(feature = "bitvec")]
+impl<'a, 'b, O1, O2, T1, T2> FindSubstring<&'b BitSlice<O2, T2>> for &'a BitSlice<O1, T1>
+where
+  O1: BitOrder,
+  O2: BitOrder,
+  T1: 'a + BitStore,
+  T2: 'b + BitStore,
+{
+  fn find_substring(&self, substr: &'b BitSlice<O2, T2>) -> Option<usize> {
+    if substr.len() > self.len() {
+      return None;
+    }
+
+    if substr.is_empty() {
+      return Some(0);
+    }
+
+    self
+      .windows(substr.len())
+      .position(|window| window == substr)
+  }
+}
+
+/// Used to integrate `str`'s `parse()` method
+pub trait ParseTo<R> {
+  /// Succeeds if `parse()` succeeded. The byte slice implementation
+  /// will first convert it to a `&str`, then apply the `parse()` function
+  fn parse_to(&self) -> Option<R>;
+}
+
+impl<'a, R: FromStr> ParseTo<R> for &'a [u8] {
+  fn parse_to(&self) -> Option<R> {
+    from_utf8(self).ok().and_then(|s| s.parse().ok())
+  }
+}
+
+impl<'a, R: FromStr> ParseTo<R> for &'a str {
+  fn parse_to(&self) -> Option<R> {
+    self.parse().ok()
+  }
+}
+
+/// Slicing operations using ranges.
+///
+/// This trait is loosely based on
+/// `Index`, but can actually return
+/// something else than a `&[T]` or `&str`
+pub trait Slice<R> {
+  /// Slices self according to the range argument
+  fn slice(&self, range: R) -> Self;
+}
+
+macro_rules! impl_fn_slice {
+  ( $ty:ty ) => {
+    fn slice(&self, range: $ty) -> Self {
+      &self[range]
+    }
+  };
+}
+
+macro_rules! slice_range_impl {
+  ( BitSlice, $ty:ty ) => {
+    impl<'a, O, T> Slice<$ty> for &'a BitSlice<O, T>
+    where
+      O: BitOrder,
+      T: BitStore,
+    {
+      impl_fn_slice!($ty);
+    }
+  };
+  ( [ $for_type:ident ], $ty:ty ) => {
+    impl<'a, $for_type> Slice<$ty> for &'a [$for_type] {
+      impl_fn_slice!($ty);
+    }
+  };
+  ( $for_type:ty, $ty:ty ) => {
+    impl<'a> Slice<$ty> for &'a $for_type {
+      impl_fn_slice!($ty);
+    }
+  };
+}
+
+macro_rules! slice_ranges_impl {
+  ( BitSlice ) => {
+    slice_range_impl! {BitSlice, Range<usize>}
+    slice_range_impl! {BitSlice, RangeTo<usize>}
+    slice_range_impl! {BitSlice, RangeFrom<usize>}
+    slice_range_impl! {BitSlice, RangeFull}
+  };
+  ( [ $for_type:ident ] ) => {
+    slice_range_impl! {[$for_type], Range<usize>}
+    slice_range_impl! {[$for_type], RangeTo<usize>}
+    slice_range_impl! {[$for_type], RangeFrom<usize>}
+    slice_range_impl! {[$for_type], RangeFull}
+  };
+  ( $for_type:ty ) => {
+    slice_range_impl! {$for_type, Range<usize>}
+    slice_range_impl! {$for_type, RangeTo<usize>}
+    slice_range_impl! {$for_type, RangeFrom<usize>}
+    slice_range_impl! {$for_type, RangeFull}
+  };
+}
+
+slice_ranges_impl! {str}
+slice_ranges_impl! {[T]}
+
+#[cfg(feature = "bitvec")]
+slice_ranges_impl! {BitSlice}
+
+macro_rules! array_impls {
+  ($($N:expr)+) => {
+    $(
+      impl InputLength for [u8; $N] {
+        #[inline]
+        fn input_len(&self) -> usize {
+          self.len()
+        }
+      }
+
+      impl<'a> InputLength for &'a [u8; $N] {
+        #[inline]
+        fn input_len(&self) -> usize {
+          self.len()
+        }
+      }
+
+      impl<'a> InputIter for &'a [u8; $N] {
+        type Item = u8;
+        type Iter = Enumerate<Self::IterElem>;
+        type IterElem = Copied<Iter<'a, u8>>;
+
+        fn iter_indices(&self) -> Self::Iter {
+          (&self[..]).iter_indices()
+        }
+
+        fn iter_elements(&self) -> Self::IterElem {
+          (&self[..]).iter_elements()
+        }
+
+        fn position<P>(&self, predicate: P) -> Option<usize>
+          where P: Fn(Self::Item) -> bool {
+          (&self[..]).position(predicate)
+        }
+
+        fn slice_index(&self, count: usize) -> Result<usize, Needed> {
+          (&self[..]).slice_index(count)
+        }
+      }
+
+      impl<'a> Compare<[u8; $N]> for &'a [u8] {
+        #[inline(always)]
+        fn compare(&self, t: [u8; $N]) -> CompareResult {
+          self.compare(&t[..])
+        }
+
+        #[inline(always)]
+        fn compare_no_case(&self, t: [u8;$N]) -> CompareResult {
+          self.compare_no_case(&t[..])
+        }
+      }
+
+      impl<'a,'b> Compare<&'b [u8; $N]> for &'a [u8] {
+        #[inline(always)]
+        fn compare(&self, t: &'b [u8; $N]) -> CompareResult {
+          self.compare(&t[..])
+        }
+
+        #[inline(always)]
+        fn compare_no_case(&self, t: &'b [u8;$N]) -> CompareResult {
+          self.compare_no_case(&t[..])
+        }
+      }
+
+      impl FindToken<u8> for [u8; $N] {
+        fn find_token(&self, token: u8) -> bool {
+          memchr::memchr(token, &self[..]).is_some()
+        }
+      }
+
+      impl<'a> FindToken<&'a u8> for [u8; $N] {
+        fn find_token(&self, token: &u8) -> bool {
+          self.find_token(*token)
+        }
+      }
+    )+
+  };
+}
+
+array_impls! {
+     0  1  2  3  4  5  6  7  8  9
+    10 11 12 13 14 15 16 17 18 19
+    20 21 22 23 24 25 26 27 28 29
+    30 31 32
+}
+
+/// Abstracts something which can extend an `Extend`.
+/// Used to build modified input slices in `escaped_transform`
+pub trait ExtendInto {
+  /// The current input type is a sequence of that `Item` type.
+  ///
+  /// Example: `u8` for `&[u8]` or `char` for `&str`
+  type Item;
+
+  /// The type that will be produced
+  type Extender;
+
+  /// Create a new `Extend` of the correct type
+  fn new_builder(&self) -> Self::Extender;
+  /// Accumulate the input into an accumulator
+  fn extend_into(&self, acc: &mut Self::Extender);
+}
+
+#[cfg(feature = "alloc")]
+impl ExtendInto for [u8] {
+  type Item = u8;
+  type Extender = Vec<u8>;
+
+  #[inline]
+  fn new_builder(&self) -> Vec<u8> {
+    Vec::new()
+  }
+  #[inline]
+  fn extend_into(&self, acc: &mut Vec<u8>) {
+    acc.extend(self.iter().cloned());
+  }
+}
+
+#[cfg(feature = "alloc")]
+impl ExtendInto for &[u8] {
+  type Item = u8;
+  type Extender = Vec<u8>;
+
+  #[inline]
+  fn new_builder(&self) -> Vec<u8> {
+    Vec::new()
+  }
+  #[inline]
+  fn extend_into(&self, acc: &mut Vec<u8>) {
+    acc.extend_from_slice(self);
+  }
+}
+
+#[cfg(feature = "alloc")]
+impl ExtendInto for str {
+  type Item = char;
+  type Extender = String;
+
+  #[inline]
+  fn new_builder(&self) -> String {
+    String::new()
+  }
+  #[inline]
+  fn extend_into(&self, acc: &mut String) {
+    acc.push_str(self);
+  }
+}
+
+#[cfg(feature = "alloc")]
+impl ExtendInto for &str {
+  type Item = char;
+  type Extender = String;
+
+  #[inline]
+  fn new_builder(&self) -> String {
+    String::new()
+  }
+  #[inline]
+  fn extend_into(&self, acc: &mut String) {
+    acc.push_str(self);
+  }
+}
+
+#[cfg(feature = "alloc")]
+impl ExtendInto for char {
+  type Item = char;
+  type Extender = String;
+
+  #[inline]
+  fn new_builder(&self) -> String {
+    String::new()
+  }
+  #[inline]
+  fn extend_into(&self, acc: &mut String) {
+    acc.push(*self);
+  }
+}
+
+#[cfg(all(feature = "alloc", feature = "bitvec"))]
+impl<O, T> ExtendInto for BitSlice<O, T>
+where
+  O: BitOrder,
+  T: BitStore,
+{
+  type Item = bool;
+  type Extender = BitVec<O, T>;
+
+  #[inline]
+  fn new_builder(&self) -> BitVec<O, T> {
+    BitVec::new()
+  }
+
+  #[inline]
+  fn extend_into(&self, acc: &mut Self::Extender) {
+    acc.extend(self.iter());
+  }
+}
+
+#[cfg(all(feature = "alloc", feature = "bitvec"))]
+impl<'a, O, T> ExtendInto for &'a BitSlice<O, T>
+where
+  O: BitOrder,
+  T: 'a + BitStore,
+{
+  type Item = bool;
+  type Extender = BitVec<O, T>;
+
+  #[inline]
+  fn new_builder(&self) -> BitVec<O, T> {
+    BitVec::new()
+  }
+
+  #[inline]
+  fn extend_into(&self, acc: &mut Self::Extender) {
+    acc.extend(self.iter());
+  }
+}
+
+/// Helper trait to convert numbers to usize.
+///
+/// By default, usize implements `From<u8>` and `From<u16>` but not
+/// `From<u32>` and `From<u64>` because that would be invalid on some
+/// platforms. This trait implements the conversion for platforms
+/// with 32 and 64 bits pointer platforms
+pub trait ToUsize {
+  /// converts self to usize
+  fn to_usize(&self) -> usize;
+}
+
+impl ToUsize for u8 {
+  #[inline]
+  fn to_usize(&self) -> usize {
+    *self as usize
+  }
+}
+
+impl ToUsize for u16 {
+  #[inline]
+  fn to_usize(&self) -> usize {
+    *self as usize
+  }
+}
+
+impl ToUsize for usize {
+  #[inline]
+  fn to_usize(&self) -> usize {
+    *self
+  }
+}
+
+#[cfg(any(target_pointer_width = "32", target_pointer_width = "64"))]
+impl ToUsize for u32 {
+  #[inline]
+  fn to_usize(&self) -> usize {
+    *self as usize
+  }
+}
+
+#[cfg(target_pointer_width = "64")]
+impl ToUsize for u64 {
+  #[inline]
+  fn to_usize(&self) -> usize {
+    *self as usize
+  }
+}
+
+/// Equivalent From implementation to avoid orphan rules in bits parsers
+pub trait ErrorConvert<E> {
+  /// Transform to another error type
+  fn convert(self) -> E;
+}
+
+impl<I> ErrorConvert<(I, ErrorKind)> for ((I, usize), ErrorKind) {
+  fn convert(self) -> (I, ErrorKind) {
+    ((self.0).0, self.1)
+  }
+}
+
+impl<I> ErrorConvert<((I, usize), ErrorKind)> for (I, ErrorKind) {
+  fn convert(self) -> ((I, usize), ErrorKind) {
+    ((self.0, 0), self.1)
+  }
+}
+
+use crate::error;
+impl<I> ErrorConvert<error::Error<I>> for error::Error<(I, usize)> {
+  fn convert(self) -> error::Error<I> {
+    error::Error {
+      input: self.input.0,
+      code: self.code,
+    }
+  }
+}
+
+impl<I> ErrorConvert<error::Error<(I, usize)>> for error::Error<I> {
+  fn convert(self) -> error::Error<(I, usize)> {
+    error::Error {
+      input: (self.input, 0),
+      code: self.code,
+    }
+  }
+}
+
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+impl<I> ErrorConvert<error::VerboseError<I>> for error::VerboseError<(I, usize)> {
+  fn convert(self) -> error::VerboseError<I> {
+    error::VerboseError {
+      errors: self.errors.into_iter().map(|(i, e)| (i.0, e)).collect(),
+    }
+  }
+}
+
+#[cfg(feature = "alloc")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "alloc")))]
+impl<I> ErrorConvert<error::VerboseError<(I, usize)>> for error::VerboseError<I> {
+  fn convert(self) -> error::VerboseError<(I, usize)> {
+    error::VerboseError {
+      errors: self.errors.into_iter().map(|(i, e)| ((i, 0), e)).collect(),
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  fn test_offset_u8() {
+    let s = b"abcd123";
+    let a = &s[..];
+    let b = &a[2..];
+    let c = &a[..4];
+    let d = &a[3..5];
+    assert_eq!(a.offset(b), 2);
+    assert_eq!(a.offset(c), 0);
+    assert_eq!(a.offset(d), 3);
+  }
+
+  #[test]
+  fn test_offset_str() {
+    let s = "abcřèÂßÇd123";
+    let a = &s[..];
+    let b = &a[7..];
+    let c = &a[..5];
+    let d = &a[5..9];
+    assert_eq!(a.offset(b), 7);
+    assert_eq!(a.offset(c), 0);
+    assert_eq!(a.offset(d), 5);
+  }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/src/util.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/src/util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,218 @@
+#[cfg(feature = "std")]
+use crate::internal::IResult;
+#[cfg(feature = "std")]
+use std::fmt::Debug;
+
+#[cfg(feature = "std")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "std")))]
+/// Helper trait to show a byte slice as a hex dump
+pub trait HexDisplay {
+  /// Converts the value of `self` to a hex dump, returning the owned
+  /// `String`.
+  fn to_hex(&self, chunk_size: usize) -> String;
+
+  /// Converts the value of `self` to a hex dump beginning at `from` address, returning the owned
+  /// `String`.
+  fn to_hex_from(&self, chunk_size: usize, from: usize) -> String;
+}
+
+#[cfg(feature = "std")]
+static CHARS: &[u8] = b"0123456789abcdef";
+
+#[cfg(feature = "std")]
+impl HexDisplay for [u8] {
+  #[allow(unused_variables)]
+  fn to_hex(&self, chunk_size: usize) -> String {
+    self.to_hex_from(chunk_size, 0)
+  }
+
+  #[allow(unused_variables)]
+  fn to_hex_from(&self, chunk_size: usize, from: usize) -> String {
+    let mut v = Vec::with_capacity(self.len() * 3);
+    let mut i = from;
+    for chunk in self.chunks(chunk_size) {
+      let s = format!("{:08x}", i);
+      for &ch in s.as_bytes().iter() {
+        v.push(ch);
+      }
+      v.push(b'\t');
+
+      i += chunk_size;
+
+      for &byte in chunk {
+        v.push(CHARS[(byte >> 4) as usize]);
+        v.push(CHARS[(byte & 0xf) as usize]);
+        v.push(b' ');
+      }
+      if chunk_size > chunk.len() {
+        for j in 0..(chunk_size - chunk.len()) {
+          v.push(b' ');
+          v.push(b' ');
+          v.push(b' ');
+        }
+      }
+      v.push(b'\t');
+
+      for &byte in chunk {
+        if (byte >= 32 && byte <= 126) || byte >= 128 {
+          v.push(byte);
+        } else {
+          v.push(b'.');
+        }
+      }
+      v.push(b'\n');
+    }
+
+    String::from_utf8_lossy(&v[..]).into_owned()
+  }
+}
+
+#[cfg(feature = "std")]
+impl HexDisplay for str {
+  #[allow(unused_variables)]
+  fn to_hex(&self, chunk_size: usize) -> String {
+    self.to_hex_from(chunk_size, 0)
+  }
+
+  #[allow(unused_variables)]
+  fn to_hex_from(&self, chunk_size: usize, from: usize) -> String {
+    self.as_bytes().to_hex_from(chunk_size, from)
+  }
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! nom_line (
+  () => (line!());
+);
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! nom_println (
+  ($($args:tt)*) => (println!($($args)*));
+);
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! nom_stringify (
+  ($($args:tt)*) => (stringify!($($args)*));
+);
+
+/// Prints a message if the parser fails.
+///
+/// The message prints the `Error` or `Incomplete`
+/// and the parser's calling code
+///
+/// ```
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///    named!(f, dbg_basic!( tag!( "abcd" ) ) );
+///
+///    let a = &b"efgh"[..];
+///
+///    // Will print the following message:
+///    // Error(Position(0, [101, 102, 103, 104])) at l.5 by ' tag ! ( "abcd" ) '
+///    f(a);
+/// # }
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! dbg_basic (
+  ($i: expr, $submac:ident!( $($args:tt)* )) => (
+    {
+      use $crate::lib::std::result::Result::*;
+      let l = nom_line!();
+      match $submac!($i, $($args)*) {
+        Err(e) => {
+          nom_println!("Err({:?}) at l.{} by ' {} '", e, l, nom_stringify!($submac!($($args)*)));
+          Err(e)
+        },
+        a => a,
+      }
+    }
+  );
+
+  ($i:expr, $f:ident) => (
+      dbg_basic!($i, call!($f));
+  );
+);
+
+/// Prints a message and the input if the parser fails.
+///
+/// The message prints the `Error` or `Incomplete`
+/// and the parser's calling code.
+///
+/// It also displays the input in hexdump format
+///
+/// ```rust
+/// use nom::{IResult, dbg_dmp, bytes::complete::tag};
+///
+/// fn f(i: &[u8]) -> IResult<&[u8], &[u8]> {
+///   dbg_dmp(tag("abcd"), "tag")(i)
+/// }
+///
+///   let a = &b"efghijkl"[..];
+///
+/// // Will print the following message:
+/// // Error(Position(0, [101, 102, 103, 104, 105, 106, 107, 108])) at l.5 by ' tag ! ( "abcd" ) '
+/// // 00000000        65 66 67 68 69 6a 6b 6c         efghijkl
+/// f(a);
+/// ```
+#[cfg(feature = "std")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "std")))]
+pub fn dbg_dmp<'a, F, O, E: Debug>(
+  f: F,
+  context: &'static str,
+) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], O, E>
+where
+  F: Fn(&'a [u8]) -> IResult<&'a [u8], O, E>,
+{
+  move |i: &'a [u8]| match f(i) {
+    Err(e) => {
+      println!("{}: Error({:?}) at:\n{}", context, e, i.to_hex(8));
+      Err(e)
+    }
+    a => a,
+  }
+}
+
+/// Prints a message and the input if the parser fails.
+///
+/// The message prints the `Error` or `Incomplete`
+/// and the parser's calling code.
+///
+/// It also displays the input in hexdump format
+///
+/// ```ignore
+/// # #[macro_use] extern crate nom;
+/// # fn main() {
+///    named!(f, dbg_dmp!( tag!( "abcd" ) ) );
+///
+///    let a = &b"efghijkl"[..];
+///
+///    // Will print the following message:
+///    // Error(Position(0, [101, 102, 103, 104, 105, 106, 107, 108])) at l.5 by ' tag ! ( "abcd" ) '
+///    // 00000000        65 66 67 68 69 6a 6b 6c         efghijkl
+///    f(a);
+/// # }
+#[macro_export(local_inner_macros)]
+#[cfg(feature = "std")]
+#[cfg_attr(feature = "docsrs", doc(cfg(feature = "std")))]
+macro_rules! dbg_dmp (
+  ($i: expr, $submac:ident!( $($args:tt)* )) => (
+    {
+      use $crate::HexDisplay;
+      let l = nom_line!();
+      match $submac!($i, $($args)*) {
+        Err(e) => {
+          nom_println!("Error({:?}) at l.{} by ' {} '\n{}", e, l, nom_stringify!($submac!($($args)*)), $i.to_hex(8));
+          Err(e)
+        },
+        a => a,
+      }
+    }
+  );
+
+  ($i:expr, $f:ident) => (
+      dbg_dmp!($i, call!($f));
+  );
+);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/arithmetic_ast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/arithmetic_ast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/arithmetic_ast.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/arithmetic_ast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,163 @@
+extern crate nom;
+
+use std::fmt;
+use std::fmt::{Debug, Display, Formatter};
+
+use std::str::FromStr;
+
+use nom::{
+  branch::alt,
+  bytes::complete::tag,
+  character::complete::{digit1 as digit, multispace0 as multispace},
+  combinator::{map, map_res},
+  multi::many0,
+  sequence::{delimited, preceded},
+  IResult,
+};
+
+pub enum Expr {
+  Value(i64),
+  Add(Box<Expr>, Box<Expr>),
+  Sub(Box<Expr>, Box<Expr>),
+  Mul(Box<Expr>, Box<Expr>),
+  Div(Box<Expr>, Box<Expr>),
+  Paren(Box<Expr>),
+}
+
+#[derive(Debug)]
+pub enum Oper {
+  Add,
+  Sub,
+  Mul,
+  Div,
+}
+
+impl Display for Expr {
+  fn fmt(&self, format: &mut Formatter) -> fmt::Result {
+    use self::Expr::*;
+    match *self {
+      Value(val) => write!(format, "{}", val),
+      Add(ref left, ref right) => write!(format, "{} + {}", left, right),
+      Sub(ref left, ref right) => write!(format, "{} - {}", left, right),
+      Mul(ref left, ref right) => write!(format, "{} * {}", left, right),
+      Div(ref left, ref right) => write!(format, "{} / {}", left, right),
+      Paren(ref expr) => write!(format, "({})", expr),
+    }
+  }
+}
+
+impl Debug for Expr {
+  fn fmt(&self, format: &mut Formatter) -> fmt::Result {
+    use self::Expr::*;
+    match *self {
+      Value(val) => write!(format, "{}", val),
+      Add(ref left, ref right) => write!(format, "({:?} + {:?})", left, right),
+      Sub(ref left, ref right) => write!(format, "({:?} - {:?})", left, right),
+      Mul(ref left, ref right) => write!(format, "({:?} * {:?})", left, right),
+      Div(ref left, ref right) => write!(format, "({:?} / {:?})", left, right),
+      Paren(ref expr) => write!(format, "[{:?}]", expr),
+    }
+  }
+}
+
+fn parens(i: &str) -> IResult<&str, Expr> {
+  delimited(
+    multispace,
+    delimited(tag("("), map(expr, |e| Expr::Paren(Box::new(e))), tag(")")),
+    multispace,
+  )(i)
+}
+
+fn factor(i: &str) -> IResult<&str, Expr> {
+  alt((
+    map(
+      map_res(delimited(multispace, digit, multispace), FromStr::from_str),
+      Expr::Value,
+    ),
+    parens,
+  ))(i)
+}
+
+fn fold_exprs(initial: Expr, remainder: Vec<(Oper, Expr)>) -> Expr {
+  remainder.into_iter().fold(initial, |acc, pair| {
+    let (oper, expr) = pair;
+    match oper {
+      Oper::Add => Expr::Add(Box::new(acc), Box::new(expr)),
+      Oper::Sub => Expr::Sub(Box::new(acc), Box::new(expr)),
+      Oper::Mul => Expr::Mul(Box::new(acc), Box::new(expr)),
+      Oper::Div => Expr::Div(Box::new(acc), Box::new(expr)),
+    }
+  })
+}
+
+fn term(i: &str) -> IResult<&str, Expr> {
+  let (i, initial) = factor(i)?;
+  let (i, remainder) = many0(alt((
+    |i| {
+      let (i, mul) = preceded(tag("*"), factor)(i)?;
+      Ok((i, (Oper::Mul, mul)))
+    },
+    |i| {
+      let (i, div) = preceded(tag("/"), factor)(i)?;
+      Ok((i, (Oper::Div, div)))
+    },
+  )))(i)?;
+
+  Ok((i, fold_exprs(initial, remainder)))
+}
+
+fn expr(i: &str) -> IResult<&str, Expr> {
+  let (i, initial) = term(i)?;
+  let (i, remainder) = many0(alt((
+    |i| {
+      let (i, add) = preceded(tag("+"), term)(i)?;
+      Ok((i, (Oper::Add, add)))
+    },
+    |i| {
+      let (i, sub) = preceded(tag("-"), term)(i)?;
+      Ok((i, (Oper::Sub, sub)))
+    },
+  )))(i)?;
+
+  Ok((i, fold_exprs(initial, remainder)))
+}
+
+#[test]
+fn factor_test() {
+  assert_eq!(
+    factor("  3  ").map(|(i, x)| (i, format!("{:?}", x))),
+    Ok(("", String::from("3")))
+  );
+}
+
+#[test]
+fn term_test() {
+  assert_eq!(
+    term(" 3 *  5   ").map(|(i, x)| (i, format!("{:?}", x))),
+    Ok(("", String::from("(3 * 5)")))
+  );
+}
+
+#[test]
+fn expr_test() {
+  assert_eq!(
+    expr(" 1 + 2 *  3 ").map(|(i, x)| (i, format!("{:?}", x))),
+    Ok(("", String::from("(1 + (2 * 3))")))
+  );
+  assert_eq!(
+    expr(" 1 + 2 *  3 / 4 - 5 ").map(|(i, x)| (i, format!("{:?}", x))),
+    Ok(("", String::from("((1 + ((2 * 3) / 4)) - 5)")))
+  );
+  assert_eq!(
+    expr(" 72 / 2 / 3 ").map(|(i, x)| (i, format!("{:?}", x))),
+    Ok(("", String::from("((72 / 2) / 3)")))
+  );
+}
+
+#[test]
+fn parens_test() {
+  assert_eq!(
+    expr(" ( 1 + 2 ) *  3 ").map(|(i, x)| (i, format!("{:?}", x))),
+    Ok(("", String::from("([(1 + 2)] * 3)")))
+  );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/arithmetic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/arithmetic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/arithmetic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/arithmetic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+extern crate nom;
+
+use nom::{
+  branch::alt,
+  bytes::complete::tag,
+  character::complete::char,
+  character::complete::{digit1 as digit, space0 as space},
+  combinator::map_res,
+  multi::fold_many0,
+  sequence::{delimited, pair},
+  IResult,
+};
+
+// Parser definition
+
+use std::str::FromStr;
+
+// We parse any expr surrounded by parens, ignoring all whitespaces around those
+fn parens(i: &str) -> IResult<&str, i64> {
+  delimited(space, delimited(tag("("), expr, tag(")")), space)(i)
+}
+
+// We transform an integer string into a i64, ignoring surrounding whitespaces
+// We look for a digit suite, and try to convert it.
+// If either str::from_utf8 or FromStr::from_str fail,
+// we fallback to the parens parser defined above
+fn factor(i: &str) -> IResult<&str, i64> {
+  alt((
+    map_res(delimited(space, digit, space), FromStr::from_str),
+    parens,
+  ))(i)
+}
+
+// We read an initial factor and for each time we find
+// a * or / operator followed by another factor, we do
+// the math by folding everything
+fn term(i: &str) -> IResult<&str, i64> {
+  let (i, init) = factor(i)?;
+
+  fold_many0(
+    pair(alt((char('*'), char('/'))), factor),
+    init,
+    |acc, (op, val): (char, i64)| {
+      if op == '*' {
+        acc * val
+      } else {
+        acc / val
+      }
+    },
+  )(i)
+}
+
+fn expr(i: &str) -> IResult<&str, i64> {
+  let (i, init) = term(i)?;
+
+  fold_many0(
+    pair(alt((char('+'), char('-'))), term),
+    init,
+    |acc, (op, val): (char, i64)| {
+      if op == '+' {
+        acc + val
+      } else {
+        acc - val
+      }
+    },
+  )(i)
+}
+
+#[test]
+fn factor_test() {
+  assert_eq!(factor("3"), Ok(("", 3)));
+  assert_eq!(factor(" 12"), Ok(("", 12)));
+  assert_eq!(factor("537  "), Ok(("", 537)));
+  assert_eq!(factor("  24   "), Ok(("", 24)));
+}
+
+#[test]
+fn term_test() {
+  assert_eq!(term(" 12 *2 /  3"), Ok(("", 8)));
+  assert_eq!(term(" 2* 3  *2 *2 /  3"), Ok(("", 8)));
+  assert_eq!(term(" 48 /  3/2"), Ok(("", 8)));
+}
+
+#[test]
+fn expr_test() {
+  assert_eq!(expr(" 1 +  2 "), Ok(("", 3)));
+  assert_eq!(expr(" 12 + 6 - 4+  3"), Ok(("", 17)));
+  assert_eq!(expr(" 1 + 2*3 + 4"), Ok(("", 11)));
+}
+
+#[test]
+fn parens_test() {
+  assert_eq!(expr(" (  2 )"), Ok(("", 2)));
+  assert_eq!(expr(" 2* (  3 + 4 ) "), Ok(("", 14)));
+  assert_eq!(expr("  2*2 / ( 5 - 1) + 3"), Ok(("", 4)));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/bitstream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/bitstream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/bitstream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/bitstream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,32 @@
+#![cfg(feature = "bitvec")]
+
+use bitvec::prelude::*;
+use nom::{
+  bytes::complete::{tag, take},
+  combinator::map,
+  IResult,
+};
+
+#[test]
+fn parse_bitstream() {
+  let data = [0xA5u8, 0x69, 0xF0, 0xC3];
+  let bits = data.view_bits::<Msb0>();
+
+  fn parser(bits: &BitSlice<Msb0, u8>) -> IResult<&BitSlice<Msb0, u8>, &BitSlice<Msb0, u8>> {
+    tag(bits![1, 0, 1, 0])(bits)
+  }
+
+  assert_eq!(parser(bits), Ok((&bits[4..], &bits[..4])));
+}
+
+#[test]
+fn parse_bitstream_map() {
+  let data = [0b1000_0000];
+  let bits = data.view_bits::<Msb0>();
+
+  fn parser(bits: &BitSlice<Msb0, u8>) -> IResult<&BitSlice<Msb0, u8>, bool> {
+    map(take(1_u8), |val: &BitSlice<Msb0, u8>| val[0])(bits)
+  }
+
+  assert_eq!(parser(bits), Ok((&bits[1..], true)));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/blockbuf-arithmetic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/blockbuf-arithmetic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/blockbuf-arithmetic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/blockbuf-arithmetic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,321 @@
+/*
+#[macro_use]
+extern crate nom;
+extern crate bytes;
+
+use nom::{Compare,CompareResult,InputLength,InputIter,Slice,HexDisplay};
+
+use std::str;
+use std::str::FromStr;
+use bytes::{Buf,MutBuf};
+use bytes::buf::{BlockBuf,BlockBufCursor};
+use std::ops::{Range,RangeTo,RangeFrom,RangeFull};
+use std::iter::{Enumerate,Iterator};
+use std::fmt;
+use std::cmp::{min,PartialEq};
+
+#[derive(Clone,Copy)]
+#[repr(C)]
+pub struct BlockSlice<'a> {
+  buf: &'a BlockBuf,
+  start: usize,
+  end:   usize,
+}
+
+impl<'a> BlockSlice<'a> {
+  fn cursor(&self) -> WrapCursor<'a> {
+    let mut cur = self.buf.buf();
+    cur.advance(self.start);
+    WrapCursor {
+      cursor: cur,
+      length: self.end - self.start,
+    }
+  }
+}
+
+impl<'a> fmt::Debug for BlockSlice<'a> {
+  fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    write!(f, "BlockSlice {{ start: {}, end: {}, data:\n{}\n}}", self.start, self.end, self.buf.bytes().unwrap_or(&b""[..]).to_hex(16))
+  }
+}
+
+impl<'a> PartialEq for BlockSlice<'a> {
+  fn eq(&self, other: &BlockSlice<'a>) -> bool {
+    let bufs = (self.buf as *const BlockBuf) == (other.buf as *const BlockBuf);
+    self.start == other.start && self.end == other.end && bufs
+  }
+}
+
+impl<'a> Slice<Range<usize>> for BlockSlice<'a> {
+  fn slice(&self, range:Range<usize>) -> Self {
+    BlockSlice {
+      buf:   self.buf,
+      start: self.start + range.start,
+      //FIXME: check for valid end here
+      end:   self.start + range.end,
+    }
+  }
+}
+
+impl<'a> Slice<RangeTo<usize>> for BlockSlice<'a> {
+  fn slice(&self, range:RangeTo<usize>) -> Self {
+    self.slice(0..range.end)
+  }
+}
+
+impl<'a> Slice<RangeFrom<usize>> for BlockSlice<'a> {
+  fn slice(&self, range:RangeFrom<usize>) -> Self {
+    self.slice(range.start..self.end - self.start)
+  }
+}
+
+impl<'a> Slice<RangeFull> for BlockSlice<'a> {
+  fn slice(&self, _:RangeFull) -> Self {
+    BlockSlice {
+      buf:   self.buf,
+      start: self.start,
+      end:   self.end,
+    }
+  }
+}
+
+
+impl<'a> InputIter for BlockSlice<'a> {
+    type Item     = u8;
+    type RawItem  = u8;
+    type Iter     = Enumerate<WrapCursor<'a>>;
+    type IterElem = WrapCursor<'a>;
+
+    fn iter_indices(&self)  -> Self::Iter {
+      self.cursor().enumerate()
+    }
+    fn iter_elements(&self) -> Self::IterElem {
+      self.cursor()
+    }
+    fn position<P>(&self, predicate: P) -> Option<usize> where P: Fn(Self::RawItem) -> bool {
+      self.cursor().position(|b| predicate(b))
+    }
+    fn slice_index(&self, count:usize) -> Option<usize> {
+      if self.end - self.start >= count {
+        Some(count)
+      } else {
+        None
+      }
+    }
+}
+
+
+impl<'a> InputLength for BlockSlice<'a> {
+  fn input_len(&self) -> usize {
+    self.end - self.start
+  }
+}
+
+impl<'a,'b> Compare<&'b[u8]> for BlockSlice<'a> {
+  fn compare(&self, t: &'b[u8]) -> CompareResult {
+    let len     = self.end - self.start;
+    let blen    = t.len();
+    let m       = if len < blen { len } else { blen };
+    let reduced = self.slice(..m);
+    let b       = &t[..m];
+
+    for (a,b) in reduced.cursor().zip(b.iter()) {
+      if a != *b {
+        return CompareResult::Error;
+      }
+    }
+    if m < blen {
+      CompareResult::Incomplete
+    } else {
+      CompareResult::Ok
+    }
+  }
+
+
+  #[inline(always)]
+  fn compare_no_case(&self, t: &'b[u8]) -> CompareResult {
+    let len     = self.end - self.start;
+    let blen    = t.len();
+    let m       = if len < blen { len } else { blen };
+    let reduced = self.slice(..m);
+    let other   = &t[..m];
+
+    if !reduced.cursor().zip(other).all(|(a, b)| {
+      match (a,*b) {
+        (0...64, 0...64) | (91...96, 91...96) | (123...255, 123...255) => a == *b,
+        (65...90, 65...90) | (97...122, 97...122) | (65...90, 97...122 ) |(97...122, 65...90) => {
+          a & 0b01000000 == *b & 0b01000000
+        }
+        _ => false
+      }
+    }) {
+      CompareResult::Error
+    } else if m < blen {
+      CompareResult::Incomplete
+    } else {
+      CompareResult::Ok
+    }
+  }
+}
+
+impl<'a,'b> Compare<&'b str> for BlockSlice<'a> {
+  fn compare(&self, t: &'b str) -> CompareResult {
+    self.compare(str::as_bytes(t))
+  }
+  fn compare_no_case(&self, t: &'b str) -> CompareResult {
+    self.compare_no_case(str::as_bytes(t))
+  }
+}
+
+//Wrapper to implement Iterator on BlockBufCursor
+pub struct WrapCursor<'a> {
+  pub cursor: BlockBufCursor<'a>,
+  pub length: usize,
+}
+
+impl<'a> Iterator for WrapCursor<'a> {
+  type Item = u8;
+  fn next(&mut self) -> Option<u8> {
+    //println!("NEXT: length={}, remaining={}", self.length, self.cursor.remaining());
+    if min(self.length, self.cursor.remaining()) > 0 {
+      self.length -=1;
+      Some(self.cursor.read_u8())
+    } else {
+      None
+    }
+  }
+}
+
+//Reimplement eat_separator instead of fixing iterators
+#[macro_export]
+macro_rules! block_eat_separator (
+  ($i:expr, $arr:expr) => (
+    {
+      use nom::{InputLength,InputIter,Slice};
+      if ($i).input_len() == 0 {
+        Ok(($i, ($i).slice(0..0)))
+      } else {
+        match ($i).iter_indices().position(|(_, item)| {
+          for (_,c) in ($arr).iter_indices() {
+            if *c == item { return false; }
+          }
+          true
+        }) {
+          Some(index) => {
+            Ok((($i).slice(index..), ($i).slice(..index)))
+          },
+          None => {
+            Ok((($i).slice(($i).input_len()..), $i))
+          }
+        }
+      }
+    }
+  )
+);
+
+#[macro_export]
+macro_rules! block_named (
+  ($name:ident, $submac:ident!( $($args:tt)* )) => (
+    fn $name<'a>( i: BlockSlice<'a> ) -> nom::IResult<BlockSlice<'a>, BlockSlice<'a>, u32> {
+      $submac!(i, $($args)*)
+    }
+  );
+  ($name:ident<$o:ty>, $submac:ident!( $($args:tt)* )) => (
+    fn $name<'a>( i: BlockSlice<'a> ) -> nom::IResult<BlockSlice<'a>, $o, u32> {
+      $submac!(i, $($args)*)
+    }
+  );
+);
+
+block_named!(sp, block_eat_separator!(&b" \t\r\n"[..]));
+
+macro_rules! block_ws (
+  ($i:expr, $($args:tt)*) => (
+    {
+      sep!($i, sp, $($args)*)
+    }
+  )
+);
+
+block_named!(digit, is_a!("0123456789"));
+
+block_named!(parens<i64>, block_ws!(delimited!( tag!("("), expr, tag!(")") )) );
+
+
+block_named!(factor<i64>, alt!(
+      map_res!(
+        block_ws!(digit),
+        to_i64
+    )
+  | parens
+  )
+);
+
+block_named!(term <i64>, do_parse!(
+    init: factor >>
+    res:  fold_many0!(
+        pair!(alt!(tag!("*") | tag!("/")), factor),
+        init,
+        |acc, (op, val): (BlockSlice, i64)| {
+            if (op.cursor().next().unwrap() as char) == '*' { acc * val } else { acc / val }
+        }
+    ) >>
+    (res)
+  )
+);
+
+block_named!(expr <i64>, do_parse!(
+    init: term >>
+    res:  fold_many0!(
+        pair!(alt!(tag!("+") | tag!("-")), term),
+        init,
+        |acc, (op, val): (BlockSlice, i64)| {
+            if (op.cursor().next().unwrap() as char) == '+' { acc + val } else { acc - val }
+        }
+    ) >>
+    (res)
+  )
+);
+
+
+fn blockbuf_from(input: &[u8]) -> BlockBuf {
+  let mut b = BlockBuf::new(2, 100);
+  b.copy_from(input);
+  b
+}
+
+
+fn sl<'a>(input: &'a BlockBuf) -> BlockSlice<'a> {
+  BlockSlice {
+    buf: input,
+    start: 0,
+    end:   input.len(),
+  }
+}
+
+fn to_i64<'a>(input: BlockSlice<'a>) -> Result<i64, ()> {
+  let v: Vec<u8> = input.cursor().collect();
+
+  match str::from_utf8(&v) {
+    Err(_) => Err(()),
+    Ok(s) => match FromStr::from_str(s) {
+      Err(_) => Err(()),
+      Ok(i)  => Ok(i)
+    }
+  }
+}
+
+#[test]
+fn factor_test() {
+  let a = blockbuf_from(&b"3"[..]);
+  println!("calculated: {:?}", factor(sl(&a)));
+}
+
+#[test]
+fn parens_test() {
+  let input1 = blockbuf_from(&b" 2* (  3 + 4 ) "[..]);
+  println!("calculated 1: {:?}", expr(sl(&input1)));
+  let input2 = blockbuf_from(&b"  2*2 / ( 5 - 1) + 3"[..]);
+  println!("calculated 2: {:?}", expr(sl(&input2)));
+}
+*/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/css.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/css.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/css.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/css.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+extern crate nom;
+
+use nom::bytes::complete::{tag, take_while_m_n};
+use nom::combinator::map_res;
+use nom::sequence::tuple;
+use nom::IResult;
+
+#[derive(Debug, PartialEq)]
+pub struct Color {
+  pub red: u8,
+  pub green: u8,
+  pub blue: u8,
+}
+
+fn from_hex(input: &str) -> Result<u8, std::num::ParseIntError> {
+  u8::from_str_radix(input, 16)
+}
+
+fn is_hex_digit(c: char) -> bool {
+  c.is_digit(16)
+}
+
+fn hex_primary(input: &str) -> IResult<&str, u8> {
+  map_res(take_while_m_n(2, 2, is_hex_digit), from_hex)(input)
+}
+
+fn hex_color(input: &str) -> IResult<&str, Color> {
+  let (input, _) = tag("#")(input)?;
+  let (input, (red, green, blue)) = tuple((hex_primary, hex_primary, hex_primary))(input)?;
+
+  Ok((input, Color { red, green, blue }))
+}
+
+#[test]
+fn parse_color() {
+  assert_eq!(
+    hex_color("#2F14DF"),
+    Ok((
+      "",
+      Color {
+        red: 47,
+        green: 20,
+        blue: 223,
+      }
+    ))
+  );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/custom_errors.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/custom_errors.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/custom_errors.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/custom_errors.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,49 @@
+#![allow(dead_code)]
+#![cfg_attr(feature = "cargo-clippy", allow(block_in_if_condition_stmt))]
+
+#[macro_use]
+extern crate nom;
+
+use nom::character::streaming::digit1 as digit;
+use nom::error::{ErrorKind, ParseError};
+use nom::IResult;
+
+use std::convert::From;
+
+#[derive(Debug)]
+pub struct CustomError(String);
+
+impl<'a> From<(&'a str, ErrorKind)> for CustomError {
+  fn from(error: (&'a str, ErrorKind)) -> Self {
+    CustomError(format!("error code was: {:?}", error))
+  }
+}
+
+impl<'a> ParseError<&'a str> for CustomError {
+  fn from_error_kind(_: &'a str, kind: ErrorKind) -> Self {
+    CustomError(format!("error code was: {:?}", kind))
+  }
+
+  fn append(_: &'a str, kind: ErrorKind, other: CustomError) -> Self {
+    CustomError(format!("{:?}\nerror code was: {:?}", other, kind))
+  }
+}
+
+fn test1(input: &str) -> IResult<&str, &str, CustomError> {
+  //fix_error!(input, CustomError, tag!("abcd"))
+  tag!(input, "abcd")
+}
+
+fn test2(input: &str) -> IResult<&str, &str, CustomError> {
+  //terminated!(input, test1, fix_error!(CustomError, digit))
+  terminated!(input, test1, digit)
+}
+
+fn test3(input: &str) -> IResult<&str, &str, CustomError> {
+  verify!(input, test1, |s: &str| { s.starts_with("abcd") })
+}
+
+#[cfg(feature = "alloc")]
+fn test4(input: &str) -> IResult<&str, Vec<&str>, CustomError> {
+  count!(input, test1, 4)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/escaped.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/escaped.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/escaped.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/escaped.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,28 @@
+use nom::bytes::complete::escaped;
+use nom::character::complete::digit1;
+use nom::character::complete::one_of;
+use nom::{error::ErrorKind, Err, IResult};
+
+fn esc(s: &str) -> IResult<&str, &str, (&str, ErrorKind)> {
+  escaped(digit1, '\\', one_of("\"n\\"))(s)
+}
+
+#[cfg(feature = "alloc")]
+fn esc_trans(s: &str) -> IResult<&str, String, (&str, ErrorKind)> {
+  use nom::bytes::complete::{escaped_transform, tag};
+  escaped_transform(digit1, '\\', tag("n"))(s)
+}
+
+#[test]
+fn test_escaped() {
+  assert_eq!(esc("abcd"), Err(Err::Error(("abcd", ErrorKind::Escaped))));
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn test_escaped_transform() {
+  assert_eq!(
+    esc_trans("abcd"),
+    Err(Err::Error(("abcd", ErrorKind::EscapedTransform)))
+  );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/float.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/float.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/float.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/float.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+#[macro_use]
+extern crate nom;
+
+use nom::character::streaming::digit1 as digit;
+
+use std::str;
+use std::str::FromStr;
+
+named!(
+  unsigned_float<f32>,
+  map_res!(
+    map_res!(
+      recognize!(alt!(
+        delimited!(digit, tag!("."), opt!(digit)) | delimited!(opt!(digit), tag!("."), digit)
+      )),
+      str::from_utf8
+    ),
+    FromStr::from_str
+  )
+);
+
+named!(
+  float<f32>,
+  map!(
+    pair!(opt!(alt!(tag!("+") | tag!("-"))), unsigned_float),
+    |(sign, value): (Option<&[u8]>, f32)| sign
+      .and_then(|s| if s[0] == b'-' { Some(-1f32) } else { None })
+      .unwrap_or(1f32)
+      * value
+  )
+);
+
+#[test]
+fn unsigned_float_test() {
+  assert_eq!(unsigned_float(&b"123.456;"[..]), Ok((&b";"[..], 123.456)));
+  assert_eq!(unsigned_float(&b"0.123;"[..]), Ok((&b";"[..], 0.123)));
+  assert_eq!(unsigned_float(&b"123.0;"[..]), Ok((&b";"[..], 123.0)));
+  assert_eq!(unsigned_float(&b"123.;"[..]), Ok((&b";"[..], 123.0)));
+  assert_eq!(unsigned_float(&b".123;"[..]), Ok((&b";"[..], 0.123)));
+}
+
+#[test]
+fn float_test() {
+  assert_eq!(float(&b"123.456;"[..]), Ok((&b";"[..], 123.456)));
+  assert_eq!(float(&b"+123.456;"[..]), Ok((&b";"[..], 123.456)));
+  assert_eq!(float(&b"-123.456;"[..]), Ok((&b";"[..], -123.456)));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/fnmut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/fnmut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/fnmut.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/fnmut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+extern crate nom;
+
+use nom::{
+  bytes::complete::tag,
+  multi::{many0, many0_count},
+};
+
+#[test]
+fn parse() {
+  let mut counter = 0;
+
+  let res = {
+    let mut parser = many0::<_, _, (), _>(|i| {
+      counter += 1;
+      tag("abc")(i)
+    });
+
+    parser("abcabcabcabc").unwrap()
+  };
+
+  println!("res: {:?}", res);
+  assert_eq!(counter, 5);
+}
+
+#[test]
+fn accumulate() {
+  let mut v = Vec::new();
+
+  let (_, count) = {
+    let mut parser = many0_count::<_, _, (), _>(|i| {
+      let (i, o) = tag("abc")(i)?;
+      v.push(o);
+      Ok((i, ()))
+    });
+    parser("abcabcabcabc").unwrap()
+  };
+
+  println!("v: {:?}", v);
+  assert_eq!(count, 4);
+  assert_eq!(v.len(), 4);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/inference.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/inference.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/inference.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/inference.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,54 @@
+//! test type inference issues in parsee compilation
+//#![feature(trace_macros)]
+#![allow(dead_code)]
+#![allow(unused_comparisons)]
+#![allow(unused_variables)]
+#![allow(unused_imports)]
+
+#[macro_use]
+extern crate nom;
+
+use nom::character::{is_digit, streaming::alpha1 as alpha};
+use std::str;
+
+// issue #617
+named!(multi<&[u8], () >, fold_many0!( take_while1!( is_digit ), (), |_, _| {}));
+
+// issue #561
+#[cfg(feature = "alloc")]
+named!(
+  value<Vec<Vec<&str>>>,
+  do_parse!(
+    first_line: map_res!(is_not!("\n"), std::str::from_utf8)
+      >> rest:
+        many_m_n!(
+          0,
+          1,
+          separated_list0!(
+            tag!("\n\t"),
+            map_res!(take_while!(call!(|c| c != b'\n')), std::str::from_utf8)
+          )
+        )
+      >> (rest)
+  )
+);
+
+// issue #534
+#[cfg(feature = "alloc")]
+fn wrap_suffix(input: &Option<Vec<&[u8]>>) -> Option<String> {
+  if input.is_some() {
+    // I've tried both of the lines below individually and get the same error.
+    Some("hello".to_string())
+  //Some(str::from_utf8(u).expect("Found invalid UTF-8").to_string())
+  } else {
+    None
+  }
+}
+
+#[cfg(feature = "alloc")]
+named!(parse_suffix<&[u8],Option<String>>,do_parse!(
+  u: opt!(many1!(alt!(
+    complete!(tag!("%")) | complete!(tag!("#"))  | complete!(tag!("@")) | complete!(alpha)
+  ))) >>
+  (wrap_suffix(&u))
+));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/ini.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/ini.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/ini.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/ini.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,226 @@
+#[macro_use]
+extern crate nom;
+
+use nom::{
+  bytes::complete::take_while,
+  character::complete::{
+    alphanumeric1 as alphanumeric, char, multispace0 as multispace, space0 as space,
+  },
+  combinator::map_res,
+  sequence::delimited,
+  IResult,
+};
+
+use std::collections::HashMap;
+use std::str;
+
+fn category(i: &[u8]) -> IResult<&[u8], &str> {
+  map_res(
+    delimited(char('['), take_while(|c| c != b']'), char(']')),
+    str::from_utf8,
+  )(i)
+}
+
+fn complete_byte_slice_to_str<'a>(s: &'a [u8]) -> Result<&'a str, str::Utf8Error> {
+  str::from_utf8(s)
+}
+
+named!(key_value    <&[u8],(&str,&str)>,
+  do_parse!(
+     key: map_res!(alphanumeric, complete_byte_slice_to_str)
+  >>      opt!(space)
+  >>      char!('=')
+  >>      opt!(space)
+  >> val: map_res!(
+           take_while!(call!(|c| c != b'\n' && c != b';')),
+           complete_byte_slice_to_str
+         )
+  >>      opt!(pair!(char!(';'), take_while!(call!(|c| c != b'\n'))))
+  >>      (key, val)
+  )
+);
+
+named!(keys_and_values<&[u8], HashMap<&str, &str> >,
+  map!(
+    many0!(terminated!(key_value, opt!(multispace))),
+    |vec: Vec<_>| vec.into_iter().collect()
+  )
+);
+
+named!(category_and_keys<&[u8],(&str,HashMap<&str,&str>)>,
+  do_parse!(
+    category: category         >>
+              opt!(multispace) >>
+    keys: keys_and_values      >>
+    (category, keys)
+  )
+);
+
+named!(categories<&[u8], HashMap<&str, HashMap<&str,&str> > >,
+  map!(
+    many0!(
+      separated_pair!(
+        category,
+        opt!(multispace),
+        map!(
+          many0!(terminated!(key_value, opt!(multispace))),
+          |vec: Vec<_>| vec.into_iter().collect()
+        )
+      )
+    ),
+    |vec: Vec<_>| vec.into_iter().collect()
+  )
+);
+
+#[test]
+fn parse_category_test() {
+  let ini_file = &b"[category]
+
+parameter=value
+key = value2"[..];
+
+  let ini_without_category = &b"\n\nparameter=value
+key = value2"[..];
+
+  let res = category(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, o)) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o),
+    _ => println!("error"),
+  }
+
+  assert_eq!(res, Ok((ini_without_category, "category")));
+}
+
+#[test]
+fn parse_key_value_test() {
+  let ini_file = &b"parameter=value
+key = value2"[..];
+
+  let ini_without_key_value = &b"\nkey = value2"[..];
+
+  let res = key_value(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, (o1, o2))) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2),
+    _ => println!("error"),
+  }
+
+  assert_eq!(res, Ok((ini_without_key_value, ("parameter", "value"))));
+}
+
+#[test]
+fn parse_key_value_with_space_test() {
+  let ini_file = &b"parameter = value
+key = value2"[..];
+
+  let ini_without_key_value = &b"\nkey = value2"[..];
+
+  let res = key_value(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, (o1, o2))) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2),
+    _ => println!("error"),
+  }
+
+  assert_eq!(res, Ok((ini_without_key_value, ("parameter", "value"))));
+}
+
+#[test]
+fn parse_key_value_with_comment_test() {
+  let ini_file = &b"parameter=value;abc
+key = value2"[..];
+
+  let ini_without_key_value = &b"\nkey = value2"[..];
+
+  let res = key_value(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, (o1, o2))) => println!("i: {:?} | o: ({:?},{:?})", str::from_utf8(i), o1, o2),
+    _ => println!("error"),
+  }
+
+  assert_eq!(res, Ok((ini_without_key_value, ("parameter", "value"))));
+}
+
+#[test]
+fn parse_multiple_keys_and_values_test() {
+  let ini_file = &b"parameter=value;abc
+
+key = value2
+
+[category]"[..];
+
+  let ini_without_key_value = &b"[category]"[..];
+
+  let res = keys_and_values(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, ref o)) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o),
+    _ => println!("error"),
+  }
+
+  let mut expected: HashMap<&str, &str> = HashMap::new();
+  expected.insert("parameter", "value");
+  expected.insert("key", "value2");
+  assert_eq!(res, Ok((ini_without_key_value, expected)));
+}
+
+#[test]
+fn parse_category_then_multiple_keys_and_values_test() {
+  //FIXME: there can be an empty line or a comment line after a category
+  let ini_file = &b"[abcd]
+parameter=value;abc
+
+key = value2
+
+[category]"[..];
+
+  let ini_after_parser = &b"[category]"[..];
+
+  let res = category_and_keys(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, ref o)) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o),
+    _ => println!("error"),
+  }
+
+  let mut expected_h: HashMap<&str, &str> = HashMap::new();
+  expected_h.insert("parameter", "value");
+  expected_h.insert("key", "value2");
+  assert_eq!(res, Ok((ini_after_parser, ("abcd", expected_h))));
+}
+
+#[test]
+fn parse_multiple_categories_test() {
+  let ini_file = &b"[abcd]
+
+parameter=value;abc
+
+key = value2
+
+[category]
+parameter3=value3
+key4 = value4
+"[..];
+
+  let ini_after_parser = &b""[..];
+
+  let res = categories(ini_file);
+  //println!("{:?}", res);
+  match res {
+    Ok((i, ref o)) => println!("i: {:?} | o: {:?}", str::from_utf8(i), o),
+    _ => println!("error"),
+  }
+
+  let mut expected_1: HashMap<&str, &str> = HashMap::new();
+  expected_1.insert("parameter", "value");
+  expected_1.insert("key", "value2");
+  let mut expected_2: HashMap<&str, &str> = HashMap::new();
+  expected_2.insert("parameter3", "value3");
+  expected_2.insert("key4", "value4");
+  let mut expected_h: HashMap<&str, HashMap<&str, &str>> = HashMap::new();
+  expected_h.insert("abcd", expected_1);
+  expected_h.insert("category", expected_2);
+  assert_eq!(res, Ok((ini_after_parser, expected_h)));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/ini_str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/ini_str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/ini_str.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/ini_str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,218 @@
+#[macro_use]
+extern crate nom;
+
+use nom::{
+  bytes::complete::{is_a, take_while},
+  character::complete::{alphanumeric1 as alphanumeric, char, space0 as space},
+  combinator::opt,
+  sequence::{delimited, terminated},
+  IResult,
+};
+
+use std::collections::HashMap;
+
+fn is_line_ending_or_comment(chr: char) -> bool {
+  chr == ';' || chr == '\n'
+}
+
+fn not_line_ending(i: &str) -> IResult<&str, &str> {
+  take_while(|c| c != '\r' && c != '\n')(i)
+}
+
+fn space_or_line_ending(i: &str) -> IResult<&str, &str> {
+  is_a(" \r\n")(i)
+}
+
+fn category(i: &str) -> IResult<&str, &str> {
+  terminated(
+    delimited(char('['), take_while(|c| c != ']'), char(']')),
+    opt(is_a(" \r\n")),
+  )(i)
+}
+
+named!(key_value    <&str,(&str,&str)>,
+  do_parse!(
+    key: alphanumeric                              >>
+         opt!(space)                               >>
+         tag!("=")                               >>
+         opt!(space)                               >>
+    val: take_till!(is_line_ending_or_comment)   >>
+         opt!(space)                               >>
+         opt!(pair!(tag!(";"), not_line_ending)) >>
+         opt!(space_or_line_ending)                >>
+    (key, val)
+  )
+);
+
+named!(keys_and_values_aggregator<&str, Vec<(&str, &str)> >, many0!(key_value));
+
+fn keys_and_values(input: &str) -> IResult<&str, HashMap<&str, &str>> {
+  match keys_and_values_aggregator(input) {
+    Ok((i, tuple_vec)) => Ok((i, tuple_vec.into_iter().collect())),
+    Err(e) => Err(e),
+  }
+}
+
+named!(category_and_keys<&str,(&str,HashMap<&str,&str>)>,
+  pair!(category, keys_and_values)
+);
+
+named!(categories_aggregator<&str, Vec<(&str, HashMap<&str,&str>)> >, many0!(category_and_keys));
+
+fn categories(input: &str) -> IResult<&str, HashMap<&str, HashMap<&str, &str>>> {
+  match categories_aggregator(input) {
+    Ok((i, tuple_vec)) => Ok((i, tuple_vec.into_iter().collect())),
+    Err(e) => Err(e),
+  }
+}
+
+#[test]
+fn parse_category_test() {
+  let ini_file = "[category]
+
+parameter=value
+key = value2";
+
+  let ini_without_category = "parameter=value
+key = value2";
+
+  let res = category(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, o)) => println!("i: {} | o: {:?}", i, o),
+    _ => println!("error"),
+  }
+
+  assert_eq!(res, Ok((ini_without_category, "category")));
+}
+
+#[test]
+fn parse_key_value_test() {
+  let ini_file = "parameter=value
+key = value2";
+
+  let ini_without_key_value = "key = value2";
+
+  let res = key_value(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, (o1, o2))) => println!("i: {} | o: ({:?},{:?})", i, o1, o2),
+    _ => println!("error"),
+  }
+
+  assert_eq!(res, Ok((ini_without_key_value, ("parameter", "value"))));
+}
+
+#[test]
+fn parse_key_value_with_space_test() {
+  let ini_file = "parameter = value
+key = value2";
+
+  let ini_without_key_value = "key = value2";
+
+  let res = key_value(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, (o1, o2))) => println!("i: {} | o: ({:?},{:?})", i, o1, o2),
+    _ => println!("error"),
+  }
+
+  assert_eq!(res, Ok((ini_without_key_value, ("parameter", "value"))));
+}
+
+#[test]
+fn parse_key_value_with_comment_test() {
+  let ini_file = "parameter=value;abc
+key = value2";
+
+  let ini_without_key_value = "key = value2";
+
+  let res = key_value(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, (o1, o2))) => println!("i: {} | o: ({:?},{:?})", i, o1, o2),
+    _ => println!("error"),
+  }
+
+  assert_eq!(res, Ok((ini_without_key_value, ("parameter", "value"))));
+}
+
+#[test]
+fn parse_multiple_keys_and_values_test() {
+  let ini_file = "parameter=value;abc
+
+key = value2
+
+[category]";
+
+  let ini_without_key_value = "[category]";
+
+  let res = keys_and_values(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, ref o)) => println!("i: {} | o: {:?}", i, o),
+    _ => println!("error"),
+  }
+
+  let mut expected: HashMap<&str, &str> = HashMap::new();
+  expected.insert("parameter", "value");
+  expected.insert("key", "value2");
+  assert_eq!(res, Ok((ini_without_key_value, expected)));
+}
+
+#[test]
+fn parse_category_then_multiple_keys_and_values_test() {
+  //FIXME: there can be an empty line or a comment line after a category
+  let ini_file = "[abcd]
+parameter=value;abc
+
+key = value2
+
+[category]";
+
+  let ini_after_parser = "[category]";
+
+  let res = category_and_keys(ini_file);
+  println!("{:?}", res);
+  match res {
+    Ok((i, ref o)) => println!("i: {} | o: {:?}", i, o),
+    _ => println!("error"),
+  }
+
+  let mut expected_h: HashMap<&str, &str> = HashMap::new();
+  expected_h.insert("parameter", "value");
+  expected_h.insert("key", "value2");
+  assert_eq!(res, Ok((ini_after_parser, ("abcd", expected_h))));
+}
+
+#[test]
+fn parse_multiple_categories_test() {
+  let ini_file = "[abcd]
+
+parameter=value;abc
+
+key = value2
+
+[category]
+parameter3=value3
+key4 = value4
+";
+
+  let res = categories(ini_file);
+  //println!("{:?}", res);
+  match res {
+    Ok((i, ref o)) => println!("i: {} | o: {:?}", i, o),
+    _ => println!("error"),
+  }
+
+  let mut expected_1: HashMap<&str, &str> = HashMap::new();
+  expected_1.insert("parameter", "value");
+  expected_1.insert("key", "value2");
+  let mut expected_2: HashMap<&str, &str> = HashMap::new();
+  expected_2.insert("parameter3", "value3");
+  expected_2.insert("key4", "value4");
+  let mut expected_h: HashMap<&str, HashMap<&str, &str>> = HashMap::new();
+  expected_h.insert("abcd", expected_1);
+  expected_h.insert("category", expected_2);
+  assert_eq!(res, Ok(("", expected_h)));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/issues.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/issues.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/issues.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/issues.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,360 @@
+//#![feature(trace_macros)]
+#![allow(dead_code)]
+#![cfg_attr(feature = "cargo-clippy", allow(redundant_closure))]
+
+#[macro_use]
+extern crate nom;
+
+use nom::{
+  character::{is_digit, streaming::space1 as space},
+  error::ErrorKind,
+  number::streaming::le_u64,
+  Err, IResult, Needed,
+};
+
+#[allow(dead_code)]
+struct Range {
+  start: char,
+  end: char,
+}
+
+pub fn take_char(input: &[u8]) -> IResult<&[u8], char> {
+  if !input.is_empty() {
+    Ok((&input[1..], input[0] as char))
+  } else {
+    Err(Err::Incomplete(Needed::new(1)))
+  }
+}
+
+//trace_macros!(true);
+
+#[allow(dead_code)]
+named!(range<&[u8], Range>,
+    alt!(
+        do_parse!(
+            start: take_char >>
+            tag!("-")        >>
+            end: take_char   >>
+            (Range {
+                start: start,
+                end:   end,
+            })
+        ) |
+        map!(
+            take_char,
+            |c| {
+                Range {
+                    start: c,
+                    end:   c,
+                }
+            }
+        )
+    )
+);
+
+#[allow(dead_code)]
+named!(literal<&[u8], Vec<char> >,
+    map!(
+        many1!(take_char),
+        |cs| {
+          cs
+        }
+    )
+);
+
+#[test]
+fn issue_58() {
+  let _ = range(&b"abcd"[..]);
+  let _ = literal(&b"abcd"[..]);
+}
+
+//trace_macros!(false);
+
+#[cfg(feature = "std")]
+mod parse_int {
+  use nom::HexDisplay;
+  use nom::{
+    character::streaming::{digit1 as digit, space1 as space},
+    IResult,
+  };
+  use std::str;
+
+  named!(parse_ints<Vec<i32>>, many0!(spaces_or_int));
+
+  fn spaces_or_int(input: &[u8]) -> IResult<&[u8], i32> {
+    println!("{}", input.to_hex(8));
+    do_parse!(
+      input,
+      opt!(complete!(space))
+        >> res: map!(complete!(digit), |x| {
+          println!("x: {:?}", x);
+          let result = str::from_utf8(x).unwrap();
+          println!("Result: {}", result);
+          println!("int is empty?: {}", x.is_empty());
+          match result.parse() {
+            Ok(i) => i,
+            Err(e) => panic!("UH OH! NOT A DIGIT! {:?}", e),
+          }
+        })
+        >> (res)
+    )
+  }
+
+  #[test]
+  fn issue_142() {
+    let subject = parse_ints(&b"12 34 5689a"[..]);
+    let expected = Ok((&b"a"[..], vec![12, 34, 5689]));
+    assert_eq!(subject, expected);
+
+    let subject = parse_ints(&b"12 34 5689 "[..]);
+    let expected = Ok((&b" "[..], vec![12, 34, 5689]));
+    assert_eq!(subject, expected)
+  }
+}
+
+#[test]
+fn usize_length_bytes_issue() {
+  use nom::number::streaming::be_u16;
+  let _: IResult<&[u8], &[u8], (&[u8], ErrorKind)> = length_data!(b"012346", be_u16);
+}
+
+/*
+ DOES NOT COMPILE
+#[test]
+fn issue_152() {
+  named!(take4, take!(4));
+  named!(xyz, tag!("XYZ"));
+  named!(abc, tag!("abc"));
+
+
+  named!(sw,
+    switch!(take4,
+      b"abcd" => xyz |
+      b"efgh" => abc
+    )
+  );
+}
+*/
+
+#[test]
+fn take_till_issue() {
+  named!(nothing, take_till!(call!(|_| true)));
+
+  assert_eq!(nothing(b""), Err(Err::Incomplete(Needed::new(1))));
+  assert_eq!(nothing(b"abc"), Ok((&b"abc"[..], &b""[..])));
+}
+
+named!(
+  issue_498<Vec<&[u8]>>,
+  separated_list1!(opt!(space), tag!("abcd"))
+);
+
+named!(issue_308(&str) -> bool,
+    do_parse! (
+        tag! ("foo") >>
+        b: alt! (
+            complete!(map! (tag! ("1"), |_: &str|->bool {true})) |
+            value! (false)
+        ) >>
+        (b) ));
+
+#[cfg(feature = "alloc")]
+fn issue_302(input: &[u8]) -> IResult<&[u8], Option<Vec<u64>>> {
+  do_parse!(input, entries: cond!(true, count!(le_u64, 3)) >> (entries))
+}
+
+#[test]
+fn issue_655() {
+  use nom::character::streaming::{line_ending, not_line_ending};
+  named!(twolines(&str) -> (&str, &str),
+    do_parse!(
+      l1 : not_line_ending >>
+           line_ending >>
+      l2 : not_line_ending >>
+           line_ending >>
+      ((l1, l2))
+    )
+  );
+
+  assert_eq!(twolines("foo\nbar\n"), Ok(("", ("foo", "bar"))));
+  assert_eq!(twolines("féo\nbar\n"), Ok(("", ("féo", "bar"))));
+  assert_eq!(twolines("foé\nbar\n"), Ok(("", ("foé", "bar"))));
+  assert_eq!(twolines("foé\r\nbar\n"), Ok(("", ("foé", "bar"))));
+}
+
+#[test]
+fn issue_721() {
+  named!(f1<&str, u16>, parse_to!(u16));
+  named!(f2<&str, String>, parse_to!(String));
+  assert_eq!(f1("1234"), Ok(("", 1234)));
+  assert_eq!(f2("foo"), Ok(("", "foo".to_string())));
+  //assert_eq!(parse_to!("1234", u16), Ok(("", 1234)));
+  //assert_eq!(parse_to!("foo", String), Ok(("", "foo".to_string())));
+}
+
+#[cfg(feature = "alloc")]
+named!(issue_717<&[u8], Vec<&[u8]> >,
+  separated_list0!(tag!([0x0]), is_not!([0x0u8]))
+);
+
+struct NoPartialEq {
+  value: i32,
+}
+
+named!(issue_724<&str, i32>,
+  do_parse!(
+    metadata: permutation!(
+      map!(tag!("hello"), |_| NoPartialEq { value: 1 }),
+      map!(tag!("world"), |_| NoPartialEq { value: 2 })
+    ) >>
+    (metadata.0.value + metadata.1.value)
+  )
+);
+
+#[test]
+fn issue_752() {
+  assert_eq!(
+    Err::Error(("ab", nom::error::ErrorKind::ParseTo)),
+    parse_to!("ab", usize).unwrap_err()
+  )
+}
+
+fn atom_specials(c: u8) -> bool {
+  c == b'q'
+}
+
+named!(
+  capability<&str>,
+  do_parse!(tag!(" ") >> _atom: map_res!(take_till1!(atom_specials), std::str::from_utf8) >> ("a"))
+);
+
+#[test]
+fn issue_759() {
+  assert_eq!(capability(b" abcqd"), Ok((&b"qd"[..], "a")));
+}
+
+named_args!(issue_771(count: usize)<Vec<u32>>,
+  length_count!(value!(count), call!(nom::number::streaming::be_u32))
+);
+
+/// This test is in a separate module to check that all required symbols are imported in
+/// `escaped_transform!()`. Without the module, the `use`-es of the current module would
+/// mask the error ('"Use of undeclared type or module `Needed`" in escaped_transform!').
+mod issue_780 {
+  named!(issue_780<&str, String>,
+    escaped_transform!(call!(::nom::character::streaming::alpha1), '\\', tag!("n"))
+  );
+}
+
+// issue 617
+named!(digits, take_while1!(is_digit));
+named!(multi_617<&[u8], () >, fold_many0!( digits, (), |_, _| {}));
+
+// Sad :(
+named!(multi_617_fails<&[u8], () >, fold_many0!( take_while1!( is_digit ), (), |_, _| {}));
+
+mod issue_647 {
+  use nom::{error::Error, number::streaming::be_f64, Err};
+  pub type Input<'a> = &'a [u8];
+
+  #[derive(PartialEq, Debug, Clone)]
+  struct Data {
+    c: f64,
+    v: Vec<f64>,
+  }
+
+  fn list<'a, 'b>(
+    input: Input<'a>,
+    _cs: &'b f64,
+  ) -> Result<(Input<'a>, Vec<f64>), Err<Error<&'a [u8]>>> {
+    separated_list0!(input, complete!(tag!(",")), complete!(be_f64))
+  }
+
+  named!(data<Input,Data>, map!(
+      do_parse!(
+          c: be_f64 >>
+          tag!("\n") >>
+          v: call!(list,&c) >>
+          (c,v)
+      ), |(c,v)| {
+          Data {
+              c: c,
+              v: v
+          }
+      }
+  ));
+}
+
+named!(issue_775, take_till1!(|_| true));
+
+#[test]
+fn issue_848_overflow_incomplete_bits_to_bytes() {
+  named!(take, take!(0x2000000000000000));
+  named!(parser<&[u8], &[u8]>, bits!(bytes!(take)));
+  assert_eq!(
+    parser(&b""[..]),
+    Err(Err::Failure(error_position!(&b""[..], ErrorKind::TooLarge)))
+  );
+}
+
+#[test]
+fn issue_942() {
+  use nom::error::{ContextError, ParseError};
+  pub fn parser<'a, E: ParseError<&'a str> + ContextError<&'a str>>(
+    i: &'a str,
+  ) -> IResult<&'a str, usize, E> {
+    use nom::{character::complete::char, error::context, multi::many0_count};
+    many0_count(context("char_a", char('a')))(i)
+  }
+  assert_eq!(parser::<()>("aaa"), Ok(("", 3)));
+}
+
+#[test]
+fn issue_many_m_n_with_zeros() {
+  use nom::character::complete::char;
+  use nom::multi::many_m_n;
+  let mut parser = many_m_n::<_, _, (), _>(0, 0, char('a'));
+  assert_eq!(parser("aaa"), Ok(("aaa", vec!())));
+}
+
+#[test]
+fn issue_1027_convert_error_panic_nonempty() {
+  use nom::character::complete::char;
+  use nom::error::{convert_error, VerboseError};
+  use nom::sequence::pair;
+
+  let input = "a";
+
+  let result: IResult<_, _, VerboseError<&str>> = pair(char('a'), char('b'))(input);
+  let err = match result.unwrap_err() {
+    Err::Error(e) => e,
+    _ => unreachable!(),
+  };
+
+  let msg = convert_error(input, err);
+  assert_eq!(
+    msg,
+    "0: at line 1:\na\n ^\nexpected \'b\', got end of input\n\n"
+  );
+}
+
+named!(issue_962<&[u8], Vec<&[u8]>>,
+    fold_many0!(
+        alt!(tag!("aaaa") | tag!("bbbb")),
+        Vec::new(), |mut acc: Vec<_>, item| {
+            acc.push(item);
+            acc
+        }
+    )
+);
+
+#[test]
+fn issue_1231_bits_expect_fn_closure() {
+  use nom::bits::{bits, complete::take};
+  use nom::error::Error;
+  use nom::sequence::tuple;
+  pub fn example(input: &[u8]) -> IResult<&[u8], (u8, u8)> {
+    bits::<_, _, Error<_>, _, _>(tuple((take(1usize), take(1usize))))(input)
+  }
+  assert_eq!(example(&[0xff]), Ok((&b""[..], (1, 1))));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/json.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/json.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/json.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/json.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,237 @@
+#![cfg(feature = "alloc")]
+extern crate nom;
+
+use nom::{
+  branch::alt,
+  bytes::complete::{tag, take},
+  character::complete::{anychar, char, multispace0, none_of},
+  combinator::{map, map_opt, map_res, value, verify},
+  error::ParseError,
+  multi::{fold_many0, separated_list0},
+  number::complete::double,
+  sequence::{delimited, preceded, separated_pair},
+  IResult, Parser,
+};
+
+use std::collections::HashMap;
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum JsonValue {
+  Null,
+  Bool(bool),
+  Str(String),
+  Num(f64),
+  Array(Vec<JsonValue>),
+  Object(HashMap<String, JsonValue>),
+}
+
+fn boolean(input: &str) -> IResult<&str, bool> {
+  alt((value(false, tag("false")), value(true, tag("true"))))(input)
+}
+
+fn u16_hex(input: &str) -> IResult<&str, u16> {
+  map_res(take(4usize), |s| u16::from_str_radix(s, 16))(input)
+}
+
+fn unicode_escape(input: &str) -> IResult<&str, char> {
+  map_opt(
+    alt((
+      // Not a surrogate
+      map(verify(u16_hex, |cp| !(0xD800..0xE000).contains(cp)), |cp| {
+        cp as u32
+      }),
+      // See https://en.wikipedia.org/wiki/UTF-16#Code_points_from_U+010000_to_U+10FFFF for details
+      map(
+        verify(
+          separated_pair(u16_hex, tag("\\u"), u16_hex),
+          |(high, low)| (0xD800..0xDC00).contains(high) && (0xDC00..0xE000).contains(low),
+        ),
+        |(high, low)| {
+          let high_ten = (high as u32) - 0xD800;
+          let low_ten = (low as u32) - 0xDC00;
+          (high_ten << 10) + low_ten + 0x10000
+        },
+      ),
+    )),
+    // Could be probably replaced with .unwrap() or _unchecked due to the verify checks
+    std::char::from_u32,
+  )(input)
+}
+
+fn character(input: &str) -> IResult<&str, char> {
+  let (input, c) = none_of("\"")(input)?;
+  if c == '\\' {
+    alt((
+      map_res(anychar, |c| {
+        Ok(match c {
+          '"' | '\\' | '/' => c,
+          'b' => '\x08',
+          'f' => '\x0C',
+          'n' => '\n',
+          'r' => '\r',
+          't' => '\t',
+          _ => return Err(()),
+        })
+      }),
+      preceded(char('u'), unicode_escape),
+    ))(input)
+  } else {
+    Ok((input, c))
+  }
+}
+
+fn string(input: &str) -> IResult<&str, String> {
+  delimited(
+    char('"'),
+    fold_many0(character, String::new(), |mut string, c| {
+      string.push(c);
+      string
+    }),
+    char('"'),
+  )(input)
+}
+
+fn ws<'a, O, E: ParseError<&'a str>, F: Parser<&'a str, O, E>>(f: F) -> impl Parser<&'a str, O, E> {
+  delimited(multispace0, f, multispace0)
+}
+
+fn array(input: &str) -> IResult<&str, Vec<JsonValue>> {
+  delimited(
+    char('['),
+    ws(separated_list0(ws(char(',')), json_value)),
+    char(']'),
+  )(input)
+}
+
+fn object(input: &str) -> IResult<&str, HashMap<String, JsonValue>> {
+  map(
+    delimited(
+      char('{'),
+      ws(separated_list0(
+        ws(char(',')),
+        separated_pair(string, ws(char(':')), json_value),
+      )),
+      char('}'),
+    ),
+    |key_values| key_values.into_iter().collect(),
+  )(input)
+}
+
+fn json_value(input: &str) -> IResult<&str, JsonValue> {
+  use JsonValue::*;
+
+  alt((
+    value(Null, tag("null")),
+    map(boolean, Bool),
+    map(string, Str),
+    map(double, Num),
+    map(array, Array),
+    map(object, Object),
+  ))(input)
+}
+
+fn json(input: &str) -> IResult<&str, JsonValue> {
+  ws(json_value).parse(input)
+}
+
+#[test]
+fn json_string() {
+  assert_eq!(string("\"\""), Ok(("", "".to_string())));
+  assert_eq!(string("\"abc\""), Ok(("", "abc".to_string())));
+  assert_eq!(
+    string("\"abc\\\"\\\\\\/\\b\\f\\n\\r\\t\\u0001\\u2014\u{2014}def\""),
+    Ok(("", "abc\"\\/\x08\x0C\n\r\t\x01——def".to_string())),
+  );
+  assert_eq!(string("\"\\uD83D\\uDE10\""), Ok(("", "�".to_string())));
+
+  assert!(string("\"").is_err());
+  assert!(string("\"abc").is_err());
+  assert!(string("\"\\\"").is_err());
+  assert!(string("\"\\u123\"").is_err());
+  assert!(string("\"\\uD800\"").is_err());
+  assert!(string("\"\\uD800\\uD800\"").is_err());
+  assert!(string("\"\\uDC00\"").is_err());
+}
+
+#[test]
+fn json_object() {
+  use JsonValue::*;
+
+  let input = r#"{"a":42,"b":"x"}"#;
+
+  let expected = Object(
+    vec![
+      ("a".to_string(), Num(42.0)),
+      ("b".to_string(), Str("x".to_string())),
+    ]
+    .into_iter()
+    .collect(),
+  );
+
+  assert_eq!(json(input), Ok(("", expected)));
+}
+
+#[test]
+fn json_array() {
+  use JsonValue::*;
+
+  let input = r#"[42,"x"]"#;
+
+  let expected = Array(vec![Num(42.0), Str("x".to_string())]);
+
+  assert_eq!(json(input), Ok(("", expected)));
+}
+
+#[test]
+fn json_whitespace() {
+  use JsonValue::*;
+
+  let input = r#"
+  {
+    "null" : null,
+    "true"  :true ,
+    "false":  false  ,
+    "number" : 123e4 ,
+    "string" : " abc 123 " ,
+    "array" : [ false , 1 , "two" ] ,
+    "object" : { "a" : 1.0 , "b" : "c" } ,
+    "empty_array" : [  ] ,
+    "empty_object" : {   }
+  }
+  "#;
+
+  assert_eq!(
+    json(input),
+    Ok((
+      "",
+      Object(
+        vec![
+          ("null".to_string(), Null),
+          ("true".to_string(), Bool(true)),
+          ("false".to_string(), Bool(false)),
+          ("number".to_string(), Num(123e4)),
+          ("string".to_string(), Str(" abc 123 ".to_string())),
+          (
+            "array".to_string(),
+            Array(vec![Bool(false), Num(1.0), Str("two".to_string())])
+          ),
+          (
+            "object".to_string(),
+            Object(
+              vec![
+                ("a".to_string(), Num(1.0)),
+                ("b".to_string(), Str("c".to_string())),
+              ]
+              .into_iter()
+              .collect()
+            )
+          ),
+          ("empty_array".to_string(), Array(vec![]),),
+          ("empty_object".to_string(), Object(HashMap::new()),),
+        ]
+        .into_iter()
+        .collect()
+      )
+    ))
+  );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/mp4.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/mp4.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/mp4.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/mp4.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,318 @@
+#![allow(dead_code)]
+
+#[macro_use]
+extern crate nom;
+
+use nom::{
+  error::ErrorKind,
+  number::streaming::{be_f32, be_u16, be_u32, be_u64},
+  Err, IResult, Needed,
+};
+
+use std::str;
+
+fn mp4_box(input: &[u8]) -> IResult<&[u8], &[u8]> {
+  match be_u32(input) {
+    Ok((i, offset)) => {
+      let sz: usize = offset as usize;
+      if i.len() >= sz - 4 {
+        Ok((&i[(sz - 4)..], &i[0..(sz - 4)]))
+      } else {
+        Err(Err::Incomplete(Needed::new(offset as usize + 4)))
+      }
+    }
+    Err(e) => Err(e),
+  }
+}
+
+#[cfg_attr(rustfmt, rustfmt_skip)]
+#[derive(PartialEq,Eq,Debug)]
+struct FileType<'a> {
+  major_brand:         &'a str,
+  major_brand_version: &'a [u8],
+  compatible_brands:   Vec<&'a str>
+}
+
+#[cfg_attr(rustfmt, rustfmt_skip)]
+#[allow(non_snake_case)]
+#[derive(Debug,Clone)]
+pub struct Mvhd32 {
+  version_flags: u32, // actually:
+  // version: u8,
+  // flags: u24       // 3 bytes
+  created_date:  u32,
+  modified_date: u32,
+  scale:         u32,
+  duration:      u32,
+  speed:         f32,
+  volume:        u16, // actually a 2 bytes decimal
+  /* 10 bytes reserved */
+  scaleA:        f32,
+  rotateB:       f32,
+  angleU:        f32,
+  rotateC:       f32,
+  scaleD:        f32,
+  angleV:        f32,
+  positionX:     f32,
+  positionY:     f32,
+  scaleW:        f32,
+  preview:       u64,
+  poster:        u32,
+  selection:     u64,
+  current_time:  u32,
+  track_id:      u32
+}
+
+#[cfg_attr(rustfmt, rustfmt_skip)]
+#[allow(non_snake_case)]
+#[derive(Debug,Clone)]
+pub struct Mvhd64 {
+  version_flags: u32, // actually:
+  // version: u8,
+  // flags: u24       // 3 bytes
+  created_date:  u64,
+  modified_date: u64,
+  scale:         u32,
+  duration:      u64,
+  speed:         f32,
+  volume:        u16, // actually a 2 bytes decimal
+  /* 10 bytes reserved */
+  scaleA:        f32,
+  rotateB:       f32,
+  angleU:        f32,
+  rotateC:       f32,
+  scaleD:        f32,
+  angleV:        f32,
+  positionX:     f32,
+  positionY:     f32,
+  scaleW:        f32,
+  preview:       u64,
+  poster:        u32,
+  selection:     u64,
+  current_time:  u32,
+  track_id:      u32
+}
+
+#[allow(non_snake_case)]
+named!(mvhd32 <&[u8], MvhdBox>,
+  do_parse!(
+  version_flags: be_u32 >>
+  created_date:  be_u32 >>
+  modified_date: be_u32 >>
+  scale:         be_u32 >>
+  duration:      be_u32 >>
+  speed:         be_f32 >>
+  volume:        be_u16 >> // actually a 2 bytes decimal
+              take!(10) >>
+  scale_a:       be_f32 >>
+  rotate_b:      be_f32 >>
+  angle_u:       be_f32 >>
+  rotate_c:      be_f32 >>
+  scale_d:       be_f32 >>
+  angle_v:       be_f32 >>
+  position_x:    be_f32 >>
+  position_y:    be_f32 >>
+  scale_w:       be_f32 >>
+  preview:       be_u64 >>
+  poster:        be_u32 >>
+  selection:     be_u64 >>
+  current_time:  be_u32 >>
+  track_id:      be_u32 >>
+  (
+    MvhdBox::M32(Mvhd32 {
+      version_flags: version_flags,
+      created_date:  created_date,
+      modified_date: modified_date,
+      scale:         scale,
+      duration:      duration,
+      speed:         speed,
+      volume:        volume,
+      scaleA:        scale_a,
+      rotateB:       rotate_b,
+      angleU:        angle_u,
+      rotateC:       rotate_c,
+      scaleD:        scale_d,
+      angleV:        angle_v,
+      positionX:     position_x,
+      positionY:     position_y,
+      scaleW:        scale_w,
+      preview:       preview,
+      poster:        poster,
+      selection:     selection,
+      current_time:  current_time,
+      track_id:      track_id
+    })
+  ))
+);
+
+#[allow(non_snake_case)]
+named!(mvhd64 <&[u8], MvhdBox>,
+  do_parse!(
+  version_flags: be_u32 >>
+  created_date:  be_u64 >>
+  modified_date: be_u64 >>
+  scale:         be_u32 >>
+  duration:      be_u64 >>
+  speed:         be_f32 >>
+  volume:        be_u16 >> // actually a 2 bytes decimal
+              take!(10) >>
+  scale_a:       be_f32 >>
+  rotate_b:      be_f32 >>
+  angle_u:       be_f32 >>
+  rotate_c:      be_f32 >>
+  scale_d:       be_f32 >>
+  angle_v:       be_f32 >>
+  position_x:    be_f32 >>
+  position_y:    be_f32 >>
+  scale_w:       be_f32 >>
+  preview:       be_u64 >>
+  poster:        be_u32 >>
+  selection:     be_u64 >>
+  current_time:  be_u32 >>
+  track_id:      be_u32 >>
+  (
+    MvhdBox::M64(Mvhd64 {
+      version_flags: version_flags,
+      created_date:  created_date,
+      modified_date: modified_date,
+      scale:         scale,
+      duration:      duration,
+      speed:         speed,
+      volume:        volume,
+      scaleA:        scale_a,
+      rotateB:       rotate_b,
+      angleU:        angle_u,
+      rotateC:       rotate_c,
+      scaleD:        scale_d,
+      angleV:        angle_v,
+      positionX:     position_x,
+      positionY:     position_y,
+      scaleW:        scale_w,
+      preview:       preview,
+      poster:        poster,
+      selection:     selection,
+      current_time:  current_time,
+      track_id:      track_id
+    })
+  ))
+);
+
+#[derive(Debug, Clone)]
+pub enum MvhdBox {
+  M32(Mvhd32),
+  M64(Mvhd64),
+}
+
+#[derive(Debug, Clone)]
+pub enum MoovBox {
+  Mdra,
+  Dref,
+  Cmov,
+  Rmra,
+  Iods,
+  Mvhd(MvhdBox),
+  Clip,
+  Trak,
+  Udta,
+}
+
+#[derive(Debug)]
+enum MP4BoxType {
+  Ftyp,
+  Moov,
+  Mdat,
+  Free,
+  Skip,
+  Wide,
+  Mdra,
+  Dref,
+  Cmov,
+  Rmra,
+  Iods,
+  Mvhd,
+  Clip,
+  Trak,
+  Udta,
+  Unknown,
+}
+
+#[derive(Debug)]
+struct MP4BoxHeader {
+  length: u32,
+  tag: MP4BoxType,
+}
+
+named!(brand_name<&[u8],&str>, map_res!(take!(4), str::from_utf8));
+
+named!(filetype_parser<&[u8], FileType>,
+  do_parse!(
+    m: brand_name          >>
+    v: take!(4)            >>
+    c: many0!(brand_name)  >>
+    (FileType{ major_brand: m, major_brand_version:v, compatible_brands: c })
+  )
+);
+
+fn mvhd_box(input: &[u8]) -> IResult<&[u8], MvhdBox> {
+  let res = if input.len() < 100 {
+    Err(Err::Incomplete(Needed::new(100)))
+  } else if input.len() == 100 {
+    mvhd32(input)
+  } else if input.len() == 112 {
+    mvhd64(input)
+  } else {
+    Err(Err::Error(error_position!(input, ErrorKind::TooLarge)))
+  };
+  println!("res: {:?}", res);
+  res
+}
+
+fn unknown_box_type(input: &[u8]) -> IResult<&[u8], MP4BoxType> {
+  Ok((input, MP4BoxType::Unknown))
+}
+
+//named!(box_type<&[u8], MP4BoxType>,
+fn box_type(input: &[u8]) -> IResult<&[u8], MP4BoxType> {
+  alt!(input,
+    tag!("ftyp") => { |_| MP4BoxType::Ftyp } |
+    tag!("moov") => { |_| MP4BoxType::Moov } |
+    tag!("mdat") => { |_| MP4BoxType::Mdat } |
+    tag!("free") => { |_| MP4BoxType::Free } |
+    tag!("skip") => { |_| MP4BoxType::Skip } |
+    tag!("wide") => { |_| MP4BoxType::Wide } |
+    unknown_box_type
+  )
+}
+
+// warning, an alt combinator with 9 branches containing a tag combinator
+// can make the compilation very slow. Use functions as sub parsers,
+// or split into multiple alt! parsers if it gets slow
+named!(moov_type<&[u8], MP4BoxType>,
+  alt!(
+    tag!("mdra") => { |_| MP4BoxType::Mdra } |
+    tag!("dref") => { |_| MP4BoxType::Dref } |
+    tag!("cmov") => { |_| MP4BoxType::Cmov } |
+    tag!("rmra") => { |_| MP4BoxType::Rmra } |
+    tag!("iods") => { |_| MP4BoxType::Iods } |
+    tag!("mvhd") => { |_| MP4BoxType::Mvhd } |
+    tag!("clip") => { |_| MP4BoxType::Clip } |
+    tag!("trak") => { |_| MP4BoxType::Trak } |
+    tag!("udta") => { |_| MP4BoxType::Udta }
+  )
+);
+
+named!(box_header<&[u8],MP4BoxHeader>,
+  do_parse!(
+    length: be_u32 >>
+    tag: box_type  >>
+    (MP4BoxHeader{ length: length, tag: tag})
+  )
+);
+
+named!(moov_header<&[u8],MP4BoxHeader>,
+  do_parse!(
+    length: be_u32 >>
+    tag: moov_type >>
+    (MP4BoxHeader{ length: length, tag: tag})
+  )
+);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/multiline.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/multiline.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/multiline.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/multiline.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+extern crate nom;
+
+use nom::{
+  character::complete::{alphanumeric1 as alphanumeric, line_ending as eol},
+  multi::many0,
+  sequence::terminated,
+  IResult,
+};
+
+pub fn end_of_line(input: &str) -> IResult<&str, &str> {
+  if input.is_empty() {
+    Ok((input, input))
+  } else {
+    eol(input)
+  }
+}
+
+pub fn read_line(input: &str) -> IResult<&str, &str> {
+  terminated(alphanumeric, end_of_line)(input)
+}
+
+pub fn read_lines(input: &str) -> IResult<&str, Vec<&str>> {
+  many0(read_line)(input)
+}
+
+#[cfg(feature = "alloc")]
+#[test]
+fn read_lines_test() {
+  let res = Ok(("", vec!["Duck", "Dog", "Cow"]));
+
+  assert_eq!(read_lines("Duck\nDog\nCow\n"), res);
+  assert_eq!(read_lines("Duck\nDog\nCow"), res);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/named_args.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/named_args.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/named_args.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/named_args.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,122 @@
+#[macro_use]
+extern crate nom;
+
+use nom::{
+  branch::alt,
+  bytes::complete::tag,
+  character::complete::{digit1 as digit, space0 as space},
+  sequence::{delimited, pair, preceded},
+};
+
+// Parser definition
+
+use std::str;
+use std::str::FromStr;
+
+use self::Operator::*;
+
+enum Operator {
+  Slash,
+  Star,
+}
+
+impl Operator {
+  fn to_str(&self) -> &'static str {
+    match *self {
+      Slash => "/",
+      Star => "*",
+    }
+  }
+}
+
+// Parse the specified `Operator`.
+named_args!(operator(op: Operator) <&[u8], &[u8]>,
+    call!(tag(op.to_str()))
+);
+
+// We parse any expr surrounded by the tags `open_tag` and `close_tag`, ignoring all whitespaces around those
+named_args!(brackets<'a>(open_tag: &str, close_tag: &str) <&'a[u8], i64>,
+  call!(delimited(
+    space,
+    delimited(tag(open_tag), preceded(space, expr), preceded(space, tag(close_tag))),
+    space
+  ))
+);
+
+fn byte_slice_to_str<'a>(s: &'a [u8]) -> Result<&'a str, str::Utf8Error> {
+  str::from_utf8(s)
+}
+
+// We transform an integer string into a i64, ignoring surrounding whitespaces
+// We look for a digit suite, and try to convert it.
+// If either str::from_utf8 or FromStr::from_str fail,
+// we fallback to the brackets parser defined above
+named!(factor<&[u8], i64>, alt!(
+    map_res!(
+      map_res!(
+        call!(delimited(space, digit, space)),
+        byte_slice_to_str
+      ),
+      FromStr::from_str
+    )
+  | call!(brackets, "(", ")")
+  )
+);
+
+// We read an initial factor and for each time we find
+// a * or / operator followed by another factor, we do
+// the math by folding everything
+named!(term <&[u8], i64>, do_parse!(
+    init: factor >>
+    res:  fold_many0!(
+        pair!(alt!(call!(operator, Star) | call!(operator, Slash)), factor),
+        init,
+        |acc, (op, val): (&[u8], i64)| {
+            if (op[0] as char) == '*' { acc * val } else { acc / val }
+        }
+    ) >>
+    (res)
+  )
+);
+
+named!(expr <&[u8], i64>, do_parse!(
+    init: term >>
+    res:  fold_many0!(
+        call!(pair(alt((tag("+"), tag("-"))), term)),
+        init,
+        |acc, (op, val): (&[u8], i64)| {
+            if (op[0] as char) == '+' { acc + val } else { acc - val }
+        }
+    ) >>
+    (res)
+  )
+);
+
+#[test]
+fn factor_test() {
+  assert_eq!(factor(&b"3"[..]), Ok((&b""[..], 3)));
+  assert_eq!(factor(&b" 12"[..]), Ok((&b""[..], 12)));
+  assert_eq!(factor(&b"537  "[..]), Ok((&b""[..], 537)));
+  assert_eq!(factor(&b"  24   "[..]), Ok((&b""[..], 24)));
+}
+
+#[test]
+fn term_test() {
+  assert_eq!(term(&b" 12 *2 /  3"[..]), Ok((&b""[..], 8)));
+  assert_eq!(term(&b" 2* 3  *2 *2 /  3"[..]), Ok((&b""[..], 8)));
+  assert_eq!(term(&b" 48 /  3/2"[..]), Ok((&b""[..], 8)));
+}
+
+#[test]
+fn expr_test() {
+  assert_eq!(expr(&b" 1 +  2 "[..]), Ok((&b""[..], 3)));
+  assert_eq!(expr(&b" 12 + 6 - 4+  3"[..]), Ok((&b""[..], 17)));
+  assert_eq!(expr(&b" 1 + 2*3 + 4"[..]), Ok((&b""[..], 11)));
+}
+
+#[test]
+fn parens_test() {
+  assert_eq!(expr(&b" (  2 )"[..]), Ok((&b""[..], 2)));
+  assert_eq!(expr(&b" 2* (  3 + 4 ) "[..]), Ok((&b""[..], 14)));
+  assert_eq!(expr(&b"  2*2 / ( 5 - 1) + 3"[..]), Ok((&b""[..], 4)));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/overflow.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/overflow.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/overflow.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/overflow.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,139 @@
+#![cfg_attr(feature = "cargo-clippy", allow(unreadable_literal))]
+#![cfg(target_pointer_width = "64")]
+
+#[macro_use]
+extern crate nom;
+
+#[cfg(feature = "alloc")]
+use nom::number::streaming::be_u64;
+use nom::{Err, Needed};
+
+// Parser definition
+
+// We request a length that would trigger an overflow if computing consumed + requested
+named!(parser01<&[u8],()>,
+    do_parse!(
+        hdr: take!(1) >>
+        data: take!(18446744073709551615) >>
+        ({
+          let _ = hdr;
+          let _ = data;
+          ()
+        })
+    )
+);
+
+// We request a length that would trigger an overflow if computing consumed + requested
+named!(parser02<&[u8],(&[u8],&[u8])>,
+    tuple!(take!(1),take!(18446744073709551615))
+);
+
+#[test]
+fn overflow_incomplete_do_parse() {
+  assert_eq!(
+    parser01(&b"3"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551615)))
+  );
+}
+
+#[test]
+fn overflow_incomplete_tuple() {
+  assert_eq!(
+    parser02(&b"3"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551615)))
+  );
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn overflow_incomplete_length_bytes() {
+  named!(multi<&[u8], Vec<&[u8]> >, many0!( length_data!(be_u64) ) );
+
+  // Trigger an overflow in length_data
+  assert_eq!(
+    multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xff"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551615)))
+  );
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn overflow_incomplete_many0() {
+  named!(multi<&[u8], Vec<&[u8]> >, many0!( length_data!(be_u64) ) );
+
+  // Trigger an overflow in many0
+  assert_eq!(
+    multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551599)))
+  );
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn overflow_incomplete_many1() {
+  named!(multi<&[u8], Vec<&[u8]> >, many1!( length_data!(be_u64) ) );
+
+  // Trigger an overflow in many1
+  assert_eq!(
+    multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551599)))
+  );
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn overflow_incomplete_many_till() {
+  named!(multi<&[u8], (Vec<&[u8]>, &[u8]) >, many_till!( length_data!(be_u64), tag!("abc") ) );
+
+  // Trigger an overflow in many_till
+  assert_eq!(
+    multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551599)))
+  );
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn overflow_incomplete_many_m_n() {
+  named!(multi<&[u8], Vec<&[u8]> >, many_m_n!(2, 4, length_data!(be_u64) ) );
+
+  // Trigger an overflow in many_m_n
+  assert_eq!(
+    multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551599)))
+  );
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn overflow_incomplete_count() {
+  named!(counter<&[u8], Vec<&[u8]> >, count!( length_data!(be_u64), 2 ) );
+
+  assert_eq!(
+    counter(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xef"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551599)))
+  );
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn overflow_incomplete_length_count() {
+  use nom::number::streaming::be_u8;
+  named!(multi<&[u8], Vec<&[u8]> >, length_count!( be_u8, length_data!(be_u64) ) );
+
+  assert_eq!(
+    multi(&b"\x04\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xee"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551598)))
+  );
+}
+
+#[test]
+#[cfg(feature = "alloc")]
+fn overflow_incomplete_length_data() {
+  named!(multi<&[u8], Vec<&[u8]> >, many0!( length_data!(be_u64) ) );
+
+  assert_eq!(
+    multi(&b"\x00\x00\x00\x00\x00\x00\x00\x01\xaa\xff\xff\xff\xff\xff\xff\xff\xff"[..]),
+    Err(Err::Incomplete(Needed::new(18446744073709551615)))
+  );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/reborrow_fold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/reborrow_fold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/reborrow_fold.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/reborrow_fold.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+#![allow(dead_code)]
+#![allow(unused_variables)]
+
+#[macro_use]
+extern crate nom;
+
+use std::str;
+
+named_args!(atom<'a>(tomb: &'a mut ())<String>,
+            map!(map_res!(is_not!(" \t\r\n()"), str::from_utf8), ToString::to_string));
+
+/*FIXME: should we support the use case of borrowing data mutably in a parser?
+named_args!(list<'a>(tomb: &'a mut ())<String>,
+  delimited!(
+    char!('('),
+    fold_many0!(call!(atom, tomb), "".to_string(), |acc: String, next: String| acc + next.as_str()),
+    char!(')')));
+*/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/test1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/test1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/tests/test1.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/tests/test1.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+#![cfg(feature = "stream")]
+
+#[macro_use]
+extern crate nom;
+
+use nom::{not_line_ending, IResult};
+
+use std::fmt::Debug;
+
+/*
+#[test]
+#[allow(unused_must_use)]
+fn tag() {
+  FileProducer::new("assets/links.txt", 20).map(|producer: FileProducer| {
+    let mut p = producer;
+    p.refill();
+
+    consumer_from_parser!(PrintConsumer<()>, flat_map!(map_res!(tag!("https!"), str::from_utf8), print));
+    let mut cs = PrintConsumer::new();
+    for _ in 1..4 {
+      p.apply(&mut cs);
+    }
+  });
+}
+*/
+
+pub fn print<T: Debug>(input: T) -> IResult<T, ()> {
+  println!("{:?}", input);
+  Ok((input, ()))
+}
+
+#[test]
+fn is_not() {
+  //is_not!(foo b"\r\n");
+  named!(foo<&[u8],&[u8]>, is_not!(&b"\r\n"[..]));
+  let a = &b"ab12cd\nefgh"[..];
+  assert_eq!(foo(a), Ok((&b"\nefgh"[..], &b"ab12cd"[..])));
+}
+
+#[test]
+fn exported_public_method_defined_by_macro() {
+  let a = &b"ab12cd\nefgh"[..];
+  assert_eq!(not_line_ending(a), Ok((&b"\nefgh"[..], &b"ab12cd"[..])));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/.travis.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/.travis.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom/.travis.yml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom/.travis.yml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,110 @@
+language: rust
+# sudo is required to enable kcov to use the personality syscall
+sudo: required
+dist: trusty
+cache: cargo
+
+rust:
+  - nightly
+  - beta
+  - stable
+  - 1.44.0
+
+env:
+  matrix:
+    - FEATURES='--features "regexp"'
+
+before_script:
+  - eval git pull --rebase https://github.com/Geal/nom master
+  - eval git log --pretty=oneline HEAD~5..HEAD
+
+matrix:
+  include:
+    - rust: stable
+      env: FEATURES='--features "std lexical regexp"'
+      before_script:
+        - export PATH=$HOME/.cargo/bin:$PATH
+        - cargo install cargo-update || echo "cargo-update already installed"
+        - cargo install cargo-tarpaulin || echo "cargo tarpaulin already installed"
+        - cargo install-update -a
+      script:
+        cargo tarpaulin --ciserver travis-ci --coveralls $TRAVIS_JOB_ID
+    - rust: stable
+      env: FEATURES=''
+    - rust: stable
+      env: FEATURES='--no-default-features'
+      # still compatible with 1.36.0 if not using lexical-core
+    - rust: 1.37.0
+      env: FEATURES='--no-default-features --features "regexp lexical"'
+    - rust: stable
+      env: FEATURES='--no-default-features --features "alloc"'
+    - rust: nightly
+      env: FEATURES=''
+    - rust: nightly
+      env: FEATURES='--no-default-features'
+    - rust: nightly
+      env: FEATURES='--no-default-features --features "alloc"'
+    - rust: nightly
+      env: DOC_FEATURES='--features "std lexical regexp" --no-default-features'
+      before_script:
+        - export PATH=$HOME/.cargo/bin:$PATH
+      script:
+        - eval cargo doc --verbose $DOC_FEATURES
+
+  allow_failures:
+    - rust: stable
+      env: FEATURES=''
+      before_script:
+        - export PATH=$HOME/.cargo/bin:$PATH
+        - rustup component add rustfmt-preview
+      script:
+        - eval cargo fmt -- --write-mode=diff
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/9c035a194ac4fd4cc061
+    on_success: change
+    on_failure: always
+    on_start: false
+
+
+addons:
+  apt:
+    packages:
+      - libcurl4-openssl-dev
+      - libelf-dev
+      - libdw-dev
+      - binutils-dev
+      - cmake
+    sources:
+      - kalakris-cmake
+
+cache:
+  directories:
+    - /home/travis/.cargo
+
+before_cache:
+  - rm -rf /home/travis/.cargo/registry
+
+script:
+  - eval cargo build --verbose $FEATURES
+  - eval cargo test --verbose $FEATURES
+
+after_success: |
+  case "$TRAVIS_RUST_VERSION" in
+    nightly)
+      if [ "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" != "master" ]; then
+        git fetch &&
+        git checkout master &&
+        cargo bench --verbose
+      fi
+
+      if [ "$FEATURES" == '--features "regexp"' ]; then
+        cargo bench --verbose
+      fi
+      ;;
+
+    *)
+      ;;
+  esac
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"c48ca97de48d7bcfb8228bf951494d27f62235503d64f9adafabb37a999fdd8c","Cargo.toml":"2012ba49019358fa2bfc36a62c9120124f7e08549d5d04835e70d67cdc4bb55e","LICENSE":"2684de17300e0a434686f1ec7f8af6045207a4b457a3fe04b2b9ce655e7c5d50","README.md":"35d804834ba1b682653d08b1066ae1e44e50518610f71d8594cdc10603bd2602","src/error.rs":"6273dd6035d38da188f30948216881ac62c3ede17840f53e77645119ca01193d","src/final_parser.rs":"7d849ac8ce1df116fc845aa5057bb964345f0f599153555466e85d1e5bf13c32","src/from_str.rs":"a196ee121ec46cba0254025fa65a9d3da480c0cea459d3248db3e6cd3d7e3cdf","src/lib.rs":"31de041e4b6e0b13ef467b06286f2d04fd4c1c23e9e67a5d9f688ef73770b7cf","src/multi.rs":"6444db4fb0c7d8a4d2e78ba441482edd405c708648d7c9f7cde2b769ecc09e1c","src/parser_ext.rs":"899d7c05846662f0b276316032e9e1c63a643d132dfd150271eb8fbeea92907b","src/tag.rs":"ec033d82ba4eb57587520348b6b2bf5ec9e53c039a78a599c258951db53a55e0"},"package":"e08bbbb568bb8e06f87b58a592eb5af2bf6dbbfe1868ab7311adec38230459a8"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,37 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "nom-supreme"
+version = "0.4.6"
+authors = ["Nathan West <Lucretiel@gmail.com>"]
+description = "A collection of excellent utilities for nom"
+readme = "README.md"
+license = "MPL-2.0"
+repository = "https://github.com/Lucretiel/nom-supreme"
+[dependencies.brownstone]
+version = "1.0.0"
+
+[dependencies.indent_write]
+version = "2.0.0"
+
+[dependencies.joinery]
+version = "2.0.0"
+
+[dependencies.memchr]
+version = "2.3.4"
+
+[dependencies.nom]
+version = "6.0.1"
+[dev-dependencies.cool_asserts]
+version = "1.0.3"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,160 @@
+# Changelog
+
+## 0.4.6
+
+### Added
+
+- Added `array` and `separated_array` to `ParserExt`
+
+### Internal
+
+- Minor implementation refactors
+- Add `brownstone` dependency
+
+## 0.4.5
+
+### Added
+
+- Add cutting versions of `Result` combinators, which return `Failure` in the event that the mapping function returns an `Err`.
+  - Add `map_res_cut` (thanks @loewenheim)
+  - Add `parse_from_str_cut`
+- Reexport `ParserExt` at the toplevel
+
+### Fixed
+
+- Fixed some edge case bugs in error handling in `multi`
+
+### Internal
+
+- Various internal refactorings of stuff in `ParserExt`
+- Remove `cascade` dependency
+
+## 0.4.4
+
+### Added
+
+- Add `ExtractContext<E2> for Result<T, E1>`
+- Add `collect_separated_terminated`
+
+### Documentation
+
+- Documentation refactoring in `multi`
+
+### Changed
+
+- Internal code style fixes
+- Implementation improvements for parsers in `multi`
+
+## 0.4.3
+
+### Added
+
+- Add `with_recognized` combinator to `ParserExt`.
+
+## 0.4.2
+
+### Added
+
+- Implement `ErrorConvert` for `ErrorTree`, enabling its use in bit parsers
+
+### Documentation
+
+- Fix broken links in documentation.
+- Fix incorrect example parser in `ErrorTree` doctests.
+- Add additional example content to `ErrorTree`.
+- Add additional example to `ParserExt::parse_from_str`.
+
+## 0.4.1
+
+### Documentation
+
+- Fixed major typo in `ErrorTree` documentation.
+
+## 0.4.0
+
+### Changed
+
+- Changes to how `ErrorTree` and `Expectation` handle `ErrorKind::Eof`:
+  - Because `ErrorKind::Eof` is used interchangeably by some nom parsers to refer to either "expected eof" or "*un*expected eof", we examine the input via InputLength to determine which variant is intended
+  - Removed `Expectation::Byte` and `Expectation::AnyChar`, replaced them with `Expectation::Something`.
+- Major changes to `ErrorTree::Stack`
+  - Now separately represents the context stack and base error as different types.
+  - Split `BaseErrorKind` into `BaseErrorKind` and
+- `BaseErrorKind::External` now reports the error message on an indented line.
+
+### Internal
+
+- Several updates to interior code, unit tests, and doctests, all related to the `ErrorTree` changes.
+
+### Documentation
+
+- Proofread edits of most of the `nom_supreme::error` docs.
+- Added several doctests for `ErrorTree`.
+
+## 0.3.1
+
+### Added
+
+- `ParserExt::parse_from_str`
+
+### Tests
+
+- Add comprehensive unit tests to `parse_separated_terminated`
+
+### Internal
+
+- Bump to [cool_asserts] 1.0.3
+- Reimplement `parse_from_str` based on `ParserExt`
+
+## 0.3.0
+
+### Added
+
+- `parse_separated_terminated` now works correctly as documented: it smartly detects when the parser is hanging and bail if necessary.
+- `parse_separated_terminated` is now slightly smarter about error cases. If the separator successfully parses a 0-length match, the next item error will include the terminator error as well.
+
+## 0.2.0
+
+### Added
+
+- `ParserExt::by_ref`, which borrows a parser so that it can have combinators applied to it without giving up ownership.
+
+### Changed
+
+- **(BREAKING)** Reworked `ParserExt::delimited_by`:
+  - Removed original `delimited_by` in favor of simply using `.preceded_by(..).terminated(..)`.
+  - Renamed `ParserExt::delimited_by_both` to `ParserExt::delimited_by`, and added a dedicated parser type, such that it no longer requires `Clone` on the delimiter parser.
+
+### Tests
+
+- Added doctests to all `ParserExt` methods.
+
+### Documentation
+
+- Fixed numerous broken documentation links.
+
+## 0.1.4
+
+### Added
+
+- `.peek()` combinator to `ParserExt`
+- `.not()` combinator to `ParserExt`
+- `Expectation::AnyChar` and `Expectation::Byte`
+
+### Fixed
+
+- Broken doctests
+
+## 0.1.3
+
+No code changes
+
+### Documentation
+
+- `parse_from_str` example now actually shows `parse_from_str`
+
+## 0.1.2
+
+- Changelog started
+
+[cool_asserts](https://docs.rs/cool_asserts/)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3 @@
+# nom-supreme
+
+A collection of utilities for a superior nom experience
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,658 @@
+//! An error type, [`ErrorTree`], designed to retain much more useful
+//! information about parse failures than the built-in nom error types.
+
+use std::{
+    error::Error,
+    fmt::{self, Debug, Display, Formatter, Write},
+};
+
+use indent_write::fmt::IndentWriter;
+use joinery::JoinableIterator;
+use nom::{
+    error::{ContextError, ErrorKind as NomErrorKind, FromExternalError, ParseError},
+    ErrorConvert, InputLength,
+};
+
+use crate::final_parser::{ExtractContext, RecreateContext};
+use crate::tag::TagError;
+
+
+/// Enum for generic things that can be expected by nom parsers
+///
+/// Certain nom parsers (think [`digit1`], [`tag`], or [`space1`]) are "base
+/// level" in the sense that, rather than combining subparsers, they scan for a
+/// specific character or specific kind of character. This enum tracks the
+/// different kinds of things that can be expected by these base parses.
+///
+/// Printing an expectation via [`Display`] will only include the thing that
+/// was expected, in a form suitable for being prefixed with "expected" or
+/// suffixed with "was expected".
+///
+/// This enum is non-exhaustive; it is intended to represent everything parse
+/// errors where we know *specifically* what was expected. For instance,
+/// [`take_while`] cannot create an [`Expectation`], because it can't
+/// meaningfully report what its subparser is expecting.
+///
+/// [`digit1`]: nom::character::complete::digit1
+/// [`tag`]: crate::tag::complete::tag
+/// [`space1`]: nom::character::complete::space1
+/// [`take_while`]: nom::bytes::complete::take_while
+#[non_exhaustive]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum Expectation {
+    /// A string tag was expected.
+    Tag(&'static str),
+
+    /// A specific character was expected.
+    Char(char),
+
+    /// An ASCII letter (`[a-zA-Z]`) was expected.
+    Alpha,
+
+    /// A decimal digit (`[0-9]`) was expected.
+    Digit,
+
+    /// A hexadecimal digit (`[0-9a-fA-F]`) was expected.
+    HexDigit,
+
+    /// An octal digit (`[0-7]`) was expected.
+    OctDigit,
+
+    /// An alphanumeric character (`[0-9a-zA-Z]`) was expected.
+    AlphaNumeric,
+
+    /// A space or tab was expected.
+    Space,
+
+    /// A space, tab, newline, or carriage return was expected.
+    Multispace,
+
+    /// `"\r\n"` was expected.
+    CrLf,
+
+    /// Eof was expected.
+    Eof,
+
+    /// Expected something; ie, not Eof.
+    Something,
+}
+
+impl Display for Expectation {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match *self {
+            Expectation::Tag(tag) => write!(f, "{:?}", tag),
+            Expectation::Char(c) => write!(f, "{:?}", c),
+            Expectation::Alpha => write!(f, "an ascii letter"),
+            Expectation::Digit => write!(f, "an ascii digit"),
+            Expectation::HexDigit => write!(f, "a hexadecimal digit"),
+            Expectation::OctDigit => write!(f, "an octal digit"),
+            Expectation::AlphaNumeric => write!(f, "an ascii alphanumeric character"),
+            Expectation::Space => write!(f, "a space or tab"),
+            Expectation::Multispace => write!(f, "whitespace"),
+            Expectation::Eof => write!(f, "eof"),
+            Expectation::CrLf => write!(f, "CRLF"),
+            Expectation::Something => write!(f, "not eof"),
+        }
+    }
+}
+
+/// These are the different specific things that can go wrong at a particular
+/// location during a nom parse. Many of these are collected into an
+/// [`ErrorTree`].
+#[derive(Debug)]
+pub enum BaseErrorKind {
+    /// Something specific was expected, such as a specific
+    /// [character][Expectation::Char] or any [digit](Expectation::Digit).
+    /// See [`Expectation`] for details.
+    Expected(Expectation),
+
+    /// A nom parser failed.
+    Kind(NomErrorKind),
+
+    /// An error outside of nom occurred during parsing; for instance, as a
+    /// result of an error during [`map_res`].
+    ///
+    /// [`map_res`]: crate::parser_ext::ParserExt::map_res
+    // Design note: I've gone back and forth on whether or not to exclude the
+    // ErrorKind from this variant. Right now I'm doing so, because it seems
+    // like in practice it's *always* MapRes.
+    External(Box<dyn Error + Send + Sync + 'static>),
+}
+
+impl Display for BaseErrorKind {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match *self {
+            BaseErrorKind::Expected(expectation) => write!(f, "expected {}", expectation),
+            BaseErrorKind::External(ref err) => {
+                writeln!(f, "external error:")?;
+                let mut f = IndentWriter::new("  ", f);
+                write!(f, "{}", err)
+            }
+            BaseErrorKind::Kind(kind) => write!(f, "error in {:?}", kind),
+        }
+    }
+}
+
+/// Context that can appear in a [stack][ErrorTree::Stack], above a base
+/// [`ErrorTree`]. Stack contexts are attached by parser combinators to errors
+/// from their subparsers during stack unwinding.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum StackContext {
+    /// A nom combinator attached an [`ErrorKind`][NomErrorKind] as context
+    /// for a subparser error.
+    Kind(NomErrorKind),
+
+    /// The [`context`][crate::parser_ext::ParserExt::context] combinator
+    /// attached a message as context for a subparser error.
+    Context(&'static str),
+}
+
+impl Display for StackContext {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match *self {
+            StackContext::Kind(kind) => write!(f, "while parsing {:?}", kind),
+            StackContext::Context(ctx) => write!(f, "in section {:?}", ctx),
+        }
+    }
+}
+
+/// A comprehensive tree of nom errors describing a parse failure.
+///
+/// This Error type is designed to be [`VerboseError`]`++`. While
+/// [`VerboseError`] can represent a *stack* of errors, this type can represent
+/// a full tree. In addition to representing a particular specific parse error,
+/// it can also represent a stack of nested error contexts (for instance, as
+/// provided by [`context`][nom::error::context]), or a list of alternatives
+/// that were all tried individually by [`alt`][nom::branch::alt] and all
+/// failed.
+///
+/// In general, the design goal for this type is to discard as little useful
+/// information as possible. That being said, many [`ErrorKind`] variants add
+/// very little useful contextual information to error traces; for example,
+/// [`ErrorKind::Alt`] doesn't add any interesting context to an
+/// [`ErrorTree::Alt`], and its presence in a stack precludes merging together
+/// adjacent sets of [`ErrorTree::Alt`] siblings.
+///
+/// # Examples
+///
+/// ## Base parser errors
+///
+/// An `ErrorTree::Base` is an error that occurred at the "bottom" of the stack,
+/// from a parser looking for 1 specific kind of thing.
+///
+/// ```rust
+/// use cool_asserts::assert_matches;
+/// use nom::{Parser, Err};
+/// use nom::character::complete::{digit1, char};
+/// use nom_supreme::error::{ErrorTree, BaseErrorKind, StackContext, Expectation};
+/// use nom_supreme::parser_ext::ParserExt;
+///
+/// let err: Err<ErrorTree<&str>> = digit1.parse("abc").unwrap_err();
+///
+/// assert_matches!(err, Err::Error(ErrorTree::Base{
+///     location: "abc",
+///     kind: BaseErrorKind::Expected(Expectation::Digit),
+/// }));
+///
+/// let err: Err<ErrorTree<&str>> = char('a').and(char('b')).parse("acb").unwrap_err();
+///
+/// assert_matches!(err, Err::Error(ErrorTree::Base{
+///     location: "cb",
+///     kind: BaseErrorKind::Expected(Expectation::Char('b')),
+/// }));
+/// ```
+///
+/// ## Stacks
+///
+/// An [`ErrorTree::Stack`] is created when a parser combinator—typically
+/// [`context`]—attaches additional error context to a subparser error. It can
+/// have any [`ErrorTree`] at the base of the stack.
+///
+/// ```rust
+/// use cool_asserts::assert_matches;
+/// use nom::{Parser, Err};
+/// use nom::character::complete::{alpha1, space1, char,};
+/// use nom::sequence::{separated_pair, delimited};
+/// use nom_supreme::parser_ext::ParserExt;
+/// use nom_supreme::error::{ErrorTree, BaseErrorKind, StackContext, Expectation};
+///
+/// // Parse a single identifier, defined as just a string of letters.
+/// let identifier = alpha1.context("identifier");
+///
+/// // Parse a pair of identifiers, separated by whitespace
+/// let identifier_pair = separated_pair(identifier, space1, identifier)
+///     .context("identifier pair");
+///
+/// // Parse a pair of identifiers in parenthesis.
+/// let mut parenthesized = delimited(char('('), identifier_pair, char(')'))
+///     .context("parenthesized");
+///
+/// let err: Err<ErrorTree<&str>> = parenthesized.parse("(abc 123)").unwrap_err();
+///
+/// assert_matches!(err, Err::Error(ErrorTree::Stack {
+///     base,
+///     contexts,
+/// }) => {
+///     assert_matches!(*base, ErrorTree::Base {
+///         location: "123)",
+///         kind: BaseErrorKind::Expected(Expectation::Alpha)
+///     });
+///
+///     assert_eq!(contexts, [
+///         ("123)", StackContext::Context("identifier")),
+///         ("abc 123)", StackContext::Context("identifier pair")),
+///         ("(abc 123)", StackContext::Context("parenthesized")),
+///     ]);
+/// });
+/// ```
+///
+/// ## Alternatives
+///
+/// An [`ErrorTree::Alt`] is created when a series of parsers are all tried,
+/// and all of them fail. Most commonly this will happen via the
+/// [`alt`][nom::branch::alt] combinator or the equivalent [`.or`] postfix
+/// combinator. When all of these subparsers fail, their errors (each
+/// individually their own `ErrorTree`) are aggregated into an
+/// [`ErrorTree::Alt`], indicating that "any one of these things were
+/// expected."
+///
+/// ```rust
+/// use cool_asserts::assert_matches;
+/// use nom::{Parser, Err};
+/// use nom::branch::alt;
+/// use nom_supreme::error::{ErrorTree, BaseErrorKind, StackContext, Expectation};
+/// use nom_supreme::parser_ext::ParserExt;
+/// use nom_supreme::tag::complete::tag;
+///
+/// let parse_bool = alt((
+///     tag("true").value(true),
+///     tag("false").value(false),
+/// ));
+///
+/// let mut parse_null_bool = alt((
+///     parse_bool.map(Some),
+///     tag("null").value(None),
+/// ));
+///
+/// assert_eq!(parse_null_bool.parse("true").unwrap(), ("", Some(true)));
+/// assert_eq!(parse_null_bool.parse("false").unwrap(), ("", Some(false)));
+/// assert_eq!(parse_null_bool.parse("null").unwrap(), ("", None));
+///
+/// let err: Err<ErrorTree<&str>> = parse_null_bool.parse("123").unwrap_err();
+///
+/// // This error communicates to the caller that any one of "true", "false",
+/// // or "null" was expected at that location.
+/// assert_matches!(err, Err::Error(ErrorTree::Alt(choices)) => {
+///     assert_matches!(choices.as_slice(), [
+///         ErrorTree::Base {
+///             location: "123",
+///             kind: BaseErrorKind::Expected(Expectation::Tag("true"))},
+///         ErrorTree::Base {
+///             location: "123",
+///             kind: BaseErrorKind::Expected(Expectation::Tag("false"))},
+///         ErrorTree::Base {
+///             location: "123",
+///             kind: BaseErrorKind::Expected(Expectation::Tag("null"))},
+///     ])
+/// });
+/// ```
+///
+/// ## Contexts and Alternatives
+///
+/// Because [`Stack`] and [`Alt`] recursively contain [`ErrorTree`] errors from
+/// subparsers, they can be can combined to create error trees of arbitrary
+/// complexity.
+///
+/// ```rust
+/// use cool_asserts::assert_matches;
+/// use nom::{Parser, Err};
+/// use nom::branch::alt;
+/// use nom_supreme::error::{ErrorTree, BaseErrorKind, StackContext, Expectation};
+/// use nom_supreme::parser_ext::ParserExt;
+/// use nom_supreme::tag::complete::tag;
+///
+/// let parse_bool = alt((
+///     tag("true").value(true),
+///     tag("false").value(false),
+/// )).context("bool");
+///
+/// let mut parse_null_bool = alt((
+///     parse_bool.map(Some),
+///     tag("null").value(None).context("null"),
+/// )).context("null or bool");
+///
+/// assert_eq!(parse_null_bool.parse("true").unwrap(), ("", Some(true)));
+/// assert_eq!(parse_null_bool.parse("false").unwrap(), ("", Some(false)));
+/// assert_eq!(parse_null_bool.parse("null").unwrap(), ("", None));
+///
+/// let err: Err<ErrorTree<&str>> = parse_null_bool.parse("123").unwrap_err();
+///
+/// assert_matches!(err, Err::Error(ErrorTree::Stack{base, contexts}) => {
+///     assert_eq!(contexts, [("123", StackContext::Context("null or bool"))]);
+///     assert_matches!(*base, ErrorTree::Alt(choices) => {
+///         assert_matches!(&choices[0], ErrorTree::Stack{base, contexts} => {
+///             assert_eq!(contexts, &[("123", StackContext::Context("bool"))]);
+///             assert_matches!(&**base, ErrorTree::Alt(choices) => {
+///                 assert_matches!(&choices[0], ErrorTree::Base {
+///                     location: "123",
+///                     kind: BaseErrorKind::Expected(Expectation::Tag("true"))
+///                 });
+///                 assert_matches!(&choices[1], ErrorTree::Base {
+///                     location: "123",
+///                     kind: BaseErrorKind::Expected(Expectation::Tag("false"))
+///                 });
+///            });
+///         });
+///         assert_matches!(&choices[1], ErrorTree::Stack{base, contexts} => {
+///             assert_eq!(contexts, &[("123", StackContext::Context("null"))]);
+///             assert_matches!(&**base, ErrorTree::Base {
+///                 location: "123",
+///                 kind: BaseErrorKind::Expected(Expectation::Tag("null"))
+///             });
+///         });
+///     });
+/// });
+/// ```
+///
+/// # Display formatting
+///
+/// TODO WRITE THIS SECTION
+///
+/// [`.or`]: nom::Parser::or
+/// [`Alt`]: ErrorTree::Alt
+/// [`context`]: nom::error::context
+/// [`ErrorKind::Alt`]: nom::error::ErrorKind::Alt
+/// [`ErrorKind`]: nom::error::ErrorKind
+/// [`Stack`]: ErrorTree::Stack
+/// [`VerboseError`]: nom::error::VerboseError
+#[derive(Debug)]
+pub enum ErrorTree<I> {
+    /// A specific error event at a specific location. Often this will indicate
+    /// that something like a tag or character was expected at that location.
+    Base {
+        /// The location of this error in the input
+        location: I,
+
+        /// The specific error that occurred
+        kind: BaseErrorKind,
+    },
+
+    /// A stack indicates a chain of error contexts was provided. The stack
+    /// should be read "backwards"; that is, errors *earlier* in the `Vec`
+    /// occurred "sooner" (deeper in the call stack).
+    Stack {
+        /// The original error
+        base: Box<Self>,
+
+        /// The stack of contexts attached to that error
+        contexts: Vec<(I, StackContext)>,
+    },
+
+    /// A series of parsers were tried at the same location (for instance, via
+    /// the [`alt`](nom::branch::alt) combinator) and all of them failed. All
+    /// of the errors in this set are "siblings".
+    Alt(Vec<Self>),
+    // TODO: in a future version of nom-supreme, elaborate on the specific
+    // type combinations here. For instance:
+    // - Alt can only contain Stack or Base
+    // - Stack has a single Base or Alt, followed by a series of contexts
+    //   (Context or Kind)
+}
+
+impl<I> ErrorTree<I> {
+    /// Helper for `map_locations`. Because it operates recursively, this
+    /// method uses an `&mut impl FnMut`, which can be reborrowed.
+    fn map_locations_ref<T>(self, convert_location: &mut impl FnMut(I) -> T) -> ErrorTree<T> {
+        // TODO: does the recursive nature of this function present a potential
+        // security risk? Consider replacing it with a breadth-first algorithm,
+        // or capping the maximum recursion depth. Note, though, that recursion
+        // only happens when alternating between different *kinds* of
+        // ErrorTree; nested groups of Alt or Stack are flattened.
+        match self {
+            ErrorTree::Base { location, kind } => ErrorTree::Base {
+                location: convert_location(location),
+                kind,
+            },
+            ErrorTree::Stack { base, contexts } => ErrorTree::Stack {
+                base: Box::new(base.map_locations_ref(convert_location)),
+                contexts: contexts
+                    .into_iter()
+                    .map(|(location, context)| (convert_location(location), context))
+                    .collect(),
+            },
+            ErrorTree::Alt(siblings) => ErrorTree::Alt(
+                siblings
+                    .into_iter()
+                    .map(|err| err.map_locations_ref(convert_location))
+                    .collect(),
+            ),
+        }
+    }
+
+    /// Convert all of the locations in this error using some kind of mapping
+    /// function. This is intended to help add additional context that may not
+    /// have been available when the nom parsers were running, such as line
+    /// and column numbers.
+    pub fn map_locations<T>(self, mut convert_location: impl FnMut(I) -> T) -> ErrorTree<T> {
+        self.map_locations_ref(&mut convert_location)
+    }
+}
+
+impl<I: Display> Display for ErrorTree<I> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            ErrorTree::Base { location, kind } => write!(f, "{} at {:#}", kind, location),
+            ErrorTree::Stack { contexts, base } => {
+                contexts.iter().rev().try_for_each(|(location, context)| {
+                    writeln!(f, "{} at {:#},", context, location)
+                })?;
+
+                base.fmt(f)
+            }
+            ErrorTree::Alt(siblings) => {
+                writeln!(f, "one of:")?;
+                let mut f = IndentWriter::new("  ", f);
+                write!(f, "{}", siblings.iter().join_with(", or\n"))
+            }
+        }
+    }
+}
+
+impl<I: Display + Debug> Error for ErrorTree<I> {}
+
+impl<I: InputLength> ParseError<I> for ErrorTree<I> {
+    /// Create a new error at the given position. Interpret `kind` as an
+    /// [`Expectation`] if possible, to give a more informative error message.
+    fn from_error_kind(location: I, kind: NomErrorKind) -> Self {
+        let kind = match kind {
+            NomErrorKind::Alpha => BaseErrorKind::Expected(Expectation::Alpha),
+            NomErrorKind::Digit => BaseErrorKind::Expected(Expectation::Digit),
+            NomErrorKind::HexDigit => BaseErrorKind::Expected(Expectation::HexDigit),
+            NomErrorKind::OctDigit => BaseErrorKind::Expected(Expectation::OctDigit),
+            NomErrorKind::AlphaNumeric => BaseErrorKind::Expected(Expectation::AlphaNumeric),
+            NomErrorKind::Space => BaseErrorKind::Expected(Expectation::Space),
+            NomErrorKind::MultiSpace => BaseErrorKind::Expected(Expectation::Multispace),
+            NomErrorKind::CrLf => BaseErrorKind::Expected(Expectation::CrLf),
+
+            // Problem: ErrorKind::Eof is used interchangeably by various nom
+            // parsers to mean either "expected Eof" or "expected NOT eof". See
+            // https://github.com/Geal/nom/issues/1259. For now, we examine the
+            // input string to guess what the likely intention is.
+            NomErrorKind::Eof => match location.input_len() {
+                // The input is at Eof, which means that this refers to an
+                // *unexpected* eof.
+                0 => BaseErrorKind::Expected(Expectation::Something),
+
+                // The input is *not* at eof, which means that this refers to
+                // an *expected* eof.
+                _ => BaseErrorKind::Expected(Expectation::Eof),
+            },
+            kind => BaseErrorKind::Kind(kind),
+        };
+
+        ErrorTree::Base { location, kind }
+    }
+
+    /// Combine an existing error with a new one. This is how error context is
+    /// accumulated when backtracing. "other" is the original error, and the
+    /// inputs new error from higher in the call stack.
+    ///
+    /// If `other` is already an `ErrorTree::Stack`, the context is added to
+    /// the stack; otherwise, a new stack is created, with `other` at the root.
+    fn append(location: I, kind: NomErrorKind, other: Self) -> Self {
+        let context = (location, StackContext::Kind(kind));
+
+        match other {
+            // Don't create a stack of [ErrorKind::Alt, ErrorTree::Alt(..)]
+            alt @ ErrorTree::Alt(..) if kind == NomErrorKind::Alt => alt,
+
+            // This is already a stack, so push on to it
+            ErrorTree::Stack { contexts, base } => ErrorTree::Stack {
+                base,
+                contexts: express!(contexts.push(context))
+            },
+
+            // This isn't a stack; create a new stack
+            base => ErrorTree::Stack {
+                base: Box::new(base),
+                contexts: vec![context],
+            },
+        }
+    }
+
+    /// Create an error indicating an expected character at a given position
+    fn from_char(location: I, character: char) -> Self {
+        ErrorTree::Base {
+            location,
+            kind: BaseErrorKind::Expected(Expectation::Char(character)),
+        }
+    }
+
+    /// Combine two errors from branches of alt. If either or both errors are
+    /// already [`ErrorTree::Alt`], the different error sets are merged;
+    /// otherwise, a new [`ErrorTree::Alt`] is created, containing both
+    /// `self` and `other`.
+    fn or(self, other: Self) -> Self {
+        // For now we assume that there's no need to try and preserve
+        // left-to-right ordering of alternatives.
+        let siblings = match (self, other) {
+            (ErrorTree::Alt(siblings1), ErrorTree::Alt(siblings2)) => {
+                match siblings1.capacity() >= siblings2.capacity() {
+                    true => express!(siblings1.extend(siblings2)),
+                    false => express!(siblings2.extend(siblings1)),
+                }
+            }
+            (ErrorTree::Alt(siblings), err) | (err, ErrorTree::Alt(siblings)) => express!(siblings.push(err)),
+            (err1, err2) => vec![err1, err2],
+        };
+
+        ErrorTree::Alt(siblings)
+    }
+}
+
+impl<I> ContextError<I> for ErrorTree<I> {
+    /// Similar to append: Create a new error with some added context
+    fn add_context(location: I, ctx: &'static str, other: Self) -> Self {
+        let context = (location, StackContext::Context(ctx));
+
+        match other {
+            // This is already a stack, so push on to it
+            ErrorTree::Stack { contexts, base } => ErrorTree::Stack {
+                base,
+                contexts: express!(contexts.push(context)),
+            },
+
+            // This isn't a stack, create a new stack
+            base => ErrorTree::Stack {
+                base: Box::new(base),
+                contexts: vec![context],
+            },
+        }
+    }
+}
+
+impl<I, E: Error + Send + Sync + 'static> FromExternalError<I, E> for ErrorTree<I> {
+    /// Create an error from a given external error, such as from FromStr
+    fn from_external_error(location: I, _kind: NomErrorKind, e: E) -> Self {
+        ErrorTree::Base {
+            location,
+            kind: BaseErrorKind::External(Box::new(e)),
+        }
+    }
+}
+
+impl<I> TagError<I, &'static str> for ErrorTree<I> {
+    fn from_tag(location: I, tag: &'static str) -> Self {
+        ErrorTree::Base {
+            location,
+            kind: BaseErrorKind::Expected(Expectation::Tag(tag)),
+        }
+    }
+}
+
+impl<I> ErrorConvert<ErrorTree<(I, usize)>> for ErrorTree<I> {
+    fn convert(self) -> ErrorTree<(I, usize)> {
+        self.map_locations(|location| (location, 0))
+    }
+}
+
+impl<I> ErrorConvert<ErrorTree<I>> for ErrorTree<(I, usize)> {
+    fn convert(self) -> ErrorTree<I> {
+        self.map_locations(move |(location, _offset)| location)
+    }
+}
+
+impl<I, T> ExtractContext<I, ErrorTree<T>> for ErrorTree<I>
+where
+    I: Clone,
+    T: RecreateContext<I>,
+{
+    fn extract_context(self, original_input: I) -> ErrorTree<T> {
+        self.map_locations(move |location| T::recreate_context(original_input.clone(), location))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use nom::{
+        bits::{bits, complete::take},
+        sequence::tuple,
+        IResult, Parser,
+    };
+
+    type BitInput<'a> = (&'a [u8], usize);
+
+    fn parse_bool_bit(input: (&[u8], usize)) -> IResult<BitInput, bool, ErrorTree<BitInput>> {
+        take(1usize).map(|bit: u8| bit != 0).parse(input)
+    }
+
+    type Byte = (bool, bool, bool, bool, bool, bool, bool, bool);
+
+    /// Parse 8 bits
+    fn parse_bits(input: &[u8]) -> IResult<&[u8], Byte, ErrorTree<&[u8]>> {
+        bits(tuple((
+            parse_bool_bit,
+            parse_bool_bit,
+            parse_bool_bit,
+            parse_bool_bit,
+            parse_bool_bit,
+            parse_bool_bit,
+            parse_bool_bit,
+            parse_bool_bit,
+        )))
+        .parse(input)
+    }
+
+    /// Test that ErrorTree can be used with a bits parser, which requires
+    /// ErrorConvert
+    #[test]
+    fn error_tree_bits() {
+        let values = [0b1010_1111, 10];
+        let (tail, result) = parse_bits(&values).unwrap();
+
+        assert_eq!(tail, &[10]);
+        assert_eq!(result, (true, false, true, false, true, true, true, true));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/final_parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/final_parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/final_parser.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/final_parser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,241 @@
+//! Entry point layer into nom parsers. See [`final_parser`] for details.
+
+use std::fmt::{self, Display, Formatter};
+
+use nom::{
+    error::{Error, ErrorKind, ParseError, VerboseError},
+    Err as NomErr, InputLength, Offset, Parser,
+};
+
+use crate::parser_ext::ParserExt;
+
+/// Trait for types which represent an absolute location of a parse error in
+/// an input
+///
+/// This trait is implemented for "full location context" types; that is, for
+/// types that capture the exact location (and possibly other related context)
+/// of a parse error for the purpose of reporting. Two such types are provided
+/// by `nom-supreme`: [`Location`], which captures the line and column number
+/// of the error, and [`ByteOffset`], which captures the byte offset of the
+/// error.
+///
+/// This trait is usually paired with [`ExtractContext`], a trait used by
+/// nom error types to convert the stored input tail types into location
+/// contexts. [`ExtractContext`] is in turn used by [`final_parser`] to create
+/// & return parse errors with the full attached context.
+pub trait RecreateContext<I>: Sized {
+    /// Given the *original* input, as well as the context reported by nom,
+    /// recreate a context in the original string where the error occurred.
+    ///
+    /// This function may return garbage or panic if the tail is not associated
+    /// with the original input.
+    fn recreate_context(original_input: I, tail: I) -> Self;
+}
+
+impl<I> RecreateContext<I> for I {
+    fn recreate_context(_original_input: I, tail: I) -> Self {
+        tail
+    }
+}
+
+/// A byte offset into the input where an error may have occurred
+///
+/// # `&str` Example
+///
+/// ```
+/// use nom_supreme::final_parser::{ByteOffset, RecreateContext};
+///
+/// let original_input = "Hello,\nWorld!\n";
+/// let tail = &original_input[9..];
+///
+/// assert_eq!(
+///    ByteOffset::recreate_context(original_input, tail),
+///    ByteOffset(9),
+/// );
+/// ```
+///
+/// `# &[u8]` Example
+///
+/// ```
+/// use nom_supreme::final_parser::{ByteOffset, RecreateContext};
+///
+/// let original_input = b"GET / HTTP/1.1\r\n";
+/// let tail = &original_input[6..];
+///
+/// assert_eq!(
+///    ByteOffset::recreate_context(&original_input[..], tail),
+///    ByteOffset(6),
+/// );
+/// ```
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct ByteOffset(pub usize);
+
+impl<I: Offset> RecreateContext<I> for ByteOffset {
+    fn recreate_context(original_input: I, tail: I) -> Self {
+        ByteOffset(original_input.offset(&tail))
+    }
+}
+
+/// A location in a string where an error may have occurred. In keeping with
+/// the typical practice from editors and other tools, line and columns are both
+/// 1-indexed.
+///
+/// # Example
+///
+/// ```
+/// use nom_supreme::final_parser::{RecreateContext, Location};
+///
+/// let original_input = "Hello,\nWorld!\n";
+/// let tail = &original_input[9..];
+///
+/// assert_eq!(
+///    Location::recreate_context(original_input, tail),
+///    Location { line: 2, column: 3 },
+/// );
+/// ```
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Location {
+    /// The line number in the original input where the error occurred
+    pub line: usize,
+
+    /// The column of the line in the original input where the error occurred
+    pub column: usize,
+}
+
+impl Location {
+    /// Given the *original* input string, as well as the context reported by
+    /// nom, compute the location in the original string where the error
+    /// occurred.
+    ///
+    /// This function will report garbage (and may panic) if the context is not
+    /// associated with the input
+    pub fn locate_tail<'a>(original_input: &'a str, tail: &'a str) -> Self {
+        let offset = original_input.offset(tail);
+        let input_bytes = original_input.as_bytes();
+        let prefix = &input_bytes[..offset];
+
+        let line_number = memchr::memchr_iter(b'\n', prefix).count() + 1;
+
+        let last_line_start = memchr::memrchr(b'\n', prefix).map(|i| i + 1).unwrap_or(0);
+        let last_line = &prefix[last_line_start..];
+        let column_number = last_line.len() + 1;
+
+        Location {
+            line: line_number,
+            column: column_number,
+        }
+    }
+}
+
+impl Display for Location {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        if f.alternate() {
+            write!(f, "line {}, column {}", self.line, self.column)
+        } else {
+            write!(f, "{}:{}", self.line, self.column)
+        }
+    }
+}
+
+impl RecreateContext<&str> for Location {
+    fn recreate_context(original_input: &str, tail: &str) -> Self {
+        Location::locate_tail(original_input, tail)
+    }
+}
+
+/// Trait for recombining error information with the original input.
+///
+/// This trait is used to take the context information attached to nom errors-
+/// specifically, the tail of the input indicating the location of the input-
+/// and recombine it with the *original* input to produce an error with
+/// something more useful for error reporting.
+///
+/// Typically, it looks like  `ExtractContext<I, E<T>> for E<I>`. This
+/// indicates that some error type `E`, which is generic over the input type,
+/// can be converted into another variant of that error, using `T` instead of
+/// `I` to hold the result context. Often this context conversion can happen
+/// with [`RecreateContext`].
+pub trait ExtractContext<I, T> {
+    /// Given the context attached to a nom error, and given the *original*
+    /// input to the nom parser, extract more the useful context information.
+    ///
+    /// For example, for a string, 1 possible context extraction would be the
+    /// Location (line and column number) in the original input where the error
+    /// indicated by self occurred.
+    fn extract_context(self, original_input: I) -> T;
+}
+
+impl<I, T> ExtractContext<I, ()> for T {
+    fn extract_context(self, _original_input: I) {}
+}
+
+impl<I, T> ExtractContext<I, (T, ErrorKind)> for (I, ErrorKind)
+where
+    T: RecreateContext<I>,
+{
+    fn extract_context(self, original_input: I) -> (T, ErrorKind) {
+        let (tail, kind) = self;
+        (T::recreate_context(original_input, tail), kind)
+    }
+}
+
+impl<I, T> ExtractContext<I, Error<T>> for Error<I>
+where
+    T: RecreateContext<I>,
+{
+    fn extract_context(self, original_input: I) -> Error<T> {
+        Error::new(T::recreate_context(original_input, self.input), self.code)
+    }
+}
+
+impl<I, T> ExtractContext<I, VerboseError<T>> for VerboseError<I>
+where
+    T: RecreateContext<I>,
+    I: Clone,
+{
+    fn extract_context(self, original_input: I) -> VerboseError<T> {
+        VerboseError {
+            errors: self
+                .errors
+                .into_iter()
+                .map(|(input, kind)| (T::recreate_context(original_input.clone(), input), kind))
+                .collect(),
+        }
+    }
+}
+
+/// `extract_context` can be used directly on `Result` values that have an
+/// error with `ExtractContext`
+impl<T, E1, E2, I> ExtractContext<I, Result<T, E2>> for Result<T, E1>
+where
+    E1: ExtractContext<I, E2>,
+{
+    fn extract_context(self, original_input: I) -> Result<T, E2> {
+        self.map_err(move |err| err.extract_context(original_input))
+    }
+}
+
+/// Bootstrapping layer for a nom parser.
+///
+/// This function is intended to be the entry point into a nom parser; it
+/// represents in some sense the "end of composability". It creates a function
+/// which applies a parser to an input. The parser is configured such that it
+/// must parse the *entire* input, and any "Incomplete" responses are reported
+/// as errors. Additionally, if the parser returns an error, the context
+/// information in the error is recombined with the original input via
+/// `ExtractContext` to create a more useful error.
+pub fn final_parser<I, O, E, E2>(parser: impl Parser<I, O, E>) -> impl FnMut(I) -> Result<O, E2>
+where
+    E: ParseError<I> + ExtractContext<I, E2>,
+    I: InputLength + Clone,
+{
+    let mut parser = parser.complete().all_consuming();
+
+    move |input| match parser.parse(input.clone()) {
+        Ok((_, parsed)) => Ok(parsed),
+        Err(NomErr::Error(err)) | Err(NomErr::Failure(err)) => Err(err.extract_context(input)),
+        Err(NomErr::Incomplete(..)) => {
+            unreachable!("Complete combinator should make this impossible")
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/from_str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/from_str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/from_str.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/from_str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,35 @@
+use std::str::FromStr;
+
+use nom::{error::FromExternalError, Parser};
+
+use crate::parser_ext::ParserExt;
+
+/// A nom parser that parses any [`FromStr`] type. It uses a recognizer to
+/// parse the prefix string that should be parsed via FromStr.
+///
+/// # Example
+///
+/// ```
+/// # use nom::{IResult, Err, character::complete::digit1, Parser, error::{Error, ErrorKind}};
+/// use nom_supreme::{parse_from_str, parser_ext::ParserExt};
+///
+/// fn parse_int(input: &str) -> IResult<&str, i64> {
+///     parse_from_str(digit1).parse(input)
+/// }
+///
+/// assert_eq!(parse_int("125 abc"), Ok((" abc", 125)));
+/// assert_eq!(parse_int("abc"), Err(Err::Error(Error{input: "abc", code: ErrorKind::Digit})));
+///
+/// // The recognizer function determines what will be passed to `FromStr`.
+/// // in this example, it doesn't accept a leading sign, so this will fail
+/// // to parse.
+/// assert_eq!(parse_int("-125"),  Err(Err::Error(Error{input: "-125", code: ErrorKind::Digit})));
+/// ```
+pub fn parse_from_str<'a, F, T, E>(recognizer: F) -> impl Parser<&'a str, T, E>
+where
+    F: Parser<&'a str, &'a str, E> + Sized,
+    T: FromStr,
+    E: FromExternalError<&'a str, T::Err>,
+{
+    recognizer.parse_from_str()
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,46 @@
+//! A collection of excellent utilities for nom, including:
+//!
+//! - [`ParserExt`][parser_ext::ParserExt], a trait which makes available
+//!   many common nom parser combinators as postfix methods, to complement
+//!   those already available on [`nom::Parser`].
+//! - [`ErrorTree`][error::ErrorTree], a nom error which retains as much
+//!   information and context as possible about the details of the failed
+//!   parse, with an excellent indenting formatter for printing these failures.
+//!   Integrates with the extra error features of `nom-supreme`.
+//! - Improved [`tag`] parsers, which attach the mismatched the error in the
+//!   event of a parse failure, similar to
+//!   [`char`][nom::character::complete::char].
+//! - [`parse_separated_terminated`][multi::parse_separated_terminated], the
+//!   perfected folding parser for building parse loops.
+//! - [`final_parser`][final_parser::final_parser], which serves as a bridge
+//!   between nom-style [`IResult`][nom::IResult] parsers and more typical rust
+//!   results. It decorates a nom parser, requiring it to parse all of its
+//!   input, not return `Incomplete`. It also uses an
+//!   [`ExtractContext`][final_parser::ExtractContext] trait to convert the
+//!   error locations in nom errors, which are usually just suffixes of the
+//!   input, into more useful locations, such as a line and column number.
+
+#![deny(missing_docs)]
+
+/// Call a method or methods on an object, and then return the original object.
+///
+/// The input to this macro is the methods calls written in a chaining style:
+/// `express!(vec.push(1).push(2).push(3))`, which is transformed into a series
+/// of calls on the original object, then returning that object.
+macro_rules! express {
+    ($thing:ident $( . $method:ident ( $($args:tt)* ) )*) => {{
+        let mut thing = $thing;
+        $( thing.$method($($args)*); )*
+        thing
+    }};
+}
+
+pub mod error;
+pub mod final_parser;
+mod from_str;
+pub mod multi;
+pub mod parser_ext;
+pub mod tag;
+
+pub use from_str::parse_from_str;
+pub use parser_ext::ParserExt;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/multi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/multi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/multi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/multi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,626 @@
+/*!
+Perfected looping parsers designed to behave more reliably and provide more
+useful parse errors.
+
+The combinators in this module all generally follow the same pattern for
+parsing in a loop. They parse an item; then, they attempt to parse a
+`terminator`. If the `terminator` is found, the parse returns successfully;
+otherwise, they attempt to parse a `separator`. If they fail to parse either
+a `separator` or a `terminator`, the parse fails; otherwise, it will continue
+on to parse the next item. The parsed items are collected together into a final
+value; each combinator does this in a slightly different way:
+
+- [`collect_separated_terminated`] collects the parsed items into a collection
+with [`Extend`].
+- [`parse_separated_terminated`] combines the parsed items with a folding
+function.
+- [`parse_separated_terminated_res`] combines the parsed items with a fallible
+folding function; it may return early if the folding function returns an
+[`Err`].
+
+These combinators always parse at least 1 item. If you want 0 or more things
+to be parsed, use [`opt`] or [`alt`] to handle that case.
+
+These combinators will stop as soon as they find a `terminator`. If you wish
+to have a `terminator` parser that is the same as your `separator`, you'll need
+to add some extra context to the terminator parser; perhaps a lookahead
+with [`peek`].
+
+These combinators exists to provide meaningful parse errors. By requiring a
+`terminator`, we can ensure that they don't suffer from the normal folding
+parser problem of unconditionally returning success because a subparser failure
+is interpreted as the end of the loop. This ensures that potentially important
+errors aren't thrown away.
+
+The combinators will attempt to smartly allow 0-length matches. It will allow
+subparsers to have 0-length matches, but if a full loop is made without any
+progress being made, we assume we've encountered an infinite loop and return
+a parse error.
+
+[`opt`]: crate::parser_ext::ParserExt::opt
+[`alt`]: nom::branch::alt
+[`peek`]: crate::parser_ext::ParserExt::peek
+*/
+
+use std::{convert::Infallible, iter};
+
+use nom::{
+    error::{append_error, ErrorKind::SeparatedNonEmptyList, FromExternalError, ParseError},
+    Err::{Error, Failure, Incomplete},
+    Parser,
+};
+
+/**
+Parse a series of 1 or more things, separated by `separator`, terminated by
+`terminator`, and collect them into a collection using [`Extend`].
+
+When this parser is run, it will create a new, empty collection with
+[`Default`]. It will then collect each parsed item into the collection with
+[`Extend`]. See the [module] docs for details of how this parser parses a sequence.
+
+See the [module] docs for a detailed description of how this parser parses a sequence.
+
+# Example
+
+```
+use nom_supreme::{
+    multi::collect_separated_terminated,
+    parser_ext::ParserExt,
+    error::ErrorTree,
+};
+use nom::character::complete::{digit1, char, space0};
+use nom::{IResult, Parser, error::ParseError};
+
+fn parse_number(input: &str) -> IResult<&str, i32, ErrorTree<&str>> {
+    digit1
+        .preceded_by(char('-').opt())
+        .recognize()
+        .parse_from_str()
+        .parse(input)
+}
+
+// A vector is a square brackets, containing comma separated numbers, with
+// whitespace in between
+let mut vec_parser = collect_separated_terminated(
+    // Parse numbers
+    parse_number.terminated(space0),
+
+    // separated by commas
+    char(',').terminated(space0),
+
+    // terminated by a close bracket
+    char(']'),
+)
+// Allow for empty vectors
+.or(char(']').value(Vec::new()))
+.preceded_by(char('[').terminated(space0));
+
+let result: IResult<&str, Vec<i32>, ErrorTree<&str>> = vec_parser.parse("[1, 2, -3, 4]");
+let vec = result.unwrap().1;
+assert_eq!(vec, [1, 2, -3, 4]);
+
+```
+
+[module]: crate::multi
+*/
+pub fn collect_separated_terminated<
+    Input,
+    ParseOutput,
+    SepOutput,
+    TermOutput,
+    ParseErr,
+    Collection,
+>(
+    parser: impl Parser<Input, ParseOutput, ParseErr>,
+    separator: impl Parser<Input, SepOutput, ParseErr>,
+    terminator: impl Parser<Input, TermOutput, ParseErr>,
+) -> impl Parser<Input, Collection, ParseErr>
+where
+    Input: Clone + PartialEq,
+    ParseErr: ParseError<Input>,
+    Collection: Default + Extend<ParseOutput>,
+{
+    parse_separated_terminated(
+        parser,
+        separator,
+        terminator,
+        Collection::default,
+        // TODO: use extend_one
+        |collection, item| express!(collection.extend(iter::once(item))),
+    )
+}
+
+/**
+Parse a series of 1 or more things, separated by `separator`, terminated by
+`terminator`, and fold them together using a folding function.
+
+When this parser is run, it will first create an accumulator value with `init`.
+It will then combine it with every parsed item using `fold`, which should
+return the new accumulator for each item. See the [module] docs for details
+of how this parser parses a sequence.
+
+[module]: crate::multi
+*/
+#[inline]
+pub fn parse_separated_terminated<Input, ParseOutput, SepOutput, TermOutput, ParseErr, Accum>(
+    parser: impl Parser<Input, ParseOutput, ParseErr>,
+    separator: impl Parser<Input, SepOutput, ParseErr>,
+    terminator: impl Parser<Input, TermOutput, ParseErr>,
+
+    init: impl FnMut() -> Accum,
+    mut fold: impl FnMut(Accum, ParseOutput) -> Accum,
+) -> impl Parser<Input, Accum, ParseErr>
+where
+    Input: Clone + PartialEq,
+    ParseErr: ParseError<Input>,
+{
+    parse_separated_terminated_impl(
+        parser,
+        separator,
+        terminator,
+        init,
+        move |accum, item| Ok(fold(accum, item)),
+        |_input, err: Infallible| match err {},
+    )
+}
+
+/**
+Parse a series of 1 or more things, separated by some `separator`, terminated
+by some `terminator`, folding them all together with a fallible fold function.
+
+This function is identical to [`parse_separated_terminated`], except that
+the fold function may return an error, which ends the parse early. See its
+documentation for more details about the precise behavior of this parser.
+*/
+#[inline]
+pub fn parse_separated_terminated_res<
+    Input,
+    ParseOutput,
+    SepOutput,
+    TermOutput,
+    ParseErr,
+    Accum,
+    FoldErr,
+>(
+    parser: impl Parser<Input, ParseOutput, ParseErr>,
+    separator: impl Parser<Input, SepOutput, ParseErr>,
+    terminator: impl Parser<Input, TermOutput, ParseErr>,
+
+    init: impl FnMut() -> Accum,
+    fold: impl FnMut(Accum, ParseOutput) -> Result<Accum, FoldErr>,
+) -> impl Parser<Input, Accum, ParseErr>
+where
+    Input: Clone + PartialEq,
+    ParseErr: ParseError<Input> + FromExternalError<Input, FoldErr>,
+{
+    parse_separated_terminated_impl(parser, separator, terminator, init, fold, |input, err| {
+        ParseErr::from_external_error(input, SeparatedNonEmptyList, err)
+    })
+}
+
+/// Helper enum for tracking zero length parses. `parse_separated_terminated`
+/// allows for subparsers to return zero-length matches, but if *every*
+/// subparser does so in a loop, that's reported as an error.
+///
+/// This enum specifically tracks the least-recent zero-length parse that has
+/// not been succeeded by a non-zero-length parser.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum ZeroLengthParseState<E> {
+    None,
+    Item,
+    Separator { terminator_error: E },
+}
+
+impl<E> ZeroLengthParseState<E> {
+    fn terminator_error(self) -> Option<E> {
+        match self {
+            Self::Separator { terminator_error } => Some(terminator_error),
+            _ => None,
+        }
+    }
+}
+
+/// Shared implementation for parse_separated_terminated_res and
+/// parse_separated_terminated. This exists so that we don't have to have an
+/// unnecessary bound of FromExternalError on parse_separated_terminated.
+#[inline]
+fn parse_separated_terminated_impl<
+    Input,
+    ParseOutput,
+    SepOutput,
+    TermOutput,
+    ParseErr,
+    Accum,
+    FoldErr,
+>(
+    mut parser: impl Parser<Input, ParseOutput, ParseErr>,
+    mut separator: impl Parser<Input, SepOutput, ParseErr>,
+    mut terminator: impl Parser<Input, TermOutput, ParseErr>,
+
+    mut init: impl FnMut() -> Accum,
+    mut fold: impl FnMut(Accum, ParseOutput) -> Result<Accum, FoldErr>,
+
+    mut build_error: impl FnMut(Input, FoldErr) -> ParseErr,
+) -> impl Parser<Input, Accum, ParseErr>
+where
+    Input: Clone + PartialEq,
+    ParseErr: ParseError<Input>,
+{
+    move |mut input: Input| {
+        let mut accum = init();
+
+        let mut zero_length_state = ZeroLengthParseState::None;
+
+        loop {
+            // Try to find a value. To fail to do so at this point is an
+            // error, since we either just started or successfully parsed a
+            // separator.
+            //
+            // If an error occurs here, also try to attach terminator_error.
+            // terminator_error is available if the most recent separator parse
+            // was zero-length, which means that both the terminator and the
+            // item would be valid parses at this point.
+            let (tail, value) = match parser.parse(input.clone()) {
+                Ok(success) => success,
+                Err(Error(item_error)) => {
+                    break Err(Error(append_error(
+                        input,
+                        SeparatedNonEmptyList,
+                        match zero_length_state.terminator_error() {
+                            None => item_error,
+                            Some(terminator_error) => item_error.or(terminator_error),
+                        },
+                    )))
+                }
+                Err(Failure(item_error)) => {
+                    break Err(Failure(append_error(
+                        input,
+                        SeparatedNonEmptyList,
+                        item_error,
+                    )))
+                }
+                Err(Incomplete(n)) => break Err(Incomplete(n)),
+            };
+
+            // Check zero-length matches
+            zero_length_state = match (input == tail, zero_length_state) {
+                // If both the item and the separator had a zero length match,
+                // we're hanging. Bail.
+                //
+                // It doesn't make sense to include the terminator error here,
+                // because we *did* successfully parse a separator and an
+                // item, they just happened to be zero length
+                (true, ZeroLengthParseState::Separator { .. }) => {
+                    break Err(Error(ParseErr::from_error_kind(
+                        input,
+                        SeparatedNonEmptyList,
+                    )))
+                }
+
+                // If only the item had a zero-length match, update the
+                // state.
+                (true, _) => ZeroLengthParseState::Item,
+
+                // If the item had a non-zero length match, clear the state
+                (false, _) => ZeroLengthParseState::None,
+            };
+
+            // Advance the loop state
+            accum = fold(accum, value).map_err(|err| Error(build_error(input, err)))?;
+            input = tail;
+
+            // Try to find a terminator; if we found it, we're done. If we
+            // didn't, preserve the error, so that it can be reported as an
+            // .or() branch with the subsequent separator or item error.
+            let terminator_error = match terminator.parse(input.clone()) {
+                // We found a terminator, so we're done
+                Ok((tail, _)) => break Ok((tail, accum)),
+
+                // No terminator. Keep track of the error in case we also fail
+                // to find a separator or item.
+                Err(Error(err)) => err,
+
+                // Other kinds of errors should be returned immediately.
+                Err(err) => {
+                    break Err(err.map(move |err| append_error(input, SeparatedNonEmptyList, err)))
+                }
+            };
+
+            // No terminator, so instead try to find a separator
+            let tail = match separator.parse(input.clone()) {
+                Ok((tail, _)) => tail,
+                Err(Error(separator_error)) => {
+                    break Err(Error(append_error(
+                        input,
+                        SeparatedNonEmptyList,
+                        separator_error.or(terminator_error),
+                    )))
+                }
+                Err(Failure(separator_error)) => {
+                    break (Err(Failure(append_error(
+                        input,
+                        SeparatedNonEmptyList,
+                        separator_error,
+                    ))))
+                }
+                Err(Incomplete(n)) => break Err(Incomplete(n)),
+            };
+
+            // Check zero-length matches
+            zero_length_state = match (input == tail, zero_length_state) {
+                // If both the separator and the item had a zero length match,
+                // we're hanging. Bail.
+                (true, ZeroLengthParseState::Item) => {
+                    break Err(Error(ParseErr::from_error_kind(
+                        input,
+                        SeparatedNonEmptyList,
+                    )))
+                }
+                // If only the separator had a zero-length match, update the
+                // state. Additionally preserve the terminator error so that
+                // it can be reported as an alternate if there was an item
+                // error.
+                (true, _) => ZeroLengthParseState::Separator { terminator_error },
+
+                // If the separator had a non-zero length match, clear the
+                // state
+                (false, _) => ZeroLengthParseState::None,
+            };
+
+            // Advance the loop state
+            input = tail;
+        }
+    }
+}
+
+#[cfg(test)]
+mod test_separated_terminated {
+    use cool_asserts::assert_matches;
+    use nom::{
+        branch::alt,
+        character::complete::{alpha0, char, digit1, space0},
+        error::ErrorKind,
+        Err, IResult, Parser,
+    };
+
+    use crate::parser_ext::ParserExt;
+    use crate::{
+        error::{BaseErrorKind, ErrorTree, Expectation, StackContext},
+        parse_from_str,
+    };
+
+    use super::parse_separated_terminated;
+
+    /// Parse a series of numbers, separated by commas, terminated by a period.
+    fn parse_number_list(input: &str) -> IResult<&str, Vec<i64>, ErrorTree<&str>> {
+        parse_separated_terminated(
+            parse_from_str(digit1),
+            char(',').delimited_by(space0),
+            char('.').preceded_by(space0),
+            Vec::new,
+            |vec, num| express!(vec.push(num)),
+        )
+        .parse(input)
+    }
+
+    #[test]
+    fn basic() {
+        assert_eq!(
+            parse_number_list("1, 2, 3, 4, 5.").unwrap(),
+            ("", vec![1, 2, 3, 4, 5]),
+        )
+    }
+
+    #[test]
+    fn trailing_input() {
+        assert_eq!(
+            parse_number_list("1, 2, 3, 4, 5. 4, 5, 6.").unwrap(),
+            (" 4, 5, 6.", vec![1, 2, 3, 4, 5]),
+        )
+    }
+
+    #[test]
+    fn only_one() {
+        assert_eq!(parse_number_list("10.").unwrap(), ("", vec![10]),)
+    }
+
+    #[test]
+    fn at_least_one() {
+        let err = parse_number_list("abc").unwrap_err();
+
+        assert_matches!(
+            err,
+            Err::Error(ErrorTree::Stack{contexts, base}) => {
+                assert_eq!(contexts, [("abc", StackContext::Kind(ErrorKind::SeparatedNonEmptyList))]);
+                assert_matches!(
+                    *base,
+                    ErrorTree::Base{location: "abc", kind: BaseErrorKind::Expected(Expectation::Digit)},
+                );
+            }
+        );
+    }
+
+    /// Test that a parse failure from both the separator and the terminator
+    /// causes an error including both messages
+    #[test]
+    fn terminator_separator_miss() {
+        let err = parse_number_list("10, 20 30.").unwrap_err();
+
+        assert_matches!(err, Err::Error(ErrorTree::Stack{contexts, base}) => {
+            assert_eq!(contexts, [(" 30.", StackContext::Kind(ErrorKind::SeparatedNonEmptyList))]);
+            assert_matches!(*base, ErrorTree::Alt(choices) => assert_matches!(choices.as_slice(), [
+                ErrorTree::Base{location: "30.", kind: BaseErrorKind::Expected(Expectation::Char(','))},
+                ErrorTree::Base{location: "30.", kind: BaseErrorKind::Expected(Expectation::Char('.'))},
+            ]));
+        });
+    }
+
+    /// Test that a terminator is required, even at EoF
+    #[test]
+    fn required_terminator() {
+        let err = parse_number_list("1, 2, 3").unwrap_err();
+
+        assert_matches!(err, Err::Error(ErrorTree::Stack{contexts, base}) => {
+            assert_eq!(contexts, [("", StackContext::Kind(ErrorKind::SeparatedNonEmptyList))]);
+            assert_matches!(*base, ErrorTree::Alt(choices) => assert_matches!(
+                choices.as_slice(),
+                [
+                    ErrorTree::Base {
+                        location: "",
+                        kind: BaseErrorKind::Expected(Expectation::Char(','))
+                    },
+                    ErrorTree::Base {
+                        location: "",
+                        kind: BaseErrorKind::Expected(Expectation::Char('.'))
+                    },
+                ]
+            ));
+        });
+    }
+
+    /// Test that a parse failure from the item parser includes only that error
+    /// if the separator isn't zero-length
+    #[test]
+    fn item_error() {
+        let err = parse_number_list("1, 2, abc.").unwrap_err();
+
+        assert_matches!(err, Err::Error(ErrorTree::Stack{base, contexts}) => {
+            assert_eq!(contexts, [("abc.", StackContext::Kind(ErrorKind::SeparatedNonEmptyList))]);
+            assert_matches!(*base, ErrorTree::Base {
+                location: "abc.",
+                kind: BaseErrorKind::Expected(Expectation::Digit),
+            });
+        });
+    }
+
+    /// Parse a series of numbers ending in periods, separated by 0 or more
+    /// whitespace, terminated by a semicolon. Used to test 0-length
+    /// separator behavior.
+    fn parse_number_dot_list(input: &str) -> IResult<&str, Vec<i64>, ErrorTree<&str>> {
+        parse_separated_terminated(
+            digit1.parse_from_str().terminated(char('.')),
+            space0,
+            char(';'),
+            Vec::new,
+            |vec, num| express!(vec.push(num)),
+        )
+        .parse(input)
+    }
+
+    #[test]
+    fn zero_length_separator() {
+        assert_eq!(
+            parse_number_dot_list("1.2. 3.4.  5.; abc").unwrap(),
+            (" abc", vec![1, 2, 3, 4, 5])
+        );
+    }
+
+    /// Test that, when a separator matches zero length, and then the item
+    /// parser fails, the returned error includes both the item error and the
+    /// terminator error.
+    #[test]
+    fn zero_length_separator_item_term_error() {
+        let err = parse_number_dot_list("1.2.3.abc.;").unwrap_err();
+
+        assert_matches!(err, Err::Error(ErrorTree::Stack{contexts, base}) => {
+            assert_eq!(contexts, [("abc.;", StackContext::Kind(ErrorKind::SeparatedNonEmptyList))]);
+            assert_matches!(*base, ErrorTree::Alt(choices) => assert_matches!(
+                choices.as_slice(),
+                [
+                    ErrorTree::Base {
+                        location: "abc.;",
+                        kind: BaseErrorKind::Expected(Expectation::Digit)
+                    },
+                    ErrorTree::Base {
+                        location: "abc.;",
+                        kind: BaseErrorKind::Expected(Expectation::Char(';'))
+                    },
+                ]
+            ));
+        });
+    }
+
+    /// Parse a series of runs of 1 or more digits or 0 more more letters, separated by
+    /// an optional dash, terminated by a semicolon. Used to test
+    /// infinite loop detection
+    fn parse_letters_numbers(input: &str) -> IResult<&str, Vec<&str>, ErrorTree<&str>> {
+        parse_separated_terminated(
+            alt((digit1, alpha0)),
+            char('-').opt(),
+            char(';'),
+            Vec::new,
+            |vec, num| express!(vec.push(num)),
+        )
+        .parse(input)
+    }
+
+    #[test]
+    fn zero_length_item() {
+        assert_eq!(
+            parse_letters_numbers("----; abc").unwrap(),
+            (" abc", vec!["", "", "", "", ""])
+        )
+    }
+
+    #[test]
+    fn zero_length_separators() {
+        assert_eq!(
+            parse_letters_numbers("abc123abc123; abc").unwrap(),
+            (" abc", vec!["abc", "123", "abc", "123"]),
+        )
+    }
+
+    /// Test that both zero-length separators and items are allowed together,
+    /// as long as the loop makes progress
+    #[test]
+    fn zero_length_mixed() {
+        assert_eq!(
+            parse_letters_numbers("abc--123abc-123-; abc").unwrap(),
+            (" abc", vec!["abc", "", "123", "abc", "123", ""]),
+        )
+    }
+
+    /// Test that if the loop makes no progress, that's an error
+    #[test]
+    fn infinite_loop_aborts() {
+        let err = parse_letters_numbers("abc123-.; abc").unwrap_err();
+
+        assert_matches!(
+            err,
+            Err::Error(ErrorTree::Base {
+                location: ".; abc",
+                kind: BaseErrorKind::Kind(ErrorKind::SeparatedNonEmptyList)
+            })
+        );
+    }
+
+    /// Parse a series of numbers, separated by commas, terminated by optional
+    /// comma and eof. Used to test that the terminator "wins" when it and the
+    /// separator can match the same string.
+    fn parse_comma_separated(input: &str) -> IResult<&str, Vec<i64>, ErrorTree<&str>> {
+        parse_separated_terminated(
+            parse_from_str(digit1),
+            char(','),
+            char(',').opt().all_consuming(),
+            Vec::new,
+            |vec, num| express!(vec.push(num)),
+        )
+        .parse(input)
+    }
+
+    #[test]
+    fn empty_terminator_wins() {
+        assert_eq!(
+            parse_comma_separated("1,2,3,4").unwrap(),
+            ("", vec![1, 2, 3, 4]),
+        );
+    }
+
+    #[test]
+    fn test_terminator_wins() {
+        assert_eq!(
+            parse_comma_separated("1,2,3,4,").unwrap(),
+            ("", vec![1, 2, 3, 4]),
+        )
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/parser_ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/parser_ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/parser_ext.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/parser_ext.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1439 @@
+//! Extensions to the nom [`Parser`][nom::Parser] trait which add postfix
+//! versions of the common combinators. See [`ParserExt`] for details.
+
+use std::{marker::PhantomData, ops::RangeTo, str::FromStr};
+
+use nom::{
+    error::{ContextError, ErrorKind as NomErrorKind, FromExternalError, ParseError},
+    Err as NomErr, InputLength, Offset, Parser, Slice,
+};
+
+/// No-op function that typechecks that its argument is a parser. Used to
+/// ensure there are no accidentally missing type bounds on the `ParserExt`
+/// methods
+#[inline(always)]
+fn must_be_a_parser<I, O, E, P: Parser<I, O, E>>(parser: P) -> P {
+    parser
+}
+
+/// Additional postfix parser combinators, as a complement to [`Parser`].
+/// Mostly these are postfix versions of the combinators in [`nom::combinator`]
+/// and [`nom::sequence`], with some additional combinators original to
+/// `nom-supreme`.
+///
+/// Compatibility note: it is expected that eventually many of these postfix
+/// methods will eventually be added directly to the [`Parser`] trait. It will
+/// therefore *not* be considered a compatibility break to remove those methods
+/// from [`ParserExt`], *if* they have the same name and signature.
+pub trait ParserExt<I, O, E>: Parser<I, O, E> + Sized {
+    /// Borrow a parser. This allows building parser combinators while still
+    /// retaining ownership of the original parser. This is necessary because
+    /// `impl<T: Parser> Parser for &mut T` is impossible due to conflicts
+    /// with `impl<T: FnMut> Parser for T`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Hello");
+    ///
+    /// let mut subparser = parser.by_ref().terminated(tag(", World"));
+    ///
+    /// assert_eq!(subparser.parse("Hello, World!"), Ok(("!", "Hello")));
+    /// assert_eq!(
+    ///     subparser.parse("Hello"),
+    ///     Err(Err::Error(Error{input: "", code: ErrorKind::Tag}))
+    /// );
+    ///
+    /// // We still have ownership of the original parser
+    ///
+    /// assert_eq!(parser.parse("Hello, World!"), Ok((", World!", "Hello")));
+    /// assert_eq!(parser.parse("Hello"), Ok(("", "Hello")));
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn by_ref(&mut self) -> RefParser<Self> {
+        must_be_a_parser(RefParser { parser: self })
+    }
+
+    /// Create a parser that must consume all of the input, or else return an
+    /// error.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Hello").all_consuming();
+    ///
+    /// assert_eq!(parser.parse("Hello"), Ok(("", "Hello")));
+    /// assert_eq!(
+    ///     parser.parse("World"),
+    ///     Err(Err::Error(Error{input: "World", code: ErrorKind::Tag}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("Hello World"),
+    ///     Err(Err::Error(Error{input: " World", code: ErrorKind::Eof}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn all_consuming(self) -> AllConsuming<Self>
+    where
+        I: InputLength,
+        E: ParseError<I>,
+    {
+        must_be_a_parser(AllConsuming { parser: self })
+    }
+
+    /// Create a parser that transforms `Incomplete` into `Error`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::streaming::tag;
+    ///
+    /// let mut parser = tag("Hello").complete();
+    ///
+    /// assert_eq!(parser.parse("Hello"), Ok(("", "Hello")));
+    /// assert_eq!(
+    ///     parser.parse("World"),
+    ///     Err(Err::Error(Error{input: "World", code: ErrorKind::Tag}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("Hel"),
+    ///     Err(Err::Error(Error{input: "Hel", code: ErrorKind::Complete}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn complete(self) -> Complete<Self>
+    where
+        I: Clone,
+        E: ParseError<I>,
+    {
+        must_be_a_parser(Complete { parser: self })
+    }
+
+    /// Create a parser that transforms `Error` into `Failure`. This will
+    /// end the parse immediately, even if there are other branches that
+    /// could occur.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Hello").cut();
+    ///
+    /// assert_eq!(parser.parse("Hello"), Ok(("", "Hello")));
+    /// assert_eq!(
+    ///     parser.parse("World"),
+    ///     Err(Err::Failure(Error{input: "World", code: ErrorKind::Tag}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn cut(self) -> Cut<Self> {
+        must_be_a_parser(Cut { parser: self })
+    }
+
+    /// Create a parser that applies a mapping function `func` to the output
+    /// of the subparser. Any errors from `func` will be transformed into
+    /// parse errors via [`FromExternalError`].
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::alphanumeric1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    ///
+    /// let mut parser = alphanumeric1.map_res(|s: &str| s.parse());
+    ///
+    /// assert_eq!(parser.parse("10 abc"), Ok((" abc", 10)));
+    /// assert_eq!(
+    ///     parser.parse("<===>"),
+    ///     Err(Err::Error(Error{input: "<===>", code: ErrorKind::AlphaNumeric})),
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("abc abc"),
+    ///     Err(Err::Error(Error{input: "abc abc", code: ErrorKind::MapRes})),
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn map_res<F, O2, E2>(self, func: F) -> MapRes<Self, F, O, E2>
+    where
+        F: FnMut(O) -> Result<O2, E2>,
+        E: FromExternalError<I, E2>,
+        I: Clone,
+    {
+        must_be_a_parser(MapRes {
+            parser: self,
+            func,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Create a parser that applies a mapping function `func` to the output
+    /// of the subparser. Any errors from `func` will be transformed into
+    /// parse failures via [`FromExternalError`]. This will
+    /// end the parse immediately, even if there are other branches that
+    /// could occur.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::alphanumeric1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    ///
+    /// let mut parser = alphanumeric1.map_res_cut(|s: &str| s.parse());
+    ///
+    /// assert_eq!(parser.parse("10 abc"), Ok((" abc", 10)));
+    /// assert_eq!(
+    ///     parser.parse("<===>"),
+    ///     Err(Err::Error(Error{input: "<===>", code: ErrorKind::AlphaNumeric})),
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("abc abc"),
+    ///     Err(Err::Failure(Error{input: "abc abc", code: ErrorKind::MapRes})),
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn map_res_cut<F, O2, E2>(self, func: F) -> MapResCut<Self, F, O, E2>
+    where
+        F: FnMut(O) -> Result<O2, E2>,
+        E: FromExternalError<I, E2>,
+        I: Clone,
+    {
+        must_be_a_parser(MapResCut {
+            parser: self,
+            func,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Make this parser optional; if it fails to parse, instead it returns
+    /// `None` with the input in the original position.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser, IResult};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// fn parser(input: &str) -> IResult<&str, Option<&str>> {
+    ///     tag("Hello").opt().parse(input)
+    /// }
+    ///
+    /// assert_eq!(parser.parse("Hello, World"), Ok((", World", Some("Hello"))));
+    /// assert_eq!(parser.parse("World"), Ok(("World", None)));
+    ///
+    /// let mut parser = tag("Hello").cut().opt();
+    /// assert_eq!(
+    ///     parser.parse("World"),
+    ///     Err(Err::Failure(Error{input: "World", code: ErrorKind::Tag}))
+    /// )
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn opt(self) -> Optional<Self>
+    where
+        I: Clone,
+    {
+        must_be_a_parser(Optional { parser: self })
+    }
+
+    /// Replace this parser's output with the entire input that was consumed
+    /// by the parser.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::space1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Hello").delimited_by(space1).recognize();
+    ///
+    /// assert_eq!(parser.parse("   Hello   World!"), Ok(("World!", "   Hello   ")));
+    /// assert_eq!(
+    ///     parser.parse("Hello"),
+    ///     Err(Err::Error(Error{input: "Hello", code: ErrorKind::Space}))
+    /// )
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn recognize(self) -> Recognize<Self, O>
+    where
+        I: Clone + Slice<RangeTo<usize>> + Offset,
+    {
+        must_be_a_parser(Recognize {
+            parser: self.with_recognized(),
+            phantom: PhantomData,
+        })
+    }
+
+    /// Return the parsed value, but also return the entire input that was
+    /// consumed by the parse
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::space1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Hello").delimited_by(space1).with_recognized();
+    ///
+    /// assert_eq!(parser.parse("   Hello   World!"), Ok(("World!", ("   Hello   ", "Hello"))));
+    /// assert_eq!(
+    ///     parser.parse("Hello"),
+    ///     Err(Err::Error(Error{input: "Hello", code: ErrorKind::Space}))
+    /// )
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn with_recognized(self) -> WithRecognized<Self>
+    where
+        I: Clone + Slice<RangeTo<usize>> + Offset,
+    {
+        must_be_a_parser(WithRecognized { parser: self })
+    }
+
+    /// Replace this parser's output with a clone of `value` every time it
+    /// finishes successfully.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::branch::alt;
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    /// use nom_supreme::error::{ErrorTree, BaseErrorKind, Expectation};
+    ///
+    ///
+    /// let mut parser = alt((
+    ///     tag("true").value(true),
+    ///     tag("false").value(false),
+    /// ));
+    ///
+    /// assert_eq!(parser.parse("true abc").unwrap(), (" abc", true));
+    /// assert_eq!(parser.parse("false abc").unwrap(), (" abc", false));
+    ///
+    /// // ErrorTree gives much better error reports for alt and tag.
+    /// let err = parser.parse("null").unwrap_err();
+    /// let choices = match err {
+    ///     Err::Error(ErrorTree::Alt(choices)) => choices,
+    ///     _ => panic!("Unexpected error {:?}", err)
+    /// };
+    /// assert!(matches!(
+    ///     choices.as_slice(),
+    ///     [
+    ///         ErrorTree::Base {
+    ///             kind: BaseErrorKind::Expected(Expectation::Tag("true")),
+    ///             location: "null",
+    ///         },
+    ///         ErrorTree::Base {
+    ///             kind: BaseErrorKind::Expected(Expectation::Tag("false")),
+    ///             location: "null",
+    ///         },
+    ///     ]
+    /// ))
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn value<T: Clone>(self, value: T) -> Value<T, Self, O> {
+        must_be_a_parser(Value {
+            parser: self,
+            value,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Require the output of this parser to pass a verifier function, or
+    /// else return a parse error.
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::alpha1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    ///
+    /// let mut parser = alpha1.verify(|s: &&str| s.len() == 5);
+    ///
+    /// assert_eq!(parser.parse("Hello"), Ok(("", "Hello")));
+    /// assert_eq!(parser.parse("Hello, World"), Ok((", World", "Hello")));
+    /// assert_eq!(
+    ///     parser.parse("abc"),
+    ///     Err(Err::Error(Error{input: "abc", code: ErrorKind::Verify}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("abcabcabc"),
+    ///     Err(Err::Error(Error{input: "abcabcabc", code: ErrorKind::Verify}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("123"),
+    ///     Err(Err::Error(Error{input: "123", code: ErrorKind::Alpha}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn verify<F>(self, verifier: F) -> Verify<Self, F>
+    where
+        F: Fn(&O) -> bool,
+        I: Clone,
+        E: ParseError<I>,
+    {
+        must_be_a_parser(Verify {
+            parser: self,
+            verifier,
+        })
+    }
+
+    /// Add some context to the parser. This context will be added to any
+    /// errors that are returned from the parser via [`ContextError`].
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{VerboseError, ErrorKind, VerboseErrorKind};
+    /// use nom::sequence::separated_pair;
+    /// use nom::character::complete::space1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = separated_pair(
+    ///     tag("Hello").context("hello"),
+    ///     space1,
+    ///     tag("World").context("world"),
+    /// )
+    /// .context("hello world");
+    ///
+    /// assert_eq!(parser.parse("Hello World"), Ok(("", ("Hello", "World"))));
+    /// assert_eq!(
+    ///     parser.parse("Hel"),
+    ///     Err(Err::Error(VerboseError {errors: vec![
+    ///         ("Hel", VerboseErrorKind::Nom(ErrorKind::Tag)),
+    ///         ("Hel", VerboseErrorKind::Context("hello")),
+    ///         ("Hel", VerboseErrorKind::Context("hello world")),
+    ///     ]}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("Hello"),
+    ///     Err(Err::Error(VerboseError {errors: vec![
+    ///         ("", VerboseErrorKind::Nom(ErrorKind::Space)),
+    ///         ("Hello", VerboseErrorKind::Context("hello world")),
+    ///     ]}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("Hello Wor"),
+    ///     Err(Err::Error(VerboseError {errors: vec![
+    ///         ("Wor", VerboseErrorKind::Nom(ErrorKind::Tag)),
+    ///         ("Wor", VerboseErrorKind::Context("world")),
+    ///         ("Hello Wor", VerboseErrorKind::Context("hello world")),
+    ///     ]}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn context(self, context: &'static str) -> Context<Self>
+    where
+        E: ContextError<I>,
+        I: Clone,
+    {
+        must_be_a_parser(Context {
+            context,
+            parser: self,
+        })
+    }
+
+    /// Add a terminator parser. The terminator will run after this parser,
+    /// returning any errors, but its output will otherwise be discarded.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Hello").terminated(tag(" World"));
+    ///
+    /// assert_eq!(parser.parse("Hello World!"), Ok(("!", "Hello")));
+    /// assert_eq!(
+    ///     parser.parse("Hello"),
+    ///     Err(Err::Error(Error{input: "", code: ErrorKind::Tag}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn terminated<F, O2>(self, terminator: F) -> Terminated<Self, F, O2>
+    where
+        F: Parser<I, O2, E>,
+    {
+        must_be_a_parser(Terminated {
+            parser: self,
+            terminator,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Make this parser precede another one. The successor parser will run
+    /// after this one succeeds, and the successor's output will be returned.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::digit1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Value: ").precedes(digit1);
+    ///
+    /// assert_eq!(parser.parse("Value: 25;"), Ok((";", "25")));
+    /// assert_eq!(
+    ///     parser.parse("Value: "),
+    ///     Err(Err::Error(Error{input: "", code: ErrorKind::Digit}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("25"),
+    ///     Err(Err::Error(Error{input: "25", code: ErrorKind::Tag}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn precedes<F, O2>(self, successor: F) -> Preceded<F, Self, O>
+    where
+        F: Parser<I, O2, E>,
+    {
+        must_be_a_parser(successor.preceded_by(self))
+    }
+
+    /// Make this parser preceded by another one. The `prefix` will run first,
+    /// and if it succeeds, its output will be discard and this parser will
+    /// be run.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::digit1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = digit1.preceded_by(tag("Value: "));
+    ///
+    /// assert_eq!(parser.parse("Value: 25;"), Ok((";", "25")));
+    /// assert_eq!(
+    ///     parser.parse("Value: "),
+    ///     Err(Err::Error(Error{input: "", code: ErrorKind::Digit}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("25"),
+    ///     Err(Err::Error(Error{input: "25", code: ErrorKind::Tag}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn preceded_by<F, O2>(self, prefix: F) -> Preceded<Self, F, O2>
+    where
+        F: Parser<I, O2, E>,
+    {
+        must_be_a_parser(Preceded {
+            parser: self,
+            prefix,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Make this parser delimited, requiring a `delimiter` as both a prefix and
+    /// a suffix. The output of the delimiters is discarded.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::{char, digit1};
+    /// use nom_supreme::parser_ext::ParserExt;
+    ///
+    /// let mut parser = digit1.delimited_by(char('\''));
+    ///
+    /// assert_eq!(parser.parse("'123' '456'"), Ok((" '456'", "123")));
+    /// assert_eq!(
+    ///     parser.parse("'' ''"),
+    ///     Err(Err::Error(Error{input: "' ''", code: ErrorKind::Digit}))
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("'123 '"),
+    ///     Err(Err::Error(Error{input: " '", code: ErrorKind::Char}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn delimited_by<D, O2>(self, delimiter: D) -> Delimited<Self, D, O2>
+    where
+        D: Parser<I, O2, E>,
+    {
+        must_be_a_parser(Delimited {
+            parser: self,
+            delimiter,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Make this parser peeking: it runs normally but consumes no input.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Hello").peek();
+    ///
+    /// assert_eq!(parser.parse("Hello World"), Ok(("Hello World", "Hello")));
+    /// assert_eq!(
+    ///     parser.parse("World"),
+    ///     Err(Err::Error(Error{input: "World", code: ErrorKind::Tag}))
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn peek(self) -> Peek<Self>
+    where
+        I: Clone,
+    {
+        must_be_a_parser(Peek { parser: self })
+    }
+
+    /// Make this parser a negative lookahead: it will succeed if the subparser
+    /// fails, and fail if the subparser succeeds.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = tag("Hello").not();
+    ///
+    /// assert_eq!(parser.parse("World"), Ok(("World", ())));
+    /// assert_eq!(
+    ///     parser.parse("Hello World"),
+    ///     Err(Err::Error(Error{input: "Hello World", code: ErrorKind::Not})),
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn not(self) -> Not<Self, O>
+    where
+        I: Clone,
+        E: ParseError<I>,
+    {
+        must_be_a_parser(Not {
+            parser: self,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Create a parser that parses something via [`FromStr`], using this
+    /// parser as a recognizer for the string to pass to
+    /// [`from_str`][FromStr::from_str].
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser, IResult};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::digit1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    ///
+    /// let mut parser = digit1.parse_from_str();
+    ///
+    /// assert_eq!(parser.parse("123 abc"), Ok((" abc", 123)));
+    /// assert_eq!(
+    ///     parser.parse("abc"),
+    ///     Err(Err::Error(Error{input: "abc", code: ErrorKind::Digit})),
+    /// );
+    /// ```
+    ///
+    /// # Parse error example
+    ///
+    /// If the [`FromStr`] parser fails, the error is recoverable from via
+    /// [`FromExternalError`]. In general, though, it's better practice to
+    /// ensure your recognizer won't allow invalid strings to be forwarded to
+    /// the [`FromStr`] parser
+    ///
+    /// ```rust
+    /// use std::num::ParseIntError;
+    /// use cool_asserts::assert_matches;
+    /// # use nom::{Err, Parser, IResult};
+    /// # use nom::error::{ErrorKind};
+    /// use nom::character::complete::alphanumeric1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::error::{ErrorTree, BaseErrorKind};
+    ///
+    /// let mut parser = alphanumeric1.parse_from_str();
+    ///
+    /// assert_matches!(parser.parse("123 abc"), Ok((" abc", 123)));
+    /// assert_matches!(
+    ///     parser.parse("abc"),
+    ///     Err(Err::Error(ErrorTree::Base{
+    ///         location: "abc",
+    ///         kind: BaseErrorKind::External(err),
+    ///     })) => {
+    ///         let _err: &ParseIntError = err.downcast_ref().unwrap();
+    ///     },
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn parse_from_str<'a, T>(self) -> FromStrParser<Self, T>
+    where
+        Self: Parser<&'a str, &'a str, E>,
+        T: FromStr,
+        E: FromExternalError<&'a str, T::Err>,
+    {
+        must_be_a_parser(FromStrParser {
+            parser: self,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Create a parser that parses something via [`FromStr`], using this
+    /// parser as a recognizer for the string to pass to
+    /// [`from_str`][FromStr::from_str]. This parser transforms any errors
+    /// from [`FromStr`] into [`Err::Failure`][NomErr::Failure], which will
+    /// end the overall parse immediately, even if there are other branches
+    /// that could be tried.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nom::{Err, Parser, IResult};
+    /// # use nom::error::{Error, ErrorKind};
+    /// use nom::character::complete::alphanumeric1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    ///
+    /// let mut parser = alphanumeric1.parse_from_str_cut();
+    ///
+    /// assert_eq!(parser.parse("123 abc"), Ok((" abc", 123)));
+    /// assert_eq!(
+    ///     parser.parse("<===>"),
+    ///     Err(Err::Error(Error{input: "<===>", code: ErrorKind::AlphaNumeric})),
+    /// );
+    /// assert_eq!(
+    ///     parser.parse("abc"),
+    ///     Err(Err::Failure(Error{input: "abc", code: ErrorKind::MapRes})),
+    /// );
+    /// ```
+    ///
+    /// # Parse error example
+    ///
+    /// If the [`FromStr`] parser fails, the error is recoverable from via
+    /// [`FromExternalError`]. In general, though, it's better practice to
+    /// ensure your recognizer won't allow invalid strings to be forwarded to
+    /// the [`FromStr`] parser
+    ///
+    /// ```rust
+    /// use std::num::ParseIntError;
+    /// use cool_asserts::assert_matches;
+    /// # use nom::{Err, Parser, IResult};
+    /// # use nom::error::{ErrorKind};
+    /// use nom::character::complete::alphanumeric1;
+    /// use nom_supreme::parser_ext::ParserExt;
+    /// use nom_supreme::error::{ErrorTree, BaseErrorKind};
+    ///
+    /// let mut parser = alphanumeric1.parse_from_str_cut();
+    ///
+    /// assert_matches!(parser.parse("123 abc"), Ok((" abc", 123)));
+    /// assert_matches!(
+    ///     parser.parse("abc"),
+    ///     Err(Err::Failure(ErrorTree::Base{
+    ///         location: "abc",
+    ///         kind: BaseErrorKind::External(err),
+    ///     })) => {
+    ///         let _err: &ParseIntError = err.downcast_ref().unwrap();
+    ///     },
+    /// );
+    /// ```
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn parse_from_str_cut<'a, T>(self) -> FromStrCutParser<Self, T>
+    where
+        Self: Parser<&'a str, &'a str, E>,
+        T: FromStr,
+        E: FromExternalError<&'a str, T::Err>,
+    {
+        must_be_a_parser(FromStrCutParser {
+            parser: self,
+            phantom: PhantomData,
+        })
+    }
+
+    /// Create a parser that parses a fixed-size array by running this parser
+    /// in a loop.
+    ///
+    /// The returned parser implements [`Parser`] generically over any
+    /// `const N: usize`, which means it can be used to parse arrays of any
+    /// length
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use cool_asserts::assert_matches;
+    /// use nom::character::complete::digit1;
+    /// # use nom::{Parser, Err, IResult};
+    /// # use nom::error::{ErrorKind, Error};
+    /// use nom_supreme::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = digit1
+    ///     .terminated(tag(", "))
+    ///     .parse_from_str()
+    ///     .array();
+    ///
+    /// assert_matches!(parser.parse("123, 456, 789, abc"), Ok(("789, abc", [123, 456])));
+    /// assert_matches!(parser.parse("123, 456, 789, abc"), Ok(("abc", [123, 456, 789])));
+    ///
+    /// let res: Result<(&str, [u16; 4]), Err<Error<&str>>> = parser.parse("123, 456, 789, abc");
+    /// assert_matches!(
+    ///     res,
+    ///     Err(Err::Error(Error{input: "abc", code: ErrorKind::Digit}))
+    /// );
+    /// ```
+    ///
+    /// Note that this parser does not attach any additional context to the
+    /// error in the event of a parser; consider using [`context`][Self::context]
+    /// on the item parser or array parser to add additional information about
+    /// where in the input there was a parse failure.
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn array(self) -> ArrayParser<Self> {
+        ArrayParser { parser: self }
+    }
+
+    /// Create a parser that parses a fixed-size array by running this parser
+    /// in a loop, parsing a separator in between each element.
+    ///
+    /// The returned parser implements [`Parser`] generically over any
+    /// `const N: usize`, which means it can be used to parse arrays of any
+    /// length
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use std::net::{Ipv4Addr, SocketAddrV4};
+    /// use cool_asserts::assert_matches;
+    /// use nom::character::complete::{char, digit1};
+    /// # use nom::{Parser, Err, IResult};
+    /// # use nom::error::{ErrorKind, Error};
+    /// use nom_supreme::ParserExt;
+    /// use nom_supreme::tag::complete::tag;
+    ///
+    /// let mut parser = digit1
+    ///     .parse_from_str()
+    ///     .separated_array(char('.'))
+    ///     .map(Ipv4Addr::from)
+    ///     .terminated(char(':'))
+    ///     .and(digit1.parse_from_str())
+    ///     .map(|(ip, port)| SocketAddrV4::new(ip, port));
+    ///
+    /// let (_tail, socket_addr) = parser.parse("192.168.0.1:80").unwrap();
+    /// assert_eq!(socket_addr.ip().octets(), [192, 168, 0, 1]);
+    /// assert_eq!(socket_addr.port(), 80);
+    ///
+    /// assert_matches!(
+    ///     parser.parse("192.168.0.abc:80"),
+    ///     Err(Err::Error(Error{input: "abc:80", code: ErrorKind::Digit})),
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parser.parse("192.168.0.1"),
+    ///     Err(Err::Error(Error{input: "", code: ErrorKind::Char})),
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parser.parse("192.168.0.1000:80"),
+    ///     Err(Err::Error(Error{input: "1000:80", code: ErrorKind::MapRes})),
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parser.parse("192.168.10abc"),
+    ///     Err(Err::Error(Error{input: "abc", code: ErrorKind::Char})),
+    /// );
+    /// ```
+    ///
+    /// Note that this parser does not attach any additional context to the
+    /// error in the event of a parser; consider using [`context`][Self::context]
+    /// on the item, separator, or array parsers to add additional information
+    /// about where in the input there was a parse failure.
+    #[inline]
+    #[must_use = "Parsers do nothing unless used"]
+    fn separated_array<F, O2>(self, separator: F) -> SeparatedArrayParser<Self, F, O2>
+    where
+        F: Parser<I, O2, E>,
+    {
+        SeparatedArrayParser {
+            parser: self,
+            separator,
+            phantom: PhantomData,
+        }
+    }
+}
+
+impl<I, O, E, P> ParserExt<I, O, E> for P where P: Parser<I, O, E> {}
+
+/// Parser wrapping a mutable reference to a subparser.
+#[derive(Debug)]
+pub struct RefParser<'a, P> {
+    parser: &'a mut P,
+}
+
+impl<'a, I, O, E, P> Parser<I, O, E> for RefParser<'a, P>
+where
+    P: Parser<I, O, E>,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O, E> {
+        self.parser.parse(input)
+    }
+}
+
+/// Parser which returns an error if the subparser didn't consume the whole
+/// input.
+#[derive(Debug, Clone, Copy)]
+pub struct AllConsuming<P> {
+    parser: P,
+}
+
+impl<I, O, E, P> Parser<I, O, E> for AllConsuming<P>
+where
+    P: Parser<I, O, E>,
+    E: ParseError<I>,
+    I: InputLength,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O, E> {
+        let (tail, value) = self.parser.parse(input)?;
+
+        if tail.input_len() > 0 {
+            Err(NomErr::Error(E::from_error_kind(tail, NomErrorKind::Eof)))
+        } else {
+            Ok((tail, value))
+        }
+    }
+}
+
+/// Parser which returns an error if the subparser returned
+/// [`Incomplete`][nom::Err::Incomplete].
+#[derive(Debug, Clone, Copy)]
+pub struct Complete<P> {
+    parser: P,
+}
+
+impl<I, O, E, P> Parser<I, O, E> for Complete<P>
+where
+    P: Parser<I, O, E>,
+    E: ParseError<I>,
+    I: Clone,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O, E> {
+        self.parser
+            .parse(input.clone())
+            .map_err(move |err| match err {
+                NomErr::Incomplete(..) => {
+                    NomErr::Error(E::from_error_kind(input, NomErrorKind::Complete))
+                }
+                err => err,
+            })
+    }
+}
+
+/// Parser which returns a [`Failure`][nom::Err::Failure] if the subparser
+/// returned an error. This prevents other branches from being tried.
+#[derive(Debug, Clone, Copy)]
+pub struct Cut<P> {
+    parser: P,
+}
+
+impl<I, O, E, P> Parser<I, O, E> for Cut<P>
+where
+    P: Parser<I, O, E>,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O, E> {
+        self.parser.parse(input).map_err(|err| match err {
+            NomErr::Error(err) => NomErr::Failure(err),
+            err => err,
+        })
+    }
+}
+
+/// Parser which wraps the subparser output in an [`Option`], and returns a
+/// successful [`None`] output if it fails.
+#[derive(Debug, Clone, Copy)]
+pub struct Optional<P> {
+    parser: P,
+}
+
+impl<I, O, E, P> Parser<I, Option<O>, E> for Optional<P>
+where
+    P: Parser<I, O, E>,
+    I: Clone,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, Option<O>, E> {
+        match self.parser.parse(input.clone()) {
+            Ok((tail, value)) => Ok((tail, Some(value))),
+            Err(NomErr::Error(_)) => Ok((input, None)),
+            Err(e) => Err(e),
+        }
+    }
+}
+
+/// Parser which, when successful, discards the output of the subparser and
+/// instead returns the consumed input.
+#[derive(Debug, Clone, Copy)]
+pub struct Recognize<P, O> {
+    parser: WithRecognized<P>,
+    phantom: PhantomData<O>,
+}
+
+impl<I, O, E, P> Parser<I, I, E> for Recognize<P, O>
+where
+    P: Parser<I, O, E>,
+    I: Clone + Slice<RangeTo<usize>> + Offset,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, I, E> {
+        self.parser
+            .parse(input)
+            .map(|(tail, (recognized, _))| (tail, recognized))
+    }
+}
+
+/// Parser which, when successful, returns the result of the inner parser and
+/// also the consumed input
+#[derive(Debug, Clone, Copy)]
+pub struct WithRecognized<P> {
+    parser: P,
+}
+
+impl<I, O, E, P> Parser<I, (I, O), E> for WithRecognized<P>
+where
+    P: Parser<I, O, E>,
+    I: Clone + Slice<RangeTo<usize>> + Offset,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, (I, O), E> {
+        let (tail, output) = self.parser.parse(input.clone())?;
+        let index = input.offset(&tail);
+        Ok((tail, (input.slice(..index), output)))
+    }
+}
+
+/// Parser which, when successful, discards the output of the subparser and
+/// instead returns a clone of a value.
+#[derive(Debug, Clone, Copy)]
+pub struct Value<T, P, O> {
+    parser: P,
+    value: T,
+    phantom: PhantomData<O>,
+}
+
+impl<I, O, E, T, P> Parser<I, T, E> for Value<T, P, O>
+where
+    P: Parser<I, O, E>,
+    T: Clone,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, T, E> {
+        self.parser
+            .parse(input)
+            .map(|(input, _)| (input, self.value.clone()))
+    }
+}
+
+/// Parser which checks the output of its subparser against a verifier function.
+#[derive(Debug, Clone, Copy)]
+pub struct Verify<P, F> {
+    parser: P,
+    verifier: F,
+}
+
+impl<I, O, E, P, F> Parser<I, O, E> for Verify<P, F>
+where
+    P: Parser<I, O, E>,
+    E: ParseError<I>,
+    F: Fn(&O) -> bool,
+    I: Clone,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O, E> {
+        let (tail, value) = self.parser.parse(input.clone())?;
+
+        match (self.verifier)(&value) {
+            true => Ok((tail, value)),
+            false => Err(NomErr::Error(E::from_error_kind(
+                input,
+                NomErrorKind::Verify,
+            ))),
+        }
+    }
+}
+
+/// Parser which attaches additional context to any errors returned by the
+/// subparser.
+#[derive(Debug, Clone, Copy)]
+pub struct Context<P> {
+    context: &'static str,
+    parser: P,
+}
+
+impl<I, O, E, P> Parser<I, O, E> for Context<P>
+where
+    P: Parser<I, O, E>,
+    E: ContextError<I>,
+    I: Clone,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O, E> {
+        self.parser
+            .parse(input.clone())
+            .map_err(move |err| err.map(move |err| E::add_context(input, self.context, err)))
+    }
+}
+
+/// Parser which gets and discards an output from a second subparser,
+/// returning the output from the original parser if both were successful.
+#[derive(Debug, Clone, Copy)]
+pub struct Terminated<P1, P2, O2> {
+    parser: P1,
+    terminator: P2,
+    phantom: PhantomData<O2>,
+}
+
+impl<I, O1, O2, E, P1, P2> Parser<I, O1, E> for Terminated<P1, P2, O2>
+where
+    P1: Parser<I, O1, E>,
+    P2: Parser<I, O2, E>,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O1, E> {
+        let (input, value) = self.parser.parse(input)?;
+        let (input, _) = self.terminator.parse(input)?;
+
+        Ok((input, value))
+    }
+}
+
+/// Parser which gets and discards an output from a prefix subparser before
+/// running the main subparser. Returns the output from the main subparser if
+/// both were successful.
+#[derive(Debug, Clone, Copy)]
+pub struct Preceded<P1, P2, O2> {
+    parser: P1,
+    prefix: P2,
+    phantom: PhantomData<O2>,
+}
+
+impl<I, O1, O2, E, P1, P2> Parser<I, O1, E> for Preceded<P1, P2, O2>
+where
+    P1: Parser<I, O1, E>,
+    P2: Parser<I, O2, E>,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O1, E> {
+        let (input, _) = self.prefix.parse(input)?;
+        self.parser.parse(input)
+    }
+}
+
+/// Parser which gets and discards a delimiting value both before and after the
+/// main subparser. Returns the output from the main subparser if all were
+/// successful.
+#[derive(Debug, Clone, Copy)]
+pub struct Delimited<P, D, O2> {
+    parser: P,
+    delimiter: D,
+    phantom: PhantomData<O2>,
+}
+
+impl<P, D, I, O, E, O2> Parser<I, O, E> for Delimited<P, D, O2>
+where
+    P: Parser<I, O, E>,
+    D: Parser<I, O2, E>,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O, E> {
+        let (input, _) = self.delimiter.parse(input)?;
+        let (input, value) = self.parser.parse(input)?;
+        let (input, _) = self.delimiter.parse(input)?;
+
+        Ok((input, value))
+    }
+}
+
+/// Parser which runs a fallible mapping function on the output of the
+/// subparser. Any errors returned by the mapping function are transformed
+/// into a parse error.
+///
+#[derive(Debug, Clone, Copy)]
+pub struct MapRes<P, F, O, E2> {
+    parser: P,
+    func: F,
+    phantom: PhantomData<(O, E2)>,
+}
+
+impl<P, F, I, O, E, O2, E2> Parser<I, O2, E> for MapRes<P, F, O, E2>
+where
+    P: Parser<I, O, E>,
+    F: FnMut(O) -> Result<O2, E2>,
+    E: FromExternalError<I, E2>,
+    I: Clone,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O2, E> {
+        let (tail, value) = self.parser.parse(input.clone())?;
+
+        (self.func)(value)
+            .map(move |value| (tail, value))
+            .map_err(move |err| {
+                NomErr::Error(E::from_external_error(input, NomErrorKind::MapRes, err))
+            })
+    }
+}
+
+/// Parser which runs a fallible mapping function on the output of the
+/// subparser. Any errors returned by the mapping function are transformed
+/// into a parse failure.
+///
+#[derive(Debug, Clone, Copy)]
+pub struct MapResCut<P, F, O, E2> {
+    parser: P,
+    func: F,
+    phantom: PhantomData<(O, E2)>,
+}
+
+impl<P, F, I, O, E, O2, E2> Parser<I, O2, E> for MapResCut<P, F, O, E2>
+where
+    P: Parser<I, O, E>,
+    F: FnMut(O) -> Result<O2, E2>,
+    E: FromExternalError<I, E2>,
+    I: Clone,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O2, E> {
+        let (tail, value) = self.parser.parse(input.clone())?;
+
+        (self.func)(value)
+            .map(move |value| (tail, value))
+            .map_err(move |err| {
+                NomErr::Failure(E::from_external_error(input, NomErrorKind::MapRes, err))
+            })
+    }
+}
+/// Parser which runs a subparser but doesn't consume any input
+#[derive(Debug, Clone, Copy)]
+pub struct Peek<P> {
+    parser: P,
+}
+
+impl<I, O, E, P> Parser<I, O, E> for Peek<P>
+where
+    P: Parser<I, O, E>,
+    I: Clone,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, O, E> {
+        self.parser
+            .parse(input.clone())
+            .map(|(_, value)| (input, value))
+    }
+}
+
+/// Parser which returns failure if the subparser succeeds, and succeeds if the
+/// subparser fails.
+#[derive(Debug, Clone, Copy)]
+pub struct Not<P, O> {
+    parser: P,
+    phantom: PhantomData<O>,
+}
+
+impl<I, O, E, P> Parser<I, (), E> for Not<P, O>
+where
+    P: Parser<I, O, E>,
+    I: Clone,
+    E: ParseError<I>,
+{
+    #[inline]
+    fn parse(&mut self, input: I) -> nom::IResult<I, (), E> {
+        match self.parser.parse(input.clone()) {
+            Ok(..) => Err(NomErr::Error(E::from_error_kind(input, NomErrorKind::Not))),
+            Err(NomErr::Error(..)) => Ok((input, ())),
+            Err(err) => Err(err),
+        }
+    }
+}
+
+/// Parser which parses something via [`FromStr`], using a subparser as a
+/// recognizer for the string to pass to [`from_str`][FromStr::from_str].
+#[derive(Debug, Clone, Copy)]
+pub struct FromStrParser<P, T> {
+    parser: P,
+    phantom: PhantomData<T>,
+}
+
+impl<'a, T, E, P> Parser<&'a str, T, E> for FromStrParser<P, T>
+where
+    P: Parser<&'a str, &'a str, E>,
+    T: FromStr,
+    E: FromExternalError<&'a str, T::Err>,
+{
+    #[inline]
+    fn parse(&mut self, input: &'a str) -> nom::IResult<&'a str, T, E> {
+        let (tail, value_str) = self.parser.parse(input)?;
+        match value_str.parse() {
+            Ok(value) => Ok((tail, value)),
+            Err(parse_err) => Err(NomErr::Error(E::from_external_error(
+                input,
+                NomErrorKind::MapRes,
+                parse_err,
+            ))),
+        }
+    }
+}
+
+/// Parser which parses something via [`FromStr`], using a subparser as a
+/// recognizer for the string to pass to [`from_str`][FromStr::from_str].
+/// Returns [`Err::Failure`][NomErr::Failure] if the [`FromStr`] parse fails.
+#[derive(Debug, Clone, Copy)]
+pub struct FromStrCutParser<P, T> {
+    parser: P,
+    phantom: PhantomData<T>,
+}
+
+impl<'a, T, E, P> Parser<&'a str, T, E> for FromStrCutParser<P, T>
+where
+    P: Parser<&'a str, &'a str, E>,
+    T: FromStr,
+    E: FromExternalError<&'a str, T::Err>,
+{
+    #[inline]
+    fn parse(&mut self, input: &'a str) -> nom::IResult<&'a str, T, E> {
+        let (tail, value_str) = self.parser.parse(input)?;
+        match value_str.parse() {
+            Ok(value) => Ok((tail, value)),
+            Err(parse_err) => Err(NomErr::Failure(E::from_external_error(
+                input,
+                NomErrorKind::MapRes,
+                parse_err,
+            ))),
+        }
+    }
+}
+
+/// Parser which parses an array by running a subparser in a loop a fixed
+/// number of times.
+#[derive(Debug, Clone, Copy)]
+pub struct ArrayParser<P> {
+    parser: P,
+}
+
+impl<P, I, O, E, const N: usize> Parser<I, [O; N], E> for ArrayParser<P>
+where
+    P: Parser<I, O, E>,
+{
+    fn parse(&mut self, input: I) -> nom::IResult<I, [O; N], E> {
+        // TODO: create a folding version of brownstone::try_build so that
+        // this Some trick isn't necessary
+        let mut input = Some(input);
+
+        brownstone::try_build(|| {
+            let (tail, value) = self.parser.parse(input.take().unwrap())?;
+            input = Some(tail);
+            Ok(value)
+        })
+        .map(|array| (input.unwrap(), array))
+        .map_err(|err| err.error)
+    }
+}
+
+/// Parser which parses an array by running a subparser in a loop a fixed
+/// number of times, parsing a separator between each item.
+#[derive(Debug, Clone, Copy)]
+pub struct SeparatedArrayParser<P1, P2, O2> {
+    parser: P1,
+    separator: P2,
+    phantom: PhantomData<O2>,
+}
+
+impl<I, O1, O2, E, P1, P2, const N: usize> Parser<I, [O1; N], E>
+    for SeparatedArrayParser<P1, P2, O2>
+where
+    P1: Parser<I, O1, E>,
+    P2: Parser<I, O2, E>,
+{
+    fn parse(&mut self, input: I) -> nom::IResult<I, [O1; N], E> {
+        // TODO: create a folding version of brownstone::try_build so that
+        // this Some trick isn't necessary
+        let mut input = Some(input);
+
+        brownstone::try_build_indexed(|idx| {
+            let local_input = input.take().unwrap();
+
+            let (tail, value) = match idx {
+                0 => self.parser.parse(local_input),
+                _ => self
+                    .parser
+                    .by_ref()
+                    .preceded_by(self.separator.by_ref())
+                    .parse(local_input),
+            }?;
+
+            input = Some(tail);
+            Ok(value)
+        })
+        .map(|array| (input.unwrap(), array))
+        .map_err(|err| err.error)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/tag.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/tag.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/nom-supreme/src/tag.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/nom-supreme/src/tag.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,267 @@
+//! Enhanced tag parser for nom.
+//!
+//! This module introduces a new trait, [`TagError`], and variants of `tag`
+//! and `tag_case_insensitive` that can use the trait to add to an error the
+//! specific tag that was expected. This allows the error message to report
+//! something like `Expected tag: "true"` instead of just `Error: Tag`.
+
+use nom::error::{Error, ErrorKind, ParseError, VerboseError};
+
+/// Similar to [`FromExternalError`][nom::error::FromExternalError] and
+/// [`ContextError`][nom::error::ContextError], this trait allows a parser to
+/// create an error representing an unmatched tag. This allows error messages
+/// to produce more useful context about what went wrong.
+pub trait TagError<I, T>: Sized {
+    /// Create an error from an expected tag at a location.
+    fn from_tag(input: I, tag: T) -> Self;
+
+    /// As above, but for a case insensitive tag. By default this just
+    /// calls [`from_tag`][Self::from_tag]
+    fn from_tag_no_case(input: I, tag: T) -> Self {
+        Self::from_tag(input, tag)
+    }
+}
+
+impl<I, T> TagError<I, T> for () {
+    fn from_tag(_input: I, _tag: T) {}
+}
+
+impl<I, T> TagError<I, T> for (I, ErrorKind) {
+    fn from_tag(input: I, _tag: T) -> Self {
+        (input, ErrorKind::Tag)
+    }
+}
+
+impl<I, T> TagError<I, T> for Error<I> {
+    fn from_tag(input: I, _tag: T) -> Self {
+        Error::new(input, ErrorKind::Tag)
+    }
+}
+
+impl<I, T> TagError<I, T> for VerboseError<I> {
+    fn from_tag(input: I, _tag: T) -> Self {
+        VerboseError::from_error_kind(input, ErrorKind::Tag)
+    }
+}
+
+/// Complete input version of enhanced `tag` parsers
+pub mod complete {
+    use nom::{Compare, CompareResult, Err, IResult, InputLength, InputTake};
+
+    use super::TagError;
+
+    /// Parser recognizing a fixed pattern, called a tag. If the front of the
+    /// input data matches the `tag`, that part of the input will be returned.
+    /// Records the tag in the error in the event of a parse failure via
+    /// [`TagError`].
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use nom::{IResult, Err, Needed};
+    /// use cool_asserts::assert_matches;
+    /// use nom_supreme::tag::complete::tag;
+    /// use nom_supreme::error::{ErrorTree, BaseErrorKind, Expectation};
+    ///
+    /// fn parse_hello(s: &str) -> IResult<&str, &str, ErrorTree<&str>> {
+    ///     tag("hello")(s)
+    /// }
+    ///
+    /// assert_matches!(
+    ///     parse_hello("hello, world!"),
+    ///     Ok((", world!", "hello")),
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parse_hello("something"),
+    ///     Err(Err::Error(ErrorTree::Base {
+    ///         location: "something",
+    ///         kind: BaseErrorKind::Expected(Expectation::Tag("hello")),
+    ///     }))
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parse_hello("hel"),
+    ///     Err(Err::Error(ErrorTree::Base {
+    ///         location: "hel",
+    ///         kind: BaseErrorKind::Expected(Expectation::Tag("hello")),
+    ///     }))
+    /// );
+    /// ```
+    pub fn tag<T, I, E>(tag: T) -> impl Clone + Fn(I) -> IResult<I, I, E>
+    where
+        T: InputLength + Clone,
+        I: InputTake + Compare<T>,
+        E: TagError<I, T>,
+    {
+        let tag_len = tag.input_len();
+
+        move |input: I| match input.compare(tag.clone()) {
+            CompareResult::Ok => Ok(input.take_split(tag_len)),
+            _ => Err(Err::Error(E::from_tag(input, tag.clone()))),
+        }
+    }
+
+    /// Parser recognizing a fixed pattern, called a tag. If the front of the
+    /// input data matches the `tag`, case insensitively, that part of the
+    /// input will be returned. Records the tag in the error in the event of a
+    /// parse failure via [`TagError`].
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use nom::{IResult, Err, Needed};
+    /// use cool_asserts::assert_matches;
+    /// use nom_supreme::tag::complete::tag_no_case;
+    /// use nom_supreme::error::{ErrorTree, BaseErrorKind, Expectation};
+    ///
+    /// fn parse_hello(s: &str) -> IResult<&str, &str, ErrorTree<&str>> {
+    ///     tag_no_case("hello")(s)
+    /// }
+    ///
+    /// assert_matches!(
+    ///     parse_hello("HELLO, WORLD!"),
+    ///     Ok((", WORLD!", "HELLO")),
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parse_hello("something"),
+    ///     Err(Err::Error(ErrorTree::Base {
+    ///         location: "something",
+    ///         kind: BaseErrorKind::Expected(Expectation::Tag("hello")),
+    ///     }))
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parse_hello("HEL"),
+    ///     Err(Err::Error(ErrorTree::Base {
+    ///         location: "HEL",
+    ///         kind: BaseErrorKind::Expected(Expectation::Tag("hello")),
+    ///     }))
+    /// );
+    /// ```
+    pub fn tag_no_case<T, I, E>(tag: T) -> impl Clone + Fn(I) -> IResult<I, I, E>
+    where
+        T: InputLength + Clone,
+        I: InputTake + Compare<T>,
+        E: TagError<I, T>,
+    {
+        move |input: I| match input.compare_no_case(tag.clone()) {
+            CompareResult::Ok => Ok(input.take_split(tag.input_len())),
+            _ => Err(Err::Error(E::from_tag_no_case(input, tag.clone()))),
+        }
+    }
+}
+
+/// Streaming version of enhanced `tag` parsers.
+pub mod streaming {
+    use nom::{Compare, CompareResult, Err, IResult, InputLength, InputTake, Needed};
+
+    use super::TagError;
+
+    /// Parser recognizing a fixed pattern, called a tag. If the front of the
+    /// input data matches the `tag`, that part of the input will be returned.
+    /// Records the tag in the error in the event of a parse failure via
+    /// [`TagError`]. If there is only a partial match, returns
+    /// [`Err::Incomplete`][nom::Err::Incomplete].
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use nom::{IResult, Err, Needed};
+    /// use cool_asserts::assert_matches;
+    /// use nom_supreme::tag::streaming::tag;
+    /// use nom_supreme::error::{ErrorTree, BaseErrorKind, Expectation};
+    ///
+    /// fn parse_hello(s: &str) -> IResult<&str, &str, ErrorTree<&str>> {
+    ///     tag("hello")(s)
+    /// }
+    ///
+    /// assert_matches!(
+    ///     parse_hello("hello, world!"),
+    ///     Ok((", world!", "hello")),
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parse_hello("something"),
+    ///     Err(Err::Error(ErrorTree::Base {
+    ///         location: "something",
+    ///         kind: BaseErrorKind::Expected(Expectation::Tag("hello")),
+    ///     }))
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parse_hello("hel"),
+    ///     Err(Err::Incomplete(Needed::Size(n))) if n.get() == 2,
+    /// );
+    /// ```
+    pub fn tag<T, I, E>(tag: T) -> impl Clone + Fn(I) -> IResult<I, I, E>
+    where
+        T: InputLength + Clone,
+        I: InputLength + InputTake + Compare<T>,
+        E: TagError<I, T>,
+    {
+        let tag_len = tag.input_len();
+
+        move |input: I| match input.compare(tag.clone()) {
+            CompareResult::Ok => Ok(input.take_split(tag_len)),
+            CompareResult::Incomplete => {
+                Err(Err::Incomplete(Needed::new(tag_len - input.input_len())))
+            }
+            CompareResult::Error => Err(Err::Error(E::from_tag(input, tag.clone()))),
+        }
+    }
+
+    /// Parser recognizing a fixed pattern, called a tag. If the front of the
+    /// input data matches the `tag`, case insensitively, that part of the
+    /// input will be returned. Records the tag in the error in the event of a
+    /// parse failure via [`TagError`]. If there is only a partial match,
+    /// returns [`Err::Incomplete`][[nom::Err::Incomplete]].
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use nom::{IResult, Err, Needed};
+    /// use cool_asserts::assert_matches;
+    /// use nom_supreme::tag::streaming::tag_no_case;
+    /// use nom_supreme::error::{ErrorTree, BaseErrorKind, Expectation};
+    ///
+    /// fn parse_hello(s: &str) -> IResult<&str, &str, ErrorTree<&str>> {
+    ///     tag_no_case("hello")(s)
+    /// }
+    ///
+    /// assert_matches!(
+    ///     parse_hello("HELLO, WORLD!"),
+    ///     Ok((", WORLD!", "HELLO")),
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parse_hello("something"),
+    ///     Err(Err::Error(ErrorTree::Base {
+    ///         location: "something",
+    ///         kind: BaseErrorKind::Expected(Expectation::Tag("hello")),
+    ///     }))
+    /// );
+    ///
+    /// assert_matches!(
+    ///     parse_hello("HEL"),
+    ///     Err(Err::Incomplete(Needed::Size(n))) if n.get() == 2,
+    /// );
+    /// ```
+    pub fn tag_no_case<T, I, E>(tag: T) -> impl Clone + Fn(I) -> IResult<I, I, E>
+    where
+        T: InputLength + Clone,
+        I: InputLength + InputTake + Compare<T>,
+        E: TagError<I, T>,
+    {
+        let tag_len = tag.input_len();
+
+        move |input: I| match input.compare_no_case(tag.clone()) {
+            CompareResult::Ok => Ok(input.take_split(tag_len)),
+            CompareResult::Incomplete => {
+                Err(Err::Incomplete(Needed::new(tag_len - input.input_len())))
+            }
+            CompareResult::Error => Err(Err::Error(E::from_tag_no_case(input, tag.clone()))),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+use std::env::var;
+
+fn main() {
+    #[cfg(feature = "user")] {
+        if var("TARGET").map(
+            |t| t == "x86_64-pc-windows-gnu" || t == "i686-pc-windows-gnu"
+        ).unwrap_or(false) {
+            if var("WINAPI_NO_BUNDLED_LIBRARIES").is_ok() {
+                println!("cargo:rustc-link-lib=ntdll");
+            } else {
+                println!("cargo:rustc-link-lib=winapi_ntdll");
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"df2bff6c902101625fda37208f5c24ee61112328353a285a85d9aa3991cfba85","LICENSE-APACHE":"cf90d659de5c1e6418267ab8043b756e65508ee5d8d50b29eb2d2fe444c2c3eb","LICENSE-MIT":"11a7964ccc0dd115d16720ab1d826c5d03e52838748ffaba3d21bae8bcacd82a","README.md":"b78edd24147c2ce8cf1d9921849fde8cd4f874b5e3e7b5aa07e15ec5f215bba1","build.rs":"13a274ea4cb1886872626b8a98269e9bf2e1f93cb1068fc8c797e421746cac7e","src/lib.rs":"1105cbc6e75471fb343b3faf4a5bf2d25b5e7d5259440e10ae3641641130bb33","src/macros.rs":"7204cc62c198ad2b3097fc082a7ce8b94ac9d788c8250709cf71c82cabe38a77","src/ntapi_base.rs":"b2edefaf68709c32f7fb4377ea21457afd3c7546ba59596f9f25bbaeb220f4d4","src/ntdbg.rs":"f891d4b26ef9d6c68ca098ab70bb4b1dd4d7e1d05e0f65c32bc6cb1151528f91","src/ntexapi.rs":"b6fba3599495dba43852c42ff571ebc675938e3651359b9621ae8533c5e683fe","src/ntgdi.rs":"9fa6610566d77e95294432957f8cb8564cef3bb09d2d8d0adcf23047fa3a5221","src/ntioapi.rs":"577f3c3d83a95a965fff62efbdaa01769e9b3cf713f0d296a948f34cdfddcedc","src/ntkeapi.rs":"1ede6613c94303e6087e30e64ee1f1623eada9d088ce50992904e1812b263923","src/ntldr.rs":"c9be16003da83f82599a419995fbf4f15e047f24166f700dd4b08c0e58adb5a8","src/ntlpcapi.rs":"da5070b1c1adad34091aedd01d2b888daa4dc9446fdcd69668565e6eeb2db11f","src/ntmisc.rs":"4904e383065828b86013ebd3b85d45b384b522899954ac89c561963061acc962","src/ntmmapi.rs":"3a371e9edb7df91d1242f9dae92bf6d295c9b6c3ca65846c8d1ebbba55bdf7ee","src/ntnls.rs":"ef90b985da124d2f4c4b8cb0addab766a0928843b4afa4bce40b3a9fcddaf163","src/ntobapi.rs":"3071d8bc73e40d92d769e4093744820c0a5e116ecf4a94676ca3cdc008adfd8e","src/ntpebteb.rs":"94a9fbc1b3c48fa368f1b602fa205d41d3201e4d8c638c0898402eb3ebb5b72a","src/ntpfapi.rs":"37270db61f2562cd5481302c2a5a64be186b8c7126eacfe12b6c66e9bec4bf61","src/ntpnpapi.rs":"cfcaa3dd6110f25a48c51c011bb8369e83e3817e142afb412e40d6e4b868a036","src/ntpoapi.rs":"a535206a89cd42f81e3b931e5802f8b3343fd35387e9f3fedd9b042a78853f34","src/ntpsapi.rs":"776e8ef7615bd14837791c203967c00be2ffc1e1fe4b5ff1dd68a7a88576171d","src/ntregapi.rs":"a6f5a830b48e88fd0a4824036fffda2d2d80d1cad07baf37607121142f2c4777","src/ntrtl.rs":"64fd391d74c255de85b7712e3332501049983593a9a5f54e3c4d0c0efea9588e","src/ntsam.rs":"dc59cfa944c27cf02b782fdbf110de4757ca6ae77806820a64a17742670242b4","src/ntseapi.rs":"c87688e028aa05513e361bb72288ef3af2f3dfe8e923745a84409d8fdeee57fd","src/ntsmss.rs":"6ac1f029b56a2a8856569c3acbedd7c560d2ccfac030aa2f2178f52d9312cdc5","src/nttmapi.rs":"7092c8b35aae642572c333b0fef1fe4a32f5a9c563249b585766317051670db5","src/nttp.rs":"47be534d36af7d6a715c87ef646824162bd3eb47f86a85ed8357c987c1a4fcdd","src/ntwow64.rs":"725baf7b32d24c0800abf730b58335e682332b821636ca699c40e80ba7148f94","src/ntxcapi.rs":"54fcadd43a0e146ade8ebdd750b09872d0e8f7a1295a9646910529048d5f6dca","src/ntzwapi.rs":"012932586fdbcac8eff57d90ce640e10d20e150dc7702100d1ea46f6f261f868","src/string.rs":"ac0e73f37384e03f14d9dc47fcfb3620a4157e122481f30c82b16fb21ab86a40","src/subprocesstag.rs":"4c85e44c91521cb20e5c6624b0cf4b27ca6ac7c3e560854ad34e0e66fb809971","src/winapi_local.rs":"2003099deec5e7039e5d2dd0aa6a43120816f67e94f4d9909c7f6689b62747e4","src/winapi_local/um.rs":"48859dfb53520bdd569c052ac26d06de2d16c57403ffbe4febbc1e1f25847f45","src/winapi_local/um/winioctl.rs":"00020fcda499ce558edfa4d684f5b4e198cbcfa5b3b8e9b62a122c0aca46514f","src/winapi_local/um/winnt.rs":"1820a3ae47c93f952d2f25a5216fe5a817dee51a3c4f76c3fc3dbd40c0f10de4","src/winsta.rs":"c5a28c5c55f08745b2b100a5a374af821cf173b053eb8ee54ae19a85455d3fac"},"package":"3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "ntapi"
+version = "0.3.6"
+authors = ["MSxDOS <melcodos@gmail.com>"]
+include = ["src/**/*", "Cargo.toml", "build.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+description = "FFI bindings for Native API"
+documentation = "https://docs.rs/ntapi/*/x86_64-pc-windows-msvc/ntapi/"
+readme = "README.md"
+keywords = ["windows", "ffi", "ntapi", "native", "win32"]
+categories = ["external-ffi-bindings", "no-std", "os::windows-apis"]
+license = "Apache-2.0 OR MIT"
+repository = "https://github.com/MSxDOS/ntapi"
+[package.metadata.docs.rs]
+default-target = "x86_64-pc-windows-msvc"
+features = ["nightly"]
+targets = ["aarch64-pc-windows-msvc", "i686-pc-windows-msvc", "x86_64-pc-windows-msvc"]
+[dependencies.winapi]
+version = "0.3.9"
+features = ["cfg", "evntrace", "in6addr", "inaddr", "minwinbase", "ntsecapi", "windef", "winioctl"]
+
+[features]
+default = ["user"]
+func-types = []
+impl-default = ["winapi/impl-default"]
+kernel = []
+nightly = []
+user = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+# ntapi [![AppVeyor][appveyor_badge]][appveyor_link] [![Travis][travis_badge]][travis_link] [![Crates.io][crates_badge]][crates_link] [![Documentation][docs_badge]][docs_link] [![Lines of Code][loc_badge]][loc_link] [![Unsafe][unsafe_badge]][unsafe_link]
+
+Rust FFI bindings for Native API. Mostly based on Process Hacker [phnt](https://github.com/processhacker/processhacker/tree/master/phnt) headers as the most complete source of bindings to be found. The comments there also contain useful information on how to use specific things.
+
+### Minimum supported Rust
+Always the latest stable. Some [features][docs_link] require a nightly compiler.
+
+[travis_link]: https://travis-ci.org/MSxDOS/ntapi
+[travis_badge]: https://travis-ci.org/MSxDOS/ntapi.svg?branch=master
+[appveyor_link]: https://ci.appveyor.com/project/MSxDOS/ntapi
+[appveyor_badge]: https://ci.appveyor.com/api/projects/status/i1fcmm0c5b7c6b6u/branch/master?svg=true
+[crates_link]: https://crates.io/crates/ntapi
+[crates_badge]: https://img.shields.io/crates/v/ntapi.svg
+[docs_link]: https://docs.rs/ntapi/*/x86_64-pc-windows-msvc/ntapi/
+[docs_badge]: https://docs.rs/ntapi/badge.svg
+[loc_link]: https://github.com/Aaronepower/tokei
+[loc_badge]: https://tokei.rs/b1/github/MSxDOS/ntapi
+[unsafe_link]: https://doc.rust-lang.org/book/ch19-01-unsafe-rust.html
+[unsafe_badge]: https://img.shields.io/badge/unsafe-%E2%9C%94-C901DD.svg
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,71 @@
+//! # Features
+//! **`func-types`** -- Generate [types][fn_ptr] for external functions.<br/>
+//! **`impl-default`** -- Implement [`Default`] for structs and unions.<br/>
+//! **`user`** *(default)* -- Link to `ntdll`.<br/>
+//! **`kernel`** -- Link to `ntoskrnl` on MSVC targets.<br/>
+//! **`nightly`** --  Unlock unstable features that require a nightly compiler:
+//! - [`NtCurrentTeb`]
+//! - [`__readfsdword`]
+//! - [`__readgsqword`]
+//! - [`_bittest64`]
+//! - [`NtCurrentPeb`]
+//! - [`NtCurrentProcessId`]
+//! - [`NtCurrentThreadId`]
+//! - [`RtlProcessHeap`]
+//! - [`RtlCheckBit`] implementation using [`_bittest64`] on x86_64.
+//!
+//! [`NtCurrentTeb`]: winapi_local/um/winnt/fn.NtCurrentTeb.html
+//! [`__readfsdword`]: winapi_local/um/winnt/fn.__readfsdword.html
+//! [`__readgsqword`]: winapi_local/um/winnt/fn.__readgsqword.html
+//! [`_bittest64`]: winapi_local/um/winnt/fn._bittest64.html
+//! [`NtCurrentPeb`]: ntpsapi/fn.NtCurrentPeb.html
+//! [`NtCurrentProcessId`]: ntpsapi/fn.NtCurrentProcessId.html
+//! [`NtCurrentThreadId`]: ntpsapi/fn.NtCurrentThreadId.html
+//! [`RtlProcessHeap`]: ntrtl/fn.RtlProcessHeap.html
+//! [`RtlCheckBit`]: ntrtl/fn.RtlCheckBit.html
+//! [fn_ptr]: https://doc.rust-lang.org/reference/types.html#function-pointer-types
+//! [`Default`]: https://doc.rust-lang.org/std/default/trait.Default.html#tymethod.default
+#![cfg(all(windows, any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))]
+#![no_std]
+#![deny(unused, unused_qualifications)]
+#![warn(unused_attributes)]
+#![allow(bad_style, overflowing_literals, unused_macros, clippy::cast_lossless, clippy::cast_ptr_alignment, clippy::len_without_is_empty, clippy::trivially_copy_pass_by_ref, clippy::unreadable_literal)]
+#![cfg_attr(feature = "nightly", feature(llvm_asm))]
+#[doc(hidden)]
+pub extern crate core as _core;
+#[macro_use]
+#[doc(hidden)]
+pub extern crate winapi;
+#[macro_use]
+mod macros;
+pub mod ntapi_base;
+pub mod ntdbg;
+pub mod ntexapi;
+pub mod ntgdi;
+pub mod ntioapi;
+pub mod ntkeapi;
+pub mod ntldr;
+pub mod ntlpcapi;
+pub mod ntmisc;
+pub mod ntmmapi;
+pub mod ntnls;
+pub mod ntobapi;
+pub mod ntpebteb;
+pub mod ntpfapi;
+pub mod ntpnpapi;
+pub mod ntpoapi;
+pub mod ntpsapi;
+pub mod ntregapi;
+pub mod ntrtl;
+pub mod ntsam;
+pub mod ntseapi;
+pub mod ntsmss;
+pub mod nttmapi;
+pub mod nttp;
+pub mod ntwow64;
+pub mod ntxcapi;
+pub mod ntzwapi;
+pub mod string;
+pub mod subprocesstag;
+pub mod winapi_local;
+pub mod winsta;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,110 @@
+#[macro_export]
+macro_rules! EXTERN {
+    (extern $c:tt {$(
+        fn $n:ident ($( $p:tt $(: $t:ty)?),* $(,)?) $(-> $r:ty)?;
+    )+}) => {
+        #[cfg_attr(all(target_env = "msvc", feature = "user"), link(name = "ntdll"))]
+        #[cfg_attr(all(target_env = "msvc", feature = "kernel"), link(name = "ntoskrnl"))]
+        extern $c {$(
+            pub fn $n(
+                $($p $(: $t)?),*
+            ) $(-> $r)?;
+        )+}
+        $(
+            #[cfg(feature = "func-types")]
+            pub type $n = unsafe extern $c fn($($p $(: $t)?),*) $(-> $r)?;
+        )+
+    };
+    (extern $c:tt {$(
+        static mut $n:ident : $t:ty;
+    )+}) => {
+        #[cfg_attr(all(target_env = "msvc", feature = "user"), link(name = "ntdll"))]
+        extern $c {$(
+            pub static mut $n: $t;
+        )+}
+    };
+}
+#[macro_export]
+macro_rules! FIELD_OFFSET {
+    ($_type:ty, $field:ident$(.$cfields:ident)*) => {
+        unsafe {
+            union Transmuter<T: 'static> {
+                p: *const T,
+                r: &'static T,
+                i: usize,
+            }
+            Transmuter {
+                r: &(&Transmuter {
+                    p: $crate::_core::ptr::null::<$_type>()
+                }.r).$field$(.$cfields)*
+            }.i
+        }
+    };
+}
+macro_rules! BITFIELD {
+    ($base:ident $field:ident: $fieldtype:ty [
+        $($thing:ident $set_thing:ident[$r:expr],)+
+    ]) => {
+        impl $base {$(
+            #[inline]
+            pub const fn $thing(&self) -> $fieldtype {
+                const SIZE: usize = $crate::_core::mem::size_of::<$fieldtype>() * 8;
+                self.$field << (SIZE - $r.end) >> (SIZE - $r.end + $r.start)
+            }
+            #[inline]
+            pub fn $set_thing(&mut self, val: $fieldtype) {
+                const MASK: $fieldtype = ((1 << ($r.end - $r.start)) - 1) << $r.start;
+                self.$field &= !MASK;
+                self.$field |= (val << $r.start) & MASK;
+            }
+        )+}
+    };
+    (unsafe $base:ident $field:ident: $fieldtype:ty [
+        $($thing:ident $set_thing:ident[$r:expr],)+
+    ]) => {
+        impl $base {$(
+            #[inline]
+            pub unsafe fn $thing(&self) -> $fieldtype {
+                const SIZE: usize = $crate::_core::mem::size_of::<$fieldtype>() * 8;
+                self.$field << (SIZE - $r.end) >> (SIZE - $r.end + $r.start)
+            }
+            #[inline]
+            pub unsafe fn $set_thing(&mut self, val: $fieldtype) {
+                const MASK: $fieldtype = ((1 << ($r.end - $r.start)) - 1) << $r.start;
+                self.$field &= !MASK;
+                self.$field |= (val << $r.start) & MASK;
+            }
+        )+}
+    };
+}
+macro_rules! UNION {
+    ($(#[$attrs:meta])* union $name:ident {
+        $($variant:ident: $ftype:ty,)+
+    }) => (
+        #[repr(C)] $(#[$attrs])*
+        pub union $name {
+            $(pub $variant: $ftype,)+
+        }
+        impl Copy for $name {}
+        impl Clone for $name {
+            #[inline]
+            fn clone(&self) -> $name { *self }
+        }
+        #[cfg(feature = "impl-default")]
+        impl Default for $name {
+            #[inline]
+            fn default() -> $name { unsafe { $crate::_core::mem::zeroed() } }
+        }
+    );
+}
+macro_rules! FN {
+    (stdcall $func:ident($($p:ident: $t:ty,)*) -> $ret:ty) => (
+        pub type $func = Option<unsafe extern "system" fn($($p: $t,)*) -> $ret>;
+    );
+    (cdecl $func:ident($($p:ident: $t:ty,)*) -> $ret:ty) => (
+        pub type $func = Option<unsafe extern "C" fn($($p: $t,)*) -> $ret>;
+    );
+}
+macro_rules! IFDEF {
+    ($($thing:item)*) => ($($thing)*)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntapi_base.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntapi_base.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntapi_base.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntapi_base.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+use winapi::shared::ntdef::{HANDLE, LONG, NTSTATUS, ULONG, ULONGLONG, USHORT};
+use winapi::shared::ntstatus::FACILITY_NTWIN32;
+pub type KPRIORITY = LONG;
+pub type RTL_ATOM = USHORT;
+pub type PRTL_ATOM = *mut RTL_ATOM;
+pub const NT_FACILITY_MASK: ULONG = 0xfff;
+pub const NT_FACILITY_SHIFT: ULONG = 16;
+#[inline]
+pub const fn NT_FACILITY(Status: NTSTATUS) -> ULONG {
+    (Status as u32) >> NT_FACILITY_SHIFT & NT_FACILITY_MASK
+}
+#[inline]
+pub const fn NT_NTWIN32(Status: NTSTATUS) -> bool {
+    NT_FACILITY(Status) == FACILITY_NTWIN32 as u32
+}
+#[inline]
+pub const fn WIN32_FROM_NTSTATUS(Status: NTSTATUS) -> ULONG {
+    (Status as u32) & 0xffff
+}
+STRUCT!{struct CLIENT_ID {
+    UniqueProcess: HANDLE,
+    UniqueThread: HANDLE,
+}}
+pub type PCLIENT_ID = *mut CLIENT_ID;
+STRUCT!{struct CLIENT_ID32 {
+    UniqueProcess: ULONG,
+    UniqueThread: ULONG,
+}}
+pub type PCLIENT_ID32 = *mut CLIENT_ID32;
+STRUCT!{struct CLIENT_ID64 {
+    UniqueProcess: ULONGLONG,
+    UniqueThread: ULONGLONG,
+}}
+pub type PCLIENT_ID64 = *mut CLIENT_ID64;
+STRUCT!{struct KSYSTEM_TIME {
+    LowPart: ULONG,
+    High1Time: LONG,
+    High2Time: LONG,
+}}
+pub type PKSYSTEM_TIME = *mut KSYSTEM_TIME;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntdbg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntdbg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntdbg.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntdbg.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,239 @@
+use crate::ntapi_base::{CLIENT_ID, PCLIENT_ID};
+use winapi::shared::evntprov::EVENT_FILTER_DESCRIPTOR;
+use winapi::shared::guiddef::LPCGUID;
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, NTSTATUS, PCCH, PCH, PCSTR, PHANDLE, PLARGE_INTEGER, POBJECT_ATTRIBUTES,
+    PULONG, PVOID, UCHAR, ULONG, ULONGLONG,
+};
+use winapi::um::minwinbase::LPDEBUG_EVENT;
+use winapi::um::winnt::{ACCESS_MASK, EXCEPTION_RECORD, STANDARD_RIGHTS_REQUIRED, SYNCHRONIZE};
+use winapi::vc::vadefs::va_list;
+EXTERN!{extern "system" {
+    fn DbgUserBreakPoint();
+    fn DbgBreakPoint();
+    fn DbgBreakPointWithStatus(
+        Status: ULONG,
+    );
+}}
+pub const DBG_STATUS_CONTROL_C: u32 = 1;
+pub const DBG_STATUS_SYSRQ: u32 = 2;
+pub const DBG_STATUS_BUGCHECK_FIRST: u32 = 3;
+pub const DBG_STATUS_BUGCHECK_SECOND: u32 = 4;
+pub const DBG_STATUS_FATAL: u32 = 5;
+pub const DBG_STATUS_DEBUG_CONTROL: u32 = 6;
+pub const DBG_STATUS_WORKER: u32 = 7;
+EXTERN!{extern "C" {
+    fn DbgPrint(
+        Format: PCSTR,
+        ...
+    ) -> ULONG;
+    fn DbgPrintEx(
+        ComponentId: ULONG,
+        Level: ULONG,
+        Format: PCSTR,
+        ...
+    ) -> ULONG;
+}}
+EXTERN!{extern "system" {
+    fn vDbgPrintEx(
+        ComponentId: ULONG,
+        Level: ULONG,
+        Format: PCCH,
+        arglist: va_list,
+    ) -> ULONG;
+    fn vDbgPrintExWithPrefix(
+        Prefix: PCH,
+        ComponentId: ULONG,
+        Level: ULONG,
+        Format: PCCH,
+        arglist: va_list,
+    ) -> ULONG;
+    fn DbgQueryDebugFilterState(
+        ComponentId: ULONG,
+        Level: ULONG,
+    ) -> NTSTATUS;
+    fn DbgSetDebugFilterState(
+        ComponentId: ULONG,
+        Level: ULONG,
+        State: BOOLEAN,
+    ) -> NTSTATUS;
+    fn DbgPrompt(
+        Prompt: PCCH,
+        Response: PCH,
+        Length: ULONG,
+    ) -> ULONG;
+}}
+STRUCT!{struct DBGKM_EXCEPTION {
+    ExceptionRecord: EXCEPTION_RECORD,
+    FirstChance: ULONG,
+}}
+pub type PDBGKM_EXCEPTION = *mut DBGKM_EXCEPTION;
+STRUCT!{struct DBGKM_CREATE_THREAD {
+    SubSystemKey: ULONG,
+    StartAddress: PVOID,
+}}
+pub type PDBGKM_CREATE_THREAD = *mut DBGKM_CREATE_THREAD;
+STRUCT!{struct DBGKM_CREATE_PROCESS {
+    SubSystemKey: ULONG,
+    FileHandle: HANDLE,
+    BaseOfImage: PVOID,
+    DebugInfoFileOffset: ULONG,
+    DebugInfoSize: ULONG,
+    InitialThread: DBGKM_CREATE_THREAD,
+}}
+pub type PDBGKM_CREATE_PROCESS = *mut DBGKM_CREATE_PROCESS;
+STRUCT!{struct DBGKM_EXIT_THREAD {
+    ExitStatus: NTSTATUS,
+}}
+pub type PDBGKM_EXIT_THREAD = *mut DBGKM_EXIT_THREAD;
+STRUCT!{struct DBGKM_EXIT_PROCESS {
+    ExitStatus: NTSTATUS,
+}}
+pub type PDBGKM_EXIT_PROCESS = *mut DBGKM_EXIT_PROCESS;
+STRUCT!{struct DBGKM_LOAD_DLL {
+    FileHandle: HANDLE,
+    BaseOfDll: PVOID,
+    DebugInfoFileOffset: ULONG,
+    DebugInfoSize: ULONG,
+    NamePointer: PVOID,
+}}
+pub type PDBGKM_LOAD_DLL = *mut DBGKM_LOAD_DLL;
+STRUCT!{struct DBGKM_UNLOAD_DLL {
+    BaseAddress: PVOID,
+}}
+pub type PDBGKM_UNLOAD_DLL = *mut DBGKM_UNLOAD_DLL;
+ENUM!{enum DBG_STATE {
+    DbgIdle = 0,
+    DbgReplyPending = 1,
+    DbgCreateThreadStateChange = 2,
+    DbgCreateProcessStateChange = 3,
+    DbgExitThreadStateChange = 4,
+    DbgExitProcessStateChange = 5,
+    DbgExceptionStateChange = 6,
+    DbgBreakpointStateChange = 7,
+    DbgSingleStepStateChange = 8,
+    DbgLoadDllStateChange = 9,
+    DbgUnloadDllStateChange = 10,
+}}
+pub type PDBG_STATE = *mut DBG_STATE;
+STRUCT!{struct DBGUI_CREATE_THREAD {
+    HandleToThread: HANDLE,
+    NewThread: DBGKM_CREATE_THREAD,
+}}
+pub type PDBGUI_CREATE_THREAD = *mut DBGUI_CREATE_THREAD;
+STRUCT!{struct DBGUI_CREATE_PROCESS {
+    HandleToProcess: HANDLE,
+    HandleToThread: HANDLE,
+    NewProcess: DBGKM_CREATE_PROCESS,
+}}
+UNION!{union DBGUI_WAIT_STATE_CHANGE_StateInfo {
+    Exception: DBGKM_EXCEPTION,
+    CreateThread: DBGUI_CREATE_THREAD,
+    CreateProcessInfo: DBGUI_CREATE_PROCESS,
+    ExitThread: DBGKM_EXIT_THREAD,
+    ExitProcess: DBGKM_EXIT_PROCESS,
+    LoadDll: DBGKM_LOAD_DLL,
+    UnloadDll: DBGKM_UNLOAD_DLL,
+}}
+pub type PDBGUI_CREATE_PROCESS = *mut DBGUI_CREATE_PROCESS;
+STRUCT!{struct DBGUI_WAIT_STATE_CHANGE {
+    NewState: DBG_STATE,
+    AppClientId: CLIENT_ID,
+    StateInfo: DBGUI_WAIT_STATE_CHANGE_StateInfo,
+}}
+pub type PDBGUI_WAIT_STATE_CHANGE = *mut DBGUI_WAIT_STATE_CHANGE;
+pub const DEBUG_READ_EVENT: ULONG = 0x0001;
+pub const DEBUG_PROCESS_ASSIGN: ULONG = 0x0002;
+pub const DEBUG_SET_INFORMATION: ULONG = 0x0004;
+pub const DEBUG_QUERY_INFORMATION: ULONG = 0x0008;
+pub const DEBUG_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | DEBUG_READ_EVENT
+    | DEBUG_PROCESS_ASSIGN | DEBUG_SET_INFORMATION | DEBUG_QUERY_INFORMATION;
+pub const DEBUG_KILL_ON_CLOSE: u32 = 0x1;
+ENUM!{enum DEBUGOBJECTINFOCLASS {
+    DebugObjectUnusedInformation = 0,
+    DebugObjectKillProcessOnExitInformation = 1,
+    MaxDebugObjectInfoClass = 2,
+}}
+pub type PDEBUGOBJECTINFOCLASS = *mut DEBUGOBJECTINFOCLASS;
+EXTERN!{extern "system" {
+    fn NtCreateDebugObject(
+        DebugObjectHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtDebugActiveProcess(
+        ProcessHandle: HANDLE,
+        DebugObjectHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtDebugContinue(
+        DebugObjectHandle: HANDLE,
+        ClientId: PCLIENT_ID,
+        ContinueStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn NtRemoveProcessDebug(
+        ProcessHandle: HANDLE,
+        DebugObjectHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtSetInformationDebugObject(
+        DebugObjectHandle: HANDLE,
+        DebugObjectInformationClass: DEBUGOBJECTINFOCLASS,
+        DebugInformation: PVOID,
+        DebugInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtWaitForDebugEvent(
+        DebugObjectHandle: HANDLE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+        WaitStateChange: PVOID,
+    ) -> NTSTATUS;
+    fn DbgUiConnectToDbg() -> NTSTATUS;
+    fn DbgUiGetThreadDebugObject() -> HANDLE;
+    fn DbgUiSetThreadDebugObject(
+        DebugObject: HANDLE,
+    );
+    fn DbgUiWaitStateChange(
+        StateChange: PDBGUI_WAIT_STATE_CHANGE,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn DbgUiContinue(
+        AppClientId: PCLIENT_ID,
+        ContinueStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn DbgUiStopDebugging(
+        Process: HANDLE,
+    ) -> NTSTATUS;
+    fn DbgUiDebugActiveProcess(
+        Process: HANDLE,
+    ) -> NTSTATUS;
+    fn DbgUiRemoteBreakin(
+        Context: PVOID,
+    );
+    fn DbgUiIssueRemoteBreakin(
+        Process: HANDLE,
+    ) -> NTSTATUS;
+    fn DbgUiConvertStateChangeStructure(
+        StateChange: PDBGUI_WAIT_STATE_CHANGE,
+        DebugEvent: LPDEBUG_EVENT,
+    ) -> NTSTATUS;
+}}
+FN!{stdcall PENABLECALLBACK(
+    SourceId: LPCGUID,
+    IsEnabled: ULONG,
+    Level: UCHAR,
+    MatchAnyKeyword: ULONGLONG,
+    MatchAllKeyword: ULONGLONG,
+    FilterData: *mut EVENT_FILTER_DESCRIPTOR,
+    CallbackContext: PVOID,
+) -> ()}
+pub type REGHANDLE = ULONGLONG;
+pub type PREGHANDLE = *mut ULONGLONG;
+EXTERN!{extern "system" {
+    fn EtwEventRegister(
+        ProviderId: LPCGUID,
+        EnableCallback: PENABLECALLBACK,
+        CallbackContext: PVOID,
+        RegHandle: PREGHANDLE,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntexapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntexapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntexapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntexapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3001 @@
+#[allow(deprecated)] //fixme
+use core::mem::uninitialized;
+use core::ptr::read_volatile;
+#[cfg(target_arch = "x86")]
+use core::sync::atomic::spin_loop_hint;
+use crate::ntapi_base::{CLIENT_ID, KPRIORITY, KSYSTEM_TIME, PRTL_ATOM, RTL_ATOM};
+use crate::ntioapi::{BUS_DATA_TYPE, FILE_IO_COMPLETION_INFORMATION, INTERFACE_TYPE};
+use crate::ntkeapi::{KPROFILE_SOURCE, KTHREAD_STATE, KWAIT_REASON};
+use crate::ntldr::RTL_PROCESS_MODULE_INFORMATION_EX;
+use crate::ntpebteb::PTEB;
+use crate::ntpoapi::COUNTED_REASON_CONTEXT;
+use winapi::shared::basetsd::{KAFFINITY, PULONG64, PULONG_PTR, SIZE_T, ULONG64, ULONG_PTR};
+use winapi::shared::evntrace::PROFILE_SOURCE_INFO;
+use winapi::shared::guiddef::{GUID, LPGUID};
+use winapi::shared::ntdef::{
+    BOOLEAN, CCHAR, EVENT_TYPE, HANDLE, LANGID, LARGE_INTEGER, LCID, LOGICAL, LONG, LONGLONG,
+    NTSTATUS, NT_PRODUCT_TYPE, PBOOLEAN, PCHAR, PCWNF_STATE_NAME, PGROUP_AFFINITY, PHANDLE,
+    PHYSICAL_ADDRESS, PLARGE_INTEGER, PLCID, PLONG, PLUID, POBJECT_ATTRIBUTES, PUCHAR,
+    PULARGE_INTEGER, PULONG, PUNICODE_STRING, PUSHORT, PVOID, PWNF_STATE_NAME, PWSTR, TIMER_TYPE,
+    UCHAR, ULARGE_INTEGER, ULONG, ULONGLONG, UNICODE_STRING, USHORT, VOID, WCHAR, WNF_STATE_NAME,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, ANYSIZE_ARRAY, FIRMWARE_TYPE, GENERIC_MAPPING, PSECURITY_DESCRIPTOR,
+    STANDARD_RIGHTS_REQUIRED, SYNCHRONIZE, XSTATE_CONFIGURATION,
+};
+use crate::winapi_local::um::winnt::UInt32x32To64;
+EXTERN!{extern "system" {
+    fn NtDelayExecution(
+        Alertable: BOOLEAN,
+        DelayInterval: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtQuerySystemEnvironmentValue(
+        VariableName: PUNICODE_STRING,
+        VariableValue: PWSTR,
+        ValueLength: USHORT,
+        ReturnLength: PUSHORT,
+    ) -> NTSTATUS;
+    fn NtSetSystemEnvironmentValue(
+        VariableName: PUNICODE_STRING,
+        VariableValue: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn NtQuerySystemEnvironmentValueEx(
+        VariableName: PUNICODE_STRING,
+        VendorGuid: LPGUID,
+        Value: PVOID,
+        ValueLength: PULONG,
+        Attributes: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetSystemEnvironmentValueEx(
+        VariableName: PUNICODE_STRING,
+        VendorGuid: LPGUID,
+        Value: PVOID,
+        ValueLength: ULONG,
+        Attributes: ULONG,
+    ) -> NTSTATUS;
+    fn NtEnumerateSystemEnvironmentValuesEx(
+        InformationClass: ULONG,
+        Buffer: PVOID,
+        BufferLength: PULONG,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct BOOT_ENTRY {
+    Version: ULONG,
+    Length: ULONG,
+    Id: ULONG,
+    Attributes: ULONG,
+    FriendlyNameOffset: ULONG,
+    BootFilePathOffset: ULONG,
+    OsOptionsLength: ULONG,
+    OsOptions: [UCHAR; 1],
+}}
+pub type PBOOT_ENTRY = *mut BOOT_ENTRY;
+STRUCT!{struct BOOT_ENTRY_LIST {
+    NextEntryOffset: ULONG,
+    BootEntry: BOOT_ENTRY,
+}}
+pub type PBOOT_ENTRY_LIST = *mut BOOT_ENTRY_LIST;
+STRUCT!{struct BOOT_OPTIONS {
+    Version: ULONG,
+    Length: ULONG,
+    Timeout: ULONG,
+    CurrentBootEntryId: ULONG,
+    NextBootEntryId: ULONG,
+    HeadlessRedirection: [WCHAR; 1],
+}}
+pub type PBOOT_OPTIONS = *mut BOOT_OPTIONS;
+STRUCT!{struct FILE_PATH {
+    Version: ULONG,
+    Length: ULONG,
+    Type: ULONG,
+    FilePath: [UCHAR; 1],
+}}
+pub type PFILE_PATH = *mut FILE_PATH;
+STRUCT!{struct EFI_DRIVER_ENTRY {
+    Version: ULONG,
+    Length: ULONG,
+    Id: ULONG,
+    FriendlyNameOffset: ULONG,
+    DriverFilePathOffset: ULONG,
+}}
+pub type PEFI_DRIVER_ENTRY = *mut EFI_DRIVER_ENTRY;
+STRUCT!{struct EFI_DRIVER_ENTRY_LIST {
+    NextEntryOffset: ULONG,
+    DriverEntry: EFI_DRIVER_ENTRY,
+}}
+pub type PEFI_DRIVER_ENTRY_LIST = *mut EFI_DRIVER_ENTRY_LIST;
+EXTERN!{extern "system" {
+    fn NtAddBootEntry(
+        BootEntry: PBOOT_ENTRY,
+        Id: PULONG,
+    ) -> NTSTATUS;
+    fn NtDeleteBootEntry(
+        Id: ULONG,
+    ) -> NTSTATUS;
+    fn NtModifyBootEntry(
+        BootEntry: PBOOT_ENTRY,
+    ) -> NTSTATUS;
+    fn NtEnumerateBootEntries(
+        Buffer: PVOID,
+        BufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtQueryBootEntryOrder(
+        Ids: PULONG,
+        Count: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetBootEntryOrder(
+        Ids: PULONG,
+        Count: ULONG,
+    ) -> NTSTATUS;
+    fn NtQueryBootOptions(
+        BootOptions: PBOOT_OPTIONS,
+        BootOptionsLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetBootOptions(
+        BootOptions: PBOOT_OPTIONS,
+        FieldsToChange: ULONG,
+    ) -> NTSTATUS;
+    fn NtTranslateFilePath(
+        InputFilePath: PFILE_PATH,
+        OutputType: ULONG,
+        OutputFilePath: PFILE_PATH,
+        OutputFilePathLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtAddDriverEntry(
+        DriverEntry: PEFI_DRIVER_ENTRY,
+        Id: PULONG,
+    ) -> NTSTATUS;
+    fn NtDeleteDriverEntry(
+        Id: ULONG,
+    ) -> NTSTATUS;
+    fn NtModifyDriverEntry(
+        DriverEntry: PEFI_DRIVER_ENTRY,
+    ) -> NTSTATUS;
+    fn NtEnumerateDriverEntries(
+        Buffer: PVOID,
+        BufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtQueryDriverEntryOrder(
+        Ids: PULONG,
+        Count: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetDriverEntryOrder(
+        Ids: PULONG,
+        Count: ULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum FILTER_BOOT_OPTION_OPERATION {
+    FilterBootOptionOperationOpenSystemStore = 0,
+    FilterBootOptionOperationSetElement = 1,
+    FilterBootOptionOperationDeleteElement = 2,
+    FilterBootOptionOperationMax = 3,
+}}
+EXTERN!{extern "system" {
+    fn NtFilterBootOption(
+        FilterOperation: FILTER_BOOT_OPTION_OPERATION,
+        ObjectType: ULONG,
+        ElementType: ULONG,
+        Data: PVOID,
+        DataSize: ULONG,
+    ) -> NTSTATUS;
+}}
+pub const EVENT_QUERY_STATE: u32 = 0x0001;
+ENUM!{enum EVENT_INFORMATION_CLASS {
+    EventBasicInformation = 0,
+}}
+STRUCT!{struct EVENT_BASIC_INFORMATION {
+    EventType: EVENT_TYPE,
+    EventState: LONG,
+}}
+pub type PEVENT_BASIC_INFORMATION = *mut EVENT_BASIC_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtCreateEvent(
+        EventHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        EventType: EVENT_TYPE,
+        InitialState: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtOpenEvent(
+        EventHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtSetEvent(
+        EventHandle: HANDLE,
+        PreviousState: PLONG,
+    ) -> NTSTATUS;
+    fn NtSetEventBoostPriority(
+        EventHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtClearEvent(
+        EventHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtResetEvent(
+        EventHandle: HANDLE,
+        PreviousState: PLONG,
+    ) -> NTSTATUS;
+    fn NtPulseEvent(
+        EventHandle: HANDLE,
+        PreviousState: PLONG,
+    ) -> NTSTATUS;
+    fn NtQueryEvent(
+        EventHandle: HANDLE,
+        EventInformationClass: EVENT_INFORMATION_CLASS,
+        EventInformation: PVOID,
+        EventInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
+pub const EVENT_PAIR_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE;
+EXTERN!{extern "system" {
+    fn NtCreateEventPair(
+        EventPairHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtOpenEventPair(
+        EventPairHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtSetLowEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtSetHighEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtWaitLowEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtWaitHighEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtSetLowWaitHighEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtSetHighWaitLowEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum MUTANT_INFORMATION_CLASS {
+    MutantBasicInformation = 0,
+    MutantOwnerInformation = 1,
+}}
+STRUCT!{struct MUTANT_BASIC_INFORMATION {
+    CurrentCount: LONG,
+    OwnedByCaller: BOOLEAN,
+    AbandonedState: BOOLEAN,
+}}
+pub type PMUTANT_BASIC_INFORMATION = *mut MUTANT_BASIC_INFORMATION;
+STRUCT!{struct MUTANT_OWNER_INFORMATION {
+    ClientId: CLIENT_ID,
+}}
+pub type PMUTANT_OWNER_INFORMATION = *mut MUTANT_OWNER_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtCreateMutant(
+        MutantHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        InitialOwner: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtOpenMutant(
+        MutantHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtReleaseMutant(
+        MutantHandle: HANDLE,
+        PreviousCount: PLONG,
+    ) -> NTSTATUS;
+    fn NtQueryMutant(
+        MutantHandle: HANDLE,
+        MutantInformationClass: MUTANT_INFORMATION_CLASS,
+        MutantInformation: PVOID,
+        MutantInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
+pub const SEMAPHORE_QUERY_STATE: u32 = 0x0001;
+ENUM!{enum SEMAPHORE_INFORMATION_CLASS {
+    SemaphoreBasicInformation = 0,
+}}
+STRUCT!{struct SEMAPHORE_BASIC_INFORMATION {
+    CurrentCount: LONG,
+    MaximumCount: LONG,
+}}
+pub type PSEMAPHORE_BASIC_INFORMATION = *mut SEMAPHORE_BASIC_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtCreateSemaphore(
+        SemaphoreHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        InitialCount: LONG,
+        MaximumCount: LONG,
+    ) -> NTSTATUS;
+    fn NtOpenSemaphore(
+        SemaphoreHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtReleaseSemaphore(
+        SemaphoreHandle: HANDLE,
+        ReleaseCount: LONG,
+        PreviousCount: PLONG,
+    ) -> NTSTATUS;
+    fn NtQuerySemaphore(
+        SemaphoreHandle: HANDLE,
+        SemaphoreInformationClass: SEMAPHORE_INFORMATION_CLASS,
+        SemaphoreInformation: PVOID,
+        SemaphoreInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum TIMER_INFORMATION_CLASS {
+    TimerBasicInformation = 0,
+}}
+STRUCT!{struct TIMER_BASIC_INFORMATION {
+    RemainingTime: LARGE_INTEGER,
+    TimerState: BOOLEAN,
+}}
+pub type PTIMER_BASIC_INFORMATION = *mut TIMER_BASIC_INFORMATION;
+FN!{stdcall PTIMER_APC_ROUTINE(
+    TimerContext: PVOID,
+    TimerLowValue: ULONG,
+    TimerHighValue: LONG,
+) -> ()}
+ENUM!{enum TIMER_SET_INFORMATION_CLASS {
+    TimerSetCoalescableTimer = 0,
+    MaxTimerInfoClass = 1,
+}}
+STRUCT!{struct TIMER_SET_COALESCABLE_TIMER_INFO {
+    DueTime: LARGE_INTEGER,
+    TimerApcRoutine: PTIMER_APC_ROUTINE,
+    TimerContext: PVOID,
+    WakeContext: *mut COUNTED_REASON_CONTEXT,
+    Period: ULONG,
+    TolerableDelay: ULONG,
+    PreviousState: PBOOLEAN,
+}}
+pub type PTIMER_SET_COALESCABLE_TIMER_INFO = *mut TIMER_SET_COALESCABLE_TIMER_INFO;
+EXTERN!{extern "system" {
+    fn NtCreateTimer(
+        TimerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TimerType: TIMER_TYPE,
+    ) -> NTSTATUS;
+    fn NtOpenTimer(
+        TimerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtSetTimer(
+        TimerHandle: HANDLE,
+        DueTime: PLARGE_INTEGER,
+        TimerApcRoutine: PTIMER_APC_ROUTINE,
+        TimerContext: PVOID,
+        ResumeTimer: BOOLEAN,
+        Period: LONG,
+        PreviousState: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtSetTimerEx(
+        TimerHandle: HANDLE,
+        TimerSetInformationClass: TIMER_SET_INFORMATION_CLASS,
+        TimerSetInformation: PVOID,
+        TimerSetInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtCancelTimer(
+        TimerHandle: HANDLE,
+        CurrentState: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtQueryTimer(
+        TimerHandle: HANDLE,
+        TimerInformationClass: TIMER_INFORMATION_CLASS,
+        TimerInformation: PVOID,
+        TimerInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtCreateIRTimer(
+        TimerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+    ) -> NTSTATUS;
+    fn NtSetIRTimer(
+        TimerHandle: HANDLE,
+        DueTime: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct T2_SET_PARAMETERS {
+    Version: ULONG,
+    Reserved: ULONG,
+    NoWakeTolerance: LONGLONG,
+}}
+pub type PT2_SET_PARAMETERS = *mut T2_SET_PARAMETERS;
+pub type PT2_CANCEL_PARAMETERS = PVOID;
+EXTERN!{extern "system" {
+    fn NtCreateTimer2(
+        TimerHandle: PHANDLE,
+        Reserved1: PVOID,
+        Reserved2: PVOID,
+        Attributes: ULONG,
+        DesiredAccess: ACCESS_MASK,
+    ) -> NTSTATUS;
+    fn NtSetTimer2(
+        TimerHandle: HANDLE,
+        DueTime: PLARGE_INTEGER,
+        Period: PLARGE_INTEGER,
+        Parameters: PT2_SET_PARAMETERS,
+    ) -> NTSTATUS;
+    fn NtCancelTimer2(
+        TimerHandle: HANDLE,
+        Parameters: PT2_CANCEL_PARAMETERS,
+    ) -> NTSTATUS;
+}}
+pub const PROFILE_CONTROL: u32 = 0x0001;
+pub const PROFILE_ALL_ACCESS: u32 = STANDARD_RIGHTS_REQUIRED | PROFILE_CONTROL;
+EXTERN!{extern "system" {
+    fn NtCreateProfile(
+        ProfileHandle: PHANDLE,
+        Process: HANDLE,
+        ProfileBase: PVOID,
+        ProfileSize: SIZE_T,
+        BucketSize: ULONG,
+        Buffer: PULONG,
+        BufferSize: ULONG,
+        ProfileSource: KPROFILE_SOURCE,
+        Affinity: KAFFINITY,
+    ) -> NTSTATUS;
+    fn NtCreateProfileEx(
+        ProfileHandle: PHANDLE,
+        Process: HANDLE,
+        ProfileBase: PVOID,
+        ProfileSize: SIZE_T,
+        BucketSize: ULONG,
+        Buffer: PULONG,
+        BufferSize: ULONG,
+        ProfileSource: KPROFILE_SOURCE,
+        GroupCount: USHORT,
+        GroupAffinity: PGROUP_AFFINITY,
+    ) -> NTSTATUS;
+    fn NtStartProfile(
+        ProfileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtStopProfile(
+        ProfileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtQueryIntervalProfile(
+        ProfileSource: KPROFILE_SOURCE,
+        Interval: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetIntervalProfile(
+        Interval: ULONG,
+        Source: KPROFILE_SOURCE,
+    ) -> NTSTATUS;
+}}
+pub const KEYEDEVENT_WAIT: ULONG = 0x0001;
+pub const KEYEDEVENT_WAKE: ULONG = 0x0002;
+pub const KEYEDEVENT_ALL_ACCESS: ACCESS_MASK =
+    STANDARD_RIGHTS_REQUIRED | KEYEDEVENT_WAIT | KEYEDEVENT_WAKE;
+EXTERN!{extern "system" {
+    fn NtCreateKeyedEvent(
+        KeyedEventHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtOpenKeyedEvent(
+        KeyedEventHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtReleaseKeyedEvent(
+        KeyedEventHandle: HANDLE,
+        KeyValue: PVOID,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtWaitForKeyedEvent(
+        KeyedEventHandle: HANDLE,
+        KeyValue: PVOID,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtUmsThreadYield(
+        SchedulerParam: PVOID,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum WNF_STATE_NAME_LIFETIME {
+    WnfWellKnownStateName = 0,
+    WnfPermanentStateName = 1,
+    WnfPersistentStateName = 2,
+    WnfTemporaryStateName = 3,
+}}
+ENUM!{enum WNF_STATE_NAME_INFORMATION {
+    WnfInfoStateNameExist = 0,
+    WnfInfoSubscribersPresent = 1,
+    WnfInfoIsQuiescent = 2,
+}}
+ENUM!{enum WNF_DATA_SCOPE {
+    WnfDataScopeSystem = 0,
+    WnfDataScopeSession = 1,
+    WnfDataScopeUser = 2,
+    WnfDataScopeProcess = 3,
+    WnfDataScopeMachine = 4,
+}}
+STRUCT!{struct WNF_TYPE_ID {
+    TypeId: GUID,
+}}
+pub type PWNF_TYPE_ID = *mut WNF_TYPE_ID;
+pub type PCWNF_TYPE_ID = *const WNF_TYPE_ID;
+pub type PWNF_CHANGE_STAMP = *mut ULONG;
+pub type WNF_CHANGE_STAMP = ULONG;
+STRUCT!{struct WNF_DELIVERY_DESCRIPTOR {
+    SubscriptionId: ULONGLONG,
+    StateName: WNF_STATE_NAME,
+    ChangeStamp: WNF_CHANGE_STAMP,
+    StateDataSize: ULONG,
+    EventMask: ULONG,
+    TypeId: WNF_TYPE_ID,
+    StateDataOffset: ULONG,
+}}
+pub type PWNF_DELIVERY_DESCRIPTOR = *mut WNF_DELIVERY_DESCRIPTOR;
+EXTERN!{extern "system" {
+    fn NtCreateWnfStateName(
+        StateName: PWNF_STATE_NAME,
+        NameLifetime: WNF_STATE_NAME_LIFETIME,
+        DataScope: WNF_DATA_SCOPE,
+        PersistData: BOOLEAN,
+        TypeId: PCWNF_TYPE_ID,
+        MaximumStateSize: ULONG,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+    ) -> NTSTATUS;
+    fn NtDeleteWnfStateName(
+        StateName: PCWNF_STATE_NAME,
+    ) -> NTSTATUS;
+    fn NtUpdateWnfStateData(
+        StateName: PCWNF_STATE_NAME,
+        Buffer: *const VOID,
+        Length: ULONG,
+        TypeId: PCWNF_TYPE_ID,
+        ExplicitScope: *const VOID,
+        MatchingChangeStamp: WNF_CHANGE_STAMP,
+        CheckStamp: LOGICAL,
+    ) -> NTSTATUS;
+    fn NtDeleteWnfStateData(
+        StateName: PCWNF_STATE_NAME,
+        ExplicitScope: *const VOID,
+    ) -> NTSTATUS;
+    fn NtQueryWnfStateData(
+        StateName: PCWNF_STATE_NAME,
+        TypeId: PCWNF_TYPE_ID,
+        ExplicitScope: *const VOID,
+        ChangeStamp: PWNF_CHANGE_STAMP,
+        Buffer: PVOID,
+        BufferSize: PULONG,
+    ) -> NTSTATUS;
+    fn NtQueryWnfStateNameInformation(
+        StateName: PCWNF_STATE_NAME,
+        NameInfoClass: WNF_STATE_NAME_INFORMATION,
+        ExplicitScope: *const VOID,
+        InfoBuffer: PVOID,
+        InfoBufferSize: ULONG,
+    ) -> NTSTATUS;
+    fn NtSubscribeWnfStateChange(
+        StateName: PCWNF_STATE_NAME,
+        ChangeStamp: WNF_CHANGE_STAMP,
+        EventMask: ULONG,
+        SubscriptionId: PULONG64,
+    ) -> NTSTATUS;
+    fn NtUnsubscribeWnfStateChange(
+        StateName: PCWNF_STATE_NAME,
+    ) -> NTSTATUS;
+    fn NtGetCompleteWnfStateSubscription(
+        OldDescriptorStateName: PWNF_STATE_NAME,
+        OldSubscriptionId: *mut ULONG64,
+        OldDescriptorEventMask: ULONG,
+        OldDescriptorStatus: ULONG,
+        NewDeliveryDescriptor: PWNF_DELIVERY_DESCRIPTOR,
+        DescriptorSize: ULONG,
+    ) -> NTSTATUS;
+    fn NtSetWnfProcessNotificationEvent(
+        NotificationEvent: HANDLE,
+    ) -> NTSTATUS;
+}}
+pub const WORKER_FACTORY_RELEASE_WORKER: u32 = 0x0001;
+pub const WORKER_FACTORY_WAIT: u32 = 0x0002;
+pub const WORKER_FACTORY_SET_INFORMATION: u32 = 0x0004;
+pub const WORKER_FACTORY_QUERY_INFORMATION: u32 = 0x0008;
+pub const WORKER_FACTORY_READY_WORKER: u32 = 0x0010;
+pub const WORKER_FACTORY_SHUTDOWN: u32 = 0x0020;
+pub const WORKER_FACTORY_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED
+    | WORKER_FACTORY_RELEASE_WORKER | WORKER_FACTORY_WAIT | WORKER_FACTORY_SET_INFORMATION
+    | WORKER_FACTORY_QUERY_INFORMATION | WORKER_FACTORY_READY_WORKER | WORKER_FACTORY_SHUTDOWN;
+ENUM!{enum WORKERFACTORYINFOCLASS {
+    WorkerFactoryTimeout = 0,
+    WorkerFactoryRetryTimeout = 1,
+    WorkerFactoryIdleTimeout = 2,
+    WorkerFactoryBindingCount = 3,
+    WorkerFactoryThreadMinimum = 4,
+    WorkerFactoryThreadMaximum = 5,
+    WorkerFactoryPaused = 6,
+    WorkerFactoryBasicInformation = 7,
+    WorkerFactoryAdjustThreadGoal = 8,
+    WorkerFactoryCallbackType = 9,
+    WorkerFactoryStackInformation = 10,
+    WorkerFactoryThreadBasePriority = 11,
+    WorkerFactoryTimeoutWaiters = 12,
+    WorkerFactoryFlags = 13,
+    WorkerFactoryThreadSoftMaximum = 14,
+    MaxWorkerFactoryInfoClass = 15,
+}}
+pub type PWORKERFACTORYINFOCLASS = *mut WORKERFACTORYINFOCLASS;
+STRUCT!{struct WORKER_FACTORY_BASIC_INFORMATION {
+    Timeout: LARGE_INTEGER,
+    RetryTimeout: LARGE_INTEGER,
+    IdleTimeout: LARGE_INTEGER,
+    Paused: BOOLEAN,
+    TimerSet: BOOLEAN,
+    QueuedToExWorker: BOOLEAN,
+    MayCreate: BOOLEAN,
+    CreateInProgress: BOOLEAN,
+    InsertedIntoQueue: BOOLEAN,
+    Shutdown: BOOLEAN,
+    BindingCount: ULONG,
+    ThreadMinimum: ULONG,
+    ThreadMaximum: ULONG,
+    PendingWorkerCount: ULONG,
+    WaitingWorkerCount: ULONG,
+    TotalWorkerCount: ULONG,
+    ReleaseCount: ULONG,
+    InfiniteWaitGoal: LONGLONG,
+    StartRoutine: PVOID,
+    StartParameter: PVOID,
+    ProcessId: HANDLE,
+    StackReserve: SIZE_T,
+    StackCommit: SIZE_T,
+    LastThreadCreationStatus: NTSTATUS,
+}}
+pub type PWORKER_FACTORY_BASIC_INFORMATION = *mut WORKER_FACTORY_BASIC_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtCreateWorkerFactory(
+        WorkerFactoryHandleReturn: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        CompletionPortHandle: HANDLE,
+        WorkerProcessHandle: HANDLE,
+        StartRoutine: PVOID,
+        StartParameter: PVOID,
+        MaxThreadCount: ULONG,
+        StackReserve: SIZE_T,
+        StackCommit: SIZE_T,
+    ) -> NTSTATUS;
+    fn NtQueryInformationWorkerFactory(
+        WorkerFactoryHandle: HANDLE,
+        WorkerFactoryInformationClass: WORKERFACTORYINFOCLASS,
+        WorkerFactoryInformation: PVOID,
+        WorkerFactoryInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationWorkerFactory(
+        WorkerFactoryHandle: HANDLE,
+        WorkerFactoryInformationClass: WORKERFACTORYINFOCLASS,
+        WorkerFactoryInformation: PVOID,
+        WorkerFactoryInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtShutdownWorkerFactory(
+        WorkerFactoryHandle: HANDLE,
+        PendingWorkerCount: *mut LONG,
+    ) -> NTSTATUS;
+    fn NtReleaseWorkerFactoryWorker(
+        WorkerFactoryHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtWorkerFactoryWorkerReady(
+        WorkerFactoryHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtWaitForWorkViaWorkerFactory(
+        WorkerFactoryHandle: HANDLE,
+        MiniPacket: *mut FILE_IO_COMPLETION_INFORMATION,
+    ) -> NTSTATUS;
+    fn NtQuerySystemTime(
+        SystemTime: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtSetSystemTime(
+        SystemTime: PLARGE_INTEGER,
+        PreviousTime: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtQueryTimerResolution(
+        MaximumTime: PULONG,
+        MinimumTime: PULONG,
+        CurrentTime: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetTimerResolution(
+        DesiredTime: ULONG,
+        SetResolution: BOOLEAN,
+        ActualTime: PULONG,
+    ) -> NTSTATUS;
+    fn NtQueryPerformanceCounter(
+        PerformanceCounter: PLARGE_INTEGER,
+        PerformanceFrequency: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtAllocateLocallyUniqueId(
+        Luid: PLUID,
+    ) -> NTSTATUS;
+    fn NtSetUuidSeed(
+        Seed: PCHAR,
+    ) -> NTSTATUS;
+    fn NtAllocateUuids(
+        Time: PULARGE_INTEGER,
+        Range: PULONG,
+        Sequence: PULONG,
+        Seed: PCHAR,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum SYSTEM_INFORMATION_CLASS {
+    SystemBasicInformation = 0,
+    SystemProcessorInformation = 1,
+    SystemPerformanceInformation = 2,
+    SystemTimeOfDayInformation = 3,
+    SystemPathInformation = 4,
+    SystemProcessInformation = 5,
+    SystemCallCountInformation = 6,
+    SystemDeviceInformation = 7,
+    SystemProcessorPerformanceInformation = 8,
+    SystemFlagsInformation = 9,
+    SystemCallTimeInformation = 10,
+    SystemModuleInformation = 11,
+    SystemLocksInformation = 12,
+    SystemStackTraceInformation = 13,
+    SystemPagedPoolInformation = 14,
+    SystemNonPagedPoolInformation = 15,
+    SystemHandleInformation = 16,
+    SystemObjectInformation = 17,
+    SystemPageFileInformation = 18,
+    SystemVdmInstemulInformation = 19,
+    SystemVdmBopInformation = 20,
+    SystemFileCacheInformation = 21,
+    SystemPoolTagInformation = 22,
+    SystemInterruptInformation = 23,
+    SystemDpcBehaviorInformation = 24,
+    SystemFullMemoryInformation = 25,
+    SystemLoadGdiDriverInformation = 26,
+    SystemUnloadGdiDriverInformation = 27,
+    SystemTimeAdjustmentInformation = 28,
+    SystemSummaryMemoryInformation = 29,
+    SystemMirrorMemoryInformation = 30,
+    SystemPerformanceTraceInformation = 31,
+    SystemObsolete0 = 32,
+    SystemExceptionInformation = 33,
+    SystemCrashDumpStateInformation = 34,
+    SystemKernelDebuggerInformation = 35,
+    SystemContextSwitchInformation = 36,
+    SystemRegistryQuotaInformation = 37,
+    SystemExtendServiceTableInformation = 38,
+    SystemPrioritySeperation = 39,
+    SystemVerifierAddDriverInformation = 40,
+    SystemVerifierRemoveDriverInformation = 41,
+    SystemProcessorIdleInformation = 42,
+    SystemLegacyDriverInformation = 43,
+    SystemCurrentTimeZoneInformation = 44,
+    SystemLookasideInformation = 45,
+    SystemTimeSlipNotification = 46,
+    SystemSessionCreate = 47,
+    SystemSessionDetach = 48,
+    SystemSessionInformation = 49,
+    SystemRangeStartInformation = 50,
+    SystemVerifierInformation = 51,
+    SystemVerifierThunkExtend = 52,
+    SystemSessionProcessInformation = 53,
+    SystemLoadGdiDriverInSystemSpace = 54,
+    SystemNumaProcessorMap = 55,
+    SystemPrefetcherInformation = 56,
+    SystemExtendedProcessInformation = 57,
+    SystemRecommendedSharedDataAlignment = 58,
+    SystemComPlusPackage = 59,
+    SystemNumaAvailableMemory = 60,
+    SystemProcessorPowerInformation = 61,
+    SystemEmulationBasicInformation = 62,
+    SystemEmulationProcessorInformation = 63,
+    SystemExtendedHandleInformation = 64,
+    SystemLostDelayedWriteInformation = 65,
+    SystemBigPoolInformation = 66,
+    SystemSessionPoolTagInformation = 67,
+    SystemSessionMappedViewInformation = 68,
+    SystemHotpatchInformation = 69,
+    SystemObjectSecurityMode = 70,
+    SystemWatchdogTimerHandler = 71,
+    SystemWatchdogTimerInformation = 72,
+    SystemLogicalProcessorInformation = 73,
+    SystemWow64SharedInformationObsolete = 74,
+    SystemRegisterFirmwareTableInformationHandler = 75,
+    SystemFirmwareTableInformation = 76,
+    SystemModuleInformationEx = 77,
+    SystemVerifierTriageInformation = 78,
+    SystemSuperfetchInformation = 79,
+    SystemMemoryListInformation = 80,
+    SystemFileCacheInformationEx = 81,
+    SystemThreadPriorityClientIdInformation = 82,
+    SystemProcessorIdleCycleTimeInformation = 83,
+    SystemVerifierCancellationInformation = 84,
+    SystemProcessorPowerInformationEx = 85,
+    SystemRefTraceInformation = 86,
+    SystemSpecialPoolInformation = 87,
+    SystemProcessIdInformation = 88,
+    SystemErrorPortInformation = 89,
+    SystemBootEnvironmentInformation = 90,
+    SystemHypervisorInformation = 91,
+    SystemVerifierInformationEx = 92,
+    SystemTimeZoneInformation = 93,
+    SystemImageFileExecutionOptionsInformation = 94,
+    SystemCoverageInformation = 95,
+    SystemPrefetchPatchInformation = 96,
+    SystemVerifierFaultsInformation = 97,
+    SystemSystemPartitionInformation = 98,
+    SystemSystemDiskInformation = 99,
+    SystemProcessorPerformanceDistribution = 100,
+    SystemNumaProximityNodeInformation = 101,
+    SystemDynamicTimeZoneInformation = 102,
+    SystemCodeIntegrityInformation = 103,
+    SystemProcessorMicrocodeUpdateInformation = 104,
+    SystemProcessorBrandString = 105,
+    SystemVirtualAddressInformation = 106,
+    SystemLogicalProcessorAndGroupInformation = 107,
+    SystemProcessorCycleTimeInformation = 108,
+    SystemStoreInformation = 109,
+    SystemRegistryAppendString = 110,
+    SystemAitSamplingValue = 111,
+    SystemVhdBootInformation = 112,
+    SystemCpuQuotaInformation = 113,
+    SystemNativeBasicInformation = 114,
+    SystemSpare1 = 115,
+    SystemLowPriorityIoInformation = 116,
+    SystemTpmBootEntropyInformation = 117,
+    SystemVerifierCountersInformation = 118,
+    SystemPagedPoolInformationEx = 119,
+    SystemSystemPtesInformationEx = 120,
+    SystemNodeDistanceInformation = 121,
+    SystemAcpiAuditInformation = 122,
+    SystemBasicPerformanceInformation = 123,
+    SystemQueryPerformanceCounterInformation = 124,
+    SystemSessionBigPoolInformation = 125,
+    SystemBootGraphicsInformation = 126,
+    SystemScrubPhysicalMemoryInformation = 127,
+    SystemBadPageInformation = 128,
+    SystemProcessorProfileControlArea = 129,
+    SystemCombinePhysicalMemoryInformation = 130,
+    SystemEntropyInterruptTimingCallback = 131,
+    SystemConsoleInformation = 132,
+    SystemPlatformBinaryInformation = 133,
+    SystemThrottleNotificationInformation = 134,
+    SystemHypervisorProcessorCountInformation = 135,
+    SystemDeviceDataInformation = 136,
+    SystemDeviceDataEnumerationInformation = 137,
+    SystemMemoryTopologyInformation = 138,
+    SystemMemoryChannelInformation = 139,
+    SystemBootLogoInformation = 140,
+    SystemProcessorPerformanceInformationEx = 141,
+    SystemSpare0 = 142,
+    SystemSecureBootPolicyInformation = 143,
+    SystemPageFileInformationEx = 144,
+    SystemSecureBootInformation = 145,
+    SystemEntropyInterruptTimingRawInformation = 146,
+    SystemPortableWorkspaceEfiLauncherInformation = 147,
+    SystemFullProcessInformation = 148,
+    SystemKernelDebuggerInformationEx = 149,
+    SystemBootMetadataInformation = 150,
+    SystemSoftRebootInformation = 151,
+    SystemElamCertificateInformation = 152,
+    SystemOfflineDumpConfigInformation = 153,
+    SystemProcessorFeaturesInformation = 154,
+    SystemRegistryReconciliationInformation = 155,
+    SystemEdidInformation = 156,
+    SystemManufacturingInformation = 157,
+    SystemEnergyEstimationConfigInformation = 158,
+    SystemHypervisorDetailInformation = 159,
+    SystemProcessorCycleStatsInformation = 160,
+    SystemVmGenerationCountInformation = 161,
+    SystemTrustedPlatformModuleInformation = 162,
+    SystemKernelDebuggerFlags = 163,
+    SystemCodeIntegrityPolicyInformation = 164,
+    SystemIsolatedUserModeInformation = 165,
+    SystemHardwareSecurityTestInterfaceResultsInformation = 166,
+    SystemSingleModuleInformation = 167,
+    SystemAllowedCpuSetsInformation = 168,
+    SystemVsmProtectionInformation = 169,
+    SystemInterruptCpuSetsInformation = 170,
+    SystemSecureBootPolicyFullInformation = 171,
+    SystemCodeIntegrityPolicyFullInformation = 172,
+    SystemAffinitizedInterruptProcessorInformation = 173,
+    SystemRootSiloInformation = 174,
+    SystemCpuSetInformation = 175,
+    SystemCpuSetTagInformation = 176,
+    SystemWin32WerStartCallout = 177,
+    SystemSecureKernelProfileInformation = 178,
+    SystemCodeIntegrityPlatformManifestInformation = 179,
+    SystemInterruptSteeringInformation = 180,
+    SystemSupportedProcessorArchitectures = 181,
+    SystemMemoryUsageInformation = 182,
+    SystemCodeIntegrityCertificateInformation = 183,
+    SystemPhysicalMemoryInformation = 184,
+    SystemControlFlowTransition = 185,
+    SystemKernelDebuggingAllowed = 186,
+    SystemActivityModerationExeState = 187,
+    SystemActivityModerationUserSettings = 188,
+    SystemCodeIntegrityPoliciesFullInformation = 189,
+    SystemCodeIntegrityUnlockInformation = 190,
+    SystemIntegrityQuotaInformation = 191,
+    SystemFlushInformation = 192,
+    SystemProcessorIdleMaskInformation = 193,
+    SystemSecureDumpEncryptionInformation = 194,
+    SystemWriteConstraintInformation = 195,
+    SystemKernelVaShadowInformation = 196,
+    SystemHypervisorSharedPageInformation = 197,
+    SystemFirmwareBootPerformanceInformation = 198,
+    SystemCodeIntegrityVerificationInformation = 199,
+    SystemFirmwarePartitionInformation = 200,
+    SystemSpeculationControlInformation = 201,
+    SystemDmaGuardPolicyInformation = 202,
+    SystemEnclaveLaunchControlInformation = 203,
+    SystemWorkloadAllowedCpuSetsInformation = 204,
+    SystemCodeIntegrityUnlockModeInformation = 205,
+    SystemLeapSecondInformation = 206,
+    SystemFlags2Information = 207,
+    MaxSystemInfoClass = 208,
+}}
+STRUCT!{struct SYSTEM_BASIC_INFORMATION {
+    Reserved: ULONG,
+    TimerResolution: ULONG,
+    PageSize: ULONG,
+    NumberOfPhysicalPages: ULONG,
+    LowestPhysicalPageNumber: ULONG,
+    HighestPhysicalPageNumber: ULONG,
+    AllocationGranularity: ULONG,
+    MinimumUserModeAddress: ULONG_PTR,
+    MaximumUserModeAddress: ULONG_PTR,
+    ActiveProcessorsAffinityMask: ULONG_PTR,
+    NumberOfProcessors: CCHAR,
+}}
+pub type PSYSTEM_BASIC_INFORMATION = *mut SYSTEM_BASIC_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_INFORMATION {
+    ProcessorArchitecture: USHORT,
+    ProcessorLevel: USHORT,
+    ProcessorRevision: USHORT,
+    MaximumProcessors: USHORT,
+    ProcessorFeatureBits: ULONG,
+}}
+pub type PSYSTEM_PROCESSOR_INFORMATION = *mut SYSTEM_PROCESSOR_INFORMATION;
+STRUCT!{struct SYSTEM_PERFORMANCE_INFORMATION {
+    IdleProcessTime: LARGE_INTEGER,
+    IoReadTransferCount: LARGE_INTEGER,
+    IoWriteTransferCount: LARGE_INTEGER,
+    IoOtherTransferCount: LARGE_INTEGER,
+    IoReadOperationCount: ULONG,
+    IoWriteOperationCount: ULONG,
+    IoOtherOperationCount: ULONG,
+    AvailablePages: ULONG,
+    CommittedPages: ULONG,
+    CommitLimit: ULONG,
+    PeakCommitment: ULONG,
+    PageFaultCount: ULONG,
+    CopyOnWriteCount: ULONG,
+    TransitionCount: ULONG,
+    CacheTransitionCount: ULONG,
+    DemandZeroCount: ULONG,
+    PageReadCount: ULONG,
+    PageReadIoCount: ULONG,
+    CacheReadCount: ULONG,
+    CacheIoCount: ULONG,
+    DirtyPagesWriteCount: ULONG,
+    DirtyWriteIoCount: ULONG,
+    MappedPagesWriteCount: ULONG,
+    MappedWriteIoCount: ULONG,
+    PagedPoolPages: ULONG,
+    NonPagedPoolPages: ULONG,
+    PagedPoolAllocs: ULONG,
+    PagedPoolFrees: ULONG,
+    NonPagedPoolAllocs: ULONG,
+    NonPagedPoolFrees: ULONG,
+    FreeSystemPtes: ULONG,
+    ResidentSystemCodePage: ULONG,
+    TotalSystemDriverPages: ULONG,
+    TotalSystemCodePages: ULONG,
+    NonPagedPoolLookasideHits: ULONG,
+    PagedPoolLookasideHits: ULONG,
+    AvailablePagedPoolPages: ULONG,
+    ResidentSystemCachePage: ULONG,
+    ResidentPagedPoolPage: ULONG,
+    ResidentSystemDriverPage: ULONG,
+    CcFastReadNoWait: ULONG,
+    CcFastReadWait: ULONG,
+    CcFastReadResourceMiss: ULONG,
+    CcFastReadNotPossible: ULONG,
+    CcFastMdlReadNoWait: ULONG,
+    CcFastMdlReadWait: ULONG,
+    CcFastMdlReadResourceMiss: ULONG,
+    CcFastMdlReadNotPossible: ULONG,
+    CcMapDataNoWait: ULONG,
+    CcMapDataWait: ULONG,
+    CcMapDataNoWaitMiss: ULONG,
+    CcMapDataWaitMiss: ULONG,
+    CcPinMappedDataCount: ULONG,
+    CcPinReadNoWait: ULONG,
+    CcPinReadWait: ULONG,
+    CcPinReadNoWaitMiss: ULONG,
+    CcPinReadWaitMiss: ULONG,
+    CcCopyReadNoWait: ULONG,
+    CcCopyReadWait: ULONG,
+    CcCopyReadNoWaitMiss: ULONG,
+    CcCopyReadWaitMiss: ULONG,
+    CcMdlReadNoWait: ULONG,
+    CcMdlReadWait: ULONG,
+    CcMdlReadNoWaitMiss: ULONG,
+    CcMdlReadWaitMiss: ULONG,
+    CcReadAheadIos: ULONG,
+    CcLazyWriteIos: ULONG,
+    CcLazyWritePages: ULONG,
+    CcDataFlushes: ULONG,
+    CcDataPages: ULONG,
+    ContextSwitches: ULONG,
+    FirstLevelTbFills: ULONG,
+    SecondLevelTbFills: ULONG,
+    SystemCalls: ULONG,
+    CcTotalDirtyPages: ULONGLONG,
+    CcDirtyPageThreshold: ULONGLONG,
+    ResidentAvailablePages: LONGLONG,
+    SharedCommittedPages: ULONGLONG,
+}}
+pub type PSYSTEM_PERFORMANCE_INFORMATION = *mut SYSTEM_PERFORMANCE_INFORMATION;
+STRUCT!{struct SYSTEM_TIMEOFDAY_INFORMATION {
+    BootTime: LARGE_INTEGER,
+    CurrentTime: LARGE_INTEGER,
+    TimeZoneBias: LARGE_INTEGER,
+    TimeZoneId: ULONG,
+    Reserved: ULONG,
+    BootTimeBias: ULONGLONG,
+    SleepTimeBias: ULONGLONG,
+}}
+pub type PSYSTEM_TIMEOFDAY_INFORMATION = *mut SYSTEM_TIMEOFDAY_INFORMATION;
+STRUCT!{struct SYSTEM_THREAD_INFORMATION {
+    KernelTime: LARGE_INTEGER,
+    UserTime: LARGE_INTEGER,
+    CreateTime: LARGE_INTEGER,
+    WaitTime: ULONG,
+    StartAddress: PVOID,
+    ClientId: CLIENT_ID,
+    Priority: KPRIORITY,
+    BasePriority: LONG,
+    ContextSwitches: ULONG,
+    ThreadState: KTHREAD_STATE,
+    WaitReason: KWAIT_REASON,
+}}
+pub type PSYSTEM_THREAD_INFORMATION = *mut SYSTEM_THREAD_INFORMATION;
+STRUCT!{struct SYSTEM_EXTENDED_THREAD_INFORMATION {
+    ThreadInfo: SYSTEM_THREAD_INFORMATION,
+    StackBase: PVOID,
+    StackLimit: PVOID,
+    Win32StartAddress: PVOID,
+    TebBase: PTEB,
+    Reserved2: ULONG_PTR,
+    Reserved3: ULONG_PTR,
+    Reserved4: ULONG_PTR,
+}}
+pub type PSYSTEM_EXTENDED_THREAD_INFORMATION = *mut SYSTEM_EXTENDED_THREAD_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESS_INFORMATION {
+    NextEntryOffset: ULONG,
+    NumberOfThreads: ULONG,
+    WorkingSetPrivateSize: LARGE_INTEGER,
+    HardFaultCount: ULONG,
+    NumberOfThreadsHighWatermark: ULONG,
+    CycleTime: ULONGLONG,
+    CreateTime: LARGE_INTEGER,
+    UserTime: LARGE_INTEGER,
+    KernelTime: LARGE_INTEGER,
+    ImageName: UNICODE_STRING,
+    BasePriority: KPRIORITY,
+    UniqueProcessId: HANDLE,
+    InheritedFromUniqueProcessId: HANDLE,
+    HandleCount: ULONG,
+    SessionId: ULONG,
+    UniqueProcessKey: ULONG_PTR,
+    PeakVirtualSize: SIZE_T,
+    VirtualSize: SIZE_T,
+    PageFaultCount: ULONG,
+    PeakWorkingSetSize: SIZE_T,
+    WorkingSetSize: SIZE_T,
+    QuotaPeakPagedPoolUsage: SIZE_T,
+    QuotaPagedPoolUsage: SIZE_T,
+    QuotaPeakNonPagedPoolUsage: SIZE_T,
+    QuotaNonPagedPoolUsage: SIZE_T,
+    PagefileUsage: SIZE_T,
+    PeakPagefileUsage: SIZE_T,
+    PrivatePageCount: SIZE_T,
+    ReadOperationCount: LARGE_INTEGER,
+    WriteOperationCount: LARGE_INTEGER,
+    OtherOperationCount: LARGE_INTEGER,
+    ReadTransferCount: LARGE_INTEGER,
+    WriteTransferCount: LARGE_INTEGER,
+    OtherTransferCount: LARGE_INTEGER,
+    Threads: [SYSTEM_THREAD_INFORMATION; 1],
+}}
+pub type PSYSTEM_PROCESS_INFORMATION = *mut SYSTEM_PROCESS_INFORMATION;
+STRUCT!{struct SYSTEM_CALL_COUNT_INFORMATION {
+    Length: ULONG,
+    NumberOfTables: ULONG,
+}}
+pub type PSYSTEM_CALL_COUNT_INFORMATION = *mut SYSTEM_CALL_COUNT_INFORMATION;
+STRUCT!{struct SYSTEM_DEVICE_INFORMATION {
+    NumberOfDisks: ULONG,
+    NumberOfFloppies: ULONG,
+    NumberOfCdRoms: ULONG,
+    NumberOfTapes: ULONG,
+    NumberOfSerialPorts: ULONG,
+    NumberOfParallelPorts: ULONG,
+}}
+pub type PSYSTEM_DEVICE_INFORMATION = *mut SYSTEM_DEVICE_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION {
+    IdleTime: LARGE_INTEGER,
+    KernelTime: LARGE_INTEGER,
+    UserTime: LARGE_INTEGER,
+    DpcTime: LARGE_INTEGER,
+    InterruptTime: LARGE_INTEGER,
+    InterruptCount: ULONG,
+}}
+pub type PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION = *mut SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
+STRUCT!{struct SYSTEM_FLAGS_INFORMATION {
+    Flags: ULONG,
+}}
+pub type PSYSTEM_FLAGS_INFORMATION = *mut SYSTEM_FLAGS_INFORMATION;
+STRUCT!{struct SYSTEM_CALL_TIME_INFORMATION {
+    Length: ULONG,
+    TotalCalls: ULONG,
+    TimeOfCalls: [LARGE_INTEGER; 1],
+}}
+pub type PSYSTEM_CALL_TIME_INFORMATION = *mut SYSTEM_CALL_TIME_INFORMATION;
+STRUCT!{struct RTL_PROCESS_LOCK_INFORMATION {
+    Address: PVOID,
+    Type: USHORT,
+    CreatorBackTraceIndex: USHORT,
+    OwningThread: HANDLE,
+    LockCount: LONG,
+    ContentionCount: ULONG,
+    EntryCount: ULONG,
+    RecursionCount: LONG,
+    NumberOfWaitingShared: ULONG,
+    NumberOfWaitingExclusive: ULONG,
+}}
+pub type PRTL_PROCESS_LOCK_INFORMATION = *mut RTL_PROCESS_LOCK_INFORMATION;
+STRUCT!{struct RTL_PROCESS_LOCKS {
+    NumberOfLocks: ULONG,
+    Locks: [RTL_PROCESS_LOCK_INFORMATION; 1],
+}}
+pub type PRTL_PROCESS_LOCKS = *mut RTL_PROCESS_LOCKS;
+STRUCT!{struct RTL_PROCESS_BACKTRACE_INFORMATION {
+    SymbolicBackTrace: PCHAR,
+    TraceCount: ULONG,
+    Index: USHORT,
+    Depth: USHORT,
+    BackTrace: [PVOID; 32],
+}}
+pub type PRTL_PROCESS_BACKTRACE_INFORMATION = *mut RTL_PROCESS_BACKTRACE_INFORMATION;
+STRUCT!{struct RTL_PROCESS_BACKTRACES {
+    CommittedMemory: ULONG,
+    ReservedMemory: ULONG,
+    NumberOfBackTraceLookups: ULONG,
+    NumberOfBackTraces: ULONG,
+    BackTraces: [RTL_PROCESS_BACKTRACE_INFORMATION; 1],
+}}
+pub type PRTL_PROCESS_BACKTRACES = *mut RTL_PROCESS_BACKTRACES;
+STRUCT!{struct SYSTEM_HANDLE_TABLE_ENTRY_INFO {
+    UniqueProcessId: USHORT,
+    CreatorBackTraceIndex: USHORT,
+    ObjectTypeIndex: UCHAR,
+    HandleAttributes: UCHAR,
+    HandleValue: USHORT,
+    Object: PVOID,
+    GrantedAccess: ULONG,
+}}
+pub type PSYSTEM_HANDLE_TABLE_ENTRY_INFO = *mut SYSTEM_HANDLE_TABLE_ENTRY_INFO;
+STRUCT!{struct SYSTEM_HANDLE_INFORMATION {
+    NumberOfHandles: ULONG,
+    Handles: [SYSTEM_HANDLE_TABLE_ENTRY_INFO; 1],
+}}
+pub type PSYSTEM_HANDLE_INFORMATION = *mut SYSTEM_HANDLE_INFORMATION;
+STRUCT!{struct SYSTEM_OBJECTTYPE_INFORMATION {
+    NextEntryOffset: ULONG,
+    NumberOfObjects: ULONG,
+    NumberOfHandles: ULONG,
+    TypeIndex: ULONG,
+    InvalidAttributes: ULONG,
+    GenericMapping: GENERIC_MAPPING,
+    ValidAccessMask: ULONG,
+    PoolType: ULONG,
+    SecurityRequired: BOOLEAN,
+    WaitableObject: BOOLEAN,
+    TypeName: UNICODE_STRING,
+}}
+pub type PSYSTEM_OBJECTTYPE_INFORMATION = *mut SYSTEM_OBJECTTYPE_INFORMATION;
+STRUCT!{struct SYSTEM_OBJECT_INFORMATION {
+    NextEntryOffset: ULONG,
+    Object: PVOID,
+    CreatorUniqueProcess: HANDLE,
+    CreatorBackTraceIndex: USHORT,
+    Flags: USHORT,
+    PointerCount: LONG,
+    HandleCount: LONG,
+    PagedPoolCharge: ULONG,
+    NonPagedPoolCharge: ULONG,
+    ExclusiveProcessId: HANDLE,
+    SecurityDescriptor: PVOID,
+    NameInfo: UNICODE_STRING,
+}}
+pub type PSYSTEM_OBJECT_INFORMATION = *mut SYSTEM_OBJECT_INFORMATION;
+STRUCT!{struct SYSTEM_PAGEFILE_INFORMATION {
+    NextEntryOffset: ULONG,
+    TotalSize: ULONG,
+    TotalInUse: ULONG,
+    PeakUsage: ULONG,
+    PageFileName: UNICODE_STRING,
+}}
+pub type PSYSTEM_PAGEFILE_INFORMATION = *mut SYSTEM_PAGEFILE_INFORMATION;
+pub const MM_WORKING_SET_MAX_HARD_ENABLE: ULONG = 0x1;
+pub const MM_WORKING_SET_MAX_HARD_DISABLE: ULONG = 0x2;
+pub const MM_WORKING_SET_MIN_HARD_ENABLE: ULONG = 0x4;
+pub const MM_WORKING_SET_MIN_HARD_DISABLE: ULONG = 0x8;
+STRUCT!{struct SYSTEM_FILECACHE_INFORMATION {
+    CurrentSize: SIZE_T,
+    PeakSize: SIZE_T,
+    PageFaultCount: ULONG,
+    MinimumWorkingSet: SIZE_T,
+    MaximumWorkingSet: SIZE_T,
+    CurrentSizeIncludingTransitionInPages: SIZE_T,
+    PeakSizeIncludingTransitionInPages: SIZE_T,
+    TransitionRePurposeCount: ULONG,
+    Flags: ULONG,
+}}
+pub type PSYSTEM_FILECACHE_INFORMATION = *mut SYSTEM_FILECACHE_INFORMATION;
+STRUCT!{struct SYSTEM_BASIC_WORKING_SET_INFORMATION {
+    CurrentSize: SIZE_T,
+    PeakSize: SIZE_T,
+    PageFaultCount: ULONG,
+}}
+pub type PSYSTEM_BASIC_WORKING_SET_INFORMATION = *mut SYSTEM_BASIC_WORKING_SET_INFORMATION;
+UNION!{union SYSTEM_POOLTAG_u {
+    Tag: [UCHAR; 4],
+    TagUlong: ULONG,
+}}
+STRUCT!{struct SYSTEM_POOLTAG {
+    u: SYSTEM_POOLTAG_u,
+    PagedAllocs: ULONG,
+    PagedFrees: ULONG,
+    PagedUsed: SIZE_T,
+    NonPagedAllocs: ULONG,
+    NonPagedFrees: ULONG,
+    NonPagedUsed: SIZE_T,
+}}
+pub type PSYSTEM_POOLTAG = *mut SYSTEM_POOLTAG;
+STRUCT!{struct SYSTEM_POOLTAG_INFORMATION {
+    Count: ULONG,
+    TagInfo: [SYSTEM_POOLTAG; 1],
+}}
+pub type PSYSTEM_POOLTAG_INFORMATION = *mut SYSTEM_POOLTAG_INFORMATION;
+STRUCT!{struct SYSTEM_INTERRUPT_INFORMATION {
+    ContextSwitches: ULONG,
+    DpcCount: ULONG,
+    DpcRate: ULONG,
+    TimeIncrement: ULONG,
+    DpcBypassCount: ULONG,
+    ApcBypassCount: ULONG,
+}}
+pub type PSYSTEM_INTERRUPT_INFORMATION = *mut SYSTEM_INTERRUPT_INFORMATION;
+STRUCT!{struct SYSTEM_DPC_BEHAVIOR_INFORMATION {
+    Spare: ULONG,
+    DpcQueueDepth: ULONG,
+    MinimumDpcRate: ULONG,
+    AdjustDpcThreshold: ULONG,
+    IdealDpcRate: ULONG,
+}}
+pub type PSYSTEM_DPC_BEHAVIOR_INFORMATION = *mut SYSTEM_DPC_BEHAVIOR_INFORMATION;
+STRUCT!{struct SYSTEM_QUERY_TIME_ADJUST_INFORMATION {
+    TimeAdjustment: ULONG,
+    TimeIncrement: ULONG,
+    Enable: BOOLEAN,
+}}
+pub type PSYSTEM_QUERY_TIME_ADJUST_INFORMATION = *mut SYSTEM_QUERY_TIME_ADJUST_INFORMATION;
+STRUCT!{struct SYSTEM_QUERY_TIME_ADJUST_INFORMATION_PRECISE {
+    TimeAdjustment: ULONGLONG,
+    TimeIncrement: ULONGLONG,
+    Enable: BOOLEAN,
+}}
+pub type PSYSTEM_QUERY_TIME_ADJUST_INFORMATION_PRECISE =
+    *mut SYSTEM_QUERY_TIME_ADJUST_INFORMATION_PRECISE;
+STRUCT!{struct SYSTEM_SET_TIME_ADJUST_INFORMATION {
+    TimeAdjustment: ULONG,
+    Enable: BOOLEAN,
+}}
+pub type PSYSTEM_SET_TIME_ADJUST_INFORMATION = *mut SYSTEM_SET_TIME_ADJUST_INFORMATION;
+STRUCT!{struct SYSTEM_SET_TIME_ADJUST_INFORMATION_PRECISE {
+    TimeAdjustment: ULONGLONG,
+    Enable: BOOLEAN,
+}}
+pub type PSYSTEM_SET_TIME_ADJUST_INFORMATION_PRECISE =
+    *mut SYSTEM_SET_TIME_ADJUST_INFORMATION_PRECISE;
+ENUM!{enum EVENT_TRACE_INFORMATION_CLASS {
+    EventTraceKernelVersionInformation = 0,
+    EventTraceGroupMaskInformation = 1,
+    EventTracePerformanceInformation = 2,
+    EventTraceTimeProfileInformation = 3,
+    EventTraceSessionSecurityInformation = 4,
+    EventTraceSpinlockInformation = 5,
+    EventTraceStackTracingInformation = 6,
+    EventTraceExecutiveResourceInformation = 7,
+    EventTraceHeapTracingInformation = 8,
+    EventTraceHeapSummaryTracingInformation = 9,
+    EventTracePoolTagFilterInformation = 10,
+    EventTracePebsTracingInformation = 11,
+    EventTraceProfileConfigInformation = 12,
+    EventTraceProfileSourceListInformation = 13,
+    EventTraceProfileEventListInformation = 14,
+    EventTraceProfileCounterListInformation = 15,
+    EventTraceStackCachingInformation = 16,
+    EventTraceObjectTypeFilterInformation = 17,
+    EventTraceSoftRestartInformation = 18,
+    EventTraceLastBranchConfigurationInformation = 19,
+    EventTraceLastBranchEventListInformation = 20,
+    EventTraceProfileSourceAddInformation = 21,
+    EventTraceProfileSourceRemoveInformation = 22,
+    EventTraceProcessorTraceConfigurationInformation = 23,
+    EventTraceProcessorTraceEventListInformation = 24,
+    EventTraceCoverageSamplerInformation = 25,
+    MaxEventTraceInfoClass = 26,
+}}
+STRUCT!{struct EVENT_TRACE_VERSION_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    EventTraceKernelVersion: ULONG,
+}}
+pub type PEVENT_TRACE_VERSION_INFORMATION = *mut EVENT_TRACE_VERSION_INFORMATION;
+STRUCT!{struct PERFINFO_GROUPMASK {
+    Masks: [ULONG; 8],
+}}
+pub type PPERFINFO_GROUPMASK = *mut PERFINFO_GROUPMASK;
+STRUCT!{struct EVENT_TRACE_GROUPMASK_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    TraceHandle: HANDLE,
+    EventTraceGroupMasks: PERFINFO_GROUPMASK,
+}}
+pub type PEVENT_TRACE_GROUPMASK_INFORMATION = *mut EVENT_TRACE_GROUPMASK_INFORMATION;
+STRUCT!{struct EVENT_TRACE_PERFORMANCE_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    LogfileBytesWritten: LARGE_INTEGER,
+}}
+pub type PEVENT_TRACE_PERFORMANCE_INFORMATION = *mut EVENT_TRACE_PERFORMANCE_INFORMATION;
+STRUCT!{struct EVENT_TRACE_TIME_PROFILE_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    ProfileInterval: ULONG,
+}}
+pub type PEVENT_TRACE_TIME_PROFILE_INFORMATION = *mut EVENT_TRACE_TIME_PROFILE_INFORMATION;
+STRUCT!{struct EVENT_TRACE_SESSION_SECURITY_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    SecurityInformation: ULONG,
+    TraceHandle: HANDLE,
+    SecurityDescriptor: [UCHAR; 1],
+}}
+pub type PEVENT_TRACE_SESSION_SECURITY_INFORMATION = *mut EVENT_TRACE_SESSION_SECURITY_INFORMATION;
+STRUCT!{struct EVENT_TRACE_SPINLOCK_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    SpinLockSpinThreshold: ULONG,
+    SpinLockAcquireSampleRate: ULONG,
+    SpinLockContentionSampleRate: ULONG,
+    SpinLockHoldThreshold: ULONG,
+}}
+pub type PEVENT_TRACE_SPINLOCK_INFORMATION = *mut EVENT_TRACE_SPINLOCK_INFORMATION;
+STRUCT!{struct EVENT_TRACE_SYSTEM_EVENT_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    TraceHandle: HANDLE,
+    HookId: [ULONG; 1],
+}}
+pub type PEVENT_TRACE_SYSTEM_EVENT_INFORMATION = *mut EVENT_TRACE_SYSTEM_EVENT_INFORMATION;
+STRUCT!{struct EVENT_TRACE_EXECUTIVE_RESOURCE_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    ReleaseSamplingRate: ULONG,
+    ContentionSamplingRate: ULONG,
+    NumberOfExcessiveTimeouts: ULONG,
+}}
+pub type PEVENT_TRACE_EXECUTIVE_RESOURCE_INFORMATION =
+    *mut EVENT_TRACE_EXECUTIVE_RESOURCE_INFORMATION;
+STRUCT!{struct EVENT_TRACE_HEAP_TRACING_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    ProcessId: ULONG,
+}}
+pub type PEVENT_TRACE_HEAP_TRACING_INFORMATION = *mut EVENT_TRACE_HEAP_TRACING_INFORMATION;
+STRUCT!{struct EVENT_TRACE_TAG_FILTER_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    TraceHandle: HANDLE,
+    Filter: [ULONG; 1],
+}}
+pub type PEVENT_TRACE_TAG_FILTER_INFORMATION = *mut EVENT_TRACE_TAG_FILTER_INFORMATION;
+STRUCT!{struct EVENT_TRACE_PROFILE_COUNTER_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    TraceHandle: HANDLE,
+    ProfileSource: [ULONG; 1],
+}}
+pub type PEVENT_TRACE_PROFILE_COUNTER_INFORMATION = *mut EVENT_TRACE_PROFILE_COUNTER_INFORMATION;
+STRUCT!{struct EVENT_TRACE_PROFILE_LIST_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    Spare: ULONG,
+    Profile: [*mut PROFILE_SOURCE_INFO; 1],
+}}
+pub type PEVENT_TRACE_PROFILE_LIST_INFORMATION = *mut EVENT_TRACE_PROFILE_LIST_INFORMATION;
+STRUCT!{struct EVENT_TRACE_STACK_CACHING_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    TraceHandle: HANDLE,
+    Enabled: BOOLEAN,
+    Reserved: [UCHAR; 3],
+    CacheSize: ULONG,
+    BucketCount: ULONG,
+}}
+pub type PEVENT_TRACE_STACK_CACHING_INFORMATION = *mut EVENT_TRACE_STACK_CACHING_INFORMATION;
+STRUCT!{struct EVENT_TRACE_SOFT_RESTART_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    TraceHandle: HANDLE,
+    PersistTraceBuffers: BOOLEAN,
+    FileName: [WCHAR; 1],
+}}
+pub type PEVENT_TRACE_SOFT_RESTART_INFORMATION = *mut EVENT_TRACE_SOFT_RESTART_INFORMATION;
+STRUCT!{struct EVENT_TRACE_PROFILE_ADD_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    PerfEvtEventSelect: BOOLEAN,
+    PerfEvtUnitSelect: BOOLEAN,
+    PerfEvtType: ULONG,
+    CpuInfoHierarchy: [ULONG; 3],
+    InitialInterval: ULONG,
+    AllowsHalt: BOOLEAN,
+    Persist: BOOLEAN,
+    ProfileSourceDescription: [WCHAR; 1],
+}}
+pub type PEVENT_TRACE_PROFILE_ADD_INFORMATION = *mut EVENT_TRACE_PROFILE_ADD_INFORMATION;
+STRUCT!{struct EVENT_TRACE_PROFILE_REMOVE_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    ProfileSource: KPROFILE_SOURCE,
+    CpuInfoHierarchy: [ULONG; 3],
+}}
+pub type PEVENT_TRACE_PROFILE_REMOVE_INFORMATION = *mut EVENT_TRACE_PROFILE_REMOVE_INFORMATION;
+STRUCT!{struct EVENT_TRACE_COVERAGE_SAMPLER_INFORMATION {
+    EventTraceInformationClass: EVENT_TRACE_INFORMATION_CLASS,
+    CoverageSamplerInformationClass: BOOLEAN,
+    MajorVersion: UCHAR,
+    MinorVersion: UCHAR,
+    Reserved: UCHAR,
+    SamplerHandle: HANDLE,
+}}
+pub type PEVENT_TRACE_COVERAGE_SAMPLER_INFORMATION = *mut EVENT_TRACE_COVERAGE_SAMPLER_INFORMATION;
+STRUCT!{struct SYSTEM_EXCEPTION_INFORMATION {
+    AlignmentFixupCount: ULONG,
+    ExceptionDispatchCount: ULONG,
+    FloatingEmulationCount: ULONG,
+    ByteWordEmulationCount: ULONG,
+}}
+pub type PSYSTEM_EXCEPTION_INFORMATION = *mut SYSTEM_EXCEPTION_INFORMATION;
+STRUCT!{struct SYSTEM_KERNEL_DEBUGGER_INFORMATION {
+    KernelDebuggerEnabled: BOOLEAN,
+    KernelDebuggerNotPresent: BOOLEAN,
+}}
+pub type PSYSTEM_KERNEL_DEBUGGER_INFORMATION = *mut SYSTEM_KERNEL_DEBUGGER_INFORMATION;
+STRUCT!{struct SYSTEM_CONTEXT_SWITCH_INFORMATION {
+    ContextSwitches: ULONG,
+    FindAny: ULONG,
+    FindLast: ULONG,
+    FindIdeal: ULONG,
+    IdleAny: ULONG,
+    IdleCurrent: ULONG,
+    IdleLast: ULONG,
+    IdleIdeal: ULONG,
+    PreemptAny: ULONG,
+    PreemptCurrent: ULONG,
+    PreemptLast: ULONG,
+    SwitchToIdle: ULONG,
+}}
+pub type PSYSTEM_CONTEXT_SWITCH_INFORMATION = *mut SYSTEM_CONTEXT_SWITCH_INFORMATION;
+STRUCT!{struct SYSTEM_REGISTRY_QUOTA_INFORMATION {
+    RegistryQuotaAllowed: ULONG,
+    RegistryQuotaUsed: ULONG,
+    PagedPoolSize: SIZE_T,
+}}
+pub type PSYSTEM_REGISTRY_QUOTA_INFORMATION = *mut SYSTEM_REGISTRY_QUOTA_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_IDLE_INFORMATION {
+    IdleTime: ULONGLONG,
+    C1Time: ULONGLONG,
+    C2Time: ULONGLONG,
+    C3Time: ULONGLONG,
+    C1Transitions: ULONG,
+    C2Transitions: ULONG,
+    C3Transitions: ULONG,
+    Padding: ULONG,
+}}
+pub type PSYSTEM_PROCESSOR_IDLE_INFORMATION = *mut SYSTEM_PROCESSOR_IDLE_INFORMATION;
+STRUCT!{struct SYSTEM_LEGACY_DRIVER_INFORMATION {
+    VetoType: ULONG,
+    VetoList: UNICODE_STRING,
+}}
+pub type PSYSTEM_LEGACY_DRIVER_INFORMATION = *mut SYSTEM_LEGACY_DRIVER_INFORMATION;
+STRUCT!{struct SYSTEM_LOOKASIDE_INFORMATION {
+    CurrentDepth: USHORT,
+    MaximumDepth: USHORT,
+    TotalAllocates: ULONG,
+    AllocateMisses: ULONG,
+    TotalFrees: ULONG,
+    FreeMisses: ULONG,
+    Type: ULONG,
+    Tag: ULONG,
+    Size: ULONG,
+}}
+pub type PSYSTEM_LOOKASIDE_INFORMATION = *mut SYSTEM_LOOKASIDE_INFORMATION;
+STRUCT!{struct SYSTEM_RANGE_START_INFORMATION {
+    SystemRangeStart: PVOID,
+}}
+pub type PSYSTEM_RANGE_START_INFORMATION = *mut SYSTEM_RANGE_START_INFORMATION;
+STRUCT!{struct SYSTEM_VERIFIER_INFORMATION {
+    NextEntryOffset: ULONG,
+    Level: ULONG,
+    DriverName: UNICODE_STRING,
+    RaiseIrqls: ULONG,
+    AcquireSpinLocks: ULONG,
+    SynchronizeExecutions: ULONG,
+    AllocationsAttempted: ULONG,
+    AllocationsSucceeded: ULONG,
+    AllocationsSucceededSpecialPool: ULONG,
+    AllocationsWithNoTag: ULONG,
+    TrimRequests: ULONG,
+    Trims: ULONG,
+    AllocationsFailed: ULONG,
+    AllocationsFailedDeliberately: ULONG,
+    Loads: ULONG,
+    Unloads: ULONG,
+    UnTrackedPool: ULONG,
+    CurrentPagedPoolAllocations: ULONG,
+    CurrentNonPagedPoolAllocations: ULONG,
+    PeakPagedPoolAllocations: ULONG,
+    PeakNonPagedPoolAllocations: ULONG,
+    PagedPoolUsageInBytes: SIZE_T,
+    NonPagedPoolUsageInBytes: SIZE_T,
+    PeakPagedPoolUsageInBytes: SIZE_T,
+    PeakNonPagedPoolUsageInBytes: SIZE_T,
+}}
+pub type PSYSTEM_VERIFIER_INFORMATION = *mut SYSTEM_VERIFIER_INFORMATION;
+STRUCT!{struct SYSTEM_SESSION_PROCESS_INFORMATION {
+    SessionId: ULONG,
+    SizeOfBuf: ULONG,
+    Buffer: PVOID,
+}}
+pub type PSYSTEM_SESSION_PROCESS_INFORMATION = *mut SYSTEM_SESSION_PROCESS_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_POWER_INFORMATION {
+    CurrentFrequency: UCHAR,
+    ThermalLimitFrequency: UCHAR,
+    ConstantThrottleFrequency: UCHAR,
+    DegradedThrottleFrequency: UCHAR,
+    LastBusyFrequency: UCHAR,
+    LastC3Frequency: UCHAR,
+    LastAdjustedBusyFrequency: UCHAR,
+    ProcessorMinThrottle: UCHAR,
+    ProcessorMaxThrottle: UCHAR,
+    NumberOfFrequencies: ULONG,
+    PromotionCount: ULONG,
+    DemotionCount: ULONG,
+    ErrorCount: ULONG,
+    RetryCount: ULONG,
+    CurrentFrequencyTime: ULONGLONG,
+    CurrentProcessorTime: ULONGLONG,
+    CurrentProcessorIdleTime: ULONGLONG,
+    LastProcessorTime: ULONGLONG,
+    LastProcessorIdleTime: ULONGLONG,
+    Energy: ULONGLONG,
+}}
+pub type PSYSTEM_PROCESSOR_POWER_INFORMATION = *mut SYSTEM_PROCESSOR_POWER_INFORMATION;
+STRUCT!{struct SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX {
+    Object: PVOID,
+    UniqueProcessId: ULONG_PTR,
+    HandleValue: ULONG_PTR,
+    GrantedAccess: ULONG,
+    CreatorBackTraceIndex: USHORT,
+    ObjectTypeIndex: USHORT,
+    HandleAttributes: ULONG,
+    Reserved: ULONG,
+}}
+pub type PSYSTEM_HANDLE_TABLE_ENTRY_INFO_EX = *mut SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX;
+STRUCT!{struct SYSTEM_HANDLE_INFORMATION_EX {
+    NumberOfHandles: ULONG_PTR,
+    Reserved: ULONG_PTR,
+    Handles: [SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX; 1],
+}}
+pub type PSYSTEM_HANDLE_INFORMATION_EX = *mut SYSTEM_HANDLE_INFORMATION_EX;
+UNION!{union SYSTEM_BIGPOOL_ENTRY_u1 {
+    VirtualAddress: PVOID,
+    Bitfields: ULONG_PTR,
+}}
+UNION!{union SYSTEM_BIGPOOL_ENTRY_u2 {
+    Tag: [UCHAR; 4],
+    TagUlong: ULONG,
+}}
+BITFIELD!{unsafe SYSTEM_BIGPOOL_ENTRY_u1 Bitfields: ULONG_PTR [
+    NonPaged set_NonPaged[0..1],
+]}
+STRUCT!{struct SYSTEM_BIGPOOL_ENTRY {
+    u1: SYSTEM_BIGPOOL_ENTRY_u1,
+    SizeInBytes: SIZE_T,
+    u2: SYSTEM_BIGPOOL_ENTRY_u2,
+}}
+pub type PSYSTEM_BIGPOOL_ENTRY = *mut SYSTEM_BIGPOOL_ENTRY;
+STRUCT!{struct SYSTEM_BIGPOOL_INFORMATION {
+    Count: ULONG,
+    AllocatedInfo: [SYSTEM_BIGPOOL_ENTRY; 1],
+}}
+pub type PSYSTEM_BIGPOOL_INFORMATION = *mut SYSTEM_BIGPOOL_INFORMATION;
+UNION!{union SYSTEM_POOL_ENTRY_u {
+    Tag: [UCHAR; 4],
+    TagUlong: ULONG,
+    ProcessChargedQuota: PVOID,
+}}
+STRUCT!{struct SYSTEM_POOL_ENTRY {
+    Allocated: BOOLEAN,
+    Spare0: BOOLEAN,
+    AllocatorBackTraceIndex: USHORT,
+    Size: ULONG,
+    u: SYSTEM_POOL_ENTRY_u,
+}}
+pub type PSYSTEM_POOL_ENTRY = *mut SYSTEM_POOL_ENTRY;
+STRUCT!{struct SYSTEM_POOL_INFORMATION {
+    TotalSize: SIZE_T,
+    FirstEntry: PVOID,
+    EntryOverhead: USHORT,
+    PoolTagPresent: BOOLEAN,
+    Spare0: BOOLEAN,
+    NumberOfEntries: ULONG,
+    Entries: [SYSTEM_POOL_ENTRY; 1],
+}}
+pub type PSYSTEM_POOL_INFORMATION = *mut SYSTEM_POOL_INFORMATION;
+STRUCT!{struct SYSTEM_SESSION_POOLTAG_INFORMATION {
+    NextEntryOffset: SIZE_T,
+    SessionId: ULONG,
+    Count: ULONG,
+    TagInfo: [SYSTEM_POOLTAG; 1],
+}}
+pub type PSYSTEM_SESSION_POOLTAG_INFORMATION = *mut SYSTEM_SESSION_POOLTAG_INFORMATION;
+STRUCT!{struct SYSTEM_SESSION_MAPPED_VIEW_INFORMATION {
+    NextEntryOffset: SIZE_T,
+    SessionId: ULONG,
+    ViewFailures: ULONG,
+    NumberOfBytesAvailable: SIZE_T,
+    NumberOfBytesAvailableContiguous: SIZE_T,
+}}
+pub type PSYSTEM_SESSION_MAPPED_VIEW_INFORMATION = *mut SYSTEM_SESSION_MAPPED_VIEW_INFORMATION;
+ENUM!{enum SYSTEM_FIRMWARE_TABLE_ACTION {
+    SystemFirmwareTableEnumerate = 0,
+    SystemFirmwareTableGet = 1,
+    SystemFirmwareTableMax = 2,
+}}
+STRUCT!{struct SYSTEM_FIRMWARE_TABLE_INFORMATION {
+    ProviderSignature: ULONG,
+    Action: SYSTEM_FIRMWARE_TABLE_ACTION,
+    TableID: ULONG,
+    TableBufferLength: ULONG,
+    TableBuffer: [UCHAR; 1],
+}}
+pub type PSYSTEM_FIRMWARE_TABLE_INFORMATION = *mut SYSTEM_FIRMWARE_TABLE_INFORMATION;
+STRUCT!{struct SYSTEM_MEMORY_LIST_INFORMATION {
+    ZeroPageCount: ULONG_PTR,
+    FreePageCount: ULONG_PTR,
+    ModifiedPageCount: ULONG_PTR,
+    ModifiedNoWritePageCount: ULONG_PTR,
+    BadPageCount: ULONG_PTR,
+    PageCountByPriority: [ULONG_PTR; 8],
+    RepurposedPagesByPriority: [ULONG_PTR; 8],
+    ModifiedPageCountPageFile: ULONG_PTR,
+}}
+pub type PSYSTEM_MEMORY_LIST_INFORMATION = *mut SYSTEM_MEMORY_LIST_INFORMATION;
+ENUM!{enum SYSTEM_MEMORY_LIST_COMMAND {
+    MemoryCaptureAccessedBits = 0,
+    MemoryCaptureAndResetAccessedBits = 1,
+    MemoryEmptyWorkingSets = 2,
+    MemoryFlushModifiedList = 3,
+    MemoryPurgeStandbyList = 4,
+    MemoryPurgeLowPriorityStandbyList = 5,
+    MemoryCommandMax = 6,
+}}
+STRUCT!{struct SYSTEM_THREAD_CID_PRIORITY_INFORMATION {
+    ClientId: CLIENT_ID,
+    Priority: KPRIORITY,
+}}
+pub type PSYSTEM_THREAD_CID_PRIORITY_INFORMATION = *mut SYSTEM_THREAD_CID_PRIORITY_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_IDLE_CYCLE_TIME_INFORMATION {
+    CycleTime: ULONGLONG,
+}}
+pub type PSYSTEM_PROCESSOR_IDLE_CYCLE_TIME_INFORMATION =
+    *mut SYSTEM_PROCESSOR_IDLE_CYCLE_TIME_INFORMATION;
+STRUCT!{struct SYSTEM_REF_TRACE_INFORMATION {
+    TraceEnable: BOOLEAN,
+    TracePermanent: BOOLEAN,
+    TraceProcessName: UNICODE_STRING,
+    TracePoolTags: UNICODE_STRING,
+}}
+pub type PSYSTEM_REF_TRACE_INFORMATION = *mut SYSTEM_REF_TRACE_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESS_ID_INFORMATION {
+    ProcessId: HANDLE,
+    ImageName: UNICODE_STRING,
+}}
+pub type PSYSTEM_PROCESS_ID_INFORMATION = *mut SYSTEM_PROCESS_ID_INFORMATION;
+STRUCT!{struct SYSTEM_BOOT_ENVIRONMENT_INFORMATION {
+    BootIdentifier: GUID,
+    FirmwareType: FIRMWARE_TYPE,
+    BootFlags: ULONGLONG,
+}}
+BITFIELD!{SYSTEM_BOOT_ENVIRONMENT_INFORMATION BootFlags: ULONGLONG [
+    DbgMenuOsSelection set_DbgMenuOsSelection[0..1],
+    DbgHiberBoot set_DbgHiberBoot[1..2],
+    DbgSoftBoot set_DbgSoftBoot[2..3],
+    DbgMeasuredLaunch set_DbgMeasuredLaunch[3..4],
+]}
+pub type PSYSTEM_BOOT_ENVIRONMENT_INFORMATION = *mut SYSTEM_BOOT_ENVIRONMENT_INFORMATION;
+STRUCT!{struct SYSTEM_IMAGE_FILE_EXECUTION_OPTIONS_INFORMATION {
+    FlagsToEnable: ULONG,
+    FlagsToDisable: ULONG,
+}}
+pub type PSYSTEM_IMAGE_FILE_EXECUTION_OPTIONS_INFORMATION =
+    *mut SYSTEM_IMAGE_FILE_EXECUTION_OPTIONS_INFORMATION;
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+STRUCT!{struct SYSTEM_VERIFIER_INFORMATION_EX {
+    VerifyMode: ULONG,
+    OptionChanges: ULONG,
+    PreviousBucketName: UNICODE_STRING,
+    IrpCancelTimeoutMsec: ULONG,
+    VerifierExtensionEnabled: ULONG,
+    Reserved: [ULONG; 1],
+}}
+#[cfg(target_arch = "x86")]
+STRUCT!{struct SYSTEM_VERIFIER_INFORMATION_EX {
+    VerifyMode: ULONG,
+    OptionChanges: ULONG,
+    PreviousBucketName: UNICODE_STRING,
+    IrpCancelTimeoutMsec: ULONG,
+    VerifierExtensionEnabled: ULONG,
+    Reserved: [ULONG; 3],
+}}
+pub type PSYSTEM_VERIFIER_INFORMATION_EX = *mut SYSTEM_VERIFIER_INFORMATION_EX;
+STRUCT!{struct SYSTEM_SYSTEM_PARTITION_INFORMATION {
+    SystemPartition: UNICODE_STRING,
+}}
+pub type PSYSTEM_SYSTEM_PARTITION_INFORMATION = *mut SYSTEM_SYSTEM_PARTITION_INFORMATION;
+STRUCT!{struct SYSTEM_SYSTEM_DISK_INFORMATION {
+    SystemDisk: UNICODE_STRING,
+}}
+pub type PSYSTEM_SYSTEM_DISK_INFORMATION = *mut SYSTEM_SYSTEM_DISK_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT {
+    Hits: ULONGLONG,
+    PercentFrequency: UCHAR,
+}}
+pub type PSYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT = *mut SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT;
+STRUCT!{struct SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8 {
+    Hits: ULONG,
+    PercentFrequency: UCHAR,
+}}
+pub type PSYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8 =
+    *mut SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8;
+STRUCT!{struct SYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION {
+    ProcessorNumber: ULONG,
+    StateCount: ULONG,
+    States: [SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT; 1],
+}}
+pub type PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION =
+    *mut SYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION;
+STRUCT!{struct SYSTEM_PROCESSOR_PERFORMANCE_DISTRIBUTION {
+    ProcessorCount: ULONG,
+    Offsets: [ULONG; 1],
+}}
+pub type PSYSTEM_PROCESSOR_PERFORMANCE_DISTRIBUTION =
+    *mut SYSTEM_PROCESSOR_PERFORMANCE_DISTRIBUTION;
+STRUCT!{struct SYSTEM_CODEINTEGRITY_INFORMATION {
+    Length: ULONG,
+    CodeIntegrityOptions: ULONG,
+}}
+pub type PSYSTEM_CODEINTEGRITY_INFORMATION = *mut SYSTEM_CODEINTEGRITY_INFORMATION;
+ENUM!{enum SYSTEM_VA_TYPE {
+    SystemVaTypeAll = 0,
+    SystemVaTypeNonPagedPool = 1,
+    SystemVaTypePagedPool = 2,
+    SystemVaTypeSystemCache = 3,
+    SystemVaTypeSystemPtes = 4,
+    SystemVaTypeSessionSpace = 5,
+    SystemVaTypeMax = 6,
+}}
+pub type PSYSTEM_VA_TYPE = *mut SYSTEM_VA_TYPE;
+STRUCT!{struct SYSTEM_VA_LIST_INFORMATION {
+    VirtualSize: SIZE_T,
+    VirtualPeak: SIZE_T,
+    VirtualLimit: SIZE_T,
+    AllocationFailures: SIZE_T,
+}}
+pub type PSYSTEM_VA_LIST_INFORMATION = *mut SYSTEM_VA_LIST_INFORMATION;
+STRUCT!{struct SYSTEM_REGISTRY_APPEND_STRING_PARAMETERS {
+    KeyHandle: HANDLE,
+    ValueNamePointer: PUNICODE_STRING,
+    RequiredLengthPointer: PULONG,
+    Buffer: PUCHAR,
+    BufferLength: ULONG,
+    Type: ULONG,
+    AppendBuffer: PUCHAR,
+    AppendBufferLength: ULONG,
+    CreateIfDoesntExist: BOOLEAN,
+    TruncateExistingValue: BOOLEAN,
+}}
+pub type PSYSTEM_REGISTRY_APPEND_STRING_PARAMETERS = *mut SYSTEM_REGISTRY_APPEND_STRING_PARAMETERS;
+STRUCT!{struct SYSTEM_VHD_BOOT_INFORMATION {
+    OsDiskIsVhd: BOOLEAN,
+    OsVhdFilePathOffset: ULONG,
+    OsVhdParentVolume: [WCHAR; ANYSIZE_ARRAY],
+}}
+pub type PSYSTEM_VHD_BOOT_INFORMATION = *mut SYSTEM_VHD_BOOT_INFORMATION;
+STRUCT!{struct SYSTEM_LOW_PRIORITY_IO_INFORMATION {
+    LowPriReadOperations: ULONG,
+    LowPriWriteOperations: ULONG,
+    KernelBumpedToNormalOperations: ULONG,
+    LowPriPagingReadOperations: ULONG,
+    KernelPagingReadsBumpedToNormal: ULONG,
+    LowPriPagingWriteOperations: ULONG,
+    KernelPagingWritesBumpedToNormal: ULONG,
+    BoostedIrpCount: ULONG,
+    BoostedPagingIrpCount: ULONG,
+    BlanketBoostCount: ULONG,
+}}
+pub type PSYSTEM_LOW_PRIORITY_IO_INFORMATION = *mut SYSTEM_LOW_PRIORITY_IO_INFORMATION;
+ENUM!{enum TPM_BOOT_ENTROPY_RESULT_CODE {
+    TpmBootEntropyStructureUninitialized = 0,
+    TpmBootEntropyDisabledByPolicy = 1,
+    TpmBootEntropyNoTpmFound = 2,
+    TpmBootEntropyTpmError = 3,
+    TpmBootEntropySuccess = 4,
+}}
+STRUCT!{struct TPM_BOOT_ENTROPY_NT_RESULT {
+    Policy: ULONGLONG,
+    ResultCode: TPM_BOOT_ENTROPY_RESULT_CODE,
+    ResultStatus: NTSTATUS,
+    Time: ULONGLONG,
+    EntropyLength: ULONG,
+    EntropyData: [UCHAR; 40],
+}}
+pub type PTPM_BOOT_ENTROPY_NT_RESULT = *mut TPM_BOOT_ENTROPY_NT_RESULT;
+STRUCT!{struct SYSTEM_VERIFIER_COUNTERS_INFORMATION {
+    Legacy: SYSTEM_VERIFIER_INFORMATION,
+    RaiseIrqls: ULONG,
+    AcquireSpinLocks: ULONG,
+    SynchronizeExecutions: ULONG,
+    AllocationsWithNoTag: ULONG,
+    AllocationsFailed: ULONG,
+    AllocationsFailedDeliberately: ULONG,
+    LockedBytes: SIZE_T,
+    PeakLockedBytes: SIZE_T,
+    MappedLockedBytes: SIZE_T,
+    PeakMappedLockedBytes: SIZE_T,
+    MappedIoSpaceBytes: SIZE_T,
+    PeakMappedIoSpaceBytes: SIZE_T,
+    PagesForMdlBytes: SIZE_T,
+    PeakPagesForMdlBytes: SIZE_T,
+    ContiguousMemoryBytes: SIZE_T,
+    PeakContiguousMemoryBytes: SIZE_T,
+    ExecutePoolTypes: ULONG,
+    ExecutePageProtections: ULONG,
+    ExecutePageMappings: ULONG,
+    ExecuteWriteSections: ULONG,
+    SectionAlignmentFailures: ULONG,
+    UnsupportedRelocs: ULONG,
+    IATInExecutableSection: ULONG,
+}}
+pub type PSYSTEM_VERIFIER_COUNTERS_INFORMATION = *mut SYSTEM_VERIFIER_COUNTERS_INFORMATION;
+STRUCT!{struct SYSTEM_ACPI_AUDIT_INFORMATION {
+    RsdpCount: ULONG,
+    Bitfields: ULONG,
+}}
+BITFIELD!{SYSTEM_ACPI_AUDIT_INFORMATION Bitfields: ULONG [
+    SameRsdt set_SameRsdt[0..1],
+    SlicPresent set_SlicPresent[1..2],
+    SlicDifferent set_SlicDifferent[2..3],
+]}
+pub type PSYSTEM_ACPI_AUDIT_INFORMATION = *mut SYSTEM_ACPI_AUDIT_INFORMATION;
+STRUCT!{struct SYSTEM_BASIC_PERFORMANCE_INFORMATION {
+    AvailablePages: SIZE_T,
+    CommittedPages: SIZE_T,
+    CommitLimit: SIZE_T,
+    PeakCommitment: SIZE_T,
+}}
+pub type PSYSTEM_BASIC_PERFORMANCE_INFORMATION = *mut SYSTEM_BASIC_PERFORMANCE_INFORMATION;
+STRUCT!{struct QUERY_PERFORMANCE_COUNTER_FLAGS {
+    ul: ULONG,
+}}
+BITFIELD!{QUERY_PERFORMANCE_COUNTER_FLAGS ul: ULONG [
+    KernelTransition set_KernelTransition[0..1],
+    Reserved set_Reserved[1..32],
+]}
+STRUCT!{struct SYSTEM_QUERY_PERFORMANCE_COUNTER_INFORMATION {
+    Version: ULONG,
+    Flags: QUERY_PERFORMANCE_COUNTER_FLAGS,
+    ValidFlags: QUERY_PERFORMANCE_COUNTER_FLAGS,
+}}
+pub type PSYSTEM_QUERY_PERFORMANCE_COUNTER_INFORMATION =
+    *mut SYSTEM_QUERY_PERFORMANCE_COUNTER_INFORMATION;
+ENUM!{enum SYSTEM_PIXEL_FORMAT {
+    SystemPixelFormatUnknown = 0,
+    SystemPixelFormatR8G8B8 = 1,
+    SystemPixelFormatR8G8B8X8 = 2,
+    SystemPixelFormatB8G8R8 = 3,
+    SystemPixelFormatB8G8R8X8 = 4,
+}}
+STRUCT!{struct SYSTEM_BOOT_GRAPHICS_INFORMATION {
+    FrameBuffer: LARGE_INTEGER,
+    Width: ULONG,
+    Height: ULONG,
+    PixelStride: ULONG,
+    Flags: ULONG,
+    Format: SYSTEM_PIXEL_FORMAT,
+    DisplayRotation: ULONG,
+}}
+pub type PSYSTEM_BOOT_GRAPHICS_INFORMATION = *mut SYSTEM_BOOT_GRAPHICS_INFORMATION;
+STRUCT!{struct MEMORY_SCRUB_INFORMATION {
+    Handle: HANDLE,
+    PagesScrubbed: ULONG,
+}}
+pub type PMEMORY_SCRUB_INFORMATION = *mut MEMORY_SCRUB_INFORMATION;
+STRUCT!{struct PEBS_DS_SAVE_AREA {
+    BtsBufferBase: ULONGLONG,
+    BtsIndex: ULONGLONG,
+    BtsAbsoluteMaximum: ULONGLONG,
+    BtsInterruptThreshold: ULONGLONG,
+    PebsBufferBase: ULONGLONG,
+    PebsIndex: ULONGLONG,
+    PebsAbsoluteMaximum: ULONGLONG,
+    PebsInterruptThreshold: ULONGLONG,
+    PebsCounterReset0: ULONGLONG,
+    PebsCounterReset1: ULONGLONG,
+    PebsCounterReset2: ULONGLONG,
+    PebsCounterReset3: ULONGLONG,
+}}
+pub type PPEBS_DS_SAVE_AREA = *mut PEBS_DS_SAVE_AREA;
+STRUCT!{struct PROCESSOR_PROFILE_CONTROL_AREA {
+    PebsDsSaveArea: PEBS_DS_SAVE_AREA,
+}}
+pub type PPROCESSOR_PROFILE_CONTROL_AREA = *mut PROCESSOR_PROFILE_CONTROL_AREA;
+STRUCT!{struct SYSTEM_PROCESSOR_PROFILE_CONTROL_AREA {
+    ProcessorProfileControlArea: PROCESSOR_PROFILE_CONTROL_AREA,
+    Allocate: BOOLEAN,
+}}
+pub type PSYSTEM_PROCESSOR_PROFILE_CONTROL_AREA = *mut SYSTEM_PROCESSOR_PROFILE_CONTROL_AREA;
+STRUCT!{struct MEMORY_COMBINE_INFORMATION {
+    Handle: HANDLE,
+    PagesCombined: ULONG_PTR,
+}}
+pub type PMEMORY_COMBINE_INFORMATION = *mut MEMORY_COMBINE_INFORMATION;
+pub const MEMORY_COMBINE_FLAGS_COMMON_PAGES_ONLY: ULONG = 0x4;
+STRUCT!{struct MEMORY_COMBINE_INFORMATION_EX {
+    Handle: HANDLE,
+    PagesCombined: ULONG_PTR,
+    Flags: ULONG,
+}}
+pub type PMEMORY_COMBINE_INFORMATION_EX = *mut MEMORY_COMBINE_INFORMATION_EX;
+STRUCT!{struct MEMORY_COMBINE_INFORMATION_EX2 {
+    Handle: HANDLE,
+    PagesCombined: ULONG_PTR,
+    Flags: ULONG,
+    ProcessHandle: HANDLE,
+}}
+pub type PMEMORY_COMBINE_INFORMATION_EX2 = *mut MEMORY_COMBINE_INFORMATION_EX2;
+STRUCT!{struct SYSTEM_CONSOLE_INFORMATION {
+    Bitfields: ULONG,
+}}
+BITFIELD!{SYSTEM_CONSOLE_INFORMATION Bitfields: ULONG [
+    DriverLoaded set_DriverLoaded[0..1],
+    Spare set_Spare[1..32],
+]}
+pub type PSYSTEM_CONSOLE_INFORMATION = *mut SYSTEM_CONSOLE_INFORMATION;
+STRUCT!{struct SYSTEM_PLATFORM_BINARY_INFORMATION {
+    PhysicalAddress: ULONG64,
+    HandoffBuffer: PVOID,
+    CommandLineBuffer: PVOID,
+    HandoffBufferSize: ULONG,
+    CommandLineBufferSize: ULONG,
+}}
+pub type PSYSTEM_PLATFORM_BINARY_INFORMATION = *mut SYSTEM_PLATFORM_BINARY_INFORMATION;
+STRUCT!{struct SYSTEM_HYPERVISOR_PROCESSOR_COUNT_INFORMATION {
+    NumberOfLogicalProcessors: ULONG,
+    NumberOfCores: ULONG,
+}}
+pub type PSYSTEM_HYPERVISOR_PROCESSOR_COUNT_INFORMATION =
+    *mut SYSTEM_HYPERVISOR_PROCESSOR_COUNT_INFORMATION;
+STRUCT!{struct SYSTEM_DEVICE_DATA_INFORMATION {
+    DeviceId: UNICODE_STRING,
+    DataName: UNICODE_STRING,
+    DataType: ULONG,
+    DataBufferLength: ULONG,
+    DataBuffer: PVOID,
+}}
+pub type PSYSTEM_DEVICE_DATA_INFORMATION = *mut SYSTEM_DEVICE_DATA_INFORMATION;
+STRUCT!{struct PHYSICAL_CHANNEL_RUN {
+    NodeNumber: ULONG,
+    ChannelNumber: ULONG,
+    BasePage: ULONGLONG,
+    PageCount: ULONGLONG,
+    Flags: ULONG,
+}}
+pub type PPHYSICAL_CHANNEL_RUN = *mut PHYSICAL_CHANNEL_RUN;
+STRUCT!{struct SYSTEM_MEMORY_TOPOLOGY_INFORMATION {
+    NumberOfRuns: ULONGLONG,
+    NumberOfNodes: ULONG,
+    NumberOfChannels: ULONG,
+    Run: [PHYSICAL_CHANNEL_RUN; 1],
+}}
+pub type PSYSTEM_MEMORY_TOPOLOGY_INFORMATION = *mut SYSTEM_MEMORY_TOPOLOGY_INFORMATION;
+STRUCT!{struct SYSTEM_MEMORY_CHANNEL_INFORMATION {
+    ChannelNumber: ULONG,
+    ChannelHeatIndex: ULONG,
+    TotalPageCount: ULONGLONG,
+    ZeroPageCount: ULONGLONG,
+    FreePageCount: ULONGLONG,
+    StandbyPageCount: ULONGLONG,
+}}
+pub type PSYSTEM_MEMORY_CHANNEL_INFORMATION = *mut SYSTEM_MEMORY_CHANNEL_INFORMATION;
+STRUCT!{struct SYSTEM_BOOT_LOGO_INFORMATION {
+    Flags: ULONG,
+    BitmapOffset: ULONG,
+}}
+pub type PSYSTEM_BOOT_LOGO_INFORMATION = *mut SYSTEM_BOOT_LOGO_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION_EX {
+    IdleTime: LARGE_INTEGER,
+    KernelTime: LARGE_INTEGER,
+    UserTime: LARGE_INTEGER,
+    DpcTime: LARGE_INTEGER,
+    InterruptTime: LARGE_INTEGER,
+    InterruptCount: ULONG,
+    Spare0: ULONG,
+    AvailableTime: LARGE_INTEGER,
+    Spare1: LARGE_INTEGER,
+    Spare2: LARGE_INTEGER,
+}}
+pub type PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION_EX =
+    *mut SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION_EX;
+STRUCT!{struct SYSTEM_SECUREBOOT_POLICY_INFORMATION {
+    PolicyPublisher: GUID,
+    PolicyVersion: ULONG,
+    PolicyOptions: ULONG,
+}}
+pub type PSYSTEM_SECUREBOOT_POLICY_INFORMATION = *mut SYSTEM_SECUREBOOT_POLICY_INFORMATION;
+STRUCT!{struct SYSTEM_PAGEFILE_INFORMATION_EX {
+    Info: SYSTEM_PAGEFILE_INFORMATION,
+    MinimumSize: ULONG,
+    MaximumSize: ULONG,
+}}
+pub type PSYSTEM_PAGEFILE_INFORMATION_EX = *mut SYSTEM_PAGEFILE_INFORMATION_EX;
+STRUCT!{struct SYSTEM_SECUREBOOT_INFORMATION {
+    SecureBootEnabled: BOOLEAN,
+    SecureBootCapable: BOOLEAN,
+}}
+pub type PSYSTEM_SECUREBOOT_INFORMATION = *mut SYSTEM_SECUREBOOT_INFORMATION;
+STRUCT!{struct PROCESS_DISK_COUNTERS {
+    BytesRead: ULONGLONG,
+    BytesWritten: ULONGLONG,
+    ReadOperationCount: ULONGLONG,
+    WriteOperationCount: ULONGLONG,
+    FlushOperationCount: ULONGLONG,
+}}
+pub type PPROCESS_DISK_COUNTERS = *mut PROCESS_DISK_COUNTERS;
+UNION!{union ENERGY_STATE_DURATION_u {
+    Value: ULONGLONG,
+    LastChangeTime: ULONG,
+}}
+UNION!{union ENERGY_STATE_DURATION {
+    u: ENERGY_STATE_DURATION_u,
+    BitFields: ULONG,
+}}
+pub type PENERGY_STATE_DURATION = *mut ENERGY_STATE_DURATION;
+BITFIELD!{unsafe ENERGY_STATE_DURATION BitFields: ULONG [
+    Duration set_Duration[0..31],
+    IsInState set_IsInState[31..32],
+]}
+STRUCT!{struct PROCESS_ENERGY_VALUES {
+    Cycles: [[ULONGLONG; 4]; 2],
+    DiskEnergy: ULONGLONG,
+    NetworkTailEnergy: ULONGLONG,
+    MBBTailEnergy: ULONGLONG,
+    NetworkTxRxBytes: ULONGLONG,
+    MBBTxRxBytes: ULONGLONG,
+    ForegroundDuration: ENERGY_STATE_DURATION,
+    DesktopVisibleDuration: ENERGY_STATE_DURATION,
+    PSMForegroundDuration: ENERGY_STATE_DURATION,
+    CompositionRendered: ULONG,
+    CompositionDirtyGenerated: ULONG,
+    CompositionDirtyPropagated: ULONG,
+    Reserved1: ULONG,
+    AttributedCycles: [[ULONGLONG; 2]; 4],
+    WorkOnBehalfCycles: [[ULONGLONG; 2]; 4],
+}}
+pub type PPROCESS_ENERGY_VALUES = *mut PROCESS_ENERGY_VALUES;
+STRUCT!{struct TIMELINE_BITMAP {
+    Value: ULONGLONG,
+    EndTime: ULONG,
+    Bitmap: ULONG,
+}}
+pub type PTIMELINE_BITMAP = *mut TIMELINE_BITMAP;
+STRUCT!{struct PROCESS_ENERGY_VALUES_EXTENSION_Timelines {
+    CpuTimeline: TIMELINE_BITMAP,
+    DiskTimeline: TIMELINE_BITMAP,
+    NetworkTimeline: TIMELINE_BITMAP,
+    MBBTimeline: TIMELINE_BITMAP,
+    ForegroundTimeline: TIMELINE_BITMAP,
+    DesktopVisibleTimeline: TIMELINE_BITMAP,
+    CompositionRenderedTimeline: TIMELINE_BITMAP,
+    CompositionDirtyGeneratedTimeline: TIMELINE_BITMAP,
+    CompositionDirtyPropagatedTimeline: TIMELINE_BITMAP,
+    InputTimeline: TIMELINE_BITMAP,
+    AudioInTimeline: TIMELINE_BITMAP,
+    AudioOutTimeline: TIMELINE_BITMAP,
+    DisplayRequiredTimeline: TIMELINE_BITMAP,
+    KeyboardInputTimeline: TIMELINE_BITMAP,
+}}
+STRUCT!{struct PROCESS_ENERGY_VALUES_EXTENSION_Durations {
+    InputDuration: ENERGY_STATE_DURATION,
+    AudioInDuration: ENERGY_STATE_DURATION,
+    AudioOutDuration: ENERGY_STATE_DURATION,
+    DisplayRequiredDuration: ENERGY_STATE_DURATION,
+    PSMBackgroundDuration: ENERGY_STATE_DURATION,
+}}
+STRUCT!{struct PROCESS_ENERGY_VALUES_EXTENSION {
+    Timelines: PROCESS_ENERGY_VALUES_EXTENSION_Timelines,
+    Durations: PROCESS_ENERGY_VALUES_EXTENSION_Durations,
+    KeyboardInput: ULONG,
+    MouseInput: ULONG,
+}}
+pub type PPROCESS_ENERGY_VALUES_EXTENSION = *mut PROCESS_ENERGY_VALUES_EXTENSION;
+STRUCT!{struct PROCESS_EXTENDED_ENERGY_VALUES {
+    Base: PROCESS_ENERGY_VALUES,
+    Extension: PROCESS_ENERGY_VALUES_EXTENSION,
+}}
+pub type PPROCESS_EXTENDED_ENERGY_VALUES = *mut PROCESS_EXTENDED_ENERGY_VALUES;
+ENUM!{enum SYSTEM_PROCESS_CLASSIFICATION {
+    SystemProcessClassificationNormal = 0,
+    SystemProcessClassificationSystem = 1,
+    SystemProcessClassificationSecureSystem = 2,
+    SystemProcessClassificationMemCompression = 3,
+    SystemProcessClassificationRegistry = 4,
+    SystemProcessClassificationMaximum = 5,
+}}
+STRUCT!{struct SYSTEM_PROCESS_INFORMATION_EXTENSION {
+    DiskCounters: PROCESS_DISK_COUNTERS,
+    ContextSwitches: ULONGLONG,
+    Flags: ULONG,
+    UserSidOffset: ULONG,
+    PackageFullNameOffset: ULONG,
+    EnergyValues: PROCESS_ENERGY_VALUES,
+    AppIdOffset: ULONG,
+    SharedCommitCharge: SIZE_T,
+    JobObjectId: ULONG,
+    SpareUlong: ULONG,
+    ProcessSequenceNumber: ULONGLONG,
+}}
+BITFIELD!{SYSTEM_PROCESS_INFORMATION_EXTENSION Flags: ULONG [
+    HasStrongId set_HasStrongId[0..1],
+    Classification set_Classification[1..5],
+    BackgroundActivityModerated set_BackgroundActivityModerated[5..6],
+    Spare set_Spare[6..32],
+]}
+pub type PSYSTEM_PROCESS_INFORMATION_EXTENSION = *mut SYSTEM_PROCESS_INFORMATION_EXTENSION;
+STRUCT!{struct SYSTEM_PORTABLE_WORKSPACE_EFI_LAUNCHER_INFORMATION {
+    EfiLauncherEnabled: BOOLEAN,
+}}
+pub type PSYSTEM_PORTABLE_WORKSPACE_EFI_LAUNCHER_INFORMATION =
+    *mut SYSTEM_PORTABLE_WORKSPACE_EFI_LAUNCHER_INFORMATION;
+STRUCT!{struct SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX {
+    DebuggerAllowed: BOOLEAN,
+    DebuggerEnabled: BOOLEAN,
+    DebuggerPresent: BOOLEAN,
+}}
+pub type PSYSTEM_KERNEL_DEBUGGER_INFORMATION_EX = *mut SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX;
+STRUCT!{struct SYSTEM_ELAM_CERTIFICATE_INFORMATION {
+    ElamDriverFile: HANDLE,
+}}
+pub type PSYSTEM_ELAM_CERTIFICATE_INFORMATION = *mut SYSTEM_ELAM_CERTIFICATE_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_FEATURES_INFORMATION {
+    ProcessorFeatureBits: ULONGLONG,
+    Reserved: [ULONGLONG; 3],
+}}
+pub type PSYSTEM_PROCESSOR_FEATURES_INFORMATION = *mut SYSTEM_PROCESSOR_FEATURES_INFORMATION;
+STRUCT!{struct SYSTEM_MANUFACTURING_INFORMATION {
+    Options: ULONG,
+    ProfileName: UNICODE_STRING,
+}}
+pub type PSYSTEM_MANUFACTURING_INFORMATION = *mut SYSTEM_MANUFACTURING_INFORMATION;
+STRUCT!{struct SYSTEM_ENERGY_ESTIMATION_CONFIG_INFORMATION {
+    Enabled: BOOLEAN,
+}}
+pub type PSYSTEM_ENERGY_ESTIMATION_CONFIG_INFORMATION =
+    *mut SYSTEM_ENERGY_ESTIMATION_CONFIG_INFORMATION;
+STRUCT!{struct HV_DETAILS {
+    Data: [ULONG; 4],
+}}
+pub type PHV_DETAILS = *mut HV_DETAILS;
+STRUCT!{struct SYSTEM_HYPERVISOR_DETAIL_INFORMATION {
+    HvVendorAndMaxFunction: HV_DETAILS,
+    HypervisorInterface: HV_DETAILS,
+    HypervisorVersion: HV_DETAILS,
+    HvFeatures: HV_DETAILS,
+    HwFeatures: HV_DETAILS,
+    EnlightenmentInfo: HV_DETAILS,
+    ImplementationLimits: HV_DETAILS,
+}}
+pub type PSYSTEM_HYPERVISOR_DETAIL_INFORMATION = *mut SYSTEM_HYPERVISOR_DETAIL_INFORMATION;
+STRUCT!{struct SYSTEM_PROCESSOR_CYCLE_STATS_INFORMATION {
+    Cycles: [[ULONGLONG; 4]; 2],
+}}
+pub type PSYSTEM_PROCESSOR_CYCLE_STATS_INFORMATION = *mut SYSTEM_PROCESSOR_CYCLE_STATS_INFORMATION;
+STRUCT!{struct SYSTEM_TPM_INFORMATION {
+    Flags: ULONG,
+}}
+pub type PSYSTEM_TPM_INFORMATION = *mut SYSTEM_TPM_INFORMATION;
+STRUCT!{struct SYSTEM_VSM_PROTECTION_INFORMATION {
+    DmaProtectionsAvailable: BOOLEAN,
+    DmaProtectionsInUse: BOOLEAN,
+    HardwareMbecAvailable: BOOLEAN,
+}}
+pub type PSYSTEM_VSM_PROTECTION_INFORMATION = *mut SYSTEM_VSM_PROTECTION_INFORMATION;
+STRUCT!{struct SYSTEM_CODEINTEGRITYPOLICY_INFORMATION {
+    Options: ULONG,
+    HVCIOptions: ULONG,
+    Version: ULONGLONG,
+    PolicyGuid: GUID,
+}}
+pub type PSYSTEM_CODEINTEGRITYPOLICY_INFORMATION = *mut SYSTEM_CODEINTEGRITYPOLICY_INFORMATION;
+STRUCT!{struct SYSTEM_ISOLATED_USER_MODE_INFORMATION {
+    Bitfields1: BOOLEAN,
+    Bitfields2: BOOLEAN,
+    Spare0: [BOOLEAN; 6],
+    Spare1: ULONGLONG,
+}}
+BITFIELD!{SYSTEM_ISOLATED_USER_MODE_INFORMATION Bitfields1: BOOLEAN [
+    SecureKernelRunning set_SecureKernelRunning[0..1],
+    HvciEnabled set_HvciEnabled[1..2],
+    HvciStrictMode set_HvciStrictMode[2..3],
+    DebugEnabled set_DebugEnabled[3..4],
+    FirmwarePageProtection set_FirmwarePageProtection[4..5],
+    EncryptionKeyAvailable set_EncryptionKeyAvailable[5..6],
+    SpareFlags set_SpareFlags[6..7],
+    TrustletRunning set_TrustletRunning[7..8],
+]}
+BITFIELD!{SYSTEM_ISOLATED_USER_MODE_INFORMATION Bitfields2: BOOLEAN [
+    SpareFlags2 set_SpareFlags2[0..1],
+]}
+pub type PSYSTEM_ISOLATED_USER_MODE_INFORMATION = *mut SYSTEM_ISOLATED_USER_MODE_INFORMATION;
+STRUCT!{struct SYSTEM_SINGLE_MODULE_INFORMATION {
+    TargetModuleAddress: PVOID,
+    ExInfo: RTL_PROCESS_MODULE_INFORMATION_EX,
+}}
+pub type PSYSTEM_SINGLE_MODULE_INFORMATION = *mut SYSTEM_SINGLE_MODULE_INFORMATION;
+STRUCT!{struct SYSTEM_INTERRUPT_CPU_SET_INFORMATION {
+    Gsiv: ULONG,
+    Group: USHORT,
+    CpuSets: ULONGLONG,
+}}
+pub type PSYSTEM_INTERRUPT_CPU_SET_INFORMATION = *mut SYSTEM_INTERRUPT_CPU_SET_INFORMATION;
+STRUCT!{struct SYSTEM_SECUREBOOT_POLICY_FULL_INFORMATION {
+    PolicyInformation: SYSTEM_SECUREBOOT_POLICY_INFORMATION,
+    PolicySize: ULONG,
+    Policy: [UCHAR; 1],
+}}
+pub type PSYSTEM_SECUREBOOT_POLICY_FULL_INFORMATION =
+    *mut SYSTEM_SECUREBOOT_POLICY_FULL_INFORMATION;
+STRUCT!{struct SYSTEM_ROOT_SILO_INFORMATION {
+    NumberOfSilos: ULONG,
+    SiloIdList: [ULONG; 1],
+}}
+pub type PSYSTEM_ROOT_SILO_INFORMATION = *mut SYSTEM_ROOT_SILO_INFORMATION;
+STRUCT!{struct SYSTEM_CPU_SET_TAG_INFORMATION {
+    Tag: ULONGLONG,
+    CpuSets: [ULONGLONG; 1],
+}}
+pub type PSYSTEM_CPU_SET_TAG_INFORMATION = *mut SYSTEM_CPU_SET_TAG_INFORMATION;
+STRUCT!{struct SYSTEM_SECURE_KERNEL_HYPERGUARD_PROFILE_INFORMATION {
+    ExtentCount: ULONG,
+    ValidStructureSize: ULONG,
+    NextExtentIndex: ULONG,
+    ExtentRestart: ULONG,
+    CycleCount: ULONG,
+    TimeoutCount: ULONG,
+    CycleTime: ULONGLONG,
+    CycleTimeMax: ULONGLONG,
+    ExtentTime: ULONGLONG,
+    ExtentTimeIndex: ULONG,
+    ExtentTimeMaxIndex: ULONG,
+    ExtentTimeMax: ULONGLONG,
+    HyperFlushTimeMax: ULONGLONG,
+    TranslateVaTimeMax: ULONGLONG,
+    DebugExemptionCount: ULONGLONG,
+    TbHitCount: ULONGLONG,
+    TbMissCount: ULONGLONG,
+    VinaPendingYield: ULONGLONG,
+    HashCycles: ULONGLONG,
+    HistogramOffset: ULONG,
+    HistogramBuckets: ULONG,
+    HistogramShift: ULONG,
+    Reserved1: ULONG,
+    PageNotPresentCount: ULONGLONG,
+}}
+pub type PSYSTEM_SECURE_KERNEL_HYPERGUARD_PROFILE_INFORMATION =
+    *mut SYSTEM_SECURE_KERNEL_HYPERGUARD_PROFILE_INFORMATION;
+STRUCT!{struct SYSTEM_SECUREBOOT_PLATFORM_MANIFEST_INFORMATION {
+    PlatformManifestSize: ULONG,
+    PlatformManifest: [UCHAR; 1],
+}}
+pub type PSYSTEM_SECUREBOOT_PLATFORM_MANIFEST_INFORMATION =
+    *mut SYSTEM_SECUREBOOT_PLATFORM_MANIFEST_INFORMATION;
+STRUCT!{struct SYSTEM_MEMORY_USAGE_INFORMATION {
+    TotalPhysicalBytes: ULONGLONG,
+    AvailableBytes: ULONGLONG,
+    ResidentAvailableBytes: LONGLONG,
+    CommittedBytes: ULONGLONG,
+    SharedCommittedBytes: ULONGLONG,
+    CommitLimitBytes: ULONGLONG,
+    PeakCommitmentBytes: ULONGLONG,
+}}
+pub type PSYSTEM_MEMORY_USAGE_INFORMATION = *mut SYSTEM_MEMORY_USAGE_INFORMATION;
+STRUCT!{struct SYSTEM_CODEINTEGRITY_CERTIFICATE_INFORMATION {
+    ImageFile: HANDLE,
+    Type: ULONG,
+}}
+pub type PSYSTEM_CODEINTEGRITY_CERTIFICATE_INFORMATION =
+    *mut SYSTEM_CODEINTEGRITY_CERTIFICATE_INFORMATION;
+STRUCT!{struct SYSTEM_PHYSICAL_MEMORY_INFORMATION {
+    TotalPhysicalBytes: ULONGLONG,
+    LowestPhysicalAddress: ULONGLONG,
+    HighestPhysicalAddress: ULONGLONG,
+}}
+pub type PSYSTEM_PHYSICAL_MEMORY_INFORMATION = *mut SYSTEM_PHYSICAL_MEMORY_INFORMATION;
+ENUM!{enum SYSTEM_ACTIVITY_MODERATION_STATE {
+    SystemActivityModerationStateSystemManaged = 0,
+    SystemActivityModerationStateUserManagedAllowThrottling = 1,
+    SystemActivityModerationStateUserManagedDisableThrottling = 2,
+    MaxSystemActivityModerationState = 3,
+}}
+ENUM!{enum SYSTEM_ACTIVITY_MODERATION_APP_TYPE {
+    SystemActivityModerationAppTypeClassic = 0,
+    SystemActivityModerationAppTypePackaged = 1,
+    MaxSystemActivityModerationAppType = 2,
+}}
+STRUCT!{struct SYSTEM_ACTIVITY_MODERATION_INFO {
+    Identifier: UNICODE_STRING,
+    ModerationState: SYSTEM_ACTIVITY_MODERATION_STATE,
+    AppType: SYSTEM_ACTIVITY_MODERATION_APP_TYPE,
+}}
+pub type PSYSTEM_ACTIVITY_MODERATION_INFO = *mut SYSTEM_ACTIVITY_MODERATION_INFO;
+STRUCT!{struct SYSTEM_ACTIVITY_MODERATION_USER_SETTINGS {
+    UserKeyHandle: HANDLE,
+}}
+pub type PSYSTEM_ACTIVITY_MODERATION_USER_SETTINGS = *mut SYSTEM_ACTIVITY_MODERATION_USER_SETTINGS;
+STRUCT!{struct SYSTEM_CODEINTEGRITY_UNLOCK_INFORMATION {
+    Flags: ULONG,
+    UnlockId: [UCHAR; 32],
+}}
+BITFIELD!{SYSTEM_CODEINTEGRITY_UNLOCK_INFORMATION Flags: ULONG [
+    Locked set_Locked[0..1],
+    Unlockable set_Unlockable[1..2],
+    UnlockApplied set_UnlockApplied[2..3],
+    UnlockIdValid set_UnlockIdValid[3..4],
+    Reserved set_Reserved[4..32],
+]}
+pub type PSYSTEM_CODEINTEGRITY_UNLOCK_INFORMATION = *mut SYSTEM_CODEINTEGRITY_UNLOCK_INFORMATION;
+STRUCT!{struct SYSTEM_FLUSH_INFORMATION {
+    SupportedFlushMethods: ULONG,
+    ProcessorCacheFlushSize: ULONG,
+    SystemFlushCapabilities: ULONGLONG,
+    Reserved: [ULONGLONG; 2],
+}}
+pub type PSYSTEM_FLUSH_INFORMATION = *mut SYSTEM_FLUSH_INFORMATION;
+STRUCT!{struct SYSTEM_WRITE_CONSTRAINT_INFORMATION {
+    WriteConstraintPolicy: ULONG,
+    Reserved: ULONG,
+}}
+pub type PSYSTEM_WRITE_CONSTRAINT_INFORMATION = *mut SYSTEM_WRITE_CONSTRAINT_INFORMATION;
+STRUCT!{struct SYSTEM_KERNEL_VA_SHADOW_INFORMATION {
+    Flags: ULONG,
+}}
+BITFIELD!{SYSTEM_KERNEL_VA_SHADOW_INFORMATION Flags: ULONG [
+    KvaShadowEnabled set_KvaShadowEnabled[0..1],
+    KvaShadowUserGlobal set_KvaShadowUserGlobal[1..2],
+    KvaShadowPcid set_KvaShadowPcid[2..3],
+    KvaShadowInvpcid set_KvaShadowInvpcid[3..4],
+    KvaShadowRequired set_KvaShadowRequired[4..5],
+    KvaShadowRequiredAvailable set_KvaShadowRequiredAvailable[5..6],
+    InvalidPteBit set_InvalidPteBit[6..12],
+    L1DataCacheFlushSupported set_L1DataCacheFlushSupported[12..13],
+    L1TerminalFaultMitigationPresent set_L1TerminalFaultMitigationPresent[13..14],
+    Reserved set_Reserved[14..32],
+]}
+pub type PSYSTEM_KERNEL_VA_SHADOW_INFORMATION = *mut SYSTEM_KERNEL_VA_SHADOW_INFORMATION;
+STRUCT!{struct SYSTEM_CODEINTEGRITYVERIFICATION_INFORMATION {
+    FileHandle: HANDLE,
+    ImageSize: ULONG,
+    Image: PVOID,
+}}
+pub type PSYSTEM_CODEINTEGRITYVERIFICATION_INFORMATION =
+    *mut SYSTEM_CODEINTEGRITYVERIFICATION_INFORMATION;
+STRUCT!{struct SYSTEM_HYPERVISOR_SHARED_PAGE_INFORMATION {
+    HypervisorSharedUserVa: PVOID,
+}}
+pub type PSYSTEM_HYPERVISOR_SHARED_PAGE_INFORMATION =
+    *mut SYSTEM_HYPERVISOR_SHARED_PAGE_INFORMATION;
+STRUCT!{struct SYSTEM_SPECULATION_CONTROL_INFORMATION {
+    Flags: ULONG,
+}}
+BITFIELD!{SYSTEM_SPECULATION_CONTROL_INFORMATION Flags: ULONG [
+    BpbEnabled set_BpbEnabled[0..1],
+    BpbDisabledSystemPolicy set_BpbDisabledSystemPolicy[1..2],
+    BpbDisabledNoHardwareSupport set_BpbDisabledNoHardwareSupport[2..3],
+    SpecCtrlEnumerated set_SpecCtrlEnumerated[3..4],
+    SpecCmdEnumerated set_SpecCmdEnumerated[4..5],
+    IbrsPresent set_IbrsPresent[5..6],
+    StibpPresent set_StibpPresent[6..7],
+    SmepPresent set_SmepPresent[7..8],
+    SpeculativeStoreBypassDisableAvailable set_SpeculativeStoreBypassDisableAvailable[8..9],
+    SpeculativeStoreBypassDisableSupported set_SpeculativeStoreBypassDisableSupported[9..10],
+    SpeculativeStoreBypassDisabledSystemWide set_SpeculativeStoreBypassDisabledSystemWide[10..11],
+    SpeculativeStoreBypassDisabledKernel set_SpeculativeStoreBypassDisabledKernel[11..12],
+    SpeculativeStoreBypassDisableRequired set_SpeculativeStoreBypassDisableRequired[12..13],
+    BpbDisabledKernelToUser set_BpbDisabledKernelToUser[13..14],
+    SpecCtrlRetpolineEnabled set_SpecCtrlRetpolineEnabled[14..15],
+    SpecCtrlImportOptimizationEnabled set_SpecCtrlImportOptimizationEnabled[15..16],
+    Reserved set_Reserved[16..32],
+]}
+pub type PSYSTEM_SPECULATION_CONTROL_INFORMATION = *mut SYSTEM_SPECULATION_CONTROL_INFORMATION;
+STRUCT!{struct SYSTEM_DMA_GUARD_POLICY_INFORMATION {
+    DmaGuardPolicyEnabled: BOOLEAN,
+}}
+pub type PSYSTEM_DMA_GUARD_POLICY_INFORMATION = *mut SYSTEM_DMA_GUARD_POLICY_INFORMATION;
+STRUCT!{struct SYSTEM_ENCLAVE_LAUNCH_CONTROL_INFORMATION {
+    EnclaveLaunchSigner: [UCHAR; 32],
+}}
+pub type PSYSTEM_ENCLAVE_LAUNCH_CONTROL_INFORMATION =
+    *mut SYSTEM_ENCLAVE_LAUNCH_CONTROL_INFORMATION;
+STRUCT!{struct SYSTEM_WORKLOAD_ALLOWED_CPU_SET_INFORMATION {
+    WorkloadClass: ULONGLONG,
+    CpuSets: [ULONGLONG; 1],
+}}
+pub type PSYSTEM_WORKLOAD_ALLOWED_CPU_SET_INFORMATION =
+    *mut SYSTEM_WORKLOAD_ALLOWED_CPU_SET_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtQuerySystemInformation(
+        SystemInformationClass: SYSTEM_INFORMATION_CLASS,
+        SystemInformation: PVOID,
+        SystemInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtQuerySystemInformationEx(
+        SystemInformationClass: SYSTEM_INFORMATION_CLASS,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        SystemInformation: PVOID,
+        SystemInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetSystemInformation(
+        SystemInformationClass: SYSTEM_INFORMATION_CLASS,
+        SystemInformation: PVOID,
+        SystemInformationLength: ULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum SYSDBG_COMMAND {
+    SysDbgQueryModuleInformation = 0,
+    SysDbgQueryTraceInformation = 1,
+    SysDbgSetTracepoint = 2,
+    SysDbgSetSpecialCall = 3,
+    SysDbgClearSpecialCalls = 4,
+    SysDbgQuerySpecialCalls = 5,
+    SysDbgBreakPoint = 6,
+    SysDbgQueryVersion = 7,
+    SysDbgReadVirtual = 8,
+    SysDbgWriteVirtual = 9,
+    SysDbgReadPhysical = 10,
+    SysDbgWritePhysical = 11,
+    SysDbgReadControlSpace = 12,
+    SysDbgWriteControlSpace = 13,
+    SysDbgReadIoSpace = 14,
+    SysDbgWriteIoSpace = 15,
+    SysDbgReadMsr = 16,
+    SysDbgWriteMsr = 17,
+    SysDbgReadBusData = 18,
+    SysDbgWriteBusData = 19,
+    SysDbgCheckLowMemory = 20,
+    SysDbgEnableKernelDebugger = 21,
+    SysDbgDisableKernelDebugger = 22,
+    SysDbgGetAutoKdEnable = 23,
+    SysDbgSetAutoKdEnable = 24,
+    SysDbgGetPrintBufferSize = 25,
+    SysDbgSetPrintBufferSize = 26,
+    SysDbgGetKdUmExceptionEnable = 27,
+    SysDbgSetKdUmExceptionEnable = 28,
+    SysDbgGetTriageDump = 29,
+    SysDbgGetKdBlockEnable = 30,
+    SysDbgSetKdBlockEnable = 31,
+    SysDbgRegisterForUmBreakInfo = 32,
+    SysDbgGetUmBreakPid = 33,
+    SysDbgClearUmBreakPid = 34,
+    SysDbgGetUmAttachPid = 35,
+    SysDbgClearUmAttachPid = 36,
+    SysDbgGetLiveKernelDump = 37,
+}}
+pub type PSYSDBG_COMMAND = *mut SYSDBG_COMMAND;
+STRUCT!{struct SYSDBG_VIRTUAL {
+    Address: PVOID,
+    Buffer: PVOID,
+    Request: ULONG,
+}}
+pub type PSYSDBG_VIRTUAL = *mut SYSDBG_VIRTUAL;
+STRUCT!{struct SYSDBG_PHYSICAL {
+    Address: PHYSICAL_ADDRESS,
+    Buffer: PVOID,
+    Request: ULONG,
+}}
+pub type PSYSDBG_PHYSICAL = *mut SYSDBG_PHYSICAL;
+STRUCT!{struct SYSDBG_CONTROL_SPACE {
+    Address: ULONG64,
+    Buffer: PVOID,
+    Request: ULONG,
+    Processor: ULONG,
+}}
+pub type PSYSDBG_CONTROL_SPACE = *mut SYSDBG_CONTROL_SPACE;
+STRUCT!{struct SYSDBG_IO_SPACE {
+    Address: ULONG64,
+    Buffer: PVOID,
+    Request: ULONG,
+    InterfaceType: INTERFACE_TYPE,
+    BusNumber: ULONG,
+    AddressSpace: ULONG,
+}}
+pub type PSYSDBG_IO_SPACE = *mut SYSDBG_IO_SPACE;
+STRUCT!{struct SYSDBG_MSR {
+    Msr: ULONG,
+    Data: ULONG64,
+}}
+pub type PSYSDBG_MSR = *mut SYSDBG_MSR;
+STRUCT!{struct SYSDBG_BUS_DATA {
+    Address: ULONG,
+    Buffer: PVOID,
+    Request: ULONG,
+    BusDataType: BUS_DATA_TYPE,
+    BusNumber: ULONG,
+    SlotNumber: ULONG,
+}}
+pub type PSYSDBG_BUS_DATA = *mut SYSDBG_BUS_DATA;
+STRUCT!{struct SYSDBG_TRIAGE_DUMP {
+    Flags: ULONG,
+    BugCheckCode: ULONG,
+    BugCheckParam1: ULONG_PTR,
+    BugCheckParam2: ULONG_PTR,
+    BugCheckParam3: ULONG_PTR,
+    BugCheckParam4: ULONG_PTR,
+    ProcessHandles: ULONG,
+    ThreadHandles: ULONG,
+    Handles: PHANDLE,
+}}
+pub type PSYSDBG_TRIAGE_DUMP = *mut SYSDBG_TRIAGE_DUMP;
+STRUCT!{struct SYSDBG_LIVEDUMP_CONTROL_FLAGS {
+    AsUlong: ULONG,
+}}
+BITFIELD!{SYSDBG_LIVEDUMP_CONTROL_FLAGS AsUlong: ULONG [
+    UseDumpStorageStack set_UseDumpStorageStack[0..1],
+    CompressMemoryPagesData set_CompressMemoryPagesData[1..2],
+    IncludeUserSpaceMemoryPages set_IncludeUserSpaceMemoryPages[2..3],
+    AbortIfMemoryPressure set_AbortIfMemoryPressure[3..4],
+    Reserved set_Reserved[4..32],
+]}
+pub type PSYSDBG_LIVEDUMP_CONTROL_FLAGS = *mut SYSDBG_LIVEDUMP_CONTROL_FLAGS;
+STRUCT!{struct SYSDBG_LIVEDUMP_CONTROL_ADDPAGES {
+    AsUlong: ULONG,
+}}
+BITFIELD!{SYSDBG_LIVEDUMP_CONTROL_ADDPAGES AsUlong: ULONG [
+    HypervisorPages set_HypervisorPages[0..1],
+    Reserved set_Reserved[1..32],
+]}
+pub type PSYSDBG_LIVEDUMP_CONTROL_ADDPAGES = *mut SYSDBG_LIVEDUMP_CONTROL_ADDPAGES;
+pub const SYSDBG_LIVEDUMP_CONTROL_VERSION: ULONG = 1;
+STRUCT!{struct SYSDBG_LIVEDUMP_CONTROL {
+    Version: ULONG,
+    BugCheckCode: ULONG,
+    BugCheckParam1: ULONG_PTR,
+    BugCheckParam2: ULONG_PTR,
+    BugCheckParam3: ULONG_PTR,
+    BugCheckParam4: ULONG_PTR,
+    DumpFileHandle: HANDLE,
+    CancelEventHandle: HANDLE,
+    Flags: SYSDBG_LIVEDUMP_CONTROL_FLAGS,
+    AddPagesControl: SYSDBG_LIVEDUMP_CONTROL_ADDPAGES,
+}}
+pub type PSYSDBG_LIVEDUMP_CONTROL = *mut SYSDBG_LIVEDUMP_CONTROL;
+EXTERN!{extern "system" {
+    fn NtSystemDebugControl(
+        Command: SYSDBG_COMMAND,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        OutputBuffer: PVOID,
+        OutputBufferLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum HARDERROR_RESPONSE_OPTION {
+    OptionAbortRetryIgnore = 0,
+    OptionOk = 1,
+    OptionOkCancel = 2,
+    OptionRetryCancel = 3,
+    OptionYesNo = 4,
+    OptionYesNoCancel = 5,
+    OptionShutdownSystem = 6,
+    OptionOkNoWait = 7,
+    OptionCancelTryContinue = 8,
+}}
+ENUM!{enum HARDERROR_RESPONSE {
+    ResponseReturnToCaller = 0,
+    ResponseNotHandled = 1,
+    ResponseAbort = 2,
+    ResponseCancel = 3,
+    ResponseIgnore = 4,
+    ResponseNo = 5,
+    ResponseOk = 6,
+    ResponseRetry = 7,
+    ResponseYes = 8,
+    ResponseTryAgain = 9,
+    ResponseContinue = 10,
+}}
+pub const HARDERROR_OVERRIDE_ERRORMODE: ULONG = 0x10000000;
+EXTERN!{extern "system" {
+    fn NtRaiseHardError(
+        ErrorStatus: NTSTATUS,
+        NumberOfParameters: ULONG,
+        UnicodeStringParameterMask: ULONG,
+        Parameters: PULONG_PTR,
+        ValidResponseOptions: ULONG,
+        Response: PULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum ALTERNATIVE_ARCHITECTURE_TYPE {
+    StandardDesign = 0,
+    NEC98x86 = 1,
+    EndAlternatives = 2,
+}}
+pub const PROCESSOR_FEATURE_MAX: usize = 64;
+pub const MAX_WOW64_SHARED_ENTRIES: u32 = 16;
+pub const NX_SUPPORT_POLICY_ALWAYSOFF: u32 = 0;
+pub const NX_SUPPORT_POLICY_ALWAYSON: u32 = 1;
+pub const NX_SUPPORT_POLICY_OPTIN: u32 = 2;
+pub const NX_SUPPORT_POLICY_OPTOUT: u32 = 3;
+UNION!{union KUSER_SHARED_DATA_u {
+    TickCount: KSYSTEM_TIME,
+    TickCountQuad: ULONG64,
+    ReservedTickCountOverlay: [ULONG; 3],
+}}
+STRUCT!{#[repr(packed(4))] struct KUSER_SHARED_DATA {
+    TickCountLowDeprecated: ULONG,
+    TickCountMultiplier: ULONG,
+    InterruptTime: KSYSTEM_TIME,
+    SystemTime: KSYSTEM_TIME,
+    TimeZoneBias: KSYSTEM_TIME,
+    ImageNumberLow: USHORT,
+    ImageNumberHigh: USHORT,
+    NtSystemRoot: [WCHAR; 260],
+    MaxStackTraceDepth: ULONG,
+    CryptoExponent: ULONG,
+    TimeZoneId: ULONG,
+    LargePageMinimum: ULONG,
+    AitSamplingValue: ULONG,
+    AppCompatFlag: ULONG,
+    RNGSeedVersion: ULONGLONG,
+    GlobalValidationRunlevel: ULONG,
+    TimeZoneBiasStamp: LONG,
+    NtBuildNumber: ULONG,
+    NtProductType: NT_PRODUCT_TYPE,
+    ProductTypeIsValid: BOOLEAN,
+    Reserved0: [UCHAR; 1],
+    NativeProcessorArchitecture: USHORT,
+    NtMajorVersion: ULONG,
+    NtMinorVersion: ULONG,
+    ProcessorFeatures: [BOOLEAN; PROCESSOR_FEATURE_MAX],
+    Reserved1: ULONG,
+    Reserved3: ULONG,
+    TimeSlip: ULONG,
+    AlternativeArchitecture: ALTERNATIVE_ARCHITECTURE_TYPE,
+    BootId: ULONG,
+    SystemExpirationDate: LARGE_INTEGER,
+    SuiteMask: ULONG,
+    KdDebuggerEnabled: BOOLEAN,
+    MitigationPolicies: UCHAR,
+    Reserved6: [UCHAR; 2],
+    ActiveConsoleId: ULONG,
+    DismountCount: ULONG,
+    ComPlusPackage: ULONG,
+    LastSystemRITEventTickCount: ULONG,
+    NumberOfPhysicalPages: ULONG,
+    SafeBootMode: BOOLEAN,
+    VirtualizationFlags: UCHAR,
+    Reserved12: [UCHAR; 2],
+    SharedDataFlags: ULONG,
+    DataFlagsPad: [ULONG; 1],
+    TestRetInstruction: ULONGLONG,
+    QpcFrequency: LONGLONG,
+    SystemCall: ULONG,
+    SystemCallPad0: ULONG,
+    SystemCallPad: [ULONGLONG; 2],
+    u: KUSER_SHARED_DATA_u,
+    //TickCountPad: [ULONG; 1],
+    Cookie: ULONG,
+    CookiePad: [ULONG; 1],
+    ConsoleSessionForegroundProcessId: LONGLONG,
+    TimeUpdateLock: ULONGLONG,
+    BaselineSystemTimeQpc: ULONGLONG,
+    BaselineInterruptTimeQpc: ULONGLONG,
+    QpcSystemTimeIncrement: ULONGLONG,
+    QpcInterruptTimeIncrement: ULONGLONG,
+    QpcSystemTimeIncrementShift: UCHAR,
+    QpcInterruptTimeIncrementShift: UCHAR,
+    UnparkedProcessorCount: USHORT,
+    EnclaveFeatureMask: [ULONG; 4],
+    TelemetryCoverageRound: ULONG,
+    UserModeGlobalLogger: [USHORT; 16],
+    ImageFileExecutionOptions: ULONG,
+    LangGenerationCount: ULONG,
+    Reserved4: ULONGLONG,
+    InterruptTimeBias: ULONG64,
+    QpcBias: ULONG64,
+    ActiveProcessorCount: ULONG,
+    ActiveGroupCount: UCHAR,
+    Reserved9: UCHAR,
+    QpcData: UCHAR,
+    TimeZoneBiasEffectiveStart: LARGE_INTEGER,
+    TimeZoneBiasEffectiveEnd: LARGE_INTEGER,
+    XState: XSTATE_CONFIGURATION,
+}}
+BITFIELD!{KUSER_SHARED_DATA MitigationPolicies: UCHAR [
+    NXSupportPolicy set_NXSupportPolicy[0..2],
+    SEHValidationPolicy set_SEHValidationPolicy[2..4],
+    CurDirDevicesSkippedForDlls set_CurDirDevicesSkippedForDlls[4..6],
+    Reserved set_Reserved[6..8],
+]}
+BITFIELD!{KUSER_SHARED_DATA SharedDataFlags: ULONG [
+    DbgErrorPortPresent set_DbgErrorPortPresent[0..1],
+    DbgElevationEnabled set_DbgElevationEnabled[1..2],
+    DbgVirtEnabled set_DbgVirtEnabled[2..3],
+    DbgInstallerDetectEnabled set_DbgInstallerDetectEnabled[3..4],
+    DbgLkgEnabled set_DbgLkgEnabled[4..5],
+    DbgDynProcessorEnabled set_DbgDynProcessorEnabled[5..6],
+    DbgConsoleBrokerEnabled set_DbgConsoleBrokerEnabled[6..7],
+    DbgSecureBootEnabled set_DbgSecureBootEnabled[7..8],
+    DbgMultiSessionSku set_DbgMultiSessionSku[8..9],
+    DbgMultiUsersInSessionSku set_DbgMultiUsersInSessionSku[9..10],
+    DbgStateSeparationEnabled set_DbgStateSeparationEnabled[10..11],
+    SpareBits set_SpareBits[11..32],
+]}
+BITFIELD!{KUSER_SHARED_DATA QpcData: UCHAR [
+    QpcBypassEnabled set_QpcBypassEnabled[0..1],
+    QpcShift set_QpcShift[1..2],
+]}
+pub type PKUSER_SHARED_DATA = *mut KUSER_SHARED_DATA;
+pub const USER_SHARED_DATA: *const KUSER_SHARED_DATA = 0x7ffe0000 as *const _;
+#[inline]
+pub unsafe fn NtGetTickCount64() -> ULONGLONG {
+    #[allow(deprecated)] //fixme
+    let mut tick_count: ULARGE_INTEGER = uninitialized();
+    #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))] {
+        *tick_count.QuadPart_mut() = read_volatile(&(*USER_SHARED_DATA).u.TickCountQuad);
+    }
+    #[cfg(target_arch = "x86")] {
+        loop {
+            tick_count.s_mut().HighPart =
+                read_volatile(&(*USER_SHARED_DATA).u.TickCount.High1Time) as u32;
+            tick_count.s_mut().LowPart = read_volatile(&(*USER_SHARED_DATA).u.TickCount.LowPart);
+            if tick_count.s().HighPart == read_volatile(&(*USER_SHARED_DATA).u.TickCount.High2Time)
+                as u32
+            {
+                break;
+            }
+            spin_loop_hint();
+        }
+    }
+    (UInt32x32To64(tick_count.s().LowPart, (*USER_SHARED_DATA).TickCountMultiplier) >> 24)
+        + (UInt32x32To64(
+        tick_count.s().HighPart as u32,
+        (*USER_SHARED_DATA).TickCountMultiplier,
+    ) << 8)
+}
+#[inline]
+pub unsafe fn NtGetTickCount() -> ULONG {
+    #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))] {
+        ((read_volatile(&(*USER_SHARED_DATA).u.TickCountQuad)
+            * (*USER_SHARED_DATA).TickCountMultiplier as u64) >> 24) as u32
+    }
+    #[cfg(target_arch = "x86")] {
+        #[allow(deprecated)] //fixme
+        let mut tick_count: ULARGE_INTEGER = uninitialized();
+        loop {
+            tick_count.s_mut().HighPart = read_volatile(&(*USER_SHARED_DATA).u.TickCount.High1Time)
+                as u32;
+            tick_count.s_mut().LowPart = read_volatile(&(*USER_SHARED_DATA).u.TickCount.LowPart);
+            if tick_count.s().HighPart == read_volatile(&(*USER_SHARED_DATA).u.TickCount.High2Time)
+                as u32
+            {
+                break;
+            }
+            spin_loop_hint();
+        }
+        ((UInt32x32To64(tick_count.s().LowPart, (*USER_SHARED_DATA).TickCountMultiplier) >> 24)
+            + UInt32x32To64(
+            (tick_count.s().HighPart as u32) << 8,
+            (*USER_SHARED_DATA).TickCountMultiplier,
+        )) as u32
+    }
+}
+EXTERN!{extern "system" {
+    fn NtQueryDefaultLocale(
+        UserProfile: BOOLEAN,
+        DefaultLocaleId: PLCID,
+    ) -> NTSTATUS;
+    fn NtSetDefaultLocale(
+        UserProfile: BOOLEAN,
+        DefaultLocaleId: LCID,
+    ) -> NTSTATUS;
+    fn NtQueryInstallUILanguage(
+        InstallUILanguageId: *mut LANGID,
+    ) -> NTSTATUS;
+    fn NtFlushInstallUILanguage(
+        InstallUILanguage: LANGID,
+        SetComittedFlag: ULONG,
+    ) -> NTSTATUS;
+    fn NtQueryDefaultUILanguage(
+        DefaultUILanguageId: *mut LANGID,
+    ) -> NTSTATUS;
+    fn NtSetDefaultUILanguage(
+        DefaultUILanguageId: LANGID,
+    ) -> NTSTATUS;
+    fn NtIsUILanguageComitted() -> NTSTATUS;
+    fn NtInitializeNlsFiles(
+        BaseAddress: *mut PVOID,
+        DefaultLocaleId: PLCID,
+        DefaultCasingTableSize: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtGetNlsSectionPtr(
+        SectionType: ULONG,
+        SectionData: ULONG,
+        ContextData: PVOID,
+        SectionPointer: *mut PVOID,
+        SectionSize: PULONG,
+    ) -> NTSTATUS;
+    fn NtMapCMFModule(
+        What: ULONG,
+        Index: ULONG,
+        CacheIndexOut: PULONG,
+        CacheFlagsOut: PULONG,
+        ViewSizeOut: PULONG,
+        BaseAddress: *mut PVOID,
+    ) -> NTSTATUS;
+    fn NtGetMUIRegistryInfo(
+        Flags: ULONG,
+        DataSize: PULONG,
+        Data: PVOID,
+    ) -> NTSTATUS;
+    fn NtAddAtom(
+        AtomName: PWSTR,
+        Length: ULONG,
+        Atom: PRTL_ATOM,
+    ) -> NTSTATUS;
+}}
+pub const ATOM_FLAG_GLOBAL: ULONG = 0x2;
+EXTERN!{extern "system" {
+    fn NtAddAtomEx(
+        AtomName: PWSTR,
+        Length: ULONG,
+        Atom: PRTL_ATOM,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtFindAtom(
+        AtomName: PWSTR,
+        Length: ULONG,
+        Atom: PRTL_ATOM,
+    ) -> NTSTATUS;
+    fn NtDeleteAtom(
+        Atom: RTL_ATOM,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum ATOM_INFORMATION_CLASS {
+    AtomBasicInformation = 0,
+    AtomTableInformation = 1,
+}}
+STRUCT!{struct ATOM_BASIC_INFORMATION {
+    UsageCount: USHORT,
+    Flags: USHORT,
+    NameLength: USHORT,
+    Name: [WCHAR; 1],
+}}
+pub type PATOM_BASIC_INFORMATION = *mut ATOM_BASIC_INFORMATION;
+STRUCT!{struct ATOM_TABLE_INFORMATION {
+    NumberOfAtoms: ULONG,
+    Atoms: [RTL_ATOM; 1],
+}}
+pub type PATOM_TABLE_INFORMATION = *mut ATOM_TABLE_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtQueryInformationAtom(
+        Atom: RTL_ATOM,
+        AtomInformationClass: ATOM_INFORMATION_CLASS,
+        AtomInformation: PVOID,
+        AtomInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
+pub const FLG_STOP_ON_EXCEPTION: u32 = 0x00000001;
+pub const FLG_SHOW_LDR_SNAPS: u32 = 0x00000002;
+pub const FLG_DEBUG_INITIAL_COMMAND: u32 = 0x00000004;
+pub const FLG_STOP_ON_HUNG_GUI: u32 = 0x00000008;
+pub const FLG_HEAP_ENABLE_TAIL_CHECK: u32 = 0x00000010;
+pub const FLG_HEAP_ENABLE_FREE_CHECK: u32 = 0x00000020;
+pub const FLG_HEAP_VALIDATE_PARAMETERS: u32 = 0x00000040;
+pub const FLG_HEAP_VALIDATE_ALL: u32 = 0x00000080;
+pub const FLG_APPLICATION_VERIFIER: u32 = 0x00000100;
+pub const FLG_POOL_ENABLE_TAGGING: u32 = 0x00000400;
+pub const FLG_HEAP_ENABLE_TAGGING: u32 = 0x00000800;
+pub const FLG_USER_STACK_TRACE_DB: u32 = 0x00001000;
+pub const FLG_KERNEL_STACK_TRACE_DB: u32 = 0x00002000;
+pub const FLG_MAINTAIN_OBJECT_TYPELIST: u32 = 0x00004000;
+pub const FLG_HEAP_ENABLE_TAG_BY_DLL: u32 = 0x00008000;
+pub const FLG_DISABLE_STACK_EXTENSION: u32 = 0x00010000;
+pub const FLG_ENABLE_CSRDEBUG: u32 = 0x00020000;
+pub const FLG_ENABLE_KDEBUG_SYMBOL_LOAD: u32 = 0x00040000;
+pub const FLG_DISABLE_PAGE_KERNEL_STACKS: u32 = 0x00080000;
+pub const FLG_ENABLE_SYSTEM_CRIT_BREAKS: u32 = 0x00100000;
+pub const FLG_HEAP_DISABLE_COALESCING: u32 = 0x00200000;
+pub const FLG_ENABLE_CLOSE_EXCEPTIONS: u32 = 0x00400000;
+pub const FLG_ENABLE_EXCEPTION_LOGGING: u32 = 0x00800000;
+pub const FLG_ENABLE_HANDLE_TYPE_TAGGING: u32 = 0x01000000;
+pub const FLG_HEAP_PAGE_ALLOCS: u32 = 0x02000000;
+pub const FLG_DEBUG_INITIAL_COMMAND_EX: u32 = 0x04000000;
+pub const FLG_DISABLE_DBGPRINT: u32 = 0x08000000;
+pub const FLG_CRITSEC_EVENT_CREATION: u32 = 0x10000000;
+pub const FLG_LDR_TOP_DOWN: u32 = 0x20000000;
+pub const FLG_ENABLE_HANDLE_EXCEPTIONS: u32 = 0x40000000;
+pub const FLG_DISABLE_PROTDLLS: u32 = 0x80000000;
+pub const FLG_VALID_BITS: u32 = 0xfffffdff;
+pub const FLG_USERMODE_VALID_BITS: u32 = FLG_STOP_ON_EXCEPTION | FLG_SHOW_LDR_SNAPS
+    | FLG_HEAP_ENABLE_TAIL_CHECK | FLG_HEAP_ENABLE_FREE_CHECK | FLG_HEAP_VALIDATE_PARAMETERS
+    | FLG_HEAP_VALIDATE_ALL | FLG_APPLICATION_VERIFIER | FLG_HEAP_ENABLE_TAGGING
+    | FLG_USER_STACK_TRACE_DB | FLG_HEAP_ENABLE_TAG_BY_DLL | FLG_DISABLE_STACK_EXTENSION
+    | FLG_ENABLE_SYSTEM_CRIT_BREAKS | FLG_HEAP_DISABLE_COALESCING | FLG_DISABLE_PROTDLLS
+    | FLG_HEAP_PAGE_ALLOCS | FLG_CRITSEC_EVENT_CREATION | FLG_LDR_TOP_DOWN;
+pub const FLG_BOOTONLY_VALID_BITS: u32 = FLG_KERNEL_STACK_TRACE_DB | FLG_MAINTAIN_OBJECT_TYPELIST
+    | FLG_ENABLE_CSRDEBUG | FLG_DEBUG_INITIAL_COMMAND | FLG_DEBUG_INITIAL_COMMAND_EX
+    | FLG_DISABLE_PAGE_KERNEL_STACKS;
+pub const FLG_KERNELMODE_VALID_BITS: u32 = FLG_STOP_ON_EXCEPTION | FLG_SHOW_LDR_SNAPS
+    | FLG_STOP_ON_HUNG_GUI | FLG_POOL_ENABLE_TAGGING | FLG_ENABLE_KDEBUG_SYMBOL_LOAD
+    | FLG_ENABLE_CLOSE_EXCEPTIONS | FLG_ENABLE_EXCEPTION_LOGGING | FLG_ENABLE_HANDLE_TYPE_TAGGING
+    | FLG_DISABLE_DBGPRINT | FLG_ENABLE_HANDLE_EXCEPTIONS;
+EXTERN!{extern "system" {
+    fn NtQueryLicenseValue(
+        ValueName: PUNICODE_STRING,
+        Type: PULONG,
+        Data: PVOID,
+        DataSize: ULONG,
+        ResultDataSize: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetDefaultHardErrorPort(
+        DefaultHardErrorPort: HANDLE,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum SHUTDOWN_ACTION {
+    ShutdownNoReboot = 0,
+    ShutdownReboot = 1,
+    ShutdownPowerOff = 2,
+}}
+EXTERN!{extern "system" {
+    fn NtShutdownSystem(
+        Action: SHUTDOWN_ACTION,
+    ) -> NTSTATUS;
+    fn NtDisplayString(
+        String: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn NtDrawText(
+        Text: PUNICODE_STRING,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntgdi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntgdi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntgdi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntgdi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,123 @@
+use winapi::shared::ntdef::{PVOID, UCHAR, ULONG, USHORT};
+pub const GDI_MAX_HANDLE_COUNT: usize = 0x4000;
+pub const GDI_HANDLE_INDEX_SHIFT: ULONG = 0;
+pub const GDI_HANDLE_INDEX_BITS: ULONG = 16;
+pub const GDI_HANDLE_INDEX_MASK: ULONG = 0xffff;
+pub const GDI_HANDLE_TYPE_SHIFT: ULONG = 16;
+pub const GDI_HANDLE_TYPE_BITS: ULONG = 5;
+pub const GDI_HANDLE_TYPE_MASK: ULONG = 0x1f;
+pub const GDI_HANDLE_ALTTYPE_SHIFT: ULONG = 21;
+pub const GDI_HANDLE_ALTTYPE_BITS: ULONG = 2;
+pub const GDI_HANDLE_ALTTYPE_MASK: ULONG = 0x3;
+pub const GDI_HANDLE_STOCK_SHIFT: ULONG = 23;
+pub const GDI_HANDLE_STOCK_BITS: ULONG = 1;
+pub const GDI_HANDLE_STOCK_MASK: ULONG = 0x1;
+pub const GDI_HANDLE_UNIQUE_SHIFT: ULONG = 24;
+pub const GDI_HANDLE_UNIQUE_BITS: ULONG = 8;
+pub const GDI_HANDLE_UNIQUE_MASK: ULONG = 0xff;
+#[inline]
+pub const fn GDI_HANDLE_INDEX(Handle: ULONG) -> ULONG {
+    Handle & GDI_HANDLE_INDEX_MASK
+}
+#[inline]
+pub const fn GDI_HANDLE_TYPE(Handle: ULONG) -> ULONG {
+    Handle >> GDI_HANDLE_TYPE_SHIFT & GDI_HANDLE_TYPE_MASK
+}
+#[inline]
+pub const fn GDI_HANDLE_ALTTYPE(Handle: ULONG) -> ULONG {
+    Handle >> GDI_HANDLE_ALTTYPE_SHIFT & GDI_HANDLE_ALTTYPE_MASK
+}
+#[inline]
+pub const fn GDI_HANDLE_STOCK(Handle: ULONG) -> ULONG {
+    Handle >> GDI_HANDLE_STOCK_SHIFT & GDI_HANDLE_STOCK_MASK
+}
+#[inline]
+pub const fn GDI_MAKE_HANDLE(Index: ULONG, Unique: ULONG) -> ULONG {
+    Unique << GDI_HANDLE_INDEX_BITS | Index
+}
+pub const GDI_DEF_TYPE: ULONG = 0;
+pub const GDI_DC_TYPE: ULONG = 1;
+pub const GDI_DD_DIRECTDRAW_TYPE: ULONG = 2;
+pub const GDI_DD_SURFACE_TYPE: ULONG = 3;
+pub const GDI_RGN_TYPE: ULONG = 4;
+pub const GDI_SURF_TYPE: ULONG = 5;
+pub const GDI_CLIENTOBJ_TYPE: ULONG = 6;
+pub const GDI_PATH_TYPE: ULONG = 7;
+pub const GDI_PAL_TYPE: ULONG = 8;
+pub const GDI_ICMLCS_TYPE: ULONG = 9;
+pub const GDI_LFONT_TYPE: ULONG = 10;
+pub const GDI_RFONT_TYPE: ULONG = 11;
+pub const GDI_PFE_TYPE: ULONG = 12;
+pub const GDI_PFT_TYPE: ULONG = 13;
+pub const GDI_ICMCXF_TYPE: ULONG = 14;
+pub const GDI_ICMDLL_TYPE: ULONG = 15;
+pub const GDI_BRUSH_TYPE: ULONG = 16;
+pub const GDI_PFF_TYPE: ULONG = 17;
+pub const GDI_CACHE_TYPE: ULONG = 18;
+pub const GDI_SPACE_TYPE: ULONG = 19;
+pub const GDI_DBRUSH_TYPE: ULONG = 20;
+pub const GDI_META_TYPE: ULONG = 21;
+pub const GDI_EFSTATE_TYPE: ULONG = 22;
+pub const GDI_BMFD_TYPE: ULONG = 23;
+pub const GDI_VTFD_TYPE: ULONG = 24;
+pub const GDI_TTFD_TYPE: ULONG = 25;
+pub const GDI_RC_TYPE: ULONG = 26;
+pub const GDI_TEMP_TYPE: ULONG = 27;
+pub const GDI_DRVOBJ_TYPE: ULONG = 28;
+pub const GDI_DCIOBJ_TYPE: ULONG = 29;
+pub const GDI_SPOOL_TYPE: ULONG = 30;
+#[inline]
+pub const fn GDI_CLIENT_TYPE_FROM_HANDLE(Handle: ULONG) -> ULONG {
+    Handle & (GDI_HANDLE_ALTTYPE_MASK << GDI_HANDLE_ALTTYPE_SHIFT | GDI_HANDLE_TYPE_MASK
+        << GDI_HANDLE_TYPE_SHIFT)
+}
+#[inline]
+pub const fn GDI_CLIENT_TYPE_FROM_UNIQUE(Unique: ULONG) -> ULONG {
+    GDI_CLIENT_TYPE_FROM_HANDLE(Unique << 16)
+}
+pub const GDI_ALTTYPE_1: ULONG = 1 << GDI_HANDLE_ALTTYPE_SHIFT;
+pub const GDI_ALTTYPE_2: ULONG = 2 << GDI_HANDLE_ALTTYPE_SHIFT;
+pub const GDI_ALTTYPE_3: ULONG = 3 << GDI_HANDLE_ALTTYPE_SHIFT;
+pub const GDI_CLIENT_BITMAP_TYPE: ULONG = GDI_SURF_TYPE << GDI_HANDLE_TYPE_SHIFT;
+pub const GDI_CLIENT_BRUSH_TYPE: ULONG = GDI_BRUSH_TYPE << GDI_HANDLE_TYPE_SHIFT;
+pub const GDI_CLIENT_CLIENTOBJ_TYPE: ULONG = GDI_CLIENTOBJ_TYPE << GDI_HANDLE_TYPE_SHIFT;
+pub const GDI_CLIENT_DC_TYPE: ULONG = GDI_DC_TYPE << GDI_HANDLE_TYPE_SHIFT;
+pub const GDI_CLIENT_FONT_TYPE: ULONG = GDI_LFONT_TYPE << GDI_HANDLE_TYPE_SHIFT;
+pub const GDI_CLIENT_PALETTE_TYPE: ULONG = GDI_PAL_TYPE << GDI_HANDLE_TYPE_SHIFT;
+pub const GDI_CLIENT_REGION_TYPE: ULONG = GDI_RGN_TYPE << GDI_HANDLE_TYPE_SHIFT;
+pub const GDI_CLIENT_ALTDC_TYPE: ULONG = GDI_CLIENT_DC_TYPE | GDI_ALTTYPE_1;
+pub const GDI_CLIENT_DIBSECTION_TYPE: ULONG = GDI_CLIENT_BITMAP_TYPE | GDI_ALTTYPE_1;
+pub const GDI_CLIENT_EXTPEN_TYPE: ULONG = GDI_CLIENT_BRUSH_TYPE | GDI_ALTTYPE_2;
+pub const GDI_CLIENT_METADC16_TYPE: ULONG = GDI_CLIENT_CLIENTOBJ_TYPE | GDI_ALTTYPE_3;
+pub const GDI_CLIENT_METAFILE_TYPE: ULONG = GDI_CLIENT_CLIENTOBJ_TYPE | GDI_ALTTYPE_2;
+pub const GDI_CLIENT_METAFILE16_TYPE: ULONG = GDI_CLIENT_CLIENTOBJ_TYPE | GDI_ALTTYPE_1;
+pub const GDI_CLIENT_PEN_TYPE: ULONG = GDI_CLIENT_BRUSH_TYPE | GDI_ALTTYPE_1;
+UNION!{union GDI_HANDLE_ENTRY_u {
+    Object: PVOID,
+    NextFree: PVOID,
+}}
+STRUCT!{struct GDI_HANDLE_ENTRY_Owner_s {
+    ProcessId: USHORT,
+    Bitfields: USHORT,
+}}
+BITFIELD!{GDI_HANDLE_ENTRY_Owner_s Bitfields: USHORT [
+    Lock set_Lock[0..1],
+    Count set_Count[1..16],
+]}
+UNION!{union GDI_HANDLE_ENTRY_Owner {
+    s: GDI_HANDLE_ENTRY_Owner_s,
+    Value: ULONG,
+}}
+STRUCT!{struct GDI_HANDLE_ENTRY {
+    u: GDI_HANDLE_ENTRY_u,
+    Owner: GDI_HANDLE_ENTRY_Owner,
+    Unique: USHORT,
+    Type: UCHAR,
+    Flags: UCHAR,
+    UserPointer: PVOID,
+}}
+pub type PGDI_HANDLE_ENTRY = *mut GDI_HANDLE_ENTRY;
+STRUCT!{struct GDI_SHARED_MEMORY {
+    Handles: [GDI_HANDLE_ENTRY; GDI_MAX_HANDLE_COUNT],
+}}
+pub type PGDI_SHARED_MEMORY = *mut GDI_SHARED_MEMORY;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntioapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntioapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntioapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntioapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1464 @@
+use crate::string::UTF16Const;
+use crate::winapi_local::um::winioctl::CTL_CODE;
+use winapi::shared::basetsd::ULONG_PTR;
+use winapi::shared::guiddef::GUID;
+use winapi::shared::minwindef::DWORD;
+use winapi::shared::ntdef::{
+    BOOLEAN, CCHAR, CHAR, HANDLE, LARGE_INTEGER, LONG, LONGLONG, NTSTATUS, PBOOLEAN, PHANDLE,
+    PLARGE_INTEGER, POBJECT_ATTRIBUTES, PUCHAR, PULONG, PUNICODE_STRING, PVOID, UCHAR, ULONG,
+    ULONGLONG, USHORT, WCHAR,
+};
+use winapi::um::winioctl::{
+    FILE_ANY_ACCESS, FILE_DEVICE_MAILSLOT, FILE_DEVICE_NAMED_PIPE, METHOD_BUFFERED, METHOD_NEITHER,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, FILE_ID_128, FILE_READ_DATA, FILE_WRITE_DATA, PFILE_SEGMENT_ELEMENT, PSID, SID,
+};
+pub const FILE_SUPERSEDE: ULONG = 0x00000000;
+pub const FILE_OPEN: ULONG = 0x00000001;
+pub const FILE_CREATE: ULONG = 0x00000002;
+pub const FILE_OPEN_IF: ULONG = 0x00000003;
+pub const FILE_OVERWRITE: ULONG = 0x00000004;
+pub const FILE_OVERWRITE_IF: ULONG = 0x00000005;
+pub const FILE_MAXIMUM_DISPOSITION: ULONG = 0x00000005;
+pub const FILE_DIRECTORY_FILE: ULONG = 0x00000001;
+pub const FILE_WRITE_THROUGH: ULONG = 0x00000002;
+pub const FILE_SEQUENTIAL_ONLY: ULONG = 0x00000004;
+pub const FILE_NO_INTERMEDIATE_BUFFERING: ULONG = 0x00000008;
+pub const FILE_SYNCHRONOUS_IO_ALERT: ULONG = 0x00000010;
+pub const FILE_SYNCHRONOUS_IO_NONALERT: ULONG = 0x00000020;
+pub const FILE_NON_DIRECTORY_FILE: ULONG = 0x00000040;
+pub const FILE_CREATE_TREE_CONNECTION: ULONG = 0x00000080;
+pub const FILE_COMPLETE_IF_OPLOCKED: ULONG = 0x00000100;
+pub const FILE_NO_EA_KNOWLEDGE: ULONG = 0x00000200;
+pub const FILE_OPEN_FOR_RECOVERY: ULONG = 0x00000400;
+pub const FILE_RANDOM_ACCESS: ULONG = 0x00000800;
+pub const FILE_DELETE_ON_CLOSE: ULONG = 0x00001000;
+pub const FILE_OPEN_BY_FILE_ID: ULONG = 0x00002000;
+pub const FILE_OPEN_FOR_BACKUP_INTENT: ULONG = 0x00004000;
+pub const FILE_NO_COMPRESSION: ULONG = 0x00008000;
+pub const FILE_OPEN_REQUIRING_OPLOCK: ULONG = 0x00010000;
+pub const FILE_DISALLOW_EXCLUSIVE: ULONG = 0x00020000;
+pub const FILE_SESSION_AWARE: ULONG = 0x00040000;
+pub const FILE_RESERVE_OPFILTER: ULONG = 0x00100000;
+pub const FILE_OPEN_REPARSE_POINT: ULONG = 0x00200000;
+pub const FILE_OPEN_NO_RECALL: ULONG = 0x00400000;
+pub const FILE_OPEN_FOR_FREE_SPACE_QUERY: ULONG = 0x00800000;
+pub const FILE_COPY_STRUCTURED_STORAGE: ULONG = 0x00000041;
+pub const FILE_STRUCTURED_STORAGE: ULONG = 0x00000441;
+pub const FILE_SUPERSEDED: ULONG = 0x00000000;
+pub const FILE_OPENED: ULONG = 0x00000001;
+pub const FILE_CREATED: ULONG = 0x00000002;
+pub const FILE_OVERWRITTEN: ULONG = 0x00000003;
+pub const FILE_EXISTS: ULONG = 0x00000004;
+pub const FILE_DOES_NOT_EXIST: ULONG = 0x00000005;
+pub const FILE_WRITE_TO_END_OF_FILE: ULONG = 0xffffffff;
+pub const FILE_USE_FILE_POINTER_POSITION: ULONG = 0xfffffffe;
+pub const FILE_BYTE_ALIGNMENT: ULONG = 0x00000000;
+pub const FILE_WORD_ALIGNMENT: ULONG = 0x00000001;
+pub const FILE_LONG_ALIGNMENT: ULONG = 0x00000003;
+pub const FILE_QUAD_ALIGNMENT: ULONG = 0x00000007;
+pub const FILE_OCTA_ALIGNMENT: ULONG = 0x0000000f;
+pub const FILE_32_BYTE_ALIGNMENT: ULONG = 0x0000001f;
+pub const FILE_64_BYTE_ALIGNMENT: ULONG = 0x0000003f;
+pub const FILE_128_BYTE_ALIGNMENT: ULONG = 0x0000007f;
+pub const FILE_256_BYTE_ALIGNMENT: ULONG = 0x000000ff;
+pub const FILE_512_BYTE_ALIGNMENT: ULONG = 0x000001ff;
+pub const MAXIMUM_FILENAME_LENGTH: u32 = 256;
+pub const FILE_NEED_EA: ULONG = 0x00000080;
+pub const FILE_EA_TYPE_BINARY: ULONG = 0xfffe;
+pub const FILE_EA_TYPE_ASCII: ULONG = 0xfffd;
+pub const FILE_EA_TYPE_BITMAP: ULONG = 0xfffb;
+pub const FILE_EA_TYPE_METAFILE: ULONG = 0xfffa;
+pub const FILE_EA_TYPE_ICON: ULONG = 0xfff9;
+pub const FILE_EA_TYPE_EA: ULONG = 0xffee;
+pub const FILE_EA_TYPE_MVMT: ULONG = 0xffdf;
+pub const FILE_EA_TYPE_MVST: ULONG = 0xffde;
+pub const FILE_EA_TYPE_ASN1: ULONG = 0xffdd;
+pub const FILE_EA_TYPE_FAMILY_IDS: ULONG = 0xff01;
+pub const FILE_REMOVABLE_MEDIA: ULONG = 0x00000001;
+pub const FILE_READ_ONLY_DEVICE: ULONG = 0x00000002;
+pub const FILE_FLOPPY_DISKETTE: ULONG = 0x00000004;
+pub const FILE_WRITE_ONCE_MEDIA: ULONG = 0x00000008;
+pub const FILE_REMOTE_DEVICE: ULONG = 0x00000010;
+pub const FILE_DEVICE_IS_MOUNTED: ULONG = 0x00000020;
+pub const FILE_VIRTUAL_VOLUME: ULONG = 0x00000040;
+pub const FILE_AUTOGENERATED_DEVICE_NAME: ULONG = 0x00000080;
+pub const FILE_DEVICE_SECURE_OPEN: ULONG = 0x00000100;
+pub const FILE_CHARACTERISTIC_PNP_DEVICE: ULONG = 0x00000800;
+pub const FILE_CHARACTERISTIC_TS_DEVICE: ULONG = 0x00001000;
+pub const FILE_CHARACTERISTIC_WEBDAV_DEVICE: ULONG = 0x00002000;
+pub const FILE_CHARACTERISTIC_CSV: ULONG = 0x00010000;
+pub const FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL: ULONG = 0x00020000;
+pub const FILE_PORTABLE_DEVICE: ULONG = 0x00040000;
+pub const FILE_PIPE_BYTE_STREAM_TYPE: ULONG = 0x00000000;
+pub const FILE_PIPE_MESSAGE_TYPE: ULONG = 0x00000001;
+pub const FILE_PIPE_ACCEPT_REMOTE_CLIENTS: ULONG = 0x00000000;
+pub const FILE_PIPE_REJECT_REMOTE_CLIENTS: ULONG = 0x00000002;
+pub const FILE_PIPE_TYPE_VALID_MASK: ULONG = 0x00000003;
+pub const FILE_PIPE_QUEUE_OPERATION: ULONG = 0x00000000;
+pub const FILE_PIPE_COMPLETE_OPERATION: ULONG = 0x00000001;
+pub const FILE_PIPE_BYTE_STREAM_MODE: ULONG = 0x00000000;
+pub const FILE_PIPE_MESSAGE_MODE: ULONG = 0x00000001;
+pub const FILE_PIPE_INBOUND: ULONG = 0x00000000;
+pub const FILE_PIPE_OUTBOUND: ULONG = 0x00000001;
+pub const FILE_PIPE_FULL_DUPLEX: ULONG = 0x00000002;
+pub const FILE_PIPE_DISCONNECTED_STATE: ULONG = 0x00000001;
+pub const FILE_PIPE_LISTENING_STATE: ULONG = 0x00000002;
+pub const FILE_PIPE_CONNECTED_STATE: ULONG = 0x00000003;
+pub const FILE_PIPE_CLOSING_STATE: ULONG = 0x00000004;
+pub const FILE_PIPE_CLIENT_END: ULONG = 0x00000000;
+pub const FILE_PIPE_SERVER_END: ULONG = 0x00000001;
+pub const MAILSLOT_SIZE_AUTO: u32 = 0;
+UNION!{union IO_STATUS_BLOCK_u {
+    Status: NTSTATUS,
+    Pointer: PVOID,
+}}
+STRUCT!{struct IO_STATUS_BLOCK {
+    u: IO_STATUS_BLOCK_u,
+    Information: ULONG_PTR,
+}}
+pub type PIO_STATUS_BLOCK = *mut IO_STATUS_BLOCK;
+FN!{stdcall PIO_APC_ROUTINE(
+    ApcContext: PVOID,
+    IoStatusBlock: PIO_STATUS_BLOCK,
+    Reserved: ULONG,
+) -> ()}
+STRUCT!{struct FILE_IO_COMPLETION_INFORMATION {
+    KeyContext: PVOID,
+    ApcContext: PVOID,
+    IoStatusBlock: IO_STATUS_BLOCK,
+}}
+pub type PFILE_IO_COMPLETION_INFORMATION = *mut FILE_IO_COMPLETION_INFORMATION;
+ENUM!{enum FILE_INFORMATION_CLASS {
+    FileDirectoryInformation = 1,
+    FileFullDirectoryInformation = 2,
+    FileBothDirectoryInformation = 3,
+    FileBasicInformation = 4,
+    FileStandardInformation = 5,
+    FileInternalInformation = 6,
+    FileEaInformation = 7,
+    FileAccessInformation = 8,
+    FileNameInformation = 9,
+    FileRenameInformation = 10,
+    FileLinkInformation = 11,
+    FileNamesInformation = 12,
+    FileDispositionInformation = 13,
+    FilePositionInformation = 14,
+    FileFullEaInformation = 15,
+    FileModeInformation = 16,
+    FileAlignmentInformation = 17,
+    FileAllInformation = 18,
+    FileAllocationInformation = 19,
+    FileEndOfFileInformation = 20,
+    FileAlternateNameInformation = 21,
+    FileStreamInformation = 22,
+    FilePipeInformation = 23,
+    FilePipeLocalInformation = 24,
+    FilePipeRemoteInformation = 25,
+    FileMailslotQueryInformation = 26,
+    FileMailslotSetInformation = 27,
+    FileCompressionInformation = 28,
+    FileObjectIdInformation = 29,
+    FileCompletionInformation = 30,
+    FileMoveClusterInformation = 31,
+    FileQuotaInformation = 32,
+    FileReparsePointInformation = 33,
+    FileNetworkOpenInformation = 34,
+    FileAttributeTagInformation = 35,
+    FileTrackingInformation = 36,
+    FileIdBothDirectoryInformation = 37,
+    FileIdFullDirectoryInformation = 38,
+    FileValidDataLengthInformation = 39,
+    FileShortNameInformation = 40,
+    FileIoCompletionNotificationInformation = 41,
+    FileIoStatusBlockRangeInformation = 42,
+    FileIoPriorityHintInformation = 43,
+    FileSfioReserveInformation = 44,
+    FileSfioVolumeInformation = 45,
+    FileHardLinkInformation = 46,
+    FileProcessIdsUsingFileInformation = 47,
+    FileNormalizedNameInformation = 48,
+    FileNetworkPhysicalNameInformation = 49,
+    FileIdGlobalTxDirectoryInformation = 50,
+    FileIsRemoteDeviceInformation = 51,
+    FileUnusedInformation = 52,
+    FileNumaNodeInformation = 53,
+    FileStandardLinkInformation = 54,
+    FileRemoteProtocolInformation = 55,
+    FileRenameInformationBypassAccessCheck = 56,
+    FileLinkInformationBypassAccessCheck = 57,
+    FileVolumeNameInformation = 58,
+    FileIdInformation = 59,
+    FileIdExtdDirectoryInformation = 60,
+    FileReplaceCompletionInformation = 61,
+    FileHardLinkFullIdInformation = 62,
+    FileIdExtdBothDirectoryInformation = 63,
+    FileDispositionInformationEx = 64,
+    FileRenameInformationEx = 65,
+    FileRenameInformationExBypassAccessCheck = 66,
+    FileDesiredStorageClassInformation = 67,
+    FileStatInformation = 68,
+    FileMemoryPartitionInformation = 69,
+    FileStatLxInformation = 70,
+    FileCaseSensitiveInformation = 71,
+    FileLinkInformationEx = 72,
+    FileLinkInformationExBypassAccessCheck = 73,
+    FileStorageReserveIdInformation = 74,
+    FileCaseSensitiveInformationForceAccessCheck = 75,
+    FileMaximumInformation = 76,
+}}
+pub type PFILE_INFORMATION_CLASS = *mut FILE_INFORMATION_CLASS;
+STRUCT!{struct FILE_BASIC_INFORMATION {
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    FileAttributes: ULONG,
+}}
+pub type PFILE_BASIC_INFORMATION = *mut FILE_BASIC_INFORMATION;
+STRUCT!{struct FILE_STANDARD_INFORMATION {
+    AllocationSize: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    NumberOfLinks: ULONG,
+    DeletePending: BOOLEAN,
+    Directory: BOOLEAN,
+}}
+pub type PFILE_STANDARD_INFORMATION = *mut FILE_STANDARD_INFORMATION;
+STRUCT!{struct FILE_STANDARD_INFORMATION_EX {
+    AllocationSize: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    NumberOfLinks: ULONG,
+    DeletePending: BOOLEAN,
+    Directory: BOOLEAN,
+    AlternateStream: BOOLEAN,
+    MetadataAttribute: BOOLEAN,
+}}
+pub type PFILE_STANDARD_INFORMATION_EX = *mut FILE_STANDARD_INFORMATION_EX;
+STRUCT!{struct FILE_INTERNAL_INFORMATION {
+    IndexNumber: LARGE_INTEGER,
+}}
+pub type PFILE_INTERNAL_INFORMATION = *mut FILE_INTERNAL_INFORMATION;
+STRUCT!{struct FILE_EA_INFORMATION {
+    EaSize: ULONG,
+}}
+pub type PFILE_EA_INFORMATION = *mut FILE_EA_INFORMATION;
+STRUCT!{struct FILE_ACCESS_INFORMATION {
+    AccessFlags: ACCESS_MASK,
+}}
+pub type PFILE_ACCESS_INFORMATION = *mut FILE_ACCESS_INFORMATION;
+STRUCT!{struct FILE_POSITION_INFORMATION {
+    CurrentByteOffset: LARGE_INTEGER,
+}}
+pub type PFILE_POSITION_INFORMATION = *mut FILE_POSITION_INFORMATION;
+STRUCT!{struct FILE_MODE_INFORMATION {
+    Mode: ULONG,
+}}
+pub type PFILE_MODE_INFORMATION = *mut FILE_MODE_INFORMATION;
+STRUCT!{struct FILE_ALIGNMENT_INFORMATION {
+    AlignmentRequirement: ULONG,
+}}
+pub type PFILE_ALIGNMENT_INFORMATION = *mut FILE_ALIGNMENT_INFORMATION;
+STRUCT!{struct FILE_NAME_INFORMATION {
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_NAME_INFORMATION = *mut FILE_NAME_INFORMATION;
+STRUCT!{struct FILE_ALL_INFORMATION {
+    BasicInformation: FILE_BASIC_INFORMATION,
+    StandardInformation: FILE_STANDARD_INFORMATION,
+    InternalInformation: FILE_INTERNAL_INFORMATION,
+    EaInformation: FILE_EA_INFORMATION,
+    AccessInformation: FILE_ACCESS_INFORMATION,
+    PositionInformation: FILE_POSITION_INFORMATION,
+    ModeInformation: FILE_MODE_INFORMATION,
+    AlignmentInformation: FILE_ALIGNMENT_INFORMATION,
+    NameInformation: FILE_NAME_INFORMATION,
+}}
+pub type PFILE_ALL_INFORMATION = *mut FILE_ALL_INFORMATION;
+STRUCT!{struct FILE_NETWORK_OPEN_INFORMATION {
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    FileAttributes: ULONG,
+}}
+pub type PFILE_NETWORK_OPEN_INFORMATION = *mut FILE_NETWORK_OPEN_INFORMATION;
+STRUCT!{struct FILE_ATTRIBUTE_TAG_INFORMATION {
+    FileAttributes: ULONG,
+    ReparseTag: ULONG,
+}}
+pub type PFILE_ATTRIBUTE_TAG_INFORMATION = *mut FILE_ATTRIBUTE_TAG_INFORMATION;
+STRUCT!{struct FILE_ALLOCATION_INFORMATION {
+    AllocationSize: LARGE_INTEGER,
+}}
+pub type PFILE_ALLOCATION_INFORMATION = *mut FILE_ALLOCATION_INFORMATION;
+STRUCT!{struct FILE_COMPRESSION_INFORMATION {
+    CompressedFileSize: LARGE_INTEGER,
+    CompressionFormat: USHORT,
+    CompressionUnitShift: UCHAR,
+    ChunkShift: UCHAR,
+    ClusterShift: UCHAR,
+    Reserved: [UCHAR; 3],
+}}
+pub type PFILE_COMPRESSION_INFORMATION = *mut FILE_COMPRESSION_INFORMATION;
+STRUCT!{struct FILE_DISPOSITION_INFORMATION {
+    DeleteFileA: BOOLEAN,
+}}
+pub type PFILE_DISPOSITION_INFORMATION = *mut FILE_DISPOSITION_INFORMATION;
+STRUCT!{struct FILE_END_OF_FILE_INFORMATION {
+    EndOfFile: LARGE_INTEGER,
+}}
+pub type PFILE_END_OF_FILE_INFORMATION = *mut FILE_END_OF_FILE_INFORMATION;
+STRUCT!{struct FILE_VALID_DATA_LENGTH_INFORMATION {
+    ValidDataLength: LARGE_INTEGER,
+}}
+pub type PFILE_VALID_DATA_LENGTH_INFORMATION = *mut FILE_VALID_DATA_LENGTH_INFORMATION;
+STRUCT!{struct FILE_LINK_INFORMATION {
+    ReplaceIfExists: BOOLEAN,
+    RootDirectory: HANDLE,
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_LINK_INFORMATION = *mut FILE_LINK_INFORMATION;
+STRUCT!{struct FILE_MOVE_CLUSTER_INFORMATION {
+    ClusterCount: ULONG,
+    RootDirectory: HANDLE,
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_MOVE_CLUSTER_INFORMATION = *mut FILE_MOVE_CLUSTER_INFORMATION;
+STRUCT!{struct FILE_RENAME_INFORMATION {
+    ReplaceIfExists: BOOLEAN,
+    RootDirectory: HANDLE,
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_RENAME_INFORMATION = *mut FILE_RENAME_INFORMATION;
+STRUCT!{struct FILE_STREAM_INFORMATION {
+    NextEntryOffset: ULONG,
+    StreamNameLength: ULONG,
+    StreamSize: LARGE_INTEGER,
+    StreamAllocationSize: LARGE_INTEGER,
+    StreamName: [WCHAR; 1],
+}}
+pub type PFILE_STREAM_INFORMATION = *mut FILE_STREAM_INFORMATION;
+STRUCT!{struct FILE_TRACKING_INFORMATION {
+    DestinationFile: HANDLE,
+    ObjectInformationLength: ULONG,
+    ObjectInformation: [CHAR; 1],
+}}
+pub type PFILE_TRACKING_INFORMATION = *mut FILE_TRACKING_INFORMATION;
+STRUCT!{struct FILE_COMPLETION_INFORMATION {
+    Port: HANDLE,
+    Key: PVOID,
+}}
+pub type PFILE_COMPLETION_INFORMATION = *mut FILE_COMPLETION_INFORMATION;
+STRUCT!{struct FILE_PIPE_INFORMATION {
+    ReadMode: ULONG,
+    CompletionMode: ULONG,
+}}
+pub type PFILE_PIPE_INFORMATION = *mut FILE_PIPE_INFORMATION;
+STRUCT!{struct FILE_PIPE_LOCAL_INFORMATION {
+    NamedPipeType: ULONG,
+    NamedPipeConfiguration: ULONG,
+    MaximumInstances: ULONG,
+    CurrentInstances: ULONG,
+    InboundQuota: ULONG,
+    ReadDataAvailable: ULONG,
+    OutboundQuota: ULONG,
+    WriteQuotaAvailable: ULONG,
+    NamedPipeState: ULONG,
+    NamedPipeEnd: ULONG,
+}}
+pub type PFILE_PIPE_LOCAL_INFORMATION = *mut FILE_PIPE_LOCAL_INFORMATION;
+STRUCT!{struct FILE_PIPE_REMOTE_INFORMATION {
+    CollectDataTime: LARGE_INTEGER,
+    MaximumCollectionCount: ULONG,
+}}
+pub type PFILE_PIPE_REMOTE_INFORMATION = *mut FILE_PIPE_REMOTE_INFORMATION;
+STRUCT!{struct FILE_MAILSLOT_QUERY_INFORMATION {
+    MaximumMessageSize: ULONG,
+    MailslotQuota: ULONG,
+    NextMessageSize: ULONG,
+    MessagesAvailable: ULONG,
+    ReadTimeout: LARGE_INTEGER,
+}}
+pub type PFILE_MAILSLOT_QUERY_INFORMATION = *mut FILE_MAILSLOT_QUERY_INFORMATION;
+STRUCT!{struct FILE_MAILSLOT_SET_INFORMATION {
+    ReadTimeout: PLARGE_INTEGER,
+}}
+pub type PFILE_MAILSLOT_SET_INFORMATION = *mut FILE_MAILSLOT_SET_INFORMATION;
+STRUCT!{struct FILE_REPARSE_POINT_INFORMATION {
+    FileReference: LONGLONG,
+    Tag: ULONG,
+}}
+pub type PFILE_REPARSE_POINT_INFORMATION = *mut FILE_REPARSE_POINT_INFORMATION;
+STRUCT!{struct FILE_LINK_ENTRY_INFORMATION {
+    NextEntryOffset: ULONG,
+    ParentFileId: LONGLONG,
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_LINK_ENTRY_INFORMATION = *mut FILE_LINK_ENTRY_INFORMATION;
+STRUCT!{struct FILE_LINKS_INFORMATION {
+    BytesNeeded: ULONG,
+    EntriesReturned: ULONG,
+    Entry: FILE_LINK_ENTRY_INFORMATION,
+}}
+pub type PFILE_LINKS_INFORMATION = *mut FILE_LINKS_INFORMATION;
+STRUCT!{struct FILE_NETWORK_PHYSICAL_NAME_INFORMATION {
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_NETWORK_PHYSICAL_NAME_INFORMATION = *mut FILE_NETWORK_PHYSICAL_NAME_INFORMATION;
+STRUCT!{struct FILE_STANDARD_LINK_INFORMATION {
+    NumberOfAccessibleLinks: ULONG,
+    TotalNumberOfLinks: ULONG,
+    DeletePending: BOOLEAN,
+    Directory: BOOLEAN,
+}}
+pub type PFILE_STANDARD_LINK_INFORMATION = *mut FILE_STANDARD_LINK_INFORMATION;
+STRUCT!{struct FILE_SFIO_RESERVE_INFORMATION {
+    RequestsPerPeriod: ULONG,
+    Period: ULONG,
+    RetryFailures: BOOLEAN,
+    Discardable: BOOLEAN,
+    RequestSize: ULONG,
+    NumOutstandingRequests: ULONG,
+}}
+pub type PFILE_SFIO_RESERVE_INFORMATION = *mut FILE_SFIO_RESERVE_INFORMATION;
+STRUCT!{struct FILE_SFIO_VOLUME_INFORMATION {
+    MaximumRequestsPerPeriod: ULONG,
+    MinimumPeriod: ULONG,
+    MinimumTransferSize: ULONG,
+}}
+pub type PFILE_SFIO_VOLUME_INFORMATION = *mut FILE_SFIO_VOLUME_INFORMATION;
+ENUM!{enum IO_PRIORITY_HINT {
+    IoPriorityVeryLow = 0,
+    IoPriorityLow = 1,
+    IoPriorityNormal = 2,
+    IoPriorityHigh = 3,
+    IoPriorityCritical = 4,
+    MaxIoPriorityTypes = 5,
+}}
+STRUCT!{struct FILE_IO_PRIORITY_HINT_INFORMATION {
+    PriorityHint: IO_PRIORITY_HINT,
+}}
+pub type PFILE_IO_PRIORITY_HINT_INFORMATION = *mut FILE_IO_PRIORITY_HINT_INFORMATION;
+STRUCT!{struct FILE_IO_PRIORITY_HINT_INFORMATION_EX {
+    PriorityHint: IO_PRIORITY_HINT,
+    BoostOutstanding: BOOLEAN,
+}}
+pub type PFILE_IO_PRIORITY_HINT_INFORMATION_EX = *mut FILE_IO_PRIORITY_HINT_INFORMATION_EX;
+pub const FILE_SKIP_COMPLETION_PORT_ON_SUCCESS: u32 = 0x1;
+pub const FILE_SKIP_SET_EVENT_ON_HANDLE: u32 = 0x2;
+pub const FILE_SKIP_SET_USER_EVENT_ON_FAST_IO: u32 = 0x4;
+STRUCT!{struct FILE_IO_COMPLETION_NOTIFICATION_INFORMATION {
+    Flags: ULONG,
+}}
+pub type PFILE_IO_COMPLETION_NOTIFICATION_INFORMATION =
+    *mut FILE_IO_COMPLETION_NOTIFICATION_INFORMATION;
+STRUCT!{struct FILE_PROCESS_IDS_USING_FILE_INFORMATION {
+    NumberOfProcessIdsInList: ULONG,
+    ProcessIdList: [ULONG_PTR; 1],
+}}
+pub type PFILE_PROCESS_IDS_USING_FILE_INFORMATION = *mut FILE_PROCESS_IDS_USING_FILE_INFORMATION;
+STRUCT!{struct FILE_IS_REMOTE_DEVICE_INFORMATION {
+    IsRemote: BOOLEAN,
+}}
+pub type PFILE_IS_REMOTE_DEVICE_INFORMATION = *mut FILE_IS_REMOTE_DEVICE_INFORMATION;
+STRUCT!{struct FILE_NUMA_NODE_INFORMATION {
+    NodeNumber: USHORT,
+}}
+pub type PFILE_NUMA_NODE_INFORMATION = *mut FILE_NUMA_NODE_INFORMATION;
+STRUCT!{struct FILE_IOSTATUSBLOCK_RANGE_INFORMATION {
+    IoStatusBlockRange: PUCHAR,
+    Length: ULONG,
+}}
+pub type PFILE_IOSTATUSBLOCK_RANGE_INFORMATION = *mut FILE_IOSTATUSBLOCK_RANGE_INFORMATION;
+STRUCT!{struct FILE_REMOTE_PROTOCOL_INFORMATION_GenericReserved {
+    Reserved: [ULONG; 8],
+}}
+STRUCT!{struct FILE_REMOTE_PROTOCOL_INFORMATION_ProtocolSpecific_Smb2_Server {
+    Capabilities: ULONG,
+}}
+STRUCT!{struct FILE_REMOTE_PROTOCOL_INFORMATION_ProtocolSpecific_Smb2_Share {
+    Capabilities: ULONG,
+    CachingFlags: ULONG,
+}}
+STRUCT!{struct FILE_REMOTE_PROTOCOL_INFORMATION_ProtocolSpecific_Smb2 {
+    Server: FILE_REMOTE_PROTOCOL_INFORMATION_ProtocolSpecific_Smb2_Server,
+    Share: FILE_REMOTE_PROTOCOL_INFORMATION_ProtocolSpecific_Smb2_Share,
+}}
+UNION!{union FILE_REMOTE_PROTOCOL_INFORMATION_ProtocolSpecific {
+    Smb2: FILE_REMOTE_PROTOCOL_INFORMATION_ProtocolSpecific_Smb2,
+    Reserved: [ULONG; 16],
+}}
+STRUCT!{struct FILE_REMOTE_PROTOCOL_INFORMATION {
+    StructureVersion: USHORT,
+    StructureSize: USHORT,
+    Protocol: ULONG,
+    ProtocolMajorVersion: USHORT,
+    ProtocolMinorVersion: USHORT,
+    ProtocolRevision: USHORT,
+    Reserved: USHORT,
+    Flags: ULONG,
+    GenericReserved: FILE_REMOTE_PROTOCOL_INFORMATION_GenericReserved,
+    ProtocolSpecific: FILE_REMOTE_PROTOCOL_INFORMATION_ProtocolSpecific,
+}}
+pub type PFILE_REMOTE_PROTOCOL_INFORMATION = *mut FILE_REMOTE_PROTOCOL_INFORMATION;
+pub const CHECKSUM_ENFORCEMENT_OFF: u32 = 0x00000001;
+STRUCT!{struct FILE_INTEGRITY_STREAM_INFORMATION {
+    ChecksumAlgorithm: USHORT,
+    ChecksumChunkShift: UCHAR,
+    ClusterShift: UCHAR,
+    Flags: ULONG,
+}}
+pub type PFILE_INTEGRITY_STREAM_INFORMATION = *mut FILE_INTEGRITY_STREAM_INFORMATION;
+STRUCT!{struct FILE_VOLUME_NAME_INFORMATION {
+    DeviceNameLength: ULONG,
+    DeviceName: [WCHAR; 1],
+}}
+pub type PFILE_VOLUME_NAME_INFORMATION = *mut FILE_VOLUME_NAME_INFORMATION;
+STRUCT!{struct FILE_ID_INFORMATION {
+    VolumeSerialNumber: ULONGLONG,
+    FileId: FILE_ID_128,
+}}
+pub type PFILE_ID_INFORMATION = *mut FILE_ID_INFORMATION;
+STRUCT!{struct FILE_ID_EXTD_DIR_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    FileNameLength: ULONG,
+    EaSize: ULONG,
+    ReparsePointTag: ULONG,
+    FileId: FILE_ID_128,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_ID_EXTD_DIR_INFORMATION = *mut FILE_ID_EXTD_DIR_INFORMATION;
+STRUCT!{struct FILE_LINK_ENTRY_FULL_ID_INFORMATION {
+    NextEntryOffset: ULONG,
+    ParentFileId: FILE_ID_128,
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_LINK_ENTRY_FULL_ID_INFORMATION = *mut FILE_LINK_ENTRY_FULL_ID_INFORMATION;
+STRUCT!{struct FILE_ID_EXTD_BOTH_DIR_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    FileNameLength: ULONG,
+    EaSize: ULONG,
+    ReparsePointTag: ULONG,
+    FileId: FILE_ID_128,
+    ShortNameLength: CCHAR,
+    ShortName: [WCHAR; 12],
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_ID_EXTD_BOTH_DIR_INFORMATION = *mut FILE_ID_EXTD_BOTH_DIR_INFORMATION;
+STRUCT!{struct FILE_STAT_INFORMATION {
+    FileId: LARGE_INTEGER,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    ReparseTag: ULONG,
+    NumberOfLinks: ULONG,
+    EffectiveAccess: ULONG,
+}}
+pub type PFILE_STAT_INFORMATION = *mut FILE_STAT_INFORMATION;
+STRUCT!{struct FILE_MEMORY_PARTITION_INFORMATION_Flags_s {
+    NoCrossPartitionAccess: UCHAR,
+    Spare: [UCHAR; 3],
+}}
+UNION!{union FILE_MEMORY_PARTITION_INFORMATION_Flags {
+    s: FILE_MEMORY_PARTITION_INFORMATION_Flags_s,
+    AllFlags: ULONG,
+}}
+STRUCT!{struct FILE_MEMORY_PARTITION_INFORMATION {
+    OwnerPartitionHandle: HANDLE,
+    Flags: FILE_MEMORY_PARTITION_INFORMATION_Flags,
+}}
+pub type PFILE_MEMORY_PARTITION_INFORMATION = *mut FILE_MEMORY_PARTITION_INFORMATION;
+STRUCT!{struct FILE_STAT_LX_INFORMATION {
+    FileId: LARGE_INTEGER,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    ReparseTag: ULONG,
+    NumberOfLinks: ULONG,
+    EffectiveAccess: ULONG,
+    LxFlags: ULONG,
+    LxUid: ULONG,
+    LxGid: ULONG,
+    LxMode: ULONG,
+    LxDeviceIdMajor: ULONG,
+    LxDeviceIdMinor: ULONG,
+}}
+pub type PFILE_STAT_LX_INFORMATION = *mut FILE_STAT_LX_INFORMATION;
+STRUCT!{struct FILE_CASE_SENSITIVE_INFORMATION {
+    Flags: ULONG,
+}}
+pub type PFILE_CASE_SENSITIVE_INFORMATION = *mut FILE_CASE_SENSITIVE_INFORMATION;
+STRUCT!{struct FILE_DIRECTORY_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_DIRECTORY_INFORMATION = *mut FILE_DIRECTORY_INFORMATION;
+STRUCT!{struct FILE_FULL_DIR_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    FileNameLength: ULONG,
+    EaSize: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_FULL_DIR_INFORMATION = *mut FILE_FULL_DIR_INFORMATION;
+STRUCT!{struct FILE_ID_FULL_DIR_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    FileNameLength: ULONG,
+    EaSize: ULONG,
+    FileId: LARGE_INTEGER,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_ID_FULL_DIR_INFORMATION = *mut FILE_ID_FULL_DIR_INFORMATION;
+STRUCT!{struct FILE_BOTH_DIR_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    FileNameLength: ULONG,
+    EaSize: ULONG,
+    ShortNameLength: CCHAR,
+    ShortName: [WCHAR; 12],
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_BOTH_DIR_INFORMATION = *mut FILE_BOTH_DIR_INFORMATION;
+STRUCT!{struct FILE_ID_BOTH_DIR_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    FileNameLength: ULONG,
+    EaSize: ULONG,
+    ShortNameLength: CCHAR,
+    ShortName: [WCHAR; 12],
+    FileId: LARGE_INTEGER,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_ID_BOTH_DIR_INFORMATION = *mut FILE_ID_BOTH_DIR_INFORMATION;
+STRUCT!{struct FILE_NAMES_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    FileNameLength: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_NAMES_INFORMATION = *mut FILE_NAMES_INFORMATION;
+STRUCT!{struct FILE_ID_GLOBAL_TX_DIR_INFORMATION {
+    NextEntryOffset: ULONG,
+    FileIndex: ULONG,
+    CreationTime: LARGE_INTEGER,
+    LastAccessTime: LARGE_INTEGER,
+    LastWriteTime: LARGE_INTEGER,
+    ChangeTime: LARGE_INTEGER,
+    EndOfFile: LARGE_INTEGER,
+    AllocationSize: LARGE_INTEGER,
+    FileAttributes: ULONG,
+    FileNameLength: ULONG,
+    FileId: LARGE_INTEGER,
+    LockingTransactionId: GUID,
+    TxInfoFlags: ULONG,
+    FileName: [WCHAR; 1],
+}}
+pub type PFILE_ID_GLOBAL_TX_DIR_INFORMATION = *mut FILE_ID_GLOBAL_TX_DIR_INFORMATION;
+pub const FILE_ID_GLOBAL_TX_DIR_INFO_FLAG_WRITELOCKED: u32 = 0x00000001;
+pub const FILE_ID_GLOBAL_TX_DIR_INFO_FLAG_VISIBLE_TO_TX: u32 = 0x00000002;
+pub const FILE_ID_GLOBAL_TX_DIR_INFO_FLAG_VISIBLE_OUTSIDE_TX: u32 = 0x00000004;
+STRUCT!{struct FILE_OBJECTID_INFORMATION_u_s {
+    BirthVolumeId: [UCHAR; 16],
+    BirthObjectId: [UCHAR; 16],
+    DomainId: [UCHAR; 16],
+}}
+UNION!{union FILE_OBJECTID_INFORMATION_u {
+    s: FILE_OBJECTID_INFORMATION_u_s,
+    ExtendedInfo: [UCHAR; 48],
+}}
+STRUCT!{struct FILE_OBJECTID_INFORMATION {
+    FileReference: LONGLONG,
+    ObjectId: [UCHAR; 16],
+    u: FILE_OBJECTID_INFORMATION_u,
+}}
+pub type PFILE_OBJECTID_INFORMATION = *mut FILE_OBJECTID_INFORMATION;
+STRUCT!{struct FILE_FULL_EA_INFORMATION {
+    NextEntryOffset: ULONG,
+    Flags: UCHAR,
+    EaNameLength: UCHAR,
+    EaValueLength: USHORT,
+    EaName: [CHAR; 1],
+}}
+pub type PFILE_FULL_EA_INFORMATION = *mut FILE_FULL_EA_INFORMATION;
+STRUCT!{struct FILE_GET_EA_INFORMATION {
+    NextEntryOffset: ULONG,
+    EaNameLength: UCHAR,
+    EaName: [CHAR; 1],
+}}
+pub type PFILE_GET_EA_INFORMATION = *mut FILE_GET_EA_INFORMATION;
+STRUCT!{struct FILE_GET_QUOTA_INFORMATION {
+    NextEntryOffset: ULONG,
+    SidLength: ULONG,
+    Sid: SID,
+}}
+pub type PFILE_GET_QUOTA_INFORMATION = *mut FILE_GET_QUOTA_INFORMATION;
+STRUCT!{struct FILE_QUOTA_INFORMATION {
+    NextEntryOffset: ULONG,
+    SidLength: ULONG,
+    ChangeTime: LARGE_INTEGER,
+    QuotaUsed: LARGE_INTEGER,
+    QuotaThreshold: LARGE_INTEGER,
+    QuotaLimit: LARGE_INTEGER,
+    Sid: SID,
+}}
+pub type PFILE_QUOTA_INFORMATION = *mut FILE_QUOTA_INFORMATION;
+ENUM!{enum FS_INFORMATION_CLASS {
+    FileFsVolumeInformation = 1,
+    FileFsLabelInformation = 2,
+    FileFsSizeInformation = 3,
+    FileFsDeviceInformation = 4,
+    FileFsAttributeInformation = 5,
+    FileFsControlInformation = 6,
+    FileFsFullSizeInformation = 7,
+    FileFsObjectIdInformation = 8,
+    FileFsDriverPathInformation = 9,
+    FileFsVolumeFlagsInformation = 10,
+    FileFsSectorSizeInformation = 11,
+    FileFsDataCopyInformation = 12,
+    FileFsMetadataSizeInformation = 13,
+    FileFsFullSizeInformationEx = 14,
+    FileFsMaximumInformation = 15,
+}}
+pub type PFS_INFORMATION_CLASS = *mut FS_INFORMATION_CLASS;
+STRUCT!{struct FILE_FS_LABEL_INFORMATION {
+    VolumeLabelLength: ULONG,
+    VolumeLabel: [WCHAR; 1],
+}}
+pub type PFILE_FS_LABEL_INFORMATION = *mut FILE_FS_LABEL_INFORMATION;
+STRUCT!{struct FILE_FS_VOLUME_INFORMATION {
+    VolumeCreationTime: LARGE_INTEGER,
+    VolumeSerialNumber: ULONG,
+    VolumeLabelLength: ULONG,
+    SupportsObjects: BOOLEAN,
+    VolumeLabel: [WCHAR; 1],
+}}
+pub type PFILE_FS_VOLUME_INFORMATION = *mut FILE_FS_VOLUME_INFORMATION;
+STRUCT!{struct FILE_FS_SIZE_INFORMATION {
+    TotalAllocationUnits: LARGE_INTEGER,
+    AvailableAllocationUnits: LARGE_INTEGER,
+    SectorsPerAllocationUnit: ULONG,
+    BytesPerSector: ULONG,
+}}
+pub type PFILE_FS_SIZE_INFORMATION = *mut FILE_FS_SIZE_INFORMATION;
+STRUCT!{struct FILE_FS_CONTROL_INFORMATION {
+    FreeSpaceStartFiltering: LARGE_INTEGER,
+    FreeSpaceThreshold: LARGE_INTEGER,
+    FreeSpaceStopFiltering: LARGE_INTEGER,
+    DefaultQuotaThreshold: LARGE_INTEGER,
+    DefaultQuotaLimit: LARGE_INTEGER,
+    FileSystemControlFlags: ULONG,
+}}
+pub type PFILE_FS_CONTROL_INFORMATION = *mut FILE_FS_CONTROL_INFORMATION;
+STRUCT!{struct FILE_FS_FULL_SIZE_INFORMATION {
+    TotalAllocationUnits: LARGE_INTEGER,
+    CallerAvailableAllocationUnits: LARGE_INTEGER,
+    ActualAvailableAllocationUnits: LARGE_INTEGER,
+    SectorsPerAllocationUnit: ULONG,
+    BytesPerSector: ULONG,
+}}
+pub type PFILE_FS_FULL_SIZE_INFORMATION = *mut FILE_FS_FULL_SIZE_INFORMATION;
+STRUCT!{struct FILE_FS_OBJECTID_INFORMATION {
+    ObjectId: [UCHAR; 16],
+    ExtendedInfo: [UCHAR; 48],
+}}
+pub type PFILE_FS_OBJECTID_INFORMATION = *mut FILE_FS_OBJECTID_INFORMATION;
+STRUCT!{struct FILE_FS_DEVICE_INFORMATION {
+    DeviceType: DWORD,
+    Characteristics: ULONG,
+}}
+pub type PFILE_FS_DEVICE_INFORMATION = *mut FILE_FS_DEVICE_INFORMATION;
+STRUCT!{struct FILE_FS_ATTRIBUTE_INFORMATION {
+    FileSystemAttributes: ULONG,
+    MaximumComponentNameLength: LONG,
+    FileSystemNameLength: ULONG,
+    FileSystemName: [WCHAR; 1],
+}}
+pub type PFILE_FS_ATTRIBUTE_INFORMATION = *mut FILE_FS_ATTRIBUTE_INFORMATION;
+STRUCT!{struct FILE_FS_DRIVER_PATH_INFORMATION {
+    DriverInPath: BOOLEAN,
+    DriverNameLength: ULONG,
+    DriverName: [WCHAR; 1],
+}}
+pub type PFILE_FS_DRIVER_PATH_INFORMATION = *mut FILE_FS_DRIVER_PATH_INFORMATION;
+STRUCT!{struct FILE_FS_VOLUME_FLAGS_INFORMATION {
+    Flags: ULONG,
+}}
+pub type PFILE_FS_VOLUME_FLAGS_INFORMATION = *mut FILE_FS_VOLUME_FLAGS_INFORMATION;
+pub const SSINFO_FLAGS_ALIGNED_DEVICE: u32 = 0x00000001;
+pub const SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE: u32 = 0x00000002;
+pub const SSINFO_OFFSET_UNKNOWN: u32 = 0xffffffff;
+STRUCT!{struct FILE_FS_SECTOR_SIZE_INFORMATION {
+    LogicalBytesPerSector: ULONG,
+    PhysicalBytesPerSectorForAtomicity: ULONG,
+    PhysicalBytesPerSectorForPerformance: ULONG,
+    FileSystemEffectivePhysicalBytesPerSectorForAtomicity: ULONG,
+    Flags: ULONG,
+    ByteOffsetForSectorAlignment: ULONG,
+    ByteOffsetForPartitionAlignment: ULONG,
+}}
+pub type PFILE_FS_SECTOR_SIZE_INFORMATION = *mut FILE_FS_SECTOR_SIZE_INFORMATION;
+STRUCT!{struct FILE_FS_DATA_COPY_INFORMATION {
+    NumberOfCopies: ULONG,
+}}
+pub type PFILE_FS_DATA_COPY_INFORMATION = *mut FILE_FS_DATA_COPY_INFORMATION;
+STRUCT!{struct FILE_FS_METADATA_SIZE_INFORMATION {
+    TotalMetadataAllocationUnits: LARGE_INTEGER,
+    SectorsPerAllocationUnit: ULONG,
+    BytesPerSector: ULONG,
+}}
+pub type PFILE_FS_METADATA_SIZE_INFORMATION = *mut FILE_FS_METADATA_SIZE_INFORMATION;
+STRUCT!{struct FILE_FS_FULL_SIZE_INFORMATION_EX {
+    ActualTotalAllocationUnits: ULONGLONG,
+    ActualAvailableAllocationUnits: ULONGLONG,
+    ActualPoolUnavailableAllocationUnits: ULONGLONG,
+    CallerTotalAllocationUnits: ULONGLONG,
+    CallerAvailableAllocationUnits: ULONGLONG,
+    CallerPoolUnavailableAllocationUnits: ULONGLONG,
+    UsedAllocationUnits: ULONGLONG,
+    TotalReservedAllocationUnits: ULONGLONG,
+    VolumeStorageReserveAllocationUnits: ULONGLONG,
+    AvailableCommittedAllocationUnits: ULONGLONG,
+    PoolAvailableAllocationUnits: ULONGLONG,
+    SectorsPerAllocationUnit: ULONG,
+    BytesPerSector: ULONG,
+}}
+pub type PFILE_FS_FULL_SIZE_INFORMATION_EX = *mut FILE_FS_FULL_SIZE_INFORMATION_EX;
+EXTERN!{extern "system" {
+    fn NtCreateFile(
+        FileHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        AllocationSize: PLARGE_INTEGER,
+        FileAttributes: ULONG,
+        ShareAccess: ULONG,
+        CreateDisposition: ULONG,
+        CreateOptions: ULONG,
+        EaBuffer: PVOID,
+        EaLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtCreateNamedPipeFile(
+        FileHandle: PHANDLE,
+        DesiredAccess: ULONG,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        ShareAccess: ULONG,
+        CreateDisposition: ULONG,
+        CreateOptions: ULONG,
+        NamedPipeType: ULONG,
+        ReadMode: ULONG,
+        CompletionMode: ULONG,
+        MaximumInstances: ULONG,
+        InboundQuota: ULONG,
+        OutboundQuota: ULONG,
+        DefaultTimeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtCreateMailslotFile(
+        FileHandle: PHANDLE,
+        DesiredAccess: ULONG,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        CreateOptions: ULONG,
+        MailslotQuota: ULONG,
+        MaximumMessageSize: ULONG,
+        ReadTimeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtOpenFile(
+        FileHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        ShareAccess: ULONG,
+        OpenOptions: ULONG,
+    ) -> NTSTATUS;
+    fn NtDeleteFile(
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtFlushBuffersFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn NtFlushBuffersFileEx(
+        FileHandle: HANDLE,
+        Flags: ULONG,
+        Parameters: PVOID,
+        ParametersSize: ULONG,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn NtQueryInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FileInformation: PVOID,
+        Length: ULONG,
+        FileInformationClass: FILE_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn NtQueryInformationByName(
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FileInformation: PVOID,
+        Length: ULONG,
+        FileInformationClass: FILE_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn NtSetInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FileInformation: PVOID,
+        Length: ULONG,
+        FileInformationClass: FILE_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn NtQueryDirectoryFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FileInformation: PVOID,
+        Length: ULONG,
+        FileInformationClass: FILE_INFORMATION_CLASS,
+        ReturnSingleEntry: BOOLEAN,
+        FileName: PUNICODE_STRING,
+        RestartScan: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtQueryEaFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        ReturnSingleEntry: BOOLEAN,
+        EaList: PVOID,
+        EaListLength: ULONG,
+        EaIndex: PULONG,
+        RestartScan: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtSetEaFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+    ) -> NTSTATUS;
+    fn NtQueryQuotaInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        ReturnSingleEntry: BOOLEAN,
+        SidList: PVOID,
+        SidListLength: ULONG,
+        StartSid: PSID,
+        RestartScan: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtSetQuotaInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+    ) -> NTSTATUS;
+    fn NtQueryVolumeInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FsInformation: PVOID,
+        Length: ULONG,
+        FsInformationClass: FS_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn NtSetVolumeInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FsInformation: PVOID,
+        Length: ULONG,
+        FsInformationClass: FS_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn NtCancelIoFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn NtCancelIoFileEx(
+        FileHandle: HANDLE,
+        IoRequestToCancel: PIO_STATUS_BLOCK,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn NtCancelSynchronousIoFile(
+        ThreadHandle: HANDLE,
+        IoRequestToCancel: PIO_STATUS_BLOCK,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn NtDeviceIoControlFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        IoControlCode: ULONG,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        OutputBuffer: PVOID,
+        OutputBufferLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtFsControlFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FsControlCode: ULONG,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        OutputBuffer: PVOID,
+        OutputBufferLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtReadFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        ByteOffset: PLARGE_INTEGER,
+        Key: PULONG,
+    ) -> NTSTATUS;
+    fn NtWriteFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        ByteOffset: PLARGE_INTEGER,
+        Key: PULONG,
+    ) -> NTSTATUS;
+    fn NtReadFileScatter(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        SegmentArray: PFILE_SEGMENT_ELEMENT,
+        Length: ULONG,
+        ByteOffset: PLARGE_INTEGER,
+        Key: PULONG,
+    ) -> NTSTATUS;
+    fn NtWriteFileGather(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        SegmentArray: PFILE_SEGMENT_ELEMENT,
+        Length: ULONG,
+        ByteOffset: PLARGE_INTEGER,
+        Key: PULONG,
+    ) -> NTSTATUS;
+    fn NtLockFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        ByteOffset: PLARGE_INTEGER,
+        Length: PLARGE_INTEGER,
+        Key: ULONG,
+        FailImmediately: BOOLEAN,
+        ExclusiveLock: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtUnlockFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        ByteOffset: PLARGE_INTEGER,
+        Length: PLARGE_INTEGER,
+        Key: ULONG,
+    ) -> NTSTATUS;
+    fn NtQueryAttributesFile(
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        FileInformation: PFILE_BASIC_INFORMATION,
+    ) -> NTSTATUS;
+    fn NtQueryFullAttributesFile(
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        FileInformation: PFILE_NETWORK_OPEN_INFORMATION,
+    ) -> NTSTATUS;
+    fn NtNotifyChangeDirectoryFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        CompletionFilter: ULONG,
+        WatchTree: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtLoadDriver(
+        DriverServiceName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn NtUnloadDriver(
+        DriverServiceName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+}}
+pub const IO_COMPLETION_QUERY_STATE: u32 = 0x0001;
+ENUM!{enum IO_COMPLETION_INFORMATION_CLASS {
+    IoCompletionBasicInformation = 0,
+}}
+STRUCT!{struct IO_COMPLETION_BASIC_INFORMATION {
+    Depth: LONG,
+}}
+pub type PIO_COMPLETION_BASIC_INFORMATION = *mut IO_COMPLETION_BASIC_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtCreateIoCompletion(
+        IoCompletionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Count: ULONG,
+    ) -> NTSTATUS;
+    fn NtOpenIoCompletion(
+        IoCompletionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtQueryIoCompletion(
+        IoCompletionHandle: HANDLE,
+        IoCompletionInformationClass: IO_COMPLETION_INFORMATION_CLASS,
+        IoCompletionInformation: PVOID,
+        IoCompletionInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetIoCompletion(
+        IoCompletionHandle: HANDLE,
+        KeyContext: PVOID,
+        ApcContext: PVOID,
+        IoStatus: NTSTATUS,
+        IoStatusInformation: ULONG_PTR,
+    ) -> NTSTATUS;
+    fn NtSetIoCompletionEx(
+        IoCompletionHandle: HANDLE,
+        IoCompletionPacketHandle: HANDLE,
+        KeyContext: PVOID,
+        ApcContext: PVOID,
+        IoStatus: NTSTATUS,
+        IoStatusInformation: ULONG_PTR,
+    ) -> NTSTATUS;
+    fn NtRemoveIoCompletion(
+        IoCompletionHandle: HANDLE,
+        KeyContext: *mut PVOID,
+        ApcContext: *mut PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtRemoveIoCompletionEx(
+        IoCompletionHandle: HANDLE,
+        IoCompletionInformation: PFILE_IO_COMPLETION_INFORMATION,
+        Count: ULONG,
+        NumEntriesRemoved: PULONG,
+        Timeout: PLARGE_INTEGER,
+        Alertable: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtCreateWaitCompletionPacket(
+        WaitCompletionPacketHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtAssociateWaitCompletionPacket(
+        WaitCompletionPacketHandle: HANDLE,
+        IoCompletionHandle: HANDLE,
+        TargetObjectHandle: HANDLE,
+        KeyContext: PVOID,
+        ApcContext: PVOID,
+        IoStatus: NTSTATUS,
+        IoStatusInformation: ULONG_PTR,
+        AlreadySignaled: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtCancelWaitCompletionPacket(
+        WaitCompletionPacketHandle: HANDLE,
+        RemoveSignaledPacket: BOOLEAN,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum IO_SESSION_EVENT {
+    IoSessionEventIgnore = 0,
+    IoSessionEventCreated = 1,
+    IoSessionEventTerminated = 2,
+    IoSessionEventConnected = 3,
+    IoSessionEventDisconnected = 4,
+    IoSessionEventLogon = 5,
+    IoSessionEventLogoff = 6,
+    IoSessionEventMax = 7,
+}}
+ENUM!{enum IO_SESSION_STATE {
+    IoSessionStateCreated = 0,
+    IoSessionStateInitialized = 1,
+    IoSessionStateConnected = 2,
+    IoSessionStateDisconnected = 3,
+    IoSessionStateDisconnectedLoggedOn = 4,
+    IoSessionStateLoggedOn = 5,
+    IoSessionStateLoggedOff = 6,
+    IoSessionStateTerminated = 7,
+    IoSessionStateMax = 8,
+}}
+EXTERN!{extern "system" {
+    fn NtNotifyChangeSession(
+        SessionHandle: HANDLE,
+        ChangeSequenceNumber: ULONG,
+        ChangeTimeStamp: PLARGE_INTEGER,
+        Event: IO_SESSION_EVENT,
+        NewState: IO_SESSION_STATE,
+        PreviousState: IO_SESSION_STATE,
+        Payload: PVOID,
+        PayloadSize: ULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum INTERFACE_TYPE {
+    InterfaceTypeUndefined = -1i32 as u32,
+    Internal = 0,
+    Isa = 1,
+    Eisa = 2,
+    MicroChannel = 3,
+    TurboChannel = 4,
+    PCIBus = 5,
+    VMEBus = 6,
+    NuBus = 7,
+    PCMCIABus = 8,
+    CBus = 9,
+    MPIBus = 10,
+    MPSABus = 11,
+    ProcessorInternal = 12,
+    InternalPowerBus = 13,
+    PNPISABus = 14,
+    PNPBus = 15,
+    Vmcs = 16,
+    MaximumInterfaceType = 17,
+}}
+pub type PINTERFACE_TYPE = *mut INTERFACE_TYPE;
+ENUM!{enum DMA_WIDTH {
+    Width8Bits = 0,
+    Width16Bits = 1,
+    Width32Bits = 2,
+    MaximumDmaWidth = 3,
+}}
+pub type PDMA_WIDTH = *mut DMA_WIDTH;
+ENUM!{enum DMA_SPEED {
+    Compatible = 0,
+    TypeA = 1,
+    TypeB = 2,
+    TypeC = 3,
+    TypeF = 4,
+    MaximumDmaSpeed = 5,
+}}
+pub type PDMA_SPEED = *mut DMA_SPEED;
+ENUM!{enum BUS_DATA_TYPE {
+    ConfigurationSpaceUndefined = -1i32 as u32,
+    Cmos = 0,
+    EisaConfiguration = 1,
+    Pos = 2,
+    CbusConfiguration = 3,
+    PCIConfiguration = 4,
+    VMEConfiguration = 5,
+    NuBusConfiguration = 6,
+    PCMCIAConfiguration = 7,
+    MPIConfiguration = 8,
+    MPSAConfiguration = 9,
+    PNPISAConfiguration = 10,
+    SgiInternalConfiguration = 11,
+    MaximumBusDataType = 12,
+}}
+pub type PBUS_DATA_TYPE = *mut BUS_DATA_TYPE;
+pub const SYMLINK_FLAG_RELATIVE: u32 = 1;
+STRUCT!{struct REPARSE_DATA_BUFFER_u_SymbolicLinkReparseBuffer {
+    SubstituteNameOffset: USHORT,
+    SubstituteNameLength: USHORT,
+    PrintNameOffset: USHORT,
+    PrintNameLength: USHORT,
+    Flags: ULONG,
+    PathBuffer: [WCHAR; 1],
+}}
+STRUCT!{struct REPARSE_DATA_BUFFER_u_MountPointReparseBuffer {
+    SubstituteNameOffset: USHORT,
+    SubstituteNameLength: USHORT,
+    PrintNameOffset: USHORT,
+    PrintNameLength: USHORT,
+    PathBuffer: [WCHAR; 1],
+}}
+STRUCT!{struct REPARSE_DATA_BUFFER_u_GenericReparseBuffer {
+    DataBuffer: [UCHAR; 1],
+}}
+UNION!{union REPARSE_DATA_BUFFER_u {
+    SymbolicLinkReparseBuffer: REPARSE_DATA_BUFFER_u_SymbolicLinkReparseBuffer,
+    MountPointReparseBuffer: REPARSE_DATA_BUFFER_u_MountPointReparseBuffer,
+    GenericReparseBuffer: REPARSE_DATA_BUFFER_u_GenericReparseBuffer,
+}}
+STRUCT!{struct REPARSE_DATA_BUFFER {
+    ReparseTag: ULONG,
+    ReparseDataLength: USHORT,
+    Reserved: USHORT,
+    u: REPARSE_DATA_BUFFER_u,
+}}
+pub type PREPARSE_DATA_BUFFER = *mut REPARSE_DATA_BUFFER;
+/// "\Device\NamedPipe\"
+pub const DEVICE_NAMED_PIPE: UTF16Const = UTF16Const(&[
+    0x005C, 0x0044, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x005C, 0x004E, 0x0061, 0x006D, 0x0065,
+    0x0064, 0x0050, 0x0069, 0x0070, 0x0065, 0x005C, 0u16,
+]);
+pub const FSCTL_PIPE_ASSIGN_EVENT: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_DISCONNECT: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_LISTEN: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_PEEK: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 3, METHOD_BUFFERED, FILE_READ_DATA);
+pub const FSTL_PIPE_QUERY_EVENT: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_TRANSCEIVE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 5, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA);
+pub const FSTL_PIPE_WAIT: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_IMPERSONATE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_SET_CLIENT_PROCESS: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_QUERY_CLIENT_PROCESS: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_GET_PIPE_ATTRIBUTE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 10, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_SET_PIPE_ATTRIBUTE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 11, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_GET_CONNECTION_ATTRIBUTE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_SET_CONNECTION_ATTRIBUTE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 13, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_GET_HANDLE_ATTRIBUTE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 14, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_SET_HANDLE_ATTRIBUTE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 15, METHOD_BUFFERED, FILE_ANY_ACCESS);
+pub const FSTL_PIPE_FLUSH: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 16, METHOD_BUFFERED, FILE_WRITE_DATA);
+pub const FSTL_PIPE_INTERNAL_READ: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2045, METHOD_BUFFERED, FILE_READ_DATA);
+pub const FSTL_PIPE_INTERNAL_WRITE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2046, METHOD_BUFFERED, FILE_WRITE_DATA);
+pub const FSTL_PIPE_INTERNAL_TRANSCEIVE: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2047, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA);
+pub const FSTL_PIPE_INTERNAL_READ_OVFLOW: u32 =
+    CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA);
+pub const FILE_PIPE_READ_DATA: u32 = 0x00000000;
+pub const FILE_PIPE_WRITE_SPACE: u32 = 0x00000001;
+STRUCT!{struct FILE_PIPE_ASSIGN_EVENT_BUFFER {
+    EventHandle: HANDLE,
+    KeyValue: ULONG,
+}}
+pub type PFILE_PIPE_ASSIGN_EVENT_BUFFER = *mut FILE_PIPE_ASSIGN_EVENT_BUFFER;
+STRUCT!{struct FILE_PIPE_PEEK_BUFFER {
+    NamedPipeState: ULONG,
+    ReadDataAvailable: ULONG,
+    NumberOfMessages: ULONG,
+    MessageLength: ULONG,
+    Data: [CHAR; 1],
+}}
+pub type PFILE_PIPE_PEEK_BUFFER = *mut FILE_PIPE_PEEK_BUFFER;
+STRUCT!{struct FILE_PIPE_EVENT_BUFFER {
+    NamedPipeState: ULONG,
+    EntryType: ULONG,
+    ByteCount: ULONG,
+    KeyValue: ULONG,
+    NumberRequests: ULONG,
+}}
+pub type PFILE_PIPE_EVENT_BUFFER = *mut FILE_PIPE_EVENT_BUFFER;
+STRUCT!{struct FILE_PIPE_WAIT_FOR_BUFFER {
+    Timeout: LARGE_INTEGER,
+    NameLength: ULONG,
+    TimeoutSpecified: BOOLEAN,
+    Name: [WCHAR; 1],
+}}
+pub type PFILE_PIPE_WAIT_FOR_BUFFER = *mut FILE_PIPE_WAIT_FOR_BUFFER;
+STRUCT!{struct FILE_PIPE_CLIENT_PROCESS_BUFFER {
+    ClientSession: PVOID,
+    ClientProcess: PVOID,
+}}
+pub type PFILE_PIPE_CLIENT_PROCESS_BUFFER = *mut FILE_PIPE_CLIENT_PROCESS_BUFFER;
+pub const FILE_PIPE_COMPUTER_NAME_LENGTH: usize = 15;
+STRUCT!{struct FILE_PIPE_CLIENT_PROCESS_BUFFER_EX {
+    ClientSession: PVOID,
+    ClientProcess: PVOID,
+    ClientComputerNameLength: USHORT,
+    ClientComputerBuffer: [WCHAR; FILE_PIPE_COMPUTER_NAME_LENGTH + 1],
+}}
+pub type PFILE_PIPE_CLIENT_PROCESS_BUFFER_EX = *mut FILE_PIPE_CLIENT_PROCESS_BUFFER_EX;
+pub const MAILSLOT_CLASS_FIRSTCLASS: u32 = 1;
+pub const MAILSLOT_CLASS_SECONDCLASS: u32 = 2;
+pub const FSCTL_MAILSLOT_PEEK: u32 =
+    CTL_CODE(FILE_DEVICE_MAILSLOT, 0, METHOD_NEITHER, FILE_READ_DATA);
+STRUCT!{struct FILE_MAILSLOT_PEEK_BUFFER {
+    ReadDataAvailable: ULONG,
+    NumberOfMessages: ULONG,
+    MessageLength: ULONG,
+}}
+pub type PFILE_MAILSLOT_PEEK_BUFFER = *mut FILE_MAILSLOT_PEEK_BUFFER;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntkeapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntkeapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntkeapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntkeapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,121 @@
+use winapi::shared::ntdef::{BOOLEAN, NTSTATUS, PVOID, ULONG};
+pub const LOW_PRIORITY: u32 = 0;
+pub const LOW_REALTIME_PRIORITY: u32 = 16;
+pub const HIGH_PRIORITY: u32 = 31;
+pub const MAXIMUM_PRIORITY: u32 = 32;
+ENUM!{enum KTHREAD_STATE {
+    Initialized = 0,
+    Ready = 1,
+    Running = 2,
+    Standby = 3,
+    Terminated = 4,
+    Waiting = 5,
+    Transition = 6,
+    DeferredReady = 7,
+    GateWaitObsolete = 8,
+    WaitingForProcessInSwap = 9,
+    MaximumThreadState = 10,
+}}
+pub type PKTHREAD_STATE = *mut KTHREAD_STATE;
+ENUM!{enum KHETERO_CPU_POLICY {
+    KHeteroCpuPolicyAll = 0,
+    KHeteroCpuPolicyLarge = 1,
+    KHeteroCpuPolicyLargeOrIdle = 2,
+    KHeteroCpuPolicySmall = 3,
+    KHeteroCpuPolicySmallOrIdle = 4,
+    KHeteroCpuPolicyDynamic = 5,
+    KHeteroCpuPolicyStaticMax = 6,
+    KHeteroCpuPolicyBiasedSmall = 7,
+    KHeteroCpuPolicyBiasedLarge = 8,
+    KHeteroCpuPolicyDefault = 9,
+    KHeteroCpuPolicyMax = 10,
+}}
+pub type PKHETERO_CPU_POLICY = *mut KHETERO_CPU_POLICY;
+ENUM!{enum KWAIT_REASON {
+    Executive = 0,
+    FreePage = 1,
+    PageIn = 2,
+    PoolAllocation = 3,
+    DelayExecution = 4,
+    Suspended = 5,
+    UserRequest = 6,
+    WrExecutive = 7,
+    WrFreePage = 8,
+    WrPageIn = 9,
+    WrPoolAllocation = 10,
+    WrDelayExecution = 11,
+    WrSuspended = 12,
+    WrUserRequest = 13,
+    WrEventPair = 14,
+    WrQueue = 15,
+    WrLpcReceive = 16,
+    WrLpcReply = 17,
+    WrVirtualMemory = 18,
+    WrPageOut = 19,
+    WrRendezvous = 20,
+    WrKeyedEvent = 21,
+    WrTerminated = 22,
+    WrProcessInSwap = 23,
+    WrCpuRateControl = 24,
+    WrCalloutStack = 25,
+    WrKernel = 26,
+    WrResource = 27,
+    WrPushLock = 28,
+    WrMutex = 29,
+    WrQuantumEnd = 30,
+    WrDispatchInt = 31,
+    WrPreempted = 32,
+    WrYieldExecution = 33,
+    WrFastMutex = 34,
+    WrGuardedMutex = 35,
+    WrRundown = 36,
+    WrAlertByThreadId = 37,
+    WrDeferredPreempt = 38,
+    MaximumWaitReason = 39,
+}}
+pub type PKWAIT_REASON = *mut KWAIT_REASON;
+ENUM!{enum KPROFILE_SOURCE {
+    ProfileTime = 0,
+    ProfileAlignmentFixup = 1,
+    ProfileTotalIssues = 2,
+    ProfilePipelineDry = 3,
+    ProfileLoadInstructions = 4,
+    ProfilePipelineFrozen = 5,
+    ProfileBranchInstructions = 6,
+    ProfileTotalNonissues = 7,
+    ProfileDcacheMisses = 8,
+    ProfileIcacheMisses = 9,
+    ProfileCacheMisses = 10,
+    ProfileBranchMispredictions = 11,
+    ProfileStoreInstructions = 12,
+    ProfileFpInstructions = 13,
+    ProfileIntegerInstructions = 14,
+    Profile2Issue = 15,
+    Profile3Issue = 16,
+    Profile4Issue = 17,
+    ProfileSpecialInstructions = 18,
+    ProfileTotalCycles = 19,
+    ProfileIcacheIssues = 20,
+    ProfileDcacheAccesses = 21,
+    ProfileMemoryBarrierCycles = 22,
+    ProfileLoadLinkedIssues = 23,
+    ProfileMaximum = 24,
+}}
+EXTERN!{extern "system" {
+    fn NtCallbackReturn(
+        OutputBuffer: PVOID,
+        OutputLength: ULONG,
+        Status: NTSTATUS,
+    ) -> NTSTATUS;
+    fn NtFlushProcessWriteBuffers();
+    fn NtQueryDebugFilterState(
+        ComponentId: ULONG,
+        Level: ULONG,
+    ) -> NTSTATUS;
+    fn NtSetDebugFilterState(
+        ComponentId: ULONG,
+        Level: ULONG,
+        State: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtYieldExecution() -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntldr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntldr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntldr.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntldr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,661 @@
+use winapi::shared::basetsd::{LONG_PTR, PSIZE_T, SIZE_T, ULONG_PTR};
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, LARGE_INTEGER, LIST_ENTRY, LONG, LONGLONG, NTSTATUS, PANSI_STRING, PCSTR,
+    PCUNICODE_STRING, PCWSTR, PHANDLE, POBJECT_ATTRIBUTES, PSINGLE_LIST_ENTRY, PSTR, PULONG,
+    PUNICODE_STRING, PUSHORT, PVOID, PWSTR, RTL_BALANCED_NODE, SINGLE_LIST_ENTRY, UCHAR, ULONG,
+    UNICODE_STRING, USHORT,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, ACTIVATION_CONTEXT, IMAGE_RESOURCE_DIRECTORY_ENTRY, PCIMAGE_DELAYLOAD_DESCRIPTOR,
+    PIMAGE_BASE_RELOCATION, PIMAGE_IMPORT_DESCRIPTOR, PIMAGE_RESOURCE_DATA_ENTRY,
+    PIMAGE_RESOURCE_DIRECTORY, PIMAGE_RESOURCE_DIRECTORY_STRING, PIMAGE_THUNK_DATA,
+};
+FN!{stdcall PLDR_INIT_ROUTINE(
+    DllHandle: PVOID,
+    Reason: ULONG,
+    Context: PVOID,
+) -> BOOLEAN}
+STRUCT!{struct LDR_SERVICE_TAG_RECORD {
+    Next: *mut LDR_SERVICE_TAG_RECORD,
+    ServiceTag: ULONG,
+}}
+pub type PLDR_SERVICE_TAG_RECORD = *mut LDR_SERVICE_TAG_RECORD;
+STRUCT!{struct LDRP_CSLIST {
+    Tail: PSINGLE_LIST_ENTRY,
+}}
+pub type PLDRP_CSLIST = *mut LDRP_CSLIST;
+ENUM!{enum LDR_DDAG_STATE {
+    LdrModulesMerged = -5i32 as u32,
+    LdrModulesInitError = -4i32 as u32,
+    LdrModulesSnapError = -3i32 as u32,
+    LdrModulesUnloaded = -2i32 as u32,
+    LdrModulesUnloading = -1i32 as u32,
+    LdrModulesPlaceHolder = 0,
+    LdrModulesMapping = 1,
+    LdrModulesMapped = 2,
+    LdrModulesWaitingForDependencies = 3,
+    LdrModulesSnapping = 4,
+    LdrModulesSnapped = 5,
+    LdrModulesCondensed = 6,
+    LdrModulesReadyToInit = 7,
+    LdrModulesInitializing = 8,
+    LdrModulesReadyToRun = 9,
+}}
+UNION!{union LDR_DDAG_NODE_u {
+    Dependencies: LDRP_CSLIST,
+    RemovalLink: SINGLE_LIST_ENTRY,
+}}
+STRUCT!{struct LDR_DDAG_NODE {
+    Modules: LIST_ENTRY,
+    ServiceTagList: PLDR_SERVICE_TAG_RECORD,
+    LoadCount: ULONG,
+    LoadWhileUnloadingCount: ULONG,
+    LowestLink: ULONG,
+    u: LDR_DDAG_NODE_u,
+    IncomingDependencies: LDRP_CSLIST,
+    State: LDR_DDAG_STATE,
+    CondenseLink: SINGLE_LIST_ENTRY,
+    PreorderNumber: ULONG,
+}}
+pub type PLDR_DDAG_NODE = *mut LDR_DDAG_NODE;
+STRUCT!{struct LDR_DEPENDENCY_RECORD {
+    DependencyLink: SINGLE_LIST_ENTRY,
+    DependencyNode: PLDR_DDAG_NODE,
+    IncomingDependencyLink: SINGLE_LIST_ENTRY,
+    IncomingDependencyNode: PLDR_DDAG_NODE,
+}}
+pub type PLDR_DEPENDENCY_RECORD = *mut LDR_DEPENDENCY_RECORD;
+ENUM!{enum LDR_DLL_LOAD_REASON {
+    LoadReasonStaticDependency = 0,
+    LoadReasonStaticForwarderDependency = 1,
+    LoadReasonDynamicForwarderDependency = 2,
+    LoadReasonDelayloadDependency = 3,
+    LoadReasonDynamicLoad = 4,
+    LoadReasonAsImageLoad = 5,
+    LoadReasonAsDataLoad = 6,
+    LoadReasonEnclavePrimary = 7,
+    LoadReasonEnclaveDependency = 8,
+    LoadReasonUnknown = -1i32 as u32,
+}}
+pub type PLDR_DLL_LOAD_REASON = *mut LDR_DLL_LOAD_REASON;
+pub const LDRP_PACKAGED_BINARY: ULONG = 0x00000001;
+pub const LDRP_STATIC_LINK: ULONG = 0x00000002;
+pub const LDRP_IMAGE_DLL: ULONG = 0x00000004;
+pub const LDRP_LOAD_IN_PROGRESS: ULONG = 0x00001000;
+pub const LDRP_UNLOAD_IN_PROGRESS: ULONG = 0x00002000;
+pub const LDRP_ENTRY_PROCESSED: ULONG = 0x00004000;
+pub const LDRP_ENTRY_INSERTED: ULONG = 0x00008000;
+pub const LDRP_CURRENT_LOAD: ULONG = 0x00010000;
+pub const LDRP_FAILED_BUILTIN_LOAD: ULONG = 0x00020000;
+pub const LDRP_DONT_CALL_FOR_THREADS: ULONG = 0x00040000;
+pub const LDRP_PROCESS_ATTACH_CALLED: ULONG = 0x00080000;
+pub const LDRP_DEBUG_SYMBOLS_LOADED: ULONG = 0x00100000;
+pub const LDRP_IMAGE_NOT_AT_BASE: ULONG = 0x00200000;
+pub const LDRP_COR_IMAGE: ULONG = 0x00400000;
+pub const LDRP_DONT_RELOCATE: ULONG = 0x00800000;
+pub const LDRP_SYSTEM_MAPPED: ULONG = 0x01000000;
+pub const LDRP_IMAGE_VERIFYING: ULONG = 0x02000000;
+pub const LDRP_DRIVER_DEPENDENT_DLL: ULONG = 0x04000000;
+pub const LDRP_ENTRY_NATIVE: ULONG = 0x08000000;
+pub const LDRP_REDIRECTED: ULONG = 0x10000000;
+pub const LDRP_NON_PAGED_DEBUG_INFO: ULONG = 0x20000000;
+pub const LDRP_MM_LOADED: ULONG = 0x40000000;
+pub const LDRP_COMPAT_DATABASE_PROCESSED: ULONG = 0x80000000;
+STRUCT!{struct LDRP_LOAD_CONTEXT {
+    BaseDllName: UNICODE_STRING,
+    somestruct: PVOID,
+    Flags: ULONG,
+    pstatus: *mut NTSTATUS,
+    ParentEntry: *mut LDR_DATA_TABLE_ENTRY,
+    Entry: *mut LDR_DATA_TABLE_ENTRY,
+    WorkQueueListEntry: LIST_ENTRY,
+    ReplacedEntry: *mut LDR_DATA_TABLE_ENTRY,
+    pvImports: *mut *mut LDR_DATA_TABLE_ENTRY,
+    ImportDllCount: ULONG,
+    TaskCount: LONG,
+    pvIAT: PVOID,
+    SizeOfIAT: ULONG,
+    CurrentDll: ULONG,
+    piid: PIMAGE_IMPORT_DESCRIPTOR,
+    OriginalIATProtect: ULONG,
+    GuardCFCheckFunctionPointer: PVOID,
+    pGuardCFCheckFunctionPointer: *mut PVOID,
+}}
+UNION!{union LDR_DATA_TABLE_ENTRY_u1 {
+    InInitializationOrderLinks: LIST_ENTRY,
+    InProgressLinks: LIST_ENTRY,
+}}
+UNION!{union LDR_DATA_TABLE_ENTRY_u2 {
+    FlagGroup: [UCHAR; 4],
+    Flags: ULONG,
+}}
+STRUCT!{struct LDR_DATA_TABLE_ENTRY {
+    InLoadOrderLinks: LIST_ENTRY,
+    InMemoryOrderLinks: LIST_ENTRY,
+    u1: LDR_DATA_TABLE_ENTRY_u1,
+    DllBase: PVOID,
+    EntryPoint: PLDR_INIT_ROUTINE,
+    SizeOfImage: ULONG,
+    FullDllName: UNICODE_STRING,
+    BaseDllName: UNICODE_STRING,
+    u2: LDR_DATA_TABLE_ENTRY_u2,
+    ObsoleteLoadCount: USHORT,
+    TlsIndex: USHORT,
+    HashLinks: LIST_ENTRY,
+    TimeDateStamp: ULONG,
+    EntryPointActivationContext: *mut ACTIVATION_CONTEXT,
+    Lock: PVOID,
+    DdagNode: PLDR_DDAG_NODE,
+    NodeModuleLink: LIST_ENTRY,
+    LoadContext: *mut LDRP_LOAD_CONTEXT,
+    ParentDllBase: PVOID,
+    SwitchBackContext: PVOID,
+    BaseAddressIndexNode: RTL_BALANCED_NODE,
+    MappingInfoIndexNode: RTL_BALANCED_NODE,
+    OriginalBase: ULONG_PTR,
+    LoadTime: LARGE_INTEGER,
+    BaseNameHashValue: ULONG,
+    LoadReason: LDR_DLL_LOAD_REASON,
+    ImplicitPathOptions: ULONG,
+    ReferenceCount: ULONG,
+    DependentLoadFlags: ULONG,
+    SigningLevel: UCHAR,
+}}
+BITFIELD!{unsafe LDR_DATA_TABLE_ENTRY_u2 Flags: ULONG [
+    PackagedBinary set_PackagedBinary[0..1],
+    MarkedForRemoval set_MarkedForRemoval[1..2],
+    ImageDll set_ImageDll[2..3],
+    LoadNotificationsSent set_LoadNotificationsSent[3..4],
+    TelemetryEntryProcessed set_TelemetryEntryProcessed[4..5],
+    ProcessStaticImport set_ProcessStaticImport[5..6],
+    InLegacyLists set_InLegacyLists[6..7],
+    InIndexes set_InIndexes[7..8],
+    ShimDll set_ShimDll[8..9],
+    InExceptionTable set_InExceptionTable[9..10],
+    ReservedFlags1 set_ReservedFlags1[10..12],
+    LoadInProgress set_LoadInProgress[12..13],
+    LoadConfigProcessed set_LoadConfigProcessed[13..14],
+    EntryProcessed set_EntryProcessed[14..15],
+    ProtectDelayLoad set_ProtectDelayLoad[15..16],
+    ReservedFlags3 set_ReservedFlags3[16..18],
+    DontCallForThreads set_DontCallForThreads[18..19],
+    ProcessAttachCalled set_ProcessAttachCalled[19..20],
+    ProcessAttachFailed set_ProcessAttachFailed[20..21],
+    CorDeferredValidate set_CorDeferredValidate[21..22],
+    CorImage set_CorImage[22..23],
+    DontRelocate set_DontRelocate[23..24],
+    CorILOnly set_CorILOnly[24..25],
+    ReservedFlags5 set_ReservedFlags5[25..28],
+    Redirected set_Redirected[28..29],
+    ReservedFlags6 set_ReservedFlags6[29..31],
+    CompatDatabaseProcessed set_CompatDatabaseProcessed[31..32],
+]}
+pub type PLDR_DATA_TABLE_ENTRY = *mut LDR_DATA_TABLE_ENTRY;
+#[inline]
+pub const fn LDR_IS_DATAFILE(DllHandle: ULONG_PTR) -> bool {
+    DllHandle & 1 != 0
+}
+#[inline]
+pub const fn LDR_IS_IMAGEMAPPING(DllHandle: ULONG_PTR) -> bool {
+    DllHandle & 2 != 0
+}
+#[inline]
+pub const fn LDR_IS_RESOURCE(DllHandle: ULONG_PTR) -> bool {
+    (LDR_IS_IMAGEMAPPING(DllHandle) | LDR_IS_DATAFILE(DllHandle)) as u8 != 0 //fixme
+}
+EXTERN!{extern "system" {
+    fn LdrLoadDll(
+        DllPath: PWSTR,
+        DllCharacteristics: PULONG,
+        DllName: PUNICODE_STRING,
+        DllHandle: *mut PVOID,
+    ) -> NTSTATUS;
+    fn LdrUnloadDll(
+        DllHandle: PVOID,
+    ) -> NTSTATUS;
+    fn LdrGetDllHandle(
+        DllPath: PWSTR,
+        DllCharacteristics: PULONG,
+        DllName: PUNICODE_STRING,
+        DllHandle: *mut PVOID,
+    ) -> NTSTATUS;
+}}
+pub const LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT: ULONG = 0x00000001;
+pub const LDR_GET_DLL_HANDLE_EX_PIN: ULONG = 0x00000002;
+EXTERN!{extern "system" {
+    fn LdrGetDllHandleEx(
+        Flags: ULONG,
+        DllPath: PWSTR,
+        DllCharacteristics: PULONG,
+        DllName: PUNICODE_STRING,
+        DllHandle: *mut PVOID,
+    ) -> NTSTATUS;
+    fn LdrGetDllHandleByMapping(
+        BaseAddress: PVOID,
+        DllHandle: *mut PVOID,
+    ) -> NTSTATUS;
+    fn LdrGetDllHandleByName(
+        BaseDllName: PUNICODE_STRING,
+        FullDllName: PUNICODE_STRING,
+        DllHandle: *mut PVOID,
+    ) -> NTSTATUS;
+    fn LdrGetDllFullName(
+        DllHandle: PVOID,
+        FullDllName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn LdrGetDllDirectory(
+        DllDirectory: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn LdrSetDllDirectory(
+        DllDirectory: PUNICODE_STRING,
+    ) -> NTSTATUS;
+}}
+pub const LDR_ADDREF_DLL_PIN: ULONG = 0x00000001;
+EXTERN!{extern "system" {
+    fn LdrAddRefDll(
+        Flags: ULONG,
+        DllHandle: PVOID,
+    ) -> NTSTATUS;
+    fn LdrGetProcedureAddress(
+        DllHandle: PVOID,
+        ProcedureName: PANSI_STRING,
+        ProcedureNumber: ULONG,
+        ProcedureAddress: *mut PVOID,
+    ) -> NTSTATUS;
+}}
+pub const LDR_GET_PROCEDURE_ADDRESS_DONT_RECORD_FORWARDER: ULONG = 0x00000001;
+EXTERN!{extern "system" {
+    fn LdrGetProcedureAddressEx(
+        DllHandle: PVOID,
+        ProcedureName: PANSI_STRING,
+        ProcedureNumber: ULONG,
+        ProcedureAddress: *mut PVOID,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn LdrGetKnownDllSectionHandle(
+        DllName: PCWSTR,
+        KnownDlls32: BOOLEAN,
+        Section: PHANDLE,
+    ) -> NTSTATUS;
+    fn LdrGetProcedureAddressForCaller(
+        DllHandle: PVOID,
+        ProcedureName: PANSI_STRING,
+        ProcedureNumber: ULONG,
+        ProcedureAddress: *mut PVOID,
+        Flags: ULONG,
+        Callback: *mut PVOID,
+    ) -> NTSTATUS;
+}}
+pub const LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS: ULONG = 0x00000001;
+pub const LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY: ULONG = 0x00000002;
+pub const LDR_LOCK_LOADER_LOCK_DISPOSITION_INVALID: ULONG = 0;
+pub const LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED: ULONG = 1;
+pub const LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED: ULONG = 2;
+EXTERN!{extern "system" {
+    fn LdrLockLoaderLock(
+        Flags: ULONG,
+        Disposition: *mut ULONG,
+        Cookie: *mut PVOID,
+    ) -> NTSTATUS;
+}}
+pub const LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS: ULONG = 0x00000001;
+EXTERN!{extern "system" {
+    fn LdrUnlockLoaderLock(
+        Flags: ULONG,
+        Cookie: PVOID,
+    ) -> NTSTATUS;
+    fn LdrRelocateImage(
+        NewBase: PVOID,
+        LoaderName: PSTR,
+        Success: NTSTATUS,
+        Conflict: NTSTATUS,
+        Invalid: NTSTATUS,
+    ) -> NTSTATUS;
+    fn LdrRelocateImageWithBias(
+        NewBase: PVOID,
+        Bias: LONGLONG,
+        LoaderName: PSTR,
+        Success: NTSTATUS,
+        Conflict: NTSTATUS,
+        Invalid: NTSTATUS,
+    ) -> NTSTATUS;
+    fn LdrProcessRelocationBlock(
+        VA: ULONG_PTR,
+        SizeOfBlock: ULONG,
+        NextOffset: PUSHORT,
+        Diff: LONG_PTR,
+    ) -> PIMAGE_BASE_RELOCATION;
+    fn LdrVerifyMappedImageMatchesChecksum(
+        BaseAddress: PVOID,
+        NumberOfBytes: SIZE_T,
+        FileLength: ULONG,
+    ) -> BOOLEAN;
+}}
+FN!{stdcall PLDR_IMPORT_MODULE_CALLBACK(
+    Parameter: PVOID,
+    ModuleName: PSTR,
+) -> ()}
+EXTERN!{extern "system" {
+    fn LdrVerifyImageMatchesChecksum(
+        ImageFileHandle: HANDLE,
+        ImportCallbackRoutine: PLDR_IMPORT_MODULE_CALLBACK,
+        ImportCallbackParameter: PVOID,
+        ImageCharacteristics: PUSHORT,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct LDR_IMPORT_CALLBACK_INFO {
+    ImportCallbackRoutine: PLDR_IMPORT_MODULE_CALLBACK,
+    ImportCallbackParameter: PVOID,
+}}
+pub type PLDR_IMPORT_CALLBACK_INFO = *mut LDR_IMPORT_CALLBACK_INFO;
+STRUCT!{struct LDR_SECTION_INFO {
+    SectionHandle: HANDLE,
+    DesiredAccess: ACCESS_MASK,
+    ObjA: POBJECT_ATTRIBUTES,
+    SectionPageProtection: ULONG,
+    AllocationAttributes: ULONG,
+}}
+pub type PLDR_SECTION_INFO = *mut LDR_SECTION_INFO;
+STRUCT!{struct LDR_VERIFY_IMAGE_INFO {
+    Size: ULONG,
+    Flags: ULONG,
+    CallbackInfo: LDR_IMPORT_CALLBACK_INFO,
+    SectionInfo: LDR_SECTION_INFO,
+    ImageCharacteristics: USHORT,
+}}
+pub type PLDR_VERIFY_IMAGE_INFO = *mut LDR_VERIFY_IMAGE_INFO;
+EXTERN!{extern "system" {
+    fn LdrVerifyImageMatchesChecksumEx(
+        ImageFileHandle: HANDLE,
+        VerifyInfo: PLDR_VERIFY_IMAGE_INFO,
+    ) -> NTSTATUS;
+    fn LdrQueryModuleServiceTags(
+        DllHandle: PVOID,
+        ServiceTagBuffer: PULONG,
+        BufferSize: PULONG,
+    ) -> NTSTATUS;
+}}
+pub const LDR_DLL_NOTIFICATION_REASON_LOADED: ULONG = 1;
+pub const LDR_DLL_NOTIFICATION_REASON_UNLOADED: ULONG = 2;
+STRUCT!{struct LDR_DLL_LOADED_NOTIFICATION_DATA {
+    Flags: ULONG,
+    FullDllName: PUNICODE_STRING,
+    BaseDllName: PUNICODE_STRING,
+    DllBase: PVOID,
+    SizeOfImage: ULONG,
+}}
+pub type PLDR_DLL_LOADED_NOTIFICATION_DATA = *mut LDR_DLL_LOADED_NOTIFICATION_DATA;
+STRUCT!{struct LDR_DLL_UNLOADED_NOTIFICATION_DATA {
+    Flags: ULONG,
+    FullDllName: PCUNICODE_STRING,
+    BaseDllName: PCUNICODE_STRING,
+    DllBase: PVOID,
+    SizeOfImage: ULONG,
+}}
+pub type PLDR_DLL_UNLOADED_NOTIFICATION_DATA = *mut LDR_DLL_UNLOADED_NOTIFICATION_DATA;
+UNION!{union LDR_DLL_NOTIFICATION_DATA {
+    Loaded: LDR_DLL_LOADED_NOTIFICATION_DATA,
+    Unloaded: LDR_DLL_UNLOADED_NOTIFICATION_DATA,
+}}
+pub type PLDR_DLL_NOTIFICATION_DATA = *mut LDR_DLL_NOTIFICATION_DATA;
+FN!{stdcall PLDR_DLL_NOTIFICATION_FUNCTION(
+    NotificationReason: ULONG,
+    NotificationData: PLDR_DLL_NOTIFICATION_DATA,
+    Context: PVOID,
+) -> ()}
+EXTERN!{extern "system" {
+    fn LdrRegisterDllNotification(
+        Flags: ULONG,
+        NotificationFunction: PLDR_DLL_NOTIFICATION_FUNCTION,
+        Context: PVOID,
+        Cookie: *mut PVOID,
+    ) -> NTSTATUS;
+    fn LdrUnregisterDllNotification(
+        Cookie: PVOID,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct PS_MITIGATION_OPTIONS_MAP {
+    Map: [ULONG_PTR; 2],
+}}
+pub type PPS_MITIGATION_OPTIONS_MAP = *mut PS_MITIGATION_OPTIONS_MAP;
+STRUCT!{struct PS_MITIGATION_AUDIT_OPTIONS_MAP {
+    Map: [ULONG_PTR; 2],
+}}
+pub type PPS_MITIGATION_AUDIT_OPTIONS_MAP = *mut PS_MITIGATION_AUDIT_OPTIONS_MAP;
+STRUCT!{struct PS_SYSTEM_DLL_INIT_BLOCK {
+    Size: ULONG,
+    SystemDllWowRelocation: ULONG_PTR,
+    SystemDllNativeRelocation: ULONG_PTR,
+    Wow64SharedInformation: [ULONG_PTR; 16],
+    RngData: ULONG,
+    Flags: ULONG,
+    MitigationOptionsMap: PS_MITIGATION_OPTIONS_MAP,
+    CfgBitMap: ULONG_PTR,
+    CfgBitMapSize: ULONG_PTR,
+    Wow64CfgBitMap: ULONG_PTR,
+    Wow64CfgBitMapSize: ULONG_PTR,
+    MitigationAuditOptionsMap: PS_MITIGATION_AUDIT_OPTIONS_MAP,
+}}
+BITFIELD!{PS_SYSTEM_DLL_INIT_BLOCK Flags: ULONG [
+    CfgOverride set_CfgOverride[0..1],
+    Reserved set_Reserved[1..32],
+]}
+pub type PPS_SYSTEM_DLL_INIT_BLOCK = *mut PS_SYSTEM_DLL_INIT_BLOCK;
+EXTERN!{extern "system" {
+    fn LdrSystemDllInitBlock() -> PPS_SYSTEM_DLL_INIT_BLOCK;
+    fn LdrAddLoadAsDataTable(
+        Module: PVOID,
+        FilePath: PWSTR,
+        Size: SIZE_T,
+        Handle: HANDLE,
+    ) -> NTSTATUS;
+    fn LdrRemoveLoadAsDataTable(
+        InitModule: PVOID,
+        BaseModule: *mut PVOID,
+        Size: PSIZE_T,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn LdrGetFileNameFromLoadAsDataTable(
+        Module: PVOID,
+        pFileNamePrt: *mut PVOID,
+    ) -> NTSTATUS;
+    fn LdrDisableThreadCalloutsForDll(
+        DllImageBase: PVOID,
+    ) -> NTSTATUS;
+    fn LdrAccessResource(
+        DllHandle: PVOID,
+        ResourceDataEntry: PIMAGE_RESOURCE_DATA_ENTRY,
+        ResourceBuffer: *mut PVOID,
+        ResourceLength: *mut ULONG,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct LDR_RESOURCE_INFO {
+    Type: ULONG_PTR,
+    Name: ULONG_PTR,
+    Language: ULONG_PTR,
+}}
+pub type PLDR_RESOURCE_INFO = *mut LDR_RESOURCE_INFO;
+pub const RESOURCE_TYPE_LEVEL: ULONG = 0;
+pub const RESOURCE_NAME_LEVEL: ULONG = 1;
+pub const RESOURCE_LANGUAGE_LEVEL: ULONG = 2;
+pub const RESOURCE_DATA_LEVEL: ULONG = 3;
+EXTERN!{extern "system" {
+    fn LdrFindResource_U(
+        DllHandle: PVOID,
+        ResourceInfo: PLDR_RESOURCE_INFO,
+        Level: ULONG,
+        ResourceDataEntry: *mut PIMAGE_RESOURCE_DATA_ENTRY,
+    ) -> NTSTATUS;
+    fn LdrFindResourceDirectory_U(
+        DllHandle: PVOID,
+        ResourceInfo: PLDR_RESOURCE_INFO,
+        Level: ULONG,
+        ResourceDirectory: *mut PIMAGE_RESOURCE_DIRECTORY,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct LDR_ENUM_RESOURCE_ENTRY_Path_s {
+    Id: USHORT,
+    NameIsPresent: USHORT,
+}}
+UNION!{union LDR_ENUM_RESOURCE_ENTRY_Path {
+    NameOrId: ULONG_PTR,
+    Name: PIMAGE_RESOURCE_DIRECTORY_STRING,
+    s: LDR_ENUM_RESOURCE_ENTRY_Path_s,
+}}
+STRUCT!{struct LDR_ENUM_RESOURCE_ENTRY {
+    Path: [LDR_ENUM_RESOURCE_ENTRY_Path; 3],
+    Data: PVOID,
+    Size: ULONG,
+    Reserved: ULONG,
+}}
+pub type PLDR_ENUM_RESOURCE_ENTRY = *mut LDR_ENUM_RESOURCE_ENTRY;
+#[inline]
+pub unsafe fn NAME_FROM_RESOURCE_ENTRY(
+    RootDirectory: PIMAGE_RESOURCE_DIRECTORY,
+    Entry: &IMAGE_RESOURCE_DIRECTORY_ENTRY,
+) -> usize {
+    if Entry.u.s().NameIsString() != 0 {
+        return RootDirectory as usize + Entry.u.s().NameOffset() as usize;
+    }
+    *Entry.u.Id() as usize
+}
+EXTERN!{extern "system" {
+    fn LdrEnumResources(
+        DllHandle: PVOID,
+        ResourceInfo: PLDR_RESOURCE_INFO,
+        Level: ULONG,
+        ResourceCount: *mut ULONG,
+        Resources: PLDR_ENUM_RESOURCE_ENTRY,
+    ) -> NTSTATUS;
+    fn LdrFindEntryForAddress(
+        DllHandle: PVOID,
+        Entry: *mut PLDR_DATA_TABLE_ENTRY,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct RTL_PROCESS_MODULE_INFORMATION {
+    Section: HANDLE,
+    MappedBase: PVOID,
+    ImageBase: PVOID,
+    ImageSize: ULONG,
+    Flags: ULONG,
+    LoadOrderIndex: USHORT,
+    InitOrderIndex: USHORT,
+    LoadCount: USHORT,
+    OffsetToFileName: USHORT,
+    FullPathName: [UCHAR; 256],
+}}
+pub type PRTL_PROCESS_MODULE_INFORMATION = *mut RTL_PROCESS_MODULE_INFORMATION;
+STRUCT!{struct RTL_PROCESS_MODULES {
+    NumberOfModules: ULONG,
+    Modules: [RTL_PROCESS_MODULE_INFORMATION; 1],
+}}
+pub type PRTL_PROCESS_MODULES = *mut RTL_PROCESS_MODULES;
+STRUCT!{struct RTL_PROCESS_MODULE_INFORMATION_EX {
+    NextOffset: USHORT,
+    BaseInfo: RTL_PROCESS_MODULE_INFORMATION,
+    ImageChecksum: ULONG,
+    TimeDateStamp: ULONG,
+    DefaultBase: PVOID,
+}}
+pub type PRTL_PROCESS_MODULE_INFORMATION_EX = *mut RTL_PROCESS_MODULE_INFORMATION_EX;
+EXTERN!{extern "system" {
+    fn LdrQueryProcessModuleInformation(
+        ModuleInformation: PRTL_PROCESS_MODULES,
+        Size: ULONG,
+        ReturnedSize: PULONG,
+    ) -> NTSTATUS;
+}}
+FN!{stdcall PLDR_ENUM_CALLBACK(
+    ModuleInformation: PLDR_DATA_TABLE_ENTRY,
+    Parameter: PVOID,
+    Stop: *mut BOOLEAN,
+) -> ()}
+EXTERN!{extern "system" {
+    fn LdrEnumerateLoadedModules(
+        ReservedFlag: BOOLEAN,
+        EnumProc: PLDR_ENUM_CALLBACK,
+        Context: PVOID,
+    ) -> NTSTATUS;
+    fn LdrOpenImageFileOptionsKey(
+        SubKey: PUNICODE_STRING,
+        Wow64: BOOLEAN,
+        NewKeyHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn LdrQueryImageFileKeyOption(
+        KeyHandle: HANDLE,
+        ValueName: PCWSTR,
+        Type: ULONG,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+        ReturnedLength: PULONG,
+    ) -> NTSTATUS;
+    fn LdrQueryImageFileExecutionOptions(
+        SubKey: PUNICODE_STRING,
+        ValueName: PCWSTR,
+        ValueSize: ULONG,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+        ReturnedLength: PULONG,
+    ) -> NTSTATUS;
+    fn LdrQueryImageFileExecutionOptionsEx(
+        SubKey: PUNICODE_STRING,
+        ValueName: PCWSTR,
+        Type: ULONG,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+        ReturnedLength: PULONG,
+        Wow64: BOOLEAN,
+    ) -> NTSTATUS;
+}}
+UNION!{union DELAYLOAD_PROC_DESCRIPTOR_Description {
+    Name: PCSTR,
+    Ordinal: ULONG,
+}}
+STRUCT!{struct DELAYLOAD_PROC_DESCRIPTOR {
+    ImportDescribedByName: ULONG,
+    Description: DELAYLOAD_PROC_DESCRIPTOR_Description,
+}}
+pub type PDELAYLOAD_PROC_DESCRIPTOR = *mut DELAYLOAD_PROC_DESCRIPTOR;
+STRUCT!{struct DELAYLOAD_INFO {
+    Size: ULONG,
+    DelayloadDescriptor: PCIMAGE_DELAYLOAD_DESCRIPTOR,
+    ThunkAddress: PIMAGE_THUNK_DATA,
+    TargetDllName: PCSTR,
+    TargetApiDescriptor: DELAYLOAD_PROC_DESCRIPTOR,
+    TargetModuleBase: PVOID,
+    Unused: PVOID,
+    LastError: ULONG,
+}}
+pub type PDELAYLOAD_INFO = *mut DELAYLOAD_INFO;
+FN!{stdcall PDELAYLOAD_FAILURE_DLL_CALLBACK(
+    NotificationReason: ULONG,
+    DelayloadInfo: PDELAYLOAD_INFO,
+) -> PVOID}
+FN!{stdcall PDELAYLOAD_FAILURE_SYSTEM_ROUTINE(
+    DllName: PCSTR,
+    ProcName: PCSTR,
+) -> PVOID}
+EXTERN!{extern "system" {
+    fn LdrResolveDelayLoadedAPI(
+        ParentModuleBase: PVOID,
+        DelayloadDescriptor: PCIMAGE_DELAYLOAD_DESCRIPTOR,
+        FailureDllHook: PDELAYLOAD_FAILURE_DLL_CALLBACK,
+        FailureSystemHook: PDELAYLOAD_FAILURE_SYSTEM_ROUTINE,
+        ThunkAddress: PIMAGE_THUNK_DATA,
+        Flags: ULONG,
+    ) -> PVOID;
+    fn LdrResolveDelayLoadsFromDll(
+        ParentBase: PVOID,
+        TargetDllName: PCSTR,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn LdrSetDefaultDllDirectories(
+        DirectoryFlags: ULONG,
+    ) -> NTSTATUS;
+    fn LdrShutdownProcess() -> NTSTATUS;
+    fn LdrShutdownThread() -> NTSTATUS;
+    fn LdrSetImplicitPathOptions(
+        ImplicitPathOptions: ULONG,
+    ) -> NTSTATUS;
+    fn LdrControlFlowGuardEnforced() -> BOOLEAN;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntlpcapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntlpcapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntlpcapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntlpcapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,692 @@
+use core::mem::size_of;
+use crate::ntapi_base::{CLIENT_ID, CLIENT_ID64};
+use winapi::ctypes::c_double;
+use winapi::shared::basetsd::{PSIZE_T, SIZE_T, ULONG64, ULONG_PTR};
+use winapi::shared::ntdef::{
+    BOOLEAN, CSHORT, HANDLE, LARGE_INTEGER, NTSTATUS, OBJ_CASE_INSENSITIVE, PHANDLE,
+    PLARGE_INTEGER, POBJECT_ATTRIBUTES, PULONG, PUNICODE_STRING, PVOID, ULONG, ULONGLONG,
+    UNICODE_STRING,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, PSECURITY_DESCRIPTOR, PSECURITY_QUALITY_OF_SERVICE, PSID, RTL_SRWLOCK,
+    SECURITY_QUALITY_OF_SERVICE, STANDARD_RIGHTS_REQUIRED, SYNCHRONIZE,
+};
+pub const PORT_CONNECT: u32 = 0x0001;
+pub const PORT_ALL_ACCESS: u32 = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1;
+STRUCT!{struct PORT_MESSAGE_u1_s {
+    DataLength: CSHORT,
+    TotalLength: CSHORT,
+}}
+STRUCT!{struct PORT_MESSAGE_u2_s {
+    Type: CSHORT,
+    DataInfoOffset: CSHORT,
+}}
+UNION!{union PORT_MESSAGE_u1 {
+    s: PORT_MESSAGE_u1_s,
+    Length: ULONG,
+}}
+UNION!{union PORT_MESSAGE_u2 {
+    s: PORT_MESSAGE_u2_s,
+    ZeroInit: ULONG,
+}}
+UNION!{union PORT_MESSAGE_u3 {
+    ClientId: CLIENT_ID,
+    DoNotUseThisField: c_double,
+}}
+UNION!{union PORT_MESSAGE_u4 {
+    ClientViewSize: SIZE_T,
+    CallbackId: ULONG,
+}}
+STRUCT!{struct PORT_MESSAGE {
+    u1: PORT_MESSAGE_u1,
+    u2: PORT_MESSAGE_u2,
+    u3: PORT_MESSAGE_u3,
+    MessageId: ULONG,
+    u4: PORT_MESSAGE_u4,
+}}
+pub type PPORT_MESSAGE = *mut PORT_MESSAGE;
+STRUCT!{struct PORT_DATA_ENTRY {
+    Base: PVOID,
+    Size: ULONG,
+}}
+pub type PPORT_DATA_ENTRY = *mut PORT_DATA_ENTRY;
+STRUCT!{struct PORT_DATA_INFORMATION {
+    CountDataEntries: ULONG,
+    DataEntries: [PORT_DATA_ENTRY; 1],
+}}
+pub type PPORT_DATA_INFORMATION = *mut PORT_DATA_INFORMATION;
+pub const LPC_REQUEST: ULONG = 1;
+pub const LPC_REPLY: ULONG = 2;
+pub const LPC_DATAGRAM: ULONG = 3;
+pub const LPC_LOST_REPLY: ULONG = 4;
+pub const LPC_PORT_CLOSED: ULONG = 5;
+pub const LPC_CLIENT_DIED: ULONG = 6;
+pub const LPC_EXCEPTION: ULONG = 7;
+pub const LPC_DEBUG_EVENT: ULONG = 8;
+pub const LPC_ERROR_EVENT: ULONG = 9;
+pub const LPC_CONNECTION_REQUEST: ULONG = 10;
+pub const LPC_KERNELMODE_MESSAGE: CSHORT = 0x8000;
+pub const LPC_NO_IMPERSONATE: CSHORT = 0x4000;
+pub const PORT_VALID_OBJECT_ATTRIBUTES: u32 = OBJ_CASE_INSENSITIVE;
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+pub const PORT_MAXIMUM_MESSAGE_LENGTH: u32 = 512;
+#[cfg(target_arch = "x86")]
+pub const PORT_MAXIMUM_MESSAGE_LENGTH: u32 = 256;
+pub const LPC_MAX_CONNECTION_INFO_SIZE: u32 = 16 * size_of::<ULONG_PTR>() as u32;
+pub const PORT_TOTAL_MAXIMUM_MESSAGE_LENGTH: u32 = (PORT_MAXIMUM_MESSAGE_LENGTH
+    + size_of::<PORT_MESSAGE>() as u32
+    + LPC_MAX_CONNECTION_INFO_SIZE
+    + 0xf) & !0xf;
+STRUCT!{struct LPC_CLIENT_DIED_MSG {
+    PortMsg: PORT_MESSAGE,
+    CreateTime: LARGE_INTEGER,
+}}
+pub type PLPC_CLIENT_DIED_MSG = *mut LPC_CLIENT_DIED_MSG;
+STRUCT!{struct PORT_VIEW {
+    Length: ULONG,
+    SectionHandle: HANDLE,
+    SectionOffset: ULONG,
+    ViewSize: SIZE_T,
+    ViewBase: PVOID,
+    ViewRemoteBase: PVOID,
+}}
+pub type PPORT_VIEW = *mut PORT_VIEW;
+STRUCT!{struct REMOTE_PORT_VIEW {
+    Length: ULONG,
+    ViewSize: SIZE_T,
+    ViewBase: PVOID,
+}}
+pub type PREMOTE_PORT_VIEW = *mut REMOTE_PORT_VIEW;
+STRUCT!{struct PORT_MESSAGE64_u1_s {
+    DataLength: CSHORT,
+    TotalLength: CSHORT,
+}}
+STRUCT!{struct PORT_MESSAGE64_u2_s {
+    Type: CSHORT,
+    DataInfoOffset: CSHORT,
+}}
+UNION!{union PORT_MESSAGE64_u1 {
+    s: PORT_MESSAGE64_u1_s,
+    Length: ULONG,
+}}
+UNION!{union PORT_MESSAGE64_u2 {
+    s: PORT_MESSAGE64_u2_s,
+    ZeroInit: ULONG,
+}}
+UNION!{union PORT_MESSAGE64_u3 {
+    ClientId: CLIENT_ID64,
+    DoNotUseThisField: c_double,
+}}
+UNION!{union PORT_MESSAGE64_u4 {
+    ClientViewSize: ULONGLONG,
+    CallbackId: ULONG,
+}}
+STRUCT!{struct PORT_MESSAGE64 {
+    u1: PORT_MESSAGE64_u1,
+    u2: PORT_MESSAGE64_u2,
+    u3: PORT_MESSAGE64_u3,
+    MessageId: ULONG,
+    u4: PORT_MESSAGE64_u4,
+}}
+pub type PPORT_MESSAGE64 = *mut PORT_MESSAGE64;
+STRUCT!{struct LPC_CLIENT_DIED_MSG64 {
+    PortMsg: PORT_MESSAGE64,
+    CreateTime: LARGE_INTEGER,
+}}
+pub type PLPC_CLIENT_DIED_MSG64 = *mut LPC_CLIENT_DIED_MSG64;
+STRUCT!{struct PORT_VIEW64 {
+    Length: ULONG,
+    SectionHandle: ULONGLONG,
+    SectionOffset: ULONG,
+    ViewSize: ULONGLONG,
+    ViewBase: ULONGLONG,
+    ViewRemoteBase: ULONGLONG,
+}}
+pub type PPORT_VIEW64 = *mut PORT_VIEW64;
+STRUCT!{struct REMOTE_PORT_VIEW64 {
+    Length: ULONG,
+    ViewSize: ULONGLONG,
+    ViewBase: ULONGLONG,
+}}
+pub type PREMOTE_PORT_VIEW64 = *mut REMOTE_PORT_VIEW64;
+EXTERN!{extern "system" {
+    fn NtCreatePort(
+        PortHandle: PHANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        MaxConnectionInfoLength: ULONG,
+        MaxMessageLength: ULONG,
+        MaxPoolUsage: ULONG,
+    ) -> NTSTATUS;
+    fn NtCreateWaitablePort(
+        PortHandle: PHANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        MaxConnectionInfoLength: ULONG,
+        MaxMessageLength: ULONG,
+        MaxPoolUsage: ULONG,
+    ) -> NTSTATUS;
+    fn NtConnectPort(
+        PortHandle: PHANDLE,
+        PortName: PUNICODE_STRING,
+        SecurityQos: PSECURITY_QUALITY_OF_SERVICE,
+        ClientView: PPORT_VIEW,
+        ServerView: PREMOTE_PORT_VIEW,
+        MaxMessageLength: PULONG,
+        ConnectionInformation: PVOID,
+        ConnectionInformationLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSecureConnectPort(
+        PortHandle: PHANDLE,
+        PortName: PUNICODE_STRING,
+        SecurityQos: PSECURITY_QUALITY_OF_SERVICE,
+        ClientView: PPORT_VIEW,
+        RequiredServerSid: PSID,
+        ServerView: PREMOTE_PORT_VIEW,
+        MaxMessageLength: PULONG,
+        ConnectionInformation: PVOID,
+        ConnectionInformationLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtListenPort(
+        PortHandle: HANDLE,
+        ConnectionRequest: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn NtAcceptConnectPort(
+        PortHandle: PHANDLE,
+        PortContext: PVOID,
+        ConnectionRequest: PPORT_MESSAGE,
+        AcceptConnection: BOOLEAN,
+        ServerView: PPORT_VIEW,
+        ClientView: PREMOTE_PORT_VIEW,
+    ) -> NTSTATUS;
+    fn NtCompleteConnectPort(
+        PortHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtRequestPort(
+        PortHandle: HANDLE,
+        RequestMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn NtRequestWaitReplyPort(
+        PortHandle: HANDLE,
+        RequestMessage: PPORT_MESSAGE,
+        ReplyMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn NtReplyPort(
+        PortHandle: HANDLE,
+        ReplyMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn NtReplyWaitReplyPort(
+        PortHandle: HANDLE,
+        ReplyMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn NtReplyWaitReceivePort(
+        PortHandle: HANDLE,
+        PortContext: *mut PVOID,
+        ReplyMessage: PPORT_MESSAGE,
+        ReceiveMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn NtReplyWaitReceivePortEx(
+        PortHandle: HANDLE,
+        PortContext: *mut PVOID,
+        ReplyMessage: PPORT_MESSAGE,
+        ReceiveMessage: PPORT_MESSAGE,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtImpersonateClientOfPort(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn NtReadRequestData(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+        DataEntryIndex: ULONG,
+        Buffer: PVOID,
+        BufferSize: SIZE_T,
+        NumberOfBytesRead: PSIZE_T,
+    ) -> NTSTATUS;
+    fn NtWriteRequestData(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+        DataEntryIndex: ULONG,
+        Buffer: PVOID,
+        BufferSize: SIZE_T,
+        NumberOfBytesWritten: PSIZE_T,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum PORT_INFORMATION_CLASS {
+    PortBasicInformation = 0,
+    PortDumpInformation = 1,
+}}
+EXTERN!{extern "system" {
+    fn NtQueryInformationPort(
+        PortHandle: HANDLE,
+        PortInformationClass: PORT_INFORMATION_CLASS,
+        PortInformation: PVOID,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
+pub type PALPC_HANDLE = *mut HANDLE;
+pub type ALPC_HANDLE = HANDLE;
+pub const ALPC_PORFLG_ALLOW_LPC_REQUESTS: ULONG = 0x20000;
+pub const ALPC_PORFLG_WAITABLE_PORT: ULONG = 0x40000;
+pub const ALPC_PORFLG_SYSTEM_PROCESS: ULONG = 0x100000;
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+STRUCT!{struct ALPC_PORT_ATTRIBUTES {
+    Flags: ULONG,
+    SecurityQos: SECURITY_QUALITY_OF_SERVICE,
+    MaxMessageLength: SIZE_T,
+    MemoryBandwidth: SIZE_T,
+    MaxPoolUsage: SIZE_T,
+    MaxSectionSize: SIZE_T,
+    MaxViewSize: SIZE_T,
+    MaxTotalSectionSize: SIZE_T,
+    DupObjectTypes: ULONG,
+    Reserved: ULONG,
+}}
+#[cfg(target_arch = "x86")]
+STRUCT!{struct ALPC_PORT_ATTRIBUTES {
+    Flags: ULONG,
+    SecurityQos: SECURITY_QUALITY_OF_SERVICE,
+    MaxMessageLength: SIZE_T,
+    MemoryBandwidth: SIZE_T,
+    MaxPoolUsage: SIZE_T,
+    MaxSectionSize: SIZE_T,
+    MaxViewSize: SIZE_T,
+    MaxTotalSectionSize: SIZE_T,
+    DupObjectTypes: ULONG,
+}}
+pub type PALPC_PORT_ATTRIBUTES = *mut ALPC_PORT_ATTRIBUTES;
+pub const ALPC_MESSAGE_SECURITY_ATTRIBUTE: ULONG = 0x80000000;
+pub const ALPC_MESSAGE_VIEW_ATTRIBUTE: ULONG = 0x40000000;
+pub const ALPC_MESSAGE_CONTEXT_ATTRIBUTE: ULONG = 0x20000000;
+pub const ALPC_MESSAGE_HANDLE_ATTRIBUTE: ULONG = 0x10000000;
+STRUCT!{struct ALPC_MESSAGE_ATTRIBUTES {
+    AllocatedAttributes: ULONG,
+    ValidAttributes: ULONG,
+}}
+pub type PALPC_MESSAGE_ATTRIBUTES = *mut ALPC_MESSAGE_ATTRIBUTES;
+STRUCT!{struct ALPC_COMPLETION_LIST_STATE {
+    Value: ULONG64,
+}}
+BITFIELD!{ALPC_COMPLETION_LIST_STATE Value: ULONG64 [
+    Head set_Head[0..24],
+    Tail set_Tail[24..48],
+    ActiveThreadCount set_ActiveThreadCount[48..64],
+]}
+pub type PALPC_COMPLETION_LIST_STATE = *mut ALPC_COMPLETION_LIST_STATE;
+pub const ALPC_COMPLETION_LIST_BUFFER_GRANULARITY_MASK: ULONG = 0x3f;
+STRUCT!{#[repr(align(128))] struct ALPC_COMPLETION_LIST_HEADER {
+    StartMagic: ULONG64,
+    TotalSize: ULONG,
+    ListOffset: ULONG,
+    ListSize: ULONG,
+    BitmapOffset: ULONG,
+    BitmapSize: ULONG,
+    DataOffset: ULONG,
+    DataSize: ULONG,
+    AttributeFlags: ULONG,
+    AttributeSize: ULONG,
+    __padding0: [u64; 10],
+    State: ALPC_COMPLETION_LIST_STATE,
+    LastMessageId: ULONG,
+    LastCallbackId: ULONG,
+    __padding1: [u32; 28],
+    PostCount: ULONG,
+    __padding2: [u32; 31],
+    ReturnCount: ULONG,
+    __padding3: [u32; 31],
+    LogSequenceNumber: ULONG,
+    __padding4: [u64; 15],
+    UserLock: RTL_SRWLOCK,
+    EndMagic: ULONG64,
+    __padding5: [u64; 14],
+}}
+pub type PALPC_COMPLETION_LIST_HEADER = *mut ALPC_COMPLETION_LIST_HEADER;
+STRUCT!{struct ALPC_CONTEXT_ATTR {
+    PortContext: PVOID,
+    MessageContext: PVOID,
+    Sequence: ULONG,
+    MessageId: ULONG,
+    CallbackId: ULONG,
+}}
+pub type PALPC_CONTEXT_ATTR = *mut ALPC_CONTEXT_ATTR;
+pub const ALPC_HANDLEFLG_DUPLICATE_SAME_ACCESS: ULONG = 0x10000;
+pub const ALPC_HANDLEFLG_DUPLICATE_SAME_ATTRIBUTES: ULONG = 0x20000;
+pub const ALPC_HANDLEFLG_DUPLICATE_INHERIT: ULONG = 0x80000;
+STRUCT!{struct ALPC_HANDLE_ATTR32 {
+    Flags: ULONG,
+    Reserved0: ULONG,
+    SameAccess: ULONG,
+    SameAttributes: ULONG,
+    Indirect: ULONG,
+    Inherit: ULONG,
+    Reserved1: ULONG,
+    Handle: ULONG,
+    ObjectType: ULONG,
+    DesiredAccess: ULONG,
+    GrantedAccess: ULONG,
+}}
+pub type PALPC_HANDLE_ATTR32 = *mut ALPC_HANDLE_ATTR32;
+STRUCT!{struct ALPC_HANDLE_ATTR {
+    Flags: ULONG,
+    Reserved0: ULONG,
+    SameAccess: ULONG,
+    SameAttributes: ULONG,
+    Indirect: ULONG,
+    Inherit: ULONG,
+    Reserved1: ULONG,
+    Handle: HANDLE,
+    HandleAttrArray: PALPC_HANDLE_ATTR32,
+    ObjectType: ULONG,
+    HandleCount: ULONG,
+    DesiredAccess: ACCESS_MASK,
+    GrantedAccess: ACCESS_MASK,
+}}
+pub type PALPC_HANDLE_ATTR = *mut ALPC_HANDLE_ATTR;
+pub const ALPC_SECFLG_CREATE_HANDLE: ULONG = 0x20000;
+STRUCT!{struct ALPC_SECURITY_ATTR {
+    Flags: ULONG,
+    QoS: PSECURITY_QUALITY_OF_SERVICE,
+    ContextHandle: ALPC_HANDLE,
+}}
+pub type PALPC_SECURITY_ATTR = *mut ALPC_SECURITY_ATTR;
+pub const ALPC_VIEWFLG_NOT_SECURE: ULONG = 0x40000;
+STRUCT!{struct ALPC_DATA_VIEW_ATTR {
+    Flags: ULONG,
+    SectionHandle: ALPC_HANDLE,
+    ViewBase: PVOID,
+    ViewSize: SIZE_T,
+}}
+pub type PALPC_DATA_VIEW_ATTR = *mut ALPC_DATA_VIEW_ATTR;
+ENUM!{enum ALPC_PORT_INFORMATION_CLASS {
+    AlpcBasicInformation = 0,
+    AlpcPortInformation = 1,
+    AlpcAssociateCompletionPortInformation = 2,
+    AlpcConnectedSIDInformation = 3,
+    AlpcServerInformation = 4,
+    AlpcMessageZoneInformation = 5,
+    AlpcRegisterCompletionListInformation = 6,
+    AlpcUnregisterCompletionListInformation = 7,
+    AlpcAdjustCompletionListConcurrencyCountInformation = 8,
+    AlpcRegisterCallbackInformation = 9,
+    AlpcCompletionListRundownInformation = 10,
+    AlpcWaitForPortReferences = 11,
+}}
+STRUCT!{struct ALPC_BASIC_INFORMATION {
+    Flags: ULONG,
+    SequenceNo: ULONG,
+    PortContext: PVOID,
+}}
+pub type PALPC_BASIC_INFORMATION = *mut ALPC_BASIC_INFORMATION;
+STRUCT!{struct ALPC_PORT_ASSOCIATE_COMPLETION_PORT {
+    CompletionKey: PVOID,
+    CompletionPort: HANDLE,
+}}
+pub type PALPC_PORT_ASSOCIATE_COMPLETION_PORT = *mut ALPC_PORT_ASSOCIATE_COMPLETION_PORT;
+STRUCT!{struct ALPC_SERVER_INFORMATION_Out {
+    ThreadBlocked: BOOLEAN,
+    ConnectedProcessId: HANDLE,
+    ConnectionPortName: UNICODE_STRING,
+}}
+UNION!{union ALPC_SERVER_INFORMATION {
+    ThreadHandle: HANDLE,
+    Out: ALPC_SERVER_INFORMATION_Out,
+}}
+pub type PALPC_SERVER_INFORMATION = *mut ALPC_SERVER_INFORMATION;
+STRUCT!{struct ALPC_PORT_MESSAGE_ZONE_INFORMATION {
+    Buffer: PVOID,
+    Size: ULONG,
+}}
+pub type PALPC_PORT_MESSAGE_ZONE_INFORMATION = *mut ALPC_PORT_MESSAGE_ZONE_INFORMATION;
+STRUCT!{struct ALPC_PORT_COMPLETION_LIST_INFORMATION {
+    Buffer: PVOID,
+    Size: ULONG,
+    ConcurrencyCount: ULONG,
+    AttributeFlags: ULONG,
+}}
+pub type PALPC_PORT_COMPLETION_LIST_INFORMATION = *mut ALPC_PORT_COMPLETION_LIST_INFORMATION;
+ENUM!{enum ALPC_MESSAGE_INFORMATION_CLASS {
+    AlpcMessageSidInformation = 0,
+    AlpcMessageTokenModifiedIdInformation = 1,
+    AlpcMessageDirectStatusInformation = 2,
+    AlpcMessageHandleInformation = 3,
+    MaxAlpcMessageInfoClass = 4,
+}}
+pub type PALPC_MESSAGE_INFORMATION_CLASS = *mut ALPC_MESSAGE_INFORMATION_CLASS;
+STRUCT!{struct ALPC_MESSAGE_HANDLE_INFORMATION {
+    Index: ULONG,
+    Flags: ULONG,
+    Handle: ULONG,
+    ObjectType: ULONG,
+    GrantedAccess: ACCESS_MASK,
+}}
+pub type PALPC_MESSAGE_HANDLE_INFORMATION = *mut ALPC_MESSAGE_HANDLE_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtAlpcCreatePort(
+        PortHandle: PHANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PortAttributes: PALPC_PORT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtAlpcDisconnectPort(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtAlpcQueryInformation(
+        PortHandle: HANDLE,
+        PortInformationClass: ALPC_PORT_INFORMATION_CLASS,
+        PortInformation: PVOID,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtAlpcSetInformation(
+        PortHandle: HANDLE,
+        PortInformationClass: ALPC_PORT_INFORMATION_CLASS,
+        PortInformation: PVOID,
+        Length: ULONG,
+    ) -> NTSTATUS;
+    fn NtAlpcCreatePortSection(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        SectionHandle: HANDLE,
+        SectionSize: SIZE_T,
+        AlpcSectionHandle: PALPC_HANDLE,
+        ActualSectionSize: PSIZE_T,
+    ) -> NTSTATUS;
+    fn NtAlpcDeletePortSection(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        SectionHandle: ALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn NtAlpcCreateResourceReserve(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        MessageSize: SIZE_T,
+        ResourceId: PALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn NtAlpcDeleteResourceReserve(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ResourceId: ALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn NtAlpcCreateSectionView(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ViewAttributes: PALPC_DATA_VIEW_ATTR,
+    ) -> NTSTATUS;
+    fn NtAlpcDeleteSectionView(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ViewBase: PVOID,
+    ) -> NTSTATUS;
+    fn NtAlpcCreateSecurityContext(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        SecurityAttribute: PALPC_SECURITY_ATTR,
+    ) -> NTSTATUS;
+    fn NtAlpcDeleteSecurityContext(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ContextHandle: ALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn NtAlpcRevokeSecurityContext(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ContextHandle: ALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn NtAlpcQueryInformationMessage(
+        PortHandle: HANDLE,
+        PortMessage: PPORT_MESSAGE,
+        MessageInformationClass: ALPC_MESSAGE_INFORMATION_CLASS,
+        MessageInformation: PVOID,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
+pub const ALPC_MSGFLG_REPLY_MESSAGE: ULONG = 0x1;
+pub const ALPC_MSGFLG_LPC_MODE: ULONG = 0x2;
+pub const ALPC_MSGFLG_RELEASE_MESSAGE: ULONG = 0x10000;
+pub const ALPC_MSGFLG_SYNC_REQUEST: ULONG = 0x20000;
+pub const ALPC_MSGFLG_WAIT_USER_MODE: ULONG = 0x100000;
+pub const ALPC_MSGFLG_WAIT_ALERTABLE: ULONG = 0x200000;
+pub const ALPC_MSGFLG_WOW64_CALL: ULONG = 0x80000000;
+EXTERN!{extern "system" {
+    fn NtAlpcConnectPort(
+        PortHandle: PHANDLE,
+        PortName: PUNICODE_STRING,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PortAttributes: PALPC_PORT_ATTRIBUTES,
+        Flags: ULONG,
+        RequiredServerSid: PSID,
+        ConnectionMessage: PPORT_MESSAGE,
+        BufferLength: PULONG,
+        OutMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        InMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtAlpcConnectPortEx(
+        PortHandle: PHANDLE,
+        ConnectionPortObjectAttributes: POBJECT_ATTRIBUTES,
+        ClientPortObjectAttributes: POBJECT_ATTRIBUTES,
+        PortAttributes: PALPC_PORT_ATTRIBUTES,
+        Flags: ULONG,
+        ServerSecurityRequirements: PSECURITY_DESCRIPTOR,
+        ConnectionMessage: PPORT_MESSAGE,
+        BufferLength: PSIZE_T,
+        OutMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        InMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtAlpcAcceptConnectPort(
+        PortHandle: PHANDLE,
+        ConnectionPortHandle: HANDLE,
+        Flags: ULONG,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PortAttributes: PALPC_PORT_ATTRIBUTES,
+        PortContext: PVOID,
+        ConnectionRequest: PPORT_MESSAGE,
+        ConnectionMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        AcceptConnection: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtAlpcSendWaitReceivePort(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        SendMessageA: PPORT_MESSAGE,
+        SendMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        ReceiveMessage: PPORT_MESSAGE,
+        BufferLength: PSIZE_T,
+        ReceiveMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+}}
+pub const ALPC_CANCELFLG_TRY_CANCEL: ULONG = 0x1;
+pub const ALPC_CANCELFLG_NO_CONTEXT_CHECK: ULONG = 0x8;
+pub const ALPC_CANCELFLGP_FLUSH: ULONG = 0x10000;
+EXTERN!{extern "system" {
+    fn NtAlpcCancelMessage(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        MessageContext: PALPC_CONTEXT_ATTR,
+    ) -> NTSTATUS;
+    fn NtAlpcImpersonateClientOfPort(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+        Flags: PVOID,
+    ) -> NTSTATUS;
+    fn NtAlpcImpersonateClientContainerOfPort(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtAlpcOpenSenderProcess(
+        ProcessHandle: PHANDLE,
+        PortHandle: HANDLE,
+        PortMessage: PPORT_MESSAGE,
+        Flags: ULONG,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtAlpcOpenSenderThread(
+        ThreadHandle: PHANDLE,
+        PortHandle: HANDLE,
+        PortMessage: PPORT_MESSAGE,
+        Flags: ULONG,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn AlpcMaxAllowedMessageLength() -> ULONG;
+    fn AlpcGetHeaderSize(
+        Flags: ULONG,
+    ) -> ULONG;
+    fn AlpcInitializeMessageAttribute(
+        AttributeFlags: ULONG,
+        Buffer: PALPC_MESSAGE_ATTRIBUTES,
+        BufferSize: ULONG,
+        RequiredBufferSize: PULONG,
+    ) -> NTSTATUS;
+    fn AlpcGetMessageAttribute(
+        Buffer: PALPC_MESSAGE_ATTRIBUTES,
+        AttributeFlag: ULONG,
+    ) -> PVOID;
+    fn AlpcRegisterCompletionList(
+        PortHandle: HANDLE,
+        Buffer: PALPC_COMPLETION_LIST_HEADER,
+        Size: ULONG,
+        ConcurrencyCount: ULONG,
+        AttributeFlags: ULONG,
+    ) -> NTSTATUS;
+    fn AlpcUnregisterCompletionList(
+        PortHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn AlpcRundownCompletionList(
+        PortHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn AlpcAdjustCompletionListConcurrencyCount(
+        PortHandle: HANDLE,
+        ConcurrencyCount: ULONG,
+    ) -> NTSTATUS;
+    fn AlpcRegisterCompletionListWorkerThread(
+        CompletionList: PVOID,
+    ) -> BOOLEAN;
+    fn AlpcUnregisterCompletionListWorkerThread(
+        CompletionList: PVOID,
+    ) -> BOOLEAN;
+    fn AlpcGetCompletionListLastMessageInformation(
+        CompletionList: PVOID,
+        LastMessageId: PULONG,
+        LastCallbackId: PULONG,
+    );
+    fn AlpcGetOutstandingCompletionListMessageCount(
+        CompletionList: PVOID,
+    ) -> ULONG;
+    fn AlpcGetMessageFromCompletionList(
+        CompletionList: PVOID,
+        MessageAttributes: *mut PALPC_MESSAGE_ATTRIBUTES,
+    ) -> PPORT_MESSAGE;
+    fn AlpcFreeCompletionListMessage(
+        CompletionList: PVOID,
+        Message: PPORT_MESSAGE,
+    );
+    fn AlpcGetCompletionListMessageAttributes(
+        CompletionList: PVOID,
+        Message: PPORT_MESSAGE,
+    ) -> PALPC_MESSAGE_ATTRIBUTES;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntmisc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntmisc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntmisc.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntmisc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+use winapi::shared::ntdef::{HANDLE, NTSTATUS, PULONG, PVOID, ULONG};
+use winapi::um::winnt::STANDARD_RIGHTS_ALL;
+pub const FLT_PORT_CONNECT: u32 = 0x0001;
+pub const FLT_PORT_ALL_ACCESS: u32 = FLT_PORT_CONNECT | STANDARD_RIGHTS_ALL;
+ENUM!{enum VDMSERVICECLASS {
+    VdmStartExecution = 0,
+    VdmQueueInterrupt = 1,
+    VdmDelayInterrupt = 2,
+    VdmInitialize = 3,
+    VdmFeatures = 4,
+    VdmSetInt21Handler = 5,
+    VdmQueryDir = 6,
+    VdmPrinterDirectIoOpen = 7,
+    VdmPrinterDirectIoClose = 8,
+    VdmPrinterInitialize = 9,
+    VdmSetLdtEntries = 10,
+    VdmSetProcessLdtInfo = 11,
+    VdmAdlibEmulation = 12,
+    VdmPMCliControl = 13,
+    VdmQueryVdmProcess = 14,
+}}
+pub type PVDMSERVICECLASS = *mut VDMSERVICECLASS;
+EXTERN!{extern "system" {
+    fn NtVdmControl(
+        Service: VDMSERVICECLASS,
+        ServiceData: PVOID,
+    ) -> NTSTATUS;
+    fn NtTraceEvent(
+        TraceHandle: HANDLE,
+        Flags: ULONG,
+        FieldSize: ULONG,
+        Fields: PVOID,
+    ) -> NTSTATUS;
+    fn NtTraceControl(
+        FunctionCode: ULONG,
+        InBuffer: PVOID,
+        InBufferLen: ULONG,
+        OutBuffer: PVOID,
+        OutBufferLen: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntmmapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntmmapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntmmapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntmmapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,630 @@
+use crate::winapi_local::um::winnt::PMEM_EXTENDED_PARAMETER;
+use winapi::shared::basetsd::{PSIZE_T, PULONG_PTR, SIZE_T, ULONG_PTR};
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, LARGE_INTEGER, NTSTATUS, PHANDLE, PLARGE_INTEGER, POBJECT_ATTRIBUTES, PULONG,
+    PUNICODE_STRING, PVOID, UCHAR, ULONG, ULONGLONG, UNICODE_STRING, USHORT,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, PCFG_CALL_TARGET_INFO, STANDARD_RIGHTS_REQUIRED, SYNCHRONIZE,
+};
+ENUM!{enum MEMORY_INFORMATION_CLASS {
+    MemoryBasicInformation = 0,
+    MemoryWorkingSetInformation = 1,
+    MemoryMappedFilenameInformation = 2,
+    MemoryRegionInformation = 3,
+    MemoryWorkingSetExInformation = 4,
+    MemorySharedCommitInformation = 5,
+    MemoryImageInformation = 6,
+    MemoryRegionInformationEx = 7,
+    MemoryPrivilegedBasicInformation = 8,
+    MemoryEnclaveImageInformation = 9,
+    MemoryBasicInformationCapped = 10,
+}}
+STRUCT!{struct MEMORY_WORKING_SET_BLOCK {
+    Bitfields: ULONG_PTR,
+}}
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+BITFIELD!{MEMORY_WORKING_SET_BLOCK Bitfields: ULONG_PTR [
+    Protection set_Protection[0..5],
+    ShareCount set_ShareCount[5..8],
+    Shared set_Shared[8..9],
+    Node set_Node[9..12],
+    VirtualPage set_VirtualPage[12..64],
+]}
+#[cfg(target_arch = "x86")]
+BITFIELD!{MEMORY_WORKING_SET_BLOCK Bitfields: ULONG_PTR [
+    Protection set_Protection[0..5],
+    ShareCount set_ShareCount[5..8],
+    Shared set_Shared[8..9],
+    Node set_Node[9..12],
+    VirtualPage set_VirtualPage[12..32],
+]}
+pub type PMEMORY_WORKING_SET_BLOCK = *mut MEMORY_WORKING_SET_BLOCK;
+STRUCT!{struct MEMORY_WORKING_SET_INFORMATION {
+    NumberOfEntries: ULONG_PTR,
+    WorkingSetInfo: [MEMORY_WORKING_SET_BLOCK; 1],
+}}
+pub type PMEMORY_WORKING_SET_INFORMATION = *mut MEMORY_WORKING_SET_INFORMATION;
+STRUCT!{struct MEMORY_REGION_INFORMATION {
+    AllocationBase: PVOID,
+    AllocationProtect: ULONG,
+    RegionType: ULONG,
+    RegionSize: SIZE_T,
+    CommitSize: SIZE_T,
+}}
+BITFIELD!{MEMORY_REGION_INFORMATION RegionType: ULONG [
+    Private set_Private[0..1],
+    MappedDataFile set_MappedDataFile[1..2],
+    MappedImage set_MappedImage[2..3],
+    MappedPageFile set_MappedPageFile[3..4],
+    MappedPhysical set_MappedPhysical[4..5],
+    DirectMapped set_DirectMapped[5..6],
+    SoftwareEnclave set_SoftwareEnclave[6..7],
+    PageSize64K set_PageSize64K[7..8],
+    PlaceholderReservation set_PlaceholderReservation[8..9],
+    Reserved set_Reserved[9..32],
+]}
+pub type PMEMORY_REGION_INFORMATION = *mut MEMORY_REGION_INFORMATION;
+ENUM!{enum MEMORY_WORKING_SET_EX_LOCATION {
+    MemoryLocationInvalid = 0,
+    MemoryLocationResident = 1,
+    MemoryLocationPagefile = 2,
+    MemoryLocationReserved = 3,
+}}
+UNION!{union MEMORY_WORKING_SET_EX_BLOCK_u {
+    Bitfields: ULONG_PTR,
+    Invalid: ULONG_PTR,
+}}
+STRUCT!{struct MEMORY_WORKING_SET_EX_BLOCK {
+    u: MEMORY_WORKING_SET_EX_BLOCK_u,
+}}
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+BITFIELD!{unsafe MEMORY_WORKING_SET_EX_BLOCK_u Bitfields: ULONG_PTR [
+    Valid set_Valid[0..1],
+    ShareCount set_ShareCount[1..4],
+    Win32Protection set_Win32Protection[4..15],
+    Shared set_Shared[15..16],
+    Node set_Node[16..22],
+    Locked set_Locked[22..23],
+    LargePage set_LargePage[23..24],
+    Priority set_Priority[24..27],
+    Reserved set_Reserved[27..30],
+    SharedOriginal set_SharedOriginal[30..31],
+    Bad set_Bad[31..32],
+    ReservedUlong set_ReservedUlong[32..64],
+]}
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+BITFIELD!{unsafe MEMORY_WORKING_SET_EX_BLOCK_u Invalid: ULONG_PTR [
+    Invalid_Valid set_Invalid_Valid[0..1],
+    Invalid_Reserved0 set_Invalid_Reserved0[1..15],
+    Invalid_Shared set_Invalid_Shared[15..16],
+    Invalid_Reserved1 set_Invalid_Reserved1[16..21],
+    Invalid_PageTable set_Invalid_PageTable[21..22],
+    Invalid_Location set_Invalid_Location[22..24],
+    Invalid_Priority set_Invalid_Priority[24..27],
+    Invalid_ModifiedList set_Invalid_ModifiedList[27..28],
+    Invalid_Reserved2 set_Invalid_Reserved2[28..30],
+    Invalid_SharedOriginal set_Invalid_SharedOriginal[30..31],
+    Invalid_Bad set_Invalid_Bad[31..32],
+    Invalid_ReservedUlong set_Invalid_ReservedUlong[32..64],
+]}
+#[cfg(target_arch = "x86")]
+BITFIELD!{unsafe MEMORY_WORKING_SET_EX_BLOCK_u Bitfields: ULONG_PTR [
+    Valid set_Valid[0..1],
+    ShareCount set_ShareCount[1..4],
+    Win32Protection set_Win32Protection[4..15],
+    Shared set_Shared[15..16],
+    Node set_Node[16..22],
+    Locked set_Locked[22..23],
+    LargePage set_LargePage[23..24],
+    Priority set_Priority[24..27],
+    Reserved set_Reserved[27..30],
+    SharedOriginal set_SharedOriginal[30..31],
+    Bad set_Bad[31..32],
+]}
+#[cfg(target_arch = "x86")]
+BITFIELD!{unsafe MEMORY_WORKING_SET_EX_BLOCK_u Invalid: ULONG_PTR [
+    Invalid_Valid set_Invalid_Valid[0..1],
+    Invalid_Reserved0 set_Invalid_Reserved0[1..15],
+    Invalid_Shared set_Invalid_Shared[15..16],
+    Invalid_Reserved1 set_Invalid_Reserved1[16..21],
+    Invalid_PageTable set_Invalid_PageTable[21..22],
+    Invalid_Location set_Invalid_Location[22..24],
+    Invalid_Priority set_Invalid_Priority[24..27],
+    Invalid_ModifiedList set_Invalid_ModifiedList[27..28],
+    Invalid_Reserved2 set_Invalid_Reserved2[28..30],
+    Invalid_SharedOriginal set_Invalid_SharedOriginal[30..31],
+    Invalid_Bad set_Invalid_Bad[31..32],
+]}
+pub type PMEMORY_WORKING_SET_EX_BLOCK = *mut MEMORY_WORKING_SET_EX_BLOCK;
+STRUCT!{struct MEMORY_WORKING_SET_EX_INFORMATION {
+    VirtualAddress: PVOID,
+    VirtualAttributes: MEMORY_WORKING_SET_EX_BLOCK,
+}}
+pub type PMEMORY_WORKING_SET_EX_INFORMATION = *mut MEMORY_WORKING_SET_EX_INFORMATION;
+STRUCT!{struct MEMORY_SHARED_COMMIT_INFORMATION {
+    CommitSize: SIZE_T,
+}}
+pub type PMEMORY_SHARED_COMMIT_INFORMATION = *mut MEMORY_SHARED_COMMIT_INFORMATION;
+STRUCT!{struct MEMORY_IMAGE_INFORMATION {
+    ImageBase: PVOID,
+    SizeOfImage: SIZE_T,
+    ImageFlags: ULONG,
+}}
+BITFIELD!{MEMORY_IMAGE_INFORMATION ImageFlags: ULONG [
+    ImagePartialMap set_ImagePartialMap[0..1],
+    ImageNotExecutable set_ImageNotExecutable[1..2],
+    ImageSigningLevel set_ImageSigningLevel[2..6],
+    Reserved set_Reserved[6..32],
+]}
+pub type PMEMORY_IMAGE_INFORMATION = *mut MEMORY_IMAGE_INFORMATION;
+STRUCT!{struct MEMORY_ENCLAVE_IMAGE_INFORMATION {
+    ImageInfo: MEMORY_IMAGE_INFORMATION,
+    UniqueID: [UCHAR; 32],
+    AuthorID: [UCHAR; 32],
+}}
+pub type PMEMORY_ENCLAVE_IMAGE_INFORMATION = *mut MEMORY_ENCLAVE_IMAGE_INFORMATION;
+pub const MMPFNLIST_ZERO: u32 = 0;
+pub const MMPFNLIST_FREE: u32 = 1;
+pub const MMPFNLIST_STANDBY: u32 = 2;
+pub const MMPFNLIST_MODIFIED: u32 = 3;
+pub const MMPFNLIST_MODIFIEDNOWRITE: u32 = 4;
+pub const MMPFNLIST_BAD: u32 = 5;
+pub const MMPFNLIST_ACTIVE: u32 = 6;
+pub const MMPFNLIST_TRANSITION: u32 = 7;
+pub const MMPFNUSE_PROCESSPRIVATE: u32 = 0;
+pub const MMPFNUSE_FILE: u32 = 1;
+pub const MMPFNUSE_PAGEFILEMAPPED: u32 = 2;
+pub const MMPFNUSE_PAGETABLE: u32 = 3;
+pub const MMPFNUSE_PAGEDPOOL: u32 = 4;
+pub const MMPFNUSE_NONPAGEDPOOL: u32 = 5;
+pub const MMPFNUSE_SYSTEMPTE: u32 = 6;
+pub const MMPFNUSE_SESSIONPRIVATE: u32 = 7;
+pub const MMPFNUSE_METAFILE: u32 = 8;
+pub const MMPFNUSE_AWEPAGE: u32 = 9;
+pub const MMPFNUSE_DRIVERLOCKPAGE: u32 = 10;
+pub const MMPFNUSE_KERNELSTACK: u32 = 11;
+STRUCT!{struct MEMORY_FRAME_INFORMATION {
+    Bitfields: ULONGLONG,
+}}
+BITFIELD!{MEMORY_FRAME_INFORMATION Bitfields: ULONGLONG [
+    UseDescription set_UseDescription[0..4],
+    ListDescription set_ListDescription[4..7],
+    Reserved0 set_Reserved0[7..8],
+    Pinned set_Pinned[8..9],
+    DontUse set_DontUse[9..57],
+    Priority set_Priority[57..60],
+    Reserved set_Reserved[60..64],
+]}
+STRUCT!{struct FILEOFFSET_INFORMATION {
+    Bitfields: ULONGLONG,
+}}
+BITFIELD!{FILEOFFSET_INFORMATION Bitfields: ULONGLONG [
+    DontUse set_DontUse[0..9],
+    Offset set_Offset[9..57],
+    Reserved set_Reserved[57..64],
+]}
+STRUCT!{struct PAGEDIR_INFORMATION {
+    Bitfields: ULONGLONG,
+}}
+BITFIELD!{PAGEDIR_INFORMATION Bitfields: ULONGLONG [
+    DontUse set_DontUse[0..9],
+    PageDirectoryBase set_PageDirectoryBase[9..57],
+    Reserved set_Reserved[57..64],
+]}
+STRUCT!{struct UNIQUE_PROCESS_INFORMATION {
+    Bitfields: ULONGLONG,
+}}
+BITFIELD!{UNIQUE_PROCESS_INFORMATION Bitfields: ULONGLONG [
+    DontUse set_DontUse[0..9],
+    UniqueProcessKey set_UniqueProcessKey[9..57],
+    Reserved set_Reserved[57..64],
+]}
+pub type PUNIQUE_PROCESS_INFORMATION = *mut UNIQUE_PROCESS_INFORMATION;
+UNION!{union MMPFN_IDENTITY_u1 {
+    e1: MEMORY_FRAME_INFORMATION,
+    e2: FILEOFFSET_INFORMATION,
+    e3: PAGEDIR_INFORMATION,
+    e4: UNIQUE_PROCESS_INFORMATION,
+}}
+UNION!{union MMPFN_IDENTITY_u2 {
+    e1: ULONG_PTR,
+    e2_CombinedPage: ULONG_PTR,
+    FileObject: ULONG_PTR,
+    UniqueFileObjectKey: ULONG_PTR,
+    ProtoPteAddress: ULONG_PTR,
+    VirtualAddress: ULONG_PTR,
+}}
+STRUCT!{struct MMPFN_IDENTITY {
+    u1: MMPFN_IDENTITY_u1,
+    PageFrameIndex: ULONG_PTR,
+    u2: MMPFN_IDENTITY_u2,
+}}
+BITFIELD!{unsafe MMPFN_IDENTITY_u2 e1: ULONG_PTR [
+    Image set_Image[0..1],
+    Mismatch set_Mismatch[1..2],
+]}
+pub type PMMPFN_IDENTITY = *mut MMPFN_IDENTITY;
+STRUCT!{struct MMPFN_MEMSNAP_INFORMATION {
+    InitialPageFrameIndex: ULONG_PTR,
+    Count: ULONG_PTR,
+}}
+pub type PMMPFN_MEMSNAP_INFORMATION = *mut MMPFN_MEMSNAP_INFORMATION;
+ENUM!{enum SECTION_INFORMATION_CLASS {
+    SectionBasicInformation = 0,
+    SectionImageInformation = 1,
+    SectionRelocationInformation = 2,
+    SectionOriginalBaseInformation = 3,
+    SectionInternalImageInformation = 4,
+    MaxSectionInfoClass = 5,
+}}
+STRUCT!{struct SECTION_BASIC_INFORMATION {
+    BaseAddress: PVOID,
+    AllocationAttributes: ULONG,
+    MaximumSize: LARGE_INTEGER,
+}}
+pub type PSECTION_BASIC_INFORMATION = *mut SECTION_BASIC_INFORMATION;
+STRUCT!{struct SECTION_IMAGE_INFORMATION_u1_s {
+    SubSystemMinorVersion: USHORT,
+    SubSystemMajorVersion: USHORT,
+}}
+UNION!{union SECTION_IMAGE_INFORMATION_u1 {
+    s: SECTION_IMAGE_INFORMATION_u1_s,
+    SubSystemVersion: ULONG,
+}}
+STRUCT!{struct SECTION_IMAGE_INFORMATION_u2_s {
+    MajorOperatingSystemVersion: USHORT,
+    MinorOperatingSystemVersion: USHORT,
+}}
+UNION!{union SECTION_IMAGE_INFORMATION_u2 {
+    s: SECTION_IMAGE_INFORMATION_u2_s,
+    OperatingSystemVersion: ULONG,
+}}
+STRUCT!{struct SECTION_IMAGE_INFORMATION {
+    TransferAddress: PVOID,
+    ZeroBits: ULONG,
+    MaximumStackSize: SIZE_T,
+    CommittedStackSize: SIZE_T,
+    SubSystemType: ULONG,
+    u1: SECTION_IMAGE_INFORMATION_u1,
+    u2: SECTION_IMAGE_INFORMATION_u2,
+    ImageCharacteristics: USHORT,
+    DllCharacteristics: USHORT,
+    Machine: USHORT,
+    ImageContainsCode: BOOLEAN,
+    ImageFlags: UCHAR,
+    LoaderFlags: ULONG,
+    ImageFileSize: ULONG,
+    CheckSum: ULONG,
+}}
+BITFIELD!{SECTION_IMAGE_INFORMATION ImageFlags: UCHAR [
+    ComPlusNativeReady set_ComPlusNativeReady[0..1],
+    ComPlusILOnly set_ComPlusILOnly[1..2],
+    ImageDynamicallyRelocated set_ImageDynamicallyRelocated[2..3],
+    ImageMappedFlat set_ImageMappedFlat[3..4],
+    BaseBelow4gb set_BaseBelow4gb[4..5],
+    ComPlusPrefer32bit set_ComPlusPrefer32bit[5..6],
+    Reserved set_Reserved[6..8],
+]}
+pub type PSECTION_IMAGE_INFORMATION = *mut SECTION_IMAGE_INFORMATION;
+STRUCT!{struct SECTION_INTERNAL_IMAGE_INFORMATION {
+    SectionInformation: SECTION_IMAGE_INFORMATION,
+    ExtendedFlags: ULONG,
+}}
+BITFIELD!{SECTION_INTERNAL_IMAGE_INFORMATION ExtendedFlags: ULONG [
+    ImageExportSuppressionEnabled set_ImageExportSuppressionEnabled[0..1],
+    Reserved set_Reserved[1..32],
+]}
+pub type PSECTION_INTERNAL_IMAGE_INFORMATION = *mut SECTION_INTERNAL_IMAGE_INFORMATION;
+ENUM!{enum SECTION_INHERIT {
+    ViewShare = 1,
+    ViewUnmap = 2,
+}}
+pub const SEC_BASED: u32 = 0x200000;
+pub const SEC_NO_CHANGE: u32 = 0x400000;
+pub const SEC_GLOBAL: u32 = 0x20000000;
+pub const MEM_EXECUTE_OPTION_DISABLE: u32 = 0x1;
+pub const MEM_EXECUTE_OPTION_ENABLE: u32 = 0x2;
+pub const MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION: u32 = 0x4;
+pub const MEM_EXECUTE_OPTION_PERMANENT: u32 = 0x8;
+pub const MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE: u32 = 0x10;
+pub const MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE: u32 = 0x20;
+pub const MEM_EXECUTE_OPTION_VALID_FLAGS: u32 = 0x3f;
+EXTERN!{extern "system" {
+    fn NtAllocateVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        ZeroBits: ULONG_PTR,
+        RegionSize: PSIZE_T,
+        AllocationType: ULONG,
+        Protect: ULONG,
+    ) -> NTSTATUS;
+    fn NtFreeVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        RegionSize: PSIZE_T,
+        FreeType: ULONG,
+    ) -> NTSTATUS;
+    fn NtReadVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        Buffer: PVOID,
+        BufferSize: SIZE_T,
+        NumberOfBytesRead: PSIZE_T,
+    ) -> NTSTATUS;
+    fn NtWriteVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        Buffer: PVOID,
+        BufferSize: SIZE_T,
+        NumberOfBytesWritten: PSIZE_T,
+    ) -> NTSTATUS;
+    fn NtProtectVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        RegionSize: PSIZE_T,
+        NewProtect: ULONG,
+        OldProtect: PULONG,
+    ) -> NTSTATUS;
+    fn NtQueryVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        MemoryInformationClass: MEMORY_INFORMATION_CLASS,
+        MemoryInformation: PVOID,
+        MemoryInformationLength: SIZE_T,
+        ReturnLength: PSIZE_T,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum VIRTUAL_MEMORY_INFORMATION_CLASS {
+    VmPrefetchInformation = 0,
+    VmPagePriorityInformation = 1,
+    VmCfgCallTargetInformation = 2,
+    VmPageDirtyStateInformation = 3,
+}}
+STRUCT!{struct MEMORY_RANGE_ENTRY {
+    VirtualAddress: PVOID,
+    NumberOfBytes: SIZE_T,
+}}
+pub type PMEMORY_RANGE_ENTRY = *mut MEMORY_RANGE_ENTRY;
+STRUCT!{struct CFG_CALL_TARGET_LIST_INFORMATION {
+    NumberOfEntries: ULONG,
+    Reserved: ULONG,
+    NumberOfEntriesProcessed: PULONG,
+    CallTargetInfo: PCFG_CALL_TARGET_INFO,
+    Section: PVOID,
+    FileOffset: ULONGLONG,
+}}
+pub type PCFG_CALL_TARGET_LIST_INFORMATION = *mut CFG_CALL_TARGET_LIST_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtSetInformationVirtualMemory(
+        ProcessHandle: HANDLE,
+        VmInformationClass: VIRTUAL_MEMORY_INFORMATION_CLASS,
+        NumberOfEntries: ULONG_PTR,
+        VirtualAddresses: PMEMORY_RANGE_ENTRY,
+        VmInformation: PVOID,
+        VmInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtLockVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        RegionSize: PSIZE_T,
+        MapType: ULONG,
+    ) -> NTSTATUS;
+    fn NtUnlockVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        RegionSize: PSIZE_T,
+        MapType: ULONG,
+    ) -> NTSTATUS;
+    fn NtCreateSection(
+        SectionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        MaximumSize: PLARGE_INTEGER,
+        SectionPageProtection: ULONG,
+        AllocationAttributes: ULONG,
+        FileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtCreateSectionEx(
+        SectionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        MaximumSize: PLARGE_INTEGER,
+        SectionPageProtection: ULONG,
+        AllocationAttributes: ULONG,
+        FileHandle: HANDLE,
+        ExtendedParameters: PMEM_EXTENDED_PARAMETER,
+        ExtendedParameterCount: ULONG,
+    ) -> NTSTATUS;
+    fn NtOpenSection(
+        SectionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtMapViewOfSection(
+        SectionHandle: HANDLE,
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        ZeroBits: ULONG_PTR,
+        CommitSize: SIZE_T,
+        SectionOffset: PLARGE_INTEGER,
+        ViewSize: PSIZE_T,
+        InheritDisposition: SECTION_INHERIT,
+        AllocationType: ULONG,
+        Win32Protect: ULONG,
+    ) -> NTSTATUS;
+    fn NtUnmapViewOfSection(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+    ) -> NTSTATUS;
+    fn NtUnmapViewOfSectionEx(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtExtendSection(
+        SectionHandle: HANDLE,
+        NewSectionSize: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtQuerySection(
+        SectionHandle: HANDLE,
+        SectionInformationClass: SECTION_INFORMATION_CLASS,
+        SectionInformation: PVOID,
+        SectionInformationLength: SIZE_T,
+        ReturnLength: PSIZE_T,
+    ) -> NTSTATUS;
+    fn NtAreMappedFilesTheSame(
+        File1MappedAsAnImage: PVOID,
+        File2MappedAsFile: PVOID,
+    ) -> NTSTATUS;
+}}
+pub const MEMORY_PARTITION_QUERY_ACCESS: u32 = 0x0001;
+pub const MEMORY_PARTITION_MODIFY_ACCESS: u32 = 0x0002;
+pub const MEMORY_PARTITION_ALL_ACCESS: u32 = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE
+    | MEMORY_PARTITION_QUERY_ACCESS | MEMORY_PARTITION_MODIFY_ACCESS;
+ENUM!{enum MEMORY_PARTITION_INFORMATION_CLASS {
+    SystemMemoryPartitionInformation = 0,
+    SystemMemoryPartitionMoveMemory = 1,
+    SystemMemoryPartitionAddPagefile = 2,
+    SystemMemoryPartitionCombineMemory = 3,
+    SystemMemoryPartitionInitialAddMemory = 4,
+    SystemMemoryPartitionGetMemoryEvents = 5,
+    SystemMemoryPartitionMax = 6,
+}}
+STRUCT!{struct MEMORY_PARTITION_CONFIGURATION_INFORMATION {
+    Flags: ULONG,
+    NumaNode: ULONG,
+    Channel: ULONG,
+    NumberOfNumaNodes: ULONG,
+    ResidentAvailablePages: ULONG_PTR,
+    CommittedPages: ULONG_PTR,
+    CommitLimit: ULONG_PTR,
+    PeakCommitment: ULONG_PTR,
+    TotalNumberOfPages: ULONG_PTR,
+    AvailablePages: ULONG_PTR,
+    ZeroPages: ULONG_PTR,
+    FreePages: ULONG_PTR,
+    StandbyPages: ULONG_PTR,
+    StandbyPageCountByPriority: [ULONG_PTR; 8],
+    RepurposedPagesByPriority: [ULONG_PTR; 8],
+    MaximumCommitLimit: ULONG_PTR,
+    DonatedPagesToPartitions: ULONG_PTR,
+    PartitionId: ULONG,
+}}
+pub type PMEMORY_PARTITION_CONFIGURATION_INFORMATION =
+    *mut MEMORY_PARTITION_CONFIGURATION_INFORMATION;
+STRUCT!{struct MEMORY_PARTITION_TRANSFER_INFORMATION {
+    NumberOfPages: ULONG_PTR,
+    NumaNode: ULONG,
+    Flags: ULONG,
+}}
+pub type PMEMORY_PARTITION_TRANSFER_INFORMATION = *mut MEMORY_PARTITION_TRANSFER_INFORMATION;
+STRUCT!{struct MEMORY_PARTITION_PAGEFILE_INFORMATION {
+    PageFileName: UNICODE_STRING,
+    MinimumSize: LARGE_INTEGER,
+    MaximumSize: LARGE_INTEGER,
+    Flags: ULONG,
+}}
+pub type PMEMORY_PARTITION_PAGEFILE_INFORMATION = *mut MEMORY_PARTITION_PAGEFILE_INFORMATION;
+STRUCT!{struct MEMORY_PARTITION_PAGE_COMBINE_INFORMATION {
+    StopHandle: HANDLE,
+    Flags: ULONG,
+    TotalNumberOfPages: ULONG_PTR,
+}}
+pub type PMEMORY_PARTITION_PAGE_COMBINE_INFORMATION =
+    *mut MEMORY_PARTITION_PAGE_COMBINE_INFORMATION;
+STRUCT!{struct MEMORY_PARTITION_PAGE_RANGE {
+    StartPage: ULONG_PTR,
+    NumberOfPages: ULONG_PTR,
+}}
+pub type PMEMORY_PARTITION_PAGE_RANGE = *mut MEMORY_PARTITION_PAGE_RANGE;
+STRUCT!{struct MEMORY_PARTITION_INITIAL_ADD_INFORMATION {
+    Flags: ULONG,
+    NumberOfRanges: ULONG,
+    NumberOfPagesAdded: ULONG_PTR,
+    PartitionRanges: [MEMORY_PARTITION_PAGE_RANGE; 1],
+}}
+pub type PMEMORY_PARTITION_INITIAL_ADD_INFORMATION = *mut MEMORY_PARTITION_INITIAL_ADD_INFORMATION;
+STRUCT!{struct MEMORY_PARTITION_MEMORY_EVENTS_INFORMATION {
+    Flags: ULONG,
+    HandleAttributes: ULONG,
+    DesiredAccess: ULONG,
+    LowCommitCondition: HANDLE,
+    HighCommitCondition: HANDLE,
+    MaximumCommitCondition: HANDLE,
+}}
+BITFIELD!{MEMORY_PARTITION_MEMORY_EVENTS_INFORMATION Flags: ULONG [
+    CommitEvents set_CommitEvents[0..1],
+    Spare set_Spare[1..32],
+]}
+pub type PMEMORY_PARTITION_MEMORY_EVENTS_INFORMATION =
+    *mut MEMORY_PARTITION_MEMORY_EVENTS_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtCreatePartition(
+        PartitionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PreferredNode: ULONG,
+    ) -> NTSTATUS;
+    fn NtOpenPartition(
+        PartitionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtManagePartition(
+        PartitionInformationClass: MEMORY_PARTITION_INFORMATION_CLASS,
+        PartitionInformation: PVOID,
+        PartitionInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtMapUserPhysicalPages(
+        VirtualAddress: PVOID,
+        NumberOfPages: ULONG_PTR,
+        UserPfnArray: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn NtMapUserPhysicalPagesScatter(
+        VirtualAddresses: *mut PVOID,
+        NumberOfPages: ULONG_PTR,
+        UserPfnArray: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn NtAllocateUserPhysicalPages(
+        ProcessHandle: HANDLE,
+        NumberOfPages: PULONG_PTR,
+        UserPfnArray: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn NtFreeUserPhysicalPages(
+        ProcessHandle: HANDLE,
+        NumberOfPages: PULONG_PTR,
+        UserPfnArray: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn NtOpenSession(
+        SessionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtGetWriteWatch(
+        ProcessHandle: HANDLE,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+        RegionSize: SIZE_T,
+        UserAddressArray: *mut PVOID,
+        EntriesInUserAddressArray: PULONG_PTR,
+        Granularity: PULONG,
+    ) -> NTSTATUS;
+    fn NtResetWriteWatch(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        RegionSize: SIZE_T,
+    ) -> NTSTATUS;
+    fn NtCreatePagingFile(
+        PageFileName: PUNICODE_STRING,
+        MinimumSize: PLARGE_INTEGER,
+        MaximumSize: PLARGE_INTEGER,
+        Priority: ULONG,
+    ) -> NTSTATUS;
+    fn NtFlushInstructionCache(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        Length: SIZE_T,
+    ) -> NTSTATUS;
+    fn NtFlushWriteBuffer() -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntnls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntnls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntnls.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntnls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,29 @@
+use winapi::shared::ntdef::{BOOLEAN, PUSHORT, PVOID, UCHAR, USHORT};
+pub const MAXIMUM_LEADBYTES: usize = 12;
+STRUCT!{struct CPTABLEINFO {
+    CodePage: USHORT,
+    MaximumCharacterSize: USHORT,
+    DefaultChar: USHORT,
+    UniDefaultChar: USHORT,
+    TransDefaultChar: USHORT,
+    TransUniDefaultChar: USHORT,
+    DBCSCodePage: USHORT,
+    LeadByte: [UCHAR; MAXIMUM_LEADBYTES],
+    MultiByteTable: PUSHORT,
+    WideCharTable: PVOID,
+    DBCSRanges: PUSHORT,
+    DBCSOffsets: PUSHORT,
+}}
+pub type PCPTABLEINFO = *mut CPTABLEINFO;
+STRUCT!{struct NLSTABLEINFO {
+    OemTableInfo: CPTABLEINFO,
+    AnsiTableInfo: CPTABLEINFO,
+    UpperCaseTable: PUSHORT,
+    LowerCaseTable: PUSHORT,
+}}
+pub type PNLSTABLEINFO = *mut NLSTABLEINFO;
+EXTERN!{extern "C" {
+    static mut NlsAnsiCodePage: USHORT;
+    static mut NlsMbCodePageTag: BOOLEAN;
+    static mut NlsMbOemCodePageTag: BOOLEAN;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntobapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntobapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntobapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntobapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,226 @@
+use winapi::shared::ntdef::{
+    BOOLEAN, CHAR, HANDLE, LARGE_INTEGER, LONG, NTSTATUS, PHANDLE, PLARGE_INTEGER,
+    POBJECT_ATTRIBUTES, PULONG, PUNICODE_STRING, PVOID, UCHAR, ULONG, UNICODE_STRING, WAIT_TYPE,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, GENERIC_MAPPING, PSECURITY_DESCRIPTOR, SECURITY_INFORMATION,
+    STANDARD_RIGHTS_REQUIRED,
+};
+pub const OBJECT_TYPE_CREATE: u32 = 0x0001;
+pub const OBJECT_TYPE_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED | 0x1;
+pub const DIRECTORY_QUERY: u32 = 0x0001;
+pub const DIRECTORY_TRAVERSE: u32 = 0x0002;
+pub const DIRECTORY_CREATE_OBJECT: u32 = 0x0004;
+pub const DIRECTORY_CREATE_SUBDIRECTORY: u32 = 0x0008;
+pub const DIRECTORY_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED | 0xf;
+pub const SYMBOLIC_LINK_QUERY: u32 = 0x0001;
+pub const SYMBOLIC_LINK_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED | 0x1;
+pub const OBJ_PROTECT_CLOSE: u32 = 0x00000001;
+pub const OBJ_INHERIT: u32 = 0x00000002;
+pub const OBJ_AUDIT_OBJECT_CLOSE: u32 = 0x00000004;
+ENUM!{enum OBJECT_INFORMATION_CLASS {
+    ObjectBasicInformation = 0,
+    ObjectNameInformation = 1,
+    ObjectTypeInformation = 2,
+    ObjectTypesInformation = 3,
+    ObjectHandleFlagInformation = 4,
+    ObjectSessionInformation = 5,
+    ObjectSessionObjectInformation = 6,
+    MaxObjectInfoClass = 7,
+}}
+STRUCT!{struct OBJECT_BASIC_INFORMATION {
+    Attributes: ULONG,
+    GrantedAccess: ACCESS_MASK,
+    HandleCount: ULONG,
+    PointerCount: ULONG,
+    PagedPoolCharge: ULONG,
+    NonPagedPoolCharge: ULONG,
+    Reserved: [ULONG; 3],
+    NameInfoSize: ULONG,
+    TypeInfoSize: ULONG,
+    SecurityDescriptorSize: ULONG,
+    CreationTime: LARGE_INTEGER,
+}}
+pub type POBJECT_BASIC_INFORMATION = *mut OBJECT_BASIC_INFORMATION;
+STRUCT!{struct OBJECT_NAME_INFORMATION {
+    Name: UNICODE_STRING,
+}}
+pub type POBJECT_NAME_INFORMATION = *mut OBJECT_NAME_INFORMATION;
+STRUCT!{struct OBJECT_TYPE_INFORMATION {
+    TypeName: UNICODE_STRING,
+    TotalNumberOfObjects: ULONG,
+    TotalNumberOfHandles: ULONG,
+    TotalPagedPoolUsage: ULONG,
+    TotalNonPagedPoolUsage: ULONG,
+    TotalNamePoolUsage: ULONG,
+    TotalHandleTableUsage: ULONG,
+    HighWaterNumberOfObjects: ULONG,
+    HighWaterNumberOfHandles: ULONG,
+    HighWaterPagedPoolUsage: ULONG,
+    HighWaterNonPagedPoolUsage: ULONG,
+    HighWaterNamePoolUsage: ULONG,
+    HighWaterHandleTableUsage: ULONG,
+    InvalidAttributes: ULONG,
+    GenericMapping: GENERIC_MAPPING,
+    ValidAccessMask: ULONG,
+    SecurityRequired: BOOLEAN,
+    MaintainHandleCount: BOOLEAN,
+    TypeIndex: UCHAR,
+    ReservedByte: CHAR,
+    PoolType: ULONG,
+    DefaultPagedPoolCharge: ULONG,
+    DefaultNonPagedPoolCharge: ULONG,
+}}
+pub type POBJECT_TYPE_INFORMATION = *mut OBJECT_TYPE_INFORMATION;
+STRUCT!{struct OBJECT_TYPES_INFORMATION {
+    NumberOfTypes: ULONG,
+}}
+pub type POBJECT_TYPES_INFORMATION = *mut OBJECT_TYPES_INFORMATION;
+STRUCT!{struct OBJECT_HANDLE_FLAG_INFORMATION {
+    Inherit: BOOLEAN,
+    ProtectFromClose: BOOLEAN,
+}}
+pub type POBJECT_HANDLE_FLAG_INFORMATION = *mut OBJECT_HANDLE_FLAG_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtQueryObject(
+        Handle: HANDLE,
+        ObjectInformationClass: OBJECT_INFORMATION_CLASS,
+        ObjectInformation: PVOID,
+        ObjectInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationObject(
+        Handle: HANDLE,
+        ObjectInformationClass: OBJECT_INFORMATION_CLASS,
+        ObjectInformation: PVOID,
+        ObjectInformationLength: ULONG,
+    ) -> NTSTATUS;
+}}
+pub const DUPLICATE_CLOSE_SOURCE: u32 = 0x00000001;
+pub const DUPLICATE_SAME_ACCESS: u32 = 0x00000002;
+pub const DUPLICATE_SAME_ATTRIBUTES: u32 = 0x00000004;
+EXTERN!{extern "system" {
+    fn NtDuplicateObject(
+        SourceProcessHandle: HANDLE,
+        SourceHandle: HANDLE,
+        TargetProcessHandle: HANDLE,
+        TargetHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        HandleAttributes: ULONG,
+        Options: ULONG,
+    ) -> NTSTATUS;
+    fn NtMakeTemporaryObject(
+        Handle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtMakePermanentObject(
+        Handle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtSignalAndWaitForSingleObject(
+        SignalHandle: HANDLE,
+        WaitHandle: HANDLE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtWaitForSingleObject(
+        Handle: HANDLE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtWaitForMultipleObjects(
+        Count: ULONG,
+        Handles: *mut HANDLE,
+        WaitType: WAIT_TYPE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtWaitForMultipleObjects32(
+        Count: ULONG,
+        Handles: *mut LONG,
+        WaitType: WAIT_TYPE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtSetSecurityObject(
+        Handle: HANDLE,
+        SecurityInformation: SECURITY_INFORMATION,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+    ) -> NTSTATUS;
+    fn NtQuerySecurityObject(
+        Handle: HANDLE,
+        SecurityInformation: SECURITY_INFORMATION,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Length: ULONG,
+        LengthNeeded: PULONG,
+    ) -> NTSTATUS;
+    fn NtClose(
+        Handle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtCompareObjects(
+        FirstObjectHandle: HANDLE,
+        SecondObjectHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtCreateDirectoryObject(
+        DirectoryHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtCreateDirectoryObjectEx(
+        DirectoryHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ShadowDirectoryHandle: HANDLE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtOpenDirectoryObject(
+        DirectoryHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct OBJECT_DIRECTORY_INFORMATION {
+    Name: UNICODE_STRING,
+    TypeName: UNICODE_STRING,
+}}
+pub type POBJECT_DIRECTORY_INFORMATION = *mut OBJECT_DIRECTORY_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtQueryDirectoryObject(
+        DirectoryHandle: HANDLE,
+        Buffer: PVOID,
+        Length: ULONG,
+        ReturnSingleEntry: BOOLEAN,
+        RestartScan: BOOLEAN,
+        Context: PULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtCreatePrivateNamespace(
+        NamespaceHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        BoundaryDescriptor: PVOID,
+    ) -> NTSTATUS;
+    fn NtOpenPrivateNamespace(
+        NamespaceHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        BoundaryDescriptor: PVOID,
+    ) -> NTSTATUS;
+    fn NtDeletePrivateNamespace(
+        NamespaceHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtCreateSymbolicLinkObject(
+        LinkHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        LinkTarget: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn NtOpenSymbolicLinkObject(
+        LinkHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtQuerySymbolicLinkObject(
+        LinkHandle: HANDLE,
+        LinkTarget: PUNICODE_STRING,
+        ReturnedLength: PULONG,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpebteb.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpebteb.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpebteb.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpebteb.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,431 @@
+use core::mem::size_of;
+use crate::ntapi_base::CLIENT_ID;
+use crate::ntpsapi::{GDI_HANDLE_BUFFER, PPEB_LDR_DATA};
+use crate::ntrtl::PRTL_USER_PROCESS_PARAMETERS;
+use winapi::shared::basetsd::{SIZE_T, ULONG_PTR};
+use winapi::shared::guiddef::GUID;
+use winapi::shared::ntdef::{
+    BOOLEAN, CHAR, HANDLE, LCID, LIST_ENTRY, LONG, NTSTATUS, PROCESSOR_NUMBER, PSTR, PVOID, UCHAR,
+    ULARGE_INTEGER, ULONG, ULONGLONG, UNICODE_STRING, USHORT, WCHAR,
+};
+use winapi::um::winnt::{
+    ACTIVATION_CONTEXT, FLS_MAXIMUM_AVAILABLE, NT_TIB, PRTL_CRITICAL_SECTION, PSLIST_HEADER,
+};
+STRUCT!{struct RTL_ACTIVATION_CONTEXT_STACK_FRAME {
+    Previous: PRTL_ACTIVATION_CONTEXT_STACK_FRAME,
+    ActivationContext: *mut ACTIVATION_CONTEXT,
+    Flags: ULONG,
+}}
+pub type PRTL_ACTIVATION_CONTEXT_STACK_FRAME = *mut RTL_ACTIVATION_CONTEXT_STACK_FRAME;
+STRUCT!{struct ACTIVATION_CONTEXT_STACK {
+    ActiveFrame: *mut RTL_ACTIVATION_CONTEXT_STACK_FRAME,
+    FrameListCache: LIST_ENTRY,
+    Flags: ULONG,
+    NextCookieSequenceNumber: ULONG,
+    StackId: ULONG,
+}}
+pub type PACTIVATION_CONTEXT_STACK = *mut ACTIVATION_CONTEXT_STACK;
+STRUCT!{struct API_SET_NAMESPACE {
+    Version: ULONG,
+    Size: ULONG,
+    Flags: ULONG,
+    Count: ULONG,
+    EntryOffset: ULONG,
+    HashOffset: ULONG,
+    HashFactor: ULONG,
+}}
+pub type PAPI_SET_NAMESPACE = *mut API_SET_NAMESPACE;
+STRUCT!{struct API_SET_HASH_ENTRY {
+    Hash: ULONG,
+    Index: ULONG,
+}}
+pub type PAPI_SET_HASH_ENTRY = *mut API_SET_HASH_ENTRY;
+STRUCT!{struct API_SET_NAMESPACE_ENTRY {
+    Flags: ULONG,
+    NameOffset: ULONG,
+    NameLength: ULONG,
+    HashedLength: ULONG,
+    ValueOffset: ULONG,
+    ValueCount: ULONG,
+}}
+pub type PAPI_SET_NAMESPACE_ENTRY = *mut API_SET_NAMESPACE_ENTRY;
+STRUCT!{struct API_SET_VALUE_ENTRY {
+    Flags: ULONG,
+    NameOffset: ULONG,
+    NameLength: ULONG,
+    ValueOffset: ULONG,
+    ValueLength: ULONG,
+}}
+pub type PAPI_SET_VALUE_ENTRY = *mut API_SET_VALUE_ENTRY;
+UNION!{union PEB_u {
+    KernelCallbackTable: PVOID,
+    UserSharedInfoPtr: PVOID,
+}}
+#[repr(C)]
+pub struct LEAP_SECOND_DATA([u8; 0]); //fixme
+STRUCT!{struct PEB {
+    InheritedAddressSpace: BOOLEAN,
+    ReadImageFileExecOptions: BOOLEAN,
+    BeingDebugged: BOOLEAN,
+    BitField: BOOLEAN,
+    Mutant: HANDLE,
+    ImageBaseAddress: PVOID,
+    Ldr: PPEB_LDR_DATA,
+    ProcessParameters: PRTL_USER_PROCESS_PARAMETERS,
+    SubSystemData: PVOID,
+    ProcessHeap: PVOID,
+    FastPebLock: PRTL_CRITICAL_SECTION,
+    IFEOKey: PVOID,
+    AtlThunkSListPtr: PSLIST_HEADER,
+    CrossProcessFlags: ULONG,
+    u: PEB_u,
+    SystemReserved: [ULONG; 1],
+    AtlThunkSListPtr32: ULONG,
+    ApiSetMap: PAPI_SET_NAMESPACE,
+    TlsExpansionCounter: ULONG,
+    TlsBitmap: PVOID,
+    TlsBitmapBits: [ULONG; 2],
+    ReadOnlySharedMemoryBase: PVOID,
+    SharedData: PVOID,
+    ReadOnlyStaticServerData: *mut PVOID,
+    AnsiCodePageData: PVOID,
+    OemCodePageData: PVOID,
+    UnicodeCaseTableData: PVOID,
+    NumberOfProcessors: ULONG,
+    NtGlobalFlag: ULONG,
+    CriticalSectionTimeout: ULARGE_INTEGER,
+    HeapSegmentReserve: SIZE_T,
+    HeapSegmentCommit: SIZE_T,
+    HeapDeCommitTotalFreeThreshold: SIZE_T,
+    HeapDeCommitFreeBlockThreshold: SIZE_T,
+    NumberOfHeaps: ULONG,
+    MaximumNumberOfHeaps: ULONG,
+    ProcessHeaps: *mut PVOID,
+    GdiSharedHandleTable: PVOID,
+    ProcessStarterHelper: PVOID,
+    GdiDCAttributeList: ULONG,
+    LoaderLock: PRTL_CRITICAL_SECTION,
+    OSMajorVersion: ULONG,
+    OSMinorVersion: ULONG,
+    OSBuildNumber: USHORT,
+    OSCSDVersion: USHORT,
+    OSPlatformId: ULONG,
+    ImageSubsystem: ULONG,
+    ImageSubsystemMajorVersion: ULONG,
+    ImageSubsystemMinorVersion: ULONG,
+    ActiveProcessAffinityMask: ULONG_PTR,
+    GdiHandleBuffer: GDI_HANDLE_BUFFER,
+    PostProcessInitRoutine: PVOID,
+    TlsExpansionBitmap: PVOID,
+    TlsExpansionBitmapBits: [ULONG; 32],
+    SessionId: ULONG,
+    AppCompatFlags: ULARGE_INTEGER,
+    AppCompatFlagsUser: ULARGE_INTEGER,
+    pShimData: PVOID,
+    AppCompatInfo: PVOID,
+    CSDVersion: UNICODE_STRING,
+    ActivationContextData: PVOID,
+    ProcessAssemblyStorageMap: PVOID,
+    SystemDefaultActivationContextData: PVOID,
+    SystemAssemblyStorageMap: PVOID,
+    MinimumStackCommit: SIZE_T,
+    FlsCallback: *mut PVOID,
+    FlsListHead: LIST_ENTRY,
+    FlsBitmap: PVOID,
+    FlsBitmapBits: [ULONG; FLS_MAXIMUM_AVAILABLE as usize / (size_of::<ULONG>() * 8)],
+    FlsHighIndex: ULONG,
+    WerRegistrationData: PVOID,
+    WerShipAssertPtr: PVOID,
+    pUnused: PVOID,
+    pImageHeaderHash: PVOID,
+    TracingFlags: ULONG,
+    CsrServerReadOnlySharedMemoryBase: ULONGLONG,
+    TppWorkerpListLock: PRTL_CRITICAL_SECTION,
+    TppWorkerpList: LIST_ENTRY,
+    WaitOnAddressHashTable: [PVOID; 128],
+    TelemetryCoverageHeader: PVOID,
+    CloudFileFlags: ULONG,
+    CloudFileDiagFlags: ULONG,
+    PlaceholderCompatibilityMode: CHAR,
+    PlaceholderCompatibilityModeReserved: [CHAR; 7],
+    LeapSecondData: *mut LEAP_SECOND_DATA,
+    LeapSecondFlags: ULONG,
+    NtGlobalFlag2: ULONG,
+}}
+BITFIELD!{PEB BitField: BOOLEAN [
+    ImageUsesLargePages set_ImageUsesLargePages[0..1],
+    IsProtectedProcess set_IsProtectedProcess[1..2],
+    IsImageDynamicallyRelocated set_IsImageDynamicallyRelocated[2..3],
+    SkipPatchingUser32Forwarders set_SkipPatchingUser32Forwarders[3..4],
+    IsPackagedProcess set_IsPackagedProcess[4..5],
+    IsAppContainer set_IsAppContainer[5..6],
+    IsProtectedProcessLight set_IsProtectedProcessLight[6..7],
+    IsLongPathAwareProcess set_IsLongPathAwareProcess[7..8],
+]}
+BITFIELD!{PEB CrossProcessFlags: ULONG [
+    ProcessInJob set_ProcessInJob[0..1],
+    ProcessInitializing set_ProcessInitializing[1..2],
+    ProcessUsingVEH set_ProcessUsingVEH[2..3],
+    ProcessUsingVCH set_ProcessUsingVCH[3..4],
+    ProcessUsingFTH set_ProcessUsingFTH[4..5],
+    ProcessPreviouslyThrottled set_ProcessPreviouslyThrottled[5..6],
+    ProcessCurrentlyThrottled set_ProcessCurrentlyThrottled[6..7],
+    ProcessImagesHotPatched set_ProcessImagesHotPatched[7..8],
+    ReservedBits0 set_ReservedBits0[8..32],
+]}
+BITFIELD!{PEB TracingFlags: ULONG [
+    HeapTracingEnabled set_HeapTracingEnabled[0..1],
+    CritSecTracingEnabled set_CritSecTracingEnabled[1..2],
+    LibLoaderTracingEnabled set_LibLoaderTracingEnabled[2..3],
+    SpareTracingBits set_SpareTracingBits[3..32],
+]}
+BITFIELD!{PEB LeapSecondFlags: ULONG [
+    SixtySecondEnabled set_SixtySecondEnabled[0..1],
+    Reserved set_Reserved[1..32],
+]}
+pub type PPEB = *mut PEB;
+pub const GDI_BATCH_BUFFER_SIZE: usize = 310;
+STRUCT!{struct GDI_TEB_BATCH {
+    Offset: ULONG,
+    HDC: ULONG_PTR,
+    Buffer: [ULONG; GDI_BATCH_BUFFER_SIZE],
+}}
+pub type PGDI_TEB_BATCH = *mut GDI_TEB_BATCH;
+STRUCT!{struct TEB_ACTIVE_FRAME_CONTEXT {
+    Flags: ULONG,
+    FrameName: PSTR,
+}}
+pub type PTEB_ACTIVE_FRAME_CONTEXT = *mut TEB_ACTIVE_FRAME_CONTEXT;
+STRUCT!{struct TEB_ACTIVE_FRAME {
+    Flags: ULONG,
+    Previous: *mut TEB_ACTIVE_FRAME,
+    Context: PTEB_ACTIVE_FRAME_CONTEXT,
+}}
+pub type PTEB_ACTIVE_FRAME = *mut TEB_ACTIVE_FRAME;
+STRUCT!{struct TEB_u_s {
+    ReservedPad0: UCHAR,
+    ReservedPad1: UCHAR,
+    ReservedPad2: UCHAR,
+    IdealProcessor: UCHAR,
+}}
+UNION!{union TEB_u {
+    CurrentIdealProcessor: PROCESSOR_NUMBER,
+    IdealProcessorValue: ULONG,
+    s: TEB_u_s,
+}}
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+STRUCT!{struct TEB {
+    NtTib: NT_TIB,
+    EnvironmentPointer: PVOID,
+    ClientId: CLIENT_ID,
+    ActiveRpcHandle: PVOID,
+    ThreadLocalStoragePointer: PVOID,
+    ProcessEnvironmentBlock: PPEB,
+    LastErrorValue: ULONG,
+    CountOfOwnedCriticalSections: ULONG,
+    CsrClientThread: PVOID,
+    Win32ThreadInfo: PVOID,
+    User32Reserved: [ULONG; 26],
+    UserReserved: [ULONG; 5],
+    WOW32Reserved: PVOID,
+    CurrentLocale: LCID,
+    FpSoftwareStatusRegister: ULONG,
+    ReservedForDebuggerInstrumentation: [PVOID; 16],
+    SystemReserved1: [PVOID; 30],
+    PlaceholderCompatibilityMode: CHAR,
+    PlaceholderReserved: [CHAR; 11],
+    ProxiedProcessId: ULONG,
+    ActivationStack: ACTIVATION_CONTEXT_STACK,
+    WorkingOnBehalfTicket: [UCHAR; 8],
+    ExceptionCode: NTSTATUS,
+    ActivationContextStackPointer: PACTIVATION_CONTEXT_STACK,
+    InstrumentationCallbackSp: ULONG_PTR,
+    InstrumentationCallbackPreviousPc: ULONG_PTR,
+    InstrumentationCallbackPreviousSp: ULONG_PTR,
+    TxFsContext: ULONG,
+    InstrumentationCallbackDisabled: BOOLEAN,
+    GdiTebBatch: GDI_TEB_BATCH,
+    RealClientId: CLIENT_ID,
+    GdiCachedProcessHandle: HANDLE,
+    GdiClientPID: ULONG,
+    GdiClientTID: ULONG,
+    GdiThreadLocalInfo: PVOID,
+    Win32ClientInfo: [ULONG_PTR; 62],
+    glDispatchTable: [PVOID; 233],
+    glReserved1: [ULONG_PTR; 29],
+    glReserved2: PVOID,
+    glSectionInfo: PVOID,
+    glSection: PVOID,
+    glTable: PVOID,
+    glCurrentRC: PVOID,
+    glContext: PVOID,
+    LastStatusValue: NTSTATUS,
+    StaticUnicodeString: UNICODE_STRING,
+    StaticUnicodeBuffer: [WCHAR; 261],
+    DeallocationStack: PVOID,
+    TlsSlots: [PVOID; 64],
+    TlsLinks: LIST_ENTRY,
+    Vdm: PVOID,
+    ReservedForNtRpc: PVOID,
+    DbgSsReserved: [PVOID; 2],
+    HardErrorMode: ULONG,
+    Instrumentation: [PVOID; 11],
+    ActivityId: GUID,
+    SubProcessTag: PVOID,
+    PerflibData: PVOID,
+    EtwTraceData: PVOID,
+    WinSockData: PVOID,
+    GdiBatchCount: ULONG,
+    u: TEB_u,
+    GuaranteedStackBytes: ULONG,
+    ReservedForPerf: PVOID,
+    ReservedForOle: PVOID,
+    WaitingOnLoaderLock: ULONG,
+    SavedPriorityState: PVOID,
+    ReservedForCodeCoverage: ULONG_PTR,
+    ThreadPoolData: PVOID,
+    TlsExpansionSlots: *mut PVOID,
+    DeallocationBStore: PVOID,
+    BStoreLimit: PVOID,
+    MuiGeneration: ULONG,
+    IsImpersonating: ULONG,
+    NlsCache: PVOID,
+    pShimData: PVOID,
+    HeapVirtualAffinity: USHORT,
+    LowFragHeapDataSlot: USHORT,
+    CurrentTransactionHandle: HANDLE,
+    ActiveFrame: PTEB_ACTIVE_FRAME,
+    FlsData: PVOID,
+    PreferredLanguages: PVOID,
+    UserPrefLanguages: PVOID,
+    MergedPrefLanguages: PVOID,
+    MuiImpersonation: ULONG,
+    CrossTebFlags: USHORT,
+    SameTebFlags: USHORT,
+    TxnScopeEnterCallback: PVOID,
+    TxnScopeExitCallback: PVOID,
+    TxnScopeContext: PVOID,
+    LockCount: ULONG,
+    WowTebOffset: LONG,
+    ResourceRetValue: PVOID,
+    ReservedForWdf: PVOID,
+    ReservedForCrt: ULONGLONG,
+    EffectiveContainerId: GUID,
+}}
+#[cfg(target_arch = "x86")]
+STRUCT!{struct TEB {
+    NtTib: NT_TIB,
+    EnvironmentPointer: PVOID,
+    ClientId: CLIENT_ID,
+    ActiveRpcHandle: PVOID,
+    ThreadLocalStoragePointer: PVOID,
+    ProcessEnvironmentBlock: PPEB,
+    LastErrorValue: ULONG,
+    CountOfOwnedCriticalSections: ULONG,
+    CsrClientThread: PVOID,
+    Win32ThreadInfo: PVOID,
+    User32Reserved: [ULONG; 26],
+    UserReserved: [ULONG; 5],
+    WOW32Reserved: PVOID,
+    CurrentLocale: LCID,
+    FpSoftwareStatusRegister: ULONG,
+    ReservedForDebuggerInstrumentation: [PVOID; 16],
+    SystemReserved1: [PVOID; 26],
+    PlaceholderCompatibilityMode: CHAR,
+    PlaceholderReserved: [CHAR; 11],
+    ProxiedProcessId: ULONG,
+    ActivationStack: ACTIVATION_CONTEXT_STACK,
+    WorkingOnBehalfTicket: [UCHAR; 8],
+    ExceptionCode: NTSTATUS,
+    ActivationContextStackPointer: PACTIVATION_CONTEXT_STACK,
+    InstrumentationCallbackSp: ULONG_PTR,
+    InstrumentationCallbackPreviousPc: ULONG_PTR,
+    InstrumentationCallbackPreviousSp: ULONG_PTR,
+    InstrumentationCallbackDisabled: BOOLEAN,
+    SpareBytes: [UCHAR; 23],
+    TxFsContext: ULONG,
+    GdiTebBatch: GDI_TEB_BATCH,
+    RealClientId: CLIENT_ID,
+    GdiCachedProcessHandle: HANDLE,
+    GdiClientPID: ULONG,
+    GdiClientTID: ULONG,
+    GdiThreadLocalInfo: PVOID,
+    Win32ClientInfo: [ULONG_PTR; 62],
+    glDispatchTable: [PVOID; 233],
+    glReserved1: [ULONG_PTR; 29],
+    glReserved2: PVOID,
+    glSectionInfo: PVOID,
+    glSection: PVOID,
+    glTable: PVOID,
+    glCurrentRC: PVOID,
+    glContext: PVOID,
+    LastStatusValue: NTSTATUS,
+    StaticUnicodeString: UNICODE_STRING,
+    StaticUnicodeBuffer: [WCHAR; 261],
+    DeallocationStack: PVOID,
+    TlsSlots: [PVOID; 64],
+    TlsLinks: LIST_ENTRY,
+    Vdm: PVOID,
+    ReservedForNtRpc: PVOID,
+    DbgSsReserved: [PVOID; 2],
+    HardErrorMode: ULONG,
+    Instrumentation: [PVOID; 9],
+    ActivityId: GUID,
+    SubProcessTag: PVOID,
+    PerflibData: PVOID,
+    EtwTraceData: PVOID,
+    WinSockData: PVOID,
+    GdiBatchCount: ULONG,
+    u: TEB_u,
+    GuaranteedStackBytes: ULONG,
+    ReservedForPerf: PVOID,
+    ReservedForOle: PVOID,
+    WaitingOnLoaderLock: ULONG,
+    SavedPriorityState: PVOID,
+    ReservedForCodeCoverage: ULONG_PTR,
+    ThreadPoolData: PVOID,
+    TlsExpansionSlots: *mut PVOID,
+    MuiGeneration: ULONG,
+    IsImpersonating: ULONG,
+    NlsCache: PVOID,
+    pShimData: PVOID,
+    HeapVirtualAffinity: USHORT,
+    LowFragHeapDataSlot: USHORT,
+    CurrentTransactionHandle: HANDLE,
+    ActiveFrame: PTEB_ACTIVE_FRAME,
+    FlsData: PVOID,
+    PreferredLanguages: PVOID,
+    UserPrefLanguages: PVOID,
+    MergedPrefLanguages: PVOID,
+    MuiImpersonation: ULONG,
+    CrossTebFlags: USHORT,
+    SameTebFlags: USHORT,
+    TxnScopeEnterCallback: PVOID,
+    TxnScopeExitCallback: PVOID,
+    TxnScopeContext: PVOID,
+    LockCount: ULONG,
+    WowTebOffset: LONG,
+    ResourceRetValue: PVOID,
+    ReservedForWdf: PVOID,
+    ReservedForCrt: ULONGLONG,
+    EffectiveContainerId: GUID,
+}}
+BITFIELD!{TEB SameTebFlags: USHORT [
+    SafeThunkCall set_SafeThunkCall[0..1],
+    InDebugPrint set_InDebugPrint[1..2],
+    HasFiberData set_HasFiberData[2..3],
+    SkipThreadAttach set_SkipThreadAttach[3..4],
+    WerInShipAssertCode set_WerInShipAssertCode[4..5],
+    RanProcessInit set_RanProcessInit[5..6],
+    ClonedThread set_ClonedThread[6..7],
+    SuppressDebugMsg set_SuppressDebugMsg[7..8],
+    DisableUserStackWalk set_DisableUserStackWalk[8..9],
+    RtlExceptionAttached set_RtlExceptionAttached[9..10],
+    InitialThread set_InitialThread[10..11],
+    SessionAware set_SessionAware[11..12],
+    LoadOwner set_LoadOwner[12..13],
+    LoaderWorker set_LoaderWorker[13..14],
+    SkipLoaderInit set_SkipLoaderInit[14..15],
+    SpareSameTebBits set_SpareSameTebBits[15..16],
+]}
+pub type PTEB = *mut TEB;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpfapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpfapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpfapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpfapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,219 @@
+use crate::ntexapi::SYSTEM_MEMORY_LIST_INFORMATION;
+use crate::ntmmapi::MMPFN_IDENTITY;
+use winapi::shared::basetsd::{SIZE_T, ULONG_PTR};
+use winapi::shared::ntdef::{CHAR, LONGLONG, PVOID, ULONG, ULONGLONG, WCHAR};
+ENUM!{enum PF_BOOT_PHASE_ID {
+    PfKernelInitPhase = 0,
+    PfBootDriverInitPhase = 90,
+    PfSystemDriverInitPhase = 120,
+    PfSessionManagerInitPhase = 150,
+    PfSMRegistryInitPhase = 180,
+    PfVideoInitPhase = 210,
+    PfPostVideoInitPhase = 240,
+    PfBootAcceptedRegistryInitPhase = 270,
+    PfUserShellReadyPhase = 300,
+    PfMaxBootPhaseId = 900,
+}}
+ENUM!{enum PF_ENABLE_STATUS {
+    PfSvNotSpecified = 0,
+    PfSvEnabled = 1,
+    PfSvDisabled = 2,
+    PfSvMaxEnableStatus = 3,
+}}
+STRUCT!{struct PF_TRACE_LIMITS {
+    MaxNumPages: ULONG,
+    MaxNumSections: ULONG,
+    TimerPeriod: LONGLONG,
+}}
+pub type PPF_TRACE_LIMITS = *mut PF_TRACE_LIMITS;
+STRUCT!{struct PF_SYSTEM_PREFETCH_PARAMETERS {
+    EnableStatus: [PF_ENABLE_STATUS; 2],
+    TraceLimits: [PF_TRACE_LIMITS; 2],
+    MaxNumActiveTraces: ULONG,
+    MaxNumSavedTraces: ULONG,
+    RootDirPath: [WCHAR; 32],
+    HostingApplicationList: [WCHAR; 128],
+}}
+pub type PPF_SYSTEM_PREFETCH_PARAMETERS = *mut PF_SYSTEM_PREFETCH_PARAMETERS;
+pub const PF_BOOT_CONTROL_VERSION: u32 = 1;
+STRUCT!{struct PF_BOOT_CONTROL {
+    Version: ULONG,
+    DisableBootPrefetching: ULONG,
+}}
+pub type PPF_BOOT_CONTROL = *mut PF_BOOT_CONTROL;
+ENUM!{enum PREFETCHER_INFORMATION_CLASS {
+    PrefetcherRetrieveTrace = 1,
+    PrefetcherSystemParameters = 2,
+    PrefetcherBootPhase = 3,
+    PrefetcherRetrieveBootLoaderTrace = 4,
+    PrefetcherBootControl = 5,
+}}
+pub const PREFETCHER_INFORMATION_VERSION: ULONG = 23;
+pub const PREFETCHER_INFORMATION_MAGIC: ULONG = 0x6b756843;
+STRUCT!{struct PREFETCHER_INFORMATION {
+    Version: ULONG,
+    Magic: ULONG,
+    PrefetcherInformationClass: PREFETCHER_INFORMATION_CLASS,
+    PrefetcherInformation: PVOID,
+    PrefetcherInformationLength: ULONG,
+}}
+pub type PPREFETCHER_INFORMATION = *mut PREFETCHER_INFORMATION;
+STRUCT!{struct PF_SYSTEM_SUPERFETCH_PARAMETERS {
+    EnabledComponents: ULONG,
+    BootID: ULONG,
+    SavedSectInfoTracesMax: ULONG,
+    SavedPageAccessTracesMax: ULONG,
+    ScenarioPrefetchTimeoutStandby: ULONG,
+    ScenarioPrefetchTimeoutHibernate: ULONG,
+}}
+pub type PPF_SYSTEM_SUPERFETCH_PARAMETERS = *mut PF_SYSTEM_SUPERFETCH_PARAMETERS;
+pub const PF_PFN_PRIO_REQUEST_VERSION: u32 = 1;
+pub const PF_PFN_PRIO_REQUEST_QUERY_MEMORY_LIST: u32 = 0x1;
+pub const PF_PFN_PRIO_REQUEST_VALID_FLAGS: u32 = 0x1;
+STRUCT!{struct PF_PFN_PRIO_REQUEST {
+    Version: ULONG,
+    RequestFlags: ULONG,
+    PfnCount: ULONG_PTR,
+    MemInfo: SYSTEM_MEMORY_LIST_INFORMATION,
+    PageData: [MMPFN_IDENTITY; 256],
+}}
+pub type PPF_PFN_PRIO_REQUEST = *mut PF_PFN_PRIO_REQUEST;
+ENUM!{enum PFS_PRIVATE_PAGE_SOURCE_TYPE {
+    PfsPrivateSourceKernel = 0,
+    PfsPrivateSourceSession = 1,
+    PfsPrivateSourceProcess = 2,
+    PfsPrivateSourceMax = 3,
+}}
+UNION!{union PFS_PRIVATE_PAGE_SOURCE_u {
+    SessionId: ULONG,
+    ProcessId: ULONG,
+}}
+STRUCT!{struct PFS_PRIVATE_PAGE_SOURCE {
+    Type: PFS_PRIVATE_PAGE_SOURCE_TYPE,
+    u: PFS_PRIVATE_PAGE_SOURCE_u,
+    ImagePathHash: ULONG,
+    UniqueProcessHash: ULONG_PTR,
+}}
+UNION!{union PF_PRIVSOURCE_INFO_u {
+    WsSwapPages: ULONG_PTR,
+    SessionPagedPoolPages: ULONG_PTR,
+    StoreSizePages: ULONG_PTR,
+}}
+pub type PPFS_PRIVATE_PAGE_SOURCE = *mut PFS_PRIVATE_PAGE_SOURCE;
+STRUCT!{struct PF_PRIVSOURCE_INFO {
+    DbInfo: PFS_PRIVATE_PAGE_SOURCE,
+    EProcess: PVOID,
+    WsPrivatePages: SIZE_T,
+    TotalPrivatePages: SIZE_T,
+    SessionID: ULONG,
+    ImageName: [CHAR; 16],
+    u: PF_PRIVSOURCE_INFO_u,
+    WsTotalPages: ULONG_PTR,
+    DeepFreezeTimeMs: ULONG,
+    BitFields: ULONG,
+}}
+BITFIELD!{PF_PRIVSOURCE_INFO BitFields: ULONG [
+    ModernApp set_ModernApp[0..1],
+    DeepFrozen set_DeepFrozen[1..2],
+    Foreground set_Foreground[2..3],
+    PerProcessStore set_PerProcessStore[3..4],
+    Spare set_Spare[4..32],
+]}
+pub type PPF_PRIVSOURCE_INFO = *mut PF_PRIVSOURCE_INFO;
+pub const PF_PRIVSOURCE_QUERY_REQUEST_VERSION: u32 = 3;
+STRUCT!{struct PF_PRIVSOURCE_QUERY_REQUEST {
+    Version: ULONG,
+    Flags: ULONG,
+    InfoCount: ULONG,
+    InfoArray: [PF_PRIVSOURCE_INFO; 1],
+}}
+pub type PPF_PRIVSOURCE_QUERY_REQUEST = *mut PF_PRIVSOURCE_QUERY_REQUEST;
+ENUM!{enum PF_PHASED_SCENARIO_TYPE {
+    PfScenarioTypeNone = 0,
+    PfScenarioTypeStandby = 1,
+    PfScenarioTypeHibernate = 2,
+    PfScenarioTypeFUS = 3,
+    PfScenarioTypeMax = 4,
+}}
+pub const PF_SCENARIO_PHASE_INFO_VERSION: u32 = 4;
+STRUCT!{struct PF_SCENARIO_PHASE_INFO {
+    Version: ULONG,
+    ScenType: PF_PHASED_SCENARIO_TYPE,
+    PhaseId: ULONG,
+    SequenceNumber: ULONG,
+    Flags: ULONG,
+    FUSUserId: ULONG,
+}}
+pub type PPF_SCENARIO_PHASE_INFO = *mut PF_SCENARIO_PHASE_INFO;
+STRUCT!{struct PF_MEMORY_LIST_NODE {
+    Bitfields: ULONGLONG,
+    StandbyLowPageCount: ULONGLONG,
+    StandbyMediumPageCount: ULONGLONG,
+    StandbyHighPageCount: ULONGLONG,
+    FreePageCount: ULONGLONG,
+    ModifiedPageCount: ULONGLONG,
+}}
+BITFIELD!{PF_MEMORY_LIST_NODE Bitfields: ULONGLONG [
+    Node set_Node[0..8],
+    Spare set_Spare[8..64],
+]}
+pub type PPF_MEMORY_LIST_NODE = *mut PF_MEMORY_LIST_NODE;
+pub const PF_MEMORY_LIST_INFO_VERSION: u32 = 1;
+STRUCT!{struct PF_MEMORY_LIST_INFO {
+    Version: ULONG,
+    Size: ULONG,
+    NodeCount: ULONG,
+    Nodes: [PF_MEMORY_LIST_NODE; 1],
+}}
+pub type PPF_MEMORY_LIST_INFO = *mut PF_MEMORY_LIST_INFO;
+STRUCT!{struct PF_PHYSICAL_MEMORY_RANGE {
+    BasePfn: ULONG_PTR,
+    PageCount: ULONG_PTR,
+}}
+pub type PPF_PHYSICAL_MEMORY_RANGE = *mut PF_PHYSICAL_MEMORY_RANGE;
+pub const PF_PHYSICAL_MEMORY_RANGE_INFO_VERSION: u32 = 1;
+STRUCT!{struct PF_PHYSICAL_MEMORY_RANGE_INFO {
+    Version: ULONG,
+    RangeCount: ULONG,
+    Ranges: [PF_PHYSICAL_MEMORY_RANGE; 1],
+}}
+pub type PPF_PHYSICAL_MEMORY_RANGE_INFO = *mut PF_PHYSICAL_MEMORY_RANGE_INFO;
+pub const PF_REPURPOSED_BY_PREFETCH_INFO_VERSION: u32 = 1;
+STRUCT!{struct PF_REPURPOSED_BY_PREFETCH_INFO {
+    Version: ULONG,
+    RepurposedByPrefetch: ULONG,
+}}
+pub type PPF_REPURPOSED_BY_PREFETCH_INFO = *mut PF_REPURPOSED_BY_PREFETCH_INFO;
+ENUM!{enum SUPERFETCH_INFORMATION_CLASS {
+    SuperfetchRetrieveTrace = 1,
+    SuperfetchSystemParameters = 2,
+    SuperfetchLogEvent = 3,
+    SuperfetchGenerateTrace = 4,
+    SuperfetchPrefetch = 5,
+    SuperfetchPfnQuery = 6,
+    SuperfetchPfnSetPriority = 7,
+    SuperfetchPrivSourceQuery = 8,
+    SuperfetchSequenceNumberQuery = 9,
+    SuperfetchScenarioPhase = 10,
+    SuperfetchWorkerPriority = 11,
+    SuperfetchScenarioQuery = 12,
+    SuperfetchScenarioPrefetch = 13,
+    SuperfetchRobustnessControl = 14,
+    SuperfetchTimeControl = 15,
+    SuperfetchMemoryListQuery = 16,
+    SuperfetchMemoryRangesQuery = 17,
+    SuperfetchTracingControl = 18,
+    SuperfetchTrimWhileAgingControl = 19,
+    SuperfetchRepurposedByPrefetch = 20,
+    SuperfetchInformationMax = 21,
+}}
+pub const SUPERFETCH_INFORMATION_VERSION: ULONG = 45;
+pub const SUPERFETCH_INFORMATION_MAGIC: ULONG = 0x6b756843;
+STRUCT!{struct SUPERFETCH_INFORMATION {
+    Version: ULONG,
+    Magic: ULONG,
+    InfoClass: SUPERFETCH_INFORMATION_CLASS,
+    Data: PVOID,
+    Length: ULONG,
+}}
+pub type PSUPERFETCH_INFORMATION = *mut SUPERFETCH_INFORMATION;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpnpapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpnpapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpnpapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpnpapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,118 @@
+use winapi::shared::cfg::PNP_VETO_TYPE;
+use winapi::shared::guiddef::GUID;
+use winapi::shared::ntdef::{HANDLE, NTSTATUS, PULONG, PUNICODE_STRING, PVOID, ULONG, WCHAR};
+ENUM!{enum PLUGPLAY_EVENT_CATEGORY {
+    HardwareProfileChangeEvent = 0,
+    TargetDeviceChangeEvent = 1,
+    DeviceClassChangeEvent = 2,
+    CustomDeviceEvent = 3,
+    DeviceInstallEvent = 4,
+    DeviceArrivalEvent = 5,
+    PowerEvent = 6,
+    VetoEvent = 7,
+    BlockedDriverEvent = 8,
+    InvalidIDEvent = 9,
+    MaxPlugEventCategory = 10,
+}}
+pub type PPLUGPLAY_EVENT_CATEGORY = *mut PLUGPLAY_EVENT_CATEGORY;
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_DeviceClass {
+    ClassGuid: GUID,
+    SymbolicLinkName: [WCHAR; 1],
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_TargetDevice {
+    DeviceIds: [WCHAR; 1],
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_InstallDevice {
+    DeviceId: [WCHAR; 1],
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_CustomNotification {
+    NotificationStructure: PVOID,
+    DeviceIds: [WCHAR; 1],
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_ProfileNotification {
+    Notification: PVOID,
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_PowerNotification {
+    NotificationCode: ULONG,
+    NotificationData: ULONG,
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_VetoNotification {
+    VetoType: PNP_VETO_TYPE,
+    DeviceIdVetoNameBuffer: [WCHAR; 1],
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_BlockedDriverNotification {
+    BlockedDriverGuid: GUID,
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK_u_InvalidIDNotification {
+    ParentId: [WCHAR; 1],
+}}
+UNION!{union PLUGPLAY_EVENT_BLOCK_u {
+    DeviceClass: PLUGPLAY_EVENT_BLOCK_u_DeviceClass,
+    TargetDevice: PLUGPLAY_EVENT_BLOCK_u_TargetDevice,
+    InstallDevice: PLUGPLAY_EVENT_BLOCK_u_InstallDevice,
+    CustomNotification: PLUGPLAY_EVENT_BLOCK_u_CustomNotification,
+    ProfileNotification: PLUGPLAY_EVENT_BLOCK_u_ProfileNotification,
+    PowerNotification: PLUGPLAY_EVENT_BLOCK_u_PowerNotification,
+    VetoNotification: PLUGPLAY_EVENT_BLOCK_u_VetoNotification,
+    BlockedDriverNotification: PLUGPLAY_EVENT_BLOCK_u_BlockedDriverNotification,
+    InvalidIDNotification: PLUGPLAY_EVENT_BLOCK_u_InvalidIDNotification,
+}}
+STRUCT!{struct PLUGPLAY_EVENT_BLOCK {
+    EventGuid: GUID,
+    EventCategory: PLUGPLAY_EVENT_CATEGORY,
+    Result: PULONG,
+    Flags: ULONG,
+    TotalSize: ULONG,
+    DeviceObject: PVOID,
+    u: PLUGPLAY_EVENT_BLOCK_u,
+}}
+pub type PPLUGPLAY_EVENT_BLOCK = *mut PLUGPLAY_EVENT_BLOCK;
+ENUM!{enum PLUGPLAY_CONTROL_CLASS {
+    PlugPlayControlEnumerateDevice = 0,
+    PlugPlayControlRegisterNewDevice = 1,
+    PlugPlayControlDeregisterDevice = 2,
+    PlugPlayControlInitializeDevice = 3,
+    PlugPlayControlStartDevice = 4,
+    PlugPlayControlUnlockDevice = 5,
+    PlugPlayControlQueryAndRemoveDevice = 6,
+    PlugPlayControlUserResponse = 7,
+    PlugPlayControlGenerateLegacyDevice = 8,
+    PlugPlayControlGetInterfaceDeviceList = 9,
+    PlugPlayControlProperty = 10,
+    PlugPlayControlDeviceClassAssociation = 11,
+    PlugPlayControlGetRelatedDevice = 12,
+    PlugPlayControlGetInterfaceDeviceAlias = 13,
+    PlugPlayControlDeviceStatus = 14,
+    PlugPlayControlGetDeviceDepth = 15,
+    PlugPlayControlQueryDeviceRelations = 16,
+    PlugPlayControlTargetDeviceRelation = 17,
+    PlugPlayControlQueryConflictList = 18,
+    PlugPlayControlRetrieveDock = 19,
+    PlugPlayControlResetDevice = 20,
+    PlugPlayControlHaltDevice = 21,
+    PlugPlayControlGetBlockedDriverList = 22,
+    PlugPlayControlGetDeviceInterfaceEnabled = 23,
+    MaxPlugPlayControl = 24,
+}}
+pub type PPLUGPLAY_CONTROL_CLASS = *mut PLUGPLAY_CONTROL_CLASS;
+EXTERN!{extern "system" {
+    fn NtGetPlugPlayEvent(
+        EventHandle: HANDLE,
+        Context: PVOID,
+        EventBlock: PPLUGPLAY_EVENT_BLOCK,
+        EventBufferSize: ULONG,
+    ) -> NTSTATUS;
+    fn NtPlugPlayControl(
+        PnPControlClass: PLUGPLAY_CONTROL_CLASS,
+        PnPControlData: PVOID,
+        PnPControlDataLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtSerializeBoot() -> NTSTATUS;
+    fn NtEnableLastKnownGood() -> NTSTATUS;
+    fn NtDisableLastKnownGood() -> NTSTATUS;
+    fn NtReplacePartitionUnit(
+        TargetInstancePath: PUNICODE_STRING,
+        SpareInstancePath: PUNICODE_STRING,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpoapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpoapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpoapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpoapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,134 @@
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, LONG, NTSTATUS, PLONG, PUNICODE_STRING, PVOID, UCHAR, ULONG, UNICODE_STRING,
+    USHORT,
+};
+use winapi::um::winnt::{
+    DEVICE_POWER_STATE, EXECUTION_STATE, LATENCY_TIME, PDEVICE_POWER_STATE, PEXECUTION_STATE,
+    POWER_ACTION, POWER_INFORMATION_LEVEL, SYSTEM_POWER_STATE,
+};
+UNION!{union POWER_STATE {
+    SystemState: SYSTEM_POWER_STATE,
+    DeviceState: DEVICE_POWER_STATE,
+}}
+pub type PPOWER_STATE = *mut POWER_STATE;
+ENUM!{enum POWER_STATE_TYPE {
+    SystemPowerState = 0,
+    DevicePowerState = 1,
+}}
+pub type PPOWER_STATE_TYPE = *mut POWER_STATE_TYPE;
+STRUCT!{struct SYSTEM_POWER_STATE_CONTEXT {
+    ContextAsUlong: ULONG,
+}}
+BITFIELD!{SYSTEM_POWER_STATE_CONTEXT ContextAsUlong: ULONG [
+    Reserved1 set_Reserved1[0..8],
+    TargetSystemState set_TargetSystemState[8..12],
+    EffectiveSystemState set_EffectiveSystemState[12..16],
+    CurrentSystemState set_CurrentSystemState[16..20],
+    IgnoreHibernationPath set_IgnoreHibernationPath[20..21],
+    PseudoTransition set_PseudoTransition[21..22],
+    Reserved2 set_Reserved2[22..32],
+]}
+pub type PSYSTEM_POWER_STATE_CONTEXT = *mut SYSTEM_POWER_STATE_CONTEXT;
+STRUCT!{struct COUNTED_REASON_CONTEXT_u_s {
+    ResourceFileName: UNICODE_STRING,
+    ResourceReasonId: USHORT,
+    StringCount: ULONG,
+    ReasonStrings: PUNICODE_STRING,
+}}
+UNION!{union COUNTED_REASON_CONTEXT_u {
+    s: COUNTED_REASON_CONTEXT_u_s,
+    SimpleString: UNICODE_STRING,
+}}
+STRUCT!{struct COUNTED_REASON_CONTEXT {
+    Version: ULONG,
+    Flags: ULONG,
+    u: COUNTED_REASON_CONTEXT_u,
+}}
+pub type PCOUNTED_REASON_CONTEXT = *mut COUNTED_REASON_CONTEXT;
+ENUM!{enum POWER_STATE_HANDLER_TYPE {
+    PowerStateSleeping1 = 0,
+    PowerStateSleeping2 = 1,
+    PowerStateSleeping3 = 2,
+    PowerStateSleeping4 = 3,
+    PowerStateShutdownOff = 4,
+    PowerStateShutdownReset = 5,
+    PowerStateSleeping4Firmware = 6,
+    PowerStateMaximum = 7,
+}}
+pub type PPOWER_STATE_HANDLER_TYPE = *mut POWER_STATE_HANDLER_TYPE;
+FN!{stdcall PENTER_STATE_SYSTEM_HANDLER(
+    SystemContext: PVOID,
+) -> NTSTATUS}
+FN!{stdcall PENTER_STATE_HANDLER(
+    Context: PVOID,
+    SystemHandler: PENTER_STATE_SYSTEM_HANDLER,
+    SystemContext: PVOID,
+    NumberProcessors: LONG,
+    Number: PLONG,
+) -> NTSTATUS}
+STRUCT!{struct POWER_STATE_HANDLER {
+    Type: POWER_STATE_HANDLER_TYPE,
+    RtcWake: BOOLEAN,
+    Spare: [UCHAR; 3],
+    Handler: PENTER_STATE_HANDLER,
+    Context: PVOID,
+}}
+pub type PPOWER_STATE_HANDLER = *mut POWER_STATE_HANDLER;
+FN!{stdcall PENTER_STATE_NOTIFY_HANDLER(
+    State: POWER_STATE_HANDLER_TYPE,
+    Context: PVOID,
+    Entering: BOOLEAN,
+) -> NTSTATUS}
+STRUCT!{struct POWER_STATE_NOTIFY_HANDLER {
+    Handler: PENTER_STATE_NOTIFY_HANDLER,
+    Context: PVOID,
+}}
+pub type PPOWER_STATE_NOTIFY_HANDLER = *mut POWER_STATE_NOTIFY_HANDLER;
+STRUCT!{struct PROCESSOR_POWER_INFORMATION {
+    Number: ULONG,
+    MaxMhz: ULONG,
+    CurrentMhz: ULONG,
+    MhzLimit: ULONG,
+    MaxIdleState: ULONG,
+    CurrentIdleState: ULONG,
+}}
+pub type PPROCESSOR_POWER_INFORMATION = *mut PROCESSOR_POWER_INFORMATION;
+STRUCT!{struct SYSTEM_POWER_INFORMATION {
+    MaxIdlenessAllowed: ULONG,
+    Idleness: ULONG,
+    TimeRemaining: ULONG,
+    CoolingMode: UCHAR,
+}}
+pub type PSYSTEM_POWER_INFORMATION = *mut SYSTEM_POWER_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtPowerInformation(
+        InformationLevel: POWER_INFORMATION_LEVEL,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        OutputBuffer: PVOID,
+        OutputBufferLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtSetThreadExecutionState(
+        NewFlags: EXECUTION_STATE,
+        PreviousFlags: PEXECUTION_STATE,
+    ) -> NTSTATUS;
+    fn NtRequestWakeupLatency(
+        latency: LATENCY_TIME,
+    ) -> NTSTATUS;
+    fn NtInitiatePowerAction(
+        SystemAction: POWER_ACTION,
+        LightestSystemState: SYSTEM_POWER_STATE,
+        Flags: ULONG,
+        Asynchronous: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtSetSystemPowerState(
+        SystemAction: POWER_ACTION,
+        LightestSystemState: SYSTEM_POWER_STATE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtGetDevicePowerState(
+        Device: HANDLE,
+        State: PDEVICE_POWER_STATE,
+    ) -> NTSTATUS;
+    fn NtIsSystemResumeAutomatic() -> BOOLEAN;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpsapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpsapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntpsapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntpsapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1471 @@
+use crate::ntapi_base::{CLIENT_ID, KPRIORITY, PCLIENT_ID};
+use crate::ntexapi::{PROCESS_DISK_COUNTERS, PROCESS_ENERGY_VALUES};
+use crate::ntpebteb::{PPEB, PTEB};
+use winapi::ctypes::c_void;
+use winapi::shared::basetsd::{PSIZE_T, SIZE_T, ULONG64, ULONG_PTR};
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, LARGE_INTEGER, LIST_ENTRY, LONG, LONGLONG, NTSTATUS, NT_PRODUCT_TYPE,
+    PHANDLE, PLARGE_INTEGER, POBJECT_ATTRIBUTES, PROCESSOR_NUMBER, PSINGLE_LIST_ENTRY, PULONG,
+    PVOID, SINGLE_LIST_ENTRY, UCHAR, ULONG, ULONGLONG, UNICODE_STRING, USHORT, WCHAR,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, CONTEXT, HARDWARE_COUNTER_TYPE, IO_COUNTERS, JOBOBJECTINFOCLASS,
+    JOBOBJECT_BASIC_ACCOUNTING_INFORMATION, LDT_ENTRY, MAX_HW_COUNTERS, PCONTEXT, PJOB_SET_ARRAY,
+    PROCESS_MITIGATION_ASLR_POLICY, PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY,
+    PROCESS_MITIGATION_CHILD_PROCESS_POLICY, PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY,
+    PROCESS_MITIGATION_DYNAMIC_CODE_POLICY, PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY,
+    PROCESS_MITIGATION_FONT_DISABLE_POLICY, PROCESS_MITIGATION_IMAGE_LOAD_POLICY,
+    PROCESS_MITIGATION_PAYLOAD_RESTRICTION_POLICY, PROCESS_MITIGATION_POLICY,
+    PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY, PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY,
+    PROCESS_MITIGATION_SYSTEM_CALL_FILTER_POLICY, PSECURITY_QUALITY_OF_SERVICE,
+};
+#[cfg(all(feature = "nightly", not(target_arch = "aarch64")))]
+use crate::winapi_local::um::winnt::NtCurrentTeb;
+pub const GDI_HANDLE_BUFFER_SIZE32: usize = 34;
+pub const GDI_HANDLE_BUFFER_SIZE64: usize = 60;
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+pub const GDI_HANDLE_BUFFER_SIZE: usize = GDI_HANDLE_BUFFER_SIZE64;
+#[cfg(target_arch = "x86")]
+pub const GDI_HANDLE_BUFFER_SIZE: usize = GDI_HANDLE_BUFFER_SIZE32;
+pub type GDI_HANDLE_BUFFER = [ULONG; GDI_HANDLE_BUFFER_SIZE];
+pub type GDI_HANDLE_BUFFER32 = [ULONG; GDI_HANDLE_BUFFER_SIZE32];
+pub type GDI_HANDLE_BUFFER64 = [ULONG; GDI_HANDLE_BUFFER_SIZE];
+pub const TLS_EXPANSION_SLOTS: usize = 1024;
+STRUCT!{struct PEB_LDR_DATA {
+    Length: ULONG,
+    Initialized: BOOLEAN,
+    SsHandle: HANDLE,
+    InLoadOrderModuleList: LIST_ENTRY,
+    InMemoryOrderModuleList: LIST_ENTRY,
+    InInitializationOrderModuleList: LIST_ENTRY,
+    EntryInProgress: PVOID,
+    ShutdownInProgress: BOOLEAN,
+    ShutdownThreadId: HANDLE,
+}}
+pub type PPEB_LDR_DATA = *mut PEB_LDR_DATA;
+STRUCT!{struct INITIAL_TEB_OldInitialTeb {
+    OldStackBase: PVOID,
+    OldStackLimit: PVOID,
+}}
+STRUCT!{struct INITIAL_TEB {
+    OldInitialTeb: INITIAL_TEB_OldInitialTeb,
+    StackBase: PVOID,
+    StackLimit: PVOID,
+    StackAllocationBase: PVOID,
+}}
+pub type PINITIAL_TEB = *mut INITIAL_TEB;
+STRUCT!{struct WOW64_PROCESS {
+    Wow64: PVOID,
+}}
+pub type PWOW64_PROCESS = *mut WOW64_PROCESS;
+ENUM!{enum PROCESSINFOCLASS {
+    ProcessBasicInformation = 0,
+    ProcessQuotaLimits = 1,
+    ProcessIoCounters = 2,
+    ProcessVmCounters = 3,
+    ProcessTimes = 4,
+    ProcessBasePriority = 5,
+    ProcessRaisePriority = 6,
+    ProcessDebugPort = 7,
+    ProcessExceptionPort = 8,
+    ProcessAccessToken = 9,
+    ProcessLdtInformation = 10,
+    ProcessLdtSize = 11,
+    ProcessDefaultHardErrorMode = 12,
+    ProcessIoPortHandlers = 13,
+    ProcessPooledUsageAndLimits = 14,
+    ProcessWorkingSetWatch = 15,
+    ProcessUserModeIOPL = 16,
+    ProcessEnableAlignmentFaultFixup = 17,
+    ProcessPriorityClass = 18,
+    ProcessWx86Information = 19,
+    ProcessHandleCount = 20,
+    ProcessAffinityMask = 21,
+    ProcessPriorityBoost = 22,
+    ProcessDeviceMap = 23,
+    ProcessSessionInformation = 24,
+    ProcessForegroundInformation = 25,
+    ProcessWow64Information = 26,
+    ProcessImageFileName = 27,
+    ProcessLUIDDeviceMapsEnabled = 28,
+    ProcessBreakOnTermination = 29,
+    ProcessDebugObjectHandle = 30,
+    ProcessDebugFlags = 31,
+    ProcessHandleTracing = 32,
+    ProcessIoPriority = 33,
+    ProcessExecuteFlags = 34,
+    ProcessResourceManagement = 35,
+    ProcessCookie = 36,
+    ProcessImageInformation = 37,
+    ProcessCycleTime = 38,
+    ProcessPagePriority = 39,
+    ProcessInstrumentationCallback = 40,
+    ProcessThreadStackAllocation = 41,
+    ProcessWorkingSetWatchEx = 42,
+    ProcessImageFileNameWin32 = 43,
+    ProcessImageFileMapping = 44,
+    ProcessAffinityUpdateMode = 45,
+    ProcessMemoryAllocationMode = 46,
+    ProcessGroupInformation = 47,
+    ProcessTokenVirtualizationEnabled = 48,
+    ProcessConsoleHostProcess = 49,
+    ProcessWindowInformation = 50,
+    ProcessHandleInformation = 51,
+    ProcessMitigationPolicy = 52,
+    ProcessDynamicFunctionTableInformation = 53,
+    ProcessHandleCheckingMode = 54,
+    ProcessKeepAliveCount = 55,
+    ProcessRevokeFileHandles = 56,
+    ProcessWorkingSetControl = 57,
+    ProcessHandleTable = 58,
+    ProcessCheckStackExtentsMode = 59,
+    ProcessCommandLineInformation = 60,
+    ProcessProtectionInformation = 61,
+    ProcessMemoryExhaustion = 62,
+    ProcessFaultInformation = 63,
+    ProcessTelemetryIdInformation = 64,
+    ProcessCommitReleaseInformation = 65,
+    ProcessDefaultCpuSetsInformation = 66,
+    ProcessAllowedCpuSetsInformation = 67,
+    ProcessSubsystemProcess = 68,
+    ProcessJobMemoryInformation = 69,
+    ProcessInPrivate = 70,
+    ProcessRaiseUMExceptionOnInvalidHandleClose = 71,
+    ProcessIumChallengeResponse = 72,
+    ProcessChildProcessInformation = 73,
+    ProcessHighGraphicsPriorityInformation = 74,
+    ProcessSubsystemInformation = 75,
+    ProcessEnergyValues = 76,
+    ProcessActivityThrottleState = 77,
+    ProcessActivityThrottlePolicy = 78,
+    ProcessWin32kSyscallFilterInformation = 79,
+    ProcessDisableSystemAllowedCpuSets = 80,
+    ProcessWakeInformation = 81,
+    ProcessEnergyTrackingState = 82,
+    ProcessManageWritesToExecutableMemory = 83,
+    ProcessCaptureTrustletLiveDump = 84,
+    ProcessTelemetryCoverage = 85,
+    ProcessEnclaveInformation = 86,
+    ProcessEnableReadWriteVmLogging = 87,
+    ProcessUptimeInformation = 88,
+    ProcessImageSection = 89,
+    ProcessDebugAuthInformation = 90,
+    ProcessSystemResourceManagement = 91,
+    ProcessSequenceNumber = 92,
+    ProcessLoaderDetour = 93,
+    ProcessSecurityDomainInformation = 94,
+    ProcessCombineSecurityDomainsInformation = 95,
+    ProcessEnableLogging = 96,
+    ProcessLeapSecondInformation = 97,
+    MaxProcessInfoClass = 98,
+}}
+ENUM!{enum THREADINFOCLASS {
+    ThreadBasicInformation = 0,
+    ThreadTimes = 1,
+    ThreadPriority = 2,
+    ThreadBasePriority = 3,
+    ThreadAffinityMask = 4,
+    ThreadImpersonationToken = 5,
+    ThreadDescriptorTableEntry = 6,
+    ThreadEnableAlignmentFaultFixup = 7,
+    ThreadEventPair = 8,
+    ThreadQuerySetWin32StartAddress = 9,
+    ThreadZeroTlsCell = 10,
+    ThreadPerformanceCount = 11,
+    ThreadAmILastThread = 12,
+    ThreadIdealProcessor = 13,
+    ThreadPriorityBoost = 14,
+    ThreadSetTlsArrayAddress = 15,
+    ThreadIsIoPending = 16,
+    ThreadHideFromDebugger = 17,
+    ThreadBreakOnTermination = 18,
+    ThreadSwitchLegacyState = 19,
+    ThreadIsTerminated = 20,
+    ThreadLastSystemCall = 21,
+    ThreadIoPriority = 22,
+    ThreadCycleTime = 23,
+    ThreadPagePriority = 24,
+    ThreadActualBasePriority = 25,
+    ThreadTebInformation = 26,
+    ThreadCSwitchMon = 27,
+    ThreadCSwitchPmu = 28,
+    ThreadWow64Context = 29,
+    ThreadGroupInformation = 30,
+    ThreadUmsInformation = 31,
+    ThreadCounterProfiling = 32,
+    ThreadIdealProcessorEx = 33,
+    ThreadCpuAccountingInformation = 34,
+    ThreadSuspendCount = 35,
+    ThreadHeterogeneousCpuPolicy = 36,
+    ThreadContainerId = 37,
+    ThreadNameInformation = 38,
+    ThreadSelectedCpuSets = 39,
+    ThreadSystemThreadInformation = 40,
+    ThreadActualGroupAffinity = 41,
+    ThreadDynamicCodePolicyInfo = 42,
+    ThreadExplicitCaseSensitivity = 43,
+    ThreadWorkOnBehalfTicket = 44,
+    ThreadSubsystemInformation = 45,
+    ThreadDbgkWerReportActive = 46,
+    ThreadAttachContainer = 47,
+    ThreadManageWritesToExecutableMemory = 48,
+    ThreadPowerThrottlingState = 49,
+    ThreadWorkloadClass = 50,
+    MaxThreadInfoClass = 51,
+}}
+STRUCT!{struct PAGE_PRIORITY_INFORMATION {
+    PagePriority: ULONG,
+}}
+pub type PPAGE_PRIORITY_INFORMATION = *mut PAGE_PRIORITY_INFORMATION;
+STRUCT!{struct PROCESS_BASIC_INFORMATION {
+    ExitStatus: NTSTATUS,
+    PebBaseAddress: PPEB,
+    AffinityMask: ULONG_PTR,
+    BasePriority: KPRIORITY,
+    UniqueProcessId: HANDLE,
+    InheritedFromUniqueProcessId: HANDLE,
+}}
+pub type PPROCESS_BASIC_INFORMATION = *mut PROCESS_BASIC_INFORMATION;
+STRUCT!{struct PROCESS_EXTENDED_BASIC_INFORMATION {
+    Size: SIZE_T,
+    BasicInfo: PROCESS_BASIC_INFORMATION,
+    Flags: ULONG,
+}}
+BITFIELD!{PROCESS_EXTENDED_BASIC_INFORMATION Flags: ULONG [
+    IsProtectedProcess set_IsProtectedProcess[0..1],
+    IsWow64Process set_IsWow64Process[1..2],
+    IsProcessDeleting set_IsProcessDeleting[2..3],
+    IsCrossSessionCreate set_IsCrossSessionCreate[3..4],
+    IsFrozen set_IsFrozen[4..5],
+    IsBackground set_IsBackground[5..6],
+    IsStronglyNamed set_IsStronglyNamed[6..7],
+    IsSecureProcess set_IsSecureProcess[7..8],
+    IsSubsystemProcess set_IsSubsystemProcess[8..9],
+    SpareBits set_SpareBits[9..32],
+]}
+pub type PPROCESS_EXTENDED_BASIC_INFORMATION = *mut PROCESS_EXTENDED_BASIC_INFORMATION;
+STRUCT!{struct VM_COUNTERS {
+    PeakVirtualSize: SIZE_T,
+    VirtualSize: SIZE_T,
+    PageFaultCount: ULONG,
+    PeakWorkingSetSize: SIZE_T,
+    WorkingSetSize: SIZE_T,
+    QuotaPeakPagedPoolUsage: SIZE_T,
+    QuotaPagedPoolUsage: SIZE_T,
+    QuotaPeakNonPagedPoolUsage: SIZE_T,
+    QuotaNonPagedPoolUsage: SIZE_T,
+    PagefileUsage: SIZE_T,
+    PeakPagefileUsage: SIZE_T,
+}}
+pub type PVM_COUNTERS = *mut VM_COUNTERS;
+STRUCT!{struct VM_COUNTERS_EX {
+    PeakVirtualSize: SIZE_T,
+    VirtualSize: SIZE_T,
+    PageFaultCount: ULONG,
+    PeakWorkingSetSize: SIZE_T,
+    WorkingSetSize: SIZE_T,
+    QuotaPeakPagedPoolUsage: SIZE_T,
+    QuotaPagedPoolUsage: SIZE_T,
+    QuotaPeakNonPagedPoolUsage: SIZE_T,
+    QuotaNonPagedPoolUsage: SIZE_T,
+    PagefileUsage: SIZE_T,
+    PeakPagefileUsage: SIZE_T,
+    PrivateUsage: SIZE_T,
+}}
+pub type PVM_COUNTERS_EX = *mut VM_COUNTERS_EX;
+STRUCT!{struct VM_COUNTERS_EX2 {
+    CountersEx: VM_COUNTERS_EX,
+    PrivateWorkingSetSize: SIZE_T,
+    SharedCommitUsage: SIZE_T,
+}}
+pub type PVM_COUNTERS_EX2 = *mut VM_COUNTERS_EX2;
+STRUCT!{struct KERNEL_USER_TIMES {
+    CreateTime: LARGE_INTEGER,
+    ExitTime: LARGE_INTEGER,
+    KernelTime: LARGE_INTEGER,
+    UserTime: LARGE_INTEGER,
+}}
+pub type PKERNEL_USER_TIMES = *mut KERNEL_USER_TIMES;
+STRUCT!{struct POOLED_USAGE_AND_LIMITS {
+    PeakPagedPoolUsage: SIZE_T,
+    PagedPoolUsage: SIZE_T,
+    PagedPoolLimit: SIZE_T,
+    PeakNonPagedPoolUsage: SIZE_T,
+    NonPagedPoolUsage: SIZE_T,
+    NonPagedPoolLimit: SIZE_T,
+    PeakPagefileUsage: SIZE_T,
+    PagefileUsage: SIZE_T,
+    PagefileLimit: SIZE_T,
+}}
+pub type PPOOLED_USAGE_AND_LIMITS = *mut POOLED_USAGE_AND_LIMITS;
+pub const PROCESS_EXCEPTION_PORT_ALL_STATE_BITS: ULONG_PTR = 0x00000003;
+pub const PROCESS_EXCEPTION_PORT_ALL_STATE_FLAGS: ULONG_PTR =
+    (1 << PROCESS_EXCEPTION_PORT_ALL_STATE_BITS) - 1;
+STRUCT!{struct PROCESS_EXCEPTION_PORT {
+    ExceptionPortHandle: HANDLE,
+    StateFlags: ULONG,
+}}
+pub type PPROCESS_EXCEPTION_PORT = *mut PROCESS_EXCEPTION_PORT;
+STRUCT!{struct PROCESS_ACCESS_TOKEN {
+    Token: HANDLE,
+    Thread: HANDLE,
+}}
+pub type PPROCESS_ACCESS_TOKEN = *mut PROCESS_ACCESS_TOKEN;
+STRUCT!{struct PROCESS_LDT_INFORMATION {
+    Start: ULONG,
+    Length: ULONG,
+    LdtEntries: [LDT_ENTRY; 1],
+}}
+pub type PPROCESS_LDT_INFORMATION = *mut PROCESS_LDT_INFORMATION;
+STRUCT!{struct PROCESS_LDT_SIZE {
+    Length: ULONG,
+}}
+pub type PPROCESS_LDT_SIZE = *mut PROCESS_LDT_SIZE;
+STRUCT!{struct PROCESS_WS_WATCH_INFORMATION {
+    FaultingPc: PVOID,
+    FaultingVa: PVOID,
+}}
+pub type PPROCESS_WS_WATCH_INFORMATION = *mut PROCESS_WS_WATCH_INFORMATION;
+STRUCT!{struct PROCESS_WS_WATCH_INFORMATION_EX {
+    BasicInfo: PROCESS_WS_WATCH_INFORMATION,
+    FaultingThreadId: ULONG_PTR,
+    Flags: ULONG_PTR,
+}}
+pub type PPROCESS_WS_WATCH_INFORMATION_EX = *mut PROCESS_WS_WATCH_INFORMATION_EX;
+pub const PROCESS_PRIORITY_CLASS_UNKNOWN: u32 = 0;
+pub const PROCESS_PRIORITY_CLASS_IDLE: u32 = 1;
+pub const PROCESS_PRIORITY_CLASS_NORMAL: u32 = 2;
+pub const PROCESS_PRIORITY_CLASS_HIGH: u32 = 3;
+pub const PROCESS_PRIORITY_CLASS_REALTIME: u32 = 4;
+pub const PROCESS_PRIORITY_CLASS_BELOW_NORMAL: u32 = 5;
+pub const PROCESS_PRIORITY_CLASS_ABOVE_NORMAL: u32 = 6;
+STRUCT!{struct PROCESS_PRIORITY_CLASS {
+    Foreground: BOOLEAN,
+    PriorityClass: UCHAR,
+}}
+pub type PPROCESS_PRIORITY_CLASS = *mut PROCESS_PRIORITY_CLASS;
+STRUCT!{struct PROCESS_FOREGROUND_BACKGROUND {
+    Foreground: BOOLEAN,
+}}
+pub type PPROCESS_FOREGROUND_BACKGROUND = *mut PROCESS_FOREGROUND_BACKGROUND;
+STRUCT!{struct PROCESS_DEVICEMAP_INFORMATION_Set {
+    DirectoryHandle: HANDLE,
+}}
+STRUCT!{struct PROCESS_DEVICEMAP_INFORMATION_Query {
+    DriveMap: ULONG,
+    DriveType: [UCHAR; 32],
+}}
+UNION!{union PROCESS_DEVICEMAP_INFORMATION {
+    Set: PROCESS_DEVICEMAP_INFORMATION_Set,
+    Query: PROCESS_DEVICEMAP_INFORMATION_Query,
+}}
+pub type PPROCESS_DEVICEMAP_INFORMATION = *mut PROCESS_DEVICEMAP_INFORMATION;
+pub const PROCESS_LUID_DOSDEVICES_ONLY: ULONG = 0x00000001;
+STRUCT!{struct PROCESS_DEVICEMAP_INFORMATION_EX_u_Set {
+    DirectoryHandle: HANDLE,
+}}
+STRUCT!{struct PROCESS_DEVICEMAP_INFORMATION_EX_u_Query {
+    DriveMap: ULONG,
+    DriveType: [UCHAR; 32],
+}}
+UNION!{union PROCESS_DEVICEMAP_INFORMATION_EX_u {
+    Set: PROCESS_DEVICEMAP_INFORMATION_EX_u_Set,
+    Query: PROCESS_DEVICEMAP_INFORMATION_EX_u_Query,
+}}
+STRUCT!{struct PROCESS_DEVICEMAP_INFORMATION_EX {
+    u: PROCESS_DEVICEMAP_INFORMATION_EX_u,
+    Flags: ULONG,
+}}
+pub type PPROCESS_DEVICEMAP_INFORMATION_EX = *mut PROCESS_DEVICEMAP_INFORMATION_EX;
+STRUCT!{struct PROCESS_SESSION_INFORMATION {
+    SessionId: ULONG,
+}}
+pub type PPROCESS_SESSION_INFORMATION = *mut PROCESS_SESSION_INFORMATION;
+pub const PROCESS_HANDLE_EXCEPTIONS_ENABLED: ULONG = 0x00000001;
+pub const PROCESS_HANDLE_RAISE_EXCEPTION_ON_INVALID_HANDLE_CLOSE_DISABLED: ULONG = 0x00000000;
+pub const PROCESS_HANDLE_RAISE_EXCEPTION_ON_INVALID_HANDLE_CLOSE_ENABLED: ULONG = 0x00000001;
+STRUCT!{struct PROCESS_HANDLE_TRACING_ENABLE {
+    Flags: ULONG,
+}}
+pub type PPROCESS_HANDLE_TRACING_ENABLE = *mut PROCESS_HANDLE_TRACING_ENABLE;
+pub const PROCESS_HANDLE_TRACING_MAX_SLOTS: ULONG = 0x20000;
+STRUCT!{struct PROCESS_HANDLE_TRACING_ENABLE_EX {
+    Flags: ULONG,
+    TotalSlots: ULONG,
+}}
+pub type PPROCESS_HANDLE_TRACING_ENABLE_EX = *mut PROCESS_HANDLE_TRACING_ENABLE_EX;
+pub const PROCESS_HANDLE_TRACING_MAX_STACKS: usize = 16;
+pub const PROCESS_HANDLE_TRACE_TYPE_OPEN: ULONG = 1;
+pub const PROCESS_HANDLE_TRACE_TYPE_CLOSE: ULONG = 2;
+pub const PROCESS_HANDLE_TRACE_TYPE_BADREF: ULONG = 3;
+STRUCT!{struct PROCESS_HANDLE_TRACING_ENTRY {
+    Handle: HANDLE,
+    ClientId: CLIENT_ID,
+    Type: ULONG,
+    Stacks: [PVOID; PROCESS_HANDLE_TRACING_MAX_STACKS],
+}}
+pub type PPROCESS_HANDLE_TRACING_ENTRY = *mut PROCESS_HANDLE_TRACING_ENTRY;
+STRUCT!{struct PROCESS_HANDLE_TRACING_QUERY {
+    Handle: HANDLE,
+    TotalTraces: ULONG,
+    HandleTrace: [PROCESS_HANDLE_TRACING_ENTRY; 1],
+}}
+pub type PPROCESS_HANDLE_TRACING_QUERY = *mut PROCESS_HANDLE_TRACING_QUERY;
+STRUCT!{struct THREAD_TLS_INFORMATION {
+    Flags: ULONG,
+    NewTlsData: PVOID,
+    OldTlsData: PVOID,
+    ThreadId: HANDLE,
+}}
+pub type PTHREAD_TLS_INFORMATION = *mut THREAD_TLS_INFORMATION;
+ENUM!{enum PROCESS_TLS_INFORMATION_TYPE {
+    ProcessTlsReplaceIndex = 0,
+    ProcessTlsReplaceVector = 1,
+    MaxProcessTlsOperation = 2,
+}}
+pub type PPROCESS_TLS_INFORMATION_TYPE = *mut PROCESS_TLS_INFORMATION_TYPE;
+STRUCT!{struct PROCESS_TLS_INFORMATION {
+    Flags: ULONG,
+    OperationType: ULONG,
+    ThreadDataCount: ULONG,
+    TlsIndex: ULONG,
+    PreviousCount: ULONG,
+    ThreadData: [THREAD_TLS_INFORMATION; 1],
+}}
+pub type PPROCESS_TLS_INFORMATION = *mut PROCESS_TLS_INFORMATION;
+STRUCT!{struct PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION {
+    Version: ULONG,
+    Reserved: ULONG,
+    Callback: PVOID,
+}}
+pub type PPROCESS_INSTRUMENTATION_CALLBACK_INFORMATION =
+    *mut PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION;
+STRUCT!{struct PROCESS_STACK_ALLOCATION_INFORMATION {
+    ReserveSize: SIZE_T,
+    ZeroBits: SIZE_T,
+    StackBase: PVOID,
+}}
+pub type PPROCESS_STACK_ALLOCATION_INFORMATION = *mut PROCESS_STACK_ALLOCATION_INFORMATION;
+STRUCT!{struct PROCESS_STACK_ALLOCATION_INFORMATION_EX {
+    PreferredNode: ULONG,
+    Reserved0: ULONG,
+    Reserved1: ULONG,
+    Reserved2: ULONG,
+    AllocInfo: PROCESS_STACK_ALLOCATION_INFORMATION,
+}}
+pub type PPROCESS_STACK_ALLOCATION_INFORMATION_EX = *mut PROCESS_STACK_ALLOCATION_INFORMATION_EX;
+STRUCT!{struct PROCESS_AFFINITY_UPDATE_MODE {
+    Flags: ULONG,
+}}
+BITFIELD!{PROCESS_AFFINITY_UPDATE_MODE Flags: ULONG [
+    EnableAutoUpdate set_EnableAutoUpdate[0..1],
+    Permanent set_Permanent[1..2],
+    Reserved set_Reserved[2..32],
+]}
+pub type PPROCESS_AFFINITY_UPDATE_MODE = *mut PROCESS_AFFINITY_UPDATE_MODE;
+STRUCT!{struct PROCESS_MEMORY_ALLOCATION_MODE {
+    Flags: ULONG,
+}}
+BITFIELD!{PROCESS_MEMORY_ALLOCATION_MODE Flags: ULONG [
+    TopDown set_TopDown[0..1],
+    Reserved set_Reserved[1..32],
+]}
+pub type PPROCESS_MEMORY_ALLOCATION_MODE = *mut PROCESS_MEMORY_ALLOCATION_MODE;
+STRUCT!{struct PROCESS_HANDLE_INFORMATION {
+    HandleCount: ULONG,
+    HandleCountHighWatermark: ULONG,
+}}
+pub type PPROCESS_HANDLE_INFORMATION = *mut PROCESS_HANDLE_INFORMATION;
+STRUCT!{struct PROCESS_CYCLE_TIME_INFORMATION {
+    AccumulatedCycles: ULONGLONG,
+    CurrentCycleCount: ULONGLONG,
+}}
+pub type PPROCESS_CYCLE_TIME_INFORMATION = *mut PROCESS_CYCLE_TIME_INFORMATION;
+STRUCT!{struct PROCESS_WINDOW_INFORMATION {
+    WindowFlags: ULONG,
+    WindowTitleLength: USHORT,
+    WindowTitle: [WCHAR; 1],
+}}
+pub type PPROCESS_WINDOW_INFORMATION = *mut PROCESS_WINDOW_INFORMATION;
+STRUCT!{struct PROCESS_HANDLE_TABLE_ENTRY_INFO {
+    HandleValue: HANDLE,
+    HandleCount: ULONG_PTR,
+    PointerCount: ULONG_PTR,
+    GrantedAccess: ULONG,
+    ObjectTypeIndex: ULONG,
+    HandleAttributes: ULONG,
+    Reserved: ULONG,
+}}
+pub type PPROCESS_HANDLE_TABLE_ENTRY_INFO = *mut PROCESS_HANDLE_TABLE_ENTRY_INFO;
+STRUCT!{struct PROCESS_HANDLE_SNAPSHOT_INFORMATION {
+    NumberOfHandles: ULONG_PTR,
+    Reserved: ULONG_PTR,
+    Handles: [PROCESS_HANDLE_TABLE_ENTRY_INFO; 1],
+}}
+pub type PPROCESS_HANDLE_SNAPSHOT_INFORMATION = *mut PROCESS_HANDLE_SNAPSHOT_INFORMATION;
+UNION!{union PROCESS_MITIGATION_POLICY_INFORMATION_u {
+    ASLRPolicy: PROCESS_MITIGATION_ASLR_POLICY,
+    StrictHandleCheckPolicy: PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY,
+    SystemCallDisablePolicy: PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY,
+    ExtensionPointDisablePolicy: PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY,
+    DynamicCodePolicy: PROCESS_MITIGATION_DYNAMIC_CODE_POLICY,
+    ControlFlowGuardPolicy: PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY,
+    SignaturePolicy: PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY,
+    FontDisablePolicy: PROCESS_MITIGATION_FONT_DISABLE_POLICY,
+    ImageLoadPolicy: PROCESS_MITIGATION_IMAGE_LOAD_POLICY,
+    SystemCallFilterPolicy: PROCESS_MITIGATION_SYSTEM_CALL_FILTER_POLICY,
+    PayloadRestrictionPolicy: PROCESS_MITIGATION_PAYLOAD_RESTRICTION_POLICY,
+    ChildProcessPolicy: PROCESS_MITIGATION_CHILD_PROCESS_POLICY,
+    // SideChannelIsolationPolicy: PROCESS_MITIGATION_SIDE_CHANNEL_ISOLATION_POLICY, //TODO
+}}
+STRUCT!{struct PROCESS_MITIGATION_POLICY_INFORMATION {
+    Policy: PROCESS_MITIGATION_POLICY,
+    u: PROCESS_MITIGATION_POLICY_INFORMATION_u,
+}}
+pub type PPROCESS_MITIGATION_POLICY_INFORMATION = *mut PROCESS_MITIGATION_POLICY_INFORMATION;
+STRUCT!{struct PROCESS_KEEPALIVE_COUNT_INFORMATION {
+    WakeCount: ULONG,
+    NoWakeCount: ULONG,
+}}
+pub type PPROCESS_KEEPALIVE_COUNT_INFORMATION = *mut PROCESS_KEEPALIVE_COUNT_INFORMATION;
+STRUCT!{struct PROCESS_REVOKE_FILE_HANDLES_INFORMATION {
+    TargetDevicePath: UNICODE_STRING,
+}}
+pub type PPROCESS_REVOKE_FILE_HANDLES_INFORMATION = *mut PROCESS_REVOKE_FILE_HANDLES_INFORMATION;
+ENUM!{enum PROCESS_WORKING_SET_OPERATION {
+    ProcessWorkingSetSwap = 0,
+    ProcessWorkingSetEmpty = 1,
+    ProcessWorkingSetOperationMax = 2,
+}}
+STRUCT!{struct PROCESS_WORKING_SET_CONTROL {
+    Version: ULONG,
+    Operation: PROCESS_WORKING_SET_OPERATION,
+    Flags: ULONG,
+}}
+pub type PPROCESS_WORKING_SET_CONTROL = *mut PROCESS_WORKING_SET_CONTROL;
+ENUM!{enum PS_PROTECTED_TYPE {
+    PsProtectedTypeNone = 0,
+    PsProtectedTypeProtectedLight = 1,
+    PsProtectedTypeProtected = 2,
+    PsProtectedTypeMax = 3,
+}}
+ENUM!{enum PS_PROTECTED_SIGNER {
+    PsProtectedSignerNone = 0,
+    PsProtectedSignerAuthenticode = 1,
+    PsProtectedSignerCodeGen = 2,
+    PsProtectedSignerAntimalware = 3,
+    PsProtectedSignerLsa = 4,
+    PsProtectedSignerWindows = 5,
+    PsProtectedSignerWinTcb = 6,
+    PsProtectedSignerWinSystem = 7,
+    PsProtectedSignerApp = 8,
+    PsProtectedSignerMax = 9,
+}}
+pub const PS_PROTECTED_SIGNER_MASK: UCHAR = 0xFF;
+pub const PS_PROTECTED_AUDIT_MASK: UCHAR = 0x08;
+pub const PS_PROTECTED_TYPE_MASK: UCHAR = 0x07;
+#[inline]
+pub const fn PsProtectedValue(
+    aSigner: PS_PROTECTED_SIGNER,
+    aAudit: u8,
+    aType: PS_PROTECTED_TYPE,
+) -> UCHAR {
+    (aSigner as u8 & PS_PROTECTED_SIGNER_MASK) << 4 | (aAudit & PS_PROTECTED_AUDIT_MASK) << 3
+        | (aType as u8 & PS_PROTECTED_TYPE_MASK)
+}
+#[inline]
+pub fn InitializePsProtection(
+    aProtectionLevelPtr: &mut PS_PROTECTION,
+    aSigner: PS_PROTECTED_SIGNER,
+    aAudit: u8,
+    aType: PS_PROTECTED_TYPE,
+) {
+    aProtectionLevelPtr.set_Signer(aSigner as u8);
+    aProtectionLevelPtr.set_Audit(aAudit);
+    aProtectionLevelPtr.set_Type(aType as u8);
+}
+STRUCT!{struct PS_PROTECTION {
+    Level: UCHAR,
+}}
+pub type PPS_PROTECTION = *mut PS_PROTECTION;
+BITFIELD!{PS_PROTECTION Level: UCHAR [
+    Type set_Type[0..3],
+    Audit set_Audit[3..4],
+    Signer set_Signer[4..8],
+]}
+STRUCT!{struct PROCESS_FAULT_INFORMATION {
+    FaultFlags: ULONG,
+    AdditionalInfo: ULONG,
+}}
+pub type PPROCESS_FAULT_INFORMATION = *mut PROCESS_FAULT_INFORMATION;
+STRUCT!{struct PROCESS_TELEMETRY_ID_INFORMATION {
+    HeaderSize: ULONG,
+    ProcessId: ULONG,
+    ProcessStartKey: ULONGLONG,
+    CreateTime: ULONGLONG,
+    CreateInterruptTime: ULONGLONG,
+    CreateUnbiasedInterruptTime: ULONGLONG,
+    ProcessSequenceNumber: ULONGLONG,
+    SessionCreateTime: ULONGLONG,
+    SessionId: ULONG,
+    BootId: ULONG,
+    ImageChecksum: ULONG,
+    ImageTimeDateStamp: ULONG,
+    UserSidOffset: ULONG,
+    ImagePathOffset: ULONG,
+    PackageNameOffset: ULONG,
+    RelativeAppNameOffset: ULONG,
+    CommandLineOffset: ULONG,
+}}
+pub type PPROCESS_TELEMETRY_ID_INFORMATION = *mut PROCESS_TELEMETRY_ID_INFORMATION;
+STRUCT!{struct PROCESS_COMMIT_RELEASE_INFORMATION {
+    Version: ULONG,
+    s: ULONG,
+    CommitDebt: SIZE_T,
+    CommittedMemResetSize: SIZE_T,
+    RepurposedMemResetSize: SIZE_T,
+}}
+BITFIELD!{PROCESS_COMMIT_RELEASE_INFORMATION s: ULONG [
+    Eligible set_Eligible[0..1],
+    ReleaseRepurposedMemResetCommit set_ReleaseRepurposedMemResetCommit[1..2],
+    ForceReleaseMemResetCommit set_ForceReleaseMemResetCommit[2..3],
+    Spare set_Spare[3..32],
+]}
+pub type PPROCESS_COMMIT_RELEASE_INFORMATION = *mut PROCESS_COMMIT_RELEASE_INFORMATION;
+STRUCT!{struct PROCESS_JOB_MEMORY_INFO {
+    SharedCommitUsage: ULONGLONG,
+    PrivateCommitUsage: ULONGLONG,
+    PeakPrivateCommitUsage: ULONGLONG,
+    PrivateCommitLimit: ULONGLONG,
+    TotalCommitLimit: ULONGLONG,
+}}
+pub type PPROCESS_JOB_MEMORY_INFO = *mut PROCESS_JOB_MEMORY_INFO;
+STRUCT!{struct PROCESS_CHILD_PROCESS_INFORMATION {
+    ProhibitChildProcesses: BOOLEAN,
+    AlwaysAllowSecureChildProcess: BOOLEAN,
+    AuditProhibitChildProcesses: BOOLEAN,
+}}
+pub type PPROCESS_CHILD_PROCESS_INFORMATION = *mut PROCESS_CHILD_PROCESS_INFORMATION;
+STRUCT!{struct PROCESS_WAKE_INFORMATION {
+    NotificationChannel: ULONGLONG,
+    WakeCounters: [ULONG; 7],
+    WakeFilter: *mut JOBOBJECT_WAKE_FILTER,
+}}
+pub type PPROCESS_WAKE_INFORMATION = *mut PROCESS_WAKE_INFORMATION;
+STRUCT!{struct PROCESS_ENERGY_TRACKING_STATE {
+    StateUpdateMask: ULONG,
+    StateDesiredValue: ULONG,
+    StateSequence: ULONG,
+    UpdateTag: ULONG,
+    Tag: [WCHAR; 64],
+}}
+pub type PPROCESS_ENERGY_TRACKING_STATE = *mut PROCESS_ENERGY_TRACKING_STATE;
+BITFIELD!{PROCESS_ENERGY_TRACKING_STATE UpdateTag: ULONG [
+    UpdateTag set_UpdateTag[0..1],
+]}
+STRUCT!{struct MANAGE_WRITES_TO_EXECUTABLE_MEMORY {
+    BitFields: ULONG,
+}}
+BITFIELD!{MANAGE_WRITES_TO_EXECUTABLE_MEMORY BitFields: ULONG [
+    Machine set_Machine[0..16],
+    KernelMode set_KernelMode[16..17],
+    UserMode set_UserMode[17..18],
+    Native set_Native[18..19],
+    Process set_Process[19..20],
+    ReservedZero0 set_ReservedZero0[20..32],
+]}
+pub type PMANAGE_WRITES_TO_EXECUTABLE_MEMORY = *mut MANAGE_WRITES_TO_EXECUTABLE_MEMORY;
+pub const PROCESS_READWRITEVM_LOGGING_ENABLE_READVM: UCHAR = 1;
+pub const PROCESS_READWRITEVM_LOGGING_ENABLE_WRITEVM: UCHAR = 2;
+pub const PROCESS_READWRITEVM_LOGGING_ENABLE_READVM_V: UCHAR = 1;
+pub const PROCESS_READWRITEVM_LOGGING_ENABLE_WRITEVM_V: UCHAR = 2;
+STRUCT!{struct PROCESS_READWRITEVM_LOGGING_INFORMATION {
+    Flags: UCHAR,
+}}
+BITFIELD!{PROCESS_READWRITEVM_LOGGING_INFORMATION Flags: UCHAR [
+    EnableReadVmLogging set_EnableReadVmLogging[0..1],
+    EnableWriteVmLogging set_EnableWriteVmLogging[1..2],
+    Unused set_Unused[2..8],
+]}
+UNION!{union PROCESS_UPTIME_INFORMATION_u {
+    HangCount: ULONG,
+    GhostCount: ULONG,
+    Crashed: ULONG,
+    Terminated: ULONG,
+}}
+pub type PPROCESS_READWRITEVM_LOGGING_INFORMATION = *mut PROCESS_READWRITEVM_LOGGING_INFORMATION;
+STRUCT!{struct PROCESS_UPTIME_INFORMATION {
+    QueryInterruptTime: ULONGLONG,
+    QueryUnbiasedTime: ULONGLONG,
+    EndInterruptTime: ULONGLONG,
+    TimeSinceCreation: ULONGLONG,
+    Uptime: ULONGLONG,
+    SuspendedTime: ULONGLONG,
+    u: PROCESS_UPTIME_INFORMATION_u,
+}}
+pub type PPROCESS_UPTIME_INFORMATION = *mut PROCESS_UPTIME_INFORMATION;
+STRUCT!{struct PROCESS_SYSTEM_RESOURCE_MANAGEMENT {
+    Flags: ULONG,
+}}
+pub type PPROCESS_SYSTEM_RESOURCE_MANAGEMENT = *mut PROCESS_SYSTEM_RESOURCE_MANAGEMENT;
+BITFIELD!{PROCESS_SYSTEM_RESOURCE_MANAGEMENT Flags: ULONG [
+    Foreground set_Foreground[0..1],
+    Reserved set_Reserved[1..32],
+]}
+STRUCT!{struct PROCESS_SECURITY_DOMAIN_INFORMATION {
+    SecurityDomain: ULONGLONG,
+}}
+pub type PPROCESS_SECURITY_DOMAIN_INFORMATION = *mut PROCESS_SECURITY_DOMAIN_INFORMATION;
+STRUCT!{struct PROCESS_COMBINE_SECURITY_DOMAINS_INFORMATION {
+    ProcessHandle: HANDLE,
+}}
+pub type PPROCESS_COMBINE_SECURITY_DOMAINS_INFORMATION =
+    *mut PROCESS_COMBINE_SECURITY_DOMAINS_INFORMATION;
+STRUCT!{struct PROCESS_LOGGING_INFORMATION {
+    Flags: ULONG,
+    BitFields: ULONG,
+}}
+BITFIELD!{PROCESS_LOGGING_INFORMATION BitFields: ULONG [
+    EnableReadVmLogging set_EnableReadVmLogging[0..1],
+    EnableWriteVmLogging set_EnableWriteVmLogging[1..2],
+    EnableProcessSuspendResumeLogging set_EnableProcessSuspendResumeLogging[2..3],
+    EnableThreadSuspendResumeLogging set_EnableThreadSuspendResumeLogging[3..4],
+    Reserved set_Reserved[4..32],
+]}
+pub type PPROCESS_LOGGING_INFORMATION = *mut PROCESS_LOGGING_INFORMATION;
+STRUCT!{struct PROCESS_LEAP_SECOND_INFORMATION {
+    Flags: ULONG,
+    Reserved: ULONG,
+}}
+pub type PPROCESS_LEAP_SECOND_INFORMATION = *mut PROCESS_LEAP_SECOND_INFORMATION;
+STRUCT!{struct THREAD_BASIC_INFORMATION {
+    ExitStatus: NTSTATUS,
+    TebBaseAddress: PTEB,
+    ClientId: CLIENT_ID,
+    AffinityMask: ULONG_PTR,
+    Priority: KPRIORITY,
+    BasePriority: LONG,
+}}
+pub type PTHREAD_BASIC_INFORMATION = *mut THREAD_BASIC_INFORMATION;
+STRUCT!{struct THREAD_LAST_SYSCALL_INFORMATION {
+    FirstArgument: PVOID,
+    SystemCallNumber: USHORT,
+    Pad: [USHORT; 1],
+    WaitTime: ULONG64,
+}}
+pub type PTHREAD_LAST_SYSCALL_INFORMATION = *mut THREAD_LAST_SYSCALL_INFORMATION;
+STRUCT!{struct THREAD_CYCLE_TIME_INFORMATION {
+    AccumulatedCycles: ULONGLONG,
+    CurrentCycleCount: ULONGLONG,
+}}
+pub type PTHREAD_CYCLE_TIME_INFORMATION = *mut THREAD_CYCLE_TIME_INFORMATION;
+STRUCT!{struct THREAD_TEB_INFORMATION {
+    TebInformation: PVOID,
+    TebOffset: ULONG,
+    BytesToRead: ULONG,
+}}
+pub type PTHREAD_TEB_INFORMATION = *mut THREAD_TEB_INFORMATION;
+STRUCT!{struct COUNTER_READING {
+    Type: HARDWARE_COUNTER_TYPE,
+    Index: ULONG,
+    Start: ULONG64,
+    Total: ULONG64,
+}}
+pub type PCOUNTER_READING = *mut COUNTER_READING;
+STRUCT!{struct THREAD_PERFORMANCE_DATA {
+    Size: USHORT,
+    Version: USHORT,
+    ProcessorNumber: PROCESSOR_NUMBER,
+    ContextSwitches: ULONG,
+    HwCountersCount: ULONG,
+    UpdateCount: ULONG64,
+    WaitReasonBitMap: ULONG64,
+    HardwareCounters: ULONG64,
+    CycleTime: COUNTER_READING,
+    HwCounters: [COUNTER_READING; MAX_HW_COUNTERS],
+}}
+pub type PTHREAD_PERFORMANCE_DATA = *mut THREAD_PERFORMANCE_DATA;
+STRUCT!{struct THREAD_PROFILING_INFORMATION {
+    HardwareCounters: ULONG64,
+    Flags: ULONG,
+    Enable: ULONG,
+    PerformanceData: PTHREAD_PERFORMANCE_DATA,
+}}
+pub type PTHREAD_PROFILING_INFORMATION = *mut THREAD_PROFILING_INFORMATION;
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+STRUCT!{#[repr(align(16))] struct RTL_UMS_CONTEXT {
+    Link: SINGLE_LIST_ENTRY,
+    __padding: u64,
+    Context: CONTEXT,
+    Teb: PVOID,
+    UserContext: PVOID,
+    ScheduledThread: ULONG,
+    Suspended: ULONG,
+    VolatileContext: ULONG,
+    Terminated: ULONG,
+    DebugActive: ULONG,
+    RunningOnSelfThread: ULONG,
+    DenyRunningOnSelfThread: ULONG,
+    Flags: LONG,
+    KernelUpdateLock: ULONG64,
+    PrimaryClientID: ULONG64,
+    ContextLock: ULONG64,
+    PrimaryUmsContext: *mut RTL_UMS_CONTEXT,
+    SwitchCount: ULONG,
+    KernelYieldCount: ULONG,
+    MixedYieldCount: ULONG,
+    YieldCount: ULONG,
+}}
+#[cfg(target_arch = "x86")]
+STRUCT!{struct RTL_UMS_CONTEXT {
+    Link: SINGLE_LIST_ENTRY,
+    Context: CONTEXT,
+    Teb: PVOID,
+    UserContext: PVOID,
+    ScheduledThread: ULONG,
+    Suspended: ULONG,
+    VolatileContext: ULONG,
+    Terminated: ULONG,
+    DebugActive: ULONG,
+    RunningOnSelfThread: ULONG,
+    DenyRunningOnSelfThread: ULONG,
+    Flags: LONG,
+    KernelUpdateLock: ULONG64,
+    PrimaryClientID: ULONG64,
+    ContextLock: ULONG64,
+    PrimaryUmsContext: *mut RTL_UMS_CONTEXT,
+    SwitchCount: ULONG,
+    KernelYieldCount: ULONG,
+    MixedYieldCount: ULONG,
+    YieldCount: ULONG,
+    __padding: u32,
+}}
+pub type PRTL_UMS_CONTEXT = *mut RTL_UMS_CONTEXT;
+ENUM!{enum THREAD_UMS_INFORMATION_COMMAND {
+    UmsInformationCommandInvalid = 0,
+    UmsInformationCommandAttach = 1,
+    UmsInformationCommandDetach = 2,
+    UmsInformationCommandQuery = 3,
+}}
+STRUCT!{struct RTL_UMS_COMPLETION_LIST {
+    ThreadListHead: PSINGLE_LIST_ENTRY,
+    CompletionEvent: PVOID,
+    CompletionFlags: ULONG,
+    InternalListHead: SINGLE_LIST_ENTRY,
+}}
+pub type PRTL_UMS_COMPLETION_LIST = *mut RTL_UMS_COMPLETION_LIST;
+STRUCT!{struct THREAD_UMS_INFORMATION {
+    Command: THREAD_UMS_INFORMATION_COMMAND,
+    CompletionList: PRTL_UMS_COMPLETION_LIST,
+    UmsContext: PRTL_UMS_CONTEXT,
+    Flags: ULONG,
+}}
+BITFIELD!{THREAD_UMS_INFORMATION Flags: ULONG [
+    IsUmsSchedulerThread set_IsUmsSchedulerThread[0..1],
+    IsUmsWorkerThread set_IsUmsWorkerThread[1..2],
+    SpareBits set_SpareBits[2..32],
+]}
+pub type PTHREAD_UMS_INFORMATION = *mut THREAD_UMS_INFORMATION;
+STRUCT!{struct THREAD_NAME_INFORMATION {
+    ThreadName: UNICODE_STRING,
+}}
+pub type PTHREAD_NAME_INFORMATION = *mut THREAD_NAME_INFORMATION;
+ENUM!{enum SUBSYSTEM_INFORMATION_TYPE {
+    SubsystemInformationTypeWin32 = 0,
+    SubsystemInformationTypeWSL = 1,
+    MaxSubsystemInformationType = 2,
+}}
+ENUM!{enum THREAD_WORKLOAD_CLASS {
+    ThreadWorkloadClassDefault = 0,
+    ThreadWorkloadClassGraphics = 1,
+    MaxThreadWorkloadClass = 2,
+}}
+EXTERN!{extern "system" {
+    fn NtCreateProcess(
+        ProcessHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ParentProcess: HANDLE,
+        InheritObjectTable: BOOLEAN,
+        SectionHandle: HANDLE,
+        DebugPort: HANDLE,
+        ExceptionPort: HANDLE,
+    ) -> NTSTATUS;
+}}
+pub const PROCESS_CREATE_FLAGS_BREAKAWAY: ULONG = 0x00000001;
+pub const PROCESS_CREATE_FLAGS_NO_DEBUG_INHERIT: ULONG = 0x00000002;
+pub const PROCESS_CREATE_FLAGS_INHERIT_HANDLES: ULONG = 0x00000004;
+pub const PROCESS_CREATE_FLAGS_OVERRIDE_ADDRESS_SPACE: ULONG = 0x00000008;
+pub const PROCESS_CREATE_FLAGS_LARGE_PAGES: ULONG = 0x00000010;
+EXTERN!{extern "system" {
+    fn NtCreateProcessEx(
+        ProcessHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ParentProcess: HANDLE,
+        Flags: ULONG,
+        SectionHandle: HANDLE,
+        DebugPort: HANDLE,
+        ExceptionPort: HANDLE,
+        JobMemberLevel: ULONG,
+    ) -> NTSTATUS;
+    fn NtOpenProcess(
+        ProcessHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ClientId: PCLIENT_ID,
+    ) -> NTSTATUS;
+    fn NtTerminateProcess(
+        ProcessHandle: HANDLE,
+        ExitStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn NtSuspendProcess(
+        ProcessHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtResumeProcess(
+        ProcessHandle: HANDLE,
+    ) -> NTSTATUS;
+}}
+pub const NtCurrentProcess: HANDLE = -1isize as *mut c_void;
+pub const ZwCurrentProcess: HANDLE = NtCurrentProcess;
+pub const NtCurrentThread: HANDLE = -2isize as *mut c_void;
+pub const ZwCurrentThread: HANDLE = NtCurrentThread;
+pub const NtCurrentSession: HANDLE = -3isize as *mut c_void;
+pub const ZwCurrentSession: HANDLE = NtCurrentSession;
+#[inline] #[cfg(all(feature = "nightly", not(target_arch = "aarch64")))]
+pub unsafe fn NtCurrentPeb() -> PPEB {
+    (*NtCurrentTeb()).ProcessEnvironmentBlock
+}
+pub const NtCurrentProcessToken: HANDLE = -4isize as *mut c_void;
+pub const NtCurrentThreadToken: HANDLE = -5isize as *mut c_void;
+pub const NtCurrentEffectiveToken: HANDLE = -6isize as *mut c_void;
+pub const NtCurrentSilo: HANDLE = -1isize as *mut c_void;
+#[inline] #[cfg(all(feature = "nightly", not(target_arch = "aarch64")))]
+pub unsafe fn NtCurrentProcessId() -> HANDLE {
+    (*NtCurrentTeb()).ClientId.UniqueProcess
+}
+#[inline] #[cfg(all(feature = "nightly", not(target_arch = "aarch64")))]
+pub unsafe fn NtCurrentThreadId() -> HANDLE {
+    (*NtCurrentTeb()).ClientId.UniqueThread
+}
+EXTERN!{extern "system" {
+    fn NtQueryInformationProcess(
+        ProcessHandle: HANDLE,
+        ProcessInformationClass: PROCESSINFOCLASS,
+        ProcessInformation: PVOID,
+        ProcessInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtGetNextProcess(
+        ProcessHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        HandleAttributes: ULONG,
+        Flags: ULONG,
+        NewProcessHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtGetNextThread(
+        ProcessHandle: HANDLE,
+        ThreadHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        HandleAttributes: ULONG,
+        Flags: ULONG,
+        NewThreadHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtSetInformationProcess(
+        ProcessHandle: HANDLE,
+        ProcessInformationClass: PROCESSINFOCLASS,
+        ProcessInformation: PVOID,
+        ProcessInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtQueryPortInformationProcess() -> NTSTATUS;
+    fn NtCreateThread(
+        ThreadHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ProcessHandle: HANDLE,
+        ClientId: PCLIENT_ID,
+        ThreadContext: PCONTEXT,
+        InitialTeb: PINITIAL_TEB,
+        CreateSuspended: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtOpenThread(
+        ThreadHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ClientId: PCLIENT_ID,
+    ) -> NTSTATUS;
+    fn NtTerminateThread(
+        ThreadHandle: HANDLE,
+        ExitStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn NtSuspendThread(
+        ThreadHandle: HANDLE,
+        PreviousSuspendCount: PULONG,
+    ) -> NTSTATUS;
+    fn NtResumeThread(
+        ThreadHandle: HANDLE,
+        PreviousSuspendCount: PULONG,
+    ) -> NTSTATUS;
+    fn NtGetCurrentProcessorNumber() -> ULONG;
+    fn NtGetContextThread(
+        ThreadHandle: HANDLE,
+        ThreadContext: PCONTEXT,
+    ) -> NTSTATUS;
+    fn NtSetContextThread(
+        ThreadHandle: HANDLE,
+        ThreadContext: PCONTEXT,
+    ) -> NTSTATUS;
+    fn NtQueryInformationThread(
+        ThreadHandle: HANDLE,
+        ThreadInformationClass: THREADINFOCLASS,
+        ThreadInformation: PVOID,
+        ThreadInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationThread(
+        ThreadHandle: HANDLE,
+        ThreadInformationClass: THREADINFOCLASS,
+        ThreadInformation: PVOID,
+        ThreadInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtAlertThread(
+        ThreadHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtAlertResumeThread(
+        ThreadHandle: HANDLE,
+        PreviousSuspendCount: PULONG,
+    ) -> NTSTATUS;
+    fn NtTestAlert() -> NTSTATUS;
+    fn NtImpersonateThread(
+        ServerThreadHandle: HANDLE,
+        ClientThreadHandle: HANDLE,
+        SecurityQos: PSECURITY_QUALITY_OF_SERVICE,
+    ) -> NTSTATUS;
+    fn NtRegisterThreadTerminatePort(
+        PortHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtSetLdtEntries(
+        Selector0: ULONG,
+        Entry0Low: ULONG,
+        Entry0Hi: ULONG,
+        Selector1: ULONG,
+        Entry1Low: ULONG,
+        Entry1Hi: ULONG,
+    ) -> NTSTATUS;
+}}
+FN!{cdecl PPS_APC_ROUTINE(
+    ApcArgument1: PVOID,
+    ApcArgument2: PVOID,
+    ApcArgument3: PVOID,
+) -> ()}
+EXTERN!{extern "system" {
+    fn NtQueueApcThread(
+        ThreadHandle: HANDLE,
+        ApcRoutine: PPS_APC_ROUTINE,
+        ApcArgument1: PVOID,
+        ApcArgument2: PVOID,
+        ApcArgument3: PVOID,
+    ) -> NTSTATUS;
+}}
+pub const APC_FORCE_THREAD_SIGNAL: HANDLE = 1 as *mut c_void;
+EXTERN!{extern "system" {
+    fn NtQueueApcThreadEx(
+        ThreadHandle: HANDLE,
+        UserApcReserveHandle: HANDLE,
+        ApcRoutine: PPS_APC_ROUTINE,
+        ApcArgument1: PVOID,
+        ApcArgument2: PVOID,
+        ApcArgument3: PVOID,
+    ) -> NTSTATUS;
+    fn NtAlertThreadByThreadId(
+        ThreadId: HANDLE,
+    ) -> NTSTATUS;
+    fn NtWaitForAlertByThreadId(
+        Address: PVOID,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+}}
+pub const PS_ATTRIBUTE_NUMBER_MASK: u32 = 0x0000ffff;
+pub const PS_ATTRIBUTE_THREAD: u32 = 0x00010000;
+pub const PS_ATTRIBUTE_INPUT: u32 = 0x00020000;
+pub const PS_ATTRIBUTE_ADDITIVE: u32 = 0x00040000;
+ENUM!{enum PS_ATTRIBUTE_NUM {
+    PsAttributeParentProcess = 0,
+    PsAttributeDebugPort = 1,
+    PsAttributeToken = 2,
+    PsAttributeClientId = 3,
+    PsAttributeTebAddress = 4,
+    PsAttributeImageName = 5,
+    PsAttributeImageInfo = 6,
+    PsAttributeMemoryReserve = 7,
+    PsAttributePriorityClass = 8,
+    PsAttributeErrorMode = 9,
+    PsAttributeStdHandleInfo = 10,
+    PsAttributeHandleList = 11,
+    PsAttributeGroupAffinity = 12,
+    PsAttributePreferredNode = 13,
+    PsAttributeIdealProcessor = 14,
+    PsAttributeUmsThread = 15,
+    PsAttributeMitigationOptions = 16,
+    PsAttributeProtectionLevel = 17,
+    PsAttributeSecureProcess = 18,
+    PsAttributeJobList = 19,
+    PsAttributeChildProcessPolicy = 20,
+    PsAttributeAllApplicationPackagesPolicy = 21,
+    PsAttributeWin32kFilter = 22,
+    PsAttributeSafeOpenPromptOriginClaim = 23,
+    PsAttributeBnoIsolation = 24,
+    PsAttributeDesktopAppPolicy = 25,
+    PsAttributeChpe = 26,
+    PsAttributeMax = 27,
+}}
+#[inline]
+pub const fn PsAttributeValue(
+    Number: PS_ATTRIBUTE_NUM,
+    Thread: bool,
+    Input: bool,
+    Additive: bool,
+) -> ULONG_PTR { //fixme
+    (Number & PS_ATTRIBUTE_NUMBER_MASK | [0, PS_ATTRIBUTE_THREAD][Thread as usize]
+    | [0, PS_ATTRIBUTE_INPUT][Input as usize] | [0, PS_ATTRIBUTE_ADDITIVE][Additive as usize]
+    ) as usize
+}
+pub const PS_ATTRIBUTE_PARENT_PROCESS: ULONG_PTR = 0x00060000;
+pub const PS_ATTRIBUTE_DEBUG_PORT: ULONG_PTR = 0x00060001;
+pub const PS_ATTRIBUTE_TOKEN: ULONG_PTR = 0x00060002;
+pub const PS_ATTRIBUTE_CLIENT_ID: ULONG_PTR = 0x00010003;
+pub const PS_ATTRIBUTE_TEB_ADDRESS: ULONG_PTR = 0x00010004;
+pub const PS_ATTRIBUTE_IMAGE_NAME: ULONG_PTR = 0x00020005;
+pub const PS_ATTRIBUTE_IMAGE_INFO: ULONG_PTR = 0x00000006;
+pub const PS_ATTRIBUTE_MEMORY_RESERVE: ULONG_PTR = 0x00020007;
+pub const PS_ATTRIBUTE_PRIORITY_CLASS: ULONG_PTR = 0x00020008;
+pub const PS_ATTRIBUTE_ERROR_MODE: ULONG_PTR = 0x00020009;
+pub const PS_ATTRIBUTE_STD_HANDLE_INFO: ULONG_PTR = 0x0002000a;
+pub const PS_ATTRIBUTE_HANDLE_LIST: ULONG_PTR = 0x0002000b;
+pub const PS_ATTRIBUTE_GROUP_AFFINITY: ULONG_PTR = 0x0003000c;
+pub const PS_ATTRIBUTE_PREFERRED_NODE: ULONG_PTR = 0x0002000d;
+pub const PS_ATTRIBUTE_IDEAL_PROCESSOR: ULONG_PTR = 0x0003000e;
+pub const PS_ATTRIBUTE_UMS_THREAD: ULONG_PTR = 0x0003000f;
+pub const PS_ATTRIBUTE_MITIGATION_OPTIONS: ULONG_PTR = 0x00060010;
+pub const PS_ATTRIBUTE_PROTECTION_LEVEL: ULONG_PTR = 0x00060011;
+pub const PS_ATTRIBUTE_SECURE_PROCESS: ULONG_PTR = 0x00020012;
+pub const PS_ATTRIBUTE_JOB_LIST: ULONG_PTR = 0x00020013;
+pub const PS_ATTRIBUTE_CHILD_PROCESS_POLICY: ULONG_PTR = 0x00020014;
+pub const PS_ATTRIBUTE_ALL_APPLICATION_PACKAGES_POLICY: ULONG_PTR = 0x00020015;
+pub const PS_ATTRIBUTE_WIN32K_FILTER: ULONG_PTR = 0x00020016;
+pub const PS_ATTRIBUTE_SAFE_OPEN_PROMPT_ORIGIN_CLAIM: ULONG_PTR = 0x00020017;
+pub const PS_ATTRIBUTE_BNO_ISOLATION: ULONG_PTR = 0x00020018;
+pub const PS_ATTRIBUTE_DESKTOP_APP_POLICY: ULONG_PTR = 0x00020019;
+UNION!{union PS_ATTRIBUTE_u {
+    Value: ULONG_PTR,
+    ValuePtr: PVOID,
+}}
+STRUCT!{struct PS_ATTRIBUTE {
+    Attribute: ULONG_PTR,
+    Size: SIZE_T,
+    u: PS_ATTRIBUTE_u,
+    ReturnLength: PSIZE_T,
+}}
+pub type PPS_ATTRIBUTE = *mut PS_ATTRIBUTE;
+STRUCT!{struct PS_ATTRIBUTE_LIST {
+    TotalLength: SIZE_T,
+    Attributes: [PS_ATTRIBUTE; 1],
+}}
+pub type PPS_ATTRIBUTE_LIST = *mut PS_ATTRIBUTE_LIST;
+STRUCT!{struct PS_MEMORY_RESERVE {
+    ReserveAddress: PVOID,
+    ReserveSize: SIZE_T,
+}}
+pub type PPS_MEMORY_RESERVE = *mut PS_MEMORY_RESERVE;
+ENUM!{enum PS_STD_HANDLE_STATE {
+    PsNeverDuplicate = 0,
+    PsRequestDuplicate = 1,
+    PsAlwaysDuplicate = 2,
+    PsMaxStdHandleStates = 3,
+}}
+pub const PS_STD_INPUT_HANDLE: u32 = 0x1;
+pub const PS_STD_OUTPUT_HANDLE: u32 = 0x2;
+pub const PS_STD_ERROR_HANDLE: u32 = 0x4;
+STRUCT!{struct PS_STD_HANDLE_INFO {
+    Flags: ULONG,
+    StdHandleSubsystemType: ULONG,
+}}
+pub type PPS_STD_HANDLE_INFO = *mut PS_STD_HANDLE_INFO;
+BITFIELD!{PS_STD_HANDLE_INFO Flags: ULONG [
+    StdHandleState set_StdHandleState[0..2],
+    PseudoHandleMask set_PseudoHandleMask[2..5],
+]}
+STRUCT!{struct PS_BNO_ISOLATION_PARAMETERS {
+    IsolationPrefix: UNICODE_STRING,
+    HandleCount: ULONG,
+    Handles: *mut PVOID,
+    IsolationEnabled: BOOLEAN,
+}}
+pub type PPS_BNO_ISOLATION_PARAMETERS = *mut PS_BNO_ISOLATION_PARAMETERS;
+ENUM!{enum PS_MITIGATION_OPTION {
+    PS_MITIGATION_OPTION_NX = 0,
+    PS_MITIGATION_OPTION_SEHOP = 1,
+    PS_MITIGATION_OPTION_FORCE_RELOCATE_IMAGES = 2,
+    PS_MITIGATION_OPTION_HEAP_TERMINATE = 3,
+    PS_MITIGATION_OPTION_BOTTOM_UP_ASLR = 4,
+    PS_MITIGATION_OPTION_HIGH_ENTROPY_ASLR = 5,
+    PS_MITIGATION_OPTION_STRICT_HANDLE_CHECKS = 6,
+    PS_MITIGATION_OPTION_WIN32K_SYSTEM_CALL_DISABLE = 7,
+    PS_MITIGATION_OPTION_EXTENSION_POINT_DISABLE = 8,
+    PS_MITIGATION_OPTION_PROHIBIT_DYNAMIC_CODE = 9,
+    PS_MITIGATION_OPTION_CONTROL_FLOW_GUARD = 10,
+    PS_MITIGATION_OPTION_BLOCK_NON_MICROSOFT_BINARIES = 11,
+    PS_MITIGATION_OPTION_FONT_DISABLE = 12,
+    PS_MITIGATION_OPTION_IMAGE_LOAD_NO_REMOTE = 13,
+    PS_MITIGATION_OPTION_IMAGE_LOAD_NO_LOW_LABEL = 14,
+    PS_MITIGATION_OPTION_IMAGE_LOAD_PREFER_SYSTEM32 = 15,
+    PS_MITIGATION_OPTION_RETURN_FLOW_GUARD = 16,
+    PS_MITIGATION_OPTION_LOADER_INTEGRITY_CONTINUITY = 17,
+    PS_MITIGATION_OPTION_STRICT_CONTROL_FLOW_GUARD = 18,
+    PS_MITIGATION_OPTION_RESTRICT_SET_THREAD_CONTEXT = 19,
+    PS_MITIGATION_OPTION_ROP_STACKPIVOT = 20,
+    PS_MITIGATION_OPTION_ROP_CALLER_CHECK = 21,
+    PS_MITIGATION_OPTION_ROP_SIMEXEC = 22,
+    PS_MITIGATION_OPTION_EXPORT_ADDRESS_FILTER = 23,
+    PS_MITIGATION_OPTION_EXPORT_ADDRESS_FILTER_PLUS = 24,
+    PS_MITIGATION_OPTION_RESTRICT_CHILD_PROCESS_CREATION = 25,
+    PS_MITIGATION_OPTION_IMPORT_ADDRESS_FILTER = 26,
+    PS_MITIGATION_OPTION_MODULE_TAMPERING_PROTECTION = 27,
+    PS_MITIGATION_OPTION_RESTRICT_INDIRECT_BRANCH_PREDICTION = 28,
+    PS_MITIGATION_OPTION_SPECULATIVE_STORE_BYPASS_DISABLE = 29,
+    PS_MITIGATION_OPTION_ALLOW_DOWNGRADE_DYNAMIC_CODE_POLICY = 30,
+    PS_MITIGATION_OPTION_CET_SHADOW_STACKS = 31,
+}}
+ENUM!{enum PS_CREATE_STATE {
+    PsCreateInitialState = 0,
+    PsCreateFailOnFileOpen = 1,
+    PsCreateFailOnSectionCreate = 2,
+    PsCreateFailExeFormat = 3,
+    PsCreateFailMachineMismatch = 4,
+    PsCreateFailExeName = 5,
+    PsCreateSuccess = 6,
+    PsCreateMaximumStates = 7,
+}}
+STRUCT!{struct PS_CREATE_INFO_u_InitState {
+    InitFlags: ULONG,
+    AdditionalFileAccess: ACCESS_MASK,
+}}
+BITFIELD!{PS_CREATE_INFO_u_InitState InitFlags: ULONG [
+    WriteOutputOnExit set_WriteOutputOnExit[0..1],
+    DetectManifest set_DetectManifest[1..2],
+    IFEOSkipDebugger set_IFEOSkipDebugger[2..3],
+    IFEODoNotPropagateKeyState set_IFEODoNotPropagateKeyState[3..4],
+    SpareBits1 set_SpareBits1[4..8],
+    SpareBits2 set_SpareBits2[8..16],
+    ProhibitedImageCharacteristics set_ProhibitedImageCharacteristics[16..32],
+]}
+STRUCT!{struct PS_CREATE_INFO_u_SuccessState {
+    OutputFlags: ULONG,
+    FileHandle: HANDLE,
+    SectionHandle: HANDLE,
+    UserProcessParametersNative: ULONGLONG,
+    UserProcessParametersWow64: ULONG,
+    CurrentParameterFlags: ULONG,
+    PebAddressNative: ULONGLONG,
+    PebAddressWow64: ULONG,
+    ManifestAddress: ULONGLONG,
+    ManifestSize: ULONG,
+}}
+BITFIELD!{PS_CREATE_INFO_u_SuccessState OutputFlags: ULONG [
+    ProtectedProcess set_ProtectedProcess[0..1],
+    AddressSpaceOverride set_AddressSpaceOverride[1..2],
+    DevOverrideEnabled set_DevOverrideEnabled[2..3],
+    ManifestDetected set_ManifestDetected[3..4],
+    ProtectedProcessLight set_ProtectedProcessLight[4..5],
+    SpareBits1 set_SpareBits1[5..8],
+    SpareBits2 set_SpareBits2[8..16],
+    SpareBits3 set_SpareBits3[16..32],
+]}
+UNION!{union PS_CREATE_INFO_u {
+    InitState: PS_CREATE_INFO_u_InitState,
+    FileHandle: HANDLE,
+    DllCharacteristics: USHORT,
+    IFEOKey: HANDLE,
+    SuccessState: PS_CREATE_INFO_u_SuccessState,
+}}
+STRUCT!{struct PS_CREATE_INFO {
+    Size: SIZE_T,
+    State: PS_CREATE_STATE,
+    u: PS_CREATE_INFO_u,
+}}
+pub type PPS_CREATE_INFO = *mut PS_CREATE_INFO;
+pub const PROCESS_CREATE_FLAGS_LARGE_PAGE_SYSTEM_DLL: ULONG = 0x00000020;
+pub const PROCESS_CREATE_FLAGS_PROTECTED_PROCESS: ULONG = 0x00000040;
+pub const PROCESS_CREATE_FLAGS_CREATE_SESSION: ULONG = 0x00000080;
+pub const PROCESS_CREATE_FLAGS_INHERIT_FROM_PARENT: ULONG = 0x00000100;
+pub const PROCESS_CREATE_FLAGS_SUSPENDED: ULONG = 0x00000200;
+pub const PROCESS_CREATE_FLAGS_EXTENDED_UNKNOWN: ULONG = 0x00000400;
+EXTERN!{extern "system" {
+    fn NtCreateUserProcess(
+        ProcessHandle: PHANDLE,
+        ThreadHandle: PHANDLE,
+        ProcessDesiredAccess: ACCESS_MASK,
+        ThreadDesiredAccess: ACCESS_MASK,
+        ProcessObjectAttributes: POBJECT_ATTRIBUTES,
+        ThreadObjectAttributes: POBJECT_ATTRIBUTES,
+        ProcessFlags: ULONG,
+        ThreadFlags: ULONG,
+        ProcessParameters: PVOID,
+        CreateInfo: PPS_CREATE_INFO,
+        AttributeList: PPS_ATTRIBUTE_LIST,
+    ) -> NTSTATUS;
+}}
+pub const THREAD_CREATE_FLAGS_CREATE_SUSPENDED: ULONG = 0x00000001;
+pub const THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH: ULONG = 0x00000002;
+pub const THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER: ULONG = 0x00000004;
+pub const THREAD_CREATE_FLAGS_HAS_SECURITY_DESCRIPTOR: ULONG = 0x00000010;
+pub const THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET: ULONG = 0x00000020;
+pub const THREAD_CREATE_FLAGS_INITIAL_THREAD: ULONG = 0x00000080;
+EXTERN!{extern "system" {
+    fn NtCreateThreadEx(
+        ThreadHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ProcessHandle: HANDLE,
+        StartRoutine: PVOID,
+        Argument: PVOID,
+        CreateFlags: ULONG,
+        ZeroBits: SIZE_T,
+        StackSize: SIZE_T,
+        MaximumStackSize: SIZE_T,
+        AttributeList: PPS_ATTRIBUTE_LIST,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct JOBOBJECT_EXTENDED_ACCOUNTING_INFORMATION {
+    BasicInfo: JOBOBJECT_BASIC_ACCOUNTING_INFORMATION,
+    IoInfo: IO_COUNTERS,
+    DiskIoInfo: PROCESS_DISK_COUNTERS,
+    ContextSwitches: ULONG64,
+    TotalCycleTime: LARGE_INTEGER,
+    ReadyTime: ULONG64,
+    EnergyValues: PROCESS_ENERGY_VALUES,
+}}
+pub type PJOBOBJECT_EXTENDED_ACCOUNTING_INFORMATION =
+    *mut JOBOBJECT_EXTENDED_ACCOUNTING_INFORMATION;
+STRUCT!{struct JOBOBJECT_WAKE_INFORMATION {
+    NotificationChannel: HANDLE,
+    WakeCounters: [ULONG64; 7],
+}}
+pub type PJOBOBJECT_WAKE_INFORMATION = *mut JOBOBJECT_WAKE_INFORMATION;
+STRUCT!{struct JOBOBJECT_WAKE_INFORMATION_V1 {
+    NotificationChannel: HANDLE,
+    WakeCounters: [ULONG64; 4],
+}}
+pub type PJOBOBJECT_WAKE_INFORMATION_V1 = *mut JOBOBJECT_WAKE_INFORMATION_V1;
+STRUCT!{struct JOBOBJECT_INTERFERENCE_INFORMATION {
+    Count: ULONG64,
+}}
+pub type PJOBOBJECT_INTERFERENCE_INFORMATION = *mut JOBOBJECT_INTERFERENCE_INFORMATION;
+STRUCT!{struct JOBOBJECT_WAKE_FILTER {
+    HighEdgeFilter: ULONG,
+    LowEdgeFilter: ULONG,
+}}
+pub type PJOBOBJECT_WAKE_FILTER = *mut JOBOBJECT_WAKE_FILTER;
+STRUCT!{struct JOBOBJECT_FREEZE_INFORMATION {
+    Flags: ULONG,
+    Freeze: BOOLEAN,
+    Swap: BOOLEAN,
+    Reserved0: [UCHAR; 2],
+    WakeFilter: JOBOBJECT_WAKE_FILTER,
+}}
+pub type PJOBOBJECT_FREEZE_INFORMATION = *mut JOBOBJECT_FREEZE_INFORMATION;
+BITFIELD!{JOBOBJECT_FREEZE_INFORMATION Flags: ULONG [
+    FreezeOperation set_FreezeOperation[0..1],
+    FilterOperation set_FilterOperation[1..2],
+    SwapOperation set_SwapOperation[2..3],
+    Reserved set_Reserved[3..32],
+]}
+STRUCT!{struct JOBOBJECT_MEMORY_USAGE_INFORMATION {
+    JobMemory: ULONG64,
+    PeakJobMemoryUsed: ULONG64,
+}}
+pub type PJOBOBJECT_MEMORY_USAGE_INFORMATION = *mut JOBOBJECT_MEMORY_USAGE_INFORMATION;
+STRUCT!{struct JOBOBJECT_MEMORY_USAGE_INFORMATION_V2 {
+    BasicInfo: JOBOBJECT_MEMORY_USAGE_INFORMATION,
+    JobSharedMemory: ULONG64,
+    Reserved: [ULONG64; 2],
+}}
+pub type PJOBOBJECT_MEMORY_USAGE_INFORMATION_V2 = *mut JOBOBJECT_MEMORY_USAGE_INFORMATION_V2;
+STRUCT!{struct SILO_USER_SHARED_DATA {
+    ServiceSessionId: ULONG64,
+    ActiveConsoleId: ULONG,
+    ConsoleSessionForegroundProcessId: LONGLONG,
+    NtProductType: NT_PRODUCT_TYPE,
+    SuiteMask: ULONG,
+    SharedUserSessionId: ULONG,
+    IsMultiSessionSku: BOOLEAN,
+    NtSystemRoot: [WCHAR; 260],
+    UserModeGlobalLogger: [USHORT; 16],
+}}
+pub type PSILO_USER_SHARED_DATA = *mut SILO_USER_SHARED_DATA;
+STRUCT!{struct SILOOBJECT_ROOT_DIRECTORY {
+    ControlFlags: ULONG,
+    Path: UNICODE_STRING,
+}}
+pub type PSILOOBJECT_ROOT_DIRECTORY = *mut SILOOBJECT_ROOT_DIRECTORY;
+STRUCT!{struct JOBOBJECT_ENERGY_TRACKING_STATE {
+    Value: ULONG64,
+    UpdateMask: ULONG,
+    DesiredState: ULONG,
+}}
+pub type PJOBOBJECT_ENERGY_TRACKING_STATE = *mut JOBOBJECT_ENERGY_TRACKING_STATE;
+EXTERN!{extern "system" {
+    fn NtCreateJobObject(
+        JobHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtOpenJobObject(
+        JobHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtAssignProcessToJobObject(
+        JobHandle: HANDLE,
+        ProcessHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtTerminateJobObject(
+        JobHandle: HANDLE,
+        ExitStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn NtIsProcessInJob(
+        ProcessHandle: HANDLE,
+        JobHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtQueryInformationJobObject(
+        JobHandle: HANDLE,
+        JobObjectInformationClass: JOBOBJECTINFOCLASS,
+        JobObjectInformation: PVOID,
+        JobObjectInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationJobObject(
+        JobHandle: HANDLE,
+        JobObjectInformationClass: JOBOBJECTINFOCLASS,
+        JobObjectInformation: PVOID,
+        JobObjectInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtCreateJobSet(
+        NumJob: ULONG,
+        UserJobSet: PJOB_SET_ARRAY,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtRevertContainerImpersonation() -> NTSTATUS;
+}}
+ENUM!{enum MEMORY_RESERVE_TYPE {
+    MemoryReserveUserApc = 0,
+    MemoryReserveIoCompletion = 1,
+    MemoryReserveTypeMax = 2,
+}}
+EXTERN!{extern "system" {
+    fn NtAllocateReserveObject(
+        MemoryReserveHandle: PHANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Type: MEMORY_RESERVE_TYPE,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntregapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntregapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntregapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntregapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,450 @@
+use crate::ntioapi::{PIO_APC_ROUTINE, PIO_STATUS_BLOCK};
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, LARGE_INTEGER, NTSTATUS, OBJECT_ATTRIBUTES, PHANDLE, POBJECT_ATTRIBUTES,
+    PULONG, PUNICODE_STRING, PVOID, UCHAR, ULONG, UNICODE_STRING, USHORT, WCHAR,
+};
+use winapi::um::winnt::ACCESS_MASK;
+pub const REG_INIT_BOOT_SM: USHORT = 0x0000;
+pub const REG_INIT_BOOT_SETUP: USHORT = 0x0001;
+pub const REG_INIT_BOOT_ACCEPTED_BASE: USHORT = 0x0002;
+pub const REG_INIT_BOOT_ACCEPTED_MAX: USHORT = REG_INIT_BOOT_ACCEPTED_BASE;
+pub const REG_MAX_KEY_VALUE_NAME_LENGTH: u32 = 32767;
+pub const REG_MAX_KEY_NAME_LENGTH: u32 = 512;
+ENUM!{enum KEY_INFORMATION_CLASS {
+    KeyBasicInformation = 0,
+    KeyNodeInformation = 1,
+    KeyFullInformation = 2,
+    KeyNameInformation = 3,
+    KeyCachedInformation = 4,
+    KeyFlagsInformation = 5,
+    KeyVirtualizationInformation = 6,
+    KeyHandleTagsInformation = 7,
+    KeyTrustInformation = 8,
+    KeyLayerInformation = 9,
+    MaxKeyInfoClass = 10,
+}}
+STRUCT!{struct KEY_BASIC_INFORMATION {
+    LastWriteTime: LARGE_INTEGER,
+    TitleIndex: ULONG,
+    NameLength: ULONG,
+    Name: [WCHAR; 1],
+}}
+pub type PKEY_BASIC_INFORMATION = *mut KEY_BASIC_INFORMATION;
+STRUCT!{struct KEY_NODE_INFORMATION {
+    LastWriteTime: LARGE_INTEGER,
+    TitleIndex: ULONG,
+    ClassOffset: ULONG,
+    ClassLength: ULONG,
+    NameLength: ULONG,
+    Name: [WCHAR; 1],
+}}
+pub type PKEY_NODE_INFORMATION = *mut KEY_NODE_INFORMATION;
+STRUCT!{struct KEY_FULL_INFORMATION {
+    LastWriteTime: LARGE_INTEGER,
+    TitleIndex: ULONG,
+    ClassOffset: ULONG,
+    ClassLength: ULONG,
+    SubKeys: ULONG,
+    MaxNameLen: ULONG,
+    MaxClassLen: ULONG,
+    Values: ULONG,
+    MaxValueNameLen: ULONG,
+    MaxValueDataLen: ULONG,
+    Class: [WCHAR; 1],
+}}
+pub type PKEY_FULL_INFORMATION = *mut KEY_FULL_INFORMATION;
+STRUCT!{struct KEY_NAME_INFORMATION {
+    NameLength: ULONG,
+    Name: [WCHAR; 1],
+}}
+pub type PKEY_NAME_INFORMATION = *mut KEY_NAME_INFORMATION;
+STRUCT!{struct KEY_CACHED_INFORMATION {
+    LastWriteTime: LARGE_INTEGER,
+    TitleIndex: ULONG,
+    SubKeys: ULONG,
+    MaxNameLen: ULONG,
+    Values: ULONG,
+    MaxValueNameLen: ULONG,
+    MaxValueDataLen: ULONG,
+    NameLength: ULONG,
+    Name: [WCHAR; 1],
+}}
+pub type PKEY_CACHED_INFORMATION = *mut KEY_CACHED_INFORMATION;
+STRUCT!{struct KEY_FLAGS_INFORMATION {
+    UserFlags: ULONG,
+}}
+pub type PKEY_FLAGS_INFORMATION = *mut KEY_FLAGS_INFORMATION;
+STRUCT!{struct KEY_VIRTUALIZATION_INFORMATION {
+    Bitfields: ULONG,
+}}
+BITFIELD!{KEY_VIRTUALIZATION_INFORMATION Bitfields: ULONG [
+    VirtualizationCandidate set_VirtualizationCandidate[0..1],
+    VirtualizationEnabled set_VirtualizationEnabled[1..2],
+    VirtualTarget set_VirtualTarget[2..3],
+    VirtualStore set_VirtualStore[3..4],
+    VirtualSource set_VirtualSource[4..5],
+    Reserved set_Reserved[5..32],
+]}
+pub type PKEY_VIRTUALIZATION_INFORMATION = *mut KEY_VIRTUALIZATION_INFORMATION;
+STRUCT!{struct KEY_TRUST_INFORMATION {
+    Bitfields: ULONG,
+}}
+BITFIELD!{KEY_TRUST_INFORMATION Bitfields: ULONG [
+    TrustedKey set_TrustedKey[0..1],
+    Reserved set_Reserved[1..32],
+]}
+pub type PKEY_TRUST_INFORMATION = *mut KEY_TRUST_INFORMATION;
+STRUCT!{struct KEY_LAYER_INFORMATION {
+    IsTombstone: ULONG,
+    IsSupersedeLocal: ULONG,
+    IsSupersedeTree: ULONG,
+    ClassIsInherited: ULONG,
+    Reserved: ULONG,
+}}
+pub type PKEY_LAYER_INFORMATION = *mut KEY_LAYER_INFORMATION;
+ENUM!{enum KEY_SET_INFORMATION_CLASS {
+    KeyWriteTimeInformation = 0,
+    KeyWow64FlagsInformation = 1,
+    KeyControlFlagsInformation = 2,
+    KeySetVirtualizationInformation = 3,
+    KeySetDebugInformation = 4,
+    KeySetHandleTagsInformation = 5,
+    KeySetLayerInformation = 6,
+    MaxKeySetInfoClass = 7,
+}}
+STRUCT!{struct KEY_WRITE_TIME_INFORMATION {
+    LastWriteTime: LARGE_INTEGER,
+}}
+pub type PKEY_WRITE_TIME_INFORMATION = *mut KEY_WRITE_TIME_INFORMATION;
+STRUCT!{struct KEY_WOW64_FLAGS_INFORMATION {
+    UserFlags: ULONG,
+}}
+pub type PKEY_WOW64_FLAGS_INFORMATION = *mut KEY_WOW64_FLAGS_INFORMATION;
+STRUCT!{struct KEY_HANDLE_TAGS_INFORMATION {
+    HandleTags: ULONG,
+}}
+pub type PKEY_HANDLE_TAGS_INFORMATION = *mut KEY_HANDLE_TAGS_INFORMATION;
+STRUCT!{struct KEY_SET_LAYER_INFORMATION {
+    Bitfields: ULONG,
+}}
+BITFIELD!{KEY_SET_LAYER_INFORMATION Bitfields: ULONG [
+    IsTombstone set_IsTombstone[0..1],
+    IsSupersedeLocal set_IsSupersedeLocal[1..2],
+    IsSupersedeTree set_IsSupersedeTree[2..3],
+    ClassIsInherited set_ClassIsInherited[3..4],
+    Reserved set_Reserved[4..32],
+]}
+pub type PKEY_SET_LAYER_INFORMATION = *mut KEY_SET_LAYER_INFORMATION;
+STRUCT!{struct KEY_CONTROL_FLAGS_INFORMATION {
+    ControlFlags: ULONG,
+}}
+pub type PKEY_CONTROL_FLAGS_INFORMATION = *mut KEY_CONTROL_FLAGS_INFORMATION;
+STRUCT!{struct KEY_SET_VIRTUALIZATION_INFORMATION {
+    HandleTags: ULONG,
+}}
+BITFIELD!{KEY_SET_VIRTUALIZATION_INFORMATION HandleTags: ULONG [
+    VirtualTarget set_VirtualTarget[0..1],
+    VirtualStore set_VirtualStore[1..2],
+    VirtualSource set_VirtualSource[2..3],
+    Reserved set_Reserved[3..32],
+]}
+pub type PKEY_SET_VIRTUALIZATION_INFORMATION = *mut KEY_SET_VIRTUALIZATION_INFORMATION;
+ENUM!{enum KEY_VALUE_INFORMATION_CLASS {
+    KeyValueBasicInformation = 0,
+    KeyValueFullInformation = 1,
+    KeyValuePartialInformation = 2,
+    KeyValueFullInformationAlign64 = 3,
+    KeyValuePartialInformationAlign64 = 4,
+    KeyValueLayerInformation = 5,
+    MaxKeyValueInfoClass = 6,
+}}
+STRUCT!{struct KEY_VALUE_BASIC_INFORMATION {
+    TitleIndex: ULONG,
+    Type: ULONG,
+    NameLength: ULONG,
+    Name: [WCHAR; 1],
+}}
+pub type PKEY_VALUE_BASIC_INFORMATION = *mut KEY_VALUE_BASIC_INFORMATION;
+STRUCT!{struct KEY_VALUE_FULL_INFORMATION {
+    TitleIndex: ULONG,
+    Type: ULONG,
+    DataOffset: ULONG,
+    DataLength: ULONG,
+    NameLength: ULONG,
+    Name: [WCHAR; 1],
+}}
+pub type PKEY_VALUE_FULL_INFORMATION = *mut KEY_VALUE_FULL_INFORMATION;
+STRUCT!{struct KEY_VALUE_PARTIAL_INFORMATION {
+    TitleIndex: ULONG,
+    Type: ULONG,
+    DataLength: ULONG,
+    Data: [UCHAR; 1],
+}}
+pub type PKEY_VALUE_PARTIAL_INFORMATION = *mut KEY_VALUE_PARTIAL_INFORMATION;
+STRUCT!{struct KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 {
+    Type: ULONG,
+    DataLength: ULONG,
+    Data: [UCHAR; 1],
+}}
+pub type PKEY_VALUE_PARTIAL_INFORMATION_ALIGN64 = *mut KEY_VALUE_PARTIAL_INFORMATION_ALIGN64;
+STRUCT!{struct KEY_VALUE_LAYER_INFORMATION {
+    IsTombstone: ULONG,
+    Reserved: ULONG,
+}}
+pub type PKEY_VALUE_LAYER_INFORMATION = *mut KEY_VALUE_LAYER_INFORMATION;
+STRUCT!{struct KEY_VALUE_ENTRY {
+    ValueName: PUNICODE_STRING,
+    DataLength: ULONG,
+    DataOffset: ULONG,
+    Type: ULONG,
+}}
+pub type PKEY_VALUE_ENTRY = *mut KEY_VALUE_ENTRY;
+ENUM!{enum REG_ACTION {
+    KeyAdded = 0,
+    KeyRemoved = 1,
+    KeyModified = 2,
+}}
+STRUCT!{struct REG_NOTIFY_INFORMATION {
+    NextEntryOffset: ULONG,
+    Action: REG_ACTION,
+    KeyLength: ULONG,
+    Key: [WCHAR; 1],
+}}
+pub type PREG_NOTIFY_INFORMATION = *mut REG_NOTIFY_INFORMATION;
+STRUCT!{struct KEY_PID_ARRAY {
+    PID: HANDLE,
+    KeyName: UNICODE_STRING,
+}}
+pub type PKEY_PID_ARRAY = *mut KEY_PID_ARRAY;
+STRUCT!{struct KEY_OPEN_SUBKEYS_INFORMATION {
+    Count: ULONG,
+    KeyArray: [KEY_PID_ARRAY; 1],
+}}
+pub type PKEY_OPEN_SUBKEYS_INFORMATION = *mut KEY_OPEN_SUBKEYS_INFORMATION;
+EXTERN!{extern "system" {
+    fn NtCreateKey(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TitleIndex: ULONG,
+        Class: PUNICODE_STRING,
+        CreateOptions: ULONG,
+        Disposition: PULONG,
+    ) -> NTSTATUS;
+    fn NtCreateKeyTransacted(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TitleIndex: ULONG,
+        Class: PUNICODE_STRING,
+        CreateOptions: ULONG,
+        TransactionHandle: HANDLE,
+        Disposition: PULONG,
+    ) -> NTSTATUS;
+    fn NtOpenKey(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtOpenKeyTransacted(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TransactionHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtOpenKeyEx(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        OpenOptions: ULONG,
+    ) -> NTSTATUS;
+    fn NtOpenKeyTransactedEx(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        OpenOptions: ULONG,
+        TransactionHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtDeleteKey(
+        KeyHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtRenameKey(
+        KeyHandle: HANDLE,
+        NewName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn NtDeleteValueKey(
+        KeyHandle: HANDLE,
+        ValueName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn NtQueryKey(
+        KeyHandle: HANDLE,
+        KeyInformationClass: KEY_INFORMATION_CLASS,
+        KeyInformation: PVOID,
+        Length: ULONG,
+        ResultLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationKey(
+        KeyHandle: HANDLE,
+        KeySetInformationClass: KEY_SET_INFORMATION_CLASS,
+        KeySetInformation: PVOID,
+        KeySetInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtQueryValueKey(
+        KeyHandle: HANDLE,
+        ValueName: PUNICODE_STRING,
+        KeyValueInformationClass: KEY_VALUE_INFORMATION_CLASS,
+        KeyValueInformation: PVOID,
+        Length: ULONG,
+        ResultLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetValueKey(
+        KeyHandle: HANDLE,
+        ValueName: PUNICODE_STRING,
+        TitleIndex: ULONG,
+        Type: ULONG,
+        Data: PVOID,
+        DataSize: ULONG,
+    ) -> NTSTATUS;
+    fn NtQueryMultipleValueKey(
+        KeyHandle: HANDLE,
+        ValueEntries: PKEY_VALUE_ENTRY,
+        EntryCount: ULONG,
+        ValueBuffer: PVOID,
+        BufferLength: PULONG,
+        RequiredBufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtEnumerateKey(
+        KeyHandle: HANDLE,
+        Index: ULONG,
+        KeyInformationClass: KEY_INFORMATION_CLASS,
+        KeyInformation: PVOID,
+        Length: ULONG,
+        ResultLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtEnumerateValueKey(
+        KeyHandle: HANDLE,
+        Index: ULONG,
+        KeyValueInformationClass: KEY_VALUE_INFORMATION_CLASS,
+        KeyValueInformation: PVOID,
+        Length: ULONG,
+        ResultLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtFlushKey(
+        KeyHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtCompactKeys(
+        Count: ULONG,
+        KeyArray: *mut HANDLE,
+    ) -> NTSTATUS;
+    fn NtCompressKey(
+        Key: HANDLE,
+    ) -> NTSTATUS;
+    fn NtLoadKey(
+        TargetKey: POBJECT_ATTRIBUTES,
+        SourceFile: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtLoadKey2(
+        TargetKey: POBJECT_ATTRIBUTES,
+        SourceFile: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtLoadKeyEx(
+        TargetKey: POBJECT_ATTRIBUTES,
+        SourceFile: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+        TrustClassKey: HANDLE,
+        Event: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        RootHandle: PHANDLE,
+        IoStatus: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn NtReplaceKey(
+        NewFile: POBJECT_ATTRIBUTES,
+        TargetHandle: HANDLE,
+        OldFile: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtSaveKey(
+        KeyHandle: HANDLE,
+        FileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtSaveKeyEx(
+        KeyHandle: HANDLE,
+        FileHandle: HANDLE,
+        Format: ULONG,
+    ) -> NTSTATUS;
+    fn NtSaveMergedKeys(
+        HighPrecedenceKeyHandle: HANDLE,
+        LowPrecedenceKeyHandle: HANDLE,
+        FileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtRestoreKey(
+        KeyHandle: HANDLE,
+        FileHandle: HANDLE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtUnloadKey(
+        TargetKey: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+}}
+pub const REG_FORCE_UNLOAD: ULONG = 1;
+pub const REG_UNLOAD_LEGAL_FLAGS: ULONG = REG_FORCE_UNLOAD;
+EXTERN!{extern "system" {
+    fn NtUnloadKey2(
+        TargetKey: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn NtUnloadKeyEx(
+        TargetKey: POBJECT_ATTRIBUTES,
+        Event: HANDLE,
+    ) -> NTSTATUS;
+    fn NtNotifyChangeKey(
+        KeyHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        CompletionFilter: ULONG,
+        WatchTree: BOOLEAN,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+        Asynchronous: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtNotifyChangeMultipleKeys(
+        MasterKeyHandle: HANDLE,
+        Count: ULONG,
+        SubordinateObjects: *mut OBJECT_ATTRIBUTES,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        CompletionFilter: ULONG,
+        WatchTree: BOOLEAN,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+        Asynchronous: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtQueryOpenSubKeys(
+        TargetKey: POBJECT_ATTRIBUTES,
+        HandleCount: PULONG,
+    ) -> NTSTATUS;
+    fn NtQueryOpenSubKeysEx(
+        TargetKey: POBJECT_ATTRIBUTES,
+        BufferLength: ULONG,
+        Buffer: PVOID,
+        RequiredSize: PULONG,
+    ) -> NTSTATUS;
+    fn NtInitializeRegistry(
+        BootCondition: USHORT,
+    ) -> NTSTATUS;
+    fn NtLockRegistryKey(
+        KeyHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtLockProductActivationKeys(
+        pPrivateVer: *mut ULONG,
+        pSafeMode: *mut ULONG,
+    ) -> NTSTATUS;
+    fn NtFreezeRegistry(
+        TimeOutInSeconds: ULONG,
+    ) -> NTSTATUS;
+    fn NtThawRegistry() -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntrtl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntrtl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntrtl.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntrtl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,4378 @@
+use core::ptr::null_mut;
+use crate::ntapi_base::{CLIENT_ID, PCLIENT_ID};
+use crate::ntexapi::{RTL_PROCESS_BACKTRACES, RTL_PROCESS_LOCKS};
+use crate::ntioapi::FILE_INFORMATION_CLASS;
+use crate::ntldr::{RTL_PROCESS_MODULES, RTL_PROCESS_MODULE_INFORMATION_EX};
+use crate::ntmmapi::SECTION_IMAGE_INFORMATION;
+use crate::ntnls::{PCPTABLEINFO, PNLSTABLEINFO};
+use crate::ntpebteb::{PPEB, PTEB_ACTIVE_FRAME};
+use crate::ntpsapi::{PINITIAL_TEB, PPS_APC_ROUTINE, PS_PROTECTION};
+use crate::ntapi_base::{PRTL_ATOM, RTL_ATOM};
+use crate::string::UTF16Const;
+use winapi::ctypes::c_void;
+use winapi::shared::basetsd::{PULONG64, ULONG32, ULONG64, PSIZE_T, PULONG_PTR, SIZE_T, ULONG_PTR};
+use winapi::shared::guiddef::GUID;
+use winapi::shared::in6addr::in6_addr;
+use winapi::shared::inaddr::in_addr;
+use winapi::shared::minwindef::{BOOL, DWORD, PBOOL};
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+use winapi::shared::ntdef::{LARGE_INTEGER, RTL_BALANCED_NODE};
+use winapi::shared::ntdef::{
+    BOOLEAN, CCHAR, CHAR, CLONG, CSHORT, HANDLE, LCID, LIST_ENTRY, LOGICAL, LONG, LUID, NTSTATUS,
+    PANSI_STRING, PBOOLEAN, PCANSI_STRING, PCCH, PCH, PCHAR, PCOEM_STRING, PCSZ, PCUNICODE_STRING,
+    PCWCH, PCWSTR, PHANDLE, PLARGE_INTEGER, PLCID, PLIST_ENTRY, PLONG, PLUID, PNT_PRODUCT_TYPE,
+    POEM_STRING, PPROCESSOR_NUMBER, PRTL_BALANCED_NODE, PSINGLE_LIST_ENTRY, PSTR, PSTRING, PUCHAR,
+    PULONG, PULONGLONG, PUNICODE_STRING, PUSHORT, PVOID, PWCH, PWCHAR, PWSTR, SINGLE_LIST_ENTRY,
+    STRING, UCHAR, ULONG, ULONGLONG, UNICODE_STRING, USHORT, VOID, WCHAR,
+};
+use winapi::um::minwinbase::PTHREAD_START_ROUTINE;
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+use winapi::um::winnt::{PGET_RUNTIME_FUNCTION_CALLBACK, PRUNTIME_FUNCTION, PWOW64_CONTEXT};
+use winapi::um::winnt::{
+    ACCESS_MASK, ACL_INFORMATION_CLASS, APC_CALLBACK_FUNCTION, HEAP_INFORMATION_CLASS,
+    HEAP_REALLOC_IN_PLACE_ONLY, HEAP_ZERO_MEMORY, OS_DEPLOYEMENT_STATE_VALUES, PACCESS_MASK, PACL,
+    PCONTEXT, PEXCEPTION_POINTERS, PEXCEPTION_RECORD, PFLS_CALLBACK_FUNCTION, PGENERIC_MAPPING,
+    PIMAGE_NT_HEADERS, PIMAGE_SECTION_HEADER, PLUID_AND_ATTRIBUTES, PMESSAGE_RESOURCE_ENTRY,
+    PPERFORMANCE_DATA, PRTL_BARRIER, PRTL_CONDITION_VARIABLE, PRTL_CRITICAL_SECTION,
+    PRTL_OSVERSIONINFOEXW, PRTL_OSVERSIONINFOW, PRTL_RESOURCE_DEBUG, PRTL_SRWLOCK,
+    PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR_CONTROL, PSID, PSID_AND_ATTRIBUTES,
+    PSID_AND_ATTRIBUTES_HASH, PSID_IDENTIFIER_AUTHORITY, PVECTORED_EXCEPTION_HANDLER,
+    PXSAVE_AREA_HEADER, RTL_CRITICAL_SECTION, RTL_SRWLOCK, SECURITY_DESCRIPTOR_CONTROL,
+    SECURITY_IMPERSONATION_LEVEL, SECURITY_INFORMATION, WAITORTIMERCALLBACKFUNC,
+    WORKERCALLBACKFUNC,
+};
+use winapi::vc::vadefs::va_list;
+#[inline]
+pub fn InitializeListHead(ListHead: &mut LIST_ENTRY) {
+    ListHead.Flink = ListHead;
+    ListHead.Blink = ListHead;
+}
+#[inline]
+pub fn IsListEmpty(ListHead: &LIST_ENTRY) -> bool {
+    ListHead.Flink as *const _ == ListHead as *const _
+}
+#[inline]
+pub unsafe fn RemoveEntryList(Entry: &mut LIST_ENTRY) -> bool {
+    let (Blink, Flink) = (Entry.Blink, Entry.Flink);
+    (*Blink).Flink = Flink;
+    (*Flink).Blink = Blink;
+    Flink == Blink
+}
+#[inline]
+pub unsafe fn RemoveHeadList(ListHead: &mut LIST_ENTRY) -> PLIST_ENTRY {
+    let Entry = ListHead.Flink;
+    let Flink = (*Entry).Flink;
+    ListHead.Flink = Flink;
+    (*Flink).Blink = ListHead;
+    Entry
+}
+#[inline]
+pub unsafe fn RemoveTailList(ListHead: &mut LIST_ENTRY) -> PLIST_ENTRY {
+    let Entry = ListHead.Blink;
+    let Blink = (*Entry).Blink;
+    ListHead.Blink = Blink;
+    (*Blink).Flink = ListHead;
+    Entry
+}
+#[inline]
+pub unsafe fn InsertTailList(ListHead: &mut LIST_ENTRY, Entry: &mut LIST_ENTRY) {
+    let Blink = ListHead.Blink;
+    Entry.Flink = ListHead;
+    Entry.Blink = Blink;
+    (*Blink).Flink = Entry;
+    ListHead.Blink = Entry;
+}
+#[inline]
+pub unsafe fn InsertHeadList(ListHead: &mut LIST_ENTRY, Entry: &mut LIST_ENTRY) {
+    let Flink = ListHead.Flink;
+    Entry.Flink = Flink;
+    Entry.Blink = ListHead;
+    (*Flink).Blink = Entry;
+    ListHead.Flink = Entry;
+}
+#[inline]
+pub unsafe fn AppendTailList(ListHead: &mut LIST_ENTRY, ListToAppend: &mut LIST_ENTRY) {
+    let ListEnd = ListHead.Blink;
+    (*ListHead.Blink).Flink = ListToAppend;
+    ListHead.Blink = ListToAppend.Blink;
+    (*ListToAppend.Blink).Flink = ListHead;
+    ListToAppend.Blink = ListEnd;
+}
+#[inline]
+pub unsafe fn PopEntryList(ListHead: &mut SINGLE_LIST_ENTRY) -> PSINGLE_LIST_ENTRY {
+    let FirstEntry = ListHead.Next;
+    if !FirstEntry.is_null() {
+        ListHead.Next = (*FirstEntry).Next;
+    }
+    FirstEntry
+}
+#[inline]
+pub fn PushEntryList(ListHead: &mut SINGLE_LIST_ENTRY, Entry: &mut SINGLE_LIST_ENTRY) {
+    Entry.Next = ListHead.Next;
+    ListHead.Next = Entry;
+}
+ENUM!{enum TABLE_SEARCH_RESULT {
+    TableEmptyTree = 0,
+    TableFoundNode = 1,
+    TableInsertAsLeft = 2,
+    TableInsertAsRight = 3,
+}}
+ENUM!{enum RTL_GENERIC_COMPARE_RESULTS {
+    GenericLessThan = 0,
+    GenericGreaterThan = 1,
+    GenericEqual = 2,
+}}
+FN!{stdcall PRTL_AVL_COMPARE_ROUTINE(
+    Table: *mut RTL_AVL_TABLE,
+    FirstStruct: PVOID,
+    SecondStruct: PVOID,
+) -> RTL_GENERIC_COMPARE_RESULTS}
+FN!{stdcall PRTL_AVL_ALLOCATE_ROUTINE(
+    Table: *mut RTL_AVL_TABLE,
+    ByteSize: CLONG,
+) -> PVOID}
+FN!{stdcall PRTL_AVL_FREE_ROUTINE(
+    Table: *mut RTL_AVL_TABLE,
+    Buffer: PVOID,
+) -> ()}
+FN!{stdcall PRTL_AVL_MATCH_FUNCTION(
+    Table: *mut RTL_AVL_TABLE,
+    UserData: PVOID,
+    MatchData: PVOID,
+) -> NTSTATUS}
+STRUCT!{struct RTL_BALANCED_LINKS {
+    Parent: *mut RTL_BALANCED_LINKS,
+    LeftChild: *mut RTL_BALANCED_LINKS,
+    RightChild: *mut RTL_BALANCED_LINKS,
+    Balance: CHAR,
+    Reserved: [UCHAR; 3],
+}}
+pub type PRTL_BALANCED_LINKS = *mut RTL_BALANCED_LINKS;
+STRUCT!{struct RTL_AVL_TABLE {
+    BalancedRoot: RTL_BALANCED_LINKS,
+    OrderedPointer: PVOID,
+    WhichOrderedElement: ULONG,
+    NumberGenericTableElements: ULONG,
+    DepthOfTree: ULONG,
+    RestartKey: PRTL_BALANCED_LINKS,
+    DeleteCount: ULONG,
+    CompareRoutine: PRTL_AVL_COMPARE_ROUTINE,
+    AllocateRoutine: PRTL_AVL_ALLOCATE_ROUTINE,
+    FreeRoutine: PRTL_AVL_FREE_ROUTINE,
+    TableContext: PVOID,
+}}
+pub type PRTL_AVL_TABLE = *mut RTL_AVL_TABLE;
+EXTERN!{extern "system" {
+    fn RtlInitializeGenericTableAvl(
+        Table: PRTL_AVL_TABLE,
+        CompareRoutine: PRTL_AVL_COMPARE_ROUTINE,
+        AllocateRoutine: PRTL_AVL_ALLOCATE_ROUTINE,
+        FreeRoutine: PRTL_AVL_FREE_ROUTINE,
+        TableContext: PVOID,
+    );
+    fn RtlInsertElementGenericTableAvl(
+        Table: PRTL_AVL_TABLE,
+        Buffer: PVOID,
+        BufferSize: CLONG,
+        NewElement: PBOOLEAN,
+    ) -> PVOID;
+    fn RtlInsertElementGenericTableFullAvl(
+        Table: PRTL_AVL_TABLE,
+        Buffer: PVOID,
+        BufferSize: CLONG,
+        NewElement: PBOOLEAN,
+        NodeOrParent: PVOID,
+        SearchResult: TABLE_SEARCH_RESULT,
+    ) -> PVOID;
+    fn RtlDeleteElementGenericTableAvl(
+        Table: PRTL_AVL_TABLE,
+        Buffer: PVOID,
+    ) -> BOOLEAN;
+    fn RtlLookupElementGenericTableAvl(
+        Table: PRTL_AVL_TABLE,
+        Buffer: PVOID,
+    ) -> PVOID;
+    fn RtlLookupElementGenericTableFullAvl(
+        Table: PRTL_AVL_TABLE,
+        Buffer: PVOID,
+        NodeOrParent: *mut PVOID,
+        SearchResult: *mut TABLE_SEARCH_RESULT,
+    ) -> PVOID;
+    fn RtlEnumerateGenericTableAvl(
+        Table: PRTL_AVL_TABLE,
+        Restart: BOOLEAN,
+    ) -> PVOID;
+    fn RtlEnumerateGenericTableWithoutSplayingAvl(
+        Table: PRTL_AVL_TABLE,
+        RestartKey: *mut PVOID,
+    ) -> PVOID;
+    fn RtlLookupFirstMatchingElementGenericTableAvl(
+        Table: PRTL_AVL_TABLE,
+        Buffer: PVOID,
+        RestartKey: *mut PVOID,
+    ) -> PVOID;
+    fn RtlEnumerateGenericTableLikeADirectory(
+        Table: PRTL_AVL_TABLE,
+        MatchFunction: PRTL_AVL_MATCH_FUNCTION,
+        MatchData: PVOID,
+        NextFlag: ULONG,
+        RestartKey: *mut PVOID,
+        DeleteCount: PULONG,
+        Buffer: PVOID,
+    ) -> PVOID;
+    fn RtlGetElementGenericTableAvl(
+        Table: PRTL_AVL_TABLE,
+        I: ULONG,
+    ) -> PVOID;
+    fn RtlNumberGenericTableElementsAvl(
+        Table: PRTL_AVL_TABLE,
+    ) -> ULONG;
+    fn RtlIsGenericTableEmptyAvl(
+        Table: PRTL_AVL_TABLE,
+    ) -> BOOLEAN;
+}}
+STRUCT!{struct RTL_SPLAY_LINKS {
+    Parent: *mut RTL_SPLAY_LINKS,
+    LeftChild: *mut RTL_SPLAY_LINKS,
+    RightChild: *mut RTL_SPLAY_LINKS,
+}}
+pub type PRTL_SPLAY_LINKS = *mut RTL_SPLAY_LINKS;
+#[inline]
+pub fn RtlInitializeSplayLinks(Links: &mut RTL_SPLAY_LINKS) {
+    Links.Parent = Links;
+    Links.LeftChild = null_mut();
+    Links.RightChild = null_mut();
+}
+#[inline]
+pub const fn RtlParent(Links: &RTL_SPLAY_LINKS) -> PRTL_SPLAY_LINKS {
+    Links.Parent
+}
+#[inline]
+pub const fn RtlLeftChild(Links: &RTL_SPLAY_LINKS) -> PRTL_SPLAY_LINKS {
+    Links.LeftChild
+}
+#[inline]
+pub const fn RtlRightChild(Links: &RTL_SPLAY_LINKS) -> PRTL_SPLAY_LINKS {
+    Links.RightChild
+}
+#[inline]
+pub unsafe fn RtlIsRoot(Links: *const RTL_SPLAY_LINKS) -> bool {
+    (*Links).Parent as *const _ == Links
+}
+#[inline]
+pub unsafe fn RtlIsLeftChild(Links: *const RTL_SPLAY_LINKS) -> bool {
+    RtlLeftChild(&*RtlParent(&*Links)) as *const _ == Links
+}
+#[inline]
+pub unsafe fn RtlIsRightChild(Links: *const RTL_SPLAY_LINKS) -> bool {
+    RtlRightChild(&*RtlParent(&*Links)) as *const _ == Links
+}
+#[inline]
+pub fn RtlInsertAsLeftChild(
+    ParentLinks: &mut RTL_SPLAY_LINKS,
+    ChildLinks: &mut RTL_SPLAY_LINKS,
+) {
+    ParentLinks.LeftChild = ChildLinks;
+    ChildLinks.Parent = ParentLinks;
+}
+#[inline]
+pub fn RtlInsertAsRightChild(
+    ParentLinks: &mut RTL_SPLAY_LINKS,
+    ChildLinks: &mut RTL_SPLAY_LINKS,
+) {
+    ParentLinks.RightChild = ChildLinks;
+    ChildLinks.Parent = ParentLinks;
+}
+EXTERN!{extern "system" {
+    fn RtlSplay(
+        Links: PRTL_SPLAY_LINKS,
+    ) -> PRTL_SPLAY_LINKS;
+    fn RtlDelete(
+        Links: PRTL_SPLAY_LINKS,
+    ) -> PRTL_SPLAY_LINKS;
+    fn RtlDeleteNoSplay(
+        Links: PRTL_SPLAY_LINKS,
+        Root: *mut PRTL_SPLAY_LINKS,
+    );
+    fn RtlSubtreeSuccessor(
+        Links: PRTL_SPLAY_LINKS,
+    ) -> PRTL_SPLAY_LINKS;
+    fn RtlSubtreePredecessor(
+        Links: PRTL_SPLAY_LINKS,
+    ) -> PRTL_SPLAY_LINKS;
+    fn RtlRealSuccessor(
+        Links: PRTL_SPLAY_LINKS,
+    ) -> PRTL_SPLAY_LINKS;
+    fn RtlRealPredecessor(
+        Links: PRTL_SPLAY_LINKS,
+    ) -> PRTL_SPLAY_LINKS;
+}}
+FN!{stdcall PRTL_GENERIC_COMPARE_ROUTINE(
+    Table: *mut RTL_GENERIC_TABLE,
+    FirstStruct: PVOID,
+    SecondStruct: PVOID,
+) -> RTL_GENERIC_COMPARE_RESULTS}
+FN!{stdcall PRTL_GENERIC_ALLOCATE_ROUTINE(
+    Table: *mut RTL_GENERIC_TABLE,
+    ByteSize: CLONG,
+) -> PVOID}
+FN!{stdcall PRTL_GENERIC_FREE_ROUTINE(
+    Table: *mut RTL_GENERIC_TABLE,
+    Buffer: PVOID,
+) -> ()}
+STRUCT!{struct RTL_GENERIC_TABLE {
+    TableRoot: PRTL_SPLAY_LINKS,
+    InsertOrderList: LIST_ENTRY,
+    OrderedPointer: PLIST_ENTRY,
+    WhichOrderedElement: ULONG,
+    NumberGenericTableElements: ULONG,
+    CompareRoutine: PRTL_GENERIC_COMPARE_ROUTINE,
+    AllocateRoutine: PRTL_GENERIC_ALLOCATE_ROUTINE,
+    FreeRoutine: PRTL_GENERIC_FREE_ROUTINE,
+    TableContext: PVOID,
+}}
+pub type PRTL_GENERIC_TABLE = *mut RTL_GENERIC_TABLE;
+EXTERN!{extern "system" {
+    fn RtlInitializeGenericTable(
+        Table: PRTL_GENERIC_TABLE,
+        CompareRoutine: PRTL_GENERIC_COMPARE_ROUTINE,
+        AllocateRoutine: PRTL_GENERIC_ALLOCATE_ROUTINE,
+        FreeRoutine: PRTL_GENERIC_FREE_ROUTINE,
+        TableContext: PVOID,
+    );
+    fn RtlInsertElementGenericTable(
+        Table: PRTL_GENERIC_TABLE,
+        Buffer: PVOID,
+        BufferSize: CLONG,
+        NewElement: PBOOLEAN,
+    ) -> PVOID;
+    fn RtlInsertElementGenericTableFull(
+        Table: PRTL_GENERIC_TABLE,
+        Buffer: PVOID,
+        BufferSize: CLONG,
+        NewElement: PBOOLEAN,
+        NodeOrParent: PVOID,
+        SearchResult: TABLE_SEARCH_RESULT,
+    ) -> PVOID;
+    fn RtlDeleteElementGenericTable(
+        Table: PRTL_GENERIC_TABLE,
+        Buffer: PVOID,
+    ) -> BOOLEAN;
+    fn RtlLookupElementGenericTable(
+        Table: PRTL_GENERIC_TABLE,
+        Buffer: PVOID,
+    ) -> PVOID;
+    fn RtlLookupElementGenericTableFull(
+        Table: PRTL_GENERIC_TABLE,
+        Buffer: PVOID,
+        NodeOrParent: *mut PVOID,
+        SearchResult: *mut TABLE_SEARCH_RESULT,
+    ) -> PVOID;
+    fn RtlEnumerateGenericTable(
+        Table: PRTL_GENERIC_TABLE,
+        Restart: BOOLEAN,
+    ) -> PVOID;
+    fn RtlEnumerateGenericTableWithoutSplaying(
+        Table: PRTL_GENERIC_TABLE,
+        RestartKey: *mut PVOID,
+    ) -> PVOID;
+    fn RtlGetElementGenericTable(
+        Table: PRTL_GENERIC_TABLE,
+        I: ULONG,
+    ) -> PVOID;
+    fn RtlNumberGenericTableElements(
+        Table: PRTL_GENERIC_TABLE,
+    ) -> ULONG;
+    fn RtlIsGenericTableEmpty(
+        Table: PRTL_GENERIC_TABLE,
+    ) -> BOOLEAN;
+}}
+STRUCT!{struct RTL_RB_TREE {
+    Root: PRTL_BALANCED_NODE,
+    Min: PRTL_BALANCED_NODE,
+}}
+pub type PRTL_RB_TREE = *mut RTL_RB_TREE;
+EXTERN!{extern "system" {
+    fn RtlRbInsertNodeEx(
+        Tree: PRTL_RB_TREE,
+        Parent: PRTL_BALANCED_NODE,
+        Right: BOOLEAN,
+        Node: PRTL_BALANCED_NODE,
+    );
+    fn RtlRbRemoveNode(
+        Tree: PRTL_RB_TREE,
+        Node: PRTL_BALANCED_NODE,
+    );
+}}
+pub const RTL_HASH_ALLOCATED_HEADER: u32 = 0x00000001;
+pub const RTL_HASH_RESERVED_SIGNATURE: u32 = 0;
+STRUCT!{struct RTL_DYNAMIC_HASH_TABLE_ENTRY {
+    Linkage: LIST_ENTRY,
+    Signature: ULONG_PTR,
+}}
+pub type PRTL_DYNAMIC_HASH_TABLE_ENTRY = *mut RTL_DYNAMIC_HASH_TABLE_ENTRY;
+#[inline]
+pub const fn HASH_ENTRY_KEY(x: &RTL_DYNAMIC_HASH_TABLE_ENTRY) -> ULONG_PTR {
+    x.Signature
+}
+STRUCT!{struct RTL_DYNAMIC_HASH_TABLE_CONTEXT {
+    ChainHead: PLIST_ENTRY,
+    PrevLinkage: PLIST_ENTRY,
+    Signature: ULONG_PTR,
+}}
+pub type PRTL_DYNAMIC_HASH_TABLE_CONTEXT = *mut RTL_DYNAMIC_HASH_TABLE_CONTEXT;
+STRUCT!{struct RTL_DYNAMIC_HASH_TABLE_ENUMERATOR {
+    HashEntry: RTL_DYNAMIC_HASH_TABLE_ENTRY,
+    ChainHead: PLIST_ENTRY,
+    BucketIndex: ULONG,
+}}
+pub type PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR = *mut RTL_DYNAMIC_HASH_TABLE_ENUMERATOR;
+STRUCT!{struct RTL_DYNAMIC_HASH_TABLE {
+    Flags: ULONG,
+    Shift: ULONG,
+    TableSize: ULONG,
+    Pivot: ULONG,
+    DivisorMask: ULONG,
+    NumEntries: ULONG,
+    NonEmptyBuckets: ULONG,
+    NumEnumerators: ULONG,
+    Directory: PVOID,
+}}
+pub type PRTL_DYNAMIC_HASH_TABLE = *mut RTL_DYNAMIC_HASH_TABLE;
+#[inline]
+pub fn RtlInitHashTableContext(Context: &mut RTL_DYNAMIC_HASH_TABLE_CONTEXT) {
+    Context.ChainHead = null_mut();
+    Context.PrevLinkage = null_mut();
+}
+#[inline]
+pub fn RtlInitHashTableContextFromEnumerator(
+    Context: &mut RTL_DYNAMIC_HASH_TABLE_CONTEXT,
+    Enumerator: &RTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+) {
+    Context.ChainHead = Enumerator.ChainHead;
+    Context.PrevLinkage = Enumerator.HashEntry.Linkage.Blink;
+}
+// RtlReleaseHashTableContext
+#[inline]
+pub const fn RtlTotalBucketsHashTable(HashTable: &RTL_DYNAMIC_HASH_TABLE) -> ULONG {
+    HashTable.TableSize
+}
+#[inline]
+pub const fn RtlNonEmptyBucketsHashTable(HashTable: &RTL_DYNAMIC_HASH_TABLE) -> ULONG {
+    HashTable.NonEmptyBuckets
+}
+#[inline]
+pub const fn RtlEmptyBucketsHashTable(HashTable: &RTL_DYNAMIC_HASH_TABLE) -> ULONG {
+    HashTable.TableSize - HashTable.NonEmptyBuckets
+}
+#[inline]
+pub const fn RtlTotalEntriesHashTable(HashTable: &RTL_DYNAMIC_HASH_TABLE) -> ULONG {
+    HashTable.NumEntries
+}
+#[inline]
+pub const fn RtlActiveEnumeratorsHashTable(HashTable: &RTL_DYNAMIC_HASH_TABLE) -> ULONG {
+    HashTable.NumEnumerators
+}
+EXTERN!{extern "system" {
+    fn RtlCreateHashTable(
+        HashTable: *mut PRTL_DYNAMIC_HASH_TABLE,
+        Shift: ULONG,
+        Flags: ULONG,
+    ) -> BOOLEAN;
+    fn RtlDeleteHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+    );
+    fn RtlInsertEntryHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Entry: PRTL_DYNAMIC_HASH_TABLE_ENTRY,
+        Signature: ULONG_PTR,
+        Context: PRTL_DYNAMIC_HASH_TABLE_CONTEXT,
+    ) -> BOOLEAN;
+    fn RtlRemoveEntryHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Entry: PRTL_DYNAMIC_HASH_TABLE_ENTRY,
+        Context: PRTL_DYNAMIC_HASH_TABLE_CONTEXT,
+    ) -> BOOLEAN;
+    fn RtlLookupEntryHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Signature: ULONG_PTR,
+        Context: PRTL_DYNAMIC_HASH_TABLE_CONTEXT,
+    ) -> PRTL_DYNAMIC_HASH_TABLE_ENTRY;
+    fn RtlGetNextEntryHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Context: PRTL_DYNAMIC_HASH_TABLE_CONTEXT,
+    ) -> PRTL_DYNAMIC_HASH_TABLE_ENTRY;
+    fn RtlInitEnumerationHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    ) -> BOOLEAN;
+    fn RtlEnumerateEntryHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    ) -> PRTL_DYNAMIC_HASH_TABLE_ENTRY;
+    fn RtlEndEnumerationHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    );
+    fn RtlInitWeakEnumerationHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    ) -> BOOLEAN;
+    fn RtlWeaklyEnumerateEntryHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    ) -> PRTL_DYNAMIC_HASH_TABLE_ENTRY;
+    fn RtlEndWeakEnumerationHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    );
+    fn RtlExpandHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+    ) -> BOOLEAN;
+    fn RtlContractHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+    ) -> BOOLEAN;
+    fn RtlInitStrongEnumerationHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    ) -> BOOLEAN;
+    fn RtlStronglyEnumerateEntryHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    ) -> PRTL_DYNAMIC_HASH_TABLE_ENTRY;
+    fn RtlEndStrongEnumerationHashTable(
+        HashTable: PRTL_DYNAMIC_HASH_TABLE,
+        Enumerator: PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR,
+    );
+    fn RtlInitializeCriticalSection(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    ) -> NTSTATUS;
+    fn RtlInitializeCriticalSectionAndSpinCount(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+        SpinCount: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDeleteCriticalSection(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    ) -> NTSTATUS;
+    fn RtlEnterCriticalSection(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    ) -> NTSTATUS;
+    fn RtlLeaveCriticalSection(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    ) -> NTSTATUS;
+    fn RtlTryEnterCriticalSection(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    ) -> LOGICAL;
+    fn RtlIsCriticalSectionLocked(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    ) -> LOGICAL;
+    fn RtlIsCriticalSectionLockedByThread(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    ) -> LOGICAL;
+    fn RtlGetCriticalSectionRecursionCount(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    ) -> ULONG;
+    fn RtlSetCriticalSectionSpinCount(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+        SpinCount: ULONG,
+    ) -> ULONG;
+    fn RtlQueryCriticalSectionOwner(
+        EventHandle: HANDLE,
+    ) -> HANDLE;
+    fn RtlCheckForOrphanedCriticalSections(
+        ThreadHandle: HANDLE,
+    );
+}}
+STRUCT!{struct RTL_RESOURCE {
+    CriticalSection: RTL_CRITICAL_SECTION,
+    SharedSemaphore: HANDLE,
+    NumberOfWaitingShared: ULONG,
+    ExclusiveSemaphore: HANDLE,
+    NumberOfWaitingExclusive: ULONG,
+    NumberOfActive: LONG,
+    ExclusiveOwnerThread: HANDLE,
+    Flags: ULONG,
+    DebugInfo: PRTL_RESOURCE_DEBUG,
+}}
+pub type PRTL_RESOURCE = *mut RTL_RESOURCE;
+pub const RTL_RESOURCE_FLAG_LONG_TERM: ULONG = 0x00000001;
+EXTERN!{extern "system" {
+    fn RtlInitializeResource(
+        Resource: PRTL_RESOURCE,
+    );
+    fn RtlDeleteResource(
+        Resource: PRTL_RESOURCE,
+    );
+    fn RtlAcquireResourceShared(
+        Resource: PRTL_RESOURCE,
+        Wait: BOOLEAN,
+    ) -> BOOLEAN;
+    fn RtlAcquireResourceExclusive(
+        Resource: PRTL_RESOURCE,
+        Wait: BOOLEAN,
+    ) -> BOOLEAN;
+    fn RtlReleaseResource(
+        Resource: PRTL_RESOURCE,
+    );
+    fn RtlConvertSharedToExclusive(
+        Resource: PRTL_RESOURCE,
+    );
+    fn RtlConvertExclusiveToShared(
+        Resource: PRTL_RESOURCE,
+    );
+    fn RtlInitializeSRWLock(
+        SRWLock: PRTL_SRWLOCK,
+    );
+    fn RtlAcquireSRWLockExclusive(
+        SRWLock: PRTL_SRWLOCK,
+    );
+    fn RtlAcquireSRWLockShared(
+        SRWLock: PRTL_SRWLOCK,
+    );
+    fn RtlReleaseSRWLockExclusive(
+        SRWLock: PRTL_SRWLOCK,
+    );
+    fn RtlReleaseSRWLockShared(
+        SRWLock: PRTL_SRWLOCK,
+    );
+    fn RtlTryAcquireSRWLockExclusive(
+        SRWLock: PRTL_SRWLOCK,
+    ) -> BOOLEAN;
+    fn RtlTryAcquireSRWLockShared(
+        SRWLock: PRTL_SRWLOCK,
+    ) -> BOOLEAN;
+    fn RtlAcquireReleaseSRWLockExclusive(
+        SRWLock: PRTL_SRWLOCK,
+    );
+    fn RtlInitializeConditionVariable(
+        ConditionVariable: PRTL_CONDITION_VARIABLE,
+    );
+    fn RtlSleepConditionVariableCS(
+        ConditionVariable: PRTL_CONDITION_VARIABLE,
+        CriticalSection: PRTL_CRITICAL_SECTION,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn RtlSleepConditionVariableSRW(
+        ConditionVariable: PRTL_CONDITION_VARIABLE,
+        SRWLock: PRTL_SRWLOCK,
+        Timeout: PLARGE_INTEGER,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlWakeConditionVariable(
+        ConditionVariable: PRTL_CONDITION_VARIABLE,
+    );
+    fn RtlWakeAllConditionVariable(
+        ConditionVariable: PRTL_CONDITION_VARIABLE,
+    );
+}}
+pub const RTL_BARRIER_FLAGS_SPIN_ONLY: ULONG = 0x00000001;
+pub const RTL_BARRIER_FLAGS_BLOCK_ONLY: ULONG = 0x00000002;
+pub const RTL_BARRIER_FLAGS_NO_DELETE: ULONG = 0x00000004;
+EXTERN!{extern "system" {
+    fn RtlInitBarrier(
+        Barrier: PRTL_BARRIER,
+        TotalThreads: ULONG,
+        SpinCount: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDeleteBarrier(
+        Barrier: PRTL_BARRIER,
+    ) -> NTSTATUS;
+    fn RtlBarrier(
+        Barrier: PRTL_BARRIER,
+        Flags: ULONG,
+    ) -> BOOLEAN;
+    fn RtlBarrierForDelete(
+        Barrier: PRTL_BARRIER,
+        Flags: ULONG,
+    ) -> BOOLEAN;
+    fn RtlWaitOnAddress(
+        Address: *mut VOID,
+        CompareAddress: PVOID,
+        AddressSize: SIZE_T,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn RtlWakeAddressAll(
+        Address: PVOID,
+    );
+    fn RtlWakeAddressSingle(
+        Address: PVOID,
+    );
+    fn RtlInitString(
+        DestinationString: PSTRING,
+        SourceString: PCSZ,
+    );
+    fn RtlInitStringEx(
+        DestinationString: PSTRING,
+        SourceString: PCSZ,
+    ) -> NTSTATUS;
+    fn RtlInitAnsiString(
+        DestinationString: PANSI_STRING,
+        SourceString: PCSZ,
+    );
+    fn RtlInitAnsiStringEx(
+        DestinationString: PANSI_STRING,
+        SourceString: PCSZ,
+    ) -> NTSTATUS;
+    fn RtlFreeAnsiString(
+        AnsiString: PANSI_STRING,
+    );
+    fn RtlFreeOemString(
+        OemString: POEM_STRING,
+    );
+    fn RtlCopyString(
+        DestinationString: PSTRING,
+        SourceString: *const STRING,
+    );
+    fn RtlUpperChar(
+        Character: CHAR,
+    ) -> CHAR;
+    fn RtlCompareString(
+        String1: *const STRING,
+        String2: *const STRING,
+        CaseInSensitive: BOOLEAN,
+    ) -> LONG;
+    fn RtlEqualString(
+        String1: *const STRING,
+        String2: *const STRING,
+        CaseInSensitive: BOOLEAN,
+    ) -> BOOLEAN;
+    fn RtlPrefixString(
+        String1: *const STRING,
+        String2: *const STRING,
+        CaseInSensitive: BOOLEAN,
+    ) -> BOOLEAN;
+    fn RtlAppendStringToString(
+        Destination: PSTRING,
+        Source: *const STRING,
+    ) -> NTSTATUS;
+    fn RtlAppendAsciizToString(
+        Destination: PSTRING,
+        Source: PSTR,
+    ) -> NTSTATUS;
+    fn RtlUpperString(
+        DestinationString: PSTRING,
+        SourceString: *const STRING,
+    );
+}}
+#[inline]
+pub unsafe fn RtlIsNullOrEmptyUnicodeString(String: PUNICODE_STRING) -> bool {
+    String.is_null() || (*String).Length == 0
+}
+#[inline]
+pub fn RtlInitEmptyUnicodeString(
+    UnicodeString: &mut UNICODE_STRING,
+    Buffer: PWCHAR,
+    MaximumLength: USHORT,
+) {
+    UnicodeString.Buffer = Buffer;
+    UnicodeString.MaximumLength = MaximumLength;
+    UnicodeString.Length = 0;
+}
+EXTERN!{extern "system" {
+    fn RtlInitUnicodeString(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PCWSTR,
+    );
+    fn RtlInitUnicodeStringEx(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PCWSTR,
+    ) -> NTSTATUS;
+    fn RtlCreateUnicodeString(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PCWSTR,
+    ) -> BOOLEAN;
+    fn RtlCreateUnicodeStringFromAsciiz(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PSTR,
+    ) -> BOOLEAN;
+    fn RtlFreeUnicodeString(
+        UnicodeString: PUNICODE_STRING,
+    );
+}}
+pub const RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE: ULONG = 0x00000001;
+pub const RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING: ULONG = 0x00000002;
+EXTERN!{extern "system" {
+    fn RtlDuplicateUnicodeString(
+        Flags: ULONG,
+        StringIn: PCUNICODE_STRING,
+        StringOut: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlCopyUnicodeString(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PCUNICODE_STRING,
+    );
+    fn RtlUpcaseUnicodeChar(
+        SourceCharacter: WCHAR,
+    ) -> WCHAR;
+    fn RtlDowncaseUnicodeChar(
+        SourceCharacter: WCHAR,
+    ) -> WCHAR;
+    fn RtlCompareUnicodeString(
+        String1: PCUNICODE_STRING,
+        String2: PCUNICODE_STRING,
+        CaseInSensitive: BOOLEAN,
+    ) -> LONG;
+    fn RtlCompareUnicodeStrings(
+        String1: PCWCH,
+        String1Length: SIZE_T,
+        String2: PCWCH,
+        String2Length: SIZE_T,
+        CaseInSensitive: BOOLEAN,
+    ) -> LONG;
+    fn RtlEqualUnicodeString(
+        String1: PCUNICODE_STRING,
+        String2: PCUNICODE_STRING,
+        CaseInSensitive: BOOLEAN,
+    ) -> BOOLEAN;
+}}
+pub const HASH_STRING_ALGORITHM_DEFAULT: ULONG = 0;
+pub const HASH_STRING_ALGORITHM_X65599: ULONG = 1;
+pub const HASH_STRING_ALGORITHM_INVALID: ULONG = 0xffffffff;
+EXTERN!{extern "system" {
+    fn RtlHashUnicodeString(
+        String: PCUNICODE_STRING,
+        CaseInSensitive: BOOLEAN,
+        HashAlgorithm: ULONG,
+        HashValue: PULONG,
+    ) -> NTSTATUS;
+    fn RtlValidateUnicodeString(
+        Flags: ULONG,
+        String: PCUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlPrefixUnicodeString(
+        String1: PCUNICODE_STRING,
+        String2: PCUNICODE_STRING,
+        CaseInSensitive: BOOLEAN,
+    ) -> BOOLEAN;
+    fn RtlSuffixUnicodeString(
+        String1: PUNICODE_STRING,
+        String2: PUNICODE_STRING,
+        CaseInSensitive: BOOLEAN,
+    ) -> BOOLEAN;
+    fn RtlFindUnicodeSubstring(
+        FullString: PUNICODE_STRING,
+        SearchString: PUNICODE_STRING,
+        CaseInSensitive: BOOLEAN,
+    ) -> PWCHAR;
+}}
+pub const RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END: ULONG = 0x00000001;
+pub const RTL_FIND_CHAR_IN_UNICODE_STRING_COMPLEMENT_CHAR_SET: ULONG = 0x00000002;
+pub const RTL_FIND_CHAR_IN_UNICODE_STRING_CASE_INSENSITIVE: ULONG = 0x00000004;
+EXTERN!{extern "system" {
+    fn RtlFindCharInUnicodeString(
+        Flags: ULONG,
+        StringToSearch: PUNICODE_STRING,
+        CharSet: PUNICODE_STRING,
+        NonInclusivePrefixLength: PUSHORT,
+    ) -> NTSTATUS;
+    fn RtlAppendUnicodeStringToString(
+        Destination: PUNICODE_STRING,
+        Source: PCUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlAppendUnicodeToString(
+        Destination: PUNICODE_STRING,
+        Source: PCWSTR,
+    ) -> NTSTATUS;
+    fn RtlUpcaseUnicodeString(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PCUNICODE_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlDowncaseUnicodeString(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PCUNICODE_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlEraseUnicodeString(
+        String: PUNICODE_STRING,
+    );
+    fn RtlAnsiStringToUnicodeString(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PCANSI_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlUnicodeStringToAnsiString(
+        DestinationString: PANSI_STRING,
+        SourceString: PCUNICODE_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlAnsiCharToUnicodeChar(
+        SourceCharacter: *mut PUCHAR,
+    ) -> WCHAR;
+    fn RtlUpcaseUnicodeStringToAnsiString(
+        DestinationString: PANSI_STRING,
+        SourceString: PUNICODE_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlOemStringToUnicodeString(
+        DestinationString: PUNICODE_STRING,
+        SourceString: PCOEM_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlUnicodeStringToOemString(
+        DestinationString: POEM_STRING,
+        SourceString: PCUNICODE_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlUpcaseUnicodeStringToOemString(
+        DestinationString: POEM_STRING,
+        SourceString: PUNICODE_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlUnicodeStringToCountedOemString(
+        DestinationString: POEM_STRING,
+        SourceString: PCUNICODE_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlUpcaseUnicodeStringToCountedOemString(
+        DestinationString: POEM_STRING,
+        SourceString: PCUNICODE_STRING,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlMultiByteToUnicodeN(
+        UnicodeString: PWCH,
+        MaxBytesInUnicodeString: ULONG,
+        BytesInUnicodeString: PULONG,
+        MultiByteString: *const CHAR,
+        BytesInMultiByteString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlMultiByteToUnicodeSize(
+        BytesInUnicodeString: PULONG,
+        MultiByteString: *const CHAR,
+        BytesInMultiByteString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUnicodeToMultiByteN(
+        MultiByteString: PCHAR,
+        MaxBytesInMultiByteString: ULONG,
+        BytesInMultiByteString: PULONG,
+        UnicodeString: PCWCH,
+        BytesInUnicodeString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUnicodeToMultiByteSize(
+        BytesInMultiByteString: PULONG,
+        UnicodeString: PCWCH,
+        BytesInUnicodeString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUpcaseUnicodeToMultiByteN(
+        MultiByteString: PCHAR,
+        MaxBytesInMultiByteString: ULONG,
+        BytesInMultiByteString: PULONG,
+        UnicodeString: PCWCH,
+        BytesInUnicodeString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlOemToUnicodeN(
+        UnicodeString: PWCH,
+        MaxBytesInUnicodeString: ULONG,
+        BytesInUnicodeString: PULONG,
+        OemString: PCCH,
+        BytesInOemString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUnicodeToOemN(
+        OemString: PCHAR,
+        MaxBytesInOemString: ULONG,
+        BytesInOemString: PULONG,
+        UnicodeString: PCWCH,
+        BytesInUnicodeString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUpcaseUnicodeToOemN(
+        OemString: PCHAR,
+        MaxBytesInOemString: ULONG,
+        BytesInOemString: PULONG,
+        UnicodeString: PCWCH,
+        BytesInUnicodeString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlConsoleMultiByteToUnicodeN(
+        UnicodeString: PWCH,
+        MaxBytesInUnicodeString: ULONG,
+        BytesInUnicodeString: PULONG,
+        MultiByteString: PCH,
+        BytesInMultiByteString: ULONG,
+        pdwSpecialChar: PULONG,
+    ) -> NTSTATUS;
+    fn RtlUTF8ToUnicodeN(
+        UnicodeStringDestination: PWSTR,
+        UnicodeStringMaxByteCount: ULONG,
+        UnicodeStringActualByteCount: PULONG,
+        UTF8StringSource: PCCH,
+        UTF8StringByteCount: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUnicodeToUTF8N(
+        UTF8StringDestination: PCHAR,
+        UTF8StringMaxByteCount: ULONG,
+        UTF8StringActualByteCount: PULONG,
+        UnicodeStringSource: PCWCH,
+        UnicodeStringByteCount: ULONG,
+    ) -> NTSTATUS;
+    fn RtlCustomCPToUnicodeN(
+        CustomCP: PCPTABLEINFO,
+        UnicodeString: PWCH,
+        MaxBytesInUnicodeString: ULONG,
+        BytesInUnicodeString: PULONG,
+        CustomCPString: PCH,
+        BytesInCustomCPString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUnicodeToCustomCPN(
+        CustomCP: PCPTABLEINFO,
+        CustomCPString: PCH,
+        MaxBytesInCustomCPString: ULONG,
+        BytesInCustomCPString: PULONG,
+        UnicodeString: PWCH,
+        BytesInUnicodeString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUpcaseUnicodeToCustomCPN(
+        CustomCP: PCPTABLEINFO,
+        CustomCPString: PCH,
+        MaxBytesInCustomCPString: ULONG,
+        BytesInCustomCPString: PULONG,
+        UnicodeString: PWCH,
+        BytesInUnicodeString: ULONG,
+    ) -> NTSTATUS;
+    fn RtlInitCodePageTable(
+        TableBase: PUSHORT,
+        CodePageTable: PCPTABLEINFO,
+    );
+    fn RtlInitNlsTables(
+        AnsiNlsBase: PUSHORT,
+        OemNlsBase: PUSHORT,
+        LanguageNlsBase: PUSHORT,
+        TableInfo: PNLSTABLEINFO,
+    );
+    fn RtlResetRtlTranslations(
+        TableInfo: PNLSTABLEINFO,
+    );
+    fn RtlIsTextUnicode(
+        Buffer: PVOID,
+        Size: ULONG,
+        Result: PULONG,
+    ) -> BOOLEAN;
+}}
+ENUM!{enum RTL_NORM_FORM {
+    NormOther = 0x0,
+    NormC = 0x1,
+    NormD = 0x2,
+    NormKC = 0x5,
+    NormKD = 0x6,
+    NormIdna = 0xd,
+    DisallowUnassigned = 0x100,
+    NormCDisallowUnassigned = 0x101,
+    NormDDisallowUnassigned = 0x102,
+    NormKCDisallowUnassigned = 0x105,
+    NormKDDisallowUnassigned = 0x106,
+    NormIdnaDisallowUnassigned = 0x10d,
+}}
+EXTERN!{extern "system" {
+    fn RtlNormalizeString(
+        NormForm: ULONG,
+        SourceString: PCWSTR,
+        SourceStringLength: LONG,
+        DestinationString: PWSTR,
+        DestinationStringLength: PLONG,
+    ) -> NTSTATUS;
+    fn RtlIsNormalizedString(
+        NormForm: ULONG,
+        SourceString: PCWSTR,
+        SourceStringLength: LONG,
+        Normalized: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlIsNameInExpression(
+        Expression: PUNICODE_STRING,
+        Name: PUNICODE_STRING,
+        IgnoreCase: BOOLEAN,
+        UpcaseTable: PWCH,
+    ) -> BOOLEAN;
+    fn RtlIsNameInUnUpcasedExpression(
+        Expression: PUNICODE_STRING,
+        Name: PUNICODE_STRING,
+        IgnoreCase: BOOLEAN,
+        UpcaseTable: PWCH,
+    ) -> BOOLEAN;
+    fn RtlEqualDomainName(
+        String1: PUNICODE_STRING,
+        String2: PUNICODE_STRING,
+    ) -> BOOLEAN;
+    fn RtlEqualComputerName(
+        String1: PUNICODE_STRING,
+        String2: PUNICODE_STRING,
+    ) -> BOOLEAN;
+    fn RtlDnsHostNameToComputerName(
+        ComputerNameString: PUNICODE_STRING,
+        DnsHostNameString: PUNICODE_STRING,
+        AllocateComputerNameString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlStringFromGUID(
+        Guid: *const GUID,
+        GuidString: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlStringFromGUIDEx(
+        Guid: *mut GUID,
+        GuidString: PUNICODE_STRING,
+        AllocateGuidString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlGUIDFromString(
+        GuidString: PCUNICODE_STRING,
+        Guid: *mut GUID,
+    ) -> NTSTATUS;
+    fn RtlCompareAltitudes(
+        Altitude1: PCUNICODE_STRING,
+        Altitude2: PCUNICODE_STRING,
+    ) -> LONG;
+    fn RtlIdnToAscii(
+        Flags: ULONG,
+        SourceString: PCWSTR,
+        SourceStringLength: LONG,
+        DestinationString: PWSTR,
+        DestinationStringLength: PLONG,
+    ) -> NTSTATUS;
+    fn RtlIdnToUnicode(
+        Flags: ULONG,
+        SourceString: PCWSTR,
+        SourceStringLength: LONG,
+        DestinationString: PWSTR,
+        DestinationStringLength: PLONG,
+    ) -> NTSTATUS;
+    fn RtlIdnToNameprepUnicode(
+        Flags: ULONG,
+        SourceString: PCWSTR,
+        SourceStringLength: LONG,
+        DestinationString: PWSTR,
+        DestinationStringLength: PLONG,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct PREFIX_TABLE_ENTRY {
+    NodeTypeCode: CSHORT,
+    NameLength: CSHORT,
+    NextPrefixTree: *mut PREFIX_TABLE_ENTRY,
+    Links: RTL_SPLAY_LINKS,
+    Prefix: PSTRING,
+}}
+pub type PPREFIX_TABLE_ENTRY = *mut PREFIX_TABLE_ENTRY;
+STRUCT!{struct PREFIX_TABLE {
+    NodeTypeCode: CSHORT,
+    NameLength: CSHORT,
+    NextPrefixTree: PPREFIX_TABLE_ENTRY,
+}}
+pub type PPREFIX_TABLE = *mut PREFIX_TABLE;
+EXTERN!{extern "system" {
+    fn PfxInitialize(
+        PrefixTable: PPREFIX_TABLE,
+    );
+    fn PfxInsertPrefix(
+        PrefixTable: PPREFIX_TABLE,
+        Prefix: PSTRING,
+        PrefixTableEntry: PPREFIX_TABLE_ENTRY,
+    ) -> BOOLEAN;
+    fn PfxRemovePrefix(
+        PrefixTable: PPREFIX_TABLE,
+        PrefixTableEntry: PPREFIX_TABLE_ENTRY,
+    );
+    fn PfxFindPrefix(
+        PrefixTable: PPREFIX_TABLE,
+        FullName: PSTRING,
+    ) -> PPREFIX_TABLE_ENTRY;
+}}
+STRUCT!{struct UNICODE_PREFIX_TABLE_ENTRY {
+    NodeTypeCode: CSHORT,
+    NameLength: CSHORT,
+    NextPrefixTree: *mut UNICODE_PREFIX_TABLE_ENTRY,
+    CaseMatch: *mut UNICODE_PREFIX_TABLE_ENTRY,
+    Links: RTL_SPLAY_LINKS,
+    Prefix: PUNICODE_STRING,
+}}
+pub type PUNICODE_PREFIX_TABLE_ENTRY = *mut UNICODE_PREFIX_TABLE_ENTRY;
+STRUCT!{struct UNICODE_PREFIX_TABLE {
+    NodeTypeCode: CSHORT,
+    NameLength: CSHORT,
+    NextPrefixTree: PUNICODE_PREFIX_TABLE_ENTRY,
+    LastNextEntry: PUNICODE_PREFIX_TABLE_ENTRY,
+}}
+pub type PUNICODE_PREFIX_TABLE = *mut UNICODE_PREFIX_TABLE;
+EXTERN!{extern "system" {
+    fn RtlInitializeUnicodePrefix(
+        PrefixTable: PUNICODE_PREFIX_TABLE,
+    );
+    fn RtlInsertUnicodePrefix(
+        PrefixTable: PUNICODE_PREFIX_TABLE,
+        Prefix: PUNICODE_STRING,
+        PrefixTableEntry: PUNICODE_PREFIX_TABLE_ENTRY,
+    ) -> BOOLEAN;
+    fn RtlRemoveUnicodePrefix(
+        PrefixTable: PUNICODE_PREFIX_TABLE,
+        PrefixTableEntry: PUNICODE_PREFIX_TABLE_ENTRY,
+    );
+    fn RtlFindUnicodePrefix(
+        PrefixTable: PUNICODE_PREFIX_TABLE,
+        FullName: PCUNICODE_STRING,
+        CaseInsensitiveIndex: ULONG,
+    ) -> PUNICODE_PREFIX_TABLE_ENTRY;
+    fn RtlNextUnicodePrefix(
+        PrefixTable: PUNICODE_PREFIX_TABLE,
+        Restart: BOOLEAN,
+    ) -> PUNICODE_PREFIX_TABLE_ENTRY;
+}}
+STRUCT!{struct COMPRESSED_DATA_INFO {
+    CompressionFormatAndEngine: USHORT,
+    CompressionUnitShift: UCHAR,
+    ChunkShift: UCHAR,
+    ClusterShift: UCHAR,
+    Reserved: UCHAR,
+    NumberOfChunks: USHORT,
+    CompressedChunkSizes: [ULONG; 1],
+}}
+pub type PCOMPRESSED_DATA_INFO = *mut COMPRESSED_DATA_INFO;
+EXTERN!{extern "system" {
+    fn RtlGetCompressionWorkSpaceSize(
+        CompressionFormatAndEngine: USHORT,
+        CompressBufferWorkSpaceSize: PULONG,
+        CompressFragmentWorkSpaceSize: PULONG,
+    ) -> NTSTATUS;
+    fn RtlCompressBuffer(
+        CompressionFormatAndEngine: USHORT,
+        UncompressedBuffer: PUCHAR,
+        UncompressedBufferSize: ULONG,
+        CompressedBuffer: PUCHAR,
+        CompressedBufferSize: ULONG,
+        UncompressedChunkSize: ULONG,
+        FinalCompressedSize: PULONG,
+        WorkSpace: PVOID,
+    ) -> NTSTATUS;
+    fn RtlDecompressBuffer(
+        CompressionFormat: USHORT,
+        UncompressedBuffer: PUCHAR,
+        UncompressedBufferSize: ULONG,
+        CompressedBuffer: PUCHAR,
+        CompressedBufferSize: ULONG,
+        FinalUncompressedSize: PULONG,
+    ) -> NTSTATUS;
+    fn RtlDecompressBufferEx(
+        CompressionFormat: USHORT,
+        UncompressedBuffer: PUCHAR,
+        UncompressedBufferSize: ULONG,
+        CompressedBuffer: PUCHAR,
+        CompressedBufferSize: ULONG,
+        FinalUncompressedSize: PULONG,
+        WorkSpace: PVOID,
+    ) -> NTSTATUS;
+    fn RtlDecompressFragment(
+        CompressionFormat: USHORT,
+        UncompressedFragment: PUCHAR,
+        UncompressedFragmentSize: ULONG,
+        CompressedBuffer: PUCHAR,
+        CompressedBufferSize: ULONG,
+        FragmentOffset: ULONG,
+        FinalUncompressedSize: PULONG,
+        WorkSpace: PVOID,
+    ) -> NTSTATUS;
+    fn RtlDescribeChunk(
+        CompressionFormat: USHORT,
+        CompressedBuffer: *mut PUCHAR,
+        EndOfCompressedBufferPlus1: PUCHAR,
+        ChunkBuffer: *mut PUCHAR,
+        ChunkSize: PULONG,
+    ) -> NTSTATUS;
+    fn RtlReserveChunk(
+        CompressionFormat: USHORT,
+        CompressedBuffer: *mut PUCHAR,
+        EndOfCompressedBufferPlus1: PUCHAR,
+        ChunkBuffer: *mut PUCHAR,
+        ChunkSize: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDecompressChunks(
+        UncompressedBuffer: PUCHAR,
+        UncompressedBufferSize: ULONG,
+        CompressedBuffer: PUCHAR,
+        CompressedBufferSize: ULONG,
+        CompressedTail: PUCHAR,
+        CompressedTailSize: ULONG,
+        CompressedDataInfo: PCOMPRESSED_DATA_INFO,
+    ) -> NTSTATUS;
+    fn RtlCompressChunks(
+        UncompressedBuffer: PUCHAR,
+        UncompressedBufferSize: ULONG,
+        CompressedBuffer: PUCHAR,
+        CompressedBufferSize: ULONG,
+        CompressedDataInfo: PCOMPRESSED_DATA_INFO,
+        CompressedDataInfoLength: ULONG,
+        WorkSpace: PVOID,
+    ) -> NTSTATUS;
+    fn RtlConvertLCIDToString(
+        LcidValue: LCID,
+        Base: ULONG,
+        Padding: ULONG,
+        pResultBuf: PWSTR,
+        Size: ULONG,
+    ) -> NTSTATUS;
+    fn RtlIsValidLocaleName(
+        LocaleName: PWSTR,
+        Flags: ULONG,
+    ) -> BOOLEAN;
+    fn RtlGetParentLocaleName(
+        LocaleName: PWSTR,
+        ParentLocaleName: PUNICODE_STRING,
+        Flags: ULONG,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlLcidToLocaleName(
+        lcid: LCID,
+        LocaleName: PUNICODE_STRING,
+        Flags: ULONG,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlLocaleNameToLcid(
+        LocaleName: PWSTR,
+        lcid: PLCID,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlLCIDToCultureName(
+        Lcid: LCID,
+        String: PUNICODE_STRING,
+    ) -> BOOLEAN;
+    fn RtlCultureNameToLCID(
+        String: PUNICODE_STRING,
+        Lcid: PLCID,
+    ) -> BOOLEAN;
+    fn RtlCleanUpTEBLangLists();
+    fn RtlGetLocaleFileMappingAddress(
+        BaseAddress: *mut PVOID,
+        DefaultLocaleId: PLCID,
+        DefaultCasingTableSize: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn RtlGetCurrentPeb() -> PPEB;
+    fn RtlAcquirePebLock();
+    fn RtlReleasePebLock();
+    fn RtlTryAcquirePebLock() -> LOGICAL;
+    fn RtlAllocateFromPeb(
+        Size: ULONG,
+        Block: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlFreeToPeb(
+        Block: PVOID,
+        Size: ULONG,
+    ) -> NTSTATUS;
+}}
+pub const DOS_MAX_COMPONENT_LENGTH: u32 = 255;
+pub const DOS_MAX_PATH_LENGTH: u32 = DOS_MAX_COMPONENT_LENGTH + 5;
+STRUCT!{struct CURDIR {
+    DosPath: UNICODE_STRING,
+    Handle: HANDLE,
+}}
+pub type PCURDIR = *mut CURDIR;
+pub const RTL_USER_PROC_CURDIR_CLOSE: u32 = 0x00000002;
+pub const RTL_USER_PROC_CURDIR_INHERIT: u32 = 0x00000003;
+STRUCT!{struct RTL_DRIVE_LETTER_CURDIR {
+    Flags: USHORT,
+    Length: USHORT,
+    TimeStamp: ULONG,
+    DosPath: STRING,
+}}
+pub type PRTL_DRIVE_LETTER_CURDIR = *mut RTL_DRIVE_LETTER_CURDIR;
+pub const RTL_MAX_DRIVE_LETTERS: usize = 32;
+pub const RTL_DRIVE_LETTER_VALID: USHORT = 0x0001;
+STRUCT!{struct RTL_USER_PROCESS_PARAMETERS {
+    MaximumLength: ULONG,
+    Length: ULONG,
+    Flags: ULONG,
+    DebugFlags: ULONG,
+    ConsoleHandle: HANDLE,
+    ConsoleFlags: ULONG,
+    StandardInput: HANDLE,
+    StandardOutput: HANDLE,
+    StandardError: HANDLE,
+    CurrentDirectory: CURDIR,
+    DllPath: UNICODE_STRING,
+    ImagePathName: UNICODE_STRING,
+    CommandLine: UNICODE_STRING,
+    Environment: PVOID,
+    StartingX: ULONG,
+    StartingY: ULONG,
+    CountX: ULONG,
+    CountY: ULONG,
+    CountCharsX: ULONG,
+    CountCharsY: ULONG,
+    FillAttribute: ULONG,
+    WindowFlags: ULONG,
+    ShowWindowFlags: ULONG,
+    WindowTitle: UNICODE_STRING,
+    DesktopInfo: UNICODE_STRING,
+    ShellInfo: UNICODE_STRING,
+    RuntimeData: UNICODE_STRING,
+    CurrentDirectories: [RTL_DRIVE_LETTER_CURDIR; RTL_MAX_DRIVE_LETTERS],
+    EnvironmentSize: ULONG_PTR,
+    EnvironmentVersion: ULONG_PTR,
+    PackageDependencyData: PVOID,
+    ProcessGroupId: ULONG,
+    LoaderThreads: ULONG,
+}}
+pub type PRTL_USER_PROCESS_PARAMETERS = *mut RTL_USER_PROCESS_PARAMETERS;
+pub const RTL_USER_PROC_PARAMS_NORMALIZED: ULONG = 0x00000001;
+pub const RTL_USER_PROC_PROFILE_USER: ULONG = 0x00000002;
+pub const RTL_USER_PROC_PROFILE_KERNEL: ULONG = 0x00000004;
+pub const RTL_USER_PROC_PROFILE_SERVER: ULONG = 0x00000008;
+pub const RTL_USER_PROC_RESERVE_1MB: ULONG = 0x00000020;
+pub const RTL_USER_PROC_RESERVE_16MB: ULONG = 0x00000040;
+pub const RTL_USER_PROC_CASE_SENSITIVE: ULONG = 0x00000080;
+pub const RTL_USER_PROC_DISABLE_HEAP_DECOMMIT: ULONG = 0x00000100;
+pub const RTL_USER_PROC_DLL_REDIRECTION_LOCAL: ULONG = 0x00001000;
+pub const RTL_USER_PROC_APP_MANIFEST_PRESENT: ULONG = 0x00002000;
+pub const RTL_USER_PROC_IMAGE_KEY_MISSING: ULONG = 0x00004000;
+pub const RTL_USER_PROC_OPTIN_PROCESS: ULONG = 0x00020000;
+EXTERN!{extern "system" {
+    fn RtlCreateProcessParameters(
+        pProcessParameters: *mut PRTL_USER_PROCESS_PARAMETERS,
+        ImagePathName: PUNICODE_STRING,
+        DllPath: PUNICODE_STRING,
+        CurrentDirectory: PUNICODE_STRING,
+        CommandLine: PUNICODE_STRING,
+        Environment: PVOID,
+        WindowTitle: PUNICODE_STRING,
+        DesktopInfo: PUNICODE_STRING,
+        ShellInfo: PUNICODE_STRING,
+        RuntimeData: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlCreateProcessParametersEx(
+        pProcessParameters: *mut PRTL_USER_PROCESS_PARAMETERS,
+        ImagePathName: PUNICODE_STRING,
+        DllPath: PUNICODE_STRING,
+        CurrentDirectory: PUNICODE_STRING,
+        CommandLine: PUNICODE_STRING,
+        Environment: PVOID,
+        WindowTitle: PUNICODE_STRING,
+        DesktopInfo: PUNICODE_STRING,
+        ShellInfo: PUNICODE_STRING,
+        RuntimeData: PUNICODE_STRING,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDestroyProcessParameters(
+        ProcessParameters: PRTL_USER_PROCESS_PARAMETERS,
+    ) -> NTSTATUS;
+    fn RtlNormalizeProcessParams(
+        ProcessParameters: PRTL_USER_PROCESS_PARAMETERS,
+    ) -> PRTL_USER_PROCESS_PARAMETERS;
+    fn RtlDeNormalizeProcessParams(
+        ProcessParameters: PRTL_USER_PROCESS_PARAMETERS,
+    ) -> PRTL_USER_PROCESS_PARAMETERS;
+}}
+STRUCT!{struct RTL_USER_PROCESS_INFORMATION {
+    Length: ULONG,
+    Process: HANDLE,
+    Thread: HANDLE,
+    ClientId: CLIENT_ID,
+    ImageInformation: SECTION_IMAGE_INFORMATION,
+}}
+pub type PRTL_USER_PROCESS_INFORMATION = *mut RTL_USER_PROCESS_INFORMATION;
+EXTERN!{extern "system" {
+    fn RtlCreateUserProcess(
+        NtImagePathName: PUNICODE_STRING,
+        AttributesDeprecated: ULONG,
+        ProcessParameters: PRTL_USER_PROCESS_PARAMETERS,
+        ProcessSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        ThreadSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        ParentProcess: HANDLE,
+        InheritHandles: BOOLEAN,
+        DebugPort: HANDLE,
+        TokenHandle: HANDLE,
+        ProcessInformation: PRTL_USER_PROCESS_INFORMATION,
+    ) -> NTSTATUS;
+    fn RtlCreateUserProcessEx(
+        NtImagePathName: PUNICODE_STRING,
+        ProcessParameters: PRTL_USER_PROCESS_PARAMETERS,
+        InheritHandles: BOOLEAN,
+        Flags: ULONG,
+        ProcessInformation: PRTL_USER_PROCESS_INFORMATION,
+    ) -> NTSTATUS;
+    fn RtlExitUserProcess(
+        ExitStatus: NTSTATUS,
+    );
+}}
+pub const RTL_CLONE_PROCESS_FLAGS_CREATE_SUSPENDED: ULONG = 0x00000001;
+pub const RTL_CLONE_PROCESS_FLAGS_INHERIT_HANDLES: ULONG = 0x00000002;
+pub const RTL_CLONE_PROCESS_FLAGS_NO_SYNCHRONIZE: ULONG = 0x00000004;
+EXTERN!{extern "system" {
+    fn RtlCloneUserProcess(
+        ProcessFlags: ULONG,
+        ProcessSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        ThreadSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        DebugPort: HANDLE,
+        ProcessInformation: PRTL_USER_PROCESS_INFORMATION,
+    ) -> NTSTATUS;
+    fn RtlUpdateClonedCriticalSection(
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    );
+    fn RtlUpdateClonedSRWLock(
+        SRWLock: PRTL_SRWLOCK,
+        Shared: LOGICAL,
+    );
+}}
+STRUCT!{struct RTLP_PROCESS_REFLECTION_REFLECTION_INFORMATION {
+    ReflectionProcessHandle: HANDLE,
+    ReflectionThreadHandle: HANDLE,
+    ReflectionClientId: CLIENT_ID,
+}}
+pub type PRTLP_PROCESS_REFLECTION_REFLECTION_INFORMATION =
+    *mut RTLP_PROCESS_REFLECTION_REFLECTION_INFORMATION;
+EXTERN!{extern "system" {
+    fn RtlCreateProcessReflection(
+        ProcessHandle: HANDLE,
+        Flags: ULONG,
+        StartRoutine: PVOID,
+        StartContext: PVOID,
+        EventHandle: HANDLE,
+        ReflectionInformation: PRTLP_PROCESS_REFLECTION_REFLECTION_INFORMATION,
+    ) -> NTSTATUS;
+}}
+EXTERN!{extern "C" {
+    fn RtlSetProcessIsCritical(
+        NewValue: BOOLEAN,
+        OldValue: PBOOLEAN,
+        CheckFlag: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSetThreadIsCritical(
+        NewValue: BOOLEAN,
+        OldValue: PBOOLEAN,
+        CheckFlag: BOOLEAN,
+    ) -> NTSTATUS;
+}}
+EXTERN!{extern "system" {
+    fn RtlValidProcessProtection(
+        ProcessProtection: PS_PROTECTION,
+    ) -> BOOLEAN;
+    fn RtlTestProtectedAccess(
+        Source: PS_PROTECTION,
+        Target: PS_PROTECTION,
+    ) -> BOOLEAN;
+    fn RtlIsCurrentProcess(
+        ProcessHandle: HANDLE,
+    ) -> BOOLEAN;
+    fn RtlIsCurrentThread(
+        ThreadHandle: HANDLE,
+    ) -> BOOLEAN;
+}}
+FN!{stdcall PUSER_THREAD_START_ROUTINE(
+    ThreadParameter: PVOID,
+) -> NTSTATUS}
+EXTERN!{extern "system" {
+    fn RtlCreateUserThread(
+        Process: HANDLE,
+        ThreadSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        CreateSuspended: BOOLEAN,
+        ZeroBits: ULONG,
+        MaximumStackSize: SIZE_T,
+        CommittedStackSize: SIZE_T,
+        StartAddress: PUSER_THREAD_START_ROUTINE,
+        Parameter: PVOID,
+        Thread: PHANDLE,
+        ClientId: PCLIENT_ID,
+    ) -> NTSTATUS;
+    fn RtlExitUserThread(
+        ExitStatus: NTSTATUS,
+    );
+    fn RtlIsCurrentThreadAttachExempt() -> BOOLEAN;
+    fn RtlCreateUserStack(
+        CommittedStackSize: SIZE_T,
+        MaximumStackSize: SIZE_T,
+        ZeroBits: ULONG_PTR,
+        PageSize: SIZE_T,
+        ReserveAlignment: ULONG_PTR,
+        InitialTeb: PINITIAL_TEB,
+    ) -> NTSTATUS;
+    fn RtlFreeUserStack(
+        AllocationBase: PVOID,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct CONTEXT_CHUNK {
+    Offset: LONG,
+    Length: ULONG,
+}}
+pub type PCONTEXT_CHUNK = *mut CONTEXT_CHUNK;
+STRUCT!{struct CONTEXT_EX {
+    All: CONTEXT_CHUNK,
+    Legacy: CONTEXT_CHUNK,
+    XState: CONTEXT_CHUNK,
+}}
+pub type PCONTEXT_EX = *mut CONTEXT_EX;
+pub const CONTEXT_EX_LENGTH: usize = 4096;
+#[macro_export]
+macro_rules! RTL_CONTEXT_EX_OFFSET {
+    ($ContextEx:expr, $Chunk:ident) => {
+        (*$ContextEx).$Chunk.Offset
+    };
+}
+#[macro_export]
+macro_rules! RTL_CONTEXT_EX_LENGTH {
+    ($ContextEx:expr, $Chunk:ident) => {
+        (*$ContextEx).$Chunk.Length
+    };
+}
+#[macro_export]
+macro_rules! RTL_CONTEXT_EX_CHUNK {
+    ($Base:expr, $Layout:expr, $Chunk:ident) => {
+        ($Base as usize + RTL_CONTEXT_EX_OFFSET!($Layout, $Chunk) as usize) as *mut c_void
+    };
+}
+#[macro_export]
+macro_rules! RTL_CONTEXT_OFFSET {
+    ($Context:expr, $Chunk:ident) => {
+        RTL_CONTEXT_EX_OFFSET!(($Context as *const $crate::winapi::um::winnt::CONTEXT).offset(1)
+            as *const $crate::ntrtl::CONTEXT_EX, $Chunk)
+    };
+}
+#[macro_export]
+macro_rules! RTL_CONTEXT_LENGTH {
+    ($Context:expr, $Chunk:ident) => {
+        RTL_CONTEXT_EX_LENGTH!(($Context as *const $crate::winapi::um::winnt::CONTEXT).offset(1)
+            as *const $crate::ntrtl::CONTEXT_EX, $Chunk)
+    };
+}
+#[macro_export]
+macro_rules! RTL_CONTEXT_CHUNK {
+    ($Context:expr, $Chunk:ident) => {
+        RTL_CONTEXT_EX_CHUNK!(
+            ($Context as *const $crate::winapi::um::winnt::CONTEXT).offset(1)
+                as *const $crate::ntrtl::CONTEXT_EX,
+            ($Context as *const $crate::winapi::um::winnt::CONTEXT).offset(1)
+                as *const $crate::ntrtl::CONTEXT_EX,
+            $Chunk
+        )
+    };
+}
+EXTERN!{extern "system" {
+    fn RtlInitializeContext(
+        Process: HANDLE,
+        Context: PCONTEXT,
+        Parameter: PVOID,
+        InitialPc: PVOID,
+        InitialSp: PVOID,
+    );
+    fn RtlInitializeExtendedContext(
+        Context: PCONTEXT,
+        ContextFlags: ULONG,
+        ContextEx: *mut PCONTEXT_EX,
+    ) -> ULONG;
+    fn RtlCopyExtendedContext(
+        Destination: PCONTEXT_EX,
+        ContextFlags: ULONG,
+        Source: PCONTEXT_EX,
+    ) -> ULONG;
+    fn RtlGetExtendedContextLength(
+        ContextFlags: ULONG,
+        ContextLength: PULONG,
+    ) -> ULONG;
+    fn RtlGetExtendedFeaturesMask(
+        ContextEx: PCONTEXT_EX,
+    ) -> ULONG64;
+    fn RtlLocateExtendedFeature(
+        ContextEx: PCONTEXT_EX,
+        FeatureId: ULONG,
+        Length: PULONG,
+    ) -> PVOID;
+    fn RtlLocateLegacyContext(
+        ContextEx: PCONTEXT_EX,
+        Length: PULONG,
+    ) -> PCONTEXT;
+    fn RtlSetExtendedFeaturesMask(
+        ContextEx: PCONTEXT_EX,
+        FeatureMask: ULONG64,
+    );
+}}
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+EXTERN!{extern "system" {
+    fn RtlWow64GetThreadContext(
+        ThreadHandle: HANDLE,
+        ThreadContext: PWOW64_CONTEXT,
+    ) -> NTSTATUS;
+    fn RtlWow64SetThreadContext(
+        ThreadHandle: HANDLE,
+        ThreadContext: PWOW64_CONTEXT,
+    ) -> NTSTATUS;
+}}
+EXTERN!{extern "system" {
+    fn RtlRemoteCall(
+        Process: HANDLE,
+        Thread: HANDLE,
+        CallSite: PVOID,
+        ArgumentCount: ULONG,
+        Arguments: PULONG_PTR,
+        PassContext: BOOLEAN,
+        AlreadySuspended: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlAddVectoredExceptionHandler(
+        First: ULONG,
+        Handler: PVECTORED_EXCEPTION_HANDLER,
+    ) -> PVOID;
+    fn RtlRemoveVectoredExceptionHandler(
+        Handle: PVOID,
+    ) -> ULONG;
+    fn RtlAddVectoredContinueHandler(
+        First: ULONG,
+        Handler: PVECTORED_EXCEPTION_HANDLER,
+    ) -> PVOID;
+    fn RtlRemoveVectoredContinueHandler(
+        Handle: PVOID,
+    ) -> ULONG;
+}}
+FN!{stdcall PRTLP_UNHANDLED_EXCEPTION_FILTER(
+    ExceptionInfo: PEXCEPTION_POINTERS,
+) -> ULONG}
+EXTERN!{extern "system" {
+    fn RtlSetUnhandledExceptionFilter(
+        UnhandledExceptionFilter: PRTLP_UNHANDLED_EXCEPTION_FILTER,
+    );
+    fn RtlUnhandledExceptionFilter(
+        ExceptionPointers: PEXCEPTION_POINTERS,
+    ) -> LONG;
+    fn RtlUnhandledExceptionFilter2(
+        ExceptionPointers: PEXCEPTION_POINTERS,
+        Flags: ULONG,
+    ) -> LONG;
+    fn RtlKnownExceptionFilter(
+        ExceptionPointers: PEXCEPTION_POINTERS,
+    ) -> LONG;
+}}
+#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+IFDEF!{
+ENUM!{enum FUNCTION_TABLE_TYPE {
+    RF_SORTED = 0,
+    RF_UNSORTED = 1,
+    RF_CALLBACK = 2,
+    RF_KERNEL_DYNAMIC = 3,
+}}
+STRUCT!{struct DYNAMIC_FUNCTION_TABLE {
+    ListEntry: LIST_ENTRY,
+    FunctionTable: PRUNTIME_FUNCTION,
+    TimeStamp: LARGE_INTEGER,
+    MinimumAddress: ULONG64,
+    MaximumAddress: ULONG64,
+    BaseAddress: ULONG64,
+    Callback: PGET_RUNTIME_FUNCTION_CALLBACK,
+    Context: PVOID,
+    OutOfProcessCallbackDll: PWSTR,
+    Type: FUNCTION_TABLE_TYPE,
+    EntryCount: ULONG,
+    TreeNode: RTL_BALANCED_NODE,
+}}
+pub type PDYNAMIC_FUNCTION_TABLE = *mut DYNAMIC_FUNCTION_TABLE;
+EXTERN!{extern "system" {
+    fn RtlGetFunctionTableListHead() -> PLIST_ENTRY;
+}}
+}
+EXTERN!{extern "system" {
+    fn RtlImageNtHeader(
+        BaseOfImage: PVOID,
+    ) -> PIMAGE_NT_HEADERS;
+}}
+pub const RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK: ULONG = 0x00000001;
+EXTERN!{extern "system" {
+    fn RtlImageNtHeaderEx(
+        Flags: ULONG,
+        BaseOfImage: PVOID,
+        Size: ULONG64,
+        OutHeaders: *mut PIMAGE_NT_HEADERS,
+    ) -> NTSTATUS;
+    fn RtlAddressInSectionTable(
+        NtHeaders: PIMAGE_NT_HEADERS,
+        BaseOfImage: PVOID,
+        VirtualAddress: ULONG,
+    ) -> PVOID;
+    fn RtlSectionTableFromVirtualAddress(
+        NtHeaders: PIMAGE_NT_HEADERS,
+        BaseOfImage: PVOID,
+        VirtualAddress: ULONG,
+    ) -> PIMAGE_SECTION_HEADER;
+    fn RtlImageDirectoryEntryToData(
+        BaseOfImage: PVOID,
+        MappedAsImage: BOOLEAN,
+        DirectoryEntry: USHORT,
+        Size: PULONG,
+    ) -> PVOID;
+    fn RtlImageRvaToSection(
+        NtHeaders: PIMAGE_NT_HEADERS,
+        BaseOfImage: PVOID,
+        Rva: ULONG,
+    ) -> PIMAGE_SECTION_HEADER;
+    fn RtlImageRvaToVa(
+        NtHeaders: PIMAGE_NT_HEADERS,
+        BaseOfImage: PVOID,
+        Rva: ULONG,
+        LastRvaSection: *mut PIMAGE_SECTION_HEADER,
+    ) -> PVOID;
+    fn RtlFindExportedRoutineByName(
+        BaseOfImage: PVOID,
+        RoutineName: PSTR,
+    ) -> PVOID;
+    fn RtlGuardCheckLongJumpTarget(
+        PcValue: PVOID,
+        IsFastFail: BOOL,
+        IsLongJumpTarget: PBOOL,
+    ) -> NTSTATUS;
+    fn RtlCompareMemoryUlong(
+        Source: PVOID,
+        Length: SIZE_T,
+        Pattern: ULONG,
+    ) -> SIZE_T;
+    fn RtlFillMemoryUlong(
+        Destination: PVOID,
+        Length: SIZE_T,
+        Pattern: ULONG,
+    );
+    fn RtlFillMemoryUlonglong(
+        Destination: PVOID,
+        Length: SIZE_T,
+        Pattern: ULONGLONG,
+    );
+    fn RtlCreateEnvironment(
+        CloneCurrentEnvironment: BOOLEAN,
+        Environment: *mut PVOID,
+    ) -> NTSTATUS;
+}}
+pub const RTL_CREATE_ENVIRONMENT_TRANSLATE: ULONG = 0x1;
+pub const RTL_CREATE_ENVIRONMENT_TRANSLATE_FROM_OEM: ULONG = 0x2;
+pub const RTL_CREATE_ENVIRONMENT_EMPTY: ULONG = 0x4;
+EXTERN!{extern "system" {
+    fn RtlCreateEnvironmentEx(
+        SourceEnv: PVOID,
+        Environment: *mut PVOID,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDestroyEnvironment(
+        Environment: PVOID,
+    ) -> NTSTATUS;
+    fn RtlSetCurrentEnvironment(
+        Environment: PVOID,
+        PreviousEnvironment: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlSetEnvironmentVar(
+        Environment: *mut PWSTR,
+        Name: PWSTR,
+        NameLength: SIZE_T,
+        Value: PWSTR,
+        ValueLength: SIZE_T,
+    ) -> NTSTATUS;
+    fn RtlSetEnvironmentVariable(
+        Environment: *mut PVOID,
+        Name: PUNICODE_STRING,
+        Value: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlQueryEnvironmentVariable(
+        Environment: PVOID,
+        Name: PWSTR,
+        NameLength: SIZE_T,
+        Value: PWSTR,
+        ValueLength: SIZE_T,
+        ReturnLength: PSIZE_T,
+    ) -> NTSTATUS;
+    fn RtlQueryEnvironmentVariable_U(
+        Environment: PVOID,
+        Name: PUNICODE_STRING,
+        Value: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlExpandEnvironmentStrings(
+        Environment: PVOID,
+        Src: PWSTR,
+        SrcLength: SIZE_T,
+        Dst: PWSTR,
+        DstLength: SIZE_T,
+        ReturnLength: PSIZE_T,
+    ) -> NTSTATUS;
+    fn RtlExpandEnvironmentStrings_U(
+        Environment: PVOID,
+        Source: PUNICODE_STRING,
+        Destination: PUNICODE_STRING,
+        ReturnedLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlSetEnvironmentStrings(
+        NewEnvironment: PWCHAR,
+        NewEnvironmentSize: SIZE_T,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct RTLP_CURDIR_REF {
+    ReferenceCount: LONG,
+    DirectoryHandle: HANDLE,
+}}
+pub type PRTLP_CURDIR_REF = *mut RTLP_CURDIR_REF;
+STRUCT!{struct RTL_RELATIVE_NAME_U {
+    RelativeName: UNICODE_STRING,
+    ContainingDirectory: HANDLE,
+    CurDirRef: PRTLP_CURDIR_REF,
+}}
+pub type PRTL_RELATIVE_NAME_U = *mut RTL_RELATIVE_NAME_U;
+ENUM!{enum RTL_PATH_TYPE {
+    RtlPathTypeUnknown = 0,
+    RtlPathTypeUncAbsolute = 1,
+    RtlPathTypeDriveAbsolute = 2,
+    RtlPathTypeDriveRelative = 3,
+    RtlPathTypeRooted = 4,
+    RtlPathTypeRelative = 5,
+    RtlPathTypeLocalDevice = 6,
+    RtlPathTypeRootLocalDevice = 7,
+}}
+EXTERN!{extern "C" {
+    static mut RtlDosPathSeperatorsString: UNICODE_STRING;
+    static mut RtlAlternateDosPathSeperatorString: UNICODE_STRING;
+    static mut RtlNtPathSeperatorString: UNICODE_STRING;
+}}
+/// "ntdll.dll"
+pub const RtlNtdllName: UTF16Const = UTF16Const(&[
+    0x006E, 0x0074, 0x0064, 0x006C, 0x006C, 0x002E, 0x0064, 0x006C, 0x006C, 0u16,
+]);
+EXTERN!{extern "system" {
+    fn RtlDetermineDosPathNameType_U(
+        DosFileName: PWSTR,
+    ) -> RTL_PATH_TYPE;
+    fn RtlDetermineDosPathNameType_Ustr(
+        DosFileName: PCUNICODE_STRING,
+    ) -> RTL_PATH_TYPE;
+    fn RtlIsDosDeviceName_U(
+        DosFileName: PWSTR,
+    ) -> ULONG;
+    fn RtlIsDosDeviceName_Ustr(
+        DosFileName: PUNICODE_STRING,
+    ) -> ULONG;
+    fn RtlGetFullPathName_U(
+        FileName: PWSTR,
+        BufferLength: ULONG,
+        Buffer: PWSTR,
+        FilePart: *mut PWSTR,
+    ) -> ULONG;
+    fn RtlGetFullPathName_UEx(
+        FileName: PWSTR,
+        BufferLength: ULONG,
+        Buffer: PWSTR,
+        FilePart: *mut PWSTR,
+        BytesRequired: *mut ULONG,
+    ) -> NTSTATUS;
+    fn RtlGetFullPathName_UstrEx(
+        FileName: PUNICODE_STRING,
+        StaticString: PUNICODE_STRING,
+        DynamicString: PUNICODE_STRING,
+        StringUsed: *mut PUNICODE_STRING,
+        FilePartPrefixCch: *mut SIZE_T,
+        NameInvalid: PBOOLEAN,
+        InputPathType: *mut RTL_PATH_TYPE,
+        BytesRequired: *mut SIZE_T,
+    ) -> NTSTATUS;
+    fn RtlGetCurrentDirectory_U(
+        BufferLength: ULONG,
+        Buffer: PWSTR,
+    ) -> ULONG;
+    fn RtlSetCurrentDirectory_U(
+        PathName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlGetLongestNtPathLength() -> ULONG;
+    fn RtlDosPathNameToNtPathName_U(
+        DosFileName: PWSTR,
+        NtFileName: PUNICODE_STRING,
+        FilePart: *mut PWSTR,
+        RelativeName: PRTL_RELATIVE_NAME_U,
+    ) -> BOOLEAN;
+    fn RtlDosPathNameToNtPathName_U_WithStatus(
+        DosFileName: PWSTR,
+        NtFileName: PUNICODE_STRING,
+        FilePart: *mut PWSTR,
+        RelativeName: PRTL_RELATIVE_NAME_U,
+    ) -> NTSTATUS;
+    fn RtlDosLongPathNameToNtPathName_U_WithStatus(
+        DosFileName: PWSTR,
+        NtFileName: PUNICODE_STRING,
+        FilePart: *mut PWSTR,
+        RelativeName: PRTL_RELATIVE_NAME_U,
+    ) -> NTSTATUS;
+    fn RtlDosPathNameToRelativeNtPathName_U(
+        DosFileName: PWSTR,
+        NtFileName: PUNICODE_STRING,
+        FilePart: *mut PWSTR,
+        RelativeName: PRTL_RELATIVE_NAME_U,
+    ) -> BOOLEAN;
+    fn RtlDosPathNameToRelativeNtPathName_U_WithStatus(
+        DosFileName: PWSTR,
+        NtFileName: PUNICODE_STRING,
+        FilePart: *mut PWSTR,
+        RelativeName: PRTL_RELATIVE_NAME_U,
+    ) -> NTSTATUS;
+    fn RtlDosLongPathNameToRelativeNtPathName_U_WithStatus(
+        DosFileName: PWSTR,
+        NtFileName: PUNICODE_STRING,
+        FilePart: *mut PWSTR,
+        RelativeName: PRTL_RELATIVE_NAME_U,
+    ) -> NTSTATUS;
+    fn RtlReleaseRelativeName(
+        RelativeName: PRTL_RELATIVE_NAME_U,
+    );
+    fn RtlDosSearchPath_U(
+        Path: PWSTR,
+        FileName: PWSTR,
+        Extension: PWSTR,
+        BufferLength: ULONG,
+        Buffer: PWSTR,
+        FilePart: *mut PWSTR,
+    ) -> ULONG;
+}}
+pub const RTL_DOS_SEARCH_PATH_FLAG_APPLY_ISOLATION_REDIRECTION: ULONG = 0x00000001;
+pub const RTL_DOS_SEARCH_PATH_FLAG_DISALLOW_DOT_RELATIVE_PATH_SEARCH: ULONG = 0x00000002;
+pub const RTL_DOS_SEARCH_PATH_FLAG_APPLY_DEFAULT_EXTENSION_WHEN_NOT_RELATIVE_PATH_EVEN_IF_FILE_HAS_EXTENSION: ULONG = 0x00000004;
+EXTERN!{extern "system" {
+    fn RtlDosSearchPath_Ustr(
+        Flags: ULONG,
+        Path: PUNICODE_STRING,
+        FileName: PUNICODE_STRING,
+        DefaultExtension: PUNICODE_STRING,
+        StaticString: PUNICODE_STRING,
+        DynamicString: PUNICODE_STRING,
+        FullFileNameOut: *mut PCUNICODE_STRING,
+        FilePartPrefixCch: *mut SIZE_T,
+        BytesRequired: *mut SIZE_T,
+    ) -> NTSTATUS;
+    fn RtlDoesFileExists_U(
+        FileName: PWSTR,
+    ) -> BOOLEAN;
+    fn RtlGetLengthWithoutLastFullDosOrNtPathElement(
+        Flags: ULONG,
+        PathString: PUNICODE_STRING,
+        Length: PULONG,
+    ) -> NTSTATUS;
+    fn RtlGetLengthWithoutTrailingPathSeperators(
+        Flags: ULONG,
+        PathString: PUNICODE_STRING,
+        Length: PULONG,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct GENERATE_NAME_CONTEXT {
+    Checksum: USHORT,
+    CheckSumInserted: BOOLEAN,
+    NameLength: UCHAR,
+    NameBuffer: [WCHAR; 8],
+    ExtensionLength: ULONG,
+    ExtensionBuffer: [WCHAR; 4],
+    LastIndexValue: ULONG,
+}}
+pub type PGENERATE_NAME_CONTEXT = *mut GENERATE_NAME_CONTEXT;
+EXTERN!{extern "system" {
+    fn RtlGenerate8dot3Name(
+        Name: PCUNICODE_STRING,
+        AllowExtendedCharacters: BOOLEAN,
+        Context: PGENERATE_NAME_CONTEXT,
+        Name8dot3: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlComputePrivatizedDllName_U(
+        DllName: PUNICODE_STRING,
+        RealName: PUNICODE_STRING,
+        LocalName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlGetSearchPath(
+        SearchPathA: *mut PWSTR,
+    ) -> BOOLEAN;
+    fn RtlSetSearchPathMode(
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlGetExePath() -> PWSTR;
+    fn RtlGetNtSystemRoot() -> PWSTR;
+    fn RtlAreLongPathsEnabled() -> BOOLEAN;
+    fn RtlIsThreadWithinLoaderCallout() -> BOOLEAN;
+    fn RtlDllShutdownInProgress() -> BOOLEAN;
+}}
+STRUCT!{struct RTL_HEAP_ENTRY_u_s1 {
+    Settable: SIZE_T,
+    Tag: ULONG,
+}}
+STRUCT!{struct RTL_HEAP_ENTRY_u_s2 {
+    CommittedSize: SIZE_T,
+    FirstBlock: PVOID,
+}}
+UNION!{union RTL_HEAP_ENTRY_u {
+    s1: RTL_HEAP_ENTRY_u_s1,
+    s2: RTL_HEAP_ENTRY_u_s2,
+}}
+STRUCT!{struct RTL_HEAP_ENTRY {
+    Size: SIZE_T,
+    Flags: USHORT,
+    AllocatorBackTraceIndex: USHORT,
+    u: RTL_HEAP_ENTRY_u,
+}}
+pub type PRTL_HEAP_ENTRY = *mut RTL_HEAP_ENTRY;
+pub const RTL_HEAP_BUSY: USHORT = 0x0001;
+pub const RTL_HEAP_SEGMENT: USHORT = 0x0002;
+pub const RTL_HEAP_SETTABLE_VALUE: USHORT = 0x0010;
+pub const RTL_HEAP_SETTABLE_FLAG1: USHORT = 0x0020;
+pub const RTL_HEAP_SETTABLE_FLAG2: USHORT = 0x0040;
+pub const RTL_HEAP_SETTABLE_FLAG3: USHORT = 0x0080;
+pub const RTL_HEAP_SETTABLE_FLAGS: USHORT = 0x00e0;
+pub const RTL_HEAP_UNCOMMITTED_RANGE: USHORT = 0x0100;
+pub const RTL_HEAP_PROTECTED_ENTRY: USHORT = 0x0200;
+STRUCT!{struct RTL_HEAP_TAG {
+    NumberOfAllocations: ULONG,
+    NumberOfFrees: ULONG,
+    BytesAllocated: SIZE_T,
+    TagIndex: USHORT,
+    CreatorBackTraceIndex: USHORT,
+    TagName: [WCHAR; 24],
+}}
+pub type PRTL_HEAP_TAG = *mut RTL_HEAP_TAG;
+STRUCT!{struct RTL_HEAP_INFORMATION {
+    BaseAddress: PVOID,
+    Flags: ULONG,
+    EntryOverhead: USHORT,
+    CreatorBackTraceIndex: USHORT,
+    BytesAllocated: SIZE_T,
+    BytesCommitted: SIZE_T,
+    NumberOfTags: ULONG,
+    NumberOfEntries: ULONG,
+    NumberOfPseudoTags: ULONG,
+    PseudoTagGranularity: ULONG,
+    Reserved: [ULONG; 5],
+    Tags: PRTL_HEAP_TAG,
+    Entries: PRTL_HEAP_ENTRY,
+}}
+pub type PRTL_HEAP_INFORMATION = *mut RTL_HEAP_INFORMATION;
+STRUCT!{struct RTL_PROCESS_HEAPS {
+    NumberOfHeaps: ULONG,
+    Heaps: [RTL_HEAP_INFORMATION; 1],
+}}
+pub type PRTL_PROCESS_HEAPS = *mut RTL_PROCESS_HEAPS;
+FN!{stdcall PRTL_HEAP_COMMIT_ROUTINE(
+    Base: PVOID,
+    CommitAddress: *mut PVOID,
+    CommitSize: PSIZE_T,
+) -> NTSTATUS}
+STRUCT!{struct RTL_HEAP_PARAMETERS {
+    Length: ULONG,
+    SegmentReserve: SIZE_T,
+    SegmentCommit: SIZE_T,
+    DeCommitFreeBlockThreshold: SIZE_T,
+    DeCommitTotalFreeThreshold: SIZE_T,
+    MaximumAllocationSize: SIZE_T,
+    VirtualMemoryThreshold: SIZE_T,
+    InitialCommit: SIZE_T,
+    InitialReserve: SIZE_T,
+    CommitRoutine: PRTL_HEAP_COMMIT_ROUTINE,
+    Reserved: [SIZE_T; 2],
+}}
+pub type PRTL_HEAP_PARAMETERS = *mut RTL_HEAP_PARAMETERS;
+pub const HEAP_SETTABLE_USER_VALUE: ULONG = 0x00000100;
+pub const HEAP_SETTABLE_USER_FLAG1: ULONG = 0x00000200;
+pub const HEAP_SETTABLE_USER_FLAG2: ULONG = 0x00000400;
+pub const HEAP_SETTABLE_USER_FLAG3: ULONG = 0x00000800;
+pub const HEAP_SETTABLE_USER_FLAGS: ULONG = 0x00000e00;
+pub const HEAP_CLASS_0: ULONG = 0x00000000;
+pub const HEAP_CLASS_1: ULONG = 0x00001000;
+pub const HEAP_CLASS_2: ULONG = 0x00002000;
+pub const HEAP_CLASS_3: ULONG = 0x00003000;
+pub const HEAP_CLASS_4: ULONG = 0x00004000;
+pub const HEAP_CLASS_5: ULONG = 0x00005000;
+pub const HEAP_CLASS_6: ULONG = 0x00006000;
+pub const HEAP_CLASS_7: ULONG = 0x00007000;
+pub const HEAP_CLASS_8: ULONG = 0x00008000;
+pub const HEAP_CLASS_MASK: ULONG = 0x0000f000;
+EXTERN!{extern "system" {
+    fn RtlCreateHeap(
+        Flags: ULONG,
+        HeapBase: PVOID,
+        ReserveSize: SIZE_T,
+        CommitSize: SIZE_T,
+        Lock: PVOID,
+        Parameters: PRTL_HEAP_PARAMETERS,
+    ) -> PVOID;
+    fn RtlDestroyHeap(
+        HeapHandle: PVOID,
+    ) -> PVOID;
+    fn RtlAllocateHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        Size: SIZE_T,
+    ) -> PVOID;
+    fn RtlFreeHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+    ) -> BOOLEAN;
+    fn RtlSizeHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+    ) -> SIZE_T;
+    fn RtlZeroHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlProtectHeap(
+        HeapHandle: PVOID,
+        MakeReadOnly: BOOLEAN,
+    );
+}}
+#[inline] #[cfg(all(feature = "nightly", not(target_arch = "aarch64")))]
+pub unsafe fn RtlProcessHeap() -> PVOID {
+    use crate::ntpsapi::NtCurrentPeb;
+    (*NtCurrentPeb()).ProcessHeap
+}
+EXTERN!{extern "system" {
+    fn RtlLockHeap(
+        HeapHandle: PVOID,
+    ) -> BOOLEAN;
+    fn RtlUnlockHeap(
+        HeapHandle: PVOID,
+    ) -> BOOLEAN;
+    fn RtlReAllocateHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+        Size: SIZE_T,
+    ) -> PVOID;
+    fn RtlGetUserInfoHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+        UserValue: *mut PVOID,
+        UserFlags: PULONG,
+    ) -> BOOLEAN;
+    fn RtlSetUserValueHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+        UserValue: PVOID,
+    ) -> BOOLEAN;
+    fn RtlSetUserFlagsHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+        UserFlagsReset: ULONG,
+        UserFlagsSet: ULONG,
+    ) -> BOOLEAN;
+}}
+STRUCT!{struct RTL_HEAP_TAG_INFO {
+    NumberOfAllocations: ULONG,
+    NumberOfFrees: ULONG,
+    BytesAllocated: SIZE_T,
+}}
+pub type PRTL_HEAP_TAG_INFO = *mut RTL_HEAP_TAG_INFO;
+EXTERN!{extern "system" {
+    fn RtlCreateTagHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        TagPrefix: PWSTR,
+        TagNames: PWSTR,
+    ) -> ULONG;
+    fn RtlQueryTagHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        TagIndex: USHORT,
+        ResetCounters: BOOLEAN,
+        TagInfo: PRTL_HEAP_TAG_INFO,
+    ) -> PWSTR;
+    fn RtlExtendHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        Base: PVOID,
+        Size: SIZE_T,
+    ) -> NTSTATUS;
+    fn RtlCompactHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+    ) -> SIZE_T;
+    fn RtlValidateHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+    ) -> BOOLEAN;
+    fn RtlValidateProcessHeaps() -> BOOLEAN;
+    fn RtlGetProcessHeaps(
+        NumberOfHeaps: ULONG,
+        ProcessHeaps: *mut PVOID,
+    ) -> ULONG;
+}}
+FN!{stdcall PRTL_ENUM_HEAPS_ROUTINE(
+    HeapHandle: PVOID,
+    Parameter: PVOID,
+) -> NTSTATUS}
+EXTERN!{extern "system" {
+    fn RtlEnumProcessHeaps(
+        EnumRoutine: PRTL_ENUM_HEAPS_ROUTINE,
+        Parameter: PVOID,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct RTL_HEAP_USAGE_ENTRY {
+    Next: *mut RTL_HEAP_USAGE_ENTRY,
+    Address: PVOID,
+    Size: SIZE_T,
+    AllocatorBackTraceIndex: USHORT,
+    TagIndex: USHORT,
+}}
+pub type PRTL_HEAP_USAGE_ENTRY = *mut RTL_HEAP_USAGE_ENTRY;
+STRUCT!{struct RTL_HEAP_USAGE {
+    Length: ULONG,
+    BytesAllocated: SIZE_T,
+    BytesCommitted: SIZE_T,
+    BytesReserved: SIZE_T,
+    BytesReservedMaximum: SIZE_T,
+    Entries: PRTL_HEAP_USAGE_ENTRY,
+    AddedEntries: PRTL_HEAP_USAGE_ENTRY,
+    RemovedEntries: PRTL_HEAP_USAGE_ENTRY,
+    Reserved: [ULONG_PTR; 8],
+}}
+pub type PRTL_HEAP_USAGE = *mut RTL_HEAP_USAGE;
+pub const HEAP_USAGE_ALLOCATED_BLOCKS: ULONG = HEAP_REALLOC_IN_PLACE_ONLY;
+pub const HEAP_USAGE_FREE_BUFFER: ULONG = HEAP_ZERO_MEMORY;
+EXTERN!{extern "system" {
+    fn RtlUsageHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        Usage: PRTL_HEAP_USAGE,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct RTL_HEAP_WALK_ENTRY_u_Block {
+    Settable: SIZE_T,
+    TagIndex: USHORT,
+    AllocatorBackTraceIndex: USHORT,
+    Reserved: [ULONG; 2],
+}}
+STRUCT!{struct RTL_HEAP_WALK_ENTRY_u_Segment {
+    CommittedSize: ULONG,
+    UnCommittedSize: ULONG,
+    FirstEntry: PVOID,
+    LastEntry: PVOID,
+}}
+UNION!{union RTL_HEAP_WALK_ENTRY_u {
+    Block: RTL_HEAP_WALK_ENTRY_u_Block,
+    Segment: RTL_HEAP_WALK_ENTRY_u_Segment,
+}}
+STRUCT!{struct RTL_HEAP_WALK_ENTRY {
+    DataAddress: PVOID,
+    DataSize: SIZE_T,
+    OverheadBytes: UCHAR,
+    SegmentIndex: UCHAR,
+    Flags: USHORT,
+    u: RTL_HEAP_WALK_ENTRY_u,
+}}
+pub type PRTL_HEAP_WALK_ENTRY = *mut RTL_HEAP_WALK_ENTRY;
+EXTERN!{extern "system" {
+    fn RtlWalkHeap(
+        HeapHandle: PVOID,
+        Entry: PRTL_HEAP_WALK_ENTRY,
+    ) -> NTSTATUS;
+}}
+pub const HeapDetailedFailureInformation: u32 = 0x80000001;
+pub const HeapSetDebuggingInformation: u32 = 0x80000002;
+ENUM!{enum HEAP_COMPATIBILITY_MODE {
+    HEAP_COMPATIBILITY_STANDARD = 0,
+    HEAP_COMPATIBILITY_LAL = 1,
+    HEAP_COMPATIBILITY_LFH = 2,
+}}
+STRUCT!{struct PROCESS_HEAP_INFORMATION {
+    ReserveSize: ULONG_PTR,
+    CommitSize: ULONG_PTR,
+    NumberOfHeaps: ULONG,
+    FirstHeapInformationOffset: ULONG_PTR,
+}}
+pub type PPROCESS_HEAP_INFORMATION = *mut PROCESS_HEAP_INFORMATION;
+STRUCT!{struct HEAP_INFORMATION {
+    Address: ULONG_PTR,
+    Mode: ULONG,
+    ReserveSize: ULONG_PTR,
+    CommitSize: ULONG_PTR,
+    FirstRegionInformationOffset: ULONG_PTR,
+    NextHeapInformationOffset: ULONG_PTR,
+}}
+pub type PHEAP_INFORMATION = *mut HEAP_INFORMATION;
+UNION!{union HEAP_EXTENDED_INFORMATION_u {
+    ProcessHeapInformation: PROCESS_HEAP_INFORMATION,
+    HeapInformation: HEAP_INFORMATION,
+}}
+STRUCT!{struct HEAP_EXTENDED_INFORMATION {
+    Process: HANDLE,
+    Heap: ULONG_PTR,
+    Level: ULONG,
+    CallbackRoutine: PVOID,
+    CallbackContext: PVOID,
+    u: HEAP_EXTENDED_INFORMATION_u,
+}}
+pub type PHEAP_EXTENDED_INFORMATION = *mut HEAP_EXTENDED_INFORMATION;
+FN!{stdcall PRTL_HEAP_LEAK_ENUMERATION_ROUTINE(
+    Reserved: LONG,
+    HeapHandle: PVOID,
+    BaseAddress: PVOID,
+    BlockSize: SIZE_T,
+    StackTraceDepth: ULONG,
+    StackTrace: *mut PVOID,
+) -> NTSTATUS}
+STRUCT!{struct HEAP_DEBUGGING_INFORMATION {
+    InterceptorFunction: PVOID,
+    InterceptorValue: USHORT,
+    ExtendedOptions: ULONG,
+    StackTraceDepth: ULONG,
+    MinTotalBlockSize: SIZE_T,
+    MaxTotalBlockSize: SIZE_T,
+    HeapLeakEnumerationRoutine: PRTL_HEAP_LEAK_ENUMERATION_ROUTINE,
+}}
+pub type PHEAP_DEBUGGING_INFORMATION = *mut HEAP_DEBUGGING_INFORMATION;
+EXTERN!{extern "system" {
+    fn RtlQueryHeapInformation(
+        HeapHandle: PVOID,
+        HeapInformationClass: HEAP_INFORMATION_CLASS,
+        HeapInformation: PVOID,
+        HeapInformationLength: SIZE_T,
+        ReturnLength: PSIZE_T,
+    ) -> NTSTATUS;
+    fn RtlSetHeapInformation(
+        HeapHandle: PVOID,
+        HeapInformationClass: HEAP_INFORMATION_CLASS,
+        HeapInformation: PVOID,
+        HeapInformationLength: SIZE_T,
+    ) -> NTSTATUS;
+    fn RtlMultipleAllocateHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        Size: SIZE_T,
+        Count: ULONG,
+        Array: *mut PVOID,
+    ) -> ULONG;
+    fn RtlMultipleFreeHeap(
+        HeapHandle: PVOID,
+        Flags: ULONG,
+        Count: ULONG,
+        Array: *mut PVOID,
+    ) -> ULONG;
+    fn RtlDetectHeapLeaks();
+    fn RtlFlushHeaps();
+}}
+STRUCT!{struct RTL_MEMORY_ZONE_SEGMENT {
+    NextSegment: *mut RTL_MEMORY_ZONE_SEGMENT,
+    Size: SIZE_T,
+    Next: PVOID,
+    Limit: PVOID,
+}}
+pub type PRTL_MEMORY_ZONE_SEGMENT = *mut RTL_MEMORY_ZONE_SEGMENT;
+STRUCT!{struct RTL_MEMORY_ZONE {
+    Segment: RTL_MEMORY_ZONE_SEGMENT,
+    Lock: RTL_SRWLOCK,
+    LockCount: ULONG,
+    FirstSegment: PRTL_MEMORY_ZONE_SEGMENT,
+}}
+pub type PRTL_MEMORY_ZONE = *mut RTL_MEMORY_ZONE;
+EXTERN!{extern "system" {
+    fn RtlCreateMemoryZone(
+        MemoryZone: *mut PVOID,
+        InitialSize: SIZE_T,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDestroyMemoryZone(
+        MemoryZone: PVOID,
+    ) -> NTSTATUS;
+    fn RtlAllocateMemoryZone(
+        MemoryZone: PVOID,
+        BlockSize: SIZE_T,
+        Block: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlResetMemoryZone(
+        MemoryZone: PVOID,
+    ) -> NTSTATUS;
+    fn RtlLockMemoryZone(
+        MemoryZone: PVOID,
+    ) -> NTSTATUS;
+    fn RtlUnlockMemoryZone(
+        MemoryZone: PVOID,
+    ) -> NTSTATUS;
+    fn RtlCreateMemoryBlockLookaside(
+        MemoryBlockLookaside: *mut PVOID,
+        Flags: ULONG,
+        InitialSize: ULONG,
+        MinimumBlockSize: ULONG,
+        MaximumBlockSize: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDestroyMemoryBlockLookaside(
+        MemoryBlockLookaside: PVOID,
+    ) -> NTSTATUS;
+    fn RtlAllocateMemoryBlockLookaside(
+        MemoryBlockLookaside: PVOID,
+        BlockSize: ULONG,
+        Block: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlFreeMemoryBlockLookaside(
+        MemoryBlockLookaside: PVOID,
+        Block: PVOID,
+    ) -> NTSTATUS;
+    fn RtlExtendMemoryBlockLookaside(
+        MemoryBlockLookaside: PVOID,
+        Increment: ULONG,
+    ) -> NTSTATUS;
+    fn RtlResetMemoryBlockLookaside(
+        MemoryBlockLookaside: PVOID,
+    ) -> NTSTATUS;
+    fn RtlLockMemoryBlockLookaside(
+        MemoryBlockLookaside: PVOID,
+    ) -> NTSTATUS;
+    fn RtlUnlockMemoryBlockLookaside(
+        MemoryBlockLookaside: PVOID,
+    ) -> NTSTATUS;
+    fn RtlGetCurrentTransaction() -> HANDLE;
+    fn RtlSetCurrentTransaction(
+        TransactionHandle: HANDLE,
+    ) -> LOGICAL;
+}}
+#[inline]
+pub const fn RtlIsEqualLuid(L1: &LUID, L2: &LUID) -> bool {
+    ((L1.LowPart == L2.LowPart) & (L1.HighPart == L2.HighPart)) as u8 != 0 //fixme
+}
+#[inline]
+pub const fn RtlIsZeroLuid(L1: &LUID) -> bool {
+    (L1.LowPart | L1.HighPart as u32) == 0
+}
+#[inline]
+pub const fn RtlConvertLongToLuid(Long: LONG) -> LUID {
+    LUID { LowPart: Long as u32, HighPart: ((Long as i64) >> 32) as i32 }
+}
+#[inline]
+pub const fn RtlConvertUlongToLuid(Ulong: ULONG) -> LUID {
+    LUID { LowPart: Ulong, HighPart: 0 }
+}
+EXTERN!{extern "system" {
+    fn RtlCopyLuid(
+        DestinationLuid: PLUID,
+        SourceLuid: PLUID,
+    );
+    fn RtlCopyLuidAndAttributesArray(
+        Count: ULONG,
+        Src: PLUID_AND_ATTRIBUTES,
+        Dest: PLUID_AND_ATTRIBUTES,
+    );
+}}
+STRUCT!{struct RTL_PROCESS_VERIFIER_OPTIONS {
+    SizeStruct: ULONG,
+    Option: ULONG,
+    OptionData: [UCHAR; 1],
+}}
+pub type PRTL_PROCESS_VERIFIER_OPTIONS = *mut RTL_PROCESS_VERIFIER_OPTIONS;
+UNION!{union RTL_DEBUG_INFORMATION_u {
+    Modules: *mut RTL_PROCESS_MODULES,
+    ModulesEx: *mut RTL_PROCESS_MODULE_INFORMATION_EX,
+}}
+STRUCT!{struct RTL_DEBUG_INFORMATION {
+    SectionHandleClient: HANDLE,
+    ViewBaseClient: PVOID,
+    ViewBaseTarget: PVOID,
+    ViewBaseDelta: ULONG_PTR,
+    EventPairClient: HANDLE,
+    EventPairTarget: HANDLE,
+    TargetProcessId: HANDLE,
+    TargetThreadHandle: HANDLE,
+    Flags: ULONG,
+    OffsetFree: SIZE_T,
+    CommitSize: SIZE_T,
+    ViewSize: SIZE_T,
+    u: RTL_DEBUG_INFORMATION_u,
+    BackTraces: *mut RTL_PROCESS_BACKTRACES,
+    Heaps: *mut RTL_PROCESS_HEAPS,
+    Locks: *mut RTL_PROCESS_LOCKS,
+    SpecificHeap: PVOID,
+    TargetProcessHandle: HANDLE,
+    VerifierOptions: PRTL_PROCESS_VERIFIER_OPTIONS,
+    ProcessHeap: PVOID,
+    CriticalSectionHandle: HANDLE,
+    CriticalSectionOwnerThread: HANDLE,
+    Reserved: [PVOID; 4],
+}}
+pub type PRTL_DEBUG_INFORMATION = *mut RTL_DEBUG_INFORMATION;
+EXTERN!{extern "system" {
+    fn RtlCreateQueryDebugBuffer(
+        MaximumCommit: ULONG,
+        UseEventPair: BOOLEAN,
+    ) -> PRTL_DEBUG_INFORMATION;
+    fn RtlDestroyQueryDebugBuffer(
+        Buffer: PRTL_DEBUG_INFORMATION,
+    ) -> NTSTATUS;
+    fn RtlCommitDebugInfo(
+        Buffer: PRTL_DEBUG_INFORMATION,
+        Size: SIZE_T,
+    ) -> PVOID;
+    fn RtlDeCommitDebugInfo(
+        Buffer: PRTL_DEBUG_INFORMATION,
+        p: PVOID,
+        Size: SIZE_T,
+    );
+}}
+pub const RTL_QUERY_PROCESS_MODULES: ULONG = 0x00000001;
+pub const RTL_QUERY_PROCESS_BACKTRACES: ULONG = 0x00000002;
+pub const RTL_QUERY_PROCESS_HEAP_SUMMARY: ULONG = 0x00000004;
+pub const RTL_QUERY_PROCESS_HEAP_TAGS: ULONG = 0x00000008;
+pub const RTL_QUERY_PROCESS_HEAP_ENTRIES: ULONG = 0x00000010;
+pub const RTL_QUERY_PROCESS_LOCKS: ULONG = 0x00000020;
+pub const RTL_QUERY_PROCESS_MODULES32: ULONG = 0x00000040;
+pub const RTL_QUERY_PROCESS_VERIFIER_OPTIONS: ULONG = 0x00000080;
+pub const RTL_QUERY_PROCESS_MODULESEX: ULONG = 0x00000100;
+pub const RTL_QUERY_PROCESS_HEAP_ENTRIES_EX: ULONG = 0x00000200;
+pub const RTL_QUERY_PROCESS_CS_OWNER: ULONG = 0x00000400;
+pub const RTL_QUERY_PROCESS_NONINVASIVE: ULONG = 0x80000000;
+EXTERN!{extern "system" {
+    fn RtlQueryProcessDebugInformation(
+        UniqueProcessId: HANDLE,
+        Flags: ULONG,
+        Buffer: PRTL_DEBUG_INFORMATION,
+    ) -> NTSTATUS;
+    fn RtlFindMessage(
+        DllHandle: PVOID,
+        MessageTableId: ULONG,
+        MessageLanguageId: ULONG,
+        MessageId: ULONG,
+        MessageEntry: *mut PMESSAGE_RESOURCE_ENTRY,
+    ) -> NTSTATUS;
+    fn RtlFormatMessage(
+        MessageFormat: PWSTR,
+        MaximumWidth: ULONG,
+        IgnoreInserts: BOOLEAN,
+        ArgumentsAreAnsi: BOOLEAN,
+        ArgumentsAreAnArray: BOOLEAN,
+        Arguments: *mut va_list,
+        Buffer: PWSTR,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct PARSE_MESSAGE_CONTEXT {
+    fFlags: ULONG,
+    cwSavColumn: ULONG,
+    iwSrc: SIZE_T,
+    iwDst: SIZE_T,
+    iwDstSpace: SIZE_T,
+    lpvArgStart: va_list,
+}}
+pub type PPARSE_MESSAGE_CONTEXT = *mut PARSE_MESSAGE_CONTEXT;
+#[inline]
+pub fn INIT_PARSE_MESSAGE_CONTEXT(ctx: &mut PARSE_MESSAGE_CONTEXT) {
+    ctx.fFlags = 0;
+}
+#[inline]
+pub fn TEST_PARSE_MESSAGE_CONTEXT_FLAG(ctx: &mut PARSE_MESSAGE_CONTEXT, flag: ULONG) -> ULONG {
+    ctx.fFlags & flag
+}
+#[inline]
+pub fn SET_PARSE_MESSAGE_CONTEXT_FLAG(ctx: &mut PARSE_MESSAGE_CONTEXT, flag: ULONG) -> ULONG {
+    ctx.fFlags |= flag;
+    ctx.fFlags
+}
+#[inline]
+pub fn CLEAR_PARSE_MESSAGE_CONTEXT_FLAG(ctx: &mut PARSE_MESSAGE_CONTEXT, flag: ULONG) -> ULONG {
+    ctx.fFlags &= !flag;
+    ctx.fFlags
+}
+EXTERN!{extern "system" {
+    fn RtlFormatMessageEx(
+        MessageFormat: PWSTR,
+        MaximumWidth: ULONG,
+        IgnoreInserts: BOOLEAN,
+        ArgumentsAreAnsi: BOOLEAN,
+        ArgumentsAreAnArray: BOOLEAN,
+        Arguments: *mut va_list,
+        Buffer: PWSTR,
+        Length: ULONG,
+        ReturnLength: PULONG,
+        ParseContext: PPARSE_MESSAGE_CONTEXT,
+    ) -> NTSTATUS;
+    fn RtlNtStatusToDosError(
+        Status: NTSTATUS,
+    ) -> ULONG;
+    fn RtlNtStatusToDosErrorNoTeb(
+        Status: NTSTATUS,
+    ) -> ULONG;
+    fn RtlGetLastNtStatus() -> NTSTATUS;
+    fn RtlGetLastWin32Error() -> LONG;
+    fn RtlSetLastWin32ErrorAndNtStatusFromNtStatus(
+        Status: NTSTATUS,
+    );
+    fn RtlSetLastWin32Error(
+        Win32Error: LONG,
+    );
+    fn RtlRestoreLastWin32Error(
+        Win32Error: LONG,
+    );
+}}
+pub const RTL_ERRORMODE_FAILCRITICALERRORS: ULONG = 0x0010;
+pub const RTL_ERRORMODE_NOGPFAULTERRORBOX: ULONG = 0x0020;
+pub const RTL_ERRORMODE_NOOPENFILEERRORBOX: ULONG = 0x0040;
+EXTERN!{extern "system" {
+    fn RtlGetThreadErrorMode() -> ULONG;
+    fn RtlSetThreadErrorMode(
+        NewMode: ULONG,
+        OldMode: PULONG,
+    ) -> NTSTATUS;
+    fn RtlReportException(
+        ExceptionRecord: PEXCEPTION_RECORD,
+        ContextRecord: PCONTEXT,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlReportExceptionEx(
+        ExceptionRecord: PEXCEPTION_RECORD,
+        ContextRecord: PCONTEXT,
+        Flags: ULONG,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn RtlWerpReportException(
+        ProcessId: ULONG,
+        CrashReportSharedMem: HANDLE,
+        Flags: ULONG,
+        CrashVerticalProcessHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn RtlReportSilentProcessExit(
+        ProcessHandle: HANDLE,
+        ExitStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn RtlUniform(
+        Seed: PULONG,
+    ) -> ULONG;
+    fn RtlRandom(
+        Seed: PULONG,
+    ) -> ULONG;
+    fn RtlRandomEx(
+        Seed: PULONG,
+    ) -> ULONG;
+    fn RtlComputeImportTableHash(
+        FileHandle: HANDLE,
+        Hash: PCHAR,
+        ImportTableHashRevision: ULONG,
+    ) -> NTSTATUS;
+    fn RtlIntegerToChar(
+        Value: ULONG,
+        Base: ULONG,
+        OutputLength: LONG,
+        String: PSTR,
+    ) -> NTSTATUS;
+    fn RtlCharToInteger(
+        String: PCSZ,
+        Base: ULONG,
+        Value: PULONG,
+    ) -> NTSTATUS;
+    fn RtlLargeIntegerToChar(
+        Value: PLARGE_INTEGER,
+        Base: ULONG,
+        OutputLength: LONG,
+        String: PSTR,
+    ) -> NTSTATUS;
+    fn RtlIntegerToUnicodeString(
+        Value: ULONG,
+        Base: ULONG,
+        String: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlInt64ToUnicodeString(
+        Value: ULONGLONG,
+        Base: ULONG,
+        String: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlUnicodeStringToInteger(
+        String: PCUNICODE_STRING,
+        Base: ULONG,
+        Value: PULONG,
+    ) -> NTSTATUS;
+    fn RtlIpv4AddressToStringExW(
+        Address: *const in_addr,
+        Port: USHORT,
+        AddressString: PWSTR,
+        AddressStringLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlIpv6AddressToStringExW(
+        Address: *const in6_addr,
+        ScopeId: ULONG,
+        Port: USHORT,
+        AddressString: PWSTR,
+        AddressStringLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlIpv4StringToAddressExW(
+        AddressString: PCWSTR,
+        Strict: BOOLEAN,
+        Address: *mut in_addr,
+        Port: PUSHORT,
+    ) -> NTSTATUS;
+    fn RtlIpv6StringToAddressExW(
+        AddressString: PCWSTR,
+        Address: *mut in6_addr,
+        ScopeId: PULONG,
+        Port: PUSHORT,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct TIME_FIELDS {
+    Year: CSHORT,
+    Month: CSHORT,
+    Day: CSHORT,
+    Hour: CSHORT,
+    Minute: CSHORT,
+    Second: CSHORT,
+    Milliseconds: CSHORT,
+    Weekday: CSHORT,
+}}
+pub type PTIME_FIELDS = *mut TIME_FIELDS;
+EXTERN!{extern "system" {
+    fn RtlCutoverTimeToSystemTime(
+        CutoverTime: PTIME_FIELDS,
+        SystemTime: PLARGE_INTEGER,
+        CurrentSystemTime: PLARGE_INTEGER,
+        ThisYear: BOOLEAN,
+    ) -> BOOLEAN;
+    fn RtlSystemTimeToLocalTime(
+        SystemTime: PLARGE_INTEGER,
+        LocalTime: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn RtlLocalTimeToSystemTime(
+        LocalTime: PLARGE_INTEGER,
+        SystemTime: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn RtlTimeToElapsedTimeFields(
+        Time: PLARGE_INTEGER,
+        TimeFields: PTIME_FIELDS,
+    );
+    fn RtlTimeToTimeFields(
+        Time: PLARGE_INTEGER,
+        TimeFields: PTIME_FIELDS,
+    );
+    fn RtlTimeFieldsToTime(
+        TimeFields: PTIME_FIELDS,
+        Time: PLARGE_INTEGER,
+    ) -> BOOLEAN;
+    fn RtlTimeToSecondsSince1980(
+        Time: PLARGE_INTEGER,
+        ElapsedSeconds: PULONG,
+    ) -> BOOLEAN;
+    fn RtlSecondsSince1980ToTime(
+        ElapsedSeconds: ULONG,
+        Time: PLARGE_INTEGER,
+    );
+    fn RtlTimeToSecondsSince1970(
+        Time: PLARGE_INTEGER,
+        ElapsedSeconds: PULONG,
+    ) -> BOOLEAN;
+    fn RtlSecondsSince1970ToTime(
+        ElapsedSeconds: ULONG,
+        Time: PLARGE_INTEGER,
+    );
+}}
+STRUCT!{struct RTL_TIME_ZONE_INFORMATION {
+    Bias: LONG,
+    StandardName: [WCHAR; 32],
+    StandardStart: TIME_FIELDS,
+    StandardBias: LONG,
+    DaylightName: [WCHAR; 32],
+    DaylightStart: TIME_FIELDS,
+    DaylightBias: LONG,
+}}
+pub type PRTL_TIME_ZONE_INFORMATION = *mut RTL_TIME_ZONE_INFORMATION;
+EXTERN!{extern "system" {
+    fn RtlQueryTimeZoneInformation(
+        TimeZoneInformation: PRTL_TIME_ZONE_INFORMATION,
+    ) -> NTSTATUS;
+    fn RtlSetTimeZoneInformation(
+        TimeZoneInformation: PRTL_TIME_ZONE_INFORMATION,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct RTL_BITMAP {
+    SizeOfBitMap: ULONG,
+    Buffer: PULONG,
+}}
+pub type PRTL_BITMAP = *mut RTL_BITMAP;
+EXTERN!{extern "system" {
+    fn RtlInitializeBitMap(
+        BitMapHeader: PRTL_BITMAP,
+        BitMapBuffer: PULONG,
+        SizeOfBitMap: ULONG,
+    );
+    fn RtlClearBit(
+        BitMapHeader: PRTL_BITMAP,
+        BitNumber: ULONG,
+    );
+    fn RtlSetBit(
+        BitMapHeader: PRTL_BITMAP,
+        BitNumber: ULONG,
+    );
+    fn RtlTestBit(
+        BitMapHeader: PRTL_BITMAP,
+        BitNumber: ULONG,
+    ) -> BOOLEAN;
+    fn RtlClearAllBits(
+        BitMapHeader: PRTL_BITMAP,
+    );
+    fn RtlSetAllBits(
+        BitMapHeader: PRTL_BITMAP,
+    );
+    fn RtlFindClearBits(
+        BitMapHeader: PRTL_BITMAP,
+        NumberToFind: ULONG,
+        HintIndex: ULONG,
+    ) -> ULONG;
+    fn RtlFindSetBits(
+        BitMapHeader: PRTL_BITMAP,
+        NumberToFind: ULONG,
+        HintIndex: ULONG,
+    ) -> ULONG;
+    fn RtlFindClearBitsAndSet(
+        BitMapHeader: PRTL_BITMAP,
+        NumberToFind: ULONG,
+        HintIndex: ULONG,
+    ) -> ULONG;
+    fn RtlFindSetBitsAndClear(
+        BitMapHeader: PRTL_BITMAP,
+        NumberToFind: ULONG,
+        HintIndex: ULONG,
+    ) -> ULONG;
+    fn RtlClearBits(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: ULONG,
+        NumberToClear: ULONG,
+    );
+    fn RtlSetBits(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: ULONG,
+        NumberToSet: ULONG,
+    );
+    fn RtlFindMostSignificantBit(
+        Set: ULONGLONG,
+    ) -> CCHAR;
+    fn RtlFindLeastSignificantBit(
+        Set: ULONGLONG,
+    ) -> CCHAR;
+}}
+STRUCT!{struct RTL_BITMAP_RUN {
+    StartingIndex: ULONG,
+    NumberOfBits: ULONG,
+}}
+pub type PRTL_BITMAP_RUN = *mut RTL_BITMAP_RUN;
+EXTERN!{extern "system" {
+    fn RtlFindClearRuns(
+        BitMapHeader: PRTL_BITMAP,
+        RunArray: PRTL_BITMAP_RUN,
+        SizeOfRunArray: ULONG,
+        LocateLongestRuns: BOOLEAN,
+    ) -> ULONG;
+    fn RtlFindLongestRunClear(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: PULONG,
+    ) -> ULONG;
+    fn RtlFindFirstRunClear(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: PULONG,
+    ) -> ULONG;
+}}
+#[inline]
+pub unsafe fn RtlCheckBit(BitMapHeader: &RTL_BITMAP, BitPosition: ULONG) -> u8 {
+    #[cfg(all(target_arch = "x86_64", feature = "nightly"))] {
+        use crate::winapi_local::um::winnt::_bittest64;
+        _bittest64(BitMapHeader.Buffer as *const i64, BitPosition as i64)
+    }
+    #[cfg(any(
+        target_arch = "x86",
+        all(target_arch = "x86_64", not(feature = "nightly")),
+        target_arch = "aarch64",
+    ))] {
+        (*BitMapHeader.Buffer.offset(BitPosition as isize / 32) >> (BitPosition % 32) & 1) as u8
+    }
+}
+EXTERN!{extern "system" {
+    fn RtlNumberOfClearBits(
+        BitMapHeader: PRTL_BITMAP,
+    ) -> ULONG;
+    fn RtlNumberOfSetBits(
+        BitMapHeader: PRTL_BITMAP,
+    ) -> ULONG;
+    fn RtlAreBitsClear(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: ULONG,
+        Length: ULONG,
+    ) -> BOOLEAN;
+    fn RtlAreBitsSet(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: ULONG,
+        Length: ULONG,
+    ) -> BOOLEAN;
+    fn RtlFindNextForwardRunClear(
+        BitMapHeader: PRTL_BITMAP,
+        FromIndex: ULONG,
+        StartingRunIndex: PULONG,
+    ) -> ULONG;
+    fn RtlFindLastBackwardRunClear(
+        BitMapHeader: PRTL_BITMAP,
+        FromIndex: ULONG,
+        StartingRunIndex: PULONG,
+    ) -> ULONG;
+    fn RtlNumberOfSetBitsUlongPtr(
+        Target: ULONG_PTR,
+    ) -> ULONG;
+    fn RtlInterlockedClearBitRun(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: ULONG,
+        NumberToClear: ULONG,
+    );
+    fn RtlInterlockedSetBitRun(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: ULONG,
+        NumberToSet: ULONG,
+    );
+    fn RtlCopyBitMap(
+        Source: PRTL_BITMAP,
+        Destination: PRTL_BITMAP,
+        TargetBit: ULONG,
+    );
+    fn RtlExtractBitMap(
+        Source: PRTL_BITMAP,
+        Destination: PRTL_BITMAP,
+        TargetBit: ULONG,
+        NumberOfBits: ULONG,
+    );
+    fn RtlNumberOfClearBitsInRange(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: ULONG,
+        Length: ULONG,
+    ) -> ULONG;
+    fn RtlNumberOfSetBitsInRange(
+        BitMapHeader: PRTL_BITMAP,
+        StartingIndex: ULONG,
+        Length: ULONG,
+    ) -> ULONG;
+}}
+STRUCT!{struct RTL_BITMAP_EX {
+    SizeOfBitMap: ULONG64,
+    Buffer: PULONG64,
+}}
+pub type PRTL_BITMAP_EX = *mut RTL_BITMAP_EX;
+EXTERN!{extern "system" {
+    fn RtlInitializeBitMapEx(
+        BitMapHeader: PRTL_BITMAP_EX,
+        BitMapBuffer: PULONG64,
+        SizeOfBitMap: ULONG64,
+    );
+    fn RtlTestBitEx(
+        BitMapHeader: PRTL_BITMAP_EX,
+        BitNumber: ULONG64,
+    ) -> BOOLEAN;
+    fn RtlClearAllBitsEx(
+        BitMapHeader: PRTL_BITMAP_EX,
+    );
+    fn RtlClearBitEx(
+        BitMapHeader: PRTL_BITMAP_EX,
+        BitNumber: ULONG64,
+    );
+    fn RtlSetBitEx(
+        BitMapHeader: PRTL_BITMAP_EX,
+        BitNumber: ULONG64,
+    );
+    fn RtlFindSetBitsEx(
+        BitMapHeader: PRTL_BITMAP_EX,
+        NumberToFind: ULONG64,
+        HintIndex: ULONG64,
+    ) -> ULONG64;
+    fn RtlFindSetBitsAndClearEx(
+        BitMapHeader: PRTL_BITMAP_EX,
+        NumberToFind: ULONG64,
+        HintIndex: ULONG64,
+    ) -> ULONG64;
+}}
+UNION!{union RTL_HANDLE_TABLE_ENTRY {
+    Flags: ULONG,
+    NextFree: *mut RTL_HANDLE_TABLE_ENTRY,
+}}
+pub type PRTL_HANDLE_TABLE_ENTRY = *mut RTL_HANDLE_TABLE_ENTRY;
+pub const RTL_HANDLE_ALLOCATED: USHORT = 0x0001;
+STRUCT!{struct RTL_HANDLE_TABLE {
+    MaximumNumberOfHandles: ULONG,
+    SizeOfHandleTableEntry: ULONG,
+    Reserved: [ULONG; 2],
+    FreeHandles: PRTL_HANDLE_TABLE_ENTRY,
+    CommittedHandles: PRTL_HANDLE_TABLE_ENTRY,
+    UnCommittedHandles: PRTL_HANDLE_TABLE_ENTRY,
+    MaxReservedHandles: PRTL_HANDLE_TABLE_ENTRY,
+}}
+pub type PRTL_HANDLE_TABLE = *mut RTL_HANDLE_TABLE;
+EXTERN!{extern "system" {
+    fn RtlInitializeHandleTable(
+        MaximumNumberOfHandles: ULONG,
+        SizeOfHandleTableEntry: ULONG,
+        HandleTable: PRTL_HANDLE_TABLE,
+    );
+    fn RtlDestroyHandleTable(
+        HandleTable: PRTL_HANDLE_TABLE,
+    ) -> NTSTATUS;
+    fn RtlAllocateHandle(
+        HandleTable: PRTL_HANDLE_TABLE,
+        HandleIndex: PULONG,
+    ) -> PRTL_HANDLE_TABLE_ENTRY;
+    fn RtlFreeHandle(
+        HandleTable: PRTL_HANDLE_TABLE,
+        Handle: PRTL_HANDLE_TABLE_ENTRY,
+    ) -> BOOLEAN;
+    fn RtlIsValidHandle(
+        HandleTable: PRTL_HANDLE_TABLE,
+        Handle: PRTL_HANDLE_TABLE_ENTRY,
+    ) -> BOOLEAN;
+    fn RtlIsValidIndexHandle(
+        HandleTable: PRTL_HANDLE_TABLE,
+        HandleIndex: ULONG,
+        Handle: *mut PRTL_HANDLE_TABLE_ENTRY,
+    ) -> BOOLEAN;
+}}
+pub const RTL_ATOM_MAXIMUM_INTEGER_ATOM: RTL_ATOM = 0xc000;
+pub const RTL_ATOM_INVALID_ATOM: RTL_ATOM = 0x0000;
+pub const RTL_ATOM_TABLE_DEFAULT_NUMBER_OF_BUCKETS: u32 = 37;
+pub const RTL_ATOM_MAXIMUM_NAME_LENGTH: u32 = 255;
+pub const RTL_ATOM_PINNED: u32 = 0x01;
+EXTERN!{extern "system" {
+    fn RtlCreateAtomTable(
+        NumberOfBuckets: ULONG,
+        AtomTableHandle: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlDestroyAtomTable(
+        AtomTableHandle: PVOID,
+    ) -> NTSTATUS;
+    fn RtlEmptyAtomTable(
+        AtomTableHandle: PVOID,
+        IncludePinnedAtoms: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlAddAtomToAtomTable(
+        AtomTableHandle: PVOID,
+        AtomName: PWSTR,
+        Atom: PRTL_ATOM,
+    ) -> NTSTATUS;
+    fn RtlLookupAtomInAtomTable(
+        AtomTableHandle: PVOID,
+        AtomName: PWSTR,
+        Atom: PRTL_ATOM,
+    ) -> NTSTATUS;
+    fn RtlDeleteAtomFromAtomTable(
+        AtomTableHandle: PVOID,
+        Atom: RTL_ATOM,
+    ) -> NTSTATUS;
+    fn RtlPinAtomInAtomTable(
+        AtomTableHandle: PVOID,
+        Atom: RTL_ATOM,
+    ) -> NTSTATUS;
+    fn RtlQueryAtomInAtomTable(
+        AtomTableHandle: PVOID,
+        Atom: RTL_ATOM,
+        AtomUsage: PULONG,
+        AtomFlags: PULONG,
+        AtomName: PWSTR,
+        AtomNameLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlGetIntegerAtom(
+        AtomName: PWSTR,
+        IntegerAtom: PUSHORT,
+    ) -> BOOLEAN;
+    fn RtlValidSid(
+        Sid: PSID,
+    ) -> BOOLEAN;
+    fn RtlEqualSid(
+        Sid1: PSID,
+        Sid2: PSID,
+    ) -> BOOLEAN;
+    fn RtlEqualPrefixSid(
+        Sid1: PSID,
+        Sid2: PSID,
+    ) -> BOOLEAN;
+    fn RtlLengthRequiredSid(
+        SubAuthorityCount: ULONG,
+    ) -> ULONG;
+    fn RtlFreeSid(
+        Sid: PSID,
+    ) -> PVOID;
+    fn RtlAllocateAndInitializeSid(
+        IdentifierAuthority: PSID_IDENTIFIER_AUTHORITY,
+        SubAuthorityCount: UCHAR,
+        SubAuthority0: ULONG,
+        SubAuthority1: ULONG,
+        SubAuthority2: ULONG,
+        SubAuthority3: ULONG,
+        SubAuthority4: ULONG,
+        SubAuthority5: ULONG,
+        SubAuthority6: ULONG,
+        SubAuthority7: ULONG,
+        Sid: *mut PSID,
+    ) -> NTSTATUS;
+    fn RtlInitializeSid(
+        Sid: PSID,
+        IdentifierAuthority: PSID_IDENTIFIER_AUTHORITY,
+        SubAuthorityCount: UCHAR,
+    ) -> NTSTATUS;
+}}
+EXTERN!{extern "C" {
+    fn RtlInitializeSidEx(
+        Sid: PSID,
+        IdentifierAuthority: PSID_IDENTIFIER_AUTHORITY,
+        SubAuthorityCount: UCHAR,
+        ...
+    ) -> NTSTATUS;
+}}
+EXTERN!{extern "system" {
+    fn RtlIdentifierAuthoritySid(
+        Sid: PSID,
+    ) -> PSID_IDENTIFIER_AUTHORITY;
+    fn RtlSubAuthoritySid(
+        Sid: PSID,
+        SubAuthority: ULONG,
+    ) -> PULONG;
+    fn RtlSubAuthorityCountSid(
+        Sid: PSID,
+    ) -> PUCHAR;
+    fn RtlLengthSid(
+        Sid: PSID,
+    ) -> ULONG;
+    fn RtlCopySid(
+        DestinationSidLength: ULONG,
+        DestinationSid: PSID,
+        SourceSid: PSID,
+    ) -> NTSTATUS;
+    fn RtlCopySidAndAttributesArray(
+        Count: ULONG,
+        Src: PSID_AND_ATTRIBUTES,
+        SidAreaSize: ULONG,
+        Dest: PSID_AND_ATTRIBUTES,
+        SidArea: PSID,
+        RemainingSidArea: *mut PSID,
+        RemainingSidAreaSize: PULONG,
+    ) -> NTSTATUS;
+    fn RtlCreateServiceSid(
+        ServiceName: PUNICODE_STRING,
+        ServiceSid: PSID,
+        ServiceSidLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlSidDominates(
+        Sid1: PSID,
+        Sid2: PSID,
+        Dominates: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSidDominatesForTrust(
+        Sid1: PSID,
+        Sid2: PSID,
+        DominatesTrust: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSidEqualLevel(
+        Sid1: PSID,
+        Sid2: PSID,
+        EqualLevel: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSidIsHigherLevel(
+        Sid1: PSID,
+        Sid2: PSID,
+        HigherLevel: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlCreateVirtualAccountSid(
+        Name: PCUNICODE_STRING,
+        BaseSubAuthority: ULONG,
+        Sid: PSID,
+        SidLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlReplaceSidInSd(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        OldSid: PSID,
+        NewSid: PSID,
+        NumChanges: *mut ULONG,
+    ) -> NTSTATUS;
+}}
+pub const MAX_UNICODE_STACK_BUFFER_LENGTH: usize = 256;
+EXTERN!{extern "system" {
+    fn RtlConvertSidToUnicodeString(
+        UnicodeString: PUNICODE_STRING,
+        Sid: PSID,
+        AllocateDestinationString: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSidHashInitialize(
+        SidAttr: PSID_AND_ATTRIBUTES,
+        SidCount: ULONG,
+        SidAttrHash: PSID_AND_ATTRIBUTES_HASH,
+    ) -> NTSTATUS;
+    fn RtlSidHashLookup(
+        SidAttrHash: PSID_AND_ATTRIBUTES_HASH,
+        Sid: PSID,
+    ) -> PSID_AND_ATTRIBUTES;
+    fn RtlIsElevatedRid(
+        SidAttr: PSID_AND_ATTRIBUTES,
+    ) -> BOOLEAN;
+    fn RtlDeriveCapabilitySidsFromName(
+        UnicodeString: PUNICODE_STRING,
+        CapabilityGroupSid: PSID,
+        CapabilitySid: PSID,
+    ) -> NTSTATUS;
+    fn RtlCreateSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Revision: ULONG,
+    ) -> NTSTATUS;
+    fn RtlValidSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+    ) -> BOOLEAN;
+    fn RtlLengthSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+    ) -> ULONG;
+    fn RtlValidRelativeSecurityDescriptor(
+        SecurityDescriptorInput: PSECURITY_DESCRIPTOR,
+        SecurityDescriptorLength: ULONG,
+        RequiredInformation: SECURITY_INFORMATION,
+    ) -> BOOLEAN;
+    fn RtlGetControlSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Control: PSECURITY_DESCRIPTOR_CONTROL,
+        Revision: PULONG,
+    ) -> NTSTATUS;
+    fn RtlSetControlSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        ControlBitsOfInterest: SECURITY_DESCRIPTOR_CONTROL,
+        ControlBitsToSet: SECURITY_DESCRIPTOR_CONTROL,
+    ) -> NTSTATUS;
+    fn RtlSetAttributesSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Control: SECURITY_DESCRIPTOR_CONTROL,
+        Revision: PULONG,
+    ) -> NTSTATUS;
+    fn RtlGetSecurityDescriptorRMControl(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        RMControl: PUCHAR,
+    ) -> BOOLEAN;
+    fn RtlSetSecurityDescriptorRMControl(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        RMControl: PUCHAR,
+    );
+    fn RtlSetDaclSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        DaclPresent: BOOLEAN,
+        Dacl: PACL,
+        DaclDefaulted: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlGetDaclSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        DaclPresent: PBOOLEAN,
+        Dacl: *mut PACL,
+        DaclDefaulted: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSetSaclSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        SaclPresent: BOOLEAN,
+        Sacl: PACL,
+        SaclDefaulted: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlGetSaclSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        SaclPresent: PBOOLEAN,
+        Sacl: *mut PACL,
+        SaclDefaulted: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSetOwnerSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Owner: PSID,
+        OwnerDefaulted: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlGetOwnerSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Owner: *mut PSID,
+        OwnerDefaulted: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSetGroupSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Group: PSID,
+        GroupDefaulted: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlGetGroupSecurityDescriptor(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Group: *mut PSID,
+        GroupDefaulted: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlMakeSelfRelativeSD(
+        AbsoluteSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        SelfRelativeSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        BufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlAbsoluteToSelfRelativeSD(
+        AbsoluteSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        SelfRelativeSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        BufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlSelfRelativeToAbsoluteSD(
+        SelfRelativeSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        AbsoluteSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        AbsoluteSecurityDescriptorSize: PULONG,
+        Dacl: PACL,
+        DaclSize: PULONG,
+        Sacl: PACL,
+        SaclSize: PULONG,
+        Owner: PSID,
+        OwnerSize: PULONG,
+        PrimaryGroup: PSID,
+        PrimaryGroupSize: PULONG,
+    ) -> NTSTATUS;
+    fn RtlSelfRelativeToAbsoluteSD2(
+        pSelfRelativeSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        pBufferSize: PULONG,
+    ) -> NTSTATUS;
+    fn RtlAreAllAccessesGranted(
+        GrantedAccess: ACCESS_MASK,
+        DesiredAccess: ACCESS_MASK,
+    ) -> BOOLEAN;
+    fn RtlAreAnyAccessesGranted(
+        GrantedAccess: ACCESS_MASK,
+        DesiredAccess: ACCESS_MASK,
+    ) -> BOOLEAN;
+    fn RtlMapGenericMask(
+        AccessMask: PACCESS_MASK,
+        GenericMapping: PGENERIC_MAPPING,
+    );
+    fn RtlCreateAcl(
+        Acl: PACL,
+        AclLength: ULONG,
+        AclRevision: ULONG,
+    ) -> NTSTATUS;
+    fn RtlValidAcl(
+        Acl: PACL,
+    ) -> BOOLEAN;
+    fn RtlQueryInformationAcl(
+        Acl: PACL,
+        AclInformation: PVOID,
+        AclInformationLength: ULONG,
+        AclInformationClass: ACL_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn RtlSetInformationAcl(
+        Acl: PACL,
+        AclInformation: PVOID,
+        AclInformationLength: ULONG,
+        AclInformationClass: ACL_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn RtlAddAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        StartingAceIndex: ULONG,
+        AceList: PVOID,
+        AceListLength: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDeleteAce(
+        Acl: PACL,
+        AceIndex: ULONG,
+    ) -> NTSTATUS;
+    fn RtlGetAce(
+        Acl: PACL,
+        AceIndex: ULONG,
+        Ace: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlFirstFreeAce(
+        Acl: PACL,
+        FirstFree: *mut PVOID,
+    ) -> BOOLEAN;
+    fn RtlFindAceByType(
+        pAcl: PACL,
+        AceType: UCHAR,
+        pIndex: PULONG,
+    ) -> PVOID;
+    fn RtlOwnerAcesPresent(
+        pAcl: PACL,
+    ) -> BOOLEAN;
+    fn RtlAddAccessAllowedAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AccessMask: ACCESS_MASK,
+        Sid: PSID,
+    ) -> NTSTATUS;
+    fn RtlAddAccessAllowedAceEx(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AceFlags: ULONG,
+        AccessMask: ACCESS_MASK,
+        Sid: PSID,
+    ) -> NTSTATUS;
+    fn RtlAddAccessDeniedAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AccessMask: ACCESS_MASK,
+        Sid: PSID,
+    ) -> NTSTATUS;
+    fn RtlAddAccessDeniedAceEx(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AceFlags: ULONG,
+        AccessMask: ACCESS_MASK,
+        Sid: PSID,
+    ) -> NTSTATUS;
+    fn RtlAddAuditAccessAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AccessMask: ACCESS_MASK,
+        Sid: PSID,
+        AuditSuccess: BOOLEAN,
+        AuditFailure: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlAddAuditAccessAceEx(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AceFlags: ULONG,
+        AccessMask: ACCESS_MASK,
+        Sid: PSID,
+        AuditSuccess: BOOLEAN,
+        AuditFailure: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlAddAccessAllowedObjectAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AceFlags: ULONG,
+        AccessMask: ACCESS_MASK,
+        ObjectTypeGuid: *mut GUID,
+        InheritedObjectTypeGuid: *mut GUID,
+        Sid: PSID,
+    ) -> NTSTATUS;
+    fn RtlAddAccessDeniedObjectAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AceFlags: ULONG,
+        AccessMask: ACCESS_MASK,
+        ObjectTypeGuid: *mut GUID,
+        InheritedObjectTypeGuid: *mut GUID,
+        Sid: PSID,
+    ) -> NTSTATUS;
+    fn RtlAddAuditAccessObjectAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AceFlags: ULONG,
+        AccessMask: ACCESS_MASK,
+        ObjectTypeGuid: *mut GUID,
+        InheritedObjectTypeGuid: *mut GUID,
+        Sid: PSID,
+        AuditSuccess: BOOLEAN,
+        AuditFailure: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlAddCompoundAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AceType: UCHAR,
+        AccessMask: ACCESS_MASK,
+        ServerSid: PSID,
+        ClientSid: PSID,
+    ) -> NTSTATUS;
+    fn RtlAddMandatoryAce(
+        Acl: PACL,
+        AceRevision: ULONG,
+        AceFlags: ULONG,
+        Sid: PSID,
+        AceType: UCHAR,
+        AccessMask: ACCESS_MASK,
+    ) -> NTSTATUS;
+    fn RtlDefaultNpAcl(
+        Acl: *mut PACL,
+    ) -> NTSTATUS;
+    fn RtlNewSecurityObject(
+        ParentDescriptor: PSECURITY_DESCRIPTOR,
+        CreatorDescriptor: PSECURITY_DESCRIPTOR,
+        NewDescriptor: *mut PSECURITY_DESCRIPTOR,
+        IsDirectoryObject: BOOLEAN,
+        Token: HANDLE,
+        GenericMapping: PGENERIC_MAPPING,
+    ) -> NTSTATUS;
+    fn RtlNewSecurityObjectEx(
+        ParentDescriptor: PSECURITY_DESCRIPTOR,
+        CreatorDescriptor: PSECURITY_DESCRIPTOR,
+        NewDescriptor: *mut PSECURITY_DESCRIPTOR,
+        ObjectType: *mut GUID,
+        IsDirectoryObject: BOOLEAN,
+        AutoInheritFlags: ULONG,
+        Token: HANDLE,
+        GenericMapping: PGENERIC_MAPPING,
+    ) -> NTSTATUS;
+    fn RtlNewSecurityObjectWithMultipleInheritance(
+        ParentDescriptor: PSECURITY_DESCRIPTOR,
+        CreatorDescriptor: PSECURITY_DESCRIPTOR,
+        NewDescriptor: *mut PSECURITY_DESCRIPTOR,
+        ObjectType: *mut *mut GUID,
+        GuidCount: ULONG,
+        IsDirectoryObject: BOOLEAN,
+        AutoInheritFlags: ULONG,
+        Token: HANDLE,
+        GenericMapping: PGENERIC_MAPPING,
+    ) -> NTSTATUS;
+    fn RtlDeleteSecurityObject(
+        ObjectDescriptor: *mut PSECURITY_DESCRIPTOR,
+    ) -> NTSTATUS;
+    fn RtlQuerySecurityObject(
+        ObjectDescriptor: PSECURITY_DESCRIPTOR,
+        SecurityInformation: SECURITY_INFORMATION,
+        ResultantDescriptor: PSECURITY_DESCRIPTOR,
+        DescriptorLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlSetSecurityObject(
+        SecurityInformation: SECURITY_INFORMATION,
+        ModificationDescriptor: PSECURITY_DESCRIPTOR,
+        ObjectsSecurityDescriptor: *mut PSECURITY_DESCRIPTOR,
+        GenericMapping: PGENERIC_MAPPING,
+        Token: HANDLE,
+    ) -> NTSTATUS;
+    fn RtlSetSecurityObjectEx(
+        SecurityInformation: SECURITY_INFORMATION,
+        ModificationDescriptor: PSECURITY_DESCRIPTOR,
+        ObjectsSecurityDescriptor: *mut PSECURITY_DESCRIPTOR,
+        AutoInheritFlags: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        Token: HANDLE,
+    ) -> NTSTATUS;
+    fn RtlConvertToAutoInheritSecurityObject(
+        ParentDescriptor: PSECURITY_DESCRIPTOR,
+        CurrentSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        NewSecurityDescriptor: *mut PSECURITY_DESCRIPTOR,
+        ObjectType: *mut GUID,
+        IsDirectoryObject: BOOLEAN,
+        GenericMapping: PGENERIC_MAPPING,
+    ) -> NTSTATUS;
+    fn RtlNewInstanceSecurityObject(
+        ParentDescriptorChanged: BOOLEAN,
+        CreatorDescriptorChanged: BOOLEAN,
+        OldClientTokenModifiedId: PLUID,
+        NewClientTokenModifiedId: PLUID,
+        ParentDescriptor: PSECURITY_DESCRIPTOR,
+        CreatorDescriptor: PSECURITY_DESCRIPTOR,
+        NewDescriptor: *mut PSECURITY_DESCRIPTOR,
+        IsDirectoryObject: BOOLEAN,
+        Token: HANDLE,
+        GenericMapping: PGENERIC_MAPPING,
+    ) -> NTSTATUS;
+    fn RtlCopySecurityDescriptor(
+        InputSecurityDescriptor: PSECURITY_DESCRIPTOR,
+        OutputSecurityDescriptor: *mut PSECURITY_DESCRIPTOR,
+    ) -> NTSTATUS;
+    fn RtlRunEncodeUnicodeString(
+        Seed: PUCHAR,
+        String: PUNICODE_STRING,
+    );
+    fn RtlRunDecodeUnicodeString(
+        Seed: UCHAR,
+        String: PUNICODE_STRING,
+    );
+    fn RtlImpersonateSelf(
+        ImpersonationLevel: SECURITY_IMPERSONATION_LEVEL,
+    ) -> NTSTATUS;
+    fn RtlImpersonateSelfEx(
+        ImpersonationLevel: SECURITY_IMPERSONATION_LEVEL,
+        AdditionalAccess: ACCESS_MASK,
+        ThreadToken: PHANDLE,
+    ) -> NTSTATUS;
+    fn RtlAdjustPrivilege(
+        Privilege: ULONG,
+        Enable: BOOLEAN,
+        Client: BOOLEAN,
+        WasEnabled: PBOOLEAN,
+    ) -> NTSTATUS;
+}}
+pub const RTL_ACQUIRE_PRIVILEGE_REVERT: ULONG = 0x00000001;
+pub const RTL_ACQUIRE_PRIVILEGE_PROCESS: ULONG = 0x00000002;
+EXTERN!{extern "system" {
+    fn RtlAcquirePrivilege(
+        Privilege: PULONG,
+        NumPriv: ULONG,
+        Flags: ULONG,
+        ReturnedState: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlReleasePrivilege(
+        StatePointer: PVOID,
+    );
+    fn RtlRemovePrivileges(
+        TokenHandle: HANDLE,
+        PrivilegesToKeep: PULONG,
+        PrivilegeCount: ULONG,
+    ) -> NTSTATUS;
+    fn RtlIsUntrustedObject(
+        Handle: HANDLE,
+        Object: PVOID,
+        IsUntrustedObject: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlQueryValidationRunlevel(
+        ComponentName: PUNICODE_STRING,
+    ) -> ULONG;
+    fn RtlCreateBoundaryDescriptor(
+        Name: PUNICODE_STRING,
+        Flags: ULONG,
+    ) -> PVOID;
+    fn RtlDeleteBoundaryDescriptor(
+        BoundaryDescriptor: PVOID,
+    );
+    fn RtlAddSIDToBoundaryDescriptor(
+        BoundaryDescriptor: *mut PVOID,
+        RequiredSid: PSID,
+    ) -> NTSTATUS;
+    fn RtlAddIntegrityLabelToBoundaryDescriptor(
+        BoundaryDescriptor: *mut PVOID,
+        IntegrityLabel: PSID,
+    ) -> NTSTATUS;
+    fn RtlGetVersion(
+        lpVersionInformation: PRTL_OSVERSIONINFOW,
+    ) -> NTSTATUS;
+    fn RtlVerifyVersionInfo(
+        VersionInfo: PRTL_OSVERSIONINFOEXW,
+        TypeMask: ULONG,
+        ConditionMask: ULONGLONG,
+    ) -> NTSTATUS;
+    fn RtlGetNtVersionNumbers(
+        NtMajorVersion: PULONG,
+        NtMinorVersion: PULONG,
+        NtBuildNumber: PULONG,
+    );
+    fn RtlGetNtGlobalFlags() -> ULONG;
+    fn RtlGetNtProductType(
+        NtProductType: PNT_PRODUCT_TYPE,
+    ) -> BOOLEAN;
+    fn RtlGetSuiteMask() -> ULONG;
+    fn RtlRegisterWait(
+        WaitHandle: PHANDLE,
+        Handle: HANDLE,
+        Function: WAITORTIMERCALLBACKFUNC,
+        Context: PVOID,
+        Milliseconds: ULONG,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDeregisterWait(
+        WaitHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn RtlDeregisterWaitEx(
+        WaitHandle: HANDLE,
+        Event: HANDLE,
+    ) -> NTSTATUS;
+    fn RtlQueueWorkItem(
+        Function: WORKERCALLBACKFUNC,
+        Context: PVOID,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlSetIoCompletionCallback(
+        FileHandle: HANDLE,
+        CompletionProc: APC_CALLBACK_FUNCTION,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+}}
+FN!{stdcall PRTL_START_POOL_THREAD(
+    Function: PTHREAD_START_ROUTINE,
+    Parameter: PVOID,
+    ThreadHandle: PHANDLE,
+) -> NTSTATUS}
+FN!{stdcall PRTL_EXIT_POOL_THREAD(
+    ExitStatus: NTSTATUS,
+) -> NTSTATUS}
+EXTERN!{extern "system" {
+    fn RtlSetThreadPoolStartFunc(
+        StartPoolThread: PRTL_START_POOL_THREAD,
+        ExitPoolThread: PRTL_EXIT_POOL_THREAD,
+    ) -> NTSTATUS;
+    fn RtlUserThreadStart(
+        Function: PTHREAD_START_ROUTINE,
+        Parameter: PVOID,
+    );
+    fn LdrInitializeThunk(
+        ContextRecord: PCONTEXT,
+        Parameter: PVOID,
+    );
+    fn RtlCreateTimerQueue(
+        TimerQueueHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn RtlCreateTimer(
+        TimerQueueHandle: HANDLE,
+        Handle: PHANDLE,
+        Function: WAITORTIMERCALLBACKFUNC,
+        Context: PVOID,
+        DueTime: ULONG,
+        Period: ULONG,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn RtlUpdateTimer(
+        TimerQueueHandle: HANDLE,
+        TimerHandle: HANDLE,
+        DueTime: ULONG,
+        Period: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDeleteTimer(
+        TimerQueueHandle: HANDLE,
+        TimerToCancel: HANDLE,
+        Event: HANDLE,
+    ) -> NTSTATUS;
+    fn RtlDeleteTimerQueue(
+        TimerQueueHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn RtlDeleteTimerQueueEx(
+        TimerQueueHandle: HANDLE,
+        Event: HANDLE,
+    ) -> NTSTATUS;
+    fn RtlFormatCurrentUserKeyPath(
+        CurrentUserKeyPath: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlOpenCurrentUser(
+        DesiredAccess: ACCESS_MASK,
+        CurrentUserKey: PHANDLE,
+    ) -> NTSTATUS;
+}}
+pub const RTL_REGISTRY_ABSOLUTE: ULONG = 0;
+pub const RTL_REGISTRY_SERVICES: ULONG = 1;
+pub const RTL_REGISTRY_CONTROL: ULONG = 2;
+pub const RTL_REGISTRY_WINDOWS_NT: ULONG = 3;
+pub const RTL_REGISTRY_DEVICEMAP: ULONG = 4;
+pub const RTL_REGISTRY_USER: ULONG = 5;
+pub const RTL_REGISTRY_MAXIMUM: ULONG = 6;
+pub const RTL_REGISTRY_HANDLE: ULONG = 0x40000000;
+pub const RTL_REGISTRY_OPTIONAL: ULONG = 0x80000000;
+EXTERN!{extern "system" {
+    fn RtlCreateRegistryKey(
+        RelativeTo: ULONG,
+        Path: PWSTR,
+    ) -> NTSTATUS;
+    fn RtlCheckRegistryKey(
+        RelativeTo: ULONG,
+        Path: PWSTR,
+    ) -> NTSTATUS;
+}}
+FN!{stdcall PRTL_QUERY_REGISTRY_ROUTINE(
+    ValueName: PWSTR,
+    ValueType: ULONG,
+    ValueData: PVOID,
+    ValueLength: ULONG,
+    Context: PVOID,
+    EntryContext: PVOID,
+) -> NTSTATUS}
+STRUCT!{struct RTL_QUERY_REGISTRY_TABLE {
+    QueryRoutine: PRTL_QUERY_REGISTRY_ROUTINE,
+    Flags: ULONG,
+    Name: PWSTR,
+    EntryContext: PVOID,
+    DefaultType: ULONG,
+    DefaultData: PVOID,
+    DefaultLength: ULONG,
+}}
+pub type PRTL_QUERY_REGISTRY_TABLE = *mut RTL_QUERY_REGISTRY_TABLE;
+pub const RTL_QUERY_REGISTRY_SUBKEY: ULONG = 0x00000001;
+pub const RTL_QUERY_REGISTRY_TOPKEY: ULONG = 0x00000002;
+pub const RTL_QUERY_REGISTRY_REQUIRED: ULONG = 0x00000004;
+pub const RTL_QUERY_REGISTRY_NOVALUE: ULONG = 0x00000008;
+pub const RTL_QUERY_REGISTRY_NOEXPAND: ULONG = 0x00000010;
+pub const RTL_QUERY_REGISTRY_DIRECT: ULONG = 0x00000020;
+pub const RTL_QUERY_REGISTRY_DELETE: ULONG = 0x00000040;
+EXTERN!{extern "system" {
+    fn RtlQueryRegistryValues(
+        RelativeTo: ULONG,
+        Path: PCWSTR,
+        QueryTable: PRTL_QUERY_REGISTRY_TABLE,
+        Context: PVOID,
+        Environment: PVOID,
+    ) -> NTSTATUS;
+    fn RtlQueryRegistryValuesEx(
+        RelativeTo: ULONG,
+        Path: PWSTR,
+        QueryTable: PRTL_QUERY_REGISTRY_TABLE,
+        Context: PVOID,
+        Environment: PVOID,
+    ) -> NTSTATUS;
+    fn RtlWriteRegistryValue(
+        RelativeTo: ULONG,
+        Path: PCWSTR,
+        ValueName: PCWSTR,
+        ValueType: ULONG,
+        ValueData: PVOID,
+        ValueLength: ULONG,
+    ) -> NTSTATUS;
+    fn RtlDeleteRegistryValue(
+        RelativeTo: ULONG,
+        Path: PCWSTR,
+        ValueName: PCWSTR,
+    ) -> NTSTATUS;
+    fn RtlEnableThreadProfiling(
+        ThreadHandle: HANDLE,
+        Flags: ULONG,
+        HardwareCounters: ULONG64,
+        PerformanceDataHandle: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlDisableThreadProfiling(
+        PerformanceDataHandle: PVOID,
+    ) -> NTSTATUS;
+    fn RtlQueryThreadProfiling(
+        ThreadHandle: HANDLE,
+        Enabled: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlReadThreadProfilingData(
+        PerformanceDataHandle: HANDLE,
+        Flags: ULONG,
+        PerformanceData: PPERFORMANCE_DATA,
+    ) -> NTSTATUS;
+    fn RtlGetNativeSystemInformation(
+        SystemInformationClass: ULONG,
+        NativeSystemInformation: PVOID,
+        InformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlQueueApcWow64Thread(
+        ThreadHandle: HANDLE,
+        ApcRoutine: PPS_APC_ROUTINE,
+        ApcArgument1: PVOID,
+        ApcArgument2: PVOID,
+        ApcArgument3: PVOID,
+    ) -> NTSTATUS;
+    fn RtlWow64EnableFsRedirection(
+        Wow64FsEnableRedirection: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlWow64EnableFsRedirectionEx(
+        Wow64FsEnableRedirection: PVOID,
+        OldFsRedirectionLevel: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlComputeCrc32(
+        PartialCrc: ULONG32,
+        Buffer: PVOID,
+        Length: ULONG,
+    ) -> ULONG32;
+    fn RtlEncodePointer(
+        Ptr: PVOID,
+    ) -> PVOID;
+    fn RtlDecodePointer(
+        Ptr: PVOID,
+    ) -> PVOID;
+    fn RtlEncodeSystemPointer(
+        Ptr: PVOID,
+    ) -> PVOID;
+    fn RtlDecodeSystemPointer(
+        Ptr: PVOID,
+    ) -> PVOID;
+    fn RtlEncodeRemotePointer(
+        ProcessHandle: HANDLE,
+        Pointer: PVOID,
+        EncodedPointer: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlDecodeRemotePointer(
+        ProcessHandle: HANDLE,
+        Pointer: PVOID,
+        DecodedPointer: *mut PVOID,
+    ) -> NTSTATUS;
+    fn RtlIsProcessorFeaturePresent(
+        ProcessorFeature: ULONG,
+    ) -> BOOLEAN;
+    fn RtlGetCurrentProcessorNumber() -> ULONG;
+    fn RtlGetCurrentProcessorNumberEx(
+        ProcessorNumber: PPROCESSOR_NUMBER,
+    );
+    fn RtlPushFrame(
+        Frame: PTEB_ACTIVE_FRAME,
+    );
+    fn RtlPopFrame(
+        Frame: PTEB_ACTIVE_FRAME,
+    );
+    fn RtlGetFrame() -> PTEB_ACTIVE_FRAME;
+}}
+pub const RTL_WALK_USER_MODE_STACK: ULONG = 0x00000001;
+pub const RTL_WALK_VALID_FLAGS: ULONG = 0x00000001;
+pub const RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT: ULONG = 0x00000008;
+EXTERN!{extern "system" {
+    fn RtlWalkFrameChain(
+        Callers: *mut PVOID,
+        Count: ULONG,
+        Flags: ULONG,
+    ) -> ULONG;
+    fn RtlGetCallersAddress(
+        CallersAddress: *mut PVOID,
+        CallersCaller: *mut PVOID,
+    );
+    fn RtlGetEnabledExtendedFeatures(
+        FeatureMask: ULONG64,
+    ) -> ULONG64;
+    fn RtlGetEnabledExtendedAndSupervisorFeatures(
+        FeatureMask: ULONG64,
+    ) -> ULONG64;
+    fn RtlLocateSupervisorFeature(
+        XStateHeader: PXSAVE_AREA_HEADER,
+        FeatureId: ULONG,
+        Length: PULONG,
+    ) -> PVOID;
+}}
+STRUCT!{struct RTL_ELEVATION_FLAGS {
+    Flags: ULONG,
+}}
+BITFIELD!{RTL_ELEVATION_FLAGS Flags: ULONG [
+    ElevationEnabled set_ElevationEnabled[0..1],
+    VirtualizationEnabled set_VirtualizationEnabled[1..2],
+    InstallerDetectEnabled set_InstallerDetectEnabled[2..3],
+    ReservedBits set_ReservedBits[3..32],
+]}
+pub type PRTL_ELEVATION_FLAGS = *mut RTL_ELEVATION_FLAGS;
+EXTERN!{extern "system" {
+    fn RtlQueryElevationFlags(
+        Flags: PRTL_ELEVATION_FLAGS,
+    ) -> NTSTATUS;
+    fn RtlRegisterThreadWithCsrss() -> NTSTATUS;
+    fn RtlLockCurrentThread() -> NTSTATUS;
+    fn RtlUnlockCurrentThread() -> NTSTATUS;
+    fn RtlLockModuleSection(
+        Address: PVOID,
+    ) -> NTSTATUS;
+    fn RtlUnlockModuleSection(
+        Address: PVOID,
+    ) -> NTSTATUS;
+}}
+pub const RTL_UNLOAD_EVENT_TRACE_NUMBER: u32 = 64;
+STRUCT!{struct RTL_UNLOAD_EVENT_TRACE {
+    BaseAddress: PVOID,
+    SizeOfImage: SIZE_T,
+    Sequence: ULONG,
+    TimeDateStamp: ULONG,
+    CheckSum: ULONG,
+    ImageName: [WCHAR; 32],
+    Version: [ULONG; 2],
+}}
+pub type PRTL_UNLOAD_EVENT_TRACE = *mut RTL_UNLOAD_EVENT_TRACE;
+STRUCT!{struct RTL_UNLOAD_EVENT_TRACE32 {
+    BaseAddress: ULONG,
+    SizeOfImage: ULONG,
+    Sequence: ULONG,
+    TimeDateStamp: ULONG,
+    CheckSum: ULONG,
+    ImageName: [WCHAR; 32],
+    Version: [ULONG; 2],
+}}
+pub type PRTL_UNLOAD_EVENT_TRACE32 = *mut RTL_UNLOAD_EVENT_TRACE32;
+EXTERN!{extern "system" {
+    fn RtlGetUnloadEventTrace() -> PRTL_UNLOAD_EVENT_TRACE;
+    fn RtlGetUnloadEventTraceEx(
+        ElementSize: *mut PULONG,
+        ElementCount: *mut PULONG,
+        EventTrace: *mut PVOID,
+    );
+    fn RtlQueryPerformanceCounter(
+        PerformanceCounter: PLARGE_INTEGER,
+    ) -> LOGICAL;
+    fn RtlQueryPerformanceFrequency(
+        PerformanceFrequency: PLARGE_INTEGER,
+    ) -> LOGICAL;
+}}
+ENUM!{enum IMAGE_MITIGATION_POLICY {
+    ImageDepPolicy = 0,
+    ImageAslrPolicy = 1,
+    ImageDynamicCodePolicy = 2,
+    ImageStrictHandleCheckPolicy = 3,
+    ImageSystemCallDisablePolicy = 4,
+    ImageMitigationOptionsMask = 5,
+    ImageExtensionPointDisablePolicy = 6,
+    ImageControlFlowGuardPolicy = 7,
+    ImageSignaturePolicy = 8,
+    ImageFontDisablePolicy = 9,
+    ImageImageLoadPolicy = 10,
+    ImagePayloadRestrictionPolicy = 11,
+    ImageChildProcessPolicy = 12,
+    ImageSehopPolicy = 13,
+    ImageHeapPolicy = 14,
+    MaxImageMitigationPolicy = 15,
+}}
+UNION!{union RTL_IMAGE_MITIGATION_POLICY {
+    Bitfields1: ULONG64,
+    Bitfields2: ULONG64,
+}}
+BITFIELD!{unsafe RTL_IMAGE_MITIGATION_POLICY Bitfields1: ULONG64 [
+    AuditState set_AuditState[0..2],
+    AuditFlag set_AuditFlag[2..3],
+    EnableAdditionalAuditingOption set_EnableAdditionalAuditingOption[3..4],
+    Reserved set_Reserved[4..64],
+]}
+BITFIELD!{unsafe RTL_IMAGE_MITIGATION_POLICY Bitfields2: ULONG64 [
+    PolicyState set_PolicyState[0..2],
+    AlwaysInherit set_AlwaysInherit[2..3],
+    EnableAdditionalPolicyOption set_EnableAdditionalPolicyOption[3..4],
+    AuditReserved set_AuditReserved[4..64],
+]}
+pub type PRTL_IMAGE_MITIGATION_POLICY = *mut RTL_IMAGE_MITIGATION_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_DEP_POLICY {
+    Dep: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_DEP_POLICY = *mut RTL_IMAGE_MITIGATION_DEP_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_ASLR_POLICY {
+    ForceRelocateImages: RTL_IMAGE_MITIGATION_POLICY,
+    BottomUpRandomization: RTL_IMAGE_MITIGATION_POLICY,
+    HighEntropyRandomization: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_ASLR_POLICY = *mut RTL_IMAGE_MITIGATION_ASLR_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_DYNAMIC_CODE_POLICY {
+    BlockDynamicCode: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_DYNAMIC_CODE_POLICY = *mut RTL_IMAGE_MITIGATION_DYNAMIC_CODE_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_STRICT_HANDLE_CHECK_POLICY {
+    StrictHandleChecks: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_STRICT_HANDLE_CHECK_POLICY =
+    *mut RTL_IMAGE_MITIGATION_STRICT_HANDLE_CHECK_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_SYSTEM_CALL_DISABLE_POLICY {
+    BlockWin32kSystemCalls: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_SYSTEM_CALL_DISABLE_POLICY =
+    *mut RTL_IMAGE_MITIGATION_SYSTEM_CALL_DISABLE_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_EXTENSION_POINT_DISABLE_POLICY {
+    DisableExtensionPoints: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_EXTENSION_POINT_DISABLE_POLICY =
+    *mut RTL_IMAGE_MITIGATION_EXTENSION_POINT_DISABLE_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_CONTROL_FLOW_GUARD_POLICY {
+    ControlFlowGuard: RTL_IMAGE_MITIGATION_POLICY,
+    StrictControlFlowGuard: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_CONTROL_FLOW_GUARD_POLICY =
+    *mut RTL_IMAGE_MITIGATION_CONTROL_FLOW_GUARD_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_BINARY_SIGNATURE_POLICY {
+    BlockNonMicrosoftSignedBinaries: RTL_IMAGE_MITIGATION_POLICY,
+    EnforceSigningOnModuleDependencies: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_BINARY_SIGNATURE_POLICY =
+    *mut RTL_IMAGE_MITIGATION_BINARY_SIGNATURE_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_FONT_DISABLE_POLICY {
+    DisableNonSystemFonts: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_FONT_DISABLE_POLICY = *mut RTL_IMAGE_MITIGATION_FONT_DISABLE_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_IMAGE_LOAD_POLICY {
+    BlockRemoteImageLoads: RTL_IMAGE_MITIGATION_POLICY,
+    BlockLowLabelImageLoads: RTL_IMAGE_MITIGATION_POLICY,
+    PreferSystem32: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_IMAGE_LOAD_POLICY = *mut RTL_IMAGE_MITIGATION_IMAGE_LOAD_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_PAYLOAD_RESTRICTION_POLICY {
+    EnableExportAddressFilter: RTL_IMAGE_MITIGATION_POLICY,
+    EnableExportAddressFilterPlus: RTL_IMAGE_MITIGATION_POLICY,
+    EnableImportAddressFilter: RTL_IMAGE_MITIGATION_POLICY,
+    EnableRopStackPivot: RTL_IMAGE_MITIGATION_POLICY,
+    EnableRopCallerCheck: RTL_IMAGE_MITIGATION_POLICY,
+    EnableRopSimExec: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_PAYLOAD_RESTRICTION_POLICY =
+    *mut RTL_IMAGE_MITIGATION_PAYLOAD_RESTRICTION_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_CHILD_PROCESS_POLICY {
+    DisallowChildProcessCreation: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_CHILD_PROCESS_POLICY =
+    *mut RTL_IMAGE_MITIGATION_CHILD_PROCESS_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_SEHOP_POLICY {
+    Sehop: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_SEHOP_POLICY = *mut RTL_IMAGE_MITIGATION_SEHOP_POLICY;
+STRUCT!{struct RTL_IMAGE_MITIGATION_HEAP_POLICY {
+    TerminateOnHeapErrors: RTL_IMAGE_MITIGATION_POLICY,
+}}
+pub type PRTL_IMAGE_MITIGATION_HEAP_POLICY = *mut RTL_IMAGE_MITIGATION_HEAP_POLICY;
+ENUM!{enum RTL_IMAGE_MITIGATION_OPTION_STATE {
+    RtlMitigationOptionStateNotConfigured = 0,
+    RtlMitigationOptionStateOn = 1,
+    RtlMitigationOptionStateOff = 2,
+}}
+pub const RTL_IMAGE_MITIGATION_FLAG_RESET: ULONG = 0x1;
+pub const RTL_IMAGE_MITIGATION_FLAG_REMOVE: ULONG = 0x2;
+pub const RTL_IMAGE_MITIGATION_FLAG_OSDEFAULT: ULONG = 0x4;
+pub const RTL_IMAGE_MITIGATION_FLAG_AUDIT: ULONG = 0x8;
+EXTERN!{extern "system" {
+    fn RtlQueryImageMitigationPolicy(
+        ImagePath: PWSTR,
+        Policy: IMAGE_MITIGATION_POLICY,
+        Flags: ULONG,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+    ) -> NTSTATUS;
+    fn RtlSetImageMitigationPolicy(
+        ImagePath: PWSTR,
+        Policy: IMAGE_MITIGATION_POLICY,
+        Flags: ULONG,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+    ) -> NTSTATUS;
+    fn RtlGetCurrentServiceSessionId() -> ULONG;
+    fn RtlGetActiveConsoleId() -> ULONG;
+    fn RtlGetConsoleSessionForegroundProcessId() -> ULONGLONG;
+    fn RtlGetTokenNamedObjectPath(
+        Token: HANDLE,
+        Sid: PSID,
+        ObjectPath: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlGetAppContainerNamedObjectPath(
+        Token: HANDLE,
+        AppContainerSid: PSID,
+        RelativePath: BOOLEAN,
+        ObjectPath: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn RtlGetAppContainerParent(
+        AppContainerSid: PSID,
+        AppContainerSidParent: *mut PSID,
+    ) -> NTSTATUS;
+    fn RtlCheckSandboxedToken(
+        TokenHandle: HANDLE,
+        IsSandboxed: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlCheckTokenCapability(
+        TokenHandle: HANDLE,
+        CapabilitySidToCheck: PSID,
+        HasCapability: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlCapabilityCheck(
+        TokenHandle: HANDLE,
+        CapabilityName: PUNICODE_STRING,
+        HasCapability: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlCheckTokenMembership(
+        TokenHandle: HANDLE,
+        SidToCheck: PSID,
+        IsMember: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlCheckTokenMembershipEx(
+        TokenHandle: HANDLE,
+        SidToCheck: PSID,
+        Flags: ULONG,
+        IsMember: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlIsParentOfChildAppContainer(
+        ParentAppContainerSid: PSID,
+        ChildAppContainerSid: PSID,
+    ) -> NTSTATUS;
+    fn RtlIsCapabilitySid(
+        Sid: PSID,
+    ) -> BOOLEAN;
+    fn RtlIsPackageSid(
+        Sid: PSID,
+    ) -> BOOLEAN;
+    fn RtlIsValidProcessTrustLabelSid(
+        Sid: PSID,
+    ) -> BOOLEAN;
+    fn RtlIsStateSeparationEnabled() -> BOOLEAN;
+}}
+ENUM!{enum APPCONTAINER_SID_TYPE {
+    NotAppContainerSidType = 0,
+    ChildAppContainerSidType = 1,
+    ParentAppContainerSidType = 2,
+    InvalidAppContainerSidType = 3,
+    MaxAppContainerSidType = 4,
+}}
+pub type PAPPCONTAINER_SID_TYPE = *mut APPCONTAINER_SID_TYPE;
+EXTERN!{extern "system" {
+    fn RtlGetAppContainerSidType(
+        AppContainerSid: PSID,
+        AppContainerSidType: PAPPCONTAINER_SID_TYPE,
+    ) -> NTSTATUS;
+    fn RtlFlsAlloc(
+        Callback: PFLS_CALLBACK_FUNCTION,
+        FlsIndex: PULONG,
+    ) -> NTSTATUS;
+    fn RtlFlsFree(
+        FlsIndex: ULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum STATE_LOCATION_TYPE {
+    LocationTypeRegistry = 0,
+    LocationTypeFileSystem = 1,
+    LocationTypeMaximum = 2,
+}}
+EXTERN!{extern "system" {
+    fn RtlGetPersistedStateLocation(
+        SourceID: PCWSTR,
+        CustomValue: PCWSTR,
+        DefaultPath: PCWSTR,
+        StateLocationType: STATE_LOCATION_TYPE,
+        TargetPath: PWCHAR,
+        BufferLengthIn: ULONG,
+        BufferLengthOut: PULONG,
+    ) -> NTSTATUS;
+    fn RtlIsCloudFilesPlaceholder(
+        FileAttributes: ULONG,
+        ReparseTag: ULONG,
+    ) -> BOOLEAN;
+    fn RtlIsPartialPlaceholder(
+        FileAttributes: ULONG,
+        ReparseTag: ULONG,
+    ) -> BOOLEAN;
+    fn RtlIsPartialPlaceholderFileHandle(
+        FileHandle: HANDLE,
+        IsPartialPlaceholder: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlIsPartialPlaceholderFileInfo(
+        InfoBuffer: *const c_void,
+        InfoClass: FILE_INFORMATION_CLASS,
+        IsPartialPlaceholder: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlIsNonEmptyDirectoryReparsePointAllowed(
+        ReparseTag: ULONG,
+    ) -> BOOLEAN;
+    fn RtlAppxIsFileOwnedByTrustedInstaller(
+        FileHandle: HANDLE,
+        IsFileOwnedByTrustedInstaller: PBOOLEAN,
+    ) -> NTSTATUS;
+}}
+STRUCT!{struct PS_PKG_CLAIM {
+    Flags: ULONGLONG,
+    Origin: ULONGLONG,
+}}
+pub type PPS_PKG_CLAIM = *mut PS_PKG_CLAIM;
+EXTERN!{extern "system" {
+    fn RtlQueryPackageClaims(
+        TokenHandle: HANDLE,
+        PackageFullName: PWSTR,
+        PackageSize: PSIZE_T,
+        AppId: PWSTR,
+        AppIdSize: PSIZE_T,
+        DynamicId: *mut GUID,
+        PkgClaim: PPS_PKG_CLAIM,
+        AttributesPresent: PULONG64,
+    ) -> NTSTATUS;
+    fn RtlQueryProtectedPolicy(
+        PolicyGuid: *mut GUID,
+        PolicyValue: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn RtlSetProtectedPolicy(
+        PolicyGuid: *mut GUID,
+        PolicyValue: ULONG_PTR,
+        OldPolicyValue: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn RtlIsMultiSessionSku() -> BOOLEAN;
+    fn RtlIsMultiUsersInSessionSku() -> BOOLEAN;
+}}
+ENUM!{enum RTL_BSD_ITEM_TYPE {
+    RtlBsdItemVersionNumber = 0,
+    RtlBsdItemProductType = 1,
+    RtlBsdItemAabEnabled = 2,
+    RtlBsdItemAabTimeout = 3,
+    RtlBsdItemBootGood = 4,
+    RtlBsdItemBootShutdown = 5,
+    RtlBsdSleepInProgress = 6,
+    RtlBsdPowerTransition = 7,
+    RtlBsdItemBootAttemptCount = 8,
+    RtlBsdItemBootCheckpoint = 9,
+    RtlBsdItemBootId = 10,
+    RtlBsdItemShutdownBootId = 11,
+    RtlBsdItemReportedAbnormalShutdownBootId = 12,
+    RtlBsdItemErrorInfo = 13,
+    RtlBsdItemPowerButtonPressInfo = 14,
+    RtlBsdItemChecksum = 15,
+    RtlBsdItemMax = 16,
+}}
+STRUCT!{struct RTL_BSD_ITEM {
+    Type: RTL_BSD_ITEM_TYPE,
+    DataBuffer: PVOID,
+    DataLength: ULONG,
+}}
+pub type PRTL_BSD_ITEM = *mut RTL_BSD_ITEM;
+EXTERN!{extern "system" {
+    fn RtlCreateBootStatusDataFile() -> NTSTATUS;
+    fn RtlLockBootStatusData(
+        FileHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn RtlUnlockBootStatusData(
+        FileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn RtlGetSetBootStatusData(
+        FileHandle: HANDLE,
+        Read: BOOLEAN,
+        DataClass: RTL_BSD_ITEM_TYPE,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn RtlCheckBootStatusIntegrity(
+        FileHandle: HANDLE,
+        Verified: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlCheckPortableOperatingSystem(
+        IsPortable: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlSetPortableOperatingSystem(
+        IsPortable: BOOLEAN,
+    ) -> NTSTATUS;
+}}
+EXTERN!{extern "system" {
+    fn RtlOsDeploymentState(
+        Flags: DWORD,
+    ) -> OS_DEPLOYEMENT_STATE_VALUES;
+    fn RtlFindClosestEncodableLength(
+        SourceLength: ULONGLONG,
+        TargetLength: PULONGLONG,
+    ) -> NTSTATUS;
+}}
+FN!{stdcall PRTL_SECURE_MEMORY_CACHE_CALLBACK(
+    Address: PVOID,
+    Length: SIZE_T,
+) -> NTSTATUS}
+EXTERN!{extern "system" {
+    fn RtlRegisterSecureMemoryCacheCallback(
+        Callback: PRTL_SECURE_MEMORY_CACHE_CALLBACK,
+    ) -> NTSTATUS;
+    fn RtlDeregisterSecureMemoryCacheCallback(
+        Callback: PRTL_SECURE_MEMORY_CACHE_CALLBACK,
+    ) -> NTSTATUS;
+    fn RtlFlushSecureMemoryCache(
+        MemoryCache: PVOID,
+        MemoryLength: SIZE_T,
+    ) -> BOOLEAN;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntsam.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntsam.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntsam.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntsam.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1077 @@
+use crate::string::UTF8Const;
+use winapi::shared::basetsd::ULONG64;
+use winapi::shared::minwindef::DWORD;
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, LARGE_INTEGER, NTSTATUS, OEM_STRING, PLARGE_INTEGER, POBJECT_ATTRIBUTES,
+    PUCHAR, PULONG, PUNICODE_STRING, PVOID, PWSTR, ULONG, UNICODE_STRING, USHORT,
+};
+use winapi::um::ntsecapi::PDOMAIN_PASSWORD_INFORMATION;
+use winapi::um::subauth::LOGON_HOURS;
+use winapi::um::winnt::{
+    ACCESS_MASK, PSECURITY_DESCRIPTOR, PSID, PSID_NAME_USE, SECURITY_INFORMATION, SID_NAME_USE,
+    STANDARD_RIGHTS_EXECUTE, STANDARD_RIGHTS_READ, STANDARD_RIGHTS_REQUIRED, STANDARD_RIGHTS_WRITE,
+};
+pub const SAM_MAXIMUM_LOOKUP_COUNT: u32 = 1000;
+pub const SAM_MAXIMUM_LOOKUP_LENGTH: u32 = 32000;
+pub const SAM_MAX_PASSWORD_LENGTH: u32 = 256;
+pub const SAM_PASSWORD_ENCRYPTION_SALT_LEN: u32 = 16;
+pub type PSAM_HANDLE = *mut PVOID;
+pub type SAM_HANDLE = PVOID;
+pub type SAM_ENUMERATE_HANDLE = ULONG;
+pub type PSAM_ENUMERATE_HANDLE = *mut ULONG;
+STRUCT!{struct SAM_RID_ENUMERATION {
+    RelativeId: ULONG,
+    Name: UNICODE_STRING,
+}}
+pub type PSAM_RID_ENUMERATION = *mut SAM_RID_ENUMERATION;
+STRUCT!{struct SAM_SID_ENUMERATION {
+    Sid: PSID,
+    Name: UNICODE_STRING,
+}}
+pub type PSAM_SID_ENUMERATION = *mut SAM_SID_ENUMERATION;
+STRUCT!{struct SAM_BYTE_ARRAY {
+    Size: ULONG,
+    Data: PUCHAR,
+}}
+pub type PSAM_BYTE_ARRAY = *mut SAM_BYTE_ARRAY;
+STRUCT!{struct SAM_BYTE_ARRAY_32K {
+    Size: ULONG,
+    Data: PUCHAR,
+}}
+pub type PSAM_BYTE_ARRAY_32K = *mut SAM_BYTE_ARRAY_32K;
+pub type PSAM_SHELL_OBJECT_PROPERTIES = *mut SAM_BYTE_ARRAY_32K;
+pub type SAM_SHELL_OBJECT_PROPERTIES = SAM_BYTE_ARRAY_32K;
+EXTERN!{extern "system" {
+    fn SamFreeMemory(
+        Buffer: PVOID,
+    ) -> NTSTATUS;
+    fn SamCloseHandle(
+        SamHandle: SAM_HANDLE,
+    ) -> NTSTATUS;
+    fn SamSetSecurityObject(
+        ObjectHandle: SAM_HANDLE,
+        SecurityInformation: SECURITY_INFORMATION,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+    ) -> NTSTATUS;
+    fn SamQuerySecurityObject(
+        ObjectHandle: SAM_HANDLE,
+        SecurityInformation: SECURITY_INFORMATION,
+        SecurityDescriptor: *mut PSECURITY_DESCRIPTOR,
+    ) -> NTSTATUS;
+    fn SamRidToSid(
+        ObjectHandle: SAM_HANDLE,
+        Rid: ULONG,
+        Sid: *mut PSID,
+    ) -> NTSTATUS;
+}}
+pub const SAM_SERVER_CONNECT: ACCESS_MASK = 0x0001;
+pub const SAM_SERVER_SHUTDOWN: ACCESS_MASK = 0x0002;
+pub const SAM_SERVER_INITIALIZE: ACCESS_MASK = 0x0004;
+pub const SAM_SERVER_CREATE_DOMAIN: ACCESS_MASK = 0x0008;
+pub const SAM_SERVER_ENUMERATE_DOMAINS: ACCESS_MASK = 0x0010;
+pub const SAM_SERVER_LOOKUP_DOMAIN: ACCESS_MASK = 0x0020;
+pub const SAM_SERVER_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED | SAM_SERVER_CONNECT
+    | SAM_SERVER_INITIALIZE | SAM_SERVER_CREATE_DOMAIN | SAM_SERVER_SHUTDOWN
+    | SAM_SERVER_ENUMERATE_DOMAINS | SAM_SERVER_LOOKUP_DOMAIN;
+pub const SAM_SERVER_READ: ACCESS_MASK = STANDARD_RIGHTS_READ | SAM_SERVER_ENUMERATE_DOMAINS;
+pub const SAM_SERVER_WRITE: ACCESS_MASK =
+    STANDARD_RIGHTS_WRITE | SAM_SERVER_INITIALIZE | SAM_SERVER_CREATE_DOMAIN | SAM_SERVER_SHUTDOWN;
+pub const SAM_SERVER_EXECUTE: ACCESS_MASK =
+    STANDARD_RIGHTS_EXECUTE | SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN;
+EXTERN!{extern "system" {
+    fn SamConnect(
+        ServerName: PUNICODE_STRING,
+        ServerHandle: PSAM_HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn SamShutdownSamServer(
+        ServerHandle: SAM_HANDLE,
+    ) -> NTSTATUS;
+}}
+pub const DOMAIN_READ_PASSWORD_PARAMETERS: u32 = 0x0001;
+pub const DOMAIN_WRITE_PASSWORD_PARAMS: u32 = 0x0002;
+pub const DOMAIN_READ_OTHER_PARAMETERS: u32 = 0x0004;
+pub const DOMAIN_WRITE_OTHER_PARAMETERS: u32 = 0x0008;
+pub const DOMAIN_CREATE_USER: u32 = 0x0010;
+pub const DOMAIN_CREATE_GROUP: u32 = 0x0020;
+pub const DOMAIN_CREATE_ALIAS: u32 = 0x0040;
+pub const DOMAIN_GET_ALIAS_MEMBERSHIP: u32 = 0x0080;
+pub const DOMAIN_LIST_ACCOUNTS: u32 = 0x0100;
+pub const DOMAIN_LOOKUP: u32 = 0x0200;
+pub const DOMAIN_ADMINISTER_SERVER: u32 = 0x0400;
+pub const DOMAIN_ALL_ACCESS: u32 = STANDARD_RIGHTS_REQUIRED | DOMAIN_READ_OTHER_PARAMETERS
+    | DOMAIN_WRITE_OTHER_PARAMETERS | DOMAIN_WRITE_PASSWORD_PARAMS | DOMAIN_CREATE_USER
+    | DOMAIN_CREATE_GROUP | DOMAIN_CREATE_ALIAS | DOMAIN_GET_ALIAS_MEMBERSHIP
+    | DOMAIN_LIST_ACCOUNTS | DOMAIN_READ_PASSWORD_PARAMETERS | DOMAIN_LOOKUP
+    | DOMAIN_ADMINISTER_SERVER;
+pub const DOMAIN_READ: u32 =
+    STANDARD_RIGHTS_READ | DOMAIN_GET_ALIAS_MEMBERSHIP | DOMAIN_READ_OTHER_PARAMETERS;
+pub const DOMAIN_WRITE: u32 = STANDARD_RIGHTS_WRITE | DOMAIN_WRITE_OTHER_PARAMETERS
+    | DOMAIN_WRITE_PASSWORD_PARAMS | DOMAIN_CREATE_USER | DOMAIN_CREATE_GROUP | DOMAIN_CREATE_ALIAS
+    | DOMAIN_ADMINISTER_SERVER;
+pub const DOMAIN_EXECUTE: u32 = STANDARD_RIGHTS_EXECUTE | DOMAIN_READ_PASSWORD_PARAMETERS
+    | DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP;
+ENUM!{enum DOMAIN_INFORMATION_CLASS {
+    DomainPasswordInformation = 1,
+    DomainGeneralInformation = 2,
+    DomainLogoffInformation = 3,
+    DomainOemInformation = 4,
+    DomainNameInformation = 5,
+    DomainReplicationInformation = 6,
+    DomainServerRoleInformation = 7,
+    DomainModifiedInformation = 8,
+    DomainStateInformation = 9,
+    DomainUasInformation = 10,
+    DomainGeneralInformation2 = 11,
+    DomainLockoutInformation = 12,
+    DomainModifiedInformation2 = 13,
+}}
+ENUM!{enum DOMAIN_SERVER_ENABLE_STATE {
+    DomainServerEnabled = 1,
+    DomainServerDisabled = 2,
+}}
+pub type PDOMAIN_SERVER_ENABLE_STATE = *mut DOMAIN_SERVER_ENABLE_STATE;
+ENUM!{enum DOMAIN_SERVER_ROLE {
+    DomainServerRoleBackup = 2,
+    DomainServerRolePrimary = 3,
+}}
+pub type PDOMAIN_SERVER_ROLE = *mut DOMAIN_SERVER_ROLE;
+STRUCT!{#[repr(packed(4))] struct DOMAIN_GENERAL_INFORMATION {
+    ForceLogoff: LARGE_INTEGER,
+    OemInformation: UNICODE_STRING,
+    DomainName: UNICODE_STRING,
+    ReplicaSourceNodeName: UNICODE_STRING,
+    DomainModifiedCount: LARGE_INTEGER,
+    DomainServerState: DOMAIN_SERVER_ENABLE_STATE,
+    DomainServerRole: DOMAIN_SERVER_ROLE,
+    UasCompatibilityRequired: BOOLEAN,
+    UserCount: ULONG,
+    GroupCount: ULONG,
+    AliasCount: ULONG,
+}}
+pub type PDOMAIN_GENERAL_INFORMATION = *mut DOMAIN_GENERAL_INFORMATION;
+STRUCT!{#[repr(packed(4))] struct DOMAIN_GENERAL_INFORMATION2 {
+    I1: DOMAIN_GENERAL_INFORMATION,
+    LockoutDuration: LARGE_INTEGER,
+    LockoutObservationWindow: LARGE_INTEGER,
+    LockoutThreshold: USHORT,
+}}
+pub type PDOMAIN_GENERAL_INFORMATION2 = *mut DOMAIN_GENERAL_INFORMATION2;
+STRUCT!{struct DOMAIN_UAS_INFORMATION {
+    UasCompatibilityRequired: BOOLEAN,
+}}
+ENUM!{enum DOMAIN_PASSWORD_CONSTRUCTION {
+    DomainPasswordSimple = 1,
+    DomainPasswordComplex = 2,
+}}
+STRUCT!{struct DOMAIN_LOGOFF_INFORMATION {
+    ForceLogoff: LARGE_INTEGER,
+}}
+pub type PDOMAIN_LOGOFF_INFORMATION = *mut DOMAIN_LOGOFF_INFORMATION;
+STRUCT!{struct DOMAIN_OEM_INFORMATION {
+    OemInformation: UNICODE_STRING,
+}}
+pub type PDOMAIN_OEM_INFORMATION = *mut DOMAIN_OEM_INFORMATION;
+STRUCT!{struct DOMAIN_NAME_INFORMATION {
+    DomainName: UNICODE_STRING,
+}}
+pub type PDOMAIN_NAME_INFORMATION = *mut DOMAIN_NAME_INFORMATION;
+STRUCT!{struct DOMAIN_SERVER_ROLE_INFORMATION {
+    DomainServerRole: DOMAIN_SERVER_ROLE,
+}}
+pub type PDOMAIN_SERVER_ROLE_INFORMATION = *mut DOMAIN_SERVER_ROLE_INFORMATION;
+STRUCT!{struct DOMAIN_REPLICATION_INFORMATION {
+    ReplicaSourceNodeName: UNICODE_STRING,
+}}
+pub type PDOMAIN_REPLICATION_INFORMATION = *mut DOMAIN_REPLICATION_INFORMATION;
+STRUCT!{struct DOMAIN_MODIFIED_INFORMATION {
+    DomainModifiedCount: LARGE_INTEGER,
+    CreationTime: LARGE_INTEGER,
+}}
+pub type PDOMAIN_MODIFIED_INFORMATION = *mut DOMAIN_MODIFIED_INFORMATION;
+STRUCT!{struct DOMAIN_MODIFIED_INFORMATION2 {
+    DomainModifiedCount: LARGE_INTEGER,
+    CreationTime: LARGE_INTEGER,
+    ModifiedCountAtLastPromotion: LARGE_INTEGER,
+}}
+pub type PDOMAIN_MODIFIED_INFORMATION2 = *mut DOMAIN_MODIFIED_INFORMATION2;
+STRUCT!{struct DOMAIN_STATE_INFORMATION {
+    DomainServerState: DOMAIN_SERVER_ENABLE_STATE,
+}}
+pub type PDOMAIN_STATE_INFORMATION = *mut DOMAIN_STATE_INFORMATION;
+STRUCT!{struct DOMAIN_LOCKOUT_INFORMATION {
+    LockoutDuration: LARGE_INTEGER,
+    LockoutObservationWindow: LARGE_INTEGER,
+    LockoutThreshold: USHORT,
+}}
+pub type PDOMAIN_LOCKOUT_INFORMATION = *mut DOMAIN_LOCKOUT_INFORMATION;
+ENUM!{enum DOMAIN_DISPLAY_INFORMATION {
+    DomainDisplayUser = 1,
+    DomainDisplayMachine = 2,
+    DomainDisplayGroup = 3,
+    DomainDisplayOemUser = 4,
+    DomainDisplayOemGroup = 5,
+    DomainDisplayServer = 6,
+}}
+pub type PDOMAIN_DISPLAY_INFORMATION = *mut DOMAIN_DISPLAY_INFORMATION;
+STRUCT!{struct DOMAIN_DISPLAY_USER {
+    Index: ULONG,
+    Rid: ULONG,
+    AccountControl: ULONG,
+    LogonName: UNICODE_STRING,
+    AdminComment: UNICODE_STRING,
+    FullName: UNICODE_STRING,
+}}
+pub type PDOMAIN_DISPLAY_USER = *mut DOMAIN_DISPLAY_USER;
+STRUCT!{struct DOMAIN_DISPLAY_MACHINE {
+    Index: ULONG,
+    Rid: ULONG,
+    AccountControl: ULONG,
+    Machine: UNICODE_STRING,
+    Comment: UNICODE_STRING,
+}}
+pub type PDOMAIN_DISPLAY_MACHINE = *mut DOMAIN_DISPLAY_MACHINE;
+STRUCT!{struct DOMAIN_DISPLAY_GROUP {
+    Index: ULONG,
+    Rid: ULONG,
+    Attributes: ULONG,
+    Group: UNICODE_STRING,
+    Comment: UNICODE_STRING,
+}}
+pub type PDOMAIN_DISPLAY_GROUP = *mut DOMAIN_DISPLAY_GROUP;
+STRUCT!{struct DOMAIN_DISPLAY_OEM_USER {
+    Index: ULONG,
+    User: OEM_STRING,
+}}
+pub type PDOMAIN_DISPLAY_OEM_USER = *mut DOMAIN_DISPLAY_OEM_USER;
+STRUCT!{struct DOMAIN_DISPLAY_OEM_GROUP {
+    Index: ULONG,
+    Group: OEM_STRING,
+}}
+pub type PDOMAIN_DISPLAY_OEM_GROUP = *mut DOMAIN_DISPLAY_OEM_GROUP;
+ENUM!{enum DOMAIN_LOCALIZABLE_ACCOUNTS_INFORMATION {
+    DomainLocalizableAccountsBasic = 1,
+}}
+pub type PDOMAIN_LOCALIZABLE_ACCOUNTS_INFORMATION = *mut DOMAIN_LOCALIZABLE_ACCOUNTS_INFORMATION;
+STRUCT!{struct DOMAIN_LOCALIZABLE_ACCOUNT_ENTRY {
+    Rid: ULONG,
+    Use: SID_NAME_USE,
+    Name: UNICODE_STRING,
+    AdminComment: UNICODE_STRING,
+}}
+pub type PDOMAIN_LOCALIZABLE_ACCOUNT_ENTRY = *mut DOMAIN_LOCALIZABLE_ACCOUNT_ENTRY;
+STRUCT!{struct DOMAIN_LOCALIZABLE_ACCOUNTS_BASIC {
+    Count: ULONG,
+    Entries: *mut DOMAIN_LOCALIZABLE_ACCOUNT_ENTRY,
+}}
+pub type PDOMAIN_LOCALIZABLE_ACCOUNTS_BASIC = *mut DOMAIN_LOCALIZABLE_ACCOUNTS_BASIC;
+UNION!{union DOMAIN_LOCALIZABLE_ACCOUNTS_INFO_BUFFER {
+    Basic: DOMAIN_LOCALIZABLE_ACCOUNTS_BASIC,
+}}
+pub type PDOMAIN_LOCALIZABLE_ACCOUNTS_INFO_BUFFER = *mut DOMAIN_LOCALIZABLE_ACCOUNTS_INFO_BUFFER;
+EXTERN!{extern "system" {
+    fn SamLookupDomainInSamServer(
+        ServerHandle: SAM_HANDLE,
+        Name: PUNICODE_STRING,
+        DomainId: *mut PSID,
+    ) -> NTSTATUS;
+    fn SamEnumerateDomainsInSamServer(
+        ServerHandle: SAM_HANDLE,
+        EnumerationContext: PSAM_ENUMERATE_HANDLE,
+        Buffer: *mut PVOID,
+        PreferedMaximumLength: ULONG,
+        CountReturned: PULONG,
+    ) -> NTSTATUS;
+    fn SamOpenDomain(
+        ServerHandle: SAM_HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        DomainId: PSID,
+        DomainHandle: PSAM_HANDLE,
+    ) -> NTSTATUS;
+    fn SamQueryInformationDomain(
+        DomainHandle: SAM_HANDLE,
+        DomainInformationClass: DOMAIN_INFORMATION_CLASS,
+        Buffer: *mut PVOID,
+    ) -> NTSTATUS;
+    fn SamSetInformationDomain(
+        DomainHandle: SAM_HANDLE,
+        DomainInformationClass: DOMAIN_INFORMATION_CLASS,
+        DomainInformation: PVOID,
+    ) -> NTSTATUS;
+    fn SamLookupNamesInDomain(
+        DomainHandle: SAM_HANDLE,
+        Count: ULONG,
+        Names: PUNICODE_STRING,
+        RelativeIds: *mut PULONG,
+        Use: *mut PSID_NAME_USE,
+    ) -> NTSTATUS;
+    fn SamLookupIdsInDomain(
+        DomainHandle: SAM_HANDLE,
+        Count: ULONG,
+        RelativeIds: PULONG,
+        Names: *mut PUNICODE_STRING,
+        Use: *mut PSID_NAME_USE,
+    ) -> NTSTATUS;
+    fn SamRemoveMemberFromForeignDomain(
+        DomainHandle: SAM_HANDLE,
+        MemberId: PSID,
+    ) -> NTSTATUS;
+    fn SamQueryLocalizableAccountsInDomain(
+        Domain: SAM_HANDLE,
+        Flags: ULONG,
+        LanguageId: ULONG,
+        Class: DOMAIN_LOCALIZABLE_ACCOUNTS_INFORMATION,
+        Buffer: *mut PVOID,
+    ) -> NTSTATUS;
+}}
+pub const GROUP_READ_INFORMATION: ACCESS_MASK = 0x0001;
+pub const GROUP_WRITE_ACCOUNT: ACCESS_MASK = 0x0002;
+pub const GROUP_ADD_MEMBER: ACCESS_MASK = 0x0004;
+pub const GROUP_REMOVE_MEMBER: ACCESS_MASK = 0x0008;
+pub const GROUP_LIST_MEMBERS: ACCESS_MASK = 0x0010;
+pub const GROUP_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED | GROUP_LIST_MEMBERS
+    | GROUP_WRITE_ACCOUNT | GROUP_ADD_MEMBER | GROUP_REMOVE_MEMBER | GROUP_READ_INFORMATION;
+pub const GROUP_READ: ACCESS_MASK = STANDARD_RIGHTS_READ | GROUP_LIST_MEMBERS;
+pub const GROUP_WRITE: ACCESS_MASK =
+    STANDARD_RIGHTS_WRITE | GROUP_WRITE_ACCOUNT | GROUP_ADD_MEMBER | GROUP_REMOVE_MEMBER;
+pub const GROUP_EXECUTE: ACCESS_MASK = STANDARD_RIGHTS_EXECUTE | GROUP_READ_INFORMATION;
+STRUCT!{struct GROUP_MEMBERSHIP {
+    RelativeId: ULONG,
+    Attributes: ULONG,
+}}
+pub type PGROUP_MEMBERSHIP = *mut GROUP_MEMBERSHIP;
+ENUM!{enum GROUP_INFORMATION_CLASS {
+    GroupGeneralInformation = 1,
+    GroupNameInformation = 2,
+    GroupAttributeInformation = 3,
+    GroupAdminCommentInformation = 4,
+    GroupReplicationInformation = 5,
+}}
+STRUCT!{struct GROUP_GENERAL_INFORMATION {
+    Name: UNICODE_STRING,
+    Attributes: ULONG,
+    MemberCount: ULONG,
+    AdminComment: UNICODE_STRING,
+}}
+pub type PGROUP_GENERAL_INFORMATION = *mut GROUP_GENERAL_INFORMATION;
+STRUCT!{struct GROUP_NAME_INFORMATION {
+    Name: UNICODE_STRING,
+}}
+pub type PGROUP_NAME_INFORMATION = *mut GROUP_NAME_INFORMATION;
+STRUCT!{struct GROUP_ATTRIBUTE_INFORMATION {
+    Attributes: ULONG,
+}}
+pub type PGROUP_ATTRIBUTE_INFORMATION = *mut GROUP_ATTRIBUTE_INFORMATION;
+STRUCT!{struct GROUP_ADM_COMMENT_INFORMATION {
+    AdminComment: UNICODE_STRING,
+}}
+pub type PGROUP_ADM_COMMENT_INFORMATION = *mut GROUP_ADM_COMMENT_INFORMATION;
+EXTERN!{extern "system" {
+    fn SamEnumerateGroupsInDomain(
+        DomainHandle: SAM_HANDLE,
+        EnumerationContext: PSAM_ENUMERATE_HANDLE,
+        Buffer: *mut PVOID,
+        PreferedMaximumLength: ULONG,
+        CountReturned: PULONG,
+    ) -> NTSTATUS;
+    fn SamCreateGroupInDomain(
+        DomainHandle: SAM_HANDLE,
+        AccountName: PUNICODE_STRING,
+        DesiredAccess: ACCESS_MASK,
+        GroupHandle: PSAM_HANDLE,
+        RelativeId: PULONG,
+    ) -> NTSTATUS;
+    fn SamOpenGroup(
+        DomainHandle: SAM_HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        GroupId: ULONG,
+        GroupHandle: PSAM_HANDLE,
+    ) -> NTSTATUS;
+    fn SamDeleteGroup(
+        GroupHandle: SAM_HANDLE,
+    ) -> NTSTATUS;
+    fn SamQueryInformationGroup(
+        GroupHandle: SAM_HANDLE,
+        GroupInformationClass: GROUP_INFORMATION_CLASS,
+        Buffer: *mut PVOID,
+    ) -> NTSTATUS;
+    fn SamSetInformationGroup(
+        GroupHandle: SAM_HANDLE,
+        GroupInformationClass: GROUP_INFORMATION_CLASS,
+        Buffer: PVOID,
+    ) -> NTSTATUS;
+    fn SamAddMemberToGroup(
+        GroupHandle: SAM_HANDLE,
+        MemberId: ULONG,
+        Attributes: ULONG,
+    ) -> NTSTATUS;
+    fn SamRemoveMemberFromGroup(
+        GroupHandle: SAM_HANDLE,
+        MemberId: ULONG,
+    ) -> NTSTATUS;
+    fn SamGetMembersInGroup(
+        GroupHandle: SAM_HANDLE,
+        MemberIds: *mut PULONG,
+        Attributes: *mut PULONG,
+        MemberCount: PULONG,
+    ) -> NTSTATUS;
+    fn SamSetMemberAttributesOfGroup(
+        GroupHandle: SAM_HANDLE,
+        MemberId: ULONG,
+        Attributes: ULONG,
+    ) -> NTSTATUS;
+}}
+pub const ALIAS_ADD_MEMBER: ACCESS_MASK = 0x0001;
+pub const ALIAS_REMOVE_MEMBER: ACCESS_MASK = 0x0002;
+pub const ALIAS_LIST_MEMBERS: ACCESS_MASK = 0x0004;
+pub const ALIAS_READ_INFORMATION: ACCESS_MASK = 0x0008;
+pub const ALIAS_WRITE_ACCOUNT: ACCESS_MASK = 0x0010;
+pub const ALIAS_ALL_ACCESS: ACCESS_MASK = STANDARD_RIGHTS_REQUIRED | ALIAS_READ_INFORMATION
+    | ALIAS_WRITE_ACCOUNT | ALIAS_LIST_MEMBERS | ALIAS_ADD_MEMBER | ALIAS_REMOVE_MEMBER;
+pub const ALIAS_READ: ACCESS_MASK = STANDARD_RIGHTS_READ | ALIAS_LIST_MEMBERS;
+pub const ALIAS_WRITE: ACCESS_MASK =
+    STANDARD_RIGHTS_WRITE | ALIAS_WRITE_ACCOUNT | ALIAS_ADD_MEMBER | ALIAS_REMOVE_MEMBER;
+pub const ALIAS_EXECUTE: ACCESS_MASK = STANDARD_RIGHTS_EXECUTE | ALIAS_READ_INFORMATION;
+ENUM!{enum ALIAS_INFORMATION_CLASS {
+    AliasGeneralInformation = 1,
+    AliasNameInformation = 2,
+    AliasAdminCommentInformation = 3,
+    AliasReplicationInformation = 4,
+    AliasExtendedInformation = 5,
+}}
+STRUCT!{struct ALIAS_GENERAL_INFORMATION {
+    Name: UNICODE_STRING,
+    MemberCount: ULONG,
+    AdminComment: UNICODE_STRING,
+}}
+pub type PALIAS_GENERAL_INFORMATION = *mut ALIAS_GENERAL_INFORMATION;
+STRUCT!{struct ALIAS_NAME_INFORMATION {
+    Name: UNICODE_STRING,
+}}
+pub type PALIAS_NAME_INFORMATION = *mut ALIAS_NAME_INFORMATION;
+STRUCT!{struct ALIAS_ADM_COMMENT_INFORMATION {
+    AdminComment: UNICODE_STRING,
+}}
+pub type PALIAS_ADM_COMMENT_INFORMATION = *mut ALIAS_ADM_COMMENT_INFORMATION;
+pub const ALIAS_ALL_NAME: ULONG = 0x00000001;
+pub const ALIAS_ALL_MEMBER_COUNT: ULONG = 0x00000002;
+pub const ALIAS_ALL_ADMIN_COMMENT: ULONG = 0x00000004;
+pub const ALIAS_ALL_SHELL_ADMIN_OBJECT_PROPERTIES: ULONG = 0x00000008;
+STRUCT!{struct ALIAS_EXTENDED_INFORMATION {
+    WhichFields: ULONG,
+    ShellAdminObjectProperties: SAM_SHELL_OBJECT_PROPERTIES,
+}}
+pub type PALIAS_EXTENDED_INFORMATION = *mut ALIAS_EXTENDED_INFORMATION;
+EXTERN!{extern "system" {
+    fn SamEnumerateAliasesInDomain(
+        DomainHandle: SAM_HANDLE,
+        EnumerationContext: PSAM_ENUMERATE_HANDLE,
+        Buffer: *mut PVOID,
+        PreferedMaximumLength: ULONG,
+        CountReturned: PULONG,
+    ) -> NTSTATUS;
+    fn SamCreateAliasInDomain(
+        DomainHandle: SAM_HANDLE,
+        AccountName: PUNICODE_STRING,
+        DesiredAccess: ACCESS_MASK,
+        AliasHandle: PSAM_HANDLE,
+        RelativeId: PULONG,
+    ) -> NTSTATUS;
+    fn SamOpenAlias(
+        DomainHandle: SAM_HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        AliasId: ULONG,
+        AliasHandle: PSAM_HANDLE,
+    ) -> NTSTATUS;
+    fn SamDeleteAlias(
+        AliasHandle: SAM_HANDLE,
+    ) -> NTSTATUS;
+    fn SamQueryInformationAlias(
+        AliasHandle: SAM_HANDLE,
+        AliasInformationClass: ALIAS_INFORMATION_CLASS,
+        Buffer: *mut PVOID,
+    ) -> NTSTATUS;
+    fn SamSetInformationAlias(
+        AliasHandle: SAM_HANDLE,
+        AliasInformationClass: ALIAS_INFORMATION_CLASS,
+        Buffer: PVOID,
+    ) -> NTSTATUS;
+    fn SamAddMemberToAlias(
+        AliasHandle: SAM_HANDLE,
+        MemberId: PSID,
+    ) -> NTSTATUS;
+    fn SamAddMultipleMembersToAlias(
+        AliasHandle: SAM_HANDLE,
+        MemberIds: *mut PSID,
+        MemberCount: ULONG,
+    ) -> NTSTATUS;
+    fn SamRemoveMemberFromAlias(
+        AliasHandle: SAM_HANDLE,
+        MemberId: PSID,
+    ) -> NTSTATUS;
+    fn SamRemoveMultipleMembersFromAlias(
+        AliasHandle: SAM_HANDLE,
+        MemberIds: *mut PSID,
+        MemberCount: ULONG,
+    ) -> NTSTATUS;
+    fn SamGetMembersInAlias(
+        AliasHandle: SAM_HANDLE,
+        MemberIds: *mut *mut PSID,
+        MemberCount: PULONG,
+    ) -> NTSTATUS;
+    fn SamGetAliasMembership(
+        DomainHandle: SAM_HANDLE,
+        PassedCount: ULONG,
+        Sids: *mut PSID,
+        MembershipCount: PULONG,
+        Aliases: *mut PULONG,
+    ) -> NTSTATUS;
+}}
+pub const GROUP_TYPE_BUILTIN_LOCAL_GROUP: u32 = 0x00000001;
+pub const GROUP_TYPE_ACCOUNT_GROUP: u32 = 0x00000002;
+pub const GROUP_TYPE_RESOURCE_GROUP: u32 = 0x00000004;
+pub const GROUP_TYPE_UNIVERSAL_GROUP: u32 = 0x00000008;
+pub const GROUP_TYPE_APP_BASIC_GROUP: u32 = 0x00000010;
+pub const GROUP_TYPE_APP_QUERY_GROUP: u32 = 0x00000020;
+pub const GROUP_TYPE_SECURITY_ENABLED: u32 = 0x80000000;
+pub const GROUP_TYPE_RESOURCE_BEHAVOIR: u32 =
+    GROUP_TYPE_RESOURCE_GROUP | GROUP_TYPE_APP_BASIC_GROUP | GROUP_TYPE_APP_QUERY_GROUP;
+pub const USER_READ_GENERAL: DWORD = 0x0001;
+pub const USER_READ_PREFERENCES: DWORD = 0x0002;
+pub const USER_WRITE_PREFERENCES: DWORD = 0x0004;
+pub const USER_READ_LOGON: DWORD = 0x0008;
+pub const USER_READ_ACCOUNT: DWORD = 0x0010;
+pub const USER_WRITE_ACCOUNT: DWORD = 0x0020;
+pub const USER_CHANGE_PASSWORD: DWORD = 0x0040;
+pub const USER_FORCE_PASSWORD_CHANGE: DWORD = 0x0080;
+pub const USER_LIST_GROUPS: DWORD = 0x0100;
+pub const USER_READ_GROUP_INFORMATION: DWORD = 0x0200;
+pub const USER_WRITE_GROUP_INFORMATION: DWORD = 0x0400;
+pub const USER_ALL_ACCESS: DWORD = STANDARD_RIGHTS_REQUIRED | USER_READ_PREFERENCES
+    | USER_READ_LOGON | USER_LIST_GROUPS | USER_READ_GROUP_INFORMATION | USER_WRITE_PREFERENCES
+    | USER_CHANGE_PASSWORD | USER_FORCE_PASSWORD_CHANGE | USER_READ_GENERAL | USER_READ_ACCOUNT
+    | USER_WRITE_ACCOUNT | USER_WRITE_GROUP_INFORMATION;
+pub const USER_READ: DWORD = STANDARD_RIGHTS_READ | USER_READ_PREFERENCES | USER_READ_LOGON
+    | USER_READ_ACCOUNT | USER_LIST_GROUPS | USER_READ_GROUP_INFORMATION;
+pub const USER_WRITE: DWORD =
+    STANDARD_RIGHTS_WRITE | USER_WRITE_PREFERENCES | USER_CHANGE_PASSWORD;
+pub const USER_EXECUTE: DWORD = STANDARD_RIGHTS_EXECUTE | USER_READ_GENERAL | USER_CHANGE_PASSWORD;
+ENUM!{enum USER_INFORMATION_CLASS {
+    UserGeneralInformation = 1,
+    UserPreferencesInformation = 2,
+    UserLogonInformation = 3,
+    UserLogonHoursInformation = 4,
+    UserAccountInformation = 5,
+    UserNameInformation = 6,
+    UserAccountNameInformation = 7,
+    UserFullNameInformation = 8,
+    UserPrimaryGroupInformation = 9,
+    UserHomeInformation = 10,
+    UserScriptInformation = 11,
+    UserProfileInformation = 12,
+    UserAdminCommentInformation = 13,
+    UserWorkStationsInformation = 14,
+    UserSetPasswordInformation = 15,
+    UserControlInformation = 16,
+    UserExpiresInformation = 17,
+    UserInternal1Information = 18,
+    UserInternal2Information = 19,
+    UserParametersInformation = 20,
+    UserAllInformation = 21,
+    UserInternal3Information = 22,
+    UserInternal4Information = 23,
+    UserInternal5Information = 24,
+    UserInternal4InformationNew = 25,
+    UserInternal5InformationNew = 26,
+    UserInternal6Information = 27,
+    UserExtendedInformation = 28,
+    UserLogonUIInformation = 29,
+}}
+pub type PUSER_INFORMATION_CLASS = *mut USER_INFORMATION_CLASS;
+pub const USER_ALL_USERNAME: ULONG = 0x00000001;
+pub const USER_ALL_FULLNAME: ULONG = 0x00000002;
+pub const USER_ALL_USERID: ULONG = 0x00000004;
+pub const USER_ALL_PRIMARYGROUPID: ULONG = 0x00000008;
+pub const USER_ALL_ADMINCOMMENT: ULONG = 0x00000010;
+pub const USER_ALL_USERCOMMENT: ULONG = 0x00000020;
+pub const USER_ALL_HOMEDIRECTORY: ULONG = 0x00000040;
+pub const USER_ALL_HOMEDIRECTORYDRIVE: ULONG = 0x00000080;
+pub const USER_ALL_SCRIPTPATH: ULONG = 0x00000100;
+pub const USER_ALL_PROFILEPATH: ULONG = 0x00000200;
+pub const USER_ALL_WORKSTATIONS: ULONG = 0x00000400;
+pub const USER_ALL_LASTLOGON: ULONG = 0x00000800;
+pub const USER_ALL_LASTLOGOFF: ULONG = 0x00001000;
+pub const USER_ALL_LOGONHOURS: ULONG = 0x00002000;
+pub const USER_ALL_BADPASSWORDCOUNT: ULONG = 0x00004000;
+pub const USER_ALL_LOGONCOUNT: ULONG = 0x00008000;
+pub const USER_ALL_PASSWORDCANCHANGE: ULONG = 0x00010000;
+pub const USER_ALL_PASSWORDMUSTCHANGE: ULONG = 0x00020000;
+pub const USER_ALL_PASSWORDLASTSET: ULONG = 0x00040000;
+pub const USER_ALL_ACCOUNTEXPIRES: ULONG = 0x00080000;
+pub const USER_ALL_USERACCOUNTCONTROL: ULONG = 0x00100000;
+pub const USER_ALL_PARAMETERS: ULONG = 0x00200000;
+pub const USER_ALL_COUNTRYCODE: ULONG = 0x00400000;
+pub const USER_ALL_CODEPAGE: ULONG = 0x00800000;
+pub const USER_ALL_NTPASSWORDPRESENT: ULONG = 0x01000000;
+pub const USER_ALL_LMPASSWORDPRESENT: ULONG = 0x02000000;
+pub const USER_ALL_PRIVATEDATA: ULONG = 0x04000000;
+pub const USER_ALL_PASSWORDEXPIRED: ULONG = 0x08000000;
+pub const USER_ALL_SECURITYDESCRIPTOR: ULONG = 0x10000000;
+pub const USER_ALL_OWFPASSWORD: ULONG = 0x20000000;
+pub const USER_ALL_UNDEFINED_MASK: ULONG = 0xc0000000;
+pub const USER_ALL_READ_GENERAL_MASK: ULONG = USER_ALL_USERNAME | USER_ALL_FULLNAME
+    | USER_ALL_USERID | USER_ALL_PRIMARYGROUPID | USER_ALL_ADMINCOMMENT | USER_ALL_USERCOMMENT;
+pub const USER_ALL_READ_LOGON_MASK: ULONG = USER_ALL_HOMEDIRECTORY | USER_ALL_HOMEDIRECTORYDRIVE
+    | USER_ALL_SCRIPTPATH | USER_ALL_PROFILEPATH | USER_ALL_WORKSTATIONS | USER_ALL_LASTLOGON
+    | USER_ALL_LASTLOGOFF | USER_ALL_LOGONHOURS | USER_ALL_BADPASSWORDCOUNT | USER_ALL_LOGONCOUNT
+    | USER_ALL_PASSWORDCANCHANGE | USER_ALL_PASSWORDMUSTCHANGE;
+pub const USER_ALL_READ_ACCOUNT_MASK: ULONG = USER_ALL_PASSWORDLASTSET | USER_ALL_ACCOUNTEXPIRES
+    | USER_ALL_USERACCOUNTCONTROL | USER_ALL_PARAMETERS;
+pub const USER_ALL_READ_PREFERENCES_MASK: ULONG = USER_ALL_COUNTRYCODE | USER_ALL_CODEPAGE;
+pub const USER_ALL_READ_TRUSTED_MASK: ULONG = USER_ALL_NTPASSWORDPRESENT
+    | USER_ALL_LMPASSWORDPRESENT | USER_ALL_PASSWORDEXPIRED | USER_ALL_SECURITYDESCRIPTOR
+    | USER_ALL_PRIVATEDATA;
+pub const USER_ALL_READ_CANT_MASK: ULONG = USER_ALL_UNDEFINED_MASK;
+pub const USER_ALL_WRITE_ACCOUNT_MASK: ULONG = USER_ALL_USERNAME | USER_ALL_FULLNAME
+    | USER_ALL_PRIMARYGROUPID | USER_ALL_HOMEDIRECTORY | USER_ALL_HOMEDIRECTORYDRIVE
+    | USER_ALL_SCRIPTPATH | USER_ALL_PROFILEPATH | USER_ALL_ADMINCOMMENT | USER_ALL_WORKSTATIONS
+    | USER_ALL_LOGONHOURS | USER_ALL_ACCOUNTEXPIRES | USER_ALL_USERACCOUNTCONTROL
+    | USER_ALL_PARAMETERS;
+pub const USER_ALL_WRITE_PREFERENCES_MASK: ULONG =
+    USER_ALL_USERCOMMENT | USER_ALL_COUNTRYCODE | USER_ALL_CODEPAGE;
+pub const USER_ALL_WRITE_FORCE_PASSWORD_CHANGE_MASK: ULONG =
+    USER_ALL_NTPASSWORDPRESENT | USER_ALL_LMPASSWORDPRESENT | USER_ALL_PASSWORDEXPIRED;
+pub const USER_ALL_WRITE_TRUSTED_MASK: ULONG = USER_ALL_LASTLOGON | USER_ALL_LASTLOGOFF
+    | USER_ALL_BADPASSWORDCOUNT | USER_ALL_LOGONCOUNT | USER_ALL_PASSWORDLASTSET
+    | USER_ALL_SECURITYDESCRIPTOR | USER_ALL_PRIVATEDATA;
+pub const USER_ALL_WRITE_CANT_MASK: ULONG = USER_ALL_USERID | USER_ALL_PASSWORDCANCHANGE
+    | USER_ALL_PASSWORDMUSTCHANGE | USER_ALL_UNDEFINED_MASK;
+STRUCT!{struct USER_GENERAL_INFORMATION {
+    UserName: UNICODE_STRING,
+    FullName: UNICODE_STRING,
+    PrimaryGroupId: ULONG,
+    AdminComment: UNICODE_STRING,
+    UserComment: UNICODE_STRING,
+}}
+pub type PUSER_GENERAL_INFORMATION = *mut USER_GENERAL_INFORMATION;
+STRUCT!{struct USER_PREFERENCES_INFORMATION {
+    UserComment: UNICODE_STRING,
+    Reserved1: UNICODE_STRING,
+    CountryCode: USHORT,
+    CodePage: USHORT,
+}}
+pub type PUSER_PREFERENCES_INFORMATION = *mut USER_PREFERENCES_INFORMATION;
+STRUCT!{struct USER_PARAMETERS_INFORMATION {
+    Parameters: UNICODE_STRING,
+}}
+pub type PUSER_PARAMETERS_INFORMATION = *mut USER_PARAMETERS_INFORMATION;
+STRUCT!{#[repr(packed(4))] struct USER_LOGON_INFORMATION {
+    UserName: UNICODE_STRING,
+    FullName: UNICODE_STRING,
+    UserId: ULONG,
+    PrimaryGroupId: ULONG,
+    HomeDirectory: UNICODE_STRING,
+    HomeDirectoryDrive: UNICODE_STRING,
+    ScriptPath: UNICODE_STRING,
+    ProfilePath: UNICODE_STRING,
+    WorkStations: UNICODE_STRING,
+    LastLogon: LARGE_INTEGER,
+    LastLogoff: LARGE_INTEGER,
+    PasswordLastSet: LARGE_INTEGER,
+    PasswordCanChange: LARGE_INTEGER,
+    PasswordMustChange: LARGE_INTEGER,
+    LogonHours: LOGON_HOURS,
+    BadPasswordCount: USHORT,
+    LogonCount: USHORT,
+    UserAccountControl: ULONG,
+}}
+pub type PUSER_LOGON_INFORMATION = *mut USER_LOGON_INFORMATION;
+STRUCT!{#[repr(packed(4))] struct USER_ACCOUNT_INFORMATION {
+    UserName: UNICODE_STRING,
+    FullName: UNICODE_STRING,
+    UserId: ULONG,
+    PrimaryGroupId: ULONG,
+    HomeDirectory: UNICODE_STRING,
+    HomeDirectoryDrive: UNICODE_STRING,
+    ScriptPath: UNICODE_STRING,
+    ProfilePath: UNICODE_STRING,
+    AdminComment: UNICODE_STRING,
+    WorkStations: UNICODE_STRING,
+    LastLogon: LARGE_INTEGER,
+    LastLogoff: LARGE_INTEGER,
+    LogonHours: LOGON_HOURS,
+    BadPasswordCount: USHORT,
+    LogonCount: USHORT,
+    PasswordLastSet: LARGE_INTEGER,
+    AccountExpires: LARGE_INTEGER,
+    UserAccountControl: ULONG,
+}}
+pub type PUSER_ACCOUNT_INFORMATION = *mut USER_ACCOUNT_INFORMATION;
+STRUCT!{struct USER_ACCOUNT_NAME_INFORMATION {
+    UserName: UNICODE_STRING,
+}}
+pub type PUSER_ACCOUNT_NAME_INFORMATION = *mut USER_ACCOUNT_NAME_INFORMATION;
+STRUCT!{struct USER_FULL_NAME_INFORMATION {
+    FullName: UNICODE_STRING,
+}}
+pub type PUSER_FULL_NAME_INFORMATION = *mut USER_FULL_NAME_INFORMATION;
+STRUCT!{struct USER_NAME_INFORMATION {
+    UserName: UNICODE_STRING,
+    FullName: UNICODE_STRING,
+}}
+pub type PUSER_NAME_INFORMATION = *mut USER_NAME_INFORMATION;
+STRUCT!{struct USER_PRIMARY_GROUP_INFORMATION {
+    PrimaryGroupId: ULONG,
+}}
+pub type PUSER_PRIMARY_GROUP_INFORMATION = *mut USER_PRIMARY_GROUP_INFORMATION;
+STRUCT!{struct USER_HOME_INFORMATION {
+    HomeDirectory: UNICODE_STRING,
+    HomeDirectoryDrive: UNICODE_STRING,
+}}
+pub type PUSER_HOME_INFORMATION = *mut USER_HOME_INFORMATION;
+STRUCT!{struct USER_SCRIPT_INFORMATION {
+    ScriptPath: UNICODE_STRING,
+}}
+pub type PUSER_SCRIPT_INFORMATION = *mut USER_SCRIPT_INFORMATION;
+STRUCT!{struct USER_PROFILE_INFORMATION {
+    ProfilePath: UNICODE_STRING,
+}}
+pub type PUSER_PROFILE_INFORMATION = *mut USER_PROFILE_INFORMATION;
+STRUCT!{struct USER_ADMIN_COMMENT_INFORMATION {
+    AdminComment: UNICODE_STRING,
+}}
+pub type PUSER_ADMIN_COMMENT_INFORMATION = *mut USER_ADMIN_COMMENT_INFORMATION;
+STRUCT!{struct USER_WORKSTATIONS_INFORMATION {
+    WorkStations: UNICODE_STRING,
+}}
+pub type PUSER_WORKSTATIONS_INFORMATION = *mut USER_WORKSTATIONS_INFORMATION;
+STRUCT!{struct USER_SET_PASSWORD_INFORMATION {
+    Password: UNICODE_STRING,
+    PasswordExpired: BOOLEAN,
+}}
+pub type PUSER_SET_PASSWORD_INFORMATION = *mut USER_SET_PASSWORD_INFORMATION;
+STRUCT!{struct USER_CONTROL_INFORMATION {
+    UserAccountControl: ULONG,
+}}
+pub type PUSER_CONTROL_INFORMATION = *mut USER_CONTROL_INFORMATION;
+STRUCT!{struct USER_EXPIRES_INFORMATION {
+    AccountExpires: LARGE_INTEGER,
+}}
+pub type PUSER_EXPIRES_INFORMATION = *mut USER_EXPIRES_INFORMATION;
+STRUCT!{struct USER_LOGON_HOURS_INFORMATION {
+    LogonHours: LOGON_HOURS,
+}}
+pub type PUSER_LOGON_HOURS_INFORMATION = *mut USER_LOGON_HOURS_INFORMATION;
+pub type SAM_USER_TILE = SAM_BYTE_ARRAY_32K;
+pub type PSAM_USER_TILE = *mut SAM_BYTE_ARRAY_32K;
+pub const USER_EXTENDED_FIELD_USER_TILE: ULONG = 0x00001000;
+pub const USER_EXTENDED_FIELD_PASSWORD_HINT: ULONG = 0x00002000;
+pub const USER_EXTENDED_FIELD_DONT_SHOW_IN_LOGON_UI: ULONG = 0x00004000;
+pub const USER_EXTENDED_FIELD_SHELL_ADMIN_OBJECT_PROPERTIES: ULONG = 0x00008000;
+STRUCT!{struct USER_EXTENDED_INFORMATION {
+    ExtendedWhichFields: ULONG,
+    UserTile: SAM_USER_TILE,
+    PasswordHint: UNICODE_STRING,
+    DontShowInLogonUI: BOOLEAN,
+    ShellAdminObjectProperties: SAM_SHELL_OBJECT_PROPERTIES,
+}}
+pub type PUSER_EXTENDED_INFORMATION = *mut USER_EXTENDED_INFORMATION;
+STRUCT!{struct USER_LOGON_UI_INFORMATION {
+    PasswordIsBlank: BOOLEAN,
+    AccountIsDisabled: BOOLEAN,
+}}
+pub type PUSER_LOGON_UI_INFORMATION = *mut USER_LOGON_UI_INFORMATION;
+STRUCT!{struct USER_PWD_CHANGE_FAILURE_INFORMATION {
+    ExtendedFailureReason: ULONG,
+    FilterModuleName: UNICODE_STRING,
+}}
+pub type PUSER_PWD_CHANGE_FAILURE_INFORMATION = *mut USER_PWD_CHANGE_FAILURE_INFORMATION;
+pub const SAM_PWD_CHANGE_NO_ERROR: u32 = 0;
+pub const SAM_PWD_CHANGE_PASSWORD_TOO_SHORT: u32 = 1;
+pub const SAM_PWD_CHANGE_PWD_IN_HISTORY: u32 = 2;
+pub const SAM_PWD_CHANGE_USERNAME_IN_PASSWORD: u32 = 3;
+pub const SAM_PWD_CHANGE_FULLNAME_IN_PASSWORD: u32 = 4;
+pub const SAM_PWD_CHANGE_NOT_COMPLEX: u32 = 5;
+pub const SAM_PWD_CHANGE_MACHINE_PASSWORD_NOT_DEFAULT: u32 = 6;
+pub const SAM_PWD_CHANGE_FAILED_BY_FILTER: u32 = 7;
+pub const SAM_PWD_CHANGE_PASSWORD_TOO_LONG: u32 = 8;
+pub const SAM_PWD_CHANGE_FAILURE_REASON_MAX: u32 = 8;
+EXTERN!{extern "system" {
+    fn SamEnumerateUsersInDomain(
+        DomainHandle: SAM_HANDLE,
+        EnumerationContext: PSAM_ENUMERATE_HANDLE,
+        UserAccountControl: ULONG,
+        Buffer: *mut PVOID,
+        PreferedMaximumLength: ULONG,
+        CountReturned: PULONG,
+    ) -> NTSTATUS;
+    fn SamCreateUserInDomain(
+        DomainHandle: SAM_HANDLE,
+        AccountName: PUNICODE_STRING,
+        DesiredAccess: ACCESS_MASK,
+        UserHandle: PSAM_HANDLE,
+        RelativeId: PULONG,
+    ) -> NTSTATUS;
+    fn SamCreateUser2InDomain(
+        DomainHandle: SAM_HANDLE,
+        AccountName: PUNICODE_STRING,
+        AccountType: ULONG,
+        DesiredAccess: ACCESS_MASK,
+        UserHandle: PSAM_HANDLE,
+        GrantedAccess: PULONG,
+        RelativeId: PULONG,
+    ) -> NTSTATUS;
+    fn SamOpenUser(
+        DomainHandle: SAM_HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        UserId: ULONG,
+        UserHandle: PSAM_HANDLE,
+    ) -> NTSTATUS;
+    fn SamDeleteUser(
+        UserHandle: SAM_HANDLE,
+    ) -> NTSTATUS;
+    fn SamQueryInformationUser(
+        UserHandle: SAM_HANDLE,
+        UserInformationClass: USER_INFORMATION_CLASS,
+        Buffer: *mut PVOID,
+    ) -> NTSTATUS;
+    fn SamSetInformationUser(
+        UserHandle: SAM_HANDLE,
+        UserInformationClass: USER_INFORMATION_CLASS,
+        Buffer: PVOID,
+    ) -> NTSTATUS;
+    fn SamGetGroupsForUser(
+        UserHandle: SAM_HANDLE,
+        Groups: *mut PGROUP_MEMBERSHIP,
+        MembershipCount: PULONG,
+    ) -> NTSTATUS;
+    fn SamChangePasswordUser(
+        UserHandle: SAM_HANDLE,
+        OldPassword: PUNICODE_STRING,
+        NewPassword: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn SamChangePasswordUser2(
+        ServerName: PUNICODE_STRING,
+        UserName: PUNICODE_STRING,
+        OldPassword: PUNICODE_STRING,
+        NewPassword: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn SamChangePasswordUser3(
+        ServerName: PUNICODE_STRING,
+        UserName: PUNICODE_STRING,
+        OldPassword: PUNICODE_STRING,
+        NewPassword: PUNICODE_STRING,
+        EffectivePasswordPolicy: *mut PDOMAIN_PASSWORD_INFORMATION,
+        PasswordChangeFailureInfo: *mut PUSER_PWD_CHANGE_FAILURE_INFORMATION,
+    ) -> NTSTATUS;
+    fn SamQueryDisplayInformation(
+        DomainHandle: SAM_HANDLE,
+        DisplayInformation: DOMAIN_DISPLAY_INFORMATION,
+        Index: ULONG,
+        EntryCount: ULONG,
+        PreferredMaximumLength: ULONG,
+        TotalAvailable: PULONG,
+        TotalReturned: PULONG,
+        ReturnedEntryCount: PULONG,
+        SortedBuffer: *mut PVOID,
+    ) -> NTSTATUS;
+    fn SamGetDisplayEnumerationIndex(
+        DomainHandle: SAM_HANDLE,
+        DisplayInformation: DOMAIN_DISPLAY_INFORMATION,
+        Prefix: PUNICODE_STRING,
+        Index: PULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum SECURITY_DB_DELTA_TYPE {
+    SecurityDbNew = 1,
+    SecurityDbRename = 2,
+    SecurityDbDelete = 3,
+    SecurityDbChangeMemberAdd = 4,
+    SecurityDbChangeMemberSet = 5,
+    SecurityDbChangeMemberDel = 6,
+    SecurityDbChange = 7,
+    SecurityDbChangePassword = 8,
+}}
+pub type PSECURITY_DB_DELTA_TYPE = *mut SECURITY_DB_DELTA_TYPE;
+ENUM!{enum SECURITY_DB_OBJECT_TYPE {
+    SecurityDbObjectSamDomain = 1,
+    SecurityDbObjectSamUser = 2,
+    SecurityDbObjectSamGroup = 3,
+    SecurityDbObjectSamAlias = 4,
+    SecurityDbObjectLsaPolicy = 5,
+    SecurityDbObjectLsaTDomain = 6,
+    SecurityDbObjectLsaAccount = 7,
+    SecurityDbObjectLsaSecret = 8,
+}}
+pub type PSECURITY_DB_OBJECT_TYPE = *mut SECURITY_DB_OBJECT_TYPE;
+ENUM!{enum SAM_ACCOUNT_TYPE {
+    SamObjectUser = 1,
+    SamObjectGroup = 2,
+    SamObjectAlias = 3,
+}}
+pub type PSAM_ACCOUNT_TYPE = *mut SAM_ACCOUNT_TYPE;
+pub const SAM_USER_ACCOUNT: u32 = 0x00000001;
+pub const SAM_GLOBAL_GROUP_ACCOUNT: u32 = 0x00000002;
+pub const SAM_LOCAL_GROUP_ACCOUNT: u32 = 0x00000004;
+STRUCT!{struct SAM_GROUP_MEMBER_ID {
+    MemberRid: ULONG,
+}}
+pub type PSAM_GROUP_MEMBER_ID = *mut SAM_GROUP_MEMBER_ID;
+STRUCT!{struct SAM_ALIAS_MEMBER_ID {
+    MemberSid: PSID,
+}}
+pub type PSAM_ALIAS_MEMBER_ID = *mut SAM_ALIAS_MEMBER_ID;
+UNION!{union SAM_DELTA_DATA {
+    GroupMemberId: SAM_GROUP_MEMBER_ID,
+    AliasMemberId: SAM_ALIAS_MEMBER_ID,
+    AccountControl: ULONG,
+}}
+pub type PSAM_DELTA_DATA = *mut SAM_DELTA_DATA;
+FN!{stdcall PSAM_DELTA_NOTIFICATION_ROUTINE(
+    DomainSid: PSID,
+    DeltaType: SECURITY_DB_DELTA_TYPE,
+    ObjectType: SECURITY_DB_OBJECT_TYPE,
+    ObjectRid: ULONG,
+    ObjectName: PUNICODE_STRING,
+    ModifiedCount: PLARGE_INTEGER,
+    DeltaData: PSAM_DELTA_DATA,
+) -> NTSTATUS}
+pub const SAM_DELTA_NOTIFY_ROUTINE: UTF8Const = UTF8Const("DeltaNotify\0");
+EXTERN!{extern "system" {
+    fn SamRegisterObjectChangeNotification(
+        ObjectType: SECURITY_DB_OBJECT_TYPE,
+        NotificationEventHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn SamUnregisterObjectChangeNotification(
+        ObjectType: SECURITY_DB_OBJECT_TYPE,
+        NotificationEventHandle: HANDLE,
+    ) -> NTSTATUS;
+}}
+pub const SAM_SID_COMPATIBILITY_ALL: u32 = 0;
+pub const SAM_SID_COMPATIBILITY_LAX: u32 = 1;
+pub const SAM_SID_COMPATIBILITY_STRICT: u32 = 2;
+EXTERN!{extern "system" {
+    fn SamGetCompatibilityMode(
+        ObjectHandle: SAM_HANDLE,
+        Mode: *mut ULONG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum PASSWORD_POLICY_VALIDATION_TYPE {
+    SamValidateAuthentication = 1,
+    SamValidatePasswordChange = 2,
+    SamValidatePasswordReset = 3,
+}}
+STRUCT!{struct SAM_VALIDATE_PASSWORD_HASH {
+    Length: ULONG,
+    Hash: PUCHAR,
+}}
+pub type PSAM_VALIDATE_PASSWORD_HASH = *mut SAM_VALIDATE_PASSWORD_HASH;
+pub const SAM_VALIDATE_PASSWORD_LAST_SET: u32 = 0x00000001;
+pub const SAM_VALIDATE_BAD_PASSWORD_TIME: u32 = 0x00000002;
+pub const SAM_VALIDATE_LOCKOUT_TIME: u32 = 0x00000004;
+pub const SAM_VALIDATE_BAD_PASSWORD_COUNT: u32 = 0x00000008;
+pub const SAM_VALIDATE_PASSWORD_HISTORY_LENGTH: u32 = 0x00000010;
+pub const SAM_VALIDATE_PASSWORD_HISTORY: u32 = 0x00000020;
+STRUCT!{struct SAM_VALIDATE_PERSISTED_FIELDS {
+    PresentFields: ULONG,
+    PasswordLastSet: LARGE_INTEGER,
+    BadPasswordTime: LARGE_INTEGER,
+    LockoutTime: LARGE_INTEGER,
+    BadPasswordCount: ULONG,
+    PasswordHistoryLength: ULONG,
+    PasswordHistory: PSAM_VALIDATE_PASSWORD_HASH,
+}}
+pub type PSAM_VALIDATE_PERSISTED_FIELDS = *mut SAM_VALIDATE_PERSISTED_FIELDS;
+ENUM!{enum SAM_VALIDATE_VALIDATION_STATUS {
+    SamValidateSuccess = 0,
+    SamValidatePasswordMustChange = 1,
+    SamValidateAccountLockedOut = 2,
+    SamValidatePasswordExpired = 3,
+    SamValidatePasswordIncorrect = 4,
+    SamValidatePasswordIsInHistory = 5,
+    SamValidatePasswordTooShort = 6,
+    SamValidatePasswordTooLong = 7,
+    SamValidatePasswordNotComplexEnough = 8,
+    SamValidatePasswordTooRecent = 9,
+    SamValidatePasswordFilterError = 10,
+}}
+pub type PSAM_VALIDATE_VALIDATION_STATUS = *mut SAM_VALIDATE_VALIDATION_STATUS;
+STRUCT!{struct SAM_VALIDATE_STANDARD_OUTPUT_ARG {
+    ChangedPersistedFields: SAM_VALIDATE_PERSISTED_FIELDS,
+    ValidationStatus: SAM_VALIDATE_VALIDATION_STATUS,
+}}
+pub type PSAM_VALIDATE_STANDARD_OUTPUT_ARG = *mut SAM_VALIDATE_STANDARD_OUTPUT_ARG;
+STRUCT!{struct SAM_VALIDATE_AUTHENTICATION_INPUT_ARG {
+    InputPersistedFields: SAM_VALIDATE_PERSISTED_FIELDS,
+    PasswordMatched: BOOLEAN,
+}}
+pub type PSAM_VALIDATE_AUTHENTICATION_INPUT_ARG = *mut SAM_VALIDATE_AUTHENTICATION_INPUT_ARG;
+STRUCT!{struct SAM_VALIDATE_PASSWORD_CHANGE_INPUT_ARG {
+    InputPersistedFields: SAM_VALIDATE_PERSISTED_FIELDS,
+    ClearPassword: UNICODE_STRING,
+    UserAccountName: UNICODE_STRING,
+    HashedPassword: SAM_VALIDATE_PASSWORD_HASH,
+    PasswordMatch: BOOLEAN,
+}}
+pub type PSAM_VALIDATE_PASSWORD_CHANGE_INPUT_ARG = *mut SAM_VALIDATE_PASSWORD_CHANGE_INPUT_ARG;
+STRUCT!{struct SAM_VALIDATE_PASSWORD_RESET_INPUT_ARG {
+    InputPersistedFields: SAM_VALIDATE_PERSISTED_FIELDS,
+    ClearPassword: UNICODE_STRING,
+    UserAccountName: UNICODE_STRING,
+    HashedPassword: SAM_VALIDATE_PASSWORD_HASH,
+    PasswordMustChangeAtNextLogon: BOOLEAN,
+    ClearLockout: BOOLEAN,
+}}
+pub type PSAM_VALIDATE_PASSWORD_RESET_INPUT_ARG = *mut SAM_VALIDATE_PASSWORD_RESET_INPUT_ARG;
+UNION!{union SAM_VALIDATE_INPUT_ARG {
+    ValidateAuthenticationInput: SAM_VALIDATE_AUTHENTICATION_INPUT_ARG,
+    ValidatePasswordChangeInput: SAM_VALIDATE_PASSWORD_CHANGE_INPUT_ARG,
+    ValidatePasswordResetInput: SAM_VALIDATE_PASSWORD_RESET_INPUT_ARG,
+}}
+pub type PSAM_VALIDATE_INPUT_ARG = *mut SAM_VALIDATE_INPUT_ARG;
+UNION!{union SAM_VALIDATE_OUTPUT_ARG {
+    ValidateAuthenticationOutput: SAM_VALIDATE_STANDARD_OUTPUT_ARG,
+    ValidatePasswordChangeOutput: SAM_VALIDATE_STANDARD_OUTPUT_ARG,
+    ValidatePasswordResetOutput: SAM_VALIDATE_STANDARD_OUTPUT_ARG,
+}}
+pub type PSAM_VALIDATE_OUTPUT_ARG = *mut SAM_VALIDATE_OUTPUT_ARG;
+EXTERN!{extern "system" {
+    fn SamValidatePassword(
+        ServerName: PUNICODE_STRING,
+        ValidationType: PASSWORD_POLICY_VALIDATION_TYPE,
+        InputArg: PSAM_VALIDATE_INPUT_ARG,
+        OutputArg: *mut PSAM_VALIDATE_OUTPUT_ARG,
+    ) -> NTSTATUS;
+}}
+ENUM!{enum SAM_GENERIC_OPERATION_TYPE {
+    SamObjectChangeNotificationOperation = 0,
+}}
+pub type PSAM_GENERIC_OPERATION_TYPE = *mut SAM_GENERIC_OPERATION_TYPE;
+STRUCT!{struct SAM_OPERATION_OBJCHG_INPUT {
+    Register: BOOLEAN,
+    EventHandle: ULONG64,
+    ObjectType: SECURITY_DB_OBJECT_TYPE,
+    ProcessID: ULONG,
+}}
+pub type PSAM_OPERATION_OBJCHG_INPUT = *mut SAM_OPERATION_OBJCHG_INPUT;
+STRUCT!{struct SAM_OPERATION_OBJCHG_OUTPUT {
+    Reserved: ULONG,
+}}
+pub type PSAM_OPERATION_OBJCHG_OUTPUT = *mut SAM_OPERATION_OBJCHG_OUTPUT;
+UNION!{union SAM_GENERIC_OPERATION_INPUT {
+    ObjChangeIn: SAM_OPERATION_OBJCHG_INPUT,
+}}
+pub type PSAM_GENERIC_OPERATION_INPUT = *mut SAM_GENERIC_OPERATION_INPUT;
+UNION!{union SAM_GENERIC_OPERATION_OUTPUT {
+    ObjChangeOut: SAM_OPERATION_OBJCHG_OUTPUT,
+}}
+pub type PSAM_GENERIC_OPERATION_OUTPUT = *mut SAM_GENERIC_OPERATION_OUTPUT;
+EXTERN!{extern "system" {
+    fn SamPerformGenericOperation(
+        ServerName: PWSTR,
+        OperationType: SAM_GENERIC_OPERATION_TYPE,
+        OperationIn: PSAM_GENERIC_OPERATION_INPUT,
+        OperationOut: *mut PSAM_GENERIC_OPERATION_OUTPUT,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntseapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntseapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntseapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntseapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,439 @@
+use winapi::shared::basetsd::{PLONG64, PULONG64, ULONG64};
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, LONG, NTSTATUS, PBOOLEAN, PHANDLE, PLARGE_INTEGER, PLUID, PNTSTATUS,
+    POBJECT_ATTRIBUTES, PUCHAR, PULONG, PUNICODE_STRING, PVOID, ULONG, UNICODE_STRING, USHORT,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, AUDIT_EVENT_TYPE, PACCESS_MASK, PGENERIC_MAPPING, POBJECT_TYPE_LIST,
+    PPRIVILEGE_SET, PSECURITY_DESCRIPTOR, PSE_SIGNING_LEVEL, PSID, PSID_AND_ATTRIBUTES,
+    PTOKEN_DEFAULT_DACL, PTOKEN_GROUPS, PTOKEN_MANDATORY_POLICY, PTOKEN_OWNER,
+    PTOKEN_PRIMARY_GROUP, PTOKEN_PRIVILEGES, PTOKEN_SOURCE, PTOKEN_USER, SE_SIGNING_LEVEL,
+    TOKEN_INFORMATION_CLASS, TOKEN_TYPE,
+};
+pub const SE_MIN_WELL_KNOWN_PRIVILEGE: LONG = 2;
+pub const SE_CREATE_TOKEN_PRIVILEGE: LONG = 2;
+pub const SE_ASSIGNPRIMARYTOKEN_PRIVILEGE: LONG = 3;
+pub const SE_LOCK_MEMORY_PRIVILEGE: LONG = 4;
+pub const SE_INCREASE_QUOTA_PRIVILEGE: LONG = 5;
+pub const SE_MACHINE_ACCOUNT_PRIVILEGE: LONG = 6;
+pub const SE_TCB_PRIVILEGE: LONG = 7;
+pub const SE_SECURITY_PRIVILEGE: LONG = 8;
+pub const SE_TAKE_OWNERSHIP_PRIVILEGE: LONG = 9;
+pub const SE_LOAD_DRIVER_PRIVILEGE: LONG = 10;
+pub const SE_SYSTEM_PROFILE_PRIVILEGE: LONG = 11;
+pub const SE_SYSTEMTIME_PRIVILEGE: LONG = 12;
+pub const SE_PROF_SINGLE_PROCESS_PRIVILEGE: LONG = 13;
+pub const SE_INC_BASE_PRIORITY_PRIVILEGE: LONG = 14;
+pub const SE_CREATE_PAGEFILE_PRIVILEGE: LONG = 15;
+pub const SE_CREATE_PERMANENT_PRIVILEGE: LONG = 16;
+pub const SE_BACKUP_PRIVILEGE: LONG = 17;
+pub const SE_RESTORE_PRIVILEGE: LONG = 18;
+pub const SE_SHUTDOWN_PRIVILEGE: LONG = 19;
+pub const SE_DEBUG_PRIVILEGE: LONG = 20;
+pub const SE_AUDIT_PRIVILEGE: LONG = 21;
+pub const SE_SYSTEM_ENVIRONMENT_PRIVILEGE: LONG = 22;
+pub const SE_CHANGE_NOTIFY_PRIVILEGE: LONG = 23;
+pub const SE_REMOTE_SHUTDOWN_PRIVILEGE: LONG = 24;
+pub const SE_UNDOCK_PRIVILEGE: LONG = 25;
+pub const SE_SYNC_AGENT_PRIVILEGE: LONG = 26;
+pub const SE_ENABLE_DELEGATION_PRIVILEGE: LONG = 27;
+pub const SE_MANAGE_VOLUME_PRIVILEGE: LONG = 28;
+pub const SE_IMPERSONATE_PRIVILEGE: LONG = 29;
+pub const SE_CREATE_GLOBAL_PRIVILEGE: LONG = 30;
+pub const SE_TRUSTED_CREDMAN_ACCESS_PRIVILEGE: LONG = 31;
+pub const SE_RELABEL_PRIVILEGE: LONG = 32;
+pub const SE_INC_WORKING_SET_PRIVILEGE: LONG = 33;
+pub const SE_TIME_ZONE_PRIVILEGE: LONG = 34;
+pub const SE_CREATE_SYMBOLIC_LINK_PRIVILEGE: LONG = 35;
+pub const SE_DELEGATE_SESSION_USER_IMPERSONATE_PRIVILEGE: LONG = 36;
+pub const SE_MAX_WELL_KNOWN_PRIVILEGE: LONG = SE_DELEGATE_SESSION_USER_IMPERSONATE_PRIVILEGE;
+pub const TOKEN_SECURITY_ATTRIBUTE_TYPE_INVALID: USHORT = 0x00;
+pub const TOKEN_SECURITY_ATTRIBUTE_TYPE_INT64: USHORT = 0x01;
+pub const TOKEN_SECURITY_ATTRIBUTE_TYPE_UINT64: USHORT = 0x02;
+pub const TOKEN_SECURITY_ATTRIBUTE_TYPE_STRING: USHORT = 0x03;
+pub const TOKEN_SECURITY_ATTRIBUTE_TYPE_FQBN: USHORT = 0x04;
+pub const TOKEN_SECURITY_ATTRIBUTE_TYPE_SID: USHORT = 0x05;
+pub const TOKEN_SECURITY_ATTRIBUTE_TYPE_BOOLEAN: USHORT = 0x06;
+pub const TOKEN_SECURITY_ATTRIBUTE_TYPE_OCTET_STRING: USHORT = 0x10;
+pub const TOKEN_SECURITY_ATTRIBUTE_NON_INHERITABLE: USHORT = 0x0001;
+pub const TOKEN_SECURITY_ATTRIBUTE_VALUE_CASE_SENSITIVE: USHORT = 0x0002;
+pub const TOKEN_SECURITY_ATTRIBUTE_USE_FOR_DENY_ONLY: USHORT = 0x0004;
+pub const TOKEN_SECURITY_ATTRIBUTE_DISABLED_BY_DEFAULT: USHORT = 0x0008;
+pub const TOKEN_SECURITY_ATTRIBUTE_DISABLED: USHORT = 0x0010;
+pub const TOKEN_SECURITY_ATTRIBUTE_MANDATORY: USHORT = 0x0020;
+pub const TOKEN_SECURITY_ATTRIBUTE_COMPARE_IGNORE: USHORT = 0x0040;
+pub const TOKEN_SECURITY_ATTRIBUTE_VALID_FLAGS: USHORT = TOKEN_SECURITY_ATTRIBUTE_NON_INHERITABLE
+    | TOKEN_SECURITY_ATTRIBUTE_VALUE_CASE_SENSITIVE | TOKEN_SECURITY_ATTRIBUTE_USE_FOR_DENY_ONLY
+    | TOKEN_SECURITY_ATTRIBUTE_DISABLED_BY_DEFAULT | TOKEN_SECURITY_ATTRIBUTE_DISABLED
+    | TOKEN_SECURITY_ATTRIBUTE_MANDATORY;
+pub const TOKEN_SECURITY_ATTRIBUTE_CUSTOM_FLAGS: u32 = 0xffff0000;
+STRUCT!{struct TOKEN_SECURITY_ATTRIBUTE_FQBN_VALUE {
+    Version: ULONG64,
+    Name: UNICODE_STRING,
+}}
+pub type PTOKEN_SECURITY_ATTRIBUTE_FQBN_VALUE = *mut TOKEN_SECURITY_ATTRIBUTE_FQBN_VALUE;
+STRUCT!{struct TOKEN_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE {
+    pValue: PVOID,
+    ValueLength: ULONG,
+}}
+pub type PTOKEN_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE =
+    *mut TOKEN_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE;
+UNION!{union TOKEN_SECURITY_ATTRIBUTE_V1_Values {
+    pInt64: PLONG64,
+    pUint64: PULONG64,
+    pString: PUNICODE_STRING,
+    pFqbn: PTOKEN_SECURITY_ATTRIBUTE_FQBN_VALUE,
+    pOctetString: PTOKEN_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE,
+}}
+STRUCT!{struct TOKEN_SECURITY_ATTRIBUTE_V1 {
+    Name: UNICODE_STRING,
+    ValueType: USHORT,
+    Reserved: USHORT,
+    Flags: ULONG,
+    ValueCount: ULONG,
+    Values: TOKEN_SECURITY_ATTRIBUTE_V1_Values,
+}}
+pub type PTOKEN_SECURITY_ATTRIBUTE_V1 = *mut TOKEN_SECURITY_ATTRIBUTE_V1;
+pub const TOKEN_SECURITY_ATTRIBUTES_INFORMATION_VERSION_V1: USHORT = 1;
+pub const TOKEN_SECURITY_ATTRIBUTES_INFORMATION_VERSION: USHORT =
+    TOKEN_SECURITY_ATTRIBUTES_INFORMATION_VERSION_V1;
+STRUCT!{struct TOKEN_SECURITY_ATTRIBUTES_INFORMATION {
+    Version: USHORT,
+    Reserved: USHORT,
+    AttributeCount: ULONG,
+    pAttributeV1: PTOKEN_SECURITY_ATTRIBUTE_V1,
+}}
+pub type PTOKEN_SECURITY_ATTRIBUTES_INFORMATION = *mut TOKEN_SECURITY_ATTRIBUTES_INFORMATION;
+STRUCT!{struct TOKEN_PROCESS_TRUST_LEVEL {
+    TrustLevelSid: PSID,
+}}
+pub type PTOKEN_PROCESS_TRUST_LEVEL = *mut TOKEN_PROCESS_TRUST_LEVEL;
+EXTERN!{extern "system" {
+    fn NtCreateToken(
+        TokenHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TokenType: TOKEN_TYPE,
+        AuthenticationId: PLUID,
+        ExpirationTime: PLARGE_INTEGER,
+        User: PTOKEN_USER,
+        Groups: PTOKEN_GROUPS,
+        Privileges: PTOKEN_PRIVILEGES,
+        Owner: PTOKEN_OWNER,
+        PrimaryGroup: PTOKEN_PRIMARY_GROUP,
+        DefaultDacl: PTOKEN_DEFAULT_DACL,
+        TokenSource: PTOKEN_SOURCE,
+    ) -> NTSTATUS;
+    fn NtCreateLowBoxToken(
+        TokenHandle: PHANDLE,
+        ExistingTokenHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PackageSid: PSID,
+        CapabilityCount: ULONG,
+        Capabilities: PSID_AND_ATTRIBUTES,
+        HandleCount: ULONG,
+        Handles: *mut HANDLE,
+    ) -> NTSTATUS;
+    fn NtCreateTokenEx(
+        TokenHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TokenType: TOKEN_TYPE,
+        AuthenticationId: PLUID,
+        ExpirationTime: PLARGE_INTEGER,
+        User: PTOKEN_USER,
+        Groups: PTOKEN_GROUPS,
+        Privileges: PTOKEN_PRIVILEGES,
+        UserAttributes: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        DeviceAttributes: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        DeviceGroups: PTOKEN_GROUPS,
+        TokenMandatoryPolicy: PTOKEN_MANDATORY_POLICY,
+        Owner: PTOKEN_OWNER,
+        PrimaryGroup: PTOKEN_PRIMARY_GROUP,
+        DefaultDacl: PTOKEN_DEFAULT_DACL,
+        TokenSource: PTOKEN_SOURCE,
+    ) -> NTSTATUS;
+    fn NtOpenProcessToken(
+        ProcessHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        TokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtOpenProcessTokenEx(
+        ProcessHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        HandleAttributes: ULONG,
+        TokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtOpenThreadToken(
+        ThreadHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        OpenAsSelf: BOOLEAN,
+        TokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtOpenThreadTokenEx(
+        ThreadHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        OpenAsSelf: BOOLEAN,
+        HandleAttributes: ULONG,
+        TokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtDuplicateToken(
+        ExistingTokenHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        EffectiveOnly: BOOLEAN,
+        TokenType: TOKEN_TYPE,
+        NewTokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtQueryInformationToken(
+        TokenHandle: HANDLE,
+        TokenInformationClass: TOKEN_INFORMATION_CLASS,
+        TokenInformation: PVOID,
+        TokenInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationToken(
+        TokenHandle: HANDLE,
+        TokenInformationClass: TOKEN_INFORMATION_CLASS,
+        TokenInformation: PVOID,
+        TokenInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtAdjustPrivilegesToken(
+        TokenHandle: HANDLE,
+        DisableAllPrivileges: BOOLEAN,
+        NewState: PTOKEN_PRIVILEGES,
+        BufferLength: ULONG,
+        PreviousState: PTOKEN_PRIVILEGES,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtAdjustGroupsToken(
+        TokenHandle: HANDLE,
+        ResetToDefault: BOOLEAN,
+        NewState: PTOKEN_GROUPS,
+        BufferLength: ULONG,
+        PreviousState: PTOKEN_GROUPS,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtAdjustTokenClaimsAndDeviceGroups(
+        TokenHandle: HANDLE,
+        UserResetToDefault: BOOLEAN,
+        DeviceResetToDefault: BOOLEAN,
+        DeviceGroupsResetToDefault: BOOLEAN,
+        NewUserState: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        NewDeviceState: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        NewDeviceGroupsState: PTOKEN_GROUPS,
+        UserBufferLength: ULONG,
+        PreviousUserState: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        DeviceBufferLength: ULONG,
+        PreviousDeviceState: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        DeviceGroupsBufferLength: ULONG,
+        PreviousDeviceGroups: PTOKEN_GROUPS,
+        UserReturnLength: PULONG,
+        DeviceReturnLength: PULONG,
+        DeviceGroupsReturnBufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtFilterToken(
+        ExistingTokenHandle: HANDLE,
+        Flags: ULONG,
+        SidsToDisable: PTOKEN_GROUPS,
+        PrivilegesToDelete: PTOKEN_PRIVILEGES,
+        RestrictedSids: PTOKEN_GROUPS,
+        NewTokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtFilterTokenEx(
+        ExistingTokenHandle: HANDLE,
+        Flags: ULONG,
+        SidsToDisable: PTOKEN_GROUPS,
+        PrivilegesToDelete: PTOKEN_PRIVILEGES,
+        RestrictedSids: PTOKEN_GROUPS,
+        DisableUserClaimsCount: ULONG,
+        UserClaimsToDisable: PUNICODE_STRING,
+        DisableDeviceClaimsCount: ULONG,
+        DeviceClaimsToDisable: PUNICODE_STRING,
+        DeviceGroupsToDisable: PTOKEN_GROUPS,
+        RestrictedUserAttributes: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        RestrictedDeviceAttributes: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        RestrictedDeviceGroups: PTOKEN_GROUPS,
+        NewTokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn NtCompareTokens(
+        FirstTokenHandle: HANDLE,
+        SecondTokenHandle: HANDLE,
+        Equal: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtPrivilegeCheck(
+        ClientToken: HANDLE,
+        RequiredPrivileges: PPRIVILEGE_SET,
+        Result: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtImpersonateAnonymousToken(
+        ThreadHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtQuerySecurityAttributesToken(
+        TokenHandle: HANDLE,
+        Attributes: PUNICODE_STRING,
+        NumberOfAttributes: ULONG,
+        Buffer: PVOID,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtAccessCheck(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        GenericMapping: PGENERIC_MAPPING,
+        PrivilegeSet: PPRIVILEGE_SET,
+        PrivilegeSetLength: PULONG,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+    ) -> NTSTATUS;
+    fn NtAccessCheckByType(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        PrivilegeSet: PPRIVILEGE_SET,
+        PrivilegeSetLength: PULONG,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+    ) -> NTSTATUS;
+    fn NtAccessCheckByTypeResultList(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        PrivilegeSet: PPRIVILEGE_SET,
+        PrivilegeSetLength: PULONG,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+    ) -> NTSTATUS;
+    fn NtSetCachedSigningLevel(
+        Flags: ULONG,
+        InputSigningLevel: SE_SIGNING_LEVEL,
+        SourceFiles: PHANDLE,
+        SourceFileCount: ULONG,
+        TargetFile: HANDLE,
+    ) -> NTSTATUS;
+    fn NtGetCachedSigningLevel(
+        File: HANDLE,
+        Flags: PULONG,
+        SigningLevel: PSE_SIGNING_LEVEL,
+        Thumbprint: PUCHAR,
+        ThumbprintSize: PULONG,
+        ThumbprintAlgorithm: PULONG,
+    ) -> NTSTATUS;
+    fn NtAccessCheckAndAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        DesiredAccess: ACCESS_MASK,
+        GenericMapping: PGENERIC_MAPPING,
+        ObjectCreation: BOOLEAN,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtAccessCheckByTypeAndAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        DesiredAccess: ACCESS_MASK,
+        AuditType: AUDIT_EVENT_TYPE,
+        Flags: ULONG,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        ObjectCreation: BOOLEAN,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtAccessCheckByTypeResultListAndAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        DesiredAccess: ACCESS_MASK,
+        AuditType: AUDIT_EVENT_TYPE,
+        Flags: ULONG,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        ObjectCreation: BOOLEAN,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtAccessCheckByTypeResultListAndAuditAlarmByHandle(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ClientToken: HANDLE,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        DesiredAccess: ACCESS_MASK,
+        AuditType: AUDIT_EVENT_TYPE,
+        Flags: ULONG,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        ObjectCreation: BOOLEAN,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtOpenObjectAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        GrantedAccess: ACCESS_MASK,
+        Privileges: PPRIVILEGE_SET,
+        ObjectCreation: BOOLEAN,
+        AccessGranted: BOOLEAN,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn NtPrivilegeObjectAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        Privileges: PPRIVILEGE_SET,
+        AccessGranted: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtCloseObjectAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        GenerateOnClose: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtDeleteObjectAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        GenerateOnClose: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtPrivilegedServiceAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        ServiceName: PUNICODE_STRING,
+        ClientToken: HANDLE,
+        Privileges: PPRIVILEGE_SET,
+        AccessGranted: BOOLEAN,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntsmss.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntsmss.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntsmss.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntsmss.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+use crate::ntlpcapi::PPORT_MESSAGE;
+use winapi::shared::minwindef::DWORD;
+use winapi::shared::ntdef::{HANDLE, NTSTATUS, PHANDLE, PUNICODE_STRING};
+EXTERN!{extern "system" {
+    fn RtlConnectToSm(
+        ApiPortName: PUNICODE_STRING,
+        ApiPortHandle: HANDLE,
+        ProcessImageType: DWORD,
+        SmssConnection: PHANDLE,
+    ) -> NTSTATUS;
+    fn RtlSendMsgToSm(
+        ApiPortHandle: HANDLE,
+        MessageData: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/nttmapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/nttmapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/nttmapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/nttmapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,239 @@
+use winapi::shared::basetsd::ULONG_PTR;
+use winapi::shared::guiddef::LPGUID;
+use winapi::shared::ktmtypes::{NOTIFICATION_MASK, PCRM_PROTOCOL_ID, PTRANSACTION_NOTIFICATION};
+use winapi::shared::ntdef::{
+    BOOLEAN, HANDLE, NTSTATUS, PHANDLE, PLARGE_INTEGER, POBJECT_ATTRIBUTES, PULONG,
+    PUNICODE_STRING, PVOID, ULONG,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, ENLISTMENT_INFORMATION_CLASS, KTMOBJECT_TYPE, PKTMOBJECT_CURSOR,
+    RESOURCEMANAGER_INFORMATION_CLASS, TRANSACTIONMANAGER_INFORMATION_CLASS,
+    TRANSACTION_INFORMATION_CLASS,
+};
+EXTERN!{extern "system" {
+    fn NtCreateTransactionManager(
+        TmHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        LogFileName: PUNICODE_STRING,
+        CreateOptions: ULONG,
+        CommitStrength: ULONG,
+    ) -> NTSTATUS;
+    fn NtOpenTransactionManager(
+        TmHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        LogFileName: PUNICODE_STRING,
+        TmIdentity: LPGUID,
+        OpenOptions: ULONG,
+    ) -> NTSTATUS;
+    fn NtRenameTransactionManager(
+        LogFileName: PUNICODE_STRING,
+        ExistingTransactionManagerGuid: LPGUID,
+    ) -> NTSTATUS;
+    fn NtRollforwardTransactionManager(
+        TransactionManagerHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtRecoverTransactionManager(
+        TransactionManagerHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtQueryInformationTransactionManager(
+        TransactionManagerHandle: HANDLE,
+        TransactionManagerInformationClass: TRANSACTIONMANAGER_INFORMATION_CLASS,
+        TransactionManagerInformation: PVOID,
+        TransactionManagerInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationTransactionManager(
+        TmHandle: HANDLE,
+        TransactionManagerInformationClass: TRANSACTIONMANAGER_INFORMATION_CLASS,
+        TransactionManagerInformation: PVOID,
+        TransactionManagerInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtEnumerateTransactionObject(
+        RootObjectHandle: HANDLE,
+        QueryType: KTMOBJECT_TYPE,
+        ObjectCursor: PKTMOBJECT_CURSOR,
+        ObjectCursorLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtCreateTransaction(
+        TransactionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Uow: LPGUID,
+        TmHandle: HANDLE,
+        CreateOptions: ULONG,
+        IsolationLevel: ULONG,
+        IsolationFlags: ULONG,
+        Timeout: PLARGE_INTEGER,
+        Description: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn NtOpenTransaction(
+        TransactionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Uow: LPGUID,
+        TmHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtQueryInformationTransaction(
+        TransactionHandle: HANDLE,
+        TransactionInformationClass: TRANSACTION_INFORMATION_CLASS,
+        TransactionInformation: PVOID,
+        TransactionInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationTransaction(
+        TransactionHandle: HANDLE,
+        TransactionInformationClass: TRANSACTION_INFORMATION_CLASS,
+        TransactionInformation: PVOID,
+        TransactionInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtCommitTransaction(
+        TransactionHandle: HANDLE,
+        Wait: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtRollbackTransaction(
+        TransactionHandle: HANDLE,
+        Wait: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtCreateEnlistment(
+        EnlistmentHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ResourceManagerHandle: HANDLE,
+        TransactionHandle: HANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        CreateOptions: ULONG,
+        NotificationMask: NOTIFICATION_MASK,
+        EnlistmentKey: PVOID,
+    ) -> NTSTATUS;
+    fn NtOpenEnlistment(
+        EnlistmentHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ResourceManagerHandle: HANDLE,
+        EnlistmentGuid: LPGUID,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtQueryInformationEnlistment(
+        EnlistmentHandle: HANDLE,
+        EnlistmentInformationClass: ENLISTMENT_INFORMATION_CLASS,
+        EnlistmentInformation: PVOID,
+        EnlistmentInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationEnlistment(
+        EnlistmentHandle: HANDLE,
+        EnlistmentInformationClass: ENLISTMENT_INFORMATION_CLASS,
+        EnlistmentInformation: PVOID,
+        EnlistmentInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtRecoverEnlistment(
+        EnlistmentHandle: HANDLE,
+        EnlistmentKey: PVOID,
+    ) -> NTSTATUS;
+    fn NtPrePrepareEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtPrepareEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtCommitEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtRollbackEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtPrePrepareComplete(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtPrepareComplete(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtCommitComplete(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtReadOnlyEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtRollbackComplete(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtSinglePhaseReject(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtCreateResourceManager(
+        ResourceManagerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        TmHandle: HANDLE,
+        RmGuid: LPGUID,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        CreateOptions: ULONG,
+        Description: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn NtOpenResourceManager(
+        ResourceManagerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        TmHandle: HANDLE,
+        ResourceManagerGuid: LPGUID,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn NtRecoverResourceManager(
+        ResourceManagerHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn NtGetNotificationResourceManager(
+        ResourceManagerHandle: HANDLE,
+        TransactionNotification: PTRANSACTION_NOTIFICATION,
+        NotificationLength: ULONG,
+        Timeout: PLARGE_INTEGER,
+        ReturnLength: PULONG,
+        Asynchronous: ULONG,
+        AsynchronousContext: ULONG_PTR,
+    ) -> NTSTATUS;
+    fn NtQueryInformationResourceManager(
+        ResourceManagerHandle: HANDLE,
+        ResourceManagerInformationClass: RESOURCEMANAGER_INFORMATION_CLASS,
+        ResourceManagerInformation: PVOID,
+        ResourceManagerInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn NtSetInformationResourceManager(
+        ResourceManagerHandle: HANDLE,
+        ResourceManagerInformationClass: RESOURCEMANAGER_INFORMATION_CLASS,
+        ResourceManagerInformation: PVOID,
+        ResourceManagerInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn NtRegisterProtocolAddressInformation(
+        ResourceManager: HANDLE,
+        ProtocolId: PCRM_PROTOCOL_ID,
+        ProtocolInformationSize: ULONG,
+        ProtocolInformation: PVOID,
+        CreateOptions: ULONG,
+    ) -> NTSTATUS;
+    fn NtPropagationComplete(
+        ResourceManagerHandle: HANDLE,
+        RequestCookie: ULONG,
+        BufferLength: ULONG,
+        Buffer: PVOID,
+    ) -> NTSTATUS;
+    fn NtPropagationFailed(
+        ResourceManagerHandle: HANDLE,
+        RequestCookie: ULONG,
+        PropStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn NtFreezeTransactions(
+        FreezeTimeout: PLARGE_INTEGER,
+        ThawTimeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn NtThawTransactions() -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/nttp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/nttp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/nttp.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/nttp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,207 @@
+use crate::ntioapi::PIO_STATUS_BLOCK;
+use winapi::shared::ntdef::{HANDLE, LOGICAL, LONG, NTSTATUS, PLARGE_INTEGER, PVOID};
+use winapi::um::winnt::{
+    PRTL_CRITICAL_SECTION, PTP_CALLBACK_ENVIRON, PTP_CALLBACK_INSTANCE, PTP_CLEANUP_GROUP, PTP_IO,
+    PTP_POOL, PTP_POOL_STACK_INFORMATION, PTP_SIMPLE_CALLBACK, PTP_TIMER, PTP_TIMER_CALLBACK,
+    PTP_WAIT, PTP_WAIT_CALLBACK, PTP_WORK, PTP_WORK_CALLBACK,
+};
+#[repr(C)]
+pub struct TP_ALPC([u8; 0]);
+pub type PTP_ALPC = *mut TP_ALPC;
+FN!{stdcall PTP_ALPC_CALLBACK(
+    Instance: PTP_CALLBACK_INSTANCE,
+    Context: PVOID,
+    Alpc: PTP_ALPC,
+) -> ()}
+FN!{stdcall PTP_ALPC_CALLBACK_EX(
+    Instanc: PTP_CALLBACK_INSTANCE,
+    Contex: PVOID,
+    Alp: PTP_ALPC,
+    ApcContext: PVOID,
+) -> ()}
+EXTERN!{extern "system" {
+    fn TpAllocPool(
+        PoolReturn: *mut PTP_POOL,
+        Reserved: PVOID,
+    ) -> NTSTATUS;
+    fn TpReleasePool(
+        Pool: PTP_POOL,
+    );
+    fn TpSetPoolMaxThreads(
+        Pool: PTP_POOL,
+        MaxThreads: LONG,
+    );
+    fn TpSetPoolMinThreads(
+        Pool: PTP_POOL,
+        MinThreads: LONG,
+    ) -> NTSTATUS;
+    fn TpQueryPoolStackInformation(
+        Pool: PTP_POOL,
+        PoolStackInformation: PTP_POOL_STACK_INFORMATION,
+    ) -> NTSTATUS;
+    fn TpSetPoolStackInformation(
+        Pool: PTP_POOL,
+        PoolStackInformation: PTP_POOL_STACK_INFORMATION,
+    ) -> NTSTATUS;
+    fn TpAllocCleanupGroup(
+        CleanupGroupReturn: *mut PTP_CLEANUP_GROUP,
+    ) -> NTSTATUS;
+    fn TpReleaseCleanupGroup(
+        CleanupGroup: PTP_CLEANUP_GROUP,
+    );
+    fn TpReleaseCleanupGroupMembers(
+        CleanupGroup: PTP_CLEANUP_GROUP,
+        CancelPendingCallbacks: LOGICAL,
+        CleanupParameter: PVOID,
+    );
+    fn TpCallbackSetEventOnCompletion(
+        Instance: PTP_CALLBACK_INSTANCE,
+        Event: HANDLE,
+    );
+    fn TpCallbackReleaseSemaphoreOnCompletion(
+        Instance: PTP_CALLBACK_INSTANCE,
+        Semaphore: HANDLE,
+        ReleaseCount: LONG,
+    );
+    fn TpCallbackReleaseMutexOnCompletion(
+        Instance: PTP_CALLBACK_INSTANCE,
+        Mutex: HANDLE,
+    );
+    fn TpCallbackLeaveCriticalSectionOnCompletion(
+        Instance: PTP_CALLBACK_INSTANCE,
+        CriticalSection: PRTL_CRITICAL_SECTION,
+    );
+    fn TpCallbackUnloadDllOnCompletion(
+        Instance: PTP_CALLBACK_INSTANCE,
+        DllHandle: PVOID,
+    );
+    fn TpCallbackMayRunLong(
+        Instance: PTP_CALLBACK_INSTANCE,
+    ) -> NTSTATUS;
+    fn TpDisassociateCallback(
+        Instance: PTP_CALLBACK_INSTANCE,
+    );
+    fn TpSimpleTryPost(
+        Callback: PTP_SIMPLE_CALLBACK,
+        Context: PVOID,
+        CallbackEnviron: PTP_CALLBACK_ENVIRON,
+    ) -> NTSTATUS;
+    fn TpAllocWork(
+        WorkReturn: *mut PTP_WORK,
+        Callback: PTP_WORK_CALLBACK,
+        Context: PVOID,
+        CallbackEnviron: PTP_CALLBACK_ENVIRON,
+    ) -> NTSTATUS;
+    fn TpReleaseWork(
+        Work: PTP_WORK,
+    );
+    fn TpPostWork(
+        Work: PTP_WORK,
+    );
+    fn TpWaitForWork(
+        Work: PTP_WORK,
+        CancelPendingCallbacks: LOGICAL,
+    );
+    fn TpAllocTimer(
+        Timer: *mut PTP_TIMER,
+        Callback: PTP_TIMER_CALLBACK,
+        Context: PVOID,
+        CallbackEnviron: PTP_CALLBACK_ENVIRON,
+    ) -> NTSTATUS;
+    fn TpReleaseTimer(
+        Timer: PTP_TIMER,
+    );
+    fn TpSetTimer(
+        Timer: PTP_TIMER,
+        DueTime: PLARGE_INTEGER,
+        Period: LONG,
+        WindowLength: LONG,
+    );
+    fn TpIsTimerSet(
+        Timer: PTP_TIMER,
+    ) -> LOGICAL;
+    fn TpWaitForTimer(
+        Timer: PTP_TIMER,
+        CancelPendingCallbacks: LOGICAL,
+    );
+    fn TpAllocWait(
+        WaitReturn: *mut PTP_WAIT,
+        Callback: PTP_WAIT_CALLBACK,
+        Context: PVOID,
+        CallbackEnviron: PTP_CALLBACK_ENVIRON,
+    ) -> NTSTATUS;
+    fn TpReleaseWait(
+        Wait: PTP_WAIT,
+    );
+    fn TpSetWait(
+        Wait: PTP_WAIT,
+        Handle: HANDLE,
+        Timeout: PLARGE_INTEGER,
+    );
+    fn TpWaitForWait(
+        Wait: PTP_WAIT,
+        CancelPendingCallbacks: LOGICAL,
+    );
+}}
+FN!{stdcall PTP_IO_CALLBACK(
+    Instance: PTP_CALLBACK_INSTANCE,
+    Context: PVOID,
+    ApcContext: PVOID,
+    IoSB: PIO_STATUS_BLOCK,
+    Io: PTP_IO,
+) -> ()}
+EXTERN!{extern "system" {
+    fn TpAllocIoCompletion(
+        IoReturn: *mut PTP_IO,
+        File: HANDLE,
+        Callback: PTP_IO_CALLBACK,
+        Context: PVOID,
+        CallbackEnviron: PTP_CALLBACK_ENVIRON,
+    ) -> NTSTATUS;
+    fn TpReleaseIoCompletion(
+        Io: PTP_IO,
+    );
+    fn TpStartAsyncIoOperation(
+        Io: PTP_IO,
+    );
+    fn TpCancelAsyncIoOperation(
+        Io: PTP_IO,
+    );
+    fn TpWaitForIoCompletion(
+        Io: PTP_IO,
+        CancelPendingCallbacks: LOGICAL,
+    );
+    fn TpAllocAlpcCompletion(
+        AlpcReturn: *mut PTP_ALPC,
+        AlpcPort: HANDLE,
+        Callback: PTP_ALPC_CALLBACK,
+        Context: PVOID,
+        CallbackEnviron: PTP_CALLBACK_ENVIRON,
+    ) -> NTSTATUS;
+    fn TpAllocAlpcCompletionEx(
+        AlpcReturn: *mut PTP_ALPC,
+        AlpcPort: HANDLE,
+        Callback: PTP_ALPC_CALLBACK_EX,
+        Context: PVOID,
+        CallbackEnviron: PTP_CALLBACK_ENVIRON,
+    ) -> NTSTATUS;
+    fn TpReleaseAlpcCompletion(
+        Alpc: PTP_ALPC,
+    );
+    fn TpWaitForAlpcCompletion(
+        Alpc: PTP_ALPC,
+    );
+}}
+ENUM!{enum TP_TRACE_TYPE {
+    TpTraceThreadPriority = 1,
+    TpTraceThreadAffinity = 2,
+    MaxTpTraceType = 3,
+}}
+EXTERN!{extern "system" {
+    fn TpCaptureCaller(
+        Type: TP_TRACE_TYPE,
+    );
+    fn TpCheckTerminateWorker(
+        Thread: HANDLE,
+    );
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntwow64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntwow64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntwow64.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntwow64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,476 @@
+use core::mem::size_of;
+use crate::ntapi_base::CLIENT_ID32;
+use crate::ntldr::{LDR_DDAG_STATE, LDR_DLL_LOAD_REASON};
+use crate::ntpsapi::GDI_HANDLE_BUFFER32;
+use crate::ntrtl::RTL_MAX_DRIVE_LETTERS;
+use crate::string::{UTF16Const, UTF8Const};
+use winapi::shared::guiddef::GUID;
+use winapi::shared::ntdef::{
+    BOOLEAN, CHAR, LARGE_INTEGER, LCID, LIST_ENTRY32, LONG, NTSTATUS, PROCESSOR_NUMBER,
+    SINGLE_LIST_ENTRY32, STRING32, UCHAR, ULARGE_INTEGER, ULONG, ULONGLONG, UNICODE_STRING,
+    UNICODE_STRING32, USHORT, WCHAR,
+};
+use winapi::um::winnt::{FLS_MAXIMUM_AVAILABLE, NT_TIB32};
+pub const WOW64_SYSTEM_DIRECTORY: UTF8Const = UTF8Const("SysWOW64\0");
+/// "SysWOW64"
+pub const WOW64_SYSTEM_DIRECTORY_U: UTF16Const = UTF16Const(&[
+    0x0053, 0x0079, 0x0073, 0x0057, 0x004F, 0x0057, 0x0036, 0x0034, 0u16,
+]);
+pub const WOW64_X86_TAG: UTF8Const = UTF8Const(" (x86)\0");
+/// " (x86)"
+pub const WOW64_X86_TAG_U: UTF16Const = UTF16Const(&[
+    0x0020, 0x0028, 0x0078, 0x0038, 0x0036, 0x0029, 0u16,
+]);
+ENUM!{enum WOW64_SHARED_INFORMATION {
+    SharedNtdll32LdrInitializeThunk = 0,
+    SharedNtdll32KiUserExceptionDispatcher = 1,
+    SharedNtdll32KiUserApcDispatcher = 2,
+    SharedNtdll32KiUserCallbackDispatcher = 3,
+    SharedNtdll32ExpInterlockedPopEntrySListFault = 4,
+    SharedNtdll32ExpInterlockedPopEntrySListResume = 5,
+    SharedNtdll32ExpInterlockedPopEntrySListEnd = 6,
+    SharedNtdll32RtlUserThreadStart = 7,
+    SharedNtdll32pQueryProcessDebugInformationRemote = 8,
+    SharedNtdll32BaseAddress = 9,
+    SharedNtdll32LdrSystemDllInitBlock = 10,
+    Wow64SharedPageEntriesCount = 11,
+}}
+STRUCT!{struct RTL_BALANCED_NODE32_u_s {
+    Left: ULONG, // WOW64_POINTER
+    Right: ULONG, // WOW64_POINTER
+}}
+UNION!{union RTL_BALANCED_NODE32_u {
+    Children: [ULONG; 2], // WOW64_POINTER
+    s: RTL_BALANCED_NODE32_u_s,
+}}
+STRUCT!{struct RTL_BALANCED_NODE32 {
+    u: RTL_BALANCED_NODE32_u,
+    ParentValue: ULONG,
+}}
+pub type PRTL_BALANCED_NODE32 = *mut RTL_BALANCED_NODE32;
+STRUCT!{struct RTL_RB_TREE32 {
+    Root: ULONG, // WOW64_POINTER
+    Min: ULONG, // WOW64_POINTER
+}}
+pub type PRTL_RB_TREE32 = *mut RTL_RB_TREE32;
+STRUCT!{struct PEB_LDR_DATA32 {
+    Length: ULONG,
+    Initialized: BOOLEAN,
+    SsHandle: ULONG,
+    InLoadOrderModuleList: LIST_ENTRY32,
+    InMemoryOrderModuleList: LIST_ENTRY32,
+    InInitializationOrderModuleList: LIST_ENTRY32,
+    EntryInProgress: ULONG,
+    ShutdownInProgress: BOOLEAN,
+    ShutdownThreadId: ULONG,
+}}
+pub type PPEB_LDR_DATA32 = *mut PEB_LDR_DATA32;
+STRUCT!{struct LDR_SERVICE_TAG_RECORD32 {
+    Next: ULONG,
+    ServiceTag: ULONG,
+}}
+pub type PLDR_SERVICE_TAG_RECORD32 = *mut LDR_SERVICE_TAG_RECORD32;
+STRUCT!{struct LDRP_CSLIST32 {
+    Tail: ULONG, // WOW64_POINTER
+}}
+pub type PLDRP_CSLIST32 = *mut LDRP_CSLIST32;
+UNION!{union LDR_DDAG_NODE32_u {
+    Dependencies: LDRP_CSLIST32,
+    RemovalLink: SINGLE_LIST_ENTRY32,
+}}
+STRUCT!{struct LDR_DDAG_NODE32 {
+    Modules: LIST_ENTRY32,
+    ServiceTagList: ULONG, // WOW64_POINTER
+    LoadCount: ULONG,
+    LoadWhileUnloadingCount: ULONG,
+    LowestLink: ULONG,
+    u: LDR_DDAG_NODE32_u,
+    IncomingDependencies: LDRP_CSLIST32,
+    State: LDR_DDAG_STATE,
+    CondenseLink: SINGLE_LIST_ENTRY32,
+    PreorderNumber: ULONG,
+}}
+pub type PLDR_DDAG_NODE32 = *mut LDR_DDAG_NODE32;
+pub const LDR_DATA_TABLE_ENTRY_SIZE_WINXP_32: usize = 80;
+pub const LDR_DATA_TABLE_ENTRY_SIZE_WIN7_32: usize = 144;
+pub const LDR_DATA_TABLE_ENTRY_SIZE_WIN8_32: usize = 152;
+UNION!{union LDR_DATA_TABLE_ENTRY32_u1 {
+    InInitializationOrderLinks: LIST_ENTRY32,
+    InProgressLinks: LIST_ENTRY32,
+}}
+UNION!{union LDR_DATA_TABLE_ENTRY32_u2 {
+    FlagGroup: [UCHAR; 4],
+    Flags: ULONG,
+}}
+STRUCT!{struct LDR_DATA_TABLE_ENTRY32 {
+    InLoadOrderLinks: LIST_ENTRY32,
+    InMemoryOrderLinks: LIST_ENTRY32,
+    u1: LDR_DATA_TABLE_ENTRY32_u1,
+    DllBase: ULONG, // WOW64_POINTER
+    EntryPoint: ULONG, // WOW64_POINTER
+    SizeOfImage: ULONG,
+    FullDllName: UNICODE_STRING32,
+    BaseDllName: UNICODE_STRING32,
+    u2: LDR_DATA_TABLE_ENTRY32_u2,
+    ObsoleteLoadCount: USHORT,
+    TlsIndex: USHORT,
+    HashLinks: LIST_ENTRY32,
+    TimeDateStamp: ULONG,
+    EntryPointActivationContext: ULONG, // WOW64_POINTER
+    Lock: ULONG, // WOW64_POINTER
+    DdagNode: ULONG, // WOW64_POINTER
+    NodeModuleLink: LIST_ENTRY32,
+    LoadContext: ULONG, // WOW64_POINTER
+    ParentDllBase: ULONG, // WOW64_POINTER
+    SwitchBackContext: ULONG, // WOW64_POINTER
+    BaseAddressIndexNode: RTL_BALANCED_NODE32,
+    MappingInfoIndexNode: RTL_BALANCED_NODE32,
+    OriginalBase: ULONG,
+    LoadTime: LARGE_INTEGER,
+    BaseNameHashValue: ULONG,
+    LoadReason: LDR_DLL_LOAD_REASON,
+    ImplicitPathOptions: ULONG,
+    ReferenceCount: ULONG,
+    DependentLoadFlags: ULONG,
+    SigningLevel: UCHAR,
+}}
+BITFIELD!{unsafe LDR_DATA_TABLE_ENTRY32_u2 Flags: ULONG [
+    PackagedBinary set_PackagedBinary[0..1],
+    MarkedForRemoval set_MarkedForRemoval[1..2],
+    ImageDll set_ImageDll[2..3],
+    LoadNotificationsSent set_LoadNotificationsSent[3..4],
+    TelemetryEntryProcessed set_TelemetryEntryProcessed[4..5],
+    ProcessStaticImport set_ProcessStaticImport[5..6],
+    InLegacyLists set_InLegacyLists[6..7],
+    InIndexes set_InIndexes[7..8],
+    ShimDll set_ShimDll[8..9],
+    InExceptionTable set_InExceptionTable[9..10],
+    ReservedFlags1 set_ReservedFlags1[10..12],
+    LoadInProgress set_LoadInProgress[12..13],
+    LoadConfigProcessed set_LoadConfigProcessed[13..14],
+    EntryProcessed set_EntryProcessed[14..15],
+    ProtectDelayLoad set_ProtectDelayLoad[15..16],
+    ReservedFlags3 set_ReservedFlags3[16..18],
+    DontCallForThreads set_DontCallForThreads[18..19],
+    ProcessAttachCalled set_ProcessAttachCalled[19..20],
+    ProcessAttachFailed set_ProcessAttachFailed[20..21],
+    CorDeferredValidate set_CorDeferredValidate[21..22],
+    CorImage set_CorImage[22..23],
+    DontRelocate set_DontRelocate[23..24],
+    CorILOnly set_CorILOnly[24..25],
+    ReservedFlags5 set_ReservedFlags5[25..28],
+    Redirected set_Redirected[28..29],
+    ReservedFlags6 set_ReservedFlags6[29..31],
+    CompatDatabaseProcessed set_CompatDatabaseProcessed[31..32],
+]}
+pub type PLDR_DATA_TABLE_ENTRY32 = *mut LDR_DATA_TABLE_ENTRY32;
+STRUCT!{struct CURDIR32 {
+    DosPath: UNICODE_STRING32,
+    Handle: ULONG, // WOW64_POINTER
+}}
+pub type PCURDIR32 = *mut CURDIR32;
+STRUCT!{struct RTL_DRIVE_LETTER_CURDIR32 {
+    Flags: USHORT,
+    Length: USHORT,
+    TimeStamp: ULONG,
+    DosPath: STRING32,
+}}
+pub type PRTL_DRIVE_LETTER_CURDIR32 = *mut RTL_DRIVE_LETTER_CURDIR32;
+STRUCT!{struct RTL_USER_PROCESS_PARAMETERS32 {
+    MaximumLength: ULONG,
+    Length: ULONG,
+    Flags: ULONG,
+    DebugFlags: ULONG,
+    ConsoleHandle: ULONG, // WOW64_POINTER
+    ConsoleFlags: ULONG,
+    StandardInput: ULONG, // WOW64_POINTER
+    StandardOutput: ULONG, // WOW64_POINTER
+    StandardError: ULONG, // WOW64_POINTER
+    CurrentDirectory: CURDIR32,
+    DllPath: UNICODE_STRING32,
+    ImagePathName: UNICODE_STRING32,
+    CommandLine: UNICODE_STRING32,
+    Environment: ULONG, // WOW64_POINTER
+    StartingX: ULONG,
+    StartingY: ULONG,
+    CountX: ULONG,
+    CountY: ULONG,
+    CountCharsX: ULONG,
+    CountCharsY: ULONG,
+    FillAttribute: ULONG,
+    WindowFlags: ULONG,
+    ShowWindowFlags: ULONG,
+    WindowTitle: UNICODE_STRING32,
+    DesktopInfo: UNICODE_STRING32,
+    ShellInfo: UNICODE_STRING32,
+    RuntimeData: UNICODE_STRING32,
+    CurrentDirectories: [RTL_DRIVE_LETTER_CURDIR32; RTL_MAX_DRIVE_LETTERS],
+    EnvironmentSize: ULONG,
+    EnvironmentVersion: ULONG,
+    PackageDependencyData: ULONG, // WOW64_POINTER
+    ProcessGroupId: ULONG,
+    LoaderThreads: ULONG,
+}}
+pub type PRTL_USER_PROCESS_PARAMETERS32 = *mut RTL_USER_PROCESS_PARAMETERS32;
+UNION!{union PEB32_u {
+    KernelCallbackTable: ULONG, // WOW64_POINTER
+    UserSharedInfoPtr: ULONG, // WOW64_POINTER
+}}
+STRUCT!{struct PEB32 {
+    InheritedAddressSpace: BOOLEAN,
+    ReadImageFileExecOptions: BOOLEAN,
+    BeingDebugged: BOOLEAN,
+    BitField: BOOLEAN,
+    Mutant: ULONG, // WOW64_POINTER
+    ImageBaseAddress: ULONG, // WOW64_POINTER
+    Ldr: ULONG, // WOW64_POINTER
+    ProcessParameters: ULONG, // WOW64_POINTER
+    SubSystemData: ULONG, // WOW64_POINTER
+    ProcessHeap: ULONG, // WOW64_POINTER
+    FastPebLock: ULONG, // WOW64_POINTER
+    AtlThunkSListPtr: ULONG, // WOW64_POINTER
+    IFEOKey: ULONG, // WOW64_POINTER
+    CrossProcessFlags: ULONG,
+    u: PEB32_u,
+    SystemReserved: [ULONG; 1],
+    AtlThunkSListPtr32: ULONG,
+    ApiSetMap: ULONG, // WOW64_POINTER
+    TlsExpansionCounter: ULONG,
+    TlsBitmap: ULONG, // WOW64_POINTER
+    TlsBitmapBits: [ULONG; 2],
+    ReadOnlySharedMemoryBase: ULONG, // WOW64_POINTER
+    HotpatchInformation: ULONG, // WOW64_POINTER
+    ReadOnlyStaticServerData: ULONG, // WOW64_POINTER
+    AnsiCodePageData: ULONG, // WOW64_POINTER
+    OemCodePageData: ULONG, // WOW64_POINTER
+    UnicodeCaseTableData: ULONG, // WOW64_POINTER
+    NumberOfProcessors: ULONG,
+    NtGlobalFlag: ULONG,
+    CriticalSectionTimeout: LARGE_INTEGER,
+    HeapSegmentReserve: ULONG,
+    HeapSegmentCommit: ULONG,
+    HeapDeCommitTotalFreeThreshold: ULONG,
+    HeapDeCommitFreeBlockThreshold: ULONG,
+    NumberOfHeaps: ULONG,
+    MaximumNumberOfHeaps: ULONG,
+    ProcessHeaps: ULONG, // WOW64_POINTER
+    GdiSharedHandleTable: ULONG, // WOW64_POINTER
+    ProcessStarterHelper: ULONG, // WOW64_POINTER
+    GdiDCAttributeList: ULONG,
+    LoaderLock: ULONG, // WOW64_POINTER
+    OSMajorVersion: ULONG,
+    OSMinorVersion: ULONG,
+    OSBuildNumber: USHORT,
+    OSCSDVersion: USHORT,
+    OSPlatformId: ULONG,
+    ImageSubsystem: ULONG,
+    ImageSubsystemMajorVersion: ULONG,
+    ImageSubsystemMinorVersion: ULONG,
+    ActiveProcessAffinityMask: ULONG,
+    GdiHandleBuffer: GDI_HANDLE_BUFFER32,
+    PostProcessInitRoutine: ULONG, // WOW64_POINTER
+    TlsExpansionBitmap: ULONG, // WOW64_POINTER
+    TlsExpansionBitmapBits: [ULONG; 32],
+    SessionId: ULONG,
+    AppCompatFlags: ULARGE_INTEGER,
+    AppCompatFlagsUser: ULARGE_INTEGER,
+    pShimData: ULONG, // WOW64_POINTER
+    AppCompatInfo: ULONG, // WOW64_POINTER
+    CSDVersion: UNICODE_STRING32,
+    ActivationContextData: ULONG, // WOW64_POINTER
+    ProcessAssemblyStorageMap: ULONG, // WOW64_POINTER
+    SystemDefaultActivationContextData: ULONG, // WOW64_POINTER
+    SystemAssemblyStorageMap: ULONG, // WOW64_POINTER
+    MinimumStackCommit: ULONG,
+    FlsCallback: ULONG, // WOW64_POINTER
+    FlsListHead: LIST_ENTRY32,
+    FlsBitmap: ULONG, // WOW64_POINTER
+    FlsBitmapBits: [ULONG; FLS_MAXIMUM_AVAILABLE as usize / (size_of::<ULONG>() * 8)],
+    FlsHighIndex: ULONG,
+    WerRegistrationData: ULONG, // WOW64_POINTER
+    WerShipAssertPtr: ULONG, // WOW64_POINTER
+    pContextData: ULONG, // WOW64_POINTER
+    pImageHeaderHash: ULONG, // WOW64_POINTER
+    TracingFlags: ULONG,
+    CsrServerReadOnlySharedMemoryBase: ULONGLONG,
+    TppWorkerpListLock: ULONG, // WOW64_POINTER
+    TppWorkerpList: LIST_ENTRY32,
+    WaitOnAddressHashTable: [ULONG; 128], // WOW64_POINTER
+    TelemetryCoverageHeader: ULONG, // WOW64_POINTER
+    CloudFileFlags: ULONG,
+    CloudFileDiagFlags: ULONG,
+    PlaceholderCompatibilityMode: CHAR,
+    PlaceholderCompatibilityModeReserved: [CHAR; 7],
+}}
+BITFIELD!{PEB32 BitField: BOOLEAN [
+    ImageUsesLargePages set_ImageUsesLargePages[0..1],
+    IsProtectedProcess set_IsProtectedProcess[1..2],
+    IsImageDynamicallyRelocated set_IsImageDynamicallyRelocated[2..3],
+    SkipPatchingUser32Forwarders set_SkipPatchingUser32Forwarders[3..4],
+    IsPackagedProcess set_IsPackagedProcess[4..5],
+    IsAppContainer set_IsAppContainer[5..6],
+    IsProtectedProcessLight set_IsProtectedProcessLight[6..7],
+    IsLongPathAwareProcess set_IsLongPathAwareProcess[7..8],
+]}
+BITFIELD!{PEB32 CrossProcessFlags: ULONG [
+    ProcessInJob set_ProcessInJob[0..1],
+    ProcessInitializing set_ProcessInitializing[1..2],
+    ProcessUsingVEH set_ProcessUsingVEH[2..3],
+    ProcessUsingVCH set_ProcessUsingVCH[3..4],
+    ProcessUsingFTH set_ProcessUsingFTH[4..5],
+    ReservedBits0 set_ReservedBits0[5..32],
+]}
+BITFIELD!{PEB32 TracingFlags: ULONG [
+    HeapTracingEnabled set_HeapTracingEnabled[0..1],
+    CritSecTracingEnabled set_CritSecTracingEnabled[1..2],
+    LibLoaderTracingEnabled set_LibLoaderTracingEnabled[2..3],
+    SpareTracingBits set_SpareTracingBits[3..32],
+]}
+pub type PPEB32 = *mut PEB32;
+pub const GDI_BATCH_BUFFER_SIZE: usize = 310;
+STRUCT!{struct GDI_TEB_BATCH32 {
+    Offset: ULONG,
+    HDC: ULONG,
+    Buffer: [ULONG; GDI_BATCH_BUFFER_SIZE],
+}}
+pub type PGDI_TEB_BATCH32 = *mut GDI_TEB_BATCH32;
+STRUCT!{struct TEB32_u_s {
+    ReservedPad0: UCHAR,
+    ReservedPad1: UCHAR,
+    ReservedPad2: UCHAR,
+    IdealProcessor: UCHAR,
+}}
+UNION!{union TEB32_u {
+    CurrentIdealProcessor: PROCESSOR_NUMBER,
+    IdealProcessorValue: ULONG,
+    s: TEB32_u_s,
+}}
+STRUCT!{struct TEB32 {
+    NtTib: NT_TIB32,
+    EnvironmentPointer: ULONG, // WOW64_POINTER
+    ClientId: CLIENT_ID32,
+    ActiveRpcHandle: ULONG, // WOW64_POINTER
+    ThreadLocalStoragePointer: ULONG, // WOW64_POINTER
+    ProcessEnvironmentBlock: ULONG, // WOW64_POINTER
+    LastErrorValue: ULONG,
+    CountOfOwnedCriticalSections: ULONG,
+    CsrClientThread: ULONG, // WOW64_POINTER
+    Win32ThreadInfo: ULONG, // WOW64_POINTER
+    User32Reserved: [ULONG; 26],
+    UserReserved: [ULONG; 5],
+    WOW32Reserved: ULONG, // WOW64_POINTER
+    CurrentLocale: LCID,
+    FpSoftwareStatusRegister: ULONG,
+    ReservedForDebuggerInstrumentation: [ULONG; 16], // WOW64_POINTER
+    SystemReserved1: [ULONG; 36], // WOW64_POINTER
+    WorkingOnBehalfTicket: [UCHAR; 8],
+    ExceptionCode: NTSTATUS,
+    ActivationContextStackPointer: ULONG, // WOW64_POINTER
+    InstrumentationCallbackSp: ULONG,
+    InstrumentationCallbackPreviousPc: ULONG,
+    InstrumentationCallbackPreviousSp: ULONG,
+    InstrumentationCallbackDisabled: BOOLEAN,
+    SpareBytes: [UCHAR; 23],
+    TxFsContext: ULONG,
+    GdiTebBatch: GDI_TEB_BATCH32,
+    RealClientId: CLIENT_ID32,
+    GdiCachedProcessHandle: ULONG, // WOW64_POINTER
+    GdiClientPID: ULONG,
+    GdiClientTID: ULONG,
+    GdiThreadLocalInfo: ULONG, // WOW64_POINTER
+    Win32ClientInfo: [ULONG; 62],
+    glDispatchTable: [ULONG; 233], // WOW64_POINTER
+    glReserved1: [ULONG; 29], // WOW64_POINTER
+    glReserved2: ULONG, // WOW64_POINTER
+    glSectionInfo: ULONG, // WOW64_POINTER
+    glSection: ULONG, // WOW64_POINTER
+    glTable: ULONG, // WOW64_POINTER
+    glCurrentRC: ULONG, // WOW64_POINTER
+    glContext: ULONG, // WOW64_POINTER
+    LastStatusValue: NTSTATUS,
+    StaticUnicodeString: UNICODE_STRING32,
+    StaticUnicodeBuffer: [WCHAR; 261],
+    DeallocationStack: ULONG, // WOW64_POINTER
+    TlsSlots: [ULONG; 64], // WOW64_POINTER
+    TlsLinks: LIST_ENTRY32,
+    Vdm: ULONG, // WOW64_POINTER
+    ReservedForNtRpc: ULONG, // WOW64_POINTER
+    DbgSsReserved: [ULONG; 2], // WOW64_POINTER
+    HardErrorMode: ULONG,
+    Instrumentation: [ULONG; 9], // WOW64_POINTER
+    ActivityId: GUID,
+    SubProcessTag: ULONG, // WOW64_POINTER
+    PerflibData: ULONG, // WOW64_POINTER
+    EtwTraceData: ULONG, // WOW64_POINTER
+    WinSockData: ULONG, // WOW64_POINTER
+    GdiBatchCount: ULONG,
+    u: TEB32_u,
+    GuaranteedStackBytes: ULONG,
+    ReservedForPerf: ULONG, // WOW64_POINTER
+    ReservedForOle: ULONG, // WOW64_POINTER
+    WaitingOnLoaderLock: ULONG,
+    SavedPriorityState: ULONG, // WOW64_POINTER
+    ReservedForCodeCoverage: ULONG,
+    ThreadPoolData: ULONG, // WOW64_POINTER
+    TlsExpansionSlots: ULONG, // WOW64_POINTER
+    MuiGeneration: ULONG,
+    IsImpersonating: ULONG,
+    NlsCache: ULONG, // WOW64_POINTER
+    pShimData: ULONG, // WOW64_POINTER
+    HeapVirtualAffinity: USHORT,
+    LowFragHeapDataSlot: USHORT,
+    CurrentTransactionHandle: ULONG, // WOW64_POINTER
+    ActiveFrame: ULONG, // WOW64_POINTER
+    FlsData: ULONG, // WOW64_POINTER
+    PreferredLanguages: ULONG, // WOW64_POINTER
+    UserPrefLanguages: ULONG, // WOW64_POINTER
+    MergedPrefLanguages: ULONG, // WOW64_POINTER
+    MuiImpersonation: ULONG,
+    CrossTebFlags: USHORT,
+    SameTebFlags: USHORT,
+    TxnScopeEnterCallback: ULONG, // WOW64_POINTER
+    TxnScopeExitCallback: ULONG, // WOW64_POINTER
+    TxnScopeContext: ULONG, // WOW64_POINTER
+    LockCount: ULONG,
+    WowTebOffset: LONG,
+    ResourceRetValue: ULONG, // WOW64_POINTER
+    ReservedForWdf: ULONG, // WOW64_POINTER
+    ReservedForCrt: ULONGLONG,
+    EffectiveContainerId: GUID,
+}}
+BITFIELD!{TEB32 SameTebFlags: USHORT [
+    SafeThunkCall set_SafeThunkCall[0..1],
+    InDebugPrint set_InDebugPrint[1..2],
+    HasFiberData set_HasFiberData[2..3],
+    SkipThreadAttach set_SkipThreadAttach[3..4],
+    WerInShipAssertCode set_WerInShipAssertCode[4..5],
+    RanProcessInit set_RanProcessInit[5..6],
+    ClonedThread set_ClonedThread[6..7],
+    SuppressDebugMsg set_SuppressDebugMsg[7..8],
+    DisableUserStackWalk set_DisableUserStackWalk[8..9],
+    RtlExceptionAttached set_RtlExceptionAttached[9..10],
+    InitialThread set_InitialThread[10..11],
+    SessionAware set_SessionAware[11..12],
+    LoadOwner set_LoadOwner[12..13],
+    LoaderWorker set_LoaderWorker[13..14],
+    SpareSameTebBits set_SpareSameTebBits[14..16],
+]}
+pub type PTEB32 = *mut TEB32;
+#[inline]
+pub fn UStr32ToUStr(
+    Destination: &mut UNICODE_STRING,
+    Source: &UNICODE_STRING32,
+) {
+    Destination.Length = Source.Length;
+    Destination.MaximumLength = Source.MaximumLength;
+    Destination.Buffer = Source.Buffer as *mut u16;
+}
+#[inline]
+pub fn UStrToUStr32(
+    Destination: &mut UNICODE_STRING32,
+    Source: &UNICODE_STRING,
+) {
+    Destination.Length = Source.Length;
+    Destination.MaximumLength = Source.MaximumLength;
+    Destination.Buffer = Source.Buffer as u32;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntxcapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntxcapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntxcapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntxcapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,29 @@
+use winapi::shared::ntdef::{BOOLEAN, NTSTATUS, PSTR, PVOID, ULONG};
+use winapi::um::winnt::{PCONTEXT, PEXCEPTION_RECORD};
+EXTERN!{extern "system" {
+    fn RtlDispatchException(
+        ExceptionRecord: PEXCEPTION_RECORD,
+        ContextRecord: PCONTEXT,
+    ) -> BOOLEAN;
+    fn RtlRaiseStatus(
+        Status: NTSTATUS,
+    );
+    fn RtlRaiseException(
+        ExceptionRecord: PEXCEPTION_RECORD,
+    );
+    fn NtContinue(
+        ContextRecord: PCONTEXT,
+        TestAlert: BOOLEAN,
+    ) -> NTSTATUS;
+    fn NtRaiseException(
+        ExceptionRecord: PEXCEPTION_RECORD,
+        ContextRecord: PCONTEXT,
+        FirstChance: BOOLEAN,
+    ) -> NTSTATUS;
+    fn RtlAssert(
+        VoidFailedAssertion: PVOID,
+        VoidFileName: PVOID,
+        LineNumber: ULONG,
+        MutableMessage: PSTR,
+    );
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntzwapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntzwapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/ntzwapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/ntzwapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2699 @@
+use crate::ntapi_base::{PCLIENT_ID, PRTL_ATOM, RTL_ATOM};
+use crate::ntdbg::DEBUGOBJECTINFOCLASS;
+use crate::ntexapi::{
+    ATOM_INFORMATION_CLASS, EVENT_INFORMATION_CLASS, MUTANT_INFORMATION_CLASS, PBOOT_ENTRY,
+    PBOOT_OPTIONS, PCWNF_TYPE_ID, PEFI_DRIVER_ENTRY, PFILE_PATH, PT2_CANCEL_PARAMETERS,
+    PT2_SET_PARAMETERS, PTIMER_APC_ROUTINE, PWNF_CHANGE_STAMP, PWNF_DELIVERY_DESCRIPTOR,
+    SEMAPHORE_INFORMATION_CLASS, SHUTDOWN_ACTION, SYSDBG_COMMAND, SYSTEM_INFORMATION_CLASS,
+    TIMER_INFORMATION_CLASS, TIMER_SET_INFORMATION_CLASS, WNF_CHANGE_STAMP, WNF_DATA_SCOPE,
+    WNF_STATE_NAME_INFORMATION, WNF_STATE_NAME_LIFETIME, WORKERFACTORYINFOCLASS,
+};
+use crate::ntioapi::{
+    FILE_INFORMATION_CLASS, FILE_IO_COMPLETION_INFORMATION, FS_INFORMATION_CLASS,
+    IO_COMPLETION_INFORMATION_CLASS, IO_SESSION_EVENT, IO_SESSION_STATE, PFILE_BASIC_INFORMATION,
+    PFILE_IO_COMPLETION_INFORMATION, PFILE_NETWORK_OPEN_INFORMATION, PIO_APC_ROUTINE,
+    PIO_STATUS_BLOCK,
+};
+use crate::ntkeapi::KPROFILE_SOURCE;
+use crate::ntlpcapi::{
+    ALPC_HANDLE, ALPC_MESSAGE_INFORMATION_CLASS, ALPC_PORT_INFORMATION_CLASS, PALPC_CONTEXT_ATTR,
+    PALPC_DATA_VIEW_ATTR, PALPC_HANDLE, PALPC_MESSAGE_ATTRIBUTES, PALPC_PORT_ATTRIBUTES,
+    PALPC_SECURITY_ATTR, PORT_INFORMATION_CLASS, PPORT_MESSAGE, PPORT_VIEW, PREMOTE_PORT_VIEW,
+};
+use crate::ntmisc::VDMSERVICECLASS;
+use crate::ntmmapi::{
+    MEMORY_INFORMATION_CLASS, MEMORY_PARTITION_INFORMATION_CLASS, PMEMORY_RANGE_ENTRY,
+    SECTION_INFORMATION_CLASS, SECTION_INHERIT, VIRTUAL_MEMORY_INFORMATION_CLASS,
+};
+use crate::ntobapi::OBJECT_INFORMATION_CLASS;
+use crate::ntpnpapi::{PLUGPLAY_CONTROL_CLASS, PPLUGPLAY_EVENT_BLOCK};
+use crate::ntpsapi::{
+    MEMORY_RESERVE_TYPE, PINITIAL_TEB, PPS_APC_ROUTINE, PPS_ATTRIBUTE_LIST, PPS_CREATE_INFO,
+    PROCESSINFOCLASS, THREADINFOCLASS,
+};
+use crate::ntregapi::{
+    KEY_INFORMATION_CLASS, KEY_SET_INFORMATION_CLASS, KEY_VALUE_INFORMATION_CLASS,
+    PKEY_VALUE_ENTRY,
+};
+use crate::ntseapi::PTOKEN_SECURITY_ATTRIBUTES_INFORMATION;
+use winapi::shared::basetsd::{
+    KAFFINITY, PSIZE_T, PULONG64, PULONG_PTR, SIZE_T, ULONG64, ULONG_PTR,
+};
+use winapi::shared::guiddef::LPGUID;
+use winapi::shared::ktmtypes::{NOTIFICATION_MASK, PCRM_PROTOCOL_ID, PTRANSACTION_NOTIFICATION};
+use winapi::shared::ntdef::{
+    BOOLEAN, EVENT_TYPE, HANDLE, LANGID, LCID, LOGICAL, LONG, NTSTATUS, OBJECT_ATTRIBUTES,
+    PBOOLEAN, PCHAR, PCWNF_STATE_NAME, PGROUP_AFFINITY, PHANDLE, PLARGE_INTEGER, PLCID, PLONG,
+    PLUID, PNTSTATUS, POBJECT_ATTRIBUTES, PUCHAR, PULARGE_INTEGER, PULONG, PULONGLONG,
+    PUNICODE_STRING, PUSHORT, PVOID, PWNF_STATE_NAME, PWSTR, TIMER_TYPE, ULONG, USHORT, VOID,
+    WAIT_TYPE,
+};
+use winapi::um::winnt::{
+    ACCESS_MASK, AUDIT_EVENT_TYPE, ENLISTMENT_INFORMATION_CLASS, EXECUTION_STATE,
+    JOBOBJECTINFOCLASS, KTMOBJECT_TYPE, LATENCY_TIME, PACCESS_MASK, PCONTEXT, PDEVICE_POWER_STATE,
+    PEXCEPTION_RECORD, PFILE_SEGMENT_ELEMENT, PGENERIC_MAPPING, PJOB_SET_ARRAY, PKTMOBJECT_CURSOR,
+    POBJECT_TYPE_LIST, POWER_ACTION, POWER_INFORMATION_LEVEL, PPRIVILEGE_SET, PSECURITY_DESCRIPTOR,
+    PSECURITY_QUALITY_OF_SERVICE, PSE_SIGNING_LEVEL, PSID, PSID_AND_ATTRIBUTES,
+    PTOKEN_DEFAULT_DACL, PTOKEN_GROUPS, PTOKEN_MANDATORY_POLICY, PTOKEN_OWNER,
+    PTOKEN_PRIMARY_GROUP, PTOKEN_PRIVILEGES, PTOKEN_SOURCE, PTOKEN_USER,
+    RESOURCEMANAGER_INFORMATION_CLASS, SECURITY_INFORMATION, SE_SIGNING_LEVEL, SYSTEM_POWER_STATE,
+    TOKEN_INFORMATION_CLASS, TOKEN_TYPE, TRANSACTIONMANAGER_INFORMATION_CLASS,
+    TRANSACTION_INFORMATION_CLASS,
+};
+EXTERN!{extern "system" {
+    fn ZwAcceptConnectPort(
+        PortHandle: PHANDLE,
+        PortContext: PVOID,
+        ConnectionRequest: PPORT_MESSAGE,
+        AcceptConnection: BOOLEAN,
+        ServerView: PPORT_VIEW,
+        ClientView: PREMOTE_PORT_VIEW,
+    ) -> NTSTATUS;
+    fn ZwAccessCheck(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        GenericMapping: PGENERIC_MAPPING,
+        PrivilegeSet: PPRIVILEGE_SET,
+        PrivilegeSetLength: PULONG,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwAccessCheckAndAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        DesiredAccess: ACCESS_MASK,
+        GenericMapping: PGENERIC_MAPPING,
+        ObjectCreation: BOOLEAN,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwAccessCheckByType(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        PrivilegeSet: PPRIVILEGE_SET,
+        PrivilegeSetLength: PULONG,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwAccessCheckByTypeAndAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        DesiredAccess: ACCESS_MASK,
+        AuditType: AUDIT_EVENT_TYPE,
+        Flags: ULONG,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        ObjectCreation: BOOLEAN,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwAccessCheckByTypeResultList(
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        PrivilegeSet: PPRIVILEGE_SET,
+        PrivilegeSetLength: PULONG,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwAccessCheckByTypeResultListAndAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        DesiredAccess: ACCESS_MASK,
+        AuditType: AUDIT_EVENT_TYPE,
+        Flags: ULONG,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        ObjectCreation: BOOLEAN,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwAccessCheckByTypeResultListAndAuditAlarmByHandle(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ClientToken: HANDLE,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        PrincipalSelfSid: PSID,
+        DesiredAccess: ACCESS_MASK,
+        AuditType: AUDIT_EVENT_TYPE,
+        Flags: ULONG,
+        ObjectTypeList: POBJECT_TYPE_LIST,
+        ObjectTypeListLength: ULONG,
+        GenericMapping: PGENERIC_MAPPING,
+        ObjectCreation: BOOLEAN,
+        GrantedAccess: PACCESS_MASK,
+        AccessStatus: PNTSTATUS,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwAcquireCMFViewOwnership(
+        TimeStamp: PULONGLONG,
+        tokenTaken: PBOOLEAN,
+        replaceExisting: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwAddAtom(
+        AtomName: PWSTR,
+        Length: ULONG,
+        Atom: PRTL_ATOM,
+    ) -> NTSTATUS;
+    fn ZwAddAtomEx(
+        AtomName: PWSTR,
+        Length: ULONG,
+        Atom: PRTL_ATOM,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwAddBootEntry(
+        BootEntry: PBOOT_ENTRY,
+        Id: PULONG,
+    ) -> NTSTATUS;
+    fn ZwAddDriverEntry(
+        DriverEntry: PEFI_DRIVER_ENTRY,
+        Id: PULONG,
+    ) -> NTSTATUS;
+    fn ZwAdjustGroupsToken(
+        TokenHandle: HANDLE,
+        ResetToDefault: BOOLEAN,
+        NewState: PTOKEN_GROUPS,
+        BufferLength: ULONG,
+        PreviousState: PTOKEN_GROUPS,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwAdjustPrivilegesToken(
+        TokenHandle: HANDLE,
+        DisableAllPrivileges: BOOLEAN,
+        NewState: PTOKEN_PRIVILEGES,
+        BufferLength: ULONG,
+        PreviousState: PTOKEN_PRIVILEGES,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwAdjustTokenClaimsAndDeviceGroups(
+        TokenHandle: HANDLE,
+        UserResetToDefault: BOOLEAN,
+        DeviceResetToDefault: BOOLEAN,
+        DeviceGroupsResetToDefault: BOOLEAN,
+        NewUserState: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        NewDeviceState: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        NewDeviceGroupsState: PTOKEN_GROUPS,
+        UserBufferLength: ULONG,
+        PreviousUserState: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        DeviceBufferLength: ULONG,
+        PreviousDeviceState: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        DeviceGroupsBufferLength: ULONG,
+        PreviousDeviceGroups: PTOKEN_GROUPS,
+        UserReturnLength: PULONG,
+        DeviceReturnLength: PULONG,
+        DeviceGroupsReturnBufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwAlertResumeThread(
+        ThreadHandle: HANDLE,
+        PreviousSuspendCount: PULONG,
+    ) -> NTSTATUS;
+    fn ZwAlertThread(
+        ThreadHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwAlertThreadByThreadId(
+        ThreadId: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwAllocateLocallyUniqueId(
+        Luid: PLUID,
+    ) -> NTSTATUS;
+    fn ZwAllocateReserveObject(
+        MemoryReserveHandle: PHANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Type: MEMORY_RESERVE_TYPE,
+    ) -> NTSTATUS;
+    fn ZwAllocateUserPhysicalPages(
+        ProcessHandle: HANDLE,
+        NumberOfPages: PULONG_PTR,
+        UserPfnArray: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn ZwAllocateUuids(
+        Time: PULARGE_INTEGER,
+        Range: PULONG,
+        Sequence: PULONG,
+        Seed: PCHAR,
+    ) -> NTSTATUS;
+    fn ZwAllocateVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        ZeroBits: ULONG_PTR,
+        RegionSize: PSIZE_T,
+        AllocationType: ULONG,
+        Protect: ULONG,
+    ) -> NTSTATUS;
+    fn ZwAlpcAcceptConnectPort(
+        PortHandle: PHANDLE,
+        ConnectionPortHandle: HANDLE,
+        Flags: ULONG,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PortAttributes: PALPC_PORT_ATTRIBUTES,
+        PortContext: PVOID,
+        ConnectionRequest: PPORT_MESSAGE,
+        ConnectionMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        AcceptConnection: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwAlpcCancelMessage(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        MessageContext: PALPC_CONTEXT_ATTR,
+    ) -> NTSTATUS;
+    fn ZwAlpcConnectPort(
+        PortHandle: PHANDLE,
+        PortName: PUNICODE_STRING,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PortAttributes: PALPC_PORT_ATTRIBUTES,
+        Flags: ULONG,
+        RequiredServerSid: PSID,
+        ConnectionMessage: PPORT_MESSAGE,
+        BufferLength: PULONG,
+        OutMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        InMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwAlpcConnectPortEx(
+        PortHandle: PHANDLE,
+        ConnectionPortObjectAttributes: POBJECT_ATTRIBUTES,
+        ClientPortObjectAttributes: POBJECT_ATTRIBUTES,
+        PortAttributes: PALPC_PORT_ATTRIBUTES,
+        Flags: ULONG,
+        ServerSecurityRequirements: PSECURITY_DESCRIPTOR,
+        ConnectionMessage: PPORT_MESSAGE,
+        BufferLength: PSIZE_T,
+        OutMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        InMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwAlpcCreatePort(
+        PortHandle: PHANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PortAttributes: PALPC_PORT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwAlpcCreatePortSection(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        SectionHandle: HANDLE,
+        SectionSize: SIZE_T,
+        AlpcSectionHandle: PALPC_HANDLE,
+        ActualSectionSize: PSIZE_T,
+    ) -> NTSTATUS;
+    fn ZwAlpcCreateResourceReserve(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        MessageSize: SIZE_T,
+        ResourceId: PALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn ZwAlpcCreateSectionView(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ViewAttributes: PALPC_DATA_VIEW_ATTR,
+    ) -> NTSTATUS;
+    fn ZwAlpcCreateSecurityContext(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        SecurityAttribute: PALPC_SECURITY_ATTR,
+    ) -> NTSTATUS;
+    fn ZwAlpcDeletePortSection(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        SectionHandle: ALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn ZwAlpcDeleteResourceReserve(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ResourceId: ALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn ZwAlpcDeleteSectionView(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ViewBase: PVOID,
+    ) -> NTSTATUS;
+    fn ZwAlpcDeleteSecurityContext(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ContextHandle: ALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn ZwAlpcDisconnectPort(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwAlpcImpersonateClientContainerOfPort(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwAlpcImpersonateClientOfPort(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+        Flags: PVOID,
+    ) -> NTSTATUS;
+    fn ZwAlpcOpenSenderProcess(
+        ProcessHandle: PHANDLE,
+        PortHandle: HANDLE,
+        PortMessage: PPORT_MESSAGE,
+        Flags: ULONG,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwAlpcOpenSenderThread(
+        ThreadHandle: PHANDLE,
+        PortHandle: HANDLE,
+        PortMessage: PPORT_MESSAGE,
+        Flags: ULONG,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwAlpcQueryInformation(
+        PortHandle: HANDLE,
+        PortInformationClass: ALPC_PORT_INFORMATION_CLASS,
+        PortInformation: PVOID,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwAlpcQueryInformationMessage(
+        PortHandle: HANDLE,
+        PortMessage: PPORT_MESSAGE,
+        MessageInformationClass: ALPC_MESSAGE_INFORMATION_CLASS,
+        MessageInformation: PVOID,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwAlpcRevokeSecurityContext(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        ContextHandle: ALPC_HANDLE,
+    ) -> NTSTATUS;
+    fn ZwAlpcSendWaitReceivePort(
+        PortHandle: HANDLE,
+        Flags: ULONG,
+        SendMessageA: PPORT_MESSAGE,
+        SendMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        ReceiveMessage: PPORT_MESSAGE,
+        BufferLength: PSIZE_T,
+        ReceiveMessageAttributes: PALPC_MESSAGE_ATTRIBUTES,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwAlpcSetInformation(
+        PortHandle: HANDLE,
+        PortInformationClass: ALPC_PORT_INFORMATION_CLASS,
+        PortInformation: PVOID,
+        Length: ULONG,
+    ) -> NTSTATUS;
+    fn ZwAreMappedFilesTheSame(
+        File1MappedAsAnImage: PVOID,
+        File2MappedAsFile: PVOID,
+    ) -> NTSTATUS;
+    fn ZwAssignProcessToJobObject(
+        JobHandle: HANDLE,
+        ProcessHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwAssociateWaitCompletionPacket(
+        WaitCompletionPacketHandle: HANDLE,
+        IoCompletionHandle: HANDLE,
+        TargetObjectHandle: HANDLE,
+        KeyContext: PVOID,
+        ApcContext: PVOID,
+        IoStatus: NTSTATUS,
+        IoStatusInformation: ULONG_PTR,
+        AlreadySignaled: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCallbackReturn(
+        OutputBuffer: PVOID,
+        OutputLength: ULONG,
+        Status: NTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwCancelIoFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn ZwCancelIoFileEx(
+        FileHandle: HANDLE,
+        IoRequestToCancel: PIO_STATUS_BLOCK,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn ZwCancelSynchronousIoFile(
+        ThreadHandle: HANDLE,
+        IoRequestToCancel: PIO_STATUS_BLOCK,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn ZwCancelTimer(
+        TimerHandle: HANDLE,
+        CurrentState: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCancelTimer2(
+        TimerHandle: HANDLE,
+        Parameters: PT2_CANCEL_PARAMETERS,
+    ) -> NTSTATUS;
+    fn ZwCancelWaitCompletionPacket(
+        WaitCompletionPacketHandle: HANDLE,
+        RemoveSignaledPacket: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwClearEvent(
+        EventHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwClose(
+        Handle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwCloseObjectAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        GenerateOnClose: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCommitComplete(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwCommitEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwCommitTransaction(
+        TransactionHandle: HANDLE,
+        Wait: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCompactKeys(
+        Count: ULONG,
+        KeyArray: *mut HANDLE,
+    ) -> NTSTATUS;
+    fn ZwCompareObjects(
+        FirstObjectHandle: HANDLE,
+        SecondObjectHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwCompareTokens(
+        FirstTokenHandle: HANDLE,
+        SecondTokenHandle: HANDLE,
+        Equal: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCompleteConnectPort(
+        PortHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwCompressKey(
+        Key: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwConnectPort(
+        PortHandle: PHANDLE,
+        PortName: PUNICODE_STRING,
+        SecurityQos: PSECURITY_QUALITY_OF_SERVICE,
+        ClientView: PPORT_VIEW,
+        ServerView: PREMOTE_PORT_VIEW,
+        MaxMessageLength: PULONG,
+        ConnectionInformation: PVOID,
+        ConnectionInformationLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwContinue(
+        ContextRecord: PCONTEXT,
+        TestAlert: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCreateDebugObject(
+        DebugObjectHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateDirectoryObject(
+        DirectoryHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwCreateDirectoryObjectEx(
+        DirectoryHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ShadowDirectoryHandle: HANDLE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateEnlistment(
+        EnlistmentHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ResourceManagerHandle: HANDLE,
+        TransactionHandle: HANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        CreateOptions: ULONG,
+        NotificationMask: NOTIFICATION_MASK,
+        EnlistmentKey: PVOID,
+    ) -> NTSTATUS;
+    fn ZwCreateEvent(
+        EventHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        EventType: EVENT_TYPE,
+        InitialState: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCreateEventPair(
+        EventPairHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwCreateFile(
+        FileHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        AllocationSize: PLARGE_INTEGER,
+        FileAttributes: ULONG,
+        ShareAccess: ULONG,
+        CreateDisposition: ULONG,
+        CreateOptions: ULONG,
+        EaBuffer: PVOID,
+        EaLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateIRTimer(
+        TimerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+    ) -> NTSTATUS;
+    fn ZwCreateIoCompletion(
+        IoCompletionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Count: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateJobObject(
+        JobHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwCreateJobSet(
+        NumJob: ULONG,
+        UserJobSet: PJOB_SET_ARRAY,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateKey(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TitleIndex: ULONG,
+        Class: PUNICODE_STRING,
+        CreateOptions: ULONG,
+        Disposition: PULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateKeyTransacted(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TitleIndex: ULONG,
+        Class: PUNICODE_STRING,
+        CreateOptions: ULONG,
+        TransactionHandle: HANDLE,
+        Disposition: PULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateKeyedEvent(
+        KeyedEventHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateLowBoxToken(
+        TokenHandle: PHANDLE,
+        ExistingTokenHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PackageSid: PSID,
+        CapabilityCount: ULONG,
+        Capabilities: PSID_AND_ATTRIBUTES,
+        HandleCount: ULONG,
+        Handles: *mut HANDLE,
+    ) -> NTSTATUS;
+    fn ZwCreateMailslotFile(
+        FileHandle: PHANDLE,
+        DesiredAccess: ULONG,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        CreateOptions: ULONG,
+        MailslotQuota: ULONG,
+        MaximumMessageSize: ULONG,
+        ReadTimeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwCreateMutant(
+        MutantHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        InitialOwner: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCreateNamedPipeFile(
+        FileHandle: PHANDLE,
+        DesiredAccess: ULONG,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        ShareAccess: ULONG,
+        CreateDisposition: ULONG,
+        CreateOptions: ULONG,
+        NamedPipeType: ULONG,
+        ReadMode: ULONG,
+        CompletionMode: ULONG,
+        MaximumInstances: ULONG,
+        InboundQuota: ULONG,
+        OutboundQuota: ULONG,
+        DefaultTimeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwCreatePagingFile(
+        PageFileName: PUNICODE_STRING,
+        MinimumSize: PLARGE_INTEGER,
+        MaximumSize: PLARGE_INTEGER,
+        Priority: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreatePartition(
+        PartitionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        PreferredNode: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreatePort(
+        PortHandle: PHANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        MaxConnectionInfoLength: ULONG,
+        MaxMessageLength: ULONG,
+        MaxPoolUsage: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreatePrivateNamespace(
+        NamespaceHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        BoundaryDescriptor: PVOID,
+    ) -> NTSTATUS;
+    fn ZwCreateProcess(
+        ProcessHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ParentProcess: HANDLE,
+        InheritObjectTable: BOOLEAN,
+        SectionHandle: HANDLE,
+        DebugPort: HANDLE,
+        ExceptionPort: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwCreateProcessEx(
+        ProcessHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ParentProcess: HANDLE,
+        Flags: ULONG,
+        SectionHandle: HANDLE,
+        DebugPort: HANDLE,
+        ExceptionPort: HANDLE,
+        JobMemberLevel: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateProfile(
+        ProfileHandle: PHANDLE,
+        Process: HANDLE,
+        ProfileBase: PVOID,
+        ProfileSize: SIZE_T,
+        BucketSize: ULONG,
+        Buffer: PULONG,
+        BufferSize: ULONG,
+        ProfileSource: KPROFILE_SOURCE,
+        Affinity: KAFFINITY,
+    ) -> NTSTATUS;
+    fn ZwCreateProfileEx(
+        ProfileHandle: PHANDLE,
+        Process: HANDLE,
+        ProfileBase: PVOID,
+        ProfileSize: SIZE_T,
+        BucketSize: ULONG,
+        Buffer: PULONG,
+        BufferSize: ULONG,
+        ProfileSource: KPROFILE_SOURCE,
+        GroupCount: USHORT,
+        GroupAffinity: PGROUP_AFFINITY,
+    ) -> NTSTATUS;
+    fn ZwCreateResourceManager(
+        ResourceManagerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        TmHandle: HANDLE,
+        ResourceManagerGuid: LPGUID,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        CreateOptions: ULONG,
+        Description: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwCreateSection(
+        SectionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        MaximumSize: PLARGE_INTEGER,
+        SectionPageProtection: ULONG,
+        AllocationAttributes: ULONG,
+        FileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwCreateSemaphore(
+        SemaphoreHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        InitialCount: LONG,
+        MaximumCount: LONG,
+    ) -> NTSTATUS;
+    fn ZwCreateSymbolicLinkObject(
+        LinkHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        LinkTarget: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwCreateThread(
+        ThreadHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ProcessHandle: HANDLE,
+        ClientId: PCLIENT_ID,
+        ThreadContext: PCONTEXT,
+        InitialTeb: PINITIAL_TEB,
+        CreateSuspended: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwCreateThreadEx(
+        ThreadHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ProcessHandle: HANDLE,
+        StartRoutine: PVOID,
+        Argument: PVOID,
+        CreateFlags: ULONG,
+        ZeroBits: SIZE_T,
+        StackSize: SIZE_T,
+        MaximumStackSize: SIZE_T,
+        AttributeList: PPS_ATTRIBUTE_LIST,
+    ) -> NTSTATUS;
+    fn ZwCreateTimer(
+        TimerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TimerType: TIMER_TYPE,
+    ) -> NTSTATUS;
+    fn ZwCreateTimer2(
+        TimerHandle: PHANDLE,
+        Reserved1: PVOID,
+        Reserved2: PVOID,
+        Attributes: ULONG,
+        DesiredAccess: ACCESS_MASK,
+    ) -> NTSTATUS;
+    fn ZwCreateToken(
+        TokenHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TokenType: TOKEN_TYPE,
+        AuthenticationId: PLUID,
+        ExpirationTime: PLARGE_INTEGER,
+        User: PTOKEN_USER,
+        Groups: PTOKEN_GROUPS,
+        Privileges: PTOKEN_PRIVILEGES,
+        Owner: PTOKEN_OWNER,
+        PrimaryGroup: PTOKEN_PRIMARY_GROUP,
+        DefaultDacl: PTOKEN_DEFAULT_DACL,
+        TokenSource: PTOKEN_SOURCE,
+    ) -> NTSTATUS;
+    fn ZwCreateTokenEx(
+        TokenHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TokenType: TOKEN_TYPE,
+        AuthenticationId: PLUID,
+        ExpirationTime: PLARGE_INTEGER,
+        User: PTOKEN_USER,
+        Groups: PTOKEN_GROUPS,
+        Privileges: PTOKEN_PRIVILEGES,
+        UserAttributes: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        DeviceAttributes: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        DeviceGroups: PTOKEN_GROUPS,
+        TokenMandatoryPolicy: PTOKEN_MANDATORY_POLICY,
+        Owner: PTOKEN_OWNER,
+        PrimaryGroup: PTOKEN_PRIMARY_GROUP,
+        DefaultDacl: PTOKEN_DEFAULT_DACL,
+        TokenSource: PTOKEN_SOURCE,
+    ) -> NTSTATUS;
+    fn ZwCreateTransaction(
+        TransactionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Uow: LPGUID,
+        TmHandle: HANDLE,
+        CreateOptions: ULONG,
+        IsolationLevel: ULONG,
+        IsolationFlags: ULONG,
+        Timeout: PLARGE_INTEGER,
+        Description: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwCreateTransactionManager(
+        TmHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        LogFileName: PUNICODE_STRING,
+        CreateOptions: ULONG,
+        CommitStrength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateUserProcess(
+        ProcessHandle: PHANDLE,
+        ThreadHandle: PHANDLE,
+        ProcessDesiredAccess: ACCESS_MASK,
+        ThreadDesiredAccess: ACCESS_MASK,
+        ProcessObjectAttributes: POBJECT_ATTRIBUTES,
+        ThreadObjectAttributes: POBJECT_ATTRIBUTES,
+        ProcessFlags: ULONG,
+        ThreadFlags: ULONG,
+        ProcessParameters: PVOID,
+        CreateInfo: PPS_CREATE_INFO,
+        AttributeList: PPS_ATTRIBUTE_LIST,
+    ) -> NTSTATUS;
+    fn ZwCreateWaitCompletionPacket(
+        WaitCompletionPacketHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwCreateWaitablePort(
+        PortHandle: PHANDLE,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        MaxConnectionInfoLength: ULONG,
+        MaxMessageLength: ULONG,
+        MaxPoolUsage: ULONG,
+    ) -> NTSTATUS;
+    fn ZwCreateWnfStateName(
+        StateName: PWNF_STATE_NAME,
+        NameLifetime: WNF_STATE_NAME_LIFETIME,
+        DataScope: WNF_DATA_SCOPE,
+        PersistData: BOOLEAN,
+        TypeId: PCWNF_TYPE_ID,
+        MaximumStateSize: ULONG,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+    ) -> NTSTATUS;
+    fn ZwCreateWorkerFactory(
+        WorkerFactoryHandleReturn: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        CompletionPortHandle: HANDLE,
+        WorkerProcessHandle: HANDLE,
+        StartRoutine: PVOID,
+        StartParameter: PVOID,
+        MaxThreadCount: ULONG,
+        StackReserve: SIZE_T,
+        StackCommit: SIZE_T,
+    ) -> NTSTATUS;
+    fn ZwDebugActiveProcess(
+        ProcessHandle: HANDLE,
+        DebugObjectHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwDebugContinue(
+        DebugObjectHandle: HANDLE,
+        ClientId: PCLIENT_ID,
+        ContinueStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwDelayExecution(
+        Alertable: BOOLEAN,
+        DelayInterval: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwDeleteAtom(
+        Atom: RTL_ATOM,
+    ) -> NTSTATUS;
+    fn ZwDeleteBootEntry(
+        Id: ULONG,
+    ) -> NTSTATUS;
+    fn ZwDeleteDriverEntry(
+        Id: ULONG,
+    ) -> NTSTATUS;
+    fn ZwDeleteFile(
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwDeleteKey(
+        KeyHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwDeleteObjectAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        GenerateOnClose: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwDeletePrivateNamespace(
+        NamespaceHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwDeleteValueKey(
+        KeyHandle: HANDLE,
+        ValueName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwDeleteWnfStateData(
+        StateName: PCWNF_STATE_NAME,
+        ExplicitScope: *const VOID,
+    ) -> NTSTATUS;
+    fn ZwDeleteWnfStateName(
+        StateName: PCWNF_STATE_NAME,
+    ) -> NTSTATUS;
+    fn ZwDeviceIoControlFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        IoControlCode: ULONG,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        OutputBuffer: PVOID,
+        OutputBufferLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwDisableLastKnownGood() -> NTSTATUS;
+    fn ZwDisplayString(
+        String: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwDrawText(
+        String: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwDuplicateObject(
+        SourceProcessHandle: HANDLE,
+        SourceHandle: HANDLE,
+        TargetProcessHandle: HANDLE,
+        TargetHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        HandleAttributes: ULONG,
+        Options: ULONG,
+    ) -> NTSTATUS;
+    fn ZwDuplicateToken(
+        ExistingTokenHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        EffectiveOnly: BOOLEAN,
+        TokenType: TOKEN_TYPE,
+        NewTokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwEnableLastKnownGood() -> NTSTATUS;
+    fn ZwEnumerateBootEntries(
+        Buffer: PVOID,
+        BufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwEnumerateDriverEntries(
+        Buffer: PVOID,
+        BufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwEnumerateKey(
+        KeyHandle: HANDLE,
+        Index: ULONG,
+        KeyInformationClass: KEY_INFORMATION_CLASS,
+        KeyInformation: PVOID,
+        Length: ULONG,
+        ResultLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwEnumerateSystemEnvironmentValuesEx(
+        InformationClass: ULONG,
+        Buffer: PVOID,
+        BufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwEnumerateTransactionObject(
+        RootObjectHandle: HANDLE,
+        QueryType: KTMOBJECT_TYPE,
+        ObjectCursor: PKTMOBJECT_CURSOR,
+        ObjectCursorLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwEnumerateValueKey(
+        KeyHandle: HANDLE,
+        Index: ULONG,
+        KeyValueInformationClass: KEY_VALUE_INFORMATION_CLASS,
+        KeyValueInformation: PVOID,
+        Length: ULONG,
+        ResultLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwExtendSection(
+        SectionHandle: HANDLE,
+        NewSectionSize: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwFilterToken(
+        ExistingTokenHandle: HANDLE,
+        Flags: ULONG,
+        SidsToDisable: PTOKEN_GROUPS,
+        PrivilegesToDelete: PTOKEN_PRIVILEGES,
+        RestrictedSids: PTOKEN_GROUPS,
+        NewTokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwFilterTokenEx(
+        ExistingTokenHandle: HANDLE,
+        Flags: ULONG,
+        SidsToDisable: PTOKEN_GROUPS,
+        PrivilegesToDelete: PTOKEN_PRIVILEGES,
+        RestrictedSids: PTOKEN_GROUPS,
+        DisableUserClaimsCount: ULONG,
+        UserClaimsToDisable: PUNICODE_STRING,
+        DisableDeviceClaimsCount: ULONG,
+        DeviceClaimsToDisable: PUNICODE_STRING,
+        DeviceGroupsToDisable: PTOKEN_GROUPS,
+        RestrictedUserAttributes: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        RestrictedDeviceAttributes: PTOKEN_SECURITY_ATTRIBUTES_INFORMATION,
+        RestrictedDeviceGroups: PTOKEN_GROUPS,
+        NewTokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwFindAtom(
+        AtomName: PWSTR,
+        Length: ULONG,
+        Atom: PRTL_ATOM,
+    ) -> NTSTATUS;
+    fn ZwFlushBuffersFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn ZwFlushBuffersFileEx(
+        FileHandle: HANDLE,
+        Flags: ULONG,
+        Parameters: PVOID,
+        ParametersSize: ULONG,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn ZwFlushInstallUILanguage(
+        InstallUILanguage: LANGID,
+        SetComittedFlag: ULONG,
+    ) -> NTSTATUS;
+    fn ZwFlushInstructionCache(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        Length: SIZE_T,
+    ) -> NTSTATUS;
+    fn ZwFlushKey(
+        KeyHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwFlushProcessWriteBuffers();
+    fn ZwFlushWriteBuffer() -> NTSTATUS;
+    fn ZwFreeUserPhysicalPages(
+        ProcessHandle: HANDLE,
+        NumberOfPages: PULONG_PTR,
+        UserPfnArray: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn ZwFreeVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        RegionSize: PSIZE_T,
+        FreeType: ULONG,
+    ) -> NTSTATUS;
+    fn ZwFreezeRegistry(
+        TimeOutInSeconds: ULONG,
+    ) -> NTSTATUS;
+    fn ZwFreezeTransactions(
+        FreezeTimeout: PLARGE_INTEGER,
+        ThawTimeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwFsControlFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FsControlCode: ULONG,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        OutputBuffer: PVOID,
+        OutputBufferLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwGetCachedSigningLevel(
+        File: HANDLE,
+        Flags: PULONG,
+        SigningLevel: PSE_SIGNING_LEVEL,
+        Thumbprint: PUCHAR,
+        ThumbprintSize: PULONG,
+        ThumbprintAlgorithm: PULONG,
+    ) -> NTSTATUS;
+    fn ZwGetCompleteWnfStateSubscription(
+        OldDescriptorStateName: PWNF_STATE_NAME,
+        OldSubscriptionId: *mut ULONG64,
+        OldDescriptorEventMask: ULONG,
+        OldDescriptorStatus: ULONG,
+        NewDeliveryDescriptor: PWNF_DELIVERY_DESCRIPTOR,
+        DescriptorSize: ULONG,
+    ) -> NTSTATUS;
+    fn ZwGetContextThread(
+        ThreadHandle: HANDLE,
+        ThreadContext: PCONTEXT,
+    ) -> NTSTATUS;
+    fn ZwGetCurrentProcessorNumber() -> ULONG;
+    fn ZwGetDevicePowerState(
+        Device: HANDLE,
+        State: PDEVICE_POWER_STATE,
+    ) -> NTSTATUS;
+    fn ZwGetMUIRegistryInfo(
+        Flags: ULONG,
+        DataSize: PULONG,
+        Data: PVOID,
+    ) -> NTSTATUS;
+    fn ZwGetNextProcess(
+        ProcessHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        HandleAttributes: ULONG,
+        Flags: ULONG,
+        NewProcessHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwGetNextThread(
+        ProcessHandle: HANDLE,
+        ThreadHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        HandleAttributes: ULONG,
+        Flags: ULONG,
+        NewThreadHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwGetNlsSectionPtr(
+        SectionType: ULONG,
+        SectionData: ULONG,
+        ContextData: PVOID,
+        SectionPointer: *mut PVOID,
+        SectionSize: PULONG,
+    ) -> NTSTATUS;
+    fn ZwGetNotificationResourceManager(
+        ResourceManagerHandle: HANDLE,
+        TransactionNotification: PTRANSACTION_NOTIFICATION,
+        NotificationLength: ULONG,
+        Timeout: PLARGE_INTEGER,
+        ReturnLength: PULONG,
+        Asynchronous: ULONG,
+        AsynchronousContext: ULONG_PTR,
+    ) -> NTSTATUS;
+    fn ZwGetPlugPlayEvent(
+        EventHandle: HANDLE,
+        Context: PVOID,
+        EventBlock: PPLUGPLAY_EVENT_BLOCK,
+        EventBufferSize: ULONG,
+    ) -> NTSTATUS;
+    fn ZwGetWriteWatch(
+        ProcessHandle: HANDLE,
+        Flags: ULONG,
+        BaseAddress: PVOID,
+        RegionSize: SIZE_T,
+        UserAddressArray: *mut PVOID,
+        EntriesInUserAddressArray: PULONG_PTR,
+        Granularity: PULONG,
+    ) -> NTSTATUS;
+    fn ZwImpersonateAnonymousToken(
+        ThreadHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwImpersonateClientOfPort(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn ZwImpersonateThread(
+        ServerThreadHandle: HANDLE,
+        ClientThreadHandle: HANDLE,
+        SecurityQos: PSECURITY_QUALITY_OF_SERVICE,
+    ) -> NTSTATUS;
+    fn ZwInitializeNlsFiles(
+        BaseAddress: *mut PVOID,
+        DefaultLocaleId: PLCID,
+        DefaultCasingTableSize: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwInitializeRegistry(
+        BootCondition: USHORT,
+    ) -> NTSTATUS;
+    fn ZwInitiatePowerAction(
+        SystemAction: POWER_ACTION,
+        LightestSystemState: SYSTEM_POWER_STATE,
+        Flags: ULONG,
+        Asynchronous: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwIsProcessInJob(
+        ProcessHandle: HANDLE,
+        JobHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwIsSystemResumeAutomatic() -> BOOLEAN;
+    fn ZwIsUILanguageComitted() -> NTSTATUS;
+    fn ZwListenPort(
+        PortHandle: HANDLE,
+        ConnectionRequest: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn ZwLoadDriver(
+        DriverServiceName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwLoadKey(
+        TargetKey: POBJECT_ATTRIBUTES,
+        SourceFile: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwLoadKey2(
+        TargetKey: POBJECT_ATTRIBUTES,
+        SourceFile: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwLoadKeyEx(
+        TargetKey: POBJECT_ATTRIBUTES,
+        SourceFile: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+        TrustClassKey: HANDLE,
+        Event: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        RootHandle: PHANDLE,
+        IoStatus: PIO_STATUS_BLOCK,
+    ) -> NTSTATUS;
+    fn ZwLockFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        ByteOffset: PLARGE_INTEGER,
+        Length: PLARGE_INTEGER,
+        Key: ULONG,
+        FailImmediately: BOOLEAN,
+        ExclusiveLock: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwLockProductActivationKeys(
+        pPrivateVer: *mut ULONG,
+        pSafeMode: *mut ULONG,
+    ) -> NTSTATUS;
+    fn ZwLockRegistryKey(
+        KeyHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwLockVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        RegionSize: PSIZE_T,
+        MapType: ULONG,
+    ) -> NTSTATUS;
+    fn ZwMakePermanentObject(
+        Handle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwMakeTemporaryObject(
+        Handle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwManagePartition(
+        PartitionInformationClass: MEMORY_PARTITION_INFORMATION_CLASS,
+        PartitionInformation: PVOID,
+        PartitionInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwMapCMFModule(
+        What: ULONG,
+        Index: ULONG,
+        CacheIndexOut: PULONG,
+        CacheFlagsOut: PULONG,
+        ViewSizeOut: PULONG,
+        BaseAddress: *mut PVOID,
+    ) -> NTSTATUS;
+    fn ZwMapUserPhysicalPages(
+        VirtualAddress: PVOID,
+        NumberOfPages: ULONG_PTR,
+        UserPfnArray: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn ZwMapUserPhysicalPagesScatter(
+        VirtualAddresses: *mut PVOID,
+        NumberOfPages: ULONG_PTR,
+        UserPfnArray: PULONG_PTR,
+    ) -> NTSTATUS;
+    fn ZwMapViewOfSection(
+        SectionHandle: HANDLE,
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        ZeroBits: ULONG_PTR,
+        CommitSize: SIZE_T,
+        SectionOffset: PLARGE_INTEGER,
+        ViewSize: PSIZE_T,
+        InheritDisposition: SECTION_INHERIT,
+        AllocationType: ULONG,
+        Win32Protect: ULONG,
+    ) -> NTSTATUS;
+    fn ZwModifyBootEntry(
+        BootEntry: PBOOT_ENTRY,
+    ) -> NTSTATUS;
+    fn ZwModifyDriverEntry(
+        DriverEntry: PEFI_DRIVER_ENTRY,
+    ) -> NTSTATUS;
+    fn ZwNotifyChangeDirectoryFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        CompletionFilter: ULONG,
+        WatchTree: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwNotifyChangeKey(
+        KeyHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        CompletionFilter: ULONG,
+        WatchTree: BOOLEAN,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+        Asynchronous: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwNotifyChangeMultipleKeys(
+        MasterKeyHandle: HANDLE,
+        Count: ULONG,
+        SubordinateObjects: *mut OBJECT_ATTRIBUTES,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        CompletionFilter: ULONG,
+        WatchTree: BOOLEAN,
+        Buffer: PVOID,
+        BufferSize: ULONG,
+        Asynchronous: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwNotifyChangeSession(
+        SessionHandle: HANDLE,
+        ChangeSequenceNumber: ULONG,
+        ChangeTimeStamp: PLARGE_INTEGER,
+        Event: IO_SESSION_EVENT,
+        NewState: IO_SESSION_STATE,
+        PreviousState: IO_SESSION_STATE,
+        Payload: PVOID,
+        PayloadSize: ULONG,
+    ) -> NTSTATUS;
+    fn ZwOpenDirectoryObject(
+        DirectoryHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenEnlistment(
+        EnlistmentHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        RmHandle: HANDLE,
+        EnlistmentGuid: LPGUID,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenEvent(
+        EventHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenEventPair(
+        EventPairHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenFile(
+        FileHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        ShareAccess: ULONG,
+        OpenOptions: ULONG,
+    ) -> NTSTATUS;
+    fn ZwOpenIoCompletion(
+        IoCompletionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenJobObject(
+        JobHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenKey(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenKeyEx(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        OpenOptions: ULONG,
+    ) -> NTSTATUS;
+    fn ZwOpenKeyTransacted(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        TransactionHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwOpenKeyTransactedEx(
+        KeyHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        OpenOptions: ULONG,
+        TransactionHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwOpenKeyedEvent(
+        KeyedEventHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenMutant(
+        MutantHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenObjectAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ObjectTypeName: PUNICODE_STRING,
+        ObjectName: PUNICODE_STRING,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        GrantedAccess: ACCESS_MASK,
+        Privileges: PPRIVILEGE_SET,
+        ObjectCreation: BOOLEAN,
+        AccessGranted: BOOLEAN,
+        GenerateOnClose: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwOpenPartition(
+        PartitionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenPrivateNamespace(
+        NamespaceHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        BoundaryDescriptor: PVOID,
+    ) -> NTSTATUS;
+    fn ZwOpenProcess(
+        ProcessHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ClientId: PCLIENT_ID,
+    ) -> NTSTATUS;
+    fn ZwOpenProcessToken(
+        ProcessHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        TokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwOpenProcessTokenEx(
+        ProcessHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        HandleAttributes: ULONG,
+        TokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwOpenResourceManager(
+        ResourceManagerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        TmHandle: HANDLE,
+        ResourceManagerGuid: LPGUID,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenSection(
+        SectionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenSemaphore(
+        SemaphoreHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenSession(
+        SessionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenSymbolicLinkObject(
+        LinkHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenThread(
+        ThreadHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        ClientId: PCLIENT_ID,
+    ) -> NTSTATUS;
+    fn ZwOpenThreadToken(
+        ThreadHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        OpenAsSelf: BOOLEAN,
+        TokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwOpenThreadTokenEx(
+        ThreadHandle: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        OpenAsSelf: BOOLEAN,
+        HandleAttributes: ULONG,
+        TokenHandle: PHANDLE,
+    ) -> NTSTATUS;
+    fn ZwOpenTimer(
+        TimerHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwOpenTransaction(
+        TransactionHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        Uow: LPGUID,
+        TmHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwOpenTransactionManager(
+        TmHandle: PHANDLE,
+        DesiredAccess: ACCESS_MASK,
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        LogFileName: PUNICODE_STRING,
+        TmIdentity: LPGUID,
+        OpenOptions: ULONG,
+    ) -> NTSTATUS;
+    fn ZwPlugPlayControl(
+        PnPControlClass: PLUGPLAY_CONTROL_CLASS,
+        PnPControlData: PVOID,
+        PnPControlDataLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwPowerInformation(
+        InformationLevel: POWER_INFORMATION_LEVEL,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        OutputBuffer: PVOID,
+        OutputBufferLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwPrePrepareComplete(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwPrePrepareEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwPrepareComplete(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwPrepareEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwPrivilegeCheck(
+        ClientToken: HANDLE,
+        RequiredPrivileges: PPRIVILEGE_SET,
+        Result: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwPrivilegeObjectAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        HandleId: PVOID,
+        ClientToken: HANDLE,
+        DesiredAccess: ACCESS_MASK,
+        Privileges: PPRIVILEGE_SET,
+        AccessGranted: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwPrivilegedServiceAuditAlarm(
+        SubsystemName: PUNICODE_STRING,
+        ServiceName: PUNICODE_STRING,
+        ClientToken: HANDLE,
+        Privileges: PPRIVILEGE_SET,
+        AccessGranted: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwPropagationComplete(
+        ResourceManagerHandle: HANDLE,
+        RequestCookie: ULONG,
+        BufferLength: ULONG,
+        Buffer: PVOID,
+    ) -> NTSTATUS;
+    fn ZwPropagationFailed(
+        ResourceManagerHandle: HANDLE,
+        RequestCookie: ULONG,
+        PropStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwProtectVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        RegionSize: PSIZE_T,
+        NewProtect: ULONG,
+        OldProtect: PULONG,
+    ) -> NTSTATUS;
+    fn ZwPulseEvent(
+        EventHandle: HANDLE,
+        PreviousState: PLONG,
+    ) -> NTSTATUS;
+    fn ZwQueryAttributesFile(
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        FileInformation: PFILE_BASIC_INFORMATION,
+    ) -> NTSTATUS;
+    fn ZwQueryBootEntryOrder(
+        Ids: PULONG,
+        Count: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryBootOptions(
+        BootOptions: PBOOT_OPTIONS,
+        BootOptionsLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryDebugFilterState(
+        ComponentId: ULONG,
+        Level: ULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryDefaultLocale(
+        UserProfile: BOOLEAN,
+        DefaultLocaleId: PLCID,
+    ) -> NTSTATUS;
+    fn ZwQueryDefaultUILanguage(
+        DefaultUILanguageId: *mut LANGID,
+    ) -> NTSTATUS;
+    fn ZwQueryDirectoryFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FileInformation: PVOID,
+        Length: ULONG,
+        FileInformationClass: FILE_INFORMATION_CLASS,
+        ReturnSingleEntry: BOOLEAN,
+        FileName: PUNICODE_STRING,
+        RestartScan: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwQueryDirectoryObject(
+        DirectoryHandle: HANDLE,
+        Buffer: PVOID,
+        Length: ULONG,
+        ReturnSingleEntry: BOOLEAN,
+        RestartScan: BOOLEAN,
+        Context: PULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryDriverEntryOrder(
+        Ids: PULONG,
+        Count: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryEaFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        ReturnSingleEntry: BOOLEAN,
+        EaList: PVOID,
+        EaListLength: ULONG,
+        EaIndex: PULONG,
+        RestartScan: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwQueryEvent(
+        EventHandle: HANDLE,
+        EventInformationClass: EVENT_INFORMATION_CLASS,
+        EventInformation: PVOID,
+        EventInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryFullAttributesFile(
+        ObjectAttributes: POBJECT_ATTRIBUTES,
+        FileInformation: PFILE_NETWORK_OPEN_INFORMATION,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationAtom(
+        Atom: RTL_ATOM,
+        AtomInformationClass: ATOM_INFORMATION_CLASS,
+        AtomInformation: PVOID,
+        AtomInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationEnlistment(
+        EnlistmentHandle: HANDLE,
+        EnlistmentInformationClass: ENLISTMENT_INFORMATION_CLASS,
+        EnlistmentInformation: PVOID,
+        EnlistmentInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FileInformation: PVOID,
+        Length: ULONG,
+        FileInformationClass: FILE_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationJobObject(
+        JobHandle: HANDLE,
+        JobObjectInformationClass: JOBOBJECTINFOCLASS,
+        JobObjectInformation: PVOID,
+        JobObjectInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationPort(
+        PortHandle: HANDLE,
+        PortInformationClass: PORT_INFORMATION_CLASS,
+        PortInformation: PVOID,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationProcess(
+        ProcessHandle: HANDLE,
+        ProcessInformationClass: PROCESSINFOCLASS,
+        ProcessInformation: PVOID,
+        ProcessInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationResourceManager(
+        ResourceManagerHandle: HANDLE,
+        ResourceManagerInformationClass: RESOURCEMANAGER_INFORMATION_CLASS,
+        ResourceManagerInformation: PVOID,
+        ResourceManagerInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationThread(
+        ThreadHandle: HANDLE,
+        ThreadInformationClass: THREADINFOCLASS,
+        ThreadInformation: PVOID,
+        ThreadInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationToken(
+        TokenHandle: HANDLE,
+        TokenInformationClass: TOKEN_INFORMATION_CLASS,
+        TokenInformation: PVOID,
+        TokenInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationTransaction(
+        TransactionHandle: HANDLE,
+        TransactionInformationClass: TRANSACTION_INFORMATION_CLASS,
+        TransactionInformation: PVOID,
+        TransactionInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationTransactionManager(
+        TransactionManagerHandle: HANDLE,
+        TransactionManagerInformationClass: TRANSACTIONMANAGER_INFORMATION_CLASS,
+        TransactionManagerInformation: PVOID,
+        TransactionManagerInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInformationWorkerFactory(
+        WorkerFactoryHandle: HANDLE,
+        WorkerFactoryInformationClass: WORKERFACTORYINFOCLASS,
+        WorkerFactoryInformation: PVOID,
+        WorkerFactoryInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryInstallUILanguage(
+        InstallUILanguageId: *mut LANGID,
+    ) -> NTSTATUS;
+    fn ZwQueryIntervalProfile(
+        ProfileSource: KPROFILE_SOURCE,
+        Interval: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryIoCompletion(
+        IoCompletionHandle: HANDLE,
+        IoCompletionInformationClass: IO_COMPLETION_INFORMATION_CLASS,
+        IoCompletionInformation: PVOID,
+        IoCompletionInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryKey(
+        KeyHandle: HANDLE,
+        KeyInformationClass: KEY_INFORMATION_CLASS,
+        KeyInformation: PVOID,
+        Length: ULONG,
+        ResultLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryLicenseValue(
+        ValueName: PUNICODE_STRING,
+        Type: PULONG,
+        Data: PVOID,
+        DataSize: ULONG,
+        ResultDataSize: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryMultipleValueKey(
+        KeyHandle: HANDLE,
+        ValueEntries: PKEY_VALUE_ENTRY,
+        EntryCount: ULONG,
+        ValueBuffer: PVOID,
+        BufferLength: PULONG,
+        RequiredBufferLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryMutant(
+        MutantHandle: HANDLE,
+        MutantInformationClass: MUTANT_INFORMATION_CLASS,
+        MutantInformation: PVOID,
+        MutantInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryObject(
+        Handle: HANDLE,
+        ObjectInformationClass: OBJECT_INFORMATION_CLASS,
+        ObjectInformation: PVOID,
+        ObjectInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryOpenSubKeys(
+        TargetKey: POBJECT_ATTRIBUTES,
+        HandleCount: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryOpenSubKeysEx(
+        TargetKey: POBJECT_ATTRIBUTES,
+        BufferLength: ULONG,
+        Buffer: PVOID,
+        RequiredSize: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryPerformanceCounter(
+        PerformanceCounter: PLARGE_INTEGER,
+        PerformanceFrequency: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwQueryPortInformationProcess() -> NTSTATUS;
+    fn ZwQueryQuotaInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        ReturnSingleEntry: BOOLEAN,
+        SidList: PVOID,
+        SidListLength: ULONG,
+        StartSid: PSID,
+        RestartScan: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwQuerySection(
+        SectionHandle: HANDLE,
+        SectionInformationClass: SECTION_INFORMATION_CLASS,
+        SectionInformation: PVOID,
+        SectionInformationLength: SIZE_T,
+        ReturnLength: PSIZE_T,
+    ) -> NTSTATUS;
+    fn ZwQuerySecurityAttributesToken(
+        TokenHandle: HANDLE,
+        Attributes: PUNICODE_STRING,
+        NumberOfAttributes: ULONG,
+        Buffer: PVOID,
+        Length: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQuerySecurityObject(
+        Handle: HANDLE,
+        SecurityInformation: SECURITY_INFORMATION,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+        Length: ULONG,
+        LengthNeeded: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQuerySemaphore(
+        SemaphoreHandle: HANDLE,
+        SemaphoreInformationClass: SEMAPHORE_INFORMATION_CLASS,
+        SemaphoreInformation: PVOID,
+        SemaphoreInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQuerySymbolicLinkObject(
+        LinkHandle: HANDLE,
+        LinkTarget: PUNICODE_STRING,
+        ReturnedLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQuerySystemEnvironmentValue(
+        VariableName: PUNICODE_STRING,
+        VariableValue: PWSTR,
+        ValueLength: USHORT,
+        ReturnLength: PUSHORT,
+    ) -> NTSTATUS;
+    fn ZwQuerySystemEnvironmentValueEx(
+        VariableName: PUNICODE_STRING,
+        VendorGuid: LPGUID,
+        Value: PVOID,
+        ValueLength: PULONG,
+        Attributes: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQuerySystemInformation(
+        SystemInformationClass: SYSTEM_INFORMATION_CLASS,
+        SystemInformation: PVOID,
+        SystemInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQuerySystemInformationEx(
+        SystemInformationClass: SYSTEM_INFORMATION_CLASS,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        SystemInformation: PVOID,
+        SystemInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQuerySystemTime(
+        SystemTime: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwQueryTimer(
+        TimerHandle: HANDLE,
+        TimerInformationClass: TIMER_INFORMATION_CLASS,
+        TimerInformation: PVOID,
+        TimerInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryTimerResolution(
+        MaximumTime: PULONG,
+        MinimumTime: PULONG,
+        CurrentTime: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryValueKey(
+        KeyHandle: HANDLE,
+        ValueName: PUNICODE_STRING,
+        KeyValueInformationClass: KEY_VALUE_INFORMATION_CLASS,
+        KeyValueInformation: PVOID,
+        Length: ULONG,
+        ResultLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        MemoryInformationClass: MEMORY_INFORMATION_CLASS,
+        MemoryInformation: PVOID,
+        MemoryInformationLength: SIZE_T,
+        ReturnLength: PSIZE_T,
+    ) -> NTSTATUS;
+    fn ZwQueryVolumeInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FsInformation: PVOID,
+        Length: ULONG,
+        FsInformationClass: FS_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn ZwQueryWnfStateData(
+        StateName: PCWNF_STATE_NAME,
+        TypeId: PCWNF_TYPE_ID,
+        ExplicitScope: *const VOID,
+        ChangeStamp: PWNF_CHANGE_STAMP,
+        Buffer: PVOID,
+        BufferSize: PULONG,
+    ) -> NTSTATUS;
+    fn ZwQueryWnfStateNameInformation(
+        StateName: PCWNF_STATE_NAME,
+        NameInfoClass: WNF_STATE_NAME_INFORMATION,
+        ExplicitScope: *const VOID,
+        InfoBuffer: PVOID,
+        InfoBufferSize: ULONG,
+    ) -> NTSTATUS;
+    fn ZwQueueApcThread(
+        ThreadHandle: HANDLE,
+        ApcRoutine: PPS_APC_ROUTINE,
+        ApcArgument1: PVOID,
+        ApcArgument2: PVOID,
+        ApcArgument3: PVOID,
+    ) -> NTSTATUS;
+    fn ZwQueueApcThreadEx(
+        ThreadHandle: HANDLE,
+        UserApcReserveHandle: HANDLE,
+        ApcRoutine: PPS_APC_ROUTINE,
+        ApcArgument1: PVOID,
+        ApcArgument2: PVOID,
+        ApcArgument3: PVOID,
+    ) -> NTSTATUS;
+    fn ZwRaiseException(
+        ExceptionRecord: PEXCEPTION_RECORD,
+        ContextRecord: PCONTEXT,
+        FirstChance: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwRaiseHardError(
+        ErrorStatus: NTSTATUS,
+        NumberOfParameters: ULONG,
+        UnicodeStringParameterMask: ULONG,
+        Parameters: PULONG_PTR,
+        ValidResponseOptions: ULONG,
+        Response: PULONG,
+    ) -> NTSTATUS;
+    fn ZwReadFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        ByteOffset: PLARGE_INTEGER,
+        Key: PULONG,
+    ) -> NTSTATUS;
+    fn ZwReadFileScatter(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        SegmentArray: PFILE_SEGMENT_ELEMENT,
+        Length: ULONG,
+        ByteOffset: PLARGE_INTEGER,
+        Key: PULONG,
+    ) -> NTSTATUS;
+    fn ZwReadOnlyEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwReadRequestData(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+        DataEntryIndex: ULONG,
+        Buffer: PVOID,
+        BufferSize: SIZE_T,
+        NumberOfBytesRead: PSIZE_T,
+    ) -> NTSTATUS;
+    fn ZwReadVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        Buffer: PVOID,
+        BufferSize: SIZE_T,
+        NumberOfBytesRead: PSIZE_T,
+    ) -> NTSTATUS;
+    fn ZwRecoverEnlistment(
+        EnlistmentHandle: HANDLE,
+        EnlistmentKey: PVOID,
+    ) -> NTSTATUS;
+    fn ZwRecoverResourceManager(
+        ResourceManagerHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwRecoverTransactionManager(
+        TransactionManagerHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwRegisterProtocolAddressInformation(
+        ResourceManager: HANDLE,
+        ProtocolId: PCRM_PROTOCOL_ID,
+        ProtocolInformationSize: ULONG,
+        ProtocolInformation: PVOID,
+        CreateOptions: ULONG,
+    ) -> NTSTATUS;
+    fn ZwRegisterThreadTerminatePort(
+        PortHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwReleaseCMFViewOwnership() -> NTSTATUS;
+    fn ZwReleaseKeyedEvent(
+        KeyedEventHandle: HANDLE,
+        KeyValue: PVOID,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwReleaseMutant(
+        MutantHandle: HANDLE,
+        PreviousCount: PLONG,
+    ) -> NTSTATUS;
+    fn ZwReleaseSemaphore(
+        SemaphoreHandle: HANDLE,
+        ReleaseCount: LONG,
+        PreviousCount: PLONG,
+    ) -> NTSTATUS;
+    fn ZwReleaseWorkerFactoryWorker(
+        WorkerFactoryHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwRemoveIoCompletion(
+        IoCompletionHandle: HANDLE,
+        KeyContext: *mut PVOID,
+        ApcContext: *mut PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwRemoveIoCompletionEx(
+        IoCompletionHandle: HANDLE,
+        IoCompletionInformation: PFILE_IO_COMPLETION_INFORMATION,
+        Count: ULONG,
+        NumEntriesRemoved: PULONG,
+        Timeout: PLARGE_INTEGER,
+        Alertable: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwRemoveProcessDebug(
+        ProcessHandle: HANDLE,
+        DebugObjectHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwRenameKey(
+        KeyHandle: HANDLE,
+        NewName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwRenameTransactionManager(
+        LogFileName: PUNICODE_STRING,
+        ExistingTransactionManagerGuid: LPGUID,
+    ) -> NTSTATUS;
+    fn ZwReplaceKey(
+        NewFile: POBJECT_ATTRIBUTES,
+        TargetHandle: HANDLE,
+        OldFile: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwReplacePartitionUnit(
+        TargetInstancePath: PUNICODE_STRING,
+        SpareInstancePath: PUNICODE_STRING,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwReplyPort(
+        PortHandle: HANDLE,
+        ReplyMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn ZwReplyWaitReceivePort(
+        PortHandle: HANDLE,
+        PortContext: *mut PVOID,
+        ReplyMessage: PPORT_MESSAGE,
+        ReceiveMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn ZwReplyWaitReceivePortEx(
+        PortHandle: HANDLE,
+        PortContext: *mut PVOID,
+        ReplyMessage: PPORT_MESSAGE,
+        ReceiveMessage: PPORT_MESSAGE,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwReplyWaitReplyPort(
+        PortHandle: HANDLE,
+        ReplyMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn ZwRequestPort(
+        PortHandle: HANDLE,
+        RequestMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn ZwRequestWaitReplyPort(
+        PortHandle: HANDLE,
+        RequestMessage: PPORT_MESSAGE,
+        ReplyMessage: PPORT_MESSAGE,
+    ) -> NTSTATUS;
+    fn ZwRequestWakeupLatency(
+        latency: LATENCY_TIME,
+    ) -> NTSTATUS;
+    fn ZwResetEvent(
+        EventHandle: HANDLE,
+        PreviousState: PLONG,
+    ) -> NTSTATUS;
+    fn ZwResetWriteWatch(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        RegionSize: SIZE_T,
+    ) -> NTSTATUS;
+    fn ZwRestoreKey(
+        KeyHandle: HANDLE,
+        FileHandle: HANDLE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwResumeProcess(
+        ProcessHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwResumeThread(
+        ThreadHandle: HANDLE,
+        PreviousSuspendCount: PULONG,
+    ) -> NTSTATUS;
+    fn ZwRevertContainerImpersonation() -> NTSTATUS;
+    fn ZwRollbackComplete(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwRollbackEnlistment(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwRollbackTransaction(
+        TransactionHandle: HANDLE,
+        Wait: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwRollforwardTransactionManager(
+        TransactionManagerHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwSaveKey(
+        KeyHandle: HANDLE,
+        FileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSaveKeyEx(
+        KeyHandle: HANDLE,
+        FileHandle: HANDLE,
+        Format: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSaveMergedKeys(
+        HighPrecedenceKeyHandle: HANDLE,
+        LowPrecedenceKeyHandle: HANDLE,
+        FileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSecureConnectPort(
+        PortHandle: PHANDLE,
+        PortName: PUNICODE_STRING,
+        SecurityQos: PSECURITY_QUALITY_OF_SERVICE,
+        ClientView: PPORT_VIEW,
+        RequiredServerSid: PSID,
+        ServerView: PREMOTE_PORT_VIEW,
+        MaxMessageLength: PULONG,
+        ConnectionInformation: PVOID,
+        ConnectionInformationLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwSerializeBoot() -> NTSTATUS;
+    fn ZwSetBootEntryOrder(
+        Ids: PULONG,
+        Count: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetBootOptions(
+        BootOptions: PBOOT_OPTIONS,
+        FieldsToChange: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetCachedSigningLevel(
+        Flags: ULONG,
+        InputSigningLevel: SE_SIGNING_LEVEL,
+        SourceFiles: PHANDLE,
+        SourceFileCount: ULONG,
+        TargetFile: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSetContextThread(
+        ThreadHandle: HANDLE,
+        ThreadContext: PCONTEXT,
+    ) -> NTSTATUS;
+    fn ZwSetDebugFilterState(
+        ComponentId: ULONG,
+        Level: ULONG,
+        State: BOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwSetDefaultHardErrorPort(
+        DefaultHardErrorPort: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSetDefaultLocale(
+        UserProfile: BOOLEAN,
+        DefaultLocaleId: LCID,
+    ) -> NTSTATUS;
+    fn ZwSetDefaultUILanguage(
+        DefaultUILanguageId: LANGID,
+    ) -> NTSTATUS;
+    fn ZwSetDriverEntryOrder(
+        Ids: PULONG,
+        Count: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetEaFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetEvent(
+        EventHandle: HANDLE,
+        PreviousState: PLONG,
+    ) -> NTSTATUS;
+    fn ZwSetEventBoostPriority(
+        EventHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSetHighEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSetHighWaitLowEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSetIRTimer(
+        TimerHandle: HANDLE,
+        DueTime: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwSetInformationDebugObject(
+        DebugObjectHandle: HANDLE,
+        DebugObjectInformationClass: DEBUGOBJECTINFOCLASS,
+        DebugInformation: PVOID,
+        DebugInformationLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationEnlistment(
+        EnlistmentHandle: HANDLE,
+        EnlistmentInformationClass: ENLISTMENT_INFORMATION_CLASS,
+        EnlistmentInformation: PVOID,
+        EnlistmentInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FileInformation: PVOID,
+        Length: ULONG,
+        FileInformationClass: FILE_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn ZwSetInformationJobObject(
+        JobHandle: HANDLE,
+        JobObjectInformationClass: JOBOBJECTINFOCLASS,
+        JobObjectInformation: PVOID,
+        JobObjectInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationKey(
+        KeyHandle: HANDLE,
+        KeySetInformationClass: KEY_SET_INFORMATION_CLASS,
+        KeySetInformation: PVOID,
+        KeySetInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationObject(
+        Handle: HANDLE,
+        ObjectInformationClass: OBJECT_INFORMATION_CLASS,
+        ObjectInformation: PVOID,
+        ObjectInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationProcess(
+        ProcessHandle: HANDLE,
+        ProcessInformationClass: PROCESSINFOCLASS,
+        ProcessInformation: PVOID,
+        ProcessInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationResourceManager(
+        ResourceManagerHandle: HANDLE,
+        ResourceManagerInformationClass: RESOURCEMANAGER_INFORMATION_CLASS,
+        ResourceManagerInformation: PVOID,
+        ResourceManagerInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationThread(
+        ThreadHandle: HANDLE,
+        ThreadInformationClass: THREADINFOCLASS,
+        ThreadInformation: PVOID,
+        ThreadInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationToken(
+        TokenHandle: HANDLE,
+        TokenInformationClass: TOKEN_INFORMATION_CLASS,
+        TokenInformation: PVOID,
+        TokenInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationTransaction(
+        TransactionHandle: HANDLE,
+        TransactionInformationClass: TRANSACTION_INFORMATION_CLASS,
+        TransactionInformation: PVOID,
+        TransactionInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationTransactionManager(
+        TmHandle: HANDLE,
+        TransactionManagerInformationClass: TRANSACTIONMANAGER_INFORMATION_CLASS,
+        TransactionManagerInformation: PVOID,
+        TransactionManagerInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationVirtualMemory(
+        ProcessHandle: HANDLE,
+        VmInformationClass: VIRTUAL_MEMORY_INFORMATION_CLASS,
+        NumberOfEntries: ULONG_PTR,
+        VirtualAddresses: PMEMORY_RANGE_ENTRY,
+        VmInformation: PVOID,
+        VmInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetInformationWorkerFactory(
+        WorkerFactoryHandle: HANDLE,
+        WorkerFactoryInformationClass: WORKERFACTORYINFOCLASS,
+        WorkerFactoryInformation: PVOID,
+        WorkerFactoryInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetIntervalProfile(
+        Interval: ULONG,
+        Source: KPROFILE_SOURCE,
+    ) -> NTSTATUS;
+    fn ZwSetIoCompletion(
+        IoCompletionHandle: HANDLE,
+        KeyContext: PVOID,
+        ApcContext: PVOID,
+        IoStatus: NTSTATUS,
+        IoStatusInformation: ULONG_PTR,
+    ) -> NTSTATUS;
+    fn ZwSetIoCompletionEx(
+        IoCompletionHandle: HANDLE,
+        IoCompletionPacketHandle: HANDLE,
+        KeyContext: PVOID,
+        ApcContext: PVOID,
+        IoStatus: NTSTATUS,
+        IoStatusInformation: ULONG_PTR,
+    ) -> NTSTATUS;
+    fn ZwSetLdtEntries(
+        Selector0: ULONG,
+        Entry0Low: ULONG,
+        Entry0Hi: ULONG,
+        Selector1: ULONG,
+        Entry1Low: ULONG,
+        Entry1Hi: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetLowEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSetLowWaitHighEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSetQuotaInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetSecurityObject(
+        Handle: HANDLE,
+        SecurityInformation: SECURITY_INFORMATION,
+        SecurityDescriptor: PSECURITY_DESCRIPTOR,
+    ) -> NTSTATUS;
+    fn ZwSetSystemEnvironmentValue(
+        VariableName: PUNICODE_STRING,
+        VariableValue: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwSetSystemEnvironmentValueEx(
+        VariableName: PUNICODE_STRING,
+        VendorGuid: LPGUID,
+        Value: PVOID,
+        ValueLength: ULONG,
+        Attributes: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetSystemInformation(
+        SystemInformationClass: SYSTEM_INFORMATION_CLASS,
+        SystemInformation: PVOID,
+        SystemInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetSystemPowerState(
+        SystemAction: POWER_ACTION,
+        LightestSystemState: SYSTEM_POWER_STATE,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetSystemTime(
+        SystemTime: PLARGE_INTEGER,
+        PreviousTime: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwSetThreadExecutionState(
+        NewFlags: EXECUTION_STATE,
+        PreviousFlags: *mut EXECUTION_STATE,
+    ) -> NTSTATUS;
+    fn ZwSetTimer(
+        TimerHandle: HANDLE,
+        DueTime: PLARGE_INTEGER,
+        TimerApcRoutine: PTIMER_APC_ROUTINE,
+        TimerContext: PVOID,
+        ResumeTimer: BOOLEAN,
+        Period: LONG,
+        PreviousState: PBOOLEAN,
+    ) -> NTSTATUS;
+    fn ZwSetTimer2(
+        TimerHandle: HANDLE,
+        DueTime: PLARGE_INTEGER,
+        Period: PLARGE_INTEGER,
+        Parameters: PT2_SET_PARAMETERS,
+    ) -> NTSTATUS;
+    fn ZwSetTimerEx(
+        TimerHandle: HANDLE,
+        TimerSetInformationClass: TIMER_SET_INFORMATION_CLASS,
+        TimerSetInformation: PVOID,
+        TimerSetInformationLength: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetTimerResolution(
+        DesiredTime: ULONG,
+        SetResolution: BOOLEAN,
+        ActualTime: PULONG,
+    ) -> NTSTATUS;
+    fn ZwSetUuidSeed(
+        Seed: PCHAR,
+    ) -> NTSTATUS;
+    fn ZwSetValueKey(
+        KeyHandle: HANDLE,
+        ValueName: PUNICODE_STRING,
+        TitleIndex: ULONG,
+        Type: ULONG,
+        Data: PVOID,
+        DataSize: ULONG,
+    ) -> NTSTATUS;
+    fn ZwSetVolumeInformationFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        FsInformation: PVOID,
+        Length: ULONG,
+        FsInformationClass: FS_INFORMATION_CLASS,
+    ) -> NTSTATUS;
+    fn ZwSetWnfProcessNotificationEvent(
+        NotificationEvent: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwShutdownSystem(
+        Action: SHUTDOWN_ACTION,
+    ) -> NTSTATUS;
+    fn ZwShutdownWorkerFactory(
+        WorkerFactoryHandle: HANDLE,
+        PendingWorkerCount: *mut LONG,
+    ) -> NTSTATUS;
+    fn ZwSignalAndWaitForSingleObject(
+        SignalHandle: HANDLE,
+        WaitHandle: HANDLE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwSinglePhaseReject(
+        EnlistmentHandle: HANDLE,
+        TmVirtualClock: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwStartProfile(
+        ProfileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwStopProfile(
+        ProfileHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSubscribeWnfStateChange(
+        StateName: PCWNF_STATE_NAME,
+        ChangeStamp: WNF_CHANGE_STAMP,
+        EventMask: ULONG,
+        SubscriptionId: PULONG64,
+    ) -> NTSTATUS;
+    fn ZwSuspendProcess(
+        ProcessHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwSuspendThread(
+        ThreadHandle: HANDLE,
+        PreviousSuspendCount: PULONG,
+    ) -> NTSTATUS;
+    fn ZwSystemDebugControl(
+        Command: SYSDBG_COMMAND,
+        InputBuffer: PVOID,
+        InputBufferLength: ULONG,
+        OutputBuffer: PVOID,
+        OutputBufferLength: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwTerminateJobObject(
+        JobHandle: HANDLE,
+        ExitStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwTerminateProcess(
+        ProcessHandle: HANDLE,
+        ExitStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwTerminateThread(
+        ThreadHandle: HANDLE,
+        ExitStatus: NTSTATUS,
+    ) -> NTSTATUS;
+    fn ZwTestAlert() -> NTSTATUS;
+    fn ZwThawRegistry() -> NTSTATUS;
+    fn ZwThawTransactions() -> NTSTATUS;
+    fn ZwTraceControl(
+        FunctionCode: ULONG,
+        InBuffer: PVOID,
+        InBufferLen: ULONG,
+        OutBuffer: PVOID,
+        OutBufferLen: ULONG,
+        ReturnLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwTraceEvent(
+        TraceHandle: HANDLE,
+        Flags: ULONG,
+        FieldSize: ULONG,
+        Fields: PVOID,
+    ) -> NTSTATUS;
+    fn ZwTranslateFilePath(
+        InputFilePath: PFILE_PATH,
+        OutputType: ULONG,
+        OutputFilePath: PFILE_PATH,
+        OutputFilePathLength: PULONG,
+    ) -> NTSTATUS;
+    fn ZwUmsThreadYield(
+        SchedulerParam: PVOID,
+    ) -> NTSTATUS;
+    fn ZwUnloadDriver(
+        DriverServiceName: PUNICODE_STRING,
+    ) -> NTSTATUS;
+    fn ZwUnloadKey(
+        TargetKey: POBJECT_ATTRIBUTES,
+    ) -> NTSTATUS;
+    fn ZwUnloadKey2(
+        TargetKey: POBJECT_ATTRIBUTES,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwUnloadKeyEx(
+        TargetKey: POBJECT_ATTRIBUTES,
+        Event: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwUnlockFile(
+        FileHandle: HANDLE,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        ByteOffset: PLARGE_INTEGER,
+        Length: PLARGE_INTEGER,
+        Key: ULONG,
+    ) -> NTSTATUS;
+    fn ZwUnlockVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: *mut PVOID,
+        RegionSize: PSIZE_T,
+        MapType: ULONG,
+    ) -> NTSTATUS;
+    fn ZwUnmapViewOfSection(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+    ) -> NTSTATUS;
+    fn ZwUnmapViewOfSectionEx(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        Flags: ULONG,
+    ) -> NTSTATUS;
+    fn ZwUnsubscribeWnfStateChange(
+        StateName: PCWNF_STATE_NAME,
+    ) -> NTSTATUS;
+    fn ZwUpdateWnfStateData(
+        StateName: PCWNF_STATE_NAME,
+        Buffer: *const VOID,
+        Length: ULONG,
+        TypeId: PCWNF_TYPE_ID,
+        ExplicitScope: *const VOID,
+        MatchingChangeStamp: WNF_CHANGE_STAMP,
+        CheckStamp: LOGICAL,
+    ) -> NTSTATUS;
+    fn ZwVdmControl(
+        Service: VDMSERVICECLASS,
+        ServiceData: PVOID,
+    ) -> NTSTATUS;
+    fn ZwWaitForAlertByThreadId(
+        Address: PVOID,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwWaitForDebugEvent(
+        DebugObjectHandle: HANDLE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+        WaitStateChange: PVOID,
+    ) -> NTSTATUS;
+    fn ZwWaitForKeyedEvent(
+        KeyedEventHandle: HANDLE,
+        KeyValue: PVOID,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwWaitForMultipleObjects(
+        Count: ULONG,
+        Handles: *mut HANDLE,
+        WaitType: WAIT_TYPE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwWaitForMultipleObjects32(
+        Count: ULONG,
+        Handles: *mut LONG,
+        WaitType: WAIT_TYPE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwWaitForSingleObject(
+        Handle: HANDLE,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS;
+    fn ZwWaitForWorkViaWorkerFactory(
+        WorkerFactoryHandle: HANDLE,
+        MiniPacket: *mut FILE_IO_COMPLETION_INFORMATION,
+    ) -> NTSTATUS;
+    fn ZwWaitHighEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwWaitLowEventPair(
+        EventPairHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwWorkerFactoryWorkerReady(
+        WorkerFactoryHandle: HANDLE,
+    ) -> NTSTATUS;
+    fn ZwWriteFile(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        Buffer: PVOID,
+        Length: ULONG,
+        ByteOffset: PLARGE_INTEGER,
+        Key: PULONG,
+    ) -> NTSTATUS;
+    fn ZwWriteFileGather(
+        FileHandle: HANDLE,
+        Event: HANDLE,
+        ApcRoutine: PIO_APC_ROUTINE,
+        ApcContext: PVOID,
+        IoStatusBlock: PIO_STATUS_BLOCK,
+        SegmentArray: PFILE_SEGMENT_ELEMENT,
+        Length: ULONG,
+        ByteOffset: PLARGE_INTEGER,
+        Key: PULONG,
+    ) -> NTSTATUS;
+    fn ZwWriteRequestData(
+        PortHandle: HANDLE,
+        Message: PPORT_MESSAGE,
+        DataEntryIndex: ULONG,
+        Buffer: PVOID,
+        BufferSize: SIZE_T,
+        NumberOfBytesWritten: PSIZE_T,
+    ) -> NTSTATUS;
+    fn ZwWriteVirtualMemory(
+        ProcessHandle: HANDLE,
+        BaseAddress: PVOID,
+        Buffer: PVOID,
+        BufferSize: SIZE_T,
+        NumberOfBytesWritten: PSIZE_T,
+    ) -> NTSTATUS;
+    fn ZwYieldExecution() -> NTSTATUS;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/string.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,58 @@
+/// A wrapper over UTF16 string constants.
+pub struct UTF16Const(pub &'static [u16]);
+impl UTF16Const {
+    #[inline]
+    pub fn as_ptr(&self) -> *const u16 {
+        self.0.as_ptr()
+    }
+    #[inline]
+    pub fn as_mut_ptr(&self) -> *mut u16 {
+        self.0.as_ptr() as *mut u16
+    }
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.0.len() - 1
+    }
+}
+impl AsRef<[u16]> for UTF16Const {
+    #[inline]
+    fn as_ref(&self) -> &[u16] {
+        &self.0[..self.len()]
+    }
+}
+impl Copy for UTF16Const {}
+impl Clone for UTF16Const {
+    #[inline]
+    fn clone(&self) -> UTF16Const { *self }
+}
+/// A wrapper over UTF8 string constants.
+pub struct UTF8Const(pub &'static str);
+impl UTF8Const {
+    #[inline]
+    pub fn as_ptr(&self) -> *const i8 {
+        self.0.as_ptr() as *const i8
+    }
+    #[inline]
+    pub fn as_mut_ptr(&self) -> *mut i8 {
+        self.0.as_ptr() as *mut i8
+    }
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.0.len() - 1
+    }
+    #[inline]
+    pub fn as_str(&self) -> &str {
+        &self.0[..self.len()]
+    }
+}
+impl AsRef<str> for UTF8Const {
+    #[inline]
+    fn as_ref(&self) -> &str {
+        &self.0[..self.len()]
+    }
+}
+impl Copy for UTF8Const {}
+impl Clone for UTF8Const {
+    #[inline]
+    fn clone(&self) -> UTF8Const { *self }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/subprocesstag.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/subprocesstag.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/subprocesstag.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/subprocesstag.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,77 @@
+use winapi::shared::minwindef::DWORD;
+use winapi::shared::ntdef::{LPCWSTR, LPWSTR, PVOID};
+ENUM!{enum TAG_INFO_LEVEL {
+    eTagInfoLevelNameFromTag = 1,
+    eTagInfoLevelNamesReferencingModule = 2,
+    eTagInfoLevelNameTagMapping = 3,
+    eTagInfoLevelMax = 4,
+}}
+ENUM!{enum TAG_TYPE {
+    eTagTypeService = 1,
+    eTagTypeMax = 2,
+}}
+STRUCT!{struct TAG_INFO_NAME_FROM_TAG_IN_PARAMS {
+    dwPid: DWORD,
+    dwTag: DWORD,
+}}
+pub type PTAG_INFO_NAME_FROM_TAG_IN_PARAMS = *mut TAG_INFO_NAME_FROM_TAG_IN_PARAMS;
+STRUCT!{struct TAG_INFO_NAME_FROM_TAG_OUT_PARAMS {
+    eTagType: DWORD,
+    pszName: LPWSTR,
+}}
+pub type PTAG_INFO_NAME_FROM_TAG_OUT_PARAMS = *mut TAG_INFO_NAME_FROM_TAG_OUT_PARAMS;
+STRUCT!{struct TAG_INFO_NAME_FROM_TAG {
+    InParams: TAG_INFO_NAME_FROM_TAG_IN_PARAMS,
+    OutParams: TAG_INFO_NAME_FROM_TAG_OUT_PARAMS,
+}}
+pub type PTAG_INFO_NAME_FROM_TAG = *mut TAG_INFO_NAME_FROM_TAG;
+STRUCT!{struct TAG_INFO_NAMES_REFERENCING_MODULE_IN_PARAMS {
+    dwPid: DWORD,
+    pszModule: LPWSTR,
+}}
+pub type PTAG_INFO_NAMES_REFERENCING_MODULE_IN_PARAMS =
+    *mut TAG_INFO_NAMES_REFERENCING_MODULE_IN_PARAMS;
+STRUCT!{struct TAG_INFO_NAMES_REFERENCING_MODULE_OUT_PARAMS {
+    eTagType: DWORD,
+    pmszNames: LPWSTR,
+}}
+pub type PTAG_INFO_NAMES_REFERENCING_MODULE_OUT_PARAMS =
+    *mut TAG_INFO_NAMES_REFERENCING_MODULE_OUT_PARAMS;
+STRUCT!{struct TAG_INFO_NAMES_REFERENCING_MODULE {
+    InParams: TAG_INFO_NAMES_REFERENCING_MODULE_IN_PARAMS,
+    OutParams: TAG_INFO_NAMES_REFERENCING_MODULE_OUT_PARAMS,
+}}
+pub type PTAG_INFO_NAMES_REFERENCING_MODULE = *mut TAG_INFO_NAMES_REFERENCING_MODULE;
+STRUCT!{struct TAG_INFO_NAME_TAG_MAPPING_IN_PARAMS {
+    dwPid: DWORD,
+}}
+pub type PTAG_INFO_NAME_TAG_MAPPING_IN_PARAMS = *mut TAG_INFO_NAME_TAG_MAPPING_IN_PARAMS;
+STRUCT!{struct TAG_INFO_NAME_TAG_MAPPING_ELEMENT {
+    eTagType: DWORD,
+    dwTag: DWORD,
+    pszName: LPWSTR,
+    pszGroupName: LPWSTR,
+}}
+pub type PTAG_INFO_NAME_TAG_MAPPING_ELEMENT = *mut TAG_INFO_NAME_TAG_MAPPING_ELEMENT;
+STRUCT!{struct TAG_INFO_NAME_TAG_MAPPING_OUT_PARAMS {
+    cElements: DWORD,
+    pNameTagMappingElements: PTAG_INFO_NAME_TAG_MAPPING_ELEMENT,
+}}
+pub type PTAG_INFO_NAME_TAG_MAPPING_OUT_PARAMS = *mut TAG_INFO_NAME_TAG_MAPPING_OUT_PARAMS;
+STRUCT!{struct TAG_INFO_NAME_TAG_MAPPING {
+    InParams: TAG_INFO_NAME_TAG_MAPPING_IN_PARAMS,
+    pOutParams: PTAG_INFO_NAME_TAG_MAPPING_OUT_PARAMS,
+}}
+pub type PTAG_INFO_NAME_TAG_MAPPING = *mut TAG_INFO_NAME_TAG_MAPPING;
+EXTERN!{extern "system" {
+    fn I_QueryTagInformation(
+        pszMachineName: LPCWSTR,
+        eInfoLevel: TAG_INFO_LEVEL,
+        pTagInfo: PVOID,
+    ) -> DWORD;
+}}
+FN!{stdcall PQUERY_TAG_INFORMATION(
+    pszMachineName: LPCWSTR,
+    eInfoLevel: TAG_INFO_LEVEL,
+    pTagInfo: PVOID,
+) -> DWORD}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winapi_local/um/winioctl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winapi_local/um/winioctl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winapi_local/um/winioctl.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winapi_local/um/winioctl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,4 @@
+#[inline]
+pub(crate) const fn CTL_CODE(DeviceType: u32, Function: u32, Method: u32, Access: u32) -> u32 {
+    (DeviceType << 16) | (Access << 14) | (Function << 2) | Method
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winapi_local/um/winnt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winapi_local/um/winnt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winapi_local/um/winnt.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winapi_local/um/winnt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,80 @@
+use winapi::shared::basetsd::{DWORD64, SIZE_T, ULONG64};
+use winapi::shared::minwindef::DWORD;
+use winapi::um::winnt::{HANDLE, PVOID};
+#[doc(hidden)]
+#[inline]
+pub const fn UInt32x32To64(a: u32, b: u32) -> u64 {
+    a as u64 * b as u64
+}
+#[cfg(all(feature = "nightly", not(target_arch = "aarch64")))]
+IFDEF!{
+use crate::ntpebteb::TEB;
+#[inline]
+pub unsafe fn _bittest64(Base: *const i64, Offset: i64) -> u8 {
+    let out: u8;
+    llvm_asm!("bt $1, $2; setb $0"
+    : "=r"(out)
+    :  "*m"(Base), "r"(Offset)
+    : "cc"
+    : "intel"
+    );
+    out
+}
+#[inline]
+pub unsafe fn __readfsdword(Offset: DWORD) -> DWORD {
+    let out: u32;
+    llvm_asm!("mov $0, fs:[$1]"
+    : "=r"(out)
+    : "ri"(Offset)
+    :
+    : "intel"
+    );
+    out
+}
+#[inline]
+pub unsafe fn __readgsqword(Offset: DWORD) -> DWORD64 {
+    let out: u64;
+    llvm_asm!("mov $0, gs:[$1]"
+    : "=r"(out)
+    : "ri"(Offset)
+    :
+    : "intel"
+    );
+    out
+}
+#[inline] #[allow(unused_unsafe)]
+pub unsafe fn NtCurrentTeb() -> *mut TEB {
+    use winapi::um::winnt::NT_TIB;
+    let teb_offset = FIELD_OFFSET!(NT_TIB, _Self) as u32;
+    #[cfg(target_arch = "x86_64")] {
+        __readgsqword(teb_offset) as *mut TEB
+    }
+    #[cfg(target_arch = "x86")] {
+        __readfsdword(teb_offset) as *mut TEB
+    }
+}
+}
+ENUM!{enum MEM_EXTENDED_PARAMETER_TYPE {
+    MemExtendedParameterInvalidType = 0,
+    MemExtendedParameterAddressRequirements = 1,
+    MemExtendedParameterNumaNode = 2,
+    MemExtendedParameterPartitionHandle = 3,
+    MemExtendedParameterMax = 4,
+}}
+pub type PMEM_EXTENDED_PARAMETER_TYPE = *mut MEM_EXTENDED_PARAMETER_TYPE;
+UNION!{union MEM_EXTENDED_PARAMETER_u {
+    ULong64: DWORD64,
+    Pointer: PVOID,
+    Size: SIZE_T,
+    Handle: HANDLE,
+    ULong: DWORD,
+}}
+STRUCT!{struct MEM_EXTENDED_PARAMETER {
+    BitFields: ULONG64,
+    u: MEM_EXTENDED_PARAMETER_u,
+}}
+BITFIELD!{MEM_EXTENDED_PARAMETER BitFields: ULONG64 [
+    Type set_Type[0..8],
+    Reserved set_Reserved[8..64],
+]}
+pub type PMEM_EXTENDED_PARAMETER = *mut MEM_EXTENDED_PARAMETER;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winapi_local/um.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winapi_local/um.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winapi_local/um.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winapi_local/um.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2 @@
+pub(crate) mod winioctl;
+pub mod winnt;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winapi_local.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winapi_local.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winapi_local.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winapi_local.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+pub mod um;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winsta.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winsta.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ntapi/src/winsta.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ntapi/src/winsta.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,848 @@
+use core::ptr::null_mut;
+use crate::ntrtl::RTL_TIME_ZONE_INFORMATION;
+use winapi::shared::basetsd::SIZE_T;
+use winapi::shared::minwindef::{BYTE, DWORD, FILETIME};
+use winapi::shared::ntdef::{
+    BOOLEAN, CHAR, HANDLE, LARGE_INTEGER, LONG, PULONG, PVOID, PWSTR, UCHAR, ULONG, UNICODE_STRING,
+    USHORT, WCHAR,
+};
+use winapi::shared::windef::HWND;
+use winapi::um::winnt::{PSID, STANDARD_RIGHTS_REQUIRED};
+pub const WINSTATION_QUERY: u32 = 0x00000001;
+pub const WINSTATION_SET: u32 = 0x00000002;
+pub const WINSTATION_RESET: u32 = 0x00000004;
+pub const WINSTATION_VIRTUAL: u32 = 0x00000008;
+pub const WINSTATION_SHADOW: u32 = 0x00000010;
+pub const WINSTATION_LOGON: u32 = 0x00000020;
+pub const WINSTATION_LOGOFF: u32 = 0x00000040;
+pub const WINSTATION_MSG: u32 = 0x00000080;
+pub const WINSTATION_CONNECT: u32 = 0x00000100;
+pub const WINSTATION_DISCONNECT: u32 = 0x00000200;
+pub const WINSTATION_GUEST_ACCESS: u32 = WINSTATION_LOGON;
+pub const WINSTATION_CURRENT_GUEST_ACCESS: u32 = WINSTATION_VIRTUAL | WINSTATION_LOGOFF;
+pub const WINSTATION_USER_ACCESS: u32 =
+    WINSTATION_GUEST_ACCESS | WINSTATION_QUERY | WINSTATION_CONNECT;
+pub const WINSTATION_CURRENT_USER_ACCESS: u32 = WINSTATION_SET | WINSTATION_RESET
+    | WINSTATION_VIRTUAL | WINSTATION_LOGOFF | WINSTATION_DISCONNECT;
+pub const WINSTATION_ALL_ACCESS: u32 = STANDARD_RIGHTS_REQUIRED | WINSTATION_QUERY | WINSTATION_SET
+    | WINSTATION_RESET | WINSTATION_VIRTUAL | WINSTATION_SHADOW | WINSTATION_LOGON | WINSTATION_MSG
+    | WINSTATION_CONNECT | WINSTATION_DISCONNECT;
+pub const WDPREFIX_LENGTH: usize = 12;
+pub const CALLBACK_LENGTH: usize = 50;
+pub const DLLNAME_LENGTH: usize = 32;
+pub const CDNAME_LENGTH: usize = 32;
+pub const WDNAME_LENGTH: usize = 32;
+pub const PDNAME_LENGTH: usize = 32;
+pub const DEVICENAME_LENGTH: usize = 128;
+pub const MODEMNAME_LENGTH: usize = DEVICENAME_LENGTH;
+pub const STACK_ADDRESS_LENGTH: usize = 128;
+pub const MAX_BR_NAME: usize = 65;
+pub const DIRECTORY_LENGTH: usize = 256;
+pub const INITIALPROGRAM_LENGTH: usize = 256;
+pub const USERNAME_LENGTH: usize = 20;
+pub const DOMAIN_LENGTH: usize = 17;
+pub const PASSWORD_LENGTH: usize = 14;
+pub const NASISPECIFICNAME_LENGTH: usize = 14;
+pub const NASIUSERNAME_LENGTH: usize = 47;
+pub const NASIPASSWORD_LENGTH: usize = 24;
+pub const NASISESSIONNAME_LENGTH: usize = 16;
+pub const NASIFILESERVER_LENGTH: usize = 47;
+pub const CLIENTDATANAME_LENGTH: usize = 7;
+pub const CLIENTNAME_LENGTH: usize = 20;
+pub const CLIENTADDRESS_LENGTH: usize = 30;
+pub const IMEFILENAME_LENGTH: usize = 32;
+pub const CLIENTLICENSE_LENGTH: usize = 32;
+pub const CLIENTMODEM_LENGTH: usize = 40;
+pub const CLIENT_PRODUCT_ID_LENGTH: usize = 32;
+pub const MAX_COUNTER_EXTENSIONS: u32 = 2;
+pub const WINSTATIONNAME_LENGTH: usize = 32;
+pub const TERMSRV_TOTAL_SESSIONS: u32 = 1;
+pub const TERMSRV_DISC_SESSIONS: u32 = 2;
+pub const TERMSRV_RECON_SESSIONS: u32 = 3;
+pub const TERMSRV_CURRENT_ACTIVE_SESSIONS: u32 = 4;
+pub const TERMSRV_CURRENT_DISC_SESSIONS: u32 = 5;
+pub const TERMSRV_PENDING_SESSIONS: u32 = 6;
+pub const TERMSRV_SUCC_TOTAL_LOGONS: u32 = 7;
+pub const TERMSRV_SUCC_LOCAL_LOGONS: u32 = 8;
+pub const TERMSRV_SUCC_REMOTE_LOGONS: u32 = 9;
+pub const TERMSRV_SUCC_SESSION0_LOGONS: u32 = 10;
+pub const TERMSRV_CURRENT_TERMINATING_SESSIONS: u32 = 11;
+pub const TERMSRV_CURRENT_LOGGEDON_SESSIONS: u32 = 12;
+pub type PTS_TIME_ZONE_INFORMATION = *mut RTL_TIME_ZONE_INFORMATION;
+pub type TS_TIME_ZONE_INFORMATION = RTL_TIME_ZONE_INFORMATION;
+pub type WINSTATIONNAME = [WCHAR; WINSTATIONNAME_LENGTH + 1];
+STRUCT!{struct VARDATA_WIRE {
+    Size: USHORT,
+    Offset: USHORT,
+}}
+pub type PVARDATA_WIRE = *mut VARDATA_WIRE;
+ENUM!{enum WINSTATIONSTATECLASS {
+    State_Active = 0,
+    State_Connected = 1,
+    State_ConnectQuery = 2,
+    State_Shadow = 3,
+    State_Disconnected = 4,
+    State_Idle = 5,
+    State_Listen = 6,
+    State_Reset = 7,
+    State_Down = 8,
+    State_Init = 9,
+}}
+UNION!{union SESSIONIDW_u {
+    SessionId: ULONG,
+    LogonId: ULONG,
+}}
+STRUCT!{struct SESSIONIDW {
+    u: SESSIONIDW_u,
+    WinStationName: WINSTATIONNAME,
+    State: WINSTATIONSTATECLASS,
+}}
+pub type PSESSIONIDW = *mut SESSIONIDW;
+ENUM!{enum WINSTATIONINFOCLASS {
+    WinStationCreateData = 0,
+    WinStationConfiguration = 1,
+    WinStationPdParams = 2,
+    WinStationWd = 3,
+    WinStationPd = 4,
+    WinStationPrinter = 5,
+    WinStationClient = 6,
+    WinStationModules = 7,
+    WinStationInformation = 8,
+    WinStationTrace = 9,
+    WinStationBeep = 10,
+    WinStationEncryptionOff = 11,
+    WinStationEncryptionPerm = 12,
+    WinStationNtSecurity = 13,
+    WinStationUserToken = 14,
+    WinStationUnused1 = 15,
+    WinStationVideoData = 16,
+    WinStationInitialProgram = 17,
+    WinStationCd = 18,
+    WinStationSystemTrace = 19,
+    WinStationVirtualData = 20,
+    WinStationClientData = 21,
+    WinStationSecureDesktopEnter = 22,
+    WinStationSecureDesktopExit = 23,
+    WinStationLoadBalanceSessionTarget = 24,
+    WinStationLoadIndicator = 25,
+    WinStationShadowInfo = 26,
+    WinStationDigProductId = 27,
+    WinStationLockedState = 28,
+    WinStationRemoteAddress = 29,
+    WinStationIdleTime = 30,
+    WinStationLastReconnectType = 31,
+    WinStationDisallowAutoReconnect = 32,
+    WinStationMprNotifyInfo = 33,
+    WinStationExecSrvSystemPipe = 34,
+    WinStationSmartCardAutoLogon = 35,
+    WinStationIsAdminLoggedOn = 36,
+    WinStationReconnectedFromId = 37,
+    WinStationEffectsPolicy = 38,
+    WinStationType = 39,
+    WinStationInformationEx = 40,
+    WinStationValidationInfo = 41,
+}}
+STRUCT!{struct WINSTATIONCREATE {
+    Bitfields: ULONG,
+    MaxInstanceCount: ULONG,
+}}
+BITFIELD!{WINSTATIONCREATE Bitfields: ULONG [
+    fEnableWinStation set_fEnableWinStation[0..1],
+]}
+pub type PWINSTATIONCREATE = *mut WINSTATIONCREATE;
+STRUCT!{struct WINSTACONFIGWIRE {
+    Comment: [WCHAR; 61],
+    OEMId: [CHAR; 4],
+    UserConfig: VARDATA_WIRE,
+    NewFields: VARDATA_WIRE,
+}}
+pub type PWINSTACONFIGWIRE = *mut WINSTACONFIGWIRE;
+ENUM!{enum CALLBACKCLASS {
+    Callback_Disable = 0,
+    Callback_Roving = 1,
+    Callback_Fixed = 2,
+}}
+ENUM!{enum SHADOWCLASS {
+    Shadow_Disable = 0,
+    Shadow_EnableInputNotify = 1,
+    Shadow_EnableInputNoNotify = 2,
+    Shadow_EnableNoInputNotify = 3,
+    Shadow_EnableNoInputNoNotify = 4,
+}}
+STRUCT!{struct USERCONFIG {
+    Bitfields: ULONG,
+    Bitfields2: ULONG,
+    UserName: [WCHAR; USERNAME_LENGTH + 1],
+    Domain: [WCHAR; DOMAIN_LENGTH + 1],
+    Password: [WCHAR; PASSWORD_LENGTH + 1],
+    WorkDirectory: [WCHAR; DIRECTORY_LENGTH + 1],
+    InitialProgram: [WCHAR; INITIALPROGRAM_LENGTH + 1],
+    CallbackNumber: [WCHAR; CALLBACK_LENGTH + 1],
+    Callback: CALLBACKCLASS,
+    Shadow: SHADOWCLASS,
+    MaxConnectionTime: ULONG,
+    MaxDisconnectionTime: ULONG,
+    MaxIdleTime: ULONG,
+    KeyboardLayout: ULONG,
+    MinEncryptionLevel: BYTE,
+    NWLogonServer: [WCHAR; NASIFILESERVER_LENGTH + 1],
+    PublishedName: [WCHAR; MAX_BR_NAME],
+    WFProfilePath: [WCHAR; DIRECTORY_LENGTH + 1],
+    WFHomeDir: [WCHAR; DIRECTORY_LENGTH + 1],
+    WFHomeDirDrive: [WCHAR; 4],
+}}
+BITFIELD!{USERCONFIG Bitfields: ULONG [
+    fInheritAutoLogon set_fInheritAutoLogon[0..1],
+    fInheritResetBroken set_fInheritResetBroken[1..2],
+    fInheritReconnectSame set_fInheritReconnectSame[2..3],
+    fInheritInitialProgram set_fInheritInitialProgram[3..4],
+    fInheritCallback set_fInheritCallback[4..5],
+    fInheritCallbackNumber set_fInheritCallbackNumber[5..6],
+    fInheritShadow set_fInheritShadow[6..7],
+    fInheritMaxSessionTime set_fInheritMaxSessionTime[7..8],
+    fInheritMaxDisconnectionTime set_fInheritMaxDisconnectionTime[8..9],
+    fInheritMaxIdleTime set_fInheritMaxIdleTime[9..10],
+    fInheritAutoClient set_fInheritAutoClient[10..11],
+    fInheritSecurity set_fInheritSecurity[11..12],
+    fPromptForPassword set_fPromptForPassword[12..13],
+    fResetBroken set_fResetBroken[13..14],
+    fReconnectSame set_fReconnectSame[14..15],
+    fLogonDisabled set_fLogonDisabled[15..16],
+    fWallPaperDisabled set_fWallPaperDisabled[16..17],
+    fAutoClientDrives set_fAutoClientDrives[17..18],
+    fAutoClientLpts set_fAutoClientLpts[18..19],
+    fForceClientLptDef set_fForceClientLptDef[19..20],
+    fRequireEncryption set_fRequireEncryption[20..21],
+    fDisableEncryption set_fDisableEncryption[21..22],
+    fUnused1 set_fUnused1[22..23],
+    fHomeDirectoryMapRoot set_fHomeDirectoryMapRoot[23..24],
+    fUseDefaultGina set_fUseDefaultGina[24..25],
+    fCursorBlinkDisabled set_fCursorBlinkDisabled[25..26],
+    fPublishedApp set_fPublishedApp[26..27],
+    fHideTitleBar set_fHideTitleBar[27..28],
+    fMaximize set_fMaximize[28..29],
+    fDisableCpm set_fDisableCpm[29..30],
+    fDisableCdm set_fDisableCdm[30..31],
+    fDisableCcm set_fDisableCcm[31..32],
+]}
+BITFIELD!{USERCONFIG Bitfields2: ULONG [
+    fDisableLPT set_fDisableLPT[0..1],
+    fDisableClip set_fDisableClip[1..2],
+    fDisableExe set_fDisableExe[2..3],
+    fDisableCam set_fDisableCam[3..4],
+    fDisableAutoReconnect set_fDisableAutoReconnect[4..5],
+    ColorDepth set_ColorDepth[5..6],
+    fInheritColorDepth set_fInheritColorDepth[6..7],
+    fErrorInvalidProfile set_fErrorInvalidProfile[7..8],
+    fPasswordIsScPin set_fPasswordIsScPin[8..9],
+    fDisablePNPRedir set_fDisablePNPRedir[9..10],
+]}
+pub type PUSERCONFIG = *mut USERCONFIG;
+ENUM!{enum SDCLASS {
+    SdNone = 0,
+    SdConsole = 1,
+    SdNetwork = 2,
+    SdAsync = 3,
+    SdOemTransport = 4,
+}}
+pub type DEVICENAME = [WCHAR; DEVICENAME_LENGTH + 1];
+pub type MODEMNAME = [WCHAR; MODEMNAME_LENGTH + 1];
+pub type NASISPECIFICNAME = [WCHAR; NASISPECIFICNAME_LENGTH + 1];
+pub type NASIUSERNAME = [WCHAR; NASIUSERNAME_LENGTH + 1];
+pub type NASIPASSWORD = [WCHAR; NASIPASSWORD_LENGTH + 1];
+pub type NASISESIONNAME = [WCHAR; NASISESSIONNAME_LENGTH + 1];
+pub type NASIFILESERVER = [WCHAR; NASIFILESERVER_LENGTH + 1];
+pub type WDNAME = [WCHAR; WDNAME_LENGTH + 1];
+pub type WDPREFIX = [WCHAR; WDPREFIX_LENGTH + 1];
+pub type CDNAME = [WCHAR; CDNAME_LENGTH + 1];
+pub type DLLNAME = [WCHAR; DLLNAME_LENGTH + 1];
+pub type PDNAME = [WCHAR; PDNAME_LENGTH + 1];
+STRUCT!{struct NETWORKCONFIG {
+    LanAdapter: LONG,
+    NetworkName: DEVICENAME,
+    Flags: ULONG,
+}}
+pub type PNETWORKCONFIG = *mut NETWORKCONFIG;
+ENUM!{enum FLOWCONTROLCLASS {
+    FlowControl_None = 0,
+    FlowControl_Hardware = 1,
+    FlowControl_Software = 2,
+}}
+ENUM!{enum RECEIVEFLOWCONTROLCLASS {
+    ReceiveFlowControl_None = 0,
+    ReceiveFlowControl_RTS = 1,
+    ReceiveFlowControl_DTR = 2,
+}}
+ENUM!{enum TRANSMITFLOWCONTROLCLASS {
+    TransmitFlowControl_None = 0,
+    TransmitFlowControl_CTS = 1,
+    TransmitFlowControl_DSR = 2,
+}}
+ENUM!{enum ASYNCCONNECTCLASS {
+    Connect_CTS = 0,
+    Connect_DSR = 1,
+    Connect_RI = 2,
+    Connect_DCD = 3,
+    Connect_FirstChar = 4,
+    Connect_Perm = 5,
+}}
+STRUCT!{struct FLOWCONTROLCONFIG {
+    Bitfields: ULONG,
+    XonChar: CHAR,
+    XoffChar: CHAR,
+    Type: FLOWCONTROLCLASS,
+    HardwareReceive: RECEIVEFLOWCONTROLCLASS,
+    HardwareTransmit: TRANSMITFLOWCONTROLCLASS,
+}}
+BITFIELD!{FLOWCONTROLCONFIG Bitfields: ULONG [
+    fEnableSoftwareTx set_fEnableSoftwareTx[0..1],
+    fEnableSoftwareRx set_fEnableSoftwareRx[1..2],
+    fEnableDTR set_fEnableDTR[2..3],
+    fEnableRTS set_fEnableRTS[3..4],
+]}
+pub type PFLOWCONTROLCONFIG = *mut FLOWCONTROLCONFIG;
+STRUCT!{struct CONNECTCONFIG {
+    Type: ASYNCCONNECTCLASS,
+    Bitfields: ULONG,
+}}
+BITFIELD!{CONNECTCONFIG Bitfields: ULONG [
+    fEnableBreakDisconnect set_fEnableBreakDisconnect[0..1],
+]}
+pub type PCONNECTCONFIG = *mut CONNECTCONFIG;
+STRUCT!{struct ASYNCCONFIG {
+    DeviceName: DEVICENAME,
+    ModemName: MODEMNAME,
+    BaudRate: ULONG,
+    Parity: ULONG,
+    StopBits: ULONG,
+    ByteSize: ULONG,
+    Bitfields: ULONG,
+    FlowControl: FLOWCONTROLCONFIG,
+    Connect: CONNECTCONFIG,
+}}
+BITFIELD!{ASYNCCONFIG Bitfields: ULONG [
+    fEnableDsrSensitivity set_fEnableDsrSensitivity[0..1],
+    fConnectionDriver set_fConnectionDriver[1..2],
+]}
+pub type PASYNCCONFIG = *mut ASYNCCONFIG;
+STRUCT!{struct NASICONFIG {
+    SpecificName: NASISPECIFICNAME,
+    UserName: NASIUSERNAME,
+    PassWord: NASIPASSWORD,
+    SessionName: NASISESIONNAME,
+    FileServer: NASIFILESERVER,
+    GlobalSession: BOOLEAN,
+}}
+pub type PNASICONFIG = *mut NASICONFIG;
+STRUCT!{struct OEMTDCONFIG {
+    Adapter: LONG,
+    DeviceName: DEVICENAME,
+    Flags: ULONG,
+}}
+pub type POEMTDCONFIG = *mut OEMTDCONFIG;
+UNION!{union PDPARAMS_u {
+    Network: NETWORKCONFIG,
+    Async: ASYNCCONFIG,
+    Nasi: NASICONFIG,
+    OemTd: OEMTDCONFIG,
+}}
+STRUCT!{struct PDPARAMS {
+    SdClass: SDCLASS,
+    u: PDPARAMS_u,
+}}
+pub type PPDPARAMS = *mut PDPARAMS;
+STRUCT!{struct WDCONFIG {
+    WdName: WDNAME,
+    WdDLL: DLLNAME,
+    WsxDLL: DLLNAME,
+    WdFlag: ULONG,
+    WdInputBufferLength: ULONG,
+    CfgDLL: DLLNAME,
+    WdPrefix: WDPREFIX,
+}}
+pub type PWDCONFIG = *mut WDCONFIG;
+STRUCT!{struct PDCONFIG2 {
+    PdName: PDNAME,
+    SdClass: SDCLASS,
+    PdDLL: DLLNAME,
+    PdFlag: ULONG,
+    OutBufLength: ULONG,
+    OutBufCount: ULONG,
+    OutBufDelay: ULONG,
+    InteractiveDelay: ULONG,
+    PortNumber: ULONG,
+    KeepAliveTimeout: ULONG,
+}}
+pub type PPDCONFIG2 = *mut PDCONFIG2;
+STRUCT!{struct WINSTATIONCLIENT {
+    Bitfields: ULONG,
+    ClientName: [WCHAR; CLIENTNAME_LENGTH + 1],
+    Domain: [WCHAR; DOMAIN_LENGTH + 1],
+    UserName: [WCHAR; USERNAME_LENGTH + 1],
+    Password: [WCHAR; PASSWORD_LENGTH + 1],
+    WorkDirectory: [WCHAR; DIRECTORY_LENGTH + 1],
+    InitialProgram: [WCHAR; INITIALPROGRAM_LENGTH + 1],
+    SerialNumber: ULONG,
+    EncryptionLevel: BYTE,
+    ClientAddressFamily: ULONG,
+    ClientAddress: [WCHAR; CLIENTADDRESS_LENGTH + 1],
+    HRes: USHORT,
+    VRes: USHORT,
+    ColorDepth: USHORT,
+    ProtocolType: USHORT,
+    KeyboardLayout: ULONG,
+    KeyboardType: ULONG,
+    KeyboardSubType: ULONG,
+    KeyboardFunctionKey: ULONG,
+    ImeFileName: [WCHAR; IMEFILENAME_LENGTH + 1],
+    ClientDirectory: [WCHAR; DIRECTORY_LENGTH + 1],
+    ClientLicense: [WCHAR; CLIENTLICENSE_LENGTH + 1],
+    ClientModem: [WCHAR; CLIENTMODEM_LENGTH + 1],
+    ClientBuildNumber: ULONG,
+    ClientHardwareId: ULONG,
+    ClientProductId: USHORT,
+    OutBufCountHost: USHORT,
+    OutBufCountClient: USHORT,
+    OutBufLength: USHORT,
+    AudioDriverName: [WCHAR; 9],
+    ClientTimeZone: TS_TIME_ZONE_INFORMATION,
+    ClientSessionId: ULONG,
+    ClientDigProductId: [WCHAR; CLIENT_PRODUCT_ID_LENGTH],
+    PerformanceFlags: ULONG,
+    ActiveInputLocale: ULONG,
+}}
+BITFIELD!{WINSTATIONCLIENT Bitfields: ULONG [
+    fTextOnly set_fTextOnly[0..1],
+    fDisableCtrlAltDel set_fDisableCtrlAltDel[1..2],
+    fMouse set_fMouse[2..3],
+    fDoubleClickDetect set_fDoubleClickDetect[3..4],
+    fINetClient set_fINetClient[4..5],
+    fPromptForPassword set_fPromptForPassword[5..6],
+    fMaximizeShell set_fMaximizeShell[6..7],
+    fEnableWindowsKey set_fEnableWindowsKey[7..8],
+    fRemoteConsoleAudio set_fRemoteConsoleAudio[8..9],
+    fPasswordIsScPin set_fPasswordIsScPin[9..10],
+    fNoAudioPlayback set_fNoAudioPlayback[10..11],
+    fUsingSavedCreds set_fUsingSavedCreds[11..12],
+]}
+pub type PWINSTATIONCLIENT = *mut WINSTATIONCLIENT;
+STRUCT!{struct TSHARE_COUNTERS {
+    Reserved: ULONG,
+}}
+pub type PTSHARE_COUNTERS = *mut TSHARE_COUNTERS;
+UNION!{union PROTOCOLCOUNTERS_Specific {
+    TShareCounters: TSHARE_COUNTERS,
+    Reserved: [ULONG; 100],
+}}
+STRUCT!{struct PROTOCOLCOUNTERS {
+    WdBytes: ULONG,
+    WdFrames: ULONG,
+    WaitForOutBuf: ULONG,
+    Frames: ULONG,
+    Bytes: ULONG,
+    CompressedBytes: ULONG,
+    CompressFlushes: ULONG,
+    Errors: ULONG,
+    Timeouts: ULONG,
+    AsyncFramingError: ULONG,
+    AsyncOverrunError: ULONG,
+    AsyncOverflowError: ULONG,
+    AsyncParityError: ULONG,
+    TdErrors: ULONG,
+    ProtocolType: USHORT,
+    Length: USHORT,
+    Specific: PROTOCOLCOUNTERS_Specific,
+}}
+pub type PPROTOCOLCOUNTERS = *mut PROTOCOLCOUNTERS;
+STRUCT!{struct THINWIRECACHE {
+    CacheReads: ULONG,
+    CacheHits: ULONG,
+}}
+pub type PTHINWIRECACHE = *mut THINWIRECACHE;
+pub const MAX_THINWIRECACHE: usize = 4;
+STRUCT!{struct RESERVED_CACHE {
+    ThinWireCache: [THINWIRECACHE; MAX_THINWIRECACHE],
+}}
+pub type PRESERVED_CACHE = *mut RESERVED_CACHE;
+STRUCT!{struct TSHARE_CACHE {
+    Reserved: ULONG,
+}}
+pub type PTSHARE_CACHE = *mut TSHARE_CACHE;
+UNION!{union CACHE_STATISTICS_Specific {
+    ReservedCacheStats: RESERVED_CACHE,
+    TShareCacheStats: TSHARE_CACHE,
+    Reserved: [ULONG; 20],
+}}
+STRUCT!{struct CACHE_STATISTICS {
+    ProtocolType: USHORT,
+    Length: USHORT,
+    Specific: CACHE_STATISTICS_Specific,
+}}
+pub type PCACHE_STATISTICS = *mut CACHE_STATISTICS;
+STRUCT!{struct PROTOCOLSTATUS {
+    Output: PROTOCOLCOUNTERS,
+    Input: PROTOCOLCOUNTERS,
+    Cache: CACHE_STATISTICS,
+    AsyncSignal: ULONG,
+    AsyncSignalMask: ULONG,
+}}
+pub type PPROTOCOLSTATUS = *mut PROTOCOLSTATUS;
+STRUCT!{struct WINSTATIONINFORMATION {
+    ConnectState: WINSTATIONSTATECLASS,
+    WinStationName: WINSTATIONNAME,
+    LogonId: ULONG,
+    ConnectTime: LARGE_INTEGER,
+    DisconnectTime: LARGE_INTEGER,
+    LastInputTime: LARGE_INTEGER,
+    LogonTime: LARGE_INTEGER,
+    Status: PROTOCOLSTATUS,
+    Domain: [WCHAR; DOMAIN_LENGTH + 1],
+    UserName: [WCHAR; USERNAME_LENGTH + 1],
+    CurrentTime: LARGE_INTEGER,
+}}
+pub type PWINSTATIONINFORMATION = *mut WINSTATIONINFORMATION;
+STRUCT!{struct WINSTATIONUSERTOKEN {
+    ProcessId: HANDLE,
+    ThreadId: HANDLE,
+    UserToken: HANDLE,
+}}
+pub type PWINSTATIONUSERTOKEN = *mut WINSTATIONUSERTOKEN;
+STRUCT!{struct WINSTATIONVIDEODATA {
+    HResolution: USHORT,
+    VResolution: USHORT,
+    fColorDepth: USHORT,
+}}
+pub type PWINSTATIONVIDEODATA = *mut WINSTATIONVIDEODATA;
+ENUM!{enum CDCLASS {
+    CdNone = 0,
+    CdModem = 1,
+    CdClass_Maximum = 2,
+}}
+STRUCT!{struct CDCONFIG {
+    CdClass: CDCLASS,
+    CdName: CDNAME,
+    CdDLL: DLLNAME,
+    CdFlag: ULONG,
+}}
+pub type PCDCONFIG = *mut CDCONFIG;
+pub type CLIENTDATANAME = [CHAR; CLIENTDATANAME_LENGTH + 1];
+pub type PCLIENTDATANAME = *mut CHAR;
+STRUCT!{struct WINSTATIONCLIENTDATA {
+    DataName: CLIENTDATANAME,
+    fUnicodeData: BOOLEAN,
+}}
+pub type PWINSTATIONCLIENTDATA = *mut WINSTATIONCLIENTDATA;
+ENUM!{enum LOADFACTORTYPE {
+    ErrorConstraint = 0,
+    PagedPoolConstraint = 1,
+    NonPagedPoolConstraint = 2,
+    AvailablePagesConstraint = 3,
+    SystemPtesConstraint = 4,
+    CPUConstraint = 5,
+}}
+STRUCT!{struct WINSTATIONLOADINDICATORDATA {
+    RemainingSessionCapacity: ULONG,
+    LoadFactor: LOADFACTORTYPE,
+    TotalSessions: ULONG,
+    DisconnectedSessions: ULONG,
+    IdleCPU: LARGE_INTEGER,
+    TotalCPU: LARGE_INTEGER,
+    RawSessionCapacity: ULONG,
+    reserved: [ULONG; 9],
+}}
+pub type PWINSTATIONLOADINDICATORDATA = *mut WINSTATIONLOADINDICATORDATA;
+ENUM!{enum SHADOWSTATECLASS {
+    State_NoShadow = 0,
+    State_Shadowing = 1,
+    State_Shadowed = 2,
+}}
+STRUCT!{struct WINSTATIONSHADOW {
+    ShadowState: SHADOWSTATECLASS,
+    ShadowClass: SHADOWCLASS,
+    SessionId: ULONG,
+    ProtocolType: ULONG,
+}}
+pub type PWINSTATIONSHADOW = *mut WINSTATIONSHADOW;
+STRUCT!{struct WINSTATIONPRODID {
+    DigProductId: [WCHAR; CLIENT_PRODUCT_ID_LENGTH],
+    ClientDigProductId: [WCHAR; CLIENT_PRODUCT_ID_LENGTH],
+    OuterMostDigProductId: [WCHAR; CLIENT_PRODUCT_ID_LENGTH],
+    CurrentSessionId: ULONG,
+    ClientSessionId: ULONG,
+    OuterMostSessionId: ULONG,
+}}
+pub type PWINSTATIONPRODID = *mut WINSTATIONPRODID;
+STRUCT!{struct WINSTATIONREMOTEADDRESS_u_ipv4 {
+    sin_port: USHORT,
+    sin_addr: ULONG,
+    sin_zero: [UCHAR; 8],
+}}
+STRUCT!{struct WINSTATIONREMOTEADDRESS_u_ipv6 {
+    sin6_port: USHORT,
+    sin6_flowinfo: ULONG,
+    sin6_addr: [USHORT; 8],
+    sin6_scope_id: ULONG,
+}}
+UNION!{union WINSTATIONREMOTEADDRESS_u {
+    ipv4: WINSTATIONREMOTEADDRESS_u_ipv4,
+    ipv6: WINSTATIONREMOTEADDRESS_u_ipv6,
+}}
+STRUCT!{struct WINSTATIONREMOTEADDRESS {
+    sin_family: USHORT,
+    u: WINSTATIONREMOTEADDRESS_u,
+}}
+pub type PWINSTATIONREMOTEADDRESS = *mut WINSTATIONREMOTEADDRESS;
+STRUCT!{struct WINSTATIONINFORMATIONEX_LEVEL1 {
+    SessionId: ULONG,
+    SessionState: WINSTATIONSTATECLASS,
+    SessionFlags: LONG,
+    WinStationName: WINSTATIONNAME,
+    UserName: [WCHAR; USERNAME_LENGTH + 1],
+    DomainName: [WCHAR; DOMAIN_LENGTH + 1],
+    LogonTime: LARGE_INTEGER,
+    ConnectTime: LARGE_INTEGER,
+    DisconnectTime: LARGE_INTEGER,
+    LastInputTime: LARGE_INTEGER,
+    CurrentTime: LARGE_INTEGER,
+    ProtocolStatus: PROTOCOLSTATUS,
+}}
+pub type PWINSTATIONINFORMATIONEX_LEVEL1 = *mut WINSTATIONINFORMATIONEX_LEVEL1;
+STRUCT!{struct WINSTATIONINFORMATIONEX_LEVEL2 {
+    SessionId: ULONG,
+    SessionState: WINSTATIONSTATECLASS,
+    SessionFlags: LONG,
+    WinStationName: WINSTATIONNAME,
+    SamCompatibleUserName: [WCHAR; USERNAME_LENGTH + 1],
+    SamCompatibleDomainName: [WCHAR; DOMAIN_LENGTH + 1],
+    LogonTime: LARGE_INTEGER,
+    ConnectTime: LARGE_INTEGER,
+    DisconnectTime: LARGE_INTEGER,
+    LastInputTime: LARGE_INTEGER,
+    CurrentTime: LARGE_INTEGER,
+    ProtocolStatus: PROTOCOLSTATUS,
+    UserName: [WCHAR; 257],
+    DomainName: [WCHAR; 256],
+}}
+pub type PWINSTATIONINFORMATIONEX_LEVEL2 = *mut WINSTATIONINFORMATIONEX_LEVEL2;
+UNION!{union WINSTATIONINFORMATIONEX_LEVEL {
+    WinStationInfoExLevel1: WINSTATIONINFORMATIONEX_LEVEL1,
+    WinStationInfoExLevel2: WINSTATIONINFORMATIONEX_LEVEL2,
+}}
+pub type PWINSTATIONINFORMATIONEX_LEVEL = *mut WINSTATIONINFORMATIONEX_LEVEL;
+STRUCT!{struct WINSTATIONINFORMATIONEX {
+    Level: ULONG,
+    Data: WINSTATIONINFORMATIONEX_LEVEL,
+}}
+pub type PWINSTATIONINFORMATIONEX = *mut WINSTATIONINFORMATIONEX;
+pub const TS_PROCESS_INFO_MAGIC_NT4: u32 = 0x23495452;
+STRUCT!{struct TS_PROCESS_INFORMATION_NT4 {
+    MagicNumber: ULONG,
+    LogonId: ULONG,
+    ProcessSid: PVOID,
+    Pad: ULONG,
+}}
+pub type PTS_PROCESS_INFORMATION_NT4 = *mut TS_PROCESS_INFORMATION_NT4;
+pub const SIZEOF_TS4_SYSTEM_THREAD_INFORMATION: u32 = 64;
+pub const SIZEOF_TS4_SYSTEM_PROCESS_INFORMATION: u32 = 136;
+STRUCT!{struct TS_SYS_PROCESS_INFORMATION {
+    NextEntryOffset: ULONG,
+    NumberOfThreads: ULONG,
+    SpareLi1: LARGE_INTEGER,
+    SpareLi2: LARGE_INTEGER,
+    SpareLi3: LARGE_INTEGER,
+    CreateTime: LARGE_INTEGER,
+    UserTime: LARGE_INTEGER,
+    KernelTime: LARGE_INTEGER,
+    ImageName: UNICODE_STRING,
+    BasePriority: LONG,
+    UniqueProcessId: ULONG,
+    InheritedFromUniqueProcessId: ULONG,
+    HandleCount: ULONG,
+    SessionId: ULONG,
+    SpareUl3: ULONG,
+    PeakVirtualSize: SIZE_T,
+    VirtualSize: SIZE_T,
+    PageFaultCount: ULONG,
+    PeakWorkingSetSize: ULONG,
+    WorkingSetSize: ULONG,
+    QuotaPeakPagedPoolUsage: SIZE_T,
+    QuotaPagedPoolUsage: SIZE_T,
+    QuotaPeakNonPagedPoolUsage: SIZE_T,
+    QuotaNonPagedPoolUsage: SIZE_T,
+    PagefileUsage: SIZE_T,
+    PeakPagefileUsage: SIZE_T,
+    PrivatePageCount: SIZE_T,
+}}
+pub type PTS_SYS_PROCESS_INFORMATION = *mut TS_SYS_PROCESS_INFORMATION;
+STRUCT!{struct TS_ALL_PROCESSES_INFO {
+    pTsProcessInfo: PTS_SYS_PROCESS_INFORMATION,
+    SizeOfSid: ULONG,
+    pSid: PSID,
+}}
+pub type PTS_ALL_PROCESSES_INFO = *mut TS_ALL_PROCESSES_INFO;
+STRUCT!{struct TS_COUNTER_HEADER {
+    dwCounterID: DWORD,
+    bResult: BOOLEAN,
+}}
+pub type PTS_COUNTER_HEADER = *mut TS_COUNTER_HEADER;
+STRUCT!{struct TS_COUNTER {
+    CounterHead: TS_COUNTER_HEADER,
+    dwValue: DWORD,
+    StartTime: LARGE_INTEGER,
+}}
+pub type PTS_COUNTER = *mut TS_COUNTER;
+pub const WSD_LOGOFF: ULONG = 0x1;
+pub const WSD_SHUTDOWN: ULONG = 0x2;
+pub const WSD_REBOOT: ULONG = 0x4;
+pub const WSD_POWEROFF: ULONG = 0x8;
+pub const WEVENT_NONE: ULONG = 0x0;
+pub const WEVENT_CREATE: ULONG = 0x1;
+pub const WEVENT_DELETE: ULONG = 0x2;
+pub const WEVENT_RENAME: ULONG = 0x4;
+pub const WEVENT_CONNECT: ULONG = 0x8;
+pub const WEVENT_DISCONNECT: ULONG = 0x10;
+pub const WEVENT_LOGON: ULONG = 0x20;
+pub const WEVENT_LOGOFF: ULONG = 0x40;
+pub const WEVENT_STATECHANGE: ULONG = 0x80;
+pub const WEVENT_LICENSE: ULONG = 0x100;
+pub const WEVENT_ALL: ULONG = 0x7fffffff;
+pub const WEVENT_FLUSH: ULONG = 0x80000000;
+pub const KBDSHIFT: USHORT = 0x1;
+pub const KBDCTRL: USHORT = 0x2;
+pub const KBDALT: USHORT = 0x4;
+pub const WNOTIFY_ALL_SESSIONS: ULONG = 0x1;
+pub const LOGONID_CURRENT: i32 = -1;
+pub const SERVERNAME_CURRENT: PWSTR = null_mut();
+EXTERN!{extern "system" {
+    fn WinStationFreeMemory(
+        Buffer: PVOID,
+    ) -> BOOLEAN;
+    fn WinStationOpenServerW(
+        ServerName: PWSTR,
+    ) -> HANDLE;
+    fn WinStationCloseServer(
+        ServerHandle: HANDLE,
+    ) -> BOOLEAN;
+    fn WinStationServerPing(
+        ServerHandle: HANDLE,
+    ) -> BOOLEAN;
+    fn WinStationGetTermSrvCountersValue(
+        ServerHandle: HANDLE,
+        Count: ULONG,
+        Counters: PTS_COUNTER,
+    ) -> BOOLEAN;
+    fn WinStationShutdownSystem(
+        ServerHandle: HANDLE,
+        ShutdownFlags: ULONG,
+    ) -> BOOLEAN;
+    fn WinStationWaitSystemEvent(
+        ServerHandle: HANDLE,
+        EventMask: ULONG,
+        EventFlags: PULONG,
+    ) -> BOOLEAN;
+    fn WinStationRegisterConsoleNotification(
+        ServerHandle: HANDLE,
+        WindowHandle: HWND,
+        Flags: ULONG,
+    ) -> BOOLEAN;
+    fn WinStationUnRegisterConsoleNotification(
+        ServerHandle: HANDLE,
+        WindowHandle: HWND,
+    ) -> BOOLEAN;
+    fn WinStationEnumerateW(
+        ServerHandle: HANDLE,
+        SessionIds: *mut PSESSIONIDW,
+        Count: PULONG,
+    ) -> BOOLEAN;
+    fn WinStationQueryInformationW(
+        ServerHandle: HANDLE,
+        SessionId: ULONG,
+        WinStationInformationClass: WINSTATIONINFOCLASS,
+        pWinStationInformation: PVOID,
+        WinStationInformationLength: ULONG,
+        pReturnLength: PULONG,
+    ) -> BOOLEAN;
+    fn WinStationSetInformationW(
+        ServerHandle: HANDLE,
+        SessionId: ULONG,
+        WinStationInformationClass: WINSTATIONINFOCLASS,
+        pWinStationInformation: PVOID,
+        WinStationInformationLength: ULONG,
+    ) -> BOOLEAN;
+    fn WinStationNameFromLogonIdW(
+        ServerHandle: HANDLE,
+        SessionId: ULONG,
+        pWinStationName: PWSTR,
+    ) -> BOOLEAN;
+    fn WinStationSendMessageW(
+        ServerHandle: HANDLE,
+        SessionId: ULONG,
+        Title: PWSTR,
+        TitleLength: ULONG,
+        Message: PWSTR,
+        MessageLength: ULONG,
+        Style: ULONG,
+        Timeout: ULONG,
+        Response: PULONG,
+        DoNotWait: BOOLEAN,
+    ) -> BOOLEAN;
+    fn WinStationConnectW(
+        ServerHandle: HANDLE,
+        SessionId: ULONG,
+        TargetSessionId: ULONG,
+        pPassword: PWSTR,
+        bWait: BOOLEAN,
+    ) -> BOOLEAN;
+    fn WinStationDisconnect(
+        ServerHandle: HANDLE,
+        SessionId: ULONG,
+        bWait: BOOLEAN,
+    ) -> BOOLEAN;
+    fn WinStationReset(
+        ServerHandle: HANDLE,
+        SessionId: ULONG,
+        bWait: BOOLEAN,
+    ) -> BOOLEAN;
+    fn WinStationShadow(
+        ServerHandle: HANDLE,
+        TargetServerName: PWSTR,
+        TargetSessionId: ULONG,
+        HotKeyVk: UCHAR,
+        HotkeyModifiers: USHORT,
+    ) -> BOOLEAN;
+    fn WinStationShadowStop(
+        ServerHandle: HANDLE,
+        SessionId: ULONG,
+        bWait: BOOLEAN,
+    ) -> BOOLEAN;
+    fn WinStationEnumerateProcesses(
+        ServerHandle: HANDLE,
+        Processes: *mut PVOID,
+    ) -> BOOLEAN;
+    fn WinStationGetAllProcesses(
+        ServerHandle: HANDLE,
+        Level: ULONG,
+        NumberOfProcesses: PULONG,
+        Processes: *mut PTS_ALL_PROCESSES_INFO,
+    ) -> BOOLEAN;
+    fn WinStationFreeGAPMemory(
+        Level: ULONG,
+        Processes: PTS_ALL_PROCESSES_INFO,
+        NumberOfProcesses: ULONG,
+    ) -> BOOLEAN;
+    fn WinStationTerminateProcess(
+        ServerHandle: HANDLE,
+        ProcessId: ULONG,
+        ExitCode: ULONG,
+    ) -> BOOLEAN;
+    fn WinStationGetProcessSid(
+        ServerHandle: HANDLE,
+        ProcessId: ULONG,
+        ProcessStartTime: FILETIME,
+        pProcessUserSid: PVOID,
+        dwSidSize: PULONG,
+    ) -> BOOLEAN;
+    fn WinStationSwitchToServicesSession() -> BOOLEAN;
+    fn WinStationRevertFromServicesSession() -> BOOLEAN;
+    fn _WinStationWaitForConnect() -> BOOLEAN;
+}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"603c5210dd959cf6ebd1cf3f9f4c115dafb2918e8d16c734eba1e375e9229365","Cargo.toml":"13af9055d96778670a80d939840f95389e90522049a196dcf2f87fed1db2936d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0b74dfa0bcee5c420c6b7f67b4b2658f9ab8388c97b8e733975f2cecbdd668a6","README.md":"8d2a8e636daba9e9b80c316c5eddacf9dc0abfda23eb321c406654b8443b9926","examples/ar.rs":"e7944efd03ad1bb70344bbf9d10e4ed44aa5ccdcfa70af2b1e76c130f6d5db93","examples/nm.rs":"25c40b89ac96298b6a99282bd9d459fcbb194e25a8fcdffd283248802e7aa8d7","examples/objcopy.rs":"64093c98fb5236a83cbd3046f171bbc3ecc6e1edf57e5416f39feac000e071e1","examples/objdump.rs":"2681e0008b35582e88b0eb04e9fee340fee475ccedcf4a729775cfdbb5b81270","examples/objectmap.rs":"0affc3afecea8e5418c3a839fa2697c914c4978d646dbb5841892dbac4df4a1c","src/archive.rs":"7ca11076759d4b87b42657f866b0d2b1dd07d2536b19645da0a5da5dd713b77d","src/common.rs":"d457c3747260d579ad6776820848de454850d384b5e3dbba31eb3309ec42fd55","src/elf.rs":"16a75ec17035f8b72ffb496765acbe175e52032df03e81d641575480bb63dfd6","src/endian.rs":"ceaad1b651627ad9e6218a168f87353ae651f5d76c9f61bc8099dff25007405e","src/lib.rs":"73aa5890f0c5c63bbf82704877cb98f9344162f2edd1b47afb963ff76d5efc9d","src/macho.rs":"fd1c199c450f0c91d3405ef18a397fbd39ed2145c51177681c68c27dc6f92914","src/pe.rs":"e21f22c28d06befb71292c449e5274ca620f4dbdf6cf331959d93791c1873c82","src/pod.rs":"47c2a4cd75df89cae932e318260586da4216510a2e3fa40fa9885894d9f973a2","src/read/any.rs":"7fbf06d083b15e69ebf83ec89880cf1bc0aead7cb803f90e47b55398bf56b827","src/read/archive.rs":"9c2d7d6f2aea2a2733a86f170264963e4dc2645622e0502c71a5fd41015e055e","src/read/coff/comdat.rs":"baa64820b25e17a50708afc616fb3a3eb308b183a93222d0d55be8aff26b6026","src/read/coff/file.rs":"994f05798bc81dc8ea82ede0629f16147492e096bdb51ab7113738ad57018552","src/read/coff/mod.rs":"5eed1c0ca7cf044b3173223b06afacc4961a0515ef2478fffa35641f4ee364ee","src/read/coff/relocation.rs":"ca751f163fa0ed96d39331850b0e7301b2ab36038824426df2962d3767ff6c48","src/read/coff/section.rs":"351a160ed6c11cf297b3b3316d3b87b3a6f31782763715d70eeae17555e8e6a1","src/read/coff/symbol.rs":"70e6db6b66941d5dabad72aa8bbcfe345cf50a204978f6281bfc486ab9007e4a","src/read/elf/comdat.rs":"2d8f7ecd4545351e89b3d1d98fadccf26e0a350cdfc42c6d4f5ea29e8ce3d72c","src/read/elf/compression.rs":"097ff8bdc78d01a1532b11c1c0cae3b35905128c7d98b471de188d46da3ff970","src/read/elf/file.rs":"b0bc065b150819d0e130cdfb42a792493e6d173f2723bd1c71de3399bdcff50d","src/read/elf/mod.rs":"365e0aaae1b33600c9f8a2b944a780d650266f83cb03d4546268fb40ef2b3604","src/read/elf/note.rs":"5aa4100de10cfe9c315fe306fe87ee7725334ce828b1b69412660d58d35db02a","src/read/elf/relocation.rs":"cf82b981f8faafee9a1129926a16757a23b80d00862c0389a4a837b4cc417f0a","src/read/elf/section.rs":"bec4b919ac6d0e15478d0a0c588388e4d78be394c590f71e1a1d75ab26aa97b5","src/read/elf/segment.rs":"1e7ffe5d62b28f75773f7b22f5344444e5959301caf355354d5f962a24a32267","src/read/elf/symbol.rs":"b5346bc2c46750eacf7fc5f44f9985b86b9e79da7324a66f19e6493477eccd35","src/read/macho/file.rs":"e299932d923391807c57de0ec41a1412391b0d0816570a1ca40234c8c265ef6a","src/read/macho/load_command.rs":"d6b3469140101c0d6f83f6cc5cd446c0bdd2ec2834ae2b42d2d8ca54106c0aea","src/read/macho/mod.rs":"bf5128078d75515c763f1605554557d91c3dd0fda8cc5eafc012d2c6fb2642be","src/read/macho/relocation.rs":"6cd7782f1def85e13f96c3548c00c199384028edda1de1a8d93e0aa12ce55e6a","src/read/macho/section.rs":"cb34a74020caa05e0be73f0896b96e1d58e3b0c59bddb79a8e03bc7798f6e074","src/read/macho/segment.rs":"2af4e635ee3194d78ba3dd2412c0fe74b8719eb43b46d9e2cf39b1674dafb336","src/read/macho/symbol.rs":"c8dcbf38506069039a2791a6c0b25ef95690c70a22ec4f6703e2c21e4c56dd3f","src/read/mod.rs":"036cebc7809874990d0f74e0bff2dceb9ec430f77bd16b0b7114cfd7c8c55be9","src/read/pe/file.rs":"2bb2932bd09c51703958a093845beb18ec6d2cd8e0bfa0a994711be2d71333c9","src/read/pe/mod.rs":"1a2cd741d15329e64d7089b314782db8ee39db26d45962c7e9de9aefe6d83aaf","src/read/pe/section.rs":"0f03cace202198dceb1e47f9d03c3a9b491f72fa3bd3d5f27a7dcd29991151d1","src/read/traits.rs":"d988b028fb6b8a108ce66ce49b2cfc36e653b5ba3f8a4a78b3ea7f76fe8166dd","src/read/util.rs":"a98f0720c2c393cc316184c93c2f76b6027ed3d8b2f692313c3f391b64002d6e","src/read/wasm.rs":"d483a0b408d9262f549610007d72f1bd282b08842e75a393394824fbd775d91d","src/write/coff.rs":"40f20a60090c9ca188b67dafb9a440f914d69063e6d81567468945a00125bfa8","src/write/elf.rs":"f94be9c3065d7ddc5ab6e98efdbca3848e17c494e8a5afb804453d122cd06ce6","src/write/macho.rs":"1ea6c84fe506ede639578b751299779ba51a84ee625751b9fa7e3e19ea20273b","src/write/mod.rs":"a68240e3db6e20f967d54f958e8cc335daee2a063aa2e51dc1ab7f224e831e5c","src/write/string.rs":"920d71223a5a146ef516b6d5fb6d22bc86a7e456da369ae8a4d1ca6b63d59892","src/write/util.rs":"c7f75a08c67a431edf14a4ef25b504196b9f4aef7145213aade1f5a290612c0c","tests/integration.rs":"d491a0ae0d50c3194cd7b81720262f55ccb234251346f188284ce29729823dc2","tests/parse_self.rs":"02aebb0548a98739a0705ba07785ffe0897bd04e450c5c914313b93b4dfd6b00","tests/round_trip/bss.rs":"021b909a03b86f1960291e7855bd7ca34c8eb6dc142f7b79f57b449042f18c3e","tests/round_trip/comdat.rs":"da73e513788f714ac98cc5dfe7bee22493959ac7ae91af539f1c912f59d63db6","tests/round_trip/common.rs":"311314045a32c1d7852b828f49fd841285d23c3faa92c53cd5eb11a0b003673f","tests/round_trip/elf.rs":"28b66be3c264dd80a6c122372036e88bc58a87c91ac1e57dbe8d8f4505ac0054","tests/round_trip/mod.rs":"0e73aa4ab258a313d17b4988f2f2c30f7716142c0a54219d5d4de3c1e1965753","tests/round_trip/tls.rs":"e73a8a4c0f064884b507bf75e7b9e20aaf557bf2cbfcd23ed577dc6c39d9f300"},"package":"8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"52a47c66164f368e5a167f1732525583ec574cd7de8be91fac29d52997b1c632","Cargo.lock":"a1190887088da0ebf768d172d97a9c21519fe4adb72860e4c9d3826307a57ce6","Cargo.toml":"2481b73a96029b6409d582b026d901d04f5ef12c12ccb27f3c997fa567ce18a7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0b74dfa0bcee5c420c6b7f67b4b2658f9ab8388c97b8e733975f2cecbdd668a6","README.md":"283c8881f81e647191130eea41b94fe877214e492fd35dd02a10c0698aaedcdf","clippy.toml":"50fd0cdaae995561b1d688c9410fe99335fc7ac3916a400dafd25ff63f8215f7","examples/ar.rs":"9846b618c70acfcb869895f1e1829a3b3824c04afd685ee7af289c91fcf0e420","examples/dyldcachedump.rs":"d30974ade7acbb13843ab5ffe74e825316f533b4bf7a6431799277d2340aad01","examples/nm.rs":"07b8dd510ad51640ffedba74ef3d05b290922d1a5ccf78237693e527124deb2d","examples/objcopy.rs":"e4e3a080733e877bd8024b3bd98dbf607e3ad9611db4f417a156c0f144f6b663","examples/objdump.rs":"1e0a27b2c3ac4dd85df9fc9a4463644de5f4762b3428e9b0d4f542c7084ff793","examples/objectmap.rs":"d36457d5334551a8d82880847a563ca619e022746e8ef3fd79f3a16193a5dd95","examples/readobj.rs":"49feba2fd34a6fb76e18763348e6ccf5a0c4ccf3779e5bc622df4d8ed14e82bf","src/archive.rs":"7ca11076759d4b87b42657f866b0d2b1dd07d2536b19645da0a5da5dd713b77d","src/common.rs":"9a16e67c321a6b35d35ce9d0611281f8f30b2c475cde68479d6a0fdd2b997a5e","src/elf.rs":"78df96810cb379e1dd8b4872ab90d2337855fa4d4d98fb09697d0750154dc40b","src/endian.rs":"ceaad1b651627ad9e6218a168f87353ae651f5d76c9f61bc8099dff25007405e","src/lib.rs":"fccca74e1e79d5d4dbb090a0103d91b5a0b4f71983d5e3ee3b139b13a9c7990d","src/macho.rs":"ef938fbfd5913711493ef4347a1b426b7ee661a2eb2038681552d7d8b7282e7a","src/pe.rs":"7a1b57131f43ed01472f4924f37657896880b82b127a153795388eb4577a640a","src/pod.rs":"9643a698e1388ad98d1e9ea074ca5b0b35599a2491a82e67a62ebcdc8cb19218","src/read/any.rs":"696a956935e7f1babb621ff71dec23154ca4bf906a8adfa5c02aac7a50117c69","src/read/archive.rs":"987eaf577ec47f5b4ac4e91c697abad31c00ead02f3241dde4f74ce24a884b20","src/read/coff/comdat.rs":"f4198dcdd2c270c9f1ba9efa30c6fb291913984079a45c02e6b6f57dce2700da","src/read/coff/file.rs":"3b15e43d5db9e3af025cda166dd731a5a10293c8d6a6a6f82e7ff4541a4b04a8","src/read/coff/mod.rs":"5eed1c0ca7cf044b3173223b06afacc4961a0515ef2478fffa35641f4ee364ee","src/read/coff/relocation.rs":"a9406980b89a33a16b4fa4f41f01d6db63096c46ff61bb8bd590f86f1d5ed5cf","src/read/coff/section.rs":"721e4f96c2de16f85192db0ad53ee34745bcbe8d551ad297d4f44ab13205ec06","src/read/coff/symbol.rs":"01a11c8f77c1b80d354d9437439cf4685b99bf254cc9eeadd19da2a394fc3c57","src/read/elf/comdat.rs":"340cccdea68c7ed77406ee45c4baa5f179588d77d90bb88b0cd9749d0d725cb1","src/read/elf/compression.rs":"097ff8bdc78d01a1532b11c1c0cae3b35905128c7d98b471de188d46da3ff970","src/read/elf/dynamic.rs":"2454551eb67757622b3d6660bc13ed39341be91f382eb8b1910095f58cf2bae2","src/read/elf/file.rs":"9d5958552ac3f590249c45795d40d8ffce0d41a6e4d9ae2f38f356ad4e46c05e","src/read/elf/hash.rs":"3a08046c78a6fd79bccfd1a0d4cc113da8d0664164576f290885b51d8110acca","src/read/elf/mod.rs":"98b5bd46778d3c33e9d19dee2d294f61677dec16b28f22aa73340008c241fe09","src/read/elf/note.rs":"33bf89a85bb7927fd0123cd6c2919f0b9b0f8935db1ae7b446b75ea2717a476d","src/read/elf/relocation.rs":"62b27c79964f7b037f4fb0b952afacd14790751828e82b67ed5890f143e2b2dc","src/read/elf/section.rs":"d692093ad195ccd0e4857c2f9c638543aa38a8179180e68d27a1f0784aa5e09a","src/read/elf/segment.rs":"d3cbb86cc9ca6eca93f9c17f36823dae0bd72ab2761f2b784dadd8f5b5c9dd9f","src/read/elf/symbol.rs":"9582039f44e82a3bbf225db12ddab9a3b3d5f4b0536d4125c18bb693da3c6db7","src/read/elf/version.rs":"c665034c90cb17e7bd1a6ba836966534fb2527698979908a704cf3b716c0dbdc","src/read/macho/dyld_cache.rs":"37330ba249226231b2e6ae7de80d60845c2eb7db854fd588c52fc706e13e49b8","src/read/macho/fat.rs":"05e84f0a10958ef4e3828f388cd5d2fea95481ea89aeb80b76a2784c4208e4a1","src/read/macho/file.rs":"c524be5be3447afb5aa9c68673f495de05e652687790397f6bf5617b9beea21a","src/read/macho/load_command.rs":"df976715bbc7699f7fdb8e9d388ba3e96a6d40c6a03b96c2696bd7c19786695a","src/read/macho/mod.rs":"23b353da3b7e076c68a067776e6a5b346a746116ac42c2c90bafd95ad54a90b3","src/read/macho/relocation.rs":"77fa3e65ccf5884433c96cdc39c457b8a0c430432e5ff9cad22a8becf13f0183","src/read/macho/section.rs":"59e70336d50f757d8d8daf44f23acca77de87cffcf2d62326e3b17c2ff9f672f","src/read/macho/segment.rs":"659b61a8cb563504f533c390fb901883b72c298f7bea037100a677cc9e4face4","src/read/macho/symbol.rs":"c0a615079779bf83bc3a6ae6d816f8d853099591f0b72e8646a624955bc5069e","src/read/mod.rs":"18ccc63d7acfc1af561d413738cafb1882368179257d36d2dc2496e21095bf7c","src/read/pe/file.rs":"f17836ac757dfd198323a2df1289b02dbb3ba85f2ceff0fdb7e565d30d555da3","src/read/pe/mod.rs":"05d9f3320596f9e567cbd791b68982d50a31e8d18f60c2c401c4a40eb50f1d94","src/read/pe/section.rs":"befd3c82fe6d9186b5802945853da9653649779989fd36cd2a835e3264156281","src/read/read_cache.rs":"939b66cfc11fc022c4e4b78fcad63b375516967da2274da78fb200271d934a53","src/read/read_ref.rs":"5fe6f717c79b07fecac9ee8ba15740c7a9581c36f1e356119e99dd669af6c39c","src/read/traits.rs":"5f29ae16bcf078c7089b22d7bd3ca9c6bc2eb637900a3b1cc70f9a45e5f8be09","src/read/util.rs":"c329a240689b177613049e00faf7928e6cd6aad021542cd708cc06b598c6900e","src/read/wasm.rs":"936ac6b218d23d7bb9ca6869f17cd8dafbed80ee0b267254c7a3ffe05bd46948","src/write/coff.rs":"16f52497fd18ec893c8f72903e9ea0bde6901e75acdfbc8be6a7305e13bccb8c","src/write/elf.rs":"2d6d3c4b014e9df7dd09e3ecf926a7d8fbac6e3cf3ab768e672b7c8ac1d38485","src/write/macho.rs":"fa058f9e7aa1e9895a3c4575fa527c3d5dbac186d994c9ba48801348a8428f35","src/write/mod.rs":"970620fba6e7b851981cda09929d93667a51d0c0be2c1491fdd8002d530515df","src/write/string.rs":"920d71223a5a146ef516b6d5fb6d22bc86a7e456da369ae8a4d1ca6b63d59892","src/write/util.rs":"3bf18004fd5cd25229e480856f36b3410f23b12c096de4c52ab13e11da75b2e3","tests/integration.rs":"d491a0ae0d50c3194cd7b81720262f55ccb234251346f188284ce29729823dc2","tests/parse_self.rs":"81b44b2dd1de9a5d8c18d9bd8926156e39fb83931837afa8ca344da0d309aeee","tests/round_trip/bss.rs":"849d69b063fd757fed02219dd81e9d13b82068a2025d2cc5cfd40cf557e31bda","tests/round_trip/comdat.rs":"2e3ef1aef466911646e5cbfe0b1a8c1543530baf8ca6102394519e701a1e2747","tests/round_trip/common.rs":"ced08ff559ca4d343ceef54bb4c581a3405cd96d6a1628ba43b7aab82070800b","tests/round_trip/elf.rs":"a1ff40266998321c75023cf76384f8ad03828c6d487421ea8b7774fce8173039","tests/round_trip/macho.rs":"b23931f506345b26ce3b4908dc2ce02f704603c622d39f5e9e7c8529f2882818","tests/round_trip/mod.rs":"b741ba432fdee2156699743962c64aaf2d1e9629c432e40953ac4d410688ea5a","tests/round_trip/tls.rs":"23a49a1036b9173ece82a3080745930e5925e745280ab38866c9d3c29f463e63"},"package":"39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,43 +1,45 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "adler"
-version = "0.2.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.32"
+version = "0.1.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc4ac2c824d2bfc612cba57708198547e9a26943af0632aff033e0693074d5c"
+checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2"
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.16"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
 dependencies = [
  "cfg-if",
  "crc32fast",
@@ -47,18 +49,15 @@
 
 [[package]]
 name = "hashbrown"
-version = "0.8.2"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
-dependencies = [
- "autocfg",
-]
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "indexmap"
-version = "1.5.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -66,38 +65,49 @@
 
 [[package]]
 name = "libc"
-version = "0.2.74"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
+checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
+
+[[package]]
+name = "memchr"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
 
 [[package]]
-name = "memmap"
-version = "0.7.0"
+name = "memmap2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
+checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357"
 dependencies = [
  "libc",
- "winapi",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.0"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
+ "autocfg",
 ]
 
 [[package]]
 name = "object"
-version = "0.22.0"
+version = "0.26.2"
 dependencies = [
  "compiler_builtins",
  "crc32fast",
  "flate2",
  "indexmap",
- "memmap",
+ "memchr",
+ "memmap2",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
  "wasmparser",
@@ -120,25 +130,3 @@
 version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,8 +13,7 @@
 [package]
 edition = "2018"
 name = "object"
-version = "0.22.0"
-authors = ["Nick Fitzgerald <fitzgen@gmail.com>", "Philip Craig <philipjcraig@gmail.com>"]
+version = "0.26.2"
 exclude = ["/.coveralls.yml", "/.travis.yml"]
 description = "A unified interface for reading and writing object file formats."
 keywords = ["object", "elf", "mach-o", "pe", "coff"]
@@ -24,8 +23,8 @@
 features = ["all"]
 
 [[example]]
-name = "nm"
-required-features = ["read"]
+name = "ar"
+required-features = ["read_core", "archive"]
 
 [[example]]
 name = "objcopy"
@@ -33,15 +32,19 @@
 
 [[example]]
 name = "objdump"
+required-features = ["read"]
+
+[[example]]
+name = "objectmap"
 required-features = ["read_core"]
 
 [[example]]
-name = "ar"
-required-features = ["read_core", "archive"]
+name = "nm"
+required-features = ["read"]
 
 [[example]]
-name = "objectmap"
-required-features = ["read_core"]
+name = "readobj"
+required-features = ["read"]
 [dependencies.alloc]
 version = "1.0.0"
 optional = true
@@ -68,14 +71,18 @@
 version = "1.1"
 optional = true
 
+[dependencies.memchr]
+version = "2.4.1"
+default-features = false
+
 [dependencies.wasmparser]
 version = "0.57"
 optional = true
-[dev-dependencies.memmap]
-version = "0.7"
+[dev-dependencies.memmap2]
+version = "0.3"
 
 [features]
-all = ["read", "write", "std", "compression", "default"]
+all = ["read", "write", "std", "compression", "wasm"]
 archive = []
 cargo-all = []
 coff = []
@@ -84,10 +91,10 @@
 elf = []
 macho = []
 pe = ["coff"]
-read = ["read_core", "archive", "coff", "elf", "macho", "pe", "wasm", "unaligned"]
+read = ["read_core", "archive", "coff", "elf", "macho", "pe", "unaligned"]
 read_core = []
-rustc-dep-of-std = ["core", "compiler_builtins", "alloc"]
-std = []
+rustc-dep-of-std = ["core", "compiler_builtins", "alloc", "memchr/rustc-dep-of-std"]
+std = ["memchr/std"]
 unaligned = []
 wasm = ["wasmparser"]
 write = ["write_core", "coff", "elf", "macho"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,164 @@
+# `object` Change Log
+
+--------------------------------------------------------------------------------
+
+## 0.26.2
+
+Released 2021/08/28.
+
+### Added
+
+* Added support for 64-bit symbol table names to `read::archive`.
+  [#366](https://github.com/gimli-rs/object/pull/366)
+
+--------------------------------------------------------------------------------
+
+## 0.26.1
+
+Released 2021/08/19.
+
+### Changed
+
+* Activate `memchr`'s `rustc-dep-of-std` feature
+  [#356](https://github.com/gimli-rs/object/pull/356)
+
+--------------------------------------------------------------------------------
+
+## 0.26.0
+
+Released 2021/07/26.
+
+### Breaking changes
+
+* Changed `ReadRef::read_bytes_at_until` to accept a range parameter.
+  [#326](https://github.com/gimli-rs/object/pull/326)
+
+* Added `ReadRef` type parameter to `read::StringTable` and types that
+  contain it. String table entries are now only read as required.
+  [#326](https://github.com/gimli-rs/object/pull/326)
+
+* Changed result type of `read::elf::SectionHeader::data` and `data_as_array`.
+  [#332](https://github.com/gimli-rs/object/pull/332)
+
+* Moved `pod::WritableBuffer` to `write::WritableBuffer`.
+  Renamed `WritableBuffer::extend` to `write_bytes`.
+  Added more provided methods to `WritableBuffer`.
+  [#335](https://github.com/gimli-rs/object/pull/335)
+
+* Moved `pod::Bytes` to `read::Bytes`.
+  [#336](https://github.com/gimli-rs/object/pull/336)
+
+* Added `is_mips64el` parameter to `elf::Rela64::r_info/set_r_info`.
+  [#337](https://github.com/gimli-rs/object/pull/337)
+
+### Changed
+
+* Removed `alloc` dependency when no features are enabled.
+  [#336](https://github.com/gimli-rs/object/pull/336)
+
+### Added
+
+* Added `read::pe::PeFile` methods: `section_table`, `data_directory`, and `data`.
+  [#324](https://github.com/gimli-rs/object/pull/324)
+
+* Added more ELF definitions.
+  [#332](https://github.com/gimli-rs/object/pull/332)
+
+* Added `read::elf::SectionTable` methods for hash tables and symbol version
+  information.
+  [#332](https://github.com/gimli-rs/object/pull/332)
+
+* Added PE RISC-V definitions.
+  [#333](https://github.com/gimli-rs/object/pull/333)
+
+* Added `WritableBuffer` implementation for `Vec`.
+  [#335](https://github.com/gimli-rs/object/pull/335)
+
+--------------------------------------------------------------------------------
+
+## 0.25.3
+
+Released 2021/06/12.
+
+### Added
+
+* Added `RelocationEncoding::AArch64Call`.
+  [#322](https://github.com/gimli-rs/object/pull/322)
+
+--------------------------------------------------------------------------------
+
+## 0.25.2
+
+Released 2021/06/04.
+
+### Added
+
+* Added `Architecture::X86_64_X32`.
+  [#320](https://github.com/gimli-rs/object/pull/320)
+
+--------------------------------------------------------------------------------
+
+## 0.25.1
+
+Released 2021/06/03.
+
+### Changed
+
+* write: Fix choice of `SHT_REL` or `SHT_RELA` for most architectures.
+  [#318](https://github.com/gimli-rs/object/pull/318)
+
+* write: Fix relocation encoding for MIPS64EL.
+  [#318](https://github.com/gimli-rs/object/pull/318)
+
+--------------------------------------------------------------------------------
+
+## 0.25.0
+
+Released 2021/06/02.
+
+### Breaking changes
+
+* Added `non_exhaustive` to most public enums.
+  [#306](https://github.com/gimli-rs/object/pull/306)
+
+* `MachHeader::parse` and `MachHeader::load_commands` now require a header offset.
+  [#304](https://github.com/gimli-rs/object/pull/304)
+
+* Added `ReadRef::read_bytes_at_until`.
+  [#308](https://github.com/gimli-rs/object/pull/308)
+
+* `PeFile::entry`, `PeSection::address` and `PeSegment::address` now return a
+  virtual address instead of a RVA.
+  [#315](https://github.com/gimli-rs/object/pull/315)
+
+### Added
+
+* Added `pod::from_bytes_mut`, `pod::slice_from_bytes_mut`, `pod::bytes_of_mut`,
+  and `pod::bytes_of_slice_mut`.
+  [#296](https://github.com/gimli-rs/object/pull/296)
+  [#297](https://github.com/gimli-rs/object/pull/297)
+
+* Added `Object::pdb_info`.
+  [#298](https://github.com/gimli-rs/object/pull/298)
+
+* Added `read::macho::DyldCache`, other associated definitions,
+  and support for these in the examples.
+  [#308](https://github.com/gimli-rs/object/pull/308)
+
+* Added more architecture support.
+  [#303](https://github.com/gimli-rs/object/pull/303)
+  [#309](https://github.com/gimli-rs/object/pull/309)
+
+* Derive more traits for enums.
+  [#311](https://github.com/gimli-rs/object/pull/311)
+
+* Added `Object::relative_address_base`.
+  [#315](https://github.com/gimli-rs/object/pull/315)
+
+### Changed
+
+* Improved performance for string parsing.
+  [#302](https://github.com/gimli-rs/object/pull/302)
+
+* `objdump` example allows selecting container members.
+  [#308](https://github.com/gimli-rs/object/pull/308)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/clippy.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/clippy.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/clippy.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/clippy.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+msrv = "1.42.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/ar.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/ar.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/ar.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/ar.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
             return;
         }
     };
-    let file = match unsafe { memmap::Mmap::map(&file) } {
+    let file = match unsafe { memmap2::Mmap::map(&file) } {
         Ok(mmap) => mmap,
         Err(err) => {
             println!("Failed to map file '{}': {}", file_path, err,);
@@ -36,7 +36,6 @@
     };
     match op.chars().next().unwrap() {
         't' => {
-            println!("kind: {:?}", archive.kind());
             for member in archive.members() {
                 let member = member.unwrap();
                 println!("{}", String::from_utf8_lossy(member.name()));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/dyldcachedump.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/dyldcachedump.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/dyldcachedump.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/dyldcachedump.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,50 @@
+use object::read::macho::DyldCache;
+use object::Endianness;
+use std::{env, fs, process};
+
+fn main() {
+    let arg_len = env::args().len();
+    if arg_len <= 1 {
+        eprintln!("Usage: {} <file> ...", env::args().next().unwrap());
+        process::exit(1);
+    }
+
+    for file_path in env::args().skip(1) {
+        if arg_len > 2 {
+            println!();
+            println!("{}:", file_path);
+        }
+
+        let file = match fs::File::open(&file_path) {
+            Ok(file) => file,
+            Err(err) => {
+                println!("Failed to open file '{}': {}", file_path, err,);
+                continue;
+            }
+        };
+        let file = match unsafe { memmap2::Mmap::map(&file) } {
+            Ok(mmap) => mmap,
+            Err(err) => {
+                println!("Failed to map file '{}': {}", file_path, err,);
+                continue;
+            }
+        };
+        let cache = match DyldCache::<Endianness>::parse(&*file) {
+            Ok(cache) => cache,
+            Err(err) => {
+                println!(
+                    "Failed to parse Dyld shared cache file '{}': {}",
+                    file_path, err,
+                );
+                continue;
+            }
+        };
+
+        // Print the list of image paths in this file.
+        for image in cache.images() {
+            if let Ok(path) = image.path() {
+                println!("{}", path);
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/nm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/nm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/nm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/nm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -25,7 +25,7 @@
                 continue;
             }
         };
-        let file = match unsafe { memmap::Mmap::map(&file) } {
+        let file = match unsafe { memmap2::Mmap::map(&file) } {
             Ok(mmap) => mmap,
             Err(err) => {
                 println!("Failed to map file '{}': {}", file_path, err,);
@@ -61,19 +61,10 @@
     }
 
     let mut kind = match symbol.section() {
-        SymbolSection::Unknown | SymbolSection::None => '?',
         SymbolSection::Undefined => 'U',
         SymbolSection::Absolute => 'A',
         SymbolSection::Common => 'C',
         SymbolSection::Section(index) => match section_kinds.get(&index) {
-            None
-            | Some(SectionKind::Unknown)
-            | Some(SectionKind::Other)
-            | Some(SectionKind::OtherString)
-            | Some(SectionKind::Debug)
-            | Some(SectionKind::Linker)
-            | Some(SectionKind::Note)
-            | Some(SectionKind::Metadata) => '?',
             Some(SectionKind::Text) => 't',
             Some(SectionKind::Data) | Some(SectionKind::Tls) | Some(SectionKind::TlsVariables) => {
                 'd'
@@ -81,7 +72,9 @@
             Some(SectionKind::ReadOnlyData) | Some(SectionKind::ReadOnlyString) => 'r',
             Some(SectionKind::UninitializedData) | Some(SectionKind::UninitializedTls) => 'b',
             Some(SectionKind::Common) => 'C',
+            _ => '?',
         },
+        _ => '?',
     };
 
     if symbol.is_global() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/objcopy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/objcopy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/objcopy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/objcopy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,7 +24,7 @@
             process::exit(1);
         }
     };
-    let in_file = match unsafe { memmap::Mmap::map(&in_file) } {
+    let in_file = match unsafe { memmap2::Mmap::map(&in_file) } {
         Ok(mmap) => mmap,
         Err(err) => {
             eprintln!("Failed to map file '{}': {}", in_file_path, err,);
@@ -78,7 +78,6 @@
             continue;
         }
         let (section, value) = match in_symbol.section() {
-            SymbolSection::Unknown => panic!("unknown symbol section for {:?}", in_symbol),
             SymbolSection::None => (write::SymbolSection::None, in_symbol.address()),
             SymbolSection::Undefined => (write::SymbolSection::Undefined, in_symbol.address()),
             SymbolSection::Absolute => (write::SymbolSection::Absolute, in_symbol.address()),
@@ -95,6 +94,7 @@
                     continue;
                 }
             }
+            _ => panic!("unknown symbol section for {:?}", in_symbol),
         };
         let flags = match in_symbol.flags() {
             SymbolFlags::None => SymbolFlags::None,
@@ -111,6 +111,7 @@
                     associative_section,
                 }
             }
+            _ => panic!("unknown symbol flags for {:?}", in_symbol),
         };
         let out_symbol = write::Symbol {
             name: in_symbol.name().unwrap_or("").as_bytes().to_vec(),
@@ -137,6 +138,7 @@
                 RelocationTarget::Section(section) => {
                     out_object.section_symbol(*out_sections.get(&section).unwrap())
                 }
+                _ => panic!("unknown relocation target for {:?}", in_relocation),
             };
             let out_relocation = write::Relocation {
                 offset,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/objdump.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/objdump.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/objdump.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/objdump.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,91 +1,230 @@
-use object::{Object, ObjectComdat, ObjectSection, ObjectSymbol};
+use object::read::archive::ArchiveFile;
+use object::read::macho::{DyldCache, FatArch, FatHeader};
+use object::{Endianness, Object, ObjectComdat, ObjectSection, ObjectSymbol};
 use std::{env, fs, process};
 
 fn main() {
-    let arg_len = env::args().len();
-    if arg_len <= 1 {
-        eprintln!("Usage: {} <file> ...", env::args().next().unwrap());
+    let mut args = env::args();
+    let cmd = args.next().unwrap();
+    if args.len() == 0 {
+        eprintln!("Usage: {} <file> [<member>...]", cmd);
         process::exit(1);
     }
+    let file_path = args.next().unwrap();
+    let mut member_names: Vec<_> = args.map(|name| (name, false)).collect();
 
-    for file_path in env::args().skip(1) {
-        if arg_len > 2 {
-            println!();
-            println!("{}:", file_path);
+    let file = match fs::File::open(&file_path) {
+        Ok(file) => file,
+        Err(err) => {
+            eprintln!("Failed to open file '{}': {}", file_path, err,);
+            process::exit(1);
+        }
+    };
+    let file = match unsafe { memmap2::Mmap::map(&file) } {
+        Ok(mmap) => mmap,
+        Err(err) => {
+            eprintln!("Failed to map file '{}': {}", file_path, err,);
+            process::exit(1);
+        }
+    };
+
+    if let Ok(archive) = ArchiveFile::parse(&*file) {
+        eprintln!("Format: Archive (kind: {:?})", archive.kind());
+        for member in archive.members() {
+            if let Ok(member) = member {
+                if find_member(&mut member_names, member.name()) {
+                    println!();
+                    println!("{}:", String::from_utf8_lossy(member.name()));
+                    if let Ok(data) = member.data(&*file) {
+                        dump_object(data);
+                    }
+                }
+            }
         }
-
-        let file = match fs::File::open(&file_path) {
-            Ok(file) => file,
-            Err(err) => {
-                println!("Failed to open file '{}': {}", file_path, err,);
-                return;
+    } else if let Ok(arches) = FatHeader::parse_arch32(&*file) {
+        println!("Format: Mach-O Fat 32");
+        for arch in arches {
+            println!();
+            println!("Fat Arch: {:?}", arch.architecture());
+            if let Ok(data) = arch.data(&*file) {
+                dump_object(data);
             }
-        };
-        let file = match unsafe { memmap::Mmap::map(&file) } {
-            Ok(mmap) => mmap,
-            Err(err) => {
-                println!("Failed to map file '{}': {}", file_path, err,);
-                return;
+        }
+    } else if let Ok(arches) = FatHeader::parse_arch64(&*file) {
+        println!("Format: Mach-O Fat 64");
+        for arch in arches {
+            println!();
+            println!("Fat Arch: {:?}", arch.architecture());
+            if let Ok(data) = arch.data(&*file) {
+                dump_object(data);
             }
-        };
-        let file = match object::File::parse(&*file) {
-            Ok(file) => file,
-            Err(err) => {
-                println!("Failed to parse file '{}': {}", file_path, err);
-                return;
+        }
+    } else if let Ok(cache) = DyldCache::<Endianness>::parse(&*file) {
+        println!("Format: dyld cache {:?}-endian", cache.endianness());
+        println!("Architecture: {:?}", cache.architecture());
+        for image in cache.images() {
+            if let Ok(path) = image.path() {
+                if find_member(&mut member_names, path.as_bytes()) {
+                    println!();
+                    println!("{}:", path);
+                    let file = match image.parse_object() {
+                        Ok(file) => file,
+                        Err(err) => {
+                            eprintln!("Failed to parse file: {}", err);
+                            continue;
+                        }
+                    };
+                    dump_parsed_object(&file);
+                }
             }
-        };
-
-        match file.mach_uuid() {
-            Ok(Some(uuid)) => println!("Mach UUID: {:x?}", uuid),
-            Ok(None) => {}
-            Err(e) => println!("Failed to parse Mach UUID: {}", e),
         }
-        match file.build_id() {
-            Ok(Some(build_id)) => println!("Build ID: {:x?}", build_id),
-            Ok(None) => {}
-            Err(e) => println!("Failed to parse build ID: {}", e),
+    } else {
+        dump_object(&*file);
+    }
+
+    for (name, found) in member_names {
+        if !found {
+            eprintln!("Failed to find member '{}", name);
         }
-        match file.gnu_debuglink() {
-            Ok(Some((filename, crc))) => println!(
-                "GNU debug link: {} CRC: {:08x}",
-                String::from_utf8_lossy(filename),
-                crc,
-            ),
-            Ok(None) => {}
-            Err(e) => println!("Failed to parse GNU debug link: {}", e),
+    }
+}
+
+fn find_member(member_names: &mut [(String, bool)], name: &[u8]) -> bool {
+    if member_names.is_empty() {
+        return true;
+    }
+    match member_names.iter().position(|x| x.0.as_bytes() == name) {
+        Some(i) => {
+            member_names[i].1 = true;
+            true
         }
+        None => false,
+    }
+}
 
-        for segment in file.segments() {
-            println!("{:?}", segment);
+fn dump_object(data: &[u8]) {
+    let file = match object::File::parse(data) {
+        Ok(file) => file,
+        Err(err) => {
+            println!("Failed to parse file: {}", err);
+            return;
         }
+    };
+    dump_parsed_object(&file);
+}
+
+fn dump_parsed_object(file: &object::File) {
+    println!(
+        "Format: {:?} {:?}-endian {}-bit",
+        file.format(),
+        file.endianness(),
+        if file.is_64() { "64" } else { "32" }
+    );
+    println!("Architecture: {:?}", file.architecture());
+    println!("Flags: {:x?}", file.flags());
+    println!("Relative Address Base: {:x?}", file.relative_address_base());
+    println!("Entry Address: {:x?}", file.entry());
+
+    match file.mach_uuid() {
+        Ok(Some(uuid)) => println!("Mach UUID: {:x?}", uuid),
+        Ok(None) => {}
+        Err(e) => println!("Failed to parse Mach UUID: {}", e),
+    }
+    match file.build_id() {
+        Ok(Some(build_id)) => println!("Build ID: {:x?}", build_id),
+        Ok(None) => {}
+        Err(e) => println!("Failed to parse build ID: {}", e),
+    }
+    match file.gnu_debuglink() {
+        Ok(Some((filename, crc))) => println!(
+            "GNU debug link: {} CRC: {:08x}",
+            String::from_utf8_lossy(filename),
+            crc,
+        ),
+        Ok(None) => {}
+        Err(e) => println!("Failed to parse GNU debug link: {}", e),
+    }
+    match file.gnu_debugaltlink() {
+        Ok(Some((filename, build_id))) => println!(
+            "GNU debug alt link: {}, build ID: {:x?}",
+            String::from_utf8_lossy(filename),
+            build_id,
+        ),
+        Ok(None) => {}
+        Err(e) => println!("Failed to parse GNU debug alt link: {}", e),
+    }
+    match file.pdb_info() {
+        Ok(Some(info)) => println!(
+            "PDB file: {}, GUID: {:x?}, Age: {}",
+            String::from_utf8_lossy(info.path()),
+            info.guid(),
+            info.age()
+        ),
+        Ok(None) => {}
+        Err(e) => println!("Failed to parse PE CodeView info: {}", e),
+    }
+
+    for segment in file.segments() {
+        println!("{:x?}", segment);
+    }
 
-        for section in file.sections() {
-            println!("{}: {:?}", section.index().0, section);
+    for section in file.sections() {
+        println!("{}: {:x?}", section.index().0, section);
+    }
+
+    for comdat in file.comdats() {
+        print!("{:?} Sections:", comdat);
+        for section in comdat.sections() {
+            print!(" {}", section.0);
         }
+        println!();
+    }
+
+    println!();
+    println!("Symbols");
+    for symbol in file.symbols() {
+        println!("{}: {:x?}", symbol.index().0, symbol);
+    }
 
-        for comdat in file.comdats() {
-            print!("{:?} Sections:", comdat);
-            for section in comdat.sections() {
-                print!(" {}", section.0);
+    for section in file.sections() {
+        if section.relocations().next().is_some() {
+            println!(
+                "\n{} relocations",
+                section.name().unwrap_or("<invalid name>")
+            );
+            for relocation in section.relocations() {
+                println!("{:x?}", relocation);
             }
-            println!();
         }
+    }
+
+    println!();
+    println!("Dynamic symbols");
+    for symbol in file.dynamic_symbols() {
+        println!("{}: {:x?}", symbol.index().0, symbol);
+    }
+
+    if let Some(relocations) = file.dynamic_relocations() {
+        println!();
+        println!("Dynamic relocations");
+        for relocation in relocations {
+            println!("{:x?}", relocation);
+        }
+    }
 
-        for symbol in file.symbols() {
-            println!("{}: {:?}", symbol.index().0, symbol);
+    let imports = file.imports().unwrap();
+    if !imports.is_empty() {
+        println!();
+        for import in imports {
+            println!("{:?}", import);
         }
+    }
 
-        for section in file.sections() {
-            if section.relocations().next().is_some() {
-                println!(
-                    "\n{} relocations",
-                    section.name().unwrap_or("<invalid name>")
-                );
-                for relocation in section.relocations() {
-                    println!("{:?}", relocation);
-                }
-            }
+    let exports = file.exports().unwrap();
+    if !exports.is_empty() {
+        println!();
+        for export in exports {
+            println!("{:x?}", export);
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/objectmap.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/objectmap.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/objectmap.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/objectmap.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
             process::exit(1);
         }
     };
-    let file = match unsafe { memmap::Mmap::map(&file) } {
+    let file = match unsafe { memmap2::Mmap::map(&file) } {
         Ok(mmap) => mmap,
         Err(err) => {
             println!("Failed to map file '{}': {}", file_path, err,);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/readobj.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/readobj.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/examples/readobj.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/examples/readobj.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5257 @@
+//! Example that uses the lower level read API.
+
+use object::read::archive::ArchiveFile;
+use object::read::macho::{FatArch, FatHeader};
+use object::Endianness;
+use std::convert::TryInto;
+use std::io::Write;
+use std::{env, fmt, fs, io, process, str};
+
+fn main() {
+    let arg_len = env::args().len();
+    if arg_len <= 1 {
+        eprintln!("Usage: {} <file> ...", env::args().next().unwrap());
+        process::exit(1);
+    }
+
+    for file_path in env::args().skip(1) {
+        if arg_len > 2 {
+            println!();
+            println!("{}:", file_path);
+        }
+
+        let file = match fs::File::open(&file_path) {
+            Ok(file) => file,
+            Err(err) => {
+                println!("Failed to open file '{}': {}", file_path, err);
+                continue;
+            }
+        };
+        let file = match unsafe { memmap2::Mmap::map(&file) } {
+            Ok(mmap) => mmap,
+            Err(err) => {
+                println!("Failed to map file '{}': {}", file_path, err);
+                continue;
+            }
+        };
+
+        let stdout = io::stdout();
+        let mut printer = Printer::new(stdout.lock());
+        print_object(&mut printer, &*file);
+    }
+}
+
+struct Printer<W: Write> {
+    w: W,
+    indent: usize,
+}
+
+impl<W: Write> Printer<W> {
+    fn new(w: W) -> Self {
+        Self { w, indent: 0 }
+    }
+
+    fn blank(&mut self) {
+        writeln!(self.w).unwrap();
+    }
+
+    fn print_indent(&mut self) {
+        if self.indent != 0 {
+            write!(self.w, "{:-1$}", " ", self.indent * 4).unwrap();
+        }
+    }
+
+    fn print_string(&mut self, s: &[u8]) {
+        if let Ok(s) = str::from_utf8(s) {
+            write!(self.w, "\"{}\"", s).unwrap();
+        } else {
+            write!(self.w, "{:X?}", s).unwrap();
+        }
+    }
+
+    fn indent<F: FnOnce(&mut Self)>(&mut self, f: F) {
+        self.indent += 1;
+        f(self);
+        self.indent -= 1;
+    }
+
+    fn group<F: FnOnce(&mut Self)>(&mut self, name: &str, f: F) {
+        self.print_indent();
+        writeln!(self.w, "{} {{", name).unwrap();
+        self.indent(f);
+        self.print_indent();
+        writeln!(self.w, "}}").unwrap();
+    }
+
+    fn field_name(&mut self, name: &str) {
+        self.print_indent();
+        if !name.is_empty() {
+            write!(self.w, "{}: ", name).unwrap();
+        }
+    }
+
+    fn field<T: fmt::Display>(&mut self, name: &str, value: T) {
+        self.field_name(name);
+        writeln!(self.w, "{}", value).unwrap();
+    }
+
+    fn field_hex<T: fmt::UpperHex>(&mut self, name: &str, value: T) {
+        self.field_name(name);
+        writeln!(self.w, "0x{:X}", value).unwrap();
+    }
+
+    fn field_bytes(&mut self, name: &str, value: &[u8]) {
+        self.field_name(name);
+        writeln!(self.w, "{:X?}", value).unwrap();
+    }
+
+    fn field_string<T: fmt::UpperHex>(&mut self, name: &str, value: T, s: Option<&[u8]>) {
+        if let Some(s) = s {
+            self.field_name(name);
+            self.print_string(s);
+            writeln!(self.w, " (0x{:X})", value).unwrap();
+        } else {
+            self.field_hex(name, value);
+        }
+    }
+
+    fn field_inline_string(&mut self, name: &str, s: &[u8]) {
+        self.field_name(name);
+        self.print_string(s);
+        writeln!(self.w).unwrap();
+    }
+
+    fn field_enum<T: Eq + fmt::UpperHex>(&mut self, name: &str, value: T, flags: &[Flag<T>]) {
+        for flag in flags {
+            if value == flag.value {
+                self.field_name(name);
+                writeln!(self.w, "{} (0x{:X})", flag.name, value).unwrap();
+                return;
+            }
+        }
+        self.field_hex(name, value);
+    }
+
+    fn field_enums<T: Eq + fmt::UpperHex>(&mut self, name: &str, value: T, enums: &[&[Flag<T>]]) {
+        for flags in enums {
+            for flag in *flags {
+                if value == flag.value {
+                    self.field_name(name);
+                    writeln!(self.w, "{} (0x{:X})", flag.name, value).unwrap();
+                    return;
+                }
+            }
+        }
+        self.field_hex(name, value);
+    }
+
+    fn flags<T: Into<u64>, U: Copy + Into<u64>>(&mut self, value: T, mask: U, flags: &[Flag<U>]) {
+        let value = value.into();
+        let mask = mask.into();
+        self.indent(|p| {
+            if mask != 0 {
+                for flag in flags {
+                    if value & mask == flag.value.into() {
+                        p.print_indent();
+                        writeln!(p.w, "{} (0x{:X})", flag.name, flag.value.into()).unwrap();
+                        return;
+                    }
+                }
+                p.print_indent();
+                writeln!(p.w, "<unknown> (0x{:X})", value & mask).unwrap();
+            } else {
+                for flag in flags {
+                    if value & flag.value.into() == flag.value.into() {
+                        p.print_indent();
+                        writeln!(p.w, "{} (0x{:X})", flag.name, flag.value.into()).unwrap();
+                    }
+                }
+                // TODO: display unknown flags (need to display all flags at once for this)
+            }
+        });
+    }
+}
+
+struct Flag<T> {
+    value: T,
+    name: &'static str,
+}
+
+macro_rules! flags {
+    ($($name:ident),+ $(,)?) => ( [ $(Flag { value: $name, name: stringify!($name), }),+ ] )
+}
+
+fn print_object(p: &mut Printer<impl Write>, data: &[u8]) {
+    let kind = match object::FileKind::parse(data) {
+        Ok(file) => file,
+        Err(err) => {
+            println!("Failed to parse file: {}", err);
+            return;
+        }
+    };
+    match kind {
+        object::FileKind::Archive => print_archive(p, data),
+        object::FileKind::Coff => pe::print_coff(p, data),
+        object::FileKind::DyldCache => macho::print_dyld_cache(p, data),
+        object::FileKind::Elf32 => elf::print_elf32(p, data),
+        object::FileKind::Elf64 => elf::print_elf64(p, data),
+        object::FileKind::MachO32 => macho::print_macho32(p, data, 0),
+        object::FileKind::MachO64 => macho::print_macho64(p, data, 0),
+        object::FileKind::MachOFat32 => macho::print_macho_fat32(p, data),
+        object::FileKind::MachOFat64 => macho::print_macho_fat64(p, data),
+        object::FileKind::Pe32 => pe::print_pe32(p, data),
+        object::FileKind::Pe64 => pe::print_pe64(p, data),
+        // TODO
+        _ => {}
+    }
+}
+
+fn print_object_at(p: &mut Printer<impl Write>, data: &[u8], offset: u64) {
+    let kind = match object::FileKind::parse_at(data, offset) {
+        Ok(file) => file,
+        Err(err) => {
+            println!("Failed to parse file: {}", err);
+            return;
+        }
+    };
+    match kind {
+        object::FileKind::MachO32 => macho::print_macho32(p, data, offset),
+        object::FileKind::MachO64 => macho::print_macho64(p, data, offset),
+        // TODO
+        _ => {}
+    }
+}
+
+fn print_archive(p: &mut Printer<impl Write>, data: &[u8]) {
+    if let Ok(archive) = ArchiveFile::parse(data) {
+        p.field("Format", format!("Archive ({:?})", archive.kind()));
+        for member in archive.members() {
+            if let Ok(member) = member {
+                p.blank();
+                p.field("Member", String::from_utf8_lossy(member.name()));
+                if let Ok(data) = member.data(data) {
+                    print_object(p, data);
+                }
+            }
+        }
+    }
+}
+
+mod elf {
+    use super::*;
+    use object::elf::*;
+    use object::read::elf::*;
+
+    pub(super) fn print_elf32(p: &mut Printer<impl Write>, data: &[u8]) {
+        if let Ok(elf) = FileHeader32::<Endianness>::parse(data) {
+            println!("Format: ELF 32-bit");
+            print_elf(p, elf, data);
+        }
+    }
+
+    pub(super) fn print_elf64(p: &mut Printer<impl Write>, data: &[u8]) {
+        if let Ok(elf) = FileHeader64::<Endianness>::parse(data) {
+            println!("Format: ELF 64-bit");
+            print_elf(p, elf, data);
+        }
+    }
+
+    fn print_elf<Elf: FileHeader<Endian = Endianness>>(
+        p: &mut Printer<impl Write>,
+        elf: &Elf,
+        data: &[u8],
+    ) {
+        if let Ok(endian) = elf.endian() {
+            print_file_header(p, endian, elf);
+            if let Ok(segments) = elf.program_headers(endian, data) {
+                print_program_headers(p, endian, data, elf, segments);
+            }
+            if let Ok(sections) = elf.sections(endian, data) {
+                print_section_headers(p, endian, data, elf, &sections);
+            }
+        }
+    }
+
+    fn print_file_header<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        elf: &Elf,
+    ) {
+        p.group("FileHeader", |p| {
+            p.group("Ident", |p| print_ident(p, elf.e_ident()));
+            p.field_enum("Type", elf.e_type(endian), &FLAGS_ET);
+            p.field_enum("Machine", elf.e_machine(endian), &FLAGS_EM);
+            let version = elf.e_version(endian);
+            if version < 256 {
+                p.field_enum("Version", version as u8, &FLAGS_EV);
+            } else {
+                p.field_hex("Version", version);
+            }
+            p.field_enum("Type", elf.e_type(endian), &FLAGS_ET);
+            p.field_hex("Entry", elf.e_entry(endian).into());
+            p.field_hex("ProgramHeaderOffset", elf.e_phoff(endian).into());
+            p.field_hex("SectionHeaderOffset", elf.e_shoff(endian).into());
+            let flags = elf.e_flags(endian);
+            p.field_hex("Flags", flags);
+            match elf.e_machine(endian) {
+                EM_SPARC => p.flags(flags, 0, &FLAGS_EF_SPARC),
+                EM_SPARCV9 => p.flags(flags, 0, &FLAGS_EF_SPARCV9),
+                EM_MIPS => {
+                    p.flags(flags, 0, &FLAGS_EF_MIPS);
+                    p.flags(flags, EF_MIPS_ARCH, &FLAGS_EF_MIPS_ARCH);
+                }
+                EM_PARISC => {
+                    p.flags(flags, 0, &FLAGS_EF_PARISC);
+                    p.flags(flags, EF_PARISC_ARCH, &FLAGS_EF_PARISC_ARCH);
+                }
+                EM_ALPHA => p.flags(flags, 0, &FLAGS_EF_ALPHA),
+                EM_PPC => p.flags(flags, 0, &FLAGS_EF_PPC),
+                EM_PPC64 => p.flags(flags, 0, &FLAGS_EF_PPC64),
+                EM_ARM => {
+                    p.flags(flags, 0, &FLAGS_EF_ARM);
+                    p.flags(flags, EF_ARM_EABIMASK, &FLAGS_EF_ARM_EABI);
+                }
+                EM_CSKY => p.flags(flags, EF_CSKY_ABIMASK, &FLAGS_EF_CSKY_ABI),
+                EM_IA_64 => p.flags(flags, 0, &FLAGS_EF_IA_64),
+                EM_SH => p.flags(flags, EF_SH_MACH_MASK, &FLAGS_EF_SH_MACH),
+                EM_S390 => p.flags(flags, 0, &FLAGS_EF_S390),
+                EM_RISCV => {
+                    p.flags(flags, 0, &FLAGS_EF_RISCV);
+                    p.flags(flags, EF_RISCV_FLOAT_ABI, &FLAGS_EF_RISCV_FLOAT_ABI);
+                }
+                _ => {}
+            };
+            p.field_hex("HeaderSize", elf.e_ehsize(endian));
+            p.field_hex("ProgramHeaderEntrySize", elf.e_phentsize(endian));
+            p.field("ProgramHeaderCount", elf.e_phnum(endian));
+            p.field_hex("SectionHeaderEntrySize", elf.e_shentsize(endian));
+            p.field("SectionHeaderCount", elf.e_shnum(endian));
+            p.field("SectionHeaderStringTableIndex", elf.e_shstrndx(endian));
+        });
+    }
+
+    fn print_ident(p: &mut Printer<impl Write>, ident: &Ident) {
+        p.field("Magic", format!("{:X?}", ident.magic));
+        p.field_enum("Class", ident.class, &FLAGS_EI_CLASS);
+        p.field_enum("Data", ident.data, &FLAGS_EI_DATA);
+        p.field_enum("Version", ident.version, &FLAGS_EV);
+        p.field_enum("OsAbi", ident.os_abi, &FLAGS_EI_OSABI);
+        p.field_hex("AbiVersion", ident.abi_version);
+        p.field("Unused", format!("{:X?}", ident.padding));
+    }
+
+    fn print_program_headers<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        elf: &Elf,
+        segments: &[Elf::ProgramHeader],
+    ) {
+        for segment in segments {
+            p.group("ProgramHeader", |p| {
+                let proc = match elf.e_machine(endian) {
+                    EM_MIPS => FLAGS_PT_MIPS,
+                    EM_PARISC => FLAGS_PT_PARISC,
+                    EM_ARM => FLAGS_PT_ARM,
+                    EM_IA_64 => FLAGS_PT_IA_64,
+                    _ => &[],
+                };
+                let os = match elf.e_ident().os_abi {
+                    ELFOSABI_HPUX => FLAGS_PT_HP,
+                    _ => &[],
+                };
+                p.field_enums("Type", segment.p_type(endian), &[FLAGS_PT, proc, os]);
+
+                p.field_hex("Offset", segment.p_offset(endian).into());
+                p.field_hex("VirtualAddress", segment.p_vaddr(endian).into());
+                p.field_hex("PhysicalAddress", segment.p_paddr(endian).into());
+                p.field_hex("FileSize", segment.p_filesz(endian).into());
+                p.field_hex("MemorySize", segment.p_memsz(endian).into());
+
+                let flags = segment.p_flags(endian);
+                p.field_hex("Flags", flags);
+                p.flags(flags, 0, FLAGS_PF);
+                match elf.e_ident().os_abi {
+                    ELFOSABI_HPUX => p.flags(flags, 0, FLAGS_PF_HP),
+                    _ => {}
+                };
+                match elf.e_machine(endian) {
+                    EM_MIPS => p.flags(flags, 0, FLAGS_PF_MIPS),
+                    EM_PARISC => p.flags(flags, 0, FLAGS_PF_PARISC),
+                    EM_ARM => p.flags(flags, 0, FLAGS_PF_ARM),
+                    EM_IA_64 => p.flags(flags, 0, FLAGS_PF_IA_64),
+                    _ => {}
+                };
+
+                p.field_hex("Align", segment.p_align(endian).into());
+
+                match segment.p_type(endian) {
+                    PT_NOTE => print_segment_notes(p, endian, data, elf, segment),
+                    PT_DYNAMIC => print_segment_dynamic(p, endian, data, elf, segments, segment),
+                    // TODO:
+                    //PT_INTERP =>
+                    //PT_SHLIB =>
+                    //PT_PHDR =>
+                    //PT_TLS =>
+                    //PT_GNU_EH_FRAME =>
+                    //PT_GNU_STACK =>
+                    //PT_GNU_RELRO =>
+                    _ => {}
+                }
+            });
+        }
+    }
+
+    fn print_segment_notes<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        _elf: &Elf,
+        segment: &Elf::ProgramHeader,
+    ) {
+        if let Ok(Some(notes)) = segment.notes(endian, data) {
+            print_notes(p, endian, notes);
+        }
+    }
+
+    fn print_segment_dynamic<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        elf: &Elf,
+        segments: &[Elf::ProgramHeader],
+        segment: &Elf::ProgramHeader,
+    ) {
+        if let Ok(Some(dynamic)) = segment.dynamic(endian, data) {
+            // TODO: add a helper API for this and the other mandatory tags?
+            let mut strtab = 0;
+            let mut strsz = 0;
+            for d in dynamic {
+                let tag = d.d_tag(endian).into();
+                if tag == DT_STRTAB.into() {
+                    strtab = d.d_val(endian).into();
+                } else if tag == DT_STRSZ.into() {
+                    strsz = d.d_val(endian).into();
+                }
+            }
+            let mut dynstr = object::StringTable::default();
+            for s in segments {
+                if let Ok(Some(data)) = s.data_range(endian, data, strtab, strsz) {
+                    dynstr = object::StringTable::new(data, 0, data.len() as u64);
+                    break;
+                }
+            }
+
+            let proc = match elf.e_machine(endian) {
+                EM_SPARC => FLAGS_DT_SPARC,
+                EM_MIPS => FLAGS_DT_MIPS,
+                EM_ALPHA => FLAGS_DT_ALPHA,
+                EM_PPC => FLAGS_DT_PPC,
+                EM_PPC64 => FLAGS_DT_PPC64,
+                EM_IA_64 => FLAGS_DT_IA_64,
+                EM_ALTERA_NIOS2 => FLAGS_DT_NIOS2,
+                _ => &[],
+            };
+            for d in dynamic {
+                let tag = d.d_tag(endian).into();
+                let val = d.d_val(endian).into();
+                p.group("Dynamic", |p| {
+                    if let Ok(tag) = tag.try_into() {
+                        p.field_enums("Tag", tag, &[FLAGS_DT, proc]);
+                        if tag == DT_NEEDED {
+                            p.field_string(
+                                "Value",
+                                val,
+                                val.try_into().ok().and_then(|val| dynstr.get(val).ok()),
+                            );
+                        } else {
+                            p.field_hex("Value", val);
+                            if tag == DT_FLAGS {
+                                p.flags(val, 0, FLAGS_DF);
+                            } else if tag == DT_FLAGS_1 {
+                                p.flags(val, 0, FLAGS_DF_1);
+                            }
+                        }
+                    } else {
+                        p.field_hex("Tag", tag);
+                        p.field_hex("Value", val);
+                    }
+                });
+                if tag == DT_NULL.into() {
+                    break;
+                }
+            }
+        }
+    }
+
+    fn print_section_headers<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        elf: &Elf,
+        sections: &SectionTable<Elf>,
+    ) {
+        for (index, section) in sections.iter().enumerate() {
+            p.group("SectionHeader", |p| {
+                p.field("Index", index);
+                p.field_string(
+                    "Name",
+                    section.sh_name(endian),
+                    sections.section_name(endian, section).ok(),
+                );
+
+                let proc = match elf.e_machine(endian) {
+                    EM_MIPS => FLAGS_SHT_MIPS,
+                    EM_PARISC => FLAGS_SHT_PARISC,
+                    EM_ALPHA => FLAGS_SHT_ALPHA,
+                    EM_ARM => FLAGS_SHT_ARM,
+                    EM_CSKY => FLAGS_SHT_CSKY,
+                    EM_IA_64 => FLAGS_SHT_IA_64,
+                    EM_X86_64 => FLAGS_SHT_X86_64,
+                    _ => &[],
+                };
+                p.field_enums("Type", section.sh_type(endian), &[FLAGS_SHT, proc]);
+
+                let flags = section.sh_flags(endian).into();
+                p.field_hex("Flags", flags);
+                p.flags(flags, 0, FLAGS_SHF);
+                match elf.e_machine(endian) {
+                    EM_MIPS => p.flags(flags, 0, FLAGS_SHF_MIPS),
+                    EM_PARISC => p.flags(flags, 0, FLAGS_SHF_PARISC),
+                    EM_ALPHA => p.flags(flags, 0, FLAGS_SHF_ALPHA),
+                    EM_ARM => p.flags(flags, 0, FLAGS_SHF_ARM),
+                    EM_IA_64 => p.flags(flags, 0, FLAGS_SHF_IA_64),
+                    _ => {}
+                }
+
+                p.field_hex("Address", section.sh_addr(endian).into());
+                p.field_hex("Offset", section.sh_offset(endian).into());
+                p.field_hex("Size", section.sh_size(endian).into());
+                p.field("Link", section.sh_link(endian));
+                p.field("Info", section.sh_info(endian));
+                p.field_hex("AddressAlign", section.sh_addralign(endian).into());
+                p.field_hex("EntrySize", section.sh_entsize(endian).into());
+
+                match section.sh_type(endian) {
+                    SHT_SYMTAB | SHT_DYNSYM => {
+                        print_section_symbols(p, endian, data, elf, sections, index, section)
+                    }
+                    SHT_REL => print_section_rel(p, endian, data, elf, sections, section),
+                    SHT_RELA => print_section_rela(p, endian, data, elf, sections, section),
+                    SHT_NOTE => print_section_notes(p, endian, data, elf, section),
+                    SHT_GROUP => print_section_group(p, endian, data, elf, sections, section),
+                    SHT_HASH => print_hash(p, endian, data, elf, sections, section),
+                    SHT_GNU_HASH => print_gnu_hash(p, endian, data, elf, sections, section),
+                    SHT_GNU_VERDEF => print_gnu_verdef(p, endian, data, elf, sections, section),
+                    SHT_GNU_VERNEED => print_gnu_verneed(p, endian, data, elf, sections, section),
+                    SHT_GNU_VERSYM => print_gnu_versym(p, endian, data, elf, sections, section),
+                    // TODO:
+                    //SHT_DYNAMIC =>
+                    //SHT_SHLIB =>
+                    //SHT_INIT_ARRAY =>
+                    //SHT_FINI_ARRAY =>
+                    //SHT_PREINIT_ARRAY =>
+                    _ => {}
+                }
+            });
+        }
+    }
+
+    fn print_section_symbols<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        elf: &Elf,
+        sections: &SectionTable<Elf>,
+        section_index: usize,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(symbols)) = section.symbols(endian, data, sections, section_index) {
+            let os_stt = match elf.e_ident().os_abi {
+                ELFOSABI_GNU => FLAGS_STT_GNU,
+                ELFOSABI_HPUX => FLAGS_STT_HP,
+                _ => &[],
+            };
+            let proc_stt = match elf.e_machine(endian) {
+                EM_SPARC => FLAGS_STT_SPARC,
+                EM_PARISC => FLAGS_STT_PARISC,
+                EM_ARM => FLAGS_STT_ARM,
+                _ => &[],
+            };
+            let os_stb = match elf.e_ident().os_abi {
+                ELFOSABI_GNU => FLAGS_STB_GNU,
+                _ => &[],
+            };
+            let proc_stb = match elf.e_machine(endian) {
+                EM_MIPS => FLAGS_STB_MIPS,
+                _ => &[],
+            };
+            let proc_shn = match elf.e_machine(endian) {
+                EM_MIPS => FLAGS_SHN_MIPS,
+                EM_PARISC => FLAGS_SHN_PARISC,
+                _ => &[],
+            };
+            for (index, symbol) in symbols.iter().enumerate() {
+                p.group("Symbol", |p| {
+                    p.field("Index", index);
+                    p.field_string(
+                        "Name",
+                        symbol.st_name(endian),
+                        symbol.name(endian, symbols.strings()).ok(),
+                    );
+                    p.field_hex("Value", symbol.st_value(endian).into());
+                    p.field_hex("Size", symbol.st_size(endian).into());
+                    p.field_enums("Type", symbol.st_type(), &[FLAGS_STT, os_stt, proc_stt]);
+                    p.field_enums("Bind", symbol.st_bind(), &[FLAGS_STB, os_stb, proc_stb]);
+
+                    let other = symbol.st_other();
+                    if other & !0x3 == 0 {
+                        p.field_enum("Other", other, FLAGS_STV);
+                    } else {
+                        p.field_hex("Other", other);
+                        p.flags(other, 0x3, FLAGS_STV);
+                        match elf.e_machine(endian) {
+                            EM_MIPS => p.flags(other, 0, FLAGS_STO_MIPS),
+                            EM_ALPHA => p.flags(other, 0, FLAGS_STO_ALPHA),
+                            EM_PPC64 => p.field_hex(
+                                "Local",
+                                (other & STO_PPC64_LOCAL_MASK) >> STO_PPC64_LOCAL_BIT,
+                            ),
+                            _ => {}
+                        }
+                    }
+
+                    let shndx = symbol.st_shndx(endian);
+                    if shndx == SHN_UNDEF || shndx >= SHN_LORESERVE {
+                        p.field_enums("SectionIndex", shndx, &[FLAGS_SHN, proc_shn]);
+                    } else {
+                        p.field("SectionIndex", shndx);
+                    }
+                    if let Some(shndx) = symbols.shndx(index) {
+                        p.field("ExtendedSectionIndex", shndx);
+                    }
+                });
+            }
+        }
+    }
+
+    fn print_section_rel<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        elf: &Elf,
+        sections: &SectionTable<Elf>,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(relocations)) = section.rel(endian, data) {
+            let symbols = section.relocation_symbols(endian, data, sections).ok();
+            let proc = rel_flag_type(endian, elf);
+            for relocation in relocations {
+                p.group("Relocation", |p| {
+                    p.field_hex("Offset", relocation.r_offset(endian).into());
+                    p.field_enum("Type", relocation.r_type(endian), proc);
+                    let sym = relocation.r_sym(endian);
+                    p.field_string("Symbol", sym, rel_symbol(endian, symbols, sym as usize));
+                });
+            }
+        }
+    }
+
+    fn print_section_rela<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        elf: &Elf,
+        sections: &SectionTable<Elf>,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(relocations)) = section.rela(endian, data) {
+            let symbols = section.relocation_symbols(endian, data, sections).ok();
+            let proc = rel_flag_type(endian, elf);
+            for relocation in relocations {
+                p.group("Relocation", |p| {
+                    p.field_hex("Offset", relocation.r_offset(endian).into());
+                    p.field_enum(
+                        "Type",
+                        relocation.r_type(endian, elf.is_mips64el(endian)),
+                        proc,
+                    );
+                    let sym = relocation.r_sym(endian, elf.is_mips64el(endian));
+                    p.field_string("Symbol", sym, rel_symbol(endian, symbols, sym as usize));
+                    let addend = relocation.r_addend(endian).into() as u64;
+                    if addend != 0 {
+                        p.field_hex("Addend", addend);
+                    }
+                });
+            }
+        }
+    }
+
+    fn rel_symbol<'data, Elf: FileHeader>(
+        endian: Elf::Endian,
+        symbols: Option<SymbolTable<'data, Elf>>,
+        sym: usize,
+    ) -> Option<&'data [u8]> {
+        let symbols = symbols?;
+        let symbol = symbols.symbol(sym as usize).ok()?;
+        symbol.name(endian, symbols.strings()).ok()
+    }
+
+    fn rel_flag_type<Elf: FileHeader>(endian: Elf::Endian, elf: &Elf) -> &'static [Flag<u32>] {
+        match elf.e_machine(endian) {
+            EM_68K => FLAGS_R_68K,
+            EM_386 => FLAGS_R_386,
+            EM_SPARC => FLAGS_R_SPARC,
+            EM_MIPS => FLAGS_R_MIPS,
+            EM_PARISC => FLAGS_R_PARISC,
+            EM_ALPHA => FLAGS_R_ALPHA,
+            EM_PPC => FLAGS_R_PPC,
+            EM_PPC64 => FLAGS_R_PPC64,
+            EM_AARCH64 => FLAGS_R_AARCH64,
+            EM_ARM => FLAGS_R_ARM,
+            EM_CSKY => FLAGS_R_CKCORE,
+            EM_IA_64 => FLAGS_R_IA64,
+            EM_SH => FLAGS_R_SH,
+            EM_S390 => FLAGS_R_390,
+            EM_CRIS => FLAGS_R_CRIS,
+            EM_X86_64 => FLAGS_R_X86_64,
+            EM_MN10300 => FLAGS_R_MN10300,
+            EM_M32R => FLAGS_R_M32R,
+            EM_MICROBLAZE => FLAGS_R_MICROBLAZE,
+            EM_ALTERA_NIOS2 => FLAGS_R_NIOS2,
+            EM_TILEPRO => FLAGS_R_TILEPRO,
+            EM_TILEGX => FLAGS_R_TILEGX,
+            EM_RISCV => FLAGS_R_RISCV,
+            EM_BPF => FLAGS_R_BPF,
+            EM_METAG => FLAGS_R_METAG,
+            EM_NDS32 => FLAGS_R_NDS32,
+            _ => &[],
+        }
+    }
+
+    fn print_section_notes<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        _elf: &Elf,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(notes)) = section.notes(endian, data) {
+            print_notes(p, endian, notes);
+        }
+    }
+
+    fn print_section_group<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        _elf: &Elf,
+        sections: &SectionTable<Elf>,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some((flag, members))) = section.group(endian, data) {
+            p.field_enum("GroupFlag", flag, FLAGS_GRP);
+            p.group("GroupSections", |p| {
+                for member in members {
+                    let index = member.get(endian);
+                    p.print_indent();
+                    if let Ok(section) = sections.section(index as usize) {
+                        if let Ok(name) = sections.section_name(endian, section) {
+                            p.print_string(name);
+                            writeln!(p.w, " ({})", index).unwrap();
+                        } else {
+                            writeln!(p.w, "{}", index).unwrap();
+                        }
+                    } else {
+                        writeln!(p.w, "{}", index).unwrap();
+                    }
+                }
+            });
+        }
+    }
+
+    fn print_notes<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        mut notes: NoteIterator<Elf>,
+    ) {
+        while let Ok(Some(note)) = notes.next() {
+            p.group("Note", |p| {
+                let name = note.name();
+                p.field_string("Name", note.n_namesz(endian), Some(name));
+                let flags = if name == ELF_NOTE_CORE || name == ELF_NOTE_LINUX {
+                    FLAGS_NT_CORE
+                } else if name == ELF_NOTE_SOLARIS {
+                    FLAGS_NT_SOLARIS
+                } else if name == ELF_NOTE_GNU {
+                    FLAGS_NT_GNU
+                } else {
+                    // TODO: NT_VERSION
+                    &[]
+                };
+                p.field_enum("Type", note.n_type(endian), flags);
+                // TODO: interpret desc
+                p.field_bytes("Desc", note.desc());
+            });
+        }
+    }
+
+    fn print_hash<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        _elf: &Elf,
+        _sections: &SectionTable<Elf>,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(hash)) = section.hash_header(endian, data) {
+            p.group("Hash", |p| {
+                p.field("BucketCount", hash.bucket_count.get(endian));
+                p.field("ChainCount", hash.chain_count.get(endian));
+            });
+        }
+        /* TODO: add this in a test somewhere
+        if let Ok(Some(hash_table)) = section.hash(endian, data) {
+            if let Ok(symbols) = _sections.symbols(endian, data, SHT_DYNSYM) {
+                for symbol in symbols.symbols() {
+                    let name = symbols.symbol_name(endian, symbol).unwrap();
+                    if !symbol.is_definition(endian) {
+                        continue;
+                    }
+                    let hash = hash(name);
+                    let hash_symbol = hash_table.find(endian, name, hash, &symbols).unwrap();
+                    let hash_name = symbols.symbol_name(endian, hash_symbol).unwrap();
+                    assert_eq!(name, hash_name);
+                }
+            }
+        }
+        */
+    }
+
+    fn print_gnu_hash<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        _elf: &Elf,
+        _sections: &SectionTable<Elf>,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(hash)) = section.gnu_hash_header(endian, data) {
+            p.group("GnuHash", |p| {
+                p.field("BucketCount", hash.bucket_count.get(endian));
+                p.field("SymbolBase", hash.symbol_base.get(endian));
+                p.field("BloomCount", hash.bloom_count.get(endian));
+                p.field("BloomShift", hash.bloom_shift.get(endian));
+            });
+        }
+        /* TODO: add this in a test somewhere
+        if let Ok(Some(hash_table)) = section.gnu_hash(endian, data) {
+            if let Ok(symbols) = _sections.symbols(endian, data, SHT_DYNSYM) {
+                for symbol in &symbols.symbols()[hash_table.symbol_base() as usize..] {
+                    let name = symbols.symbol_name(endian, symbol).unwrap();
+                    let hash = gnu_hash(name);
+                    let hash_symbol = hash_table.find(endian, name, hash, &symbols).unwrap();
+                    let hash_name = symbols.symbol_name(endian, hash_symbol).unwrap();
+                    assert_eq!(name, hash_name);
+                }
+            }
+        }
+        */
+    }
+
+    fn print_gnu_verdef<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        _elf: &Elf,
+        _sections: &SectionTable<Elf>,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(mut verdefs)) = section.gnu_verdef(endian, data) {
+            while let Ok(Some((verdef, mut verdauxs))) = verdefs.next() {
+                p.group("VersionDefinition", |p| {
+                    // TODO: names
+                    p.field("Version", verdef.vd_version.get(endian));
+                    p.field_hex("Flags", verdef.vd_flags.get(endian));
+                    p.flags(verdef.vd_flags.get(endian), 0, FLAGS_VER_FLG);
+                    p.field("Index", verdef.vd_ndx.get(endian) & !VER_NDX_HIDDEN);
+                    p.flags(verdef.vd_ndx.get(endian), 0, FLAGS_VER_NDX);
+                    p.field("AuxCount", verdef.vd_cnt.get(endian));
+                    p.field_hex("Hash", verdef.vd_hash.get(endian));
+                    p.field("AuxOffset", verdef.vd_aux.get(endian));
+                    p.field("NextOffset", verdef.vd_next.get(endian));
+                    while let Ok(Some(verdaux)) = verdauxs.next() {
+                        p.group("Aux", |p| {
+                            p.field_hex("Name", verdaux.vda_name.get(endian));
+                            p.field("NextOffset", verdaux.vda_next.get(endian));
+                        });
+                    }
+                });
+            }
+        }
+    }
+
+    fn print_gnu_verneed<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        _elf: &Elf,
+        _sections: &SectionTable<Elf>,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(mut verneeds)) = section.gnu_verneed(endian, data) {
+            while let Ok(Some((verneed, mut vernauxs))) = verneeds.next() {
+                p.group("VersionNeed", |p| {
+                    // TODO: names
+                    p.field("Version", verneed.vn_version.get(endian));
+                    p.field("AuxCount", verneed.vn_cnt.get(endian));
+                    p.field_hex("Filename", verneed.vn_file.get(endian));
+                    p.field("AuxOffset", verneed.vn_aux.get(endian));
+                    p.field("NextOffset", verneed.vn_next.get(endian));
+                    while let Ok(Some(vernaux)) = vernauxs.next() {
+                        p.group("Aux", |p| {
+                            p.field_hex("Hash", vernaux.vna_hash.get(endian));
+                            p.field_hex("Flags", vernaux.vna_flags.get(endian));
+                            p.flags(vernaux.vna_flags.get(endian), 0, FLAGS_VER_FLG);
+                            p.field("Index", vernaux.vna_other.get(endian) & !VER_NDX_HIDDEN);
+                            p.flags(vernaux.vna_other.get(endian), 0, FLAGS_VER_NDX);
+                            p.field_hex("Name", vernaux.vna_name.get(endian));
+                            p.field("NextOffset", vernaux.vna_next.get(endian));
+                        });
+                    }
+                });
+            }
+        }
+    }
+
+    fn print_gnu_versym<Elf: FileHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Elf::Endian,
+        data: &[u8],
+        _elf: &Elf,
+        _sections: &SectionTable<Elf>,
+        section: &Elf::SectionHeader,
+    ) {
+        if let Ok(Some(syms)) = section.gnu_versym(endian, data) {
+            for sym in syms {
+                p.group("VersionSymbol", |p| {
+                    p.field("Version", sym.0.get(endian) & !VER_NDX_HIDDEN);
+                    p.flags(sym.0.get(endian), 0, FLAGS_VER_NDX);
+                    // TODO: version name
+                });
+            }
+        }
+    }
+
+    static FLAGS_EI_CLASS: &[Flag<u8>] = &flags!(ELFCLASSNONE, ELFCLASS32, ELFCLASS64);
+    static FLAGS_EI_DATA: &[Flag<u8>] = &flags!(ELFDATANONE, ELFDATA2LSB, ELFDATA2MSB);
+    static FLAGS_EV: &[Flag<u8>] = &flags!(EV_NONE, EV_CURRENT);
+    static FLAGS_EI_OSABI: &[Flag<u8>] = &flags!(
+        ELFOSABI_SYSV,
+        ELFOSABI_HPUX,
+        ELFOSABI_NETBSD,
+        ELFOSABI_GNU,
+        ELFOSABI_SOLARIS,
+        ELFOSABI_AIX,
+        ELFOSABI_IRIX,
+        ELFOSABI_FREEBSD,
+        ELFOSABI_TRU64,
+        ELFOSABI_MODESTO,
+        ELFOSABI_OPENBSD,
+        ELFOSABI_ARM_AEABI,
+        ELFOSABI_ARM,
+        ELFOSABI_STANDALONE,
+    );
+    static FLAGS_ET: &[Flag<u16>] = &flags!(ET_NONE, ET_REL, ET_EXEC, ET_DYN, ET_CORE);
+    static FLAGS_EM: &[Flag<u16>] = &flags!(
+        EM_NONE,
+        EM_M32,
+        EM_SPARC,
+        EM_386,
+        EM_68K,
+        EM_88K,
+        EM_IAMCU,
+        EM_860,
+        EM_MIPS,
+        EM_S370,
+        EM_MIPS_RS3_LE,
+        EM_PARISC,
+        EM_VPP500,
+        EM_SPARC32PLUS,
+        EM_960,
+        EM_PPC,
+        EM_PPC64,
+        EM_S390,
+        EM_SPU,
+        EM_V800,
+        EM_FR20,
+        EM_RH32,
+        EM_RCE,
+        EM_ARM,
+        EM_FAKE_ALPHA,
+        EM_SH,
+        EM_SPARCV9,
+        EM_TRICORE,
+        EM_ARC,
+        EM_H8_300,
+        EM_H8_300H,
+        EM_H8S,
+        EM_H8_500,
+        EM_IA_64,
+        EM_MIPS_X,
+        EM_COLDFIRE,
+        EM_68HC12,
+        EM_MMA,
+        EM_PCP,
+        EM_NCPU,
+        EM_NDR1,
+        EM_STARCORE,
+        EM_ME16,
+        EM_ST100,
+        EM_TINYJ,
+        EM_X86_64,
+        EM_PDSP,
+        EM_PDP10,
+        EM_PDP11,
+        EM_FX66,
+        EM_ST9PLUS,
+        EM_ST7,
+        EM_68HC16,
+        EM_68HC11,
+        EM_68HC08,
+        EM_68HC05,
+        EM_SVX,
+        EM_ST19,
+        EM_VAX,
+        EM_CRIS,
+        EM_JAVELIN,
+        EM_FIREPATH,
+        EM_ZSP,
+        EM_MMIX,
+        EM_HUANY,
+        EM_PRISM,
+        EM_AVR,
+        EM_FR30,
+        EM_D10V,
+        EM_D30V,
+        EM_V850,
+        EM_M32R,
+        EM_MN10300,
+        EM_MN10200,
+        EM_PJ,
+        EM_OPENRISC,
+        EM_ARC_COMPACT,
+        EM_XTENSA,
+        EM_VIDEOCORE,
+        EM_TMM_GPP,
+        EM_NS32K,
+        EM_TPC,
+        EM_SNP1K,
+        EM_ST200,
+        EM_IP2K,
+        EM_MAX,
+        EM_CR,
+        EM_F2MC16,
+        EM_MSP430,
+        EM_BLACKFIN,
+        EM_SE_C33,
+        EM_SEP,
+        EM_ARCA,
+        EM_UNICORE,
+        EM_EXCESS,
+        EM_DXP,
+        EM_ALTERA_NIOS2,
+        EM_CRX,
+        EM_XGATE,
+        EM_C166,
+        EM_M16C,
+        EM_DSPIC30F,
+        EM_CE,
+        EM_M32C,
+        EM_TSK3000,
+        EM_RS08,
+        EM_SHARC,
+        EM_ECOG2,
+        EM_SCORE7,
+        EM_DSP24,
+        EM_VIDEOCORE3,
+        EM_LATTICEMICO32,
+        EM_SE_C17,
+        EM_TI_C6000,
+        EM_TI_C2000,
+        EM_TI_C5500,
+        EM_TI_ARP32,
+        EM_TI_PRU,
+        EM_MMDSP_PLUS,
+        EM_CYPRESS_M8C,
+        EM_R32C,
+        EM_TRIMEDIA,
+        EM_HEXAGON,
+        EM_8051,
+        EM_STXP7X,
+        EM_NDS32,
+        EM_ECOG1X,
+        EM_MAXQ30,
+        EM_XIMO16,
+        EM_MANIK,
+        EM_CRAYNV2,
+        EM_RX,
+        EM_METAG,
+        EM_MCST_ELBRUS,
+        EM_ECOG16,
+        EM_CR16,
+        EM_ETPU,
+        EM_SLE9X,
+        EM_L10M,
+        EM_K10M,
+        EM_AARCH64,
+        EM_AVR32,
+        EM_STM8,
+        EM_TILE64,
+        EM_TILEPRO,
+        EM_MICROBLAZE,
+        EM_CUDA,
+        EM_TILEGX,
+        EM_CLOUDSHIELD,
+        EM_COREA_1ST,
+        EM_COREA_2ND,
+        EM_ARC_COMPACT2,
+        EM_OPEN8,
+        EM_RL78,
+        EM_VIDEOCORE5,
+        EM_78KOR,
+        EM_56800EX,
+        EM_BA1,
+        EM_BA2,
+        EM_XCORE,
+        EM_MCHP_PIC,
+        EM_KM32,
+        EM_KMX32,
+        EM_EMX16,
+        EM_EMX8,
+        EM_KVARC,
+        EM_CDP,
+        EM_COGE,
+        EM_COOL,
+        EM_NORC,
+        EM_CSR_KALIMBA,
+        EM_Z80,
+        EM_VISIUM,
+        EM_FT32,
+        EM_MOXIE,
+        EM_AMDGPU,
+        EM_RISCV,
+        EM_BPF,
+        EM_CSKY,
+        EM_ALPHA,
+    );
+    static FLAGS_EF_SPARC: &[Flag<u32>] = &flags!(
+        EF_SPARC_LEDATA,
+        EF_SPARC_EXT_MASK,
+        EF_SPARC_32PLUS,
+        EF_SPARC_SUN_US1,
+        EF_SPARC_HAL_R1,
+        EF_SPARC_SUN_US3,
+    );
+    static FLAGS_EF_SPARCV9: &[Flag<u32>] = &flags!(
+        EF_SPARCV9_MM,
+        EF_SPARCV9_TSO,
+        EF_SPARCV9_PSO,
+        EF_SPARCV9_RMO,
+    );
+    static FLAGS_EF_MIPS: &[Flag<u32>] = &flags!(
+        EF_MIPS_NOREORDER,
+        EF_MIPS_PIC,
+        EF_MIPS_CPIC,
+        EF_MIPS_XGOT,
+        EF_MIPS_64BIT_WHIRL,
+        EF_MIPS_ABI2,
+        EF_MIPS_ABI_ON32,
+        EF_MIPS_FP64,
+        EF_MIPS_NAN2008,
+    );
+    static FLAGS_EF_MIPS_ARCH: &[Flag<u32>] = &flags!(
+        EF_MIPS_ARCH_1,
+        EF_MIPS_ARCH_2,
+        EF_MIPS_ARCH_3,
+        EF_MIPS_ARCH_4,
+        EF_MIPS_ARCH_5,
+        EF_MIPS_ARCH_32,
+        EF_MIPS_ARCH_64,
+        EF_MIPS_ARCH_32R2,
+        EF_MIPS_ARCH_64R2,
+    );
+    static FLAGS_EF_PARISC: &[Flag<u32>] = &flags!(
+        EF_PARISC_TRAPNIL,
+        EF_PARISC_EXT,
+        EF_PARISC_LSB,
+        EF_PARISC_WIDE,
+        EF_PARISC_NO_KABP,
+        EF_PARISC_LAZYSWAP,
+    );
+    static FLAGS_EF_PARISC_ARCH: &[Flag<u32>] =
+        &flags!(EFA_PARISC_1_0, EFA_PARISC_1_1, EFA_PARISC_2_0);
+    static FLAGS_EF_ALPHA: &[Flag<u32>] = &flags!(EF_ALPHA_32BIT, EF_ALPHA_CANRELAX);
+    static FLAGS_EF_PPC: &[Flag<u32>] =
+        &flags!(EF_PPC_EMB, EF_PPC_RELOCATABLE, EF_PPC_RELOCATABLE_LIB);
+    static FLAGS_EF_PPC64: &[Flag<u32>] = &flags!(EF_PPC64_ABI);
+    static FLAGS_EF_ARM: &[Flag<u32>] = &flags!(
+        EF_ARM_RELEXEC,
+        EF_ARM_HASENTRY,
+        EF_ARM_INTERWORK,
+        EF_ARM_APCS_26,
+        EF_ARM_APCS_FLOAT,
+        EF_ARM_PIC,
+        EF_ARM_ALIGN8,
+        EF_ARM_NEW_ABI,
+        EF_ARM_OLD_ABI,
+        EF_ARM_SOFT_FLOAT,
+        EF_ARM_VFP_FLOAT,
+        EF_ARM_MAVERICK_FLOAT,
+        EF_ARM_BE8,
+        EF_ARM_LE8,
+    );
+    static FLAGS_EF_ARM_EABI: &[Flag<u32>] = &flags!(
+        EF_ARM_EABI_UNKNOWN,
+        EF_ARM_EABI_VER1,
+        EF_ARM_EABI_VER2,
+        EF_ARM_EABI_VER3,
+        EF_ARM_EABI_VER4,
+        EF_ARM_EABI_VER5,
+    );
+    static FLAGS_EF_CSKY_ABI: &[Flag<u32>] = &flags!(EF_CSKY_ABIV1, EF_CSKY_ABIV2);
+    static FLAGS_EF_IA_64: &[Flag<u32>] = &flags!(EF_IA_64_ABI64);
+    static FLAGS_EF_SH_MACH: &[Flag<u32>] = &flags!(
+        EF_SH_UNKNOWN,
+        EF_SH1,
+        EF_SH2,
+        EF_SH3,
+        EF_SH_DSP,
+        EF_SH3_DSP,
+        EF_SH4AL_DSP,
+        EF_SH3E,
+        EF_SH4,
+        EF_SH2E,
+        EF_SH4A,
+        EF_SH2A,
+        EF_SH4_NOFPU,
+        EF_SH4A_NOFPU,
+        EF_SH4_NOMMU_NOFPU,
+        EF_SH2A_NOFPU,
+        EF_SH3_NOMMU,
+        EF_SH2A_SH4_NOFPU,
+        EF_SH2A_SH3_NOFPU,
+        EF_SH2A_SH4,
+        EF_SH2A_SH3E,
+    );
+    static FLAGS_EF_S390: &[Flag<u32>] = &flags!(EF_S390_HIGH_GPRS);
+    static FLAGS_EF_RISCV: &[Flag<u32>] = &flags!(EF_RISCV_RVC);
+    static FLAGS_EF_RISCV_FLOAT_ABI: &[Flag<u32>] = &flags!(
+        EF_RISCV_FLOAT_ABI_SOFT,
+        EF_RISCV_FLOAT_ABI_SINGLE,
+        EF_RISCV_FLOAT_ABI_DOUBLE,
+        EF_RISCV_FLOAT_ABI_QUAD,
+    );
+    static FLAGS_PT: &[Flag<u32>] = &flags!(
+        PT_NULL,
+        PT_LOAD,
+        PT_DYNAMIC,
+        PT_INTERP,
+        PT_NOTE,
+        PT_SHLIB,
+        PT_PHDR,
+        PT_TLS,
+        PT_LOOS,
+        PT_GNU_EH_FRAME,
+        PT_GNU_STACK,
+        PT_GNU_RELRO,
+    );
+    static FLAGS_PT_HP: &[Flag<u32>] = &flags!(
+        PT_HP_TLS,
+        PT_HP_CORE_NONE,
+        PT_HP_CORE_VERSION,
+        PT_HP_CORE_KERNEL,
+        PT_HP_CORE_COMM,
+        PT_HP_CORE_PROC,
+        PT_HP_CORE_LOADABLE,
+        PT_HP_CORE_STACK,
+        PT_HP_CORE_SHM,
+        PT_HP_CORE_MMF,
+        PT_HP_PARALLEL,
+        PT_HP_FASTBIND,
+        PT_HP_OPT_ANNOT,
+        PT_HP_HSL_ANNOT,
+        PT_HP_STACK,
+    );
+    static FLAGS_PT_MIPS: &[Flag<u32>] = &flags!(
+        PT_MIPS_REGINFO,
+        PT_MIPS_RTPROC,
+        PT_MIPS_OPTIONS,
+        PT_MIPS_ABIFLAGS,
+    );
+    static FLAGS_PT_PARISC: &[Flag<u32>] = &flags!(PT_PARISC_ARCHEXT, PT_PARISC_UNWIND);
+    static FLAGS_PT_ARM: &[Flag<u32>] = &flags!(PT_ARM_EXIDX);
+    static FLAGS_PT_IA_64: &[Flag<u32>] = &flags!(PT_IA_64_ARCHEXT, PT_IA_64_UNWIND);
+    static FLAGS_PF: &[Flag<u32>] = &flags!(PF_X, PF_W, PF_R);
+    static FLAGS_PF_HP: &[Flag<u32>] = &flags!(
+        PF_HP_PAGE_SIZE,
+        PF_HP_FAR_SHARED,
+        PF_HP_NEAR_SHARED,
+        PF_HP_CODE,
+        PF_HP_MODIFY,
+        PF_HP_LAZYSWAP,
+        PF_HP_SBP,
+    );
+    static FLAGS_PF_MIPS: &[Flag<u32>] = &flags!(PF_MIPS_LOCAL);
+    static FLAGS_PF_PARISC: &[Flag<u32>] = &flags!(PF_PARISC_SBP);
+    static FLAGS_PF_ARM: &[Flag<u32>] = &flags!(PF_ARM_SB, PF_ARM_PI, PF_ARM_ABS);
+    static FLAGS_PF_IA_64: &[Flag<u32>] = &flags!(PF_IA_64_NORECOV);
+    static FLAGS_SHT: &[Flag<u32>] = &flags!(
+        SHT_NULL,
+        SHT_PROGBITS,
+        SHT_SYMTAB,
+        SHT_STRTAB,
+        SHT_RELA,
+        SHT_HASH,
+        SHT_DYNAMIC,
+        SHT_NOTE,
+        SHT_NOBITS,
+        SHT_REL,
+        SHT_SHLIB,
+        SHT_DYNSYM,
+        SHT_INIT_ARRAY,
+        SHT_FINI_ARRAY,
+        SHT_PREINIT_ARRAY,
+        SHT_GROUP,
+        SHT_SYMTAB_SHNDX,
+        SHT_GNU_ATTRIBUTES,
+        SHT_GNU_HASH,
+        SHT_GNU_LIBLIST,
+        SHT_CHECKSUM,
+        SHT_SUNW_move,
+        SHT_SUNW_COMDAT,
+        SHT_SUNW_syminfo,
+        SHT_GNU_VERDEF,
+        SHT_GNU_VERNEED,
+        SHT_GNU_VERSYM,
+    );
+    static FLAGS_SHT_MIPS: &[Flag<u32>] = &flags!(
+        SHT_MIPS_LIBLIST,
+        SHT_MIPS_MSYM,
+        SHT_MIPS_CONFLICT,
+        SHT_MIPS_GPTAB,
+        SHT_MIPS_UCODE,
+        SHT_MIPS_DEBUG,
+        SHT_MIPS_REGINFO,
+        SHT_MIPS_PACKAGE,
+        SHT_MIPS_PACKSYM,
+        SHT_MIPS_RELD,
+        SHT_MIPS_IFACE,
+        SHT_MIPS_CONTENT,
+        SHT_MIPS_OPTIONS,
+        SHT_MIPS_SHDR,
+        SHT_MIPS_FDESC,
+        SHT_MIPS_EXTSYM,
+        SHT_MIPS_DENSE,
+        SHT_MIPS_PDESC,
+        SHT_MIPS_LOCSYM,
+        SHT_MIPS_AUXSYM,
+        SHT_MIPS_OPTSYM,
+        SHT_MIPS_LOCSTR,
+        SHT_MIPS_LINE,
+        SHT_MIPS_RFDESC,
+        SHT_MIPS_DELTASYM,
+        SHT_MIPS_DELTAINST,
+        SHT_MIPS_DELTACLASS,
+        SHT_MIPS_DWARF,
+        SHT_MIPS_DELTADECL,
+        SHT_MIPS_SYMBOL_LIB,
+        SHT_MIPS_EVENTS,
+        SHT_MIPS_TRANSLATE,
+        SHT_MIPS_PIXIE,
+        SHT_MIPS_XLATE,
+        SHT_MIPS_XLATE_DEBUG,
+        SHT_MIPS_WHIRL,
+        SHT_MIPS_EH_REGION,
+        SHT_MIPS_XLATE_OLD,
+        SHT_MIPS_PDR_EXCEPTION,
+    );
+    static FLAGS_SHT_PARISC: &[Flag<u32>] =
+        &flags!(SHT_PARISC_EXT, SHT_PARISC_UNWIND, SHT_PARISC_DOC);
+    static FLAGS_SHT_ALPHA: &[Flag<u32>] = &flags!(SHT_ALPHA_DEBUG, SHT_ALPHA_REGINFO);
+    static FLAGS_SHT_ARM: &[Flag<u32>] =
+        &flags!(SHT_ARM_EXIDX, SHT_ARM_PREEMPTMAP, SHT_ARM_ATTRIBUTES);
+    static FLAGS_SHT_CSKY: &[Flag<u32>] = &flags!(SHT_CSKY_ATTRIBUTES);
+    static FLAGS_SHT_IA_64: &[Flag<u32>] = &flags!(SHT_IA_64_EXT, SHT_IA_64_UNWIND);
+    static FLAGS_SHT_X86_64: &[Flag<u32>] = &flags!(SHT_X86_64_UNWIND);
+    static FLAGS_SHF: &[Flag<u32>] = &flags!(
+        SHF_WRITE,
+        SHF_ALLOC,
+        SHF_EXECINSTR,
+        SHF_MERGE,
+        SHF_STRINGS,
+        SHF_INFO_LINK,
+        SHF_LINK_ORDER,
+        SHF_OS_NONCONFORMING,
+        SHF_GROUP,
+        SHF_TLS,
+        SHF_COMPRESSED,
+    );
+    static FLAGS_SHF_MIPS: &[Flag<u32>] = &flags!(
+        SHF_MIPS_GPREL,
+        SHF_MIPS_MERGE,
+        SHF_MIPS_ADDR,
+        SHF_MIPS_STRINGS,
+        SHF_MIPS_NOSTRIP,
+        SHF_MIPS_LOCAL,
+        SHF_MIPS_NAMES,
+        SHF_MIPS_NODUPE,
+    );
+    static FLAGS_SHF_PARISC: &[Flag<u32>] =
+        &flags!(SHF_PARISC_SHORT, SHF_PARISC_HUGE, SHF_PARISC_SBP);
+    static FLAGS_SHF_ALPHA: &[Flag<u32>] = &flags!(SHF_ALPHA_GPREL);
+    static FLAGS_SHF_ARM: &[Flag<u32>] = &flags!(SHF_ARM_ENTRYSECT, SHF_ARM_COMDEF);
+    static FLAGS_SHF_IA_64: &[Flag<u32>] = &flags!(SHF_IA_64_SHORT, SHF_IA_64_NORECOV);
+    static FLAGS_STT: &[Flag<u8>] = &flags!(
+        STT_NOTYPE,
+        STT_OBJECT,
+        STT_FUNC,
+        STT_SECTION,
+        STT_FILE,
+        STT_COMMON,
+        STT_TLS,
+    );
+    static FLAGS_STT_GNU: &[Flag<u8>] = &flags!(STT_GNU_IFUNC);
+    static FLAGS_STT_HP: &[Flag<u8>] = &flags!(STT_HP_OPAQUE, STT_HP_STUB);
+    static FLAGS_STT_SPARC: &[Flag<u8>] = &flags!(STT_SPARC_REGISTER);
+    static FLAGS_STT_PARISC: &[Flag<u8>] = &flags!(STT_PARISC_MILLICODE);
+    static FLAGS_STT_ARM: &[Flag<u8>] = &flags!(STT_ARM_TFUNC, STT_ARM_16BIT);
+    static FLAGS_STB: &[Flag<u8>] = &flags!(STB_LOCAL, STB_GLOBAL, STB_WEAK);
+    static FLAGS_STB_GNU: &[Flag<u8>] = &flags!(STB_GNU_UNIQUE);
+    static FLAGS_STB_MIPS: &[Flag<u8>] = &flags!(STB_MIPS_SPLIT_COMMON);
+    static FLAGS_STV: &[Flag<u8>] = &flags!(STV_DEFAULT, STV_INTERNAL, STV_HIDDEN, STV_PROTECTED);
+    static FLAGS_STO_MIPS: &[Flag<u8>] = &flags!(STO_MIPS_PLT);
+    static FLAGS_STO_ALPHA: &[Flag<u8>] = &flags!(STO_ALPHA_NOPV, STO_ALPHA_STD_GPLOAD);
+    static FLAGS_SHN: &[Flag<u16>] = &flags!(SHN_UNDEF, SHN_ABS, SHN_COMMON, SHN_XINDEX);
+    static FLAGS_SHN_MIPS: &[Flag<u16>] = &flags!(
+        SHN_MIPS_ACOMMON,
+        SHN_MIPS_TEXT,
+        SHN_MIPS_DATA,
+        SHN_MIPS_SCOMMON,
+        SHN_MIPS_SUNDEFINED,
+    );
+    static FLAGS_SHN_PARISC: &[Flag<u16>] = &flags!(SHN_PARISC_ANSI_COMMON, SHN_PARISC_HUGE_COMMON);
+    static FLAGS_R_68K: &[Flag<u32>] = &flags!(
+        R_68K_NONE,
+        R_68K_32,
+        R_68K_16,
+        R_68K_8,
+        R_68K_PC32,
+        R_68K_PC16,
+        R_68K_PC8,
+        R_68K_GOT32,
+        R_68K_GOT16,
+        R_68K_GOT8,
+        R_68K_GOT32O,
+        R_68K_GOT16O,
+        R_68K_GOT8O,
+        R_68K_PLT32,
+        R_68K_PLT16,
+        R_68K_PLT8,
+        R_68K_PLT32O,
+        R_68K_PLT16O,
+        R_68K_PLT8O,
+        R_68K_COPY,
+        R_68K_GLOB_DAT,
+        R_68K_JMP_SLOT,
+        R_68K_RELATIVE,
+        R_68K_TLS_GD32,
+        R_68K_TLS_GD16,
+        R_68K_TLS_GD8,
+        R_68K_TLS_LDM32,
+        R_68K_TLS_LDM16,
+        R_68K_TLS_LDM8,
+        R_68K_TLS_LDO32,
+        R_68K_TLS_LDO16,
+        R_68K_TLS_LDO8,
+        R_68K_TLS_IE32,
+        R_68K_TLS_IE16,
+        R_68K_TLS_IE8,
+        R_68K_TLS_LE32,
+        R_68K_TLS_LE16,
+        R_68K_TLS_LE8,
+        R_68K_TLS_DTPMOD32,
+        R_68K_TLS_DTPREL32,
+        R_68K_TLS_TPREL32,
+    );
+    static FLAGS_R_386: &[Flag<u32>] = &flags!(
+        R_386_NONE,
+        R_386_32,
+        R_386_PC32,
+        R_386_GOT32,
+        R_386_PLT32,
+        R_386_COPY,
+        R_386_GLOB_DAT,
+        R_386_JMP_SLOT,
+        R_386_RELATIVE,
+        R_386_GOTOFF,
+        R_386_GOTPC,
+        R_386_32PLT,
+        R_386_TLS_TPOFF,
+        R_386_TLS_IE,
+        R_386_TLS_GOTIE,
+        R_386_TLS_LE,
+        R_386_TLS_GD,
+        R_386_TLS_LDM,
+        R_386_16,
+        R_386_PC16,
+        R_386_8,
+        R_386_PC8,
+        R_386_TLS_GD_32,
+        R_386_TLS_GD_PUSH,
+        R_386_TLS_GD_CALL,
+        R_386_TLS_GD_POP,
+        R_386_TLS_LDM_32,
+        R_386_TLS_LDM_PUSH,
+        R_386_TLS_LDM_CALL,
+        R_386_TLS_LDM_POP,
+        R_386_TLS_LDO_32,
+        R_386_TLS_IE_32,
+        R_386_TLS_LE_32,
+        R_386_TLS_DTPMOD32,
+        R_386_TLS_DTPOFF32,
+        R_386_TLS_TPOFF32,
+        R_386_SIZE32,
+        R_386_TLS_GOTDESC,
+        R_386_TLS_DESC_CALL,
+        R_386_TLS_DESC,
+        R_386_IRELATIVE,
+        R_386_GOT32X,
+    );
+    static FLAGS_R_SPARC: &[Flag<u32>] = &flags!(
+        R_SPARC_NONE,
+        R_SPARC_8,
+        R_SPARC_16,
+        R_SPARC_32,
+        R_SPARC_DISP8,
+        R_SPARC_DISP16,
+        R_SPARC_DISP32,
+        R_SPARC_WDISP30,
+        R_SPARC_WDISP22,
+        R_SPARC_HI22,
+        R_SPARC_22,
+        R_SPARC_13,
+        R_SPARC_LO10,
+        R_SPARC_GOT10,
+        R_SPARC_GOT13,
+        R_SPARC_GOT22,
+        R_SPARC_PC10,
+        R_SPARC_PC22,
+        R_SPARC_WPLT30,
+        R_SPARC_COPY,
+        R_SPARC_GLOB_DAT,
+        R_SPARC_JMP_SLOT,
+        R_SPARC_RELATIVE,
+        R_SPARC_UA32,
+        R_SPARC_PLT32,
+        R_SPARC_HIPLT22,
+        R_SPARC_LOPLT10,
+        R_SPARC_PCPLT32,
+        R_SPARC_PCPLT22,
+        R_SPARC_PCPLT10,
+        R_SPARC_10,
+        R_SPARC_11,
+        R_SPARC_64,
+        R_SPARC_OLO10,
+        R_SPARC_HH22,
+        R_SPARC_HM10,
+        R_SPARC_LM22,
+        R_SPARC_PC_HH22,
+        R_SPARC_PC_HM10,
+        R_SPARC_PC_LM22,
+        R_SPARC_WDISP16,
+        R_SPARC_WDISP19,
+        R_SPARC_GLOB_JMP,
+        R_SPARC_7,
+        R_SPARC_5,
+        R_SPARC_6,
+        R_SPARC_DISP64,
+        R_SPARC_PLT64,
+        R_SPARC_HIX22,
+        R_SPARC_LOX10,
+        R_SPARC_H44,
+        R_SPARC_M44,
+        R_SPARC_L44,
+        R_SPARC_REGISTER,
+        R_SPARC_UA64,
+        R_SPARC_UA16,
+        R_SPARC_TLS_GD_HI22,
+        R_SPARC_TLS_GD_LO10,
+        R_SPARC_TLS_GD_ADD,
+        R_SPARC_TLS_GD_CALL,
+        R_SPARC_TLS_LDM_HI22,
+        R_SPARC_TLS_LDM_LO10,
+        R_SPARC_TLS_LDM_ADD,
+        R_SPARC_TLS_LDM_CALL,
+        R_SPARC_TLS_LDO_HIX22,
+        R_SPARC_TLS_LDO_LOX10,
+        R_SPARC_TLS_LDO_ADD,
+        R_SPARC_TLS_IE_HI22,
+        R_SPARC_TLS_IE_LO10,
+        R_SPARC_TLS_IE_LD,
+        R_SPARC_TLS_IE_LDX,
+        R_SPARC_TLS_IE_ADD,
+        R_SPARC_TLS_LE_HIX22,
+        R_SPARC_TLS_LE_LOX10,
+        R_SPARC_TLS_DTPMOD32,
+        R_SPARC_TLS_DTPMOD64,
+        R_SPARC_TLS_DTPOFF32,
+        R_SPARC_TLS_DTPOFF64,
+        R_SPARC_TLS_TPOFF32,
+        R_SPARC_TLS_TPOFF64,
+        R_SPARC_GOTDATA_HIX22,
+        R_SPARC_GOTDATA_LOX10,
+        R_SPARC_GOTDATA_OP_HIX22,
+        R_SPARC_GOTDATA_OP_LOX10,
+        R_SPARC_GOTDATA_OP,
+        R_SPARC_H34,
+        R_SPARC_SIZE32,
+        R_SPARC_SIZE64,
+        R_SPARC_WDISP10,
+        R_SPARC_JMP_IREL,
+        R_SPARC_IRELATIVE,
+        R_SPARC_GNU_VTINHERIT,
+        R_SPARC_GNU_VTENTRY,
+        R_SPARC_REV32,
+    );
+    static FLAGS_R_MIPS: &[Flag<u32>] = &flags!(
+        R_MIPS_NONE,
+        R_MIPS_16,
+        R_MIPS_32,
+        R_MIPS_REL32,
+        R_MIPS_26,
+        R_MIPS_HI16,
+        R_MIPS_LO16,
+        R_MIPS_GPREL16,
+        R_MIPS_LITERAL,
+        R_MIPS_GOT16,
+        R_MIPS_PC16,
+        R_MIPS_CALL16,
+        R_MIPS_GPREL32,
+        R_MIPS_SHIFT5,
+        R_MIPS_SHIFT6,
+        R_MIPS_64,
+        R_MIPS_GOT_DISP,
+        R_MIPS_GOT_PAGE,
+        R_MIPS_GOT_OFST,
+        R_MIPS_GOT_HI16,
+        R_MIPS_GOT_LO16,
+        R_MIPS_SUB,
+        R_MIPS_INSERT_A,
+        R_MIPS_INSERT_B,
+        R_MIPS_DELETE,
+        R_MIPS_HIGHER,
+        R_MIPS_HIGHEST,
+        R_MIPS_CALL_HI16,
+        R_MIPS_CALL_LO16,
+        R_MIPS_SCN_DISP,
+        R_MIPS_REL16,
+        R_MIPS_ADD_IMMEDIATE,
+        R_MIPS_PJUMP,
+        R_MIPS_RELGOT,
+        R_MIPS_JALR,
+        R_MIPS_TLS_DTPMOD32,
+        R_MIPS_TLS_DTPREL32,
+        R_MIPS_TLS_DTPMOD64,
+        R_MIPS_TLS_DTPREL64,
+        R_MIPS_TLS_GD,
+        R_MIPS_TLS_LDM,
+        R_MIPS_TLS_DTPREL_HI16,
+        R_MIPS_TLS_DTPREL_LO16,
+        R_MIPS_TLS_GOTTPREL,
+        R_MIPS_TLS_TPREL32,
+        R_MIPS_TLS_TPREL64,
+        R_MIPS_TLS_TPREL_HI16,
+        R_MIPS_TLS_TPREL_LO16,
+        R_MIPS_GLOB_DAT,
+        R_MIPS_COPY,
+        R_MIPS_JUMP_SLOT,
+    );
+    static FLAGS_R_PARISC: &[Flag<u32>] = &flags!(
+        R_PARISC_NONE,
+        R_PARISC_DIR32,
+        R_PARISC_DIR21L,
+        R_PARISC_DIR17R,
+        R_PARISC_DIR17F,
+        R_PARISC_DIR14R,
+        R_PARISC_PCREL32,
+        R_PARISC_PCREL21L,
+        R_PARISC_PCREL17R,
+        R_PARISC_PCREL17F,
+        R_PARISC_PCREL14R,
+        R_PARISC_DPREL21L,
+        R_PARISC_DPREL14R,
+        R_PARISC_GPREL21L,
+        R_PARISC_GPREL14R,
+        R_PARISC_LTOFF21L,
+        R_PARISC_LTOFF14R,
+        R_PARISC_SECREL32,
+        R_PARISC_SEGBASE,
+        R_PARISC_SEGREL32,
+        R_PARISC_PLTOFF21L,
+        R_PARISC_PLTOFF14R,
+        R_PARISC_LTOFF_FPTR32,
+        R_PARISC_LTOFF_FPTR21L,
+        R_PARISC_LTOFF_FPTR14R,
+        R_PARISC_FPTR64,
+        R_PARISC_PLABEL32,
+        R_PARISC_PLABEL21L,
+        R_PARISC_PLABEL14R,
+        R_PARISC_PCREL64,
+        R_PARISC_PCREL22F,
+        R_PARISC_PCREL14WR,
+        R_PARISC_PCREL14DR,
+        R_PARISC_PCREL16F,
+        R_PARISC_PCREL16WF,
+        R_PARISC_PCREL16DF,
+        R_PARISC_DIR64,
+        R_PARISC_DIR14WR,
+        R_PARISC_DIR14DR,
+        R_PARISC_DIR16F,
+        R_PARISC_DIR16WF,
+        R_PARISC_DIR16DF,
+        R_PARISC_GPREL64,
+        R_PARISC_GPREL14WR,
+        R_PARISC_GPREL14DR,
+        R_PARISC_GPREL16F,
+        R_PARISC_GPREL16WF,
+        R_PARISC_GPREL16DF,
+        R_PARISC_LTOFF64,
+        R_PARISC_LTOFF14WR,
+        R_PARISC_LTOFF14DR,
+        R_PARISC_LTOFF16F,
+        R_PARISC_LTOFF16WF,
+        R_PARISC_LTOFF16DF,
+        R_PARISC_SECREL64,
+        R_PARISC_SEGREL64,
+        R_PARISC_PLTOFF14WR,
+        R_PARISC_PLTOFF14DR,
+        R_PARISC_PLTOFF16F,
+        R_PARISC_PLTOFF16WF,
+        R_PARISC_PLTOFF16DF,
+        R_PARISC_LTOFF_FPTR64,
+        R_PARISC_LTOFF_FPTR14WR,
+        R_PARISC_LTOFF_FPTR14DR,
+        R_PARISC_LTOFF_FPTR16F,
+        R_PARISC_LTOFF_FPTR16WF,
+        R_PARISC_LTOFF_FPTR16DF,
+        R_PARISC_COPY,
+        R_PARISC_IPLT,
+        R_PARISC_EPLT,
+        R_PARISC_TPREL32,
+        R_PARISC_TPREL21L,
+        R_PARISC_TPREL14R,
+        R_PARISC_LTOFF_TP21L,
+        R_PARISC_LTOFF_TP14R,
+        R_PARISC_LTOFF_TP14F,
+        R_PARISC_TPREL64,
+        R_PARISC_TPREL14WR,
+        R_PARISC_TPREL14DR,
+        R_PARISC_TPREL16F,
+        R_PARISC_TPREL16WF,
+        R_PARISC_TPREL16DF,
+        R_PARISC_LTOFF_TP64,
+        R_PARISC_LTOFF_TP14WR,
+        R_PARISC_LTOFF_TP14DR,
+        R_PARISC_LTOFF_TP16F,
+        R_PARISC_LTOFF_TP16WF,
+        R_PARISC_LTOFF_TP16DF,
+        R_PARISC_GNU_VTENTRY,
+        R_PARISC_GNU_VTINHERIT,
+        R_PARISC_TLS_GD21L,
+        R_PARISC_TLS_GD14R,
+        R_PARISC_TLS_GDCALL,
+        R_PARISC_TLS_LDM21L,
+        R_PARISC_TLS_LDM14R,
+        R_PARISC_TLS_LDMCALL,
+        R_PARISC_TLS_LDO21L,
+        R_PARISC_TLS_LDO14R,
+        R_PARISC_TLS_DTPMOD32,
+        R_PARISC_TLS_DTPMOD64,
+        R_PARISC_TLS_DTPOFF32,
+        R_PARISC_TLS_DTPOFF64,
+        R_PARISC_TLS_LE21L,
+        R_PARISC_TLS_LE14R,
+        R_PARISC_TLS_IE21L,
+        R_PARISC_TLS_IE14R,
+        R_PARISC_TLS_TPREL32,
+        R_PARISC_TLS_TPREL64,
+    );
+    static FLAGS_R_ALPHA: &[Flag<u32>] = &flags!(
+        R_ALPHA_NONE,
+        R_ALPHA_REFLONG,
+        R_ALPHA_REFQUAD,
+        R_ALPHA_GPREL32,
+        R_ALPHA_LITERAL,
+        R_ALPHA_LITUSE,
+        R_ALPHA_GPDISP,
+        R_ALPHA_BRADDR,
+        R_ALPHA_HINT,
+        R_ALPHA_SREL16,
+        R_ALPHA_SREL32,
+        R_ALPHA_SREL64,
+        R_ALPHA_GPRELHIGH,
+        R_ALPHA_GPRELLOW,
+        R_ALPHA_GPREL16,
+        R_ALPHA_COPY,
+        R_ALPHA_GLOB_DAT,
+        R_ALPHA_JMP_SLOT,
+        R_ALPHA_RELATIVE,
+        R_ALPHA_TLS_GD_HI,
+        R_ALPHA_TLSGD,
+        R_ALPHA_TLS_LDM,
+        R_ALPHA_DTPMOD64,
+        R_ALPHA_GOTDTPREL,
+        R_ALPHA_DTPREL64,
+        R_ALPHA_DTPRELHI,
+        R_ALPHA_DTPRELLO,
+        R_ALPHA_DTPREL16,
+        R_ALPHA_GOTTPREL,
+        R_ALPHA_TPREL64,
+        R_ALPHA_TPRELHI,
+        R_ALPHA_TPRELLO,
+        R_ALPHA_TPREL16,
+    );
+    static FLAGS_R_PPC: &[Flag<u32>] = &flags!(
+        R_PPC_NONE,
+        R_PPC_ADDR32,
+        R_PPC_ADDR24,
+        R_PPC_ADDR16,
+        R_PPC_ADDR16_LO,
+        R_PPC_ADDR16_HI,
+        R_PPC_ADDR16_HA,
+        R_PPC_ADDR14,
+        R_PPC_ADDR14_BRTAKEN,
+        R_PPC_ADDR14_BRNTAKEN,
+        R_PPC_REL24,
+        R_PPC_REL14,
+        R_PPC_REL14_BRTAKEN,
+        R_PPC_REL14_BRNTAKEN,
+        R_PPC_GOT16,
+        R_PPC_GOT16_LO,
+        R_PPC_GOT16_HI,
+        R_PPC_GOT16_HA,
+        R_PPC_PLTREL24,
+        R_PPC_COPY,
+        R_PPC_GLOB_DAT,
+        R_PPC_JMP_SLOT,
+        R_PPC_RELATIVE,
+        R_PPC_LOCAL24PC,
+        R_PPC_UADDR32,
+        R_PPC_UADDR16,
+        R_PPC_REL32,
+        R_PPC_PLT32,
+        R_PPC_PLTREL32,
+        R_PPC_PLT16_LO,
+        R_PPC_PLT16_HI,
+        R_PPC_PLT16_HA,
+        R_PPC_SDAREL16,
+        R_PPC_SECTOFF,
+        R_PPC_SECTOFF_LO,
+        R_PPC_SECTOFF_HI,
+        R_PPC_SECTOFF_HA,
+        R_PPC_TLS,
+        R_PPC_DTPMOD32,
+        R_PPC_TPREL16,
+        R_PPC_TPREL16_LO,
+        R_PPC_TPREL16_HI,
+        R_PPC_TPREL16_HA,
+        R_PPC_TPREL32,
+        R_PPC_DTPREL16,
+        R_PPC_DTPREL16_LO,
+        R_PPC_DTPREL16_HI,
+        R_PPC_DTPREL16_HA,
+        R_PPC_DTPREL32,
+        R_PPC_GOT_TLSGD16,
+        R_PPC_GOT_TLSGD16_LO,
+        R_PPC_GOT_TLSGD16_HI,
+        R_PPC_GOT_TLSGD16_HA,
+        R_PPC_GOT_TLSLD16,
+        R_PPC_GOT_TLSLD16_LO,
+        R_PPC_GOT_TLSLD16_HI,
+        R_PPC_GOT_TLSLD16_HA,
+        R_PPC_GOT_TPREL16,
+        R_PPC_GOT_TPREL16_LO,
+        R_PPC_GOT_TPREL16_HI,
+        R_PPC_GOT_TPREL16_HA,
+        R_PPC_GOT_DTPREL16,
+        R_PPC_GOT_DTPREL16_LO,
+        R_PPC_GOT_DTPREL16_HI,
+        R_PPC_GOT_DTPREL16_HA,
+        R_PPC_TLSGD,
+        R_PPC_TLSLD,
+        R_PPC_EMB_NADDR32,
+        R_PPC_EMB_NADDR16,
+        R_PPC_EMB_NADDR16_LO,
+        R_PPC_EMB_NADDR16_HI,
+        R_PPC_EMB_NADDR16_HA,
+        R_PPC_EMB_SDAI16,
+        R_PPC_EMB_SDA2I16,
+        R_PPC_EMB_SDA2REL,
+        R_PPC_EMB_SDA21,
+        R_PPC_EMB_MRKREF,
+        R_PPC_EMB_RELSEC16,
+        R_PPC_EMB_RELST_LO,
+        R_PPC_EMB_RELST_HI,
+        R_PPC_EMB_RELST_HA,
+        R_PPC_EMB_BIT_FLD,
+        R_PPC_EMB_RELSDA,
+        R_PPC_DIAB_SDA21_LO,
+        R_PPC_DIAB_SDA21_HI,
+        R_PPC_DIAB_SDA21_HA,
+        R_PPC_DIAB_RELSDA_LO,
+        R_PPC_DIAB_RELSDA_HI,
+        R_PPC_DIAB_RELSDA_HA,
+        R_PPC_IRELATIVE,
+        R_PPC_REL16,
+        R_PPC_REL16_LO,
+        R_PPC_REL16_HI,
+        R_PPC_REL16_HA,
+        R_PPC_TOC16,
+    );
+    static FLAGS_R_PPC64: &[Flag<u32>] = &flags!(
+        R_PPC64_NONE,
+        R_PPC64_ADDR32,
+        R_PPC64_ADDR24,
+        R_PPC64_ADDR16,
+        R_PPC64_ADDR16_LO,
+        R_PPC64_ADDR16_HI,
+        R_PPC64_ADDR16_HA,
+        R_PPC64_ADDR14,
+        R_PPC64_ADDR14_BRTAKEN,
+        R_PPC64_ADDR14_BRNTAKEN,
+        R_PPC64_REL24,
+        R_PPC64_REL14,
+        R_PPC64_REL14_BRTAKEN,
+        R_PPC64_REL14_BRNTAKEN,
+        R_PPC64_GOT16,
+        R_PPC64_GOT16_LO,
+        R_PPC64_GOT16_HI,
+        R_PPC64_GOT16_HA,
+        R_PPC64_COPY,
+        R_PPC64_GLOB_DAT,
+        R_PPC64_JMP_SLOT,
+        R_PPC64_RELATIVE,
+        R_PPC64_UADDR32,
+        R_PPC64_UADDR16,
+        R_PPC64_REL32,
+        R_PPC64_PLT32,
+        R_PPC64_PLTREL32,
+        R_PPC64_PLT16_LO,
+        R_PPC64_PLT16_HI,
+        R_PPC64_PLT16_HA,
+        R_PPC64_SECTOFF,
+        R_PPC64_SECTOFF_LO,
+        R_PPC64_SECTOFF_HI,
+        R_PPC64_SECTOFF_HA,
+        R_PPC64_ADDR30,
+        R_PPC64_ADDR64,
+        R_PPC64_ADDR16_HIGHER,
+        R_PPC64_ADDR16_HIGHERA,
+        R_PPC64_ADDR16_HIGHEST,
+        R_PPC64_ADDR16_HIGHESTA,
+        R_PPC64_UADDR64,
+        R_PPC64_REL64,
+        R_PPC64_PLT64,
+        R_PPC64_PLTREL64,
+        R_PPC64_TOC16,
+        R_PPC64_TOC16_LO,
+        R_PPC64_TOC16_HI,
+        R_PPC64_TOC16_HA,
+        R_PPC64_TOC,
+        R_PPC64_PLTGOT16,
+        R_PPC64_PLTGOT16_LO,
+        R_PPC64_PLTGOT16_HI,
+        R_PPC64_PLTGOT16_HA,
+        R_PPC64_ADDR16_DS,
+        R_PPC64_ADDR16_LO_DS,
+        R_PPC64_GOT16_DS,
+        R_PPC64_GOT16_LO_DS,
+        R_PPC64_PLT16_LO_DS,
+        R_PPC64_SECTOFF_DS,
+        R_PPC64_SECTOFF_LO_DS,
+        R_PPC64_TOC16_DS,
+        R_PPC64_TOC16_LO_DS,
+        R_PPC64_PLTGOT16_DS,
+        R_PPC64_PLTGOT16_LO_DS,
+        R_PPC64_TLS,
+        R_PPC64_DTPMOD64,
+        R_PPC64_TPREL16,
+        R_PPC64_TPREL16_LO,
+        R_PPC64_TPREL16_HI,
+        R_PPC64_TPREL16_HA,
+        R_PPC64_TPREL64,
+        R_PPC64_DTPREL16,
+        R_PPC64_DTPREL16_LO,
+        R_PPC64_DTPREL16_HI,
+        R_PPC64_DTPREL16_HA,
+        R_PPC64_DTPREL64,
+        R_PPC64_GOT_TLSGD16,
+        R_PPC64_GOT_TLSGD16_LO,
+        R_PPC64_GOT_TLSGD16_HI,
+        R_PPC64_GOT_TLSGD16_HA,
+        R_PPC64_GOT_TLSLD16,
+        R_PPC64_GOT_TLSLD16_LO,
+        R_PPC64_GOT_TLSLD16_HI,
+        R_PPC64_GOT_TLSLD16_HA,
+        R_PPC64_GOT_TPREL16_DS,
+        R_PPC64_GOT_TPREL16_LO_DS,
+        R_PPC64_GOT_TPREL16_HI,
+        R_PPC64_GOT_TPREL16_HA,
+        R_PPC64_GOT_DTPREL16_DS,
+        R_PPC64_GOT_DTPREL16_LO_DS,
+        R_PPC64_GOT_DTPREL16_HI,
+        R_PPC64_GOT_DTPREL16_HA,
+        R_PPC64_TPREL16_DS,
+        R_PPC64_TPREL16_LO_DS,
+        R_PPC64_TPREL16_HIGHER,
+        R_PPC64_TPREL16_HIGHERA,
+        R_PPC64_TPREL16_HIGHEST,
+        R_PPC64_TPREL16_HIGHESTA,
+        R_PPC64_DTPREL16_DS,
+        R_PPC64_DTPREL16_LO_DS,
+        R_PPC64_DTPREL16_HIGHER,
+        R_PPC64_DTPREL16_HIGHERA,
+        R_PPC64_DTPREL16_HIGHEST,
+        R_PPC64_DTPREL16_HIGHESTA,
+        R_PPC64_TLSGD,
+        R_PPC64_TLSLD,
+        R_PPC64_TOCSAVE,
+        R_PPC64_ADDR16_HIGH,
+        R_PPC64_ADDR16_HIGHA,
+        R_PPC64_TPREL16_HIGH,
+        R_PPC64_TPREL16_HIGHA,
+        R_PPC64_DTPREL16_HIGH,
+        R_PPC64_DTPREL16_HIGHA,
+        R_PPC64_JMP_IREL,
+        R_PPC64_IRELATIVE,
+        R_PPC64_REL16,
+        R_PPC64_REL16_LO,
+        R_PPC64_REL16_HI,
+        R_PPC64_REL16_HA,
+    );
+    static FLAGS_R_AARCH64: &[Flag<u32>] = &flags!(
+        R_AARCH64_NONE,
+        R_AARCH64_P32_ABS32,
+        R_AARCH64_P32_COPY,
+        R_AARCH64_P32_GLOB_DAT,
+        R_AARCH64_P32_JUMP_SLOT,
+        R_AARCH64_P32_RELATIVE,
+        R_AARCH64_P32_TLS_DTPMOD,
+        R_AARCH64_P32_TLS_DTPREL,
+        R_AARCH64_P32_TLS_TPREL,
+        R_AARCH64_P32_TLSDESC,
+        R_AARCH64_P32_IRELATIVE,
+        R_AARCH64_ABS64,
+        R_AARCH64_ABS32,
+        R_AARCH64_ABS16,
+        R_AARCH64_PREL64,
+        R_AARCH64_PREL32,
+        R_AARCH64_PREL16,
+        R_AARCH64_MOVW_UABS_G0,
+        R_AARCH64_MOVW_UABS_G0_NC,
+        R_AARCH64_MOVW_UABS_G1,
+        R_AARCH64_MOVW_UABS_G1_NC,
+        R_AARCH64_MOVW_UABS_G2,
+        R_AARCH64_MOVW_UABS_G2_NC,
+        R_AARCH64_MOVW_UABS_G3,
+        R_AARCH64_MOVW_SABS_G0,
+        R_AARCH64_MOVW_SABS_G1,
+        R_AARCH64_MOVW_SABS_G2,
+        R_AARCH64_LD_PREL_LO19,
+        R_AARCH64_ADR_PREL_LO21,
+        R_AARCH64_ADR_PREL_PG_HI21,
+        R_AARCH64_ADR_PREL_PG_HI21_NC,
+        R_AARCH64_ADD_ABS_LO12_NC,
+        R_AARCH64_LDST8_ABS_LO12_NC,
+        R_AARCH64_TSTBR14,
+        R_AARCH64_CONDBR19,
+        R_AARCH64_JUMP26,
+        R_AARCH64_CALL26,
+        R_AARCH64_LDST16_ABS_LO12_NC,
+        R_AARCH64_LDST32_ABS_LO12_NC,
+        R_AARCH64_LDST64_ABS_LO12_NC,
+        R_AARCH64_MOVW_PREL_G0,
+        R_AARCH64_MOVW_PREL_G0_NC,
+        R_AARCH64_MOVW_PREL_G1,
+        R_AARCH64_MOVW_PREL_G1_NC,
+        R_AARCH64_MOVW_PREL_G2,
+        R_AARCH64_MOVW_PREL_G2_NC,
+        R_AARCH64_MOVW_PREL_G3,
+        R_AARCH64_LDST128_ABS_LO12_NC,
+        R_AARCH64_MOVW_GOTOFF_G0,
+        R_AARCH64_MOVW_GOTOFF_G0_NC,
+        R_AARCH64_MOVW_GOTOFF_G1,
+        R_AARCH64_MOVW_GOTOFF_G1_NC,
+        R_AARCH64_MOVW_GOTOFF_G2,
+        R_AARCH64_MOVW_GOTOFF_G2_NC,
+        R_AARCH64_MOVW_GOTOFF_G3,
+        R_AARCH64_GOTREL64,
+        R_AARCH64_GOTREL32,
+        R_AARCH64_GOT_LD_PREL19,
+        R_AARCH64_LD64_GOTOFF_LO15,
+        R_AARCH64_ADR_GOT_PAGE,
+        R_AARCH64_LD64_GOT_LO12_NC,
+        R_AARCH64_LD64_GOTPAGE_LO15,
+        R_AARCH64_TLSGD_ADR_PREL21,
+        R_AARCH64_TLSGD_ADR_PAGE21,
+        R_AARCH64_TLSGD_ADD_LO12_NC,
+        R_AARCH64_TLSGD_MOVW_G1,
+        R_AARCH64_TLSGD_MOVW_G0_NC,
+        R_AARCH64_TLSLD_ADR_PREL21,
+        R_AARCH64_TLSLD_ADR_PAGE21,
+        R_AARCH64_TLSLD_ADD_LO12_NC,
+        R_AARCH64_TLSLD_MOVW_G1,
+        R_AARCH64_TLSLD_MOVW_G0_NC,
+        R_AARCH64_TLSLD_LD_PREL19,
+        R_AARCH64_TLSLD_MOVW_DTPREL_G2,
+        R_AARCH64_TLSLD_MOVW_DTPREL_G1,
+        R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC,
+        R_AARCH64_TLSLD_MOVW_DTPREL_G0,
+        R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC,
+        R_AARCH64_TLSLD_ADD_DTPREL_HI12,
+        R_AARCH64_TLSLD_ADD_DTPREL_LO12,
+        R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC,
+        R_AARCH64_TLSLD_LDST8_DTPREL_LO12,
+        R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC,
+        R_AARCH64_TLSLD_LDST16_DTPREL_LO12,
+        R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC,
+        R_AARCH64_TLSLD_LDST32_DTPREL_LO12,
+        R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC,
+        R_AARCH64_TLSLD_LDST64_DTPREL_LO12,
+        R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC,
+        R_AARCH64_TLSIE_MOVW_GOTTPREL_G1,
+        R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC,
+        R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21,
+        R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC,
+        R_AARCH64_TLSIE_LD_GOTTPREL_PREL19,
+        R_AARCH64_TLSLE_MOVW_TPREL_G2,
+        R_AARCH64_TLSLE_MOVW_TPREL_G1,
+        R_AARCH64_TLSLE_MOVW_TPREL_G1_NC,
+        R_AARCH64_TLSLE_MOVW_TPREL_G0,
+        R_AARCH64_TLSLE_MOVW_TPREL_G0_NC,
+        R_AARCH64_TLSLE_ADD_TPREL_HI12,
+        R_AARCH64_TLSLE_ADD_TPREL_LO12,
+        R_AARCH64_TLSLE_ADD_TPREL_LO12_NC,
+        R_AARCH64_TLSLE_LDST8_TPREL_LO12,
+        R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC,
+        R_AARCH64_TLSLE_LDST16_TPREL_LO12,
+        R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC,
+        R_AARCH64_TLSLE_LDST32_TPREL_LO12,
+        R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC,
+        R_AARCH64_TLSLE_LDST64_TPREL_LO12,
+        R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC,
+        R_AARCH64_TLSDESC_LD_PREL19,
+        R_AARCH64_TLSDESC_ADR_PREL21,
+        R_AARCH64_TLSDESC_ADR_PAGE21,
+        R_AARCH64_TLSDESC_LD64_LO12,
+        R_AARCH64_TLSDESC_ADD_LO12,
+        R_AARCH64_TLSDESC_OFF_G1,
+        R_AARCH64_TLSDESC_OFF_G0_NC,
+        R_AARCH64_TLSDESC_LDR,
+        R_AARCH64_TLSDESC_ADD,
+        R_AARCH64_TLSDESC_CALL,
+        R_AARCH64_TLSLE_LDST128_TPREL_LO12,
+        R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC,
+        R_AARCH64_TLSLD_LDST128_DTPREL_LO12,
+        R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC,
+        R_AARCH64_COPY,
+        R_AARCH64_GLOB_DAT,
+        R_AARCH64_JUMP_SLOT,
+        R_AARCH64_RELATIVE,
+        R_AARCH64_TLS_DTPMOD,
+        R_AARCH64_TLS_DTPREL,
+        R_AARCH64_TLS_TPREL,
+        R_AARCH64_TLSDESC,
+        R_AARCH64_IRELATIVE,
+    );
+    static FLAGS_R_ARM: &[Flag<u32>] = &flags!(
+        R_ARM_NONE,
+        R_ARM_PC24,
+        R_ARM_ABS32,
+        R_ARM_REL32,
+        R_ARM_PC13,
+        R_ARM_ABS16,
+        R_ARM_ABS12,
+        R_ARM_THM_ABS5,
+        R_ARM_ABS8,
+        R_ARM_SBREL32,
+        R_ARM_THM_PC22,
+        R_ARM_THM_PC8,
+        R_ARM_AMP_VCALL9,
+        R_ARM_SWI24,
+        R_ARM_TLS_DESC,
+        R_ARM_THM_SWI8,
+        R_ARM_XPC25,
+        R_ARM_THM_XPC22,
+        R_ARM_TLS_DTPMOD32,
+        R_ARM_TLS_DTPOFF32,
+        R_ARM_TLS_TPOFF32,
+        R_ARM_COPY,
+        R_ARM_GLOB_DAT,
+        R_ARM_JUMP_SLOT,
+        R_ARM_RELATIVE,
+        R_ARM_GOTOFF,
+        R_ARM_GOTPC,
+        R_ARM_GOT32,
+        R_ARM_PLT32,
+        R_ARM_CALL,
+        R_ARM_JUMP24,
+        R_ARM_THM_JUMP24,
+        R_ARM_BASE_ABS,
+        R_ARM_ALU_PCREL_7_0,
+        R_ARM_ALU_PCREL_15_8,
+        R_ARM_ALU_PCREL_23_15,
+        R_ARM_LDR_SBREL_11_0,
+        R_ARM_ALU_SBREL_19_12,
+        R_ARM_ALU_SBREL_27_20,
+        R_ARM_TARGET1,
+        R_ARM_SBREL31,
+        R_ARM_V4BX,
+        R_ARM_TARGET2,
+        R_ARM_PREL31,
+        R_ARM_MOVW_ABS_NC,
+        R_ARM_MOVT_ABS,
+        R_ARM_MOVW_PREL_NC,
+        R_ARM_MOVT_PREL,
+        R_ARM_THM_MOVW_ABS_NC,
+        R_ARM_THM_MOVT_ABS,
+        R_ARM_THM_MOVW_PREL_NC,
+        R_ARM_THM_MOVT_PREL,
+        R_ARM_THM_JUMP19,
+        R_ARM_THM_JUMP6,
+        R_ARM_THM_ALU_PREL_11_0,
+        R_ARM_THM_PC12,
+        R_ARM_ABS32_NOI,
+        R_ARM_REL32_NOI,
+        R_ARM_ALU_PC_G0_NC,
+        R_ARM_ALU_PC_G0,
+        R_ARM_ALU_PC_G1_NC,
+        R_ARM_ALU_PC_G1,
+        R_ARM_ALU_PC_G2,
+        R_ARM_LDR_PC_G1,
+        R_ARM_LDR_PC_G2,
+        R_ARM_LDRS_PC_G0,
+        R_ARM_LDRS_PC_G1,
+        R_ARM_LDRS_PC_G2,
+        R_ARM_LDC_PC_G0,
+        R_ARM_LDC_PC_G1,
+        R_ARM_LDC_PC_G2,
+        R_ARM_ALU_SB_G0_NC,
+        R_ARM_ALU_SB_G0,
+        R_ARM_ALU_SB_G1_NC,
+        R_ARM_ALU_SB_G1,
+        R_ARM_ALU_SB_G2,
+        R_ARM_LDR_SB_G0,
+        R_ARM_LDR_SB_G1,
+        R_ARM_LDR_SB_G2,
+        R_ARM_LDRS_SB_G0,
+        R_ARM_LDRS_SB_G1,
+        R_ARM_LDRS_SB_G2,
+        R_ARM_LDC_SB_G0,
+        R_ARM_LDC_SB_G1,
+        R_ARM_LDC_SB_G2,
+        R_ARM_MOVW_BREL_NC,
+        R_ARM_MOVT_BREL,
+        R_ARM_MOVW_BREL,
+        R_ARM_THM_MOVW_BREL_NC,
+        R_ARM_THM_MOVT_BREL,
+        R_ARM_THM_MOVW_BREL,
+        R_ARM_TLS_GOTDESC,
+        R_ARM_TLS_CALL,
+        R_ARM_TLS_DESCSEQ,
+        R_ARM_THM_TLS_CALL,
+        R_ARM_PLT32_ABS,
+        R_ARM_GOT_ABS,
+        R_ARM_GOT_PREL,
+        R_ARM_GOT_BREL12,
+        R_ARM_GOTOFF12,
+        R_ARM_GOTRELAX,
+        R_ARM_GNU_VTENTRY,
+        R_ARM_GNU_VTINHERIT,
+        R_ARM_THM_PC11,
+        R_ARM_THM_PC9,
+        R_ARM_TLS_GD32,
+        R_ARM_TLS_LDM32,
+        R_ARM_TLS_LDO32,
+        R_ARM_TLS_IE32,
+        R_ARM_TLS_LE32,
+        R_ARM_TLS_LDO12,
+        R_ARM_TLS_LE12,
+        R_ARM_TLS_IE12GP,
+        R_ARM_ME_TOO,
+        R_ARM_THM_TLS_DESCSEQ,
+        R_ARM_THM_TLS_DESCSEQ16,
+        R_ARM_THM_TLS_DESCSEQ32,
+        R_ARM_THM_GOT_BREL12,
+        R_ARM_IRELATIVE,
+        R_ARM_RXPC25,
+        R_ARM_RSBREL32,
+        R_ARM_THM_RPC22,
+        R_ARM_RREL32,
+        R_ARM_RABS22,
+        R_ARM_RPC24,
+        R_ARM_RBASE,
+    );
+    static FLAGS_R_CKCORE: &[Flag<u32>] = &flags!(
+        R_CKCORE_NONE,
+        R_CKCORE_ADDR32,
+        R_CKCORE_PCRELIMM8BY4,
+        R_CKCORE_PCRELIMM11BY2,
+        R_CKCORE_PCREL32,
+        R_CKCORE_PCRELJSR_IMM11BY2,
+        R_CKCORE_RELATIVE,
+        R_CKCORE_COPY,
+        R_CKCORE_GLOB_DAT,
+        R_CKCORE_JUMP_SLOT,
+        R_CKCORE_GOTOFF,
+        R_CKCORE_GOTPC,
+        R_CKCORE_GOT32,
+        R_CKCORE_PLT32,
+        R_CKCORE_ADDRGOT,
+        R_CKCORE_ADDRPLT,
+        R_CKCORE_PCREL_IMM26BY2,
+        R_CKCORE_PCREL_IMM16BY2,
+        R_CKCORE_PCREL_IMM16BY4,
+        R_CKCORE_PCREL_IMM10BY2,
+        R_CKCORE_PCREL_IMM10BY4,
+        R_CKCORE_ADDR_HI16,
+        R_CKCORE_ADDR_LO16,
+        R_CKCORE_GOTPC_HI16,
+        R_CKCORE_GOTPC_LO16,
+        R_CKCORE_GOTOFF_HI16,
+        R_CKCORE_GOTOFF_LO16,
+        R_CKCORE_GOT12,
+        R_CKCORE_GOT_HI16,
+        R_CKCORE_GOT_LO16,
+        R_CKCORE_PLT12,
+        R_CKCORE_PLT_HI16,
+        R_CKCORE_PLT_LO16,
+        R_CKCORE_ADDRGOT_HI16,
+        R_CKCORE_ADDRGOT_LO16,
+        R_CKCORE_ADDRPLT_HI16,
+        R_CKCORE_ADDRPLT_LO16,
+        R_CKCORE_PCREL_JSR_IMM26BY2,
+        R_CKCORE_TOFFSET_LO16,
+        R_CKCORE_DOFFSET_LO16,
+        R_CKCORE_PCREL_IMM18BY2,
+        R_CKCORE_DOFFSET_IMM18,
+        R_CKCORE_DOFFSET_IMM18BY2,
+        R_CKCORE_DOFFSET_IMM18BY4,
+        R_CKCORE_GOT_IMM18BY4,
+        R_CKCORE_PLT_IMM18BY4,
+        R_CKCORE_PCREL_IMM7BY4,
+        R_CKCORE_TLS_LE32,
+        R_CKCORE_TLS_IE32,
+        R_CKCORE_TLS_GD32,
+        R_CKCORE_TLS_LDM32,
+        R_CKCORE_TLS_LDO32,
+        R_CKCORE_TLS_DTPMOD32,
+        R_CKCORE_TLS_DTPOFF32,
+        R_CKCORE_TLS_TPOFF32,
+    );
+    static FLAGS_R_IA64: &[Flag<u32>] = &flags!(
+        R_IA64_NONE,
+        R_IA64_IMM14,
+        R_IA64_IMM22,
+        R_IA64_IMM64,
+        R_IA64_DIR32MSB,
+        R_IA64_DIR32LSB,
+        R_IA64_DIR64MSB,
+        R_IA64_DIR64LSB,
+        R_IA64_GPREL22,
+        R_IA64_GPREL64I,
+        R_IA64_GPREL32MSB,
+        R_IA64_GPREL32LSB,
+        R_IA64_GPREL64MSB,
+        R_IA64_GPREL64LSB,
+        R_IA64_LTOFF22,
+        R_IA64_LTOFF64I,
+        R_IA64_PLTOFF22,
+        R_IA64_PLTOFF64I,
+        R_IA64_PLTOFF64MSB,
+        R_IA64_PLTOFF64LSB,
+        R_IA64_FPTR64I,
+        R_IA64_FPTR32MSB,
+        R_IA64_FPTR32LSB,
+        R_IA64_FPTR64MSB,
+        R_IA64_FPTR64LSB,
+        R_IA64_PCREL60B,
+        R_IA64_PCREL21B,
+        R_IA64_PCREL21M,
+        R_IA64_PCREL21F,
+        R_IA64_PCREL32MSB,
+        R_IA64_PCREL32LSB,
+        R_IA64_PCREL64MSB,
+        R_IA64_PCREL64LSB,
+        R_IA64_LTOFF_FPTR22,
+        R_IA64_LTOFF_FPTR64I,
+        R_IA64_LTOFF_FPTR32MSB,
+        R_IA64_LTOFF_FPTR32LSB,
+        R_IA64_LTOFF_FPTR64MSB,
+        R_IA64_LTOFF_FPTR64LSB,
+        R_IA64_SEGREL32MSB,
+        R_IA64_SEGREL32LSB,
+        R_IA64_SEGREL64MSB,
+        R_IA64_SEGREL64LSB,
+        R_IA64_SECREL32MSB,
+        R_IA64_SECREL32LSB,
+        R_IA64_SECREL64MSB,
+        R_IA64_SECREL64LSB,
+        R_IA64_REL32MSB,
+        R_IA64_REL32LSB,
+        R_IA64_REL64MSB,
+        R_IA64_REL64LSB,
+        R_IA64_LTV32MSB,
+        R_IA64_LTV32LSB,
+        R_IA64_LTV64MSB,
+        R_IA64_LTV64LSB,
+        R_IA64_PCREL21BI,
+        R_IA64_PCREL22,
+        R_IA64_PCREL64I,
+        R_IA64_IPLTMSB,
+        R_IA64_IPLTLSB,
+        R_IA64_COPY,
+        R_IA64_SUB,
+        R_IA64_LTOFF22X,
+        R_IA64_LDXMOV,
+        R_IA64_TPREL14,
+        R_IA64_TPREL22,
+        R_IA64_TPREL64I,
+        R_IA64_TPREL64MSB,
+        R_IA64_TPREL64LSB,
+        R_IA64_LTOFF_TPREL22,
+        R_IA64_DTPMOD64MSB,
+        R_IA64_DTPMOD64LSB,
+        R_IA64_LTOFF_DTPMOD22,
+        R_IA64_DTPREL14,
+        R_IA64_DTPREL22,
+        R_IA64_DTPREL64I,
+        R_IA64_DTPREL32MSB,
+        R_IA64_DTPREL32LSB,
+        R_IA64_DTPREL64MSB,
+        R_IA64_DTPREL64LSB,
+        R_IA64_LTOFF_DTPREL22,
+    );
+    static FLAGS_R_SH: &[Flag<u32>] = &flags!(
+        R_SH_NONE,
+        R_SH_DIR32,
+        R_SH_REL32,
+        R_SH_DIR8WPN,
+        R_SH_IND12W,
+        R_SH_DIR8WPL,
+        R_SH_DIR8WPZ,
+        R_SH_DIR8BP,
+        R_SH_DIR8W,
+        R_SH_DIR8L,
+        R_SH_SWITCH16,
+        R_SH_SWITCH32,
+        R_SH_USES,
+        R_SH_COUNT,
+        R_SH_ALIGN,
+        R_SH_CODE,
+        R_SH_DATA,
+        R_SH_LABEL,
+        R_SH_SWITCH8,
+        R_SH_GNU_VTINHERIT,
+        R_SH_GNU_VTENTRY,
+        R_SH_TLS_GD_32,
+        R_SH_TLS_LD_32,
+        R_SH_TLS_LDO_32,
+        R_SH_TLS_IE_32,
+        R_SH_TLS_LE_32,
+        R_SH_TLS_DTPMOD32,
+        R_SH_TLS_DTPOFF32,
+        R_SH_TLS_TPOFF32,
+        R_SH_GOT32,
+        R_SH_PLT32,
+        R_SH_COPY,
+        R_SH_GLOB_DAT,
+        R_SH_JMP_SLOT,
+        R_SH_RELATIVE,
+        R_SH_GOTOFF,
+        R_SH_GOTPC,
+    );
+    static FLAGS_R_390: &[Flag<u32>] = &flags!(
+        R_390_NONE,
+        R_390_8,
+        R_390_12,
+        R_390_16,
+        R_390_32,
+        R_390_PC32,
+        R_390_GOT12,
+        R_390_GOT32,
+        R_390_PLT32,
+        R_390_COPY,
+        R_390_GLOB_DAT,
+        R_390_JMP_SLOT,
+        R_390_RELATIVE,
+        R_390_GOTOFF32,
+        R_390_GOTPC,
+        R_390_GOT16,
+        R_390_PC16,
+        R_390_PC16DBL,
+        R_390_PLT16DBL,
+        R_390_PC32DBL,
+        R_390_PLT32DBL,
+        R_390_GOTPCDBL,
+        R_390_64,
+        R_390_PC64,
+        R_390_GOT64,
+        R_390_PLT64,
+        R_390_GOTENT,
+        R_390_GOTOFF16,
+        R_390_GOTOFF64,
+        R_390_GOTPLT12,
+        R_390_GOTPLT16,
+        R_390_GOTPLT32,
+        R_390_GOTPLT64,
+        R_390_GOTPLTENT,
+        R_390_PLTOFF16,
+        R_390_PLTOFF32,
+        R_390_PLTOFF64,
+        R_390_TLS_LOAD,
+        R_390_TLS_GDCALL,
+        R_390_TLS_LDCALL,
+        R_390_TLS_GD32,
+        R_390_TLS_GD64,
+        R_390_TLS_GOTIE12,
+        R_390_TLS_GOTIE32,
+        R_390_TLS_GOTIE64,
+        R_390_TLS_LDM32,
+        R_390_TLS_LDM64,
+        R_390_TLS_IE32,
+        R_390_TLS_IE64,
+        R_390_TLS_IEENT,
+        R_390_TLS_LE32,
+        R_390_TLS_LE64,
+        R_390_TLS_LDO32,
+        R_390_TLS_LDO64,
+        R_390_TLS_DTPMOD,
+        R_390_TLS_DTPOFF,
+        R_390_TLS_TPOFF,
+        R_390_20,
+        R_390_GOT20,
+        R_390_GOTPLT20,
+        R_390_TLS_GOTIE20,
+        R_390_IRELATIVE,
+    );
+    static FLAGS_R_CRIS: &[Flag<u32>] = &flags!(
+        R_CRIS_NONE,
+        R_CRIS_8,
+        R_CRIS_16,
+        R_CRIS_32,
+        R_CRIS_8_PCREL,
+        R_CRIS_16_PCREL,
+        R_CRIS_32_PCREL,
+        R_CRIS_GNU_VTINHERIT,
+        R_CRIS_GNU_VTENTRY,
+        R_CRIS_COPY,
+        R_CRIS_GLOB_DAT,
+        R_CRIS_JUMP_SLOT,
+        R_CRIS_RELATIVE,
+        R_CRIS_16_GOT,
+        R_CRIS_32_GOT,
+        R_CRIS_16_GOTPLT,
+        R_CRIS_32_GOTPLT,
+        R_CRIS_32_GOTREL,
+        R_CRIS_32_PLT_GOTREL,
+        R_CRIS_32_PLT_PCREL,
+    );
+    static FLAGS_R_X86_64: &[Flag<u32>] = &flags!(
+        R_X86_64_NONE,
+        R_X86_64_64,
+        R_X86_64_PC32,
+        R_X86_64_GOT32,
+        R_X86_64_PLT32,
+        R_X86_64_COPY,
+        R_X86_64_GLOB_DAT,
+        R_X86_64_JUMP_SLOT,
+        R_X86_64_RELATIVE,
+        R_X86_64_GOTPCREL,
+        R_X86_64_32,
+        R_X86_64_32S,
+        R_X86_64_16,
+        R_X86_64_PC16,
+        R_X86_64_8,
+        R_X86_64_PC8,
+        R_X86_64_DTPMOD64,
+        R_X86_64_DTPOFF64,
+        R_X86_64_TPOFF64,
+        R_X86_64_TLSGD,
+        R_X86_64_TLSLD,
+        R_X86_64_DTPOFF32,
+        R_X86_64_GOTTPOFF,
+        R_X86_64_TPOFF32,
+        R_X86_64_PC64,
+        R_X86_64_GOTOFF64,
+        R_X86_64_GOTPC32,
+        R_X86_64_GOT64,
+        R_X86_64_GOTPCREL64,
+        R_X86_64_GOTPC64,
+        R_X86_64_GOTPLT64,
+        R_X86_64_PLTOFF64,
+        R_X86_64_SIZE32,
+        R_X86_64_SIZE64,
+        R_X86_64_GOTPC32_TLSDESC,
+        R_X86_64_TLSDESC_CALL,
+        R_X86_64_TLSDESC,
+        R_X86_64_IRELATIVE,
+        R_X86_64_RELATIVE64,
+        R_X86_64_GOTPCRELX,
+        R_X86_64_REX_GOTPCRELX,
+    );
+    static FLAGS_R_MN10300: &[Flag<u32>] = &flags!(
+        R_MN10300_NONE,
+        R_MN10300_32,
+        R_MN10300_16,
+        R_MN10300_8,
+        R_MN10300_PCREL32,
+        R_MN10300_PCREL16,
+        R_MN10300_PCREL8,
+        R_MN10300_GNU_VTINHERIT,
+        R_MN10300_GNU_VTENTRY,
+        R_MN10300_24,
+        R_MN10300_GOTPC32,
+        R_MN10300_GOTPC16,
+        R_MN10300_GOTOFF32,
+        R_MN10300_GOTOFF24,
+        R_MN10300_GOTOFF16,
+        R_MN10300_PLT32,
+        R_MN10300_PLT16,
+        R_MN10300_GOT32,
+        R_MN10300_GOT24,
+        R_MN10300_GOT16,
+        R_MN10300_COPY,
+        R_MN10300_GLOB_DAT,
+        R_MN10300_JMP_SLOT,
+        R_MN10300_RELATIVE,
+        R_MN10300_TLS_GD,
+        R_MN10300_TLS_LD,
+        R_MN10300_TLS_LDO,
+        R_MN10300_TLS_GOTIE,
+        R_MN10300_TLS_IE,
+        R_MN10300_TLS_LE,
+        R_MN10300_TLS_DTPMOD,
+        R_MN10300_TLS_DTPOFF,
+        R_MN10300_TLS_TPOFF,
+        R_MN10300_SYM_DIFF,
+        R_MN10300_ALIGN,
+    );
+    static FLAGS_R_M32R: &[Flag<u32>] = &flags!(
+        R_M32R_NONE,
+        R_M32R_16,
+        R_M32R_32,
+        R_M32R_24,
+        R_M32R_10_PCREL,
+        R_M32R_18_PCREL,
+        R_M32R_26_PCREL,
+        R_M32R_HI16_ULO,
+        R_M32R_HI16_SLO,
+        R_M32R_LO16,
+        R_M32R_SDA16,
+        R_M32R_GNU_VTINHERIT,
+        R_M32R_GNU_VTENTRY,
+        R_M32R_16_RELA,
+        R_M32R_32_RELA,
+        R_M32R_24_RELA,
+        R_M32R_10_PCREL_RELA,
+        R_M32R_18_PCREL_RELA,
+        R_M32R_26_PCREL_RELA,
+        R_M32R_HI16_ULO_RELA,
+        R_M32R_HI16_SLO_RELA,
+        R_M32R_LO16_RELA,
+        R_M32R_SDA16_RELA,
+        R_M32R_RELA_GNU_VTINHERIT,
+        R_M32R_RELA_GNU_VTENTRY,
+        R_M32R_REL32,
+        R_M32R_GOT24,
+        R_M32R_26_PLTREL,
+        R_M32R_COPY,
+        R_M32R_GLOB_DAT,
+        R_M32R_JMP_SLOT,
+        R_M32R_RELATIVE,
+        R_M32R_GOTOFF,
+        R_M32R_GOTPC24,
+        R_M32R_GOT16_HI_ULO,
+        R_M32R_GOT16_HI_SLO,
+        R_M32R_GOT16_LO,
+        R_M32R_GOTPC_HI_ULO,
+        R_M32R_GOTPC_HI_SLO,
+        R_M32R_GOTPC_LO,
+        R_M32R_GOTOFF_HI_ULO,
+        R_M32R_GOTOFF_HI_SLO,
+        R_M32R_GOTOFF_LO,
+        R_M32R_NUM,
+    );
+    static FLAGS_R_MICROBLAZE: &[Flag<u32>] = &flags!(
+        R_MICROBLAZE_NONE,
+        R_MICROBLAZE_32,
+        R_MICROBLAZE_32_PCREL,
+        R_MICROBLAZE_64_PCREL,
+        R_MICROBLAZE_32_PCREL_LO,
+        R_MICROBLAZE_64,
+        R_MICROBLAZE_32_LO,
+        R_MICROBLAZE_SRO32,
+        R_MICROBLAZE_SRW32,
+        R_MICROBLAZE_64_NONE,
+        R_MICROBLAZE_32_SYM_OP_SYM,
+        R_MICROBLAZE_GNU_VTINHERIT,
+        R_MICROBLAZE_GNU_VTENTRY,
+        R_MICROBLAZE_GOTPC_64,
+        R_MICROBLAZE_GOT_64,
+        R_MICROBLAZE_PLT_64,
+        R_MICROBLAZE_REL,
+        R_MICROBLAZE_JUMP_SLOT,
+        R_MICROBLAZE_GLOB_DAT,
+        R_MICROBLAZE_GOTOFF_64,
+        R_MICROBLAZE_GOTOFF_32,
+        R_MICROBLAZE_COPY,
+        R_MICROBLAZE_TLS,
+        R_MICROBLAZE_TLSGD,
+        R_MICROBLAZE_TLSLD,
+        R_MICROBLAZE_TLSDTPMOD32,
+        R_MICROBLAZE_TLSDTPREL32,
+        R_MICROBLAZE_TLSDTPREL64,
+        R_MICROBLAZE_TLSGOTTPREL32,
+        R_MICROBLAZE_TLSTPREL32,
+    );
+    static FLAGS_R_NIOS2: &[Flag<u32>] = &flags!(
+        R_NIOS2_NONE,
+        R_NIOS2_S16,
+        R_NIOS2_U16,
+        R_NIOS2_PCREL16,
+        R_NIOS2_CALL26,
+        R_NIOS2_IMM5,
+        R_NIOS2_CACHE_OPX,
+        R_NIOS2_IMM6,
+        R_NIOS2_IMM8,
+        R_NIOS2_HI16,
+        R_NIOS2_LO16,
+        R_NIOS2_HIADJ16,
+        R_NIOS2_BFD_RELOC_32,
+        R_NIOS2_BFD_RELOC_16,
+        R_NIOS2_BFD_RELOC_8,
+        R_NIOS2_GPREL,
+        R_NIOS2_GNU_VTINHERIT,
+        R_NIOS2_GNU_VTENTRY,
+        R_NIOS2_UJMP,
+        R_NIOS2_CJMP,
+        R_NIOS2_CALLR,
+        R_NIOS2_ALIGN,
+        R_NIOS2_GOT16,
+        R_NIOS2_CALL16,
+        R_NIOS2_GOTOFF_LO,
+        R_NIOS2_GOTOFF_HA,
+        R_NIOS2_PCREL_LO,
+        R_NIOS2_PCREL_HA,
+        R_NIOS2_TLS_GD16,
+        R_NIOS2_TLS_LDM16,
+        R_NIOS2_TLS_LDO16,
+        R_NIOS2_TLS_IE16,
+        R_NIOS2_TLS_LE16,
+        R_NIOS2_TLS_DTPMOD,
+        R_NIOS2_TLS_DTPREL,
+        R_NIOS2_TLS_TPREL,
+        R_NIOS2_COPY,
+        R_NIOS2_GLOB_DAT,
+        R_NIOS2_JUMP_SLOT,
+        R_NIOS2_RELATIVE,
+        R_NIOS2_GOTOFF,
+        R_NIOS2_CALL26_NOAT,
+        R_NIOS2_GOT_LO,
+        R_NIOS2_GOT_HA,
+        R_NIOS2_CALL_LO,
+        R_NIOS2_CALL_HA,
+    );
+    static FLAGS_R_TILEPRO: &[Flag<u32>] = &flags!(
+        R_TILEPRO_NONE,
+        R_TILEPRO_32,
+        R_TILEPRO_16,
+        R_TILEPRO_8,
+        R_TILEPRO_32_PCREL,
+        R_TILEPRO_16_PCREL,
+        R_TILEPRO_8_PCREL,
+        R_TILEPRO_LO16,
+        R_TILEPRO_HI16,
+        R_TILEPRO_HA16,
+        R_TILEPRO_COPY,
+        R_TILEPRO_GLOB_DAT,
+        R_TILEPRO_JMP_SLOT,
+        R_TILEPRO_RELATIVE,
+        R_TILEPRO_BROFF_X1,
+        R_TILEPRO_JOFFLONG_X1,
+        R_TILEPRO_JOFFLONG_X1_PLT,
+        R_TILEPRO_IMM8_X0,
+        R_TILEPRO_IMM8_Y0,
+        R_TILEPRO_IMM8_X1,
+        R_TILEPRO_IMM8_Y1,
+        R_TILEPRO_MT_IMM15_X1,
+        R_TILEPRO_MF_IMM15_X1,
+        R_TILEPRO_IMM16_X0,
+        R_TILEPRO_IMM16_X1,
+        R_TILEPRO_IMM16_X0_LO,
+        R_TILEPRO_IMM16_X1_LO,
+        R_TILEPRO_IMM16_X0_HI,
+        R_TILEPRO_IMM16_X1_HI,
+        R_TILEPRO_IMM16_X0_HA,
+        R_TILEPRO_IMM16_X1_HA,
+        R_TILEPRO_IMM16_X0_PCREL,
+        R_TILEPRO_IMM16_X1_PCREL,
+        R_TILEPRO_IMM16_X0_LO_PCREL,
+        R_TILEPRO_IMM16_X1_LO_PCREL,
+        R_TILEPRO_IMM16_X0_HI_PCREL,
+        R_TILEPRO_IMM16_X1_HI_PCREL,
+        R_TILEPRO_IMM16_X0_HA_PCREL,
+        R_TILEPRO_IMM16_X1_HA_PCREL,
+        R_TILEPRO_IMM16_X0_GOT,
+        R_TILEPRO_IMM16_X1_GOT,
+        R_TILEPRO_IMM16_X0_GOT_LO,
+        R_TILEPRO_IMM16_X1_GOT_LO,
+        R_TILEPRO_IMM16_X0_GOT_HI,
+        R_TILEPRO_IMM16_X1_GOT_HI,
+        R_TILEPRO_IMM16_X0_GOT_HA,
+        R_TILEPRO_IMM16_X1_GOT_HA,
+        R_TILEPRO_MMSTART_X0,
+        R_TILEPRO_MMEND_X0,
+        R_TILEPRO_MMSTART_X1,
+        R_TILEPRO_MMEND_X1,
+        R_TILEPRO_SHAMT_X0,
+        R_TILEPRO_SHAMT_X1,
+        R_TILEPRO_SHAMT_Y0,
+        R_TILEPRO_SHAMT_Y1,
+        R_TILEPRO_DEST_IMM8_X1,
+        R_TILEPRO_TLS_GD_CALL,
+        R_TILEPRO_IMM8_X0_TLS_GD_ADD,
+        R_TILEPRO_IMM8_X1_TLS_GD_ADD,
+        R_TILEPRO_IMM8_Y0_TLS_GD_ADD,
+        R_TILEPRO_IMM8_Y1_TLS_GD_ADD,
+        R_TILEPRO_TLS_IE_LOAD,
+        R_TILEPRO_IMM16_X0_TLS_GD,
+        R_TILEPRO_IMM16_X1_TLS_GD,
+        R_TILEPRO_IMM16_X0_TLS_GD_LO,
+        R_TILEPRO_IMM16_X1_TLS_GD_LO,
+        R_TILEPRO_IMM16_X0_TLS_GD_HI,
+        R_TILEPRO_IMM16_X1_TLS_GD_HI,
+        R_TILEPRO_IMM16_X0_TLS_GD_HA,
+        R_TILEPRO_IMM16_X1_TLS_GD_HA,
+        R_TILEPRO_IMM16_X0_TLS_IE,
+        R_TILEPRO_IMM16_X1_TLS_IE,
+        R_TILEPRO_IMM16_X0_TLS_IE_LO,
+        R_TILEPRO_IMM16_X1_TLS_IE_LO,
+        R_TILEPRO_IMM16_X0_TLS_IE_HI,
+        R_TILEPRO_IMM16_X1_TLS_IE_HI,
+        R_TILEPRO_IMM16_X0_TLS_IE_HA,
+        R_TILEPRO_IMM16_X1_TLS_IE_HA,
+        R_TILEPRO_TLS_DTPMOD32,
+        R_TILEPRO_TLS_DTPOFF32,
+        R_TILEPRO_TLS_TPOFF32,
+        R_TILEPRO_IMM16_X0_TLS_LE,
+        R_TILEPRO_IMM16_X1_TLS_LE,
+        R_TILEPRO_IMM16_X0_TLS_LE_LO,
+        R_TILEPRO_IMM16_X1_TLS_LE_LO,
+        R_TILEPRO_IMM16_X0_TLS_LE_HI,
+        R_TILEPRO_IMM16_X1_TLS_LE_HI,
+        R_TILEPRO_IMM16_X0_TLS_LE_HA,
+        R_TILEPRO_IMM16_X1_TLS_LE_HA,
+        R_TILEPRO_GNU_VTINHERIT,
+        R_TILEPRO_GNU_VTENTRY,
+    );
+    static FLAGS_R_TILEGX: &[Flag<u32>] = &flags!(
+        R_TILEGX_NONE,
+        R_TILEGX_64,
+        R_TILEGX_32,
+        R_TILEGX_16,
+        R_TILEGX_8,
+        R_TILEGX_64_PCREL,
+        R_TILEGX_32_PCREL,
+        R_TILEGX_16_PCREL,
+        R_TILEGX_8_PCREL,
+        R_TILEGX_HW0,
+        R_TILEGX_HW1,
+        R_TILEGX_HW2,
+        R_TILEGX_HW3,
+        R_TILEGX_HW0_LAST,
+        R_TILEGX_HW1_LAST,
+        R_TILEGX_HW2_LAST,
+        R_TILEGX_COPY,
+        R_TILEGX_GLOB_DAT,
+        R_TILEGX_JMP_SLOT,
+        R_TILEGX_RELATIVE,
+        R_TILEGX_BROFF_X1,
+        R_TILEGX_JUMPOFF_X1,
+        R_TILEGX_JUMPOFF_X1_PLT,
+        R_TILEGX_IMM8_X0,
+        R_TILEGX_IMM8_Y0,
+        R_TILEGX_IMM8_X1,
+        R_TILEGX_IMM8_Y1,
+        R_TILEGX_DEST_IMM8_X1,
+        R_TILEGX_MT_IMM14_X1,
+        R_TILEGX_MF_IMM14_X1,
+        R_TILEGX_MMSTART_X0,
+        R_TILEGX_MMEND_X0,
+        R_TILEGX_SHAMT_X0,
+        R_TILEGX_SHAMT_X1,
+        R_TILEGX_SHAMT_Y0,
+        R_TILEGX_SHAMT_Y1,
+        R_TILEGX_IMM16_X0_HW0,
+        R_TILEGX_IMM16_X1_HW0,
+        R_TILEGX_IMM16_X0_HW1,
+        R_TILEGX_IMM16_X1_HW1,
+        R_TILEGX_IMM16_X0_HW2,
+        R_TILEGX_IMM16_X1_HW2,
+        R_TILEGX_IMM16_X0_HW3,
+        R_TILEGX_IMM16_X1_HW3,
+        R_TILEGX_IMM16_X0_HW0_LAST,
+        R_TILEGX_IMM16_X1_HW0_LAST,
+        R_TILEGX_IMM16_X0_HW1_LAST,
+        R_TILEGX_IMM16_X1_HW1_LAST,
+        R_TILEGX_IMM16_X0_HW2_LAST,
+        R_TILEGX_IMM16_X1_HW2_LAST,
+        R_TILEGX_IMM16_X0_HW0_PCREL,
+        R_TILEGX_IMM16_X1_HW0_PCREL,
+        R_TILEGX_IMM16_X0_HW1_PCREL,
+        R_TILEGX_IMM16_X1_HW1_PCREL,
+        R_TILEGX_IMM16_X0_HW2_PCREL,
+        R_TILEGX_IMM16_X1_HW2_PCREL,
+        R_TILEGX_IMM16_X0_HW3_PCREL,
+        R_TILEGX_IMM16_X1_HW3_PCREL,
+        R_TILEGX_IMM16_X0_HW0_LAST_PCREL,
+        R_TILEGX_IMM16_X1_HW0_LAST_PCREL,
+        R_TILEGX_IMM16_X0_HW1_LAST_PCREL,
+        R_TILEGX_IMM16_X1_HW1_LAST_PCREL,
+        R_TILEGX_IMM16_X0_HW2_LAST_PCREL,
+        R_TILEGX_IMM16_X1_HW2_LAST_PCREL,
+        R_TILEGX_IMM16_X0_HW0_GOT,
+        R_TILEGX_IMM16_X1_HW0_GOT,
+        R_TILEGX_IMM16_X0_HW0_PLT_PCREL,
+        R_TILEGX_IMM16_X1_HW0_PLT_PCREL,
+        R_TILEGX_IMM16_X0_HW1_PLT_PCREL,
+        R_TILEGX_IMM16_X1_HW1_PLT_PCREL,
+        R_TILEGX_IMM16_X0_HW2_PLT_PCREL,
+        R_TILEGX_IMM16_X1_HW2_PLT_PCREL,
+        R_TILEGX_IMM16_X0_HW0_LAST_GOT,
+        R_TILEGX_IMM16_X1_HW0_LAST_GOT,
+        R_TILEGX_IMM16_X0_HW1_LAST_GOT,
+        R_TILEGX_IMM16_X1_HW1_LAST_GOT,
+        R_TILEGX_IMM16_X0_HW3_PLT_PCREL,
+        R_TILEGX_IMM16_X1_HW3_PLT_PCREL,
+        R_TILEGX_IMM16_X0_HW0_TLS_GD,
+        R_TILEGX_IMM16_X1_HW0_TLS_GD,
+        R_TILEGX_IMM16_X0_HW0_TLS_LE,
+        R_TILEGX_IMM16_X1_HW0_TLS_LE,
+        R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE,
+        R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE,
+        R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE,
+        R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE,
+        R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD,
+        R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD,
+        R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD,
+        R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD,
+        R_TILEGX_IMM16_X0_HW0_TLS_IE,
+        R_TILEGX_IMM16_X1_HW0_TLS_IE,
+        R_TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL,
+        R_TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL,
+        R_TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL,
+        R_TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL,
+        R_TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL,
+        R_TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL,
+        R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE,
+        R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE,
+        R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE,
+        R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE,
+        R_TILEGX_TLS_DTPMOD64,
+        R_TILEGX_TLS_DTPOFF64,
+        R_TILEGX_TLS_TPOFF64,
+        R_TILEGX_TLS_DTPMOD32,
+        R_TILEGX_TLS_DTPOFF32,
+        R_TILEGX_TLS_TPOFF32,
+        R_TILEGX_TLS_GD_CALL,
+        R_TILEGX_IMM8_X0_TLS_GD_ADD,
+        R_TILEGX_IMM8_X1_TLS_GD_ADD,
+        R_TILEGX_IMM8_Y0_TLS_GD_ADD,
+        R_TILEGX_IMM8_Y1_TLS_GD_ADD,
+        R_TILEGX_TLS_IE_LOAD,
+        R_TILEGX_IMM8_X0_TLS_ADD,
+        R_TILEGX_IMM8_X1_TLS_ADD,
+        R_TILEGX_IMM8_Y0_TLS_ADD,
+        R_TILEGX_IMM8_Y1_TLS_ADD,
+        R_TILEGX_GNU_VTINHERIT,
+        R_TILEGX_GNU_VTENTRY,
+    );
+    static FLAGS_R_RISCV: &[Flag<u32>] = &flags!(
+        R_RISCV_NONE,
+        R_RISCV_32,
+        R_RISCV_64,
+        R_RISCV_RELATIVE,
+        R_RISCV_COPY,
+        R_RISCV_JUMP_SLOT,
+        R_RISCV_TLS_DTPMOD32,
+        R_RISCV_TLS_DTPMOD64,
+        R_RISCV_TLS_DTPREL32,
+        R_RISCV_TLS_DTPREL64,
+        R_RISCV_TLS_TPREL32,
+        R_RISCV_TLS_TPREL64,
+        R_RISCV_BRANCH,
+        R_RISCV_JAL,
+        R_RISCV_CALL,
+        R_RISCV_CALL_PLT,
+        R_RISCV_GOT_HI20,
+        R_RISCV_TLS_GOT_HI20,
+        R_RISCV_TLS_GD_HI20,
+        R_RISCV_PCREL_HI20,
+        R_RISCV_PCREL_LO12_I,
+        R_RISCV_PCREL_LO12_S,
+        R_RISCV_HI20,
+        R_RISCV_LO12_I,
+        R_RISCV_LO12_S,
+        R_RISCV_TPREL_HI20,
+        R_RISCV_TPREL_LO12_I,
+        R_RISCV_TPREL_LO12_S,
+        R_RISCV_TPREL_ADD,
+        R_RISCV_ADD8,
+        R_RISCV_ADD16,
+        R_RISCV_ADD32,
+        R_RISCV_ADD64,
+        R_RISCV_SUB8,
+        R_RISCV_SUB16,
+        R_RISCV_SUB32,
+        R_RISCV_SUB64,
+        R_RISCV_GNU_VTINHERIT,
+        R_RISCV_GNU_VTENTRY,
+        R_RISCV_ALIGN,
+        R_RISCV_RVC_BRANCH,
+        R_RISCV_RVC_JUMP,
+        R_RISCV_RVC_LUI,
+        R_RISCV_GPREL_I,
+        R_RISCV_GPREL_S,
+        R_RISCV_TPREL_I,
+        R_RISCV_TPREL_S,
+        R_RISCV_RELAX,
+        R_RISCV_SUB6,
+        R_RISCV_SET6,
+        R_RISCV_SET8,
+        R_RISCV_SET16,
+        R_RISCV_SET32,
+        R_RISCV_32_PCREL,
+    );
+    static FLAGS_R_BPF: &[Flag<u32>] = &flags!(R_BPF_NONE, R_BPF_64_64, R_BPF_64_32);
+    static FLAGS_R_METAG: &[Flag<u32>] = &flags!(
+        R_METAG_HIADDR16,
+        R_METAG_LOADDR16,
+        R_METAG_ADDR32,
+        R_METAG_NONE,
+        R_METAG_RELBRANCH,
+        R_METAG_GETSETOFF,
+        R_METAG_REG32OP1,
+        R_METAG_REG32OP2,
+        R_METAG_REG32OP3,
+        R_METAG_REG16OP1,
+        R_METAG_REG16OP2,
+        R_METAG_REG16OP3,
+        R_METAG_REG32OP4,
+        R_METAG_HIOG,
+        R_METAG_LOOG,
+        R_METAG_REL8,
+        R_METAG_REL16,
+        R_METAG_GNU_VTINHERIT,
+        R_METAG_GNU_VTENTRY,
+        R_METAG_HI16_GOTOFF,
+        R_METAG_LO16_GOTOFF,
+        R_METAG_GETSET_GOTOFF,
+        R_METAG_GETSET_GOT,
+        R_METAG_HI16_GOTPC,
+        R_METAG_LO16_GOTPC,
+        R_METAG_HI16_PLT,
+        R_METAG_LO16_PLT,
+        R_METAG_RELBRANCH_PLT,
+        R_METAG_GOTOFF,
+        R_METAG_PLT,
+        R_METAG_COPY,
+        R_METAG_JMP_SLOT,
+        R_METAG_RELATIVE,
+        R_METAG_GLOB_DAT,
+        R_METAG_TLS_GD,
+        R_METAG_TLS_LDM,
+        R_METAG_TLS_LDO_HI16,
+        R_METAG_TLS_LDO_LO16,
+        R_METAG_TLS_LDO,
+        R_METAG_TLS_IE,
+        R_METAG_TLS_IENONPIC,
+        R_METAG_TLS_IENONPIC_HI16,
+        R_METAG_TLS_IENONPIC_LO16,
+        R_METAG_TLS_TPOFF,
+        R_METAG_TLS_DTPMOD,
+        R_METAG_TLS_DTPOFF,
+        R_METAG_TLS_LE,
+        R_METAG_TLS_LE_HI16,
+        R_METAG_TLS_LE_LO16,
+    );
+    static FLAGS_R_NDS32: &[Flag<u32>] = &flags!(
+        R_NDS32_NONE,
+        R_NDS32_32_RELA,
+        R_NDS32_COPY,
+        R_NDS32_GLOB_DAT,
+        R_NDS32_JMP_SLOT,
+        R_NDS32_RELATIVE,
+        R_NDS32_TLS_TPOFF,
+        R_NDS32_TLS_DESC,
+    );
+    static FLAGS_NT_CORE: &[Flag<u32>] = &flags!(
+        NT_PRSTATUS,
+        NT_PRFPREG,
+        NT_FPREGSET,
+        NT_PRPSINFO,
+        NT_PRXREG,
+        NT_TASKSTRUCT,
+        NT_PLATFORM,
+        NT_AUXV,
+        NT_GWINDOWS,
+        NT_ASRS,
+        NT_PSTATUS,
+        NT_PSINFO,
+        NT_PRCRED,
+        NT_UTSNAME,
+        NT_LWPSTATUS,
+        NT_LWPSINFO,
+        NT_PRFPXREG,
+        NT_SIGINFO,
+        NT_FILE,
+        NT_PRXFPREG,
+        NT_PPC_VMX,
+        NT_PPC_SPE,
+        NT_PPC_VSX,
+        NT_PPC_TAR,
+        NT_PPC_PPR,
+        NT_PPC_DSCR,
+        NT_PPC_EBB,
+        NT_PPC_PMU,
+        NT_PPC_TM_CGPR,
+        NT_PPC_TM_CFPR,
+        NT_PPC_TM_CVMX,
+        NT_PPC_TM_CVSX,
+        NT_PPC_TM_SPR,
+        NT_PPC_TM_CTAR,
+        NT_PPC_TM_CPPR,
+        NT_PPC_TM_CDSCR,
+        NT_PPC_PKEY,
+        NT_386_TLS,
+        NT_386_IOPERM,
+        NT_X86_XSTATE,
+        NT_S390_HIGH_GPRS,
+        NT_S390_TIMER,
+        NT_S390_TODCMP,
+        NT_S390_TODPREG,
+        NT_S390_CTRS,
+        NT_S390_PREFIX,
+        NT_S390_LAST_BREAK,
+        NT_S390_SYSTEM_CALL,
+        NT_S390_TDB,
+        NT_S390_VXRS_LOW,
+        NT_S390_VXRS_HIGH,
+        NT_S390_GS_CB,
+        NT_S390_GS_BC,
+        NT_S390_RI_CB,
+        NT_ARM_VFP,
+        NT_ARM_TLS,
+        NT_ARM_HW_BREAK,
+        NT_ARM_HW_WATCH,
+        NT_ARM_SYSTEM_CALL,
+        NT_ARM_SVE,
+        NT_VMCOREDD,
+        NT_MIPS_DSP,
+        NT_MIPS_FP_MODE,
+    );
+    static FLAGS_NT_SOLARIS: &[Flag<u32>] = &flags!(NT_SOLARIS_PAGESIZE_HINT);
+    static FLAGS_NT_GNU: &[Flag<u32>] = &flags!(
+        NT_GNU_ABI_TAG,
+        NT_GNU_HWCAP,
+        NT_GNU_BUILD_ID,
+        NT_GNU_GOLD_VERSION,
+        NT_GNU_PROPERTY_TYPE_0,
+    );
+    static FLAGS_GRP: &[Flag<u32>] = &flags!(GRP_COMDAT);
+    static FLAGS_DT: &[Flag<u32>] = &flags!(
+        DT_NULL,
+        DT_NEEDED,
+        DT_PLTRELSZ,
+        DT_PLTGOT,
+        DT_HASH,
+        DT_STRTAB,
+        DT_SYMTAB,
+        DT_RELA,
+        DT_RELASZ,
+        DT_RELAENT,
+        DT_STRSZ,
+        DT_SYMENT,
+        DT_INIT,
+        DT_FINI,
+        DT_SONAME,
+        DT_RPATH,
+        DT_SYMBOLIC,
+        DT_REL,
+        DT_RELSZ,
+        DT_RELENT,
+        DT_PLTREL,
+        DT_DEBUG,
+        DT_TEXTREL,
+        DT_JMPREL,
+        DT_BIND_NOW,
+        DT_INIT_ARRAY,
+        DT_FINI_ARRAY,
+        DT_INIT_ARRAYSZ,
+        DT_FINI_ARRAYSZ,
+        DT_RUNPATH,
+        DT_FLAGS,
+        DT_PREINIT_ARRAY,
+        DT_PREINIT_ARRAYSZ,
+        DT_SYMTAB_SHNDX,
+        DT_GNU_PRELINKED,
+        DT_GNU_CONFLICTSZ,
+        DT_GNU_LIBLISTSZ,
+        DT_CHECKSUM,
+        DT_PLTPADSZ,
+        DT_MOVEENT,
+        DT_MOVESZ,
+        DT_FEATURE_1,
+        DT_POSFLAG_1,
+        DT_SYMINSZ,
+        DT_SYMINENT,
+        DT_GNU_HASH,
+        DT_TLSDESC_PLT,
+        DT_TLSDESC_GOT,
+        DT_GNU_CONFLICT,
+        DT_GNU_LIBLIST,
+        DT_CONFIG,
+        DT_DEPAUDIT,
+        DT_AUDIT,
+        DT_PLTPAD,
+        DT_MOVETAB,
+        DT_SYMINFO,
+        DT_VERSYM,
+        DT_RELACOUNT,
+        DT_RELCOUNT,
+        DT_FLAGS_1,
+        DT_VERDEF,
+        DT_VERDEFNUM,
+        DT_VERNEED,
+        DT_VERNEEDNUM,
+        DT_AUXILIARY,
+        DT_FILTER,
+    );
+    static FLAGS_DT_SPARC: &[Flag<u32>] = &flags!(DT_SPARC_REGISTER);
+    static FLAGS_DT_MIPS: &[Flag<u32>] = &flags!(
+        DT_MIPS_RLD_VERSION,
+        DT_MIPS_TIME_STAMP,
+        DT_MIPS_ICHECKSUM,
+        DT_MIPS_IVERSION,
+        DT_MIPS_FLAGS,
+        DT_MIPS_BASE_ADDRESS,
+        DT_MIPS_MSYM,
+        DT_MIPS_CONFLICT,
+        DT_MIPS_LIBLIST,
+        DT_MIPS_LOCAL_GOTNO,
+        DT_MIPS_CONFLICTNO,
+        DT_MIPS_LIBLISTNO,
+        DT_MIPS_SYMTABNO,
+        DT_MIPS_UNREFEXTNO,
+        DT_MIPS_GOTSYM,
+        DT_MIPS_HIPAGENO,
+        DT_MIPS_RLD_MAP,
+        DT_MIPS_DELTA_CLASS,
+        DT_MIPS_DELTA_CLASS_NO,
+        DT_MIPS_DELTA_INSTANCE,
+        DT_MIPS_DELTA_INSTANCE_NO,
+        DT_MIPS_DELTA_RELOC,
+        DT_MIPS_DELTA_RELOC_NO,
+        DT_MIPS_DELTA_SYM,
+        DT_MIPS_DELTA_SYM_NO,
+        DT_MIPS_DELTA_CLASSSYM,
+        DT_MIPS_DELTA_CLASSSYM_NO,
+        DT_MIPS_CXX_FLAGS,
+        DT_MIPS_PIXIE_INIT,
+        DT_MIPS_SYMBOL_LIB,
+        DT_MIPS_LOCALPAGE_GOTIDX,
+        DT_MIPS_LOCAL_GOTIDX,
+        DT_MIPS_HIDDEN_GOTIDX,
+        DT_MIPS_PROTECTED_GOTIDX,
+        DT_MIPS_OPTIONS,
+        DT_MIPS_INTERFACE,
+        DT_MIPS_DYNSTR_ALIGN,
+        DT_MIPS_INTERFACE_SIZE,
+        DT_MIPS_RLD_TEXT_RESOLVE_ADDR,
+        DT_MIPS_PERF_SUFFIX,
+        DT_MIPS_COMPACT_SIZE,
+        DT_MIPS_GP_VALUE,
+        DT_MIPS_AUX_DYNAMIC,
+        DT_MIPS_PLTGOT,
+        DT_MIPS_RWPLT,
+        DT_MIPS_RLD_MAP_REL,
+    );
+    static FLAGS_DT_ALPHA: &[Flag<u32>] = &flags!(DT_ALPHA_PLTRO);
+    static FLAGS_DT_PPC: &[Flag<u32>] = &flags!(DT_PPC_GOT, DT_PPC_OPT);
+    static FLAGS_DT_PPC64: &[Flag<u32>] =
+        &flags!(DT_PPC64_GLINK, DT_PPC64_OPD, DT_PPC64_OPDSZ, DT_PPC64_OPT);
+    static FLAGS_DT_IA_64: &[Flag<u32>] = &flags!(DT_IA_64_PLT_RESERVE);
+    static FLAGS_DT_NIOS2: &[Flag<u32>] = &flags!(DT_NIOS2_GP);
+    static FLAGS_DF: &[Flag<u32>] = &flags!(
+        DF_ORIGIN,
+        DF_SYMBOLIC,
+        DF_TEXTREL,
+        DF_BIND_NOW,
+        DF_STATIC_TLS,
+    );
+    static FLAGS_DF_1: &[Flag<u32>] = &flags!(
+        DF_1_NOW,
+        DF_1_GLOBAL,
+        DF_1_GROUP,
+        DF_1_NODELETE,
+        DF_1_LOADFLTR,
+        DF_1_INITFIRST,
+        DF_1_NOOPEN,
+        DF_1_ORIGIN,
+        DF_1_DIRECT,
+        DF_1_TRANS,
+        DF_1_INTERPOSE,
+        DF_1_NODEFLIB,
+        DF_1_NODUMP,
+        DF_1_CONFALT,
+        DF_1_ENDFILTEE,
+        DF_1_DISPRELDNE,
+        DF_1_DISPRELPND,
+        DF_1_NODIRECT,
+        DF_1_IGNMULDEF,
+        DF_1_NOKSYMS,
+        DF_1_NOHDR,
+        DF_1_EDITED,
+        DF_1_NORELOC,
+        DF_1_SYMINTPOSE,
+        DF_1_GLOBAUDIT,
+        DF_1_SINGLETON,
+        DF_1_STUB,
+        DF_1_PIE,
+    );
+    static FLAGS_VER_FLG: &[Flag<u16>] = &flags!(VER_FLG_BASE, VER_FLG_WEAK);
+    static FLAGS_VER_NDX: &[Flag<u16>] = &flags!(VER_NDX_HIDDEN);
+}
+
+mod macho {
+    use super::*;
+    use object::macho::*;
+    use object::read::macho::*;
+    use object::BigEndian;
+
+    pub(super) fn print_dyld_cache(p: &mut Printer<impl Write>, data: &[u8]) {
+        if let Ok(header) = DyldCacheHeader::<Endianness>::parse(data) {
+            if let Ok((_, endian)) = header.parse_magic() {
+                print_dyld_cache_header(p, endian, header);
+                let mappings = header.mappings(endian, data).ok();
+                if let Some(mappings) = mappings {
+                    print_dyld_cache_mappings(p, endian, mappings);
+                }
+                if let Ok(images) = header.images(endian, data) {
+                    print_dyld_cache_images(p, endian, data, mappings, images);
+                }
+            }
+        }
+    }
+
+    pub(super) fn print_dyld_cache_header(
+        p: &mut Printer<impl Write>,
+        endian: Endianness,
+        header: &DyldCacheHeader<Endianness>,
+    ) {
+        p.group("DyldCacheHeader", |p| {
+            p.field_bytes("Magic", &header.magic);
+            p.field_hex("MappingOffset", header.mapping_offset.get(endian));
+            p.field("MappingCount", header.mapping_count.get(endian));
+            p.field_hex("ImagesOffset", header.images_offset.get(endian));
+            p.field("ImagesCount", header.images_count.get(endian));
+            p.field_hex("DyldBaseAddress", header.dyld_base_address.get(endian));
+        });
+    }
+
+    pub(super) fn print_dyld_cache_mappings(
+        p: &mut Printer<impl Write>,
+        endian: Endianness,
+        mappings: &[DyldCacheMappingInfo<Endianness>],
+    ) {
+        for mapping in mappings {
+            p.group("DyldCacheMappingInfo", |p| {
+                p.field_hex("Address", mapping.address.get(endian));
+                p.field_hex("Size", mapping.size.get(endian));
+                p.field_hex("FileOffset", mapping.file_offset.get(endian));
+                p.field_hex("MaxProt", mapping.max_prot.get(endian));
+                p.flags(mapping.max_prot.get(endian), 0, FLAGS_VM);
+                p.field_hex("InitProt", mapping.init_prot.get(endian));
+                p.flags(mapping.init_prot.get(endian), 0, FLAGS_VM);
+            });
+        }
+    }
+
+    pub(super) fn print_dyld_cache_images(
+        p: &mut Printer<impl Write>,
+        endian: Endianness,
+        data: &[u8],
+        mappings: Option<&[DyldCacheMappingInfo<Endianness>]>,
+        images: &[DyldCacheImageInfo<Endianness>],
+    ) {
+        for image in images {
+            p.group("DyldCacheImageInfo", |p| {
+                p.field_hex("Address", image.address.get(endian));
+                p.field_hex("ModTime", image.mod_time.get(endian));
+                p.field_hex("Inode", image.inode.get(endian));
+                p.field_string(
+                    "Path",
+                    image.path_file_offset.get(endian),
+                    image.path(endian, data).ok(),
+                );
+                p.field_hex("Pad", image.pad.get(endian));
+            });
+            if let Some(offset) =
+                mappings.and_then(|mappings| image.file_offset(endian, mappings).ok())
+            {
+                p.blank();
+                print_object_at(p, data, offset);
+                p.blank();
+            }
+        }
+    }
+
+    pub(super) fn print_macho_fat32(p: &mut Printer<impl Write>, data: &[u8]) {
+        if let Ok(arches) = FatHeader::parse_arch32(data) {
+            println!("Format: Mach-O Fat 32-bit");
+            print_fat_header(p, data);
+            for arch in arches {
+                print_fat_arch(p, arch);
+            }
+            for arch in arches {
+                if let Ok(data) = arch.data(data) {
+                    p.blank();
+                    print_object(p, data);
+                }
+            }
+        }
+    }
+
+    pub(super) fn print_macho_fat64(p: &mut Printer<impl Write>, data: &[u8]) {
+        if let Ok(arches) = FatHeader::parse_arch64(data) {
+            println!("Format: Mach-O Fat 64-bit");
+            print_fat_header(p, data);
+            for arch in arches {
+                print_fat_arch(p, arch);
+            }
+            for arch in arches {
+                if let Ok(data) = arch.data(data) {
+                    p.blank();
+                    print_object(p, data);
+                }
+            }
+        }
+    }
+
+    pub(super) fn print_fat_header(p: &mut Printer<impl Write>, data: &[u8]) {
+        if let Ok(header) = FatHeader::parse(data) {
+            p.group("FatHeader", |p| {
+                p.field_hex("Magic", header.magic.get(BigEndian));
+                p.field("NumberOfFatArch", header.nfat_arch.get(BigEndian));
+            });
+        }
+    }
+
+    pub(super) fn print_fat_arch<Arch: FatArch>(p: &mut Printer<impl Write>, arch: &Arch) {
+        p.group("FatArch", |p| {
+            print_cputype(p, arch.cputype(), arch.cpusubtype());
+            p.field_hex("Offset", arch.offset().into());
+            p.field_hex("Size", arch.size().into());
+            p.field("Align", arch.align());
+        });
+    }
+
+    pub(super) fn print_macho32(p: &mut Printer<impl Write>, data: &[u8], offset: u64) {
+        if let Ok(header) = MachHeader32::parse(data, offset) {
+            println!("Format: Mach-O 32-bit");
+            print_macho(p, header, data, offset);
+        }
+    }
+
+    pub(super) fn print_macho64(p: &mut Printer<impl Write>, data: &[u8], offset: u64) {
+        if let Ok(header) = MachHeader64::parse(data, offset) {
+            println!("Format: Mach-O 64-bit");
+            print_macho(p, header, data, offset);
+        }
+    }
+
+    #[derive(Default)]
+    struct MachState {
+        section_index: usize,
+    }
+
+    fn print_macho<Mach: MachHeader<Endian = Endianness>>(
+        p: &mut Printer<impl Write>,
+        header: &Mach,
+        data: &[u8],
+        offset: u64,
+    ) {
+        if let Ok(endian) = header.endian() {
+            let mut state = MachState::default();
+            print_mach_header(p, endian, header);
+            if let Ok(mut commands) = header.load_commands(endian, data, offset) {
+                while let Ok(Some(command)) = commands.next() {
+                    print_load_command(p, endian, data, header, command, &mut state);
+                }
+            }
+        }
+    }
+
+    fn print_mach_header<Mach: MachHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Mach::Endian,
+        header: &Mach,
+    ) {
+        p.group("MachHeader", |p| {
+            p.field_hex("Magic", header.magic().to_be());
+            print_cputype(p, header.cputype(endian), header.cpusubtype(endian));
+            p.field_enum("FileType", header.filetype(endian), FLAGS_MH_FILETYPE);
+            p.field("NumberOfCmds", header.ncmds(endian));
+            p.field_hex("SizeOfCmds", header.sizeofcmds(endian));
+            p.field_enum("Flags", header.flags(endian), FLAGS_MH);
+        });
+    }
+
+    fn print_load_command<Mach: MachHeader>(
+        p: &mut Printer<impl Write>,
+        endian: Mach::Endian,
+        data: &[u8],
+        header: &Mach,
+        command: LoadCommandData<Mach::Endian>,
+        state: &mut MachState,
+    ) {
+        if let Ok(variant) = command.variant() {
+            match variant {
+                LoadCommandVariant::Segment32(segment, section_data) => {
+                    print_segment(
+                        p,
+                        endian,
+                        data,
+                        header.cputype(endian),
+                        segment,
+                        section_data,
+                        state,
+                    );
+                }
+                LoadCommandVariant::Segment64(segment, section_data) => {
+                    print_segment(
+                        p,
+                        endian,
+                        data,
+                        header.cputype(endian),
+                        segment,
+                        section_data,
+                        state,
+                    );
+                }
+                LoadCommandVariant::Symtab(symtab) => {
+                    print_symtab::<Mach, _>(p, endian, data, symtab);
+                }
+                LoadCommandVariant::Thread(x, _thread_data) => {
+                    p.group("ThreadCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        // TODO: thread_data
+                    });
+                }
+                LoadCommandVariant::Dysymtab(x) => {
+                    p.group("DysymtabCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        // TODO: dump the tables these are all pointing to
+                        p.field("IndexOfLocalSymbols", x.ilocalsym.get(endian));
+                        p.field("NumberOfLocalSymbols", x.nlocalsym.get(endian));
+                        p.field("IndexOfExternallyDefinedSymbols", x.iextdefsym.get(endian));
+                        p.field("NumberOfExternallyDefinedSymbols", x.nextdefsym.get(endian));
+                        p.field("IndexOfUndefinedSymbols", x.iundefsym.get(endian));
+                        p.field("NumberOfUndefinedSymbols", x.nundefsym.get(endian));
+                        p.field_hex("TocOffset", x.tocoff.get(endian));
+                        p.field("NumberOfTocEntries", x.ntoc.get(endian));
+                        p.field_hex("ModuleTableOffset", x.modtaboff.get(endian));
+                        p.field("NumberOfModuleTableEntries", x.nmodtab.get(endian));
+                        p.field_hex("ExternalRefSymbolOffset", x.extrefsymoff.get(endian));
+                        p.field("NumberOfExternalRefSymbols", x.nextrefsyms.get(endian));
+                        p.field_hex("IndirectSymbolOffset", x.indirectsymoff.get(endian));
+                        p.field("NumberOfIndirectSymbols", x.nindirectsyms.get(endian));
+                        p.field_hex("ExternalRelocationOffset", x.extreloff.get(endian));
+                        p.field("NumberOfExternalRelocations", x.nextrel.get(endian));
+                        p.field_hex("LocalRelocationOffset", x.locreloff.get(endian));
+                        p.field("NumberOfLocalRelocations", x.nlocrel.get(endian));
+                    });
+                }
+                LoadCommandVariant::Dylib(x) | LoadCommandVariant::IdDylib(x) => {
+                    p.group("DylibCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.group("Dylib", |p| {
+                            p.field_string(
+                                "Name",
+                                x.dylib.name.offset.get(endian),
+                                command.string(endian, x.dylib.name).ok(),
+                            );
+                            p.field("Timestamp", x.dylib.timestamp.get(endian));
+                            p.field_hex("CurrentVersion", x.dylib.current_version.get(endian));
+                            p.field_hex(
+                                "CompatibilityVersion",
+                                x.dylib.compatibility_version.get(endian),
+                            );
+                        });
+                    });
+                }
+                LoadCommandVariant::LoadDylinker(x)
+                | LoadCommandVariant::IdDylinker(x)
+                | LoadCommandVariant::DyldEnvironment(x) => {
+                    p.group("DylinkerCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_string(
+                            "Name",
+                            x.name.offset.get(endian),
+                            command.string(endian, x.name).ok(),
+                        );
+                    });
+                }
+                LoadCommandVariant::PreboundDylib(x) => {
+                    p.group("PreboundDylibCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_string(
+                            "Name",
+                            x.name.offset.get(endian),
+                            command.string(endian, x.name).ok(),
+                        );
+                        p.field("NumberOfModules", x.nmodules.get(endian));
+                        // TODO: display bit vector
+                        p.field_hex("LinkedModules", x.linked_modules.offset.get(endian));
+                    });
+                }
+                LoadCommandVariant::Routines32(x) => {
+                    p.group("RoutinesCommand32", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("InitAddress", x.init_address.get(endian));
+                        p.field_hex("InitModule", x.init_module.get(endian));
+                        p.field_hex("Reserved1", x.reserved1.get(endian));
+                        p.field_hex("Reserved2", x.reserved2.get(endian));
+                        p.field_hex("Reserved3", x.reserved3.get(endian));
+                        p.field_hex("Reserved4", x.reserved4.get(endian));
+                        p.field_hex("Reserved5", x.reserved5.get(endian));
+                        p.field_hex("Reserved6", x.reserved6.get(endian));
+                    });
+                }
+                LoadCommandVariant::Routines64(x) => {
+                    p.group("RoutinesCommand64", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("InitAddress", x.init_address.get(endian));
+                        p.field_hex("InitModule", x.init_module.get(endian));
+                        p.field_hex("Reserved1", x.reserved1.get(endian));
+                        p.field_hex("Reserved2", x.reserved2.get(endian));
+                        p.field_hex("Reserved3", x.reserved3.get(endian));
+                        p.field_hex("Reserved4", x.reserved4.get(endian));
+                        p.field_hex("Reserved5", x.reserved5.get(endian));
+                        p.field_hex("Reserved6", x.reserved6.get(endian));
+                    });
+                }
+                LoadCommandVariant::SubFramework(x) => {
+                    p.group("SubFrameworkCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_string(
+                            "Umbrella",
+                            x.umbrella.offset.get(endian),
+                            command.string(endian, x.umbrella).ok(),
+                        );
+                    });
+                }
+                LoadCommandVariant::SubUmbrella(x) => {
+                    p.group("SubUmbrellaCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_string(
+                            "SubUmbrella",
+                            x.sub_umbrella.offset.get(endian),
+                            command.string(endian, x.sub_umbrella).ok(),
+                        );
+                    });
+                }
+                LoadCommandVariant::SubClient(x) => {
+                    p.group("SubClientCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_string(
+                            "Client",
+                            x.client.offset.get(endian),
+                            command.string(endian, x.client).ok(),
+                        );
+                    });
+                }
+                LoadCommandVariant::SubLibrary(x) => {
+                    p.group("SubLibraryCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_string(
+                            "SubLibrary",
+                            x.sub_library.offset.get(endian),
+                            command.string(endian, x.sub_library).ok(),
+                        );
+                    });
+                }
+                LoadCommandVariant::TwolevelHints(x) => {
+                    p.group("TwolevelHintsCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("Offset", x.offset.get(endian));
+                        p.field_hex("NumberOfHints", x.nhints.get(endian));
+                        // TODO: display hints
+                    });
+                }
+                LoadCommandVariant::PrebindCksum(x) => {
+                    p.group("PrebindCksumCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("Cksum", x.cksum.get(endian));
+                    });
+                }
+                LoadCommandVariant::Uuid(x) => {
+                    p.group("UuidCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field("Uuid", format!("{:X?}", x.uuid));
+                    });
+                }
+                LoadCommandVariant::Rpath(x) => {
+                    p.group("RpathCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_string(
+                            "Path",
+                            x.path.offset.get(endian),
+                            command.string(endian, x.path).ok(),
+                        );
+                    });
+                }
+                LoadCommandVariant::LinkeditData(x) => {
+                    p.group("LinkeditDataCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("DataOffset", x.dataoff.get(endian));
+                        p.field_hex("DataSize", x.datasize.get(endian));
+                    });
+                }
+                LoadCommandVariant::EncryptionInfo32(x) => {
+                    p.group("EncryptionInfoCommand32", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("CryptOffset", x.cryptoff.get(endian));
+                        p.field_hex("CryptSize", x.cryptsize.get(endian));
+                        p.field_hex("CryptId", x.cryptid.get(endian));
+                    });
+                }
+                LoadCommandVariant::EncryptionInfo64(x) => {
+                    p.group("EncryptionInfoCommand64", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("CryptOffset", x.cryptoff.get(endian));
+                        p.field_hex("CryptSize", x.cryptsize.get(endian));
+                        p.field_hex("CryptId", x.cryptid.get(endian));
+                        p.field_hex("Pad", x.pad.get(endian));
+                    });
+                }
+                LoadCommandVariant::DyldInfo(x) => {
+                    p.group("DyldInfoCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        // TODO: dump the tables these are all pointing to
+                        p.field_hex("RebaseOffset", x.rebase_off.get(endian));
+                        p.field_hex("RebaseSize", x.rebase_size.get(endian));
+                        p.field_hex("BindOffset", x.bind_off.get(endian));
+                        p.field_hex("BindSize", x.bind_size.get(endian));
+                        p.field_hex("WeakBindOffset", x.weak_bind_off.get(endian));
+                        p.field_hex("WeakBindSize", x.weak_bind_size.get(endian));
+                        p.field_hex("LazyBindOffset", x.lazy_bind_off.get(endian));
+                        p.field_hex("LazyBindSize", x.lazy_bind_size.get(endian));
+                        p.field_hex("ExportOffset", x.export_off.get(endian));
+                        p.field_hex("ExportSize", x.export_size.get(endian));
+                    });
+                }
+                LoadCommandVariant::VersionMin(x) => {
+                    p.group("VersionMinCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("Version", x.version.get(endian));
+                        p.field_hex("Sdk", x.sdk.get(endian));
+                    });
+                }
+                LoadCommandVariant::EntryPoint(x) => {
+                    p.group("EntryPointCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("EntryOffset", x.entryoff.get(endian));
+                        p.field_hex("StackSize", x.stacksize.get(endian));
+                    });
+                }
+                LoadCommandVariant::SourceVersion(x) => {
+                    p.group("SourceVersionCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("Version", x.version.get(endian));
+                    });
+                }
+                LoadCommandVariant::LinkerOption(x) => {
+                    p.group("LinkerOptionCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("Count", x.count.get(endian));
+                        // TODO: dump strings
+                    });
+                }
+                LoadCommandVariant::Note(x) => {
+                    p.group("NoteCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        // TODO: string?
+                        p.field("DataOwner", format!("{:X?}", x.data_owner));
+                        p.field_hex("Offset", x.offset.get(endian));
+                        p.field_hex("Size", x.size.get(endian));
+                    });
+                }
+                LoadCommandVariant::BuildVersion(x) => {
+                    p.group("BuildVersionCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_enum("Platform", x.platform.get(endian), FLAGS_PLATFORM);
+                        p.field_hex("MinOs", x.minos.get(endian));
+                        p.field_hex("Sdk", x.sdk.get(endian));
+                        p.field_hex("NumberOfTools", x.ntools.get(endian));
+                        // TODO: dump tools
+                    });
+                }
+                LoadCommandVariant::FilesetEntry(x) => {
+                    p.group("FilesetEntryCommand", |p| {
+                        p.field_enum("Cmd", x.cmd.get(endian), FLAGS_LC);
+                        p.field_hex("CmdSize", x.cmdsize.get(endian));
+                        p.field_hex("VmAddress", x.vmaddr.get(endian));
+                        p.field_hex("FileOffset", x.fileoff.get(endian));
+                        p.field_string(
+                            "EntryId",
+                            x.entry_id.offset.get(endian),
+                            command.string(endian, x.entry_id).ok(),
+                        );
+                        p.field_hex("Reserved", x.reserved.get(endian));
+                    });
+                }
+                _ => {
+                    p.group("LoadCommand", |p| {
+                        p.field_enum("Cmd", command.cmd(), FLAGS_LC);
+                        p.field_hex("CmdSize", command.cmdsize());
+                    });
+                }
+            }
+        } else {
+            p.group("LoadCommand", |p| {
+                p.field_enum("Cmd", command.cmd(), FLAGS_LC);
+                p.field_hex("CmdSize", command.cmdsize());
+            });
+        }
+    }
+
+    fn print_segment<S: Segment>(
+        p: &mut Printer<impl Write>,
+        endian: S::Endian,
+        data: &[u8],
+        cputype: u32,
+        segment: &S,
+        section_data: &[u8],
+        state: &mut MachState,
+    ) {
+        p.group("SegmentCommand", |p| {
+            p.field_enum("Cmd", segment.cmd(endian), FLAGS_LC);
+            p.field_hex("CmdSize", segment.cmdsize(endian));
+            p.field_inline_string("SegmentName", segment.name());
+            p.field_hex("VmAddress", segment.vmaddr(endian).into());
+            p.field_hex("VmSize", segment.vmsize(endian).into());
+            p.field_hex("FileOffset", segment.fileoff(endian).into());
+            p.field_hex("FileSize", segment.filesize(endian).into());
+            p.field_hex("MaxProt", segment.maxprot(endian));
+            p.flags(segment.maxprot(endian), 0, FLAGS_VM);
+            p.field_hex("InitProt", segment.initprot(endian));
+            p.flags(segment.initprot(endian), 0, FLAGS_VM);
+            p.field("NumberOfSections", segment.nsects(endian));
+            p.field_hex("Flags", segment.flags(endian));
+            p.flags(segment.flags(endian), 0, FLAGS_SG);
+            if let Ok(sections) = segment.sections(endian, section_data) {
+                for section in sections {
+                    print_section(p, endian, data, cputype, section, state);
+                }
+            }
+        });
+    }
+
+    fn print_section<S: Section>(
+        p: &mut Printer<impl Write>,
+        endian: S::Endian,
+        data: &[u8],
+        cputype: u32,
+        section: &S,
+        state: &mut MachState,
+    ) {
+        p.group("Section", |p| {
+            p.field("Index", state.section_index);
+            state.section_index += 1;
+            p.field_inline_string("SectionName", section.name());
+            p.field_inline_string("SegmentName", section.segment_name());
+            p.field_hex("Address", section.addr(endian).into());
+            p.field_hex("Size", section.size(endian).into());
+            p.field_hex("Offset", section.offset(endian));
+            p.field_hex("Align", section.align(endian));
+            p.field_hex("RelocationOffset", section.reloff(endian));
+            p.field_hex("NumberOfRelocations", section.nreloc(endian));
+            let flags = section.flags(endian);
+            if flags & SECTION_TYPE == flags {
+                p.field_enum("Flags", flags, FLAGS_S_TYPE);
+            } else {
+                p.field_hex("Flags", section.flags(endian));
+                p.flags(flags, SECTION_TYPE, FLAGS_S_TYPE);
+                p.flags(flags, 0, FLAGS_S_ATTR);
+            }
+            if let Ok(relocations) = section.relocations(endian, data) {
+                let proc = match cputype {
+                    CPU_TYPE_X86 => FLAGS_GENERIC_RELOC,
+                    CPU_TYPE_X86_64 => FLAGS_X86_64_RELOC,
+                    CPU_TYPE_ARM => FLAGS_ARM_RELOC,
+                    CPU_TYPE_ARM64 | CPU_TYPE_ARM64_32 => FLAGS_ARM64_RELOC,
+                    CPU_TYPE_POWERPC | CPU_TYPE_POWERPC64 => FLAGS_PPC_RELOC,
+                    _ => &[],
+                };
+                for relocation in relocations {
+                    if relocation.r_scattered(endian, cputype) {
+                        let info = relocation.scattered_info(endian);
+                        p.group("ScatteredRelocationInfo", |p| {
+                            p.field_hex("Address", info.r_address);
+                            p.field("PcRel", if info.r_pcrel { "yes" } else { "no" });
+                            p.field("Length", info.r_length);
+                            p.field_enum("Type", info.r_type, proc);
+                            p.field_hex("Value", info.r_value);
+                        });
+                    } else {
+                        let info = relocation.info(endian);
+                        p.group("RelocationInfo", |p| {
+                            p.field_hex("Address", info.r_address);
+                            if info.r_extern {
+                                // TODO: symbol name
+                                p.field("Symbol", info.r_symbolnum);
+                            } else {
+                                p.field("Section", info.r_symbolnum);
+                            }
+                            p.field("PcRel", if info.r_pcrel { "yes" } else { "no" });
+                            p.field("Length", info.r_length);
+                            p.field("Extern", if info.r_extern { "yes" } else { "no" });
+                            p.field_enum("Type", info.r_type, proc);
+                        });
+                    }
+                }
+            }
+        });
+    }
+
+    fn print_symtab<Mach: MachHeader, W: Write>(
+        p: &mut Printer<W>,
+        endian: Mach::Endian,
+        data: &[u8],
+        symtab: &SymtabCommand<Mach::Endian>,
+    ) {
+        p.group("SymtabCommand", |p| {
+            p.field_enum("Cmd", symtab.cmd.get(endian), FLAGS_LC);
+            p.field_hex("CmdSize", symtab.cmdsize.get(endian));
+            p.field_hex("SymbolOffset", symtab.symoff.get(endian));
+            p.field_hex("NumberOfSymbols", symtab.nsyms.get(endian));
+            p.field_hex("StringOffset", symtab.stroff.get(endian));
+            p.field_hex("StringSize", symtab.strsize.get(endian));
+            if let Ok(symbols) = symtab.symbols::<Mach, _>(endian, data) {
+                for (index, nlist) in symbols.iter().enumerate() {
+                    p.group("Nlist", |p| {
+                        p.field("Index", index);
+                        p.field_string(
+                            "String",
+                            nlist.n_strx(endian),
+                            nlist.name(endian, symbols.strings()).ok(),
+                        );
+                        let n_type = nlist.n_type();
+                        if nlist.is_stab() {
+                            p.field_enum("Type", n_type, FLAGS_N_STAB);
+                        } else if n_type & N_TYPE == n_type {
+                            // Avoid an extra line if no flags.
+                            p.field_enum("Type", n_type, FLAGS_N_TYPE);
+                        } else {
+                            p.field_hex("Type", n_type);
+                            p.flags(n_type, N_TYPE, FLAGS_N_TYPE);
+                            p.flags(n_type, 0, FLAGS_N_EXT);
+                        }
+                        p.field("Section", nlist.n_sect());
+                        let n_desc = nlist.n_desc(endian);
+                        p.field_hex("Desc", n_desc);
+                        if nlist.is_undefined() {
+                            p.flags(n_desc, REFERENCE_TYPE, FLAGS_REFERENCE);
+                        }
+                        if !nlist.is_stab() {
+                            p.flags(n_desc, 0, FLAGS_N_DESC);
+                        }
+                        p.field_hex("Value", nlist.n_value(endian).into());
+                    });
+                }
+            }
+        });
+    }
+
+    fn print_cputype(p: &mut Printer<impl Write>, cputype: u32, cpusubtype: u32) {
+        let proc = match cputype {
+            CPU_TYPE_ANY => FLAGS_CPU_SUBTYPE_ANY,
+            CPU_TYPE_VAX => FLAGS_CPU_SUBTYPE_VAX,
+            CPU_TYPE_MC680X0 => FLAGS_CPU_SUBTYPE_MC680X0,
+            CPU_TYPE_X86 => FLAGS_CPU_SUBTYPE_X86,
+            CPU_TYPE_X86_64 => FLAGS_CPU_SUBTYPE_X86_64,
+            CPU_TYPE_MIPS => FLAGS_CPU_SUBTYPE_MIPS,
+            CPU_TYPE_MC98000 => FLAGS_CPU_SUBTYPE_MC98000,
+            CPU_TYPE_HPPA => FLAGS_CPU_SUBTYPE_HPPA,
+            CPU_TYPE_ARM => FLAGS_CPU_SUBTYPE_ARM,
+            CPU_TYPE_ARM64 => FLAGS_CPU_SUBTYPE_ARM64,
+            CPU_TYPE_ARM64_32 => FLAGS_CPU_SUBTYPE_ARM64_32,
+            CPU_TYPE_MC88000 => FLAGS_CPU_SUBTYPE_MC88000,
+            CPU_TYPE_SPARC => FLAGS_CPU_SUBTYPE_SPARC,
+            CPU_TYPE_I860 => FLAGS_CPU_SUBTYPE_I860,
+            CPU_TYPE_POWERPC | CPU_TYPE_POWERPC64 => FLAGS_CPU_SUBTYPE_POWERPC,
+            _ => &[],
+        };
+        p.field_enum("CpuType", cputype, FLAGS_CPU_TYPE);
+        p.field_hex("CpuSubtype", cpusubtype);
+        p.flags(cpusubtype, !CPU_SUBTYPE_MASK, proc);
+        p.flags(cpusubtype, 0, FLAGS_CPU_SUBTYPE);
+    }
+
+    static FLAGS_CPU_TYPE: &[Flag<u32>] = &flags!(
+        CPU_TYPE_ANY,
+        CPU_TYPE_VAX,
+        CPU_TYPE_MC680X0,
+        CPU_TYPE_X86,
+        CPU_TYPE_X86_64,
+        CPU_TYPE_MIPS,
+        CPU_TYPE_MC98000,
+        CPU_TYPE_HPPA,
+        CPU_TYPE_ARM,
+        CPU_TYPE_ARM64,
+        CPU_TYPE_ARM64_32,
+        CPU_TYPE_MC88000,
+        CPU_TYPE_SPARC,
+        CPU_TYPE_I860,
+        CPU_TYPE_ALPHA,
+        CPU_TYPE_POWERPC,
+        CPU_TYPE_POWERPC64,
+    );
+    static FLAGS_CPU_SUBTYPE: &[Flag<u32>] = &flags!(CPU_SUBTYPE_LIB64);
+    static FLAGS_CPU_SUBTYPE_ANY: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_MULTIPLE,
+        CPU_SUBTYPE_LITTLE_ENDIAN,
+        CPU_SUBTYPE_BIG_ENDIAN,
+    );
+    static FLAGS_CPU_SUBTYPE_VAX: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_VAX_ALL,
+        CPU_SUBTYPE_VAX780,
+        CPU_SUBTYPE_VAX785,
+        CPU_SUBTYPE_VAX750,
+        CPU_SUBTYPE_VAX730,
+        CPU_SUBTYPE_UVAXI,
+        CPU_SUBTYPE_UVAXII,
+        CPU_SUBTYPE_VAX8200,
+        CPU_SUBTYPE_VAX8500,
+        CPU_SUBTYPE_VAX8600,
+        CPU_SUBTYPE_VAX8650,
+        CPU_SUBTYPE_VAX8800,
+        CPU_SUBTYPE_UVAXIII,
+    );
+    static FLAGS_CPU_SUBTYPE_MC680X0: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_MC680X0_ALL,
+        CPU_SUBTYPE_MC68040,
+        CPU_SUBTYPE_MC68030_ONLY,
+    );
+    static FLAGS_CPU_SUBTYPE_X86: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_I386_ALL,
+        CPU_SUBTYPE_386,
+        CPU_SUBTYPE_486,
+        CPU_SUBTYPE_486SX,
+        CPU_SUBTYPE_586,
+        CPU_SUBTYPE_PENT,
+        CPU_SUBTYPE_PENTPRO,
+        CPU_SUBTYPE_PENTII_M3,
+        CPU_SUBTYPE_PENTII_M5,
+        CPU_SUBTYPE_CELERON,
+        CPU_SUBTYPE_CELERON_MOBILE,
+        CPU_SUBTYPE_PENTIUM_3,
+        CPU_SUBTYPE_PENTIUM_3_M,
+        CPU_SUBTYPE_PENTIUM_3_XEON,
+        CPU_SUBTYPE_PENTIUM_M,
+        CPU_SUBTYPE_PENTIUM_4,
+        CPU_SUBTYPE_PENTIUM_4_M,
+        CPU_SUBTYPE_ITANIUM,
+        CPU_SUBTYPE_ITANIUM_2,
+        CPU_SUBTYPE_XEON,
+        CPU_SUBTYPE_XEON_MP,
+    );
+    static FLAGS_CPU_SUBTYPE_X86_64: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_X86_64_ALL,
+        CPU_SUBTYPE_X86_ARCH1,
+        CPU_SUBTYPE_X86_64_H,
+    );
+    static FLAGS_CPU_SUBTYPE_MIPS: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_MIPS_ALL,
+        CPU_SUBTYPE_MIPS_R2300,
+        CPU_SUBTYPE_MIPS_R2600,
+        CPU_SUBTYPE_MIPS_R2800,
+        CPU_SUBTYPE_MIPS_R2000A,
+        CPU_SUBTYPE_MIPS_R2000,
+        CPU_SUBTYPE_MIPS_R3000A,
+        CPU_SUBTYPE_MIPS_R3000,
+    );
+    static FLAGS_CPU_SUBTYPE_MC98000: &[Flag<u32>] =
+        &flags!(CPU_SUBTYPE_MC98000_ALL, CPU_SUBTYPE_MC98601);
+    static FLAGS_CPU_SUBTYPE_HPPA: &[Flag<u32>] =
+        &flags!(CPU_SUBTYPE_HPPA_ALL, CPU_SUBTYPE_HPPA_7100LC);
+    static FLAGS_CPU_SUBTYPE_MC88000: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_MC88000_ALL,
+        CPU_SUBTYPE_MC88100,
+        CPU_SUBTYPE_MC88110,
+    );
+    static FLAGS_CPU_SUBTYPE_SPARC: &[Flag<u32>] = &flags!(CPU_SUBTYPE_SPARC_ALL);
+    static FLAGS_CPU_SUBTYPE_I860: &[Flag<u32>] =
+        &flags!(CPU_SUBTYPE_I860_ALL, CPU_SUBTYPE_I860_860);
+    static FLAGS_CPU_SUBTYPE_POWERPC: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_POWERPC_ALL,
+        CPU_SUBTYPE_POWERPC_601,
+        CPU_SUBTYPE_POWERPC_602,
+        CPU_SUBTYPE_POWERPC_603,
+        CPU_SUBTYPE_POWERPC_603E,
+        CPU_SUBTYPE_POWERPC_603EV,
+        CPU_SUBTYPE_POWERPC_604,
+        CPU_SUBTYPE_POWERPC_604E,
+        CPU_SUBTYPE_POWERPC_620,
+        CPU_SUBTYPE_POWERPC_750,
+        CPU_SUBTYPE_POWERPC_7400,
+        CPU_SUBTYPE_POWERPC_7450,
+        CPU_SUBTYPE_POWERPC_970,
+    );
+    static FLAGS_CPU_SUBTYPE_ARM: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_ARM_ALL,
+        CPU_SUBTYPE_ARM_V4T,
+        CPU_SUBTYPE_ARM_V6,
+        CPU_SUBTYPE_ARM_V5TEJ,
+        CPU_SUBTYPE_ARM_XSCALE,
+        CPU_SUBTYPE_ARM_V7,
+        CPU_SUBTYPE_ARM_V7F,
+        CPU_SUBTYPE_ARM_V7S,
+        CPU_SUBTYPE_ARM_V7K,
+        CPU_SUBTYPE_ARM_V8,
+        CPU_SUBTYPE_ARM_V6M,
+        CPU_SUBTYPE_ARM_V7M,
+        CPU_SUBTYPE_ARM_V7EM,
+        CPU_SUBTYPE_ARM_V8M,
+    );
+    static FLAGS_CPU_SUBTYPE_ARM64: &[Flag<u32>] = &flags!(
+        CPU_SUBTYPE_ARM64_ALL,
+        CPU_SUBTYPE_ARM64_V8,
+        CPU_SUBTYPE_ARM64E,
+    );
+    static FLAGS_CPU_SUBTYPE_ARM64_32: &[Flag<u32>] =
+        &flags!(CPU_SUBTYPE_ARM64_32_ALL, CPU_SUBTYPE_ARM64_32_V8);
+    static FLAGS_MH_FILETYPE: &[Flag<u32>] = &flags!(
+        MH_OBJECT,
+        MH_EXECUTE,
+        MH_FVMLIB,
+        MH_CORE,
+        MH_PRELOAD,
+        MH_DYLIB,
+        MH_DYLINKER,
+        MH_BUNDLE,
+        MH_DYLIB_STUB,
+        MH_DSYM,
+        MH_KEXT_BUNDLE,
+        MH_FILESET,
+    );
+    static FLAGS_MH: &[Flag<u32>] = &flags!(
+        MH_NOUNDEFS,
+        MH_INCRLINK,
+        MH_DYLDLINK,
+        MH_BINDATLOAD,
+        MH_PREBOUND,
+        MH_SPLIT_SEGS,
+        MH_LAZY_INIT,
+        MH_TWOLEVEL,
+        MH_FORCE_FLAT,
+        MH_NOMULTIDEFS,
+        MH_NOFIXPREBINDING,
+        MH_PREBINDABLE,
+        MH_ALLMODSBOUND,
+        MH_SUBSECTIONS_VIA_SYMBOLS,
+        MH_CANONICAL,
+        MH_WEAK_DEFINES,
+        MH_BINDS_TO_WEAK,
+        MH_ALLOW_STACK_EXECUTION,
+        MH_ROOT_SAFE,
+        MH_SETUID_SAFE,
+        MH_NO_REEXPORTED_DYLIBS,
+        MH_PIE,
+        MH_DEAD_STRIPPABLE_DYLIB,
+        MH_HAS_TLV_DESCRIPTORS,
+        MH_NO_HEAP_EXECUTION,
+        MH_APP_EXTENSION_SAFE,
+        MH_NLIST_OUTOFSYNC_WITH_DYLDINFO,
+        MH_SIM_SUPPORT,
+        MH_DYLIB_IN_CACHE,
+    );
+    static FLAGS_LC: &[Flag<u32>] = &flags!(
+        LC_SEGMENT,
+        LC_SYMTAB,
+        LC_SYMSEG,
+        LC_THREAD,
+        LC_UNIXTHREAD,
+        LC_LOADFVMLIB,
+        LC_IDFVMLIB,
+        LC_IDENT,
+        LC_FVMFILE,
+        LC_PREPAGE,
+        LC_DYSYMTAB,
+        LC_LOAD_DYLIB,
+        LC_ID_DYLIB,
+        LC_LOAD_DYLINKER,
+        LC_ID_DYLINKER,
+        LC_PREBOUND_DYLIB,
+        LC_ROUTINES,
+        LC_SUB_FRAMEWORK,
+        LC_SUB_UMBRELLA,
+        LC_SUB_CLIENT,
+        LC_SUB_LIBRARY,
+        LC_TWOLEVEL_HINTS,
+        LC_PREBIND_CKSUM,
+        LC_LOAD_WEAK_DYLIB,
+        LC_SEGMENT_64,
+        LC_ROUTINES_64,
+        LC_UUID,
+        LC_RPATH,
+        LC_CODE_SIGNATURE,
+        LC_SEGMENT_SPLIT_INFO,
+        LC_REEXPORT_DYLIB,
+        LC_LAZY_LOAD_DYLIB,
+        LC_ENCRYPTION_INFO,
+        LC_DYLD_INFO,
+        LC_DYLD_INFO_ONLY,
+        LC_LOAD_UPWARD_DYLIB,
+        LC_VERSION_MIN_MACOSX,
+        LC_VERSION_MIN_IPHONEOS,
+        LC_FUNCTION_STARTS,
+        LC_DYLD_ENVIRONMENT,
+        LC_MAIN,
+        LC_DATA_IN_CODE,
+        LC_SOURCE_VERSION,
+        LC_DYLIB_CODE_SIGN_DRS,
+        LC_ENCRYPTION_INFO_64,
+        LC_LINKER_OPTION,
+        LC_LINKER_OPTIMIZATION_HINT,
+        LC_VERSION_MIN_TVOS,
+        LC_VERSION_MIN_WATCHOS,
+        LC_NOTE,
+        LC_BUILD_VERSION,
+        LC_DYLD_EXPORTS_TRIE,
+        LC_DYLD_CHAINED_FIXUPS,
+        LC_FILESET_ENTRY,
+    );
+    static FLAGS_VM: &[Flag<u32>] = &flags!(VM_PROT_READ, VM_PROT_WRITE, VM_PROT_EXECUTE);
+    static FLAGS_SG: &[Flag<u32>] = &flags!(
+        SG_HIGHVM,
+        SG_FVMLIB,
+        SG_NORELOC,
+        SG_PROTECTED_VERSION_1,
+        SG_READ_ONLY,
+    );
+    static FLAGS_S_TYPE: &[Flag<u32>] = &flags!(
+        S_REGULAR,
+        S_ZEROFILL,
+        S_CSTRING_LITERALS,
+        S_4BYTE_LITERALS,
+        S_8BYTE_LITERALS,
+        S_LITERAL_POINTERS,
+        S_NON_LAZY_SYMBOL_POINTERS,
+        S_LAZY_SYMBOL_POINTERS,
+        S_SYMBOL_STUBS,
+        S_MOD_INIT_FUNC_POINTERS,
+        S_MOD_TERM_FUNC_POINTERS,
+        S_COALESCED,
+        S_GB_ZEROFILL,
+        S_INTERPOSING,
+        S_16BYTE_LITERALS,
+        S_DTRACE_DOF,
+        S_LAZY_DYLIB_SYMBOL_POINTERS,
+        S_THREAD_LOCAL_REGULAR,
+        S_THREAD_LOCAL_ZEROFILL,
+        S_THREAD_LOCAL_VARIABLES,
+        S_THREAD_LOCAL_VARIABLE_POINTERS,
+        S_THREAD_LOCAL_INIT_FUNCTION_POINTERS,
+        S_INIT_FUNC_OFFSETS,
+    );
+    static FLAGS_S_ATTR: &[Flag<u32>] = &flags!(
+        S_ATTR_PURE_INSTRUCTIONS,
+        S_ATTR_NO_TOC,
+        S_ATTR_STRIP_STATIC_SYMS,
+        S_ATTR_NO_DEAD_STRIP,
+        S_ATTR_LIVE_SUPPORT,
+        S_ATTR_SELF_MODIFYING_CODE,
+        S_ATTR_DEBUG,
+        S_ATTR_SOME_INSTRUCTIONS,
+        S_ATTR_EXT_RELOC,
+        S_ATTR_LOC_RELOC,
+    );
+    static FLAGS_PLATFORM: &[Flag<u32>] = &flags!(
+        PLATFORM_MACOS,
+        PLATFORM_IOS,
+        PLATFORM_TVOS,
+        PLATFORM_WATCHOS,
+        PLATFORM_BRIDGEOS,
+        PLATFORM_MACCATALYST,
+        PLATFORM_IOSSIMULATOR,
+        PLATFORM_TVOSSIMULATOR,
+        PLATFORM_WATCHOSSIMULATOR,
+        PLATFORM_DRIVERKIT,
+    );
+    static FLAGS_N_EXT: &[Flag<u8>] = &flags!(N_PEXT, N_EXT);
+    static FLAGS_N_TYPE: &[Flag<u8>] = &flags!(N_UNDF, N_ABS, N_SECT, N_PBUD, N_INDR);
+    static FLAGS_N_STAB: &[Flag<u8>] = &flags!(
+        N_GSYM, N_FNAME, N_FUN, N_STSYM, N_LCSYM, N_BNSYM, N_AST, N_OPT, N_RSYM, N_SLINE, N_ENSYM,
+        N_SSYM, N_SO, N_OSO, N_LSYM, N_BINCL, N_SOL, N_PARAMS, N_VERSION, N_OLEVEL, N_PSYM,
+        N_EINCL, N_ENTRY, N_LBRAC, N_EXCL, N_RBRAC, N_BCOMM, N_ECOMM, N_ECOML, N_LENG, N_PC,
+    );
+    static FLAGS_REFERENCE: &[Flag<u16>] = &flags!(
+        REFERENCE_FLAG_UNDEFINED_NON_LAZY,
+        REFERENCE_FLAG_UNDEFINED_LAZY,
+        REFERENCE_FLAG_DEFINED,
+        REFERENCE_FLAG_PRIVATE_DEFINED,
+        REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY,
+        REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY,
+    );
+    static FLAGS_N_DESC: &[Flag<u16>] = &flags!(
+        REFERENCED_DYNAMICALLY,
+        N_NO_DEAD_STRIP,
+        N_DESC_DISCARDED,
+        N_WEAK_REF,
+        N_WEAK_DEF,
+        N_REF_TO_WEAK,
+        N_ARM_THUMB_DEF,
+        N_SYMBOL_RESOLVER,
+        N_ALT_ENTRY,
+    );
+    static FLAGS_GENERIC_RELOC: &[Flag<u8>] = &flags!(
+        GENERIC_RELOC_VANILLA,
+        GENERIC_RELOC_PAIR,
+        GENERIC_RELOC_SECTDIFF,
+        GENERIC_RELOC_PB_LA_PTR,
+        GENERIC_RELOC_LOCAL_SECTDIFF,
+        GENERIC_RELOC_TLV,
+    );
+    static FLAGS_ARM_RELOC: &[Flag<u8>] = &flags!(
+        ARM_RELOC_VANILLA,
+        ARM_RELOC_PAIR,
+        ARM_RELOC_SECTDIFF,
+        ARM_RELOC_LOCAL_SECTDIFF,
+        ARM_RELOC_PB_LA_PTR,
+        ARM_RELOC_BR24,
+        ARM_THUMB_RELOC_BR22,
+        ARM_THUMB_32BIT_BRANCH,
+        ARM_RELOC_HALF,
+        ARM_RELOC_HALF_SECTDIFF,
+    );
+    static FLAGS_ARM64_RELOC: &[Flag<u8>] = &flags!(
+        ARM64_RELOC_UNSIGNED,
+        ARM64_RELOC_SUBTRACTOR,
+        ARM64_RELOC_BRANCH26,
+        ARM64_RELOC_PAGE21,
+        ARM64_RELOC_PAGEOFF12,
+        ARM64_RELOC_GOT_LOAD_PAGE21,
+        ARM64_RELOC_GOT_LOAD_PAGEOFF12,
+        ARM64_RELOC_POINTER_TO_GOT,
+        ARM64_RELOC_TLVP_LOAD_PAGE21,
+        ARM64_RELOC_TLVP_LOAD_PAGEOFF12,
+        ARM64_RELOC_ADDEND,
+        ARM64_RELOC_AUTHENTICATED_POINTER,
+    );
+    static FLAGS_PPC_RELOC: &[Flag<u8>] = &flags!(
+        PPC_RELOC_VANILLA,
+        PPC_RELOC_PAIR,
+        PPC_RELOC_BR14,
+        PPC_RELOC_BR24,
+        PPC_RELOC_HI16,
+        PPC_RELOC_LO16,
+        PPC_RELOC_HA16,
+        PPC_RELOC_LO14,
+        PPC_RELOC_SECTDIFF,
+        PPC_RELOC_PB_LA_PTR,
+        PPC_RELOC_HI16_SECTDIFF,
+        PPC_RELOC_LO16_SECTDIFF,
+        PPC_RELOC_HA16_SECTDIFF,
+        PPC_RELOC_JBSR,
+        PPC_RELOC_LO14_SECTDIFF,
+        PPC_RELOC_LOCAL_SECTDIFF,
+    );
+    static FLAGS_X86_64_RELOC: &[Flag<u8>] = &flags!(
+        X86_64_RELOC_UNSIGNED,
+        X86_64_RELOC_SIGNED,
+        X86_64_RELOC_BRANCH,
+        X86_64_RELOC_GOT_LOAD,
+        X86_64_RELOC_GOT,
+        X86_64_RELOC_SUBTRACTOR,
+        X86_64_RELOC_SIGNED_1,
+        X86_64_RELOC_SIGNED_2,
+        X86_64_RELOC_SIGNED_4,
+        X86_64_RELOC_TLV,
+    );
+}
+
+mod pe {
+    use super::*;
+    use object::pe::*;
+    use object::read::pe::*;
+    use object::LittleEndian as LE;
+
+    pub(super) fn print_coff(p: &mut Printer<impl Write>, data: &[u8]) {
+        let mut offset = 0;
+        if let Ok(header) = ImageFileHeader::parse(data, &mut offset) {
+            println!("Format: COFF");
+            print_file(p, header);
+            let sections = header.sections(data, offset).ok();
+            let symbols = header.symbols(data).ok();
+            if let Some(ref sections) = sections {
+                print_sections(p, data, header.machine.get(LE), symbols.as_ref(), &sections);
+            }
+            if let Some(ref symbols) = symbols {
+                print_symbols(p, sections.as_ref(), &symbols);
+            }
+        }
+    }
+
+    pub(super) fn print_pe32(p: &mut Printer<impl Write>, data: &[u8]) {
+        println!("Format: PE 32-bit");
+        print_pe::<ImageNtHeaders32, _>(p, data);
+    }
+
+    pub(super) fn print_pe64(p: &mut Printer<impl Write>, data: &[u8]) {
+        println!("Format: PE 64-bit");
+        print_pe::<ImageNtHeaders64, _>(p, data);
+    }
+
+    fn print_pe<Pe: ImageNtHeaders, W: Write>(p: &mut Printer<W>, data: &[u8]) {
+        if let Ok(dos_header) = ImageDosHeader::parse(data) {
+            p.group("ImageDosHeader", |p| {
+                p.field_hex("Magic", dos_header.e_magic.get(LE));
+                p.field_hex("CountBytesLastPage", dos_header.e_cblp.get(LE));
+                p.field_hex("CountPages", dos_header.e_cp.get(LE));
+                p.field_hex("CountRelocations", dos_header.e_crlc.get(LE));
+                p.field_hex("CountHeaderParagraphs", dos_header.e_cparhdr.get(LE));
+                p.field_hex("MinAllocParagraphs", dos_header.e_minalloc.get(LE));
+                p.field_hex("MaxAllocParagraphs", dos_header.e_maxalloc.get(LE));
+                p.field_hex("StackSegment", dos_header.e_ss.get(LE));
+                p.field_hex("StackPointer", dos_header.e_sp.get(LE));
+                p.field_hex("Checksum", dos_header.e_csum.get(LE));
+                p.field_hex("InstructionPointer", dos_header.e_ip.get(LE));
+                p.field_hex("CodeSegment", dos_header.e_cs.get(LE));
+                p.field_hex("AddressOfRelocations", dos_header.e_lfarlc.get(LE));
+                p.field_hex("OverlayNumber", dos_header.e_ovno.get(LE));
+                p.field_hex("OemId", dos_header.e_oemid.get(LE));
+                p.field_hex("OemInfo", dos_header.e_oeminfo.get(LE));
+                p.field_hex("AddressOfNewHeader", dos_header.e_lfanew.get(LE));
+            });
+            let mut offset = dos_header.nt_headers_offset().into();
+            if let Ok((nt_headers, data_directories)) = Pe::parse(data, &mut offset) {
+                p.group("ImageNtHeaders", |p| {
+                    p.field_hex("Signature", nt_headers.signature());
+                });
+                let header = nt_headers.file_header();
+                let sections = header.sections(data, offset).ok();
+                let symbols = header.symbols(data).ok();
+                print_file(p, header);
+                print_optional(p, nt_headers.optional_header());
+                for (index, dir) in data_directories.iter().enumerate() {
+                    p.group("ImageDataDirectory", |p| {
+                        p.field_enum("Index", index, FLAGS_IMAGE_DIRECTORY_ENTRY);
+                        p.field_hex("VirtualAddress", dir.virtual_address.get(LE));
+                        p.field_hex("Size", dir.size.get(LE));
+                        if let Some(dir_data) = sections
+                            .as_ref()
+                            .and_then(|sections| dir.data(data, sections).ok())
+                        {
+                            match index {
+                                IMAGE_DIRECTORY_ENTRY_EXPORT => print_export_dir(p, dir, dir_data),
+                                // TODO
+                                _ => {}
+                            }
+                        }
+                    });
+                }
+                if let Some(ref sections) = sections {
+                    print_sections(p, data, header.machine.get(LE), symbols.as_ref(), &sections);
+                }
+                if let Some(ref symbols) = symbols {
+                    print_symbols(p, sections.as_ref(), &symbols);
+                }
+            }
+        }
+    }
+
+    fn print_file(p: &mut Printer<impl Write>, header: &ImageFileHeader) {
+        p.group("ImageFileHeader", |p| {
+            p.field_enum("Machine", header.machine.get(LE), FLAGS_IMAGE_FILE_MACHINE);
+            p.field("NumberOfSections", header.number_of_sections.get(LE));
+            p.field("TimeDateStamp", header.time_date_stamp.get(LE));
+            p.field_hex(
+                "PointerToSymbolTable",
+                header.pointer_to_symbol_table.get(LE),
+            );
+            p.field("NumberOfSymbols", header.number_of_symbols.get(LE));
+            p.field_hex(
+                "SizeOfOptionalHeader",
+                header.size_of_optional_header.get(LE),
+            );
+            p.field_hex("Characteristics", header.characteristics.get(LE));
+            p.flags(header.characteristics.get(LE), 0, FLAGS_IMAGE_FILE);
+        });
+    }
+
+    fn print_optional(p: &mut Printer<impl Write>, header: &impl ImageOptionalHeader) {
+        p.group("ImageOptionalHeader", |p| {
+            p.field_hex("Magic", header.magic());
+            p.field("MajorLinkerVersion", header.major_linker_version());
+            p.field("MinorLinkerVersion", header.minor_linker_version());
+            p.field_hex("SizeOfCode", header.size_of_code());
+            p.field_hex("SizeOfInitializedData", header.size_of_initialized_data());
+            p.field_hex(
+                "SizeOfUninitializedData",
+                header.size_of_uninitialized_data(),
+            );
+            p.field_hex("AddressOfEntryPoint", header.address_of_entry_point());
+            p.field_hex("BaseOfCode", header.base_of_code());
+            p.field_hex("ImageBase", header.image_base());
+            p.field_hex("SectionAlignment", header.section_alignment());
+            p.field(
+                "MajorOperatingSystemVersion",
+                header.major_operating_system_version(),
+            );
+            p.field(
+                "MinorOperatingSystemVersion",
+                header.minor_operating_system_version(),
+            );
+            p.field("MajorImageVersion", header.major_image_version());
+            p.field("MinorImageVersion", header.minor_image_version());
+            p.field("MajorSubsystemVersion", header.major_subsystem_version());
+            p.field("MinorSubsystemVersion", header.minor_subsystem_version());
+            p.field("Win32VersionValue", header.win32_version_value());
+            p.field_hex("SizeOfImage", header.size_of_image());
+            p.field_hex("SizeOfHeaders", header.size_of_headers());
+            p.field_hex("CheckSum", header.check_sum());
+            p.field_enum("Subsystem", header.subsystem(), FLAGS_IMAGE_SUBSYSTEM);
+            p.field_hex("DllCharacteristics", header.dll_characteristics());
+            p.flags(
+                header.dll_characteristics(),
+                0,
+                FLAGS_IMAGE_DLLCHARACTERISTICS,
+            );
+            p.field_hex("SizeOfStackReserve", header.size_of_stack_reserve());
+            p.field_hex("SizeOfStackCommit", header.size_of_stack_commit());
+            p.field_hex("SizeOfHeapReserve", header.size_of_heap_reserve());
+            p.field_hex("SizeOfHeapCommit", header.size_of_heap_commit());
+            p.field_hex("LoaderFlags", header.loader_flags());
+            p.field_hex("NumberOfRvaAndSizes", header.number_of_rva_and_sizes());
+        });
+    }
+
+    fn print_export_dir(p: &mut Printer<impl Write>, _dir: &ImageDataDirectory, dir_data: &[u8]) {
+        if let Ok((export_dir, _)) = object::from_bytes::<pe::ImageExportDirectory>(dir_data) {
+            p.group("ImageExportDirectory", |p| {
+                p.field_hex("Characteristics", export_dir.characteristics.get(LE));
+                p.field_hex("TimeDateStamp", export_dir.time_date_stamp.get(LE));
+                p.field("MajorVersion", export_dir.major_version.get(LE));
+                p.field("MinorVersion", export_dir.minor_version.get(LE));
+                p.field_hex("Name", export_dir.name.get(LE));
+                p.field("Base", export_dir.base.get(LE));
+                p.field("NumberOfFunctions", export_dir.number_of_functions.get(LE));
+                p.field("NumberOfNames", export_dir.number_of_names.get(LE));
+                p.field_hex(
+                    "AddressOfFunctions",
+                    export_dir.address_of_functions.get(LE),
+                );
+                p.field_hex("AddressOfNames", export_dir.address_of_names.get(LE));
+                p.field_hex(
+                    "AddressOfNameOrdinals",
+                    export_dir.address_of_name_ordinals.get(LE),
+                );
+                // TODO: display tables
+            });
+        }
+    }
+
+    fn print_sections(
+        p: &mut Printer<impl Write>,
+        data: &[u8],
+        machine: u16,
+        symbols: Option<&SymbolTable>,
+        sections: &SectionTable,
+    ) {
+        for (index, section) in sections.iter().enumerate() {
+            p.group("ImageSectionHeader", |p| {
+                p.field("Index", index + 1);
+                if let Some(name) = symbols.and_then(|symbols| section.name(symbols.strings()).ok())
+                {
+                    p.field_inline_string("Name", name);
+                } else {
+                    p.field_inline_string("Name", section.raw_name());
+                }
+                p.field_hex("VirtualSize", section.virtual_size.get(LE));
+                p.field_hex("VirtualAddress", section.virtual_address.get(LE));
+                p.field_hex("SizeOfRawData", section.size_of_raw_data.get(LE));
+                p.field_hex("PointerToRawData", section.pointer_to_raw_data.get(LE));
+                p.field_hex(
+                    "PointerToRelocations",
+                    section.pointer_to_relocations.get(LE),
+                );
+                p.field_hex(
+                    "PointerToLinenumbers",
+                    section.pointer_to_linenumbers.get(LE),
+                );
+                p.field("NumberOfRelocations", section.number_of_relocations.get(LE));
+                p.field("NumberOfLinenumbers", section.number_of_linenumbers.get(LE));
+                p.field_hex("Characteristics", section.characteristics.get(LE));
+                p.flags(section.characteristics.get(LE), 0, FLAGS_IMAGE_SCN);
+                p.flags(
+                    section.characteristics.get(LE),
+                    IMAGE_SCN_ALIGN_MASK,
+                    FLAGS_IMAGE_SCN_ALIGN,
+                );
+                if let Ok(relocations) = section.coff_relocations(data) {
+                    for relocation in relocations {
+                        p.group("ImageRelocation", |p| {
+                            p.field_hex("VirtualAddress", relocation.virtual_address.get(LE));
+                            let index = relocation.symbol_table_index.get(LE);
+                            let name = symbols.and_then(|symbols| {
+                                symbols
+                                    .symbol(index as usize)
+                                    .and_then(|symbol| symbol.name(symbols.strings()))
+                                    .ok()
+                            });
+                            p.field_string("Symbol", index, name);
+                            let proc = match machine {
+                                IMAGE_FILE_MACHINE_I386 => FLAGS_IMAGE_REL_I386,
+                                IMAGE_FILE_MACHINE_MIPS16
+                                | IMAGE_FILE_MACHINE_MIPSFPU
+                                | IMAGE_FILE_MACHINE_MIPSFPU16 => FLAGS_IMAGE_REL_MIPS,
+                                IMAGE_FILE_MACHINE_ALPHA | IMAGE_FILE_MACHINE_ALPHA64 => {
+                                    FLAGS_IMAGE_REL_ALPHA
+                                }
+                                IMAGE_FILE_MACHINE_POWERPC | IMAGE_FILE_MACHINE_POWERPCFP => {
+                                    FLAGS_IMAGE_REL_PPC
+                                }
+                                IMAGE_FILE_MACHINE_SH3
+                                | IMAGE_FILE_MACHINE_SH3DSP
+                                | IMAGE_FILE_MACHINE_SH3E
+                                | IMAGE_FILE_MACHINE_SH4
+                                | IMAGE_FILE_MACHINE_SH5 => FLAGS_IMAGE_REL_SH,
+                                IMAGE_FILE_MACHINE_ARM => FLAGS_IMAGE_REL_ARM,
+                                IMAGE_FILE_MACHINE_AM33 => FLAGS_IMAGE_REL_AM,
+                                IMAGE_FILE_MACHINE_ARM64 => FLAGS_IMAGE_REL_ARM64,
+                                IMAGE_FILE_MACHINE_AMD64 => FLAGS_IMAGE_REL_AMD64,
+                                IMAGE_FILE_MACHINE_IA64 => FLAGS_IMAGE_REL_IA64,
+                                IMAGE_FILE_MACHINE_CEF => FLAGS_IMAGE_REL_CEF,
+                                IMAGE_FILE_MACHINE_CEE => FLAGS_IMAGE_REL_CEE,
+                                IMAGE_FILE_MACHINE_M32R => FLAGS_IMAGE_REL_M32R,
+                                IMAGE_FILE_MACHINE_EBC => FLAGS_IMAGE_REL_EBC,
+                                _ => &[],
+                            };
+                            let typ = relocation.typ.get(LE);
+                            p.field_enum("Type", typ, proc);
+                            match machine {
+                                IMAGE_FILE_MACHINE_POWERPC | IMAGE_FILE_MACHINE_POWERPCFP => {
+                                    p.flags(typ, 0, FLAGS_IMAGE_REL_PPC_BITS)
+                                }
+                                IMAGE_FILE_MACHINE_SH3
+                                | IMAGE_FILE_MACHINE_SH3DSP
+                                | IMAGE_FILE_MACHINE_SH3E
+                                | IMAGE_FILE_MACHINE_SH4
+                                | IMAGE_FILE_MACHINE_SH5 => {
+                                    p.flags(typ, 0, FLAGS_IMAGE_REL_SH_BITS)
+                                }
+                                _ => {}
+                            }
+                        });
+                    }
+                }
+            });
+        }
+    }
+
+    fn print_symbols(
+        p: &mut Printer<impl Write>,
+        sections: Option<&SectionTable>,
+        symbols: &SymbolTable,
+    ) {
+        for (index, symbol) in symbols.iter() {
+            p.group("ImageSymbol", |p| {
+                p.field("Index", index);
+                if let Ok(name) = symbol.name(symbols.strings()) {
+                    p.field_inline_string("Name", name);
+                } else {
+                    p.field("Name", format!("{:X?}", symbol.name));
+                }
+                p.field_hex("Value", symbol.value.get(LE));
+                let section = symbol.section_number.get(LE);
+                if section == 0 || section >= IMAGE_SYM_SECTION_MAX {
+                    p.field_enum("Section", section, FLAGS_IMAGE_SYM);
+                } else {
+                    let section_name = sections.and_then(|sections| {
+                        sections
+                            .section(section.into())
+                            .and_then(|section| section.name(symbols.strings()))
+                            .ok()
+                    });
+                    p.field_string("Section", section, section_name);
+                }
+                p.field_hex("Type", symbol.typ.get(LE));
+                p.field_enum("BaseType", symbol.base_type(), FLAGS_IMAGE_SYM_TYPE);
+                p.field_enum("DerivedType", symbol.derived_type(), FLAGS_IMAGE_SYM_DTYPE);
+                p.field_enum("StorageClass", symbol.storage_class, FLAGS_IMAGE_SYM_CLASS);
+                p.field_hex("NumberOfAuxSymbols", symbol.number_of_aux_symbols);
+                if symbol.has_aux_file_name() {
+                    if let Ok(name) = symbols.aux_file_name(index, symbol.number_of_aux_symbols) {
+                        p.group("ImageAuxSymbolFile", |p| {
+                            p.field_inline_string("Name", name);
+                        });
+                    }
+                } else if symbol.has_aux_function() {
+                    if let Ok(aux) = symbols.aux_function(index) {
+                        p.group("ImageAuxSymbolFunction", |p| {
+                            p.field("TagIndex", aux.tag_index.get(LE));
+                            p.field("TotalSize", aux.total_size.get(LE));
+                            p.field_hex("PointerToLinenumber", aux.pointer_to_linenumber.get(LE));
+                            p.field(
+                                "PointerToNextFunction",
+                                aux.pointer_to_next_function.get(LE),
+                            );
+                            p.field("Unused", format!("{:X?}", aux.unused));
+                        });
+                    }
+                } else if symbol.has_aux_section() {
+                    if let Ok(aux) = symbols.aux_section(index) {
+                        p.group("ImageAuxSymbolSection", |p| {
+                            p.field_hex("Length", aux.length.get(LE));
+                            p.field("NumberOfRelocations", aux.number_of_relocations.get(LE));
+                            p.field("NumberOfLinenumbers", aux.number_of_linenumbers.get(LE));
+                            p.field_hex("CheckSum", aux.check_sum.get(LE));
+                            p.field("Number", aux.number.get(LE));
+                            p.field_enum("Selection", aux.selection, FLAGS_IMAGE_COMDAT_SELECT);
+                            p.field_hex("Reserved", aux.reserved);
+                            p.field("HighNumber", aux.high_number.get(LE));
+                        });
+                    }
+                }
+                // TODO: ImageAuxSymbolFunctionBeginEnd
+                // TODO: ImageAuxSymbolWeak
+            });
+        }
+    }
+
+    static FLAGS_IMAGE_FILE: &[Flag<u16>] = &flags!(
+        IMAGE_FILE_RELOCS_STRIPPED,
+        IMAGE_FILE_EXECUTABLE_IMAGE,
+        IMAGE_FILE_LINE_NUMS_STRIPPED,
+        IMAGE_FILE_LOCAL_SYMS_STRIPPED,
+        IMAGE_FILE_AGGRESIVE_WS_TRIM,
+        IMAGE_FILE_LARGE_ADDRESS_AWARE,
+        IMAGE_FILE_BYTES_REVERSED_LO,
+        IMAGE_FILE_32BIT_MACHINE,
+        IMAGE_FILE_DEBUG_STRIPPED,
+        IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP,
+        IMAGE_FILE_NET_RUN_FROM_SWAP,
+        IMAGE_FILE_SYSTEM,
+        IMAGE_FILE_DLL,
+        IMAGE_FILE_UP_SYSTEM_ONLY,
+        IMAGE_FILE_BYTES_REVERSED_HI,
+    );
+    static FLAGS_IMAGE_FILE_MACHINE: &[Flag<u16>] = &flags!(
+        IMAGE_FILE_MACHINE_UNKNOWN,
+        IMAGE_FILE_MACHINE_TARGET_HOST,
+        IMAGE_FILE_MACHINE_I386,
+        IMAGE_FILE_MACHINE_R3000,
+        IMAGE_FILE_MACHINE_R4000,
+        IMAGE_FILE_MACHINE_R10000,
+        IMAGE_FILE_MACHINE_WCEMIPSV2,
+        IMAGE_FILE_MACHINE_ALPHA,
+        IMAGE_FILE_MACHINE_SH3,
+        IMAGE_FILE_MACHINE_SH3DSP,
+        IMAGE_FILE_MACHINE_SH3E,
+        IMAGE_FILE_MACHINE_SH4,
+        IMAGE_FILE_MACHINE_SH5,
+        IMAGE_FILE_MACHINE_ARM,
+        IMAGE_FILE_MACHINE_THUMB,
+        IMAGE_FILE_MACHINE_ARMNT,
+        IMAGE_FILE_MACHINE_AM33,
+        IMAGE_FILE_MACHINE_POWERPC,
+        IMAGE_FILE_MACHINE_POWERPCFP,
+        IMAGE_FILE_MACHINE_IA64,
+        IMAGE_FILE_MACHINE_MIPS16,
+        IMAGE_FILE_MACHINE_ALPHA64,
+        IMAGE_FILE_MACHINE_MIPSFPU,
+        IMAGE_FILE_MACHINE_MIPSFPU16,
+        IMAGE_FILE_MACHINE_AXP64,
+        IMAGE_FILE_MACHINE_TRICORE,
+        IMAGE_FILE_MACHINE_CEF,
+        IMAGE_FILE_MACHINE_EBC,
+        IMAGE_FILE_MACHINE_AMD64,
+        IMAGE_FILE_MACHINE_M32R,
+        IMAGE_FILE_MACHINE_ARM64,
+        IMAGE_FILE_MACHINE_CEE,
+        IMAGE_FILE_MACHINE_RISCV32,
+        IMAGE_FILE_MACHINE_RISCV64,
+        IMAGE_FILE_MACHINE_RISCV128,
+    );
+    static FLAGS_IMAGE_SCN: &[Flag<u32>] = &flags!(
+        IMAGE_SCN_TYPE_NO_PAD,
+        IMAGE_SCN_CNT_CODE,
+        IMAGE_SCN_CNT_INITIALIZED_DATA,
+        IMAGE_SCN_CNT_UNINITIALIZED_DATA,
+        IMAGE_SCN_LNK_OTHER,
+        IMAGE_SCN_LNK_INFO,
+        IMAGE_SCN_LNK_REMOVE,
+        IMAGE_SCN_LNK_COMDAT,
+        IMAGE_SCN_NO_DEFER_SPEC_EXC,
+        IMAGE_SCN_GPREL,
+        IMAGE_SCN_MEM_FARDATA,
+        IMAGE_SCN_MEM_PURGEABLE,
+        IMAGE_SCN_MEM_16BIT,
+        IMAGE_SCN_MEM_LOCKED,
+        IMAGE_SCN_MEM_PRELOAD,
+        IMAGE_SCN_LNK_NRELOC_OVFL,
+        IMAGE_SCN_MEM_DISCARDABLE,
+        IMAGE_SCN_MEM_NOT_CACHED,
+        IMAGE_SCN_MEM_NOT_PAGED,
+        IMAGE_SCN_MEM_SHARED,
+        IMAGE_SCN_MEM_EXECUTE,
+        IMAGE_SCN_MEM_READ,
+        IMAGE_SCN_MEM_WRITE,
+    );
+    static FLAGS_IMAGE_SCN_ALIGN: &[Flag<u32>] = &flags!(
+        IMAGE_SCN_ALIGN_1BYTES,
+        IMAGE_SCN_ALIGN_2BYTES,
+        IMAGE_SCN_ALIGN_4BYTES,
+        IMAGE_SCN_ALIGN_8BYTES,
+        IMAGE_SCN_ALIGN_16BYTES,
+        IMAGE_SCN_ALIGN_32BYTES,
+        IMAGE_SCN_ALIGN_64BYTES,
+        IMAGE_SCN_ALIGN_128BYTES,
+        IMAGE_SCN_ALIGN_256BYTES,
+        IMAGE_SCN_ALIGN_512BYTES,
+        IMAGE_SCN_ALIGN_1024BYTES,
+        IMAGE_SCN_ALIGN_2048BYTES,
+        IMAGE_SCN_ALIGN_4096BYTES,
+        IMAGE_SCN_ALIGN_8192BYTES,
+    );
+    static FLAGS_IMAGE_REL_I386: &[Flag<u16>] = &flags!(
+        IMAGE_REL_I386_ABSOLUTE,
+        IMAGE_REL_I386_DIR16,
+        IMAGE_REL_I386_REL16,
+        IMAGE_REL_I386_DIR32,
+        IMAGE_REL_I386_DIR32NB,
+        IMAGE_REL_I386_SEG12,
+        IMAGE_REL_I386_SECTION,
+        IMAGE_REL_I386_SECREL,
+        IMAGE_REL_I386_TOKEN,
+        IMAGE_REL_I386_SECREL7,
+        IMAGE_REL_I386_REL32,
+    );
+    static FLAGS_IMAGE_REL_MIPS: &[Flag<u16>] = &flags!(
+        IMAGE_REL_MIPS_ABSOLUTE,
+        IMAGE_REL_MIPS_REFHALF,
+        IMAGE_REL_MIPS_REFWORD,
+        IMAGE_REL_MIPS_JMPADDR,
+        IMAGE_REL_MIPS_REFHI,
+        IMAGE_REL_MIPS_REFLO,
+        IMAGE_REL_MIPS_GPREL,
+        IMAGE_REL_MIPS_LITERAL,
+        IMAGE_REL_MIPS_SECTION,
+        IMAGE_REL_MIPS_SECREL,
+        IMAGE_REL_MIPS_SECRELLO,
+        IMAGE_REL_MIPS_SECRELHI,
+        IMAGE_REL_MIPS_TOKEN,
+        IMAGE_REL_MIPS_JMPADDR16,
+        IMAGE_REL_MIPS_REFWORDNB,
+        IMAGE_REL_MIPS_PAIR,
+    );
+    static FLAGS_IMAGE_REL_ALPHA: &[Flag<u16>] = &flags!(
+        IMAGE_REL_ALPHA_ABSOLUTE,
+        IMAGE_REL_ALPHA_REFLONG,
+        IMAGE_REL_ALPHA_REFQUAD,
+        IMAGE_REL_ALPHA_GPREL32,
+        IMAGE_REL_ALPHA_LITERAL,
+        IMAGE_REL_ALPHA_LITUSE,
+        IMAGE_REL_ALPHA_GPDISP,
+        IMAGE_REL_ALPHA_BRADDR,
+        IMAGE_REL_ALPHA_HINT,
+        IMAGE_REL_ALPHA_INLINE_REFLONG,
+        IMAGE_REL_ALPHA_REFHI,
+        IMAGE_REL_ALPHA_REFLO,
+        IMAGE_REL_ALPHA_PAIR,
+        IMAGE_REL_ALPHA_MATCH,
+        IMAGE_REL_ALPHA_SECTION,
+        IMAGE_REL_ALPHA_SECREL,
+        IMAGE_REL_ALPHA_REFLONGNB,
+        IMAGE_REL_ALPHA_SECRELLO,
+        IMAGE_REL_ALPHA_SECRELHI,
+        IMAGE_REL_ALPHA_REFQ3,
+        IMAGE_REL_ALPHA_REFQ2,
+        IMAGE_REL_ALPHA_REFQ1,
+        IMAGE_REL_ALPHA_GPRELLO,
+        IMAGE_REL_ALPHA_GPRELHI,
+    );
+    static FLAGS_IMAGE_REL_PPC: &[Flag<u16>] = &flags!(
+        IMAGE_REL_PPC_ABSOLUTE,
+        IMAGE_REL_PPC_ADDR64,
+        IMAGE_REL_PPC_ADDR32,
+        IMAGE_REL_PPC_ADDR24,
+        IMAGE_REL_PPC_ADDR16,
+        IMAGE_REL_PPC_ADDR14,
+        IMAGE_REL_PPC_REL24,
+        IMAGE_REL_PPC_REL14,
+        IMAGE_REL_PPC_TOCREL16,
+        IMAGE_REL_PPC_TOCREL14,
+        IMAGE_REL_PPC_ADDR32NB,
+        IMAGE_REL_PPC_SECREL,
+        IMAGE_REL_PPC_SECTION,
+        IMAGE_REL_PPC_IFGLUE,
+        IMAGE_REL_PPC_IMGLUE,
+        IMAGE_REL_PPC_SECREL16,
+        IMAGE_REL_PPC_REFHI,
+        IMAGE_REL_PPC_REFLO,
+        IMAGE_REL_PPC_PAIR,
+        IMAGE_REL_PPC_SECRELLO,
+        IMAGE_REL_PPC_SECRELHI,
+        IMAGE_REL_PPC_GPREL,
+        IMAGE_REL_PPC_TOKEN,
+    );
+    static FLAGS_IMAGE_REL_PPC_BITS: &[Flag<u16>] = &flags!(
+        IMAGE_REL_PPC_NEG,
+        IMAGE_REL_PPC_BRTAKEN,
+        IMAGE_REL_PPC_BRNTAKEN,
+        IMAGE_REL_PPC_TOCDEFN,
+    );
+    static FLAGS_IMAGE_REL_SH: &[Flag<u16>] = &flags!(
+        IMAGE_REL_SH3_ABSOLUTE,
+        IMAGE_REL_SH3_DIRECT16,
+        IMAGE_REL_SH3_DIRECT32,
+        IMAGE_REL_SH3_DIRECT8,
+        IMAGE_REL_SH3_DIRECT8_WORD,
+        IMAGE_REL_SH3_DIRECT8_LONG,
+        IMAGE_REL_SH3_DIRECT4,
+        IMAGE_REL_SH3_DIRECT4_WORD,
+        IMAGE_REL_SH3_DIRECT4_LONG,
+        IMAGE_REL_SH3_PCREL8_WORD,
+        IMAGE_REL_SH3_PCREL8_LONG,
+        IMAGE_REL_SH3_PCREL12_WORD,
+        IMAGE_REL_SH3_STARTOF_SECTION,
+        IMAGE_REL_SH3_SIZEOF_SECTION,
+        IMAGE_REL_SH3_SECTION,
+        IMAGE_REL_SH3_SECREL,
+        IMAGE_REL_SH3_DIRECT32_NB,
+        IMAGE_REL_SH3_GPREL4_LONG,
+        IMAGE_REL_SH3_TOKEN,
+        IMAGE_REL_SHM_PCRELPT,
+        IMAGE_REL_SHM_REFLO,
+        IMAGE_REL_SHM_REFHALF,
+        IMAGE_REL_SHM_RELLO,
+        IMAGE_REL_SHM_RELHALF,
+        IMAGE_REL_SHM_PAIR,
+    );
+    static FLAGS_IMAGE_REL_SH_BITS: &[Flag<u16>] = &flags!(IMAGE_REL_SH_NOMODE,);
+    static FLAGS_IMAGE_REL_ARM: &[Flag<u16>] = &flags!(
+        IMAGE_REL_ARM_ABSOLUTE,
+        IMAGE_REL_ARM_ADDR32,
+        IMAGE_REL_ARM_ADDR32NB,
+        IMAGE_REL_ARM_BRANCH24,
+        IMAGE_REL_ARM_BRANCH11,
+        IMAGE_REL_ARM_TOKEN,
+        IMAGE_REL_ARM_GPREL12,
+        IMAGE_REL_ARM_GPREL7,
+        IMAGE_REL_ARM_BLX24,
+        IMAGE_REL_ARM_BLX11,
+        IMAGE_REL_ARM_SECTION,
+        IMAGE_REL_ARM_SECREL,
+        IMAGE_REL_ARM_MOV32A,
+        IMAGE_REL_ARM_MOV32T,
+        IMAGE_REL_ARM_BRANCH20T,
+        IMAGE_REL_ARM_BRANCH24T,
+        IMAGE_REL_ARM_BLX23T,
+    );
+    static FLAGS_IMAGE_REL_AM: &[Flag<u16>] = &flags!(
+        IMAGE_REL_AM_ABSOLUTE,
+        IMAGE_REL_AM_ADDR32,
+        IMAGE_REL_AM_ADDR32NB,
+        IMAGE_REL_AM_CALL32,
+        IMAGE_REL_AM_FUNCINFO,
+        IMAGE_REL_AM_REL32_1,
+        IMAGE_REL_AM_REL32_2,
+        IMAGE_REL_AM_SECREL,
+        IMAGE_REL_AM_SECTION,
+        IMAGE_REL_AM_TOKEN,
+    );
+    static FLAGS_IMAGE_REL_ARM64: &[Flag<u16>] = &flags!(
+        IMAGE_REL_ARM64_ABSOLUTE,
+        IMAGE_REL_ARM64_ADDR32,
+        IMAGE_REL_ARM64_ADDR32NB,
+        IMAGE_REL_ARM64_BRANCH26,
+        IMAGE_REL_ARM64_PAGEBASE_REL21,
+        IMAGE_REL_ARM64_REL21,
+        IMAGE_REL_ARM64_PAGEOFFSET_12A,
+        IMAGE_REL_ARM64_PAGEOFFSET_12L,
+        IMAGE_REL_ARM64_SECREL,
+        IMAGE_REL_ARM64_SECREL_LOW12A,
+        IMAGE_REL_ARM64_SECREL_HIGH12A,
+        IMAGE_REL_ARM64_SECREL_LOW12L,
+        IMAGE_REL_ARM64_TOKEN,
+        IMAGE_REL_ARM64_SECTION,
+        IMAGE_REL_ARM64_ADDR64,
+        IMAGE_REL_ARM64_BRANCH19,
+    );
+    static FLAGS_IMAGE_REL_AMD64: &[Flag<u16>] = &flags!(
+        IMAGE_REL_AMD64_ABSOLUTE,
+        IMAGE_REL_AMD64_ADDR64,
+        IMAGE_REL_AMD64_ADDR32,
+        IMAGE_REL_AMD64_ADDR32NB,
+        IMAGE_REL_AMD64_REL32,
+        IMAGE_REL_AMD64_REL32_1,
+        IMAGE_REL_AMD64_REL32_2,
+        IMAGE_REL_AMD64_REL32_3,
+        IMAGE_REL_AMD64_REL32_4,
+        IMAGE_REL_AMD64_REL32_5,
+        IMAGE_REL_AMD64_SECTION,
+        IMAGE_REL_AMD64_SECREL,
+        IMAGE_REL_AMD64_SECREL7,
+        IMAGE_REL_AMD64_TOKEN,
+        IMAGE_REL_AMD64_SREL32,
+        IMAGE_REL_AMD64_PAIR,
+        IMAGE_REL_AMD64_SSPAN32,
+        IMAGE_REL_AMD64_EHANDLER,
+        IMAGE_REL_AMD64_IMPORT_BR,
+        IMAGE_REL_AMD64_IMPORT_CALL,
+        IMAGE_REL_AMD64_CFG_BR,
+        IMAGE_REL_AMD64_CFG_BR_REX,
+        IMAGE_REL_AMD64_CFG_CALL,
+        IMAGE_REL_AMD64_INDIR_BR,
+        IMAGE_REL_AMD64_INDIR_BR_REX,
+        IMAGE_REL_AMD64_INDIR_CALL,
+        IMAGE_REL_AMD64_INDIR_BR_SWITCHTABLE_FIRST,
+        IMAGE_REL_AMD64_INDIR_BR_SWITCHTABLE_LAST,
+    );
+    static FLAGS_IMAGE_REL_IA64: &[Flag<u16>] = &flags!(
+        IMAGE_REL_IA64_ABSOLUTE,
+        IMAGE_REL_IA64_IMM14,
+        IMAGE_REL_IA64_IMM22,
+        IMAGE_REL_IA64_IMM64,
+        IMAGE_REL_IA64_DIR32,
+        IMAGE_REL_IA64_DIR64,
+        IMAGE_REL_IA64_PCREL21B,
+        IMAGE_REL_IA64_PCREL21M,
+        IMAGE_REL_IA64_PCREL21F,
+        IMAGE_REL_IA64_GPREL22,
+        IMAGE_REL_IA64_LTOFF22,
+        IMAGE_REL_IA64_SECTION,
+        IMAGE_REL_IA64_SECREL22,
+        IMAGE_REL_IA64_SECREL64I,
+        IMAGE_REL_IA64_SECREL32,
+        IMAGE_REL_IA64_DIR32NB,
+        IMAGE_REL_IA64_SREL14,
+        IMAGE_REL_IA64_SREL22,
+        IMAGE_REL_IA64_SREL32,
+        IMAGE_REL_IA64_UREL32,
+        IMAGE_REL_IA64_PCREL60X,
+        IMAGE_REL_IA64_PCREL60B,
+        IMAGE_REL_IA64_PCREL60F,
+        IMAGE_REL_IA64_PCREL60I,
+        IMAGE_REL_IA64_PCREL60M,
+        IMAGE_REL_IA64_IMMGPREL64,
+        IMAGE_REL_IA64_TOKEN,
+        IMAGE_REL_IA64_GPREL32,
+        IMAGE_REL_IA64_ADDEND,
+    );
+    static FLAGS_IMAGE_REL_CEF: &[Flag<u16>] = &flags!(
+        IMAGE_REL_CEF_ABSOLUTE,
+        IMAGE_REL_CEF_ADDR32,
+        IMAGE_REL_CEF_ADDR64,
+        IMAGE_REL_CEF_ADDR32NB,
+        IMAGE_REL_CEF_SECTION,
+        IMAGE_REL_CEF_SECREL,
+        IMAGE_REL_CEF_TOKEN,
+    );
+    static FLAGS_IMAGE_REL_CEE: &[Flag<u16>] = &flags!(
+        IMAGE_REL_CEE_ABSOLUTE,
+        IMAGE_REL_CEE_ADDR32,
+        IMAGE_REL_CEE_ADDR64,
+        IMAGE_REL_CEE_ADDR32NB,
+        IMAGE_REL_CEE_SECTION,
+        IMAGE_REL_CEE_SECREL,
+        IMAGE_REL_CEE_TOKEN,
+    );
+    static FLAGS_IMAGE_REL_M32R: &[Flag<u16>] = &flags!(
+        IMAGE_REL_M32R_ABSOLUTE,
+        IMAGE_REL_M32R_ADDR32,
+        IMAGE_REL_M32R_ADDR32NB,
+        IMAGE_REL_M32R_ADDR24,
+        IMAGE_REL_M32R_GPREL16,
+        IMAGE_REL_M32R_PCREL24,
+        IMAGE_REL_M32R_PCREL16,
+        IMAGE_REL_M32R_PCREL8,
+        IMAGE_REL_M32R_REFHALF,
+        IMAGE_REL_M32R_REFHI,
+        IMAGE_REL_M32R_REFLO,
+        IMAGE_REL_M32R_PAIR,
+        IMAGE_REL_M32R_SECTION,
+        IMAGE_REL_M32R_SECREL32,
+        IMAGE_REL_M32R_TOKEN,
+    );
+    static FLAGS_IMAGE_REL_EBC: &[Flag<u16>] = &flags!(
+        IMAGE_REL_EBC_ABSOLUTE,
+        IMAGE_REL_EBC_ADDR32NB,
+        IMAGE_REL_EBC_REL32,
+        IMAGE_REL_EBC_SECTION,
+        IMAGE_REL_EBC_SECREL,
+    );
+    static FLAGS_IMAGE_SYM: &[Flag<u16>] =
+        &flags!(IMAGE_SYM_UNDEFINED, IMAGE_SYM_ABSOLUTE, IMAGE_SYM_DEBUG,);
+    static FLAGS_IMAGE_SYM_TYPE: &[Flag<u16>] = &flags!(
+        IMAGE_SYM_TYPE_NULL,
+        IMAGE_SYM_TYPE_VOID,
+        IMAGE_SYM_TYPE_CHAR,
+        IMAGE_SYM_TYPE_SHORT,
+        IMAGE_SYM_TYPE_INT,
+        IMAGE_SYM_TYPE_LONG,
+        IMAGE_SYM_TYPE_FLOAT,
+        IMAGE_SYM_TYPE_DOUBLE,
+        IMAGE_SYM_TYPE_STRUCT,
+        IMAGE_SYM_TYPE_UNION,
+        IMAGE_SYM_TYPE_ENUM,
+        IMAGE_SYM_TYPE_MOE,
+        IMAGE_SYM_TYPE_BYTE,
+        IMAGE_SYM_TYPE_WORD,
+        IMAGE_SYM_TYPE_UINT,
+        IMAGE_SYM_TYPE_DWORD,
+        IMAGE_SYM_TYPE_PCODE,
+    );
+    static FLAGS_IMAGE_SYM_DTYPE: &[Flag<u16>] = &flags!(
+        IMAGE_SYM_DTYPE_NULL,
+        IMAGE_SYM_DTYPE_POINTER,
+        IMAGE_SYM_DTYPE_FUNCTION,
+        IMAGE_SYM_DTYPE_ARRAY,
+    );
+    static FLAGS_IMAGE_SYM_CLASS: &[Flag<u8>] = &flags!(
+        IMAGE_SYM_CLASS_END_OF_FUNCTION,
+        IMAGE_SYM_CLASS_NULL,
+        IMAGE_SYM_CLASS_AUTOMATIC,
+        IMAGE_SYM_CLASS_EXTERNAL,
+        IMAGE_SYM_CLASS_STATIC,
+        IMAGE_SYM_CLASS_REGISTER,
+        IMAGE_SYM_CLASS_EXTERNAL_DEF,
+        IMAGE_SYM_CLASS_LABEL,
+        IMAGE_SYM_CLASS_UNDEFINED_LABEL,
+        IMAGE_SYM_CLASS_MEMBER_OF_STRUCT,
+        IMAGE_SYM_CLASS_ARGUMENT,
+        IMAGE_SYM_CLASS_STRUCT_TAG,
+        IMAGE_SYM_CLASS_MEMBER_OF_UNION,
+        IMAGE_SYM_CLASS_UNION_TAG,
+        IMAGE_SYM_CLASS_TYPE_DEFINITION,
+        IMAGE_SYM_CLASS_UNDEFINED_STATIC,
+        IMAGE_SYM_CLASS_ENUM_TAG,
+        IMAGE_SYM_CLASS_MEMBER_OF_ENUM,
+        IMAGE_SYM_CLASS_REGISTER_PARAM,
+        IMAGE_SYM_CLASS_BIT_FIELD,
+        IMAGE_SYM_CLASS_FAR_EXTERNAL,
+        IMAGE_SYM_CLASS_BLOCK,
+        IMAGE_SYM_CLASS_FUNCTION,
+        IMAGE_SYM_CLASS_END_OF_STRUCT,
+        IMAGE_SYM_CLASS_FILE,
+        IMAGE_SYM_CLASS_SECTION,
+        IMAGE_SYM_CLASS_WEAK_EXTERNAL,
+        IMAGE_SYM_CLASS_CLR_TOKEN,
+    );
+    static FLAGS_IMAGE_COMDAT_SELECT: &[Flag<u8>] = &flags!(
+        IMAGE_COMDAT_SELECT_NODUPLICATES,
+        IMAGE_COMDAT_SELECT_ANY,
+        IMAGE_COMDAT_SELECT_SAME_SIZE,
+        IMAGE_COMDAT_SELECT_EXACT_MATCH,
+        IMAGE_COMDAT_SELECT_ASSOCIATIVE,
+        IMAGE_COMDAT_SELECT_LARGEST,
+        IMAGE_COMDAT_SELECT_NEWEST,
+    );
+    static FLAGS_IMAGE_SUBSYSTEM: &[Flag<u16>] = &flags!(
+        IMAGE_SUBSYSTEM_UNKNOWN,
+        IMAGE_SUBSYSTEM_NATIVE,
+        IMAGE_SUBSYSTEM_WINDOWS_GUI,
+        IMAGE_SUBSYSTEM_WINDOWS_CUI,
+        IMAGE_SUBSYSTEM_OS2_CUI,
+        IMAGE_SUBSYSTEM_POSIX_CUI,
+        IMAGE_SUBSYSTEM_NATIVE_WINDOWS,
+        IMAGE_SUBSYSTEM_WINDOWS_CE_GUI,
+        IMAGE_SUBSYSTEM_EFI_APPLICATION,
+        IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER,
+        IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER,
+        IMAGE_SUBSYSTEM_EFI_ROM,
+        IMAGE_SUBSYSTEM_XBOX,
+        IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION,
+        IMAGE_SUBSYSTEM_XBOX_CODE_CATALOG,
+    );
+    static FLAGS_IMAGE_DLLCHARACTERISTICS: &[Flag<u16>] = &flags!(
+        IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA,
+        IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE,
+        IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY,
+        IMAGE_DLLCHARACTERISTICS_NX_COMPAT,
+        IMAGE_DLLCHARACTERISTICS_NO_ISOLATION,
+        IMAGE_DLLCHARACTERISTICS_NO_SEH,
+        IMAGE_DLLCHARACTERISTICS_NO_BIND,
+        IMAGE_DLLCHARACTERISTICS_APPCONTAINER,
+        IMAGE_DLLCHARACTERISTICS_WDM_DRIVER,
+        IMAGE_DLLCHARACTERISTICS_GUARD_CF,
+        IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE,
+    );
+    static FLAGS_IMAGE_DIRECTORY_ENTRY: &[Flag<usize>] = &flags!(
+        IMAGE_DIRECTORY_ENTRY_EXPORT,
+        IMAGE_DIRECTORY_ENTRY_IMPORT,
+        IMAGE_DIRECTORY_ENTRY_RESOURCE,
+        IMAGE_DIRECTORY_ENTRY_EXCEPTION,
+        IMAGE_DIRECTORY_ENTRY_SECURITY,
+        IMAGE_DIRECTORY_ENTRY_BASERELOC,
+        IMAGE_DIRECTORY_ENTRY_DEBUG,
+        IMAGE_DIRECTORY_ENTRY_ARCHITECTURE,
+        IMAGE_DIRECTORY_ENTRY_GLOBALPTR,
+        IMAGE_DIRECTORY_ENTRY_TLS,
+        IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG,
+        IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT,
+        IMAGE_DIRECTORY_ENTRY_IAT,
+        IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT,
+        IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR,
+    );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,26 @@
 * a higher level unified API for accessing common features of object files, such
   as sections and symbols
 
-Supported file formats: ELF, Mach-O, Windows PE/COFF, and Unix archive.
+Supported file formats: ELF, Mach-O, Windows PE/COFF, Wasm, and Unix archive.
+
+## Example for unified read API
+```rust
+use object::{Object, ObjectSection};
+use std::error::Error;
+use std::fs;
+
+/// Reads a file and displays the content of the ".boot" section.
+fn main() -> Result<(), Box<dyn Error>> {
+  let bin_data = fs::read("./multiboot2-binary.elf")?;
+  let obj_file = object::File::parse(&*bin_data)?;
+  if let Some(section) = obj_file.section_by_name(".boot") {
+    println!("{:#x?}", section.data()?);
+  } else {
+    eprintln!("section not available");
+  }
+  Ok(())
+}
+```
 
 ## License
 
@@ -24,8 +43,6 @@
 
 ## Contribution
 
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for hacking.
-
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
 dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/common.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/common.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,28 @@
 /// A CPU architecture.
 #[allow(missing_docs)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum Architecture {
     Unknown,
     Aarch64,
     Arm,
+    Avr,
+    Bpf,
     I386,
+    X86_64,
+    #[allow(non_camel_case_types)]
+    X86_64_X32,
+    Hexagon,
     Mips,
+    Mips64,
+    Msp430,
+    PowerPc,
+    PowerPc64,
+    Riscv32,
+    Riscv64,
     S390x,
+    Sparc64,
     Wasm32,
-    X86_64,
 }
 
 impl Architecture {
@@ -21,11 +34,22 @@
             Architecture::Unknown => None,
             Architecture::Aarch64 => Some(AddressSize::U64),
             Architecture::Arm => Some(AddressSize::U32),
+            Architecture::Avr => Some(AddressSize::U8),
+            Architecture::Bpf => Some(AddressSize::U64),
             Architecture::I386 => Some(AddressSize::U32),
+            Architecture::X86_64 => Some(AddressSize::U64),
+            Architecture::X86_64_X32 => Some(AddressSize::U32),
+            Architecture::Hexagon => Some(AddressSize::U32),
             Architecture::Mips => Some(AddressSize::U32),
+            Architecture::Mips64 => Some(AddressSize::U64),
+            Architecture::Msp430 => Some(AddressSize::U16),
+            Architecture::PowerPc => Some(AddressSize::U32),
+            Architecture::PowerPc64 => Some(AddressSize::U64),
+            Architecture::Riscv32 => Some(AddressSize::U32),
+            Architecture::Riscv64 => Some(AddressSize::U64),
             Architecture::S390x => Some(AddressSize::U64),
+            Architecture::Sparc64 => Some(AddressSize::U64),
             Architecture::Wasm32 => Some(AddressSize::U32),
-            Architecture::X86_64 => Some(AddressSize::U64),
         }
     }
 }
@@ -35,8 +59,11 @@
 /// This may differ from the address size supported by the file format (such as for COFF).
 #[allow(missing_docs)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 #[repr(u8)]
 pub enum AddressSize {
+    U8 = 1,
+    U16 = 2,
     U32 = 4,
     U64 = 8,
 }
@@ -52,6 +79,7 @@
 /// A binary file format.
 #[allow(missing_docs)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum BinaryFormat {
     Coff,
     Elf,
@@ -61,7 +89,8 @@
 }
 
 /// The kind of a section.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum SectionKind {
     /// The section kind is unknown.
     Unknown,
@@ -139,6 +168,11 @@
     ///
     /// Example ELF sections: `.symtab`, `.strtab`, `.group`
     Metadata,
+    /// Some other ELF section type.
+    ///
+    /// This is the `sh_type` field in the section header.
+    /// The meaning may be dependent on the architecture.
+    Elf(u32),
 }
 
 impl SectionKind {
@@ -154,7 +188,8 @@
 ///
 /// This determines the way in which the linker resolves multiple definitions of the COMDAT
 /// sections.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum ComdatKind {
     /// The selection kind is unknown.
     Unknown,
@@ -185,7 +220,8 @@
 }
 
 /// The kind of a symbol.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum SymbolKind {
     /// The symbol kind is unknown.
     Unknown,
@@ -206,7 +242,7 @@
 }
 
 /// A symbol scope.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum SymbolScope {
     /// Unknown scope.
     Unknown,
@@ -233,7 +269,8 @@
 /// * Section - The address of the section containing the symbol.
 ///
 /// 'XxxRelative' means 'Xxx + A - P'.  'XxxOffset' means 'S + A - Xxx'.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum RelocationKind {
     /// S + A
     Absolute,
@@ -272,7 +309,8 @@
 ///
 /// This is usually architecture specific, such as specifying an addressing mode or
 /// a specific instruction.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum RelocationEncoding {
     /// Generic encoding.
     Generic,
@@ -298,10 +336,16 @@
     ///
     /// The `RelocationKind` must be PC relative.
     S390xDbl,
+
+    /// AArch64 call target.
+    ///
+    /// The `RelocationKind` must be PC relative.
+    AArch64Call,
 }
 
 /// File flags that are specific to each file format.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum FileFlags {
     /// No file flags.
     None,
@@ -323,7 +367,8 @@
 }
 
 /// Section flags that are specific to each file format.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum SectionFlags {
     /// No section flags.
     None,
@@ -345,7 +390,8 @@
 }
 
 /// Symbol flags that are specific to each file format.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum SymbolFlags<Section> {
     /// No symbol flags.
     None,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/elf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/elf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/elf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/elf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -130,6 +130,8 @@
 pub const ELFMAG: [u8; 4] = [0x7f, b'E', b'L', b'F'];
 
 // Values for `Ident::class`.
+/// Invalid class.
+pub const ELFCLASSNONE: u8 = 0;
 /// 32-bit object.
 pub const ELFCLASS32: u8 = 1;
 /// 64-bit object.
@@ -446,8 +448,8 @@
 pub const EM_R32C: u16 = 162;
 /// NXP Semi. TriMedia
 pub const EM_TRIMEDIA: u16 = 163;
-/// QUALCOMM DSP6
-pub const EM_QDSP6: u16 = 164;
+/// QUALCOMM Hexagon
+pub const EM_HEXAGON: u16 = 164;
 /// Intel 8051 and variants
 pub const EM_8051: u16 = 165;
 /// STMicroelectronics STxP7x
@@ -693,6 +695,33 @@
 pub const SHT_SYMTAB_SHNDX: u32 = 18;
 /// Start of OS-specific section types.
 pub const SHT_LOOS: u32 = 0x6000_0000;
+/// Object attributes.
+pub const SHT_GNU_ATTRIBUTES: u32 = 0x6fff_fff5;
+/// GNU-style hash table.
+pub const SHT_GNU_HASH: u32 = 0x6fff_fff6;
+/// Prelink library list
+pub const SHT_GNU_LIBLIST: u32 = 0x6fff_fff7;
+/// Checksum for DSO content.
+pub const SHT_CHECKSUM: u32 = 0x6fff_fff8;
+/// Sun-specific low bound.
+pub const SHT_LOSUNW: u32 = 0x6fff_fffa;
+#[allow(missing_docs, non_upper_case_globals)]
+pub const SHT_SUNW_move: u32 = 0x6fff_fffa;
+#[allow(missing_docs)]
+pub const SHT_SUNW_COMDAT: u32 = 0x6fff_fffb;
+#[allow(missing_docs, non_upper_case_globals)]
+pub const SHT_SUNW_syminfo: u32 = 0x6fff_fffc;
+/// Version definition section.
+#[allow(non_upper_case_globals)]
+pub const SHT_GNU_VERDEF: u32 = 0x6fff_fffd;
+/// Version needs section.
+#[allow(non_upper_case_globals)]
+pub const SHT_GNU_VERNEED: u32 = 0x6fff_fffe;
+/// Version symbol table.
+#[allow(non_upper_case_globals)]
+pub const SHT_GNU_VERSYM: u32 = 0x6fff_ffff;
+/// Sun-specific high bound.
+pub const SHT_HISUNW: u32 = 0x6fff_ffff;
 /// End of OS-specific section types.
 pub const SHT_HIOS: u32 = 0x6fff_ffff;
 /// Start of processor-specific section types.
@@ -733,6 +762,8 @@
 pub const SHF_MASKOS: u32 = 0x0ff0_0000;
 /// Processor-specific section flags.
 pub const SHF_MASKPROC: u32 = 0xf000_0000;
+/// This section is excluded from the final executable or shared library.
+pub const SHF_EXCLUDE: u32 = 0x8000_0000;
 
 /// Section compression header.
 ///
@@ -998,14 +1029,14 @@
 impl<E: Endian> Rel32<E> {
     /// Get the `r_sym` component of the `r_info` field.
     #[inline]
-    pub fn r_sym(self, endian: E) -> u32 {
+    pub fn r_sym(&self, endian: E) -> u32 {
         self.r_info.get(endian) >> 8
     }
 
     /// Get the `r_type` component of the `r_info` field.
     #[inline]
-    pub fn r_type(self, endian: E) -> u8 {
-        (self.r_info.get(endian) & 0xff) as u8
+    pub fn r_type(&self, endian: E) -> u32 {
+        self.r_info.get(endian) & 0xff
     }
 
     /// Calculate the `r_info` field given the `r_sym` and `r_type` components.
@@ -1122,26 +1153,46 @@
 }
 
 impl<E: Endian> Rela64<E> {
+    pub(crate) fn get_r_info(&self, endian: E, is_mips64el: bool) -> u64 {
+        let mut t = self.r_info.get(endian);
+        if is_mips64el {
+            t = (t << 32)
+                | ((t >> 8) & 0xff000000)
+                | ((t >> 24) & 0x00ff0000)
+                | ((t >> 40) & 0x0000ff00)
+                | ((t >> 56) & 0x000000ff);
+        }
+        t
+    }
+
     /// Get the `r_sym` component of the `r_info` field.
     #[inline]
-    pub fn r_sym(&self, endian: E) -> u32 {
-        (self.r_info.get(endian) >> 32) as u32
+    pub fn r_sym(&self, endian: E, is_mips64el: bool) -> u32 {
+        (self.get_r_info(endian, is_mips64el) >> 32) as u32
     }
 
     /// Get the `r_type` component of the `r_info` field.
     #[inline]
-    pub fn r_type(&self, endian: E) -> u32 {
-        (self.r_info.get(endian) & 0xffff_ffff) as u32
+    pub fn r_type(&self, endian: E, is_mips64el: bool) -> u32 {
+        (self.get_r_info(endian, is_mips64el) & 0xffff_ffff) as u32
     }
 
     /// Calculate the `r_info` field given the `r_sym` and `r_type` components.
-    pub fn r_info(endian: E, r_sym: u32, r_type: u32) -> U64<E> {
-        U64::new(endian, (u64::from(r_sym) << 32) | u64::from(r_type))
+    pub fn r_info(endian: E, is_mips64el: bool, r_sym: u32, r_type: u32) -> U64<E> {
+        let mut t = (u64::from(r_sym) << 32) | u64::from(r_type);
+        if is_mips64el {
+            t = (t >> 32)
+                | ((t & 0xff000000) << 8)
+                | ((t & 0x00ff0000) << 24)
+                | ((t & 0x0000ff00) << 40)
+                | ((t & 0x000000ff) << 56);
+        }
+        U64::new(endian, t)
     }
 
     /// Set the `r_info` field given the `r_sym` and `r_type` components.
-    pub fn set_r_info(&mut self, endian: E, r_sym: u32, r_type: u32) {
-        self.r_info = Self::r_info(endian, r_sym, r_type);
+    pub fn set_r_info(&mut self, endian: E, is_mips64el: bool, r_sym: u32, r_type: u32) {
+        self.r_info = Self::r_info(endian, is_mips64el, r_sym, r_type);
     }
 }
 
@@ -1240,15 +1291,11 @@
 pub const PF_MASKPROC: u32 = 0xf000_0000;
 
 /// Note name for core files.
-///
-/// May also appear without the terminator.
-pub static ELF_NOTE_CORE: &[u8] = b"CORE\0";
+pub static ELF_NOTE_CORE: &[u8] = b"CORE";
 /// Note name for linux core files.
 ///
-/// May also appear without the terminator.
-///
 /// Notes in linux core files may also use `ELF_NOTE_CORE`.
-pub static ELF_NOTE_LINUX: &[u8] = b"LINUX\0";
+pub static ELF_NOTE_LINUX: &[u8] = b"LINUX";
 
 // Values for `NoteHeader*::n_type` in core files.
 //
@@ -1392,7 +1439,7 @@
 #[repr(C)]
 pub struct Dyn32<E: Endian> {
     /// Dynamic entry type.
-    pub d_tag: I32<E>,
+    pub d_tag: U32<E>,
     /// Value (integer or address).
     pub d_val: U32<E>,
 }
@@ -1402,7 +1449,7 @@
 #[repr(C)]
 pub struct Dyn64<E: Endian> {
     /// Dynamic entry type.
-    pub d_tag: I64<E>,
+    pub d_tag: U64<E>,
     /// Value (integer or address).
     pub d_val: U64<E>,
 }
@@ -1642,10 +1689,99 @@
 #[allow(missing_docs)]
 pub const DF_1_PIE: u32 = 0x0800_0000;
 
-// TODO: ELF*_Verdef, VER_DEF_*, VER_FLG_*, VER_NDX_*
-// TODO: Elf*_Verdaux
-// TODO: Elf*_Verneed, VER_NEED_*
-// TODO: Elf*_Vernaux, VER_FLG_*
+/// Version symbol information
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct Versym<E: Endian>(pub U16<E>);
+
+/// Version definition sections
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct Verdef<E: Endian> {
+    /// Version revision
+    pub vd_version: U16<E>,
+    /// Version information
+    pub vd_flags: U16<E>,
+    /// Version Index
+    pub vd_ndx: U16<E>,
+    /// Number of associated aux entries
+    pub vd_cnt: U16<E>,
+    /// Version name hash value
+    pub vd_hash: U32<E>,
+    /// Offset in bytes to verdaux array
+    pub vd_aux: U32<E>,
+    /// Offset in bytes to next verdef entry
+    pub vd_next: U32<E>,
+}
+
+// Legal values for vd_version (version revision).
+/// No version
+pub const VER_DEF_NONE: u16 = 0;
+/// Current version
+pub const VER_DEF_CURRENT: u16 = 1;
+
+// Legal values for vd_flags and vna_flags (version information flags).
+/// Version definition of file itself
+pub const VER_FLG_BASE: u16 = 0x1;
+/// Weak version identifier
+pub const VER_FLG_WEAK: u16 = 0x2;
+
+// Versym symbol index values.
+/// Symbol is local.
+pub const VER_NDX_LOCAL: u16 = 0;
+/// Symbol is global.
+pub const VER_NDX_GLOBAL: u16 = 1;
+/// Symbol is hidden.
+pub const VER_NDX_HIDDEN: u16 = 0x8000;
+
+/// Auxiliary version information.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct Verdaux<E: Endian> {
+    /// Version or dependency names
+    pub vda_name: U32<E>,
+    /// Offset in bytes to next verdaux
+    pub vda_next: U32<E>,
+}
+
+/// Version dependency.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct Verneed<E: Endian> {
+    /// Version of structure
+    pub vn_version: U16<E>,
+    /// Number of associated aux entries
+    pub vn_cnt: U16<E>,
+    /// Offset of filename for this dependency
+    pub vn_file: U32<E>,
+    /// Offset in bytes to vernaux array
+    pub vn_aux: U32<E>,
+    /// Offset in bytes to next verneed entry
+    pub vn_next: U32<E>,
+}
+
+// Legal values for vn_version (version revision).
+/// No version
+pub const VER_NEED_NONE: u16 = 0;
+/// Current version
+pub const VER_NEED_CURRENT: u16 = 1;
+
+/// Auxiliary needed version information.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct Vernaux<E: Endian> {
+    /// Hash value of dependency name
+    pub vna_hash: U32<E>,
+    /// Dependency specific information
+    pub vna_flags: U16<E>,
+    /// Version Index
+    pub vna_other: U16<E>,
+    /// Dependency name string offset
+    pub vna_name: U32<E>,
+    /// Offset in bytes to next vernaux entry
+    pub vna_next: U32<E>,
+}
+
 // TODO: Elf*_auxv_t, AT_*
 
 /// Note section entry header.
@@ -1689,14 +1825,14 @@
 }
 
 /// Solaris entries in the note section have this name.
-pub static ELF_NOTE_SOLARIS: &[u8] = b"SUNW Solaris\0";
+pub static ELF_NOTE_SOLARIS: &[u8] = b"SUNW Solaris";
 
 // Values for `n_type` when the name is `ELF_NOTE_SOLARIS`.
 /// Desired pagesize for the binary.
 pub const NT_SOLARIS_PAGESIZE_HINT: u32 = 1;
 
 /// GNU entries in the note section have this name.
-pub static ELF_NOTE_GNU: &[u8] = b"GNU\0";
+pub static ELF_NOTE_GNU: &[u8] = b"GNU";
 
 // Note types for `ELF_NOTE_GNU`.
 
@@ -1742,6 +1878,65 @@
 // TODO: GNU_PROPERTY_*
 // TODO: Elf*_Move
 
+/// Header of `SHT_HASH` section.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct HashHeader<E: Endian> {
+    /// The number of hash buckets.
+    pub bucket_count: U32<E>,
+    /// The number of chain values.
+    pub chain_count: U32<E>,
+    // Array of hash bucket start indices.
+    // buckets: U32<E>[bucket_count]
+    // Array of hash chain links. An index of 0 terminates the chain.
+    // chains: U32<E>[chain_count]
+}
+
+/// Calculate the SysV hash for a symbol name.
+///
+/// Used for `SHT_HASH`.
+pub fn hash(name: &[u8]) -> u32 {
+    let mut hash = 0u32;
+    for byte in name {
+        hash = hash.wrapping_mul(16).wrapping_add(u32::from(*byte));
+        hash ^= (hash >> 24) & 0xf0;
+    }
+    hash & 0xfff_ffff
+}
+
+/// Header of `SHT_GNU_HASH` section.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct GnuHashHeader<E: Endian> {
+    /// The number of hash buckets.
+    pub bucket_count: U32<E>,
+    /// The symbol table index of the first symbol in the hash.
+    pub symbol_base: U32<E>,
+    /// The number of words in the bloom filter.
+    ///
+    /// Must be a non-zero power of 2.
+    pub bloom_count: U32<E>,
+    /// The bit shift count for the bloom filter.
+    pub bloom_shift: U32<E>,
+    // Array of bloom filter words.
+    // bloom_filters: U32<E>[bloom_count] or U64<E>[bloom_count]
+    // Array of hash bucket start indices.
+    // buckets: U32<E>[bucket_count]
+    // Array of hash values, one for each symbol starting at symbol_base.
+    // values: U32<E>[symbol_count]
+}
+
+/// Calculate the GNU hash for a symbol name.
+///
+/// Used for `SHT_GNU_HASH`.
+pub fn gnu_hash(name: &[u8]) -> u32 {
+    let mut hash = 5381u32;
+    for byte in name {
+        hash = hash.wrapping_mul(33).wrapping_add(u32::from(*byte));
+    }
+    hash
+}
+
 // Motorola 68k specific definitions.
 
 // m68k values for `Rel*::r_type`.
@@ -2309,21 +2504,13 @@
 // MIPS values for `Sym32::st_other`.
 
 #[allow(missing_docs)]
-pub const STO_MIPS_DEFAULT: u8 = 0x0;
-#[allow(missing_docs)]
-pub const STO_MIPS_INTERNAL: u8 = 0x1;
-#[allow(missing_docs)]
-pub const STO_MIPS_HIDDEN: u8 = 0x2;
-#[allow(missing_docs)]
-pub const STO_MIPS_PROTECTED: u8 = 0x3;
-#[allow(missing_docs)]
 pub const STO_MIPS_PLT: u8 = 0x8;
-#[allow(missing_docs)]
+/// Only valid for `STB_MIPS_SPLIT_COMMON`.
 pub const STO_MIPS_SC_ALIGN_UNUSED: u8 = 0xff;
 
 // MIPS values for `Sym32::st_info'.
 #[allow(missing_docs)]
-pub const STB_MIPS_SPLIT_COMMON: u32 = 13;
+pub const STB_MIPS_SPLIT_COMMON: u8 = 13;
 
 // Entries found in sections of type `SHT_MIPS_GPTAB`.
 
@@ -4016,6 +4203,25 @@
 /// STT_GNU_IFUNC relocation.
 pub const R_AARCH64_IRELATIVE: u32 = 1032;
 
+// AVR values for `Rel*::r_type`.
+
+/// Direct 32 bit
+pub const R_AVR_32: u32 = 1;
+/// Direct 16 bit
+pub const R_AVR_16: u32 = 4;
+
+// MSP430 values for `Rel*::r_type`.
+
+/// Direct 32 bit
+pub const R_MSP430_32: u32 = 1;
+/// Direct 16 bit
+pub const R_MSP430_16_BYTE: u32 = 5;
+
+// Hexagon values for `Rel*::r_type`.
+
+/// Direct 32 bit
+pub const R_HEX_32: u32 = 6;
+
 // ARM values for `Rel*::r_type`.
 
 /// No reloc
@@ -6030,6 +6236,13 @@
     ProgramHeader64,
     Dyn32,
     Dyn64,
+    Versym,
+    Verdef,
+    Verdaux,
+    Verneed,
+    Vernaux,
     NoteHeader32,
     NoteHeader64,
+    HashHeader,
+    GnuHashHeader,
 );
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -25,14 +25,46 @@
 //! ## Unified write API
 //!
 //! [write::Object] allows building an object and then writing it out.
+//!
+//! ## Example for unified read API
+//!  ```no_run
+//! use object::{Object, ObjectSection};
+//! use std::error::Error;
+//! use std::fs;
+//!
+//! /// Reads a file and displays the content of the ".boot" section.
+//! fn main() -> Result<(), Box<dyn Error>> {
+//!   let bin_data = fs::read("./multiboot2-binary.elf")?;
+//!   let obj_file = object::File::parse(&*bin_data)?;
+//!   if let Some(section) = obj_file.section_by_name(".boot") {
+//!     println!("{:#x?}", section.data()?);
+//!   } else {
+//!     eprintln!("section not available");
+//!   }
+//!   Ok(())
+//! }
+//! ```
 
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
 #![no_std]
+// Style.
+#![allow(clippy::collapsible_if)]
+#![allow(clippy::comparison_chain)]
+#![allow(clippy::match_like_matches_macro)]
+#![allow(clippy::single_match)]
+#![allow(clippy::type_complexity)]
+// Occurs due to fallible iteration.
+#![allow(clippy::should_implement_trait)]
+// Unit errors are converted to other types by callers.
+#![allow(clippy::result_unit_err)]
+// Clippy is wrong.
+#![allow(clippy::transmute_ptr_to_ptr)]
 
 #[cfg(feature = "cargo-all")]
 compile_error!("'--all-features' is not supported; use '--features all' instead");
 
+#[cfg(feature = "read_core")]
 #[allow(unused_imports)]
 #[macro_use]
 extern crate alloc;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/macho.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/macho.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/macho.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/macho.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,14 +3,14 @@
 //! These definitions are independent of read/write support, although we do implement
 //! some traits useful for those.
 //!
-//! This module is based heavily on macOS header files.
+//! This module is based heavily on header files from MacOSX11.1.sdk.
 
 #![allow(missing_docs)]
 
 use crate::endian::{BigEndian, Endian, U64Bytes, U16, U32, U64};
 use crate::pod::Pod;
 
-// Definitions from "/usr/include/mach-o/machine.h".
+// Definitions from "/usr/include/mach/machine.h".
 
 /*
  * Capability bits used in the definition of cpu_type.
@@ -53,6 +53,13 @@
 pub const CPU_SUBTYPE_MASK: u32 = 0xff00_0000;
 /// 64 bit libraries
 pub const CPU_SUBTYPE_LIB64: u32 = 0x8000_0000;
+/// pointer authentication with versioned ABI
+pub const CPU_SUBTYPE_PTRAUTH_ABI: u32 = 0x8000_0000;
+
+/// When selecting a slice, ANY will pick the slice with the best
+/// grading for the selected cpu_type_t, unlike the "ALL" subtypes,
+/// which are the slices that can run on any hardware for that cpu type.
+pub const CPU_SUBTYPE_ANY: u32 = !0;
 
 /*
  *	Object files that are hand-crafted to run on any
@@ -236,20 +243,22 @@
 pub const CPU_SUBTYPE_ARM_V6: u32 = 6;
 pub const CPU_SUBTYPE_ARM_V5TEJ: u32 = 7;
 pub const CPU_SUBTYPE_ARM_XSCALE: u32 = 8;
+/// ARMv7-A and ARMv7-R
 pub const CPU_SUBTYPE_ARM_V7: u32 = 9;
 /// Cortex A9
 pub const CPU_SUBTYPE_ARM_V7F: u32 = 10;
 /// Swift
 pub const CPU_SUBTYPE_ARM_V7S: u32 = 11;
 pub const CPU_SUBTYPE_ARM_V7K: u32 = 12;
+pub const CPU_SUBTYPE_ARM_V8: u32 = 13;
 /// Not meant to be run under xnu
 pub const CPU_SUBTYPE_ARM_V6M: u32 = 14;
 /// Not meant to be run under xnu
 pub const CPU_SUBTYPE_ARM_V7M: u32 = 15;
 /// Not meant to be run under xnu
 pub const CPU_SUBTYPE_ARM_V7EM: u32 = 16;
-
-pub const CPU_SUBTYPE_ARM_V8: u32 = 13;
+/// Not meant to be run under xnu
+pub const CPU_SUBTYPE_ARM_V8M: u32 = 17;
 
 /*
  *  ARM64 subtypes
@@ -273,6 +282,62 @@
 /// execute permission
 pub const VM_PROT_EXECUTE: u32 = 0x04;
 
+// Definitions from https://opensource.apple.com/source/dyld/dyld-210.2.3/launch-cache/dyld_cache_format.h.auto.html
+
+/// The dyld cache header, containing only the fields which are present
+/// in all versions of dyld caches (dyld-95.3 and up).
+/// Many more fields exist in later dyld versions, but we currently do
+/// not need to parse those.
+/// Corresponds to struct dyld_cache_header from dyld_cache_format.h.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct DyldCacheHeader<E: Endian> {
+    /// e.g. "dyld_v0    i386"
+    pub magic: [u8; 16],
+    /// file offset to first dyld_cache_mapping_info
+    pub mapping_offset: U32<E>,
+    /// number of dyld_cache_mapping_info entries
+    pub mapping_count: U32<E>,
+    /// file offset to first dyld_cache_image_info
+    pub images_offset: U32<E>,
+    /// number of dyld_cache_image_info entries
+    pub images_count: U32<E>,
+    /// base address of dyld when cache was built
+    pub dyld_base_address: U64<E>,
+}
+
+/// Corresponds to struct dyld_cache_mapping_info from dyld_cache_format.h.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct DyldCacheMappingInfo<E: Endian> {
+    ///
+    pub address: U64<E>,
+    ///
+    pub size: U64<E>,
+    ///
+    pub file_offset: U64<E>,
+    ///
+    pub max_prot: U32<E>,
+    ///
+    pub init_prot: U32<E>,
+}
+
+/// Corresponds to struct dyld_cache_image_info from dyld_cache_format.h.
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct DyldCacheImageInfo<E: Endian> {
+    ///
+    pub address: U64<E>,
+    ///
+    pub mod_time: U64<E>,
+    ///
+    pub inode: U64<E>,
+    ///
+    pub path_file_offset: U32<E>,
+    ///
+    pub pad: U32<E>,
+}
+
 // Definitions from "/usr/include/mach-o/loader.h".
 
 /*
@@ -451,6 +516,8 @@
 pub const MH_DSYM: u32 = 0xa;
 /// x86_64 kexts
 pub const MH_KEXT_BUNDLE: u32 = 0xb;
+/// set of mach-o's
+pub const MH_FILESET: u32 = 0xc;
 
 // Values for `MachHeader*::flags`.
 /// the object file has no undefined references
@@ -487,15 +554,12 @@
 pub const MH_WEAK_DEFINES: u32 = 0x8000;
 /// the final linked image uses weak symbols
 pub const MH_BINDS_TO_WEAK: u32 = 0x10000;
-
 /// When this bit is set, all stacks in the task will be given stack execution privilege.  Only used in MH_EXECUTE filetypes.
 pub const MH_ALLOW_STACK_EXECUTION: u32 = 0x20000;
 /// When this bit is set, the binary declares it is safe for use in processes with uid zero
 pub const MH_ROOT_SAFE: u32 = 0x40000;
-
 /// When this bit is set, the binary declares it is safe for use in processes when issetugid() is true
 pub const MH_SETUID_SAFE: u32 = 0x80000;
-
 /// When this bit is set on a dylib, the static linker does not need to examine dependent dylibs to see if any are re-exported
 pub const MH_NO_REEXPORTED_DYLIBS: u32 = 0x10_0000;
 /// When this bit is set, the OS will load the main executable at a random address.  Only used in MH_EXECUTE filetypes.
@@ -504,17 +568,18 @@
 pub const MH_DEAD_STRIPPABLE_DYLIB: u32 = 0x40_0000;
 /// Contains a section of type S_THREAD_LOCAL_VARIABLES
 pub const MH_HAS_TLV_DESCRIPTORS: u32 = 0x80_0000;
-
 /// When this bit is set, the OS will run the main executable with a non-executable heap even on platforms (e.g. i386) that don't require it. Only used in MH_EXECUTE filetypes.
 pub const MH_NO_HEAP_EXECUTION: u32 = 0x100_0000;
-
 /// The code was linked for use in an application extension.
 pub const MH_APP_EXTENSION_SAFE: u32 = 0x0200_0000;
-
-pub const MH_NLIST_OUTOFSYNC_WITH_DYLDINFO: u32 = 0x0400_0000;
 /// The external symbols listed in the nlist symbol table do not include all the symbols listed in the dyld info.
-
+pub const MH_NLIST_OUTOFSYNC_WITH_DYLDINFO: u32 = 0x0400_0000;
+/// Allow LC_MIN_VERSION_MACOS and LC_BUILD_VERSION load commands with
+/// the platforms macOS, iOSMac, iOSSimulator, tvOSSimulator and watchOSSimulator.
 pub const MH_SIM_SUPPORT: u32 = 0x0800_0000;
+/// Only for use on dylibs. When this bit is set, the dylib is part of the dyld
+/// shared cache, rather than loose in the filesystem.
+pub const MH_DYLIB_IN_CACHE: u32 = 0x8000_0000;
 
 /// Common fields at the start of every load command.
 ///
@@ -602,13 +667,9 @@
 pub const LC_TWOLEVEL_HINTS: u32 = 0x16;
 /// prebind checksum
 pub const LC_PREBIND_CKSUM: u32 = 0x17;
-
-/*
- * load a dynamically linked shared library that is allowed to be missing
- * (all symbols are weak imported).
- */
+/// load a dynamically linked shared library that is allowed to be missing
+/// (all symbols are weak imported).
 pub const LC_LOAD_WEAK_DYLIB: u32 = 0x18 | LC_REQ_DYLD;
-
 /// 64-bit segment of this file to be mapped
 pub const LC_SEGMENT_64: u32 = 0x19;
 /// 64-bit image routines
@@ -667,6 +728,8 @@
 pub const LC_DYLD_EXPORTS_TRIE: u32 = 0x33 | LC_REQ_DYLD;
 /// used with `LinkeditDataCommand`
 pub const LC_DYLD_CHAINED_FIXUPS: u32 = 0x34 | LC_REQ_DYLD;
+/// used with `FilesetEntryCommand`
+pub const LC_FILESET_ENTRY: u32 = 0x35 | LC_REQ_DYLD;
 
 /// A variable length string in a load command.
 ///
@@ -1021,6 +1084,9 @@
 /// the segment containing all structs created and maintained by the link editor.  Created with -seglinkedit option to ld(1) for MH_EXECUTE and FVMLIB file types only
 pub const SEG_LINKEDIT: &str = "__LINKEDIT";
 
+/// the segment overlapping with linkedit containing linking information
+pub const SEG_LINKINFO: &str = "__LINKINFO";
+
 /// the unix stack segment
 pub const SEG_UNIXSTACK: &str = "__UNIXSTACK";
 
@@ -1280,7 +1346,7 @@
  */
 #[derive(Debug, Clone, Copy)]
 #[repr(C)]
-pub struct RoutinesCommand<E: Endian> {
+pub struct RoutinesCommand32<E: Endian> {
     /* for 32-bit architectures */
     /// LC_ROUTINES
     pub cmd: U32<E>,
@@ -1303,7 +1369,7 @@
  */
 #[derive(Debug, Clone, Copy)]
 #[repr(C)]
-pub struct RoutinesCommand_64<E: Endian> {
+pub struct RoutinesCommand64<E: Endian> {
     /* for 64-bit architectures */
     /// LC_ROUTINES_64
     pub cmd: U32<E>,
@@ -1732,7 +1798,9 @@
 #[derive(Debug, Clone, Copy)]
 #[repr(C)]
 pub struct LinkeditDataCommand<E: Endian> {
-    /// LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO, LC_FUNCTION_STARTS, LC_DATA_IN_CODE, LC_DYLIB_CODE_SIGN_DRS or LC_LINKER_OPTIMIZATION_HINT.
+    /// `LC_CODE_SIGNATURE`, `LC_SEGMENT_SPLIT_INFO`, `LC_FUNCTION_STARTS`,
+    /// `LC_DATA_IN_CODE`, `LC_DYLIB_CODE_SIGN_DRS`, `LC_LINKER_OPTIMIZATION_HINT`,
+    /// `LC_DYLD_EXPORTS_TRIE`, or `LC_DYLD_CHAINED_FIXUPS`.
     pub cmd: U32<E>,
     /// sizeof(struct LinkeditDataCommand)
     pub cmdsize: U32<E>,
@@ -1742,16 +1810,33 @@
     pub datasize: U32<E>,
 }
 
+#[derive(Debug, Clone, Copy)]
+#[repr(C)]
+pub struct FilesetEntryCommand<E: Endian> {
+    // LC_FILESET_ENTRY
+    pub cmd: U32<E>,
+    /// includes id string
+    pub cmdsize: U32<E>,
+    /// memory address of the dylib
+    pub vmaddr: U64<E>,
+    /// file offset of the dylib
+    pub fileoff: U64<E>,
+    /// contained entry id
+    pub entry_id: LcStr<E>,
+    /// entry_id is 32-bits long, so this is the reserved padding
+    pub reserved: U32<E>,
+}
+
 /*
- * The EncryptionInfoCommand contains the file offset and size of an
+ * The EncryptionInfoCommand32 contains the file offset and size of an
  * of an encrypted segment.
  */
 #[derive(Debug, Clone, Copy)]
 #[repr(C)]
-pub struct EncryptionInfoCommand<E: Endian> {
+pub struct EncryptionInfoCommand32<E: Endian> {
     /// LC_ENCRYPTION_INFO
     pub cmd: U32<E>,
-    /// sizeof(struct EncryptionInfoCommand)
+    /// sizeof(struct EncryptionInfoCommand32)
     pub cmdsize: U32<E>,
     /// file offset of encrypted range
     pub cryptoff: U32<E>,
@@ -1836,10 +1921,11 @@
 pub const PLATFORM_TVOS: u32 = 3;
 pub const PLATFORM_WATCHOS: u32 = 4;
 pub const PLATFORM_BRIDGEOS: u32 = 5;
-pub const PLATFORM_IOSMAC: u32 = 6;
+pub const PLATFORM_MACCATALYST: u32 = 6;
 pub const PLATFORM_IOSSIMULATOR: u32 = 7;
 pub const PLATFORM_TVOSSIMULATOR: u32 = 8;
 pub const PLATFORM_WATCHOSSIMULATOR: u32 = 9;
+pub const PLATFORM_DRIVERKIT: u32 = 10;
 
 /* Known values for the tool field above. */
 pub const TOOL_CLANG: u32 = 1;
@@ -2052,7 +2138,7 @@
 }
 
 /*
- * The SymSegCommand contains the offset and size of the GNU style
+ * The SymsegCommand contains the offset and size of the GNU style
  * symbol table information as described in the header file <symseg.h>.
  * The symbol roots of the symbol segments must also be aligned properly
  * in the file.  So the requirement of keeping the offsets aligned to a
@@ -2062,10 +2148,10 @@
  */
 #[derive(Debug, Clone, Copy)]
 #[repr(C)]
-pub struct SymSegCommand<E: Endian> {
+pub struct SymsegCommand<E: Endian> {
     /// LC_SYMSEG
     pub cmd: U32<E>,
-    /// sizeof(struct SymSegCommand)
+    /// sizeof(struct SymsegCommand)
     pub cmdsize: U32<E>,
     /// symbol segment offset
     pub offset: U32<E>,
@@ -2142,7 +2228,7 @@
 }
 
 /*
- * The LC_DATA_IN_CODE load commands uses a linkedit_data_command
+ * The LC_DATA_IN_CODE load commands uses a LinkeditDataCommand
  * to point to an array of DataInCodeEntry entries. Each entry
  * describes a range of data in a code section.
  */
@@ -3110,6 +3196,9 @@
 
 unsafe_impl_pod!(FatHeader, FatArch32, FatArch64,);
 unsafe_impl_endian_pod!(
+    DyldCacheHeader,
+    DyldCacheMappingInfo,
+    DyldCacheImageInfo,
     MachHeader32,
     MachHeader64,
     LoadCommand,
@@ -3129,8 +3218,8 @@
     PreboundDylibCommand,
     DylinkerCommand,
     ThreadCommand,
-    RoutinesCommand,
-    RoutinesCommand_64,
+    RoutinesCommand32,
+    RoutinesCommand64,
     SymtabCommand,
     DysymtabCommand,
     DylibTableOfContents,
@@ -3143,14 +3232,15 @@
     UuidCommand,
     RpathCommand,
     LinkeditDataCommand,
-    EncryptionInfoCommand,
+    FilesetEntryCommand,
+    EncryptionInfoCommand32,
     EncryptionInfoCommand64,
     VersionMinCommand,
     BuildVersionCommand,
     BuildToolVersion,
     DyldInfoCommand,
     LinkerOptionCommand,
-    SymSegCommand,
+    SymsegCommand,
     IdentCommand,
     FvmfileCommand,
     EntryPointCommand,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/pe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/pe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/pe.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/pe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -343,6 +343,12 @@
 /// ARM64 Little-Endian
 pub const IMAGE_FILE_MACHINE_ARM64: u16 = 0xAA64;
 pub const IMAGE_FILE_MACHINE_CEE: u16 = 0xC0EE;
+/// RISCV32
+pub const IMAGE_FILE_MACHINE_RISCV32: u16 = 0x5032;
+/// RISCV64
+pub const IMAGE_FILE_MACHINE_RISCV64: u16 = 0x5064;
+/// RISCV128
+pub const IMAGE_FILE_MACHINE_RISCV128: u16 = 0x5128;
 
 //
 // Directory format.
@@ -1732,6 +1738,10 @@
 pub const IMAGE_REL_BASED_ARM_MOV32: u16 = 5;
 pub const IMAGE_REL_BASED_THUMB_MOV32: u16 = 7;
 
+pub const IMAGE_REL_BASED_RISCV_HIGH20: u16 = 5;
+pub const IMAGE_REL_BASED_RISCV_LOW12I: u16 = 7;
+pub const IMAGE_REL_BASED_RISCV_LOW12S: u16 = 8;
+
 //
 // Archive format.
 //
@@ -1833,9 +1843,12 @@
         pub address_of_data: U32<LE>,
     } u1;
 }
+*/
 
 pub const IMAGE_ORDINAL_FLAG64: u64 = 0x8000000000000000;
 pub const IMAGE_ORDINAL_FLAG32: u32 = 0x80000000;
+
+/*
 #define IMAGE_ORDINAL64(Ordinal) (Ordinal & 0xffff)
 #define IMAGE_ORDINAL32(Ordinal) (Ordinal & 0xffff)
 #define IMAGE_SNAP_BY_ORDINAL64(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG64) != 0)
@@ -1873,25 +1886,22 @@
     pub characteristics: U32<LE>,
 }
 
-// TODO: unaligned?
 #[derive(Debug, Clone, Copy)]
 #[repr(C)]
 pub struct ImageImportDescriptor {
+    /// RVA to original unbound IAT (`ImageThunkData32`/`ImageThunkData64`)
     /// 0 for terminating null import descriptor
-    /// RVA to original unbound IAT (PIMAGE_THUNK_DATA)
-    pub characteristics_or_original_first_thunk: U32<LE>,
-    pub original_first_thunk: U32<LE>,
+    pub original_first_thunk: U32Bytes<LE>,
     /// 0 if not bound,
     /// -1 if bound, and real date\time stamp
     ///     in IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT (new BIND)
     /// O.W. date/time stamp of DLL bound to (Old BIND)
-    pub time_date_stamp: U32<LE>,
-
+    pub time_date_stamp: U32Bytes<LE>,
     /// -1 if no forwarders
-    pub forwarder_chain: U32<LE>,
-    pub name: U32<LE>,
+    pub forwarder_chain: U32Bytes<LE>,
+    pub name: U32Bytes<LE>,
     /// RVA to IAT (if bound this IAT has actual addresses)
-    pub first_thunk: U32<LE>,
+    pub first_thunk: U32Bytes<LE>,
 }
 
 //
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/pod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/pod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/pod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/pod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,10 +3,12 @@
 //! This module should be replaced once rust provides safe transmutes.
 
 // This module provides functions for both read and write features.
-#![cfg_attr(not(all(feature = "read_core", feature = "write_core")), allow(dead_code))]
+#![cfg_attr(
+    not(all(feature = "read_core", feature = "write_core")),
+    allow(dead_code)
+)]
 
-use alloc::vec::Vec;
-use core::{fmt, mem, result, slice};
+use core::{mem, result, slice};
 
 type Result<T> = result::Result<T, ()>;
 
@@ -23,12 +25,12 @@
 /// Returns the type and the tail of the slice.
 #[inline]
 pub fn from_bytes<T: Pod>(data: &[u8]) -> Result<(&T, &[u8])> {
+    let size = mem::size_of::<T>();
+    let tail = data.get(size..).ok_or(())?;
     let ptr = data.as_ptr();
     if (ptr as usize) % mem::align_of::<T>() != 0 {
         return Err(());
     }
-    let size = mem::size_of::<T>();
-    let tail = data.get(size..).ok_or(())?;
     // Safety:
     // The alignment and size are checked by this function.
     // The Pod trait ensures the type is valid to cast from bytes.
@@ -36,17 +38,38 @@
     Ok((val, tail))
 }
 
+/// Cast a mutable byte slice to a `Pod` type.
+///
+/// Returns the type and the tail of the slice.
+#[inline]
+pub fn from_bytes_mut<T: Pod>(data: &mut [u8]) -> Result<(&mut T, &mut [u8])> {
+    let size = mem::size_of::<T>();
+    if size > data.len() {
+        return Err(());
+    }
+    let (data, tail) = data.split_at_mut(size);
+    let ptr = data.as_mut_ptr();
+    if (ptr as usize) % mem::align_of::<T>() != 0 {
+        return Err(());
+    }
+    // Safety:
+    // The alignment and size are checked by this function.
+    // The Pod trait ensures the type is valid to cast from bytes.
+    let val = unsafe { &mut *ptr.cast() };
+    Ok((val, tail))
+}
+
 /// Cast a byte slice to a slice of a `Pod` type.
 ///
 /// Returns the type slice and the tail of the byte slice.
 #[inline]
 pub fn slice_from_bytes<T: Pod>(data: &[u8], count: usize) -> Result<(&[T], &[u8])> {
+    let size = count.checked_mul(mem::size_of::<T>()).ok_or(())?;
+    let tail = data.get(size..).ok_or(())?;
     let ptr = data.as_ptr();
     if (ptr as usize) % mem::align_of::<T>() != 0 {
         return Err(());
     }
-    let size = count.checked_mul(mem::size_of::<T>()).ok_or(())?;
-    let tail = data.get(size..).ok_or(())?;
     // Safety:
     // The alignment and size are checked by this function.
     // The Pod trait ensures the type is valid to cast from bytes.
@@ -54,6 +77,30 @@
     Ok((slice, tail))
 }
 
+/// Cast a mutable byte slice to a slice of a `Pod` type.
+///
+/// Returns the type slice and the tail of the byte slice.
+#[inline]
+pub fn slice_from_bytes_mut<T: Pod>(
+    data: &mut [u8],
+    count: usize,
+) -> Result<(&mut [T], &mut [u8])> {
+    let size = count.checked_mul(mem::size_of::<T>()).ok_or(())?;
+    if size > data.len() {
+        return Err(());
+    }
+    let (data, tail) = data.split_at_mut(size);
+    let ptr = data.as_mut_ptr();
+    if (ptr as usize) % mem::align_of::<T>() != 0 {
+        return Err(());
+    }
+    // Safety:
+    // The alignment and size are checked by this function.
+    // The Pod trait ensures the type is valid to cast from bytes.
+    let slice = unsafe { slice::from_raw_parts_mut(ptr.cast(), count) };
+    Ok((slice, tail))
+}
+
 /// Cast a `Pod` type to a byte slice.
 #[inline]
 pub fn bytes_of<T: Pod>(val: &T) -> &[u8] {
@@ -65,273 +112,37 @@
     unsafe { slice::from_raw_parts(slice::from_ref(val).as_ptr().cast(), size) }
 }
 
-/// A newtype for byte slices.
-///
-/// It has these important features:
-/// - no methods that can panic, such as `Index`
-/// - convenience methods for `Pod` types
-/// - a useful `Debug` implementation
-#[derive(Default, Clone, Copy, PartialEq, Eq)]
-pub struct Bytes<'data>(pub &'data [u8]);
-
-impl<'data> fmt::Debug for Bytes<'data> {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        debug_list_bytes(self.0, fmt)
-    }
-}
-
-impl<'data> Bytes<'data> {
-    /// Return the length of the byte slice.
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    /// Return true if the byte slice is empty.
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    /// Skip over the given number of bytes at the start of the byte slice.
-    ///
-    /// Modifies the byte slice to start after the bytes.
-    ///
-    /// Returns an error if there are too few bytes.
-    #[inline]
-    pub fn skip(&mut self, offset: usize) -> Result<()> {
-        match self.0.get(offset..) {
-            Some(tail) => {
-                self.0 = tail;
-                Ok(())
-            }
-            None => {
-                self.0 = &[];
-                Err(())
-            }
-        }
-    }
-
-    /// Return a reference to the given number of bytes at the start of the byte slice.
-    ///
-    /// Modifies the byte slice to start after the bytes.
-    ///
-    /// Returns an error if there are too few bytes.
-    #[inline]
-    pub fn read_bytes(&mut self, count: usize) -> Result<Bytes<'data>> {
-        match (self.0.get(..count), self.0.get(count..)) {
-            (Some(head), Some(tail)) => {
-                self.0 = tail;
-                Ok(Bytes(head))
-            }
-            _ => {
-                self.0 = &[];
-                Err(())
-            }
-        }
-    }
-
-    /// Return a reference to the given number of bytes at the given offset of the byte slice.
-    ///
-    /// Returns an error if the offset is invalid or there are too few bytes.
-    #[inline]
-    pub fn read_bytes_at(mut self, offset: usize, count: usize) -> Result<Bytes<'data>> {
-        self.skip(offset)?;
-        self.read_bytes(count)
-    }
-
-    /// Return a reference to a `Pod` struct at the start of the byte slice.
-    ///
-    /// Modifies the byte slice to start after the bytes.
-    ///
-    /// Returns an error if there are too few bytes or the slice is incorrectly aligned.
-    #[inline]
-    pub fn read<T: Pod>(&mut self) -> Result<&'data T> {
-        match from_bytes(self.0) {
-            Ok((value, tail)) => {
-                self.0 = tail;
-                Ok(value)
-            }
-            Err(()) => {
-                self.0 = &[];
-                Err(())
-            }
-        }
-    }
-
-    /// Return a reference to a `Pod` struct at the given offset of the byte slice.
-    ///
-    /// Returns an error if there are too few bytes or the offset is incorrectly aligned.
-    #[inline]
-    pub fn read_at<T: Pod>(mut self, offset: usize) -> Result<&'data T> {
-        self.skip(offset)?;
-        self.read()
-    }
-
-    /// Return a reference to a slice of `Pod` structs at the start of the byte slice.
-    ///
-    /// Modifies the byte slice to start after the bytes.
-    ///
-    /// Returns an error if there are too few bytes or the offset is incorrectly aligned.
-    #[inline]
-    pub fn read_slice<T: Pod>(&mut self, count: usize) -> Result<&'data [T]> {
-        match slice_from_bytes(self.0, count) {
-            Ok((value, tail)) => {
-                self.0 = tail;
-                Ok(value)
-            }
-            Err(()) => {
-                self.0 = &[];
-                Err(())
-            }
-        }
-    }
-
-    /// Return a reference to a slice of `Pod` structs at the given offset of the byte slice.
-    ///
-    /// Returns an error if there are too few bytes or the offset is incorrectly aligned.
-    #[inline]
-    pub fn read_slice_at<T: Pod>(mut self, offset: usize, count: usize) -> Result<&'data [T]> {
-        self.skip(offset)?;
-        self.read_slice(count)
-    }
-
-    /// Read a null terminated string.
-    ///
-    /// Does not assume any encoding.
-    /// Reads past the null byte, but doesn't return it.
-    #[inline]
-    pub fn read_string(&mut self) -> Result<&'data [u8]> {
-        match self.0.iter().position(|&x| x == 0) {
-            Some(null) => {
-                // These will never fail.
-                let bytes = self.read_bytes(null)?;
-                self.skip(1)?;
-                Ok(bytes.0)
-            }
-            None => {
-                self.0 = &[];
-                Err(())
-            }
-        }
-    }
-
-    /// Read a null terminated string at an offset.
-    ///
-    /// Does not assume any encoding. Does not return the null byte.
-    #[inline]
-    pub fn read_string_at(mut self, offset: usize) -> Result<&'data [u8]> {
-        self.skip(offset)?;
-        self.read_string()
-    }
-}
-
-/// Trait for writable buffer.
-pub trait WritableBuffer {
-    /// Returns position/offset for data to be written at.
-    fn len(&self) -> usize;
-    /// Returns true if buffer contains no data.
-    fn is_empty(&self) -> bool;
-    /// Reserves specified number of bytes in the buffer.
-    fn reserve(&mut self, additional: usize) -> Result<()>;
-    /// Resizes buffer to the specified length, fills new items
-    /// with the specified value.
-    fn resize(&mut self, new_len: usize, value: u8);
-    /// Extends buffer with the specified slice of bytes.
-    fn extend(&mut self, val: &[u8]);
-}
-
-/// A newtype for byte vectors.
-///
-/// It provides convenience methods for `Pod` types.
-// TODO: should this be an extension trait for `Vec<u8>` instead?
-#[derive(Default, Clone, PartialEq, Eq)]
-pub(crate) struct BytesMut(pub Vec<u8>);
-
-impl fmt::Debug for BytesMut {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        debug_list_bytes(&self.0, fmt)
-    }
-}
-
-impl BytesMut {
-    #[inline]
-    pub fn new() -> Self {
-        BytesMut(Vec::new())
-    }
-
-    #[inline]
-    pub fn write<T: Pod>(&mut self, val: &T) {
-        self.0.extend_from_slice(bytes_of(val))
-    }
-
-    #[inline]
-    pub fn write_at<T: Pod>(&mut self, offset: usize, val: &T) -> Result<()> {
-        let src = bytes_of(val);
-        let dest = self.0.get_mut(offset..).ok_or(())?;
-        let dest = dest.get_mut(..src.len()).ok_or(())?;
-        dest.copy_from_slice(src);
-        Ok(())
-    }
-
-    #[inline]
-    pub fn as_slice(&self) -> &[u8] {
-        self.0.as_slice()
-    }
-}
-
-impl WritableBuffer for BytesMut {
-    #[inline]
-    fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    #[inline]
-    fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    #[inline]
-    fn reserve(&mut self, additional: usize) -> Result<()> {
-        self.0.reserve(additional);
-        Ok(())
-    }
-
-    #[inline]
-    fn resize(&mut self, new_len: usize, value: u8) {
-        self.0.resize(new_len, value);
-    }
-
-    #[inline]
-    fn extend(&mut self, val: &[u8]) {
-        self.0.extend_from_slice(val)
-    }
-}
-
-// Only for Debug impl of `Bytes/BytesMut`.
-fn debug_list_bytes(bytes: &[u8], fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-    let mut list = fmt.debug_list();
-    list.entries(bytes.iter().take(8).copied().map(DebugByte));
-    if bytes.len() > 8 {
-        list.entry(&DebugLen(bytes.len()));
-    }
-    list.finish()
+/// Cast a `Pod` type to a mutable byte slice.
+#[inline]
+pub fn bytes_of_mut<T: Pod>(val: &mut T) -> &mut [u8] {
+    let size = mem::size_of::<T>();
+    // Safety:
+    // Any alignment is allowed.
+    // The size is determined in this function.
+    // The Pod trait ensures the type is valid to cast to bytes.
+    unsafe { slice::from_raw_parts_mut(slice::from_mut(val).as_mut_ptr().cast(), size) }
 }
 
-struct DebugByte(u8);
-
-impl fmt::Debug for DebugByte {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(fmt, "0x{:02x}", self.0)
-    }
+/// Cast a slice of a `Pod` type to a byte slice.
+#[inline]
+pub fn bytes_of_slice<T: Pod>(val: &[T]) -> &[u8] {
+    let size = val.len().wrapping_mul(mem::size_of::<T>());
+    // Safety:
+    // Any alignment is allowed.
+    // The size is determined in this function.
+    // The Pod trait ensures the type is valid to cast to bytes.
+    unsafe { slice::from_raw_parts(val.as_ptr().cast(), size) }
 }
 
-struct DebugLen(usize);
-
-impl fmt::Debug for DebugLen {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(fmt, "...; {}", self.0)
-    }
+/// Cast a slice of a `Pod` type to a mutable byte slice.
+#[inline]
+pub fn bytes_of_slice_mut<T: Pod>(val: &mut [T]) -> &mut [u8] {
+    let size = val.len().wrapping_mul(mem::size_of::<T>());
+    // Safety:
+    // Any alignment is allowed.
+    // The size is determined in this function.
+    // The Pod trait ensures the type is valid to cast to bytes.
+    unsafe { slice::from_raw_parts_mut(val.as_mut_ptr().cast(), size) }
 }
 
 macro_rules! unsafe_impl_pod {
@@ -351,187 +162,77 @@
     #[test]
     fn single() {
         let x = u32::to_be(0x0123_4567);
+        let mut x_mut = x;
         let bytes = bytes_of(&x);
+        let bytes_mut = bytes_of_mut(&mut x_mut);
         assert_eq!(bytes, [0x01, 0x23, 0x45, 0x67]);
+        assert_eq!(bytes, bytes_mut);
 
         let x16 = [u16::to_be(0x0123), u16::to_be(0x4567)];
 
         let (y, tail) = from_bytes::<u32>(bytes).unwrap();
+        let (y_mut, tail_mut) = from_bytes_mut::<u32>(bytes_mut).unwrap();
         assert_eq!(*y, x);
+        assert_eq!(y, y_mut);
         assert_eq!(tail, &[]);
+        assert_eq!(tail, tail_mut);
 
         let (y, tail) = from_bytes::<u16>(bytes).unwrap();
+        let (y_mut, tail_mut) = from_bytes_mut::<u16>(bytes_mut).unwrap();
         assert_eq!(*y, x16[0]);
+        assert_eq!(y, y_mut);
         assert_eq!(tail, &bytes[2..]);
+        assert_eq!(tail, tail_mut);
 
         let (y, tail) = from_bytes::<u16>(&bytes[2..]).unwrap();
+        let (y_mut, tail_mut) = from_bytes_mut::<u16>(&mut bytes_mut[2..]).unwrap();
         assert_eq!(*y, x16[1]);
+        assert_eq!(y, y_mut);
         assert_eq!(tail, &[]);
+        assert_eq!(tail, tail_mut);
 
         assert_eq!(from_bytes::<u16>(&bytes[1..]), Err(()));
         assert_eq!(from_bytes::<u16>(&bytes[3..]), Err(()));
         assert_eq!(from_bytes::<u16>(&bytes[4..]), Err(()));
+        assert_eq!(from_bytes_mut::<u16>(&mut bytes_mut[1..]), Err(()));
+        assert_eq!(from_bytes_mut::<u16>(&mut bytes_mut[3..]), Err(()));
+        assert_eq!(from_bytes_mut::<u16>(&mut bytes_mut[4..]), Err(()));
     }
 
     #[test]
     fn slice() {
-        let x = u64::to_be(0x0123_4567_89ab_cdef);
-        let bytes = bytes_of(&x);
-        assert_eq!(bytes, [0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef]);
-
-        let x16 = [
+        let x = [
             u16::to_be(0x0123),
             u16::to_be(0x4567),
             u16::to_be(0x89ab),
             u16::to_be(0xcdef),
         ];
+        let mut x_mut = x;
+
+        let bytes = bytes_of_slice(&x);
+        let bytes_mut = bytes_of_slice_mut(&mut x_mut);
+        assert_eq!(bytes, [0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef]);
+        assert_eq!(bytes, bytes_mut);
 
-        let (y, tail) = slice_from_bytes::<u16>(&bytes, 4).unwrap();
-        assert_eq!(y, x16);
+        let (y, tail) = slice_from_bytes::<u16>(bytes, 4).unwrap();
+        let (y_mut, tail_mut) = slice_from_bytes_mut::<u16>(bytes_mut, 4).unwrap();
+        assert_eq!(y, x);
+        assert_eq!(y, y_mut);
         assert_eq!(tail, &[]);
+        assert_eq!(tail, tail_mut);
 
         let (y, tail) = slice_from_bytes::<u16>(&bytes[2..], 2).unwrap();
-        assert_eq!(y, &x16[1..3]);
+        let (y_mut, tail_mut) = slice_from_bytes::<u16>(&mut bytes_mut[2..], 2).unwrap();
+        assert_eq!(y, &x[1..3]);
+        assert_eq!(y, y_mut);
         assert_eq!(tail, &bytes[6..]);
+        assert_eq!(tail, tail_mut);
 
-        assert_eq!(slice_from_bytes::<u16>(&bytes, 5), Err(()));
+        assert_eq!(slice_from_bytes::<u16>(bytes, 5), Err(()));
         assert_eq!(slice_from_bytes::<u16>(&bytes[2..], 4), Err(()));
         assert_eq!(slice_from_bytes::<u16>(&bytes[1..], 2), Err(()));
-    }
-
-    #[test]
-    fn bytes() {
-        let x = u32::to_be(0x0123_4567);
-        let data = Bytes(bytes_of(&x));
-
-        let mut bytes = data;
-        assert_eq!(bytes.skip(0), Ok(()));
-        assert_eq!(bytes, data);
-
-        let mut bytes = data;
-        assert_eq!(bytes.skip(4), Ok(()));
-        assert_eq!(bytes, Bytes(&[]));
-
-        let mut bytes = data;
-        assert_eq!(bytes.skip(5), Err(()));
-        assert_eq!(bytes, Bytes(&[]));
-
-        let mut bytes = data;
-        assert_eq!(bytes.read_bytes(0), Ok(Bytes(&[])));
-        assert_eq!(bytes, data);
-
-        let mut bytes = data;
-        assert_eq!(bytes.read_bytes(4), Ok(data));
-        assert_eq!(bytes, Bytes(&[]));
-
-        let mut bytes = data;
-        assert_eq!(bytes.read_bytes(5), Err(()));
-        assert_eq!(bytes, Bytes(&[]));
-
-        assert_eq!(data.read_bytes_at(0, 0), Ok(Bytes(&[])));
-        assert_eq!(data.read_bytes_at(4, 0), Ok(Bytes(&[])));
-        assert_eq!(data.read_bytes_at(0, 4), Ok(data));
-        assert_eq!(data.read_bytes_at(1, 4), Err(()));
-
-        let mut bytes = data;
-        assert_eq!(bytes.read::<u16>(), Ok(&u16::to_be(0x0123)));
-        assert_eq!(bytes, Bytes(&[0x45, 0x67]));
-        assert_eq!(data.read_at::<u16>(2), Ok(&u16::to_be(0x4567)));
-        assert_eq!(data.read_at::<u16>(3), Err(()));
-        assert_eq!(data.read_at::<u16>(4), Err(()));
-
-        let mut bytes = data;
-        assert_eq!(bytes.read::<u32>(), Ok(&x));
-        assert_eq!(bytes, Bytes(&[]));
-
-        let mut bytes = data;
-        assert_eq!(bytes.read::<u64>(), Err(()));
-        assert_eq!(bytes, Bytes(&[]));
-
-        let mut bytes = data;
-        assert_eq!(bytes.read_slice::<u8>(0), Ok(&[][..]));
-        assert_eq!(bytes, data);
-
-        let mut bytes = data;
-        assert_eq!(bytes.read_slice::<u8>(4), Ok(data.0));
-        assert_eq!(bytes, Bytes(&[]));
-
-        let mut bytes = data;
-        assert_eq!(bytes.read_slice::<u8>(5), Err(()));
-        assert_eq!(bytes, Bytes(&[]));
-
-        assert_eq!(data.read_slice_at::<u8>(0, 0), Ok(&[][..]));
-        assert_eq!(data.read_slice_at::<u8>(4, 0), Ok(&[][..]));
-        assert_eq!(data.read_slice_at::<u8>(0, 4), Ok(data.0));
-        assert_eq!(data.read_slice_at::<u8>(1, 4), Err(()));
-
-        let data = Bytes(&[0x01, 0x02, 0x00, 0x04]);
-
-        let mut bytes = data;
-        assert_eq!(bytes.read_string(), Ok(&data.0[..2]));
-        assert_eq!(bytes.0, &data.0[3..]);
-
-        let mut bytes = data;
-        bytes.skip(3).unwrap();
-        assert_eq!(bytes.read_string(), Err(()));
-        assert_eq!(bytes.0, &[]);
-
-        assert_eq!(data.read_string_at(0), Ok(&data.0[..2]));
-        assert_eq!(data.read_string_at(1), Ok(&data.0[1..2]));
-        assert_eq!(data.read_string_at(2), Ok(&[][..]));
-        assert_eq!(data.read_string_at(3), Err(()));
-    }
-
-    #[test]
-    fn bytes_mut() {
-        let data = BytesMut(vec![0x01, 0x23, 0x45, 0x67]);
-
-        let mut bytes = data.clone();
-        bytes.write(&u16::to_be(0x89ab));
-        assert_eq!(bytes.0, [0x01, 0x23, 0x45, 0x67, 0x89, 0xab]);
-
-        let mut bytes = data.clone();
-        assert_eq!(bytes.write_at(0, &u16::to_be(0x89ab)), Ok(()));
-        assert_eq!(bytes.0, [0x89, 0xab, 0x45, 0x67]);
-
-        let mut bytes = data.clone();
-        assert_eq!(bytes.write_at(2, &u16::to_be(0x89ab)), Ok(()));
-        assert_eq!(bytes.0, [0x01, 0x23, 0x89, 0xab]);
-
-        assert_eq!(bytes.write_at(3, &u16::to_be(0x89ab)), Err(()));
-        assert_eq!(bytes.write_at(4, &u16::to_be(0x89ab)), Err(()));
-        assert_eq!(
-            BytesMut::default().write_at(0, &u32::to_be(0x89ab)),
-            Err(())
-        );
-    }
-
-    #[test]
-    fn bytes_debug() {
-        assert_eq!(format!("{:?}", Bytes(&[])), "[]");
-        assert_eq!(format!("{:?}", Bytes(&[0x01])), "[0x01]");
-        assert_eq!(
-            format!(
-                "{:?}",
-                Bytes(&[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08])
-            ),
-            "[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08]"
-        );
-        assert_eq!(
-            format!(
-                "{:?}",
-                Bytes(&[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09])
-            ),
-            "[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, ...; 9]"
-        );
-
-        assert_eq!(format!("{:?}", BytesMut(vec![])), "[]");
-        assert_eq!(
-            format!(
-                "{:?}",
-                BytesMut(vec![0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09])
-            ),
-            "[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, ...; 9]"
-        );
+        assert_eq!(slice_from_bytes_mut::<u16>(bytes_mut, 5), Err(()));
+        assert_eq!(slice_from_bytes_mut::<u16>(&mut bytes_mut[2..], 4), Err(()));
+        assert_eq!(slice_from_bytes_mut::<u16>(&mut bytes_mut[1..], 2), Err(()));
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/any.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/any.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/any.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/any.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,6 @@
 use alloc::fmt;
+use alloc::vec::Vec;
+use core::marker::PhantomData;
 
 #[cfg(feature = "coff")]
 use crate::read::coff;
@@ -11,11 +13,14 @@
 #[cfg(feature = "wasm")]
 use crate::read::wasm;
 use crate::read::{
-    self, Architecture, BinaryFormat, ComdatKind, CompressedData, Error, FileFlags, Object,
-    ObjectComdat, ObjectMap, ObjectSection, ObjectSegment, ObjectSymbol, ObjectSymbolTable,
-    Relocation, Result, SectionFlags, SectionIndex, SectionKind, SymbolFlags, SymbolIndex,
-    SymbolKind, SymbolMap, SymbolMapName, SymbolScope, SymbolSection,
+    self, Architecture, BinaryFormat, CodeView, ComdatKind, CompressedData, CompressedFileRange,
+    Error, Export, FileFlags, FileKind, Import, Object, ObjectComdat, ObjectMap, ObjectSection,
+    ObjectSegment, ObjectSymbol, ObjectSymbolTable, ReadRef, Relocation, Result, SectionFlags,
+    SectionIndex, SectionKind, SymbolFlags, SymbolIndex, SymbolKind, SymbolMap, SymbolMapName,
+    SymbolScope, SymbolSection,
 };
+#[allow(unused_imports)]
+use crate::Endianness;
 
 /// Evaluate an expression on the contents of a file format enum.
 ///
@@ -114,6 +119,29 @@
     };
 }
 
+macro_rules! map_inner_option_mut {
+    ($inner:expr, $from:ident, $to:ident, | $var:ident | $body:expr) => {
+        match $inner {
+            #[cfg(feature = "coff")]
+            $from::Coff(ref mut $var) => $body.map($to::Coff),
+            #[cfg(feature = "elf")]
+            $from::Elf32(ref mut $var) => $body.map($to::Elf32),
+            #[cfg(feature = "elf")]
+            $from::Elf64(ref mut $var) => $body.map($to::Elf64),
+            #[cfg(feature = "macho")]
+            $from::MachO32(ref mut $var) => $body.map($to::MachO32),
+            #[cfg(feature = "macho")]
+            $from::MachO64(ref mut $var) => $body.map($to::MachO64),
+            #[cfg(feature = "pe")]
+            $from::Pe32(ref mut $var) => $body.map($to::Pe32),
+            #[cfg(feature = "pe")]
+            $from::Pe64(ref mut $var) => $body.map($to::Pe64),
+            #[cfg(feature = "wasm")]
+            $from::Wasm(ref mut $var) => $body.map($to::Wasm),
+        }
+    };
+}
+
 /// Call `next` for a file format iterator.
 macro_rules! next_inner {
     ($inner:expr, $from:ident, $to:ident) => {
@@ -142,81 +170,75 @@
 ///
 /// Most functionality is provided by the `Object` trait implementation.
 #[derive(Debug)]
-pub struct File<'data> {
-    inner: FileInternal<'data>,
+pub struct File<'data, R: ReadRef<'data> = &'data [u8]> {
+    inner: FileInternal<'data, R>,
 }
 
-#[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
-enum FileInternal<'data> {
+enum FileInternal<'data, R: ReadRef<'data>> {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffFile<'data>),
+    Coff(coff::CoffFile<'data, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfFile32<'data>),
+    Elf32(elf::ElfFile32<'data, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfFile64<'data>),
+    Elf64(elf::ElfFile64<'data, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachOFile32<'data>),
+    MachO32(macho::MachOFile32<'data, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachOFile64<'data>),
+    MachO64(macho::MachOFile64<'data, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeFile32<'data>),
+    Pe32(pe::PeFile32<'data, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeFile64<'data>),
+    Pe64(pe::PeFile64<'data, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmFile<'data>),
+    Wasm(wasm::WasmFile<'data, R>),
 }
 
-impl<'data> File<'data> {
+impl<'data, R: ReadRef<'data>> File<'data, R> {
     /// Parse the raw file data.
-    pub fn parse(data: &'data [u8]) -> Result<Self> {
-        if data.len() < 16 {
-            return Err(Error("File too short"));
-        }
-
-        let inner = match [data[0], data[1], data[2], data[3], data[4]] {
-            // 32-bit ELF
+    pub fn parse(data: R) -> Result<Self> {
+        let inner = match FileKind::parse(data)? {
             #[cfg(feature = "elf")]
-            [0x7f, b'E', b'L', b'F', 1] => FileInternal::Elf32(elf::ElfFile32::parse(data)?),
-            // 64-bit ELF
+            FileKind::Elf32 => FileInternal::Elf32(elf::ElfFile32::parse(data)?),
             #[cfg(feature = "elf")]
-            [0x7f, b'E', b'L', b'F', 2] => FileInternal::Elf64(elf::ElfFile64::parse(data)?),
-            // 32-bit Mach-O
+            FileKind::Elf64 => FileInternal::Elf64(elf::ElfFile64::parse(data)?),
             #[cfg(feature = "macho")]
-            [0xfe, 0xed, 0xfa, 0xce, _]
-            | [0xce, 0xfa, 0xed, 0xfe, _] => FileInternal::MachO32(macho::MachOFile32::parse(data)?),
-            // 64-bit Mach-O
+            FileKind::MachO32 => FileInternal::MachO32(macho::MachOFile32::parse(data)?),
             #[cfg(feature = "macho")]
-            | [0xfe, 0xed, 0xfa, 0xcf, _]
-            | [0xcf, 0xfa, 0xed, 0xfe, _] => FileInternal::MachO64(macho::MachOFile64::parse(data)?),
-            // WASM
+            FileKind::MachO64 => FileInternal::MachO64(macho::MachOFile64::parse(data)?),
             #[cfg(feature = "wasm")]
-            [0x00, b'a', b's', b'm', _] => FileInternal::Wasm(wasm::WasmFile::parse(data)?),
-            // MS-DOS, assume stub for Windows PE32 or PE32+
+            FileKind::Wasm => FileInternal::Wasm(wasm::WasmFile::parse(data)?),
             #[cfg(feature = "pe")]
-            [b'M', b'Z', _, _, _] => {
-                // `optional_header_magic` doesn't care if it's `PeFile32` and `PeFile64`.
-                match pe::PeFile64::optional_header_magic(data) {
-                    Ok(crate::pe::IMAGE_NT_OPTIONAL_HDR32_MAGIC) => {
-                        FileInternal::Pe32(pe::PeFile32::parse(data)?)
-                    }
-                    Ok(crate::pe::IMAGE_NT_OPTIONAL_HDR64_MAGIC) => {
-                        FileInternal::Pe64(pe::PeFile64::parse(data)?)
-                    }
-                    _ => return Err(Error("Unknown MS-DOS file")),
-                }
-            }
-            // TODO: more COFF machines
+            FileKind::Pe32 => FileInternal::Pe32(pe::PeFile32::parse(data)?),
+            #[cfg(feature = "pe")]
+            FileKind::Pe64 => FileInternal::Pe64(pe::PeFile64::parse(data)?),
             #[cfg(feature = "coff")]
-            // COFF x86
-            [0x4c, 0x01, _, _, _]
-            // COFF x86-64
-            | [0x64, 0x86, _, _, _] => FileInternal::Coff(coff::CoffFile::parse(data)?),
-            _ => return Err(Error("Unknown file magic")),
+            FileKind::Coff => FileInternal::Coff(coff::CoffFile::parse(data)?),
+            #[allow(unreachable_patterns)]
+            _ => return Err(Error("Unsupported file format")),
         };
         Ok(File { inner })
     }
 
+    /// Parse the raw file data at an arbitrary offset inside the input data.
+    ///
+    /// Currently, this is only supported for Mach-O images.
+    /// This can be used for parsing Mach-O images inside the dyld shared cache,
+    /// where multiple images, located at different offsets, share the same address
+    /// space.
+    pub fn parse_at(data: R, offset: u64) -> Result<Self> {
+        let _inner = match FileKind::parse_at(data, offset)? {
+            #[cfg(feature = "macho")]
+            FileKind::MachO32 => FileInternal::MachO32(macho::MachOFile32::parse_at(data, offset)?),
+            #[cfg(feature = "macho")]
+            FileKind::MachO64 => FileInternal::MachO64(macho::MachOFile64::parse_at(data, offset)?),
+            #[allow(unreachable_patterns)]
+            _ => return Err(Error("Unsupported file format")),
+        };
+        #[allow(unreachable_code)]
+        Ok(File { inner: _inner })
+    }
+
     /// Return the file format.
     pub fn format(&self) -> BinaryFormat {
         match self.inner {
@@ -234,21 +256,23 @@
     }
 }
 
-impl<'data> read::private::Sealed for File<'data> {}
+impl<'data, R: ReadRef<'data>> read::private::Sealed for File<'data, R> {}
 
-impl<'data, 'file> Object<'data, 'file> for File<'data>
+impl<'data, 'file, R> Object<'data, 'file> for File<'data, R>
 where
     'data: 'file,
+    R: 'file + ReadRef<'data>,
 {
-    type Segment = Segment<'data, 'file>;
-    type SegmentIterator = SegmentIterator<'data, 'file>;
-    type Section = Section<'data, 'file>;
-    type SectionIterator = SectionIterator<'data, 'file>;
-    type Comdat = Comdat<'data, 'file>;
-    type ComdatIterator = ComdatIterator<'data, 'file>;
-    type Symbol = Symbol<'data, 'file>;
-    type SymbolIterator = SymbolIterator<'data, 'file>;
-    type SymbolTable = SymbolTable<'data, 'file>;
+    type Segment = Segment<'data, 'file, R>;
+    type SegmentIterator = SegmentIterator<'data, 'file, R>;
+    type Section = Section<'data, 'file, R>;
+    type SectionIterator = SectionIterator<'data, 'file, R>;
+    type Comdat = Comdat<'data, 'file, R>;
+    type ComdatIterator = ComdatIterator<'data, 'file, R>;
+    type Symbol = Symbol<'data, 'file, R>;
+    type SymbolIterator = SymbolIterator<'data, 'file, R>;
+    type SymbolTable = SymbolTable<'data, 'file, R>;
+    type DynamicRelocationIterator = DynamicRelocationIterator<'data, 'file, R>;
 
     fn architecture(&self) -> Architecture {
         with_inner!(self.inner, FileInternal, |x| x.architecture())
@@ -262,71 +286,98 @@
         with_inner!(self.inner, FileInternal, |x| x.is_64())
     }
 
-    fn segments(&'file self) -> SegmentIterator<'data, 'file> {
+    fn segments(&'file self) -> SegmentIterator<'data, 'file, R> {
         SegmentIterator {
             inner: map_inner!(self.inner, FileInternal, SegmentIteratorInternal, |x| x
                 .segments()),
         }
     }
 
-    fn section_by_name(&'file self, section_name: &str) -> Option<Section<'data, 'file>> {
+    fn section_by_name(&'file self, section_name: &str) -> Option<Section<'data, 'file, R>> {
         map_inner_option!(self.inner, FileInternal, SectionInternal, |x| x
             .section_by_name(section_name))
         .map(|inner| Section { inner })
     }
 
-    fn section_by_index(&'file self, index: SectionIndex) -> Result<Section<'data, 'file>> {
+    fn section_by_index(&'file self, index: SectionIndex) -> Result<Section<'data, 'file, R>> {
         map_inner_option!(self.inner, FileInternal, SectionInternal, |x| x
             .section_by_index(index))
         .map(|inner| Section { inner })
     }
 
-    fn sections(&'file self) -> SectionIterator<'data, 'file> {
+    fn sections(&'file self) -> SectionIterator<'data, 'file, R> {
         SectionIterator {
             inner: map_inner!(self.inner, FileInternal, SectionIteratorInternal, |x| x
                 .sections()),
         }
     }
 
-    fn comdats(&'file self) -> ComdatIterator<'data, 'file> {
+    fn comdats(&'file self) -> ComdatIterator<'data, 'file, R> {
         ComdatIterator {
             inner: map_inner!(self.inner, FileInternal, ComdatIteratorInternal, |x| x
                 .comdats()),
         }
     }
 
-    fn symbol_by_index(&'file self, index: SymbolIndex) -> Result<Symbol<'data, 'file>> {
+    fn symbol_by_index(&'file self, index: SymbolIndex) -> Result<Symbol<'data, 'file, R>> {
         map_inner_option!(self.inner, FileInternal, SymbolInternal, |x| x
-            .symbol_by_index(index))
+            .symbol_by_index(index)
+            .map(|x| (x, PhantomData)))
         .map(|inner| Symbol { inner })
     }
 
-    fn symbols(&'file self) -> SymbolIterator<'data, 'file> {
+    fn symbols(&'file self) -> SymbolIterator<'data, 'file, R> {
         SymbolIterator {
-            inner: map_inner!(self.inner, FileInternal, SymbolIteratorInternal, |x| x
-                .symbols()),
+            inner: map_inner!(self.inner, FileInternal, SymbolIteratorInternal, |x| (
+                x.symbols(),
+                PhantomData
+            )),
         }
     }
 
-    fn symbol_table(&'file self) -> Option<SymbolTable<'data, 'file>> {
+    fn symbol_table(&'file self) -> Option<SymbolTable<'data, 'file, R>> {
         map_inner_option!(self.inner, FileInternal, SymbolTableInternal, |x| x
-            .symbol_table())
+            .symbol_table()
+            .map(|x| (x, PhantomData)))
         .map(|inner| SymbolTable { inner })
     }
 
-    fn dynamic_symbols(&'file self) -> SymbolIterator<'data, 'file> {
+    fn dynamic_symbols(&'file self) -> SymbolIterator<'data, 'file, R> {
         SymbolIterator {
-            inner: map_inner!(self.inner, FileInternal, SymbolIteratorInternal, |x| x
-                .dynamic_symbols()),
+            inner: map_inner!(self.inner, FileInternal, SymbolIteratorInternal, |x| (
+                x.dynamic_symbols(),
+                PhantomData
+            )),
         }
     }
 
-    fn dynamic_symbol_table(&'file self) -> Option<SymbolTable<'data, 'file>> {
+    fn dynamic_symbol_table(&'file self) -> Option<SymbolTable<'data, 'file, R>> {
         map_inner_option!(self.inner, FileInternal, SymbolTableInternal, |x| x
-            .dynamic_symbol_table())
+            .dynamic_symbol_table()
+            .map(|x| (x, PhantomData)))
         .map(|inner| SymbolTable { inner })
     }
 
+    #[cfg(feature = "elf")]
+    fn dynamic_relocations(&'file self) -> Option<DynamicRelocationIterator<'data, 'file, R>> {
+        let inner = match self.inner {
+            FileInternal::Elf32(ref elf) => {
+                DynamicRelocationIteratorInternal::Elf32(elf.dynamic_relocations()?)
+            }
+            FileInternal::Elf64(ref elf) => {
+                DynamicRelocationIteratorInternal::Elf64(elf.dynamic_relocations()?)
+            }
+            #[allow(unreachable_patterns)]
+            _ => return None,
+        };
+        Some(DynamicRelocationIterator { inner })
+    }
+
+    #[cfg(not(feature = "elf"))]
+    fn dynamic_relocations(&'file self) -> Option<DynamicRelocationIterator<'data, 'file, R>> {
+        None
+    }
+
     fn symbol_map(&self) -> SymbolMap<SymbolMapName<'data>> {
         with_inner!(self.inner, FileInternal, |x| x.symbol_map())
     }
@@ -335,6 +386,14 @@
         with_inner!(self.inner, FileInternal, |x| x.object_map())
     }
 
+    fn imports(&self) -> Result<Vec<Import<'data>>> {
+        with_inner!(self.inner, FileInternal, |x| x.imports())
+    }
+
+    fn exports(&self) -> Result<Vec<Export<'data>>> {
+        with_inner!(self.inner, FileInternal, |x| x.exports())
+    }
+
     fn has_debug_symbols(&self) -> bool {
         with_inner!(self.inner, FileInternal, |x| x.has_debug_symbols())
     }
@@ -354,6 +413,20 @@
         with_inner!(self.inner, FileInternal, |x| x.gnu_debuglink())
     }
 
+    #[inline]
+    fn gnu_debugaltlink(&self) -> Result<Option<(&'data [u8], &'data [u8])>> {
+        with_inner!(self.inner, FileInternal, |x| x.gnu_debugaltlink())
+    }
+
+    #[inline]
+    fn pdb_info(&self) -> Result<Option<CodeView>> {
+        with_inner!(self.inner, FileInternal, |x| x.pdb_info())
+    }
+
+    fn relative_address_base(&self) -> u64 {
+        with_inner!(self.inner, FileInternal, |x| x.relative_address_base())
+    }
+
     fn entry(&self) -> u64 {
         with_inner!(self.inner, FileInternal, |x| x.entry())
     }
@@ -365,38 +438,38 @@
 
 /// An iterator over the segments of a `File`.
 #[derive(Debug)]
-pub struct SegmentIterator<'data, 'file>
+pub struct SegmentIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]>
 where
     'data: 'file,
 {
-    inner: SegmentIteratorInternal<'data, 'file>,
+    inner: SegmentIteratorInternal<'data, 'file, R>,
 }
 
 #[derive(Debug)]
-enum SegmentIteratorInternal<'data, 'file>
+enum SegmentIteratorInternal<'data, 'file, R: ReadRef<'data>>
 where
     'data: 'file,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffSegmentIterator<'data, 'file>),
+    Coff(coff::CoffSegmentIterator<'data, 'file, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfSegmentIterator32<'data, 'file>),
+    Elf32(elf::ElfSegmentIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfSegmentIterator64<'data, 'file>),
+    Elf64(elf::ElfSegmentIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachOSegmentIterator32<'data, 'file>),
+    MachO32(macho::MachOSegmentIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachOSegmentIterator64<'data, 'file>),
+    MachO64(macho::MachOSegmentIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeSegmentIterator32<'data, 'file>),
+    Pe32(pe::PeSegmentIterator32<'data, 'file, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeSegmentIterator64<'data, 'file>),
+    Pe64(pe::PeSegmentIterator64<'data, 'file, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmSegmentIterator<'data, 'file>),
+    Wasm(wasm::WasmSegmentIterator<'data, 'file, R>),
 }
 
-impl<'data, 'file> Iterator for SegmentIterator<'data, 'file> {
-    type Item = Segment<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> Iterator for SegmentIterator<'data, 'file, R> {
+    type Item = Segment<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         next_inner!(self.inner, SegmentIteratorInternal, SegmentInternal)
@@ -405,37 +478,37 @@
 }
 
 /// A segment of a `File`.
-pub struct Segment<'data, 'file>
+pub struct Segment<'data, 'file, R: ReadRef<'data> = &'data [u8]>
 where
     'data: 'file,
 {
-    inner: SegmentInternal<'data, 'file>,
+    inner: SegmentInternal<'data, 'file, R>,
 }
 
 #[derive(Debug)]
-enum SegmentInternal<'data, 'file>
+enum SegmentInternal<'data, 'file, R: ReadRef<'data>>
 where
     'data: 'file,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffSegment<'data, 'file>),
+    Coff(coff::CoffSegment<'data, 'file, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfSegment32<'data, 'file>),
+    Elf32(elf::ElfSegment32<'data, 'file, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfSegment64<'data, 'file>),
+    Elf64(elf::ElfSegment64<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachOSegment32<'data, 'file>),
+    MachO32(macho::MachOSegment32<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachOSegment64<'data, 'file>),
+    MachO64(macho::MachOSegment64<'data, 'file, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeSegment32<'data, 'file>),
+    Pe32(pe::PeSegment32<'data, 'file, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeSegment64<'data, 'file>),
+    Pe64(pe::PeSegment64<'data, 'file, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmSegment<'data, 'file>),
+    Wasm(wasm::WasmSegment<'data, 'file, R>),
 }
 
-impl<'data, 'file> fmt::Debug for Segment<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> fmt::Debug for Segment<'data, 'file, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // It's painful to do much better than this
         let mut s = f.debug_struct("Segment");
@@ -454,9 +527,9 @@
     }
 }
 
-impl<'data, 'file> read::private::Sealed for Segment<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for Segment<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSegment<'data> for Segment<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> ObjectSegment<'data> for Segment<'data, 'file, R> {
     fn address(&self) -> u64 {
         with_inner!(self.inner, SegmentInternal, |x| x.address())
     }
@@ -488,39 +561,39 @@
 
 /// An iterator of the sections of a `File`.
 #[derive(Debug)]
-pub struct SectionIterator<'data, 'file>
+pub struct SectionIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]>
 where
     'data: 'file,
 {
-    inner: SectionIteratorInternal<'data, 'file>,
+    inner: SectionIteratorInternal<'data, 'file, R>,
 }
 
 // we wrap our enums in a struct so that they are kept private.
 #[derive(Debug)]
-enum SectionIteratorInternal<'data, 'file>
+enum SectionIteratorInternal<'data, 'file, R: ReadRef<'data>>
 where
     'data: 'file,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffSectionIterator<'data, 'file>),
+    Coff(coff::CoffSectionIterator<'data, 'file, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfSectionIterator32<'data, 'file>),
+    Elf32(elf::ElfSectionIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfSectionIterator64<'data, 'file>),
+    Elf64(elf::ElfSectionIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachOSectionIterator32<'data, 'file>),
+    MachO32(macho::MachOSectionIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachOSectionIterator64<'data, 'file>),
+    MachO64(macho::MachOSectionIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeSectionIterator32<'data, 'file>),
+    Pe32(pe::PeSectionIterator32<'data, 'file, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeSectionIterator64<'data, 'file>),
+    Pe64(pe::PeSectionIterator64<'data, 'file, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmSectionIterator<'data, 'file>),
+    Wasm(wasm::WasmSectionIterator<'data, 'file, R>),
 }
 
-impl<'data, 'file> Iterator for SectionIterator<'data, 'file> {
-    type Item = Section<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> Iterator for SectionIterator<'data, 'file, R> {
+    type Item = Section<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         next_inner!(self.inner, SectionIteratorInternal, SectionInternal)
@@ -529,36 +602,36 @@
 }
 
 /// A Section of a File
-pub struct Section<'data, 'file>
+pub struct Section<'data, 'file, R: ReadRef<'data> = &'data [u8]>
 where
     'data: 'file,
 {
-    inner: SectionInternal<'data, 'file>,
+    inner: SectionInternal<'data, 'file, R>,
 }
 
-enum SectionInternal<'data, 'file>
+enum SectionInternal<'data, 'file, R: ReadRef<'data>>
 where
     'data: 'file,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffSection<'data, 'file>),
+    Coff(coff::CoffSection<'data, 'file, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfSection32<'data, 'file>),
+    Elf32(elf::ElfSection32<'data, 'file, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfSection64<'data, 'file>),
+    Elf64(elf::ElfSection64<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachOSection32<'data, 'file>),
+    MachO32(macho::MachOSection32<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachOSection64<'data, 'file>),
+    MachO64(macho::MachOSection64<'data, 'file, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeSection32<'data, 'file>),
+    Pe32(pe::PeSection32<'data, 'file, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeSection64<'data, 'file>),
+    Pe64(pe::PeSection64<'data, 'file, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmSection<'data, 'file>),
+    Wasm(wasm::WasmSection<'data, 'file, R>),
 }
 
-impl<'data, 'file> fmt::Debug for Section<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> fmt::Debug for Section<'data, 'file, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // It's painful to do much better than this
         let mut s = f.debug_struct("Section");
@@ -581,10 +654,10 @@
     }
 }
 
-impl<'data, 'file> read::private::Sealed for Section<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for Section<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSection<'data> for Section<'data, 'file> {
-    type RelocationIterator = RelocationIterator<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> ObjectSection<'data> for Section<'data, 'file, R> {
+    type RelocationIterator = SectionRelocationIterator<'data, 'file, R>;
 
     fn index(&self) -> SectionIndex {
         with_inner!(self.inner, SectionInternal, |x| x.index())
@@ -614,6 +687,10 @@
         with_inner!(self.inner, SectionInternal, |x| x.data_range(address, size))
     }
 
+    fn compressed_file_range(&self) -> Result<CompressedFileRange> {
+        with_inner!(self.inner, SectionInternal, |x| x.compressed_file_range())
+    }
+
     fn compressed_data(&self) -> Result<CompressedData<'data>> {
         with_inner!(self.inner, SectionInternal, |x| x.compressed_data())
     }
@@ -630,12 +707,12 @@
         with_inner!(self.inner, SectionInternal, |x| x.kind())
     }
 
-    fn relocations(&self) -> RelocationIterator<'data, 'file> {
-        RelocationIterator {
+    fn relocations(&self) -> SectionRelocationIterator<'data, 'file, R> {
+        SectionRelocationIterator {
             inner: map_inner!(
                 self.inner,
                 SectionInternal,
-                RelocationIteratorInternal,
+                SectionRelocationIteratorInternal,
                 |x| x.relocations()
             ),
         }
@@ -648,38 +725,38 @@
 
 /// An iterator of the COMDAT section groups of a `File`.
 #[derive(Debug)]
-pub struct ComdatIterator<'data, 'file>
+pub struct ComdatIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]>
 where
     'data: 'file,
 {
-    inner: ComdatIteratorInternal<'data, 'file>,
+    inner: ComdatIteratorInternal<'data, 'file, R>,
 }
 
 #[derive(Debug)]
-enum ComdatIteratorInternal<'data, 'file>
+enum ComdatIteratorInternal<'data, 'file, R: ReadRef<'data>>
 where
     'data: 'file,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffComdatIterator<'data, 'file>),
+    Coff(coff::CoffComdatIterator<'data, 'file, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfComdatIterator32<'data, 'file>),
+    Elf32(elf::ElfComdatIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfComdatIterator64<'data, 'file>),
+    Elf64(elf::ElfComdatIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachOComdatIterator32<'data, 'file>),
+    MachO32(macho::MachOComdatIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachOComdatIterator64<'data, 'file>),
+    MachO64(macho::MachOComdatIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeComdatIterator32<'data, 'file>),
+    Pe32(pe::PeComdatIterator32<'data, 'file, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeComdatIterator64<'data, 'file>),
+    Pe64(pe::PeComdatIterator64<'data, 'file, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmComdatIterator<'data, 'file>),
+    Wasm(wasm::WasmComdatIterator<'data, 'file, R>),
 }
 
-impl<'data, 'file> Iterator for ComdatIterator<'data, 'file> {
-    type Item = Comdat<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> Iterator for ComdatIterator<'data, 'file, R> {
+    type Item = Comdat<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         next_inner!(self.inner, ComdatIteratorInternal, ComdatInternal)
@@ -688,36 +765,36 @@
 }
 
 /// A COMDAT section group of a `File`.
-pub struct Comdat<'data, 'file>
+pub struct Comdat<'data, 'file, R: ReadRef<'data> = &'data [u8]>
 where
     'data: 'file,
 {
-    inner: ComdatInternal<'data, 'file>,
+    inner: ComdatInternal<'data, 'file, R>,
 }
 
-enum ComdatInternal<'data, 'file>
+enum ComdatInternal<'data, 'file, R: ReadRef<'data>>
 where
     'data: 'file,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffComdat<'data, 'file>),
+    Coff(coff::CoffComdat<'data, 'file, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfComdat32<'data, 'file>),
+    Elf32(elf::ElfComdat32<'data, 'file, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfComdat64<'data, 'file>),
+    Elf64(elf::ElfComdat64<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachOComdat32<'data, 'file>),
+    MachO32(macho::MachOComdat32<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachOComdat64<'data, 'file>),
+    MachO64(macho::MachOComdat64<'data, 'file, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeComdat32<'data, 'file>),
+    Pe32(pe::PeComdat32<'data, 'file, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeComdat64<'data, 'file>),
+    Pe64(pe::PeComdat64<'data, 'file, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmComdat<'data, 'file>),
+    Wasm(wasm::WasmComdat<'data, 'file, R>),
 }
 
-impl<'data, 'file> fmt::Debug for Comdat<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> fmt::Debug for Comdat<'data, 'file, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut s = f.debug_struct("Comdat");
         s.field("symbol", &self.symbol())
@@ -727,10 +804,10 @@
     }
 }
 
-impl<'data, 'file> read::private::Sealed for Comdat<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for Comdat<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectComdat<'data> for Comdat<'data, 'file> {
-    type SectionIterator = ComdatSectionIterator<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> ObjectComdat<'data> for Comdat<'data, 'file, R> {
+    type SectionIterator = ComdatSectionIterator<'data, 'file, R>;
 
     fn kind(&self) -> ComdatKind {
         with_inner!(self.inner, ComdatInternal, |x| x.kind())
@@ -744,7 +821,7 @@
         with_inner!(self.inner, ComdatInternal, |x| x.name())
     }
 
-    fn sections(&self) -> ComdatSectionIterator<'data, 'file> {
+    fn sections(&self) -> ComdatSectionIterator<'data, 'file, R> {
         ComdatSectionIterator {
             inner: map_inner!(
                 self.inner,
@@ -758,37 +835,37 @@
 
 /// An iterator over COMDAT section entries.
 #[derive(Debug)]
-pub struct ComdatSectionIterator<'data, 'file>
+pub struct ComdatSectionIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]>
 where
     'data: 'file,
 {
-    inner: ComdatSectionIteratorInternal<'data, 'file>,
+    inner: ComdatSectionIteratorInternal<'data, 'file, R>,
 }
 
 #[derive(Debug)]
-enum ComdatSectionIteratorInternal<'data, 'file>
+enum ComdatSectionIteratorInternal<'data, 'file, R: ReadRef<'data>>
 where
     'data: 'file,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffComdatSectionIterator<'data, 'file>),
+    Coff(coff::CoffComdatSectionIterator<'data, 'file, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfComdatSectionIterator32<'data, 'file>),
+    Elf32(elf::ElfComdatSectionIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfComdatSectionIterator64<'data, 'file>),
+    Elf64(elf::ElfComdatSectionIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachOComdatSectionIterator32<'data, 'file>),
+    MachO32(macho::MachOComdatSectionIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachOComdatSectionIterator64<'data, 'file>),
+    MachO64(macho::MachOComdatSectionIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeComdatSectionIterator32<'data, 'file>),
+    Pe32(pe::PeComdatSectionIterator32<'data, 'file, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeComdatSectionIterator64<'data, 'file>),
+    Pe64(pe::PeComdatSectionIterator64<'data, 'file, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmComdatSectionIterator<'data, 'file>),
+    Wasm(wasm::WasmComdatSectionIterator<'data, 'file, R>),
 }
 
-impl<'data, 'file> Iterator for ComdatSectionIterator<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> Iterator for ComdatSectionIterator<'data, 'file, R> {
     type Item = SectionIndex;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -798,41 +875,63 @@
 
 /// A symbol table.
 #[derive(Debug)]
-pub struct SymbolTable<'data, 'file>
+pub struct SymbolTable<'data, 'file, R = &'data [u8]>
 where
     'data: 'file,
+    R: ReadRef<'data>,
 {
-    inner: SymbolTableInternal<'data, 'file>,
+    inner: SymbolTableInternal<'data, 'file, R>,
 }
 
 #[derive(Debug)]
-enum SymbolTableInternal<'data, 'file>
+enum SymbolTableInternal<'data, 'file, R>
 where
     'data: 'file,
+    R: ReadRef<'data>,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffSymbolTable<'data, 'file>),
+    Coff((coff::CoffSymbolTable<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfSymbolTable32<'data, 'file>),
-    #[cfg(feature = "elf")]
-    Elf64(elf::ElfSymbolTable64<'data, 'file>),
-    #[cfg(feature = "macho")]
-    MachO32(macho::MachOSymbolTable32<'data, 'file>),
-    #[cfg(feature = "macho")]
-    MachO64(macho::MachOSymbolTable64<'data, 'file>),
+    Elf32(
+        (
+            elf::ElfSymbolTable32<'data, 'file, Endianness, R>,
+            PhantomData<R>,
+        ),
+    ),
+    #[cfg(feature = "elf")]
+    Elf64(
+        (
+            elf::ElfSymbolTable64<'data, 'file, Endianness, R>,
+            PhantomData<R>,
+        ),
+    ),
+    #[cfg(feature = "macho")]
+    MachO32(
+        (
+            macho::MachOSymbolTable32<'data, 'file, Endianness, R>,
+            PhantomData<()>,
+        ),
+    ),
+    #[cfg(feature = "macho")]
+    MachO64(
+        (
+            macho::MachOSymbolTable64<'data, 'file, Endianness, R>,
+            PhantomData<()>,
+        ),
+    ),
     #[cfg(feature = "pe")]
-    Pe32(coff::CoffSymbolTable<'data, 'file>),
+    Pe32((coff::CoffSymbolTable<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "pe")]
-    Pe64(coff::CoffSymbolTable<'data, 'file>),
+    Pe64((coff::CoffSymbolTable<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmSymbolTable<'data, 'file>),
+    Wasm((wasm::WasmSymbolTable<'data, 'file>, PhantomData<R>)),
 }
 
-impl<'data, 'file> read::private::Sealed for SymbolTable<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for SymbolTable<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSymbolTable<'data> for SymbolTable<'data, 'file> {
-    type Symbol = Symbol<'data, 'file>;
-    type SymbolIterator = SymbolIterator<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> ObjectSymbolTable<'data> for SymbolTable<'data, 'file, R> {
+    type Symbol = Symbol<'data, 'file, R>;
+    type SymbolIterator = SymbolIterator<'data, 'file, R>;
 
     fn symbols(&self) -> Self::SymbolIterator {
         SymbolIterator {
@@ -840,90 +939,138 @@
                 self.inner,
                 SymbolTableInternal,
                 SymbolIteratorInternal,
-                |x| x.symbols()
+                |x| (x.0.symbols(), PhantomData)
             ),
         }
     }
 
     fn symbol_by_index(&self, index: SymbolIndex) -> Result<Self::Symbol> {
         map_inner_option!(self.inner, SymbolTableInternal, SymbolInternal, |x| x
-            .symbol_by_index(index))
+            .0
+            .symbol_by_index(index)
+            .map(|x| (x, PhantomData)))
         .map(|inner| Symbol { inner })
     }
 }
 
 /// An iterator over symbol table entries.
 #[derive(Debug)]
-pub struct SymbolIterator<'data, 'file>
+pub struct SymbolIterator<'data, 'file, R = &'data [u8]>
 where
     'data: 'file,
+    R: ReadRef<'data>,
 {
-    inner: SymbolIteratorInternal<'data, 'file>,
+    inner: SymbolIteratorInternal<'data, 'file, R>,
 }
 
 #[derive(Debug)]
-enum SymbolIteratorInternal<'data, 'file>
+enum SymbolIteratorInternal<'data, 'file, R>
 where
     'data: 'file,
+    R: ReadRef<'data>,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffSymbolIterator<'data, 'file>),
+    Coff((coff::CoffSymbolIterator<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfSymbolIterator32<'data, 'file>),
-    #[cfg(feature = "elf")]
-    Elf64(elf::ElfSymbolIterator64<'data, 'file>),
-    #[cfg(feature = "macho")]
-    MachO32(macho::MachOSymbolIterator32<'data, 'file>),
-    #[cfg(feature = "macho")]
-    MachO64(macho::MachOSymbolIterator64<'data, 'file>),
+    Elf32(
+        (
+            elf::ElfSymbolIterator32<'data, 'file, Endianness, R>,
+            PhantomData<R>,
+        ),
+    ),
+    #[cfg(feature = "elf")]
+    Elf64(
+        (
+            elf::ElfSymbolIterator64<'data, 'file, Endianness, R>,
+            PhantomData<R>,
+        ),
+    ),
+    #[cfg(feature = "macho")]
+    MachO32(
+        (
+            macho::MachOSymbolIterator32<'data, 'file, Endianness, R>,
+            PhantomData<()>,
+        ),
+    ),
+    #[cfg(feature = "macho")]
+    MachO64(
+        (
+            macho::MachOSymbolIterator64<'data, 'file, Endianness, R>,
+            PhantomData<()>,
+        ),
+    ),
     #[cfg(feature = "pe")]
-    Pe32(coff::CoffSymbolIterator<'data, 'file>),
+    Pe32((coff::CoffSymbolIterator<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "pe")]
-    Pe64(coff::CoffSymbolIterator<'data, 'file>),
+    Pe64((coff::CoffSymbolIterator<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmSymbolIterator<'data, 'file>),
+    Wasm((wasm::WasmSymbolIterator<'data, 'file>, PhantomData<R>)),
 }
 
-impl<'data, 'file> Iterator for SymbolIterator<'data, 'file> {
-    type Item = Symbol<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> Iterator for SymbolIterator<'data, 'file, R> {
+    type Item = Symbol<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        next_inner!(self.inner, SymbolIteratorInternal, SymbolInternal)
-            .map(|inner| Symbol { inner })
+        map_inner_option_mut!(self.inner, SymbolIteratorInternal, SymbolInternal, |iter| {
+            iter.0.next().map(|x| (x, PhantomData))
+        })
+        .map(|inner| Symbol { inner })
     }
 }
 
 /// A symbol table entry.
-pub struct Symbol<'data, 'file>
+pub struct Symbol<'data, 'file, R = &'data [u8]>
 where
     'data: 'file,
+    R: ReadRef<'data>,
 {
-    inner: SymbolInternal<'data, 'file>,
+    inner: SymbolInternal<'data, 'file, R>,
 }
 
-enum SymbolInternal<'data, 'file>
+enum SymbolInternal<'data, 'file, R>
 where
     'data: 'file,
+    R: ReadRef<'data>,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffSymbol<'data, 'file>),
-    #[cfg(feature = "elf")]
-    Elf32(elf::ElfSymbol32<'data, 'file>),
+    Coff((coff::CoffSymbol<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfSymbol64<'data, 'file>),
-    #[cfg(feature = "macho")]
-    MachO32(macho::MachOSymbol32<'data, 'file>),
-    #[cfg(feature = "macho")]
-    MachO64(macho::MachOSymbol64<'data, 'file>),
+    Elf32(
+        (
+            elf::ElfSymbol32<'data, 'file, Endianness, R>,
+            PhantomData<R>,
+        ),
+    ),
+    #[cfg(feature = "elf")]
+    Elf64(
+        (
+            elf::ElfSymbol64<'data, 'file, Endianness, R>,
+            PhantomData<R>,
+        ),
+    ),
+    #[cfg(feature = "macho")]
+    MachO32(
+        (
+            macho::MachOSymbol32<'data, 'file, Endianness, R>,
+            PhantomData<()>,
+        ),
+    ),
+    #[cfg(feature = "macho")]
+    MachO64(
+        (
+            macho::MachOSymbol64<'data, 'file, Endianness, R>,
+            PhantomData<()>,
+        ),
+    ),
     #[cfg(feature = "pe")]
-    Pe32(coff::CoffSymbol<'data, 'file>),
+    Pe32((coff::CoffSymbol<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "pe")]
-    Pe64(coff::CoffSymbol<'data, 'file>),
+    Pe64((coff::CoffSymbol<'data, 'file, R>, PhantomData<R>)),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmSymbol<'data, 'file>),
+    Wasm((wasm::WasmSymbol<'data, 'file>, PhantomData<R>)),
 }
 
-impl<'data, 'file> fmt::Debug for Symbol<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> fmt::Debug for Symbol<'data, 'file, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Symbol")
             .field("name", &self.name().unwrap_or("<invalid>"))
@@ -938,102 +1085,141 @@
     }
 }
 
-impl<'data, 'file> read::private::Sealed for Symbol<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for Symbol<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSymbol<'data> for Symbol<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> ObjectSymbol<'data> for Symbol<'data, 'file, R> {
     fn index(&self) -> SymbolIndex {
-        with_inner!(self.inner, SymbolInternal, |x| x.index())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.index())
     }
 
     fn name(&self) -> Result<&'data str> {
-        with_inner!(self.inner, SymbolInternal, |x| x.name())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.name())
     }
 
     fn address(&self) -> u64 {
-        with_inner!(self.inner, SymbolInternal, |x| x.address())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.address())
     }
 
     fn size(&self) -> u64 {
-        with_inner!(self.inner, SymbolInternal, |x| x.size())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.size())
     }
 
     fn kind(&self) -> SymbolKind {
-        with_inner!(self.inner, SymbolInternal, |x| x.kind())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.kind())
     }
 
     fn section(&self) -> SymbolSection {
-        with_inner!(self.inner, SymbolInternal, |x| x.section())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.section())
     }
 
     fn is_undefined(&self) -> bool {
-        with_inner!(self.inner, SymbolInternal, |x| x.is_undefined())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.is_undefined())
     }
 
     fn is_definition(&self) -> bool {
-        with_inner!(self.inner, SymbolInternal, |x| x.is_definition())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.is_definition())
     }
 
     fn is_common(&self) -> bool {
-        with_inner!(self.inner, SymbolInternal, |x| x.is_common())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.is_common())
     }
 
     fn is_weak(&self) -> bool {
-        with_inner!(self.inner, SymbolInternal, |x| x.is_weak())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.is_weak())
     }
 
     fn scope(&self) -> SymbolScope {
-        with_inner!(self.inner, SymbolInternal, |x| x.scope())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.scope())
     }
 
     fn is_global(&self) -> bool {
-        with_inner!(self.inner, SymbolInternal, |x| x.is_global())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.is_global())
     }
 
     fn is_local(&self) -> bool {
-        with_inner!(self.inner, SymbolInternal, |x| x.is_local())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.is_local())
     }
 
     fn flags(&self) -> SymbolFlags<SectionIndex> {
-        with_inner!(self.inner, SymbolInternal, |x| x.flags())
+        with_inner!(self.inner, SymbolInternal, |x| x.0.flags())
+    }
+}
+
+/// An iterator over dynamic relocation entries.
+#[derive(Debug)]
+pub struct DynamicRelocationIterator<'data, 'file, R = &'data [u8]>
+where
+    'data: 'file,
+    R: ReadRef<'data>,
+{
+    inner: DynamicRelocationIteratorInternal<'data, 'file, R>,
+}
+
+#[derive(Debug)]
+enum DynamicRelocationIteratorInternal<'data, 'file, R>
+where
+    'data: 'file,
+    R: ReadRef<'data>,
+{
+    #[cfg(feature = "elf")]
+    Elf32(elf::ElfDynamicRelocationIterator32<'data, 'file, Endianness, R>),
+    #[cfg(feature = "elf")]
+    Elf64(elf::ElfDynamicRelocationIterator64<'data, 'file, Endianness, R>),
+    // We need to always use the lifetime parameters.
+    #[allow(unused)]
+    None(PhantomData<(&'data (), &'file (), R)>),
+}
+
+impl<'data, 'file, R: ReadRef<'data>> Iterator for DynamicRelocationIterator<'data, 'file, R> {
+    type Item = (u64, Relocation);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.inner {
+            #[cfg(feature = "elf")]
+            DynamicRelocationIteratorInternal::Elf32(ref mut elf) => elf.next(),
+            #[cfg(feature = "elf")]
+            DynamicRelocationIteratorInternal::Elf64(ref mut elf) => elf.next(),
+            DynamicRelocationIteratorInternal::None(_) => None,
+        }
     }
 }
 
-/// An iterator over relocation entries
+/// An iterator over section relocation entries.
 #[derive(Debug)]
-pub struct RelocationIterator<'data, 'file>
+pub struct SectionRelocationIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]>
 where
     'data: 'file,
 {
-    inner: RelocationIteratorInternal<'data, 'file>,
+    inner: SectionRelocationIteratorInternal<'data, 'file, R>,
 }
 
 #[derive(Debug)]
-enum RelocationIteratorInternal<'data, 'file>
+enum SectionRelocationIteratorInternal<'data, 'file, R: ReadRef<'data>>
 where
     'data: 'file,
 {
     #[cfg(feature = "coff")]
-    Coff(coff::CoffRelocationIterator<'data, 'file>),
+    Coff(coff::CoffRelocationIterator<'data, 'file, R>),
     #[cfg(feature = "elf")]
-    Elf32(elf::ElfRelocationIterator32<'data, 'file>),
+    Elf32(elf::ElfSectionRelocationIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "elf")]
-    Elf64(elf::ElfRelocationIterator64<'data, 'file>),
+    Elf64(elf::ElfSectionRelocationIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO32(macho::MachORelocationIterator32<'data, 'file>),
+    MachO32(macho::MachORelocationIterator32<'data, 'file, Endianness, R>),
     #[cfg(feature = "macho")]
-    MachO64(macho::MachORelocationIterator64<'data, 'file>),
+    MachO64(macho::MachORelocationIterator64<'data, 'file, Endianness, R>),
     #[cfg(feature = "pe")]
-    Pe32(pe::PeRelocationIterator<'data, 'file>),
+    Pe32(pe::PeRelocationIterator<'data, 'file, R>),
     #[cfg(feature = "pe")]
-    Pe64(pe::PeRelocationIterator<'data, 'file>),
+    Pe64(pe::PeRelocationIterator<'data, 'file, R>),
     #[cfg(feature = "wasm")]
-    Wasm(wasm::WasmRelocationIterator<'data, 'file>),
+    Wasm(wasm::WasmRelocationIterator<'data, 'file, R>),
 }
 
-impl<'data, 'file> Iterator for RelocationIterator<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> Iterator for SectionRelocationIterator<'data, 'file, R> {
     type Item = (u64, Relocation);
 
     fn next(&mut self) -> Option<Self::Item> {
-        with_inner_mut!(self.inner, RelocationIteratorInternal, |x| x.next())
+        with_inner_mut!(self.inner, SectionRelocationIteratorInternal, |x| x.next())
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/archive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/archive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/archive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/archive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,54 +1,65 @@
 //! Support for archive files.
 
-use crate::read::{self, Error, ReadError};
-use crate::{archive, Bytes};
+use core::convert::TryInto;
+
+use crate::archive;
+use crate::read::{self, Error, ReadError, ReadRef};
 
 /// The kind of archive format.
-// TODO: Gnu64 and Darwin64 (and Darwin for writing)
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum ArchiveKind {
     /// There are no special files that indicate the archive format.
     Unknown,
     /// The GNU (or System V) archive format.
     Gnu,
+    /// The GNU (or System V) archive format with 64-bit symbol table.
+    Gnu64,
     /// The BSD archive format.
     Bsd,
+    /// The BSD archive format with 64-bit symbol table.
+    ///
+    /// This is used for Darwin.
+    Bsd64,
     /// The Windows COFF archive format.
     Coff,
 }
 
 /// A partially parsed archive file.
 #[derive(Debug)]
-pub struct ArchiveFile<'data> {
-    data: Bytes<'data>,
+pub struct ArchiveFile<'data, R: ReadRef<'data> = &'data [u8]> {
+    data: R,
+    len: u64,
+    offset: u64,
     kind: ArchiveKind,
-    symbols: Bytes<'data>,
-    names: Bytes<'data>,
+    symbols: (u64, u64),
+    names: &'data [u8],
 }
 
-impl<'data> ArchiveFile<'data> {
+impl<'data, R: ReadRef<'data>> ArchiveFile<'data, R> {
     /// Parse the archive header and special members.
-    pub fn parse(data: &'data [u8]) -> read::Result<Self> {
-        let data = Bytes(data);
-        let mut tail = data;
-
-        let magic = tail
-            .read_bytes(archive::MAGIC.len())
+    pub fn parse(data: R) -> read::Result<Self> {
+        let len = data.len().read_error("Unknown archive length")?;
+        let mut tail = 0;
+        let magic = data
+            .read_bytes(&mut tail, archive::MAGIC.len() as u64)
             .read_error("Invalid archive size")?;
-        if magic.0 != &archive::MAGIC[..] {
+        if magic != &archive::MAGIC[..] {
             return Err(Error("Unsupported archive identifier"));
         }
 
         let mut file = ArchiveFile {
-            data: tail,
+            data,
+            offset: tail,
+            len,
             kind: ArchiveKind::Unknown,
-            symbols: Bytes(&[]),
-            names: Bytes(&[]),
+            symbols: (0, 0),
+            names: &[],
         };
 
         // The first few members may be special, so parse them.
         // GNU has:
-        // - "/": symbol table (optional)
+        // - "/" or "/SYM64/": symbol table (optional)
         // - "//": names table (optional)
         // COFF has:
         // - "/": first linker member
@@ -56,46 +67,69 @@
         // - "//": names table
         // BSD has:
         // - "__.SYMDEF" or "__.SYMDEF SORTED": symbol table (optional)
-        if !tail.is_empty() {
-            let member = ArchiveMember::parse(&mut tail, Bytes(&[]))?;
+        // BSD 64-bit has:
+        // - "__.SYMDEF_64" or "__.SYMDEF_64 SORTED": symbol table (optional)
+        // BSD may use the extended name for the symbol table. This is handled
+        // by `ArchiveMember::parse`.
+        if tail < len {
+            let member = ArchiveMember::parse(data, &mut tail, &[])?;
             if member.name == b"/" {
                 // GNU symbol table (unless we later determine this is COFF).
                 file.kind = ArchiveKind::Gnu;
-                file.symbols = member.data;
-                file.data = tail;
+                file.symbols = member.file_range();
+                file.offset = tail;
 
-                if !tail.is_empty() {
-                    let member = ArchiveMember::parse(&mut tail, Bytes(&[]))?;
+                if tail < len {
+                    let member = ArchiveMember::parse(data, &mut tail, &[])?;
                     if member.name == b"/" {
                         // COFF linker member.
                         file.kind = ArchiveKind::Coff;
-                        file.symbols = member.data;
-                        file.data = tail;
+                        file.symbols = member.file_range();
+                        file.offset = tail;
 
-                        if !tail.is_empty() {
-                            let member = ArchiveMember::parse(&mut tail, Bytes(&[]))?;
+                        if tail < len {
+                            let member = ArchiveMember::parse(data, &mut tail, &[])?;
                             if member.name == b"//" {
                                 // COFF names table.
-                                file.names = member.data;
-                                file.data = tail;
+                                file.names = member.data(data)?;
+                                file.offset = tail;
                             }
                         }
                     } else if member.name == b"//" {
                         // GNU names table.
-                        file.names = member.data;
-                        file.data = tail;
+                        file.names = member.data(data)?;
+                        file.offset = tail;
+                    }
+                }
+            } else if member.name == b"/SYM64/" {
+                // GNU 64-bit symbol table.
+                file.kind = ArchiveKind::Gnu64;
+                file.symbols = member.file_range();
+                file.offset = tail;
+
+                if tail < len {
+                    let member = ArchiveMember::parse(data, &mut tail, &[])?;
+                    if member.name == b"//" {
+                        // GNU names table.
+                        file.names = member.data(data)?;
+                        file.offset = tail;
                     }
                 }
             } else if member.name == b"//" {
                 // GNU names table.
                 file.kind = ArchiveKind::Gnu;
-                file.names = member.data;
-                file.data = tail;
+                file.names = member.data(data)?;
+                file.offset = tail;
             } else if member.name == b"__.SYMDEF" || member.name == b"__.SYMDEF SORTED" {
                 // BSD symbol table.
                 file.kind = ArchiveKind::Bsd;
-                file.symbols = member.data;
-                file.data = tail;
+                file.symbols = member.file_range();
+                file.offset = tail;
+            } else if member.name == b"__.SYMDEF_64" || member.name == b"__.SYMDEF_64 SORTED" {
+                // BSD 64-bit symbol table.
+                file.kind = ArchiveKind::Bsd64;
+                file.symbols = member.file_range();
+                file.offset = tail;
             } else {
                 // TODO: This could still be a BSD file. We leave this as unknown for now.
             }
@@ -113,9 +147,11 @@
     ///
     /// This does not return special members.
     #[inline]
-    pub fn members(&self) -> ArchiveMemberIterator<'data> {
+    pub fn members(&self) -> ArchiveMemberIterator<'data, R> {
         ArchiveMemberIterator {
             data: self.data,
+            offset: self.offset,
+            len: self.len,
             names: self.names,
         }
     }
@@ -123,21 +159,23 @@
 
 /// An iterator over the members of an archive.
 #[derive(Debug)]
-pub struct ArchiveMemberIterator<'data> {
-    data: Bytes<'data>,
-    names: Bytes<'data>,
+pub struct ArchiveMemberIterator<'data, R: ReadRef<'data> = &'data [u8]> {
+    data: R,
+    offset: u64,
+    len: u64,
+    names: &'data [u8],
 }
 
-impl<'data> Iterator for ArchiveMemberIterator<'data> {
+impl<'data, R: ReadRef<'data>> Iterator for ArchiveMemberIterator<'data, R> {
     type Item = read::Result<ArchiveMember<'data>>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.data.is_empty() {
+        if self.offset >= self.len {
             return None;
         }
-        let member = ArchiveMember::parse(&mut self.data, self.names);
+        let member = ArchiveMember::parse(self.data, &mut self.offset, self.names);
         if member.is_err() {
-            self.data = Bytes(&[]);
+            self.offset = self.len;
         }
         Some(member)
     }
@@ -148,29 +186,35 @@
 pub struct ArchiveMember<'data> {
     header: &'data archive::Header,
     name: &'data [u8],
-    data: Bytes<'data>,
+    offset: u64,
+    size: u64,
 }
 
 impl<'data> ArchiveMember<'data> {
     /// Parse the archive member header, name, and file data.
     ///
     /// This reads the extended name (if any) and adjusts the file size.
-    fn parse(data: &mut Bytes<'data>, names: Bytes<'data>) -> read::Result<Self> {
+    fn parse<R: ReadRef<'data>>(
+        data: R,
+        offset: &mut u64,
+        names: &'data [u8],
+    ) -> read::Result<Self> {
         let header = data
-            .read::<archive::Header>()
+            .read::<archive::Header>(offset)
             .read_error("Invalid archive member header")?;
         if header.terminator != archive::TERMINATOR {
             return Err(Error("Invalid archive terminator"));
         }
 
-        let size =
-            parse_usize_digits(&header.size, 10).read_error("Invalid archive member size")?;
-        let mut file_data = data
-            .read_bytes(size)
+        let mut file_offset = *offset;
+        let mut file_size =
+            parse_u64_digits(&header.size, 10).read_error("Invalid archive member size")?;
+        *offset = offset
+            .checked_add(file_size)
             .read_error("Archive member size is too large")?;
         // Entries are padded to an even number of bytes.
-        if (size & 1) != 0 {
-            data.skip(1).ok();
+        if (file_size & 1) != 0 {
+            *offset = offset.saturating_add(1);
         }
 
         let name = if header.name[0] == b'/' && (header.name[1] as char).is_digit(10) {
@@ -179,23 +223,23 @@
                 .read_error("Invalid archive extended name offset")?
         } else if &header.name[..3] == b"#1/" && (header.name[3] as char).is_digit(10) {
             // Read file name from the start of the file data.
-            parse_bsd_extended_name(&header.name[3..], &mut file_data)
+            parse_bsd_extended_name(&header.name[3..], data, &mut file_offset, &mut file_size)
                 .read_error("Invalid archive extended name length")?
         } else if header.name[0] == b'/' {
-            let name_len =
-                (header.name.iter().position(|&x| x == b' ')).unwrap_or_else(|| header.name.len());
+            let name_len = memchr::memchr(b' ', &header.name).unwrap_or(header.name.len());
             &header.name[..name_len]
         } else {
-            let name_len = (header.name.iter().position(|&x| x == b'/'))
-                .or_else(|| header.name.iter().position(|&x| x == b' '))
-                .unwrap_or_else(|| header.name.len());
+            let name_len = memchr::memchr(b'/', &header.name)
+                .or_else(|| memchr::memchr(b' ', &header.name))
+                .unwrap_or(header.name.len());
             &header.name[..name_len]
         };
 
         Ok(ArchiveMember {
             header,
             name,
-            data: file_data,
+            offset: file_offset,
+            size: file_size,
         })
     }
 
@@ -215,80 +259,86 @@
 
     /// Parse the file modification timestamp from the header.
     #[inline]
-    pub fn date(&self) -> Option<usize> {
-        parse_usize_digits(&self.header.date, 10)
+    pub fn date(&self) -> Option<u64> {
+        parse_u64_digits(&self.header.date, 10)
     }
 
     /// Parse the user ID from the header.
     #[inline]
-    pub fn uid(&self) -> Option<usize> {
-        parse_usize_digits(&self.header.uid, 10)
+    pub fn uid(&self) -> Option<u64> {
+        parse_u64_digits(&self.header.uid, 10)
     }
 
     /// Parse the group ID from the header.
     #[inline]
-    pub fn gid(&self) -> Option<usize> {
-        parse_usize_digits(&self.header.gid, 10)
+    pub fn gid(&self) -> Option<u64> {
+        parse_u64_digits(&self.header.gid, 10)
     }
 
     /// Parse the file mode from the header.
     #[inline]
-    pub fn mode(&self) -> Option<usize> {
-        parse_usize_digits(&self.header.mode, 8)
+    pub fn mode(&self) -> Option<u64> {
+        parse_u64_digits(&self.header.mode, 8)
+    }
+
+    /// Return the offset and size of the file data.
+    pub fn file_range(&self) -> (u64, u64) {
+        (self.offset, self.size)
     }
 
     /// Return the file data.
     #[inline]
-    pub fn data(&self) -> &'data [u8] {
-        self.data.0
+    pub fn data<R: ReadRef<'data>>(&self, data: R) -> read::Result<&'data [u8]> {
+        data.read_bytes_at(self.offset, self.size)
+            .read_error("Archive member size is too large")
     }
 }
 
 // Ignores bytes starting from the first space.
-fn parse_usize_digits(digits: &[u8], radix: u32) -> Option<usize> {
-    let len = digits
-        .iter()
-        .position(|&x| x == b' ')
-        .unwrap_or_else(|| digits.len());
-    let digits = &digits[..len];
-    if digits.is_empty() {
+fn parse_u64_digits(digits: &[u8], radix: u32) -> Option<u64> {
+    if let [b' ', ..] = digits {
         return None;
     }
-    let mut result: usize = 0;
+    let mut result: u64 = 0;
     for &c in digits {
-        let x = (c as char).to_digit(radix)?;
-        result = result
-            .checked_mul(radix as usize)?
-            .checked_add(x as usize)?;
+        if c == b' ' {
+            return Some(result);
+        } else {
+            let x = (c as char).to_digit(radix)?;
+            result = result
+                .checked_mul(u64::from(radix))?
+                .checked_add(u64::from(x))?;
+        }
     }
     Some(result)
 }
 
-fn parse_sysv_extended_name<'data>(
-    digits: &[u8],
-    mut names: Bytes<'data>,
-) -> Result<&'data [u8], ()> {
-    let offset = parse_usize_digits(digits, 10).ok_or(())?;
-    names.skip(offset)?;
-    let name = match names.0.iter().position(|&x| x == b'/' || x == 0) {
-        Some(len) => names.read_bytes(len)?,
-        None => names,
+fn parse_sysv_extended_name<'data>(digits: &[u8], names: &'data [u8]) -> Result<&'data [u8], ()> {
+    let offset = parse_u64_digits(digits, 10).ok_or(())?;
+    let offset = offset.try_into().map_err(|_| ())?;
+    let name_data = names.get(offset..).ok_or(())?;
+    let name = match memchr::memchr2(b'/', b'\0', name_data) {
+        Some(len) => &name_data[..len],
+        None => name_data,
     };
-    Ok(name.0)
+    Ok(name)
 }
 
 /// Modifies `data` to start after the extended name.
-fn parse_bsd_extended_name<'data>(
+fn parse_bsd_extended_name<'data, R: ReadRef<'data>>(
     digits: &[u8],
-    data: &mut Bytes<'data>,
+    data: R,
+    offset: &mut u64,
+    size: &mut u64,
 ) -> Result<&'data [u8], ()> {
-    let len = parse_usize_digits(digits, 10).ok_or(())?;
-    let mut name_data = data.read_bytes(len)?;
-    let name = match name_data.0.iter().position(|&x| x == 0) {
-        Some(len) => name_data.read_bytes(len)?,
+    let len = parse_u64_digits(digits, 10).ok_or(())?;
+    *size = size.checked_sub(len).ok_or(())?;
+    let name_data = data.read_bytes(offset, len)?;
+    let name = match memchr::memchr(b'\0', name_data) {
+        Some(len) => &name_data[..len],
         None => name_data,
     };
-    Ok(name.0)
+    Ok(name)
 }
 
 #[cfg(test)]
@@ -298,21 +348,21 @@
     #[test]
     fn kind() {
         let data = b"!<arch>\n";
-        let archive = ArchiveFile::parse(data).unwrap();
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Unknown);
 
         let data = b"\
             !<arch>\n\
             /                                               4         `\n\
             0000";
-        let archive = ArchiveFile::parse(data).unwrap();
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Gnu);
 
         let data = b"\
             !<arch>\n\
             //                                              4         `\n\
             0000";
-        let archive = ArchiveFile::parse(data).unwrap();
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Gnu);
 
         let data = b"\
@@ -321,39 +371,76 @@
             0000\
             //                                              4         `\n\
             0000";
-        let archive = ArchiveFile::parse(data).unwrap();
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Gnu);
 
         let data = b"\
             !<arch>\n\
+            /SYM64/                                         4         `\n\
+            0000";
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
+        assert_eq!(archive.kind(), ArchiveKind::Gnu64);
+
+        let data = b"\
+            !<arch>\n\
+            /SYM64/                                         4         `\n\
+            0000\
+            //                                              4         `\n\
+            0000";
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
+        assert_eq!(archive.kind(), ArchiveKind::Gnu64);
+
+        let data = b"\
+            !<arch>\n\
             __.SYMDEF                                       4         `\n\
             0000";
-        let archive = ArchiveFile::parse(data).unwrap();
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Bsd);
 
         let data = b"\
             !<arch>\n\
             #1/9                                            13        `\n\
             __.SYMDEF0000";
-        let archive = ArchiveFile::parse(data).unwrap();
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Bsd);
 
         let data = b"\
             !<arch>\n\
             #1/16                                           20        `\n\
             __.SYMDEF SORTED0000";
-        let archive = ArchiveFile::parse(data).unwrap();
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Bsd);
 
         let data = b"\
             !<arch>\n\
+            __.SYMDEF_64                                    4         `\n\
+            0000";
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
+        assert_eq!(archive.kind(), ArchiveKind::Bsd64);
+
+        let data = b"\
+            !<arch>\n\
+            #1/12                                           16        `\n\
+            __.SYMDEF_640000";
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
+        assert_eq!(archive.kind(), ArchiveKind::Bsd64);
+
+        let data = b"\
+            !<arch>\n\
+            #1/19                                           23        `\n\
+            __.SYMDEF_64 SORTED0000";
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
+        assert_eq!(archive.kind(), ArchiveKind::Bsd64);
+
+        let data = b"\
+            !<arch>\n\
             /                                               4         `\n\
             0000\
             /                                               4         `\n\
             0000\
             //                                              4         `\n\
             0000";
-        let archive = ArchiveFile::parse(data).unwrap();
+        let archive = ArchiveFile::parse(&data[..]).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Coff);
     }
 
@@ -363,21 +450,28 @@
             !<arch>\n\
             //                                              18        `\n\
             0123456789abcdef/\n\
+            s p a c e/      0           0     0     644     4         `\n\
+            0000\
             0123456789abcde/0           0     0     644     3         `\n\
             odd\n\
             /0              0           0     0     644     4         `\n\
             even";
+        let data = &data[..];
         let archive = ArchiveFile::parse(data).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Gnu);
         let mut members = archive.members();
 
         let member = members.next().unwrap().unwrap();
+        assert_eq!(member.name(), b"s p a c e");
+        assert_eq!(member.data(data).unwrap(), &b"0000"[..]);
+
+        let member = members.next().unwrap().unwrap();
         assert_eq!(member.name(), b"0123456789abcde");
-        assert_eq!(member.data(), b"odd");
+        assert_eq!(member.data(data).unwrap(), &b"odd"[..]);
 
         let member = members.next().unwrap().unwrap();
         assert_eq!(member.name(), b"0123456789abcdef");
-        assert_eq!(member.data(), b"even");
+        assert_eq!(member.data(data).unwrap(), &b"even"[..]);
 
         assert!(members.next().is_none());
     }
@@ -390,17 +484,18 @@
             odd\n\
             #1/16           0           0     0     644     20        `\n\
             0123456789abcdefeven";
+        let data = &data[..];
         let archive = ArchiveFile::parse(data).unwrap();
         assert_eq!(archive.kind(), ArchiveKind::Unknown);
         let mut members = archive.members();
 
         let member = members.next().unwrap().unwrap();
         assert_eq!(member.name(), b"0123456789abcde");
-        assert_eq!(member.data(), b"odd");
+        assert_eq!(member.data(data).unwrap(), &b"odd"[..]);
 
         let member = members.next().unwrap().unwrap();
         assert_eq!(member.name(), b"0123456789abcdef");
-        assert_eq!(member.data(), b"even");
+        assert_eq!(member.data(data).unwrap(), &b"even"[..]);
 
         assert!(members.next().is_none());
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/comdat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/comdat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/comdat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/comdat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,32 +2,26 @@
 
 use crate::endian::LittleEndian as LE;
 use crate::pe;
-use crate::read::{self, ComdatKind, ObjectComdat, ReadError, Result, SectionIndex, SymbolIndex};
+use crate::read::{
+    self, ComdatKind, ObjectComdat, ReadError, ReadRef, Result, SectionIndex, SymbolIndex,
+};
 
 use super::CoffFile;
 
 /// An iterator over the COMDAT section groups of a `CoffFile`.
 #[derive(Debug)]
-pub struct CoffComdatIterator<'data, 'file>
-where
-    'data: 'file,
-{
-    pub(super) file: &'file CoffFile<'data>,
+pub struct CoffComdatIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]> {
+    pub(super) file: &'file CoffFile<'data, R>,
     pub(super) index: usize,
 }
 
-impl<'data, 'file> Iterator for CoffComdatIterator<'data, 'file> {
-    type Item = CoffComdat<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> Iterator for CoffComdatIterator<'data, 'file, R> {
+    type Item = CoffComdat<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         loop {
             let index = self.index;
-            let symbol = self
-                .file
-                .common
-                .symbols
-                .get::<pe::ImageSymbol>(index)
-                .ok()?;
+            let symbol = self.file.common.symbols.symbol(index).ok()?;
             self.index += 1 + symbol.number_of_aux_symbols as usize;
             if let Some(comdat) = CoffComdat::parse(self.file, symbol, index) {
                 return Some(comdat);
@@ -38,37 +32,26 @@
 
 /// A COMDAT section group of a `CoffFile`.
 #[derive(Debug)]
-pub struct CoffComdat<'data, 'file>
-where
-    'data: 'file,
-{
-    file: &'file CoffFile<'data>,
+pub struct CoffComdat<'data, 'file, R: ReadRef<'data> = &'data [u8]> {
+    file: &'file CoffFile<'data, R>,
     symbol_index: SymbolIndex,
     symbol: &'data pe::ImageSymbol,
     selection: u8,
 }
 
-impl<'data, 'file> CoffComdat<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> CoffComdat<'data, 'file, R> {
     fn parse(
-        file: &'file CoffFile<'data>,
+        file: &'file CoffFile<'data, R>,
         section_symbol: &'data pe::ImageSymbol,
         index: usize,
-    ) -> Option<CoffComdat<'data, 'file>> {
+    ) -> Option<CoffComdat<'data, 'file, R>> {
         // Must be a section symbol.
-        if section_symbol.value.get(LE) != 0
-            || section_symbol.base_type() != pe::IMAGE_SYM_TYPE_NULL
-            || section_symbol.storage_class != pe::IMAGE_SYM_CLASS_STATIC
-            || section_symbol.number_of_aux_symbols == 0
-        {
+        if !section_symbol.has_aux_section() {
             return None;
         }
 
         // Auxiliary record must have a non-associative selection.
-        let aux = file
-            .common
-            .symbols
-            .get::<pe::ImageAuxSymbolSection>(index + 1)
-            .ok()?;
+        let aux = file.common.symbols.aux_section(index).ok()?;
         let selection = aux.selection;
         if selection == 0 || selection == pe::IMAGE_COMDAT_SELECT_ASSOCIATIVE {
             return None;
@@ -80,11 +63,7 @@
         let section_number = section_symbol.section_number.get(LE);
         loop {
             symbol_index += 1 + symbol.number_of_aux_symbols as usize;
-            symbol = file
-                .common
-                .symbols
-                .get::<pe::ImageSymbol>(symbol_index)
-                .ok()?;
+            symbol = file.common.symbols.symbol(symbol_index).ok()?;
             if section_number == symbol.section_number.get(LE) {
                 break;
             }
@@ -99,10 +78,10 @@
     }
 }
 
-impl<'data, 'file> read::private::Sealed for CoffComdat<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for CoffComdat<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectComdat<'data> for CoffComdat<'data, 'file> {
-    type SectionIterator = CoffComdatSectionIterator<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> ObjectComdat<'data> for CoffComdat<'data, 'file, R> {
+    type SectionIterator = CoffComdatSectionIterator<'data, 'file, R>;
 
     #[inline]
     fn kind(&self) -> ComdatKind {
@@ -143,16 +122,13 @@
 
 /// An iterator over the sections in a COMDAT section group of a `CoffFile`.
 #[derive(Debug)]
-pub struct CoffComdatSectionIterator<'data, 'file>
-where
-    'data: 'file,
-{
-    file: &'file CoffFile<'data>,
+pub struct CoffComdatSectionIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]> {
+    file: &'file CoffFile<'data, R>,
     section_number: u16,
     index: usize,
 }
 
-impl<'data, 'file> Iterator for CoffComdatSectionIterator<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> Iterator for CoffComdatSectionIterator<'data, 'file, R> {
     type Item = SectionIndex;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -160,31 +136,17 @@
         // TODO: it seems gcc doesn't use associated symbols for this
         loop {
             let index = self.index;
-            let symbol = self
-                .file
-                .common
-                .symbols
-                .get::<pe::ImageSymbol>(index)
-                .ok()?;
+            let symbol = self.file.common.symbols.symbol(index).ok()?;
             self.index += 1 + symbol.number_of_aux_symbols as usize;
 
             // Must be a section symbol.
-            if symbol.value.get(LE) != 0
-                || symbol.base_type() != pe::IMAGE_SYM_TYPE_NULL
-                || symbol.storage_class != pe::IMAGE_SYM_CLASS_STATIC
-                || symbol.number_of_aux_symbols == 0
-            {
+            if !symbol.has_aux_section() {
                 continue;
             }
 
             let section_number = symbol.section_number.get(LE);
 
-            let aux = self
-                .file
-                .common
-                .symbols
-                .get::<pe::ImageAuxSymbolSection>(index + 1)
-                .ok()?;
+            let aux = self.file.common.symbols.aux_section(index).ok()?;
             if aux.selection == pe::IMAGE_COMDAT_SELECT_ASSOCIATIVE {
                 // TODO: use high_number for bigobj
                 if aux.number.get(LE) == self.section_number {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,11 @@
+use alloc::vec::Vec;
 use core::str;
 
 use crate::read::{
-    self, Architecture, FileFlags, Object, ObjectSection, ReadError, Result, SectionIndex,
-    SymbolIndex,
+    self, Architecture, Export, FileFlags, Import, NoDynamicRelocationIterator, Object,
+    ObjectSection, ReadError, ReadRef, Result, SectionIndex, SymbolIndex,
 };
-use crate::{pe, Bytes, LittleEndian as LE};
+use crate::{pe, LittleEndian as LE};
 
 use super::{
     CoffComdat, CoffComdatIterator, CoffSection, CoffSectionIterator, CoffSegment,
@@ -14,27 +15,27 @@
 
 /// The common parts of `PeFile` and `CoffFile`.
 #[derive(Debug)]
-pub(crate) struct CoffCommon<'data> {
+pub(crate) struct CoffCommon<'data, R: ReadRef<'data>> {
     pub(crate) sections: SectionTable<'data>,
     // TODO: ImageSymbolExBytes
-    pub(crate) symbols: SymbolTable<'data>,
+    pub(crate) symbols: SymbolTable<'data, R>,
     pub(crate) image_base: u64,
 }
 
 /// A COFF object file.
 #[derive(Debug)]
-pub struct CoffFile<'data> {
+pub struct CoffFile<'data, R: ReadRef<'data> = &'data [u8]> {
     pub(super) header: &'data pe::ImageFileHeader,
-    pub(super) common: CoffCommon<'data>,
-    pub(super) data: Bytes<'data>,
+    pub(super) common: CoffCommon<'data, R>,
+    pub(super) data: R,
 }
 
-impl<'data> CoffFile<'data> {
+impl<'data, R: ReadRef<'data>> CoffFile<'data, R> {
     /// Parse the raw COFF file data.
-    pub fn parse(data: &'data [u8]) -> Result<Self> {
-        let data = Bytes(data);
-        let (header, tail) = pe::ImageFileHeader::parse(data)?;
-        let sections = header.sections(tail)?;
+    pub fn parse(data: R) -> Result<Self> {
+        let mut offset = 0;
+        let header = pe::ImageFileHeader::parse(data, &mut offset)?;
+        let sections = header.sections(data, offset)?;
         let symbols = header.symbols(data)?;
 
         Ok(CoffFile {
@@ -49,24 +50,28 @@
     }
 }
 
-impl<'data> read::private::Sealed for CoffFile<'data> {}
+impl<'data, R: ReadRef<'data>> read::private::Sealed for CoffFile<'data, R> {}
 
-impl<'data, 'file> Object<'data, 'file> for CoffFile<'data>
+impl<'data, 'file, R> Object<'data, 'file> for CoffFile<'data, R>
 where
     'data: 'file,
+    R: 'file + ReadRef<'data>,
 {
-    type Segment = CoffSegment<'data, 'file>;
-    type SegmentIterator = CoffSegmentIterator<'data, 'file>;
-    type Section = CoffSection<'data, 'file>;
-    type SectionIterator = CoffSectionIterator<'data, 'file>;
-    type Comdat = CoffComdat<'data, 'file>;
-    type ComdatIterator = CoffComdatIterator<'data, 'file>;
-    type Symbol = CoffSymbol<'data, 'file>;
-    type SymbolIterator = CoffSymbolIterator<'data, 'file>;
-    type SymbolTable = CoffSymbolTable<'data, 'file>;
+    type Segment = CoffSegment<'data, 'file, R>;
+    type SegmentIterator = CoffSegmentIterator<'data, 'file, R>;
+    type Section = CoffSection<'data, 'file, R>;
+    type SectionIterator = CoffSectionIterator<'data, 'file, R>;
+    type Comdat = CoffComdat<'data, 'file, R>;
+    type ComdatIterator = CoffComdatIterator<'data, 'file, R>;
+    type Symbol = CoffSymbol<'data, 'file, R>;
+    type SymbolIterator = CoffSymbolIterator<'data, 'file, R>;
+    type SymbolTable = CoffSymbolTable<'data, 'file, R>;
+    type DynamicRelocationIterator = NoDynamicRelocationIterator;
 
     fn architecture(&self) -> Architecture {
         match self.header.machine.get(LE) {
+            pe::IMAGE_FILE_MACHINE_ARMNT => Architecture::Arm,
+            pe::IMAGE_FILE_MACHINE_ARM64 => Architecture::Aarch64,
             pe::IMAGE_FILE_MACHINE_I386 => Architecture::I386,
             pe::IMAGE_FILE_MACHINE_AMD64 => Architecture::X86_64,
             _ => Architecture::Unknown,
@@ -84,19 +89,19 @@
         false
     }
 
-    fn segments(&'file self) -> CoffSegmentIterator<'data, 'file> {
+    fn segments(&'file self) -> CoffSegmentIterator<'data, 'file, R> {
         CoffSegmentIterator {
             file: self,
             iter: self.common.sections.iter(),
         }
     }
 
-    fn section_by_name(&'file self, section_name: &str) -> Option<CoffSection<'data, 'file>> {
+    fn section_by_name(&'file self, section_name: &str) -> Option<CoffSection<'data, 'file, R>> {
         self.sections()
             .find(|section| section.name() == Ok(section_name))
     }
 
-    fn section_by_index(&'file self, index: SectionIndex) -> Result<CoffSection<'data, 'file>> {
+    fn section_by_index(&'file self, index: SectionIndex) -> Result<CoffSection<'data, 'file, R>> {
         let section = self.common.sections.section(index.0)?;
         Ok(CoffSection {
             file: self,
@@ -105,21 +110,21 @@
         })
     }
 
-    fn sections(&'file self) -> CoffSectionIterator<'data, 'file> {
+    fn sections(&'file self) -> CoffSectionIterator<'data, 'file, R> {
         CoffSectionIterator {
             file: self,
             iter: self.common.sections.iter().enumerate(),
         }
     }
 
-    fn comdats(&'file self) -> CoffComdatIterator<'data, 'file> {
+    fn comdats(&'file self) -> CoffComdatIterator<'data, 'file, R> {
         CoffComdatIterator {
             file: self,
             index: 0,
         }
     }
 
-    fn symbol_by_index(&'file self, index: SymbolIndex) -> Result<CoffSymbol<'data, 'file>> {
+    fn symbol_by_index(&'file self, index: SymbolIndex) -> Result<CoffSymbol<'data, 'file, R>> {
         let symbol = self.common.symbols.symbol(index.0)?;
         Ok(CoffSymbol {
             file: &self.common,
@@ -128,7 +133,7 @@
         })
     }
 
-    fn symbols(&'file self) -> CoffSymbolIterator<'data, 'file> {
+    fn symbols(&'file self) -> CoffSymbolIterator<'data, 'file, R> {
         CoffSymbolIterator {
             file: &self.common,
             index: 0,
@@ -136,11 +141,11 @@
     }
 
     #[inline]
-    fn symbol_table(&'file self) -> Option<CoffSymbolTable<'data, 'file>> {
+    fn symbol_table(&'file self) -> Option<CoffSymbolTable<'data, 'file, R>> {
         Some(CoffSymbolTable { file: &self.common })
     }
 
-    fn dynamic_symbols(&'file self) -> CoffSymbolIterator<'data, 'file> {
+    fn dynamic_symbols(&'file self) -> CoffSymbolIterator<'data, 'file, R> {
         CoffSymbolIterator {
             file: &self.common,
             // Hack: don't return any.
@@ -149,14 +154,35 @@
     }
 
     #[inline]
-    fn dynamic_symbol_table(&'file self) -> Option<CoffSymbolTable<'data, 'file>> {
+    fn dynamic_symbol_table(&'file self) -> Option<CoffSymbolTable<'data, 'file, R>> {
         None
     }
 
+    #[inline]
+    fn dynamic_relocations(&'file self) -> Option<NoDynamicRelocationIterator> {
+        None
+    }
+
+    #[inline]
+    fn imports(&self) -> Result<Vec<Import<'data>>> {
+        // TODO: this could return undefined symbols, but not needed yet.
+        Ok(Vec::new())
+    }
+
+    #[inline]
+    fn exports(&self) -> Result<Vec<Export<'data>>> {
+        // TODO: this could return global symbols, but not needed yet.
+        Ok(Vec::new())
+    }
+
     fn has_debug_symbols(&self) -> bool {
         self.section_by_name(".debug_info").is_some()
     }
 
+    fn relative_address_base(&self) -> u64 {
+        0
+    }
+
     #[inline]
     fn entry(&self) -> u64 {
         0
@@ -170,36 +196,46 @@
 }
 
 impl pe::ImageFileHeader {
-    /// Read the DOS header.
+    /// Read the file header.
     ///
-    /// The given data must be for the entire file.  Returns the data following the optional
-    /// header, which will contain the section headers.
-    pub fn parse<'data>(mut data: Bytes<'data>) -> read::Result<(&'data Self, Bytes<'data>)> {
+    /// `data` must be the entire file data.
+    /// `offset` must be the file header offset. It is updated to point after the optional header,
+    /// which is where the section headers are located.
+    pub fn parse<'data, R: ReadRef<'data>>(data: R, offset: &mut u64) -> read::Result<&'data Self> {
         let header = data
-            .read::<pe::ImageFileHeader>()
+            .read::<pe::ImageFileHeader>(offset)
             .read_error("Invalid COFF file header size or alignment")?;
 
         // Skip over the optional header.
-        data.skip(header.size_of_optional_header.get(LE) as usize)
+        *offset = offset
+            .checked_add(header.size_of_optional_header.get(LE).into())
             .read_error("Invalid COFF optional header size")?;
 
         // TODO: maybe validate that the machine is known?
-        Ok((header, data))
+        Ok(header)
     }
 
     /// Read the section table.
     ///
-    /// `tail` must be the data following the optional header.
+    /// `data` must be the entire file data.
+    /// `offset` must be after the optional file header.
     #[inline]
-    fn sections<'data>(&self, tail: Bytes<'data>) -> read::Result<SectionTable<'data>> {
-        SectionTable::parse(self, tail)
+    pub fn sections<'data, R: ReadRef<'data>>(
+        &self,
+        data: R,
+        offset: u64,
+    ) -> read::Result<SectionTable<'data>> {
+        SectionTable::parse(self, data, offset)
     }
 
     /// Read the symbol table and string table.
     ///
     /// `data` must be the entire file data.
     #[inline]
-    fn symbols<'data>(&self, data: Bytes<'data>) -> read::Result<SymbolTable<'data>> {
+    pub fn symbols<'data, R: ReadRef<'data>>(
+        &self,
+        data: R,
+    ) -> read::Result<SymbolTable<'data, R>> {
         SymbolTable::parse(self, data)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/relocation.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/relocation.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/relocation.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/relocation.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,22 +3,35 @@
 
 use crate::endian::LittleEndian as LE;
 use crate::pe;
-use crate::read::{Relocation, RelocationEncoding, RelocationKind, RelocationTarget, SymbolIndex};
+use crate::read::{
+    ReadRef, Relocation, RelocationEncoding, RelocationKind, RelocationTarget, SymbolIndex,
+};
 
 use super::CoffFile;
 
 /// An iterator over the relocations in a `CoffSection`.
-pub struct CoffRelocationIterator<'data, 'file> {
-    pub(super) file: &'file CoffFile<'data>,
+pub struct CoffRelocationIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]> {
+    pub(super) file: &'file CoffFile<'data, R>,
     pub(super) iter: slice::Iter<'data, pe::ImageRelocation>,
 }
 
-impl<'data, 'file> Iterator for CoffRelocationIterator<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> Iterator for CoffRelocationIterator<'data, 'file, R> {
     type Item = (u64, Relocation);
 
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next().map(|relocation| {
             let (kind, size, addend) = match self.file.header.machine.get(LE) {
+                pe::IMAGE_FILE_MACHINE_ARMNT => match relocation.typ.get(LE) {
+                    pe::IMAGE_REL_ARM_ADDR32 => (RelocationKind::Absolute, 32, 0),
+                    pe::IMAGE_REL_ARM_SECREL => (RelocationKind::SectionOffset, 32, 0),
+                    typ => (RelocationKind::Coff(typ), 0, 0),
+                },
+                pe::IMAGE_FILE_MACHINE_ARM64 => match relocation.typ.get(LE) {
+                    pe::IMAGE_REL_ARM64_ADDR32 => (RelocationKind::Absolute, 32, 0),
+                    pe::IMAGE_REL_ARM64_SECREL => (RelocationKind::SectionOffset, 32, 0),
+                    pe::IMAGE_REL_ARM64_ADDR64 => (RelocationKind::Absolute, 64, 0),
+                    typ => (RelocationKind::Coff(typ), 0, 0),
+                },
                 pe::IMAGE_FILE_MACHINE_I386 => match relocation.typ.get(LE) {
                     pe::IMAGE_REL_I386_DIR16 => (RelocationKind::Absolute, 16, 0),
                     pe::IMAGE_REL_I386_REL16 => (RelocationKind::Relative, 16, 0),
@@ -65,7 +78,7 @@
     }
 }
 
-impl<'data, 'file> fmt::Debug for CoffRelocationIterator<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> fmt::Debug for CoffRelocationIterator<'data, 'file, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("CoffRelocationIterator").finish()
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,11 +2,10 @@
 
 use crate::endian::LittleEndian as LE;
 use crate::pe;
-use crate::pod::Bytes;
 use crate::read::util::StringTable;
 use crate::read::{
-    self, CompressedData, Error, ObjectSection, ObjectSegment, ReadError, Result, SectionFlags,
-    SectionIndex, SectionKind,
+    self, CompressedData, CompressedFileRange, Error, ObjectSection, ObjectSegment, ReadError,
+    ReadRef, Result, SectionFlags, SectionIndex, SectionKind,
 };
 
 use super::{CoffFile, CoffRelocationIterator};
@@ -20,10 +19,15 @@
 impl<'data> SectionTable<'data> {
     /// Parse the section table.
     ///
-    /// `data` must be the data following the optional header.
-    pub fn parse(header: &pe::ImageFileHeader, mut data: Bytes<'data>) -> Result<Self> {
+    /// `data` must be the entire file data.
+    /// `offset` must be after the optional file header.
+    pub fn parse<R: ReadRef<'data>>(
+        header: &pe::ImageFileHeader,
+        data: R,
+        offset: u64,
+    ) -> Result<Self> {
         let sections = data
-            .read_slice(header.number_of_sections.get(LE) as usize)
+            .read_slice_at(offset, header.number_of_sections.get(LE).into())
             .read_error("Invalid COFF/PE section headers")?;
         Ok(SectionTable { sections })
     }
@@ -62,9 +66,9 @@
     /// The returned index is 1-based.
     ///
     /// Ignores sections with invalid names.
-    pub fn section_by_name(
+    pub fn section_by_name<R: ReadRef<'data>>(
         &self,
-        strings: StringTable<'data>,
+        strings: StringTable<'data, R>,
         name: &[u8],
     ) -> Option<(usize, &'data pe::ImageSectionHeader)> {
         self.sections
@@ -77,16 +81,13 @@
 
 /// An iterator over the loadable sections of a `CoffFile`.
 #[derive(Debug)]
-pub struct CoffSegmentIterator<'data, 'file>
-where
-    'data: 'file,
-{
-    pub(super) file: &'file CoffFile<'data>,
+pub struct CoffSegmentIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]> {
+    pub(super) file: &'file CoffFile<'data, R>,
     pub(super) iter: slice::Iter<'data, pe::ImageSectionHeader>,
 }
 
-impl<'data, 'file> Iterator for CoffSegmentIterator<'data, 'file> {
-    type Item = CoffSegment<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> Iterator for CoffSegmentIterator<'data, 'file, R> {
+    type Item = CoffSegment<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next().map(|section| CoffSegment {
@@ -98,25 +99,22 @@
 
 /// A loadable section of a `CoffFile`.
 #[derive(Debug)]
-pub struct CoffSegment<'data, 'file>
-where
-    'data: 'file,
-{
-    pub(super) file: &'file CoffFile<'data>,
+pub struct CoffSegment<'data, 'file, R: ReadRef<'data> = &'data [u8]> {
+    pub(super) file: &'file CoffFile<'data, R>,
     pub(super) section: &'data pe::ImageSectionHeader,
 }
 
-impl<'data, 'file> CoffSegment<'data, 'file> {
-    fn bytes(&self) -> Result<Bytes<'data>> {
+impl<'data, 'file, R: ReadRef<'data>> CoffSegment<'data, 'file, R> {
+    fn bytes(&self) -> Result<&'data [u8]> {
         self.section
-            .coff_bytes(self.file.data)
+            .coff_data(self.file.data)
             .read_error("Invalid COFF section offset or size")
     }
 }
 
-impl<'data, 'file> read::private::Sealed for CoffSegment<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for CoffSegment<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSegment<'data> for CoffSegment<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> ObjectSegment<'data> for CoffSegment<'data, 'file, R> {
     #[inline]
     fn address(&self) -> u64 {
         u64::from(self.section.virtual_address.get(LE))
@@ -139,11 +137,11 @@
     }
 
     fn data(&self) -> Result<&'data [u8]> {
-        Ok(self.bytes()?.0)
+        self.bytes()
     }
 
     fn data_range(&self, address: u64, size: u64) -> Result<Option<&'data [u8]>> {
-        Ok(read::data_range(
+        Ok(read::util::data_range(
             self.bytes()?,
             self.address(),
             address,
@@ -164,16 +162,13 @@
 
 /// An iterator over the sections of a `CoffFile`.
 #[derive(Debug)]
-pub struct CoffSectionIterator<'data, 'file>
-where
-    'data: 'file,
-{
-    pub(super) file: &'file CoffFile<'data>,
+pub struct CoffSectionIterator<'data, 'file, R: ReadRef<'data> = &'data [u8]> {
+    pub(super) file: &'file CoffFile<'data, R>,
     pub(super) iter: iter::Enumerate<slice::Iter<'data, pe::ImageSectionHeader>>,
 }
 
-impl<'data, 'file> Iterator for CoffSectionIterator<'data, 'file> {
-    type Item = CoffSection<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> Iterator for CoffSectionIterator<'data, 'file, R> {
+    type Item = CoffSection<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next().map(|(index, section)| CoffSection {
@@ -186,27 +181,24 @@
 
 /// A section of a `CoffFile`.
 #[derive(Debug)]
-pub struct CoffSection<'data, 'file>
-where
-    'data: 'file,
-{
-    pub(super) file: &'file CoffFile<'data>,
+pub struct CoffSection<'data, 'file, R: ReadRef<'data> = &'data [u8]> {
+    pub(super) file: &'file CoffFile<'data, R>,
     pub(super) index: SectionIndex,
     pub(super) section: &'data pe::ImageSectionHeader,
 }
 
-impl<'data, 'file> CoffSection<'data, 'file> {
-    fn bytes(&self) -> Result<Bytes<'data>> {
+impl<'data, 'file, R: ReadRef<'data>> CoffSection<'data, 'file, R> {
+    fn bytes(&self) -> Result<&'data [u8]> {
         self.section
-            .coff_bytes(self.file.data)
+            .coff_data(self.file.data)
             .read_error("Invalid COFF section offset or size")
     }
 }
 
-impl<'data, 'file> read::private::Sealed for CoffSection<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for CoffSection<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSection<'data> for CoffSection<'data, 'file> {
-    type RelocationIterator = CoffRelocationIterator<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> ObjectSection<'data> for CoffSection<'data, 'file, R> {
+    type RelocationIterator = CoffRelocationIterator<'data, 'file, R>;
 
     #[inline]
     fn index(&self) -> SectionIndex {
@@ -236,11 +228,11 @@
     }
 
     fn data(&self) -> Result<&'data [u8]> {
-        Ok(self.bytes()?.0)
+        self.bytes()
     }
 
     fn data_range(&self, address: u64, size: u64) -> Result<Option<&'data [u8]>> {
-        Ok(read::data_range(
+        Ok(read::util::data_range(
             self.bytes()?,
             self.address(),
             address,
@@ -249,6 +241,11 @@
     }
 
     #[inline]
+    fn compressed_file_range(&self) -> Result<CompressedFileRange> {
+        Ok(CompressedFileRange::none(self.file_range()))
+    }
+
+    #[inline]
     fn compressed_data(&self) -> Result<CompressedData<'data>> {
         self.data().map(CompressedData::none)
     }
@@ -271,10 +268,8 @@
         self.section.kind()
     }
 
-    fn relocations(&self) -> CoffRelocationIterator<'data, 'file> {
-        let pointer = self.section.pointer_to_relocations.get(LE) as usize;
-        let number = self.section.number_of_relocations.get(LE) as usize;
-        let relocations = self.file.data.read_slice_at(pointer, number).unwrap_or(&[]);
+    fn relocations(&self) -> CoffRelocationIterator<'data, 'file, R> {
+        let relocations = self.section.coff_relocations(self.file.data).unwrap_or(&[]);
         CoffRelocationIterator {
             file: self.file,
             iter: relocations.iter(),
@@ -289,33 +284,36 @@
 }
 
 impl pe::ImageSectionHeader {
-    /// Return the offset and size of the section in the file.
-    ///
-    /// Returns `None` for sections that have no data in the file.
-    fn coff_file_range(&self) -> Option<(u32, u32)> {
-        if self.characteristics.get(LE) & pe::IMAGE_SCN_CNT_UNINITIALIZED_DATA != 0 {
-            None
+    pub(crate) fn kind(&self) -> SectionKind {
+        let characteristics = self.characteristics.get(LE);
+        if characteristics & (pe::IMAGE_SCN_CNT_CODE | pe::IMAGE_SCN_MEM_EXECUTE) != 0 {
+            SectionKind::Text
+        } else if characteristics & pe::IMAGE_SCN_CNT_INITIALIZED_DATA != 0 {
+            if characteristics & pe::IMAGE_SCN_MEM_DISCARDABLE != 0 {
+                SectionKind::Other
+            } else if characteristics & pe::IMAGE_SCN_MEM_WRITE != 0 {
+                SectionKind::Data
+            } else {
+                SectionKind::ReadOnlyData
+            }
+        } else if characteristics & pe::IMAGE_SCN_CNT_UNINITIALIZED_DATA != 0 {
+            SectionKind::UninitializedData
+        } else if characteristics & pe::IMAGE_SCN_LNK_INFO != 0 {
+            SectionKind::Linker
         } else {
-            let offset = self.pointer_to_raw_data.get(LE);
-            // Note: virtual size is not used for COFF.
-            let size = self.size_of_raw_data.get(LE);
-            Some((offset, size))
+            SectionKind::Unknown
         }
     }
+}
 
-    /// Return the section data.
+impl pe::ImageSectionHeader {
+    /// Return the section name.
     ///
-    /// Returns `Ok(&[])` if the section has no data.
-    /// Returns `Err` for invalid values.
-    fn coff_bytes<'data>(&self, data: Bytes<'data>) -> result::Result<Bytes<'data>, ()> {
-        if let Some((offset, size)) = self.coff_file_range() {
-            data.read_bytes_at(offset as usize, size as usize)
-        } else {
-            Ok(Bytes(&[]))
-        }
-    }
-
-    pub(crate) fn name<'data>(&'data self, strings: StringTable<'data>) -> Result<&'data [u8]> {
+    /// This handles decoding names that are offsets into the symbol string table.
+    pub fn name<'data, R: ReadRef<'data>>(
+        &'data self,
+        strings: StringTable<'data, R>,
+    ) -> Result<&'data [u8]> {
         let bytes = &self.name;
         Ok(if bytes[0] == b'/' {
             let mut offset = 0;
@@ -345,35 +343,49 @@
                 .get(offset)
                 .read_error("Invalid COFF section name offset")?
         } else {
-            match bytes.iter().position(|&x| x == 0) {
-                Some(end) => &bytes[..end],
-                None => &bytes[..],
-            }
+            self.raw_name()
         })
     }
 
-    pub(crate) fn kind(&self) -> SectionKind {
-        let characteristics = self.characteristics.get(LE);
-        if characteristics & (pe::IMAGE_SCN_CNT_CODE | pe::IMAGE_SCN_MEM_EXECUTE) != 0 {
-            SectionKind::Text
-        } else if characteristics & pe::IMAGE_SCN_CNT_INITIALIZED_DATA != 0 {
-            if characteristics & pe::IMAGE_SCN_MEM_DISCARDABLE != 0 {
-                SectionKind::Other
-            } else if characteristics & pe::IMAGE_SCN_MEM_WRITE != 0 {
-                SectionKind::Data
-            } else {
-                SectionKind::ReadOnlyData
-            }
-        } else if characteristics & pe::IMAGE_SCN_CNT_UNINITIALIZED_DATA != 0 {
-            SectionKind::UninitializedData
-        } else if characteristics & pe::IMAGE_SCN_LNK_INFO != 0 {
-            SectionKind::Linker
+    /// Return the raw section name.
+    pub fn raw_name(&self) -> &[u8] {
+        let bytes = &self.name;
+        match memchr::memchr(b'\0', bytes) {
+            Some(end) => &bytes[..end],
+            None => &bytes[..],
+        }
+    }
+
+    /// Return the offset and size of the section in a COFF file.
+    ///
+    /// Returns `None` for sections that have no data in the file.
+    pub fn coff_file_range(&self) -> Option<(u32, u32)> {
+        if self.characteristics.get(LE) & pe::IMAGE_SCN_CNT_UNINITIALIZED_DATA != 0 {
+            None
         } else {
-            SectionKind::Unknown
+            let offset = self.pointer_to_raw_data.get(LE);
+            // Note: virtual size is not used for COFF.
+            let size = self.size_of_raw_data.get(LE);
+            Some((offset, size))
+        }
+    }
+
+    /// Return the section data in a COFF file.
+    ///
+    /// Returns `Ok(&[])` if the section has no data.
+    /// Returns `Err` for invalid values.
+    pub fn coff_data<'data, R: ReadRef<'data>>(&self, data: R) -> result::Result<&'data [u8], ()> {
+        if let Some((offset, size)) = self.coff_file_range() {
+            data.read_bytes_at(offset.into(), size.into())
+        } else {
+            Ok(&[])
         }
     }
 
-    fn coff_alignment(&self) -> u64 {
+    /// Return the section alignment in bytes.
+    ///
+    /// This is only valid for sections in a COFF file.
+    pub fn coff_alignment(&self) -> u64 {
         match self.characteristics.get(LE) & pe::IMAGE_SCN_ALIGN_MASK {
             pe::IMAGE_SCN_ALIGN_1BYTES => 1,
             pe::IMAGE_SCN_ALIGN_2BYTES => 2,
@@ -392,4 +404,17 @@
             _ => 16,
         }
     }
+
+    /// Read the relocations in a COFF file.
+    ///
+    /// `data` must be the entire file data.
+    pub fn coff_relocations<'data, R: ReadRef<'data>>(
+        &self,
+        data: R,
+    ) -> read::Result<&'data [pe::ImageRelocation]> {
+        let pointer = self.pointer_to_relocations.get(LE).into();
+        let number = self.number_of_relocations.get(LE).into();
+        data.read_slice_at(pointer, number)
+            .read_error("Invalid COFF relocation offset or number")
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/symbol.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/symbol.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/coff/symbol.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/coff/symbol.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,57 +6,56 @@
 use super::{CoffCommon, SectionTable};
 use crate::endian::{LittleEndian as LE, U32Bytes};
 use crate::pe;
-use crate::pod::{Bytes, Pod};
+use crate::pod::{bytes_of_slice, Pod};
 use crate::read::util::StringTable;
 use crate::read::{
-    self, ObjectSymbol, ObjectSymbolTable, ReadError, Result, SectionIndex, SymbolFlags,
-    SymbolIndex, SymbolKind, SymbolMap, SymbolMapEntry, SymbolScope, SymbolSection,
+    self, Bytes, ObjectSymbol, ObjectSymbolTable, ReadError, ReadRef, Result, SectionIndex,
+    SymbolFlags, SymbolIndex, SymbolKind, SymbolMap, SymbolMapEntry, SymbolScope, SymbolSection,
 };
 
 /// A table of symbol entries in a COFF or PE file.
 ///
 /// Also includes the string table used for the symbol names.
 #[derive(Debug)]
-pub struct SymbolTable<'data> {
+pub struct SymbolTable<'data, R = &'data [u8]>
+where
+    R: ReadRef<'data>,
+{
     symbols: &'data [pe::ImageSymbolBytes],
-    strings: StringTable<'data>,
+    strings: StringTable<'data, R>,
 }
 
-impl<'data> SymbolTable<'data> {
+impl<'data, R: ReadRef<'data>> SymbolTable<'data, R> {
     /// Read the symbol table.
-    pub fn parse(header: &pe::ImageFileHeader, mut data: Bytes<'data>) -> Result<Self> {
+    pub fn parse(header: &pe::ImageFileHeader, data: R) -> Result<Self> {
         // The symbol table may not be present.
-        let symbol_offset = header.pointer_to_symbol_table.get(LE) as usize;
-        let (symbols, strings) = if symbol_offset != 0 {
-            data.skip(symbol_offset)
-                .read_error("Invalid COFF symbol table offset")?;
+        let mut offset = header.pointer_to_symbol_table.get(LE).into();
+        let (symbols, strings) = if offset != 0 {
             let symbols = data
-                .read_slice(header.number_of_symbols.get(LE) as usize)
-                .read_error("Invalid COFF symbol table size")?;
+                .read_slice(&mut offset, header.number_of_symbols.get(LE) as usize)
+                .read_error("Invalid COFF symbol table offset or size")?;
 
             // Note: don't update data when reading length; the length includes itself.
             let length = data
-                .read_at::<U32Bytes<_>>(0)
+                .read_at::<U32Bytes<_>>(offset)
                 .read_error("Missing COFF string table")?
                 .get(LE);
-            let strings = data
-                .read_bytes(length as usize)
+            let str_end = offset
+                .checked_add(length as u64)
                 .read_error("Invalid COFF string table length")?;
+            let strings = StringTable::new(data, offset, str_end);
 
             (symbols, strings)
         } else {
-            (&[][..], Bytes(&[]))
+            (&[][..], StringTable::default())
         };
 
-        Ok(SymbolTable {
-            symbols,
-            strings: StringTable::new(strings),
-        })
+        Ok(SymbolTable { symbols, strings })
     }
 
     /// Return the string table used for the symbol names.
     #[inline]
-    pub fn strings(&self) -> StringTable<'data> {
+    pub fn strings(&self) -> StringTable<'data, R> {
         self.strings
     }
 
@@ -66,23 +65,67 @@
         self.symbols.is_empty()
     }
 
-    /// The number of symbols.
+    /// The number of symbol table entries.
+    ///
+    /// This includes auxiliary symbol table entries.
     #[inline]
     pub fn len(&self) -> usize {
         self.symbols.len()
     }
 
+    /// Iterate over the symbols.
+    #[inline]
+    pub fn iter<'table>(&'table self) -> SymbolIterator<'data, 'table, R> {
+        SymbolIterator {
+            symbols: self,
+            index: 0,
+        }
+    }
+
     /// Return the symbol table entry at the given index.
     #[inline]
     pub fn symbol(&self, index: usize) -> Result<&'data pe::ImageSymbol> {
-        self.get::<pe::ImageSymbol>(index)
+        self.get::<pe::ImageSymbol>(index, 0)
+    }
+
+    /// Return the auxiliary function symbol for the symbol table entry at the given index.
+    ///
+    /// Note that the index is of the symbol, not the first auxiliary record.
+    #[inline]
+    pub fn aux_function(&self, index: usize) -> Result<&'data pe::ImageAuxSymbolFunction> {
+        self.get::<pe::ImageAuxSymbolFunction>(index, 1)
     }
 
-    /// Return the symbol table entry or auxiliary record at the given index.
-    pub fn get<T: Pod>(&self, index: usize) -> Result<&'data T> {
-        let bytes = self
-            .symbols
-            .get(index)
+    /// Return the auxiliary section symbol for the symbol table entry at the given index.
+    ///
+    /// Note that the index is of the symbol, not the first auxiliary record.
+    #[inline]
+    pub fn aux_section(&self, index: usize) -> Result<&'data pe::ImageAuxSymbolSection> {
+        self.get::<pe::ImageAuxSymbolSection>(index, 1)
+    }
+
+    /// Return the auxiliary file name for the symbol table entry at the given index.
+    ///
+    /// Note that the index is of the symbol, not the first auxiliary record.
+    pub fn aux_file_name(&self, index: usize, aux_count: u8) -> Result<&'data [u8]> {
+        let entries = index
+            .checked_add(1)
+            .and_then(|x| Some(x..x.checked_add(aux_count.into())?))
+            .and_then(|x| self.symbols.get(x))
+            .read_error("Invalid COFF symbol index")?;
+        let bytes = bytes_of_slice(entries);
+        // The name is padded with nulls.
+        Ok(match memchr::memchr(b'\0', bytes) {
+            Some(end) => &bytes[..end],
+            None => bytes,
+        })
+    }
+
+    /// Return the symbol table entry or auxiliary record at the given index and offset.
+    pub fn get<T: Pod>(&self, index: usize, offset: usize) -> Result<&'data T> {
+        let bytes = index
+            .checked_add(offset)
+            .and_then(|x| self.symbols.get(x))
             .read_error("Invalid COFF symbol index")?;
         Bytes(&bytes.0[..])
             .read()
@@ -95,9 +138,7 @@
         f: F,
     ) -> SymbolMap<Entry> {
         let mut symbols = Vec::with_capacity(self.symbols.len());
-        let mut i = 0;
-        while let Ok(symbol) = self.symbol(i) {
-            i += 1 + symbol.number_of_aux_symbols as usize;
+        for (_, symbol) in self.iter() {
             if !symbol.is_definition() {
                 continue;
             }
@@ -109,11 +150,37 @@
     }
 }
 
+/// An iterator for symbol entries in a COFF or PE file.
+///
+/// Yields the index and symbol structure for each symbol.
+#[derive(Debug)]
+pub struct SymbolIterator<'data, 'table, R = &'data [u8]>
+where
+    R: ReadRef<'data>,
+{
+    symbols: &'table SymbolTable<'data, R>,
+    index: usize,
+}
+
+impl<'data, 'table, R: ReadRef<'data>> Iterator for SymbolIterator<'data, 'table, R> {
+    type Item = (usize, &'data pe::ImageSymbol);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let index = self.index;
+        let symbol = self.symbols.symbol(index).ok()?;
+        self.index += 1 + symbol.number_of_aux_symbols as usize;
+        Some((index, symbol))
+    }
+}
+
 impl pe::ImageSymbol {
     /// Parse a COFF symbol name.
     ///
     /// `strings` must be the string table used for symbol names.
-    pub fn name<'data>(&'data self, strings: StringTable<'data>) -> Result<&'data [u8]> {
+    pub fn name<'data, R: ReadRef<'data>>(
+        &'data self,
+        strings: StringTable<'data, R>,
+    ) -> Result<&'data [u8]> {
         if self.name[0] == 0 {
             // If the name starts with 0 then the last 4 bytes are a string table offset.
             let offset = u32::from_le_bytes(self.name[4..8].try_into().unwrap());
@@ -122,7 +189,7 @@
                 .read_error("Invalid COFF symbol name offset")
         } else {
             // The name is inline and padded with nulls.
-            Ok(match self.name.iter().position(|&x| x == 0) {
+            Ok(match memchr::memchr(b'\0', &self.name) {
                 Some(end) => &self.name[..end],
                 None => &self.name[..],
             })
@@ -148,33 +215,48 @@
         }
         match self.storage_class {
             pe::IMAGE_SYM_CLASS_STATIC => {
-                if self.value.get(LE) == 0 && self.number_of_aux_symbols > 0 {
-                    // This is a section symbol.
-                    false
-                } else {
-                    true
-                }
+                // Exclude section symbols.
+                !(self.value.get(LE) == 0 && self.number_of_aux_symbols > 0)
             }
             pe::IMAGE_SYM_CLASS_EXTERNAL | pe::IMAGE_SYM_CLASS_WEAK_EXTERNAL => true,
             _ => false,
         }
     }
+
+    /// Return true if the symbol has an auxiliary file name.
+    pub fn has_aux_file_name(&self) -> bool {
+        self.number_of_aux_symbols > 0 && self.storage_class == pe::IMAGE_SYM_CLASS_FILE
+    }
+
+    /// Return true if the symbol has an auxiliary function symbol.
+    pub fn has_aux_function(&self) -> bool {
+        self.number_of_aux_symbols > 0 && self.derived_type() == pe::IMAGE_SYM_DTYPE_FUNCTION
+    }
+
+    /// Return true if the symbol has an auxiliary section symbol.
+    pub fn has_aux_section(&self) -> bool {
+        self.number_of_aux_symbols > 0
+            && self.storage_class == pe::IMAGE_SYM_CLASS_STATIC
+            && self.value.get(LE) == 0
+    }
 }
 
 /// A symbol table of a `CoffFile`.
 #[derive(Debug, Clone, Copy)]
-pub struct CoffSymbolTable<'data, 'file>
+pub struct CoffSymbolTable<'data, 'file, R = &'data [u8]>
 where
-    'data: 'file,
+    R: ReadRef<'data>,
 {
-    pub(crate) file: &'file CoffCommon<'data>,
+    pub(crate) file: &'file CoffCommon<'data, R>,
 }
 
-impl<'data, 'file> read::private::Sealed for CoffSymbolTable<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for CoffSymbolTable<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSymbolTable<'data> for CoffSymbolTable<'data, 'file> {
-    type Symbol = CoffSymbol<'data, 'file>;
-    type SymbolIterator = CoffSymbolIterator<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> ObjectSymbolTable<'data>
+    for CoffSymbolTable<'data, 'file, R>
+{
+    type Symbol = CoffSymbol<'data, 'file, R>;
+    type SymbolIterator = CoffSymbolIterator<'data, 'file, R>;
 
     fn symbols(&self) -> Self::SymbolIterator {
         CoffSymbolIterator {
@@ -194,22 +276,22 @@
 }
 
 /// An iterator over the symbols of a `CoffFile`.
-pub struct CoffSymbolIterator<'data, 'file>
+pub struct CoffSymbolIterator<'data, 'file, R = &'data [u8]>
 where
-    'data: 'file,
+    R: ReadRef<'data>,
 {
-    pub(crate) file: &'file CoffCommon<'data>,
+    pub(crate) file: &'file CoffCommon<'data, R>,
     pub(crate) index: usize,
 }
 
-impl<'data, 'file> fmt::Debug for CoffSymbolIterator<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> fmt::Debug for CoffSymbolIterator<'data, 'file, R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("CoffSymbolIterator").finish()
     }
 }
 
-impl<'data, 'file> Iterator for CoffSymbolIterator<'data, 'file> {
-    type Item = CoffSymbol<'data, 'file>;
+impl<'data, 'file, R: ReadRef<'data>> Iterator for CoffSymbolIterator<'data, 'file, R> {
+    type Item = CoffSymbol<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         let index = self.index;
@@ -225,39 +307,28 @@
 
 /// A symbol of a `CoffFile`.
 #[derive(Debug, Clone, Copy)]
-pub struct CoffSymbol<'data, 'file>
+pub struct CoffSymbol<'data, 'file, R = &'data [u8]>
 where
-    'data: 'file,
+    R: ReadRef<'data>,
 {
-    pub(crate) file: &'file CoffCommon<'data>,
+    pub(crate) file: &'file CoffCommon<'data, R>,
     pub(crate) index: SymbolIndex,
     pub(crate) symbol: &'data pe::ImageSymbol,
 }
 
-impl<'data, 'file> read::private::Sealed for CoffSymbol<'data, 'file> {}
+impl<'data, 'file, R: ReadRef<'data>> read::private::Sealed for CoffSymbol<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSymbol<'data> for CoffSymbol<'data, 'file> {
+impl<'data, 'file, R: ReadRef<'data>> ObjectSymbol<'data> for CoffSymbol<'data, 'file, R> {
     #[inline]
     fn index(&self) -> SymbolIndex {
         self.index
     }
 
     fn name(&self) -> read::Result<&'data str> {
-        let name = if self.symbol.storage_class == pe::IMAGE_SYM_CLASS_FILE {
-            // The file name is in the following auxiliary symbol.
-            if self.symbol.number_of_aux_symbols > 0 {
-                let s = self
-                    .file
-                    .symbols
-                    .get::<pe::ImageSymbolBytes>(self.index.0 + 1)?;
-                // The name is padded with nulls.
-                match s.0.iter().position(|&x| x == 0) {
-                    Some(end) => &s.0[..end],
-                    None => &s.0[..],
-                }
-            } else {
-                &[][..]
-            }
+        let name = if self.symbol.has_aux_file_name() {
+            self.file
+                .symbols
+                .aux_file_name(self.index.0, self.symbol.number_of_aux_symbols)?
         } else {
             self.symbol.name(self.file.symbols.strings())?
         };
@@ -289,12 +360,8 @@
         match self.symbol.storage_class {
             pe::IMAGE_SYM_CLASS_STATIC => {
                 // Section symbols may duplicate the size from the section table.
-                if self.symbol.value.get(LE) == 0 && self.symbol.number_of_aux_symbols > 0 {
-                    if let Ok(aux) = self
-                        .file
-                        .symbols
-                        .get::<pe::ImageAuxSymbolSection>(self.index.0 + 1)
-                    {
+                if self.symbol.has_aux_section() {
+                    if let Ok(aux) = self.file.symbols.aux_section(self.index.0) {
                         u64::from(aux.length.get(LE))
                     } else {
                         0
@@ -308,15 +375,9 @@
                     // For undefined symbols, symbol.value is 0 and the size is 0.
                     // For common data, symbol.value is the size.
                     u64::from(self.symbol.value.get(LE))
-                } else if self.symbol.derived_type() == pe::IMAGE_SYM_DTYPE_FUNCTION
-                    && self.symbol.number_of_aux_symbols > 0
-                {
+                } else if self.symbol.has_aux_function() {
                     // Function symbols may have a size.
-                    if let Ok(aux) = self
-                        .file
-                        .symbols
-                        .get::<pe::ImageAuxSymbolFunction>(self.index.0 + 1)
-                    {
+                    if let Ok(aux) = self.file.symbols.aux_function(self.index.0) {
                         u64::from(aux.total_size.get(LE))
                     } else {
                         0
@@ -371,7 +432,7 @@
                     SymbolSection::Unknown
                 }
             }
-            index if index > 0 => SymbolSection::Section(SectionIndex(index as usize)),
+            index if index > 0 => SymbolSection::Section(SectionIndex(index.into())),
             _ => SymbolSection::Unknown,
         }
     }
@@ -425,15 +486,8 @@
     }
 
     fn flags(&self) -> SymbolFlags<SectionIndex> {
-        if self.symbol.storage_class == pe::IMAGE_SYM_CLASS_STATIC
-            && self.symbol.value.get(LE) == 0
-            && self.symbol.number_of_aux_symbols > 0
-        {
-            if let Ok(aux) = self
-                .file
-                .symbols
-                .get::<pe::ImageAuxSymbolSection>(self.index.0 + 1)
-            {
+        if self.symbol.has_aux_section() {
+            if let Ok(aux) = self.file.symbols.aux_section(self.index.0) {
                 // TODO: use high_number for bigobj
                 let number = aux.number.get(LE) as usize;
                 return SymbolFlags::CoffSection {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/comdat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/comdat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/comdat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/comdat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,31 +3,35 @@
 
 use crate::elf;
 use crate::endian::{Endianness, U32Bytes};
-use crate::pod::Bytes;
-use crate::read::{self, ComdatKind, ObjectComdat, ReadError, SectionIndex, SymbolIndex};
+use crate::read::{self, ComdatKind, ObjectComdat, ReadError, ReadRef, SectionIndex, SymbolIndex};
 
 use super::{ElfFile, FileHeader, SectionHeader, Sym};
 
 /// An iterator over the COMDAT section groups of an `ElfFile32`.
-pub type ElfComdatIterator32<'data, 'file, Endian = Endianness> =
-    ElfComdatIterator<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfComdatIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfComdatIterator<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// An iterator over the COMDAT section groups of an `ElfFile64`.
-pub type ElfComdatIterator64<'data, 'file, Endian = Endianness> =
-    ElfComdatIterator<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfComdatIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfComdatIterator<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// An iterator over the COMDAT section groups of an `ElfFile`.
 #[derive(Debug)]
-pub struct ElfComdatIterator<'data, 'file, Elf>
+pub struct ElfComdatIterator<'data, 'file, Elf, R = &'data [u8]>
 where
     'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file ElfFile<'data, Elf>,
+    pub(super) file: &'file ElfFile<'data, Elf, R>,
     pub(super) iter: iter::Enumerate<slice::Iter<'data, Elf::SectionHeader>>,
 }
 
-impl<'data, 'file, Elf: FileHeader> Iterator for ElfComdatIterator<'data, 'file, Elf> {
-    type Item = ElfComdat<'data, 'file, Elf>;
+impl<'data, 'file, Elf, R> Iterator for ElfComdatIterator<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+    type Item = ElfComdat<'data, 'file, Elf, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         while let Some((index, section)) = self.iter.next() {
@@ -40,52 +44,61 @@
 }
 
 /// A COMDAT section group of an `ElfFile32`.
-pub type ElfComdat32<'data, 'file, Endian = Endianness> =
-    ElfComdat<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfComdat32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfComdat<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// A COMDAT section group of an `ElfFile64`.
-pub type ElfComdat64<'data, 'file, Endian = Endianness> =
-    ElfComdat<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfComdat64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfComdat<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// A COMDAT section group of an `ElfFile`.
 #[derive(Debug)]
-pub struct ElfComdat<'data, 'file, Elf>
+pub struct ElfComdat<'data, 'file, Elf, R = &'data [u8]>
 where
-    'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
-    file: &'file ElfFile<'data, Elf>,
+    file: &'file ElfFile<'data, Elf, R>,
     index: SectionIndex,
     section: &'data Elf::SectionHeader,
-    data: Bytes<'data>,
+    sections: &'data [U32Bytes<Elf::Endian>],
 }
 
-impl<'data, 'file, Elf: FileHeader> ElfComdat<'data, 'file, Elf> {
+impl<'data, 'file, Elf, R> ElfComdat<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
     fn parse(
-        file: &'file ElfFile<'data, Elf>,
+        file: &'file ElfFile<'data, Elf, R>,
         index: usize,
         section: &'data Elf::SectionHeader,
-    ) -> Option<ElfComdat<'data, 'file, Elf>> {
-        if section.sh_type(file.endian) != elf::SHT_GROUP {
-            return None;
-        }
-        let mut data = section.data(file.endian, file.data).ok()?;
-        let flags = data.read::<U32Bytes<_>>().ok()?;
-        if flags.get(file.endian) != elf::GRP_COMDAT {
+    ) -> Option<ElfComdat<'data, 'file, Elf, R>> {
+        let (flag, sections) = section.group(file.endian, file.data).ok()??;
+        if flag != elf::GRP_COMDAT {
             return None;
         }
         Some(ElfComdat {
             file,
             index: SectionIndex(index),
             section,
-            data,
+            sections,
         })
     }
 }
 
-impl<'data, 'file, Elf: FileHeader> read::private::Sealed for ElfComdat<'data, 'file, Elf> {}
+impl<'data, 'file, Elf, R> read::private::Sealed for ElfComdat<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Elf: FileHeader> ObjectComdat<'data> for ElfComdat<'data, 'file, Elf> {
-    type SectionIterator = ElfComdatSectionIterator<'data, 'file, Elf>;
+impl<'data, 'file, Elf, R> ObjectComdat<'data> for ElfComdat<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+    type SectionIterator = ElfComdatSectionIterator<'data, 'file, Elf, R>;
 
     #[inline]
     fn kind(&self) -> ComdatKind {
@@ -110,38 +123,39 @@
     fn sections(&self) -> Self::SectionIterator {
         ElfComdatSectionIterator {
             file: self.file,
-            data: self.data,
+            sections: self.sections.iter(),
         }
     }
 }
 
 /// An iterator over the sections in a COMDAT section group of an `ElfFile32`.
-pub type ElfComdatSectionIterator32<'data, 'file, Endian = Endianness> =
-    ElfComdatSectionIterator<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfComdatSectionIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfComdatSectionIterator<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// An iterator over the sections in a COMDAT section group of an `ElfFile64`.
-pub type ElfComdatSectionIterator64<'data, 'file, Endian = Endianness> =
-    ElfComdatSectionIterator<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfComdatSectionIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfComdatSectionIterator<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// An iterator over the sections in a COMDAT section group of an `ElfFile`.
 #[derive(Debug)]
-pub struct ElfComdatSectionIterator<'data, 'file, Elf>
+pub struct ElfComdatSectionIterator<'data, 'file, Elf, R = &'data [u8]>
 where
     'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
-    file: &'file ElfFile<'data, Elf>,
-    data: Bytes<'data>,
+    file: &'file ElfFile<'data, Elf, R>,
+    sections: slice::Iter<'data, U32Bytes<Elf::Endian>>,
 }
 
-impl<'data, 'file, Elf: FileHeader> Iterator for ElfComdatSectionIterator<'data, 'file, Elf> {
+impl<'data, 'file, Elf, R> Iterator for ElfComdatSectionIterator<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
     type Item = SectionIndex;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.data.is_empty() {
-            None
-        } else {
-            let index = self.data.read::<U32Bytes<_>>().ok()?;
-            Some(SectionIndex(index.get(self.file.endian) as usize))
-        }
+        let index = self.sections.next()?;
+        Some(SectionIndex(index.get(self.file.endian) as usize))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/dynamic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/dynamic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/dynamic.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/dynamic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+use core::fmt::Debug;
+
+use crate::elf;
+use crate::endian;
+use crate::pod::Pod;
+
+/// A trait for generic access to `Dyn32` and `Dyn64`.
+#[allow(missing_docs)]
+pub trait Dyn: Debug + Pod {
+    type Word: Into<u64>;
+    type Endian: endian::Endian;
+
+    fn d_tag(&self, endian: Self::Endian) -> Self::Word;
+    fn d_val(&self, endian: Self::Endian) -> Self::Word;
+}
+
+impl<Endian: endian::Endian> Dyn for elf::Dyn32<Endian> {
+    type Word = u32;
+    type Endian = Endian;
+
+    #[inline]
+    fn d_tag(&self, endian: Self::Endian) -> Self::Word {
+        self.d_tag.get(endian)
+    }
+
+    #[inline]
+    fn d_val(&self, endian: Self::Endian) -> Self::Word {
+        self.d_val.get(endian)
+    }
+}
+
+impl<Endian: endian::Endian> Dyn for elf::Dyn64<Endian> {
+    type Word = u64;
+    type Endian = Endian;
+
+    #[inline]
+    fn d_tag(&self, endian: Self::Endian) -> Self::Word {
+        self.d_tag.get(endian)
+    }
+
+    #[inline]
+    fn d_val(&self, endian: Self::Endian) -> Self::Word {
+        self.d_val.get(endian)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,42 +1,54 @@
+use alloc::vec::Vec;
+use core::convert::TryInto;
 use core::fmt::Debug;
 use core::{mem, str};
 
 use crate::read::{
-    self, util, Architecture, Error, FileFlags, Object, ReadError, SectionIndex, StringTable,
-    SymbolIndex,
+    self, util, Architecture, ByteString, Bytes, Error, Export, FileFlags, Import, Object,
+    ReadError, ReadRef, SectionIndex, StringTable, SymbolIndex,
 };
-use crate::{elf, endian, Bytes, Endian, Endianness, Pod, U32};
+use crate::{elf, endian, Endian, Endianness, Pod, U32};
 
 use super::{
-    CompressionHeader, ElfComdat, ElfComdatIterator, ElfSection, ElfSectionIterator, ElfSegment,
-    ElfSegmentIterator, ElfSymbol, ElfSymbolIterator, ElfSymbolTable, NoteHeader, ProgramHeader,
-    Rela, RelocationSections, SectionHeader, SectionTable, Sym, SymbolTable,
+    CompressionHeader, Dyn, ElfComdat, ElfComdatIterator, ElfDynamicRelocationIterator, ElfSection,
+    ElfSectionIterator, ElfSegment, ElfSegmentIterator, ElfSymbol, ElfSymbolIterator,
+    ElfSymbolTable, NoteHeader, ProgramHeader, Rel, Rela, RelocationSections, SectionHeader,
+    SectionTable, Sym, SymbolTable,
 };
 
 /// A 32-bit ELF object file.
-pub type ElfFile32<'data, Endian = Endianness> = ElfFile<'data, elf::FileHeader32<Endian>>;
+pub type ElfFile32<'data, Endian = Endianness, R = &'data [u8]> =
+    ElfFile<'data, elf::FileHeader32<Endian>, R>;
 /// A 64-bit ELF object file.
-pub type ElfFile64<'data, Endian = Endianness> = ElfFile<'data, elf::FileHeader64<Endian>>;
+pub type ElfFile64<'data, Endian = Endianness, R = &'data [u8]> =
+    ElfFile<'data, elf::FileHeader64<Endian>, R>;
 
 /// A partially parsed ELF file.
 ///
 /// Most of the functionality of this type is provided by the `Object` trait implementation.
 #[derive(Debug)]
-pub struct ElfFile<'data, Elf: FileHeader> {
+pub struct ElfFile<'data, Elf, R = &'data [u8]>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
     pub(super) endian: Elf::Endian,
-    pub(super) data: Bytes<'data>,
+    pub(super) data: R,
     pub(super) header: &'data Elf,
     pub(super) segments: &'data [Elf::ProgramHeader],
-    pub(super) sections: SectionTable<'data, Elf>,
+    pub(super) sections: SectionTable<'data, Elf, R>,
     pub(super) relocations: RelocationSections,
-    pub(super) symbols: SymbolTable<'data, Elf>,
-    pub(super) dynamic_symbols: SymbolTable<'data, Elf>,
+    pub(super) symbols: SymbolTable<'data, Elf, R>,
+    pub(super) dynamic_symbols: SymbolTable<'data, Elf, R>,
 }
 
-impl<'data, Elf: FileHeader> ElfFile<'data, Elf> {
+impl<'data, Elf, R> ElfFile<'data, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
     /// Parse the raw ELF file data.
-    pub fn parse(data: &'data [u8]) -> read::Result<Self> {
-        let data = Bytes(data);
+    pub fn parse(data: R) -> read::Result<Self> {
         let header = Elf::parse(data)?;
         let endian = header.endian()?;
         let segments = header.program_headers(endian, data)?;
@@ -49,20 +61,40 @@
 
         Ok(ElfFile {
             endian,
+            data,
             header,
             segments,
             sections,
             relocations,
             symbols,
             dynamic_symbols,
-            data,
         })
     }
 
+    /// Returns the endianness.
+    pub fn endian(&self) -> Elf::Endian {
+        self.endian
+    }
+
+    /// Returns the raw data.
+    pub fn data(&self) -> R {
+        self.data
+    }
+
+    /// Returns the raw ELF file header.
+    pub fn raw_header(&self) -> &'data Elf {
+        self.header
+    }
+
+    /// Returns the raw ELF segments.
+    pub fn raw_segments(&self) -> &'data [Elf::ProgramHeader] {
+        self.segments
+    }
+
     fn raw_section_by_name<'file>(
         &'file self,
         section_name: &str,
-    ) -> Option<ElfSection<'data, 'file, Elf>> {
+    ) -> Option<ElfSection<'data, 'file, Elf, R>> {
         self.sections
             .section_by_name(self.endian, section_name.as_bytes())
             .map(|(index, section)| ElfSection {
@@ -76,7 +108,7 @@
     fn zdebug_section_by_name<'file>(
         &'file self,
         section_name: &str,
-    ) -> Option<ElfSection<'data, 'file, Elf>> {
+    ) -> Option<ElfSection<'data, 'file, Elf, R>> {
         if !section_name.starts_with(".debug_") {
             return None;
         }
@@ -87,44 +119,59 @@
     fn zdebug_section_by_name<'file>(
         &'file self,
         _section_name: &str,
-    ) -> Option<ElfSection<'data, 'file, Elf>> {
+    ) -> Option<ElfSection<'data, 'file, Elf, R>> {
         None
     }
 }
 
-impl<'data, Elf: FileHeader> read::private::Sealed for ElfFile<'data, Elf> {}
+impl<'data, Elf, R> read::private::Sealed for ElfFile<'data, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Elf> Object<'data, 'file> for ElfFile<'data, Elf>
+impl<'data, 'file, Elf, R> Object<'data, 'file> for ElfFile<'data, Elf, R>
 where
     'data: 'file,
     Elf: FileHeader,
+    R: 'file + ReadRef<'data>,
 {
-    type Segment = ElfSegment<'data, 'file, Elf>;
-    type SegmentIterator = ElfSegmentIterator<'data, 'file, Elf>;
-    type Section = ElfSection<'data, 'file, Elf>;
-    type SectionIterator = ElfSectionIterator<'data, 'file, Elf>;
-    type Comdat = ElfComdat<'data, 'file, Elf>;
-    type ComdatIterator = ElfComdatIterator<'data, 'file, Elf>;
-    type Symbol = ElfSymbol<'data, 'file, Elf>;
-    type SymbolIterator = ElfSymbolIterator<'data, 'file, Elf>;
-    type SymbolTable = ElfSymbolTable<'data, 'file, Elf>;
+    type Segment = ElfSegment<'data, 'file, Elf, R>;
+    type SegmentIterator = ElfSegmentIterator<'data, 'file, Elf, R>;
+    type Section = ElfSection<'data, 'file, Elf, R>;
+    type SectionIterator = ElfSectionIterator<'data, 'file, Elf, R>;
+    type Comdat = ElfComdat<'data, 'file, Elf, R>;
+    type ComdatIterator = ElfComdatIterator<'data, 'file, Elf, R>;
+    type Symbol = ElfSymbol<'data, 'file, Elf, R>;
+    type SymbolIterator = ElfSymbolIterator<'data, 'file, Elf, R>;
+    type SymbolTable = ElfSymbolTable<'data, 'file, Elf, R>;
+    type DynamicRelocationIterator = ElfDynamicRelocationIterator<'data, 'file, Elf, R>;
 
     fn architecture(&self) -> Architecture {
-        match self.header.e_machine(self.endian) {
-            elf::EM_ARM => Architecture::Arm,
-            elf::EM_AARCH64 => Architecture::Aarch64,
-            elf::EM_386 => Architecture::I386,
-            elf::EM_X86_64 => Architecture::X86_64,
-            elf::EM_MIPS => Architecture::Mips,
-            elf::EM_S390 => {
-                // This is either s390 or s390x, depending on the ELF class.
-                // We only support the 64-bit variant s390x here.
-                if self.is_64() {
-                    Architecture::S390x
-                } else {
-                    Architecture::Unknown
-                }
-            }
+        match (
+            self.header.e_machine(self.endian),
+            self.header.is_class_64(),
+        ) {
+            (elf::EM_AARCH64, _) => Architecture::Aarch64,
+            (elf::EM_ARM, _) => Architecture::Arm,
+            (elf::EM_AVR, _) => Architecture::Avr,
+            (elf::EM_BPF, _) => Architecture::Bpf,
+            (elf::EM_386, _) => Architecture::I386,
+            (elf::EM_X86_64, false) => Architecture::X86_64_X32,
+            (elf::EM_X86_64, true) => Architecture::X86_64,
+            (elf::EM_HEXAGON, _) => Architecture::Hexagon,
+            (elf::EM_MIPS, false) => Architecture::Mips,
+            (elf::EM_MIPS, true) => Architecture::Mips64,
+            (elf::EM_MSP430, _) => Architecture::Msp430,
+            (elf::EM_PPC, _) => Architecture::PowerPc,
+            (elf::EM_PPC64, _) => Architecture::PowerPc64,
+            (elf::EM_RISCV, false) => Architecture::Riscv32,
+            (elf::EM_RISCV, true) => Architecture::Riscv64,
+            // This is either s390 or s390x, depending on the ELF class.
+            // We only support the 64-bit variant s390x here.
+            (elf::EM_S390, true) => Architecture::S390x,
+            (elf::EM_SPARCV9, true) => Architecture::Sparc64,
             _ => Architecture::Unknown,
         }
     }
@@ -139,14 +186,17 @@
         self.header.is_class_64()
     }
 
-    fn segments(&'file self) -> ElfSegmentIterator<'data, 'file, Elf> {
+    fn segments(&'file self) -> ElfSegmentIterator<'data, 'file, Elf, R> {
         ElfSegmentIterator {
             file: self,
             iter: self.segments.iter(),
         }
     }
 
-    fn section_by_name(&'file self, section_name: &str) -> Option<ElfSection<'data, 'file, Elf>> {
+    fn section_by_name(
+        &'file self,
+        section_name: &str,
+    ) -> Option<ElfSection<'data, 'file, Elf, R>> {
         self.raw_section_by_name(section_name)
             .or_else(|| self.zdebug_section_by_name(section_name))
     }
@@ -154,7 +204,7 @@
     fn section_by_index(
         &'file self,
         index: SectionIndex,
-    ) -> read::Result<ElfSection<'data, 'file, Elf>> {
+    ) -> read::Result<ElfSection<'data, 'file, Elf, R>> {
         let section = self.sections.section(index.0)?;
         Ok(ElfSection {
             file: self,
@@ -163,14 +213,14 @@
         })
     }
 
-    fn sections(&'file self) -> ElfSectionIterator<'data, 'file, Elf> {
+    fn sections(&'file self) -> ElfSectionIterator<'data, 'file, Elf, R> {
         ElfSectionIterator {
             file: self,
             iter: self.sections.iter().enumerate(),
         }
     }
 
-    fn comdats(&'file self) -> ElfComdatIterator<'data, 'file, Elf> {
+    fn comdats(&'file self) -> ElfComdatIterator<'data, 'file, Elf, R> {
         ElfComdatIterator {
             file: self,
             iter: self.sections.iter().enumerate(),
@@ -180,7 +230,7 @@
     fn symbol_by_index(
         &'file self,
         index: SymbolIndex,
-    ) -> read::Result<ElfSymbol<'data, 'file, Elf>> {
+    ) -> read::Result<ElfSymbol<'data, 'file, Elf, R>> {
         let symbol = self.symbols.symbol(index.0)?;
         Ok(ElfSymbol {
             endian: self.endian,
@@ -190,7 +240,7 @@
         })
     }
 
-    fn symbols(&'file self) -> ElfSymbolIterator<'data, 'file, Elf> {
+    fn symbols(&'file self) -> ElfSymbolIterator<'data, 'file, Elf, R> {
         ElfSymbolIterator {
             endian: self.endian,
             symbols: &self.symbols,
@@ -198,14 +248,14 @@
         }
     }
 
-    fn symbol_table(&'file self) -> Option<ElfSymbolTable<'data, 'file, Elf>> {
+    fn symbol_table(&'file self) -> Option<ElfSymbolTable<'data, 'file, Elf, R>> {
         Some(ElfSymbolTable {
             endian: self.endian,
             symbols: &self.symbols,
         })
     }
 
-    fn dynamic_symbols(&'file self) -> ElfSymbolIterator<'data, 'file, Elf> {
+    fn dynamic_symbols(&'file self) -> ElfSymbolIterator<'data, 'file, Elf, R> {
         ElfSymbolIterator {
             endian: self.endian,
             symbols: &self.dynamic_symbols,
@@ -213,13 +263,57 @@
         }
     }
 
-    fn dynamic_symbol_table(&'file self) -> Option<ElfSymbolTable<'data, 'file, Elf>> {
+    fn dynamic_symbol_table(&'file self) -> Option<ElfSymbolTable<'data, 'file, Elf, R>> {
         Some(ElfSymbolTable {
             endian: self.endian,
             symbols: &self.dynamic_symbols,
         })
     }
 
+    fn dynamic_relocations(
+        &'file self,
+    ) -> Option<ElfDynamicRelocationIterator<'data, 'file, Elf, R>> {
+        Some(ElfDynamicRelocationIterator {
+            section_index: 1,
+            file: self,
+            relocations: None,
+        })
+    }
+
+    /// Get the imported symbols.
+    fn imports(&self) -> read::Result<Vec<Import<'data>>> {
+        let mut imports = Vec::new();
+        for symbol in self.dynamic_symbols.iter() {
+            if symbol.is_undefined(self.endian) {
+                let name = symbol.name(self.endian, self.dynamic_symbols.strings())?;
+                if !name.is_empty() {
+                    // TODO: use symbol versioning to determine library
+                    imports.push(Import {
+                        name: ByteString(name),
+                        library: ByteString(&[]),
+                    });
+                }
+            }
+        }
+        Ok(imports)
+    }
+
+    /// Get the exported symbols.
+    fn exports(&self) -> read::Result<Vec<Export<'data>>> {
+        let mut exports = Vec::new();
+        for symbol in self.dynamic_symbols.iter() {
+            if symbol.is_definition(self.endian) {
+                let name = symbol.name(self.endian, self.dynamic_symbols.strings())?;
+                let address = symbol.st_value(self.endian).into();
+                exports.push(Export {
+                    name: ByteString(name),
+                    address,
+                });
+            }
+        }
+        Ok(exports)
+    }
+
     fn has_debug_symbols(&self) -> bool {
         for section in self.sections.iter() {
             if let Ok(name) = self.sections.section_name(self.endian, section) {
@@ -270,7 +364,8 @@
         let data = section
             .section
             .data(self.endian, self.data)
-            .read_error("Invalid ELF .gnu_debuglink section offset or size")?;
+            .read_error("Invalid ELF .gnu_debuglink section offset or size")
+            .map(Bytes)?;
         let filename = data
             .read_string_at(0)
             .read_error("Missing ELF .gnu_debuglink filename")?;
@@ -282,6 +377,27 @@
         Ok(Some((filename, crc)))
     }
 
+    fn gnu_debugaltlink(&self) -> read::Result<Option<(&'data [u8], &'data [u8])>> {
+        let section = match self.raw_section_by_name(".gnu_debugaltlink") {
+            Some(section) => section,
+            None => return Ok(None),
+        };
+        let mut data = section
+            .section
+            .data(self.endian, self.data)
+            .read_error("Invalid ELF .gnu_debugaltlink section offset or size")
+            .map(Bytes)?;
+        let filename = data
+            .read_string()
+            .read_error("Missing ELF .gnu_debugaltlink filename")?;
+        let build_id = data.0;
+        Ok(Some((filename, build_id)))
+    }
+
+    fn relative_address_base(&self) -> u64 {
+        0
+    }
+
     fn entry(&self) -> u64 {
         self.header.e_entry(self.endian).into()
     }
@@ -300,13 +416,14 @@
     type Word: Into<u64>;
     type Sword: Into<i64>;
     type Endian: endian::Endian;
-    type ProgramHeader: ProgramHeader<Endian = Self::Endian>;
-    type SectionHeader: SectionHeader<Endian = Self::Endian>;
-    type CompressionHeader: CompressionHeader<Endian = Self::Endian>;
+    type ProgramHeader: ProgramHeader<Elf = Self, Endian = Self::Endian, Word = Self::Word>;
+    type SectionHeader: SectionHeader<Elf = Self, Endian = Self::Endian, Word = Self::Word>;
+    type CompressionHeader: CompressionHeader<Endian = Self::Endian, Word = Self::Word>;
     type NoteHeader: NoteHeader<Endian = Self::Endian>;
-    type Sym: Sym<Endian = Self::Endian>;
-    type Rel: Clone + Pod;
-    type Rela: Rela<Endian = Self::Endian> + From<Self::Rel>;
+    type Dyn: Dyn<Endian = Self::Endian, Word = Self::Word>;
+    type Sym: Sym<Endian = Self::Endian, Word = Self::Word>;
+    type Rel: Rel<Endian = Self::Endian, Word = Self::Word>;
+    type Rela: Rela<Endian = Self::Endian, Word = Self::Word> + From<Self::Rel>;
 
     /// Return true if this type is a 64-bit header.
     ///
@@ -333,7 +450,7 @@
     /// Read the file header.
     ///
     /// Also checks that the ident field in the file header is a supported format.
-    fn parse<'data>(data: Bytes<'data>) -> read::Result<&'data Self> {
+    fn parse<'data, R: ReadRef<'data>>(data: R) -> read::Result<&'data Self> {
         let header = data
             .read_at::<Self>(0)
             .read_error("Invalid ELF header size or alignment")?;
@@ -381,22 +498,22 @@
     ///
     /// Section 0 is a special case because getting the section headers normally
     /// requires `shnum`, but `shnum` may be in the first section header.
-    fn section_0<'data>(
+    fn section_0<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
+        data: R,
     ) -> read::Result<Option<&'data Self::SectionHeader>> {
         let shoff: u64 = self.e_shoff(endian).into();
         if shoff == 0 {
             // No section headers is ok.
             return Ok(None);
         }
-        let shentsize = self.e_shentsize(endian) as usize;
+        let shentsize = usize::from(self.e_shentsize(endian));
         if shentsize != mem::size_of::<Self::SectionHeader>() {
             // Section header size must match.
             return Err(Error("Invalid ELF section header entry size"));
         }
-        data.read_at(shoff as usize)
+        data.read_at(shoff)
             .map(Some)
             .read_error("Invalid ELF section header offset or size")
     }
@@ -404,7 +521,11 @@
     /// Return the `e_phnum` field of the header. Handles extended values.
     ///
     /// Returns `Err` for invalid values.
-    fn phnum<'data>(&self, endian: Self::Endian, data: Bytes<'data>) -> read::Result<usize> {
+    fn phnum<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<usize> {
         let e_phnum = self.e_phnum(endian);
         if e_phnum < elf::PN_XNUM {
             Ok(e_phnum as usize)
@@ -419,13 +540,21 @@
     /// Return the `e_shnum` field of the header. Handles extended values.
     ///
     /// Returns `Err` for invalid values.
-    fn shnum<'data>(&self, endian: Self::Endian, data: Bytes<'data>) -> read::Result<usize> {
+    fn shnum<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<usize> {
         let e_shnum = self.e_shnum(endian);
         if e_shnum > 0 {
             Ok(e_shnum as usize)
         } else if let Some(section_0) = self.section_0(endian, data)? {
-            let size: u64 = section_0.sh_size(endian).into();
-            Ok(size as usize)
+            section_0
+                .sh_size(endian)
+                .into()
+                .try_into()
+                .ok()
+                .read_error("Invalid ELF extended e_shnum")
         } else {
             // No section headers is ok.
             Ok(0)
@@ -435,7 +564,11 @@
     /// Return the `e_shstrndx` field of the header. Handles extended values.
     ///
     /// Returns `Err` for invalid values (including if the index is 0).
-    fn shstrndx<'data>(&self, endian: Self::Endian, data: Bytes<'data>) -> read::Result<u32> {
+    fn shstrndx<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<u32> {
         let e_shstrndx = self.e_shstrndx(endian);
         let index = if e_shstrndx != elf::SHN_XINDEX {
             e_shstrndx.into()
@@ -455,10 +588,10 @@
     ///
     /// Returns `Ok(&[])` if there are no program headers.
     /// Returns `Err` for invalid values.
-    fn program_headers<'data>(
+    fn program_headers<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
+        data: R,
     ) -> read::Result<&'data [Self::ProgramHeader]> {
         let phoff: u64 = self.e_phoff(endian).into();
         if phoff == 0 {
@@ -475,7 +608,7 @@
             // Program header size must match.
             return Err(Error("Invalid ELF program header entry size"));
         }
-        data.read_slice_at(phoff as usize, phnum)
+        data.read_slice_at(phoff, phnum)
             .read_error("Invalid ELF program header size or alignment")
     }
 
@@ -483,10 +616,10 @@
     ///
     /// Returns `Ok(&[])` if there are no section headers.
     /// Returns `Err` for invalid values.
-    fn section_headers<'data>(
+    fn section_headers<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
+        data: R,
     ) -> read::Result<&'data [Self::SectionHeader]> {
         let shoff: u64 = self.e_shoff(endian).into();
         if shoff == 0 {
@@ -498,43 +631,53 @@
             // No section headers is ok.
             return Ok(&[]);
         }
-        let shentsize = self.e_shentsize(endian) as usize;
+        let shentsize = usize::from(self.e_shentsize(endian));
         if shentsize != mem::size_of::<Self::SectionHeader>() {
             // Section header size must match.
             return Err(Error("Invalid ELF section header entry size"));
         }
-        data.read_slice_at(shoff as usize, shnum)
+        data.read_slice_at(shoff, shnum)
             .read_error("Invalid ELF section header offset/size/alignment")
     }
 
     /// Return the string table for the section headers.
-    fn section_strings<'data>(
+    fn section_strings<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
+        data: R,
         sections: &[Self::SectionHeader],
-    ) -> read::Result<StringTable<'data>> {
+    ) -> read::Result<StringTable<'data, R>> {
         if sections.is_empty() {
             return Ok(StringTable::default());
         }
         let index = self.shstrndx(endian, data)? as usize;
         let shstrtab = sections.get(index).read_error("Invalid ELF e_shstrndx")?;
-        let data = shstrtab
-            .data(endian, data)
-            .read_error("Invalid ELF shstrtab data")?;
-        Ok(StringTable::new(data))
+        let strings = if let Some((shstrtab_offset, shstrtab_size)) = shstrtab.file_range(endian) {
+            let shstrtab_end = shstrtab_offset
+                .checked_add(shstrtab_size)
+                .read_error("Invalid ELF shstrtab size")?;
+            StringTable::new(data, shstrtab_offset, shstrtab_end)
+        } else {
+            StringTable::default()
+        };
+        Ok(strings)
     }
 
     /// Return the section table.
-    fn sections<'data>(
+    fn sections<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
-    ) -> read::Result<SectionTable<'data, Self>> {
+        data: R,
+    ) -> read::Result<SectionTable<'data, Self, R>> {
         let sections = self.section_headers(endian, data)?;
         let strings = self.section_strings(endian, data, sections)?;
         Ok(SectionTable::new(sections, strings))
     }
+
+    /// Returns whether this is a mips64el elf file.
+    fn is_mips64el(&self, endian: Self::Endian) -> bool {
+        self.is_class_64() && self.is_little_endian() && self.e_machine(endian) == elf::EM_MIPS
+    }
 }
 
 impl<Endian: endian::Endian> FileHeader for elf::FileHeader32<Endian> {
@@ -545,6 +688,7 @@
     type SectionHeader = elf::SectionHeader32<Endian>;
     type CompressionHeader = elf::CompressionHeader32<Endian>;
     type NoteHeader = elf::NoteHeader32<Endian>;
+    type Dyn = elf::Dyn32<Endian>;
     type Sym = elf::Sym32<Endian>;
     type Rel = elf::Rel32<Endian>;
     type Rela = elf::Rela32<Endian>;
@@ -633,6 +777,7 @@
     type SectionHeader = elf::SectionHeader64<Endian>;
     type CompressionHeader = elf::CompressionHeader64<Endian>;
     type NoteHeader = elf::NoteHeader32<Endian>;
+    type Dyn = elf::Dyn64<Endian>;
     type Sym = elf::Sym64<Endian>;
     type Rel = elf::Rel64<Endian>;
     type Rela = elf::Rela64<Endian>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/hash.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/hash.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/hash.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/hash.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,211 @@
+use core::mem;
+
+use crate::elf;
+use crate::read::{ReadError, ReadRef, Result};
+use crate::{U32, U64};
+
+use super::{FileHeader, Sym, SymbolTable};
+
+/// A SysV symbol hash table in an ELF file.
+#[derive(Debug)]
+pub struct HashTable<'data, Elf: FileHeader> {
+    buckets: &'data [U32<Elf::Endian>],
+    chains: &'data [U32<Elf::Endian>],
+}
+
+impl<'data, Elf: FileHeader> HashTable<'data, Elf> {
+    /// Parse a SysV hash table.
+    ///
+    /// `data` should be from a `SHT_HASH` section, or from a
+    /// segment pointed to via the `DT_HASH` entry.
+    ///
+    /// The header is read at offset 0 in the given `data`.
+    pub fn parse(endian: Elf::Endian, data: &'data [u8]) -> Result<Self> {
+        let mut offset = 0;
+        let header = data
+            .read::<elf::HashHeader<Elf::Endian>>(&mut offset)
+            .read_error("Invalid hash header")?;
+        let buckets = data
+            .read_slice(&mut offset, header.bucket_count.get(endian) as usize)
+            .read_error("Invalid hash buckets")?;
+        let chains = data
+            .read_slice(&mut offset, header.chain_count.get(endian) as usize)
+            .read_error("Invalid hash chains")?;
+        Ok(HashTable { buckets, chains })
+    }
+
+    /// Return the symbol table length.
+    pub fn symbol_table_length(&self) -> u32 {
+        self.chains.len() as u32
+    }
+
+    /// Use the hash table to find the symbol table entry with the given name and hash.
+    pub fn find<R: ReadRef<'data>>(
+        &self,
+        endian: Elf::Endian,
+        name: &[u8],
+        hash: u32,
+        symbols: &SymbolTable<'data, Elf, R>,
+    ) -> Option<&'data Elf::Sym> {
+        // Get the chain start from the bucket for this hash.
+        let mut index = self.buckets[(hash as usize) % self.buckets.len()].get(endian) as usize;
+        // Avoid infinite loop.
+        let mut i = 0;
+        let strings = symbols.strings();
+        while index != 0 && i < self.chains.len() {
+            if let Ok(symbol) = symbols.symbol(index) {
+                if symbol.name(endian, strings) == Ok(name) {
+                    return Some(symbol);
+                }
+            }
+            index = self.chains.get(index)?.get(endian) as usize;
+            i += 1;
+        }
+        None
+    }
+}
+
+/// A GNU symbol hash table in an ELF file.
+#[derive(Debug)]
+pub struct GnuHashTable<'data, Elf: FileHeader> {
+    symbol_base: u32,
+    bloom_shift: u32,
+    bloom_filters: &'data [u8],
+    buckets: &'data [U32<Elf::Endian>],
+    values: &'data [U32<Elf::Endian>],
+}
+
+impl<'data, Elf: FileHeader> GnuHashTable<'data, Elf> {
+    /// Parse a GNU hash table.
+    ///
+    /// `data` should be from a `SHT_GNU_HASH` section, or from a
+    /// segment pointed to via the `DT_GNU_HASH` entry.
+    ///
+    /// The header is read at offset 0 in the given `data`.
+    ///
+    /// The header does not contain a length field, and so all of `data`
+    /// will be used as the hash table values. It does not matter if this
+    /// is longer than needed, and this will often the case when accessing
+    /// the hash table via the `DT_GNU_HASH` entry.
+    pub fn parse(endian: Elf::Endian, data: &'data [u8]) -> Result<Self> {
+        let mut offset = 0;
+        let header = data
+            .read::<elf::GnuHashHeader<Elf::Endian>>(&mut offset)
+            .read_error("Invalid GNU hash header")?;
+        let bloom_len =
+            u64::from(header.bloom_count.get(endian)) * mem::size_of::<Elf::Word>() as u64;
+        let bloom_filters = data
+            .read_bytes(&mut offset, bloom_len)
+            .read_error("Invalid GNU hash bloom filters")?;
+        let buckets = data
+            .read_slice(&mut offset, header.bucket_count.get(endian) as usize)
+            .read_error("Invalid GNU hash buckets")?;
+        let chain_count = (data.len() - offset as usize) / 4;
+        let values = data
+            .read_slice(&mut offset, chain_count)
+            .read_error("Invalid GNU hash values")?;
+        Ok(GnuHashTable {
+            symbol_base: header.symbol_base.get(endian),
+            bloom_shift: header.bloom_shift.get(endian),
+            bloom_filters,
+            buckets,
+            values,
+        })
+    }
+
+    /// Return the symbol table index of the first symbol in the hash table.
+    pub fn symbol_base(&self) -> u32 {
+        self.symbol_base
+    }
+
+    /// Determine the symbol table length by finding the last entry in the hash table.
+    ///
+    /// Returns `None` if the hash table is empty or invalid.
+    pub fn symbol_table_length(&self, endian: Elf::Endian) -> Option<u32> {
+        // Ensure we find a non-empty bucket.
+        if self.symbol_base == 0 {
+            return None;
+        }
+
+        // Find the highest chain index in a bucket.
+        let mut max_symbol = 0;
+        for bucket in self.buckets {
+            let bucket = bucket.get(endian);
+            if max_symbol < bucket {
+                max_symbol = bucket;
+            }
+        }
+
+        // Find the end of the chain.
+        for value in self
+            .values
+            .get(max_symbol.checked_sub(self.symbol_base)? as usize..)?
+        {
+            max_symbol += 1;
+            if value.get(endian) & 1 != 0 {
+                return Some(max_symbol);
+            }
+        }
+
+        None
+    }
+
+    /// Use the hash table to find the symbol table entry with the given name and hash.
+    pub fn find<R: ReadRef<'data>>(
+        &self,
+        endian: Elf::Endian,
+        name: &[u8],
+        hash: u32,
+        symbols: &SymbolTable<'data, Elf, R>,
+    ) -> Option<&'data Elf::Sym> {
+        let word_bits = mem::size_of::<Elf::Word>() as u32 * 8;
+
+        // Test against bloom filter.
+        let bloom_count = self.bloom_filters.len() / mem::size_of::<Elf::Word>();
+        let offset =
+            ((hash / word_bits) & (bloom_count as u32 - 1)) * mem::size_of::<Elf::Word>() as u32;
+        let filter = if word_bits == 64 {
+            self.bloom_filters
+                .read_at::<U64<Elf::Endian>>(offset.into())
+                .ok()?
+                .get(endian)
+        } else {
+            self.bloom_filters
+                .read_at::<U32<Elf::Endian>>(offset.into())
+                .ok()?
+                .get(endian)
+                .into()
+        };
+        if filter & (1 << (hash % word_bits)) == 0 {
+            return None;
+        }
+        if filter & (1 << ((hash >> self.bloom_shift) % word_bits)) == 0 {
+            return None;
+        }
+
+        // Get the chain start from the bucket for this hash.
+        let index = self.buckets[(hash as usize) % self.buckets.len()].get(endian) as usize;
+        if index == 0 {
+            return None;
+        }
+
+        // Test symbols in the chain.
+        let strings = symbols.strings();
+        let symbols = symbols.symbols().get(index..)?;
+        let values = self
+            .values
+            .get(index.checked_sub(self.symbol_base as usize)?..)?;
+        for (symbol, value) in symbols.iter().zip(values.iter()) {
+            let value = value.get(endian);
+            if value | 1 == hash | 1 {
+                if symbol.name(endian, strings) == Ok(name) {
+                    return Some(symbol);
+                }
+            }
+            if value & 1 != 0 {
+                break;
+            }
+        }
+        None
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,11 +20,20 @@
 mod relocation;
 pub use relocation::*;
 
+mod comdat;
+pub use comdat::*;
+
+mod dynamic;
+pub use dynamic::*;
+
 mod compression;
 pub use compression::*;
 
 mod note;
 pub use note::*;
 
-mod comdat;
-pub use comdat::*;
+mod hash;
+pub use hash::*;
+
+mod version;
+pub use version::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/note.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/note.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/note.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/note.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,16 +2,16 @@
 use core::mem;
 
 use crate::elf;
-use crate::endian::{self, Endianness};
-use crate::pod::{Bytes, Pod};
+use crate::endian;
+use crate::pod::Pod;
 use crate::read::util;
-use crate::read::{self, Error, ReadError};
+use crate::read::{self, Bytes, Error, ReadError};
 
 use super::FileHeader;
 
-/// An iterator over the notes in an `ElfSegment` or `ElfSection`.
+/// An iterator over the notes in an ELF section or segment.
 #[derive(Debug)]
-pub struct ElfNoteIterator<'data, Elf>
+pub struct NoteIterator<'data, Elf>
 where
     Elf: FileHeader,
 {
@@ -20,7 +20,7 @@
     data: Bytes<'data>,
 }
 
-impl<'data, Elf> ElfNoteIterator<'data, Elf>
+impl<'data, Elf> NoteIterator<'data, Elf>
 where
     Elf: FileHeader,
 {
@@ -28,7 +28,7 @@
     pub(super) fn new(
         endian: Elf::Endian,
         align: Elf::Word,
-        data: Bytes<'data>,
+        data: &'data [u8],
     ) -> read::Result<Self> {
         let align = match align.into() {
             0u64..=4 => 4,
@@ -36,15 +36,15 @@
             _ => return Err(Error("Invalid ELF note alignment")),
         };
         // TODO: check data alignment?
-        Ok(ElfNoteIterator {
+        Ok(NoteIterator {
             endian,
             align,
-            data,
+            data: Bytes(data),
         })
     }
 
     /// Returns the next note.
-    pub fn next(&mut self) -> read::Result<Option<ElfNote<'data, Elf>>> {
+    pub fn next(&mut self) -> read::Result<Option<Note<'data, Elf>>> {
         let mut data = self.data;
         if data.is_empty() {
             return Ok(None);
@@ -77,18 +77,13 @@
         }
         self.data = data;
 
-        Ok(Some(ElfNote { header, name, desc }))
+        Ok(Some(Note { header, name, desc }))
     }
 }
 
-/// A parsed `NoteHeader32`.
-pub type ElfNote32<'data, Endian = Endianness> = ElfNote<'data, elf::FileHeader32<Endian>>;
-/// A parsed `NoteHeader64`.
-pub type ElfNote64<'data, Endian = Endianness> = ElfNote<'data, elf::FileHeader64<Endian>>;
-
 /// A parsed `NoteHeader`.
 #[derive(Debug)]
-pub struct ElfNote<'data, Elf>
+pub struct Note<'data, Elf>
 where
     Elf: FileHeader,
 {
@@ -97,7 +92,7 @@
     desc: &'data [u8],
 }
 
-impl<'data, Elf: FileHeader> ElfNote<'data, Elf> {
+impl<'data, Elf: FileHeader> Note<'data, Elf> {
     /// Return the `n_type` field of the `NoteHeader`.
     ///
     /// The meaning of this field is determined by `name`.
@@ -115,11 +110,20 @@
         self.header.n_descsz(endian)
     }
 
-    /// Return the bytes for the name field following the `NoteHeader`.
+    /// Return the bytes for the name field following the `NoteHeader`,
+    /// excluding any null terminator.
+    ///
+    /// This field is usually a string including a null terminator
+    /// (but it is not required to be).
     ///
-    /// The length of this field is given by `n_namesz`. This field is usually a
-    /// string including a null terminator (but it is not required to be).
+    /// The length of this field (including any null terminator) is given by
+    /// `n_namesz`.
     pub fn name(&self) -> &'data [u8] {
+        if let Some((last, name)) = self.name.split_last() {
+            if *last == 0 {
+                return name;
+            }
+        }
         self.name
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/relocation.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/relocation.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/relocation.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/relocation.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,8 @@
 use crate::endian::{self, Endianness};
 use crate::pod::Pod;
 use crate::read::{
-    self, Error, Relocation, RelocationEncoding, RelocationKind, RelocationTarget, SymbolIndex,
+    self, Error, ReadRef, Relocation, RelocationEncoding, RelocationKind, RelocationTarget,
+    SymbolIndex,
 };
 
 use super::{ElfFile, FileHeader, SectionHeader, SectionTable};
@@ -22,9 +23,9 @@
     /// Create a new mapping using the section table.
     ///
     /// Skips relocation sections that do not use the given symbol table section.
-    pub fn parse<Elf: FileHeader>(
+    pub fn parse<'data, Elf: FileHeader, R: ReadRef<'data>>(
         endian: Elf::Endian,
-        sections: &SectionTable<Elf>,
+        sections: &SectionTable<'data, Elf, R>,
         symbol_section: usize,
     ) -> read::Result<Self> {
         let mut relocations = vec![0; sections.len()];
@@ -33,7 +34,6 @@
             if sh_type == elf::SHT_REL || sh_type == elf::SHT_RELA {
                 // The symbol indices used in relocations must be for the symbol table
                 // we are expecting to use.
-                // TODO: support relocations that use dynamic symbols.
                 let sh_link = section.sh_link(endian) as usize;
                 if sh_link != symbol_section {
                     continue;
@@ -91,26 +91,103 @@
     }
 }
 
+/// An iterator over the dynamic relocations for an `ElfFile32`.
+pub type ElfDynamicRelocationIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfDynamicRelocationIterator<'data, 'file, elf::FileHeader32<Endian>, R>;
+/// An iterator over the dynamic relocations for an `ElfFile64`.
+pub type ElfDynamicRelocationIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfDynamicRelocationIterator<'data, 'file, elf::FileHeader64<Endian>, R>;
+
+/// An iterator over the dynamic relocations for an `ElfFile`.
+pub struct ElfDynamicRelocationIterator<'data, 'file, Elf, R = &'data [u8]>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+    /// The current relocation section index.
+    pub(super) section_index: usize,
+    pub(super) file: &'file ElfFile<'data, Elf, R>,
+    pub(super) relocations: Option<ElfRelaIterator<'data, Elf>>,
+}
+
+impl<'data, 'file, Elf, R> Iterator for ElfDynamicRelocationIterator<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+    type Item = (u64, Relocation);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let endian = self.file.endian;
+        loop {
+            if let Some(ref mut relocations) = self.relocations {
+                if let Some(reloc) = relocations.next() {
+                    let relocation =
+                        parse_relocation(self.file.header, endian, reloc, relocations.is_rel());
+                    return Some((reloc.r_offset(endian).into(), relocation));
+                }
+                self.relocations = None;
+            }
+
+            let section = self.file.sections.section(self.section_index).ok()?;
+            self.section_index += 1;
+
+            let sh_link = section.sh_link(endian) as usize;
+            if sh_link != self.file.dynamic_symbols.section() {
+                continue;
+            }
+
+            match section.sh_type(endian) {
+                elf::SHT_REL => {
+                    if let Ok(relocations) = section.data_as_array(endian, self.file.data) {
+                        self.relocations = Some(ElfRelaIterator::Rel(relocations.iter()));
+                    }
+                }
+                elf::SHT_RELA => {
+                    if let Ok(relocations) = section.data_as_array(endian, self.file.data) {
+                        self.relocations = Some(ElfRelaIterator::Rela(relocations.iter()));
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+}
+
+impl<'data, 'file, Elf, R> fmt::Debug for ElfDynamicRelocationIterator<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ElfDynamicRelocationIterator").finish()
+    }
+}
+
 /// An iterator over the relocations for an `ElfSection32`.
-pub type ElfRelocationIterator32<'data, 'file, Endian = Endianness> =
-    ElfRelocationIterator<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfSectionRelocationIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSectionRelocationIterator<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// An iterator over the relocations for an `ElfSection64`.
-pub type ElfRelocationIterator64<'data, 'file, Endian = Endianness> =
-    ElfRelocationIterator<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfSectionRelocationIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSectionRelocationIterator<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// An iterator over the relocations for an `ElfSection`.
-pub struct ElfRelocationIterator<'data, 'file, Elf>
+pub struct ElfSectionRelocationIterator<'data, 'file, Elf, R = &'data [u8]>
 where
-    'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
     /// The current pointer in the chain of relocation sections.
     pub(super) section_index: usize,
-    pub(super) file: &'file ElfFile<'data, Elf>,
+    pub(super) file: &'file ElfFile<'data, Elf, R>,
     pub(super) relocations: Option<ElfRelaIterator<'data, Elf>>,
 }
 
-impl<'data, 'file, Elf: FileHeader> Iterator for ElfRelocationIterator<'data, 'file, Elf> {
+impl<'data, 'file, Elf, R> Iterator for ElfSectionRelocationIterator<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
     type Item = (u64, Relocation);
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -118,108 +195,11 @@
         loop {
             if let Some(ref mut relocations) = self.relocations {
                 if let Some(reloc) = relocations.next() {
-                    let mut encoding = RelocationEncoding::Generic;
-                    let (kind, size) = match self.file.header.e_machine(endian) {
-                        elf::EM_ARM => match reloc.r_type(endian) {
-                            elf::R_ARM_ABS32 => (RelocationKind::Absolute, 32),
-                            r_type => (RelocationKind::Elf(r_type), 0),
-                        },
-                        elf::EM_AARCH64 => match reloc.r_type(endian) {
-                            elf::R_AARCH64_ABS64 => (RelocationKind::Absolute, 64),
-                            elf::R_AARCH64_ABS32 => (RelocationKind::Absolute, 32),
-                            elf::R_AARCH64_ABS16 => (RelocationKind::Absolute, 16),
-                            elf::R_AARCH64_PREL64 => (RelocationKind::Relative, 64),
-                            elf::R_AARCH64_PREL32 => (RelocationKind::Relative, 32),
-                            elf::R_AARCH64_PREL16 => (RelocationKind::Relative, 16),
-                            r_type => (RelocationKind::Elf(r_type), 0),
-                        },
-                        elf::EM_386 => match reloc.r_type(endian) {
-                            elf::R_386_32 => (RelocationKind::Absolute, 32),
-                            elf::R_386_PC32 => (RelocationKind::Relative, 32),
-                            elf::R_386_GOT32 => (RelocationKind::Got, 32),
-                            elf::R_386_PLT32 => (RelocationKind::PltRelative, 32),
-                            elf::R_386_GOTOFF => (RelocationKind::GotBaseOffset, 32),
-                            elf::R_386_GOTPC => (RelocationKind::GotBaseRelative, 32),
-                            elf::R_386_16 => (RelocationKind::Absolute, 16),
-                            elf::R_386_PC16 => (RelocationKind::Relative, 16),
-                            elf::R_386_8 => (RelocationKind::Absolute, 8),
-                            elf::R_386_PC8 => (RelocationKind::Relative, 8),
-                            r_type => (RelocationKind::Elf(r_type), 0),
-                        },
-                        elf::EM_X86_64 => match reloc.r_type(endian) {
-                            elf::R_X86_64_64 => (RelocationKind::Absolute, 64),
-                            elf::R_X86_64_PC32 => (RelocationKind::Relative, 32),
-                            elf::R_X86_64_GOT32 => (RelocationKind::Got, 32),
-                            elf::R_X86_64_PLT32 => (RelocationKind::PltRelative, 32),
-                            elf::R_X86_64_GOTPCREL => (RelocationKind::GotRelative, 32),
-                            elf::R_X86_64_32 => (RelocationKind::Absolute, 32),
-                            elf::R_X86_64_32S => {
-                                encoding = RelocationEncoding::X86Signed;
-                                (RelocationKind::Absolute, 32)
-                            }
-                            elf::R_X86_64_16 => (RelocationKind::Absolute, 16),
-                            elf::R_X86_64_PC16 => (RelocationKind::Relative, 16),
-                            elf::R_X86_64_8 => (RelocationKind::Absolute, 8),
-                            elf::R_X86_64_PC8 => (RelocationKind::Relative, 8),
-                            r_type => (RelocationKind::Elf(r_type), 0),
-                        },
-                        elf::EM_S390 => match reloc.r_type(endian) {
-                            elf::R_390_8 => (RelocationKind::Absolute, 8),
-                            elf::R_390_16 => (RelocationKind::Absolute, 16),
-                            elf::R_390_32 => (RelocationKind::Absolute, 32),
-                            elf::R_390_64 => (RelocationKind::Absolute, 64),
-                            elf::R_390_PC16 => (RelocationKind::Relative, 16),
-                            elf::R_390_PC32 => (RelocationKind::Relative, 32),
-                            elf::R_390_PC64 => (RelocationKind::Relative, 64),
-                            elf::R_390_PC16DBL => {
-                                encoding = RelocationEncoding::S390xDbl;
-                                (RelocationKind::Relative, 16)
-                            }
-                            elf::R_390_PC32DBL => {
-                                encoding = RelocationEncoding::S390xDbl;
-                                (RelocationKind::Relative, 32)
-                            }
-                            elf::R_390_PLT16DBL => {
-                                encoding = RelocationEncoding::S390xDbl;
-                                (RelocationKind::PltRelative, 16)
-                            }
-                            elf::R_390_PLT32DBL => {
-                                encoding = RelocationEncoding::S390xDbl;
-                                (RelocationKind::PltRelative, 32)
-                            }
-                            elf::R_390_GOT16 => (RelocationKind::Got, 16),
-                            elf::R_390_GOT32 => (RelocationKind::Got, 32),
-                            elf::R_390_GOT64 => (RelocationKind::Got, 64),
-                            elf::R_390_GOTENT => {
-                                encoding = RelocationEncoding::S390xDbl;
-                                (RelocationKind::GotRelative, 32)
-                            }
-                            elf::R_390_GOTOFF16 => (RelocationKind::GotBaseOffset, 16),
-                            elf::R_390_GOTOFF32 => (RelocationKind::GotBaseOffset, 32),
-                            elf::R_390_GOTOFF64 => (RelocationKind::GotBaseOffset, 64),
-                            elf::R_390_GOTPC => (RelocationKind::GotBaseRelative, 64),
-                            elf::R_390_GOTPCDBL => {
-                                encoding = RelocationEncoding::S390xDbl;
-                                (RelocationKind::GotBaseRelative, 32)
-                            }
-                            r_type => (RelocationKind::Elf(r_type), 0),
-                        },
-                        _ => (RelocationKind::Elf(reloc.r_type(endian)), 0),
-                    };
-                    let target =
-                        RelocationTarget::Symbol(SymbolIndex(reloc.r_sym(endian) as usize));
-                    return Some((
-                        reloc.r_offset(endian).into(),
-                        Relocation {
-                            kind,
-                            encoding,
-                            size,
-                            target,
-                            addend: reloc.r_addend(endian).into(),
-                            implicit_addend: relocations.is_rel(),
-                        },
-                    ));
+                    let relocation =
+                        parse_relocation(self.file.header, endian, reloc, relocations.is_rel());
+                    return Some((reloc.r_offset(endian).into(), relocation));
                 }
+                self.relocations = None;
             }
             self.section_index = self.file.relocations.get(self.section_index)?;
             // The construction of RelocationSections ensures section_index is valid.
@@ -241,27 +221,191 @@
     }
 }
 
-impl<'data, 'file, Elf: FileHeader> fmt::Debug for ElfRelocationIterator<'data, 'file, Elf> {
+impl<'data, 'file, Elf, R> fmt::Debug for ElfSectionRelocationIterator<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("ElfRelocationIterator").finish()
+        f.debug_struct("ElfSectionRelocationIterator").finish()
     }
 }
 
-/// A trait for generic access to `Rela32` and `Rela64`.
+fn parse_relocation<Elf: FileHeader>(
+    header: &Elf,
+    endian: Elf::Endian,
+    reloc: Elf::Rela,
+    implicit_addend: bool,
+) -> Relocation {
+    let mut encoding = RelocationEncoding::Generic;
+    let is_mips64el = header.is_mips64el(endian);
+    let (kind, size) = match header.e_machine(endian) {
+        elf::EM_AARCH64 => match reloc.r_type(endian, false) {
+            elf::R_AARCH64_ABS64 => (RelocationKind::Absolute, 64),
+            elf::R_AARCH64_ABS32 => (RelocationKind::Absolute, 32),
+            elf::R_AARCH64_ABS16 => (RelocationKind::Absolute, 16),
+            elf::R_AARCH64_PREL64 => (RelocationKind::Relative, 64),
+            elf::R_AARCH64_PREL32 => (RelocationKind::Relative, 32),
+            elf::R_AARCH64_PREL16 => (RelocationKind::Relative, 16),
+            elf::R_AARCH64_CALL26 => {
+                encoding = RelocationEncoding::AArch64Call;
+                (RelocationKind::PltRelative, 26)
+            }
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_ARM => match reloc.r_type(endian, false) {
+            elf::R_ARM_ABS32 => (RelocationKind::Absolute, 32),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_AVR => match reloc.r_type(endian, false) {
+            elf::R_AVR_32 => (RelocationKind::Absolute, 32),
+            elf::R_AVR_16 => (RelocationKind::Absolute, 16),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_BPF => match reloc.r_type(endian, false) {
+            elf::R_BPF_64_64 => (RelocationKind::Absolute, 64),
+            elf::R_BPF_64_32 => (RelocationKind::Absolute, 32),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_386 => match reloc.r_type(endian, false) {
+            elf::R_386_32 => (RelocationKind::Absolute, 32),
+            elf::R_386_PC32 => (RelocationKind::Relative, 32),
+            elf::R_386_GOT32 => (RelocationKind::Got, 32),
+            elf::R_386_PLT32 => (RelocationKind::PltRelative, 32),
+            elf::R_386_GOTOFF => (RelocationKind::GotBaseOffset, 32),
+            elf::R_386_GOTPC => (RelocationKind::GotBaseRelative, 32),
+            elf::R_386_16 => (RelocationKind::Absolute, 16),
+            elf::R_386_PC16 => (RelocationKind::Relative, 16),
+            elf::R_386_8 => (RelocationKind::Absolute, 8),
+            elf::R_386_PC8 => (RelocationKind::Relative, 8),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_X86_64 => match reloc.r_type(endian, false) {
+            elf::R_X86_64_64 => (RelocationKind::Absolute, 64),
+            elf::R_X86_64_PC32 => (RelocationKind::Relative, 32),
+            elf::R_X86_64_GOT32 => (RelocationKind::Got, 32),
+            elf::R_X86_64_PLT32 => (RelocationKind::PltRelative, 32),
+            elf::R_X86_64_GOTPCREL => (RelocationKind::GotRelative, 32),
+            elf::R_X86_64_32 => (RelocationKind::Absolute, 32),
+            elf::R_X86_64_32S => {
+                encoding = RelocationEncoding::X86Signed;
+                (RelocationKind::Absolute, 32)
+            }
+            elf::R_X86_64_16 => (RelocationKind::Absolute, 16),
+            elf::R_X86_64_PC16 => (RelocationKind::Relative, 16),
+            elf::R_X86_64_8 => (RelocationKind::Absolute, 8),
+            elf::R_X86_64_PC8 => (RelocationKind::Relative, 8),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_HEXAGON => match reloc.r_type(endian, false) {
+            elf::R_HEX_32 => (RelocationKind::Absolute, 32),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_MIPS => match reloc.r_type(endian, is_mips64el) {
+            elf::R_MIPS_16 => (RelocationKind::Absolute, 16),
+            elf::R_MIPS_32 => (RelocationKind::Absolute, 32),
+            elf::R_MIPS_64 => (RelocationKind::Absolute, 64),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_MSP430 => match reloc.r_type(endian, false) {
+            elf::R_MSP430_32 => (RelocationKind::Absolute, 32),
+            elf::R_MSP430_16_BYTE => (RelocationKind::Absolute, 16),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_PPC => match reloc.r_type(endian, false) {
+            elf::R_PPC_ADDR32 => (RelocationKind::Absolute, 32),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_PPC64 => match reloc.r_type(endian, false) {
+            elf::R_PPC64_ADDR32 => (RelocationKind::Absolute, 32),
+            elf::R_PPC64_ADDR64 => (RelocationKind::Absolute, 64),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_RISCV => match reloc.r_type(endian, false) {
+            elf::R_RISCV_32 => (RelocationKind::Absolute, 32),
+            elf::R_RISCV_64 => (RelocationKind::Absolute, 64),
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_S390 => match reloc.r_type(endian, false) {
+            elf::R_390_8 => (RelocationKind::Absolute, 8),
+            elf::R_390_16 => (RelocationKind::Absolute, 16),
+            elf::R_390_32 => (RelocationKind::Absolute, 32),
+            elf::R_390_64 => (RelocationKind::Absolute, 64),
+            elf::R_390_PC16 => (RelocationKind::Relative, 16),
+            elf::R_390_PC32 => (RelocationKind::Relative, 32),
+            elf::R_390_PC64 => (RelocationKind::Relative, 64),
+            elf::R_390_PC16DBL => {
+                encoding = RelocationEncoding::S390xDbl;
+                (RelocationKind::Relative, 16)
+            }
+            elf::R_390_PC32DBL => {
+                encoding = RelocationEncoding::S390xDbl;
+                (RelocationKind::Relative, 32)
+            }
+            elf::R_390_PLT16DBL => {
+                encoding = RelocationEncoding::S390xDbl;
+                (RelocationKind::PltRelative, 16)
+            }
+            elf::R_390_PLT32DBL => {
+                encoding = RelocationEncoding::S390xDbl;
+                (RelocationKind::PltRelative, 32)
+            }
+            elf::R_390_GOT16 => (RelocationKind::Got, 16),
+            elf::R_390_GOT32 => (RelocationKind::Got, 32),
+            elf::R_390_GOT64 => (RelocationKind::Got, 64),
+            elf::R_390_GOTENT => {
+                encoding = RelocationEncoding::S390xDbl;
+                (RelocationKind::GotRelative, 32)
+            }
+            elf::R_390_GOTOFF16 => (RelocationKind::GotBaseOffset, 16),
+            elf::R_390_GOTOFF32 => (RelocationKind::GotBaseOffset, 32),
+            elf::R_390_GOTOFF64 => (RelocationKind::GotBaseOffset, 64),
+            elf::R_390_GOTPC => (RelocationKind::GotBaseRelative, 64),
+            elf::R_390_GOTPCDBL => {
+                encoding = RelocationEncoding::S390xDbl;
+                (RelocationKind::GotBaseRelative, 32)
+            }
+            r_type => (RelocationKind::Elf(r_type), 0),
+        },
+        elf::EM_SPARC | elf::EM_SPARC32PLUS | elf::EM_SPARCV9 => {
+            match reloc.r_type(endian, false) {
+                elf::R_SPARC_32 | elf::R_SPARC_UA32 => (RelocationKind::Absolute, 32),
+                elf::R_SPARC_64 | elf::R_SPARC_UA64 => (RelocationKind::Absolute, 64),
+                r_type => (RelocationKind::Elf(r_type), 0),
+            }
+        }
+        _ => (RelocationKind::Elf(reloc.r_type(endian, false)), 0),
+    };
+    let sym = reloc.r_sym(endian, is_mips64el) as usize;
+    let target = if sym == 0 {
+        RelocationTarget::Absolute
+    } else {
+        RelocationTarget::Symbol(SymbolIndex(sym))
+    };
+    Relocation {
+        kind,
+        encoding,
+        size,
+        target,
+        addend: reloc.r_addend(endian).into(),
+        implicit_addend,
+    }
+}
+
+/// A trait for generic access to `Rel32` and `Rel64`.
 #[allow(missing_docs)]
-pub trait Rela: Debug + Pod + Clone {
+pub trait Rel: Debug + Pod + Clone {
     type Word: Into<u64>;
     type Sword: Into<i64>;
     type Endian: endian::Endian;
 
     fn r_offset(&self, endian: Self::Endian) -> Self::Word;
     fn r_info(&self, endian: Self::Endian) -> Self::Word;
-    fn r_addend(&self, endian: Self::Endian) -> Self::Sword;
     fn r_sym(&self, endian: Self::Endian) -> u32;
     fn r_type(&self, endian: Self::Endian) -> u32;
 }
 
-impl<Endian: endian::Endian> Rela for elf::Rela32<Endian> {
+impl<Endian: endian::Endian> Rel for elf::Rel32<Endian> {
     type Word = u32;
     type Sword = i32;
     type Endian = Endian;
@@ -277,11 +421,6 @@
     }
 
     #[inline]
-    fn r_addend(&self, endian: Self::Endian) -> Self::Sword {
-        self.r_addend.get(endian)
-    }
-
-    #[inline]
     fn r_sym(&self, endian: Self::Endian) -> u32 {
         self.r_sym(endian)
     }
@@ -292,7 +431,7 @@
     }
 }
 
-impl<Endian: endian::Endian> Rela for elf::Rela64<Endian> {
+impl<Endian: endian::Endian> Rel for elf::Rel64<Endian> {
     type Word = u64;
     type Sword = i64;
     type Endian = Endian;
@@ -308,17 +447,88 @@
     }
 
     #[inline]
+    fn r_sym(&self, endian: Self::Endian) -> u32 {
+        self.r_sym(endian)
+    }
+
+    #[inline]
+    fn r_type(&self, endian: Self::Endian) -> u32 {
+        self.r_type(endian)
+    }
+}
+
+/// A trait for generic access to `Rela32` and `Rela64`.
+#[allow(missing_docs)]
+pub trait Rela: Debug + Pod + Clone {
+    type Word: Into<u64>;
+    type Sword: Into<i64>;
+    type Endian: endian::Endian;
+
+    fn r_offset(&self, endian: Self::Endian) -> Self::Word;
+    fn r_info(&self, endian: Self::Endian, is_mips64el: bool) -> Self::Word;
+    fn r_addend(&self, endian: Self::Endian) -> Self::Sword;
+    fn r_sym(&self, endian: Self::Endian, is_mips64el: bool) -> u32;
+    fn r_type(&self, endian: Self::Endian, is_mips64el: bool) -> u32;
+}
+
+impl<Endian: endian::Endian> Rela for elf::Rela32<Endian> {
+    type Word = u32;
+    type Sword = i32;
+    type Endian = Endian;
+
+    #[inline]
+    fn r_offset(&self, endian: Self::Endian) -> Self::Word {
+        self.r_offset.get(endian)
+    }
+
+    #[inline]
+    fn r_info(&self, endian: Self::Endian, _is_mips64el: bool) -> Self::Word {
+        self.r_info.get(endian)
+    }
+
+    #[inline]
     fn r_addend(&self, endian: Self::Endian) -> Self::Sword {
         self.r_addend.get(endian)
     }
 
     #[inline]
-    fn r_sym(&self, endian: Self::Endian) -> u32 {
+    fn r_sym(&self, endian: Self::Endian, _is_mips64el: bool) -> u32 {
         self.r_sym(endian)
     }
 
     #[inline]
-    fn r_type(&self, endian: Self::Endian) -> u32 {
+    fn r_type(&self, endian: Self::Endian, _is_mips64el: bool) -> u32 {
         self.r_type(endian)
     }
 }
+
+impl<Endian: endian::Endian> Rela for elf::Rela64<Endian> {
+    type Word = u64;
+    type Sword = i64;
+    type Endian = Endian;
+
+    #[inline]
+    fn r_offset(&self, endian: Self::Endian) -> Self::Word {
+        self.r_offset.get(endian)
+    }
+
+    #[inline]
+    fn r_info(&self, endian: Self::Endian, is_mips64el: bool) -> Self::Word {
+        self.get_r_info(endian, is_mips64el)
+    }
+
+    #[inline]
+    fn r_addend(&self, endian: Self::Endian) -> Self::Sword {
+        self.r_addend.get(endian)
+    }
+
+    #[inline]
+    fn r_sym(&self, endian: Self::Endian, is_mips64el: bool) -> u32 {
+        self.r_sym(endian, is_mips64el)
+    }
+
+    #[inline]
+    fn r_type(&self, endian: Self::Endian, is_mips64el: bool) -> u32 {
+        self.r_type(endian, is_mips64el)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,30 +3,33 @@
 
 use crate::elf;
 use crate::endian::{self, Endianness, U32Bytes};
-use crate::pod::{Bytes, Pod};
+use crate::pod::Pod;
 use crate::read::{
-    self, CompressedData, CompressionFormat, Error, ObjectSection, ReadError, SectionFlags,
-    SectionIndex, SectionKind, StringTable,
+    self, Bytes, CompressedData, CompressedFileRange, CompressionFormat, Error, ObjectSection,
+    ReadError, ReadRef, SectionFlags, SectionIndex, SectionKind, StringTable,
 };
 
 use super::{
-    CompressionHeader, ElfFile, ElfNoteIterator, ElfRelocationIterator, FileHeader,
-    RelocationSections, SymbolTable,
+    CompressionHeader, ElfFile, ElfSectionRelocationIterator, FileHeader, GnuHashTable, HashTable,
+    NoteIterator, RelocationSections, SymbolTable, VerdefIterator, VerneedIterator,
 };
 
 /// The table of section headers in an ELF file.
 ///
 /// Also includes the string table used for the section names.
 #[derive(Debug, Default, Clone, Copy)]
-pub struct SectionTable<'data, Elf: FileHeader> {
+pub struct SectionTable<'data, Elf: FileHeader, R = &'data [u8]>
+where
+    R: ReadRef<'data>,
+{
     sections: &'data [Elf::SectionHeader],
-    strings: StringTable<'data>,
+    strings: StringTable<'data, R>,
 }
 
-impl<'data, Elf: FileHeader> SectionTable<'data, Elf> {
+impl<'data, Elf: FileHeader, R: ReadRef<'data>> SectionTable<'data, Elf, R> {
     /// Create a new section table.
     #[inline]
-    pub fn new(sections: &'data [Elf::SectionHeader], strings: StringTable<'data>) -> Self {
+    pub fn new(sections: &'data [Elf::SectionHeader], strings: StringTable<'data, R>) -> Self {
         SectionTable { sections, strings }
     }
 
@@ -75,9 +78,7 @@
         endian: Elf::Endian,
         section: &'data Elf::SectionHeader,
     ) -> read::Result<&'data [u8]> {
-        self.strings
-            .get(section.sh_name(endian))
-            .read_error("Invalid ELF section name offset")
+        section.name(endian, self.strings)
     }
 
     /// Return the symbol table of the given section type.
@@ -87,10 +88,39 @@
     pub fn symbols(
         &self,
         endian: Elf::Endian,
-        data: Bytes<'data>,
+        data: R,
         sh_type: u32,
-    ) -> read::Result<SymbolTable<'data, Elf>> {
-        SymbolTable::parse(endian, data, self, sh_type)
+    ) -> read::Result<SymbolTable<'data, Elf, R>> {
+        debug_assert!(sh_type == elf::SHT_DYNSYM || sh_type == elf::SHT_SYMTAB);
+
+        let (index, section) = match self
+            .iter()
+            .enumerate()
+            .find(|s| s.1.sh_type(endian) == sh_type)
+        {
+            Some(s) => s,
+            None => return Ok(SymbolTable::default()),
+        };
+
+        SymbolTable::parse(endian, data, self, index, section)
+    }
+
+    /// Return the symbol table at the given section index.
+    ///
+    /// Returns an error if the section is not a symbol table.
+    #[inline]
+    pub fn symbol_table_by_index(
+        &self,
+        endian: Elf::Endian,
+        data: R,
+        index: usize,
+    ) -> read::Result<SymbolTable<'data, Elf, R>> {
+        let section = self.section(index)?;
+        match section.sh_type(endian) {
+            elf::SHT_DYNSYM | elf::SHT_SYMTAB => {}
+            _ => return Err(Error("Invalid ELF symbol table section type.")),
+        }
+        SymbolTable::parse(endian, data, self, index, section)
     }
 
     /// Create a mapping from section index to associated relocation sections.
@@ -102,28 +132,151 @@
     ) -> read::Result<RelocationSections> {
         RelocationSections::parse(endian, self, symbol_section)
     }
+
+    /// Return the header of a SysV hash section.
+    ///
+    /// Returns `Ok(None)` if there is no SysV GNU hash section.
+    /// Returns `Err` for invalid values.
+    pub fn hash_header(
+        &self,
+        endian: Elf::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data elf::HashHeader<Elf::Endian>>> {
+        for section in self.sections {
+            if let Some(hash) = section.hash_header(endian, data)? {
+                return Ok(Some(hash));
+            }
+        }
+        Ok(None)
+    }
+
+    /// Return the contents of a SysV hash section.
+    ///
+    /// Returns `Ok(None)` if there is no SysV hash section.
+    /// Returns `Err` for invalid values.
+    pub fn hash(
+        &self,
+        endian: Elf::Endian,
+        data: R,
+    ) -> read::Result<Option<HashTable<'data, Elf>>> {
+        for section in self.sections {
+            if let Some(hash) = section.hash(endian, data)? {
+                return Ok(Some(hash));
+            }
+        }
+        Ok(None)
+    }
+
+    /// Return the header of a GNU hash section.
+    ///
+    /// Returns `Ok(None)` if there is no GNU hash section.
+    /// Returns `Err` for invalid values.
+    pub fn gnu_hash_header(
+        &self,
+        endian: Elf::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data elf::GnuHashHeader<Elf::Endian>>> {
+        for section in self.sections {
+            if let Some(hash) = section.gnu_hash_header(endian, data)? {
+                return Ok(Some(hash));
+            }
+        }
+        Ok(None)
+    }
+
+    /// Return the contents of a GNU hash section.
+    ///
+    /// Returns `Ok(None)` if there is no GNU hash section.
+    /// Returns `Err` for invalid values.
+    pub fn gnu_hash(
+        &self,
+        endian: Elf::Endian,
+        data: R,
+    ) -> read::Result<Option<GnuHashTable<'data, Elf>>> {
+        for section in self.sections {
+            if let Some(hash) = section.gnu_hash(endian, data)? {
+                return Ok(Some(hash));
+            }
+        }
+        Ok(None)
+    }
+
+    /// Return the contents of a `SHT_GNU_VERSYM` section.
+    ///
+    /// Returns `Ok(None)` if there is no `SHT_GNU_VERSYM` section.
+    /// Returns `Err` for invalid values.
+    pub fn gnu_versym(
+        &self,
+        endian: Elf::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data [elf::Versym<Elf::Endian>]>> {
+        for section in self.sections {
+            if let Some(syms) = section.gnu_versym(endian, data)? {
+                return Ok(Some(syms));
+            }
+        }
+        Ok(None)
+    }
+
+    /// Return the contents of a `SHT_GNU_VERDEF` section.
+    ///
+    /// Returns `Ok(None)` if there is no `SHT_GNU_VERDEF` section.
+    /// Returns `Err` for invalid values.
+    pub fn gnu_verdef(
+        &self,
+        endian: Elf::Endian,
+        data: R,
+    ) -> read::Result<Option<VerdefIterator<'data, Elf>>> {
+        for section in self.sections {
+            if let Some(defs) = section.gnu_verdef(endian, data)? {
+                return Ok(Some(defs));
+            }
+        }
+        Ok(None)
+    }
+
+    /// Return the contents of a `SHT_GNU_VERNEED` section.
+    ///
+    /// Returns `Ok(None)` if there is no `SHT_GNU_VERNEED` section.
+    /// Returns `Err` for invalid values.
+    pub fn gnu_verneed(
+        &self,
+        endian: Elf::Endian,
+        data: R,
+    ) -> read::Result<Option<VerneedIterator<'data, Elf>>> {
+        for section in self.sections {
+            if let Some(needs) = section.gnu_verneed(endian, data)? {
+                return Ok(Some(needs));
+            }
+        }
+        Ok(None)
+    }
 }
 
 /// An iterator over the sections of an `ElfFile32`.
-pub type ElfSectionIterator32<'data, 'file, Endian = Endianness> =
-    ElfSectionIterator<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfSectionIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSectionIterator<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// An iterator over the sections of an `ElfFile64`.
-pub type ElfSectionIterator64<'data, 'file, Endian = Endianness> =
-    ElfSectionIterator<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfSectionIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSectionIterator<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// An iterator over the sections of an `ElfFile`.
 #[derive(Debug)]
-pub struct ElfSectionIterator<'data, 'file, Elf>
+pub struct ElfSectionIterator<'data, 'file, Elf, R = &'data [u8]>
 where
-    'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file ElfFile<'data, Elf>,
+    pub(super) file: &'file ElfFile<'data, Elf, R>,
     pub(super) iter: iter::Enumerate<slice::Iter<'data, Elf::SectionHeader>>,
 }
 
-impl<'data, 'file, Elf: FileHeader> Iterator for ElfSectionIterator<'data, 'file, Elf> {
-    type Item = ElfSection<'data, 'file, Elf>;
+impl<'data, 'file, Elf, R> Iterator for ElfSectionIterator<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+    type Item = ElfSection<'data, 'file, Elf, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next().map(|(index, section)| ElfSection {
@@ -135,57 +288,64 @@
 }
 
 /// A section of an `ElfFile32`.
-pub type ElfSection32<'data, 'file, Endian = Endianness> =
-    ElfSection<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfSection32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSection<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// A section of an `ElfFile64`.
-pub type ElfSection64<'data, 'file, Endian = Endianness> =
-    ElfSection<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfSection64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSection<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// A section of an `ElfFile`.
 #[derive(Debug)]
-pub struct ElfSection<'data, 'file, Elf>
+pub struct ElfSection<'data, 'file, Elf, R = &'data [u8]>
 where
     'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file ElfFile<'data, Elf>,
+    pub(super) file: &'file ElfFile<'data, Elf, R>,
     pub(super) index: SectionIndex,
     pub(super) section: &'data Elf::SectionHeader,
 }
 
-impl<'data, 'file, Elf: FileHeader> ElfSection<'data, 'file, Elf> {
-    fn bytes(&self) -> read::Result<Bytes<'data>> {
+impl<'data, 'file, Elf: FileHeader, R: ReadRef<'data>> ElfSection<'data, 'file, Elf, R> {
+    fn bytes(&self) -> read::Result<&'data [u8]> {
         self.section
             .data(self.file.endian, self.file.data)
             .read_error("Invalid ELF section size or offset")
     }
 
-    fn maybe_compressed_data(&self) -> read::Result<Option<CompressedData<'data>>> {
+    fn maybe_compressed(&self) -> read::Result<Option<CompressedFileRange>> {
         let endian = self.file.endian;
         if (self.section.sh_flags(endian).into() & u64::from(elf::SHF_COMPRESSED)) == 0 {
             return Ok(None);
         }
-
-        let mut data = self
+        let (section_offset, section_size) = self
             .section
-            .data(endian, self.file.data)
-            .read_error("Invalid ELF compressed section offset or size")?;
-        let header = data
-            .read::<Elf::CompressionHeader>()
-            .read_error("Invalid ELF compression header size or alignment")?;
+            .file_range(endian)
+            .read_error("Invalid ELF compressed section type")?;
+        let mut offset = section_offset;
+        let header = self
+            .file
+            .data
+            .read::<Elf::CompressionHeader>(&mut offset)
+            .read_error("Invalid ELF compressed section offset")?;
         if header.ch_type(endian) != elf::ELFCOMPRESS_ZLIB {
             return Err(Error("Unsupported ELF compression type"));
         }
-        let uncompressed_size: u64 = header.ch_size(endian).into();
-        Ok(Some(CompressedData {
+        let uncompressed_size = header.ch_size(endian).into();
+        let compressed_size = section_size
+            .checked_sub(offset - section_offset)
+            .read_error("Invalid ELF compressed section size")?;
+        Ok(Some(CompressedFileRange {
             format: CompressionFormat::Zlib,
-            data: data.0,
-            uncompressed_size: uncompressed_size as usize,
+            offset,
+            compressed_size,
+            uncompressed_size,
         }))
     }
 
     /// Try GNU-style "ZLIB" header decompression.
-    fn maybe_compressed_data_gnu(&self) -> read::Result<Option<CompressedData<'data>>> {
+    fn maybe_compressed_gnu(&self) -> read::Result<Option<CompressedFileRange>> {
         let name = match self.name() {
             Ok(name) => name,
             // I think it's ok to ignore this error?
@@ -194,34 +354,52 @@
         if !name.starts_with(".zdebug_") {
             return Ok(None);
         }
-        let mut data = self.bytes()?;
+        let (section_offset, section_size) = self
+            .section
+            .file_range(self.file.endian)
+            .read_error("Invalid ELF GNU compressed section type")?;
+        let mut offset = section_offset;
+        let data = self.file.data;
         // Assume ZLIB-style uncompressed data is no more than 4GB to avoid accidentally
         // huge allocations. This also reduces the chance of accidentally matching on a
         // .debug_str that happens to start with "ZLIB".
         if data
-            .read_bytes(8)
+            .read_bytes(&mut offset, 8)
             .read_error("ELF GNU compressed section is too short")?
-            .0
             != b"ZLIB\0\0\0\0"
         {
             return Err(Error("Invalid ELF GNU compressed section header"));
         }
         let uncompressed_size = data
-            .read::<U32Bytes<_>>()
+            .read::<U32Bytes<_>>(&mut offset)
             .read_error("ELF GNU compressed section is too short")?
-            .get(endian::BigEndian);
-        Ok(Some(CompressedData {
+            .get(endian::BigEndian)
+            .into();
+        let compressed_size = section_size
+            .checked_sub(offset - section_offset)
+            .read_error("ELF GNU compressed section is too short")?;
+        Ok(Some(CompressedFileRange {
             format: CompressionFormat::Zlib,
-            data: data.0,
-            uncompressed_size: uncompressed_size as usize,
+            offset,
+            compressed_size,
+            uncompressed_size,
         }))
     }
 }
 
-impl<'data, 'file, Elf: FileHeader> read::private::Sealed for ElfSection<'data, 'file, Elf> {}
+impl<'data, 'file, Elf, R> read::private::Sealed for ElfSection<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Elf: FileHeader> ObjectSection<'data> for ElfSection<'data, 'file, Elf> {
-    type RelocationIterator = ElfRelocationIterator<'data, 'file, Elf>;
+impl<'data, 'file, Elf, R> ObjectSection<'data> for ElfSection<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+    type RelocationIterator = ElfSectionRelocationIterator<'data, 'file, Elf, R>;
 
     #[inline]
     fn index(&self) -> SectionIndex {
@@ -250,11 +428,11 @@
 
     #[inline]
     fn data(&self) -> read::Result<&'data [u8]> {
-        Ok(self.bytes()?.0)
+        self.bytes()
     }
 
     fn data_range(&self, address: u64, size: u64) -> read::Result<Option<&'data [u8]>> {
-        Ok(read::data_range(
+        Ok(read::util::data_range(
             self.bytes()?,
             self.address(),
             address,
@@ -262,16 +440,20 @@
         ))
     }
 
-    fn compressed_data(&self) -> read::Result<CompressedData<'data>> {
-        Ok(if let Some(data) = self.maybe_compressed_data()? {
+    fn compressed_file_range(&self) -> read::Result<CompressedFileRange> {
+        Ok(if let Some(data) = self.maybe_compressed()? {
             data
-        } else if let Some(data) = self.maybe_compressed_data_gnu()? {
+        } else if let Some(data) = self.maybe_compressed_gnu()? {
             data
         } else {
-            CompressedData::none(self.data()?)
+            CompressedFileRange::none(self.file_range())
         })
     }
 
+    fn compressed_data(&self) -> read::Result<CompressedData<'data>> {
+        self.compressed_file_range()?.data(self.file.data)
+    }
+
     fn name(&self) -> read::Result<&str> {
         let name = self
             .file
@@ -289,7 +471,8 @@
 
     fn kind(&self) -> SectionKind {
         let flags = self.section.sh_flags(self.file.endian).into();
-        match self.section.sh_type(self.file.endian) {
+        let sh_type = self.section.sh_type(self.file.endian);
+        match sh_type {
             elf::SHT_PROGBITS => {
                 if flags & u64::from(elf::SHF_ALLOC) != 0 {
                     if flags & u64::from(elf::SHF_EXECINSTR) != 0 {
@@ -326,15 +509,12 @@
             | elf::SHT_REL
             | elf::SHT_DYNSYM
             | elf::SHT_GROUP => SectionKind::Metadata,
-            _ => {
-                // TODO: maybe add more specialised kinds based on sh_type (e.g. Unwind)
-                SectionKind::Unknown
-            }
+            _ => SectionKind::Elf(sh_type),
         }
     }
 
-    fn relocations(&self) -> ElfRelocationIterator<'data, 'file, Elf> {
-        ElfRelocationIterator {
+    fn relocations(&self) -> ElfSectionRelocationIterator<'data, 'file, Elf, R> {
+        ElfSectionRelocationIterator {
             section_index: self.index.0,
             file: self.file,
             relocations: None,
@@ -351,9 +531,9 @@
 /// A trait for generic access to `SectionHeader32` and `SectionHeader64`.
 #[allow(missing_docs)]
 pub trait SectionHeader: Debug + Pod {
+    type Elf: FileHeader<SectionHeader = Self, Endian = Self::Endian, Word = Self::Word>;
     type Word: Into<u64>;
     type Endian: endian::Endian;
-    type Elf: FileHeader<Word = Self::Word, Endian = Self::Endian>;
 
     fn sh_name(&self, endian: Self::Endian) -> u32;
     fn sh_type(&self, endian: Self::Endian) -> u32;
@@ -366,6 +546,17 @@
     fn sh_addralign(&self, endian: Self::Endian) -> Self::Word;
     fn sh_entsize(&self, endian: Self::Endian) -> Self::Word;
 
+    /// Parse the section name from the string table.
+    fn name<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        strings: StringTable<'data, R>,
+    ) -> read::Result<&'data [u8]> {
+        strings
+            .get(self.sh_name(endian))
+            .read_error("Invalid ELF section name offset")
+    }
+
     /// Return the offset and size of the section in the file.
     ///
     /// Returns `None` for sections that have no data in the file.
@@ -381,11 +572,16 @@
     ///
     /// Returns `Ok(&[])` if the section has no data.
     /// Returns `Err` for invalid values.
-    fn data<'data>(&self, endian: Self::Endian, data: Bytes<'data>) -> Result<Bytes<'data>, ()> {
+    fn data<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<&'data [u8]> {
         if let Some((offset, size)) = self.file_range(endian) {
-            data.read_bytes_at(offset as usize, size as usize)
+            data.read_bytes_at(offset, size)
+                .read_error("Invalid ELF section size or offset")
         } else {
-            Ok(Bytes(&[]))
+            Ok(&[])
         }
     }
 
@@ -394,39 +590,277 @@
     /// Allows padding at the end of the data.
     /// Returns `Ok(&[])` if the section has no data.
     /// Returns `Err` for invalid values, including bad alignment.
-    fn data_as_array<'data, T: Pod>(
+    fn data_as_array<'data, T: Pod, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
-    ) -> Result<&'data [T], ()> {
-        let mut data = self.data(endian, data)?;
+        data: R,
+    ) -> read::Result<&'data [T]> {
+        let mut data = self.data(endian, data).map(Bytes)?;
         data.read_slice(data.len() / mem::size_of::<T>())
+            .read_error("Invalid ELF section size or offset")
+    }
+
+    /// Return the symbols in the section.
+    ///
+    /// Also finds the corresponding string table in `sections`.
+    ///
+    /// `section_index` must be the 0-based index of this section, and is used
+    /// to find the corresponding extended section index table in `sections`.
+    ///
+    /// Returns `Ok(None)` if the section does not contain symbols.
+    /// Returns `Err` for invalid values.
+    fn symbols<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+        sections: &SectionTable<'data, Self::Elf, R>,
+        section_index: usize,
+    ) -> read::Result<Option<SymbolTable<'data, Self::Elf, R>>> {
+        let sh_type = self.sh_type(endian);
+        if sh_type != elf::SHT_SYMTAB && sh_type != elf::SHT_DYNSYM {
+            return Ok(None);
+        }
+        SymbolTable::parse(endian, data, sections, section_index, self).map(Some)
+    }
+
+    /// Return the `Elf::Rel` entries in the section.
+    ///
+    /// Returns `Ok(None)` if the section does not contain relocations.
+    /// Returns `Err` for invalid values.
+    fn rel<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data [<Self::Elf as FileHeader>::Rel]>> {
+        if self.sh_type(endian) != elf::SHT_REL {
+            return Ok(None);
+        }
+        self.data_as_array(endian, data)
+            .map(Some)
+            .read_error("Invalid ELF relocation section offset or size")
+    }
+
+    /// Return the `Elf::Rela` entries in the section.
+    ///
+    /// Returns `Ok(None)` if the section does not contain relocations.
+    /// Returns `Err` for invalid values.
+    fn rela<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data [<Self::Elf as FileHeader>::Rela]>> {
+        if self.sh_type(endian) != elf::SHT_RELA {
+            return Ok(None);
+        }
+        self.data_as_array(endian, data)
+            .map(Some)
+            .read_error("Invalid ELF relocation section offset or size")
+    }
+
+    /// Return the symbol table for a relocation section.
+    ///
+    /// Returns `Err` for invalid values, including if the section does not contain
+    /// relocations.
+    fn relocation_symbols<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+        sections: &SectionTable<'data, Self::Elf, R>,
+    ) -> read::Result<SymbolTable<'data, Self::Elf, R>> {
+        let sh_type = self.sh_type(endian);
+        if sh_type != elf::SHT_REL && sh_type != elf::SHT_RELA {
+            return Err(Error("Invalid ELF relocation section type"));
+        }
+        sections.symbol_table_by_index(endian, data, self.sh_link(endian) as usize)
     }
 
     /// Return a note iterator for the section data.
     ///
     /// Returns `Ok(None)` if the section does not contain notes.
     /// Returns `Err` for invalid values.
-    fn notes<'data>(
+    fn notes<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
-    ) -> read::Result<Option<ElfNoteIterator<'data, Self::Elf>>> {
+        data: R,
+    ) -> read::Result<Option<NoteIterator<'data, Self::Elf>>> {
         if self.sh_type(endian) != elf::SHT_NOTE {
             return Ok(None);
         }
         let data = self
             .data(endian, data)
             .read_error("Invalid ELF note section offset or size")?;
-        let notes = ElfNoteIterator::new(endian, self.sh_addralign(endian), data)?;
+        let notes = NoteIterator::new(endian, self.sh_addralign(endian), data)?;
         Ok(Some(notes))
     }
+
+    /// Return the contents of a group section.
+    ///
+    /// The first value is a `GRP_*` value, and the remaining values
+    /// are section indices.
+    ///
+    /// Returns `Ok(None)` if the section does not define a group.
+    /// Returns `Err` for invalid values.
+    fn group<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<(u32, &'data [U32Bytes<Self::Endian>])>> {
+        if self.sh_type(endian) != elf::SHT_GROUP {
+            return Ok(None);
+        }
+        let mut data = self
+            .data(endian, data)
+            .read_error("Invalid ELF group section offset or size")
+            .map(Bytes)?;
+        let flag = data
+            .read::<U32Bytes<_>>()
+            .read_error("Invalid ELF group section offset or size")?
+            .get(endian);
+        let count = data.len() / mem::size_of::<U32Bytes<Self::Endian>>();
+        let sections = data
+            .read_slice(count)
+            .read_error("Invalid ELF group section offset or size")?;
+        Ok(Some((flag, sections)))
+    }
+
+    /// Return the header of a SysV hash section.
+    ///
+    /// Returns `Ok(None)` if the section does not contain a SysV hash.
+    /// Returns `Err` for invalid values.
+    fn hash_header<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data elf::HashHeader<Self::Endian>>> {
+        if self.sh_type(endian) != elf::SHT_HASH {
+            return Ok(None);
+        }
+        let data = self
+            .data(endian, data)
+            .read_error("Invalid ELF hash section offset or size")?;
+        let header = data
+            .read_at::<elf::HashHeader<Self::Endian>>(0)
+            .read_error("Invalid hash header")?;
+        Ok(Some(header))
+    }
+
+    /// Return the contents of a SysV hash section.
+    ///
+    /// Returns `Ok(None)` if the section does not contain a SysV hash.
+    /// Returns `Err` for invalid values.
+    fn hash<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<HashTable<'data, Self::Elf>>> {
+        if self.sh_type(endian) != elf::SHT_HASH {
+            return Ok(None);
+        }
+        let data = self
+            .data(endian, data)
+            .read_error("Invalid ELF hash section offset or size")?;
+        let hash = HashTable::parse(endian, data)?;
+        Ok(Some(hash))
+    }
+
+    /// Return the header of a GNU hash section.
+    ///
+    /// Returns `Ok(None)` if the section does not contain a GNU hash.
+    /// Returns `Err` for invalid values.
+    fn gnu_hash_header<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data elf::GnuHashHeader<Self::Endian>>> {
+        if self.sh_type(endian) != elf::SHT_GNU_HASH {
+            return Ok(None);
+        }
+        let data = self
+            .data(endian, data)
+            .read_error("Invalid ELF GNU hash section offset or size")?;
+        let header = data
+            .read_at::<elf::GnuHashHeader<Self::Endian>>(0)
+            .read_error("Invalid GNU hash header")?;
+        Ok(Some(header))
+    }
+
+    /// Return the contents of a GNU hash section.
+    ///
+    /// Returns `Ok(None)` if the section does not contain a GNU hash.
+    /// Returns `Err` for invalid values.
+    fn gnu_hash<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<GnuHashTable<'data, Self::Elf>>> {
+        if self.sh_type(endian) != elf::SHT_GNU_HASH {
+            return Ok(None);
+        }
+        let data = self
+            .data(endian, data)
+            .read_error("Invalid ELF GNU hash section offset or size")?;
+        let hash = GnuHashTable::parse(endian, data)?;
+        Ok(Some(hash))
+    }
+
+    /// Return the contents of a `SHT_GNU_VERSYM` section.
+    ///
+    /// Returns `Ok(None)` if the section type is not `SHT_GNU_VERSYM`.
+    /// Returns `Err` for invalid values.
+    fn gnu_versym<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data [elf::Versym<Self::Endian>]>> {
+        if self.sh_type(endian) != elf::SHT_GNU_VERSYM {
+            return Ok(None);
+        }
+        self.data_as_array(endian, data)
+            .read_error("Invalid ELF GNU versym section offset or size")
+            .map(Some)
+    }
+
+    /// Return an iterator for the entries of a `SHT_GNU_VERDEF` section.
+    ///
+    /// Returns `Ok(None)` if the section type is not `SHT_GNU_VERDEF`.
+    /// Returns `Err` for invalid values.
+    fn gnu_verdef<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<VerdefIterator<'data, Self::Elf>>> {
+        if self.sh_type(endian) != elf::SHT_GNU_VERDEF {
+            return Ok(None);
+        }
+        let data = self
+            .data_as_array(endian, data)
+            .read_error("Invalid ELF GNU verdef section offset or size")?;
+        Ok(Some(VerdefIterator::new(endian, data)))
+    }
+
+    /// Return an iterator for the entries of a `SHT_GNU_VERNEED` section.
+    ///
+    /// Returns `Ok(None)` if the section type is not `SHT_GNU_VERNEED`.
+    /// Returns `Err` for invalid values.
+    fn gnu_verneed<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<VerneedIterator<'data, Self::Elf>>> {
+        if self.sh_type(endian) != elf::SHT_GNU_VERNEED {
+            return Ok(None);
+        }
+        let data = self
+            .data_as_array(endian, data)
+            .read_error("Invalid ELF GNU verneed section offset or size")?;
+        Ok(Some(VerneedIterator::new(endian, data)))
+    }
 }
 
 impl<Endian: endian::Endian> SectionHeader for elf::SectionHeader32<Endian> {
+    type Elf = elf::FileHeader32<Endian>;
     type Word = u32;
     type Endian = Endian;
-    type Elf = elf::FileHeader32<Endian>;
 
     #[inline]
     fn sh_name(&self, endian: Self::Endian) -> u32 {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/segment.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/segment.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/segment.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/segment.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,37 @@
 use core::fmt::Debug;
-use core::{slice, str};
+use core::{mem, slice, str};
 
 use crate::elf;
 use crate::endian::{self, Endianness};
-use crate::pod::{Bytes, Pod};
-use crate::read::{self, ObjectSegment, ReadError};
+use crate::pod::Pod;
+use crate::read::{self, Bytes, ObjectSegment, ReadError, ReadRef};
 
-use super::{ElfFile, ElfNoteIterator, FileHeader};
+use super::{ElfFile, FileHeader, NoteIterator};
 
 /// An iterator over the segments of an `ElfFile32`.
-pub type ElfSegmentIterator32<'data, 'file, Endian = Endianness> =
-    ElfSegmentIterator<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfSegmentIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSegmentIterator<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// An iterator over the segments of an `ElfFile64`.
-pub type ElfSegmentIterator64<'data, 'file, Endian = Endianness> =
-    ElfSegmentIterator<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfSegmentIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSegmentIterator<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// An iterator over the segments of an `ElfFile`.
 #[derive(Debug)]
-pub struct ElfSegmentIterator<'data, 'file, Elf>
+pub struct ElfSegmentIterator<'data, 'file, Elf, R = &'data [u8]>
 where
-    'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file ElfFile<'data, Elf>,
+    pub(super) file: &'file ElfFile<'data, Elf, R>,
     pub(super) iter: slice::Iter<'data, Elf::ProgramHeader>,
 }
 
-impl<'data, 'file, Elf: FileHeader> Iterator for ElfSegmentIterator<'data, 'file, Elf> {
-    type Item = ElfSegment<'data, 'file, Elf>;
+impl<'data, 'file, Elf, R> Iterator for ElfSegmentIterator<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+    type Item = ElfSegment<'data, 'file, Elf, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         while let Some(segment) = self.iter.next() {
@@ -43,34 +47,44 @@
 }
 
 /// A segment of an `ElfFile32`.
-pub type ElfSegment32<'data, 'file, Endian = Endianness> =
-    ElfSegment<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfSegment32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSegment<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// A segment of an `ElfFile64`.
-pub type ElfSegment64<'data, 'file, Endian = Endianness> =
-    ElfSegment<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfSegment64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSegment<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// A segment of an `ElfFile`.
 #[derive(Debug)]
-pub struct ElfSegment<'data, 'file, Elf>
+pub struct ElfSegment<'data, 'file, Elf, R = &'data [u8]>
 where
     'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file ElfFile<'data, Elf>,
+    pub(super) file: &'file ElfFile<'data, Elf, R>,
     pub(super) segment: &'data Elf::ProgramHeader,
 }
 
-impl<'data, 'file, Elf: FileHeader> ElfSegment<'data, 'file, Elf> {
-    fn bytes(&self) -> read::Result<Bytes<'data>> {
+impl<'data, 'file, Elf: FileHeader, R: ReadRef<'data>> ElfSegment<'data, 'file, Elf, R> {
+    fn bytes(&self) -> read::Result<&'data [u8]> {
         self.segment
             .data(self.file.endian, self.file.data)
             .read_error("Invalid ELF segment size or offset")
     }
 }
 
-impl<'data, 'file, Elf: FileHeader> read::private::Sealed for ElfSegment<'data, 'file, Elf> {}
+impl<'data, 'file, Elf, R> read::private::Sealed for ElfSegment<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Elf: FileHeader> ObjectSegment<'data> for ElfSegment<'data, 'file, Elf> {
+impl<'data, 'file, Elf, R> ObjectSegment<'data> for ElfSegment<'data, 'file, Elf, R>
+where
+    Elf: FileHeader,
+    R: ReadRef<'data>,
+{
     #[inline]
     fn address(&self) -> u64 {
         self.segment.p_vaddr(self.file.endian).into()
@@ -93,11 +107,11 @@
 
     #[inline]
     fn data(&self) -> read::Result<&'data [u8]> {
-        Ok(self.bytes()?.0)
+        self.bytes()
     }
 
     fn data_range(&self, address: u64, size: u64) -> read::Result<Option<&'data [u8]>> {
-        Ok(read::data_range(
+        Ok(read::util::data_range(
             self.bytes()?,
             self.address(),
             address,
@@ -114,9 +128,9 @@
 /// A trait for generic access to `ProgramHeader32` and `ProgramHeader64`.
 #[allow(missing_docs)]
 pub trait ProgramHeader: Debug + Pod {
+    type Elf: FileHeader<ProgramHeader = Self, Endian = Self::Endian, Word = Self::Word>;
     type Word: Into<u64>;
     type Endian: endian::Endian;
-    type Elf: FileHeader<Word = Self::Word, Endian = Self::Endian>;
 
     fn p_type(&self, endian: Self::Endian) -> u32;
     fn p_flags(&self, endian: Self::Endian) -> u32;
@@ -135,27 +149,82 @@
     /// Return the segment data.
     ///
     /// Returns `Err` for invalid values.
-    fn data<'data>(&self, endian: Self::Endian, data: Bytes<'data>) -> Result<Bytes<'data>, ()> {
+    fn data<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> Result<&'data [u8], ()> {
         let (offset, size) = self.file_range(endian);
-        data.read_bytes_at(offset as usize, size as usize)
+        data.read_bytes_at(offset, size)
+    }
+
+    /// Return the segment data as a slice of the given type.
+    ///
+    /// Allows padding at the end of the data.
+    /// Returns `Ok(&[])` if the segment has no data.
+    /// Returns `Err` for invalid values, including bad alignment.
+    fn data_as_array<'data, T: Pod, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> Result<&'data [T], ()> {
+        let mut data = self.data(endian, data).map(Bytes)?;
+        data.read_slice(data.len() / mem::size_of::<T>())
+    }
+
+    /// Return the segment data in the given virtual address range
+    ///
+    /// Returns `Ok(None)` if the segment does not contain the address.
+    /// Returns `Err` for invalid values.
+    fn data_range<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+        address: u64,
+        size: u64,
+    ) -> Result<Option<&'data [u8]>, ()> {
+        Ok(read::util::data_range(
+            self.data(endian, data)?,
+            self.p_vaddr(endian).into(),
+            address,
+            size,
+        ))
+    }
+
+    /// Return entries in a dynamic segment.
+    ///
+    /// Returns `Ok(None)` if the segment is not `PT_DYNAMIC`.
+    /// Returns `Err` for invalid values.
+    fn dynamic<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+    ) -> read::Result<Option<&'data [<Self::Elf as FileHeader>::Dyn]>> {
+        if self.p_type(endian) != elf::PT_DYNAMIC {
+            return Ok(None);
+        }
+        let dynamic = self
+            .data_as_array(endian, data)
+            .read_error("Invalid ELF dynamic segment offset or size")?;
+        Ok(Some(dynamic))
     }
 
     /// Return a note iterator for the segment data.
     ///
     /// Returns `Ok(None)` if the segment does not contain notes.
     /// Returns `Err` for invalid values.
-    fn notes<'data>(
+    fn notes<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
-    ) -> read::Result<Option<ElfNoteIterator<'data, Self::Elf>>> {
-        if self.p_type(endian) == elf::PT_NOTE {
+        data: R,
+    ) -> read::Result<Option<NoteIterator<'data, Self::Elf>>> {
+        if self.p_type(endian) != elf::PT_NOTE {
             return Ok(None);
         }
         let data = self
             .data(endian, data)
             .read_error("Invalid ELF note segment offset or size")?;
-        let notes = ElfNoteIterator::new(endian, self.p_align(endian), data)?;
+        let notes = NoteIterator::new(endian, self.p_align(endian), data)?;
         Ok(Some(notes))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/symbol.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/symbol.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/symbol.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/symbol.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,11 +6,11 @@
 
 use crate::elf;
 use crate::endian::{self, Endianness};
-use crate::pod::{Bytes, Pod};
+use crate::pod::Pod;
 use crate::read::util::StringTable;
 use crate::read::{
-    self, ObjectSymbol, ObjectSymbolTable, ReadError, SectionIndex, SymbolFlags, SymbolIndex,
-    SymbolKind, SymbolMap, SymbolMapEntry, SymbolScope, SymbolSection,
+    self, ObjectSymbol, ObjectSymbolTable, ReadError, ReadRef, SectionIndex, SymbolFlags,
+    SymbolIndex, SymbolKind, SymbolMap, SymbolMapEntry, SymbolScope, SymbolSection,
 };
 
 use super::{FileHeader, SectionHeader, SectionTable};
@@ -19,14 +19,17 @@
 ///
 /// Also includes the string table used for the symbol names.
 #[derive(Debug, Clone, Copy)]
-pub struct SymbolTable<'data, Elf: FileHeader> {
+pub struct SymbolTable<'data, Elf: FileHeader, R = &'data [u8]>
+where
+    R: ReadRef<'data>,
+{
     section: usize,
     symbols: &'data [Elf::Sym],
-    strings: StringTable<'data>,
+    strings: StringTable<'data, R>,
     shndx: &'data [u32],
 }
 
-impl<'data, Elf: FileHeader> Default for SymbolTable<'data, Elf> {
+impl<'data, Elf: FileHeader, R: ReadRef<'data>> Default for SymbolTable<'data, Elf, R> {
     fn default() -> Self {
         SymbolTable {
             section: 0,
@@ -37,40 +40,39 @@
     }
 }
 
-impl<'data, Elf: FileHeader> SymbolTable<'data, Elf> {
-    /// Parse the symbol table of the given section type.
-    ///
-    /// Returns an empty symbol table if the symbol table does not exist.
+impl<'data, Elf: FileHeader, R: ReadRef<'data>> SymbolTable<'data, Elf, R> {
+    /// Parse the given symbol table section.
     pub fn parse(
         endian: Elf::Endian,
-        data: Bytes<'data>,
-        sections: &SectionTable<Elf>,
-        sh_type: u32,
-    ) -> read::Result<SymbolTable<'data, Elf>> {
-        debug_assert!(sh_type == elf::SHT_DYNSYM || sh_type == elf::SHT_SYMTAB);
+        data: R,
+        sections: &SectionTable<'data, Elf, R>,
+        section_index: usize,
+        section: &Elf::SectionHeader,
+    ) -> read::Result<SymbolTable<'data, Elf, R>> {
+        debug_assert!(
+            section.sh_type(endian) == elf::SHT_DYNSYM
+                || section.sh_type(endian) == elf::SHT_SYMTAB
+        );
 
-        let (section, symtab) = match sections
-            .iter()
-            .enumerate()
-            .find(|s| s.1.sh_type(endian) == sh_type)
-        {
-            Some(s) => s,
-            None => return Ok(SymbolTable::default()),
-        };
-        let symbols = symtab
+        let symbols = section
             .data_as_array(endian, data)
             .read_error("Invalid ELF symbol table data")?;
 
-        let strtab = sections.section(symtab.sh_link(endian) as usize)?;
-        let strtab_data = strtab
-            .data(endian, data)
-            .read_error("Invalid ELF string table data")?;
-        let strings = StringTable::new(strtab_data);
+        let strtab = sections.section(section.sh_link(endian) as usize)?;
+        let strings = if let Some((str_offset, str_size)) = strtab.file_range(endian) {
+            let str_end = str_offset
+                .checked_add(str_size)
+                .read_error("Invalid str_size")?;
+            StringTable::new(data, str_offset, str_end)
+        } else {
+            StringTable::default()
+        };
 
         let shndx = sections
             .iter()
             .find(|s| {
-                s.sh_type(endian) == elf::SHT_SYMTAB_SHNDX && s.sh_link(endian) as usize == section
+                s.sh_type(endian) == elf::SHT_SYMTAB_SHNDX
+                    && s.sh_link(endian) as usize == section_index
             })
             .map(|section| {
                 section
@@ -81,7 +83,7 @@
             .unwrap_or(&[]);
 
         Ok(SymbolTable {
-            section,
+            section: section_index,
             symbols,
             strings,
             shndx,
@@ -96,10 +98,16 @@
 
     /// Return the string table used for the symbol names.
     #[inline]
-    pub fn strings(&self) -> StringTable<'data> {
+    pub fn strings(&self) -> StringTable<'data, R> {
         self.strings
     }
 
+    /// Return the symbol table.
+    #[inline]
+    pub fn symbols(&self) -> &'data [Elf::Sym] {
+        self.symbols
+    }
+
     /// Iterate over the symbols.
     #[inline]
     pub fn iter(&self) -> slice::Iter<'data, Elf::Sym> {
@@ -131,6 +139,15 @@
         self.shndx.get(index).cloned()
     }
 
+    /// Return the symbol name for the given symbol.
+    pub fn symbol_name(
+        &self,
+        endian: Elf::Endian,
+        symbol: &'data Elf::Sym,
+    ) -> read::Result<&'data [u8]> {
+        symbol.name(endian, self.strings)
+    }
+
     /// Construct a map from addresses to a user-defined map entry.
     pub fn map<Entry: SymbolMapEntry, F: Fn(&'data Elf::Sym) -> Option<Entry>>(
         &self,
@@ -151,28 +168,34 @@
 }
 
 /// A symbol table of an `ElfFile32`.
-pub type ElfSymbolTable32<'data, 'file, Endian = Endianness> =
-    ElfSymbolTable<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfSymbolTable32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSymbolTable<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// A symbol table of an `ElfFile32`.
-pub type ElfSymbolTable64<'data, 'file, Endian = Endianness> =
-    ElfSymbolTable<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfSymbolTable64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSymbolTable<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// A symbol table of an `ElfFile`.
 #[derive(Debug, Clone, Copy)]
-pub struct ElfSymbolTable<'data, 'file, Elf>
+pub struct ElfSymbolTable<'data, 'file, Elf, R = &'data [u8]>
 where
     'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
     pub(super) endian: Elf::Endian,
-    pub(super) symbols: &'file SymbolTable<'data, Elf>,
+    pub(super) symbols: &'file SymbolTable<'data, Elf, R>,
 }
 
-impl<'data, 'file, Elf: FileHeader> read::private::Sealed for ElfSymbolTable<'data, 'file, Elf> {}
+impl<'data, 'file, Elf: FileHeader, R: ReadRef<'data>> read::private::Sealed
+    for ElfSymbolTable<'data, 'file, Elf, R>
+{
+}
 
-impl<'data, 'file, Elf: FileHeader> ObjectSymbolTable<'data> for ElfSymbolTable<'data, 'file, Elf> {
-    type Symbol = ElfSymbol<'data, 'file, Elf>;
-    type SymbolIterator = ElfSymbolIterator<'data, 'file, Elf>;
+impl<'data, 'file, Elf: FileHeader, R: ReadRef<'data>> ObjectSymbolTable<'data>
+    for ElfSymbolTable<'data, 'file, Elf, R>
+{
+    type Symbol = ElfSymbol<'data, 'file, Elf, R>;
+    type SymbolIterator = ElfSymbolIterator<'data, 'file, Elf, R>;
 
     fn symbols(&self) -> Self::SymbolIterator {
         ElfSymbolIterator {
@@ -194,31 +217,36 @@
 }
 
 /// An iterator over the symbols of an `ElfFile32`.
-pub type ElfSymbolIterator32<'data, 'file, Endian = Endianness> =
-    ElfSymbolIterator<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfSymbolIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSymbolIterator<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// An iterator over the symbols of an `ElfFile64`.
-pub type ElfSymbolIterator64<'data, 'file, Endian = Endianness> =
-    ElfSymbolIterator<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfSymbolIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSymbolIterator<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// An iterator over the symbols of an `ElfFile`.
-pub struct ElfSymbolIterator<'data, 'file, Elf>
+pub struct ElfSymbolIterator<'data, 'file, Elf, R = &'data [u8]>
 where
     'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
     pub(super) endian: Elf::Endian,
-    pub(super) symbols: &'file SymbolTable<'data, Elf>,
+    pub(super) symbols: &'file SymbolTable<'data, Elf, R>,
     pub(super) index: usize,
 }
 
-impl<'data, 'file, Elf: FileHeader> fmt::Debug for ElfSymbolIterator<'data, 'file, Elf> {
+impl<'data, 'file, Elf: FileHeader, R: ReadRef<'data>> fmt::Debug
+    for ElfSymbolIterator<'data, 'file, Elf, R>
+{
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("ElfSymbolIterator").finish()
     }
 }
 
-impl<'data, 'file, Elf: FileHeader> Iterator for ElfSymbolIterator<'data, 'file, Elf> {
-    type Item = ElfSymbol<'data, 'file, Elf>;
+impl<'data, 'file, Elf: FileHeader, R: ReadRef<'data>> Iterator
+    for ElfSymbolIterator<'data, 'file, Elf, R>
+{
+    type Item = ElfSymbol<'data, 'file, Elf, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         let index = self.index;
@@ -234,28 +262,34 @@
 }
 
 /// A symbol of an `ElfFile32`.
-pub type ElfSymbol32<'data, 'file, Endian = Endianness> =
-    ElfSymbol<'data, 'file, elf::FileHeader32<Endian>>;
+pub type ElfSymbol32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSymbol<'data, 'file, elf::FileHeader32<Endian>, R>;
 /// A symbol of an `ElfFile64`.
-pub type ElfSymbol64<'data, 'file, Endian = Endianness> =
-    ElfSymbol<'data, 'file, elf::FileHeader64<Endian>>;
+pub type ElfSymbol64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    ElfSymbol<'data, 'file, elf::FileHeader64<Endian>, R>;
 
 /// A symbol of an `ElfFile`.
 #[derive(Debug, Clone, Copy)]
-pub struct ElfSymbol<'data, 'file, Elf>
+pub struct ElfSymbol<'data, 'file, Elf, R = &'data [u8]>
 where
     'data: 'file,
     Elf: FileHeader,
+    R: ReadRef<'data>,
 {
     pub(super) endian: Elf::Endian,
-    pub(super) symbols: &'file SymbolTable<'data, Elf>,
+    pub(super) symbols: &'file SymbolTable<'data, Elf, R>,
     pub(super) index: SymbolIndex,
     pub(super) symbol: &'data Elf::Sym,
 }
 
-impl<'data, 'file, Elf: FileHeader> read::private::Sealed for ElfSymbol<'data, 'file, Elf> {}
+impl<'data, 'file, Elf: FileHeader, R: ReadRef<'data>> read::private::Sealed
+    for ElfSymbol<'data, 'file, Elf, R>
+{
+}
 
-impl<'data, 'file, Elf: FileHeader> ObjectSymbol<'data> for ElfSymbol<'data, 'file, Elf> {
+impl<'data, 'file, Elf: FileHeader, R: ReadRef<'data>> ObjectSymbol<'data>
+    for ElfSymbol<'data, 'file, Elf, R>
+{
     #[inline]
     fn index(&self) -> SymbolIndex {
         self.index
@@ -386,16 +420,22 @@
     fn st_size(&self, endian: Self::Endian) -> Self::Word;
 
     /// Parse the symbol name from the string table.
-    fn name<'data>(
+    fn name<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        strings: StringTable<'data>,
+        strings: StringTable<'data, R>,
     ) -> read::Result<&'data [u8]> {
         strings
             .get(self.st_name(endian))
             .read_error("Invalid ELF symbol name offset")
     }
 
+    /// Return true if the symbol is undefined.
+    #[inline]
+    fn is_undefined(&self, endian: Self::Endian) -> bool {
+        self.st_shndx(endian) == elf::SHN_UNDEF
+    }
+
     /// Return true if the symbol is a definition of a function or data object.
     fn is_definition(&self, endian: Self::Endian) -> bool {
         let st_type = self.st_type();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/version.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/version.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/elf/version.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/elf/version.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,175 @@
+use crate::elf;
+use crate::read::{Bytes, ReadError, Result};
+
+use super::FileHeader;
+
+/// An iterator over the entries in an ELF `SHT_GNU_verdef` section.
+#[derive(Debug, Clone)]
+pub struct VerdefIterator<'data, Elf: FileHeader> {
+    endian: Elf::Endian,
+    data: Bytes<'data>,
+}
+
+impl<'data, Elf: FileHeader> VerdefIterator<'data, Elf> {
+    pub(super) fn new(endian: Elf::Endian, data: &'data [u8]) -> Self {
+        VerdefIterator {
+            endian,
+            data: Bytes(data),
+        }
+    }
+
+    /// Return the next `Verdef` entry.
+    pub fn next(
+        &mut self,
+    ) -> Result<Option<(&'data elf::Verdef<Elf::Endian>, VerdauxIterator<'data, Elf>)>> {
+        if self.data.is_empty() {
+            return Ok(None);
+        }
+
+        let verdef = self
+            .data
+            .read_at::<elf::Verdef<_>>(0)
+            .read_error("ELF verdef is too short")?;
+
+        let mut verdaux_data = self.data;
+        verdaux_data
+            .skip(verdef.vd_aux.get(self.endian) as usize)
+            .read_error("Invalid ELF vd_aux")?;
+        let verdaux =
+            VerdauxIterator::new(self.endian, verdaux_data.0, verdef.vd_cnt.get(self.endian));
+
+        let next = verdef.vd_next.get(self.endian);
+        if next != 0 {
+            self.data
+                .skip(next as usize)
+                .read_error("Invalid ELF vd_next")?;
+        } else {
+            self.data = Bytes(&[]);
+        }
+        Ok(Some((verdef, verdaux)))
+    }
+}
+
+/// An iterator over the auxiliary records for an entry in an ELF `SHT_GNU_verdef` section.
+#[derive(Debug, Clone)]
+pub struct VerdauxIterator<'data, Elf: FileHeader> {
+    endian: Elf::Endian,
+    data: Bytes<'data>,
+    count: u16,
+}
+
+impl<'data, Elf: FileHeader> VerdauxIterator<'data, Elf> {
+    pub(super) fn new(endian: Elf::Endian, data: &'data [u8], count: u16) -> Self {
+        VerdauxIterator {
+            endian,
+            data: Bytes(data),
+            count,
+        }
+    }
+
+    /// Return the next `Verdaux` entry.
+    pub fn next(&mut self) -> Result<Option<&'data elf::Verdaux<Elf::Endian>>> {
+        if self.count == 0 {
+            return Ok(None);
+        }
+
+        let verdaux = self
+            .data
+            .read_at::<elf::Verdaux<_>>(0)
+            .read_error("ELF verdaux is too short")?;
+
+        self.data
+            .skip(verdaux.vda_next.get(self.endian) as usize)
+            .read_error("Invalid ELF vda_next")?;
+        self.count -= 1;
+        Ok(Some(verdaux))
+    }
+}
+
+/// An iterator over the entries in an ELF `SHT_GNU_verneed` section.
+#[derive(Debug, Clone)]
+pub struct VerneedIterator<'data, Elf: FileHeader> {
+    endian: Elf::Endian,
+    data: Bytes<'data>,
+}
+
+impl<'data, Elf: FileHeader> VerneedIterator<'data, Elf> {
+    pub(super) fn new(endian: Elf::Endian, data: &'data [u8]) -> Self {
+        VerneedIterator {
+            endian,
+            data: Bytes(data),
+        }
+    }
+
+    /// Return the next `Verneed` entry.
+    pub fn next(
+        &mut self,
+    ) -> Result<
+        Option<(
+            &'data elf::Verneed<Elf::Endian>,
+            VernauxIterator<'data, Elf>,
+        )>,
+    > {
+        if self.data.is_empty() {
+            return Ok(None);
+        }
+
+        let verneed = self
+            .data
+            .read_at::<elf::Verneed<_>>(0)
+            .read_error("ELF verneed is too short")?;
+
+        let mut vernaux_data = self.data;
+        vernaux_data
+            .skip(verneed.vn_aux.get(self.endian) as usize)
+            .read_error("Invalid ELF vn_aux")?;
+        let vernaux =
+            VernauxIterator::new(self.endian, vernaux_data.0, verneed.vn_cnt.get(self.endian));
+
+        let next = verneed.vn_next.get(self.endian);
+        if next != 0 {
+            self.data
+                .skip(next as usize)
+                .read_error("Invalid ELF vn_next")?;
+        } else {
+            self.data = Bytes(&[]);
+        }
+        Ok(Some((verneed, vernaux)))
+    }
+}
+
+/// An iterator over the auxiliary records for an entry in an ELF `SHT_GNU_verneed` section.
+#[derive(Debug, Clone)]
+pub struct VernauxIterator<'data, Elf: FileHeader> {
+    endian: Elf::Endian,
+    data: Bytes<'data>,
+    count: u16,
+}
+
+impl<'data, Elf: FileHeader> VernauxIterator<'data, Elf> {
+    pub(super) fn new(endian: Elf::Endian, data: &'data [u8], count: u16) -> Self {
+        VernauxIterator {
+            endian,
+            data: Bytes(data),
+            count,
+        }
+    }
+
+    /// Return the next `Vernaux` entry.
+    pub fn next(&mut self) -> Result<Option<&'data elf::Vernaux<Elf::Endian>>> {
+        if self.count == 0 {
+            return Ok(None);
+        }
+
+        let vernaux = self
+            .data
+            .read_at::<elf::Vernaux<_>>(0)
+            .read_error("ELF vernaux is too short")?;
+
+        self.data
+            .skip(vernaux.vna_next.get(self.endian) as usize)
+            .read_error("Invalid ELF vna_next")?;
+        self.count -= 1;
+        Ok(Some(vernaux))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/dyld_cache.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/dyld_cache.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/dyld_cache.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/dyld_cache.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,218 @@
+use core::slice;
+
+use crate::read::{Error, File, ReadError, ReadRef, Result};
+use crate::{macho, Architecture, Endian, Endianness};
+
+/// A parsed representation of the dyld shared cache.
+#[derive(Debug)]
+pub struct DyldCache<'data, E = Endianness, R = &'data [u8]>
+where
+    E: Endian,
+    R: ReadRef<'data>,
+{
+    endian: E,
+    data: R,
+    header: &'data macho::DyldCacheHeader<E>,
+    mappings: &'data [macho::DyldCacheMappingInfo<E>],
+    images: &'data [macho::DyldCacheImageInfo<E>],
+    arch: Architecture,
+}
+
+impl<'data, E, R> DyldCache<'data, E, R>
+where
+    E: Endian,
+    R: ReadRef<'data>,
+{
+    /// Parse the raw dyld shared cache data.
+    pub fn parse(data: R) -> Result<Self> {
+        let header = macho::DyldCacheHeader::parse(data)?;
+        let (arch, endian) = header.parse_magic()?;
+        let mappings = header.mappings(endian, data)?;
+        let images = header.images(endian, data)?;
+        Ok(DyldCache {
+            endian,
+            data,
+            header,
+            mappings,
+            images,
+            arch,
+        })
+    }
+
+    /// Get the architecture type of the file.
+    pub fn architecture(&self) -> Architecture {
+        self.arch
+    }
+
+    /// Get the endianness of the file.
+    #[inline]
+    pub fn endianness(&self) -> Endianness {
+        if self.is_little_endian() {
+            Endianness::Little
+        } else {
+            Endianness::Big
+        }
+    }
+
+    /// Return true if the file is little endian, false if it is big endian.
+    pub fn is_little_endian(&self) -> bool {
+        self.endian.is_little_endian()
+    }
+
+    /// Iterate over the images in this cache.
+    pub fn images<'cache>(&'cache self) -> DyldCacheImageIterator<'data, 'cache, E, R> {
+        DyldCacheImageIterator {
+            cache: self,
+            iter: self.images.iter(),
+        }
+    }
+}
+
+/// An iterator over all the images (dylibs) in the dyld shared cache.
+#[derive(Debug)]
+pub struct DyldCacheImageIterator<'data, 'cache, E = Endianness, R = &'data [u8]>
+where
+    E: Endian,
+    R: ReadRef<'data>,
+{
+    cache: &'cache DyldCache<'data, E, R>,
+    iter: slice::Iter<'data, macho::DyldCacheImageInfo<E>>,
+}
+
+impl<'data, 'cache, E, R> Iterator for DyldCacheImageIterator<'data, 'cache, E, R>
+where
+    E: Endian,
+    R: ReadRef<'data>,
+{
+    type Item = DyldCacheImage<'data, E, R>;
+
+    fn next(&mut self) -> Option<DyldCacheImage<'data, E, R>> {
+        let image_info = self.iter.next()?;
+        Some(DyldCacheImage {
+            endian: self.cache.endian,
+            data: self.cache.data,
+            mappings: self.cache.mappings,
+            image_info,
+        })
+    }
+}
+
+/// One image (dylib) from inside the dyld shared cache.
+#[derive(Debug)]
+pub struct DyldCacheImage<'data, E = Endianness, R = &'data [u8]>
+where
+    E: Endian,
+    R: ReadRef<'data>,
+{
+    endian: E,
+    data: R,
+    mappings: &'data [macho::DyldCacheMappingInfo<E>],
+    image_info: &'data macho::DyldCacheImageInfo<E>,
+}
+
+impl<'data, E, R> DyldCacheImage<'data, E, R>
+where
+    E: Endian,
+    R: ReadRef<'data>,
+{
+    /// The file system path of this image.
+    pub fn path(&self) -> Result<&'data str> {
+        let path = self.image_info.path(self.endian, self.data)?;
+        // The path should always be ascii, so from_utf8 should alway succeed.
+        let path = core::str::from_utf8(path).map_err(|_| Error("Path string not valid utf-8"))?;
+        Ok(path)
+    }
+
+    /// The offset in the dyld cache file where this image starts.
+    pub fn file_offset(&self) -> Result<u64> {
+        self.image_info.file_offset(self.endian, self.mappings)
+    }
+
+    /// Parse this image into an Object.
+    pub fn parse_object(&self) -> Result<File<'data, R>> {
+        File::parse_at(self.data, self.file_offset()?)
+    }
+}
+
+impl<E: Endian> macho::DyldCacheHeader<E> {
+    /// Read the dyld cache header.
+    pub fn parse<'data, R: ReadRef<'data>>(data: R) -> Result<&'data Self> {
+        data.read_at::<macho::DyldCacheHeader<E>>(0)
+            .read_error("Invalid dyld cache header size or alignment")
+    }
+
+    /// Returns (arch, endian) based on the magic string.
+    pub fn parse_magic(&self) -> Result<(Architecture, E)> {
+        let (arch, is_big_endian) = match &self.magic {
+            b"dyld_v1    i386\0" => (Architecture::I386, false),
+            b"dyld_v1  x86_64\0" => (Architecture::X86_64, false),
+            b"dyld_v1 x86_64h\0" => (Architecture::X86_64, false),
+            b"dyld_v1     ppc\0" => (Architecture::PowerPc, true),
+            b"dyld_v1   armv6\0" => (Architecture::Arm, false),
+            b"dyld_v1   armv7\0" => (Architecture::Arm, false),
+            b"dyld_v1  armv7f\0" => (Architecture::Arm, false),
+            b"dyld_v1  armv7s\0" => (Architecture::Arm, false),
+            b"dyld_v1  armv7k\0" => (Architecture::Arm, false),
+            b"dyld_v1   arm64\0" => (Architecture::Aarch64, false),
+            b"dyld_v1  arm64e\0" => (Architecture::Aarch64, false),
+            _ => return Err(Error("Unrecognized dyld cache magic")),
+        };
+        let endian =
+            E::from_big_endian(is_big_endian).read_error("Unsupported dyld cache endian")?;
+        Ok((arch, endian))
+    }
+
+    /// Return the mapping information table.
+    pub fn mappings<'data, R: ReadRef<'data>>(
+        &self,
+        endian: E,
+        data: R,
+    ) -> Result<&'data [macho::DyldCacheMappingInfo<E>]> {
+        data.read_slice_at::<macho::DyldCacheMappingInfo<E>>(
+            self.mapping_offset.get(endian).into(),
+            self.mapping_count.get(endian) as usize,
+        )
+        .read_error("Invalid dyld cache mapping size or alignment")
+    }
+
+    /// Return the image information table.
+    pub fn images<'data, R: ReadRef<'data>>(
+        &self,
+        endian: E,
+        data: R,
+    ) -> Result<&'data [macho::DyldCacheImageInfo<E>]> {
+        data.read_slice_at::<macho::DyldCacheImageInfo<E>>(
+            self.images_offset.get(endian).into(),
+            self.images_count.get(endian) as usize,
+        )
+        .read_error("Invalid dyld cache image size or alignment")
+    }
+}
+
+impl<E: Endian> macho::DyldCacheImageInfo<E> {
+    /// The file system path of this image.
+    pub fn path<'data, R: ReadRef<'data>>(&self, endian: E, data: R) -> Result<&'data [u8]> {
+        let r_start = self.path_file_offset.get(endian).into();
+        let r_end = data.len().read_error("Couldn't get data len()")?;
+        data.read_bytes_at_until(r_start..r_end, 0)
+            .read_error("Couldn't read dyld cache image path")
+    }
+
+    /// Find the file offset of the image by looking up its address in the mappings.
+    pub fn file_offset(
+        &self,
+        endian: E,
+        mappings: &[macho::DyldCacheMappingInfo<E>],
+    ) -> Result<u64> {
+        let address = self.address.get(endian);
+        for mapping in mappings {
+            let mapping_address = mapping.address.get(endian);
+            if address >= mapping_address
+                && address < mapping_address.wrapping_add(mapping.size.get(endian))
+            {
+                return Ok(address - mapping_address + mapping.file_offset.get(endian));
+            }
+        }
+        Err(Error("Invalid dyld cache image address"))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/fat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/fat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/fat.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/fat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,120 @@
+use crate::read::{Architecture, Error, ReadError, ReadRef, Result};
+use crate::{macho, BigEndian, Pod};
+
+pub use macho::{FatArch32, FatArch64, FatHeader};
+
+impl FatHeader {
+    /// Attempt to parse a fat header.
+    ///
+    /// Does not validate the magic value.
+    pub fn parse<'data, R: ReadRef<'data>>(file: R) -> Result<&'data FatHeader> {
+        file.read_at::<FatHeader>(0)
+            .read_error("Invalid fat header size or alignment")
+    }
+
+    /// Attempt to parse a fat header and 32-bit fat arches.
+    pub fn parse_arch32<'data, R: ReadRef<'data>>(file: R) -> Result<&'data [FatArch32]> {
+        let mut offset = 0;
+        let header = file
+            .read::<FatHeader>(&mut offset)
+            .read_error("Invalid fat header size or alignment")?;
+        if header.magic.get(BigEndian) != macho::FAT_MAGIC {
+            return Err(Error("Invalid 32-bit fat magic"));
+        }
+        file.read_slice::<FatArch32>(&mut offset, header.nfat_arch.get(BigEndian) as usize)
+            .read_error("Invalid nfat_arch")
+    }
+
+    /// Attempt to parse a fat header and 64-bit fat arches.
+    pub fn parse_arch64<'data, R: ReadRef<'data>>(file: R) -> Result<&'data [FatArch64]> {
+        let mut offset = 0;
+        let header = file
+            .read::<FatHeader>(&mut offset)
+            .read_error("Invalid fat header size or alignment")?;
+        if header.magic.get(BigEndian) != macho::FAT_MAGIC_64 {
+            return Err(Error("Invalid 64-bit fat magic"));
+        }
+        file.read_slice::<FatArch64>(&mut offset, header.nfat_arch.get(BigEndian) as usize)
+            .read_error("Invalid nfat_arch")
+    }
+}
+
+/// A trait for generic access to `FatArch32` and `FatArch64`.
+#[allow(missing_docs)]
+pub trait FatArch: Pod {
+    type Word: Into<u64>;
+
+    fn cputype(&self) -> u32;
+    fn cpusubtype(&self) -> u32;
+    fn offset(&self) -> Self::Word;
+    fn size(&self) -> Self::Word;
+    fn align(&self) -> u32;
+
+    fn architecture(&self) -> Architecture {
+        match self.cputype() {
+            macho::CPU_TYPE_ARM => Architecture::Arm,
+            macho::CPU_TYPE_ARM64 => Architecture::Aarch64,
+            macho::CPU_TYPE_X86 => Architecture::I386,
+            macho::CPU_TYPE_X86_64 => Architecture::X86_64,
+            macho::CPU_TYPE_MIPS => Architecture::Mips,
+            _ => Architecture::Unknown,
+        }
+    }
+
+    fn file_range(&self) -> (u64, u64) {
+        (self.offset().into(), self.size().into())
+    }
+
+    fn data<'data, R: ReadRef<'data>>(&self, file: R) -> Result<&'data [u8]> {
+        file.read_bytes_at(self.offset().into(), self.size().into())
+            .read_error("Invalid fat arch offset or size")
+    }
+}
+
+impl FatArch for FatArch32 {
+    type Word = u32;
+
+    fn cputype(&self) -> u32 {
+        self.cputype.get(BigEndian)
+    }
+
+    fn cpusubtype(&self) -> u32 {
+        self.cpusubtype.get(BigEndian)
+    }
+
+    fn offset(&self) -> Self::Word {
+        self.offset.get(BigEndian)
+    }
+
+    fn size(&self) -> Self::Word {
+        self.size.get(BigEndian)
+    }
+
+    fn align(&self) -> u32 {
+        self.align.get(BigEndian)
+    }
+}
+
+impl FatArch for FatArch64 {
+    type Word = u64;
+
+    fn cputype(&self) -> u32 {
+        self.cputype.get(BigEndian)
+    }
+
+    fn cpusubtype(&self) -> u32 {
+        self.cpusubtype.get(BigEndian)
+    }
+
+    fn offset(&self) -> Self::Word {
+        self.offset.get(BigEndian)
+    }
+
+    fn size(&self) -> Self::Word {
+        self.size.get(BigEndian)
+    }
+
+    fn align(&self) -> u32 {
+        self.align.get(BigEndian)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,45 +3,64 @@
 use core::{mem, str};
 
 use crate::read::{
-    self, Architecture, ComdatKind, Error, FileFlags, Object, ObjectComdat, ObjectMap,
-    ObjectSection, ReadError, Result, SectionIndex, SymbolIndex,
+    self, Architecture, ComdatKind, Error, Export, FileFlags, Import, NoDynamicRelocationIterator,
+    Object, ObjectComdat, ObjectMap, ObjectSection, ReadError, ReadRef, Result, SectionIndex,
+    SymbolIndex,
 };
-use crate::{endian, macho, BigEndian, Bytes, Endian, Endianness, Pod};
+use crate::{endian, macho, BigEndian, ByteString, Endian, Endianness, Pod};
 
 use super::{
-    MachOLoadCommandIterator, MachOSection, MachOSectionInternal, MachOSectionIterator,
-    MachOSegment, MachOSegmentIterator, MachOSymbol, MachOSymbolIterator, MachOSymbolTable, Nlist,
-    Section, Segment, SymbolTable,
+    LoadCommandIterator, MachOSection, MachOSectionInternal, MachOSectionIterator, MachOSegment,
+    MachOSegmentIterator, MachOSymbol, MachOSymbolIterator, MachOSymbolTable, Nlist, Section,
+    Segment, SymbolTable,
 };
 
 /// A 32-bit Mach-O object file.
-pub type MachOFile32<'data, Endian = Endianness> = MachOFile<'data, macho::MachHeader32<Endian>>;
+pub type MachOFile32<'data, Endian = Endianness, R = &'data [u8]> =
+    MachOFile<'data, macho::MachHeader32<Endian>, R>;
 /// A 64-bit Mach-O object file.
-pub type MachOFile64<'data, Endian = Endianness> = MachOFile<'data, macho::MachHeader64<Endian>>;
+pub type MachOFile64<'data, Endian = Endianness, R = &'data [u8]> =
+    MachOFile<'data, macho::MachHeader64<Endian>, R>;
 
 /// A partially parsed Mach-O file.
 ///
 /// Most of the functionality of this type is provided by the `Object` trait implementation.
 #[derive(Debug)]
-pub struct MachOFile<'data, Mach: MachHeader> {
+pub struct MachOFile<'data, Mach, R = &'data [u8]>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     pub(super) endian: Mach::Endian,
-    pub(super) data: Bytes<'data>,
+    pub(super) data: R,
+    pub(super) header_offset: u64,
     pub(super) header: &'data Mach,
     pub(super) sections: Vec<MachOSectionInternal<'data, Mach>>,
-    pub(super) symbols: SymbolTable<'data, Mach>,
+    pub(super) symbols: SymbolTable<'data, Mach, R>,
 }
 
-impl<'data, Mach: MachHeader> MachOFile<'data, Mach> {
+impl<'data, Mach, R> MachOFile<'data, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     /// Parse the raw Mach-O file data.
-    pub fn parse(data: &'data [u8]) -> Result<Self> {
-        let data = Bytes(data);
-        let header = Mach::parse(data)?;
+    pub fn parse(data: R) -> Result<Self> {
+        Self::parse_at(data, 0)
+    }
+
+    /// Parse the raw Mach-O file data at an arbitrary offset inside the input data.
+    /// This can be used for parsing Mach-O images inside the dyld shared cache,
+    /// where multiple images, located at different offsets, share the same address
+    /// space.
+    pub fn parse_at(data: R, header_offset: u64) -> Result<Self> {
+        let header = Mach::parse(data, header_offset)?;
         let endian = header.endian()?;
 
         let mut symbols = SymbolTable::default();
         // Build a list of sections to make some operations more efficient.
         let mut sections = Vec::new();
-        if let Ok(mut commands) = header.load_commands(endian, data) {
+        if let Ok(mut commands) = header.load_commands(endian, data, header_offset) {
             while let Ok(Some(command)) = commands.next() {
                 if let Some((segment, section_data)) = Mach::Segment::from_command(command)? {
                     for section in segment.sections(endian, section_data)? {
@@ -56,10 +75,11 @@
 
         Ok(MachOFile {
             endian,
+            data,
+            header_offset,
             header,
             sections,
             symbols,
-            data,
         })
     }
 
@@ -77,22 +97,29 @@
     }
 }
 
-impl<'data, Mach: MachHeader> read::private::Sealed for MachOFile<'data, Mach> {}
+impl<'data, Mach, R> read::private::Sealed for MachOFile<'data, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Mach> Object<'data, 'file> for MachOFile<'data, Mach>
+impl<'data, 'file, Mach, R> Object<'data, 'file> for MachOFile<'data, Mach, R>
 where
     'data: 'file,
     Mach: MachHeader,
+    R: 'file + ReadRef<'data>,
 {
-    type Segment = MachOSegment<'data, 'file, Mach>;
-    type SegmentIterator = MachOSegmentIterator<'data, 'file, Mach>;
-    type Section = MachOSection<'data, 'file, Mach>;
-    type SectionIterator = MachOSectionIterator<'data, 'file, Mach>;
-    type Comdat = MachOComdat<'data, 'file, Mach>;
-    type ComdatIterator = MachOComdatIterator<'data, 'file, Mach>;
-    type Symbol = MachOSymbol<'data, 'file, Mach>;
-    type SymbolIterator = MachOSymbolIterator<'data, 'file, Mach>;
-    type SymbolTable = MachOSymbolTable<'data, 'file, Mach>;
+    type Segment = MachOSegment<'data, 'file, Mach, R>;
+    type SegmentIterator = MachOSegmentIterator<'data, 'file, Mach, R>;
+    type Section = MachOSection<'data, 'file, Mach, R>;
+    type SectionIterator = MachOSectionIterator<'data, 'file, Mach, R>;
+    type Comdat = MachOComdat<'data, 'file, Mach, R>;
+    type ComdatIterator = MachOComdatIterator<'data, 'file, Mach, R>;
+    type Symbol = MachOSymbol<'data, 'file, Mach, R>;
+    type SymbolIterator = MachOSymbolIterator<'data, 'file, Mach, R>;
+    type SymbolTable = MachOSymbolTable<'data, 'file, Mach, R>;
+    type DynamicRelocationIterator = NoDynamicRelocationIterator;
 
     fn architecture(&self) -> Architecture {
         match self.header.cputype(self.endian) {
@@ -115,12 +142,12 @@
         self.header.is_type_64()
     }
 
-    fn segments(&'file self) -> MachOSegmentIterator<'data, 'file, Mach> {
+    fn segments(&'file self) -> MachOSegmentIterator<'data, 'file, Mach, R> {
         MachOSegmentIterator {
             file: self,
             commands: self
                 .header
-                .load_commands(self.endian, self.data)
+                .load_commands(self.endian, self.data, self.header_offset)
                 .ok()
                 .unwrap_or_else(Default::default),
         }
@@ -129,18 +156,28 @@
     fn section_by_name(
         &'file self,
         section_name: &str,
-    ) -> Option<MachOSection<'data, 'file, Mach>> {
+    ) -> Option<MachOSection<'data, 'file, Mach, R>> {
         // Translate the "." prefix to the "__" prefix used by OSX/Mach-O, eg
-        // ".debug_info" to "__debug_info".
-        let system_section = section_name.starts_with('.');
-        let cmp_section_name = |section: &MachOSection<Mach>| {
+        // ".debug_info" to "__debug_info", and limit to 16 bytes total.
+        let system_name = if section_name.starts_with('.') {
+            if section_name.len() > 15 {
+                Some(&section_name[1..15])
+            } else {
+                Some(&section_name[1..])
+            }
+        } else {
+            None
+        };
+        let cmp_section_name = |section: &MachOSection<'data, 'file, Mach, R>| {
             section
                 .name()
                 .map(|name| {
                     section_name == name
-                        || (system_section
-                            && name.starts_with("__")
-                            && section_name[1..] == name[2..])
+                        || system_name
+                            .filter(|system_name| {
+                                name.starts_with("__") && name[2..] == **system_name
+                            })
+                            .is_some()
                 })
                 .unwrap_or(false)
         };
@@ -151,7 +188,7 @@
     fn section_by_index(
         &'file self,
         index: SectionIndex,
-    ) -> Result<MachOSection<'data, 'file, Mach>> {
+    ) -> Result<MachOSection<'data, 'file, Mach, R>> {
         let internal = *self.section_internal(index)?;
         Ok(MachOSection {
             file: self,
@@ -159,23 +196,26 @@
         })
     }
 
-    fn sections(&'file self) -> MachOSectionIterator<'data, 'file, Mach> {
+    fn sections(&'file self) -> MachOSectionIterator<'data, 'file, Mach, R> {
         MachOSectionIterator {
             file: self,
             iter: self.sections.iter(),
         }
     }
 
-    fn comdats(&'file self) -> MachOComdatIterator<'data, 'file, Mach> {
+    fn comdats(&'file self) -> MachOComdatIterator<'data, 'file, Mach, R> {
         MachOComdatIterator { file: self }
     }
 
-    fn symbol_by_index(&'file self, index: SymbolIndex) -> Result<MachOSymbol<'data, 'file, Mach>> {
+    fn symbol_by_index(
+        &'file self,
+        index: SymbolIndex,
+    ) -> Result<MachOSymbol<'data, 'file, Mach, R>> {
         let nlist = self.symbols.symbol(index.0)?;
         MachOSymbol::new(self, index, nlist).read_error("Unsupported Mach-O symbol index")
     }
 
-    fn symbols(&'file self) -> MachOSymbolIterator<'data, 'file, Mach> {
+    fn symbols(&'file self) -> MachOSymbolIterator<'data, 'file, Mach, R> {
         MachOSymbolIterator {
             file: self,
             index: 0,
@@ -183,11 +223,11 @@
     }
 
     #[inline]
-    fn symbol_table(&'file self) -> Option<MachOSymbolTable<'data, 'file, Mach>> {
+    fn symbol_table(&'file self) -> Option<MachOSymbolTable<'data, 'file, Mach, R>> {
         Some(MachOSymbolTable { file: self })
     }
 
-    fn dynamic_symbols(&'file self) -> MachOSymbolIterator<'data, 'file, Mach> {
+    fn dynamic_symbols(&'file self) -> MachOSymbolIterator<'data, 'file, Mach, R> {
         MachOSymbolIterator {
             file: self,
             index: self.symbols.len(),
@@ -195,7 +235,7 @@
     }
 
     #[inline]
-    fn dynamic_symbol_table(&'file self) -> Option<MachOSymbolTable<'data, 'file, Mach>> {
+    fn dynamic_symbol_table(&'file self) -> Option<MachOSymbolTable<'data, 'file, Mach, R>> {
         None
     }
 
@@ -203,16 +243,102 @@
         self.symbols.object_map(self.endian)
     }
 
+    fn imports(&self) -> Result<Vec<Import<'data>>> {
+        let mut dysymtab = None;
+        let mut libraries = Vec::new();
+        let twolevel = self.header.flags(self.endian) & macho::MH_TWOLEVEL != 0;
+        if twolevel {
+            libraries.push(&[][..]);
+        }
+        let mut commands = self
+            .header
+            .load_commands(self.endian, self.data, self.header_offset)?;
+        while let Some(command) = commands.next()? {
+            if let Some(command) = command.dysymtab()? {
+                dysymtab = Some(command);
+            }
+            if twolevel {
+                if let Some(dylib) = command.dylib()? {
+                    libraries.push(command.string(self.endian, dylib.dylib.name)?);
+                }
+            }
+        }
+
+        let mut imports = Vec::new();
+        if let Some(dysymtab) = dysymtab {
+            let index = dysymtab.iundefsym.get(self.endian) as usize;
+            let number = dysymtab.nundefsym.get(self.endian) as usize;
+            for i in index..(index.wrapping_add(number)) {
+                let symbol = self.symbols.symbol(i)?;
+                let name = symbol.name(self.endian, self.symbols.strings())?;
+                let library = if twolevel {
+                    libraries
+                        .get(symbol.library_ordinal(self.endian) as usize)
+                        .copied()
+                        .read_error("Invalid Mach-O symbol library ordinal")?
+                } else {
+                    &[]
+                };
+                imports.push(Import {
+                    name: ByteString(name),
+                    library: ByteString(library),
+                });
+            }
+        }
+        Ok(imports)
+    }
+
+    fn exports(&self) -> Result<Vec<Export<'data>>> {
+        let mut dysymtab = None;
+        let mut commands = self
+            .header
+            .load_commands(self.endian, self.data, self.header_offset)?;
+        while let Some(command) = commands.next()? {
+            if let Some(command) = command.dysymtab()? {
+                dysymtab = Some(command);
+                break;
+            }
+        }
+
+        let mut exports = Vec::new();
+        if let Some(dysymtab) = dysymtab {
+            let index = dysymtab.iextdefsym.get(self.endian) as usize;
+            let number = dysymtab.nextdefsym.get(self.endian) as usize;
+            for i in index..(index.wrapping_add(number)) {
+                let symbol = self.symbols.symbol(i)?;
+                let name = symbol.name(self.endian, self.symbols.strings())?;
+                let address = symbol.n_value(self.endian).into();
+                exports.push(Export {
+                    name: ByteString(name),
+                    address,
+                });
+            }
+        }
+        Ok(exports)
+    }
+
+    #[inline]
+    fn dynamic_relocations(&'file self) -> Option<NoDynamicRelocationIterator> {
+        None
+    }
+
     fn has_debug_symbols(&self) -> bool {
         self.section_by_name(".debug_info").is_some()
     }
 
     fn mach_uuid(&self) -> Result<Option<[u8; 16]>> {
-        self.header.uuid(self.endian, self.data)
+        self.header.uuid(self.endian, self.data, self.header_offset)
+    }
+
+    fn relative_address_base(&self) -> u64 {
+        0
     }
 
     fn entry(&self) -> u64 {
-        if let Ok(mut commands) = self.header.load_commands(self.endian, self.data) {
+        if let Ok(mut commands) =
+            self.header
+                .load_commands(self.endian, self.data, self.header_offset)
+        {
             while let Ok(Some(command)) = commands.next() {
                 if let Ok(Some(command)) = command.entry_point() {
                     return command.entryoff.get(self.endian);
@@ -230,20 +356,28 @@
 }
 
 /// An iterator over the COMDAT section groups of a `MachOFile64`.
-pub type MachOComdatIterator32<'data, 'file, Endian = Endianness> =
-    MachOComdatIterator<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOComdatIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOComdatIterator<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// An iterator over the COMDAT section groups of a `MachOFile64`.
-pub type MachOComdatIterator64<'data, 'file, Endian = Endianness> =
-    MachOComdatIterator<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOComdatIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOComdatIterator<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// An iterator over the COMDAT section groups of a `MachOFile`.
 #[derive(Debug)]
-pub struct MachOComdatIterator<'data, 'file, Mach: MachHeader> {
-    file: &'file MachOFile<'data, Mach>,
+pub struct MachOComdatIterator<'data, 'file, Mach, R = &'data [u8]>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    file: &'file MachOFile<'data, Mach, R>,
 }
 
-impl<'data, 'file, Mach: MachHeader> Iterator for MachOComdatIterator<'data, 'file, Mach> {
-    type Item = MachOComdat<'data, 'file, Mach>;
+impl<'data, 'file, Mach, R> Iterator for MachOComdatIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    type Item = MachOComdat<'data, 'file, Mach, R>;
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
@@ -252,23 +386,36 @@
 }
 
 /// A COMDAT section group of a `MachOFile32`.
-pub type MachOComdat32<'data, 'file, Endian = Endianness> =
-    MachOComdat<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOComdat32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOComdat<'data, 'file, macho::MachHeader32<Endian>, R>;
 
 /// A COMDAT section group of a `MachOFile64`.
-pub type MachOComdat64<'data, 'file, Endian = Endianness> =
-    MachOComdat<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOComdat64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOComdat<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// A COMDAT section group of a `MachOFile`.
 #[derive(Debug)]
-pub struct MachOComdat<'data, 'file, Mach: MachHeader> {
-    file: &'file MachOFile<'data, Mach>,
+pub struct MachOComdat<'data, 'file, Mach, R = &'data [u8]>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    file: &'file MachOFile<'data, Mach, R>,
 }
 
-impl<'data, 'file, Mach: MachHeader> read::private::Sealed for MachOComdat<'data, 'file, Mach> {}
+impl<'data, 'file, Mach, R> read::private::Sealed for MachOComdat<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Mach: MachHeader> ObjectComdat<'data> for MachOComdat<'data, 'file, Mach> {
-    type SectionIterator = MachOComdatSectionIterator<'data, 'file, Mach>;
+impl<'data, 'file, Mach, R> ObjectComdat<'data> for MachOComdat<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    type SectionIterator = MachOComdatSectionIterator<'data, 'file, Mach, R>;
 
     #[inline]
     fn kind(&self) -> ComdatKind {
@@ -292,22 +439,28 @@
 }
 
 /// An iterator over the sections in a COMDAT section group of a `MachOFile32`.
-pub type MachOComdatSectionIterator32<'data, 'file, Endian = Endianness> =
-    MachOComdatSectionIterator<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOComdatSectionIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOComdatSectionIterator<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// An iterator over the sections in a COMDAT section group of a `MachOFile64`.
-pub type MachOComdatSectionIterator64<'data, 'file, Endian = Endianness> =
-    MachOComdatSectionIterator<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOComdatSectionIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOComdatSectionIterator<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// An iterator over the sections in a COMDAT section group of a `MachOFile`.
 #[derive(Debug)]
-pub struct MachOComdatSectionIterator<'data, 'file, Mach: MachHeader>
+pub struct MachOComdatSectionIterator<'data, 'file, Mach, R = &'data [u8]>
 where
     'data: 'file,
+    Mach: MachHeader,
+    R: ReadRef<'data>,
 {
-    file: &'file MachOFile<'data, Mach>,
+    file: &'file MachOFile<'data, Mach, R>,
 }
 
-impl<'data, 'file, Mach: MachHeader> Iterator for MachOComdatSectionIterator<'data, 'file, Mach> {
+impl<'data, 'file, Mach, R> Iterator for MachOComdatSectionIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     type Item = SectionIndex;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -348,9 +501,9 @@
     /// Read the file header.
     ///
     /// Also checks that the magic field in the file header is a supported format.
-    fn parse<'data>(mut data: Bytes<'data>) -> read::Result<&'data Self> {
+    fn parse<'data, R: ReadRef<'data>>(data: R, offset: u64) -> read::Result<&'data Self> {
         let header = data
-            .read::<Self>()
+            .read_at::<Self>(offset)
             .read_error("Invalid Mach-O header size or alignment")?;
         if !header.is_supported() {
             return Err(Error("Unsupported Mach-O header"));
@@ -366,24 +519,29 @@
         Self::Endian::from_big_endian(self.is_big_endian()).read_error("Unsupported Mach-O endian")
     }
 
-    fn load_commands<'data>(
+    fn load_commands<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
-    ) -> Result<MachOLoadCommandIterator<'data, Self::Endian>> {
+        data: R,
+        header_offset: u64,
+    ) -> Result<LoadCommandIterator<'data, Self::Endian>> {
         let data = data
-            .read_bytes_at(mem::size_of::<Self>(), self.sizeofcmds(endian) as usize)
+            .read_bytes_at(
+                header_offset + mem::size_of::<Self>() as u64,
+                self.sizeofcmds(endian).into(),
+            )
             .read_error("Invalid Mach-O load command table size")?;
-        Ok(MachOLoadCommandIterator::new(
-            endian,
-            data,
-            self.ncmds(endian),
-        ))
+        Ok(LoadCommandIterator::new(endian, data, self.ncmds(endian)))
     }
 
     /// Return the UUID from the `LC_UUID` load command, if one is present.
-    fn uuid<'data>(&self, endian: Self::Endian, data: Bytes<'data>) -> Result<Option<[u8; 16]>> {
-        let mut commands = self.load_commands(endian, data)?;
+    fn uuid<'data, R: ReadRef<'data>>(
+        &self,
+        endian: Self::Endian,
+        data: R,
+        header_offset: u64,
+    ) -> Result<Option<[u8; 16]>> {
+        let mut commands = self.load_commands(endian, data, header_offset)?;
         while let Some(command) = commands.next()? {
             if let Ok(Some(uuid)) = command.uuid() {
                 return Ok(Some(uuid.uuid));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/load_command.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/load_command.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/load_command.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/load_command.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,29 +2,29 @@
 
 use crate::endian::Endian;
 use crate::macho;
-use crate::pod::Bytes;
+use crate::pod::Pod;
 use crate::read::macho::{MachHeader, SymbolTable};
-use crate::read::{ReadError, Result, StringTable};
+use crate::read::{Bytes, ReadError, ReadRef, Result, StringTable};
 
 /// An iterator over the load commands of a `MachHeader`.
 #[derive(Debug, Default, Clone, Copy)]
-pub struct MachOLoadCommandIterator<'data, E: Endian> {
+pub struct LoadCommandIterator<'data, E: Endian> {
     endian: E,
     data: Bytes<'data>,
     ncmds: u32,
 }
 
-impl<'data, E: Endian> MachOLoadCommandIterator<'data, E> {
-    pub(super) fn new(endian: E, data: Bytes<'data>, ncmds: u32) -> Self {
-        MachOLoadCommandIterator {
+impl<'data, E: Endian> LoadCommandIterator<'data, E> {
+    pub(super) fn new(endian: E, data: &'data [u8], ncmds: u32) -> Self {
+        LoadCommandIterator {
             endian,
-            data,
+            data: Bytes(data),
             ncmds,
         }
     }
 
     /// Return the next load command.
-    pub fn next(&mut self) -> Result<Option<MachOLoadCommand<'data, E>>> {
+    pub fn next(&mut self) -> Result<Option<LoadCommandData<'data, E>>> {
         if self.ncmds == 0 {
             return Ok(None);
         }
@@ -39,7 +39,7 @@
             .read_bytes(cmdsize)
             .read_error("Invalid Mach-O load command size")?;
         self.ncmds -= 1;
-        Ok(Some(MachOLoadCommand {
+        Ok(Some(LoadCommandData {
             cmd,
             data,
             marker: Default::default(),
@@ -47,39 +47,155 @@
     }
 }
 
-/// A parsed `LoadCommand`.
+/// The data for a `LoadCommand`.
 #[derive(Debug, Clone, Copy)]
-pub struct MachOLoadCommand<'data, E: Endian> {
+pub struct LoadCommandData<'data, E: Endian> {
     cmd: u32,
     // Includes the header.
     data: Bytes<'data>,
     marker: PhantomData<E>,
 }
 
-impl<'data, E: Endian> MachOLoadCommand<'data, E> {
+impl<'data, E: Endian> LoadCommandData<'data, E> {
+    /// Return the `cmd` field of the `LoadCommand`.
+    ///
+    /// This is one of the `LC_` constants.
+    pub fn cmd(&self) -> u32 {
+        self.cmd
+    }
+
+    /// Return the `cmdsize` field of the `LoadCommand`.
+    pub fn cmdsize(&self) -> u32 {
+        self.data.len() as u32
+    }
+
+    /// Parse the data as the given type.
+    #[inline]
+    pub fn data<T: Pod>(&self) -> Result<&'data T> {
+        self.data
+            .read_at(0)
+            .read_error("Invalid Mach-O command size")
+    }
+
+    /// Parse a load command string value.
+    ///
+    /// Strings used by load commands are specified by offsets that are
+    /// relative to the load command header.
+    pub fn string(&self, endian: E, s: macho::LcStr<E>) -> Result<&'data [u8]> {
+        self.data
+            .read_string_at(s.offset.get(endian) as usize)
+            .read_error("Invalid load command string offset")
+    }
+
+    /// Parse the command data according to the `cmd` field.
+    pub fn variant(&self) -> Result<LoadCommandVariant<'data, E>> {
+        Ok(match self.cmd {
+            macho::LC_SEGMENT => {
+                let mut data = self.data;
+                let segment = data.read().read_error("Invalid Mach-O command size")?;
+                LoadCommandVariant::Segment32(segment, data.0)
+            }
+            macho::LC_SYMTAB => LoadCommandVariant::Symtab(self.data()?),
+            macho::LC_THREAD | macho::LC_UNIXTHREAD => {
+                let mut data = self.data;
+                let thread = data.read().read_error("Invalid Mach-O command size")?;
+                LoadCommandVariant::Thread(thread, data.0)
+            }
+            macho::LC_DYSYMTAB => LoadCommandVariant::Dysymtab(self.data()?),
+            macho::LC_LOAD_DYLIB
+            | macho::LC_LOAD_WEAK_DYLIB
+            | macho::LC_REEXPORT_DYLIB
+            | macho::LC_LAZY_LOAD_DYLIB
+            | macho::LC_LOAD_UPWARD_DYLIB => LoadCommandVariant::Dylib(self.data()?),
+            macho::LC_ID_DYLIB => LoadCommandVariant::IdDylib(self.data()?),
+            macho::LC_LOAD_DYLINKER => LoadCommandVariant::LoadDylinker(self.data()?),
+            macho::LC_ID_DYLINKER => LoadCommandVariant::IdDylinker(self.data()?),
+            macho::LC_PREBOUND_DYLIB => LoadCommandVariant::PreboundDylib(self.data()?),
+            macho::LC_ROUTINES => LoadCommandVariant::Routines32(self.data()?),
+            macho::LC_SUB_FRAMEWORK => LoadCommandVariant::SubFramework(self.data()?),
+            macho::LC_SUB_UMBRELLA => LoadCommandVariant::SubUmbrella(self.data()?),
+            macho::LC_SUB_CLIENT => LoadCommandVariant::SubClient(self.data()?),
+            macho::LC_SUB_LIBRARY => LoadCommandVariant::SubLibrary(self.data()?),
+            macho::LC_TWOLEVEL_HINTS => LoadCommandVariant::TwolevelHints(self.data()?),
+            macho::LC_PREBIND_CKSUM => LoadCommandVariant::PrebindCksum(self.data()?),
+            macho::LC_SEGMENT_64 => {
+                let mut data = self.data;
+                let segment = data.read().read_error("Invalid Mach-O command size")?;
+                LoadCommandVariant::Segment64(segment, data.0)
+            }
+            macho::LC_ROUTINES_64 => LoadCommandVariant::Routines64(self.data()?),
+            macho::LC_UUID => LoadCommandVariant::Uuid(self.data()?),
+            macho::LC_RPATH => LoadCommandVariant::Rpath(self.data()?),
+            macho::LC_CODE_SIGNATURE
+            | macho::LC_SEGMENT_SPLIT_INFO
+            | macho::LC_FUNCTION_STARTS
+            | macho::LC_DATA_IN_CODE
+            | macho::LC_DYLIB_CODE_SIGN_DRS
+            | macho::LC_LINKER_OPTIMIZATION_HINT
+            | macho::LC_DYLD_EXPORTS_TRIE
+            | macho::LC_DYLD_CHAINED_FIXUPS => LoadCommandVariant::LinkeditData(self.data()?),
+            macho::LC_ENCRYPTION_INFO => LoadCommandVariant::EncryptionInfo32(self.data()?),
+            macho::LC_DYLD_INFO | macho::LC_DYLD_INFO_ONLY => {
+                LoadCommandVariant::DyldInfo(self.data()?)
+            }
+            macho::LC_VERSION_MIN_MACOSX
+            | macho::LC_VERSION_MIN_IPHONEOS
+            | macho::LC_VERSION_MIN_TVOS
+            | macho::LC_VERSION_MIN_WATCHOS => LoadCommandVariant::VersionMin(self.data()?),
+            macho::LC_DYLD_ENVIRONMENT => LoadCommandVariant::DyldEnvironment(self.data()?),
+            macho::LC_MAIN => LoadCommandVariant::EntryPoint(self.data()?),
+            macho::LC_SOURCE_VERSION => LoadCommandVariant::SourceVersion(self.data()?),
+            macho::LC_ENCRYPTION_INFO_64 => LoadCommandVariant::EncryptionInfo64(self.data()?),
+            macho::LC_LINKER_OPTION => LoadCommandVariant::LinkerOption(self.data()?),
+            macho::LC_NOTE => LoadCommandVariant::Note(self.data()?),
+            macho::LC_BUILD_VERSION => LoadCommandVariant::BuildVersion(self.data()?),
+            macho::LC_FILESET_ENTRY => LoadCommandVariant::FilesetEntry(self.data()?),
+            _ => LoadCommandVariant::Other,
+        })
+    }
+
     /// Try to parse this command as a `SegmentCommand32`.
-    pub fn segment_32(self) -> Result<Option<(&'data macho::SegmentCommand32<E>, Bytes<'data>)>> {
+    ///
+    /// Returns the segment command and the data containing the sections.
+    pub fn segment_32(self) -> Result<Option<(&'data macho::SegmentCommand32<E>, &'data [u8])>> {
         if self.cmd == macho::LC_SEGMENT {
             let mut data = self.data;
-            let command = data
-                .read()
-                .read_error("Invalid Mach-O LC_SEGMENT command size")?;
-            Ok(Some((command, data)))
+            let segment = data.read().read_error("Invalid Mach-O command size")?;
+            Ok(Some((segment, data.0)))
         } else {
             Ok(None)
         }
     }
 
     /// Try to parse this command as a `SymtabCommand`.
+    ///
+    /// Returns the segment command and the data containing the sections.
     pub fn symtab(self) -> Result<Option<&'data macho::SymtabCommand<E>>> {
         if self.cmd == macho::LC_SYMTAB {
-            Some(
-                self.data
-                    .clone()
-                    .read()
-                    .read_error("Invalid Mach-O LC_SYMTAB command size"),
-            )
-            .transpose()
+            Some(self.data()).transpose()
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// Try to parse this command as a `DysymtabCommand`.
+    pub fn dysymtab(self) -> Result<Option<&'data macho::DysymtabCommand<E>>> {
+        if self.cmd == macho::LC_DYSYMTAB {
+            Some(self.data()).transpose()
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// Try to parse this command as a `DylibCommand`.
+    pub fn dylib(self) -> Result<Option<&'data macho::DylibCommand<E>>> {
+        if self.cmd == macho::LC_LOAD_DYLIB
+            || self.cmd == macho::LC_LOAD_WEAK_DYLIB
+            || self.cmd == macho::LC_REEXPORT_DYLIB
+            || self.cmd == macho::LC_LAZY_LOAD_DYLIB
+            || self.cmd == macho::LC_LOAD_UPWARD_DYLIB
+        {
+            Some(self.data()).transpose()
         } else {
             Ok(None)
         }
@@ -88,26 +204,27 @@
     /// Try to parse this command as a `UuidCommand`.
     pub fn uuid(self) -> Result<Option<&'data macho::UuidCommand<E>>> {
         if self.cmd == macho::LC_UUID {
-            Some(
-                self.data
-                    .clone()
-                    .read()
-                    .read_error("Invalid Mach-O LC_UUID command size"),
-            )
-            .transpose()
+            Some(self.data()).transpose()
         } else {
             Ok(None)
         }
     }
 
     /// Try to parse this command as a `SegmentCommand64`.
-    pub fn segment_64(self) -> Result<Option<(&'data macho::SegmentCommand64<E>, Bytes<'data>)>> {
+    pub fn segment_64(self) -> Result<Option<(&'data macho::SegmentCommand64<E>, &'data [u8])>> {
         if self.cmd == macho::LC_SEGMENT_64 {
             let mut data = self.data;
-            let command = data
-                .read()
-                .read_error("Invalid Mach-O LC_SEGMENT_64 command size")?;
-            Ok(Some((command, data)))
+            let command = data.read().read_error("Invalid Mach-O command size")?;
+            Ok(Some((command, data.0)))
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// Try to parse this command as a `DyldInfoCommand`.
+    pub fn dyld_info(self) -> Result<Option<&'data macho::DyldInfoCommand<E>>> {
+        if self.cmd == macho::LC_DYLD_INFO || self.cmd == macho::LC_DYLD_INFO_ONLY {
+            Some(self.data()).transpose()
         } else {
             Ok(None)
         }
@@ -116,39 +233,116 @@
     /// Try to parse this command as an `EntryPointCommand`.
     pub fn entry_point(self) -> Result<Option<&'data macho::EntryPointCommand<E>>> {
         if self.cmd == macho::LC_MAIN {
-            Some(
-                self.data
-                    .clone()
-                    .read()
-                    .read_error("Invalid Mach-O LC_MAIN command size"),
-            )
-            .transpose()
+            Some(self.data()).transpose()
         } else {
             Ok(None)
         }
     }
 }
 
+/// A `LoadCommand` that has been interpreted according to its `cmd` field.
+#[derive(Debug, Clone, Copy)]
+#[non_exhaustive]
+pub enum LoadCommandVariant<'data, E: Endian> {
+    /// `LC_SEGMENT`
+    Segment32(&'data macho::SegmentCommand32<E>, &'data [u8]),
+    /// `LC_SYMTAB`
+    Symtab(&'data macho::SymtabCommand<E>),
+    // obsolete: `LC_SYMSEG`
+    //Symseg(&'data macho::SymsegCommand<E>),
+    /// `LC_THREAD` or `LC_UNIXTHREAD`
+    Thread(&'data macho::ThreadCommand<E>, &'data [u8]),
+    // obsolete: `LC_IDFVMLIB` or `LC_LOADFVMLIB`
+    //Fvmlib(&'data macho::FvmlibCommand<E>),
+    // obsolete: `LC_IDENT`
+    //Ident(&'data macho::IdentCommand<E>),
+    // internal: `LC_FVMFILE`
+    //Fvmfile(&'data macho::FvmfileCommand<E>),
+    // internal: `LC_PREPAGE`
+    /// `LC_DYSYMTAB`
+    Dysymtab(&'data macho::DysymtabCommand<E>),
+    /// `LC_LOAD_DYLIB`, `LC_LOAD_WEAK_DYLIB`, `LC_REEXPORT_DYLIB`,
+    /// `LC_LAZY_LOAD_DYLIB`, or `LC_LOAD_UPWARD_DYLIB`
+    Dylib(&'data macho::DylibCommand<E>),
+    /// `LC_ID_DYLIB`
+    IdDylib(&'data macho::DylibCommand<E>),
+    /// `LC_LOAD_DYLINKER`
+    LoadDylinker(&'data macho::DylinkerCommand<E>),
+    /// `LC_ID_DYLINKER`
+    IdDylinker(&'data macho::DylinkerCommand<E>),
+    /// `LC_PREBOUND_DYLIB`
+    PreboundDylib(&'data macho::PreboundDylibCommand<E>),
+    /// `LC_ROUTINES`
+    Routines32(&'data macho::RoutinesCommand32<E>),
+    /// `LC_SUB_FRAMEWORK`
+    SubFramework(&'data macho::SubFrameworkCommand<E>),
+    /// `LC_SUB_UMBRELLA`
+    SubUmbrella(&'data macho::SubUmbrellaCommand<E>),
+    /// `LC_SUB_CLIENT`
+    SubClient(&'data macho::SubClientCommand<E>),
+    /// `LC_SUB_LIBRARY`
+    SubLibrary(&'data macho::SubLibraryCommand<E>),
+    /// `LC_TWOLEVEL_HINTS`
+    TwolevelHints(&'data macho::TwolevelHintsCommand<E>),
+    /// `LC_PREBIND_CKSUM`
+    PrebindCksum(&'data macho::PrebindCksumCommand<E>),
+    /// `LC_SEGMENT_64`
+    Segment64(&'data macho::SegmentCommand64<E>, &'data [u8]),
+    /// `LC_ROUTINES_64`
+    Routines64(&'data macho::RoutinesCommand64<E>),
+    /// `LC_UUID`
+    Uuid(&'data macho::UuidCommand<E>),
+    /// `LC_RPATH`
+    Rpath(&'data macho::RpathCommand<E>),
+    /// `LC_CODE_SIGNATURE`, `LC_SEGMENT_SPLIT_INFO`, `LC_FUNCTION_STARTS`,
+    /// `LC_DATA_IN_CODE`, `LC_DYLIB_CODE_SIGN_DRS`, `LC_LINKER_OPTIMIZATION_HINT`,
+    /// `LC_DYLD_EXPORTS_TRIE`, or `LC_DYLD_CHAINED_FIXUPS`.
+    LinkeditData(&'data macho::LinkeditDataCommand<E>),
+    /// `LC_ENCRYPTION_INFO`
+    EncryptionInfo32(&'data macho::EncryptionInfoCommand32<E>),
+    /// `LC_DYLD_INFO` or `LC_DYLD_INFO_ONLY`
+    DyldInfo(&'data macho::DyldInfoCommand<E>),
+    /// `LC_VERSION_MIN_MACOSX`, `LC_VERSION_MIN_IPHONEOS`, `LC_VERSION_MIN_WATCHOS`,
+    /// or `LC_VERSION_MIN_TVOS`
+    VersionMin(&'data macho::VersionMinCommand<E>),
+    /// `LC_DYLD_ENVIRONMENT`
+    DyldEnvironment(&'data macho::DylinkerCommand<E>),
+    /// `LC_MAIN`
+    EntryPoint(&'data macho::EntryPointCommand<E>),
+    /// `LC_SOURCE_VERSION`
+    SourceVersion(&'data macho::SourceVersionCommand<E>),
+    /// `LC_ENCRYPTION_INFO_64`
+    EncryptionInfo64(&'data macho::EncryptionInfoCommand64<E>),
+    /// `LC_LINKER_OPTION`
+    LinkerOption(&'data macho::LinkerOptionCommand<E>),
+    /// `LC_NOTE`
+    Note(&'data macho::NoteCommand<E>),
+    /// `LC_BUILD_VERSION`
+    BuildVersion(&'data macho::BuildVersionCommand<E>),
+    /// `LC_FILESET_ENTRY`
+    FilesetEntry(&'data macho::FilesetEntryCommand<E>),
+    /// An unrecognized or obsolete load command.
+    Other,
+}
+
 impl<E: Endian> macho::SymtabCommand<E> {
     /// Return the symbol table that this command references.
-    pub fn symbols<'data, Mach: MachHeader<Endian = E>>(
+    pub fn symbols<'data, Mach: MachHeader<Endian = E>, R: ReadRef<'data>>(
         &self,
         endian: E,
-        data: Bytes<'data>,
-    ) -> Result<SymbolTable<'data, Mach>> {
+        data: R,
+    ) -> Result<SymbolTable<'data, Mach, R>> {
         let symbols = data
             .read_slice_at(
-                self.symoff.get(endian) as usize,
+                self.symoff.get(endian).into(),
                 self.nsyms.get(endian) as usize,
             )
             .read_error("Invalid Mach-O symbol table offset or size")?;
-        let strings = data
-            .read_bytes_at(
-                self.stroff.get(endian) as usize,
-                self.strsize.get(endian) as usize,
-            )
-            .read_error("Invalid Mach-O string table offset or size")?;
-        let strings = StringTable::new(strings);
+        let str_start: u64 = self.stroff.get(endian).into();
+        let str_end = str_start
+            .checked_add(self.strsize.get(endian).into())
+            .read_error("Invalid Mach-O string table length")?;
+        let strings = StringTable::new(data, str_start, str_end);
         Ok(SymbolTable::new(symbols, strings))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,11 +5,17 @@
 //!
 //! Also provides `MachOFile` and related types which implement the `Object` trait.
 
+mod dyld_cache;
+pub use dyld_cache::*;
+
+mod fat;
+pub use fat::*;
+
 mod file;
 pub use file::*;
 
 mod load_command;
-use load_command::*;
+pub use load_command::*;
 
 mod segment;
 pub use segment::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/relocation.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/relocation.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/relocation.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/relocation.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,29 +3,35 @@
 use crate::endian::Endianness;
 use crate::macho;
 use crate::read::{
-    Relocation, RelocationEncoding, RelocationKind, RelocationTarget, SectionIndex, SymbolIndex,
+    ReadRef, Relocation, RelocationEncoding, RelocationKind, RelocationTarget, SectionIndex,
+    SymbolIndex,
 };
 
 use super::{MachHeader, MachOFile};
 
 /// An iterator over the relocations in a `MachOSection32`.
-pub type MachORelocationIterator32<'data, 'file, Endian = Endianness> =
-    MachORelocationIterator<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachORelocationIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachORelocationIterator<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// An iterator over the relocations in a `MachOSection64`.
-pub type MachORelocationIterator64<'data, 'file, Endian = Endianness> =
-    MachORelocationIterator<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachORelocationIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachORelocationIterator<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// An iterator over the relocations in a `MachOSection`.
-pub struct MachORelocationIterator<'data, 'file, Mach>
+pub struct MachORelocationIterator<'data, 'file, Mach, R = &'data [u8]>
 where
     'data: 'file,
     Mach: MachHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file MachOFile<'data, Mach>,
+    pub(super) file: &'file MachOFile<'data, Mach, R>,
     pub(super) relocations: slice::Iter<'data, macho::Relocation<Mach::Endian>>,
 }
 
-impl<'data, 'file, Mach: MachHeader> Iterator for MachORelocationIterator<'data, 'file, Mach> {
+impl<'data, 'file, Mach, R> Iterator for MachORelocationIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     type Item = (u64, Relocation);
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -109,7 +115,11 @@
     }
 }
 
-impl<'data, 'file, Mach: MachHeader> fmt::Debug for MachORelocationIterator<'data, 'file, Mach> {
+impl<'data, 'file, Mach, R> fmt::Debug for MachORelocationIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("MachORelocationIterator").finish()
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,39 +3,49 @@
 
 use crate::endian::{self, Endianness};
 use crate::macho;
-use crate::pod::{Bytes, Pod};
+use crate::pod::Pod;
 use crate::read::{
-    self, CompressedData, ObjectSection, ReadError, Result, SectionFlags, SectionIndex, SectionKind,
+    self, CompressedData, CompressedFileRange, ObjectSection, ReadError, ReadRef, Result,
+    SectionFlags, SectionIndex, SectionKind,
 };
 
 use super::{MachHeader, MachOFile, MachORelocationIterator};
 
 /// An iterator over the sections of a `MachOFile32`.
-pub type MachOSectionIterator32<'data, 'file, Endian = Endianness> =
-    MachOSectionIterator<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOSectionIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSectionIterator<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// An iterator over the sections of a `MachOFile64`.
-pub type MachOSectionIterator64<'data, 'file, Endian = Endianness> =
-    MachOSectionIterator<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOSectionIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSectionIterator<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// An iterator over the sections of a `MachOFile`.
-pub struct MachOSectionIterator<'data, 'file, Mach>
+pub struct MachOSectionIterator<'data, 'file, Mach, R = &'data [u8]>
 where
     'data: 'file,
     Mach: MachHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file MachOFile<'data, Mach>,
+    pub(super) file: &'file MachOFile<'data, Mach, R>,
     pub(super) iter: slice::Iter<'file, MachOSectionInternal<'data, Mach>>,
 }
 
-impl<'data, 'file, Mach: MachHeader> fmt::Debug for MachOSectionIterator<'data, 'file, Mach> {
+impl<'data, 'file, Mach, R> fmt::Debug for MachOSectionIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // It's painful to do much better than this
         f.debug_struct("MachOSectionIterator").finish()
     }
 }
 
-impl<'data, 'file, Mach: MachHeader> Iterator for MachOSectionIterator<'data, 'file, Mach> {
-    type Item = MachOSection<'data, 'file, Mach>;
+impl<'data, 'file, Mach, R> Iterator for MachOSectionIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    type Item = MachOSection<'data, 'file, Mach, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next().map(|&internal| MachOSection {
@@ -46,25 +56,30 @@
 }
 
 /// A section of a `MachOFile32`.
-pub type MachOSection32<'data, 'file, Endian = Endianness> =
-    MachOSection<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOSection32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSection<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// A section of a `MachOFile64`.
-pub type MachOSection64<'data, 'file, Endian = Endianness> =
-    MachOSection<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOSection64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSection<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// A section of a `MachOFile`.
 #[derive(Debug)]
-pub struct MachOSection<'data, 'file, Mach>
+pub struct MachOSection<'data, 'file, Mach, R = &'data [u8]>
 where
     'data: 'file,
     Mach: MachHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file MachOFile<'data, Mach>,
+    pub(super) file: &'file MachOFile<'data, Mach, R>,
     pub(super) internal: MachOSectionInternal<'data, Mach>,
 }
 
-impl<'data, 'file, Mach: MachHeader> MachOSection<'data, 'file, Mach> {
-    fn bytes(&self) -> Result<Bytes<'data>> {
+impl<'data, 'file, Mach, R> MachOSection<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    fn bytes(&self) -> Result<&'data [u8]> {
         self.internal
             .section
             .data(self.file.endian, self.file.data)
@@ -72,10 +87,19 @@
     }
 }
 
-impl<'data, 'file, Mach: MachHeader> read::private::Sealed for MachOSection<'data, 'file, Mach> {}
+impl<'data, 'file, Mach, R> read::private::Sealed for MachOSection<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Mach: MachHeader> ObjectSection<'data> for MachOSection<'data, 'file, Mach> {
-    type RelocationIterator = MachORelocationIterator<'data, 'file, Mach>;
+impl<'data, 'file, Mach, R> ObjectSection<'data> for MachOSection<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    type RelocationIterator = MachORelocationIterator<'data, 'file, Mach, R>;
 
     #[inline]
     fn index(&self) -> SectionIndex {
@@ -104,11 +128,11 @@
 
     #[inline]
     fn data(&self) -> Result<&'data [u8]> {
-        Ok(self.bytes()?.0)
+        self.bytes()
     }
 
     fn data_range(&self, address: u64, size: u64) -> Result<Option<&'data [u8]>> {
-        Ok(read::data_range(
+        Ok(read::util::data_range(
             self.bytes()?,
             self.address(),
             address,
@@ -117,6 +141,11 @@
     }
 
     #[inline]
+    fn compressed_file_range(&self) -> Result<CompressedFileRange> {
+        Ok(CompressedFileRange::none(self.file_range()))
+    }
+
+    #[inline]
     fn compressed_data(&self) -> Result<CompressedData<'data>> {
         self.data().map(CompressedData::none)
     }
@@ -141,7 +170,7 @@
         self.internal.kind
     }
 
-    fn relocations(&self) -> MachORelocationIterator<'data, 'file, Mach> {
+    fn relocations(&self) -> MachORelocationIterator<'data, 'file, Mach, R> {
         MachORelocationIterator {
             file: self.file,
             relocations: self
@@ -216,7 +245,7 @@
     /// Return the `sectname` bytes up until the null terminator.
     fn name(&self) -> &[u8] {
         let sectname = &self.sectname()[..];
-        match sectname.iter().position(|&x| x == 0) {
+        match memchr::memchr(b'\0', sectname) {
             Some(end) => &sectname[..end],
             None => sectname,
         }
@@ -225,7 +254,7 @@
     /// Return the `segname` bytes up until the null terminator.
     fn segment_name(&self) -> &[u8] {
         let segname = &self.segname()[..];
-        match segname.iter().position(|&x| x == 0) {
+        match memchr::memchr(b'\0', segname) {
             Some(end) => &segname[..end],
             None => segname,
         }
@@ -245,27 +274,27 @@
     ///
     /// Returns `Ok(&[])` if the section has no data.
     /// Returns `Err` for invalid values.
-    fn data<'data>(
+    fn data<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
-    ) -> result::Result<Bytes<'data>, ()> {
+        data: R,
+    ) -> result::Result<&'data [u8], ()> {
         if let Some((offset, size)) = self.file_range(endian) {
-            data.read_bytes_at(offset as usize, size as usize)
+            data.read_bytes_at(offset, size)
         } else {
-            Ok(Bytes(&[]))
+            Ok(&[])
         }
     }
 
     /// Return the relocation array.
     ///
     /// Returns `Err` for invalid values.
-    fn relocations<'data>(
+    fn relocations<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
+        data: R,
     ) -> Result<&'data [macho::Relocation<Self::Endian>]> {
-        data.read_slice_at(self.reloff(endian) as usize, self.nreloc(endian) as usize)
+        data.read_slice_at(self.reloff(endian).into(), self.nreloc(endian) as usize)
             .read_error("Invalid Mach-O relocations offset or number")
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/segment.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/segment.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/segment.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/segment.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,31 +3,36 @@
 
 use crate::endian::{self, Endianness};
 use crate::macho;
-use crate::pod::{Bytes, Pod};
-use crate::read::{self, ObjectSegment, ReadError, Result};
+use crate::pod::Pod;
+use crate::read::{self, ObjectSegment, ReadError, ReadRef, Result};
 
-use super::{MachHeader, MachOFile, MachOLoadCommand, MachOLoadCommandIterator, Section};
+use super::{LoadCommandData, LoadCommandIterator, MachHeader, MachOFile, Section};
 
 /// An iterator over the segments of a `MachOFile32`.
-pub type MachOSegmentIterator32<'data, 'file, Endian = Endianness> =
-    MachOSegmentIterator<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOSegmentIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSegmentIterator<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// An iterator over the segments of a `MachOFile64`.
-pub type MachOSegmentIterator64<'data, 'file, Endian = Endianness> =
-    MachOSegmentIterator<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOSegmentIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSegmentIterator<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// An iterator over the segments of a `MachOFile`.
 #[derive(Debug)]
-pub struct MachOSegmentIterator<'data, 'file, Mach>
+pub struct MachOSegmentIterator<'data, 'file, Mach, R = &'data [u8]>
 where
     'data: 'file,
     Mach: MachHeader,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file MachOFile<'data, Mach>,
-    pub(super) commands: MachOLoadCommandIterator<'data, Mach::Endian>,
+    pub(super) file: &'file MachOFile<'data, Mach, R>,
+    pub(super) commands: LoadCommandIterator<'data, Mach::Endian>,
 }
 
-impl<'data, 'file, Mach: MachHeader> Iterator for MachOSegmentIterator<'data, 'file, Mach> {
-    type Item = MachOSegment<'data, 'file, Mach>;
+impl<'data, 'file, Mach, R> Iterator for MachOSegmentIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    type Item = MachOSegment<'data, 'file, Mach, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         loop {
@@ -43,34 +48,48 @@
 }
 
 /// A segment of a `MachOFile32`.
-pub type MachOSegment32<'data, 'file, Endian = Endianness> =
-    MachOSegment<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOSegment32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSegment<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// A segment of a `MachOFile64`.
-pub type MachOSegment64<'data, 'file, Endian = Endianness> =
-    MachOSegment<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOSegment64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSegment<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// A segment of a `MachOFile`.
 #[derive(Debug)]
-pub struct MachOSegment<'data, 'file, Mach>
+pub struct MachOSegment<'data, 'file, Mach, R = &'data [u8]>
 where
     'data: 'file,
     Mach: MachHeader,
+    R: ReadRef<'data>,
 {
-    file: &'file MachOFile<'data, Mach>,
+    file: &'file MachOFile<'data, Mach, R>,
     segment: &'data Mach::Segment,
 }
 
-impl<'data, 'file, Mach: MachHeader> MachOSegment<'data, 'file, Mach> {
-    fn bytes(&self) -> Result<Bytes<'data>> {
+impl<'data, 'file, Mach, R> MachOSegment<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    fn bytes(&self) -> Result<&'data [u8]> {
         self.segment
             .data(self.file.endian, self.file.data)
             .read_error("Invalid Mach-O segment size or offset")
     }
 }
 
-impl<'data, 'file, Mach: MachHeader> read::private::Sealed for MachOSegment<'data, 'file, Mach> {}
+impl<'data, 'file, Mach, R> read::private::Sealed for MachOSegment<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Mach: MachHeader> ObjectSegment<'data> for MachOSegment<'data, 'file, Mach> {
+impl<'data, 'file, Mach, R> ObjectSegment<'data> for MachOSegment<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     #[inline]
     fn address(&self) -> u64 {
         self.segment.vmaddr(self.file.endian).into()
@@ -93,11 +112,11 @@
     }
 
     fn data(&self) -> Result<&'data [u8]> {
-        Ok(self.bytes()?.0)
+        self.bytes()
     }
 
     fn data_range(&self, address: u64, size: u64) -> Result<Option<&'data [u8]>> {
-        Ok(read::data_range(
+        Ok(read::util::data_range(
             self.bytes()?,
             self.address(),
             address,
@@ -122,7 +141,7 @@
     type Endian: endian::Endian;
     type Section: Section<Endian = Self::Endian>;
 
-    fn from_command(command: MachOLoadCommand<Self::Endian>) -> Result<Option<(&Self, Bytes)>>;
+    fn from_command(command: LoadCommandData<Self::Endian>) -> Result<Option<(&Self, &[u8])>>;
 
     fn cmd(&self, endian: Self::Endian) -> u32;
     fn cmdsize(&self, endian: Self::Endian) -> u32;
@@ -139,7 +158,7 @@
     /// Return the `segname` bytes up until the null terminator.
     fn name(&self) -> &[u8] {
         let segname = &self.segname()[..];
-        match segname.iter().position(|&x| x == 0) {
+        match memchr::memchr(b'\0', segname) {
             Some(end) => &segname[..end],
             None => segname,
         }
@@ -153,24 +172,25 @@
     /// Get the segment data from the file data.
     ///
     /// Returns `Err` for invalid values.
-    fn data<'data>(
+    fn data<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
-    ) -> result::Result<Bytes<'data>, ()> {
+        data: R,
+    ) -> result::Result<&'data [u8], ()> {
         let (offset, size) = self.file_range(endian);
-        data.read_bytes_at(offset as usize, size as usize)
+        data.read_bytes_at(offset, size)
     }
 
     /// Get the array of sections from the data following the segment command.
     ///
     /// Returns `Err` for invalid values.
-    fn sections<'data>(
+    fn sections<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        data: Bytes<'data>,
+        section_data: R,
     ) -> Result<&'data [Self::Section]> {
-        data.read_slice_at(0, self.nsects(endian) as usize)
+        section_data
+            .read_slice_at(0, self.nsects(endian) as usize)
             .read_error("Invalid Mach-O number of sections")
     }
 }
@@ -180,7 +200,7 @@
     type Endian = Endian;
     type Section = macho::Section32<Self::Endian>;
 
-    fn from_command(command: MachOLoadCommand<Self::Endian>) -> Result<Option<(&Self, Bytes)>> {
+    fn from_command(command: LoadCommandData<Self::Endian>) -> Result<Option<(&Self, &[u8])>> {
         command.segment_32()
     }
 
@@ -224,7 +244,7 @@
     type Endian = Endian;
     type Section = macho::Section64<Self::Endian>;
 
-    fn from_command(command: MachOLoadCommand<Self::Endian>) -> Result<Option<(&Self, Bytes)>> {
+    fn from_command(command: LoadCommandData<Self::Endian>) -> Result<Option<(&Self, &[u8])>> {
         command.segment_64()
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/symbol.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/symbol.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/macho/symbol.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/macho/symbol.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
 use crate::pod::Pod;
 use crate::read::util::StringTable;
 use crate::read::{
-    self, ObjectMap, ObjectMapEntry, ObjectSymbol, ObjectSymbolTable, ReadError, Result,
+    self, ObjectMap, ObjectMapEntry, ObjectSymbol, ObjectSymbolTable, ReadError, ReadRef, Result,
     SectionIndex, SectionKind, SymbolFlags, SymbolIndex, SymbolKind, SymbolMap, SymbolMapEntry,
     SymbolScope, SymbolSection,
 };
@@ -18,12 +18,15 @@
 ///
 /// Also includes the string table used for the symbol names.
 #[derive(Debug, Clone, Copy)]
-pub struct SymbolTable<'data, Mach: MachHeader> {
+pub struct SymbolTable<'data, Mach: MachHeader, R = &'data [u8]>
+where
+    R: ReadRef<'data>,
+{
     symbols: &'data [Mach::Nlist],
-    strings: StringTable<'data>,
+    strings: StringTable<'data, R>,
 }
 
-impl<'data, Mach: MachHeader> Default for SymbolTable<'data, Mach> {
+impl<'data, Mach: MachHeader, R: ReadRef<'data>> Default for SymbolTable<'data, Mach, R> {
     fn default() -> Self {
         SymbolTable {
             symbols: &[],
@@ -32,15 +35,15 @@
     }
 }
 
-impl<'data, Mach: MachHeader> SymbolTable<'data, Mach> {
+impl<'data, Mach: MachHeader, R: ReadRef<'data>> SymbolTable<'data, Mach, R> {
     #[inline]
-    pub(super) fn new(symbols: &'data [Mach::Nlist], strings: StringTable<'data>) -> Self {
+    pub(super) fn new(symbols: &'data [Mach::Nlist], strings: StringTable<'data, R>) -> Self {
         SymbolTable { symbols, strings }
     }
 
     /// Return the string table used for the symbol names.
     #[inline]
-    pub fn strings(&self) -> StringTable<'data> {
+    pub fn strings(&self) -> StringTable<'data, R> {
         self.strings
     }
 
@@ -141,28 +144,36 @@
 }
 
 /// An iterator over the symbols of a `MachOFile32`.
-pub type MachOSymbolTable32<'data, 'file, Endian = Endianness> =
-    MachOSymbolTable<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOSymbolTable32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSymbolTable<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// An iterator over the symbols of a `MachOFile64`.
-pub type MachOSymbolTable64<'data, 'file, Endian = Endianness> =
-    MachOSymbolTable<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOSymbolTable64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSymbolTable<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// A symbol table of a `MachOFile`.
 #[derive(Debug, Clone, Copy)]
-pub struct MachOSymbolTable<'data, 'file, Mach: MachHeader> {
-    pub(super) file: &'file MachOFile<'data, Mach>,
+pub struct MachOSymbolTable<'data, 'file, Mach, R = &'data [u8]>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    pub(super) file: &'file MachOFile<'data, Mach, R>,
 }
 
-impl<'data, 'file, Mach: MachHeader> read::private::Sealed
-    for MachOSymbolTable<'data, 'file, Mach>
+impl<'data, 'file, Mach, R> read::private::Sealed for MachOSymbolTable<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
 {
 }
 
-impl<'data, 'file, Mach: MachHeader> ObjectSymbolTable<'data>
-    for MachOSymbolTable<'data, 'file, Mach>
+impl<'data, 'file, Mach, R> ObjectSymbolTable<'data> for MachOSymbolTable<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
 {
-    type Symbol = MachOSymbol<'data, 'file, Mach>;
-    type SymbolIterator = MachOSymbolIterator<'data, 'file, Mach>;
+    type Symbol = MachOSymbol<'data, 'file, Mach, R>;
+    type SymbolIterator = MachOSymbolIterator<'data, 'file, Mach, R>;
 
     fn symbols(&self) -> Self::SymbolIterator {
         MachOSymbolIterator {
@@ -178,26 +189,38 @@
 }
 
 /// An iterator over the symbols of a `MachOFile32`.
-pub type MachOSymbolIterator32<'data, 'file, Endian = Endianness> =
-    MachOSymbolIterator<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOSymbolIterator32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSymbolIterator<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// An iterator over the symbols of a `MachOFile64`.
-pub type MachOSymbolIterator64<'data, 'file, Endian = Endianness> =
-    MachOSymbolIterator<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOSymbolIterator64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSymbolIterator<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// An iterator over the symbols of a `MachOFile`.
-pub struct MachOSymbolIterator<'data, 'file, Mach: MachHeader> {
-    pub(super) file: &'file MachOFile<'data, Mach>,
+pub struct MachOSymbolIterator<'data, 'file, Mach, R = &'data [u8]>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    pub(super) file: &'file MachOFile<'data, Mach, R>,
     pub(super) index: usize,
 }
 
-impl<'data, 'file, Mach: MachHeader> fmt::Debug for MachOSymbolIterator<'data, 'file, Mach> {
+impl<'data, 'file, Mach, R> fmt::Debug for MachOSymbolIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("MachOSymbolIterator").finish()
     }
 }
 
-impl<'data, 'file, Mach: MachHeader> Iterator for MachOSymbolIterator<'data, 'file, Mach> {
-    type Item = MachOSymbol<'data, 'file, Mach>;
+impl<'data, 'file, Mach, R> Iterator for MachOSymbolIterator<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    type Item = MachOSymbol<'data, 'file, Mach, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         loop {
@@ -212,23 +235,31 @@
 }
 
 /// A symbol of a `MachOFile32`.
-pub type MachOSymbol32<'data, 'file, Endian = Endianness> =
-    MachOSymbol<'data, 'file, macho::MachHeader32<Endian>>;
+pub type MachOSymbol32<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSymbol<'data, 'file, macho::MachHeader32<Endian>, R>;
 /// A symbol of a `MachOFile64`.
-pub type MachOSymbol64<'data, 'file, Endian = Endianness> =
-    MachOSymbol<'data, 'file, macho::MachHeader64<Endian>>;
+pub type MachOSymbol64<'data, 'file, Endian = Endianness, R = &'data [u8]> =
+    MachOSymbol<'data, 'file, macho::MachHeader64<Endian>, R>;
 
 /// A symbol of a `MachOFile`.
 #[derive(Debug, Clone, Copy)]
-pub struct MachOSymbol<'data, 'file, Mach: MachHeader> {
-    file: &'file MachOFile<'data, Mach>,
+pub struct MachOSymbol<'data, 'file, Mach, R = &'data [u8]>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+    file: &'file MachOFile<'data, Mach, R>,
     index: SymbolIndex,
     nlist: &'data Mach::Nlist,
 }
 
-impl<'data, 'file, Mach: MachHeader> MachOSymbol<'data, 'file, Mach> {
+impl<'data, 'file, Mach, R> MachOSymbol<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     pub(super) fn new(
-        file: &'file MachOFile<'data, Mach>,
+        file: &'file MachOFile<'data, Mach, R>,
         index: SymbolIndex,
         nlist: &'data Mach::Nlist,
     ) -> Option<Self> {
@@ -239,9 +270,18 @@
     }
 }
 
-impl<'data, 'file, Mach: MachHeader> read::private::Sealed for MachOSymbol<'data, 'file, Mach> {}
+impl<'data, 'file, Mach, R> read::private::Sealed for MachOSymbol<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Mach: MachHeader> ObjectSymbol<'data> for MachOSymbol<'data, 'file, Mach> {
+impl<'data, 'file, Mach, R> ObjectSymbol<'data> for MachOSymbol<'data, 'file, Mach, R>
+where
+    Mach: MachHeader,
+    R: ReadRef<'data>,
+{
     #[inline]
     fn index(&self) -> SymbolIndex {
         self.index
@@ -364,21 +404,43 @@
     fn n_desc(&self, endian: Self::Endian) -> u16;
     fn n_value(&self, endian: Self::Endian) -> Self::Word;
 
-    fn name<'data>(
+    fn name<'data, R: ReadRef<'data>>(
         &self,
         endian: Self::Endian,
-        strings: StringTable<'data>,
+        strings: StringTable<'data, R>,
     ) -> Result<&'data [u8]> {
         strings
             .get(self.n_strx(endian))
             .read_error("Invalid Mach-O symbol name offset")
     }
 
+    /// Return true if this is a STAB symbol.
+    ///
+    /// This determines the meaning of the `n_type` field.
+    fn is_stab(&self) -> bool {
+        self.n_type() & macho::N_STAB != 0
+    }
+
+    /// Return true if this is an undefined symbol.
+    fn is_undefined(&self) -> bool {
+        let n_type = self.n_type();
+        n_type & macho::N_STAB == 0 && n_type & macho::N_TYPE == macho::N_UNDF
+    }
+
     /// Return true if the symbol is a definition of a function or data object.
     fn is_definition(&self) -> bool {
         let n_type = self.n_type();
         n_type & macho::N_STAB == 0 && n_type & macho::N_TYPE != macho::N_UNDF
     }
+
+    /// Return the library ordinal.
+    ///
+    /// This is either a 1-based index into the dylib load commands,
+    /// or a special ordinal.
+    #[inline]
+    fn library_ordinal(&self, endian: Self::Endian) -> u8 {
+        (self.n_desc(endian) >> 8) as u8
+    }
 }
 
 impl<Endian: endian::Endian> Nlist for macho::Nlist32<Endian> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,12 +5,33 @@
 use core::{fmt, result};
 
 use crate::common::*;
-use crate::Bytes;
+
+mod read_ref;
+pub use read_ref::*;
+
+#[cfg(feature = "std")]
+mod read_cache;
+#[cfg(feature = "std")]
+pub use read_cache::*;
 
 mod util;
-pub use util::StringTable;
+pub use util::*;
 
+#[cfg(any(
+    feature = "coff",
+    feature = "elf",
+    feature = "macho",
+    feature = "pe",
+    feature = "wasm"
+))]
 mod any;
+#[cfg(any(
+    feature = "coff",
+    feature = "elf",
+    feature = "macho",
+    feature = "pe",
+    feature = "wasm"
+))]
 pub use any::*;
 
 #[cfg(feature = "archive")]
@@ -65,6 +86,12 @@
     }
 }
 
+impl<T> ReadError<T> for result::Result<T, Error> {
+    fn read_error(self, error: &'static str) -> Result<T> {
+        self.map_err(|_| Error(error))
+    }
+}
+
 impl<T> ReadError<T> for Option<T> {
     fn read_error(self, error: &'static str) -> Result<T> {
         self.ok_or(Error(error))
@@ -78,7 +105,7 @@
     target_pointer_width = "32",
     feature = "elf"
 ))]
-pub type NativeFile<'data> = elf::ElfFile32<'data>;
+pub type NativeFile<'data, R = &'data [u8]> = elf::ElfFile32<'data, crate::Endianness, R>;
 
 /// The native executable file for the target platform.
 #[cfg(all(
@@ -87,27 +114,133 @@
     target_pointer_width = "64",
     feature = "elf"
 ))]
-pub type NativeFile<'data> = elf::ElfFile64<'data>;
+pub type NativeFile<'data, R = &'data [u8]> = elf::ElfFile64<'data, crate::Endianness, R>;
 
 /// The native executable file for the target platform.
 #[cfg(all(target_os = "macos", target_pointer_width = "32", feature = "macho"))]
-pub type NativeFile<'data> = macho::MachOFile32<'data>;
+pub type NativeFile<'data, R = &'data [u8]> = macho::MachOFile32<'data, crate::Endianness, R>;
 
 /// The native executable file for the target platform.
 #[cfg(all(target_os = "macos", target_pointer_width = "64", feature = "macho"))]
-pub type NativeFile<'data> = macho::MachOFile64<'data>;
+pub type NativeFile<'data, R = &'data [u8]> = macho::MachOFile64<'data, crate::Endianness, R>;
 
 /// The native executable file for the target platform.
 #[cfg(all(target_os = "windows", target_pointer_width = "32", feature = "pe"))]
-pub type NativeFile<'data> = pe::PeFile32<'data>;
+pub type NativeFile<'data, R = &'data [u8]> = pe::PeFile32<'data, R>;
 
 /// The native executable file for the target platform.
 #[cfg(all(target_os = "windows", target_pointer_width = "64", feature = "pe"))]
-pub type NativeFile<'data> = pe::PeFile64<'data>;
+pub type NativeFile<'data, R = &'data [u8]> = pe::PeFile64<'data, R>;
 
 /// The native executable file for the target platform.
 #[cfg(all(feature = "wasm", target_arch = "wasm32", feature = "wasm"))]
-pub type NativeFile<'data> = wasm::WasmFile<'data>;
+pub type NativeFile<'data, R = &'data [u8]> = wasm::WasmFile<'data, R>;
+
+/// An object file kind.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum FileKind {
+    /// A Unix archive.
+    #[cfg(feature = "archive")]
+    Archive,
+    /// A COFF object file.
+    #[cfg(feature = "coff")]
+    Coff,
+    /// A dyld cache file containing Mach-O images.
+    #[cfg(feature = "macho")]
+    DyldCache,
+    /// A 32-bit ELF file.
+    #[cfg(feature = "elf")]
+    Elf32,
+    /// A 64-bit ELF file.
+    #[cfg(feature = "elf")]
+    Elf64,
+    /// A 32-bit Mach-O file.
+    #[cfg(feature = "macho")]
+    MachO32,
+    /// A 64-bit Mach-O file.
+    #[cfg(feature = "macho")]
+    MachO64,
+    /// A 32-bit Mach-O fat binary.
+    #[cfg(feature = "macho")]
+    MachOFat32,
+    /// A 64-bit Mach-O fat binary.
+    #[cfg(feature = "macho")]
+    MachOFat64,
+    /// A 32-bit PE file.
+    #[cfg(feature = "pe")]
+    Pe32,
+    /// A 64-bit PE file.
+    #[cfg(feature = "pe")]
+    Pe64,
+    /// A Wasm file.
+    #[cfg(feature = "wasm")]
+    Wasm,
+}
+
+impl FileKind {
+    /// Determine a file kind by parsing the start of the file.
+    pub fn parse<'data, R: ReadRef<'data>>(data: R) -> Result<FileKind> {
+        Self::parse_at(data, 0)
+    }
+
+    /// Determine a file kind by parsing at the given offset.
+    pub fn parse_at<'data, R: ReadRef<'data>>(data: R, offset: u64) -> Result<FileKind> {
+        let magic = data
+            .read_bytes_at(offset, 16)
+            .read_error("Could not read file magic")?;
+        if magic.len() < 16 {
+            return Err(Error("File too short"));
+        }
+
+        let kind = match [magic[0], magic[1], magic[2], magic[3], magic[4], magic[5], magic[6], magic[7]] {
+            #[cfg(feature = "archive")]
+            [b'!', b'<', b'a', b'r', b'c', b'h', b'>', b'\n'] => FileKind::Archive,
+            #[cfg(feature = "macho")]
+            [b'd', b'y', b'l', b'd', b'_', b'v', b'1', b' '] => FileKind::DyldCache,
+            #[cfg(feature = "elf")]
+            [0x7f, b'E', b'L', b'F', 1, ..] => FileKind::Elf32,
+            #[cfg(feature = "elf")]
+            [0x7f, b'E', b'L', b'F', 2, ..] => FileKind::Elf64,
+            #[cfg(feature = "macho")]
+            [0xfe, 0xed, 0xfa, 0xce, ..]
+            | [0xce, 0xfa, 0xed, 0xfe, ..] => FileKind::MachO32,
+            #[cfg(feature = "macho")]
+            | [0xfe, 0xed, 0xfa, 0xcf, ..]
+            | [0xcf, 0xfa, 0xed, 0xfe, ..] => FileKind::MachO64,
+            #[cfg(feature = "macho")]
+            [0xca, 0xfe, 0xba, 0xbe, ..] => FileKind::MachOFat32,
+            #[cfg(feature = "macho")]
+            [0xca, 0xfe, 0xba, 0xbf, ..] => FileKind::MachOFat64,
+            #[cfg(feature = "wasm")]
+            [0x00, b'a', b's', b'm', ..] => FileKind::Wasm,
+            #[cfg(feature = "pe")]
+            [b'M', b'Z', ..] => {
+                match pe::optional_header_magic(data) {
+                    Ok(crate::pe::IMAGE_NT_OPTIONAL_HDR32_MAGIC) => {
+                        FileKind::Pe32
+                    }
+                    Ok(crate::pe::IMAGE_NT_OPTIONAL_HDR64_MAGIC) => {
+                        FileKind::Pe64
+                    }
+                    _ => return Err(Error("Unknown MS-DOS file")),
+                }
+            }
+            // TODO: more COFF machines
+            #[cfg(feature = "coff")]
+            // COFF arm
+            [0xc4, 0x01, ..]
+            // COFF arm64
+            | [0x64, 0xaa, ..]
+            // COFF x86
+            | [0x4c, 0x01, ..]
+            // COFF x86-64
+            | [0x64, 0x86, ..] => FileKind::Coff,
+            _ => return Err(Error("Unknown file magic")),
+        };
+        Ok(kind)
+    }
+}
 
 /// The index used to identify a section of a file.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -119,6 +252,7 @@
 
 /// The section where a symbol is defined.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum SymbolSection {
     /// The section is unknown.
     Unknown,
@@ -301,13 +435,88 @@
     }
 }
 
+/// An imported symbol.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Import<'data> {
+    // TODO: or ordinal
+    name: ByteString<'data>,
+    library: ByteString<'data>,
+}
+
+impl<'data> Import<'data> {
+    /// The symbol name.
+    #[inline]
+    pub fn name(&self) -> &'data [u8] {
+        self.name.0
+    }
+
+    /// The name of the library to import the symbol from.
+    #[inline]
+    pub fn library(&self) -> &'data [u8] {
+        self.library.0
+    }
+}
+
+/// An exported symbol.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Export<'data> {
+    // TODO: and ordinal?
+    name: ByteString<'data>,
+    address: u64,
+}
+
+impl<'data> Export<'data> {
+    /// The symbol name.
+    #[inline]
+    pub fn name(&self) -> &'data [u8] {
+        self.name.0
+    }
+
+    /// The virtual address of the symbol.
+    #[inline]
+    pub fn address(&self) -> u64 {
+        self.address
+    }
+}
+
+/// PDB Information
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct CodeView<'data> {
+    guid: [u8; 16],
+    path: ByteString<'data>,
+    age: u32,
+}
+
+impl<'data> CodeView<'data> {
+    /// The path to the PDB as stored in CodeView
+    #[inline]
+    pub fn path(&self) -> &'data [u8] {
+        self.path.0
+    }
+
+    /// The age of the PDB
+    #[inline]
+    pub fn age(&self) -> u32 {
+        self.age
+    }
+
+    /// The GUID of the PDB.
+    #[inline]
+    pub fn guid(&self) -> [u8; 16] {
+        self.guid
+    }
+}
+
 /// The target referenced by a relocation.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum RelocationTarget {
     /// The target is a symbol.
     Symbol(SymbolIndex),
     /// The target is a section.
     Section(SectionIndex),
+    /// The offset is an absolute address.
+    Absolute,
 }
 
 /// A relocation entry.
@@ -368,25 +577,9 @@
     }
 }
 
-fn data_range(data: Bytes, data_address: u64, range_address: u64, size: u64) -> Option<&[u8]> {
-    let offset = range_address.checked_sub(data_address)?;
-    let data = data.read_bytes_at(offset as usize, size as usize).ok()?;
-    Some(data.0)
-}
-
-/// Data that may be compressed.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct CompressedData<'data> {
-    /// The data compression format.
-    pub format: CompressionFormat,
-    /// The compressed data.
-    pub data: &'data [u8],
-    /// The uncompressed data size.
-    pub uncompressed_size: usize,
-}
-
 /// A data compression format.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum CompressionFormat {
     /// The data is uncompressed.
     None,
@@ -398,6 +591,64 @@
     Zlib,
 }
 
+/// A range in a file that may be compressed.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct CompressedFileRange {
+    /// The data compression format.
+    pub format: CompressionFormat,
+    /// The file offset of the compressed data.
+    pub offset: u64,
+    /// The compressed data size.
+    pub compressed_size: u64,
+    /// The uncompressed data size.
+    pub uncompressed_size: u64,
+}
+
+impl CompressedFileRange {
+    /// Data that is uncompressed.
+    #[inline]
+    pub fn none(range: Option<(u64, u64)>) -> Self {
+        if let Some((offset, size)) = range {
+            CompressedFileRange {
+                format: CompressionFormat::None,
+                offset,
+                compressed_size: size,
+                uncompressed_size: size,
+            }
+        } else {
+            CompressedFileRange {
+                format: CompressionFormat::None,
+                offset: 0,
+                compressed_size: 0,
+                uncompressed_size: 0,
+            }
+        }
+    }
+
+    /// Convert to `CompressedData` by reading from the file.
+    pub fn data<'data, R: ReadRef<'data>>(self, file: R) -> Result<CompressedData<'data>> {
+        let data = file
+            .read_bytes_at(self.offset, self.compressed_size)
+            .read_error("Invalid compressed data size or offset")?;
+        Ok(CompressedData {
+            format: self.format,
+            data,
+            uncompressed_size: self.uncompressed_size,
+        })
+    }
+}
+
+/// Data that may be compressed.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct CompressedData<'data> {
+    /// The data compression format.
+    pub format: CompressionFormat,
+    /// The compressed data.
+    pub data: &'data [u8],
+    /// The uncompressed data size.
+    pub uncompressed_size: u64,
+}
+
 impl<'data> CompressedData<'data> {
     /// Data that is uncompressed.
     #[inline]
@@ -405,7 +656,7 @@
         CompressedData {
             format: CompressionFormat::None,
             data,
-            uncompressed_size: data.len(),
+            uncompressed_size: data.len() as u64,
         }
     }
 
@@ -419,7 +670,13 @@
             CompressionFormat::None => Ok(Cow::Borrowed(self.data)),
             #[cfg(feature = "compression")]
             CompressionFormat::Zlib => {
-                let mut decompressed = Vec::with_capacity(self.uncompressed_size);
+                use core::convert::TryInto;
+                let size = self
+                    .uncompressed_size
+                    .try_into()
+                    .ok()
+                    .read_error("Uncompressed data size is too large.")?;
+                let mut decompressed = Vec::with_capacity(size);
                 let mut decompress = flate2::Decompress::new(true);
                 decompress
                     .decompress_vec(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/pe/file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/pe/file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/pe/file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/pe/file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,53 +1,52 @@
+use alloc::vec::Vec;
 use core::fmt::Debug;
 use core::{mem, str};
 
+use core::convert::TryInto;
+
 use crate::read::coff::{CoffCommon, CoffSymbol, CoffSymbolIterator, CoffSymbolTable, SymbolTable};
 use crate::read::{
-    self, Architecture, ComdatKind, Error, FileFlags, Object, ObjectComdat, ReadError, Result,
-    SectionIndex, SymbolIndex,
+    self, Architecture, ComdatKind, Error, Export, FileFlags, Import, NoDynamicRelocationIterator,
+    Object, ObjectComdat, ReadError, ReadRef, Result, SectionIndex, SymbolIndex,
+};
+use crate::{
+    pe, ByteString, Bytes, CodeView, LittleEndian as LE, Pod, U16Bytes, U32Bytes, U32, U64,
 };
-use crate::{pe, Bytes, LittleEndian as LE, Pod};
 
 use super::{PeSection, PeSectionIterator, PeSegment, PeSegmentIterator, SectionTable};
 
 /// A PE32 (32-bit) image file.
-pub type PeFile32<'data> = PeFile<'data, pe::ImageNtHeaders32>;
+pub type PeFile32<'data, R = &'data [u8]> = PeFile<'data, pe::ImageNtHeaders32, R>;
 /// A PE32+ (64-bit) image file.
-pub type PeFile64<'data> = PeFile<'data, pe::ImageNtHeaders64>;
+pub type PeFile64<'data, R = &'data [u8]> = PeFile<'data, pe::ImageNtHeaders64, R>;
 
 /// A PE object file.
 #[derive(Debug)]
-pub struct PeFile<'data, Pe: ImageNtHeaders> {
+pub struct PeFile<'data, Pe, R = &'data [u8]>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
     pub(super) dos_header: &'data pe::ImageDosHeader,
     pub(super) nt_headers: &'data Pe,
     pub(super) data_directories: &'data [pe::ImageDataDirectory],
-    pub(super) common: CoffCommon<'data>,
-    pub(super) data: Bytes<'data>,
+    pub(super) common: CoffCommon<'data, R>,
+    pub(super) data: R,
 }
 
-impl<'data, Pe: ImageNtHeaders> PeFile<'data, Pe> {
-    /// Find the optional header and read the `optional_header.magic`.
-    pub fn optional_header_magic(data: &'data [u8]) -> Result<u16> {
-        let data = Bytes(data);
-        let dos_header = pe::ImageDosHeader::parse(data)?;
-        // NT headers are at an offset specified in the DOS header.
-        let nt_headers = data
-            .read_at::<Pe>(dos_header.e_lfanew.get(LE) as usize)
-            .read_error("Invalid NT headers offset, size, or alignment")?;
-        if nt_headers.signature() != pe::IMAGE_NT_SIGNATURE {
-            return Err(Error("Invalid PE magic"));
-        }
-        Ok(nt_headers.optional_header().magic())
-    }
-
+impl<'data, Pe, R> PeFile<'data, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
     /// Parse the raw PE file data.
-    pub fn parse(data: &'data [u8]) -> Result<Self> {
-        let data = Bytes(data);
+    pub fn parse(data: R) -> Result<Self> {
         let dos_header = pe::ImageDosHeader::parse(data)?;
-        let (nt_headers, data_directories, nt_tail) = dos_header.nt_headers::<Pe>(data)?;
-        let sections = nt_headers.sections(nt_tail)?;
+        let mut offset = dos_header.nt_headers_offset().into();
+        let (nt_headers, data_directories) = Pe::parse(data, &mut offset)?;
+        let sections = nt_headers.sections(data, offset)?;
         let symbols = nt_headers.symbols(data)?;
-        let image_base = u64::from(nt_headers.optional_header().image_base());
+        let image_base = nt_headers.optional_header().image_base();
 
         Ok(PeFile {
             dos_header,
@@ -65,28 +64,67 @@
     pub(super) fn section_alignment(&self) -> u64 {
         u64::from(self.nt_headers.optional_header().section_alignment())
     }
+
+    /// Return the DOS header of this file
+    pub fn dos_header(&self) -> &'data pe::ImageDosHeader {
+        self.dos_header
+    }
+
+    /// Return the NT Headers of this file
+    pub fn nt_headers(&self) -> &'data Pe {
+        self.nt_headers
+    }
+
+    /// Returns the section table of this binary.
+    pub fn section_table(&self) -> SectionTable<'data> {
+        self.common.sections
+    }
+
+    /// Returns the data directory at the given index.
+    pub fn data_directory(&self, id: usize) -> Option<&'data pe::ImageDataDirectory> {
+        self.data_directories
+            .get(id)
+            .filter(|d| d.size.get(LE) != 0)
+    }
+
+    fn data_at(&self, va: u32) -> Option<Bytes<'data>> {
+        self.common.sections.pe_data_at(self.data, va).map(Bytes)
+    }
+
+    /// Returns this binary data.
+    pub fn data(&self) -> R {
+        self.data
+    }
 }
 
-impl<'data, Pe: ImageNtHeaders> read::private::Sealed for PeFile<'data, Pe> {}
+impl<'data, Pe, R> read::private::Sealed for PeFile<'data, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Pe> Object<'data, 'file> for PeFile<'data, Pe>
+impl<'data, 'file, Pe, R> Object<'data, 'file> for PeFile<'data, Pe, R>
 where
     'data: 'file,
     Pe: ImageNtHeaders,
+    R: 'file + ReadRef<'data>,
 {
-    type Segment = PeSegment<'data, 'file, Pe>;
-    type SegmentIterator = PeSegmentIterator<'data, 'file, Pe>;
-    type Section = PeSection<'data, 'file, Pe>;
-    type SectionIterator = PeSectionIterator<'data, 'file, Pe>;
-    type Comdat = PeComdat<'data, 'file, Pe>;
-    type ComdatIterator = PeComdatIterator<'data, 'file, Pe>;
-    type Symbol = CoffSymbol<'data, 'file>;
-    type SymbolIterator = CoffSymbolIterator<'data, 'file>;
-    type SymbolTable = CoffSymbolTable<'data, 'file>;
+    type Segment = PeSegment<'data, 'file, Pe, R>;
+    type SegmentIterator = PeSegmentIterator<'data, 'file, Pe, R>;
+    type Section = PeSection<'data, 'file, Pe, R>;
+    type SectionIterator = PeSectionIterator<'data, 'file, Pe, R>;
+    type Comdat = PeComdat<'data, 'file, Pe, R>;
+    type ComdatIterator = PeComdatIterator<'data, 'file, Pe, R>;
+    type Symbol = CoffSymbol<'data, 'file, R>;
+    type SymbolIterator = CoffSymbolIterator<'data, 'file, R>;
+    type SymbolTable = CoffSymbolTable<'data, 'file, R>;
+    type DynamicRelocationIterator = NoDynamicRelocationIterator;
 
     fn architecture(&self) -> Architecture {
         match self.nt_headers.file_header().machine.get(LE) {
-            // TODO: Arm/Arm64
+            pe::IMAGE_FILE_MACHINE_ARMNT => Architecture::Arm,
+            pe::IMAGE_FILE_MACHINE_ARM64 => Architecture::Aarch64,
             pe::IMAGE_FILE_MACHINE_I386 => Architecture::I386,
             pe::IMAGE_FILE_MACHINE_AMD64 => Architecture::X86_64,
             _ => Architecture::Unknown,
@@ -104,14 +142,14 @@
         self.nt_headers.is_type_64()
     }
 
-    fn segments(&'file self) -> PeSegmentIterator<'data, 'file, Pe> {
+    fn segments(&'file self) -> PeSegmentIterator<'data, 'file, Pe, R> {
         PeSegmentIterator {
             file: self,
             iter: self.common.sections.iter(),
         }
     }
 
-    fn section_by_name(&'file self, section_name: &str) -> Option<PeSection<'data, 'file, Pe>> {
+    fn section_by_name(&'file self, section_name: &str) -> Option<PeSection<'data, 'file, Pe, R>> {
         self.common
             .sections
             .section_by_name(self.common.symbols.strings(), section_name.as_bytes())
@@ -122,7 +160,10 @@
             })
     }
 
-    fn section_by_index(&'file self, index: SectionIndex) -> Result<PeSection<'data, 'file, Pe>> {
+    fn section_by_index(
+        &'file self,
+        index: SectionIndex,
+    ) -> Result<PeSection<'data, 'file, Pe, R>> {
         let section = self.common.sections.section(index.0)?;
         Ok(PeSection {
             file: self,
@@ -131,18 +172,18 @@
         })
     }
 
-    fn sections(&'file self) -> PeSectionIterator<'data, 'file, Pe> {
+    fn sections(&'file self) -> PeSectionIterator<'data, 'file, Pe, R> {
         PeSectionIterator {
             file: self,
             iter: self.common.sections.iter().enumerate(),
         }
     }
 
-    fn comdats(&'file self) -> PeComdatIterator<'data, 'file, Pe> {
+    fn comdats(&'file self) -> PeComdatIterator<'data, 'file, Pe, R> {
         PeComdatIterator { file: self }
     }
 
-    fn symbol_by_index(&'file self, index: SymbolIndex) -> Result<CoffSymbol<'data, 'file>> {
+    fn symbol_by_index(&'file self, index: SymbolIndex) -> Result<CoffSymbol<'data, 'file, R>> {
         let symbol = self.common.symbols.symbol(index.0)?;
         Ok(CoffSymbol {
             file: &self.common,
@@ -151,18 +192,18 @@
         })
     }
 
-    fn symbols(&'file self) -> CoffSymbolIterator<'data, 'file> {
+    fn symbols(&'file self) -> CoffSymbolIterator<'data, 'file, R> {
         CoffSymbolIterator {
             file: &self.common,
             index: 0,
         }
     }
 
-    fn symbol_table(&'file self) -> Option<CoffSymbolTable<'data, 'file>> {
+    fn symbol_table(&'file self) -> Option<CoffSymbolTable<'data, 'file, R>> {
         Some(CoffSymbolTable { file: &self.common })
     }
 
-    fn dynamic_symbols(&'file self) -> CoffSymbolIterator<'data, 'file> {
+    fn dynamic_symbols(&'file self) -> CoffSymbolIterator<'data, 'file, R> {
         CoffSymbolIterator {
             file: &self.common,
             // Hack: don't return any.
@@ -170,16 +211,201 @@
         }
     }
 
-    fn dynamic_symbol_table(&'file self) -> Option<CoffSymbolTable<'data, 'file>> {
+    fn dynamic_symbol_table(&'file self) -> Option<CoffSymbolTable<'data, 'file, R>> {
         None
     }
 
+    fn dynamic_relocations(&'file self) -> Option<NoDynamicRelocationIterator> {
+        None
+    }
+
+    fn imports(&self) -> Result<Vec<Import<'data>>> {
+        let data_dir = match self.data_directory(pe::IMAGE_DIRECTORY_ENTRY_IMPORT) {
+            Some(data_dir) => data_dir,
+            None => return Ok(Vec::new()),
+        };
+        let mut import_descriptors = data_dir.data(self.data, &self.common.sections).map(Bytes)?;
+        let mut imports = Vec::new();
+        loop {
+            let import_desc = import_descriptors
+                .read::<pe::ImageImportDescriptor>()
+                .read_error("Missing PE null import descriptor")?;
+            if import_desc.original_first_thunk.get(LE) == 0 {
+                break;
+            }
+
+            let library = self
+                .data_at(import_desc.name.get(LE))
+                .read_error("Invalid PE import descriptor name")?
+                .read_string()
+                .read_error("Invalid PE import descriptor name")?;
+
+            let thunk_va = import_desc.original_first_thunk.get(LE);
+            let mut thunk_data = self
+                .data_at(thunk_va)
+                .read_error("Invalid PE import thunk address")?;
+            loop {
+                let hint_name = if self.is_64() {
+                    let thunk = thunk_data
+                        .read::<U64<_>>()
+                        .read_error("Missing PE null import thunk")?
+                        .get(LE);
+                    if thunk == 0 {
+                        break;
+                    }
+                    if thunk & pe::IMAGE_ORDINAL_FLAG64 != 0 {
+                        // TODO: handle import by ordinal
+                        continue;
+                    }
+                    thunk as u32
+                } else {
+                    let thunk = thunk_data
+                        .read::<U32<_>>()
+                        .read_error("Missing PE null import thunk")?
+                        .get(LE);
+                    if thunk == 0 {
+                        break;
+                    }
+                    if thunk & pe::IMAGE_ORDINAL_FLAG32 != 0 {
+                        // TODO: handle import by ordinal
+                        continue;
+                    }
+                    thunk
+                };
+                let name = self
+                    .data_at(hint_name)
+                    .read_error("Invalid PE import thunk name")?
+                    .read_string_at(2)
+                    .read_error("Invalid PE import thunk name")?;
+
+                imports.push(Import {
+                    name: ByteString(name),
+                    library: ByteString(library),
+                });
+            }
+        }
+        Ok(imports)
+    }
+
+    fn exports(&self) -> Result<Vec<Export<'data>>> {
+        let data_dir = match self.data_directory(pe::IMAGE_DIRECTORY_ENTRY_EXPORT) {
+            Some(data_dir) => data_dir,
+            None => return Ok(Vec::new()),
+        };
+        let export_va = data_dir.virtual_address.get(LE);
+        let export_size = data_dir.size.get(LE);
+        let export_data = data_dir.data(self.data, &self.common.sections).map(Bytes)?;
+        let export_dir = export_data
+            .read_at::<pe::ImageExportDirectory>(0)
+            .read_error("Invalid PE export dir size")?;
+        let addresses = export_data
+            .read_slice_at::<U32Bytes<_>>(
+                export_dir
+                    .address_of_functions
+                    .get(LE)
+                    .wrapping_sub(export_va) as usize,
+                export_dir.number_of_functions.get(LE) as usize,
+            )
+            .read_error("Invalid PE export address table")?;
+        let number = export_dir.number_of_names.get(LE) as usize;
+        let names = export_data
+            .read_slice_at::<U32Bytes<_>>(
+                export_dir.address_of_names.get(LE).wrapping_sub(export_va) as usize,
+                number,
+            )
+            .read_error("Invalid PE export name table")?;
+        let ordinals = export_data
+            .read_slice_at::<U16Bytes<_>>(
+                export_dir
+                    .address_of_name_ordinals
+                    .get(LE)
+                    .wrapping_sub(export_va) as usize,
+                number,
+            )
+            .read_error("Invalid PE export ordinal table")?;
+
+        let mut exports = Vec::new();
+        for (name, ordinal) in names.iter().zip(ordinals.iter()) {
+            let name = export_data
+                .read_string_at(name.get(LE).wrapping_sub(export_va) as usize)
+                .read_error("Invalid PE export name entry")?;
+            let address = addresses
+                .get(ordinal.get(LE) as usize)
+                .read_error("Invalid PE export ordinal entry")?
+                .get(LE);
+            // Check for export address (vs forwarder address).
+            if address < export_va || (address - export_va) >= export_size {
+                exports.push(Export {
+                    name: ByteString(name),
+                    address: self.common.image_base.wrapping_add(address.into()),
+                })
+            }
+        }
+        Ok(exports)
+    }
+
+    fn pdb_info(&self) -> Result<Option<CodeView>> {
+        let data_dir = match self.data_directory(pe::IMAGE_DIRECTORY_ENTRY_DEBUG) {
+            Some(data_dir) => data_dir,
+            None => return Ok(None),
+        };
+        let debug_data = data_dir.data(self.data, &self.common.sections).map(Bytes)?;
+        let debug_dir = debug_data
+            .read_at::<pe::ImageDebugDirectory>(0)
+            .read_error("Invalid PE debug dir size")?;
+
+        if debug_dir.typ.get(LE) != pe::IMAGE_DEBUG_TYPE_CODEVIEW {
+            return Ok(None);
+        }
+
+        let info = self
+            .data
+            .read_slice_at::<u8>(
+                debug_dir.pointer_to_raw_data.get(LE) as u64,
+                debug_dir.size_of_data.get(LE) as usize,
+            )
+            .read_error("Invalid CodeView Info address")?;
+
+        let mut info = Bytes(info);
+
+        let sig = info
+            .read_bytes(4)
+            .read_error("Invalid CodeView signature")?;
+        if sig.0 != b"RSDS" {
+            return Ok(None);
+        }
+
+        let guid: [u8; 16] = info
+            .read_bytes(16)
+            .read_error("Invalid CodeView GUID")?
+            .0
+            .try_into()
+            .unwrap();
+
+        let age = info.read::<U32<LE>>().read_error("Invalid CodeView Age")?;
+
+        let path = info
+            .read_string()
+            .read_error("Invalid CodeView file path")?;
+
+        Ok(Some(CodeView {
+            path: ByteString(path),
+            guid,
+            age: age.get(LE),
+        }))
+    }
+
     fn has_debug_symbols(&self) -> bool {
         self.section_by_name(".debug_info").is_some()
     }
 
+    fn relative_address_base(&self) -> u64 {
+        self.common.image_base
+    }
+
     fn entry(&self) -> u64 {
         u64::from(self.nt_headers.optional_header().address_of_entry_point())
+            .wrapping_add(self.common.image_base)
     }
 
     fn flags(&self) -> FileFlags {
@@ -190,18 +416,28 @@
 }
 
 /// An iterator over the COMDAT section groups of a `PeFile32`.
-pub type PeComdatIterator32<'data, 'file> = PeComdatIterator<'data, 'file, pe::ImageNtHeaders32>;
+pub type PeComdatIterator32<'data, 'file, R = &'data [u8]> =
+    PeComdatIterator<'data, 'file, pe::ImageNtHeaders32, R>;
 /// An iterator over the COMDAT section groups of a `PeFile64`.
-pub type PeComdatIterator64<'data, 'file> = PeComdatIterator<'data, 'file, pe::ImageNtHeaders64>;
+pub type PeComdatIterator64<'data, 'file, R = &'data [u8]> =
+    PeComdatIterator<'data, 'file, pe::ImageNtHeaders64, R>;
 
 /// An iterator over the COMDAT section groups of a `PeFile`.
 #[derive(Debug)]
-pub struct PeComdatIterator<'data, 'file, Pe: ImageNtHeaders> {
-    file: &'file PeFile<'data, Pe>,
+pub struct PeComdatIterator<'data, 'file, Pe, R = &'data [u8]>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    file: &'file PeFile<'data, Pe, R>,
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> Iterator for PeComdatIterator<'data, 'file, Pe> {
-    type Item = PeComdat<'data, 'file, Pe>;
+impl<'data, 'file, Pe, R> Iterator for PeComdatIterator<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    type Item = PeComdat<'data, 'file, Pe, R>;
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
@@ -210,20 +446,35 @@
 }
 
 /// A COMDAT section group of a `PeFile32`.
-pub type PeComdat32<'data, 'file> = PeComdat<'data, 'file, pe::ImageNtHeaders32>;
+pub type PeComdat32<'data, 'file, R = &'data [u8]> =
+    PeComdat<'data, 'file, pe::ImageNtHeaders32, R>;
 /// A COMDAT section group of a `PeFile64`.
-pub type PeComdat64<'data, 'file> = PeComdat<'data, 'file, pe::ImageNtHeaders64>;
+pub type PeComdat64<'data, 'file, R = &'data [u8]> =
+    PeComdat<'data, 'file, pe::ImageNtHeaders64, R>;
 
 /// A COMDAT section group of a `PeFile`.
 #[derive(Debug)]
-pub struct PeComdat<'data, 'file, Pe: ImageNtHeaders> {
-    file: &'file PeFile<'data, Pe>,
+pub struct PeComdat<'data, 'file, Pe, R = &'data [u8]>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    file: &'file PeFile<'data, Pe, R>,
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> read::private::Sealed for PeComdat<'data, 'file, Pe> {}
+impl<'data, 'file, Pe, R> read::private::Sealed for PeComdat<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Pe: ImageNtHeaders> ObjectComdat<'data> for PeComdat<'data, 'file, Pe> {
-    type SectionIterator = PeComdatSectionIterator<'data, 'file, Pe>;
+impl<'data, 'file, Pe, R> ObjectComdat<'data> for PeComdat<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    type SectionIterator = PeComdatSectionIterator<'data, 'file, Pe, R>;
 
     #[inline]
     fn kind(&self) -> ComdatKind {
@@ -247,22 +498,27 @@
 }
 
 /// An iterator over the sections in a COMDAT section group of a `PeFile32`.
-pub type PeComdatSectionIterator32<'data, 'file> =
-    PeComdatSectionIterator<'data, 'file, pe::ImageNtHeaders32>;
+pub type PeComdatSectionIterator32<'data, 'file, R = &'data [u8]> =
+    PeComdatSectionIterator<'data, 'file, pe::ImageNtHeaders32, R>;
 /// An iterator over the sections in a COMDAT section group of a `PeFile64`.
-pub type PeComdatSectionIterator64<'data, 'file> =
-    PeComdatSectionIterator<'data, 'file, pe::ImageNtHeaders64>;
+pub type PeComdatSectionIterator64<'data, 'file, R = &'data [u8]> =
+    PeComdatSectionIterator<'data, 'file, pe::ImageNtHeaders64, R>;
 
 /// An iterator over the sections in a COMDAT section group of a `PeFile`.
 #[derive(Debug)]
-pub struct PeComdatSectionIterator<'data, 'file, Pe: ImageNtHeaders>
+pub struct PeComdatSectionIterator<'data, 'file, Pe, R = &'data [u8]>
 where
-    'data: 'file,
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
 {
-    file: &'file PeFile<'data, Pe>,
+    file: &'file PeFile<'data, Pe, R>,
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> Iterator for PeComdatSectionIterator<'data, 'file, Pe> {
+impl<'data, 'file, Pe, R> Iterator for PeComdatSectionIterator<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
     type Item = SectionIndex;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -274,7 +530,7 @@
     /// Read the DOS header.
     ///
     /// Also checks that the `e_magic` field in the header is valid.
-    pub fn parse<'data>(data: Bytes<'data>) -> read::Result<&'data Self> {
+    pub fn parse<'data, R: ReadRef<'data>>(data: R) -> read::Result<&'data Self> {
         // DOS header comes first.
         let dos_header = data
             .read_at::<pe::ImageDosHeader>(0)
@@ -285,19 +541,30 @@
         Ok(dos_header)
     }
 
-    /// Read the NT headers, including the data directories.
-    ///
-    /// The given data must be for the entire file.  Returns the data following the NT headers,
-    /// which will contain the section headers.
-    ///
-    /// Also checks that the `signature` and `magic` fields in the headers are valid.
+    /// Return the file offset of the nt_headers.
     #[inline]
-    pub fn nt_headers<'data, Pe: ImageNtHeaders>(
-        &self,
-        data: Bytes<'data>,
-    ) -> read::Result<(&'data Pe, &'data [pe::ImageDataDirectory], Bytes<'data>)> {
-        Pe::parse(self, data)
+    pub fn nt_headers_offset(&self) -> u32 {
+        self.e_lfanew.get(LE)
+    }
+}
+
+/// Find the optional header and read the `optional_header.magic`.
+///
+/// It can be useful to know this magic value before trying to
+/// fully parse the NT headers.
+pub fn optional_header_magic<'data, R: ReadRef<'data>>(data: R) -> Result<u16> {
+    let dos_header = pe::ImageDosHeader::parse(data)?;
+    // NT headers are at an offset specified in the DOS header.
+    let offset = dos_header.nt_headers_offset().into();
+    // It doesn't matter which NT header type is used for the purpose
+    // of reading the optional header magic.
+    let nt_headers = data
+        .read_at::<pe::ImageNtHeaders32>(offset)
+        .read_error("Invalid NT headers offset, size, or alignment")?;
+    if nt_headers.signature() != pe::IMAGE_NT_SIGNATURE {
+        return Err(Error("Invalid PE magic"));
     }
+    Ok(nt_headers.optional_header().magic())
 }
 
 /// A trait for generic access to `ImageNtHeaders32` and `ImageNtHeaders64`.
@@ -326,22 +593,20 @@
 
     /// Read the NT headers, including the data directories.
     ///
-    /// The DOS header is required to determine the NT headers offset.
+    /// `data` must be for the entire file.
     ///
-    /// The given data must be for the entire file.  Returns the data following the NT headers,
-    /// which will contain the section headers.
+    /// `offset` must be headers offset, which can be obtained from `ImageDosHeader::nt_headers_offset`.
+    /// It is updated to point after the optional header, which is where the section headers are located.
     ///
     /// Also checks that the `signature` and `magic` fields in the headers are valid.
-    fn parse<'data>(
-        dos_header: &pe::ImageDosHeader,
-        mut data: Bytes<'data>,
-    ) -> read::Result<(&'data Self, &'data [pe::ImageDataDirectory], Bytes<'data>)> {
-        data.skip(dos_header.e_lfanew.get(LE) as usize)
-            .read_error("Invalid PE headers offset")?;
+    fn parse<'data, R: ReadRef<'data>>(
+        data: R,
+        offset: &mut u64,
+    ) -> read::Result<(&'data Self, &'data [pe::ImageDataDirectory])> {
         // Note that this does not include the data directories in the optional header.
         let nt_headers = data
-            .read::<Self>()
-            .read_error("Invalid PE headers size or alignment")?;
+            .read::<Self>(offset)
+            .read_error("Invalid PE headers offset or size")?;
         if nt_headers.signature() != pe::IMAGE_NT_SIGNATURE {
             return Err(Error("Invalid PE magic"));
         }
@@ -350,33 +615,39 @@
         }
 
         // Read the rest of the optional header, and then read the data directories from that.
-        let optional_data_size = (nt_headers.file_header().size_of_optional_header.get(LE)
-            as usize)
-            .checked_sub(mem::size_of::<Self::ImageOptionalHeader>())
-            .read_error("PE optional header size is too small")?;
+        let optional_data_size =
+            u64::from(nt_headers.file_header().size_of_optional_header.get(LE))
+                .checked_sub(mem::size_of::<Self::ImageOptionalHeader>() as u64)
+                .read_error("PE optional header size is too small")?;
         let mut optional_data = data
-            .read_bytes(optional_data_size)
-            .read_error("Invalid PE optional header size")?;
+            .read_bytes(offset, optional_data_size)
+            .read_error("Invalid PE optional header size")
+            .map(Bytes)?;
         let data_directories = optional_data
             .read_slice(nt_headers.optional_header().number_of_rva_and_sizes() as usize)
             .read_error("Invalid PE number of RVA and sizes")?;
 
-        Ok((nt_headers, data_directories, data))
+        Ok((nt_headers, data_directories))
     }
 
     /// Read the section table.
     ///
-    /// `nt_tail` must be the data following the NT headers.
+    /// `data` must be for the entire file.
+    /// `offset` must be after the optional file header.
     #[inline]
-    fn sections<'data>(&self, nt_tail: Bytes<'data>) -> read::Result<SectionTable<'data>> {
-        SectionTable::parse(self.file_header(), nt_tail)
+    fn sections<'data, R: ReadRef<'data>>(
+        &self,
+        data: R,
+        offset: u64,
+    ) -> read::Result<SectionTable<'data>> {
+        SectionTable::parse(self.file_header(), data, offset)
     }
 
     /// Read the symbol table and string table.
     ///
     /// `data` must be the entire file data.
     #[inline]
-    fn symbols<'data>(&self, data: Bytes<'data>) -> read::Result<SymbolTable<'data>> {
+    fn symbols<'data, R: ReadRef<'data>>(&self, data: R) -> read::Result<SymbolTable<'data, R>> {
         SymbolTable::parse(self.file_header(), data)
     }
 }
@@ -769,3 +1040,18 @@
         self.number_of_rva_and_sizes.get(LE)
     }
 }
+
+impl pe::ImageDataDirectory {
+    /// Get the data referenced by this directory entry.
+    pub fn data<'data, R: ReadRef<'data>>(
+        &self,
+        data: R,
+        sections: &SectionTable<'data>,
+    ) -> Result<&'data [u8]> {
+        sections
+            .pe_data_at(data, self.virtual_address.get(LE))
+            .read_error("Invalid data dir virtual address or size")?
+            .get(..self.size.get(LE) as usize)
+            .read_error("Invalid data dir size")
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/pe/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/pe/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/pe/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/pe/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-//! Support for reading ELF files.
+//! Support for reading PE files.
 //!
 //! Defines traits to abstract over the difference between PE32/PE32+,
 //! and implements read functionality in terms of these traits.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/pe/section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/pe/section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/pe/section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/pe/section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,32 +3,37 @@
 
 use crate::endian::LittleEndian as LE;
 use crate::pe;
-use crate::pod::Bytes;
 use crate::read::{
-    self, CompressedData, ObjectSection, ObjectSegment, ReadError, Relocation, Result,
-    SectionFlags, SectionIndex, SectionKind,
+    self, CompressedData, CompressedFileRange, ObjectSection, ObjectSegment, ReadError, ReadRef,
+    Relocation, Result, SectionFlags, SectionIndex, SectionKind,
 };
 
-use super::{ImageNtHeaders, PeFile};
+use super::{ImageNtHeaders, PeFile, SectionTable};
 
 /// An iterator over the loadable sections of a `PeFile32`.
-pub type PeSegmentIterator32<'data, 'file> = PeSegmentIterator<'data, 'file, pe::ImageNtHeaders32>;
+pub type PeSegmentIterator32<'data, 'file, R = &'data [u8]> =
+    PeSegmentIterator<'data, 'file, pe::ImageNtHeaders32, R>;
 /// An iterator over the loadable sections of a `PeFile64`.
-pub type PeSegmentIterator64<'data, 'file> = PeSegmentIterator<'data, 'file, pe::ImageNtHeaders64>;
+pub type PeSegmentIterator64<'data, 'file, R = &'data [u8]> =
+    PeSegmentIterator<'data, 'file, pe::ImageNtHeaders64, R>;
 
 /// An iterator over the loadable sections of a `PeFile`.
 #[derive(Debug)]
-pub struct PeSegmentIterator<'data, 'file, Pe>
+pub struct PeSegmentIterator<'data, 'file, Pe, R = &'data [u8]>
 where
-    'data: 'file,
     Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file PeFile<'data, Pe>,
-    pub(super) iter: slice::Iter<'file, pe::ImageSectionHeader>,
+    pub(super) file: &'file PeFile<'data, Pe, R>,
+    pub(super) iter: slice::Iter<'data, pe::ImageSectionHeader>,
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> Iterator for PeSegmentIterator<'data, 'file, Pe> {
-    type Item = PeSegment<'data, 'file, Pe>;
+impl<'data, 'file, Pe, R> Iterator for PeSegmentIterator<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    type Item = PeSegment<'data, 'file, Pe, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next().map(|section| PeSegment {
@@ -39,35 +44,50 @@
 }
 
 /// A loadable section of a `PeFile32`.
-pub type PeSegment32<'data, 'file> = PeSegment<'data, 'file, pe::ImageNtHeaders32>;
+pub type PeSegment32<'data, 'file, R = &'data [u8]> =
+    PeSegment<'data, 'file, pe::ImageNtHeaders32, R>;
 /// A loadable section of a `PeFile64`.
-pub type PeSegment64<'data, 'file> = PeSegment<'data, 'file, pe::ImageNtHeaders64>;
+pub type PeSegment64<'data, 'file, R = &'data [u8]> =
+    PeSegment<'data, 'file, pe::ImageNtHeaders64, R>;
 
 /// A loadable section of a `PeFile`.
 #[derive(Debug)]
-pub struct PeSegment<'data, 'file, Pe>
+pub struct PeSegment<'data, 'file, Pe, R = &'data [u8]>
 where
-    'data: 'file,
     Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
 {
-    file: &'file PeFile<'data, Pe>,
-    section: &'file pe::ImageSectionHeader,
+    file: &'file PeFile<'data, Pe, R>,
+    section: &'data pe::ImageSectionHeader,
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> PeSegment<'data, 'file, Pe> {
-    fn bytes(&self) -> Result<Bytes<'data>> {
+impl<'data, 'file, Pe, R> PeSegment<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    fn bytes(&self) -> Result<&'data [u8]> {
         self.section
             .pe_data(self.file.data)
             .read_error("Invalid PE section offset or size")
     }
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> read::private::Sealed for PeSegment<'data, 'file, Pe> {}
+impl<'data, 'file, Pe, R> read::private::Sealed for PeSegment<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Pe: ImageNtHeaders> ObjectSegment<'data> for PeSegment<'data, 'file, Pe> {
+impl<'data, 'file, Pe, R> ObjectSegment<'data> for PeSegment<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
     #[inline]
     fn address(&self) -> u64 {
-        u64::from(self.section.virtual_address.get(LE))
+        u64::from(self.section.virtual_address.get(LE)).wrapping_add(self.file.common.image_base)
     }
 
     #[inline]
@@ -87,11 +107,11 @@
     }
 
     fn data(&self) -> Result<&'data [u8]> {
-        Ok(self.bytes()?.0)
+        self.bytes()
     }
 
     fn data_range(&self, address: u64, size: u64) -> Result<Option<&'data [u8]>> {
-        Ok(read::data_range(
+        Ok(read::util::data_range(
             self.bytes()?,
             self.address(),
             address,
@@ -111,23 +131,30 @@
 }
 
 /// An iterator over the sections of a `PeFile32`.
-pub type PeSectionIterator32<'data, 'file> = PeSectionIterator<'data, 'file, pe::ImageNtHeaders32>;
+pub type PeSectionIterator32<'data, 'file, R = &'data [u8]> =
+    PeSectionIterator<'data, 'file, pe::ImageNtHeaders32, R>;
 /// An iterator over the sections of a `PeFile64`.
-pub type PeSectionIterator64<'data, 'file> = PeSectionIterator<'data, 'file, pe::ImageNtHeaders64>;
+pub type PeSectionIterator64<'data, 'file, R = &'data [u8]> =
+    PeSectionIterator<'data, 'file, pe::ImageNtHeaders64, R>;
 
 /// An iterator over the sections of a `PeFile`.
 #[derive(Debug)]
-pub struct PeSectionIterator<'data, 'file, Pe>
+pub struct PeSectionIterator<'data, 'file, Pe, R = &'data [u8]>
 where
     'data: 'file,
     Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file PeFile<'data, Pe>,
-    pub(super) iter: iter::Enumerate<slice::Iter<'file, pe::ImageSectionHeader>>,
+    pub(super) file: &'file PeFile<'data, Pe, R>,
+    pub(super) iter: iter::Enumerate<slice::Iter<'data, pe::ImageSectionHeader>>,
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> Iterator for PeSectionIterator<'data, 'file, Pe> {
-    type Item = PeSection<'data, 'file, Pe>;
+impl<'data, 'file, Pe, R> Iterator for PeSectionIterator<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    type Item = PeSection<'data, 'file, Pe, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         self.iter.next().map(|(index, section)| PeSection {
@@ -139,34 +166,50 @@
 }
 
 /// A section of a `PeFile32`.
-pub type PeSection32<'data, 'file> = PeSection<'data, 'file, pe::ImageNtHeaders32>;
+pub type PeSection32<'data, 'file, R = &'data [u8]> =
+    PeSection<'data, 'file, pe::ImageNtHeaders32, R>;
 /// A section of a `PeFile64`.
-pub type PeSection64<'data, 'file> = PeSection<'data, 'file, pe::ImageNtHeaders64>;
+pub type PeSection64<'data, 'file, R = &'data [u8]> =
+    PeSection<'data, 'file, pe::ImageNtHeaders64, R>;
 
 /// A section of a `PeFile`.
 #[derive(Debug)]
-pub struct PeSection<'data, 'file, Pe>
+pub struct PeSection<'data, 'file, Pe, R = &'data [u8]>
 where
     'data: 'file,
     Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
 {
-    pub(super) file: &'file PeFile<'data, Pe>,
+    pub(super) file: &'file PeFile<'data, Pe, R>,
     pub(super) index: SectionIndex,
-    pub(super) section: &'file pe::ImageSectionHeader,
+    pub(super) section: &'data pe::ImageSectionHeader,
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> PeSection<'data, 'file, Pe> {
-    fn bytes(&self) -> Result<Bytes<'data>> {
+impl<'data, 'file, Pe, R> PeSection<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    fn bytes(&self) -> Result<&'data [u8]> {
         self.section
             .pe_data(self.file.data)
             .read_error("Invalid PE section offset or size")
     }
 }
 
-impl<'data, 'file, Pe: ImageNtHeaders> read::private::Sealed for PeSection<'data, 'file, Pe> {}
+impl<'data, 'file, Pe, R> read::private::Sealed for PeSection<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+}
 
-impl<'data, 'file, Pe: ImageNtHeaders> ObjectSection<'data> for PeSection<'data, 'file, Pe> {
-    type RelocationIterator = PeRelocationIterator<'data, 'file>;
+impl<'data, 'file, Pe, R> ObjectSection<'data> for PeSection<'data, 'file, Pe, R>
+where
+    Pe: ImageNtHeaders,
+    R: ReadRef<'data>,
+{
+    type RelocationIterator = PeRelocationIterator<'data, 'file, R>;
 
     #[inline]
     fn index(&self) -> SectionIndex {
@@ -175,7 +218,7 @@
 
     #[inline]
     fn address(&self) -> u64 {
-        u64::from(self.section.virtual_address.get(LE))
+        u64::from(self.section.virtual_address.get(LE)).wrapping_add(self.file.common.image_base)
     }
 
     #[inline]
@@ -199,11 +242,11 @@
     }
 
     fn data(&self) -> Result<&'data [u8]> {
-        Ok(self.bytes()?.0)
+        self.bytes()
     }
 
     fn data_range(&self, address: u64, size: u64) -> Result<Option<&'data [u8]>> {
-        Ok(read::data_range(
+        Ok(read::util::data_range(
             self.bytes()?,
             self.address(),
             address,
@@ -212,6 +255,11 @@
     }
 
     #[inline]
+    fn compressed_file_range(&self) -> Result<CompressedFileRange> {
+        Ok(CompressedFileRange::none(self.file_range()))
+    }
+
+    #[inline]
     fn compressed_data(&self) -> Result<CompressedData<'data>> {
         self.data().map(CompressedData::none)
     }
@@ -234,8 +282,8 @@
         self.section.kind()
     }
 
-    fn relocations(&self) -> PeRelocationIterator<'data, 'file> {
-        PeRelocationIterator::default()
+    fn relocations(&self) -> PeRelocationIterator<'data, 'file, R> {
+        PeRelocationIterator(PhantomData)
     }
 
     fn flags(&self) -> SectionFlags {
@@ -245,26 +293,48 @@
     }
 }
 
+impl<'data> SectionTable<'data> {
+    /// Return the data at the given virtual address in a PE file.
+    pub fn pe_data_at<R: ReadRef<'data>>(&self, data: R, va: u32) -> Option<&'data [u8]> {
+        self.iter()
+            .filter_map(|section| section.pe_data_at(data, va))
+            .next()
+    }
+}
+
 impl pe::ImageSectionHeader {
-    fn pe_file_range(&self) -> (u32, u32) {
+    /// Return the offset and size of the section in a PE file.
+    ///
+    /// Returns `None` for sections that have no data in the file.
+    pub fn pe_file_range(&self) -> (u32, u32) {
         // Pointer and size will be zero for uninitialized data; we don't need to validate this.
         let offset = self.pointer_to_raw_data.get(LE);
         let size = cmp::min(self.virtual_size.get(LE), self.size_of_raw_data.get(LE));
         (offset, size)
     }
 
-    /// Return the data for a PE section.
-    pub fn pe_data<'data>(&self, data: Bytes<'data>) -> result::Result<Bytes<'data>, ()> {
+    /// Return the section data in a PE file.
+    pub fn pe_data<'data, R: ReadRef<'data>>(&self, data: R) -> result::Result<&'data [u8], ()> {
         let (offset, size) = self.pe_file_range();
-        data.read_bytes_at(offset as usize, size as usize)
+        data.read_bytes_at(offset.into(), size.into())
+    }
+
+    /// Return the data at the given virtual address if this section contains it.
+    pub fn pe_data_at<'data, R: ReadRef<'data>>(&self, data: R, va: u32) -> Option<&'data [u8]> {
+        let section_va = self.virtual_address.get(LE);
+        let offset = va.checked_sub(section_va)?;
+        let section_data = self.pe_data(data).ok()?;
+        section_data.get(offset as usize..)
     }
 }
 
 /// An iterator over the relocations in an `PeSection`.
-#[derive(Debug, Default)]
-pub struct PeRelocationIterator<'data, 'file>(PhantomData<(&'data (), &'file ())>);
+#[derive(Debug)]
+pub struct PeRelocationIterator<'data, 'file, R = &'data [u8]>(
+    PhantomData<(&'data (), &'file (), R)>,
+);
 
-impl<'data, 'file> Iterator for PeRelocationIterator<'data, 'file> {
+impl<'data, 'file, R> Iterator for PeRelocationIterator<'data, 'file, R> {
     type Item = (u64, Relocation);
 
     fn next(&mut self) -> Option<Self::Item> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/read_cache.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/read_cache.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/read_cache.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/read_cache.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,185 @@
+use core::ops::Range;
+use std::boxed::Box;
+use std::cell::RefCell;
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use std::convert::TryInto;
+use std::io::{Read, Seek, SeekFrom};
+use std::mem;
+use std::vec::Vec;
+
+use crate::read::ReadRef;
+
+/// An implementation of `ReadRef` for data in a stream that implements
+/// `Read + Seek`.
+///
+/// Contains a cache of read-only blocks of data, allowing references to
+/// them to be returned. Entries in the cache are never removed.
+/// Entries are keyed on the offset and size of the read.
+/// Currently overlapping reads are considered separate reads.
+#[derive(Debug)]
+pub struct ReadCache<R: Read + Seek> {
+    cache: RefCell<ReadCacheInternal<R>>,
+}
+
+#[derive(Debug)]
+struct ReadCacheInternal<R: Read + Seek> {
+    read: R,
+    bufs: HashMap<(u64, u64), Box<[u8]>>,
+    strings: HashMap<(u64, u8), Box<[u8]>>,
+}
+
+impl<R: Read + Seek> ReadCache<R> {
+    /// Create an empty `ReadCache` for the given stream.
+    pub fn new(read: R) -> Self {
+        ReadCache {
+            cache: RefCell::new(ReadCacheInternal {
+                read,
+                bufs: HashMap::new(),
+                strings: HashMap::new(),
+            }),
+        }
+    }
+
+    /// Return an implementation of `ReadRef` that restricts reads
+    /// to the given range of the stream.
+    pub fn range(&self, offset: u64, size: u64) -> ReadCacheRange<'_, R> {
+        ReadCacheRange {
+            r: self,
+            offset,
+            size,
+        }
+    }
+
+    /// Free buffers used by the cache.
+    pub fn clear(&mut self) {
+        self.cache.borrow_mut().bufs.clear();
+    }
+
+    /// Unwrap this `ReadCache<R>`, returning the underlying reader.
+    pub fn into_inner(self) -> R {
+        self.cache.into_inner().read
+    }
+}
+
+impl<'a, R: Read + Seek> ReadRef<'a> for &'a ReadCache<R> {
+    fn len(self) -> Result<u64, ()> {
+        let cache = &mut *self.cache.borrow_mut();
+        cache.read.seek(SeekFrom::End(0)).map_err(|_| ())
+    }
+
+    fn read_bytes_at(self, offset: u64, size: u64) -> Result<&'a [u8], ()> {
+        if size == 0 {
+            return Ok(&[]);
+        }
+        let cache = &mut *self.cache.borrow_mut();
+        let buf = match cache.bufs.entry((offset, size)) {
+            Entry::Occupied(entry) => entry.into_mut(),
+            Entry::Vacant(entry) => {
+                let size = size.try_into().map_err(|_| ())?;
+                cache
+                    .read
+                    .seek(SeekFrom::Start(offset as u64))
+                    .map_err(|_| ())?;
+                let mut bytes = vec![0; size].into_boxed_slice();
+                cache.read.read_exact(&mut bytes).map_err(|_| ())?;
+                entry.insert(bytes)
+            }
+        };
+        // Extend the lifetime to that of self.
+        // This is OK because we never mutate or remove entries.
+        Ok(unsafe { mem::transmute::<&[u8], &[u8]>(buf) })
+    }
+
+    fn read_bytes_at_until(self, range: Range<u64>, delimiter: u8) -> Result<&'a [u8], ()> {
+        let cache = &mut *self.cache.borrow_mut();
+        let buf = match cache.strings.entry((range.start, delimiter)) {
+            Entry::Occupied(entry) => entry.into_mut(),
+            Entry::Vacant(entry) => {
+                cache
+                    .read
+                    .seek(SeekFrom::Start(range.start))
+                    .map_err(|_| ())?;
+
+                let max_check: usize = (range.end - range.start).try_into().map_err(|_| ())?;
+                // Strings should be relatively small.
+                // TODO: make this configurable?
+                let max_check = max_check.min(4096);
+
+                let mut bytes = Vec::new();
+                let mut checked = 0;
+                loop {
+                    bytes.resize((checked + 256).min(max_check), 0);
+                    let read = cache.read.read(&mut bytes[checked..]).map_err(|_| ())?;
+                    if read == 0 {
+                        return Err(());
+                    }
+                    if let Some(len) = memchr::memchr(delimiter, &bytes[checked..][..read]) {
+                        bytes.truncate(checked + len);
+                        break entry.insert(bytes.into_boxed_slice());
+                    }
+                    checked += read;
+                    if checked >= max_check {
+                        return Err(());
+                    }
+                }
+            }
+        };
+        // Extend the lifetime to that of self.
+        // This is OK because we never mutate or remove entries.
+        Ok(unsafe { mem::transmute::<&[u8], &[u8]>(buf) })
+    }
+}
+
+/// An implementation of `ReadRef` for a range of data in a stream that
+/// implements `Read + Seek`.
+///
+/// Shares an underlying `ReadCache` with a lifetime of `'a`.
+#[derive(Debug)]
+pub struct ReadCacheRange<'a, R: Read + Seek> {
+    r: &'a ReadCache<R>,
+    offset: u64,
+    size: u64,
+}
+
+impl<'a, R: Read + Seek> Clone for ReadCacheRange<'a, R> {
+    fn clone(&self) -> Self {
+        Self {
+            r: self.r,
+            offset: self.offset,
+            size: self.size,
+        }
+    }
+}
+
+impl<'a, R: Read + Seek> Copy for ReadCacheRange<'a, R> {}
+
+impl<'a, R: Read + Seek> ReadRef<'a> for ReadCacheRange<'a, R> {
+    fn len(self) -> Result<u64, ()> {
+        Ok(self.size)
+    }
+
+    fn read_bytes_at(self, offset: u64, size: u64) -> Result<&'a [u8], ()> {
+        if size == 0 {
+            return Ok(&[]);
+        }
+        let end = offset.checked_add(size).ok_or(())?;
+        if end > self.size {
+            return Err(());
+        }
+        let r_offset = self.offset.checked_add(offset).ok_or(())?;
+        self.r.read_bytes_at(r_offset, size)
+    }
+
+    fn read_bytes_at_until(self, range: Range<u64>, delimiter: u8) -> Result<&'a [u8], ()> {
+        let r_start = self.offset.checked_add(range.start).ok_or(())?;
+        let r_end = self.offset.checked_add(range.end).ok_or(())?;
+        let bytes = self.r.read_bytes_at_until(r_start..r_end, delimiter)?;
+        let size = bytes.len().try_into().map_err(|_| ())?;
+        let end = range.start.checked_add(size).ok_or(())?;
+        if end > self.size {
+            return Err(());
+        }
+        Ok(bytes)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/read_ref.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/read_ref.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/read_ref.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/read_ref.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,137 @@
+#![allow(clippy::len_without_is_empty)]
+
+use core::convert::TryInto;
+use core::ops::Range;
+use core::{mem, result};
+
+use crate::pod::{from_bytes, slice_from_bytes, Pod};
+
+type Result<T> = result::Result<T, ()>;
+
+/// A trait for reading references to `Pod` types from a block of data.
+///
+/// This allows parsers to handle both of these cases:
+/// - the block of data exists in memory, and it is desirable
+///   to use references to this block instead of copying it,
+/// - the block of data exists in storage, and it is desirable
+///   to read on demand to minimize I/O and memory usage.
+///
+/// The methods accept `self` by value because `Self` is expected to behave
+/// similar to a reference: it may be a reference with a lifetime of `'a`,
+/// or it may be a wrapper of a reference.
+///
+/// The `Clone` and `Copy` bounds are for convenience, and since `Self` is
+/// expected to be similar to a reference, these are easily satisfied.
+///
+/// Object file parsers typically use offsets to locate the structures
+/// in the block, and will most commonly use the `*_at` methods to
+/// read a structure at a known offset.
+///
+/// Occasionally file parsers will need to treat the block as a stream,
+/// and so convenience methods are provided that update an offset with
+/// the size that was read.
+//
+// An alternative would be for methods to accept `&mut self` and use a
+// `seek` method instead of the `offset` parameters, but this is less
+// convenient for implementers.
+pub trait ReadRef<'a>: Clone + Copy {
+    /// The total size of the block of data.
+    fn len(self) -> Result<u64>;
+
+    /// Get a reference to a `u8` slice at the given offset.
+    ///
+    /// Returns an error if offset or size are out of bounds.
+    fn read_bytes_at(self, offset: u64, size: u64) -> Result<&'a [u8]>;
+
+    /// Get a reference to a delimited `u8` slice which starts at range.start.
+    ///
+    /// Does not include the delimiter.
+    ///
+    /// Returns an error if the range is out of bounds or the delimiter is
+    /// not found in the range.
+    fn read_bytes_at_until(self, range: Range<u64>, delimiter: u8) -> Result<&'a [u8]>;
+
+    /// Get a reference to a `u8` slice at the given offset, and update the offset.
+    ///
+    /// Returns an error if offset or size are out of bounds.
+    fn read_bytes(self, offset: &mut u64, size: u64) -> Result<&'a [u8]> {
+        let bytes = self.read_bytes_at(*offset, size)?;
+        *offset = offset.wrapping_add(size);
+        Ok(bytes)
+    }
+
+    /// Get a reference to a `Pod` type at the given offset, and update the offset.
+    ///
+    /// Returns an error if offset or size are out of bounds.
+    ///
+    /// The default implementation uses `read_bytes`, and returns an error if
+    /// `read_bytes` does not return bytes with the correct alignment for `T`.
+    /// Implementors may want to provide their own implementation that ensures
+    /// the alignment can be satisified. Alternatively, only use this method with
+    /// types that do not need alignment (see the `unaligned` feature of this crate).
+    fn read<T: Pod>(self, offset: &mut u64) -> Result<&'a T> {
+        let size = mem::size_of::<T>().try_into().map_err(|_| ())?;
+        let bytes = self.read_bytes(offset, size)?;
+        let (t, _) = from_bytes(bytes)?;
+        Ok(t)
+    }
+
+    /// Get a reference to a `Pod` type at the given offset.
+    ///
+    /// Returns an error if offset or size are out of bounds.
+    ///
+    /// Also see the `read` method for information regarding alignment of `T`.
+    fn read_at<T: Pod>(self, mut offset: u64) -> Result<&'a T> {
+        self.read(&mut offset)
+    }
+
+    /// Get a reference to a slice of a `Pod` type at the given offset, and update the offset.
+    ///
+    /// Returns an error if offset or size are out of bounds.
+    ///
+    /// Also see the `read` method for information regarding alignment of `T`.
+    fn read_slice<T: Pod>(self, offset: &mut u64, count: usize) -> Result<&'a [T]> {
+        let size = count
+            .checked_mul(mem::size_of::<T>())
+            .ok_or(())?
+            .try_into()
+            .map_err(|_| ())?;
+        let bytes = self.read_bytes(offset, size)?;
+        let (t, _) = slice_from_bytes(bytes, count)?;
+        Ok(t)
+    }
+
+    /// Get a reference to a slice of a `Pod` type at the given offset.
+    ///
+    /// Returns an error if offset or size are out of bounds.
+    ///
+    /// Also see the `read` method for information regarding alignment of `T`.
+    fn read_slice_at<T: Pod>(self, mut offset: u64, count: usize) -> Result<&'a [T]> {
+        self.read_slice(&mut offset, count)
+    }
+}
+
+impl<'a> ReadRef<'a> for &'a [u8] {
+    fn len(self) -> Result<u64> {
+        self.len().try_into().map_err(|_| ())
+    }
+
+    fn read_bytes_at(self, offset: u64, size: u64) -> Result<&'a [u8]> {
+        let offset: usize = offset.try_into().map_err(|_| ())?;
+        let size: usize = size.try_into().map_err(|_| ())?;
+        self.get(offset..).ok_or(())?.get(..size).ok_or(())
+    }
+
+    fn read_bytes_at_until(self, range: Range<u64>, delimiter: u8) -> Result<&'a [u8]> {
+        let start: usize = range.start.try_into().map_err(|_| ())?;
+        let end: usize = range.end.try_into().map_err(|_| ())?;
+        let bytes = self.get(start..end).ok_or(())?;
+        match memchr::memchr(delimiter, bytes) {
+            Some(len) => {
+                // This will never fail.
+                bytes.get(..len).ok_or(())
+            }
+            None => Err(()),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/traits.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,9 +2,9 @@
 use alloc::vec::Vec;
 
 use crate::read::{
-    self, Architecture, ComdatKind, CompressedData, FileFlags, ObjectMap, Relocation, Result,
-    SectionFlags, SectionIndex, SectionKind, SymbolFlags, SymbolIndex, SymbolKind, SymbolMap,
-    SymbolMapName, SymbolScope, SymbolSection,
+    self, Architecture, CodeView, ComdatKind, CompressedData, CompressedFileRange, Export,
+    FileFlags, Import, ObjectMap, Relocation, Result, SectionFlags, SectionIndex, SectionKind,
+    SymbolFlags, SymbolIndex, SymbolKind, SymbolMap, SymbolMapName, SymbolScope, SymbolSection,
 };
 use crate::Endianness;
 
@@ -41,6 +41,12 @@
         SymbolIterator = Self::SymbolIterator,
     >;
 
+    /// An iterator over dynamic relocations in the file.
+    ///
+    /// The first field in the item tuple is the address
+    /// that the relocation applies to.
+    type DynamicRelocationIterator: Iterator<Item = (u64, Relocation)>;
+
     /// Get the architecture type of the file.
     fn architecture(&self) -> Architecture;
 
@@ -63,16 +69,13 @@
     /// Get an iterator over the segments in the file.
     fn segments(&'file self) -> Self::SegmentIterator;
 
-    /// Get the entry point address of the binary
-    fn entry(&'file self) -> u64;
-
     /// Get the section named `section_name`, if such a section exists.
     ///
     /// If `section_name` starts with a '.' then it is treated as a system section name,
     /// and is compared using the conventions specific to the object file format. This
     /// includes:
-    /// - if ".text" is requested for a Mach-O object file, then the actual
-    /// section name that is searched for is "__text".
+    /// - if ".debug_str_offsets" is requested for a Mach-O object file, then the actual
+    /// section name that is searched for is "__debug_str_offs".
     /// - if ".debug_info" is requested for an ELF object file, then
     /// ".zdebug_info" may be returned (and similarly for other debug sections).
     ///
@@ -122,8 +125,18 @@
     /// Get an iterator over the dynamic linking symbols in the file.
     ///
     /// This may skip over symbols that are malformed or unsupported.
+    ///
+    /// Only ELF has separate dynamic linking symbols.
+    /// Other file formats will return an empty iterator.
     fn dynamic_symbols(&'file self) -> Self::SymbolIterator;
 
+    /// Get the dynamic relocations for this file.
+    ///
+    /// Symbol indices in these relocations refer to the dynamic symbol table.
+    ///
+    /// Only ELF has dynamic relocations.
+    fn dynamic_relocations(&'file self) -> Option<Self::DynamicRelocationIterator>;
+
     /// Construct a map from addresses to symbol names.
     ///
     /// The map will only contain defined text and data symbols.
@@ -150,6 +163,12 @@
         ObjectMap::default()
     }
 
+    /// Get the imported symbols.
+    fn imports(&self) -> Result<Vec<Import<'data>>>;
+
+    /// Get the exported symbols.
+    fn exports(&self) -> Result<Vec<Export<'data>>>;
+
     /// Return true if the file contains debug information sections, false if not.
     fn has_debug_symbols(&self) -> bool;
 
@@ -171,6 +190,26 @@
         Ok(None)
     }
 
+    /// The filename and build ID from a `.gnu_debugaltlink` section.
+    #[inline]
+    fn gnu_debugaltlink(&self) -> Result<Option<(&'data [u8], &'data [u8])>> {
+        Ok(None)
+    }
+
+    /// The filename and GUID from the PE CodeView section
+    #[inline]
+    fn pdb_info(&self) -> Result<Option<CodeView>> {
+        Ok(None)
+    }
+
+    /// Get the base address used for relative virtual addresses.
+    ///
+    /// Currently this is only non-zero for PE.
+    fn relative_address_base(&'file self) -> u64;
+
+    /// Get the virtual address of the entry point of the binary
+    fn entry(&'file self) -> u64;
+
     /// File flags that are specific to each file format.
     fn flags(&self) -> FileFlags;
 }
@@ -245,6 +284,10 @@
     /// Returns `Ok(None)` if the section does not contain the given range.
     fn data_range(&self, address: u64, size: u64) -> Result<Option<&'data [u8]>>;
 
+    /// Returns the potentially compressed file range of the section,
+    /// along with information about the compression.
+    fn compressed_file_range(&self) -> Result<CompressedFileRange>;
+
     /// Returns the potentially compressed contents of the section,
     /// along with information about the compression.
     fn compressed_data(&self) -> Result<CompressedData<'data>>;
@@ -371,3 +414,16 @@
     /// Symbol flags that are specific to each file format.
     fn flags(&self) -> SymbolFlags<SectionIndex>;
 }
+
+/// An iterator for files that don't have dynamic relocations.
+#[derive(Debug)]
+pub struct NoDynamicRelocationIterator;
+
+impl Iterator for NoDynamicRelocationIterator {
+    type Item = (u64, Relocation);
+
+    #[inline]
+    fn next(&mut self) -> Option<Self::Item> {
+        None
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/util.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,383 @@
-use crate::pod::Bytes;
+use alloc::string::String;
+use core::convert::TryInto;
+use core::fmt;
+use core::marker::PhantomData;
 
+use crate::pod::{from_bytes, slice_from_bytes, Pod};
+use crate::ReadRef;
+
+/// A newtype for byte slices.
+///
+/// It has these important features:
+/// - no methods that can panic, such as `Index`
+/// - convenience methods for `Pod` types
+/// - a useful `Debug` implementation
+#[derive(Default, Clone, Copy, PartialEq, Eq)]
+pub struct Bytes<'data>(pub &'data [u8]);
+
+impl<'data> fmt::Debug for Bytes<'data> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        debug_list_bytes(self.0, fmt)
+    }
+}
+
+impl<'data> Bytes<'data> {
+    /// Return the length of the byte slice.
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    /// Return true if the byte slice is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Skip over the given number of bytes at the start of the byte slice.
+    ///
+    /// Modifies the byte slice to start after the bytes.
+    ///
+    /// Returns an error if there are too few bytes.
+    #[inline]
+    pub fn skip(&mut self, offset: usize) -> Result<(), ()> {
+        match self.0.get(offset..) {
+            Some(tail) => {
+                self.0 = tail;
+                Ok(())
+            }
+            None => {
+                self.0 = &[];
+                Err(())
+            }
+        }
+    }
+
+    /// Return a reference to the given number of bytes at the start of the byte slice.
+    ///
+    /// Modifies the byte slice to start after the bytes.
+    ///
+    /// Returns an error if there are too few bytes.
+    #[inline]
+    pub fn read_bytes(&mut self, count: usize) -> Result<Bytes<'data>, ()> {
+        match (self.0.get(..count), self.0.get(count..)) {
+            (Some(head), Some(tail)) => {
+                self.0 = tail;
+                Ok(Bytes(head))
+            }
+            _ => {
+                self.0 = &[];
+                Err(())
+            }
+        }
+    }
+
+    /// Return a reference to the given number of bytes at the given offset of the byte slice.
+    ///
+    /// Returns an error if the offset is invalid or there are too few bytes.
+    #[inline]
+    pub fn read_bytes_at(mut self, offset: usize, count: usize) -> Result<Bytes<'data>, ()> {
+        self.skip(offset)?;
+        self.read_bytes(count)
+    }
+
+    /// Return a reference to a `Pod` struct at the start of the byte slice.
+    ///
+    /// Modifies the byte slice to start after the bytes.
+    ///
+    /// Returns an error if there are too few bytes or the slice is incorrectly aligned.
+    #[inline]
+    pub fn read<T: Pod>(&mut self) -> Result<&'data T, ()> {
+        match from_bytes(self.0) {
+            Ok((value, tail)) => {
+                self.0 = tail;
+                Ok(value)
+            }
+            Err(()) => {
+                self.0 = &[];
+                Err(())
+            }
+        }
+    }
+
+    /// Return a reference to a `Pod` struct at the given offset of the byte slice.
+    ///
+    /// Returns an error if there are too few bytes or the offset is incorrectly aligned.
+    #[inline]
+    pub fn read_at<T: Pod>(mut self, offset: usize) -> Result<&'data T, ()> {
+        self.skip(offset)?;
+        self.read()
+    }
+
+    /// Return a reference to a slice of `Pod` structs at the start of the byte slice.
+    ///
+    /// Modifies the byte slice to start after the bytes.
+    ///
+    /// Returns an error if there are too few bytes or the offset is incorrectly aligned.
+    #[inline]
+    pub fn read_slice<T: Pod>(&mut self, count: usize) -> Result<&'data [T], ()> {
+        match slice_from_bytes(self.0, count) {
+            Ok((value, tail)) => {
+                self.0 = tail;
+                Ok(value)
+            }
+            Err(()) => {
+                self.0 = &[];
+                Err(())
+            }
+        }
+    }
+
+    /// Return a reference to a slice of `Pod` structs at the given offset of the byte slice.
+    ///
+    /// Returns an error if there are too few bytes or the offset is incorrectly aligned.
+    #[inline]
+    pub fn read_slice_at<T: Pod>(mut self, offset: usize, count: usize) -> Result<&'data [T], ()> {
+        self.skip(offset)?;
+        self.read_slice(count)
+    }
+
+    /// Read a null terminated string.
+    ///
+    /// Does not assume any encoding.
+    /// Reads past the null byte, but doesn't return it.
+    #[inline]
+    pub fn read_string(&mut self) -> Result<&'data [u8], ()> {
+        match memchr::memchr(b'\0', self.0) {
+            Some(null) => {
+                // These will never fail.
+                let bytes = self.read_bytes(null)?;
+                self.skip(1)?;
+                Ok(bytes.0)
+            }
+            None => {
+                self.0 = &[];
+                Err(())
+            }
+        }
+    }
+
+    /// Read a null terminated string at an offset.
+    ///
+    /// Does not assume any encoding. Does not return the null byte.
+    #[inline]
+    pub fn read_string_at(mut self, offset: usize) -> Result<&'data [u8], ()> {
+        self.skip(offset)?;
+        self.read_string()
+    }
+}
+
+// Only for Debug impl of `Bytes`.
+fn debug_list_bytes(bytes: &[u8], fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+    let mut list = fmt.debug_list();
+    list.entries(bytes.iter().take(8).copied().map(DebugByte));
+    if bytes.len() > 8 {
+        list.entry(&DebugLen(bytes.len()));
+    }
+    list.finish()
+}
+
+struct DebugByte(u8);
+
+impl fmt::Debug for DebugByte {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "0x{:02x}", self.0)
+    }
+}
+
+struct DebugLen(usize);
+
+impl fmt::Debug for DebugLen {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "...; {}", self.0)
+    }
+}
+
+/// A newtype for byte strings.
+///
+/// For byte slices that are strings of an unknown encoding.
+///
+/// Provides a `Debug` implementation that interprets the bytes as UTF-8.
+#[derive(Default, Clone, Copy, PartialEq, Eq)]
+pub(crate) struct ByteString<'data>(pub &'data [u8]);
+
+impl<'data> fmt::Debug for ByteString<'data> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "\"{}\"", String::from_utf8_lossy(self.0))
+    }
+}
+
+#[allow(dead_code)]
 #[inline]
 pub(crate) fn align(offset: usize, size: usize) -> usize {
     (offset + (size - 1)) & !(size - 1)
 }
 
+#[allow(dead_code)]
+pub(crate) fn data_range(
+    data: &[u8],
+    data_address: u64,
+    range_address: u64,
+    size: u64,
+) -> Option<&[u8]> {
+    let offset = range_address.checked_sub(data_address)?;
+    data.get(offset.try_into().ok()?..)?
+        .get(..size.try_into().ok()?)
+}
+
 /// A table of zero-terminated strings.
 ///
 /// This is used for most file formats.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct StringTable<'data> {
-    data: Bytes<'data>,
+#[derive(Debug, Clone, Copy)]
+pub struct StringTable<'data, R = &'data [u8]>
+where
+    R: ReadRef<'data>,
+{
+    data: Option<R>,
+    start: u64,
+    end: u64,
+    marker: PhantomData<&'data ()>,
 }
 
-impl<'data> StringTable<'data> {
+impl<'data, R: ReadRef<'data>> StringTable<'data, R> {
     /// Interpret the given data as a string table.
-    pub fn new(data: Bytes<'data>) -> Self {
-        StringTable { data }
+    pub fn new(data: R, start: u64, end: u64) -> Self {
+        StringTable {
+            data: Some(data),
+            start,
+            end,
+            marker: PhantomData,
+        }
     }
 
     /// Return the string at the given offset.
     pub fn get(&self, offset: u32) -> Result<&'data [u8], ()> {
-        self.data.read_string_at(offset as usize)
+        match self.data {
+            Some(data) => {
+                let r_start = self.start.checked_add(offset.into()).ok_or(())?;
+                data.read_bytes_at_until(r_start..self.end, 0)
+            }
+            None => Err(()),
+        }
+    }
+}
+
+impl<'data, R: ReadRef<'data>> Default for StringTable<'data, R> {
+    fn default() -> Self {
+        StringTable {
+            data: None,
+            start: 0,
+            end: 0,
+            marker: PhantomData,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::pod::bytes_of;
+
+    #[test]
+    fn bytes() {
+        let x = u32::to_be(0x0123_4567);
+        let data = Bytes(bytes_of(&x));
+
+        let mut bytes = data;
+        assert_eq!(bytes.skip(0), Ok(()));
+        assert_eq!(bytes, data);
+
+        let mut bytes = data;
+        assert_eq!(bytes.skip(4), Ok(()));
+        assert_eq!(bytes, Bytes(&[]));
+
+        let mut bytes = data;
+        assert_eq!(bytes.skip(5), Err(()));
+        assert_eq!(bytes, Bytes(&[]));
+
+        let mut bytes = data;
+        assert_eq!(bytes.read_bytes(0), Ok(Bytes(&[])));
+        assert_eq!(bytes, data);
+
+        let mut bytes = data;
+        assert_eq!(bytes.read_bytes(4), Ok(data));
+        assert_eq!(bytes, Bytes(&[]));
+
+        let mut bytes = data;
+        assert_eq!(bytes.read_bytes(5), Err(()));
+        assert_eq!(bytes, Bytes(&[]));
+
+        assert_eq!(data.read_bytes_at(0, 0), Ok(Bytes(&[])));
+        assert_eq!(data.read_bytes_at(4, 0), Ok(Bytes(&[])));
+        assert_eq!(data.read_bytes_at(0, 4), Ok(data));
+        assert_eq!(data.read_bytes_at(1, 4), Err(()));
+
+        let mut bytes = data;
+        assert_eq!(bytes.read::<u16>(), Ok(&u16::to_be(0x0123)));
+        assert_eq!(bytes, Bytes(&[0x45, 0x67]));
+        assert_eq!(data.read_at::<u16>(2), Ok(&u16::to_be(0x4567)));
+        assert_eq!(data.read_at::<u16>(3), Err(()));
+        assert_eq!(data.read_at::<u16>(4), Err(()));
+
+        let mut bytes = data;
+        assert_eq!(bytes.read::<u32>(), Ok(&x));
+        assert_eq!(bytes, Bytes(&[]));
+
+        let mut bytes = data;
+        assert_eq!(bytes.read::<u64>(), Err(()));
+        assert_eq!(bytes, Bytes(&[]));
+
+        let mut bytes = data;
+        assert_eq!(bytes.read_slice::<u8>(0), Ok(&[][..]));
+        assert_eq!(bytes, data);
+
+        let mut bytes = data;
+        assert_eq!(bytes.read_slice::<u8>(4), Ok(data.0));
+        assert_eq!(bytes, Bytes(&[]));
+
+        let mut bytes = data;
+        assert_eq!(bytes.read_slice::<u8>(5), Err(()));
+        assert_eq!(bytes, Bytes(&[]));
+
+        assert_eq!(data.read_slice_at::<u8>(0, 0), Ok(&[][..]));
+        assert_eq!(data.read_slice_at::<u8>(4, 0), Ok(&[][..]));
+        assert_eq!(data.read_slice_at::<u8>(0, 4), Ok(data.0));
+        assert_eq!(data.read_slice_at::<u8>(1, 4), Err(()));
+
+        let data = Bytes(&[0x01, 0x02, 0x00, 0x04]);
+
+        let mut bytes = data;
+        assert_eq!(bytes.read_string(), Ok(&data.0[..2]));
+        assert_eq!(bytes.0, &data.0[3..]);
+
+        let mut bytes = data;
+        bytes.skip(3).unwrap();
+        assert_eq!(bytes.read_string(), Err(()));
+        assert_eq!(bytes.0, &[]);
+
+        assert_eq!(data.read_string_at(0), Ok(&data.0[..2]));
+        assert_eq!(data.read_string_at(1), Ok(&data.0[1..2]));
+        assert_eq!(data.read_string_at(2), Ok(&[][..]));
+        assert_eq!(data.read_string_at(3), Err(()));
+    }
+
+    #[test]
+    fn bytes_debug() {
+        assert_eq!(format!("{:?}", Bytes(&[])), "[]");
+        assert_eq!(format!("{:?}", Bytes(&[0x01])), "[0x01]");
+        assert_eq!(
+            format!(
+                "{:?}",
+                Bytes(&[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08])
+            ),
+            "[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08]"
+        );
+        assert_eq!(
+            format!(
+                "{:?}",
+                Bytes(&[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09])
+            ),
+            "[0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, ...; 9]"
+        );
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/wasm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/wasm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/read/wasm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/read/wasm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,10 +10,10 @@
 use wasmparser as wp;
 
 use crate::read::{
-    self, Architecture, ComdatKind, CompressedData, Error, FileFlags, Object, ObjectComdat,
-    ObjectSection, ObjectSegment, ObjectSymbol, ObjectSymbolTable, ReadError, Relocation, Result,
-    SectionFlags, SectionIndex, SectionKind, SymbolFlags, SymbolIndex, SymbolKind, SymbolScope,
-    SymbolSection,
+    self, Architecture, ComdatKind, CompressedData, CompressedFileRange, Error, Export, FileFlags,
+    Import, NoDynamicRelocationIterator, Object, ObjectComdat, ObjectSection, ObjectSegment,
+    ObjectSymbol, ObjectSymbolTable, ReadError, ReadRef, Relocation, Result, SectionFlags,
+    SectionIndex, SectionKind, SymbolFlags, SymbolIndex, SymbolKind, SymbolScope, SymbolSection,
 };
 
 const SECTION_CUSTOM: usize = 0;
@@ -33,8 +33,8 @@
 const MAX_SECTION_ID: usize = SECTION_DATA_COUNT;
 
 /// A WebAssembly object file.
-#[derive(Debug, Default)]
-pub struct WasmFile<'data> {
+#[derive(Debug)]
+pub struct WasmFile<'data, R = &'data [u8]> {
     // All sections, including custom sections.
     sections: Vec<wp::Section<'data>>,
     // Indices into `sections` of sections with a non-zero id.
@@ -45,6 +45,7 @@
     symbols: Vec<WasmSymbolInternal<'data>>,
     // Address of the function body for the entry point.
     entry: u64,
+    marker: PhantomData<R>,
 }
 
 #[derive(Clone)]
@@ -60,12 +61,21 @@
     }
 }
 
-impl<'data> WasmFile<'data> {
+impl<'data, R: ReadRef<'data>> WasmFile<'data, R> {
     /// Parse the raw wasm data.
-    pub fn parse(data: &'data [u8]) -> Result<Self> {
+    pub fn parse(data: R) -> Result<Self> {
+        let len = data.len().read_error("Unknown Wasm file size")?;
+        let data = data.read_bytes_at(0, len).read_error("Wasm read failed")?;
         let module = wp::ModuleReader::new(data).read_error("Invalid Wasm header")?;
 
-        let mut file = WasmFile::default();
+        let mut file = WasmFile {
+            sections: Vec::new(),
+            id_sections: Default::default(),
+            has_debug_symbols: false,
+            symbols: Vec::new(),
+            entry: 0,
+            marker: PhantomData,
+        };
 
         let mut main_file_symbol = Some(WasmSymbolInternal {
             name: "",
@@ -283,21 +293,23 @@
     }
 }
 
-impl<'data> read::private::Sealed for WasmFile<'data> {}
+impl<'data, R> read::private::Sealed for WasmFile<'data, R> {}
 
-impl<'data, 'file> Object<'data, 'file> for WasmFile<'data>
+impl<'data, 'file, R> Object<'data, 'file> for WasmFile<'data, R>
 where
     'data: 'file,
+    R: 'file,
 {
-    type Segment = WasmSegment<'data, 'file>;
-    type SegmentIterator = WasmSegmentIterator<'data, 'file>;
-    type Section = WasmSection<'data, 'file>;
-    type SectionIterator = WasmSectionIterator<'data, 'file>;
-    type Comdat = WasmComdat<'data, 'file>;
-    type ComdatIterator = WasmComdatIterator<'data, 'file>;
+    type Segment = WasmSegment<'data, 'file, R>;
+    type SegmentIterator = WasmSegmentIterator<'data, 'file, R>;
+    type Section = WasmSection<'data, 'file, R>;
+    type SectionIterator = WasmSectionIterator<'data, 'file, R>;
+    type Comdat = WasmComdat<'data, 'file, R>;
+    type ComdatIterator = WasmComdatIterator<'data, 'file, R>;
     type Symbol = WasmSymbol<'data, 'file>;
     type SymbolIterator = WasmSymbolIterator<'data, 'file>;
     type SymbolTable = WasmSymbolTable<'data, 'file>;
+    type DynamicRelocationIterator = NoDynamicRelocationIterator;
 
     #[inline]
     fn architecture(&self) -> Architecture {
@@ -318,17 +330,12 @@
         WasmSegmentIterator { file: self }
     }
 
-    #[inline]
-    fn entry(&'file self) -> u64 {
-        self.entry
-    }
-
-    fn section_by_name(&'file self, section_name: &str) -> Option<WasmSection<'data, 'file>> {
+    fn section_by_name(&'file self, section_name: &str) -> Option<WasmSection<'data, 'file, R>> {
         self.sections()
             .find(|section| section.name() == Ok(section_name))
     }
 
-    fn section_by_index(&'file self, index: SectionIndex) -> Result<WasmSection<'data, 'file>> {
+    fn section_by_index(&'file self, index: SectionIndex) -> Result<WasmSection<'data, 'file, R>> {
         // TODO: Missing sections should return an empty section.
         let id_section = self
             .id_sections
@@ -336,12 +343,16 @@
             .and_then(|x| *x)
             .read_error("Invalid Wasm section index")?;
         let section = self.sections.get(id_section).unwrap();
-        Ok(WasmSection { section })
+        Ok(WasmSection {
+            section,
+            marker: PhantomData,
+        })
     }
 
     fn sections(&'file self) -> Self::SectionIterator {
         WasmSectionIterator {
             sections: self.sections.iter(),
+            marker: PhantomData,
         }
     }
 
@@ -381,10 +392,34 @@
         None
     }
 
+    #[inline]
+    fn dynamic_relocations(&self) -> Option<NoDynamicRelocationIterator> {
+        None
+    }
+
+    fn imports(&self) -> Result<Vec<Import<'data>>> {
+        // TODO: return entries in the import section
+        Ok(Vec::new())
+    }
+
+    fn exports(&self) -> Result<Vec<Export<'data>>> {
+        // TODO: return entries in the export section
+        Ok(Vec::new())
+    }
+
     fn has_debug_symbols(&self) -> bool {
         self.has_debug_symbols
     }
 
+    fn relative_address_base(&self) -> u64 {
+        0
+    }
+
+    #[inline]
+    fn entry(&'file self) -> u64 {
+        self.entry
+    }
+
     #[inline]
     fn flags(&self) -> FileFlags {
         FileFlags::None
@@ -393,12 +428,12 @@
 
 /// An iterator over the segments of a `WasmFile`.
 #[derive(Debug)]
-pub struct WasmSegmentIterator<'data, 'file> {
-    file: &'file WasmFile<'data>,
+pub struct WasmSegmentIterator<'data, 'file, R = &'data [u8]> {
+    file: &'file WasmFile<'data, R>,
 }
 
-impl<'data, 'file> Iterator for WasmSegmentIterator<'data, 'file> {
-    type Item = WasmSegment<'data, 'file>;
+impl<'data, 'file, R> Iterator for WasmSegmentIterator<'data, 'file, R> {
+    type Item = WasmSegment<'data, 'file, R>;
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
@@ -408,13 +443,13 @@
 
 /// A segment of a `WasmFile`.
 #[derive(Debug)]
-pub struct WasmSegment<'data, 'file> {
-    file: &'file WasmFile<'data>,
+pub struct WasmSegment<'data, 'file, R = &'data [u8]> {
+    file: &'file WasmFile<'data, R>,
 }
 
-impl<'data, 'file> read::private::Sealed for WasmSegment<'data, 'file> {}
+impl<'data, 'file, R> read::private::Sealed for WasmSegment<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSegment<'data> for WasmSegment<'data, 'file> {
+impl<'data, 'file, R> ObjectSegment<'data> for WasmSegment<'data, 'file, R> {
     #[inline]
     fn address(&self) -> u64 {
         unreachable!()
@@ -451,29 +486,34 @@
 
 /// An iterator over the sections of a `WasmFile`.
 #[derive(Debug)]
-pub struct WasmSectionIterator<'data, 'file> {
+pub struct WasmSectionIterator<'data, 'file, R = &'data [u8]> {
     sections: slice::Iter<'file, wp::Section<'data>>,
+    marker: PhantomData<R>,
 }
 
-impl<'data, 'file> Iterator for WasmSectionIterator<'data, 'file> {
-    type Item = WasmSection<'data, 'file>;
+impl<'data, 'file, R> Iterator for WasmSectionIterator<'data, 'file, R> {
+    type Item = WasmSection<'data, 'file, R>;
 
     fn next(&mut self) -> Option<Self::Item> {
         let section = self.sections.next()?;
-        Some(WasmSection { section })
+        Some(WasmSection {
+            section,
+            marker: PhantomData,
+        })
     }
 }
 
 /// A section of a `WasmFile`.
 #[derive(Debug)]
-pub struct WasmSection<'data, 'file> {
+pub struct WasmSection<'data, 'file, R = &'data [u8]> {
     section: &'file wp::Section<'data>,
+    marker: PhantomData<R>,
 }
 
-impl<'data, 'file> read::private::Sealed for WasmSection<'data, 'file> {}
+impl<'data, 'file, R> read::private::Sealed for WasmSection<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectSection<'data> for WasmSection<'data, 'file> {
-    type RelocationIterator = WasmRelocationIterator<'data, 'file>;
+impl<'data, 'file, R> ObjectSection<'data> for WasmSection<'data, 'file, R> {
+    type RelocationIterator = WasmRelocationIterator<'data, 'file, R>;
 
     #[inline]
     fn index(&self) -> SectionIndex {
@@ -517,6 +557,11 @@
     }
 
     #[inline]
+    fn compressed_file_range(&self) -> Result<CompressedFileRange> {
+        Ok(CompressedFileRange::none(self.file_range()))
+    }
+
+    #[inline]
     fn compressed_data(&self) -> Result<CompressedData<'data>> {
         self.data().map(CompressedData::none)
     }
@@ -570,8 +615,8 @@
     }
 
     #[inline]
-    fn relocations(&self) -> WasmRelocationIterator<'data, 'file> {
-        WasmRelocationIterator::default()
+    fn relocations(&self) -> WasmRelocationIterator<'data, 'file, R> {
+        WasmRelocationIterator(PhantomData)
     }
 
     #[inline]
@@ -582,12 +627,12 @@
 
 /// An iterator over the COMDAT section groups of a `WasmFile`.
 #[derive(Debug)]
-pub struct WasmComdatIterator<'data, 'file> {
-    file: &'file WasmFile<'data>,
+pub struct WasmComdatIterator<'data, 'file, R = &'data [u8]> {
+    file: &'file WasmFile<'data, R>,
 }
 
-impl<'data, 'file> Iterator for WasmComdatIterator<'data, 'file> {
-    type Item = WasmComdat<'data, 'file>;
+impl<'data, 'file, R> Iterator for WasmComdatIterator<'data, 'file, R> {
+    type Item = WasmComdat<'data, 'file, R>;
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
@@ -597,14 +642,14 @@
 
 /// A COMDAT section group of a `WasmFile`.
 #[derive(Debug)]
-pub struct WasmComdat<'data, 'file> {
-    file: &'file WasmFile<'data>,
+pub struct WasmComdat<'data, 'file, R = &'data [u8]> {
+    file: &'file WasmFile<'data, R>,
 }
 
-impl<'data, 'file> read::private::Sealed for WasmComdat<'data, 'file> {}
+impl<'data, 'file, R> read::private::Sealed for WasmComdat<'data, 'file, R> {}
 
-impl<'data, 'file> ObjectComdat<'data> for WasmComdat<'data, 'file> {
-    type SectionIterator = WasmComdatSectionIterator<'data, 'file>;
+impl<'data, 'file, R> ObjectComdat<'data> for WasmComdat<'data, 'file, R> {
+    type SectionIterator = WasmComdatSectionIterator<'data, 'file, R>;
 
     #[inline]
     fn kind(&self) -> ComdatKind {
@@ -629,14 +674,14 @@
 
 /// An iterator over the sections in a COMDAT section group of a `WasmFile`.
 #[derive(Debug)]
-pub struct WasmComdatSectionIterator<'data, 'file>
+pub struct WasmComdatSectionIterator<'data, 'file, R = &'data [u8]>
 where
     'data: 'file,
 {
-    file: &'file WasmFile<'data>,
+    file: &'file WasmFile<'data, R>,
 }
 
-impl<'data, 'file> Iterator for WasmComdatSectionIterator<'data, 'file> {
+impl<'data, 'file, R> Iterator for WasmComdatSectionIterator<'data, 'file, R> {
     type Item = SectionIndex;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -781,10 +826,12 @@
 }
 
 /// An iterator over the relocations in a `WasmSection`.
-#[derive(Debug, Default)]
-pub struct WasmRelocationIterator<'data, 'file>(PhantomData<(&'data (), &'file ())>);
+#[derive(Debug)]
+pub struct WasmRelocationIterator<'data, 'file, R = &'data [u8]>(
+    PhantomData<(&'data (), &'file (), R)>,
+);
 
-impl<'data, 'file> Iterator for WasmRelocationIterator<'data, 'file> {
+impl<'data, 'file, R> Iterator for WasmRelocationIterator<'data, 'file, R> {
     type Item = (u64, Relocation);
 
     #[inline]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/coff.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/coff.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/coff.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/coff.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,8 @@
-use crc32fast;
 use std::mem;
 use std::vec::Vec;
 
 use crate::endian::{LittleEndian as LE, U16Bytes, U32Bytes, U16, U32};
 use crate::pe as coff;
-use crate::pod::{bytes_of, WritableBuffer};
 use crate::write::string::*;
 use crate::write::util::*;
 use crate::write::*;
@@ -59,7 +57,7 @@
     pub(crate) fn coff_subsection_name(&self, section: &[u8], value: &[u8]) -> Vec<u8> {
         let mut name = section.to_vec();
         name.push(b'$');
-        name.extend(value);
+        name.extend_from_slice(value);
         name
     }
 
@@ -109,7 +107,7 @@
         let stub_size = self.architecture.address_size().unwrap().bytes();
 
         let mut name = b".rdata$.refptr.".to_vec();
-        name.extend(&self.symbols[symbol_id.0].name);
+        name.extend_from_slice(&self.symbols[symbol_id.0].name);
         let section_id = self.add_section(Vec::new(), name, SectionKind::ReadOnlyData);
         let section = self.section_mut(section_id);
         section.set_data(vec![0; stub_size as usize], u64::from(stub_size));
@@ -123,7 +121,7 @@
         }];
 
         let mut name = b".refptr.".to_vec();
-        name.extend(&self.symbol(symbol_id).name);
+        name.extend_from_slice(&self.symbol(symbol_id).name);
         let stub_id = self.add_raw_symbol(Symbol {
             name,
             value: 0,
@@ -268,6 +266,8 @@
             machine: U16::new(
                 LE,
                 match self.architecture {
+                    Architecture::Arm => coff::IMAGE_FILE_MACHINE_ARMNT,
+                    Architecture::Aarch64 => coff::IMAGE_FILE_MACHINE_ARM64,
                     Architecture::I386 => coff::IMAGE_FILE_MACHINE_I386,
                     Architecture::X86_64 => coff::IMAGE_FILE_MACHINE_AMD64,
                     _ => {
@@ -288,7 +288,7 @@
                 _ => U16::default(),
             },
         };
-        buffer.extend(bytes_of(&header));
+        buffer.write(&header);
 
         // Write section headers.
         for (index, section) in self.sections.iter().enumerate() {
@@ -332,7 +332,8 @@
                 | SectionKind::TlsVariables
                 | SectionKind::Note
                 | SectionKind::Unknown
-                | SectionKind::Metadata => {
+                | SectionKind::Metadata
+                | SectionKind::Elf(_) => {
                     return Err(Error(format!(
                         "unimplemented section `{}` kind {:?}",
                         section.name().unwrap_or(""),
@@ -395,7 +396,7 @@
                     coff_section.name = [0; 8];
                     coff_section.name[0] = b'/';
                     coff_section.name[1..][..len].copy_from_slice(&name[7 - len..]);
-                } else if str_offset as u64 <= 0xfff_fff_fff {
+                } else if str_offset as u64 <= 0xf_ffff_ffff {
                     coff_section.name[0] = b'/';
                     coff_section.name[1] = b'/';
                     for i in 0..6 {
@@ -415,7 +416,7 @@
                     return Err(Error(format!("invalid section name offset {}", str_offset)));
                 }
             }
-            buffer.extend(bytes_of(&coff_section));
+            buffer.write(&coff_section);
         }
 
         // Write section data and relocations.
@@ -424,7 +425,7 @@
             if len != 0 {
                 write_align(buffer, 4);
                 debug_assert_eq!(section_offsets[index].offset, buffer.len());
-                buffer.extend(section.data.as_slice());
+                buffer.write_bytes(&section.data);
             }
 
             if !section.relocations.is_empty() {
@@ -479,7 +480,7 @@
                         ),
                         typ: U16Bytes::new(LE, typ),
                     };
-                    buffer.extend(bytes_of(&coff_relocation));
+                    buffer.write(&coff_relocation);
                 }
             }
         }
@@ -569,7 +570,7 @@
                 let str_offset = strtab.get_offset(symbol_offsets[index].str_id.unwrap());
                 coff_symbol.name[4..8].copy_from_slice(&u32::to_le_bytes(str_offset as u32));
             }
-            buffer.extend(bytes_of(&coff_symbol));
+            buffer.write(&coff_symbol);
 
             // Write auxiliary symbols.
             match symbol.kind {
@@ -577,7 +578,7 @@
                     let aux_len = number_of_aux_symbols as usize * coff::IMAGE_SIZEOF_SYMBOL;
                     debug_assert!(aux_len >= symbol.name.len());
                     let old_len = buffer.len();
-                    buffer.extend(&symbol.name);
+                    buffer.write_bytes(&symbol.name);
                     buffer.resize(old_len + aux_len, 0);
                 }
                 SymbolKind::Section => {
@@ -598,7 +599,7 @@
                         // TODO: bigobj
                         high_number: U16Bytes::default(),
                     };
-                    buffer.extend(bytes_of(&aux));
+                    buffer.write(&aux);
                 }
                 _ => {
                     debug_assert_eq!(number_of_aux_symbols, 0);
@@ -608,8 +609,8 @@
 
         // Write strtab section.
         debug_assert_eq!(strtab_offset, buffer.len());
-        buffer.extend(&u32::to_le_bytes(strtab_len as u32));
-        buffer.extend(&strtab_data);
+        buffer.write_bytes(&u32::to_le_bytes(strtab_len as u32));
+        buffer.write_bytes(&strtab_data);
 
         debug_assert_eq!(offset, buffer.len());
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/elf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/elf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/elf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/elf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,10 +3,10 @@
 
 use crate::elf;
 use crate::endian::*;
-use crate::pod::{bytes_of, BytesMut, WritableBuffer};
 use crate::write::string::*;
 use crate::write::util::*;
 use crate::write::*;
+use crate::AddressSize;
 
 #[derive(Default, Clone, Copy)]
 struct ComdatOffsets {
@@ -65,17 +65,29 @@
     pub(crate) fn elf_subsection_name(&self, section: &[u8], value: &[u8]) -> Vec<u8> {
         let mut name = section.to_vec();
         name.push(b'.');
-        name.extend(value);
+        name.extend_from_slice(value);
         name
     }
 
     fn elf_has_relocation_addend(&self) -> Result<bool> {
         Ok(match self.architecture {
-            Architecture::Arm => false,
             Architecture::Aarch64 => true,
+            Architecture::Arm => false,
+            Architecture::Avr => true,
+            Architecture::Bpf => false,
             Architecture::I386 => false,
             Architecture::X86_64 => true,
+            Architecture::X86_64_X32 => true,
+            Architecture::Hexagon => true,
+            Architecture::Mips => false,
+            Architecture::Mips64 => true,
+            Architecture::Msp430 => true,
+            Architecture::PowerPc => true,
+            Architecture::PowerPc64 => true,
+            Architecture::Riscv64 => true,
+            Architecture::Riscv32 => true,
             Architecture::S390x => true,
+            Architecture::Sparc64 => true,
             _ => {
                 return Err(Error(format!(
                     "unimplemented architecture {:?}",
@@ -146,10 +158,12 @@
         let elf32 = Elf32 { endian };
         let elf64 = Elf64 { endian };
         let elf: &dyn Elf = match address_size {
-            AddressSize::U32 => &elf32,
+            AddressSize::U8 | AddressSize::U16 | AddressSize::U32 => &elf32,
             AddressSize::U64 => &elf64,
         };
         let pointer_align = address_size.bytes() as usize;
+        let is_mips64el =
+            self.architecture == Architecture::Mips64 && self.endian == Endianness::Little;
 
         // Calculate offsets of everything.
         let mut offset = 0;
@@ -241,7 +255,7 @@
             }
         }
         for (index, symbol) in self.symbols.iter().enumerate() {
-            if symbol.kind != SymbolKind::Section {
+            if symbol.kind != SymbolKind::Section && !symbol.name.is_empty() {
                 symbol_offsets[index].str_id = Some(strtab.add(&symbol.name));
             }
         }
@@ -281,9 +295,8 @@
         // Calculate size of strtab.
         let strtab_str_id = shstrtab.add(&b".strtab"[..]);
         let strtab_offset = offset;
-        let mut strtab_data = Vec::new();
-        // Null name.
-        strtab_data.push(0);
+        // Start with null name.
+        let mut strtab_data = vec![0];
         strtab.write(1, &mut strtab_data);
         offset += strtab_data.len();
         let strtab_index = section_num;
@@ -304,9 +317,8 @@
         // Calculate size of shstrtab.
         let shstrtab_str_id = shstrtab.add(&b".shstrtab"[..]);
         let shstrtab_offset = offset;
-        let mut shstrtab_data = Vec::new();
-        // Null section name.
-        shstrtab_data.push(0);
+        // Start with null section name.
+        let mut shstrtab_data = vec![0];
         shstrtab.write(1, &mut shstrtab_data);
         offset += shstrtab_data.len();
         let shstrtab_index = section_num;
@@ -327,7 +339,7 @@
         let e_ident = elf::Ident {
             magic: elf::ELFMAG,
             class: match address_size {
-                AddressSize::U32 => elf::ELFCLASS32,
+                AddressSize::U8 | AddressSize::U16 | AddressSize::U32 => elf::ELFCLASS32,
                 AddressSize::U64 => elf::ELFCLASS64,
             },
             data: if endian.is_little_endian() {
@@ -342,11 +354,23 @@
         };
         let e_type = elf::ET_REL;
         let e_machine = match self.architecture {
-            Architecture::Arm => elf::EM_ARM,
             Architecture::Aarch64 => elf::EM_AARCH64,
+            Architecture::Arm => elf::EM_ARM,
+            Architecture::Avr => elf::EM_AVR,
+            Architecture::Bpf => elf::EM_BPF,
             Architecture::I386 => elf::EM_386,
             Architecture::X86_64 => elf::EM_X86_64,
+            Architecture::X86_64_X32 => elf::EM_X86_64,
+            Architecture::Hexagon => elf::EM_HEXAGON,
+            Architecture::Mips => elf::EM_MIPS,
+            Architecture::Mips64 => elf::EM_MIPS,
+            Architecture::Msp430 => elf::EM_MSP430,
+            Architecture::PowerPc => elf::EM_PPC,
+            Architecture::PowerPc64 => elf::EM_PPC64,
+            Architecture::Riscv32 => elf::EM_RISCV,
+            Architecture::Riscv64 => elf::EM_RISCV,
             Architecture::S390x => elf::EM_S390,
+            Architecture::Sparc64 => elf::EM_SPARCV9,
             _ => {
                 return Err(Error(format!(
                     "unimplemented architecture {:?}",
@@ -392,23 +416,26 @@
 
         // Write section data.
         for (index, comdat) in self.comdats.iter().enumerate() {
-            let mut data = BytesMut::new();
-            data.write(&U32::new(endian, elf::GRP_COMDAT));
+            let mut data = Vec::new();
+            data.write_pod(&U32::new(self.endian, elf::GRP_COMDAT));
             for section in &comdat.sections {
-                data.write(&U32::new(endian, section_offsets[section.0].index as u32));
+                data.write_pod(&U32::new(
+                    self.endian,
+                    section_offsets[section.0].index as u32,
+                ));
             }
 
             write_align(buffer, 4);
             debug_assert_eq!(comdat_offsets[index].offset, buffer.len());
             debug_assert_eq!(comdat_offsets[index].len, data.len());
-            buffer.extend(data.as_slice());
+            buffer.write_bytes(&data);
         }
         for (index, section) in self.sections.iter().enumerate() {
             let len = section.data.len();
             if len != 0 {
                 write_align(buffer, section.align as usize);
                 debug_assert_eq!(section_offsets[index].offset, buffer.len());
-                buffer.extend(section.data.as_slice());
+                buffer.write_bytes(&section.data);
             }
         }
 
@@ -426,9 +453,9 @@
                 st_size: 0,
             },
         );
-        let mut symtab_shndx = BytesMut::new();
+        let mut symtab_shndx = Vec::new();
         if need_symtab_shndx {
-            symtab_shndx.write(&U32::new(endian, 0));
+            symtab_shndx.write_pod(&U32::new(endian, 0));
         }
         let mut write_symbol = |index: usize, symbol: &Symbol| -> Result<()> {
             let st_info = if let SymbolFlags::Elf { st_info, .. } = symbol.flags {
@@ -522,7 +549,7 @@
                 },
             );
             if need_symtab_shndx {
-                symtab_shndx.write(&U32::new(endian, xindex));
+                symtab_shndx.write_pod(&U32::new(endian, xindex));
             }
             Ok(())
         };
@@ -539,12 +566,12 @@
         if need_symtab_shndx {
             debug_assert_eq!(symtab_shndx_offset, buffer.len());
             debug_assert_eq!(symtab_shndx_len, symtab_shndx.len());
-            buffer.extend(symtab_shndx.as_slice());
+            buffer.write_bytes(&symtab_shndx);
         }
 
         // Write strtab section.
         debug_assert_eq!(strtab_offset, buffer.len());
-        buffer.extend(&strtab_data);
+        buffer.write_bytes(&strtab_data);
 
         // Write relocations.
         for (index, section) in self.sections.iter().enumerate() {
@@ -553,6 +580,57 @@
                 debug_assert_eq!(section_offsets[index].reloc_offset, buffer.len());
                 for reloc in &section.relocations {
                     let r_type = match self.architecture {
+                        Architecture::Aarch64 => match (reloc.kind, reloc.encoding, reloc.size) {
+                            (RelocationKind::Absolute, RelocationEncoding::Generic, 64) => {
+                                elf::R_AARCH64_ABS64
+                            }
+                            (RelocationKind::Absolute, RelocationEncoding::Generic, 32) => {
+                                elf::R_AARCH64_ABS32
+                            }
+                            (RelocationKind::Absolute, RelocationEncoding::Generic, 16) => {
+                                elf::R_AARCH64_ABS16
+                            }
+                            (RelocationKind::Relative, RelocationEncoding::Generic, 64) => {
+                                elf::R_AARCH64_PREL64
+                            }
+                            (RelocationKind::Relative, RelocationEncoding::Generic, 32) => {
+                                elf::R_AARCH64_PREL32
+                            }
+                            (RelocationKind::Relative, RelocationEncoding::Generic, 16) => {
+                                elf::R_AARCH64_PREL16
+                            }
+                            (RelocationKind::Relative, RelocationEncoding::AArch64Call, 26)
+                            | (RelocationKind::PltRelative, RelocationEncoding::AArch64Call, 26) => {
+                                elf::R_AARCH64_CALL26
+                            }
+                            (RelocationKind::Elf(x), _, _) => x,
+                            _ => {
+                                return Err(Error(format!("unimplemented relocation {:?}", reloc)));
+                            }
+                        },
+                        Architecture::Arm => match (reloc.kind, reloc.encoding, reloc.size) {
+                            (RelocationKind::Absolute, _, 32) => elf::R_ARM_ABS32,
+                            (RelocationKind::Elf(x), _, _) => x,
+                            _ => {
+                                return Err(Error(format!("unimplemented relocation {:?}", reloc)));
+                            }
+                        },
+                        Architecture::Avr => match (reloc.kind, reloc.encoding, reloc.size) {
+                            (RelocationKind::Absolute, _, 32) => elf::R_AVR_32,
+                            (RelocationKind::Absolute, _, 16) => elf::R_AVR_16,
+                            (RelocationKind::Elf(x), _, _) => x,
+                            _ => {
+                                return Err(Error(format!("unimplemented relocation {:?}", reloc)));
+                            }
+                        },
+                        Architecture::Bpf => match (reloc.kind, reloc.encoding, reloc.size) {
+                            (RelocationKind::Absolute, _, 64) => elf::R_BPF_64_64,
+                            (RelocationKind::Absolute, _, 32) => elf::R_BPF_64_32,
+                            (RelocationKind::Elf(x), _, _) => x,
+                            _ => {
+                                return Err(Error(format!("unimplemented relocation {:?}", reloc)));
+                            }
+                        },
                         Architecture::I386 => match (reloc.kind, reloc.size) {
                             (RelocationKind::Absolute, 32) => elf::R_386_32,
                             (RelocationKind::Relative, 32) => elf::R_386_PC32,
@@ -569,41 +647,91 @@
                                 return Err(Error(format!("unimplemented relocation {:?}", reloc)));
                             }
                         },
-                        Architecture::X86_64 => match (reloc.kind, reloc.encoding, reloc.size) {
-                            (RelocationKind::Absolute, RelocationEncoding::Generic, 64) => {
-                                elf::R_X86_64_64
+                        Architecture::X86_64 | Architecture::X86_64_X32 => {
+                            match (reloc.kind, reloc.encoding, reloc.size) {
+                                (RelocationKind::Absolute, RelocationEncoding::Generic, 64) => {
+                                    elf::R_X86_64_64
+                                }
+                                (RelocationKind::Relative, _, 32) => elf::R_X86_64_PC32,
+                                (RelocationKind::Got, _, 32) => elf::R_X86_64_GOT32,
+                                (RelocationKind::PltRelative, _, 32) => elf::R_X86_64_PLT32,
+                                (RelocationKind::GotRelative, _, 32) => elf::R_X86_64_GOTPCREL,
+                                (RelocationKind::Absolute, RelocationEncoding::Generic, 32) => {
+                                    elf::R_X86_64_32
+                                }
+                                (RelocationKind::Absolute, RelocationEncoding::X86Signed, 32) => {
+                                    elf::R_X86_64_32S
+                                }
+                                (RelocationKind::Absolute, _, 16) => elf::R_X86_64_16,
+                                (RelocationKind::Relative, _, 16) => elf::R_X86_64_PC16,
+                                (RelocationKind::Absolute, _, 8) => elf::R_X86_64_8,
+                                (RelocationKind::Relative, _, 8) => elf::R_X86_64_PC8,
+                                (RelocationKind::Elf(x), _, _) => x,
+                                _ => {
+                                    return Err(Error(format!(
+                                        "unimplemented relocation {:?}",
+                                        reloc
+                                    )));
+                                }
                             }
-                            (RelocationKind::Relative, _, 32) => elf::R_X86_64_PC32,
-                            (RelocationKind::Got, _, 32) => elf::R_X86_64_GOT32,
-                            (RelocationKind::PltRelative, _, 32) => elf::R_X86_64_PLT32,
-                            (RelocationKind::GotRelative, _, 32) => elf::R_X86_64_GOTPCREL,
-                            (RelocationKind::Absolute, RelocationEncoding::Generic, 32) => {
-                                elf::R_X86_64_32
+                        }
+                        Architecture::Hexagon => match (reloc.kind, reloc.encoding, reloc.size) {
+                            (RelocationKind::Absolute, _, 32) => elf::R_HEX_32,
+                            (RelocationKind::Elf(x), _, _) => x,
+                            _ => {
+                                return Err(Error(format!("unimplemented relocation {:?}", reloc)));
                             }
-                            (RelocationKind::Absolute, RelocationEncoding::X86Signed, 32) => {
-                                elf::R_X86_64_32S
+                        },
+                        Architecture::Mips | Architecture::Mips64 => {
+                            match (reloc.kind, reloc.encoding, reloc.size) {
+                                (RelocationKind::Absolute, _, 16) => elf::R_MIPS_16,
+                                (RelocationKind::Absolute, _, 32) => elf::R_MIPS_32,
+                                (RelocationKind::Absolute, _, 64) => elf::R_MIPS_64,
+                                (RelocationKind::Elf(x), _, _) => x,
+                                _ => {
+                                    return Err(Error(format!(
+                                        "unimplemented relocation {:?}",
+                                        reloc
+                                    )));
+                                }
                             }
-                            (RelocationKind::Absolute, _, 16) => elf::R_X86_64_16,
-                            (RelocationKind::Relative, _, 16) => elf::R_X86_64_PC16,
-                            (RelocationKind::Absolute, _, 8) => elf::R_X86_64_8,
-                            (RelocationKind::Relative, _, 8) => elf::R_X86_64_PC8,
+                        }
+                        Architecture::Msp430 => match (reloc.kind, reloc.encoding, reloc.size) {
+                            (RelocationKind::Absolute, _, 32) => elf::R_MSP430_32,
+                            (RelocationKind::Absolute, _, 16) => elf::R_MSP430_16_BYTE,
                             (RelocationKind::Elf(x), _, _) => x,
                             _ => {
                                 return Err(Error(format!("unimplemented relocation {:?}", reloc)));
                             }
                         },
-                        Architecture::Aarch64 => match (reloc.kind, reloc.encoding, reloc.size) {
-                            (RelocationKind::Absolute, RelocationEncoding::Generic, 32) => {
-                                elf::R_AARCH64_ABS32
-                            }
-                            (RelocationKind::Absolute, RelocationEncoding::Generic, 64) => {
-                                elf::R_AARCH64_ABS64
+                        Architecture::PowerPc => match (reloc.kind, reloc.encoding, reloc.size) {
+                            (RelocationKind::Absolute, _, 32) => elf::R_PPC_ADDR32,
+                            (RelocationKind::Elf(x), _, _) => x,
+                            _ => {
+                                return Err(Error(format!("unimplemented relocation {:?}", reloc)));
                             }
+                        },
+                        Architecture::PowerPc64 => match (reloc.kind, reloc.encoding, reloc.size) {
+                            (RelocationKind::Absolute, _, 32) => elf::R_PPC64_ADDR32,
+                            (RelocationKind::Absolute, _, 64) => elf::R_PPC64_ADDR64,
                             (RelocationKind::Elf(x), _, _) => x,
                             _ => {
                                 return Err(Error(format!("unimplemented relocation {:?}", reloc)));
                             }
                         },
+                        Architecture::Riscv32 | Architecture::Riscv64 => {
+                            match (reloc.kind, reloc.encoding, reloc.size) {
+                                (RelocationKind::Absolute, _, 32) => elf::R_RISCV_32,
+                                (RelocationKind::Absolute, _, 64) => elf::R_RISCV_64,
+                                (RelocationKind::Elf(x), _, _) => x,
+                                _ => {
+                                    return Err(Error(format!(
+                                        "unimplemented relocation {:?}",
+                                        reloc
+                                    )));
+                                }
+                            }
+                        }
                         Architecture::S390x => match (reloc.kind, reloc.encoding, reloc.size) {
                             (RelocationKind::Absolute, RelocationEncoding::Generic, 8) => {
                                 elf::R_390_8
@@ -670,16 +798,27 @@
                                 return Err(Error(format!("unimplemented relocation {:?}", reloc)));
                             }
                         },
+                        Architecture::Sparc64 => match (reloc.kind, reloc.encoding, reloc.size) {
+                            // TODO: use R_SPARC_32/R_SPARC_64 if aligned.
+                            (RelocationKind::Absolute, _, 32) => elf::R_SPARC_UA32,
+                            (RelocationKind::Absolute, _, 64) => elf::R_SPARC_UA64,
+                            (RelocationKind::Elf(x), _, _) => x,
+                            _ => {
+                                return Err(Error(format!("unimplemented relocation {:?}", reloc)));
+                            }
+                        },
                         _ => {
-                            return Err(Error(format!(
-                                "unimplemented architecture {:?}",
-                                self.architecture
-                            )));
+                            if let RelocationKind::Elf(x) = reloc.kind {
+                                x
+                            } else {
+                                return Err(Error(format!("unimplemented relocation {:?}", reloc)));
+                            }
                         }
                     };
                     let r_sym = symbol_offsets[reloc.symbol.0].index as u32;
                     elf.write_rel(
                         buffer,
+                        is_mips64el,
                         is_rela,
                         Rel {
                             r_offset: reloc.offset,
@@ -694,7 +833,7 @@
 
         // Write shstrtab section.
         debug_assert_eq!(shstrtab_offset, buffer.len());
-        buffer.extend(&shstrtab_data);
+        buffer.write_bytes(&shstrtab_data);
 
         // Write section headers.
         write_align(buffer, pointer_align);
@@ -748,6 +887,7 @@
             let sh_type = match section.kind {
                 SectionKind::UninitializedData | SectionKind::UninitializedTls => elf::SHT_NOBITS,
                 SectionKind::Note => elf::SHT_NOTE,
+                SectionKind::Elf(sh_type) => sh_type,
                 _ => elf::SHT_PROGBITS,
             };
             let sh_flags = if let SectionFlags::Elf { sh_flags } = section.flags {
@@ -768,7 +908,8 @@
                     | SectionKind::Debug
                     | SectionKind::Metadata
                     | SectionKind::Linker
-                    | SectionKind::Note => 0,
+                    | SectionKind::Note
+                    | SectionKind::Elf(_) => 0,
                     SectionKind::Unknown | SectionKind::Common | SectionKind::TlsVariables => {
                         return Err(Error(format!(
                             "unimplemented section `{}` kind {:?}",
@@ -961,7 +1102,13 @@
     fn write_file_header(&self, buffer: &mut dyn WritableBuffer, section: FileHeader);
     fn write_section_header(&self, buffer: &mut dyn WritableBuffer, section: SectionHeader);
     fn write_symbol(&self, buffer: &mut dyn WritableBuffer, symbol: Sym);
-    fn write_rel(&self, buffer: &mut dyn WritableBuffer, is_rela: bool, rel: Rel);
+    fn write_rel(
+        &self,
+        buffer: &mut dyn WritableBuffer,
+        is_mips64el: bool,
+        is_rela: bool,
+        rel: Rel,
+    );
 }
 
 struct Elf32<E> {
@@ -1007,7 +1154,7 @@
             e_shnum: U16::new(endian, file.e_shnum),
             e_shstrndx: U16::new(endian, file.e_shstrndx),
         };
-        buffer.extend(bytes_of(&file));
+        buffer.write(&file);
     }
 
     fn write_section_header(&self, buffer: &mut dyn WritableBuffer, section: SectionHeader) {
@@ -1024,7 +1171,7 @@
             sh_addralign: U32::new(endian, section.sh_addralign as u32),
             sh_entsize: U32::new(endian, section.sh_entsize as u32),
         };
-        buffer.extend(bytes_of(&section));
+        buffer.write(&section);
     }
 
     fn write_symbol(&self, buffer: &mut dyn WritableBuffer, symbol: Sym) {
@@ -1037,10 +1184,16 @@
             st_value: U32::new(endian, symbol.st_value as u32),
             st_size: U32::new(endian, symbol.st_size as u32),
         };
-        buffer.extend(bytes_of(&symbol));
+        buffer.write(&symbol);
     }
 
-    fn write_rel(&self, buffer: &mut dyn WritableBuffer, is_rela: bool, rel: Rel) {
+    fn write_rel(
+        &self,
+        buffer: &mut dyn WritableBuffer,
+        _is_mips64el: bool,
+        is_rela: bool,
+        rel: Rel,
+    ) {
         let endian = self.endian;
         if is_rela {
             let rel = elf::Rela32 {
@@ -1048,13 +1201,13 @@
                 r_info: elf::Rel32::r_info(endian, rel.r_sym, rel.r_type as u8),
                 r_addend: I32::new(endian, rel.r_addend as i32),
             };
-            buffer.extend(bytes_of(&rel));
+            buffer.write(&rel);
         } else {
             let rel = elf::Rel32 {
                 r_offset: U32::new(endian, rel.r_offset as u32),
                 r_info: elf::Rel32::r_info(endian, rel.r_sym, rel.r_type as u8),
             };
-            buffer.extend(bytes_of(&rel));
+            buffer.write(&rel);
         }
     }
 }
@@ -1102,7 +1255,7 @@
             e_shnum: U16::new(endian, file.e_shnum),
             e_shstrndx: U16::new(endian, file.e_shstrndx),
         };
-        buffer.extend(bytes_of(&file))
+        buffer.write(&file)
     }
 
     fn write_section_header(&self, buffer: &mut dyn WritableBuffer, section: SectionHeader) {
@@ -1119,7 +1272,7 @@
             sh_addralign: U64::new(endian, section.sh_addralign),
             sh_entsize: U64::new(endian, section.sh_entsize),
         };
-        buffer.extend(bytes_of(&section));
+        buffer.write(&section);
     }
 
     fn write_symbol(&self, buffer: &mut dyn WritableBuffer, symbol: Sym) {
@@ -1132,24 +1285,30 @@
             st_value: U64::new(endian, symbol.st_value),
             st_size: U64::new(endian, symbol.st_size),
         };
-        buffer.extend(bytes_of(&symbol));
+        buffer.write(&symbol);
     }
 
-    fn write_rel(&self, buffer: &mut dyn WritableBuffer, is_rela: bool, rel: Rel) {
+    fn write_rel(
+        &self,
+        buffer: &mut dyn WritableBuffer,
+        is_mips64el: bool,
+        is_rela: bool,
+        rel: Rel,
+    ) {
         let endian = self.endian;
         if is_rela {
             let rel = elf::Rela64 {
                 r_offset: U64::new(endian, rel.r_offset),
-                r_info: elf::Rela64::r_info(endian, rel.r_sym, rel.r_type),
+                r_info: elf::Rela64::r_info(endian, is_mips64el, rel.r_sym, rel.r_type),
                 r_addend: I64::new(endian, rel.r_addend),
             };
-            buffer.extend(bytes_of(&rel));
+            buffer.write(&rel);
         } else {
             let rel = elf::Rel64 {
                 r_offset: U64::new(endian, rel.r_offset),
                 r_info: elf::Rel64::r_info(endian, rel.r_sym, rel.r_type),
             };
-            buffer.extend(bytes_of(&rel));
+            buffer.write(&rel);
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/macho.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/macho.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/macho.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/macho.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,11 @@
 use std::mem;
-use std::vec::Vec;
 
 use crate::endian::*;
 use crate::macho;
-use crate::pod::{bytes_of, WritableBuffer};
 use crate::write::string::*;
 use crate::write::util::*;
 use crate::write::*;
+use crate::AddressSize;
 
 #[derive(Default, Clone, Copy)]
 struct SectionOffsets {
@@ -116,7 +115,7 @@
 
         // Create the initializer symbol.
         let mut name = symbol.name.clone();
-        name.extend(b"$tlv$init");
+        name.extend_from_slice(b"$tlv$init");
         let init_symbol_id = self.add_raw_symbol(Symbol {
             name,
             value: 0,
@@ -191,7 +190,7 @@
         let macho32 = MachO32 { endian };
         let macho64 = MachO64 { endian };
         let macho: &dyn MachO = match address_size {
-            AddressSize::U32 => &macho32,
+            AddressSize::U8 | AddressSize::U16 | AddressSize::U32 => &macho32,
             AddressSize::U64 => &macho64,
         };
         let pointer_align = address_size.bytes() as usize;
@@ -222,7 +221,7 @@
         let sizeofcmds = offset - command_offset;
 
         // Calculate size of section data.
-        let segment_data_offset = offset;
+        let mut segment_file_offset = None;
         let mut section_offsets = vec![SectionOffsets::default(); self.sections.len()];
         let mut address = 0;
         for (index, section) in self.sections.iter().enumerate() {
@@ -232,6 +231,9 @@
                 if len != 0 {
                     offset = align(offset, section.align as usize);
                     section_offsets[index].offset = offset;
+                    if segment_file_offset.is_none() {
+                        segment_file_offset = Some(offset);
+                    }
                     offset += len;
                 } else {
                     section_offsets[index].offset = offset;
@@ -249,7 +251,9 @@
                 address += section.size;
             }
         }
-        let segment_data_size = offset - segment_data_offset;
+        let segment_file_offset = segment_file_offset.unwrap_or(offset);
+        let segment_file_size = offset - segment_file_offset;
+        debug_assert!(segment_file_size as u64 <= address);
 
         // Count symbols and add symbol strings to strtab.
         let mut strtab = StringTable::default();
@@ -295,9 +299,8 @@
 
         // Calculate size of strtab.
         let strtab_offset = offset;
-        let mut strtab_data = Vec::new();
-        // Null name.
-        strtab_data.push(0);
+        // Start with null name.
+        let mut strtab_data = vec![0];
         strtab.write(1, &mut strtab_data);
         offset += strtab_data.len();
 
@@ -356,8 +359,8 @@
                 segname: [0; 16],
                 vmaddr: 0,
                 vmsize: address,
-                fileoff: segment_data_offset as u64,
-                filesize: segment_data_size as u64,
+                fileoff: segment_file_offset as u64,
+                filesize: segment_file_size as u64,
                 maxprot: macho::VM_PROT_READ | macho::VM_PROT_WRITE | macho::VM_PROT_EXECUTE,
                 initprot: macho::VM_PROT_READ | macho::VM_PROT_WRITE | macho::VM_PROT_EXECUTE,
                 nsects: self.sections.len() as u32,
@@ -368,9 +371,25 @@
         // Write section headers.
         for (index, section) in self.sections.iter().enumerate() {
             let mut sectname = [0; 16];
-            sectname[..section.name.len()].copy_from_slice(&section.name);
+            sectname
+                .get_mut(..section.name.len())
+                .ok_or_else(|| {
+                    Error(format!(
+                        "section name `{}` is too long",
+                        section.name().unwrap_or(""),
+                    ))
+                })?
+                .copy_from_slice(&section.name);
             let mut segname = [0; 16];
-            segname[..section.segment.len()].copy_from_slice(&section.segment);
+            segname
+                .get_mut(..section.segment.len())
+                .ok_or_else(|| {
+                    Error(format!(
+                        "segment name `{}` is too long",
+                        section.segment().unwrap_or(""),
+                    ))
+                })?
+                .copy_from_slice(&section.segment);
             let flags = if let SectionFlags::MachO { flags } = section.flags {
                 flags
             } else {
@@ -388,7 +407,7 @@
                     SectionKind::Debug => macho::S_ATTR_DEBUG,
                     SectionKind::OtherString => macho::S_CSTRING_LITERALS,
                     SectionKind::Other | SectionKind::Linker | SectionKind::Metadata => 0,
-                    SectionKind::Note | SectionKind::Unknown => {
+                    SectionKind::Note | SectionKind::Unknown | SectionKind::Elf(_) => {
                         return Err(Error(format!(
                             "unimplemented section `{}` kind {:?}",
                             section.name().unwrap_or(""),
@@ -423,18 +442,18 @@
             stroff: U32::new(endian, strtab_offset as u32),
             strsize: U32::new(endian, strtab_data.len() as u32),
         };
-        buffer.extend(bytes_of(&symtab_command));
+        buffer.write(&symtab_command);
 
         // Write section data.
-        debug_assert_eq!(segment_data_offset, buffer.len());
         for (index, section) in self.sections.iter().enumerate() {
             let len = section.data.len();
             if len != 0 {
                 write_align(buffer, section.align as usize);
                 debug_assert_eq!(section_offsets[index].offset, buffer.len());
-                buffer.extend(section.data.as_slice());
+                buffer.write_bytes(&section.data);
             }
         }
+        debug_assert_eq!(segment_file_offset + segment_file_size, buffer.len());
 
         // Write symtab.
         write_align(buffer, pointer_align);
@@ -504,7 +523,7 @@
 
         // Write strtab.
         debug_assert_eq!(strtab_offset, buffer.len());
-        buffer.extend(&strtab_data);
+        buffer.write_bytes(&strtab_data);
 
         // Write relocations.
         for (index, section) in self.sections.iter().enumerate() {
@@ -580,7 +599,7 @@
                         r_extern,
                         r_type,
                     };
-                    buffer.extend(bytes_of(&reloc_info.relocation(endian)));
+                    buffer.write(&reloc_info.relocation(endian));
                 }
             }
         }
@@ -681,7 +700,7 @@
             sizeofcmds: U32::new(endian, header.sizeofcmds),
             flags: U32::new(endian, header.flags),
         };
-        buffer.extend(bytes_of(&header));
+        buffer.write(&header);
     }
 
     fn write_segment_command(&self, buffer: &mut dyn WritableBuffer, segment: SegmentCommand) {
@@ -699,7 +718,7 @@
             nsects: U32::new(endian, segment.nsects),
             flags: U32::new(endian, segment.flags),
         };
-        buffer.extend(bytes_of(&segment));
+        buffer.write(&segment);
     }
 
     fn write_section(&self, buffer: &mut dyn WritableBuffer, section: SectionHeader) {
@@ -717,7 +736,7 @@
             reserved1: U32::default(),
             reserved2: U32::default(),
         };
-        buffer.extend(bytes_of(&section));
+        buffer.write(&section);
     }
 
     fn write_nlist(&self, buffer: &mut dyn WritableBuffer, nlist: Nlist) {
@@ -729,7 +748,7 @@
             n_desc: U16::new(endian, nlist.n_desc),
             n_value: U32::new(endian, nlist.n_value as u32),
         };
-        buffer.extend(bytes_of(&nlist));
+        buffer.write(&nlist);
     }
 }
 
@@ -771,7 +790,7 @@
             flags: U32::new(endian, header.flags),
             reserved: U32::default(),
         };
-        buffer.extend(bytes_of(&header));
+        buffer.write(&header);
     }
 
     fn write_segment_command(&self, buffer: &mut dyn WritableBuffer, segment: SegmentCommand) {
@@ -789,7 +808,7 @@
             nsects: U32::new(endian, segment.nsects),
             flags: U32::new(endian, segment.flags),
         };
-        buffer.extend(bytes_of(&segment));
+        buffer.write(&segment);
     }
 
     fn write_section(&self, buffer: &mut dyn WritableBuffer, section: SectionHeader) {
@@ -808,7 +827,7 @@
             reserved2: U32::default(),
             reserved3: U32::default(),
         };
-        buffer.extend(bytes_of(&section));
+        buffer.write(&section);
     }
 
     fn write_nlist(&self, buffer: &mut dyn WritableBuffer, nlist: Nlist) {
@@ -820,6 +839,6 @@
             n_desc: U16::new(endian, nlist.n_desc),
             n_value: U64Bytes::new(endian, nlist.n_value),
         };
-        buffer.extend(bytes_of(&nlist));
+        buffer.write(&nlist);
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1,14 @@
 //! Interface for writing object files.
 
-#![allow(clippy::cognitive_complexity)]
-#![allow(clippy::collapsible_if)]
-#![allow(clippy::comparison_chain)]
-#![allow(clippy::single_match)]
-#![allow(clippy::useless_let_if_seq)]
-
 use std::collections::HashMap;
 use std::string::String;
 use std::vec::Vec;
 use std::{error, fmt, result, str};
 
 use crate::endian::{Endianness, U32, U64};
-use crate::pod::{BytesMut, WritableBuffer};
 use crate::{
-    AddressSize, Architecture, BinaryFormat, ComdatKind, FileFlags, RelocationEncoding,
-    RelocationKind, SectionFlags, SectionKind, SymbolFlags, SymbolKind, SymbolScope,
+    Architecture, BinaryFormat, ComdatKind, FileFlags, RelocationEncoding, RelocationKind,
+    SectionFlags, SectionKind, SymbolFlags, SymbolKind, SymbolScope,
 };
 
 #[cfg(feature = "coff")]
@@ -26,6 +19,7 @@
 mod macho;
 mod string;
 mod util;
+pub use util::*;
 
 /// The error type used within the write module.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -109,6 +103,7 @@
     /// Return the name for a standard segment.
     ///
     /// This will vary based on the file format.
+    #[allow(unused_variables)]
     pub fn segment_name(&self, segment: StandardSegment) -> &'static [u8] {
         match self.format {
             #[cfg(feature = "coff")]
@@ -167,7 +162,7 @@
             kind,
             size: 0,
             align: 1,
-            data: BytesMut::new(),
+            data: Vec::new(),
             relocations: Vec::new(),
             symbol: None,
             flags: SectionFlags::None,
@@ -247,6 +242,7 @@
         (segment, name, kind)
     }
 
+    #[allow(unused_variables)]
     fn subsection_name(&self, section: &[u8], value: &[u8]) -> Vec<u8> {
         debug_assert!(!self.has_subsections_via_symbols());
         match self.format {
@@ -438,6 +434,7 @@
     ///
     /// For Mach-O, this also creates a `__thread_vars` entry for TLS symbols, and the
     /// symbol will indirectly point to the data via the `__thread_vars` entry.
+    #[allow(unused_mut)]
     pub fn set_symbol_data(
         &mut self,
         mut symbol_id: SymbolId,
@@ -523,9 +520,9 @@
 
     /// Write the object to a `Vec`.
     pub fn write(&self) -> Result<Vec<u8>> {
-        let mut buffer = BytesMut::new();
+        let mut buffer = Vec::new();
         self.emit(&mut buffer)?;
-        Ok(buffer.0)
+        Ok(buffer)
     }
 
     /// Write the object to a `WritableBuffer`.
@@ -545,6 +542,7 @@
 /// A standard segment kind.
 #[allow(missing_docs)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum StandardSegment {
     Text,
     Data,
@@ -554,6 +552,7 @@
 /// A standard section kind.
 #[allow(missing_docs)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum StandardSection {
     Text,
     Data,
@@ -617,7 +616,7 @@
     kind: SectionKind,
     size: u64,
     align: u64,
-    data: BytesMut,
+    data: Vec<u8>,
     relocations: Vec<Relocation>,
     symbol: Option<SymbolId>,
     /// Section flags that are specific to each file format.
@@ -631,6 +630,12 @@
         str::from_utf8(&self.name).ok()
     }
 
+    /// Try to convert the segment to a utf8 string.
+    #[inline]
+    pub fn segment(&self) -> Option<&str> {
+        str::from_utf8(&self.segment).ok()
+    }
+
     /// Return true if this section contains zerofill data.
     #[inline]
     pub fn is_bss(&self) -> bool {
@@ -645,7 +650,7 @@
         debug_assert_eq!(align & (align - 1), 0);
         debug_assert!(self.data.is_empty());
         self.size = data.len() as u64;
-        self.data = BytesMut(data);
+        self.data = data;
         self.align = align;
     }
 
@@ -664,7 +669,7 @@
             offset += align - (offset & (align - 1));
             self.data.resize(offset, 0);
         }
-        self.data.extend(data);
+        self.data.extend_from_slice(data);
         self.size = self.data.len() as u64;
         offset as u64
     }
@@ -690,6 +695,7 @@
 
 /// The section where a symbol is defined.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum SymbolSection {
     /// The section is not applicable for this symbol (such as file symbols).
     None,
@@ -815,7 +821,8 @@
 }
 
 /// The symbol name mangling scheme.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum Mangling {
     /// No symbol mangling.
     None,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/src/write/util.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/src/write/util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,98 @@
-use crate::pod::WritableBuffer;
+use std::vec::Vec;
+
+use crate::pod::{bytes_of, bytes_of_slice, Pod};
+
+/// Trait for writable buffer.
+#[allow(clippy::len_without_is_empty)]
+pub trait WritableBuffer {
+    /// Returns position/offset for data to be written at.
+    fn len(&self) -> usize;
+
+    /// Reserves specified number of bytes in the buffer.
+    fn reserve(&mut self, additional: usize) -> Result<(), ()>;
+
+    /// Writes the specified value at the end of the buffer
+    /// until the buffer has the specified length.
+    fn resize(&mut self, new_len: usize, value: u8);
+
+    /// Writes the specified slice of bytes at the end of the buffer.
+    fn write_bytes(&mut self, val: &[u8]);
+
+    /// Writes the specified `Pod` type at the end of the buffer.
+    fn write_pod<T: Pod>(&mut self, val: &T)
+    where
+        Self: Sized,
+    {
+        self.write_bytes(bytes_of(val))
+    }
+
+    /// Writes the specified `Pod` slice at the end of the buffer.
+    fn write_pod_slice<T: Pod>(&mut self, val: &[T])
+    where
+        Self: Sized,
+    {
+        self.write_bytes(bytes_of_slice(val))
+    }
+}
+
+impl<'a> dyn WritableBuffer + 'a {
+    /// Writes the specified `Pod` type at the end of the buffer.
+    pub fn write<T: Pod>(&mut self, val: &T) {
+        self.write_bytes(bytes_of(val))
+    }
+
+    /// Writes the specified `Pod` slice at the end of the buffer.
+    pub fn write_slice<T: Pod>(&mut self, val: &[T]) {
+        self.write_bytes(bytes_of_slice(val))
+    }
+}
+
+impl WritableBuffer for Vec<u8> {
+    #[inline]
+    fn len(&self) -> usize {
+        self.len()
+    }
+
+    #[inline]
+    fn reserve(&mut self, additional: usize) -> Result<(), ()> {
+        self.reserve(additional);
+        Ok(())
+    }
+
+    #[inline]
+    fn resize(&mut self, new_len: usize, value: u8) {
+        self.resize(new_len, value);
+    }
+
+    #[inline]
+    fn write_bytes(&mut self, val: &[u8]) {
+        self.extend_from_slice(val)
+    }
+}
+
+/// A trait for mutable byte slices.
+///
+/// It provides convenience methods for `Pod` types.
+pub(crate) trait BytesMut {
+    fn write_at<T: Pod>(self, offset: usize, val: &T) -> Result<(), ()>;
+}
+
+impl<'a> BytesMut for &'a mut [u8] {
+    #[inline]
+    fn write_at<T: Pod>(self, offset: usize, val: &T) -> Result<(), ()> {
+        let src = bytes_of(val);
+        let dest = self.get_mut(offset..).ok_or(())?;
+        let dest = dest.get_mut(..src.len()).ok_or(())?;
+        dest.copy_from_slice(src);
+        Ok(())
+    }
+}
 
 pub(crate) fn align(offset: usize, size: usize) -> usize {
     (offset + (size - 1)) & !(size - 1)
 }
 
+#[allow(dead_code)]
 pub(crate) fn align_u64(offset: u64, size: u64) -> u64 {
     (offset + (size - 1)) & !(size - 1)
 }
@@ -12,3 +101,29 @@
     let new_len = align(buffer.len(), size);
     buffer.resize(new_len, 0);
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn bytes_mut() {
+        let data = vec![0x01, 0x23, 0x45, 0x67];
+
+        let mut bytes = data.clone();
+        bytes.extend_from_slice(bytes_of(&u16::to_be(0x89ab)));
+        assert_eq!(bytes, [0x01, 0x23, 0x45, 0x67, 0x89, 0xab]);
+
+        let mut bytes = data.clone();
+        assert_eq!(bytes.write_at(0, &u16::to_be(0x89ab)), Ok(()));
+        assert_eq!(bytes, [0x89, 0xab, 0x45, 0x67]);
+
+        let mut bytes = data.clone();
+        assert_eq!(bytes.write_at(2, &u16::to_be(0x89ab)), Ok(()));
+        assert_eq!(bytes, [0x01, 0x23, 0x89, 0xab]);
+
+        assert_eq!(bytes.write_at(3, &u16::to_be(0x89ab)), Err(()));
+        assert_eq!(bytes.write_at(4, &u16::to_be(0x89ab)), Err(()));
+        assert_eq!(vec![].write_at(0, &u32::to_be(0x89ab)), Err(()));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/parse_self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/parse_self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/parse_self.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/parse_self.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+#![cfg(feature = "read")]
 use object::{File, Object};
 use std::{env, fs};
 
@@ -5,7 +6,20 @@
 fn parse_self() {
     let exe = env::current_exe().unwrap();
     let data = fs::read(exe).unwrap();
-    let object = File::parse(&data).unwrap();
+    let object = File::parse(&*data).unwrap();
+    assert!(object.entry() != 0);
+    assert!(object.sections().count() != 0);
+}
+
+#[cfg(feature = "std")]
+#[test]
+fn parse_self_cache() {
+    use object::read::{ReadCache, ReadRef};
+    let exe = env::current_exe().unwrap();
+    let file = fs::File::open(exe).unwrap();
+    let cache = ReadCache::new(file);
+    let data = cache.range(0, cache.len().unwrap());
+    let object = File::parse(data).unwrap();
     assert!(object.entry() != 0);
     assert!(object.sections().count() != 0);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/bss.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/bss.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/bss.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/bss.rs	2021-12-09 12:01:26.000000000 +0000
@@ -41,7 +41,7 @@
 
     //std::fs::write(&"bss.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Coff);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -56,10 +56,7 @@
     assert_eq!(bss.data(), Ok(&[][..]));
 
     let section = sections.next();
-    assert!(
-        section.is_none(),
-        format!("unexpected section {:?}", section)
-    );
+    assert!(section.is_none(), "unexpected section {:?}", section);
 
     let mut symbols = object.symbols();
 
@@ -84,7 +81,7 @@
     assert_eq!(symbol.address(), 24);
 
     let symbol = symbols.next();
-    assert!(symbol.is_none(), format!("unexpected symbol {:?}", symbol));
+    assert!(symbol.is_none(), "unexpected symbol {:?}", symbol);
 }
 
 #[test]
@@ -122,7 +119,7 @@
 
     //std::fs::write(&"bss.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Elf);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -172,7 +169,7 @@
     assert_eq!(symbol.size(), 34);
 
     let symbol = symbols.next();
-    assert!(symbol.is_none(), format!("unexpected symbol {:?}", symbol));
+    assert!(symbol.is_none(), "unexpected symbol {:?}", symbol);
 }
 
 #[test]
@@ -213,7 +210,7 @@
 
     //std::fs::write(&"bss.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::MachO);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -229,10 +226,7 @@
     assert_eq!(bss.data(), Ok(&[][..]));
 
     let section = sections.next();
-    assert!(
-        section.is_none(),
-        format!("unexpected section {:?}", section)
-    );
+    assert!(section.is_none(), "unexpected section {:?}", section);
 
     let mut symbols = object.symbols();
 
@@ -257,5 +251,5 @@
     assert_eq!(symbol.address(), 24);
 
     let symbol = symbols.next();
-    assert!(symbol.is_none(), format!("unexpected symbol {:?}", symbol));
+    assert!(symbol.is_none(), "unexpected symbol {:?}", symbol);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/comdat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/comdat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/comdat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/comdat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -41,7 +41,7 @@
 
     //std::fs::write(&"comdat.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Coff);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -112,7 +112,7 @@
     assert_eq!(symbol.address(), 0);
 
     let symbol = symbols.next();
-    assert!(symbol.is_none(), format!("unexpected symbol {:?}", symbol));
+    assert!(symbol.is_none(), "unexpected symbol {:?}", symbol);
 
     let mut comdats = object.comdats();
 
@@ -158,7 +158,7 @@
 
     //std::fs::write(&"comdat.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Elf);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -209,7 +209,7 @@
     assert_eq!(symbol.address(), 0);
 
     let symbol = symbols.next();
-    assert!(symbol.is_none(), format!("unexpected symbol {:?}", symbol));
+    assert!(symbol.is_none(), "unexpected symbol {:?}", symbol);
 
     let mut comdats = object.comdats();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/common.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/common.rs	2021-12-09 12:01:26.000000000 +0000
@@ -52,7 +52,7 @@
 
     //std::fs::write(&"common.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Coff);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -92,7 +92,7 @@
     assert_eq!(symbol.size(), 0);
 
     let symbol = symbols.next();
-    assert!(symbol.is_none(), format!("unexpected symbol {:?}", symbol));
+    assert!(symbol.is_none(), "unexpected symbol {:?}", symbol);
 }
 
 #[test]
@@ -128,7 +128,7 @@
 
     //std::fs::write(&"common.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Elf);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -161,7 +161,7 @@
     assert_eq!(symbol.size(), 8);
 
     let symbol = symbols.next();
-    assert!(symbol.is_none(), format!("unexpected symbol {:?}", symbol));
+    assert!(symbol.is_none(), "unexpected symbol {:?}", symbol);
 }
 
 #[test]
@@ -200,7 +200,7 @@
 
     //std::fs::write(&"common.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::MachO);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -216,10 +216,7 @@
     assert_eq!(common.data(), Ok(&[][..]));
 
     let section = sections.next();
-    assert!(
-        section.is_none(),
-        format!("unexpected section {:?}", section)
-    );
+    assert!(section.is_none(), "unexpected section {:?}", section);
 
     let mut symbols = object.symbols();
 
@@ -244,5 +241,5 @@
     assert_eq!(symbol.address(), 8);
 
     let symbol = symbols.next();
-    assert!(symbol.is_none(), format!("unexpected symbol {:?}", symbol));
+    assert!(symbol.is_none(), "unexpected symbol {:?}", symbol);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/elf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/elf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/elf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/elf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use object::read::elf::{FileHeader, SectionHeader};
 use object::read::{Object, ObjectSymbol};
 use object::{
-    elf, read, write, Architecture, BinaryFormat, Bytes, Endianness, LittleEndian, SectionIndex,
+    elf, read, write, Architecture, BinaryFormat, Endianness, LittleEndian, SectionIndex,
     SectionKind, SymbolFlags, SymbolKind, SymbolScope, SymbolSection, U32,
 };
 use std::io::Write;
@@ -30,7 +30,7 @@
 
     //std::fs::write(&"symtab_shndx.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Elf);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -77,7 +77,7 @@
 
     //std::fs::write(&"compression.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Elf);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -114,7 +114,7 @@
 
     //std::fs::write(&"compression.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Elf);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -180,11 +180,10 @@
     let section = object.add_section(Vec::new(), b".note8".to_vec(), SectionKind::Note);
     object.section_mut(section).set_data(buffer, 8);
 
-    let bytes = object.write().unwrap();
+    let bytes = &*object.write().unwrap();
 
     //std::fs::write(&"note.o", &bytes).unwrap();
 
-    let bytes = Bytes(&bytes);
     let header = elf::FileHeader64::parse(bytes).unwrap();
     let endian: LittleEndian = header.endian().unwrap();
     let sections = header.sections(endian, bytes).unwrap();
@@ -194,11 +193,11 @@
     assert_eq!(section.sh_addralign(endian), 4);
     let mut notes = section.notes(endian, bytes).unwrap().unwrap();
     let note = notes.next().unwrap().unwrap();
-    assert_eq!(note.name(), b"name1\0");
+    assert_eq!(note.name(), b"name1");
     assert_eq!(note.desc(), b"descriptor\0");
     assert_eq!(note.n_type(endian), 1);
     let note = notes.next().unwrap().unwrap();
-    assert_eq!(note.name(), b"name2\0");
+    assert_eq!(note.name(), b"name2");
     assert_eq!(note.desc(), b"descriptor\0");
     assert_eq!(note.n_type(endian), 2);
     assert!(notes.next().unwrap().is_none());
@@ -208,11 +207,11 @@
     assert_eq!(section.sh_addralign(endian), 8);
     let mut notes = section.notes(endian, bytes).unwrap().unwrap();
     let note = notes.next().unwrap().unwrap();
-    assert_eq!(note.name(), b"name1\0");
+    assert_eq!(note.name(), b"name1");
     assert_eq!(note.desc(), b"descriptor\0");
     assert_eq!(note.n_type(endian), 1);
     let note = notes.next().unwrap().unwrap();
-    assert_eq!(note.name(), b"abc\0");
+    assert_eq!(note.name(), b"abc");
     assert_eq!(note.desc(), b"descriptor\0");
     assert_eq!(note.n_type(endian), 2);
     assert!(notes.next().unwrap().is_none());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/macho.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/macho.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/macho.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/macho.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+use object::read::macho::MachHeader;
+use object::{macho, write, Architecture, BinaryFormat, Endianness};
+
+#[test]
+// Test that segment size is valid when the first section needs alignment.
+fn issue_286_segment_file_size() {
+    let mut object = write::Object::new(
+        BinaryFormat::MachO,
+        Architecture::X86_64,
+        Endianness::Little,
+    );
+
+    let text = object.section_id(write::StandardSection::Text);
+    object.append_section_data(text, &[1; 30], 0x1000);
+
+    let bytes = &*object.write().unwrap();
+    let header = macho::MachHeader64::parse(bytes, 0).unwrap();
+    let endian: Endianness = header.endian().unwrap();
+    let mut commands = header.load_commands(endian, bytes, 0).unwrap();
+    let command = commands.next().unwrap().unwrap();
+    let (segment, _) = command.segment_64().unwrap().unwrap();
+    assert_eq!(segment.vmsize.get(endian), 30);
+    assert_eq!(segment.filesize.get(endian), 30);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,7 @@
 mod comdat;
 mod common;
 mod elf;
+mod macho;
 mod tls;
 
 #[test]
@@ -50,7 +51,7 @@
         .unwrap();
 
     let bytes = object.write().unwrap();
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Coff);
     assert_eq!(object.architecture(), Architecture::X86_64);
     assert_eq!(object.endianness(), Endianness::Little);
@@ -147,7 +148,7 @@
         .unwrap();
 
     let bytes = object.write().unwrap();
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Elf);
     assert_eq!(object.architecture(), Architecture::X86_64);
     assert_eq!(object.endianness(), Endianness::Little);
@@ -225,6 +226,108 @@
 }
 
 #[test]
+fn elf_any() {
+    for (arch, endian) in [
+        (Architecture::Aarch64, Endianness::Little),
+        (Architecture::Arm, Endianness::Little),
+        (Architecture::Avr, Endianness::Little),
+        (Architecture::Bpf, Endianness::Little),
+        (Architecture::I386, Endianness::Little),
+        (Architecture::X86_64, Endianness::Little),
+        (Architecture::X86_64_X32, Endianness::Little),
+        (Architecture::Hexagon, Endianness::Little),
+        (Architecture::Mips, Endianness::Little),
+        (Architecture::Mips64, Endianness::Little),
+        (Architecture::Msp430, Endianness::Little),
+        (Architecture::PowerPc, Endianness::Big),
+        (Architecture::PowerPc64, Endianness::Big),
+        (Architecture::Riscv32, Endianness::Little),
+        (Architecture::Riscv64, Endianness::Little),
+        (Architecture::S390x, Endianness::Big),
+        (Architecture::Sparc64, Endianness::Big),
+    ]
+    .iter()
+    .copied()
+    {
+        let mut object = write::Object::new(BinaryFormat::Elf, arch, endian);
+
+        let section = object.section_id(write::StandardSection::Data);
+        object.append_section_data(section, &[1; 30], 4);
+        let symbol = object.section_symbol(section);
+
+        object
+            .add_relocation(
+                section,
+                write::Relocation {
+                    offset: 8,
+                    size: 32,
+                    kind: RelocationKind::Absolute,
+                    encoding: RelocationEncoding::Generic,
+                    symbol,
+                    addend: 0,
+                },
+            )
+            .unwrap();
+        if arch.address_size().unwrap().bytes() >= 8 {
+            object
+                .add_relocation(
+                    section,
+                    write::Relocation {
+                        offset: 16,
+                        size: 64,
+                        kind: RelocationKind::Absolute,
+                        encoding: RelocationEncoding::Generic,
+                        symbol,
+                        addend: 0,
+                    },
+                )
+                .unwrap();
+        }
+
+        let bytes = object.write().unwrap();
+        let object = read::File::parse(&*bytes).unwrap();
+        println!("{:?}", object.architecture());
+        assert_eq!(object.format(), BinaryFormat::Elf);
+        assert_eq!(object.architecture(), arch);
+        assert_eq!(object.endianness(), endian);
+
+        let mut sections = object.sections();
+
+        let section = sections.next().unwrap();
+        println!("{:?}", section);
+        assert_eq!(section.name(), Ok(""));
+        assert_eq!(section.kind(), SectionKind::Metadata);
+        assert_eq!(section.address(), 0);
+        assert_eq!(section.size(), 0);
+
+        let data = sections.next().unwrap();
+        println!("{:?}", data);
+        assert_eq!(data.name(), Ok(".data"));
+        assert_eq!(data.kind(), SectionKind::Data);
+
+        let mut relocations = data.relocations();
+
+        let (offset, relocation) = relocations.next().unwrap();
+        println!("{:?}", relocation);
+        assert_eq!(offset, 8);
+        assert_eq!(relocation.kind(), RelocationKind::Absolute);
+        assert_eq!(relocation.encoding(), RelocationEncoding::Generic);
+        assert_eq!(relocation.size(), 32);
+        assert_eq!(relocation.addend(), 0);
+
+        if arch.address_size().unwrap().bytes() >= 8 {
+            let (offset, relocation) = relocations.next().unwrap();
+            println!("{:?}", relocation);
+            assert_eq!(offset, 16);
+            assert_eq!(relocation.kind(), RelocationKind::Absolute);
+            assert_eq!(relocation.encoding(), RelocationEncoding::Generic);
+            assert_eq!(relocation.size(), 64);
+            assert_eq!(relocation.addend(), 0);
+        }
+    }
+}
+
+#[test]
 fn macho_x86_64() {
     let mut object = write::Object::new(
         BinaryFormat::MachO,
@@ -277,7 +380,7 @@
         .unwrap();
 
     let bytes = object.write().unwrap();
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::MachO);
     assert_eq!(object.architecture(), Architecture::X86_64);
     assert_eq!(object.endianness(), Endianness::Little);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/tls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/tls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/object/tests/round_trip/tls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/object/tests/round_trip/tls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,7 +29,7 @@
 
     //std::fs::write(&"tls.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Coff);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -90,7 +90,7 @@
 
     //std::fs::write(&"tls.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::Elf);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
@@ -181,7 +181,7 @@
 
     //std::fs::write(&"tls.o", &bytes).unwrap();
 
-    let object = read::File::parse(&bytes).unwrap();
+    let object = read::File::parse(&*bytes).unwrap();
     assert_eq!(object.format(), BinaryFormat::MachO);
     assert_eq!(object.architecture(), Architecture::X86_64);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"822a0cbdf9bd857ef63fb775bbb887f685a84719fd866b5349786212b324a053","Cargo.lock":"4181aa848515ee1483b556fdd78b6d59fc025f671d46b18859880ddfa6248412","Cargo.toml":"fc4ae79cd01ea51cbe7a29a78f53b689b389f89feec10cf9383930fd05768ffd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"d7203c0e18700de8e1408c3f4bb96075df271fea9ab678f6ad2e09855aefa7ed","bors.toml":"ebd69f714a49dceb8fd10ebadfea6e2767be4732fdef49eddf6239151b4bc78c","examples/bench.rs":"1597a52529f75d6c5ad0b86759a775b1d723dfa810e2016317283b13594219da","examples/bench_acquire.rs":"9f4912ca262194cb55e893c33739c85c2f4868d07905b9dd3238552b6ce8a6e4","examples/bench_vs_lazy_static.rs":"d527294a2e73b53ac5faed8b316dfd1ae2a06adb31384134af21f10ce76333a5","examples/lazy_static.rs":"90541b093ed1d1cbb73f4097ff02cf80657e28264d281d6a31d96a708fdfea90","examples/reentrant_init_deadlocks.rs":"ff84929de27a848e5b155549caa96db5db5f030afca975f8ba3f3da640083001","examples/regex.rs":"4a2e0fb093c7f5bbe0fff8689fc0c670c5334344a1bfda376f5faa98a05d459f","examples/test_synchronization.rs":"88abd5c16275bb2f2d77eaecf369d97681404a77b8edd0021f24bfd377c46be3","src/imp_pl.rs":"3b38a5ab0e2b9321b860bd45ccda45d804a5d7cd967b0b1b0c24f93b69eaebb9","src/imp_std.rs":"48121b9079e7289f0749f6e6612553ad587f246f72cd69ad2f1b7c6762bdffa6","src/lib.rs":"2abf26aa938010d546c93cffa9bb31ec1ed9e7522a420e1e144933abc636e081","src/race.rs":"e9110c6673e7ccaee86803e023dd149b74843e372288ef6804e927495a09d597","tests/it.rs":"e701bafda21026c9ea0c3668f9d74debae288b1a576ab3c70c356056efb3f8f9"},"package":"13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"abb8c3977a69e288097ac9e6d86c78b95170fabcaa4454ce3250e06f6fc388ab","Cargo.lock":"8904e3dc1908b63c1c81005d34a1e5e498c639a65f05d306b3388bc88a919f3a","Cargo.toml":"0ab421ab8c48cc6410965fd82a82dbaec19bb8b24adb7bf0cab07870fac472e9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"7e93eec9a4c6c38db0eb3851c1e868c55e64ff2bacc86380d601a2ee08a11589","bors.toml":"ebd69f714a49dceb8fd10ebadfea6e2767be4732fdef49eddf6239151b4bc78c","examples/bench.rs":"1597a52529f75d6c5ad0b86759a775b1d723dfa810e2016317283b13594219da","examples/bench_acquire.rs":"9f4912ca262194cb55e893c33739c85c2f4868d07905b9dd3238552b6ce8a6e4","examples/bench_vs_lazy_static.rs":"d527294a2e73b53ac5faed8b316dfd1ae2a06adb31384134af21f10ce76333a5","examples/lazy_static.rs":"90541b093ed1d1cbb73f4097ff02cf80657e28264d281d6a31d96a708fdfea90","examples/reentrant_init_deadlocks.rs":"ff84929de27a848e5b155549caa96db5db5f030afca975f8ba3f3da640083001","examples/regex.rs":"4a2e0fb093c7f5bbe0fff8689fc0c670c5334344a1bfda376f5faa98a05d459f","examples/test_synchronization.rs":"88abd5c16275bb2f2d77eaecf369d97681404a77b8edd0021f24bfd377c46be3","src/imp_pl.rs":"cac67286119fcfa2b69ffb9ada51d5cb57c89e95a533d95d5d40b0ae4d38a6c2","src/imp_std.rs":"7a9b58444f71ca3025655f060dabc0f33a775d3b27916e9c22fe4182b286265d","src/lib.rs":"80c30678f1583e6abf5105c704650564505556cf97e30ab507acf70d5e90d25a","src/race.rs":"4b19f459ac16605353e4b6559ea3b194f45c3812aa157e2c0e3a82f67ebacfeb","tests/it.rs":"ed9ff44665f29fa138055800d7199405740bce912f9c568c11aa2ff2249c17f8"},"package":"692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -29,26 +29,18 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "cloudabi"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
 name = "crossbeam-utils"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "instant"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -61,12 +53,12 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lock_api"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -79,42 +71,44 @@
 
 [[package]]
 name = "once_cell"
-version = "1.5.2"
+version = "1.8.0"
 dependencies = [
  "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parking_lot"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "instant 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lock_api 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "instant 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudabi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "instant 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "instant 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.97 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.57"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "regex"
@@ -143,7 +137,7 @@
 
 [[package]]
 name = "smallvec"
-version = "1.4.2"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -187,22 +181,21 @@
 "checksum aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282"
 "checksum autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
 "checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-"checksum cloudabi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
 "checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-"checksum instant 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
+"checksum instant 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
-"checksum lock_api 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
+"checksum libc 0.2.97 (registry+https://github.com/rust-lang/crates.io-index)" = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
+"checksum lock_api 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum parking_lot 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
-"checksum parking_lot_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
-"checksum redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)" = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+"checksum parking_lot 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+"checksum parking_lot_core 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+"checksum redox_syscall 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
 "checksum regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6b23da8dfd98a84bd7e08700190a5d9f7d2d38abd4369dd1dae651bc40bfd2cc"
 "checksum regex-syntax 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bfaca88e749e19dffb60f77b55e5d87a872fac7e9e48598f7cf93b2d8c047b0a"
 "checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-"checksum smallvec 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
+"checksum smallvec 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum ucd-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f3bf5cdf1df6b578c0947a94d4740bbb2b2afd1b898e33df1ff07b555a335e4"
 "checksum utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd70f467df6810094968e2fce0ee1bd0e87157aceb026a8c083bcf5e25b9efe4"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,9 +13,9 @@
 [package]
 edition = "2018"
 name = "once_cell"
-version = "1.5.2"
+version = "1.8.0"
 authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]
-exclude = ["*.png", "*.svg", "/Cargo.lock.min", "/.travis.yml", "/run-miri-tests.sh", "rustfmt.toml"]
+exclude = ["*.png", "*.svg", "/Cargo.lock.msrv", "/.travis.yml", "/run-miri-tests.sh", "rustfmt.toml"]
 description = "Single assignment cells and lazy values."
 documentation = "https://docs.rs/once_cell"
 readme = "README.md"
@@ -67,7 +67,8 @@
 version = "1.2.0"
 
 [features]
-alloc = []
+alloc = ["race"]
 default = ["std"]
+race = []
 std = ["alloc"]
 unstable = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,31 @@
 # Changelog
 
+## 1.8.0
+
+- Add `try_insert` API -- a version of `set` that returns a reference.
+
+## 1.7.2
+
+- Improve code size when using parking_lot feature.
+
+## 1.7.1
+
+- Fix `race::OnceBox<T>` to also impl `Default` even if `T` doesn't impl `Default`.
+
+## 1.7.0
+
+- Hide the `race` module behind (default) `race` feature.
+  Turns out that adding `race` by default was a breaking change on some platforms without atomics.
+  In this release, we make the module opt-out.
+  Technically, this is a breaking change for those who use `race` with `no_default_features`.
+  Given that the `race` module itself only several days old, the breakage is deemed acceptable.
+
+## 1.6.0
+
+- Add `Lazy::into_value`
+- Stabilize `once_cell::race` module for "first one wins" no_std-compatible initialization flavor.
+- Migrate from deprecated `compare_and_swap` to `compare_exchange`.
+
 ## 1.5.2
 
 - `OnceBox` API uses `Box<T>`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-<p align="center"><img src="design/logo.png" alt="once_cell" height="300px"></p>
+<p align="center"><img src="design/logo.png" alt="once_cell"></p>
 
 
 [![Build Status](https://travis-ci.org/matklad/once_cell.svg?branch=master)](https://travis-ci.org/matklad/once_cell)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/src/imp_pl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/src/imp_pl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/src/imp_pl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/src/imp_pl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,6 +7,8 @@
 
 use parking_lot::Mutex;
 
+use crate::take_unchecked;
+
 pub(crate) struct OnceCell<T> {
     mutex: Mutex<()>,
     is_initialized: AtomicBool,
@@ -46,8 +48,10 @@
     where
         F: FnOnce() -> Result<T, E>,
     {
-        let _guard = self.mutex.lock();
-        if !self.is_initialized() {
+        let mut f = Some(f);
+        let mut res: Result<(), E> = Ok(());
+        let slot: *mut Option<T> = self.value.get();
+        initialize_inner(&self.mutex, &self.is_initialized, &mut || {
             // We are calling user-supplied function and need to be careful.
             // - if it returns Err, we unlock mutex and return without touching anything
             // - if it panics, we unlock mutex and propagate panic without touching anything
@@ -56,15 +60,22 @@
             //   but that is more complicated
             // - finally, if it returns Ok, we store the value and store the flag with
             //   `Release`, which synchronizes with `Acquire`s.
-            let value = f()?;
-            // Safe b/c we have a unique access and no panic may happen
-            // until the cell is marked as initialized.
-            let slot: &mut Option<T> = unsafe { &mut *self.value.get() };
-            debug_assert!(slot.is_none());
-            *slot = Some(value);
-            self.is_initialized.store(true, Ordering::Release);
-        }
-        Ok(())
+            let f = unsafe { take_unchecked(&mut f) };
+            match f() {
+                Ok(value) => unsafe {
+                    // Safe b/c we have a unique access and no panic may happen
+                    // until the cell is marked as initialized.
+                    debug_assert!((*slot).is_none());
+                    *slot = Some(value);
+                    true
+                },
+                Err(err) => {
+                    res = Err(err);
+                    false
+                }
+            }
+        });
+        res
     }
 
     /// Get the reference to the underlying value, without checking if the cell
@@ -102,6 +113,18 @@
     }
 }
 
+// Note: this is intentionally monomorphic
+#[inline(never)]
+fn initialize_inner(mutex: &Mutex<()>, is_initialized: &AtomicBool, init: &mut dyn FnMut() -> bool) {
+    let _guard = mutex.lock();
+
+    if !is_initialized.load(Ordering::Acquire) {
+        if init() {
+            is_initialized.store(true, Ordering::Release);
+        }
+    }
+}
+
 #[test]
 fn test_size() {
     use std::mem::size_of;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/src/imp_std.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/src/imp_std.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/src/imp_std.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/src/imp_std.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,6 +12,8 @@
     thread::{self, Thread},
 };
 
+use crate::take_unchecked;
+
 #[derive(Debug)]
 pub(crate) struct OnceCell<T> {
     // This `state` word is actually an encoded version of just a pointer to a
@@ -89,7 +91,7 @@
         let mut res: Result<(), E> = Ok(());
         let slot: *mut Option<T> = self.value.get();
         initialize_inner(&self.state_and_queue, &mut || {
-            let f = f.take().unwrap();
+            let f = unsafe { take_unchecked(&mut f) };
             match f() {
                 Ok(value) => {
                     unsafe { *slot = Some(value) };
@@ -144,6 +146,7 @@
 
 // Corresponds to `std::sync::Once::call_inner`
 // Note: this is intentionally monomorphic
+#[inline(never)]
 fn initialize_inner(my_state_and_queue: &AtomicUsize, init: &mut dyn FnMut() -> bool) -> bool {
     let mut state_and_queue = my_state_and_queue.load(Ordering::Acquire);
 
@@ -151,12 +154,13 @@
         match state_and_queue {
             COMPLETE => return true,
             INCOMPLETE => {
-                let old = my_state_and_queue.compare_and_swap(
+                let exchange = my_state_and_queue.compare_exchange(
                     state_and_queue,
                     RUNNING,
                     Ordering::Acquire,
+                    Ordering::Acquire,
                 );
-                if old != state_and_queue {
+                if let Err(old) = exchange {
                     state_and_queue = old;
                     continue;
                 }
@@ -193,8 +197,13 @@
         };
         let me = &node as *const Waiter as usize;
 
-        let old = state_and_queue.compare_and_swap(current_state, me | RUNNING, Ordering::Release);
-        if old != current_state {
+        let exchange = state_and_queue.compare_exchange(
+            current_state,
+            me | RUNNING,
+            Ordering::Release,
+            Ordering::Relaxed,
+        );
+        if let Err(old) = exchange {
             current_state = old;
             continue;
         }
@@ -253,6 +262,7 @@
     }
 
     #[test]
+    #[cfg(not(miri))]
     fn stampede_once() {
         static O: OnceCell<()> = OnceCell::new();
         static mut RUN: bool = false;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 //!
 //! ```rust,ignore
 //! impl<T> OnceCell<T> {
-//!     fn new() -> OnceCell<T> { ... }
+//!     const fn new() -> OnceCell<T> { ... }
 //!     fn set(&self, value: T) -> Result<(), T> { ... }
 //!     fn get(&self) -> Option<&T> { ... }
 //! }
@@ -24,11 +24,11 @@
 //! [`Mutex`]: https://doc.rust-lang.org/std/sync/struct.Mutex.html
 //! [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
 //!
-//! # Patterns
+//! # Recipes
 //!
 //! `OnceCell` might be useful for a variety of patterns.
 //!
-//! ## Safe Initialization of global data
+//! ## Safe Initialization of Global Data
 //!
 //! ```rust
 //! use std::{env, io};
@@ -59,7 +59,7 @@
 //! }
 //! ```
 //!
-//! ## Lazy initialized global data
+//! ## Lazy Initialized Global Data
 //!
 //! This is essentially the `lazy_static!` macro, but without a macro.
 //!
@@ -97,6 +97,9 @@
 //! }
 //! ```
 //!
+//! Note that the variable that holds `Lazy` is declared as `static`, *not*
+//! `const`. This is important: using `const` instead compiles, but works wrong.
+//!
 //! [`sync::Lazy`]: sync/struct.Lazy.html
 //! [`unsync::Lazy`]: unsync/struct.Lazy.html
 //!
@@ -139,10 +142,9 @@
 //! }
 //! ```
 //!
-//! ## Building block
+//! ## Lazily Compiled Regex
 //!
-//! Naturally, it is  possible to build other abstractions on top of `OnceCell`.
-//! For example, this is a `regex!` macro which takes a string literal and returns an
+//! This is a `regex!` macro which takes a string literal and returns an
 //! *expression* that evaluates to a `&'static Regex`:
 //!
 //! ```
@@ -156,7 +158,51 @@
 //!
 //! This macro can be useful to avoid the "compile regex on every loop iteration" problem.
 //!
-//! Another pattern would be a `LateInit` type for delayed initialization:
+//! ## Runtime `include_bytes!`
+//!
+//! The `include_bytes` macro is useful to include test resources, but it slows
+//! down test compilation a lot. An alternative is to load the resources at
+//! runtime:
+//!
+//! ```
+//! use std::path::Path;
+//!
+//! use once_cell::sync::OnceCell;
+//!
+//! pub struct TestResource {
+//!     path: &'static str,
+//!     cell: OnceCell<Vec<u8>>,
+//! }
+//!
+//! impl TestResource {
+//!     pub const fn new(path: &'static str) -> TestResource {
+//!         TestResource { path, cell: OnceCell::new() }
+//!     }
+//!     pub fn bytes(&self) -> &[u8] {
+//!         self.cell.get_or_init(|| {
+//!             let dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
+//!             let path = Path::new(dir.as_str()).join(self.path);
+//!             std::fs::read(&path).unwrap_or_else(|_err| {
+//!                 panic!("failed to load test resource: {}", path.display())
+//!             })
+//!         }).as_slice()
+//!     }
+//! }
+//!
+//! static TEST_IMAGE: TestResource = TestResource::new("test_data/lena.png");
+//!
+//! #[test]
+//! fn test_sobel_filter() {
+//!     let rgb: &[u8] = TEST_IMAGE.bytes();
+//!     // ...
+//! # drop(rgb);
+//! }
+//! ```
+//!
+//! ## `lateinit`
+//!
+//! `LateInit` type for delayed initialization. It is reminiscent of Kotlin's
+//! `lateinit` keyword and allows construction of cyclic data structures:
 //!
 //!
 //! ```
@@ -233,10 +279,11 @@
 //! and [`lazy_cell`](https://github.com/indiv0/lazycell/) crates and [`std::sync::Once`]. In some sense,
 //! `once_cell` just streamlines and unifies those APIs.
 //!
-//! To implement a sync flavor of `OnceCell`, this crates uses either a custom re-implementation of
-//! `std::sync::Once` or `parking_lot::Mutex`. This is controlled by the `parking_lot` feature, which
-//! is enabled by default. Performance is the same for both cases, but the `parking_lot` based `OnceCell<T>`
-//! is smaller by up to 16 bytes.
+//! To implement a sync flavor of `OnceCell`, this crates uses either a custom
+//! re-implementation of `std::sync::Once` or `parking_lot::Mutex`. This is
+//! controlled by the `parking_lot` feature (disabled by default). Performance
+//! is the same for both cases, but the `parking_lot` based `OnceCell<T>` is
+//! smaller by up to 16 bytes.
 //!
 //! This crate uses `unsafe`.
 //!
@@ -277,7 +324,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(feature = "unstable")]
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
@@ -291,10 +337,11 @@
 #[path = "imp_std.rs"]
 mod imp;
 
+/// Single-threaded version of `OnceCell`.
 pub mod unsync {
     use core::{
         cell::{Cell, UnsafeCell},
-        fmt, mem,
+        fmt, hint, mem,
         ops::{Deref, DerefMut},
     };
 
@@ -417,9 +464,29 @@
         /// assert!(cell.get().is_some());
         /// ```
         pub fn set(&self, value: T) -> Result<(), T> {
-            let slot = unsafe { &*self.inner.get() };
-            if slot.is_some() {
-                return Err(value);
+            match self.try_insert(value) {
+                Ok(_) => Ok(()),
+                Err((_, value)) => Err(value),
+            }
+        }
+
+        /// Like [`set`](Self::set), but also returns a referce to the final cell value.
+        ///
+        /// # Example
+        /// ```
+        /// use once_cell::unsync::OnceCell;
+        ///
+        /// let cell = OnceCell::new();
+        /// assert!(cell.get().is_none());
+        ///
+        /// assert_eq!(cell.try_insert(92), Ok(&92));
+        /// assert_eq!(cell.try_insert(62), Err((&92, 62)));
+        ///
+        /// assert!(cell.get().is_some());
+        /// ```
+        pub fn try_insert(&self, value: T) -> Result<&T, (&T, T)> {
+            if let Some(old) = self.get() {
+                return Err((old, value));
             }
             let slot = unsafe { &mut *self.inner.get() };
             // This is the only place where we set the slot, no races
@@ -427,7 +494,10 @@
             // checked that slot is currently `None`, so this write
             // maintains the `inner`'s invariant.
             *slot = Some(value);
-            Ok(())
+            Ok(match &*slot {
+                Some(value) => value,
+                None => unsafe { hint::unreachable_unchecked() },
+            })
         }
 
         /// Gets the contents of the cell, initializing it with `f`
@@ -599,6 +669,17 @@
         pub const fn new(init: F) -> Lazy<T, F> {
             Lazy { cell: OnceCell::new(), init: Cell::new(Some(init)) }
         }
+
+        /// Consumes this `Lazy` returning the stored value.
+        ///
+        /// Returns `Ok(value)` if `Lazy` is initialized and `Err(f)` otherwise.
+        pub fn into_value(this: Lazy<T, F>) -> Result<T, F> {
+            let cell = this.cell;
+            let init = this.init;
+            cell.into_inner().ok_or_else(|| {
+                init.take().unwrap_or_else(|| panic!("Lazy instance has previously been poisoned"))
+            })
+        }
     }
 
     impl<T, F: FnOnce() -> T> Lazy<T, F> {
@@ -646,6 +727,7 @@
     }
 }
 
+/// Thread-safe, blocking version of `OnceCell`.
 #[cfg(feature = "std")]
 pub mod sync {
     use std::{
@@ -792,11 +874,33 @@
         /// }
         /// ```
         pub fn set(&self, value: T) -> Result<(), T> {
+            match self.try_insert(value) {
+                Ok(_) => Ok(()),
+                Err((_, value)) => Err(value),
+            }
+        }
+
+        /// Like [`set`](Self::set), but also returns a reference to the final cell value.
+        ///
+        /// # Example
+        ///
+        /// ```
+        /// use once_cell::unsync::OnceCell;
+        ///
+        /// let cell = OnceCell::new();
+        /// assert!(cell.get().is_none());
+        ///
+        /// assert_eq!(cell.try_insert(92), Ok(&92));
+        /// assert_eq!(cell.try_insert(62), Err((&92, 62)));
+        ///
+        /// assert!(cell.get().is_some());
+        /// ```
+        pub fn try_insert(&self, value: T) -> Result<&T, (&T, T)> {
             let mut value = Some(value);
-            self.get_or_init(|| value.take().unwrap());
+            let res = self.get_or_init(|| value.take().unwrap());
             match value {
-                None => Ok(()),
-                Some(value) => Err(value),
+                None => Ok(res),
+                Some(value) => Err((res, value)),
             }
         }
 
@@ -963,11 +1067,10 @@
         }
     }
 
-    // We never create a `&F` from a `&Lazy<T, F>` so it is fine
-    // to not impl `Sync` for `F`
-    // we do create a `&mut Option<F>` in `force`, but this is
-    // properly synchronized, so it only happens once
-    // so it also does not contribute to this impl.
+    // We never create a `&F` from a `&Lazy<T, F>` so it is fine to not impl
+    // `Sync` for `F`. we do create a `&mut Option<F>` in `force`, but this is
+    // properly synchronized, so it only happens once so it also does not
+    // contribute to this impl.
     unsafe impl<T, F: Send> Sync for Lazy<T, F> where OnceCell<T>: Sync {}
     // auto-derived `Send` impl is OK.
 
@@ -980,6 +1083,17 @@
         pub const fn new(f: F) -> Lazy<T, F> {
             Lazy { cell: OnceCell::new(), init: Cell::new(Some(f)) }
         }
+
+        /// Consumes this `Lazy` returning the stored value.
+        ///
+        /// Returns `Ok(value)` if `Lazy` is initialized and `Err(f)` otherwise.
+        pub fn into_value(this: Lazy<T, F>) -> Result<T, F> {
+            let cell = this.cell;
+            let init = this.init;
+            cell.into_inner().ok_or_else(|| {
+                init.take().unwrap_or_else(|| panic!("Lazy instance has previously been poisoned"))
+            })
+        }
     }
 
     impl<T, F: FnOnce() -> T> Lazy<T, F> {
@@ -1043,5 +1157,16 @@
     fn _dummy() {}
 }
 
-#[cfg(feature = "unstable")]
+#[cfg(feature = "race")]
 pub mod race;
+
+#[cfg(feature = "std")]
+unsafe fn take_unchecked<T>(val: &mut Option<T>) -> T {
+    match val.take() {
+        Some(it) => it,
+        None => {
+            debug_assert!(false);
+            std::hint::unreachable_unchecked()
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/src/race.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/src/race.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/src/race.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/src/race.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-//! "First one wins" flavor of `OnceCell`.
+//! Thread-safe, non-blocking, "first one wins" flavor of `OnceCell`.
 //!
 //! If two threads race to initialize a type from the `race` module, they
 //! don't block, execute initialization function together, but only one of
@@ -19,11 +19,13 @@
 
 impl OnceNonZeroUsize {
     /// Creates a new empty cell.
+    #[inline]
     pub const fn new() -> OnceNonZeroUsize {
         OnceNonZeroUsize { inner: AtomicUsize::new(0) }
     }
 
     /// Gets the underlying value.
+    #[inline]
     pub fn get(&self) -> Option<NonZeroUsize> {
         let val = self.inner.load(Ordering::Acquire);
         NonZeroUsize::new(val)
@@ -33,12 +35,13 @@
     ///
     /// Returns `Ok(())` if the cell was empty and `Err(())` if it was
     /// full.
+    #[inline]
     pub fn set(&self, value: NonZeroUsize) -> Result<(), ()> {
-        let val = self.inner.compare_and_swap(0, value.get(), Ordering::AcqRel);
-        if val == 0 {
-            Ok(())
-        } else {
-            Err(())
+        let exchange =
+            self.inner.compare_exchange(0, value.get(), Ordering::AcqRel, Ordering::Acquire);
+        match exchange {
+            Ok(_) => Ok(()),
+            Err(_) => Err(()),
         }
     }
 
@@ -75,9 +78,10 @@
             Some(it) => it,
             None => {
                 let mut val = f()?.get();
-                let old_val = self.inner.compare_and_swap(0, val, Ordering::AcqRel);
-                if old_val != 0 {
-                    val = old_val;
+                let exchange =
+                    self.inner.compare_exchange(0, val, Ordering::AcqRel, Ordering::Acquire);
+                if let Err(old) = exchange {
+                    val = old;
                 }
                 unsafe { NonZeroUsize::new_unchecked(val) }
             }
@@ -94,11 +98,13 @@
 
 impl OnceBool {
     /// Creates a new empty cell.
+    #[inline]
     pub const fn new() -> OnceBool {
         OnceBool { inner: OnceNonZeroUsize::new() }
     }
 
     /// Gets the underlying value.
+    #[inline]
     pub fn get(&self) -> Option<bool> {
         self.inner.get().map(OnceBool::from_usize)
     }
@@ -107,6 +113,7 @@
     ///
     /// Returns `Ok(())` if the cell was empty and `Err(())` if it was
     /// full.
+    #[inline]
     pub fn set(&self, value: bool) -> Result<(), ()> {
         self.inner.set(OnceBool::to_usize(value))
     }
@@ -138,9 +145,11 @@
         self.inner.get_or_try_init(|| f().map(OnceBool::to_usize)).map(OnceBool::from_usize)
     }
 
+    #[inline]
     fn from_usize(value: NonZeroUsize) -> bool {
         value.get() == 1
     }
+    #[inline]
     fn to_usize(value: bool) -> NonZeroUsize {
         unsafe { NonZeroUsize::new_unchecked(if value { 1 } else { 2 }) }
     }
@@ -148,22 +157,30 @@
 
 #[cfg(feature = "alloc")]
 pub use self::once_box::OnceBox;
+
 #[cfg(feature = "alloc")]
 mod once_box {
-    use alloc::boxed::Box;
     use core::{
         marker::PhantomData,
         ptr,
         sync::atomic::{AtomicPtr, Ordering},
     };
 
+    use alloc::boxed::Box;
+
     /// A thread-safe cell which can be written to only once.
-    #[derive(Default, Debug)]
+    #[derive(Debug)]
     pub struct OnceBox<T> {
         inner: AtomicPtr<T>,
         ghost: PhantomData<Option<Box<T>>>,
     }
 
+    impl<T> Default for OnceBox<T> {
+        fn default() -> Self {
+            Self::new()
+        }
+    }
+
     impl<T> Drop for OnceBox<T> {
         fn drop(&mut self) {
             let ptr = *self.inner.get_mut();
@@ -194,8 +211,13 @@
         /// full.
         pub fn set(&self, value: Box<T>) -> Result<(), Box<T>> {
             let ptr = Box::into_raw(value);
-            let old_ptr = self.inner.compare_and_swap(ptr::null_mut(), ptr, Ordering::AcqRel);
-            if !old_ptr.is_null() {
+            let exchange = self.inner.compare_exchange(
+                ptr::null_mut(),
+                ptr,
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            );
+            if let Err(_) = exchange {
                 let value = unsafe { Box::from_raw(ptr) };
                 return Err(value);
             }
@@ -235,16 +257,23 @@
             if ptr.is_null() {
                 let val = f()?;
                 ptr = Box::into_raw(val);
-                let old_ptr = self.inner.compare_and_swap(ptr::null_mut(), ptr, Ordering::AcqRel);
-                if !old_ptr.is_null() {
+                let exchange = self.inner.compare_exchange(
+                    ptr::null_mut(),
+                    ptr,
+                    Ordering::AcqRel,
+                    Ordering::Acquire,
+                );
+                if let Err(old) = exchange {
                     drop(unsafe { Box::from_raw(ptr) });
-                    ptr = old_ptr;
+                    ptr = old;
                 }
             };
             Ok(unsafe { &*ptr })
         }
     }
 
+    unsafe impl<T: Sync + Send> Sync for OnceBox<T> {}
+
     /// ```compile_fail
     /// struct S(*mut ());
     /// unsafe impl Sync for S {}
@@ -252,5 +281,5 @@
     /// fn share<T: Sync>(_: &T) {}
     /// share(&once_cell::race::OnceBox::<S>::new());
     /// ```
-    unsafe impl<T: Sync + Send> Sync for OnceBox<T> {}
+    fn _dummy() {}
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/tests/it.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/tests/it.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/once_cell/tests/it.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/once_cell/tests/it.rs	2021-12-09 12:01:26.000000000 +0000
@@ -156,6 +156,15 @@
     }
 
     #[test]
+    fn lazy_into_value() {
+        let l: Lazy<i32, _> = Lazy::new(|| panic!());
+        assert!(matches!(Lazy::into_value(l), Err(_)));
+        let l = Lazy::new(|| -> i32 { 92 });
+        Lazy::force(&l);
+        assert!(matches!(Lazy::into_value(l), Ok(92)));
+    }
+
+    #[test]
     #[cfg(feature = "std")]
     fn lazy_poisoning() {
         let x: Lazy<String> = Lazy::new(|| panic!("kaboom"));
@@ -468,6 +477,15 @@
     }
 
     #[test]
+    fn lazy_into_value() {
+        let l: Lazy<i32, _> = Lazy::new(|| panic!());
+        assert!(matches!(Lazy::into_value(l), Err(_)));
+        let l = Lazy::new(|| -> i32 { 92 });
+        Lazy::force(&l);
+        assert!(matches!(Lazy::into_value(l), Ok(92)));
+    }
+
+    #[test]
     fn lazy_poisoning() {
         let x: Lazy<String> = Lazy::new(|| panic!("kaboom"));
         for _ in 0..2 {
@@ -571,7 +589,7 @@
     }
 }
 
-#[cfg(feature = "unstable")]
+#[cfg(feature = "race")]
 mod race {
     use std::{
         num::NonZeroUsize,
@@ -707,7 +725,7 @@
     }
 }
 
-#[cfg(all(feature = "unstable", feature = "alloc"))]
+#[cfg(all(feature = "race", feature = "alloc"))]
 mod race_once_box {
     use std::sync::{
         atomic::{AtomicUsize, Ordering::SeqCst},
@@ -841,4 +859,12 @@
         });
         assert_eq!(res, "hello");
     }
+
+    #[test]
+    fn once_box_default() {
+        struct Foo;
+
+        let cell: OnceBox<Foo> = Default::default();
+        assert!(cell.get().is_none());
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"316df812f280ae0c584b6132630119bea8de32864c29772100f9bb8352196381","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"d5c22aa3118d240e877ad41c5d9fa232f9c77d757d4aac0c2f943afc0a95e0ef","src/lib.rs":"2d7d563f4a4df4b0583d6370046642103e4909f0ec2002768308f951f2d7e05c"},"package":"2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "opaque-debug"
-version = "0.2.3"
-authors = ["RustCrypto Developers"]
-description = "Macro for opaque Debug trait implementation"
-documentation = "https://docs.rs/opaque-debug"
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/RustCrypto/utils"
-
-[dependencies]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2018-2019 The RustCrypto Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/opaque-debug-0.2.3/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/opaque-debug-0.2.3/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-//! Macro for opaque `Debug` trait implementation.
-#![no_std]
-
-#[doc(hidden)]
-pub extern crate core as __core;
-
-/// Macro for defining opaque `Debug` implementation.
-///
-/// It will use the following format: "StructName { ... }". While it's
-/// convinient to have it (e.g. for including into other structs), it could be
-/// undesirable to leak internall state, which can happen for example through
-/// uncareful logging.
-#[macro_export]
-macro_rules! impl_opaque_debug {
-    ($struct:ty) => {
-        impl $crate::__core::fmt::Debug for $struct {
-            fn fmt(&self, f: &mut $crate::__core::fmt::Formatter)
-                -> Result<(), $crate::__core::fmt::Error>
-            {
-                write!(f, concat!(stringify!($struct), " {{ ... }}"))
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![allow(clippy::inconsistent_digit_grouping)]
+#![allow(clippy::inconsistent_digit_grouping, clippy::unusual_byte_groupings)]
 
 use std::env;
 
@@ -35,6 +35,9 @@
         if version >= 0x1_01_01_00_0 {
             println!("cargo:rustc-cfg=ossl111");
         }
+        if version >= 0x3_00_00_00_0 {
+            println!("cargo:rustc-cfg=ossl300");
+        }
     }
 
     if let Ok(version) = env::var("DEP_OPENSSL_LIBRESSL_VERSION_NUMBER") {
@@ -67,5 +70,9 @@
         if version >= 0x3_02_01_00_0 {
             println!("cargo:rustc-cfg=libressl321");
         }
+
+        if version >= 0x3_03_02_00_0 {
+            println!("cargo:rustc-cfg=libressl332");
+        }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"c0d825b3e9441626f3a6f950afbeb5e9bef4513252c76c4ffe3672bca87cb293","Cargo.lock":"aa31d5123c27e38cc9d9f80d2880344dc4d63ee22240e07b46676cd8956ebe2c","Cargo.toml":"6fbcad79fc9d6d5499d61ff65666e88d92a975720e22479f4ef7e1780ab3b3d6","LICENSE":"f3d4287b4a21c5176fea2f9bd4ae800696004e2fb8e05cbc818be513f188a941","README.md":"18071782a20c51379733d7c2041c6755a11326d0153d8c7c3073875d7870da42","build.rs":"c919e9b1a59730d9373ffdc44d066bc4aa3d3ea7597bd1600f2e28dcb4f40db7","examples/mk_certs.rs":"0e892bff9bd0b4f736f4047669fad081f3a91b2054d429fc3703578983373aee","src/aes.rs":"543695af23713706c52b44800e7c2ff5df990bdff874ce6989ad72cd11a866ea","src/asn1.rs":"53fee591ad9163cb5c0a7ea200d27feff6c309e360bc35acdf6207188d9c7535","src/base64.rs":"1203211ca30a09389ce337ffd5bfae0663f03cc19150ac21cf491080de9f488c","src/bio.rs":"69d92d161c568fee5d43747f442791c6ef5f6f39ab96569d3ff36eb68321ba0f","src/bn.rs":"8f6ca6c59fe2694e5aff88382ff2caca1eb64f1e4d497a830578b053f4adc2d2","src/cms.rs":"148664a32a5066b43fbb66d96d3d2f15dd701b7f0bd2354cbe0f08667d380878","src/conf.rs":"9ed5ab5d62bf1e8143eb4d7459dd247a943612a2ea41d00216597870a02d73aa","src/derive.rs":"4fdf6a818056abe25cff7b1315f40f5ea60915fef50c9f7e43282c825df84528","src/dh.rs":"0b912b1486be12b4c327d966873af9d2db2e2011b16ca2e86e7a01611c63e6cd","src/dsa.rs":"ebbf30a3fe337194dde70d1ff6858677fb70bc1181e5bf348f76f9f0c91f4e38","src/ec.rs":"864e4bb6c488d35e032808071b2afbe7775412ed76ed96cae5450864d76420a0","src/ecdsa.rs":"b606855cf2437cd40d180c81947bf357cec9fb6a8e64603f5f2e59fada0cb280","src/envelope.rs":"79709a79d9e15050393bced3513e20cbeceb8a7524948558e68e48efeb244665","src/error.rs":"71105200e8134f72c265f908c9e8e13fad72fa525398fa2fe37645438fbc063f","src/ex_data.rs":"0a58a3a274a4ef2251dadb64cbcd44b43710d252201b137ecfb91cf14373c04f","src/fips.rs":"7ab6b136e69ad60c58f7d75a141c828a62579b739130623883847f5f474a0eee","src/hash.rs":"0897b1784cce138edfc6354f7663b69b0f7597dad06a48ed512c56ac821b6567","src/lib.rs":"486da9752998dc16669e0c81691c9400879bbd68284e5fbb100a3ba51659bbfa","src/macros.rs":"947ec33eea19dab5b3f1f5f79927ba5f940207bfc01a83f850da268b983e7f37","src/memcmp.rs":"8800e092d2e625816a0c0f687ca34fa7eea756a329a5ea3d17c7fe4fca7cd9ed","src/nid.rs":"7954eea28ea388173ad445a94bafbef14466d71f8c10c7ad17decdd817e141a4","src/ocsp.rs":"47cbac068ce4754d0b3b2871fffeac500fd3b1595fef87a4f0de915f50324919","src/pkcs12.rs":"d007b8693d2f7ae0f28df18abb8ca2ee175195feb07fd993e0362cba66e70068","src/pkcs5.rs":"c5697c62fec157c4674951d9bce6d6b512d9396c677afd605d3927e6bcf87f54","src/pkcs7.rs":"7bb292d1529d7f209bc1bce552bce76cf312c76b547961641fd7ea423ae6d37c","src/pkey.rs":"415723aa8d67aaa069b8cb6c931a72b3e46166a1b0daff909578d9d8982dc554","src/rand.rs":"729d31aad059b19b3a3e96e06ef99f7d8842c99758e77d70dd1abda55b32cc63","src/rsa.rs":"47908c022804fb66746c786f3d4f292207fb3d94d802802ffbb375442d22420a","src/sha.rs":"8419aadb65404ee2d585402b7f4e3785b69b6b30e5fbcab1c2c96c60e96bf80f","src/sign.rs":"134989bb8a1826b9957628c78d817b94c09c2ff9bca9e764b6a429cdff76f825","src/srtp.rs":"a5cc94441792aea623e51eb489245df383b48ff074e4a99cef4fd18a1a186cc6","src/ssl/bio.rs":"d2b4c3a8d6585b447a30625ef3ffdf7b061b3caa7bf7fcc63776e6345b4d71f4","src/ssl/callbacks.rs":"eaea2e293b20b12045234cfcea00c6e8b4f03bf916c1a566b1c9b1a755b915f9","src/ssl/connector.rs":"faacdc2dbde70f88e2f39495878c7dddd8c51d196655b593dd44c97114acc1d7","src/ssl/error.rs":"dfe141666ae82b9e93c95ac5f1c9d540075f7f09fdf1b4e4e49c5518b5fb6346","src/ssl/mod.rs":"34ebbb5d19eb7f7dacd1eecea33b4ea2831c77fe12a5e038f721293247e81337","src/ssl/test/mod.rs":"8da1597731c2e8304ff203be0d4bcb816c065a0bd9af0dabde828e356f8832bc","src/ssl/test/server.rs":"a6bab66725acc9055fd9f4edacf34d788a01950e8a93cb9ba749e56cd173d270","src/stack.rs":"76bd923e792d74af75184f34be0cb4527e7ae065ee7ecc4f328069bf0d7ffa44","src/string.rs":"6f42609d226cebdb210e57c34f63d5ac6f0c6d19b9959f64068048205d67f095","src/symm.rs":"848b6215bdca7b2f3336481a51884690bfefb9003921218f7420652cf6976994","src/util.rs":"9fa125888abe8371224bcc200652d569bd346c8086da4b7d9bf3235750451f06","src/version.rs":"5b7c2ce77ce944a3beb2a8f8a193c88fb569b843161bf0e82ae334b20d1ab555","src/x509/extension.rs":"2bd6a710fca0adb885f581b128f3a9e5444e23d4e93e37bed706c61c9e1b91d5","src/x509/mod.rs":"af367604075bf32a5a1fe034d1c6797770b3d103f44d9b5048ca030731eb25c0","src/x509/store.rs":"814851d143b8aaa8690f8b47b0f24b6fcd0ad6dbaf7303345e4d401868563cc8","src/x509/tests.rs":"94a8ec7bf90eac9453fa27ae532e833d4272f94c64bae41a2fe351bd7f0cfec7","src/x509/verify.rs":"8be6c794edc7466dcf818e19010e14cb44fd6390c81a25100a401f1f25ff8982","test/alt_name_cert.pem":"f3cc0a1d21657164918dffab0dac8f1c499fc1cf5717805420a0134b3aee128c","test/cert.pem":"53c8b338be254490c71a6b13da90dc5a59ba596587c548be5673657e04824afb","test/certs.pem":"106d5d22c86e26c3db619b9525567f22333d22de82e4d2850ed379150c638008","test/cms.p12":"d33fc5edd6b9caa672e7570b869135235bb2583580a273f6e88c6a6c68fd5a8a","test/cms_pubkey.der":"03682a732e1fd861f5fa687915a8e6f5c935d10273b0f6f73f3db52a8d71fc6d","test/dhparams.pem":"14d9461949d9ae8ca50a393b008ee2168254f14342b0e17b56c0a62d2905b963","test/dsa.pem":"826d513234205fd3dee0bbbf844f0b6fea501145bdf05ea3b14e14df98cbe090","test/dsa.pem.pub":"721677bebf9ab28b8650f98a0cd27658de0c1acd867a4b6e985fe1df95a8bd37","test/dsaparam.pem":"94a1284bdd7d7566151cfde0c7f245e84f7b99ba840f202e3f27ea0160f82988","test/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","test/key.der":"e8842cd6674b5c77a83e0283cd876a91de404561dfc86d79ce525f6e55b28197","test/key.der.pub":"e559d56bb6ec57ad743dbf972bbcaf263a9fa7d320433baa71b04f849d987060","test/key.pem":"12d9105a92bf39b615ccb4820c5c1e38c61905483cd30be13f9ab99b98af64ed","test/key.pem.pub":"f5d030df843ddbaba5bf316ae18f1434de5a63a955be66442429dd4f16f161ef","test/keystore-empty-chain.p12":"bbea280f6fe10556d7470df7072ef0e4ee3997e2c0b3666197f423430c0e6b61","test/nid_test_cert.pem":"7047e8d317e284c6b698eee4a0f1a629d50cd4615ad7da85fe90a2ffb6c21611","test/nid_uid_test_cert.pem":"a735211f3b40edbde7084337138fb0aea06aea6c78369c52015253e4b7a17d83","test/pkcs1.pem.pub":"4d446864b63c4178ec2c7dc8df9b7121d9271851c1f4701231fccb8b07c94918","test/pkcs8-nocrypt.der":"5590d03cc0d037c6c27d78fafc937f48defb226e9a52cde84d54df68086d0575","test/pkcs8.der":"8719fc002d59313fb97e46e068ae40db4d9acc0e2debd308ac9eb46329bea487","test/root-ca.key":"b37cf88614980c38e43c4329cdf7162bae48cc8af1fafd54db2fe0d17e458e1d","test/root-ca.pem":"59b9200c35e818bf21be4aaa97ba87bb6a18fd780527a9f9c51cc74212c631a0","test/rsa-encrypted.pem":"ea41b0f1816056672de6abbab43d0e8089da047c329ceed14aace5a5bde713f1","test/rsa.pem":"f866a5506ea9a37ed2f73f62f503e1aff32f7e4145be62b023535f4da1c24416","test/rsa.pem.pub":"2c5eeea39708e90396f9f09d920f2af8b7e9f84ace963c1319072224dd3d302b"},"package":"8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"75531323f4566a1de9f415ace94853dbfb6d1f862a4ba3d0ce177b0ad46b1547","Cargo.lock":"86cf6586c2bd21ca978c7422083968e79c5199443b7b9582ed7dcf6548a95302","Cargo.toml":"a2cd835b7ae97864e79388077a0c111975b639a217ca029d8db8cfe1ea8af437","LICENSE":"f3d4287b4a21c5176fea2f9bd4ae800696004e2fb8e05cbc818be513f188a941","README.md":"c5ddde25c2756a1115daaa671fb4297cdc83bf23009c8356ba65b5311d0dd30d","build.rs":"575bf9996eb60039fbe26705983f8ea5f20978308d0bfde8e27f99ed734a162d","examples/mk_certs.rs":"aad6324bf23a97357ef29fa81c9784a42b982b774c958b1195da9b5890b6a35e","src/aes.rs":"31555f2753c2b06199ddcb4b39304bc49acc73a1f64e06b30fa66d16859f566f","src/asn1.rs":"fa4d540948758cd20fbb4cc88b174464d0c81c3154662243f65c90dbfdb2d581","src/base64.rs":"48a3e924b3b5c17df63f88210d88e726b95da7b825af867f2e2010381194ba72","src/bio.rs":"a8b0d600bd350ffdbf037ce1e293aad8e01eb870697e8776cc720490637da51f","src/bn.rs":"0b280ce40feae6c9b1ee914642170829dd955e17de0c16b4ac99df51185ce9d7","src/cms.rs":"ac7cf827538a25321c1b10b605f01d50d999fbab13ca9c54036ab305f0c34066","src/conf.rs":"ba6aca357b1f31114dcf8f05dedc8e143edacad3a05e4e9d5f3aeaa00bbbcf34","src/derive.rs":"e70c2a49e4e32eb1523c7b6c5bfdb9c5c17c284bd5a8a5cec4c26206c0e8fd49","src/dh.rs":"c54a2ffb78b6431c931fa3093f021428d3e6c2e9553547ec379b67ee1f6aa8f9","src/dsa.rs":"88a0bdc680c4b02642c56e07671c54e1d70c3fb875b7a0092c15884bf11bea33","src/ec.rs":"6093ac9fe11142e010761e114e15b6305ff9cf195649b855b21f51a48c86cd92","src/ecdsa.rs":"0e30beee5fff7b681c969554d2860e7f2300b7364ed102e0a3fd48dda8e3ddfb","src/encrypt.rs":"12bec334ceeaee12b963e2280fc56f772fd409df50b2d5ce2edcda4393086700","src/envelope.rs":"555817e5109b3e2cce8ca66d2ceeb31312d7928b3fde152bde22184c416af4cc","src/error.rs":"cced1c5e348c1e3fced8262c3758e3b5afc4154a9f35e427bfea3798f4456875","src/ex_data.rs":"0a58a3a274a4ef2251dadb64cbcd44b43710d252201b137ecfb91cf14373c04f","src/fips.rs":"406722ff95f933af3e862b937f3b51f705a049a7b4a8515a9d8311cc74b1a3de","src/hash.rs":"02bc290edf034baf778fced4adcac83700247d0ffea39fac84e49181b4616045","src/lib.rs":"da51832c9eb768d2b3b6bac81e3895eee651997bba2b2aeed63f1042c83d4a84","src/macros.rs":"29751b6f9b40c8667128cd46ee780b6544c54a34738f1d587042db9de6f24b12","src/memcmp.rs":"f5860ea386424f1c1b78a88932f76594d85848c27f97cf42cf823e563a4ec191","src/nid.rs":"49ee73b89292a93f5d9c9f005b6c0bc5e46c23f00e9d1af3989680eef62131f4","src/ocsp.rs":"e9c36fb63d3a9b9a2d52a11be4123688710e0d126c0c1eb09512be37fed6aaf1","src/pkcs12.rs":"764dbb1a67b09e2da4c326653e9ceeba18591d732f8f0ab1b8228b3e392742ec","src/pkcs5.rs":"2948a418a9218d0347b3072998d01b0b5c5263b5fef69716e9c69fca548ed77c","src/pkcs7.rs":"a0e96577c25af824255e0d40d617a0d0723c2955429b90da7d29e2ed1080261c","src/pkey.rs":"162dc98c20b8875f9616c201b52e434d799dac1aeed57e5027e4334d5f2b55d6","src/rand.rs":"c7b3fed0d322af7ea950b249430ec2163d2b57fa1b7a3864c9e0a8c8365ad997","src/rsa.rs":"ca2dacc55531088f29465d13a2c5b8f76481f7e0d32488783e3d2cb8cb9440d8","src/sha.rs":"505eaa30fa822ca3b8e647993b34267e376b2932a526bf193ad9367fb566c4b0","src/sign.rs":"7b3211990a07f1b60d2dfc5c60a113ca3bb7eb150368d5eaf8526807f5fd960e","src/srtp.rs":"29a726ed8269567d1a8dcc7ac256501e255a0536d5ce03740ea2274d098218ec","src/ssl/bio.rs":"7d11afcf22b0a6023eaaad953cb392ef8da651c4b4ceaa94b793789792291a96","src/ssl/callbacks.rs":"1f2514a6149347c3df4add8cbae8c74a8f2a255f580a2fa4a62586b4250335c8","src/ssl/connector.rs":"dc1147f2b16de747c15ff9bdab44fc02fe18dcc1b6abe6acba56b69bec99013b","src/ssl/error.rs":"f39ac3e1037a35ae5cccbf5cf5976044614a6368c9ffe3f1b96bead63c0c4231","src/ssl/mod.rs":"19dd397f3bfb3267b61d78e0db373f289f5537cf9a3b8ec6e776559fec00e2a1","src/ssl/test/mod.rs":"12691fee5a6f670e6fb0d298c543d1a8044bbe74c6009e7e5edeaa46684b9d45","src/ssl/test/server.rs":"4276ba970a0fac5c9cae21d7df7af36389c377472f3546ce597678ffc6ad5b38","src/stack.rs":"fe7787dc1239392c4b55b4332dc9f90276ff48f4ac0e77a95591b5062bfc17e0","src/string.rs":"9cf0c69c03b091b186a846f46698c17c75e55d747fd4154cc9950e8aca54c0dd","src/symm.rs":"95eea67865d9a5c802fa9a3b9e76c004eead5c88a804d9ddc012a08961746267","src/util.rs":"76eaa375361e305e020d11b51c6e3adaa68ee2b531b253bbac92eb1bfd03180d","src/version.rs":"ea890383758bbe9a92fab8ee27def2ad759a2346481199e1af30940b25d8aae1","src/x509/extension.rs":"772861b6725c2524911521c0ae4fd58657b739209d6cd9a697d97652d6aadb15","src/x509/mod.rs":"7850e07bef15318c777890d21818ff038334c5600e5e883982ff1b07ed572019","src/x509/store.rs":"7cdcb33018006b3063375cfb87dcc319ac28d200c03d94e281cefb74e2a78879","src/x509/tests.rs":"c92a5a385887d389184daba1e827fbb7203a7f984e8782dfe55485852f0f5937","src/x509/verify.rs":"ad00a223cd1d008fb6fdfe470bb473b5a47a1375ba92cd302aa14790d7e3e58f","test/aia_test_cert.pem":"9eaf52b5d0023f3be7911938d937ed16fc75d43d14dbe41557a800b0a82f4b1b","test/alt_name_cert.pem":"f3cc0a1d21657164918dffab0dac8f1c499fc1cf5717805420a0134b3aee128c","test/cert.pem":"53c8b338be254490c71a6b13da90dc5a59ba596587c548be5673657e04824afb","test/certs.pem":"106d5d22c86e26c3db619b9525567f22333d22de82e4d2850ed379150c638008","test/cms.p12":"d33fc5edd6b9caa672e7570b869135235bb2583580a273f6e88c6a6c68fd5a8a","test/cms_pubkey.der":"03682a732e1fd861f5fa687915a8e6f5c935d10273b0f6f73f3db52a8d71fc6d","test/dhparams.pem":"14d9461949d9ae8ca50a393b008ee2168254f14342b0e17b56c0a62d2905b963","test/dsa.pem":"826d513234205fd3dee0bbbf844f0b6fea501145bdf05ea3b14e14df98cbe090","test/dsa.pem.pub":"721677bebf9ab28b8650f98a0cd27658de0c1acd867a4b6e985fe1df95a8bd37","test/dsaparam.pem":"94a1284bdd7d7566151cfde0c7f245e84f7b99ba840f202e3f27ea0160f82988","test/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","test/key.der":"e8842cd6674b5c77a83e0283cd876a91de404561dfc86d79ce525f6e55b28197","test/key.der.pub":"e559d56bb6ec57ad743dbf972bbcaf263a9fa7d320433baa71b04f849d987060","test/key.pem":"12d9105a92bf39b615ccb4820c5c1e38c61905483cd30be13f9ab99b98af64ed","test/key.pem.pub":"f5d030df843ddbaba5bf316ae18f1434de5a63a955be66442429dd4f16f161ef","test/keystore-empty-chain.p12":"bbea280f6fe10556d7470df7072ef0e4ee3997e2c0b3666197f423430c0e6b61","test/nid_test_cert.pem":"7047e8d317e284c6b698eee4a0f1a629d50cd4615ad7da85fe90a2ffb6c21611","test/nid_uid_test_cert.pem":"a735211f3b40edbde7084337138fb0aea06aea6c78369c52015253e4b7a17d83","test/pkcs1.pem.pub":"4d446864b63c4178ec2c7dc8df9b7121d9271851c1f4701231fccb8b07c94918","test/pkcs8-nocrypt.der":"5590d03cc0d037c6c27d78fafc937f48defb226e9a52cde84d54df68086d0575","test/pkcs8.der":"8719fc002d59313fb97e46e068ae40db4d9acc0e2debd308ac9eb46329bea487","test/root-ca.key":"b37cf88614980c38e43c4329cdf7162bae48cc8af1fafd54db2fe0d17e458e1d","test/root-ca.pem":"59b9200c35e818bf21be4aaa97ba87bb6a18fd780527a9f9c51cc74212c631a0","test/rsa-encrypted.pem":"ea41b0f1816056672de6abbab43d0e8089da047c329ceed14aace5a5bde713f1","test/rsa.pem":"f866a5506ea9a37ed2f73f62f503e1aff32f7e4145be62b023535f4da1c24416","test/rsa.pem.pub":"2c5eeea39708e90396f9f09d920f2af8b7e9f84ace963c1319072224dd3d302b"},"package":"8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -8,15 +10,15 @@
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "cc"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 
 [[package]]
 name = "cfg-if"
@@ -52,45 +54,45 @@
 checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 
 [[package]]
-name = "lazy_static"
-version = "1.4.0"
+name = "libc"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
 
 [[package]]
-name = "libc"
-version = "0.2.81"
+name = "once_cell"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "openssl"
-version = "0.10.31"
+version = "0.10.36"
 dependencies = [
  "bitflags",
  "cfg-if",
  "foreign-types",
  "hex",
- "lazy_static",
  "libc",
+ "once_cell",
  "openssl-sys",
  "tempdir",
 ]
 
 [[package]]
 name = "openssl-src"
-version = "111.13.0+1.1.1i"
+version = "111.15.0+1.1.1k"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6"
+checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.59"
+version = "0.9.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe"
+checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82"
 dependencies = [
  "autocfg",
  "cc",
@@ -164,9 +166,9 @@
 
 [[package]]
 name = "vcpkg"
-version = "0.2.10"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "winapi"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "openssl"
-version = "0.10.31"
+version = "0.10.36"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 description = "OpenSSL bindings"
 readme = "README.md"
@@ -26,17 +27,18 @@
 [dependencies.cfg-if]
 version = "1.0"
 
+[dependencies.ffi]
+version = "0.9.66"
+package = "openssl-sys"
+
 [dependencies.foreign-types]
 version = "0.3.1"
 
-[dependencies.lazy_static]
-version = "1"
-
 [dependencies.libc]
 version = "0.2"
 
-[dependencies.openssl-sys]
-version = "0.9.59"
+[dependencies.once_cell]
+version = "1.5.2"
 [dev-dependencies.hex]
 version = "0.3"
 
@@ -48,4 +50,4 @@
 v102 = []
 v110 = []
 v111 = []
-vendored = ["openssl-sys/vendored"]
+vendored = ["ffi/vendored"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,75 @@
 
 ## [Unreleased]
 
+## [v0.10.36] - 2021-08-17
+
+### Added
+
+* Added `Asn1Object::as_slice`.
+* Added `PKeyRef::{raw_public_key, raw_private_key, private_key_to_pkcs8_passphrase}` and
+    `PKey::{private_key_from_raw_bytes, public_key_from_raw_bytes}`.
+* Added `Cipher::{seed_cbc, seed_cfb128, seed_ecb, seed_ofb}`.
+
+## [v0.10.35] - 2021-06-18
+
+### Fixed
+
+* Fixed a memory leak in `Deriver`.
+
+### Added
+
+* Added support for OpenSSL 3.x.x.
+* Added `SslStream::peek`.
+
+## [v0.10.34] - 2021-04-28
+
+### Added
+
+* Added `Dh::set_private_key` and `DhRef::private_key`.
+* Added `EcPointRef::affine_coordinates`.
+* Added `TryFrom` implementations to convert between `PKey` and specific key types.
+* Added `X509StoreBuilderRef::set_flags`.
+
+## [v0.10.33] - 2021-03-13
+
+### Fixed
+
+* `Dh::generate_params` now uses `DH_generate_params_ex` rather than the deprecated `DH_generated_params` function.
+
+### Added
+
+* Added `Asn1Type`.
+* Added `CmsContentInfoRef::decrypt_without_cert_check`.
+* Added `EcPointRef::{is_infinity, is_on_curve}`.
+* Added `Encrypter::set_rsa_oaep_label`.
+* Added `MessageDigest::sm3`.
+* Added `Pkcs7Ref::signers`.
+* Added `Cipher::nid`.
+* Added `X509Ref::authority_info` and `AccessDescription::{method, location}`.
+* Added `X509NameBuilder::{append_entry_by_text_with_type, append_entry_by_nid_with_type}`.
+
+## [v0.10.32] - 2020-12-24
+
+### Fixed
+
+* Fixed `Ssl::new` to take a `&SslContextRef` rather than `&SslContext`.
+
+### Added
+
+* Added the `encrypt` module to support asymmetric encryption and decryption with `PKey`s.
+* Added `MessageDigest::from_name`.
+* Added `ConnectConfiguration::into_ssl`.
+* Added the ability to create unconnected `SslStream`s directly from an `Ssl` and transport stream
+    without performing any part of the handshake with `SslStream::new`.
+* Added `SslStream::{read_early_data, write_early_data, connect, accept, do_handshake, stateless}`.
+* Implemented `ToOwned` for `SslContextRef`.
+* Added `SslRef::{set_connect_state, set_accept_state}`.
+
+### Deprecated
+
+* Deprecated `SslStream::from_raw_parts` in favor of `Ssl::from_ptr` and `SslStream::new`.
+* Deprecated `SslStreamBuilder` in favor of methods on `Ssl` and `SslStream`.
+
 ## [v0.10.31] - 2020-12-09
 
 ### Added
@@ -487,7 +556,12 @@
 
 Look at the [release tags] for information about older releases.
 
-[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.31...master
+[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.36...master
+[v0.10.36]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.35...openssl-v0.10.36
+[v0.10.35]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.34...openssl-v0.10.35
+[v0.10.34]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.33...openssl-v0.10.34
+[v0.10.33]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.32...openssl-v0.10.33
+[v0.10.32]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.31...openssl-v0.10.32
 [v0.10.31]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.30...openssl-v0.10.31
 [v0.10.30]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.29...openssl-v0.10.30
 [v0.10.29]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.28...openssl-v0.10.29
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/examples/mk_certs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/examples/mk_certs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/examples/mk_certs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/examples/mk_certs.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,6 @@
 //! A program that generates ca certs, certs verified by the ca, and public
 //! and private keys.
 
-extern crate openssl;
-
 use openssl::asn1::Asn1Time;
 use openssl::bn::{BigNum, MsbOption};
 use openssl::error::ErrorStack;
@@ -18,7 +16,7 @@
 /// Make a CA certificate and private key
 fn mk_ca_cert() -> Result<(X509, PKey<Private>), ErrorStack> {
     let rsa = Rsa::generate(2048)?;
-    let privkey = PKey::from_rsa(rsa)?;
+    let key_pair = PKey::from_rsa(rsa)?;
 
     let mut x509_name = X509NameBuilder::new()?;
     x509_name.append_entry_by_text("C", "US")?;
@@ -37,7 +35,7 @@
     cert_builder.set_serial_number(&serial_number)?;
     cert_builder.set_subject_name(&x509_name)?;
     cert_builder.set_issuer_name(&x509_name)?;
-    cert_builder.set_pubkey(&privkey)?;
+    cert_builder.set_pubkey(&key_pair)?;
     let not_before = Asn1Time::days_from_now(0)?;
     cert_builder.set_not_before(&not_before)?;
     let not_after = Asn1Time::days_from_now(365)?;
@@ -56,16 +54,16 @@
         SubjectKeyIdentifier::new().build(&cert_builder.x509v3_context(None, None))?;
     cert_builder.append_extension(subject_key_identifier)?;
 
-    cert_builder.sign(&privkey, MessageDigest::sha256())?;
+    cert_builder.sign(&key_pair, MessageDigest::sha256())?;
     let cert = cert_builder.build();
 
-    Ok((cert, privkey))
+    Ok((cert, key_pair))
 }
 
 /// Make a X509 request with the given private key
-fn mk_request(privkey: &PKey<Private>) -> Result<X509Req, ErrorStack> {
+fn mk_request(key_pair: &PKey<Private>) -> Result<X509Req, ErrorStack> {
     let mut req_builder = X509ReqBuilder::new()?;
-    req_builder.set_pubkey(&privkey)?;
+    req_builder.set_pubkey(key_pair)?;
 
     let mut x509_name = X509NameBuilder::new()?;
     x509_name.append_entry_by_text("C", "US")?;
@@ -75,7 +73,7 @@
     let x509_name = x509_name.build();
     req_builder.set_subject_name(&x509_name)?;
 
-    req_builder.sign(&privkey, MessageDigest::sha256())?;
+    req_builder.sign(key_pair, MessageDigest::sha256())?;
     let req = req_builder.build();
     Ok(req)
 }
@@ -83,12 +81,12 @@
 /// Make a certificate and private key signed by the given CA cert and private key
 fn mk_ca_signed_cert(
     ca_cert: &X509Ref,
-    ca_privkey: &PKeyRef<Private>,
+    ca_key_pair: &PKeyRef<Private>,
 ) -> Result<(X509, PKey<Private>), ErrorStack> {
     let rsa = Rsa::generate(2048)?;
-    let privkey = PKey::from_rsa(rsa)?;
+    let key_pair = PKey::from_rsa(rsa)?;
 
-    let req = mk_request(&privkey)?;
+    let req = mk_request(&key_pair)?;
 
     let mut cert_builder = X509::builder()?;
     cert_builder.set_version(2)?;
@@ -100,7 +98,7 @@
     cert_builder.set_serial_number(&serial_number)?;
     cert_builder.set_subject_name(req.subject_name())?;
     cert_builder.set_issuer_name(ca_cert.subject_name())?;
-    cert_builder.set_pubkey(&privkey)?;
+    cert_builder.set_pubkey(&key_pair)?;
     let not_before = Asn1Time::days_from_now(0)?;
     cert_builder.set_not_before(&not_before)?;
     let not_after = Asn1Time::days_from_now(365)?;
@@ -133,15 +131,15 @@
         .build(&cert_builder.x509v3_context(Some(ca_cert), None))?;
     cert_builder.append_extension(subject_alt_name)?;
 
-    cert_builder.sign(&ca_privkey, MessageDigest::sha256())?;
+    cert_builder.sign(ca_key_pair, MessageDigest::sha256())?;
     let cert = cert_builder.build();
 
-    Ok((cert, privkey))
+    Ok((cert, key_pair))
 }
 
 fn real_main() -> Result<(), ErrorStack> {
-    let (ca_cert, ca_privkey) = mk_ca_cert()?;
-    let (cert, _privkey) = mk_ca_signed_cert(&ca_cert, &ca_privkey)?;
+    let (ca_cert, ca_key_pair) = mk_ca_cert()?;
+    let (cert, _key_pair) = mk_ca_signed_cert(&ca_cert, &ca_key_pair)?;
 
     // Verify that this cert was issued by this ca
     match ca_cert.issued(&cert) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,5 @@
 # rust-openssl
 
-[![CircleCI](https://circleci.com/gh/sfackler/rust-openssl.svg?style=shield)](https://circleci.com/gh/sfackler/rust-openssl)
 [![crates.io](https://img.shields.io/crates/v/openssl.svg)](https://crates.io/crates/openssl)
 
 OpenSSL bindings for the Rust programming language.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/aes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/aes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/aes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/aes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -55,11 +55,11 @@
 //! assert_eq!(&orig_key[..], &key_to_wrap[..]);
 //! ```
 //!
-use ffi;
 use libc::{c_int, c_uint};
-use std::{mem, ptr};
+use std::mem::MaybeUninit;
+use std::ptr;
 
-use symm::Mode;
+use crate::symm::Mode;
 
 /// Provides Error handling for parsing keys.
 #[derive(Debug)]
@@ -74,19 +74,18 @@
     /// # Failure
     ///
     /// Returns an error if the key is not 128, 192, or 256 bits.
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
     pub fn new_encrypt(key: &[u8]) -> Result<AesKey, KeyError> {
         unsafe {
             assert!(key.len() <= c_int::max_value() as usize / 8);
 
-            let mut aes_key = mem::uninitialized();
+            let mut aes_key = MaybeUninit::uninit();
             let r = ffi::AES_set_encrypt_key(
                 key.as_ptr() as *const _,
                 key.len() as c_int * 8,
-                &mut aes_key,
+                aes_key.as_mut_ptr(),
             );
             if r == 0 {
-                Ok(AesKey(aes_key))
+                Ok(AesKey(aes_key.assume_init()))
             } else {
                 Err(KeyError(()))
             }
@@ -98,20 +97,19 @@
     /// # Failure
     ///
     /// Returns an error if the key is not 128, 192, or 256 bits.
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
     pub fn new_decrypt(key: &[u8]) -> Result<AesKey, KeyError> {
         unsafe {
             assert!(key.len() <= c_int::max_value() as usize / 8);
 
-            let mut aes_key = mem::uninitialized();
+            let mut aes_key = MaybeUninit::uninit();
             let r = ffi::AES_set_decrypt_key(
                 key.as_ptr() as *const _,
                 key.len() as c_int * 8,
-                &mut aes_key,
+                aes_key.as_mut_ptr(),
             );
 
             if r == 0 {
-                Ok(AesKey(aes_key))
+                Ok(AesKey(aes_key.assume_init()))
             } else {
                 Err(KeyError(()))
             }
@@ -122,14 +120,14 @@
 /// Performs AES IGE encryption or decryption
 ///
 /// AES IGE (Infinite Garble Extension) is a form of AES block cipher utilized in
-/// OpenSSL.  Infinite Garble referes to propogating forward errors.  IGE, like other
-/// block ciphers implemented for AES requires an initalization vector.  The IGE mode
+/// OpenSSL.  Infinite Garble refers to propagating forward errors.  IGE, like other
+/// block ciphers implemented for AES requires an initialization vector.  The IGE mode
 /// allows a stream of blocks to be encrypted or decrypted without having the entire
 /// plaintext available.  For more information, visit [AES IGE Encryption].
 ///
-/// This block cipher uses 16 byte blocks.  The rust implmentation will panic
-/// if the input or output does not meet this 16-byte boundry.  Attention must
-/// be made in this low level implementation to pad the value to the 128-bit boundry.
+/// This block cipher uses 16 byte blocks.  The rust implementation will panic
+/// if the input or output does not meet this 16-byte boundary.  Attention must
+/// be made in this low level implementation to pad the value to the 128-bit boundary.
 ///
 /// [AES IGE Encryption]: http://www.links.org/files/openssl-ige.pdf
 ///
@@ -240,7 +238,7 @@
     use hex::FromHex;
 
     use super::*;
-    use symm::Mode;
+    use crate::symm::Mode;
 
     // From https://www.mgp25.com/AESIGE/
     #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/asn1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/asn1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/asn1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/asn1.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,7 +24,7 @@
 //! use openssl::asn1::Asn1Time;
 //! let tomorrow = Asn1Time::days_from_now(1);
 //! ```
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::{c_char, c_int, c_long, time_t};
 #[cfg(ossl102)]
@@ -35,12 +35,12 @@
 use std::slice;
 use std::str;
 
-use bio::MemBio;
-use bn::{BigNum, BigNumRef};
-use error::ErrorStack;
-use nid::Nid;
-use string::OpensslString;
-use {cvt, cvt_p};
+use crate::bio::MemBio;
+use crate::bn::{BigNum, BigNumRef};
+use crate::error::ErrorStack;
+use crate::nid::Nid;
+use crate::string::OpensslString;
+use crate::{cvt, cvt_p};
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::ASN1_GENERALIZEDTIME;
@@ -53,7 +53,7 @@
     /// example outside the year range of 1950-2049.
     ///
     /// [ASN1_GENERALIZEDTIME_set] documentation from OpenSSL provides
-    /// further details of implmentation.  Note: these docs are from the master
+    /// further details of implementation.  Note: these docs are from the master
     /// branch as documentation on the 1.1.0 branch did not include this page.
     ///
     /// [ASN1_GENERALIZEDTIME_set]: https://www.openssl.org/docs/manmaster/man3/ASN1_GENERALIZEDTIME_set.html
@@ -65,7 +65,7 @@
 }
 
 impl fmt::Display for Asn1GeneralizedTimeRef {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         unsafe {
             let mem_bio = match MemBio::new() {
                 Err(_) => return f.write_str("error"),
@@ -83,6 +83,79 @@
     }
 }
 
+/// The type of an ASN.1 value.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct Asn1Type(c_int);
+
+#[allow(missing_docs)] // no need to document the constants
+impl Asn1Type {
+    pub const EOC: Asn1Type = Asn1Type(ffi::V_ASN1_EOC);
+
+    pub const BOOLEAN: Asn1Type = Asn1Type(ffi::V_ASN1_BOOLEAN);
+
+    pub const INTEGER: Asn1Type = Asn1Type(ffi::V_ASN1_INTEGER);
+
+    pub const BIT_STRING: Asn1Type = Asn1Type(ffi::V_ASN1_BIT_STRING);
+
+    pub const OCTET_STRING: Asn1Type = Asn1Type(ffi::V_ASN1_OCTET_STRING);
+
+    pub const NULL: Asn1Type = Asn1Type(ffi::V_ASN1_NULL);
+
+    pub const OBJECT: Asn1Type = Asn1Type(ffi::V_ASN1_OBJECT);
+
+    pub const OBJECT_DESCRIPTOR: Asn1Type = Asn1Type(ffi::V_ASN1_OBJECT_DESCRIPTOR);
+
+    pub const EXTERNAL: Asn1Type = Asn1Type(ffi::V_ASN1_EXTERNAL);
+
+    pub const REAL: Asn1Type = Asn1Type(ffi::V_ASN1_REAL);
+
+    pub const ENUMERATED: Asn1Type = Asn1Type(ffi::V_ASN1_ENUMERATED);
+
+    pub const UTF8STRING: Asn1Type = Asn1Type(ffi::V_ASN1_UTF8STRING);
+
+    pub const SEQUENCE: Asn1Type = Asn1Type(ffi::V_ASN1_SEQUENCE);
+
+    pub const SET: Asn1Type = Asn1Type(ffi::V_ASN1_SET);
+
+    pub const NUMERICSTRING: Asn1Type = Asn1Type(ffi::V_ASN1_NUMERICSTRING);
+
+    pub const PRINTABLESTRING: Asn1Type = Asn1Type(ffi::V_ASN1_PRINTABLESTRING);
+
+    pub const T61STRING: Asn1Type = Asn1Type(ffi::V_ASN1_T61STRING);
+
+    pub const TELETEXSTRING: Asn1Type = Asn1Type(ffi::V_ASN1_TELETEXSTRING);
+
+    pub const VIDEOTEXSTRING: Asn1Type = Asn1Type(ffi::V_ASN1_VIDEOTEXSTRING);
+
+    pub const IA5STRING: Asn1Type = Asn1Type(ffi::V_ASN1_IA5STRING);
+
+    pub const UTCTIME: Asn1Type = Asn1Type(ffi::V_ASN1_UTCTIME);
+
+    pub const GENERALIZEDTIME: Asn1Type = Asn1Type(ffi::V_ASN1_GENERALIZEDTIME);
+
+    pub const GRAPHICSTRING: Asn1Type = Asn1Type(ffi::V_ASN1_GRAPHICSTRING);
+
+    pub const ISO64STRING: Asn1Type = Asn1Type(ffi::V_ASN1_ISO64STRING);
+
+    pub const VISIBLESTRING: Asn1Type = Asn1Type(ffi::V_ASN1_VISIBLESTRING);
+
+    pub const GENERALSTRING: Asn1Type = Asn1Type(ffi::V_ASN1_GENERALSTRING);
+
+    pub const UNIVERSALSTRING: Asn1Type = Asn1Type(ffi::V_ASN1_UNIVERSALSTRING);
+
+    pub const BMPSTRING: Asn1Type = Asn1Type(ffi::V_ASN1_BMPSTRING);
+
+    /// Constructs an `Asn1Type` from a raw OpenSSL value.
+    pub fn from_raw(value: c_int) -> Self {
+        Asn1Type(value)
+    }
+
+    /// Returns the raw OpenSSL value represented by this type.
+    pub fn as_raw(&self) -> c_int {
+        self.0
+    }
+}
+
 /// Difference between two ASN1 times.
 ///
 /// This `struct` is created by the [`diff`] method on [`Asn1TimeRef`]. See its
@@ -211,7 +284,7 @@
 }
 
 impl fmt::Display for Asn1TimeRef {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         unsafe {
             let mem_bio = match MemBio::new() {
                 Err(_) => return f.write_str("error"),
@@ -227,7 +300,7 @@
 }
 
 impl fmt::Debug for Asn1TimeRef {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.write_str(&self.to_string())
     }
 }
@@ -408,7 +481,7 @@
 }
 
 impl fmt::Debug for Asn1StringRef {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.as_utf8() {
             Ok(openssl_string) => openssl_string.fmt(fmt),
             Err(_) => fmt.write_str("error"),
@@ -453,7 +526,7 @@
     #[allow(missing_docs)]
     #[deprecated(since = "0.10.6", note = "use to_bn instead")]
     pub fn get(&self) -> i64 {
-        unsafe { ::ffi::ASN1_INTEGER_get(self.as_ptr()) as i64 }
+        unsafe { ffi::ASN1_INTEGER_get(self.as_ptr()) as i64 }
     }
 
     /// Converts the integer to a `BigNum`.
@@ -463,7 +536,7 @@
     /// [`ASN1_INTEGER_to_BN`]: https://www.openssl.org/docs/man1.1.0/crypto/ASN1_INTEGER_get.html
     pub fn to_bn(&self) -> Result<BigNum, ErrorStack> {
         unsafe {
-            cvt_p(::ffi::ASN1_INTEGER_to_BN(self.as_ptr(), ptr::null_mut()))
+            cvt_p(ffi::ASN1_INTEGER_to_BN(self.as_ptr(), ptr::null_mut()))
                 .map(|p| BigNum::from_ptr(p))
         }
     }
@@ -476,7 +549,7 @@
     /// [`bn`]: ../bn/struct.BigNumRef.html#method.to_asn1_integer
     /// [`ASN1_INTEGER_set`]: https://www.openssl.org/docs/man1.1.0/crypto/ASN1_INTEGER_set.html
     pub fn set(&mut self, value: i32) -> Result<(), ErrorStack> {
-        unsafe { cvt(::ffi::ASN1_INTEGER_set(self.as_ptr(), value as c_long)).map(|_| ()) }
+        unsafe { cvt(ffi::ASN1_INTEGER_set(self.as_ptr(), value as c_long)).map(|_| ()) }
     }
 }
 
@@ -553,6 +626,22 @@
             Ok(Asn1Object::from_ptr(obj))
         }
     }
+
+    /// Return the OID as an DER encoded array of bytes. This is the ASN.1
+    /// value, not including tag or length.
+    ///
+    /// This corresponds to [`OBJ_get0_data`].
+    ///
+    /// Requires OpenSSL 1.1.1 or newer.
+    ///
+    /// [`OBJ_get0_data`]: https://www.openssl.org/docs/man1.1.0/man3/OBJ_get0_data.html
+    #[cfg(ossl111)]
+    pub fn as_slice(&self) -> &[u8] {
+        unsafe {
+            let len = ffi::OBJ_length(self.as_ptr());
+            slice::from_raw_parts(ffi::OBJ_get0_data(self.as_ptr()), len)
+        }
+    }
 }
 
 impl Asn1ObjectRef {
@@ -563,7 +652,7 @@
 }
 
 impl fmt::Display for Asn1ObjectRef {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         unsafe {
             let mut buf = [0; 80];
             let len = ffi::OBJ_obj2txt(
@@ -581,7 +670,7 @@
 }
 
 impl fmt::Debug for Asn1ObjectRef {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.write_str(self.to_string().as_str())
     }
 }
@@ -601,8 +690,8 @@
 mod tests {
     use super::*;
 
-    use bn::BigNum;
-    use nid::Nid;
+    use crate::bn::BigNum;
+    use crate::nid::Nid;
 
     /// Tests conversion between BigNum and Asn1Integer.
     #[test]
@@ -692,4 +781,14 @@
             .map(|object| object.to_string())
             .expect_err("parsing invalid OID should fail");
     }
+
+    #[test]
+    #[cfg(ossl111)]
+    fn object_to_slice() {
+        let object = Asn1Object::from_str("2.16.840.1.101.3.4.2.1").unwrap();
+        assert_eq!(
+            object.as_slice(),
+            &[0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01],
+        );
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/base64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/base64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/base64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/base64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,6 @@
 //! Base64 encoding support.
-use cvt_n;
-use error::ErrorStack;
-use ffi;
+use crate::cvt_n;
+use crate::error::ErrorStack;
 use libc::c_int;
 
 /// Encodes a slice of bytes to a base64 string.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/bio.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/bio.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/bio.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/bio.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
-use ffi;
+use cfg_if::cfg_if;
 use libc::c_int;
 use std::marker::PhantomData;
 use std::ptr;
 use std::slice;
 
-use cvt_p;
-use error::ErrorStack;
+use crate::cvt_p;
+use crate::error::ErrorStack;
 
 pub struct MemBioSlice<'a>(*mut ffi::BIO, PhantomData<&'a [u8]>);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/bn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/bn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/bn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/bn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,7 @@
 //! ```
 //!
 //! [`BIGNUM`]: https://wiki.openssl.org/index.php/Manual:Bn_internal(3)
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::cmp::Ordering;
@@ -30,10 +30,10 @@
 use std::ops::{Add, Deref, Div, Mul, Neg, Rem, Shl, Shr, Sub};
 use std::{fmt, ptr};
 
-use asn1::Asn1Integer;
-use error::ErrorStack;
-use string::OpensslString;
-use {cvt, cvt_n, cvt_p};
+use crate::asn1::Asn1Integer;
+use crate::error::ErrorStack;
+use crate::string::OpensslString;
+use crate::{cvt, cvt_n, cvt_p};
 
 cfg_if! {
     if #[cfg(ossl110)] {
@@ -120,7 +120,7 @@
     /// with [`new`].  Perform standard mathematics on large numbers using
     /// methods from [`Dref<Target = BigNumRef>`]
     ///
-    /// OpenSSL documenation at [`BN_new`].
+    /// OpenSSL documentation at [`BN_new`].
     ///
     /// [`new`]: struct.BigNum.html#method.new
     /// [`Dref<Target = BigNumRef>`]: struct.BigNum.html#deref-methods
@@ -1122,7 +1122,7 @@
 }
 
 impl fmt::Debug for BigNumRef {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.to_dec_str() {
             Ok(s) => f.write_str(&s),
             Err(e) => Err(e.into()),
@@ -1131,7 +1131,7 @@
 }
 
 impl fmt::Debug for BigNum {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.to_dec_str() {
             Ok(s) => f.write_str(&s),
             Err(e) => Err(e.into()),
@@ -1140,7 +1140,7 @@
 }
 
 impl fmt::Display for BigNumRef {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.to_dec_str() {
             Ok(s) => f.write_str(&s),
             Err(e) => Err(e.into()),
@@ -1149,7 +1149,7 @@
 }
 
 impl fmt::Display for BigNum {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.to_dec_str() {
             Ok(s) => f.write_str(&s),
             Err(e) => Err(e.into()),
@@ -1376,7 +1376,7 @@
 
 #[cfg(test)]
 mod tests {
-    use bn::{BigNum, BigNumContext};
+    use crate::bn::{BigNum, BigNumContext};
 
     #[test]
     fn test_to_from_slice() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/cms.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/cms.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/cms.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/cms.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,22 @@
 //! SMIME implementation using CMS
 //!
-//! CMS (PKCS#7) is an encyption standard.  It allows signing and ecrypting data using
+//! CMS (PKCS#7) is an encryption standard.  It allows signing and encrypting data using
 //! X.509 certificates.  The OpenSSL implementation of CMS is used in email encryption
 //! generated from a `Vec` of bytes.  This `Vec` follows the smime protocol standards.
 //! Data accepted by this module will be smime type `enveloped-data`.
 
-use ffi;
+use bitflags::bitflags;
 use foreign_types::{ForeignType, ForeignTypeRef};
+use libc::c_uint;
 use std::ptr;
 
-use bio::{MemBio, MemBioSlice};
-use error::ErrorStack;
-use libc::c_uint;
-use pkey::{HasPrivate, PKeyRef};
-use stack::StackRef;
-use symm::Cipher;
-use x509::{X509Ref, X509};
-use {cvt, cvt_p};
+use crate::bio::{MemBio, MemBioSlice};
+use crate::error::ErrorStack;
+use crate::pkey::{HasPrivate, PKeyRef};
+use crate::stack::StackRef;
+use crate::symm::Cipher;
+use crate::x509::{X509Ref, X509};
+use crate::{cvt, cvt_p};
 
 bitflags! {
     pub struct CMSOptions : c_uint {
@@ -56,7 +56,7 @@
     /// CMS supports nesting various types of data, including signatures, certificates,
     /// encrypted data, smime messages (encrypted email), and data digest.  The ContentInfo
     /// content type is the encapsulation of all those content types.  [`RFC 5652`] describes
-    /// CMS and OpenSSL follows this RFC's implmentation.
+    /// CMS and OpenSSL follows this RFC's implementation.
     ///
     /// [`RFC 5652`]: https://tools.ietf.org/html/rfc5652#page-6
     pub struct CmsContentInfo;
@@ -95,6 +95,35 @@
         }
     }
 
+    /// Given the sender's private key, `pkey`,
+    /// decrypt the data in `self` without validating the recipient certificate.
+    ///
+    /// *Warning*: Not checking the recipient certificate may leave you vulnerable to Bleichenbacher's attack on PKCS#1 v1.5 RSA padding.
+    /// See [`CMS_decrypt`] for more information.
+    ///
+    /// [`CMS_decrypt`]: https://www.openssl.org/docs/man1.1.0/crypto/CMS_decrypt.html
+    // FIXME merge into decrypt
+    pub fn decrypt_without_cert_check<T>(&self, pkey: &PKeyRef<T>) -> Result<Vec<u8>, ErrorStack>
+    where
+        T: HasPrivate,
+    {
+        unsafe {
+            let pkey = pkey.as_ptr();
+            let out = MemBio::new()?;
+
+            cvt(ffi::CMS_decrypt(
+                self.as_ptr(),
+                pkey,
+                ptr::null_mut(),
+                ptr::null_mut(),
+                out.as_ptr(),
+                0,
+            ))?;
+
+            Ok(out.get_buf().to_owned())
+        }
+    }
+
     to_der! {
         /// Serializes this CmsContentInfo using DER.
         ///
@@ -224,11 +253,12 @@
 #[cfg(test)]
 mod test {
     use super::*;
-    use pkcs12::Pkcs12;
-    use stack::Stack;
-    use x509::X509;
+    use crate::pkcs12::Pkcs12;
+    use crate::stack::Stack;
+    use crate::x509::X509;
 
     #[test]
+    #[cfg_attr(ossl300, ignore)] // 3.0.0 can't load RC2-40-CBC
     fn cms_encrypt_decrypt() {
         // load cert with public key only
         let pub_cert_bytes = include_bytes!("../test/cms_pubkey.der");
@@ -250,7 +280,7 @@
 
         let encrypt = CmsContentInfo::encrypt(
             &cert_stack,
-            &input.as_bytes(),
+            input.as_bytes(),
             Cipher::des_ede3_cbc(),
             CMSOptions::empty(),
         )
@@ -261,12 +291,21 @@
             let encrypted_der = encrypt.to_der().expect("failed to create der from cms");
             let decrypt =
                 CmsContentInfo::from_der(&encrypted_der).expect("failed read cms from der");
-            let decrypt = decrypt
+
+            let decrypt_with_cert_check = decrypt
                 .decrypt(&priv_cert.pkey, &priv_cert.cert)
                 .expect("failed to decrypt cms");
-            let decrypt =
-                String::from_utf8(decrypt).expect("failed to create string from cms content");
-            assert_eq!(input, decrypt);
+            let decrypt_with_cert_check = String::from_utf8(decrypt_with_cert_check)
+                .expect("failed to create string from cms content");
+
+            let decrypt_without_cert_check = decrypt
+                .decrypt_without_cert_check(&priv_cert.pkey)
+                .expect("failed to decrypt cms");
+            let decrypt_without_cert_check = String::from_utf8(decrypt_without_cert_check)
+                .expect("failed to create string from cms content");
+
+            assert_eq!(input, decrypt_with_cert_check);
+            assert_eq!(input, decrypt_without_cert_check);
         }
 
         // decrypt cms message using private key cert (PEM)
@@ -274,12 +313,21 @@
             let encrypted_pem = encrypt.to_pem().expect("failed to create pem from cms");
             let decrypt =
                 CmsContentInfo::from_pem(&encrypted_pem).expect("failed read cms from pem");
-            let decrypt = decrypt
+
+            let decrypt_with_cert_check = decrypt
                 .decrypt(&priv_cert.pkey, &priv_cert.cert)
                 .expect("failed to decrypt cms");
-            let decrypt =
-                String::from_utf8(decrypt).expect("failed to create string from cms content");
-            assert_eq!(input, decrypt);
+            let decrypt_with_cert_check = String::from_utf8(decrypt_with_cert_check)
+                .expect("failed to create string from cms content");
+
+            let decrypt_without_cert_check = decrypt
+                .decrypt_without_cert_check(&priv_cert.pkey)
+                .expect("failed to decrypt cms");
+            let decrypt_without_cert_check = String::from_utf8(decrypt_without_cert_check)
+                .expect("failed to create string from cms content");
+
+            assert_eq!(input, decrypt_with_cert_check);
+            assert_eq!(input, decrypt_without_cert_check);
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/conf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/conf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/conf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/conf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,7 @@
 //! Interface for processing OpenSSL configuration files.
-use ffi;
 
-use cvt_p;
-use error::ErrorStack;
+use crate::cvt_p;
+use crate::error::ErrorStack;
 
 pub struct ConfMethod(*mut ffi::CONF_METHOD);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/derive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/derive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/derive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/derive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,11 @@
 //! Shared secret derivation.
-use ffi;
 use foreign_types::ForeignTypeRef;
 use std::marker::PhantomData;
 use std::ptr;
 
-use error::ErrorStack;
-use pkey::{HasPrivate, HasPublic, PKeyRef};
-use {cvt, cvt_p};
+use crate::error::ErrorStack;
+use crate::pkey::{HasPrivate, HasPublic, PKeyRef};
+use crate::{cvt, cvt_p};
 
 /// A type used to derive a shared secret between two keys.
 pub struct Deriver<'a>(*mut ffi::EVP_PKEY_CTX, PhantomData<&'a ()>);
@@ -93,13 +92,21 @@
     }
 }
 
+impl<'a> Drop for Deriver<'a> {
+    fn drop(&mut self) {
+        unsafe {
+            ffi::EVP_PKEY_CTX_free(self.0);
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
 
-    use ec::{EcGroup, EcKey};
-    use nid::Nid;
-    use pkey::PKey;
+    use crate::ec::{EcGroup, EcKey};
+    use crate::nid::Nid;
+    use crate::pkey::PKey;
 
     #[test]
     fn derive_without_peer() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/dh.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/dh.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/dh.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/dh.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,12 @@
-use error::ErrorStack;
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use std::mem;
 use std::ptr;
 
-use bn::{BigNum, BigNumRef};
-use pkey::{HasParams, HasPrivate, HasPublic, Params, Private};
-use {cvt, cvt_p};
+use crate::bn::{BigNum, BigNumRef};
+use crate::error::ErrorStack;
+use crate::pkey::{HasParams, HasPrivate, HasPublic, Params, Private};
+use crate::{cvt, cvt_p};
 
 generic_foreign_type_and_impl_send_sync! {
     type CType = ffi::DH;
@@ -73,19 +73,34 @@
         }
     }
 
+    /// Sets the private key on the DH object and recomputes the public key.
+    pub fn set_private_key(self, priv_key: BigNum) -> Result<Dh<Private>, ErrorStack> {
+        unsafe {
+            let dh_ptr = self.0;
+            cvt(DH_set0_key(dh_ptr, ptr::null_mut(), priv_key.as_ptr()))?;
+            mem::forget(priv_key);
+
+            cvt(ffi::DH_generate_key(dh_ptr))?;
+            mem::forget(self);
+            Ok(Dh::from_ptr(dh_ptr))
+        }
+    }
+
     /// Generates DH params based on the given `prime_len` and a fixed `generator` value.
     ///
-    /// This corresponds to [`DH_generate_parameters`].
+    /// This corresponds to [`DH_generate_parameters_ex`].
     ///
-    /// [`DH_generate_parameters`]: https://www.openssl.org/docs/man1.1.0/crypto/DH_generate_parameters.html
+    /// [`DH_generate_parameters_ex`]: https://www.openssl.org/docs/man1.1.0/crypto/DH_generate_parameters.html
     pub fn generate_params(prime_len: u32, generator: u32) -> Result<Dh<Params>, ErrorStack> {
         unsafe {
-            Ok(Dh::from_ptr(cvt_p(ffi::DH_generate_parameters(
+            let dh = Dh::from_ptr(cvt_p(ffi::DH_new())?);
+            cvt(ffi::DH_generate_parameters_ex(
+                dh.0,
                 prime_len as i32,
                 generator as i32,
-                None,
                 ptr::null_mut(),
-            ))?))
+            ))?;
+            Ok(dh)
         }
     }
 
@@ -242,11 +257,24 @@
             Ok(key)
         }
     }
+
+    /// Returns the private key from the DH instance.
+    ///
+    /// This corresponds to [`DH_get0_key`].
+    ///
+    /// [`DH_get0_key`]: https://www.openssl.org/docs/man1.1.0/crypto/DH_get0_key.html
+    pub fn private_key(&self) -> &BigNumRef {
+        let mut priv_key = ptr::null();
+        unsafe {
+            DH_get0_key(self.as_ptr(), ptr::null_mut(), &mut priv_key);
+            BigNumRef::from_ptr(priv_key as *mut _)
+        }
+    }
 }
 
 cfg_if! {
     if #[cfg(any(ossl110, libressl270))] {
-        use ffi::{DH_set0_pqg, DH_get0_pqg, DH_get0_key};
+        use ffi::{DH_set0_pqg, DH_get0_pqg, DH_get0_key, DH_set0_key};
     } else {
         #[allow(bad_style)]
         unsafe fn DH_set0_pqg(
@@ -280,6 +308,17 @@
         }
 
         #[allow(bad_style)]
+        unsafe fn DH_set0_key(
+            dh: *mut ffi::DH,
+            pub_key: *mut ffi::BIGNUM,
+            priv_key: *mut ffi::BIGNUM,
+        ) -> ::libc::c_int {
+            (*dh).pub_key = pub_key;
+            (*dh).priv_key = priv_key;
+            1
+        }
+
+        #[allow(bad_style)]
         unsafe fn DH_get0_key(
             dh: *mut ffi::DH,
             pub_key: *mut *const ffi::BIGNUM,
@@ -297,9 +336,9 @@
 
 #[cfg(test)]
 mod tests {
-    use bn::BigNum;
-    use dh::Dh;
-    use ssl::{SslContext, SslMethod};
+    use crate::bn::BigNum;
+    use crate::dh::Dh;
+    use crate::ssl::{SslContext, SslMethod};
 
     #[test]
     #[cfg(ossl102)]
@@ -348,6 +387,21 @@
     }
 
     #[test]
+    #[cfg(ossl102)]
+    fn test_dh_stored_restored() {
+        let dh1 = Dh::get_2048_256().unwrap();
+        let key1 = dh1.generate_key().unwrap();
+
+        let dh2 = Dh::get_2048_256().unwrap();
+        let key2 = dh2
+            .set_private_key(key1.private_key().to_owned().unwrap())
+            .unwrap();
+
+        assert_eq!(key1.public_key(), key2.public_key());
+        assert_eq!(key1.private_key(), key2.private_key());
+    }
+
+    #[test]
     fn test_dh_from_pem() {
         let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
         let params = include_bytes!("../test/dhparams.pem");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/dsa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/dsa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/dsa.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/dsa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,22 @@
 //! Digital Signatures
 //!
 //! DSA ensures a message originated from a known sender, and was not modified.
-//! DSA uses asymetrical keys and an algorithm to output a signature of the message
+//! DSA uses asymmetrical keys and an algorithm to output a signature of the message
 //! using the private key that can be validated with the public key but not be generated
 //! without the private key.
 
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::fmt;
 use std::mem;
 use std::ptr;
 
-use bn::{BigNum, BigNumRef};
-use error::ErrorStack;
-use pkey::{HasParams, HasPrivate, HasPublic, Private, Public};
-use util::ForeignTypeRefExt;
-use {cvt, cvt_p};
+use crate::bn::{BigNum, BigNumRef};
+use crate::error::ErrorStack;
+use crate::pkey::{HasParams, HasPrivate, HasPublic, Private, Public};
+use crate::util::ForeignTypeRefExt;
+use crate::{cvt, cvt_p};
 
 generic_foreign_type_and_impl_send_sync! {
     type CType = ffi::DSA;
@@ -31,7 +31,7 @@
     /// * `q`: DSA sub-prime parameter
     /// * `g`: DSA base parameter
     ///
-    /// These values are used to calculate a pair of asymetrical keys used for
+    /// These values are used to calculate a pair of asymmetrical keys used for
     /// signing.
     ///
     /// OpenSSL documentation at [`DSA_new`]
@@ -288,7 +288,7 @@
 }
 
 impl<T> fmt::Debug for Dsa<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "DSA")
     }
 }
@@ -358,10 +358,10 @@
 #[cfg(test)]
 mod test {
     use super::*;
-    use bn::BigNumContext;
-    use hash::MessageDigest;
-    use pkey::PKey;
-    use sign::{Signer, Verifier};
+    use crate::bn::BigNumContext;
+    use crate::hash::MessageDigest;
+    use crate::pkey::PKey;
+    use crate::sign::{Signer, Verifier};
 
     #[test]
     pub fn test_generate() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ecdsa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ecdsa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ecdsa.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ecdsa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,17 @@
 //! Low level Elliptic Curve Digital Signature Algorithm (ECDSA) functions.
 
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::mem;
 use std::ptr;
 
-use bn::{BigNum, BigNumRef};
-use ec::EcKeyRef;
-use error::ErrorStack;
-use pkey::{HasPrivate, HasPublic};
-use util::ForeignTypeRefExt;
-use {cvt_n, cvt_p};
+use crate::bn::{BigNum, BigNumRef};
+use crate::ec::EcKeyRef;
+use crate::error::ErrorStack;
+use crate::pkey::{HasPrivate, HasPublic};
+use crate::util::ForeignTypeRefExt;
+use crate::{cvt_n, cvt_p};
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::ECDSA_SIG;
@@ -175,14 +175,13 @@
 #[cfg(test)]
 mod test {
     use super::*;
-    use ec::EcGroup;
-    use ec::EcKey;
-    use nid::Nid;
-    use pkey::{Private, Public};
+    use crate::ec::EcGroup;
+    use crate::ec::EcKey;
+    use crate::nid::Nid;
+    use crate::pkey::{Private, Public};
 
     fn get_public_key(group: &EcGroup, x: &EcKey<Private>) -> Result<EcKey<Public>, ErrorStack> {
-        let public_key_point = x.public_key();
-        Ok(EcKey::from_public_key(group, public_key_point)?)
+        EcKey::from_public_key(group, x.public_key())
     }
 
     #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,18 +15,17 @@
 //! [`EcGroup`]: struct.EcGroup.html
 //! [`Nid`]: ../nid/struct.Nid.html
 //! [Eliptic Curve Cryptography]: https://wiki.openssl.org/index.php/Elliptic_Curve_Cryptography
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::fmt;
 use std::ptr;
 
-use bn::{BigNumContextRef, BigNumRef};
-use error::ErrorStack;
-use nid::Nid;
-use pkey::{HasParams, HasPrivate, HasPublic, Params, Private, Public};
-use util::ForeignTypeRefExt;
-use {cvt, cvt_n, cvt_p, init};
+use crate::bn::{BigNumContextRef, BigNumRef};
+use crate::error::ErrorStack;
+use crate::nid::Nid;
+use crate::pkey::{HasParams, HasPrivate, HasPublic, Params, Private, Public};
+use crate::util::ForeignTypeRefExt;
+use crate::{cvt, cvt_n, cvt_p, init};
 
 /// Compressed or Uncompressed conversion
 ///
@@ -103,7 +102,7 @@
     /// Prime fields use the formula `y^2 mod p = x^3 + ax + b mod p`.  Binary
     /// fields use the formula `y^2 + xy = x^3 + ax^2 + b`.  Named curves have
     /// assured security.  To prevent accidental vulnerabilities, they should
-    /// be prefered.
+    /// be preferred.
     ///
     /// [wiki]: https://wiki.openssl.org/index.php/Command_Line_Elliptic_Curve_Operations
     /// [`Nid`]: ../nid/index.html
@@ -481,6 +480,32 @@
     /// Place affine coordinates of a curve over a prime field in the provided
     /// `x` and `y` `BigNum`s
     ///
+    /// OpenSSL documentation at [`EC_POINT_get_affine_coordinates`]
+    ///
+    /// [`EC_POINT_get_affine_coordinates`]: https://www.openssl.org/docs/man1.1.1/man3/EC_POINT_get_affine_coordinates.html
+    #[cfg(ossl111)]
+    pub fn affine_coordinates(
+        &self,
+        group: &EcGroupRef,
+        x: &mut BigNumRef,
+        y: &mut BigNumRef,
+        ctx: &mut BigNumContextRef,
+    ) -> Result<(), ErrorStack> {
+        unsafe {
+            cvt(ffi::EC_POINT_get_affine_coordinates(
+                group.as_ptr(),
+                self.as_ptr(),
+                x.as_ptr(),
+                y.as_ptr(),
+                ctx.as_ptr(),
+            ))
+            .map(|_| ())
+        }
+    }
+
+    /// Place affine coordinates of a curve over a prime field in the provided
+    /// `x` and `y` `BigNum`s
+    ///
     /// OpenSSL documentation at [`EC_POINT_get_affine_coordinates_GFp`]
     ///
     /// [`EC_POINT_get_affine_coordinates_GFp`]: https://www.openssl.org/docs/man1.1.0/crypto/EC_POINT_get_affine_coordinates_GFp.html
@@ -528,6 +553,38 @@
             .map(|_| ())
         }
     }
+
+    /// Checks if point is infinity
+    ///
+    /// OpenSSL documentation at [`EC_POINT_is_at_infinity`]
+    ///
+    /// [`EC_POINT_is_at_infinity`]: https://www.openssl.org/docs/man1.1.0/man3/EC_POINT_is_at_infinity.html
+    pub fn is_infinity(&self, group: &EcGroupRef) -> bool {
+        unsafe {
+            let res = ffi::EC_POINT_is_at_infinity(group.as_ptr(), self.as_ptr());
+            res == 1
+        }
+    }
+
+    /// Checks if point is on a given curve
+    ///
+    /// OpenSSL documentation at [`EC_POINT_is_on_curve`]
+    ///
+    /// [`EC_POINT_is_on_curve`]: https://www.openssl.org/docs/man1.1.0/man3/EC_POINT_is_on_curve.html
+    pub fn is_on_curve(
+        &self,
+        group: &EcGroupRef,
+        ctx: &mut BigNumContextRef,
+    ) -> Result<bool, ErrorStack> {
+        unsafe {
+            let res = cvt_n(ffi::EC_POINT_is_on_curve(
+                group.as_ptr(),
+                self.as_ptr(),
+                ctx.as_ptr(),
+            ))?;
+            Ok(res == 1)
+        }
+    }
 }
 
 impl EcPoint {
@@ -685,7 +742,7 @@
 
     /// Checks the key for validity.
     ///
-    /// OpenSSL documenation at [`EC_KEY_check_key`]
+    /// OpenSSL documentation at [`EC_KEY_check_key`]
     ///
     /// [`EC_KEY_check_key`]: https://www.openssl.org/docs/man1.1.0/crypto/EC_KEY_check_key.html
     pub fn check_key(&self) -> Result<(), ErrorStack> {
@@ -711,7 +768,7 @@
     /// It will not have an associated public or private key. This kind of key is primarily useful
     /// to be provided to the `set_tmp_ecdh` methods on `Ssl` and `SslContextBuilder`.
     ///
-    /// OpenSSL documenation at [`EC_KEY_new_by_curve_name`]
+    /// OpenSSL documentation at [`EC_KEY_new_by_curve_name`]
     ///
     /// [`EC_KEY_new_by_curve_name`]: https://www.openssl.org/docs/man1.1.0/crypto/EC_KEY_new_by_curve_name.html
     pub fn from_curve_name(nid: Nid) -> Result<EcKey<Params>, ErrorStack> {
@@ -915,7 +972,7 @@
 }
 
 impl<T> fmt::Debug for EcKey<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "EcKey")
     }
 }
@@ -925,8 +982,8 @@
     use hex::FromHex;
 
     use super::*;
-    use bn::{BigNum, BigNumContext};
-    use nid::Nid;
+    use crate::bn::{BigNum, BigNumContext};
+    use crate::nid::Nid;
 
     #[test]
     fn key_new_by_curve_name() {
@@ -1052,6 +1109,7 @@
         assert!(ec_key.check_key().is_ok());
     }
 
+    #[cfg(ossl111)]
     #[test]
     fn get_affine_coordinates() {
         let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();
@@ -1070,9 +1128,59 @@
         let mut ctx = BigNumContext::new().unwrap();
         let ec_key_pk = ec_key.public_key();
         ec_key_pk
+            .affine_coordinates(&group, &mut xbn2, &mut ybn2, &mut ctx)
+            .unwrap();
+        assert_eq!(xbn2, xbn);
+        assert_eq!(ybn2, ybn);
+    }
+
+    #[test]
+    fn get_affine_coordinates_gfp() {
+        let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();
+        let x = Vec::from_hex("30a0424cd21c2944838a2d75c92b37e76ea20d9f00893a3b4eee8a3c0aafec3e")
+            .unwrap();
+        let y = Vec::from_hex("e04b65e92456d9888b52b379bdfbd51ee869ef1f0fc65b6659695b6cce081723")
+            .unwrap();
+
+        let xbn = BigNum::from_slice(&x).unwrap();
+        let ybn = BigNum::from_slice(&y).unwrap();
+
+        let ec_key = EcKey::from_public_key_affine_coordinates(&group, &xbn, &ybn).unwrap();
+
+        let mut xbn2 = BigNum::new().unwrap();
+        let mut ybn2 = BigNum::new().unwrap();
+        let mut ctx = BigNumContext::new().unwrap();
+        let ec_key_pk = ec_key.public_key();
+        ec_key_pk
             .affine_coordinates_gfp(&group, &mut xbn2, &mut ybn2, &mut ctx)
             .unwrap();
         assert_eq!(xbn2, xbn);
         assert_eq!(ybn2, ybn);
     }
+
+    #[test]
+    fn is_infinity() {
+        let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();
+        let mut ctx = BigNumContext::new().unwrap();
+        let g = group.generator();
+        assert!(!g.is_infinity(&group));
+
+        let mut order = BigNum::new().unwrap();
+        group.order(&mut order, &mut ctx).unwrap();
+        let mut inf = EcPoint::new(&group).unwrap();
+        inf.mul_generator(&group, &order, &ctx).unwrap();
+        assert!(inf.is_infinity(&group));
+    }
+
+    #[test]
+    #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
+    fn is_on_curve() {
+        let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();
+        let mut ctx = BigNumContext::new().unwrap();
+        let g = group.generator();
+        assert!(g.is_on_curve(&group, &mut ctx).unwrap());
+
+        let group2 = EcGroup::from_curve_name(Nid::X9_62_PRIME239V3).unwrap();
+        assert!(!g.is_on_curve(&group2, &mut ctx).unwrap());
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/encrypt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/encrypt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/encrypt.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/encrypt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,530 @@
+//! Message encryption.
+//!
+//! The [`Encrypter`] allows for encryption of data given a public key. The [`Decrypter`] can be
+//! used with the corresponding private key to decrypt the data.
+//!
+//! # Examples
+//!
+//! Encrypt and decrypt data given an RSA keypair:
+//!
+//! ```rust
+//! use openssl::encrypt::{Encrypter, Decrypter};
+//! use openssl::rsa::{Rsa, Padding};
+//! use openssl::pkey::PKey;
+//!
+//! // Generate a keypair
+//! let keypair = Rsa::generate(2048).unwrap();
+//! let keypair = PKey::from_rsa(keypair).unwrap();
+//!
+//! let data = b"hello, world!";
+//!
+//! // Encrypt the data with RSA PKCS1
+//! let mut encrypter = Encrypter::new(&keypair).unwrap();
+//! encrypter.set_rsa_padding(Padding::PKCS1).unwrap();
+//! // Create an output buffer
+//! let buffer_len = encrypter.encrypt_len(data).unwrap();
+//! let mut encrypted = vec![0; buffer_len];
+//! // Encrypt and truncate the buffer
+//! let encrypted_len = encrypter.encrypt(data, &mut encrypted).unwrap();
+//! encrypted.truncate(encrypted_len);
+//!
+//! // Decrypt the data
+//! let mut decrypter = Decrypter::new(&keypair).unwrap();
+//! decrypter.set_rsa_padding(Padding::PKCS1).unwrap();
+//! // Create an output buffer
+//! let buffer_len = decrypter.decrypt_len(&encrypted).unwrap();
+//! let mut decrypted = vec![0; buffer_len];
+//! // Encrypt and truncate the buffer
+//! let decrypted_len = decrypter.decrypt(&encrypted, &mut decrypted).unwrap();
+//! decrypted.truncate(decrypted_len);
+//! assert_eq!(&*decrypted, data);
+//! ```
+#[cfg(any(ossl102, libressl310))]
+use libc::{c_int, c_void};
+use std::{marker::PhantomData, ptr};
+
+use crate::error::ErrorStack;
+use crate::hash::MessageDigest;
+use crate::pkey::{HasPrivate, HasPublic, PKeyRef};
+use crate::rsa::Padding;
+use crate::{cvt, cvt_p};
+use foreign_types::ForeignTypeRef;
+
+/// A type which encrypts data.
+pub struct Encrypter<'a> {
+    pctx: *mut ffi::EVP_PKEY_CTX,
+    _p: PhantomData<&'a ()>,
+}
+
+unsafe impl<'a> Sync for Encrypter<'a> {}
+unsafe impl<'a> Send for Encrypter<'a> {}
+
+impl<'a> Drop for Encrypter<'a> {
+    fn drop(&mut self) {
+        unsafe {
+            ffi::EVP_PKEY_CTX_free(self.pctx);
+        }
+    }
+}
+
+impl<'a> Encrypter<'a> {
+    /// Creates a new `Encrypter`.
+    ///
+    /// OpenSSL documentation at [`EVP_PKEY_encrypt_init`].
+    ///
+    /// [`EVP_PKEY_encrypt_init`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_encrypt_init.html
+    pub fn new<T>(pkey: &'a PKeyRef<T>) -> Result<Encrypter<'a>, ErrorStack>
+    where
+        T: HasPublic,
+    {
+        unsafe {
+            ffi::init();
+
+            let pctx = cvt_p(ffi::EVP_PKEY_CTX_new(pkey.as_ptr(), ptr::null_mut()))?;
+            let r = ffi::EVP_PKEY_encrypt_init(pctx);
+            if r != 1 {
+                ffi::EVP_PKEY_CTX_free(pctx);
+                return Err(ErrorStack::get());
+            }
+
+            Ok(Encrypter {
+                pctx,
+                _p: PhantomData,
+            })
+        }
+    }
+
+    /// Returns the RSA padding mode in use.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to `EVP_PKEY_CTX_get_rsa_padding`.
+    pub fn rsa_padding(&self) -> Result<Padding, ErrorStack> {
+        unsafe {
+            let mut pad = 0;
+            cvt(ffi::EVP_PKEY_CTX_get_rsa_padding(self.pctx, &mut pad))
+                .map(|_| Padding::from_raw(pad))
+        }
+    }
+
+    /// Sets the RSA padding mode.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to [`EVP_PKEY_CTX_set_rsa_padding`].
+    ///
+    /// [`EVP_PKEY_CTX_set_rsa_padding`]: https://www.openssl.org/docs/man1.1.0/crypto/EVP_PKEY_CTX_set_rsa_padding.html
+    pub fn set_rsa_padding(&mut self, padding: Padding) -> Result<(), ErrorStack> {
+        unsafe {
+            cvt(ffi::EVP_PKEY_CTX_set_rsa_padding(
+                self.pctx,
+                padding.as_raw(),
+            ))
+            .map(|_| ())
+        }
+    }
+
+    /// Sets the RSA MGF1 algorithm.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to [`EVP_PKEY_CTX_set_rsa_mgf1_md`].
+    ///
+    /// [`EVP_PKEY_CTX_set_rsa_mgf1_md`]: https://www.openssl.org/docs/manmaster/man7/RSA-PSS.html
+    pub fn set_rsa_mgf1_md(&mut self, md: MessageDigest) -> Result<(), ErrorStack> {
+        unsafe {
+            cvt(ffi::EVP_PKEY_CTX_set_rsa_mgf1_md(
+                self.pctx,
+                md.as_ptr() as *mut _,
+            ))
+            .map(|_| ())
+        }
+    }
+
+    /// Sets the RSA OAEP algorithm.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to [`EVP_PKEY_CTX_set_rsa_oaep_md`].
+    ///
+    /// [`EVP_PKEY_CTX_set_rsa_oaep_md`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_set_rsa_oaep_md.html
+    #[cfg(any(ossl102, libressl310))]
+    pub fn set_rsa_oaep_md(&mut self, md: MessageDigest) -> Result<(), ErrorStack> {
+        unsafe {
+            cvt(ffi::EVP_PKEY_CTX_set_rsa_oaep_md(
+                self.pctx,
+                md.as_ptr() as *mut _,
+            ))
+            .map(|_| ())
+        }
+    }
+
+    /// Sets the RSA OAEP label.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to [`EVP_PKEY_CTX_set0_rsa_oaep_label`].
+    ///
+    /// [`EVP_PKEY_CTX_set0_rsa_oaep_label`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_set0_rsa_oaep_label.html
+    #[cfg(any(ossl102, libressl310))]
+    pub fn set_rsa_oaep_label(&mut self, label: &[u8]) -> Result<(), ErrorStack> {
+        unsafe {
+            let p = cvt_p(ffi::CRYPTO_malloc(
+                label.len() as _,
+                concat!(file!(), "\0").as_ptr() as *const _,
+                line!() as c_int,
+            ))?;
+            ptr::copy_nonoverlapping(label.as_ptr(), p as *mut u8, label.len());
+
+            cvt(ffi::EVP_PKEY_CTX_set0_rsa_oaep_label(
+                self.pctx,
+                p as *mut c_void,
+                label.len() as c_int,
+            ))
+            .map(|_| ())
+            .map_err(|e| {
+                #[cfg(not(ossl110))]
+                ::ffi::CRYPTO_free(p as *mut c_void);
+                #[cfg(ossl110)]
+                ::ffi::CRYPTO_free(
+                    p as *mut c_void,
+                    concat!(file!(), "\0").as_ptr() as *const _,
+                    line!() as c_int,
+                );
+                e
+            })
+        }
+    }
+
+    /// Performs public key encryption.
+    ///
+    /// In order to know the size needed for the output buffer, use [`encrypt_len`](Encrypter::encrypt_len).
+    /// Note that the length of the output buffer can be greater of the length of the encoded data.
+    /// ```
+    /// # use openssl::{
+    /// #   encrypt::Encrypter,
+    /// #   pkey::PKey,
+    /// #   rsa::{Rsa, Padding},
+    /// # };
+    /// #
+    /// # let key = include_bytes!("../test/rsa.pem");
+    /// # let private_key = Rsa::private_key_from_pem(key).unwrap();
+    /// # let pkey = PKey::from_rsa(private_key).unwrap();
+    /// # let input = b"hello world".to_vec();
+    /// #
+    /// let mut encrypter = Encrypter::new(&pkey).unwrap();
+    /// encrypter.set_rsa_padding(Padding::PKCS1).unwrap();
+    ///
+    /// // Get the length of the output buffer
+    /// let buffer_len = encrypter.encrypt_len(&input).unwrap();
+    /// let mut encoded = vec![0u8; buffer_len];
+    ///
+    /// // Encode the data and get its length
+    /// let encoded_len = encrypter.encrypt(&input, &mut encoded).unwrap();
+    ///
+    /// // Use only the part of the buffer with the encoded data
+    /// let encoded = &encoded[..encoded_len];
+    /// ```
+    ///
+    /// This corresponds to [`EVP_PKEY_encrypt`].
+    ///
+    /// [`EVP_PKEY_encrypt`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_encrypt.html
+    pub fn encrypt(&self, from: &[u8], to: &mut [u8]) -> Result<usize, ErrorStack> {
+        let mut written = to.len();
+        unsafe {
+            cvt(ffi::EVP_PKEY_encrypt(
+                self.pctx,
+                to.as_mut_ptr(),
+                &mut written,
+                from.as_ptr(),
+                from.len(),
+            ))?;
+        }
+
+        Ok(written)
+    }
+
+    /// Gets the size of the buffer needed to encrypt the input data.
+    ///
+    /// This corresponds to [`EVP_PKEY_encrypt`] called with a null pointer as output argument.
+    ///
+    /// [`EVP_PKEY_encrypt`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_encrypt.html
+    pub fn encrypt_len(&self, from: &[u8]) -> Result<usize, ErrorStack> {
+        let mut written = 0;
+        unsafe {
+            cvt(ffi::EVP_PKEY_encrypt(
+                self.pctx,
+                ptr::null_mut(),
+                &mut written,
+                from.as_ptr(),
+                from.len(),
+            ))?;
+        }
+
+        Ok(written)
+    }
+}
+
+/// A type which decrypts data.
+pub struct Decrypter<'a> {
+    pctx: *mut ffi::EVP_PKEY_CTX,
+    _p: PhantomData<&'a ()>,
+}
+
+unsafe impl<'a> Sync for Decrypter<'a> {}
+unsafe impl<'a> Send for Decrypter<'a> {}
+
+impl<'a> Drop for Decrypter<'a> {
+    fn drop(&mut self) {
+        unsafe {
+            ffi::EVP_PKEY_CTX_free(self.pctx);
+        }
+    }
+}
+
+impl<'a> Decrypter<'a> {
+    /// Creates a new `Decrypter`.
+    ///
+    /// OpenSSL documentation at [`EVP_PKEY_decrypt_init`].
+    ///
+    /// [`EVP_PKEY_decrypt_init`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_decrypt_init.html
+    pub fn new<T>(pkey: &'a PKeyRef<T>) -> Result<Decrypter<'a>, ErrorStack>
+    where
+        T: HasPrivate,
+    {
+        unsafe {
+            ffi::init();
+
+            let pctx = cvt_p(ffi::EVP_PKEY_CTX_new(pkey.as_ptr(), ptr::null_mut()))?;
+            let r = ffi::EVP_PKEY_decrypt_init(pctx);
+            if r != 1 {
+                ffi::EVP_PKEY_CTX_free(pctx);
+                return Err(ErrorStack::get());
+            }
+
+            Ok(Decrypter {
+                pctx,
+                _p: PhantomData,
+            })
+        }
+    }
+
+    /// Returns the RSA padding mode in use.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to `EVP_PKEY_CTX_get_rsa_padding`.
+    pub fn rsa_padding(&self) -> Result<Padding, ErrorStack> {
+        unsafe {
+            let mut pad = 0;
+            cvt(ffi::EVP_PKEY_CTX_get_rsa_padding(self.pctx, &mut pad))
+                .map(|_| Padding::from_raw(pad))
+        }
+    }
+
+    /// Sets the RSA padding mode.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to [`EVP_PKEY_CTX_set_rsa_padding`].
+    ///
+    /// [`EVP_PKEY_CTX_set_rsa_padding`]: https://www.openssl.org/docs/man1.1.0/crypto/EVP_PKEY_CTX_set_rsa_padding.html
+    pub fn set_rsa_padding(&mut self, padding: Padding) -> Result<(), ErrorStack> {
+        unsafe {
+            cvt(ffi::EVP_PKEY_CTX_set_rsa_padding(
+                self.pctx,
+                padding.as_raw(),
+            ))
+            .map(|_| ())
+        }
+    }
+
+    /// Sets the RSA MGF1 algorithm.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to [`EVP_PKEY_CTX_set_rsa_mgf1_md`].
+    ///
+    /// [`EVP_PKEY_CTX_set_rsa_mgf1_md`]: https://www.openssl.org/docs/manmaster/man7/RSA-PSS.html
+    pub fn set_rsa_mgf1_md(&mut self, md: MessageDigest) -> Result<(), ErrorStack> {
+        unsafe {
+            cvt(ffi::EVP_PKEY_CTX_set_rsa_mgf1_md(
+                self.pctx,
+                md.as_ptr() as *mut _,
+            ))
+            .map(|_| ())
+        }
+    }
+
+    /// Sets the RSA OAEP algorithm.
+    ///
+    /// This is only useful for RSA keys.
+    ///
+    /// This corresponds to [`EVP_PKEY_CTX_set_rsa_oaep_md`].
+    ///
+    /// [`EVP_PKEY_CTX_set_rsa_oaep_md`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_set_rsa_oaep_md.html
+    #[cfg(any(ossl102, libressl310))]
+    pub fn set_rsa_oaep_md(&mut self, md: MessageDigest) -> Result<(), ErrorStack> {
+        unsafe {
+            cvt(ffi::EVP_PKEY_CTX_set_rsa_oaep_md(
+                self.pctx,
+                md.as_ptr() as *mut _,
+            ))
+            .map(|_| ())
+        }
+    }
+
+    /// Performs public key decryption.
+    ///
+    /// In order to know the size needed for the output buffer, use [`decrypt_len`](Decrypter::decrypt_len).
+    /// Note that the length of the output buffer can be greater of the length of the decoded data.
+    /// ```
+    /// # use openssl::{
+    /// #   encrypt::Decrypter,
+    /// #   pkey::PKey,
+    /// #   rsa::{Rsa, Padding},
+    /// # };
+    /// #
+    /// # const INPUT: &[u8] = b"\
+    /// #     \x26\xa1\xc1\x13\xc5\x7f\xb4\x9f\xa0\xb4\xde\x61\x5e\x2e\xc6\xfb\x76\x5c\xd1\x2b\x5f\
+    /// #     \x1d\x36\x60\xfa\xf8\xe8\xb3\x21\xf4\x9c\x70\xbc\x03\xea\xea\xac\xce\x4b\xb3\xf6\x45\
+    /// #     \xcc\xb3\x80\x9e\xa8\xf7\xc3\x5d\x06\x12\x7a\xa3\x0c\x30\x67\xf1\xe7\x94\x6c\xf6\x26\
+    /// #     \xac\x28\x17\x59\x69\xe1\xdc\xed\x7e\xc0\xe9\x62\x57\x49\xce\xdd\x13\x07\xde\x18\x03\
+    /// #     \x0f\x9d\x61\x65\xb9\x23\x8c\x78\x4b\xad\x23\x49\x75\x47\x64\xa0\xa0\xa2\x90\xc1\x49\
+    /// #     \x1b\x05\x24\xc2\xe9\x2c\x0d\x49\x78\x72\x61\x72\xed\x8b\x6f\x8a\xe8\xca\x05\x5c\x58\
+    /// #     \xd6\x95\xd6\x7b\xe3\x2d\x0d\xaa\x3e\x6d\x3c\x9a\x1c\x1d\xb4\x6c\x42\x9d\x9a\x82\x55\
+    /// #     \xd9\xde\xc8\x08\x7b\x17\xac\xd7\xaf\x86\x7b\x69\x9e\x3c\xf4\x5e\x1c\x39\x52\x6d\x62\
+    /// #     \x50\x51\xbd\xa6\xc8\x4e\xe9\x34\xf0\x37\x0d\xa9\xa9\x77\xe6\xf5\xc2\x47\x2d\xa8\xee\
+    /// #     \x3f\x69\x78\xff\xa9\xdc\x70\x22\x20\x9a\x5c\x9b\x70\x15\x90\xd3\xb4\x0e\x54\x9e\x48\
+    /// #     \xed\xb6\x2c\x88\xfc\xb4\xa9\x37\x10\xfa\x71\xb2\xec\x75\xe7\xe7\x0e\xf4\x60\x2c\x7b\
+    /// #     \x58\xaf\xa0\x53\xbd\x24\xf1\x12\xe3\x2e\x99\x25\x0a\x54\x54\x9d\xa1\xdb\xca\x41\x85\
+    /// #     \xf4\x62\x78\x64";
+    /// #
+    /// # let key = include_bytes!("../test/rsa.pem");
+    /// # let private_key = Rsa::private_key_from_pem(key).unwrap();
+    /// # let pkey = PKey::from_rsa(private_key).unwrap();
+    /// # let input = INPUT.to_vec();
+    /// #
+    /// let mut decrypter = Decrypter::new(&pkey).unwrap();
+    /// decrypter.set_rsa_padding(Padding::PKCS1).unwrap();
+    ///
+    /// // Get the length of the output buffer
+    /// let buffer_len = decrypter.decrypt_len(&input).unwrap();
+    /// let mut decoded = vec![0u8; buffer_len];
+    ///
+    /// // Decrypt the data and get its length
+    /// let decoded_len = decrypter.decrypt(&input, &mut decoded).unwrap();
+    ///
+    /// // Use only the part of the buffer with the decrypted data
+    /// let decoded = &decoded[..decoded_len];
+    /// ```
+    ///
+    /// This corresponds to [`EVP_PKEY_decrypt`].
+    ///
+    /// [`EVP_PKEY_decrypt`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_decrypt.html
+    pub fn decrypt(&self, from: &[u8], to: &mut [u8]) -> Result<usize, ErrorStack> {
+        let mut written = to.len();
+        unsafe {
+            cvt(ffi::EVP_PKEY_decrypt(
+                self.pctx,
+                to.as_mut_ptr(),
+                &mut written,
+                from.as_ptr(),
+                from.len(),
+            ))?;
+        }
+
+        Ok(written)
+    }
+
+    /// Gets the size of the buffer needed to decrypt the input data.
+    ///
+    /// This corresponds to [`EVP_PKEY_decrypt`] called with a null pointer as output argument.
+    ///
+    /// [`EVP_PKEY_decrypt`]: https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_decrypt.html
+    pub fn decrypt_len(&self, from: &[u8]) -> Result<usize, ErrorStack> {
+        let mut written = 0;
+        unsafe {
+            cvt(ffi::EVP_PKEY_decrypt(
+                self.pctx,
+                ptr::null_mut(),
+                &mut written,
+                from.as_ptr(),
+                from.len(),
+            ))?;
+        }
+
+        Ok(written)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use hex::FromHex;
+
+    use crate::encrypt::{Decrypter, Encrypter};
+    #[cfg(any(ossl102, libressl310))]
+    use crate::hash::MessageDigest;
+    use crate::pkey::PKey;
+    use crate::rsa::{Padding, Rsa};
+
+    const INPUT: &str =
+        "65794a68624763694f694a53557a49314e694a392e65794a7063334d694f694a71623255694c41304b49434a6c\
+         654841694f6a457a4d4441344d546b7a4f44417344516f67496d6830644841364c79396c654746746347786c4c\
+         6d4e76625339706331397962323930496a7030636e566c6651";
+
+    #[test]
+    fn rsa_encrypt_decrypt() {
+        let key = include_bytes!("../test/rsa.pem");
+        let private_key = Rsa::private_key_from_pem(key).unwrap();
+        let pkey = PKey::from_rsa(private_key).unwrap();
+
+        let mut encrypter = Encrypter::new(&pkey).unwrap();
+        encrypter.set_rsa_padding(Padding::PKCS1).unwrap();
+        let input = Vec::from_hex(INPUT).unwrap();
+        let buffer_len = encrypter.encrypt_len(&input).unwrap();
+        let mut encoded = vec![0u8; buffer_len];
+        let encoded_len = encrypter.encrypt(&input, &mut encoded).unwrap();
+        let encoded = &encoded[..encoded_len];
+
+        let mut decrypter = Decrypter::new(&pkey).unwrap();
+        decrypter.set_rsa_padding(Padding::PKCS1).unwrap();
+        let buffer_len = decrypter.decrypt_len(encoded).unwrap();
+        let mut decoded = vec![0u8; buffer_len];
+        let decoded_len = decrypter.decrypt(encoded, &mut decoded).unwrap();
+        let decoded = &decoded[..decoded_len];
+
+        assert_eq!(decoded, &*input);
+    }
+
+    #[test]
+    #[cfg(any(ossl102, libressl310))]
+    fn rsa_encrypt_decrypt_with_sha256() {
+        let key = include_bytes!("../test/rsa.pem");
+        let private_key = Rsa::private_key_from_pem(key).unwrap();
+        let pkey = PKey::from_rsa(private_key).unwrap();
+
+        let md = MessageDigest::sha256();
+
+        let mut encrypter = Encrypter::new(&pkey).unwrap();
+        encrypter.set_rsa_padding(Padding::PKCS1_OAEP).unwrap();
+        encrypter.set_rsa_oaep_md(md).unwrap();
+        encrypter.set_rsa_mgf1_md(md).unwrap();
+        let input = Vec::from_hex(INPUT).unwrap();
+        let buffer_len = encrypter.encrypt_len(&input).unwrap();
+        let mut encoded = vec![0u8; buffer_len];
+        let encoded_len = encrypter.encrypt(&input, &mut encoded).unwrap();
+        let encoded = &encoded[..encoded_len];
+
+        let mut decrypter = Decrypter::new(&pkey).unwrap();
+        decrypter.set_rsa_padding(Padding::PKCS1_OAEP).unwrap();
+        decrypter.set_rsa_oaep_md(md).unwrap();
+        decrypter.set_rsa_mgf1_md(md).unwrap();
+        let buffer_len = decrypter.decrypt_len(encoded).unwrap();
+        let mut decoded = vec![0u8; buffer_len];
+        let decoded_len = decrypter.decrypt(encoded, &mut decoded).unwrap();
+        let decoded = &decoded[..decoded_len];
+
+        assert_eq!(decoded, &*input);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/envelope.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/envelope.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/envelope.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/envelope.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,38 +3,32 @@
 //! # Example
 //!
 //! ```rust
-//!
-//! extern crate openssl;
-//!
 //! use openssl::rsa::Rsa;
 //! use openssl::envelope::Seal;
 //! use openssl::pkey::PKey;
 //! use openssl::symm::Cipher;
 //!
-//! fn main() {
-//!     let rsa = Rsa::generate(2048).unwrap();
-//!     let key = PKey::from_rsa(rsa).unwrap();
+//! let rsa = Rsa::generate(2048).unwrap();
+//! let key = PKey::from_rsa(rsa).unwrap();
 //!
-//!     let cipher = Cipher::aes_256_cbc();
-//!     let mut seal = Seal::new(cipher, &[key]).unwrap();
+//! let cipher = Cipher::aes_256_cbc();
+//! let mut seal = Seal::new(cipher, &[key]).unwrap();
 //!
-//!     let secret = b"My secret message";
-//!     let mut encrypted = vec![0; secret.len() + cipher.block_size()];
+//! let secret = b"My secret message";
+//! let mut encrypted = vec![0; secret.len() + cipher.block_size()];
 //!
-//!     let mut enc_len = seal.update(secret, &mut encrypted).unwrap();
-//!     enc_len += seal.finalize(&mut encrypted[enc_len..]).unwrap();
-//!     encrypted.truncate(enc_len);
-//! }
+//! let mut enc_len = seal.update(secret, &mut encrypted).unwrap();
+//! enc_len += seal.finalize(&mut encrypted[enc_len..]).unwrap();
+//! encrypted.truncate(enc_len);
 //! ```
-use error::ErrorStack;
-use ffi;
+use crate::error::ErrorStack;
+use crate::pkey::{HasPrivate, HasPublic, PKey, PKeyRef};
+use crate::symm::Cipher;
+use crate::{cvt, cvt_p};
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
-use pkey::{HasPrivate, HasPublic, PKey, PKeyRef};
 use std::cmp;
 use std::ptr;
-use symm::Cipher;
-use {cvt, cvt_p};
 
 /// Represents an EVP_Seal context.
 pub struct Seal {
@@ -259,8 +253,8 @@
 #[cfg(test)]
 mod test {
     use super::*;
-    use pkey::PKey;
-    use symm::Cipher;
+    use crate::pkey::PKey;
+    use crate::symm::Cipher;
 
     #[test]
     fn public_encrypt_private_decrypt() {
@@ -278,7 +272,7 @@
         let iv = seal.iv();
         let encrypted_key = &seal.encrypted_keys()[0];
 
-        let mut open = Open::new(cipher, &private_key, iv, &encrypted_key).unwrap();
+        let mut open = Open::new(cipher, &private_key, iv, encrypted_key).unwrap();
         let mut decrypted = vec![0; enc_len + cipher.block_size()];
         let mut dec_len = open.update(&encrypted[..enc_len], &mut decrypted).unwrap();
         dec_len += open.finalize(&mut decrypted[dec_len..]).unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,6 +15,7 @@
 //!     Err(e) => println!("Parsing Error: {:?}", e),
 //! }
 //! ```
+use cfg_if::cfg_if;
 use libc::{c_char, c_int, c_ulong};
 use std::borrow::Cow;
 use std::error;
@@ -24,8 +25,6 @@
 use std::ptr;
 use std::str;
 
-use ffi;
-
 /// Collection of [`Error`]s from OpenSSL.
 ///
 /// [`Error`]: struct.Error.html
@@ -58,7 +57,7 @@
 }
 
 impl fmt::Display for ErrorStack {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.0.is_empty() {
             return fmt.write_str("OpenSSL error");
         }
@@ -95,6 +94,7 @@
     code: c_ulong,
     file: *const c_char,
     line: c_int,
+    func: *const c_char,
     data: Option<Cow<'static, str>>,
 }
 
@@ -109,9 +109,10 @@
 
             let mut file = ptr::null();
             let mut line = 0;
+            let mut func = ptr::null();
             let mut data = ptr::null();
             let mut flags = 0;
-            match ffi::ERR_get_error_line_data(&mut file, &mut line, &mut data, &mut flags) {
+            match ERR_get_error_all(&mut file, &mut line, &mut func, &mut data, &mut flags) {
                 0 => None,
                 code => {
                     // The memory referenced by data is only valid until that slot is overwritten
@@ -132,6 +133,7 @@
                         code,
                         file,
                         line,
+                        func,
                         data,
                     })
                 }
@@ -141,14 +143,9 @@
 
     /// Pushes the error back onto the OpenSSL error stack.
     pub fn put(&self) {
+        self.put_error();
+
         unsafe {
-            ffi::ERR_put_error(
-                ffi::ERR_GET_LIB(self.code),
-                ffi::ERR_GET_FUNC(self.code),
-                ffi::ERR_GET_REASON(self.code),
-                self.file,
-                self.line,
-            );
             let data = match self.data {
                 Some(Cow::Borrowed(data)) => Some((data.as_ptr() as *mut c_char, 0)),
                 Some(Cow::Owned(ref data)) => {
@@ -173,6 +170,32 @@
         }
     }
 
+    #[cfg(ossl300)]
+    fn put_error(&self) {
+        unsafe {
+            ffi::ERR_new();
+            ffi::ERR_set_debug(self.file, self.line, self.func);
+            ffi::ERR_set_error(
+                ffi::ERR_GET_LIB(self.code),
+                ffi::ERR_GET_REASON(self.code),
+                ptr::null(),
+            );
+        }
+    }
+
+    #[cfg(not(ossl300))]
+    fn put_error(&self) {
+        unsafe {
+            ffi::ERR_put_error(
+                ffi::ERR_GET_LIB(self.code),
+                ffi::ERR_GET_FUNC(self.code),
+                ffi::ERR_GET_REASON(self.code),
+                self.file,
+                self.line,
+            );
+        }
+    }
+
     /// Returns the raw OpenSSL error code for this error.
     pub fn code(&self) -> c_ulong {
         self.code
@@ -193,11 +216,10 @@
     /// Returns the name of the function reporting the error.
     pub fn function(&self) -> Option<&'static str> {
         unsafe {
-            let cstr = ffi::ERR_func_error_string(self.code);
-            if cstr.is_null() {
+            if self.func.is_null() {
                 return None;
             }
-            let bytes = CStr::from_ptr(cstr as *const _).to_bytes();
+            let bytes = CStr::from_ptr(self.func).to_bytes();
             Some(str::from_utf8(bytes).unwrap())
         }
     }
@@ -236,7 +258,7 @@
 }
 
 impl fmt::Debug for Error {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut builder = fmt.debug_struct("Error");
         builder.field("code", &self.code());
         if let Some(library) = self.library() {
@@ -258,7 +280,7 @@
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(fmt, "error:{:08X}", self.code())?;
         match self.library() {
             Some(l) => write!(fmt, ":{}", l)?,
@@ -283,3 +305,22 @@
 }
 
 impl error::Error for Error {}
+
+cfg_if! {
+    if #[cfg(ossl300)] {
+        use ffi::ERR_get_error_all;
+    } else {
+        #[allow(bad_style)]
+        unsafe extern "C" fn ERR_get_error_all(
+            file: *mut *const c_char,
+            line: *mut c_int,
+            func: *mut *const c_char,
+            data: *mut *const c_char,
+            flags: *mut c_int,
+        ) -> c_ulong {
+            let code = ffi::ERR_get_error_line_data(file, line, data, flags);
+            *func = ffi::ERR_func_error_string(code);
+            code
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/fips.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/fips.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/fips.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/fips.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,14 +3,14 @@
 //! See [OpenSSL's documentation] for details.
 //!
 //! [OpenSSL's documentation]: https://www.openssl.org/docs/fips/UserGuide-2.0.pdf
-use cvt;
-use error::ErrorStack;
-use ffi;
+use crate::cvt;
+use crate::error::ErrorStack;
 
 /// Moves the library into or out of the FIPS 140-2 mode of operation.
 ///
 /// This corresponds to `FIPS_mode_set`.
 pub fn enable(enabled: bool) -> Result<(), ErrorStack> {
+    ffi::init();
     unsafe { cvt(ffi::FIPS_mode_set(enabled as _)).map(|_| ()) }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/hash.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/hash.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/hash.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/hash.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,14 @@
-use ffi;
+use cfg_if::cfg_if;
+use std::ffi::CString;
 use std::fmt;
 use std::io;
 use std::io::prelude::*;
 use std::ops::{Deref, DerefMut};
 use std::ptr;
 
-use error::ErrorStack;
-use nid::Nid;
-use {cvt, cvt_p};
+use crate::error::ErrorStack;
+use crate::nid::Nid;
+use crate::{cvt, cvt_p};
 
 cfg_if! {
     if #[cfg(ossl110)] {
@@ -46,6 +47,24 @@
         }
     }
 
+    /// Returns the `MessageDigest` corresponding to an algorithm name.
+    ///
+    /// This corresponds to [`EVP_get_digestbyname`].
+    ///
+    /// [`EVP_get_digestbyname`]: https://www.openssl.org/docs/man1.1.0/crypto/EVP_DigestInit.html
+    pub fn from_name(name: &str) -> Option<MessageDigest> {
+        ffi::init();
+        let name = CString::new(name).ok()?;
+        unsafe {
+            let ptr = ffi::EVP_get_digestbyname(name.as_ptr());
+            if ptr.is_null() {
+                None
+            } else {
+                Some(MessageDigest(ptr))
+            }
+        }
+    }
+
     pub fn null() -> MessageDigest {
         unsafe { MessageDigest(ffi::EVP_md_null()) }
     }
@@ -109,6 +128,11 @@
         unsafe { MessageDigest(ffi::EVP_ripemd160()) }
     }
 
+    #[cfg(all(any(ossl111, libressl291), not(osslconf = "OPENSSL_NO_SM3")))]
+    pub fn sm3() -> MessageDigest {
+        unsafe { MessageDigest(ffi::EVP_sm3()) }
+    }
+
     #[allow(clippy::trivially_copy_pass_by_ref)]
     pub fn as_ptr(&self) -> *const ffi::EVP_MD {
         self.0
@@ -371,7 +395,7 @@
 }
 
 impl fmt::Debug for DigestBytes {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Debug::fmt(&**self, fmt)
     }
 }
@@ -599,6 +623,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)]
     fn test_ripemd160() {
         let tests = [("616263", "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc")];
 
@@ -607,6 +632,19 @@
         }
     }
 
+    #[cfg(all(any(ossl111, libressl291), not(osslconf = "OPENSSL_NO_SM3")))]
+    #[test]
+    fn test_sm3() {
+        let tests = [(
+            "616263",
+            "66c7f0f462eeedd9d1f2d46bdc10e4e24167c4875cf2f7a2297da02b8f4ba8e0",
+        )];
+
+        for test in tests.iter() {
+            hash_test(MessageDigest::sm3(), test);
+        }
+    }
+
     #[test]
     fn from_nid() {
         assert_eq!(
@@ -614,4 +652,12 @@
             MessageDigest::sha256().as_ptr()
         );
     }
+
+    #[test]
+    fn from_name() {
+        assert_eq!(
+            MessageDigest::from_name("SHA256").unwrap().as_ptr(),
+            MessageDigest::sha256().as_ptr()
+        )
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 //! Bindings to OpenSSL
 //!
 //! This crate provides a safe interface to the popular OpenSSL cryptography library. OpenSSL versions 1.0.1 through
-//! 1.1.1 and LibreSSL versions 2.5 through 2.8 are supported.
+//! 1.1.1 and LibreSSL versions 2.5 through 3.3.x are supported.
 //!
 //! # Building
 //!
@@ -28,9 +28,15 @@
 //! Additionally, it will use `pkg-config` on Unix-like systems to find the system installation.
 //!
 //! ```not_rust
-//! # macOS
+//! # macOS (Homebrew)
 //! $ brew install openssl@1.1
 //!
+//! # macOS (MacPorts)
+//! $ sudo port install openssl
+//!
+//! # macOS (pkgsrc)
+//! $ sudo pkgin install openssl
+//!
 //! # Arch Linux
 //! $ sudo pacman -S pkg-config openssl
 //!
@@ -109,29 +115,14 @@
 //! ctx.set_ciphersuites("TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256").unwrap();
 //! ```
 #![doc(html_root_url = "https://docs.rs/openssl/0.10")]
-
-#[macro_use]
-extern crate bitflags;
-#[macro_use]
-extern crate cfg_if;
-#[macro_use]
-extern crate foreign_types;
-#[macro_use]
-extern crate lazy_static;
-extern crate libc;
-extern crate openssl_sys as ffi;
-
-#[cfg(test)]
-extern crate hex;
-#[cfg(test)]
-extern crate tempdir;
+#![warn(rust_2018_idioms)]
 
 #[doc(inline)]
 pub use ffi::init;
 
 use libc::c_int;
 
-use error::ErrorStack;
+use crate::error::ErrorStack;
 
 #[macro_use]
 mod macros;
@@ -151,14 +142,16 @@
 pub mod dsa;
 pub mod ec;
 pub mod ecdsa;
+pub mod encrypt;
 pub mod envelope;
 pub mod error;
 pub mod ex_data;
-#[cfg(not(libressl))]
+#[cfg(not(any(libressl, ossl300)))]
 pub mod fips;
 pub mod hash;
 pub mod memcmp;
 pub mod nid;
+#[cfg(not(osslconf = "OPENSSL_NO_OCSP"))]
 pub mod ocsp;
 pub mod pkcs12;
 pub mod pkcs5;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,10 +3,10 @@
         from_pem!($(#[$m])* $n, $t, $f);
 
         $(#[$m2])*
-        pub fn $n2(pem: &[u8], passphrase: &[u8]) -> Result<$t, ::error::ErrorStack> {
+        pub fn $n2(pem: &[u8], passphrase: &[u8]) -> Result<$t, crate::error::ErrorStack> {
             unsafe {
                 ffi::init();
-                let bio = ::bio::MemBioSlice::new(pem)?;
+                let bio = crate::bio::MemBioSlice::new(pem)?;
                 let passphrase = ::std::ffi::CString::new(passphrase).unwrap();
                 cvt_p($f(bio.as_ptr(),
                          ptr::null_mut(),
@@ -17,16 +17,16 @@
         }
 
         $(#[$m3])*
-        pub fn $n3<F>(pem: &[u8], callback: F) -> Result<$t, ::error::ErrorStack>
-            where F: FnOnce(&mut [u8]) -> Result<usize, ::error::ErrorStack>
+        pub fn $n3<F>(pem: &[u8], callback: F) -> Result<$t, crate::error::ErrorStack>
+            where F: FnOnce(&mut [u8]) -> Result<usize, crate::error::ErrorStack>
         {
             unsafe {
                 ffi::init();
-                let mut cb = ::util::CallbackState::new(callback);
-                let bio = ::bio::MemBioSlice::new(pem)?;
+                let mut cb = crate::util::CallbackState::new(callback);
+                let bio = crate::bio::MemBioSlice::new(pem)?;
                 cvt_p($f(bio.as_ptr(),
                          ptr::null_mut(),
-                         Some(::util::invoke_passwd_cb::<F>),
+                         Some(crate::util::invoke_passwd_cb::<F>),
                          &mut cb as *mut _ as *mut _))
                     .map(|p| ::foreign_types::ForeignType::from_ptr(p))
             }
@@ -37,9 +37,9 @@
 macro_rules! private_key_to_pem {
     ($(#[$m:meta])* $n:ident, $(#[$m2:meta])* $n2:ident, $f:path) => {
         $(#[$m])*
-        pub fn $n(&self) -> Result<Vec<u8>, ::error::ErrorStack> {
+        pub fn $n(&self) -> Result<Vec<u8>, crate::error::ErrorStack> {
             unsafe {
-                let bio = ::bio::MemBio::new()?;
+                let bio = crate::bio::MemBio::new()?;
                 cvt($f(bio.as_ptr(),
                         self.as_ptr(),
                         ptr::null(),
@@ -54,11 +54,11 @@
         $(#[$m2])*
         pub fn $n2(
             &self,
-            cipher: ::symm::Cipher,
+            cipher: crate::symm::Cipher,
             passphrase: &[u8]
-        ) -> Result<Vec<u8>, ::error::ErrorStack> {
+        ) -> Result<Vec<u8>, crate::error::ErrorStack> {
             unsafe {
-                let bio = ::bio::MemBio::new()?;
+                let bio = crate::bio::MemBio::new()?;
                 assert!(passphrase.len() <= ::libc::c_int::max_value() as usize);
                 cvt($f(bio.as_ptr(),
                         self.as_ptr(),
@@ -76,9 +76,9 @@
 macro_rules! to_pem {
     ($(#[$m:meta])* $n:ident, $f:path) => {
         $(#[$m])*
-        pub fn $n(&self) -> Result<Vec<u8>, ::error::ErrorStack> {
+        pub fn $n(&self) -> Result<Vec<u8>, crate::error::ErrorStack> {
             unsafe {
-                let bio = ::bio::MemBio::new()?;
+                let bio = crate::bio::MemBio::new()?;
                 cvt($f(bio.as_ptr(), self.as_ptr()))?;
                 Ok(bio.get_buf().to_owned())
             }
@@ -89,12 +89,12 @@
 macro_rules! to_der {
     ($(#[$m:meta])* $n:ident, $f:path) => {
         $(#[$m])*
-        pub fn $n(&self) -> Result<Vec<u8>, ::error::ErrorStack> {
+        pub fn $n(&self) -> Result<Vec<u8>, crate::error::ErrorStack> {
             unsafe {
-                let len = ::cvt($f(::foreign_types::ForeignTypeRef::as_ptr(self),
+                let len = crate::cvt($f(::foreign_types::ForeignTypeRef::as_ptr(self),
                                         ptr::null_mut()))?;
                 let mut buf = vec![0; len as usize];
-                ::cvt($f(::foreign_types::ForeignTypeRef::as_ptr(self),
+                crate::cvt($f(::foreign_types::ForeignTypeRef::as_ptr(self),
                               &mut buf.as_mut_ptr()))?;
                 Ok(buf)
             }
@@ -105,11 +105,11 @@
 macro_rules! from_der {
     ($(#[$m:meta])* $n:ident, $t:ty, $f:path) => {
         $(#[$m])*
-        pub fn $n(der: &[u8]) -> Result<$t, ::error::ErrorStack> {
+        pub fn $n(der: &[u8]) -> Result<$t, crate::error::ErrorStack> {
             unsafe {
-                ::ffi::init();
+                ffi::init();
                 let len = ::std::cmp::min(der.len(), ::libc::c_long::max_value() as usize) as ::libc::c_long;
-                ::cvt_p($f(::std::ptr::null_mut(), &mut der.as_ptr(), len))
+                crate::cvt_p($f(::std::ptr::null_mut(), &mut der.as_ptr(), len))
                     .map(|p| ::foreign_types::ForeignType::from_ptr(p))
             }
         }
@@ -119,10 +119,10 @@
 macro_rules! from_pem {
     ($(#[$m:meta])* $n:ident, $t:ty, $f:path) => {
         $(#[$m])*
-        pub fn $n(pem: &[u8]) -> Result<$t, ::error::ErrorStack> {
+        pub fn $n(pem: &[u8]) -> Result<$t, crate::error::ErrorStack> {
             unsafe {
-                ::init();
-                let bio = ::bio::MemBioSlice::new(pem)?;
+                crate::init();
+                let bio = crate::bio::MemBioSlice::new(pem)?;
                 cvt_p($f(bio.as_ptr(), ::std::ptr::null_mut(), None, ::std::ptr::null_mut()))
                     .map(|p| ::foreign_types::ForeignType::from_ptr(p))
             }
@@ -143,7 +143,7 @@
         pub struct $borrowed:ident;
     )
         => {
-            foreign_type! {
+            ::foreign_types::foreign_type! {
                 $(#[$impl_attr])*
                 type CType = $ctype;
                 fn drop = $drop;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/memcmp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/memcmp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/memcmp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/memcmp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 //!
 //! # Examples
 //!
-//! To perform a constant-time comparision of two arrays of the same length but different
+//! To perform a constant-time comparison of two arrays of the same length but different
 //! values:
 //!
 //! ```
@@ -29,7 +29,6 @@
 //! assert!(!eq(&a, &b));
 //! assert!(!eq(&a, &c));
 //! ```
-use ffi;
 use libc::size_t;
 
 /// Returns `true` iff `a` and `b` contain the same bytes.
@@ -44,7 +43,7 @@
 ///
 /// # Examples
 ///
-/// To perform a constant-time comparision of two arrays of the same length but different
+/// To perform a constant-time comparison of two arrays of the same length but different
 /// values:
 ///
 /// ```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/nid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/nid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/nid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/nid.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,11 @@
 //! A collection of numerical identifiers for OpenSSL objects.
-use ffi;
 use libc::{c_char, c_int};
 
 use std::ffi::CStr;
 use std::str;
 
-use cvt_p;
-use error::ErrorStack;
+use crate::cvt_p;
+use crate::error::ErrorStack;
 
 /// The digest and public-key algorithms associated with a signature.
 pub struct SignatureAlgorithms {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ocsp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ocsp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ocsp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ocsp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,17 @@
-use ffi;
+use bitflags::bitflags;
 use foreign_types::ForeignTypeRef;
 use libc::{c_int, c_long, c_ulong};
 use std::mem;
 use std::ptr;
 
-use asn1::Asn1GeneralizedTimeRef;
-use error::ErrorStack;
-use hash::MessageDigest;
-use stack::StackRef;
-use util::ForeignTypeRefExt;
-use x509::store::X509StoreRef;
-use x509::{X509Ref, X509};
-use {cvt, cvt_p};
+use crate::asn1::Asn1GeneralizedTimeRef;
+use crate::error::ErrorStack;
+use crate::hash::MessageDigest;
+use crate::stack::StackRef;
+use crate::util::ForeignTypeRefExt;
+use crate::x509::store::X509StoreRef;
+use crate::x509::{X509Ref, X509};
+use crate::{cvt, cvt_p};
 
 bitflags! {
     pub struct OcspFlag: c_ulong {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/pkcs12.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/pkcs12.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/pkcs12.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/pkcs12.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,17 @@
 //! PKCS #12 archives.
 
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::ffi::CString;
 use std::ptr;
 
-use error::ErrorStack;
-use nid::Nid;
-use pkey::{HasPrivate, PKey, PKeyRef, Private};
-use stack::Stack;
-use util::ForeignTypeExt;
-use x509::{X509Ref, X509};
-use {cvt, cvt_p};
+use crate::error::ErrorStack;
+use crate::nid::Nid;
+use crate::pkey::{HasPrivate, PKey, PKeyRef, Private};
+use crate::stack::Stack;
+use crate::util::ForeignTypeExt;
+use crate::x509::{X509Ref, X509};
+use crate::{cvt, cvt_p};
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::PKCS12;
@@ -197,19 +196,18 @@
 
 #[cfg(test)]
 mod test {
-    use hash::MessageDigest;
-    use hex;
-
-    use asn1::Asn1Time;
-    use nid::Nid;
-    use pkey::PKey;
-    use rsa::Rsa;
-    use x509::extension::KeyUsage;
-    use x509::{X509Name, X509};
+    use crate::asn1::Asn1Time;
+    use crate::hash::MessageDigest;
+    use crate::nid::Nid;
+    use crate::pkey::PKey;
+    use crate::rsa::Rsa;
+    use crate::x509::extension::KeyUsage;
+    use crate::x509::{X509Name, X509};
 
     use super::*;
 
     #[test]
+    #[cfg_attr(ossl300, ignore)] // https://github.com/openssl/openssl/issues/11672
     fn parse() {
         let der = include_bytes!("../test/identity.p12");
         let pkcs12 = Pkcs12::from_der(der).unwrap();
@@ -229,6 +227,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)] // https://github.com/openssl/openssl/issues/11672
     fn parse_empty_chain() {
         let der = include_bytes!("../test/keystore-empty-chain.p12");
         let pkcs12 = Pkcs12::from_der(der).unwrap();
@@ -237,6 +236,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)] // https://github.com/openssl/openssl/issues/11672
     fn create() {
         let subject_name = "ns.example.com";
         let rsa = Rsa::generate(2048).unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/pkcs5.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/pkcs5.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/pkcs5.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/pkcs5.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,10 @@
-use ffi;
 use libc::c_int;
 use std::ptr;
 
-use cvt;
-use error::ErrorStack;
-use hash::MessageDigest;
-use symm::Cipher;
+use crate::cvt;
+use crate::error::ErrorStack;
+use crate::hash::MessageDigest;
+use crate::symm::Cipher;
 
 #[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct KeyIvPair {
@@ -141,8 +140,8 @@
 
 #[cfg(test)]
 mod tests {
-    use hash::MessageDigest;
-    use symm::Cipher;
+    use crate::hash::MessageDigest;
+    use crate::symm::Cipher;
 
     // Test vectors from
     // https://git.lysator.liu.se/nettle/nettle/blob/nettle_3.1.1_release_20150424/testsuite/pbkdf2-test.c
@@ -281,8 +280,6 @@
     #[test]
     #[cfg(any(ossl110))]
     fn scrypt() {
-        use hex;
-
         let pass = "pleaseletmein";
         let salt = "SodiumChloride";
         let expected =
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/pkcs7.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/pkcs7.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/pkcs7.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/pkcs7.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,17 @@
-use bio::{MemBio, MemBioSlice};
-use error::ErrorStack;
-use ffi;
-use foreign_types::ForeignTypeRef;
+use bitflags::bitflags;
+use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
-use pkey::{HasPrivate, PKeyRef};
-use stack::StackRef;
+use std::mem;
 use std::ptr;
-use symm::Cipher;
-use x509::store::X509StoreRef;
-use x509::{X509Ref, X509};
-use {cvt, cvt_p};
+
+use crate::bio::{MemBio, MemBioSlice};
+use crate::error::ErrorStack;
+use crate::pkey::{HasPrivate, PKeyRef};
+use crate::stack::{Stack, StackRef};
+use crate::symm::Cipher;
+use crate::x509::store::X509StoreRef;
+use crate::x509::{X509Ref, X509};
+use crate::{cvt, cvt_p};
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::PKCS7;
@@ -280,16 +282,46 @@
 
         Ok(())
     }
+
+    /// Retrieve the signer's certificates from the PKCS#7 structure without verifying them.
+    ///
+    /// This corresponds to [`PKCS7_get0_signers`].
+    ///
+    /// [`PKCS7_get0_signers`]: https://www.openssl.org/docs/man1.0.2/crypto/PKCS7_verify.html
+    pub fn signers(
+        &self,
+        certs: &StackRef<X509>,
+        flags: Pkcs7Flags,
+    ) -> Result<Stack<X509>, ErrorStack> {
+        unsafe {
+            let ptr = cvt_p(ffi::PKCS7_get0_signers(
+                self.as_ptr(),
+                certs.as_ptr(),
+                flags.bits,
+            ))?;
+
+            // The returned stack is owned by the caller, but the certs inside are not! Our stack interface can't deal
+            // with that, so instead we just manually bump the refcount of the certs so that the whole stack is properly
+            // owned.
+            let stack = Stack::<X509>::from_ptr(ptr);
+            for cert in &stack {
+                mem::forget(cert.to_owned());
+            }
+
+            Ok(stack)
+        }
+    }
 }
 
 #[cfg(test)]
 mod tests {
-    use pkcs7::{Pkcs7, Pkcs7Flags};
-    use pkey::PKey;
-    use stack::Stack;
-    use symm::Cipher;
-    use x509::store::X509StoreBuilder;
-    use x509::X509;
+    use crate::hash::MessageDigest;
+    use crate::pkcs7::{Pkcs7, Pkcs7Flags};
+    use crate::pkey::PKey;
+    use crate::stack::Stack;
+    use crate::symm::Cipher;
+    use crate::x509::store::X509StoreBuilder;
+    use crate::x509::X509;
 
     #[test]
     fn encrypt_decrypt_test() {
@@ -398,10 +430,45 @@
     }
 
     #[test]
+    fn signers() {
+        let cert = include_bytes!("../test/cert.pem");
+        let cert = X509::from_pem(cert).unwrap();
+        let cert_digest = cert.digest(MessageDigest::sha256()).unwrap();
+        let certs = Stack::new().unwrap();
+        let message = "foo";
+        let flags = Pkcs7Flags::STREAM;
+        let pkey = include_bytes!("../test/key.pem");
+        let pkey = PKey::private_key_from_pem(pkey).unwrap();
+        let mut store_builder = X509StoreBuilder::new().expect("should succeed");
+
+        let root_ca = include_bytes!("../test/root-ca.pem");
+        let root_ca = X509::from_pem(root_ca).unwrap();
+        store_builder.add_cert(root_ca).expect("should succeed");
+
+        let pkcs7 =
+            Pkcs7::sign(&cert, &pkey, &certs, message.as_bytes(), flags).expect("should succeed");
+
+        let signed = pkcs7
+            .to_smime(message.as_bytes(), flags)
+            .expect("should succeed");
+
+        let (pkcs7_decoded, _) = Pkcs7::from_smime(signed.as_slice()).expect("should succeed");
+
+        let empty_certs = Stack::new().unwrap();
+        let signer_certs = pkcs7_decoded
+            .signers(&empty_certs, flags)
+            .expect("should succeed");
+        assert_eq!(empty_certs.len(), 0);
+        assert_eq!(signer_certs.len(), 1);
+        let signer_digest = signer_certs[0].digest(MessageDigest::sha256()).unwrap();
+        assert_eq!(*cert_digest, *signer_digest);
+    }
+
+    #[test]
     fn invalid_from_smime() {
         let input = String::from("Invalid SMIME Message");
         let result = Pkcs7::from_smime(input.as_bytes());
 
-        assert_eq!(result.is_err(), true)
+        assert!(result.is_err());
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/pkey.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/pkey.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/pkey.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/pkey.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,40 +29,35 @@
 //! Generate a 2048-bit RSA public/private key pair and print the public key.
 //!
 //! ```rust
-//!
-//! extern crate openssl;
-//!
 //! use openssl::rsa::Rsa;
 //! use openssl::pkey::PKey;
 //! use std::str;
 //!
-//! fn main() {
-//!     let rsa = Rsa::generate(2048).unwrap();
-//!     let pkey = PKey::from_rsa(rsa).unwrap();
+//! let rsa = Rsa::generate(2048).unwrap();
+//! let pkey = PKey::from_rsa(rsa).unwrap();
 //!
-//!     let pub_key: Vec<u8> = pkey.public_key_to_pem().unwrap();
-//!     println!("{:?}", str::from_utf8(pub_key.as_slice()).unwrap());
-//! }
+//! let pub_key: Vec<u8> = pkey.public_key_to_pem().unwrap();
+//! println!("{:?}", str::from_utf8(pub_key.as_slice()).unwrap());
 //! ```
 
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::{c_int, c_long};
+use std::convert::TryFrom;
 use std::ffi::CString;
 use std::fmt;
 use std::mem;
 use std::ptr;
 
-use bio::MemBioSlice;
-use dh::Dh;
-use dsa::Dsa;
-use ec::EcKey;
-use error::ErrorStack;
-use rsa::Rsa;
-#[cfg(ossl110)]
-use symm::Cipher;
-use util::{invoke_passwd_cb, CallbackState};
-use {cvt, cvt_p};
+use crate::bio::{MemBio, MemBioSlice};
+use crate::dh::Dh;
+use crate::dsa::Dsa;
+use crate::ec::EcKey;
+use crate::error::ErrorStack;
+use crate::rsa::Rsa;
+use crate::symm::Cipher;
+use crate::util::{invoke_passwd_cb, CallbackState};
+use crate::{cvt, cvt_p};
 
 /// A tag type indicating that a key only has parameters.
 pub enum Params {}
@@ -254,6 +249,34 @@
     {
         unsafe { ffi::EVP_PKEY_cmp(self.as_ptr(), other.as_ptr()) == 1 }
     }
+
+    /// Raw byte representation of a public key
+    ///
+    /// This function only works for algorithms that support raw public keys.
+    /// Currently this is: X25519, ED25519, X448 or ED448
+    ///
+    /// This corresponds to [`EVP_PKEY_get_raw_public_key`].
+    ///
+    /// [`EVP_PKEY_get_raw_public_key`]: https://www.openssl.org/docs/man1.1.1/man3/EVP_PKEY_get_raw_public_key.html
+    #[cfg(ossl111)]
+    pub fn raw_public_key(&self) -> Result<Vec<u8>, ErrorStack> {
+        unsafe {
+            let mut len = 0;
+            cvt(ffi::EVP_PKEY_get_raw_public_key(
+                self.as_ptr(),
+                ptr::null_mut(),
+                &mut len,
+            ))?;
+            let mut buf = vec![0u8; len];
+            cvt(ffi::EVP_PKEY_get_raw_public_key(
+                self.as_ptr(),
+                buf.as_mut_ptr(),
+                &mut len,
+            ))?;
+            buf.truncate(len);
+            Ok(buf)
+        }
+    }
 }
 
 impl<T> PKeyRef<T>
@@ -289,10 +312,67 @@
         private_key_to_der,
         ffi::i2d_PrivateKey
     }
+
+    /// Raw byte representation of a private key
+    ///
+    /// This function only works for algorithms that support raw private keys.
+    /// Currently this is: HMAC, X25519, ED25519, X448 or ED448
+    ///
+    /// This corresponds to [`EVP_PKEY_get_raw_private_key`].
+    ///
+    /// [`EVP_PKEY_get_raw_private_key`]: https://www.openssl.org/docs/man1.1.1/man3/EVP_PKEY_get_raw_private_key.html
+    #[cfg(ossl111)]
+    pub fn raw_private_key(&self) -> Result<Vec<u8>, ErrorStack> {
+        unsafe {
+            let mut len = 0;
+            cvt(ffi::EVP_PKEY_get_raw_private_key(
+                self.as_ptr(),
+                ptr::null_mut(),
+                &mut len,
+            ))?;
+            let mut buf = vec![0u8; len];
+            cvt(ffi::EVP_PKEY_get_raw_private_key(
+                self.as_ptr(),
+                buf.as_mut_ptr(),
+                &mut len,
+            ))?;
+            buf.truncate(len);
+            Ok(buf)
+        }
+    }
+
+    /// Serializes a private key into a DER-formatted PKCS#8, using the supplied password to
+    /// encrypt the key.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `passphrase` contains an embedded null.
+    pub fn private_key_to_pkcs8_passphrase(
+        &self,
+        cipher: Cipher,
+        passphrase: &[u8],
+    ) -> Result<Vec<u8>, ErrorStack> {
+        unsafe {
+            let bio = MemBio::new()?;
+            let len = passphrase.len();
+            let passphrase = CString::new(passphrase).unwrap();
+            cvt(ffi::i2d_PKCS8PrivateKey_bio(
+                bio.as_ptr(),
+                self.as_ptr(),
+                cipher.as_ptr(),
+                passphrase.as_ptr() as *const _ as *mut _,
+                len as ::libc::c_int,
+                None,
+                ptr::null_mut(),
+            ))?;
+
+            Ok(bio.get_buf().to_owned())
+        }
+    }
 }
 
 impl<T> fmt::Debug for PKey<T> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         let alg = match self.id() {
             Id::RSA => "RSA",
             Id::HMAC => "HMAC",
@@ -476,7 +556,7 @@
         }
     }
 
-    #[cfg(ossl110)]
+    #[cfg(ossl111)]
     fn generate_eddsa(nid: c_int) -> Result<PKey<Private>, ErrorStack> {
         unsafe {
             let kctx = cvt_p(ffi::EVP_PKEY_CTX_new_id(nid, ptr::null_mut()))?;
@@ -631,6 +711,30 @@
             .map(|p| PKey::from_ptr(p))
         }
     }
+
+    /// Creates a private key from its raw byte representation
+    ///
+    /// Algorithm types that support raw private keys are HMAC, X25519, ED25519, X448 or ED448
+    ///
+    /// This corresponds to [`EVP_PKEY_new_raw_private_key`].
+    ///
+    /// [`EVP_PKEY_new_raw_private_key`]: https://www.openssl.org/docs/man1.1.1/man3/EVP_PKEY_new_raw_private_key.html
+    #[cfg(ossl111)]
+    pub fn private_key_from_raw_bytes(
+        bytes: &[u8],
+        key_type: Id,
+    ) -> Result<PKey<Private>, ErrorStack> {
+        unsafe {
+            ffi::init();
+            cvt_p(ffi::EVP_PKEY_new_raw_private_key(
+                key_type.as_raw(),
+                ptr::null_mut(),
+                bytes.as_ptr(),
+                bytes.len(),
+            ))
+            .map(|p| PKey::from_ptr(p))
+        }
+    }
 }
 
 impl PKey<Public> {
@@ -657,6 +761,30 @@
         PKey<Public>,
         ffi::d2i_PUBKEY
     }
+
+    /// Creates a public key from its raw byte representation
+    ///
+    /// Algorithm types that support raw public keys are X25519, ED25519, X448 or ED448
+    ///
+    /// This corresponds to [`EVP_PKEY_new_raw_public_key`].
+    ///
+    /// [`EVP_PKEY_new_raw_public_key`]: https://www.openssl.org/docs/man1.1.1/man3/EVP_PKEY_new_raw_public_key.html
+    #[cfg(ossl111)]
+    pub fn public_key_from_raw_bytes(
+        bytes: &[u8],
+        key_type: Id,
+    ) -> Result<PKey<Public>, ErrorStack> {
+        unsafe {
+            ffi::init();
+            cvt_p(ffi::EVP_PKEY_new_raw_public_key(
+                key_type.as_raw(),
+                ptr::null_mut(),
+                bytes.as_ptr(),
+                bytes.len(),
+            ))
+            .map(|p| PKey::from_ptr(p))
+        }
+    }
 }
 
 cfg_if! {
@@ -676,17 +804,86 @@
     }
 }
 
+impl<T> TryFrom<EcKey<T>> for PKey<T> {
+    type Error = ErrorStack;
+
+    fn try_from(ec_key: EcKey<T>) -> Result<PKey<T>, ErrorStack> {
+        PKey::from_ec_key(ec_key)
+    }
+}
+
+impl<T> TryFrom<PKey<T>> for EcKey<T> {
+    type Error = ErrorStack;
+
+    fn try_from(pkey: PKey<T>) -> Result<EcKey<T>, ErrorStack> {
+        pkey.ec_key()
+    }
+}
+
+impl<T> TryFrom<Rsa<T>> for PKey<T> {
+    type Error = ErrorStack;
+
+    fn try_from(rsa: Rsa<T>) -> Result<PKey<T>, ErrorStack> {
+        PKey::from_rsa(rsa)
+    }
+}
+
+impl<T> TryFrom<PKey<T>> for Rsa<T> {
+    type Error = ErrorStack;
+
+    fn try_from(pkey: PKey<T>) -> Result<Rsa<T>, ErrorStack> {
+        pkey.rsa()
+    }
+}
+
+impl<T> TryFrom<Dsa<T>> for PKey<T> {
+    type Error = ErrorStack;
+
+    fn try_from(dsa: Dsa<T>) -> Result<PKey<T>, ErrorStack> {
+        PKey::from_dsa(dsa)
+    }
+}
+
+impl<T> TryFrom<PKey<T>> for Dsa<T> {
+    type Error = ErrorStack;
+
+    fn try_from(pkey: PKey<T>) -> Result<Dsa<T>, ErrorStack> {
+        pkey.dsa()
+    }
+}
+
+impl<T> TryFrom<Dh<T>> for PKey<T> {
+    type Error = ErrorStack;
+
+    fn try_from(dh: Dh<T>) -> Result<PKey<T>, ErrorStack> {
+        PKey::from_dh(dh)
+    }
+}
+
+impl<T> TryFrom<PKey<T>> for Dh<T> {
+    type Error = ErrorStack;
+
+    fn try_from(pkey: PKey<T>) -> Result<Dh<T>, ErrorStack> {
+        pkey.dh()
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use dh::Dh;
-    use dsa::Dsa;
-    use ec::EcKey;
-    use nid::Nid;
-    use rsa::Rsa;
-    use symm::Cipher;
+    use std::convert::TryInto;
+
+    use crate::dh::Dh;
+    use crate::dsa::Dsa;
+    use crate::ec::EcKey;
+    use crate::nid::Nid;
+    use crate::rsa::Rsa;
+    use crate::symm::Cipher;
 
     use super::*;
 
+    #[cfg(ossl111)]
+    use crate::rand::rand_bytes;
+
     #[test]
     fn test_to_password() {
         let rsa = Rsa::generate(2048).unwrap();
@@ -708,6 +905,17 @@
     fn test_encrypted_pkcs8_passphrase() {
         let key = include_bytes!("../test/pkcs8.der");
         PKey::private_key_from_pkcs8_passphrase(key, b"mypass").unwrap();
+
+        let rsa = Rsa::generate(2048).unwrap();
+        let pkey = PKey::from_rsa(rsa).unwrap();
+        let der = pkey
+            .private_key_to_pkcs8_passphrase(Cipher::aes_128_cbc(), b"mypass")
+            .unwrap();
+        let pkey2 = PKey::private_key_from_pkcs8_passphrase(&der, b"mypass").unwrap();
+        assert_eq!(
+            pkey.private_key_to_der().unwrap(),
+            pkey2.private_key_to_der().unwrap()
+        );
     }
 
     #[test]
@@ -797,4 +1005,127 @@
         assert_eq!(pkey.id(), Id::EC);
         assert!(pkey.rsa().is_err());
     }
+
+    #[test]
+    fn test_rsa_conversion() {
+        let rsa = Rsa::generate(2048).unwrap();
+        let pkey: PKey<Private> = rsa.clone().try_into().unwrap();
+        let rsa_: Rsa<Private> = pkey.try_into().unwrap();
+        // Eq is missing
+        assert_eq!(rsa.p(), rsa_.p());
+        assert_eq!(rsa.q(), rsa_.q());
+    }
+
+    #[test]
+    fn test_dsa_conversion() {
+        let dsa = Dsa::generate(2048).unwrap();
+        let pkey: PKey<Private> = dsa.clone().try_into().unwrap();
+        let dsa_: Dsa<Private> = pkey.try_into().unwrap();
+        // Eq is missing
+        assert_eq!(dsa.priv_key(), dsa_.priv_key());
+    }
+
+    #[test]
+    fn test_ec_key_conversion() {
+        let group = crate::ec::EcGroup::from_curve_name(crate::nid::Nid::X9_62_PRIME256V1).unwrap();
+        let ec_key = EcKey::generate(&group).unwrap();
+        let pkey: PKey<Private> = ec_key.clone().try_into().unwrap();
+        let ec_key_: EcKey<Private> = pkey.try_into().unwrap();
+        // Eq is missing
+        assert_eq!(ec_key.private_key(), ec_key_.private_key());
+    }
+
+    #[test]
+    fn test_dh_conversion() {
+        let dh_params = include_bytes!("../test/dhparams.pem");
+        let dh_params = Dh::params_from_pem(dh_params).unwrap();
+        let dh = dh_params.generate_key().unwrap();
+
+        // Clone is missing for Dh, save the parameters
+        let p = dh.prime_p().to_owned().unwrap();
+        let q = dh.prime_q().map(|q| q.to_owned().unwrap());
+        let g = dh.generator().to_owned().unwrap();
+
+        let pkey: PKey<Private> = dh.try_into().unwrap();
+        let dh_: Dh<Private> = pkey.try_into().unwrap();
+
+        // Eq is missing
+        assert_eq!(&p, dh_.prime_p());
+        assert_eq!(q, dh_.prime_q().map(|q| q.to_owned().unwrap()));
+        assert_eq!(&g, dh_.generator());
+    }
+
+    #[cfg(ossl111)]
+    fn test_raw_public_key(gen: fn() -> Result<PKey<Private>, ErrorStack>, key_type: Id) {
+        // Generate a new key
+        let key = gen().unwrap();
+
+        // Get the raw bytes, and create a new key from the raw bytes
+        let raw = key.raw_public_key().unwrap();
+        let from_raw = PKey::public_key_from_raw_bytes(&raw, key_type).unwrap();
+
+        // Compare the der encoding of the original and raw / restored public key
+        assert_eq!(
+            key.public_key_to_der().unwrap(),
+            from_raw.public_key_to_der().unwrap()
+        );
+    }
+
+    #[cfg(ossl111)]
+    fn test_raw_private_key(gen: fn() -> Result<PKey<Private>, ErrorStack>, key_type: Id) {
+        // Generate a new key
+        let key = gen().unwrap();
+
+        // Get the raw bytes, and create a new key from the raw bytes
+        let raw = key.raw_private_key().unwrap();
+        let from_raw = PKey::private_key_from_raw_bytes(&raw, key_type).unwrap();
+
+        // Compare the der encoding of the original and raw / restored public key
+        assert_eq!(
+            key.private_key_to_der().unwrap(),
+            from_raw.private_key_to_der().unwrap()
+        );
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_raw_public_key_bytes() {
+        test_raw_public_key(PKey::generate_x25519, Id::X25519);
+        test_raw_public_key(PKey::generate_ed25519, Id::ED25519);
+        test_raw_public_key(PKey::generate_x448, Id::X448);
+        test_raw_public_key(PKey::generate_ed448, Id::ED448);
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_raw_private_key_bytes() {
+        test_raw_private_key(PKey::generate_x25519, Id::X25519);
+        test_raw_private_key(PKey::generate_ed25519, Id::ED25519);
+        test_raw_private_key(PKey::generate_x448, Id::X448);
+        test_raw_private_key(PKey::generate_ed448, Id::ED448);
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_raw_hmac() {
+        let mut test_bytes = vec![0u8; 32];
+        rand_bytes(&mut test_bytes).unwrap();
+
+        let hmac_key = PKey::hmac(&test_bytes).unwrap();
+        assert!(hmac_key.raw_public_key().is_err());
+
+        let key_bytes = hmac_key.raw_private_key().unwrap();
+        assert_eq!(key_bytes, test_bytes);
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_raw_key_fail() {
+        // Getting a raw byte representation will not work with Nist curves
+        let group = crate::ec::EcGroup::from_curve_name(Nid::SECP256K1).unwrap();
+        let ec_key = EcKey::generate(&group).unwrap();
+        let pkey = PKey::from_ec_key(ec_key).unwrap();
+        assert!(pkey.raw_private_key().is_err());
+        assert!(pkey.raw_public_key().is_err());
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/rand.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/rand.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/rand.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/rand.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,11 +10,10 @@
 //! let mut buf = [0; 256];
 //! rand_bytes(&mut buf).unwrap();
 //! ```
-use ffi;
 use libc::c_int;
 
-use cvt;
-use error::ErrorStack;
+use crate::cvt;
+use crate::error::ErrorStack;
 
 /// Fill buffer with cryptographically strong pseudo-random bytes.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/rsa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/rsa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/rsa.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/rsa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,30 +16,25 @@
 //! Generate a 2048-bit RSA key pair and use the public key to encrypt some data.
 //!
 //! ```rust
-//!
-//! extern crate openssl;
-//!
 //! use openssl::rsa::{Rsa, Padding};
 //!
-//! fn main() {
-//!     let rsa = Rsa::generate(2048).unwrap();
-//!     let data = b"foobar";
-//!     let mut buf = vec![0; rsa.size() as usize];
-//!     let encrypted_len = rsa.public_encrypt(data, &mut buf, Padding::PKCS1).unwrap();
-//! }
+//! let rsa = Rsa::generate(2048).unwrap();
+//! let data = b"foobar";
+//! let mut buf = vec![0; rsa.size() as usize];
+//! let encrypted_len = rsa.public_encrypt(data, &mut buf, Padding::PKCS1).unwrap();
 //! ```
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::fmt;
 use std::mem;
 use std::ptr;
 
-use bn::{BigNum, BigNumRef};
-use error::ErrorStack;
-use pkey::{HasPrivate, HasPublic, Private, Public};
-use util::ForeignTypeRefExt;
-use {cvt, cvt_n, cvt_p};
+use crate::bn::{BigNum, BigNumRef};
+use crate::error::ErrorStack;
+use crate::pkey::{HasPrivate, HasPublic, Private, Public};
+use crate::util::ForeignTypeRefExt;
+use crate::{cvt, cvt_n, cvt_p};
 
 /// Type of encryption padding to use.
 ///
@@ -651,7 +646,7 @@
 }
 
 impl<T> fmt::Debug for Rsa<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Rsa")
     }
 }
@@ -754,7 +749,7 @@
 
 #[cfg(test)]
 mod test {
-    use symm::Cipher;
+    use crate::symm::Cipher;
 
     use super::*;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/sha.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/sha.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/sha.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/sha.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 //! SHA, or Secure Hash Algorithms, are a family of cryptographic hashing algorithms published by
 //! the National Institute of Standards and Technology (NIST).  Hash algorithms such as those in
 //! the SHA family are used to map data of an arbitrary size to a fixed-size string of bytes.
-//! As cryptographic hashing algorithms, these mappings have the property of being irreversable.
+//! As cryptographic hashing algorithms, these mappings have the property of being irreversible.
 //! This property makes hash algorithms like these excellent for uses such as verifying the
 //! contents of a file- if you know the hash you expect beforehand, then you can verify that the
 //! data you have is correct if it hashes to the same value.
@@ -14,40 +14,30 @@
 //! you can create a hasher that you can repeatedly update to add bytes to.
 //!
 //! ```rust
-//! extern crate openssl;
-//! extern crate hex;
-//!
 //! use openssl::sha;
 //!
-//! fn main() {
-//!     let mut hasher = sha::Sha256::new();
+//! let mut hasher = sha::Sha256::new();
 //!
-//!     hasher.update(b"Hello, ");
-//!     hasher.update(b"world");
+//! hasher.update(b"Hello, ");
+//! hasher.update(b"world");
 //!
-//!     let hash = hasher.finish();
-//!     println!("Hashed \"Hello, world\" to {}", hex::encode(hash));
-//! }
+//! let hash = hasher.finish();
+//! println!("Hashed \"Hello, world\" to {}", hex::encode(hash));
 //! ```
 //!
-//! On the other hand, if you already have access to all of the data you woud like to hash, you
+//! On the other hand, if you already have access to all of the data you would like to hash, you
 //! may prefer to use the slightly simpler method of simply calling the hash function corresponding
 //! to the algorithm you want to use.
 //!
 //! ```rust
-//! extern crate openssl;
-//! extern crate hex;
-//!
 //! use openssl::sha::sha256;
 //!
-//! fn main() {
-//!     let hash = sha256(b"your data or message");
-//!     println!("Hash = {}", hex::encode(hash));
-//! }
+//! let hash = sha256(b"your data or message");
+//! println!("Hash = {}", hex::encode(hash));
 //! ```
-use ffi;
+use cfg_if::cfg_if;
 use libc::c_void;
-use std::mem;
+use std::mem::MaybeUninit;
 
 /// Computes the SHA1 hash of some data.
 ///
@@ -56,293 +46,280 @@
 /// SHA1 is known to be insecure - it should not be used unless required for
 /// compatibility with existing systems.
 #[inline]
-#[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
 pub fn sha1(data: &[u8]) -> [u8; 20] {
     unsafe {
-        let mut hash: [u8; 20] = mem::uninitialized();
-        ffi::SHA1(data.as_ptr(), data.len(), hash.as_mut_ptr());
-        hash
+        let mut hash = MaybeUninit::<[u8; 20]>::uninit();
+        ffi::SHA1(data.as_ptr(), data.len(), hash.as_mut_ptr() as *mut _);
+        hash.assume_init()
     }
 }
 
 /// Computes the SHA224 hash of some data.
 #[inline]
-#[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
 pub fn sha224(data: &[u8]) -> [u8; 28] {
     unsafe {
-        let mut hash: [u8; 28] = mem::uninitialized();
-        ffi::SHA224(data.as_ptr(), data.len(), hash.as_mut_ptr());
-        hash
+        let mut hash = MaybeUninit::<[u8; 28]>::uninit();
+        ffi::SHA224(data.as_ptr(), data.len(), hash.as_mut_ptr() as *mut _);
+        hash.assume_init()
     }
 }
 
 /// Computes the SHA256 hash of some data.
 #[inline]
-#[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
 pub fn sha256(data: &[u8]) -> [u8; 32] {
     unsafe {
-        let mut hash: [u8; 32] = mem::uninitialized();
-        ffi::SHA256(data.as_ptr(), data.len(), hash.as_mut_ptr());
-        hash
+        let mut hash = MaybeUninit::<[u8; 32]>::uninit();
+        ffi::SHA256(data.as_ptr(), data.len(), hash.as_mut_ptr() as *mut _);
+        hash.assume_init()
     }
 }
 
 /// Computes the SHA384 hash of some data.
 #[inline]
-#[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
 pub fn sha384(data: &[u8]) -> [u8; 48] {
     unsafe {
-        let mut hash: [u8; 48] = mem::uninitialized();
-        ffi::SHA384(data.as_ptr(), data.len(), hash.as_mut_ptr());
-        hash
+        let mut hash = MaybeUninit::<[u8; 48]>::uninit();
+        ffi::SHA384(data.as_ptr(), data.len(), hash.as_mut_ptr() as *mut _);
+        hash.assume_init()
     }
 }
 
 /// Computes the SHA512 hash of some data.
 #[inline]
-#[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
 pub fn sha512(data: &[u8]) -> [u8; 64] {
     unsafe {
-        let mut hash: [u8; 64] = mem::uninitialized();
-        ffi::SHA512(data.as_ptr(), data.len(), hash.as_mut_ptr());
-        hash
-    }
-}
-
-/// An object which calculates a SHA1 hash of some data.
-///
-/// # Warning
-///
-/// SHA1 is known to be insecure - it should not be used unless required for
-/// compatibility with existing systems.
-#[derive(Clone)]
-pub struct Sha1(ffi::SHA_CTX);
-
-impl Default for Sha1 {
-    #[inline]
-    fn default() -> Sha1 {
-        Sha1::new()
-    }
-}
-
-impl Sha1 {
-    /// Creates a new hasher.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn new() -> Sha1 {
-        unsafe {
-            let mut ctx = mem::uninitialized();
-            ffi::SHA1_Init(&mut ctx);
-            Sha1(ctx)
-        }
-    }
-
-    /// Feeds some data into the hasher.
-    ///
-    /// This can be called multiple times.
-    #[inline]
-    pub fn update(&mut self, buf: &[u8]) {
-        unsafe {
-            ffi::SHA1_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
-        }
-    }
-
-    /// Returns the hash of the data.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn finish(mut self) -> [u8; 20] {
-        unsafe {
-            let mut hash: [u8; 20] = mem::uninitialized();
-            ffi::SHA1_Final(hash.as_mut_ptr(), &mut self.0);
-            hash
-        }
-    }
-}
-
-/// An object which calculates a SHA224 hash of some data.
-#[derive(Clone)]
-pub struct Sha224(ffi::SHA256_CTX);
-
-impl Default for Sha224 {
-    #[inline]
-    fn default() -> Sha224 {
-        Sha224::new()
-    }
-}
-
-impl Sha224 {
-    /// Creates a new hasher.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn new() -> Sha224 {
-        unsafe {
-            let mut ctx = mem::uninitialized();
-            ffi::SHA224_Init(&mut ctx);
-            Sha224(ctx)
-        }
-    }
-
-    /// Feeds some data into the hasher.
-    ///
-    /// This can be called multiple times.
-    #[inline]
-    pub fn update(&mut self, buf: &[u8]) {
-        unsafe {
-            ffi::SHA224_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
-        }
-    }
-
-    /// Returns the hash of the data.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn finish(mut self) -> [u8; 28] {
-        unsafe {
-            let mut hash: [u8; 28] = mem::uninitialized();
-            ffi::SHA224_Final(hash.as_mut_ptr(), &mut self.0);
-            hash
-        }
-    }
-}
-
-/// An object which calculates a SHA256 hash of some data.
-#[derive(Clone)]
-pub struct Sha256(ffi::SHA256_CTX);
-
-impl Default for Sha256 {
-    #[inline]
-    fn default() -> Sha256 {
-        Sha256::new()
-    }
-}
-
-impl Sha256 {
-    /// Creates a new hasher.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn new() -> Sha256 {
-        unsafe {
-            let mut ctx = mem::uninitialized();
-            ffi::SHA256_Init(&mut ctx);
-            Sha256(ctx)
-        }
-    }
-
-    /// Feeds some data into the hasher.
-    ///
-    /// This can be called multiple times.
-    #[inline]
-    pub fn update(&mut self, buf: &[u8]) {
-        unsafe {
-            ffi::SHA256_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
-        }
-    }
-
-    /// Returns the hash of the data.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn finish(mut self) -> [u8; 32] {
-        unsafe {
-            let mut hash: [u8; 32] = mem::uninitialized();
-            ffi::SHA256_Final(hash.as_mut_ptr(), &mut self.0);
-            hash
-        }
-    }
-}
-
-/// An object which calculates a SHA384 hash of some data.
-#[derive(Clone)]
-pub struct Sha384(ffi::SHA512_CTX);
-
-impl Default for Sha384 {
-    #[inline]
-    fn default() -> Sha384 {
-        Sha384::new()
-    }
-}
-
-impl Sha384 {
-    /// Creates a new hasher.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn new() -> Sha384 {
-        unsafe {
-            let mut ctx = mem::uninitialized();
-            ffi::SHA384_Init(&mut ctx);
-            Sha384(ctx)
-        }
-    }
-
-    /// Feeds some data into the hasher.
-    ///
-    /// This can be called multiple times.
-    #[inline]
-    pub fn update(&mut self, buf: &[u8]) {
-        unsafe {
-            ffi::SHA384_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
-        }
-    }
-
-    /// Returns the hash of the data.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn finish(mut self) -> [u8; 48] {
-        unsafe {
-            let mut hash: [u8; 48] = mem::uninitialized();
-            ffi::SHA384_Final(hash.as_mut_ptr(), &mut self.0);
-            hash
-        }
-    }
-}
-
-/// An object which calculates a SHA512 hash of some data.
-#[derive(Clone)]
-pub struct Sha512(ffi::SHA512_CTX);
-
-impl Default for Sha512 {
-    #[inline]
-    fn default() -> Sha512 {
-        Sha512::new()
-    }
-}
-
-impl Sha512 {
-    /// Creates a new hasher.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn new() -> Sha512 {
-        unsafe {
-            let mut ctx = mem::uninitialized();
-            ffi::SHA512_Init(&mut ctx);
-            Sha512(ctx)
+        let mut hash = MaybeUninit::<[u8; 64]>::uninit();
+        ffi::SHA512(data.as_ptr(), data.len(), hash.as_mut_ptr() as *mut _);
+        hash.assume_init()
+    }
+}
+
+cfg_if! {
+    if #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))] {
+        /// An object which calculates a SHA1 hash of some data.
+        ///
+        /// # Warning
+        ///
+        /// SHA1 is known to be insecure - it should not be used unless required for
+        /// compatibility with existing systems.
+        #[derive(Clone)]
+        pub struct Sha1(ffi::SHA_CTX);
+
+        impl Default for Sha1 {
+            #[inline]
+            fn default() -> Sha1 {
+                Sha1::new()
+            }
+        }
+
+        impl Sha1 {
+            /// Creates a new hasher.
+            #[inline]
+            pub fn new() -> Sha1 {
+                unsafe {
+                    let mut ctx = MaybeUninit::uninit();
+                    ffi::SHA1_Init( ctx.as_mut_ptr());
+                    Sha1(ctx.assume_init())
+                }
+            }
+
+            /// Feeds some data into the hasher.
+            ///
+            /// This can be called multiple times.
+            #[inline]
+            pub fn update(&mut self, buf: &[u8]) {
+                unsafe {
+                    ffi::SHA1_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
+                }
+            }
+
+            /// Returns the hash of the data.
+            #[inline]
+            pub fn finish(mut self) -> [u8; 20] {
+                unsafe {
+                    let mut hash = MaybeUninit::<[u8; 20]>::uninit();
+                    ffi::SHA1_Final(hash.as_mut_ptr() as *mut _, &mut self.0);
+                    hash.assume_init()
+                }
+            }
+        }
+
+        /// An object which calculates a SHA224 hash of some data.
+        #[derive(Clone)]
+        pub struct Sha224(ffi::SHA256_CTX);
+
+        impl Default for Sha224 {
+            #[inline]
+            fn default() -> Sha224 {
+                Sha224::new()
+            }
+        }
+
+        impl Sha224 {
+            /// Creates a new hasher.
+            #[inline]
+            pub fn new() -> Sha224 {
+                unsafe {
+                    let mut ctx = MaybeUninit::uninit();
+                    ffi::SHA224_Init(ctx.as_mut_ptr());
+                    Sha224(ctx.assume_init())
+                }
+            }
+
+            /// Feeds some data into the hasher.
+            ///
+            /// This can be called multiple times.
+            #[inline]
+            pub fn update(&mut self, buf: &[u8]) {
+                unsafe {
+                    ffi::SHA224_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
+                }
+            }
+
+            /// Returns the hash of the data.
+            #[inline]
+            pub fn finish(mut self) -> [u8; 28] {
+                unsafe {
+                    let mut hash = MaybeUninit::<[u8; 28]>::uninit();
+                    ffi::SHA224_Final(hash.as_mut_ptr() as *mut _, &mut self.0);
+                    hash.assume_init()
+                }
+            }
+        }
+
+        /// An object which calculates a SHA256 hash of some data.
+        #[derive(Clone)]
+        pub struct Sha256(ffi::SHA256_CTX);
+
+        impl Default for Sha256 {
+            #[inline]
+            fn default() -> Sha256 {
+                Sha256::new()
+            }
+        }
+
+        impl Sha256 {
+            /// Creates a new hasher.
+            #[inline]
+            pub fn new() -> Sha256 {
+                unsafe {
+                    let mut ctx = MaybeUninit::uninit();
+                    ffi::SHA256_Init(ctx.as_mut_ptr());
+                    Sha256(ctx.assume_init())
+                }
+            }
+
+            /// Feeds some data into the hasher.
+            ///
+            /// This can be called multiple times.
+            #[inline]
+            pub fn update(&mut self, buf: &[u8]) {
+                unsafe {
+                    ffi::SHA256_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
+                }
+            }
+
+            /// Returns the hash of the data.
+            #[inline]
+            pub fn finish(mut self) -> [u8; 32] {
+                unsafe {
+                    let mut hash = MaybeUninit::<[u8; 32]>::uninit();
+                    ffi::SHA256_Final(hash.as_mut_ptr() as *mut _, &mut self.0);
+                    hash.assume_init()
+                }
+            }
+        }
+
+        /// An object which calculates a SHA384 hash of some data.
+        #[derive(Clone)]
+        pub struct Sha384(ffi::SHA512_CTX);
+
+        impl Default for Sha384 {
+            #[inline]
+            fn default() -> Sha384 {
+                Sha384::new()
+            }
+        }
+
+        impl Sha384 {
+            /// Creates a new hasher.
+            #[inline]
+            pub fn new() -> Sha384 {
+                unsafe {
+                    let mut ctx = MaybeUninit::uninit();
+                    ffi::SHA384_Init(ctx.as_mut_ptr());
+                    Sha384(ctx.assume_init())
+                }
+            }
+
+            /// Feeds some data into the hasher.
+            ///
+            /// This can be called multiple times.
+            #[inline]
+            pub fn update(&mut self, buf: &[u8]) {
+                unsafe {
+                    ffi::SHA384_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
+                }
+            }
+
+            /// Returns the hash of the data.
+            #[inline]
+            pub fn finish(mut self) -> [u8; 48] {
+                unsafe {
+                    let mut hash = MaybeUninit::<[u8; 48]>::uninit();
+                    ffi::SHA384_Final(hash.as_mut_ptr() as *mut _, &mut self.0);
+                    hash.assume_init()
+                }
+            }
+        }
+
+        /// An object which calculates a SHA512 hash of some data.
+        #[derive(Clone)]
+        pub struct Sha512(ffi::SHA512_CTX);
+
+        impl Default for Sha512 {
+            #[inline]
+            fn default() -> Sha512 {
+                Sha512::new()
+            }
+        }
+
+        impl Sha512 {
+            /// Creates a new hasher.
+            #[inline]
+            pub fn new() -> Sha512 {
+                unsafe {
+                    let mut ctx = MaybeUninit::uninit();
+                    ffi::SHA512_Init(ctx.as_mut_ptr());
+                    Sha512(ctx.assume_init())
+                }
+            }
+
+            /// Feeds some data into the hasher.
+            ///
+            /// This can be called multiple times.
+            #[inline]
+            pub fn update(&mut self, buf: &[u8]) {
+                unsafe {
+                    ffi::SHA512_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
+                }
+            }
+
+            /// Returns the hash of the data.
+            #[inline]
+            pub fn finish(mut self) -> [u8; 64] {
+                unsafe {
+                    let mut hash= MaybeUninit::<[u8; 64]>::uninit();
+                ffi::SHA512_Final(hash.as_mut_ptr() as *mut _, &mut self.0);
+                hash.assume_init()
+            }
         }
     }
-
-    /// Feeds some data into the hasher.
-    ///
-    /// This can be called multiple times.
-    #[inline]
-    pub fn update(&mut self, buf: &[u8]) {
-        unsafe {
-            ffi::SHA512_Update(&mut self.0, buf.as_ptr() as *const c_void, buf.len());
-        }
-    }
-
-    /// Returns the hash of the data.
-    #[inline]
-    #[allow(deprecated)] // https://github.com/rust-lang/rust/issues/63566
-    pub fn finish(mut self) -> [u8; 64] {
-        unsafe {
-            let mut hash: [u8; 64] = mem::uninitialized();
-            ffi::SHA512_Final(hash.as_mut_ptr(), &mut self.0);
-            hash
-        }
     }
 }
 
 #[cfg(test)]
 mod test {
-    use hex;
-
     use super::*;
 
     #[test]
@@ -354,6 +331,7 @@
     }
 
     #[test]
+    #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
     fn struct_1() {
         let expected = "a9993e364706816aba3e25717850c26c9cd0d89d";
 
@@ -364,6 +342,7 @@
     }
 
     #[test]
+    #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
     fn cloning_allows_incremental_hashing() {
         let expected = "a9993e364706816aba3e25717850c26c9cd0d89d";
 
@@ -386,6 +365,7 @@
     }
 
     #[test]
+    #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
     fn struct_224() {
         let expected = "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7";
 
@@ -404,6 +384,7 @@
     }
 
     #[test]
+    #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
     fn struct_256() {
         let expected = "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad";
 
@@ -424,6 +405,7 @@
     }
 
     #[test]
+    #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
     fn struct_384() {
         let expected =
             "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e\
@@ -446,6 +428,7 @@
     }
 
     #[test]
+    #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
     fn struct_512() {
         let expected =
             "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274\
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/sign.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/sign.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/sign.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/sign.rs	2021-12-09 12:01:26.000000000 +0000
@@ -61,18 +61,18 @@
 //! # let target = hmac.clone();
 //! assert!(memcmp::eq(&hmac, &target));
 //! ```
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::ForeignTypeRef;
 use libc::c_int;
 use std::io::{self, Write};
 use std::marker::PhantomData;
 use std::ptr;
 
-use error::ErrorStack;
-use hash::MessageDigest;
-use pkey::{HasPrivate, HasPublic, PKeyRef};
-use rsa::Padding;
-use {cvt, cvt_p};
+use crate::error::ErrorStack;
+use crate::hash::MessageDigest;
+use crate::pkey::{HasPrivate, HasPublic, PKeyRef};
+use crate::rsa::Padding;
+use crate::{cvt, cvt_p};
 
 cfg_if! {
     if #[cfg(ossl110)] {
@@ -639,12 +639,14 @@
     use hex::{self, FromHex};
     use std::iter;
 
-    use ec::{EcGroup, EcKey};
-    use hash::MessageDigest;
-    use nid::Nid;
-    use pkey::PKey;
-    use rsa::{Padding, Rsa};
-    use sign::{RsaPssSaltlen, Signer, Verifier};
+    use crate::ec::{EcGroup, EcKey};
+    use crate::hash::MessageDigest;
+    use crate::nid::Nid;
+    use crate::pkey::PKey;
+    use crate::rsa::{Padding, Rsa};
+    #[cfg(ossl111)]
+    use crate::sign::RsaPssSaltlen;
+    use crate::sign::{Signer, Verifier};
 
     const INPUT: &str =
         "65794a68624763694f694a53557a49314e694a392e65794a7063334d694f694a71623255694c41304b49434a6c\
@@ -801,8 +803,9 @@
 
     #[test]
     #[cfg(ossl110)]
+    #[cfg_attr(ossl300, ignore)] // https://github.com/openssl/openssl/issues/11671
     fn test_cmac() {
-        let cipher = ::symm::Cipher::aes_128_cbc();
+        let cipher = crate::symm::Cipher::aes_128_cbc();
         let key = Vec::from_hex("9294727a3638bb1c13f48ef8158bfc9d").unwrap();
         let pkey = PKey::cmac(&cipher, &key).unwrap();
         let mut signer = Signer::new_without_digest(&pkey).unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/srtp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/srtp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/srtp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/srtp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,6 @@
-use ffi;
+use crate::stack::Stackable;
 use foreign_types::ForeignTypeRef;
 use libc::c_ulong;
-use stack::Stackable;
 use std::ffi::CStr;
 use std::str;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/bio.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/bio.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/bio.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/bio.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use cfg_if::cfg_if;
 use ffi::{
     self, BIO_clear_retry_flags, BIO_new, BIO_set_retry_read, BIO_set_retry_write, BIO,
     BIO_CTRL_DGRAM_QUERY_MTU, BIO_CTRL_FLUSH,
@@ -10,8 +11,8 @@
 use std::ptr;
 use std::slice;
 
-use cvt_p;
-use error::ErrorStack;
+use crate::cvt_p;
+use crate::error::ErrorStack;
 
 pub struct StreamState<S> {
     pub stream: S,
@@ -24,8 +25,8 @@
 pub struct BioMethod(BIO_METHOD);
 
 impl BioMethod {
-    fn new<S: Read + Write>() -> BioMethod {
-        BioMethod(BIO_METHOD::new::<S>())
+    fn new<S: Read + Write>() -> Result<BioMethod, ErrorStack> {
+        BIO_METHOD::new::<S>().map(BioMethod)
     }
 }
 
@@ -33,7 +34,7 @@
 unsafe impl Send for BioMethod {}
 
 pub fn new<S: Read + Write>(stream: S) -> Result<(*mut BIO, BioMethod), ErrorStack> {
-    let method = BioMethod::new::<S>();
+    let method = BioMethod::new::<S>()?;
 
     let state = Box::new(StreamState {
         stream,
@@ -191,26 +192,26 @@
 cfg_if! {
     if #[cfg(any(ossl110, libressl273))] {
         use ffi::{BIO_get_data, BIO_set_data, BIO_set_flags, BIO_set_init};
+        use crate::cvt;
 
         #[allow(bad_style)]
         unsafe fn BIO_set_num(_bio: *mut ffi::BIO, _num: c_int) {}
 
-        #[allow(bad_style)]
+        #[allow(bad_style, clippy::upper_case_acronyms)]
         struct BIO_METHOD(*mut ffi::BIO_METHOD);
 
         impl BIO_METHOD {
-            fn new<S: Read + Write>() -> BIO_METHOD {
+            fn new<S: Read + Write>() -> Result<BIO_METHOD, ErrorStack> {
                 unsafe {
-                    let ptr = ffi::BIO_meth_new(ffi::BIO_TYPE_NONE, b"rust\0".as_ptr() as *const _);
-                    assert!(!ptr.is_null());
-                    let ret = BIO_METHOD(ptr);
-                    assert!(ffi::BIO_meth_set_write(ptr, bwrite::<S>) != 0);
-                    assert!(ffi::BIO_meth_set_read(ptr, bread::<S>) != 0);
-                    assert!(ffi::BIO_meth_set_puts(ptr, bputs::<S>) != 0);
-                    assert!(ffi::BIO_meth_set_ctrl(ptr, ctrl::<S>) != 0);
-                    assert!(ffi::BIO_meth_set_create(ptr, create) != 0);
-                    assert!(ffi::BIO_meth_set_destroy(ptr, destroy::<S>) != 0);
-                    ret
+                    let ptr = cvt_p(ffi::BIO_meth_new(ffi::BIO_TYPE_NONE, b"rust\0".as_ptr() as *const _))?;
+                    let method = BIO_METHOD(ptr);
+                    cvt(ffi::BIO_meth_set_write(method.0, bwrite::<S>))?;
+                    cvt(ffi::BIO_meth_set_read(method.0, bread::<S>))?;
+                    cvt(ffi::BIO_meth_set_puts(method.0, bputs::<S>))?;
+                    cvt(ffi::BIO_meth_set_ctrl(method.0, ctrl::<S>))?;
+                    cvt(ffi::BIO_meth_set_create(method.0, create))?;
+                    cvt(ffi::BIO_meth_set_destroy(method.0, destroy::<S>))?;
+                    Ok(method)
                 }
             }
 
@@ -227,11 +228,11 @@
             }
         }
     } else {
-        #[allow(bad_style)]
+        #[allow(bad_style, clippy::upper_case_acronyms)]
         struct BIO_METHOD(*mut ffi::BIO_METHOD);
 
         impl BIO_METHOD {
-            fn new<S: Read + Write>() -> BIO_METHOD {
+            fn new<S: Read + Write>() -> Result<BIO_METHOD, ErrorStack> {
                 let ptr = Box::new(ffi::BIO_METHOD {
                     type_: ffi::BIO_TYPE_NONE,
                     name: b"rust\0".as_ptr() as *const _,
@@ -245,7 +246,7 @@
                     callback_ctrl: None,
                 });
 
-                BIO_METHOD(Box::into_raw(ptr))
+                Ok(BIO_METHOD(Box::into_raw(ptr)))
             }
 
             fn get(&self) -> *mut ffi::BIO_METHOD {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/callbacks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/callbacks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/callbacks.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/callbacks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::ForeignType;
 use foreign_types::ForeignTypeRef;
 #[cfg(any(ossl111, not(osslconf = "OPENSSL_NO_PSK")))]
@@ -15,23 +15,24 @@
 use std::str;
 use std::sync::Arc;
 
-use dh::Dh;
+use crate::dh::Dh;
 #[cfg(all(ossl101, not(ossl110)))]
-use ec::EcKey;
-use error::ErrorStack;
-use pkey::Params;
+use crate::ec::EcKey;
+use crate::error::ErrorStack;
+use crate::pkey::Params;
 #[cfg(any(ossl102, libressl261))]
-use ssl::AlpnError;
-#[cfg(ossl111)]
-use ssl::{ClientHelloResponse, ExtensionContext};
-use ssl::{
-    SniError, Ssl, SslAlert, SslContext, SslContextRef, SslRef, SslSession, SslSessionRef,
-    SESSION_CTX_INDEX,
+use crate::ssl::AlpnError;
+use crate::ssl::{
+    try_get_session_ctx_index, SniError, Ssl, SslAlert, SslContext, SslContextRef, SslRef,
+    SslSession, SslSessionRef,
 };
-use util::ForeignTypeRefExt;
 #[cfg(ossl111)]
-use x509::X509Ref;
-use x509::{X509StoreContext, X509StoreContextRef};
+use crate::ssl::{ClientHelloResponse, ExtensionContext};
+#[cfg(ossl111)]
+use crate::util::ForeignTypeRefExt;
+#[cfg(ossl111)]
+use crate::x509::X509Ref;
+use crate::x509::{X509StoreContext, X509StoreContextRef};
 
 pub extern "C" fn raw_verify<F>(preverify_ok: c_int, x509_ctx: *mut ffi::X509_STORE_CTX) -> c_int
 where
@@ -355,9 +356,11 @@
 where
     F: Fn(&mut SslRef, SslSession) + 'static + Sync + Send,
 {
+    let session_ctx_index =
+        try_get_session_ctx_index().expect("BUG: session context index initialization failed");
     let ssl = SslRef::from_ptr_mut(ssl);
     let callback = ssl
-        .ex_data(*SESSION_CTX_INDEX)
+        .ex_data(*session_ctx_index)
         .expect("BUG: session context missing")
         .ex_data(SslContext::cached_ex_index::<F>())
         .expect("BUG: new session callback missing") as *const F;
@@ -401,9 +404,11 @@
 where
     F: Fn(&mut SslRef, &[u8]) -> Option<SslSession> + 'static + Sync + Send,
 {
+    let session_ctx_index =
+        try_get_session_ctx_index().expect("BUG: session context index initialization failed");
     let ssl = SslRef::from_ptr_mut(ssl);
     let callback = ssl
-        .ex_data(*SESSION_CTX_INDEX)
+        .ex_data(*session_ctx_index)
         .expect("BUG: session context missing")
         .ex_data(SslContext::cached_ex_index::<F>())
         .expect("BUG: get session callback missing") as *const F;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/connector.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/connector.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/connector.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/connector.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,14 @@
+use cfg_if::cfg_if;
 use std::io::{Read, Write};
 use std::ops::{Deref, DerefMut};
 
-use dh::Dh;
-use error::ErrorStack;
-use ssl::{
+use crate::dh::Dh;
+use crate::error::ErrorStack;
+use crate::ssl::{
     HandshakeError, Ssl, SslContext, SslContextBuilder, SslContextRef, SslMethod, SslMode,
     SslOptions, SslRef, SslStream, SslVerifyMode,
 };
-use version;
+use crate::version;
 
 const FFDHE_2048: &str = "
 -----BEGIN DH PARAMETERS-----
@@ -20,7 +21,7 @@
 -----END DH PARAMETERS-----
 ";
 
-#[allow(clippy::inconsistent_digit_grouping)]
+#[allow(clippy::inconsistent_digit_grouping, clippy::unusual_byte_groupings)]
 fn ctx(method: SslMethod) -> Result<SslContextBuilder, ErrorStack> {
     let mut ctx = SslContextBuilder::new(method)?;
 
@@ -168,13 +169,10 @@
         self.verify_hostname = verify_hostname;
     }
 
-    /// Initiates a client-side TLS session on a stream.
+    /// Returns an `Ssl` configured to connect to the provided domain.
     ///
     /// The domain is used for SNI and hostname verification if enabled.
-    pub fn connect<S>(mut self, domain: &str, stream: S) -> Result<SslStream<S>, HandshakeError<S>>
-    where
-        S: Read + Write,
-    {
+    pub fn into_ssl(mut self, domain: &str) -> Result<Ssl, ErrorStack> {
         if self.sni {
             self.ssl.set_hostname(domain)?;
         }
@@ -183,7 +181,17 @@
             setup_verify_hostname(&mut self.ssl, domain)?;
         }
 
-        self.ssl.connect(stream)
+        Ok(self.ssl)
+    }
+
+    /// Initiates a client-side TLS session on a stream.
+    ///
+    /// The domain is used for SNI and hostname verification if enabled.
+    pub fn connect<S>(self, domain: &str, stream: S) -> Result<SslStream<S>, HandshakeError<S>>
+    where
+        S: Read + Write,
+    {
+        self.into_ssl(domain)?.connect(stream)
     }
 }
 
@@ -350,6 +358,7 @@
 
 cfg_if! {
     if #[cfg(ossl110)] {
+        #[allow(clippy::unnecessary_wraps)]
         fn setup_curves(_: &mut SslContextBuilder) -> Result<(), ErrorStack> {
             Ok(())
         }
@@ -359,8 +368,8 @@
         }
     } else {
         fn setup_curves(ctx: &mut SslContextBuilder) -> Result<(), ErrorStack> {
-            use ec::EcKey;
-            use nid::Nid;
+            use crate::ec::EcKey;
+            use crate::nid::Nid;
 
             let curve = EcKey::from_curve_name(Nid::X9_62_PRIME256V1)?;
             ctx.set_tmp_ecdh(&curve)
@@ -375,7 +384,7 @@
         }
 
         fn setup_verify_hostname(ssl: &mut SslRef, domain: &str) -> Result<(), ErrorStack> {
-            use x509::verify::X509CheckFlags;
+            use crate::x509::verify::X509CheckFlags;
 
             let param = ssl.param_mut();
             param.set_hostflags(X509CheckFlags::NO_PARTIAL_WILDCARDS);
@@ -391,25 +400,30 @@
 
         fn setup_verify_hostname(ssl: &mut Ssl, domain: &str) -> Result<(), ErrorStack> {
             let domain = domain.to_string();
-            ssl.set_ex_data(*verify::HOSTNAME_IDX, domain);
+            let hostname_idx = verify::try_get_hostname_idx()?;
+            ssl.set_ex_data(*hostname_idx, domain);
             Ok(())
         }
 
         mod verify {
             use std::net::IpAddr;
             use std::str;
+            use once_cell::sync::OnceCell;
 
-            use ex_data::Index;
-            use nid::Nid;
-            use ssl::Ssl;
-            use stack::Stack;
-            use x509::{
+            use crate::error::ErrorStack;
+            use crate::ex_data::Index;
+            use crate::nid::Nid;
+            use crate::ssl::Ssl;
+            use crate::stack::Stack;
+            use crate::x509::{
                 GeneralName, X509NameRef, X509Ref, X509StoreContext, X509StoreContextRef,
                 X509VerifyResult,
             };
 
-            lazy_static! {
-                pub static ref HOSTNAME_IDX: Index<Ssl, String> = Ssl::new_ex_index().unwrap();
+            static HOSTNAME_IDX: OnceCell<Index<Ssl, String>> = OnceCell::new();
+
+            pub fn try_get_hostname_idx() -> Result<&'static Index<Ssl, String>, ErrorStack> {
+                HOSTNAME_IDX.get_or_try_init(Ssl::new_ex_index)
             }
 
             pub fn verify_callback(preverify_ok: bool, x509_ctx: &mut X509StoreContextRef) -> bool {
@@ -417,12 +431,14 @@
                     return preverify_ok;
                 }
 
+                let hostname_idx =
+                    try_get_hostname_idx().expect("failed to initialize hostname index");
                 let ok = match (
                     x509_ctx.current_cert(),
                     X509StoreContext::ssl_idx()
                         .ok()
                         .and_then(|idx| x509_ctx.ex_data(idx))
-                        .and_then(|ssl| ssl.ex_data(*HOSTNAME_IDX)),
+                        .and_then(|ssl| ssl.ex_data(*hostname_idx)),
                 ) {
                     (Some(x509), Some(domain)) => verify_hostname(domain, &x509),
                     _ => true,
@@ -551,7 +567,7 @@
 
             #[test]
             fn test_dns_match() {
-                use ssl::connector::verify::matches_dns;
+                use crate::ssl::connector::verify::matches_dns;
                 assert!(matches_dns("website.tld", "website.tld")); // A name should match itself.
                 assert!(matches_dns("website.tld", "wEbSiTe.tLd")); // DNS name matching ignores case of hostname.
                 assert!(matches_dns("wEbSiTe.TlD", "website.tld")); // DNS name matching ignores case of subject.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,12 @@
-use ffi;
 use libc::c_int;
 use std::error;
 use std::error::Error as StdError;
 use std::fmt;
 use std::io;
 
-use error::ErrorStack;
-use ssl::MidHandshakeSslStream;
-use x509::X509VerifyResult;
+use crate::error::ErrorStack;
+use crate::ssl::MidHandshakeSslStream;
+use crate::x509::X509VerifyResult;
 
 /// An error code returned from SSL functions.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -99,7 +98,7 @@
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.code {
             ErrorCode::ZERO_RETURN => fmt.write_str("the SSL session has been shut down"),
             ErrorCode::WANT_READ => match self.io_error() {
@@ -157,7 +156,7 @@
 }
 
 impl<S: fmt::Debug> fmt::Display for HandshakeError<S> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             HandshakeError::SetupFailure(ref e) => write!(f, "stream setup failed: {}", e)?,
             HandshakeError::Failure(ref s) => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -57,9 +57,11 @@
 //!     }
 //! }
 //! ```
-use ffi;
+use bitflags::bitflags;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef, Opaque};
-use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void};
+use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_void};
+use once_cell::sync::{Lazy, OnceCell};
 use std::any::TypeId;
 use std::cmp;
 use std::collections::HashMap;
@@ -77,33 +79,33 @@
 use std::str;
 use std::sync::{Arc, Mutex};
 
-use dh::{Dh, DhRef};
+use crate::dh::{Dh, DhRef};
 #[cfg(all(ossl101, not(ossl110)))]
-use ec::EcKey;
-use ec::EcKeyRef;
-use error::ErrorStack;
-use ex_data::Index;
+use crate::ec::EcKey;
+use crate::ec::EcKeyRef;
+use crate::error::ErrorStack;
+use crate::ex_data::Index;
 #[cfg(ossl111)]
-use hash::MessageDigest;
+use crate::hash::MessageDigest;
 #[cfg(ossl110)]
-use nid::Nid;
-use pkey::{HasPrivate, PKeyRef, Params, Private};
-use srtp::{SrtpProtectionProfile, SrtpProtectionProfileRef};
-use ssl::bio::BioMethod;
-use ssl::callbacks::*;
-use ssl::error::InnerError;
-use stack::{Stack, StackRef};
-use util::{ForeignTypeExt, ForeignTypeRefExt};
-use x509::store::{X509Store, X509StoreBuilderRef, X509StoreRef};
+use crate::nid::Nid;
+use crate::pkey::{HasPrivate, PKeyRef, Params, Private};
+use crate::srtp::{SrtpProtectionProfile, SrtpProtectionProfileRef};
+use crate::ssl::bio::BioMethod;
+use crate::ssl::callbacks::*;
+use crate::ssl::error::InnerError;
+use crate::stack::{Stack, StackRef};
+use crate::util::{ForeignTypeExt, ForeignTypeRefExt};
+use crate::x509::store::{X509Store, X509StoreBuilderRef, X509StoreRef};
 #[cfg(any(ossl102, libressl261))]
-use x509::verify::X509VerifyParamRef;
-use x509::{X509Name, X509Ref, X509StoreContextRef, X509VerifyResult, X509};
-use {cvt, cvt_n, cvt_p, init};
+use crate::x509::verify::X509VerifyParamRef;
+use crate::x509::{X509Name, X509Ref, X509StoreContextRef, X509VerifyResult, X509};
+use crate::{cvt, cvt_n, cvt_p, init};
 
-pub use ssl::connector::{
+pub use crate::ssl::connector::{
     ConnectConfiguration, SslAcceptor, SslAcceptorBuilder, SslConnector, SslConnectorBuilder,
 };
-pub use ssl::error::{Error, ErrorCode, HandshakeError};
+pub use crate::ssl::error::{Error, ErrorCode, HandshakeError};
 
 mod bio;
 mod callbacks;
@@ -132,9 +134,17 @@
     }
 }
 
+cfg_if! {
+    if #[cfg(ossl300)] {
+        type SslOptionsRepr = u64;
+    } else {
+        type SslOptionsRepr = libc::c_ulong;
+    }
+}
+
 bitflags! {
     /// Options controlling the behavior of an `SslContext`.
-    pub struct SslOptions: c_ulong {
+    pub struct SslOptions: SslOptionsRepr {
         /// Disables a countermeasure against an SSLv3/TLSv1.0 vulnerability affecting CBC ciphers.
         const DONT_INSERT_EMPTY_FRAGMENTS = ffi::SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
 
@@ -209,14 +219,14 @@
 
         /// Disables the use of DTLSv1.0
         ///
-        /// Requires OpenSSL 1.0.2 or newer.
-        #[cfg(any(ossl102, ossl110))]
+        /// Requires OpenSSL 1.0.2 or LibreSSL 3.3.2 or newer.
+        #[cfg(any(ossl102, ossl110, libressl332))]
         const NO_DTLSV1 = ffi::SSL_OP_NO_DTLSv1;
 
         /// Disables the use of DTLSv1.2.
         ///
-        /// Requires OpenSSL 1.0.2, or newer.
-        #[cfg(any(ossl102, ossl110))]
+        /// Requires OpenSSL 1.0.2 or LibreSSL 3.3.2 or newer.
+        #[cfg(any(ossl102, ossl110, libressl332))]
         const NO_DTLSV1_2 = ffi::SSL_OP_NO_DTLSv1_2;
 
         /// Disables the use of all (D)TLS protocol versions.
@@ -358,7 +368,7 @@
 unsafe impl Send for SslMethod {}
 
 bitflags! {
-    /// Options controling the behavior of certificate verification.
+    /// Options controlling the behavior of certificate verification.
     pub struct SslVerifyMode: i32 {
         /// Verifies that the peer's certificate is trusted.
         ///
@@ -512,10 +522,12 @@
     }
 }
 
-lazy_static! {
-    static ref INDEXES: Mutex<HashMap<TypeId, c_int>> = Mutex::new(HashMap::new());
-    static ref SSL_INDEXES: Mutex<HashMap<TypeId, c_int>> = Mutex::new(HashMap::new());
-    static ref SESSION_CTX_INDEX: Index<Ssl, SslContext> = Ssl::new_ex_index().unwrap();
+static INDEXES: Lazy<Mutex<HashMap<TypeId, c_int>>> = Lazy::new(|| Mutex::new(HashMap::new()));
+static SSL_INDEXES: Lazy<Mutex<HashMap<TypeId, c_int>>> = Lazy::new(|| Mutex::new(HashMap::new()));
+static SESSION_CTX_INDEX: OnceCell<Index<Ssl, SslContext>> = OnceCell::new();
+
+fn try_get_session_ctx_index() -> Result<&'static Index<Ssl, SslContext>, ErrorStack> {
+    SESSION_CTX_INDEX.get_or_try_init(Ssl::new_ex_index)
 }
 
 unsafe extern "C" fn free_data_box<T>(
@@ -1823,6 +1835,14 @@
 
 impl Clone for SslContext {
     fn clone(&self) -> Self {
+        (**self).to_owned()
+    }
+}
+
+impl ToOwned for SslContextRef {
+    type Owned = SslContext;
+
+    fn to_owned(&self) -> Self::Owned {
         unsafe {
             SSL_CTX_up_ref(self.as_ptr());
             SslContext::from_ptr(self.as_ptr())
@@ -1832,7 +1852,7 @@
 
 // TODO: add useful info here
 impl fmt::Debug for SslContext {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(fmt, "SslContext")
     }
 }
@@ -2335,7 +2355,7 @@
 }
 
 impl fmt::Debug for Ssl {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Debug::fmt(&**self, fmt)
     }
 }
@@ -2381,11 +2401,12 @@
     ///
     /// [`SSL_new`]: https://www.openssl.org/docs/man1.0.2/ssl/SSL_new.html
     // FIXME should take &SslContextRef
-    pub fn new(ctx: &SslContext) -> Result<Ssl, ErrorStack> {
+    pub fn new(ctx: &SslContextRef) -> Result<Ssl, ErrorStack> {
+        let session_ctx_index = try_get_session_ctx_index()?;
         unsafe {
             let ptr = cvt_p(ffi::SSL_new(ctx.as_ptr()))?;
             let mut ssl = Ssl::from_ptr(ptr);
-            ssl.set_ex_data(*SESSION_CTX_INDEX, ctx.clone());
+            ssl.set_ex_data(*session_ctx_index, ctx.to_owned());
 
             Ok(ssl)
         }
@@ -2401,6 +2422,7 @@
     /// `SslConnector` rather than `Ssl` directly, as it manages that configuration.
     ///
     /// [`SSL_connect`]: https://www.openssl.org/docs/manmaster/man3/SSL_connect.html
+    #[allow(deprecated)]
     pub fn connect<S>(self, stream: S) -> Result<SslStream<S>, HandshakeError<S>>
     where
         S: Read + Write,
@@ -2418,6 +2440,7 @@
     /// `SslAcceptor` rather than `Ssl` directly, as it manages that configuration.
     ///
     /// [`SSL_accept`]: https://www.openssl.org/docs/manmaster/man3/SSL_accept.html
+    #[allow(deprecated)]
     pub fn accept<S>(self, stream: S) -> Result<SslStream<S>, HandshakeError<S>>
     where
         S: Read + Write,
@@ -2427,7 +2450,7 @@
 }
 
 impl fmt::Debug for SslRef {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Ssl")
             .field("state", &self.state_string_long())
             .field("verify_result", &self.verify_result())
@@ -2445,6 +2468,11 @@
         unsafe { ffi::SSL_read(self.as_ptr(), buf.as_ptr() as *mut c_void, len) }
     }
 
+    fn peek(&mut self, buf: &mut [u8]) -> c_int {
+        let len = cmp::min(c_int::max_value() as usize, buf.len()) as c_int;
+        unsafe { ffi::SSL_peek(self.as_ptr(), buf.as_ptr() as *mut c_void, len) }
+    }
+
     fn write(&mut self, buf: &[u8]) -> c_int {
         let len = cmp::min(c_int::max_value() as usize, buf.len()) as c_int;
         unsafe { ffi::SSL_write(self.as_ptr(), buf.as_ptr() as *const c_void, len) }
@@ -2454,6 +2482,24 @@
         unsafe { ErrorCode::from_raw(ffi::SSL_get_error(self.as_ptr(), ret)) }
     }
 
+    /// Configure as an outgoing stream from a client.
+    ///
+    /// This corresponds to [`SSL_set_connect_state`].
+    ///
+    /// [`SSL_set_connect_state`]: https://www.openssl.org/docs/manmaster/man3/SSL_set_connect_state.html
+    pub fn set_connect_state(&mut self) {
+        unsafe { ffi::SSL_set_connect_state(self.as_ptr()) }
+    }
+
+    /// Configure as an incoming stream to a server.
+    ///
+    /// This corresponds to [`SSL_set_accept_state`].
+    ///
+    /// [`SSL_set_accept_state`]: https://www.openssl.org/docs/manmaster/man3/SSL_set_accept_state.html
+    pub fn set_accept_state(&mut self) {
+        unsafe { ffi::SSL_set_accept_state(self.as_ptr()) }
+    }
+
     /// Like [`SslContextBuilder::set_verify`].
     ///
     /// This corresponds to [`SSL_set_verify`].
@@ -2648,7 +2694,7 @@
     /// [`SSL_get_peer_certificate`]: https://www.openssl.org/docs/man1.1.0/ssl/SSL_get_peer_certificate.html
     pub fn peer_certificate(&self) -> Option<X509> {
         unsafe {
-            let ptr = ffi::SSL_get_peer_certificate(self.as_ptr());
+            let ptr = SSL_get1_peer_certificate(self.as_ptr());
             X509::from_ptr_opt(ptr)
         }
     }
@@ -3263,7 +3309,7 @@
 
     /// Returns the random field of the client's hello message.
     ///
-    /// This can only be used inside of the client hello callback. Otherwise, `None` is returend.
+    /// This can only be used inside of the client hello callback. Otherwise, `None` is returned.
     ///
     /// Requires OpenSSL 1.1.1 or newer.
     ///
@@ -3285,7 +3331,7 @@
 
     /// Returns the session ID field of the client's hello message.
     ///
-    /// This can only be used inside of the client hello callback. Otherwise, `None` is returend.
+    /// This can only be used inside of the client hello callback. Otherwise, `None` is returned.
     ///
     /// Requires OpenSSL 1.1.1 or newer.
     ///
@@ -3307,7 +3353,7 @@
 
     /// Returns the ciphers field of the client's hello message.
     ///
-    /// This can only be used inside of the client hello callback. Otherwise, `None` is returend.
+    /// This can only be used inside of the client hello callback. Otherwise, `None` is returned.
     ///
     /// Requires OpenSSL 1.1.1 or newer.
     ///
@@ -3329,7 +3375,7 @@
 
     /// Returns the compression methods field of the client's hello message.
     ///
-    /// This can only be used inside of the client hello callback. Otherwise, `None` is returend.
+    /// This can only be used inside of the client hello callback. Otherwise, `None` is returned.
     ///
     /// Requires OpenSSL 1.1.1 or newer.
     ///
@@ -3389,23 +3435,28 @@
     pub fn into_error(self) -> Error {
         self.error
     }
+}
 
+impl<S> MidHandshakeSslStream<S>
+where
+    S: Read + Write,
+{
     /// Restarts the handshake process.
     ///
     /// This corresponds to [`SSL_do_handshake`].
     ///
     /// [`SSL_do_handshake`]: https://www.openssl.org/docs/manmaster/man3/SSL_do_handshake.html
     pub fn handshake(mut self) -> Result<SslStream<S>, HandshakeError<S>> {
-        let ret = unsafe { ffi::SSL_do_handshake(self.stream.ssl.as_ptr()) };
-        if ret > 0 {
-            Ok(self.stream)
-        } else {
-            self.error = self.stream.make_error(ret);
-            match self.error.code() {
-                ErrorCode::WANT_READ | ErrorCode::WANT_WRITE => {
-                    Err(HandshakeError::WouldBlock(self))
+        match self.stream.do_handshake() {
+            Ok(()) => Ok(self.stream),
+            Err(error) => {
+                self.error = error;
+                match self.error.code() {
+                    ErrorCode::WANT_READ | ErrorCode::WANT_WRITE => {
+                        Err(HandshakeError::WouldBlock(self))
+                    }
+                    _ => Err(HandshakeError::Failure(self)),
                 }
-                _ => Err(HandshakeError::Failure(self)),
             }
         }
     }
@@ -3432,7 +3483,7 @@
 where
     S: fmt::Debug,
 {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("SslStream")
             .field("stream", &self.get_ref())
             .field("ssl", &self.ssl())
@@ -3441,17 +3492,28 @@
 }
 
 impl<S: Read + Write> SslStream<S> {
-    fn new_base(ssl: Ssl, stream: S) -> Self {
+    /// Creates a new `SslStream`.
+    ///
+    /// This function performs no IO; the stream will not have performed any part of the handshake
+    /// with the peer. If the `Ssl` was configured with [`SslRef::set_connect_state`] or
+    /// [`SslRef::set_accept_state`], the handshake can be performed automatically during the first
+    /// call to read or write. Otherwise the `connect` and `accept` methods can be used to
+    /// explicitly perform the handshake.
+    ///
+    /// This corresponds to [`SSL_set_bio`].
+    ///
+    /// [`SSL_set_bio`]: https://www.openssl.org/docs/manmaster/man3/SSL_set_bio.html
+    pub fn new(ssl: Ssl, stream: S) -> Result<Self, ErrorStack> {
+        let (bio, method) = bio::new(stream)?;
         unsafe {
-            let (bio, method) = bio::new(stream).unwrap();
             ffi::SSL_set_bio(ssl.as_ptr(), bio, bio);
-
-            SslStream {
-                ssl: ManuallyDrop::new(ssl),
-                method: ManuallyDrop::new(method),
-                _p: PhantomData,
-            }
         }
+
+        Ok(SslStream {
+            ssl: ManuallyDrop::new(ssl),
+            method: ManuallyDrop::new(method),
+            _p: PhantomData,
+        })
     }
 
     /// Constructs an `SslStream` from a pointer to the underlying OpenSSL `SSL` struct.
@@ -3461,9 +3523,150 @@
     /// # Safety
     ///
     /// The caller must ensure the pointer is valid.
+    #[deprecated(
+        since = "0.10.32",
+        note = "use Ssl::from_ptr and SslStream::new instead"
+    )]
     pub unsafe fn from_raw_parts(ssl: *mut ffi::SSL, stream: S) -> Self {
         let ssl = Ssl::from_ptr(ssl);
-        Self::new_base(ssl, stream)
+        Self::new(ssl, stream).unwrap()
+    }
+
+    /// Read application data transmitted by a client before handshake completion.
+    ///
+    /// Useful for reducing latency, but vulnerable to replay attacks. Call
+    /// [`SslRef::set_accept_state`] first.
+    ///
+    /// Returns `Ok(0)` if all early data has been read.
+    ///
+    /// Requires OpenSSL 1.1.1 or newer.
+    ///
+    /// This corresponds to [`SSL_read_early_data`].
+    ///
+    /// [`SSL_read_early_data`]: https://www.openssl.org/docs/manmaster/man3/SSL_read_early_data.html
+    #[cfg(ossl111)]
+    pub fn read_early_data(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
+        let mut read = 0;
+        let ret = unsafe {
+            ffi::SSL_read_early_data(
+                self.ssl.as_ptr(),
+                buf.as_ptr() as *mut c_void,
+                buf.len(),
+                &mut read,
+            )
+        };
+        match ret {
+            ffi::SSL_READ_EARLY_DATA_ERROR => Err(self.make_error(ret)),
+            ffi::SSL_READ_EARLY_DATA_SUCCESS => Ok(read),
+            ffi::SSL_READ_EARLY_DATA_FINISH => Ok(0),
+            _ => unreachable!(),
+        }
+    }
+
+    /// Send data to the server without blocking on handshake completion.
+    ///
+    /// Useful for reducing latency, but vulnerable to replay attacks. Call
+    /// [`SslRef::set_connect_state`] first.
+    ///
+    /// Requires OpenSSL 1.1.1 or newer.
+    ///
+    /// This corresponds to [`SSL_write_early_data`].
+    ///
+    /// [`SSL_write_early_data`]: https://www.openssl.org/docs/manmaster/man3/SSL_write_early_data.html
+    #[cfg(ossl111)]
+    pub fn write_early_data(&mut self, buf: &[u8]) -> Result<usize, Error> {
+        let mut written = 0;
+        let ret = unsafe {
+            ffi::SSL_write_early_data(
+                self.ssl.as_ptr(),
+                buf.as_ptr() as *const c_void,
+                buf.len(),
+                &mut written,
+            )
+        };
+        if ret > 0 {
+            Ok(written as usize)
+        } else {
+            Err(self.make_error(ret))
+        }
+    }
+
+    /// Initiates a client-side TLS handshake.
+    ///
+    /// This corresponds to [`SSL_connect`].
+    ///
+    /// # Warning
+    ///
+    /// OpenSSL's default configuration is insecure. It is highly recommended to use
+    /// `SslConnector` rather than `Ssl` directly, as it manages that configuration.
+    ///
+    /// [`SSL_connect`]: https://www.openssl.org/docs/manmaster/man3/SSL_connect.html
+    pub fn connect(&mut self) -> Result<(), Error> {
+        let ret = unsafe { ffi::SSL_connect(self.ssl.as_ptr()) };
+        if ret > 0 {
+            Ok(())
+        } else {
+            Err(self.make_error(ret))
+        }
+    }
+
+    /// Initiates a server-side TLS handshake.
+    ///
+    /// This corresponds to [`SSL_accept`].
+    ///
+    /// # Warning
+    ///
+    /// OpenSSL's default configuration is insecure. It is highly recommended to use
+    /// `SslAcceptor` rather than `Ssl` directly, as it manages that configuration.
+    ///
+    /// [`SSL_accept`]: https://www.openssl.org/docs/manmaster/man3/SSL_accept.html
+    pub fn accept(&mut self) -> Result<(), Error> {
+        let ret = unsafe { ffi::SSL_accept(self.ssl.as_ptr()) };
+        if ret > 0 {
+            Ok(())
+        } else {
+            Err(self.make_error(ret))
+        }
+    }
+
+    /// Initiates the handshake.
+    ///
+    /// This will fail if `set_accept_state` or `set_connect_state` was not called first.
+    ///
+    /// This corresponds to [`SSL_do_handshake`].
+    ///
+    /// [`SSL_do_handshake`]: https://www.openssl.org/docs/manmaster/man3/SSL_do_handshake.html
+    pub fn do_handshake(&mut self) -> Result<(), Error> {
+        let ret = unsafe { ffi::SSL_do_handshake(self.ssl.as_ptr()) };
+        if ret > 0 {
+            Ok(())
+        } else {
+            Err(self.make_error(ret))
+        }
+    }
+
+    /// Perform a stateless server-side handshake.
+    ///
+    /// Requires that cookie generation and verification callbacks were
+    /// set on the SSL context.
+    ///
+    /// Returns `Ok(true)` if a complete ClientHello containing a valid cookie
+    /// was read, in which case the handshake should be continued via
+    /// `accept`. If a HelloRetryRequest containing a fresh cookie was
+    /// transmitted, `Ok(false)` is returned instead. If the handshake cannot
+    /// proceed at all, `Err` is returned.
+    ///
+    /// This corresponds to [`SSL_stateless`]
+    ///
+    /// [`SSL_stateless`]: https://www.openssl.org/docs/manmaster/man3/SSL_stateless.html
+    #[cfg(ossl111)]
+    pub fn stateless(&mut self) -> Result<bool, ErrorStack> {
+        match unsafe { ffi::SSL_stateless(self.ssl.as_ptr()) } {
+            1 => Ok(true),
+            0 => Ok(false),
+            -1 => Err(ErrorStack::get()),
+            _ => unreachable!(),
+        }
     }
 
     /// Like `read`, but returns an `ssl::Error` rather than an `io::Error`.
@@ -3475,7 +3678,7 @@
     ///
     /// [`SSL_read`]: https://www.openssl.org/docs/manmaster/man3/SSL_read.html
     pub fn ssl_read(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
-        // The intepretation of the return code here is a little odd with a
+        // The interpretation of the return code here is a little odd with a
         // zero-length write. OpenSSL will likely correctly report back to us
         // that it read zero bytes, but zero is also the sentinel for "error".
         // To avoid that confusion short-circuit that logic and return quickly
@@ -3514,6 +3717,25 @@
         }
     }
 
+    /// Reads data from the stream, without removing it from the queue.
+    ///
+    /// This corresponds to [`SSL_peek`].
+    ///
+    /// [`SSL_peek`]: https://www.openssl.org/docs/manmaster/man3/SSL_peek.html
+    pub fn ssl_peek(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
+        // See above for why we short-circuit on zero-length buffers
+        if buf.is_empty() {
+            return Ok(0);
+        }
+
+        let ret = self.ssl.peek(buf);
+        if ret > 0 {
+            Ok(ret as usize)
+        } else {
+            Err(self.make_error(ret))
+        }
+    }
+
     /// Shuts down the session.
     ///
     /// The shutdown process consists of two steps. The first step sends a close notify message to
@@ -3664,10 +3886,15 @@
 }
 
 /// A partially constructed `SslStream`, useful for unusual handshakes.
+#[deprecated(
+    since = "0.10.32",
+    note = "use the methods directly on Ssl/SslStream instead"
+)]
 pub struct SslStreamBuilder<S> {
     inner: SslStream<S>,
 }
 
+#[allow(deprecated)]
 impl<S> SslStreamBuilder<S>
 where
     S: Read + Write,
@@ -3675,7 +3902,7 @@
     /// Begin creating an `SslStream` atop `stream`
     pub fn new(ssl: Ssl, stream: S) -> Self {
         Self {
-            inner: SslStream::new_base(ssl, stream),
+            inner: SslStream::new(ssl, stream).unwrap(),
         }
     }
 
@@ -3722,48 +3949,40 @@
     }
 
     /// See `Ssl::connect`
-    pub fn connect(self) -> Result<SslStream<S>, HandshakeError<S>> {
-        let mut stream = self.inner;
-        let ret = unsafe { ffi::SSL_connect(stream.ssl.as_ptr()) };
-        if ret > 0 {
-            Ok(stream)
-        } else {
-            let error = stream.make_error(ret);
-            match error.code() {
+    pub fn connect(mut self) -> Result<SslStream<S>, HandshakeError<S>> {
+        match self.inner.connect() {
+            Ok(()) => Ok(self.inner),
+            Err(error) => match error.code() {
                 ErrorCode::WANT_READ | ErrorCode::WANT_WRITE => {
                     Err(HandshakeError::WouldBlock(MidHandshakeSslStream {
-                        stream,
+                        stream: self.inner,
                         error,
                     }))
                 }
                 _ => Err(HandshakeError::Failure(MidHandshakeSslStream {
-                    stream,
+                    stream: self.inner,
                     error,
                 })),
-            }
+            },
         }
     }
 
     /// See `Ssl::accept`
-    pub fn accept(self) -> Result<SslStream<S>, HandshakeError<S>> {
-        let mut stream = self.inner;
-        let ret = unsafe { ffi::SSL_accept(stream.ssl.as_ptr()) };
-        if ret > 0 {
-            Ok(stream)
-        } else {
-            let error = stream.make_error(ret);
-            match error.code() {
+    pub fn accept(mut self) -> Result<SslStream<S>, HandshakeError<S>> {
+        match self.inner.accept() {
+            Ok(()) => Ok(self.inner),
+            Err(error) => match error.code() {
                 ErrorCode::WANT_READ | ErrorCode::WANT_WRITE => {
                     Err(HandshakeError::WouldBlock(MidHandshakeSslStream {
-                        stream,
+                        stream: self.inner,
                         error,
                     }))
                 }
                 _ => Err(HandshakeError::Failure(MidHandshakeSslStream {
-                    stream,
+                    stream: self.inner,
                     error,
                 })),
-            }
+            },
         }
     }
 
@@ -3774,25 +3993,21 @@
     /// This corresponds to [`SSL_do_handshake`].
     ///
     /// [`SSL_do_handshake`]: https://www.openssl.org/docs/manmaster/man3/SSL_do_handshake.html
-    pub fn handshake(self) -> Result<SslStream<S>, HandshakeError<S>> {
-        let mut stream = self.inner;
-        let ret = unsafe { ffi::SSL_do_handshake(stream.ssl.as_ptr()) };
-        if ret > 0 {
-            Ok(stream)
-        } else {
-            let error = stream.make_error(ret);
-            match error.code() {
+    pub fn handshake(mut self) -> Result<SslStream<S>, HandshakeError<S>> {
+        match self.inner.do_handshake() {
+            Ok(()) => Ok(self.inner),
+            Err(error) => match error.code() {
                 ErrorCode::WANT_READ | ErrorCode::WANT_WRITE => {
                     Err(HandshakeError::WouldBlock(MidHandshakeSslStream {
-                        stream,
+                        stream: self.inner,
                         error,
                     }))
                 }
                 _ => Err(HandshakeError::Failure(MidHandshakeSslStream {
-                    stream,
+                    stream: self.inner,
                     error,
                 })),
-            }
+            },
         }
     }
 
@@ -3811,21 +4026,7 @@
     /// [`SSL_read_early_data`]: https://www.openssl.org/docs/manmaster/man3/SSL_read_early_data.html
     #[cfg(ossl111)]
     pub fn read_early_data(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
-        let mut read = 0;
-        let ret = unsafe {
-            ffi::SSL_read_early_data(
-                self.inner.ssl.as_ptr(),
-                buf.as_ptr() as *mut c_void,
-                buf.len(),
-                &mut read,
-            )
-        };
-        match ret {
-            ffi::SSL_READ_EARLY_DATA_ERROR => Err(self.inner.make_error(ret)),
-            ffi::SSL_READ_EARLY_DATA_SUCCESS => Ok(read),
-            ffi::SSL_READ_EARLY_DATA_FINISH => Ok(0),
-            _ => unreachable!(),
-        }
+        self.inner.read_early_data(buf)
     }
 
     /// Send data to the server without blocking on handshake completion.
@@ -3840,23 +4041,11 @@
     /// [`SSL_write_early_data`]: https://www.openssl.org/docs/manmaster/man3/SSL_write_early_data.html
     #[cfg(ossl111)]
     pub fn write_early_data(&mut self, buf: &[u8]) -> Result<usize, Error> {
-        let mut written = 0;
-        let ret = unsafe {
-            ffi::SSL_write_early_data(
-                self.inner.ssl.as_ptr(),
-                buf.as_ptr() as *const c_void,
-                buf.len(),
-                &mut written,
-            )
-        };
-        if ret > 0 {
-            Ok(written as usize)
-        } else {
-            Err(self.inner.make_error(ret))
-        }
+        self.inner.write_early_data(buf)
     }
 }
 
+#[allow(deprecated)]
 impl<S> SslStreamBuilder<S> {
     /// Returns a shared reference to the underlying stream.
     pub fn get_ref(&self) -> &S {
@@ -3972,6 +4161,13 @@
 }
 
 cfg_if! {
+    if #[cfg(ossl300)] {
+        use ffi::SSL_get1_peer_certificate;
+    } else {
+        use ffi::SSL_get_peer_certificate as SSL_get1_peer_certificate;
+    }
+}
+cfg_if! {
     if #[cfg(any(ossl110, libressl291))] {
         use ffi::{TLS_method, DTLS_method, TLS_client_method, TLS_server_method};
     } else {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/test/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/test/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/test/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/test/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,5 @@
 #![allow(unused_imports)]
 
-use hex;
 use std::env;
 use std::fs::File;
 use std::io::prelude::*;
@@ -16,28 +15,28 @@
 use std::time::Duration;
 use tempdir::TempDir;
 
-use dh::Dh;
-use error::ErrorStack;
-use hash::MessageDigest;
-use ocsp::{OcspResponse, OcspResponseStatus};
-use pkey::PKey;
-use srtp::SrtpProfileId;
-use ssl;
-use ssl::test::server::Server;
+use crate::dh::Dh;
+use crate::error::ErrorStack;
+use crate::hash::MessageDigest;
+use crate::ocsp::{OcspResponse, OcspResponseStatus};
+use crate::pkey::PKey;
+use crate::srtp::SrtpProfileId;
+use crate::ssl;
+use crate::ssl::test::server::Server;
 #[cfg(any(ossl110, ossl111, libressl261))]
-use ssl::SslVersion;
+use crate::ssl::SslVersion;
 #[cfg(ossl111)]
-use ssl::{ClientHelloResponse, ExtensionContext};
-use ssl::{
+use crate::ssl::{ClientHelloResponse, ExtensionContext};
+use crate::ssl::{
     Error, HandshakeError, MidHandshakeSslStream, ShutdownResult, ShutdownState, Ssl, SslAcceptor,
     SslAcceptorBuilder, SslConnector, SslContext, SslContextBuilder, SslFiletype, SslMethod,
-    SslOptions, SslSessionCacheMode, SslStream, SslStreamBuilder, SslVerifyMode, StatusType,
+    SslOptions, SslSessionCacheMode, SslStream, SslVerifyMode, StatusType,
 };
 #[cfg(ossl102)]
-use x509::store::X509StoreBuilder;
+use crate::x509::store::X509StoreBuilder;
 #[cfg(ossl102)]
-use x509::verify::X509CheckFlags;
-use x509::{X509Name, X509StoreContext, X509VerifyResult, X509};
+use crate::x509::verify::X509CheckFlags;
+use crate::x509::{X509Name, X509StoreContext, X509VerifyResult, X509};
 
 mod server;
 
@@ -307,7 +306,6 @@
 /// lists of supported protocols have an overlap -- with only ONE protocol
 /// being valid for both.
 #[test]
-#[cfg_attr(libressl291, ignore)]
 fn test_connect_with_srtp_ctx() {
     let listener = TcpListener::bind("127.0.0.1:0").unwrap();
     let addr = listener.local_addr().unwrap();
@@ -366,7 +364,6 @@
 /// lists of supported protocols have an overlap -- with only ONE protocol
 /// being valid for both.
 #[test]
-#[cfg_attr(libressl291, ignore)]
 fn test_connect_with_srtp_ssl() {
     let listener = TcpListener::bind("127.0.0.1:0").unwrap();
     let addr = listener.local_addr().unwrap();
@@ -868,8 +865,8 @@
 #[test]
 #[cfg(all(ossl101, not(ossl110)))]
 fn tmp_ecdh_callback() {
-    use ec::EcKey;
-    use nid::Nid;
+    use crate::ec::EcKey;
+    use crate::nid::Nid;
 
     static CALLED_BACK: AtomicBool = AtomicBool::new(false);
 
@@ -917,8 +914,8 @@
 #[test]
 #[cfg(all(ossl101, not(ossl110)))]
 fn tmp_ecdh_callback_ssl() {
-    use ec::EcKey;
-    use nid::Nid;
+    use crate::ec::EcKey;
+    use crate::nid::Nid;
 
     static CALLED_BACK: AtomicBool = AtomicBool::new(false);
 
@@ -1196,7 +1193,7 @@
             self.incoming.get_mut().extend_from_slice(data);
         }
 
-        pub fn take_outgoing(&mut self) -> Outgoing {
+        pub fn take_outgoing(&mut self) -> Outgoing<'_> {
             Outgoing(&mut self.outgoing)
         }
     }
@@ -1239,13 +1236,13 @@
     impl<'a> ::std::ops::Deref for Outgoing<'a> {
         type Target = [u8];
         fn deref(&self) -> &[u8] {
-            &self.0
+            self.0
         }
     }
 
     impl<'a> AsRef<[u8]> for Outgoing<'a> {
         fn as_ref(&self) -> &[u8] {
-            &self.0
+            self.0
         }
     }
 
@@ -1253,23 +1250,14 @@
         to.extend_incoming(&from.take_outgoing());
     }
 
-    fn hs<S: ::std::fmt::Debug>(
-        stream: Result<SslStream<S>, HandshakeError<S>>,
-    ) -> Result<SslStream<S>, MidHandshakeSslStream<S>> {
-        match stream {
-            Ok(stream) => Ok(stream),
-            Err(HandshakeError::WouldBlock(stream)) => Err(stream),
-            Err(e) => panic!("unexpected error: {:?}", e),
-        }
-    }
-
     //
     // Setup
     //
 
     let mut client_ctx = SslContext::builder(SslMethod::tls()).unwrap();
     client_ctx.clear_options(SslOptions::ENABLE_MIDDLEBOX_COMPAT);
-    let client_stream = Ssl::new(&client_ctx.build()).unwrap();
+    let mut client_stream =
+        SslStream::new(Ssl::new(&client_ctx.build()).unwrap(), MemoryStream::new()).unwrap();
 
     let mut server_ctx = SslContext::builder(SslMethod::tls()).unwrap();
     server_ctx
@@ -1285,29 +1273,29 @@
     });
     server_ctx.set_stateless_cookie_verify_cb(|_tls, buf| buf == COOKIE);
     let mut server_stream =
-        ssl::SslStreamBuilder::new(Ssl::new(&server_ctx.build()).unwrap(), MemoryStream::new());
+        SslStream::new(Ssl::new(&server_ctx.build()).unwrap(), MemoryStream::new()).unwrap();
 
     //
     // Handshake
     //
 
     // Initial ClientHello
-    let mut client_stream = hs(client_stream.connect(MemoryStream::new())).unwrap_err();
+    client_stream.connect().unwrap_err();
     send(client_stream.get_mut(), server_stream.get_mut());
     // HelloRetryRequest
     assert!(!server_stream.stateless().unwrap());
     send(server_stream.get_mut(), client_stream.get_mut());
     // Second ClientHello
-    let mut client_stream = hs(client_stream.handshake()).unwrap_err();
+    client_stream.do_handshake().unwrap_err();
     send(client_stream.get_mut(), server_stream.get_mut());
     // OldServerHello
     assert!(server_stream.stateless().unwrap());
-    let mut server_stream = hs(server_stream.accept()).unwrap_err();
+    server_stream.accept().unwrap_err();
     send(server_stream.get_mut(), client_stream.get_mut());
     // Finished
-    let mut client_stream = hs(client_stream.handshake()).unwrap();
+    client_stream.do_handshake().unwrap();
     send(client_stream.get_mut(), server_stream.get_mut());
-    hs(server_stream.handshake()).unwrap();
+    server_stream.do_handshake().unwrap();
 }
 
 #[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
@@ -1338,7 +1326,7 @@
     client
         .ctx()
         .set_psk_client_callback(move |_, _, identity, psk| {
-            identity[..CLIENT_IDENT.len()].copy_from_slice(&CLIENT_IDENT);
+            identity[..CLIENT_IDENT.len()].copy_from_slice(CLIENT_IDENT);
             identity[CLIENT_IDENT.len()] = 0;
             psk[..PSK.len()].copy_from_slice(PSK);
             CLIENT_CALLED.store(true, Ordering::SeqCst);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/test/server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/test/server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/ssl/test/server.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/ssl/test/server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 use std::net::{SocketAddr, TcpListener, TcpStream};
 use std::thread::{self, JoinHandle};
 
-use ssl::{Ssl, SslContext, SslContextBuilder, SslFiletype, SslMethod, SslRef, SslStream};
+use crate::ssl::{Ssl, SslContext, SslContextBuilder, SslFiletype, SslMethod, SslRef, SslStream};
 
 pub struct Server {
     handle: Option<JoinHandle<()>>,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/stack.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef, Opaque};
 use libc::c_int;
 use std::borrow::Borrow;
@@ -9,9 +9,9 @@
 use std::mem;
 use std::ops::{Deref, DerefMut, Index, IndexMut, Range};
 
-use error::ErrorStack;
-use util::ForeignTypeExt;
-use {cvt, cvt_p};
+use crate::error::ErrorStack;
+use crate::util::ForeignTypeExt;
+use crate::{cvt, cvt_p};
 
 cfg_if! {
     if #[cfg(ossl110)] {
@@ -50,7 +50,7 @@
     T: Stackable,
     T::Ref: fmt::Debug,
 {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_list().entries(self).finish()
     }
 }
@@ -141,6 +141,8 @@
 impl<T: Stackable> Drop for IntoIter<T> {
     fn drop(&mut self) {
         unsafe {
+            // https://github.com/rust-lang/rust-clippy/issues/7510
+            #[allow(clippy::while_let_on_iterator)]
             while let Some(_) = self.next() {}
             OPENSSL_sk_free(self.stack as *mut _);
         }
@@ -199,14 +201,14 @@
         self.len() == 0
     }
 
-    pub fn iter(&self) -> Iter<T> {
+    pub fn iter(&self) -> Iter<'_, T> {
         Iter {
             stack: self,
             idxs: 0..self.len() as c_int,
         }
     }
 
-    pub fn iter_mut(&mut self) -> IterMut<T> {
+    pub fn iter_mut(&mut self) -> IterMut<'_, T> {
         IterMut {
             idxs: 0..self.len() as c_int,
             stack: self,
@@ -310,10 +312,7 @@
 }
 
 /// An iterator over the stack's contents.
-pub struct Iter<'a, T: Stackable>
-where
-    T: 'a,
-{
+pub struct Iter<'a, T: Stackable> {
     stack: &'a StackRef<T>,
     idxs: Range<c_int>,
 }
@@ -347,7 +346,7 @@
 impl<'a, T: Stackable> ExactSizeIterator for Iter<'a, T> {}
 
 /// A mutable iterator over the stack's contents.
-pub struct IterMut<'a, T: Stackable + 'a> {
+pub struct IterMut<'a, T: Stackable> {
     stack: &'a mut StackRef<T>,
     idxs: Range<c_int>,
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/string.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,3 @@
-use ffi;
 use foreign_types::ForeignTypeRef;
 use libc::{c_char, c_void};
 use std::convert::AsRef;
@@ -7,7 +6,7 @@
 use std::ops::Deref;
 use std::str;
 
-use stack::Stackable;
+use crate::stack::Stackable;
 
 foreign_type_and_impl_send_sync! {
     type CType = c_char;
@@ -18,13 +17,13 @@
 }
 
 impl fmt::Display for OpensslString {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(&**self, f)
     }
 }
 
 impl fmt::Debug for OpensslString {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Debug::fmt(&**self, f)
     }
 }
@@ -69,13 +68,13 @@
 }
 
 impl fmt::Display for OpensslStringRef {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(&**self, f)
     }
 }
 
 impl fmt::Debug for OpensslStringRef {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Debug::fmt(&**self, f)
     }
 }
@@ -87,7 +86,7 @@
 
 #[cfg(ossl110)]
 unsafe fn free(buf: *mut c_char) {
-    ::ffi::CRYPTO_free(
+    ffi::CRYPTO_free(
         buf as *mut c_void,
         concat!(file!(), "\0").as_ptr() as *const c_char,
         line!() as ::libc::c_int,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/symm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/symm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/symm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/symm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -52,14 +52,14 @@
 //! println!("Decrypted: '{}'", output_string);
 //! ```
 
-use ffi;
+use cfg_if::cfg_if;
 use libc::c_int;
 use std::cmp;
 use std::ptr;
 
-use error::ErrorStack;
-use nid::Nid;
-use {cvt, cvt_p};
+use crate::error::ErrorStack;
+use crate::nid::Nid;
+use crate::{cvt, cvt_p};
 
 #[derive(Copy, Clone)]
 pub enum Mode {
@@ -90,6 +90,16 @@
         }
     }
 
+    /// Returns the cipher's Nid.
+    ///
+    /// This corresponds to [`EVP_CIPHER_nid`]
+    ///
+    /// [`EVP_CIPHER_nid`]: https://www.openssl.org/docs/man1.0.2/crypto/EVP_CIPHER_nid.html
+    pub fn nid(&self) -> Nid {
+        let nid = unsafe { ffi::EVP_CIPHER_nid(self.0) };
+        Nid::from_raw(nid)
+    }
+
     pub fn aes_128_ecb() -> Cipher {
         unsafe { Cipher(ffi::EVP_aes_128_ecb()) }
     }
@@ -280,6 +290,26 @@
         unsafe { Cipher(ffi::EVP_chacha20_poly1305()) }
     }
 
+    #[cfg(not(osslconf = "OPENSSL_NO_SEED"))]
+    pub fn seed_cbc() -> Cipher {
+        unsafe { Cipher(ffi::EVP_seed_cbc()) }
+    }
+
+    #[cfg(not(osslconf = "OPENSSL_NO_SEED"))]
+    pub fn seed_cfb128() -> Cipher {
+        unsafe { Cipher(ffi::EVP_seed_cfb128()) }
+    }
+
+    #[cfg(not(osslconf = "OPENSSL_NO_SEED"))]
+    pub fn seed_ecb() -> Cipher {
+        unsafe { Cipher(ffi::EVP_seed_ecb()) }
+    }
+
+    #[cfg(not(osslconf = "OPENSSL_NO_SEED"))]
+    pub fn seed_ofb() -> Cipher {
+        unsafe { Cipher(ffi::EVP_seed_ofb()) }
+    }
+
     /// Creates a `Cipher` from a raw pointer to its OpenSSL type.
     ///
     /// # Safety
@@ -416,7 +446,7 @@
 unsafe impl Send for Crypter {}
 
 impl Crypter {
-    /// Creates a new `Crypter`.  The initialisation vector, `iv`, is not necesarry for certain
+    /// Creates a new `Crypter`.  The initialisation vector, `iv`, is not necessary for certain
     /// types of `Cipher`.
     ///
     /// # Panics
@@ -671,7 +701,7 @@
 /// Encrypts data in one go, and returns the encrypted data.
 ///
 /// Data is encrypted using the specified cipher type `t` in encrypt mode with the specified `key`
-/// and initailization vector `iv`. Padding is enabled.
+/// and initialization vector `iv`. Padding is enabled.
 ///
 /// This is a convenient interface to `Crypter` to encrypt all data in one go.  To encrypt a stream
 /// of data increamentally , use `Crypter` instead.
@@ -710,7 +740,7 @@
 /// Decrypts data in one go, and returns the decrypted data.
 ///
 /// Data is decrypted using the specified cipher type `t` in decrypt mode with the specified `key`
-/// and initailization vector `iv`. Padding is enabled.
+/// and initialization vector `iv`. Padding is enabled.
 ///
 /// This is a convenient interface to `Crypter` to decrypt all data in one go.  To decrypt a  stream
 /// of data increamentally , use `Crypter` instead.
@@ -1010,6 +1040,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)]
     fn test_rc4() {
         let pt = "0000000000000000000000000000000000000000000000000000000000000000000000000000";
         let ct = "A68686B04D686AA107BD8D4CAB191A3EEC0A6294BC78B60F65C25CB47BD7BB3A48EFC4D26BE4";
@@ -1193,6 +1224,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)]
     fn test_bf_cbc() {
         // https://www.schneier.com/code/vectors.txt
 
@@ -1205,6 +1237,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)]
     fn test_bf_ecb() {
         let pt = "5CD54CA83DEF57DA";
         let ct = "B1B8CC0B250F09A0";
@@ -1215,6 +1248,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)]
     fn test_bf_cfb64() {
         let pt = "37363534333231204E6F77206973207468652074696D6520666F722000";
         let ct = "E73214A2822139CAF26ECF6D2EB9E76E3DA3DE04D1517200519D57A6C3";
@@ -1225,6 +1259,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)]
     fn test_bf_ofb() {
         let pt = "37363534333231204E6F77206973207468652074696D6520666F722000";
         let ct = "E73214A2822139CA62B343CC5B65587310DD908D0C241B2263C2CF80DA";
@@ -1235,6 +1270,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)]
     fn test_des_cbc() {
         let pt = "54686973206973206120746573742e";
         let ct = "6f2867cfefda048a4046ef7e556c7132";
@@ -1245,6 +1281,7 @@
     }
 
     #[test]
+    #[cfg_attr(ossl300, ignore)]
     fn test_des_ecb() {
         let pt = "54686973206973206120746573742e";
         let ct = "0050ab8aecec758843fe157b4dde938c";
@@ -1286,18 +1323,12 @@
 
     #[test]
     fn test_aes128_gcm() {
-        let key = "0e00c76561d2bd9b40c3c15427e2b08f";
-        let iv = "492cadaccd3ca3fbc9cf9f06eb3325c4e159850b0dbe98199b89b7af528806610b6f63998e1eae80c348e7\
-             4cbb921d8326631631fc6a5d304f39166daf7ea15fa1977f101819adb510b50fe9932e12c5a85aa3fd1e73\
-             d8d760af218be829903a77c63359d75edd91b4f6ed5465a72662f5055999e059e7654a8edc921aa0d496";
-        let pt = "fef03c2d7fb15bf0d2df18007d99f967c878ad59359034f7bb2c19af120685d78e32f6b8b83b032019956c\
-             a9c0195721476b85";
-        let aad = "d8f1163d8c840292a2b2dacf4ac7c36aff8733f18fabb4fa5594544125e03d1e6e5d6d0fd61656c8d8f327\
-             c92839ae5539bb469c9257f109ebff85aad7bd220fdaa95c022dbd0c7bb2d878ad504122c943045d3c5eba\
-             8f1f56c0";
-        let ct = "4f6cf471be7cbd2575cd5a1747aea8fe9dea83e51936beac3e68f66206922060c697ffa7af80ad6bb68f2c\
-             f4fc97416ee52abe";
-        let tag = "e20b6655";
+        let key = "23dc8d23d95b6fd1251741a64f7d4f41";
+        let iv = "f416f48ad44d9efa1179e167";
+        let pt = "6cb9b71dd0ccd42cdf87e8e396fc581fd8e0d700e360f590593b748e105390de";
+        let aad = "45074844c97d515c65bbe37c210a5a4b08c21c588efe5c5f73c4d9c17d34dacddc0bb6a8a53f7bf477b9780c1c2a928660df87016b2873fe876b2b887fb5886bfd63216b7eaecc046372a82c047eb043f0b063226ee52a12c69b";
+        let ct = "8ad20486778e87387efb3f2574e509951c0626816722018129e578b2787969d3";
+        let tag = "91e1bc09";
 
         // this tag is smaller than you'd normally want, but I pulled this test from the part of
         // the NIST test vectors that cover 4 byte tags.
@@ -1549,4 +1580,46 @@
         .unwrap();
         assert_eq!(pt, hex::encode(out));
     }
+
+    #[test]
+    #[cfg(not(any(osslconf = "OPENSSL_NO_SEED", ossl300)))]
+    fn test_seed_cbc() {
+        let pt = "5363686f6b6f6c6164656e6b756368656e0a";
+        let ct = "c2edf0fb2eb11bf7b2f39417a8528896d34b24b6fd79e5923b116dfcd2aba5a4";
+        let key = "41414141414141414141414141414141";
+        let iv = "41414141414141414141414141414141";
+
+        cipher_test(super::Cipher::seed_cbc(), pt, ct, key, iv);
+    }
+
+    #[test]
+    #[cfg(not(any(osslconf = "OPENSSL_NO_SEED", ossl300)))]
+    fn test_seed_cfb128() {
+        let pt = "5363686f6b6f6c6164656e6b756368656e0a";
+        let ct = "71d4d25fc1750cb7789259e7f34061939a41";
+        let key = "41414141414141414141414141414141";
+        let iv = "41414141414141414141414141414141";
+
+        cipher_test(super::Cipher::seed_cfb128(), pt, ct, key, iv);
+    }
+    #[test]
+    #[cfg(not(any(osslconf = "OPENSSL_NO_SEED", ossl300)))]
+    fn test_seed_ecb() {
+        let pt = "5363686f6b6f6c6164656e6b756368656e0a";
+        let ct = "0263a9cd498cf0edb0ef72a3231761d00ce601f7d08ad19ad74f0815f2c77f7e";
+        let key = "41414141414141414141414141414141";
+        let iv = "41414141414141414141414141414141";
+
+        cipher_test(super::Cipher::seed_ecb(), pt, ct, key, iv);
+    }
+    #[test]
+    #[cfg(not(any(osslconf = "OPENSSL_NO_SEED", ossl300)))]
+    fn test_seed_ofb() {
+        let pt = "5363686f6b6f6c6164656e6b756368656e0a";
+        let ct = "71d4d25fc1750cb7789259e7f34061930afd";
+        let key = "41414141414141414141414141414141";
+        let iv = "41414141414141414141414141414141";
+
+        cipher_test(super::Cipher::seed_ofb(), pt, ct, key, iv);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/util.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 use std::panic::{self, AssertUnwindSafe};
 use std::slice;
 
-use error::ErrorStack;
+use crate::error::ErrorStack;
 
 /// Wraps a user-supplied callback and a slot for panics thrown inside the callback (while FFI
 /// frames are on the stack).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/version.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/version.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/version.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/version.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,7 @@
 // limitations under the License.
 //
 
+use cfg_if::cfg_if;
 use std::ffi::CStr;
 
 cfg_if! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/extension.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/extension.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/extension.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/extension.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,23 +8,19 @@
 //! # Example
 //!
 //! ```rust
-//! extern crate openssl;
-//!
 //! use openssl::x509::extension::BasicConstraints;
 //! use openssl::x509::X509Extension;
 //!
-//! fn main() {
-//!     let mut bc = BasicConstraints::new();
-//!     let bc = bc.critical().ca().pathlen(1);
+//! let mut bc = BasicConstraints::new();
+//! let bc = bc.critical().ca().pathlen(1);
 //!
-//!     let extension: X509Extension = bc.build().unwrap();
-//! }
+//! let extension: X509Extension = bc.build().unwrap();
 //! ```
 use std::fmt::Write;
 
-use error::ErrorStack;
-use nid::Nid;
-use x509::{X509Extension, X509v3Context};
+use crate::error::ErrorStack;
+use crate::nid::Nid;
+use crate::x509::{X509Extension, X509v3Context};
 
 /// An extension which indicates whether a certificate is a CA certificate.
 pub struct BasicConstraints {
@@ -397,7 +393,7 @@
     }
 
     /// Return a `SubjectKeyIdentifier` extension as an `X509Extension`.
-    pub fn build(&self, ctx: &X509v3Context) -> Result<X509Extension, ErrorStack> {
+    pub fn build(&self, ctx: &X509v3Context<'_>) -> Result<X509Extension, ErrorStack> {
         let mut value = String::new();
         let mut first = true;
         append(&mut value, &mut first, self.critical, "critical");
@@ -449,7 +445,7 @@
     }
 
     /// Return a `AuthorityKeyIdentifier` extension as an `X509Extension`.
-    pub fn build(&self, ctx: &X509v3Context) -> Result<X509Extension, ErrorStack> {
+    pub fn build(&self, ctx: &X509v3Context<'_>) -> Result<X509Extension, ErrorStack> {
         let mut value = String::new();
         let mut first = true;
         append(&mut value, &mut first, self.critical, "critical");
@@ -538,7 +534,7 @@
     }
 
     /// Return a `SubjectAlternativeName` extension as an `X509Extension`.
-    pub fn build(&self, ctx: &X509v3Context) -> Result<X509Extension, ErrorStack> {
+    pub fn build(&self, ctx: &X509v3Context<'_>) -> Result<X509Extension, ErrorStack> {
         let mut value = String::new();
         let mut first = true;
         append(&mut value, &mut first, self.critical, "critical");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
 //! Internet protocols, including SSL/TLS, which is the basis for HTTPS,
 //! the secure protocol for browsing the web.
 
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::{c_int, c_long};
 use std::error::Error;
@@ -20,19 +20,21 @@
 use std::slice;
 use std::str;
 
-use asn1::{Asn1BitStringRef, Asn1IntegerRef, Asn1ObjectRef, Asn1StringRef, Asn1TimeRef};
-use bio::MemBioSlice;
-use conf::ConfRef;
-use error::ErrorStack;
-use ex_data::Index;
-use hash::{DigestBytes, MessageDigest};
-use nid::Nid;
-use pkey::{HasPrivate, HasPublic, PKey, PKeyRef, Public};
-use ssl::SslRef;
-use stack::{Stack, StackRef, Stackable};
-use string::OpensslString;
-use util::{ForeignTypeExt, ForeignTypeRefExt};
-use {cvt, cvt_n, cvt_p};
+use crate::asn1::{
+    Asn1BitStringRef, Asn1IntegerRef, Asn1ObjectRef, Asn1StringRef, Asn1TimeRef, Asn1Type,
+};
+use crate::bio::MemBioSlice;
+use crate::conf::ConfRef;
+use crate::error::ErrorStack;
+use crate::ex_data::Index;
+use crate::hash::{DigestBytes, MessageDigest};
+use crate::nid::Nid;
+use crate::pkey::{HasPrivate, HasPublic, PKey, PKeyRef, Public};
+use crate::ssl::SslRef;
+use crate::stack::{Stack, StackRef, Stackable};
+use crate::string::OpensslString;
+use crate::util::{ForeignTypeExt, ForeignTypeRefExt};
+use crate::{cvt, cvt_n, cvt_p};
 
 #[cfg(any(ossl102, libressl261))]
 pub mod verify;
@@ -447,6 +449,24 @@
         }
     }
 
+    /// Returns this certificate's [`authority information access`] entries, if they exist.
+    ///
+    /// This corresponds to [`X509_get_ext_d2i`] called with `NID_info_access`.
+    ///
+    /// [`X509_get_ext_d2i`]: https://www.openssl.org/docs/man1.1.0/crypto/X509_get_ext_d2i.html
+    /// [`authority information access`]: https://tools.ietf.org/html/rfc5280#section-4.2.2.1
+    pub fn authority_info(&self) -> Option<Stack<AccessDescription>> {
+        unsafe {
+            let stack = ffi::X509_get_ext_d2i(
+                self.as_ptr(),
+                ffi::NID_info_access,
+                ptr::null_mut(),
+                ptr::null_mut(),
+            );
+            Stack::from_ptr_opt(stack as *mut _)
+        }
+    }
+
     pub fn public_key(&self) -> Result<PKey<Public>, ErrorStack> {
         unsafe {
             let pkey = cvt_p(ffi::X509_get_pubkey(self.as_ptr()))?;
@@ -676,7 +696,7 @@
 }
 
 impl fmt::Debug for X509 {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         let serial = match &self.serial_number().to_bn() {
             Ok(bn) => match bn.to_hex_str() {
                 Ok(hex) => hex.to_string(),
@@ -747,7 +767,7 @@
     /// See the extension module for builder types which will construct certain common extensions.
     pub fn new(
         conf: Option<&ConfRef>,
-        context: Option<&X509v3Context>,
+        context: Option<&X509v3Context<'_>>,
         name: &str,
         value: &str,
     ) -> Result<X509Extension, ErrorStack> {
@@ -773,7 +793,7 @@
     /// See the extension module for builder types which will construct certain common extensions.
     pub fn new_nid(
         conf: Option<&ConfRef>,
-        context: Option<&X509v3Context>,
+        context: Option<&X509v3Context<'_>>,
         name: Nid,
         value: &str,
     ) -> Result<X509Extension, ErrorStack> {
@@ -824,6 +844,33 @@
         }
     }
 
+    /// Add a field entry by str with a specific type.
+    ///
+    /// This corresponds to [`X509_NAME_add_entry_by_txt`].
+    ///
+    /// [`X509_NAME_add_entry_by_txt`]: https://www.openssl.org/docs/man1.1.0/crypto/X509_NAME_add_entry_by_txt.html
+    pub fn append_entry_by_text_with_type(
+        &mut self,
+        field: &str,
+        value: &str,
+        ty: Asn1Type,
+    ) -> Result<(), ErrorStack> {
+        unsafe {
+            let field = CString::new(field).unwrap();
+            assert!(value.len() <= c_int::max_value() as usize);
+            cvt(ffi::X509_NAME_add_entry_by_txt(
+                self.0.as_ptr(),
+                field.as_ptr() as *mut _,
+                ty.as_raw(),
+                value.as_ptr(),
+                value.len() as c_int,
+                -1,
+                0,
+            ))
+            .map(|_| ())
+        }
+    }
+
     /// Add a field entry by NID.
     ///
     /// This corresponds to [`X509_NAME_add_entry_by_NID`].
@@ -845,6 +892,32 @@
         }
     }
 
+    /// Add a field entry by NID with a specific type.
+    ///
+    /// This corresponds to [`X509_NAME_add_entry_by_NID`].
+    ///
+    /// [`X509_NAME_add_entry_by_NID`]: https://www.openssl.org/docs/man1.1.0/crypto/X509_NAME_add_entry_by_NID.html
+    pub fn append_entry_by_nid_with_type(
+        &mut self,
+        field: Nid,
+        value: &str,
+        ty: Asn1Type,
+    ) -> Result<(), ErrorStack> {
+        unsafe {
+            assert!(value.len() <= c_int::max_value() as usize);
+            cvt(ffi::X509_NAME_add_entry_by_NID(
+                self.0.as_ptr(),
+                field.as_raw(),
+                ty.as_raw(),
+                value.as_ptr() as *mut _,
+                value.len() as c_int,
+                -1,
+                0,
+            ))
+            .map(|_| ())
+        }
+    }
+
     /// Return an `X509Name`.
     pub fn build(self) -> X509Name {
         self.0
@@ -901,7 +974,7 @@
 }
 
 impl fmt::Debug for X509NameRef {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         formatter.debug_list().entries(self.entries()).finish()
     }
 }
@@ -981,7 +1054,7 @@
 }
 
 impl fmt::Debug for X509NameEntryRef {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         formatter.write_fmt(format_args!("{:?} = {:?}", self.object(), self.data()))
     }
 }
@@ -1228,7 +1301,7 @@
 pub struct X509VerifyResult(c_int);
 
 impl fmt::Debug for X509VerifyResult {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("X509VerifyResult")
             .field("code", &self.0)
             .field("error", &self.error_string())
@@ -1237,7 +1310,7 @@
 }
 
 impl fmt::Display for X509VerifyResult {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.write_str(self.error_string())
     }
 }
@@ -1342,7 +1415,7 @@
 }
 
 impl fmt::Debug for GeneralNameRef {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         if let Some(email) = self.email() {
             formatter.write_str(email)
         } else if let Some(dnsname) = self.dnsname() {
@@ -1363,6 +1436,32 @@
 }
 
 foreign_type_and_impl_send_sync! {
+    type CType = ffi::ACCESS_DESCRIPTION;
+    fn drop = ffi::ACCESS_DESCRIPTION_free;
+
+    /// `AccessDescription` of certificate authority information.
+    pub struct AccessDescription;
+    /// Reference to `AccessDescription`.
+    pub struct AccessDescriptionRef;
+}
+
+impl AccessDescriptionRef {
+    /// Returns the access method OID.
+    pub fn method(&self) -> &Asn1ObjectRef {
+        unsafe { Asn1ObjectRef::from_ptr((*self.as_ptr()).method) }
+    }
+
+    // Returns the access location.
+    pub fn location(&self) -> &GeneralNameRef {
+        unsafe { GeneralNameRef::from_ptr((*self.as_ptr()).location) }
+    }
+}
+
+impl Stackable for AccessDescription {
+    type StackType = ffi::stack_st_ACCESS_DESCRIPTION;
+}
+
+foreign_type_and_impl_send_sync! {
     type CType = ffi::X509_ALGOR;
     fn drop = ffi::X509_ALGOR_free;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/store.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/store.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/store.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/store.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,9 +6,6 @@
 //! # Example
 //!
 //! ```rust
-//!
-//! extern crate openssl;
-//!
 //! use openssl::x509::store::{X509StoreBuilder, X509Store};
 //! use openssl::x509::{X509, X509Name};
 //! use openssl::pkey::PKey;
@@ -16,38 +13,38 @@
 //! use openssl::rsa::Rsa;
 //! use openssl::nid::Nid;
 //!
-//! fn main() {
-//!     let rsa = Rsa::generate(2048).unwrap();
-//!     let pkey = PKey::from_rsa(rsa).unwrap();
-//!
-//!     let mut name = X509Name::builder().unwrap();
-//!     name.append_entry_by_nid(Nid::COMMONNAME, "foobar.com").unwrap();
-//!     let name = name.build();
-//!
-//!     let mut builder = X509::builder().unwrap();
-//!     builder.set_version(2).unwrap();
-//!     builder.set_subject_name(&name).unwrap();
-//!     builder.set_issuer_name(&name).unwrap();
-//!     builder.set_pubkey(&pkey).unwrap();
-//!     builder.sign(&pkey, MessageDigest::sha256()).unwrap();
+//! let rsa = Rsa::generate(2048).unwrap();
+//! let pkey = PKey::from_rsa(rsa).unwrap();
 //!
-//!     let certificate: X509 = builder.build();
+//! let mut name = X509Name::builder().unwrap();
+//! name.append_entry_by_nid(Nid::COMMONNAME, "foobar.com").unwrap();
+//! let name = name.build();
+//!
+//! let mut builder = X509::builder().unwrap();
+//! builder.set_version(2).unwrap();
+//! builder.set_subject_name(&name).unwrap();
+//! builder.set_issuer_name(&name).unwrap();
+//! builder.set_pubkey(&pkey).unwrap();
+//! builder.sign(&pkey, MessageDigest::sha256()).unwrap();
 //!
-//!     let mut builder = X509StoreBuilder::new().unwrap();
-//!     let _ = builder.add_cert(certificate);
+//! let certificate: X509 = builder.build();
 //!
-//!     let store: X509Store = builder.build();
-//! }
+//! let mut builder = X509StoreBuilder::new().unwrap();
+//! let _ = builder.add_cert(certificate);
+//!
+//! let store: X509Store = builder.build();
 //! ```
 
-use ffi;
+use cfg_if::cfg_if;
 use foreign_types::ForeignTypeRef;
 use std::mem;
 
-use error::ErrorStack;
-use stack::StackRef;
-use x509::{X509Object, X509};
-use {cvt, cvt_p};
+use crate::error::ErrorStack;
+use crate::stack::StackRef;
+#[cfg(any(ossl102, libressl261))]
+use crate::x509::verify::X509VerifyFlags;
+use crate::x509::{X509Object, X509};
+use crate::{cvt, cvt_p};
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::X509_STORE;
@@ -107,6 +104,16 @@
         let lookup = unsafe { ffi::X509_STORE_add_lookup(self.as_ptr(), method.as_ptr()) };
         cvt_p(lookup).map(|ptr| unsafe { X509LookupRef::from_ptr_mut(ptr) })
     }
+
+    /// Sets certificate chain validation related flags.
+    ///
+    /// This corresponds to [`X509_STORE_set_flags`].
+    ///
+    /// [`X509_STORE_set_flags`]: https://www.openssl.org/docs/man1.1.1/man3/X509_STORE_set_flags.html
+    #[cfg(any(ossl102, libressl261))]
+    pub fn set_flags(&mut self, flags: X509VerifyFlags) -> Result<(), ErrorStack> {
+        unsafe { cvt(ffi::X509_STORE_set_flags(self.as_ptr(), flags.bits())).map(|_| ()) }
+    }
 }
 
 generic_foreign_type_and_impl_send_sync! {
@@ -164,10 +171,7 @@
 
 generic_foreign_type_and_impl_send_sync! {
     type CType = ffi::X509_LOOKUP_METHOD;
-    fn drop = |_method| {
-        #[cfg(ossl110)]
-        ffi::X509_LOOKUP_meth_free(_method);
-    };
+    fn drop = X509_LOOKUP_meth_free;
 
     /// Method used to look up certificates and CRLs.
     pub struct X509LookupMethod<T>;
@@ -202,3 +206,12 @@
         }
     }
 }
+
+cfg_if! {
+    if #[cfg(ossl110)] {
+        use ffi::X509_LOOKUP_meth_free;
+    } else {
+        #[allow(bad_style)]
+        unsafe fn X509_LOOKUP_meth_free(_x: *mut ffi::X509_LOOKUP_METHOD) {}
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,21 @@
-use asn1::Asn1Time;
-use bn::{BigNum, MsbOption};
-use hash::MessageDigest;
-use hex::{self, FromHex};
-use nid::Nid;
-use pkey::{PKey, Private};
-use rsa::Rsa;
-use stack::Stack;
-use x509::extension::{
+use crate::asn1::Asn1Time;
+use crate::bn::{BigNum, MsbOption};
+use crate::hash::MessageDigest;
+use crate::nid::Nid;
+use crate::pkey::{PKey, Private};
+use crate::rsa::Rsa;
+use crate::stack::Stack;
+use crate::x509::extension::{
     AuthorityKeyIdentifier, BasicConstraints, ExtendedKeyUsage, KeyUsage, SubjectAlternativeName,
     SubjectKeyIdentifier,
 };
-use x509::store::X509StoreBuilder;
+use crate::x509::store::X509StoreBuilder;
+#[cfg(any(ossl102, libressl261))]
+use crate::x509::verify::X509VerifyFlags;
 #[cfg(ossl110)]
-use x509::X509Builder;
-use x509::{X509Name, X509Req, X509StoreContext, X509VerifyResult, X509};
+use crate::x509::X509Builder;
+use crate::x509::{X509Name, X509Req, X509StoreContext, X509VerifyResult, X509};
+use hex::{self, FromHex};
 
 fn pkey() -> PKey<Private> {
     let rsa = Rsa::generate(2048).unwrap();
@@ -178,6 +180,24 @@
 }
 
 #[test]
+fn test_aia_ca_issuer() {
+    // With AIA
+    let cert = include_bytes!("../../test/aia_test_cert.pem");
+    let cert = X509::from_pem(cert).unwrap();
+    let authority_info = cert.authority_info().unwrap();
+    assert_eq!(authority_info.len(), 1);
+    assert_eq!(authority_info[0].method().to_string(), "CA Issuers");
+    assert_eq!(
+        authority_info[0].location().uri(),
+        Some("http://www.example.com/cert.pem")
+    );
+    // Without AIA
+    let cert = include_bytes!("../../test/cert.pem");
+    let cert = X509::from_pem(cert).unwrap();
+    assert!(cert.authority_info().is_none());
+}
+
+#[test]
 fn x509_builder() {
     let pkey = pkey();
 
@@ -380,6 +400,33 @@
         .unwrap());
 }
 
+#[test]
+#[cfg(any(ossl102, libressl261))]
+fn test_verify_fails_with_crl_flag_set_and_no_crl() {
+    let cert = include_bytes!("../../test/cert.pem");
+    let cert = X509::from_pem(cert).unwrap();
+    let ca = include_bytes!("../../test/root-ca.pem");
+    let ca = X509::from_pem(ca).unwrap();
+    let chain = Stack::new().unwrap();
+
+    let mut store_bldr = X509StoreBuilder::new().unwrap();
+    store_bldr.add_cert(ca).unwrap();
+    store_bldr.set_flags(X509VerifyFlags::CRL_CHECK).unwrap();
+    let store = store_bldr.build();
+
+    let mut context = X509StoreContext::new().unwrap();
+    assert_eq!(
+        context
+            .init(&store, &cert, &chain, |c| {
+                c.verify_cert()?;
+                Ok(c.error())
+            })
+            .unwrap()
+            .error_string(),
+        "unable to get certificate CRL"
+    )
+}
+
 #[cfg(ossl110)]
 #[test]
 fn x509_ref_version() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/verify.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/verify.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/src/x509/verify.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/src/x509/verify.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,10 @@
-use ffi;
+use bitflags::bitflags;
 use foreign_types::ForeignTypeRef;
 use libc::{c_uint, c_ulong};
 use std::net::IpAddr;
 
-use cvt;
-use error::ErrorStack;
+use crate::cvt;
+use crate::error::ErrorStack;
 
 bitflags! {
     /// Flags used to check an `X509` certificate.
@@ -30,8 +30,8 @@
         const USE_CHECK_TIME = ffi::X509_V_FLAG_USE_CHECK_TIME;
         const CRL_CHECK = ffi::X509_V_FLAG_CRL_CHECK;
         const CRL_CHECK_ALL = ffi::X509_V_FLAG_CRL_CHECK_ALL;
-        const IGNORE_CRITICAL = ffi::X509_V_FLAG_X509_STRICT;
-        const X509_STRICT = ffi::X509_V_FLAG_IGNORE_CRITICAL;
+        const IGNORE_CRITICAL = ffi::X509_V_FLAG_IGNORE_CRITICAL;
+        const X509_STRICT = ffi::X509_V_FLAG_X509_STRICT;
         const ALLOW_PROXY_CERTS = ffi::X509_V_FLAG_ALLOW_PROXY_CERTS;
         const POLICY_CHECK = ffi::X509_V_FLAG_POLICY_CHECK;
         const EXPLICIT_POLICY = ffi::X509_V_FLAG_EXPLICIT_POLICY;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/test/aia_test_cert.pem thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/test/aia_test_cert.pem
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl/test/aia_test_cert.pem	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl/test/aia_test_cert.pem	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDozCCAougAwIBAgIJAJayG40CARAjMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV
+BAMMBHRlc3QwHhcNMjEwMzAyMDA1NzQ3WhcNNDgwNzE4MDA1NzQ3WjBzMQswCQYD
+VQQGEwJYWDELMAkGA1UECAwCWFgxEDAOBgNVBAcMB25vd2hlcmUxEDAOBgNVBAoM
+B3Rlc3RvcmcxEjAQBgNVBAsMCXRlc3Rncm91cDEfMB0GA1UEAwwWbWFjaGluZS0w
+Lm15aG9zdC5teW5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANKA
+3zhwC70hbxFVdC0dYk9BHaNntZ4LPUVwFSG2HBn34oO8zCp4wkH+VIi9vOhWiySK
+Gs3gW4qpjMbF82Gqc3dG2KfqUrOtWY+u54zAzqpgiJf08wmREHPoZmjqfCfgM3FO
+VMEA8g1BQxXEd+y7UEDoXhPIoeFnqzMu9sg4npnL9U5BLaQJiWnXHClnBrvAAKXW
+E8KDNmcavtFvo2xQVC09C6dJG5CrigWcZe4CaUl44rHiPaQd+jOp0HAccl/XLA0/
+QyHvW6ksjco/mb7ia1U9ohaC/3NHmzUA1S3kdq/qgnkPsjmy5v8k5vizowNc5rFO
+XsV86BIv44rh1Jut52ECAwEAAaOBnTCBmjAMBgNVHRMEBTADAQH/MAsGA1UdDwQE
+AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIQYDVR0RBBowGIIW
+bWFjaGluZS0wLm15aG9zdC5teW5ldDA7BggrBgEFBQcBAQQvMC0wKwYIKwYBBQUH
+MAKGH2h0dHA6Ly93d3cuZXhhbXBsZS5jb20vY2VydC5wZW0wDQYJKoZIhvcNAQEL
+BQADggEBAH+ayx8qGvxzrG57jgXJudq+z783O6E2xGBJn1cT9Jhrg1VnlU+tHcNd
+fFcsp0gdQZCmm3pu3E0m/FsgTpfHUgdCOmZQp45QrxCz2oRdWQM71SSA/x1VfQ9w
+670iZOEY15/ss2nRl0woaYO7tBVadpZfymW5+OhsTKn5gL0pVmW3RciHuAmbIvQO
+bouUwzuZIJMfca7T1MqZYdrKoJrOBj0LaPTutjfQB7O/02vUCPjTTIH20aqsMe5K
+KXCrjiZO2jkxQ49Hz5uwfPx12dSVHNLpsnfOAH+MUToeW+SPx2OPvl/uAHcph2lj
+MLA6Wi64rSUxzkcFLFsGpKcK6QKcHUw=
+-----END CERTIFICATE-----
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b8f55060518437695fa1b6fc577f8bd48f1b429b3705fd570c179dfd98f8071b","LICENSE-APACHE":"7cfd738c53d61c79f07e348f622bf7707c9084237054d37fbe07788a75f5881c","LICENSE-MIT":"29c9533fc9a32ee529e928bcb12308f0745d237fdea80d83c0258f23243d65d1","README.md":"8b65b4b2b3e5abddb8ab7130100baa43dbb6d3ff5c672a41c9def67716a43373","src/lib.rs":"7637b047b1b2747b807d4e3f9b38dc371ba7868bc5304b57f95a4993e1fa93dd"},"package":"77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"}
\ No newline at end of file
+{"files":{"Cargo.toml":"12b874eac6730a62f8c404132256448c45aa1b0bf6b142dfd51e68da75b33273","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"92bce73b5b1e41134e103fc07974aeab78866c7e0335a613436d3de85f0f8d04","src/lib.rs":"9f78be125ee8c9049994246c77ec7a4c82073532170add6fc8957ed44e284ea2"},"package":"28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -12,7 +12,7 @@
 
 [package]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.4"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Tool for helping to find SSL certificate locations on the system for OpenSSL\n"
 homepage = "https://github.com/alexcrichton/openssl-probe"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -1,201 +1,201 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,25 @@
-Copyright (c) 2014 Alex Crichton
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+Copyright (c) 2014 Alex Crichton
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,33 @@
-# openssl-probe
-
-Tool for helping to find SSL certificate locations on the system for OpenSSL
-
-[![Crates.io](https://img.shields.io/crates/v/openssl-probe.svg?maxAge=2592000)](https://crates.io/crates/openssl-probe)
-[![docs.rs](https://docs.rs/openssl-probe/badge.svg)](https://docs.rs/openssl-probe/)
-
-## Usage
-
-First, add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-openssl-probe = "0.1.2"
-```
-
-Then add this to your crate:
-
-```rust
-extern crate openssl_probe;
-
-fn main() {
-    openssl_probe::init_ssl_cert_env_vars();
-    //... your code
-}
-```
-
-## License
-
-`openssl-probe` is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0),
-with portions covered by various BSD-like licenses.
-
-See [LICENSE-APACHE](./LICENSE-APACHE), and [LICENSE-MIT](LICENSE-MIT) for details.
+# openssl-probe
+
+Tool for helping to find SSL certificate locations on the system for OpenSSL
+
+[![Crates.io](https://img.shields.io/crates/v/openssl-probe.svg?maxAge=2592000)](https://crates.io/crates/openssl-probe)
+[![docs.rs](https://docs.rs/openssl-probe/badge.svg)](https://docs.rs/openssl-probe/)
+
+## Usage
+
+First, add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+openssl-probe = "0.1.2"
+```
+
+Then add this to your crate:
+
+```rust
+extern crate openssl_probe;
+
+fn main() {
+    openssl_probe::init_ssl_cert_env_vars();
+    //... your code
+}
+```
+
+## License
+
+`openssl-probe` is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0),
+with portions covered by various BSD-like licenses.
+
+See [LICENSE-APACHE](./LICENSE-APACHE), and [LICENSE-MIT](LICENSE-MIT) for details.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-probe/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-probe/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,83 +1,132 @@
-use std::env;
-use std::fs;
-use std::path::PathBuf;
-
-pub struct ProbeResult {
-    pub cert_file: Option<PathBuf>,
-    pub cert_dir: Option<PathBuf>,
-}
-
-/// Probe the system for the directory in which CA certificates should likely be
-/// found.
-///
-/// This will only search known system locations.
-pub fn find_certs_dirs() -> Vec<PathBuf> {
-    // see http://gagravarr.org/writing/openssl-certs/others.shtml
-    [
-        "/var/ssl",
-        "/usr/share/ssl",
-        "/usr/local/ssl",
-        "/usr/local/openssl",
-        "/usr/local/share",
-        "/usr/lib/ssl",
-        "/usr/ssl",
-        "/etc/openssl",
-        "/etc/pki/ca-trust/extracted/pem",
-        "/etc/pki/tls",
-        "/etc/ssl",
-        "/data/data/com.termux/files/usr/etc/tls",
-        "/boot/system/data/ssl",
-    ].iter().map(|s| PathBuf::from(*s)).filter(|p| {
-        fs::metadata(p).is_ok()
-    }).collect()
-}
-
-pub fn init_ssl_cert_env_vars() {
-    let ProbeResult { cert_file, cert_dir } = probe();
-    match cert_file {
-        Some(path) => put("SSL_CERT_FILE", path),
-        None => {}
-    }
-    match cert_dir {
-        Some(path) => put("SSL_CERT_DIR", path),
-        None => {}
-    }
-
-    fn put(var: &str, path: PathBuf) {
-        // Don't stomp over what anyone else has set
-        match env::var(var) {
-            Ok(..) => {}
-            Err(..) => env::set_var(var, &path),
-        }
-    }
-}
-
-pub fn probe() -> ProbeResult {
-    let mut result = ProbeResult {
-        cert_file: env::var_os("SSL_CERT_FILE").map(PathBuf::from),
-        cert_dir: env::var_os("SSL_CERT_DIR").map(PathBuf::from),
-    };
-    for certs_dir in find_certs_dirs().iter() {
-        // cert.pem looks to be an openssl 1.0.1 thing, while
-        // certs/ca-certificates.crt appears to be a 0.9.8 thing
-        for cert in [
-            "cert.pem",
-            "certs.pem",
-            "certs/ca-certificates.crt",
-            "certs/ca-root-nss.crt",
-            "certs/ca-bundle.crt",
-            "CARootCertificates.pem",
-            "tls-ca-bundle.pem",
-        ].iter() {
-            try(&mut result.cert_file, certs_dir.join(cert));
-        }
-        try(&mut result.cert_dir, certs_dir.join("certs"));
-    }
-    result
-}
-
-fn try(dst: &mut Option<PathBuf>, val: PathBuf) {
-    if dst.is_none() && fs::metadata(&val).is_ok() {
-        *dst = Some(val);
-    }
-}
+use std::env;
+use std::path::{Path, PathBuf};
+
+/// The OpenSSL environment variable to configure what certificate file to use.
+pub const ENV_CERT_FILE: &'static str = "SSL_CERT_FILE";
+
+/// The OpenSSL environment variable to configure what certificates directory to use.
+pub const ENV_CERT_DIR: &'static str = "SSL_CERT_DIR";
+
+pub struct ProbeResult {
+    pub cert_file: Option<PathBuf>,
+    pub cert_dir: Option<PathBuf>,
+}
+
+/// Probe the system for the directory in which CA certificates should likely be
+/// found.
+///
+/// This will only search known system locations.
+pub fn find_certs_dirs() -> Vec<PathBuf> {
+    cert_dirs_iter().map(Path::to_path_buf).collect()
+}
+
+// TODO: when we bump to 0.2, make this the `find_certs_dirs` function
+fn cert_dirs_iter() -> impl Iterator<Item = &'static Path> {
+    // see http://gagravarr.org/writing/openssl-certs/others.shtml
+    [
+        "/var/ssl",
+        "/usr/share/ssl",
+        "/usr/local/ssl",
+        "/usr/local/openssl",
+        "/usr/local/etc/openssl",
+        "/usr/local/share",
+        "/usr/lib/ssl",
+        "/usr/ssl",
+        "/etc/openssl",
+        "/etc/pki/ca-trust/extracted/pem",
+        "/etc/pki/tls",
+        "/etc/ssl",
+        "/data/data/com.termux/files/usr/etc/tls",
+        "/boot/system/data/ssl",
+    ]
+    .iter().map(Path::new).filter(|p| p.exists())
+}
+
+/// Probe for SSL certificates on the system, then configure the SSL certificate `SSL_CERT_FILE`
+/// and `SSL_CERT_DIR` environment variables in this process for OpenSSL to use.
+///
+/// Preconfigured values in the environment variables will not be overwritten if the paths they
+/// point to exist and are accessible.
+pub fn init_ssl_cert_env_vars() {
+    try_init_ssl_cert_env_vars();
+}
+
+/// Probe for SSL certificates on the system, then configure the SSL certificate `SSL_CERT_FILE`
+/// and `SSL_CERT_DIR` environment variables in this process for OpenSSL to use.
+///
+/// Preconfigured values in the environment variables will not be overwritten if the paths they
+/// point to exist and are accessible.
+///
+/// Returns `true` if any certificate file or directory was found while probing.
+/// Combine this with `has_ssl_cert_env_vars()` to check whether previously configured environment
+/// variables are valid.
+pub fn try_init_ssl_cert_env_vars() -> bool {
+    let ProbeResult { cert_file, cert_dir } = probe();
+    // we won't be overwriting existing env variables because if they're valid probe() will have
+    // returned them unchanged
+    if let Some(path) = &cert_file {
+        env::set_var(ENV_CERT_FILE, path);
+    }
+    if let Some(path) = &cert_dir {
+        env::set_var(ENV_CERT_DIR, path);
+    }
+
+    cert_file.is_some() || cert_dir.is_some()
+}
+
+/// Check whether the OpenSSL `SSL_CERT_FILE` and/or `SSL_CERT_DIR` environment variable is
+/// configured in this process with an existing file or directory.
+///
+/// That being the case would indicate that certificates will be found successfully by OpenSSL.
+///
+/// Returns `true` if either variable is set to an existing file or directory.
+pub fn has_ssl_cert_env_vars() -> bool {
+    let probe = probe_from_env();
+    probe.cert_file.is_some() || probe.cert_dir.is_some()
+}
+
+fn probe_from_env() -> ProbeResult {
+    let var = |name| {
+        env::var_os(name)
+            .map(PathBuf::from)
+            .filter(|p| p.exists())
+    };
+    ProbeResult {
+        cert_file: var(ENV_CERT_FILE),
+        cert_dir: var(ENV_CERT_DIR),
+    }
+}
+
+pub fn probe() -> ProbeResult {
+    let mut result = probe_from_env();
+    for certs_dir in cert_dirs_iter() {
+        // cert.pem looks to be an openssl 1.0.1 thing, while
+        // certs/ca-certificates.crt appears to be a 0.9.8 thing
+        let cert_filenames = [
+            "cert.pem",
+            "certs.pem",
+            "ca-bundle.pem",
+            "certs/ca-certificates.crt",
+            "certs/ca-root-nss.crt",
+            "certs/ca-bundle.crt",
+            "CARootCertificates.pem",
+            "tls-ca-bundle.pem",
+        ];
+        if result.cert_file.is_none() {
+            result.cert_file = cert_filenames
+                .iter()
+                .map(|fname| certs_dir.join(fname))
+                .find(|p| p.exists());
+        }
+        if result.cert_dir.is_none() {
+            let cert_dir = certs_dir.join("certs");
+            if cert_dir.exists() {
+                result.cert_dir = Some(cert_dir);
+            }
+        }
+        if result.cert_file.is_some() && result.cert_dir.is_some() {
+            break;
+        }
+    }
+    result
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"48a61fa45067eb10db3d211f03d5fb63627d9ad31bced91b8d742eab9388009c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"1e9e6f175db74bd9a89cadb0854b398b72a93af2167f88809ab04d5c32b17a64","ci/docker/aarch64-linux-android/Dockerfile":"b6321433a0886f2e6d9c489fd042137b4da9ce4012d49bea108e9c4fa9064b3e","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"c908701526553756579599caf68f86dfe1f7725ad846cee895eb887a569a7035","ci/docker/arm-linux-androideabi/Dockerfile":"10be394a6196a7904fc04e5b6fac6affd67564897476f9a8c3f4baf827a099b1","ci/docker/arm-unknown-linux-gnueabi/Dockerfile":"ecfe5fef865611dc68bcbbfcb89bdf09dd87599985954f05fd2fff772b816e51","ci/docker/asmjs-unknown-emscripten/Dockerfile":"621d535e7705e1d9d3db5c7d68f7e86fddb849f408efd5a46dd21c1bf3e68f75","ci/docker/i686-linux-android/Dockerfile":"e3aa316c6af0a4559803518cef6bd2c1d90677f9d5d964140266f58369535165","ci/docker/i686-unknown-linux-gnu/Dockerfile":"4e79d9cd661a89b9bba7c2a0cafc51e48fe6ca48da421fa10aeacf600d739d54","ci/docker/x86_64-linux-android/Dockerfile":"bdcaea60bd2151441064a5ace526975aa361d80016e736f9e068d7b479cba9ce","ci/docker/x86_64-pc-windows-gnu/Dockerfile":"54dd42ea91e2adcd98d534abac81c42a0ec7ac40ef1d9d7fb86e33c93bdca23a","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"deaceeb36695cabb94d4078b7008847d68c257f7cb789b634e1c879c557866c4","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"f2d5a414b194a0b2fcf622781c666065a1112296896b82e0f268191d18cb1ab4","ci/run-docker.sh":"d25dbe04ee974cf8a3aad9bc0647e5e152854f8a4af66f59187c63c70795d01a","ci/run.sh":"f3a6a73366f328c481fdb7ef1d07915398d6c695195a5895695652b4a76aa6ce","openssl/ACKNOWLEDGEMENTS":"e1118418fb157664605bcafd07c25befa2ebe52d001a16f63e2f487c8db79d02","openssl/AUTHORS":"cf34049e1b1f4cff04433842759aca1e4579a5014f905de159743abff09ff9d7","openssl/CHANGES":"a93158e4d943900b2b5a98bbe80ae96ad011dad217b150874bc4474a89253371","openssl/CONTRIBUTING":"d75319225da5728d3cbe848cddd01f3d079d046f750808962f071fc9d5caab47","openssl/Configurations/00-base-templates.conf":"8a59b4d78963965f01d3abfae92aa76a375515e9115033f2457088e1472b4fed","openssl/Configurations/10-main.conf":"266fb14d4d0f84097f2b505179f2430a9f9509655720be7cfd9b98b70ae388cf","openssl/Configurations/15-android.conf":"c0497fd23ac34e99991cf1f881e491200e1e38cd4ebbd32dd8b925528417392e","openssl/Configurations/15-ios.conf":"26ad7be0c3826195eddf9c19d3d385fa3dfd90869bb3f46fd452cddefd324ad7","openssl/Configurations/50-djgpp.conf":"a1ce6facf2a76952f9924a2c0e671b750d6822f1b43cf9ddc0f4859eb3fd3435","openssl/Configurations/50-haiku.conf":"a91ffac31fa2fbac0c4ac04cea16d48c5c34129e94bd008eacf2e3ddde3dbe96","openssl/Configurations/50-masm.conf":"45e544fc21dc1ef1945beb8090251f1827ee5a6cad56e4c23d6fd4721205314c","openssl/Configurations/50-win-onecore.conf":"2e2f626d9d60beb243f2cb7aa62161d1cb830aae58cf8e50dccc6ed5efe4008b","openssl/Configurations/90-team.norelease.conf":"c2be1594850a887b2f4d4578c66ce4aaf20ea36ba702b32b2a0a09dee301137e","openssl/Configurations/INTERNALS.Configure":"3d54a61916deb1f715d24df0e10184d6f1ad557bc7addae9e8747e33ae7fa58d","openssl/Configurations/README":"0f61201ab182fc25b22c29cd8322bcb3627c0c15bc2ab009b4456ced19d72ea0","openssl/Configurations/README.design":"74dbfdf425cc4306bc450bbdb8db0143d944627e8044517de1ab5d5e618ae123","openssl/Configurations/common.tmpl":"efb432110f945075caa4dbc8471f903d333a303348bf4b8bf8072fc17208ec23","openssl/Configurations/common0.tmpl":"aa5afd98d4cad920099be90dd991884c21b3f4598bffd2e22c8552872cc5fc88","openssl/Configurations/descrip.mms.tmpl":"435a8d518008605d547e51f41b0927f4c82a0e71ffe66ebbcb316ad583dca10c","openssl/Configurations/shared-info.pl":"8c9d8a35b536650aec08e192cebddd077dd93f1a2ba8e8e39173649991381b92","openssl/Configurations/unix-Makefile.tmpl":"570dfa454df76b8179ea13717f542f869149a15ee5f168a2de77d69a7008b83f","openssl/Configurations/unix-checker.pm":"86716919b8ed8989dbec32b425161ef9950b809c3fe019e426051885e1489776","openssl/Configurations/windows-checker.pm":"59edc790aa4120df7c2aa3214e1f51b0a044190614ba653df2255be286359366","openssl/Configurations/windows-makefile.tmpl":"c91d443eea0dd6d070df9abcc55f980abf1815436c54aaae011ad061148e9144","openssl/Configure":"038f4abfc2f6378d44604e56f5a3c4f3b0e44d5fe67bad66df36f0c2c3a38048","openssl/FAQ":"0dcd26c83d90badb57e21b7c8659e2c3919b82c8dcfa058d70f86fa926089c2f","openssl/INSTALL":"a4e52961f559a2bd4ff59f595cd82a5cb5e77cd30def6c7443cba6dee48fa481","openssl/LICENSE":"c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c","openssl/NEWS":"638d535085e113661e5ce1624e3c82a30688a5a6298ffd863127f687211a32b8","openssl/NOTES.ANDROID":"7b6ea508f8ed8a9acf9b7f2097ed11d98d8f9a162a01ebb0025177441f117bc4","openssl/NOTES.DJGPP":"681eb2565ba66d185f0d7b23538acebacf959d8c23113f3729f567773c4d04e8","openssl/NOTES.PERL":"d191543a4f97ab7df62f25e75138802bf85a31e082d64773da3a50188c493ec7","openssl/NOTES.UNIX":"e1d727530000565d3cd37da881a984b565c67cc9e39a908e77e83532d9a21d9c","openssl/NOTES.VMS":"8f2493120d221f903752a761f0f07c687f2bdf0eb0134bbf8bc27aa39c95f2dc","openssl/NOTES.WIN":"4defc517ae22cb1695b0cb984f267027910c6f608934cb6dea3386241917dbe9","openssl/README":"a2cfdaa19d8cf9d8b54dfaa84474e5db07628c3315961c2dd4b0b65109a05816","openssl/README.ENGINE":"666adc424b9c8429d49496dd6fd45878c91b56347e139b77978fb60253415547","openssl/README.FIPS":"21d77b48ddf9547ec20de4ee43414f040c08174eb65526bfe46ffe2d4165ea67","openssl/VMS/VMSify-conf.pl":"e7ba8104be58dceea15342d25ef0b3342baa7de9734b67f63f99823cf0f052c3","openssl/VMS/engine.opt":"9622da581af6dd9b906b7d0b0c92c48f50f22632383a08bb335103d0ab86cf2a","openssl/VMS/openssl_ivp.com.in":"fdfccaef699539dc9a772d86ff4457152e874ff0720fde689eff09a3b346b1b2","openssl/VMS/openssl_shutdown.com.in":"934c50cc721507b7fcae17835c0c57f82c55e1ea9914df55ca3e72904cdb64c8","openssl/VMS/openssl_startup.com.in":"d042019383229968fffbcf4e01c190278e7a2479b739d425fe9d770f2ad1312b","openssl/VMS/openssl_utils.com.in":"bf882d08efbe25f8ae46c6fe045a9c9d69790cb5443c8e14d812a8c834ed1e66","openssl/VMS/test-includes.com":"162c56165429a073fa397eda227eae83d575cfcf0b17b6ff7c4e0d900499fa1d","openssl/VMS/translatesyms.pl":"bf9dd82f9487d8b1350e2a330dd125712c2ee1d3390da1b2286fbda3eee5f68f","openssl/apps/CA.pl.in":"880374dbd8e2ad686d48673e8b4d319b2f6e0312d05aaa8018cc0e7862032284","openssl/apps/app_rand.c":"6e52d715808e3ee8d33be50afe2f4a7dcafeefa9754cd9735f722cc61c2c39f2","openssl/apps/apps.c":"c4fc428697252d6d54c3b507f189f3675329db3f2482108a4f64f7efefb83fe3","openssl/apps/apps.h":"3b52233d7a7233aed678d0025815aaeecac0dc23e564a413f347cca13588664d","openssl/apps/asn1pars.c":"073ca2401664a7157844f6bf73aa85464d359e2134bd56e6b617f3fbcaa37381","openssl/apps/bf_prefix.c":"9ee399824e7f33eae606788ad777af357e307e4b241ea38b4e53dc2b7c8cb0c8","openssl/apps/build.info":"c6e41aa4d47403adc5f3c1382da77052a4e168f423523265be870cabf82cb825","openssl/apps/ca-cert.srl":"8460deb84917c63e1fdb019b02d4332ceaad0821edc248abb69a26fdaf2bb0d8","openssl/apps/ca-key.pem":"3490491a6a38d202a29ba250f717b8e3065eb1ee3e16d9e5e9171d3f8f2bf8b5","openssl/apps/ca-req.pem":"a1d0a69a7260d27a140a311a1f9a6e7364859a007f7a18bbd9681ccaa2c55121","openssl/apps/ca.c":"8c10b446791842e84895da6f4f65363496c25ef48b06fd3c13a44a272e2d6e65","openssl/apps/cert.pem":"a4c9b015f67947c38833fa9b2c0a07d4ee4136955ffa3a28a1e34be048f9b957","openssl/apps/ciphers.c":"2fa8c7b381417ee687e49796b1b6e3625b6f7d21d3f413b8ad665b9b1345492a","openssl/apps/client.pem":"5517423efa9a5cd7ede4604399d1572f271260d2b7214ac4218f499387b18c99","openssl/apps/cms.c":"28bf084e6afdb4efdb5f0af4131b4ac4d207f820cdd5842d28ebb3e05578ad67","openssl/apps/crl.c":"9befa634297700f6001ad1c7eca0d63bb8b1dbfae7bb1ab72bfa53336192832c","openssl/apps/crl2p7.c":"ca5a4f2cb3e81c02e3de2d4a954ab9031ee458c6486152a494838312866b6886","openssl/apps/ct_log_list.cnf":"f1c1803d13d1d0b755b13b23c28bd4e20e07baf9f2b744c9337ba5866aa0ec3b","openssl/apps/demoSRP/srp_verifier.txt":"90eeadfb310fe0dc8e4bae1cc30b202a4ec098ff0dc8d0370a5fa37508ec581f","openssl/apps/demoSRP/srp_verifier.txt.attr":"f185cb1322492dbcb4c2e4dd179bd3c09958fd39287dad4308e2fbd3c569f669","openssl/apps/dgst.c":"90ef4dc631bc28d52570512803b4169ba67f2d4538977dad4c1a9d6a3e008d17","openssl/apps/dh1024.pem":"e819c122a1c2834f9f9583b84d40e658bac62c7618560582532a3967e0ee70ea","openssl/apps/dh2048.pem":"accf8e94315c6045756bbbb3d7505993ed9410b93c071fd1f238798f2ad8e10b","openssl/apps/dh4096.pem":"d50f4c0d4339585076895105fe66219cc16d2fb3c8486c4a4b65d954a00412e0","openssl/apps/dhparam.c":"36291335870f26519025cda1c8dbb2fcbb64c35d8a5c0b78d1be16d22e7a0fae","openssl/apps/dsa-ca.pem":"840ab42f5a6754f9ddd6df488410a689e6c10ed37059a9f3ea2f7199458aab15","openssl/apps/dsa-pca.pem":"6551544012b1e3c4c58f0b64200b75f03b2a39eb69681872f41e6793b0d524be","openssl/apps/dsa.c":"e9a10e820f46b35e6d44a5001de482b5a4b7bc64f5c7a47e9e86a0073170ffa3","openssl/apps/dsa1024.pem":"cd2bd5801e45e07d0df2e28d15fc30f13ad473ebd614abcf0bb81f6e508b26bf","openssl/apps/dsa512.pem":"b2abd5916a1a7206e5daff2b73e5faf884c6ec5e53393c08e555887c8ab6f4f2","openssl/apps/dsap.pem":"6cd4f9c195a56c4cd0d801050b4fd2404a72a98d0ed1f5b18cb17ec167cc4f84","openssl/apps/dsaparam.c":"ee7664f99f0ae89302efa47ba098e3254bf2f369c019c31286a6e571a9f470e2","openssl/apps/ec.c":"7fedf07458619ea8d48d203999ee145d5d8a9ce0fa5a490c89d7b3092dfc3e89","openssl/apps/ecparam.c":"f8b3c5c1e461077330e7f5f08973e7fe6a84442dc8c2cd1c67ecd54940e2fbb2","openssl/apps/enc.c":"44b26cb58bd9f8b91545fdf22291e9b6e88d06416be48822afc7fa4b35c878cd","openssl/apps/engine.c":"445f3491a326e49dfb908fa661cdae908fe950875585947c8b485065d7192fd2","openssl/apps/errstr.c":"53188956eda5015bfedae11762c22857ed781e7ad535472e762d564884de9a69","openssl/apps/gendsa.c":"2b06541a2770ce29ea524741cce83f907bdd4dd6421a2a537ab8937186b374ce","openssl/apps/genpkey.c":"4ec4c0b42debd510133cfdb3f558289c56d58318686b727dfceff2028b1e9f3d","openssl/apps/genrsa.c":"4e083685f5e9bcae19042f8c2d5e597a59b2908090792a95011669c2c69e16d2","openssl/apps/nseq.c":"9340adf4468cdee2ec2c7b32a5bce64291ef675c3e2d34907f8e511af612d04e","openssl/apps/ocsp.c":"f245736d1e959337b1fb87fe475200f1c32360f3df50f35c21bcce981e3d2e46","openssl/apps/openssl-vms.cnf":"a280743343019485f6d9dddbc7e341b5d7a7ecc51f8d97c0842c795b7ef3204d","openssl/apps/openssl.c":"878bf601ab33e533c59f02ad08d2ad12dd9153ab6b61da4bd445cddf3ae3f868","openssl/apps/openssl.cnf":"f10ba64917b4458fafc1e078c2eb9e6a7602e68fc98c2e9e6df5e1636ae27d6b","openssl/apps/opt.c":"d16922f4d94d39726eafa62ace1a67ee7f10c6d4a7b47e3b872779e25c6fa090","openssl/apps/passwd.c":"f7f0d61c984a744b3d97d14a751f26c452fb227e24b99efd9724e76f33e55299","openssl/apps/pca-cert.srl":"8460deb84917c63e1fdb019b02d4332ceaad0821edc248abb69a26fdaf2bb0d8","openssl/apps/pca-key.pem":"6eba0a092a01ee003a4bf101491de540e4ee03b94075578a67084292581f0430","openssl/apps/pca-req.pem":"f043270a1483e035369e9aa6e7c3ee570f75e443b3a18a0198aed6c5b1f7b0bc","openssl/apps/pkcs12.c":"9f157db41a676ba5393739d3eb89d2e4678ef69c50b6fd541a8522552dfad7c8","openssl/apps/pkcs7.c":"dd8b6b134c82564796d819845abbbb52ee1cbc9b8545e1adc1b49fe8f38b4e98","openssl/apps/pkcs8.c":"856e5911266e6d6c733ccc650400249c3c2b2a684f85aa2375e3c4a7a794d3d0","openssl/apps/pkey.c":"667cb21e1cd7ab16c259b69872c04d694ec442aa74f3c6affa2342dfa4ba67c7","openssl/apps/pkeyparam.c":"01dc6f1fda2af529b7b94acdbe982a5b66586de37b2968e2b569afbbb2f10ca7","openssl/apps/pkeyutl.c":"83771b82d508a341fa34ce67756ffcb1dfd8dffd384c01a4370474f725c59150","openssl/apps/prime.c":"f78a49e29cd624bb4b3e822e7fa904315779b5210ea22317fba2dec552b7b86b","openssl/apps/privkey.pem":"64795d8b4aac68c76ba833da4cfb54e739b7a90161ab3866d441ae0205da6fa9","openssl/apps/progs.pl":"031f57b38fe763c34bd35844d1655e10fb4b0a0a9ee629d2471adf041aaa2b71","openssl/apps/rand.c":"a5789f9f5a69fa1e4e8824c5aa7fc776f1e30b0e581ec371536096fbd9e0fd84","openssl/apps/rehash.c":"54f03091b739cf4a33b6692c442171c7d6a30ec6fc245d7175c9ebd81b508732","openssl/apps/req.c":"487a8015a6230dda2b4cf774365bf27c83109a960425365e6b9aa614ab2dff08","openssl/apps/req.pem":"7e5054bc53334b6723ae688236f94aca50b8a8b87eae44bffb04aa3f971a4d4b","openssl/apps/rsa.c":"8c13dac2a4b2073c63924099695aa0c57cebddf0bd50e4ea4a7d210c61c2f02e","openssl/apps/rsa8192.pem":"24f69b9f93919a7cc85159762f269b3b3a7e807dec24ebf90ccf166e1d63fe6b","openssl/apps/rsautl.c":"c3689f04ed09e06baa5d83a740211479bb2b40f189a81b81f827146ec5385c9d","openssl/apps/s1024key.pem":"dd647f2b3d59c7450bd0693d215355ce93919b0462f4f57c35e4ce292e671a61","openssl/apps/s1024req.pem":"b6475a60576911f5dc510e2dd4aa63e6de82827dd74baf95dbc547a499a8328a","openssl/apps/s512-key.pem":"eabd97ef4ae742dc493633e69d55c477561662ca63a9d914da1cce76d70f562a","openssl/apps/s512-req.pem":"492a3d866747d7495b8966d28641d327116f1f84e965177c213bbf9add182163","openssl/apps/s_apps.h":"f3d2232dcebb504861a59335c1c657ea4a5273b03a68a13ae20e561046ce8c85","openssl/apps/s_cb.c":"3708e0f6408d65deb42697b98990835d61f7add8f9de2df9a93662b364b6d50e","openssl/apps/s_client.c":"40a1213d86ca153e54465e69784ab6824ca25c8d7787aa8fdc416d0ac847bace","openssl/apps/s_server.c":"4e4283e3ad275f4802f8f027bcc17b663c653d93e7f43faa4cde8cd356a66914","openssl/apps/s_socket.c":"cecc461895cd674446f127700089faad8d1cd1dfc64cc782c701b64106c04ae4","openssl/apps/s_time.c":"9b9b33aae487c047455af900838969ac23d30b46e48ec05fcdc46ccfc38c36ad","openssl/apps/server.pem":"ffdc8d77eb82b815de5235d93d1b733bf7a6934a8276862cd3b0d842b7dcc53d","openssl/apps/server.srl":"43fd56f56bb9bb18bc9c33966325732b2d7e58bfe2504a2c5c164b071c1b8653","openssl/apps/server2.pem":"315a1d925c484b57b5f6b154318c241f49803a627d5dd97a1add7eb5759a16fd","openssl/apps/sess_id.c":"e83c514dce778a4a0571a3aa4be4092332555d18e67bf4886b1214217e017d27","openssl/apps/smime.c":"54d4d7fcea506c7851d4fb490b2159de50fa20a53fd5ec7076102198dcb6dbe6","openssl/apps/speed.c":"2acfebcc2c902533e6adc6c30f210009892b499e4216947215a48cda76869676","openssl/apps/spkac.c":"76800611dc1e50ae3df5cbcab236a7fd13fddaaec8aa1b8afe58baa519a8e603","openssl/apps/srp.c":"e0c02d90859698a4dec9db38604bf028256a5a25eff8bb9878f447bb6feb8b03","openssl/apps/storeutl.c":"87e65d12dfeaac45a122234d6f692995acbd327ec6df63afe16b9cd0179c6f60","openssl/apps/testCA.pem":"e75c583a194e000b9cae10e3f4224cf305c8be9ba057e3c86192ac008f57fad3","openssl/apps/testdsa.h":"67ec5ef1f45a7e41083ed72548336608893656c379ff01e0b4f42565022c2bf3","openssl/apps/testrsa.h":"bd13d6a56f990a4515241402dc0c9720d47a42b737d4041bdd042a4bc86d2544","openssl/apps/timeouts.h":"33d3a52e11dbe263072a7646cd75fac70252e32dcb997384c9ca1b7b5fb171da","openssl/apps/ts.c":"16b807fd495b19b69ce2da8abef1e8fda99362555db14a2d077801c866dd4c4d","openssl/apps/tsget.in":"8a3fa8dd19db4e6d13fad28438206d765b72fc804201f61e081abd1963792970","openssl/apps/verify.c":"b9eb9429828fc89fe0b3603ee709b6d09d5846c0258bc2eccb5b814ba6e079ec","openssl/apps/version.c":"ac399bc15e845495698e66c9cac09f5ca8f282d82cebffa59fdd9517380a50b0","openssl/apps/vms_decc_init.c":"8539f1d25c6b8d659f85dc8b6b679021afeb887b6c61b904bdbd6bb5d03a5d19","openssl/apps/vms_term_sock.c":"bfd258937ee18b21ecb57b3bcd88f18458c3e5960f83854b2a448e96c97084d0","openssl/apps/vms_term_sock.h":"ce3ad480013244ed87fba126098fb730ee807965b97c7b592936e4005c2fd699","openssl/apps/win32_init.c":"f2494d72e25318eae3d57523e3aeace7458187349f92e8287be39ac5fca2b6db","openssl/apps/x509.c":"a75bd19286102ca1f015741c68ee696289a90c94db73079d590fba75a8b643df","openssl/appveyor.yml":"d71020aed505f851228ae8d5661d8587c17f3e8967e4d38612c8521da522cb7b","openssl/build.info":"1fafb451a7cfabd49372a2485f99acf6a5aefbf1872464a309c9bc79ee1afb31","openssl/config":"08c3441534ca899ecb40fe57d51376ca73f96e13b3bb32c53a72cb78ad2b9c99","openssl/config.com":"9070ebab2d5ebab6428a46673195e6bb9f043b0e9b394f71588c1ad17c9632b7","openssl/crypto/LPdir_nyi.c":"f638ff3001e5dc7ddbb230c288d47737e2d9f85226ea046a604a4259bad07cb0","openssl/crypto/LPdir_unix.c":"320356ac25a50f915697bd9cecab43fad7912420ab1551449422972c878aef7c","openssl/crypto/LPdir_vms.c":"adc0cd123d9c0ddba011876b4d5e0c3665a769cecccd1a5d6c5049ac8030fe93","openssl/crypto/LPdir_win.c":"63087d5abfbe1d49f5076f92ad2f5a5d58cd9f4af6cd21b29514c0326df367f4","openssl/crypto/LPdir_win32.c":"775d02591831f77ffee41beafd0388854e10742af0f27bb94ac2ab7a9597c51b","openssl/crypto/LPdir_wince.c":"2e6a13af735a9b7fb4dafebfce3cb4781b8bd0593b422b49639a756ac49e0a88","openssl/crypto/aes/aes_cbc.c":"34a4fe01fc7363e17a546ad762c0eacf9f3e2e54075f58a5e64a9a904f3a1c64","openssl/crypto/aes/aes_cfb.c":"53d9d10074bf4ac5463a288bb7278a7f8f21dc1143b7ee516afc3e217de20c1d","openssl/crypto/aes/aes_core.c":"30e5c42410e2cd816b35a5f823018ecb265a2da3c2bdd2aad1cdb226ea85a2c3","openssl/crypto/aes/aes_ecb.c":"d686330d81e81903043b0aae0bb5c42ded90c5d36930e93b7fafb1122b3a3a97","openssl/crypto/aes/aes_ige.c":"60ef606508f1e5cfb0bbf7829ea9a5122d6465f10511c0279bf378a3a821044f","openssl/crypto/aes/aes_local.h":"c03a0617d75a234e86f92c57548b630db2182c5ac5a1f42b8d2b7f654bba09c5","openssl/crypto/aes/aes_misc.c":"7662c30dbfa5d6944f0b346694d602a2a80c44ca3db7fd0ff1c0bb3ea3098e84","openssl/crypto/aes/aes_ofb.c":"67531b43a689fbfe5899b745d8f7016e254df0fafedee64af780b55c970274dd","openssl/crypto/aes/aes_wrap.c":"251791087036c02ed6e716dd4188b8b5937365c6c46a03fce55c92936446e9e7","openssl/crypto/aes/aes_x86core.c":"16127de408d69734af652c0fb3762d0a9a22aa0924caaad3e7720d9a4d5c016e","openssl/crypto/aes/asm/aes-armv4.pl":"2643bc76707494fba19c61da6718e595856833cf2e072302124b0dc5adb34760","openssl/crypto/aes/asm/aes-c64xplus.pl":"a9d46af40d5bf7fb09431bc61324dd61d8c502e0621c78118812f854a27dd9c1","openssl/crypto/aes/asm/aes-ia64.S":"3670f1c9503450b3d870b4b7a1f3d7fd09fa33faca0369f994b232b8a0331e81","openssl/crypto/aes/asm/aes-mips.pl":"281ee9e887ac017fe4ab300d062809770eb2c52e1d4a5d9c389c50eb895b8190","openssl/crypto/aes/asm/aes-parisc.pl":"f4cc48b0906233377375a3c839062823dcba4f6a42f319f99f51a1fc7ab10267","openssl/crypto/aes/asm/aes-ppc.pl":"e1f93284e66ab614689f080680fbe952865b862403c7c19c76cbfd3b422a8a3d","openssl/crypto/aes/asm/aes-s390x.pl":"f14c90947cb3f662ffde6c91190b3e28885d5a9bf78fa7e2102ee957e0b1501c","openssl/crypto/aes/asm/aes-sparcv9.pl":"854bee89601f5d1ea6e98cc67cc5f41b720ee025cb05888c6ae1d77fc9da3815","openssl/crypto/aes/asm/aesfx-sparcv9.pl":"b78394799c0e2b3f096394bdf4d3ea9f5678df0d06e0892456273f8d5c2c461a","openssl/crypto/aes/asm/aesni-mb-x86_64.pl":"5beb473ae072df0354243718780fa455621b2221e03fa9c921854a4d180577da","openssl/crypto/aes/asm/aesni-sha1-x86_64.pl":"fbda8b5f3b613f900269d372d91a490f01603dd6a32e417c9212560371002e8c","openssl/crypto/aes/asm/aesni-sha256-x86_64.pl":"f248cd0070544d1a3388247ccfc883b83d9bf6d58b40c5550f189e7223738aad","openssl/crypto/aes/asm/aesni-x86.pl":"254c726386a9205d6e6a8be48c6f9679e02895840e8912b4c386c55eb5b5a51f","openssl/crypto/aes/asm/aesni-x86_64.pl":"f9f949a48ae275aa455f90841406f684499475e960b87daecd9eb9a7a84c976b","openssl/crypto/aes/asm/aesp8-ppc.pl":"d33481726a7432f7e4a247e300b5a85ed5e6bc223fa2c9086c1efb2c25a29bcd","openssl/crypto/aes/asm/aest4-sparcv9.pl":"8030bae72b93e9e22812bef09fc3dc0ea95296a9c2bf0d34735ab5696850a982","openssl/crypto/aes/asm/aesv8-armx.pl":"3a3137a0a7130a61aefb5be06b3117100dd528232f8b70baba4a0dad1cf7e8c5","openssl/crypto/aes/asm/bsaes-armv7.pl":"a570a66cf4461ba6df4e6ca9f18f845455c1dd857518c489f15d05fac8b1cc9a","openssl/crypto/aes/asm/vpaes-armv8.pl":"6bc9a6daa838c106f5236911ad4a1de329f16312f2574ff52343a7ce36d24568","openssl/crypto/aes/asm/vpaes-ppc.pl":"590671c7967c261ab7f1055abe5dbfcce7c7897f42288aebe568d4d9c05dd17a","openssl/crypto/aes/asm/vpaes-x86.pl":"bfd3e7df0eb92c1d32225f1ccafc4cc917b352ba1ce7f5915924f36154aab241","openssl/crypto/aes/asm/vpaes-x86_64.pl":"aae1a01b2c793305227e6757dde739116c95c125bfeda6073ffb60c8aaae71b8","openssl/crypto/aes/build.info":"4fd9b60b8eba57c73ec8037325770b682151c84e5c8c74a8f9f87b27791c2fa8","openssl/crypto/alphacpuid.pl":"54de69fd5d7531b3924ce56e4f31d55a44e01293c73511fa5e80152678940ac9","openssl/crypto/aria/aria.c":"da9d631bb6ae5f11e5ae50ea033082568fe8e84e44f023c3ad087bf12b89664d","openssl/crypto/aria/build.info":"506e26da9ed2bd9dd14a25f593e649c5acf25bd5a56e43ccef16ec59614bb2e4","openssl/crypto/arm64cpuid.pl":"6ed88764bb65b5c2dd4382fc66fcdddc8fd23277679044061eefcfbb96df8c5a","openssl/crypto/arm_arch.h":"7e5614435c2fdf780310858ea0ff7cc524b5bbc112e97d9c861cda095fe07380","openssl/crypto/armcap.c":"824274a6caf835ee2fcdb9e5454ac5272dd8e13d9a0cb6a6971203b553596900","openssl/crypto/armv4cpuid.pl":"655d50afdfe0388c462f364ef77dd9fdacf1e34c4b9b4f6881959f9c16392734","openssl/crypto/asn1/a_bitstr.c":"0455687ebb68d32e633bf31188fc3fbf3d38e085ba0c717d5ccdb4d849b358f9","openssl/crypto/asn1/a_d2i_fp.c":"efc237e569fbe6c3aa4c993ed9b15cafa6eba03cd0c56b19c1eac3f6beb35354","openssl/crypto/asn1/a_digest.c":"602f45ee0c3cb0c0e713e1d62486740819cdbc4c96bd3256c1ad432448c630b8","openssl/crypto/asn1/a_dup.c":"0b089629598a4569585424c34dd3c67e03995f69b6e574a575cf2c9f998a1bda","openssl/crypto/asn1/a_gentm.c":"fb2e06a39014b803425ca75b10ffc34e24ee90953f893025630f026957f1bf4c","openssl/crypto/asn1/a_i2d_fp.c":"5d98da7ae83ec083f447a42d119a2696d853766f646a7eee0bb1408148f27f88","openssl/crypto/asn1/a_int.c":"b05e27052e97f1a4488f98d90b3b94493a36a33dbc3c1054da92c34d14f6b054","openssl/crypto/asn1/a_mbstr.c":"4e0818e467ad59bba8d0a8156219d61deb4d7db0e3d1b3dcec44d297d9a08a17","openssl/crypto/asn1/a_object.c":"7b700da6be52b17d498d720a3b97d101f0220c280e92ea39e59956a1793652f1","openssl/crypto/asn1/a_octet.c":"6734764389c1ed27857a07f65abd406dcad0a3bcaf48c9b44bc50c435c493a1f","openssl/crypto/asn1/a_print.c":"a862a0dc5586a2167fdaa3ba47d79749eaed67e2a9d531bdd8e49dc35182ede9","openssl/crypto/asn1/a_sign.c":"90dc997934166ba2cb7895d184d317d0377ab74aee36f34c50c8b5c0c1c828fc","openssl/crypto/asn1/a_strex.c":"d99f88dae508e900d556d2a48d4e56e7147bedfe733f74d2f13cac76e6c4fd86","openssl/crypto/asn1/a_strnid.c":"46e07565ebb5adde365f69e5d8497f044ea9fd83f0b22ae8ecf0338f3f70703f","openssl/crypto/asn1/a_time.c":"3a06e13e97ad57f5e79a0205097665e7c474564f89badfbe747ea4084985ee8a","openssl/crypto/asn1/a_type.c":"fdddffdee9d8f64fc70f36469ba9b7b438f6bda52ca544a55c6d2a645497b561","openssl/crypto/asn1/a_utctm.c":"c713c6836eb1ff49be6f64f89b0d59b28f510c4c3f6206e5c450cc46712782bb","openssl/crypto/asn1/a_utf8.c":"55efd2f1103eb15b8199a5fad63f81b7e6dae98278c04556fa651f5155cf1b01","openssl/crypto/asn1/a_verify.c":"412f08f99c52e255855616ccda616e5390691cfc9d8ec8be04b757bf5fb95c73","openssl/crypto/asn1/ameth_lib.c":"15a82ae8a24481f1bfabb91686d79224d2bc4181eae15a914d729dffeb9968cc","openssl/crypto/asn1/asn1_err.c":"f12c5a109f37dea5e052b6a64ee84096de39614262b6696c4109c7f2aab6cd44","openssl/crypto/asn1/asn1_gen.c":"1c9a643ccf3f0a5c896fb232db91ba1cb4fada81ff895f0af848880f3f8ce17c","openssl/crypto/asn1/asn1_item_list.c":"cafc68db3b9f78fc349256799aed0cf046a0adeb34669d5eb5fe537e2d87da52","openssl/crypto/asn1/asn1_item_list.h":"617843466bf00b81d6f2b56696cfbc52edfed754a48b58a7711e951ac9b29ac0","openssl/crypto/asn1/asn1_lib.c":"23fe4693d8e45492b0cb27ab8de66917f26ad8e63e9d1f6c5d298b3c227db01c","openssl/crypto/asn1/asn1_local.h":"7f0fb7bf0c589edb119b8a2b387deb12a2ae0caa5564ac07314c684a10340ba8","openssl/crypto/asn1/asn1_par.c":"e5397f6ec834f253b72c4853cdc71a698376c264f59f0bd60024e8dd5524de00","openssl/crypto/asn1/asn_mime.c":"31a14151f7ded7c8a25d615f03b782bb86088468c2028d8bbe2c294d13f301eb","openssl/crypto/asn1/asn_moid.c":"8794c22a22c285ed5529cb653ae9bc4a532759556b082df62cf3c7c5a980d65c","openssl/crypto/asn1/asn_mstbl.c":"e5636d0b7070096599c81428620efd8da80806c1469adff5bcee9538b3d3eeb2","openssl/crypto/asn1/asn_pack.c":"34c17431a3e1d5f2870a110316083643d7d2f712cacd773a27be10be8fbc8f7e","openssl/crypto/asn1/bio_asn1.c":"40eb90c7295879fd79483d01225d35da46efc210d69cdca765e338df90e8f04d","openssl/crypto/asn1/bio_ndef.c":"0762e9642a7b1a3495661fd13177b5bb6b47c41ac5400c9ddf67c4396e6683c3","openssl/crypto/asn1/build.info":"fa44195e9e9134c468cd6cc4dc319a10b42efdfad2afc0c24c6c09ab03fe6244","openssl/crypto/asn1/charmap.h":"89fd54108d2ec2e28432e6c215bfc57e485a450298e75f49b25136da7a2fd952","openssl/crypto/asn1/charmap.pl":"c8f68c7552750671a6aead3adce1edc24f6209b5b9a912a66e5c3ed97f36cee2","openssl/crypto/asn1/d2i_pr.c":"6beb843dc43aab95c407515f0f6dbff900d62237a10136cefc349db2c78f3867","openssl/crypto/asn1/d2i_pu.c":"db03265276649bbff5d13e00833a1d7afe370ecdae6ea3b8636fa66d6bc04d21","openssl/crypto/asn1/evp_asn1.c":"13e62fc5ec5f2389ed73b4c36764df7dfac8f9ca5d6ad4b9af4d5a40ffb3e834","openssl/crypto/asn1/f_int.c":"c31ad783d4102c01e1c356db25703ebad9ecbc4076be03671ebdf0dce77bbfa8","openssl/crypto/asn1/f_string.c":"ca8bcbe18111761b9d7051c28dc8c3a517f12ef09b07f7d18e95b09b1cea8463","openssl/crypto/asn1/i2d_pr.c":"6d5d69947533950f56b2a1ea9914e9a6263c89e3dd6e0bc580fac91c144a4418","openssl/crypto/asn1/i2d_pu.c":"6a4dea59d8f2a292a2e56d9d0dd7c1e5face5611b8cd464acd482f352bcbf7e8","openssl/crypto/asn1/n_pkey.c":"7a806728ae2fc2ac07c6403da406cfa1939dacca640bb44a265b5b3ba40bbb97","openssl/crypto/asn1/nsseq.c":"9d12f391ef3a96d4c49263876834fd3e55953ad182b8a50af67b9985fd0ae69c","openssl/crypto/asn1/p5_pbe.c":"b5bf15dc48ba22546910fbc45b8deb4f16f702b2079001d8bfab52e796586370","openssl/crypto/asn1/p5_pbev2.c":"75db91088cf53ef8ecf16096a273263dc1b8f1b305d34642fee9a3375eda264f","openssl/crypto/asn1/p5_scrypt.c":"2ee170bcd3a3f74020359645c556e148c2bdee58cf8eb5aa9e3d16549a236991","openssl/crypto/asn1/p8_pkey.c":"3a6bd5462179c020db34cb3856a351ca72cdb2c67aaaaa4b93490a4b5fc4f2ff","openssl/crypto/asn1/standard_methods.h":"b24ba0bd23ff748cc8198a20061b4ed786bd23b726b8863b0a9aab43ce4940dd","openssl/crypto/asn1/t_bitst.c":"3e3d70f8b000bae8d22df59d06d618636c4475bc74c5cf6496222ee362df2d87","openssl/crypto/asn1/t_pkey.c":"3c0b19d47d16ee69fd4cf9e254f18942ec60738153d777af58cc92dc36f85b1f","openssl/crypto/asn1/t_spki.c":"abc6fb07dbd6f0539c6dfb246c78c6e64331efc7dbcd6710851b0e9b25a92c62","openssl/crypto/asn1/tasn_dec.c":"d6ee6e8d5088d41e7c57b4b2ee722fc4887f0f303ba818b4068a8df4f95f2cbd","openssl/crypto/asn1/tasn_enc.c":"9923263ae81335b0185aa75529c75a328a7ce23205f79e2e6e2ab4d5ad14a31f","openssl/crypto/asn1/tasn_fre.c":"180a6caf40524dba99f5c59c5aa027111c5b4e2bd36f9f4023532d87ce9d0572","openssl/crypto/asn1/tasn_new.c":"a68ca3d8fb25b7d738ad0fe3e0fe89d04b666e8bda27205c0a29391ad236f06b","openssl/crypto/asn1/tasn_prn.c":"87104fe0b0cb61b15b29ed9ff0a87ee0322a7d8afb96fb5814947778736e49b9","openssl/crypto/asn1/tasn_scn.c":"bfee8c5ce3596ca8424d86d79d6629b9a10ec5e638f01a3a41190f6a997a0cfa","openssl/crypto/asn1/tasn_typ.c":"1b2ef7de83c4cdd6814a7ff51b7887ec0fbdaa491239fcb53ae099809ed93950","openssl/crypto/asn1/tasn_utl.c":"555ebc1deccb5fb32b8fabebc9dd5f7ec8c08ccddf55089f125313ffb86302be","openssl/crypto/asn1/tbl_standard.h":"d218819087369d116e0cb1a09a1d18d62e3b8d81f1097f51bda64d4d2632276d","openssl/crypto/asn1/x_algor.c":"6251fd9cde962a870fb99ad9efec2e92056bcae56f11b6a006099b58dddfbc1b","openssl/crypto/asn1/x_bignum.c":"86cf198543ed64b9aab374c68a9e6126621ea822f36be6e799d98b429703dfcb","openssl/crypto/asn1/x_info.c":"0c7b475e7ff24be19a93799988a8285a4fcff54948dcdcad56d5d15832697d2b","openssl/crypto/asn1/x_int64.c":"e07b3a84a97486aeb8cabe2fce3f310cc26dd4ed0f253d8bfbfea34829ae8671","openssl/crypto/asn1/x_long.c":"b7196b0ad11e30e2c3eb2b3fc87ecd7ee23e70337a561a1b004b8d8310696270","openssl/crypto/asn1/x_pkey.c":"dd38a57de88a305d3d91b67c2546a1dbdd19626242f4c2aca7589a5c43ca4d5b","openssl/crypto/asn1/x_sig.c":"3ad785d142245924ece45b57287508a337f4e6a17ff0171b8dcc29fdfe9987d2","openssl/crypto/asn1/x_spki.c":"9f360d8664aca7e8df445bb14e67aef5b8c6ebf96902d0d17f434de2760dd045","openssl/crypto/asn1/x_val.c":"16cf6f2ec27d2b0a6e5670f507a2e9838f449ba354b4ef8c3d3870624c78e000","openssl/crypto/async/arch/async_null.c":"fda3f2108e56457e67e90672cee85a88ed3be9c0ae8c48be3c311d3af4b1cb4f","openssl/crypto/async/arch/async_null.h":"b1584fbd40feaad7cdbcaa0f37634f6a3bb6151c8d3a1ea775407d2492bffbf1","openssl/crypto/async/arch/async_posix.c":"0559b3649322a5ca8a8327a5697d3a760b6cfe4ab583e04e77e405d1291becbe","openssl/crypto/async/arch/async_posix.h":"aa3c2f8b400c9c5055473dec40dd70397be774875b45b877de628b626269c625","openssl/crypto/async/arch/async_win.c":"f6e1c968ee12455407d45a98d797a20bb670ef54206101e8322b8b129bc0bca2","openssl/crypto/async/arch/async_win.h":"e44cf8ed835324cfca32677619cc086cab40464a556ed6877b16a48d64ccc314","openssl/crypto/async/async.c":"81ae3029a88776ae82430d2e62d8fd2cbd37ee882e6e454fc6e44b043462905f","openssl/crypto/async/async_err.c":"9dc8db44323ac3875af45c9e252c07b57e9414153eef799227cb62e3bf275817","openssl/crypto/async/async_local.h":"c1de46865fa89e0e3b091c2d0d1e636277e7a17b767a0bf832e9a6d4467de6a1","openssl/crypto/async/async_wait.c":"31a751120c1e124e15e5443d4f241d020136475c50224019fc6f17941e3f23be","openssl/crypto/async/build.info":"0f207664fd179f0da32133b314a3a12d882ca0767bd933223987e512f38b6559","openssl/crypto/bf/asm/bf-586.pl":"e2a70151810a9c072f339fb79a547d40518c9ad291b4b861bfe150accdbb9736","openssl/crypto/bf/bf_cfb64.c":"65bc70248cb9873a57035726be7c4daab7088edf3e0444f20ff3edeaa0bd00e7","openssl/crypto/bf/bf_ecb.c":"bb667d96213ce99df938ff6faf05fd6c8d8de41377e0138718bbe154e35402b3","openssl/crypto/bf/bf_enc.c":"007d64c1c42ab76f752dce1bce9e4d76a1d9b502b5ac38ab2ffd11a3bbfab872","openssl/crypto/bf/bf_local.h":"d5caa7b411eddd3325b5e44ee6aa98f7fb0aaae90afb266b95ff82ddc8dc6ce8","openssl/crypto/bf/bf_ofb64.c":"5fec279245aea9091befe01784509c0811bba300f4f4ae831c5b10d2c245de2b","openssl/crypto/bf/bf_pi.h":"9100be951fae338f952bcd373fdae299db340004a560d4a8e2522d94d126937b","openssl/crypto/bf/bf_skey.c":"5abf32cd325f89702f542ef125b837e94182478b4e88fc8dc9ba959670494304","openssl/crypto/bf/build.info":"18fc244655787eba13a938e63be44df66237ff9c61c652f9373abf0e1944de2d","openssl/crypto/bio/b_addr.c":"edc5f3e04397ddcc975944d75223a3f22f6bcb4bfd193e296351d048fa76afd3","openssl/crypto/bio/b_dump.c":"23636615ed57398b183859bfc644b3ed6a6e4ea767a4b0510f384fc22d3174a3","openssl/crypto/bio/b_print.c":"37598da04c8b2d79954a13934c1415bb0b1bfb2aa26b92fb9ba7d05efd739426","openssl/crypto/bio/b_sock.c":"7fac000db37431a216998c55b37f7cedf7da8e93e95e87a2870eb636001d541e","openssl/crypto/bio/b_sock2.c":"ec5d800048172edd6198048e822e997b4ab537d56af13213958a62e4a70bf87e","openssl/crypto/bio/bf_buff.c":"93f4d8b64f77a78bd3b75899524da4fd377bf1843fa436e121f7a4e8fac70f6f","openssl/crypto/bio/bf_lbuf.c":"556acdbc6aec55d7dd154cc91d58d30e27cc26447cd0580e5bf5e62e0fdfbaf2","openssl/crypto/bio/bf_nbio.c":"20de24180dd8768d4236b072fe6fbded3e4c2f046138b82c196829210f83e6f9","openssl/crypto/bio/bf_null.c":"1d9d2aee3c3345fd1f9fa6a7c61bd0a7210296c16bb8e430db6eb96f986d4daa","openssl/crypto/bio/bio_cb.c":"36a248185aff251569cf313e027df36e7ddd2f040011c7df120e763fd374013b","openssl/crypto/bio/bio_err.c":"a076d1a372dd188ac2d0b2d85aec7fd092615304eb750a7dc7f35171d83e0b12","openssl/crypto/bio/bio_lib.c":"d3768371c6f66104a0cbbbe79a78d3bf6b9211f51b9361d496efee7d492c3e7d","openssl/crypto/bio/bio_local.h":"372e5162c3276036c8afec0d831c8fa799b9b40c585a950dee9c684c100e4503","openssl/crypto/bio/bio_meth.c":"909b7c1fbffa3f3652c06e781f68888fe32921bb0864f2edf0cf11f81c57206e","openssl/crypto/bio/bss_acpt.c":"a9d2e85a836f783e3a8b0bb43e91c98a8bea13be248547f41e8efdc112c6dded","openssl/crypto/bio/bss_bio.c":"0fbbf25cc71727b70d69cdaf54e33c1edff88dfda9c6135c3ffb903bc2a16158","openssl/crypto/bio/bss_conn.c":"763ba60a50f5ce0436ca6f7d2ae4012ad64c08d4a7206bcf46f6215e0c87e0b0","openssl/crypto/bio/bss_dgram.c":"9087e5d3f85ad7a484eab44c43b610c5f171f9eced525562207be248a8950b87","openssl/crypto/bio/bss_fd.c":"a1d09b6f537ae1cd91b78747064bf6e0bf1480d2081fd49520bf68b8bc6f9c8e","openssl/crypto/bio/bss_file.c":"a6b7fae08a9ade223189c131d9cf791e665d07c096f72c81222d3914b6febd77","openssl/crypto/bio/bss_log.c":"57800ced38e095cbfab4978b135c987d198e23577e0b1ece7b9f9ec09ad134d6","openssl/crypto/bio/bss_mem.c":"a5fd895707fe741301a631c2a1f2001e2c6c9962224da56b4d31714936183a4f","openssl/crypto/bio/bss_null.c":"5c69c5ef64fba87209ce6732daa442179147f58ed182b0ffae2c810d1a1f9246","openssl/crypto/bio/bss_sock.c":"291ec483d46ce4c84d6e27767b5024e8b46c545a9337440040044698b77a5185","openssl/crypto/bio/build.info":"c06b0ab353777e854ec2e3fb06da384d5feacf7b6a7a793a86f953f75727f9df","openssl/crypto/blake2/blake2_impl.h":"43d57951c44208b9c739ea55268ad32537bd69cb6996142aa9fba1fc73156546","openssl/crypto/blake2/blake2_local.h":"3b65f381c00259a7e9ae4c99804129d0be1da85883171f7a7e03770b6d19c182","openssl/crypto/blake2/blake2b.c":"a270a88442ff7a5ad50aeb98f201631733ecd94b3d16ccf4e293f326069870f4","openssl/crypto/blake2/blake2s.c":"3127b5f1e4b7c86b4b3f98906be4e02cbf6c6ddb76ec562df22bb90f8dc703e3","openssl/crypto/blake2/build.info":"32d94885a66457adde2492c1f54d8eff2470fabc56714ff452656d26e0dc5dd2","openssl/crypto/blake2/m_blake2b.c":"15ae3e3e588732702f387aa72bcbf83da1c6699be5fff50bd43ad6823f6a2ea7","openssl/crypto/blake2/m_blake2s.c":"86328f420a7255f5356e213e066c0ea159620556a6d0f4809a01af1d749a326d","openssl/crypto/bn/README.pod":"f9a09a797a9bb17b25582b1ec93f630ed6fce7e1e7d7bca660cdaceb93f7e18f","openssl/crypto/bn/asm/alpha-mont.pl":"9a965fc05099cad8166dd2139a369797b76b86f5a3ff649c2d769c809e43f49b","openssl/crypto/bn/asm/armv4-gf2m.pl":"59d4382de548cfe64a537ff06d7cc2f853267c374b362112e7c56f604d097295","openssl/crypto/bn/asm/armv4-mont.pl":"033cf96aeb2d944ed8216f6428b50f0c1342effe795eead230780fee09c1b81b","openssl/crypto/bn/asm/armv8-mont.pl":"74e3e61fae844a76899b271096ad959126ace8a44c6b423b49b5c60644183846","openssl/crypto/bn/asm/bn-586.pl":"48bf56c13b07e72dab0758458edb8fb91d405ea66be51ba2cbe0b8d7ad66a1ea","openssl/crypto/bn/asm/bn-c64xplus.asm":"2ccfc9e32f973733286f929efaba733ef221a2a525baca902d10b43f37e5c316","openssl/crypto/bn/asm/c64xplus-gf2m.pl":"6baf33b426d15ba5f1932354803c207ffbaac02a8ca0a297f1f1887f7d9e3ac4","openssl/crypto/bn/asm/co-586.pl":"a6e32d465555356f8d94ba60502f989571014e259578d8b7ecf08b8d550f2d49","openssl/crypto/bn/asm/ia64-mont.pl":"38c66ea37a612cbdae9ec76653ccf5f88639f2c83a4ccc7b68f1a07885925f39","openssl/crypto/bn/asm/ia64.S":"bb03f1210151f611b289d26275dfa4ec04858c3f6b8e44f6a134ae43134ecd4e","openssl/crypto/bn/asm/mips-mont.pl":"695fe1bfe46aadeedd9370ed36052d2f46744e220aae1bacdaf609d565f83d62","openssl/crypto/bn/asm/mips.pl":"84011dee4e2a318e17924259049a8009b525929e07be682e5433a32388989254","openssl/crypto/bn/asm/parisc-mont.pl":"0618fd3e42cbb86c80f9a442df30eb5ab03fbaba85bf60e305f1e8a7b0303011","openssl/crypto/bn/asm/ppc-mont.pl":"1c74d887826dd16230de9da9379143b585030a723c7c77e1a8ceaf67fd431d86","openssl/crypto/bn/asm/ppc.pl":"e5fc7d5df29159aa04884e787586ede7e3daf38dd1aca187d277987f6ce4f30e","openssl/crypto/bn/asm/ppc64-mont.pl":"d71870e9fa8fa2d7b8132f43e9619c1016f24669aaf0e4fcc5b49b10069bf9d4","openssl/crypto/bn/asm/rsaz-avx2.pl":"d1c58913d6a27eed2bca23b623640767356b4bd63a0253b7c665fd364a8b6137","openssl/crypto/bn/asm/rsaz-x86_64.pl":"2b988945d8e2c352c739ec7a816cf06fb41eb7b5666ccfa13e504ed489513246","openssl/crypto/bn/asm/s390x-gf2m.pl":"ff56c23a2625a1d7203558c930795d53e7aae96edf79dff9b425399f3bcf88c3","openssl/crypto/bn/asm/s390x-mont.pl":"5f42262e655b2f0864c888076b9e92003364787f840dfd7fe6821d1f0ab20b75","openssl/crypto/bn/asm/s390x.S":"3bbc49704aa816f558c053615e554f5dc5727f0d8faf5731569409968419e3f1","openssl/crypto/bn/asm/sparct4-mont.pl":"90072ba1eade122f422edf8c22d9f8b9dea38288f644bc83d7606a2899717472","openssl/crypto/bn/asm/sparcv8.S":"5ea77201a1d3d910c4f9a6e46d84497a101888e1a88221df37e0b938b3b7fb27","openssl/crypto/bn/asm/sparcv8plus.S":"9a06de2127cb76904210100b84593545ce85ace4a1683508560ded0df5e458c5","openssl/crypto/bn/asm/sparcv9-gf2m.pl":"46eacdb7fa8a1e456a2f189236c29da071243465d3e5dddeab216195a0b7330c","openssl/crypto/bn/asm/sparcv9-mont.pl":"c110a9ffe20fb2df17788f18f4378fe658c65c5ef3e0132eba55b49e6b30c990","openssl/crypto/bn/asm/sparcv9a-mont.pl":"2a41e7e980b947e74e4f904d2f73f5eb3cf6fcf33aed719a8c54f2829af80d18","openssl/crypto/bn/asm/via-mont.pl":"39b3d4fe10f57f762bc04a3d4c007228a27b733ca822626b4fa318bcef9a6603","openssl/crypto/bn/asm/vis3-mont.pl":"8905a111cf37dafab244fef8328a1880e2767dec450d3f14bc9a94b0e962995a","openssl/crypto/bn/asm/x86-gf2m.pl":"5d67351d8ab90a1f9bc27442790b38e8b5af3adb2ea808f1c538e302b63292e3","openssl/crypto/bn/asm/x86-mont.pl":"ed70f06b72ee5b7952382450d271048c1ea90b8b1a7f2b54725c418d010e2a92","openssl/crypto/bn/asm/x86_64-gcc.c":"b26f0475d8edfc4d29f144ae1bd2509656519a65909ba935a6ab8e028730c41a","openssl/crypto/bn/asm/x86_64-gf2m.pl":"093190e7d1cca46563423663eec16612c27b5baafb1045085837c7e0bb92a771","openssl/crypto/bn/asm/x86_64-mont.pl":"daef157ec69e2ee356eff9b886f493c0c06727de42c53a6bc9e52609bd1ee27a","openssl/crypto/bn/asm/x86_64-mont5.pl":"dbb7ec07d1bb9f403691ba3e3b1371e979a11ebe440a026a165f8610d21313b4","openssl/crypto/bn/bn_add.c":"997a8198a4162b709bef9f539c83e0eee985b95e048a6880f800f1c87fc66983","openssl/crypto/bn/bn_asm.c":"8ca1fc49cf63552b9eba95f3337d23d4d850df16b6c8023b0e0ff3ee51a8eed0","openssl/crypto/bn/bn_blind.c":"f7ca8bb9482532cc2bae51c6c6a98cb7a9285c73bdbde80b6e6f5b3db57ddd7c","openssl/crypto/bn/bn_const.c":"2976d9b82e2f804a139dfc23b93c24174835f2c0b5205a9714c15e6f9dab06da","openssl/crypto/bn/bn_ctx.c":"53e5d709712fdce65572c27121a770655d55741d86fbd762eee86d2f81c2e4f2","openssl/crypto/bn/bn_depr.c":"a1c0cb167ce107a0dc1a65d605371fdf350616592b601420a3ccc92722ccedc6","openssl/crypto/bn/bn_dh.c":"c3d5ef28fc5967c871616c14aee75efcb245cb1bf537ca3d7b4483fe4c6e66e6","openssl/crypto/bn/bn_div.c":"3db538c8048d83806ba91f84d3d119856a0e1e6156119ef5b446d3c0295068cf","openssl/crypto/bn/bn_err.c":"0bfac66fbf810f30e4da7f8781c851e4e40688bef16c1d4e854d39cf1c286821","openssl/crypto/bn/bn_exp.c":"4debe351ac34156006b758f3e3c2746a07407a9423393b787c2347b0b26f4049","openssl/crypto/bn/bn_exp2.c":"165dc76aac9064a1f497d1ce1bd4538900f6a73bdc658b22a72977d22439f111","openssl/crypto/bn/bn_gcd.c":"e8183efd1bd8adb6a50207375ff1f25ee8e2636b8bfa7f04ea1358412cb7d652","openssl/crypto/bn/bn_gf2m.c":"933f0dee1e86e2d2bc128a14e361e95f62a9b044315686e7d9544036724a91f2","openssl/crypto/bn/bn_intern.c":"e9fdb85c35674c4ea10b8a435402f449009a201b1e792ea938c55b43ac14a2e7","openssl/crypto/bn/bn_kron.c":"e53f88fb97342946e40eb40b1bb796f269c00ae7c9c08da6f0ff1dab92ff1d08","openssl/crypto/bn/bn_lib.c":"def99b81926fa50477f38f368e3bed9072e5b6fc471238719a4b5c2c773c0fae","openssl/crypto/bn/bn_local.h":"1d0667f22eed00b4d6cf2f19aaea84b073cdb35cd8a15c8b09650978749b9d86","openssl/crypto/bn/bn_mod.c":"ab67f5a59f39426f7746298d36f1a2dd0218e6bbe5337e5b8f3308969e6fbc43","openssl/crypto/bn/bn_mont.c":"29e10ca123e5782b2c0f86431420fd4a189b0e1492027d0ae30ba2bc2f213676","openssl/crypto/bn/bn_mpi.c":"414317c7cc164eb976cba211be80c47c10c317f6e5510c7488a26b3eeac7439a","openssl/crypto/bn/bn_mul.c":"adb75d2e053af57f50b556e314058fdb1f07de5f73b9330084e9e62a1b47e6d8","openssl/crypto/bn/bn_nist.c":"38cc4b28a758daf1e4685b791b8c12d0297b0847a06ced49b524e37e44952108","openssl/crypto/bn/bn_prime.c":"4a9c72c0e6e04369f81c9fae730c588487882b68c9bfd3b55a9ca416c632860d","openssl/crypto/bn/bn_prime.h":"a45d7634243f8451f7937789fabaacc6b424ffa13694591030328381101ebc67","openssl/crypto/bn/bn_prime.pl":"3c2b7b7050c667f3db49b042844033760c5be6d0a622c3519f573e4fe559fe4d","openssl/crypto/bn/bn_print.c":"27249c4c4f523c7f0ae663ddb1233f6da54a6a439b92a402a9fdd1cc758c5c41","openssl/crypto/bn/bn_rand.c":"8ac00fab08a188260e02b17caf25d48552d29db278f6fd7bfe63d5086d4f4417","openssl/crypto/bn/bn_recp.c":"e1459f1a51e7c29aed0be014069fb143e707e1e94930e5c0d3c53684aaf928a2","openssl/crypto/bn/bn_shift.c":"20f682e6765fa62b1a24535a438fc4f3bfd09a95c84882b794ee325a3ed30800","openssl/crypto/bn/bn_sqr.c":"febfe487629fb06da8541ed72a1bc020130e054aed978509afaf082f4689eb4f","openssl/crypto/bn/bn_sqrt.c":"468b98c671c7b2ec9017fe6c534bc63ac0f3597106c4d659281b74af9cbe66b5","openssl/crypto/bn/bn_srp.c":"2cc2dd53d107360b02a46df479e56dbcef76173284c90787a6034711ad0d20ef","openssl/crypto/bn/bn_word.c":"80a6785f781de09007b0a38c07cb1fe6f95da91a7c5d7719fd393b473272922a","openssl/crypto/bn/bn_x931p.c":"95916c4578c8a924c2a4ab40e221beb5ef39724f8c5acc0eb0cf446a059b36a9","openssl/crypto/bn/build.info":"c8caf83e7eae6fef8838b21f1d49b3036d877a5d60c9c9466d35fffe71679bb9","openssl/crypto/bn/rsaz_exp.c":"f26dbdcdc7a825e42a33e4789553f084b46391dd605508d14f6285e9169287d9","openssl/crypto/bn/rsaz_exp.h":"174f1e4366fdf37c1ea5921d66101c16941bf3bf5232e25c062f33d508798cef","openssl/crypto/buffer/buf_err.c":"077e32ee5b2554f2ef88c2e2e431cd502f4b6564a4562ad6ca7f4ef2d93719d0","openssl/crypto/buffer/buffer.c":"c8e85cfe68a2a0b8c240c7d253bef08370d8c5d6beb8306317d5c13b9d894457","openssl/crypto/buffer/build.info":"a49cd5c09fa81fe79c92a2746795f4ab03664edb564fe967e02ab630051fbb65","openssl/crypto/build.info":"01a8fcab56106ee83cdab9aa3d57c014e2794e7f973bb164c98dbd1f6252fda4","openssl/crypto/c64xpluscpuid.pl":"bc7734ba0a8a8a9b6522f8522cac953fcb55f7ca9291d9470ff42eae28ffe624","openssl/crypto/camellia/asm/cmll-x86.pl":"fff9bc31ea47c39ff3d29d5f500bbee2be5f99ae33c85a42f50261519a1ca58d","openssl/crypto/camellia/asm/cmll-x86_64.pl":"a39992cc95db61459d6ba3b4fc4469b468ec5cc65c8b0e140f8541146eeaea2d","openssl/crypto/camellia/asm/cmllt4-sparcv9.pl":"057db0662cac6d2910c9b0df404aad0149c9bfed7edb2b606c1a65063b800262","openssl/crypto/camellia/build.info":"c329591bf1ddf3b43874ba5f16edc771dfc3609b59692a67ab9be5329ebc2984","openssl/crypto/camellia/camellia.c":"0b89bdc95099441a27eba170d8a18715b0de111ab258c857cd7bc470c44c7065","openssl/crypto/camellia/cmll_cbc.c":"3d8730494a197898020547aac319cf993d984ac12a7caf05769ab4f3d5542127","openssl/crypto/camellia/cmll_cfb.c":"3bcd9e4d94df8fef19f6c878dafe390869070b0a915b903dd7c124fe4ff29eeb","openssl/crypto/camellia/cmll_ctr.c":"b118ed55ff15ba0ba23f8d1509f82c05469538914354a00b29fc4b13d9fdb138","openssl/crypto/camellia/cmll_ecb.c":"6fb0a9e82c7a88efd6e21b8a7ffbc2bb5ca2389d9cd090854b52432666f00dbf","openssl/crypto/camellia/cmll_local.h":"0a9a4626d21afee3bf75df5141d9cb5df16843135dc52588ed6ae5db9db57520","openssl/crypto/camellia/cmll_misc.c":"d612139def8070bbc0eeee703e10620b55b74e92bdb66cb0cadef32640eebd4d","openssl/crypto/camellia/cmll_ofb.c":"95d00adc90c3abc0244c90863643c1c972c7b72e1a89ded3e9be78961d7b5ace","openssl/crypto/cast/asm/cast-586.pl":"db4eeab4c805f9283ad642eeb9bd4f15b2fd274aae04be9e6108df432ea841ec","openssl/crypto/cast/build.info":"d50ce511fda2f776ef1b01ab2904a95105177b8e220d16ec08823ad4003c568e","openssl/crypto/cast/c_cfb64.c":"ef480ba12d67983b33d836b4c23a894825663f934e3cca35a758ac02dc3b7299","openssl/crypto/cast/c_ecb.c":"2a64c4f6ab8dd81fe8fae14aed324740725b736de13d33ef53b8cb75aa816287","openssl/crypto/cast/c_enc.c":"1aad93cdbec46cd6decef3aefe6ed6c0d4ac35458c3277d9feaf72a3554d5237","openssl/crypto/cast/c_ofb64.c":"314c96f3cf57fb5e6c3dc80dc04487e1d9679279b5726adbe7ace25311789136","openssl/crypto/cast/c_skey.c":"03c78ef44da509b4f83d13523ed842eff9415ad9fea3874f99d3c304f7c01f42","openssl/crypto/cast/cast_local.h":"66eed6779089997ded5323031123a0597f9cb1e7dd4e8ea0acaef3f8cf33800e","openssl/crypto/cast/cast_s.h":"3d8771f99d09b7e75ba8ee54015cec6a87e56851a49b7ba733d5e05cd31d8c90","openssl/crypto/chacha/asm/chacha-armv4.pl":"99f5da3bed7a9983c75e2507d70f4ff1a098a6e8f043bf041be91b3629ae422c","openssl/crypto/chacha/asm/chacha-armv8.pl":"b7d01513fecbde9fbc790d2602397de122474163fccddb1ef5cfa122d2015d09","openssl/crypto/chacha/asm/chacha-c64xplus.pl":"7fc7c87c75801b38bbd10e1da71e8d23e63cfdb9b25696155ef4831f4bea6aeb","openssl/crypto/chacha/asm/chacha-ppc.pl":"8201e4b04f17b94f63fd1632e33c443d82651a188356ecce215b05002d29c07a","openssl/crypto/chacha/asm/chacha-s390x.pl":"92145fd451e8b90dc3060b4b6cbb781c29ea76ebadf1af278f54f210b24877cd","openssl/crypto/chacha/asm/chacha-x86.pl":"0c0b923503045c50339fa62ea5f23f2896d36a5afa5d92d328ba122ada4d5245","openssl/crypto/chacha/asm/chacha-x86_64.pl":"c8a5e2d3d23dc7f5e1b5e9e1a72bdcd705fec68d884e98ff3be0d8a7c65505ea","openssl/crypto/chacha/build.info":"9fc715460c418da09ed9b1f3b0c2955d05e1a601ea08c722e03cd3e093d21355","openssl/crypto/chacha/chacha_enc.c":"3537109a7cbf8cbcb891fadf1187fd18bfc4697244d9f454863edf0efc935747","openssl/crypto/cmac/build.info":"4cab4dd7922065b919ea2fab534ea5b2425671a385a9bcc339b034b90b18a1a3","openssl/crypto/cmac/cm_ameth.c":"2485363b94018ee4bcb9c26ae556e0da6bd976c7aa2a74cc6eee25dddcff4839","openssl/crypto/cmac/cm_pmeth.c":"a651591b1d044ce06d3fd3d04685de16da3ffb832edbb23de2c62bfcef1437ae","openssl/crypto/cmac/cmac.c":"23c517f53442658958ccbd35324621074e9e1ff6aefc76f1734b3e8a15276e2b","openssl/crypto/cms/build.info":"b60b5fcd1a7bdd099d8d6ad6dff76d38a2f2f6d69206f606e7b31f2512ed8c78","openssl/crypto/cms/cms_asn1.c":"039c1090f3dca16886efcc692f098c6757df4bfb7ab3a8d5d861e039a1bdb5c8","openssl/crypto/cms/cms_att.c":"e4fef52bc7a42fb4418dcd3af56ad69c2eda39fee3173cf5c81a2bb09b4f1c99","openssl/crypto/cms/cms_cd.c":"9a054626d20f06907e587f28626faaba4a6c246c3e46c46161bf740fd40ae823","openssl/crypto/cms/cms_dd.c":"a20f210ba25d1e39b3d2c3689fc403cf1d26e95b56ba63ddeb953170b1c46a7b","openssl/crypto/cms/cms_enc.c":"cebb206fc3f2770245fee217c728e1a4bc36f48dd727cd43ed71689a01048949","openssl/crypto/cms/cms_env.c":"dd543ce2f88c2aa8182fb6176b243fb74148fb01ef2b664eba8b46a8c207e0aa","openssl/crypto/cms/cms_err.c":"98895b0546291e85cfa5b046dc3637b839f463398ba7f8f1f7a302a290f549c0","openssl/crypto/cms/cms_ess.c":"1c214bf9ed990141a0fe9b2bd6d75c0abe13f7a3972fcc9e8546c6cfb61fd774","openssl/crypto/cms/cms_io.c":"b0f7efc22758684e682ce4d4084c5a9c92f2be85337472b4cb2b0877dc97b9a8","openssl/crypto/cms/cms_kari.c":"5cfa5f47a8c1a68548cc5056c3acf5dbdd6863add51540d31bd9f3febe158305","openssl/crypto/cms/cms_lib.c":"02fb5868d86f55d6fd22925bc1179ee6e30bd33d8c03bb9d17f3c1f32b5e8a2d","openssl/crypto/cms/cms_local.h":"fd4c2c08265477861e764df58596e6f46e4e1c1edf44b83dd756c30a11e4378d","openssl/crypto/cms/cms_pwri.c":"ec89b18f85b2d54e7685eba3e025d5c80bef96a6342647e75a38e7ce2d05421e","openssl/crypto/cms/cms_sd.c":"4b5d481625e094458ea8f305abf4f135929c4e8953f52c8a095ac1c4190ea80a","openssl/crypto/cms/cms_smime.c":"4b39921aa3cc3a75de8ff249bafd5f14fa7fb2f87ee5fbdb5965be16a701de9b","openssl/crypto/comp/build.info":"85bf6e692117dae30cbc494d4eba2d702cd3cae6f89fa09b7ca0fd4456a7ce2f","openssl/crypto/comp/c_zlib.c":"91cd791e519dce9e72bd1c95850bbfb28948314f72c89d186c1cf31018a4118c","openssl/crypto/comp/comp_err.c":"57076955737d79c2a7c3770fd2cc34f23d5eb871d464d2fcdb824a430b241f52","openssl/crypto/comp/comp_lib.c":"400c8ec3deef4c53bf6a04d6a56b3306085adfd7c26b7f30a1c81dbf2ca14c1c","openssl/crypto/comp/comp_local.h":"017673a53ffcd90fc07054e2f2b58bb19cf7dd662972b77a522880be4df748a7","openssl/crypto/conf/build.info":"b43b86c91fce5501f6f7f3be1ae0563ad61a11a6dc923d51b1cbfd38642b69d4","openssl/crypto/conf/conf_api.c":"ddd6ba576e40e1ae38be2da7e9c650a831bd6cd3e457b1103dfaad4e38db3945","openssl/crypto/conf/conf_def.c":"4ac7064e9e5e9e05ed1253e73d666cc4a6aff6b3f3d4241d8a833bd923bfbbbc","openssl/crypto/conf/conf_def.h":"e4fb0bf931370d0fe95005257dfad07be4c3ee0971ffbe21d970ce7990390876","openssl/crypto/conf/conf_err.c":"b7ad98807619b2338608b0b678af3e9ba552968c1a62e4dc7f596fa22c967489","openssl/crypto/conf/conf_lib.c":"03830ff1f426c2017809c8a5ce2fc1f6c0cdd4e3f4ead3724af49619ced93197","openssl/crypto/conf/conf_local.h":"21f6604347cfb6f65ebd57a2baa57a594c90f2c2d553d04110a481e533dc932e","openssl/crypto/conf/conf_mall.c":"8c749bcd6b98aac509a55ba3ae6c85b7a7576d19a48fe351116b84f13a4bc9b7","openssl/crypto/conf/conf_mod.c":"1f9bfefdced4c28189a5a401e60c981bc21f2c2cc630ab16c14104161433544c","openssl/crypto/conf/conf_sap.c":"3a55841a7cb9466b3520fe5ecdc18a0de441517fed3864a0c6ec501c60d2bcbe","openssl/crypto/conf/conf_ssl.c":"9a915457c88510105b1ee96b63ba18a7a395f16e1228f6dc3d300c09a29da965","openssl/crypto/conf/keysets.pl":"3fb8dc12b0c38b0bc10c28e8f63fff7067c15f628d0c4e0aa4eeb332ab80a3ee","openssl/crypto/cpt_err.c":"0582ec85ea86920e9c54f61b8c896766da5178ed76d943927e54f0cc5aeaff37","openssl/crypto/cryptlib.c":"071e82aec2a79c3165cc40af4e40f4f0b9cd7f903d6d342cd0b2bcbf120f0808","openssl/crypto/ct/build.info":"cba8cc48d6e1afd7524a791dd853ab68b711e20242e53d34f7bc69cfddfb58a1","openssl/crypto/ct/ct_b64.c":"3f496457a333d2ee14330174497621a3dc0d7226584f028323ed3f74ab5eb059","openssl/crypto/ct/ct_err.c":"38c768cee2bd24a73056ef3b6b11c9ee2b521b4549472bf2814da6783b3237d1","openssl/crypto/ct/ct_local.h":"b646fbbe542dab91575dcfd70d753f97829cd30b8cc6d20ff43cf6b180a5fda4","openssl/crypto/ct/ct_log.c":"fafaabfaebb95a7830629c278eae9ef41474abf74bf4a192a40ed688ab857d99","openssl/crypto/ct/ct_oct.c":"cc15a402c4910fc8e2fc3e4e2696159164324170d7aa314b705084ae3e5fe1f5","openssl/crypto/ct/ct_policy.c":"761b4246d70c58cd5ef169b7e6495fb4ae98095de55db952865321b53026a9da","openssl/crypto/ct/ct_prn.c":"c61e1e516cc7f2c6e56d744dc9d2eb34e265a3033dcdd5594bddd389d92cb849","openssl/crypto/ct/ct_sct.c":"2053d098f8067761f883dc37b5e9f32a88f8efd8e838c7bfd30dfbeb8b2c213f","openssl/crypto/ct/ct_sct_ctx.c":"384be165ab6ab299ea1fb20a8f71549b52c11a62f48354557d9df795dad0a615","openssl/crypto/ct/ct_vfy.c":"dd9fd14491f0be632c2c9a4e3f64f2c9e7212077318585cdeb0be083c9b9d16c","openssl/crypto/ct/ct_x509v3.c":"f6fd221ccdb7233b57d7e2e2200f70f74415bc1a50d71f3f3db54573323ef5c3","openssl/crypto/ctype.c":"6ee2e82b4b35a0ff31e652a41a215e22183f27227629c3dd9ef29dee5ef72235","openssl/crypto/cversion.c":"e025275b671266d567e01588bc06f5953f9801ccab837f747444a7fd4deb2d21","openssl/crypto/des/asm/crypt586.pl":"ea344cbacc0c1782c86a5cd8e59850b15ec7b992af758944177b5a8d06f731f0","openssl/crypto/des/asm/des-586.pl":"7087fa7f11206b134cd19b706c6dea47244cc4dfa02eacb34f5be64f1596c59c","openssl/crypto/des/asm/des_enc.m4":"fc01ac73663cf6a379f2f5b9bfb4656180904d3dbeb1a1332981c65536b57537","openssl/crypto/des/asm/desboth.pl":"9ee2f65db79acb719d97d7a9a023b5966e043de565c296d91fcf9fa22c8d66c3","openssl/crypto/des/asm/dest4-sparcv9.pl":"af3aeb58563b500da64826b8b242879be45a25492b35416a64dd8f2d261b54ed","openssl/crypto/des/build.info":"e9313f6656218289223c13eded0ee42c0ef2a907ba1cad0d921895d5897f6033","openssl/crypto/des/cbc_cksm.c":"5d206f71869bd8f991aa0cc6e59dfdfb0d32332a3ddcc5fbc1e53dd434182dbe","openssl/crypto/des/cbc_enc.c":"516db95c905c16f248b0a77110f5112bc4b11c1bf7c22ec00015afeba4a59775","openssl/crypto/des/cfb64ede.c":"9eaf1da7ec5ee3d418962153b20609ac35ce2a7791d0e89f67af6743ec3ec1bd","openssl/crypto/des/cfb64enc.c":"01adae8089de85462097168450a1e8da6b883f40ffdf16f71328b4f27c295d8b","openssl/crypto/des/cfb_enc.c":"77d937e722323246ffbbfb90236cc4db0eb97f0e3094703136b13e3f5ac96cd3","openssl/crypto/des/des_enc.c":"e6ca2ab1d3ecea8d7bb237249c4b2e3c4b3341fb7117c103b923425547d18ce5","openssl/crypto/des/des_local.h":"65a67352a112d223c1a5e86014f9bb35f2801a7facdec761e84ed0fd84453f0f","openssl/crypto/des/ecb3_enc.c":"9c0390b6d31ba0210770c99825d134ea383b0ff6786a17901cc9e8d29a1be271","openssl/crypto/des/ecb_enc.c":"ed826a2ea841d55e73ef7b4c18ce0e3f3a7fc2ce1f66114ef304116ceb797f8d","openssl/crypto/des/fcrypt.c":"8722ce9353d34a091718240262350f71da8d219a6e5735f7452cf6cd6a513e12","openssl/crypto/des/fcrypt_b.c":"17687bbece11cf0d69d20c8e2a161e3e8cb8c6cc954e98e4be89b2fec1229433","openssl/crypto/des/ncbc_enc.c":"7c699d1d1382865f134a66ae6102a1579311d923a867a9689f1938cf6cec16c3","openssl/crypto/des/ofb64ede.c":"a80c89c3c3aca3061d374a5719e7fbf34de6aabada2a33dd3ca227f71154b46f","openssl/crypto/des/ofb64enc.c":"f6778fc3903629332792169d1eda2a66983102927d4ed3960f897ac3e4340dd9","openssl/crypto/des/ofb_enc.c":"1dab1cd28dadd9d50c929bb733050114da777eb16a0881bf73a346e741aa4cbf","openssl/crypto/des/pcbc_enc.c":"30566f7d37c7370ff3877c3ed546012158447f26f3f252bca81464c97584d613","openssl/crypto/des/qud_cksm.c":"866fa600186d5ec9a9453a1913415b8ce6f3f10aca9dda468ac598a43f45ecf4","openssl/crypto/des/rand_key.c":"087fcbb52d8c335222758edb7068b9d4126b1480882539824795a06d9b61ac81","openssl/crypto/des/set_key.c":"72121d5af75f56b90476e3b0801df350e245e106bf2f4d3b807d7197b7db26af","openssl/crypto/des/spr.h":"716d8fa9cfba26ba57bbbfe471b2179b0788907c0f6ce831ca25c1f88692968c","openssl/crypto/des/str2key.c":"b981915490f07bd96a1ee7bc47176cd0b502021245b0d9a3ce5624f53f87a8b3","openssl/crypto/des/xcbc_enc.c":"b827a25f0e027ccb260fc580ca679fa517cd3f31984f1d23aeb537d35cbb6a8d","openssl/crypto/dh/build.info":"e2bcc399874d63bd088982f115a561fffb4e0dbb441bb7b594d5599e9c65a718","openssl/crypto/dh/dh1024.pem":"e8e1acddd3b19d70ba25308970888a2ea046f951b9e055eb4ed039ad873b56c0","openssl/crypto/dh/dh192.pem":"58077024ed24a21542f46e2fa71872b920925d7878e70ee260f7e12c3acd6c49","openssl/crypto/dh/dh2048.pem":"8ef0bceef3550a6a252553e157a8f72286a26688d429fcf8659b0fd62e64049d","openssl/crypto/dh/dh4096.pem":"b5efe13f7908d0c8dd358b97e9fc449aab144bb9f5db480dd6a59787733e6475","openssl/crypto/dh/dh512.pem":"16f824bb92c255eb62cfb1146014049be68b8ea46273ad7c3afb585c47555689","openssl/crypto/dh/dh_ameth.c":"60617d9a7a21651a935e470098cc19d07f6c63982c2264fe1fa0a4901417cfb7","openssl/crypto/dh/dh_asn1.c":"98f73ca5addf73a7cc65f719a9957995efe2d776f7b9fbf93b6ef089095993b4","openssl/crypto/dh/dh_check.c":"24a505a328422c0c6f1186fdb69d927e6cfc0923f5dcfcfee8e75501f4796485","openssl/crypto/dh/dh_depr.c":"3acb7d89701c08aec293c9a8f72c8564d2ed438008a156dd65f2110007d6941c","openssl/crypto/dh/dh_err.c":"78358e127d64f41a453dda8b14c29a86c127b9eae3b6673b81c8d1f1f0f1c37d","openssl/crypto/dh/dh_gen.c":"217882ada635b4cb3826bec6d5038e57d319d6461b15f3db2b898cb063a86686","openssl/crypto/dh/dh_kdf.c":"363b9b80e8002df14e9944a07ef2cafc7a1657e937c73ab0fee1729e15b82700","openssl/crypto/dh/dh_key.c":"e501c340ed13fb727e8417e89fb2d1fa0033f6ce8c5867cce53b1fc9a05f63f1","openssl/crypto/dh/dh_lib.c":"b0b2596db218d7d4799bb645e91e96d8deebe9c29fb91be3557ec4daf09af2c4","openssl/crypto/dh/dh_local.h":"7d416db8510cb01d015816fd3cfe48e8c31f7130d9339084a32969f2cfa05b23","openssl/crypto/dh/dh_meth.c":"d06db6b0c7076e8783311606b5736799f271bfe96e82a34282f38fae7527e598","openssl/crypto/dh/dh_pmeth.c":"8e253377cf60e4c6951414d7032a476bd8f5b39b8dd73e6be7aa5f31dc70de93","openssl/crypto/dh/dh_prn.c":"52d6c69a3079ff431c1f0c4fba4561b3b35e3c8e3b864e837b36fe04b229376e","openssl/crypto/dh/dh_rfc5114.c":"ec521e03c0d46750d6ab81bc3f9ea563010cdd4105654292add4963c43f34ba7","openssl/crypto/dh/dh_rfc7919.c":"bb50a469470ac7e0e0464919f2b1a4525fdca2024082ea71906e08412083e6b8","openssl/crypto/dllmain.c":"8fac31d2a5be44be12783f486a0c947b34f537706e9679041025e3cbc4f1e86a","openssl/crypto/dsa/build.info":"085045ec79ec9a5862b89a021c7489ddcdcfbcd11282a5427c261f607799b003","openssl/crypto/dsa/dsa_ameth.c":"2d2d71bd13c7f03f9471e7e097a1121e620acfe9602102ec98b63bc02bbe4c9f","openssl/crypto/dsa/dsa_asn1.c":"7fc0c381019990d20c3f17d30189bd25b0bbce4dc6076ff82bec14aa242fcd1a","openssl/crypto/dsa/dsa_depr.c":"e8842ccab520759650fdf8f11fd9671eadd76a84a3dd99cbcea144d7a62d477d","openssl/crypto/dsa/dsa_err.c":"cf4d169cf5d725929d4642e2b9e0d364ade8a9bd6f3ed7588face74a761f83a6","openssl/crypto/dsa/dsa_gen.c":"da779bca293f86ba7fff0eba0ab1123dc1da92076cc5b17d74ca2457afb29a33","openssl/crypto/dsa/dsa_key.c":"994f194ebf96a3f508fddda63c202fb62a865011342ef7ca67fcc0e61b307751","openssl/crypto/dsa/dsa_lib.c":"7b4046813db5765108923a203582dcec87edcf4eda828c73faebd93d5e6d4fb7","openssl/crypto/dsa/dsa_local.h":"e5bab35bd60b618d6701f39fd2cae327ce1022216de6e7e7bbb3db33a56a04b7","openssl/crypto/dsa/dsa_meth.c":"3bfb2d0a05d9b1996464f36335f0ca18e8ddfc7e5fb0c823f35b0d9f634edf73","openssl/crypto/dsa/dsa_ossl.c":"401fc60603f2c2f4ea07df3ee9947f053d59579ba6a5c29af0e6ff46c476e4ac","openssl/crypto/dsa/dsa_pmeth.c":"75d81c26461dee4880598d315e4a3e5d8f14669374e0a4cff76ac1b29e21da3c","openssl/crypto/dsa/dsa_prn.c":"d8adcd6555d3dcc6b5afeb71d19e7c888b85f25aafd7a3a3de99a2e5876bac1a","openssl/crypto/dsa/dsa_sign.c":"6ea0f5fa257c78daa400a3241875a50fca357722a982d634fcfacfccbeb7a850","openssl/crypto/dsa/dsa_vrf.c":"8bac622f0dcc0cf8ef4169cc0bbaac675f0fe0a44d13a8ddddfb23279674cc0f","openssl/crypto/dso/build.info":"f3ac516f673b6627cdd424b8a0187dc1204454b9c8ad7f3921e54fcf4c2b7d63","openssl/crypto/dso/dso_dl.c":"b0c47090ceccfc5eaee122bc081b2eecc57525ac2f9e16ff7ea5615b9834e67e","openssl/crypto/dso/dso_dlfcn.c":"1096fb62171b74e3c5e479bb013874286d23a52c8b55af8da6097849ff837809","openssl/crypto/dso/dso_err.c":"65da64f7372a8c3c941ac500388ed6b236c1c0587df47331efe0ee83a7094b0a","openssl/crypto/dso/dso_lib.c":"a4ce4fe5108efc8bea3548fa0e4cc377bbf5dc41b473d454abcedd195fc12b7b","openssl/crypto/dso/dso_local.h":"c8fb9be8ee8505ceb47d18959c53018949e68882a983bc6b155500824adead2a","openssl/crypto/dso/dso_openssl.c":"128e45bc40d044ecc31999d5ddc8a3bff7458984b394750e2512d6e63f288f56","openssl/crypto/dso/dso_vms.c":"b6b23417f7ebc775fd6cd6213e48430fea7aae71581b1b4b9f66134710c27549","openssl/crypto/dso/dso_win32.c":"c0a959463d6b39eb3de5be8e36aee2bb94eb0a02b17d16ad513851c0d97e2b77","openssl/crypto/ebcdic.c":"08ca75b55c1a19689de35f6826eb45d60096f9f61bfb177f4d47c6e7b164bd5b","openssl/crypto/ec/asm/ecp_nistz256-armv4.pl":"40ba05324054d59b0ff73206960b52fd98af1aefb527fc0653d88f66aa1f8075","openssl/crypto/ec/asm/ecp_nistz256-armv8.pl":"5d56ec0425c7e072fd47af26bc6a42c5b96831e7a5386233cbe9211d0c8384d7","openssl/crypto/ec/asm/ecp_nistz256-ppc64.pl":"bab3bd37522b68ebf4306d4a8611a9b9984c18af2502f133b1a45671c788bdf8","openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl":"0d5960e38388ebfb979259345a96d3e5c5a1eb01a1d307d04e46a01776c33c64","openssl/crypto/ec/asm/ecp_nistz256-x86.pl":"166cf499864dfb17509b744af27bd04f6c62553ca57a907f65247aebc7bd2033","openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl":"3826ef600d5dea5ab791ea812a1499a768bd9d57f6fc194f752fe89942007ef3","openssl/crypto/ec/asm/x25519-ppc64.pl":"48a8881f53d115b750338ff3f5ea2b00b3c8cb12bfe3497ffe7efc14e7663c04","openssl/crypto/ec/asm/x25519-x86_64.pl":"b058c37ca6fd2e9ba6cd03dfa4925e43cfef8243388d3b906cc9eacbf515d42d","openssl/crypto/ec/build.info":"fdabcfbb5d33c483abc06efd155649d50d46a23ad330e9db93e53fa8fab7c95e","openssl/crypto/ec/curve25519.c":"804cccc55744600342c506be8ebfb89297f233994b42c1a6df43254da9be90e0","openssl/crypto/ec/curve448/arch_32/arch_intrinsics.h":"b6d5ddcba24f8724091b0f4e8ffb4eba3501050d7b56514040e9e35cd4d2dc28","openssl/crypto/ec/curve448/arch_32/f_impl.c":"8f2711a771d2de4e28e1af000972a97632b84dbbeca98200bff75bd4de9c68ce","openssl/crypto/ec/curve448/arch_32/f_impl.h":"8c4146a1896235ac63ea2c02ff368b485811efadc530e4e55a7772a5be3df0f5","openssl/crypto/ec/curve448/curve448.c":"08f0f4acc5ec817c83ba9fb033b27196b20636cdf1c25a441990611c84b2fe95","openssl/crypto/ec/curve448/curve448_local.h":"45859eb89631a801785f23fd084372df5c6a9886f63b7a8c327a5a1da2c32835","openssl/crypto/ec/curve448/curve448_tables.c":"6a244fdb0e907bab2415ca902277c53e347ed4446d89a8cd96cb1f6d422851aa","openssl/crypto/ec/curve448/curve448utils.h":"14590b6c857ca26f8f4d902aa959d22f939b5c8c233d4dd1dafef44f8345480d","openssl/crypto/ec/curve448/ed448.h":"162ffa623f582675f30cd07397e8127acb65ad50dab864f0690ad01169070e01","openssl/crypto/ec/curve448/eddsa.c":"5fbd57402b93953751db5b0d877183c455acd4e5a799bad1b4c04eca476c25f4","openssl/crypto/ec/curve448/f_generic.c":"07e9c3ffec06daa1493b77afa3d929627f8e104b6a7068a5ce8c82cf2abe0530","openssl/crypto/ec/curve448/field.h":"44b6bccdcb3700587cd6879b5d0301a721876cfee54302838cbac9586d6debb9","openssl/crypto/ec/curve448/point_448.h":"7934398d93fa3c4e1586e88ce30e9ab9e7fa6cd5bee469c7e266d6c008276e52","openssl/crypto/ec/curve448/scalar.c":"d6b59d4271c2b689a137c5329779f48437d89c0dd420331b0dcd19c07e8d1bbc","openssl/crypto/ec/curve448/word.h":"e6c2a871e623d231d86330622a30172e39189b9d0d6de01ef3349373592fad1d","openssl/crypto/ec/ec2_oct.c":"ae504857ce2f4654378859132a46d7b3c8acc7912e10d3cec534665df3a02f34","openssl/crypto/ec/ec2_smpl.c":"3a1d9eb3215d1aae80f5a97b9a70cbea244a17aa32ff31547a3750c27f91c6f7","openssl/crypto/ec/ec_ameth.c":"f037546edeef994b2161c337cda66ed526b6fb2dbd7680350d3c88feb08f8a56","openssl/crypto/ec/ec_asn1.c":"0c33b2ff7ca91d2fe27b2f869ec0531cdbd031ee5a8e2135033b233a36c49005","openssl/crypto/ec/ec_check.c":"968eacf0ec42ab6ea40d9b4e7bfe92d8839e7650fc6c4cafdb5526e24db93bda","openssl/crypto/ec/ec_curve.c":"bfd2f60e3d56f9a267a98c64247eda39c30b2bc0936aefd89cde893ac0aa0230","openssl/crypto/ec/ec_cvt.c":"21751232ee7f55c78b27297d1748d1694bd0444503ecd1e4da5ef28e0ec2c06c","openssl/crypto/ec/ec_err.c":"822f407e3bb07bbd155532cb2d318445f75a4c23dc51d839cc572f063b8c3b31","openssl/crypto/ec/ec_key.c":"176544a638d7f8609023a3fa7dcf18a269f26a23eedb7fdf5d50c99006131eab","openssl/crypto/ec/ec_kmeth.c":"c8873b9c502b2ec7ca701b75f179a03b17e1d0f232ceaf93a7e8b2a9dc09ed51","openssl/crypto/ec/ec_lib.c":"3b90b027406fa37e449a29ef5fda8d618050264b20ac72cb443afe3cb41a8ca5","openssl/crypto/ec/ec_local.h":"2bd3d1770f28940ae353c7967d67a868717c131360611fd29e1c8ab4759c8d15","openssl/crypto/ec/ec_mult.c":"e5af943eb7b22d20c2924040cc82780a5db6f28adb034b932b68fe63ccb050fe","openssl/crypto/ec/ec_oct.c":"e6bc6cc8381d7b6f2e3db9c4e80f8c7f7a256e4955bd639e256a6fba4ec8e235","openssl/crypto/ec/ec_pmeth.c":"fa5ade19d352740ec048bcf20789ff225f2f7752dcb1b166005c24a47983425a","openssl/crypto/ec/ec_print.c":"35731d346565725e5fe6663d76c4b7552ada501c8ac154ca0364674e5ab4b249","openssl/crypto/ec/ecdh_kdf.c":"9483709aac20fd03d9a602f933b9623c4e01343a8a9ebca269cf765f28ca839a","openssl/crypto/ec/ecdh_ossl.c":"6771ed31fcc563d61455896d49592f73de249a4a02ab919f2e2dc61c6e32a069","openssl/crypto/ec/ecdsa_ossl.c":"e9d540bf9e98f823ff8b94d077fd42683bd52471a1b2f0e27af839b22e7b2bac","openssl/crypto/ec/ecdsa_sign.c":"ef0aba33c4d785892e8b04bc215818dd79346f12198b86e926306bbb82906540","openssl/crypto/ec/ecdsa_vrf.c":"9144435f6f8da7b6787302332fd512817f1351e648d6aad8b97f66dab750410c","openssl/crypto/ec/eck_prn.c":"2a61e56b81eca251023e6def47349289a25a71028d3cac71392720514bbaff37","openssl/crypto/ec/ecp_mont.c":"413f82245a3ef45776c928c96b539cd02a40c7f11610f5ae8657aa9e1268125a","openssl/crypto/ec/ecp_nist.c":"695fdbe3f4c21d3c9860e7433ad506c39473e702fa69ed1a9d6814de5a1652b0","openssl/crypto/ec/ecp_nistp224.c":"133ba08c45fbdcb9cc7003e6965a43a40c3b8edde14d8014ffb17b3e3dd1588b","openssl/crypto/ec/ecp_nistp256.c":"8d63ee38a1a20c6f0704a724a1638aea565c74e58e13ee9ec5965736ce90b60f","openssl/crypto/ec/ecp_nistp521.c":"47c3e20705cd7c9deecf527f90374270a30a49e33573d4d7e99463405f0c7f5b","openssl/crypto/ec/ecp_nistputil.c":"d9aec2730f8921bfe6f4bd8ad09859a89e717d79c5a5c116143f403a57dd8fd2","openssl/crypto/ec/ecp_nistz256.c":"dca45bcde9c7d2e2c27b9f096c5953beb1ace46b9e36b8786e934e9b3a6d6077","openssl/crypto/ec/ecp_nistz256_table.c":"d811f3e5e3d6a188fd33da7366daef81d8e69d083963033a6b8468d42fe99855","openssl/crypto/ec/ecp_oct.c":"5b572e7ebf6eb4888042fb3e7a0cc84e3bab4ba954fa79a4fb3de6d7c8a3562d","openssl/crypto/ec/ecp_smpl.c":"3ccb53c7c5836497174a69dd6d47edb061c1986ccd52bdc70a036c3f76b87064","openssl/crypto/ec/ecx_meth.c":"a3ae62fb9c7c9243e610a1b258c31810999bfcf734abd3d0b618dd4a5673363c","openssl/crypto/engine/README":"75f83cd826e3d844a982830cfe3dd40a9745680f598823dc6c20483433e7496c","openssl/crypto/engine/build.info":"bc69605adbffb3f6e78073735a304007ac70c302c1cdadda0598475077a0b06f","openssl/crypto/engine/eng_all.c":"938319cf3c8d29dc239182c751e9e674a2254371ef62f9a2a961fb998af948ed","openssl/crypto/engine/eng_cnf.c":"c5776261e20cd6e2b01c9faa98ac27920748652ff8870b50e93c9dc43e33eb40","openssl/crypto/engine/eng_ctrl.c":"cc4295f6d8aae029a526f909a949c99d1798e766e662f1af36788b587aefd02e","openssl/crypto/engine/eng_devcrypto.c":"e289b45d3db9b7adb22037de30dcf19d67da44d9743d286d99937feb48b32c50","openssl/crypto/engine/eng_dyn.c":"b7abab5ff9935248d5003dc42f1bcb9b40fae1d6d2ee3ea2e87b6d98d0803bed","openssl/crypto/engine/eng_err.c":"f7528c6b2e12cba00592e138292428653b6d67f82d119ed274210459fae8e96c","openssl/crypto/engine/eng_fat.c":"dade309980fd6ff737918439cd5f4cbbe2ceb6bd685f57162836e874bdcb09f5","openssl/crypto/engine/eng_init.c":"ce7c7a5abbbb4ce3755d88b49e3ae9051c9364988bcdce82e9714e7b1f50eb6b","openssl/crypto/engine/eng_lib.c":"caaac0493f13ea89ab75135cdafccd7e11b4b85363b60a83438230aaef1c4d9b","openssl/crypto/engine/eng_list.c":"e9cb779a0ea154c8a2ac281f1036aaed2a72c8a247ca7d7b8eea8e31472f9919","openssl/crypto/engine/eng_local.h":"50898497a06f23ce8da2fbe6d4d351e6604831d662e17028b2dc90d4a4934d83","openssl/crypto/engine/eng_openssl.c":"f0b6d2784744f4de19b58415a32f0311016826bf2b942de683275d099adad5bc","openssl/crypto/engine/eng_pkey.c":"5980b2e7d788172ca7363a9e599efc60978e0e01e27f2eb5a20ff72177908a4c","openssl/crypto/engine/eng_rdrand.c":"00c500e3ab162d6ebebd05a35969e8cf87e666056493c27005e1056ac08a9681","openssl/crypto/engine/eng_table.c":"0119fd35633708e5b3d3eb84affe6567e859bcb25b2ee803ee296d9ca7e377f7","openssl/crypto/engine/tb_asnmth.c":"697b41214c83500a5d6a24db15349047d861af1fb9698cbf4a1ea583b7e4c34f","openssl/crypto/engine/tb_cipher.c":"a0a78c49864bfa6a12e51aec865ada99c8f2b6d6173f95c131091f14f5596434","openssl/crypto/engine/tb_dh.c":"44df00bbfe79beb277bdaf5ab6b5b67e7a42c7aeb41d78282cb066b2845ec1c3","openssl/crypto/engine/tb_digest.c":"7f91c40451ec2af39e1589c99798c03227267b52ac2137656fe764a030030138","openssl/crypto/engine/tb_dsa.c":"11d608eb60f707236c12b2342d6e46e78a35546f5080d24fc2bec5fc93d5da8d","openssl/crypto/engine/tb_eckey.c":"d01e2e757b633478d735813aa7f11d7ea840b57993919c9ade502e0bd3623177","openssl/crypto/engine/tb_pkmeth.c":"cdb64c39295890bc8f513910cc4e99366c77551e3d58f1b15f33eac953025a14","openssl/crypto/engine/tb_rand.c":"8a3db3bdee6b44a706e58a27b9f2b77000a3397251fcd3c0b3069e50d1e92061","openssl/crypto/engine/tb_rsa.c":"cc36a9a7deb850d6a68ae963accb17cd27fa22aa842c3e72ab02ffa2444cae49","openssl/crypto/err/README":"c5ed5efd4e5ace164c73404aa86a8dc1c86da1838f78ebd69488fbe29ee907e5","openssl/crypto/err/build.info":"d6041997113bd776a1d2a0e997b2c222f289e4c3f3b7709b3034b8389721395f","openssl/crypto/err/err.c":"ea433e3302c4cb0623f4159a98fe0a16b36628c8d0c8d61d8a2657ec5b3450ac","openssl/crypto/err/err_all.c":"dc089a12d9e7a982c53f8a823f920dc02d8a20ee70591f00e2994df3f440b0fc","openssl/crypto/err/err_prn.c":"78864cf84d5e6a3e88fa8095a8ef2b8d17ef5254d85c405e86964ec68445881e","openssl/crypto/err/openssl.ec":"2b72f95498562d1cba12ede9d176cb78f7cc952471e09121c05a14677b89d3f6","openssl/crypto/err/openssl.txt":"c9e794ff69e2eb01e9cd16cabc931361fad89e66ce1d0597b42ff56576611ccb","openssl/crypto/evp/bio_b64.c":"52cffad34f8a36d8783399304aeeac3a31ad76738ffad067cd148d82e311980c","openssl/crypto/evp/bio_enc.c":"5789bae803d56f7242285af82ee7397bfe9bc41c99dbe56f3391554295a6ffa2","openssl/crypto/evp/bio_md.c":"bb69f5c9e0115d6f6193e415966078b74bf13030ecbc9bb496bb10a51492397f","openssl/crypto/evp/bio_ok.c":"5738ef882340cb88dc8e6b3690c098bc84666c1bdc46f92581157151aeb1982f","openssl/crypto/evp/build.info":"31b20792b825dc95e34adce28499a555871514b73767f57af30911d6ec42be46","openssl/crypto/evp/c_allc.c":"9b0317fad52f722d505c9e7124fb802b7e9b9ba4e592f6c53c181bd72cdf4ea1","openssl/crypto/evp/c_alld.c":"7b91fae290bd3e84b44cf8d273dd47cb52dc7a190278c0a7770253a5b92f67c4","openssl/crypto/evp/cmeth_lib.c":"454c5c511e1b11ec9bccd9eb81b13bf7fe3b9b49aab1d4e2af9431fdf4685384","openssl/crypto/evp/digest.c":"6d55866c1c1217a8536cd06ccab4d6f44ca5c04bbfc5568768307cbc9c44a20a","openssl/crypto/evp/e_aes.c":"4f2e4b2560e8e0e32274cbe5ad340854d685ae470c335fee6768ce15007ad16e","openssl/crypto/evp/e_aes_cbc_hmac_sha1.c":"ab83f218805953b0c69b333bd715408fa33355aea73d19f5cfd65c4e5803ae9d","openssl/crypto/evp/e_aes_cbc_hmac_sha256.c":"dc7d54bc7aebda2e046eb232a0697ac2199d38c401336dc6ff8bbcab203013f4","openssl/crypto/evp/e_aria.c":"3e84d9441695d57ebc53359bd859409825b8ff4129f556854d30850cbb0b7db5","openssl/crypto/evp/e_bf.c":"a7f1835f01ce60ae0930e96d5794ef9627645a8133d40f8156035b1ca7f9f912","openssl/crypto/evp/e_camellia.c":"6d6ea2e2ecc8925f05c82cd400a6798e338665b4ebc14328706559683267283f","openssl/crypto/evp/e_cast.c":"777149f3560cbafa09db82529c62e229821fcd9b8d0cd52ccce1911059ddc002","openssl/crypto/evp/e_chacha20_poly1305.c":"e3b0340460cff799fa31dde2fd243efbe491243cd3fd45785aa754a9e58aaaed","openssl/crypto/evp/e_des.c":"ed58fe7034f20460ae033009948cbff82f4c29cf759c7a5c20ef16fb939a8fb2","openssl/crypto/evp/e_des3.c":"9870e2d940343976bef9f0dfb9ed472e6f9b13c7a088ac0f642e81a13fb9b023","openssl/crypto/evp/e_idea.c":"9367d350ee726882edef664b36be5ffb087bcd5784c188e3c1eab80b0f9b61ea","openssl/crypto/evp/e_null.c":"d4fd2e9d7ffbd334d0698f33688001c6d83d416179dfaecf0da158a51cfb1dfb","openssl/crypto/evp/e_old.c":"c5d4176d9f86eb7030fb37044abda9e15484ebd40917f5203fdbd27820642b83","openssl/crypto/evp/e_rc2.c":"271a9892ec2c9fb5d5ac19549bba713f9d1cc7533a6c4729b8855b2086756c75","openssl/crypto/evp/e_rc4.c":"7b651e12cf17d62c54c5e77f14e2dc4a330e09f0ca16bb15a7b88661f97f754b","openssl/crypto/evp/e_rc4_hmac_md5.c":"f31b8b2f34dd55c4888e7f3f832159e0f0f121334f89123177465d5766274eb5","openssl/crypto/evp/e_rc5.c":"cdbb95bd98f94046b2948b5afccb39af8ecca3f8678e75ae323785f6a6ddc158","openssl/crypto/evp/e_seed.c":"90a6cf552de0fed01659500527a20836c9459f5cabc37996a1b350493ea7a4e7","openssl/crypto/evp/e_sm4.c":"90040528209db9a1f93ead632b1dfee44393754c31cd4f8c02afdf36f1257a85","openssl/crypto/evp/e_xcbc_d.c":"9e50d87e3a83f9a12cc7529f2e9d92616b1f3592ea52c9621b26fa3051c49c22","openssl/crypto/evp/encode.c":"00bb9baa416979e8d4fdc3a8d035f974747d6fb707a874a0a5f5504a4ad27dfb","openssl/crypto/evp/evp_cnf.c":"010e9619d2fdc706cbe9d6fd7af598455de26f3d98d8e4dc0ae6a8b9672f6c03","openssl/crypto/evp/evp_enc.c":"d1986fa5654bb790abb5b015cec32ab8e753e42c1ca44203fe87b93c8c9ad76a","openssl/crypto/evp/evp_err.c":"e36541ed7a23785bbec716f97890763c4ccf5a9fcd047e6223995dac2e207711","openssl/crypto/evp/evp_key.c":"e6607a748ad0f59bcb41fb65341f3092ef6f776596c4e757e3467c4d6eb23835","openssl/crypto/evp/evp_lib.c":"04e61c90c042d423532d0991f68894394dd7ace7348b1f8de97eaad684d5d540","openssl/crypto/evp/evp_local.h":"a5cff76bd1fdc5300f11d8e114784e38ea371e5b44aec043edf08132a48a96c0","openssl/crypto/evp/evp_pbe.c":"d35b96f74c9a4abfbaed7b4331047ce2b74374d2ee1f253fe8f7ad1aa859a178","openssl/crypto/evp/evp_pkey.c":"47223df9ca9ae75ae9288f66bb2f705dcc20673295595e5aa1b98256c69b717f","openssl/crypto/evp/m_md2.c":"cc3d0201ae7928dfb8488e06c9238cd75cd6d1c8afdc3748d66d097bcee82e20","openssl/crypto/evp/m_md4.c":"dbb59fd4839783fc0f27bcdb7072bf9603ecbd111f60e86e117561af46e8b04b","openssl/crypto/evp/m_md5.c":"bf7492079876e0a628b82f8b6bdc71563f4d4501ec169c071eec2d0074d6d642","openssl/crypto/evp/m_md5_sha1.c":"9ea3a96f8fae43da1fd0c4a821b68495a52b253c93ac529c9e60f19659483b3a","openssl/crypto/evp/m_mdc2.c":"347d2e4e7466904b60a016f99ac167772ec1c548ff13375b89b18842e7c91ce3","openssl/crypto/evp/m_null.c":"93396bdcb42c7ca0a32a4708c3a17d6d659c123dc70def32d572468f5eae6f12","openssl/crypto/evp/m_ripemd.c":"169cf92c735f5dcf6b4ba901c99e9daad9067770ae188f54dea2cb26f45e7344","openssl/crypto/evp/m_sha1.c":"3d8bd7f232cc5d373ed6f23ec16d0e36711e92eff1ba9db514a11ea536d65b72","openssl/crypto/evp/m_sha3.c":"094ef2a430dddea20b997dd39bb77742e274ddd5f20ce229d1313f490caffe67","openssl/crypto/evp/m_sigver.c":"27ebe435751097a40f6984bd8f2271eeb7cf357a87ac6d4ccc011058245a8b87","openssl/crypto/evp/m_wp.c":"dfca1381ae8eb6c5595c8ae96ac3619cdc1aed0fff6dbc4c3586d946943b659b","openssl/crypto/evp/names.c":"813349cdfbb70dd2d25e8441408f0ca4da42c14fd79806ea0159b1b6666babd7","openssl/crypto/evp/p5_crpt.c":"1adb6d06b8f335a704917885f79a0c0c587c78f481c6666f86d9284d893f86e2","openssl/crypto/evp/p5_crpt2.c":"daa3a33108d10b4233bb52b86a972318467bf6ec43bd8e242a60e2318a921d3e","openssl/crypto/evp/p_dec.c":"67a9a619393b8aa0229734ed9be6127ee28fdfbf0a22897ad71b69c608058d1f","openssl/crypto/evp/p_enc.c":"1c53c74c5db4ffaca90bc2958415298f99a88ce3c4b2f512a4bc631fb14515a6","openssl/crypto/evp/p_lib.c":"c6742fac30e77cb23eaeb91f10e933761c34cd2834a01a2ec3c78c6b849a91da","openssl/crypto/evp/p_open.c":"77b6849c6aaabd4e1eea6cbf4109fe563f94ae953f316ebbd18fdaa8c20c6640","openssl/crypto/evp/p_seal.c":"b00d90129b20cec822bfa52c8f46931d58e45a552dbe15f3f49df112a3c0729a","openssl/crypto/evp/p_sign.c":"d5dcf61a03bf789b27d95d0c7977be687776b478c915a0001ce9f744ad0fbdd2","openssl/crypto/evp/p_verify.c":"9bddcb790cb0c5f6af76c2447de2fd8e02a402e2c18c229782045e0f25dc1b2f","openssl/crypto/evp/pbe_scrypt.c":"c85cfc008e7b092df14f1f1de6086bb828c9086ea1d05c3a821d2d70abe8bab3","openssl/crypto/evp/pmeth_fn.c":"a4b2bbc946bb4d2f66384139a8cbf4e78d96151991544d9bc228a8600da9b325","openssl/crypto/evp/pmeth_gn.c":"3466a34a86030d86e7083d3b387d4db85d95fb2f80c99649724019efb50d85c1","openssl/crypto/evp/pmeth_lib.c":"6447da66b25fc86fec36e7726e169de8c62a3ff7fb9e0a19b6a94c3d042b74e8","openssl/crypto/ex_data.c":"5623bb2a73d34b936fdea2beac22ad046b9369506c9d31397a09d82fd83de9b7","openssl/crypto/getenv.c":"9f0b7d2434aee9963a2614b9e27a214fba6249b513050ab34985e7aa37ee759a","openssl/crypto/hmac/build.info":"bb9af1e0035a0cf7208f4ba6100365554be8ac10f1d5d0eece723d0fac44753b","openssl/crypto/hmac/hm_ameth.c":"854c0b7394384f16195834a9bfe39e8ee579870c545695662e61cd208efa81af","openssl/crypto/hmac/hm_pmeth.c":"8872aadd35ff9f8597a3a4d62e2f086544c2763279bff4eb191c1e06c48f792e","openssl/crypto/hmac/hmac.c":"db86ce730a7cdbe6ef9ee57353ff039b70e71aada2d09cbd42c43eac729a7bed","openssl/crypto/hmac/hmac_local.h":"67a3495876f2b776f84c7bb646105265bbe7c74f67c3f4c7820b9d6d022fcbb8","openssl/crypto/ia64cpuid.S":"f34b5edb66e3b16a8dedb0dff9067d197ec999b33c8870884ab7532015b1307a","openssl/crypto/idea/build.info":"6f12243caa237b8840094e485d046b787d390eea3e8e1df4274d2e29d22c1f65","openssl/crypto/idea/i_cbc.c":"2515d3804eafd96bf0fef5c47d49061606a995d5f6319a85240af3bcff1fe8c2","openssl/crypto/idea/i_cfb64.c":"253523f60a8ebd14a33ad86129dca3d080467c74a2d51e8ba91a7bfe2d7702b0","openssl/crypto/idea/i_ecb.c":"2083cd6bc4f4516734ab7352db2eaeb2066b2e1065881c8a4348e7c4d0da67bc","openssl/crypto/idea/i_ofb64.c":"c38bf911e6e1361615c76c6a462766c3e7cdcccabddec04e18819b6bf3ad9d7a","openssl/crypto/idea/i_skey.c":"2145c01e4c4741016678397aed68dedcdf1fb1b5c1ad1709168e6e5e58a6080f","openssl/crypto/idea/idea_local.h":"440ad054c70c6fee42667331c4536d8372caf2049ef76e58732f366ec9da894e","openssl/crypto/init.c":"849da31ae0e70414fee0073bfaacd02e0790d30545fbc2a5bbcec2065c250ae3","openssl/crypto/kdf/build.info":"eee49c5e0a5099bc7ba1994cced8d073e0438e590400cc303a19c17e3a311202","openssl/crypto/kdf/hkdf.c":"0fe71bcb78f768eb065f09a3d925fe2763c3e28fec4671d726dd0e3cb2c9cf0e","openssl/crypto/kdf/kdf_err.c":"0fedb61ca4b0a3bfdfb0f889ef489080c438046283c7af4573092c3ef0ca84cc","openssl/crypto/kdf/scrypt.c":"99b292f19298191695c2e9b893437f5642106ed1affe5cfdde68f03758c5ec76","openssl/crypto/kdf/tls1_prf.c":"a519d3ff721d4ec59befac8586e24624fa87d9d8f6479327f7af58d652b6e4e5","openssl/crypto/lhash/build.info":"6934ebf844a1756ef7ad6c13a94786fab5b6b4aca73492f90c4e9a342beb787e","openssl/crypto/lhash/lh_stats.c":"3b12d7c2ba46b9739ee6035b6d7d8fdec3d337e2cd87ec0ce1f179c5a370f9bd","openssl/crypto/lhash/lhash.c":"afad3e197e48238de9290aaad10caf40ddda9123b4757f381f843deeedef06bc","openssl/crypto/lhash/lhash_local.h":"c4295080821d4dc647b56b0c4128e8676728eeb88e22b2868a73156105034266","openssl/crypto/md2/build.info":"ff114b6e07a281adee13fb6d0d15f64cb7cc14143af8617164908f3dddb9e88a","openssl/crypto/md2/md2_dgst.c":"d47b4a0a99f9d630589c51c1b628c322aaf1e7fb55446ef0633681fb25d158c1","openssl/crypto/md2/md2_one.c":"1d37c2b974f9a41bce8ddd0a3b8bc3a3eaa11afc3ecb1d937b3d5ec1b0af7355","openssl/crypto/md4/build.info":"947373b325c169c3c8e7f232e254ecc16b2cb87ecd5bce73e758bd81625c7d73","openssl/crypto/md4/md4_dgst.c":"c89d489bded3fc498e48d9516dd9e1089c2a432a35a42bbe66c3159dd8fe6148","openssl/crypto/md4/md4_local.h":"e30870635cb21dc5119422daf19330f864542758e45d3f5c6b88a9c0567d2f89","openssl/crypto/md4/md4_one.c":"872416f5e31d003951e5b62e6f2f7a5166caccc63ba41cceb0b2219f107f1442","openssl/crypto/md5/asm/md5-586.pl":"6c23a2dd3325f7fda3d84d5d31fd2450c722e471a1c19a49e23315656441008a","openssl/crypto/md5/asm/md5-sparcv9.pl":"4194570443a6b459e56848d681dc93a78a504585c4e2bbb95126d07b3bb0f078","openssl/crypto/md5/asm/md5-x86_64.pl":"96a6669432191059e706c30139bf688c5f7acdb44bdbf1aef86d812c72bf49e0","openssl/crypto/md5/build.info":"9c78923fcaf42ed7e04a9e57ab643d3530c001352d833d0dd36c414b7f1b2ed1","openssl/crypto/md5/md5_dgst.c":"29ef7ffc6454efd1f76de31f485fcbad696a5e5ab866617b0ab23d2fade68bc2","openssl/crypto/md5/md5_local.h":"fb5941cb742c7c01dcc1382d47cbe8472d34fdaa24b3bca41cb291940fc5d982","openssl/crypto/md5/md5_one.c":"4e1110d587e7369c18b91bbe7d433b88d01a68454e54568d0d4fb1947879a120","openssl/crypto/mdc2/build.info":"ec3d4b9949842d5ff0b2372f3323f4b129dab1f55a97bfb399518e19381b5747","openssl/crypto/mdc2/mdc2_one.c":"2e7948368f07b0f02c517f59f73a3973e196940f02926c7290419da6252e98ab","openssl/crypto/mdc2/mdc2dgst.c":"11eaf3f8e718fca75d5364d31633e59ede1473e9bdbbfaaf04eef088bc78b2c5","openssl/crypto/mem.c":"85dd1c69a5b878a3cc98de20b6a927ce945823c6ffd2359e0d508e4ef0869255","openssl/crypto/mem_clr.c":"374d9f79d0c51ee855d40e816fbe2cca17030162d8f9866ebfc68e2a1c0f2a1a","openssl/crypto/mem_dbg.c":"20af715997e1336b3a66be3d0370bbdf01290ab551f5cff468588864141e3f43","openssl/crypto/mem_sec.c":"e744716e9930b492410c0402769d0809df38776770da6fa6b49e2088b1a7b4fc","openssl/crypto/mips_arch.h":"0c1160b6bb82104e8267f6d6f5de9e66df6fd3455dc90132b1c2de631512d39b","openssl/crypto/modes/asm/aesni-gcm-x86_64.pl":"e2a5b29a625159dd9a6c23f880eb1736b607e4918c1af8fc83529e046296d16c","openssl/crypto/modes/asm/ghash-alpha.pl":"3c33c85ca98065c1208d3c7e2005e436f7f2deb810bfc91b69736d4940d881a6","openssl/crypto/modes/asm/ghash-armv4.pl":"c54f94bfa356dee899ce78aec9d4381431f19e9862550a443ebbab1b83c23822","openssl/crypto/modes/asm/ghash-c64xplus.pl":"ba3e68b6a74bf2767acea24097d19c58d28f23dd898f06eac4e4fb47f07131c6","openssl/crypto/modes/asm/ghash-ia64.pl":"23d1d1359b8eb97f00f61a68a68ed4a982a7eba1a198b59060127d337237a312","openssl/crypto/modes/asm/ghash-parisc.pl":"7f0997ff284ef46222397a7302e894deac61dd3618058869a4cd285eb26e9228","openssl/crypto/modes/asm/ghash-s390x.pl":"8aff7b4902484e77c76b48be8b7cf6a4cd381be4a96e7c3de87ca49214903160","openssl/crypto/modes/asm/ghash-sparcv9.pl":"d3ac07ae68a3818e04f4c1a4ea3eed9ac2f950e046660e7156010e805dc53e25","openssl/crypto/modes/asm/ghash-x86.pl":"02ce4df864d0137ab32b488e5c3f79c3b92f43603bb5ca8be6cbc3d5f3ac7a5f","openssl/crypto/modes/asm/ghash-x86_64.pl":"260aa24d4546b6646690445ba0b38edba403d7913c09e5399f4ac5eafce7eda6","openssl/crypto/modes/asm/ghashp8-ppc.pl":"e0f1064d81d64f236dd5a729406838d90b08c27e2121096c52c413c670907e2b","openssl/crypto/modes/asm/ghashv8-armx.pl":"cb5854d36d240364c6fec6671c3db141e74687bcc5d88dbf94a1bf5cf7527e79","openssl/crypto/modes/build.info":"c5a0c305c1d3b6ca947c7987302a1d2d38f0f22fae1d3675205826c3d23575c7","openssl/crypto/modes/cbc128.c":"bd696b62a08a8ded4a27600e42b5a40d68003670f58486d8014c6790feba1bd5","openssl/crypto/modes/ccm128.c":"7ea24c0a5373ec9f4732954f4bae27875378c248c1f1cc1bfda3fbc2c1cd27b6","openssl/crypto/modes/cfb128.c":"83e1967f7dfcf6d03ac7f0da52ed01f4eb10e52ee106c6191a4098f9a74d96e7","openssl/crypto/modes/ctr128.c":"bf15a34551c348142d30f18f6d6c4e8e55bba35df3833d6076e5ea25e6740b6d","openssl/crypto/modes/cts128.c":"353952f605011761858ebdc8c0a9f56c449b81df2d1d4045158290f519fb9f8a","openssl/crypto/modes/gcm128.c":"9da7c7cc67b1376f35b58e6d967530a72585608375c359c3f7646b67bb7e4a80","openssl/crypto/modes/modes_local.h":"e9eb6afc0101d645d06a49c76cd91dc922d8b537224f130d339ba0a2761c3fc1","openssl/crypto/modes/ocb128.c":"c4f2df501f93702acc375a5f12630c62e95b81f8a2737483969472d9a377d6b7","openssl/crypto/modes/ofb128.c":"2cfeeb9562763a1b662f06b8c8beebae22b9453e77ac50ff6c379afeb1a189ef","openssl/crypto/modes/wrap128.c":"e1a966397a1ca4dcc16813367ca786409225cf8eac6038df0ad59c3a80e07962","openssl/crypto/modes/xts128.c":"174f626aad1d8bbd18f57b7d689d832401c9e51c1b4f999feffd682bed20ce2d","openssl/crypto/o_dir.c":"c62dd0f9bf71744ba93906522a39ebd1678ef102eac315c8661c36bd46fd3291","openssl/crypto/o_fips.c":"90917fc13bb8faa86f5c442bc650808330e3684a56cc4a54e0834678a70e7c02","openssl/crypto/o_fopen.c":"849a9fe62b26add36b65231c0e9faa1436d0f7f61bb921994f7a05d43fc9b66e","openssl/crypto/o_init.c":"71faba14f840d84ac595b4bb07f2a02b714c5a1ea28a72873b265765268e2625","openssl/crypto/o_str.c":"58f3c1b0c70b860a973145a4e2ed049cacc4ad09b4dffebf0af1c13ee0ed972b","openssl/crypto/o_time.c":"ae3a3eda108ddeec0436ce85ca278b56c8d804a8a972b931be265e998564e739","openssl/crypto/objects/README":"ea1cb7962ba3ec620e533d2ae20de9d31e637ee8335886a8e9867e52ab0f3215","openssl/crypto/objects/build.info":"e8684ea0bdafbc725d38a799848bc2ee106bef9eeb75794790bb55779fa5fdfe","openssl/crypto/objects/o_names.c":"420202adcb08d798c6d10eba88397e7302ca5729f9c037fff69ba7af3047d052","openssl/crypto/objects/obj_dat.c":"8e27de3118ec94c5406bac6d562f5f16502eb11e9590708572e1359f1eae864b","openssl/crypto/objects/obj_dat.h":"81f55dca77093b45e5f9faf4eb669f1f2add6f98a7bd5db44dccc1018c784c1b","openssl/crypto/objects/obj_dat.pl":"863b2ffdd2cc5d5eb328632eaee2225a53c5314460155915b7adb50f72ad4c23","openssl/crypto/objects/obj_err.c":"dd742c38b0b28d04d7b39e163236513b589f6b7780bafb57fd2997abbfe17cfe","openssl/crypto/objects/obj_lib.c":"c1f5721213e0d9466a9d61fc482a2ecee9b87277eead6095e0872c7ae509ba43","openssl/crypto/objects/obj_local.h":"c0a87d694fafba3b8fe96b184a77d9107c55f30e239cf93d8f89cb09bf6d827d","openssl/crypto/objects/obj_mac.num":"95ae10336125c0b5d5d618c24be928d3aa2b97ed7219ebb607b42a8d5720db61","openssl/crypto/objects/obj_xref.c":"4843391d202580b48bd01c603c595dcc4a8bdcb2e40cc67c53680d609ffe9f1c","openssl/crypto/objects/obj_xref.h":"804eaf723120395401dc812a442b6cbf892618bee1cd4c3449ee4f400515844c","openssl/crypto/objects/obj_xref.txt":"a7a6cf5147be047cd235cd63702e611c270ab8cb482e6210801188185ae2886d","openssl/crypto/objects/objects.pl":"6c538d5c2e4e97bbda5fef8ae60004c397f9a536987e8ecde988442107d01276","openssl/crypto/objects/objects.txt":"99b4c494e35bbf182979b922d62301f3c93e38069efcc41f91711cfe194ee237","openssl/crypto/objects/objxref.pl":"a6c1903f5814eaaa89d2e9fbb009bef2f8c4144cc53bf74fe07e407eb876ada2","openssl/crypto/ocsp/build.info":"c376f4387ed224b780503c83cc11c022896ceefd487649d83dad3c3f12e8a91b","openssl/crypto/ocsp/ocsp_asn.c":"3a1357b0fda1a0013736f2ea9b9174025893bc72c376b61ad18e97db6435697c","openssl/crypto/ocsp/ocsp_cl.c":"3696a5f991086053d2f7b913aaadb9425ef23ea3b26059a5ec2dff5a31e782b6","openssl/crypto/ocsp/ocsp_err.c":"3807ee304722a187d02114de43a5af6ad7e5bccc58f35bcbdfaeeb27a412f07b","openssl/crypto/ocsp/ocsp_ext.c":"70ad06e65b00be76733516bc413064604e740564014c0888a30ee11ceb9f2fc0","openssl/crypto/ocsp/ocsp_ht.c":"ae3c7b41ee3f1908eddacedcf114064e6f3d3cf178d0b1b589a917f1d2526d3f","openssl/crypto/ocsp/ocsp_lib.c":"87f1026201007222533ecaafc39d2e33018d422d336251080aaf26f03c833b02","openssl/crypto/ocsp/ocsp_local.h":"78752d1015577f36373c8d1f43ec1892a18004edccaa942e8c0835ac8a5cfb06","openssl/crypto/ocsp/ocsp_prn.c":"9c2367f405e1b112cff4147806897d24a40c34c0465564d14aa12b9bbcf4891b","openssl/crypto/ocsp/ocsp_srv.c":"71c8bd2bcf5eaeffc148ab8f7c95a7b1fdbb5a3e789577a4ec4bf6e9aba5cf50","openssl/crypto/ocsp/ocsp_vfy.c":"3c5a3068ba3c45aab7a45bb17ae1b549205af725222c3e3aa9e55cc0e12cb668","openssl/crypto/ocsp/v3_ocsp.c":"04c9cb4c315ebfdc57f1a0efc6e4831a08c14b679e8e48a4b2c3c930f78cb61e","openssl/crypto/pariscid.pl":"671157af7edf4eb831310affc0d44cc51a17b35d6baaa7f35b95c86e11900ea9","openssl/crypto/pem/build.info":"c419f3165a3ff2cc9e5998a03117291c1183585c2b8823b37a5298ae9914b04e","openssl/crypto/pem/pem_all.c":"5a16e9192d90974de9dbd1553dd09fa373d64366d8a90a6ac4f07b0a0af76c79","openssl/crypto/pem/pem_err.c":"bc491849f68e5f3e9c10106193a8975a4aeca7b43298098a5a81ec2191fedaf9","openssl/crypto/pem/pem_info.c":"32ee97a3aeaf487e544adcfc18e540c9b54a693fcd3aa57150271f89e906d791","openssl/crypto/pem/pem_lib.c":"5931b56b01bc8ccc8e56677b2debe279f2378d8fb2119d9d74c69ed71f49cab7","openssl/crypto/pem/pem_oth.c":"530c99308fabff37b4b130b09754ed542705603a7666ea5133416e0cdaf0bbfc","openssl/crypto/pem/pem_pk8.c":"14447690b2c5e469466853d1b5b1d0b36bf4808861f1f074ed2f93bfe8b9bdc2","openssl/crypto/pem/pem_pkey.c":"72eca65bfed5eb61191f3f5bf7a49397fa7aa132824b9cab7c7a67b9a3d518c1","openssl/crypto/pem/pem_sign.c":"7792b412f4a8910211c8cdd40e05aeb54e614e7716522dd10c834f1908f9a4dc","openssl/crypto/pem/pem_x509.c":"74ff5cbc40207a656e02e8fc7c5f28f64576e8cb8959334031db3cf0f5ebd9b9","openssl/crypto/pem/pem_xaux.c":"c44765e20101d33853fd8f34dc9bf62a479a7015047c0a5cb341ce522d501b6e","openssl/crypto/pem/pvkfmt.c":"77fe4e179c5899330fd61e3ada9e6a2ae0f17118515b7004efced31c620afcfd","openssl/crypto/perlasm/README":"a397f0f820309ccd1a25143fa8bde5c6e5512de53add775214cafc45eb3e594d","openssl/crypto/perlasm/arm-xlate.pl":"50f1d3fda02dd7b00a529b9087e55dce3d4c58fcae7c1508fe4dfa546dfd1e41","openssl/crypto/perlasm/cbc.pl":"73a0364ae97d052f89ba7f83283fa9893a0b7b76b0555ec4033c1357f9188add","openssl/crypto/perlasm/ppc-xlate.pl":"964569804a05f76630898a070bc7399c45ac968599cb2a438a3a0f3d1266f3f7","openssl/crypto/perlasm/sparcv9_modes.pl":"0c7ac5079c3863f13bb467d0b6402b0edb13fba04dc669e27e0989d0632f1144","openssl/crypto/perlasm/x86_64-xlate.pl":"0a1377240e2560d4628e29fc533c086b07144ffe414bb5c7d2ee614351062dca","openssl/crypto/perlasm/x86asm.pl":"fa62e615e89ca1e0775e7e8913a911726a0e4651322e9c33b040714aa20d8f71","openssl/crypto/perlasm/x86gas.pl":"ccf9de7a5e7eefa00d7cdf23f2d73538c0ba48ea75544d0ae6040ab20323209a","openssl/crypto/perlasm/x86masm.pl":"3b57d38f24c2193b4ab5c7ff603666846122198336ad1939cad482120b4f41a1","openssl/crypto/perlasm/x86nasm.pl":"5a89241db3f2532b8daca0392d32b21b6f9420a1e4b6839b2c17c80e1874146f","openssl/crypto/pkcs12/build.info":"2f59a1c0bbb1ceea9edeb66b36c8e7bba49dd64a94e8e2f16cad52c36729559c","openssl/crypto/pkcs12/p12_add.c":"1022c183931f02d204d65b44fa0886a826bfa9799e8eaf8c0e7b0f6f8da3ac56","openssl/crypto/pkcs12/p12_asn.c":"05803d4b8467c5bdb1b06da8fe40388c347bea9f2f8e54584f1e754a04f7332e","openssl/crypto/pkcs12/p12_attr.c":"f7a31189a46ac43f2a64271fc3a5ec793d79c2906b24397456e67ea930f3c0d7","openssl/crypto/pkcs12/p12_crpt.c":"baff5b7231306d2254013fdf0ea8a1798fff3051633fed729d044f938b5c9a99","openssl/crypto/pkcs12/p12_crt.c":"aa6ca363eb66d526ac24b3f126b5abd776e98ee23a5141ee159e0217e381efac","openssl/crypto/pkcs12/p12_decr.c":"0ef74163429c1e8797e5f7ff26fc9f56fb55600f02cb2d6f639cc50202bd02b2","openssl/crypto/pkcs12/p12_init.c":"fae385643529f9567d691927438ec92c8125cdead2aefe88ccabe5c8af1bea45","openssl/crypto/pkcs12/p12_key.c":"f0be15bbed34ce582d29dfee20a8422ef6ce6ee453bfbde698b64a8be249a9ae","openssl/crypto/pkcs12/p12_kiss.c":"b8a6f89466d45ec6f6581db37b215383b1a84038f4f2e10ca9cdad038e90fafa","openssl/crypto/pkcs12/p12_local.h":"8a84fd4f012af5f8ab4fccc309cef6dbb9061646abfacb0d41b36441e3b2827b","openssl/crypto/pkcs12/p12_mutl.c":"f239c7d4451263b413dd507f0c374fda8080db717bb7204400eda0106b04fe35","openssl/crypto/pkcs12/p12_npas.c":"d01010c0f8dbdd3beda7964d4e68cf6c1fdd93181c77ecc4c5582facfcbd9d51","openssl/crypto/pkcs12/p12_p8d.c":"d1dcb6931499e9f7cc838e69efa9e1617b249cb0515d2ba8b45043b75b918e9d","openssl/crypto/pkcs12/p12_p8e.c":"e2ad27c98cf187843985aa71315875a207d137b3bc38d59df2da56a4ed58f554","openssl/crypto/pkcs12/p12_sbag.c":"5af3f68a0c3de9e7a6b9d8a11f3d0de577bf61d9d0b0b9590e28cb0cd75da9b7","openssl/crypto/pkcs12/p12_utl.c":"0f10379d12ade7fb5bfd5278dc75923dcfe2f52f11d8823f1a530c22fd53e839","openssl/crypto/pkcs12/pk12err.c":"738150847fbec69e993de2e8b0d226c20081e425995f64eec317b245ad175f03","openssl/crypto/pkcs7/bio_pk7.c":"d35d599d846ad941d02aea02b1031c90edbffcebaa81eea0e55caf875d6e32a0","openssl/crypto/pkcs7/build.info":"0f56496c6125fd0e2ff6e5cecdd26073f0d491a73ad96492b403936f8aee3c54","openssl/crypto/pkcs7/pk7_asn1.c":"5fad3d3ef8435214916a1a313b541480de9b233531505a3f6e0cf07d39c77852","openssl/crypto/pkcs7/pk7_attr.c":"bb9f4f93286952e70c4fbd33dd4446533a20f474227ad7fd149ac050f6637e3a","openssl/crypto/pkcs7/pk7_doit.c":"f58d3d3674c9bf0bfc4571d105552ead7366aba58d183f2792c62132be233bea","openssl/crypto/pkcs7/pk7_lib.c":"de60d7d8447e11844e0eff90f50e8008b3565cf030e805d6c47224721cbe5763","openssl/crypto/pkcs7/pk7_mime.c":"cbc67561cca2e1904d234dd7f25d4c57b42e4825e52890a7928162df3072281a","openssl/crypto/pkcs7/pk7_smime.c":"ffbe7cc41984ee7160f01a20faa341df78b9c7f652362eb03d253212a5bfc786","openssl/crypto/pkcs7/pkcs7err.c":"09607257508d8b105ecb4dfd28a929eb001eb822ad9cbacaeb5706b2efd2fa54","openssl/crypto/poly1305/asm/poly1305-armv4.pl":"8257227f9304ce1682544137205e36875c608f8a5827fe5315c924988b483d30","openssl/crypto/poly1305/asm/poly1305-armv8.pl":"71288a9d6e7eef64333d9b89319fa40d149733e358c7e9eadced0a1d7d12b2c6","openssl/crypto/poly1305/asm/poly1305-c64xplus.pl":"0107057c401a6ff2b0838aab9b704736550c08fbc81971834c6f4f202de41430","openssl/crypto/poly1305/asm/poly1305-mips.pl":"cd135a12be9c47277cba5e2fcb1b27289cde632584a1e2808f8d9d3222aa3ea4","openssl/crypto/poly1305/asm/poly1305-ppc.pl":"3da40be700562136d1b935479e35d46b31295de5b45317f3ca10d327ab8f2e92","openssl/crypto/poly1305/asm/poly1305-ppcfp.pl":"af455460399ea65fa61beeb46d7a0faf1b128ca5070929b361084daaf72b19ba","openssl/crypto/poly1305/asm/poly1305-s390x.pl":"c879cb3c6b632d3cef3eba411ea0d1668491c0353585cecc8a004f30544a955d","openssl/crypto/poly1305/asm/poly1305-sparcv9.pl":"0ee8746f475278a6c7a24b5e338fdfa4225c1907a4ba677f9475db7fa3135251","openssl/crypto/poly1305/asm/poly1305-x86.pl":"1998c110caa1ea62d7bd41b0b7918dd2dae3d2b02207699773b203dec1729bd1","openssl/crypto/poly1305/asm/poly1305-x86_64.pl":"e9ed59a5ca1a014016fda2a08878b1cbc98a72f603b5031e05a2fc138b03658f","openssl/crypto/poly1305/build.info":"e4c61fef5095fa4b702b6719eeb0e5b2e68783994c84fb551a47e67990d65237","openssl/crypto/poly1305/poly1305.c":"33660bdb9e65ea21d5b76b846b79e717085fd45213b490787b48b8cceefe10f7","openssl/crypto/poly1305/poly1305_ameth.c":"7376c44c26841308e4804e7875d4a6d934482d215b3ca34c3ce1005586edb6a3","openssl/crypto/poly1305/poly1305_base2_44.c":"0ea8bc267535c740255678e404481446800c81e6aa26b21803d9311c55689557","openssl/crypto/poly1305/poly1305_ieee754.c":"c0e41ea950a69d0ee82287a6734248e3963d8918620be45c8f9ab87f7f45a2f8","openssl/crypto/poly1305/poly1305_local.h":"9ade03dbc325f7e454abbc1657c7a737a6204fd2ee158302bf8cb2b7ce64215b","openssl/crypto/poly1305/poly1305_pmeth.c":"9b871e64dac49a70d62625cacfd0717280739808cd7a4f7b37185ac01265558c","openssl/crypto/ppc_arch.h":"44a38287a18609ae24322d52ef488ba0f2b96763f324c085e29d9995934b7978","openssl/crypto/ppccap.c":"442563831b003ce7d709deb35dcf91583a1948ffe25d893d87f3418a19c4966d","openssl/crypto/ppccpuid.pl":"413d6d1e5c0049ed6a0b813ad80df78277ffcd3724884a6852d92916ccb967c8","openssl/crypto/rand/build.info":"eb3f32ca6d3d5e5b26f96ff8457afcea31bfef12b580dc4c3c4775551be9f0e3","openssl/crypto/rand/drbg_ctr.c":"e7cf60d6ff5ed2862ec84f47723a99dc624132dd5dea10b2953068a937c853a9","openssl/crypto/rand/drbg_lib.c":"a24e75e6663f6e02e74bf20cf17389c2d1319f1048c476a667a4a06dad127251","openssl/crypto/rand/rand_egd.c":"6e946fcf002b1a30e138ef0628e2a09175a86555bbd1741b6bc16b3371b04d31","openssl/crypto/rand/rand_err.c":"4d0b0226dd530be3cfc62d9f5192477bc19194347c0c53a8b29523b7519422fb","openssl/crypto/rand/rand_lib.c":"dd913132710af6d240944b83b8f1e96a44936848cc22259222032fb1d35a4faf","openssl/crypto/rand/rand_local.h":"7df626ee2d36af077feecd4069c9e1c1929f528db37c1f42404f67a2aadfc534","openssl/crypto/rand/rand_unix.c":"238d9e1dd5f8366a5a8ffc16205a6ac0d05628ed36bc97efae14adc5b95e4ffc","openssl/crypto/rand/rand_vms.c":"7e259f843f3dddc36ee152f05690e26c5c2c7e8798242774d30f42e1a86cedd8","openssl/crypto/rand/rand_win.c":"4e47837161c307895f84cd79b0cc74370a30a26793e22fd9d18eee25da159b23","openssl/crypto/rand/randfile.c":"fe187941caae09dda34edcaf5b52281f427f9f11dfd0ca77c4fcdb64f3bfb186","openssl/crypto/rc2/build.info":"fa9fad30f2000390e0b060b1c029ac28a5e8e6d715bf06cc05de1c804aa97401","openssl/crypto/rc2/rc2_cbc.c":"5d17a12887305f3e4651cac47756621be09efc1e8333e138856bd5fd477bf0c9","openssl/crypto/rc2/rc2_ecb.c":"28c2940e21dba06419be3ed19afca706e65f311bc7e418f970b02c7fb24abd29","openssl/crypto/rc2/rc2_local.h":"ed44dacd7fdf91b264373b3c9977abaa754c0df32e5fa21060261478ed7eb4dd","openssl/crypto/rc2/rc2_skey.c":"84896df1395bb27f8dd7cb7c23411eff6c80aaa081fabc8c757aab0f26ec05d1","openssl/crypto/rc2/rc2cfb64.c":"d856c9d9208df29fc204f4efa2239c94ba12e4ca686b2760ace8b8e4210bc685","openssl/crypto/rc2/rc2ofb64.c":"4de9c653f5b5136e239b61ef047f1a97af043ea95cc83486290dc76c398378ce","openssl/crypto/rc4/asm/rc4-586.pl":"e6d6ce4a453540cce69e560f598fe5e8712cf0d341de46bc02c995a73486303b","openssl/crypto/rc4/asm/rc4-c64xplus.pl":"fc651da99f08db21512898fd642212751959a58bc8450d848968f3231ee1209a","openssl/crypto/rc4/asm/rc4-md5-x86_64.pl":"84af0ad1878af80af48799fb258b424e014d34fb572903f336a66d43d2e4f0f8","openssl/crypto/rc4/asm/rc4-parisc.pl":"3fe4d93256af08b1f9357d63a48d9d9da894cc80647142cf7aaecdef02b64f8a","openssl/crypto/rc4/asm/rc4-s390x.pl":"289518afc7db683a8da31c85033f1376d574140a1a050330b88e1415fba767ee","openssl/crypto/rc4/asm/rc4-x86_64.pl":"42f8e2f8834e371c9fd78fcead28a04699e9ce13a8c0cc6033f8ad6739e38ff8","openssl/crypto/rc4/build.info":"dafb5e92c1c67dbceb1346e0ca7f9593ee0d32b565f6deec78115575882d71ac","openssl/crypto/rc4/rc4_enc.c":"698568b5fe0dcaa6f82bd2bcfa8314063857a41c52f72ce2b0d89ad785883493","openssl/crypto/rc4/rc4_local.h":"82f57383610c6462ff3c4462e4ff539e5bf66f6683d8d65c888bb6a1328c3cf6","openssl/crypto/rc4/rc4_skey.c":"fbeb154e752081d08688dba213b005f97dd269b8354bb80ea3bb03ecb429d0f0","openssl/crypto/rc5/asm/rc5-586.pl":"ea6781b05166f25ce2e23df9e6d803456bad08d3864e3947bfc6837090d999ee","openssl/crypto/rc5/build.info":"9697a4327aeaf8c8934683c3987baac00b7ddd22a5442a47f14e4bf24eba8ba2","openssl/crypto/rc5/rc5_ecb.c":"86c967263189d6e5a6ebeed489f333fb40135d1db5aab739524fd63068a3fc58","openssl/crypto/rc5/rc5_enc.c":"6a979a8f1083f257ed4baf7cd1d79888a3d56cf99dba9594fb87c4a58c7b2ff6","openssl/crypto/rc5/rc5_local.h":"363648f7b8d0a5f5ef008ab6444741a39ec5391e456f765aa6d3c1c226bd2c66","openssl/crypto/rc5/rc5_skey.c":"f42620aecc4ebf937620f848e2fb011257ca46819fd2d31ae98e4ce8345a2947","openssl/crypto/rc5/rc5cfb64.c":"7d09168e9473d4448266c0d428509233ba0d9cdf40251f801827ba67485ac920","openssl/crypto/rc5/rc5ofb64.c":"114c7a7ecb408f6b4552cc2460c0a386cef4cd823a877a6058bd9f3ebd235a20","openssl/crypto/ripemd/asm/rmd-586.pl":"707a70e32309d4e55867e57908f6202e281427a1a917a31239afa4ef7b799410","openssl/crypto/ripemd/build.info":"8659770d9841882138787c31161f0caaf5659daa1ab6ee51446825f69fed0d5d","openssl/crypto/ripemd/rmd_dgst.c":"c845d74a5629fac28a1646ab8bbb07152db302dd89d117b7b133836638d38cae","openssl/crypto/ripemd/rmd_local.h":"b6c8dca828d8187e44350a3430ea373fd0f386e088ee0bcc65da2e0baf41bd6f","openssl/crypto/ripemd/rmd_one.c":"de45dad151221a755b1912337b048c0828b7ea9803e2f2700e55c02f6d7c2bfd","openssl/crypto/ripemd/rmdconst.h":"b4f908f84addb2c1b1fe09261d26b87ef5a20d434ae8ae42dd078addd71ad467","openssl/crypto/rsa/build.info":"257b566ae3ecacad27d828d5bfe447e9f1e0aad0e8efd3c212f15df49ee913cb","openssl/crypto/rsa/rsa_ameth.c":"307abc673ffb80d45a011b551b2a918f98589365ac3d246e401c5c984009f383","openssl/crypto/rsa/rsa_asn1.c":"81a5a98914b8e2dedec487b3ef98c9f003d6bef33005e191322f2cd4f04330ff","openssl/crypto/rsa/rsa_chk.c":"7bfa882a20fced60b03b287230d4549abfb282cdf24a2b0f570edef80a169697","openssl/crypto/rsa/rsa_crpt.c":"da9b2f71971479da56e4f39a345ed2fbb020ef12737d417c9b68c11a7d50196b","openssl/crypto/rsa/rsa_depr.c":"d7421a277b8a98658c74261388c3628856f56e262ee97dbf41f6584a5594f81e","openssl/crypto/rsa/rsa_err.c":"4a84e10c082ec1c3986fea95fa62189e217cff91a3bf705bdc8a0bc904c6c781","openssl/crypto/rsa/rsa_gen.c":"abd456b06e48f0bfaef44e064f3fd62db6bc0fb445d23627e5ca784b93af3e70","openssl/crypto/rsa/rsa_lib.c":"b711e363b57782b03f657b372bd6311458255704ea06071e6a1dbf3f22b7a5bf","openssl/crypto/rsa/rsa_local.h":"51245a3f0b7350a846ed851692ac63bb09af2584681b31b1552bbf99241bb647","openssl/crypto/rsa/rsa_meth.c":"d51d459ccd362102bb5a4f64ad6144f077d2014a9f0cf6201fd77c3f05a1e757","openssl/crypto/rsa/rsa_mp.c":"832bea3c81f5d7d1e41daa1ae1eb4989908796f2d9574738671e9462419b008f","openssl/crypto/rsa/rsa_none.c":"f3a8bc1ba22ecef6701b80db01557078e2cf12f2b61a16b0892423ae43d854c5","openssl/crypto/rsa/rsa_oaep.c":"c938fe57f010f532552676fa9b58f0d6d742ab5feca031c754a95a9bcda6464e","openssl/crypto/rsa/rsa_ossl.c":"37645b993d30a14fcc916455bc113fb23d3f78da6b94c6cfca52aa89176e5837","openssl/crypto/rsa/rsa_pk1.c":"413f63a20d5ebdf688537cecd1904f13756b297c0f26c899906a309af63ce879","openssl/crypto/rsa/rsa_pmeth.c":"d6147a88868e540d78987e6b140ac5008fe4c94276bf49287da377faac248496","openssl/crypto/rsa/rsa_prn.c":"58e42536f09c2e87f73684d04f3bcd5f7e6c90012ea21aea64f6bd8c6538ab7e","openssl/crypto/rsa/rsa_pss.c":"dfb509cd579f114cadd7eacc82554481088c5f01345f090f4cc9600df9a0055a","openssl/crypto/rsa/rsa_saos.c":"888c46b976fcc6af3ccf850883fa87ad43306e872a2a705e278481e50437b212","openssl/crypto/rsa/rsa_sign.c":"396019b0a9987e4e5f5be1fb2d7c2ac6ed62ab645b68b977669d0806c2ec381e","openssl/crypto/rsa/rsa_ssl.c":"61a7d61c892c5e23418ca840c35cfc80b3a79184bc84f2a126b84476480efe81","openssl/crypto/rsa/rsa_x931.c":"a3f7a315506d4e26a050d764df2eb8f5a5177d31e4d62d48d1a6abc857a862ee","openssl/crypto/rsa/rsa_x931g.c":"2bf3eb27bf4394f7f34235f51db3c3e9eebb8a8711ee6507de6a3b90c4c32131","openssl/crypto/s390x_arch.h":"2d3c0e7462a39d7ed076ec1b9c6a7373e51471ca3f8754578cb231cbeacd365f","openssl/crypto/s390xcap.c":"499c372d94e55772e7fb6c532ef0007551f66b2c46f20b427d6c1758a0868946","openssl/crypto/s390xcpuid.pl":"1d8a4694b69b32ab56b031e997dc8802b20380fe078fb56d7e8f62da575907b9","openssl/crypto/seed/build.info":"11a58534ceff43757cf9dbed58c94ddee01789b3992a70e3601e37637bc49ccd","openssl/crypto/seed/seed.c":"80618242c9d0f75a5ab1c7c080e857c69710854ec06329e7434bc83438e0fd96","openssl/crypto/seed/seed_cbc.c":"b775e571021fe9d348f836a010f6a5489e7f2a0596dcc5b52c1be10a91639741","openssl/crypto/seed/seed_cfb.c":"480a01e3ce4b95992b62c5a63cfb7a244122caade4845785ff92e3f8b655d062","openssl/crypto/seed/seed_ecb.c":"b6f8a61c77174d96f7857350f626f83796f34de7de6c2fa83a228811c690a74b","openssl/crypto/seed/seed_local.h":"a7f2e5ea85f994f62450a0056de9116982291a8abc12d3e971537d89229c4106","openssl/crypto/seed/seed_ofb.c":"e1897c1c4af729d102daee7121e585b77189e22afd8ab095b98689f629023ae0","openssl/crypto/sha/asm/keccak1600-armv4.pl":"542e8f46ede74eb9cd19c72a49071bdf91ad78b75c7500481d5c59c65afcda25","openssl/crypto/sha/asm/keccak1600-armv8.pl":"4b3770611981a2832588c9f35e4f02e38b2f9ecef3ca23db62a5a25f4a17bd96","openssl/crypto/sha/asm/keccak1600-avx2.pl":"c12ee719d061ed159fcba309237af8c11deb2a19606320f7a9bd96c97467ca81","openssl/crypto/sha/asm/keccak1600-avx512.pl":"6b60549e38f1d414fa7a6b22ac3425676f3dc13da2076b3cb1ab83fc9b007dc4","openssl/crypto/sha/asm/keccak1600-avx512vl.pl":"b7162d20919c3677c0ba5b9c15f32a7b93da382a8772db9e9c01d96dfcd59b09","openssl/crypto/sha/asm/keccak1600-c64x.pl":"612b74de8eb0be8773a0b06738a39deeb3897059fdd8a85c64cfd910dbba0fa5","openssl/crypto/sha/asm/keccak1600-mmx.pl":"b0e6895f1c1b2c32387c7d3b06fd474506a6017e55734e4975b0643c6bcd108d","openssl/crypto/sha/asm/keccak1600-ppc64.pl":"b22b70e115f4c24e0c17e916954e0e6afd0c9593e65207a3735ad89aeb97402d","openssl/crypto/sha/asm/keccak1600-s390x.pl":"85a7715a8edbdc5636a638da798ffa8b0a99320f1252e6222f2d3099b722b6fa","openssl/crypto/sha/asm/keccak1600-x86_64.pl":"a14915e8a91fb4a15054ed7c1ba6e508e86fc69c3ff5b9073e0600c4846e0656","openssl/crypto/sha/asm/keccak1600p8-ppc.pl":"a8c7a781949b77ac99f175a345c773343818e21c7fc9984f0e7199d301e67c22","openssl/crypto/sha/asm/sha1-586.pl":"eeb0fc4fbcb984038ab1b1c15dc5afcffb11913f9fca00f8d4b915d9798bb400","openssl/crypto/sha/asm/sha1-alpha.pl":"cd51ce6fca67e62b73cac97ab23fe72ce9cc611135517a3ddc1eed5c31fcd87b","openssl/crypto/sha/asm/sha1-armv4-large.pl":"0a06172fa5a03fdb7b99c7515b87a508d83f2dbe319cd44bdd52a9d5cff96ae4","openssl/crypto/sha/asm/sha1-armv8.pl":"6596faa8e1a8a6472ecab5638b39554077451901f2fff8f51eec38ffbc9cff5c","openssl/crypto/sha/asm/sha1-c64xplus.pl":"f92bca18470640470899a721878a6b70bc5791a30da8129d9de88bbd2a55a79a","openssl/crypto/sha/asm/sha1-ia64.pl":"f8a627a74526c3cbc258af9084971ef1c5f88bea15ea78d1dff8bd249a73c01d","openssl/crypto/sha/asm/sha1-mb-x86_64.pl":"800cc6d88fb5663b7f150eb3d7c4902b65c4814308b969803b41588a6ab12236","openssl/crypto/sha/asm/sha1-mips.pl":"6be7c374df5c4fa5f54170a785aecdb9fa0a254e9a4a9add71e00cc71b2bf7e3","openssl/crypto/sha/asm/sha1-parisc.pl":"84e61839ebbe074f1eb9af7091afee054d2915c8d37d49ab744e5644d2ee3753","openssl/crypto/sha/asm/sha1-ppc.pl":"e13e35de483cd2205d94524bd56c459fcf079e038bc7392fcbe3a8086b297a70","openssl/crypto/sha/asm/sha1-s390x.pl":"119b51be4107546b803fdf4f4903c2dac5153ded1903388c8f73415eb8980f7c","openssl/crypto/sha/asm/sha1-sparcv9.pl":"34662072f7db2945d9291cc84ef51a308e6aead68e500d24dfce744dab4b9cbd","openssl/crypto/sha/asm/sha1-sparcv9a.pl":"e23a82eb0fad844f4e150112948a07748033f819a7fdd6a17465ddc3af9b77b1","openssl/crypto/sha/asm/sha1-thumb.pl":"4e49b02927a01e6448717e71647ceac30dddfd9f86532cbc16fa9a1281ae239e","openssl/crypto/sha/asm/sha1-x86_64.pl":"ba4b88674f454bf022b838d93ef5b2434c4e618c32836687afa00a0ec636d426","openssl/crypto/sha/asm/sha256-586.pl":"1202d1efbd245d5dcb1f5bdab86ce95a60f97c86f2bf79e8cf011e2005d7e826","openssl/crypto/sha/asm/sha256-armv4.pl":"d0c38f7f021c358624d6845fda1cc2e278b4e8523efbf59de627afae31a69954","openssl/crypto/sha/asm/sha256-c64xplus.pl":"65fc995ad25e0e22cdc1d429c02d27ed88495350093b3256ece3adbe6fbe7817","openssl/crypto/sha/asm/sha256-mb-x86_64.pl":"bc2549bba79c9367e749da71ab40f0b9a1434b87fd3209fdf414c9342ab7cbf2","openssl/crypto/sha/asm/sha512-586.pl":"8ce885933bf41c9624a7a51e42abcb32fc915d61a1e7de3d595281d3d2592af0","openssl/crypto/sha/asm/sha512-armv4.pl":"956283d9ad4de0489cab2e32135826c3fcc14d7c0efb991a0fc72b8cc37ec666","openssl/crypto/sha/asm/sha512-armv8.pl":"effd9a393a181e0595d42d1c5d4a249051a0c62b1ab6e36cb472c9b3dba05567","openssl/crypto/sha/asm/sha512-c64xplus.pl":"09f9b9e042cc8f848eb852e156bd6892187eab8ce3edad8f1db29db3541d9248","openssl/crypto/sha/asm/sha512-ia64.pl":"4342a9b491a46747edab0ff7bd0f762b1f70b16f374fb415ab6abc588e4e129c","openssl/crypto/sha/asm/sha512-mips.pl":"a8a3a342b55e3fc29a55bc01d22c9426a61b62d54221f98f7e271d5307f21644","openssl/crypto/sha/asm/sha512-parisc.pl":"a86a41d9c116c552f23a6b3aff1ee0f2e5973cbd5086e04eb37db3c42acbbf64","openssl/crypto/sha/asm/sha512-ppc.pl":"129c4638fdfb3459d804bd9755c998a9f995e90c56825ad6f8c4c02261351489","openssl/crypto/sha/asm/sha512-s390x.pl":"7d35d2bba8dea8fe33027bf8ca132c6c23f13b34de3c4aee7e8b3e61b065ca2c","openssl/crypto/sha/asm/sha512-sparcv9.pl":"2148a9ab469e01ea394db0d3382839b47a61c7532d0dc328af661084b965712b","openssl/crypto/sha/asm/sha512-x86_64.pl":"20411ddd8a77be94515ebf5352936839ff698ae2b39d565b66fc1827c3be3922","openssl/crypto/sha/asm/sha512p8-ppc.pl":"a4bdbebb7cb5bc0b259b1f25e2afacd821cdbf99ffe3012772250ea16fe97adf","openssl/crypto/sha/build.info":"d40aac1bb358e2936547b3f40ee445b49c48fce159b51f74545feabac0dc6ca5","openssl/crypto/sha/keccak1600.c":"4596e079f5bbc172204cde849e4d1e5e4cab78b507a86294030d97c3a0173f33","openssl/crypto/sha/sha1_one.c":"18bf57d4750e234f7074375609a9f9aae32c5872a7fe0c16a61e2a3848483708","openssl/crypto/sha/sha1dgst.c":"ae0dab96e2b0d8b89fd47bd6049e70fde583dcb4a16e5372a2745f7e1fa74a4b","openssl/crypto/sha/sha256.c":"3c03556ebd787b018f747ff3c6d84ac08a1d458b6367a172560ce20a114e8109","openssl/crypto/sha/sha512.c":"4bc230ca6efecf8391b0c7c114d6096f7aeb0dd09bb573d98db2b71df788b855","openssl/crypto/sha/sha_local.h":"604eb9ba98aec825f308ae0ef400aad2331513df7d47f1604ff524a4915c501d","openssl/crypto/siphash/build.info":"380f0a4c8fcd9697eea92f2b5004050d32a55bd6893a6ec8d03bc316107c8f67","openssl/crypto/siphash/siphash.c":"9da8a7c5156f78546629c115fc21ab5478ffb249fdc6e797ac93fac05313bf70","openssl/crypto/siphash/siphash_ameth.c":"d9c54f706f72bcf19bfc73ec2458903fefabd8dead3209854637ab07df7a5c97","openssl/crypto/siphash/siphash_local.h":"d6325eb9c432f35d9b9f3c0ee9c7785f70078d95986e3bfc3010634d76a026ac","openssl/crypto/siphash/siphash_pmeth.c":"dca7f5df1fcd2fc457918df9eea7388a9709f92994c22ce2a8d5c50f3d02c803","openssl/crypto/sm2/build.info":"a0ea4917c09e9f2153eb4f722a4a419b1437e358d6dd5a8b52ad3cd6e99b45cb","openssl/crypto/sm2/sm2_crypt.c":"ee1c4afeffb223bc7eb5a788a4b94c330d5cb2c90809570130c94206ffd60ec7","openssl/crypto/sm2/sm2_err.c":"9dd7b6bcabdfe8ca1eb66374370bc1708efb0db5dccf7cd296174740fcf2f771","openssl/crypto/sm2/sm2_pmeth.c":"69bcff1f836f2e834e00a4637b645c18bfac3e2217fdee67c9da3eee8a445d65","openssl/crypto/sm2/sm2_sign.c":"203260b46105abc1525125e5a83438c7c5a6bf19ad216246b55e3609ec58c1d4","openssl/crypto/sm3/build.info":"619763e5cd74bb7c9556ba97dc559ff219a7e0fa25a704579a2b9b1bda1f3610","openssl/crypto/sm3/m_sm3.c":"102b12f8382f33279c763aaa1ef6ee0923723dfbcea41b07e465c01cd2cd72cc","openssl/crypto/sm3/sm3.c":"192aa39e787fa67d2ad800cc5b8d1c80d5c6cc6384786680d8eeb14185c057e9","openssl/crypto/sm3/sm3_local.h":"02cee467d273f55810be185590e1026b1fda6f47c526fd66f449864fcf4d83ec","openssl/crypto/sm4/build.info":"e447c13dcad1e3a3cb2d582b4979be34f1dd852cdee1e325c87a8f5f3658138c","openssl/crypto/sm4/sm4.c":"287c8e298c63cf935bbd7f767abeee1a6a9c84fd5930253627bc8466fc1651ed","openssl/crypto/sparc_arch.h":"210a902b386e5a3ffb43f1e634d9a8c0069c84c572fee3285dfbe446643dde95","openssl/crypto/sparccpuid.S":"9f67d1aa1a9c642198abb67ab2394fe7c9375017822f8117679d14c49e1c0ad1","openssl/crypto/sparcv9cap.c":"1a5eb5aa9699afff5c76162e51f97698529766d8e7894aaf59817b07e1894da9","openssl/crypto/srp/build.info":"117640a1010ab716e020ac03b532c763a7fa3c2289633098504ecbe94995f376","openssl/crypto/srp/srp_lib.c":"2931fddd0920e4ec142afe9f92ea29bff38f11ff42deefee5ff6db7064a0b8a4","openssl/crypto/srp/srp_vfy.c":"7555f7314f76bfd9c05423e2d6262f985f464e30cd9001f5d3b46b41130692b0","openssl/crypto/stack/build.info":"08ddcbc25f8fef0aff834fdf79a514eb23ee9ce8b3075499e2f446870ab11ec3","openssl/crypto/stack/stack.c":"61df807a619658bef83d8d02942a22e6885a877469a1083ef12115d9a15476ac","openssl/crypto/store/build.info":"411fc258658218b167097415f8d086d2543dbe580ba03ac8f6c9b6b0d3cf2d49","openssl/crypto/store/loader_file.c":"f735e06e29401d04ee87e0ffd5b59adc0f7d10b6995fa846d83f5e845b2f68f3","openssl/crypto/store/store_err.c":"c5a0e3525c808c54a44866279a2e23cbb32a0ee057b22045de66a6bca9e5d345","openssl/crypto/store/store_init.c":"c77b777ba036a9ebdc6916608455eaa9db23eb5168ae2be94b23c13c697086fa","openssl/crypto/store/store_lib.c":"99fa9efd46a8177fa44155e6986ca01d80ad1fc841b30ce72981e62bb65a126c","openssl/crypto/store/store_local.h":"f9faa746e26e8f8efd1c2d52d6845f00f7e16e15f80e7e112a5029f531b365f8","openssl/crypto/store/store_register.c":"69d36d882b2137f51672f461dba5bdbb697dcd22f8c6c36035e8c4f92fa2c96b","openssl/crypto/store/store_strings.c":"a926f46d67fbe57747a3dfc5ac8aa01c52a196e8359db44be88dd391f1b0c045","openssl/crypto/threads_none.c":"ce84a6a047a1d5bd4dad0947b3d6e8a166a1f8daa2b40aaef30292bd0736a952","openssl/crypto/threads_pthread.c":"27955f2f4be96cc85e661c9998940f84bd03532b08eb1f49825cb480bb11715e","openssl/crypto/threads_win.c":"e813a198a1a0304781d936eb79132ad09b9578e4702b59f8c3d3ca3c7d3de56b","openssl/crypto/ts/build.info":"f9908ee4ca6a1b8a13a050e2864f99ded2871603aef152b80dede8cb7d23a1d1","openssl/crypto/ts/ts_asn1.c":"6a4ad1328934a8686e43d2a5d5b98b7aaf022ce31fb2240fa503d2b55c0f6159","openssl/crypto/ts/ts_conf.c":"9f58af31f6003c52a4940358e4a429a5274b7abafa6b4f08e5ca8457cf1e10ac","openssl/crypto/ts/ts_err.c":"c0de1090451540dfc4266afe1fcbe348e659f554067f79397d934955123df1db","openssl/crypto/ts/ts_lib.c":"1799c88472a43a977b5e3b481e1f5a68611f3fd40c5711287af8c7dd67f8f6b2","openssl/crypto/ts/ts_local.h":"e74f27519c9ab2dd9e76a6913f0645b034872a011dac5028aeefcb0d3814f828","openssl/crypto/ts/ts_req_print.c":"3ccc050fe21d386022d0d830f6eabfe2a4f5ddbee93e7792620dc6d5f7e55653","openssl/crypto/ts/ts_req_utils.c":"36ca2e7fe8dadee3e1869aae453afc14f212f62591282accda69acef8d035f08","openssl/crypto/ts/ts_rsp_print.c":"c575672e3ccaa71d7049be21f9fbf26b68a5c644538ccb0a3998ad856fb3b214","openssl/crypto/ts/ts_rsp_sign.c":"30fc28979a34af230d114c57b5eeb5eef339e9ae9cce816962cbf6a57b170acf","openssl/crypto/ts/ts_rsp_utils.c":"1e621128663bd333f579603633e14d865ddcb4a9cefbaca7de38a473413ccf31","openssl/crypto/ts/ts_rsp_verify.c":"cd0a023e164b35411da8e27fd4ba83bff3b5a82700e5dcfed026cbd335385a87","openssl/crypto/ts/ts_verify_ctx.c":"37639a6e18805fd77ca436b4f7db441e316a5c0f019bc0471d9ceae7ae0f5ea4","openssl/crypto/txt_db/build.info":"799c270bfbc9d07d6f8b395ad253c0a8a2f20550328fad5a6691e79af4694819","openssl/crypto/txt_db/txt_db.c":"4fe9150f5665f46ac2c9949a676b5251e15b51106ad62a57fe11b9fc8af2305b","openssl/crypto/ui/build.info":"5a483732ca46036c608b7e20ddd080f9a4b2a171c85ed85c87933d398b6b4514","openssl/crypto/ui/ui_err.c":"027d5bcb2cbb2302b2a61936f79f9eccd9a06700bd2cc41a3485bbd554eeea8a","openssl/crypto/ui/ui_lib.c":"946edaa4b9ede3bad15da10c64d0e4a1ee5d639efd8102365450a5ae4e36355e","openssl/crypto/ui/ui_local.h":"e07419f8321ca0234282df11a6a616e7710194753b46aa84102c34cd7d40f46e","openssl/crypto/ui/ui_null.c":"803d2ae023fb6d6c3aacb4a2cca0165f90e545260d9fd544af8d1a9a751b243b","openssl/crypto/ui/ui_openssl.c":"11a0b8644c420b9f968161e2131852b5f0e6d7e247d0d7ad3746280ca7be9df8","openssl/crypto/ui/ui_util.c":"c6350ba9b1a59660e04ac1a9670b5c387d470d0d9ebcd77aa722f2a66e551199","openssl/crypto/uid.c":"5027f1598eb779016793a21ff1fb8db97be7a0a7f7717c75b8f48af5a9587f54","openssl/crypto/vms_rms.h":"d8a9dea1f7d6d2d47b4f8e13b44300c240b4215724d019459f537f0ee8de65cb","openssl/crypto/whrlpool/asm/wp-mmx.pl":"887038977e3f1fce6ce2d687ea7a40323213ab43b0ef95eb5b2c60f0dfaea948","openssl/crypto/whrlpool/asm/wp-x86_64.pl":"c758c6d370f26c614b05321069ec0678dda7c993f8a1864b1e01c12e52264512","openssl/crypto/whrlpool/build.info":"af3bc2b6c3963c272a6eb1fc015578e3b13c8edfc3a857ea7817fe5337704e9d","openssl/crypto/whrlpool/wp_block.c":"884f1ec2247d0f1426e4201ff7f0f7c9a24419bb2bac3ee5c6fadaec213f861b","openssl/crypto/whrlpool/wp_dgst.c":"1af49127d90372f8cce04f89d8c8153f053ada1383382a01d2eca73ba3faa32a","openssl/crypto/whrlpool/wp_local.h":"ca85102a6f440eb9c3d0958b79a3266fd6f94fd8da49dcfc607719183c57bd78","openssl/crypto/x509/build.info":"2cc54f328ca08c22601f6098db0ea39519b0ae34c5823eb84455c31523c9ed4d","openssl/crypto/x509/by_dir.c":"17d9bd9c10c7873bbf263f5aba1c104b09a2fb6f323919ac08f2e8a27648074a","openssl/crypto/x509/by_file.c":"12c78263f35836fab4b23445bf93f7a454d12931cbb0d19e7dff56ea01c14593","openssl/crypto/x509/t_crl.c":"e929cedbafba5ec1de7062a8d9517521a58aa5ca30f0e58f92022dfb14fc2a1d","openssl/crypto/x509/t_req.c":"e63b47be322906b4016172cf06c495f846de9433684bba212d6fad17e2068075","openssl/crypto/x509/t_x509.c":"a81995746287a06e4a8adfad49699fdae2852cc7b4bd731a0f1bf1092c16ba20","openssl/crypto/x509/x509_att.c":"d510f09e9621a1a2c0705f97707d897dd64e8bb0ede440e819a742f45ded8148","openssl/crypto/x509/x509_cmp.c":"049e0e99753a4b301527b68c797522105bbab9a7f765807d4eab91ef52ee3820","openssl/crypto/x509/x509_d2.c":"0992dfc3f6b6352c81d19c81b82d2b0783ca07d0928e141a86ce3464c586d19a","openssl/crypto/x509/x509_def.c":"131c4ae5d99af123f2e1dc06702a8de35db096b3b447dc45b17c00125ae9f3be","openssl/crypto/x509/x509_err.c":"dff444901a4b74160a763714e7aa015c4851468cccb0fb3168c63e20f901b9ad","openssl/crypto/x509/x509_ext.c":"5eae60eddf4390506a3a2ffa44efab9b7ccee5a6bf884aaef88d4a39815b6472","openssl/crypto/x509/x509_local.h":"c9bce0ef40ad7144218e5fa315fc74572827624c717d89abedb0667bdc86ef06","openssl/crypto/x509/x509_lu.c":"c3d06f8a32bdd302933c10f453803a845f45200e921155607b753be949dbcf7c","openssl/crypto/x509/x509_meth.c":"6796892127d4f8c2ef720cea7696cd21de308a776c75392b1b5c6dcb2b9b77e9","openssl/crypto/x509/x509_obj.c":"85d5382a42ed915057618ae6b835244b8ec5ea6997449b1e7b737fd7a51dbafa","openssl/crypto/x509/x509_r2x.c":"20d19f6acc837f8ffb4a3b2de311a581fa471d52b10a376286bab49026ddf42e","openssl/crypto/x509/x509_req.c":"caabf10b9c6e62ddbbd66269a26a6f4595f4bad08eeff91365384fa149c4ce3c","openssl/crypto/x509/x509_set.c":"f9fb63e0eb93644263fe325a5a2a94ceccc7c2eb21da23139158d18ccc265bd2","openssl/crypto/x509/x509_trs.c":"e2a1b8bfd56d6db5ea950815d4e85555164032c352de15188cfcb9af785bf49f","openssl/crypto/x509/x509_txt.c":"a680a1fdf94210072ca35dab8df36995ccc5af544e504f39d2ab5c321147385d","openssl/crypto/x509/x509_v3.c":"d92b87f23dbc501babd1c5508ca59d79e932a2a3be6df4abcd781ab621dcbbd8","openssl/crypto/x509/x509_vfy.c":"5ecd5f59157a6de549bb52afdbe8e7d6e39132baecad0919b16239a25633bf76","openssl/crypto/x509/x509_vpm.c":"33d765f1467c78f231fbb0687cbc62162befbc101314985d6d26909c754d99d1","openssl/crypto/x509/x509cset.c":"2c02e058ec0805af5ef8aeaa4567c367a1851648d6fc333a9a22bb5a7d6030d6","openssl/crypto/x509/x509name.c":"b5d38d5b6bc0b8bf4b01e49d65c45f5638b548f288cd11d73e0b1ee09218672b","openssl/crypto/x509/x509rset.c":"51a81f7d7243738732b1cac8d98fff07593c9b6413e72cbd37eb96e18ded5145","openssl/crypto/x509/x509spki.c":"aa04f3f9a2f742262d4b9ff64b398d62f05c5a11e48f89955ca0b6f876365dcb","openssl/crypto/x509/x509type.c":"41dd92e873e38a474c52aad7c9964135439a68427b79dd4b2ddc2cbb728fad5f","openssl/crypto/x509/x_all.c":"bbcccd0477b799a72248f8fa1109c5d6c6ebda11b93cb471a82ee9dca5764515","openssl/crypto/x509/x_attrib.c":"507fa1a6062a935f794701328398ad073ba44219061e4e254c249503339a8e17","openssl/crypto/x509/x_crl.c":"9eb3ef7d7256d3b1b176bc2813adf738db68e170ad826a47f4a785dfea916005","openssl/crypto/x509/x_exten.c":"693247d2361c016badffa8417994f6fc8ea20e2c5b0a3e9574d11ac707175fcb","openssl/crypto/x509/x_name.c":"b7e17f921eb8a4ea8087f549d78a0aa5bf0b92235e4f0a67a9929e858969b643","openssl/crypto/x509/x_pubkey.c":"e9a5df4a43624b038d308037c4f3004410690aedb03952e0942f9830e5664921","openssl/crypto/x509/x_req.c":"e10b418b414865ffe52d871e6b73511505f1eaccdb1beaa1e4aee75229dce8d8","openssl/crypto/x509/x_x509.c":"0d94d9578d50b37bfd7518385f4b3de376805811709fb362e5f6592e3d3dc9fb","openssl/crypto/x509/x_x509a.c":"15c9d3212720ba734fe72ffe68958ecaa38b85aca4c0b2d1c081540badf42fb1","openssl/crypto/x509v3/build.info":"ac99cdfc6def24ae8d87e06165d78f76e6db2de52a84e273aa65c1b68ee4aec8","openssl/crypto/x509v3/ext_dat.h":"5594f35d016d77119f3381d09ef25d278b8bd0999a9a8c84fee44211c48f5c33","openssl/crypto/x509v3/pcy_cache.c":"6610d69659376ddc88c7778f2430fe7771a3c96156f677cdd03414ddd028ca64","openssl/crypto/x509v3/pcy_data.c":"b310afb45c06650fb89324289474962e8f87aa8555387e456280d1ea8f723ab6","openssl/crypto/x509v3/pcy_lib.c":"d5dabfc31ed80dc2f4bd2774c3d5e66763924efe9a055fde0f863610d38b1577","openssl/crypto/x509v3/pcy_local.h":"920fb9c6d96f0c8b22b784d372c7c63bb498647f6b7b90881062eec2e78c346e","openssl/crypto/x509v3/pcy_map.c":"7ee7e0359e5f50415ba878e8f73b4f2f7a451f716b74a91253d18cd23b05b4c3","openssl/crypto/x509v3/pcy_node.c":"4b0aafb158e95253c809155f7c579c5b8d4ea54476e86112e923c9a8b69754c1","openssl/crypto/x509v3/pcy_tree.c":"91c5d0c135784dc9d1da4d586f2e49f6c386c0d0eab1271317361396987a6f18","openssl/crypto/x509v3/standard_exts.h":"561a315dfed93c1c074b2288210afb3a2a163db9389e281e866a19ae2f8c05e6","openssl/crypto/x509v3/v3_addr.c":"1b8593763f527f37d6b7c4868f6c9d77e537ed86bc019505dae9f40350eb3bde","openssl/crypto/x509v3/v3_admis.c":"b2090e98e684f0fca9f016f20c959f1c630c8eafa38b850494ada0a8c191fe87","openssl/crypto/x509v3/v3_admis.h":"8dc121a741f2345d3ea1cd1258821b83bf99950d7590f0e8e157d5ff3f673592","openssl/crypto/x509v3/v3_akey.c":"3fe58c085720409847078c0d1fdfd61d7ce76fe05d1bba9693ddc254af28e2e0","openssl/crypto/x509v3/v3_akeya.c":"181c9116647979b27ffa2833c2423e48948e865d56d18d6cc2eefb5c31b32ac0","openssl/crypto/x509v3/v3_alt.c":"4da332211e9b1e61a41087bb1fd43c2ab51732a2aa4d7b55d345c34a05019d08","openssl/crypto/x509v3/v3_asid.c":"b8c5940ebd9390fbff6c06bfdea7fbf556a3b5407f6dd07be443366b9e81aa6b","openssl/crypto/x509v3/v3_bcons.c":"647b5cf5cb8443d071d33fc0bf4e324ce232664c2e2db4aed2ddfaf1dd504ce4","openssl/crypto/x509v3/v3_bitst.c":"a1d385a3aa75f9f43252d80ea6d5d0949520910d40f5262efdcf730b7dcc68c9","openssl/crypto/x509v3/v3_conf.c":"a68af11573fbdf678c010cde17d2dab26645c3c1901b5685cf2ba60421656bc5","openssl/crypto/x509v3/v3_cpols.c":"47329546ee7f00251e4806d9375a5e6b2b97c13b186a15a32845ec8ee6e3b337","openssl/crypto/x509v3/v3_crld.c":"0d1b5df4977c278b76ea5d560afe93d99d0b3d54d1dff54a9563f39404d20e1e","openssl/crypto/x509v3/v3_enum.c":"dbfc84f80c93e5c2cc6908ed66f5288c57346785a5228a2772a540f6d77a8d5a","openssl/crypto/x509v3/v3_extku.c":"8d515314dc30aa17016e8a3ea96dc633df24507a88180cc81e8629592959c6c8","openssl/crypto/x509v3/v3_genn.c":"df01b46d706e5efa369474cb35c55ef215ca26744c9bf0a68e39d1f4ff14c5b6","openssl/crypto/x509v3/v3_ia5.c":"03b7078100cbb644ae1587095fd90fb9fd81c014fbb14b5880acb0bd4d369cf5","openssl/crypto/x509v3/v3_info.c":"a704352335f9ce19b84d9e064ad2bfc76a538c8d6473ded006ce58f8769c0d03","openssl/crypto/x509v3/v3_int.c":"a8d9b35e0d9b4b9e5ea9c665c19a3d9293b375b3064b94bd85206f6ef5c57a14","openssl/crypto/x509v3/v3_lib.c":"a3e4ba890b2bcfacb5a0a6279420256b6fc2fe5ed84e51496c7f59855d110af6","openssl/crypto/x509v3/v3_ncons.c":"17e0a941a9ca219764565373345e3397189cda22f5ff5f1600bc9da6590927c9","openssl/crypto/x509v3/v3_pci.c":"a121c839aa66fd5e1e1907af24bedd2cffed1f179f6b62ef466eccb4988cc94a","openssl/crypto/x509v3/v3_pcia.c":"1f03c6643126ce61047b25730a43136cd957ed545b0bb3955f3add35b6142b18","openssl/crypto/x509v3/v3_pcons.c":"6bae7cb1bf646774af20eb4e7bd307e2f0915ee2b67a0e5f20e4ab72d7d6ff37","openssl/crypto/x509v3/v3_pku.c":"38fdbd7c25f247cd67bc2b65a88bed20b806d9de59bf95aace8f3a05b9a56964","openssl/crypto/x509v3/v3_pmaps.c":"7c66d9ec0fc5f7285002ed589d51f75beec9c9d9f9343e1e0f4721d00454ad65","openssl/crypto/x509v3/v3_prn.c":"3e0466448d6e7a8547d57c3266e069cdebe9b227a1766b989490c00f86fcee9c","openssl/crypto/x509v3/v3_purp.c":"7ccbe06b47b96aec1f0139de97f513fc5f3d1ef8d29c4be00b142e47d68de110","openssl/crypto/x509v3/v3_skey.c":"4b09cca8fc2a3c8d48aced50af76bae6b8e2363401d5f00a0f349867a1a6a41a","openssl/crypto/x509v3/v3_sxnet.c":"620c9df28740f13dbc5d67f7f659428033fd50879b32d379017e1dd2f14e4d15","openssl/crypto/x509v3/v3_tlsf.c":"93435b658dcb57ce4d9c09de0210d17db26e64cb490a16107c7c6dcdaef35abd","openssl/crypto/x509v3/v3_utl.c":"45f3eb40443a405f63f42372917baa031509bd2620611ce9ab17f58f216ee82b","openssl/crypto/x509v3/v3err.c":"347935ccc6ff4fe7a0f5b03b6a94e9ed59edf07f757092838fae876e0f6f6216","openssl/crypto/x86_64cpuid.pl":"45435886ac3894284a39a26dd700602e4b5bd7f63d3defa9e9aef908ef7578ff","openssl/crypto/x86cpuid.pl":"2801d3febb337a6632e9cfdf347a55711de3e59df0f5f04fe74414163ac0ed93","openssl/demos/README":"dd75e8bf6efa43f84576fb0ab2e52c17bcc3565feff860ab9262087bd336e874","openssl/demos/bio/Makefile":"117f672c377e6d6a589361119be2e9741836ceee127a84155ca19b27f3e03a23","openssl/demos/bio/README":"9e9fc749bb331abeaa5347529f6bd04d0c91a8a6d932bebfec16b4cc72f1caae","openssl/demos/bio/accept.cnf":"3446ea01ca3623b6438dd067f5a4557566dbbd8d208ae2241eb2a6b6f98098ae","openssl/demos/bio/client-arg.c":"b9e411eaff145d566b137fd8950e6ccdb2e08e2838c0190fa99cf1b1d55a6eba","openssl/demos/bio/client-conf.c":"db2838dfdd922e43c67df53fc0a67527eef277507d62f73741eec072f550e171","openssl/demos/bio/cmod.cnf":"bb075cc2f6e2880f67450b2125186a0d40a2519651e12113ac4bc60d87b779ba","openssl/demos/bio/connect.cnf":"6aa9d12d5718ecd640b6d71b22abc332853943e4f4690b6d5ec2f992f90721ad","openssl/demos/bio/descrip.mms":"45d5237b66935b9602ea9ae998c9dd147998a00b21ba017ea3c6f5363ce6f1c4","openssl/demos/bio/intca.pem":"876ac7a17992346c11205a5e55972347eb76486e30bcc218c3a4954545e4e282","openssl/demos/bio/root.pem":"3a33842a19657f72d1a14818cd53d845e578a7bcc3a55c0ff93a911d7d7b82c8","openssl/demos/bio/saccept.c":"e3aa04980d7e3f5aad196b53bb97d467910eef289aeb0936e72287234511511a","openssl/demos/bio/sconnect.c":"3cc1c8044f13fafb93dfb395abaf8f5e6395a2bc5e1dfbe44d1fcdcf23a0e325","openssl/demos/bio/server-arg.c":"f18754bccd974016f621e417d82a7ee548ac0ede019df1278ccf51920143e011","openssl/demos/bio/server-cmod.c":"221f2aa36c686cc007c2a2385700f4684b8d43a4999b48ff918ebbf5734e5470","openssl/demos/bio/server-conf.c":"ebaf1a312465915b9606a6185bb59e5136929c4c220ddb9a4de501d36a198e25","openssl/demos/bio/server-ec.pem":"ceaf699619734a8696d669b0b5534a63a416f9cf0b7da1def7a71b45f5f252e2","openssl/demos/bio/server.pem":"57d7d62587cb493806f09fee4f8da1b0a9ea7b6e77aa43879a5fdcc85ff63a4e","openssl/demos/bio/shared.opt":"2d85fd326a716bfd18bf535d7701ae4d19416d11a460fbcc01f5c0ab344cfe62","openssl/demos/bio/static.opt":"54b4d25d172a692a062d0cf88280bf0a1728779c1227f08b5d920ec28523adf6","openssl/demos/certs/README":"c62177cd495b1692f97f3571844b1b4f873f4d811b75fe17b67bf1daa9897558","openssl/demos/certs/apps/apps.cnf":"d9386d7f5eba2af4830f4f5a4da20ef4de1bff11f4a1f209aeda513a80b52bf0","openssl/demos/certs/apps/ckey.pem":"c261be75344e362cacc629218eadcfbdd96823c869685959a3ba7af79fc3f6b5","openssl/demos/certs/apps/intkey.pem":"cba3a56ebf13674fef79721d16fbd3404b991107884b1aa628a43b6538c00429","openssl/demos/certs/apps/mkacerts.sh":"f21e64c6244d7e66d2caca5911ed9fad024f19088125d00bd9912a32c8db86d1","openssl/demos/certs/apps/mkxcerts.sh":"45dee54df9d305f719a833bdc92a5af92fa70f93f7fa9cdb1996bbfbcf0778b7","openssl/demos/certs/apps/rootkey.pem":"49c67aac894bac4cacf8891fefc5dc99126ecec6948c5c51ed31443c9cf5cf12","openssl/demos/certs/apps/skey.pem":"d0bcbe9a9ff18061856a684670a40e82d5fbd57d3c95f35d886c392ce1bc4929","openssl/demos/certs/apps/skey2.pem":"48f1d94844d0d276e8c41fc9ce9e37485bc5551e939f57ba7a4893d0d8d98971","openssl/demos/certs/ca.cnf":"751796c86aa25148cb62a05a0c95fc68271c9a5429672c72c254cf8cdf852891","openssl/demos/certs/mkcerts.sh":"2e3afbbfa11141e2f6b1db6e64f518196f43e34638399dfbf2205a34ef6b25f8","openssl/demos/certs/ocspquery.sh":"2d04b40e04d895f6ea27fcd08bc71e6e857c9954d22572ec63c2d8ddd2373f10","openssl/demos/certs/ocsprun.sh":"a669f8a3e1c0f1279307b097ec809b25a44a4d4f6de613d5d9d5e9c73ce4f559","openssl/demos/cms/cacert.pem":"a648d3e421b0c2a1bf65414158c8472b24e7684488d8b4bf6ee45de32f3d4cae","openssl/demos/cms/cakey.pem":"c7ed282861c32151a60a9aa62b860d81ed7c906532b6eaa6606b77af241703ed","openssl/demos/cms/cms_comp.c":"ba7c5bb1d344f42619748a54cce24f00f52fb0f203775d02a999b2c22243708c","openssl/demos/cms/cms_ddec.c":"cb52b2389d60413f046cd9c639b1d789dcfb664530db977b6e0c728e7a0638e8","openssl/demos/cms/cms_dec.c":"08454e874c1efedc366dfd023b691133afeffbc8531cd03f5624329c8ef5ce43","openssl/demos/cms/cms_denc.c":"86349746ba3befd25c41c1011ef3a867eff6c49cb4ec88debc1211b14229287d","openssl/demos/cms/cms_enc.c":"ea86580d64b378b5f3ea38c43e1e431b7f04d5fd9ffed63af143ec3c4cb79868","openssl/demos/cms/cms_sign.c":"014cdd3058cf2465dca51d1c8d71daaa44312fb2af0a334ac86571deae13ac37","openssl/demos/cms/cms_sign2.c":"bd6d177ef1a95870f2a2df6c2e062b5c1ddaa616b2bf0c6f1e1c78302bd29f85","openssl/demos/cms/cms_uncomp.c":"fd1da2917b323ccb45c16070ed2a965aa961d6d803a2ad01245fa34cf8b48a2d","openssl/demos/cms/cms_ver.c":"f0032ed4fdb8b6324bf28bfbf567af67e9c4c079b2c79d453adb3cfdc7c9585c","openssl/demos/cms/comp.txt":"baf5807c5d1d1cdfd0d076538509b21358c0ab2e888b51a391258c729c640b06","openssl/demos/cms/encr.txt":"f79fa5e249dbd8fc6be362b77541e48d514a88ddd60825b81f74f8bedbdb2253","openssl/demos/cms/sign.txt":"d0f8790d669a88e0401215fbf2fd36a5307783612a65cec65d9c7110daedb997","openssl/demos/cms/signer.pem":"3a2a367baf036df9f8cae8f6abf59818a6695a513b6c453e86b0c5b2cec5d246","openssl/demos/cms/signer2.pem":"adcb64407c7a6aa0b027b584197d7ca2c6606a12fc638a0c6ba532c54b80d65e","openssl/demos/engines/e_chil.txt":"a7a199c58dfe8868de7a1b0be9ae2b109c48bf11f6ac14a0cf3a2523af2c22c4","openssl/demos/evp/Makefile":"743fbbfaae2829921d9c9f76d37a8ba08f73bb3f6b322388320c480dbaa4f66a","openssl/demos/evp/aesccm.c":"0e98fd498ff2df1e1e94488afe68c925d89e38574a86b2290486e2003f5f8e0c","openssl/demos/evp/aesgcm.c":"525952c5aaf76c5b9d0a261f4a158f009fc67020dd8a6339219e00811237fdf5","openssl/demos/pkcs12/pkread.c":"d52bfacedb3f4fece2b6af661a09f66374b88506341f807f19b524b9c3bbb96b","openssl/demos/pkcs12/pkwrite.c":"bd2b804cb9d6f04b36815f5721120647771c7860109397ccc9fb33ceeb1d3294","openssl/demos/smime/cacert.pem":"a648d3e421b0c2a1bf65414158c8472b24e7684488d8b4bf6ee45de32f3d4cae","openssl/demos/smime/cakey.pem":"c7ed282861c32151a60a9aa62b860d81ed7c906532b6eaa6606b77af241703ed","openssl/demos/smime/encr.txt":"435ed2485336e5e5a35e1c03241ba1d98ab1a10b754395e014244afde90cfad7","openssl/demos/smime/sign.txt":"8a62e6d85601452162cb5c4b6a544d651b5d21e3fb9133b534e43c8088f89021","openssl/demos/smime/signer.pem":"3a2a367baf036df9f8cae8f6abf59818a6695a513b6c453e86b0c5b2cec5d246","openssl/demos/smime/signer2.pem":"adcb64407c7a6aa0b027b584197d7ca2c6606a12fc638a0c6ba532c54b80d65e","openssl/demos/smime/smdec.c":"69507f4c8124bc7cab79f61d347cc63b67ab9edaed3604f9bd0f3295f2ef7a7b","openssl/demos/smime/smenc.c":"da25fab0c1f98194bb150f45f20cb1ca9993bf17289c109def009e3a4930116c","openssl/demos/smime/smsign.c":"1ad9d5bbee5c5452be286d10754a290b78288f0c8041123de66c9c0c858837b0","openssl/demos/smime/smsign2.c":"289a8111a998a45fa59433816a23c8fe06505c4369fd9a4beb1810172f83a80b","openssl/demos/smime/smver.c":"6e09b1f8f636a0178bb82b289e434373e4f2fad02c583544d7db844a0a35a96c","openssl/doc/HOWTO/certificates.txt":"5924021ee2ddb3408212b77a918075b4d53f0fdfe5b6aa0f10aff82e58df6b6d","openssl/doc/HOWTO/keys.txt":"f1243eb87db2b3ed7d311e4eef174b8e08e6350f3c9ad13003f08df9b54be9c3","openssl/doc/README":"06848c1e90ba335bdaf9283725ed7eff467551212fb4ea701006317281f11389","openssl/doc/dir-locals.example.el":"d4d533c35de16586239014d1907eaf3d064b3f8f83e9d64aece6d0b1f730f0b0","openssl/doc/fingerprints.txt":"7556a7425258d98c2a260fa61978a283fe7f6b68ac0dba2a65f8ce617df3a979","openssl/doc/man1/CA.pl.pod":"c9ff465a4fc35b9f96fd7c4969f502fc39b6b7bd10759c054baab95d726d2199","openssl/doc/man1/asn1parse.pod":"37caf9092a1256e45780be842a61ed570b21f7a527eb88ffecd862df9afafe37","openssl/doc/man1/ca.pod":"75af05bb632529212306ae2bfce7d205d6f3cb9e4a35e1cb29886de06b7b402e","openssl/doc/man1/ciphers.pod":"516d7a0512049475c71c170366e7bb5b79e1e5677cb1a8a40236127993d3b161","openssl/doc/man1/cms.pod":"ee8a23e7fb91684ff1574c4c04ddb004d63ad25218592200ad8486d7f2dcc232","openssl/doc/man1/crl.pod":"810d4de260c4da6decf285ac39abe3c584d3599c1b7be79ab6d7e14636fded7f","openssl/doc/man1/crl2pkcs7.pod":"8f55a854785a111a29bef3a7093e11b59cb4776bf175c90d0011ab0f3afa724d","openssl/doc/man1/dgst.pod":"e1860ffa2b27e848b93eb669bf11813c2865bb48c31718c3c53198554a3be92f","openssl/doc/man1/dhparam.pod":"6c536d3828fdcebd4314acb692523bbfd81d3a380b09085b6bd624094e39dace","openssl/doc/man1/dsa.pod":"3433b21aa192bc7577d6034543086538e5e52476f64f26e65a648c099433eb2a","openssl/doc/man1/dsaparam.pod":"14d6e77d1a8082be208cd3423ac5ea06889559c3f5d952e79a5c4752d27207e6","openssl/doc/man1/ec.pod":"5b55174ef1b4333e861997fbdee2d3e7d4a33f11a1b6e5cf70179daf59819302","openssl/doc/man1/ecparam.pod":"acdd81bfb533b283a6fcb49c80cbd4ca7540c44496583a3ca20bfd3458d2cdb4","openssl/doc/man1/enc.pod":"2387cd2d8e75d720e00efc4841e5fa9b33eed743d3b2a8cb185d1eda5248140a","openssl/doc/man1/engine.pod":"956f40b58d88348040c05de3b4b717826d2105981a0a150068afd1df9035a25b","openssl/doc/man1/errstr.pod":"f378decd1e49529aee4e3e57cbaf810fc6dfbb735c2a5d1722fcecf6e0103e32","openssl/doc/man1/gendsa.pod":"086bad15f6e6e7b35d890aafa0b96be9fbbeb1cd238cab5daad41a5c65686c71","openssl/doc/man1/genpkey.pod":"6a87b18ffd6f5053de3c855735805b9786f4d4a0f46164e03e71459f7fbacb80","openssl/doc/man1/genrsa.pod":"6cd40d26c1befcc4bfd6f0dfec2672b4e27b7c24ce6b4710e8820675a1ad1b35","openssl/doc/man1/list.pod":"e92acd0bed1ff5d77705667c87e206f0517031273abefead26e6eb1b73d64c84","openssl/doc/man1/nseq.pod":"0d8d6e396a2b821b2473b23ca51b6d72bc321d2a19933b18ee5960fe51508ba7","openssl/doc/man1/ocsp.pod":"aa271208f076f3919559a6e6a6b922404a674c076b654d3a20802c77ff44365d","openssl/doc/man1/openssl.pod":"bdc08295a016259f9980a9dc840d8987b9f556745cf927fe23fc8551e2c6e712","openssl/doc/man1/passwd.pod":"969c61561e8034fd64df63991ff60e7338a9b4301ca88b7241d74ef00a16b0a0","openssl/doc/man1/pkcs12.pod":"75372bd5af88962d8cc4e8bd51fcdb653996547ef36f6cf0545ab15ce5ff771a","openssl/doc/man1/pkcs7.pod":"8901f6dd53ef0d83c9f236c2d896d04ba0ae09e19300435f95751c72cf148ea5","openssl/doc/man1/pkcs8.pod":"30ac12dbc904fd877f4791fe23831a03a9f96a009926f51167c2ae61cccc60ea","openssl/doc/man1/pkey.pod":"7f10a516164472d42c67f90766895824cac901f056eb0a70b08345dc33f356dc","openssl/doc/man1/pkeyparam.pod":"2ea25538484191e0dca7112a8aa3b25aca5a12fd1697121aae59a2619acd1d51","openssl/doc/man1/pkeyutl.pod":"429e1f48d001a33a48928350c2b97c3c6aebb92421ce1f7f1464ebf37a2db259","openssl/doc/man1/prime.pod":"f8280e24245f07a77fda976740e0c038a424f9124b32da974e369401b4b688fc","openssl/doc/man1/rand.pod":"a696ce5df831a9d531cd6bb652e86ce7986d3fe4a56976028780435a0ccede41","openssl/doc/man1/rehash.pod":"5ccd3e337ba0d6f440f4bc60729e374788d1f7fa986a50ed0185c53da4821587","openssl/doc/man1/req.pod":"a2b0594024d118a2d3a932e1e2f8e9805da7dcc09dc16a4bb1782e210f345b23","openssl/doc/man1/rsa.pod":"b388114fd406803ae91e92c29f6ca96b8025f912fdee79f11063dcf9ce0615fe","openssl/doc/man1/rsautl.pod":"722c01fd7945b7f038c13d250c1faf1a7eac51e4582b9859429523d1d9f3de47","openssl/doc/man1/s_client.pod":"c9a7e8f0123d6596ef189d25573db46c9f05c6776e55dbef48b161e4b00523eb","openssl/doc/man1/s_server.pod":"17104da0191503fd7f93aa8971f7ca80e9e4d0a3cc231693da04aa7f9bb43050","openssl/doc/man1/s_time.pod":"c8cb6a1e343a06fe20046f07a523ee92273b07b67da6457e30e95a33c44dea68","openssl/doc/man1/sess_id.pod":"4184f0eea825ea06e9fec3744e853566333c25f802f780d8c54e5bf883ab9f59","openssl/doc/man1/smime.pod":"c22d768db2628e1e8df90e6742c161e2392e1c3b9c47cec2da8da4ff104370a8","openssl/doc/man1/speed.pod":"6293b599b5c08bee8c5126d5f4a31eb08f67e4bf11b9222d80b466add0b0784e","openssl/doc/man1/spkac.pod":"6fdd686324319fc96704fd6e7f348fe1b1e89c051e92a5356d55f298739213e2","openssl/doc/man1/srp.pod":"99fe0c81640a18655c5ab8e56d41bbd64e45a061e33a394299869e241fb1489f","openssl/doc/man1/storeutl.pod":"d81e8240233a0d65664d8f649115cb3dcf8a71a967ecf70ecb8794fe4a44d23b","openssl/doc/man1/ts.pod":"713b95ebe45e3437a8d397d5d5acdfaa3d89618079a9825ac571d656ed281bbe","openssl/doc/man1/tsget.pod":"a0e814408835f766ece5811c783687905d86a96c53fefebcc5c943f219d876b1","openssl/doc/man1/verify.pod":"32afc1b00816faa9e382188398022fe34f5530db5473ea1f39d96cbd416df0cc","openssl/doc/man1/version.pod":"9e1979cc0c8dffd2330d99e2387c1954dc9d5985485add35660f157267062078","openssl/doc/man1/x509.pod":"5e80da812b8c2eccc77e9636a5ebdbab45faf822507ea7a0d6575673a6f91ab1","openssl/doc/man3/ADMISSIONS.pod":"0e47448d30d675413854b2a6cb4c62054129f142a9ca5a131bbb5994acaf84e5","openssl/doc/man3/ASN1_INTEGER_get_int64.pod":"f45317514145f3f959520236d27e8469234b600587b333261f2cd45b74978962","openssl/doc/man3/ASN1_ITEM_lookup.pod":"52056b94798838216bbdb47c5c735ad6805c01332f20747ba7ad299d930cd0fd","openssl/doc/man3/ASN1_OBJECT_new.pod":"1a16a3048bdd841bce92a48677db293a78419bd487126085024ebcf056a1ce91","openssl/doc/man3/ASN1_STRING_TABLE_add.pod":"eff5457b59194fa1707ae5f544bfa10418c12921899e4c2b6031649f488f06cd","openssl/doc/man3/ASN1_STRING_length.pod":"20e8a297f425a09ab543715fa99f60bc03850aaef70dcf3ed4fa29bd30160786","openssl/doc/man3/ASN1_STRING_new.pod":"8d88d413502add013edee187cd9ad1b57af51cc11782da2e9c865bb4a641e605","openssl/doc/man3/ASN1_STRING_print_ex.pod":"21946f10f99781a2d3301f12acf53d8112925375a2085c01cb475772518b6166","openssl/doc/man3/ASN1_TIME_set.pod":"7f3f81980694d321f45bb45fbcc42c77c05771d316b146c0639ce2fa5c55eebe","openssl/doc/man3/ASN1_TYPE_get.pod":"539214daf11857c02b88ab0f2911c7fb74426934ac47040b807e1f48b0cc8777","openssl/doc/man3/ASN1_generate_nconf.pod":"171bb2a07a7cec062437a0613da7d147e025635a77714992295196eebd777bf1","openssl/doc/man3/ASYNC_WAIT_CTX_new.pod":"fc2f03f854f7ce0ba1365a6cdda6be9517b0f5cf9bff2846e943cace5d63a594","openssl/doc/man3/ASYNC_start_job.pod":"81015f757d1dcc902f70e809f4ef68a08f70f5f9e22d60d3d906bcfa52e6ea4b","openssl/doc/man3/BF_encrypt.pod":"94a8c4d9b6dc278bcc5c34789eeb086ddc0ee4a76d71f48ebf1292ae2a623cad","openssl/doc/man3/BIO_ADDR.pod":"0cfce6be0de80b728e9e997c7787de7f08a606d6ae18e6d6f46a1a8a6eb29c85","openssl/doc/man3/BIO_ADDRINFO.pod":"d0bb976134561aea384f6d6198a9e65383475a06f3694f530f165125db8c68e9","openssl/doc/man3/BIO_connect.pod":"9ba374b343d094bf57210c15cb5a9eafd8fce65d57c0b3d85d3905361e7de984","openssl/doc/man3/BIO_ctrl.pod":"0b614d266841c49be5c6a0da078bc372d5e7aa210d43c66d7aff52a9738a3998","openssl/doc/man3/BIO_f_base64.pod":"a9b826aef3d9c1f18055a604d2da7b1870e074780e5a952d8f11799024aa13a5","openssl/doc/man3/BIO_f_buffer.pod":"4b46af048133c3062b68768b817eb1d134b721b16b1fcd9b21804d6af78f97df","openssl/doc/man3/BIO_f_cipher.pod":"bdf7ff799a66c12659fff0c48904053b4525740341d142eea10799929f0fc3cf","openssl/doc/man3/BIO_f_md.pod":"6fe4c50b0500ef7fb758985b9671c920d9b95cc12af40b4357924935a6b05112","openssl/doc/man3/BIO_f_null.pod":"4c6cd77a55188c983d2a91bd8b64073de37d0e8c662de780de68dd87a34b0ce7","openssl/doc/man3/BIO_f_ssl.pod":"4f3fa6ef3018e29c26843c35a7e3e84d2d47b3828edf2b5eecae70979ba6d6ca","openssl/doc/man3/BIO_find_type.pod":"fcf5357f5529ed3df6d3ae454a8cb944a24f98b2c9b088ae0b326b07d6178111","openssl/doc/man3/BIO_get_data.pod":"7d4656acd2494e1229c3f0f7fbc7ca313f69e7e5afd43736acc93ac58f7ebba7","openssl/doc/man3/BIO_get_ex_new_index.pod":"56d5cd2469bae856b77669d4a416ab0b6e42d622128ad5b5c6ae10178ef33284","openssl/doc/man3/BIO_meth_new.pod":"5c7e859c14648fabebf81873de311127424bed0e6db40411e6d7b734f96d16c0","openssl/doc/man3/BIO_new.pod":"4adbd6353586dde668b645a13cb9dc34c615d85d4312c493dc082064dcc075de","openssl/doc/man3/BIO_new_CMS.pod":"768b0de763b920189521a86497c07ebcfd22383a39bd92acc64d37c28c1a5925","openssl/doc/man3/BIO_parse_hostserv.pod":"7ecea4ecfa32d705bf4cb7038896fce0d83d360a6ab8f7e3b8b7159261aa74f4","openssl/doc/man3/BIO_printf.pod":"f5fc563636de300e191cb79d3265e219d540452c94870aef8611fcc905bf2178","openssl/doc/man3/BIO_push.pod":"df61b65d6839a17e0bb04521bfc9638e5c4dc50ff37b6ba849ec2729290754cc","openssl/doc/man3/BIO_read.pod":"3798d92f798cda03cf261187da338fe9eef3fbd36a2d5b9553632c373a5e8189","openssl/doc/man3/BIO_s_accept.pod":"7c6e3ab07bb088cd8814c8e5727834c667b4aa509b6ee88606338fd210edb6a9","openssl/doc/man3/BIO_s_bio.pod":"1becfc7e3c67bc7721e371628f9cf035ae39d28749acd8b1ba267f61cba12c00","openssl/doc/man3/BIO_s_connect.pod":"79623a97b5e4e33f3fcd1ee8a09e074d386bd54995896fa43b653f6a5a817d33","openssl/doc/man3/BIO_s_fd.pod":"5726d2ef68b96b2d01f2803d563a1a0300ae9aed1c133307eba1e86c804b73db","openssl/doc/man3/BIO_s_file.pod":"56cf9dfd449a4508bb1e6b8787ffa0697a46c92cee1f4ccb64a097849f89f762","openssl/doc/man3/BIO_s_mem.pod":"84f3342b7ea398478a39314dff2d82217357fc913595ec0f7be90ded69fe65c8","openssl/doc/man3/BIO_s_null.pod":"238c7f139d367977908644b92b1e4a674c9e43f9357a1334ae23327859bae9f3","openssl/doc/man3/BIO_s_socket.pod":"3ad6e926a104e7614d431ff830660263dd6b2e63241bd4c67f9f906d687596a5","openssl/doc/man3/BIO_set_callback.pod":"c3d0050e3e10414a89149f1141719190c76c3a2fd755d2fb09d82895b6d58449","openssl/doc/man3/BIO_should_retry.pod":"d4c7f036fb3f7c148e63a1106fff4e1a387cbe0d86689e561bdfe40e37e1520a","openssl/doc/man3/BN_BLINDING_new.pod":"d234055a3d363fbf60bff965a1653ffbbd2c9b77f1a2ea417f8294029b9cfb26","openssl/doc/man3/BN_CTX_new.pod":"60dabfa0a4558ee3896896ab4d0f94e786bf0f9934ac0db8af2cc9a1550760a7","openssl/doc/man3/BN_CTX_start.pod":"e44cc9208720c706eeb5111ac2e6437104694cf8f1448bac264fc65c7171791b","openssl/doc/man3/BN_add.pod":"f317883947698f94bfbf4304075ee5c07c7b3b59994ea791e778b39a7ac20434","openssl/doc/man3/BN_add_word.pod":"05fec916d3aadfd9f7bc8d89b33b76dd8e209b8a85b328eb72bf5e1dbb9f1a89","openssl/doc/man3/BN_bn2bin.pod":"b794b15c0c4e029d3c14bbf0784a92ad7f7ea1bbcb176f7d18114435074e3199","openssl/doc/man3/BN_cmp.pod":"3f81b35b19049a28384f367651106ced041b93b058d4aff051afd250186d0dbb","openssl/doc/man3/BN_copy.pod":"e38cc0fd535af136f52c2d3e726f03e91a16ab19c6064eb6df44e546597d2238","openssl/doc/man3/BN_generate_prime.pod":"3a864bf07e5369b3c212e42207b872b9aaf8c9cff83d455e5a618f3e4712afec","openssl/doc/man3/BN_mod_inverse.pod":"9e539642132fd30dbc5d3de75c0a8394858987b0185e01c7499265cca175e501","openssl/doc/man3/BN_mod_mul_montgomery.pod":"667bd4c69fc3b235370e48434874df19f5e095202bc42cfc7a6f1f13e4c286bb","openssl/doc/man3/BN_mod_mul_reciprocal.pod":"f05e308970e1a3a818f7235184853460e615d97467a386c070c3d7739369af17","openssl/doc/man3/BN_new.pod":"b1f6ab481d2bcbb0f3dcf87e3d7c477b77cbad453daa16e43222e862d269c7dd","openssl/doc/man3/BN_num_bytes.pod":"f3505483afb503cd27891c8bce713124863ba8ce764406ffbf26c661729f18bf","openssl/doc/man3/BN_rand.pod":"bc4a2b96f1d5394e2a04ba4154463c4a70a2dbb36ea1d84fcf62bdc117574e04","openssl/doc/man3/BN_security_bits.pod":"bf0d1d1fc14efff28f970e916fef140d6f01c24426e11724c413bc1171e5107f","openssl/doc/man3/BN_set_bit.pod":"6e3cdc6952d4937303f874fb6c32e5dd91e390917ea144d906e507220c24b679","openssl/doc/man3/BN_swap.pod":"5ec80972fbdfbfffccef9e4fe3e69b7e9a3444674d58ebd5d5d8ff68a64b1be3","openssl/doc/man3/BN_zero.pod":"de18d59b5794437a2a10fb68f5154719f841442d8d4250489e13598b9c4bd755","openssl/doc/man3/BUF_MEM_new.pod":"317e636b930c1ef0db349b5e1851f2429148a113e2c7919df89e15596587a558","openssl/doc/man3/CMS_add0_cert.pod":"29712e051a0755523458cccb9c7437faf2ff24114efa31417342978dcb008cea","openssl/doc/man3/CMS_add1_recipient_cert.pod":"2e378848b5e155b1c5a5c3e4a734b26cc3f080d2bb044b972f1dd1782a4af14f","openssl/doc/man3/CMS_add1_signer.pod":"963b52dff6097d7393d39a90e7d7ee567b9bd4b36df476721d290098ae87f5f4","openssl/doc/man3/CMS_compress.pod":"7fc48fa2318babdb85461e800b34e8d53bd6a2da9bedf3c4264f42e61ba9da60","openssl/doc/man3/CMS_decrypt.pod":"2fb641f3d335d85fa96788cc1d1efbfe0803c84621c45b127e633d201e74c919","openssl/doc/man3/CMS_encrypt.pod":"4e34cd4df8943d2d278a57904ba99aad50afafc759868cd2ae8a453b8776f6ee","openssl/doc/man3/CMS_final.pod":"9a5c5001a1a2b8404221f1639bc5576e13ad4d7d411c085fd746d82f77b1faf0","openssl/doc/man3/CMS_get0_RecipientInfos.pod":"d06fbe3fd9f2bdbc4243dc50f7d2efd8228d103ee430f0202832e26edfd491d0","openssl/doc/man3/CMS_get0_SignerInfos.pod":"1282cf2e6dc3d9a6dbfba9b3994015f8029af065d8a03c223ec5b2615da5b057","openssl/doc/man3/CMS_get0_type.pod":"544f392b7432a3ad812e6b5d2afc9d5f5aec4144a91bfcc891cc9d5721cea045","openssl/doc/man3/CMS_get1_ReceiptRequest.pod":"304864e369450ebb03c764f36138ee07c9820e9f672d2780a47d969e68a86174","openssl/doc/man3/CMS_sign.pod":"d3494ff58523487f0e7ad2e24c71c467f34fa46bea6e7870402a7d4a089ca874","openssl/doc/man3/CMS_sign_receipt.pod":"789743ff3440f5e6793b8b7558d31a2d1e2a1b79822cf09380cf907879ed2d04","openssl/doc/man3/CMS_uncompress.pod":"3eedc42c074cb37c9c1e8c16ede2bcc57863ff8a8e488875b6a66f4e039c1e7d","openssl/doc/man3/CMS_verify.pod":"dbb6224770e5c1a24b4089e9cb1438d5fde1b4ccbe88d1dea4486d0817e0f59c","openssl/doc/man3/CMS_verify_receipt.pod":"4e74724f074c9254a05b153eee469a9cdf6b322496ec7b18c19bccee0a3ddf0f","openssl/doc/man3/CONF_modules_free.pod":"42f3d8211c7022ae823c0fa05173c1cb2038658ab392d9fd7124dcf5f590733b","openssl/doc/man3/CONF_modules_load_file.pod":"4c8fb2a920962f2aa1663122cb43f1520450d7d753e36db39a2fe38da3510657","openssl/doc/man3/CRYPTO_THREAD_run_once.pod":"797a3d74e255f8fd5ce0adb56fef357ec963e4805b2345cd56e31a4531c47e0f","openssl/doc/man3/CRYPTO_get_ex_new_index.pod":"9d63dfe936be09bc546ec4e65d35b0e9e056e44d22faf6bfdd33bc75f137c5a2","openssl/doc/man3/CRYPTO_memcmp.pod":"dadad3db32833f23b6239a22af22794f36ae60d5979356ab85934ad5bd0b8425","openssl/doc/man3/CTLOG_STORE_get0_log_by_id.pod":"d5dff2f8e4b974ddeab059b82c596931012e1fbeccbe4c548614017eec487f02","openssl/doc/man3/CTLOG_STORE_new.pod":"28559ea6b4616b147133d494a9395285db773f1374290c834b1bf478761d4682","openssl/doc/man3/CTLOG_new.pod":"d59c7b823ae4028a38c44eb7b871f74654742358b822ff4a5d7b46f59e67f12f","openssl/doc/man3/CT_POLICY_EVAL_CTX_new.pod":"25d166c38e5a308675853a9efc68f8e61778f4beef0910db98fa8e309d261f6a","openssl/doc/man3/DEFINE_STACK_OF.pod":"2264e47f3df47fc20d335fee6452410cb147064f315d8f9b0547aa5d9500f198","openssl/doc/man3/DES_random_key.pod":"7f989d0d1f18f8891f6a43f29351370159b16bb4624c8c3510328aab8b95266d","openssl/doc/man3/DH_generate_key.pod":"9bb9916b07d22a2b6f41c7c3103afddb0eab5601ae9864e6dbc7b0d323836ac5","openssl/doc/man3/DH_generate_parameters.pod":"a81b0968f27e40faec8551fa288d5dd618ee21dfb65faf97c579da66b0ebaa8f","openssl/doc/man3/DH_get0_pqg.pod":"a021c04f8cf4c655616a65dd7f34728565fa51b66f1db1c4edfcc553e938e5b1","openssl/doc/man3/DH_get_1024_160.pod":"64124df4465d5d3eef28429b46699f657d574200d50446d9805d574f83a86811","openssl/doc/man3/DH_meth_new.pod":"eec607ed0e3516870ed3a441bf9711cf5cdb6fd1fd5afa9c054ff39f35a03044","openssl/doc/man3/DH_new.pod":"26ea8071e356b98e512cff1e3a7409bd1089b2018638ac57c9f18899ed85b92d","openssl/doc/man3/DH_new_by_nid.pod":"47ce456b14a300c0fa4ef41b7c7d3a70f3a4738d129586d4dc63227f0a2a77fc","openssl/doc/man3/DH_set_method.pod":"7947122b8228ea23a388f0e1bf99a8f5a9ea1feecb71d7da54f42e92d653c05b","openssl/doc/man3/DH_size.pod":"95434d66fd4e4f680384c2b9b10dbcdb10f5bd8f1c5ba6ee7bfe8d1c66686429","openssl/doc/man3/DSA_SIG_new.pod":"607f8aa941508739d1aba4154f6b5e3232a9cd71eb626e58839819996f728fb0","openssl/doc/man3/DSA_do_sign.pod":"e5071a56133f1da4aec76b8548885f9133433fc9c37a24de6ce0197efeeb5b69","openssl/doc/man3/DSA_dup_DH.pod":"6f81979049c4fa72dbe3bec84ff8e5fe72180da021e88cb4e76e132a8f3ada23","openssl/doc/man3/DSA_generate_key.pod":"9246c4a9351f072ec084b6c36bfda48b41dc6d5bd3dfd46c9a4c76b7775161b1","openssl/doc/man3/DSA_generate_parameters.pod":"e7f7686f7ae2c04411625e7eee092429a0a79a1c641269d292d4f4657e697aab","openssl/doc/man3/DSA_get0_pqg.pod":"a2d2e564ea441cd476fb27183c7a933b533002d1dd6018f0974be7cab08962d3","openssl/doc/man3/DSA_meth_new.pod":"bae93a4a147aff44202d1cbc65f07d83f7623400f1010ac68c7aa82583e057a6","openssl/doc/man3/DSA_new.pod":"c3afb59163fbee4bd561cd252753f762cda3245c99f72b9bc16f287efa3009d6","openssl/doc/man3/DSA_set_method.pod":"4adda74b7c4add094ae47b4bfa262ffa3ac5d98cc924a8093d98832cc50ed949","openssl/doc/man3/DSA_sign.pod":"f0da4d4d0cb32e83d57f0a75dec6a18e89a9d6ed0ec8763e5f95bfd95dcca869","openssl/doc/man3/DSA_size.pod":"ead3b991b833a03cb5025a8c62a579d429fd46c238f029116ed63f712d15850b","openssl/doc/man3/DTLS_get_data_mtu.pod":"dcc951c6a80f647362b6f57ad3d5d1b394d71f5d2d1f0713a564959a55a352a5","openssl/doc/man3/DTLS_set_timer_cb.pod":"6961cb7724044d54c1f545176fbc3a73d5f1c22f02448aed592dba5de7618be4","openssl/doc/man3/DTLSv1_listen.pod":"5d91cbd45490fc5713b5201b6b81e3a59a36edb81ae82580e3f2b04ccd06954e","openssl/doc/man3/ECDSA_SIG_new.pod":"a4db3f3662b197438490faa382a13223170750b85db8be9b9a6a86a63a1444dc","openssl/doc/man3/ECPKParameters_print.pod":"6a319d10c2d10a69a99bcc53adb912023639882d79b7ba6f63f4b06808e49c21","openssl/doc/man3/EC_GFp_simple_method.pod":"468f55c16a4c3ebcc4980e118e365ce5e669551844374b9886a1432069a87412","openssl/doc/man3/EC_GROUP_copy.pod":"7e7a51864e469862da38fc83ec794bfe51a80689a34a20feb2409854b737dacb","openssl/doc/man3/EC_GROUP_new.pod":"201d6eace6aed85bd124ac2c2482163936960872d6b6b06f1ae1501ebad8b7ec","openssl/doc/man3/EC_KEY_get_enc_flags.pod":"68b5b562fd8b3d307efc8f2e8d03abc46921f68357fccd98bb4889bc791825e0","openssl/doc/man3/EC_KEY_new.pod":"da19640a90108255a9a4f476229c3d3b6b42276c1fed3b31f3792fa6e5f6b17d","openssl/doc/man3/EC_POINT_add.pod":"62a1ed0d32b4db17808e8f4f87b3f7881e20622fcc01049b336723e50f5d74ac","openssl/doc/man3/EC_POINT_new.pod":"27a1d9ffcdf3ee7daa69aefc50faa34143224cfec09fbff6202a5765db38bf01","openssl/doc/man3/ENGINE_add.pod":"bc62aad8f3da274e1957b4b7823663f90d3094a4b8a1b67406a08ab69f864d69","openssl/doc/man3/ERR_GET_LIB.pod":"6ee80946e3c3f2c4f50f4a8e73a55e16738923dab0f9cccbcad13aa415d20756","openssl/doc/man3/ERR_clear_error.pod":"a788808dddeb9993eef2963b9fdc00da9fdd77e6b9f841b95c0b9c4e5ad8e4a8","openssl/doc/man3/ERR_error_string.pod":"b8580a4083e3df8b4e77ba89728e765d52140b6020b71165e35e44437010153a","openssl/doc/man3/ERR_get_error.pod":"d0c803ed299e58019dcacdfcee791464965fb01456fd3ac11cf2e3a195cb75c7","openssl/doc/man3/ERR_load_crypto_strings.pod":"6424ee5f48c7af1621cf49231bda12591b6baa40da263d412d9bb3106ff2053c","openssl/doc/man3/ERR_load_strings.pod":"dfa48d3fcff497e978042f107dfb926b76aab7acd7bd0f496eada4f8e067c382","openssl/doc/man3/ERR_print_errors.pod":"34c86302401fc249cc967e429e6cc754445d4973ba733b7c44c7bb77e9ac72a6","openssl/doc/man3/ERR_put_error.pod":"d3e07bd8beb65dc939c3feb1c6d19616c3f909b63e0157cbef691c22217e4b17","openssl/doc/man3/ERR_remove_state.pod":"8fd62a9dc14e5d7ddba087450b2ec3d15724399dd64ed32c3d1852c35461301f","openssl/doc/man3/ERR_set_mark.pod":"d8ec32e78ff45187e3a23d56e2659d0db40178f0d7af192f4817efc9573e394d","openssl/doc/man3/EVP_BytesToKey.pod":"d6546465d79d7ae7070f6364c55cb88d751e7430ae9eb2e24858f68459e733d6","openssl/doc/man3/EVP_CIPHER_CTX_get_cipher_data.pod":"72cced6510bbe15bb5f197ea1ff98a36c79e46212a296d8db5daf42d454bc420","openssl/doc/man3/EVP_CIPHER_meth_new.pod":"670bdd4d76065209b7014ffd3f63dc9ca3443fc9328eaee70662e370cb9b0f98","openssl/doc/man3/EVP_DigestInit.pod":"777ff51cfa9174b4c17c8cf60559ba5d170e24fb9a86ac842fc8e78576a40fe0","openssl/doc/man3/EVP_DigestSignInit.pod":"4938d5bda105167f47de5c1fd3d1c66deaf0230754512c8496c100e2b8324b8a","openssl/doc/man3/EVP_DigestVerifyInit.pod":"a0535d3012855d5ca2ba45bc7f62234f2c031c12d02cf90af9f6a8d9cad3e688","openssl/doc/man3/EVP_EncodeInit.pod":"71e10220a926a97cc6dd5766d01207a074a203338bb961f7da64192f493b926f","openssl/doc/man3/EVP_EncryptInit.pod":"7204e2f910b2067dbc517ae3cf53c9591658767c7180047d492c1b3cc4976e31","openssl/doc/man3/EVP_MD_meth_new.pod":"7fb5fdea0aa29c4e348dd42a8544d8c4ee54676b14efed888b73e5a4d6369e7a","openssl/doc/man3/EVP_OpenInit.pod":"109d61803c1785b17c4e2592c804244a8aa9fbb57ddd52ce07009f67993a17fa","openssl/doc/man3/EVP_PKEY_ASN1_METHOD.pod":"5b4d6c9c5ba2924d0aa34d2e1e929936fe9a36373496960726adc0179602ab15","openssl/doc/man3/EVP_PKEY_CTX_ctrl.pod":"e9c09ebb53b26780418617763e45c2d4a036f25087b95fc72b04df06f538005d","openssl/doc/man3/EVP_PKEY_CTX_new.pod":"33f4660ed2843869bb2a5a3100a3103d980c9f89ded89cae7b2039b5373a9e2e","openssl/doc/man3/EVP_PKEY_CTX_set1_pbe_pass.pod":"d13281607e846b72e51a9999e7e5269ef8f72b006fe1df385cb74a50a99861ce","openssl/doc/man3/EVP_PKEY_CTX_set_hkdf_md.pod":"a02969e04b738e3867bc976d30726f42083a192a0bb03751527a9187734d3dca","openssl/doc/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod":"37f8bc105e30cb0e08dec4080dddc51ac681b678807731252a75e7fee6f46f85","openssl/doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod":"9b8b0a726f5805ca8b05b4ae0999b4a5856a3e109ef5d956da466f32ed039192","openssl/doc/man3/EVP_PKEY_CTX_set_tls1_prf_md.pod":"ca849639096c80ca2a71781a72e5cfca8302d037912f4905c213ab748afe95cb","openssl/doc/man3/EVP_PKEY_asn1_get_count.pod":"8e4fdf6685bc4bb39944dced1b4a48d88bb129aeaa5da9ff93b420978805a86c","openssl/doc/man3/EVP_PKEY_cmp.pod":"ee34265cd2b481820820cdf4b0d48f78ec8d805c754e2c882a02024683fea898","openssl/doc/man3/EVP_PKEY_decrypt.pod":"7cc2126855283018c7f213c1a02f7d2f31cd3c989f08f181cbe6dda784063c6c","openssl/doc/man3/EVP_PKEY_derive.pod":"b2cc409128eff8d8846677b931b1c6089e70103aba8c41449356e0799428a848","openssl/doc/man3/EVP_PKEY_encrypt.pod":"7966b6453b2146b91feffe453f385001eeecee78d3144a41cd9104b3c48ccfb3","openssl/doc/man3/EVP_PKEY_get_default_digest_nid.pod":"8007c64183f80dbbbe2914832ca33b79de0c6d3b8452ccdc5c853d1115bc75ec","openssl/doc/man3/EVP_PKEY_keygen.pod":"e31f91a808aa9c1894da2adb4fbc21e80a891c8e33c438da3cb15687bfb0e448","openssl/doc/man3/EVP_PKEY_meth_get_count.pod":"9636411e438dd91940c29da59bc102852e1623226bbe96f2a88959650b6a8295","openssl/doc/man3/EVP_PKEY_meth_new.pod":"da2a63792e8669d354dd6aed5ff0896677d51c3aeb0d2a710394f894e57cd145","openssl/doc/man3/EVP_PKEY_new.pod":"dba614cf8efe02b58d2a854d77d443ea3f11835b65a92a3e4a4314cb358f4306","openssl/doc/man3/EVP_PKEY_print_private.pod":"a2ef795f5dded00e0e4fa12d99d3cc1258e06f897f7c3c0295f23e18db553b40","openssl/doc/man3/EVP_PKEY_set1_RSA.pod":"0c8941fa8e5caa3aea611e56a14aa406ccd50292a1d357343621baf7385f0dce","openssl/doc/man3/EVP_PKEY_sign.pod":"ec1275468506aeefcb92b9c5921c041c011bb47297b1ed4f0b0ddda4a75aaa43","openssl/doc/man3/EVP_PKEY_size.pod":"2058f9c6a888f90376896b81f2b8eebcf1285f25dd6c1c69105d69766c033f07","openssl/doc/man3/EVP_PKEY_verify.pod":"041224bf1b8f7a6ce50bbfc101fb4f754ce77956da1a24b5b78436d1e3c9af2d","openssl/doc/man3/EVP_PKEY_verify_recover.pod":"9ab8f2248459cf32040b59c24abe9210d2119d0092ae1bb61059e374618e796b","openssl/doc/man3/EVP_SealInit.pod":"2c0189305828b2ad23c3e725dd1d9859cc291625fc30f65641fa5236bd758c33","openssl/doc/man3/EVP_SignInit.pod":"f403a331b370723d754cdb0be00859307113f82a91d42f8235c48c2b2d7816e4","openssl/doc/man3/EVP_VerifyInit.pod":"c1c831bba68ea606fc2b78bcb4a5f04a04c177661019a3e2af68466a7e069976","openssl/doc/man3/EVP_aes.pod":"98ba2680248a394df2748ffbffe5c1fc521a2c1b8916ffc03ee5457ce58edc05","openssl/doc/man3/EVP_aria.pod":"4711e2bdc8e258e626f59be8787e8af9c32b5dc7fc52a48663eb19c4026eeda8","openssl/doc/man3/EVP_bf_cbc.pod":"16fc065c3b43dea4e0ba1c90e6c820d0dd8213389022fda742c89c9b81974518","openssl/doc/man3/EVP_blake2b512.pod":"ce80eda0dac29f0a70260822648bb65f9d41d754a337f7e1dde7044194704e88","openssl/doc/man3/EVP_camellia.pod":"3e758556d49e3e4287ea87e53b98e267cb5eb427e486c9bd0d840610088ee961","openssl/doc/man3/EVP_cast5_cbc.pod":"fe07c76b5030261a3f360098e17cdcb870dc45c4a7192b30a16adbdeae248ff1","openssl/doc/man3/EVP_chacha20.pod":"8b1c51f6ada9bbc2bb4ef6f21def9a04bce1985bf5ce5df53e334f9105d10276","openssl/doc/man3/EVP_des.pod":"1a7eb48fec0e81c132ca35e0311aed364d21518dba956559a3b154b089ecd324","openssl/doc/man3/EVP_desx_cbc.pod":"2169a824f23f859e1f60a410a2c981958b291a2b512701b2806c2eb272c51763","openssl/doc/man3/EVP_idea_cbc.pod":"17ef6e19964a0aae4bf206f858d67e2d88ca1ffaebdea712fd1e83fdc697e577","openssl/doc/man3/EVP_md2.pod":"bb9131a736dbb0c49e8689c27ccb3b5c2f8ee317e2f87f7364d0be8874edbfca","openssl/doc/man3/EVP_md4.pod":"29475e538f4d8e8b437209f182682bea9a828f23ec686bf56bbde2c6d3bbf14e","openssl/doc/man3/EVP_md5.pod":"9e07eb7d806d6f0863eaea694d6b8c43de4b23eb76807b8fe7a47cbda2039375","openssl/doc/man3/EVP_mdc2.pod":"e21a8c709077cb86fb5651c221a10f79ab0f6db5633de2f3f32a85c13f252e78","openssl/doc/man3/EVP_rc2_cbc.pod":"b2bae952b3885653d15e0245488f8499a97c8e961bc33bc0d5d97eea5c914acd","openssl/doc/man3/EVP_rc4.pod":"523c9b62ff12f932232e225d4043f303ee22f6feab266582e77db4e548397cd8","openssl/doc/man3/EVP_rc5_32_12_16_cbc.pod":"e300f8941d3e6692a3b7eac1fbf34ae9d1e3e8b4a40f45b08c253ff0945ab9fa","openssl/doc/man3/EVP_ripemd160.pod":"4a7a55483a4a12ddcb76662325a4ea15af981c3a9c2cf0dda2755271487efe8b","openssl/doc/man3/EVP_seed_cbc.pod":"cd7d186acde78bde571b6688b9ceab6e21f48a3cf267177a66196fe41240ddb8","openssl/doc/man3/EVP_sha1.pod":"4a99e8c41316006f3454f9d08958fa5fb2586a7ab0ff7b512b198053c98bc764","openssl/doc/man3/EVP_sha224.pod":"c8807d17df0f691a71a0cc1d443b112a582d61dbf5f0b8c0c29225c1f0b74bbd","openssl/doc/man3/EVP_sha3_224.pod":"a301b85ef186554665cfd3ad06d78f2e88da5fe6c17bdc89eaee5a810571f373","openssl/doc/man3/EVP_sm3.pod":"d6ec07d83d0d76d3c30cae2f0ae9e9110e034b1572b9306d39ddc3c4e796f2e4","openssl/doc/man3/EVP_sm4_cbc.pod":"15ffea2c2002cd2787945dfee5fd9b27d217d19c6308f08f4cb631904c163027","openssl/doc/man3/EVP_whirlpool.pod":"f226d7bacf85f39017c84de58e3365e80e4adcf6ad72acd6a5bb10b06ab25665","openssl/doc/man3/HMAC.pod":"c82340e03cec6510179abebea23b26ca884ae150c7852a881c2f266f72c66036","openssl/doc/man3/MD5.pod":"39e49ea8b629f3bc74059cc3e690cda807bb9280ced796174a59fc5c3a7e3c9d","openssl/doc/man3/MDC2_Init.pod":"7486153080fab599338d10a847391f0991953418f011c05e3b68a3c49c228183","openssl/doc/man3/OBJ_nid2obj.pod":"f540f2c98e54c588fd7c0e3c4f2de98dcdf93f0aa82c31265b70f5f333ce98eb","openssl/doc/man3/OCSP_REQUEST_new.pod":"741beb80de05b151220bcc435054ecfef24511905e1db48243c0931fb8bee14e","openssl/doc/man3/OCSP_cert_to_id.pod":"ef4df2aaaa50749484720add4dfd62c898d274b420d5e5f8400b16621dfe928c","openssl/doc/man3/OCSP_request_add1_nonce.pod":"75a6f7ba5905afe3eb9f585eb0b10deb39b2d0c2d8f8d806cc78add8c3b8c001","openssl/doc/man3/OCSP_resp_find_status.pod":"24263deae0e9868da649489372c23aed8bd2f83fa591802fbc5cb8ceedaad9b4","openssl/doc/man3/OCSP_response_status.pod":"dcc2e6a0038c739ac8b1ebbea4e08f72fc15e728963ef1442556a3661aa3035c","openssl/doc/man3/OCSP_sendreq_new.pod":"3620c6ddf361cca9d331b0d42305b5d750498afec028b42576008ec859f64088","openssl/doc/man3/OPENSSL_Applink.pod":"a0db63d4885f4e0f0de231ca73718e6a685129dfe51a003cbed8baf372a3a06d","openssl/doc/man3/OPENSSL_LH_COMPFUNC.pod":"230bd99ae26ad48907db207950005f0b3b75fc906c7e442f5c84db5d518879d3","openssl/doc/man3/OPENSSL_LH_stats.pod":"3ed8b9be73fde6823b5763b0f11aef4993a78ff4a48764d4811662db65ed4cb7","openssl/doc/man3/OPENSSL_VERSION_NUMBER.pod":"5a03bd0f8bc83dbfeec72c59c4b81ab7f1d8a82180c4b31b4bcaf6968da00baa","openssl/doc/man3/OPENSSL_config.pod":"f26fddf66589d2ecdd405c2d7a94d0f63e23996ca2dd8a3cdd1a3c97b9b695c5","openssl/doc/man3/OPENSSL_fork_prepare.pod":"e41b80f3cd0bfdaa05706dcd32403c164300fffea6ecc9204a4ce5262999b847","openssl/doc/man3/OPENSSL_ia32cap.pod":"54fc46befd3c081a2a48bf97c87f7914d4e4e226948497111d84b385d5c9ff3a","openssl/doc/man3/OPENSSL_init_crypto.pod":"20a6925f66a4797d1ba1f6eef2ef70ef9ae140b9faf15b2ef8750d899f9e02c7","openssl/doc/man3/OPENSSL_init_ssl.pod":"e658828fa3b9d467a02c771411a581d9a281f39ddf6231ca5c609a21acd53104","openssl/doc/man3/OPENSSL_instrument_bus.pod":"dcf311426ca6b4e4ea3502d34c72aa0e897f792389232ab06fcaf3d7833623c4","openssl/doc/man3/OPENSSL_load_builtin_modules.pod":"2d874f7b5f90d6515f2af29dd6ab3a4b1b57b4a66517a1ac606285853257f9e5","openssl/doc/man3/OPENSSL_malloc.pod":"06d40e33c680e5e35745dbb39b59737a01f5a43c8d430fc1e65510bde18133a9","openssl/doc/man3/OPENSSL_secure_malloc.pod":"da7db09b14e8c5aa70f0870393d145bc73d24667aef3b2f56af9dacef0ad72da","openssl/doc/man3/OSSL_STORE_INFO.pod":"848862de44d58e3641fe9699967667d5375f6eb2486edd21753aa5055a3ee9e3","openssl/doc/man3/OSSL_STORE_LOADER.pod":"c939ed2132cf112f722635934734334e7c641350ff676df4574db69eb2c59aa0","openssl/doc/man3/OSSL_STORE_SEARCH.pod":"74f7cc9d63823af599c0efa126a21e6d42842efecf45e4b093e3485c1a97d07d","openssl/doc/man3/OSSL_STORE_expect.pod":"c4cef70674633017f3b9735b9e4a4eed07ed4eaead847337ef8c0d94d65472c8","openssl/doc/man3/OSSL_STORE_open.pod":"1d2a045839b904c32c2cc588f612996de9fd341d8ba464e57d3bf8c5af07a6cd","openssl/doc/man3/OpenSSL_add_all_algorithms.pod":"49b86f88fcd2bf4182c98477fbcc93ba08523d6994b922ccf77ed8ab8fec40bb","openssl/doc/man3/PEM_bytes_read_bio.pod":"48ea0c0bc7e4cd4b0a8a936f90cec50f11337f4a60f7c80ffc4fcfa33a60b877","openssl/doc/man3/PEM_read.pod":"1bdb0e48e0faf6e41f6f8b0507bac01d27f6c8016bab38c2e7958f08e980b78e","openssl/doc/man3/PEM_read_CMS.pod":"ecd9bf55b556a4e35878b646432263cd8838b4f8db1301bd3fde77980c1242f3","openssl/doc/man3/PEM_read_bio_PrivateKey.pod":"b8c09381346c4d8baddc9b29bd071d8491ddd019e260ccff8a0f6f152bf61fb9","openssl/doc/man3/PEM_read_bio_ex.pod":"71c78d14f7d2a91ba384a46ff374db7474309d59cba5fe985526b5e3039a1fa8","openssl/doc/man3/PEM_write_bio_CMS_stream.pod":"26fcf66cf1d2efc12499ea44ec99359b742989d3f7bc303128bcde7e4936c9da","openssl/doc/man3/PEM_write_bio_PKCS7_stream.pod":"0fad1e10061979328ef38dfcce7acd18c1e13a233c899887bb71e8a0474f875d","openssl/doc/man3/PKCS12_create.pod":"81b7f6be4c979f75c29f5af3e26de09a2325c83bedf979d3d0ab2fa1370ee1b8","openssl/doc/man3/PKCS12_newpass.pod":"4152f50460501aa543dea8904a41ac6bd057f14a5616246dedc036c5fc1b9898","openssl/doc/man3/PKCS12_parse.pod":"d922a981c27e69635072126e8a7e92a40eb0cde7382755d19348bdb6b0e32573","openssl/doc/man3/PKCS5_PBKDF2_HMAC.pod":"3877fec0e7d6f9ac05b0a9cede809f7e863e9bf24a595ad1c21c67e07f267d83","openssl/doc/man3/PKCS7_decrypt.pod":"222f4ddc4b049f8fe7fd9985f792ad456e4b562f16218e72deb45d20ca589654","openssl/doc/man3/PKCS7_encrypt.pod":"20c877ef00fdc262dbaabb7515246fe0594954fef9b0e5507c39765f4002a2b0","openssl/doc/man3/PKCS7_sign.pod":"572c1fef570d56b12cf5a5dd37a945002f4ee405c9ad26bf0e15f598be188a6c","openssl/doc/man3/PKCS7_sign_add_signer.pod":"56a91263508e8819c0a5f6b165ac98316ec4c8aade010f5a0862238dff48245b","openssl/doc/man3/PKCS7_verify.pod":"ae1fbcffa9b806f09e01a8657d5ed72f5ef246fb60702537e429b42fa9747e3f","openssl/doc/man3/RAND_DRBG_generate.pod":"17d2a008a9890ba1cb494900c248e5da1e886a11af3a7163ebdb67d28505cc6b","openssl/doc/man3/RAND_DRBG_get0_master.pod":"b17158470b2a4bcdc111a95b99fc86a33ee35c6b6e1a7cabda2c0166228c4673","openssl/doc/man3/RAND_DRBG_new.pod":"329b6237144c2731bae481891961d488cd5411186f9bb1f34eaf8486478d2e37","openssl/doc/man3/RAND_DRBG_reseed.pod":"26a8967c199d4f6c2290bb8523dae044242234462481b932bf7f53de7e881c56","openssl/doc/man3/RAND_DRBG_set_callbacks.pod":"cdafd1922ac7c7bf0ea6c9f7fef9133a693319f9687b1956daaa476199c9e532","openssl/doc/man3/RAND_DRBG_set_ex_data.pod":"b07169d49e6ac993e13b3f885c69895fca7d76946df5c0239ddeed77ddfdabc2","openssl/doc/man3/RAND_add.pod":"335e0955afe9ea0dd7875d1d20acd41b7c064752ce8664b094d2baf71c928b22","openssl/doc/man3/RAND_bytes.pod":"ca93ca9f1f3291a7a052d611283f52d677edd34cadb94b98d29f84a2d0ab3f20","openssl/doc/man3/RAND_cleanup.pod":"a97d7e4d8284c9f14d18ff52daf7a3334562dcc37e9be32667cb14e12a6b3051","openssl/doc/man3/RAND_egd.pod":"2bfc028cb0577b89c295b3f9822bfe0344bcd1298d7ba6a37076517c33cb3f86","openssl/doc/man3/RAND_load_file.pod":"f4dd213002d26ae4c1b11e18b89eb992e0442d7ea9312d8e2d5d2a19ce74f317","openssl/doc/man3/RAND_set_rand_method.pod":"7c3ebec8ad5acc03b274da7215e272889f7696800d9dd5345bf1b18bb72fce6b","openssl/doc/man3/RC4_set_key.pod":"3934e2567aada5692824f9466929d3b0fff3a6eab49c722318629a670c1fecc5","openssl/doc/man3/RIPEMD160_Init.pod":"ea958a1b7a02f92bf69ee70262d92d499eb4fe09132491eaaa5ec47721cd2fee","openssl/doc/man3/RSA_blinding_on.pod":"f5178d4d103f9c4afa69f4236707e3b43ed25a650628816a64938286577b825c","openssl/doc/man3/RSA_check_key.pod":"c07fbab30e1f043c7cc09319a75dce5b7b9856ea8192191f1b88b416c6f18d8e","openssl/doc/man3/RSA_generate_key.pod":"ffa62bfc47c407ae8f531da4ebffd3ddb19e14502267f9edc55105966f130840","openssl/doc/man3/RSA_get0_key.pod":"58cce39081cf2e6756a8bba145e96c23724a3306357bffe7d1960039abb6ee90","openssl/doc/man3/RSA_meth_new.pod":"c9ac9009502b8ca0540637f10ffeec689ea5b4ceb5c8ce9bfb48e783f2ffa54e","openssl/doc/man3/RSA_new.pod":"bf80bb587fae400c903cb970c1f3a7497c7b213dce4fbb94ec4faa03467e0dd1","openssl/doc/man3/RSA_padding_add_PKCS1_type_1.pod":"1a9efdca67fb7b933f9728128db08ecc84b83dc4886a6b8cc18dc7078574f838","openssl/doc/man3/RSA_print.pod":"4169f2d929a5348c3ae8db491277f232ef3a877d7bc9b400b3df13a707537b29","openssl/doc/man3/RSA_private_encrypt.pod":"38d57c8998a171586d098f0cdb3ed9eb9baf489b1b5564501a8a092418f5b8d0","openssl/doc/man3/RSA_public_encrypt.pod":"3ff5cdd751df2b5555f220927828481e57d310e5b875f6cce1ec2670a4d3debd","openssl/doc/man3/RSA_set_method.pod":"d7a55487bbe6dd5eeea29adf3ae3c05dc62d4bb5d774c45b2c85a8f53a95fd3c","openssl/doc/man3/RSA_sign.pod":"8f59b240737d04aad9aa8cb35a1bc02f88824259f607a2345c74a8185fabafba","openssl/doc/man3/RSA_sign_ASN1_OCTET_STRING.pod":"d3b6aec65ad46576bc4c15ebd6f0ab08db9dc86a96752c19442dc5b6a34305aa","openssl/doc/man3/RSA_size.pod":"02033009b3f2d52145a90b70c20cdb6b9e151fd0a5ae1e40a3fba09ff8677e60","openssl/doc/man3/SCT_new.pod":"b506b791dc1c6c7c1e47c8722f53c6ce51df9c60bc81da759c8bda2da83e7c32","openssl/doc/man3/SCT_print.pod":"c5dfd5c5f28585b4fd8db18cb9ce66ff582d0e8a3c12e4f521cb1f27c02364da","openssl/doc/man3/SCT_validate.pod":"36106502782bc9d2a512902fada06a7eeabf27068cc3dfdbc918799e2915d20b","openssl/doc/man3/SHA256_Init.pod":"0c816af790b1d88e7a3cc708bba420ba265c53b7a0eab31437c0ba77401c57a6","openssl/doc/man3/SMIME_read_CMS.pod":"3ac16031a274c4095c664106895c7ac57f9372b5040c2e2dd52d6970b7b08dcd","openssl/doc/man3/SMIME_read_PKCS7.pod":"5a7a5660105501d860fe63ad5c8566b980f2a01d269f5845b2181149e199de04","openssl/doc/man3/SMIME_write_CMS.pod":"ea711d47b144ec2d7331c1f50553619007315f547f8b2f7661a845d6958d3214","openssl/doc/man3/SMIME_write_PKCS7.pod":"71ffa71cfcdcccd671d6bb0f3baf2ae7f966fc2cbe8dc85be1438b8402f5c7a8","openssl/doc/man3/SSL_CIPHER_get_name.pod":"c587a7c6f52ee7a530a229132b5881c2da6a5ec620fbd69ce5d8f7ca0a618d68","openssl/doc/man3/SSL_COMP_add_compression_method.pod":"9b59a012d658b140d2687c9911230a451218ab4e0370cbcfeb2d732d5cea910b","openssl/doc/man3/SSL_CONF_CTX_new.pod":"31027f827a134015230703da9c56f5c62440c3ab8b09d4d112559a1f8d16cdc8","openssl/doc/man3/SSL_CONF_CTX_set1_prefix.pod":"71260ff34ff577c45d1d903c4ce377d3913b634a825bc528691977b293777d06","openssl/doc/man3/SSL_CONF_CTX_set_flags.pod":"e188f2696c62e16e30e6f6d71e44503a2e1607c7a4cfed20a0203d08f5f75d22","openssl/doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod":"ea231fc93bd4df19b54456d3bc7f8429a34f3c57eded62515ae4c91397f97cbf","openssl/doc/man3/SSL_CONF_cmd.pod":"1cde0a434e7864b7bbcc5071c900021ee794e716be8e574a79f5f55defb10614","openssl/doc/man3/SSL_CONF_cmd_argv.pod":"9d12224f2bc09dd67737996da4dbaf727cd2e6182b6e2db58d9033c7c2fa64af","openssl/doc/man3/SSL_CTX_add1_chain_cert.pod":"3ffb34b36b7b345a91332399af9e45c387218e8c4ec451222688e3f763a809df","openssl/doc/man3/SSL_CTX_add_extra_chain_cert.pod":"0d2ee70099b5ec881535fb813ef553a7d0051de659ca0c2009f9a3e5e79062f3","openssl/doc/man3/SSL_CTX_add_session.pod":"bec5e3483ced8ce89a527c01143bfb8e7551768eadba6da3a4abe875220822e9","openssl/doc/man3/SSL_CTX_config.pod":"a2c5542cfffd35eea979b4e3d9902763ce1296b495611d40c60450e1ebf53e18","openssl/doc/man3/SSL_CTX_ctrl.pod":"b8b78960b3cef7b09b64ad14aeaad9f5e0e815cbf5cf973a91c7955dfc3b2272","openssl/doc/man3/SSL_CTX_dane_enable.pod":"a90ddd5809acd5ea1be2ca803450bfae5380a07278ce3e6107ca459554928361","openssl/doc/man3/SSL_CTX_flush_sessions.pod":"ce4a997e4ae4171780043fc86c9e82c18ba6cda6a9576f36aeb59c30140b56c3","openssl/doc/man3/SSL_CTX_free.pod":"6499830839485a4f82a5496d363dbced5087abc4739dce9aff6a92bfad444af3","openssl/doc/man3/SSL_CTX_get0_param.pod":"ced535f7155efe76a8e2beab42ff20dc9c2b2981db08b424c719ba6cdb341ec2","openssl/doc/man3/SSL_CTX_get_verify_mode.pod":"28a4dc0c047c2fb347e46e9a005f260f9227f4f875f2082c7af3d54c85fdfc48","openssl/doc/man3/SSL_CTX_has_client_custom_ext.pod":"ddddbd7df4fd974a749a70970d85461224d41c815f518a843c94d15320bd0a18","openssl/doc/man3/SSL_CTX_load_verify_locations.pod":"21022d6f47c6ec5f7d6d76761fa8987ca136c7d782861707ced2d929089f5b91","openssl/doc/man3/SSL_CTX_new.pod":"dcfb546e8a7b702428a85ea480977995223ae2188c1ed3d1e24cd27804c89aa0","openssl/doc/man3/SSL_CTX_sess_number.pod":"dbb65ae74b674838e50c26b912064ff3a2e4fbab74785c15dadb903fa43df70c","openssl/doc/man3/SSL_CTX_sess_set_cache_size.pod":"77f6adb29332bb212d117faf47983466aa60aa733f04dc3ee8f973253a5898e4","openssl/doc/man3/SSL_CTX_sess_set_get_cb.pod":"0d6136d9a75c15951ddb67610c7f08e67a7dc424115eaf9ad4035971e76b5771","openssl/doc/man3/SSL_CTX_sessions.pod":"1223bb83bea15d0a5357c8e6608b98e41c1f7b62036e2681c67745ca59cd8ba8","openssl/doc/man3/SSL_CTX_set0_CA_list.pod":"1932df3801f3767252d08544b125b14c596fd0d13a7f1633427a7030ada7cb03","openssl/doc/man3/SSL_CTX_set1_curves.pod":"e0ce7947080129badd5ed256ad6804b30ad456a2a0da697cdcd3f255cfddc563","openssl/doc/man3/SSL_CTX_set1_sigalgs.pod":"095a1160eb41fdcd14c6cfbac2498c09f6e98a324fcd0a377a6a49314c10f294","openssl/doc/man3/SSL_CTX_set1_verify_cert_store.pod":"f3fade7140c78d32bec69532d825a71fcf6272bf940d25f3eb404fb74742c944","openssl/doc/man3/SSL_CTX_set_alpn_select_cb.pod":"1cb7e5bdb3d7e91db5ad550e2d51c7490f3379ee3c8ed852d14ce4e2ec4b5374","openssl/doc/man3/SSL_CTX_set_cert_cb.pod":"53f7dc014eebf63a09d8d2dda05ef46b7a66a39e314c4064a3a2c5f5bf0496c5","openssl/doc/man3/SSL_CTX_set_cert_store.pod":"a4f850ae8ff976053e0ed7726e36d9072f0554f9281132de3227aafeb3db9f4b","openssl/doc/man3/SSL_CTX_set_cert_verify_callback.pod":"0594c50e59a4c11c807270302c3c325d39ca57fccdb82cb0e0bd6c34f4755b7c","openssl/doc/man3/SSL_CTX_set_cipher_list.pod":"3df94109693d91e9ffc145dacc23e430fab4b460c8c8a27bc90577af5c622fa1","openssl/doc/man3/SSL_CTX_set_client_cert_cb.pod":"022a0492b6e96568db2be53e08ad343e10c7b4fc67b3b5db541cd2f503dc1a12","openssl/doc/man3/SSL_CTX_set_client_hello_cb.pod":"44454b894afe8e07bf14e9af1aec39aa0c1c7e2cc252a9e3963737e62a336662","openssl/doc/man3/SSL_CTX_set_ct_validation_callback.pod":"60d38e73044fdc0bb7e7bbe16036a11d48a3e0ceacb3817f298a78706e687dc2","openssl/doc/man3/SSL_CTX_set_ctlog_list_file.pod":"f7593c7bdaa4b43b83e4922fcfa645a6217acfc74f896de09664f44fe4ed9ca1","openssl/doc/man3/SSL_CTX_set_default_passwd_cb.pod":"0ddaeee16505288ac676ce640dbe85335cc3249211689e83bd5082664cf77798","openssl/doc/man3/SSL_CTX_set_ex_data.pod":"910c37abc33c0590e8c4d7f748aaf72c66f0c9032e8754051de8c359b507a32f","openssl/doc/man3/SSL_CTX_set_generate_session_id.pod":"75802eb57ed2d6d7f791a6e68aecfb010e1d625af02ffc2d764f49bf02e940f2","openssl/doc/man3/SSL_CTX_set_info_callback.pod":"58c7cfb0d2119327ac0c43653884f0ba6b93c5d5855392ee4f954d94cd335f72","openssl/doc/man3/SSL_CTX_set_keylog_callback.pod":"7722c9aa8a61b1cdd1f0cea75ecc6412747f17a9bb348a411acfc3b225ba3e24","openssl/doc/man3/SSL_CTX_set_max_cert_list.pod":"86b5bc163b99a67ff72e5296a61f826809ebd764f976a1c3deb4996c1b3e62a1","openssl/doc/man3/SSL_CTX_set_min_proto_version.pod":"a0de5e8055272cc35044545d301cc7818fb9a86cad38e7441721ac839501f910","openssl/doc/man3/SSL_CTX_set_mode.pod":"ea3a8bee7989f77a907d60f4e62c200f366c0be856639513b137d25fb71e41f6","openssl/doc/man3/SSL_CTX_set_msg_callback.pod":"87c10f79b408672cf15e6ce75e1c08513609867068bb4caa6c49b7e72d731c39","openssl/doc/man3/SSL_CTX_set_num_tickets.pod":"e91460e00d1139b4465a6e5604a8de0c824b2d1928b926404d7a344f1dc36727","openssl/doc/man3/SSL_CTX_set_options.pod":"36cd07d554a66cff5a07f7f8f2b5cf2157d5e008b293e59683bd29bbb013115e","openssl/doc/man3/SSL_CTX_set_psk_client_callback.pod":"8b12f99d32fffccebf235434b19b5f1211f6de42f08c87371dd15c6322dad3cc","openssl/doc/man3/SSL_CTX_set_quiet_shutdown.pod":"e668e7c764ef67d66de7d575aab821d7c68ba95d383d40e960a316d28944290e","openssl/doc/man3/SSL_CTX_set_read_ahead.pod":"1f2b0e5a8a626271b65c9a53bf10a2edf5ed5bed3f46595c7d6ee280c61d97bd","openssl/doc/man3/SSL_CTX_set_record_padding_callback.pod":"cce583a3e71fbadb5c5729236a48639ecb2b2614acb9d23608e70f8278daf782","openssl/doc/man3/SSL_CTX_set_security_level.pod":"18d32a592444185272aac8c2261a94321d7a6568c7331a922e2f1f3f30cb36eb","openssl/doc/man3/SSL_CTX_set_session_cache_mode.pod":"64210089697ac6bc32d99ec7a41c1cb7c45b111ff427f6b1303a9afc288f0967","openssl/doc/man3/SSL_CTX_set_session_id_context.pod":"3eb931703e5919ce4228b9018d541973069a6b796e12eb795bff9f41da2a3a8f","openssl/doc/man3/SSL_CTX_set_session_ticket_cb.pod":"bc134518148ff374aa5a5bcd004678124bc76c2863e6153b6ef1b82fdcb10e04","openssl/doc/man3/SSL_CTX_set_split_send_fragment.pod":"6604503373b79017a6fe457c24f6a6f79b93073001ca41787856598cc48fd75d","openssl/doc/man3/SSL_CTX_set_ssl_version.pod":"06d8684f35d9b31f5048750d52dea848ad07a54a5c6efe883e35bf901e259428","openssl/doc/man3/SSL_CTX_set_stateless_cookie_generate_cb.pod":"9e3ba9fee42697428bb9e48d537b8f05d3c6c74cc0ac793db6615575df4d8662","openssl/doc/man3/SSL_CTX_set_timeout.pod":"662e5c1a201bb53a3fe186b5f0338e6ee122bd6183b6d0cacb02ec8a995cf305","openssl/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod":"e07e53bc49b3938a8844a2782c7a446780a23104f6f81de05f877c5516cf7acf","openssl/doc/man3/SSL_CTX_set_tlsext_status_cb.pod":"8efea6a299309aa622a1a35b272e6a9fe6f2cf31fe3ebcb1faf4bccede1f1160","openssl/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod":"4ac6f1b07bf6baa5a21f799a15dd402b7063b0369c9212b72fed925d762d261c","openssl/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod":"49e00bcc3ac93f10bb367e2ad300c676fd630505c3a1d314c52bfacd4276dd16","openssl/doc/man3/SSL_CTX_set_tmp_dh_callback.pod":"6ef9394ec04927bdb4ac3fd0fc5dc22e589dd5431215767b91ae8941a22776fa","openssl/doc/man3/SSL_CTX_set_verify.pod":"ac8a4987600f41b06c9d03f8062c904bb1c9bc5054c34e2107efb32da8af0988","openssl/doc/man3/SSL_CTX_use_certificate.pod":"ad02bc374ba5e5bf2b029ee5c8043abcd60cc50811452741dd9f0d5e94c76d31","openssl/doc/man3/SSL_CTX_use_psk_identity_hint.pod":"ff25874925a52807e773a15db1f92570d23f9b22a7b4a4a59525d0bf20bb878e","openssl/doc/man3/SSL_CTX_use_serverinfo.pod":"0c59baa6ddb81bc09184a7cd7426de81c9d38e315e93c48dccba09a00a2dd934","openssl/doc/man3/SSL_SESSION_free.pod":"2b920d74e18f2ed8805575ca0cffdafffea2452f79449be9e8e23fac370b8125","openssl/doc/man3/SSL_SESSION_get0_cipher.pod":"7fbeea414a5c74a6682ee0239152ee09091e210e840b7365576bb751fd7af0f7","openssl/doc/man3/SSL_SESSION_get0_hostname.pod":"1e81dfd8ebc653b6d4d4cdde0d15967f7eda6c17d08b8d4437134c4be279af54","openssl/doc/man3/SSL_SESSION_get0_id_context.pod":"ef11a0f1335b2007fc960520d91a3df1c9ac2e59675e6cd1f53bae02a5da5616","openssl/doc/man3/SSL_SESSION_get0_peer.pod":"133d6ae6ccefa1cfa57fca7e1c6952f5ce1cc799c6d63e0584265980a6237505","openssl/doc/man3/SSL_SESSION_get_compress_id.pod":"07fb8cce6c50b966b66107ac36c22c1b94777c1a99b4d5a43f61e359b7722bb8","openssl/doc/man3/SSL_SESSION_get_ex_data.pod":"8b97be70166cf27a451c189c3d2767bb1c9b6b1e9f2c6b02fe7b340dbb592d1d","openssl/doc/man3/SSL_SESSION_get_protocol_version.pod":"cb70d67a1cf5f976d53b95ace040d4e19a8dbf6ff24f058a3a82637ea36dd782","openssl/doc/man3/SSL_SESSION_get_time.pod":"fef94d441fa1265ddbb54b6af2a7bba833e712301c671d4f290a1e16a8214e68","openssl/doc/man3/SSL_SESSION_has_ticket.pod":"529bd51417b3373bb181f10b7ad17afdff5a49c1e179028cc6d7751c499da73e","openssl/doc/man3/SSL_SESSION_is_resumable.pod":"396c988fda7bc03cfca63f908a7d65aedf4a0f1e95cc9e7c97b35732d647748f","openssl/doc/man3/SSL_SESSION_print.pod":"908e234e2e5414cc1f7fe239506c42e266e9a1dcf7a1fd51583a5b8f6daf7ca8","openssl/doc/man3/SSL_SESSION_set1_id.pod":"0c89d29765a4be61745251be6ec0f297e636e975b690bac4713db1ff8980d1af","openssl/doc/man3/SSL_accept.pod":"394d5c0d4f87b997e687aec50614f6fd0818a4511d9865b98abe12475d9c3780","openssl/doc/man3/SSL_alert_type_string.pod":"e878e16b1bc3a5bc478fccad7bb32a41277dcd370d0b287b29b2227dad3f7b97","openssl/doc/man3/SSL_alloc_buffers.pod":"adfc9fc4fb9f13445d40f6dd2cfb6cb217dd5cbfad7684c12abdd419dea2f89e","openssl/doc/man3/SSL_check_chain.pod":"6f5767fa1a1aa97a348f7faa324d59180934a2d061799d5c67fed2d5f817fa07","openssl/doc/man3/SSL_clear.pod":"7e870b0990741451b75e1d4d8fa539e03bbcc7f9f1b719ce57156999cdc946da","openssl/doc/man3/SSL_connect.pod":"8b9de6c2aaedc52619681458275444db2c66c2e2b72934e2089d19a92fb91f3e","openssl/doc/man3/SSL_do_handshake.pod":"299b29a9fbfa7a48895e85a57690b32c5c9579db147362283b31108cffce3a1e","openssl/doc/man3/SSL_export_keying_material.pod":"2acb6d096b31ec8fafa653f7e87cd597127a9e689d65083f22bc384961af3d70","openssl/doc/man3/SSL_extension_supported.pod":"e676ee943435ed9c9148481468b9217e693fcf538e999d852dfdd2fbc07caee1","openssl/doc/man3/SSL_free.pod":"4f6cc5c3b6d7677295e8b89dc4de699899a3e760d5b1ce5b78d917573c0493ad","openssl/doc/man3/SSL_get0_peer_scts.pod":"e126b6deebc3f24c731a930c42ddc7e0dd6b76e89dc33266aa4349334967ae9f","openssl/doc/man3/SSL_get_SSL_CTX.pod":"c6c6bec96e375583efc447fede87876f97da5cd0b92e57f1d658e2b66c3c1551","openssl/doc/man3/SSL_get_all_async_fds.pod":"6ea3e4b338f225e31b83210727d4028d9f6a1bff056e336ec4401558302f07b8","openssl/doc/man3/SSL_get_ciphers.pod":"3487a64ec366c5aa925ba9e40ba254566449013275e3879a1c2e221f030023e1","openssl/doc/man3/SSL_get_client_random.pod":"0b4fcc3396b1d7cf97c69334a62847d9934b4dfc084d9e157fe046e7bf82bfe7","openssl/doc/man3/SSL_get_current_cipher.pod":"98c1792062e77cb76e78d9c8b7023d93ae282723615e167710ea0aa03a1c487e","openssl/doc/man3/SSL_get_default_timeout.pod":"7eff4e2d544b864b301e2a92f827dc5edf98a4de7c7e8abf7d6b988ae6fd13e9","openssl/doc/man3/SSL_get_error.pod":"14550520010f9d63fc097b4879893b5e1912148ac943ba76776c11ea81e566e6","openssl/doc/man3/SSL_get_extms_support.pod":"8f276a1fb14347c3590b919c0b5e6d65a204eadb15a88726ab094638b963440d","openssl/doc/man3/SSL_get_fd.pod":"baa009aa87139009071cce433eb3a09e3cb6e64ac2d952e6b2ce1131169ba39f","openssl/doc/man3/SSL_get_peer_cert_chain.pod":"8356388380053cb13b6e09ad3a471608a30a9e43bf7f2d87836a36b3d2fb55ec","openssl/doc/man3/SSL_get_peer_certificate.pod":"d601fcd0b6a607c1f2a77578cda877532fce9324dfb7def48ffadfb8ec4ce244","openssl/doc/man3/SSL_get_peer_signature_nid.pod":"d9e1ade1fa9509da21222af7e33257f1aeaff9c02cb0b2804c5d0ccab444f3a1","openssl/doc/man3/SSL_get_peer_tmp_key.pod":"0bbaac7787c739c1d5b5d67277ba1b7dfe9a3261ecf0a1cef6a2373a9d712884","openssl/doc/man3/SSL_get_psk_identity.pod":"f44137b49e863d0577ac696832cc2062f28997af8a4acd151d4f807d93a750f7","openssl/doc/man3/SSL_get_rbio.pod":"c85c26efe281ec61aa08f9b906f48531b97e9d43bc8d8d87d235c371a47e4c1d","openssl/doc/man3/SSL_get_session.pod":"834fb55f52949a8416a786d4557aabb168d52778b342203dd2f701d642329f27","openssl/doc/man3/SSL_get_shared_sigalgs.pod":"d23ea6dc2ee08770d8526b829a95fda5bfe5e93587136d7f0ef458c0daedb4e4","openssl/doc/man3/SSL_get_verify_result.pod":"aa1571db0fb36e175b38389bc9fdc997f6649eaa6bee6a20c2f815a760b74faa","openssl/doc/man3/SSL_get_version.pod":"acd757055af280f337c94b91b965e2e473f93444d82d5951995ef98ffb014014","openssl/doc/man3/SSL_in_init.pod":"1574aaa908f8922ba23290e19906a4731770755436edd879a45df45c824e6c0a","openssl/doc/man3/SSL_key_update.pod":"615f544558314aaa3bf081414194a056bf70f10fdbda1a0b165a9e8e1af6ef62","openssl/doc/man3/SSL_library_init.pod":"fa072f418bf6091d30ca2625c3c87692b6a9b21f8bba3ab1ef844d9c97601b77","openssl/doc/man3/SSL_load_client_CA_file.pod":"eb51dbe483743c954c0497519398b753be2eb9fb9355af5320883a1ee1052bb6","openssl/doc/man3/SSL_new.pod":"325a9beb776259495c4fd9ea3dbc4613d9786e44ae69d598e8ad6dcc2773aeb7","openssl/doc/man3/SSL_pending.pod":"2baee7bd0084c86db08af4600b11a3e3bf48715b8c46fc6e23c711519e23c8ef","openssl/doc/man3/SSL_read.pod":"8b731c1080bfaeaab6e886dc4ad61a6427212913d237807b5f45eddcec361b5a","openssl/doc/man3/SSL_read_early_data.pod":"e0ff03f9b4358c8e12728a366088909e1551dfcbcb729b70dab02c96e638734f","openssl/doc/man3/SSL_rstate_string.pod":"023964a6c1ce28e063baff5cf8328d0c609407f793a839b9f519776b97c3bc91","openssl/doc/man3/SSL_session_reused.pod":"372667c4805628c3d0288c25d8caca78c928ec09bff212af977fde7f682aa335","openssl/doc/man3/SSL_set1_host.pod":"db7d71292569f96cdbe0d242a7fe62db1697a7d51e6ebf23bddf0a6a5b242e73","openssl/doc/man3/SSL_set_bio.pod":"6ba552c633f6e81e2941995f512023b1d91dd6c9533e16170d74ee0b5f75d66b","openssl/doc/man3/SSL_set_connect_state.pod":"2c1545479df3d68046b44b3af203405020830fb980a851ae988694a317905531","openssl/doc/man3/SSL_set_fd.pod":"81c180900fb359611ea6729bd3a543448da15756c397448a94044a33685596f3","openssl/doc/man3/SSL_set_session.pod":"f1c565df21199f9bb9f22ff81478238e1fe498dfa990613a529d302d9df360ff","openssl/doc/man3/SSL_set_shutdown.pod":"e21d4a6187b06df0b3ef7da18b397ef36692973af19334d5bdbbc9e4ebe82bfc","openssl/doc/man3/SSL_set_verify_result.pod":"dd2040ebf36d0dfec55c4a8e2969f6c2585ecf3f7b23b106b04858230dda1d65","openssl/doc/man3/SSL_shutdown.pod":"9d53331571e37726ac56139ff7b66f10f08420d1df728002beea7fbd31b07633","openssl/doc/man3/SSL_state_string.pod":"4db20f3c0aa03f62ddcbaeddadfd44c8bba703faf363e76994da3b9cb030cdbe","openssl/doc/man3/SSL_want.pod":"305bc0a806621b8b017278b9730946a7115c81b95a00d2b084a1d2e53986a276","openssl/doc/man3/SSL_write.pod":"3f2a76428e9c691d3c968c5f00949b5075425eda529cd25a366e018a3275ee4d","openssl/doc/man3/UI_STRING.pod":"25378107283a87316a74259e19d67e836c212be739cd5f60f4fddd2dbbc2f151","openssl/doc/man3/UI_UTIL_read_pw.pod":"c0fc481fd69923bad9539a754090c7540f361b6c3b524583ecad559d6d56deea","openssl/doc/man3/UI_create_method.pod":"a45774e406ce7a57184e62df20597df23919654b561feb6d46288fbedaf75b0f","openssl/doc/man3/UI_new.pod":"da09d8770e7904e4045107d31a7dc08e7aa751eaaa0a0d03658be87cdb6a26e5","openssl/doc/man3/X509V3_get_d2i.pod":"835ffcba4795c13db5079aba4db321b72c01fdb8eb36357deee0855cdac135d9","openssl/doc/man3/X509_ALGOR_dup.pod":"5b049392fe92e7b0e8007fe8cb607181c28a9b61a60bfa8a14c13126af5ccc76","openssl/doc/man3/X509_CRL_get0_by_serial.pod":"57954e092d37e19f57e456aec46fc041d3f7881496a7ac82594ad0d73a627bfb","openssl/doc/man3/X509_EXTENSION_set_object.pod":"765f9d2f6c7f0f62c3ff83cdaa063b9ff34610cb0734c29e2a737d58ad00ebf8","openssl/doc/man3/X509_LOOKUP.pod":"cdd0d25df89aa2d0574f0b878e064c0e12cb918fa86128159411926f2eb576a5","openssl/doc/man3/X509_LOOKUP_hash_dir.pod":"37d2395323dc9b319bcad77c4aeecdb27f7314a6490a7a39e8988aaa75710d9e","openssl/doc/man3/X509_LOOKUP_meth_new.pod":"38bb0d0fdbb31c0410e96f81c057d4f8336b90c289a66f631513049238779671","openssl/doc/man3/X509_NAME_ENTRY_get_object.pod":"0d5a67f03dcffe8c40cef439dab7e6e89fce60aa2222f4ea8f01c9ac3f2409cf","openssl/doc/man3/X509_NAME_add_entry_by_txt.pod":"9c0100e44bde9eda0b7c55b81c421666024a4fddea2f74ae71ffc81d7cedc2b0","openssl/doc/man3/X509_NAME_get0_der.pod":"14db4a7ab337e3e2315ee57b56e155185248bea3a9bc360d6e21cf82344a7a82","openssl/doc/man3/X509_NAME_get_index_by_NID.pod":"e44f82e4a7c46c24291c022d4159506f5a9d275747b5fd7c79a3e999beedd12f","openssl/doc/man3/X509_NAME_print_ex.pod":"ceb2c5ee0e0059fb8d2c83a7769a54d6eead6dfbdc75664c5891fe3781c39100","openssl/doc/man3/X509_PUBKEY_new.pod":"665eb733a696acbe5dc9871a2fa06d5c34ec9a1b8d92e7f1a9f9ff82e3232383","openssl/doc/man3/X509_SIG_get0.pod":"18d70f17d6a516b72f67e3137856a8c22cbe89cbd0734af7a9ba5933d9ed69b2","openssl/doc/man3/X509_STORE_CTX_get_error.pod":"920225d3f396dc13390db5ea02433c3662358ae90f7af37739324093994fef3c","openssl/doc/man3/X509_STORE_CTX_new.pod":"5b66b7933e4055e8972b650e61802a6e84c90d3947badef355088b15d965db0c","openssl/doc/man3/X509_STORE_CTX_set_verify_cb.pod":"acb6a12e45d92b1865906c82bac24138df9ec88ec68f6e427f0890290b807bc7","openssl/doc/man3/X509_STORE_add_cert.pod":"f62a0351ebb347b140244ce044977a2cc74b01b035661656a53eb07ccfb54be4","openssl/doc/man3/X509_STORE_get0_param.pod":"d550b0aba2821b175b98f4c6b10863841eb705eb238ce992eee3c10ed505a11a","openssl/doc/man3/X509_STORE_new.pod":"3ed802babb15f251e5de008ba067000b06a59224878469154b46ef51b0d0dadc","openssl/doc/man3/X509_STORE_set_verify_cb_func.pod":"b33e3e94836369fc3c9151e3e413067606dcab0fe75ac2ef3cf0630fcf1da222","openssl/doc/man3/X509_VERIFY_PARAM_set_flags.pod":"e0cdefb210eaf03c458e30b471975432d7a34fa1d322260790ee4f2ae19c5a31","openssl/doc/man3/X509_check_ca.pod":"b52cb429aa0b9416f9189e78e4cfc0eac26efb42d86b4c5c18ba626425ad0858","openssl/doc/man3/X509_check_host.pod":"d650728411df302db7e622e20e567b5110f7e6af0fc06086550bdc46362e1f1e","openssl/doc/man3/X509_check_issued.pod":"6c17b2588117d268d9c6c0b2efcfbb92222aa3cfd179fce4d49356421466ea6a","openssl/doc/man3/X509_check_private_key.pod":"edf307f7df63cacb1d23aa4f4f34565df534cde48318480cb5ee95f0c7f1fa27","openssl/doc/man3/X509_check_purpose.pod":"fedce0b259365a9bb0390c5423b688d9876012b1347e1627066de0d3993f12c2","openssl/doc/man3/X509_cmp.pod":"aad2f01c0457d96db4f84de4e5e1924e7572c538f0b6a0d6666a6c8e377a62d9","openssl/doc/man3/X509_cmp_time.pod":"b981da40f3f68a578db29a66f2570e55cdc99daa819268d15d7c626f6e1c230a","openssl/doc/man3/X509_digest.pod":"f4f1bedd97852b9bbe82afc6e4c573125f684714590b42b064787ae821d62d04","openssl/doc/man3/X509_dup.pod":"7caa371b8da0812b7fcb8f54e57136e41fb81f80115088dac25082fe84301159","openssl/doc/man3/X509_get0_notBefore.pod":"66cdd9be36c3bc13680918927af2a80b06f92871449be70ebef477348e687801","openssl/doc/man3/X509_get0_signature.pod":"d83bdee1efda4fede8ea60887eaa45315ebeb9ebfc822b7e60db79768fd92eca","openssl/doc/man3/X509_get0_uids.pod":"04549206bc888e9da9c4bc4bce5521f0da25b1c280bf66a3fd08773dd695c46f","openssl/doc/man3/X509_get_extension_flags.pod":"e42ba00bcb1d4077c5337081286c65ea04866aee5c2e56d8dc9bf783620a21ed","openssl/doc/man3/X509_get_pubkey.pod":"0d1b2fbdae4528648c0a70632d6fce285a5ee5c1bbd5bc4be28373ebd11c5644","openssl/doc/man3/X509_get_serialNumber.pod":"25c71d0e201e9eb12a73f9d80d6c4cb6a3c46d89efa8da10a432caf2908936a0","openssl/doc/man3/X509_get_subject_name.pod":"35e20b0e6a7cd1de5c5325b62af3a494f59a4a3e9b2f5b7f71ec90ee90844ffb","openssl/doc/man3/X509_get_version.pod":"abf7010b232e4c36e8c18bd2363c3eba41d1807052b862753cd1832d7add03f8","openssl/doc/man3/X509_new.pod":"22ff44332adb2856832c706039baf9884b54dc4ed90ac9c6cb33958f31968acb","openssl/doc/man3/X509_sign.pod":"937a6de441cb1c8c084d1a78fa91aee9e4b281adc46bad08bc1e4f4ede49d603","openssl/doc/man3/X509_verify_cert.pod":"e4ea4d7e7532d86f7cee5404412b6f2530e16d518850346d4cf45bfbdab5afc2","openssl/doc/man3/X509v3_get_ext_by_NID.pod":"5faf535447941465dcb4dba4527bc036030218f4a3f3cb31fce49091d6447789","openssl/doc/man3/d2i_DHparams.pod":"4f0ed00d8ba4d77edc38cbb99b3e16dc1d3ae9ff498e89baec764343b418aec0","openssl/doc/man3/d2i_PKCS8PrivateKey_bio.pod":"d1cdb811d88ba557c6783727f784a63c041a02f075db7b93302e0277a5eeb441","openssl/doc/man3/d2i_PrivateKey.pod":"3345288295b7c54d02a9d447d711bd96c24312c2fdff54fa90ab2df2cae9ae54","openssl/doc/man3/d2i_SSL_SESSION.pod":"bc21bc24e88352a7fa7960b018c2431aea3b0371775a9722641709ad23e2e62a","openssl/doc/man3/d2i_X509.pod":"585d128dc975199f6b8dcde463240d4c5aa7529d261d18dcacd3c5227b2e8436","openssl/doc/man3/i2d_CMS_bio_stream.pod":"57ff21edf5e057b5186ca8b616087a7f8fdfa1293cac59ae0bb72a740a4d008a","openssl/doc/man3/i2d_PKCS7_bio_stream.pod":"616ff7934af6cef7209f9e0ab2343a0668de210562e20affa4d9b02aad36da67","openssl/doc/man3/i2d_re_X509_tbs.pod":"aaca697edb4b5c7139cceba8aeb5609d4a18d7606dde52a66256bff5c8d680d6","openssl/doc/man3/o2i_SCT_LIST.pod":"82f5f749eb71d3b694869a53f060c3f9ac20e380b62d7f4a908fac406423d68f","openssl/doc/man5/config.pod":"831ba6dab308e1c0923929089be0c187a9dca9cccead33bfbfecc00885274908","openssl/doc/man5/x509v3_config.pod":"57787903148c11ba7470b477ebdf91098dbd5cfdc1cf176c3fb26f6c6d4e9aaa","openssl/doc/man7/Ed25519.pod":"0f19e6e4a06a6508e57c09a6b2c7890cdb6f51ec5806ea91e06db4be60e7c137","openssl/doc/man7/RAND.pod":"05d139307366ae6b646a292bca0862ceefecf7720297380635770c9545d938df","openssl/doc/man7/RAND_DRBG.pod":"d4efd07d231b501525970899ff911ba7f8036f724e00ea8704c06194e4fdc794","openssl/doc/man7/RSA-PSS.pod":"e302eda9bc0e90889f498d834ebf4059d44b4fc7f5e3edfb292e81d7df35bf27","openssl/doc/man7/SM2.pod":"aca4dae0e2d24d5d1c0987d698922390d9b3cf638f77a838cdadaeb645b7d2d7","openssl/doc/man7/X25519.pod":"674e80ff397706e9c6fa83c85ede868a07c3ec7eb46bf4f18fb13572e73c4814","openssl/doc/man7/bio.pod":"5a6b943aa56e79f8d9c97eed0511def267a38410bf841b230994164e3b39e425","openssl/doc/man7/crypto.pod":"426f6f3a4300d4b9928341227d5630e932f41001e2f0f9cb73e46650b3d11081","openssl/doc/man7/ct.pod":"4d458e58daf08b7b528fb72de6c9838a89fffcc3740b1438cc3b8e30bfd2a192","openssl/doc/man7/des_modes.pod":"fff878fa997b37163dd31713c796d1574490b0a3223dbe11ced01298b1c3b737","openssl/doc/man7/evp.pod":"3588d0b8355739a8b8ef48149c16b0e4625ed3798d9399528daf850c41a81314","openssl/doc/man7/ossl_store-file.pod":"b68fb7f166585d643aeabf5ad66968a9e1bb9a0f51848f9351e00e7993f3cc81","openssl/doc/man7/ossl_store.pod":"841f63f74e320dc41663277364fc2a30d84f710d2e7f8bbcb69f11f045d1efc6","openssl/doc/man7/passphrase-encoding.pod":"640502a7b0407c9e8a2c0332cfa6fefe3cebd6cf774f5ac8f24d2f22c8908d8c","openssl/doc/man7/proxy-certificates.pod":"bc563175f718b7efa53757019af9985440739489b9bba84b4bc203e2439f0669","openssl/doc/man7/scrypt.pod":"72dec00db94199c8a1e6fbc867d92505362456de3d07f199d07bb35c6826b238","openssl/doc/man7/ssl.pod":"170a8a7177e45dfe4c4515169e29b794445b6163e8360f1f691d0695ac9e2cb2","openssl/doc/man7/x509.pod":"be7cd383dd43f692e6f84a26b9f635f658e2da339bc0a15857dbada61a01e94c","openssl/doc/openssl-c-indent.el":"7d9a49b0d41e201adaa2e1b336f2073e23cb3ad8962c187dccc5dcdb3037e652","openssl/e_os.h":"c8154926e3e19c448c290142e933c40df58b262f3dfbc0c0c8832d70645dd547","openssl/engines/asm/e_padlock-x86.pl":"296feedf92fc9daaaa78f6939fdcb3a50e691b1dceaa153af45b03385b988983","openssl/engines/asm/e_padlock-x86_64.pl":"7d11ad2bdb53bcf0a815f21250d69ee7e9778690a26d6e2f40a990682f34c42e","openssl/engines/build.info":"40a72aac066ce902cadb25477c73e57848542699e1949e100e6bd1e26744d396","openssl/engines/e_afalg.c":"6c0728457270b554fa7d726bf2d99e3131cf00e222ab0f711967f33098e9f497","openssl/engines/e_afalg.ec":"e4f35d834586b49d89983d1d45d63cc8f03c6ad9b23edab4da035b8cb7b9f6b3","openssl/engines/e_afalg.h":"2c099fc3edc2a8013b7a7d8be233ccc61131bd417822940b805a0fe54a9c9c24","openssl/engines/e_afalg.txt":"9da1e6ea1d14326a3667263017868ece1c7ee56b134986ce7b73f70a49b6ced0","openssl/engines/e_afalg_err.c":"c0e61757b1f83104dc35d0f9446b61c493473a2d12314a3ae71ba579c0037b15","openssl/engines/e_afalg_err.h":"6ac228237a4e3cee9b6acb22205df48c87d72055dc24119c24f637d072e358fd","openssl/engines/e_capi.c":"94d98515cf5bc239f4f712ec6c1d46f34c9d61aa90bd36726f87641addd600e4","openssl/engines/e_capi.ec":"f321a020da40d25763685beeea504d39d7ee729a78760a160586b3ea06855674","openssl/engines/e_capi.txt":"61b251d2b29b2b2a269621a194187dfb4409803bcee4ed06a19641351b50b01a","openssl/engines/e_capi_err.c":"649eefd0de78cb8d421ca31b56216df68a567b225e933fea0a81f0527dce9d2a","openssl/engines/e_capi_err.h":"70e10eee7a1a6a60a97efab2a1a4d1e9a63fb3c270c416911176dbe0e917dd3c","openssl/engines/e_dasync.c":"2b0cb93fe5c503e30814d6a25fda2757bcff6318f1c22d2e529c07a61038c9a1","openssl/engines/e_dasync.ec":"9d72d081179b0c8917b9ed5ffae64b43988d6273139ba402ad54b6da030752df","openssl/engines/e_dasync.txt":"4bfedb638226e82d694653ae7d12ac7c292a0da53bedc8d5206733597c3d16e4","openssl/engines/e_dasync_err.c":"59386ee77e72f4de83d8803f17d1609d6cf8bedd60743825259f485fd16a8b89","openssl/engines/e_dasync_err.h":"2affd0fd7a474b7b42533d3894446c589024778f7de19bf44cb75eef6899a8e5","openssl/engines/e_ossltest.c":"cd84c18c208efe2a472ba76a248aab31a6f72c4319fe18a96fbd26c894792bac","openssl/engines/e_ossltest.ec":"a8bea88a6bdac1f2757a2edd3509f1cb6726fc416a75dd8393abfb8cd76ab7aa","openssl/engines/e_ossltest.txt":"dfe08eb4bfc84eb3e26d5f1a998a346df3f1972dcfe372a45439e0e47d47fdae","openssl/engines/e_ossltest_err.c":"1f373f1fc169f0af13b942beca5e596e83eb0719764ddeb86809498364e3d1ed","openssl/engines/e_ossltest_err.h":"2c45ed3593c3e319f6b195720c0fc04af0d1dac6c515366d25dd13508903719d","openssl/engines/e_padlock.c":"4a0299e184d7465389db2ed6eabf16fd4ed4dc943cf3c0eb8498d5aa1dd4de1b","openssl/external/perl/Downloaded.txt":"9c7b05b336f8a2f171c296535d37bab34c2597c773afc9627ecd2d85980e3ad5","openssl/external/perl/Text-Template-1.46/Artistic":"b7fd9b73ea99602016a326e0b62e6646060d18febdd065ceca8bb482208c3d88","openssl/external/perl/Text-Template-1.46/COPYING":"4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f","openssl/external/perl/Text-Template-1.46/INSTALL":"d2f84dc3b27915516d16694b00ec29d20d1b427b2c54a85e7691f4caeae0ca67","openssl/external/perl/Text-Template-1.46/MANIFEST":"3b667017874fc2df25ae3100962fdd3026615795b0ce60fdd47f02b0f545c688","openssl/external/perl/Text-Template-1.46/META.json":"e52d6f14b9990553dcc5baa16be1edee348ab890dd065c9677db246fb44a7b42","openssl/external/perl/Text-Template-1.46/META.yml":"566a7700ce6679cfa949b46119d3f103f1e3f5b891782903b087b096cd5c13e6","openssl/external/perl/Text-Template-1.46/Makefile.PL":"dcd15f8fddea6bd866d4de9ff5be0f49b69e37c34165b0a8dc570e9b99adea45","openssl/external/perl/Text-Template-1.46/README":"04cb0c7eceb19919260fecc5d617783cfbd39b5bcf676730a5757cbd0eeda01b","openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm":"ebe5111b20332dcb62b52a6c023dc6cf80bf42f3193fd14f8708239e5ec30f3a","openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm":"829f63d0c273b77c7232fa1fea02a76f076dc4e4c3070c840a9125296503de5d","openssl/external/perl/Text-Template-1.46/t/00-version.t":"c5e0f7d0e5dd616a3415528ce2c1d86389546852233ea9697944e21d770a6109","openssl/external/perl/Text-Template-1.46/t/01-basic.t":"a012eddaadcdaae932f769c3987290a0c95dd6f822d933afb529125e0975be4b","openssl/external/perl/Text-Template-1.46/t/02-hash.t":"bbcbd9546cb771107a258831a137e31ee68e2e68bb1d69200f3f7c46302fd9b5","openssl/external/perl/Text-Template-1.46/t/03-out.t":"7f47cb646abb093e287ffb7ea0182ab346a41941f5f32324c2464ba08f8561f1","openssl/external/perl/Text-Template-1.46/t/04-safe.t":"3b20d194cfe1476e6cf088e0b6d1094275021dd5737a8687598c49d920d10167","openssl/external/perl/Text-Template-1.46/t/05-safe2.t":"e0f0eee46e23f0141705b9af769c551a6191ff76b8b75ee4dfd8963404d4a316","openssl/external/perl/Text-Template-1.46/t/06-ofh.t":"7d3781023c0f210376a8650825f89799f53ef457b457feda99d02475e9a744e5","openssl/external/perl/Text-Template-1.46/t/07-safe3.t":"af4a2c1b81b038352f1411e4c4e0115e1f0b023510e5276ad69452a859a1e30e","openssl/external/perl/Text-Template-1.46/t/08-exported.t":"9dce4da9343dab7cdeb9f2799556e6a49f4231916c4db4971eacc3151cf41da1","openssl/external/perl/Text-Template-1.46/t/09-error.t":"01781f28bfff4e88678e6a17e3b50b1cd90b76ffa358a7c2c56058cd0852a8ab","openssl/external/perl/Text-Template-1.46/t/10-delimiters.t":"0a203b734fd67f83b3a1c138024443cb6270dd247d90739a345ef46271c0cc80","openssl/external/perl/Text-Template-1.46/t/11-prepend.t":"c11cb95d3583368ebfd315e8e5a6dafd75ec60debf41b8898492d7e913dea0a8","openssl/external/perl/Text-Template-1.46/t/12-preprocess.t":"422781f1e64771ef8421f32e8ca954a8e4f0a4639d77c4cccbb64e6fab6950ff","openssl/external/perl/Text-Template-1.46/t/13-taint.t":"f044f17e8fc390046118710afd041eecb69b00b81dbc50ac4aac6df359d5a2b8","openssl/external/perl/Text-Template-1.46/t/14-broken.t":"86bce79fffeb080659eb11f381f6a26c34f007028e34882f0badb194a9cc3881","openssl/external/perl/transfer/Text/Template.pm":"806ea72d6560cdcee7f9ded9527c51bd7264e17a4f191339e1d2587f801db3ae","openssl/include/crypto/__DECC_INCLUDE_EPILOGUE.H":"53cb536a751a1a309e098aa662ed2f4b8e0dabe94a6274b9e513135179e6458a","openssl/include/crypto/__DECC_INCLUDE_PROLOGUE.H":"021f571eef8cbe45c0cd6520aeb12499ac31154fee331955e5a505fbc3762570","openssl/include/crypto/aria.h":"bb5c3570c4a8086452a37d505d17f86d94173cacbf44e20de6233b4cc503a38f","openssl/include/crypto/asn1.h":"32519a422642025af212db876a62d7ec9ecbe6b56fac7bdc107e526f388469d5","openssl/include/crypto/async.h":"be1fe19da7f3163477ea57a75ac71a7d2b85a90e01cd9bd589084394f242900b","openssl/include/crypto/bn.h":"29da2f844a66930db32d124eac0f79878e3ef8e61cc6e7035c59f8b9647a9654","openssl/include/crypto/bn_conf.h.in":"eda1bac34faba99d491f2d5c28328997a94b4f59db06b65b45e91387ce00c0ac","openssl/include/crypto/bn_dh.h":"2e34e268912af61b71ed8216c7f0cccb760994e0e3c47b0ec50daa29b46dfb89","openssl/include/crypto/bn_srp.h":"d08141769d222ce60d977563fd0f6d653d2fe92e1be210a4cfb4c903db932fcd","openssl/include/crypto/chacha.h":"0e5e743174154a7d46d90c82a3dd252c1b1831ff3adfd2fa3ac5d237801ee5da","openssl/include/crypto/cryptlib.h":"8cfdf6c5319fdffc8a64d6ef0844fea3b9fcc270e314f078342b1e26a51b568c","openssl/include/crypto/ctype.h":"5265229633ff6c80ef8c5e5cb5e919bb1f837913f9e48ef4301987b2a2f49d73","openssl/include/crypto/dso_conf.h.in":"469e89dc01b73dd5bb56fb6fa4f3ade57ddc8f9ab2495f7b83ca4bb3c03fdb16","openssl/include/crypto/ec.h":"eef8c8d5561e74c0a6aac33e989f284726b44b324311acfdb4dff16451eea944","openssl/include/crypto/engine.h":"139ddc0e469424cf51722848a7befab0ce1cb4bfc336d42b36d6edb3a54bd69c","openssl/include/crypto/err.h":"bf28991eb0d4bb8ca09f7db06034549509001352db8fa75a0e9b95d6829df22e","openssl/include/crypto/evp.h":"c7e98d995cae553a3149a52bfa0ae5e76f1d9c989c6193076d526cfa7129c246","openssl/include/crypto/lhash.h":"027fd181f9effaa0f398a856c9bf423ef2b6439d2a717a63f5445546ebc2aa62","openssl/include/crypto/md32_common.h":"d89b9c7ddcf20793eb2211c1335c87053bbaa7bc685bdc639ed861a3bd4ffd4e","openssl/include/crypto/objects.h":"2c49e60754e30ebe4447d45e8856f07fcf2eb00998f2931d6522193155b2eebf","openssl/include/crypto/poly1305.h":"16e9d65921e61f0be7c160522c5505d261b17fab81f6cedc93184e8d23f0e30a","openssl/include/crypto/rand.h":"3ff692e8a6752ee55076cf2010acef5bb26bb538b454f8ce8548c078ed00ae92","openssl/include/crypto/sha.h":"bba5f6f4c1c2d2a7c00c380223fd56c5a82a039f7e8ca35ef53bd0c99ce04cc4","openssl/include/crypto/siphash.h":"1bad4bf41ffd54408532b42d3b806ebbb0b31de408d8a1795ae4b39cb7aa522d","openssl/include/crypto/sm2.h":"3cace3594d52f13c85950dbc560b8c0b5ebfd5bddbaa57f9b2b150128421f58c","openssl/include/crypto/sm2err.h":"fc350f1001162921f5e914a0cdc81220639d6e2a4477325ffb54f5455d41cf31","openssl/include/crypto/sm3.h":"44348ac98ef8a9df7c97b0d4b25b7c23988f8cfdb84735a26a42af16c3e86665","openssl/include/crypto/sm4.h":"aa3d6e0b83ac31f0d872f01998c77599cfc495a354df7eae6077b944a7b98daf","openssl/include/crypto/store.h":"efc483671c0eaac885fcc08e7c276d3e4b5d7b96ffc21aa36b2eb41ef400ccef","openssl/include/crypto/x509.h":"fc5083732d6d5da7545b4d7d9d60f99134cb1c66c7d345b90bc0d3059836ae5a","openssl/include/internal/__DECC_INCLUDE_EPILOGUE.H":"53cb536a751a1a309e098aa662ed2f4b8e0dabe94a6274b9e513135179e6458a","openssl/include/internal/__DECC_INCLUDE_PROLOGUE.H":"021f571eef8cbe45c0cd6520aeb12499ac31154fee331955e5a505fbc3762570","openssl/include/internal/bio.h":"a59fe352fef0747629706586a703f2bed34ad576be4de75b44c7a88641435f5b","openssl/include/internal/comp.h":"0bf68d4852d8387bb24b3c6b2129c56070c84f9841fe53e747cde57bbfe61da8","openssl/include/internal/conf.h":"5fb5edab92a21ebf3387f975f8030b702ae306c000c9933c5a1893dd6c5d47cd","openssl/include/internal/constant_time.h":"fba4e88378e1a76418dce375f88a94726671fda5161026f68d4ee398673c48d7","openssl/include/internal/cryptlib.h":"d85479ea9a0f508c944b3f0eac1c7bd9d55d1a9de990cd1379c8b645591f4fc5","openssl/include/internal/dane.h":"2b15667713ae1dff795754cfeddd45dcb497db6720bb6bef1512ad9d761cd77e","openssl/include/internal/dso.h":"c2aecbb40f3b210aa7401b6f3eefc4ce94bcc4b2313917c6ff9ea2b1a8e5fb8b","openssl/include/internal/dsoerr.h":"5c8a57e223879f21d50e9275512e7e0c45a959273ab9932bb8acace1fa625782","openssl/include/internal/err.h":"ecfe3e47674b053c612631cedf1739dfd4f2548ea14e2909539d8c8c38958780","openssl/include/internal/nelem.h":"aa9604f58d464853c47ec7d6beaf09ddeee04dedcbdf7ee8b5132ce5aca19863","openssl/include/internal/numbers.h":"dd67067fc220a479fd1e57936803c8149a6dfde46fb45fc1998bfe51b0f5d9f9","openssl/include/internal/o_dir.h":"1676a17c45a6a8b98290640bc57f2bc6fbaf89a54a01342e65f40d3cf9a7f02f","openssl/include/internal/o_str.h":"661d9dff184260ecd9705dcb72011934314ca0f9103723c4238397dad1333c3e","openssl/include/internal/refcount.h":"cafaf8eefa9690f3e6a0f49f7fa5900bd486099a5c67436012bd7b4f06c4201a","openssl/include/internal/sockets.h":"a1272a6b01c707292ec11f93ee074994ca2ca8cbacf5e09e6b9dca0faf0c95cd","openssl/include/internal/sslconf.h":"8f643e91886fb1fa9aaa4f7106aa360e31051fbfa4d78ae2440caa44203093d2","openssl/include/internal/thread_once.h":"76a3408ae6a68a59fe6d0ccab432644ae3d4dbee5a35973e2466d323720b974a","openssl/include/internal/tsan_assist.h":"23841bbbe658bca580f743db285dd6d0d1ce8af8ce5fe755df11995060591cdb","openssl/include/openssl/__DECC_INCLUDE_EPILOGUE.H":"797eeebf0fefaf464c6b16b02883cae3bf629de7610d48e9c4ba5efeefd67842","openssl/include/openssl/__DECC_INCLUDE_PROLOGUE.H":"57b996ee571c00c298204b878fae1506e594655c15b6b751ec26b292f9d58337","openssl/include/openssl/aes.h":"f6ba27e87d97ea578f01540a8f84b7eab05d42c178badce712d0cc668d8a9981","openssl/include/openssl/asn1.h":"851313b1176baa3d6896aaeeebef56216ebdd38dcdabb39b3eca36b6645352bc","openssl/include/openssl/asn1_mac.h":"db4883ed3aa74e07338001b31ec7e3e68546521c54bbdfe68c473b33f8511ca6","openssl/include/openssl/asn1err.h":"b89b16216ddd35f028f5bfd3fe0db4f2ead6c9415e7749b7115b0393b427ef2f","openssl/include/openssl/asn1t.h":"2702f569302248b8228e493177cf0a469f127f1ce5c76bc684bc90fbdfc45743","openssl/include/openssl/async.h":"ef96c716cac393f2cd6da304af029155ecd9f021869cd5a4c341ebdf249036bc","openssl/include/openssl/asyncerr.h":"cacc9ca951aa523d3ed6b9df2366022633925a6729d30cd134a05d2ffe5fb156","openssl/include/openssl/bio.h":"78b055555957eec2bfb4ce5f91b27bdcfdf73128026be9ce85fcca0126fdcd3d","openssl/include/openssl/bioerr.h":"ad29fe4ef37fd7c4b256b690caf9371a74e29981f6561b94436dac54a61bf74b","openssl/include/openssl/blowfish.h":"813b2c7cff888b5b709b90d4da584afef59b5ce1ea888617d682f1af48578faf","openssl/include/openssl/bn.h":"8f79b29c5ad479186acaae962a598d9868dc434fd5fa49a008eecfaff1b998ca","openssl/include/openssl/bnerr.h":"daacb00f416075ae470723f764d0ff9703f4a5fc31e881e1be8937631de7efff","openssl/include/openssl/buffer.h":"a4fa292b903cb8c2ce1761ba4980cf5bdfb66dcadcbb5c8aecc45b012bc64c23","openssl/include/openssl/buffererr.h":"722f6ea87711b7c0cb6ee29c15762c2839e5ad17b9ef579b6e81b6121f035c30","openssl/include/openssl/camellia.h":"561bdb2e985458e809e656c60e4bc83e1d6707746dd8b5badbc10b64198d4770","openssl/include/openssl/cast.h":"a14c51a129b3ae5795dafd98065be0bb0cbf00b4d4528e85adbf629966f42f53","openssl/include/openssl/cmac.h":"75bf95d1da118ff1e2f143ccb7a564d949de440097b97a49725c03976e167b52","openssl/include/openssl/cms.h":"07e4b0a779c957ef9026d69c0cb5a621ddc2060af967e0dd5e91ac861fdfbdb2","openssl/include/openssl/cmserr.h":"086aa0b661ba9de9618afc948a4d1a82df970a406f6c5bb6fa60572a720a62f0","openssl/include/openssl/comp.h":"98a877c62723e6042e4e4740cd1a6e7799df752d9234386d73a28a098e6eb31c","openssl/include/openssl/comperr.h":"f64be205d08af2557187ec19c03678aa9e29f66e428de29cebdd62cd7c3b5515","openssl/include/openssl/conf.h":"e54341e30523dadc09d821366f5afb13c9286d540b34c1945406918ed588fa21","openssl/include/openssl/conf_api.h":"175f86b69b58b0cd1da6c9b27d87ab4e4ed52f37dc76b7895c210c43469504eb","openssl/include/openssl/conferr.h":"abfe26485cd43a80e0c476e628979612ad28a635577baf68eee476850425a498","openssl/include/openssl/crypto.h":"d2cd84e695e68051fe67fa7cf901ccba4fadccc71a6b30090df20a01b91d3ec7","openssl/include/openssl/cryptoerr.h":"e752d7d3da32a6c009cf264450726367fd69e7c2a4c185d580ce650021d68e7a","openssl/include/openssl/ct.h":"b27aaf0d39609500b4fce3b3b65f6752116acb30420de1d53943074a481043f0","openssl/include/openssl/cterr.h":"ab6e70b52e341247c4b217883980ff1e98e4453d1020b0b038cdbf096c4ab8a5","openssl/include/openssl/des.h":"3cb68fbb498e34e19e46f9d41561596ab69ccf78b1d8bdf2f312e892c060015f","openssl/include/openssl/dh.h":"f56e0c29c124017c815c6f3d0c2413e03c81cadae2e84c2c325fc2c6719fd559","openssl/include/openssl/dherr.h":"9b1f7019d8d95e1d5fc5268089e8331829af7416b18a8908266ab60027aae0e3","openssl/include/openssl/dsa.h":"1525e5adf242643a7d36312580314f5ce61ecadf82223a49ff5c32220d78f9b9","openssl/include/openssl/dsaerr.h":"65ea8b47cb25ae82d611337cd47da7c1c5cdb9451982beec9d841413d4a923a9","openssl/include/openssl/dtls1.h":"7304f17cc9998bd7c16539ae9a5ea545f2e0c64086d5e688caba104b6a7ffecc","openssl/include/openssl/e_os2.h":"dc3a29489d60a0980961c2032c74eb26ed4eb38878e2658d31c5680df956a00c","openssl/include/openssl/ebcdic.h":"2289f14f11e75ac739d1123651d16e841f3c74e36daa483c1fed9f8c5c144720","openssl/include/openssl/ec.h":"2a2d02e5c3b982ab2bd0d4e0a1c56e3daa3470c165aae427211a529b7dad8b06","openssl/include/openssl/ecdh.h":"95fb89add3bd32b6d43dcf1a51d1839b915e774d7138afaf618e690efbf414bb","openssl/include/openssl/ecdsa.h":"95fb89add3bd32b6d43dcf1a51d1839b915e774d7138afaf618e690efbf414bb","openssl/include/openssl/ecerr.h":"85a3b64c0644420a18295c8001a06bad5d7c3e84d4f871c925a1b45fb89ef182","openssl/include/openssl/engine.h":"0db45763a43c17d78a4a0b3fda207ac0be4781ebdde45f04fd4b07a5ced46086","openssl/include/openssl/engineerr.h":"6f3d1e91ba1b7971929530cb8ac3ef934c0b82a8cd459caf224e241a3e5ad6e9","openssl/include/openssl/err.h":"1447263f0a840e8135c586e16c3d858cee939deddf4fd905e391869809b4daa2","openssl/include/openssl/evp.h":"9d963bdda81802988170663ccfcef437aea69042f42aef3a11ab4a217b800aef","openssl/include/openssl/evperr.h":"45ae90c137604d4951414b853d7e818bad7819c30e4df26bfc28ffbb4ce1c0f2","openssl/include/openssl/hmac.h":"76386c2273f105f54c5749f2fc854573c371ab185f9248ce295a748e126caae8","openssl/include/openssl/idea.h":"bab682c5cc06027c82d126ed8e65d7dd9dcc75fa464ccbc95d7f168bd69c732d","openssl/include/openssl/kdf.h":"aaafd4a962ba9b9f2a2462076c7f7b4991d9d87e7bef71d87e9308125e0e29c0","openssl/include/openssl/kdferr.h":"e406cbc8a8a7956bcb0e06a949454b48d2702339caf4a2e621ac0cde9c2463e3","openssl/include/openssl/lhash.h":"1036e20aba00e0585b96b91a00ae7792dc12501160e117d1f824833de7fe3752","openssl/include/openssl/md2.h":"9e28f0a8d5e2297649af298f5e3209d32fe9486edb1793cc698a757c91270662","openssl/include/openssl/md4.h":"03d3fc9dceec6c168d219eb9f404ca08b478d5521622834bc24b7d45945702e4","openssl/include/openssl/md5.h":"a0612a8f7e69e3bc166fc186ca44be1e5b1d020b5da8b5be021f73d48c270b82","openssl/include/openssl/mdc2.h":"f13b01ec09c45c2634673d1b9b1a79adbd6ec32bdff94287308e2bb27408e537","openssl/include/openssl/modes.h":"f4e527987e296a26fc1c06f4f896baa5f457b7e67f94957d176eed469b0fe602","openssl/include/openssl/obj_mac.h":"3a674b6d07dea14e339ccfc0a9db7762a4d0eebd57d12d307e33f79553084462","openssl/include/openssl/objects.h":"4018d7c54e6f19c3230af063f4dbc8523f1450528a4af15a97a0a1ff3fb3ba38","openssl/include/openssl/objectserr.h":"0ec7330c122ae2b3174df95ddecea65ff661a6152cd0192529dd1411ef3f62a1","openssl/include/openssl/ocsp.h":"cfbbc3434b56c4671080326aeb8c3d007dab7d2c3621d5146c11aba347158b80","openssl/include/openssl/ocsperr.h":"c73a57b1919601ff8c04f2dc9c62dbd130ef2d3ae39bb0fcdf25bc9e6eaf327a","openssl/include/openssl/opensslconf.h.in":"012ddfa5b7930fb023588ee96e777a7ccb7e1eb5c3d984e9f1cc4eb90314cf1c","openssl/include/openssl/opensslv.h":"668367a90ddcd6340fbe77aaf40beb489ad1e15d91da94bf0d69c08af843fedb","openssl/include/openssl/ossl_typ.h":"46f541a1cc49bf08908ab3bde05e2683fc56ea268ca3e7f2e27628653ecb4a14","openssl/include/openssl/pem.h":"32d62036d0c35d03fe7f7ddaaffe3caeafcf984ec16e4db7ed19d3e202e9d7ba","openssl/include/openssl/pem2.h":"6833ee5712125d1ce8f7b52437a752e40c2f4793276859a8228c0de71d35c3e0","openssl/include/openssl/pemerr.h":"d91c6016f3c1ba70683b92fde55500ec334777defb6486c41b0a9c4e402aa295","openssl/include/openssl/pkcs12.h":"97c129c6c9a493d7e5d3af123d96040d87c4e54fc5e41aec450832cb32a634d6","openssl/include/openssl/pkcs12err.h":"b7340727a0480f351823b669f55cd3989c065d373c8cf6ff8745b8356f61d5ff","openssl/include/openssl/pkcs7.h":"cdc3505c9bb9168a6fad434dd9d9a49ad630b9ae9216bd665b11051e04a709bc","openssl/include/openssl/pkcs7err.h":"ecee11e9fbddab20f78a018009e6a2daf287ff5df00679298b137fe9996d9386","openssl/include/openssl/rand.h":"5a91abcbdd14dcf2fc62761ccc58ee9407274ea558c292fa77ad625204ac2bd7","openssl/include/openssl/rand_drbg.h":"12379cc0a7f168cbff8e08828da72dc0e87773bc6c3bd14c4b57506339b61fa5","openssl/include/openssl/randerr.h":"41fcebfb0767afa03f3de2732d3f0ce46cd2367ec34b2016cdb5c9e84a9a8994","openssl/include/openssl/rc2.h":"ec2b9196898bbc45ff2ab00204f93a6f20c974225510f29097ad69a6eeebcdfe","openssl/include/openssl/rc4.h":"6fc023442f524349685d13d50854ad773b12b8c7a153d72d615ab27dd4a3d609","openssl/include/openssl/rc5.h":"c238954a1df23f52362d6e5fa78df2c7a5a2ad6ef9536e489f0a23295efa0cab","openssl/include/openssl/ripemd.h":"8c74b93c10a9e83abc17ced3a8021af7506f39a0fadab07b5db2d4faebcf68b6","openssl/include/openssl/rsa.h":"509c4db9081195cf6c9e5fd4683890aeb39509f2997a1989dd5a57cf43039bc2","openssl/include/openssl/rsaerr.h":"e032a933b1a4c13ec901d7561ad23ace01881b60cdcc86af0e4cb0a25a2a3252","openssl/include/openssl/safestack.h":"57665dabb37f4f0bd853539d93c64cb8adf37fd9552dc9fad215cc8f47a991c4","openssl/include/openssl/seed.h":"6bf2373dfb10dc5cbc626cf2fe86b9b1c82373d799bdd6be13eedaf7d4540d55","openssl/include/openssl/sha.h":"0bb6745481ac56b67f450d09033e813bf8f6a5f2025e90d5eb539eab1ad5e323","openssl/include/openssl/srp.h":"82a08bf9a866dec1b7deb66b4077690cee0f6caf91eb00136c5eed4e8d943d06","openssl/include/openssl/srtp.h":"e50e2dd5df6a0db219091cd1c6768a6d319ef6485b16e1f361fce43067847626","openssl/include/openssl/ssl.h":"c60006f61d48ec19032b672194b5ee7f535f9a537125980dae2006b7d21cca1b","openssl/include/openssl/ssl2.h":"7fb557a32488ad44a25420abff8279abd0bd1f4ab768e73d3e1d5c2dab36c0c5","openssl/include/openssl/ssl3.h":"d04cfec2a9f9da2aa299f55884215e200b490a6e0a9423255262648bd8a6d1c0","openssl/include/openssl/sslerr.h":"4799ae1dca959b00d3a826026c858ace5f52c42f8660c60f0a2ab6939a2453ce","openssl/include/openssl/stack.h":"45ba803bbe14007e494bb24b2ca954f6362ef700a10480efa3d2f3acb159deec","openssl/include/openssl/store.h":"1105bad1a309d3122a2cfbdc4098a33e33d50c8118e70bb332f3b7d6ef2bbb58","openssl/include/openssl/storeerr.h":"071c66bcc03ed5c2a24f1964f45e8d1a633f3cb4b183c718ded3e25312f8c4e0","openssl/include/openssl/symhacks.h":"0c9e026a5932a2432e3cdf7defb789610c4272010e51e5ff0471809eabb7aa2d","openssl/include/openssl/tls1.h":"d4104ca8720332b9852f4725d4660a6cf77a52b587e7d96ec263e996c1d0ae2f","openssl/include/openssl/ts.h":"9bd039ebce7bf6b6e71fc9667e44e017fc0cb7c79c023be1c965894e61b79238","openssl/include/openssl/tserr.h":"b6e1bbc8c53e4f7c054768dec55272d001dfbfee788a85ba8b0c069e08cbbe85","openssl/include/openssl/txt_db.h":"903696bd5b9908530f8a8578fef47721f47f3fe8507bac7761473e925e942159","openssl/include/openssl/ui.h":"f5ea3f5d2e7beb3e81db8c23c6e618e38e511c213fd93a11ef51b9ae4ad03619","openssl/include/openssl/uierr.h":"bb39377c702d9765547ce95f9e758b46a54ee4e2689f892033cf2a4ea57d5d0b","openssl/include/openssl/whrlpool.h":"38750722d1737083fa8caedfccd3bce574080e35692010d2f91dd303b154af69","openssl/include/openssl/x509.h":"f1b8b356d649da24236d5aabdfafe047b516b2008d8d5d09da5e99fbc4b4a98c","openssl/include/openssl/x509_vfy.h":"f621ac4c38a89bd010656ca00937773126a7ef348b29a14b04cc5ec5c095b531","openssl/include/openssl/x509err.h":"622499b9aaa546957c802da9aee36794c24c9c7d2e105ae69b47841ecdac6b7a","openssl/include/openssl/x509v3.h":"5c66d361607135f488201509ec733219a0f6606a19303ab7716c2610c683b170","openssl/include/openssl/x509v3err.h":"0e55368c874daa18a8074886aedf6dd0f9b84c5df5f70821e6da5087d9b321c0","openssl/ms/applink.c":"461a11e8c465d61de2357631e7e8367eca3da7f11ad744f490cb56a1ae80115d","openssl/ms/cmp.pl":"e9df8d951dbccb63ea68cdff2c925cbcb7b06764e6b3d74497c7b19e15a8622c","openssl/ms/uplink-common.pl":"7001833c39f8a008d3a0d645347ac0ccc1d15da7c7a571e36bb32710bdfdd413","openssl/ms/uplink-ia64.pl":"51661e5c5d95e674821483ab1c45adb96396911e974a531a1032e480259dac78","openssl/ms/uplink-x86.pl":"ea08cabfe289d4cce9393f9ea586cc468a35f99559aaba6bc98fcb67a5481558","openssl/ms/uplink-x86_64.pl":"58b78e367a56ab276e412a0268a0a88d3ac1e3b62a550ada222e8db6f211a4d8","openssl/ms/uplink.c":"c584dfff58d520c04022e32440ff66d4a19706831478a63c677d835e0eb2d999","openssl/ms/uplink.h":"9e372fe99a844954b80396b6487a6612f41ce4a67aea99507b15f8eab9cf2a8d","openssl/os-dep/haiku.h":"a3623a1ab97b62e79877ea7b54c1e9718ecce68b840b71fdb717c0c5f3bad04e","openssl/ssl/bio_ssl.c":"f4475afd29de4a0e148e05b0a41182147d04bcdf0a7a91a134a9acba2f8c8ab8","openssl/ssl/build.info":"150b3b41dc79f23250be61fc6adc9d1e041dc4589f8f60ae1f975ea3e1dfc5df","openssl/ssl/d1_lib.c":"4a1b191cff6ca37c8e66f29233a0f04b11f7942a7268c156d9e5feb8bce140e4","openssl/ssl/d1_msg.c":"b5370bafab09971437eef70f2380583e1f405908e8622c66ac699a9924d2bf5b","openssl/ssl/d1_srtp.c":"a5a5762a5609b3c705f04730b7860c10a77e4903b6a4d58f4d0c7d94abeaf487","openssl/ssl/methods.c":"704f7ed24dace6561b5179dfa5aaa7258e9599c49f24b8f8a47c37a80109086b","openssl/ssl/packet.c":"920b71e2ca4cbbc70d4e844a47d5101fe0b0e82300d0154a823b8879c2e8731b","openssl/ssl/packet_local.h":"496df2d06fcd70f7c1b77a44b777ba0f856b44e745da9570ec10ffc312da359a","openssl/ssl/pqueue.c":"7a2cc45afa28e7d72fc2f4ca66fb17cce54c2064ce4613975b0b2c1eaeaa05fc","openssl/ssl/record/README":"daa21a1309c257a48a089abd2f65f521ef442aef1428c5cce50af24ae4b586c8","openssl/ssl/record/dtls1_bitmap.c":"be1e12c5b264d22aeea4a3538968f4865339f1cf3f93c9eb9127d85ceef1115e","openssl/ssl/record/rec_layer_d1.c":"8dbe5d37fc5eb62c819116e85b3c9700efe661d251a3e0313d18b25dee1357d4","openssl/ssl/record/rec_layer_s3.c":"f2a89436a103d6a3c33b7c2d2e43b77d061499683990a8e08d3f4db9046f4a30","openssl/ssl/record/record.h":"53f3e73b8849b2a6460cd85252da7a7b58df4e9ac7e7871859621285c20be85e","openssl/ssl/record/record_local.h":"6569f176c637367a206f2c645c9d3f95b8dfc212a2e4ba824ef8cef11699b72f","openssl/ssl/record/ssl3_buffer.c":"3d04877ec817f4905dd59cebe4e350d74a4fa3cec3573ce4358e322b7779937c","openssl/ssl/record/ssl3_record.c":"6c05e21421d155481540ffbff8e1e2387233f1df790255104a8cfe08564bbe58","openssl/ssl/record/ssl3_record_tls13.c":"3b8801561edc994eee91c7f6a05a850fc653c066ee0b9ce37e4ddfafe69b52ba","openssl/ssl/s3_cbc.c":"6e097416a5b0a5135cf2617d23c18a601bfe195eca9d1310f5e795ef575ef19c","openssl/ssl/s3_enc.c":"db6fc3b770d4184dc9ef32f86729309bd2d1b45bc6b8ada7d647292b5b78afa0","openssl/ssl/s3_lib.c":"1af98072e5567c42c7018299c6a33f8f68e76bc8d153d5956f6f2028dafced9a","openssl/ssl/s3_msg.c":"6647cd224f35b0a3aa7e75b8a56c7376dbfca5ccaaeadb30a1736bf2f8fec057","openssl/ssl/ssl_asn1.c":"0404e563aca3f0d69140a72a0c1f44e86ce092e90213462f9423022352c5ad81","openssl/ssl/ssl_cert.c":"fceeecf99fc8eaabebe7896bc5103ed499650ce970d2e0968e31fae46b279d1e","openssl/ssl/ssl_cert_table.h":"3a4eb66c0ee057b35cfd4ef370af76534d4ee3e73067e0b6cd557d3be6de97e5","openssl/ssl/ssl_ciph.c":"37a21a9416fd0d59de56fe673b2c086a0d4437425885616e3c0e4f9a7245b2a9","openssl/ssl/ssl_conf.c":"a0cf59e3376cede23fe0252beea1b146d10c018bb0dc69f68000e136e5dfffa0","openssl/ssl/ssl_err.c":"d795b9e5938aa5f02f27c8e9470e61856b00188e6a7859789abce4cae0da8fc5","openssl/ssl/ssl_init.c":"2710e8af761297bc577d102912ebc6415ccf2c8fa27ef4124afa1b188e93bc1c","openssl/ssl/ssl_lib.c":"8b588affba5c1f28f3975e10a43c536808a0a5065a23972e732eaa1ea21594c7","openssl/ssl/ssl_local.h":"e9a6d377724e4514cb7d1d54c491847acc3aa4db92278a5daeb05ffe998e143d","openssl/ssl/ssl_mcnf.c":"4192f0c8da609fef9f19ec4b5c4c6bd3713a33ff28c2f076c662c2dbf0a1eeac","openssl/ssl/ssl_rsa.c":"3bce84b4619f07adb900d210e432e1c5c49a4cbe3b12cf89ac2276b928b15719","openssl/ssl/ssl_sess.c":"e12d08d823477f0a29b8cafd153ba8992075cfcfd4567d1e3a5d93ef09d62f13","openssl/ssl/ssl_stat.c":"032df59c03043acb5c7b4a5ec6926461e39d1bafd5b52f855e6016db16f156e1","openssl/ssl/ssl_txt.c":"b0f6d0c6ccd58a5a267a71557f1079925d406853ebe72e6b46c99343597d589f","openssl/ssl/ssl_utst.c":"69295713d556992c0bb615ea09f15e4618ae98c9b703c42efec88d1a228bf43f","openssl/ssl/statem/README":"10b892c88639c2e6b008e95087a17506758bf307b9bfde993982b29123ea17e0","openssl/ssl/statem/extensions.c":"93dc3d28730c3c4c7741a8b57af4ca3fc80463644726fbadbccd76a5214510a7","openssl/ssl/statem/extensions_clnt.c":"9a4f7b20e4b38d42c829e064dcb8ef0dad9e4d7ce92d149df899afadf2fba728","openssl/ssl/statem/extensions_cust.c":"92f108de62c669cf884888c266466e03831f5203f06799566cc1fb16bcdde663","openssl/ssl/statem/extensions_srvr.c":"d8ce734ad48ea0a6f997654a0f6b6b6aee7758c72305cd7356c423f16f31b3a3","openssl/ssl/statem/statem.c":"ea1ff60c9a1053f275568758ffad59ab3c3dc1073d54ba006154c6e6fb1b6af6","openssl/ssl/statem/statem.h":"28fb0cc332ab8222ea7c0087fc99aee4a9b049de6c6ccecbfa9aed80dfb89b8f","openssl/ssl/statem/statem_clnt.c":"1021173e3c20e75e532d5932600b8735d701fa74eff0d3adb46df09bd8e30c96","openssl/ssl/statem/statem_dtls.c":"4d57a32b5ac129d63f6eeae674d6fef6e565dc9222e168a3d5fab65867c61487","openssl/ssl/statem/statem_lib.c":"ee1983a63c9f80692602d8b3f004bb5a46a4ade2a39a54b75a81b0c08be8969c","openssl/ssl/statem/statem_local.h":"9190d8d68e261b0633e1514d6d15ce6bd6bb2d178b6f4936c00b82984d2ed3ef","openssl/ssl/statem/statem_srvr.c":"de7e03dd4a164fb5d10e54deba4d7887df3f149671ac7f3228ccbe7b59068c57","openssl/ssl/t1_enc.c":"8437b79d584c1b20764230b2bd14ff9bcf86b89dfe2ab1ac81d1007166146a12","openssl/ssl/t1_lib.c":"9e9ecbf615a88eccfe0f49cd3d18c3865029cb7a9770c724d07cc9a4c66d4c6d","openssl/ssl/t1_trce.c":"585bd13faf56b2eb5b853e873b58ee4bef7b46560c532a9d5947aa8402f42a9a","openssl/ssl/tls13_enc.c":"c9569dbbbf430780aee2a919a943c3530ffd379bb8c849b35320e7b3b125c0e4","openssl/ssl/tls_srp.c":"0f863a2373bdba22d2186373c1a9a5c3a0ac4ba421731e36f0980be2c20c103d","openssl/tools/build.info":"4ead731019edb0b0dbd7b72993c59498e3a645d0472e54b0c41cbb11c20eaebd","openssl/tools/c_rehash.in":"7d954083051823fc30fb116e2ac0506f3b9334e9b5304e9d878ddde1ebcc385c","openssl/util/add-depends.pl":"d2803c17b68414cc6be7d00ce0051d6f362f72cc7089826817d9f4b65fd6d38c","openssl/util/build.info":"f65db6fe6a0ad3669696a3f5717e8291fd8ab510963febaee8009cb2974bc175","openssl/util/cavs-to-evptest.pl":"fecd65d728fa532e8ef3552f25a838092432be90d52e86346bbc635dba01f414","openssl/util/check-malloc-errs":"b8cc85a985270733195081b0d682a8b89c5342e26ee61a4d794b082844381bac","openssl/util/ck_errf.pl":"acaba574c5b151f4d252dc4adc4741660cc83f0a3d6cae5f2b5faf0401864db9","openssl/util/copy.pl":"e2dcac32a8cb1618e0909cceeb674689fef22805687187d31a235ccb10a6534e","openssl/util/dofile.pl":"61c0a8ec7b57c34e12999908bcdf2671025750dad95c1697bb6cafa8f853f9e5","openssl/util/echo.pl":"d8a0f4766d83ea8aecdd8e361c8866b9d48f40fd50ab15968d35fd54ef521648","openssl/util/find-doc-nits":"eb9b0be06de855af7d557e25f028acdb5f6de4c17c1f0a1db14157ba48d60481","openssl/util/find-unused-errs":"2b904dc493480c41d9799120870edb9e0c28c243a91029d46e0aece8cc5ec4c2","openssl/util/fix-includes":"f9449e929856883f67a89a5d4fe281cd9014412647d739b533832ec80de05098","openssl/util/fix-includes.sed":"68bf0c81208821f306504679015b873881518d7850c699d4f296778aadcb259a","openssl/util/indent.pro":"3eb0261eae9a79d889074d893fd5690e6d46ee55e5b59a819b14a093f6269725","openssl/util/libcrypto.num":"4ce1907d53f783902093eea555b2c7808b523ae0f17058a5b5fb093100d6772e","openssl/util/libssl.num":"673d0209d71fe17c4cf0da2757603f3c1c10b33408a95d196cf9b14c15f79af1","openssl/util/local_shlib.com.in":"f267e61b6cec87c33bfebfbb68629952117c0f78b299781d47deb73a887e7257","openssl/util/mkbuildinf.pl":"855b17d7158e1a556fda698a179c9ccb193339f7757c2a491b3ab07a1a446614","openssl/util/mkdef.pl":"2017340e077b0de03007e8a802ef1508091fe5a9d7abf5ed9a89bf011781b699","openssl/util/mkdir-p.pl":"ee06ef9368633cc161e0547505886a7643b9c7fbe27c45cc28d2d1615192e0f5","openssl/util/mkerr.pl":"ac7c8be131ef1ad3ebbb9ec5efd2b07fb9ed8726c2a9edf19c6e0e3ac63d3ecf","openssl/util/mkrc.pl":"62bc9b3dea2536c73498a9a7e0a21fe2ebdb5504888175dbcae3715e285df26a","openssl/util/mktar.sh":"67843c53a1f595020d029a2fd32a5097d07b11886f1ffa642af18ecd45038d9f","openssl/util/openssl-format-source":"9933005b6d8a87777cd4290d5b928970d870d73439c69b75b66b4c5965dfdd57","openssl/util/openssl-update-copyright":"a07ca62389f204668d4768a5eaf722e3260fe1d0a46a5174ead31d3a1a102d39","openssl/util/opensslwrap.sh":"761e5ea2463e754ad9f326cbf3571b8c0f1a0002706a24c393354e4f48c444bf","openssl/util/perl/OpenSSL/Glob.pm":"4100606067f0b577d3e6d2d2aaca93d826fb66105639eb94ff76c70ae8c526c9","openssl/util/perl/OpenSSL/Test.pm":"7731f2f84da59f641039b82bcfaca312a0ed23eea5e7ae2b748ed188bd26b0ed","openssl/util/perl/OpenSSL/Test/Simple.pm":"20f978dce212a8631ce0e6b133e26d55ff3043b84a4b2cd19ba45f3da306b1cb","openssl/util/perl/OpenSSL/Test/Utils.pm":"1e31fa3ea00ff98b3457a3ad98af046f33549bd2466da29bdb00f0d5516aaf87","openssl/util/perl/OpenSSL/Util/Pod.pm":"78c4cfdc2141d24e28e5972003d8a3c437d2d47e049a47bd2f63217da261168d","openssl/util/perl/TLSProxy/Alert.pm":"23a9d02adf3f04d93b5357952a823487f4e6bf6685e655f9f640f1b588f89e79","openssl/util/perl/TLSProxy/Certificate.pm":"bba9c1ecdc254560be9fd55ff2aa576dde3e52a4482668516eb899b448e5b222","openssl/util/perl/TLSProxy/CertificateRequest.pm":"c893eddba002f097a2c48743795842b6c7fe663d4196a8066aabbb452e7d0214","openssl/util/perl/TLSProxy/CertificateVerify.pm":"97c5e987444f7e368cbcd774f0fe71597e852b0c081b3318c1c51ae6c74d5ea9","openssl/util/perl/TLSProxy/ClientHello.pm":"3a135c1f736b85d964ba9b9b011f8216cc65563d258e60c0c163b99d2e032e2f","openssl/util/perl/TLSProxy/EncryptedExtensions.pm":"ce1b5f1a43a33d80bbc726011e5c5f8973ac3cc7b07708a8af47ca9ac1e1a371","openssl/util/perl/TLSProxy/Message.pm":"f5b7decf07b0475b7a3b6b4a76ee6ce2bc4a083f69e8ec3fddb7ac2f202c132c","openssl/util/perl/TLSProxy/NewSessionTicket.pm":"6630a0f249c0a5a429be1fb690b0d1d36d6363d39aa7607f799d6dced0cbe9d1","openssl/util/perl/TLSProxy/Proxy.pm":"ca621a4ba020cdfb2d2fc2e7911c08a770f967f55855b7f38eeec3c4c158a688","openssl/util/perl/TLSProxy/Record.pm":"a878d1b039efb4a2f3c2868d20e568170816c4bdb824b56c822ca6cbe6e26428","openssl/util/perl/TLSProxy/ServerHello.pm":"ece612e81f27fce4b8106f82829f224f6b384d3d99eb21770b81e6daaf959d33","openssl/util/perl/TLSProxy/ServerKeyExchange.pm":"48754f76d9ff1be6a4c0f6f27b6bf0fc91c5c3594636332870a25c4590267493","openssl/util/perl/checkhandshake.pm":"e625a1c11f358dcb9e2d292ba36ebfa7b14a5494fc1c8020e8a082770dd98aea","openssl/util/perl/with_fallback.pm":"332618a0267a1a5145d82c8e37b663e5bf555d861e3f2851e0f2a25ca2cc90dc","openssl/util/private.num":"37c2be8df423e5064576166654a033af30801303a0f4ac71a27d4a95463ca6c0","openssl/util/process_docs.pl":"a731d563140e90c91e07132183f7c41b3c5b9ce12460880b14ffa3d738f72d98","openssl/util/shlib_wrap.sh.in":"517e70558005286dbeb506ce57a416934560a2f2ff27f5bb48d4472ff8c5ca7c","openssl/util/su-filter.pl":"892daa1ba38762cc5cfd94a204618a0abb2a539a821e237946c93e774fd35f47","openssl/util/unlocal_shlib.com.in":"21e064aad7466030be7a452982a21bb50059a9634185d312b18a5d3a5582ee5d","src/lib.rs":"8830350bf7f71aa8592ed1fd2dbc3211b2f8c1562e7f04f082b242ea43858879"},"package":"045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6"}
\ No newline at end of file
+{"files":{"Cargo.toml":"7d7f8b6ad1916b40817e0402ecd8c3e5bb99dceded94cc1773b6eed4a7d93a16","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"8fa9e96fb0dc9e278a03285b69784c2904de6fe5ccdb6fb70ba33791bf6bdb5e","ci/docker/aarch64-linux-android/Dockerfile":"b6321433a0886f2e6d9c489fd042137b4da9ce4012d49bea108e9c4fa9064b3e","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"c908701526553756579599caf68f86dfe1f7725ad846cee895eb887a569a7035","ci/docker/arm-linux-androideabi/Dockerfile":"10be394a6196a7904fc04e5b6fac6affd67564897476f9a8c3f4baf827a099b1","ci/docker/arm-unknown-linux-gnueabi/Dockerfile":"ecfe5fef865611dc68bcbbfcb89bdf09dd87599985954f05fd2fff772b816e51","ci/docker/asmjs-unknown-emscripten/Dockerfile":"621d535e7705e1d9d3db5c7d68f7e86fddb849f408efd5a46dd21c1bf3e68f75","ci/docker/i686-linux-android/Dockerfile":"e3aa316c6af0a4559803518cef6bd2c1d90677f9d5d964140266f58369535165","ci/docker/i686-unknown-linux-gnu/Dockerfile":"4e79d9cd661a89b9bba7c2a0cafc51e48fe6ca48da421fa10aeacf600d739d54","ci/docker/x86_64-linux-android/Dockerfile":"bdcaea60bd2151441064a5ace526975aa361d80016e736f9e068d7b479cba9ce","ci/docker/x86_64-pc-windows-gnu/Dockerfile":"54dd42ea91e2adcd98d534abac81c42a0ec7ac40ef1d9d7fb86e33c93bdca23a","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"deaceeb36695cabb94d4078b7008847d68c257f7cb789b634e1c879c557866c4","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"f2d5a414b194a0b2fcf622781c666065a1112296896b82e0f268191d18cb1ab4","ci/run-docker.sh":"d25dbe04ee974cf8a3aad9bc0647e5e152854f8a4af66f59187c63c70795d01a","ci/run.sh":"f3a6a73366f328c481fdb7ef1d07915398d6c695195a5895695652b4a76aa6ce","openssl/ACKNOWLEDGEMENTS":"e1118418fb157664605bcafd07c25befa2ebe52d001a16f63e2f487c8db79d02","openssl/AUTHORS":"698c66ee18f50ee7daf36e9a4566f9fecbaea4a5c6de94a42f66eb489adc83d8","openssl/CHANGES":"2094c28aaa4b373afae3a1a25b085287f7ba36f9fc1a1ba9623dfd5a0f870672","openssl/CONTRIBUTING":"1fa1178c49210ec027657c8363b5c807e2bc6b40e136b462a6c21ceb45fc43af","openssl/Configurations/00-base-templates.conf":"8a59b4d78963965f01d3abfae92aa76a375515e9115033f2457088e1472b4fed","openssl/Configurations/10-main.conf":"516f54338c7d2f2aa562fb576e8514b508f08d3c28d6857f477fdc0667b45ef7","openssl/Configurations/15-android.conf":"aa261a39414c1e9884e7e81962642310e57a556511696e42eb0cbe02374fafb0","openssl/Configurations/15-ios.conf":"26ad7be0c3826195eddf9c19d3d385fa3dfd90869bb3f46fd452cddefd324ad7","openssl/Configurations/50-djgpp.conf":"a1ce6facf2a76952f9924a2c0e671b750d6822f1b43cf9ddc0f4859eb3fd3435","openssl/Configurations/50-haiku.conf":"a91ffac31fa2fbac0c4ac04cea16d48c5c34129e94bd008eacf2e3ddde3dbe96","openssl/Configurations/50-masm.conf":"45e544fc21dc1ef1945beb8090251f1827ee5a6cad56e4c23d6fd4721205314c","openssl/Configurations/50-win-onecore.conf":"2e2f626d9d60beb243f2cb7aa62161d1cb830aae58cf8e50dccc6ed5efe4008b","openssl/Configurations/90-team.norelease.conf":"c2be1594850a887b2f4d4578c66ce4aaf20ea36ba702b32b2a0a09dee301137e","openssl/Configurations/INTERNALS.Configure":"3d54a61916deb1f715d24df0e10184d6f1ad557bc7addae9e8747e33ae7fa58d","openssl/Configurations/README":"0f61201ab182fc25b22c29cd8322bcb3627c0c15bc2ab009b4456ced19d72ea0","openssl/Configurations/README.design":"74dbfdf425cc4306bc450bbdb8db0143d944627e8044517de1ab5d5e618ae123","openssl/Configurations/common.tmpl":"efb432110f945075caa4dbc8471f903d333a303348bf4b8bf8072fc17208ec23","openssl/Configurations/common0.tmpl":"aa5afd98d4cad920099be90dd991884c21b3f4598bffd2e22c8552872cc5fc88","openssl/Configurations/descrip.mms.tmpl":"4c4bd1dbedb5f245b2e4a6a292dccaac8a07d83884286ad5f53eb84a63242a7f","openssl/Configurations/shared-info.pl":"8c9d8a35b536650aec08e192cebddd077dd93f1a2ba8e8e39173649991381b92","openssl/Configurations/unix-Makefile.tmpl":"bd8641183cab699da64ea22d5d41025499ca9c8a69dc4d9da73446e36004ab46","openssl/Configurations/unix-checker.pm":"86716919b8ed8989dbec32b425161ef9950b809c3fe019e426051885e1489776","openssl/Configurations/windows-checker.pm":"59edc790aa4120df7c2aa3214e1f51b0a044190614ba653df2255be286359366","openssl/Configurations/windows-makefile.tmpl":"eedf0a0c8c4f83744f0f73d302f0972e4610ab106338cb3ec4a4c427dd62c394","openssl/Configure":"b73918ec38b10c3ce6eecc2821f17bfbd190b26f0ebfc15f0acfcbf09f7d0618","openssl/FAQ":"0dcd26c83d90badb57e21b7c8659e2c3919b82c8dcfa058d70f86fa926089c2f","openssl/INSTALL":"dceae9bed597d526a126f95507263563800777f6a1ce218cd0d1b5aaeed8a6d0","openssl/LICENSE":"c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c","openssl/NEWS":"0ee827642189a8073978ccedb48eeb987cb3dab983105026e074bb20b6f357b3","openssl/NOTES.ANDROID":"7b6ea508f8ed8a9acf9b7f2097ed11d98d8f9a162a01ebb0025177441f117bc4","openssl/NOTES.DJGPP":"681eb2565ba66d185f0d7b23538acebacf959d8c23113f3729f567773c4d04e8","openssl/NOTES.PERL":"d191543a4f97ab7df62f25e75138802bf85a31e082d64773da3a50188c493ec7","openssl/NOTES.UNIX":"e1d727530000565d3cd37da881a984b565c67cc9e39a908e77e83532d9a21d9c","openssl/NOTES.VMS":"4b21ff74ab5ed75750657024c8159777e9f64e193b563d07ab9562ba14920edc","openssl/NOTES.WIN":"d63cc8b622130bc05eb6b7dfc0688e70c90da1bb15bd6504081e113a9446fa6f","openssl/README":"8c16abcefd83fe640e4232e8edfd3ec72cbfcc97cc1ebc01e8d5f5542bac5e38","openssl/README.ENGINE":"666adc424b9c8429d49496dd6fd45878c91b56347e139b77978fb60253415547","openssl/README.FIPS":"21d77b48ddf9547ec20de4ee43414f040c08174eb65526bfe46ffe2d4165ea67","openssl/VMS/VMSify-conf.pl":"e7ba8104be58dceea15342d25ef0b3342baa7de9734b67f63f99823cf0f052c3","openssl/VMS/engine.opt":"9622da581af6dd9b906b7d0b0c92c48f50f22632383a08bb335103d0ab86cf2a","openssl/VMS/msg_install.com":"a5e52680fe34a8d8df9968f4270c01be265f768be4eccc3d8086f2e56bfa2cce","openssl/VMS/msg_staging.com":"6a58ac395b7d1bff16c2967b501cd41d296b9e355f2532a1518a8a242bd2a739","openssl/VMS/openssl_ivp.com.in":"fdfccaef699539dc9a772d86ff4457152e874ff0720fde689eff09a3b346b1b2","openssl/VMS/openssl_shutdown.com.in":"934c50cc721507b7fcae17835c0c57f82c55e1ea9914df55ca3e72904cdb64c8","openssl/VMS/openssl_startup.com.in":"d042019383229968fffbcf4e01c190278e7a2479b739d425fe9d770f2ad1312b","openssl/VMS/openssl_utils.com.in":"bf882d08efbe25f8ae46c6fe045a9c9d69790cb5443c8e14d812a8c834ed1e66","openssl/VMS/test-includes.com":"162c56165429a073fa397eda227eae83d575cfcf0b17b6ff7c4e0d900499fa1d","openssl/VMS/translatesyms.pl":"bf9dd82f9487d8b1350e2a330dd125712c2ee1d3390da1b2286fbda3eee5f68f","openssl/apps/CA.pl.in":"880374dbd8e2ad686d48673e8b4d319b2f6e0312d05aaa8018cc0e7862032284","openssl/apps/app_rand.c":"6e52d715808e3ee8d33be50afe2f4a7dcafeefa9754cd9735f722cc61c2c39f2","openssl/apps/apps.c":"c4fc428697252d6d54c3b507f189f3675329db3f2482108a4f64f7efefb83fe3","openssl/apps/apps.h":"3b52233d7a7233aed678d0025815aaeecac0dc23e564a413f347cca13588664d","openssl/apps/asn1pars.c":"073ca2401664a7157844f6bf73aa85464d359e2134bd56e6b617f3fbcaa37381","openssl/apps/bf_prefix.c":"9ee399824e7f33eae606788ad777af357e307e4b241ea38b4e53dc2b7c8cb0c8","openssl/apps/build.info":"c6e41aa4d47403adc5f3c1382da77052a4e168f423523265be870cabf82cb825","openssl/apps/ca-cert.srl":"8460deb84917c63e1fdb019b02d4332ceaad0821edc248abb69a26fdaf2bb0d8","openssl/apps/ca-key.pem":"3490491a6a38d202a29ba250f717b8e3065eb1ee3e16d9e5e9171d3f8f2bf8b5","openssl/apps/ca-req.pem":"a1d0a69a7260d27a140a311a1f9a6e7364859a007f7a18bbd9681ccaa2c55121","openssl/apps/ca.c":"b801bcbebbb2d3ba26b3f0306ab261e7689ecf95215fc7320ca9aadd9de78d4d","openssl/apps/cert.pem":"a4c9b015f67947c38833fa9b2c0a07d4ee4136955ffa3a28a1e34be048f9b957","openssl/apps/ciphers.c":"2fa8c7b381417ee687e49796b1b6e3625b6f7d21d3f413b8ad665b9b1345492a","openssl/apps/client.pem":"5517423efa9a5cd7ede4604399d1572f271260d2b7214ac4218f499387b18c99","openssl/apps/cms.c":"28bf084e6afdb4efdb5f0af4131b4ac4d207f820cdd5842d28ebb3e05578ad67","openssl/apps/crl.c":"9befa634297700f6001ad1c7eca0d63bb8b1dbfae7bb1ab72bfa53336192832c","openssl/apps/crl2p7.c":"5b0d811d112cd89dfcdf4576ae7b7fe4bd2d6cfab1dac98af25ccd5c32f2ad17","openssl/apps/ct_log_list.cnf":"f1c1803d13d1d0b755b13b23c28bd4e20e07baf9f2b744c9337ba5866aa0ec3b","openssl/apps/demoSRP/srp_verifier.txt":"90eeadfb310fe0dc8e4bae1cc30b202a4ec098ff0dc8d0370a5fa37508ec581f","openssl/apps/demoSRP/srp_verifier.txt.attr":"f185cb1322492dbcb4c2e4dd179bd3c09958fd39287dad4308e2fbd3c569f669","openssl/apps/dgst.c":"90ef4dc631bc28d52570512803b4169ba67f2d4538977dad4c1a9d6a3e008d17","openssl/apps/dh1024.pem":"e819c122a1c2834f9f9583b84d40e658bac62c7618560582532a3967e0ee70ea","openssl/apps/dh2048.pem":"accf8e94315c6045756bbbb3d7505993ed9410b93c071fd1f238798f2ad8e10b","openssl/apps/dh4096.pem":"d50f4c0d4339585076895105fe66219cc16d2fb3c8486c4a4b65d954a00412e0","openssl/apps/dhparam.c":"36291335870f26519025cda1c8dbb2fcbb64c35d8a5c0b78d1be16d22e7a0fae","openssl/apps/dsa-ca.pem":"840ab42f5a6754f9ddd6df488410a689e6c10ed37059a9f3ea2f7199458aab15","openssl/apps/dsa-pca.pem":"6551544012b1e3c4c58f0b64200b75f03b2a39eb69681872f41e6793b0d524be","openssl/apps/dsa.c":"e9a10e820f46b35e6d44a5001de482b5a4b7bc64f5c7a47e9e86a0073170ffa3","openssl/apps/dsa1024.pem":"cd2bd5801e45e07d0df2e28d15fc30f13ad473ebd614abcf0bb81f6e508b26bf","openssl/apps/dsa512.pem":"b2abd5916a1a7206e5daff2b73e5faf884c6ec5e53393c08e555887c8ab6f4f2","openssl/apps/dsap.pem":"6cd4f9c195a56c4cd0d801050b4fd2404a72a98d0ed1f5b18cb17ec167cc4f84","openssl/apps/dsaparam.c":"ee7664f99f0ae89302efa47ba098e3254bf2f369c019c31286a6e571a9f470e2","openssl/apps/ec.c":"7fedf07458619ea8d48d203999ee145d5d8a9ce0fa5a490c89d7b3092dfc3e89","openssl/apps/ecparam.c":"f8b3c5c1e461077330e7f5f08973e7fe6a84442dc8c2cd1c67ecd54940e2fbb2","openssl/apps/enc.c":"3bcad7e671df042c2a32de212aed1a29179738bd11cbfd706be6ddc580057500","openssl/apps/engine.c":"445f3491a326e49dfb908fa661cdae908fe950875585947c8b485065d7192fd2","openssl/apps/errstr.c":"53188956eda5015bfedae11762c22857ed781e7ad535472e762d564884de9a69","openssl/apps/gendsa.c":"2b06541a2770ce29ea524741cce83f907bdd4dd6421a2a537ab8937186b374ce","openssl/apps/genpkey.c":"4ec4c0b42debd510133cfdb3f558289c56d58318686b727dfceff2028b1e9f3d","openssl/apps/genrsa.c":"4e083685f5e9bcae19042f8c2d5e597a59b2908090792a95011669c2c69e16d2","openssl/apps/nseq.c":"9340adf4468cdee2ec2c7b32a5bce64291ef675c3e2d34907f8e511af612d04e","openssl/apps/ocsp.c":"f245736d1e959337b1fb87fe475200f1c32360f3df50f35c21bcce981e3d2e46","openssl/apps/openssl-vms.cnf":"a280743343019485f6d9dddbc7e341b5d7a7ecc51f8d97c0842c795b7ef3204d","openssl/apps/openssl.c":"878bf601ab33e533c59f02ad08d2ad12dd9153ab6b61da4bd445cddf3ae3f868","openssl/apps/openssl.cnf":"f10ba64917b4458fafc1e078c2eb9e6a7602e68fc98c2e9e6df5e1636ae27d6b","openssl/apps/opt.c":"d16922f4d94d39726eafa62ace1a67ee7f10c6d4a7b47e3b872779e25c6fa090","openssl/apps/passwd.c":"f7f0d61c984a744b3d97d14a751f26c452fb227e24b99efd9724e76f33e55299","openssl/apps/pca-cert.srl":"8460deb84917c63e1fdb019b02d4332ceaad0821edc248abb69a26fdaf2bb0d8","openssl/apps/pca-key.pem":"6eba0a092a01ee003a4bf101491de540e4ee03b94075578a67084292581f0430","openssl/apps/pca-req.pem":"f043270a1483e035369e9aa6e7c3ee570f75e443b3a18a0198aed6c5b1f7b0bc","openssl/apps/pkcs12.c":"9f157db41a676ba5393739d3eb89d2e4678ef69c50b6fd541a8522552dfad7c8","openssl/apps/pkcs7.c":"dd8b6b134c82564796d819845abbbb52ee1cbc9b8545e1adc1b49fe8f38b4e98","openssl/apps/pkcs8.c":"856e5911266e6d6c733ccc650400249c3c2b2a684f85aa2375e3c4a7a794d3d0","openssl/apps/pkey.c":"667cb21e1cd7ab16c259b69872c04d694ec442aa74f3c6affa2342dfa4ba67c7","openssl/apps/pkeyparam.c":"01dc6f1fda2af529b7b94acdbe982a5b66586de37b2968e2b569afbbb2f10ca7","openssl/apps/pkeyutl.c":"83771b82d508a341fa34ce67756ffcb1dfd8dffd384c01a4370474f725c59150","openssl/apps/prime.c":"f78a49e29cd624bb4b3e822e7fa904315779b5210ea22317fba2dec552b7b86b","openssl/apps/privkey.pem":"64795d8b4aac68c76ba833da4cfb54e739b7a90161ab3866d441ae0205da6fa9","openssl/apps/progs.pl":"031f57b38fe763c34bd35844d1655e10fb4b0a0a9ee629d2471adf041aaa2b71","openssl/apps/rand.c":"a5789f9f5a69fa1e4e8824c5aa7fc776f1e30b0e581ec371536096fbd9e0fd84","openssl/apps/rehash.c":"54f03091b739cf4a33b6692c442171c7d6a30ec6fc245d7175c9ebd81b508732","openssl/apps/req.c":"487a8015a6230dda2b4cf774365bf27c83109a960425365e6b9aa614ab2dff08","openssl/apps/req.pem":"7e5054bc53334b6723ae688236f94aca50b8a8b87eae44bffb04aa3f971a4d4b","openssl/apps/rsa.c":"8c13dac2a4b2073c63924099695aa0c57cebddf0bd50e4ea4a7d210c61c2f02e","openssl/apps/rsa8192.pem":"24f69b9f93919a7cc85159762f269b3b3a7e807dec24ebf90ccf166e1d63fe6b","openssl/apps/rsautl.c":"c3689f04ed09e06baa5d83a740211479bb2b40f189a81b81f827146ec5385c9d","openssl/apps/s1024key.pem":"dd647f2b3d59c7450bd0693d215355ce93919b0462f4f57c35e4ce292e671a61","openssl/apps/s1024req.pem":"b6475a60576911f5dc510e2dd4aa63e6de82827dd74baf95dbc547a499a8328a","openssl/apps/s512-key.pem":"eabd97ef4ae742dc493633e69d55c477561662ca63a9d914da1cce76d70f562a","openssl/apps/s512-req.pem":"492a3d866747d7495b8966d28641d327116f1f84e965177c213bbf9add182163","openssl/apps/s_apps.h":"f3d2232dcebb504861a59335c1c657ea4a5273b03a68a13ae20e561046ce8c85","openssl/apps/s_cb.c":"efaab5ace41d9d390d44e42caa90693ac763c112eb5175f5cdc5712fd8fecc5a","openssl/apps/s_client.c":"40a1213d86ca153e54465e69784ab6824ca25c8d7787aa8fdc416d0ac847bace","openssl/apps/s_server.c":"c505b7037a614934bae0f785a3b319683d7e580c532b114bd691932e6e3f38f1","openssl/apps/s_socket.c":"3772d1ca28dfcc89b586dd3d922b9db7dea372b80c355cd9a5d3d15d352c2d7d","openssl/apps/s_time.c":"b97a09c3aabdfe956b629e340786893947f6edda9f62a3aa6d01696b71df822d","openssl/apps/server.pem":"ffdc8d77eb82b815de5235d93d1b733bf7a6934a8276862cd3b0d842b7dcc53d","openssl/apps/server.srl":"43fd56f56bb9bb18bc9c33966325732b2d7e58bfe2504a2c5c164b071c1b8653","openssl/apps/server2.pem":"315a1d925c484b57b5f6b154318c241f49803a627d5dd97a1add7eb5759a16fd","openssl/apps/sess_id.c":"e83c514dce778a4a0571a3aa4be4092332555d18e67bf4886b1214217e017d27","openssl/apps/smime.c":"54d4d7fcea506c7851d4fb490b2159de50fa20a53fd5ec7076102198dcb6dbe6","openssl/apps/speed.c":"2acfebcc2c902533e6adc6c30f210009892b499e4216947215a48cda76869676","openssl/apps/spkac.c":"76800611dc1e50ae3df5cbcab236a7fd13fddaaec8aa1b8afe58baa519a8e603","openssl/apps/srp.c":"e0c02d90859698a4dec9db38604bf028256a5a25eff8bb9878f447bb6feb8b03","openssl/apps/storeutl.c":"87e65d12dfeaac45a122234d6f692995acbd327ec6df63afe16b9cd0179c6f60","openssl/apps/testCA.pem":"e75c583a194e000b9cae10e3f4224cf305c8be9ba057e3c86192ac008f57fad3","openssl/apps/testdsa.h":"67ec5ef1f45a7e41083ed72548336608893656c379ff01e0b4f42565022c2bf3","openssl/apps/testrsa.h":"bd13d6a56f990a4515241402dc0c9720d47a42b737d4041bdd042a4bc86d2544","openssl/apps/timeouts.h":"33d3a52e11dbe263072a7646cd75fac70252e32dcb997384c9ca1b7b5fb171da","openssl/apps/ts.c":"16b807fd495b19b69ce2da8abef1e8fda99362555db14a2d077801c866dd4c4d","openssl/apps/tsget.in":"8a3fa8dd19db4e6d13fad28438206d765b72fc804201f61e081abd1963792970","openssl/apps/verify.c":"b9eb9429828fc89fe0b3603ee709b6d09d5846c0258bc2eccb5b814ba6e079ec","openssl/apps/version.c":"ac399bc15e845495698e66c9cac09f5ca8f282d82cebffa59fdd9517380a50b0","openssl/apps/vms_decc_init.c":"8539f1d25c6b8d659f85dc8b6b679021afeb887b6c61b904bdbd6bb5d03a5d19","openssl/apps/vms_term_sock.c":"bfd258937ee18b21ecb57b3bcd88f18458c3e5960f83854b2a448e96c97084d0","openssl/apps/vms_term_sock.h":"ce3ad480013244ed87fba126098fb730ee807965b97c7b592936e4005c2fd699","openssl/apps/win32_init.c":"f2494d72e25318eae3d57523e3aeace7458187349f92e8287be39ac5fca2b6db","openssl/apps/x509.c":"a75bd19286102ca1f015741c68ee696289a90c94db73079d590fba75a8b643df","openssl/appveyor.yml":"d71020aed505f851228ae8d5661d8587c17f3e8967e4d38612c8521da522cb7b","openssl/build.info":"1fafb451a7cfabd49372a2485f99acf6a5aefbf1872464a309c9bc79ee1afb31","openssl/config":"08c3441534ca899ecb40fe57d51376ca73f96e13b3bb32c53a72cb78ad2b9c99","openssl/config.com":"9070ebab2d5ebab6428a46673195e6bb9f043b0e9b394f71588c1ad17c9632b7","openssl/crypto/LPdir_nyi.c":"f638ff3001e5dc7ddbb230c288d47737e2d9f85226ea046a604a4259bad07cb0","openssl/crypto/LPdir_unix.c":"320356ac25a50f915697bd9cecab43fad7912420ab1551449422972c878aef7c","openssl/crypto/LPdir_vms.c":"adc0cd123d9c0ddba011876b4d5e0c3665a769cecccd1a5d6c5049ac8030fe93","openssl/crypto/LPdir_win.c":"63087d5abfbe1d49f5076f92ad2f5a5d58cd9f4af6cd21b29514c0326df367f4","openssl/crypto/LPdir_win32.c":"775d02591831f77ffee41beafd0388854e10742af0f27bb94ac2ab7a9597c51b","openssl/crypto/LPdir_wince.c":"2e6a13af735a9b7fb4dafebfce3cb4781b8bd0593b422b49639a756ac49e0a88","openssl/crypto/aes/aes_cbc.c":"34a4fe01fc7363e17a546ad762c0eacf9f3e2e54075f58a5e64a9a904f3a1c64","openssl/crypto/aes/aes_cfb.c":"53d9d10074bf4ac5463a288bb7278a7f8f21dc1143b7ee516afc3e217de20c1d","openssl/crypto/aes/aes_core.c":"30e5c42410e2cd816b35a5f823018ecb265a2da3c2bdd2aad1cdb226ea85a2c3","openssl/crypto/aes/aes_ecb.c":"d686330d81e81903043b0aae0bb5c42ded90c5d36930e93b7fafb1122b3a3a97","openssl/crypto/aes/aes_ige.c":"60ef606508f1e5cfb0bbf7829ea9a5122d6465f10511c0279bf378a3a821044f","openssl/crypto/aes/aes_local.h":"c03a0617d75a234e86f92c57548b630db2182c5ac5a1f42b8d2b7f654bba09c5","openssl/crypto/aes/aes_misc.c":"7662c30dbfa5d6944f0b346694d602a2a80c44ca3db7fd0ff1c0bb3ea3098e84","openssl/crypto/aes/aes_ofb.c":"67531b43a689fbfe5899b745d8f7016e254df0fafedee64af780b55c970274dd","openssl/crypto/aes/aes_wrap.c":"251791087036c02ed6e716dd4188b8b5937365c6c46a03fce55c92936446e9e7","openssl/crypto/aes/aes_x86core.c":"16127de408d69734af652c0fb3762d0a9a22aa0924caaad3e7720d9a4d5c016e","openssl/crypto/aes/asm/aes-armv4.pl":"2643bc76707494fba19c61da6718e595856833cf2e072302124b0dc5adb34760","openssl/crypto/aes/asm/aes-c64xplus.pl":"a9d46af40d5bf7fb09431bc61324dd61d8c502e0621c78118812f854a27dd9c1","openssl/crypto/aes/asm/aes-ia64.S":"3670f1c9503450b3d870b4b7a1f3d7fd09fa33faca0369f994b232b8a0331e81","openssl/crypto/aes/asm/aes-mips.pl":"281ee9e887ac017fe4ab300d062809770eb2c52e1d4a5d9c389c50eb895b8190","openssl/crypto/aes/asm/aes-parisc.pl":"f4cc48b0906233377375a3c839062823dcba4f6a42f319f99f51a1fc7ab10267","openssl/crypto/aes/asm/aes-ppc.pl":"e1f93284e66ab614689f080680fbe952865b862403c7c19c76cbfd3b422a8a3d","openssl/crypto/aes/asm/aes-s390x.pl":"f14c90947cb3f662ffde6c91190b3e28885d5a9bf78fa7e2102ee957e0b1501c","openssl/crypto/aes/asm/aes-sparcv9.pl":"854bee89601f5d1ea6e98cc67cc5f41b720ee025cb05888c6ae1d77fc9da3815","openssl/crypto/aes/asm/aesfx-sparcv9.pl":"b78394799c0e2b3f096394bdf4d3ea9f5678df0d06e0892456273f8d5c2c461a","openssl/crypto/aes/asm/aesni-mb-x86_64.pl":"5beb473ae072df0354243718780fa455621b2221e03fa9c921854a4d180577da","openssl/crypto/aes/asm/aesni-sha1-x86_64.pl":"fbda8b5f3b613f900269d372d91a490f01603dd6a32e417c9212560371002e8c","openssl/crypto/aes/asm/aesni-sha256-x86_64.pl":"f248cd0070544d1a3388247ccfc883b83d9bf6d58b40c5550f189e7223738aad","openssl/crypto/aes/asm/aesni-x86.pl":"254c726386a9205d6e6a8be48c6f9679e02895840e8912b4c386c55eb5b5a51f","openssl/crypto/aes/asm/aesni-x86_64.pl":"f9f949a48ae275aa455f90841406f684499475e960b87daecd9eb9a7a84c976b","openssl/crypto/aes/asm/aesp8-ppc.pl":"d33481726a7432f7e4a247e300b5a85ed5e6bc223fa2c9086c1efb2c25a29bcd","openssl/crypto/aes/asm/aest4-sparcv9.pl":"8030bae72b93e9e22812bef09fc3dc0ea95296a9c2bf0d34735ab5696850a982","openssl/crypto/aes/asm/aesv8-armx.pl":"3a3137a0a7130a61aefb5be06b3117100dd528232f8b70baba4a0dad1cf7e8c5","openssl/crypto/aes/asm/bsaes-armv7.pl":"a570a66cf4461ba6df4e6ca9f18f845455c1dd857518c489f15d05fac8b1cc9a","openssl/crypto/aes/asm/vpaes-armv8.pl":"6bc9a6daa838c106f5236911ad4a1de329f16312f2574ff52343a7ce36d24568","openssl/crypto/aes/asm/vpaes-ppc.pl":"590671c7967c261ab7f1055abe5dbfcce7c7897f42288aebe568d4d9c05dd17a","openssl/crypto/aes/asm/vpaes-x86.pl":"bfd3e7df0eb92c1d32225f1ccafc4cc917b352ba1ce7f5915924f36154aab241","openssl/crypto/aes/asm/vpaes-x86_64.pl":"aae1a01b2c793305227e6757dde739116c95c125bfeda6073ffb60c8aaae71b8","openssl/crypto/aes/build.info":"4fd9b60b8eba57c73ec8037325770b682151c84e5c8c74a8f9f87b27791c2fa8","openssl/crypto/alphacpuid.pl":"54de69fd5d7531b3924ce56e4f31d55a44e01293c73511fa5e80152678940ac9","openssl/crypto/aria/aria.c":"da9d631bb6ae5f11e5ae50ea033082568fe8e84e44f023c3ad087bf12b89664d","openssl/crypto/aria/build.info":"506e26da9ed2bd9dd14a25f593e649c5acf25bd5a56e43ccef16ec59614bb2e4","openssl/crypto/arm64cpuid.pl":"6ed88764bb65b5c2dd4382fc66fcdddc8fd23277679044061eefcfbb96df8c5a","openssl/crypto/arm_arch.h":"7e5614435c2fdf780310858ea0ff7cc524b5bbc112e97d9c861cda095fe07380","openssl/crypto/armcap.c":"9eac97979df9b8b50afd4ce62c6068ac0ff0a2277e947b718a3cc4fbf4a7f131","openssl/crypto/armv4cpuid.pl":"655d50afdfe0388c462f364ef77dd9fdacf1e34c4b9b4f6881959f9c16392734","openssl/crypto/asn1/a_bitstr.c":"0455687ebb68d32e633bf31188fc3fbf3d38e085ba0c717d5ccdb4d849b358f9","openssl/crypto/asn1/a_d2i_fp.c":"efc237e569fbe6c3aa4c993ed9b15cafa6eba03cd0c56b19c1eac3f6beb35354","openssl/crypto/asn1/a_digest.c":"602f45ee0c3cb0c0e713e1d62486740819cdbc4c96bd3256c1ad432448c630b8","openssl/crypto/asn1/a_dup.c":"0b089629598a4569585424c34dd3c67e03995f69b6e574a575cf2c9f998a1bda","openssl/crypto/asn1/a_gentm.c":"fb2e06a39014b803425ca75b10ffc34e24ee90953f893025630f026957f1bf4c","openssl/crypto/asn1/a_i2d_fp.c":"5d98da7ae83ec083f447a42d119a2696d853766f646a7eee0bb1408148f27f88","openssl/crypto/asn1/a_int.c":"b05e27052e97f1a4488f98d90b3b94493a36a33dbc3c1054da92c34d14f6b054","openssl/crypto/asn1/a_mbstr.c":"4e0818e467ad59bba8d0a8156219d61deb4d7db0e3d1b3dcec44d297d9a08a17","openssl/crypto/asn1/a_object.c":"1f34806c1e5c5fc5aa747ed2bdd9974117e0d521d383f0de2c3872747a6dcc87","openssl/crypto/asn1/a_octet.c":"6734764389c1ed27857a07f65abd406dcad0a3bcaf48c9b44bc50c435c493a1f","openssl/crypto/asn1/a_print.c":"a862a0dc5586a2167fdaa3ba47d79749eaed67e2a9d531bdd8e49dc35182ede9","openssl/crypto/asn1/a_sign.c":"90dc997934166ba2cb7895d184d317d0377ab74aee36f34c50c8b5c0c1c828fc","openssl/crypto/asn1/a_strex.c":"d81afd32a412987522b974036c1ce8baacafdb7e771522a7a3a61ac081c2760f","openssl/crypto/asn1/a_strnid.c":"46e07565ebb5adde365f69e5d8497f044ea9fd83f0b22ae8ecf0338f3f70703f","openssl/crypto/asn1/a_time.c":"3a06e13e97ad57f5e79a0205097665e7c474564f89badfbe747ea4084985ee8a","openssl/crypto/asn1/a_type.c":"fdddffdee9d8f64fc70f36469ba9b7b438f6bda52ca544a55c6d2a645497b561","openssl/crypto/asn1/a_utctm.c":"c713c6836eb1ff49be6f64f89b0d59b28f510c4c3f6206e5c450cc46712782bb","openssl/crypto/asn1/a_utf8.c":"55efd2f1103eb15b8199a5fad63f81b7e6dae98278c04556fa651f5155cf1b01","openssl/crypto/asn1/a_verify.c":"412f08f99c52e255855616ccda616e5390691cfc9d8ec8be04b757bf5fb95c73","openssl/crypto/asn1/ameth_lib.c":"15a82ae8a24481f1bfabb91686d79224d2bc4181eae15a914d729dffeb9968cc","openssl/crypto/asn1/asn1_err.c":"f12c5a109f37dea5e052b6a64ee84096de39614262b6696c4109c7f2aab6cd44","openssl/crypto/asn1/asn1_gen.c":"1c9a643ccf3f0a5c896fb232db91ba1cb4fada81ff895f0af848880f3f8ce17c","openssl/crypto/asn1/asn1_item_list.c":"cafc68db3b9f78fc349256799aed0cf046a0adeb34669d5eb5fe537e2d87da52","openssl/crypto/asn1/asn1_item_list.h":"617843466bf00b81d6f2b56696cfbc52edfed754a48b58a7711e951ac9b29ac0","openssl/crypto/asn1/asn1_lib.c":"3d5b557d6819008782ca5f81c83e540eb003a07ea77d19dadb25e1a44cba06fd","openssl/crypto/asn1/asn1_local.h":"7f0fb7bf0c589edb119b8a2b387deb12a2ae0caa5564ac07314c684a10340ba8","openssl/crypto/asn1/asn1_par.c":"587b96d03fba5f181e2a3bb986f84bbec7f270b802a7096776cac0a7a7b87da5","openssl/crypto/asn1/asn_mime.c":"31a14151f7ded7c8a25d615f03b782bb86088468c2028d8bbe2c294d13f301eb","openssl/crypto/asn1/asn_moid.c":"8794c22a22c285ed5529cb653ae9bc4a532759556b082df62cf3c7c5a980d65c","openssl/crypto/asn1/asn_mstbl.c":"e5636d0b7070096599c81428620efd8da80806c1469adff5bcee9538b3d3eeb2","openssl/crypto/asn1/asn_pack.c":"34c17431a3e1d5f2870a110316083643d7d2f712cacd773a27be10be8fbc8f7e","openssl/crypto/asn1/bio_asn1.c":"59f92e07f045c0b7caa07691260f5fbf9743734c29b011dcc81c0c1de80fe7b6","openssl/crypto/asn1/bio_ndef.c":"6eec68dc672f561e4d105353eebc943698d7304470bcae441d6c11e6fc12877d","openssl/crypto/asn1/build.info":"fa44195e9e9134c468cd6cc4dc319a10b42efdfad2afc0c24c6c09ab03fe6244","openssl/crypto/asn1/charmap.h":"a381547aa7ff7143dea241fd4992389aea6524fcc79f1e8113bc7a5a9f356961","openssl/crypto/asn1/charmap.pl":"c8f68c7552750671a6aead3adce1edc24f6209b5b9a912a66e5c3ed97f36cee2","openssl/crypto/asn1/d2i_pr.c":"7c2f7f1aefc3a017595034d6bb5a1c47c4928bd08ae061059b62d9c6ea50ee6d","openssl/crypto/asn1/d2i_pu.c":"db03265276649bbff5d13e00833a1d7afe370ecdae6ea3b8636fa66d6bc04d21","openssl/crypto/asn1/evp_asn1.c":"13e62fc5ec5f2389ed73b4c36764df7dfac8f9ca5d6ad4b9af4d5a40ffb3e834","openssl/crypto/asn1/f_int.c":"c31ad783d4102c01e1c356db25703ebad9ecbc4076be03671ebdf0dce77bbfa8","openssl/crypto/asn1/f_string.c":"ca8bcbe18111761b9d7051c28dc8c3a517f12ef09b07f7d18e95b09b1cea8463","openssl/crypto/asn1/i2d_pr.c":"6d5d69947533950f56b2a1ea9914e9a6263c89e3dd6e0bc580fac91c144a4418","openssl/crypto/asn1/i2d_pu.c":"6a4dea59d8f2a292a2e56d9d0dd7c1e5face5611b8cd464acd482f352bcbf7e8","openssl/crypto/asn1/n_pkey.c":"7a806728ae2fc2ac07c6403da406cfa1939dacca640bb44a265b5b3ba40bbb97","openssl/crypto/asn1/nsseq.c":"9d12f391ef3a96d4c49263876834fd3e55953ad182b8a50af67b9985fd0ae69c","openssl/crypto/asn1/p5_pbe.c":"b5bf15dc48ba22546910fbc45b8deb4f16f702b2079001d8bfab52e796586370","openssl/crypto/asn1/p5_pbev2.c":"75db91088cf53ef8ecf16096a273263dc1b8f1b305d34642fee9a3375eda264f","openssl/crypto/asn1/p5_scrypt.c":"2ee170bcd3a3f74020359645c556e148c2bdee58cf8eb5aa9e3d16549a236991","openssl/crypto/asn1/p8_pkey.c":"3a6bd5462179c020db34cb3856a351ca72cdb2c67aaaaa4b93490a4b5fc4f2ff","openssl/crypto/asn1/standard_methods.h":"b24ba0bd23ff748cc8198a20061b4ed786bd23b726b8863b0a9aab43ce4940dd","openssl/crypto/asn1/t_bitst.c":"3e3d70f8b000bae8d22df59d06d618636c4475bc74c5cf6496222ee362df2d87","openssl/crypto/asn1/t_pkey.c":"3c0b19d47d16ee69fd4cf9e254f18942ec60738153d777af58cc92dc36f85b1f","openssl/crypto/asn1/t_spki.c":"fa1ff7cc324e77da57523a31d43f4ee4bdd283233197a07d49b98167318f1075","openssl/crypto/asn1/tasn_dec.c":"d6ee6e8d5088d41e7c57b4b2ee722fc4887f0f303ba818b4068a8df4f95f2cbd","openssl/crypto/asn1/tasn_enc.c":"9923263ae81335b0185aa75529c75a328a7ce23205f79e2e6e2ab4d5ad14a31f","openssl/crypto/asn1/tasn_fre.c":"180a6caf40524dba99f5c59c5aa027111c5b4e2bd36f9f4023532d87ce9d0572","openssl/crypto/asn1/tasn_new.c":"a68ca3d8fb25b7d738ad0fe3e0fe89d04b666e8bda27205c0a29391ad236f06b","openssl/crypto/asn1/tasn_prn.c":"87104fe0b0cb61b15b29ed9ff0a87ee0322a7d8afb96fb5814947778736e49b9","openssl/crypto/asn1/tasn_scn.c":"bfee8c5ce3596ca8424d86d79d6629b9a10ec5e638f01a3a41190f6a997a0cfa","openssl/crypto/asn1/tasn_typ.c":"1b2ef7de83c4cdd6814a7ff51b7887ec0fbdaa491239fcb53ae099809ed93950","openssl/crypto/asn1/tasn_utl.c":"555ebc1deccb5fb32b8fabebc9dd5f7ec8c08ccddf55089f125313ffb86302be","openssl/crypto/asn1/tbl_standard.h":"d218819087369d116e0cb1a09a1d18d62e3b8d81f1097f51bda64d4d2632276d","openssl/crypto/asn1/x_algor.c":"6251fd9cde962a870fb99ad9efec2e92056bcae56f11b6a006099b58dddfbc1b","openssl/crypto/asn1/x_bignum.c":"86cf198543ed64b9aab374c68a9e6126621ea822f36be6e799d98b429703dfcb","openssl/crypto/asn1/x_info.c":"0c7b475e7ff24be19a93799988a8285a4fcff54948dcdcad56d5d15832697d2b","openssl/crypto/asn1/x_int64.c":"e07b3a84a97486aeb8cabe2fce3f310cc26dd4ed0f253d8bfbfea34829ae8671","openssl/crypto/asn1/x_long.c":"b7196b0ad11e30e2c3eb2b3fc87ecd7ee23e70337a561a1b004b8d8310696270","openssl/crypto/asn1/x_pkey.c":"dd38a57de88a305d3d91b67c2546a1dbdd19626242f4c2aca7589a5c43ca4d5b","openssl/crypto/asn1/x_sig.c":"3ad785d142245924ece45b57287508a337f4e6a17ff0171b8dcc29fdfe9987d2","openssl/crypto/asn1/x_spki.c":"9f360d8664aca7e8df445bb14e67aef5b8c6ebf96902d0d17f434de2760dd045","openssl/crypto/asn1/x_val.c":"16cf6f2ec27d2b0a6e5670f507a2e9838f449ba354b4ef8c3d3870624c78e000","openssl/crypto/async/arch/async_null.c":"fda3f2108e56457e67e90672cee85a88ed3be9c0ae8c48be3c311d3af4b1cb4f","openssl/crypto/async/arch/async_null.h":"b1584fbd40feaad7cdbcaa0f37634f6a3bb6151c8d3a1ea775407d2492bffbf1","openssl/crypto/async/arch/async_posix.c":"0559b3649322a5ca8a8327a5697d3a760b6cfe4ab583e04e77e405d1291becbe","openssl/crypto/async/arch/async_posix.h":"aa3c2f8b400c9c5055473dec40dd70397be774875b45b877de628b626269c625","openssl/crypto/async/arch/async_win.c":"f6e1c968ee12455407d45a98d797a20bb670ef54206101e8322b8b129bc0bca2","openssl/crypto/async/arch/async_win.h":"e44cf8ed835324cfca32677619cc086cab40464a556ed6877b16a48d64ccc314","openssl/crypto/async/async.c":"81ae3029a88776ae82430d2e62d8fd2cbd37ee882e6e454fc6e44b043462905f","openssl/crypto/async/async_err.c":"9dc8db44323ac3875af45c9e252c07b57e9414153eef799227cb62e3bf275817","openssl/crypto/async/async_local.h":"c1de46865fa89e0e3b091c2d0d1e636277e7a17b767a0bf832e9a6d4467de6a1","openssl/crypto/async/async_wait.c":"31a751120c1e124e15e5443d4f241d020136475c50224019fc6f17941e3f23be","openssl/crypto/async/build.info":"0f207664fd179f0da32133b314a3a12d882ca0767bd933223987e512f38b6559","openssl/crypto/bf/asm/bf-586.pl":"e2a70151810a9c072f339fb79a547d40518c9ad291b4b861bfe150accdbb9736","openssl/crypto/bf/bf_cfb64.c":"65bc70248cb9873a57035726be7c4daab7088edf3e0444f20ff3edeaa0bd00e7","openssl/crypto/bf/bf_ecb.c":"bb667d96213ce99df938ff6faf05fd6c8d8de41377e0138718bbe154e35402b3","openssl/crypto/bf/bf_enc.c":"007d64c1c42ab76f752dce1bce9e4d76a1d9b502b5ac38ab2ffd11a3bbfab872","openssl/crypto/bf/bf_local.h":"d5caa7b411eddd3325b5e44ee6aa98f7fb0aaae90afb266b95ff82ddc8dc6ce8","openssl/crypto/bf/bf_ofb64.c":"5fec279245aea9091befe01784509c0811bba300f4f4ae831c5b10d2c245de2b","openssl/crypto/bf/bf_pi.h":"9100be951fae338f952bcd373fdae299db340004a560d4a8e2522d94d126937b","openssl/crypto/bf/bf_skey.c":"5abf32cd325f89702f542ef125b837e94182478b4e88fc8dc9ba959670494304","openssl/crypto/bf/build.info":"18fc244655787eba13a938e63be44df66237ff9c61c652f9373abf0e1944de2d","openssl/crypto/bio/b_addr.c":"1adc1067bf943e4f4bc64da27cab5d2f3298ab209b35854b2a501b2c06a440e0","openssl/crypto/bio/b_dump.c":"23636615ed57398b183859bfc644b3ed6a6e4ea767a4b0510f384fc22d3174a3","openssl/crypto/bio/b_print.c":"37598da04c8b2d79954a13934c1415bb0b1bfb2aa26b92fb9ba7d05efd739426","openssl/crypto/bio/b_sock.c":"7fac000db37431a216998c55b37f7cedf7da8e93e95e87a2870eb636001d541e","openssl/crypto/bio/b_sock2.c":"2ccab53d243f274b5227b013bb5460f78992bff04286b1c4a3f25d5212bb19d9","openssl/crypto/bio/bf_buff.c":"93f4d8b64f77a78bd3b75899524da4fd377bf1843fa436e121f7a4e8fac70f6f","openssl/crypto/bio/bf_lbuf.c":"556acdbc6aec55d7dd154cc91d58d30e27cc26447cd0580e5bf5e62e0fdfbaf2","openssl/crypto/bio/bf_nbio.c":"20de24180dd8768d4236b072fe6fbded3e4c2f046138b82c196829210f83e6f9","openssl/crypto/bio/bf_null.c":"1d9d2aee3c3345fd1f9fa6a7c61bd0a7210296c16bb8e430db6eb96f986d4daa","openssl/crypto/bio/bio_cb.c":"36a248185aff251569cf313e027df36e7ddd2f040011c7df120e763fd374013b","openssl/crypto/bio/bio_err.c":"a076d1a372dd188ac2d0b2d85aec7fd092615304eb750a7dc7f35171d83e0b12","openssl/crypto/bio/bio_lib.c":"d3768371c6f66104a0cbbbe79a78d3bf6b9211f51b9361d496efee7d492c3e7d","openssl/crypto/bio/bio_local.h":"372e5162c3276036c8afec0d831c8fa799b9b40c585a950dee9c684c100e4503","openssl/crypto/bio/bio_meth.c":"909b7c1fbffa3f3652c06e781f68888fe32921bb0864f2edf0cf11f81c57206e","openssl/crypto/bio/bss_acpt.c":"a9d2e85a836f783e3a8b0bb43e91c98a8bea13be248547f41e8efdc112c6dded","openssl/crypto/bio/bss_bio.c":"0fbbf25cc71727b70d69cdaf54e33c1edff88dfda9c6135c3ffb903bc2a16158","openssl/crypto/bio/bss_conn.c":"763ba60a50f5ce0436ca6f7d2ae4012ad64c08d4a7206bcf46f6215e0c87e0b0","openssl/crypto/bio/bss_dgram.c":"9087e5d3f85ad7a484eab44c43b610c5f171f9eced525562207be248a8950b87","openssl/crypto/bio/bss_fd.c":"a1d09b6f537ae1cd91b78747064bf6e0bf1480d2081fd49520bf68b8bc6f9c8e","openssl/crypto/bio/bss_file.c":"a6b7fae08a9ade223189c131d9cf791e665d07c096f72c81222d3914b6febd77","openssl/crypto/bio/bss_log.c":"57800ced38e095cbfab4978b135c987d198e23577e0b1ece7b9f9ec09ad134d6","openssl/crypto/bio/bss_mem.c":"a5fd895707fe741301a631c2a1f2001e2c6c9962224da56b4d31714936183a4f","openssl/crypto/bio/bss_null.c":"5c69c5ef64fba87209ce6732daa442179147f58ed182b0ffae2c810d1a1f9246","openssl/crypto/bio/bss_sock.c":"291ec483d46ce4c84d6e27767b5024e8b46c545a9337440040044698b77a5185","openssl/crypto/bio/build.info":"c06b0ab353777e854ec2e3fb06da384d5feacf7b6a7a793a86f953f75727f9df","openssl/crypto/blake2/blake2_impl.h":"43d57951c44208b9c739ea55268ad32537bd69cb6996142aa9fba1fc73156546","openssl/crypto/blake2/blake2_local.h":"3b65f381c00259a7e9ae4c99804129d0be1da85883171f7a7e03770b6d19c182","openssl/crypto/blake2/blake2b.c":"a270a88442ff7a5ad50aeb98f201631733ecd94b3d16ccf4e293f326069870f4","openssl/crypto/blake2/blake2s.c":"3127b5f1e4b7c86b4b3f98906be4e02cbf6c6ddb76ec562df22bb90f8dc703e3","openssl/crypto/blake2/build.info":"32d94885a66457adde2492c1f54d8eff2470fabc56714ff452656d26e0dc5dd2","openssl/crypto/blake2/m_blake2b.c":"15ae3e3e588732702f387aa72bcbf83da1c6699be5fff50bd43ad6823f6a2ea7","openssl/crypto/blake2/m_blake2s.c":"86328f420a7255f5356e213e066c0ea159620556a6d0f4809a01af1d749a326d","openssl/crypto/bn/README.pod":"f9a09a797a9bb17b25582b1ec93f630ed6fce7e1e7d7bca660cdaceb93f7e18f","openssl/crypto/bn/asm/alpha-mont.pl":"9a965fc05099cad8166dd2139a369797b76b86f5a3ff649c2d769c809e43f49b","openssl/crypto/bn/asm/armv4-gf2m.pl":"59d4382de548cfe64a537ff06d7cc2f853267c374b362112e7c56f604d097295","openssl/crypto/bn/asm/armv4-mont.pl":"033cf96aeb2d944ed8216f6428b50f0c1342effe795eead230780fee09c1b81b","openssl/crypto/bn/asm/armv8-mont.pl":"74e3e61fae844a76899b271096ad959126ace8a44c6b423b49b5c60644183846","openssl/crypto/bn/asm/bn-586.pl":"48bf56c13b07e72dab0758458edb8fb91d405ea66be51ba2cbe0b8d7ad66a1ea","openssl/crypto/bn/asm/bn-c64xplus.asm":"2ccfc9e32f973733286f929efaba733ef221a2a525baca902d10b43f37e5c316","openssl/crypto/bn/asm/c64xplus-gf2m.pl":"6baf33b426d15ba5f1932354803c207ffbaac02a8ca0a297f1f1887f7d9e3ac4","openssl/crypto/bn/asm/co-586.pl":"a6e32d465555356f8d94ba60502f989571014e259578d8b7ecf08b8d550f2d49","openssl/crypto/bn/asm/ia64-mont.pl":"38c66ea37a612cbdae9ec76653ccf5f88639f2c83a4ccc7b68f1a07885925f39","openssl/crypto/bn/asm/ia64.S":"bb03f1210151f611b289d26275dfa4ec04858c3f6b8e44f6a134ae43134ecd4e","openssl/crypto/bn/asm/mips-mont.pl":"695fe1bfe46aadeedd9370ed36052d2f46744e220aae1bacdaf609d565f83d62","openssl/crypto/bn/asm/mips.pl":"84011dee4e2a318e17924259049a8009b525929e07be682e5433a32388989254","openssl/crypto/bn/asm/parisc-mont.pl":"0618fd3e42cbb86c80f9a442df30eb5ab03fbaba85bf60e305f1e8a7b0303011","openssl/crypto/bn/asm/ppc-mont.pl":"1c74d887826dd16230de9da9379143b585030a723c7c77e1a8ceaf67fd431d86","openssl/crypto/bn/asm/ppc.pl":"e5fc7d5df29159aa04884e787586ede7e3daf38dd1aca187d277987f6ce4f30e","openssl/crypto/bn/asm/ppc64-mont.pl":"d71870e9fa8fa2d7b8132f43e9619c1016f24669aaf0e4fcc5b49b10069bf9d4","openssl/crypto/bn/asm/rsaz-avx2.pl":"d1c58913d6a27eed2bca23b623640767356b4bd63a0253b7c665fd364a8b6137","openssl/crypto/bn/asm/rsaz-x86_64.pl":"2b988945d8e2c352c739ec7a816cf06fb41eb7b5666ccfa13e504ed489513246","openssl/crypto/bn/asm/s390x-gf2m.pl":"ff56c23a2625a1d7203558c930795d53e7aae96edf79dff9b425399f3bcf88c3","openssl/crypto/bn/asm/s390x-mont.pl":"5f42262e655b2f0864c888076b9e92003364787f840dfd7fe6821d1f0ab20b75","openssl/crypto/bn/asm/s390x.S":"3bbc49704aa816f558c053615e554f5dc5727f0d8faf5731569409968419e3f1","openssl/crypto/bn/asm/sparct4-mont.pl":"90072ba1eade122f422edf8c22d9f8b9dea38288f644bc83d7606a2899717472","openssl/crypto/bn/asm/sparcv8.S":"5ea77201a1d3d910c4f9a6e46d84497a101888e1a88221df37e0b938b3b7fb27","openssl/crypto/bn/asm/sparcv8plus.S":"9a06de2127cb76904210100b84593545ce85ace4a1683508560ded0df5e458c5","openssl/crypto/bn/asm/sparcv9-gf2m.pl":"46eacdb7fa8a1e456a2f189236c29da071243465d3e5dddeab216195a0b7330c","openssl/crypto/bn/asm/sparcv9-mont.pl":"c110a9ffe20fb2df17788f18f4378fe658c65c5ef3e0132eba55b49e6b30c990","openssl/crypto/bn/asm/sparcv9a-mont.pl":"2a41e7e980b947e74e4f904d2f73f5eb3cf6fcf33aed719a8c54f2829af80d18","openssl/crypto/bn/asm/via-mont.pl":"39b3d4fe10f57f762bc04a3d4c007228a27b733ca822626b4fa318bcef9a6603","openssl/crypto/bn/asm/vis3-mont.pl":"8905a111cf37dafab244fef8328a1880e2767dec450d3f14bc9a94b0e962995a","openssl/crypto/bn/asm/x86-gf2m.pl":"5d67351d8ab90a1f9bc27442790b38e8b5af3adb2ea808f1c538e302b63292e3","openssl/crypto/bn/asm/x86-mont.pl":"ed70f06b72ee5b7952382450d271048c1ea90b8b1a7f2b54725c418d010e2a92","openssl/crypto/bn/asm/x86_64-gcc.c":"b26f0475d8edfc4d29f144ae1bd2509656519a65909ba935a6ab8e028730c41a","openssl/crypto/bn/asm/x86_64-gf2m.pl":"093190e7d1cca46563423663eec16612c27b5baafb1045085837c7e0bb92a771","openssl/crypto/bn/asm/x86_64-mont.pl":"daef157ec69e2ee356eff9b886f493c0c06727de42c53a6bc9e52609bd1ee27a","openssl/crypto/bn/asm/x86_64-mont5.pl":"dbb7ec07d1bb9f403691ba3e3b1371e979a11ebe440a026a165f8610d21313b4","openssl/crypto/bn/bn_add.c":"997a8198a4162b709bef9f539c83e0eee985b95e048a6880f800f1c87fc66983","openssl/crypto/bn/bn_asm.c":"8ca1fc49cf63552b9eba95f3337d23d4d850df16b6c8023b0e0ff3ee51a8eed0","openssl/crypto/bn/bn_blind.c":"f7ca8bb9482532cc2bae51c6c6a98cb7a9285c73bdbde80b6e6f5b3db57ddd7c","openssl/crypto/bn/bn_const.c":"2976d9b82e2f804a139dfc23b93c24174835f2c0b5205a9714c15e6f9dab06da","openssl/crypto/bn/bn_ctx.c":"53e5d709712fdce65572c27121a770655d55741d86fbd762eee86d2f81c2e4f2","openssl/crypto/bn/bn_depr.c":"a1c0cb167ce107a0dc1a65d605371fdf350616592b601420a3ccc92722ccedc6","openssl/crypto/bn/bn_dh.c":"c3d5ef28fc5967c871616c14aee75efcb245cb1bf537ca3d7b4483fe4c6e66e6","openssl/crypto/bn/bn_div.c":"0080322602c8a7b399c7460ae98ad837be277a5dc2a30d057ec4f39fd49b04dc","openssl/crypto/bn/bn_err.c":"0bfac66fbf810f30e4da7f8781c851e4e40688bef16c1d4e854d39cf1c286821","openssl/crypto/bn/bn_exp.c":"4debe351ac34156006b758f3e3c2746a07407a9423393b787c2347b0b26f4049","openssl/crypto/bn/bn_exp2.c":"165dc76aac9064a1f497d1ce1bd4538900f6a73bdc658b22a72977d22439f111","openssl/crypto/bn/bn_gcd.c":"e8183efd1bd8adb6a50207375ff1f25ee8e2636b8bfa7f04ea1358412cb7d652","openssl/crypto/bn/bn_gf2m.c":"933f0dee1e86e2d2bc128a14e361e95f62a9b044315686e7d9544036724a91f2","openssl/crypto/bn/bn_intern.c":"e9fdb85c35674c4ea10b8a435402f449009a201b1e792ea938c55b43ac14a2e7","openssl/crypto/bn/bn_kron.c":"e53f88fb97342946e40eb40b1bb796f269c00ae7c9c08da6f0ff1dab92ff1d08","openssl/crypto/bn/bn_lib.c":"def99b81926fa50477f38f368e3bed9072e5b6fc471238719a4b5c2c773c0fae","openssl/crypto/bn/bn_local.h":"1d0667f22eed00b4d6cf2f19aaea84b073cdb35cd8a15c8b09650978749b9d86","openssl/crypto/bn/bn_mod.c":"ab67f5a59f39426f7746298d36f1a2dd0218e6bbe5337e5b8f3308969e6fbc43","openssl/crypto/bn/bn_mont.c":"29e10ca123e5782b2c0f86431420fd4a189b0e1492027d0ae30ba2bc2f213676","openssl/crypto/bn/bn_mpi.c":"414317c7cc164eb976cba211be80c47c10c317f6e5510c7488a26b3eeac7439a","openssl/crypto/bn/bn_mul.c":"adb75d2e053af57f50b556e314058fdb1f07de5f73b9330084e9e62a1b47e6d8","openssl/crypto/bn/bn_nist.c":"38cc4b28a758daf1e4685b791b8c12d0297b0847a06ced49b524e37e44952108","openssl/crypto/bn/bn_prime.c":"4a9c72c0e6e04369f81c9fae730c588487882b68c9bfd3b55a9ca416c632860d","openssl/crypto/bn/bn_prime.h":"70f8bbedf4a5129a9fd78508eb574e20b0867b6b048fa2a51649191600dd318b","openssl/crypto/bn/bn_prime.pl":"3c2b7b7050c667f3db49b042844033760c5be6d0a622c3519f573e4fe559fe4d","openssl/crypto/bn/bn_print.c":"27249c4c4f523c7f0ae663ddb1233f6da54a6a439b92a402a9fdd1cc758c5c41","openssl/crypto/bn/bn_rand.c":"8ac00fab08a188260e02b17caf25d48552d29db278f6fd7bfe63d5086d4f4417","openssl/crypto/bn/bn_recp.c":"e1459f1a51e7c29aed0be014069fb143e707e1e94930e5c0d3c53684aaf928a2","openssl/crypto/bn/bn_shift.c":"20f682e6765fa62b1a24535a438fc4f3bfd09a95c84882b794ee325a3ed30800","openssl/crypto/bn/bn_sqr.c":"febfe487629fb06da8541ed72a1bc020130e054aed978509afaf082f4689eb4f","openssl/crypto/bn/bn_sqrt.c":"468b98c671c7b2ec9017fe6c534bc63ac0f3597106c4d659281b74af9cbe66b5","openssl/crypto/bn/bn_srp.c":"2cc2dd53d107360b02a46df479e56dbcef76173284c90787a6034711ad0d20ef","openssl/crypto/bn/bn_word.c":"80a6785f781de09007b0a38c07cb1fe6f95da91a7c5d7719fd393b473272922a","openssl/crypto/bn/bn_x931p.c":"95916c4578c8a924c2a4ab40e221beb5ef39724f8c5acc0eb0cf446a059b36a9","openssl/crypto/bn/build.info":"c8caf83e7eae6fef8838b21f1d49b3036d877a5d60c9c9466d35fffe71679bb9","openssl/crypto/bn/rsaz_exp.c":"f26dbdcdc7a825e42a33e4789553f084b46391dd605508d14f6285e9169287d9","openssl/crypto/bn/rsaz_exp.h":"174f1e4366fdf37c1ea5921d66101c16941bf3bf5232e25c062f33d508798cef","openssl/crypto/buffer/buf_err.c":"077e32ee5b2554f2ef88c2e2e431cd502f4b6564a4562ad6ca7f4ef2d93719d0","openssl/crypto/buffer/buffer.c":"c8e85cfe68a2a0b8c240c7d253bef08370d8c5d6beb8306317d5c13b9d894457","openssl/crypto/buffer/build.info":"a49cd5c09fa81fe79c92a2746795f4ab03664edb564fe967e02ab630051fbb65","openssl/crypto/build.info":"01a8fcab56106ee83cdab9aa3d57c014e2794e7f973bb164c98dbd1f6252fda4","openssl/crypto/c64xpluscpuid.pl":"bc7734ba0a8a8a9b6522f8522cac953fcb55f7ca9291d9470ff42eae28ffe624","openssl/crypto/camellia/asm/cmll-x86.pl":"fff9bc31ea47c39ff3d29d5f500bbee2be5f99ae33c85a42f50261519a1ca58d","openssl/crypto/camellia/asm/cmll-x86_64.pl":"a39992cc95db61459d6ba3b4fc4469b468ec5cc65c8b0e140f8541146eeaea2d","openssl/crypto/camellia/asm/cmllt4-sparcv9.pl":"057db0662cac6d2910c9b0df404aad0149c9bfed7edb2b606c1a65063b800262","openssl/crypto/camellia/build.info":"c329591bf1ddf3b43874ba5f16edc771dfc3609b59692a67ab9be5329ebc2984","openssl/crypto/camellia/camellia.c":"0b89bdc95099441a27eba170d8a18715b0de111ab258c857cd7bc470c44c7065","openssl/crypto/camellia/cmll_cbc.c":"3d8730494a197898020547aac319cf993d984ac12a7caf05769ab4f3d5542127","openssl/crypto/camellia/cmll_cfb.c":"3bcd9e4d94df8fef19f6c878dafe390869070b0a915b903dd7c124fe4ff29eeb","openssl/crypto/camellia/cmll_ctr.c":"b118ed55ff15ba0ba23f8d1509f82c05469538914354a00b29fc4b13d9fdb138","openssl/crypto/camellia/cmll_ecb.c":"6fb0a9e82c7a88efd6e21b8a7ffbc2bb5ca2389d9cd090854b52432666f00dbf","openssl/crypto/camellia/cmll_local.h":"0a9a4626d21afee3bf75df5141d9cb5df16843135dc52588ed6ae5db9db57520","openssl/crypto/camellia/cmll_misc.c":"d612139def8070bbc0eeee703e10620b55b74e92bdb66cb0cadef32640eebd4d","openssl/crypto/camellia/cmll_ofb.c":"95d00adc90c3abc0244c90863643c1c972c7b72e1a89ded3e9be78961d7b5ace","openssl/crypto/cast/asm/cast-586.pl":"db4eeab4c805f9283ad642eeb9bd4f15b2fd274aae04be9e6108df432ea841ec","openssl/crypto/cast/build.info":"d50ce511fda2f776ef1b01ab2904a95105177b8e220d16ec08823ad4003c568e","openssl/crypto/cast/c_cfb64.c":"ef480ba12d67983b33d836b4c23a894825663f934e3cca35a758ac02dc3b7299","openssl/crypto/cast/c_ecb.c":"2a64c4f6ab8dd81fe8fae14aed324740725b736de13d33ef53b8cb75aa816287","openssl/crypto/cast/c_enc.c":"1aad93cdbec46cd6decef3aefe6ed6c0d4ac35458c3277d9feaf72a3554d5237","openssl/crypto/cast/c_ofb64.c":"314c96f3cf57fb5e6c3dc80dc04487e1d9679279b5726adbe7ace25311789136","openssl/crypto/cast/c_skey.c":"03c78ef44da509b4f83d13523ed842eff9415ad9fea3874f99d3c304f7c01f42","openssl/crypto/cast/cast_local.h":"66eed6779089997ded5323031123a0597f9cb1e7dd4e8ea0acaef3f8cf33800e","openssl/crypto/cast/cast_s.h":"3d8771f99d09b7e75ba8ee54015cec6a87e56851a49b7ba733d5e05cd31d8c90","openssl/crypto/chacha/asm/chacha-armv4.pl":"99f5da3bed7a9983c75e2507d70f4ff1a098a6e8f043bf041be91b3629ae422c","openssl/crypto/chacha/asm/chacha-armv8.pl":"b7d01513fecbde9fbc790d2602397de122474163fccddb1ef5cfa122d2015d09","openssl/crypto/chacha/asm/chacha-c64xplus.pl":"7fc7c87c75801b38bbd10e1da71e8d23e63cfdb9b25696155ef4831f4bea6aeb","openssl/crypto/chacha/asm/chacha-ppc.pl":"8201e4b04f17b94f63fd1632e33c443d82651a188356ecce215b05002d29c07a","openssl/crypto/chacha/asm/chacha-s390x.pl":"92145fd451e8b90dc3060b4b6cbb781c29ea76ebadf1af278f54f210b24877cd","openssl/crypto/chacha/asm/chacha-x86.pl":"0c0b923503045c50339fa62ea5f23f2896d36a5afa5d92d328ba122ada4d5245","openssl/crypto/chacha/asm/chacha-x86_64.pl":"5a8d0031c7baecc3c816b775f59d871835e7effb040c13e9e24d1afc5a334c31","openssl/crypto/chacha/build.info":"9fc715460c418da09ed9b1f3b0c2955d05e1a601ea08c722e03cd3e093d21355","openssl/crypto/chacha/chacha_enc.c":"3537109a7cbf8cbcb891fadf1187fd18bfc4697244d9f454863edf0efc935747","openssl/crypto/cmac/build.info":"4cab4dd7922065b919ea2fab534ea5b2425671a385a9bcc339b034b90b18a1a3","openssl/crypto/cmac/cm_ameth.c":"2485363b94018ee4bcb9c26ae556e0da6bd976c7aa2a74cc6eee25dddcff4839","openssl/crypto/cmac/cm_pmeth.c":"a651591b1d044ce06d3fd3d04685de16da3ffb832edbb23de2c62bfcef1437ae","openssl/crypto/cmac/cmac.c":"23c517f53442658958ccbd35324621074e9e1ff6aefc76f1734b3e8a15276e2b","openssl/crypto/cms/build.info":"b60b5fcd1a7bdd099d8d6ad6dff76d38a2f2f6d69206f606e7b31f2512ed8c78","openssl/crypto/cms/cms_asn1.c":"039c1090f3dca16886efcc692f098c6757df4bfb7ab3a8d5d861e039a1bdb5c8","openssl/crypto/cms/cms_att.c":"e4fef52bc7a42fb4418dcd3af56ad69c2eda39fee3173cf5c81a2bb09b4f1c99","openssl/crypto/cms/cms_cd.c":"9a054626d20f06907e587f28626faaba4a6c246c3e46c46161bf740fd40ae823","openssl/crypto/cms/cms_dd.c":"a20f210ba25d1e39b3d2c3689fc403cf1d26e95b56ba63ddeb953170b1c46a7b","openssl/crypto/cms/cms_enc.c":"cebb206fc3f2770245fee217c728e1a4bc36f48dd727cd43ed71689a01048949","openssl/crypto/cms/cms_env.c":"dd543ce2f88c2aa8182fb6176b243fb74148fb01ef2b664eba8b46a8c207e0aa","openssl/crypto/cms/cms_err.c":"98895b0546291e85cfa5b046dc3637b839f463398ba7f8f1f7a302a290f549c0","openssl/crypto/cms/cms_ess.c":"1c214bf9ed990141a0fe9b2bd6d75c0abe13f7a3972fcc9e8546c6cfb61fd774","openssl/crypto/cms/cms_io.c":"b0f7efc22758684e682ce4d4084c5a9c92f2be85337472b4cb2b0877dc97b9a8","openssl/crypto/cms/cms_kari.c":"5cfa5f47a8c1a68548cc5056c3acf5dbdd6863add51540d31bd9f3febe158305","openssl/crypto/cms/cms_lib.c":"02fb5868d86f55d6fd22925bc1179ee6e30bd33d8c03bb9d17f3c1f32b5e8a2d","openssl/crypto/cms/cms_local.h":"fd4c2c08265477861e764df58596e6f46e4e1c1edf44b83dd756c30a11e4378d","openssl/crypto/cms/cms_pwri.c":"ec89b18f85b2d54e7685eba3e025d5c80bef96a6342647e75a38e7ce2d05421e","openssl/crypto/cms/cms_sd.c":"4b5d481625e094458ea8f305abf4f135929c4e8953f52c8a095ac1c4190ea80a","openssl/crypto/cms/cms_smime.c":"4b39921aa3cc3a75de8ff249bafd5f14fa7fb2f87ee5fbdb5965be16a701de9b","openssl/crypto/comp/build.info":"85bf6e692117dae30cbc494d4eba2d702cd3cae6f89fa09b7ca0fd4456a7ce2f","openssl/crypto/comp/c_zlib.c":"91cd791e519dce9e72bd1c95850bbfb28948314f72c89d186c1cf31018a4118c","openssl/crypto/comp/comp_err.c":"57076955737d79c2a7c3770fd2cc34f23d5eb871d464d2fcdb824a430b241f52","openssl/crypto/comp/comp_lib.c":"400c8ec3deef4c53bf6a04d6a56b3306085adfd7c26b7f30a1c81dbf2ca14c1c","openssl/crypto/comp/comp_local.h":"017673a53ffcd90fc07054e2f2b58bb19cf7dd662972b77a522880be4df748a7","openssl/crypto/conf/build.info":"b43b86c91fce5501f6f7f3be1ae0563ad61a11a6dc923d51b1cbfd38642b69d4","openssl/crypto/conf/conf_api.c":"ddd6ba576e40e1ae38be2da7e9c650a831bd6cd3e457b1103dfaad4e38db3945","openssl/crypto/conf/conf_def.c":"42b346407771dd21fb8e53fb7f1f6510e8b0ee18fd1e84711afa728835b0f846","openssl/crypto/conf/conf_def.h":"3b5bfbe6ecf20d6ca68098ab17a6893c6e8f58a327fb830cdcaa08ad84b88527","openssl/crypto/conf/conf_err.c":"b7ad98807619b2338608b0b678af3e9ba552968c1a62e4dc7f596fa22c967489","openssl/crypto/conf/conf_lib.c":"03830ff1f426c2017809c8a5ce2fc1f6c0cdd4e3f4ead3724af49619ced93197","openssl/crypto/conf/conf_local.h":"21f6604347cfb6f65ebd57a2baa57a594c90f2c2d553d04110a481e533dc932e","openssl/crypto/conf/conf_mall.c":"8c749bcd6b98aac509a55ba3ae6c85b7a7576d19a48fe351116b84f13a4bc9b7","openssl/crypto/conf/conf_mod.c":"1f9bfefdced4c28189a5a401e60c981bc21f2c2cc630ab16c14104161433544c","openssl/crypto/conf/conf_sap.c":"3a55841a7cb9466b3520fe5ecdc18a0de441517fed3864a0c6ec501c60d2bcbe","openssl/crypto/conf/conf_ssl.c":"9a915457c88510105b1ee96b63ba18a7a395f16e1228f6dc3d300c09a29da965","openssl/crypto/conf/keysets.pl":"3fb8dc12b0c38b0bc10c28e8f63fff7067c15f628d0c4e0aa4eeb332ab80a3ee","openssl/crypto/cpt_err.c":"0582ec85ea86920e9c54f61b8c896766da5178ed76d943927e54f0cc5aeaff37","openssl/crypto/cryptlib.c":"071e82aec2a79c3165cc40af4e40f4f0b9cd7f903d6d342cd0b2bcbf120f0808","openssl/crypto/ct/build.info":"cba8cc48d6e1afd7524a791dd853ab68b711e20242e53d34f7bc69cfddfb58a1","openssl/crypto/ct/ct_b64.c":"3f496457a333d2ee14330174497621a3dc0d7226584f028323ed3f74ab5eb059","openssl/crypto/ct/ct_err.c":"38c768cee2bd24a73056ef3b6b11c9ee2b521b4549472bf2814da6783b3237d1","openssl/crypto/ct/ct_local.h":"b646fbbe542dab91575dcfd70d753f97829cd30b8cc6d20ff43cf6b180a5fda4","openssl/crypto/ct/ct_log.c":"fafaabfaebb95a7830629c278eae9ef41474abf74bf4a192a40ed688ab857d99","openssl/crypto/ct/ct_oct.c":"cc15a402c4910fc8e2fc3e4e2696159164324170d7aa314b705084ae3e5fe1f5","openssl/crypto/ct/ct_policy.c":"761b4246d70c58cd5ef169b7e6495fb4ae98095de55db952865321b53026a9da","openssl/crypto/ct/ct_prn.c":"c61e1e516cc7f2c6e56d744dc9d2eb34e265a3033dcdd5594bddd389d92cb849","openssl/crypto/ct/ct_sct.c":"2053d098f8067761f883dc37b5e9f32a88f8efd8e838c7bfd30dfbeb8b2c213f","openssl/crypto/ct/ct_sct_ctx.c":"384be165ab6ab299ea1fb20a8f71549b52c11a62f48354557d9df795dad0a615","openssl/crypto/ct/ct_vfy.c":"dd9fd14491f0be632c2c9a4e3f64f2c9e7212077318585cdeb0be083c9b9d16c","openssl/crypto/ct/ct_x509v3.c":"f6fd221ccdb7233b57d7e2e2200f70f74415bc1a50d71f3f3db54573323ef5c3","openssl/crypto/ctype.c":"6ee2e82b4b35a0ff31e652a41a215e22183f27227629c3dd9ef29dee5ef72235","openssl/crypto/cversion.c":"e025275b671266d567e01588bc06f5953f9801ccab837f747444a7fd4deb2d21","openssl/crypto/des/asm/crypt586.pl":"ea344cbacc0c1782c86a5cd8e59850b15ec7b992af758944177b5a8d06f731f0","openssl/crypto/des/asm/des-586.pl":"7087fa7f11206b134cd19b706c6dea47244cc4dfa02eacb34f5be64f1596c59c","openssl/crypto/des/asm/des_enc.m4":"fc01ac73663cf6a379f2f5b9bfb4656180904d3dbeb1a1332981c65536b57537","openssl/crypto/des/asm/desboth.pl":"9ee2f65db79acb719d97d7a9a023b5966e043de565c296d91fcf9fa22c8d66c3","openssl/crypto/des/asm/dest4-sparcv9.pl":"af3aeb58563b500da64826b8b242879be45a25492b35416a64dd8f2d261b54ed","openssl/crypto/des/build.info":"e9313f6656218289223c13eded0ee42c0ef2a907ba1cad0d921895d5897f6033","openssl/crypto/des/cbc_cksm.c":"5d206f71869bd8f991aa0cc6e59dfdfb0d32332a3ddcc5fbc1e53dd434182dbe","openssl/crypto/des/cbc_enc.c":"516db95c905c16f248b0a77110f5112bc4b11c1bf7c22ec00015afeba4a59775","openssl/crypto/des/cfb64ede.c":"9eaf1da7ec5ee3d418962153b20609ac35ce2a7791d0e89f67af6743ec3ec1bd","openssl/crypto/des/cfb64enc.c":"01adae8089de85462097168450a1e8da6b883f40ffdf16f71328b4f27c295d8b","openssl/crypto/des/cfb_enc.c":"77d937e722323246ffbbfb90236cc4db0eb97f0e3094703136b13e3f5ac96cd3","openssl/crypto/des/des_enc.c":"e6ca2ab1d3ecea8d7bb237249c4b2e3c4b3341fb7117c103b923425547d18ce5","openssl/crypto/des/des_local.h":"65a67352a112d223c1a5e86014f9bb35f2801a7facdec761e84ed0fd84453f0f","openssl/crypto/des/ecb3_enc.c":"9c0390b6d31ba0210770c99825d134ea383b0ff6786a17901cc9e8d29a1be271","openssl/crypto/des/ecb_enc.c":"ed826a2ea841d55e73ef7b4c18ce0e3f3a7fc2ce1f66114ef304116ceb797f8d","openssl/crypto/des/fcrypt.c":"8722ce9353d34a091718240262350f71da8d219a6e5735f7452cf6cd6a513e12","openssl/crypto/des/fcrypt_b.c":"17687bbece11cf0d69d20c8e2a161e3e8cb8c6cc954e98e4be89b2fec1229433","openssl/crypto/des/ncbc_enc.c":"7c699d1d1382865f134a66ae6102a1579311d923a867a9689f1938cf6cec16c3","openssl/crypto/des/ofb64ede.c":"a80c89c3c3aca3061d374a5719e7fbf34de6aabada2a33dd3ca227f71154b46f","openssl/crypto/des/ofb64enc.c":"f6778fc3903629332792169d1eda2a66983102927d4ed3960f897ac3e4340dd9","openssl/crypto/des/ofb_enc.c":"1dab1cd28dadd9d50c929bb733050114da777eb16a0881bf73a346e741aa4cbf","openssl/crypto/des/pcbc_enc.c":"30566f7d37c7370ff3877c3ed546012158447f26f3f252bca81464c97584d613","openssl/crypto/des/qud_cksm.c":"866fa600186d5ec9a9453a1913415b8ce6f3f10aca9dda468ac598a43f45ecf4","openssl/crypto/des/rand_key.c":"087fcbb52d8c335222758edb7068b9d4126b1480882539824795a06d9b61ac81","openssl/crypto/des/set_key.c":"72121d5af75f56b90476e3b0801df350e245e106bf2f4d3b807d7197b7db26af","openssl/crypto/des/spr.h":"716d8fa9cfba26ba57bbbfe471b2179b0788907c0f6ce831ca25c1f88692968c","openssl/crypto/des/str2key.c":"b981915490f07bd96a1ee7bc47176cd0b502021245b0d9a3ce5624f53f87a8b3","openssl/crypto/des/xcbc_enc.c":"b827a25f0e027ccb260fc580ca679fa517cd3f31984f1d23aeb537d35cbb6a8d","openssl/crypto/dh/build.info":"e2bcc399874d63bd088982f115a561fffb4e0dbb441bb7b594d5599e9c65a718","openssl/crypto/dh/dh1024.pem":"e8e1acddd3b19d70ba25308970888a2ea046f951b9e055eb4ed039ad873b56c0","openssl/crypto/dh/dh192.pem":"58077024ed24a21542f46e2fa71872b920925d7878e70ee260f7e12c3acd6c49","openssl/crypto/dh/dh2048.pem":"8ef0bceef3550a6a252553e157a8f72286a26688d429fcf8659b0fd62e64049d","openssl/crypto/dh/dh4096.pem":"b5efe13f7908d0c8dd358b97e9fc449aab144bb9f5db480dd6a59787733e6475","openssl/crypto/dh/dh512.pem":"16f824bb92c255eb62cfb1146014049be68b8ea46273ad7c3afb585c47555689","openssl/crypto/dh/dh_ameth.c":"60617d9a7a21651a935e470098cc19d07f6c63982c2264fe1fa0a4901417cfb7","openssl/crypto/dh/dh_asn1.c":"98f73ca5addf73a7cc65f719a9957995efe2d776f7b9fbf93b6ef089095993b4","openssl/crypto/dh/dh_check.c":"24a505a328422c0c6f1186fdb69d927e6cfc0923f5dcfcfee8e75501f4796485","openssl/crypto/dh/dh_depr.c":"3acb7d89701c08aec293c9a8f72c8564d2ed438008a156dd65f2110007d6941c","openssl/crypto/dh/dh_err.c":"78358e127d64f41a453dda8b14c29a86c127b9eae3b6673b81c8d1f1f0f1c37d","openssl/crypto/dh/dh_gen.c":"217882ada635b4cb3826bec6d5038e57d319d6461b15f3db2b898cb063a86686","openssl/crypto/dh/dh_kdf.c":"363b9b80e8002df14e9944a07ef2cafc7a1657e937c73ab0fee1729e15b82700","openssl/crypto/dh/dh_key.c":"0924f57cab2390c8642fd44c36e9bbae46f5040a6b031c85a157c5649f5a6239","openssl/crypto/dh/dh_lib.c":"b0b2596db218d7d4799bb645e91e96d8deebe9c29fb91be3557ec4daf09af2c4","openssl/crypto/dh/dh_local.h":"7d416db8510cb01d015816fd3cfe48e8c31f7130d9339084a32969f2cfa05b23","openssl/crypto/dh/dh_meth.c":"d06db6b0c7076e8783311606b5736799f271bfe96e82a34282f38fae7527e598","openssl/crypto/dh/dh_pmeth.c":"8e253377cf60e4c6951414d7032a476bd8f5b39b8dd73e6be7aa5f31dc70de93","openssl/crypto/dh/dh_prn.c":"52d6c69a3079ff431c1f0c4fba4561b3b35e3c8e3b864e837b36fe04b229376e","openssl/crypto/dh/dh_rfc5114.c":"ec521e03c0d46750d6ab81bc3f9ea563010cdd4105654292add4963c43f34ba7","openssl/crypto/dh/dh_rfc7919.c":"bb50a469470ac7e0e0464919f2b1a4525fdca2024082ea71906e08412083e6b8","openssl/crypto/dllmain.c":"8fac31d2a5be44be12783f486a0c947b34f537706e9679041025e3cbc4f1e86a","openssl/crypto/dsa/build.info":"085045ec79ec9a5862b89a021c7489ddcdcfbcd11282a5427c261f607799b003","openssl/crypto/dsa/dsa_ameth.c":"2d2d71bd13c7f03f9471e7e097a1121e620acfe9602102ec98b63bc02bbe4c9f","openssl/crypto/dsa/dsa_asn1.c":"7fc0c381019990d20c3f17d30189bd25b0bbce4dc6076ff82bec14aa242fcd1a","openssl/crypto/dsa/dsa_depr.c":"e8842ccab520759650fdf8f11fd9671eadd76a84a3dd99cbcea144d7a62d477d","openssl/crypto/dsa/dsa_err.c":"cf4d169cf5d725929d4642e2b9e0d364ade8a9bd6f3ed7588face74a761f83a6","openssl/crypto/dsa/dsa_gen.c":"da779bca293f86ba7fff0eba0ab1123dc1da92076cc5b17d74ca2457afb29a33","openssl/crypto/dsa/dsa_key.c":"994f194ebf96a3f508fddda63c202fb62a865011342ef7ca67fcc0e61b307751","openssl/crypto/dsa/dsa_lib.c":"7b4046813db5765108923a203582dcec87edcf4eda828c73faebd93d5e6d4fb7","openssl/crypto/dsa/dsa_local.h":"e5bab35bd60b618d6701f39fd2cae327ce1022216de6e7e7bbb3db33a56a04b7","openssl/crypto/dsa/dsa_meth.c":"3bfb2d0a05d9b1996464f36335f0ca18e8ddfc7e5fb0c823f35b0d9f634edf73","openssl/crypto/dsa/dsa_ossl.c":"401fc60603f2c2f4ea07df3ee9947f053d59579ba6a5c29af0e6ff46c476e4ac","openssl/crypto/dsa/dsa_pmeth.c":"75d81c26461dee4880598d315e4a3e5d8f14669374e0a4cff76ac1b29e21da3c","openssl/crypto/dsa/dsa_prn.c":"d7e3b0d7f192837d71683d71def73e0f59c472e22c3c6e8bfefd28c5ce4d7f3b","openssl/crypto/dsa/dsa_sign.c":"6ea0f5fa257c78daa400a3241875a50fca357722a982d634fcfacfccbeb7a850","openssl/crypto/dsa/dsa_vrf.c":"8bac622f0dcc0cf8ef4169cc0bbaac675f0fe0a44d13a8ddddfb23279674cc0f","openssl/crypto/dso/build.info":"f3ac516f673b6627cdd424b8a0187dc1204454b9c8ad7f3921e54fcf4c2b7d63","openssl/crypto/dso/dso_dl.c":"b0c47090ceccfc5eaee122bc081b2eecc57525ac2f9e16ff7ea5615b9834e67e","openssl/crypto/dso/dso_dlfcn.c":"1096fb62171b74e3c5e479bb013874286d23a52c8b55af8da6097849ff837809","openssl/crypto/dso/dso_err.c":"65da64f7372a8c3c941ac500388ed6b236c1c0587df47331efe0ee83a7094b0a","openssl/crypto/dso/dso_lib.c":"a4ce4fe5108efc8bea3548fa0e4cc377bbf5dc41b473d454abcedd195fc12b7b","openssl/crypto/dso/dso_local.h":"c8fb9be8ee8505ceb47d18959c53018949e68882a983bc6b155500824adead2a","openssl/crypto/dso/dso_openssl.c":"128e45bc40d044ecc31999d5ddc8a3bff7458984b394750e2512d6e63f288f56","openssl/crypto/dso/dso_vms.c":"b6b23417f7ebc775fd6cd6213e48430fea7aae71581b1b4b9f66134710c27549","openssl/crypto/dso/dso_win32.c":"c0a959463d6b39eb3de5be8e36aee2bb94eb0a02b17d16ad513851c0d97e2b77","openssl/crypto/ebcdic.c":"08ca75b55c1a19689de35f6826eb45d60096f9f61bfb177f4d47c6e7b164bd5b","openssl/crypto/ec/asm/ecp_nistz256-armv4.pl":"40ba05324054d59b0ff73206960b52fd98af1aefb527fc0653d88f66aa1f8075","openssl/crypto/ec/asm/ecp_nistz256-armv8.pl":"5d56ec0425c7e072fd47af26bc6a42c5b96831e7a5386233cbe9211d0c8384d7","openssl/crypto/ec/asm/ecp_nistz256-ppc64.pl":"bab3bd37522b68ebf4306d4a8611a9b9984c18af2502f133b1a45671c788bdf8","openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl":"0d5960e38388ebfb979259345a96d3e5c5a1eb01a1d307d04e46a01776c33c64","openssl/crypto/ec/asm/ecp_nistz256-x86.pl":"166cf499864dfb17509b744af27bd04f6c62553ca57a907f65247aebc7bd2033","openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl":"3826ef600d5dea5ab791ea812a1499a768bd9d57f6fc194f752fe89942007ef3","openssl/crypto/ec/asm/x25519-ppc64.pl":"48a8881f53d115b750338ff3f5ea2b00b3c8cb12bfe3497ffe7efc14e7663c04","openssl/crypto/ec/asm/x25519-x86_64.pl":"b058c37ca6fd2e9ba6cd03dfa4925e43cfef8243388d3b906cc9eacbf515d42d","openssl/crypto/ec/build.info":"fdabcfbb5d33c483abc06efd155649d50d46a23ad330e9db93e53fa8fab7c95e","openssl/crypto/ec/curve25519.c":"804cccc55744600342c506be8ebfb89297f233994b42c1a6df43254da9be90e0","openssl/crypto/ec/curve448/arch_32/arch_intrinsics.h":"b6d5ddcba24f8724091b0f4e8ffb4eba3501050d7b56514040e9e35cd4d2dc28","openssl/crypto/ec/curve448/arch_32/f_impl.c":"8f2711a771d2de4e28e1af000972a97632b84dbbeca98200bff75bd4de9c68ce","openssl/crypto/ec/curve448/arch_32/f_impl.h":"8c4146a1896235ac63ea2c02ff368b485811efadc530e4e55a7772a5be3df0f5","openssl/crypto/ec/curve448/curve448.c":"08f0f4acc5ec817c83ba9fb033b27196b20636cdf1c25a441990611c84b2fe95","openssl/crypto/ec/curve448/curve448_local.h":"45859eb89631a801785f23fd084372df5c6a9886f63b7a8c327a5a1da2c32835","openssl/crypto/ec/curve448/curve448_tables.c":"6a244fdb0e907bab2415ca902277c53e347ed4446d89a8cd96cb1f6d422851aa","openssl/crypto/ec/curve448/curve448utils.h":"14590b6c857ca26f8f4d902aa959d22f939b5c8c233d4dd1dafef44f8345480d","openssl/crypto/ec/curve448/ed448.h":"162ffa623f582675f30cd07397e8127acb65ad50dab864f0690ad01169070e01","openssl/crypto/ec/curve448/eddsa.c":"5fbd57402b93953751db5b0d877183c455acd4e5a799bad1b4c04eca476c25f4","openssl/crypto/ec/curve448/f_generic.c":"07e9c3ffec06daa1493b77afa3d929627f8e104b6a7068a5ce8c82cf2abe0530","openssl/crypto/ec/curve448/field.h":"44b6bccdcb3700587cd6879b5d0301a721876cfee54302838cbac9586d6debb9","openssl/crypto/ec/curve448/point_448.h":"7934398d93fa3c4e1586e88ce30e9ab9e7fa6cd5bee469c7e266d6c008276e52","openssl/crypto/ec/curve448/scalar.c":"d6b59d4271c2b689a137c5329779f48437d89c0dd420331b0dcd19c07e8d1bbc","openssl/crypto/ec/curve448/word.h":"e6c2a871e623d231d86330622a30172e39189b9d0d6de01ef3349373592fad1d","openssl/crypto/ec/ec2_oct.c":"4c816014a4a39e5b5d783cb644ebce73326cf7d4102fbd5ed3173e0c47c41f47","openssl/crypto/ec/ec2_smpl.c":"3a1d9eb3215d1aae80f5a97b9a70cbea244a17aa32ff31547a3750c27f91c6f7","openssl/crypto/ec/ec_ameth.c":"f037546edeef994b2161c337cda66ed526b6fb2dbd7680350d3c88feb08f8a56","openssl/crypto/ec/ec_asn1.c":"15f9d6e9a0692d1f691f5fd90c12f14da192b68cc194a31faf4b30538f7d8d0a","openssl/crypto/ec/ec_check.c":"968eacf0ec42ab6ea40d9b4e7bfe92d8839e7650fc6c4cafdb5526e24db93bda","openssl/crypto/ec/ec_curve.c":"bfd2f60e3d56f9a267a98c64247eda39c30b2bc0936aefd89cde893ac0aa0230","openssl/crypto/ec/ec_cvt.c":"21751232ee7f55c78b27297d1748d1694bd0444503ecd1e4da5ef28e0ec2c06c","openssl/crypto/ec/ec_err.c":"822f407e3bb07bbd155532cb2d318445f75a4c23dc51d839cc572f063b8c3b31","openssl/crypto/ec/ec_key.c":"176544a638d7f8609023a3fa7dcf18a269f26a23eedb7fdf5d50c99006131eab","openssl/crypto/ec/ec_kmeth.c":"c8873b9c502b2ec7ca701b75f179a03b17e1d0f232ceaf93a7e8b2a9dc09ed51","openssl/crypto/ec/ec_lib.c":"3b90b027406fa37e449a29ef5fda8d618050264b20ac72cb443afe3cb41a8ca5","openssl/crypto/ec/ec_local.h":"2bd3d1770f28940ae353c7967d67a868717c131360611fd29e1c8ab4759c8d15","openssl/crypto/ec/ec_mult.c":"e5af943eb7b22d20c2924040cc82780a5db6f28adb034b932b68fe63ccb050fe","openssl/crypto/ec/ec_oct.c":"e6bc6cc8381d7b6f2e3db9c4e80f8c7f7a256e4955bd639e256a6fba4ec8e235","openssl/crypto/ec/ec_pmeth.c":"fa5ade19d352740ec048bcf20789ff225f2f7752dcb1b166005c24a47983425a","openssl/crypto/ec/ec_print.c":"35731d346565725e5fe6663d76c4b7552ada501c8ac154ca0364674e5ab4b249","openssl/crypto/ec/ecdh_kdf.c":"9483709aac20fd03d9a602f933b9623c4e01343a8a9ebca269cf765f28ca839a","openssl/crypto/ec/ecdh_ossl.c":"6771ed31fcc563d61455896d49592f73de249a4a02ab919f2e2dc61c6e32a069","openssl/crypto/ec/ecdsa_ossl.c":"e9d540bf9e98f823ff8b94d077fd42683bd52471a1b2f0e27af839b22e7b2bac","openssl/crypto/ec/ecdsa_sign.c":"ef0aba33c4d785892e8b04bc215818dd79346f12198b86e926306bbb82906540","openssl/crypto/ec/ecdsa_vrf.c":"9144435f6f8da7b6787302332fd512817f1351e648d6aad8b97f66dab750410c","openssl/crypto/ec/eck_prn.c":"2a61e56b81eca251023e6def47349289a25a71028d3cac71392720514bbaff37","openssl/crypto/ec/ecp_mont.c":"413f82245a3ef45776c928c96b539cd02a40c7f11610f5ae8657aa9e1268125a","openssl/crypto/ec/ecp_nist.c":"695fdbe3f4c21d3c9860e7433ad506c39473e702fa69ed1a9d6814de5a1652b0","openssl/crypto/ec/ecp_nistp224.c":"133ba08c45fbdcb9cc7003e6965a43a40c3b8edde14d8014ffb17b3e3dd1588b","openssl/crypto/ec/ecp_nistp256.c":"8d63ee38a1a20c6f0704a724a1638aea565c74e58e13ee9ec5965736ce90b60f","openssl/crypto/ec/ecp_nistp521.c":"47c3e20705cd7c9deecf527f90374270a30a49e33573d4d7e99463405f0c7f5b","openssl/crypto/ec/ecp_nistputil.c":"d9aec2730f8921bfe6f4bd8ad09859a89e717d79c5a5c116143f403a57dd8fd2","openssl/crypto/ec/ecp_nistz256.c":"dca45bcde9c7d2e2c27b9f096c5953beb1ace46b9e36b8786e934e9b3a6d6077","openssl/crypto/ec/ecp_nistz256_table.c":"d811f3e5e3d6a188fd33da7366daef81d8e69d083963033a6b8468d42fe99855","openssl/crypto/ec/ecp_oct.c":"5b572e7ebf6eb4888042fb3e7a0cc84e3bab4ba954fa79a4fb3de6d7c8a3562d","openssl/crypto/ec/ecp_smpl.c":"3ccb53c7c5836497174a69dd6d47edb061c1986ccd52bdc70a036c3f76b87064","openssl/crypto/ec/ecx_meth.c":"a3ae62fb9c7c9243e610a1b258c31810999bfcf734abd3d0b618dd4a5673363c","openssl/crypto/engine/README":"75f83cd826e3d844a982830cfe3dd40a9745680f598823dc6c20483433e7496c","openssl/crypto/engine/build.info":"bc69605adbffb3f6e78073735a304007ac70c302c1cdadda0598475077a0b06f","openssl/crypto/engine/eng_all.c":"938319cf3c8d29dc239182c751e9e674a2254371ef62f9a2a961fb998af948ed","openssl/crypto/engine/eng_cnf.c":"c5776261e20cd6e2b01c9faa98ac27920748652ff8870b50e93c9dc43e33eb40","openssl/crypto/engine/eng_ctrl.c":"cc4295f6d8aae029a526f909a949c99d1798e766e662f1af36788b587aefd02e","openssl/crypto/engine/eng_devcrypto.c":"5930b4aed3a176d9448f2d792229727c103554861b7cd93fb534448d5fd608f6","openssl/crypto/engine/eng_dyn.c":"b7abab5ff9935248d5003dc42f1bcb9b40fae1d6d2ee3ea2e87b6d98d0803bed","openssl/crypto/engine/eng_err.c":"f7528c6b2e12cba00592e138292428653b6d67f82d119ed274210459fae8e96c","openssl/crypto/engine/eng_fat.c":"dade309980fd6ff737918439cd5f4cbbe2ceb6bd685f57162836e874bdcb09f5","openssl/crypto/engine/eng_init.c":"ce7c7a5abbbb4ce3755d88b49e3ae9051c9364988bcdce82e9714e7b1f50eb6b","openssl/crypto/engine/eng_lib.c":"caaac0493f13ea89ab75135cdafccd7e11b4b85363b60a83438230aaef1c4d9b","openssl/crypto/engine/eng_list.c":"e9cb779a0ea154c8a2ac281f1036aaed2a72c8a247ca7d7b8eea8e31472f9919","openssl/crypto/engine/eng_local.h":"50898497a06f23ce8da2fbe6d4d351e6604831d662e17028b2dc90d4a4934d83","openssl/crypto/engine/eng_openssl.c":"f0b6d2784744f4de19b58415a32f0311016826bf2b942de683275d099adad5bc","openssl/crypto/engine/eng_pkey.c":"5980b2e7d788172ca7363a9e599efc60978e0e01e27f2eb5a20ff72177908a4c","openssl/crypto/engine/eng_rdrand.c":"00c500e3ab162d6ebebd05a35969e8cf87e666056493c27005e1056ac08a9681","openssl/crypto/engine/eng_table.c":"0119fd35633708e5b3d3eb84affe6567e859bcb25b2ee803ee296d9ca7e377f7","openssl/crypto/engine/tb_asnmth.c":"697b41214c83500a5d6a24db15349047d861af1fb9698cbf4a1ea583b7e4c34f","openssl/crypto/engine/tb_cipher.c":"a0a78c49864bfa6a12e51aec865ada99c8f2b6d6173f95c131091f14f5596434","openssl/crypto/engine/tb_dh.c":"44df00bbfe79beb277bdaf5ab6b5b67e7a42c7aeb41d78282cb066b2845ec1c3","openssl/crypto/engine/tb_digest.c":"7f91c40451ec2af39e1589c99798c03227267b52ac2137656fe764a030030138","openssl/crypto/engine/tb_dsa.c":"11d608eb60f707236c12b2342d6e46e78a35546f5080d24fc2bec5fc93d5da8d","openssl/crypto/engine/tb_eckey.c":"d01e2e757b633478d735813aa7f11d7ea840b57993919c9ade502e0bd3623177","openssl/crypto/engine/tb_pkmeth.c":"cdb64c39295890bc8f513910cc4e99366c77551e3d58f1b15f33eac953025a14","openssl/crypto/engine/tb_rand.c":"8a3db3bdee6b44a706e58a27b9f2b77000a3397251fcd3c0b3069e50d1e92061","openssl/crypto/engine/tb_rsa.c":"cc36a9a7deb850d6a68ae963accb17cd27fa22aa842c3e72ab02ffa2444cae49","openssl/crypto/err/README":"c5ed5efd4e5ace164c73404aa86a8dc1c86da1838f78ebd69488fbe29ee907e5","openssl/crypto/err/build.info":"d6041997113bd776a1d2a0e997b2c222f289e4c3f3b7709b3034b8389721395f","openssl/crypto/err/err.c":"ea433e3302c4cb0623f4159a98fe0a16b36628c8d0c8d61d8a2657ec5b3450ac","openssl/crypto/err/err_all.c":"dc089a12d9e7a982c53f8a823f920dc02d8a20ee70591f00e2994df3f440b0fc","openssl/crypto/err/err_prn.c":"78864cf84d5e6a3e88fa8095a8ef2b8d17ef5254d85c405e86964ec68445881e","openssl/crypto/err/openssl.ec":"2b72f95498562d1cba12ede9d176cb78f7cc952471e09121c05a14677b89d3f6","openssl/crypto/err/openssl.txt":"b4d1530c7c28a0664b887ee5680dc2302a98bef602405cb7646f45c05aaea602","openssl/crypto/evp/bio_b64.c":"52cffad34f8a36d8783399304aeeac3a31ad76738ffad067cd148d82e311980c","openssl/crypto/evp/bio_enc.c":"5789bae803d56f7242285af82ee7397bfe9bc41c99dbe56f3391554295a6ffa2","openssl/crypto/evp/bio_md.c":"bb69f5c9e0115d6f6193e415966078b74bf13030ecbc9bb496bb10a51492397f","openssl/crypto/evp/bio_ok.c":"5738ef882340cb88dc8e6b3690c098bc84666c1bdc46f92581157151aeb1982f","openssl/crypto/evp/build.info":"31b20792b825dc95e34adce28499a555871514b73767f57af30911d6ec42be46","openssl/crypto/evp/c_allc.c":"9b0317fad52f722d505c9e7124fb802b7e9b9ba4e592f6c53c181bd72cdf4ea1","openssl/crypto/evp/c_alld.c":"7b91fae290bd3e84b44cf8d273dd47cb52dc7a190278c0a7770253a5b92f67c4","openssl/crypto/evp/cmeth_lib.c":"454c5c511e1b11ec9bccd9eb81b13bf7fe3b9b49aab1d4e2af9431fdf4685384","openssl/crypto/evp/digest.c":"6d55866c1c1217a8536cd06ccab4d6f44ca5c04bbfc5568768307cbc9c44a20a","openssl/crypto/evp/e_aes.c":"1c59ecbf4eafcf124ace1993effa8eab8980bb009519db6ceb8698f52a200f61","openssl/crypto/evp/e_aes_cbc_hmac_sha1.c":"ab83f218805953b0c69b333bd715408fa33355aea73d19f5cfd65c4e5803ae9d","openssl/crypto/evp/e_aes_cbc_hmac_sha256.c":"dc7d54bc7aebda2e046eb232a0697ac2199d38c401336dc6ff8bbcab203013f4","openssl/crypto/evp/e_aria.c":"3e84d9441695d57ebc53359bd859409825b8ff4129f556854d30850cbb0b7db5","openssl/crypto/evp/e_bf.c":"a7f1835f01ce60ae0930e96d5794ef9627645a8133d40f8156035b1ca7f9f912","openssl/crypto/evp/e_camellia.c":"f17a6450ed62768127fdc476ca7c4ecc3b13036a158428c9ac4c7a3998044929","openssl/crypto/evp/e_cast.c":"777149f3560cbafa09db82529c62e229821fcd9b8d0cd52ccce1911059ddc002","openssl/crypto/evp/e_chacha20_poly1305.c":"e3b0340460cff799fa31dde2fd243efbe491243cd3fd45785aa754a9e58aaaed","openssl/crypto/evp/e_des.c":"ed58fe7034f20460ae033009948cbff82f4c29cf759c7a5c20ef16fb939a8fb2","openssl/crypto/evp/e_des3.c":"9870e2d940343976bef9f0dfb9ed472e6f9b13c7a088ac0f642e81a13fb9b023","openssl/crypto/evp/e_idea.c":"9367d350ee726882edef664b36be5ffb087bcd5784c188e3c1eab80b0f9b61ea","openssl/crypto/evp/e_null.c":"d4fd2e9d7ffbd334d0698f33688001c6d83d416179dfaecf0da158a51cfb1dfb","openssl/crypto/evp/e_old.c":"c5d4176d9f86eb7030fb37044abda9e15484ebd40917f5203fdbd27820642b83","openssl/crypto/evp/e_rc2.c":"271a9892ec2c9fb5d5ac19549bba713f9d1cc7533a6c4729b8855b2086756c75","openssl/crypto/evp/e_rc4.c":"7b651e12cf17d62c54c5e77f14e2dc4a330e09f0ca16bb15a7b88661f97f754b","openssl/crypto/evp/e_rc4_hmac_md5.c":"f31b8b2f34dd55c4888e7f3f832159e0f0f121334f89123177465d5766274eb5","openssl/crypto/evp/e_rc5.c":"cdbb95bd98f94046b2948b5afccb39af8ecca3f8678e75ae323785f6a6ddc158","openssl/crypto/evp/e_seed.c":"90a6cf552de0fed01659500527a20836c9459f5cabc37996a1b350493ea7a4e7","openssl/crypto/evp/e_sm4.c":"90040528209db9a1f93ead632b1dfee44393754c31cd4f8c02afdf36f1257a85","openssl/crypto/evp/e_xcbc_d.c":"9e50d87e3a83f9a12cc7529f2e9d92616b1f3592ea52c9621b26fa3051c49c22","openssl/crypto/evp/encode.c":"00bb9baa416979e8d4fdc3a8d035f974747d6fb707a874a0a5f5504a4ad27dfb","openssl/crypto/evp/evp_cnf.c":"010e9619d2fdc706cbe9d6fd7af598455de26f3d98d8e4dc0ae6a8b9672f6c03","openssl/crypto/evp/evp_enc.c":"49cb95be8e95b8d9dd2741ce39dcf172f8b7a88adcf65283c6098916b4f7b49c","openssl/crypto/evp/evp_err.c":"d9defec02b27e2a146b6eca952dc8442c817e976c80904866f57b73d524341b8","openssl/crypto/evp/evp_key.c":"e6607a748ad0f59bcb41fb65341f3092ef6f776596c4e757e3467c4d6eb23835","openssl/crypto/evp/evp_lib.c":"04e61c90c042d423532d0991f68894394dd7ace7348b1f8de97eaad684d5d540","openssl/crypto/evp/evp_local.h":"a5cff76bd1fdc5300f11d8e114784e38ea371e5b44aec043edf08132a48a96c0","openssl/crypto/evp/evp_pbe.c":"d35b96f74c9a4abfbaed7b4331047ce2b74374d2ee1f253fe8f7ad1aa859a178","openssl/crypto/evp/evp_pkey.c":"47223df9ca9ae75ae9288f66bb2f705dcc20673295595e5aa1b98256c69b717f","openssl/crypto/evp/m_md2.c":"cc3d0201ae7928dfb8488e06c9238cd75cd6d1c8afdc3748d66d097bcee82e20","openssl/crypto/evp/m_md4.c":"dbb59fd4839783fc0f27bcdb7072bf9603ecbd111f60e86e117561af46e8b04b","openssl/crypto/evp/m_md5.c":"bf7492079876e0a628b82f8b6bdc71563f4d4501ec169c071eec2d0074d6d642","openssl/crypto/evp/m_md5_sha1.c":"9ea3a96f8fae43da1fd0c4a821b68495a52b253c93ac529c9e60f19659483b3a","openssl/crypto/evp/m_mdc2.c":"347d2e4e7466904b60a016f99ac167772ec1c548ff13375b89b18842e7c91ce3","openssl/crypto/evp/m_null.c":"93396bdcb42c7ca0a32a4708c3a17d6d659c123dc70def32d572468f5eae6f12","openssl/crypto/evp/m_ripemd.c":"169cf92c735f5dcf6b4ba901c99e9daad9067770ae188f54dea2cb26f45e7344","openssl/crypto/evp/m_sha1.c":"3d8bd7f232cc5d373ed6f23ec16d0e36711e92eff1ba9db514a11ea536d65b72","openssl/crypto/evp/m_sha3.c":"094ef2a430dddea20b997dd39bb77742e274ddd5f20ce229d1313f490caffe67","openssl/crypto/evp/m_sigver.c":"27ebe435751097a40f6984bd8f2271eeb7cf357a87ac6d4ccc011058245a8b87","openssl/crypto/evp/m_wp.c":"dfca1381ae8eb6c5595c8ae96ac3619cdc1aed0fff6dbc4c3586d946943b659b","openssl/crypto/evp/names.c":"813349cdfbb70dd2d25e8441408f0ca4da42c14fd79806ea0159b1b6666babd7","openssl/crypto/evp/p5_crpt.c":"1adb6d06b8f335a704917885f79a0c0c587c78f481c6666f86d9284d893f86e2","openssl/crypto/evp/p5_crpt2.c":"daa3a33108d10b4233bb52b86a972318467bf6ec43bd8e242a60e2318a921d3e","openssl/crypto/evp/p_dec.c":"67a9a619393b8aa0229734ed9be6127ee28fdfbf0a22897ad71b69c608058d1f","openssl/crypto/evp/p_enc.c":"1c53c74c5db4ffaca90bc2958415298f99a88ce3c4b2f512a4bc631fb14515a6","openssl/crypto/evp/p_lib.c":"c6742fac30e77cb23eaeb91f10e933761c34cd2834a01a2ec3c78c6b849a91da","openssl/crypto/evp/p_open.c":"77b6849c6aaabd4e1eea6cbf4109fe563f94ae953f316ebbd18fdaa8c20c6640","openssl/crypto/evp/p_seal.c":"b00d90129b20cec822bfa52c8f46931d58e45a552dbe15f3f49df112a3c0729a","openssl/crypto/evp/p_sign.c":"d5dcf61a03bf789b27d95d0c7977be687776b478c915a0001ce9f744ad0fbdd2","openssl/crypto/evp/p_verify.c":"9bddcb790cb0c5f6af76c2447de2fd8e02a402e2c18c229782045e0f25dc1b2f","openssl/crypto/evp/pbe_scrypt.c":"c85cfc008e7b092df14f1f1de6086bb828c9086ea1d05c3a821d2d70abe8bab3","openssl/crypto/evp/pmeth_fn.c":"a4b2bbc946bb4d2f66384139a8cbf4e78d96151991544d9bc228a8600da9b325","openssl/crypto/evp/pmeth_gn.c":"3466a34a86030d86e7083d3b387d4db85d95fb2f80c99649724019efb50d85c1","openssl/crypto/evp/pmeth_lib.c":"6447da66b25fc86fec36e7726e169de8c62a3ff7fb9e0a19b6a94c3d042b74e8","openssl/crypto/ex_data.c":"5623bb2a73d34b936fdea2beac22ad046b9369506c9d31397a09d82fd83de9b7","openssl/crypto/getenv.c":"9f0b7d2434aee9963a2614b9e27a214fba6249b513050ab34985e7aa37ee759a","openssl/crypto/hmac/build.info":"bb9af1e0035a0cf7208f4ba6100365554be8ac10f1d5d0eece723d0fac44753b","openssl/crypto/hmac/hm_ameth.c":"56c2c30d57ba4443eaaa92dbe14c7d15cf34a824fd23bdb901034420404f0996","openssl/crypto/hmac/hm_pmeth.c":"8872aadd35ff9f8597a3a4d62e2f086544c2763279bff4eb191c1e06c48f792e","openssl/crypto/hmac/hmac.c":"db86ce730a7cdbe6ef9ee57353ff039b70e71aada2d09cbd42c43eac729a7bed","openssl/crypto/hmac/hmac_local.h":"67a3495876f2b776f84c7bb646105265bbe7c74f67c3f4c7820b9d6d022fcbb8","openssl/crypto/ia64cpuid.S":"f34b5edb66e3b16a8dedb0dff9067d197ec999b33c8870884ab7532015b1307a","openssl/crypto/idea/build.info":"6f12243caa237b8840094e485d046b787d390eea3e8e1df4274d2e29d22c1f65","openssl/crypto/idea/i_cbc.c":"2515d3804eafd96bf0fef5c47d49061606a995d5f6319a85240af3bcff1fe8c2","openssl/crypto/idea/i_cfb64.c":"253523f60a8ebd14a33ad86129dca3d080467c74a2d51e8ba91a7bfe2d7702b0","openssl/crypto/idea/i_ecb.c":"2083cd6bc4f4516734ab7352db2eaeb2066b2e1065881c8a4348e7c4d0da67bc","openssl/crypto/idea/i_ofb64.c":"c38bf911e6e1361615c76c6a462766c3e7cdcccabddec04e18819b6bf3ad9d7a","openssl/crypto/idea/i_skey.c":"2145c01e4c4741016678397aed68dedcdf1fb1b5c1ad1709168e6e5e58a6080f","openssl/crypto/idea/idea_local.h":"440ad054c70c6fee42667331c4536d8372caf2049ef76e58732f366ec9da894e","openssl/crypto/init.c":"849da31ae0e70414fee0073bfaacd02e0790d30545fbc2a5bbcec2065c250ae3","openssl/crypto/kdf/build.info":"eee49c5e0a5099bc7ba1994cced8d073e0438e590400cc303a19c17e3a311202","openssl/crypto/kdf/hkdf.c":"0fe71bcb78f768eb065f09a3d925fe2763c3e28fec4671d726dd0e3cb2c9cf0e","openssl/crypto/kdf/kdf_err.c":"0fedb61ca4b0a3bfdfb0f889ef489080c438046283c7af4573092c3ef0ca84cc","openssl/crypto/kdf/scrypt.c":"99b292f19298191695c2e9b893437f5642106ed1affe5cfdde68f03758c5ec76","openssl/crypto/kdf/tls1_prf.c":"a519d3ff721d4ec59befac8586e24624fa87d9d8f6479327f7af58d652b6e4e5","openssl/crypto/lhash/build.info":"6934ebf844a1756ef7ad6c13a94786fab5b6b4aca73492f90c4e9a342beb787e","openssl/crypto/lhash/lh_stats.c":"3b12d7c2ba46b9739ee6035b6d7d8fdec3d337e2cd87ec0ce1f179c5a370f9bd","openssl/crypto/lhash/lhash.c":"afad3e197e48238de9290aaad10caf40ddda9123b4757f381f843deeedef06bc","openssl/crypto/lhash/lhash_local.h":"c4295080821d4dc647b56b0c4128e8676728eeb88e22b2868a73156105034266","openssl/crypto/md2/build.info":"ff114b6e07a281adee13fb6d0d15f64cb7cc14143af8617164908f3dddb9e88a","openssl/crypto/md2/md2_dgst.c":"d47b4a0a99f9d630589c51c1b628c322aaf1e7fb55446ef0633681fb25d158c1","openssl/crypto/md2/md2_one.c":"1d37c2b974f9a41bce8ddd0a3b8bc3a3eaa11afc3ecb1d937b3d5ec1b0af7355","openssl/crypto/md4/build.info":"947373b325c169c3c8e7f232e254ecc16b2cb87ecd5bce73e758bd81625c7d73","openssl/crypto/md4/md4_dgst.c":"c89d489bded3fc498e48d9516dd9e1089c2a432a35a42bbe66c3159dd8fe6148","openssl/crypto/md4/md4_local.h":"e30870635cb21dc5119422daf19330f864542758e45d3f5c6b88a9c0567d2f89","openssl/crypto/md4/md4_one.c":"872416f5e31d003951e5b62e6f2f7a5166caccc63ba41cceb0b2219f107f1442","openssl/crypto/md5/asm/md5-586.pl":"6c23a2dd3325f7fda3d84d5d31fd2450c722e471a1c19a49e23315656441008a","openssl/crypto/md5/asm/md5-sparcv9.pl":"4194570443a6b459e56848d681dc93a78a504585c4e2bbb95126d07b3bb0f078","openssl/crypto/md5/asm/md5-x86_64.pl":"96a6669432191059e706c30139bf688c5f7acdb44bdbf1aef86d812c72bf49e0","openssl/crypto/md5/build.info":"9c78923fcaf42ed7e04a9e57ab643d3530c001352d833d0dd36c414b7f1b2ed1","openssl/crypto/md5/md5_dgst.c":"29ef7ffc6454efd1f76de31f485fcbad696a5e5ab866617b0ab23d2fade68bc2","openssl/crypto/md5/md5_local.h":"fb5941cb742c7c01dcc1382d47cbe8472d34fdaa24b3bca41cb291940fc5d982","openssl/crypto/md5/md5_one.c":"4e1110d587e7369c18b91bbe7d433b88d01a68454e54568d0d4fb1947879a120","openssl/crypto/mdc2/build.info":"ec3d4b9949842d5ff0b2372f3323f4b129dab1f55a97bfb399518e19381b5747","openssl/crypto/mdc2/mdc2_one.c":"2e7948368f07b0f02c517f59f73a3973e196940f02926c7290419da6252e98ab","openssl/crypto/mdc2/mdc2dgst.c":"11eaf3f8e718fca75d5364d31633e59ede1473e9bdbbfaaf04eef088bc78b2c5","openssl/crypto/mem.c":"85dd1c69a5b878a3cc98de20b6a927ce945823c6ffd2359e0d508e4ef0869255","openssl/crypto/mem_clr.c":"374d9f79d0c51ee855d40e816fbe2cca17030162d8f9866ebfc68e2a1c0f2a1a","openssl/crypto/mem_dbg.c":"20af715997e1336b3a66be3d0370bbdf01290ab551f5cff468588864141e3f43","openssl/crypto/mem_sec.c":"b69dc9a9290dd9568d0e90ca93a168c5106b8258a8e880afbb84279e4f44bfa5","openssl/crypto/mips_arch.h":"0c1160b6bb82104e8267f6d6f5de9e66df6fd3455dc90132b1c2de631512d39b","openssl/crypto/modes/asm/aesni-gcm-x86_64.pl":"e2a5b29a625159dd9a6c23f880eb1736b607e4918c1af8fc83529e046296d16c","openssl/crypto/modes/asm/ghash-alpha.pl":"3c33c85ca98065c1208d3c7e2005e436f7f2deb810bfc91b69736d4940d881a6","openssl/crypto/modes/asm/ghash-armv4.pl":"c54f94bfa356dee899ce78aec9d4381431f19e9862550a443ebbab1b83c23822","openssl/crypto/modes/asm/ghash-c64xplus.pl":"ba3e68b6a74bf2767acea24097d19c58d28f23dd898f06eac4e4fb47f07131c6","openssl/crypto/modes/asm/ghash-ia64.pl":"23d1d1359b8eb97f00f61a68a68ed4a982a7eba1a198b59060127d337237a312","openssl/crypto/modes/asm/ghash-parisc.pl":"7f0997ff284ef46222397a7302e894deac61dd3618058869a4cd285eb26e9228","openssl/crypto/modes/asm/ghash-s390x.pl":"8aff7b4902484e77c76b48be8b7cf6a4cd381be4a96e7c3de87ca49214903160","openssl/crypto/modes/asm/ghash-sparcv9.pl":"d3ac07ae68a3818e04f4c1a4ea3eed9ac2f950e046660e7156010e805dc53e25","openssl/crypto/modes/asm/ghash-x86.pl":"02ce4df864d0137ab32b488e5c3f79c3b92f43603bb5ca8be6cbc3d5f3ac7a5f","openssl/crypto/modes/asm/ghash-x86_64.pl":"260aa24d4546b6646690445ba0b38edba403d7913c09e5399f4ac5eafce7eda6","openssl/crypto/modes/asm/ghashp8-ppc.pl":"e0f1064d81d64f236dd5a729406838d90b08c27e2121096c52c413c670907e2b","openssl/crypto/modes/asm/ghashv8-armx.pl":"cb5854d36d240364c6fec6671c3db141e74687bcc5d88dbf94a1bf5cf7527e79","openssl/crypto/modes/build.info":"c5a0c305c1d3b6ca947c7987302a1d2d38f0f22fae1d3675205826c3d23575c7","openssl/crypto/modes/cbc128.c":"029978aa09c2d5349bcf62e75d0f3070950053724dd94dca6da940c0195e6617","openssl/crypto/modes/ccm128.c":"7ea24c0a5373ec9f4732954f4bae27875378c248c1f1cc1bfda3fbc2c1cd27b6","openssl/crypto/modes/cfb128.c":"83e1967f7dfcf6d03ac7f0da52ed01f4eb10e52ee106c6191a4098f9a74d96e7","openssl/crypto/modes/ctr128.c":"bf15a34551c348142d30f18f6d6c4e8e55bba35df3833d6076e5ea25e6740b6d","openssl/crypto/modes/cts128.c":"353952f605011761858ebdc8c0a9f56c449b81df2d1d4045158290f519fb9f8a","openssl/crypto/modes/gcm128.c":"ff6d62dd2a5aba155f6007d5cdfd0b0d4c86a23f6f7c2edc97e89535307902f9","openssl/crypto/modes/modes_local.h":"e9eb6afc0101d645d06a49c76cd91dc922d8b537224f130d339ba0a2761c3fc1","openssl/crypto/modes/ocb128.c":"c4f2df501f93702acc375a5f12630c62e95b81f8a2737483969472d9a377d6b7","openssl/crypto/modes/ofb128.c":"2cfeeb9562763a1b662f06b8c8beebae22b9453e77ac50ff6c379afeb1a189ef","openssl/crypto/modes/wrap128.c":"e1a966397a1ca4dcc16813367ca786409225cf8eac6038df0ad59c3a80e07962","openssl/crypto/modes/xts128.c":"174f626aad1d8bbd18f57b7d689d832401c9e51c1b4f999feffd682bed20ce2d","openssl/crypto/o_dir.c":"c62dd0f9bf71744ba93906522a39ebd1678ef102eac315c8661c36bd46fd3291","openssl/crypto/o_fips.c":"90917fc13bb8faa86f5c442bc650808330e3684a56cc4a54e0834678a70e7c02","openssl/crypto/o_fopen.c":"849a9fe62b26add36b65231c0e9faa1436d0f7f61bb921994f7a05d43fc9b66e","openssl/crypto/o_init.c":"71faba14f840d84ac595b4bb07f2a02b714c5a1ea28a72873b265765268e2625","openssl/crypto/o_str.c":"58f3c1b0c70b860a973145a4e2ed049cacc4ad09b4dffebf0af1c13ee0ed972b","openssl/crypto/o_time.c":"33e4971f94b1e6577a580e78ca16a3b9b40a5f6874e860aaa1ba95bae0462b25","openssl/crypto/objects/README":"ea1cb7962ba3ec620e533d2ae20de9d31e637ee8335886a8e9867e52ab0f3215","openssl/crypto/objects/build.info":"e8684ea0bdafbc725d38a799848bc2ee106bef9eeb75794790bb55779fa5fdfe","openssl/crypto/objects/o_names.c":"420202adcb08d798c6d10eba88397e7302ca5729f9c037fff69ba7af3047d052","openssl/crypto/objects/obj_dat.c":"8e27de3118ec94c5406bac6d562f5f16502eb11e9590708572e1359f1eae864b","openssl/crypto/objects/obj_dat.h":"d20954c0fe9b00ef38514bb7b0f51795457966ef8a4505b5575c37a4fa88d08e","openssl/crypto/objects/obj_dat.pl":"863b2ffdd2cc5d5eb328632eaee2225a53c5314460155915b7adb50f72ad4c23","openssl/crypto/objects/obj_err.c":"dd742c38b0b28d04d7b39e163236513b589f6b7780bafb57fd2997abbfe17cfe","openssl/crypto/objects/obj_lib.c":"c1f5721213e0d9466a9d61fc482a2ecee9b87277eead6095e0872c7ae509ba43","openssl/crypto/objects/obj_local.h":"c0a87d694fafba3b8fe96b184a77d9107c55f30e239cf93d8f89cb09bf6d827d","openssl/crypto/objects/obj_mac.num":"95ae10336125c0b5d5d618c24be928d3aa2b97ed7219ebb607b42a8d5720db61","openssl/crypto/objects/obj_xref.c":"4843391d202580b48bd01c603c595dcc4a8bdcb2e40cc67c53680d609ffe9f1c","openssl/crypto/objects/obj_xref.h":"c4b9eb3c027525f222d7d5ccfd2f476983a9a66c4ac8d0e04680ae4a24587ce5","openssl/crypto/objects/obj_xref.txt":"a7a6cf5147be047cd235cd63702e611c270ab8cb482e6210801188185ae2886d","openssl/crypto/objects/objects.pl":"6c538d5c2e4e97bbda5fef8ae60004c397f9a536987e8ecde988442107d01276","openssl/crypto/objects/objects.txt":"99b4c494e35bbf182979b922d62301f3c93e38069efcc41f91711cfe194ee237","openssl/crypto/objects/objxref.pl":"a6c1903f5814eaaa89d2e9fbb009bef2f8c4144cc53bf74fe07e407eb876ada2","openssl/crypto/ocsp/build.info":"c376f4387ed224b780503c83cc11c022896ceefd487649d83dad3c3f12e8a91b","openssl/crypto/ocsp/ocsp_asn.c":"3a1357b0fda1a0013736f2ea9b9174025893bc72c376b61ad18e97db6435697c","openssl/crypto/ocsp/ocsp_cl.c":"3696a5f991086053d2f7b913aaadb9425ef23ea3b26059a5ec2dff5a31e782b6","openssl/crypto/ocsp/ocsp_err.c":"3807ee304722a187d02114de43a5af6ad7e5bccc58f35bcbdfaeeb27a412f07b","openssl/crypto/ocsp/ocsp_ext.c":"70ad06e65b00be76733516bc413064604e740564014c0888a30ee11ceb9f2fc0","openssl/crypto/ocsp/ocsp_ht.c":"ae3c7b41ee3f1908eddacedcf114064e6f3d3cf178d0b1b589a917f1d2526d3f","openssl/crypto/ocsp/ocsp_lib.c":"87f1026201007222533ecaafc39d2e33018d422d336251080aaf26f03c833b02","openssl/crypto/ocsp/ocsp_local.h":"78752d1015577f36373c8d1f43ec1892a18004edccaa942e8c0835ac8a5cfb06","openssl/crypto/ocsp/ocsp_prn.c":"9c2367f405e1b112cff4147806897d24a40c34c0465564d14aa12b9bbcf4891b","openssl/crypto/ocsp/ocsp_srv.c":"71c8bd2bcf5eaeffc148ab8f7c95a7b1fdbb5a3e789577a4ec4bf6e9aba5cf50","openssl/crypto/ocsp/ocsp_vfy.c":"3c5a3068ba3c45aab7a45bb17ae1b549205af725222c3e3aa9e55cc0e12cb668","openssl/crypto/ocsp/v3_ocsp.c":"04c9cb4c315ebfdc57f1a0efc6e4831a08c14b679e8e48a4b2c3c930f78cb61e","openssl/crypto/pariscid.pl":"671157af7edf4eb831310affc0d44cc51a17b35d6baaa7f35b95c86e11900ea9","openssl/crypto/pem/build.info":"c419f3165a3ff2cc9e5998a03117291c1183585c2b8823b37a5298ae9914b04e","openssl/crypto/pem/pem_all.c":"5a16e9192d90974de9dbd1553dd09fa373d64366d8a90a6ac4f07b0a0af76c79","openssl/crypto/pem/pem_err.c":"bc491849f68e5f3e9c10106193a8975a4aeca7b43298098a5a81ec2191fedaf9","openssl/crypto/pem/pem_info.c":"32ee97a3aeaf487e544adcfc18e540c9b54a693fcd3aa57150271f89e906d791","openssl/crypto/pem/pem_lib.c":"5931b56b01bc8ccc8e56677b2debe279f2378d8fb2119d9d74c69ed71f49cab7","openssl/crypto/pem/pem_oth.c":"530c99308fabff37b4b130b09754ed542705603a7666ea5133416e0cdaf0bbfc","openssl/crypto/pem/pem_pk8.c":"14447690b2c5e469466853d1b5b1d0b36bf4808861f1f074ed2f93bfe8b9bdc2","openssl/crypto/pem/pem_pkey.c":"72eca65bfed5eb61191f3f5bf7a49397fa7aa132824b9cab7c7a67b9a3d518c1","openssl/crypto/pem/pem_sign.c":"7792b412f4a8910211c8cdd40e05aeb54e614e7716522dd10c834f1908f9a4dc","openssl/crypto/pem/pem_x509.c":"74ff5cbc40207a656e02e8fc7c5f28f64576e8cb8959334031db3cf0f5ebd9b9","openssl/crypto/pem/pem_xaux.c":"c44765e20101d33853fd8f34dc9bf62a479a7015047c0a5cb341ce522d501b6e","openssl/crypto/pem/pvkfmt.c":"77fe4e179c5899330fd61e3ada9e6a2ae0f17118515b7004efced31c620afcfd","openssl/crypto/perlasm/README":"a397f0f820309ccd1a25143fa8bde5c6e5512de53add775214cafc45eb3e594d","openssl/crypto/perlasm/arm-xlate.pl":"50f1d3fda02dd7b00a529b9087e55dce3d4c58fcae7c1508fe4dfa546dfd1e41","openssl/crypto/perlasm/cbc.pl":"73a0364ae97d052f89ba7f83283fa9893a0b7b76b0555ec4033c1357f9188add","openssl/crypto/perlasm/ppc-xlate.pl":"964569804a05f76630898a070bc7399c45ac968599cb2a438a3a0f3d1266f3f7","openssl/crypto/perlasm/sparcv9_modes.pl":"0c7ac5079c3863f13bb467d0b6402b0edb13fba04dc669e27e0989d0632f1144","openssl/crypto/perlasm/x86_64-xlate.pl":"0a1377240e2560d4628e29fc533c086b07144ffe414bb5c7d2ee614351062dca","openssl/crypto/perlasm/x86asm.pl":"fa62e615e89ca1e0775e7e8913a911726a0e4651322e9c33b040714aa20d8f71","openssl/crypto/perlasm/x86gas.pl":"ccf9de7a5e7eefa00d7cdf23f2d73538c0ba48ea75544d0ae6040ab20323209a","openssl/crypto/perlasm/x86masm.pl":"3b57d38f24c2193b4ab5c7ff603666846122198336ad1939cad482120b4f41a1","openssl/crypto/perlasm/x86nasm.pl":"5a89241db3f2532b8daca0392d32b21b6f9420a1e4b6839b2c17c80e1874146f","openssl/crypto/pkcs12/build.info":"2f59a1c0bbb1ceea9edeb66b36c8e7bba49dd64a94e8e2f16cad52c36729559c","openssl/crypto/pkcs12/p12_add.c":"1022c183931f02d204d65b44fa0886a826bfa9799e8eaf8c0e7b0f6f8da3ac56","openssl/crypto/pkcs12/p12_asn.c":"05803d4b8467c5bdb1b06da8fe40388c347bea9f2f8e54584f1e754a04f7332e","openssl/crypto/pkcs12/p12_attr.c":"f7a31189a46ac43f2a64271fc3a5ec793d79c2906b24397456e67ea930f3c0d7","openssl/crypto/pkcs12/p12_crpt.c":"baff5b7231306d2254013fdf0ea8a1798fff3051633fed729d044f938b5c9a99","openssl/crypto/pkcs12/p12_crt.c":"aa6ca363eb66d526ac24b3f126b5abd776e98ee23a5141ee159e0217e381efac","openssl/crypto/pkcs12/p12_decr.c":"0ef74163429c1e8797e5f7ff26fc9f56fb55600f02cb2d6f639cc50202bd02b2","openssl/crypto/pkcs12/p12_init.c":"fae385643529f9567d691927438ec92c8125cdead2aefe88ccabe5c8af1bea45","openssl/crypto/pkcs12/p12_key.c":"2f3e58ef6b443c0548a206dee3e611c10e22651ca7dbf7ef1157b2e201106a24","openssl/crypto/pkcs12/p12_kiss.c":"b8a6f89466d45ec6f6581db37b215383b1a84038f4f2e10ca9cdad038e90fafa","openssl/crypto/pkcs12/p12_local.h":"8a84fd4f012af5f8ab4fccc309cef6dbb9061646abfacb0d41b36441e3b2827b","openssl/crypto/pkcs12/p12_mutl.c":"f239c7d4451263b413dd507f0c374fda8080db717bb7204400eda0106b04fe35","openssl/crypto/pkcs12/p12_npas.c":"d01010c0f8dbdd3beda7964d4e68cf6c1fdd93181c77ecc4c5582facfcbd9d51","openssl/crypto/pkcs12/p12_p8d.c":"d1dcb6931499e9f7cc838e69efa9e1617b249cb0515d2ba8b45043b75b918e9d","openssl/crypto/pkcs12/p12_p8e.c":"e2ad27c98cf187843985aa71315875a207d137b3bc38d59df2da56a4ed58f554","openssl/crypto/pkcs12/p12_sbag.c":"5af3f68a0c3de9e7a6b9d8a11f3d0de577bf61d9d0b0b9590e28cb0cd75da9b7","openssl/crypto/pkcs12/p12_utl.c":"0f10379d12ade7fb5bfd5278dc75923dcfe2f52f11d8823f1a530c22fd53e839","openssl/crypto/pkcs12/pk12err.c":"738150847fbec69e993de2e8b0d226c20081e425995f64eec317b245ad175f03","openssl/crypto/pkcs7/bio_pk7.c":"d35d599d846ad941d02aea02b1031c90edbffcebaa81eea0e55caf875d6e32a0","openssl/crypto/pkcs7/build.info":"0f56496c6125fd0e2ff6e5cecdd26073f0d491a73ad96492b403936f8aee3c54","openssl/crypto/pkcs7/pk7_asn1.c":"5fad3d3ef8435214916a1a313b541480de9b233531505a3f6e0cf07d39c77852","openssl/crypto/pkcs7/pk7_attr.c":"bb9f4f93286952e70c4fbd33dd4446533a20f474227ad7fd149ac050f6637e3a","openssl/crypto/pkcs7/pk7_doit.c":"f58d3d3674c9bf0bfc4571d105552ead7366aba58d183f2792c62132be233bea","openssl/crypto/pkcs7/pk7_lib.c":"de60d7d8447e11844e0eff90f50e8008b3565cf030e805d6c47224721cbe5763","openssl/crypto/pkcs7/pk7_mime.c":"cbc67561cca2e1904d234dd7f25d4c57b42e4825e52890a7928162df3072281a","openssl/crypto/pkcs7/pk7_smime.c":"ffbe7cc41984ee7160f01a20faa341df78b9c7f652362eb03d253212a5bfc786","openssl/crypto/pkcs7/pkcs7err.c":"09607257508d8b105ecb4dfd28a929eb001eb822ad9cbacaeb5706b2efd2fa54","openssl/crypto/poly1305/asm/poly1305-armv4.pl":"d0ff864669d1706928b27aec378665cb0e3b307eee5b482ebf29abf1ca5bc067","openssl/crypto/poly1305/asm/poly1305-armv8.pl":"71288a9d6e7eef64333d9b89319fa40d149733e358c7e9eadced0a1d7d12b2c6","openssl/crypto/poly1305/asm/poly1305-c64xplus.pl":"0107057c401a6ff2b0838aab9b704736550c08fbc81971834c6f4f202de41430","openssl/crypto/poly1305/asm/poly1305-mips.pl":"cd135a12be9c47277cba5e2fcb1b27289cde632584a1e2808f8d9d3222aa3ea4","openssl/crypto/poly1305/asm/poly1305-ppc.pl":"3da40be700562136d1b935479e35d46b31295de5b45317f3ca10d327ab8f2e92","openssl/crypto/poly1305/asm/poly1305-ppcfp.pl":"af455460399ea65fa61beeb46d7a0faf1b128ca5070929b361084daaf72b19ba","openssl/crypto/poly1305/asm/poly1305-s390x.pl":"c879cb3c6b632d3cef3eba411ea0d1668491c0353585cecc8a004f30544a955d","openssl/crypto/poly1305/asm/poly1305-sparcv9.pl":"0ee8746f475278a6c7a24b5e338fdfa4225c1907a4ba677f9475db7fa3135251","openssl/crypto/poly1305/asm/poly1305-x86.pl":"1998c110caa1ea62d7bd41b0b7918dd2dae3d2b02207699773b203dec1729bd1","openssl/crypto/poly1305/asm/poly1305-x86_64.pl":"e9ed59a5ca1a014016fda2a08878b1cbc98a72f603b5031e05a2fc138b03658f","openssl/crypto/poly1305/build.info":"e4c61fef5095fa4b702b6719eeb0e5b2e68783994c84fb551a47e67990d65237","openssl/crypto/poly1305/poly1305.c":"33660bdb9e65ea21d5b76b846b79e717085fd45213b490787b48b8cceefe10f7","openssl/crypto/poly1305/poly1305_ameth.c":"1c437f1a9a51aac872479ab435fb325af2689435000df0581000195de74eb1a7","openssl/crypto/poly1305/poly1305_base2_44.c":"0ea8bc267535c740255678e404481446800c81e6aa26b21803d9311c55689557","openssl/crypto/poly1305/poly1305_ieee754.c":"c0e41ea950a69d0ee82287a6734248e3963d8918620be45c8f9ab87f7f45a2f8","openssl/crypto/poly1305/poly1305_local.h":"9ade03dbc325f7e454abbc1657c7a737a6204fd2ee158302bf8cb2b7ce64215b","openssl/crypto/poly1305/poly1305_pmeth.c":"9b871e64dac49a70d62625cacfd0717280739808cd7a4f7b37185ac01265558c","openssl/crypto/ppc_arch.h":"44a38287a18609ae24322d52ef488ba0f2b96763f324c085e29d9995934b7978","openssl/crypto/ppccap.c":"1e1064b647d738212da2175491c8d3af5c3c78c7532be3c234fd331f4de65277","openssl/crypto/ppccpuid.pl":"413d6d1e5c0049ed6a0b813ad80df78277ffcd3724884a6852d92916ccb967c8","openssl/crypto/rand/build.info":"eb3f32ca6d3d5e5b26f96ff8457afcea31bfef12b580dc4c3c4775551be9f0e3","openssl/crypto/rand/drbg_ctr.c":"e7cf60d6ff5ed2862ec84f47723a99dc624132dd5dea10b2953068a937c853a9","openssl/crypto/rand/drbg_lib.c":"a24e75e6663f6e02e74bf20cf17389c2d1319f1048c476a667a4a06dad127251","openssl/crypto/rand/rand_egd.c":"6e946fcf002b1a30e138ef0628e2a09175a86555bbd1741b6bc16b3371b04d31","openssl/crypto/rand/rand_err.c":"4d0b0226dd530be3cfc62d9f5192477bc19194347c0c53a8b29523b7519422fb","openssl/crypto/rand/rand_lib.c":"16f5557d20594ec24b400184d87314af0f0bc51e4b3b807537243443b28e5e92","openssl/crypto/rand/rand_local.h":"7df626ee2d36af077feecd4069c9e1c1929f528db37c1f42404f67a2aadfc534","openssl/crypto/rand/rand_unix.c":"244d1efd4a17169a09bd110398082c2994955f92dc9c274ce1e2f72ef5b4c512","openssl/crypto/rand/rand_vms.c":"7e259f843f3dddc36ee152f05690e26c5c2c7e8798242774d30f42e1a86cedd8","openssl/crypto/rand/rand_win.c":"4e47837161c307895f84cd79b0cc74370a30a26793e22fd9d18eee25da159b23","openssl/crypto/rand/randfile.c":"fe187941caae09dda34edcaf5b52281f427f9f11dfd0ca77c4fcdb64f3bfb186","openssl/crypto/rc2/build.info":"fa9fad30f2000390e0b060b1c029ac28a5e8e6d715bf06cc05de1c804aa97401","openssl/crypto/rc2/rc2_cbc.c":"5d17a12887305f3e4651cac47756621be09efc1e8333e138856bd5fd477bf0c9","openssl/crypto/rc2/rc2_ecb.c":"28c2940e21dba06419be3ed19afca706e65f311bc7e418f970b02c7fb24abd29","openssl/crypto/rc2/rc2_local.h":"ed44dacd7fdf91b264373b3c9977abaa754c0df32e5fa21060261478ed7eb4dd","openssl/crypto/rc2/rc2_skey.c":"84896df1395bb27f8dd7cb7c23411eff6c80aaa081fabc8c757aab0f26ec05d1","openssl/crypto/rc2/rc2cfb64.c":"d856c9d9208df29fc204f4efa2239c94ba12e4ca686b2760ace8b8e4210bc685","openssl/crypto/rc2/rc2ofb64.c":"4de9c653f5b5136e239b61ef047f1a97af043ea95cc83486290dc76c398378ce","openssl/crypto/rc4/asm/rc4-586.pl":"e6d6ce4a453540cce69e560f598fe5e8712cf0d341de46bc02c995a73486303b","openssl/crypto/rc4/asm/rc4-c64xplus.pl":"fc651da99f08db21512898fd642212751959a58bc8450d848968f3231ee1209a","openssl/crypto/rc4/asm/rc4-md5-x86_64.pl":"84af0ad1878af80af48799fb258b424e014d34fb572903f336a66d43d2e4f0f8","openssl/crypto/rc4/asm/rc4-parisc.pl":"3fe4d93256af08b1f9357d63a48d9d9da894cc80647142cf7aaecdef02b64f8a","openssl/crypto/rc4/asm/rc4-s390x.pl":"289518afc7db683a8da31c85033f1376d574140a1a050330b88e1415fba767ee","openssl/crypto/rc4/asm/rc4-x86_64.pl":"42f8e2f8834e371c9fd78fcead28a04699e9ce13a8c0cc6033f8ad6739e38ff8","openssl/crypto/rc4/build.info":"dafb5e92c1c67dbceb1346e0ca7f9593ee0d32b565f6deec78115575882d71ac","openssl/crypto/rc4/rc4_enc.c":"698568b5fe0dcaa6f82bd2bcfa8314063857a41c52f72ce2b0d89ad785883493","openssl/crypto/rc4/rc4_local.h":"82f57383610c6462ff3c4462e4ff539e5bf66f6683d8d65c888bb6a1328c3cf6","openssl/crypto/rc4/rc4_skey.c":"fbeb154e752081d08688dba213b005f97dd269b8354bb80ea3bb03ecb429d0f0","openssl/crypto/rc5/asm/rc5-586.pl":"ea6781b05166f25ce2e23df9e6d803456bad08d3864e3947bfc6837090d999ee","openssl/crypto/rc5/build.info":"9697a4327aeaf8c8934683c3987baac00b7ddd22a5442a47f14e4bf24eba8ba2","openssl/crypto/rc5/rc5_ecb.c":"86c967263189d6e5a6ebeed489f333fb40135d1db5aab739524fd63068a3fc58","openssl/crypto/rc5/rc5_enc.c":"6a979a8f1083f257ed4baf7cd1d79888a3d56cf99dba9594fb87c4a58c7b2ff6","openssl/crypto/rc5/rc5_local.h":"363648f7b8d0a5f5ef008ab6444741a39ec5391e456f765aa6d3c1c226bd2c66","openssl/crypto/rc5/rc5_skey.c":"f42620aecc4ebf937620f848e2fb011257ca46819fd2d31ae98e4ce8345a2947","openssl/crypto/rc5/rc5cfb64.c":"7d09168e9473d4448266c0d428509233ba0d9cdf40251f801827ba67485ac920","openssl/crypto/rc5/rc5ofb64.c":"114c7a7ecb408f6b4552cc2460c0a386cef4cd823a877a6058bd9f3ebd235a20","openssl/crypto/ripemd/asm/rmd-586.pl":"707a70e32309d4e55867e57908f6202e281427a1a917a31239afa4ef7b799410","openssl/crypto/ripemd/build.info":"8659770d9841882138787c31161f0caaf5659daa1ab6ee51446825f69fed0d5d","openssl/crypto/ripemd/rmd_dgst.c":"c845d74a5629fac28a1646ab8bbb07152db302dd89d117b7b133836638d38cae","openssl/crypto/ripemd/rmd_local.h":"b6c8dca828d8187e44350a3430ea373fd0f386e088ee0bcc65da2e0baf41bd6f","openssl/crypto/ripemd/rmd_one.c":"de45dad151221a755b1912337b048c0828b7ea9803e2f2700e55c02f6d7c2bfd","openssl/crypto/ripemd/rmdconst.h":"b4f908f84addb2c1b1fe09261d26b87ef5a20d434ae8ae42dd078addd71ad467","openssl/crypto/rsa/build.info":"257b566ae3ecacad27d828d5bfe447e9f1e0aad0e8efd3c212f15df49ee913cb","openssl/crypto/rsa/rsa_ameth.c":"307abc673ffb80d45a011b551b2a918f98589365ac3d246e401c5c984009f383","openssl/crypto/rsa/rsa_asn1.c":"81a5a98914b8e2dedec487b3ef98c9f003d6bef33005e191322f2cd4f04330ff","openssl/crypto/rsa/rsa_chk.c":"7bfa882a20fced60b03b287230d4549abfb282cdf24a2b0f570edef80a169697","openssl/crypto/rsa/rsa_crpt.c":"da9b2f71971479da56e4f39a345ed2fbb020ef12737d417c9b68c11a7d50196b","openssl/crypto/rsa/rsa_depr.c":"d7421a277b8a98658c74261388c3628856f56e262ee97dbf41f6584a5594f81e","openssl/crypto/rsa/rsa_err.c":"4a84e10c082ec1c3986fea95fa62189e217cff91a3bf705bdc8a0bc904c6c781","openssl/crypto/rsa/rsa_gen.c":"abd456b06e48f0bfaef44e064f3fd62db6bc0fb445d23627e5ca784b93af3e70","openssl/crypto/rsa/rsa_lib.c":"b711e363b57782b03f657b372bd6311458255704ea06071e6a1dbf3f22b7a5bf","openssl/crypto/rsa/rsa_local.h":"51245a3f0b7350a846ed851692ac63bb09af2584681b31b1552bbf99241bb647","openssl/crypto/rsa/rsa_meth.c":"d51d459ccd362102bb5a4f64ad6144f077d2014a9f0cf6201fd77c3f05a1e757","openssl/crypto/rsa/rsa_mp.c":"832bea3c81f5d7d1e41daa1ae1eb4989908796f2d9574738671e9462419b008f","openssl/crypto/rsa/rsa_none.c":"f3a8bc1ba22ecef6701b80db01557078e2cf12f2b61a16b0892423ae43d854c5","openssl/crypto/rsa/rsa_oaep.c":"c938fe57f010f532552676fa9b58f0d6d742ab5feca031c754a95a9bcda6464e","openssl/crypto/rsa/rsa_ossl.c":"37645b993d30a14fcc916455bc113fb23d3f78da6b94c6cfca52aa89176e5837","openssl/crypto/rsa/rsa_pk1.c":"413f63a20d5ebdf688537cecd1904f13756b297c0f26c899906a309af63ce879","openssl/crypto/rsa/rsa_pmeth.c":"d6147a88868e540d78987e6b140ac5008fe4c94276bf49287da377faac248496","openssl/crypto/rsa/rsa_prn.c":"a9199be1c948aa3f5309307c97ecf2277bfb52e811b4f9bd16d20e3b58d96eb9","openssl/crypto/rsa/rsa_pss.c":"dfb509cd579f114cadd7eacc82554481088c5f01345f090f4cc9600df9a0055a","openssl/crypto/rsa/rsa_saos.c":"888c46b976fcc6af3ccf850883fa87ad43306e872a2a705e278481e50437b212","openssl/crypto/rsa/rsa_sign.c":"396019b0a9987e4e5f5be1fb2d7c2ac6ed62ab645b68b977669d0806c2ec381e","openssl/crypto/rsa/rsa_ssl.c":"8e070af202016dd7f216ade45a5a5c777185011d726dfc9ad486b31907f46b7b","openssl/crypto/rsa/rsa_x931.c":"a3f7a315506d4e26a050d764df2eb8f5a5177d31e4d62d48d1a6abc857a862ee","openssl/crypto/rsa/rsa_x931g.c":"2bf3eb27bf4394f7f34235f51db3c3e9eebb8a8711ee6507de6a3b90c4c32131","openssl/crypto/s390x_arch.h":"2d3c0e7462a39d7ed076ec1b9c6a7373e51471ca3f8754578cb231cbeacd365f","openssl/crypto/s390xcap.c":"499c372d94e55772e7fb6c532ef0007551f66b2c46f20b427d6c1758a0868946","openssl/crypto/s390xcpuid.pl":"1d8a4694b69b32ab56b031e997dc8802b20380fe078fb56d7e8f62da575907b9","openssl/crypto/seed/build.info":"11a58534ceff43757cf9dbed58c94ddee01789b3992a70e3601e37637bc49ccd","openssl/crypto/seed/seed.c":"80618242c9d0f75a5ab1c7c080e857c69710854ec06329e7434bc83438e0fd96","openssl/crypto/seed/seed_cbc.c":"b775e571021fe9d348f836a010f6a5489e7f2a0596dcc5b52c1be10a91639741","openssl/crypto/seed/seed_cfb.c":"480a01e3ce4b95992b62c5a63cfb7a244122caade4845785ff92e3f8b655d062","openssl/crypto/seed/seed_ecb.c":"b6f8a61c77174d96f7857350f626f83796f34de7de6c2fa83a228811c690a74b","openssl/crypto/seed/seed_local.h":"a7f2e5ea85f994f62450a0056de9116982291a8abc12d3e971537d89229c4106","openssl/crypto/seed/seed_ofb.c":"e1897c1c4af729d102daee7121e585b77189e22afd8ab095b98689f629023ae0","openssl/crypto/sha/asm/keccak1600-armv4.pl":"542e8f46ede74eb9cd19c72a49071bdf91ad78b75c7500481d5c59c65afcda25","openssl/crypto/sha/asm/keccak1600-armv8.pl":"4b3770611981a2832588c9f35e4f02e38b2f9ecef3ca23db62a5a25f4a17bd96","openssl/crypto/sha/asm/keccak1600-avx2.pl":"c12ee719d061ed159fcba309237af8c11deb2a19606320f7a9bd96c97467ca81","openssl/crypto/sha/asm/keccak1600-avx512.pl":"6b60549e38f1d414fa7a6b22ac3425676f3dc13da2076b3cb1ab83fc9b007dc4","openssl/crypto/sha/asm/keccak1600-avx512vl.pl":"b7162d20919c3677c0ba5b9c15f32a7b93da382a8772db9e9c01d96dfcd59b09","openssl/crypto/sha/asm/keccak1600-c64x.pl":"612b74de8eb0be8773a0b06738a39deeb3897059fdd8a85c64cfd910dbba0fa5","openssl/crypto/sha/asm/keccak1600-mmx.pl":"b0e6895f1c1b2c32387c7d3b06fd474506a6017e55734e4975b0643c6bcd108d","openssl/crypto/sha/asm/keccak1600-ppc64.pl":"b22b70e115f4c24e0c17e916954e0e6afd0c9593e65207a3735ad89aeb97402d","openssl/crypto/sha/asm/keccak1600-s390x.pl":"85a7715a8edbdc5636a638da798ffa8b0a99320f1252e6222f2d3099b722b6fa","openssl/crypto/sha/asm/keccak1600-x86_64.pl":"a14915e8a91fb4a15054ed7c1ba6e508e86fc69c3ff5b9073e0600c4846e0656","openssl/crypto/sha/asm/keccak1600p8-ppc.pl":"a8c7a781949b77ac99f175a345c773343818e21c7fc9984f0e7199d301e67c22","openssl/crypto/sha/asm/sha1-586.pl":"eeb0fc4fbcb984038ab1b1c15dc5afcffb11913f9fca00f8d4b915d9798bb400","openssl/crypto/sha/asm/sha1-alpha.pl":"cd51ce6fca67e62b73cac97ab23fe72ce9cc611135517a3ddc1eed5c31fcd87b","openssl/crypto/sha/asm/sha1-armv4-large.pl":"0a06172fa5a03fdb7b99c7515b87a508d83f2dbe319cd44bdd52a9d5cff96ae4","openssl/crypto/sha/asm/sha1-armv8.pl":"6596faa8e1a8a6472ecab5638b39554077451901f2fff8f51eec38ffbc9cff5c","openssl/crypto/sha/asm/sha1-c64xplus.pl":"f92bca18470640470899a721878a6b70bc5791a30da8129d9de88bbd2a55a79a","openssl/crypto/sha/asm/sha1-ia64.pl":"f8a627a74526c3cbc258af9084971ef1c5f88bea15ea78d1dff8bd249a73c01d","openssl/crypto/sha/asm/sha1-mb-x86_64.pl":"800cc6d88fb5663b7f150eb3d7c4902b65c4814308b969803b41588a6ab12236","openssl/crypto/sha/asm/sha1-mips.pl":"6be7c374df5c4fa5f54170a785aecdb9fa0a254e9a4a9add71e00cc71b2bf7e3","openssl/crypto/sha/asm/sha1-parisc.pl":"84e61839ebbe074f1eb9af7091afee054d2915c8d37d49ab744e5644d2ee3753","openssl/crypto/sha/asm/sha1-ppc.pl":"e13e35de483cd2205d94524bd56c459fcf079e038bc7392fcbe3a8086b297a70","openssl/crypto/sha/asm/sha1-s390x.pl":"119b51be4107546b803fdf4f4903c2dac5153ded1903388c8f73415eb8980f7c","openssl/crypto/sha/asm/sha1-sparcv9.pl":"34662072f7db2945d9291cc84ef51a308e6aead68e500d24dfce744dab4b9cbd","openssl/crypto/sha/asm/sha1-sparcv9a.pl":"e23a82eb0fad844f4e150112948a07748033f819a7fdd6a17465ddc3af9b77b1","openssl/crypto/sha/asm/sha1-thumb.pl":"4e49b02927a01e6448717e71647ceac30dddfd9f86532cbc16fa9a1281ae239e","openssl/crypto/sha/asm/sha1-x86_64.pl":"ba4b88674f454bf022b838d93ef5b2434c4e618c32836687afa00a0ec636d426","openssl/crypto/sha/asm/sha256-586.pl":"1202d1efbd245d5dcb1f5bdab86ce95a60f97c86f2bf79e8cf011e2005d7e826","openssl/crypto/sha/asm/sha256-armv4.pl":"d0c38f7f021c358624d6845fda1cc2e278b4e8523efbf59de627afae31a69954","openssl/crypto/sha/asm/sha256-c64xplus.pl":"65fc995ad25e0e22cdc1d429c02d27ed88495350093b3256ece3adbe6fbe7817","openssl/crypto/sha/asm/sha256-mb-x86_64.pl":"bc2549bba79c9367e749da71ab40f0b9a1434b87fd3209fdf414c9342ab7cbf2","openssl/crypto/sha/asm/sha512-586.pl":"8ce885933bf41c9624a7a51e42abcb32fc915d61a1e7de3d595281d3d2592af0","openssl/crypto/sha/asm/sha512-armv4.pl":"956283d9ad4de0489cab2e32135826c3fcc14d7c0efb991a0fc72b8cc37ec666","openssl/crypto/sha/asm/sha512-armv8.pl":"effd9a393a181e0595d42d1c5d4a249051a0c62b1ab6e36cb472c9b3dba05567","openssl/crypto/sha/asm/sha512-c64xplus.pl":"09f9b9e042cc8f848eb852e156bd6892187eab8ce3edad8f1db29db3541d9248","openssl/crypto/sha/asm/sha512-ia64.pl":"4342a9b491a46747edab0ff7bd0f762b1f70b16f374fb415ab6abc588e4e129c","openssl/crypto/sha/asm/sha512-mips.pl":"a8a3a342b55e3fc29a55bc01d22c9426a61b62d54221f98f7e271d5307f21644","openssl/crypto/sha/asm/sha512-parisc.pl":"a86a41d9c116c552f23a6b3aff1ee0f2e5973cbd5086e04eb37db3c42acbbf64","openssl/crypto/sha/asm/sha512-ppc.pl":"129c4638fdfb3459d804bd9755c998a9f995e90c56825ad6f8c4c02261351489","openssl/crypto/sha/asm/sha512-s390x.pl":"7d35d2bba8dea8fe33027bf8ca132c6c23f13b34de3c4aee7e8b3e61b065ca2c","openssl/crypto/sha/asm/sha512-sparcv9.pl":"2148a9ab469e01ea394db0d3382839b47a61c7532d0dc328af661084b965712b","openssl/crypto/sha/asm/sha512-x86_64.pl":"20411ddd8a77be94515ebf5352936839ff698ae2b39d565b66fc1827c3be3922","openssl/crypto/sha/asm/sha512p8-ppc.pl":"a4bdbebb7cb5bc0b259b1f25e2afacd821cdbf99ffe3012772250ea16fe97adf","openssl/crypto/sha/build.info":"d40aac1bb358e2936547b3f40ee445b49c48fce159b51f74545feabac0dc6ca5","openssl/crypto/sha/keccak1600.c":"4596e079f5bbc172204cde849e4d1e5e4cab78b507a86294030d97c3a0173f33","openssl/crypto/sha/sha1_one.c":"18bf57d4750e234f7074375609a9f9aae32c5872a7fe0c16a61e2a3848483708","openssl/crypto/sha/sha1dgst.c":"ae0dab96e2b0d8b89fd47bd6049e70fde583dcb4a16e5372a2745f7e1fa74a4b","openssl/crypto/sha/sha256.c":"3c03556ebd787b018f747ff3c6d84ac08a1d458b6367a172560ce20a114e8109","openssl/crypto/sha/sha512.c":"4bc230ca6efecf8391b0c7c114d6096f7aeb0dd09bb573d98db2b71df788b855","openssl/crypto/sha/sha_local.h":"604eb9ba98aec825f308ae0ef400aad2331513df7d47f1604ff524a4915c501d","openssl/crypto/siphash/build.info":"380f0a4c8fcd9697eea92f2b5004050d32a55bd6893a6ec8d03bc316107c8f67","openssl/crypto/siphash/siphash.c":"9da8a7c5156f78546629c115fc21ab5478ffb249fdc6e797ac93fac05313bf70","openssl/crypto/siphash/siphash_ameth.c":"17f0f6bce14518f7a7ed4c269fecb66d6bce4149e49c576e39c54bfc89017088","openssl/crypto/siphash/siphash_local.h":"d6325eb9c432f35d9b9f3c0ee9c7785f70078d95986e3bfc3010634d76a026ac","openssl/crypto/siphash/siphash_pmeth.c":"dca7f5df1fcd2fc457918df9eea7388a9709f92994c22ce2a8d5c50f3d02c803","openssl/crypto/sm2/build.info":"a0ea4917c09e9f2153eb4f722a4a419b1437e358d6dd5a8b52ad3cd6e99b45cb","openssl/crypto/sm2/sm2_crypt.c":"ad218bc77938bd3f1aec54d1b0c2bc369ac8ad74df619da4ac68f6f9937535a7","openssl/crypto/sm2/sm2_err.c":"9dd7b6bcabdfe8ca1eb66374370bc1708efb0db5dccf7cd296174740fcf2f771","openssl/crypto/sm2/sm2_pmeth.c":"e19cc4e2799eed41a4302057ffcf16fa34b1d930edf80d1cc733b0b40887a916","openssl/crypto/sm2/sm2_sign.c":"203260b46105abc1525125e5a83438c7c5a6bf19ad216246b55e3609ec58c1d4","openssl/crypto/sm3/build.info":"619763e5cd74bb7c9556ba97dc559ff219a7e0fa25a704579a2b9b1bda1f3610","openssl/crypto/sm3/m_sm3.c":"102b12f8382f33279c763aaa1ef6ee0923723dfbcea41b07e465c01cd2cd72cc","openssl/crypto/sm3/sm3.c":"192aa39e787fa67d2ad800cc5b8d1c80d5c6cc6384786680d8eeb14185c057e9","openssl/crypto/sm3/sm3_local.h":"02cee467d273f55810be185590e1026b1fda6f47c526fd66f449864fcf4d83ec","openssl/crypto/sm4/build.info":"e447c13dcad1e3a3cb2d582b4979be34f1dd852cdee1e325c87a8f5f3658138c","openssl/crypto/sm4/sm4.c":"287c8e298c63cf935bbd7f767abeee1a6a9c84fd5930253627bc8466fc1651ed","openssl/crypto/sparc_arch.h":"210a902b386e5a3ffb43f1e634d9a8c0069c84c572fee3285dfbe446643dde95","openssl/crypto/sparccpuid.S":"9f67d1aa1a9c642198abb67ab2394fe7c9375017822f8117679d14c49e1c0ad1","openssl/crypto/sparcv9cap.c":"50bd953eabbcaa6263185495b0500f481dc223944868ee8d1a80d8e19617b408","openssl/crypto/srp/build.info":"117640a1010ab716e020ac03b532c763a7fa3c2289633098504ecbe94995f376","openssl/crypto/srp/srp_lib.c":"0f2f0ca489d8e5417fce0f76e13d732e77451c106f39b4d6a4551826ba5945b5","openssl/crypto/srp/srp_vfy.c":"c867463872f22da52b531ff8d18efa779df69788dab8409d4ea870c59d9ae278","openssl/crypto/stack/build.info":"08ddcbc25f8fef0aff834fdf79a514eb23ee9ce8b3075499e2f446870ab11ec3","openssl/crypto/stack/stack.c":"61df807a619658bef83d8d02942a22e6885a877469a1083ef12115d9a15476ac","openssl/crypto/store/build.info":"411fc258658218b167097415f8d086d2543dbe580ba03ac8f6c9b6b0d3cf2d49","openssl/crypto/store/loader_file.c":"32373d4a54279da6a2838eb903f67f75ba376b083d58d63921c5768099c2d576","openssl/crypto/store/store_err.c":"c5a0e3525c808c54a44866279a2e23cbb32a0ee057b22045de66a6bca9e5d345","openssl/crypto/store/store_init.c":"c77b777ba036a9ebdc6916608455eaa9db23eb5168ae2be94b23c13c697086fa","openssl/crypto/store/store_lib.c":"99fa9efd46a8177fa44155e6986ca01d80ad1fc841b30ce72981e62bb65a126c","openssl/crypto/store/store_local.h":"f9faa746e26e8f8efd1c2d52d6845f00f7e16e15f80e7e112a5029f531b365f8","openssl/crypto/store/store_register.c":"69d36d882b2137f51672f461dba5bdbb697dcd22f8c6c36035e8c4f92fa2c96b","openssl/crypto/store/store_strings.c":"a926f46d67fbe57747a3dfc5ac8aa01c52a196e8359db44be88dd391f1b0c045","openssl/crypto/threads_none.c":"ce84a6a047a1d5bd4dad0947b3d6e8a166a1f8daa2b40aaef30292bd0736a952","openssl/crypto/threads_pthread.c":"27955f2f4be96cc85e661c9998940f84bd03532b08eb1f49825cb480bb11715e","openssl/crypto/threads_win.c":"e813a198a1a0304781d936eb79132ad09b9578e4702b59f8c3d3ca3c7d3de56b","openssl/crypto/ts/build.info":"f9908ee4ca6a1b8a13a050e2864f99ded2871603aef152b80dede8cb7d23a1d1","openssl/crypto/ts/ts_asn1.c":"6a4ad1328934a8686e43d2a5d5b98b7aaf022ce31fb2240fa503d2b55c0f6159","openssl/crypto/ts/ts_conf.c":"9f58af31f6003c52a4940358e4a429a5274b7abafa6b4f08e5ca8457cf1e10ac","openssl/crypto/ts/ts_err.c":"c0de1090451540dfc4266afe1fcbe348e659f554067f79397d934955123df1db","openssl/crypto/ts/ts_lib.c":"1799c88472a43a977b5e3b481e1f5a68611f3fd40c5711287af8c7dd67f8f6b2","openssl/crypto/ts/ts_local.h":"e74f27519c9ab2dd9e76a6913f0645b034872a011dac5028aeefcb0d3814f828","openssl/crypto/ts/ts_req_print.c":"3ccc050fe21d386022d0d830f6eabfe2a4f5ddbee93e7792620dc6d5f7e55653","openssl/crypto/ts/ts_req_utils.c":"36ca2e7fe8dadee3e1869aae453afc14f212f62591282accda69acef8d035f08","openssl/crypto/ts/ts_rsp_print.c":"c575672e3ccaa71d7049be21f9fbf26b68a5c644538ccb0a3998ad856fb3b214","openssl/crypto/ts/ts_rsp_sign.c":"30fc28979a34af230d114c57b5eeb5eef339e9ae9cce816962cbf6a57b170acf","openssl/crypto/ts/ts_rsp_utils.c":"1e621128663bd333f579603633e14d865ddcb4a9cefbaca7de38a473413ccf31","openssl/crypto/ts/ts_rsp_verify.c":"0114d77d534ac878fb08c7b464e233a910f8fa43758d7e9b5e844ad674d2495a","openssl/crypto/ts/ts_verify_ctx.c":"867bdb925a2de49a5fddbad729c89dd4e83fdeaf9073196a2a5d521784ab1321","openssl/crypto/txt_db/build.info":"799c270bfbc9d07d6f8b395ad253c0a8a2f20550328fad5a6691e79af4694819","openssl/crypto/txt_db/txt_db.c":"4fe9150f5665f46ac2c9949a676b5251e15b51106ad62a57fe11b9fc8af2305b","openssl/crypto/ui/build.info":"5a483732ca46036c608b7e20ddd080f9a4b2a171c85ed85c87933d398b6b4514","openssl/crypto/ui/ui_err.c":"027d5bcb2cbb2302b2a61936f79f9eccd9a06700bd2cc41a3485bbd554eeea8a","openssl/crypto/ui/ui_lib.c":"946edaa4b9ede3bad15da10c64d0e4a1ee5d639efd8102365450a5ae4e36355e","openssl/crypto/ui/ui_local.h":"e07419f8321ca0234282df11a6a616e7710194753b46aa84102c34cd7d40f46e","openssl/crypto/ui/ui_null.c":"803d2ae023fb6d6c3aacb4a2cca0165f90e545260d9fd544af8d1a9a751b243b","openssl/crypto/ui/ui_openssl.c":"11a0b8644c420b9f968161e2131852b5f0e6d7e247d0d7ad3746280ca7be9df8","openssl/crypto/ui/ui_util.c":"c6350ba9b1a59660e04ac1a9670b5c387d470d0d9ebcd77aa722f2a66e551199","openssl/crypto/uid.c":"39be0e1d0d826424d857f2384e87a33d23e2a342e95dd691e2916d77fb33ad4f","openssl/crypto/vms_rms.h":"d8a9dea1f7d6d2d47b4f8e13b44300c240b4215724d019459f537f0ee8de65cb","openssl/crypto/whrlpool/asm/wp-mmx.pl":"887038977e3f1fce6ce2d687ea7a40323213ab43b0ef95eb5b2c60f0dfaea948","openssl/crypto/whrlpool/asm/wp-x86_64.pl":"c758c6d370f26c614b05321069ec0678dda7c993f8a1864b1e01c12e52264512","openssl/crypto/whrlpool/build.info":"af3bc2b6c3963c272a6eb1fc015578e3b13c8edfc3a857ea7817fe5337704e9d","openssl/crypto/whrlpool/wp_block.c":"884f1ec2247d0f1426e4201ff7f0f7c9a24419bb2bac3ee5c6fadaec213f861b","openssl/crypto/whrlpool/wp_dgst.c":"1af49127d90372f8cce04f89d8c8153f053ada1383382a01d2eca73ba3faa32a","openssl/crypto/whrlpool/wp_local.h":"ca85102a6f440eb9c3d0958b79a3266fd6f94fd8da49dcfc607719183c57bd78","openssl/crypto/x509/build.info":"2cc54f328ca08c22601f6098db0ea39519b0ae34c5823eb84455c31523c9ed4d","openssl/crypto/x509/by_dir.c":"17d9bd9c10c7873bbf263f5aba1c104b09a2fb6f323919ac08f2e8a27648074a","openssl/crypto/x509/by_file.c":"12c78263f35836fab4b23445bf93f7a454d12931cbb0d19e7dff56ea01c14593","openssl/crypto/x509/t_crl.c":"e929cedbafba5ec1de7062a8d9517521a58aa5ca30f0e58f92022dfb14fc2a1d","openssl/crypto/x509/t_req.c":"e63b47be322906b4016172cf06c495f846de9433684bba212d6fad17e2068075","openssl/crypto/x509/t_x509.c":"ed54bdf66877a48bca8e1e83a2a80d63e7e78b23d68a475b88db1c8ea5ca647f","openssl/crypto/x509/x509_att.c":"d510f09e9621a1a2c0705f97707d897dd64e8bb0ede440e819a742f45ded8148","openssl/crypto/x509/x509_cmp.c":"94df1821bf8e3db3affa30b8ed439e13e474bc1f87b36419688c7775f84ad9af","openssl/crypto/x509/x509_d2.c":"0992dfc3f6b6352c81d19c81b82d2b0783ca07d0928e141a86ce3464c586d19a","openssl/crypto/x509/x509_def.c":"131c4ae5d99af123f2e1dc06702a8de35db096b3b447dc45b17c00125ae9f3be","openssl/crypto/x509/x509_err.c":"dff444901a4b74160a763714e7aa015c4851468cccb0fb3168c63e20f901b9ad","openssl/crypto/x509/x509_ext.c":"5eae60eddf4390506a3a2ffa44efab9b7ccee5a6bf884aaef88d4a39815b6472","openssl/crypto/x509/x509_local.h":"c9bce0ef40ad7144218e5fa315fc74572827624c717d89abedb0667bdc86ef06","openssl/crypto/x509/x509_lu.c":"c3d06f8a32bdd302933c10f453803a845f45200e921155607b753be949dbcf7c","openssl/crypto/x509/x509_meth.c":"6796892127d4f8c2ef720cea7696cd21de308a776c75392b1b5c6dcb2b9b77e9","openssl/crypto/x509/x509_obj.c":"85d5382a42ed915057618ae6b835244b8ec5ea6997449b1e7b737fd7a51dbafa","openssl/crypto/x509/x509_r2x.c":"20d19f6acc837f8ffb4a3b2de311a581fa471d52b10a376286bab49026ddf42e","openssl/crypto/x509/x509_req.c":"caabf10b9c6e62ddbbd66269a26a6f4595f4bad08eeff91365384fa149c4ce3c","openssl/crypto/x509/x509_set.c":"f9fb63e0eb93644263fe325a5a2a94ceccc7c2eb21da23139158d18ccc265bd2","openssl/crypto/x509/x509_trs.c":"e2a1b8bfd56d6db5ea950815d4e85555164032c352de15188cfcb9af785bf49f","openssl/crypto/x509/x509_txt.c":"a680a1fdf94210072ca35dab8df36995ccc5af544e504f39d2ab5c321147385d","openssl/crypto/x509/x509_v3.c":"d92b87f23dbc501babd1c5508ca59d79e932a2a3be6df4abcd781ab621dcbbd8","openssl/crypto/x509/x509_vfy.c":"994d310a4a7eb2eb617f37c5414d38a2aabf01c3a2b5473aca1a967e7bfa73b6","openssl/crypto/x509/x509_vpm.c":"d3c55c73b8211ba0cd5ca25c7e27a87ba1dc87a2b28ec8e25eddd4d7fa7cdfa7","openssl/crypto/x509/x509cset.c":"2c02e058ec0805af5ef8aeaa4567c367a1851648d6fc333a9a22bb5a7d6030d6","openssl/crypto/x509/x509name.c":"b5d38d5b6bc0b8bf4b01e49d65c45f5638b548f288cd11d73e0b1ee09218672b","openssl/crypto/x509/x509rset.c":"51a81f7d7243738732b1cac8d98fff07593c9b6413e72cbd37eb96e18ded5145","openssl/crypto/x509/x509spki.c":"aa04f3f9a2f742262d4b9ff64b398d62f05c5a11e48f89955ca0b6f876365dcb","openssl/crypto/x509/x509type.c":"41dd92e873e38a474c52aad7c9964135439a68427b79dd4b2ddc2cbb728fad5f","openssl/crypto/x509/x_all.c":"69875ed3eeeb462b2a8e19af652108a73efcf93a984c997c57a086b458062308","openssl/crypto/x509/x_attrib.c":"3e20fbc5e8660a515ae0a137e4c507c51834e21f79d9a5e1c4effb1ad16f58db","openssl/crypto/x509/x_crl.c":"9eb3ef7d7256d3b1b176bc2813adf738db68e170ad826a47f4a785dfea916005","openssl/crypto/x509/x_exten.c":"693247d2361c016badffa8417994f6fc8ea20e2c5b0a3e9574d11ac707175fcb","openssl/crypto/x509/x_name.c":"b7e17f921eb8a4ea8087f549d78a0aa5bf0b92235e4f0a67a9929e858969b643","openssl/crypto/x509/x_pubkey.c":"e9a5df4a43624b038d308037c4f3004410690aedb03952e0942f9830e5664921","openssl/crypto/x509/x_req.c":"e10b418b414865ffe52d871e6b73511505f1eaccdb1beaa1e4aee75229dce8d8","openssl/crypto/x509/x_x509.c":"0d94d9578d50b37bfd7518385f4b3de376805811709fb362e5f6592e3d3dc9fb","openssl/crypto/x509/x_x509a.c":"15c9d3212720ba734fe72ffe68958ecaa38b85aca4c0b2d1c081540badf42fb1","openssl/crypto/x509v3/build.info":"ac99cdfc6def24ae8d87e06165d78f76e6db2de52a84e273aa65c1b68ee4aec8","openssl/crypto/x509v3/ext_dat.h":"5594f35d016d77119f3381d09ef25d278b8bd0999a9a8c84fee44211c48f5c33","openssl/crypto/x509v3/pcy_cache.c":"6610d69659376ddc88c7778f2430fe7771a3c96156f677cdd03414ddd028ca64","openssl/crypto/x509v3/pcy_data.c":"b310afb45c06650fb89324289474962e8f87aa8555387e456280d1ea8f723ab6","openssl/crypto/x509v3/pcy_lib.c":"d5dabfc31ed80dc2f4bd2774c3d5e66763924efe9a055fde0f863610d38b1577","openssl/crypto/x509v3/pcy_local.h":"920fb9c6d96f0c8b22b784d372c7c63bb498647f6b7b90881062eec2e78c346e","openssl/crypto/x509v3/pcy_map.c":"7ee7e0359e5f50415ba878e8f73b4f2f7a451f716b74a91253d18cd23b05b4c3","openssl/crypto/x509v3/pcy_node.c":"4b0aafb158e95253c809155f7c579c5b8d4ea54476e86112e923c9a8b69754c1","openssl/crypto/x509v3/pcy_tree.c":"91c5d0c135784dc9d1da4d586f2e49f6c386c0d0eab1271317361396987a6f18","openssl/crypto/x509v3/standard_exts.h":"561a315dfed93c1c074b2288210afb3a2a163db9389e281e866a19ae2f8c05e6","openssl/crypto/x509v3/v3_addr.c":"1b8593763f527f37d6b7c4868f6c9d77e537ed86bc019505dae9f40350eb3bde","openssl/crypto/x509v3/v3_admis.c":"b2090e98e684f0fca9f016f20c959f1c630c8eafa38b850494ada0a8c191fe87","openssl/crypto/x509v3/v3_admis.h":"8dc121a741f2345d3ea1cd1258821b83bf99950d7590f0e8e157d5ff3f673592","openssl/crypto/x509v3/v3_akey.c":"3d50125fb6e479a7fb59e3a0afe91abeaafafd5c5ef3896536a21658a07894ba","openssl/crypto/x509v3/v3_akeya.c":"181c9116647979b27ffa2833c2423e48948e865d56d18d6cc2eefb5c31b32ac0","openssl/crypto/x509v3/v3_alt.c":"cac155e95186cee104cab537c82de01162f1296402b95e76d5510921849cf79b","openssl/crypto/x509v3/v3_asid.c":"b8c5940ebd9390fbff6c06bfdea7fbf556a3b5407f6dd07be443366b9e81aa6b","openssl/crypto/x509v3/v3_bcons.c":"647b5cf5cb8443d071d33fc0bf4e324ce232664c2e2db4aed2ddfaf1dd504ce4","openssl/crypto/x509v3/v3_bitst.c":"a1d385a3aa75f9f43252d80ea6d5d0949520910d40f5262efdcf730b7dcc68c9","openssl/crypto/x509v3/v3_conf.c":"a68af11573fbdf678c010cde17d2dab26645c3c1901b5685cf2ba60421656bc5","openssl/crypto/x509v3/v3_cpols.c":"d6398b7d6ed5f65f6dc1cd30e5f4d275d86c31088437f5328b8fd4777abe123e","openssl/crypto/x509v3/v3_crld.c":"0d1b5df4977c278b76ea5d560afe93d99d0b3d54d1dff54a9563f39404d20e1e","openssl/crypto/x509v3/v3_enum.c":"dbfc84f80c93e5c2cc6908ed66f5288c57346785a5228a2772a540f6d77a8d5a","openssl/crypto/x509v3/v3_extku.c":"8d515314dc30aa17016e8a3ea96dc633df24507a88180cc81e8629592959c6c8","openssl/crypto/x509v3/v3_genn.c":"df01b46d706e5efa369474cb35c55ef215ca26744c9bf0a68e39d1f4ff14c5b6","openssl/crypto/x509v3/v3_ia5.c":"03b7078100cbb644ae1587095fd90fb9fd81c014fbb14b5880acb0bd4d369cf5","openssl/crypto/x509v3/v3_info.c":"a704352335f9ce19b84d9e064ad2bfc76a538c8d6473ded006ce58f8769c0d03","openssl/crypto/x509v3/v3_int.c":"a8d9b35e0d9b4b9e5ea9c665c19a3d9293b375b3064b94bd85206f6ef5c57a14","openssl/crypto/x509v3/v3_lib.c":"a3e4ba890b2bcfacb5a0a6279420256b6fc2fe5ed84e51496c7f59855d110af6","openssl/crypto/x509v3/v3_ncons.c":"4c83cc7e74a1a0d99707d92cbbf726d6ced9255dc47cddda0723f7c4d485bd57","openssl/crypto/x509v3/v3_pci.c":"9c350ee6a263e6524211bcc01f3d682bb4c9cf42f024f219405a9c077a0d12ef","openssl/crypto/x509v3/v3_pcia.c":"1f03c6643126ce61047b25730a43136cd957ed545b0bb3955f3add35b6142b18","openssl/crypto/x509v3/v3_pcons.c":"6bae7cb1bf646774af20eb4e7bd307e2f0915ee2b67a0e5f20e4ab72d7d6ff37","openssl/crypto/x509v3/v3_pku.c":"38fdbd7c25f247cd67bc2b65a88bed20b806d9de59bf95aace8f3a05b9a56964","openssl/crypto/x509v3/v3_pmaps.c":"7c66d9ec0fc5f7285002ed589d51f75beec9c9d9f9343e1e0f4721d00454ad65","openssl/crypto/x509v3/v3_prn.c":"3e0466448d6e7a8547d57c3266e069cdebe9b227a1766b989490c00f86fcee9c","openssl/crypto/x509v3/v3_purp.c":"803111de281e23a11904942114ba9ada725f1145884e6f87985364e15b2e747d","openssl/crypto/x509v3/v3_skey.c":"4b09cca8fc2a3c8d48aced50af76bae6b8e2363401d5f00a0f349867a1a6a41a","openssl/crypto/x509v3/v3_sxnet.c":"620c9df28740f13dbc5d67f7f659428033fd50879b32d379017e1dd2f14e4d15","openssl/crypto/x509v3/v3_tlsf.c":"93435b658dcb57ce4d9c09de0210d17db26e64cb490a16107c7c6dcdaef35abd","openssl/crypto/x509v3/v3_utl.c":"a7ca5ba0a9812433211fc5b0089f10e8fd2515023a2e11762ee14dcd703f35d9","openssl/crypto/x509v3/v3err.c":"a034feaf8bff0db295a4074ed7c3448e885c0d4234fb458bce9c0df23fd8c548","openssl/crypto/x86_64cpuid.pl":"45435886ac3894284a39a26dd700602e4b5bd7f63d3defa9e9aef908ef7578ff","openssl/crypto/x86cpuid.pl":"2801d3febb337a6632e9cfdf347a55711de3e59df0f5f04fe74414163ac0ed93","openssl/demos/README":"dd75e8bf6efa43f84576fb0ab2e52c17bcc3565feff860ab9262087bd336e874","openssl/demos/bio/Makefile":"117f672c377e6d6a589361119be2e9741836ceee127a84155ca19b27f3e03a23","openssl/demos/bio/README":"9e9fc749bb331abeaa5347529f6bd04d0c91a8a6d932bebfec16b4cc72f1caae","openssl/demos/bio/accept.cnf":"3446ea01ca3623b6438dd067f5a4557566dbbd8d208ae2241eb2a6b6f98098ae","openssl/demos/bio/client-arg.c":"0609805e79b17696f1baf766b77a116a026c7cf1ed954bbe8aaca24a011a30ba","openssl/demos/bio/client-conf.c":"176e114d7d6a1ab0a0eaf34b9bde6cba41f2eeb415a56fcddcc996d45321c332","openssl/demos/bio/cmod.cnf":"bb075cc2f6e2880f67450b2125186a0d40a2519651e12113ac4bc60d87b779ba","openssl/demos/bio/connect.cnf":"6aa9d12d5718ecd640b6d71b22abc332853943e4f4690b6d5ec2f992f90721ad","openssl/demos/bio/descrip.mms":"45d5237b66935b9602ea9ae998c9dd147998a00b21ba017ea3c6f5363ce6f1c4","openssl/demos/bio/intca.pem":"876ac7a17992346c11205a5e55972347eb76486e30bcc218c3a4954545e4e282","openssl/demos/bio/root.pem":"3a33842a19657f72d1a14818cd53d845e578a7bcc3a55c0ff93a911d7d7b82c8","openssl/demos/bio/saccept.c":"e3aa04980d7e3f5aad196b53bb97d467910eef289aeb0936e72287234511511a","openssl/demos/bio/sconnect.c":"3cc1c8044f13fafb93dfb395abaf8f5e6395a2bc5e1dfbe44d1fcdcf23a0e325","openssl/demos/bio/server-arg.c":"f18754bccd974016f621e417d82a7ee548ac0ede019df1278ccf51920143e011","openssl/demos/bio/server-cmod.c":"221f2aa36c686cc007c2a2385700f4684b8d43a4999b48ff918ebbf5734e5470","openssl/demos/bio/server-conf.c":"ebaf1a312465915b9606a6185bb59e5136929c4c220ddb9a4de501d36a198e25","openssl/demos/bio/server-ec.pem":"ceaf699619734a8696d669b0b5534a63a416f9cf0b7da1def7a71b45f5f252e2","openssl/demos/bio/server.pem":"57d7d62587cb493806f09fee4f8da1b0a9ea7b6e77aa43879a5fdcc85ff63a4e","openssl/demos/bio/shared.opt":"2d85fd326a716bfd18bf535d7701ae4d19416d11a460fbcc01f5c0ab344cfe62","openssl/demos/bio/static.opt":"54b4d25d172a692a062d0cf88280bf0a1728779c1227f08b5d920ec28523adf6","openssl/demos/certs/README":"c62177cd495b1692f97f3571844b1b4f873f4d811b75fe17b67bf1daa9897558","openssl/demos/certs/apps/apps.cnf":"d9386d7f5eba2af4830f4f5a4da20ef4de1bff11f4a1f209aeda513a80b52bf0","openssl/demos/certs/apps/ckey.pem":"c261be75344e362cacc629218eadcfbdd96823c869685959a3ba7af79fc3f6b5","openssl/demos/certs/apps/intkey.pem":"cba3a56ebf13674fef79721d16fbd3404b991107884b1aa628a43b6538c00429","openssl/demos/certs/apps/mkacerts.sh":"f21e64c6244d7e66d2caca5911ed9fad024f19088125d00bd9912a32c8db86d1","openssl/demos/certs/apps/mkxcerts.sh":"45dee54df9d305f719a833bdc92a5af92fa70f93f7fa9cdb1996bbfbcf0778b7","openssl/demos/certs/apps/rootkey.pem":"49c67aac894bac4cacf8891fefc5dc99126ecec6948c5c51ed31443c9cf5cf12","openssl/demos/certs/apps/skey.pem":"d0bcbe9a9ff18061856a684670a40e82d5fbd57d3c95f35d886c392ce1bc4929","openssl/demos/certs/apps/skey2.pem":"48f1d94844d0d276e8c41fc9ce9e37485bc5551e939f57ba7a4893d0d8d98971","openssl/demos/certs/ca.cnf":"751796c86aa25148cb62a05a0c95fc68271c9a5429672c72c254cf8cdf852891","openssl/demos/certs/mkcerts.sh":"2e3afbbfa11141e2f6b1db6e64f518196f43e34638399dfbf2205a34ef6b25f8","openssl/demos/certs/ocspquery.sh":"2d04b40e04d895f6ea27fcd08bc71e6e857c9954d22572ec63c2d8ddd2373f10","openssl/demos/certs/ocsprun.sh":"a669f8a3e1c0f1279307b097ec809b25a44a4d4f6de613d5d9d5e9c73ce4f559","openssl/demos/cms/cacert.pem":"a648d3e421b0c2a1bf65414158c8472b24e7684488d8b4bf6ee45de32f3d4cae","openssl/demos/cms/cakey.pem":"c7ed282861c32151a60a9aa62b860d81ed7c906532b6eaa6606b77af241703ed","openssl/demos/cms/cms_comp.c":"ba7c5bb1d344f42619748a54cce24f00f52fb0f203775d02a999b2c22243708c","openssl/demos/cms/cms_ddec.c":"cb52b2389d60413f046cd9c639b1d789dcfb664530db977b6e0c728e7a0638e8","openssl/demos/cms/cms_dec.c":"08454e874c1efedc366dfd023b691133afeffbc8531cd03f5624329c8ef5ce43","openssl/demos/cms/cms_denc.c":"86349746ba3befd25c41c1011ef3a867eff6c49cb4ec88debc1211b14229287d","openssl/demos/cms/cms_enc.c":"ea86580d64b378b5f3ea38c43e1e431b7f04d5fd9ffed63af143ec3c4cb79868","openssl/demos/cms/cms_sign.c":"014cdd3058cf2465dca51d1c8d71daaa44312fb2af0a334ac86571deae13ac37","openssl/demos/cms/cms_sign2.c":"bd6d177ef1a95870f2a2df6c2e062b5c1ddaa616b2bf0c6f1e1c78302bd29f85","openssl/demos/cms/cms_uncomp.c":"fd1da2917b323ccb45c16070ed2a965aa961d6d803a2ad01245fa34cf8b48a2d","openssl/demos/cms/cms_ver.c":"f0032ed4fdb8b6324bf28bfbf567af67e9c4c079b2c79d453adb3cfdc7c9585c","openssl/demos/cms/comp.txt":"baf5807c5d1d1cdfd0d076538509b21358c0ab2e888b51a391258c729c640b06","openssl/demos/cms/encr.txt":"f79fa5e249dbd8fc6be362b77541e48d514a88ddd60825b81f74f8bedbdb2253","openssl/demos/cms/sign.txt":"d0f8790d669a88e0401215fbf2fd36a5307783612a65cec65d9c7110daedb997","openssl/demos/cms/signer.pem":"3a2a367baf036df9f8cae8f6abf59818a6695a513b6c453e86b0c5b2cec5d246","openssl/demos/cms/signer2.pem":"adcb64407c7a6aa0b027b584197d7ca2c6606a12fc638a0c6ba532c54b80d65e","openssl/demos/engines/e_chil.txt":"a7a199c58dfe8868de7a1b0be9ae2b109c48bf11f6ac14a0cf3a2523af2c22c4","openssl/demos/evp/Makefile":"743fbbfaae2829921d9c9f76d37a8ba08f73bb3f6b322388320c480dbaa4f66a","openssl/demos/evp/aesccm.c":"0e98fd498ff2df1e1e94488afe68c925d89e38574a86b2290486e2003f5f8e0c","openssl/demos/evp/aesgcm.c":"525952c5aaf76c5b9d0a261f4a158f009fc67020dd8a6339219e00811237fdf5","openssl/demos/pkcs12/pkread.c":"d52bfacedb3f4fece2b6af661a09f66374b88506341f807f19b524b9c3bbb96b","openssl/demos/pkcs12/pkwrite.c":"bd2b804cb9d6f04b36815f5721120647771c7860109397ccc9fb33ceeb1d3294","openssl/demos/smime/cacert.pem":"a648d3e421b0c2a1bf65414158c8472b24e7684488d8b4bf6ee45de32f3d4cae","openssl/demos/smime/cakey.pem":"c7ed282861c32151a60a9aa62b860d81ed7c906532b6eaa6606b77af241703ed","openssl/demos/smime/encr.txt":"435ed2485336e5e5a35e1c03241ba1d98ab1a10b754395e014244afde90cfad7","openssl/demos/smime/sign.txt":"8a62e6d85601452162cb5c4b6a544d651b5d21e3fb9133b534e43c8088f89021","openssl/demos/smime/signer.pem":"3a2a367baf036df9f8cae8f6abf59818a6695a513b6c453e86b0c5b2cec5d246","openssl/demos/smime/signer2.pem":"adcb64407c7a6aa0b027b584197d7ca2c6606a12fc638a0c6ba532c54b80d65e","openssl/demos/smime/smdec.c":"69507f4c8124bc7cab79f61d347cc63b67ab9edaed3604f9bd0f3295f2ef7a7b","openssl/demos/smime/smenc.c":"da25fab0c1f98194bb150f45f20cb1ca9993bf17289c109def009e3a4930116c","openssl/demos/smime/smsign.c":"1ad9d5bbee5c5452be286d10754a290b78288f0c8041123de66c9c0c858837b0","openssl/demos/smime/smsign2.c":"289a8111a998a45fa59433816a23c8fe06505c4369fd9a4beb1810172f83a80b","openssl/demos/smime/smver.c":"6e09b1f8f636a0178bb82b289e434373e4f2fad02c583544d7db844a0a35a96c","openssl/doc/HOWTO/certificates.txt":"5924021ee2ddb3408212b77a918075b4d53f0fdfe5b6aa0f10aff82e58df6b6d","openssl/doc/HOWTO/keys.txt":"f1243eb87db2b3ed7d311e4eef174b8e08e6350f3c9ad13003f08df9b54be9c3","openssl/doc/README":"06848c1e90ba335bdaf9283725ed7eff467551212fb4ea701006317281f11389","openssl/doc/dir-locals.example.el":"d4d533c35de16586239014d1907eaf3d064b3f8f83e9d64aece6d0b1f730f0b0","openssl/doc/fingerprints.txt":"7556a7425258d98c2a260fa61978a283fe7f6b68ac0dba2a65f8ce617df3a979","openssl/doc/man1/CA.pl.pod":"c9ff465a4fc35b9f96fd7c4969f502fc39b6b7bd10759c054baab95d726d2199","openssl/doc/man1/asn1parse.pod":"37caf9092a1256e45780be842a61ed570b21f7a527eb88ffecd862df9afafe37","openssl/doc/man1/ca.pod":"2277d2fc30b46a44256f7815043d5628bb5de6456b439bfdeb4777526d6bf6dd","openssl/doc/man1/ciphers.pod":"516d7a0512049475c71c170366e7bb5b79e1e5677cb1a8a40236127993d3b161","openssl/doc/man1/cms.pod":"93442231d03d8d702d5052273cb8afe1fd34c054b3eea223a72a0e14e8cccc1d","openssl/doc/man1/crl.pod":"810d4de260c4da6decf285ac39abe3c584d3599c1b7be79ab6d7e14636fded7f","openssl/doc/man1/crl2pkcs7.pod":"b268e620e4c73cfb1ba6344e41426ae361ab3ccad1757fc288c2b0cb867f2f93","openssl/doc/man1/dgst.pod":"c6b4493087df02c21c6ad204aa57e7241764a2f2babeb085d765d9fac91f359b","openssl/doc/man1/dhparam.pod":"6c536d3828fdcebd4314acb692523bbfd81d3a380b09085b6bd624094e39dace","openssl/doc/man1/dsa.pod":"3b9e19de709c8af3b9dbfda71ad9c4470c9296fcfbc7e9eb9b0c41366a2ad659","openssl/doc/man1/dsaparam.pod":"14d6e77d1a8082be208cd3423ac5ea06889559c3f5d952e79a5c4752d27207e6","openssl/doc/man1/ec.pod":"3ca0c2fd9e648ac45c720d201d975f2e836a4e150fe9178fe423b03cc9a18af4","openssl/doc/man1/ecparam.pod":"acdd81bfb533b283a6fcb49c80cbd4ca7540c44496583a3ca20bfd3458d2cdb4","openssl/doc/man1/enc.pod":"44b1492a1d6045430443aad2dccc20e775fefd48052b1a518b8257d79efef18d","openssl/doc/man1/engine.pod":"956f40b58d88348040c05de3b4b717826d2105981a0a150068afd1df9035a25b","openssl/doc/man1/errstr.pod":"f378decd1e49529aee4e3e57cbaf810fc6dfbb735c2a5d1722fcecf6e0103e32","openssl/doc/man1/gendsa.pod":"086bad15f6e6e7b35d890aafa0b96be9fbbeb1cd238cab5daad41a5c65686c71","openssl/doc/man1/genpkey.pod":"19e1b8a4f87b10f6d5c5f0bef195c862b28a1ac56b78e08515dac5d5599be1d0","openssl/doc/man1/genrsa.pod":"d72a1a8009fb4a082bca8ad29382ff9f84198d32aa56b685b7a49ca05ff7c591","openssl/doc/man1/list.pod":"e92acd0bed1ff5d77705667c87e206f0517031273abefead26e6eb1b73d64c84","openssl/doc/man1/nseq.pod":"0d8d6e396a2b821b2473b23ca51b6d72bc321d2a19933b18ee5960fe51508ba7","openssl/doc/man1/ocsp.pod":"aa271208f076f3919559a6e6a6b922404a674c076b654d3a20802c77ff44365d","openssl/doc/man1/openssl.pod":"bdc08295a016259f9980a9dc840d8987b9f556745cf927fe23fc8551e2c6e712","openssl/doc/man1/passwd.pod":"969c61561e8034fd64df63991ff60e7338a9b4301ca88b7241d74ef00a16b0a0","openssl/doc/man1/pkcs12.pod":"d67519deb1f2273bd12d979af01f5121e6ea276109d601b3740662f8d09e6c0c","openssl/doc/man1/pkcs7.pod":"8901f6dd53ef0d83c9f236c2d896d04ba0ae09e19300435f95751c72cf148ea5","openssl/doc/man1/pkcs8.pod":"ac2968265a97d647812d4bf23011cd0c47e8f1a40c9a162d4687c989fc009c79","openssl/doc/man1/pkey.pod":"c7b15453ba2c6a4bb4b0c541d0d96f37f49af7a0df6bcc9ea6d7c32d3a4652ba","openssl/doc/man1/pkeyparam.pod":"2ea25538484191e0dca7112a8aa3b25aca5a12fd1697121aae59a2619acd1d51","openssl/doc/man1/pkeyutl.pod":"5b1993caf2185cb9997a7d2cfca7c091f9502ab6e12524fc4cafb92e1714d5ae","openssl/doc/man1/prime.pod":"f8280e24245f07a77fda976740e0c038a424f9124b32da974e369401b4b688fc","openssl/doc/man1/rand.pod":"a696ce5df831a9d531cd6bb652e86ce7986d3fe4a56976028780435a0ccede41","openssl/doc/man1/rehash.pod":"5ccd3e337ba0d6f440f4bc60729e374788d1f7fa986a50ed0185c53da4821587","openssl/doc/man1/req.pod":"ccbe1b6c26f231434b2eeb6f0db715cbf144fad4d34d32b937dafcdaff6d87c4","openssl/doc/man1/rsa.pod":"d4d3c706a1bf6410da61cb7730517b06b93a831b90392d1a1477008e5eb140a6","openssl/doc/man1/rsautl.pod":"722c01fd7945b7f038c13d250c1faf1a7eac51e4582b9859429523d1d9f3de47","openssl/doc/man1/s_client.pod":"b36ff3cf3cd179b0e59bd3f4af0785e5d185618275fb911ae26de38214ee2f7f","openssl/doc/man1/s_server.pod":"637eb5bab15cbe0e07c77adf25188ada63d0d8472e2d6ec72c0df2e4e24d4592","openssl/doc/man1/s_time.pod":"c8cb6a1e343a06fe20046f07a523ee92273b07b67da6457e30e95a33c44dea68","openssl/doc/man1/sess_id.pod":"4184f0eea825ea06e9fec3744e853566333c25f802f780d8c54e5bf883ab9f59","openssl/doc/man1/smime.pod":"5c61834179ca1f1ee611ce46dc9c4c1bcaba4ee2a7015e896c189d5c5f4882ef","openssl/doc/man1/speed.pod":"6293b599b5c08bee8c5126d5f4a31eb08f67e4bf11b9222d80b466add0b0784e","openssl/doc/man1/spkac.pod":"b4413cee8b653a2d7969fefc55e4ddd32a7b380915b6be37549b7e4e5271ad68","openssl/doc/man1/srp.pod":"99fe0c81640a18655c5ab8e56d41bbd64e45a061e33a394299869e241fb1489f","openssl/doc/man1/storeutl.pod":"c7db7043ffa90a54c660312660d60b2ade5e141902faceb1e6729558b3f4877e","openssl/doc/man1/ts.pod":"e778f20a14dc98b4fb21060353e5d690d6d2b06bfd8f18102dca2cde63582aae","openssl/doc/man1/tsget.pod":"a0e814408835f766ece5811c783687905d86a96c53fefebcc5c943f219d876b1","openssl/doc/man1/verify.pod":"32afc1b00816faa9e382188398022fe34f5530db5473ea1f39d96cbd416df0cc","openssl/doc/man1/version.pod":"9e1979cc0c8dffd2330d99e2387c1954dc9d5985485add35660f157267062078","openssl/doc/man1/x509.pod":"b7b16dbf4530a8c1d14eca1177a7120a2bba47f0b1b2182c02239ed4c14bbc08","openssl/doc/man3/ADMISSIONS.pod":"0e47448d30d675413854b2a6cb4c62054129f142a9ca5a131bbb5994acaf84e5","openssl/doc/man3/ASN1_INTEGER_get_int64.pod":"f45317514145f3f959520236d27e8469234b600587b333261f2cd45b74978962","openssl/doc/man3/ASN1_ITEM_lookup.pod":"52056b94798838216bbdb47c5c735ad6805c01332f20747ba7ad299d930cd0fd","openssl/doc/man3/ASN1_OBJECT_new.pod":"1a16a3048bdd841bce92a48677db293a78419bd487126085024ebcf056a1ce91","openssl/doc/man3/ASN1_STRING_TABLE_add.pod":"eff5457b59194fa1707ae5f544bfa10418c12921899e4c2b6031649f488f06cd","openssl/doc/man3/ASN1_STRING_length.pod":"20e8a297f425a09ab543715fa99f60bc03850aaef70dcf3ed4fa29bd30160786","openssl/doc/man3/ASN1_STRING_new.pod":"8d88d413502add013edee187cd9ad1b57af51cc11782da2e9c865bb4a641e605","openssl/doc/man3/ASN1_STRING_print_ex.pod":"21946f10f99781a2d3301f12acf53d8112925375a2085c01cb475772518b6166","openssl/doc/man3/ASN1_TIME_set.pod":"7f3f81980694d321f45bb45fbcc42c77c05771d316b146c0639ce2fa5c55eebe","openssl/doc/man3/ASN1_TYPE_get.pod":"539214daf11857c02b88ab0f2911c7fb74426934ac47040b807e1f48b0cc8777","openssl/doc/man3/ASN1_generate_nconf.pod":"171bb2a07a7cec062437a0613da7d147e025635a77714992295196eebd777bf1","openssl/doc/man3/ASYNC_WAIT_CTX_new.pod":"fc2f03f854f7ce0ba1365a6cdda6be9517b0f5cf9bff2846e943cace5d63a594","openssl/doc/man3/ASYNC_start_job.pod":"81015f757d1dcc902f70e809f4ef68a08f70f5f9e22d60d3d906bcfa52e6ea4b","openssl/doc/man3/BF_encrypt.pod":"94a8c4d9b6dc278bcc5c34789eeb086ddc0ee4a76d71f48ebf1292ae2a623cad","openssl/doc/man3/BIO_ADDR.pod":"0cfce6be0de80b728e9e997c7787de7f08a606d6ae18e6d6f46a1a8a6eb29c85","openssl/doc/man3/BIO_ADDRINFO.pod":"d0bb976134561aea384f6d6198a9e65383475a06f3694f530f165125db8c68e9","openssl/doc/man3/BIO_connect.pod":"9ba374b343d094bf57210c15cb5a9eafd8fce65d57c0b3d85d3905361e7de984","openssl/doc/man3/BIO_ctrl.pod":"0b614d266841c49be5c6a0da078bc372d5e7aa210d43c66d7aff52a9738a3998","openssl/doc/man3/BIO_f_base64.pod":"a9b826aef3d9c1f18055a604d2da7b1870e074780e5a952d8f11799024aa13a5","openssl/doc/man3/BIO_f_buffer.pod":"4b46af048133c3062b68768b817eb1d134b721b16b1fcd9b21804d6af78f97df","openssl/doc/man3/BIO_f_cipher.pod":"bdf7ff799a66c12659fff0c48904053b4525740341d142eea10799929f0fc3cf","openssl/doc/man3/BIO_f_md.pod":"6fe4c50b0500ef7fb758985b9671c920d9b95cc12af40b4357924935a6b05112","openssl/doc/man3/BIO_f_null.pod":"4c6cd77a55188c983d2a91bd8b64073de37d0e8c662de780de68dd87a34b0ce7","openssl/doc/man3/BIO_f_ssl.pod":"4e5511d1160e169240acf7fbe0d530e2146afebb3815cec64afde8d9424c11d6","openssl/doc/man3/BIO_find_type.pod":"fcf5357f5529ed3df6d3ae454a8cb944a24f98b2c9b088ae0b326b07d6178111","openssl/doc/man3/BIO_get_data.pod":"7d4656acd2494e1229c3f0f7fbc7ca313f69e7e5afd43736acc93ac58f7ebba7","openssl/doc/man3/BIO_get_ex_new_index.pod":"56d5cd2469bae856b77669d4a416ab0b6e42d622128ad5b5c6ae10178ef33284","openssl/doc/man3/BIO_meth_new.pod":"5c7e859c14648fabebf81873de311127424bed0e6db40411e6d7b734f96d16c0","openssl/doc/man3/BIO_new.pod":"4adbd6353586dde668b645a13cb9dc34c615d85d4312c493dc082064dcc075de","openssl/doc/man3/BIO_new_CMS.pod":"768b0de763b920189521a86497c07ebcfd22383a39bd92acc64d37c28c1a5925","openssl/doc/man3/BIO_parse_hostserv.pod":"7ecea4ecfa32d705bf4cb7038896fce0d83d360a6ab8f7e3b8b7159261aa74f4","openssl/doc/man3/BIO_printf.pod":"f5fc563636de300e191cb79d3265e219d540452c94870aef8611fcc905bf2178","openssl/doc/man3/BIO_push.pod":"a6ab8b783a7536cfc3f45208532206d13798e65a36df0a3f9124a9260d4191d4","openssl/doc/man3/BIO_read.pod":"3798d92f798cda03cf261187da338fe9eef3fbd36a2d5b9553632c373a5e8189","openssl/doc/man3/BIO_s_accept.pod":"7c6e3ab07bb088cd8814c8e5727834c667b4aa509b6ee88606338fd210edb6a9","openssl/doc/man3/BIO_s_bio.pod":"1becfc7e3c67bc7721e371628f9cf035ae39d28749acd8b1ba267f61cba12c00","openssl/doc/man3/BIO_s_connect.pod":"79623a97b5e4e33f3fcd1ee8a09e074d386bd54995896fa43b653f6a5a817d33","openssl/doc/man3/BIO_s_fd.pod":"5726d2ef68b96b2d01f2803d563a1a0300ae9aed1c133307eba1e86c804b73db","openssl/doc/man3/BIO_s_file.pod":"56cf9dfd449a4508bb1e6b8787ffa0697a46c92cee1f4ccb64a097849f89f762","openssl/doc/man3/BIO_s_mem.pod":"84f3342b7ea398478a39314dff2d82217357fc913595ec0f7be90ded69fe65c8","openssl/doc/man3/BIO_s_null.pod":"238c7f139d367977908644b92b1e4a674c9e43f9357a1334ae23327859bae9f3","openssl/doc/man3/BIO_s_socket.pod":"3ad6e926a104e7614d431ff830660263dd6b2e63241bd4c67f9f906d687596a5","openssl/doc/man3/BIO_set_callback.pod":"c3d0050e3e10414a89149f1141719190c76c3a2fd755d2fb09d82895b6d58449","openssl/doc/man3/BIO_should_retry.pod":"d4c7f036fb3f7c148e63a1106fff4e1a387cbe0d86689e561bdfe40e37e1520a","openssl/doc/man3/BN_BLINDING_new.pod":"d234055a3d363fbf60bff965a1653ffbbd2c9b77f1a2ea417f8294029b9cfb26","openssl/doc/man3/BN_CTX_new.pod":"60dabfa0a4558ee3896896ab4d0f94e786bf0f9934ac0db8af2cc9a1550760a7","openssl/doc/man3/BN_CTX_start.pod":"e44cc9208720c706eeb5111ac2e6437104694cf8f1448bac264fc65c7171791b","openssl/doc/man3/BN_add.pod":"f317883947698f94bfbf4304075ee5c07c7b3b59994ea791e778b39a7ac20434","openssl/doc/man3/BN_add_word.pod":"05fec916d3aadfd9f7bc8d89b33b76dd8e209b8a85b328eb72bf5e1dbb9f1a89","openssl/doc/man3/BN_bn2bin.pod":"b794b15c0c4e029d3c14bbf0784a92ad7f7ea1bbcb176f7d18114435074e3199","openssl/doc/man3/BN_cmp.pod":"150668b20f5a946e6615de45dc3f6b5d7917abf0ad9b7083fc983d931e621635","openssl/doc/man3/BN_copy.pod":"e38cc0fd535af136f52c2d3e726f03e91a16ab19c6064eb6df44e546597d2238","openssl/doc/man3/BN_generate_prime.pod":"3a864bf07e5369b3c212e42207b872b9aaf8c9cff83d455e5a618f3e4712afec","openssl/doc/man3/BN_mod_inverse.pod":"9e539642132fd30dbc5d3de75c0a8394858987b0185e01c7499265cca175e501","openssl/doc/man3/BN_mod_mul_montgomery.pod":"667bd4c69fc3b235370e48434874df19f5e095202bc42cfc7a6f1f13e4c286bb","openssl/doc/man3/BN_mod_mul_reciprocal.pod":"f05e308970e1a3a818f7235184853460e615d97467a386c070c3d7739369af17","openssl/doc/man3/BN_new.pod":"b1f6ab481d2bcbb0f3dcf87e3d7c477b77cbad453daa16e43222e862d269c7dd","openssl/doc/man3/BN_num_bytes.pod":"f3505483afb503cd27891c8bce713124863ba8ce764406ffbf26c661729f18bf","openssl/doc/man3/BN_rand.pod":"bc4a2b96f1d5394e2a04ba4154463c4a70a2dbb36ea1d84fcf62bdc117574e04","openssl/doc/man3/BN_security_bits.pod":"bf0d1d1fc14efff28f970e916fef140d6f01c24426e11724c413bc1171e5107f","openssl/doc/man3/BN_set_bit.pod":"6e3cdc6952d4937303f874fb6c32e5dd91e390917ea144d906e507220c24b679","openssl/doc/man3/BN_swap.pod":"5ec80972fbdfbfffccef9e4fe3e69b7e9a3444674d58ebd5d5d8ff68a64b1be3","openssl/doc/man3/BN_zero.pod":"de18d59b5794437a2a10fb68f5154719f841442d8d4250489e13598b9c4bd755","openssl/doc/man3/BUF_MEM_new.pod":"317e636b930c1ef0db349b5e1851f2429148a113e2c7919df89e15596587a558","openssl/doc/man3/CMS_add0_cert.pod":"29712e051a0755523458cccb9c7437faf2ff24114efa31417342978dcb008cea","openssl/doc/man3/CMS_add1_recipient_cert.pod":"2e378848b5e155b1c5a5c3e4a734b26cc3f080d2bb044b972f1dd1782a4af14f","openssl/doc/man3/CMS_add1_signer.pod":"963b52dff6097d7393d39a90e7d7ee567b9bd4b36df476721d290098ae87f5f4","openssl/doc/man3/CMS_compress.pod":"7fc48fa2318babdb85461e800b34e8d53bd6a2da9bedf3c4264f42e61ba9da60","openssl/doc/man3/CMS_decrypt.pod":"2fb641f3d335d85fa96788cc1d1efbfe0803c84621c45b127e633d201e74c919","openssl/doc/man3/CMS_encrypt.pod":"4e34cd4df8943d2d278a57904ba99aad50afafc759868cd2ae8a453b8776f6ee","openssl/doc/man3/CMS_final.pod":"9a5c5001a1a2b8404221f1639bc5576e13ad4d7d411c085fd746d82f77b1faf0","openssl/doc/man3/CMS_get0_RecipientInfos.pod":"d06fbe3fd9f2bdbc4243dc50f7d2efd8228d103ee430f0202832e26edfd491d0","openssl/doc/man3/CMS_get0_SignerInfos.pod":"1282cf2e6dc3d9a6dbfba9b3994015f8029af065d8a03c223ec5b2615da5b057","openssl/doc/man3/CMS_get0_type.pod":"544f392b7432a3ad812e6b5d2afc9d5f5aec4144a91bfcc891cc9d5721cea045","openssl/doc/man3/CMS_get1_ReceiptRequest.pod":"304864e369450ebb03c764f36138ee07c9820e9f672d2780a47d969e68a86174","openssl/doc/man3/CMS_sign.pod":"d3494ff58523487f0e7ad2e24c71c467f34fa46bea6e7870402a7d4a089ca874","openssl/doc/man3/CMS_sign_receipt.pod":"789743ff3440f5e6793b8b7558d31a2d1e2a1b79822cf09380cf907879ed2d04","openssl/doc/man3/CMS_uncompress.pod":"3eedc42c074cb37c9c1e8c16ede2bcc57863ff8a8e488875b6a66f4e039c1e7d","openssl/doc/man3/CMS_verify.pod":"dbb6224770e5c1a24b4089e9cb1438d5fde1b4ccbe88d1dea4486d0817e0f59c","openssl/doc/man3/CMS_verify_receipt.pod":"4e74724f074c9254a05b153eee469a9cdf6b322496ec7b18c19bccee0a3ddf0f","openssl/doc/man3/CONF_modules_free.pod":"42f3d8211c7022ae823c0fa05173c1cb2038658ab392d9fd7124dcf5f590733b","openssl/doc/man3/CONF_modules_load_file.pod":"4c8fb2a920962f2aa1663122cb43f1520450d7d753e36db39a2fe38da3510657","openssl/doc/man3/CRYPTO_THREAD_run_once.pod":"797a3d74e255f8fd5ce0adb56fef357ec963e4805b2345cd56e31a4531c47e0f","openssl/doc/man3/CRYPTO_get_ex_new_index.pod":"9d63dfe936be09bc546ec4e65d35b0e9e056e44d22faf6bfdd33bc75f137c5a2","openssl/doc/man3/CRYPTO_memcmp.pod":"dadad3db32833f23b6239a22af22794f36ae60d5979356ab85934ad5bd0b8425","openssl/doc/man3/CTLOG_STORE_get0_log_by_id.pod":"d5dff2f8e4b974ddeab059b82c596931012e1fbeccbe4c548614017eec487f02","openssl/doc/man3/CTLOG_STORE_new.pod":"28559ea6b4616b147133d494a9395285db773f1374290c834b1bf478761d4682","openssl/doc/man3/CTLOG_new.pod":"d59c7b823ae4028a38c44eb7b871f74654742358b822ff4a5d7b46f59e67f12f","openssl/doc/man3/CT_POLICY_EVAL_CTX_new.pod":"25d166c38e5a308675853a9efc68f8e61778f4beef0910db98fa8e309d261f6a","openssl/doc/man3/DEFINE_STACK_OF.pod":"2264e47f3df47fc20d335fee6452410cb147064f315d8f9b0547aa5d9500f198","openssl/doc/man3/DES_random_key.pod":"7f989d0d1f18f8891f6a43f29351370159b16bb4624c8c3510328aab8b95266d","openssl/doc/man3/DH_generate_key.pod":"235a5260ee379912961e9796803b676d82a125199a757102fcbbe8bd20602bac","openssl/doc/man3/DH_generate_parameters.pod":"a81b0968f27e40faec8551fa288d5dd618ee21dfb65faf97c579da66b0ebaa8f","openssl/doc/man3/DH_get0_pqg.pod":"a021c04f8cf4c655616a65dd7f34728565fa51b66f1db1c4edfcc553e938e5b1","openssl/doc/man3/DH_get_1024_160.pod":"64124df4465d5d3eef28429b46699f657d574200d50446d9805d574f83a86811","openssl/doc/man3/DH_meth_new.pod":"eec607ed0e3516870ed3a441bf9711cf5cdb6fd1fd5afa9c054ff39f35a03044","openssl/doc/man3/DH_new.pod":"26ea8071e356b98e512cff1e3a7409bd1089b2018638ac57c9f18899ed85b92d","openssl/doc/man3/DH_new_by_nid.pod":"47ce456b14a300c0fa4ef41b7c7d3a70f3a4738d129586d4dc63227f0a2a77fc","openssl/doc/man3/DH_set_method.pod":"7947122b8228ea23a388f0e1bf99a8f5a9ea1feecb71d7da54f42e92d653c05b","openssl/doc/man3/DH_size.pod":"95434d66fd4e4f680384c2b9b10dbcdb10f5bd8f1c5ba6ee7bfe8d1c66686429","openssl/doc/man3/DSA_SIG_new.pod":"607f8aa941508739d1aba4154f6b5e3232a9cd71eb626e58839819996f728fb0","openssl/doc/man3/DSA_do_sign.pod":"e5071a56133f1da4aec76b8548885f9133433fc9c37a24de6ce0197efeeb5b69","openssl/doc/man3/DSA_dup_DH.pod":"6f81979049c4fa72dbe3bec84ff8e5fe72180da021e88cb4e76e132a8f3ada23","openssl/doc/man3/DSA_generate_key.pod":"9246c4a9351f072ec084b6c36bfda48b41dc6d5bd3dfd46c9a4c76b7775161b1","openssl/doc/man3/DSA_generate_parameters.pod":"e7f7686f7ae2c04411625e7eee092429a0a79a1c641269d292d4f4657e697aab","openssl/doc/man3/DSA_get0_pqg.pod":"a2d2e564ea441cd476fb27183c7a933b533002d1dd6018f0974be7cab08962d3","openssl/doc/man3/DSA_meth_new.pod":"bae93a4a147aff44202d1cbc65f07d83f7623400f1010ac68c7aa82583e057a6","openssl/doc/man3/DSA_new.pod":"c3afb59163fbee4bd561cd252753f762cda3245c99f72b9bc16f287efa3009d6","openssl/doc/man3/DSA_set_method.pod":"4adda74b7c4add094ae47b4bfa262ffa3ac5d98cc924a8093d98832cc50ed949","openssl/doc/man3/DSA_sign.pod":"f0da4d4d0cb32e83d57f0a75dec6a18e89a9d6ed0ec8763e5f95bfd95dcca869","openssl/doc/man3/DSA_size.pod":"ead3b991b833a03cb5025a8c62a579d429fd46c238f029116ed63f712d15850b","openssl/doc/man3/DTLS_get_data_mtu.pod":"dcc951c6a80f647362b6f57ad3d5d1b394d71f5d2d1f0713a564959a55a352a5","openssl/doc/man3/DTLS_set_timer_cb.pod":"6961cb7724044d54c1f545176fbc3a73d5f1c22f02448aed592dba5de7618be4","openssl/doc/man3/DTLSv1_listen.pod":"5d91cbd45490fc5713b5201b6b81e3a59a36edb81ae82580e3f2b04ccd06954e","openssl/doc/man3/ECDSA_SIG_new.pod":"a4db3f3662b197438490faa382a13223170750b85db8be9b9a6a86a63a1444dc","openssl/doc/man3/ECPKParameters_print.pod":"6a319d10c2d10a69a99bcc53adb912023639882d79b7ba6f63f4b06808e49c21","openssl/doc/man3/EC_GFp_simple_method.pod":"468f55c16a4c3ebcc4980e118e365ce5e669551844374b9886a1432069a87412","openssl/doc/man3/EC_GROUP_copy.pod":"7e7a51864e469862da38fc83ec794bfe51a80689a34a20feb2409854b737dacb","openssl/doc/man3/EC_GROUP_new.pod":"201d6eace6aed85bd124ac2c2482163936960872d6b6b06f1ae1501ebad8b7ec","openssl/doc/man3/EC_KEY_get_enc_flags.pod":"68b5b562fd8b3d307efc8f2e8d03abc46921f68357fccd98bb4889bc791825e0","openssl/doc/man3/EC_KEY_new.pod":"da19640a90108255a9a4f476229c3d3b6b42276c1fed3b31f3792fa6e5f6b17d","openssl/doc/man3/EC_POINT_add.pod":"62a1ed0d32b4db17808e8f4f87b3f7881e20622fcc01049b336723e50f5d74ac","openssl/doc/man3/EC_POINT_new.pod":"27a1d9ffcdf3ee7daa69aefc50faa34143224cfec09fbff6202a5765db38bf01","openssl/doc/man3/ENGINE_add.pod":"bc62aad8f3da274e1957b4b7823663f90d3094a4b8a1b67406a08ab69f864d69","openssl/doc/man3/ERR_GET_LIB.pod":"6ee80946e3c3f2c4f50f4a8e73a55e16738923dab0f9cccbcad13aa415d20756","openssl/doc/man3/ERR_clear_error.pod":"a788808dddeb9993eef2963b9fdc00da9fdd77e6b9f841b95c0b9c4e5ad8e4a8","openssl/doc/man3/ERR_error_string.pod":"b8580a4083e3df8b4e77ba89728e765d52140b6020b71165e35e44437010153a","openssl/doc/man3/ERR_get_error.pod":"d0c803ed299e58019dcacdfcee791464965fb01456fd3ac11cf2e3a195cb75c7","openssl/doc/man3/ERR_load_crypto_strings.pod":"6424ee5f48c7af1621cf49231bda12591b6baa40da263d412d9bb3106ff2053c","openssl/doc/man3/ERR_load_strings.pod":"dfa48d3fcff497e978042f107dfb926b76aab7acd7bd0f496eada4f8e067c382","openssl/doc/man3/ERR_print_errors.pod":"34c86302401fc249cc967e429e6cc754445d4973ba733b7c44c7bb77e9ac72a6","openssl/doc/man3/ERR_put_error.pod":"d3e07bd8beb65dc939c3feb1c6d19616c3f909b63e0157cbef691c22217e4b17","openssl/doc/man3/ERR_remove_state.pod":"8fd62a9dc14e5d7ddba087450b2ec3d15724399dd64ed32c3d1852c35461301f","openssl/doc/man3/ERR_set_mark.pod":"d8ec32e78ff45187e3a23d56e2659d0db40178f0d7af192f4817efc9573e394d","openssl/doc/man3/EVP_BytesToKey.pod":"d6546465d79d7ae7070f6364c55cb88d751e7430ae9eb2e24858f68459e733d6","openssl/doc/man3/EVP_CIPHER_CTX_get_cipher_data.pod":"72cced6510bbe15bb5f197ea1ff98a36c79e46212a296d8db5daf42d454bc420","openssl/doc/man3/EVP_CIPHER_meth_new.pod":"670bdd4d76065209b7014ffd3f63dc9ca3443fc9328eaee70662e370cb9b0f98","openssl/doc/man3/EVP_DigestInit.pod":"777ff51cfa9174b4c17c8cf60559ba5d170e24fb9a86ac842fc8e78576a40fe0","openssl/doc/man3/EVP_DigestSignInit.pod":"4938d5bda105167f47de5c1fd3d1c66deaf0230754512c8496c100e2b8324b8a","openssl/doc/man3/EVP_DigestVerifyInit.pod":"a0535d3012855d5ca2ba45bc7f62234f2c031c12d02cf90af9f6a8d9cad3e688","openssl/doc/man3/EVP_EncodeInit.pod":"71e10220a926a97cc6dd5766d01207a074a203338bb961f7da64192f493b926f","openssl/doc/man3/EVP_EncryptInit.pod":"7204e2f910b2067dbc517ae3cf53c9591658767c7180047d492c1b3cc4976e31","openssl/doc/man3/EVP_MD_meth_new.pod":"7fb5fdea0aa29c4e348dd42a8544d8c4ee54676b14efed888b73e5a4d6369e7a","openssl/doc/man3/EVP_OpenInit.pod":"109d61803c1785b17c4e2592c804244a8aa9fbb57ddd52ce07009f67993a17fa","openssl/doc/man3/EVP_PKEY_ASN1_METHOD.pod":"5b4d6c9c5ba2924d0aa34d2e1e929936fe9a36373496960726adc0179602ab15","openssl/doc/man3/EVP_PKEY_CTX_ctrl.pod":"e9c09ebb53b26780418617763e45c2d4a036f25087b95fc72b04df06f538005d","openssl/doc/man3/EVP_PKEY_CTX_new.pod":"33f4660ed2843869bb2a5a3100a3103d980c9f89ded89cae7b2039b5373a9e2e","openssl/doc/man3/EVP_PKEY_CTX_set1_pbe_pass.pod":"d13281607e846b72e51a9999e7e5269ef8f72b006fe1df385cb74a50a99861ce","openssl/doc/man3/EVP_PKEY_CTX_set_hkdf_md.pod":"a02969e04b738e3867bc976d30726f42083a192a0bb03751527a9187734d3dca","openssl/doc/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod":"37f8bc105e30cb0e08dec4080dddc51ac681b678807731252a75e7fee6f46f85","openssl/doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod":"9b8b0a726f5805ca8b05b4ae0999b4a5856a3e109ef5d956da466f32ed039192","openssl/doc/man3/EVP_PKEY_CTX_set_tls1_prf_md.pod":"ca849639096c80ca2a71781a72e5cfca8302d037912f4905c213ab748afe95cb","openssl/doc/man3/EVP_PKEY_asn1_get_count.pod":"8e4fdf6685bc4bb39944dced1b4a48d88bb129aeaa5da9ff93b420978805a86c","openssl/doc/man3/EVP_PKEY_cmp.pod":"ee34265cd2b481820820cdf4b0d48f78ec8d805c754e2c882a02024683fea898","openssl/doc/man3/EVP_PKEY_decrypt.pod":"7cc2126855283018c7f213c1a02f7d2f31cd3c989f08f181cbe6dda784063c6c","openssl/doc/man3/EVP_PKEY_derive.pod":"b2cc409128eff8d8846677b931b1c6089e70103aba8c41449356e0799428a848","openssl/doc/man3/EVP_PKEY_encrypt.pod":"7966b6453b2146b91feffe453f385001eeecee78d3144a41cd9104b3c48ccfb3","openssl/doc/man3/EVP_PKEY_get_default_digest_nid.pod":"8007c64183f80dbbbe2914832ca33b79de0c6d3b8452ccdc5c853d1115bc75ec","openssl/doc/man3/EVP_PKEY_keygen.pod":"e31f91a808aa9c1894da2adb4fbc21e80a891c8e33c438da3cb15687bfb0e448","openssl/doc/man3/EVP_PKEY_meth_get_count.pod":"9636411e438dd91940c29da59bc102852e1623226bbe96f2a88959650b6a8295","openssl/doc/man3/EVP_PKEY_meth_new.pod":"da2a63792e8669d354dd6aed5ff0896677d51c3aeb0d2a710394f894e57cd145","openssl/doc/man3/EVP_PKEY_new.pod":"dba614cf8efe02b58d2a854d77d443ea3f11835b65a92a3e4a4314cb358f4306","openssl/doc/man3/EVP_PKEY_print_private.pod":"a2ef795f5dded00e0e4fa12d99d3cc1258e06f897f7c3c0295f23e18db553b40","openssl/doc/man3/EVP_PKEY_set1_RSA.pod":"0c8941fa8e5caa3aea611e56a14aa406ccd50292a1d357343621baf7385f0dce","openssl/doc/man3/EVP_PKEY_sign.pod":"ec1275468506aeefcb92b9c5921c041c011bb47297b1ed4f0b0ddda4a75aaa43","openssl/doc/man3/EVP_PKEY_size.pod":"2058f9c6a888f90376896b81f2b8eebcf1285f25dd6c1c69105d69766c033f07","openssl/doc/man3/EVP_PKEY_verify.pod":"041224bf1b8f7a6ce50bbfc101fb4f754ce77956da1a24b5b78436d1e3c9af2d","openssl/doc/man3/EVP_PKEY_verify_recover.pod":"9ab8f2248459cf32040b59c24abe9210d2119d0092ae1bb61059e374618e796b","openssl/doc/man3/EVP_SealInit.pod":"2c0189305828b2ad23c3e725dd1d9859cc291625fc30f65641fa5236bd758c33","openssl/doc/man3/EVP_SignInit.pod":"f403a331b370723d754cdb0be00859307113f82a91d42f8235c48c2b2d7816e4","openssl/doc/man3/EVP_VerifyInit.pod":"c1c831bba68ea606fc2b78bcb4a5f04a04c177661019a3e2af68466a7e069976","openssl/doc/man3/EVP_aes.pod":"98ba2680248a394df2748ffbffe5c1fc521a2c1b8916ffc03ee5457ce58edc05","openssl/doc/man3/EVP_aria.pod":"4711e2bdc8e258e626f59be8787e8af9c32b5dc7fc52a48663eb19c4026eeda8","openssl/doc/man3/EVP_bf_cbc.pod":"16fc065c3b43dea4e0ba1c90e6c820d0dd8213389022fda742c89c9b81974518","openssl/doc/man3/EVP_blake2b512.pod":"ce80eda0dac29f0a70260822648bb65f9d41d754a337f7e1dde7044194704e88","openssl/doc/man3/EVP_camellia.pod":"3e758556d49e3e4287ea87e53b98e267cb5eb427e486c9bd0d840610088ee961","openssl/doc/man3/EVP_cast5_cbc.pod":"fe07c76b5030261a3f360098e17cdcb870dc45c4a7192b30a16adbdeae248ff1","openssl/doc/man3/EVP_chacha20.pod":"8b1c51f6ada9bbc2bb4ef6f21def9a04bce1985bf5ce5df53e334f9105d10276","openssl/doc/man3/EVP_des.pod":"1a7eb48fec0e81c132ca35e0311aed364d21518dba956559a3b154b089ecd324","openssl/doc/man3/EVP_desx_cbc.pod":"2169a824f23f859e1f60a410a2c981958b291a2b512701b2806c2eb272c51763","openssl/doc/man3/EVP_idea_cbc.pod":"17ef6e19964a0aae4bf206f858d67e2d88ca1ffaebdea712fd1e83fdc697e577","openssl/doc/man3/EVP_md2.pod":"bb9131a736dbb0c49e8689c27ccb3b5c2f8ee317e2f87f7364d0be8874edbfca","openssl/doc/man3/EVP_md4.pod":"29475e538f4d8e8b437209f182682bea9a828f23ec686bf56bbde2c6d3bbf14e","openssl/doc/man3/EVP_md5.pod":"9e07eb7d806d6f0863eaea694d6b8c43de4b23eb76807b8fe7a47cbda2039375","openssl/doc/man3/EVP_mdc2.pod":"e21a8c709077cb86fb5651c221a10f79ab0f6db5633de2f3f32a85c13f252e78","openssl/doc/man3/EVP_rc2_cbc.pod":"b2bae952b3885653d15e0245488f8499a97c8e961bc33bc0d5d97eea5c914acd","openssl/doc/man3/EVP_rc4.pod":"523c9b62ff12f932232e225d4043f303ee22f6feab266582e77db4e548397cd8","openssl/doc/man3/EVP_rc5_32_12_16_cbc.pod":"e300f8941d3e6692a3b7eac1fbf34ae9d1e3e8b4a40f45b08c253ff0945ab9fa","openssl/doc/man3/EVP_ripemd160.pod":"4a7a55483a4a12ddcb76662325a4ea15af981c3a9c2cf0dda2755271487efe8b","openssl/doc/man3/EVP_seed_cbc.pod":"cd7d186acde78bde571b6688b9ceab6e21f48a3cf267177a66196fe41240ddb8","openssl/doc/man3/EVP_sha1.pod":"4a99e8c41316006f3454f9d08958fa5fb2586a7ab0ff7b512b198053c98bc764","openssl/doc/man3/EVP_sha224.pod":"c8807d17df0f691a71a0cc1d443b112a582d61dbf5f0b8c0c29225c1f0b74bbd","openssl/doc/man3/EVP_sha3_224.pod":"a301b85ef186554665cfd3ad06d78f2e88da5fe6c17bdc89eaee5a810571f373","openssl/doc/man3/EVP_sm3.pod":"d6ec07d83d0d76d3c30cae2f0ae9e9110e034b1572b9306d39ddc3c4e796f2e4","openssl/doc/man3/EVP_sm4_cbc.pod":"15ffea2c2002cd2787945dfee5fd9b27d217d19c6308f08f4cb631904c163027","openssl/doc/man3/EVP_whirlpool.pod":"f226d7bacf85f39017c84de58e3365e80e4adcf6ad72acd6a5bb10b06ab25665","openssl/doc/man3/HMAC.pod":"c82340e03cec6510179abebea23b26ca884ae150c7852a881c2f266f72c66036","openssl/doc/man3/MD5.pod":"39e49ea8b629f3bc74059cc3e690cda807bb9280ced796174a59fc5c3a7e3c9d","openssl/doc/man3/MDC2_Init.pod":"7486153080fab599338d10a847391f0991953418f011c05e3b68a3c49c228183","openssl/doc/man3/OBJ_nid2obj.pod":"f540f2c98e54c588fd7c0e3c4f2de98dcdf93f0aa82c31265b70f5f333ce98eb","openssl/doc/man3/OCSP_REQUEST_new.pod":"741beb80de05b151220bcc435054ecfef24511905e1db48243c0931fb8bee14e","openssl/doc/man3/OCSP_cert_to_id.pod":"ef4df2aaaa50749484720add4dfd62c898d274b420d5e5f8400b16621dfe928c","openssl/doc/man3/OCSP_request_add1_nonce.pod":"75a6f7ba5905afe3eb9f585eb0b10deb39b2d0c2d8f8d806cc78add8c3b8c001","openssl/doc/man3/OCSP_resp_find_status.pod":"24263deae0e9868da649489372c23aed8bd2f83fa591802fbc5cb8ceedaad9b4","openssl/doc/man3/OCSP_response_status.pod":"dcc2e6a0038c739ac8b1ebbea4e08f72fc15e728963ef1442556a3661aa3035c","openssl/doc/man3/OCSP_sendreq_new.pod":"ca9a81e51a37ae00134f476f922f62be74847d9a9fb562602a8a073e333e122d","openssl/doc/man3/OPENSSL_Applink.pod":"a0db63d4885f4e0f0de231ca73718e6a685129dfe51a003cbed8baf372a3a06d","openssl/doc/man3/OPENSSL_LH_COMPFUNC.pod":"230bd99ae26ad48907db207950005f0b3b75fc906c7e442f5c84db5d518879d3","openssl/doc/man3/OPENSSL_LH_stats.pod":"3ed8b9be73fde6823b5763b0f11aef4993a78ff4a48764d4811662db65ed4cb7","openssl/doc/man3/OPENSSL_VERSION_NUMBER.pod":"5a03bd0f8bc83dbfeec72c59c4b81ab7f1d8a82180c4b31b4bcaf6968da00baa","openssl/doc/man3/OPENSSL_config.pod":"f26fddf66589d2ecdd405c2d7a94d0f63e23996ca2dd8a3cdd1a3c97b9b695c5","openssl/doc/man3/OPENSSL_fork_prepare.pod":"e41b80f3cd0bfdaa05706dcd32403c164300fffea6ecc9204a4ce5262999b847","openssl/doc/man3/OPENSSL_ia32cap.pod":"54fc46befd3c081a2a48bf97c87f7914d4e4e226948497111d84b385d5c9ff3a","openssl/doc/man3/OPENSSL_init_crypto.pod":"20a6925f66a4797d1ba1f6eef2ef70ef9ae140b9faf15b2ef8750d899f9e02c7","openssl/doc/man3/OPENSSL_init_ssl.pod":"e658828fa3b9d467a02c771411a581d9a281f39ddf6231ca5c609a21acd53104","openssl/doc/man3/OPENSSL_instrument_bus.pod":"dcf311426ca6b4e4ea3502d34c72aa0e897f792389232ab06fcaf3d7833623c4","openssl/doc/man3/OPENSSL_load_builtin_modules.pod":"2d874f7b5f90d6515f2af29dd6ab3a4b1b57b4a66517a1ac606285853257f9e5","openssl/doc/man3/OPENSSL_malloc.pod":"0bc14b05c59ab4931b962ed97e4d9cecca050bae06f21199fcc48808ed3924bb","openssl/doc/man3/OPENSSL_secure_malloc.pod":"da7db09b14e8c5aa70f0870393d145bc73d24667aef3b2f56af9dacef0ad72da","openssl/doc/man3/OSSL_STORE_INFO.pod":"848862de44d58e3641fe9699967667d5375f6eb2486edd21753aa5055a3ee9e3","openssl/doc/man3/OSSL_STORE_LOADER.pod":"c939ed2132cf112f722635934734334e7c641350ff676df4574db69eb2c59aa0","openssl/doc/man3/OSSL_STORE_SEARCH.pod":"74f7cc9d63823af599c0efa126a21e6d42842efecf45e4b093e3485c1a97d07d","openssl/doc/man3/OSSL_STORE_expect.pod":"c4cef70674633017f3b9735b9e4a4eed07ed4eaead847337ef8c0d94d65472c8","openssl/doc/man3/OSSL_STORE_open.pod":"1d2a045839b904c32c2cc588f612996de9fd341d8ba464e57d3bf8c5af07a6cd","openssl/doc/man3/OpenSSL_add_all_algorithms.pod":"49b86f88fcd2bf4182c98477fbcc93ba08523d6994b922ccf77ed8ab8fec40bb","openssl/doc/man3/PEM_bytes_read_bio.pod":"48ea0c0bc7e4cd4b0a8a936f90cec50f11337f4a60f7c80ffc4fcfa33a60b877","openssl/doc/man3/PEM_read.pod":"1bdb0e48e0faf6e41f6f8b0507bac01d27f6c8016bab38c2e7958f08e980b78e","openssl/doc/man3/PEM_read_CMS.pod":"ecd9bf55b556a4e35878b646432263cd8838b4f8db1301bd3fde77980c1242f3","openssl/doc/man3/PEM_read_bio_PrivateKey.pod":"b8c09381346c4d8baddc9b29bd071d8491ddd019e260ccff8a0f6f152bf61fb9","openssl/doc/man3/PEM_read_bio_ex.pod":"71c78d14f7d2a91ba384a46ff374db7474309d59cba5fe985526b5e3039a1fa8","openssl/doc/man3/PEM_write_bio_CMS_stream.pod":"26fcf66cf1d2efc12499ea44ec99359b742989d3f7bc303128bcde7e4936c9da","openssl/doc/man3/PEM_write_bio_PKCS7_stream.pod":"0fad1e10061979328ef38dfcce7acd18c1e13a233c899887bb71e8a0474f875d","openssl/doc/man3/PKCS12_create.pod":"81b7f6be4c979f75c29f5af3e26de09a2325c83bedf979d3d0ab2fa1370ee1b8","openssl/doc/man3/PKCS12_newpass.pod":"4152f50460501aa543dea8904a41ac6bd057f14a5616246dedc036c5fc1b9898","openssl/doc/man3/PKCS12_parse.pod":"d922a981c27e69635072126e8a7e92a40eb0cde7382755d19348bdb6b0e32573","openssl/doc/man3/PKCS5_PBKDF2_HMAC.pod":"3877fec0e7d6f9ac05b0a9cede809f7e863e9bf24a595ad1c21c67e07f267d83","openssl/doc/man3/PKCS7_decrypt.pod":"222f4ddc4b049f8fe7fd9985f792ad456e4b562f16218e72deb45d20ca589654","openssl/doc/man3/PKCS7_encrypt.pod":"20c877ef00fdc262dbaabb7515246fe0594954fef9b0e5507c39765f4002a2b0","openssl/doc/man3/PKCS7_sign.pod":"572c1fef570d56b12cf5a5dd37a945002f4ee405c9ad26bf0e15f598be188a6c","openssl/doc/man3/PKCS7_sign_add_signer.pod":"56a91263508e8819c0a5f6b165ac98316ec4c8aade010f5a0862238dff48245b","openssl/doc/man3/PKCS7_verify.pod":"ae1fbcffa9b806f09e01a8657d5ed72f5ef246fb60702537e429b42fa9747e3f","openssl/doc/man3/RAND_DRBG_generate.pod":"17d2a008a9890ba1cb494900c248e5da1e886a11af3a7163ebdb67d28505cc6b","openssl/doc/man3/RAND_DRBG_get0_master.pod":"b17158470b2a4bcdc111a95b99fc86a33ee35c6b6e1a7cabda2c0166228c4673","openssl/doc/man3/RAND_DRBG_new.pod":"329b6237144c2731bae481891961d488cd5411186f9bb1f34eaf8486478d2e37","openssl/doc/man3/RAND_DRBG_reseed.pod":"26a8967c199d4f6c2290bb8523dae044242234462481b932bf7f53de7e881c56","openssl/doc/man3/RAND_DRBG_set_callbacks.pod":"cdafd1922ac7c7bf0ea6c9f7fef9133a693319f9687b1956daaa476199c9e532","openssl/doc/man3/RAND_DRBG_set_ex_data.pod":"b07169d49e6ac993e13b3f885c69895fca7d76946df5c0239ddeed77ddfdabc2","openssl/doc/man3/RAND_add.pod":"335e0955afe9ea0dd7875d1d20acd41b7c064752ce8664b094d2baf71c928b22","openssl/doc/man3/RAND_bytes.pod":"ca93ca9f1f3291a7a052d611283f52d677edd34cadb94b98d29f84a2d0ab3f20","openssl/doc/man3/RAND_cleanup.pod":"a97d7e4d8284c9f14d18ff52daf7a3334562dcc37e9be32667cb14e12a6b3051","openssl/doc/man3/RAND_egd.pod":"2bfc028cb0577b89c295b3f9822bfe0344bcd1298d7ba6a37076517c33cb3f86","openssl/doc/man3/RAND_load_file.pod":"f4dd213002d26ae4c1b11e18b89eb992e0442d7ea9312d8e2d5d2a19ce74f317","openssl/doc/man3/RAND_set_rand_method.pod":"7c3ebec8ad5acc03b274da7215e272889f7696800d9dd5345bf1b18bb72fce6b","openssl/doc/man3/RC4_set_key.pod":"3934e2567aada5692824f9466929d3b0fff3a6eab49c722318629a670c1fecc5","openssl/doc/man3/RIPEMD160_Init.pod":"ea958a1b7a02f92bf69ee70262d92d499eb4fe09132491eaaa5ec47721cd2fee","openssl/doc/man3/RSA_blinding_on.pod":"f5178d4d103f9c4afa69f4236707e3b43ed25a650628816a64938286577b825c","openssl/doc/man3/RSA_check_key.pod":"c07fbab30e1f043c7cc09319a75dce5b7b9856ea8192191f1b88b416c6f18d8e","openssl/doc/man3/RSA_generate_key.pod":"ffa62bfc47c407ae8f531da4ebffd3ddb19e14502267f9edc55105966f130840","openssl/doc/man3/RSA_get0_key.pod":"58cce39081cf2e6756a8bba145e96c23724a3306357bffe7d1960039abb6ee90","openssl/doc/man3/RSA_meth_new.pod":"c9ac9009502b8ca0540637f10ffeec689ea5b4ceb5c8ce9bfb48e783f2ffa54e","openssl/doc/man3/RSA_new.pod":"bf80bb587fae400c903cb970c1f3a7497c7b213dce4fbb94ec4faa03467e0dd1","openssl/doc/man3/RSA_padding_add_PKCS1_type_1.pod":"1a9efdca67fb7b933f9728128db08ecc84b83dc4886a6b8cc18dc7078574f838","openssl/doc/man3/RSA_print.pod":"4169f2d929a5348c3ae8db491277f232ef3a877d7bc9b400b3df13a707537b29","openssl/doc/man3/RSA_private_encrypt.pod":"38d57c8998a171586d098f0cdb3ed9eb9baf489b1b5564501a8a092418f5b8d0","openssl/doc/man3/RSA_public_encrypt.pod":"3ff5cdd751df2b5555f220927828481e57d310e5b875f6cce1ec2670a4d3debd","openssl/doc/man3/RSA_set_method.pod":"d7a55487bbe6dd5eeea29adf3ae3c05dc62d4bb5d774c45b2c85a8f53a95fd3c","openssl/doc/man3/RSA_sign.pod":"8f59b240737d04aad9aa8cb35a1bc02f88824259f607a2345c74a8185fabafba","openssl/doc/man3/RSA_sign_ASN1_OCTET_STRING.pod":"d3b6aec65ad46576bc4c15ebd6f0ab08db9dc86a96752c19442dc5b6a34305aa","openssl/doc/man3/RSA_size.pod":"02033009b3f2d52145a90b70c20cdb6b9e151fd0a5ae1e40a3fba09ff8677e60","openssl/doc/man3/SCT_new.pod":"b506b791dc1c6c7c1e47c8722f53c6ce51df9c60bc81da759c8bda2da83e7c32","openssl/doc/man3/SCT_print.pod":"c5dfd5c5f28585b4fd8db18cb9ce66ff582d0e8a3c12e4f521cb1f27c02364da","openssl/doc/man3/SCT_validate.pod":"36106502782bc9d2a512902fada06a7eeabf27068cc3dfdbc918799e2915d20b","openssl/doc/man3/SHA256_Init.pod":"0c816af790b1d88e7a3cc708bba420ba265c53b7a0eab31437c0ba77401c57a6","openssl/doc/man3/SMIME_read_CMS.pod":"3ac16031a274c4095c664106895c7ac57f9372b5040c2e2dd52d6970b7b08dcd","openssl/doc/man3/SMIME_read_PKCS7.pod":"5a7a5660105501d860fe63ad5c8566b980f2a01d269f5845b2181149e199de04","openssl/doc/man3/SMIME_write_CMS.pod":"ea711d47b144ec2d7331c1f50553619007315f547f8b2f7661a845d6958d3214","openssl/doc/man3/SMIME_write_PKCS7.pod":"71ffa71cfcdcccd671d6bb0f3baf2ae7f966fc2cbe8dc85be1438b8402f5c7a8","openssl/doc/man3/SSL_CIPHER_get_name.pod":"c587a7c6f52ee7a530a229132b5881c2da6a5ec620fbd69ce5d8f7ca0a618d68","openssl/doc/man3/SSL_COMP_add_compression_method.pod":"9b59a012d658b140d2687c9911230a451218ab4e0370cbcfeb2d732d5cea910b","openssl/doc/man3/SSL_CONF_CTX_new.pod":"31027f827a134015230703da9c56f5c62440c3ab8b09d4d112559a1f8d16cdc8","openssl/doc/man3/SSL_CONF_CTX_set1_prefix.pod":"71260ff34ff577c45d1d903c4ce377d3913b634a825bc528691977b293777d06","openssl/doc/man3/SSL_CONF_CTX_set_flags.pod":"e188f2696c62e16e30e6f6d71e44503a2e1607c7a4cfed20a0203d08f5f75d22","openssl/doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod":"ea231fc93bd4df19b54456d3bc7f8429a34f3c57eded62515ae4c91397f97cbf","openssl/doc/man3/SSL_CONF_cmd.pod":"1cde0a434e7864b7bbcc5071c900021ee794e716be8e574a79f5f55defb10614","openssl/doc/man3/SSL_CONF_cmd_argv.pod":"9d12224f2bc09dd67737996da4dbaf727cd2e6182b6e2db58d9033c7c2fa64af","openssl/doc/man3/SSL_CTX_add1_chain_cert.pod":"3ffb34b36b7b345a91332399af9e45c387218e8c4ec451222688e3f763a809df","openssl/doc/man3/SSL_CTX_add_extra_chain_cert.pod":"0d2ee70099b5ec881535fb813ef553a7d0051de659ca0c2009f9a3e5e79062f3","openssl/doc/man3/SSL_CTX_add_session.pod":"bec5e3483ced8ce89a527c01143bfb8e7551768eadba6da3a4abe875220822e9","openssl/doc/man3/SSL_CTX_config.pod":"a2c5542cfffd35eea979b4e3d9902763ce1296b495611d40c60450e1ebf53e18","openssl/doc/man3/SSL_CTX_ctrl.pod":"b8b78960b3cef7b09b64ad14aeaad9f5e0e815cbf5cf973a91c7955dfc3b2272","openssl/doc/man3/SSL_CTX_dane_enable.pod":"a90ddd5809acd5ea1be2ca803450bfae5380a07278ce3e6107ca459554928361","openssl/doc/man3/SSL_CTX_flush_sessions.pod":"ce4a997e4ae4171780043fc86c9e82c18ba6cda6a9576f36aeb59c30140b56c3","openssl/doc/man3/SSL_CTX_free.pod":"6499830839485a4f82a5496d363dbced5087abc4739dce9aff6a92bfad444af3","openssl/doc/man3/SSL_CTX_get0_param.pod":"ced535f7155efe76a8e2beab42ff20dc9c2b2981db08b424c719ba6cdb341ec2","openssl/doc/man3/SSL_CTX_get_verify_mode.pod":"28a4dc0c047c2fb347e46e9a005f260f9227f4f875f2082c7af3d54c85fdfc48","openssl/doc/man3/SSL_CTX_has_client_custom_ext.pod":"ddddbd7df4fd974a749a70970d85461224d41c815f518a843c94d15320bd0a18","openssl/doc/man3/SSL_CTX_load_verify_locations.pod":"21022d6f47c6ec5f7d6d76761fa8987ca136c7d782861707ced2d929089f5b91","openssl/doc/man3/SSL_CTX_new.pod":"dcfb546e8a7b702428a85ea480977995223ae2188c1ed3d1e24cd27804c89aa0","openssl/doc/man3/SSL_CTX_sess_number.pod":"dbb65ae74b674838e50c26b912064ff3a2e4fbab74785c15dadb903fa43df70c","openssl/doc/man3/SSL_CTX_sess_set_cache_size.pod":"77f6adb29332bb212d117faf47983466aa60aa733f04dc3ee8f973253a5898e4","openssl/doc/man3/SSL_CTX_sess_set_get_cb.pod":"0d6136d9a75c15951ddb67610c7f08e67a7dc424115eaf9ad4035971e76b5771","openssl/doc/man3/SSL_CTX_sessions.pod":"1223bb83bea15d0a5357c8e6608b98e41c1f7b62036e2681c67745ca59cd8ba8","openssl/doc/man3/SSL_CTX_set0_CA_list.pod":"1932df3801f3767252d08544b125b14c596fd0d13a7f1633427a7030ada7cb03","openssl/doc/man3/SSL_CTX_set1_curves.pod":"e0ce7947080129badd5ed256ad6804b30ad456a2a0da697cdcd3f255cfddc563","openssl/doc/man3/SSL_CTX_set1_sigalgs.pod":"095a1160eb41fdcd14c6cfbac2498c09f6e98a324fcd0a377a6a49314c10f294","openssl/doc/man3/SSL_CTX_set1_verify_cert_store.pod":"f3fade7140c78d32bec69532d825a71fcf6272bf940d25f3eb404fb74742c944","openssl/doc/man3/SSL_CTX_set_alpn_select_cb.pod":"1cb7e5bdb3d7e91db5ad550e2d51c7490f3379ee3c8ed852d14ce4e2ec4b5374","openssl/doc/man3/SSL_CTX_set_cert_cb.pod":"53f7dc014eebf63a09d8d2dda05ef46b7a66a39e314c4064a3a2c5f5bf0496c5","openssl/doc/man3/SSL_CTX_set_cert_store.pod":"a4f850ae8ff976053e0ed7726e36d9072f0554f9281132de3227aafeb3db9f4b","openssl/doc/man3/SSL_CTX_set_cert_verify_callback.pod":"0594c50e59a4c11c807270302c3c325d39ca57fccdb82cb0e0bd6c34f4755b7c","openssl/doc/man3/SSL_CTX_set_cipher_list.pod":"3df94109693d91e9ffc145dacc23e430fab4b460c8c8a27bc90577af5c622fa1","openssl/doc/man3/SSL_CTX_set_client_cert_cb.pod":"022a0492b6e96568db2be53e08ad343e10c7b4fc67b3b5db541cd2f503dc1a12","openssl/doc/man3/SSL_CTX_set_client_hello_cb.pod":"44454b894afe8e07bf14e9af1aec39aa0c1c7e2cc252a9e3963737e62a336662","openssl/doc/man3/SSL_CTX_set_ct_validation_callback.pod":"60d38e73044fdc0bb7e7bbe16036a11d48a3e0ceacb3817f298a78706e687dc2","openssl/doc/man3/SSL_CTX_set_ctlog_list_file.pod":"f7593c7bdaa4b43b83e4922fcfa645a6217acfc74f896de09664f44fe4ed9ca1","openssl/doc/man3/SSL_CTX_set_default_passwd_cb.pod":"0ddaeee16505288ac676ce640dbe85335cc3249211689e83bd5082664cf77798","openssl/doc/man3/SSL_CTX_set_ex_data.pod":"910c37abc33c0590e8c4d7f748aaf72c66f0c9032e8754051de8c359b507a32f","openssl/doc/man3/SSL_CTX_set_generate_session_id.pod":"75802eb57ed2d6d7f791a6e68aecfb010e1d625af02ffc2d764f49bf02e940f2","openssl/doc/man3/SSL_CTX_set_info_callback.pod":"58c7cfb0d2119327ac0c43653884f0ba6b93c5d5855392ee4f954d94cd335f72","openssl/doc/man3/SSL_CTX_set_keylog_callback.pod":"7722c9aa8a61b1cdd1f0cea75ecc6412747f17a9bb348a411acfc3b225ba3e24","openssl/doc/man3/SSL_CTX_set_max_cert_list.pod":"86b5bc163b99a67ff72e5296a61f826809ebd764f976a1c3deb4996c1b3e62a1","openssl/doc/man3/SSL_CTX_set_min_proto_version.pod":"a0de5e8055272cc35044545d301cc7818fb9a86cad38e7441721ac839501f910","openssl/doc/man3/SSL_CTX_set_mode.pod":"ea3a8bee7989f77a907d60f4e62c200f366c0be856639513b137d25fb71e41f6","openssl/doc/man3/SSL_CTX_set_msg_callback.pod":"87c10f79b408672cf15e6ce75e1c08513609867068bb4caa6c49b7e72d731c39","openssl/doc/man3/SSL_CTX_set_num_tickets.pod":"e91460e00d1139b4465a6e5604a8de0c824b2d1928b926404d7a344f1dc36727","openssl/doc/man3/SSL_CTX_set_options.pod":"36cd07d554a66cff5a07f7f8f2b5cf2157d5e008b293e59683bd29bbb013115e","openssl/doc/man3/SSL_CTX_set_psk_client_callback.pod":"8b12f99d32fffccebf235434b19b5f1211f6de42f08c87371dd15c6322dad3cc","openssl/doc/man3/SSL_CTX_set_quiet_shutdown.pod":"e668e7c764ef67d66de7d575aab821d7c68ba95d383d40e960a316d28944290e","openssl/doc/man3/SSL_CTX_set_read_ahead.pod":"1f2b0e5a8a626271b65c9a53bf10a2edf5ed5bed3f46595c7d6ee280c61d97bd","openssl/doc/man3/SSL_CTX_set_record_padding_callback.pod":"cce583a3e71fbadb5c5729236a48639ecb2b2614acb9d23608e70f8278daf782","openssl/doc/man3/SSL_CTX_set_security_level.pod":"18d32a592444185272aac8c2261a94321d7a6568c7331a922e2f1f3f30cb36eb","openssl/doc/man3/SSL_CTX_set_session_cache_mode.pod":"64210089697ac6bc32d99ec7a41c1cb7c45b111ff427f6b1303a9afc288f0967","openssl/doc/man3/SSL_CTX_set_session_id_context.pod":"3eb931703e5919ce4228b9018d541973069a6b796e12eb795bff9f41da2a3a8f","openssl/doc/man3/SSL_CTX_set_session_ticket_cb.pod":"bc134518148ff374aa5a5bcd004678124bc76c2863e6153b6ef1b82fdcb10e04","openssl/doc/man3/SSL_CTX_set_split_send_fragment.pod":"6604503373b79017a6fe457c24f6a6f79b93073001ca41787856598cc48fd75d","openssl/doc/man3/SSL_CTX_set_ssl_version.pod":"06d8684f35d9b31f5048750d52dea848ad07a54a5c6efe883e35bf901e259428","openssl/doc/man3/SSL_CTX_set_stateless_cookie_generate_cb.pod":"9e3ba9fee42697428bb9e48d537b8f05d3c6c74cc0ac793db6615575df4d8662","openssl/doc/man3/SSL_CTX_set_timeout.pod":"662e5c1a201bb53a3fe186b5f0338e6ee122bd6183b6d0cacb02ec8a995cf305","openssl/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod":"e07e53bc49b3938a8844a2782c7a446780a23104f6f81de05f877c5516cf7acf","openssl/doc/man3/SSL_CTX_set_tlsext_status_cb.pod":"8efea6a299309aa622a1a35b272e6a9fe6f2cf31fe3ebcb1faf4bccede1f1160","openssl/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod":"4ac6f1b07bf6baa5a21f799a15dd402b7063b0369c9212b72fed925d762d261c","openssl/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod":"49e00bcc3ac93f10bb367e2ad300c676fd630505c3a1d314c52bfacd4276dd16","openssl/doc/man3/SSL_CTX_set_tmp_dh_callback.pod":"6ef9394ec04927bdb4ac3fd0fc5dc22e589dd5431215767b91ae8941a22776fa","openssl/doc/man3/SSL_CTX_set_verify.pod":"ac8a4987600f41b06c9d03f8062c904bb1c9bc5054c34e2107efb32da8af0988","openssl/doc/man3/SSL_CTX_use_certificate.pod":"ad02bc374ba5e5bf2b029ee5c8043abcd60cc50811452741dd9f0d5e94c76d31","openssl/doc/man3/SSL_CTX_use_psk_identity_hint.pod":"ff25874925a52807e773a15db1f92570d23f9b22a7b4a4a59525d0bf20bb878e","openssl/doc/man3/SSL_CTX_use_serverinfo.pod":"0c59baa6ddb81bc09184a7cd7426de81c9d38e315e93c48dccba09a00a2dd934","openssl/doc/man3/SSL_SESSION_free.pod":"2b920d74e18f2ed8805575ca0cffdafffea2452f79449be9e8e23fac370b8125","openssl/doc/man3/SSL_SESSION_get0_cipher.pod":"7fbeea414a5c74a6682ee0239152ee09091e210e840b7365576bb751fd7af0f7","openssl/doc/man3/SSL_SESSION_get0_hostname.pod":"1e81dfd8ebc653b6d4d4cdde0d15967f7eda6c17d08b8d4437134c4be279af54","openssl/doc/man3/SSL_SESSION_get0_id_context.pod":"ef11a0f1335b2007fc960520d91a3df1c9ac2e59675e6cd1f53bae02a5da5616","openssl/doc/man3/SSL_SESSION_get0_peer.pod":"133d6ae6ccefa1cfa57fca7e1c6952f5ce1cc799c6d63e0584265980a6237505","openssl/doc/man3/SSL_SESSION_get_compress_id.pod":"07fb8cce6c50b966b66107ac36c22c1b94777c1a99b4d5a43f61e359b7722bb8","openssl/doc/man3/SSL_SESSION_get_ex_data.pod":"8b97be70166cf27a451c189c3d2767bb1c9b6b1e9f2c6b02fe7b340dbb592d1d","openssl/doc/man3/SSL_SESSION_get_protocol_version.pod":"cb70d67a1cf5f976d53b95ace040d4e19a8dbf6ff24f058a3a82637ea36dd782","openssl/doc/man3/SSL_SESSION_get_time.pod":"fef94d441fa1265ddbb54b6af2a7bba833e712301c671d4f290a1e16a8214e68","openssl/doc/man3/SSL_SESSION_has_ticket.pod":"529bd51417b3373bb181f10b7ad17afdff5a49c1e179028cc6d7751c499da73e","openssl/doc/man3/SSL_SESSION_is_resumable.pod":"396c988fda7bc03cfca63f908a7d65aedf4a0f1e95cc9e7c97b35732d647748f","openssl/doc/man3/SSL_SESSION_print.pod":"908e234e2e5414cc1f7fe239506c42e266e9a1dcf7a1fd51583a5b8f6daf7ca8","openssl/doc/man3/SSL_SESSION_set1_id.pod":"0c89d29765a4be61745251be6ec0f297e636e975b690bac4713db1ff8980d1af","openssl/doc/man3/SSL_accept.pod":"394d5c0d4f87b997e687aec50614f6fd0818a4511d9865b98abe12475d9c3780","openssl/doc/man3/SSL_alert_type_string.pod":"e878e16b1bc3a5bc478fccad7bb32a41277dcd370d0b287b29b2227dad3f7b97","openssl/doc/man3/SSL_alloc_buffers.pod":"adfc9fc4fb9f13445d40f6dd2cfb6cb217dd5cbfad7684c12abdd419dea2f89e","openssl/doc/man3/SSL_check_chain.pod":"6f5767fa1a1aa97a348f7faa324d59180934a2d061799d5c67fed2d5f817fa07","openssl/doc/man3/SSL_clear.pod":"7e870b0990741451b75e1d4d8fa539e03bbcc7f9f1b719ce57156999cdc946da","openssl/doc/man3/SSL_connect.pod":"8b9de6c2aaedc52619681458275444db2c66c2e2b72934e2089d19a92fb91f3e","openssl/doc/man3/SSL_do_handshake.pod":"299b29a9fbfa7a48895e85a57690b32c5c9579db147362283b31108cffce3a1e","openssl/doc/man3/SSL_export_keying_material.pod":"2acb6d096b31ec8fafa653f7e87cd597127a9e689d65083f22bc384961af3d70","openssl/doc/man3/SSL_extension_supported.pod":"e676ee943435ed9c9148481468b9217e693fcf538e999d852dfdd2fbc07caee1","openssl/doc/man3/SSL_free.pod":"4f6cc5c3b6d7677295e8b89dc4de699899a3e760d5b1ce5b78d917573c0493ad","openssl/doc/man3/SSL_get0_peer_scts.pod":"e126b6deebc3f24c731a930c42ddc7e0dd6b76e89dc33266aa4349334967ae9f","openssl/doc/man3/SSL_get_SSL_CTX.pod":"c6c6bec96e375583efc447fede87876f97da5cd0b92e57f1d658e2b66c3c1551","openssl/doc/man3/SSL_get_all_async_fds.pod":"6ea3e4b338f225e31b83210727d4028d9f6a1bff056e336ec4401558302f07b8","openssl/doc/man3/SSL_get_ciphers.pod":"3487a64ec366c5aa925ba9e40ba254566449013275e3879a1c2e221f030023e1","openssl/doc/man3/SSL_get_client_random.pod":"0b4fcc3396b1d7cf97c69334a62847d9934b4dfc084d9e157fe046e7bf82bfe7","openssl/doc/man3/SSL_get_current_cipher.pod":"98c1792062e77cb76e78d9c8b7023d93ae282723615e167710ea0aa03a1c487e","openssl/doc/man3/SSL_get_default_timeout.pod":"7eff4e2d544b864b301e2a92f827dc5edf98a4de7c7e8abf7d6b988ae6fd13e9","openssl/doc/man3/SSL_get_error.pod":"14550520010f9d63fc097b4879893b5e1912148ac943ba76776c11ea81e566e6","openssl/doc/man3/SSL_get_extms_support.pod":"8f276a1fb14347c3590b919c0b5e6d65a204eadb15a88726ab094638b963440d","openssl/doc/man3/SSL_get_fd.pod":"baa009aa87139009071cce433eb3a09e3cb6e64ac2d952e6b2ce1131169ba39f","openssl/doc/man3/SSL_get_peer_cert_chain.pod":"8356388380053cb13b6e09ad3a471608a30a9e43bf7f2d87836a36b3d2fb55ec","openssl/doc/man3/SSL_get_peer_certificate.pod":"d601fcd0b6a607c1f2a77578cda877532fce9324dfb7def48ffadfb8ec4ce244","openssl/doc/man3/SSL_get_peer_signature_nid.pod":"d9e1ade1fa9509da21222af7e33257f1aeaff9c02cb0b2804c5d0ccab444f3a1","openssl/doc/man3/SSL_get_peer_tmp_key.pod":"0bbaac7787c739c1d5b5d67277ba1b7dfe9a3261ecf0a1cef6a2373a9d712884","openssl/doc/man3/SSL_get_psk_identity.pod":"f44137b49e863d0577ac696832cc2062f28997af8a4acd151d4f807d93a750f7","openssl/doc/man3/SSL_get_rbio.pod":"c85c26efe281ec61aa08f9b906f48531b97e9d43bc8d8d87d235c371a47e4c1d","openssl/doc/man3/SSL_get_session.pod":"834fb55f52949a8416a786d4557aabb168d52778b342203dd2f701d642329f27","openssl/doc/man3/SSL_get_shared_sigalgs.pod":"d23ea6dc2ee08770d8526b829a95fda5bfe5e93587136d7f0ef458c0daedb4e4","openssl/doc/man3/SSL_get_verify_result.pod":"aa1571db0fb36e175b38389bc9fdc997f6649eaa6bee6a20c2f815a760b74faa","openssl/doc/man3/SSL_get_version.pod":"acd757055af280f337c94b91b965e2e473f93444d82d5951995ef98ffb014014","openssl/doc/man3/SSL_in_init.pod":"1574aaa908f8922ba23290e19906a4731770755436edd879a45df45c824e6c0a","openssl/doc/man3/SSL_key_update.pod":"615f544558314aaa3bf081414194a056bf70f10fdbda1a0b165a9e8e1af6ef62","openssl/doc/man3/SSL_library_init.pod":"fa072f418bf6091d30ca2625c3c87692b6a9b21f8bba3ab1ef844d9c97601b77","openssl/doc/man3/SSL_load_client_CA_file.pod":"eb51dbe483743c954c0497519398b753be2eb9fb9355af5320883a1ee1052bb6","openssl/doc/man3/SSL_new.pod":"325a9beb776259495c4fd9ea3dbc4613d9786e44ae69d598e8ad6dcc2773aeb7","openssl/doc/man3/SSL_pending.pod":"2baee7bd0084c86db08af4600b11a3e3bf48715b8c46fc6e23c711519e23c8ef","openssl/doc/man3/SSL_read.pod":"8b731c1080bfaeaab6e886dc4ad61a6427212913d237807b5f45eddcec361b5a","openssl/doc/man3/SSL_read_early_data.pod":"e0ff03f9b4358c8e12728a366088909e1551dfcbcb729b70dab02c96e638734f","openssl/doc/man3/SSL_rstate_string.pod":"023964a6c1ce28e063baff5cf8328d0c609407f793a839b9f519776b97c3bc91","openssl/doc/man3/SSL_session_reused.pod":"372667c4805628c3d0288c25d8caca78c928ec09bff212af977fde7f682aa335","openssl/doc/man3/SSL_set1_host.pod":"db7d71292569f96cdbe0d242a7fe62db1697a7d51e6ebf23bddf0a6a5b242e73","openssl/doc/man3/SSL_set_bio.pod":"6ba552c633f6e81e2941995f512023b1d91dd6c9533e16170d74ee0b5f75d66b","openssl/doc/man3/SSL_set_connect_state.pod":"2c1545479df3d68046b44b3af203405020830fb980a851ae988694a317905531","openssl/doc/man3/SSL_set_fd.pod":"81c180900fb359611ea6729bd3a543448da15756c397448a94044a33685596f3","openssl/doc/man3/SSL_set_session.pod":"f1c565df21199f9bb9f22ff81478238e1fe498dfa990613a529d302d9df360ff","openssl/doc/man3/SSL_set_shutdown.pod":"e21d4a6187b06df0b3ef7da18b397ef36692973af19334d5bdbbc9e4ebe82bfc","openssl/doc/man3/SSL_set_verify_result.pod":"dd2040ebf36d0dfec55c4a8e2969f6c2585ecf3f7b23b106b04858230dda1d65","openssl/doc/man3/SSL_shutdown.pod":"9d53331571e37726ac56139ff7b66f10f08420d1df728002beea7fbd31b07633","openssl/doc/man3/SSL_state_string.pod":"4db20f3c0aa03f62ddcbaeddadfd44c8bba703faf363e76994da3b9cb030cdbe","openssl/doc/man3/SSL_want.pod":"305bc0a806621b8b017278b9730946a7115c81b95a00d2b084a1d2e53986a276","openssl/doc/man3/SSL_write.pod":"3f2a76428e9c691d3c968c5f00949b5075425eda529cd25a366e018a3275ee4d","openssl/doc/man3/UI_STRING.pod":"25378107283a87316a74259e19d67e836c212be739cd5f60f4fddd2dbbc2f151","openssl/doc/man3/UI_UTIL_read_pw.pod":"c0fc481fd69923bad9539a754090c7540f361b6c3b524583ecad559d6d56deea","openssl/doc/man3/UI_create_method.pod":"a45774e406ce7a57184e62df20597df23919654b561feb6d46288fbedaf75b0f","openssl/doc/man3/UI_new.pod":"da09d8770e7904e4045107d31a7dc08e7aa751eaaa0a0d03658be87cdb6a26e5","openssl/doc/man3/X509V3_get_d2i.pod":"835ffcba4795c13db5079aba4db321b72c01fdb8eb36357deee0855cdac135d9","openssl/doc/man3/X509_ALGOR_dup.pod":"5b049392fe92e7b0e8007fe8cb607181c28a9b61a60bfa8a14c13126af5ccc76","openssl/doc/man3/X509_CRL_get0_by_serial.pod":"57954e092d37e19f57e456aec46fc041d3f7881496a7ac82594ad0d73a627bfb","openssl/doc/man3/X509_EXTENSION_set_object.pod":"765f9d2f6c7f0f62c3ff83cdaa063b9ff34610cb0734c29e2a737d58ad00ebf8","openssl/doc/man3/X509_LOOKUP.pod":"cdd0d25df89aa2d0574f0b878e064c0e12cb918fa86128159411926f2eb576a5","openssl/doc/man3/X509_LOOKUP_hash_dir.pod":"37d2395323dc9b319bcad77c4aeecdb27f7314a6490a7a39e8988aaa75710d9e","openssl/doc/man3/X509_LOOKUP_meth_new.pod":"38bb0d0fdbb31c0410e96f81c057d4f8336b90c289a66f631513049238779671","openssl/doc/man3/X509_NAME_ENTRY_get_object.pod":"0d5a67f03dcffe8c40cef439dab7e6e89fce60aa2222f4ea8f01c9ac3f2409cf","openssl/doc/man3/X509_NAME_add_entry_by_txt.pod":"9c0100e44bde9eda0b7c55b81c421666024a4fddea2f74ae71ffc81d7cedc2b0","openssl/doc/man3/X509_NAME_get0_der.pod":"14db4a7ab337e3e2315ee57b56e155185248bea3a9bc360d6e21cf82344a7a82","openssl/doc/man3/X509_NAME_get_index_by_NID.pod":"e44f82e4a7c46c24291c022d4159506f5a9d275747b5fd7c79a3e999beedd12f","openssl/doc/man3/X509_NAME_print_ex.pod":"ceb2c5ee0e0059fb8d2c83a7769a54d6eead6dfbdc75664c5891fe3781c39100","openssl/doc/man3/X509_PUBKEY_new.pod":"665eb733a696acbe5dc9871a2fa06d5c34ec9a1b8d92e7f1a9f9ff82e3232383","openssl/doc/man3/X509_SIG_get0.pod":"18d70f17d6a516b72f67e3137856a8c22cbe89cbd0734af7a9ba5933d9ed69b2","openssl/doc/man3/X509_STORE_CTX_get_error.pod":"920225d3f396dc13390db5ea02433c3662358ae90f7af37739324093994fef3c","openssl/doc/man3/X509_STORE_CTX_new.pod":"5b66b7933e4055e8972b650e61802a6e84c90d3947badef355088b15d965db0c","openssl/doc/man3/X509_STORE_CTX_set_verify_cb.pod":"acb6a12e45d92b1865906c82bac24138df9ec88ec68f6e427f0890290b807bc7","openssl/doc/man3/X509_STORE_add_cert.pod":"f62a0351ebb347b140244ce044977a2cc74b01b035661656a53eb07ccfb54be4","openssl/doc/man3/X509_STORE_get0_param.pod":"d550b0aba2821b175b98f4c6b10863841eb705eb238ce992eee3c10ed505a11a","openssl/doc/man3/X509_STORE_new.pod":"3ed802babb15f251e5de008ba067000b06a59224878469154b46ef51b0d0dadc","openssl/doc/man3/X509_STORE_set_verify_cb_func.pod":"b33e3e94836369fc3c9151e3e413067606dcab0fe75ac2ef3cf0630fcf1da222","openssl/doc/man3/X509_VERIFY_PARAM_set_flags.pod":"e0cdefb210eaf03c458e30b471975432d7a34fa1d322260790ee4f2ae19c5a31","openssl/doc/man3/X509_check_ca.pod":"b52cb429aa0b9416f9189e78e4cfc0eac26efb42d86b4c5c18ba626425ad0858","openssl/doc/man3/X509_check_host.pod":"d650728411df302db7e622e20e567b5110f7e6af0fc06086550bdc46362e1f1e","openssl/doc/man3/X509_check_issued.pod":"6c17b2588117d268d9c6c0b2efcfbb92222aa3cfd179fce4d49356421466ea6a","openssl/doc/man3/X509_check_private_key.pod":"edf307f7df63cacb1d23aa4f4f34565df534cde48318480cb5ee95f0c7f1fa27","openssl/doc/man3/X509_check_purpose.pod":"fedce0b259365a9bb0390c5423b688d9876012b1347e1627066de0d3993f12c2","openssl/doc/man3/X509_cmp.pod":"aad2f01c0457d96db4f84de4e5e1924e7572c538f0b6a0d6666a6c8e377a62d9","openssl/doc/man3/X509_cmp_time.pod":"b981da40f3f68a578db29a66f2570e55cdc99daa819268d15d7c626f6e1c230a","openssl/doc/man3/X509_digest.pod":"f4f1bedd97852b9bbe82afc6e4c573125f684714590b42b064787ae821d62d04","openssl/doc/man3/X509_dup.pod":"7caa371b8da0812b7fcb8f54e57136e41fb81f80115088dac25082fe84301159","openssl/doc/man3/X509_get0_notBefore.pod":"66cdd9be36c3bc13680918927af2a80b06f92871449be70ebef477348e687801","openssl/doc/man3/X509_get0_signature.pod":"d83bdee1efda4fede8ea60887eaa45315ebeb9ebfc822b7e60db79768fd92eca","openssl/doc/man3/X509_get0_uids.pod":"04549206bc888e9da9c4bc4bce5521f0da25b1c280bf66a3fd08773dd695c46f","openssl/doc/man3/X509_get_extension_flags.pod":"19e7da3eb1e54e6b2625a53c71aa8ab74c89c405ff3a20ce8c60f2a9d4ce02cc","openssl/doc/man3/X509_get_pubkey.pod":"0d1b2fbdae4528648c0a70632d6fce285a5ee5c1bbd5bc4be28373ebd11c5644","openssl/doc/man3/X509_get_serialNumber.pod":"25c71d0e201e9eb12a73f9d80d6c4cb6a3c46d89efa8da10a432caf2908936a0","openssl/doc/man3/X509_get_subject_name.pod":"35e20b0e6a7cd1de5c5325b62af3a494f59a4a3e9b2f5b7f71ec90ee90844ffb","openssl/doc/man3/X509_get_version.pod":"abf7010b232e4c36e8c18bd2363c3eba41d1807052b862753cd1832d7add03f8","openssl/doc/man3/X509_new.pod":"22ff44332adb2856832c706039baf9884b54dc4ed90ac9c6cb33958f31968acb","openssl/doc/man3/X509_sign.pod":"937a6de441cb1c8c084d1a78fa91aee9e4b281adc46bad08bc1e4f4ede49d603","openssl/doc/man3/X509_verify_cert.pod":"e4ea4d7e7532d86f7cee5404412b6f2530e16d518850346d4cf45bfbdab5afc2","openssl/doc/man3/X509v3_get_ext_by_NID.pod":"5faf535447941465dcb4dba4527bc036030218f4a3f3cb31fce49091d6447789","openssl/doc/man3/d2i_DHparams.pod":"4f0ed00d8ba4d77edc38cbb99b3e16dc1d3ae9ff498e89baec764343b418aec0","openssl/doc/man3/d2i_PKCS8PrivateKey_bio.pod":"d1cdb811d88ba557c6783727f784a63c041a02f075db7b93302e0277a5eeb441","openssl/doc/man3/d2i_PrivateKey.pod":"c7853fc738802f1db4a172871d86c7b8a7d0b5d98243881ce395ac12f295d208","openssl/doc/man3/d2i_SSL_SESSION.pod":"bc21bc24e88352a7fa7960b018c2431aea3b0371775a9722641709ad23e2e62a","openssl/doc/man3/d2i_X509.pod":"585d128dc975199f6b8dcde463240d4c5aa7529d261d18dcacd3c5227b2e8436","openssl/doc/man3/i2d_CMS_bio_stream.pod":"57ff21edf5e057b5186ca8b616087a7f8fdfa1293cac59ae0bb72a740a4d008a","openssl/doc/man3/i2d_PKCS7_bio_stream.pod":"616ff7934af6cef7209f9e0ab2343a0668de210562e20affa4d9b02aad36da67","openssl/doc/man3/i2d_re_X509_tbs.pod":"aaca697edb4b5c7139cceba8aeb5609d4a18d7606dde52a66256bff5c8d680d6","openssl/doc/man3/o2i_SCT_LIST.pod":"82f5f749eb71d3b694869a53f060c3f9ac20e380b62d7f4a908fac406423d68f","openssl/doc/man5/config.pod":"831ba6dab308e1c0923929089be0c187a9dca9cccead33bfbfecc00885274908","openssl/doc/man5/x509v3_config.pod":"57787903148c11ba7470b477ebdf91098dbd5cfdc1cf176c3fb26f6c6d4e9aaa","openssl/doc/man7/Ed25519.pod":"0f19e6e4a06a6508e57c09a6b2c7890cdb6f51ec5806ea91e06db4be60e7c137","openssl/doc/man7/RAND.pod":"05d139307366ae6b646a292bca0862ceefecf7720297380635770c9545d938df","openssl/doc/man7/RAND_DRBG.pod":"d4efd07d231b501525970899ff911ba7f8036f724e00ea8704c06194e4fdc794","openssl/doc/man7/RSA-PSS.pod":"e302eda9bc0e90889f498d834ebf4059d44b4fc7f5e3edfb292e81d7df35bf27","openssl/doc/man7/SM2.pod":"aca4dae0e2d24d5d1c0987d698922390d9b3cf638f77a838cdadaeb645b7d2d7","openssl/doc/man7/X25519.pod":"674e80ff397706e9c6fa83c85ede868a07c3ec7eb46bf4f18fb13572e73c4814","openssl/doc/man7/bio.pod":"5a6b943aa56e79f8d9c97eed0511def267a38410bf841b230994164e3b39e425","openssl/doc/man7/crypto.pod":"426f6f3a4300d4b9928341227d5630e932f41001e2f0f9cb73e46650b3d11081","openssl/doc/man7/ct.pod":"4d458e58daf08b7b528fb72de6c9838a89fffcc3740b1438cc3b8e30bfd2a192","openssl/doc/man7/des_modes.pod":"fff878fa997b37163dd31713c796d1574490b0a3223dbe11ced01298b1c3b737","openssl/doc/man7/evp.pod":"3588d0b8355739a8b8ef48149c16b0e4625ed3798d9399528daf850c41a81314","openssl/doc/man7/ossl_store-file.pod":"b68fb7f166585d643aeabf5ad66968a9e1bb9a0f51848f9351e00e7993f3cc81","openssl/doc/man7/ossl_store.pod":"841f63f74e320dc41663277364fc2a30d84f710d2e7f8bbcb69f11f045d1efc6","openssl/doc/man7/passphrase-encoding.pod":"640502a7b0407c9e8a2c0332cfa6fefe3cebd6cf774f5ac8f24d2f22c8908d8c","openssl/doc/man7/proxy-certificates.pod":"bc563175f718b7efa53757019af9985440739489b9bba84b4bc203e2439f0669","openssl/doc/man7/scrypt.pod":"72dec00db94199c8a1e6fbc867d92505362456de3d07f199d07bb35c6826b238","openssl/doc/man7/ssl.pod":"170a8a7177e45dfe4c4515169e29b794445b6163e8360f1f691d0695ac9e2cb2","openssl/doc/man7/x509.pod":"b5ba0901b6aeb6e7a6ed090e061e6368aface651e928f22de2e02db1b25e1c02","openssl/doc/openssl-c-indent.el":"7d9a49b0d41e201adaa2e1b336f2073e23cb3ad8962c187dccc5dcdb3037e652","openssl/e_os.h":"c8154926e3e19c448c290142e933c40df58b262f3dfbc0c0c8832d70645dd547","openssl/engines/asm/e_padlock-x86.pl":"296feedf92fc9daaaa78f6939fdcb3a50e691b1dceaa153af45b03385b988983","openssl/engines/asm/e_padlock-x86_64.pl":"7d11ad2bdb53bcf0a815f21250d69ee7e9778690a26d6e2f40a990682f34c42e","openssl/engines/build.info":"40a72aac066ce902cadb25477c73e57848542699e1949e100e6bd1e26744d396","openssl/engines/e_afalg.c":"6c0728457270b554fa7d726bf2d99e3131cf00e222ab0f711967f33098e9f497","openssl/engines/e_afalg.ec":"e4f35d834586b49d89983d1d45d63cc8f03c6ad9b23edab4da035b8cb7b9f6b3","openssl/engines/e_afalg.h":"2c099fc3edc2a8013b7a7d8be233ccc61131bd417822940b805a0fe54a9c9c24","openssl/engines/e_afalg.txt":"9da1e6ea1d14326a3667263017868ece1c7ee56b134986ce7b73f70a49b6ced0","openssl/engines/e_afalg_err.c":"c0e61757b1f83104dc35d0f9446b61c493473a2d12314a3ae71ba579c0037b15","openssl/engines/e_afalg_err.h":"6ac228237a4e3cee9b6acb22205df48c87d72055dc24119c24f637d072e358fd","openssl/engines/e_capi.c":"94d98515cf5bc239f4f712ec6c1d46f34c9d61aa90bd36726f87641addd600e4","openssl/engines/e_capi.ec":"f321a020da40d25763685beeea504d39d7ee729a78760a160586b3ea06855674","openssl/engines/e_capi.txt":"61b251d2b29b2b2a269621a194187dfb4409803bcee4ed06a19641351b50b01a","openssl/engines/e_capi_err.c":"649eefd0de78cb8d421ca31b56216df68a567b225e933fea0a81f0527dce9d2a","openssl/engines/e_capi_err.h":"70e10eee7a1a6a60a97efab2a1a4d1e9a63fb3c270c416911176dbe0e917dd3c","openssl/engines/e_dasync.c":"2b0cb93fe5c503e30814d6a25fda2757bcff6318f1c22d2e529c07a61038c9a1","openssl/engines/e_dasync.ec":"9d72d081179b0c8917b9ed5ffae64b43988d6273139ba402ad54b6da030752df","openssl/engines/e_dasync.txt":"4bfedb638226e82d694653ae7d12ac7c292a0da53bedc8d5206733597c3d16e4","openssl/engines/e_dasync_err.c":"59386ee77e72f4de83d8803f17d1609d6cf8bedd60743825259f485fd16a8b89","openssl/engines/e_dasync_err.h":"2affd0fd7a474b7b42533d3894446c589024778f7de19bf44cb75eef6899a8e5","openssl/engines/e_ossltest.c":"cd84c18c208efe2a472ba76a248aab31a6f72c4319fe18a96fbd26c894792bac","openssl/engines/e_ossltest.ec":"a8bea88a6bdac1f2757a2edd3509f1cb6726fc416a75dd8393abfb8cd76ab7aa","openssl/engines/e_ossltest.txt":"dfe08eb4bfc84eb3e26d5f1a998a346df3f1972dcfe372a45439e0e47d47fdae","openssl/engines/e_ossltest_err.c":"1f373f1fc169f0af13b942beca5e596e83eb0719764ddeb86809498364e3d1ed","openssl/engines/e_ossltest_err.h":"2c45ed3593c3e319f6b195720c0fc04af0d1dac6c515366d25dd13508903719d","openssl/engines/e_padlock.c":"4a0299e184d7465389db2ed6eabf16fd4ed4dc943cf3c0eb8498d5aa1dd4de1b","openssl/external/perl/Downloaded.txt":"9c7b05b336f8a2f171c296535d37bab34c2597c773afc9627ecd2d85980e3ad5","openssl/external/perl/Text-Template-1.46/Artistic":"b7fd9b73ea99602016a326e0b62e6646060d18febdd065ceca8bb482208c3d88","openssl/external/perl/Text-Template-1.46/COPYING":"4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f","openssl/external/perl/Text-Template-1.46/INSTALL":"d2f84dc3b27915516d16694b00ec29d20d1b427b2c54a85e7691f4caeae0ca67","openssl/external/perl/Text-Template-1.46/MANIFEST":"3b667017874fc2df25ae3100962fdd3026615795b0ce60fdd47f02b0f545c688","openssl/external/perl/Text-Template-1.46/META.json":"e52d6f14b9990553dcc5baa16be1edee348ab890dd065c9677db246fb44a7b42","openssl/external/perl/Text-Template-1.46/META.yml":"566a7700ce6679cfa949b46119d3f103f1e3f5b891782903b087b096cd5c13e6","openssl/external/perl/Text-Template-1.46/Makefile.PL":"dcd15f8fddea6bd866d4de9ff5be0f49b69e37c34165b0a8dc570e9b99adea45","openssl/external/perl/Text-Template-1.46/README":"04cb0c7eceb19919260fecc5d617783cfbd39b5bcf676730a5757cbd0eeda01b","openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm":"ebe5111b20332dcb62b52a6c023dc6cf80bf42f3193fd14f8708239e5ec30f3a","openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm":"829f63d0c273b77c7232fa1fea02a76f076dc4e4c3070c840a9125296503de5d","openssl/external/perl/Text-Template-1.46/t/00-version.t":"c5e0f7d0e5dd616a3415528ce2c1d86389546852233ea9697944e21d770a6109","openssl/external/perl/Text-Template-1.46/t/01-basic.t":"a012eddaadcdaae932f769c3987290a0c95dd6f822d933afb529125e0975be4b","openssl/external/perl/Text-Template-1.46/t/02-hash.t":"bbcbd9546cb771107a258831a137e31ee68e2e68bb1d69200f3f7c46302fd9b5","openssl/external/perl/Text-Template-1.46/t/03-out.t":"7f47cb646abb093e287ffb7ea0182ab346a41941f5f32324c2464ba08f8561f1","openssl/external/perl/Text-Template-1.46/t/04-safe.t":"3b20d194cfe1476e6cf088e0b6d1094275021dd5737a8687598c49d920d10167","openssl/external/perl/Text-Template-1.46/t/05-safe2.t":"e0f0eee46e23f0141705b9af769c551a6191ff76b8b75ee4dfd8963404d4a316","openssl/external/perl/Text-Template-1.46/t/06-ofh.t":"7d3781023c0f210376a8650825f89799f53ef457b457feda99d02475e9a744e5","openssl/external/perl/Text-Template-1.46/t/07-safe3.t":"af4a2c1b81b038352f1411e4c4e0115e1f0b023510e5276ad69452a859a1e30e","openssl/external/perl/Text-Template-1.46/t/08-exported.t":"9dce4da9343dab7cdeb9f2799556e6a49f4231916c4db4971eacc3151cf41da1","openssl/external/perl/Text-Template-1.46/t/09-error.t":"01781f28bfff4e88678e6a17e3b50b1cd90b76ffa358a7c2c56058cd0852a8ab","openssl/external/perl/Text-Template-1.46/t/10-delimiters.t":"0a203b734fd67f83b3a1c138024443cb6270dd247d90739a345ef46271c0cc80","openssl/external/perl/Text-Template-1.46/t/11-prepend.t":"c11cb95d3583368ebfd315e8e5a6dafd75ec60debf41b8898492d7e913dea0a8","openssl/external/perl/Text-Template-1.46/t/12-preprocess.t":"422781f1e64771ef8421f32e8ca954a8e4f0a4639d77c4cccbb64e6fab6950ff","openssl/external/perl/Text-Template-1.46/t/13-taint.t":"f044f17e8fc390046118710afd041eecb69b00b81dbc50ac4aac6df359d5a2b8","openssl/external/perl/Text-Template-1.46/t/14-broken.t":"86bce79fffeb080659eb11f381f6a26c34f007028e34882f0badb194a9cc3881","openssl/external/perl/transfer/Text/Template.pm":"806ea72d6560cdcee7f9ded9527c51bd7264e17a4f191339e1d2587f801db3ae","openssl/include/crypto/__DECC_INCLUDE_EPILOGUE.H":"53cb536a751a1a309e098aa662ed2f4b8e0dabe94a6274b9e513135179e6458a","openssl/include/crypto/__DECC_INCLUDE_PROLOGUE.H":"021f571eef8cbe45c0cd6520aeb12499ac31154fee331955e5a505fbc3762570","openssl/include/crypto/aria.h":"bb5c3570c4a8086452a37d505d17f86d94173cacbf44e20de6233b4cc503a38f","openssl/include/crypto/asn1.h":"32519a422642025af212db876a62d7ec9ecbe6b56fac7bdc107e526f388469d5","openssl/include/crypto/async.h":"be1fe19da7f3163477ea57a75ac71a7d2b85a90e01cd9bd589084394f242900b","openssl/include/crypto/bn.h":"29da2f844a66930db32d124eac0f79878e3ef8e61cc6e7035c59f8b9647a9654","openssl/include/crypto/bn_conf.h.in":"eda1bac34faba99d491f2d5c28328997a94b4f59db06b65b45e91387ce00c0ac","openssl/include/crypto/bn_dh.h":"2e34e268912af61b71ed8216c7f0cccb760994e0e3c47b0ec50daa29b46dfb89","openssl/include/crypto/bn_srp.h":"d08141769d222ce60d977563fd0f6d653d2fe92e1be210a4cfb4c903db932fcd","openssl/include/crypto/chacha.h":"0e5e743174154a7d46d90c82a3dd252c1b1831ff3adfd2fa3ac5d237801ee5da","openssl/include/crypto/cryptlib.h":"8cfdf6c5319fdffc8a64d6ef0844fea3b9fcc270e314f078342b1e26a51b568c","openssl/include/crypto/ctype.h":"5265229633ff6c80ef8c5e5cb5e919bb1f837913f9e48ef4301987b2a2f49d73","openssl/include/crypto/dso_conf.h.in":"469e89dc01b73dd5bb56fb6fa4f3ade57ddc8f9ab2495f7b83ca4bb3c03fdb16","openssl/include/crypto/ec.h":"eef8c8d5561e74c0a6aac33e989f284726b44b324311acfdb4dff16451eea944","openssl/include/crypto/engine.h":"139ddc0e469424cf51722848a7befab0ce1cb4bfc336d42b36d6edb3a54bd69c","openssl/include/crypto/err.h":"bf28991eb0d4bb8ca09f7db06034549509001352db8fa75a0e9b95d6829df22e","openssl/include/crypto/evp.h":"c7e98d995cae553a3149a52bfa0ae5e76f1d9c989c6193076d526cfa7129c246","openssl/include/crypto/lhash.h":"027fd181f9effaa0f398a856c9bf423ef2b6439d2a717a63f5445546ebc2aa62","openssl/include/crypto/md32_common.h":"d89b9c7ddcf20793eb2211c1335c87053bbaa7bc685bdc639ed861a3bd4ffd4e","openssl/include/crypto/objects.h":"2c49e60754e30ebe4447d45e8856f07fcf2eb00998f2931d6522193155b2eebf","openssl/include/crypto/poly1305.h":"16e9d65921e61f0be7c160522c5505d261b17fab81f6cedc93184e8d23f0e30a","openssl/include/crypto/rand.h":"3ff692e8a6752ee55076cf2010acef5bb26bb538b454f8ce8548c078ed00ae92","openssl/include/crypto/sha.h":"bba5f6f4c1c2d2a7c00c380223fd56c5a82a039f7e8ca35ef53bd0c99ce04cc4","openssl/include/crypto/siphash.h":"1bad4bf41ffd54408532b42d3b806ebbb0b31de408d8a1795ae4b39cb7aa522d","openssl/include/crypto/sm2.h":"2bb14af67c25f1c247c482c29c76ceb955b2704a2aa4c154ddf88b3d263cff4e","openssl/include/crypto/sm2err.h":"fc350f1001162921f5e914a0cdc81220639d6e2a4477325ffb54f5455d41cf31","openssl/include/crypto/sm3.h":"44348ac98ef8a9df7c97b0d4b25b7c23988f8cfdb84735a26a42af16c3e86665","openssl/include/crypto/sm4.h":"aa3d6e0b83ac31f0d872f01998c77599cfc495a354df7eae6077b944a7b98daf","openssl/include/crypto/store.h":"efc483671c0eaac885fcc08e7c276d3e4b5d7b96ffc21aa36b2eb41ef400ccef","openssl/include/crypto/x509.h":"85366be4487887074f6664102a10b945e566b43a12879d165cb938a11777238d","openssl/include/internal/__DECC_INCLUDE_EPILOGUE.H":"53cb536a751a1a309e098aa662ed2f4b8e0dabe94a6274b9e513135179e6458a","openssl/include/internal/__DECC_INCLUDE_PROLOGUE.H":"021f571eef8cbe45c0cd6520aeb12499ac31154fee331955e5a505fbc3762570","openssl/include/internal/bio.h":"a59fe352fef0747629706586a703f2bed34ad576be4de75b44c7a88641435f5b","openssl/include/internal/comp.h":"0bf68d4852d8387bb24b3c6b2129c56070c84f9841fe53e747cde57bbfe61da8","openssl/include/internal/conf.h":"5fb5edab92a21ebf3387f975f8030b702ae306c000c9933c5a1893dd6c5d47cd","openssl/include/internal/constant_time.h":"fba4e88378e1a76418dce375f88a94726671fda5161026f68d4ee398673c48d7","openssl/include/internal/cryptlib.h":"d85479ea9a0f508c944b3f0eac1c7bd9d55d1a9de990cd1379c8b645591f4fc5","openssl/include/internal/dane.h":"2b15667713ae1dff795754cfeddd45dcb497db6720bb6bef1512ad9d761cd77e","openssl/include/internal/dso.h":"c2aecbb40f3b210aa7401b6f3eefc4ce94bcc4b2313917c6ff9ea2b1a8e5fb8b","openssl/include/internal/dsoerr.h":"5c8a57e223879f21d50e9275512e7e0c45a959273ab9932bb8acace1fa625782","openssl/include/internal/err.h":"ecfe3e47674b053c612631cedf1739dfd4f2548ea14e2909539d8c8c38958780","openssl/include/internal/nelem.h":"aa9604f58d464853c47ec7d6beaf09ddeee04dedcbdf7ee8b5132ce5aca19863","openssl/include/internal/numbers.h":"dd67067fc220a479fd1e57936803c8149a6dfde46fb45fc1998bfe51b0f5d9f9","openssl/include/internal/o_dir.h":"1676a17c45a6a8b98290640bc57f2bc6fbaf89a54a01342e65f40d3cf9a7f02f","openssl/include/internal/o_str.h":"661d9dff184260ecd9705dcb72011934314ca0f9103723c4238397dad1333c3e","openssl/include/internal/refcount.h":"cafaf8eefa9690f3e6a0f49f7fa5900bd486099a5c67436012bd7b4f06c4201a","openssl/include/internal/sockets.h":"a1272a6b01c707292ec11f93ee074994ca2ca8cbacf5e09e6b9dca0faf0c95cd","openssl/include/internal/sslconf.h":"8f643e91886fb1fa9aaa4f7106aa360e31051fbfa4d78ae2440caa44203093d2","openssl/include/internal/thread_once.h":"76a3408ae6a68a59fe6d0ccab432644ae3d4dbee5a35973e2466d323720b974a","openssl/include/internal/tsan_assist.h":"23841bbbe658bca580f743db285dd6d0d1ce8af8ce5fe755df11995060591cdb","openssl/include/openssl/__DECC_INCLUDE_EPILOGUE.H":"797eeebf0fefaf464c6b16b02883cae3bf629de7610d48e9c4ba5efeefd67842","openssl/include/openssl/__DECC_INCLUDE_PROLOGUE.H":"57b996ee571c00c298204b878fae1506e594655c15b6b751ec26b292f9d58337","openssl/include/openssl/aes.h":"f6ba27e87d97ea578f01540a8f84b7eab05d42c178badce712d0cc668d8a9981","openssl/include/openssl/asn1.h":"851313b1176baa3d6896aaeeebef56216ebdd38dcdabb39b3eca36b6645352bc","openssl/include/openssl/asn1_mac.h":"db4883ed3aa74e07338001b31ec7e3e68546521c54bbdfe68c473b33f8511ca6","openssl/include/openssl/asn1err.h":"b89b16216ddd35f028f5bfd3fe0db4f2ead6c9415e7749b7115b0393b427ef2f","openssl/include/openssl/asn1t.h":"2702f569302248b8228e493177cf0a469f127f1ce5c76bc684bc90fbdfc45743","openssl/include/openssl/async.h":"ef96c716cac393f2cd6da304af029155ecd9f021869cd5a4c341ebdf249036bc","openssl/include/openssl/asyncerr.h":"cacc9ca951aa523d3ed6b9df2366022633925a6729d30cd134a05d2ffe5fb156","openssl/include/openssl/bio.h":"78b055555957eec2bfb4ce5f91b27bdcfdf73128026be9ce85fcca0126fdcd3d","openssl/include/openssl/bioerr.h":"ad29fe4ef37fd7c4b256b690caf9371a74e29981f6561b94436dac54a61bf74b","openssl/include/openssl/blowfish.h":"813b2c7cff888b5b709b90d4da584afef59b5ce1ea888617d682f1af48578faf","openssl/include/openssl/bn.h":"8f79b29c5ad479186acaae962a598d9868dc434fd5fa49a008eecfaff1b998ca","openssl/include/openssl/bnerr.h":"daacb00f416075ae470723f764d0ff9703f4a5fc31e881e1be8937631de7efff","openssl/include/openssl/buffer.h":"a4fa292b903cb8c2ce1761ba4980cf5bdfb66dcadcbb5c8aecc45b012bc64c23","openssl/include/openssl/buffererr.h":"722f6ea87711b7c0cb6ee29c15762c2839e5ad17b9ef579b6e81b6121f035c30","openssl/include/openssl/camellia.h":"561bdb2e985458e809e656c60e4bc83e1d6707746dd8b5badbc10b64198d4770","openssl/include/openssl/cast.h":"a14c51a129b3ae5795dafd98065be0bb0cbf00b4d4528e85adbf629966f42f53","openssl/include/openssl/cmac.h":"75bf95d1da118ff1e2f143ccb7a564d949de440097b97a49725c03976e167b52","openssl/include/openssl/cms.h":"07e4b0a779c957ef9026d69c0cb5a621ddc2060af967e0dd5e91ac861fdfbdb2","openssl/include/openssl/cmserr.h":"086aa0b661ba9de9618afc948a4d1a82df970a406f6c5bb6fa60572a720a62f0","openssl/include/openssl/comp.h":"98a877c62723e6042e4e4740cd1a6e7799df752d9234386d73a28a098e6eb31c","openssl/include/openssl/comperr.h":"f64be205d08af2557187ec19c03678aa9e29f66e428de29cebdd62cd7c3b5515","openssl/include/openssl/conf.h":"e54341e30523dadc09d821366f5afb13c9286d540b34c1945406918ed588fa21","openssl/include/openssl/conf_api.h":"175f86b69b58b0cd1da6c9b27d87ab4e4ed52f37dc76b7895c210c43469504eb","openssl/include/openssl/conferr.h":"abfe26485cd43a80e0c476e628979612ad28a635577baf68eee476850425a498","openssl/include/openssl/crypto.h":"d2cd84e695e68051fe67fa7cf901ccba4fadccc71a6b30090df20a01b91d3ec7","openssl/include/openssl/cryptoerr.h":"e752d7d3da32a6c009cf264450726367fd69e7c2a4c185d580ce650021d68e7a","openssl/include/openssl/ct.h":"b27aaf0d39609500b4fce3b3b65f6752116acb30420de1d53943074a481043f0","openssl/include/openssl/cterr.h":"ab6e70b52e341247c4b217883980ff1e98e4453d1020b0b038cdbf096c4ab8a5","openssl/include/openssl/des.h":"3cb68fbb498e34e19e46f9d41561596ab69ccf78b1d8bdf2f312e892c060015f","openssl/include/openssl/dh.h":"f56e0c29c124017c815c6f3d0c2413e03c81cadae2e84c2c325fc2c6719fd559","openssl/include/openssl/dherr.h":"9b1f7019d8d95e1d5fc5268089e8331829af7416b18a8908266ab60027aae0e3","openssl/include/openssl/dsa.h":"1525e5adf242643a7d36312580314f5ce61ecadf82223a49ff5c32220d78f9b9","openssl/include/openssl/dsaerr.h":"65ea8b47cb25ae82d611337cd47da7c1c5cdb9451982beec9d841413d4a923a9","openssl/include/openssl/dtls1.h":"7304f17cc9998bd7c16539ae9a5ea545f2e0c64086d5e688caba104b6a7ffecc","openssl/include/openssl/e_os2.h":"87c55abdb4755ffc04cd5e35a36d8b1ff2f19f3d8b9c7ef10357a78ff887503b","openssl/include/openssl/ebcdic.h":"2289f14f11e75ac739d1123651d16e841f3c74e36daa483c1fed9f8c5c144720","openssl/include/openssl/ec.h":"2a2d02e5c3b982ab2bd0d4e0a1c56e3daa3470c165aae427211a529b7dad8b06","openssl/include/openssl/ecdh.h":"95fb89add3bd32b6d43dcf1a51d1839b915e774d7138afaf618e690efbf414bb","openssl/include/openssl/ecdsa.h":"95fb89add3bd32b6d43dcf1a51d1839b915e774d7138afaf618e690efbf414bb","openssl/include/openssl/ecerr.h":"85a3b64c0644420a18295c8001a06bad5d7c3e84d4f871c925a1b45fb89ef182","openssl/include/openssl/engine.h":"0db45763a43c17d78a4a0b3fda207ac0be4781ebdde45f04fd4b07a5ced46086","openssl/include/openssl/engineerr.h":"6f3d1e91ba1b7971929530cb8ac3ef934c0b82a8cd459caf224e241a3e5ad6e9","openssl/include/openssl/err.h":"1447263f0a840e8135c586e16c3d858cee939deddf4fd905e391869809b4daa2","openssl/include/openssl/evp.h":"9d963bdda81802988170663ccfcef437aea69042f42aef3a11ab4a217b800aef","openssl/include/openssl/evperr.h":"45d68b462f25239488c020bee5fbf69700b0cd7b4dc2b3ba7015bddc499476a4","openssl/include/openssl/hmac.h":"76386c2273f105f54c5749f2fc854573c371ab185f9248ce295a748e126caae8","openssl/include/openssl/idea.h":"bab682c5cc06027c82d126ed8e65d7dd9dcc75fa464ccbc95d7f168bd69c732d","openssl/include/openssl/kdf.h":"aaafd4a962ba9b9f2a2462076c7f7b4991d9d87e7bef71d87e9308125e0e29c0","openssl/include/openssl/kdferr.h":"e406cbc8a8a7956bcb0e06a949454b48d2702339caf4a2e621ac0cde9c2463e3","openssl/include/openssl/lhash.h":"1036e20aba00e0585b96b91a00ae7792dc12501160e117d1f824833de7fe3752","openssl/include/openssl/md2.h":"9e28f0a8d5e2297649af298f5e3209d32fe9486edb1793cc698a757c91270662","openssl/include/openssl/md4.h":"03d3fc9dceec6c168d219eb9f404ca08b478d5521622834bc24b7d45945702e4","openssl/include/openssl/md5.h":"a0612a8f7e69e3bc166fc186ca44be1e5b1d020b5da8b5be021f73d48c270b82","openssl/include/openssl/mdc2.h":"f13b01ec09c45c2634673d1b9b1a79adbd6ec32bdff94287308e2bb27408e537","openssl/include/openssl/modes.h":"f4e527987e296a26fc1c06f4f896baa5f457b7e67f94957d176eed469b0fe602","openssl/include/openssl/obj_mac.h":"0fc1b228340e4c4a8c904a337af064de1ed83ed7ddedd1f4821d725fe62c8be7","openssl/include/openssl/objects.h":"4018d7c54e6f19c3230af063f4dbc8523f1450528a4af15a97a0a1ff3fb3ba38","openssl/include/openssl/objectserr.h":"0ec7330c122ae2b3174df95ddecea65ff661a6152cd0192529dd1411ef3f62a1","openssl/include/openssl/ocsp.h":"cfbbc3434b56c4671080326aeb8c3d007dab7d2c3621d5146c11aba347158b80","openssl/include/openssl/ocsperr.h":"c73a57b1919601ff8c04f2dc9c62dbd130ef2d3ae39bb0fcdf25bc9e6eaf327a","openssl/include/openssl/opensslconf.h.in":"012ddfa5b7930fb023588ee96e777a7ccb7e1eb5c3d984e9f1cc4eb90314cf1c","openssl/include/openssl/opensslv.h":"0bc426b46d9bef92180d5d4f520a046802c422af79486578c7e25afcf6dfc68d","openssl/include/openssl/ossl_typ.h":"46f541a1cc49bf08908ab3bde05e2683fc56ea268ca3e7f2e27628653ecb4a14","openssl/include/openssl/pem.h":"32d62036d0c35d03fe7f7ddaaffe3caeafcf984ec16e4db7ed19d3e202e9d7ba","openssl/include/openssl/pem2.h":"6833ee5712125d1ce8f7b52437a752e40c2f4793276859a8228c0de71d35c3e0","openssl/include/openssl/pemerr.h":"d91c6016f3c1ba70683b92fde55500ec334777defb6486c41b0a9c4e402aa295","openssl/include/openssl/pkcs12.h":"97c129c6c9a493d7e5d3af123d96040d87c4e54fc5e41aec450832cb32a634d6","openssl/include/openssl/pkcs12err.h":"b7340727a0480f351823b669f55cd3989c065d373c8cf6ff8745b8356f61d5ff","openssl/include/openssl/pkcs7.h":"cdc3505c9bb9168a6fad434dd9d9a49ad630b9ae9216bd665b11051e04a709bc","openssl/include/openssl/pkcs7err.h":"ecee11e9fbddab20f78a018009e6a2daf287ff5df00679298b137fe9996d9386","openssl/include/openssl/rand.h":"5a91abcbdd14dcf2fc62761ccc58ee9407274ea558c292fa77ad625204ac2bd7","openssl/include/openssl/rand_drbg.h":"12379cc0a7f168cbff8e08828da72dc0e87773bc6c3bd14c4b57506339b61fa5","openssl/include/openssl/randerr.h":"41fcebfb0767afa03f3de2732d3f0ce46cd2367ec34b2016cdb5c9e84a9a8994","openssl/include/openssl/rc2.h":"ec2b9196898bbc45ff2ab00204f93a6f20c974225510f29097ad69a6eeebcdfe","openssl/include/openssl/rc4.h":"6fc023442f524349685d13d50854ad773b12b8c7a153d72d615ab27dd4a3d609","openssl/include/openssl/rc5.h":"c238954a1df23f52362d6e5fa78df2c7a5a2ad6ef9536e489f0a23295efa0cab","openssl/include/openssl/ripemd.h":"8c74b93c10a9e83abc17ced3a8021af7506f39a0fadab07b5db2d4faebcf68b6","openssl/include/openssl/rsa.h":"509c4db9081195cf6c9e5fd4683890aeb39509f2997a1989dd5a57cf43039bc2","openssl/include/openssl/rsaerr.h":"e032a933b1a4c13ec901d7561ad23ace01881b60cdcc86af0e4cb0a25a2a3252","openssl/include/openssl/safestack.h":"57665dabb37f4f0bd853539d93c64cb8adf37fd9552dc9fad215cc8f47a991c4","openssl/include/openssl/seed.h":"6bf2373dfb10dc5cbc626cf2fe86b9b1c82373d799bdd6be13eedaf7d4540d55","openssl/include/openssl/sha.h":"0bb6745481ac56b67f450d09033e813bf8f6a5f2025e90d5eb539eab1ad5e323","openssl/include/openssl/srp.h":"82a08bf9a866dec1b7deb66b4077690cee0f6caf91eb00136c5eed4e8d943d06","openssl/include/openssl/srtp.h":"e50e2dd5df6a0db219091cd1c6768a6d319ef6485b16e1f361fce43067847626","openssl/include/openssl/ssl.h":"c60006f61d48ec19032b672194b5ee7f535f9a537125980dae2006b7d21cca1b","openssl/include/openssl/ssl2.h":"7fb557a32488ad44a25420abff8279abd0bd1f4ab768e73d3e1d5c2dab36c0c5","openssl/include/openssl/ssl3.h":"d04cfec2a9f9da2aa299f55884215e200b490a6e0a9423255262648bd8a6d1c0","openssl/include/openssl/sslerr.h":"54a3c784ebfab631d21bb9b7db3ce38167acc0299e8920b5ce6e419a3736930a","openssl/include/openssl/stack.h":"45ba803bbe14007e494bb24b2ca954f6362ef700a10480efa3d2f3acb159deec","openssl/include/openssl/store.h":"1105bad1a309d3122a2cfbdc4098a33e33d50c8118e70bb332f3b7d6ef2bbb58","openssl/include/openssl/storeerr.h":"071c66bcc03ed5c2a24f1964f45e8d1a633f3cb4b183c718ded3e25312f8c4e0","openssl/include/openssl/symhacks.h":"0c9e026a5932a2432e3cdf7defb789610c4272010e51e5ff0471809eabb7aa2d","openssl/include/openssl/tls1.h":"d4104ca8720332b9852f4725d4660a6cf77a52b587e7d96ec263e996c1d0ae2f","openssl/include/openssl/ts.h":"9bd039ebce7bf6b6e71fc9667e44e017fc0cb7c79c023be1c965894e61b79238","openssl/include/openssl/tserr.h":"b6e1bbc8c53e4f7c054768dec55272d001dfbfee788a85ba8b0c069e08cbbe85","openssl/include/openssl/txt_db.h":"903696bd5b9908530f8a8578fef47721f47f3fe8507bac7761473e925e942159","openssl/include/openssl/ui.h":"f5ea3f5d2e7beb3e81db8c23c6e618e38e511c213fd93a11ef51b9ae4ad03619","openssl/include/openssl/uierr.h":"bb39377c702d9765547ce95f9e758b46a54ee4e2689f892033cf2a4ea57d5d0b","openssl/include/openssl/whrlpool.h":"38750722d1737083fa8caedfccd3bce574080e35692010d2f91dd303b154af69","openssl/include/openssl/x509.h":"f1b8b356d649da24236d5aabdfafe047b516b2008d8d5d09da5e99fbc4b4a98c","openssl/include/openssl/x509_vfy.h":"f621ac4c38a89bd010656ca00937773126a7ef348b29a14b04cc5ec5c095b531","openssl/include/openssl/x509err.h":"622499b9aaa546957c802da9aee36794c24c9c7d2e105ae69b47841ecdac6b7a","openssl/include/openssl/x509v3.h":"18648fb56b57553ab0c42597609a8f8963516d73f9b787db188020d5ca87f3ba","openssl/include/openssl/x509v3err.h":"3d17dcca277cd6f6373a30a6e07e1a2c44024a0b980ccccc2533d78bf0c22776","openssl/ms/applink.c":"461a11e8c465d61de2357631e7e8367eca3da7f11ad744f490cb56a1ae80115d","openssl/ms/cmp.pl":"e9df8d951dbccb63ea68cdff2c925cbcb7b06764e6b3d74497c7b19e15a8622c","openssl/ms/uplink-common.pl":"7001833c39f8a008d3a0d645347ac0ccc1d15da7c7a571e36bb32710bdfdd413","openssl/ms/uplink-ia64.pl":"51661e5c5d95e674821483ab1c45adb96396911e974a531a1032e480259dac78","openssl/ms/uplink-x86.pl":"ea08cabfe289d4cce9393f9ea586cc468a35f99559aaba6bc98fcb67a5481558","openssl/ms/uplink-x86_64.pl":"58b78e367a56ab276e412a0268a0a88d3ac1e3b62a550ada222e8db6f211a4d8","openssl/ms/uplink.c":"c584dfff58d520c04022e32440ff66d4a19706831478a63c677d835e0eb2d999","openssl/ms/uplink.h":"9e372fe99a844954b80396b6487a6612f41ce4a67aea99507b15f8eab9cf2a8d","openssl/os-dep/haiku.h":"a3623a1ab97b62e79877ea7b54c1e9718ecce68b840b71fdb717c0c5f3bad04e","openssl/ssl/bio_ssl.c":"6345e4ab8ca8d37380bc2e85992c39635e03600297f615a39acda7724362897c","openssl/ssl/build.info":"150b3b41dc79f23250be61fc6adc9d1e041dc4589f8f60ae1f975ea3e1dfc5df","openssl/ssl/d1_lib.c":"1b220dc2e2beccdded497420ae909a9385af0c13fef0181cae3c9cac53211910","openssl/ssl/d1_msg.c":"b5370bafab09971437eef70f2380583e1f405908e8622c66ac699a9924d2bf5b","openssl/ssl/d1_srtp.c":"a5a5762a5609b3c705f04730b7860c10a77e4903b6a4d58f4d0c7d94abeaf487","openssl/ssl/methods.c":"704f7ed24dace6561b5179dfa5aaa7258e9599c49f24b8f8a47c37a80109086b","openssl/ssl/packet.c":"920b71e2ca4cbbc70d4e844a47d5101fe0b0e82300d0154a823b8879c2e8731b","openssl/ssl/packet_local.h":"496df2d06fcd70f7c1b77a44b777ba0f856b44e745da9570ec10ffc312da359a","openssl/ssl/pqueue.c":"7a2cc45afa28e7d72fc2f4ca66fb17cce54c2064ce4613975b0b2c1eaeaa05fc","openssl/ssl/record/README":"daa21a1309c257a48a089abd2f65f521ef442aef1428c5cce50af24ae4b586c8","openssl/ssl/record/dtls1_bitmap.c":"be1e12c5b264d22aeea4a3538968f4865339f1cf3f93c9eb9127d85ceef1115e","openssl/ssl/record/rec_layer_d1.c":"376e22d7f9bae9ee68bde03ff01584bcb90b42aa8d94a6df9c5783cf79f209e0","openssl/ssl/record/rec_layer_s3.c":"e5be5c770874840433b3f21ce063d846502b5d7a5b2a409191b88f5eab309b1e","openssl/ssl/record/record.h":"53f3e73b8849b2a6460cd85252da7a7b58df4e9ac7e7871859621285c20be85e","openssl/ssl/record/record_local.h":"6569f176c637367a206f2c645c9d3f95b8dfc212a2e4ba824ef8cef11699b72f","openssl/ssl/record/ssl3_buffer.c":"893f86054c63de62a23948e49f4329a703127607ab89ff91deba34522b72d3dc","openssl/ssl/record/ssl3_record.c":"0c90e8eee65e651e0e6fd13ed7ea0840b2b82afcc6f988d121c727c0dbca1c23","openssl/ssl/record/ssl3_record_tls13.c":"3b8801561edc994eee91c7f6a05a850fc653c066ee0b9ce37e4ddfafe69b52ba","openssl/ssl/s3_cbc.c":"6e097416a5b0a5135cf2617d23c18a601bfe195eca9d1310f5e795ef575ef19c","openssl/ssl/s3_enc.c":"db6fc3b770d4184dc9ef32f86729309bd2d1b45bc6b8ada7d647292b5b78afa0","openssl/ssl/s3_lib.c":"828d45c992badf1f9bf6d137dc95a934438db203b7c3a00268ded6d17e5c2414","openssl/ssl/s3_msg.c":"4214a537d49ccab981ea79bf4dbb24c2791c619a72e0ad2e551f4a3a0f1919b7","openssl/ssl/ssl_asn1.c":"0404e563aca3f0d69140a72a0c1f44e86ce092e90213462f9423022352c5ad81","openssl/ssl/ssl_cert.c":"98467d627794dd19c9de7477e7901a769aeb0cf262754bf7aefdbb7db47b9ae2","openssl/ssl/ssl_cert_table.h":"3a4eb66c0ee057b35cfd4ef370af76534d4ee3e73067e0b6cd557d3be6de97e5","openssl/ssl/ssl_ciph.c":"37a21a9416fd0d59de56fe673b2c086a0d4437425885616e3c0e4f9a7245b2a9","openssl/ssl/ssl_conf.c":"a0cf59e3376cede23fe0252beea1b146d10c018bb0dc69f68000e136e5dfffa0","openssl/ssl/ssl_err.c":"bc5e7b735588f64505edf0c5bc80b80302f6322e4f2af9762768e4b699eaf568","openssl/ssl/ssl_init.c":"2710e8af761297bc577d102912ebc6415ccf2c8fa27ef4124afa1b188e93bc1c","openssl/ssl/ssl_lib.c":"1d7df9f9894dfe9ec3de71f17a143e47d8214f0f0c8d2383addfae0336845b8c","openssl/ssl/ssl_local.h":"5ba77a87af8459b1032732745eb0251a914c22280970f5e4766df3ff3952cf4c","openssl/ssl/ssl_mcnf.c":"4192f0c8da609fef9f19ec4b5c4c6bd3713a33ff28c2f076c662c2dbf0a1eeac","openssl/ssl/ssl_rsa.c":"3bce84b4619f07adb900d210e432e1c5c49a4cbe3b12cf89ac2276b928b15719","openssl/ssl/ssl_sess.c":"e12d08d823477f0a29b8cafd153ba8992075cfcfd4567d1e3a5d93ef09d62f13","openssl/ssl/ssl_stat.c":"032df59c03043acb5c7b4a5ec6926461e39d1bafd5b52f855e6016db16f156e1","openssl/ssl/ssl_txt.c":"b0f6d0c6ccd58a5a267a71557f1079925d406853ebe72e6b46c99343597d589f","openssl/ssl/ssl_utst.c":"69295713d556992c0bb615ea09f15e4618ae98c9b703c42efec88d1a228bf43f","openssl/ssl/statem/README":"10b892c88639c2e6b008e95087a17506758bf307b9bfde993982b29123ea17e0","openssl/ssl/statem/extensions.c":"beaaa396d1d9f543d92f59af5c35a65a2dc55d18e6eca278ebc1d9e931e87610","openssl/ssl/statem/extensions_clnt.c":"bb7a17467fd6377c1e49514234d63fa569626b8067d102f187bd2106b3c0d48e","openssl/ssl/statem/extensions_cust.c":"92f108de62c669cf884888c266466e03831f5203f06799566cc1fb16bcdde663","openssl/ssl/statem/extensions_srvr.c":"4bf68d447d597998de82caf208b0dde6415647ace5c481b090c018636a163f00","openssl/ssl/statem/statem.c":"ea1ff60c9a1053f275568758ffad59ab3c3dc1073d54ba006154c6e6fb1b6af6","openssl/ssl/statem/statem.h":"28fb0cc332ab8222ea7c0087fc99aee4a9b049de6c6ccecbfa9aed80dfb89b8f","openssl/ssl/statem/statem_clnt.c":"40ffcc6ec69987c04e850392679e668c942c4e6f851ac82a1b13beec8da83a3b","openssl/ssl/statem/statem_dtls.c":"4d57a32b5ac129d63f6eeae674d6fef6e565dc9222e168a3d5fab65867c61487","openssl/ssl/statem/statem_lib.c":"f220dc8309c52db42e693f84aa7222c1c152b70e7f1d72a73b97e08e702f3076","openssl/ssl/statem/statem_local.h":"1f787e9d09cb7bc872d1adcb6525834145ab87d0db3f99d45c77bc699c3f30c3","openssl/ssl/statem/statem_srvr.c":"8f1f0ee6214b8cc1218d7f71775e252245eefe1b1174dea0545e67bf9ce93ea0","openssl/ssl/t1_enc.c":"8437b79d584c1b20764230b2bd14ff9bcf86b89dfe2ab1ac81d1007166146a12","openssl/ssl/t1_lib.c":"f9de6539ae40752ba3ca069079880d58bc83e8e9733c54a8dc96ac1088c40195","openssl/ssl/t1_trce.c":"585bd13faf56b2eb5b853e873b58ee4bef7b46560c532a9d5947aa8402f42a9a","openssl/ssl/tls13_enc.c":"c9569dbbbf430780aee2a919a943c3530ffd379bb8c849b35320e7b3b125c0e4","openssl/ssl/tls_srp.c":"0f863a2373bdba22d2186373c1a9a5c3a0ac4ba421731e36f0980be2c20c103d","openssl/tools/build.info":"4ead731019edb0b0dbd7b72993c59498e3a645d0472e54b0c41cbb11c20eaebd","openssl/tools/c_rehash.in":"c31886b1f47525f6642b0e7b93988aa63e3140b72ca8ec214559aa68d69bbaa1","openssl/util/add-depends.pl":"d2803c17b68414cc6be7d00ce0051d6f362f72cc7089826817d9f4b65fd6d38c","openssl/util/build.info":"f65db6fe6a0ad3669696a3f5717e8291fd8ab510963febaee8009cb2974bc175","openssl/util/cavs-to-evptest.pl":"fecd65d728fa532e8ef3552f25a838092432be90d52e86346bbc635dba01f414","openssl/util/check-malloc-errs":"b8cc85a985270733195081b0d682a8b89c5342e26ee61a4d794b082844381bac","openssl/util/ck_errf.pl":"acaba574c5b151f4d252dc4adc4741660cc83f0a3d6cae5f2b5faf0401864db9","openssl/util/copy.pl":"e2dcac32a8cb1618e0909cceeb674689fef22805687187d31a235ccb10a6534e","openssl/util/dofile.pl":"61c0a8ec7b57c34e12999908bcdf2671025750dad95c1697bb6cafa8f853f9e5","openssl/util/echo.pl":"d8a0f4766d83ea8aecdd8e361c8866b9d48f40fd50ab15968d35fd54ef521648","openssl/util/find-doc-nits":"eb9b0be06de855af7d557e25f028acdb5f6de4c17c1f0a1db14157ba48d60481","openssl/util/find-unused-errs":"2b904dc493480c41d9799120870edb9e0c28c243a91029d46e0aece8cc5ec4c2","openssl/util/fix-includes":"f9449e929856883f67a89a5d4fe281cd9014412647d739b533832ec80de05098","openssl/util/fix-includes.sed":"68bf0c81208821f306504679015b873881518d7850c699d4f296778aadcb259a","openssl/util/indent.pro":"3eb0261eae9a79d889074d893fd5690e6d46ee55e5b59a819b14a093f6269725","openssl/util/libcrypto.num":"4ce1907d53f783902093eea555b2c7808b523ae0f17058a5b5fb093100d6772e","openssl/util/libssl.num":"673d0209d71fe17c4cf0da2757603f3c1c10b33408a95d196cf9b14c15f79af1","openssl/util/local_shlib.com.in":"f267e61b6cec87c33bfebfbb68629952117c0f78b299781d47deb73a887e7257","openssl/util/mkbuildinf.pl":"855b17d7158e1a556fda698a179c9ccb193339f7757c2a491b3ab07a1a446614","openssl/util/mkdef.pl":"2017340e077b0de03007e8a802ef1508091fe5a9d7abf5ed9a89bf011781b699","openssl/util/mkdir-p.pl":"65c167a1b75a426fd971403c1841450b7c094cffca3b9075e900108c5ab9d4d7","openssl/util/mkerr.pl":"ac7c8be131ef1ad3ebbb9ec5efd2b07fb9ed8726c2a9edf19c6e0e3ac63d3ecf","openssl/util/mkrc.pl":"62bc9b3dea2536c73498a9a7e0a21fe2ebdb5504888175dbcae3715e285df26a","openssl/util/mktar.sh":"67843c53a1f595020d029a2fd32a5097d07b11886f1ffa642af18ecd45038d9f","openssl/util/openssl-format-source":"9933005b6d8a87777cd4290d5b928970d870d73439c69b75b66b4c5965dfdd57","openssl/util/openssl-update-copyright":"a07ca62389f204668d4768a5eaf722e3260fe1d0a46a5174ead31d3a1a102d39","openssl/util/opensslwrap.sh":"761e5ea2463e754ad9f326cbf3571b8c0f1a0002706a24c393354e4f48c444bf","openssl/util/perl/OpenSSL/Glob.pm":"4100606067f0b577d3e6d2d2aaca93d826fb66105639eb94ff76c70ae8c526c9","openssl/util/perl/OpenSSL/Test.pm":"7731f2f84da59f641039b82bcfaca312a0ed23eea5e7ae2b748ed188bd26b0ed","openssl/util/perl/OpenSSL/Test/Simple.pm":"20f978dce212a8631ce0e6b133e26d55ff3043b84a4b2cd19ba45f3da306b1cb","openssl/util/perl/OpenSSL/Test/Utils.pm":"1e31fa3ea00ff98b3457a3ad98af046f33549bd2466da29bdb00f0d5516aaf87","openssl/util/perl/OpenSSL/Util/Pod.pm":"78c4cfdc2141d24e28e5972003d8a3c437d2d47e049a47bd2f63217da261168d","openssl/util/perl/TLSProxy/Alert.pm":"23a9d02adf3f04d93b5357952a823487f4e6bf6685e655f9f640f1b588f89e79","openssl/util/perl/TLSProxy/Certificate.pm":"bba9c1ecdc254560be9fd55ff2aa576dde3e52a4482668516eb899b448e5b222","openssl/util/perl/TLSProxy/CertificateRequest.pm":"c893eddba002f097a2c48743795842b6c7fe663d4196a8066aabbb452e7d0214","openssl/util/perl/TLSProxy/CertificateVerify.pm":"97c5e987444f7e368cbcd774f0fe71597e852b0c081b3318c1c51ae6c74d5ea9","openssl/util/perl/TLSProxy/ClientHello.pm":"3a135c1f736b85d964ba9b9b011f8216cc65563d258e60c0c163b99d2e032e2f","openssl/util/perl/TLSProxy/EncryptedExtensions.pm":"ce1b5f1a43a33d80bbc726011e5c5f8973ac3cc7b07708a8af47ca9ac1e1a371","openssl/util/perl/TLSProxy/Message.pm":"a1df25e8a4233b7cc61bec81ae9bcda03f2ab4e631241bf30574e1c011ee036d","openssl/util/perl/TLSProxy/NewSessionTicket.pm":"6630a0f249c0a5a429be1fb690b0d1d36d6363d39aa7607f799d6dced0cbe9d1","openssl/util/perl/TLSProxy/Proxy.pm":"ca621a4ba020cdfb2d2fc2e7911c08a770f967f55855b7f38eeec3c4c158a688","openssl/util/perl/TLSProxy/Record.pm":"a878d1b039efb4a2f3c2868d20e568170816c4bdb824b56c822ca6cbe6e26428","openssl/util/perl/TLSProxy/ServerHello.pm":"ece612e81f27fce4b8106f82829f224f6b384d3d99eb21770b81e6daaf959d33","openssl/util/perl/TLSProxy/ServerKeyExchange.pm":"48754f76d9ff1be6a4c0f6f27b6bf0fc91c5c3594636332870a25c4590267493","openssl/util/perl/checkhandshake.pm":"e625a1c11f358dcb9e2d292ba36ebfa7b14a5494fc1c8020e8a082770dd98aea","openssl/util/perl/with_fallback.pm":"332618a0267a1a5145d82c8e37b663e5bf555d861e3f2851e0f2a25ca2cc90dc","openssl/util/private.num":"37c2be8df423e5064576166654a033af30801303a0f4ac71a27d4a95463ca6c0","openssl/util/process_docs.pl":"a731d563140e90c91e07132183f7c41b3c5b9ce12460880b14ffa3d738f72d98","openssl/util/shlib_wrap.sh.in":"517e70558005286dbeb506ce57a416934560a2f2ff27f5bb48d4472ff8c5ca7c","openssl/util/su-filter.pl":"892daa1ba38762cc5cfd94a204618a0abb2a539a821e237946c93e774fd35f47","openssl/util/unlocal_shlib.com.in":"21e064aad7466030be7a452982a21bb50059a9634185d312b18a5d3a5582ee5d","src/lib.rs":"65a4daf6f0d6ad80a83d63614288c3a9df9adcebe5f3d7ff2ad34dd3d2c75196"},"package":"7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "openssl-src"
-version = "111.13.0+1.1.1i"
+version = "111.16.0+1.1.1l"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 exclude = ["openssl/boringssl/*", "openssl/fuzz/*", "openssl/krb5/*", "openssl/pyca-cryptography/*", "openssl/test/*"]
 description = "Source of OpenSSL and logic to build it.\n"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/ca.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/ca.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/ca.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/ca.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -2223,62 +2223,51 @@
 
 static int do_updatedb(CA_DB *db)
 {
-    ASN1_UTCTIME *a_tm = NULL;
+    ASN1_TIME *a_tm = NULL;
     int i, cnt = 0;
-    int db_y2k, a_y2k;          /* flags = 1 if y >= 2000 */
-    char **rrow, *a_tm_s;
+    char **rrow;
 
-    a_tm = ASN1_UTCTIME_new();
+    a_tm = ASN1_TIME_new();
     if (a_tm == NULL)
         return -1;
 
-    /* get actual time and make a string */
+    /* get actual time */
     if (X509_gmtime_adj(a_tm, 0) == NULL) {
-        ASN1_UTCTIME_free(a_tm);
+        ASN1_TIME_free(a_tm);
         return -1;
     }
-    a_tm_s = app_malloc(a_tm->length + 1, "time string");
-
-    memcpy(a_tm_s, a_tm->data, a_tm->length);
-    a_tm_s[a_tm->length] = '\0';
-
-    if (strncmp(a_tm_s, "49", 2) <= 0)
-        a_y2k = 1;
-    else
-        a_y2k = 0;
 
     for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
         rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);
 
         if (rrow[DB_type][0] == DB_TYPE_VAL) {
             /* ignore entries that are not valid */
-            if (strncmp(rrow[DB_exp_date], "49", 2) <= 0)
-                db_y2k = 1;
-            else
-                db_y2k = 0;
-
-            if (db_y2k == a_y2k) {
-                /* all on the same y2k side */
-                if (strcmp(rrow[DB_exp_date], a_tm_s) <= 0) {
-                    rrow[DB_type][0] = DB_TYPE_EXP;
-                    rrow[DB_type][1] = '\0';
-                    cnt++;
+            ASN1_TIME *exp_date = NULL;
 
-                    BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]);
-                }
-            } else if (db_y2k < a_y2k) {
+            exp_date = ASN1_TIME_new();
+            if (exp_date == NULL) {
+                ASN1_TIME_free(a_tm);
+                return -1;
+            }
+
+            if (!ASN1_TIME_set_string(exp_date, rrow[DB_exp_date])) {
+                ASN1_TIME_free(a_tm);
+                ASN1_TIME_free(exp_date);
+                return -1;
+            }
+
+            if (ASN1_TIME_compare(exp_date, a_tm) <= 0) {
                 rrow[DB_type][0] = DB_TYPE_EXP;
                 rrow[DB_type][1] = '\0';
                 cnt++;
 
                 BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]);
             }
-
+            ASN1_TIME_free(exp_date);
         }
     }
 
-    ASN1_UTCTIME_free(a_tm);
-    OPENSSL_free(a_tm_s);
+    ASN1_TIME_free(a_tm);
     return cnt;
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/crl2p7.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/crl2p7.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/crl2p7.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/crl2p7.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -120,19 +120,20 @@
 
     if (!ASN1_INTEGER_set(p7s->version, 1))
         goto end;
-    if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
-        goto end;
-    p7s->crl = crl_stack;
+
     if (crl != NULL) {
+        if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
+            goto end;
+        p7s->crl = crl_stack;
         sk_X509_CRL_push(crl_stack, crl);
         crl = NULL;             /* now part of p7 for OPENSSL_freeing */
     }
 
-    if ((cert_stack = sk_X509_new_null()) == NULL)
-        goto end;
-    p7s->cert = cert_stack;
+    if (certflst != NULL) {
+        if ((cert_stack = sk_X509_new_null()) == NULL)
+            goto end;
+        p7s->cert = cert_stack;
 
-    if (certflst != NULL)
         for (i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
             certfile = sk_OPENSSL_STRING_value(certflst, i);
             if (add_certs_from_file(cert_stack, certfile) < 0) {
@@ -141,6 +142,7 @@
                 goto end;
             }
         }
+    }
 
     out = bio_open_default(outfile, 'w', outformat);
     if (out == NULL)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/enc.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/enc.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/enc.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/enc.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -81,7 +81,7 @@
     {"", OPT_CIPHER, '-', "Any supported cipher"},
     OPT_R_OPTIONS,
 #ifdef ZLIB
-    {"z", OPT_Z, '-', "Use zlib as the 'encryption'"},
+    {"z", OPT_Z, '-', "Compress or decompress encrypted data using zlib"},
 #endif
 #ifndef OPENSSL_NO_ENGINE
     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_cb.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_cb.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_cb.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_cb.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -934,7 +934,8 @@
                 if (!SSL_build_cert_chain(ssl, 0))
                     return 0;
             } else if (exc->chain != NULL) {
-                SSL_set1_chain(ssl, exc->chain);
+                if (!SSL_set1_chain(ssl, exc->chain))
+                    return 0;
             }
         }
         exc = exc->prev;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_server.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_server.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_server.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_server.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -133,6 +133,17 @@
 
     if (s_debug)
         BIO_printf(bio_s_out, "psk_server_cb\n");
+
+    if (SSL_version(ssl) >= TLS1_3_VERSION) {
+        /*
+         * This callback is designed for use in TLSv1.2. It is possible to use
+         * a single callback for all protocol versions - but it is preferred to
+         * use a dedicated callback for TLSv1.3. For TLSv1.3 we have
+         * psk_find_session_cb.
+         */
+        return 0;
+    }
+
     if (identity == NULL) {
         BIO_printf(bio_err, "Error: client did not send PSK identity\n");
         goto out_err;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_socket.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_socket.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_socket.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_socket.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -214,6 +214,8 @@
     const BIO_ADDRINFO *next;
     int sock_family, sock_type, sock_protocol, sock_port;
     const BIO_ADDR *sock_address;
+    int sock_family_fallback = AF_UNSPEC;
+    const BIO_ADDR *sock_address_fallback = NULL;
     int sock_options = BIO_SOCK_REUSEADDR;
     int ret = 0;
 
@@ -244,6 +246,10 @@
             && BIO_ADDRINFO_protocol(next) == sock_protocol) {
         if (sock_family == AF_INET
                 && BIO_ADDRINFO_family(next) == AF_INET6) {
+            /* In case AF_INET6 is returned but not supported by the
+             * kernel, retry with the first detected address family */
+            sock_family_fallback = sock_family;
+            sock_address_fallback = sock_address;
             sock_family = AF_INET6;
             sock_address = BIO_ADDRINFO_address(next);
         } else if (sock_family == AF_INET6
@@ -253,6 +259,10 @@
     }
 
     asock = BIO_socket(sock_family, sock_type, sock_protocol, 0);
+    if (asock == INVALID_SOCKET && sock_family_fallback != AF_UNSPEC) {
+        asock = BIO_socket(sock_family_fallback, sock_type, sock_protocol, 0);
+        sock_address = sock_address_fallback;
+    }
     if (asock == INVALID_SOCKET
         || !BIO_listen(asock, sock_address, sock_options)) {
         BIO_ADDRINFO_free(res);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_time.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_time.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_time.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/apps/s_time.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -263,7 +263,8 @@
          nConn, totalTime, ((double)nConn / totalTime), bytes_read);
     printf
         ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-         nConn, (long)time(NULL) - finishtime + maxtime, bytes_read / nConn);
+         nConn, (long)time(NULL) - finishtime + maxtime,
+         nConn > 0 ? bytes_read / nConn : 0l);
 
     /*
      * Now loop and time connections using the same session id over and over
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/AUTHORS thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/AUTHORS
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/AUTHORS	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/AUTHORS	2021-12-09 12:01:26.000000000 +0000
@@ -13,6 +13,8 @@
 Bernd Edlinger
 Bodo Möller
 David Benjamin
+David von Oheimb
+Dmitry Belyavskiy (Дмитрий Бел�в�кий)
 Emilia Käsper
 Eric Young
 Geoff Thorpe
@@ -22,14 +24,19 @@
 Mark J. Cox
 Matt Caswell
 Matthias St. Pierre
+Nicola Tuveri
 Nils Larsch
+Patrick Steuer
 Paul Dale
 Paul C. Sutton
+Paul Yang
 Ralf S. Engelschall
 Rich Salz
 Richard Levitte
+Shane Lontis
 Stephen Henson
 Steve Marquess
 Tim Hudson
+Tomáš Mráz
 Ulf Möller
 Viktor Dukhovni
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/CHANGES thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/CHANGES
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/CHANGES	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/CHANGES	2021-12-09 12:01:26.000000000 +0000
@@ -7,6 +7,152 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
+ Changes between 1.1.1k and 1.1.1l [24 Aug 2021]
+
+  *) Fixed an SM2 Decryption Buffer Overflow.
+
+     In order to decrypt SM2 encrypted data an application is expected to call the
+     API function EVP_PKEY_decrypt(). Typically an application will call this
+     function twice. The first time, on entry, the "out" parameter can be NULL and,
+     on exit, the "outlen" parameter is populated with the buffer size required to
+     hold the decrypted plaintext. The application can then allocate a sufficiently
+     sized buffer and call EVP_PKEY_decrypt() again, but this time passing a non-NULL
+     value for the "out" parameter.
+
+     A bug in the implementation of the SM2 decryption code means that the
+     calculation of the buffer size required to hold the plaintext returned by the
+     first call to EVP_PKEY_decrypt() can be smaller than the actual size required by
+     the second call. This can lead to a buffer overflow when EVP_PKEY_decrypt() is
+     called by the application a second time with a buffer that is too small.
+
+     A malicious attacker who is able present SM2 content for decryption to an
+     application could cause attacker chosen data to overflow the buffer by up to a
+     maximum of 62 bytes altering the contents of other data held after the
+     buffer, possibly changing application behaviour or causing the application to
+     crash. The location of the buffer is application dependent but is typically
+     heap allocated.
+     (CVE-2021-3711)
+     [Matt Caswell]
+
+  *) Fixed various read buffer overruns processing ASN.1 strings
+
+     ASN.1 strings are represented internally within OpenSSL as an ASN1_STRING
+     structure which contains a buffer holding the string data and a field holding
+     the buffer length. This contrasts with normal C strings which are repesented as
+     a buffer for the string data which is terminated with a NUL (0) byte.
+
+     Although not a strict requirement, ASN.1 strings that are parsed using OpenSSL's
+     own "d2i" functions (and other similar parsing functions) as well as any string
+     whose value has been set with the ASN1_STRING_set() function will additionally
+     NUL terminate the byte array in the ASN1_STRING structure.
+
+     However, it is possible for applications to directly construct valid ASN1_STRING
+     structures which do not NUL terminate the byte array by directly setting the
+     "data" and "length" fields in the ASN1_STRING array. This can also happen by
+     using the ASN1_STRING_set0() function.
+
+     Numerous OpenSSL functions that print ASN.1 data have been found to assume that
+     the ASN1_STRING byte array will be NUL terminated, even though this is not
+     guaranteed for strings that have been directly constructed. Where an application
+     requests an ASN.1 structure to be printed, and where that ASN.1 structure
+     contains ASN1_STRINGs that have been directly constructed by the application
+     without NUL terminating the "data" field, then a read buffer overrun can occur.
+
+     The same thing can also occur during name constraints processing of certificates
+     (for example if a certificate has been directly constructed by the application
+     instead of loading it via the OpenSSL parsing functions, and the certificate
+     contains non NUL terminated ASN1_STRING structures). It can also occur in the
+     X509_get1_email(), X509_REQ_get1_email() and X509_get1_ocsp() functions.
+
+     If a malicious actor can cause an application to directly construct an
+     ASN1_STRING and then process it through one of the affected OpenSSL functions
+     then this issue could be hit. This might result in a crash (causing a Denial of
+     Service attack). It could also result in the disclosure of private memory
+     contents (such as private keys, or sensitive plaintext).
+     (CVE-2021-3712)
+     [Matt Caswell]
+
+ Changes between 1.1.1j and 1.1.1k [25 Mar 2021]
+
+  *) Fixed a problem with verifying a certificate chain when using the
+     X509_V_FLAG_X509_STRICT flag. This flag enables additional security checks
+     of the certificates present in a certificate chain. It is not set by
+     default.
+
+     Starting from OpenSSL version 1.1.1h a check to disallow certificates in
+     the chain that have explicitly encoded elliptic curve parameters was added
+     as an additional strict check.
+
+     An error in the implementation of this check meant that the result of a
+     previous check to confirm that certificates in the chain are valid CA
+     certificates was overwritten. This effectively bypasses the check
+     that non-CA certificates must not be able to issue other certificates.
+
+     If a "purpose" has been configured then there is a subsequent opportunity
+     for checks that the certificate is a valid CA.  All of the named "purpose"
+     values implemented in libcrypto perform this check.  Therefore, where
+     a purpose is set the certificate chain will still be rejected even when the
+     strict flag has been used. A purpose is set by default in libssl client and
+     server certificate verification routines, but it can be overridden or
+     removed by an application.
+
+     In order to be affected, an application must explicitly set the
+     X509_V_FLAG_X509_STRICT verification flag and either not set a purpose
+     for the certificate verification or, in the case of TLS client or server
+     applications, override the default purpose.
+     (CVE-2021-3450)
+     [Tomáš Mráz]
+
+  *) Fixed an issue where an OpenSSL TLS server may crash if sent a maliciously
+     crafted renegotiation ClientHello message from a client. If a TLSv1.2
+     renegotiation ClientHello omits the signature_algorithms extension (where
+     it was present in the initial ClientHello), but includes a
+     signature_algorithms_cert extension then a NULL pointer dereference will
+     result, leading to a crash and a denial of service attack.
+
+     A server is only vulnerable if it has TLSv1.2 and renegotiation enabled
+     (which is the default configuration). OpenSSL TLS clients are not impacted
+     by this issue.
+     (CVE-2021-3449)
+     [Peter Kästle and Samuel Sapalski]
+
+ Changes between 1.1.1i and 1.1.1j [16 Feb 2021]
+
+  *) Fixed the X509_issuer_and_serial_hash() function. It attempts to
+     create a unique hash value based on the issuer and serial number data
+     contained within an X509 certificate. However it was failing to correctly
+     handle any errors that may occur while parsing the issuer field (which might
+     occur if the issuer field is maliciously constructed). This may subsequently
+     result in a NULL pointer deref and a crash leading to a potential denial of
+     service attack.
+     (CVE-2021-23841)
+     [Matt Caswell]
+
+  *) Fixed the RSA_padding_check_SSLv23() function and the RSA_SSLV23_PADDING
+     padding mode to correctly check for rollback attacks. This is considered a
+     bug in OpenSSL 1.1.1 because it does not support SSLv2. In 1.0.2 this is
+     CVE-2021-23839.
+     [Matt Caswell]
+
+  *) Fixed the EVP_CipherUpdate, EVP_EncryptUpdate and EVP_DecryptUpdate
+     functions. Previously they could overflow the output length argument in some
+     cases where the input length is close to the maximum permissable length for
+     an integer on the platform. In such cases the return value from the function
+     call would be 1 (indicating success), but the output length value would be
+     negative. This could cause applications to behave incorrectly or crash.
+     (CVE-2021-23840)
+     [Matt Caswell]
+
+  *) Fixed SRP_Calc_client_key so that it runs in constant time. The previous
+     implementation called BN_mod_exp without setting BN_FLG_CONSTTIME. This
+     could be exploited in a side channel attack to recover the password. Since
+     the attack is local host only this is outside of the current OpenSSL
+     threat model and therefore no CVE is assigned.
+
+     Thanks to Mohammed Sabt and Daniel De Almeida Braga for reporting this
+     issue.
+     [Matt Caswell]
+
  Changes between 1.1.1h and 1.1.1i [8 Dec 2020]
 
   *) Fixed NULL pointer deref in the GENERAL_NAME_cmp function
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/10-main.conf thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/10-main.conf
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/10-main.conf	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/10-main.conf	2021-12-09 12:01:26.000000000 +0000
@@ -663,6 +663,7 @@
     "linux-ppc" => {
         inherit_from     => [ "linux-generic32", asm("ppc32_asm") ],
         perlasm_scheme   => "linux32",
+        lib_cppflags     => add("-DB_ENDIAN"),
     },
     "linux-ppc64" => {
         inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
@@ -753,6 +754,13 @@
         multilib         => "64",
     },
 
+    # riscv64 below refers to contemporary RISCV Architecture
+    # specifications,
+    "linux64-riscv64" => {
+        inherit_from     => [ "linux-generic64"],
+        perlasm_scheme   => "linux64",
+    },
+
     #### IA-32 targets...
     #### These two targets are a bit aged and are to be used on older Linux
     #### machines where gcc doesn't understand -m32 and -m64
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/15-android.conf thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/15-android.conf
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/15-android.conf	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/15-android.conf	2021-12-09 12:01:26.000000000 +0000
@@ -29,18 +29,18 @@
                 $ndk = $ENV{$ndk_var};
                 last if defined $ndk;
             }
-            die "\$ANDROID_NDK_HOME is not defined"  if (!$ndk);
-            if (!-d "$ndk/platforms" && !-f "$ndk/AndroidVersion.txt") {
-                # $ndk/platforms is traditional "all-inclusive" NDK, while
-                # $ndk/AndroidVersion.txt is so-called standalone toolchain
-                # tailored for specific target down to API level.
+            die "\$ANDROID_NDK_HOME is not defined" if (!$ndk);
+            my $is_standalone_toolchain = -f "$ndk/AndroidVersion.txt";
+            my $ndk_src_props = "$ndk/source.properties";
+            my $is_ndk = -f $ndk_src_props;
+            if ($is_ndk == $is_standalone_toolchain) {
                 die "\$ANDROID_NDK_HOME=$ndk is invalid";
             }
             $ndk = canonpath($ndk);
 
             my $ndkver = undef;
 
-            if (open my $fh, "<$ndk/source.properties") {
+            if (open my $fh, "<$ndk_src_props") {
                 local $_;
                 while(<$fh>) {
                     if (m|Pkg\.Revision\s*=\s*([0-9]+)|) {
@@ -59,7 +59,7 @@
             if ($sysroot = $ENV{CROSS_SYSROOT}) {
                 $sysroot =~ m|/android-([0-9]+)/arch-(\w+)/?$|;
                 ($api, $arch) = ($1, $2);
-            } elsif (-f "$ndk/AndroidVersion.txt") {
+            } elsif ($is_standalone_toolchain) {
                 $sysroot = "$ndk/sysroot";
             } else {
                 $api = "*";
@@ -72,17 +72,31 @@
                     }
                 }
 
-                # list available platforms (numerically)
-                my @platforms = sort { $a =~ m/-([0-9]+)$/; my $aa = $1;
-                                       $b =~ m/-([0-9]+)$/; $aa <=> $1;
-                                     } glob("$ndk/platforms/android-$api");
-                die "no $ndk/platforms/android-$api" if ($#platforms < 0);
-
-                $sysroot = "@platforms[$#platforms]/arch-$arch";
-                $sysroot =~ m|/android-([0-9]+)/arch-$arch|;
-                $api = $1;
+                if (-d "$ndk/platforms") {
+                    # list available platforms (numerically)
+                    my @platforms = sort { $a =~ m/-([0-9]+)$/; my $aa = $1;
+                                           $b =~ m/-([0-9]+)$/; $aa <=> $1;
+                                         } glob("$ndk/platforms/android-$api");
+                    die "no $ndk/platforms/android-$api" if ($#platforms < 0);
+
+                    $sysroot = "@platforms[$#platforms]/arch-$arch";
+                    $sysroot =~ m|/android-([0-9]+)/arch-$arch|;
+                    $api = $1;
+                } elsif ($api eq "*") {
+                    # r22 Removed platforms dir, use this JSON file
+                    my $path = "$ndk/meta/platforms.json";
+                    open my $fh, $path or die "Could not open '$path' $!";
+                    while (<$fh>) {
+                        if (/"max": (\d+),/) {
+                            $api = $1;
+                            last;
+                        }
+                    }
+                    close $fh;
+                }
+                die "Could not get default API Level" if ($api eq "*");
             }
-            die "no sysroot=$sysroot"   if (!-d $sysroot);
+            die "no sysroot=$sysroot" if (length $sysroot && !-d $sysroot);
 
             my $triarch = $triplet{$arch};
             my $cflags;
@@ -95,17 +109,21 @@
                 my $arm = $ndkver > 16 ? "armv7a" : "armv5te";
                 (my $tridefault = $triarch) =~ s/^arm-/$arm-/;
                 (my $tritools   = $triarch) =~ s/(?:x|i6)86(_64)?-.*/x86$1/;
-                $cflags .= " -target $tridefault "
-                        .  "-gcc-toolchain \$($ndk_var)/toolchains"
-                        .  "/$tritools-4.9/prebuilt/$host";
-                $user{CC} = "clang" if ($user{CC} !~ m|clang|);
+                if (length $sysroot) {
+                    $cflags .= " -target $tridefault "
+                            .  "-gcc-toolchain \$($ndk_var)/toolchains"
+                            .  "/$tritools-4.9/prebuilt/$host";
+                    $user{CC} = "clang" if ($user{CC} !~ m|clang|);
+                } else {
+                    $user{CC} = "$tridefault$api-clang";
+                }
                 $user{CROSS_COMPILE} = undef;
                 if (which("llvm-ar") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
                     $user{AR} = "llvm-ar";
                     $user{ARFLAGS} = [ "rs" ];
                     $user{RANLIB} = ":";
                 }
-            } elsif (-f "$ndk/AndroidVersion.txt") {    #"standalone toolchain"
+            } elsif ($is_standalone_toolchain) {
                 my $cc = $user{CC} // "clang";
                 # One can probably argue that both clang and gcc should be
                 # probed, but support for "standalone toolchain" was added
@@ -127,19 +145,21 @@
                 $user{CROSS_COMPILE} = "$triarch-";
             }
 
-            if (!-d "$sysroot/usr/include") {
-                my $incroot = "$ndk/sysroot/usr/include";
-                die "no $incroot"          if (!-d $incroot);
-                die "no $incroot/$triarch" if (!-d "$incroot/$triarch");
-                $incroot =~ s|^$ndk/||;
-                $cppflags  = "-D__ANDROID_API__=$api";
-                $cppflags .= " -isystem \$($ndk_var)/$incroot/$triarch";
-                $cppflags .= " -isystem \$($ndk_var)/$incroot";
+            if (length $sysroot) {
+                if (!-d "$sysroot/usr/include") {
+                    my $incroot = "$ndk/sysroot/usr/include";
+                    die "no $incroot"          if (!-d $incroot);
+                    die "no $incroot/$triarch" if (!-d "$incroot/$triarch");
+                    $incroot =~ s|^$ndk/||;
+                    $cppflags  = "-D__ANDROID_API__=$api";
+                    $cppflags .= " -isystem \$($ndk_var)/$incroot/$triarch";
+                    $cppflags .= " -isystem \$($ndk_var)/$incroot";
+                }
+                $sysroot =~ s|^$ndk/||;
+                $sysroot = " --sysroot=\$($ndk_var)/$sysroot";
             }
-
-            $sysroot =~ s|^$ndk/||;
             $android_ndk = {
-                cflags   => "$cflags --sysroot=\$($ndk_var)/$sysroot",
+                cflags   => $cflags . $sysroot,
                 cppflags => $cppflags,
                 bn_ops   => $arch =~ m/64$/ ? "SIXTY_FOUR_BIT_LONG"
                                             : "BN_LLONG",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/descrip.mms.tmpl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/descrip.mms.tmpl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/descrip.mms.tmpl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/descrip.mms.tmpl	2021-12-09 12:01:26.000000000 +0000
@@ -377,8 +377,13 @@
         $(NODEBUG) !
         $(NODEBUG) ! Installation logical names
         $(NODEBUG) !
-        $(NODEBUG) installtop = F$PARSE(staging_instdir,"$(INSTALLTOP)","[]A.;",,"SYNTAX_ONLY,NO_CONCEAL") - ".][000000" - "[000000." - "][" - "]A.;" + ".]"
-        $(NODEBUG) datatop = F$PARSE(staging_datadir,"$(OPENSSLDIR)","[]A.;",,"SYNTAX_ONLY,NO_CONCEAL") - ".][000000" - "[000000." - "][" - "]A.;" + ".]"
+        $(NODEBUG) ! This also creates a few DCL variables that are used for
+        $(NODEBUG) ! the "install_msg" target.
+        $(NODEBUG) !
+        $(NODEBUG) installroot = F$PARSE(staging_instdir,"$(INSTALLTOP)","[]A.;",,"SYNTAX_ONLY,NO_CONCEAL") - ".][000000" - "[000000." - "][" - "]A.;"
+        $(NODEBUG) installtop = installroot + ".]"
+        $(NODEBUG) dataroot = F$PARSE(staging_datadir,"$(OPENSSLDIR)","[]A.;",,"SYNTAX_ONLY,NO_CONCEAL") - ".][000000" - "[000000." - "][" - "]A.;"
+        $(NODEBUG) datatop = dataroot + ".]"
         $(NODEBUG) DEFINE ossl_installroot 'installtop'
         $(NODEBUG) DEFINE ossl_dataroot 'datatop'
         $(NODEBUG) !
@@ -455,30 +460,19 @@
         @ WRITE SYS$OUTPUT "Tests are not supported with your chosen Configure options"
         @ ! {- output_on() if !$disabled{tests}; "" -}
 
-install : install_sw install_ssldirs install_docs
+install : install_sw install_ssldirs install_docs install_msg
+        @ !
+
+install_msg :
         @ WRITE SYS$OUTPUT ""
         @ WRITE SYS$OUTPUT "######################################################################"
         @ WRITE SYS$OUTPUT ""
         @ IF "$(DESTDIR)" .EQS. "" THEN -
-             PIPE ( WRITE SYS$OUTPUT "Installation complete" ; -
-                    WRITE SYS$OUTPUT "" ; -
-                    WRITE SYS$OUTPUT "Run @$(SYSTARTUP)openssl_startup{- $osslver -} to set up logical names" ; -
-                    WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils{- $osslver -} to define commands" ; -
-                    WRITE SYS$OUTPUT "" )
+             @{- sourcefile("VMS", "msg_install.com") -} "$(SYSTARTUP)" "{- $osslver -}"
         @ IF "$(DESTDIR)" .NES. "" THEN -
-             PIPE ( WRITE SYS$OUTPUT "Staging installation complete" ; -
-                    WRITE SYS$OUTPUT "" ; -
-                    WRITE SYS$OUTPUT "Finish or package in such a way that the contents of the directory tree" ; -
-                    WRITE SYS$OUTPUT staging_instdir ; -
-                    WRITE SYS$OUTPUT "ends up in $(INSTALLTOP)," ; -
-                    WRITE SYS$OUTPUT "and that the contents of the contents of the directory tree" ; -
-                    WRITE SYS$OUTPUT staging_datadir ; -
-                    WRITE SYS$OUTPUT "ends up in $(OPENSSLDIR)" ; -
-                    WRITE SYS$OUTPUT "" ; -
-                    WRITE SYS$OUTPUT "When in its final destination," ; -
-                    WRITE SYS$OUTPUT "Run @$(SYSTARTUP)openssl_startup{- $osslver -} to set up logical names" ; -
-                    WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils{- $osslver -} to define commands" ; -
-                    WRITE SYS$OUTPUT "" )
+             @{- sourcefile("VMS", "msg_staging.com") -} -
+             "''installroot']" "''dataroot']" "$(INSTALLTOP)" "$(OPENSSLDIR)" -
+             "$(SYSTARTUP)" "{- $osslver -}"
 
 check_install :
         spawn/nolog @ossl_installroot:[SYSTEST]openssl_ivp{- $osslver -}.com
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/unix-Makefile.tmpl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/unix-Makefile.tmpl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/unix-Makefile.tmpl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/unix-Makefile.tmpl	2021-12-09 12:01:26.000000000 +0000
@@ -523,7 +523,6 @@
 	$(RM) -r test/test-runs
 	$(RM) openssl.pc libcrypto.pc libssl.pc
 	-$(RM) `find . -type l \! -name '.*' -print`
-	$(RM) $(TARFILE)
 
 distclean: clean
 	$(RM) configdata.pm
@@ -917,8 +916,8 @@
           done )
 
 ordinals:
-	( b=`pwd`; cd $(SRCDIR); $(PERL) -I$$b util/mkdef.pl crypto update )
-	( b=`pwd`; cd $(SRCDIR); $(PERL) -I$$b util/mkdef.pl ssl update )
+	$(PERL) $(SRCDIR)/util/mkdef.pl crypto update
+	$(PERL) $(SRCDIR)/util/mkdef.pl ssl update
 
 test_ordinals:
 	( cd test; \
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/windows-makefile.tmpl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/windows-makefile.tmpl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/windows-makefile.tmpl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configurations/windows-makefile.tmpl	2021-12-09 12:01:26.000000000 +0000
@@ -324,15 +324,15 @@
 # Convenience target to prebuild all generated files, not just the mandatory
 # ones
 build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)
-	@{- output_off() if $disabled{makedepend}; "" -}
+	@{- output_off() if $disabled{makedepend}; "\@rem" -}
 	@$(ECHO) "Warning: consider configuring with no-makedepend, because if"
 	@$(ECHO) "         target system doesn't have $(PERL),"
 	@$(ECHO) "         then make will fail..."
-	@{- output_on() if $disabled{makedepend}; "" -}
+	@{- output_on() if $disabled{makedepend}; "\@rem" -}
 
 test: tests
 {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep
-	@{- output_off() if $disabled{tests}; "" -}
+	@{- output_off() if $disabled{tests}; "\@rem" -}
 	-mkdir $(BLDDIR)\test\test-runs
 	set SRCTOP=$(SRCDIR)
 	set BLDTOP=$(BLDDIR)
@@ -341,17 +341,17 @@
 	set OPENSSL_ENGINES=$(MAKEDIR)\engines
 	set OPENSSL_DEBUG_MEMORY=on
 	"$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)
-	@{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
+	@{- if ($disabled{tests}) { output_on(); } else { output_off(); } "\@rem" -}
 	@$(ECHO) "Tests are not supported with your chosen Configure options"
-	@{- output_on() if !$disabled{tests}; "" -}
+	@{- output_on() if !$disabled{tests}; "\@rem" -}
 
 list-tests:
-	@{- output_off() if $disabled{tests}; "" -}
+	@{- output_off() if $disabled{tests}; "\@rem" -}
 	@set SRCTOP=$(SRCDIR)
 	@"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list
-	@{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
+	@{- if ($disabled{tests}) { output_on(); } else { output_off(); } "\@rem" -}
 	@$(ECHO) "Tests are not supported with your chosen Configure options"
-	@{- output_on() if !$disabled{tests}; "" -}
+	@{- output_on() if !$disabled{tests}; "\@rem" -}
 
 install: install_sw install_ssldirs install_docs
 
@@ -362,7 +362,7 @@
 	-del /Q /F $(LIBS) libcrypto.* libssl.* ossl_static.pdb
 
 clean: libclean
-	{- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -}
+	{- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) || "\@rem" -}
 	-del /Q /F $(ENGINES)
 	-del /Q /F $(SCRIPTS)
 	-del /Q /F $(GENERATED_MANDATORY)
@@ -378,9 +378,9 @@
 	-del /Q /F makefile
 
 depend:
-	@ {- output_off() if $disabled{makedepend}; "" -}
+	@ {- output_off() if $disabled{makedepend}; "\@rem" -}
 	@ "$(PERL)" "$(SRCDIR)\util\add-depends.pl" "VC"
-	@ {- output_on() if $disabled{makedepend}; "" -}
+	@ {- output_on() if $disabled{makedepend}; "\@rem" -}
 
 # Install helper targets #############################################
 
@@ -413,10 +413,10 @@
 	@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 )
 	@$(ECHO) "*** Installing development files"
 	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\include\openssl"
-	@{- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } (@{$target{defines}}, @{$config{defines}}); "" -}
+	@{- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } (@{$target{defines}}, @{$config{defines}}); "\@rem" -}
 	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\ms\applink.c" \
 				       "$(INSTALLTOP)\include\openssl"
-	@{- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } (@{$target{defines}}, @{$config{defines}}); "" -}
+	@{- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } (@{$target{defines}}, @{$config{defines}}); "\@rem" -}
 	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "-exclude_re=/__DECC_" \
 				       "$(SRCDIR)\include\openssl\*.h" \
 				       "$(INSTALLTOP)\include\openssl"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configure thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configure
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/Configure	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/Configure	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/env perl
 # -*- mode: perl; -*-
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -1201,6 +1201,10 @@
 # At this point, we can forget everything about %user and %useradd,
 # because it's now all been merged into the corresponding $config entry
 
+if (grep { $_ eq '-static' } @{$config{LDFLAGS}}) {
+    disable('static', 'pic', 'threads');
+}
+
 # Allow overriding the build file name
 $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
 
@@ -1521,10 +1525,6 @@
                 }
         }
 
-if (grep { $_ eq '-static' } @{$config{LDFLAGS}}) {
-    disable('static', 'pic', 'threads');
-}
-
 $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
                               ? @strict_warnings_collection
                               : ( $_ ) }
@@ -2611,19 +2611,22 @@
         }
         print "\nEnabled features:\n\n";
         foreach my $what (@disablables) {
-            print "    $what\n" unless $disabled{$what};
+            print "    $what\n"
+                unless grep { $_ =~ /^${what}$/ } keys %disabled;
         }
         print "\nDisabled features:\n\n";
         foreach my $what (@disablables) {
-            if ($disabled{$what}) {
-                print "    $what", ' ' x ($longest - length($what) + 1),
-                    "[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
-                print $disabled_info{$what}->{macro}
-                    if $disabled_info{$what}->{macro};
+            my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
+            my $what3 = $what2[0];
+            if ($what3) {
+                print "    $what3", ' ' x ($longest - length($what3) + 1),
+                    "[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
+                print $disabled_info{$what3}->{macro}
+                    if $disabled_info{$what3}->{macro};
                 print ' (skip ',
-                    join(', ', @{$disabled_info{$what}->{skipped}}),
+                    join(', ', @{$disabled_info{$what3}->{skipped}}),
                     ')'
-                    if $disabled_info{$what}->{skipped};
+                    if $disabled_info{$what3}->{skipped};
                 print "\n";
             }
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/CONTRIBUTING thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/CONTRIBUTING
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/CONTRIBUTING	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/CONTRIBUTING	2021-12-09 12:01:26.000000000 +0000
@@ -41,8 +41,8 @@
     https://www.openssl.org/policies/codingstyle.html) and compile
     without warnings. Where gcc or clang is available you should use the
     --strict-warnings Configure option.  OpenSSL compiles on many varied
-    platforms: try to ensure you only use portable features.  Clean builds
-    via Travis and AppVeyor are required, and they are started automatically
+    platforms: try to ensure you only use portable features.  Clean builds via
+    GitHub Actions and AppVeyor are required, and they are started automatically
     whenever a PR is created or updated.
 
     5.  When at all possible, patches should include tests. These can
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/armcap.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/armcap.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/armcap.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/armcap.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -68,9 +68,41 @@
 #   include <sys/auxv.h>
 #   define OSSL_IMPLEMENT_GETAUXVAL
 #  endif
+# elif defined(__ANDROID_API__)
+/* see https://developer.android.google.cn/ndk/guides/cpu-features */
+#  if __ANDROID_API__ >= 18
+#   include <sys/auxv.h>
+#   define OSSL_IMPLEMENT_GETAUXVAL
+#  endif
+# endif
+# if defined(__FreeBSD__)
+#  include <sys/param.h>
+#  if __FreeBSD_version >= 1200000
+#   include <sys/auxv.h>
+#   define OSSL_IMPLEMENT_GETAUXVAL
+
+static unsigned long getauxval(unsigned long key)
+{
+  unsigned long val = 0ul;
+
+  if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
+    return 0ul;
+
+  return val;
+}
+#  endif
 # endif
 
 /*
+ * Android: according to https://developer.android.com/ndk/guides/cpu-features,
+ * getauxval is supported starting with API level 18
+ */
+#  if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
+#   include <sys/auxv.h>
+#   define OSSL_IMPLEMENT_GETAUXVAL
+#  endif
+
+/*
  * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
  * AArch64 used AT_HWCAP.
  */
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/a_object.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/a_object.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/a_object.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/a_object.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -286,16 +286,13 @@
         }
     }
 
-    /*
-     * only the ASN1_OBJECTs from the 'table' will have values for ->sn or
-     * ->ln
-     */
     if ((a == NULL) || ((*a) == NULL) ||
         !((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC)) {
         if ((ret = ASN1_OBJECT_new()) == NULL)
             return NULL;
-    } else
+    } else {
         ret = (*a);
+    }
 
     p = *pp;
     /* detach data from object */
@@ -313,6 +310,12 @@
         ret->flags |= ASN1_OBJECT_FLAG_DYNAMIC_DATA;
     }
     memcpy(data, p, length);
+    /* If there are dynamic strings, free them here, and clear the flag */
+    if ((ret->flags & ASN1_OBJECT_FLAG_DYNAMIC_STRINGS) != 0) {
+        OPENSSL_free((char *)ret->sn);
+        OPENSSL_free((char *)ret->ln);
+        ret->flags &= ~ASN1_OBJECT_FLAG_DYNAMIC_STRINGS;
+    }
     /* reattach data to object, after which it remains const */
     ret->data = data;
     ret->length = length;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/asn1_lib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/asn1_lib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/asn1_lib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/asn1_lib.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -292,7 +292,12 @@
     }
     if ((size_t)str->length <= len || str->data == NULL) {
         c = str->data;
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+        /* No NUL terminator in fuzzing builds */
+        str->data = OPENSSL_realloc(c, len);
+#else
         str->data = OPENSSL_realloc(c, len + 1);
+#endif
         if (str->data == NULL) {
             ASN1err(ASN1_F_ASN1_STRING_SET, ERR_R_MALLOC_FAILURE);
             str->data = c;
@@ -302,8 +307,13 @@
     str->length = len;
     if (data != NULL) {
         memcpy(str->data, data, len);
-        /* an allowance for strings :-) */
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+        /*
+         * Add a NUL terminator. This should not be necessary - but we add it as
+         * a safety precaution
+         */
         str->data[len] = '\0';
+#endif
     }
     return 1;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/asn1_par.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/asn1_par.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/asn1_par.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/asn1_par.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -325,6 +325,7 @@
                 }
                 if (BIO_puts(bp, "]") <= 0)
                     goto end;
+                dump_cont = 0;
             }
 
             if (!nl) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/a_strex.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/a_strex.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/a_strex.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/a_strex.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -280,6 +280,8 @@
     t.type = str->type;
     t.value.ptr = (char *)str;
     der_len = i2d_ASN1_TYPE(&t, NULL);
+    if (der_len <= 0)
+        return -1;
     if ((der_buf = OPENSSL_malloc(der_len)) == NULL) {
         ASN1err(ASN1_F_DO_DUMP, ERR_R_MALLOC_FAILURE);
         return -1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/bio_asn1.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/bio_asn1.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/bio_asn1.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/bio_asn1.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -138,6 +138,11 @@
     if (ctx == NULL)
         return 0;
 
+    if (ctx->prefix_free != NULL)
+        ctx->prefix_free(b, &ctx->ex_buf, &ctx->ex_len, &ctx->ex_arg);
+    if (ctx->suffix_free != NULL)
+        ctx->suffix_free(b, &ctx->ex_buf, &ctx->ex_len, &ctx->ex_arg);
+
     OPENSSL_free(ctx->buf);
     OPENSSL_free(ctx);
     BIO_set_data(b, NULL);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/bio_ndef.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/bio_ndef.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/bio_ndef.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/bio_ndef.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -113,6 +113,8 @@
     ndef_aux = *(NDEF_SUPPORT **)parg;
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
+    if (derlen < 0)
+        return 0;
     if ((p = OPENSSL_malloc(derlen)) == NULL) {
         ASN1err(ASN1_F_NDEF_PREFIX, ERR_R_MALLOC_FAILURE);
         return 0;
@@ -140,6 +142,9 @@
 
     ndef_aux = *(NDEF_SUPPORT **)parg;
 
+    if (ndef_aux == NULL)
+        return 0;
+
     OPENSSL_free(ndef_aux->derbuf);
 
     ndef_aux->derbuf = NULL;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/charmap.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/charmap.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/charmap.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/charmap.h	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/asn1/charmap.pl
  *
- * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/d2i_pr.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/d2i_pr.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/d2i_pr.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/d2i_pr.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -78,13 +78,53 @@
  * type
  */
 
+static EVP_PKEY *key_as_pkcs8(const unsigned char **pp, long length, int *carry_on)
+{
+    const unsigned char *p = *pp;
+    PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, length);
+    EVP_PKEY *ret;
+
+    if (p8 == NULL)
+        return NULL;
+
+    ret = EVP_PKCS82PKEY(p8);
+    if (ret == NULL)
+        *carry_on = 0;
+
+    PKCS8_PRIV_KEY_INFO_free(p8);
+
+    if (ret != NULL)
+        *pp = p;
+
+    return ret;
+}
+
 EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
                              long length)
 {
     STACK_OF(ASN1_TYPE) *inkey;
     const unsigned char *p;
     int keytype;
+    EVP_PKEY *ret = NULL;
+    int carry_on = 1;
+
+    ERR_set_mark();
+    ret = key_as_pkcs8(pp, length, &carry_on);
+    if (ret != NULL) {
+        ERR_clear_last_mark();
+        if (a != NULL)
+            *a = ret;
+        return ret;
+    }
+
+    if (carry_on == 0) {
+        ERR_clear_last_mark();
+        ASN1err(ASN1_F_D2I_AUTOPRIVATEKEY,
+                ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
+        return NULL;
+    }
     p = *pp;
+
     /*
      * Dirty trick: read in the ASN1 data into a STACK_OF(ASN1_TYPE): by
      * analyzing it we can determine the passed structure: this assumes the
@@ -100,28 +140,15 @@
         keytype = EVP_PKEY_DSA;
     else if (sk_ASN1_TYPE_num(inkey) == 4)
         keytype = EVP_PKEY_EC;
-    else if (sk_ASN1_TYPE_num(inkey) == 3) { /* This seems to be PKCS8, not
-                                              * traditional format */
-        PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, length);
-        EVP_PKEY *ret;
-
-        sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free);
-        if (!p8) {
-            ASN1err(ASN1_F_D2I_AUTOPRIVATEKEY,
-                    ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
-            return NULL;
-        }
-        ret = EVP_PKCS82PKEY(p8);
-        PKCS8_PRIV_KEY_INFO_free(p8);
-        if (ret == NULL)
-            return NULL;
-        *pp = p;
-        if (a) {
-            *a = ret;
-        }
-        return ret;
-    } else
+    else
         keytype = EVP_PKEY_RSA;
     sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free);
-    return d2i_PrivateKey(keytype, a, pp, length);
+
+    ret = d2i_PrivateKey(keytype, a, pp, length);
+    if (ret != NULL)
+        ERR_pop_to_mark();
+    else
+        ERR_clear_last_mark();
+
+    return ret;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/t_spki.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/t_spki.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/t_spki.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/asn1/t_spki.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -38,7 +38,7 @@
     }
     chal = spki->spkac->challenge;
     if (chal->length)
-        BIO_printf(out, "  Challenge String: %s\n", chal->data);
+        BIO_printf(out, "  Challenge String: %.*s\n", chal->length, chal->data);
     i = OBJ_obj2nid(spki->sig_algor.algorithm);
     BIO_printf(out, "  Signature Algorithm: %s",
                (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bio/b_addr.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bio/b_addr.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bio/b_addr.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bio/b_addr.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -689,7 +689,7 @@
         hints.ai_protocol = protocol;
 # ifdef AI_ADDRCONFIG
 #  ifdef AF_UNSPEC
-        if (family == AF_UNSPEC)
+        if (host != NULL && family == AF_UNSPEC)
 #  endif
             hints.ai_flags |= AI_ADDRCONFIG;
 # endif
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bio/b_sock2.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bio/b_sock2.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bio/b_sock2.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bio/b_sock2.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -243,7 +243,8 @@
         }
     }
 
-# ifdef IPV6_V6ONLY
+  /* On OpenBSD it is always ipv6 only with ipv6 sockets thus read-only */
+# if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
     if (BIO_ADDR_family(addr) == AF_INET6) {
         /*
          * Note: Windows default of IPV6_V6ONLY is ON, and Linux is OFF.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bn/bn_div.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bn/bn_div.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bn/bn_div.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bn/bn_div.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -268,7 +268,7 @@
     BIGNUM *tmp, *snum, *sdiv, *res;
     BN_ULONG *resp, *wnum, *wnumtop;
     BN_ULONG d0, d1;
-    int num_n, div_n;
+    int num_n, div_n, num_neg;
 
     assert(divisor->top > 0 && divisor->d[divisor->top - 1] != 0);
 
@@ -326,7 +326,8 @@
     /* Setup quotient */
     if (!bn_wexpand(res, loop))
         goto err;
-    res->neg = (num->neg ^ divisor->neg);
+    num_neg = num->neg;
+    res->neg = (num_neg ^ divisor->neg);
     res->top = loop;
     res->flags |= BN_FLG_FIXED_TOP;
     resp = &(res->d[loop]);
@@ -442,7 +443,7 @@
         *--resp = q;
     }
     /* snum holds remainder, it's as wide as divisor */
-    snum->neg = num->neg;
+    snum->neg = num_neg;
     snum->top = div_n;
     snum->flags |= BN_FLG_FIXED_TOP;
     if (rm != NULL)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bn/bn_prime.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bn/bn_prime.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bn/bn_prime.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/bn/bn_prime.h	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/bn/bn_prime.pl
  *
- * Copyright 1998-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/chacha/asm/chacha-x86_64.pl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/chacha/asm/chacha-x86_64.pl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/chacha/asm/chacha-x86_64.pl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/chacha/asm/chacha-x86_64.pl	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -471,7 +471,7 @@
 	&por	($b,$t);
 }
 
-my $xframe = $win64 ? 32+8 : 8;
+my $xframe = $win64 ? 160+8 : 8;
 
 $code.=<<___;
 .type	ChaCha20_ssse3,\@function,5
@@ -2499,7 +2499,7 @@
 	&vprold	($b,$b,7);
 }
 
-my $xframe = $win64 ? 32+8 : 8;
+my $xframe = $win64 ? 160+8 : 8;
 
 $code.=<<___;
 .type	ChaCha20_avx512,\@function,5
@@ -2515,8 +2515,16 @@
 	sub	\$64+$xframe,%rsp
 ___
 $code.=<<___	if ($win64);
-	movaps	%xmm6,-0x28(%r9)
-	movaps	%xmm7,-0x18(%r9)
+	movaps	%xmm6,-0xa8(%r9)
+	movaps	%xmm7,-0x98(%r9)
+	movaps	%xmm8,-0x88(%r9)
+	movaps	%xmm9,-0x78(%r9)
+	movaps	%xmm10,-0x68(%r9)
+	movaps	%xmm11,-0x58(%r9)
+	movaps	%xmm12,-0x48(%r9)
+	movaps	%xmm13,-0x38(%r9)
+	movaps	%xmm14,-0x28(%r9)
+	movaps	%xmm15,-0x18(%r9)
 .Lavx512_body:
 ___
 $code.=<<___;
@@ -2683,8 +2691,16 @@
 	vzeroall
 ___
 $code.=<<___	if ($win64);
-	movaps	-0x28(%r9),%xmm6
-	movaps	-0x18(%r9),%xmm7
+	movaps	-0xa8(%r9),%xmm6
+	movaps	-0x98(%r9),%xmm7
+	movaps	-0x88(%r9),%xmm8
+	movaps	-0x78(%r9),%xmm9
+	movaps	-0x68(%r9),%xmm10
+	movaps	-0x58(%r9),%xmm11
+	movaps	-0x48(%r9),%xmm12
+	movaps	-0x38(%r9),%xmm13
+	movaps	-0x28(%r9),%xmm14
+	movaps	-0x18(%r9),%xmm15
 ___
 $code.=<<___;
 	lea	(%r9),%rsp
@@ -2711,8 +2727,16 @@
 	sub	\$64+$xframe,%rsp
 ___
 $code.=<<___	if ($win64);
-	movaps	%xmm6,-0x28(%r9)
-	movaps	%xmm7,-0x18(%r9)
+	movaps	%xmm6,-0xa8(%r9)
+	movaps	%xmm7,-0x98(%r9)
+	movaps	%xmm8,-0x88(%r9)
+	movaps	%xmm9,-0x78(%r9)
+	movaps	%xmm10,-0x68(%r9)
+	movaps	%xmm11,-0x58(%r9)
+	movaps	%xmm12,-0x48(%r9)
+	movaps	%xmm13,-0x38(%r9)
+	movaps	%xmm14,-0x28(%r9)
+	movaps	%xmm15,-0x18(%r9)
 .Lavx512vl_body:
 ___
 $code.=<<___;
@@ -2836,8 +2860,16 @@
 	vzeroall
 ___
 $code.=<<___	if ($win64);
-	movaps	-0x28(%r9),%xmm6
-	movaps	-0x18(%r9),%xmm7
+	movaps	-0xa8(%r9),%xmm6
+	movaps	-0x98(%r9),%xmm7
+	movaps	-0x88(%r9),%xmm8
+	movaps	-0x78(%r9),%xmm9
+	movaps	-0x68(%r9),%xmm10
+	movaps	-0x58(%r9),%xmm11
+	movaps	-0x48(%r9),%xmm12
+	movaps	-0x38(%r9),%xmm13
+	movaps	-0x28(%r9),%xmm14
+	movaps	-0x18(%r9),%xmm15
 ___
 $code.=<<___;
 	lea	(%r9),%rsp
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/conf/conf_def.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/conf/conf_def.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/conf/conf_def.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/conf/conf_def.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -185,6 +185,7 @@
     BUF_MEM *buff = NULL;
     char *s, *p, *end;
     int again;
+    int first_call = 1;
     long eline = 0;
     char btmp[DECIMAL_SIZE(eline) + 1];
     CONF_VALUE *v = NULL, *tv;
@@ -233,6 +234,19 @@
         BIO_gets(in, p, CONFBUFSIZE - 1);
         p[CONFBUFSIZE - 1] = '\0';
         ii = i = strlen(p);
+        if (first_call) {
+            /* Other BOMs imply unsupported multibyte encoding,
+             * so don't strip them and let the error raise */
+            const unsigned char utf8_bom[3] = {0xEF, 0xBB, 0xBF};
+
+            if (i >= 3 && memcmp(p, utf8_bom, 3) == 0) {
+                memmove(p, p + 3, i - 3);
+                p[i - 3] = 0;
+                i -= 3;
+                ii -= 3;
+            }
+            first_call = 0;
+        }
         if (i == 0 && !again) {
             /* the currently processed BIO is at EOF */
             BIO *parent;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/conf/conf_def.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/conf/conf_def.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/conf/conf_def.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/conf/conf_def.h	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/conf/keysets.pl
  *
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/dh/dh_key.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/dh/dh_key.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/dh/dh_key.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/dh/dh_key.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -25,18 +25,45 @@
     return dh->meth->generate_key(dh);
 }
 
+/*-
+ * NB: This function is inherently not constant time due to the
+ * RFC 5246 (8.1.2) padding style that strips leading zero bytes.
+ */
 int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
 {
-    return dh->meth->compute_key(key, pub_key, dh);
+    int ret = 0, i;
+    volatile size_t npad = 0, mask = 1;
+
+    /* compute the key; ret is constant unless compute_key is external */
+    if ((ret = dh->meth->compute_key(key, pub_key, dh)) <= 0)
+        return ret;
+
+    /* count leading zero bytes, yet still touch all bytes */
+    for (i = 0; i < ret; i++) {
+        mask &= !key[i];
+        npad += mask;
+    }
+
+    /* unpad key */
+    ret -= npad;
+    /* key-dependent memory access, potentially leaking npad / ret */
+    memmove(key, key + npad, ret);
+    /* key-dependent memory access, potentially leaking npad / ret */
+    memset(key + ret, 0, npad);
+
+    return ret;
 }
 
 int DH_compute_key_padded(unsigned char *key, const BIGNUM *pub_key, DH *dh)
 {
     int rv, pad;
+
+    /* rv is constant unless compute_key is external */
     rv = dh->meth->compute_key(key, pub_key, dh);
     if (rv <= 0)
         return rv;
     pad = BN_num_bytes(dh->p) - rv;
+    /* pad is constant (zero) unless compute_key is external */
     if (pad > 0) {
         memmove(key + pad, key, rv);
         memset(key, 0, pad);
@@ -212,7 +239,7 @@
         goto err;
     }
 
-    ret = BN_bn2bin(tmp, key);
+    ret = BN_bn2binpad(tmp, key, BN_num_bytes(dh->p));
  err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/dsa/dsa_prn.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/dsa/dsa_prn.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/dsa/dsa_prn.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/dsa/dsa_prn.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -49,9 +49,11 @@
     EVP_PKEY *pk;
     int ret;
     pk = EVP_PKEY_new();
-    if (pk == NULL || !EVP_PKEY_set1_DSA(pk, (DSA *)x))
+    if (pk == NULL)
         return 0;
-    ret = EVP_PKEY_print_private(bp, pk, off, NULL);
+    ret = EVP_PKEY_set1_DSA(pk, (DSA *)x);
+    if (ret)
+        ret = EVP_PKEY_print_private(bp, pk, off, NULL);
     EVP_PKEY_free(pk);
     return ret;
 }
@@ -61,9 +63,11 @@
     EVP_PKEY *pk;
     int ret;
     pk = EVP_PKEY_new();
-    if (pk == NULL || !EVP_PKEY_set1_DSA(pk, (DSA *)x))
+    if (pk == NULL)
         return 0;
-    ret = EVP_PKEY_print_params(bp, pk, 4, NULL);
+    ret = EVP_PKEY_set1_DSA(pk, (DSA *)x);
+    if (ret)
+        ret = EVP_PKEY_print_params(bp, pk, 4, NULL);
     EVP_PKEY_free(pk);
     return ret;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ec/ec2_oct.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ec/ec2_oct.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ec/ec2_oct.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ec/ec2_oct.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -247,9 +247,21 @@
         ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
         return 0;
     }
-    form = buf[0];
-    y_bit = form & 1;
-    form = form & ~1U;
+
+    /*
+     * The first octet is the point converison octet PC, see X9.62, page 4
+     * and section 4.4.2.  It must be:
+     *     0x00          for the point at infinity
+     *     0x02 or 0x03  for compressed form
+     *     0x04          for uncompressed form
+     *     0x06 or 0x07  for hybrid form.
+     * For compressed or hybrid forms, we store the last bit of buf[0] as
+     * y_bit and clear it from buf[0] so as to obtain a POINT_CONVERSION_*.
+     * We error if buf[0] contains any but the above values.
+     */
+    y_bit = buf[0] & 1;
+    form = buf[0] & ~1U;
+
     if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED)
         && (form != POINT_CONVERSION_UNCOMPRESSED)
         && (form != POINT_CONVERSION_HYBRID)) {
@@ -261,6 +273,7 @@
         return 0;
     }
 
+    /* The point at infinity is represented by a single zero octet. */
     if (form == 0) {
         if (len != 1) {
             ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
@@ -312,11 +325,23 @@
             goto err;
         }
         if (form == POINT_CONVERSION_HYBRID) {
-            if (!group->meth->field_div(group, yxi, y, x, ctx))
-                goto err;
-            if (y_bit != BN_is_odd(yxi)) {
-                ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                goto err;
+            /*
+             * Check that the form in the encoding was set correctly
+             * according to X9.62 4.4.2.a, 4(c), see also first paragraph
+             * of X9.62, 4.4.1.b.
+             */
+            if (BN_is_zero(x)) {
+                if (y_bit != 0) {
+                    ECerr(ERR_LIB_EC, EC_R_INVALID_ENCODING);
+                    goto err;
+                }
+            } else {
+                if (!group->meth->field_div(group, yxi, y, x, ctx))
+                    goto err;
+                if (y_bit != BN_is_odd(yxi)) {
+                    ECerr(ERR_LIB_EC, EC_R_INVALID_ENCODING);
+                    goto err;
+                }
             }
         }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ec/ec_asn1.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ec/ec_asn1.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ec/ec_asn1.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ec/ec_asn1.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -761,7 +761,10 @@
         ret->seed_len = params->curve->seed->length;
     }
 
-    if (!params->order || !params->base || !params->base->data) {
+    if (params->order == NULL
+            || params->base == NULL
+            || params->base->data == NULL
+            || params->base->length == 0) {
         ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_ASN1_ERROR);
         goto err;
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/engine/eng_devcrypto.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/engine/eng_devcrypto.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/engine/eng_devcrypto.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/engine/eng_devcrypto.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -758,8 +758,9 @@
 void engine_load_devcrypto_int()
 {
     ENGINE *e = NULL;
+    int fd;
 
-    if ((cfd = open("/dev/crypto", O_RDWR, 0)) < 0) {
+    if ((fd = open("/dev/crypto", O_RDWR, 0)) < 0) {
 #ifndef ENGINE_DEVCRYPTO_DEBUG
         if (errno != ENOENT)
 #endif
@@ -767,6 +768,18 @@
         return;
     }
 
+#ifdef CRIOGET
+    if (ioctl(fd, CRIOGET, &cfd) < 0) {
+        fprintf(stderr, "Could not create crypto fd: %s\n", strerror(errno));
+        close(fd);
+        cfd = -1;
+        return;
+    }
+    close(fd);
+#else
+    cfd = fd;
+#endif
+
     if ((e = ENGINE_new()) == NULL
         || !ENGINE_set_destroy_function(e, devcrypto_unload)) {
         ENGINE_free(e);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/err/openssl.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/err/openssl.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/err/openssl.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/err/openssl.txt	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -1160,6 +1160,7 @@
 SSL_F_FINAL_EMS:486:final_ems
 SSL_F_FINAL_KEY_SHARE:503:final_key_share
 SSL_F_FINAL_MAXFRAGMENTLEN:557:final_maxfragmentlen
+SSL_F_FINAL_PSK:639:final_psk
 SSL_F_FINAL_RENEGOTIATE:483:final_renegotiate
 SSL_F_FINAL_SERVER_NAME:558:final_server_name
 SSL_F_FINAL_SIG_ALGS:497:final_sig_algs
@@ -1652,6 +1653,7 @@
 X509V3_F_I2S_ASN1_IA5STRING:149:i2s_ASN1_IA5STRING
 X509V3_F_I2S_ASN1_INTEGER:120:i2s_ASN1_INTEGER
 X509V3_F_I2V_AUTHORITY_INFO_ACCESS:138:i2v_AUTHORITY_INFO_ACCESS
+X509V3_F_I2V_AUTHORITY_KEYID:173:i2v_AUTHORITY_KEYID
 X509V3_F_LEVEL_ADD_NODE:168:level_add_node
 X509V3_F_NOTICE_SECTION:132:notice_section
 X509V3_F_NREF_NOS:133:nref_nos
@@ -1692,6 +1694,7 @@
 X509V3_F_V2I_TLS_FEATURE:165:v2i_TLS_FEATURE
 X509V3_F_V3_GENERIC_EXTENSION:116:v3_generic_extension
 X509V3_F_X509V3_ADD1_I2D:140:X509V3_add1_i2d
+X509V3_F_X509V3_ADD_LEN_VALUE:174:x509v3_add_len_value
 X509V3_F_X509V3_ADD_VALUE:105:X509V3_add_value
 X509V3_F_X509V3_EXT_ADD:104:X509V3_EXT_add
 X509V3_F_X509V3_EXT_ADD_ALIAS:106:X509V3_EXT_add_alias
@@ -2283,6 +2286,7 @@
 EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE:150:\
 	operation not supported for this keytype
 EVP_R_OPERATON_NOT_INITIALIZED:151:operaton not initialized
+EVP_R_OUTPUT_WOULD_OVERFLOW:184:output would overflow
 EVP_R_PARTIALLY_OVERLAPPING:162:partially overlapping buffers
 EVP_R_PBKDF2_ERROR:181:pbkdf2 error
 EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED:179:\
@@ -2740,6 +2744,7 @@
 SSL_R_MISSING_ECDSA_SIGNING_CERT:381:missing ecdsa signing cert
 SSL_R_MISSING_FATAL:256:missing fatal
 SSL_R_MISSING_PARAMETERS:290:missing parameters
+SSL_R_MISSING_PSK_KEX_MODES_EXTENSION:310:missing psk kex modes extension
 SSL_R_MISSING_RSA_CERTIFICATE:168:missing rsa certificate
 SSL_R_MISSING_RSA_ENCRYPTING_CERT:169:missing rsa encrypting cert
 SSL_R_MISSING_RSA_SIGNING_CERT:170:missing rsa signing cert
@@ -2783,6 +2788,7 @@
 SSL_R_NO_VERIFY_COOKIE_CALLBACK:403:no verify cookie callback
 SSL_R_NULL_SSL_CTX:195:null ssl ctx
 SSL_R_NULL_SSL_METHOD_PASSED:196:null ssl method passed
+SSL_R_OCSP_CALLBACK_FAILURE:294:ocsp callback failure
 SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED:197:old session cipher not returned
 SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED:344:\
 	old session compression algorithm not returned
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/e_aes.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/e_aes.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/e_aes.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/e_aes.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -611,22 +611,22 @@
  */
 void aes128_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes128_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes192_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes192_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes256_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes256_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes128_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
                              size_t blocks, const AES_KEY *key,
                              unsigned char *ivec);
@@ -1168,9 +1168,9 @@
 static int s390x_aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                               const unsigned char *iv, int enc);
 
-# define S390X_aes_128_cbc_CAPABLE	1	/* checked by callee */
-# define S390X_aes_192_cbc_CAPABLE	1
-# define S390X_aes_256_cbc_CAPABLE	1
+# define S390X_aes_128_cbc_CAPABLE	0	/* checked by callee */
+# define S390X_aes_192_cbc_CAPABLE	0
+# define S390X_aes_256_cbc_CAPABLE	0
 # define S390X_AES_CBC_CTX		EVP_AES_KEY
 
 # define s390x_aes_cbc_init_key aes_init_key
@@ -1190,11 +1190,11 @@
     S390X_AES_ECB_CTX *cctx = EVP_C_DATA(S390X_AES_ECB_CTX, ctx);
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
 
-    cctx->fc = S390X_AES_FC(keylen);
-    if (!enc)
-        cctx->fc |= S390X_DECRYPT;
+    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT);
+
+    if (key != NULL)
+        memcpy(cctx->km.param.k, key, keylen);
 
-    memcpy(cctx->km.param.k, key, keylen);
     return 1;
 }
 
@@ -1222,14 +1222,17 @@
                                   const unsigned char *ivec, int enc)
 {
     S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
-    const unsigned char *iv = EVP_CIPHER_CTX_original_iv(ctx);
+    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx);
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
     const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
 
-    memcpy(cctx->kmo.param.cv, iv, ivlen);
-    memcpy(cctx->kmo.param.k, key, keylen);
     cctx->fc = S390X_AES_FC(keylen);
+
+    if (key != NULL)
+        memcpy(cctx->kmo.param.k, key, keylen);
+
     cctx->res = 0;
+    memcpy(cctx->kmo.param.cv, oiv, ivlen);
     return 1;
 }
 
@@ -1237,9 +1240,12 @@
                                 const unsigned char *in, size_t len)
 {
     S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
+    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
+    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
     int n = cctx->res;
     int rem;
 
+    memcpy(cctx->kmo.param.cv, iv, ivlen);
     while (n && len) {
         *out = *in ^ cctx->kmo.param.cv[n];
         n = (n + 1) & 0xf;
@@ -1268,6 +1274,7 @@
         }
     }
 
+    memcpy(iv, cctx->kmo.param.cv, ivlen);
     cctx->res = n;
     return 1;
 }
@@ -1287,18 +1294,18 @@
                                   const unsigned char *ivec, int enc)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
-    const unsigned char *iv = EVP_CIPHER_CTX_original_iv(ctx);
+    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx);
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
     const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
 
-    cctx->fc = S390X_AES_FC(keylen);
-    cctx->fc |= 16 << 24;   /* 16 bytes cipher feedback */
-    if (!enc)
-        cctx->fc |= S390X_DECRYPT;
+    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT)
+               | (16 << 24); /* 16 bytes cipher feedback */
+
+    if (key != NULL)
+        memcpy(cctx->kmf.param.k, key, keylen);
 
     cctx->res = 0;
-    memcpy(cctx->kmf.param.cv, iv, ivlen);
-    memcpy(cctx->kmf.param.k, key, keylen);
+    memcpy(cctx->kmf.param.cv, oiv, ivlen);
     return 1;
 }
 
@@ -1308,10 +1315,13 @@
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
     const int enc = EVP_CIPHER_CTX_encrypting(ctx);
+    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
+    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
     int n = cctx->res;
     int rem;
     unsigned char tmp;
 
+    memcpy(cctx->kmf.param.cv, iv, ivlen);
     while (n && len) {
         tmp = *in;
         *out = cctx->kmf.param.cv[n] ^ tmp;
@@ -1344,6 +1354,7 @@
         }
     }
 
+    memcpy(iv, cctx->kmf.param.cv, ivlen);
     cctx->res = n;
     return 1;
 }
@@ -1360,17 +1371,18 @@
                                    const unsigned char *ivec, int enc)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
-    const unsigned char *iv = EVP_CIPHER_CTX_original_iv(ctx);
+    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx);
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
     const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
 
-    cctx->fc = S390X_AES_FC(keylen);
-    cctx->fc |= 1 << 24;   /* 1 byte cipher feedback */
-    if (!enc)
-        cctx->fc |= S390X_DECRYPT;
+    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT)
+               | (1 << 24); /* 1 byte cipher feedback flag */
 
-    memcpy(cctx->kmf.param.cv, iv, ivlen);
-    memcpy(cctx->kmf.param.k, key, keylen);
+    if (key != NULL)
+        memcpy(cctx->kmf.param.k, key, keylen);
+
+    cctx->res = 0;
+    memcpy(cctx->kmf.param.cv, oiv, ivlen);
     return 1;
 }
 
@@ -1378,8 +1390,12 @@
                                  const unsigned char *in, size_t len)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
+    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
+    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
 
+    memcpy(cctx->kmf.param.cv, iv, ivlen);
     s390x_kmf(in, len, out, cctx->fc, &cctx->kmf.param);
+    memcpy(iv, cctx->kmf.param.cv, ivlen);
     return 1;
 }
 
@@ -1393,9 +1409,9 @@
 static int s390x_aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                                  const unsigned char *in, size_t len);
 
-# define S390X_aes_128_ctr_CAPABLE	1	/* checked by callee */
-# define S390X_aes_192_ctr_CAPABLE	1
-# define S390X_aes_256_ctr_CAPABLE	1
+# define S390X_aes_128_ctr_CAPABLE	0	/* checked by callee */
+# define S390X_aes_192_ctr_CAPABLE	0
+# define S390X_aes_256_ctr_CAPABLE	0
 # define S390X_AES_CTR_CTX		EVP_AES_KEY
 
 # define s390x_aes_ctr_init_key aes_init_key
@@ -1563,8 +1579,7 @@
 /*-
  * Initialize context structure. Code is big-endian.
  */
-static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx,
-                                const unsigned char *iv)
+static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx)
 {
     ctx->kma.param.t.g[0] = 0;
     ctx->kma.param.t.g[1] = 0;
@@ -1575,12 +1590,11 @@
     ctx->kreslen = 0;
 
     if (ctx->ivlen == 12) {
-        memcpy(&ctx->kma.param.j0, iv, ctx->ivlen);
+        memcpy(&ctx->kma.param.j0, ctx->iv, ctx->ivlen);
         ctx->kma.param.j0.w[3] = 1;
         ctx->kma.param.cv.w = 1;
     } else {
         /* ctx->iv has the right size and is already padded. */
-        memcpy(ctx->iv, iv, ctx->ivlen);
         s390x_kma(ctx->iv, S390X_gcm_ivpadlen(ctx->ivlen), NULL, 0, NULL,
                   ctx->fc, &ctx->kma.param);
         ctx->fc |= S390X_KMA_HS;
@@ -1694,7 +1708,7 @@
         if (gctx->iv_gen == 0 || gctx->key_set == 0)
             return 0;
 
-        s390x_aes_gcm_setiv(gctx, gctx->iv);
+        s390x_aes_gcm_setiv(gctx);
 
         if (arg <= 0 || arg > gctx->ivlen)
             arg = gctx->ivlen;
@@ -1714,7 +1728,7 @@
             return 0;
 
         memcpy(gctx->iv + gctx->ivlen - arg, ptr, arg);
-        s390x_aes_gcm_setiv(gctx, gctx->iv);
+        s390x_aes_gcm_setiv(gctx);
         gctx->iv_set = 1;
         return 1;
 
@@ -1770,43 +1784,36 @@
 }
 
 /*-
- * Set key and/or iv. Returns 1 on success. Otherwise 0 is returned.
+ * Set key or iv or enc/dec. Returns 1 on success. Otherwise 0 is returned.
  */
 static int s390x_aes_gcm_init_key(EVP_CIPHER_CTX *ctx,
                                   const unsigned char *key,
                                   const unsigned char *iv, int enc)
 {
     S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
-    int keylen;
+    const int keylen = EVP_CIPHER_CTX_key_length(ctx);
 
-    if (iv == NULL && key == NULL)
-        return 1;
+    gctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT);
 
     if (key != NULL) {
-        keylen = EVP_CIPHER_CTX_key_length(ctx);
+        gctx->fc &= ~S390X_KMA_HS;
         memcpy(&gctx->kma.param.k, key, keylen);
-
-        gctx->fc = S390X_AES_FC(keylen);
-        if (!enc)
-            gctx->fc |= S390X_DECRYPT;
-
-        if (iv == NULL && gctx->iv_set)
-            iv = gctx->iv;
-
-        if (iv != NULL) {
-            s390x_aes_gcm_setiv(gctx, iv);
-            gctx->iv_set = 1;
-        }
         gctx->key_set = 1;
-    } else {
-        if (gctx->key_set)
-            s390x_aes_gcm_setiv(gctx, iv);
-        else
-            memcpy(gctx->iv, iv, gctx->ivlen);
+    }
 
-        gctx->iv_set = 1;
+    if (iv != NULL) {
+        memcpy(gctx->iv, iv, gctx->ivlen);
         gctx->iv_gen = 0;
+        gctx->iv_set = 1;
     }
+
+    if (gctx->key_set && gctx->iv_set)
+            s390x_aes_gcm_setiv(gctx);
+
+    gctx->fc &= ~(S390X_KMA_LPC | S390X_KMA_LAAD);
+    gctx->areslen = 0;
+    gctx->mreslen = 0;
+    gctx->kreslen = 0;
     return 1;
 }
 
@@ -1895,7 +1902,6 @@
         /* recall that we already did en-/decrypt gctx->mres
          * and returned it to caller... */
         OPENSSL_cleanse(tmp, gctx->mreslen);
-        gctx->iv_set = 0;
 
         enc = EVP_CIPHER_CTX_encrypting(ctx);
         if (enc) {
@@ -1929,8 +1935,8 @@
 }
 
 # define S390X_AES_XTS_CTX		EVP_AES_XTS_CTX
-# define S390X_aes_128_xts_CAPABLE	1	/* checked by callee */
-# define S390X_aes_256_xts_CAPABLE	1
+# define S390X_aes_128_xts_CAPABLE	0	/* checked by callee */
+# define S390X_aes_256_xts_CAPABLE	0
 
 # define s390x_aes_xts_init_key aes_xts_init_key
 static int s390x_aes_xts_init_key(EVP_CIPHER_CTX *ctx,
@@ -2134,9 +2140,10 @@
                                     const unsigned char *in, size_t len)
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
-    unsigned char *ivec = EVP_CIPHER_CTX_iv_noconst(ctx);
+    const unsigned char *ivec = EVP_CIPHER_CTX_iv(ctx);
     unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
     const int enc = EVP_CIPHER_CTX_encrypting(ctx);
+    unsigned char iv[EVP_MAX_IV_LENGTH];
 
     if (out != in
             || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->aes.ccm.m))
@@ -2152,8 +2159,9 @@
      * Get explicit iv (sequence number). We already have fixed iv
      * (server/client_write_iv) here.
      */
-    memcpy(ivec + EVP_CCM_TLS_FIXED_IV_LEN, in, EVP_CCM_TLS_EXPLICIT_IV_LEN);
-    s390x_aes_ccm_setiv(cctx, ivec, len);
+    memcpy(iv, ivec, sizeof(iv));
+    memcpy(iv + EVP_CCM_TLS_FIXED_IV_LEN, in, EVP_CCM_TLS_EXPLICIT_IV_LEN);
+    s390x_aes_ccm_setiv(cctx, iv, len);
 
     /* Process aad (sequence number|type|version|length) */
     s390x_aes_ccm_aad(cctx, buf, cctx->aes.ccm.tls_aad_len);
@@ -2180,42 +2188,35 @@
 }
 
 /*-
- * Set key and flag field and/or iv. Returns 1 if successful. Otherwise 0 is
- * returned.
+ * Set key or iv or enc/dec. Returns 1 if successful.
+ * Otherwise 0 is returned.
  */
 static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
                                   const unsigned char *key,
                                   const unsigned char *iv, int enc)
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
-    unsigned char *ivec;
-    int keylen;
+    const int keylen  = EVP_CIPHER_CTX_key_length(ctx);
+    unsigned char *ivec = EVP_CIPHER_CTX_iv_noconst(ctx);
 
-    if (iv == NULL && key == NULL)
-        return 1;
+    cctx->aes.ccm.fc = S390X_AES_FC(keylen);
 
     if (key != NULL) {
-        keylen = EVP_CIPHER_CTX_key_length(ctx);
-        cctx->aes.ccm.fc = S390X_AES_FC(keylen);
         memcpy(cctx->aes.ccm.kmac_param.k, key, keylen);
-
-        /* Store encoded m and l. */
-        cctx->aes.ccm.nonce.b[0] = ((cctx->aes.ccm.l - 1) & 0x7)
-                                 | (((cctx->aes.ccm.m - 2) >> 1) & 0x7) << 3;
-        memset(cctx->aes.ccm.nonce.b + 1, 0,
-               sizeof(cctx->aes.ccm.nonce.b));
-        cctx->aes.ccm.blocks = 0;
-
         cctx->aes.ccm.key_set = 1;
     }
-
     if (iv != NULL) {
-        ivec = EVP_CIPHER_CTX_iv_noconst(ctx);
         memcpy(ivec, iv, 15 - cctx->aes.ccm.l);
-
         cctx->aes.ccm.iv_set = 1;
     }
 
+    /* Store encoded m and l. */
+    cctx->aes.ccm.nonce.b[0] = ((cctx->aes.ccm.l - 1) & 0x7)
+                             | (((cctx->aes.ccm.m - 2) >> 1) & 0x7) << 3;
+    memset(cctx->aes.ccm.nonce.b + 1, 0, sizeof(cctx->aes.ccm.nonce.b) - 1);
+
+    cctx->aes.ccm.blocks = 0;
+    cctx->aes.ccm.len_set = 0;
     return 1;
 }
 
@@ -2230,8 +2231,9 @@
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
     const int enc = EVP_CIPHER_CTX_encrypting(ctx);
+    const unsigned char *ivec = EVP_CIPHER_CTX_iv(ctx);
+    unsigned char *buf;
     int rv;
-    unsigned char *buf, *ivec;
 
     if (!cctx->aes.ccm.key_set)
         return -1;
@@ -2253,7 +2255,6 @@
     if (out == NULL) {
         /* Update(): Pass message length. */
         if (in == NULL) {
-            ivec = EVP_CIPHER_CTX_iv_noconst(ctx);
             s390x_aes_ccm_setiv(cctx, ivec, len);
 
             cctx->aes.ccm.len_set = 1;
@@ -2279,7 +2280,6 @@
          * In case message length was not previously set explicitly via
          * Update(), set it now.
          */
-        ivec = EVP_CIPHER_CTX_iv_noconst(ctx);
         s390x_aes_ccm_setiv(cctx, ivec, len);
 
         cctx->aes.ccm.len_set = 1;
@@ -2304,9 +2304,6 @@
         if (rv == -1)
             OPENSSL_cleanse(out, len);
 
-        cctx->aes.ccm.iv_set = 0;
-        cctx->aes.ccm.tag_set = 0;
-        cctx->aes.ccm.len_set = 0;
         return rv;
     }
 }
@@ -2414,9 +2411,6 @@
             return 0;
 
         memcpy(ptr, cctx->aes.ccm.kmac_param.icv.b, cctx->aes.ccm.m);
-        cctx->aes.ccm.tag_set = 0;
-        cctx->aes.ccm.iv_set = 0;
-        cctx->aes.ccm.len_set = 0;
         return 1;
 
     case EVP_CTRL_COPY:
@@ -2453,7 +2447,7 @@
     nid##_##keylen##_##nmode,blocksize,					\
     keylen / 8,								\
     ivlen,								\
-    flags | EVP_CIPH_##MODE##_MODE,					\
+    flags | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_##MODE##_MODE,		\
     s390x_aes_##mode##_init_key,					\
     s390x_aes_##mode##_cipher,						\
     NULL,								\
@@ -2490,7 +2484,7 @@
     blocksize,								\
     (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * keylen / 8,	\
     ivlen,								\
-    flags | EVP_CIPH_##MODE##_MODE,					\
+    flags | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_##MODE##_MODE,		\
     s390x_aes_##mode##_init_key,					\
     s390x_aes_##mode##_cipher,						\
     s390x_aes_##mode##_cleanup,						\
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/e_camellia.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/e_camellia.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/e_camellia.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/e_camellia.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -55,16 +55,16 @@
 
 void cmll128_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec);
+                            unsigned char *ivec, int /*unused*/);
 void cmll128_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec);
+                            unsigned char *ivec, int /*unused*/);
 void cmll256_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec);
+                            unsigned char *ivec, int /*unused*/);
 void cmll256_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec);
+                            unsigned char *ivec, int /*unused*/);
 void cmll128_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
                               size_t blocks, const CAMELLIA_KEY *key,
                               unsigned char *ivec);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/evp_enc.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/evp_enc.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/evp_enc.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/evp_enc.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,6 +8,7 @@
  */
 
 #include <stdio.h>
+#include <limits.h>
 #include <assert.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
@@ -355,6 +356,19 @@
             return 1;
         } else {
             j = bl - i;
+
+            /*
+             * Once we've processed the first j bytes from in, the amount of
+             * data left that is a multiple of the block length is:
+             * (inl - j) & ~(bl - 1)
+             * We must ensure that this amount of data, plus the one block that
+             * we process from ctx->buf does not exceed INT_MAX
+             */
+            if (((inl - j) & ~(bl - 1)) > INT_MAX - bl) {
+                EVPerr(EVP_F_EVP_ENCRYPTDECRYPTUPDATE,
+                       EVP_R_OUTPUT_WOULD_OVERFLOW);
+                return 0;
+            }
             memcpy(&(ctx->buf[i]), in, j);
             inl -= j;
             in += j;
@@ -502,6 +516,19 @@
             EVPerr(EVP_F_EVP_DECRYPTUPDATE, EVP_R_PARTIALLY_OVERLAPPING);
             return 0;
         }
+        /*
+         * final_used is only ever set if buf_len is 0. Therefore the maximum
+         * length output we will ever see from evp_EncryptDecryptUpdate is
+         * the maximum multiple of the block length that is <= inl, or just:
+         * inl & ~(b - 1)
+         * Since final_used has been set then the final output length is:
+         * (inl & ~(b - 1)) + b
+         * This must never exceed INT_MAX
+         */
+        if ((inl & ~(b - 1)) > INT_MAX - b) {
+            EVPerr(EVP_F_EVP_DECRYPTUPDATE, EVP_R_OUTPUT_WOULD_OVERFLOW);
+            return 0;
+        }
         memcpy(out, ctx->final, b);
         out += b;
         fix_len = 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/evp_err.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/evp_err.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/evp_err.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/evp/evp_err.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -239,6 +239,8 @@
     "operation not supported for this keytype"},
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATON_NOT_INITIALIZED),
     "operaton not initialized"},
+    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OUTPUT_WOULD_OVERFLOW),
+    "output would overflow"},
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARTIALLY_OVERLAPPING),
     "partially overlapping buffers"},
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PBKDF2_ERROR), "pbkdf2 error"},
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/hmac/hm_ameth.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/hmac/hm_ameth.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/hmac/hm_ameth.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/hmac/hm_ameth.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -47,7 +47,8 @@
 
 static int hmac_pkey_public_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
 {
-    return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b));
+    /* the ameth pub_cmp must return 1 on match, 0 on mismatch */
+    return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b)) == 0;
 }
 
 static int hmac_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/mem_sec.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/mem_sec.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/mem_sec.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/mem_sec.c	2021-12-09 12:01:26.000000000 +0000
@@ -34,6 +34,12 @@
 #   include <errno.h>
 #  endif
 # endif
+# if defined(__FreeBSD__)
+#  define MADV_DONTDUMP MADV_NOCORE
+# endif
+# if !defined(MAP_CONCEAL)
+#  define MAP_CONCEAL 0
+# endif
 # include <sys/param.h>
 # include <sys/stat.h>
 # include <fcntl.h>
@@ -442,7 +448,7 @@
     if (1) {
 #ifdef MAP_ANON
         sh.map_result = mmap(NULL, sh.map_size,
-                             PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0);
+                             PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE|MAP_CONCEAL, -1, 0);
     } else {
 #endif
         int fd;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/modes/cbc128.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/modes/cbc128.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/modes/cbc128.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/modes/cbc128.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -69,7 +69,8 @@
         in += 16;
         out += 16;
     }
-    memcpy(ivec, iv, 16);
+    if (ivec != iv)
+        memcpy(ivec, iv, 16);
 }
 
 void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
@@ -114,7 +115,8 @@
                 out += 16;
             }
         }
-        memcpy(ivec, iv, 16);
+        if (ivec != iv)
+            memcpy(ivec, iv, 16);
     } else {
         if (STRICT_ALIGNMENT &&
             ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/modes/gcm128.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/modes/gcm128.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/modes/gcm128.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/modes/gcm128.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2010-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -1385,8 +1385,8 @@
                 else
                     ctx->Yi.d[3] = ctr;
                 for (i = 0; i < 16 / sizeof(size_t); ++i) {
-                    size_t c = in[i];
-                    out[i] = c ^ ctx->EKi.t[i];
+                    size_t c = in_t[i];
+                    out_t[i] = c ^ ctx->EKi.t[i];
                     ctx->Xi.t[i] ^= c;
                 }
                 GCM_MUL(ctx);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/objects/obj_dat.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/objects/obj_dat.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/objects/obj_dat.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/objects/obj_dat.h	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/obj_dat.pl
  *
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/objects/obj_xref.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/objects/obj_xref.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/objects/obj_xref.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/objects/obj_xref.h	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by objxref.pl
  *
- * Copyright 1998-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/o_time.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/o_time.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/o_time.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/o_time.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -133,8 +133,8 @@
 static int julian_adj(const struct tm *tm, int off_day, long offset_sec,
                       long *pday, int *psec)
 {
-    int offset_hms, offset_day;
-    long time_jd;
+    int offset_hms;
+    long offset_day, time_jd;
     int time_year, time_month, time_day;
     /* split offset into days and day seconds */
     offset_day = offset_sec / SECS_PER_DAY;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/pkcs12/p12_key.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/pkcs12/p12_key.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/pkcs12/p12_key.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/pkcs12/p12_key.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -101,7 +101,7 @@
 #endif
     v = EVP_MD_block_size(md_type);
     u = EVP_MD_size(md_type);
-    if (u < 0 || v <= 0)
+    if (u <= 0 || v <= 0)
         goto err;
     D = OPENSSL_malloc(v);
     Ai = OPENSSL_malloc(u);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/poly1305/asm/poly1305-armv4.pl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/poly1305/asm/poly1305-armv4.pl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/poly1305/asm/poly1305-armv4.pl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/poly1305/asm/poly1305-armv4.pl	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -133,10 +133,10 @@
 #  ifdef __thumb2__
 	itete	eq
 #  endif
-	addeq	r12,r11,#(poly1305_emit-.Lpoly1305_init)
-	addne	r12,r11,#(poly1305_emit_neon-.Lpoly1305_init)
-	addeq	r11,r11,#(poly1305_blocks-.Lpoly1305_init)
-	addne	r11,r11,#(poly1305_blocks_neon-.Lpoly1305_init)
+	addeq	r12,r11,#(.Lpoly1305_emit-.Lpoly1305_init)
+	addne	r12,r11,#(.Lpoly1305_emit_neon-.Lpoly1305_init)
+	addeq	r11,r11,#(.Lpoly1305_blocks-.Lpoly1305_init)
+	addne	r11,r11,#(.Lpoly1305_blocks_neon-.Lpoly1305_init)
 # endif
 # ifdef	__thumb2__
 	orr	r12,r12,#1	@ thumb-ify address
@@ -352,6 +352,7 @@
 .type	poly1305_emit,%function
 .align	5
 poly1305_emit:
+.Lpoly1305_emit:
 	stmdb	sp!,{r4-r11}
 .Lpoly1305_emit_enter:
 
@@ -671,6 +672,7 @@
 .type	poly1305_blocks_neon,%function
 .align	5
 poly1305_blocks_neon:
+.Lpoly1305_blocks_neon:
 	ldr	ip,[$ctx,#36]		@ is_base2_26
 	ands	$len,$len,#-16
 	beq	.Lno_data_neon
@@ -1157,6 +1159,7 @@
 .type	poly1305_emit_neon,%function
 .align	5
 poly1305_emit_neon:
+.Lpoly1305_emit_neon:
 	ldr	ip,[$ctx,#36]		@ is_base2_26
 
 	stmdb	sp!,{r4-r11}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/poly1305/poly1305_ameth.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/poly1305/poly1305_ameth.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/poly1305/poly1305_ameth.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/poly1305/poly1305_ameth.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -43,7 +43,7 @@
 
 static int poly1305_pkey_public_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
 {
-    return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b));
+    return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b)) == 0;
 }
 
 static int poly1305_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ppccap.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ppccap.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ppccap.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ppccap.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2009-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -211,6 +211,30 @@
 # if __GLIBC_PREREQ(2, 16)
 #  include <sys/auxv.h>
 #  define OSSL_IMPLEMENT_GETAUXVAL
+# elif defined(__ANDROID_API__)
+/* see https://developer.android.google.cn/ndk/guides/cpu-features */
+#  if __ANDROID_API__ >= 18
+#   include <sys/auxv.h>
+#   define OSSL_IMPLEMENT_GETAUXVAL
+#  endif
+# endif
+#endif
+
+#if defined(__FreeBSD__)
+# include <sys/param.h>
+# if __FreeBSD_version >= 1200000
+#  include <sys/auxv.h>
+#  define OSSL_IMPLEMENT_GETAUXVAL
+
+static unsigned long getauxval(unsigned long key)
+{
+  unsigned long val = 0ul;
+
+  if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
+    return 0ul;
+
+  return val;
+}
 # endif
 #endif
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rand/rand_lib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rand/rand_lib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rand/rand_lib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rand/rand_lib.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -432,9 +432,13 @@
 RAND_POOL *rand_pool_new(int entropy_requested, int secure,
                          size_t min_len, size_t max_len)
 {
-    RAND_POOL *pool = OPENSSL_zalloc(sizeof(*pool));
+    RAND_POOL *pool;
     size_t min_alloc_size = RAND_POOL_MIN_ALLOCATION(secure);
 
+    if (!RUN_ONCE(&rand_init, do_rand_init))
+        return NULL;
+
+    pool = OPENSSL_zalloc(sizeof(*pool));
     if (pool == NULL) {
         RANDerr(RAND_F_RAND_POOL_NEW, ERR_R_MALLOC_FAILURE);
         return NULL;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rand/rand_unix.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rand/rand_unix.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rand/rand_unix.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rand/rand_unix.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -34,6 +34,9 @@
 #if defined(__OpenBSD__)
 # include <sys/param.h>
 #endif
+#if defined(__APPLE__)
+# include <CommonCrypto/CommonRandom.h>
+#endif
 
 #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
 # include <sys/types.h>
@@ -378,6 +381,11 @@
         if (errno != ENOSYS)
             return -1;
     }
+#  elif defined(__APPLE__)
+    if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
+	    return (ssize_t)buflen;
+
+    return -1;
 #  else
     union {
         void *p;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rsa/rsa_prn.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rsa/rsa_prn.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rsa/rsa_prn.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rsa/rsa_prn.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -34,9 +34,11 @@
     EVP_PKEY *pk;
     int ret;
     pk = EVP_PKEY_new();
-    if (pk == NULL || !EVP_PKEY_set1_RSA(pk, (RSA *)x))
+    if (pk == NULL)
         return 0;
-    ret = EVP_PKEY_print_private(bp, pk, off, NULL);
+    ret = EVP_PKEY_set1_RSA(pk, (RSA *)x);
+    if (ret)
+        ret = EVP_PKEY_print_private(bp, pk, off, NULL);
     EVP_PKEY_free(pk);
     return ret;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rsa/rsa_ssl.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rsa/rsa_ssl.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rsa/rsa_ssl.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/rsa/rsa_ssl.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -55,7 +55,7 @@
 
 /*
  * Copy of RSA_padding_check_PKCS1_type_2 with a twist that rejects padding
- * if nul delimiter is not preceded by 8 consecutive 0x03 bytes. It also
+ * if nul delimiter is preceded by 8 consecutive 0x03 bytes. It also
  * preserves error code reporting for backward compatibility.
  */
 int RSA_padding_check_SSLv23(unsigned char *to, int tlen,
@@ -122,7 +122,13 @@
                                    RSA_R_NULL_BEFORE_BLOCK_MISSING);
     mask = ~good;
 
-    good &= constant_time_ge(threes_in_row, 8);
+    /*
+     * Reject if nul delimiter is preceded by 8 consecutive 0x03 bytes. Note
+     * that RFC5246 incorrectly states this the other way around, i.e. reject
+     * if it is not preceded by 8 consecutive 0x03 bytes. However this is
+     * corrected in subsequent errata for that RFC.
+     */
+    good &= constant_time_lt(threes_in_row, 8);
     err = constant_time_select_int(mask | good, err,
                                    RSA_R_SSLV3_ROLLBACK_ATTACK);
     mask = ~good;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/siphash/siphash_ameth.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/siphash/siphash_ameth.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/siphash/siphash_ameth.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/siphash/siphash_ameth.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -44,7 +44,7 @@
 
 static int siphash_pkey_public_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
 {
-    return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b));
+    return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b)) == 0;
 }
 
 static int siphash_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sm2/sm2_crypt.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sm2/sm2_crypt.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sm2/sm2_crypt.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sm2/sm2_crypt.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2017 Ribose Inc. All Rights Reserved.
  * Ported from Ribose contributions from Botan.
  *
@@ -61,29 +61,20 @@
     return field_size;
 }
 
-int sm2_plaintext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len,
-                       size_t *pt_size)
+int sm2_plaintext_size(const unsigned char *ct, size_t ct_size, size_t *pt_size)
 {
-    const size_t field_size = ec_field_size(EC_KEY_get0_group(key));
-    const int md_size = EVP_MD_size(digest);
-    size_t overhead;
+    struct SM2_Ciphertext_st *sm2_ctext = NULL;
 
-    if (md_size < 0) {
-        SM2err(SM2_F_SM2_PLAINTEXT_SIZE, SM2_R_INVALID_DIGEST);
-        return 0;
-    }
-    if (field_size == 0) {
-        SM2err(SM2_F_SM2_PLAINTEXT_SIZE, SM2_R_INVALID_FIELD);
-        return 0;
-    }
+    sm2_ctext = d2i_SM2_Ciphertext(NULL, &ct, ct_size);
 
-    overhead = 10 + 2 * field_size + (size_t)md_size;
-    if (msg_len <= overhead) {
+    if (sm2_ctext == NULL) {
         SM2err(SM2_F_SM2_PLAINTEXT_SIZE, SM2_R_INVALID_ENCODING);
         return 0;
     }
 
-    *pt_size = msg_len - overhead;
+    *pt_size = sm2_ctext->C2->length;
+    SM2_Ciphertext_free(sm2_ctext);
+
     return 1;
 }
 
@@ -303,6 +294,10 @@
     C2 = sm2_ctext->C2->data;
     C3 = sm2_ctext->C3->data;
     msg_len = sm2_ctext->C2->length;
+    if (*ptext_len < (size_t)msg_len) {
+        SM2err(SM2_F_SM2_DECRYPT, SM2_R_BUFFER_TOO_SMALL);
+        goto done;
+    }
 
     ctx = BN_CTX_new();
     if (ctx == NULL) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sm2/sm2_pmeth.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sm2/sm2_pmeth.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sm2/sm2_pmeth.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sm2/sm2_pmeth.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -151,7 +151,7 @@
     const EVP_MD *md = (dctx->md == NULL) ? EVP_sm3() : dctx->md;
 
     if (out == NULL) {
-        if (!sm2_plaintext_size(ec, md, inlen, outlen))
+        if (!sm2_plaintext_size(in, inlen, outlen))
             return -1;
         else
             return 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sparcv9cap.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sparcv9cap.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sparcv9cap.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/sparcv9cap.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <openssl/bn.h>
 #include "internal/cryptlib.h"
+#include "bn/bn_local.h"    /* for definition of bn_mul_mont */
 
 #include "sparc_arch.h"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/srp/srp_lib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/srp/srp_lib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/srp/srp_lib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/srp/srp_lib.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -177,6 +177,7 @@
                             const BIGNUM *x, const BIGNUM *a, const BIGNUM *u)
 {
     BIGNUM *tmp = NULL, *tmp2 = NULL, *tmp3 = NULL, *k = NULL, *K = NULL;
+    BIGNUM *xtmp = NULL;
     BN_CTX *bn_ctx;
 
     if (u == NULL || B == NULL || N == NULL || g == NULL || x == NULL
@@ -185,10 +186,13 @@
 
     if ((tmp = BN_new()) == NULL ||
         (tmp2 = BN_new()) == NULL ||
-        (tmp3 = BN_new()) == NULL)
+        (tmp3 = BN_new()) == NULL ||
+        (xtmp = BN_new()) == NULL)
         goto err;
 
-    if (!BN_mod_exp(tmp, g, x, N, bn_ctx))
+    BN_with_flags(xtmp, x, BN_FLG_CONSTTIME);
+    BN_set_flags(tmp, BN_FLG_CONSTTIME);
+    if (!BN_mod_exp(tmp, g, xtmp, N, bn_ctx))
         goto err;
     if ((k = srp_Calc_k(N, g)) == NULL)
         goto err;
@@ -196,7 +200,7 @@
         goto err;
     if (!BN_mod_sub(tmp, B, tmp2, N, bn_ctx))
         goto err;
-    if (!BN_mul(tmp3, u, x, bn_ctx))
+    if (!BN_mul(tmp3, u, xtmp, bn_ctx))
         goto err;
     if (!BN_add(tmp2, a, tmp3))
         goto err;
@@ -208,6 +212,7 @@
 
  err:
     BN_CTX_free(bn_ctx);
+    BN_free(xtmp);
     BN_clear_free(tmp);
     BN_clear_free(tmp2);
     BN_clear_free(tmp3);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/srp/srp_vfy.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/srp/srp_vfy.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/srp/srp_vfy.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/srp/srp_vfy.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -684,7 +684,7 @@
     BIGNUM *x = NULL;
     BN_CTX *bn_ctx = BN_CTX_new();
     unsigned char tmp2[MAX_LEN];
-    BIGNUM *salttmp = NULL;
+    BIGNUM *salttmp = NULL, *verif;
 
     if ((user == NULL) ||
         (pass == NULL) ||
@@ -707,17 +707,18 @@
     if (x == NULL)
         goto err;
 
-    *verifier = BN_new();
-    if (*verifier == NULL)
+    verif = BN_new();
+    if (verif == NULL)
         goto err;
 
-    if (!BN_mod_exp(*verifier, g, x, N, bn_ctx)) {
-        BN_clear_free(*verifier);
+    if (!BN_mod_exp(verif, g, x, N, bn_ctx)) {
+        BN_clear_free(verif);
         goto err;
     }
 
     result = 1;
     *salt = salttmp;
+    *verifier = verif;
 
  err:
     if (salt != NULL && *salt != salttmp)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/store/loader_file.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/store/loader_file.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/store/loader_file.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/store/loader_file.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -370,6 +370,7 @@
     mem->data = (char *)new_data;
     mem->max = mem->length = (size_t)new_data_len;
     X509_SIG_free(p8);
+    p8 = NULL;
 
     store_info = ossl_store_info_new_EMBEDDED(PEM_STRING_PKCS8INF, mem);
     if (store_info == NULL) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ts/ts_rsp_verify.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ts/ts_rsp_verify.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ts/ts_rsp_verify.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ts/ts_rsp_verify.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -612,6 +612,7 @@
  err:
     EVP_MD_CTX_free(md_ctx);
     X509_ALGOR_free(*md_alg);
+    *md_alg = NULL;
     OPENSSL_free(*imprint);
     *imprint_len = 0;
     *imprint = 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ts/ts_verify_ctx.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ts/ts_verify_ctx.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ts/ts_verify_ctx.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/ts/ts_verify_ctx.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -126,6 +126,8 @@
         goto err;
     msg = imprint->hashed_msg;
     ret->imprint_len = ASN1_STRING_length(msg);
+    if (ret->imprint_len <= 0)
+        goto err;
     if ((ret->imprint = OPENSSL_malloc(ret->imprint_len)) == NULL)
         goto err;
     memcpy(ret->imprint, ASN1_STRING_get0_data(msg), ret->imprint_len);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/uid.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/uid.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/uid.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/uid.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -36,6 +36,12 @@
 #   include <sys/auxv.h>
 #   define OSSL_IMPLEMENT_GETAUXVAL
 #  endif
+# elif defined(__ANDROID_API__)
+/* see https://developer.android.google.cn/ndk/guides/cpu-features */
+#  if __ANDROID_API__ >= 18
+#   include <sys/auxv.h>
+#   define OSSL_IMPLEMENT_GETAUXVAL
+#  endif
 # endif
 
 int OPENSSL_issetugid(void)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/t_x509.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/t_x509.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/t_x509.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/t_x509.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -365,9 +365,9 @@
         BIO_puts(out, "\n");
     } else
         BIO_printf(out, "%*sNo Rejected Uses.\n", indent, "");
-    alias = X509_alias_get0(x, NULL);
+    alias = X509_alias_get0(x, &i);
     if (alias)
-        BIO_printf(out, "%*sAlias: %s\n", indent, "", alias);
+        BIO_printf(out, "%*sAlias: %.*s\n", indent, "", i, alias);
     keyid = X509_keyid_get0(x, &keyidlen);
     if (keyid) {
         BIO_printf(out, "%*sKey Id: ", indent, "");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_cmp.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_cmp.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_cmp.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_cmp.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -39,6 +39,8 @@
     if (ctx == NULL)
         goto err;
     f = X509_NAME_oneline(a->cert_info.issuer, NULL, 0);
+    if (f == NULL)
+        goto err;
     if (!EVP_DigestInit_ex(ctx, EVP_md5(), NULL))
         goto err;
     if (!EVP_DigestUpdate(ctx, (unsigned char *)f, strlen(f)))
@@ -133,19 +135,21 @@
  */
 int X509_cmp(const X509 *a, const X509 *b)
 {
-    int rv;
+    int rv = 0;
 
     if (a == b) /* for efficiency */
         return 0;
-    /* ensure hash is valid */
-    if (X509_check_purpose((X509 *)a, -1, 0) != 1)
-        return -2;
-    if (X509_check_purpose((X509 *)b, -1, 0) != 1)
-        return -2;
 
-    rv = memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH);
-    if (rv)
+    /* try to make sure hash is valid */
+    (void)X509_check_purpose((X509 *)a, -1, 0);
+    (void)X509_check_purpose((X509 *)b, -1, 0);
+
+    if ((a->ex_flags & EXFLAG_NO_FINGERPRINT) == 0
+            && (b->ex_flags & EXFLAG_NO_FINGERPRINT) == 0)
+        rv = memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH);
+    if (rv != 0)
         return rv;
+
     /* Check for match against stored encoding too */
     if (!a->cert_info.enc.modified && !b->cert_info.enc.modified) {
         if (a->cert_info.enc.len < b->cert_info.enc.len)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_vfy.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_vfy.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_vfy.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_vfy.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -323,9 +323,10 @@
 }
 
 /*
- * Find in given STACK_OF(X509) sk a non-expired issuer cert (if any) of given cert x.
- * The issuer must not be the same as x and must not yet be in ctx->chain, where the
- * exceptional case x is self-issued and ctx->chain has just one element is allowed.
+ * Find in given STACK_OF(X509) sk an issuer cert of given cert x.
+ * The issuer must not yet be in ctx->chain, where the exceptional case
+ * that x is self-issued and ctx->chain has just one element is allowed.
+ * Prefer the first one that is not expired, else take the last expired one.
  */
 static X509 *find_issuer(X509_STORE_CTX *ctx, STACK_OF(X509) *sk, X509 *x)
 {
@@ -334,11 +335,7 @@
 
     for (i = 0; i < sk_X509_num(sk); i++) {
         issuer = sk_X509_value(sk, i);
-        /*
-         * Below check 'issuer != x' is an optimization and safety precaution:
-         * Candidate issuer cert cannot be the same as the subject cert 'x'.
-         */
-        if (issuer != x && ctx->check_issued(ctx, x, issuer)
+        if (ctx->check_issued(ctx, x, issuer)
             && (((x->ex_flags & EXFLAG_SI) != 0 && sk_X509_num(ctx->chain) == 1)
                 || !sk_X509_contains(ctx->chain, issuer))) {
             rv = issuer;
@@ -527,15 +524,19 @@
                 ret = 1;
             break;
         }
-        if ((ctx->param->flags & X509_V_FLAG_X509_STRICT) && num > 1) {
+        if (ret > 0
+            && (ctx->param->flags & X509_V_FLAG_X509_STRICT) && num > 1) {
             /* Check for presence of explicit elliptic curve parameters */
             ret = check_curve(x);
-            if (ret < 0)
+            if (ret < 0) {
                 ctx->error = X509_V_ERR_UNSPECIFIED;
-            else if (ret == 0)
+                ret = 0;
+            } else if (ret == 0) {
                 ctx->error = X509_V_ERR_EC_KEY_EXPLICIT_PARAMS;
+            }
         }
-        if ((x->ex_flags & EXFLAG_CA) == 0
+        if (ret > 0
+            && (x->ex_flags & EXFLAG_CA) == 0
             && x->ex_pathlen != -1
             && (ctx->param->flags & X509_V_FLAG_X509_STRICT)) {
             ctx->error = X509_V_ERR_INVALID_EXTENSION;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_vpm.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_vpm.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_vpm.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x509_vpm.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -199,7 +199,8 @@
             return 0;
     }
 
-    /* Copy the host flags if and only if we're copying the host list */
+    x509_verify_param_copy(hostflags, 0);
+
     if (test_x509_verify_param_copy(hosts, NULL)) {
         sk_OPENSSL_STRING_pop_free(dest->hosts, str_free);
         dest->hosts = NULL;
@@ -208,7 +209,6 @@
                 sk_OPENSSL_STRING_deep_copy(src->hosts, str_copy, str_free);
             if (dest->hosts == NULL)
                 return 0;
-            dest->hostflags = src->hostflags;
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x_all.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x_all.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x_all.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x_all.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -363,7 +363,7 @@
                 unsigned int *len)
 {
     if (type == EVP_sha1() && (data->ex_flags & EXFLAG_SET) != 0
-            && (data->ex_flags & EXFLAG_INVALID) == 0) {
+            && (data->ex_flags & EXFLAG_NO_FINGERPRINT) == 0) {
         /* Asking for SHA1 and we already computed it. */
         if (len != NULL)
             *len = sizeof(data->sha1_hash);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x_attrib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x_attrib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x_attrib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509/x_attrib.c	2021-12-09 12:01:26.000000000 +0000
@@ -37,10 +37,13 @@
 {
     X509_ATTRIBUTE *ret = NULL;
     ASN1_TYPE *val = NULL;
+    ASN1_OBJECT *oid;
 
+    if ((oid = OBJ_nid2obj(nid)) == NULL)
+        return NULL;
     if ((ret = X509_ATTRIBUTE_new()) == NULL)
         return NULL;
-    ret->object = OBJ_nid2obj(nid);
+    ret->object = oid;
     if ((val = ASN1_TYPE_new()) == NULL)
         goto err;
     if (!sk_ASN1_TYPE_push(ret->set, val))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_akey.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_akey.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_akey.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_akey.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -39,20 +39,48 @@
                                                  STACK_OF(CONF_VALUE)
                                                  *extlist)
 {
-    char *tmp;
+    char *tmp = NULL;
+    STACK_OF(CONF_VALUE) *origextlist = extlist, *tmpextlist;
+
     if (akeyid->keyid) {
         tmp = OPENSSL_buf2hexstr(akeyid->keyid->data, akeyid->keyid->length);
-        X509V3_add_value("keyid", tmp, &extlist);
+        if (tmp == NULL) {
+            X509V3err(X509V3_F_I2V_AUTHORITY_KEYID, ERR_R_MALLOC_FAILURE);
+            return NULL;
+        }
+        if (!X509V3_add_value("keyid", tmp, &extlist)) {
+            OPENSSL_free(tmp);
+            X509V3err(X509V3_F_I2V_AUTHORITY_KEYID, ERR_R_X509_LIB);
+            goto err;
+        }
         OPENSSL_free(tmp);
     }
-    if (akeyid->issuer)
-        extlist = i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist);
+    if (akeyid->issuer) {
+        tmpextlist = i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist);
+        if (tmpextlist == NULL) {
+            X509V3err(X509V3_F_I2V_AUTHORITY_KEYID, ERR_R_X509_LIB);
+            goto err;
+        }
+        extlist = tmpextlist;
+    }
     if (akeyid->serial) {
         tmp = OPENSSL_buf2hexstr(akeyid->serial->data, akeyid->serial->length);
-        X509V3_add_value("serial", tmp, &extlist);
+        if (tmp == NULL) {
+            X509V3err(X509V3_F_I2V_AUTHORITY_KEYID, ERR_R_MALLOC_FAILURE);
+            goto err;
+        }
+        if (!X509V3_add_value("serial", tmp, &extlist)) {
+            OPENSSL_free(tmp);
+            X509V3err(X509V3_F_I2V_AUTHORITY_KEYID, ERR_R_X509_LIB);
+            goto err;
+        }
         OPENSSL_free(tmp);
     }
     return extlist;
+ err:
+    if (origextlist == NULL)
+        sk_CONF_VALUE_pop_free(extlist, X509V3_conf_free);
+    return NULL;
 }
 
 /*-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_alt.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_alt.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_alt.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_alt.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "crypto/x509.h"
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 #include "ext_dat.h"
@@ -99,17 +100,20 @@
         break;
 
     case GEN_EMAIL:
-        if (!X509V3_add_value_uchar("email", gen->d.ia5->data, &ret))
+        if (!x509v3_add_len_value_uchar("email", gen->d.ia5->data,
+                                        gen->d.ia5->length, &ret))
             return NULL;
         break;
 
     case GEN_DNS:
-        if (!X509V3_add_value_uchar("DNS", gen->d.ia5->data, &ret))
+        if (!x509v3_add_len_value_uchar("DNS", gen->d.ia5->data,
+                                        gen->d.ia5->length, &ret))
             return NULL;
         break;
 
     case GEN_URI:
-        if (!X509V3_add_value_uchar("URI", gen->d.ia5->data, &ret))
+        if (!x509v3_add_len_value_uchar("URI", gen->d.ia5->data,
+                                        gen->d.ia5->length, &ret))
             return NULL;
         break;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_cpols.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_cpols.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_cpols.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_cpols.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -422,7 +422,8 @@
         qualinfo = sk_POLICYQUALINFO_value(quals, i);
         switch (OBJ_obj2nid(qualinfo->pqualid)) {
         case NID_id_qt_cps:
-            BIO_printf(out, "%*sCPS: %s\n", indent, "",
+            BIO_printf(out, "%*sCPS: %.*s\n", indent, "",
+                       qualinfo->d.cpsuri->length,
                        qualinfo->d.cpsuri->data);
             break;
 
@@ -447,7 +448,8 @@
     if (notice->noticeref) {
         NOTICEREF *ref;
         ref = notice->noticeref;
-        BIO_printf(out, "%*sOrganization: %s\n", indent, "",
+        BIO_printf(out, "%*sOrganization: %.*s\n", indent, "",
+                   ref->organization->length,
                    ref->organization->data);
         BIO_printf(out, "%*sNumber%s: ", indent, "",
                    sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "");
@@ -470,7 +472,8 @@
         BIO_puts(out, "\n");
     }
     if (notice->exptext)
-        BIO_printf(out, "%*sExplicit Text: %s\n", indent, "",
+        BIO_printf(out, "%*sExplicit Text: %.*s\n", indent, "",
+                   notice->exptext->length,
                    notice->exptext->data);
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3err.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3err.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3err.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3err.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -39,6 +39,8 @@
      "i2s_ASN1_INTEGER"},
     {ERR_PACK(ERR_LIB_X509V3, X509V3_F_I2V_AUTHORITY_INFO_ACCESS, 0),
      "i2v_AUTHORITY_INFO_ACCESS"},
+    {ERR_PACK(ERR_LIB_X509V3, X509V3_F_I2V_AUTHORITY_KEYID, 0),
+     "i2v_AUTHORITY_KEYID"},
     {ERR_PACK(ERR_LIB_X509V3, X509V3_F_LEVEL_ADD_NODE, 0), "level_add_node"},
     {ERR_PACK(ERR_LIB_X509V3, X509V3_F_NOTICE_SECTION, 0), "notice_section"},
     {ERR_PACK(ERR_LIB_X509V3, X509V3_F_NREF_NOS, 0), "nref_nos"},
@@ -104,6 +106,8 @@
     {ERR_PACK(ERR_LIB_X509V3, X509V3_F_V3_GENERIC_EXTENSION, 0),
      "v3_generic_extension"},
     {ERR_PACK(ERR_LIB_X509V3, X509V3_F_X509V3_ADD1_I2D, 0), "X509V3_add1_i2d"},
+    {ERR_PACK(ERR_LIB_X509V3, X509V3_F_X509V3_ADD_LEN_VALUE, 0),
+     "x509v3_add_len_value"},
     {ERR_PACK(ERR_LIB_X509V3, X509V3_F_X509V3_ADD_VALUE, 0),
      "X509V3_add_value"},
     {ERR_PACK(ERR_LIB_X509V3, X509V3_F_X509V3_EXT_ADD, 0), "X509V3_EXT_add"},
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_ncons.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_ncons.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_ncons.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_ncons.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2003-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -63,8 +63,31 @@
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
 
+
+#define IA5_OFFSET_LEN(ia5base, offset) \
+    ((ia5base)->length - ((unsigned char *)(offset) - (ia5base)->data))
+
+/* Like memchr but for ASN1_IA5STRING. Additionally you can specify the
+ * starting point to search from
+ */
+# define ia5memchr(str, start, c) memchr(start, c, IA5_OFFSET_LEN(str, start))
+
+/* Like memrrchr but for ASN1_IA5STRING */
+static char *ia5memrchr(ASN1_IA5STRING *str, int c)
+{
+    int i;
+
+    for (i = str->length; i > 0 && str->data[i - 1] != c; i--);
+
+    if (i == 0)
+        return NULL;
+
+    return (char *)&str->data[i - 1];
+}
+
 /*
- * We cannot use strncasecmp here because that applies locale specific rules.
+ * We cannot use strncasecmp here because that applies locale specific rules. It
+ * also doesn't work with ASN1_STRINGs that may have embedded NUL characters.
  * For example in Turkish 'I' is not the uppercase character for 'i'. We need to
  * do a simple ASCII case comparison ignoring the locale (that is why we use
  * numeric constants below).
@@ -89,20 +112,12 @@
 
             /* c1 > c2 */
             return 1;
-        } else if (*s1 == 0) {
-            /* If we get here we know that *s2 == 0 too */
-            return 0;
         }
     }
 
     return 0;
 }
 
-static int ia5casecmp(const char *s1, const char *s2)
-{
-    return ia5ncasecmp(s1, s2, SIZE_MAX);
-}
-
 static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
                                   X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
@@ -337,7 +352,7 @@
         --utf8_length;
 
     /* Reject *embedded* NULs */
-    if ((size_t)utf8_length != strlen((char *)utf8_value)) {
+    if (memchr(utf8_value, 0, utf8_length) != NULL) {
         OPENSSL_free(utf8_value);
         return X509_V_ERR_UNSUPPORTED_NAME_SYNTAX;
     }
@@ -536,9 +551,14 @@
 {
     char *baseptr = (char *)base->data;
     char *dnsptr = (char *)dns->data;
+
     /* Empty matches everything */
-    if (!*baseptr)
+    if (base->length == 0)
         return X509_V_OK;
+
+    if (dns->length < base->length)
+        return X509_V_ERR_PERMITTED_VIOLATION;
+
     /*
      * Otherwise can add zero or more components on the left so compare RHS
      * and if dns is longer and expect '.' as preceding character.
@@ -549,7 +569,7 @@
             return X509_V_ERR_PERMITTED_VIOLATION;
     }
 
-    if (ia5casecmp(baseptr, dnsptr))
+    if (ia5ncasecmp(baseptr, dnsptr, base->length))
         return X509_V_ERR_PERMITTED_VIOLATION;
 
     return X509_V_OK;
@@ -560,16 +580,17 @@
 {
     const char *baseptr = (char *)base->data;
     const char *emlptr = (char *)eml->data;
+    const char *baseat = ia5memrchr(base, '@');
+    const char *emlat = ia5memrchr(eml, '@');
+    size_t basehostlen, emlhostlen;
 
-    const char *baseat = strchr(baseptr, '@');
-    const char *emlat = strchr(emlptr, '@');
     if (!emlat)
         return X509_V_ERR_UNSUPPORTED_NAME_SYNTAX;
     /* Special case: initial '.' is RHS match */
-    if (!baseat && (*baseptr == '.')) {
+    if (!baseat && base->length > 0 && (*baseptr == '.')) {
         if (eml->length > base->length) {
             emlptr += eml->length - base->length;
-            if (ia5casecmp(baseptr, emlptr) == 0)
+            if (ia5ncasecmp(baseptr, emlptr, base->length) == 0)
                 return X509_V_OK;
         }
         return X509_V_ERR_PERMITTED_VIOLATION;
@@ -589,8 +610,10 @@
         baseptr = baseat + 1;
     }
     emlptr = emlat + 1;
+    basehostlen = IA5_OFFSET_LEN(base, baseptr);
+    emlhostlen = IA5_OFFSET_LEN(eml, emlptr);
     /* Just have hostname left to match: case insensitive */
-    if (ia5casecmp(baseptr, emlptr))
+    if (basehostlen != emlhostlen || ia5ncasecmp(baseptr, emlptr, emlhostlen))
         return X509_V_ERR_PERMITTED_VIOLATION;
 
     return X509_V_OK;
@@ -601,10 +624,14 @@
 {
     const char *baseptr = (char *)base->data;
     const char *hostptr = (char *)uri->data;
-    const char *p = strchr(hostptr, ':');
+    const char *p = ia5memchr(uri, (char *)uri->data, ':');
     int hostlen;
+
     /* Check for foo:// and skip past it */
-    if (!p || (p[1] != '/') || (p[2] != '/'))
+    if (p == NULL
+            || IA5_OFFSET_LEN(uri, p) < 3
+            || p[1] != '/'
+            || p[2] != '/')
         return X509_V_ERR_UNSUPPORTED_NAME_SYNTAX;
     hostptr = p + 3;
 
@@ -612,13 +639,13 @@
 
     /* Look for a port indicator as end of hostname first */
 
-    p = strchr(hostptr, ':');
+    p = ia5memchr(uri, hostptr, ':');
     /* Otherwise look for trailing slash */
-    if (!p)
-        p = strchr(hostptr, '/');
+    if (p == NULL)
+        p = ia5memchr(uri, hostptr, '/');
 
-    if (!p)
-        hostlen = strlen(hostptr);
+    if (p == NULL)
+        hostlen = IA5_OFFSET_LEN(uri, hostptr);
     else
         hostlen = p - hostptr;
 
@@ -626,7 +653,7 @@
         return X509_V_ERR_UNSUPPORTED_NAME_SYNTAX;
 
     /* Special case: initial '.' is RHS match */
-    if (*baseptr == '.') {
+    if (base->length > 0 && *baseptr == '.') {
         if (hostlen > base->length) {
             p = hostptr + hostlen - base->length;
             if (ia5ncasecmp(p, baseptr, base->length) == 0)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_pci.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_pci.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_pci.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_pci.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -77,7 +77,8 @@
     i2a_ASN1_OBJECT(out, pci->proxyPolicy->policyLanguage);
     BIO_puts(out, "\n");
     if (pci->proxyPolicy->policy && pci->proxyPolicy->policy->data)
-        BIO_printf(out, "%*sPolicy Text: %s\n", indent, "",
+        BIO_printf(out, "%*sPolicy Text: %.*s\n", indent, "",
+                   pci->proxyPolicy->policy->length,
                    pci->proxyPolicy->policy->data);
     return 1;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_purp.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_purp.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_purp.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_purp.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -348,14 +348,17 @@
 /* Check that issuer public key algorithm matches subject signature algorithm */
 static int check_sig_alg_match(const EVP_PKEY *pkey, const X509 *subject)
 {
-    int pkey_nid;
+    int pkey_sig_nid, subj_sig_nid;
 
     if (pkey == NULL)
         return X509_V_ERR_NO_ISSUER_PUBLIC_KEY;
+    if (OBJ_find_sigid_algs(EVP_PKEY_base_id(pkey),
+                            NULL, &pkey_sig_nid) == 0)
+        pkey_sig_nid = EVP_PKEY_base_id(pkey);
     if (OBJ_find_sigid_algs(OBJ_obj2nid(subject->cert_info.signature.algorithm),
-                            NULL, &pkey_nid) == 0)
+                            NULL, &subj_sig_nid) == 0)
         return X509_V_ERR_UNSUPPORTED_SIGNATURE_ALGORITHM;
-    if (EVP_PKEY_type(pkey_nid) != EVP_PKEY_base_id(pkey))
+    if (pkey_sig_nid != EVP_PKEY_type(subj_sig_nid))
         return X509_V_ERR_SIGNATURE_ALGORITHM_MISMATCH;
     return X509_V_OK;
 }
@@ -391,7 +394,8 @@
     }
 
     if (!X509_digest(x, EVP_sha1(), x->sha1_hash, NULL))
-        x->ex_flags |= EXFLAG_INVALID;
+        x->ex_flags |= (EXFLAG_NO_FINGERPRINT | EXFLAG_INVALID);
+
     /* V1 should mean no extensions ... */
     if (!X509_get_version(x))
         x->ex_flags |= EXFLAG_V1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_utl.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_utl.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_utl.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/crypto/x509v3/v3_utl.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,6 +12,7 @@
 #include "e_os.h"
 #include "internal/cryptlib.h"
 #include <stdio.h>
+#include <string.h>
 #include "crypto/ctype.h"
 #include <openssl/conf.h>
 #include <openssl/crypto.h>
@@ -34,17 +35,26 @@
 
 /* Add a CONF_VALUE name value pair to stack */
 
-int X509V3_add_value(const char *name, const char *value,
-                     STACK_OF(CONF_VALUE) **extlist)
+static int x509v3_add_len_value(const char *name, const char *value,
+                                size_t vallen, STACK_OF(CONF_VALUE) **extlist)
 {
     CONF_VALUE *vtmp = NULL;
     char *tname = NULL, *tvalue = NULL;
     int sk_allocated = (*extlist == NULL);
 
-    if (name && (tname = OPENSSL_strdup(name)) == NULL)
-        goto err;
-    if (value && (tvalue = OPENSSL_strdup(value)) == NULL)
+    if (name != NULL && (tname = OPENSSL_strdup(name)) == NULL)
         goto err;
+    if (value != NULL && vallen > 0) {
+        /*
+         * We tolerate a single trailing NUL character, but otherwise no
+         * embedded NULs
+         */
+        if (memchr(value, 0, vallen - 1) != NULL)
+            goto err;
+        tvalue = OPENSSL_strndup(value, vallen);
+        if (tvalue == NULL)
+            goto err;
+    }
     if ((vtmp = OPENSSL_malloc(sizeof(*vtmp))) == NULL)
         goto err;
     if (sk_allocated && (*extlist = sk_CONF_VALUE_new_null()) == NULL)
@@ -56,7 +66,7 @@
         goto err;
     return 1;
  err:
-    X509V3err(X509V3_F_X509V3_ADD_VALUE, ERR_R_MALLOC_FAILURE);
+    X509V3err(X509V3_F_X509V3_ADD_LEN_VALUE, ERR_R_MALLOC_FAILURE);
     if (sk_allocated) {
         sk_CONF_VALUE_free(*extlist);
         *extlist = NULL;
@@ -67,10 +77,26 @@
     return 0;
 }
 
+int X509V3_add_value(const char *name, const char *value,
+                     STACK_OF(CONF_VALUE) **extlist)
+{
+    return x509v3_add_len_value(name, value,
+                                value != NULL ? strlen((const char *)value) : 0,
+                                extlist);
+}
+
 int X509V3_add_value_uchar(const char *name, const unsigned char *value,
                            STACK_OF(CONF_VALUE) **extlist)
 {
-    return X509V3_add_value(name, (const char *)value, extlist);
+    return x509v3_add_len_value(name, (const char *)value,
+                                value != NULL ? strlen((const char *)value) : 0,
+                                extlist);
+}
+
+int x509v3_add_len_value_uchar(const char *name, const unsigned char *value,
+                               size_t vallen, STACK_OF(CONF_VALUE) **extlist)
+{
+    return x509v3_add_len_value(name, (const char *)value, vallen, extlist);
 }
 
 /* Free function for STACK_OF(CONF_VALUE) */
@@ -502,18 +528,26 @@
     /* First some sanity checks */
     if (email->type != V_ASN1_IA5STRING)
         return 1;
-    if (!email->data || !email->length)
+    if (email->data == NULL || email->length == 0)
+        return 1;
+    if (memchr(email->data, 0, email->length) != NULL)
         return 1;
     if (*sk == NULL)
         *sk = sk_OPENSSL_STRING_new(sk_strcmp);
     if (*sk == NULL)
         return 0;
+
+    emtmp = OPENSSL_strndup((char *)email->data, email->length);
+    if (emtmp == NULL)
+        return 0;
+
     /* Don't add duplicates */
-    if (sk_OPENSSL_STRING_find(*sk, (char *)email->data) != -1)
+    if (sk_OPENSSL_STRING_find(*sk, emtmp) != -1) {
+        OPENSSL_free(emtmp);
         return 1;
-    emtmp = OPENSSL_strdup((char *)email->data);
-    if (emtmp == NULL || !sk_OPENSSL_STRING_push(*sk, emtmp)) {
-        OPENSSL_free(emtmp);    /* free on push failure */
+    }
+    if (!sk_OPENSSL_STRING_push(*sk, emtmp)) {
+        OPENSSL_free(emtmp); /* free on push failure */
         X509_email_free(*sk);
         *sk = NULL;
         return 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/demos/bio/client-arg.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/demos/bio/client-arg.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/demos/bio/client-arg.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/demos/bio/client-arg.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -93,12 +93,6 @@
         ERR_print_errors_fp(stderr);
         goto end;
     }
-
-    if (BIO_do_handshake(sbio) <= 0) {
-        fprintf(stderr, "Error establishing SSL connection\n");
-        ERR_print_errors_fp(stderr);
-        goto end;
-    }
 
     /* Could examine ssl here to get connection info */
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/demos/bio/client-conf.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/demos/bio/client-conf.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/demos/bio/client-conf.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/demos/bio/client-conf.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -101,12 +101,6 @@
         ERR_print_errors_fp(stderr);
         goto end;
     }
-
-    if (BIO_do_handshake(sbio) <= 0) {
-        fprintf(stderr, "Error establishing SSL connection\n");
-        ERR_print_errors_fp(stderr);
-        goto end;
-    }
 
     /* Could examine ssl here to get connection info */
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ca.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ca.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ca.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ca.pod	2021-12-09 12:01:26.000000000 +0000
@@ -163,7 +163,7 @@
 =item B<-passin arg>
 
 The key password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-notext>
 
@@ -759,7 +759,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/cms.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/cms.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/cms.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/cms.pod	2021-12-09 12:01:26.000000000 +0000
@@ -465,7 +465,7 @@
 =item B<-passin arg>
 
 The private key password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-rand file...>
 
@@ -735,7 +735,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/crl2pkcs7.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/crl2pkcs7.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/crl2pkcs7.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/crl2pkcs7.pod	2021-12-09 12:01:26.000000000 +0000
@@ -56,7 +56,7 @@
 
 Specifies a filename containing one or more certificates in B<PEM> format.
 All certificates in the file will be added to the PKCS#7 structure. This
-option can be used more than once to read certificates form multiple
+option can be used more than once to read certificates from multiple
 files.
 
 =item B<-nocrl>
@@ -96,7 +96,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/dgst.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/dgst.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/dgst.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/dgst.pod	2021-12-09 12:01:26.000000000 +0000
@@ -109,7 +109,7 @@
 =item B<-passin arg>
 
 The private key password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-verify filename>
 
@@ -241,7 +241,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/dsa.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/dsa.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/dsa.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/dsa.pod	2021-12-09 12:01:26.000000000 +0000
@@ -75,7 +75,7 @@
 =item B<-passin arg>
 
 The input file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-out filename>
 
@@ -87,7 +87,7 @@
 =item B<-passout arg>
 
 The output file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-aes128>, B<-aes192>, B<-aes256>, B<-aria128>, B<-aria192>, B<-aria256>, B<-camellia128>, B<-camellia192>, B<-camellia256>, B<-des>, B<-des3>, B<-idea>
 
@@ -172,7 +172,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ec.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ec.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ec.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ec.pod	2021-12-09 12:01:26.000000000 +0000
@@ -68,7 +68,7 @@
 =item B<-passin arg>
 
 The input file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-out filename>
 
@@ -80,7 +80,7 @@
 =item B<-passout arg>
 
 The output file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-des|-des3|-idea>
 
@@ -193,7 +193,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2003-2019 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2003-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/enc.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/enc.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/enc.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/enc.pod	2021-12-09 12:01:26.000000000 +0000
@@ -76,7 +76,7 @@
 =item B<-pass arg>
 
 The password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-e>
 
@@ -180,8 +180,8 @@
 
 =item B<-z>
 
-Compress or decompress clear text using zlib before encryption or after
-decryption. This option exists only if OpenSSL with compiled with zlib
+Compress or decompress encrypted data using zlib after encryption or before
+decryption. This option exists only if OpenSSL was compiled with the zlib
 or zlib-dynamic option.
 
 =item B<-none>
@@ -428,7 +428,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/genpkey.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/genpkey.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/genpkey.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/genpkey.pod	2021-12-09 12:01:26.000000000 +0000
@@ -44,7 +44,7 @@
 =item B<-pass arg>
 
 The output file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-I<cipher>>
 
@@ -325,7 +325,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2006-2019 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/genrsa.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/genrsa.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/genrsa.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/genrsa.pod	2021-12-09 12:01:26.000000000 +0000
@@ -51,7 +51,7 @@
 =item B<-passout arg>
 
 The output file password source. For more information about the format
-of B<arg> see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+of B<arg> see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-aes128>, B<-aes192>, B<-aes256>, B<-aria128>, B<-aria192>, B<-aria256>, B<-camellia128>, B<-camellia192>, B<-camellia256>, B<-des>, B<-des3>, B<-idea>
 
@@ -118,7 +118,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkcs12.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkcs12.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkcs12.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkcs12.pod	2021-12-09 12:01:26.000000000 +0000
@@ -78,14 +78,12 @@
 =item B<-passin arg>
 
 The PKCS#12 file (i.e. input file) password source. For more information about
-the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in
-L<openssl(1)>.
+the format of B<arg> see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-passout arg>
 
 Pass phrase source to encrypt any outputted private keys with. For more
-information about the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section
-in L<openssl(1)>.
+information about the format of B<arg> see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-password arg>
 
@@ -206,14 +204,12 @@
 =item B<-pass arg>, B<-passout arg>
 
 The PKCS#12 file (i.e. output file) password source. For more information about
-the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in
-L<openssl(1)>.
+the format of B<arg> see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-passin password>
 
 Pass phrase source to decrypt any input private keys with. For more information
-about the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in
-L<openssl(1)>.
+about the format of B<arg> see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-chain>
 
@@ -383,7 +379,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkcs8.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkcs8.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkcs8.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkcs8.pod	2021-12-09 12:01:26.000000000 +0000
@@ -75,7 +75,7 @@
 =item B<-passin arg>
 
 The input file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-out filename>
 
@@ -87,7 +87,7 @@
 =item B<-passout arg>
 
 The output file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-iter count>
 
@@ -309,7 +309,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkey.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkey.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkey.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkey.pod	2021-12-09 12:01:26.000000000 +0000
@@ -57,7 +57,7 @@
 =item B<-passin arg>
 
 The input file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-out filename>
 
@@ -69,7 +69,7 @@
 =item B<-passout password>
 
 The output file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-traditional>
 
@@ -158,7 +158,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkeyutl.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkeyutl.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkeyutl.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/pkeyutl.pod	2021-12-09 12:01:26.000000000 +0000
@@ -74,7 +74,7 @@
 =item B<-passin arg>
 
 The input key password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-peerkey file>
 
@@ -327,7 +327,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/req.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/req.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/req.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/req.pod	2021-12-09 12:01:26.000000000 +0000
@@ -91,7 +91,7 @@
 =item B<-passin arg>
 
 The input file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-out filename>
 
@@ -101,7 +101,7 @@
 =item B<-passout arg>
 
 The output file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-text>
 
@@ -695,7 +695,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/rsa.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/rsa.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/rsa.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/rsa.pod	2021-12-09 12:01:26.000000000 +0000
@@ -75,7 +75,7 @@
 =item B<-passin arg>
 
 The input file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-out filename>
 
@@ -87,7 +87,7 @@
 =item B<-passout password>
 
 The output file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-aes128>, B<-aes192>, B<-aes256>, B<-aria128>, B<-aria192>, B<-aria256>, B<-camellia128>, B<-camellia192>, B<-camellia256>, B<-des>, B<-des3>, B<-idea>
 
@@ -195,7 +195,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/s_client.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/s_client.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/s_client.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/s_client.pod	2021-12-09 12:01:26.000000000 +0000
@@ -258,7 +258,7 @@
 =item B<-pass arg>
 
 the private key password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-verify depth>
 
@@ -797,7 +797,7 @@
 
 The B<s_client> utility is a test tool and is designed to continue the
 handshake after any certificate verification errors. As a result it will
-accept any certificate chain (trusted or not) sent by the peer. None test
+accept any certificate chain (trusted or not) sent by the peer. Non-test
 applications should B<not> do this as it makes them vulnerable to a MITM
 attack. This behaviour can be changed by with the B<-verify_return_error>
 option: any verify errors are then returned aborting the handshake.
@@ -828,7 +828,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/smime.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/smime.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/smime.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/smime.pod	2021-12-09 12:01:26.000000000 +0000
@@ -295,7 +295,7 @@
 =item B<-passin arg>
 
 The private key password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-rand file...>
 
@@ -514,7 +514,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/spkac.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/spkac.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/spkac.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/spkac.pod	2021-12-09 12:01:26.000000000 +0000
@@ -60,7 +60,7 @@
 =item B<-passin password>
 
 The input file password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-challenge string>
 
@@ -145,7 +145,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/s_server.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/s_server.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/s_server.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/s_server.pod	2021-12-09 12:01:26.000000000 +0000
@@ -297,7 +297,7 @@
 =item B<-pass val>
 
 The private key password source. For more information about the format of B<val>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-dcert infile>, B<-dkey infile>
 
@@ -701,7 +701,7 @@
 
 =item B<-alpn val>, B<-nextprotoneg val>
 
-These flags enable the Enable the Application-Layer Protocol Negotiation
+These flags enable the Application-Layer Protocol Negotiation
 or Next Protocol Negotiation (NPN) extension, respectively. ALPN is the
 IETF standard and replaces NPN.
 The B<val> list is a comma-separated list of supported protocol
@@ -845,7 +845,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/storeutl.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/storeutl.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/storeutl.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/storeutl.pod	2021-12-09 12:01:26.000000000 +0000
@@ -51,7 +51,7 @@
 =item B<-passin arg>
 
 the key password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-text>
 
@@ -123,7 +123,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ts.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ts.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ts.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/ts.pod	2021-12-09 12:01:26.000000000 +0000
@@ -242,7 +242,7 @@
 =item B<-passin> password_src
 
 Specifies the password source for the private key of the TSA. See
-B<PASS PHRASE ARGUMENTS> in L<openssl(1)>. (Optional)
+L<openssl(1)/Pass Phrase Options>. (Optional)
 
 =item B<-signer> tsa_cert.pem
 
@@ -665,7 +665,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/x509.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/x509.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/x509.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man1/x509.pod	2021-12-09 12:01:26.000000000 +0000
@@ -376,7 +376,7 @@
 =item B<-passin arg>
 
 The key password source. For more information about the format of B<arg>
-see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+see L<openssl(1)/Pass Phrase Options>.
 
 =item B<-clrext>
 
@@ -932,7 +932,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BIO_f_ssl.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BIO_f_ssl.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BIO_f_ssl.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BIO_f_ssl.pod	2021-12-09 12:01:26.000000000 +0000
@@ -185,11 +185,6 @@
      ERR_print_errors_fp(stderr);
      exit(1);
  }
- if (BIO_do_handshake(sbio) <= 0) {
-     fprintf(stderr, "Error establishing SSL connection\n");
-     ERR_print_errors_fp(stderr);
-     exit(1);
- }
 
  /* XXX Could examine ssl here to get connection info */
 
@@ -298,7 +293,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BIO_push.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BIO_push.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BIO_push.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BIO_push.pod	2021-12-09 12:01:26.000000000 +0000
@@ -61,8 +61,8 @@
 by B<md1> and B<md2>, B<base64> encoded and written to B<f>.
 
 It should be noted that reading causes data to pass in the reverse
-direction, that is data is read from B<f>, base64 B<decoded> and digested
-by B<md1> and B<md2>. If the call:
+direction, that is data is read from B<f>, B<base64> decoded and digested
+by B<md2> and B<md1>. If the call:
 
  BIO_pop(md2);
 
@@ -79,7 +79,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BN_cmp.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BN_cmp.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BN_cmp.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/BN_cmp.pod	2021-12-09 12:01:26.000000000 +0000
@@ -2,42 +2,47 @@
 
 =head1 NAME
 
-BN_cmp, BN_ucmp, BN_is_zero, BN_is_one, BN_is_word, BN_is_odd - BIGNUM comparison and test functions
+BN_cmp, BN_ucmp, BN_is_zero, BN_is_one, BN_is_word, BN_abs_is_word, BN_is_odd - BIGNUM comparison and test functions
 
 =head1 SYNOPSIS
 
  #include <openssl/bn.h>
 
- int BN_cmp(BIGNUM *a, BIGNUM *b);
- int BN_ucmp(BIGNUM *a, BIGNUM *b);
+ int BN_cmp(const BIGNUM *a, const BIGNUM *b);
+ int BN_ucmp(const BIGNUM *a, const BIGNUM *b);
 
- int BN_is_zero(BIGNUM *a);
- int BN_is_one(BIGNUM *a);
- int BN_is_word(BIGNUM *a, BN_ULONG w);
- int BN_is_odd(BIGNUM *a);
+ int BN_is_zero(const BIGNUM *a);
+ int BN_is_one(const BIGNUM *a);
+ int BN_is_word(const BIGNUM *a, const BN_ULONG w);
+ int BN_abs_is_word(const BIGNUM *a, const BN_ULONG w);
+ int BN_is_odd(const BIGNUM *a);
 
 =head1 DESCRIPTION
 
-BN_cmp() compares the numbers B<a> and B<b>. BN_ucmp() compares their
+BN_cmp() compares the numbers I<a> and I<b>. BN_ucmp() compares their
 absolute values.
 
-BN_is_zero(), BN_is_one() and BN_is_word() test if B<a> equals 0, 1,
-or B<w> respectively. BN_is_odd() tests if a is odd.
-
-BN_is_zero(), BN_is_one(), BN_is_word() and BN_is_odd() are macros.
+BN_is_zero(), BN_is_one(), BN_is_word() and BN_abs_is_word() test if
+I<a> equals 0, 1, I<w>, or E<verbar>I<w>E<verbar> respectively.
+BN_is_odd() tests if I<a> is odd.
 
 =head1 RETURN VALUES
 
-BN_cmp() returns -1 if B<a> E<lt> B<b>, 0 if B<a> == B<b> and 1 if
-B<a> E<gt> B<b>. BN_ucmp() is the same using the absolute values
-of B<a> and B<b>.
+BN_cmp() returns -1 if I<a> E<lt> I<b>, 0 if I<a> == I<b> and 1 if
+I<a> E<gt> I<b>. BN_ucmp() is the same using the absolute values
+of I<a> and I<b>.
+
+BN_is_zero(), BN_is_one() BN_is_word(), BN_abs_is_word() and
+BN_is_odd() return 1 if the condition is true, 0 otherwise.
+
+=head1 HISTORY
 
-BN_is_zero(), BN_is_one() BN_is_word() and BN_is_odd() return 1 if
-the condition is true, 0 otherwise.
+Prior to OpenSSL 1.1.0, BN_is_zero(), BN_is_one(), BN_is_word(),
+BN_abs_is_word() and BN_is_odd() were macros.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/d2i_PrivateKey.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/d2i_PrivateKey.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/d2i_PrivateKey.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/d2i_PrivateKey.pod	2021-12-09 12:01:26.000000000 +0000
@@ -42,6 +42,10 @@
 
 =head1 NOTES
 
+All the functions that operate on data in memory update the data pointer I<*pp>
+after a successful operation, just like the other d2i and i2d functions;
+see L<d2i_X509(3)>.
+
 All these functions use DER format and unencrypted keys. Applications wishing
 to encrypt or decrypt private keys should use other functions such as
 d2i_PKCS8PrivateKey() instead.
@@ -71,7 +75,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2017-2019 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/DH_generate_key.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/DH_generate_key.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/DH_generate_key.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/DH_generate_key.pod	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,8 @@
 
 =head1 NAME
 
-DH_generate_key, DH_compute_key - perform Diffie-Hellman key exchange
+DH_generate_key, DH_compute_key, DH_compute_key_padded - perform
+Diffie-Hellman key exchange
 
 =head1 SYNOPSIS
 
@@ -10,14 +11,16 @@
 
  int DH_generate_key(DH *dh);
 
- int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh);
+ int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
+
+ int DH_compute_key_padded(unsigned char *key, const BIGNUM *pub_key, DH *dh);
 
 =head1 DESCRIPTION
 
 DH_generate_key() performs the first step of a Diffie-Hellman key
 exchange by generating private and public DH values. By calling
-DH_compute_key(), these are combined with the other party's public
-value to compute the shared key.
+DH_compute_key() or DH_compute_key_padded(), these are combined with
+the other party's public value to compute the shared key.
 
 DH_generate_key() expects B<dh> to contain the shared parameters
 B<dh-E<gt>p> and B<dh-E<gt>g>. It generates a random private DH value
@@ -28,6 +31,14 @@
 DH_compute_key() computes the shared secret from the private DH value
 in B<dh> and the other party's public value in B<pub_key> and stores
 it in B<key>. B<key> must point to B<DH_size(dh)> bytes of memory.
+The padding style is RFC 5246 (8.1.2) that strips leading zero bytes.
+It is not constant time due to the leading zero bytes being stripped.
+The return value should be considered public.
+
+DH_compute_key_padded() is similar but stores a fixed number of bytes.
+The padding style is NIST SP 800-56A (C.1) that retains leading zero bytes.
+It is constant time due to the leading zero bytes being retained.
+The return value should be considered public.
 
 =head1 RETURN VALUES
 
@@ -36,15 +47,21 @@
 DH_compute_key() returns the size of the shared secret on success, -1
 on error.
 
+DH_compute_key_padded() returns B<DH_size(dh)> on success, -1 on error.
+
 The error codes can be obtained by L<ERR_get_error(3)>.
 
 =head1 SEE ALSO
 
 L<DH_new(3)>, L<ERR_get_error(3)>, L<RAND_bytes(3)>, L<DH_size(3)>
 
+=head1 HISTORY
+
+DH_compute_key_padded() was added in OpenSSL 1.0.2.
+
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/OCSP_sendreq_new.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/OCSP_sendreq_new.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/OCSP_sendreq_new.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/OCSP_sendreq_new.pod	2021-12-09 12:01:26.000000000 +0000
@@ -2,9 +2,15 @@
 
 =head1 NAME
 
-OCSP_sendreq_new, OCSP_sendreq_nbio, OCSP_REQ_CTX_free,
-OCSP_set_max_response_length, OCSP_REQ_CTX_add1_header,
-OCSP_REQ_CTX_set1_req, OCSP_sendreq_bio - OCSP responder query functions
+OCSP_sendreq_new,
+OCSP_sendreq_nbio,
+OCSP_REQ_CTX_free,
+OCSP_set_max_response_length,
+OCSP_REQ_CTX_add1_header,
+OCSP_REQ_CTX_set1_req,
+OCSP_sendreq_bio,
+OCSP_REQ_CTX_i2d
+- OCSP responder query functions
 
 =head1 SYNOPSIS
 
@@ -26,6 +32,9 @@
 
  OCSP_RESPONSE *OCSP_sendreq_bio(BIO *io, const char *path, OCSP_REQUEST *req);
 
+ int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const char *content_type,
+                      const ASN1_ITEM *it, ASN1_VALUE *req);
+
 =head1 DESCRIPTION
 
 The function OCSP_sendreq_new() returns an B<OCSP_CTX> structure using the
@@ -51,6 +60,15 @@
 
 OCSP_REQ_CTX_set1_req() sets the OCSP request in B<rctx> to B<req>. This
 function should be called after any calls to OCSP_REQ_CTX_add1_header().
+OCSP_REQ_CTX_set1_req(rctx, req) is equivalent to the following:
+
+ OCSP_REQ_CTX_i2d(rctx, "application/ocsp-request",
+                        ASN1_ITEM_rptr(OCSP_REQUEST), (ASN1_VALUE *)req)
+
+OCSP_REQ_CTX_i2d() sets the request context B<rctx> to have the request
+B<req>, which has the ASN.1 type B<it>.
+The B<content_type>, if not NULL, will be included in the HTTP request.
+The function should be called after all other headers have already been added.
 
 OCSP_sendreq_bio() performs an OCSP request using the responder B<io>, the URL
 path B<path>, and the OCSP request B<req> with a response header maximum line
@@ -64,8 +82,8 @@
 OCSP_sendreq_nbio() returns B<1> if the operation was completed successfully,
 B<-1> if the operation should be retried and B<0> if an error occurred.
 
-OCSP_REQ_CTX_add1_header() and OCSP_REQ_CTX_set1_req() return B<1> for success
-and B<0> for failure.
+OCSP_REQ_CTX_add1_header(), OCSP_REQ_CTX_set1_req(), and OCSP_REQ_CTX_i2d()
+return B<1> for success and B<0> for failure.
 
 OCSP_sendreq_bio() returns the B<OCSP_RESPONSE> structure sent by the
 responder or B<NULL> if an error occurred.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/OPENSSL_malloc.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/OPENSSL_malloc.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/OPENSSL_malloc.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/OPENSSL_malloc.pod	2021-12-09 12:01:26.000000000 +0000
@@ -104,7 +104,7 @@
 
 OPENSSL_cleanse() fills B<ptr> of size B<len> with a string of 0's.
 Use OPENSSL_cleanse() with care if the memory is a mapping of a file.
-If the storage controller uses write compression, then its possible
+If the storage controller uses write compression, then it's possible
 that sensitive tail bytes will survive zeroization because the block of
 zeros will be compressed. If the storage controller uses wear leveling,
 then the old sensitive data will not be overwritten; rather, a block of
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/X509_get_extension_flags.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/X509_get_extension_flags.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/X509_get_extension_flags.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man3/X509_get_extension_flags.pod	2021-12-09 12:01:26.000000000 +0000
@@ -78,12 +78,17 @@
 
 =item B<EXFLAG_INVALID>
 
-Some certificate extension values are invalid or inconsistent. The
-certificate should be rejected.
+Some certificate extension values are invalid or inconsistent.
+The certificate should be rejected.
 This bit may also be raised after an out-of-memory error while
 processing the X509 object, so it may not be related to the processed
 ASN1 object itself.
 
+=item B<EXFLAG_NO_FINGERPRINT>
+
+Failed to compute the internal SHA1 hash value of the certificate.
+This may be due to malloc failure or because no SHA1 implementation was found.
+
 =item B<EXFLAG_INVALID_POLICY>
 
 The NID_certificate_policies certificate extension is invalid or
@@ -194,7 +199,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man7/x509.pod thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man7/x509.pod
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/doc/man7/x509.pod	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/doc/man7/x509.pod	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 =head1 DESCRIPTION
 
 An X.509 certificate is a structured grouping of information about
-an individual, a device, or anything one can imagine.  A X.509 CRL
+an individual, a device, or anything one can imagine.  An X.509 CRL
 (certificate revocation list) is a tool to help determine if a
 certificate is still valid.  The exact definition of those can be
 found in the X.509 document from ITU-T, or in RFC3280 from PKIX.
@@ -24,7 +24,7 @@
 
 To handle some complex parts of a certificate, there are the types
 X509_NAME (to express a certificate name), X509_ATTRIBUTE (to express
-a certificate attributes), X509_EXTENSION (to express a certificate
+a certificate attribute), X509_EXTENSION (to express a certificate
 extension) and a few more.
 
 Finally, there's the supertype X509_INFO, which can contain a CRL, a
@@ -63,7 +63,7 @@
 
 =head1 COPYRIGHT
 
-Copyright 2003-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2003-2021 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/crypto/sm2.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/crypto/sm2.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/crypto/sm2.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/crypto/sm2.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2017 Ribose Inc. All Rights Reserved.
  * Ported from Ribose contributions from Botan.
  *
@@ -60,8 +60,7 @@
 int sm2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len,
                         size_t *ct_size);
 
-int sm2_plaintext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len,
-                       size_t *pt_size);
+int sm2_plaintext_size(const unsigned char *ct, size_t ct_size, size_t *pt_size);
 
 int sm2_encrypt(const EC_KEY *key,
                 const EVP_MD *digest,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/crypto/x509.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/crypto/x509.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/crypto/x509.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/crypto/x509.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,6 +8,8 @@
  */
 
 #include "internal/refcount.h"
+#include <openssl/x509.h>
+#include <openssl/conf.h>
 
 /* Internal X509 structures and functions: not for application use */
 
@@ -284,3 +286,6 @@
 int x509_set1_time(ASN1_TIME **ptm, const ASN1_TIME *tm);
 
 void x509_init_sig_info(X509 *x);
+
+int x509v3_add_len_value_uchar(const char *name, const unsigned char *value,
+                               size_t vallen, STACK_OF(CONF_VALUE) **extlist);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/e_os2.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/e_os2.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/e_os2.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/e_os2.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -279,7 +279,8 @@
 #  define ossl_inline inline
 # endif
 
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
+     !defined(__cplusplus) 
 #  define ossl_noreturn _Noreturn
 # elif defined(__GNUC__) && __GNUC__ >= 2
 #  define ossl_noreturn __attribute__((noreturn))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/evperr.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/evperr.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/evperr.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/evperr.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,9 +11,7 @@
 #ifndef HEADER_EVPERR_H
 # define HEADER_EVPERR_H
 
-# ifndef HEADER_SYMHACKS_H
-#  include <openssl/symhacks.h>
-# endif
+# include <openssl/symhacks.h>
 
 # ifdef  __cplusplus
 extern "C"
@@ -179,6 +177,7 @@
 # define EVP_R_ONLY_ONESHOT_SUPPORTED                     177
 # define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   150
 # define EVP_R_OPERATON_NOT_INITIALIZED                   151
+# define EVP_R_OUTPUT_WOULD_OVERFLOW                      184
 # define EVP_R_PARTIALLY_OVERLAPPING                      162
 # define EVP_R_PBKDF2_ERROR                               181
 # define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 179
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/obj_mac.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/obj_mac.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/obj_mac.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/obj_mac.h	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/objects.pl
  *
- * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/opensslv.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/opensslv.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/opensslv.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/opensslv.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -39,8 +39,8 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x1010109fL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1i  8 Dec 2020"
+# define OPENSSL_VERSION_NUMBER  0x101010cfL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1l  24 Aug 2021"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/sslerr.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/sslerr.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/sslerr.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/sslerr.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -70,6 +70,7 @@
 # define SSL_F_FINAL_EMS                                  486
 # define SSL_F_FINAL_KEY_SHARE                            503
 # define SSL_F_FINAL_MAXFRAGMENTLEN                       557
+# define SSL_F_FINAL_PSK                                  639
 # define SSL_F_FINAL_RENEGOTIATE                          483
 # define SSL_F_FINAL_SERVER_NAME                          558
 # define SSL_F_FINAL_SIG_ALGS                             497
@@ -592,6 +593,7 @@
 # define SSL_R_MISSING_ECDSA_SIGNING_CERT                 381
 # define SSL_R_MISSING_FATAL                              256
 # define SSL_R_MISSING_PARAMETERS                         290
+# define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION            310
 # define SSL_R_MISSING_RSA_CERTIFICATE                    168
 # define SSL_R_MISSING_RSA_ENCRYPTING_CERT                169
 # define SSL_R_MISSING_RSA_SIGNING_CERT                   170
@@ -633,6 +635,7 @@
 # define SSL_R_NO_VERIFY_COOKIE_CALLBACK                  403
 # define SSL_R_NULL_SSL_CTX                               195
 # define SSL_R_NULL_SSL_METHOD_PASSED                     196
+# define SSL_R_OCSP_CALLBACK_FAILURE                      294
 # define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED            197
 # define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
 # define SSL_R_OVERFLOW_ERROR                             237
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/x509v3err.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/x509v3err.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/x509v3err.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/x509v3err.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -38,6 +38,7 @@
 # define X509V3_F_I2S_ASN1_IA5STRING                      149
 # define X509V3_F_I2S_ASN1_INTEGER                        120
 # define X509V3_F_I2V_AUTHORITY_INFO_ACCESS               138
+# define X509V3_F_I2V_AUTHORITY_KEYID                     173
 # define X509V3_F_LEVEL_ADD_NODE                          168
 # define X509V3_F_NOTICE_SECTION                          132
 # define X509V3_F_NREF_NOS                                133
@@ -78,6 +79,7 @@
 # define X509V3_F_V2I_TLS_FEATURE                         165
 # define X509V3_F_V3_GENERIC_EXTENSION                    116
 # define X509V3_F_X509V3_ADD1_I2D                         140
+# define X509V3_F_X509V3_ADD_LEN_VALUE                    174
 # define X509V3_F_X509V3_ADD_VALUE                        105
 # define X509V3_F_X509V3_EXT_ADD                          104
 # define X509V3_F_X509V3_EXT_ADD_ALIAS                    106
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/x509v3.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/x509v3.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/x509v3.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/include/openssl/x509v3.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -364,8 +364,9 @@
 
 # define EXFLAG_INVALID_POLICY   0x800
 # define EXFLAG_FRESHEST         0x1000
-/* Self signed */
-# define EXFLAG_SS               0x2000
+# define EXFLAG_SS               0x2000 /* cert is apparently self-signed */
+
+# define EXFLAG_NO_FINGERPRINT   0x100000
 
 # define KU_DIGITAL_SIGNATURE    0x0080
 # define KU_NON_REPUDIATION      0x0040
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/INSTALL thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/INSTALL
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/INSTALL	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/INSTALL	2021-12-09 12:01:26.000000000 +0000
@@ -106,8 +106,7 @@
  This will build and install OpenSSL in the default location, which is:
 
   Unix:    normal installation directories under /usr/local
-  OpenVMS: SYS$COMMON:[OPENSSL-'version'...], where 'version' is the
-           OpenSSL version number with underscores instead of periods.
+  OpenVMS: SYS$COMMON:[OPENSSL]
   Windows: C:\Program Files\OpenSSL or C:\Program Files (x86)\OpenSSL
 
  The installation directory should be appropriately protected to ensure
@@ -116,7 +115,9 @@
  your Operating System it is recommended that you do not overwrite the system
  version and instead install to somewhere else.
 
- If you want to install it anywhere else, run config like this:
+ If you want to install it anywhere else, run config like this (the options
+ --prefix and --openssldir are explained further down, and the values shown
+ here are mere examples):
 
   On Unix:
 
@@ -198,7 +199,7 @@
                    Unix:           /usr/local
                    Windows:        C:\Program Files\OpenSSL
                                 or C:\Program Files (x86)\OpenSSL
-                   OpenVMS:        SYS$COMMON:[OPENSSL-'version']
+                   OpenVMS:        SYS$COMMON:[OPENSSL]
 
   --release
                    Build OpenSSL without debugging symbols. This is the default.
@@ -961,9 +962,9 @@
          share/doc/openssl/html/man7
                         Contains the HTML rendition of the man-pages.
 
-       OpenVMS ('arch' is replaced with the architecture name, "Alpha"
-       or "ia64", 'sover' is replaced with the shared library version
-       (0101 for 1.1), and 'pz' is replaced with the pointer size
+       OpenVMS ('arch' is replaced with the architecture name, "ALPHA"
+       or "IA64", 'sover' is replaced with the shared library version
+       (0101 for 1.1.x), and 'pz' is replaced with the pointer size
        OpenSSL was built with):
 
          [.EXE.'arch']  Contains the openssl binary.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/NEWS thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/NEWS
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/NEWS	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/NEWS	2021-12-09 12:01:26.000000000 +0000
@@ -5,6 +5,29 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
+  Major changes between OpenSSL 1.1.1k and OpenSSL 1.1.1l [24 Aug 2021]
+
+      o Fixed an SM2 Decryption Buffer Overflow (CVE-2021-3711)
+      o Fixed various read buffer overruns processing ASN.1 strings (CVE-2021-3712)
+
+  Major changes between OpenSSL 1.1.1j and OpenSSL 1.1.1k [25 Mar 2021]
+
+      o Fixed a problem with verifying a certificate chain when using the
+        X509_V_FLAG_X509_STRICT flag (CVE-2021-3450)
+      o Fixed an issue where an OpenSSL TLS server may crash if sent a
+        maliciously crafted renegotiation ClientHello message from a client
+        (CVE-2021-3449)
+
+  Major changes between OpenSSL 1.1.1i and OpenSSL 1.1.1j [16 Feb 2021]
+
+      o Fixed a NULL pointer deref in the X509_issuer_and_serial_hash()
+        function (CVE-2021-23841)
+      o Fixed the RSA_padding_check_SSLv23() function and the RSA_SSLV23_PADDING
+        padding mode to correctly check for rollback attacks
+      o Fixed an overflow in the EVP_CipherUpdate, EVP_EncryptUpdate and
+        EVP_DecryptUpdate functions (CVE-2021-23840)
+      o Fixed SRP_Calc_client_key so that it runs in constant time
+
   Major changes between OpenSSL 1.1.1h and OpenSSL 1.1.1i [8 Dec 2020]
 
       o Fixed NULL pointer deref in GENERAL_NAME_cmp (CVE-2020-1971)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/NOTES.VMS thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/NOTES.VMS
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/NOTES.VMS	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/NOTES.VMS	2021-12-09 12:01:26.000000000 +0000
@@ -90,9 +90,9 @@
  Unix mount point.
 
  The easiest way to check if everything got through as it should is to
- check for one of the following files:
+ check that this file exists:
 
-   [.crypto]opensslconf^.h.in
+   [.include.openssl]opensslconf^.h.in
 
  The best way to get a correct distribution is to download the gzipped
  tar file from ftp://ftp.openssl.org/source/, use GZIP -d to uncompress
@@ -105,3 +105,11 @@
  Should you need it, you can find UnZip for VMS here:
 
    http://www.info-zip.org/UnZip.html
+
+
+ How the value of 'arch' is determined
+ -------------------------------------
+
+ 'arch' is mentioned in INSTALL.  It's value is determined like this:
+
+    arch = f$edit( f$getsyi( "arch_name"), "upcase")
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/NOTES.WIN thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/NOTES.WIN
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/NOTES.WIN	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/NOTES.WIN	2021-12-09 12:01:26.000000000 +0000
@@ -62,8 +62,8 @@
 
  For VC-WIN32, the following defaults are use:
 
-     PREFIX:      %ProgramFiles(86)%\OpenSSL
-     OPENSSLDIR:  %CommonProgramFiles(86)%\SSL
+     PREFIX:      %ProgramFiles(x86)%\OpenSSL
+     OPENSSLDIR:  %CommonProgramFiles(x86)%\SSL
 
  For VC-WIN64, the following defaults are use:
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/README thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/README
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/README	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/README	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 
- OpenSSL 1.1.1i 8 Dec 2020
+ OpenSSL 1.1.1l 24 Aug 2021
 
- Copyright (c) 1998-2020 The OpenSSL Project
+ Copyright (c) 1998-2021 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/bio_ssl.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/bio_ssl.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/bio_ssl.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/bio_ssl.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -451,6 +451,7 @@
         goto err;
     return ret;
  err:
+    BIO_free(ssl);
     BIO_free(con);
 #endif
     return NULL;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/d1_lib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/d1_lib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/d1_lib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/d1_lib.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -142,10 +142,11 @@
 
     ssl3_free(s);
 
-    dtls1_clear_queues(s);
-
-    pqueue_free(s->d1->buffered_messages);
-    pqueue_free(s->d1->sent_messages);
+    if (s->d1 != NULL) {
+        dtls1_clear_queues(s);
+        pqueue_free(s->d1->buffered_messages);
+        pqueue_free(s->d1->sent_messages);
+    }
 
     OPENSSL_free(s->d1);
     s->d1 = NULL;
@@ -341,12 +342,11 @@
     return 1;
 }
 
-void dtls1_double_timeout(SSL *s)
+static void dtls1_double_timeout(SSL *s)
 {
     s->d1->timeout_duration_us *= 2;
     if (s->d1->timeout_duration_us > 60000000)
         s->d1->timeout_duration_us = 60000000;
-    dtls1_start_timer(s);
 }
 
 void dtls1_stop_timer(SSL *s)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/rec_layer_d1.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/rec_layer_d1.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/rec_layer_d1.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/rec_layer_d1.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -46,6 +46,9 @@
 
 void DTLS_RECORD_LAYER_free(RECORD_LAYER *rl)
 {
+    if (rl->d == NULL)
+        return;
+
     DTLS_RECORD_LAYER_clear(rl);
     pqueue_free(rl->d->unprocessed_rcds.q);
     pqueue_free(rl->d->processed_rcds.q);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/rec_layer_s3.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/rec_layer_s3.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/rec_layer_s3.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/rec_layer_s3.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -172,9 +172,9 @@
     /*
      * If extend == 0, obtain new n-byte packet; if extend == 1, increase
      * packet by another n bytes. The packet will be in the sub-array of
-     * s->s3->rbuf.buf specified by s->packet and s->packet_length. (If
-     * s->rlayer.read_ahead is set, 'max' bytes may be stored in rbuf [plus
-     * s->packet_length bytes if extend == 1].)
+     * s->rlayer.rbuf.buf specified by s->rlayer.packet and
+     * s->rlayer.packet_length. (If s->rlayer.read_ahead is set, 'max' bytes may
+     * be stored in rbuf [plus s->rlayer.packet_length bytes if extend == 1].)
      * if clearold == 1, move the packet to the start of the buffer; if
      * clearold == 0 then leave any old packets where they were
      */
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/ssl3_buffer.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/ssl3_buffer.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/ssl3_buffer.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/ssl3_buffer.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -74,7 +74,6 @@
         b->len = len;
     }
 
-    RECORD_LAYER_set_packet(&s->rlayer, &(b->buf[0]));
     return 1;
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/ssl3_record.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/ssl3_record.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/ssl3_record.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/record/ssl3_record.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -405,7 +405,7 @@
             more = thisrr->length;
         }
         if (more > 0) {
-            /* now s->packet_length == SSL3_RT_HEADER_LENGTH */
+            /* now s->rlayer.packet_length == SSL3_RT_HEADER_LENGTH */
 
             rret = ssl3_read_n(s, more, more, 1, 0, &n);
             if (rret <= 0)
@@ -416,9 +416,9 @@
         RECORD_LAYER_set_rstate(&s->rlayer, SSL_ST_READ_HEADER);
 
         /*
-         * At this point, s->packet_length == SSL3_RT_HEADER_LENGTH
-         * + thisrr->length, or s->packet_length == SSL2_RT_HEADER_LENGTH
-         * + thisrr->length and we have that many bytes in s->packet
+         * At this point, s->rlayer.packet_length == SSL3_RT_HEADER_LENGTH
+         * + thisrr->length, or s->rlayer.packet_length == SSL2_RT_HEADER_LENGTH
+         * + thisrr->length and we have that many bytes in s->rlayer.packet
          */
         if (thisrr->rec_version == SSL2_VERSION) {
             thisrr->input =
@@ -429,11 +429,11 @@
         }
 
         /*
-         * ok, we can now read from 's->packet' data into 'thisrr' thisrr->input
-         * points at thisrr->length bytes, which need to be copied into
-         * thisrr->data by either the decryption or by the decompression When
-         * the data is 'copied' into the thisrr->data buffer, thisrr->input will
-         * be pointed at the new buffer
+         * ok, we can now read from 's->rlayer.packet' data into 'thisrr'.
+         * thisrr->input points at thisrr->length bytes, which need to be copied
+         * into thisrr->data by either the decryption or by the decompression.
+         * When the data is 'copied' into the thisrr->data buffer,
+         * thisrr->input will be updated to point at the new buffer
          */
 
         /*
@@ -1616,16 +1616,16 @@
     sess = s->session;
 
     /*
-     * At this point, s->packet_length == SSL3_RT_HEADER_LNGTH + rr->length,
-     * and we have that many bytes in s->packet
+     * At this point, s->rlayer.packet_length == SSL3_RT_HEADER_LNGTH + rr->length,
+     * and we have that many bytes in s->rlayer.packet
      */
     rr->input = &(RECORD_LAYER_get_packet(&s->rlayer)[DTLS1_RT_HEADER_LENGTH]);
 
     /*
-     * ok, we can now read from 's->packet' data into 'rr' rr->input points
-     * at rr->length bytes, which need to be copied into rr->data by either
-     * the decryption or by the decompression When the data is 'copied' into
-     * the rr->data buffer, rr->input will be pointed at the new buffer
+     * ok, we can now read from 's->rlayer.packet' data into 'rr'. rr->input
+     * points at rr->length bytes, which need to be copied into rr->data by
+     * either the decryption or by the decompression. When the data is 'copied'
+     * into the rr->data buffer, rr->input will be pointed at the new buffer
      */
 
     /*
@@ -1947,7 +1947,7 @@
 
     if (rr->length >
         RECORD_LAYER_get_packet_length(&s->rlayer) - DTLS1_RT_HEADER_LENGTH) {
-        /* now s->packet_length == DTLS1_RT_HEADER_LENGTH */
+        /* now s->rlayer.packet_length == DTLS1_RT_HEADER_LENGTH */
         more = rr->length;
         rret = ssl3_read_n(s, more, more, 1, 1, &n);
         /* this packet contained a partial record, dump it */
@@ -1963,7 +1963,7 @@
         }
 
         /*
-         * now n == rr->length, and s->packet_length ==
+         * now n == rr->length, and s->rlayer.packet_length ==
          * DTLS1_RT_HEADER_LENGTH + rr->length
          */
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/s3_lib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/s3_lib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/s3_lib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/s3_lib.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -4629,6 +4629,7 @@
 
         OPENSSL_clear_free(s->s3->tmp.psk, psklen);
         s->s3->tmp.psk = NULL;
+        s->s3->tmp.psklen = 0;
         if (!s->method->ssl3_enc->generate_master_secret(s,
                     s->session->master_key, pskpms, pskpmslen,
                     &s->session->master_key_length)) {
@@ -4658,8 +4659,10 @@
         else
             OPENSSL_cleanse(pms, pmslen);
     }
-    if (s->server == 0)
+    if (s->server == 0) {
         s->s3->tmp.pms = NULL;
+        s->s3->tmp.pmslen = 0;
+    }
     return ret;
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/s3_msg.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/s3_msg.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/s3_msg.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/s3_msg.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -48,6 +48,8 @@
                                           * protocol_version alerts */
     if (desc < 0)
         return -1;
+    if (s->shutdown & SSL_SENT_SHUTDOWN && desc != SSL_AD_CLOSE_NOTIFY)
+        return -1;
     /* If a fatal one, remove from cache */
     if ((level == SSL3_AL_FATAL) && (s->session != NULL))
         SSL_CTX_remove_session(s->session_ctx, s->session);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_cert.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_cert.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_cert.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_cert.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -876,18 +876,36 @@
     return 1;
 }
 
+int ssl_get_security_level_bits(const SSL *s, const SSL_CTX *ctx, int *levelp)
+{
+    int level;
+    static const int minbits_table[5 + 1] = { 0, 80, 112, 128, 192, 256 };
+
+    if (ctx != NULL)
+        level = SSL_CTX_get_security_level(ctx);
+    else
+        level = SSL_get_security_level(s);
+
+    if (level > 5)
+        level = 5;
+    else if (level < 0)
+        level = 0;
+
+    if (levelp != NULL)
+        *levelp = level;
+
+    return minbits_table[level];
+}
+
 static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx,
                                          int op, int bits, int nid, void *other,
                                          void *ex)
 {
     int level, minbits;
-    static const int minbits_table[5] = { 80, 112, 128, 192, 256 };
-    if (ctx)
-        level = SSL_CTX_get_security_level(ctx);
-    else
-        level = SSL_get_security_level(s);
 
-    if (level <= 0) {
+    minbits = ssl_get_security_level_bits(s, ctx, &level);
+
+    if (level == 0) {
         /*
          * No EDH keys weaker than 1024-bits even at level 0, otherwise,
          * anything goes.
@@ -896,9 +914,6 @@
             return 0;
         return 1;
     }
-    if (level > 5)
-        level = 5;
-    minbits = minbits_table[level - 1];
     switch (op) {
     case SSL_SECOP_CIPHER_SUPPORTED:
     case SSL_SECOP_CIPHER_SHARED:
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_err.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_err.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_err.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_err.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -85,6 +85,7 @@
     {ERR_PACK(ERR_LIB_SSL, SSL_F_FINAL_KEY_SHARE, 0), "final_key_share"},
     {ERR_PACK(ERR_LIB_SSL, SSL_F_FINAL_MAXFRAGMENTLEN, 0),
      "final_maxfragmentlen"},
+    {ERR_PACK(ERR_LIB_SSL, SSL_F_FINAL_PSK, 0), "final_psk"},
     {ERR_PACK(ERR_LIB_SSL, SSL_F_FINAL_RENEGOTIATE, 0), "final_renegotiate"},
     {ERR_PACK(ERR_LIB_SSL, SSL_F_FINAL_SERVER_NAME, 0), "final_server_name"},
     {ERR_PACK(ERR_LIB_SSL, SSL_F_FINAL_SIG_ALGS, 0), "final_sig_algs"},
@@ -948,6 +949,8 @@
     "missing ecdsa signing cert"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_FATAL), "missing fatal"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PARAMETERS), "missing parameters"},
+    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PSK_KEX_MODES_EXTENSION),
+    "missing psk kex modes extension"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_CERTIFICATE),
     "missing rsa certificate"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_ENCRYPTING_CERT),
@@ -1018,6 +1021,8 @@
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_CTX), "null ssl ctx"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_METHOD_PASSED),
     "null ssl method passed"},
+    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OCSP_CALLBACK_FAILURE),
+    "ocsp callback failure"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED),
     "old session cipher not returned"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_lib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_lib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_lib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_lib.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -779,8 +779,10 @@
         s->ext.ecpointformats =
             OPENSSL_memdup(ctx->ext.ecpointformats,
                            ctx->ext.ecpointformats_len);
-        if (!s->ext.ecpointformats)
+        if (!s->ext.ecpointformats) {
+            s->ext.ecpointformats_len = 0;
             goto err;
+        }
         s->ext.ecpointformats_len =
             ctx->ext.ecpointformats_len;
     }
@@ -789,8 +791,10 @@
             OPENSSL_memdup(ctx->ext.supportedgroups,
                            ctx->ext.supportedgroups_len
                                 * sizeof(*ctx->ext.supportedgroups));
-        if (!s->ext.supportedgroups)
+        if (!s->ext.supportedgroups) {
+            s->ext.supportedgroups_len = 0;
             goto err;
+        }
         s->ext.supportedgroups_len = ctx->ext.supportedgroups_len;
     }
 #endif
@@ -800,8 +804,10 @@
 
     if (s->ctx->ext.alpn) {
         s->ext.alpn = OPENSSL_malloc(s->ctx->ext.alpn_len);
-        if (s->ext.alpn == NULL)
+        if (s->ext.alpn == NULL) {
+            s->ext.alpn_len = 0;
             goto err;
+        }
         memcpy(s->ext.alpn, s->ctx->ext.alpn, s->ctx->ext.alpn_len);
         s->ext.alpn_len = s->ctx->ext.alpn_len;
     }
@@ -2113,6 +2119,11 @@
         return 0;
     }
 
+    if (RECORD_LAYER_write_pending(&s->rlayer)) {
+        SSLerr(SSL_F_SSL_KEY_UPDATE, SSL_R_BAD_WRITE_RETRY);
+        return 0;
+    }
+
     ossl_statem_set_in_init(s, 1);
     s->key_update = updatetype;
     return 1;
@@ -2823,6 +2834,19 @@
 }
 #endif
 
+static int alpn_value_ok(const unsigned char *protos, unsigned int protos_len)
+{
+    unsigned int idx;
+
+    if (protos_len < 2 || protos == NULL)
+        return 0;
+
+    for (idx = 0; idx < protos_len; idx += protos[idx] + 1) {
+        if (protos[idx] == 0)
+            return 0;
+    }
+    return idx == protos_len;
+}
 /*
  * SSL_CTX_set_alpn_protos sets the ALPN protocol list on |ctx| to |protos|.
  * |protos| must be in wire-format (i.e. a series of non-empty, 8-bit
@@ -2831,12 +2855,25 @@
 int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos,
                             unsigned int protos_len)
 {
-    OPENSSL_free(ctx->ext.alpn);
-    ctx->ext.alpn = OPENSSL_memdup(protos, protos_len);
-    if (ctx->ext.alpn == NULL) {
+    unsigned char *alpn;
+
+    if (protos_len == 0 || protos == NULL) {
+        OPENSSL_free(ctx->ext.alpn);
+        ctx->ext.alpn = NULL;
+        ctx->ext.alpn_len = 0;
+        return 0;
+    }
+    /* Not valid per RFC */
+    if (!alpn_value_ok(protos, protos_len))
+        return 1;
+
+    alpn = OPENSSL_memdup(protos, protos_len);
+    if (alpn == NULL) {
         SSLerr(SSL_F_SSL_CTX_SET_ALPN_PROTOS, ERR_R_MALLOC_FAILURE);
         return 1;
     }
+    OPENSSL_free(ctx->ext.alpn);
+    ctx->ext.alpn = alpn;
     ctx->ext.alpn_len = protos_len;
 
     return 0;
@@ -2850,12 +2887,25 @@
 int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
                         unsigned int protos_len)
 {
-    OPENSSL_free(ssl->ext.alpn);
-    ssl->ext.alpn = OPENSSL_memdup(protos, protos_len);
-    if (ssl->ext.alpn == NULL) {
+    unsigned char *alpn;
+
+    if (protos_len == 0 || protos == NULL) {
+        OPENSSL_free(ssl->ext.alpn);
+        ssl->ext.alpn = NULL;
+        ssl->ext.alpn_len = 0;
+        return 0;
+    }
+    /* Not valid per RFC */
+    if (!alpn_value_ok(protos, protos_len))
+        return 1;
+
+    alpn = OPENSSL_memdup(protos, protos_len);
+    if (alpn == NULL) {
         SSLerr(SSL_F_SSL_SET_ALPN_PROTOS, ERR_R_MALLOC_FAILURE);
         return 1;
     }
+    OPENSSL_free(ssl->ext.alpn);
+    ssl->ext.alpn = alpn;
     ssl->ext.alpn_len = protos_len;
 
     return 0;
@@ -4512,8 +4562,11 @@
     }
 
     ctx = EVP_MD_CTX_new();
-    if (ctx == NULL)
+    if (ctx == NULL) {
+        SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_HANDSHAKE_HASH,
+                 ERR_R_INTERNAL_ERROR);
         goto err;
+    }
 
     if (!EVP_MD_CTX_copy_ex(ctx, hdgst)
         || EVP_DigestFinal_ex(ctx, out, NULL) <= 0) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_local.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_local.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_local.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/ssl_local.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -537,7 +537,6 @@
     int not_resumable;
     /* This is the cert and type for the other end. */
     X509 *peer;
-    int peer_type;
     /* Certificate chain peer sent. */
     STACK_OF(X509) *peer_chain;
     /*
@@ -2306,6 +2305,7 @@
 __owur int ssl_security(const SSL *s, int op, int bits, int nid, void *other);
 __owur int ssl_ctx_security(const SSL_CTX *ctx, int op, int bits, int nid,
                             void *other);
+int ssl_get_security_level_bits(const SSL *s, const SSL_CTX *ctx, int *levelp);
 
 __owur int ssl_cert_lookup_by_nid(int nid, size_t *pidx);
 __owur const SSL_CERT_LOOKUP *ssl_cert_lookup_by_pkey(const EVP_PKEY *pk,
@@ -2427,7 +2427,6 @@
 void dtls1_start_timer(SSL *s);
 void dtls1_stop_timer(SSL *s);
 __owur int dtls1_is_timer_expired(SSL *s);
-void dtls1_double_timeout(SSL *s);
 __owur int dtls_raw_hello_verify_request(WPACKET *pkt, unsigned char *cookie,
                                          size_t cookie_len);
 __owur size_t dtls1_min_mtu(SSL *s);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -18,6 +18,7 @@
 static int init_server_name(SSL *s, unsigned int context);
 static int final_server_name(SSL *s, unsigned int context, int sent);
 #ifndef OPENSSL_NO_EC
+static int init_ec_point_formats(SSL *s, unsigned int context);
 static int final_ec_pt_formats(SSL *s, unsigned int context, int sent);
 #endif
 static int init_session_ticket(SSL *s, unsigned int context);
@@ -56,6 +57,7 @@
 static int final_early_data(SSL *s, unsigned int context, int sent);
 static int final_maxfragmentlen(SSL *s, unsigned int context, int sent);
 static int init_post_handshake_auth(SSL *s, unsigned int context);
+static int final_psk(SSL *s, unsigned int context, int sent);
 
 /* Structure to define a built-in extension */
 typedef struct extensions_definition_st {
@@ -158,7 +160,7 @@
         TLSEXT_TYPE_ec_point_formats,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
         | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
-        NULL, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
+        init_ec_point_formats, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
         tls_construct_stoc_ec_pt_formats, tls_construct_ctos_ec_pt_formats,
         final_ec_pt_formats
     },
@@ -336,6 +338,8 @@
         tls_construct_stoc_key_share, tls_construct_ctos_key_share,
         final_key_share
     },
+#else
+    INVALID_EXTENSION,
 #endif
     {
         /* Must be after key_share */
@@ -387,7 +391,7 @@
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO
         | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
         NULL, tls_parse_ctos_psk, tls_parse_stoc_psk, tls_construct_stoc_psk,
-        tls_construct_ctos_psk, NULL
+        tls_construct_ctos_psk, final_psk
     }
 };
 
@@ -966,7 +970,8 @@
      * context, to avoid the confusing situation of having sess_accept_good
      * exceed sess_accept (zero) for the new context.
      */
-    if (SSL_IS_FIRST_HANDSHAKE(s) && s->ctx != s->session_ctx) {
+    if (SSL_IS_FIRST_HANDSHAKE(s) && s->ctx != s->session_ctx
+		    && s->hello_retry_request == SSL_HRR_NONE) {
         tsan_counter(&s->ctx->stats.sess_accept);
         tsan_decr(&s->session_ctx->stats.sess_accept);
     }
@@ -1023,6 +1028,15 @@
 }
 
 #ifndef OPENSSL_NO_EC
+static int init_ec_point_formats(SSL *s, unsigned int context)
+{
+    OPENSSL_free(s->ext.peer_ecpointformats);
+    s->ext.peer_ecpointformats = NULL;
+    s->ext.peer_ecpointformats_len = 0;
+
+    return 1;
+}
+
 static int final_ec_pt_formats(SSL *s, unsigned int context, int sent)
 {
     unsigned long alg_k, alg_a;
@@ -1136,6 +1150,7 @@
     /* Clear any signature algorithms extension received */
     OPENSSL_free(s->s3->tmp.peer_sigalgs);
     s->s3->tmp.peer_sigalgs = NULL;
+    s->s3->tmp.peer_sigalgslen = 0;
 
     return 1;
 }
@@ -1145,6 +1160,7 @@
     /* Clear any signature algorithms extension received */
     OPENSSL_free(s->s3->tmp.peer_cert_sigalgs);
     s->s3->tmp.peer_cert_sigalgs = NULL;
+    s->s3->tmp.peer_cert_sigalgslen = 0;
 
     return 1;
 }
@@ -1713,3 +1729,19 @@
 
     return 1;
 }
+
+/*
+ * If clients offer "pre_shared_key" without a "psk_key_exchange_modes"
+ * extension, servers MUST abort the handshake.
+ */
+static int final_psk(SSL *s, unsigned int context, int sent)
+{
+    if (s->server && sent && s->clienthello != NULL
+            && !s->clienthello->pre_proc_exts[TLSEXT_IDX_psk_kex_modes].present) {
+        SSLfatal(s, TLS13_AD_MISSING_EXTENSION, SSL_F_FINAL_PSK,
+                 SSL_R_MISSING_PSK_KEX_MODES_EXTENSION);
+        return 0;
+    }
+
+    return 1;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions_clnt.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions_clnt.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions_clnt.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions_clnt.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -816,6 +816,7 @@
         OPENSSL_free(s->psksession_id);
         s->psksession_id = OPENSSL_memdup(id, idlen);
         if (s->psksession_id == NULL) {
+            s->psksession_id_len = 0;
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                      SSL_F_TLS_CONSTRUCT_CTOS_EARLY_DATA, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
@@ -1375,6 +1376,7 @@
         OPENSSL_free(s->ext.peer_ecpointformats);
         s->ext.peer_ecpointformats = OPENSSL_malloc(ecpointformats_len);
         if (s->ext.peer_ecpointformats == NULL) {
+            s->ext.peer_ecpointformats_len = 0;
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                      SSL_F_TLS_PARSE_STOC_EC_PT_FORMATS, ERR_R_INTERNAL_ERROR);
             return 0;
@@ -1492,8 +1494,13 @@
         s->ext.scts_len = (uint16_t)size;
         if (size > 0) {
             s->ext.scts = OPENSSL_malloc(size);
-            if (s->ext.scts == NULL
-                    || !PACKET_copy_bytes(pkt, s->ext.scts, size)) {
+            if (s->ext.scts == NULL) {
+                s->ext.scts_len = 0;
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PARSE_STOC_SCT,
+                         ERR_R_MALLOC_FAILURE);
+                return 0;
+            }
+            if (!PACKET_copy_bytes(pkt, s->ext.scts, size)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PARSE_STOC_SCT,
                          ERR_R_INTERNAL_ERROR);
                 return 0;
@@ -1592,6 +1599,7 @@
     OPENSSL_free(s->ext.npn);
     s->ext.npn = OPENSSL_malloc(selected_len);
     if (s->ext.npn == NULL) {
+        s->ext.npn_len = 0;
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PARSE_STOC_NPN,
                  ERR_R_INTERNAL_ERROR);
         return 0;
@@ -1632,6 +1640,7 @@
     OPENSSL_free(s->s3->alpn_selected);
     s->s3->alpn_selected = OPENSSL_malloc(len);
     if (s->s3->alpn_selected == NULL) {
+        s->s3->alpn_selected_len = 0;
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PARSE_STOC_ALPN,
                  ERR_R_INTERNAL_ERROR);
         return 0;
@@ -1663,6 +1672,7 @@
         s->session->ext.alpn_selected =
             OPENSSL_memdup(s->s3->alpn_selected, s->s3->alpn_selected_len);
         if (s->session->ext.alpn_selected == NULL) {
+            s->session->ext.alpn_selected_len = 0;
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PARSE_STOC_ALPN,
                      ERR_R_INTERNAL_ERROR);
             return 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions_srvr.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions_srvr.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions_srvr.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/extensions_srvr.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -1714,6 +1714,13 @@
         }
         return EXT_RETURN_NOT_SENT;
     }
+    if (s->hit && (s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE_DHE) == 0) {
+        /*
+         * PSK ('hit') and explicitly not doing DHE (if the client sent the
+         * DHE option we always take it); don't send key share.
+         */
+        return EXT_RETURN_NOT_SENT;
+    }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_key_share)
             || !WPACKET_start_sub_packet_u16(pkt)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_clnt.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_clnt.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_clnt.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_clnt.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -1001,7 +1001,8 @@
         return CCS_MAX_LENGTH;
 
     case TLS_ST_CR_SESSION_TICKET:
-        return SSL3_RT_MAX_PLAIN_LENGTH;
+        return (SSL_IS_TLS13(s)) ? SESSION_TICKET_MAX_LENGTH_TLS13
+                                 : SESSION_TICKET_MAX_LENGTH_TLS12;
 
     case TLS_ST_CR_FINISHED:
         return FINISHED_MAX_LENGTH;
@@ -1960,7 +1961,6 @@
             goto err;
         }
     }
-    s->session->peer_type = certidx;
 
     X509_free(s->session->peer);
     X509_up_ref(x);
@@ -2463,6 +2463,7 @@
         s->s3->tmp.ctype_len = 0;
         OPENSSL_free(s->pha_context);
         s->pha_context = NULL;
+        s->pha_context_len = 0;
 
         if (!PACKET_get_length_prefixed_1(pkt, &reqctx) ||
             !PACKET_memdup(&reqctx, &s->pha_context, &s->pha_context_len)) {
@@ -2772,16 +2773,17 @@
     }
     s->ext.ocsp.resp = OPENSSL_malloc(resplen);
     if (s->ext.ocsp.resp == NULL) {
+        s->ext.ocsp.resp_len = 0;
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_STATUS_BODY,
                  ERR_R_MALLOC_FAILURE);
         return 0;
     }
+    s->ext.ocsp.resp_len = resplen;
     if (!PACKET_copy_bytes(pkt, s->ext.ocsp.resp, resplen)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PROCESS_CERT_STATUS_BODY,
                  SSL_R_LENGTH_MISMATCH);
         return 0;
     }
-    s->ext.ocsp.resp_len = resplen;
 
     return 1;
 }
@@ -2832,7 +2834,7 @@
         if (ret < 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                      SSL_F_TLS_PROCESS_INITIAL_SERVER_FLIGHT,
-                     ERR_R_MALLOC_FAILURE);
+                     SSL_R_OCSP_CALLBACK_FAILURE);
             return 0;
         }
     }
@@ -2906,6 +2908,7 @@
     if (psklen > PSK_MAX_PSK_LEN) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
                  SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE, ERR_R_INTERNAL_ERROR);
+        psklen = PSK_MAX_PSK_LEN;   /* Avoid overrunning the array on cleanse */
         goto err;
     } else if (psklen == 0) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
@@ -3351,9 +3354,11 @@
  err:
     OPENSSL_clear_free(s->s3->tmp.pms, s->s3->tmp.pmslen);
     s->s3->tmp.pms = NULL;
+    s->s3->tmp.pmslen = 0;
 #ifndef OPENSSL_NO_PSK
     OPENSSL_clear_free(s->s3->tmp.psk, s->s3->tmp.psklen);
     s->s3->tmp.psk = NULL;
+    s->s3->tmp.psklen = 0;
 #endif
     return 0;
 }
@@ -3428,6 +3433,7 @@
  err:
     OPENSSL_clear_free(pms, pmslen);
     s->s3->tmp.pms = NULL;
+    s->s3->tmp.pmslen = 0;
     return 0;
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_lib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_lib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_lib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_lib.c	2021-12-09 12:01:26.000000000 +0000
@@ -1504,8 +1504,8 @@
 
 /*
  * Only called by servers. Returns 1 if the server has a TLSv1.3 capable
- * certificate type, or has PSK or a certificate callback configured. Otherwise
- * returns 0.
+ * certificate type, or has PSK or a certificate callback configured, or has
+ * a servername callback configured. Otherwise returns 0.
  */
 static int is_tls13_capable(const SSL *s)
 {
@@ -1515,6 +1515,17 @@
     EC_KEY *eckey;
 #endif
 
+    if (!ossl_assert(s->ctx != NULL) || !ossl_assert(s->session_ctx != NULL))
+        return 0;
+
+    /*
+     * A servername callback can change the available certs, so if a servername
+     * cb is set then we just assume TLSv1.3 will be ok
+     */
+    if (s->ctx->ext.servername_cb != NULL
+            || s->session_ctx->ext.servername_cb != NULL)
+        return 1;
+
 #ifndef OPENSSL_NO_PSK
     if (s->psk_server_callback != NULL)
         return 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_local.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_local.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_local.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_local.h	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -22,6 +22,8 @@
 #define SERVER_HELLO_MAX_LENGTH         20000
 #define HELLO_RETRY_REQUEST_MAX_LENGTH  20000
 #define ENCRYPTED_EXTENSIONS_MAX_LENGTH 20000
+#define SESSION_TICKET_MAX_LENGTH_TLS13 131338
+#define SESSION_TICKET_MAX_LENGTH_TLS12 65541
 #define SERVER_KEY_EXCH_MAX_LENGTH      102400
 #define SERVER_HELLO_DONE_MAX_LENGTH    0
 #define KEY_UPDATE_MAX_LENGTH           1
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_srvr.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_srvr.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_srvr.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/statem/statem_srvr.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -2178,6 +2178,7 @@
             OPENSSL_free(s->s3->alpn_selected);
             s->s3->alpn_selected = OPENSSL_memdup(selected, selected_len);
             if (s->s3->alpn_selected == NULL) {
+                s->s3->alpn_selected_len = 0;
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_HANDLE_ALPN,
                          ERR_R_INTERNAL_ERROR);
                 return 0;
@@ -2853,9 +2854,16 @@
         if (s->post_handshake_auth == SSL_PHA_REQUEST_PENDING) {
             OPENSSL_free(s->pha_context);
             s->pha_context_len = 32;
-            if ((s->pha_context = OPENSSL_malloc(s->pha_context_len)) == NULL
-                    || RAND_bytes(s->pha_context, s->pha_context_len) <= 0
-                    || !WPACKET_sub_memcpy_u8(pkt, s->pha_context, s->pha_context_len)) {
+            if ((s->pha_context = OPENSSL_malloc(s->pha_context_len)) == NULL) {
+                s->pha_context_len = 0;
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR,
+                         SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST,
+                         ERR_R_INTERNAL_ERROR);
+                return 0;
+            }
+            if (RAND_bytes(s->pha_context, s->pha_context_len) <= 0
+                    || !WPACKET_sub_memcpy_u8(pkt, s->pha_context,
+                                              s->pha_context_len)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                          SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST,
                          ERR_R_INTERNAL_ERROR);
@@ -2969,6 +2977,7 @@
     OPENSSL_cleanse(psk, psklen);
 
     if (s->s3->tmp.psk == NULL) {
+        s->s3->tmp.psklen = 0;
         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                  SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE, ERR_R_MALLOC_FAILURE);
         return 0;
@@ -3508,6 +3517,7 @@
 #ifndef OPENSSL_NO_PSK
     OPENSSL_clear_free(s->s3->tmp.psk, s->s3->tmp.psklen);
     s->s3->tmp.psk = NULL;
+    s->s3->tmp.psklen = 0;
 #endif
     return MSG_PROCESS_ERROR;
 }
@@ -3743,6 +3753,7 @@
 
     sk_X509_pop_free(s->session->peer_chain, X509_free);
     s->session->peer_chain = sk;
+    sk = NULL;
 
     /*
      * Freeze the handshake buffer. For <TLS1.3 we do this after the CKE
@@ -3757,7 +3768,6 @@
      * Inconsistency alert: cert_chain does *not* include the peer's own
      * certificate, while we do include it in statem_clnt.c
      */
-    sk = NULL;
 
     /* Save the current hash state for when we receive the CertificateVerify */
     if (SSL_IS_TLS13(s)) {
@@ -4117,6 +4127,7 @@
             s->session->ext.alpn_selected =
                 OPENSSL_memdup(s->s3->alpn_selected, s->s3->alpn_selected_len);
             if (s->session->ext.alpn_selected == NULL) {
+                s->session->ext.alpn_selected_len = 0;
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                          SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET,
                          ERR_R_MALLOC_FAILURE);
@@ -4128,9 +4139,12 @@
     }
 
     if (tctx->generate_ticket_cb != NULL &&
-        tctx->generate_ticket_cb(s, tctx->ticket_cb_data) == 0)
+        tctx->generate_ticket_cb(s, tctx->ticket_cb_data) == 0) {
+        SSLfatal(s, SSL_AD_INTERNAL_ERROR,
+                 SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET,
+                 ERR_R_INTERNAL_ERROR);
         goto err;
-
+    }
     /*
      * If we are using anti-replay protection then we behave as if
      * SSL_OP_NO_TICKET is set - we are caching tickets anyway so there
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/t1_lib.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/t1_lib.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/ssl/t1_lib.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/ssl/t1_lib.c	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -2441,7 +2441,8 @@
 {
     DH *dhp = NULL;
     BIGNUM *p = NULL, *g = NULL;
-    int dh_secbits = 80;
+    int dh_secbits = 80, sec_level_bits;
+
     if (s->cert->dh_tmp_auto != 2) {
         if (s->s3->tmp.new_cipher->algorithm_auth & (SSL_aNULL | SSL_aPSK)) {
             if (s->s3->tmp.new_cipher->strength_bits == 256)
@@ -2464,6 +2465,12 @@
         BN_free(g);
         return NULL;
     }
+
+    /* Do not pick a prime that is too weak for the current security level */
+    sec_level_bits = ssl_get_security_level_bits(s, NULL, NULL);
+    if (dh_secbits < sec_level_bits)
+        dh_secbits = sec_level_bits;
+
     if (dh_secbits >= 192)
         p = BN_get_rfc3526_prime_8192(NULL);
     else if (dh_secbits >= 152)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/tools/c_rehash.in thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/tools/c_rehash.in
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/tools/c_rehash.in	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/tools/c_rehash.in	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 #!{- $config{HASHBANGPERL} -}
 
 # {- join("\n# ", @autowarntext) -}
-# Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -161,7 +161,7 @@
 
 sub link_hash_cert {
 		my $fname = $_[0];
-		$fname =~ s/'/'\\''/g;
+		$fname =~ s/\"/\\\"/g;
 		my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
 		chomp $hash;
 		chomp $fprint;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/util/mkdir-p.pl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/util/mkdir-p.pl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/util/mkdir-p.pl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/util/mkdir-p.pl	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -34,11 +34,12 @@
   }
 
   unless (mkdir($dir, 0777)) {
+    local($err) = $!;
     if (-d $dir) {
       # We raced against another instance doing the same thing.
       return;
     }
-    die "Cannot create directory $dir: $!\n";
+    die "Cannot create directory $dir: $err\n";
   }
   print "created directory `$dir'\n";
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/util/perl/TLSProxy/Message.pm thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/util/perl/TLSProxy/Message.pm
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/util/perl/TLSProxy/Message.pm	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/util/perl/TLSProxy/Message.pm	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -448,7 +448,7 @@
 }
 
 #Update all the underlying records with the modified data from this message
-#Note: Only supports re-encrypting for TLSv1.3
+#Note: Only supports TLSv1.3 and ETM encryption
 sub repack
 {
     my $self = shift;
@@ -490,15 +490,38 @@
         # (If a length override is ever needed to construct invalid packets,
         #  use an explicit override field instead.)
         $rec->decrypt_len(length($rec->decrypt_data));
-        $rec->len($rec->len + length($msgdata) - $old_length);
-        # Only support re-encryption for TLSv1.3.
-        if (TLSProxy::Proxy->is_tls13() && $rec->encrypted()) {
-            #Add content type (1 byte) and 16 tag bytes
-            $rec->data($rec->decrypt_data
-                .pack("C", TLSProxy::Record::RT_HANDSHAKE).("\0"x16));
+        # Only support re-encryption for TLSv1.3 and ETM.
+        if ($rec->encrypted()) {
+            if (TLSProxy::Proxy->is_tls13()) {
+                #Add content type (1 byte) and 16 tag bytes
+                $rec->data($rec->decrypt_data
+                    .pack("C", TLSProxy::Record::RT_HANDSHAKE).("\0"x16));
+            } elsif ($rec->etm()) {
+                my $data = $rec->decrypt_data;
+                #Add padding
+                my $padval = length($data) % 16;
+                $padval = 15 - $padval;
+                for (0..$padval) {
+                    $data .= pack("C", $padval);
+                }
+
+                #Add MAC. Assumed to be 20 bytes
+                foreach my $macval (0..19) {
+                    $data .= pack("C", $macval);
+                }
+
+                if ($rec->version() >= TLSProxy::Record::VERS_TLS_1_1) {
+                    #Explicit IV
+                    $data = ("\0"x16).$data;
+                }
+                $rec->data($data);
+            } else {
+                die "Unsupported encryption: No ETM";
+            }
         } else {
             $rec->data($rec->decrypt_data);
         }
+        $rec->len(length($rec->data));
 
         #Update the fragment len in case we changed it above
         ${$self->message_frag_lens}[0] = length($msgdata)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/VMS/msg_install.com thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/VMS/msg_install.com
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/VMS/msg_install.com	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/VMS/msg_install.com	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+$       ! Used by the main descrip.mms to print the installation complete
+$       ! message.
+$       ! Arguments:
+$       ! P1    startup / setup / shutdown scripts directory
+$       ! P2    distinguishing version number ("major version")
+$
+$       systartup = p1
+$       osslver = p2
+$
+$       WRITE SYS$OUTPUT "Installation complete"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "The following commands need to be executed to enable you to use OpenSSL:"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "- to set up OpenSSL logical names:"
+$       WRITE SYS$OUTPUT "  @''systartup'openssl_startup''osslver'"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "- to define the OpenSSL command"
+$       WRITE SYS$OUTPUT "  @''systartup'openssl_utils''osslver'"
+$       WRITE SYS$OUTPUT ""
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/VMS/msg_staging.com thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/VMS/msg_staging.com
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/openssl/VMS/msg_staging.com	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/openssl/VMS/msg_staging.com	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,37 @@
+$       ! Used by the main descrip.mms to print the statging installation
+$       ! complete
+$       ! message.
+$       ! Arguments:
+$       ! P1    staging software installation directory
+$       ! P2    staging data installation directory
+$       ! P3    final software installation directory
+$       ! P4    final data installation directory
+$       ! P5    startup / setup / shutdown scripts directory
+$       ! P6    distinguishing version number ("major version")
+$
+$       staging_instdir = p1
+$       staging_datadir = p2
+$       final_instdir = p3
+$       final_datadir = p4
+$       systartup = p5
+$       osslver = p6
+$
+$       WRITE SYS$OUTPUT "Staging installation complete"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "Finish or package in such a way that the contents of the following directory"
+$       WRITE SYS$OUTPUT "trees end up being copied:"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "- from ", staging_instdir
+$       WRITE SYS$OUTPUT "  to   ", final_instdir
+$       WRITE SYS$OUTPUT "- from ", staging_datadir
+$       WRITE SYS$OUTPUT "  to   ", final_datadir
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "When in its final destination, the following commands need to be executed"
+$       WRITE SYS$OUTPUT "to use OpenSSL:"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "- to set up OpenSSL logical names:"
+$       WRITE SYS$OUTPUT "  @''systartup'openssl_startup''osslver'"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "- to define the OpenSSL command"
+$       WRITE SYS$OUTPUT "  @''systartup'openssl_utils''osslver'"
+$       WRITE SYS$OUTPUT ""
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -15,6 +15,22 @@
 
 at your option.
 
+### Windows MSVC Assembly
+Building OpenSSL for `windows-msvc` targets, users can choose whether to enable
+assembly language routines, which requires [nasm](https://www.nasm.us/).  
+The build process will automatically detect whether `nasm.exe` is installed in
+PATH. If found, the assembly language routines will be enabled (in other words,
+the `no-asm` option will NOT be configured).  
+You can manipulate this behavior by setting the `OPENSSL_RUST_USE_NASM` environment
+variable:
+* `1`: Force enable the assembly language routines. (panic if `nasm.exe` is not
+availible.)
+* `0`: Force disable the assembly language routines even if the `nasm.exe` can be
+found in PATH.
+* not set: Let the build process automatically detect whether `nasm.exe` is
+installed. If found, enable. If not, disable.
+However, this environment variable does not take effects on non-windows platforms.
+
 ### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-src/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-src/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,9 @@
 pub struct Artifacts {
     include_dir: PathBuf,
     lib_dir: PathBuf,
+    bin_dir: PathBuf,
     libs: Vec<String>,
+    target: String,
 }
 
 impl Build {
@@ -63,6 +65,53 @@
         }
     }
 
+    #[cfg(windows)]
+    fn check_env_var(&self, var_name: &str) -> Option<bool> {
+        env::var_os(var_name).map(|s| {
+            if s == "1" {
+                // a message to stdout, let user know asm is force enabled
+                println!(
+                    "{}: nasm.exe is force enabled by the \
+                    'OPENSSL_RUST_USE_NASM' env var.",
+                    env!("CARGO_PKG_NAME")
+                );
+                true
+            } else if s == "0" {
+                // a message to stdout, let user know asm is force disabled
+                println!(
+                    "{}: nasm.exe is force disabled by the \
+                    'OPENSSL_RUST_USE_NASM' env var.",
+                    env!("CARGO_PKG_NAME")
+                );
+                false
+            } else {
+                panic!(
+                    "The environment variable {} is set to an unacceptable value: {:?}",
+                    var_name, s
+                );
+            }
+        })
+    }
+
+    #[cfg(windows)]
+    fn is_nasm_ready(&self) -> bool {
+        self.check_env_var("OPENSSL_RUST_USE_NASM")
+            .unwrap_or_else(|| {
+                // On Windows, use cmd `where` command to check if nasm is installed
+                let wherenasm = Command::new("cmd")
+                    .args(&["/C", "where nasm"])
+                    .output()
+                    .expect("Failed to execute `cmd`.");
+                wherenasm.status.success()
+            })
+    }
+
+    #[cfg(not(windows))]
+    fn is_nasm_ready(&self) -> bool {
+        // We assume that nobody would run nasm.exe on a non-windows system.
+        false
+    }
+
     pub fn build(&mut self) -> Artifacts {
         let target = &self.target.as_ref().expect("TARGET dir not set")[..];
         let host = &self.host.as_ref().expect("HOST dir not set")[..];
@@ -95,6 +144,7 @@
         configure
             // No shared objects, we just want static libraries
             .arg("no-dso")
+            .arg("no-shared")
             // Should be off by default on OpenSSL 1.1.0, but let's be extra sure
             .arg("no-ssl3")
             // No need to build tests, we won't run them anyway
@@ -144,17 +194,18 @@
         }
 
         if target.contains("msvc") {
-            // On MSVC we need nasm.exe to compile the assembly files, but let's
-            // just pessimistically assume for now that's not available.
-            configure.arg("no-asm");
-
-            let features = env::var("CARGO_CFG_TARGET_FEATURE").unwrap_or(String::new());
-            if features.contains("crt-static") {
-                configure.arg("no-shared");
+            // On MSVC we need nasm.exe to compile the assembly files.
+            // ASM compiling will be enabled if nasm.exe is installed, unless
+            // the environment variable `OPENSSL_RUST_USE_NASM` is set.
+            if self.is_nasm_ready() {
+                // a message to stdout, let user know asm is enabled
+                println!(
+                    "{}: Enable the assembly language routines in building OpenSSL.",
+                    env!("CARGO_PKG_NAME")
+                );
+            } else {
+                configure.arg("no-asm");
             }
-        } else {
-            // Never shared on non-MSVC
-            configure.arg("no-shared");
         }
 
         let os = match target {
@@ -175,8 +226,12 @@
             "arm-unknown-linux-gnueabihf" => "linux-armv4",
             "arm-unknown-linux-musleabi" => "linux-armv4",
             "arm-unknown-linux-musleabihf" => "linux-armv4",
+            "armv5te-unknown-linux-gnueabi" => "linux-armv4",
+            "armv5te-unknown-linux-musleabi" => "linux-armv4",
             "armv6-unknown-freebsd" => "BSD-generic32",
             "armv7-unknown-freebsd" => "BSD-generic32",
+            "armv7-unknown-linux-gnueabi" => "linux-armv4",
+            "armv7-unknown-linux-musleabi" => "linux-armv4",
             "armv7-unknown-linux-gnueabihf" => "linux-armv4",
             "armv7-unknown-linux-musleabihf" => "linux-armv4",
             "asmjs-unknown-emscripten" => "gcc",
@@ -192,16 +247,22 @@
             "mips-unknown-linux-gnu" => "linux-mips32",
             "mips-unknown-linux-musl" => "linux-mips32",
             "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
+            "mips64-unknown-linux-muslabi64" => "linux64-mips64",
             "mips64el-unknown-linux-gnuabi64" => "linux64-mips64",
+            "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
             "mipsel-unknown-linux-gnu" => "linux-mips32",
             "mipsel-unknown-linux-musl" => "linux-mips32",
+            "powerpc-unknown-freebsd" => "BSD-generic32",
             "powerpc-unknown-linux-gnu" => "linux-ppc",
             "powerpc64-unknown-freebsd" => "BSD-generic64",
             "powerpc64-unknown-linux-gnu" => "linux-ppc64",
+            "powerpc64-unknown-linux-musl" => "linux-ppc64",
             "powerpc64le-unknown-freebsd" => "BSD-generic64",
             "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
+            "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
             "riscv64gc-unknown-linux-gnu" => "linux-generic64",
             "s390x-unknown-linux-gnu" => "linux64-s390x",
+            "s390x-unknown-linux-musl" => "linux64-s390x",
             "x86_64-apple-darwin" => "darwin64-x86_64-cc",
             "x86_64-linux-android" => "linux-x86_64",
             "x86_64-pc-windows-gnu" => "mingw64",
@@ -216,6 +277,7 @@
             "x86_64-sun-solaris" => "solaris64-x86_64-gcc",
             "wasm32-unknown-emscripten" => "gcc",
             "wasm32-unknown-unknown" => "gcc",
+            "wasm32-wasi" => "gcc",
             "aarch64-apple-ios" => "ios64-cross",
             "x86_64-apple-ios" => "iossimulator-xcrun",
             _ => panic!("don't know how to configure OpenSSL for {}", target),
@@ -403,8 +465,10 @@
 
         Artifacts {
             lib_dir: install_dir.join("lib"),
+            bin_dir: install_dir.join("bin"),
             include_dir: install_dir.join("include"),
             libs: libs,
+            target: target.to_string(),
         }
     }
 
@@ -512,5 +576,8 @@
         }
         println!("cargo:include={}", self.include_dir.display());
         println!("cargo:lib={}", self.lib_dir.display());
+        if self.target.contains("msvc") {
+            println!("cargo:rustc-link-lib=user32");
+        }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/build/cfgs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/build/cfgs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/build/cfgs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/build/cfgs.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,3 @@
-#[allow(clippy::inconsistent_digit_grouping)]
 pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&'static str> {
     let mut cfgs = vec![];
 
@@ -32,9 +31,15 @@
         if libressl_version >= 0x3_02_01_00_0 {
             cfgs.push("libressl321");
         }
+        if libressl_version >= 0x3_03_02_00_0 {
+            cfgs.push("libressl332");
+        }
     } else {
         let openssl_version = openssl_version.unwrap();
 
+        if openssl_version >= 0x3_00_00_00_0 {
+            cfgs.push("ossl300");
+        }
         if openssl_version >= 0x1_00_01_00_0 {
             cfgs.push("ossl101");
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/build/expando.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/build/expando.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/build/expando.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/build/expando.c	2021-12-09 12:01:26.000000000 +0000
@@ -4,8 +4,13 @@
 #define VERSION2(n, v) RUST_VERSION_##n##_##v
 #define VERSION(n, v) VERSION2(n, v)
 
+#define NEW_VERSION2(a, b, c) RUST_VERSION_NEW_OPENSSL_##a##_##b##_##c
+#define NEW_VERSION(a, b, c) NEW_VERSION2(a, b, c)
+
 #ifdef LIBRESSL_VERSION_NUMBER
 VERSION(LIBRESSL, LIBRESSL_VERSION_NUMBER)
+#elif defined OPENSSL_VERSION_MAJOR
+NEW_VERSION(OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH)
 #else
 VERSION(OPENSSL, OPENSSL_VERSION_NUMBER)
 #endif
@@ -46,6 +51,10 @@
 RUST_CONF_OPENSSL_NO_NEXTPROTONEG
 #endif
 
+#ifdef OPENSSL_NO_OCSP
+RUST_CONF_OPENSSL_NO_OCSP
+#endif
+
 #ifdef OPENSSL_NO_PSK
 RUST_CONF_OPENSSL_NO_PSK
 #endif
@@ -77,3 +86,15 @@
 #ifdef OPENSSL_NO_STDIO
 RUST_CONF_OPENSSL_NO_STDIO
 #endif
+
+#ifdef OPENSSL_NO_SM3
+RUST_CONF_OPENSSL_NO_SM3
+#endif
+
+#ifdef OPENSSL_NO_DEPRECATED_3_0
+RUST_CONF_OPENSSL_NO_DEPRECATED_3_0
+#endif
+
+#ifdef OPENSSL_NO_SEED
+RUST_CONF_OPENSSL_NO_SEED
+#endif
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/build/find_normal.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/build/find_normal.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/build/find_normal.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/build/find_normal.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
     match (lib_dir, include_dir) {
         (Some(lib_dir), Some(include_dir)) => (lib_dir, include_dir),
         (lib_dir, include_dir) => {
-            let openssl_dir = env("OPENSSL_DIR").unwrap_or_else(|| find_openssl_dir(&target));
+            let openssl_dir = env("OPENSSL_DIR").unwrap_or_else(|| find_openssl_dir(target));
             let openssl_dir = Path::new(&openssl_dir);
             let lib_dir = lib_dir.unwrap_or_else(|| openssl_dir.join("lib"));
             let include_dir = include_dir.unwrap_or_else(|| openssl_dir.join("include"));
@@ -21,35 +21,55 @@
     }
 }
 
-fn find_openssl_dir(target: &str) -> OsString {
-    let host = env::var("HOST").unwrap();
+fn resolve_with_wellknown_homebrew_location(dir: &str) -> Option<PathBuf> {
+    // Check up default aarch 64 Homebrew installation location first
+    // for quick resolution if possible.
+    //  `pkg-config` on brew doesn't necessarily contain settings for openssl apparently.
+    let homebrew = Path::new(dir).join("opt/openssl@1.1");
+    if homebrew.exists() {
+        return Some(homebrew);
+    }
 
-    if host == target && target.contains("apple-darwin") {
-        // Check up default Homebrew installation location first
-        // for quick resolution if possible.
-        let homebrew = Path::new("/usr/local/opt/openssl@1.1");
-        if homebrew.exists() {
-            return homebrew.to_path_buf().into();
-        }
-        let homebrew = Path::new("/usr/local/opt/openssl");
+    // Calling `brew --prefix <package>` command usually slow and
+    // takes seconds, and will be used only as a last resort.
+    let output = execute_command_and_get_output("brew", &["--prefix", "openssl@1.1"]);
+    if let Some(ref output) = output {
+        let homebrew = Path::new(&output);
         if homebrew.exists() {
-            return homebrew.to_path_buf().into();
-        }
-        // Calling `brew --prefix <package>` command usually slow and
-        // takes seconds, and will be used only as a last resort.
-        let output = execute_command_and_get_output("brew", &["--prefix", "openssl@1.1"]);
-        if let Some(ref output) = output {
-            let homebrew = Path::new(&output);
-            if homebrew.exists() {
-                return homebrew.to_path_buf().into();
-            }
+            return Some(homebrew.to_path_buf());
         }
-        let output = execute_command_and_get_output("brew", &["--prefix", "openssl"]);
-        if let Some(ref output) = output {
-            let homebrew = Path::new(&output);
-            if homebrew.exists() {
-                return homebrew.to_path_buf().into();
-            }
+    }
+
+    None
+}
+
+fn resolve_with_wellknown_location(dir: &str) -> Option<PathBuf> {
+    let root_dir = Path::new(dir);
+    let include_openssl = root_dir.join("include/openssl");
+    if include_openssl.exists() {
+        Some(root_dir.to_path_buf())
+    } else {
+        None
+    }
+}
+
+fn find_openssl_dir(target: &str) -> OsString {
+    let host = env::var("HOST").unwrap();
+
+    if host == target && target.ends_with("-apple-darwin") {
+        let homebrew_dir = match target {
+            "aarch64-apple-darwin" => "/opt/homebrew",
+            _ => "/usr/local",
+        };
+
+        if let Some(dir) = resolve_with_wellknown_homebrew_location(homebrew_dir) {
+            return dir.into();
+        } else if let Some(dir) = resolve_with_wellknown_location("/opt/pkg") {
+            // pkgsrc
+            return dir.into();
+        } else if let Some(dir) = resolve_with_wellknown_location("/opt/local") {
+            // MacPorts
+            return dir.into();
         }
     }
 
@@ -151,7 +171,7 @@
         );
     }
 
-    panic!(msg);
+    panic!("{}", msg);
 }
 
 /// Attempt to find OpenSSL through pkg-config.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/build/main.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/build/main.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/build/main.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/build/main.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![allow(clippy::inconsistent_digit_grouping)]
+#![allow(clippy::inconsistent_digit_grouping, clippy::unusual_byte_groupings)]
 
 extern crate autocfg;
 extern crate cc;
@@ -85,7 +85,13 @@
 
     let libs_env = env("OPENSSL_LIBS");
     let libs = match libs_env.as_ref().and_then(|s| s.to_str()) {
-        Some(ref v) => v.split(':').collect(),
+        Some(v) => {
+            if v.is_empty() {
+                vec![]
+            } else {
+                v.split(':').collect()
+            }
+        }
         None => match version {
             Version::Openssl10x if target.contains("windows") => vec!["ssleay32", "libeay32"],
             Version::Openssl11x if target.contains("windows-msvc") => vec!["libssl", "libcrypto"],
@@ -173,11 +179,15 @@
         let line = line.trim();
 
         let openssl_prefix = "RUST_VERSION_OPENSSL_";
+        let new_openssl_prefix = "RUST_VERSION_NEW_OPENSSL_";
         let libressl_prefix = "RUST_VERSION_LIBRESSL_";
         let conf_prefix = "RUST_CONF_";
         if line.starts_with(openssl_prefix) {
             let version = &line[openssl_prefix.len()..];
             openssl_version = Some(parse_version(version));
+        } else if line.starts_with(new_openssl_prefix) {
+            let version = &line[new_openssl_prefix.len()..];
+            openssl_version = Some(parse_new_version(version));
         } else if line.starts_with(libressl_prefix) {
             let version = &line[libressl_prefix.len()..];
             libressl_version = Some(parse_version(version));
@@ -226,6 +236,7 @@
             (3, 2, _) => ('3', '2', 'x'),
             (3, 3, 0) => ('3', '3', '0'),
             (3, 3, 1) => ('3', '3', '1'),
+            (3, 3, _) => ('3', '3', 'x'),
             _ => version_error(),
         };
 
@@ -237,8 +248,10 @@
         let openssl_version = openssl_version.unwrap();
         println!("cargo:version_number={:x}", openssl_version);
 
-        if openssl_version >= 0x1_01_02_00_0 {
+        if openssl_version >= 0x4_00_00_00_0 {
             version_error()
+        } else if openssl_version >= 0x3_00_00_00_0 {
+            Version::Openssl11x
         } else if openssl_version >= 0x1_01_01_00_0 {
             println!("cargo:version=111");
             Version::Openssl11x
@@ -266,7 +279,7 @@
         "
 
 This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
-through 3.3.1, but a different version of OpenSSL was found. The build is now aborting
+through 3.3.x, but a different version of OpenSSL was found. The build is now aborting
 due to this version mismatch.
 
 "
@@ -290,13 +303,24 @@
     u64::from_str_radix(version, 16).unwrap()
 }
 
+// parses a string that looks like 3_0_0
+fn parse_new_version(version: &str) -> u64 {
+    println!("version: {}", version);
+    let mut it = version.split('_');
+    let major = it.next().unwrap().parse::<u64>().unwrap();
+    let minor = it.next().unwrap().parse::<u64>().unwrap();
+    let patch = it.next().unwrap().parse::<u64>().unwrap();
+
+    (major << 28) | (minor << 20) | (patch << 4)
+}
+
 /// Given a libdir for OpenSSL (where artifacts are located) as well as the name
 /// of the libraries we're linking to, figure out whether we should link them
 /// statically or dynamically.
 fn determine_mode(libdir: &Path, libs: &[&str]) -> &'static str {
     // First see if a mode was explicitly requested
     let kind = env("OPENSSL_STATIC");
-    match kind.as_ref().and_then(|s| s.to_str()).map(|s| &s[..]) {
+    match kind.as_ref().and_then(|s| s.to_str()) {
         Some("0") => return "dylib",
         Some(_) => return "static",
         None => {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"cd6313ca2cec4ba3178ea32f9d03d3e6afe170b53e7ba9b719c04e64d1ed25b8","Cargo.toml":"b1d0bd900e95a211185c6e95cc24d15e06852f64a48dadc638acdaf9ccd5bf5e","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"18071782a20c51379733d7c2041c6755a11326d0153d8c7c3073875d7870da42","build/cfgs.rs":"af8d4d445d1f973015282ce39eec4e89f52df03490c65ebf61935e2b4ba016e1","build/expando.c":"c9c424b6b1d308b6dd03023b2474def4427fbc61d827964274adcf4ce5b71c13","build/find_normal.rs":"c55e7f61fa025898d2554361e633558990ac9bff027c76e2761d22a104881718","build/find_vendored.rs":"7bf0e59c5646d72ee5a4392ad970fdf5c20288ddaf54dd86a8caff49583b38f5","build/main.rs":"9694ea2a64fa5b5d489fd74eaae51cd1e73ee11c90d744b59267752739bdc03e","src/aes.rs":"822bf666db351fe6ef9607c918081d6ad378fc1cedb05290bb746f86980c6088","src/asn1.rs":"b121ab63ae58d49330a972823f04c0ea74cd61177fc2150350f9f9adf6b2cfe1","src/bio.rs":"3aac4e38ccf8d832b4156908cd3f1ff9c56f84c05d2f07ed7a3e3fccabe965e9","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"f21a403fea95e7b7efe0539a429831cfa51c8818adb79c7ebf73ae2a6f2dc87e","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"a1279719ade9704be3d9af55ff679abbe918d525f332ca15810146d45e9080cf","src/dh.rs":"f7fac8821a9302bb9e34a097a820fad86f15bc5945916bf68de893cc55d2119a","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"81372dfe497db2fc90457a470a3b8ccb249828b3ce2bf4fd2da8ec42afd6a6b3","src/err.rs":"3edf1379b3277df32e047a52553d243d4a4001111a277cf4b12f7297f2fe2bf0","src/evp.rs":"9c61c702657e88dc62e53cf2e860b9a971629ceb3a86815c7852ef04afb9858a","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"57291110117331f5d6733da1421267e47cf891e0e0411b0720a04fdbc0686700","src/macros.rs":"7ed99c00c53ee12ea92634d4ace0af84845ebf98819869746e7896c8eaff23db","src/obj_mac.rs":"797a8a921fb564c080ef53fc1aeea9aaf4bd4e647c33481bef44c5a8ea77ae5c","src/object.rs":"210d91fc81414da4cd3afa0127cabffef1640fa85e65635bc489e0f721ee929f","src/ocsp.rs":"154e416aa14df8d5aa962f3352ca72bab00716f0834413c78dfa663e0880e9dd","src/ossl_typ.rs":"4379b8327a1efbae1c784ad576c98ac7708bf62cab1c373845d9ca948b5e401b","src/pem.rs":"ba80937125618cd0e7073d69be6aff3b619ede74e227a158cb0a68af27f69640","src/pkcs12.rs":"f1a3f32f128fa8ce94391c1957a0e535387cebc0e25d21743888b172518dd636","src/pkcs7.rs":"0298823a49516daa9d02a9a796065406c4e396bca15cb9ce28b5a2e37bb73872","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"1a6b028a63654d2419417a9a8af790cd22409a4643682a0686ecdb9441264eba","src/srtp.rs":"1c4dee9e6c139cc70416207786e385f199321624fb9fbf3cbf39a8160c0c405d","src/ssl.rs":"5970b21a47668f7efb8130f22110d9ab65c571a45681c02d8ab596b7068db963","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"7ffbf8687f650dd9678eab61871913579539f78ebf69f005f07f7a40017b26cb","src/x509_vfy.rs":"a5fc69e3ef3565c8d9196768c0b84bd876edfb019688dc4487dbb88f6a89293d","src/x509v3.rs":"80ccb7ea176767b98547148168ff8c1843cb240b07e05d57024e5948869156d6"},"package":"de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"86c4a0ef9eca206f12ef503a4c22f72da870892f9cd16e00b758867989d1026a","Cargo.toml":"3c8e2f40f005bff2e714df23b3e6c71cfd23c2d18837095393a6b5a1027cb915","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"c5ddde25c2756a1115daaa671fb4297cdc83bf23009c8356ba65b5311d0dd30d","build/cfgs.rs":"193f81ffdf211f056599072e8910d59c2134d3df85fed9ca693bc59f82cb73d4","build/expando.c":"08e9e236d273f30c88c1b310c3c4683cb470cd7c2f6a8d6213c84d363b58f78a","build/find_normal.rs":"8020f239b84a7dc4b7e59f680429a7b77fd7fd6c5470f483f89a0065c7710c49","build/find_vendored.rs":"7bf0e59c5646d72ee5a4392ad970fdf5c20288ddaf54dd86a8caff49583b38f5","build/main.rs":"9f21821e4517f8ec279ba8c6382e9e34e40f56ca898a2a2984eb976bcbd27358","src/aes.rs":"822bf666db351fe6ef9607c918081d6ad378fc1cedb05290bb746f86980c6088","src/asn1.rs":"801c254afc76b0c29b756bd86a149361609f82ec33c1f1fad39a512fbe4e87ee","src/bio.rs":"3aac4e38ccf8d832b4156908cd3f1ff9c56f84c05d2f07ed7a3e3fccabe965e9","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"1e1500367732915e756ba7dcee4a0691ba4fab770e0cef88267b74111e99e127","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"fa513478e5c4a1e9d54081a9c79d48400f726c7047e776aa3f1adc023d6600be","src/dh.rs":"fb3b539eec4434b448b30df19e2e2ac5ffc3bd11bb817c7fb9090186ec3b0146","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"0477022d5bcf2b7a620c70ece4da08a2958be3eca5a57127c89d79525c692ebd","src/ec.rs":"018a2ab377804bb735206e88d0561ab16098e29007d1a1fd0d565c8e492544c2","src/err.rs":"9e6c84a170dce46db74414a64b9e1855845afbd8180100a2d9412f7509f69284","src/evp.rs":"b6473677c04bccde1ab37b7e4387c929984d9c7df3d6f203c4ca228e0a3f6b07","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"19ddf11d94bf469abb3f453a6b38886f6ccea4bc6004477f36b200516f5fee44","src/macros.rs":"7ed99c00c53ee12ea92634d4ace0af84845ebf98819869746e7896c8eaff23db","src/obj_mac.rs":"42019b142e523d7695d8c14ee7f72fa4b5702c07dee98fa12e70ab7dfcc95459","src/object.rs":"453406a03a684473eca091217d60bfa1edf2374c1cf842a2bde67ac6e6c22e84","src/ocsp.rs":"614492810c5fadd0c1c4bb5eda165fb7e744eed7b04ae61d582446f5013e733a","src/ossl_typ.rs":"0d8dd0f82ef08672ab3c5059d2335b7eaad2d5afc0a20dbf26c2476c99dcae8e","src/pem.rs":"3fac4a29c67cd06e094c6ce8620a12d37370c5e613a2a491d0cb06a4bcd304bd","src/pkcs12.rs":"4c3c1cf2e716454c5fc94c3d5e1174922c57b9de796253799437dc13303a68d1","src/pkcs7.rs":"726614946784f919db88fd5282ec66d5b9df2edafc98ade9614758e109176b31","src/rand.rs":"c771057f37c64406aa750f36397fa877caf330a8c725e49356c7081c2b2fdd67","src/rsa.rs":"d45d421339b903b0d33817e93be5e939964431f9caed343e5c4490382cfad5b1","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"16a4c77cbc38926b8f8eee07b0beae8dc12cbdc8cfa599d4db66fa84a7b3871d","src/srtp.rs":"1c4dee9e6c139cc70416207786e385f199321624fb9fbf3cbf39a8160c0c405d","src/ssl.rs":"f0dd56aef28630ba8359e49538664160b54f58e255cca1f5c239f23aa820de1b","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/types.rs":"0b9bafc6f5fd373ec8c01e49339f7fe7ef1d76e44d60cda59f60c06982b4070e","src/x509.rs":"785bcb26166b8f39e616e5ab9a0358814773e96de51b40fd5ae62b45a2edcda6","src/x509_vfy.rs":"e530e2fd91e959715265b40fba95576bb53ddcb4e2c6586c2192098e0e8b1cc1","src/x509v3.rs":"520253195097d134e553c6378c1db2510eae6ccfcab6f6fb08919697bc0f023b"},"package":"1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "openssl-sys"
-version = "0.9.59"
+version = "0.9.66"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Steven Fackler <sfackler@gmail.com>"]
 build = "build/main.rs"
 links = "openssl"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,71 @@
 
 ## [Unreleased]
 
+## [v0.9.66] - 2021-08-17
+
+### Added
+
+* Added `EVP_seed_cbc`, `EVP_seed_cfb128`, `EVP_seed_ecb`, and `EVP_seed_ofb`.
+* Added `OBJ_length` and `OBJ_get0_data`.
+* Added `i2d_PKCS8PrivateKey_bio`.
+
+## [v0.9.65] - 2021-06-21
+
+### Fixed
+
+* Restored the accidentally deleted `PEM_read_bio_X509_CRL` function.
+
+## [v0.9.64] - 2021-06-18
+
+### Added
+
+* Added support for OpenSSL 3.x.x.
+* Added `SSL_peek`.
+* Added `ERR_LIB_ASN1` and `ASN1_R_HEADER_TOO_LONG`.
+* Added `d2i_X509_bio`.
+* Added `OBJ_nid2obj`.
+* Added `RAND_add`.
+* Added `SSL_CTX_set_post_handshake_auth`.
+* Added `COMP_get_type`.
+* Added `X509_get_default_cert_file_env`, `X509_get_default_cert_file`, `X509_get_default_cert_dir_env`, and
+    `X509_get_default_cirt_dir`.
+
+## [v0.9.63] - 2021-05-06
+
+### Added
+
+* Added support for LibreSSL 3.3.x.
+
+## [v0.9.62] - 2021-04-28
+
+### Added
+
+* Added support for LibreSSL 3.3.2.
+* Added `DH_set0_key`.
+* Added `EC_POINT_get_affine_coordinates`.
+
+## [v0.9.61] - 2021-03-13
+
+### Added
+
+* Added support for automatic detection of OpenSSL installations via pkgsrc and MacPorts on macOS.
+* Added various `V_ASN1_*` constants.
+* Added `DH_generate_parameters_ex`.
+* Added `EC_POINT_is_at_infinity` and `EC_POINT_is_on_curve`.
+* Added `EVP_CIPHER_nid`.
+* Added `EVP_sm3`.
+* Added `NID_*` constants related to SM3.
+* Added `PKCS7_get0_signers`.
+* Added `EVP_PKEY_CTX_set0_rsa_oaep_label`.
+* Added `ACCESS_DESCRIPTION` and `ACCESS_DESCRIPTION_free`.
+
+## [v0.9.60] - 2020-12-24
+
+### Added
+
+* Added support for the default Homebrew install directory on ARM.
+* Added `EVP_PKEY_CTX_set_rsa_oaep_md` and `EVP_PKEY_CTRL_RSA_OAEP_MD`.
+
 ## [v0.9.59] - 2020-12-09
 
 ### Added
@@ -156,7 +221,13 @@
 * Added `X509_verify` and `X509_REQ_verify`.
 * Added `EVP_MD_type` and `EVP_GROUP_get_curve_name`.
 
-[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.59...master
+[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.65...master
+[v0.9.65]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.64...openssl-sys-v0.9.65
+[v0.9.64]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.63...openssl-sys-v0.9.64
+[v0.9.63]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.62...openssl-sys-v0.9.63
+[v0.9.62]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.61...openssl-sys-v0.9.62
+[v0.9.61]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.60...openssl-sys-v0.9.61
+[v0.9.60]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.59...openssl-sys-v0.9.60
 [v0.9.59]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.58...openssl-sys-v0.9.59
 [v0.9.58]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.57...openssl-sys-v0.9.58
 [v0.9.57]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.56...openssl-sys-v0.9.57
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,5 @@
 # rust-openssl
 
-[![CircleCI](https://circleci.com/gh/sfackler/rust-openssl.svg?style=shield)](https://circleci.com/gh/sfackler/rust-openssl)
 [![crates.io](https://img.shields.io/crates/v/openssl.svg)](https://crates.io/crates/openssl)
 
 OpenSSL bindings for the Rust programming language.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/asn1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/asn1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/asn1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/asn1.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,8 +2,35 @@
 
 use *;
 
+// ASN.1 tag values
+pub const V_ASN1_EOC: c_int = 0;
+pub const V_ASN1_BOOLEAN: c_int = 1;
+pub const V_ASN1_INTEGER: c_int = 2;
+pub const V_ASN1_BIT_STRING: c_int = 3;
+pub const V_ASN1_OCTET_STRING: c_int = 4;
+pub const V_ASN1_NULL: c_int = 5;
+pub const V_ASN1_OBJECT: c_int = 6;
+pub const V_ASN1_OBJECT_DESCRIPTOR: c_int = 7;
+pub const V_ASN1_EXTERNAL: c_int = 8;
+pub const V_ASN1_REAL: c_int = 9;
+pub const V_ASN1_ENUMERATED: c_int = 10;
+pub const V_ASN1_UTF8STRING: c_int = 12;
+pub const V_ASN1_SEQUENCE: c_int = 16;
+pub const V_ASN1_SET: c_int = 17;
+pub const V_ASN1_NUMERICSTRING: c_int = 18;
+pub const V_ASN1_PRINTABLESTRING: c_int = 19;
+pub const V_ASN1_T61STRING: c_int = 20;
+pub const V_ASN1_TELETEXSTRING: c_int = 20; // alias
+pub const V_ASN1_VIDEOTEXSTRING: c_int = 21;
+pub const V_ASN1_IA5STRING: c_int = 22;
 pub const V_ASN1_UTCTIME: c_int = 23;
 pub const V_ASN1_GENERALIZEDTIME: c_int = 24;
+pub const V_ASN1_GRAPHICSTRING: c_int = 25;
+pub const V_ASN1_ISO64STRING: c_int = 26;
+pub const V_ASN1_VISIBLESTRING: c_int = 26; // alias
+pub const V_ASN1_GENERALSTRING: c_int = 27;
+pub const V_ASN1_UNIVERSALSTRING: c_int = 28;
+pub const V_ASN1_BMPSTRING: c_int = 30;
 
 pub const MBSTRING_FLAG: c_int = 0x1000;
 pub const MBSTRING_UTF8: c_int = MBSTRING_FLAG;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/cms.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/cms.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/cms.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/cms.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,9 +6,16 @@
 extern "C" {
     #[cfg(ossl101)]
     pub fn CMS_ContentInfo_free(cms: *mut ::CMS_ContentInfo);
-    #[cfg(ossl101)]
-    pub fn i2d_CMS_ContentInfo(a: *mut ::CMS_ContentInfo, pp: *mut *mut c_uchar) -> c_int;
+}
+
+const_ptr_api! {
+    extern "C" {
+        #[cfg(ossl101)]
+        pub fn i2d_CMS_ContentInfo(a: #[const_ptr_if(ossl300)] CMS_ContentInfo, pp: *mut *mut c_uchar) -> c_int;
+    }
+}
 
+extern "C" {
     #[cfg(ossl101)]
     pub fn d2i_CMS_ContentInfo(
         a: *mut *mut ::CMS_ContentInfo,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/crypto.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/crypto.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/crypto.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/crypto.rs	2021-12-09 12:01:26.000000000 +0000
@@ -121,9 +121,9 @@
 }
 
 extern "C" {
-    #[cfg(ossl101)]
+    #[cfg(all(ossl101, not(ossl300)))]
     pub fn FIPS_mode() -> c_int;
-    #[cfg(ossl101)]
+    #[cfg(all(ossl101, not(ossl300)))]
     pub fn FIPS_mode_set(onoff: c_int) -> c_int;
 
     pub fn CRYPTO_memcmp(a: *const c_void, b: *const c_void, len: size_t) -> c_int;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/dh.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/dh.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/dh.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/dh.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,13 @@
         cb_arg: *mut c_void,
     ) -> *mut DH;
 
+    pub fn DH_generate_parameters_ex(
+        dh: *mut DH,
+        prime_len: c_int,
+        generator: c_int,
+        cb: *mut BN_GENCB,
+    ) -> c_int;
+
     pub fn DH_generate_key(dh: *mut DH) -> c_int;
     pub fn DH_compute_key(key: *mut c_uchar, pub_key: *const BIGNUM, dh: *mut DH) -> c_int;
     pub fn DH_size(dh: *const DH) -> c_int;
@@ -36,5 +43,8 @@
     );
 
     #[cfg(any(ossl110, libressl270))]
+    pub fn DH_set0_key(dh: *mut DH, pub_key: *mut BIGNUM, priv_key: *mut BIGNUM) -> c_int;
+
+    #[cfg(any(ossl110, libressl270))]
     pub fn DH_get0_key(dh: *const DH, pub_key: *mut *const BIGNUM, priv_key: *mut *const BIGNUM);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/dtls1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/dtls1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/dtls1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/dtls1.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,9 @@
 use libc::*;
 
-pub const DTLS1_COOKIE_LENGTH: c_uint = 256;
+cfg_if! {
+    if #[cfg(ossl300)] {
+        pub const DTLS1_COOKIE_LENGTH: c_uint = 255;
+    } else {
+        pub const DTLS1_COOKIE_LENGTH: c_uint = 256;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/ec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/ec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/ec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/ec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -81,12 +81,29 @@
 
     pub fn EC_GROUP_new_by_curve_name(nid: c_int) -> *mut EC_GROUP;
 
+    pub fn EC_POINT_is_at_infinity(group: *const EC_GROUP, point: *const EC_POINT) -> c_int;
+
+    pub fn EC_POINT_is_on_curve(
+        group: *const EC_GROUP,
+        point: *const EC_POINT,
+        ctx: *mut BN_CTX,
+    ) -> c_int;
+
     pub fn EC_POINT_new(group: *const EC_GROUP) -> *mut EC_POINT;
 
     pub fn EC_POINT_free(point: *mut EC_POINT);
 
     pub fn EC_POINT_dup(p: *const EC_POINT, group: *const EC_GROUP) -> *mut EC_POINT;
 
+    #[cfg(ossl111)]
+    pub fn EC_POINT_get_affine_coordinates(
+        group: *const EC_GROUP,
+        p: *const EC_POINT,
+        x: *mut BIGNUM,
+        y: *mut BIGNUM,
+        ctx: *mut BN_CTX,
+    ) -> c_int;
+
     pub fn EC_POINT_get_affine_coordinates_GFp(
         group: *const EC_GROUP,
         p: *const EC_POINT,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/err.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/err.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/err.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/err.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,25 +3,69 @@
 pub const ERR_TXT_MALLOCED: c_int = 0x01;
 pub const ERR_TXT_STRING: c_int = 0x02;
 
+pub const ERR_LIB_SYS: c_int = 2;
 pub const ERR_LIB_PEM: c_int = 9;
+pub const ERR_LIB_ASN1: c_int = 13;
 
-const_fn! {
-    pub const fn ERR_PACK(l: c_int, f: c_int, r: c_int) -> c_ulong {
-        ((l as c_ulong & 0x0FF) << 24) |
-        ((f as c_ulong & 0xFFF) << 12) |
-        (r as c_ulong & 0xFFF)
-    }
-
-    pub const fn ERR_GET_LIB(l: c_ulong) -> c_int {
-        ((l >> 24) & 0x0FF) as c_int
-    }
-
-    pub const fn ERR_GET_FUNC(l: c_ulong) -> c_int {
-        ((l >> 12) & 0xFFF) as c_int
-    }
-
-    pub const fn ERR_GET_REASON(l: c_ulong) -> c_int {
-        (l & 0xFFF) as c_int
+cfg_if! {
+    if #[cfg(ossl300)] {
+        pub const ERR_SYSTEM_FLAG: c_ulong = c_int::max_value() as c_ulong + 1;
+        pub const ERR_SYSTEM_MASK: c_ulong = c_int::max_value() as c_ulong;
+
+        pub const ERR_LIB_OFFSET: c_ulong = 23;
+        pub const ERR_LIB_MASK: c_ulong = 0xff;
+        pub const ERR_RFLAGS_OFFSET: c_ulong = 18;
+        pub const ERR_RFLAGS_MASK: c_ulong = 0x1f;
+        pub const ERR_REASON_MASK: c_ulong = 0x7FFFFF;
+
+        pub const ERR_RFLAG_FATAL: c_ulong = 0x1 << ERR_RFLAGS_OFFSET;
+
+        const_fn! {
+            pub const fn ERR_SYSTEM_ERROR(errcode: c_ulong) -> bool {
+                errcode & ERR_SYSTEM_FLAG != 0
+            }
+
+            pub const fn ERR_GET_LIB(errcode: c_ulong) -> c_int {
+                // hacks since `if` isn't yet stable in const functions :(
+                ((ERR_LIB_SYS as c_ulong * (ERR_SYSTEM_ERROR(errcode) as c_ulong)) |
+                (((errcode >> ERR_LIB_OFFSET) & ERR_LIB_MASK)) * (!ERR_SYSTEM_ERROR(errcode) as c_ulong)) as c_int
+            }
+
+            pub const fn ERR_GET_FUNC(_errcode: c_ulong) -> c_int {
+                0
+            }
+
+            pub const fn ERR_GET_REASON(errcode: c_ulong) -> c_int {
+                // hacks since `if` isn't yet stable in const functions :(
+                ((ERR_LIB_SYS as c_ulong * (ERR_SYSTEM_ERROR(errcode) as c_ulong)) |
+                ((errcode & ERR_REASON_MASK)) * (!ERR_SYSTEM_ERROR(errcode) as c_ulong)) as c_int
+            }
+
+            pub const fn ERR_PACK(lib: c_int, _func: c_int, reason: c_int) -> c_ulong {
+                ((lib as c_ulong & ERR_LIB_MASK) << ERR_LIB_OFFSET) |
+                ((reason as c_ulong & ERR_REASON_MASK))
+            }
+        }
+    } else {
+        const_fn! {
+            pub const fn ERR_PACK(l: c_int, f: c_int, r: c_int) -> c_ulong {
+                ((l as c_ulong & 0x0FF) << 24) |
+                ((f as c_ulong & 0xFFF) << 12) |
+                (r as c_ulong & 0xFFF)
+            }
+
+            pub const fn ERR_GET_LIB(l: c_ulong) -> c_int {
+                ((l >> 24) & 0x0FF) as c_int
+            }
+
+            pub const fn ERR_GET_FUNC(l: c_ulong) -> c_int {
+                ((l >> 12) & 0xFFF) as c_int
+            }
+
+            pub const fn ERR_GET_REASON(l: c_ulong) -> c_int {
+                (l & 0xFFF) as c_int
+            }
+        }
     }
 }
 
@@ -31,11 +75,32 @@
     pub string: *const c_char,
 }
 
+cfg_if! {
+    if #[cfg(ossl300)] {
+        extern "C" {
+            pub fn ERR_new();
+            pub fn ERR_set_debug(file: *const c_char, line: c_int, func: *const c_char);
+            pub fn ERR_set_error(lib: c_int, reason: c_int, fmt: *const c_char, ...);
+        }
+    } else {
+        extern "C" {
+            pub fn ERR_put_error(lib: c_int, func: c_int, reason: c_int, file: *const c_char, line: c_int);
+        }
+    }
+}
+
 extern "C" {
-    pub fn ERR_put_error(lib: c_int, func: c_int, reason: c_int, file: *const c_char, line: c_int);
     pub fn ERR_set_error_data(data: *mut c_char, flags: c_int);
 
     pub fn ERR_get_error() -> c_ulong;
+    #[cfg(ossl300)]
+    pub fn ERR_get_error_all(
+        file: *mut *const c_char,
+        line: *mut c_int,
+        func: *mut *const c_char,
+        data: *mut *const c_char,
+        flags: *mut c_int,
+    ) -> c_ulong;
     pub fn ERR_get_error_line_data(
         file: *mut *const c_char,
         line: *mut c_int,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/evp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/evp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/evp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/evp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,14 +29,60 @@
     EVP_get_digestbyname(OBJ_nid2sn(type_))
 }
 
-extern "C" {
-    pub fn EVP_MD_size(md: *const EVP_MD) -> c_int;
-    pub fn EVP_MD_type(md: *const EVP_MD) -> c_int;
+cfg_if! {
+    if #[cfg(ossl300)] {
+        extern "C" {
+            pub fn EVP_MD_get_size(md: *const EVP_MD) -> c_int;
+            pub fn EVP_MD_get_type(md: *const EVP_MD) -> c_int;
+
+            pub fn EVP_CIPHER_get_key_length(cipher: *const EVP_CIPHER) -> c_int;
+            pub fn EVP_CIPHER_get_block_size(cipher: *const EVP_CIPHER) -> c_int;
+            pub fn EVP_CIPHER_get_iv_length(cipher: *const EVP_CIPHER) -> c_int;
+            pub fn EVP_CIPHER_get_nid(cipher: *const EVP_CIPHER) -> c_int;
+        }
+
+        #[inline]
+        pub unsafe fn EVP_MD_size(md: *const EVP_MD) -> c_int {
+            EVP_MD_get_size(md)
+        }
+
+        #[inline]
+        pub unsafe fn EVP_MD_type(md: *const EVP_MD) -> c_int {
+            EVP_MD_get_type(md)
+        }
+
+        #[inline]
+        pub unsafe fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int {
+            EVP_CIPHER_get_key_length(cipher)
+        }
+
+        #[inline]
+        pub unsafe fn EVP_CIPHER_block_size(cipher: *const EVP_CIPHER) -> c_int {
+            EVP_CIPHER_get_block_size(cipher)
+        }
 
-    pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int;
-    pub fn EVP_CIPHER_block_size(cipher: *const EVP_CIPHER) -> c_int;
-    pub fn EVP_CIPHER_iv_length(cipher: *const EVP_CIPHER) -> c_int;
+        #[inline]
+        pub unsafe fn EVP_CIPHER_iv_length(cipher: *const EVP_CIPHER) -> c_int {
+            EVP_CIPHER_get_iv_length(cipher)
+        }
+
+        #[inline]
+        pub unsafe fn EVP_CIPHER_nid(cipher: *const EVP_CIPHER) -> c_int {
+            EVP_CIPHER_get_nid(cipher)
+        }
+    } else {
+        extern "C" {
+            pub fn EVP_MD_size(md: *const EVP_MD) -> c_int;
+            pub fn EVP_MD_type(md: *const EVP_MD) -> c_int;
+
+            pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int;
+            pub fn EVP_CIPHER_block_size(cipher: *const EVP_CIPHER) -> c_int;
+            pub fn EVP_CIPHER_iv_length(cipher: *const EVP_CIPHER) -> c_int;
+            pub fn EVP_CIPHER_nid(cipher: *const EVP_CIPHER) -> c_int;
+        }
+    }
 }
+extern "C" {}
 
 cfg_if! {
     if #[cfg(ossl110)] {
@@ -57,6 +103,16 @@
         -> c_int;
     pub fn EVP_DigestUpdate(ctx: *mut EVP_MD_CTX, data: *const c_void, n: size_t) -> c_int;
     pub fn EVP_DigestFinal_ex(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
+    #[cfg(ossl300)]
+    pub fn EVP_Q_digest(
+        libctx: *mut OSSL_LIB_CTX,
+        name: *const c_char,
+        propq: *const c_char,
+        data: *const c_void,
+        count: size_t,
+        md: *mut c_uchar,
+        size: *mut size_t,
+    ) -> c_int;
     pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD) -> c_int;
     pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
     #[cfg(ossl111)]
@@ -174,9 +230,22 @@
         outl: *mut c_int,
     ) -> c_int;
 }
-const_ptr_api! {
-    extern "C" {
-        pub fn EVP_PKEY_size(pkey: #[const_ptr_if(any(ossl111b, libressl280))] EVP_PKEY) -> c_int;
+cfg_if! {
+    if #[cfg(ossl300)] {
+        extern "C" {
+            pub fn EVP_PKEY_get_size(pkey: *const EVP_PKEY) -> c_int;
+        }
+
+        #[inline]
+        pub unsafe fn EVP_PKEY_size(pkey: *const EVP_PKEY) -> c_int {
+            EVP_PKEY_get_size(pkey)
+        }
+    } else {
+        const_ptr_api! {
+            extern "C" {
+                pub fn EVP_PKEY_size(pkey: #[const_ptr_if(any(ossl111b, libressl280))] EVP_PKEY) -> c_int;
+            }
+        }
     }
 }
 cfg_if! {
@@ -243,6 +312,8 @@
     #[cfg(ossl111)]
     pub fn EVP_shake256() -> *const EVP_MD;
     pub fn EVP_ripemd160() -> *const EVP_MD;
+    #[cfg(all(any(ossl111, libressl291), not(osslconf = "OPENSSL_NO_SM3")))]
+    pub fn EVP_sm3() -> *const EVP_MD;
     pub fn EVP_des_ecb() -> *const EVP_CIPHER;
     pub fn EVP_des_ede3() -> *const EVP_CIPHER;
     pub fn EVP_des_ede3_cbc() -> *const EVP_CIPHER;
@@ -292,18 +363,47 @@
     pub fn EVP_chacha20() -> *const ::EVP_CIPHER;
     #[cfg(ossl110)]
     pub fn EVP_chacha20_poly1305() -> *const ::EVP_CIPHER;
+    #[cfg(not(osslconf = "OPENSSL_NO_SEED"))]
+    pub fn EVP_seed_cbc() -> *const EVP_CIPHER;
+    #[cfg(not(osslconf = "OPENSSL_NO_SEED"))]
+    pub fn EVP_seed_cfb128() -> *const EVP_CIPHER;
+    #[cfg(not(osslconf = "OPENSSL_NO_SEED"))]
+    pub fn EVP_seed_ecb() -> *const EVP_CIPHER;
+    #[cfg(not(osslconf = "OPENSSL_NO_SEED"))]
+    pub fn EVP_seed_ofb() -> *const EVP_CIPHER;
 
     #[cfg(not(ossl110))]
     pub fn OPENSSL_add_all_algorithms_noconf();
 
     pub fn EVP_get_digestbyname(name: *const c_char) -> *const EVP_MD;
     pub fn EVP_get_cipherbyname(name: *const c_char) -> *const EVP_CIPHER;
-
-    pub fn EVP_PKEY_id(pkey: *const EVP_PKEY) -> c_int;
 }
-const_ptr_api! {
-    extern "C" {
-        pub fn EVP_PKEY_bits(key: #[const_ptr_if(any(ossl110, libressl280))] EVP_PKEY) -> c_int;
+
+cfg_if! {
+    if #[cfg(ossl300)] {
+        extern "C" {
+            pub fn EVP_PKEY_get_id(pkey: *const EVP_PKEY) -> c_int;
+            pub fn EVP_PKEY_get_bits(key: *const EVP_PKEY) -> c_int;
+        }
+
+        #[inline]
+        pub unsafe fn EVP_PKEY_id(pkey: *const EVP_PKEY) -> c_int {
+            EVP_PKEY_get_id(pkey)
+        }
+
+        #[inline]
+        pub unsafe fn EVP_PKEY_bits(pkey: *const EVP_PKEY) -> c_int {
+            EVP_PKEY_get_bits(pkey)
+        }
+    } else {
+        extern "C" {
+            pub fn EVP_PKEY_id(pkey: *const EVP_PKEY) -> c_int;
+        }
+        const_ptr_api! {
+            extern "C" {
+                pub fn EVP_PKEY_bits(key: #[const_ptr_if(any(ossl110, libressl280))] EVP_PKEY) -> c_int;
+            }
+        }
     }
 }
 extern "C" {
@@ -366,13 +466,25 @@
 }
 
 pub const EVP_PKEY_OP_KEYGEN: c_int = 1 << 2;
-pub const EVP_PKEY_OP_SIGN: c_int = 1 << 3;
-pub const EVP_PKEY_OP_VERIFY: c_int = 1 << 4;
-pub const EVP_PKEY_OP_VERIFYRECOVER: c_int = 1 << 5;
-pub const EVP_PKEY_OP_SIGNCTX: c_int = 1 << 6;
-pub const EVP_PKEY_OP_VERIFYCTX: c_int = 1 << 7;
-pub const EVP_PKEY_OP_ENCRYPT: c_int = 1 << 8;
-pub const EVP_PKEY_OP_DECRYPT: c_int = 1 << 9;
+cfg_if! {
+    if #[cfg(ossl300)] {
+        pub const EVP_PKEY_OP_SIGN: c_int = 1 << 4;
+        pub const EVP_PKEY_OP_VERIFY: c_int = 1 << 5;
+        pub const EVP_PKEY_OP_VERIFYRECOVER: c_int = 1 << 6;
+        pub const EVP_PKEY_OP_SIGNCTX: c_int = 1 << 7;
+        pub const EVP_PKEY_OP_VERIFYCTX: c_int = 1 << 8;
+        pub const EVP_PKEY_OP_ENCRYPT: c_int = 1 << 9;
+        pub const EVP_PKEY_OP_DECRYPT: c_int = 1 << 10;
+    } else {
+        pub const EVP_PKEY_OP_SIGN: c_int = 1 << 3;
+        pub const EVP_PKEY_OP_VERIFY: c_int = 1 << 4;
+        pub const EVP_PKEY_OP_VERIFYRECOVER: c_int = 1 << 5;
+        pub const EVP_PKEY_OP_SIGNCTX: c_int = 1 << 6;
+        pub const EVP_PKEY_OP_VERIFYCTX: c_int = 1 << 7;
+        pub const EVP_PKEY_OP_ENCRYPT: c_int = 1 << 8;
+        pub const EVP_PKEY_OP_DECRYPT: c_int = 1 << 9;
+    }
+}
 
 pub const EVP_PKEY_OP_TYPE_SIG: c_int = EVP_PKEY_OP_SIGN
     | EVP_PKEY_OP_VERIFY
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 #![allow(
     clippy::missing_safety_doc,
     clippy::unreadable_literal,
+    clippy::upper_case_acronyms,
     dead_code,
     non_camel_case_types,
     non_snake_case,
@@ -45,6 +46,7 @@
 pub use ssl3::*;
 pub use stack::*;
 pub use tls1::*;
+pub use types::*;
 pub use x509::*;
 pub use x509_vfy::*;
 pub use x509v3::*;
@@ -82,6 +84,7 @@
 mod ssl3;
 mod stack;
 mod tls1;
+mod types;
 mod x509;
 mod x509_vfy;
 mod x509v3;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/object.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/object.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/object.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/object.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,6 +5,7 @@
 extern "C" {
     pub fn OBJ_nid2ln(nid: c_int) -> *const c_char;
     pub fn OBJ_nid2sn(nid: c_int) -> *const c_char;
+    pub fn OBJ_nid2obj(n: c_int) -> *mut ASN1_OBJECT;
     pub fn OBJ_obj2nid(o: *const ASN1_OBJECT) -> c_int;
     pub fn OBJ_obj2txt(
         buf: *mut c_char,
@@ -17,4 +18,8 @@
         -> c_int;
     pub fn OBJ_sn2nid(sn: *const libc::c_char) -> libc::c_int;
     pub fn OBJ_txt2obj(s: *const libc::c_char, no_name: libc::c_int) -> *mut ASN1_OBJECT;
+    #[cfg(ossl111)]
+    pub fn OBJ_length(obj: *const ASN1_OBJECT) -> libc::size_t;
+    #[cfg(ossl111)]
+    pub fn OBJ_get0_data(obj: *const ASN1_OBJECT) -> *const c_uchar;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/obj_mac.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/obj_mac.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/obj_mac.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/obj_mac.rs	2021-12-09 12:01:26.000000000 +0000
@@ -920,3 +920,11 @@
 pub const NID_ED25519: c_int = 1087;
 #[cfg(ossl111)]
 pub const NID_ED448: c_int = 1088;
+#[cfg(ossl111)]
+pub const NID_sm3: c_int = 1143;
+#[cfg(libressl291)]
+pub const NID_sm3: c_int = 968;
+#[cfg(ossl111)]
+pub const NID_sm3WithRSAEncryption: c_int = 1144;
+#[cfg(libressl291)]
+pub const NID_sm3WithRSAEncryption: c_int = 969;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/ocsp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/ocsp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/ocsp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/ocsp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -82,7 +82,15 @@
     pub fn OCSP_BASICRESP_free(r: *mut OCSP_BASICRESP);
     pub fn OCSP_RESPONSE_new() -> *mut OCSP_RESPONSE;
     pub fn OCSP_RESPONSE_free(r: *mut OCSP_RESPONSE);
-    pub fn i2d_OCSP_RESPONSE(a: *mut OCSP_RESPONSE, pp: *mut *mut c_uchar) -> c_int;
+}
+
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_OCSP_RESPONSE(a: #[const_ptr_if(ossl300)] OCSP_RESPONSE, pp: *mut *mut c_uchar) -> c_int;
+    }
+}
+
+extern "C" {
     pub fn d2i_OCSP_RESPONSE(
         a: *mut *mut OCSP_RESPONSE,
         pp: *mut *const c_uchar,
@@ -92,7 +100,15 @@
     pub fn OCSP_CERTID_free(id: *mut OCSP_CERTID);
     pub fn OCSP_REQUEST_new() -> *mut OCSP_REQUEST;
     pub fn OCSP_REQUEST_free(r: *mut OCSP_REQUEST);
-    pub fn i2d_OCSP_REQUEST(a: *mut OCSP_REQUEST, pp: *mut *mut c_uchar) -> c_int;
+}
+
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_OCSP_REQUEST(a: #[const_ptr_if(ossl300)] OCSP_REQUEST, pp: *mut *mut c_uchar) -> c_int;
+    }
+}
+
+extern "C" {
     pub fn d2i_OCSP_REQUEST(
         a: *mut *mut OCSP_REQUEST,
         pp: *mut *const c_uchar,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/ossl_typ.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/ossl_typ.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/ossl_typ.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/ossl_typ.rs	2021-12-09 12:01:26.000000000 +0000
@@ -439,6 +439,8 @@
     crl: *mut c_void,
     db_meth: *mut c_void,
     db: *mut c_void,
+    #[cfg(ossl300)]
+    issuer_pkey: *mut c_void,
     // I like the last comment line, it is copied from OpenSSL sources:
     // Maybe more here
 }
@@ -1010,7 +1012,41 @@
     }
 }
 
-pub enum COMP_METHOD {}
+pub enum COMP_CTX {}
+
+cfg_if! {
+    if #[cfg(ossl110)] {
+        pub enum COMP_METHOD {}
+    } else {
+        #[repr(C)]
+        pub struct COMP_METHOD {
+            pub type_: c_int,
+            pub name: *const c_char,
+            init: Option<unsafe extern "C" fn(*mut COMP_CTX) -> c_int>,
+            finish: Option<unsafe extern "C" fn(*mut COMP_CTX)>,
+            compress: Option<
+                unsafe extern "C" fn(
+                    *mut COMP_CTX,
+                    *mut c_uchar,
+                    c_uint,
+                    *mut c_uchar,
+                    c_uint,
+                ) -> c_int,
+            >,
+            expand: Option<
+                unsafe extern "C" fn(
+                    *mut COMP_CTX,
+                    *mut c_uchar,
+                    c_uint,
+                    *mut c_uchar,
+                    c_uint,
+                ) -> c_int,
+            >,
+            ctrl: Option<unsafe extern "C" fn() -> c_long>,
+            callback_ctrl: Option<unsafe extern "C" fn() -> c_long>,
+        }
+    }
+}
 
 cfg_if! {
     if #[cfg(any(ossl110, libressl280))] {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/pem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/pem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/pem.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/pem.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,73 @@
     ) -> c_int,
 >;
 
+const_ptr_api! {
+    extern "C" {
+        pub fn PEM_write_bio_X509(bio: *mut BIO, x509: #[const_ptr_if(ossl300)] X509) -> c_int;
+        pub fn PEM_write_bio_X509_REQ(bio: *mut BIO, x509: #[const_ptr_if(ossl300)] X509_REQ) -> c_int;
+        pub fn PEM_write_bio_X509_CRL(bio: *mut BIO, x509: #[const_ptr_if(ossl300)] X509_CRL) -> c_int;
+        pub fn PEM_write_bio_RSAPrivateKey(
+            bp: *mut BIO,
+            rsa: #[const_ptr_if(ossl300)] RSA,
+            cipher: *const EVP_CIPHER,
+            kstr: #[const_ptr_if(ossl300)] c_uchar,
+            klen: c_int,
+            callback: pem_password_cb,
+            user_data: *mut c_void,
+        ) -> c_int;
+        pub fn PEM_write_bio_RSA_PUBKEY(bp: *mut BIO, rsa: #[const_ptr_if(ossl300)] RSA) -> c_int;
+        pub fn PEM_write_bio_DSAPrivateKey(
+            bp: *mut BIO,
+            dsa: #[const_ptr_if(ossl300)] DSA,
+            cipher: *const EVP_CIPHER,
+            kstr: #[const_ptr_if(ossl300)] c_uchar,
+            klen: c_int,
+            callback: pem_password_cb,
+            user_data: *mut c_void,
+        ) -> c_int;
+        pub fn PEM_write_bio_ECPrivateKey(
+            bio: *mut BIO,
+            key: #[const_ptr_if(ossl300)] EC_KEY,
+            cipher: *const EVP_CIPHER,
+            kstr: #[const_ptr_if(ossl300)] c_uchar,
+            klen: c_int,
+            callback: pem_password_cb,
+            user_data: *mut c_void,
+        ) -> c_int;
+        pub fn PEM_write_bio_DSA_PUBKEY(bp: *mut BIO, dsa: #[const_ptr_if(ossl300)] DSA) -> c_int;
+        pub fn PEM_write_bio_PrivateKey(
+            bio: *mut BIO,
+            pkey: #[const_ptr_if(ossl300)] EVP_PKEY,
+            cipher: *const EVP_CIPHER,
+            kstr: #[const_ptr_if(ossl300)] c_uchar,
+            klen: c_int,
+            callback: pem_password_cb,
+            user_data: *mut c_void,
+        ) -> c_int;
+        pub fn PEM_write_bio_PUBKEY(bp: *mut BIO, x: #[const_ptr_if(ossl300)] EVP_PKEY) -> c_int;
+        pub fn PEM_write_bio_PKCS8PrivateKey(
+            bio: *mut BIO,
+            pkey: #[const_ptr_if(ossl300)] EVP_PKEY,
+            cipher: *const EVP_CIPHER,
+            kstr: #[const_ptr_if(ossl300)] c_char,
+            klen: c_int,
+            callback: pem_password_cb,
+            user_data: *mut c_void,
+        ) -> c_int;
+        pub fn PEM_write_bio_PKCS7(bp: *mut BIO, x: #[const_ptr_if(ossl300)] PKCS7) -> c_int;
+        pub fn PEM_write_bio_EC_PUBKEY(bp: *mut BIO, ec: #[const_ptr_if(ossl300)] EC_KEY) -> c_int;
+        pub fn i2d_PKCS8PrivateKey_bio(
+            bp: *mut BIO,
+            x: #[const_ptr_if(ossl300)] EVP_PKEY,
+            enc: *const EVP_CIPHER,
+            kstr: #[const_ptr_if(ossl300)] c_char,
+            klen: c_int,
+            cb: pem_password_cb,
+            u: *mut c_void,
+        ) -> c_int;
+    }
+}
+
 extern "C" {
     pub fn PEM_read_bio_X509(
         bio: *mut BIO,
@@ -18,36 +85,24 @@
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut X509;
-    pub fn PEM_write_bio_X509(bio: *mut BIO, x509: *mut X509) -> c_int;
-    pub fn PEM_read_bio_X509_CRL(
-        bio: *mut BIO,
-        out: *mut *mut X509_CRL,
-        callback: pem_password_cb,
-        user_data: *mut c_void,
-    ) -> *mut X509_CRL;
-    pub fn PEM_write_bio_X509_CRL(bio: *mut BIO, x509: *mut X509_CRL) -> c_int;
     pub fn PEM_read_bio_X509_REQ(
         bio: *mut BIO,
         out: *mut *mut X509_REQ,
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut X509_REQ;
-    pub fn PEM_write_bio_X509_REQ(bio: *mut BIO, x509: *mut X509_REQ) -> c_int;
+    pub fn PEM_read_bio_X509_CRL(
+        bio: *mut BIO,
+        out: *mut *mut X509_CRL,
+        callback: pem_password_cb,
+        user_data: *mut c_void,
+    ) -> *mut X509_CRL;
     pub fn PEM_read_bio_RSAPrivateKey(
         bio: *mut BIO,
         rsa: *mut *mut RSA,
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut RSA;
-    pub fn PEM_write_bio_RSAPrivateKey(
-        bp: *mut BIO,
-        rsa: *mut RSA,
-        cipher: *const EVP_CIPHER,
-        kstr: *mut c_uchar,
-        klen: c_int,
-        callback: pem_password_cb,
-        user_data: *mut c_void,
-    ) -> c_int;
     pub fn PEM_read_bio_RSAPublicKey(
         bio: *mut BIO,
         rsa: *mut *mut RSA,
@@ -61,51 +116,30 @@
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut RSA;
-    pub fn PEM_write_bio_RSA_PUBKEY(bp: *mut BIO, rsa: *mut RSA) -> c_int;
     pub fn PEM_read_bio_DSAPrivateKey(
         bp: *mut BIO,
         dsa: *mut *mut DSA,
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut DSA;
-    pub fn PEM_write_bio_DSAPrivateKey(
-        bp: *mut BIO,
-        dsa: *mut DSA,
-        cipher: *const EVP_CIPHER,
-        kstr: *mut c_uchar,
-        klen: c_int,
-        callback: pem_password_cb,
-        user_data: *mut c_void,
-    ) -> c_int;
     pub fn PEM_read_bio_DSA_PUBKEY(
         bp: *mut BIO,
         dsa: *mut *mut DSA,
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut DSA;
-    pub fn PEM_write_bio_DSA_PUBKEY(bp: *mut BIO, dsa: *mut DSA) -> c_int;
     pub fn PEM_read_bio_ECPrivateKey(
         bio: *mut BIO,
         key: *mut *mut EC_KEY,
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut EC_KEY;
-    pub fn PEM_write_bio_ECPrivateKey(
-        bio: *mut BIO,
-        key: *mut EC_KEY,
-        cipher: *const EVP_CIPHER,
-        kstr: *mut c_uchar,
-        klen: c_int,
-        callback: pem_password_cb,
-        user_data: *mut c_void,
-    ) -> c_int;
     pub fn PEM_read_bio_EC_PUBKEY(
         bp: *mut BIO,
         ec: *mut *mut EC_KEY,
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut EC_KEY;
-    pub fn PEM_write_bio_EC_PUBKEY(bp: *mut BIO, ec: *mut EC_KEY) -> c_int;
     pub fn PEM_read_bio_DHparams(
         bio: *mut BIO,
         out: *mut *mut DH,
@@ -119,32 +153,13 @@
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut EVP_PKEY;
-    pub fn PEM_write_bio_PrivateKey(
-        bio: *mut BIO,
-        pkey: *mut EVP_PKEY,
-        cipher: *const EVP_CIPHER,
-        kstr: *mut c_uchar,
-        klen: c_int,
-        callback: pem_password_cb,
-        user_data: *mut c_void,
-    ) -> c_int;
     pub fn PEM_read_bio_PUBKEY(
         bio: *mut BIO,
         out: *mut *mut EVP_PKEY,
         callback: pem_password_cb,
         user_data: *mut c_void,
     ) -> *mut EVP_PKEY;
-    pub fn PEM_write_bio_PUBKEY(bp: *mut BIO, x: *mut EVP_PKEY) -> c_int;
 
-    pub fn PEM_write_bio_PKCS8PrivateKey(
-        bio: *mut BIO,
-        pkey: *mut EVP_PKEY,
-        cipher: *const EVP_CIPHER,
-        kstr: *mut c_char,
-        klen: c_int,
-        callback: pem_password_cb,
-        user_data: *mut c_void,
-    ) -> c_int;
     pub fn d2i_PKCS8PrivateKey_bio(
         bp: *mut BIO,
         x: *mut *mut EVP_PKEY,
@@ -165,8 +180,6 @@
         u: *mut c_void,
     ) -> *mut PKCS7;
 
-    pub fn PEM_write_bio_PKCS7(bp: *mut BIO, x: *mut PKCS7) -> c_int;
-
     #[cfg(ossl101)]
     pub fn PEM_read_bio_CMS(
         bio: *mut BIO,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/pkcs12.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/pkcs12.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/pkcs12.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/pkcs12.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,13 @@
 
 extern "C" {
     pub fn PKCS12_free(p12: *mut PKCS12);
-    pub fn i2d_PKCS12(a: *mut PKCS12, buf: *mut *mut u8) -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_PKCS12(a: #[const_ptr_if(ossl300)] PKCS12, buf: *mut *mut u8) -> c_int;
+    }
+}
+extern "C" {
     pub fn d2i_PKCS12(a: *mut *mut PKCS12, pp: *mut *const u8, length: c_long) -> *mut PKCS12;
 
     pub fn PKCS12_parse(
@@ -31,9 +37,7 @@
             mac_iter: c_int,
             keytype: c_int,
         ) -> *mut PKCS12;
-    }
-}
 
-extern "C" {
-    pub fn i2d_PKCS12_bio(b: *mut BIO, a: *mut PKCS12) -> c_int;
+        pub fn i2d_PKCS12_bio(b: *mut BIO, a: #[const_ptr_if(ossl300)] PKCS12) -> c_int;
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/pkcs7.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/pkcs7.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/pkcs7.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/pkcs7.rs	2021-12-09 12:01:26.000000000 +0000
@@ -30,9 +30,15 @@
 
 extern "C" {
     pub fn d2i_PKCS7(a: *mut *mut PKCS7, pp: *mut *const c_uchar, length: c_long) -> *mut PKCS7;
+}
 
-    pub fn i2d_PKCS7(a: *mut PKCS7, buf: *mut *mut u8) -> c_int;
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_PKCS7(a: #[const_ptr_if(ossl300)] PKCS7, buf: *mut *mut u8) -> c_int;
+    }
+}
 
+extern "C" {
     pub fn PKCS7_encrypt(
         certs: *mut stack_st_X509,
         b: *mut BIO,
@@ -49,6 +55,12 @@
         flags: c_int,
     ) -> c_int;
 
+    pub fn PKCS7_get0_signers(
+        pkcs7: *mut PKCS7,
+        certs: *mut stack_st_X509,
+        flags: c_int,
+    ) -> *mut stack_st_X509;
+
     pub fn PKCS7_sign(
         signcert: *mut X509,
         pkey: *mut EVP_PKEY,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/rand.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/rand.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/rand.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/rand.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,4 +7,6 @@
     pub fn RAND_keep_random_devices_open(keep: c_int);
 
     pub fn RAND_status() -> c_int;
+
+    pub fn RAND_add(buf: *const c_void, num: c_int, randomness: c_double);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/rsa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/rsa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/rsa.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/rsa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,47 +5,86 @@
 
 pub const RSA_F4: c_long = 0x10001;
 
-pub unsafe fn EVP_PKEY_CTX_set_rsa_padding(ctx: *mut EVP_PKEY_CTX, pad: c_int) -> c_int {
-    EVP_PKEY_CTX_ctrl(
-        ctx,
-        EVP_PKEY_RSA,
-        -1,
-        EVP_PKEY_CTRL_RSA_PADDING,
-        pad,
-        ptr::null_mut(),
-    )
+cfg_if! {
+    if #[cfg(ossl300)] {
+        extern "C" {
+            pub fn EVP_PKEY_CTX_set_rsa_padding(ctx: *mut EVP_PKEY_CTX, pad_mode: c_int) -> c_int;
+            pub fn EVP_PKEY_CTX_get_rsa_padding(ctx: *mut EVP_PKEY_CTX, pad_mode: *mut c_int) -> c_int;
+
+            pub fn EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx: *mut EVP_PKEY_CTX, len: c_int) -> c_int;
+            pub fn EVP_PKEY_CTX_set_rsa_mgf1_md(ctx: *mut EVP_PKEY_CTX, md: *const EVP_MD) -> c_int;
+        }
+    } else {
+        pub unsafe fn EVP_PKEY_CTX_set_rsa_padding(ctx: *mut EVP_PKEY_CTX, pad: c_int) -> c_int {
+            EVP_PKEY_CTX_ctrl(
+                ctx,
+                EVP_PKEY_RSA,
+                -1,
+                EVP_PKEY_CTRL_RSA_PADDING,
+                pad,
+                ptr::null_mut(),
+            )
+        }
+        pub unsafe fn EVP_PKEY_CTX_get_rsa_padding(ctx: *mut EVP_PKEY_CTX, ppad: *mut c_int) -> c_int {
+            EVP_PKEY_CTX_ctrl(
+                ctx,
+                EVP_PKEY_RSA,
+                -1,
+                EVP_PKEY_CTRL_GET_RSA_PADDING,
+                0,
+                ppad as *mut c_void,
+            )
+        }
+
+        pub unsafe fn EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx: *mut EVP_PKEY_CTX, len: c_int) -> c_int {
+            EVP_PKEY_CTX_ctrl(
+                ctx,
+                EVP_PKEY_RSA,
+                EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY,
+                EVP_PKEY_CTRL_RSA_PSS_SALTLEN,
+                len,
+                ptr::null_mut(),
+            )
+        }
+
+        pub unsafe fn EVP_PKEY_CTX_set_rsa_mgf1_md(ctx: *mut EVP_PKEY_CTX, md: *mut EVP_MD) -> c_int {
+            EVP_PKEY_CTX_ctrl(
+                ctx,
+                EVP_PKEY_RSA,
+                EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
+                EVP_PKEY_CTRL_RSA_MGF1_MD,
+                0,
+                md as *mut c_void,
+            )
+        }
+    }
 }
 
-pub unsafe fn EVP_PKEY_CTX_get_rsa_padding(ctx: *mut EVP_PKEY_CTX, ppad: *mut c_int) -> c_int {
+#[cfg(any(ossl102, libressl310))]
+pub unsafe fn EVP_PKEY_CTX_set_rsa_oaep_md(ctx: *mut EVP_PKEY_CTX, md: *mut EVP_MD) -> c_int {
     EVP_PKEY_CTX_ctrl(
         ctx,
         EVP_PKEY_RSA,
-        -1,
-        EVP_PKEY_CTRL_GET_RSA_PADDING,
+        EVP_PKEY_OP_TYPE_CRYPT,
+        EVP_PKEY_CTRL_RSA_OAEP_MD,
         0,
-        ppad as *mut c_void,
+        md as *mut c_void,
     )
 }
 
-pub unsafe fn EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx: *mut EVP_PKEY_CTX, len: c_int) -> c_int {
+#[cfg(any(ossl102, libressl310))]
+pub unsafe fn EVP_PKEY_CTX_set0_rsa_oaep_label(
+    ctx: *mut EVP_PKEY_CTX,
+    label: *mut c_void,
+    len: c_int,
+) -> c_int {
     EVP_PKEY_CTX_ctrl(
         ctx,
         EVP_PKEY_RSA,
-        EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY,
-        EVP_PKEY_CTRL_RSA_PSS_SALTLEN,
+        EVP_PKEY_OP_TYPE_CRYPT,
+        EVP_PKEY_CTRL_RSA_OAEP_LABEL,
         len,
-        ptr::null_mut(),
-    )
-}
-
-pub unsafe fn EVP_PKEY_CTX_set_rsa_mgf1_md(ctx: *mut EVP_PKEY_CTX, md: *mut EVP_MD) -> c_int {
-    EVP_PKEY_CTX_ctrl(
-        ctx,
-        EVP_PKEY_RSA,
-        EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
-        EVP_PKEY_CTRL_RSA_MGF1_MD,
-        0,
-        md as *mut c_void,
+        label as *mut c_void,
     )
 }
 
@@ -56,7 +95,13 @@
 
 pub const EVP_PKEY_CTRL_GET_RSA_PADDING: c_int = EVP_PKEY_ALG_CTRL + 6;
 
+#[cfg(any(ossl102, libressl310))]
+pub const EVP_PKEY_CTRL_RSA_OAEP_MD: c_int = EVP_PKEY_ALG_CTRL + 9;
+#[cfg(any(ossl102, libressl310))]
+pub const EVP_PKEY_CTRL_RSA_OAEP_LABEL: c_int = EVP_PKEY_ALG_CTRL + 10;
+
 pub const RSA_PKCS1_PADDING: c_int = 1;
+#[cfg(not(ossl300))]
 pub const RSA_SSLV23_PADDING: c_int = 2;
 pub const RSA_NO_PADDING: c_int = 3;
 pub const RSA_PKCS1_OAEP_PADDING: c_int = 4;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/sha.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/sha.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/sha.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/sha.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,73 +1,189 @@
 use libc::*;
+use std::ptr;
+use *;
 
-pub type SHA_LONG = c_uint;
-
-pub const SHA_LBLOCK: c_int = 16;
-
-#[repr(C)]
-#[derive(Clone)]
-pub struct SHA_CTX {
-    pub h0: SHA_LONG,
-    pub h1: SHA_LONG,
-    pub h2: SHA_LONG,
-    pub h3: SHA_LONG,
-    pub h4: SHA_LONG,
-    pub Nl: SHA_LONG,
-    pub Nh: SHA_LONG,
-    pub data: [SHA_LONG; SHA_LBLOCK as usize],
-    pub num: c_uint,
-}
-
-extern "C" {
-    pub fn SHA1_Init(c: *mut SHA_CTX) -> c_int;
-    pub fn SHA1_Update(c: *mut SHA_CTX, data: *const c_void, len: size_t) -> c_int;
-    pub fn SHA1_Final(md: *mut c_uchar, c: *mut SHA_CTX) -> c_int;
-    pub fn SHA1(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
-}
-
-#[repr(C)]
-#[derive(Clone)]
-pub struct SHA256_CTX {
-    pub h: [SHA_LONG; 8],
-    pub Nl: SHA_LONG,
-    pub Nh: SHA_LONG,
-    pub data: [SHA_LONG; SHA_LBLOCK as usize],
-    pub num: c_uint,
-    pub md_len: c_uint,
-}
-
-extern "C" {
-    pub fn SHA224_Init(c: *mut SHA256_CTX) -> c_int;
-    pub fn SHA224_Update(c: *mut SHA256_CTX, data: *const c_void, len: size_t) -> c_int;
-    pub fn SHA224_Final(md: *mut c_uchar, c: *mut SHA256_CTX) -> c_int;
-    pub fn SHA224(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
-    pub fn SHA256_Init(c: *mut SHA256_CTX) -> c_int;
-    pub fn SHA256_Update(c: *mut SHA256_CTX, data: *const c_void, len: size_t) -> c_int;
-    pub fn SHA256_Final(md: *mut c_uchar, c: *mut SHA256_CTX) -> c_int;
-    pub fn SHA256(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
-}
-
-pub type SHA_LONG64 = u64;
-
-#[repr(C)]
-#[derive(Clone)]
-pub struct SHA512_CTX {
-    pub h: [SHA_LONG64; 8],
-    pub Nl: SHA_LONG64,
-    pub Nh: SHA_LONG64,
-    // this is a union but we don't want to require 1.19
-    u: [SHA_LONG64; SHA_LBLOCK as usize],
-    pub num: c_uint,
-    pub md_len: c_uint,
-}
-
-extern "C" {
-    pub fn SHA384_Init(c: *mut SHA512_CTX) -> c_int;
-    pub fn SHA384_Update(c: *mut SHA512_CTX, data: *const c_void, len: size_t) -> c_int;
-    pub fn SHA384_Final(md: *mut c_uchar, c: *mut SHA512_CTX) -> c_int;
-    pub fn SHA384(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
-    pub fn SHA512_Init(c: *mut SHA512_CTX) -> c_int;
-    pub fn SHA512_Update(c: *mut SHA512_CTX, data: *const c_void, len: size_t) -> c_int;
-    pub fn SHA512_Final(md: *mut c_uchar, c: *mut SHA512_CTX) -> c_int;
-    pub fn SHA512(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
+cfg_if! {
+    if #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))] {
+        pub type SHA_LONG = c_uint;
+
+        pub const SHA_LBLOCK: c_int = 16;
+
+        #[repr(C)]
+        #[derive(Clone)]
+        pub struct SHA_CTX {
+            pub h0: SHA_LONG,
+            pub h1: SHA_LONG,
+            pub h2: SHA_LONG,
+            pub h3: SHA_LONG,
+            pub h4: SHA_LONG,
+            pub Nl: SHA_LONG,
+            pub Nh: SHA_LONG,
+            pub data: [SHA_LONG; SHA_LBLOCK as usize],
+            pub num: c_uint,
+        }
+
+        extern "C" {
+            pub fn SHA1_Init(c: *mut SHA_CTX) -> c_int;
+            pub fn SHA1_Update(c: *mut SHA_CTX, data: *const c_void, len: size_t) -> c_int;
+            pub fn SHA1_Final(md: *mut c_uchar, c: *mut SHA_CTX) -> c_int;
+        }
+    }
+}
+
+cfg_if! {
+    if #[cfg(ossl300)] {
+        // Ideally we'd macro define these, but that crashes ctest :(
+        pub unsafe fn SHA1(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar {
+            if EVP_Q_digest(
+                ptr::null_mut(),
+                "SHA1\0".as_ptr() as *const c_char,
+                ptr::null(),
+                d as *const c_void,
+                n,
+                md,
+                ptr::null_mut(),
+            ) != 0 {
+                md
+            } else {
+                ptr::null_mut()
+            }
+        }
+    } else {
+        extern "C" {
+            pub fn SHA1(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
+        }
+    }
+}
+
+cfg_if! {
+    if #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))] {
+        #[repr(C)]
+        #[derive(Clone)]
+        pub struct SHA256_CTX {
+            pub h: [SHA_LONG; 8],
+            pub Nl: SHA_LONG,
+            pub Nh: SHA_LONG,
+            pub data: [SHA_LONG; SHA_LBLOCK as usize],
+            pub num: c_uint,
+            pub md_len: c_uint,
+        }
+
+        extern "C" {
+            pub fn SHA224_Init(c: *mut SHA256_CTX) -> c_int;
+            pub fn SHA224_Update(c: *mut SHA256_CTX, data: *const c_void, len: size_t) -> c_int;
+            pub fn SHA224_Final(md: *mut c_uchar, c: *mut SHA256_CTX) -> c_int;
+            pub fn SHA256_Init(c: *mut SHA256_CTX) -> c_int;
+            pub fn SHA256_Update(c: *mut SHA256_CTX, data: *const c_void, len: size_t) -> c_int;
+            pub fn SHA256_Final(md: *mut c_uchar, c: *mut SHA256_CTX) -> c_int;
+        }
+    }
+}
+
+cfg_if! {
+    if #[cfg(ossl300)] {
+        pub unsafe fn SHA224(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar {
+            if EVP_Q_digest(
+                ptr::null_mut(),
+                "SHA224\0".as_ptr() as *const c_char,
+                ptr::null(),
+                d as *const c_void,
+                n,
+                md,
+                ptr::null_mut(),
+            ) != 0 {
+                md
+            } else {
+                ptr::null_mut()
+            }
+        }
+
+        pub unsafe fn SHA256(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar {
+            if EVP_Q_digest(
+                ptr::null_mut(),
+                "SHA256\0".as_ptr() as *const c_char,
+                ptr::null(),
+                d as *const c_void,
+                n,
+                md,
+                ptr::null_mut(),
+            ) != 0 {
+                md
+            } else {
+                ptr::null_mut()
+            }
+        }
+    } else {
+        extern "C" {
+            pub fn SHA224(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
+            pub fn SHA256(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
+        }
+    }
+}
+
+cfg_if! {
+    if #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))] {
+        pub type SHA_LONG64 = u64;
+
+        #[repr(C)]
+        #[derive(Clone)]
+        pub struct SHA512_CTX {
+            pub h: [SHA_LONG64; 8],
+            pub Nl: SHA_LONG64,
+            pub Nh: SHA_LONG64,
+            // this is a union but we don't want to require 1.19
+            u: [SHA_LONG64; SHA_LBLOCK as usize],
+            pub num: c_uint,
+            pub md_len: c_uint,
+        }
+
+        extern "C" {
+            pub fn SHA384_Init(c: *mut SHA512_CTX) -> c_int;
+            pub fn SHA384_Update(c: *mut SHA512_CTX, data: *const c_void, len: size_t) -> c_int;
+            pub fn SHA384_Final(md: *mut c_uchar, c: *mut SHA512_CTX) -> c_int;
+            pub fn SHA512_Init(c: *mut SHA512_CTX) -> c_int;
+            pub fn SHA512_Update(c: *mut SHA512_CTX, data: *const c_void, len: size_t) -> c_int;
+            pub fn SHA512_Final(md: *mut c_uchar, c: *mut SHA512_CTX) -> c_int;
+        }
+    }
+}
+
+cfg_if! {
+    if #[cfg(ossl300)] {
+        pub unsafe fn SHA384(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar {
+            if EVP_Q_digest(
+                ptr::null_mut(),
+                "SHA384\0".as_ptr() as *const c_char,
+                ptr::null(),
+                d as *const c_void,
+                n,
+                md,
+                ptr::null_mut(),
+            ) != 0 {
+                md
+            } else {
+                ptr::null_mut()
+            }
+        }
+
+        pub unsafe fn SHA512(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar {
+            if EVP_Q_digest(
+                ptr::null_mut(),
+                "SHA512\0".as_ptr() as *const c_char,
+                ptr::null(),
+                d as *const c_void,
+                n,
+                md,
+                ptr::null_mut(),
+            ) != 0 {
+                md
+            } else {
+                ptr::null_mut()
+            }
+        }
+    } else {
+        extern "C" {
+            pub fn SHA384(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
+            pub fn SHA512(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar;
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/ssl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/ssl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/ssl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/ssl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -253,149 +253,171 @@
     ) -> c_int,
 >;
 
-pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004;
+cfg_if! {
+    if #[cfg(ossl300)] {
+        macro_rules! ssl_op_type {
+            () => {u64};
+        }
+    } else {
+        macro_rules! ssl_op_type {
+            () => {c_ulong};
+        }
+    }
+}
+
+pub const SSL_OP_LEGACY_SERVER_CONNECT: ssl_op_type!() = 0x00000004;
 cfg_if! {
     if #[cfg(libressl261)] {
-        pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0;
+        pub const SSL_OP_TLSEXT_PADDING: ssl_op_type!() = 0x0;
     } else if #[cfg(any(ossl102, libressl))] {
-        pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x10;
+        pub const SSL_OP_TLSEXT_PADDING: ssl_op_type!() = 0x10;
     }
 }
 #[cfg(ossl101)]
-pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: c_ulong = 0x00000040;
+pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: ssl_op_type!() = 0x00000040;
 
-pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800;
+pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: ssl_op_type!() = 0x00000800;
 
-pub const SSL_OP_NO_QUERY_MTU: c_ulong = 0x00001000;
-pub const SSL_OP_COOKIE_EXCHANGE: c_ulong = 0x00002000;
-pub const SSL_OP_NO_TICKET: c_ulong = 0x00004000;
+pub const SSL_OP_NO_QUERY_MTU: ssl_op_type!() = 0x00001000;
+pub const SSL_OP_COOKIE_EXCHANGE: ssl_op_type!() = 0x00002000;
+pub const SSL_OP_NO_TICKET: ssl_op_type!() = 0x00004000;
 cfg_if! {
     if #[cfg(ossl101)] {
-        pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x00008000;
+        pub const SSL_OP_CISCO_ANYCONNECT: ssl_op_type!() = 0x00008000;
     } else {
-        pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0;
+        pub const SSL_OP_CISCO_ANYCONNECT: ssl_op_type!() = 0x0;
     }
 }
 
-pub const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: c_ulong = 0x00010000;
+pub const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: ssl_op_type!() = 0x00010000;
 cfg_if! {
     if #[cfg(ossl101)] {
-        pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x00020000;
-        pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: c_ulong = 0x00040000;
+        pub const SSL_OP_NO_COMPRESSION: ssl_op_type!() = 0x00020000;
+        pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: ssl_op_type!() = 0x00040000;
     } else {
-        pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0;
-        pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: c_ulong = 0x0;
+        pub const SSL_OP_NO_COMPRESSION: ssl_op_type!() = 0x0;
+        pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: ssl_op_type!() = 0x0;
     }
 }
 
 #[cfg(ossl111)]
-pub const SSL_OP_ENABLE_MIDDLEBOX_COMPAT: c_ulong = 0x00100000;
+pub const SSL_OP_ENABLE_MIDDLEBOX_COMPAT: ssl_op_type!() = 0x00100000;
 
-pub const SSL_OP_CIPHER_SERVER_PREFERENCE: c_ulong = 0x00400000;
+pub const SSL_OP_CIPHER_SERVER_PREFERENCE: ssl_op_type!() = 0x00400000;
 cfg_if! {
     if #[cfg(libressl280)] {
-        pub const SSL_OP_TLS_ROLLBACK_BUG: c_ulong = 0;
+        pub const SSL_OP_TLS_ROLLBACK_BUG: ssl_op_type!() = 0;
     } else {
-        pub const SSL_OP_TLS_ROLLBACK_BUG: c_ulong = 0x00800000;
+        pub const SSL_OP_TLS_ROLLBACK_BUG: ssl_op_type!() = 0x00800000;
     }
 }
 
 cfg_if! {
     if #[cfg(ossl101)] {
-        pub const SSL_OP_NO_SSLv3: c_ulong = 0x02000000;
+        pub const SSL_OP_NO_SSLv3: ssl_op_type!() = 0x02000000;
     } else {
-        pub const SSL_OP_NO_SSLv3: c_ulong = 0x0;
+        pub const SSL_OP_NO_SSLv3: ssl_op_type!() = 0x0;
     }
 }
-pub const SSL_OP_NO_TLSv1_1: c_ulong = 0x10000000;
-pub const SSL_OP_NO_TLSv1_2: c_ulong = 0x08000000;
+pub const SSL_OP_NO_TLSv1_1: ssl_op_type!() = 0x10000000;
+pub const SSL_OP_NO_TLSv1_2: ssl_op_type!() = 0x08000000;
 
-pub const SSL_OP_NO_TLSv1: c_ulong = 0x04000000;
-#[cfg(ossl102)]
-pub const SSL_OP_NO_DTLSv1: c_ulong = 0x04000000;
-#[cfg(ossl102)]
-pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x08000000;
+pub const SSL_OP_NO_TLSv1: ssl_op_type!() = 0x04000000;
+cfg_if! {
+    if #[cfg(ossl102)] {
+        pub const SSL_OP_NO_DTLSv1: ssl_op_type!() = 0x04000000;
+        pub const SSL_OP_NO_DTLSv1_2: ssl_op_type!() = 0x08000000;
+    } else if #[cfg(libressl332)] {
+        pub const SSL_OP_NO_DTLSv1: ssl_op_type!() = 0x40000000;
+        pub const SSL_OP_NO_DTLSv1_2: ssl_op_type!() = 0x80000000;
+    }
+}
 #[cfg(ossl111)]
-pub const SSL_OP_NO_TLSv1_3: c_ulong = 0x20000000;
+pub const SSL_OP_NO_TLSv1_3: ssl_op_type!() = 0x20000000;
 
 #[cfg(ossl110h)]
-pub const SSL_OP_NO_RENEGOTIATION: c_ulong = 0x40000000;
+pub const SSL_OP_NO_RENEGOTIATION: ssl_op_type!() = 0x40000000;
 
 cfg_if! {
     if #[cfg(ossl111)] {
-        pub const SSL_OP_NO_SSL_MASK: c_ulong = SSL_OP_NO_SSLv2
+        pub const SSL_OP_NO_SSL_MASK: ssl_op_type!() = SSL_OP_NO_SSLv2
             | SSL_OP_NO_SSLv3
             | SSL_OP_NO_TLSv1
             | SSL_OP_NO_TLSv1_1
             | SSL_OP_NO_TLSv1_2
             | SSL_OP_NO_TLSv1_3;
     } else if #[cfg(ossl102)] {
-        pub const SSL_OP_NO_SSL_MASK: c_ulong =
+        pub const SSL_OP_NO_SSL_MASK: ssl_op_type!() =
             SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2;
     }
 }
 
 cfg_if! {
     if #[cfg(libressl261)] {
-        pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0;
+        pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: ssl_op_type!() = 0x0;
     } else {
-        pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000;
+        pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: ssl_op_type!() = 0x80000000;
     }
 }
 
 cfg_if! {
-    if #[cfg(ossl110f)] {
-        pub const SSL_OP_ALL: c_ulong = SSL_OP_CRYPTOPRO_TLSEXT_BUG
+    if #[cfg(ossl300)] {
+        pub const SSL_OP_ALL: ssl_op_type!() = SSL_OP_CRYPTOPRO_TLSEXT_BUG
+            | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
+            | SSL_OP_TLSEXT_PADDING
+            | SSL_OP_SAFARI_ECDHE_ECDSA_BUG;
+    } else if #[cfg(ossl110f)] {
+        pub const SSL_OP_ALL: ssl_op_type!() = SSL_OP_CRYPTOPRO_TLSEXT_BUG
             | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
             | SSL_OP_LEGACY_SERVER_CONNECT
             | SSL_OP_TLSEXT_PADDING
             | SSL_OP_SAFARI_ECDHE_ECDSA_BUG;
     } else if #[cfg(libressl261)] {
-        pub const SSL_OP_ALL: c_ulong = 0x4;
+        pub const SSL_OP_ALL: ssl_op_type!() = 0x4;
     } else if #[cfg(libressl)] {
-        pub const SSL_OP_ALL: c_ulong = 0x80000014;
+        pub const SSL_OP_ALL: ssl_op_type!() = 0x80000014;
     } else {
-        pub const SSL_OP_ALL: c_ulong = 0x80000BFF;
+        pub const SSL_OP_ALL: ssl_op_type!() = 0x80000BFF;
     }
 }
 
 cfg_if! {
     if #[cfg(ossl110)] {
-        pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x00000000;
-        pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x00000000;
-        pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x00000000;
-        pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x00000000;
-        pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x00000000;
-        pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x00000000;
-        pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x00000000;
-        pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00000000;
-        pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00000000;
-        pub const SSL_OP_NO_SSLv2: c_ulong = 0x00000000;
+        pub const SSL_OP_MICROSOFT_SESS_ID_BUG: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_TLS_D5_BUG: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_TLS_BLOCK_PADDING_BUG: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_SINGLE_ECDH_USE: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_SINGLE_DH_USE: ssl_op_type!() = 0x00000000;
+        pub const SSL_OP_NO_SSLv2: ssl_op_type!() = 0x00000000;
     } else if #[cfg(ossl101)] {
-        pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x00000001;
-        pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x00000002;
-        pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x00000008;
-        pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x00000020;
-        pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x00000080;
-        pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x00000100;
-        pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x00000200;
-        pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000;
-        pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000;
-        pub const SSL_OP_NO_SSLv2: c_ulong = 0x01000000;
+        pub const SSL_OP_MICROSOFT_SESS_ID_BUG: ssl_op_type!() = 0x00000001;
+        pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: ssl_op_type!() = 0x00000002;
+        pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: ssl_op_type!() = 0x00000008;
+        pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: ssl_op_type!() = 0x00000020;
+        pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: ssl_op_type!() = 0x00000080;
+        pub const SSL_OP_TLS_D5_BUG: ssl_op_type!() = 0x00000100;
+        pub const SSL_OP_TLS_BLOCK_PADDING_BUG: ssl_op_type!() = 0x00000200;
+        pub const SSL_OP_SINGLE_ECDH_USE: ssl_op_type!() = 0x00080000;
+        pub const SSL_OP_SINGLE_DH_USE: ssl_op_type!() = 0x00100000;
+        pub const SSL_OP_NO_SSLv2: ssl_op_type!() = 0x01000000;
     } else {
-        pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x0;
-        pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x0;
-        pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x0;
-        pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x0;
-        pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0;
-        pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0;
-        pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0;
+        pub const SSL_OP_MICROSOFT_SESS_ID_BUG: ssl_op_type!() = 0x0;
+        pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: ssl_op_type!() = 0x0;
+        pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: ssl_op_type!() = 0x0;
+        pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: ssl_op_type!() = 0x0;
+        pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: ssl_op_type!() = 0x0;
+        pub const SSL_OP_TLS_D5_BUG: ssl_op_type!() = 0x0;
+        pub const SSL_OP_TLS_BLOCK_PADDING_BUG: ssl_op_type!() = 0x0;
         #[cfg(libressl261)]
-        pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0;
+        pub const SSL_OP_SINGLE_ECDH_USE: ssl_op_type!() = 0x0;
         #[cfg(not(libressl261))]
-        pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000;
-        pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000;
-        pub const SSL_OP_NO_SSLv2: c_ulong = 0x0;
+        pub const SSL_OP_SINGLE_ECDH_USE: ssl_op_type!() = 0x00080000;
+        pub const SSL_OP_SINGLE_DH_USE: ssl_op_type!() = 0x00100000;
+        pub const SSL_OP_NO_SSLv2: ssl_op_type!() = 0x0;
     }
 }
 
@@ -419,7 +441,13 @@
 pub const SSL_COOKIE_LENGTH: c_int = 4096;
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(ossl300)] {
+        extern "C" {
+            pub fn SSL_CTX_get_options(ctx: *const SSL_CTX) -> u64;
+            pub fn SSL_CTX_set_options(ctx: *mut SSL_CTX, op: u64) -> u64;
+            pub fn SSL_CTX_clear_options(ctx: *mut SSL_CTX, op: u64) -> u64;
+        }
+    } else if #[cfg(ossl110)] {
         extern "C" {
             pub fn SSL_CTX_get_options(ctx: *const SSL_CTX) -> c_ulong;
             pub fn SSL_CTX_set_options(ctx: *mut SSL_CTX, op: c_ulong) -> c_ulong;
@@ -972,7 +1000,13 @@
     #[cfg(any(ossl110, libressl273))]
     pub fn SSL_SESSION_up_ref(ses: *mut SSL_SESSION) -> c_int;
     pub fn SSL_SESSION_free(s: *mut SSL_SESSION);
-    pub fn i2d_SSL_SESSION(s: *mut SSL_SESSION, pp: *mut *mut c_uchar) -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_SSL_SESSION(s: #[const_ptr_if(ossl300)] SSL_SESSION, pp: *mut *mut c_uchar) -> c_int;
+    }
+}
+extern "C" {
     pub fn SSL_set_session(ssl: *mut SSL, session: *mut SSL_SESSION) -> c_int;
     pub fn SSL_CTX_add_session(ctx: *mut SSL_CTX, session: *mut SSL_SESSION) -> c_int;
     pub fn SSL_CTX_remove_session(ctx: *mut SSL_CTX, session: *mut SSL_SESSION) -> c_int;
@@ -982,7 +1016,10 @@
         len: c_long,
     ) -> *mut SSL_SESSION;
 
+    #[cfg(not(ossl300))]
     pub fn SSL_get_peer_certificate(ssl: *const SSL) -> *mut X509;
+    #[cfg(ossl300)]
+    pub fn SSL_get1_peer_certificate(ssl: *const SSL) -> *mut X509;
 
     pub fn SSL_get_peer_cert_chain(ssl: *const SSL) -> *mut stack_st_X509;
 
@@ -993,6 +1030,9 @@
     );
     pub fn SSL_CTX_set_verify_depth(ctx: *mut SSL_CTX, depth: c_int);
 
+    #[cfg(ossl111)]
+    pub fn SSL_CTX_set_post_handshake_auth(ctx: *mut SSL_CTX, val: c_int);
+
     pub fn SSL_CTX_check_private_key(ctx: *const SSL_CTX) -> c_int;
 
     pub fn SSL_CTX_set_session_id_context(
@@ -1062,6 +1102,7 @@
     pub fn SSL_stateless(s: *mut SSL) -> c_int;
     pub fn SSL_connect(ssl: *mut SSL) -> c_int;
     pub fn SSL_read(ssl: *mut SSL, buf: *mut c_void, num: c_int) -> c_int;
+    pub fn SSL_peek(ssl: *mut SSL, buf: *mut c_void, num: c_int) -> c_int;
     #[cfg(ossl111)]
     pub fn SSL_read_early_data(
         s: *mut ::SSL,
@@ -1339,6 +1380,12 @@
     }
 }
 
+#[cfg(not(osslconf = "OPENSSL_NO_COMP"))]
+extern "C" {
+    #[cfg(ossl110)]
+    pub fn COMP_get_type(meth: *const COMP_METHOD) -> i32;
+}
+
 extern "C" {
     #[cfg(ossl110)]
     pub fn SSL_CIPHER_get_cipher_nid(c: *const SSL_CIPHER) -> c_int;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/types.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/types.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/types.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/types.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2 @@
+#[cfg(ossl300)]
+pub enum OSSL_LIB_CTX {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/x509.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/x509.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/x509.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/x509.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,6 +6,8 @@
 pub const X509_FILETYPE_ASN1: c_int = 2;
 pub const X509_FILETYPE_DEFAULT: c_int = 3;
 
+pub const ASN1_R_HEADER_TOO_LONG: c_int = 123;
+
 #[repr(C)]
 pub struct X509_VAL {
     pub notBefore: *mut ASN1_TIME,
@@ -183,32 +185,38 @@
     ) -> c_int;
 
     pub fn X509_REQ_sign(x: *mut X509_REQ, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> c_int;
+}
 
-    pub fn i2d_X509_bio(b: *mut BIO, x: *mut X509) -> c_int;
-    pub fn i2d_X509_REQ_bio(b: *mut BIO, x: *mut X509_REQ) -> c_int;
-    pub fn i2d_PrivateKey_bio(b: *mut BIO, x: *mut EVP_PKEY) -> c_int;
-    pub fn i2d_PUBKEY_bio(b: *mut BIO, x: *mut EVP_PKEY) -> c_int;
-
-    pub fn i2d_PUBKEY(k: *mut EVP_PKEY, buf: *mut *mut u8) -> c_int;
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_X509_bio(b: *mut BIO, x: #[const_ptr_if(ossl300)] X509) -> c_int;
+        pub fn i2d_X509_REQ_bio(b: *mut BIO, x: #[const_ptr_if(ossl300)] X509_REQ) -> c_int;
+        pub fn i2d_PrivateKey_bio(b: *mut BIO, x: #[const_ptr_if(ossl300)] EVP_PKEY) -> c_int;
+        pub fn i2d_PUBKEY_bio(b: *mut BIO, x: #[const_ptr_if(ossl300)] EVP_PKEY) -> c_int;
+
+        pub fn i2d_PUBKEY(k: #[const_ptr_if(ossl300)] EVP_PKEY, buf: *mut *mut u8) -> c_int;
+        pub fn i2d_RSA_PUBKEY(k: #[const_ptr_if(ossl300)] RSA, buf: *mut *mut u8) -> c_int;
+        pub fn i2d_DSA_PUBKEY(a: #[const_ptr_if(ossl300)] DSA, pp: *mut *mut c_uchar) -> c_int;
+        pub fn i2d_PrivateKey(k: #[const_ptr_if(ossl300)] EVP_PKEY, buf: *mut *mut u8) -> c_int;
+        pub fn i2d_ECPrivateKey(ec_key: #[const_ptr_if(ossl300)] EC_KEY, pp: *mut *mut c_uchar) -> c_int;
+        pub fn i2d_EC_PUBKEY(a: #[const_ptr_if(ossl300)] EC_KEY, pp: *mut *mut c_uchar) -> c_int;
+    }
+}
+extern "C" {
     pub fn d2i_PUBKEY(k: *mut *mut EVP_PKEY, buf: *mut *const u8, len: c_long) -> *mut EVP_PKEY;
     pub fn d2i_RSA_PUBKEY(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA;
-    pub fn i2d_RSA_PUBKEY(k: *mut RSA, buf: *mut *mut u8) -> c_int;
     pub fn d2i_DSA_PUBKEY(k: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long) -> *mut DSA;
-    pub fn i2d_DSA_PUBKEY(a: *mut DSA, pp: *mut *mut c_uchar) -> c_int;
     pub fn d2i_EC_PUBKEY(
         a: *mut *mut EC_KEY,
         pp: *mut *const c_uchar,
         length: c_long,
     ) -> *mut EC_KEY;
-    pub fn i2d_EC_PUBKEY(a: *mut EC_KEY, pp: *mut *mut c_uchar) -> c_int;
-    pub fn i2d_PrivateKey(k: *mut EVP_PKEY, buf: *mut *mut u8) -> c_int;
 
     pub fn d2i_ECPrivateKey(
         k: *mut *mut EC_KEY,
         pp: *mut *const c_uchar,
         length: c_long,
     ) -> *mut EC_KEY;
-    pub fn i2d_ECPrivateKey(ec_key: *mut EC_KEY, pp: *mut *mut c_uchar) -> c_int;
 }
 
 const_ptr_api! {
@@ -232,14 +240,27 @@
 
     pub fn X509_REVOKED_new() -> *mut X509_REVOKED;
     pub fn X509_REVOKED_free(x: *mut X509_REVOKED);
-    #[cfg(any(ossl110, libressl270))]
-    pub fn X509_REVOKED_dup(rev: *mut X509_REVOKED) -> *mut X509_REVOKED;
+}
+const_ptr_api! {
+    extern "C" {
+        #[cfg(any(ossl110, libressl270))]
+        pub fn X509_REVOKED_dup(rev: #[const_ptr_if(ossl300)] X509_REVOKED) -> *mut X509_REVOKED;
+    }
+}
+
+extern "C" {
     pub fn d2i_X509_REVOKED(
         a: *mut *mut X509_REVOKED,
         pp: *mut *const c_uchar,
         length: c_long,
     ) -> *mut X509_REVOKED;
-    pub fn i2d_X509_REVOKED(x: *mut X509_REVOKED, buf: *mut *mut u8) -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_X509_REVOKED(x: #[const_ptr_if(ossl300)] X509_REVOKED, buf: *mut *mut u8) -> c_int;
+    }
+}
+extern "C" {
     pub fn X509_CRL_new() -> *mut X509_CRL;
     pub fn X509_CRL_free(x: *mut X509_CRL);
     pub fn d2i_X509_CRL(
@@ -247,8 +268,14 @@
         pp: *mut *const c_uchar,
         length: c_long,
     ) -> *mut X509_CRL;
-    pub fn i2d_X509_CRL(x: *mut X509_CRL, buf: *mut *mut u8) -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_X509_CRL(x: #[const_ptr_if(ossl300)] X509_CRL, buf: *mut *mut u8) -> c_int;
+    }
+}
 
+extern "C" {
     pub fn X509_REQ_new() -> *mut X509_REQ;
     pub fn X509_REQ_free(x: *mut X509_REQ);
     pub fn d2i_X509_REQ(
@@ -256,11 +283,11 @@
         pp: *mut *const c_uchar,
         length: c_long,
     ) -> *mut X509_REQ;
-    pub fn i2d_X509_REQ(x: *mut X509_REQ, buf: *mut *mut u8) -> c_int;
 }
-
 const_ptr_api! {
     extern "C" {
+        pub fn i2d_X509_REQ(x: #[const_ptr_if(ossl300)] X509_REQ, buf: *mut *mut u8) -> c_int;
+
         #[cfg(any(ossl102, libressl273))]
         pub fn X509_get0_signature(
             psig: *mut #[const_ptr_if(any(ossl110, libressl273))] ASN1_BIT_STRING,
@@ -282,8 +309,15 @@
 
     pub fn X509_new() -> *mut X509;
     pub fn X509_free(x: *mut X509);
-    pub fn i2d_X509(x: *mut X509, buf: *mut *mut u8) -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn i2d_X509(x: #[const_ptr_if(ossl300)] X509, buf: *mut *mut u8) -> c_int;
+    }
+}
+extern "C" {
     pub fn d2i_X509(a: *mut *mut X509, pp: *mut *const c_uchar, length: c_long) -> *mut X509;
+    pub fn d2i_X509_bio(b: *mut BIO, a: *mut *mut X509) -> *mut X509;
 
     pub fn X509_get_pubkey(x: *mut X509) -> *mut EVP_PKEY;
 
@@ -292,20 +326,19 @@
     pub fn X509_get_version(x: *const X509) -> c_long;
     pub fn X509_set_serialNumber(x: *mut X509, sn: *mut ASN1_INTEGER) -> c_int;
     pub fn X509_get_serialNumber(x: *mut X509) -> *mut ASN1_INTEGER;
-    pub fn X509_set_issuer_name(x: *mut X509, name: *mut X509_NAME) -> c_int;
-
-    pub fn X509_subject_name_hash(x: *mut ::X509) -> c_ulong;
 }
 const_ptr_api! {
     extern "C" {
-        pub fn X509_get_issuer_name(x: #[const_ptr_if(any(ossl110, libressl280))] ::X509) -> *mut ::X509_NAME;
+        pub fn X509_set_issuer_name(x: *mut X509, name: #[const_ptr_if(ossl300)] X509_NAME) -> c_int;
     }
 }
 extern "C" {
-    pub fn X509_set_subject_name(x: *mut X509, name: *mut X509_NAME) -> c_int;
+    pub fn X509_subject_name_hash(x: *mut ::X509) -> c_ulong;
 }
 const_ptr_api! {
     extern "C" {
+        pub fn X509_get_issuer_name(x: #[const_ptr_if(any(ossl110, libressl280))] ::X509) -> *mut ::X509_NAME;
+        pub fn X509_set_subject_name(x: *mut X509, name: #[const_ptr_if(ossl300)] X509_NAME) -> c_int;
         pub fn X509_get_subject_name(x: #[const_ptr_if(any(ossl110, libressl280))] ::X509) -> *mut ::X509_NAME;
     }
 }
@@ -328,12 +361,24 @@
     pub fn X509_REQ_set_version(req: *mut X509_REQ, version: c_long) -> c_int;
     #[cfg(ossl110)]
     pub fn X509_REQ_get_subject_name(req: *const X509_REQ) -> *mut X509_NAME;
-    pub fn X509_REQ_set_subject_name(req: *mut X509_REQ, name: *mut X509_NAME) -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn X509_REQ_set_subject_name(req: *mut X509_REQ, name: #[const_ptr_if(ossl300)] X509_NAME) -> c_int;
+    }
+}
+extern "C" {
     pub fn X509_REQ_set_pubkey(req: *mut X509_REQ, pkey: *mut EVP_PKEY) -> c_int;
     pub fn X509_REQ_get_pubkey(req: *mut X509_REQ) -> *mut EVP_PKEY;
     pub fn X509_REQ_get_extensions(req: *mut X509_REQ) -> *mut stack_st_X509_EXTENSION;
-    pub fn X509_REQ_add_extensions(req: *mut X509_REQ, exts: *mut stack_st_X509_EXTENSION)
-        -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn X509_REQ_add_extensions(req: *mut X509_REQ, exts: #[const_ptr_if(ossl300)] stack_st_X509_EXTENSION)
+            -> c_int;
+    }
+}
+extern "C" {
     pub fn X509_set_pubkey(x: *mut X509, pkey: *mut EVP_PKEY) -> c_int;
     pub fn X509_REQ_verify(req: *mut X509_REQ, pkey: *mut EVP_PKEY) -> c_int;
     #[cfg(any(ossl110, libressl273))]
@@ -366,12 +411,18 @@
         ret: *mut *mut X509_REVOKED,
         cert: *mut X509,
     ) -> c_int;
-    pub fn X509_CRL_get0_by_serial(
-        x: *mut X509_CRL,
-        ret: *mut *mut X509_REVOKED,
-        serial: *mut ASN1_INTEGER,
-    ) -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn X509_CRL_get0_by_serial(
+            x: *mut X509_CRL,
+            ret: *mut *mut X509_REVOKED,
+            serial: #[const_ptr_if(ossl300)] ASN1_INTEGER,
+        ) -> c_int;
+    }
+}
 
+extern "C" {
     #[cfg(any(ossl110, libressl281))]
     pub fn X509_CRL_get_REVOKED(crl: *mut X509_CRL) -> *mut stack_st_X509_REVOKED;
     #[cfg(any(ossl110, libressl281))]
@@ -385,7 +436,13 @@
     pub fn X509_get0_extensions(req: *const ::X509) -> *const stack_st_X509_EXTENSION;
 
     pub fn X509_CRL_set_version(crl: *mut X509_CRL, version: c_long) -> c_int;
-    pub fn X509_CRL_set_issuer_name(crl: *mut X509_CRL, name: *mut X509_NAME) -> c_int;
+}
+const_ptr_api! {
+    extern "C" {
+        pub fn X509_CRL_set_issuer_name(crl: *mut X509_CRL, name: #[const_ptr_if(ossl300)] X509_NAME) -> c_int;
+    }
+}
+extern "C" {
     pub fn X509_CRL_sort(crl: *mut X509_CRL) -> c_int;
 
     #[cfg(any(ossl110, libressl270))]
@@ -410,11 +467,7 @@
 const_ptr_api! {
     extern "C" {
         pub fn X509_NAME_entry_count(n: #[const_ptr_if(any(ossl110, libressl280))] X509_NAME) -> c_int;
-        pub fn X509_NAME_get_index_by_NID(n: #[const_ptr_if(libressl280)] X509_NAME, nid: c_int, last_pos: c_int) -> c_int;
-    }
-}
-const_ptr_api! {
-    extern "C" {
+        pub fn X509_NAME_get_index_by_NID(n: #[const_ptr_if(any(ossl300, libressl280))] X509_NAME, nid: c_int, last_pos: c_int) -> c_int;
         pub fn X509_NAME_get_entry(n: #[const_ptr_if(any(ossl110, libressl280))] X509_NAME, loc: c_int) -> *mut X509_NAME_ENTRY;
         pub fn X509_NAME_add_entry_by_NID(
             x: *mut X509_NAME,
@@ -561,9 +614,14 @@
     pub fn X509_verify_cert(ctx: *mut X509_STORE_CTX) -> c_int;
 }
 
+const_ptr_api! {
+    extern "C" {
+        #[cfg(any(ossl110, libressl270))]
+        pub fn X509_STORE_get0_objects(ctx: #[const_ptr_if(ossl300)] X509_STORE) -> *mut stack_st_X509_OBJECT;
+    }
+}
 #[cfg(any(ossl110, libressl270))]
 extern "C" {
-    pub fn X509_STORE_get0_objects(ctx: *mut X509_STORE) -> *mut stack_st_X509_OBJECT;
     pub fn X509_OBJECT_get0_X509(x: *const X509_OBJECT) -> *mut X509;
 }
 
@@ -578,3 +636,10 @@
         }
     }
 }
+
+extern "C" {
+    pub fn X509_get_default_cert_file_env() -> *const c_char;
+    pub fn X509_get_default_cert_file() -> *const c_char;
+    pub fn X509_get_default_cert_dir_env() -> *const c_char;
+    pub fn X509_get_default_cert_dir() -> *const c_char;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/x509v3.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/x509v3.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/x509v3.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/x509v3.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,6 +28,18 @@
 }
 
 #[repr(C)]
+pub struct ACCESS_DESCRIPTION {
+    pub method: *mut ASN1_OBJECT,
+    pub location: *mut GENERAL_NAME,
+}
+
+stack!(stack_st_ACCESS_DESCRIPTION);
+
+extern "C" {
+    pub fn ACCESS_DESCRIPTION_free(ad: *mut ACCESS_DESCRIPTION);
+}
+
+#[repr(C)]
 pub struct AUTHORITY_KEYID {
     pub keyid: *mut ASN1_OCTET_STRING,
     pub issuer: *mut stack_st_GENERAL_NAME,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/x509_vfy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/x509_vfy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/openssl-sys/src/x509_vfy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/openssl-sys/src/x509_vfy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,13 @@
 pub const X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: c_int = 21;
 pub const X509_V_ERR_CERT_CHAIN_TOO_LONG: c_int = 22;
 pub const X509_V_ERR_CERT_REVOKED: c_int = 23;
-pub const X509_V_ERR_INVALID_CA: c_int = 24;
+cfg_if! {
+    if #[cfg(ossl300)] {
+        pub const X509_V_ERR_NO_ISSUER_PUBLIC_KEY: c_int = 24;
+    } else {
+        pub const X509_V_ERR_INVALID_CA: c_int = 24;
+    }
+}
 pub const X509_V_ERR_PATH_LENGTH_EXCEEDED: c_int = 25;
 pub const X509_V_ERR_INVALID_PURPOSE: c_int = 26;
 pub const X509_V_ERR_CERT_UNTRUSTED: c_int = 27;
@@ -183,17 +189,26 @@
     ) -> *mut X509_LOOKUP;
 
     pub fn X509_STORE_set_default_paths(store: *mut X509_STORE) -> c_int;
+    pub fn X509_STORE_set_flags(store: *mut X509_STORE, flags: c_ulong) -> c_int;
+}
 
-    pub fn X509_STORE_CTX_get_ex_data(ctx: *mut X509_STORE_CTX, idx: c_int) -> *mut c_void;
-    pub fn X509_STORE_CTX_get_error(ctx: *mut X509_STORE_CTX) -> c_int;
+const_ptr_api! {
+    extern "C" {
+        pub fn X509_STORE_CTX_get_ex_data(ctx: #[const_ptr_if(ossl300)] X509_STORE_CTX, idx: c_int) -> *mut c_void;
+        pub fn X509_STORE_CTX_get_error(ctx: #[const_ptr_if(ossl300)] X509_STORE_CTX) -> c_int;
+        pub fn X509_STORE_CTX_get_error_depth(ctx: #[const_ptr_if(ossl300)] X509_STORE_CTX) -> c_int;
+        pub fn X509_STORE_CTX_get_current_cert(ctx: #[const_ptr_if(ossl300)] X509_STORE_CTX) -> *mut X509;
+    }
+}
+extern "C" {
     pub fn X509_STORE_CTX_set_error(ctx: *mut X509_STORE_CTX, error: c_int);
-    pub fn X509_STORE_CTX_get_error_depth(ctx: *mut X509_STORE_CTX) -> c_int;
-    pub fn X509_STORE_CTX_get_current_cert(ctx: *mut X509_STORE_CTX) -> *mut X509;
 }
 cfg_if! {
     if #[cfg(ossl110)] {
-        extern "C" {
-            pub fn X509_STORE_CTX_get0_chain(ctx: *mut X509_STORE_CTX) -> *mut stack_st_X509;
+        const_ptr_api! {
+            extern "C" {
+                pub fn X509_STORE_CTX_get0_chain(ctx: #[const_ptr_if(ossl300)] X509_STORE_CTX) -> *mut stack_st_X509;
+            }
         }
     } else {
         extern "C" {
@@ -210,9 +225,15 @@
     pub fn X509_VERIFY_PARAM_set_flags(param: *mut X509_VERIFY_PARAM, flags: c_ulong) -> c_int;
     #[cfg(any(ossl102, libressl261))]
     pub fn X509_VERIFY_PARAM_clear_flags(param: *mut X509_VERIFY_PARAM, flags: c_ulong) -> c_int;
-    #[cfg(any(ossl102, libressl261))]
-    pub fn X509_VERIFY_PARAM_get_flags(param: *mut X509_VERIFY_PARAM) -> c_ulong;
+}
+const_ptr_api! {
+    extern "C" {
+        #[cfg(any(ossl102, libressl261))]
+        pub fn X509_VERIFY_PARAM_get_flags(param: #[const_ptr_if(ossl300)] X509_VERIFY_PARAM) -> c_ulong;
+    }
+}
 
+extern "C" {
     #[cfg(any(ossl102, libressl261))]
     pub fn X509_VERIFY_PARAM_set1_host(
         param: *mut X509_VERIFY_PARAM,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"f9559e40e966a870d64367a75e41b233ee1bc1746f6f242501b9462e69b4db12","Cargo.toml":"a7cce7f9fbc2cb0a5c388384073f9b2e820d6b47f314ef0dcccb5613741b8202","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"93e21ceae3fe1b6cf9f6c2ebcbf09211a08b446f849048900d8d7efe52751614","bors.toml":"938b40da0516dd1e18f6ab893d43a3c6a011836124696157568380f3ce784958","src/condvar.rs":"bace2ee6e97eab088833a22a511029fb188e5f6bc9289bfcd5d41e3915de921d","src/deadlock.rs":"7d3ebb5b4f63658435df277bb983e352e4bc651a92c4fd48ae68bf103e452d0d","src/elision.rs":"9aceb0b27fd3cdaf4ef76bda63435a96ec2fdef24be098b9e4edbc39db000765","src/fair_mutex.rs":"d0a032e8207919da04b85f1422dfb14aa2af7aad78843c708d2fe3e0478e401a","src/lib.rs":"d83b9e6c70d2c6167d55dc2c4cf2b02abf4b11bfa092949750bc0cdafd38a45c","src/mutex.rs":"9fff878238ef798bfe2f48b410ca3074914826005a12df4f9b96619b2d3e6409","src/once.rs":"a1c38a5d87077e3d112d57e065ee126a24ab19f04fba9cb1f2cb43bc82caf33c","src/raw_fair_mutex.rs":"316f954d9673ac5b8d6bf4c19f2444800f63daf801c224d986e2d6dac810643c","src/raw_mutex.rs":"a24262800d61b8486ef0cfb1b72ead748c544ca2a551ec48346036ebb4fc385b","src/raw_rwlock.rs":"d0d93b096e68da3213da49d51849baf4ec241552eaa9b791f38314eb36c4e1a9","src/remutex.rs":"7a0de55161cd57497bb52d3aecca69a89eff2e71cdb2d762df53579e0607b489","src/rwlock.rs":"68584dffeb4368839774c0ee987481affc0547c38977a17970514f072a582d61","src/util.rs":"26325483bcd23ab8ceb16bf47541152c5eb0bc394f247795c14698fa7b586692","tests/issue_203.rs":"5fbdf6ec63f391d86457df949678c203a1e81e8aa32d4e10037fa76e768702c0"},"package":"6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"3ea666453fd8eae4b1b8d81f675f45e627115201a368890f0828cf895c58790f","Cargo.toml":"6217caca78eb5e8c0bb41beed960b735bde774ae60e752e584d7265a2e19f079","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"93e21ceae3fe1b6cf9f6c2ebcbf09211a08b446f849048900d8d7efe52751614","bors.toml":"938b40da0516dd1e18f6ab893d43a3c6a011836124696157568380f3ce784958","src/condvar.rs":"bace2ee6e97eab088833a22a511029fb188e5f6bc9289bfcd5d41e3915de921d","src/deadlock.rs":"7d3ebb5b4f63658435df277bb983e352e4bc651a92c4fd48ae68bf103e452d0d","src/elision.rs":"9aceb0b27fd3cdaf4ef76bda63435a96ec2fdef24be098b9e4edbc39db000765","src/fair_mutex.rs":"d0a032e8207919da04b85f1422dfb14aa2af7aad78843c708d2fe3e0478e401a","src/lib.rs":"d83b9e6c70d2c6167d55dc2c4cf2b02abf4b11bfa092949750bc0cdafd38a45c","src/mutex.rs":"9fff878238ef798bfe2f48b410ca3074914826005a12df4f9b96619b2d3e6409","src/once.rs":"a1c38a5d87077e3d112d57e065ee126a24ab19f04fba9cb1f2cb43bc82caf33c","src/raw_fair_mutex.rs":"316f954d9673ac5b8d6bf4c19f2444800f63daf801c224d986e2d6dac810643c","src/raw_mutex.rs":"a24262800d61b8486ef0cfb1b72ead748c544ca2a551ec48346036ebb4fc385b","src/raw_rwlock.rs":"f23b9d68b7048278f9987d81551ae9551894e5af47bbaaf8d86b8ee42cb7ed74","src/remutex.rs":"7a0de55161cd57497bb52d3aecca69a89eff2e71cdb2d762df53579e0607b489","src/rwlock.rs":"68584dffeb4368839774c0ee987481affc0547c38977a17970514f072a582d61","src/util.rs":"26325483bcd23ab8ceb16bf47541152c5eb0bc394f247795c14698fa7b586692","tests/issue_203.rs":"5fbdf6ec63f391d86457df949678c203a1e81e8aa32d4e10037fa76e768702c0"},"package":"7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "parking_lot"
-version = "0.11.1"
+version = "0.11.2"
 authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
 description = "More compact and efficient implementations of the standard synchronization primitives."
 readme = "README.md"
@@ -22,20 +21,21 @@
 license = "Apache-2.0/MIT"
 repository = "https://github.com/Amanieu/parking_lot"
 [dependencies.instant]
-version = "0.1.4"
+version = "0.1.9"
 
 [dependencies.lock_api]
-version = "0.4.0"
+version = "0.4.5"
 
 [dependencies.parking_lot_core]
-version = "0.8.0"
+version = "0.8.4"
 [dev-dependencies.bincode]
-version = "1.3.0"
+version = "1.3.3"
 
 [dev-dependencies.rand]
-version = "0.7.3"
+version = "0.8.3"
 
 [features]
+arc_lock = ["lock_api/arc_lock"]
 deadlock_detection = ["parking_lot_core/deadlock_detection"]
 default = []
 nightly = ["parking_lot_core/nightly", "lock_api/nightly"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,31 @@
+## parking_lot 0.11.2, parking_lot_core 0.8.4, lock_api 0.4.5 (2021-08-28)
+
+- Fixed incorrect memory orderings on `RwLock` and `WordLock`. (#294, #292)
+- Added `Arc`-based lock guards. (#291)
+- Added workaround for TSan's lack of support for `fence`. (#292)
+
+## lock_api 0.4.4 (2021-05-01)
+
+- Update for latest nightly. (#281)
+
+## lock_api 0.4.3 (2021-04-03)
+
+- Added `[Raw]ReentrantMutex::is_owned`. (#280)
+
+## parking_lot_core 0.8.3 (2021-02-12)
+
+- Updated smallvec to 1.6. (#276)
+
+## parking_lot_core 0.8.2 (2020-12-21)
+
+- Fixed assertion failure on OpenBSD. (#270)
+
+## parking_lot_core 0.8.1 (2020-12-04)
+
+- Removed deprecated CloudABI support. (#263)
+- Fixed build on wasm32-unknown-unknown. (#265)
+- Relaxed dependency on `smallvec`. (#266)
+
 ## parking_lot 0.11.1, lock_api 0.4.2 (2020-11-18)
 
 - Fix bounds on Send and Sync impls for lock guards. (#262)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot/src/raw_rwlock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot/src/raw_rwlock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot/src/raw_rwlock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot/src/raw_rwlock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -362,7 +362,7 @@
     unsafe fn upgrade(&self) {
         let state = self.state.fetch_sub(
             (ONE_READER | UPGRADABLE_BIT) - WRITER_BIT,
-            Ordering::Relaxed,
+            Ordering::Acquire,
         );
         if state & READERS_MASK != ONE_READER {
             let result = self.upgrade_slow(None);
@@ -377,7 +377,7 @@
             .compare_exchange_weak(
                 ONE_READER | UPGRADABLE_BIT,
                 WRITER_BIT,
-                Ordering::Relaxed,
+                Ordering::Acquire,
                 Ordering::Relaxed,
             )
             .is_ok()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot_core/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot_core/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot_core/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot_core/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+// Automatically detect tsan in a way that's compatible with both stable (which
+// doesn't support sanitizers) and nightly (which does). Works because build
+// scripts gets `cfg` info, even if the cfg is unstable.
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+    let santizer_list = std::env::var("CARGO_CFG_SANITIZE").unwrap_or_default();
+    if santizer_list.contains("thread") {
+        println!("cargo:rustc-cfg=tsan_enabled");
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot_core/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot_core/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot_core/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot_core/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"47ce78ae2c5d40969f0ce1f370fd54c99f24e3d1962c446aba19d832b63cf4b8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","src/lib.rs":"7baf09034aafc28f7dbb1550cdde89221e4eb5dfda51b55aeb652ee8710c715d","src/parking_lot.rs":"58125667bd78399e8753b6bd8acef84f180f369f0bc174c573887176bab9f9d3","src/spinwait.rs":"d568d8a81f9144ec4c4a139dc934d7d04ee1656a4a221eb548742fe7aba09ab1","src/thread_parker/generic.rs":"574aecb3c325012b683eca4135441ec73f44c33cc9955aa05db24d7e4c991cd7","src/thread_parker/linux.rs":"4a2c76b3dc09301ceb73d904460f49d91bc1a2492cc123ee26ca22ece3faae79","src/thread_parker/mod.rs":"9c675b7690bbde62e88d946fad218623d423edccff4e01e8e52b116d815c695c","src/thread_parker/redox.rs":"91ca107c4edffa57e87294cadec3b6010b584fb272c044e2557c925dbcb90f6a","src/thread_parker/sgx.rs":"898ced116fb7b0ac077b5977b5bcac610f1d55beffb613ec73e083b1ef09cc28","src/thread_parker/unix.rs":"02a17ad1241e8547cc7ee096318757b01d328354b639d0f799fca66ff2f07439","src/thread_parker/wasm.rs":"903b7eec240cdbe8a23467f6b41d042d93b35755bd1763be02f9cc55756c4aec","src/thread_parker/wasm_atomic.rs":"cf761157803256b18205e747bc99e30b18d5410c27121fa9595e12cb51bb6bef","src/thread_parker/windows/keyed_event.rs":"fc1cf4e592d814c4c949217d91317ec2afb6048430abebb3cea2e8487b369734","src/thread_parker/windows/mod.rs":"c99a3871e69800452a56928a9e870530b7f48a563a4d3efe6184103147899f0c","src/thread_parker/windows/waitaddress.rs":"8e037df2a5692905e2bc2d4ea955295ab92bcc7e26eea0bb7a4eaac9ce657321","src/util.rs":"285e6133150645525f2ca1ece41f6d35bad4e7c5e08b42b20c99d2a97e04a974","src/word_lock.rs":"2c030aedb340ae8ca564365206452c298fe29986d005d6a40e808c9760f91c95"},"package":"9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"}
\ No newline at end of file
+{"files":{"Cargo.toml":"fdba14f9aee05b55ba008685e1d3a9050d14a56251608b23cc0970caa6b9fae4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","build.rs":"29e629057144d1238dcd8ea70ad6cbb6ec14ca742797af3fa9335710ff5cbaaa","src/lib.rs":"7baf09034aafc28f7dbb1550cdde89221e4eb5dfda51b55aeb652ee8710c715d","src/parking_lot.rs":"58125667bd78399e8753b6bd8acef84f180f369f0bc174c573887176bab9f9d3","src/spinwait.rs":"d568d8a81f9144ec4c4a139dc934d7d04ee1656a4a221eb548742fe7aba09ab1","src/thread_parker/generic.rs":"574aecb3c325012b683eca4135441ec73f44c33cc9955aa05db24d7e4c991cd7","src/thread_parker/linux.rs":"4a2c76b3dc09301ceb73d904460f49d91bc1a2492cc123ee26ca22ece3faae79","src/thread_parker/mod.rs":"9c675b7690bbde62e88d946fad218623d423edccff4e01e8e52b116d815c695c","src/thread_parker/redox.rs":"91ca107c4edffa57e87294cadec3b6010b584fb272c044e2557c925dbcb90f6a","src/thread_parker/sgx.rs":"898ced116fb7b0ac077b5977b5bcac610f1d55beffb613ec73e083b1ef09cc28","src/thread_parker/unix.rs":"02a17ad1241e8547cc7ee096318757b01d328354b639d0f799fca66ff2f07439","src/thread_parker/wasm.rs":"903b7eec240cdbe8a23467f6b41d042d93b35755bd1763be02f9cc55756c4aec","src/thread_parker/wasm_atomic.rs":"cf761157803256b18205e747bc99e30b18d5410c27121fa9595e12cb51bb6bef","src/thread_parker/windows/keyed_event.rs":"fc1cf4e592d814c4c949217d91317ec2afb6048430abebb3cea2e8487b369734","src/thread_parker/windows/mod.rs":"c99a3871e69800452a56928a9e870530b7f48a563a4d3efe6184103147899f0c","src/thread_parker/windows/waitaddress.rs":"8e037df2a5692905e2bc2d4ea955295ab92bcc7e26eea0bb7a4eaac9ce657321","src/util.rs":"285e6133150645525f2ca1ece41f6d35bad4e7c5e08b42b20c99d2a97e04a974","src/word_lock.rs":"9ba49082359c35ad5b4e8d219fede1ffca75225f9ccb971cbba01f20e2ed2738"},"package":"d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot_core/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot_core/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot_core/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot_core/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "parking_lot_core"
-version = "0.8.2"
+version = "0.8.5"
 authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
 description = "An advanced API for creating custom synchronization primitives."
 keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
@@ -21,33 +20,33 @@
 license = "Apache-2.0/MIT"
 repository = "https://github.com/Amanieu/parking_lot"
 [dependencies.backtrace]
-version = "0.3.49"
+version = "0.3.60"
 optional = true
 
 [dependencies.cfg-if]
 version = "1.0.0"
 
 [dependencies.instant]
-version = "0.1.4"
+version = "0.1.9"
 
 [dependencies.petgraph]
 version = "0.5.1"
 optional = true
 
 [dependencies.smallvec]
-version = "1.0"
+version = "1.6.1"
 
 [dependencies.thread-id]
-version = "3.3.0"
+version = "4.0.0"
 optional = true
 
 [features]
 deadlock_detection = ["petgraph", "thread-id", "backtrace"]
 nightly = []
 [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
-version = "0.1.56"
+version = "0.2.8"
 [target."cfg(unix)".dependencies.libc]
-version = "0.2.71"
+version = "0.2.95"
 [target."cfg(windows)".dependencies.winapi]
-version = "0.3.8"
+version = "0.3.9"
 features = ["winnt", "ntstatus", "minwindef", "winerror", "winbase", "errhandlingapi", "handleapi"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot_core/src/word_lock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot_core/src/word_lock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/parking_lot_core/src/word_lock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/parking_lot_core/src/word_lock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -154,7 +154,7 @@
                 if let Err(x) = self.state.compare_exchange_weak(
                     state,
                     state.with_queue_head(thread_data),
-                    Ordering::Release,
+                    Ordering::AcqRel,
                     Ordering::Relaxed,
                 ) {
                     return x;
@@ -238,7 +238,7 @@
                 }
 
                 // Need an acquire fence before reading the new queue
-                fence(Ordering::Acquire);
+                fence_acquire(&self.state);
                 continue;
             }
 
@@ -263,7 +263,7 @@
                         continue;
                     } else {
                         // Need an acquire fence before reading the new queue
-                        fence(Ordering::Acquire);
+                        fence_acquire(&self.state);
                         continue 'outer;
                     }
                 }
@@ -286,6 +286,17 @@
     }
 }
 
+// Thread-Sanitizer only has partial fence support, so when running under it, we
+// try and avoid false positives by using a discarded acquire load instead.
+#[inline]
+fn fence_acquire(a: &AtomicUsize) {
+    if cfg!(tsan_enabled) {
+        let _ = a.load(Ordering::Acquire);
+    } else {
+        fence(Ordering::Acquire);
+    }
+}
+
 trait LockState {
     fn is_locked(self) -> bool;
     fn is_queue_locked(self) -> bool;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"621158e4a16393d57395f969fdf6db5f2526ae9b8c3622b7bd2d139634f889e0","Cargo.toml":"52a30d7c18e609b8fce13000e3d80ef83f299bf38bdfd7612577d4f75a21be50","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"9d3e8318795434d8e281effb3a0a29ef15df93d6420fa386b3ea308a74f6b165","README.md":"9a126f1edcea13f6197656e575f00ef7b22e4eadd168b7445b20f91292f56667","examples/pdb2hpp.rs":"81cbe7fc5df56158264a0a70c2e92ed7085d08d6581739a693738367b191198e","examples/pdb_framedata.rs":"c65ec93823ed261331780643a4f6fcfb6fc35891d8012b6e88b3e93d1e9c7c44","examples/pdb_lines.rs":"bdb878a94acbb64365faa067c42b13b03dad51afd785cd1eaf438413f77a7037","examples/pdb_symbols.rs":"9313de81230560fddfd16bb10a0c5d3bc18d8a569281d0855a6a1d35dca2c7f0","examples/stream_names.rs":"fbe22c71217873ed960b463579bffb8f990a274e39b19d0080bb5faf402d0fd1","src/common.rs":"ce4e1dba089fbf411dc72ed606352d36340dfb9ccc09bbf8b2f5a5d83fb74ab4","src/dbi.rs":"895d67b757dcd85c3afe65bb5f11bae3c0957257616d0b1edbc1476c9d38cd90","src/framedata.rs":"a93c68032540c1067eb6a5ac6f0f079d3576e02186aaa113dd9d974b1b6ad44d","src/lib.rs":"2ec5222e7f5e8de581bbea1fd09e35bbc4553ebd25712b6ec80a050fc367d695","src/modi/c13.rs":"06fd4c95e7163030787d6394a1b750b1717e1aa42238d6a2c226a3bf471d55db","src/modi/constants.rs":"b27154e49ed47ca7dd435e90ff108975ff4c829cd3e97841b43493b1d25b52ba","src/modi/mod.rs":"5c5dd11b86064bef2e4f87f259c69e60316d8849abe2097c1f6ab3d541a7b855","src/msf/mod.rs":"5d4234000599a33ffb74ca8150a700abaf368ef2c59d6ed00dae616c438b3fbf","src/msf/page_list.rs":"d101ec36717928e77a64c7438151d66d59e69e873a399a91c5689e31ca87b161","src/omap.rs":"fa6708eb526603842d0947ed2e6ce2fd0e6f575a619f136cf656c846c1832fc1","src/pdb.rs":"e2091888774b5ab3fada4e868200620002cc537fe526841c0c4edfb4372b8e69","src/pdbi.rs":"b6efd7b3ba5851ab88f38bb8b86505fd13ca6de73ee8b18f6d3c17b168ec9dbd","src/pe.rs":"90a48f5105ce129c56d9a68f1fe0e77974f761de71d21685e3dd8d3de9a73e73","src/source.rs":"f7f24edcca0cf905831821c4663aa817c8d378e8c2aef0c1c12e1e0ac04e8210","src/strings.rs":"8ca3e3991708c540a7f3569b191479ce1fba4779f884b1476a66f242b4463f82","src/symbol/annotations.rs":"53cd7305d5898e3aa684c30e660b678fd77eb330d7b49c8352ea7a8b53a1aeac","src/symbol/constants.rs":"966e140c4d98c8989b7e4bbef5449b35c840a86bc1e28e51cd51337b78c2ed5b","src/symbol/mod.rs":"212f3fe7830e771a563acd614bb23e3f8336e3910e1c7f584294e8bf7dc67efd","src/tpi/constants.rs":"035b9dfda903b5dc6a9436125dba6a39ce2d91579b23ecfe71578fa06ab75339","src/tpi/data.rs":"66bc587f6058f53d2fef9ed005c10f6ad93d156ff23aa9f4b685fe2386bd9918","src/tpi/header.rs":"b12c6b54321990eed16909d8f746db2e91ab928f23ac6be2979e7a8c4ddeb1c9","src/tpi/id.rs":"11cf209ca502f291dcbde9ad44fe4aefe6e1b87bf1ac6c94dde48d7214e019eb","src/tpi/mod.rs":"33257755ac39d20f221b9af422739fc59000534ac89bdbb6691269079fa87f66","src/tpi/primitive.rs":"91d15b8227c291f85b470d916b1af11ae0254ced3b554b1abf422096c9ca6690","tests/debug_information.rs":"a7e4320e4fcb4e17ac06c0788c2ef7a334a3e4fe1cc2a98c322941316af2ec7f","tests/id_information.rs":"4de0bb7a6e5fb11daa628729af00b28d3fbe0f59d53f94b6db84f1fa27b63083","tests/modi_symbol_depth.rs":"31b7e0b8db0a0ccd603c841131d488739b3911d83dc8e27609ecde27c9b08b53","tests/omap_address_translation.rs":"aa3b274e9a4b69c41f485bcec4157120a1b384952a7e505723a2e1c63d2cbff1","tests/pdb_information.rs":"3215b16efb0f7d936e0a2df3a17dc2dd8c056263984e3c602b59452a8c77af88","tests/pdb_lines.rs":"966941a57784b563fe91bcd62dae0671749d077c92eaf94cc36766d7088e6cfe","tests/symbol_table.rs":"15e9f01a9f80be3911621677914f5937c3f80bbdb7700b471532513a6cc7c264","tests/type_information.rs":"3592633b3a04a8bbf441c23df146f1d75fbe59e7e5a8cc82baea273e9a729807"},"package":"b66be5fcea88b52962d3d6fcc5194f1d77666f5aca256926688743a8de1152e4"}
\ No newline at end of file
+{"files":{"Cargo.lock":"dcd4132f47f2640892a43086ad8d686ecd5e97dd6dc80eb290af4299abf8ee6f","Cargo.toml":"901fe54273284cb2899f9119d4fdabb60b17cebf8c956002c3425ce7386650cf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"9d3e8318795434d8e281effb3a0a29ef15df93d6420fa386b3ea308a74f6b165","README.md":"6e0a2def032795a9878b7fddcf0dcdfd330e7e0926b4c62560ec798acb567dbe","examples/pdb2hpp.rs":"6fa533ce2b878b1b897ccbce16745395787b64f9105c5b895a798e0701d5ae07","examples/pdb_framedata.rs":"c65ec93823ed261331780643a4f6fcfb6fc35891d8012b6e88b3e93d1e9c7c44","examples/pdb_lines.rs":"bdb878a94acbb64365faa067c42b13b03dad51afd785cd1eaf438413f77a7037","examples/pdb_symbols.rs":"9313de81230560fddfd16bb10a0c5d3bc18d8a569281d0855a6a1d35dca2c7f0","examples/stream_names.rs":"fbe22c71217873ed960b463579bffb8f990a274e39b19d0080bb5faf402d0fd1","src/common.rs":"7360faddf5eb27288dbedf319759315672ef915fcb302b7265e19aa10c22f11a","src/dbi.rs":"0b48d0643c294855100002e9613d3b15173249fce0196c81c40dc756dfda3383","src/framedata.rs":"629556120b4cd37162fa25be20d70ca18caff51842fb35843eb9679ae1a23b28","src/lib.rs":"651101e1c1fb98177cc1990ee25f54e281b52c846f9f25fbef8119627fb0feb3","src/modi/c13.rs":"2871b76e07863a7cb8a09dad32f9cee1d11407ebda03304f18c4148ee05bf49b","src/modi/constants.rs":"b27154e49ed47ca7dd435e90ff108975ff4c829cd3e97841b43493b1d25b52ba","src/modi/mod.rs":"b6ebb30416622281fe25c1977600e25fe175a2cb219b47e06ea1e7a4b743601d","src/msf/mod.rs":"441e46e662a2e4a08a7acbabc4077cf299393294cbd523bef1389aa4ef10bbe0","src/msf/page_list.rs":"ba8a8657b386f8f1a7165fc58cbb3d687e5b20ecc73a24b5899f681c24c77c18","src/omap.rs":"9b2c996eb96e821cbb89e6ae75d525c2044a9313e6c57e741c3bcc9ec9e943a2","src/pdb.rs":"d5e8ea23ad70a517bc130d799b472579abab7cb342cd030a3bf85cca610723c2","src/pdbi.rs":"b222d3e773e1087a357d528ff31548fd21472fc8830eb4f4b34b2a5f3008f002","src/pe.rs":"48fe875623743ad1433fc1f7830598c61fac1c2a5aa5653345635fa5ebc8c461","src/source.rs":"84d975e5edf6be17992116ba174056075eb9b600b6607779d381f838bbcc9679","src/strings.rs":"ee74b3301eb512563460cadc2e7e13ac7ebfb96548cf79aed35d52a26c2b9e3d","src/symbol/annotations.rs":"a98ac59b726a47a94665ae749c4d9c73beb6cf91029b0ddbaa149ef5e09955ac","src/symbol/constants.rs":"1eae805132bb1a681430b85f3ec695e353705859a033a6069ffa8c71d7c01249","src/symbol/mod.rs":"189dd6de8d7944d783dcd705b407e0c9c5c88a89c3e87882aaf4ab4b7f4a6dc3","src/tpi/constants.rs":"1d718bca5f39fd0a35be210b84e23e91d12fb94506b67f2ccd95d88ca2d99861","src/tpi/data.rs":"c6393b00d40706ecfbda9c4e9d60bafbf76864e81677490e4db5b48aa7aa0051","src/tpi/header.rs":"b12c6b54321990eed16909d8f746db2e91ab928f23ac6be2979e7a8c4ddeb1c9","src/tpi/id.rs":"5e664b8cb91fc51228579ec701009fb39470e0def35e07624bd03aea2f5ec8cd","src/tpi/mod.rs":"9ea941918e413e778f502e6f1d82776b9aba16a23fc1e2294ba6e4c84aebc2f5","src/tpi/primitive.rs":"105fc7ab69317980a0a568e3b909aac5859c179e65e673686b7794885a93bce9","tests/debug_information.rs":"a7e4320e4fcb4e17ac06c0788c2ef7a334a3e4fe1cc2a98c322941316af2ec7f","tests/id_information.rs":"4de0bb7a6e5fb11daa628729af00b28d3fbe0f59d53f94b6db84f1fa27b63083","tests/modi_symbol_depth.rs":"31b7e0b8db0a0ccd603c841131d488739b3911d83dc8e27609ecde27c9b08b53","tests/omap_address_translation.rs":"53e107f5fddc0fd743f4b9ed570ee3ace0deec1f92d00c173462a2d07fd0544f","tests/pdb_information.rs":"3215b16efb0f7d936e0a2df3a17dc2dd8c056263984e3c602b59452a8c77af88","tests/pdb_lines.rs":"966941a57784b563fe91bcd62dae0671749d077c92eaf94cc36766d7088e6cfe","tests/symbol_table.rs":"075630350d28235f18a17f6d1a94a18565c9d4390d0567c25ac72c98f97fa96e","tests/type_information.rs":"44cfcfbfdd314a7dc49adc94cae1c85f440a8630f850edac13a4505ffa1d56eb"},"package":"13f4d162ecaaa1467de5afbe62d597757b674b51da8bb4e587430c5fdb2af7aa"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -4,1230 +4,1228 @@
 name = "MacTypes-sys"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f"
 dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "adler32"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
 
 [[package]]
 name = "arrayvec"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 dependencies = [
- "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nodrop",
 ]
 
 [[package]]
 name = "autocfg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
 
 [[package]]
 name = "base64"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder",
 ]
 
 [[package]]
 name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 
 [[package]]
 name = "byteorder"
 version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
 
 [[package]]
 name = "bytes"
 version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder",
+ "iovec",
 ]
 
 [[package]]
 name = "cc"
 version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e"
 
 [[package]]
 name = "cfg-if"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
 ]
 
 [[package]]
 name = "core-foundation"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980"
 dependencies = [
- "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys",
+ "libc",
 ]
 
 [[package]]
 name = "core-foundation-sys"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa"
 dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "crc32fast"
 version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
+ "parking_lot",
 ]
 
 [[package]]
 name = "crossbeam-channel"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
 dependencies = [
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils",
+ "smallvec",
 ]
 
 [[package]]
 name = "crossbeam-deque"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 dependencies = [
- "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
 dependencies = [
- "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec",
+ "cfg-if",
+ "crossbeam-utils",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "lazy_static",
 ]
 
 [[package]]
 name = "dtoa"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
 
 [[package]]
 name = "encoding_rs"
 version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fnv"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "foreign-types-shared",
 ]
 
 [[package]]
 name = "foreign-types-shared"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "fuchsia-zircon-sys",
 ]
 
 [[package]]
 name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "futures"
 version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
 
 [[package]]
 name = "futures-cpupool"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures",
+ "num_cpus",
 ]
 
 [[package]]
 name = "getopts"
 version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
 dependencies = [
- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width",
 ]
 
 [[package]]
 name = "h2"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddb2b25a33e231484694267af28fec74ac63b5ccf51ee2065a5e313b834d836e"
 dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder",
+ "bytes",
+ "fnv",
+ "futures",
+ "http",
+ "indexmap",
+ "log",
+ "slab",
+ "string",
+ "tokio-io",
 ]
 
 [[package]]
 name = "http"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe67e3678f2827030e89cc4b9e7ecd16d52f132c0b940ab5005f88e821500f6a"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "fnv",
+ "itoa",
 ]
 
 [[package]]
 name = "httparse"
 version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
 
 [[package]]
 name = "hyper"
 version = "0.12.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdfa9b401ef6c4229745bb6e9b2529192d07b920eed624cdee2a82348cd550af"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "futures",
+ "futures-cpupool",
+ "h2",
+ "http",
+ "httparse",
+ "iovec",
+ "itoa",
+ "log",
+ "net2",
+ "time",
+ "tokio",
+ "tokio-executor",
+ "tokio-io",
+ "tokio-reactor",
+ "tokio-tcp",
+ "tokio-threadpool",
+ "tokio-timer",
+ "want",
 ]
 
 [[package]]
 name = "hyper-tls"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32cd73f14ad370d3b4d4b7dce08f69b81536c82e39fcc89731930fe5788cd661"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "futures",
+ "hyper",
+ "native-tls",
+ "tokio-io",
 ]
 
 [[package]]
 name = "idna"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
 name = "indexmap"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 
 [[package]]
 name = "iovec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "winapi 0.2.8",
 ]
 
 [[package]]
 name = "itoa"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8",
+ "winapi-build",
 ]
 
 [[package]]
 name = "lazy_static"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 
 [[package]]
 name = "lazycell"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "libc"
 version = "0.2.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e"
 
 [[package]]
 name = "libflate"
 version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54d1ddf9c52870243c5689d7638d888331c1116aa5b398f3ba1acfa7d8758ca1"
 dependencies = [
- "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "adler32",
+ "byteorder",
+ "crc32fast",
 ]
 
 [[package]]
 name = "lock_api"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 dependencies = [
- "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "owning_ref",
+ "scopeguard",
 ]
 
 [[package]]
 name = "log"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "matches"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "memoffset"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
 
 [[package]]
 name = "mime"
 version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
 dependencies = [
- "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.2.0",
 ]
 
 [[package]]
 name = "mime_guess"
 version = "2.0.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
 dependencies = [
- "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime",
+ "phf",
+ "phf_codegen",
+ "unicase 1.4.2",
 ]
 
 [[package]]
 name = "mio"
 version = "0.6.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
 dependencies = [
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon",
+ "fuchsia-zircon-sys",
+ "iovec",
+ "kernel32-sys",
+ "lazycell",
+ "libc",
+ "log",
+ "miow",
+ "net2",
+ "slab",
+ "winapi 0.2.8",
 ]
 
 [[package]]
 name = "miow"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys",
+ "net2",
+ "winapi 0.2.8",
+ "ws2_32-sys",
 ]
 
 [[package]]
 name = "native-tls"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2"
 dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.10.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
 ]
 
 [[package]]
 name = "net2"
 version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "nodrop"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 
 [[package]]
 name = "num_cpus"
 version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
 dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "openssl"
 version = "0.10.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b90119d71b0a3596588da04bf7c2c42f2978cfa1217a94119d8ec9e963c7729c"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "lazy_static",
+ "libc",
+ "openssl-sys",
 ]
 
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 
 [[package]]
 name = "openssl-sys"
 version = "0.9.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4c77cdd67d31759b22aa72cfda3c65c12348f9e6c5420946b403c022fd0311a"
 dependencies = [
- "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
 ]
 
 [[package]]
 name = "owning_ref"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 dependencies = [
- "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stable_deref_trait",
 ]
 
 [[package]]
 name = "parking_lot"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 dependencies = [
- "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api",
+ "parking_lot_core",
 ]
 
 [[package]]
 name = "parking_lot_core"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
 dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "rand",
+ "rustc_version",
+ "smallvec",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "pdb"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
- "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fallible-iterator",
+ "getopts",
+ "reqwest",
+ "scroll",
+ "uuid 0.8.1",
 ]
 
 [[package]]
 name = "percent-encoding"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 
 [[package]]
 name = "phf"
 version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
 dependencies = [
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared",
 ]
 
 [[package]]
 name = "phf_codegen"
 version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 dependencies = [
- "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_generator",
+ "phf_shared",
 ]
 
 [[package]]
 name = "phf_generator"
 version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 dependencies = [
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared",
+ "rand",
 ]
 
 [[package]]
 name = "phf_shared"
 version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 dependencies = [
- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "siphasher",
+ "unicase 1.4.2",
 ]
 
 [[package]]
 name = "pkg-config"
 version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
 
 [[package]]
 name = "rand"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 dependencies = [
- "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "libc",
+ "rand_chacha",
+ "rand_core 0.4.0",
+ "rand_hc",
+ "rand_isaac",
+ "rand_jitter",
+ "rand_os",
+ "rand_pcg",
+ "rand_xorshift",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "rand_chacha"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 dependencies = [
- "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "rand_core"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 dependencies = [
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0",
 ]
 
 [[package]]
 name = "rand_core"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
 
 [[package]]
 name = "rand_hc"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "rand_jitter"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832"
 dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "rand_core 0.4.0",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "rand_os"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d"
 dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.4.0",
+ "rdrand",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "rand_pcg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 dependencies = [
- "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "rand_core 0.4.0",
 ]
 
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "rdrand"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "redox_syscall"
 version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85"
 
 [[package]]
 name = "remove_dir_all"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "reqwest"
 version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f205a95638627fc0d21c53901671b06f439dc2830311ff11ecdff34ae2d839a8"
 dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper-tls 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libflate 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures",
+ "http",
+ "hyper",
+ "hyper-tls",
+ "libflate",
+ "log",
+ "mime",
+ "mime_guess",
+ "native-tls",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-executor",
+ "tokio-io",
+ "tokio-threadpool",
+ "tokio-timer",
+ "url",
+ "uuid 0.7.2",
 ]
 
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver",
 ]
 
 [[package]]
 name = "ryu"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 
 [[package]]
 name = "schannel"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339"
 dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 
 [[package]]
 name = "scroll"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
 
 [[package]]
 name = "security-framework"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfab8dda0e7a327c696d893df9ffa19cadc4bd195797997f5223cf5831beaf05"
 dependencies = [
- "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc"
 dependencies = [
- "MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
+ "MacTypes-sys",
+ "core-foundation-sys",
+ "libc",
 ]
 
 [[package]]
 name = "semver"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver-parser",
 ]
 
 [[package]]
 name = "semver-parser"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
 version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
 
 [[package]]
 name = "serde_json"
 version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
 dependencies = [
- "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa",
+ "ryu",
+ "serde",
 ]
 
 [[package]]
 name = "serde_urlencoded"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
 dependencies = [
- "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa",
+ "itoa",
+ "serde",
+ "url",
 ]
 
 [[package]]
 name = "siphasher"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 
 [[package]]
 name = "slab"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
 version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
 
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 
 [[package]]
 name = "string"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
 
 [[package]]
 name = "tempfile"
 version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "rand",
+ "redox_syscall",
+ "remove_dir_all",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "redox_syscall",
+ "winapi 0.3.6",
 ]
 
 [[package]]
 name = "tokio"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0500b88064f08bebddd0c0bed39e19f5c567a5f30975bee52b0c0d3e2eeb38c"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "futures",
+ "mio",
+ "num_cpus",
+ "tokio-current-thread",
+ "tokio-executor",
+ "tokio-io",
+ "tokio-reactor",
+ "tokio-threadpool",
+ "tokio-timer",
 ]
 
 [[package]]
 name = "tokio-current-thread"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures",
+ "tokio-executor",
 ]
 
 [[package]]
 name = "tokio-executor"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
 dependencies = [
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils",
+ "futures",
 ]
 
 [[package]]
 name = "tokio-io"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "futures",
+ "log",
 ]
 
 [[package]]
 name = "tokio-reactor"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
 dependencies = [
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils",
+ "futures",
+ "lazy_static",
+ "log",
+ "mio",
+ "num_cpus",
+ "parking_lot",
+ "slab",
+ "tokio-executor",
+ "tokio-io",
 ]
 
 [[package]]
 name = "tokio-tcp"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes",
+ "futures",
+ "iovec",
+ "mio",
+ "tokio-io",
+ "tokio-reactor",
 ]
 
 [[package]]
 name = "tokio-threadpool"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fd86cb15547d02daa2b21aadaf4e37dee3368df38a526178a5afa3c034d2fb"
 dependencies = [
- "crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "futures",
+ "log",
+ "num_cpus",
+ "rand",
+ "slab",
+ "tokio-executor",
 ]
 
 [[package]]
 name = "tokio-timer"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2910970404ba6fa78c5539126a9ae2045d62e3713041e447f695f41405a120c6"
 dependencies = [
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils",
+ "futures",
+ "slab",
+ "tokio-executor",
 ]
 
 [[package]]
 name = "try-lock"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 
 [[package]]
 name = "unicase"
 version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 dependencies = [
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check",
 ]
 
 [[package]]
 name = "unicase"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
 dependencies = [
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check",
 ]
 
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches",
 ]
 
 [[package]]
 name = "unicode-normalization"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
 dependencies = [
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec",
 ]
 
 [[package]]
 name = "unicode-width"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
 
 [[package]]
 name = "url"
 version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 dependencies = [
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna",
+ "matches",
+ "percent-encoding",
 ]
 
 [[package]]
 name = "uuid"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
 dependencies = [
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand",
 ]
 
 [[package]]
 name = "uuid"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
 
 [[package]]
 name = "vcpkg"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d"
 
 [[package]]
 name = "version_check"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 
 [[package]]
 name = "want"
 version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "797464475f30ddb8830cc529aaaae648d581f99e2036a928877dfde027ddf6b3"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures",
+ "log",
+ "try-lock",
 ]
 
 [[package]]
 name = "winapi"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 
 [[package]]
 name = "winapi"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
 dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
 name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8",
+ "winapi-build",
 ]
-
-[metadata]
-"checksum MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f"
-"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
-"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
-"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
-"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
-"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
-"checksum cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e"
-"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980"
-"checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa"
-"checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
-"checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
-"checksum crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
-"checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
-"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
-"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
-"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
-"checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed"
-"checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
-"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
-"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-"checksum h2 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ddb2b25a33e231484694267af28fec74ac63b5ccf51ee2065a5e313b834d836e"
-"checksum http 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "fe67e3678f2827030e89cc4b9e7ecd16d52f132c0b940ab5005f88e821500f6a"
-"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
-"checksum hyper 0.12.24 (registry+https://github.com/rust-lang/crates.io-index)" = "fdfa9b401ef6c4229745bb6e9b2529192d07b920eed624cdee2a82348cd550af"
-"checksum hyper-tls 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "32cd73f14ad370d3b4d4b7dce08f69b81536c82e39fcc89731930fe5788cd661"
-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
-"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
-"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
-"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)" = "413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e"
-"checksum libflate 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "54d1ddf9c52870243c5689d7638d888331c1116aa5b398f3ba1acfa7d8758ca1"
-"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
-"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
-"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
-"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
-"checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
-"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2"
-"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
-"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
-"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
-"checksum openssl 0.10.18 (registry+https://github.com/rust-lang/crates.io-index)" = "b90119d71b0a3596588da04bf7c2c42f2978cfa1217a94119d8ec9e963c7729c"
-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-"checksum openssl-sys 0.9.41 (registry+https://github.com/rust-lang/crates.io-index)" = "e4c77cdd67d31759b22aa72cfda3c65c12348f9e6c5420946b403c022fd0311a"
-"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
-"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
-"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
-"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
-"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832"
-"checksum rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d"
-"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85"
-"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
-"checksum reqwest 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f205a95638627fc0d21c53901671b06f439dc2830311ff11ecdff34ae2d839a8"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
-"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339"
-"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-"checksum scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
-"checksum security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfab8dda0e7a327c696d893df9ffa19cadc4bd195797997f5223cf5831beaf05"
-"checksum security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
-"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
-"checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
-"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
-"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-"checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
-"checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a"
-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "e0500b88064f08bebddd0c0bed39e19f5c567a5f30975bee52b0c0d3e2eeb38c"
-"checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
-"checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
-"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
-"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
-"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-"checksum tokio-threadpool 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c3fd86cb15547d02daa2b21aadaf4e37dee3368df38a526178a5afa3c034d2fb"
-"checksum tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2910970404ba6fa78c5539126a9ae2045d62e3713041e447f695f41405a120c6"
-"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
-"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
-"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
-"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-"checksum uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
-"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
-"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d"
-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "797464475f30ddb8830cc529aaaae648d581f99e2036a928877dfde027ddf6b3"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "pdb"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Jan Michael Auer <mail@jauer.org>", "Will Glynn <will@willglynn.com>"]
 exclude = ["fixtures/*"]
 description = "A parser for Microsoft PDB (Program Database) debugging information"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/examples/pdb2hpp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/examples/pdb2hpp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/examples/pdb2hpp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/examples/pdb2hpp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -108,6 +108,7 @@
 }
 
 impl<'p> Class<'p> {
+    #[allow(clippy::unnecessary_wraps)]
     fn add_derived_from(
         &mut self,
         _: &pdb::TypeFinder<'p>,
@@ -392,7 +393,7 @@
         match type_finder.find(type_index)?.parse()? {
             pdb::TypeData::FieldList(data) => {
                 for field in &data.fields {
-                    self.add_field(type_finder, field, needed_types)?;
+                    self.add_field(type_finder, field, needed_types);
                 }
 
                 if let Some(continuation) = data.continuation {
@@ -412,12 +413,7 @@
         Ok(())
     }
 
-    fn add_field(
-        &mut self,
-        _: &pdb::TypeFinder<'p>,
-        field: &pdb::TypeData<'p>,
-        _: &mut TypeSet,
-    ) -> pdb::Result<()> {
+    fn add_field(&mut self, _: &pdb::TypeFinder<'p>, field: &pdb::TypeData<'p>, _: &mut TypeSet) {
         // ignore everything else even though that's sad
         if let pdb::TypeData::Enumerate(ref data) = field {
             self.values.push(EnumValue {
@@ -425,8 +421,6 @@
                 value: data.value,
             });
         }
-
-        Ok(())
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -32,28 +32,30 @@
 Usage Example
 ---
 
-```
-extern crate pdb;
-
+```rust
 use pdb::FallibleIterator;
 use std::fs::File;
 
-fn main() {
-    let file = std::fs::File::open("fixtures/self/foo.pdb")?;
+fn main() -> pdb::Result<()> {
+    let file = File::open("fixtures/self/foo.pdb")?;
     let mut pdb = pdb::PDB::open(file)?;
-    
+
     let symbol_table = pdb.global_symbols()?;
-    
+    let address_map = pdb.address_map()?;
+
     let mut symbols = symbol_table.iter();
     while let Some(symbol) = symbols.next()? {
         match symbol.parse() {
-            Ok(pdb::SymbolData::PublicSymbol{function: true, segment, offset, ..}) => {
-                // we found the location of a function
-                println!("{:x}:{:08x} is {}", segment, offset, symbol.name()?);
+            Ok(pdb::SymbolData::Public(data)) if data.function => {
+                // we found the location of a function!
+                let rva = data.offset.to_rva(&address_map).unwrap_or_default
+                println!("{} is {}", rva, data.name);
             }
             _ => {}
         }
     }
+
+    Ok(())
 }
 ```
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/common.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/common.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,6 +19,7 @@
 use crate::tpi::constants;
 
 /// An error that occurred while reading or parsing the PDB.
+#[non_exhaustive]
 #[derive(Debug)]
 pub enum Error {
     /// The input data was not recognized as a MSF (PDB) file.
@@ -375,10 +376,7 @@
 ///
 /// An internal RVA points into the PDB internal address space and may not correspond to RVAs of the
 /// executable. It can be converted into an actual [`Rva`] suitable for debugging purposes using
-/// [`rva`].
-///
-/// [`Rva`]: struct.Rva.html
-/// [`rva`]: struct.PdbInternalRva.html#method.rva
+/// [`to_rva`](Self::to_rva).
 #[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct PdbInternalRva(pub u32);
 
@@ -479,9 +477,7 @@
 ///
 /// This offset can be converted to an `Rva` to receive the address relative to the entire image.
 /// Note that this offset applies to the actual PE headers. The PDB debug information actually
-/// stores [`PdbInternalSectionOffsets`].
-///
-/// [`PdbInternalSectionOffsets`]: struct.PdbInternalSectionOffset.html
+/// stores [`PdbInternalSectionOffset`]s.
 #[derive(Clone, Copy, Default, Eq, Hash, PartialEq)]
 pub struct SectionOffset {
     /// The memory offset relative from the start of the section's memory.
@@ -499,14 +495,11 @@
 /// For optimized Microsoft binaries, this offset points to a virtual address space before the
 /// rearrangement of sections has been performed. This kind of offset is usually stored in PDB debug
 /// information. It can be converted to an RVA in the transformed address space of the optimized
-/// binary using [`rva`]. Likewise, there is a conversion to [`SectionOffset`] in the actual address
+/// binary using [`to_rva`](PdbInternalSectionOffset::to_rva). Likewise, there is a conversion to [`SectionOffset`] in the actual address
 /// space.
 ///
 /// For binaries and their PDBs that have not been optimized, both address spaces are equal and the
 /// offsets are interchangeable. The conversion operations are cheap no-ops in this case.
-///
-/// [`rva`]: struct.PdbInternalSectionOffset.html#method.rva
-/// [`SectionOffset`]: struct.SectionOffset.html
 #[derive(Clone, Copy, Default, Eq, Hash, PartialEq)]
 pub struct PdbInternalSectionOffset {
     /// The memory offset relative from the start of the section's memory.
@@ -534,13 +527,10 @@
 
 /// Index of a PDB stream.
 ///
-/// This index can either refer to a stream, or indicate the absence of a stream. Check [`is_none`]
-/// to see whether a stream should exist.
-///
-/// Use [`StreamIndex::get`] to load data for this stream.
+/// This index can either refer to a stream, or indicate the absence of a stream. Check
+/// [`is_none`](Self::is_none) to see whether a stream should exist.
 ///
-/// [`is_none`]: struct.StreamIndex.html#method.is_none
-/// [`StreamIndex::get`]: struct.StreamIndex.html#method.get
+/// Use [`get`](Self::get) to load data for this stream.
 #[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct StreamIndex(pub u16);
 
@@ -556,7 +546,7 @@
 }
 
 impl fmt::Display for StreamIndex {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.msf_number() {
             Some(number) => write!(f, "{}", number),
             None => write!(f, "None"),
@@ -565,7 +555,7 @@
 }
 
 impl fmt::Debug for StreamIndex {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "StreamIndex({})", self)
     }
 }
@@ -573,10 +563,8 @@
 impl_opt!(StreamIndex, 0xffff);
 impl_pread!(StreamIndex);
 
-/// An index into either the [`TypeInformation`] or [`IdInformation`] stream.
-///
-/// [`TypeInformation`]: type.TypeInformation.html
-/// [`IdInformation`]: type.IdInformation.html
+/// An index into either the [`TypeInformation`](crate::TypeInformation) or
+/// [`IdInformation`](crate::IdInformation) stream.
 pub trait ItemIndex:
     Copy + Default + fmt::Debug + fmt::Display + PartialEq + PartialOrd + From<u32> + Into<u32>
 {
@@ -586,33 +574,26 @@
     /// cases, a lookup in the global streams will not succeed. Instead, the import must be resolved
     /// using cross module references:
     ///
-    ///  1. Look up the index in [`CrossModuleImports`] of the current module.
-    ///  2. Use [`StringTable`] to resolve the name of the referenced module.
-    ///  3. Find the [`Module`] with the same module name and load its [`ModuleInfo`].
-    ///  4. Resolve the [`Local`] index into a global one using [`CrossModuleExports`].
+    ///  1. Look up the index in [`CrossModuleImports`](crate::CrossModuleImports) of the current
+    ///     module.
+    ///  2. Use [`StringTable`](crate::StringTable) to resolve the name of the referenced module.
+    ///  3. Find the [`Module`](crate::Module) with the same module name and load its
+    ///     [`ModuleInfo`](crate::ModuleInfo).
+    ///  4. Resolve the [`Local`](crate::Local) index into a global one using
+    ///     [`CrossModuleExports`](crate::CrossModuleExports).
     ///
     /// Cross module references are specially formatted indexes with the most significant bit set to
     /// `1`. The remaining bits are divided into a module and index offset into the
-    /// [`CrossModuleImports`] section.
-    ///
-    /// [`CrossModuleExports`]: struct.CrossModuleExports.html
-    /// [`CrossModuleImports`]: struct.CrossModuleImports.html
-    /// [`Local`]: struct.Local.html
-    /// [`Module`]: struct.Module.html
-    /// [`ModuleInfo`]: struct.ModuleInfo.html
-    /// [`StringTable`]: struct.StringTable.html
+    /// [`CrossModuleImports`](crate::CrossModuleImports) section.
     fn is_cross_module(self) -> bool {
         (self.into() & 0x8000_0000) != 0
     }
 }
 
-/// Index of a [`Type`] in the [`TypeInformation`] stream.
+/// Index of [`TypeData`](crate::TypeData) in the [`TypeInformation`](crate::TypeInformation) stream.
 ///
-/// If this index is a [cross module reference], it must be resolved before lookup in the stream.
-///
-/// [`Type`]: type.Type.html
-/// [`TypeInformation`]: type.TypeInformation.html
-/// [cross module reference]: trait.ItemIndex.html#method.is_cross_module
+/// If this index is a [cross module reference](ItemIndex::is_cross_module), it must be resolved
+/// before lookup in the stream.
 #[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct TypeIndex(pub u32);
 
@@ -622,13 +603,10 @@
 
 impl ItemIndex for TypeIndex {}
 
-/// Index of an [`Id`] in [`IdInformation`] stream.
-///
-/// If this index is a [cross module reference], it must be resolved before lookup in the stream.
+/// Index of an [`Id`](crate::Id) in [`IdInformation`](crate::IdInformation) stream.
 ///
-/// [`Id`]: type.Id.html
-/// [`IdInformation`]: type.IdInformation.html
-/// [cross module reference]: trait.ItemIndex.html#method.is_cross_module
+/// If this index is a [cross module reference](ItemIndex::is_cross_module), it must be resolved
+/// before lookup in the stream.
 #[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct IdIndex(pub u32);
 
@@ -640,18 +618,13 @@
 
 /// An [`ItemIndex`] that is local to a module.
 ///
-/// This index is usually part of a [`CrossModuleRef`]. It cannot be used to query the
-/// [`TypeInformation`] or [`IdInformation`] streams directly. Instead, it must be looked up in the
-/// [`CrossModuleImports`] of the module it belongs to in order to obtain the global index.
+/// This index is usually part of a [`CrossModuleRef`](crate::CrossModuleRef). It cannot be used to
+/// query the [`TypeInformation`](crate::TypeInformation) or [`IdInformation`](crate::IdInformation)
+/// streams directly. Instead, it must be looked up in the
+/// [`CrossModuleImports`](crate::CrossModuleImports) of the module it belongs to in order to obtain
+/// the global index.
 ///
 /// See [`ItemIndex::is_cross_module`] for more information.
-///
-/// [`ItemIndex`]: trait.ItemIndex.html
-/// [`CrossModuleImports`]: struct.CrossModuleImports.html
-/// [`CrossModuleRef`]: struct.CrossModuleRef.html
-/// [`TypeInformation`]: type.TypeInformation.html
-/// [`IdInformation`]: type.IdInformation.html
-/// [`ItemIndex::is_cross_module`]: trait.ItemIndex.html#method.is_cross_module
 #[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct Local<I: ItemIndex>(pub I);
 
@@ -667,11 +640,8 @@
 /// A reference to a string in the string table.
 ///
 /// This type stores an offset into the global string table of the PDB. To retrieve the string
-/// value, use [`to_raw_string`], [`to_string_lossy`] or methods on [`StringTable`].
-///
-/// [`to_raw_string`]: struct.StringRef.html#method.to_raw_string
-/// [`to_string_lossy`]: struct.StringRef.html#method.to_string_lossy
-/// [`StringTable`]: struct.StringTable.html
+/// value, use [`to_raw_string`](Self::to_raw_string), [`to_string_lossy`](Self::to_string_lossy) or
+/// methods on [`StringTable`](crate::StringTable).
 #[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct StringRef(pub u32);
 
@@ -681,9 +651,7 @@
 
 /// Index of a file entry in the module.
 ///
-/// Use the [`LineProgram`] to resolve information on the file from this offset.
-///
-/// [`LineProgram`]: struct.LineProgram.html
+/// Use the [`LineProgram`](crate::LineProgram) to resolve information on the file from this offset.
 #[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct FileIndex(pub u32);
 
@@ -693,11 +661,9 @@
 
 /// A reference into the symbol table of a module.
 ///
-/// To retrieve the symbol referenced by this index, use [`ModuleInfo::symbols_at`]. When iterating,
-/// use [`SymbolIter::seek`] to jump between symbols.
-///
-/// [`ModuleInfo::symbols_at`]: struct.ModuleInfo.html#method.symbols_at
-/// [`SymbolIter::seek`]: struct.SymbolIter.html#method.seek
+/// To retrieve the symbol referenced by this index, use
+/// [`ModuleInfo::symbols_at`](crate::ModuleInfo::symbols_at). When iterating, use
+/// [`SymbolIter::seek`](crate::SymbolIter::seek) to jump between symbols.
 #[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct SymbolIndex(pub u32);
 
@@ -890,7 +856,7 @@
 }
 
 impl fmt::Display for Variant {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             Variant::U8(value) => write!(f, "{}", value),
             Variant::U16(value) => write!(f, "{}", value),
@@ -966,10 +932,9 @@
 
     /// Returns a UTF-8 `String`, substituting in replacement characters as needed.
     ///
-    /// This uses [`String::from_utf8_lossy()`](https://doc.rust-lang.org/std/string/struct.String.html#method.from_utf8_lossy)
-    /// and thus avoids copying in cases where the original string was valid UTF-8. This is the
-    /// expected case for strings that appear in PDB files, since they are almost always composed of
-    /// printable 7-bit ASCII characters.
+    /// This uses [`String::from_utf8_lossy`] and thus avoids copying in cases where the original
+    /// string was valid UTF-8. This is the expected case for strings that appear in PDB files,
+    /// since they are almost always composed of printable 7-bit ASCII characters.
     #[inline]
     pub fn to_string(&self) -> Cow<'b, str> {
         String::from_utf8_lossy(self.0)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/dbi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/dbi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/dbi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/dbi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -73,14 +73,14 @@
 
     /// Returns this PDB's original `age`.
     ///
-    /// This number is written by the linker and should be equal to the image's `age` value.
-    /// In contrast, [`PDBInformation::age`] may be bumped by other tools and should be greater or
+    /// This number is written by the linker and should be equal to the image's `age` value. In
+    /// contrast, [`PDBInformation::age`] may be bumped by other tools and should be greater or
     /// equal to the image's `age` value.
     ///
     /// Old PDB files may not specify an age, in which case only [`PDBInformation::age`] should be
     /// checked for matching the image.
     ///
-    /// [`PDBInformation::age`]: struct.PDBInformation.html#structfield.age
+    /// [`PDBInformation::age`]: crate::PDBInformation::age
     pub fn age(&self) -> Option<u32> {
         match self.header.age {
             0 => None,
@@ -112,6 +112,7 @@
 /// The version of the PDB format.
 ///
 /// This version type is used in multiple locations: the DBI header, and the PDBI header.
+#[non_exhaustive]
 #[derive(Debug, Copy, Clone)]
 #[allow(missing_docs)]
 pub enum HeaderVersion {
@@ -245,7 +246,8 @@
 }
 
 /// The target machine's architecture.
-/// Reference: https://docs.microsoft.com/en-us/windows/desktop/debug/pe-format#machine-types
+/// Reference: <https://docs.microsoft.com/en-us/windows/desktop/debug/pe-format#machine-types>
+#[non_exhaustive]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum MachineType {
     /// The contents of this field are assumed to be applicable to any machine type.
@@ -379,8 +381,9 @@
     /// The size of the contribution, in bytes.
     pub size: u32,
     /// The characteristics, which map to the `Characteristics` field of
-    /// the [`IMAGE_SECTION_HEADER`][1] field in binaries.
-    /// [1]: https://msdn.microsoft.com/en-us/library/windows/desktop/ms680341(v=vs.85).aspx
+    /// the [`IMAGE_SECTION_HEADER`] field in binaries.
+    ///
+    /// [`IMAGE_SECTION_HEADER`]: https://msdn.microsoft.com/en-us/library/windows/desktop/ms680341(v=vs.85).aspx
     pub characteristics: u32,
     /// The index of the module.
     pub module: u16,
@@ -464,13 +467,11 @@
 
 /// Represents a module from the DBI stream.
 ///
-/// A `Module` is a single item that contributes to the binary, such as an
-/// object file or import library.
-///
-/// Much of the useful information for a `Module` is stored in a separate stream in the PDB.
-/// It can be retrieved by calling [`PDB::module_info`] with a specific module.
+/// A `Module` is a single item that contributes to the binary, such as an object file or import
+/// library.
 ///
-/// [`PDB::module_info`]: struct.PDB.html#method.module_info
+/// Much of the useful information for a `Module` is stored in a separate stream in the PDB. It can
+/// be retrieved by calling [`PDB::module_info`](crate::PDB::module_info) with a specific module.
 #[derive(Debug, Clone)]
 pub struct Module<'m> {
     info: DBIModuleInfo,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/framedata.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/framedata.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/framedata.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/framedata.rs	2021-12-09 12:01:26.000000000 +0000
@@ -43,7 +43,7 @@
 }
 
 impl fmt::Display for FrameType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             FrameType::Unknown => write!(f, "unknown"),
             FrameType::FPO => write!(f, "fpo"),
@@ -146,7 +146,7 @@
 }
 
 impl fmt::Debug for NewFrameData {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("NewFrameData")
             .field("code_start", &self.code_start())
             .field("code_size", &self.code_size())
@@ -174,7 +174,6 @@
 /// stream might describe the same RVA.
 ///
 /// [`struct _FPO_DATA`]: https://docs.microsoft.com/en-us/windows/desktop/debug/pe-format#debug-type
-/// [`NewFrameData`]: struct.NewFrameData.html
 ///
 /// ```c
 /// typedef struct _FPO_DATA {
@@ -250,7 +249,7 @@
 }
 
 impl fmt::Debug for OldFrameData {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("OldFrameData")
             .field("code_start", &self.code_start())
             .field("code_size", &self.code_size())
@@ -274,10 +273,7 @@
     /// Relative virtual address of the start of the code block.
     ///
     /// Note that this address is internal to the PDB. To convert this to an actual [`Rva`], use
-    /// [`to_rva`].
-    ///
-    /// [`Rva`]: struct.Rva.html
-    /// [`to_rva`]: struct.PdbInternalRva.html#method.to_rva
+    /// [`PdbInternalRva::to_rva`].
     pub code_start: PdbInternalRva,
 
     /// Size of the code block covered by this frame data in bytes.
@@ -362,7 +358,7 @@
     }
 }
 
-/// Iterator over entries in a [`FrameTable`](struct.FrameTable.html).
+/// Iterator over entries in a [`FrameTable`].
 #[derive(Debug, Default)]
 pub struct FrameDataIter<'t> {
     old_frames: &'t [OldFrameData],
@@ -472,7 +468,7 @@
 ///
 /// A procedure/function might be described by multiple entries, with the first one declaring
 /// `is_function_start`. To retrieve frame information for a specific function, use
-/// [`FrameTable::at_rva`].
+/// [`FrameTable::iter_at_rva`].
 ///
 /// Not every function in the image file must have frame data defined for it. Those functions that
 /// do not have frame data are assumed to have normal stack frames.
@@ -544,11 +540,8 @@
     /// frame data covers the given RVA, the iterator starts at the first item **after** the RVA.
     /// Therefore, check for the desired RVA range when iterating frame data.
     ///
-    /// To obtain a `PdbInternalRva`, use the `to_internal_rva` methods on
-    /// [`PdbInternalSectionOffset`] or [`Rva`].
-    ///
-    /// [`PdbInternalSectionOffset`]: struct.PdbInternalSectionOffset.html
-    /// [`Rva`]: struct.Rva.html
+    /// To obtain a `PdbInternalRva`, use [`PdbInternalSectionOffset::to_internal_rva`] or
+    /// [`Rva::to_internal_rva`].
     pub fn iter_at_rva(&self, rva: PdbInternalRva) -> FrameDataIter<'_> {
         let old_frames = self.old_frames();
         let old_index = binary_search_by_rva(old_frames, rva);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 //!
 //! # Usage
 //!
-//! PDB files are accessed via the [`pdb::PDB` object](struct.PDB.html).
+//! PDB files are accessed via the [`pdb::PDB`] object.
 //!
 //! # Example
 //!
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/modi/c13.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/modi/c13.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/modi/c13.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/modi/c13.rs	2021-12-09 12:01:26.000000000 +0000
@@ -36,7 +36,7 @@
 
 impl DebugSubsectionKind {
     fn parse(value: u32) -> Result<Option<Self>> {
-        if value >= 0xf1 && value <= 0xfd {
+        if (0xf1..=0xfd).contains(&value) {
             Ok(Some(unsafe { std::mem::transmute(value) }))
         } else if value == constants::DEBUG_S_IGNORE {
             Ok(None)
@@ -351,8 +351,8 @@
         // that they are not confused with actual line number entries.
         let start_line = self.flags & 0x00ff_ffff;
         let marker = match start_line {
-            0xfee_fee => Some(LineMarkerKind::DoNotStepOnto),
-            0xf00_f00 => Some(LineMarkerKind::DoNotStepInto),
+            0xfeefee => Some(LineMarkerKind::DoNotStepOnto),
+            0xf00f00 => Some(LineMarkerKind::DoNotStepInto),
             _ => None,
         };
 
@@ -663,8 +663,8 @@
 
 impl<'a> DebugFileChecksumsSubsection<'a> {
     /// Creates a new file checksums subsection.
-    fn parse(data: &'a [u8]) -> Result<Self> {
-        Ok(Self { data })
+    fn new(data: &'a [u8]) -> Self {
+        Self { data }
     }
 
     /// Returns an iterator over all file checksum entries.
@@ -722,8 +722,7 @@
         let count = self.buf.parse::<u32>()? as usize;
 
         let data = self.buf.take(count * mem::size_of::<u32>())?;
-        let imports =
-            cast_aligned(data).ok_or_else(|| Error::InvalidStreamLength("CrossScopeImports"))?;
+        let imports = cast_aligned(data).ok_or(Error::InvalidStreamLength("CrossScopeImports"))?;
 
         Ok(Some(CrossScopeImportModule { name, imports }))
     }
@@ -735,8 +734,8 @@
 }
 
 impl<'a> DebugCrossScopeImportsSubsection<'a> {
-    fn parse(data: &'a [u8]) -> Result<Self> {
-        Ok(Self { data })
+    fn new(data: &'a [u8]) -> Self {
+        Self { data }
     }
 
     fn modules(self) -> CrossScopeImportModuleIter<'a> {
@@ -768,7 +767,7 @@
             .map(|sec| sec.data);
 
         match import_data {
-            Some(d) => Self::from_section(DebugCrossScopeImportsSubsection::parse(d)?),
+            Some(d) => Self::from_section(DebugCrossScopeImportsSubsection::new(d)),
             None => Ok(Self::default()),
         }
     }
@@ -800,11 +799,11 @@
         let module = self
             .modules
             .get(module_index)
-            .ok_or_else(|| Error::CrossModuleRefNotFound(raw_index))?;
+            .ok_or(Error::CrossModuleRefNotFound(raw_index))?;
 
         let local_index = module
             .get(import_index)
-            .ok_or_else(|| Error::CrossModuleRefNotFound(raw_index))?;
+            .ok_or(Error::CrossModuleRefNotFound(raw_index))?;
 
         Ok(CrossModuleRef(module.name, local_index))
     }
@@ -894,8 +893,7 @@
     }
 }
 
-/// Iterator returned by
-/// [`CrossModuleExports::exports`](struct.CrossModuleExports.html#method.exports).
+/// Iterator returned by [`CrossModuleExports::exports`].
 #[derive(Clone, Debug)]
 pub struct CrossModuleExportIter<'a> {
     exports: slice::Iter<'a, RawCrossScopeExport>,
@@ -918,9 +916,8 @@
 
 /// A table of exports declared by this module.
 ///
-/// Other modules can import types and ids from this module by using [cross module references].
-///
-/// [cross module references]: trait.ItemIndex.html#method.is_cross_module
+/// Other modules can import types and ids from this module by using [cross module
+/// references](ItemIndex::is_cross_module).
 #[derive(Clone, Debug, Default)]
 pub struct CrossModuleExports {
     raw_exports: Vec<RawCrossScopeExport>,
@@ -964,9 +961,10 @@
 
     /// Resolves the global index of the given cross module import's local index.
     ///
-    /// The global index can be used to retrieve items from the [`TypeInformation`] or
-    /// [`IdInformation`] streams. If the given local index is not listed in the export list, this
-    /// function returns `Ok(None)`.
+    /// The global index can be used to retrieve items from the
+    /// [`TypeInformation`](crate::TypeInformation) or [`IdInformation`](crate::IdInformation)
+    /// streams. If the given local index is not listed in the export list, this function returns
+    /// `Ok(None)`.
     pub fn resolve_import<I>(&self, local_index: Local<I>) -> Result<Option<I>>
     where
         I: ItemIndex,
@@ -1283,7 +1281,7 @@
             .map(|sec| sec.data);
 
         let file_checksums = match checksums_data {
-            Some(d) => DebugFileChecksumsSubsection::parse(d)?,
+            Some(d) => DebugFileChecksumsSubsection::new(d),
             None => DebugFileChecksumsSubsection::default(),
         };
 
@@ -1334,7 +1332,7 @@
         let mut entries = self.file_checksums.entries_at_offset(index)?;
         let entry = entries
             .next()?
-            .ok_or_else(|| Error::InvalidFileChecksumOffset(index.0))?;
+            .ok_or(Error::InvalidFileChecksumOffset(index.0))?;
 
         Ok(FileInfo {
             name: entry.name,
@@ -1624,8 +1622,7 @@
 
     #[test]
     fn test_parse_cross_section_imports() {
-        let sec = DebugCrossScopeImportsSubsection::parse(&CROSS_MODULE_IMPORT_DATA.0)
-            .expect("parse imports");
+        let sec = DebugCrossScopeImportsSubsection::new(&CROSS_MODULE_IMPORT_DATA.0);
 
         let modules: Vec<_> = sec.modules().collect().expect("collect imports");
         assert_eq!(modules.len(), 2);
@@ -1638,8 +1635,7 @@
 
     #[test]
     fn test_resolve_cross_module_import() {
-        let sec = DebugCrossScopeImportsSubsection::parse(&CROSS_MODULE_IMPORT_DATA.0)
-            .expect("parse imports");
+        let sec = DebugCrossScopeImportsSubsection::new(&CROSS_MODULE_IMPORT_DATA.0);
 
         let imports = CrossModuleImports::from_section(sec).expect("parse section");
         let cross_ref = imports
@@ -1658,8 +1654,7 @@
 
     #[test]
     fn test_resolve_cross_module_import2() {
-        let sec = DebugCrossScopeImportsSubsection::parse(&CROSS_MODULE_IMPORT_DATA.0)
-            .expect("parse imports");
+        let sec = DebugCrossScopeImportsSubsection::new(&CROSS_MODULE_IMPORT_DATA.0);
 
         let imports = CrossModuleImports::from_section(sec).expect("parse section");
         let cross_ref = imports
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/modi/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/modi/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/modi/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/modi/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -31,16 +31,9 @@
 
 impl<'s> ModuleInfo<'s> {
     /// Parses a `ModuleInfo` from it's Module info stream data.
-    pub(crate) fn parse(stream: Stream<'s>, module: &Module<'_>) -> Result<Self> {
+    pub(crate) fn parse(stream: Stream<'s>, module: &Module<'_>) -> Self {
         let info = module.info();
 
-        let mut buf = stream.parse_buffer();
-        if buf.parse_u32()? != constants::CV_SIGNATURE_C13 {
-            return Err(Error::UnimplementedFeature(
-                "Unsupported module info format",
-            ));
-        }
-
         let lines_size = if info.lines_size > 0 {
             LinesSize::C11(info.lines_size as usize)
         } else {
@@ -48,11 +41,11 @@
         };
 
         let symbols_size = info.symbols_size as usize;
-        Ok(ModuleInfo {
+        ModuleInfo {
             stream,
             symbols_size,
             lines_size,
-        })
+        }
     }
 
     fn lines_data(&self, size: usize) -> &[u8] {
@@ -64,7 +57,14 @@
     pub fn symbols(&self) -> Result<SymbolIter<'_>> {
         let mut buf = self.stream.parse_buffer();
         buf.truncate(self.symbols_size)?;
-        buf.parse_u32()?;
+        if self.symbols_size > 0 {
+            let sig = buf.parse_u32()?;
+            if sig != constants::CV_SIGNATURE_C13 {
+                return Err(Error::UnimplementedFeature(
+                    "Unsupported symbol data format",
+                ));
+            }
+        }
         Ok(SymbolIter::new(buf))
     }
 
@@ -143,7 +143,7 @@
 /// Information record on a source file.
 #[derive(Clone, Debug, PartialEq)]
 pub struct FileInfo<'a> {
-    /// Reference to the file name in the [string table](struct.StringTable.html).
+    /// Reference to the file name in the [`StringTable`](crate::StringTable).
     pub name: StringRef,
 
     /// Checksum of the file contents.
@@ -235,7 +235,7 @@
     /// Note that line records are not guaranteed to be ordered by source code offset. If a
     /// monotonic order by `PdbInternalSectionOffset` or `Rva` is required, the lines have to be
     /// sorted manually.
-    pub fn lines_at_offset(&self, offset: PdbInternalSectionOffset) -> LineIterator {
+    pub fn lines_at_offset(&self, offset: PdbInternalSectionOffset) -> LineIterator<'_> {
         match self.inner {
             LineProgramInner::C13(ref inner) => LineIterator {
                 inner: LineIteratorInner::C13(inner.lines_at_offset(offset)),
@@ -313,12 +313,8 @@
 
 /// Named reference to a [`Module`].
 ///
-/// The name stored in the [`StringTable`] corresponds to the name of the module as returned by
-/// [`Module::module_name`].
-///
-/// [`Module`]: struct.Module.html
-/// [`Module::module_name`]: struct.Module.html#method.module_name
-/// [`StringTable`]: struct.StringTable.html
+/// The name stored in the [`StringTable`](crate::StringTable) corresponds to the name of the module
+/// as returned by [`Module::module_name`].
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct ModuleRef(pub StringRef);
 
@@ -331,8 +327,6 @@
 /// Reference to a local type or id in another module.
 ///
 /// See [`ItemIndex::is_cross_module`] for more information.
-///
-/// [`ItemIndex::is_cross_module`]: trait.ItemIndex.html#method.is_cross_module
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 pub struct CrossModuleRef<I: ItemIndex>(pub ModuleRef, pub Local<I>);
 
@@ -342,8 +336,8 @@
 /// imports subsection.
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum CrossModuleExport {
-    /// A cross module export of a [`Type`](type.Type.html).
+    /// A cross module export of a [`Type`](crate::Type).
     Type(Local<TypeIndex>, TypeIndex),
-    /// A cross module export of an [`Id`](type.Id.html).
+    /// A cross module export of an [`Id`](crate::Id).
     Id(Local<IdIndex>, IdIndex),
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/msf/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/msf/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/msf/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/msf/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -97,7 +97,7 @@
             let mut offset = 0;
             let data = RawHeader {
                 magic: {
-                    let mut tmp = [0; 32 as usize];
+                    let mut tmp = [0; 32];
                     this.gread_inout_with(&mut offset, &mut tmp, le)?;
                     tmp
                 },
@@ -228,10 +228,7 @@
             }
 
             // stream table is available
-            assert!(match self.stream_table {
-                StreamTable::Available { .. } => true,
-                _ => false,
-            });
+            assert!(matches!(self.stream_table, StreamTable::Available { .. }));
 
             Ok(())
         }
@@ -443,34 +440,22 @@
                 page_size: 4096,
                 maximum_valid_page_number: 15,
             };
-            assert!(match h.validate_page_number(0) {
-                Err(Error::PageReferenceOutOfRange(0)) => true,
-                _ => false,
-            });
-            assert!(match h.validate_page_number(1) {
-                Ok(1) => true,
-                _ => false,
-            });
-            assert!(match h.validate_page_number(2) {
-                Ok(2) => true,
-                _ => false,
-            });
-            assert!(match h.validate_page_number(14) {
-                Ok(14) => true,
-                _ => false,
-            });
-            assert!(match h.validate_page_number(15) {
-                Ok(15) => true,
-                _ => false,
-            });
-            assert!(match h.validate_page_number(16) {
-                Err(Error::PageReferenceOutOfRange(16)) => true,
-                _ => false,
-            });
-            assert!(match h.validate_page_number(17) {
-                Err(Error::PageReferenceOutOfRange(17)) => true,
-                _ => false,
-            });
+            assert!(matches!(
+                h.validate_page_number(0),
+                Err(Error::PageReferenceOutOfRange(0))
+            ));
+            assert!(matches!(h.validate_page_number(1), Ok(1)));
+            assert!(matches!(h.validate_page_number(2), Ok(2)));
+            assert!(matches!(h.validate_page_number(14), Ok(14)));
+            assert!(matches!(h.validate_page_number(15), Ok(15)));
+            assert!(matches!(
+                h.validate_page_number(16),
+                Err(Error::PageReferenceOutOfRange(16))
+            ));
+            assert!(matches!(
+                h.validate_page_number(17),
+                Err(Error::PageReferenceOutOfRange(17))
+            ));
         }
 
         #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/msf/page_list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/msf/page_list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/msf/page_list.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/msf/page_list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -87,9 +87,7 @@
 
     /// Return the total length of this PageList.
     pub fn len(&self) -> usize {
-        self.source_slices
-            .iter()
-            .fold(0 as usize, |acc, s| acc + s.size)
+        self.source_slices.iter().fold(0, |acc, s| acc + s.size)
     }
 
     /// Return a slice of SourceSlices.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/omap.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/omap.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/omap.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/omap.rs	2021-12-09 12:01:26.000000000 +0000
@@ -60,7 +60,7 @@
 }
 
 impl fmt::Debug for OMAPRecord {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("OMAPRecord")
             .field(
                 "source_address",
@@ -117,8 +117,7 @@
 /// storing target addresses), but given that OMAP tables are an uncommon PDBs feature, the obvious
 /// binary search implementation seems appropriate.
 ///
-/// [module level documentation]: ./index.html
-/// [`AddressMap`]: struct.AddressMap.html
+/// [module level documentation]: self
 pub(crate) struct OMAPTable<'s> {
     stream: Stream<'s>,
 }
@@ -186,7 +185,7 @@
 }
 
 impl fmt::Debug for OMAPTable<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_tuple("OMAPTable").field(&self.records()).finish()
     }
 }
@@ -272,10 +271,7 @@
 
 impl FusedIterator for RangeIter<'_> {}
 
-/// Iterator over [`Rva`] ranges returned by [`rva_ranges`].
-///
-/// [`Rva`]: struct.Rva.html
-/// [`rva_ranges`]: struct.AddressMap.html#method.rva_ranges
+/// Iterator over [`Rva`] ranges returned by [`AddressMap::rva_ranges`].
 pub struct RvaRangeIter<'t>(RangeIter<'t>);
 
 impl Iterator for RvaRangeIter<'_> {
@@ -288,10 +284,7 @@
 
 impl FusedIterator for RvaRangeIter<'_> {}
 
-/// Iterator over [`InternalPdbRva`] ranges returned by [`internal_rva_ranges`].
-///
-/// [`InternalPdbRva`]: struct.InternalPdbRva.html
-/// [`internal_rva_ranges`]: struct.AddressMap.html#method.internal_rva_ranges
+/// Iterator over [`PdbInternalRva`] ranges returned by [`AddressMap::internal_rva_ranges`].
 pub struct PdbInternalRvaRangeIter<'t>(RangeIter<'t>);
 
 impl Iterator for PdbInternalRvaRangeIter<'_> {
@@ -394,10 +387,6 @@
 /// [Vulcan research project]: https://research.microsoft.com/pubs/69850/tr-2001-50.pdf
 /// [Microsoft Binary Technologies Projects]: https://microsoft.com/windows/cse/bit_projects.mspx
 /// [1997 reference material]: https://www.microsoft.com/msj/0597/hood0597.aspx
-/// [`Rva`]: struct.Rva.html
-/// [`PdbInternalRva`]: struct.PdbInternalRva.html
-/// [`SectionOffset`]: struct.SectionOffset.html
-/// [`PdbInternalSectionOffset`]: struct.PdbInternalSectionOffset.html
 #[derive(Debug, Default)]
 pub struct AddressMap<'s> {
     pub(crate) original_sections: Vec<ImageSectionHeader>,
@@ -448,8 +437,10 @@
 }
 
 fn get_virtual_address(sections: &[ImageSectionHeader], section: u16, offset: u32) -> Option<u32> {
-    let section = sections.get(section as usize - 1)?;
-    Some(section.virtual_address + offset)
+    (section as usize)
+        .checked_sub(1)
+        .and_then(|i| sections.get(i))
+        .map(|section| section.virtual_address + offset)
 }
 
 impl Rva {
@@ -467,9 +458,7 @@
     /// Resolves the section offset in the PE headers.
     ///
     /// This is an offset into PE section headers of the executable. To retrieve section offsets
-    /// used in the PDB, use [`to_internal_offset`] instead.
-    ///
-    /// [`to_internal_offset`]: struct.Rva.html#method.to_internal_offset
+    /// used in the PDB, use [`to_internal_offset`](Self::to_internal_offset) instead.
     pub fn to_section_offset(self, translator: &AddressMap<'_>) -> Option<SectionOffset> {
         let (section, offset) = match translator.transformed_sections {
             Some(ref sections) => get_section_offset(sections, self.0)?,
@@ -482,9 +471,7 @@
     /// Resolves the PDB internal section offset.
     ///
     /// This is the offset value used in the PDB file. To index into the actual PE section headers,
-    /// use [`to_section_offset`] instead.
-    ///
-    /// [`to_section_offset`]: struct.Rva.html#method.to_section_offset
+    /// use [`to_section_offset`](Self::to_section_offset) instead.
     pub fn to_internal_offset(
         self,
         translator: &AddressMap<'_>,
@@ -506,9 +493,7 @@
     /// Resolves the section offset in the PE headers.
     ///
     /// This is an offset into PE section headers of the executable. To retrieve section offsets
-    /// used in the PDB, use [`to_internal_offset`] instead.
-    ///
-    /// [`to_internal_offset`]: struct.PdbInternalRva.html#method.to_internal_offset
+    /// used in the PDB, use [`to_internal_offset`](Self::to_internal_offset) instead.
     pub fn to_section_offset(self, translator: &AddressMap<'_>) -> Option<SectionOffset> {
         self.to_rva(translator)?.to_section_offset(translator)
     }
@@ -516,9 +501,7 @@
     /// Resolves the PDB internal section offset.
     ///
     /// This is the offset value used in the PDB file. To index into the actual PE section headers,
-    /// use [`to_section_offset`] instead.
-    ///
-    /// [`to_section_offset`]: struct.Rva.html#method.to_section_offset
+    /// use [`to_section_offset`](Self::to_section_offset) instead.
     pub fn to_internal_offset(
         self,
         translator: &AddressMap<'_>,
@@ -601,4 +584,18 @@
         assert_eq!(mem::size_of::<OMAPRecord>(), 8);
         assert_eq!(mem::align_of::<OMAPRecord>(), 4);
     }
+
+    #[test]
+    fn test_get_virtual_address() {
+        let sections = vec![ImageSectionHeader {
+            virtual_address: 0x1000_0000,
+            ..Default::default()
+        }];
+
+        assert_eq!(get_virtual_address(&sections, 1, 0x1234), Some(0x1000_1234));
+        assert_eq!(get_virtual_address(&sections, 2, 0x1234), None);
+
+        // https://github.com/willglynn/pdb/issues/87
+        assert_eq!(get_virtual_address(&sections, 0, 0x1234), None);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/pdbi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/pdbi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/pdbi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/pdbi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,11 +15,11 @@
 
 /// A PDB info stream header parsed from a stream.
 ///
-/// The [PDB information stream][1] contains the GUID and age fields that can be used to
+/// The [PDB information stream] contains the GUID and age fields that can be used to
 /// verify that a PDB file matches a specific binary, as well a list of named PDB streams
 /// with their stream indices.
 ///
-/// [1]: http://llvm.org/docs/PDB/PdbStream.html
+/// [PDB information stream]: http://llvm.org/docs/PDB/PdbStream.html
 #[derive(Debug)]
 pub struct PDBInformation<'s> {
     /// The version of the PDB format in use.
@@ -30,12 +30,10 @@
     ///
     /// This number is bumped by the linker and other tools every time the PDB is modified. It does
     /// not necessarily correspond to the age declared in the image. Consider using
-    /// [`DebugInformation::age`] for a better match.
+    /// [`DebugInformation::age`](crate::DebugInformation::age) for a better match.
     ///
     /// This PDB matches an image, if the `guid` values match and the PDB age is equal or higher
     /// than the image's age.
-    ///
-    /// [`DebugInformation::age`]: struct.DebugInformation.html#method.age
     pub age: u32,
     /// A `Uuid` generated when this PDB file was created that should uniquely identify it.
     pub guid: Uuid,
@@ -159,11 +157,8 @@
 
 /// A list of named streams contained within the PDB file.
 ///
-/// Call [`StreamNames::iter`][1] to iterate over the names. The iterator produces [`StreamName`][2]
+/// Call [`StreamNames::iter`] to iterate over the names. The iterator produces [`StreamName`]
 /// objects.
-///
-/// [1]: #method.iter
-/// [2]: struct.StreamName.html
 #[derive(Debug)]
 pub struct StreamNames<'s> {
     buf: ParseBuffer<'s>,
@@ -171,9 +166,7 @@
     names: Vec<StreamName<'s>>,
 }
 
-/// An iterator over [`StreamName`][1]s.
-///
-/// [1]: struct.StreamName.html
+/// An iterator over [`StreamName`]s.
 pub type NameIter<'a, 'n> = std::slice::Iter<'a, StreamName<'n>>;
 
 impl<'s> StreamNames<'s> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/pdb.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/pdb.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/pdb.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/pdb.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,8 +18,8 @@
 use crate::symbol::SymbolTable;
 use crate::tpi::{IdInformation, TypeInformation};
 
-/// Some streams have a fixed stream index.
-/// http://llvm.org/docs/PDB/index.html
+// Some streams have a fixed stream index.
+// http://llvm.org/docs/PDB/index.html
 
 const PDB_STREAM: u32 = 1;
 const TPI_STREAM: u32 = 2;
@@ -175,22 +175,22 @@
             .raw_stream(dbi_header.symbol_records_stream)?
             .ok_or(Error::GlobalSymbolsNotFound)?;
 
-        SymbolTable::parse(stream)
+        Ok(SymbolTable::new(stream))
     }
 
     /// Retrieve the module info stream for a specific `Module`.
     ///
-    /// Some information for each module is stored in a separate stream per-module.
-    /// `Module`s can be retrieved from the `PDB` by first calling [`debug_information`] to
-    /// get the debug information stream, and then calling [`modules`] on that.
+    /// Some information for each module is stored in a separate stream per-module. `Module`s can be
+    /// retrieved from the `PDB` by first calling [`debug_information`](Self::debug_information) to
+    /// get the debug information stream, and then calling [`modules`](DebugInformation::modules) on
+    /// that.
     ///
     /// # Errors
     ///
     /// * `Error::StreamNotFound` if the PDB does not contain this module info stream
     /// * `Error::IoError` if returned by the `Source`
     /// * `Error::PageReferenceOutOfRange` if the PDB file seems corrupt
-    /// * `Error::UnimplementedFeature` if the module information stream is an unsupported
-    ///   version
+    /// * `Error::UnimplementedFeature` if the module information stream is an unsupported version
     ///
     /// # Example
     ///
@@ -214,14 +214,10 @@
     /// # Ok(())
     /// # }
     /// ```
-    ///
-    /// [`debug_information`]: #method.debug_information
-    /// [`modules`]: struct.DebugInformation.html#method.modules
     pub fn module_info<'m>(&mut self, module: &Module<'m>) -> Result<Option<ModuleInfo<'s>>> {
-        match self.raw_stream(module.info().stream)? {
-            Some(stream) => ModuleInfo::parse(stream, module).map(Some),
-            None => Ok(None),
-        }
+        Ok(self
+            .raw_stream(module.info().stream)?
+            .map(|stream| ModuleInfo::parse(stream, module)))
     }
 
     /// Retrieve the executable's section headers, as stored inside this PDB.
@@ -355,8 +351,6 @@
     /// * `Error::StreamNotFound` if the PDB somehow does not contain a debug information stream
     /// * `Error::UnimplementedFeature` if the debug information header predates ~1995
     ///
-    /// [`AddressMap`]: struct.AddressMap.html
-    ///
     /// # Example
     ///
     /// ```rust
@@ -392,12 +386,8 @@
         let sections = self.sections()?.unwrap_or_default();
         Ok(match self.original_sections()? {
             Some(original_sections) => {
-                let omap_from_src = self
-                    .omap_from_src()?
-                    .ok_or_else(|| Error::AddressMapNotFound)?;
-                let omap_to_src = self
-                    .omap_to_src()?
-                    .ok_or_else(|| Error::AddressMapNotFound)?;
+                let omap_from_src = self.omap_from_src()?.ok_or(Error::AddressMapNotFound)?;
+                let omap_to_src = self.omap_to_src()?.ok_or(Error::AddressMapNotFound)?;
 
                 AddressMap {
                     original_sections,
@@ -453,8 +443,6 @@
     /// * `Error::IoError` if returned by the `Source`
     /// * `Error::PageReferenceOutOfRange` if the PDB file seems corrupt
     /// * `Error::UnexpectedEof` if the string table ends prematurely
-    ///
-    /// [`StringRef`]: struct.StringRef.html
     pub fn string_table(&mut self) -> Result<StringTable<'s>> {
         let stream = self.named_stream(b"/names")?;
         StringTable::parse(stream)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/pe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/pe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/pe.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/pe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,7 @@
 use crate::common::*;
 
 /// A PE `IMAGE_SECTION_HEADER`, as described in [the Microsoft documentation](https://msdn.microsoft.com/en-us/library/windows/desktop/ms680341(v=vs.85).aspx).
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Copy, Clone, PartialEq, Eq, Default)]
 pub struct ImageSectionHeader {
     /// An 8-byte, null-padded UTF-8 string. There is no terminating null character if the string is
     /// exactly eight characters long. For longer names, this member contains a forward slash (`/`)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/source.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/source.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/source.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/source.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,12 +22,12 @@
 
 /// The `pdb` crate accesses PDB files via the `pdb::Source` trait.
 ///
-/// This library is written with zero-copy in mind. `Source`s provide `SourceView`s which need not
+/// This library is written with zero-copy in mind. `Source`s provide [`SourceView`]s which need not
 /// outlive their parent, supporting implementations of e.g. memory mapped files.
 ///
 /// PDB files are "multi-stream files" (MSF) under the hood. MSFs have various layers of
 /// indirection, but ultimately the MSF code asks a `Source` to view a series of
-/// [`{ offset, size }` records](struct.SourceSlice.html), which the `Source` provides as a
+/// [`{ offset, size }` records](SourceSlice), which the `Source` provides as a
 /// contiguous `&[u8]`.
 ///
 /// # Default
@@ -40,8 +40,8 @@
 /// # Alignment
 ///
 /// The requested offsets will always be aligned to the MSF's page size, which is always a power of
-/// two and is usually (but not always) 4096 bytes. The requested sizes will also be multiples of the
-/// page size, except for the size of the final `SourceSlice`, which may be smaller.
+/// two and is usually (but not always) 4096 bytes. The requested sizes will also be multiples of
+/// the page size, except for the size of the final `SourceSlice`, which may be smaller.
 ///
 /// PDB files are specified as always being a multiple of the page size, so `Source` implementations
 /// are free to e.g. map whole pages and return a sub-slice of the requested length.
@@ -55,7 +55,7 @@
 }
 
 /// An owned, droppable, read-only view of the source file which can be referenced as a byte slice.
-pub trait SourceView<'s>: Drop + fmt::Debug {
+pub trait SourceView<'s>: fmt::Debug {
     /// Returns a view to the raw data.
     fn as_slice(&self) -> &[u8];
 }
@@ -77,18 +77,12 @@
     }
 }
 
-impl Drop for ReadView {
-    fn drop(&mut self) {
-        // no-op
-    }
-}
-
 impl<'s, T> Source<'s> for T
 where
     T: io::Read + io::Seek + fmt::Debug + 's,
 {
     fn view(&mut self, slices: &[SourceSlice]) -> Result<Box<dyn SourceView<'s>>, io::Error> {
-        let len = slices.iter().fold(0 as usize, |acc, s| acc + s.size);
+        let len = slices.iter().fold(0, |acc, s| acc + s.size);
 
         let mut v = ReadView {
             bytes: Vec::with_capacity(len),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/strings.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/strings.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/strings.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/strings.rs	2021-12-09 12:01:26.000000000 +0000
@@ -79,9 +79,7 @@
 /// [`StringRef`] offsets to their string values. Sometimes, it is also referred to as "Name table".
 /// The mapping from string to offset has not been implemented yet.
 ///
-/// Use [`PDB::string_table`] to obtain an instance.
-///
-/// [`PDB::string_table`]: struct.PDB.html#method.string_table
+/// Use [`PDB::string_table`](crate::PDB::string_table) to obtain an instance.
 #[derive(Debug)]
 pub struct StringTable<'s> {
     header: StringTableHeader,
@@ -143,9 +141,7 @@
     /// Resolves the raw string value of this reference.
     ///
     /// This method errors if the offset is out of bounds of the string table. Use
-    /// [`PDB::string_table`] to obtain an instance of the string table.
-    ///
-    /// [`PDB::string_table`]: struct.PDB.html#method.string_table
+    /// [`PDB::string_table`](crate::PDB::string_table) to obtain an instance of the string table.
     pub fn to_raw_string<'s>(self, strings: &'s StringTable<'_>) -> Result<RawString<'s>> {
         strings.get(self)
     }
@@ -153,9 +149,7 @@
     /// Resolves and decodes the UTF-8 string value of this reference.
     ///
     /// This method errors if the offset is out of bounds of the string table. Use
-    /// [`PDB::string_table`] to obtain an instance of the string table.
-    ///
-    /// [`PDB::string_table`]: struct.PDB.html#method.string_table
+    /// [`PDB::string_table`](crate::PDB::string_table) to obtain an instance of the string table.
     pub fn to_string_lossy<'s>(self, strings: &'s StringTable<'_>) -> Result<Cow<'s, str>> {
         strings.get(self).map(|r| r.to_string())
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/symbol/annotations.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/symbol/annotations.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/symbol/annotations.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/symbol/annotations.rs	2021-12-09 12:01:26.000000000 +0000
@@ -110,12 +110,12 @@
 impl BinaryAnnotation {
     /// Does this annotation emit a line info?
     pub fn emits_line_info(self) -> bool {
-        match self {
-            BinaryAnnotation::ChangeCodeOffset(..) => true,
-            BinaryAnnotation::ChangeCodeOffsetAndLineOffset(..) => true,
-            BinaryAnnotation::ChangeCodeLengthAndCodeOffset(..) => true,
-            _ => false,
-        }
+        matches!(
+            self,
+            BinaryAnnotation::ChangeCodeOffset(..)
+                | BinaryAnnotation::ChangeCodeOffsetAndLineOffset(..)
+                | BinaryAnnotation::ChangeCodeLengthAndCodeOffset(..)
+        )
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/symbol/constants.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/symbol/constants.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/symbol/constants.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/symbol/constants.rs	2021-12-09 12:01:26.000000000 +0000
@@ -269,7 +269,9 @@
 pub const S_LDATA_HLSL32_EX: u16 = 0x1165;
 
 /// These values correspond to the CV_CPU_TYPE_e enumeration, and are documented
-/// here: https://msdn.microsoft.com/en-us/library/b2fc64ek.aspx
+/// [on MSDN](https://msdn.microsoft.com/en-us/library/b2fc64ek.aspx).
+#[non_exhaustive]
+#[allow(missing_docs)]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum CPUType {
     Intel8080 = 0x0,
@@ -478,25 +480,47 @@
 }
 
 /// These values correspond to the CV_CFL_LANG enumeration, and are documented
-/// here: https://msdn.microsoft.com/en-us/library/bw3aekw6.aspx
+/// [on MSDN](https://msdn.microsoft.com/en-us/library/bw3aekw6.aspx).
+#[non_exhaustive]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum SourceLanguage {
+    /// Application language is C.
     C = 0x00,
+    /// Application language is C++.
     Cpp = 0x01,
+    /// Application language is FORTRAN.
     Fortran = 0x02,
+    /// Application language is Microsoft Macro Assembler.
     Masm = 0x03,
+    /// Application language is Pascal.
     Pascal = 0x04,
+    /// Application language is BASIC.
     Basic = 0x05,
+    /// Application language is COBOL.
     Cobol = 0x06,
+    /// Application is a linker-generated module.
     Link = 0x07,
+    /// Application is a resource module converted with CVTRES tool.
     Cvtres = 0x08,
+    /// Application is a POGO optimized module generated with CVTPGD tool.
     Cvtpgd = 0x09,
+    /// Application language is C#.
     CSharp = 0x0a,
+    /// Application language is Visual Basic.
     VB = 0x0b,
+    /// Application language is intermediate language assembly (that is, Common Language Runtime
+    /// (CLR) assembly).
     ILAsm = 0x0c,
+    /// Application language is Java.
     Java = 0x0d,
+    /// Application language is Jscript.
     JScript = 0x0e,
+    /// Application language is an unknown Microsoft Intermediate Language (MSIL), possibly a result
+    /// of using the [/LTCG (Link-time Code
+    /// Generation)](https://docs.microsoft.com/en-us/cpp/build/reference/ltcg-link-time-code-generation)
+    /// switch.
     MSIL = 0x0f,
+    /// Application language is High Level Shader Language.
     HLSL = 0x10,
 
     /// The DMD compiler emits 'D' for the CV source language. Microsoft doesn't
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/symbol/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/symbol/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/symbol/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/symbol/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,6 +17,7 @@
 mod constants;
 
 use self::constants::*;
+pub use self::constants::{CPUType, SourceLanguage};
 
 pub use self::annotations::*;
 
@@ -68,24 +69,49 @@
     /// If `true`, this symbol has a `parent` and an `end` field, which contains the offset of the
     /// corrsponding end symbol.
     pub fn starts_scope(&self) -> bool {
-        match self.raw_kind() {
-            S_GPROC16 | S_GPROC32 | S_GPROC32_ST | S_GPROCMIPS | S_GPROCMIPS_ST | S_GPROCIA64
-            | S_GPROCIA64_ST | S_LPROC16 | S_LPROC32 | S_LPROC32_ST | S_LPROC32_DPC
-            | S_LPROCMIPS | S_LPROCMIPS_ST | S_LPROCIA64 | S_LPROCIA64_ST | S_LPROC32_DPC_ID
-            | S_GPROC32_ID | S_GPROCMIPS_ID | S_GPROCIA64_ID | S_BLOCK16 | S_BLOCK32
-            | S_BLOCK32_ST | S_WITH16 | S_WITH32 | S_WITH32_ST | S_THUNK16 | S_THUNK32
-            | S_THUNK32_ST | S_SEPCODE | S_GMANPROC | S_GMANPROC_ST | S_LMANPROC
-            | S_LMANPROC_ST | S_INLINESITE | S_INLINESITE2 => true,
-            _ => false,
-        }
+        matches!(
+            self.raw_kind(),
+            S_GPROC16
+                | S_GPROC32
+                | S_GPROC32_ST
+                | S_GPROCMIPS
+                | S_GPROCMIPS_ST
+                | S_GPROCIA64
+                | S_GPROCIA64_ST
+                | S_LPROC16
+                | S_LPROC32
+                | S_LPROC32_ST
+                | S_LPROC32_DPC
+                | S_LPROCMIPS
+                | S_LPROCMIPS_ST
+                | S_LPROCIA64
+                | S_LPROCIA64_ST
+                | S_LPROC32_DPC_ID
+                | S_GPROC32_ID
+                | S_GPROCMIPS_ID
+                | S_GPROCIA64_ID
+                | S_BLOCK16
+                | S_BLOCK32
+                | S_BLOCK32_ST
+                | S_WITH16
+                | S_WITH32
+                | S_WITH32_ST
+                | S_THUNK16
+                | S_THUNK32
+                | S_THUNK32_ST
+                | S_SEPCODE
+                | S_GMANPROC
+                | S_GMANPROC_ST
+                | S_LMANPROC
+                | S_LMANPROC_ST
+                | S_INLINESITE
+                | S_INLINESITE2
+        )
     }
 
     /// Returns whether this symbol declares the end of a scope.
     pub fn ends_scope(&self) -> bool {
-        match self.raw_kind() {
-            S_END | S_PROC_ID_END | S_INLINESITE_END => true,
-            _ => false,
-        }
+        matches!(self.raw_kind(), S_END | S_PROC_ID_END | S_INLINESITE_END)
     }
 }
 
@@ -138,8 +164,7 @@
 //   https://github.com/Microsoft/microsoft-pdb/blob/082c5290e5aff028ae84e43affa8be717aa7af73/cvdump/dumpsym7.cpp#L264
 
 /// Information parsed from a [`Symbol`] record.
-///
-/// [`Symbol`]: struct.Symbol.html
+#[non_exhaustive]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum SymbolData<'t> {
     /// End of a scope, such as a procedure.
@@ -166,7 +191,7 @@
     CompileFlags(CompileFlagsSymbol<'t>),
     /// A using namespace directive.
     UsingNamespace(UsingNamespaceSymbol<'t>),
-    /// Reference to a [`ProcedureSymbol`](struct.ProcedureSymbol.html).
+    /// Reference to a [`ProcedureSymbol`].
     ProcedureReference(ProcedureReferenceSymbol<'t>),
     /// Reference to an imported variable.
     DataReference(DataReferenceSymbol<'t>),
@@ -423,18 +448,12 @@
     fn try_from_ctx(this: &'t [u8], kind: SymbolKind) -> Result<(Self, usize)> {
         let mut buf = ParseBuffer::from(this);
 
-        let global = match kind {
-            S_GDATA32 | S_GDATA32_ST | S_GMANDATA | S_GMANDATA_ST => true,
-            _ => false,
-        };
-        let managed = match kind {
-            S_LMANDATA | S_LMANDATA_ST | S_GMANDATA | S_GMANDATA_ST => true,
-            _ => false,
-        };
-
         let symbol = DataSymbol {
-            global,
-            managed,
+            global: matches!(kind, S_GDATA32 | S_GDATA32_ST | S_GMANDATA | S_GMANDATA_ST),
+            managed: matches!(
+                kind,
+                S_LMANDATA | S_LMANDATA_ST | S_GMANDATA | S_GMANDATA_ST
+            ),
             type_index: buf.parse()?,
             offset: buf.parse()?,
             name: parse_symbol_name(&mut buf, kind)?,
@@ -453,7 +472,7 @@
     pub global: bool,
     /// SUC of the name.
     pub sum_name: u32,
-    /// Symbol index of the referenced [`ProcedureSymbol`](struct.ProcedureSymbol.html).
+    /// Symbol index of the referenced [`ProcedureSymbol`].
     ///
     /// Note that this symbol might be located in a different module.
     pub symbol_index: SymbolIndex,
@@ -469,13 +488,8 @@
     fn try_from_ctx(this: &'t [u8], kind: SymbolKind) -> Result<(Self, usize)> {
         let mut buf = ParseBuffer::from(this);
 
-        let global = match kind {
-            S_PROCREF | S_PROCREF_ST => true,
-            _ => false,
-        };
-
         let symbol = ProcedureReferenceSymbol {
-            global,
+            global: matches!(kind, S_PROCREF | S_PROCREF_ST),
             sum_name: buf.parse()?,
             symbol_index: buf.parse()?,
             module: buf.parse()?,
@@ -493,7 +507,7 @@
 pub struct DataReferenceSymbol<'t> {
     /// SUC of the name.
     pub sum_name: u32,
-    /// Symbol index of the referenced [`DataSymbol`](struct.DataSymbol.html).
+    /// Symbol index of the referenced [`DataSymbol`].
     ///
     /// Note that this symbol might be located in a different module.
     pub symbol_index: SymbolIndex,
@@ -635,13 +649,8 @@
     fn try_from_ctx(this: &'t [u8], kind: SymbolKind) -> Result<(Self, usize)> {
         let mut buf = ParseBuffer::from(this);
 
-        let global = match kind {
-            S_GTHREAD32 | S_GTHREAD32_ST => true,
-            _ => false,
-        };
-
         let symbol = ThreadStorageSymbol {
-            global,
+            global: matches!(kind, S_GTHREAD32 | S_GTHREAD32_ST),
             type_index: buf.parse()?,
             offset: buf.parse()?,
             name: parse_symbol_name(&mut buf, kind)?,
@@ -662,6 +671,7 @@
 const CV_PFLAG_OPTDBGINFO: u8 = 0x80;
 
 /// Flags of a [`ProcedureSymbol`](struct.ProcedureSymbol).
+#[non_exhaustive]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub struct ProcedureFlags {
     /// Frame pointer is present (not omitted).
@@ -748,19 +758,9 @@
     fn try_from_ctx(this: &'t [u8], kind: SymbolKind) -> Result<(Self, usize)> {
         let mut buf = ParseBuffer::from(this);
 
-        let global = match kind {
-            S_GPROC32 | S_GPROC32_ST | S_GPROC32_ID => true,
-            _ => false,
-        };
-
-        let dpc = match kind {
-            S_LPROC32_DPC | S_LPROC32_DPC_ID => true,
-            _ => false,
-        };
-
         let symbol = ProcedureSymbol {
-            global,
-            dpc,
+            global: matches!(kind, S_GPROC32 | S_GPROC32_ST | S_GPROC32_ID),
+            dpc: matches!(kind, S_LPROC32_DPC | S_LPROC32_DPC_ID),
             parent: parse_optional_index(&mut buf)?,
             end: buf.parse()?,
             next: parse_optional_index(&mut buf)?,
@@ -785,8 +785,6 @@
     /// Index of the parent function.
     ///
     /// This might either be a [`ProcedureSymbol`] or another `InlineSiteSymbol`.
-    ///
-    /// [`ProcedureSymbol`]: struct.ProcedureSymbol.html
     pub parent: Option<SymbolIndex>,
     /// The end symbol of this callsite.
     pub end: SymbolIndex,
@@ -897,32 +895,33 @@
 }
 
 /// Compile flags declared in `CompileFlagsSymbol`.
+#[non_exhaustive]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub struct CompileFlags {
     /// Compiled for edit and continue.
-    edit_and_continue: bool,
+    pub edit_and_continue: bool,
     /// Compiled without debugging info.
-    no_debug_info: bool,
+    pub no_debug_info: bool,
     /// Compiled with `LTCG`.
-    link_time_codegen: bool,
+    pub link_time_codegen: bool,
     /// Compiled with `/bzalign`.
-    no_data_align: bool,
+    pub no_data_align: bool,
     /// Managed code or data is present.
-    managed: bool,
+    pub managed: bool,
     /// Compiled with `/GS`.
-    security_checks: bool,
+    pub security_checks: bool,
     /// Compiled with `/hotpatch`.
-    hot_patch: bool,
+    pub hot_patch: bool,
     /// Compiled with `CvtCIL`.
-    cvtcil: bool,
+    pub cvtcil: bool,
     /// This is a MSIL .NET Module.
-    msil_module: bool,
+    pub msil_module: bool,
     /// Compiled with `/sdl`.
-    sdl: bool,
+    pub sdl: bool,
     /// Compiled with `/ltcg:pgo` or `pgo:`.
-    pgo: bool,
+    pub pgo: bool,
     /// This is a .exp module.
-    exp_module: bool,
+    pub exp_module: bool,
 }
 
 impl<'t> TryFromCtx<'t, SymbolKind> for CompileFlags {
@@ -1028,7 +1027,8 @@
 const CV_LVARFLAG_ISENREG_GLOB: u16 = 0x100;
 const CV_LVARFLAG_ISENREG_STAT: u16 = 0x200;
 
-/// Flags for a [`LocalSymbol`](struct.LocalSymbol.html).
+/// Flags for a [`LocalSymbol`].
+#[non_exhaustive]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub struct LocalVariableFlags {
     /// Variable is a parameter.
@@ -1107,7 +1107,8 @@
 }
 
 // https://github.com/Microsoft/microsoft-pdb/blob/082c5290e5aff028ae84e43affa8be717aa7af73/include/cvinfo.h#L4456
-/// Flags of an [`ExportSymbol`](struct.ExportSymbol.html).
+/// Flags of an [`ExportSymbol`].
+#[non_exhaustive]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub struct ExportSymbolFlags {
     /// An exported constant.
@@ -1278,6 +1279,7 @@
 }
 
 /// A thunk kind
+#[non_exhaustive]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum ThunkKind<'t> {
     /// Standard thunk
@@ -1359,7 +1361,8 @@
 const CV_SEPCODEFLAG_IS_LEXICAL_SCOPE: u32 = 0x01;
 const CV_SEPCODEFLAG_RETURNS_TO_PARENT: u32 = 0x02;
 
-/// Flags for a [`SeparatedCodeSymbol`](struct.SeparatedCodeSymbol.html).
+/// Flags for a [`SeparatedCodeSymbol`].
+#[non_exhaustive]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub struct SeparatedCodeFlags {
     /// S_SEPCODE doubles as lexical scope.
@@ -1476,8 +1479,8 @@
 
 impl<'s> SymbolTable<'s> {
     /// Parses a symbol table from raw stream data.
-    pub(crate) fn parse(stream: Stream<'s>) -> Result<Self> {
-        Ok(SymbolTable { stream })
+    pub(crate) fn new(stream: Stream<'s>) -> Self {
+        SymbolTable { stream }
     }
 
     /// Returns an iterator that can traverse the symbol table in sequential order.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/constants.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/constants.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/constants.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/constants.rs	2021-12-09 12:01:26.000000000 +0000
@@ -174,6 +174,8 @@
 pub const LF_UDT_MOD_SRC_LINE: u16 = 0x1607; // module  source and line on where an UDT is defined
                                              // only generated by linker
 
+pub const LF_STRUCTURE19: u16 = 0x1609;
+
 pub const LF_ID_LAST: u16 = LF_UDT_MOD_SRC_LINE + 1; // one greater than the last ID record
 pub const LF_ID_MAX: u16 = LF_ID_LAST - 1;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/data.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/data.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/data.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/data.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,6 +12,7 @@
 use crate::tpi::primitive::*;
 
 /// Encapsulates parsed data about a `Type`.
+#[non_exhaustive]
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum TypeData<'t> {
     Primitive(PrimitiveType),
@@ -91,6 +92,27 @@
             Ok(TypeData::Class(class))
         }
 
+        // https://github.com/microsoft/microsoft-pdb/issues/50#issuecomment-737890766
+        LF_STRUCTURE19 => {
+            let mut class = ClassType {
+                kind: ClassKind::Struct,
+                properties: TypeProperties(buf.parse_u32()? as u16),
+                fields: parse_optional_type_index(&mut buf)?,
+                derived_from: parse_optional_type_index(&mut buf)?,
+                vtable_shape: parse_optional_type_index(&mut buf)?,
+                count: buf.parse_u16()?,
+                size: parse_unsigned(&mut buf)? as u16,
+                name: parse_string(leaf, buf)?,
+                unique_name: None,
+            };
+
+            if class.properties.has_unique_name() {
+                class.unique_name = Some(parse_string(leaf, buf)?);
+            }
+
+            Ok(TypeData::Class(class))
+        }
+
         // https://github.com/Microsoft/microsoft-pdb/blob/082c5290e5aff028ae84e43affa8be717aa7af73/include/cvinfo.h#L2580-L2586
         LF_MEMBER | LF_MEMBER_ST => Ok(TypeData::Member(MemberType {
             attributes: FieldAttributes(buf.parse_u16()?),
@@ -414,7 +436,7 @@
 }
 
 #[inline]
-fn parse_optional_type_index<'t>(buf: &mut ParseBuffer<'t>) -> Result<Option<TypeIndex>> {
+fn parse_optional_type_index(buf: &mut ParseBuffer<'_>) -> Result<Option<TypeIndex>> {
     let index = buf.parse()?;
     if index == TypeIndex(0) || index == TypeIndex(0xffff) {
         Ok(None)
@@ -433,7 +455,7 @@
 }
 
 #[inline]
-fn parse_padding<'t>(buf: &mut ParseBuffer<'t>) -> Result<()> {
+fn parse_padding(buf: &mut ParseBuffer<'_>) -> Result<()> {
     while !buf.is_empty() && buf.peek_u8()? >= 0xf0 {
         let padding = buf.parse_u8()?;
         if padding > 0xf0 {
@@ -446,7 +468,7 @@
 }
 
 // https://github.com/Microsoft/microsoft-pdb/blob/082c5290e5aff028ae84e43affa8be717aa7af73/pdbdump/pdbdump.cpp#L2417-L2456
-fn parse_unsigned<'t>(buf: &mut ParseBuffer<'t>) -> Result<u64> {
+fn parse_unsigned(buf: &mut ParseBuffer<'_>) -> Result<u64> {
     let leaf = buf.parse_u16()?;
     if leaf < LF_NUMERIC {
         // the u16 directly encodes a value
@@ -602,10 +624,7 @@
 
     #[inline]
     pub fn is_intro_virtual(self) -> bool {
-        match self.method_properties() {
-            0x04 | 0x06 => true,
-            _ => false,
-        }
+        matches!(self.method_properties(), 0x04 | 0x06)
     }
 
     // TODO
@@ -748,10 +767,10 @@
 
     /// Returns `true` if this points to a member (either data or function).
     pub fn pointer_to_member(self) -> bool {
-        match self.pointer_mode() {
-            PointerMode::Member | PointerMode::MemberFunction => true,
-            _ => false,
-        }
+        matches!(
+            self.pointer_mode(),
+            PointerMode::Member | PointerMode::MemberFunction
+        )
     }
 
     /// Returns `true` if this is a flat `0:32` pointer.
@@ -781,10 +800,10 @@
 
     /// Is this a C++ reference, as opposed to a C pointer?
     pub fn is_reference(self) -> bool {
-        match self.pointer_mode() {
-            PointerMode::LValueReference | PointerMode::RValueReference => true,
-            _ => false,
-        }
+        matches!(
+            self.pointer_mode(),
+            PointerMode::LValueReference | PointerMode::RValueReference
+        )
     }
 
     /// The size of the pointer in bytes.
@@ -1057,3 +1076,26 @@
 ParseBuf::from("\x03\x15\xb7\x16\x00\x00\x23\x00\x00\x00\x28\x00\x00\xf1").as_bytes(),
 ParseBuf::from("\x03\x15\x14\x10\x00\x00\x23\x00\x00\x00\x55\x00\x00\xf1").as_bytes(),
 */
+
+#[test]
+fn kind_1609() {
+    let data = &[
+        9, 22, 0, 2, 0, 0, 22, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 6, 0, 72, 95, 115, 105, 122,
+        101, 0, 46, 63, 65, 85, 72, 95, 115, 105, 122, 101, 64, 64, 0,
+    ][..];
+
+    assert_eq!(
+        parse_type_data(&mut ParseBuffer::from(data)).expect("parse"),
+        TypeData::Class(ClassType {
+            kind: ClassKind::Struct,
+            count: 2,
+            properties: TypeProperties(512),
+            fields: Some(TypeIndex(0x1016)),
+            derived_from: None,
+            vtable_shape: None,
+            size: 6,
+            name: RawString::from("H_size"),
+            unique_name: Some(RawString::from(".?AUH_size@@")),
+        })
+    );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/id.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/id.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/id.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/id.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 use crate::tpi::constants::*;
 
 #[inline]
-fn parse_optional_id_index<'t>(buf: &mut ParseBuffer<'t>) -> Result<Option<IdIndex>> {
+fn parse_optional_id_index(buf: &mut ParseBuffer<'_>) -> Result<Option<IdIndex>> {
     Ok(match buf.parse()? {
         IdIndex(0) => None,
         index => Some(index),
@@ -21,6 +21,7 @@
 }
 
 /// Encapsulates parsed data about an `Id`.
+#[non_exhaustive]
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum IdData<'t> {
     /// Global function, usually inlined.
@@ -78,18 +79,21 @@
                 name: parse_string(leaf, &mut buf)?,
             }),
             LF_UDT_SRC_LINE | LF_UDT_MOD_SRC_LINE => {
-                let mut udt = UserDefinedTypeSourceId {
-                    udt: buf.parse()?,
-                    source_file: buf.parse()?,
-                    line: buf.parse()?,
-                    module: None,
+                let udt = buf.parse()?;
+                let file_id = buf.parse()?;
+                let line = buf.parse()?;
+
+                let source_file = if leaf == self::LF_UDT_SRC_LINE {
+                    UserDefinedTypeSourceFileRef::Local(IdIndex(file_id))
+                } else {
+                    UserDefinedTypeSourceFileRef::Remote(buf.parse()?, StringRef(file_id))
                 };
 
-                if leaf == LF_UDT_MOD_SRC_LINE {
-                    udt.module = Some(buf.parse()?);
-                }
-
-                IdData::UserDefinedTypeSource(udt)
+                IdData::UserDefinedTypeSource(UserDefinedTypeSourceId {
+                    udt,
+                    source_file,
+                    line,
+                })
             }
             _ => return Err(Error::UnimplementedTypeKind(leaf)),
         };
@@ -100,7 +104,7 @@
 
 /// Global function, usually inlined.
 ///
-/// This Id is usually referenced by [`InlineSiteSymbol`](struct.InlineSiteSymbol.html).
+/// This Id is usually referenced by [`InlineSiteSymbol`](crate::InlineSiteSymbol).
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct FunctionId<'t> {
     /// Parent scope of this id.
@@ -113,7 +117,7 @@
 
 /// Member function, usually inlined.
 ///
-/// This Id is usually referenced by [`InlineSiteSymbol`](struct.InlineSiteSymbol.html).
+/// This Id is usually referenced by [`InlineSiteSymbol`](crate::InlineSiteSymbol).
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct MemberFunctionId<'t> {
     /// Index of the parent type.
@@ -126,7 +130,7 @@
 
 /// Tool, version and command line build information.
 ///
-/// This Id is usually referenced by [`BuildInfoSymbol`](struct.BuildInfoSymbol.html).
+/// This Id is usually referenced by [`BuildInfoSymbol`](crate::BuildInfoSymbol).
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct BuildInfoId {
     /// Indexes of build arguments.
@@ -135,7 +139,7 @@
 
 /// A list of substrings.
 ///
-/// This Id is usually referenced by [`StringId`](struct.StringId.html).
+/// This Id is usually referenced by [`StringId`].
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct StringListId {
     /// The list of substrings.
@@ -144,8 +148,7 @@
 
 /// A string.
 ///
-/// This Id is usually referenced by [`FunctionId`](struct.FunctionId.html) and contains the
-/// full namespace of a function.
+/// This Id is usually referenced by [`FunctionId`] and contains the full namespace of a function.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct StringId<'t> {
     /// Index of the list of substrings.
@@ -154,17 +157,28 @@
     pub name: RawString<'t>,
 }
 
+/// A reference to the source file name of a [`UserDefinedTypeSourceId`].
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum UserDefinedTypeSourceFileRef {
+    /// Index of the source file name in the [`IdInformation`](crate::IdInformation) of the same module.
+    ///
+    /// The index should resolve to a [`IdData::String`].
+    Local(IdIndex),
+    /// Reference into the [`StringTable`](crate::StringTable) of another module that contributes
+    /// this UDT definition.
+    ///
+    /// Use [`DebugInformation::modules`](crate::DebugInformation::modules) to resolve the
+    /// corresponding module.
+    Remote(u16, StringRef),
+}
+
 /// Source and line of the definition of a User Defined Type (UDT).
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UserDefinedTypeSourceId {
     /// Index of the UDT's type definition.
     pub udt: TypeIndex,
-    /// Index of the source file name.
-    pub source_file: IdIndex,
+    /// Reference to the source file name.
+    pub source_file: UserDefinedTypeSourceFileRef,
     /// Line number in the source file.
     pub line: u32,
-    /// Module that contributes this UDT definition.
-    ///
-    /// If None, the UDT is declared in the same module.
-    pub module: Option<u16>,
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,9 +37,10 @@
 ///    functions, build infos and source references. Its contents are identified by [`IdIndex`].
 ///
 /// Items in these streams are stored by their index in ascending order. Symbols declared in
-/// [`ModuleInfo`] can refer to items in both streams, as well as items to other items with one
-/// exception: `Type`s cannot refer to `Id`s. Also, the PDB format requires that items refer only to
-/// types with lower indexes. Thus, the stream of items forms a directed acyclic graph.
+/// [`ModuleInfo`](crate::ModuleInfo) can refer to items in both streams, as well as items to other
+/// items with one exception: `Type`s cannot refer to `Id`s. Also, the PDB format requires that
+/// items refer only to types with lower indexes. Thus, the stream of items forms a directed acyclic
+/// graph.
 ///
 /// Both streams can iterate by their index using [`ItemInformation::iter`]. Additionally,
 /// [`ItemFinder`] is a secondary data structure to provide efficient backtracking for random
@@ -123,22 +124,6 @@
 /// # }
 /// # assert!(test().expect("test") > 8000);
 /// ```
-///
-/// [`ItemInformation::iter`]: struct.ItemInformation.html#method.iter
-/// [`TypeInformation`]: type.TypeInformation.html
-/// [`IdInformation`]: type.IdInformation.html
-/// [`ItemFinder`]: struct.ItemFinder.html
-/// [`TypeFinder`]: type.TypeFinder.html
-/// [`IdFinder`]: type.IdFinder.html
-/// [`ItemIndex`]: trait.ItemIndex.html
-/// [`TypeIndex`]: struct.TypeIndex.html
-/// [`IdIndex`]: struct.IdIndex.html
-/// [`ItemIter`]: struct.ItemIter.html
-/// [`TypeIter`]: type.TypeIter.html
-/// [`IdIter`]: type.IdIter.html
-/// [`Item`]: struct.Item.html
-/// [`Type`]: type.Type.html
-/// [`Id`]: type.Id.html
 #[derive(Debug)]
 pub struct ItemInformation<'s, I> {
     stream: Stream<'s>,
@@ -184,8 +169,6 @@
     /// Note that in the case of the type stream ([`TypeInformation`]) primitive types are not
     /// stored in the PDB file. The number of distinct types reachable via this table will be higher
     /// than `len()`.
-    ///
-    /// [`TypeInformation`]: type.TypeInformation.html
     pub fn len(&self) -> usize {
         (self.header.maximum_index - self.header.minimum_index) as usize
     }
@@ -200,8 +183,6 @@
     ///
     /// The `ItemFinder` is initially empty and must be populated by iterating. See the struct-level
     /// docs for an example.
-    ///
-    /// [`ItemIndex`]: trait.ItemIndex.html
     pub fn finder(&self) -> ItemFinder<'_, I> {
         ItemFinder::new(self, 3)
     }
@@ -220,17 +201,10 @@
 ///
 /// The data held by items can be parsed:
 ///
-///  - [`Type::parse`] returns [`TypeData`].
-///  - [`Id::parse`] returns [`IdData`].
+///  - [`Type::parse`](Self::parse) returns [`TypeData`].
+///  - [`Id::parse`](Self::parse) returns [`IdData`].
 ///
 /// Depending on the stream, this can either be a [`Type`] or [`Id`].
-///
-/// [`Type`]: type.Type.html
-/// [`Id`]: type.Id.html
-/// [`Type::parse`]: struct.Item.html#method.parse
-/// [`Id::parse`]: struct.Item.html#method.parse-1
-/// [`TypeData`]: enum.TypeData.html
-/// [`IdData`]: enum.IdData.html
 #[derive(Copy, Clone, PartialEq)]
 pub struct Item<'t, I> {
     index: I,
@@ -244,9 +218,6 @@
     /// Returns this item's index.
     ///
     /// Depending on the stream, either a [`TypeIndex`] or [`IdIndex`].
-    ///
-    /// [`TypeIndex`]: struct.TypeIndex.html
-    /// [`IdIndex`]: struct.IdIndex.html
     pub fn index(&self) -> I {
         self.index
     }
@@ -268,8 +239,6 @@
     /// Returns the identifier of the kind of data stored by this this `Item`.
     ///
     /// As a special case, if this is a primitive [`Type`], this function will return `0xffff`.
-    ///
-    /// [`Type`]: type.Type.html
     #[inline]
     pub fn raw_kind(&self) -> u16 {
         debug_assert!(self.data.len() >= 2);
@@ -293,13 +262,14 @@
     }
 }
 
-/// In-memory index for efficient random-access of [`Items`] by index.
+/// In-memory index for efficient random-access to [`Item`]s by index.
 ///
 /// `ItemFinder` can be obtained via [`ItemInformation::finder`]. It starts out empty and must be
-/// populated by calling [`update`] while iterating. There are two typedefs for easier use:
+/// populated by calling [`ItemFinder::update`] while iterating. There are two typedefs for easier
+/// use:
 ///
-///  - [`TypeFinder`] for finding [`Types`] in a [`TypeInformation`] (TPI stream).
-///  - [`IdFinder`] for finding [`Ids`] in a [`IdInformation`] (IPI stream).
+///  - [`TypeFinder`] for finding [`Type`]s in a [`TypeInformation`](crate::TypeInformation) (TPI stream).
+///  - [`IdFinder`] for finding [`Id`]s in a [`IdInformation`](crate::IdInformation) (IPI stream).
 ///
 /// `ItemFinder` allocates all the memory it needs when it is first created. The footprint is
 /// directly proportional to the total number of types; see [`ItemInformation::len`].
@@ -339,16 +309,6 @@
 /// A `shift` of 2 or 3 is likely appropriate for most workloads. 500K items would require 1 MB or
 /// 500 KB of memory respectively, and lookups -- though indirect -- would still usually need only
 /// one or two 64-byte cache lines.
-///
-/// [`Items`]: struct.Item.html
-/// [`ItemInformation::finder`]: struct.ItemInformation.html#method.finder
-/// [`ItemInformation::len`]: struct.ItemInformation.html#method.len
-/// [`TypeInformation`]: type.TypeInformation.html
-/// [`IdInformation`]: type.IdInformation.html
-/// [`TypeFinder`]: type.TypeFinder.html
-/// [`Types`]: type.Type.html
-/// [`IdFinder`]: type.IdFinder.html
-/// [`Ids`]: type.Id.html
 #[derive(Debug)]
 pub struct ItemFinder<'t, I> {
     buffer: ParseBuffer<'t>,
@@ -416,9 +376,6 @@
     ///
     /// Do this each time you call `.next()`. See documentation of [`ItemInformation`] for an
     /// example.
-    ///
-    /// [`ItemIter`]: struct.ItemIter.html
-    /// [`ItemInformation`]: struct.ItemInformation.html
     #[inline]
     pub fn update(&mut self, iterator: &ItemIter<'t, I>) {
         let (vec_index, iteration_count) = self.resolve(iterator.index);
@@ -477,14 +434,12 @@
     }
 }
 
-/// An iterator over items in [`TypeInformation`] or [`IdInformation`].
+/// An iterator over items in [`TypeInformation`](crate::TypeInformation) or
+/// [`IdInformation`](crate::IdInformation).
 ///
 /// The TPI and IPI streams are represented internally as a series of records, each of which have a
 /// length, a kind, and a type-specific field layout. Iteration performance is therefore similar to
 /// a linked list.
-///
-/// [`TypeInformation`]: type.TypeInformation.html
-/// [`IdInformation`]: type.IdInformation.html
 #[derive(Debug)]
 pub struct ItemIter<'t, I> {
     buf: ParseBuffer<'t>,
@@ -532,25 +487,15 @@
 ///
 /// This stream exposes types, the variants of which are enumerated by [`TypeData`]. See
 /// [`ItemInformation`] for more information on accessing types.
-///
-/// [`TypeData`]: enum.TypeData.html
-/// [`ItemInformation`]: struct.ItemInformation.html
 pub type TypeInformation<'s> = ItemInformation<'s, TypeIndex>;
 
-/// In-memory index for efficient random-access of [`Types`] by index.
+/// In-memory index for efficient random-access of [`Type`]s by index.
 ///
-/// `TypeFinder` can be obtained via [`TypeInformation::finder`]. See [`ItemFinder`] for more
-/// information.
-///
-/// [`Types`]: type.Type.html
-/// [`TypeInformation::finder`]: struct.ItemInformation.html#method.finder
-/// [`ItemFinder`]: struct.ItemFinder.html
+/// `TypeFinder` can be obtained via [`TypeInformation::finder`](ItemInformation::finder). See
+/// [`ItemFinder`] for more information.
 pub type TypeFinder<'t> = ItemFinder<'t, TypeIndex>;
 
-/// An iterator over [`Types`] returned by [`TypeInformation::iter`].
-///
-/// [`TypeInformation::iter`]: struct.ItemInformation.html#method.iter
-/// [`Types`]: type.Type.html
+/// An iterator over [`Type`]s returned by [`TypeInformation::iter`](ItemInformation::iter).
 pub type TypeIter<'t> = ItemIter<'t, TypeIndex>;
 
 /// Information on a primitive type, class, or procedure.
@@ -579,25 +524,15 @@
 ///
 /// This stream exposes types, the variants of which are enumerated by [`IdData`]. See
 /// [`ItemInformation`] for more information on accessing types.
-///
-/// [`IdData`]: enum.IdData.html
-/// [`ItemInformation`]: struct.ItemInformation.html
 pub type IdInformation<'s> = ItemInformation<'s, IdIndex>;
 
-/// In-memory index for efficient random-access of [`Ids`] by index.
-///
-/// `IdFinder` can be obtained via [`IdInformation::finder`]. See [`ItemFinder`] for more
-/// information.
+/// In-memory index for efficient random-access of [`Id`]s by index.
 ///
-/// [`Ids`]: type.Id.html
-/// [`IdInformation::finder`]: struct.ItemInformation.html#method.finder
-/// [`ItemFinder`]: struct.ItemFinder.html
+/// `IdFinder` can be obtained via [`IdInformation::finder`](ItemInformation::finder). See
+/// [`ItemFinder`] for more information.
 pub type IdFinder<'t> = ItemFinder<'t, IdIndex>;
 
-/// An iterator over [`Ids`] returned by [`IdInformation::iter`].
-///
-/// [`IdInformation::iter`]: struct.ItemInformation.html#method.iter
-/// [`Ids`]: type.Id.html
+/// An iterator over [`Id`]s returned by [`IdInformation::iter`](ItemInformation::iter).
 pub type IdIter<'t> = ItemIter<'t, IdIndex>;
 
 /// Information on an inline function, build infos or source references.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/primitive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/primitive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/src/tpi/primitive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/src/tpi/primitive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,6 +33,7 @@
 }
 
 /// A simple type.
+#[non_exhaustive]
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum PrimitiveKind {
     /// Uncharacterized type (no type)
@@ -166,8 +167,8 @@
 
 /// Pointer mode of primitive types.
 ///
-/// This is partially overlapping with [`PointerKind`](enum.PointerKind.html) for regular pointer
-/// type definitions. While `PointerKind` can specify many more pointer types, including relative
+/// This is partially overlapping with [`PointerKind`](crate::PointerKind) for regular pointer type
+/// definitions. While `PointerKind` can specify many more pointer types, including relative
 /// pointers, `Indirection` also contains a 128-bit variant.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum Indirection {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/tests/omap_address_translation.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/tests/omap_address_translation.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/tests/omap_address_translation.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/tests/omap_address_translation.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,6 +23,22 @@
 }
 
 #[test]
+fn test_omap_section_zero() {
+    // https://github.com/willglynn/pdb/issues/87
+
+    let mut pdb = pdb::PDB::open(open_file()).expect("opening pdb");
+
+    let address = pdb::PdbInternalSectionOffset {
+        offset: 0,
+        section: 0x1234,
+    };
+
+    let address_map = pdb.address_map().expect("address map");
+
+    assert_eq!(address.to_rva(&address_map), None);
+}
+
+#[test]
 fn test_omap_symbol() {
     let mut pdb = pdb::PDB::open(open_file()).expect("opening pdb");
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/tests/symbol_table.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/tests/symbol_table.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/tests/symbol_table.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/tests/symbol_table.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 
 fn setup<F>(func: F)
 where
-    F: FnOnce(&pdb::SymbolTable<'_>, bool) -> (),
+    F: FnOnce(&pdb::SymbolTable<'_>, bool),
 {
     let (file, is_fixture) = if let Ok(filename) = std::env::var("PDB_FILE") {
         (std::fs::File::open(filename).expect("opening file"), false)
@@ -78,7 +78,7 @@
             return;
         }
 
-        let mut map: HashMap<&[u8], Option<pdb::SymbolData>> = HashMap::new();
+        let mut map: HashMap<&[u8], Option<pdb::SymbolData<'_>>> = HashMap::new();
 
         // look for:
         // main(), defined in the program
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/tests/type_information.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/tests/type_information.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pdb/tests/type_information.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pdb/tests/type_information.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 
 fn setup<F>(func: F)
 where
-    F: FnOnce(&pdb::TypeInformation<'_>) -> (),
+    F: FnOnce(&pdb::TypeInformation<'_>),
 {
     let file = if let Ok(filename) = std::env::var("PDB_FILE") {
         std::fs::File::open(filename)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.lock":"dc22ac85e4f2d9721c8353751fa5375423f0713c132bbfc65bff52fa86f8fa73","Cargo.toml":"6af58a5c349afda2efbe0ef44e6be51da5bf0f569867ef6438373040dd6cc94b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","_README.md":"e9901b6c4d50403bfda7e08a92b5c395a8c51eba868c7bd07b03e00ccba702f3","examples/parens.rs":"24b83b7fc014813aa089fd05c3ee36926e215ce74a96b07b2c4033dad4ba15b2","src/error.rs":"40dfdd4d32fde69f5320fe9516abd3b4c92ce570a306a3a010c7328ebc542c98","src/iterators/flat_pairs.rs":"0b602eb86a8fd1c037ece03afbbabce316d5938da84f98ca027e8532c311c396","src/iterators/mod.rs":"dfb9cc6d6c0c96f7365ec69500128e3547c0b15dd4e85a5d36e125649244d57a","src/iterators/pair.rs":"510d52a9a6bdf23b20c3e5156028f92ef43e9d7ca88f526d493b5701105d92d5","src/iterators/pairs.rs":"4b8a0cf20ab10ee16d947cdcffbdea535a1d264ea6a1ec4836cb7f1baff2ca38","src/iterators/queueable_token.rs":"b6c4fd1d43437ea7c6cab45717c1fb66f71fc91aaf3ed9cf9f5686fd8ccfa8f9","src/iterators/tokens.rs":"4deea56d66805afe36afb229b9355b43db051b21836af4a88d1febcc4f762ff6","src/lib.rs":"fba1b443efda3f02f20f16094404a74000bc0c6534a80b20cf74f2314fe2a42c","src/macros.rs":"576dc3b66de8d17da494c4a353474fd9bb5ebcde9ffb0d5e9ce7e950ac5b5e7e","src/parser.rs":"2cb858fa80115bf65ff6ceedf3ad73b33fd112bab2a3db4f97be84d6aa4482b5","src/parser_state.rs":"6ba62636a4fefbd11dd92af4480b4ec03ce213ba3ef18136db84a0fb76abca69","src/position.rs":"1b28abf0c8cfefc0ed305c4072b27c4803946c2e5e0bc1d0a4d20ff70e9eb810","src/prec_climber.rs":"e56e8ef7e8e019b5277f164d44acda2d6b993979cc65457e37463204a462be1c","src/span.rs":"cc6ab623ea4c496ddac79d9f179937f47da7c08b514f917f1a3b4e16ca701f52","src/stack.rs":"4fe043bab74b30049c834132c6d8ffc5e21131bc58b7219c5026968013cd665f","src/token.rs":"4ee741dd833c06f8ae826226fb1e5eaa671732d1c68b6b79dea55856ab8b5a0a","src/unicode/binary.rs":"1dcc20ae3922e92fa753849086f8290bebd6d3a1440c2f3cb3482d2192136323","src/unicode/category.rs":"94923b31f349503958e32def13c0b682e52c08b528dd1e0853b55b17627e4ad6","src/unicode/mod.rs":"66a1525a031a7508bdbf65709829e96541d3cc4f228088107f1b94101beec8d6","tests/calculator.rs":"5787fa07560f3187d0a83042336c8613ca90d71186aea88b79ef2a2ccf06f7ab","tests/json.rs":"430913278a7ed16587ac2fcdab2c68329a96cd5d2d2b2eff01245852792e1af1"},"package":"10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "itoa"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-dependencies = [
- "serde",
- "serde_json",
- "ucd-trie",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-
-[[package]]
-name = "serde"
-version = "1.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-
-[[package]]
-name = "serde_json"
-version = "1.0.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "pest"
-version = "2.1.3"
-authors = ["DragoÈ™ Tiselice <dragostiselice@gmail.com>"]
-description = "The Elegant Parser"
-homepage = "https://pest-parser.github.io/"
-documentation = "https://docs.rs/pest"
-readme = "_README.md"
-keywords = ["pest", "parser", "peg", "grammar"]
-categories = ["parsing"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/pest-parser/pest"
-[dependencies.serde]
-version = "1.0.89"
-optional = true
-
-[dependencies.serde_json]
-version = "1.0.39"
-optional = true
-
-[dependencies.ucd-trie]
-version = "0.1.1"
-
-[features]
-pretty-print = ["serde", "serde_json"]
-[badges.codecov]
-repository = "pest-parser/pest"
-
-[badges.maintenance]
-status = "actively-developed"
-
-[badges.travis-ci]
-repository = "pest-parser/pest"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/examples/parens.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/examples/parens.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/examples/parens.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/examples/parens.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-extern crate pest;
-
-use std::io::{self, Write};
-
-use pest::error::Error;
-use pest::iterators::Pairs;
-use pest::{state, ParseResult, Parser, ParserState};
-
-#[allow(dead_code, non_camel_case_types)]
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-enum Rule {
-    expr,
-    paren,
-    paren_end,
-}
-
-struct ParenParser;
-
-impl Parser<Rule> for ParenParser {
-    fn parse(rule: Rule, input: &str) -> Result<Pairs<Rule>, Error<Rule>> {
-        fn expr(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.sequence(|s| s.repeat(|s| paren(s)).and_then(|s| s.end_of_input()))
-        }
-
-        fn paren(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::paren, |s| {
-                s.sequence(|s| {
-                    s.match_string("(")
-                        .and_then(|s| {
-                            s.optional(|s| {
-                                s.sequence(|s| {
-                                    s.lookahead(true, |s| s.match_string("("))
-                                        .and_then(|s| s.repeat(|s| paren(s)))
-                                })
-                            })
-                        })
-                        .and_then(|s| s.rule(Rule::paren_end, |s| s.match_string(")")))
-                })
-            })
-        }
-
-        state(input, |state| match rule {
-            Rule::expr => expr(state),
-            Rule::paren => paren(state),
-            _ => unreachable!(),
-        })
-    }
-}
-
-#[derive(Debug)]
-struct Paren(Vec<Paren>);
-
-fn expr(pairs: Pairs<Rule>) -> Vec<Paren> {
-    pairs
-        .filter(|p| p.as_rule() == Rule::paren)
-        .map(|p| Paren(expr(p.into_inner())))
-        .collect()
-}
-
-fn main() {
-    loop {
-        let mut line = String::new();
-
-        print!("> ");
-        io::stdout().flush().unwrap();
-
-        io::stdin().read_line(&mut line).unwrap();
-        line.pop();
-
-        match ParenParser::parse(Rule::expr, &line) {
-            Ok(pairs) => println!("{:?}", expr(pairs)),
-            Err(e) => println!("\n{}", e),
-        };
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/_README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/_README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/_README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/_README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-<p align="center">
-  <img src="https://raw.github.com/pest-parser/pest/master/pest-logo.svg?sanitize=true" width="80%"/>
-</p>
-
-# pest. The Elegant Parser
-
-[![Join the chat at https://gitter.im/dragostis/pest](https://badges.gitter.im/dragostis/pest.svg)](https://gitter.im/dragostis/pest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Book](https://img.shields.io/badge/book-WIP-4d76ae.svg)](https://pest-parser.github.io/book)
-[![Docs](https://docs.rs/pest/badge.svg)](https://docs.rs/pest)
-
-[![Build Status](https://travis-ci.org/pest-parser/pest.svg?branch=master)](https://travis-ci.org/pest-parser/pest)
-[![codecov](https://codecov.io/gh/pest-parser/pest/branch/master/graph/badge.svg)](https://codecov.io/gh/pest-parser/pest)
-[![Fuzzit Status](https://app.fuzzit.dev/badge?org_id=pest-parser)](https://app.fuzzit.dev/orgs/pest-parser/dashboard)
-[![Crates.io](https://img.shields.io/crates/d/pest.svg)](https://crates.io/crates/pest)
-[![Crates.io](https://img.shields.io/crates/v/pest.svg)](https://crates.io/crates/pest)
-
-pest is a general purpose parser written in Rust with a focus on accessibility,
-correctness, and performance. It uses parsing expression grammars
-(or [PEG]) as input, which are similar in spirit to regular expressions, but
-which offer the enhanced expressivity needed to parse complex languages.
-
-[PEG]: https://en.wikipedia.org/wiki/Parsing_expression_grammar
-
-## Getting started
-
-The recommended way to start parsing with pest is to read the official [book].
-
-Other helpful resources:
-
-* API reference on [docs.rs]
-* play with grammars and share them on our [fiddle]
-* leave feedback, ask questions, or greet us on [Gitter]
-
-[book]: https://pest-parser.github.io/book
-[docs.rs]: https://docs.rs/pest
-[fiddle]: https://pest-parser.github.io/#editor
-[Gitter]: https://gitter.im/dragostis/pest
-
-## Example
-
-The following is an example of a grammar for a list of alpha-numeric identifiers
-where the first identifier does not start with a digit:
-
-```rust
-alpha = { 'a'..'z' | 'A'..'Z' }
-digit = { '0'..'9' }
-
-ident = { (alpha | digit)+ }
-
-ident_list = _{ !digit ~ ident ~ (" " ~ ident)+ }
-          // ^
-          // ident_list rule is silent which means it produces no tokens
-```
-
-Grammars are saved in separate .pest files which are never mixed with procedural
-code. This results in an always up-to-date formalization of a language that is
-easy to read and maintain.
-
-## Meaningful error reporting
-
-Based on the grammar definition, the parser also includes automatic error
-reporting. For the example above, the input `"123"` will result in:
-
-```
-thread 'main' panicked at ' --> 1:1
-  |
-1 | 123
-  | ^---
-  |
-  = unexpected digit', src/main.rs:12
-```
-while `"ab *"` will result in:
-```
-thread 'main' panicked at ' --> 1:1
-  |
-1 | ab *
-  |    ^---
-  |
-  = expected ident', src/main.rs:12
-```
-
-## Pairs API
-
-The grammar can be used to derive a `Parser` implementation automatically.
-Parsing returns an iterator of nested token pairs:
-
-```rust
-extern crate pest;
-#[macro_use]
-extern crate pest_derive;
-
-use pest::Parser;
-
-#[derive(Parser)]
-#[grammar = "ident.pest"]
-struct IdentParser;
-
-fn main() {
-    let pairs = IdentParser::parse(Rule::ident_list, "a1 b2").unwrap_or_else(|e| panic!("{}", e));
-
-    // Because ident_list is silent, the iterator will contain idents
-    for pair in pairs {
-        // A pair is a combination of the rule which matched and a span of input
-        println!("Rule:    {:?}", pair.as_rule());
-        println!("Span:    {:?}", pair.as_span());
-        println!("Text:    {}", pair.as_str());
-
-        // A pair can be converted to an iterator of the tokens which make it up:
-        for inner_pair in pair.into_inner() {
-            match inner_pair.as_rule() {
-                Rule::alpha => println!("Letter:  {}", inner_pair.as_str()),
-                Rule::digit => println!("Digit:   {}", inner_pair.as_str()),
-                _ => unreachable!()
-            };
-        }
-    }
-}
-```
-
-This produces the following output:
-```
-Rule:    ident
-Span:    Span { start: 0, end: 2 }
-Text:    a1
-Letter:  a
-Digit:   1
-Rule:    ident
-Span:    Span { start: 3, end: 5 }
-Text:    b2
-Letter:  b
-Digit:   2
-```
-
-## Other features
-
-* Precedence climbing
-* Input handling
-* Custom errors
-* Runs on stable Rust
-
-## Projects using pest
-
-* [pest_meta](https://github.com/pest-parser/pest/blob/master/meta/src/grammar.pest) (bootstrapped)
-* [AshPaper](https://github.com/shnewto/ashpaper)
-* [brain](https://github.com/brain-lang/brain)
-* [Chelone](https://github.com/Aaronepower/chelone)
-* [comrak](https://github.com/kivikakk/comrak)
-* [elastic-rs](https://github.com/cch123/elastic-rs)
-* [graphql-parser](https://github.com/Keats/graphql-parser)
-* [handlebars-rust](https://github.com/sunng87/handlebars-rust)
-* [hexdino](https://github.com/Luz/hexdino)
-* [Huia](https://gitlab.com/jimsy/huia/)
-* [jql](https://github.com/yamafaktory/jql)
-* [json5-rs](https://github.com/callum-oakley/json5-rs)
-* [mt940](https://github.com/svenstaro/mt940-rs)
-* [py_literal](https://github.com/jturner314/py_literal)
-* [rouler](https://github.com/jarcane/rouler)
-* [RuSh](https://github.com/lwandrebeck/RuSh)
-* [rs_pbrt](https://github.com/wahn/rs_pbrt)
-* [stache](https://github.com/dgraham/stache)
-* [tera](https://github.com/Keats/tera)
-* [ui_gen](https://github.com/emoon/ui_gen)
-* [ukhasnet-parser](https://github.com/adamgreig/ukhasnet-parser)
-* [ZoKrates](https://github.com/ZoKrates/ZoKrates)
-
-## Special thanks
-
-A special round of applause goes to prof. Marius Minea for his guidance and all
-pest contributors, some of which being none other than my friends.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/error.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,807 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-//! Types for different kinds of parsing failures.
-
-use std::cmp;
-use std::error;
-use std::fmt;
-use std::mem;
-
-use position::Position;
-use span::Span;
-use RuleType;
-
-/// Parse-related error type.
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub struct Error<R> {
-    /// Variant of the error
-    pub variant: ErrorVariant<R>,
-    /// Location within the input string
-    pub location: InputLocation,
-    /// Line/column within the input string
-    pub line_col: LineColLocation,
-    path: Option<String>,
-    line: String,
-    continued_line: Option<String>,
-}
-
-/// Different kinds of parsing errors.
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub enum ErrorVariant<R> {
-    /// Generated parsing error with expected and unexpected `Rule`s
-    ParsingError {
-        /// Positive attempts
-        positives: Vec<R>,
-        /// Negative attempts
-        negatives: Vec<R>,
-    },
-    /// Custom error with a message
-    CustomError {
-        /// Short explanation
-        message: String,
-    },
-}
-
-/// Where an `Error` has occurred.
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub enum InputLocation {
-    /// `Error` was created by `Error::new_from_pos`
-    Pos(usize),
-    /// `Error` was created by `Error::new_from_span`
-    Span((usize, usize)),
-}
-
-/// Line/column where an `Error` has occurred.
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub enum LineColLocation {
-    /// Line/column pair if `Error` was created by `Error::new_from_pos`
-    Pos((usize, usize)),
-    /// Line/column pairs if `Error` was created by `Error::new_from_span`
-    Span((usize, usize), (usize, usize)),
-}
-
-impl<R: RuleType> Error<R> {
-    /// Creates `Error` from `ErrorVariant` and `Position`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::error::{Error, ErrorVariant};
-    /// # use pest::Position;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[allow(dead_code)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// # enum Rule {
-    /// #     open_paren,
-    /// #     closed_paren
-    /// # }
-    /// # let input = "";
-    /// # let pos = Position::from_start(input);
-    /// let error = Error::new_from_pos(
-    ///     ErrorVariant::ParsingError {
-    ///         positives: vec![Rule::open_paren],
-    ///         negatives: vec![Rule::closed_paren]
-    ///     },
-    ///     pos
-    /// );
-    ///
-    /// println!("{}", error);
-    /// ```
-    #[allow(clippy::needless_pass_by_value)]
-    pub fn new_from_pos(variant: ErrorVariant<R>, pos: Position) -> Error<R> {
-        Error {
-            variant,
-            location: InputLocation::Pos(pos.pos()),
-            path: None,
-            line: visualize_whitespace(pos.line_of()),
-            continued_line: None,
-            line_col: LineColLocation::Pos(pos.line_col()),
-        }
-    }
-
-    /// Creates `Error` from `ErrorVariant` and `Span`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::error::{Error, ErrorVariant};
-    /// # use pest::{Position, Span};
-    /// # #[allow(non_camel_case_types)]
-    /// # #[allow(dead_code)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// # enum Rule {
-    /// #     open_paren,
-    /// #     closed_paren
-    /// # }
-    /// # let input = "";
-    /// # let start = Position::from_start(input);
-    /// # let end = start.clone();
-    /// # let span = start.span(&end);
-    /// let error = Error::new_from_span(
-    ///     ErrorVariant::ParsingError {
-    ///         positives: vec![Rule::open_paren],
-    ///         negatives: vec![Rule::closed_paren]
-    ///     },
-    ///     span
-    /// );
-    ///
-    /// println!("{}", error);
-    /// ```
-    #[allow(clippy::needless_pass_by_value)]
-    pub fn new_from_span(variant: ErrorVariant<R>, span: Span) -> Error<R> {
-        let end = span.end_pos();
-
-        let mut end_line_col = end.line_col();
-        // end position is after a \n, so we want to point to the visual lf symbol
-        if end_line_col.1 == 1 {
-            let mut visual_end = end.clone();
-            visual_end.skip_back(1);
-            let lc = visual_end.line_col();
-            end_line_col = (lc.0, lc.1 + 1);
-        };
-
-        let mut line_iter = span.lines();
-        let start_line = visualize_whitespace(line_iter.next().unwrap_or(""));
-        let continued_line = line_iter.last().map(visualize_whitespace);
-
-        Error {
-            variant,
-            location: InputLocation::Span((span.start(), end.pos())),
-            path: None,
-            line: start_line,
-            continued_line,
-            line_col: LineColLocation::Span(span.start_pos().line_col(), end_line_col),
-        }
-    }
-
-    /// Returns `Error` variant with `path` which is shown when formatted with `Display`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::error::{Error, ErrorVariant};
-    /// # use pest::Position;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[allow(dead_code)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// # enum Rule {
-    /// #     open_paren,
-    /// #     closed_paren
-    /// # }
-    /// # let input = "";
-    /// # let pos = Position::from_start(input);
-    /// Error::new_from_pos(
-    ///     ErrorVariant::ParsingError {
-    ///         positives: vec![Rule::open_paren],
-    ///         negatives: vec![Rule::closed_paren]
-    ///     },
-    ///     pos
-    /// ).with_path("file.rs");
-    /// ```
-    pub fn with_path(mut self, path: &str) -> Error<R> {
-        self.path = Some(path.to_owned());
-
-        self
-    }
-
-    /// Renames all `Rule`s if this is a [`ParsingError`]. It does nothing when called on a
-    /// [`CustomError`].
-    ///
-    /// Useful in order to rename verbose rules or have detailed per-`Rule` formatting.
-    ///
-    /// [`ParsingError`]: enum.ErrorVariant.html#variant.ParsingError
-    /// [`CustomError`]: enum.ErrorVariant.html#variant.CustomError
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::error::{Error, ErrorVariant};
-    /// # use pest::Position;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[allow(dead_code)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// # enum Rule {
-    /// #     open_paren,
-    /// #     closed_paren
-    /// # }
-    /// # let input = "";
-    /// # let pos = Position::from_start(input);
-    /// Error::new_from_pos(
-    ///     ErrorVariant::ParsingError {
-    ///         positives: vec![Rule::open_paren],
-    ///         negatives: vec![Rule::closed_paren]
-    ///     },
-    ///     pos
-    /// ).renamed_rules(|rule| {
-    ///     match *rule {
-    ///         Rule::open_paren => "(".to_owned(),
-    ///         Rule::closed_paren => "closed paren".to_owned()
-    ///     }
-    /// });
-    /// ```
-    pub fn renamed_rules<F>(mut self, f: F) -> Error<R>
-    where
-        F: FnMut(&R) -> String,
-    {
-        let variant = match self.variant {
-            ErrorVariant::ParsingError {
-                positives,
-                negatives,
-            } => {
-                let message = Error::parsing_error_message(&positives, &negatives, f);
-                ErrorVariant::CustomError { message }
-            }
-            variant => variant,
-        };
-
-        self.variant = variant;
-
-        self
-    }
-
-    fn start(&self) -> (usize, usize) {
-        match self.line_col {
-            LineColLocation::Pos(line_col) => line_col,
-            LineColLocation::Span(start_line_col, _) => start_line_col,
-        }
-    }
-
-    fn spacing(&self) -> String {
-        let line = match self.line_col {
-            LineColLocation::Pos((line, _)) => line,
-            LineColLocation::Span((start_line, _), (end_line, _)) => cmp::max(start_line, end_line),
-        };
-
-        let line_str_len = format!("{}", line).len();
-
-        let mut spacing = String::new();
-        for _ in 0..line_str_len {
-            spacing.push(' ');
-        }
-
-        spacing
-    }
-
-    fn underline(&self) -> String {
-        let mut underline = String::new();
-
-        let mut start = self.start().1;
-        let end = match self.line_col {
-            LineColLocation::Span(_, (_, mut end)) => {
-                let inverted_cols = start > end;
-                if inverted_cols {
-                    mem::swap(&mut start, &mut end);
-                    start -= 1;
-                    end += 1;
-                }
-
-                Some(end)
-            }
-            _ => None,
-        };
-        let offset = start - 1;
-        let line_chars = self.line.chars();
-
-        for c in line_chars.take(offset) {
-            match c {
-                '\t' => underline.push('\t'),
-                _ => underline.push(' '),
-            }
-        }
-
-        if let Some(end) = end {
-            if end - start > 1 {
-                underline.push('^');
-                for _ in 2..(end - start) {
-                    underline.push('-');
-                }
-                underline.push('^');
-            } else {
-                underline.push('^');
-            }
-        } else {
-            underline.push_str("^---")
-        }
-
-        underline
-    }
-
-    fn message(&self) -> String {
-        match self.variant {
-            ErrorVariant::ParsingError {
-                ref positives,
-                ref negatives,
-            } => Error::parsing_error_message(positives, negatives, |r| format!("{:?}", r)),
-            ErrorVariant::CustomError { ref message } => message.clone(),
-        }
-    }
-
-    fn parsing_error_message<F>(positives: &[R], negatives: &[R], mut f: F) -> String
-    where
-        F: FnMut(&R) -> String,
-    {
-        match (negatives.is_empty(), positives.is_empty()) {
-            (false, false) => format!(
-                "unexpected {}; expected {}",
-                Error::enumerate(negatives, &mut f),
-                Error::enumerate(positives, &mut f)
-            ),
-            (false, true) => format!("unexpected {}", Error::enumerate(negatives, &mut f)),
-            (true, false) => format!("expected {}", Error::enumerate(positives, &mut f)),
-            (true, true) => "unknown parsing error".to_owned(),
-        }
-    }
-
-    fn enumerate<F>(rules: &[R], f: &mut F) -> String
-    where
-        F: FnMut(&R) -> String,
-    {
-        match rules.len() {
-            1 => f(&rules[0]),
-            2 => format!("{} or {}", f(&rules[0]), f(&rules[1])),
-            l => {
-                let separated = rules
-                    .iter()
-                    .take(l - 1)
-                    .map(|r| f(r))
-                    .collect::<Vec<_>>()
-                    .join(", ");
-                format!("{}, or {}", separated, f(&rules[l - 1]))
-            }
-        }
-    }
-
-    pub(crate) fn format(&self) -> String {
-        let spacing = self.spacing();
-        let path = self
-            .path
-            .as_ref()
-            .map(|path| format!("{}:", path))
-            .unwrap_or_default();
-
-        let pair = (self.line_col.clone(), &self.continued_line);
-        if let (LineColLocation::Span(_, end), &Some(ref continued_line)) = pair {
-            let has_line_gap = end.0 - self.start().0 > 1;
-            if has_line_gap {
-                format!(
-                    "{s    }--> {p}{ls}:{c}\n\
-                     {s    } |\n\
-                     {ls:w$} | {line}\n\
-                     {s    } | ...\n\
-                     {le:w$} | {continued_line}\n\
-                     {s    } | {underline}\n\
-                     {s    } |\n\
-                     {s    } = {message}",
-                    s = spacing,
-                    w = spacing.len(),
-                    p = path,
-                    ls = self.start().0,
-                    le = end.0,
-                    c = self.start().1,
-                    line = self.line,
-                    continued_line = continued_line,
-                    underline = self.underline(),
-                    message = self.message()
-                )
-            } else {
-                format!(
-                    "{s    }--> {p}{ls}:{c}\n\
-                     {s    } |\n\
-                     {ls:w$} | {line}\n\
-                     {le:w$} | {continued_line}\n\
-                     {s    } | {underline}\n\
-                     {s    } |\n\
-                     {s    } = {message}",
-                    s = spacing,
-                    w = spacing.len(),
-                    p = path,
-                    ls = self.start().0,
-                    le = end.0,
-                    c = self.start().1,
-                    line = self.line,
-                    continued_line = continued_line,
-                    underline = self.underline(),
-                    message = self.message()
-                )
-            }
-        } else {
-            format!(
-                "{s}--> {p}{l}:{c}\n\
-                 {s} |\n\
-                 {l} | {line}\n\
-                 {s} | {underline}\n\
-                 {s} |\n\
-                 {s} = {message}",
-                s = spacing,
-                p = path,
-                l = self.start().0,
-                c = self.start().1,
-                line = self.line,
-                underline = self.underline(),
-                message = self.message()
-            )
-        }
-    }
-}
-
-impl<R: RuleType> fmt::Display for Error<R> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.format())
-    }
-}
-
-impl<'i, R: RuleType> error::Error for Error<R> {
-    fn description(&self) -> &str {
-        match self.variant {
-            ErrorVariant::ParsingError { .. } => "parsing error",
-            ErrorVariant::CustomError { ref message } => message,
-        }
-    }
-}
-
-fn visualize_whitespace(input: &str) -> String {
-    input.to_owned().replace('\r', "�").replace('\n', "�")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::position;
-    use super::*;
-
-    #[test]
-    fn display_parsing_error_mixed() {
-        let input = "ab\ncd\nef";
-        let pos = position::Position::new(input, 4).unwrap();
-        let error: Error<u32> = Error::new_from_pos(
-            ErrorVariant::ParsingError {
-                positives: vec![1, 2, 3],
-                negatives: vec![4, 5, 6],
-            },
-            pos,
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 2:2",
-                "  |",
-                "2 | cd�",
-                "  |  ^---",
-                "  |",
-                "  = unexpected 4, 5, or 6; expected 1, 2, or 3",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_parsing_error_positives() {
-        let input = "ab\ncd\nef";
-        let pos = position::Position::new(input, 4).unwrap();
-        let error: Error<u32> = Error::new_from_pos(
-            ErrorVariant::ParsingError {
-                positives: vec![1, 2],
-                negatives: vec![],
-            },
-            pos,
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 2:2",
-                "  |",
-                "2 | cd�",
-                "  |  ^---",
-                "  |",
-                "  = expected 1 or 2",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_parsing_error_negatives() {
-        let input = "ab\ncd\nef";
-        let pos = position::Position::new(input, 4).unwrap();
-        let error: Error<u32> = Error::new_from_pos(
-            ErrorVariant::ParsingError {
-                positives: vec![],
-                negatives: vec![4, 5, 6],
-            },
-            pos,
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 2:2",
-                "  |",
-                "2 | cd�",
-                "  |  ^---",
-                "  |",
-                "  = unexpected 4, 5, or 6",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_parsing_error_unknown() {
-        let input = "ab\ncd\nef";
-        let pos = position::Position::new(input, 4).unwrap();
-        let error: Error<u32> = Error::new_from_pos(
-            ErrorVariant::ParsingError {
-                positives: vec![],
-                negatives: vec![],
-            },
-            pos,
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 2:2",
-                "  |",
-                "2 | cd�",
-                "  |  ^---",
-                "  |",
-                "  = unknown parsing error",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_custom_pos() {
-        let input = "ab\ncd\nef";
-        let pos = position::Position::new(input, 4).unwrap();
-        let error: Error<u32> = Error::new_from_pos(
-            ErrorVariant::CustomError {
-                message: "error: big one".to_owned(),
-            },
-            pos,
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 2:2",
-                "  |",
-                "2 | cd�",
-                "  |  ^---",
-                "  |",
-                "  = error: big one",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_custom_span_two_lines() {
-        let input = "ab\ncd\nefgh";
-        let start = position::Position::new(input, 4).unwrap();
-        let end = position::Position::new(input, 9).unwrap();
-        let error: Error<u32> = Error::new_from_span(
-            ErrorVariant::CustomError {
-                message: "error: big one".to_owned(),
-            },
-            start.span(&end),
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 2:2",
-                "  |",
-                "2 | cd�",
-                "3 | efgh",
-                "  |  ^^",
-                "  |",
-                "  = error: big one",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_custom_span_three_lines() {
-        let input = "ab\ncd\nefgh";
-        let start = position::Position::new(input, 1).unwrap();
-        let end = position::Position::new(input, 9).unwrap();
-        let error: Error<u32> = Error::new_from_span(
-            ErrorVariant::CustomError {
-                message: "error: big one".to_owned(),
-            },
-            start.span(&end),
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 1:2",
-                "  |",
-                "1 | ab�",
-                "  | ...",
-                "3 | efgh",
-                "  |  ^^",
-                "  |",
-                "  = error: big one",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_custom_span_two_lines_inverted_cols() {
-        let input = "abcdef\ngh";
-        let start = position::Position::new(input, 5).unwrap();
-        let end = position::Position::new(input, 8).unwrap();
-        let error: Error<u32> = Error::new_from_span(
-            ErrorVariant::CustomError {
-                message: "error: big one".to_owned(),
-            },
-            start.span(&end),
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 1:6",
-                "  |",
-                "1 | abcdef�",
-                "2 | gh",
-                "  | ^----^",
-                "  |",
-                "  = error: big one",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_custom_span_end_after_newline() {
-        let input = "abcdef\n";
-        let start = position::Position::new(input, 0).unwrap();
-        let end = position::Position::new(input, 7).unwrap();
-        assert!(start.at_start());
-        assert!(end.at_end());
-
-        let error: Error<u32> = Error::new_from_span(
-            ErrorVariant::CustomError {
-                message: "error: big one".to_owned(),
-            },
-            start.span(&end),
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 1:1",
-                "  |",
-                "1 | abcdef�",
-                "  | ^-----^",
-                "  |",
-                "  = error: big one",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn display_custom_span_empty() {
-        let input = "";
-        let start = position::Position::new(input, 0).unwrap();
-        let end = position::Position::new(input, 0).unwrap();
-        assert!(start.at_start());
-        assert!(end.at_end());
-
-        let error: Error<u32> = Error::new_from_span(
-            ErrorVariant::CustomError {
-                message: "error: empty".to_owned(),
-            },
-            start.span(&end),
-        );
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 1:1",
-                "  |",
-                "1 | ",
-                "  | ^",
-                "  |",
-                "  = error: empty",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn mapped_parsing_error() {
-        let input = "ab\ncd\nef";
-        let pos = position::Position::new(input, 4).unwrap();
-        let error: Error<u32> = Error::new_from_pos(
-            ErrorVariant::ParsingError {
-                positives: vec![1, 2, 3],
-                negatives: vec![4, 5, 6],
-            },
-            pos,
-        )
-        .renamed_rules(|n| format!("{}", n + 1));
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> 2:2",
-                "  |",
-                "2 | cd�",
-                "  |  ^---",
-                "  |",
-                "  = unexpected 5, 6, or 7; expected 2, 3, or 4",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn error_with_path() {
-        let input = "ab\ncd\nef";
-        let pos = position::Position::new(input, 4).unwrap();
-        let error: Error<u32> = Error::new_from_pos(
-            ErrorVariant::ParsingError {
-                positives: vec![1, 2, 3],
-                negatives: vec![4, 5, 6],
-            },
-            pos,
-        )
-        .with_path("file.rs");
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> file.rs:2:2",
-                "  |",
-                "2 | cd�",
-                "  |  ^---",
-                "  |",
-                "  = unexpected 4, 5, or 6; expected 1, 2, or 3",
-            ]
-            .join("\n")
-        );
-    }
-
-    #[test]
-    fn underline_with_tabs() {
-        let input = "a\txbc";
-        let pos = position::Position::new(input, 2).unwrap();
-        let error: Error<u32> = Error::new_from_pos(
-            ErrorVariant::ParsingError {
-                positives: vec![1, 2, 3],
-                negatives: vec![4, 5, 6],
-            },
-            pos,
-        )
-        .with_path("file.rs");
-
-        assert_eq!(
-            format!("{}", error),
-            vec![
-                " --> file.rs:1:3",
-                "  |",
-                "1 | a	xbc",
-                "  |  	^---",
-                "  |",
-                "  = unexpected 4, 5, or 6; expected 1, 2, or 3",
-            ]
-            .join("\n")
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/flat_pairs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/flat_pairs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/flat_pairs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/flat_pairs.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::fmt;
-use std::rc::Rc;
-
-use super::pair::{self, Pair};
-use super::queueable_token::QueueableToken;
-use super::tokens::{self, Tokens};
-use RuleType;
-
-/// An iterator over [`Pair`]s. It is created by [`Pairs::flatten`].
-///
-/// [`Pair`]: struct.Pair.html
-/// [`Pairs::flatten`]: struct.Pairs.html#method.flatten
-pub struct FlatPairs<'i, R> {
-    /// # Safety
-    ///
-    /// All `QueueableToken`s' `input_pos` must be valid character boundary indices into `input`.
-    queue: Rc<Vec<QueueableToken<R>>>,
-    input: &'i str,
-    start: usize,
-    end: usize,
-}
-
-/// # Safety
-///
-/// All `QueueableToken`s' `input_pos` must be valid character boundary indices into `input`.
-pub unsafe fn new<R: RuleType>(
-    queue: Rc<Vec<QueueableToken<R>>>,
-    input: &str,
-    start: usize,
-    end: usize,
-) -> FlatPairs<R> {
-    FlatPairs {
-        queue,
-        input,
-        start,
-        end,
-    }
-}
-
-impl<'i, R: RuleType> FlatPairs<'i, R> {
-    /// Returns the `Tokens` for these pairs.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "";
-    /// let pairs = pest::state(input, |state| {
-    ///     // generating Token pair with Rule::a ...
-    /// #     state.rule(Rule::a, |s| Ok(s))
-    /// }).unwrap();
-    /// let tokens: Vec<_> = pairs.flatten().tokens().collect();
-    ///
-    /// assert_eq!(tokens.len(), 2);
-    /// ```
-    #[inline]
-    pub fn tokens(self) -> Tokens<'i, R> {
-        tokens::new(self.queue, self.input, self.start, self.end)
-    }
-
-    fn next_start(&mut self) {
-        self.start += 1;
-
-        while self.start < self.end && !self.is_start(self.start) {
-            self.start += 1;
-        }
-    }
-
-    fn next_start_from_end(&mut self) {
-        self.end -= 1;
-
-        while self.end >= self.start && !self.is_start(self.end) {
-            self.end -= 1;
-        }
-    }
-
-    fn is_start(&self, index: usize) -> bool {
-        match self.queue[index] {
-            QueueableToken::Start { .. } => true,
-            QueueableToken::End { .. } => false,
-        }
-    }
-}
-
-impl<'i, R: RuleType> Iterator for FlatPairs<'i, R> {
-    type Item = Pair<'i, R>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.start >= self.end {
-            return None;
-        }
-
-        let pair = unsafe { pair::new(Rc::clone(&self.queue), self.input, self.start) };
-
-        self.next_start();
-
-        Some(pair)
-    }
-}
-
-impl<'i, R: RuleType> DoubleEndedIterator for FlatPairs<'i, R> {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        if self.end <= self.start {
-            return None;
-        }
-
-        self.next_start_from_end();
-
-        let pair = unsafe { pair::new(Rc::clone(&self.queue), self.input, self.end) };
-
-        Some(pair)
-    }
-}
-
-impl<'i, R: RuleType> fmt::Debug for FlatPairs<'i, R> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("FlatPairs")
-            .field("pairs", &self.clone().collect::<Vec<_>>())
-            .finish()
-    }
-}
-
-impl<'i, R: Clone> Clone for FlatPairs<'i, R> {
-    fn clone(&self) -> FlatPairs<'i, R> {
-        FlatPairs {
-            queue: Rc::clone(&self.queue),
-            input: self.input,
-            start: self.start,
-            end: self.end,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::super::macros::tests::*;
-    use super::super::super::Parser;
-
-    #[test]
-    fn iter_for_flat_pairs() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-
-        assert_eq!(
-            pairs.flatten().map(|p| p.as_rule()).collect::<Vec<Rule>>(),
-            vec![Rule::a, Rule::b, Rule::c]
-        );
-    }
-
-    #[test]
-    fn double_ended_iter_for_flat_pairs() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-        assert_eq!(
-            pairs
-                .flatten()
-                .rev()
-                .map(|p| p.as_rule())
-                .collect::<Vec<Rule>>(),
-            vec![Rule::c, Rule::b, Rule::a]
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-//! Types and iterators for parser output.
-
-mod flat_pairs;
-mod pair;
-pub(crate) mod pairs;
-mod queueable_token;
-mod tokens;
-
-pub use self::flat_pairs::FlatPairs;
-pub use self::pair::Pair;
-pub use self::pairs::Pairs;
-pub(crate) use self::queueable_token::QueueableToken;
-pub use self::tokens::Tokens;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/pair.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/pair.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/pair.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/pair.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,389 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::ptr;
-use std::rc::Rc;
-use std::str;
-
-#[cfg(feature = "pretty-print")]
-use serde::ser::SerializeStruct;
-
-use super::pairs::{self, Pairs};
-use super::queueable_token::QueueableToken;
-use super::tokens::{self, Tokens};
-use span::{self, Span};
-use RuleType;
-
-/// A matching pair of [`Token`]s and everything between them.
-///
-/// A matching `Token` pair is formed by a `Token::Start` and a subsequent `Token::End` with the
-/// same `Rule`, with the condition that all `Token`s between them can form such pairs as well.
-/// This is similar to the [brace matching problem](https://en.wikipedia.org/wiki/Brace_matching) in
-/// editors.
-///
-/// [`Token`]: ../enum.Token.html
-#[derive(Clone)]
-pub struct Pair<'i, R> {
-    /// # Safety
-    ///
-    /// All `QueueableToken`s' `input_pos` must be valid character boundary indices into `input`.
-    queue: Rc<Vec<QueueableToken<R>>>,
-    input: &'i str,
-    /// Token index into `queue`.
-    start: usize,
-}
-
-/// # Safety
-///
-/// All `QueueableToken`s' `input_pos` must be valid character boundary indices into `input`.
-pub unsafe fn new<R: RuleType>(
-    queue: Rc<Vec<QueueableToken<R>>>,
-    input: &str,
-    start: usize,
-) -> Pair<R> {
-    Pair {
-        queue,
-        input,
-        start,
-    }
-}
-
-impl<'i, R: RuleType> Pair<'i, R> {
-    /// Returns the `Rule` of the `Pair`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "";
-    /// let pair = pest::state(input, |state| {
-    ///     // generating Token pair with Rule::a ...
-    /// #     state.rule(Rule::a, |s| Ok(s))
-    /// }).unwrap().next().unwrap();
-    ///
-    /// assert_eq!(pair.as_rule(), Rule::a);
-    /// ```
-    #[inline]
-    pub fn as_rule(&self) -> R {
-        match self.queue[self.pair()] {
-            QueueableToken::End { rule, .. } => rule,
-            _ => unreachable!(),
-        }
-    }
-
-    /// Captures a slice from the `&str` defined by the token `Pair`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     ab
-    /// }
-    ///
-    /// let input = "ab";
-    /// let pair = pest::state(input, |state| {
-    ///     // generating Token pair with Rule::ab ...
-    /// #     state.rule(Rule::ab, |s| s.match_string("ab"))
-    /// }).unwrap().next().unwrap();
-    ///
-    /// assert_eq!(pair.as_str(), "ab");
-    /// ```
-    #[inline]
-    pub fn as_str(&self) -> &'i str {
-        let start = self.pos(self.start);
-        let end = self.pos(self.pair());
-
-        // Generated positions always come from Positions and are UTF-8 borders.
-        &self.input[start..end]
-    }
-
-    /// Returns the `Span` defined by the `Pair`, consuming it.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     ab
-    /// }
-    ///
-    /// let input = "ab";
-    /// let pair = pest::state(input, |state| {
-    ///     // generating Token pair with Rule::ab ...
-    /// #     state.rule(Rule::ab, |s| s.match_string("ab"))
-    /// }).unwrap().next().unwrap();
-    ///
-    /// assert_eq!(pair.into_span().as_str(), "ab");
-    /// ```
-    #[inline]
-    #[deprecated(since = "2.0.0", note = "Please use `as_span` instead")]
-    pub fn into_span(self) -> Span<'i> {
-        self.as_span()
-    }
-
-    /// Returns the `Span` defined by the `Pair`, **without** consuming it.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     ab
-    /// }
-    ///
-    /// let input = "ab";
-    /// let pair = pest::state(input, |state| {
-    ///     // generating Token pair with Rule::ab ...
-    /// #     state.rule(Rule::ab, |s| s.match_string("ab"))
-    /// }).unwrap().next().unwrap();
-    ///
-    /// assert_eq!(pair.as_span().as_str(), "ab");
-    /// ```
-    #[inline]
-    pub fn as_span(&self) -> Span<'i> {
-        let start = self.pos(self.start);
-        let end = self.pos(self.pair());
-
-        // Generated positions always come from Positions and are UTF-8 borders.
-        unsafe { span::Span::new_unchecked(self.input, start, end) }
-    }
-
-    /// Returns the inner `Pairs` between the `Pair`, consuming it.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "";
-    /// let pair = pest::state(input, |state| {
-    ///     // generating Token pair with Rule::a ...
-    /// #     state.rule(Rule::a, |s| Ok(s))
-    /// }).unwrap().next().unwrap();
-    ///
-    /// assert!(pair.into_inner().next().is_none());
-    /// ```
-    #[inline]
-    pub fn into_inner(self) -> Pairs<'i, R> {
-        let pair = self.pair();
-
-        pairs::new(self.queue, self.input, self.start + 1, pair)
-    }
-
-    /// Returns the `Tokens` for the `Pair`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "";
-    /// let pair = pest::state(input, |state| {
-    ///     // generating Token pair with Rule::a ...
-    /// #     state.rule(Rule::a, |s| Ok(s))
-    /// }).unwrap().next().unwrap();
-    /// let tokens: Vec<_> = pair.tokens().collect();
-    ///
-    /// assert_eq!(tokens.len(), 2);
-    /// ```
-    #[inline]
-    pub fn tokens(self) -> Tokens<'i, R> {
-        let end = self.pair();
-
-        tokens::new(self.queue, self.input, self.start, end + 1)
-    }
-
-    /// Generates a string that stores the lexical information of `self` in
-    /// a pretty-printed JSON format.
-    #[cfg(feature = "pretty-print")]
-    pub fn to_json(&self) -> String {
-        ::serde_json::to_string_pretty(self).expect("Failed to pretty-print Pair to json.")
-    }
-
-    fn pair(&self) -> usize {
-        match self.queue[self.start] {
-            QueueableToken::Start {
-                end_token_index, ..
-            } => end_token_index,
-            _ => unreachable!(),
-        }
-    }
-
-    fn pos(&self, index: usize) -> usize {
-        match self.queue[index] {
-            QueueableToken::Start { input_pos, .. } | QueueableToken::End { input_pos, .. } => {
-                input_pos
-            }
-        }
-    }
-}
-
-impl<'i, R: RuleType> Pairs<'i, R> {
-    /// Create a new `Pairs` iterator containing just the single `Pair`.
-    pub fn single(pair: Pair<'i, R>) -> Self {
-        let end = pair.pair();
-        pairs::new(pair.queue, pair.input, pair.start, end)
-    }
-}
-
-impl<'i, R: RuleType> fmt::Debug for Pair<'i, R> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Pair")
-            .field("rule", &self.as_rule())
-            .field("span", &self.as_span())
-            .field("inner", &self.clone().into_inner().collect::<Vec<_>>())
-            .finish()
-    }
-}
-
-impl<'i, R: RuleType> fmt::Display for Pair<'i, R> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let rule = self.as_rule();
-        let start = self.pos(self.start);
-        let end = self.pos(self.pair());
-        let mut pairs = self.clone().into_inner().peekable();
-
-        if pairs.peek().is_none() {
-            write!(f, "{:?}({}, {})", rule, start, end)
-        } else {
-            write!(
-                f,
-                "{:?}({}, {}, [{}])",
-                rule,
-                start,
-                end,
-                pairs
-                    .map(|pair| format!("{}", pair))
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            )
-        }
-    }
-}
-
-impl<'i, R: PartialEq> PartialEq for Pair<'i, R> {
-    fn eq(&self, other: &Pair<'i, R>) -> bool {
-        Rc::ptr_eq(&self.queue, &other.queue)
-            && ptr::eq(self.input, other.input)
-            && self.start == other.start
-    }
-}
-
-impl<'i, R: Eq> Eq for Pair<'i, R> {}
-
-impl<'i, R: Hash> Hash for Pair<'i, R> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        (&*self.queue as *const Vec<QueueableToken<R>>).hash(state);
-        (self.input as *const str).hash(state);
-        self.start.hash(state);
-    }
-}
-
-#[cfg(feature = "pretty-print")]
-impl<'i, R: RuleType> ::serde::Serialize for Pair<'i, R> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: ::serde::Serializer,
-    {
-        let start = self.pos(self.start);
-        let end = self.pos(self.pair());
-        let rule = format!("{:?}", self.as_rule());
-        let inner = self.clone().into_inner();
-
-        let mut ser = serializer.serialize_struct("Pairs", 3)?;
-        ser.serialize_field("pos", &(start, end))?;
-        ser.serialize_field("rule", &rule)?;
-
-        if inner.peek().is_none() {
-            ser.serialize_field("inner", &self.as_str())?;
-        } else {
-            ser.serialize_field("inner", &inner)?;
-        }
-
-        ser.end()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use macros::tests::*;
-    use parser::Parser;
-
-    #[test]
-    #[cfg(feature = "pretty-print")]
-    fn test_pretty_print() {
-        let pair = AbcParser::parse(Rule::a, "abcde").unwrap().next().unwrap();
-
-        let expected = r#"{
-  "pos": [
-    0,
-    3
-  ],
-  "rule": "a",
-  "inner": {
-    "pos": [
-      1,
-      2
-    ],
-    "pairs": [
-      {
-        "pos": [
-          1,
-          2
-        ],
-        "rule": "b",
-        "inner": "b"
-      }
-    ]
-  }
-}"#;
-
-        assert_eq!(expected, pair.to_json());
-    }
-
-    #[test]
-    fn pair_into_inner() {
-        let pair = AbcParser::parse(Rule::a, "abcde").unwrap().next().unwrap(); // the tokens a(b())
-
-        let pairs = pair.into_inner(); // the tokens b()
-
-        assert_eq!(2, pairs.tokens().count());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/pairs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/pairs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/pairs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/pairs.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,419 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::ptr;
-use std::rc::Rc;
-use std::str;
-
-#[cfg(feature = "pretty-print")]
-use serde::ser::SerializeStruct;
-
-use super::flat_pairs::{self, FlatPairs};
-use super::pair::{self, Pair};
-use super::queueable_token::QueueableToken;
-use super::tokens::{self, Tokens};
-use RuleType;
-
-/// An iterator over [`Pair`]s. It is created by [`pest::state`] and [`Pair::into_inner`].
-///
-/// [`Pair`]: struct.Pair.html
-/// [`pest::state`]: ../fn.state.html
-/// [`Pair::into_inner`]: struct.Pair.html#method.into_inner
-#[derive(Clone)]
-pub struct Pairs<'i, R> {
-    queue: Rc<Vec<QueueableToken<R>>>,
-    input: &'i str,
-    start: usize,
-    end: usize,
-}
-
-pub fn new<R: RuleType>(
-    queue: Rc<Vec<QueueableToken<R>>>,
-    input: &str,
-    start: usize,
-    end: usize,
-) -> Pairs<R> {
-    Pairs {
-        queue,
-        input,
-        start,
-        end,
-    }
-}
-
-impl<'i, R: RuleType> Pairs<'i, R> {
-    /// Captures a slice from the `&str` defined by the starting position of the first token `Pair`
-    /// and the ending position of the last token `Pair` of the `Pairs`. This also captures
-    /// the input between those two token `Pair`s.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a,
-    ///     b
-    /// }
-    ///
-    /// let input = "a b";
-    /// let pairs = pest::state(input, |state| {
-    ///     // generating Token pairs with Rule::a and Rule::b ...
-    /// #     state.rule(Rule::a, |s| s.match_string("a")).and_then(|s| s.skip(1))
-    /// #         .and_then(|s| s.rule(Rule::b, |s| s.match_string("b")))
-    /// }).unwrap();
-    ///
-    /// assert_eq!(pairs.as_str(), "a b");
-    /// ```
-    #[inline]
-    pub fn as_str(&self) -> &'i str {
-        if self.start < self.end {
-            let start = self.pos(self.start);
-            let end = self.pos(self.end - 1);
-            // Generated positions always come from Positions and are UTF-8 borders.
-            &self.input[start..end]
-        } else {
-            ""
-        }
-    }
-
-    /// Captures inner token `Pair`s and concatenates resulting `&str`s. This does not capture
-    /// the input between token `Pair`s.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a,
-    ///     b
-    /// }
-    ///
-    /// let input = "a b";
-    /// let pairs = pest::state(input, |state| {
-    ///     // generating Token pairs with Rule::a and Rule::b ...
-    /// #     state.rule(Rule::a, |s| s.match_string("a")).and_then(|s| s.skip(1))
-    /// #         .and_then(|s| s.rule(Rule::b, |s| s.match_string("b")))
-    /// }).unwrap();
-    ///
-    /// assert_eq!(pairs.concat(), "ab");
-    /// ```
-    #[inline]
-    pub fn concat(&self) -> String {
-        self.clone()
-            .fold(String::new(), |string, pair| string + pair.as_str())
-    }
-
-    /// Flattens the `Pairs`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a,
-    ///     b
-    /// }
-    ///
-    /// let input = "";
-    /// let pairs = pest::state(input, |state| {
-    ///     // generating nested Token pair with Rule::b inside Rule::a
-    /// #     state.rule(Rule::a, |state| {
-    /// #         state.rule(Rule::b, |s| Ok(s))
-    /// #     })
-    /// }).unwrap();
-    /// let tokens: Vec<_> = pairs.flatten().tokens().collect();
-    ///
-    /// assert_eq!(tokens.len(), 4);
-    /// ```
-    #[inline]
-    pub fn flatten(self) -> FlatPairs<'i, R> {
-        unsafe { flat_pairs::new(self.queue, self.input, self.start, self.end) }
-    }
-
-    /// Returns the `Tokens` for the `Pairs`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use std::rc::Rc;
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "";
-    /// let pairs = pest::state(input, |state| {
-    ///     // generating Token pair with Rule::a ...
-    /// #     state.rule(Rule::a, |s| Ok(s))
-    /// }).unwrap();
-    /// let tokens: Vec<_> = pairs.tokens().collect();
-    ///
-    /// assert_eq!(tokens.len(), 2);
-    /// ```
-    #[inline]
-    pub fn tokens(self) -> Tokens<'i, R> {
-        tokens::new(self.queue, self.input, self.start, self.end)
-    }
-
-    /// Peek at the first inner `Pair` without changing the position of this iterator.
-    #[inline]
-    pub fn peek(&self) -> Option<Pair<'i, R>> {
-        if self.start < self.end {
-            Some(unsafe { pair::new(Rc::clone(&self.queue), self.input, self.start) })
-        } else {
-            None
-        }
-    }
-
-    /// Generates a string that stores the lexical information of `self` in
-    /// a pretty-printed JSON format.
-    #[cfg(feature = "pretty-print")]
-    pub fn to_json(&self) -> String {
-        ::serde_json::to_string_pretty(self).expect("Failed to pretty-print Pairs to json.")
-    }
-
-    fn pair(&self) -> usize {
-        match self.queue[self.start] {
-            QueueableToken::Start {
-                end_token_index, ..
-            } => end_token_index,
-            _ => unreachable!(),
-        }
-    }
-
-    fn pair_from_end(&self) -> usize {
-        match self.queue[self.end - 1] {
-            QueueableToken::End {
-                start_token_index, ..
-            } => start_token_index,
-            _ => unreachable!(),
-        }
-    }
-
-    fn pos(&self, index: usize) -> usize {
-        match self.queue[index] {
-            QueueableToken::Start { input_pos, .. } | QueueableToken::End { input_pos, .. } => {
-                input_pos
-            }
-        }
-    }
-}
-
-impl<'i, R: RuleType> Iterator for Pairs<'i, R> {
-    type Item = Pair<'i, R>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let pair = self.peek()?;
-        self.start = self.pair() + 1;
-        Some(pair)
-    }
-}
-
-impl<'i, R: RuleType> DoubleEndedIterator for Pairs<'i, R> {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        if self.end <= self.start {
-            return None;
-        }
-
-        self.end = self.pair_from_end();
-
-        let pair = unsafe { pair::new(Rc::clone(&self.queue), self.input, self.end) };
-
-        Some(pair)
-    }
-}
-
-impl<'i, R: RuleType> fmt::Debug for Pairs<'i, R> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_list().entries(self.clone()).finish()
-    }
-}
-
-impl<'i, R: RuleType> fmt::Display for Pairs<'i, R> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "[{}]",
-            self.clone()
-                .map(|pair| format!("{}", pair))
-                .collect::<Vec<_>>()
-                .join(", ")
-        )
-    }
-}
-
-impl<'i, R: PartialEq> PartialEq for Pairs<'i, R> {
-    fn eq(&self, other: &Pairs<'i, R>) -> bool {
-        Rc::ptr_eq(&self.queue, &other.queue)
-            && ptr::eq(self.input, other.input)
-            && self.start == other.start
-            && self.end == other.end
-    }
-}
-
-impl<'i, R: Eq> Eq for Pairs<'i, R> {}
-
-impl<'i, R: Hash> Hash for Pairs<'i, R> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        (&*self.queue as *const Vec<QueueableToken<R>>).hash(state);
-        (self.input as *const str).hash(state);
-        self.start.hash(state);
-        self.end.hash(state);
-    }
-}
-
-#[cfg(feature = "pretty-print")]
-impl<'i, R: RuleType> ::serde::Serialize for Pairs<'i, R> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: ::serde::Serializer,
-    {
-        let start = self.pos(self.start);
-        let end = self.pos(self.end - 1);
-        let pairs = self.clone().collect::<Vec<_>>();
-
-        let mut ser = serializer.serialize_struct("Pairs", 2)?;
-        ser.serialize_field("pos", &(start, end))?;
-        ser.serialize_field("pairs", &pairs)?;
-        ser.end()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::super::macros::tests::*;
-    use super::super::super::Parser;
-
-    #[test]
-    #[cfg(feature = "pretty-print")]
-    fn test_pretty_print() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-
-        let expected = r#"{
-  "pos": [
-    0,
-    5
-  ],
-  "pairs": [
-    {
-      "pos": [
-        0,
-        3
-      ],
-      "rule": "a",
-      "inner": {
-        "pos": [
-          1,
-          2
-        ],
-        "pairs": [
-          {
-            "pos": [
-              1,
-              2
-            ],
-            "rule": "b",
-            "inner": "b"
-          }
-        ]
-      }
-    },
-    {
-      "pos": [
-        4,
-        5
-      ],
-      "rule": "c",
-      "inner": "e"
-    }
-  ]
-}"#;
-
-        assert_eq!(expected, pairs.to_json());
-    }
-
-    #[test]
-    fn as_str() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-
-        assert_eq!(pairs.as_str(), "abcde");
-    }
-
-    #[test]
-    fn as_str_empty() {
-        let mut pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-
-        assert_eq!(pairs.nth(1).unwrap().into_inner().as_str(), "");
-    }
-
-    #[test]
-    fn concat() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-
-        assert_eq!(pairs.concat(), "abce");
-    }
-
-    #[test]
-    fn pairs_debug() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-
-        #[rustfmt::skip]
-        assert_eq!(
-            format!("{:?}", pairs),
-            "[\
-                Pair { rule: a, span: Span { str: \"abc\", start: 0, end: 3 }, inner: [\
-                    Pair { rule: b, span: Span { str: \"b\", start: 1, end: 2 }, inner: [] }\
-                ] }, \
-                Pair { rule: c, span: Span { str: \"e\", start: 4, end: 5 }, inner: [] }\
-            ]"
-            .to_owned()
-        );
-    }
-
-    #[test]
-    fn pairs_display() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-
-        assert_eq!(
-            format!("{}", pairs),
-            "[a(0, 3, [b(1, 2)]), c(4, 5)]".to_owned()
-        );
-    }
-
-    #[test]
-    fn iter_for_pairs() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-        assert_eq!(
-            pairs.map(|p| p.as_rule()).collect::<Vec<Rule>>(),
-            vec![Rule::a, Rule::c]
-        );
-    }
-
-    #[test]
-    fn double_ended_iter_for_pairs() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-        assert_eq!(
-            pairs.rev().map(|p| p.as_rule()).collect::<Vec<Rule>>(),
-            vec![Rule::c, Rule::a]
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/queueable_token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/queueable_token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/queueable_token.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/queueable_token.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-// This structure serves to improve performance over Token objects in two ways:
-//
-//   * it is smaller than a Token, leading to both less memory use when stored in the queue but also
-//     increased speed when pushing to the queue
-//   * it finds its pair in O(1) time instead of O(N), since pair positions are known at parse time
-//     and can easily be stored instead of recomputed
-#[derive(Debug)]
-pub enum QueueableToken<R> {
-    Start {
-        end_token_index: usize,
-        input_pos: usize,
-    },
-    End {
-        start_token_index: usize,
-        rule: R,
-        input_pos: usize,
-    },
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/tokens.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/tokens.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/iterators/tokens.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/iterators/tokens.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::fmt;
-use std::rc::Rc;
-use std::str;
-
-use super::queueable_token::QueueableToken;
-use position;
-use token::Token;
-use RuleType;
-
-/// An iterator over [`Token`]s. It is created by [`Pair::tokens`] and [`Pairs::tokens`].
-///
-/// [`Token`]: ../enum.Token.html
-/// [`Pair::tokens`]: struct.Pair.html#method.tokens
-/// [`Pairs::tokens`]: struct.Pairs.html#method.tokens
-#[derive(Clone)]
-pub struct Tokens<'i, R> {
-    /// # Safety:
-    ///
-    /// All `QueueableToken`s' `input_pos` must be valid character boundary indices into `input`.
-    queue: Rc<Vec<QueueableToken<R>>>,
-    input: &'i str,
-    start: usize,
-    end: usize,
-}
-
-// TODO(safety): QueueableTokens must be valid indices into input.
-pub fn new<R: RuleType>(
-    queue: Rc<Vec<QueueableToken<R>>>,
-    input: &str,
-    start: usize,
-    end: usize,
-) -> Tokens<R> {
-    if cfg!(debug_assertions) {
-        for tok in queue.iter() {
-            match *tok {
-                QueueableToken::Start { input_pos, .. } | QueueableToken::End { input_pos, .. } => {
-                    assert!(
-                        input.get(input_pos..).is_some(),
-                        "💥 UNSAFE `Tokens` CREATED 💥"
-                    )
-                }
-            }
-        }
-    }
-
-    Tokens {
-        queue,
-        input,
-        start,
-        end,
-    }
-}
-
-impl<'i, R: RuleType> Tokens<'i, R> {
-    fn create_token(&self, index: usize) -> Token<'i, R> {
-        match self.queue[index] {
-            QueueableToken::Start {
-                end_token_index,
-                input_pos,
-            } => {
-                let rule = match self.queue[end_token_index] {
-                    QueueableToken::End { rule, .. } => rule,
-                    _ => unreachable!(),
-                };
-
-                Token::Start {
-                    rule,
-                    // QueueableTokens are safely created.
-                    pos: unsafe { position::Position::new_unchecked(self.input, input_pos) },
-                }
-            }
-            QueueableToken::End {
-                rule, input_pos, ..
-            } => {
-                Token::End {
-                    rule,
-                    // QueueableTokens are safely created.
-                    pos: unsafe { position::Position::new_unchecked(self.input, input_pos) },
-                }
-            }
-        }
-    }
-}
-
-impl<'i, R: RuleType> Iterator for Tokens<'i, R> {
-    type Item = Token<'i, R>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.start >= self.end {
-            return None;
-        }
-
-        let token = self.create_token(self.start);
-
-        self.start += 1;
-
-        Some(token)
-    }
-}
-
-impl<'i, R: RuleType> DoubleEndedIterator for Tokens<'i, R> {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        if self.end <= self.start {
-            return None;
-        }
-
-        let token = self.create_token(self.end - 1);
-
-        self.end -= 1;
-
-        Some(token)
-    }
-}
-
-impl<'i, R: RuleType> fmt::Debug for Tokens<'i, R> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_list().entries(self.clone()).finish()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::super::macros::tests::*;
-    use super::super::super::Parser;
-    use super::Token;
-
-    #[test]
-    fn double_ended_iter_for_tokens() {
-        let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-        let mut tokens = pairs.clone().tokens().collect::<Vec<Token<Rule>>>();
-        tokens.reverse();
-        let reverse_tokens = pairs.tokens().rev().collect::<Vec<Token<Rule>>>();
-        assert_eq!(tokens, reverse_tokens);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-//! # pest. The Elegant Parser
-//!
-//! pest is a general purpose parser written in Rust with a focus on accessibility, correctness,
-//! and performance. It uses parsing expression grammars (or [PEG]) as input, which are similar in
-//! spirit to regular expressions, but which offer the enhanced expressivity needed to parse
-//! complex languages.
-//!
-//! [PEG]: https://en.wikipedia.org/wiki/Parsing_expression_grammar
-//!
-//! ## Getting started
-//!
-//! The recommended way to start parsing with pest is to read the official [book].
-//!
-//! Other helpful resources:
-//!
-//! * API reference on [docs.rs]
-//! * play with grammars and share them on our [fiddle]
-//! * leave feedback, ask questions, or greet us on [Gitter]
-//!
-//! [book]: https://pest-parser.github.io/book
-//! [docs.rs]: https://docs.rs/pest
-//! [fiddle]: https://pest-parser.github.io/#editor
-//! [Gitter]: https://gitter.im/dragostis/pest
-//!
-//! ## Usage
-//!
-//! The core of pest is the trait [`Parser`], which provides an interface to the parsing
-//! functionality.
-//!
-//! The accompanying crate `pest_derive` can automatically generate a [`Parser`] from a PEG
-//! grammar. Using `pest_derive` is highly encouraged, but it is also possible to implement
-//! [`Parser`] manually if required.
-//!
-//! ## `.pest` files
-//!
-//! Grammar definitions reside in custom `.pest` files located in the crate `src` directory.
-//! Parsers are automatically generated from these files using `#[derive(Parser)]` and a special
-//! `#[grammar = "..."]` attribute on a dummy struct.
-//!
-//! ```ignore
-//! #[derive(Parser)]
-//! #[grammar = "path/to/my_grammar.pest"] // relative to src
-//! struct MyParser;
-//! ```
-//!
-//! The syntax of `.pest` files is documented in the [`pest_derive` crate].
-//!
-//! ## Inline grammars
-//!
-//! Grammars can also be inlined by using the `#[grammar_inline = "..."]` attribute.
-//!
-//! [`Parser`]: trait.Parser.html
-//! [`pest_derive` crate]: https://docs.rs/pest_derive/
-
-#![doc(html_root_url = "https://docs.rs/pest")]
-
-extern crate ucd_trie;
-
-#[cfg(feature = "pretty-print")]
-extern crate serde;
-#[cfg(feature = "pretty-print")]
-extern crate serde_json;
-
-pub use parser::Parser;
-pub use parser_state::{state, Atomicity, Lookahead, MatchDir, ParseResult, ParserState};
-pub use position::Position;
-pub use span::{Lines, Span};
-use std::fmt::Debug;
-use std::hash::Hash;
-pub use token::Token;
-
-pub mod error;
-pub mod iterators;
-mod macros;
-mod parser;
-mod parser_state;
-mod position;
-pub mod prec_climber;
-mod span;
-mod stack;
-mod token;
-#[doc(hidden)]
-pub mod unicode;
-
-/// A trait which parser rules must implement.
-///
-/// This trait is set up so that any struct that implements all of its required traits will
-/// automatically implement this trait as well.
-///
-/// This is essentially a [trait alias](https://github.com/rust-lang/rfcs/pull/1733). When trait
-/// aliases are implemented, this may be replaced by one.
-pub trait RuleType: Copy + Debug + Eq + Hash + Ord {}
-
-impl<T: Copy + Debug + Eq + Hash + Ord> RuleType for T {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/macros.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,455 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! consumes_to {
-    ( $_rules:ident, $tokens:expr, [] ) => ();
-    ( $rules:ident, $tokens:expr, [ $name:ident ( $start:expr, $end:expr ) ] ) => {
-        let expected = format!("expected Start {{ rule: {:?}, pos: Position {{ pos: {} }} }}",
-                               $rules::$name, $start);
-        match $tokens.next().expect(&format!("{} but found nothing", expected)) {
-            $crate::Token::Start { rule, pos } => {
-                let message = format!("{} but found Start {{ rule: {:?}, pos: Position {{ {} }} }}",
-                                      expected, rule, pos.pos());
-
-                if rule != $rules::$name || pos.pos() != $start {
-                    panic!("{}", message);
-                }
-            },
-            token => panic!("{}", format!("{} but found {:?}", expected, token))
-        };
-
-        let expected = format!("expected End {{ rule: {:?}, pos: Position {{ pos: {} }} }}",
-                               $rules::$name, $end);
-        match $tokens.next().expect(&format!("{} but found nothing", expected)) {
-            $crate::Token::End { rule, pos } => {
-                let message = format!("{} but found End {{ rule: {:?}, pos: Position {{ {} }} }}",
-                                      expected, rule, pos.pos());
-
-                if rule != $rules::$name || pos.pos() != $end {
-                    panic!("{}", message);
-                }
-            },
-            token => panic!("{}", format!("{} but found {:?}", expected, token))
-        };
-    };
-    ( $rules:ident, $tokens:expr, [ $name:ident ( $start:expr, $end:expr ),
-                                    $( $names:ident $calls:tt ),* $(,)* ] ) => {
-
-        let expected = format!("expected Start {{ rule: {:?}, pos: Position {{ pos: {} }} }}",
-                               $rules::$name, $start);
-        match $tokens.next().expect(&format!("{} but found nothing", expected)) {
-            $crate::Token::Start { rule, pos } => {
-                let message = format!("{} but found Start {{ rule: {:?}, pos: Position {{ {} }} }}",
-                                      expected, rule, pos.pos());
-
-                if rule != $rules::$name || pos.pos() != $start {
-                    panic!("{}", message);
-                }
-            },
-            token => panic!("{}", format!("{} but found {:?}", expected, token))
-        };
-
-        let expected = format!("expected End {{ rule: {:?}, pos: Position {{ pos: {} }} }}",
-                               $rules::$name, $end);
-        match $tokens.next().expect(&format!("{} but found nothing", expected)) {
-            $crate::Token::End { rule, pos } => {
-                let message = format!("{} but found End {{ rule: {:?}, pos: Position {{ {} }} }}",
-                                      expected, rule, pos.pos());
-
-                if rule != $rules::$name || pos.pos() != $end {
-                    panic!("{}", message);
-                }
-            },
-            token => panic!("{}", format!("{} but found {:?}", expected, token))
-        };
-
-        consumes_to!($rules, $tokens, [ $( $names $calls ),* ]);
-    };
-    ( $rules:ident, $tokens:expr, [ $name:ident ( $start:expr, $end:expr,
-                                                  [ $( $names:ident $calls:tt ),* $(,)* ] ) ] ) => {
-        let expected = format!("expected Start {{ rule: {:?}, pos: Position {{ pos: {} }} }}",
-                               $rules::$name, $start);
-        match $tokens.next().expect(&format!("{} but found nothing", expected)) {
-            $crate::Token::Start { rule, pos } => {
-                let message = format!("{} but found Start {{ rule: {:?}, pos: Position {{ {} }} }}",
-                                      expected, rule, pos.pos());
-
-                if rule != $rules::$name || pos.pos() != $start {
-                    panic!("{}", message);
-                }
-            },
-            token => panic!("{}", format!("{} but found {:?}", expected, token))
-        };
-
-        consumes_to!($rules, $tokens, [ $( $names $calls ),* ]);
-
-        let expected = format!("expected End {{ rule: {:?}, pos: Position {{ pos: {} }} }}",
-                               $rules::$name, $end);
-        match $tokens.next().expect(&format!("{} but found nothing", expected)) {
-            $crate::Token::End { rule, pos } => {
-                let message = format!("{} but found End {{ rule: {:?}, pos: Position {{ {} }} }}",
-                                      expected, rule, pos.pos());
-
-                if rule != $rules::$name || pos.pos() != $end {
-                    panic!("{}", message);
-                }
-            },
-            token => panic!("{}", format!("{} but found {:?}", expected, token))
-        };
-    };
-    ( $rules:ident, $tokens:expr, [ $name:ident ( $start:expr, $end:expr,
-                                                  [ $( $nested_names:ident $nested_calls:tt ),*
-                                                  $(,)* ] ),
-                                    $( $names:ident $calls:tt ),* ] ) => {
-
-        let expected = format!("expected Start {{ rule: {:?}, pos: Position {{ pos: {} }} }}",
-                               $rules::$name, $start);
-        match $tokens.next().expect(&format!("{} but found nothing", expected)) {
-            $crate::Token::Start { rule, pos } => {
-                let message = format!("{} but found Start {{ rule: {:?}, pos: Position {{ {} }} }}",
-                                      expected, rule, pos.pos());
-
-                if rule != $rules::$name || pos.pos() != $start {
-                    panic!("{}", message);
-                }
-            },
-            token => panic!("{}", format!("{} but found {:?}", expected, token))
-        };
-
-        consumes_to!($rules, $tokens, [ $( $nested_names $nested_calls ),* ]);
-
-        let expected = format!("expected End {{ rule: {:?}, pos: Position {{ pos: {} }} }}",
-                               $rules::$name, $end);
-        match $tokens.next().expect(&format!("{} but found nothing", expected)) {
-            $crate::Token::End { rule, pos } => {
-                let message = format!("{} but found End {{ rule: {:?}, pos: Position {{ {} }} }}",
-                                      expected, rule, pos.pos());
-
-                if rule != $rules::$name || pos.pos() != $end {
-                    panic!("{}", message);
-                }
-            },
-            token => panic!("{}", format!("{} but found {:?}", expected, token))
-        };
-
-        consumes_to!($rules, $tokens, [ $( $names $calls ),* ]);
-    };
-}
-
-/// Testing tool that compares produced tokens.
-///
-/// This macro takes several arguments:
-///
-/// * `parser` - name of the data structure implementing `Parser`
-/// * `input` - input to be tested against
-/// * `rule` - `Rule` which will be run
-/// * `tokens` - token pairs of the form `name(start_pos, end_pos, [nested_child_tokens])`
-///
-/// *Note:* `start_pos` and `end_pos` are byte positions.
-///
-/// # Examples
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate pest;
-/// # use pest::Parser;
-/// # use pest::error::Error;
-/// # use pest::iterators::Pairs;
-/// # fn main() {
-/// # #[allow(non_camel_case_types)]
-/// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-/// # enum Rule {
-/// #     a,
-/// #     b,
-/// #     c
-/// # }
-/// #
-/// # struct AbcParser;
-/// #
-/// # impl Parser<Rule> for AbcParser {
-/// #     fn parse<'i>(_: Rule, input: &'i str) -> Result<Pairs<'i, Rule>, Error<Rule>> {
-/// #         pest::state(input, |state| {
-/// #             state.rule(Rule::a, |state| {
-/// #                 state.skip(1).unwrap().rule(Rule::b, |state| {
-/// #                     state.skip(1)
-/// #                 }).unwrap().skip(1)
-/// #             }).and_then(|state| {
-/// #                 state.skip(1).unwrap().rule(Rule::c, |state| {
-/// #                     state.skip(1)
-/// #                 })
-/// #             })
-/// #         })
-/// #     }
-/// # }
-/// parses_to! {
-///     parser: AbcParser,
-///     input:  "abcde",
-///     rule:   Rule::a,
-///     tokens: [
-///         a(0, 3, [
-///             b(1, 2)
-///         ]),
-///         c(4, 5)
-///     ]
-/// };
-/// # }
-/// ```
-#[macro_export]
-macro_rules! parses_to {
-    ( parser: $parser:ident, input: $string:expr, rule: $rules:tt :: $rule:tt,
-      tokens: [ $( $names:ident $calls:tt ),* $(,)* ] ) => {
-
-        #[allow(unused_mut)]
-        {
-            use $crate::Parser;
-
-            let mut tokens = $parser::parse($rules::$rule, $string).unwrap().tokens();
-
-            consumes_to!($rules, &mut tokens, [ $( $names $calls ),* ]);
-
-            let rest: Vec<_> = tokens.collect();
-
-            match rest.len() {
-                0 => (),
-                2 => {
-                    let (first, second) = (&rest[0], &rest[1]);
-
-                    match (first, second) {
-                        (
-                            &$crate::Token::Start { rule: ref first_rule, .. },
-                            &$crate::Token::End { rule: ref second_rule, .. }
-                        ) => {
-                            assert!(
-                                format!("{:?}", first_rule) == "EOI",
-                                format!("expected end of input, but found {:?}", rest)
-                            );
-                            assert!(
-                                format!("{:?}", second_rule) == "EOI",
-                                format!("expected end of input, but found {:?}", rest)
-                            );
-                        }
-                        _ => panic!("expected end of input, but found {:?}", rest)
-                    }
-                }
-                _ => panic!("expected end of input, but found {:?}", rest)
-            };
-        }
-    };
-}
-
-/// Testing tool that compares produced errors.
-///
-/// This macro takes several arguments:
-///
-/// * `parser` - name of the data structure implementing `Parser`
-/// * `input` - input to be tested against
-/// * `rule` - `Rule` which will be run
-/// * `positives` - positive `Rule` attempts that failed
-/// * `negative` - negative `Rule` attempts that failed
-/// * `pos` - byte position of failure
-///
-/// # Examples
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate pest;
-/// # use pest::Parser;
-/// # use pest::error::Error;
-/// # use pest::iterators::Pairs;
-/// # fn main() {
-/// # #[allow(non_camel_case_types)]
-/// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-/// # enum Rule {
-/// #     a,
-/// #     b,
-/// #     c
-/// # }
-/// #
-/// # struct AbcParser;
-/// #
-/// # impl Parser<Rule> for AbcParser {
-/// #     fn parse<'i>(_: Rule, input: &'i str) -> Result<Pairs<'i, Rule>, Error<Rule>> {
-/// #         pest::state(input, |state| {
-/// #             state.rule(Rule::a, |state| {
-/// #                 state.skip(1).unwrap().rule(Rule::b, |s| {
-/// #                     s.skip(1)
-/// #                 }).unwrap().skip(1)
-/// #             }).and_then(|state| {
-/// #                 state.skip(1).unwrap().rule(Rule::c, |s| {
-/// #                     s.match_string("e")
-/// #                 })
-/// #             })
-/// #         })
-/// #     }
-/// # }
-/// fails_with! {
-///     parser: AbcParser,
-///     input: "abcdf",
-///     rule: Rule::a,
-///     positives: vec![Rule::c],
-///     negatives: vec![],
-///     pos: 4
-/// };
-/// # }
-/// ```
-#[macro_export]
-macro_rules! fails_with {
-    ( parser: $parser:ident, input: $string:expr, rule: $rules:tt :: $rule:tt,
-      positives: $positives:expr, negatives: $negatives:expr, pos: $pos:expr ) => {
-        #[allow(unused_mut)]
-        {
-            use $crate::Parser;
-
-            let error = $parser::parse($rules::$rule, $string).unwrap_err();
-
-            match error.variant {
-                $crate::error::ErrorVariant::ParsingError {
-                    positives,
-                    negatives,
-                } => {
-                    assert_eq!(positives, $positives);
-                    assert_eq!(negatives, $negatives);
-                }
-                _ => unreachable!(),
-            };
-
-            match error.location {
-                $crate::error::InputLocation::Pos(pos) => assert_eq!(pos, $pos),
-                _ => unreachable!(),
-            }
-        }
-    };
-}
-
-#[cfg(test)]
-pub mod tests {
-    use super::super::error::Error;
-    use super::super::iterators::Pairs;
-    use super::super::{state, Parser};
-
-    #[allow(non_camel_case_types)]
-    #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    pub enum Rule {
-        a,
-        b,
-        c,
-    }
-
-    pub struct AbcParser;
-
-    impl Parser<Rule> for AbcParser {
-        fn parse<'i>(_: Rule, input: &'i str) -> Result<Pairs<'i, Rule>, Error<Rule>> {
-            state(input, |state| {
-                state
-                    .rule(Rule::a, |s| {
-                        s.skip(1)
-                            .unwrap()
-                            .rule(Rule::b, |s| s.skip(1))
-                            .unwrap()
-                            .skip(1)
-                    })
-                    .and_then(|s| s.skip(1).unwrap().rule(Rule::c, |s| s.match_string("e")))
-            })
-        }
-    }
-
-    #[test]
-    fn parses_to() {
-        parses_to! {
-            parser: AbcParser,
-            input: "abcde",
-            rule: Rule::a,
-            tokens: [
-                a(0, 3, [
-                    b(1, 2),
-                ]),
-                c(4, 5)
-            ]
-        };
-    }
-
-    #[test]
-    #[should_panic]
-    fn missing_end() {
-        parses_to! {
-            parser: AbcParser,
-            input: "abcde",
-            rule: Rule::a,
-            tokens: [
-                a(0, 3, [
-                    b(1, 2)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    #[should_panic]
-    fn empty() {
-        parses_to! {
-            parser: AbcParser,
-            input: "abcde",
-            rule: Rule::a,
-            tokens: []
-        };
-    }
-
-    #[test]
-    fn fails_with() {
-        fails_with! {
-            parser: AbcParser,
-            input: "abcdf",
-            rule: Rule::a,
-            positives: vec![Rule::c],
-            negatives: vec![],
-            pos: 4
-        };
-    }
-
-    #[test]
-    #[should_panic]
-    fn wrong_positives() {
-        fails_with! {
-            parser: AbcParser,
-            input: "abcdf",
-            rule: Rule::a,
-            positives: vec![Rule::a],
-            negatives: vec![],
-            pos: 4
-        };
-    }
-
-    #[test]
-    #[should_panic]
-    fn wrong_negatives() {
-        fails_with! {
-            parser: AbcParser,
-            input: "abcdf",
-            rule: Rule::a,
-            positives: vec![Rule::c],
-            negatives: vec![Rule::c],
-            pos: 4
-        };
-    }
-
-    #[test]
-    #[should_panic]
-    fn wrong_pos() {
-        fails_with! {
-            parser: AbcParser,
-            input: "abcdf",
-            rule: Rule::a,
-            positives: vec![Rule::c],
-            negatives: vec![],
-            pos: 3
-        };
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/parser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/parser.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use error::Error;
-use iterators::Pairs;
-use RuleType;
-
-/// A trait with a single method that parses strings.
-pub trait Parser<R: RuleType> {
-    /// Parses a `&str` starting from `rule`.
-    fn parse(rule: R, input: &str) -> Result<Pairs<R>, Error<R>>;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/parser_state.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/parser_state.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/parser_state.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/parser_state.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1160 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::ops::Range;
-use std::rc::Rc;
-
-use error::{Error, ErrorVariant};
-use iterators::{pairs, QueueableToken};
-use position::{self, Position};
-use span::Span;
-use stack::Stack;
-use RuleType;
-
-/// The current lookahead status of a [`ParserState`].
-///
-/// [`ParserState`]: struct.ParserState.html
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Lookahead {
-    Positive,
-    Negative,
-    None,
-}
-
-/// The current atomicity of a [`ParserState`].
-///
-/// [`ParserState`]: struct.ParserState.html
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Atomicity {
-    Atomic,
-    CompoundAtomic,
-    NonAtomic,
-}
-
-/// Type alias to simplify specifying the return value of chained closures.
-pub type ParseResult<S> = Result<S, S>;
-
-/// Match direction for the stack. Used in `PEEK[a..b]`/`stack_match_peek_slice`.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum MatchDir {
-    BottomToTop,
-    TopToBottom,
-}
-
-/// The complete state of a [`Parser`].
-///
-/// [`Parser`]: trait.Parser.html
-#[derive(Debug)]
-pub struct ParserState<'i, R: RuleType> {
-    position: Position<'i>,
-    queue: Vec<QueueableToken<R>>,
-    lookahead: Lookahead,
-    pos_attempts: Vec<R>,
-    neg_attempts: Vec<R>,
-    attempt_pos: usize,
-    atomicity: Atomicity,
-    stack: Stack<Span<'i>>,
-}
-
-/// Creates a `ParserState` from a `&str`, supplying it to a closure `f`.
-///
-/// # Examples
-///
-/// ```
-/// # use pest;
-/// let input = "";
-/// pest::state::<(), _>(input, |s| Ok(s)).unwrap();
-/// ```
-pub fn state<'i, R: RuleType, F>(input: &'i str, f: F) -> Result<pairs::Pairs<'i, R>, Error<R>>
-where
-    F: FnOnce(Box<ParserState<'i, R>>) -> ParseResult<Box<ParserState<'i, R>>>,
-{
-    let state = ParserState::new(input);
-
-    match f(state) {
-        Ok(state) => {
-            let len = state.queue.len();
-            Ok(pairs::new(Rc::new(state.queue), input, 0, len))
-        }
-        Err(mut state) => {
-            state.pos_attempts.sort();
-            state.pos_attempts.dedup();
-            state.neg_attempts.sort();
-            state.neg_attempts.dedup();
-
-            Err(Error::new_from_pos(
-                ErrorVariant::ParsingError {
-                    positives: state.pos_attempts.clone(),
-                    negatives: state.neg_attempts.clone(),
-                },
-                // TODO(performance): Guarantee state.attempt_pos is a valid position
-                position::Position::new(input, state.attempt_pos).unwrap(),
-            ))
-        }
-    }
-}
-
-impl<'i, R: RuleType> ParserState<'i, R> {
-    /// Allocates a fresh `ParserState` object to the heap and returns the owned `Box`. This `Box`
-    /// will be passed from closure to closure based on the needs of the specified `Parser`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// let input = "";
-    /// let state: Box<pest::ParserState<&str>> = pest::ParserState::new(input);
-    /// ```
-    #[allow(clippy::new_ret_no_self)]
-    pub fn new(input: &'i str) -> Box<Self> {
-        Box::new(ParserState {
-            position: Position::from_start(input),
-            queue: vec![],
-            lookahead: Lookahead::None,
-            pos_attempts: vec![],
-            neg_attempts: vec![],
-            attempt_pos: 0,
-            atomicity: Atomicity::NonAtomic,
-            stack: Stack::new(),
-        })
-    }
-
-    /// Returns a reference to the current `Position` of the `ParserState`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     ab
-    /// }
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let position = state.position();
-    /// assert_eq!(position.pos(), 0);
-    /// ```
-    pub fn position(&self) -> &Position<'i> {
-        &self.position
-    }
-
-    /// Returns the current atomicity of the `ParserState`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # use pest::Atomicity;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     ab
-    /// }
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let atomicity = state.atomicity();
-    /// assert_eq!(atomicity, Atomicity::NonAtomic);
-    /// ```
-    pub fn atomicity(&self) -> Atomicity {
-        self.atomicity
-    }
-
-    /// Wrapper needed to generate tokens. This will associate the `R` type rule to the closure
-    /// meant to match the rule.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "a";
-    /// let pairs: Vec<_> = pest::state(input, |state| {
-    ///     state.rule(Rule::a, |s| Ok(s))
-    /// }).unwrap().collect();
-    ///
-    /// assert_eq!(pairs.len(), 1);
-    /// ```
-    #[inline]
-    pub fn rule<F>(mut self: Box<Self>, rule: R, f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnOnce(Box<Self>) -> ParseResult<Box<Self>>,
-    {
-        let actual_pos = self.position.pos();
-        let index = self.queue.len();
-
-        let (pos_attempts_index, neg_attempts_index) = if actual_pos == self.attempt_pos {
-            (self.pos_attempts.len(), self.neg_attempts.len())
-        } else {
-            // Attempts have not been cleared yet since the attempt_pos is older.
-            (0, 0)
-        };
-
-        if self.lookahead == Lookahead::None && self.atomicity != Atomicity::Atomic {
-            // Pair's position will only be known after running the closure.
-            self.queue.push(QueueableToken::Start {
-                end_token_index: 0,
-                input_pos: actual_pos,
-            });
-        }
-
-        let attempts = self.attempts_at(actual_pos);
-
-        let result = f(self);
-
-        match result {
-            Ok(mut new_state) => {
-                if new_state.lookahead == Lookahead::Negative {
-                    new_state.track(
-                        rule,
-                        actual_pos,
-                        pos_attempts_index,
-                        neg_attempts_index,
-                        attempts,
-                    );
-                }
-
-                if new_state.lookahead == Lookahead::None
-                    && new_state.atomicity != Atomicity::Atomic
-                {
-                    // Storing the pair's index in the first token that was added before the closure was
-                    // run.
-                    let new_index = new_state.queue.len();
-                    match new_state.queue[index] {
-                        QueueableToken::Start {
-                            ref mut end_token_index,
-                            ..
-                        } => *end_token_index = new_index,
-                        _ => unreachable!(),
-                    };
-
-                    let new_pos = new_state.position.pos();
-
-                    new_state.queue.push(QueueableToken::End {
-                        start_token_index: index,
-                        rule,
-                        input_pos: new_pos,
-                    });
-                }
-
-                Ok(new_state)
-            }
-            Err(mut new_state) => {
-                if new_state.lookahead != Lookahead::Negative {
-                    new_state.track(
-                        rule,
-                        actual_pos,
-                        pos_attempts_index,
-                        neg_attempts_index,
-                        attempts,
-                    );
-                }
-
-                if new_state.lookahead == Lookahead::None
-                    && new_state.atomicity != Atomicity::Atomic
-                {
-                    new_state.queue.truncate(index);
-                }
-
-                Err(new_state)
-            }
-        }
-    }
-
-    fn attempts_at(&self, pos: usize) -> usize {
-        if self.attempt_pos == pos {
-            self.pos_attempts.len() + self.neg_attempts.len()
-        } else {
-            0
-        }
-    }
-
-    fn track(
-        &mut self,
-        rule: R,
-        pos: usize,
-        pos_attempts_index: usize,
-        neg_attempts_index: usize,
-        prev_attempts: usize,
-    ) {
-        if self.atomicity == Atomicity::Atomic {
-            return;
-        }
-
-        // If nested rules made no progress, there is no use to report them; it's only useful to
-        // track the current rule, the exception being when only one attempt has been made during
-        // the children rules.
-        let curr_attempts = self.attempts_at(pos);
-        if curr_attempts > prev_attempts && curr_attempts - prev_attempts == 1 {
-            return;
-        }
-
-        if pos == self.attempt_pos {
-            self.pos_attempts.truncate(pos_attempts_index);
-            self.neg_attempts.truncate(neg_attempts_index);
-        }
-
-        if pos > self.attempt_pos {
-            self.pos_attempts.clear();
-            self.neg_attempts.clear();
-            self.attempt_pos = pos;
-        }
-
-        let attempts = if self.lookahead != Lookahead::Negative {
-            &mut self.pos_attempts
-        } else {
-            &mut self.neg_attempts
-        };
-
-        if pos == self.attempt_pos {
-            attempts.push(rule);
-        }
-    }
-
-    /// Starts a sequence of transformations provided by `f` from the `Box<ParserState>`. Returns
-    /// the same `Result` returned by `f` in the case of an `Ok`, or `Err` with the current
-    /// `Box<ParserState>` otherwise.
-    ///
-    /// This method is useful to parse sequences that only match together which usually come in the
-    /// form of chained `Result`s with
-    /// [`Result::and_then`](https://doc.rust-lang.org/std/result/enum.Result.html#method.and_then).
-    ///
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "a";
-    /// let pairs: Vec<_> = pest::state(input, |state| {
-    ///     state.sequence(|s| {
-    ///         s.rule(Rule::a, |s| Ok(s)).and_then(|s| {
-    ///             s.match_string("b")
-    ///         })
-    ///     }).or_else(|s| {
-    ///         Ok(s)
-    ///     })
-    /// }).unwrap().collect();
-    ///
-    /// assert_eq!(pairs.len(), 0);
-    /// ```
-    #[inline]
-    pub fn sequence<F>(self: Box<Self>, f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnOnce(Box<Self>) -> ParseResult<Box<Self>>,
-    {
-        let token_index = self.queue.len();
-        let initial_pos = self.position.clone();
-
-        let result = f(self);
-
-        match result {
-            Ok(new_state) => Ok(new_state),
-            Err(mut new_state) => {
-                // Restore the initial position and truncate the token queue.
-                new_state.position = initial_pos;
-                new_state.queue.truncate(token_index);
-                Err(new_state)
-            }
-        }
-    }
-
-    /// Repeatedly applies the transformation provided by `f` from the `Box<ParserState>`. Returns
-    /// `Ok` with the updated `Box<ParserState>` returned by `f` wrapped up in an `Err`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     ab
-    /// }
-    ///
-    /// let input = "aab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.repeat(|s| {
-    ///     s.match_string("a")
-    /// });
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 2);
-    ///
-    /// state = pest::ParserState::new(input);
-    /// result = state.repeat(|s| {
-    ///     s.match_string("b")
-    /// });
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 0);
-    /// ```
-    #[inline]
-    pub fn repeat<F>(self: Box<Self>, mut f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnMut(Box<Self>) -> ParseResult<Box<Self>>,
-    {
-        let mut result = f(self);
-
-        loop {
-            match result {
-                Ok(state) => result = f(state),
-                Err(state) => return Ok(state),
-            };
-        }
-    }
-
-    /// Optionally applies the transformation provided by `f` from the `Box<ParserState>`. Returns
-    /// `Ok` with the updated `Box<ParserState>` returned by `f` regardless of the `Result`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     ab
-    /// }
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let result = state.optional(|s| {
-    ///     s.match_string("ab")
-    /// });
-    /// assert!(result.is_ok());
-    ///
-    /// state = pest::ParserState::new(input);
-    /// let result = state.optional(|s| {
-    ///     s.match_string("ac")
-    /// });
-    /// assert!(result.is_ok());
-    /// ```
-    #[inline]
-    pub fn optional<F>(self: Box<Self>, f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnOnce(Box<Self>) -> ParseResult<Box<Self>>,
-    {
-        match f(self) {
-            Ok(state) | Err(state) => Ok(state),
-        }
-    }
-
-    /// Attempts to match a single character based on a filter function. Returns `Ok` with the
-    /// updated `Box<ParserState>` if successful, or `Err` with the updated `Box<ParserState>`
-    /// otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let result = state.match_char_by(|c| c.is_ascii());
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 1);
-    ///
-    /// let input = "�";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let result = state.match_char_by(|c| c.is_ascii());
-    /// assert!(result.is_err());
-    /// assert_eq!(result.unwrap_err().position().pos(), 0);
-    /// ```
-    #[inline]
-    pub fn match_char_by<F>(mut self: Box<Self>, f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnOnce(char) -> bool,
-    {
-        if self.position.match_char_by(f) {
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Attempts to match the given string. Returns `Ok` with the updated `Box<ParserState>` if
-    /// successful, or `Err` with the updated `Box<ParserState>` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.match_string("ab");
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 2);
-    ///
-    /// state = pest::ParserState::new(input);
-    /// result = state.match_string("ac");
-    /// assert!(result.is_err());
-    /// assert_eq!(result.unwrap_err().position().pos(), 0);
-    /// ```
-    #[inline]
-    pub fn match_string(mut self: Box<Self>, string: &str) -> ParseResult<Box<Self>> {
-        if self.position.match_string(string) {
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Attempts to case-insensitively match the given string. Returns `Ok` with the updated
-    /// `Box<ParserState>` if successful, or `Err` with the updated `Box<ParserState>` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.match_insensitive("AB");
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 2);
-    ///
-    /// state = pest::ParserState::new(input);
-    /// result = state.match_insensitive("AC");
-    /// assert!(result.is_err());
-    /// assert_eq!(result.unwrap_err().position().pos(), 0);
-    /// ```
-    #[inline]
-    pub fn match_insensitive(mut self: Box<Self>, string: &str) -> ParseResult<Box<Self>> {
-        if self.position.match_insensitive(string) {
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Attempts to match a single character from the given range. Returns `Ok` with the updated
-    /// `Box<ParserState>` if successful, or `Err` with the updated `Box<ParserState>` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.match_range('a'..'z');
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 1);
-    ///
-    /// state = pest::ParserState::new(input);
-    /// result = state.match_range('A'..'Z');
-    /// assert!(result.is_err());
-    /// assert_eq!(result.unwrap_err().position().pos(), 0);
-    /// ```
-    #[inline]
-    pub fn match_range(mut self: Box<Self>, range: Range<char>) -> ParseResult<Box<Self>> {
-        if self.position.match_range(range) {
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Attempts to skip `n` characters forward. Returns `Ok` with the updated `Box<ParserState>`
-    /// if successful, or `Err` with the updated `Box<ParserState>` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.skip(1);
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 1);
-    ///
-    /// state = pest::ParserState::new(input);
-    /// result = state.skip(3);
-    /// assert!(result.is_err());
-    /// assert_eq!(result.unwrap_err().position().pos(), 0);
-    /// ```
-    #[inline]
-    pub fn skip(mut self: Box<Self>, n: usize) -> ParseResult<Box<Self>> {
-        if self.position.skip(n) {
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Attempts to skip forward until one of the given strings is found. Returns `Ok` with the
-    /// updated `Box<ParserState>` whether or not one of the strings is found.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "abcd";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.skip_until(&["c", "d"]);
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 2);
-    /// ```
-    #[inline]
-    pub fn skip_until(mut self: Box<Self>, strings: &[&str]) -> ParseResult<Box<Self>> {
-        self.position.skip_until(strings);
-        Ok(self)
-    }
-
-    /// Attempts to match the start of the input. Returns `Ok` with the current `Box<ParserState>`
-    /// if the parser has not yet advanced, or `Err` with the current `Box<ParserState>` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.start_of_input();
-    /// assert!(result.is_ok());
-    ///
-    /// state = pest::ParserState::new(input);
-    /// state = state.match_string("ab").unwrap();
-    /// result = state.start_of_input();
-    /// assert!(result.is_err());
-    /// ```
-    #[inline]
-    pub fn start_of_input(self: Box<Self>) -> ParseResult<Box<Self>> {
-        if self.position.at_start() {
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Attempts to match the end of the input. Returns `Ok` with the current `Box<ParserState>` if
-    /// there is no input remaining, or `Err` with the current `Box<ParserState>` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.end_of_input();
-    /// assert!(result.is_err());
-    ///
-    /// state = pest::ParserState::new(input);
-    /// state = state.match_string("ab").unwrap();
-    /// result = state.end_of_input();
-    /// assert!(result.is_ok());
-    /// ```
-    #[inline]
-    pub fn end_of_input(self: Box<Self>) -> ParseResult<Box<Self>> {
-        if self.position.at_end() {
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Starts a lookahead transformation provided by `f` from the `Box<ParserState>`. It returns
-    /// `Ok` with the current `Box<ParserState>` if `f` also returns an `Ok`, or `Err` with the current
-    /// `Box<ParserState>` otherwise. If `is_positive` is `false`, it swaps the `Ok` and `Err`
-    /// together, negating the `Result`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "a";
-    /// let pairs: Vec<_> = pest::state(input, |state| {
-    ///     state.lookahead(true, |state| {
-    ///         state.rule(Rule::a, |s| Ok(s))
-    ///     })
-    /// }).unwrap().collect();
-    ///
-    /// assert_eq!(pairs.len(), 0);
-    /// ```
-    #[inline]
-    pub fn lookahead<F>(mut self: Box<Self>, is_positive: bool, f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnOnce(Box<Self>) -> ParseResult<Box<Self>>,
-    {
-        let initial_lookahead = self.lookahead;
-
-        self.lookahead = if is_positive {
-            match initial_lookahead {
-                Lookahead::None | Lookahead::Positive => Lookahead::Positive,
-                Lookahead::Negative => Lookahead::Negative,
-            }
-        } else {
-            match initial_lookahead {
-                Lookahead::None | Lookahead::Positive => Lookahead::Negative,
-                Lookahead::Negative => Lookahead::Positive,
-            }
-        };
-
-        let initial_pos = self.position.clone();
-
-        let result = f(self.checkpoint());
-
-        let result_state = match result {
-            Ok(mut new_state) => {
-                new_state.position = initial_pos;
-                new_state.lookahead = initial_lookahead;
-                Ok(new_state.restore())
-            }
-            Err(mut new_state) => {
-                new_state.position = initial_pos;
-                new_state.lookahead = initial_lookahead;
-                Err(new_state.restore())
-            }
-        };
-
-        if is_positive {
-            result_state
-        } else {
-            match result_state {
-                Ok(state) => Err(state),
-                Err(state) => Ok(state),
-            }
-        }
-    }
-
-    /// Transformation which stops `Token`s from being generated according to `is_atomic`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::{self, Atomicity};
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {
-    ///     a
-    /// }
-    ///
-    /// let input = "a";
-    /// let pairs: Vec<_> = pest::state(input, |state| {
-    ///     state.atomic(Atomicity::Atomic, |s| {
-    ///         s.rule(Rule::a, |s| Ok(s))
-    ///     })
-    /// }).unwrap().collect();
-    ///
-    /// assert_eq!(pairs.len(), 0);
-    /// ```
-    #[inline]
-    pub fn atomic<F>(mut self: Box<Self>, atomicity: Atomicity, f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnOnce(Box<Self>) -> ParseResult<Box<Self>>,
-    {
-        let initial_atomicity = self.atomicity;
-        let should_toggle = self.atomicity != atomicity;
-
-        if should_toggle {
-            self.atomicity = atomicity;
-        }
-
-        let result = f(self);
-
-        match result {
-            Ok(mut new_state) => {
-                if should_toggle {
-                    new_state.atomicity = initial_atomicity;
-                }
-                Ok(new_state)
-            }
-            Err(mut new_state) => {
-                if should_toggle {
-                    new_state.atomicity = initial_atomicity;
-                }
-                Err(new_state)
-            }
-        }
-    }
-
-    /// Evaluates the result of closure `f` and pushes the span of the input consumed from before
-    /// `f` is called to after `f` is called to the stack. Returns `Ok(Box<ParserState>)` if `f` is
-    /// called successfully, or `Err(Box<ParserState>)` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.stack_push(|state| state.match_string("a"));
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 1);
-    /// ```
-    #[inline]
-    pub fn stack_push<F>(self: Box<Self>, f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnOnce(Box<Self>) -> ParseResult<Box<Self>>,
-    {
-        let start = self.position.clone();
-
-        let result = f(self);
-
-        match result {
-            Ok(mut state) => {
-                let end = state.position.clone();
-                state.stack.push(start.span(&end));
-                Ok(state)
-            }
-            Err(state) => Err(state),
-        }
-    }
-
-    /// Peeks the top of the stack and attempts to match the string. Returns `Ok(Box<ParserState>)`
-    /// if the string is matched successfully, or `Err(Box<ParserState>)` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "aa";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.stack_push(|state| state.match_string("a")).and_then(
-    ///     |state| state.stack_peek()
-    /// );
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 2);
-    /// ```
-    #[inline]
-    pub fn stack_peek(self: Box<Self>) -> ParseResult<Box<Self>> {
-        let string = self
-            .stack
-            .peek()
-            .expect("peek was called on empty stack")
-            .as_str();
-        self.match_string(string)
-    }
-
-    /// Pops the top of the stack and attempts to match the string. Returns `Ok(Box<ParserState>)`
-    /// if the string is matched successfully, or `Err(Box<ParserState>)` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "aa";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.stack_push(|state| state.match_string("a")).and_then(
-    ///     |state| state.stack_pop()
-    /// );
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 2);
-    /// ```
-    #[inline]
-    pub fn stack_pop(mut self: Box<Self>) -> ParseResult<Box<Self>> {
-        let string = self
-            .stack
-            .pop()
-            .expect("pop was called on empty stack")
-            .as_str();
-        self.match_string(string)
-    }
-
-    /// Matches part of the state of the stack.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::{self, MatchDir};
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "abcd cd cb";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state
-    ///     .stack_push(|state| state.match_string("a"))
-    ///     .and_then(|state| state.stack_push(|state| state.match_string("b")))
-    ///     .and_then(|state| state.stack_push(|state| state.match_string("c")))
-    ///     .and_then(|state| state.stack_push(|state| state.match_string("d")))
-    ///     .and_then(|state| state.match_string(" "))
-    ///     .and_then(|state| state.stack_match_peek_slice(2, None, MatchDir::BottomToTop))
-    ///     .and_then(|state| state.match_string(" "))
-    ///     .and_then(|state| state.stack_match_peek_slice(1, Some(-1), MatchDir::TopToBottom));
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 10);
-    /// ```
-    #[inline]
-    pub fn stack_match_peek_slice(
-        mut self: Box<Self>,
-        start: i32,
-        end: Option<i32>,
-        match_dir: MatchDir,
-    ) -> ParseResult<Box<Self>> {
-        let range = match constrain_idxs(start, end, self.stack.len()) {
-            Some(r) => r,
-            None => return Err(self),
-        };
-        // return true if an empty sequence is requested
-        if range.end <= range.start {
-            return Ok(self);
-        }
-
-        let mut position = self.position.clone();
-        let result = {
-            let mut iter_b2t = self.stack[range].iter();
-            let matcher = |span: &Span| position.match_string(span.as_str());
-            match match_dir {
-                MatchDir::BottomToTop => iter_b2t.all(matcher),
-                MatchDir::TopToBottom => iter_b2t.rev().all(matcher),
-            }
-        };
-        if result {
-            self.position = position;
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Matches the full state of the stack.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "abba";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state
-    ///     .stack_push(|state| state.match_string("a"))
-    ///     .and_then(|state| { state.stack_push(|state| state.match_string("b")) })
-    ///     .and_then(|state| state.stack_match_peek());
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 4);
-    /// ```
-    #[inline]
-    pub fn stack_match_peek(self: Box<Self>) -> ParseResult<Box<Self>> {
-        self.stack_match_peek_slice(0, None, MatchDir::TopToBottom)
-    }
-
-    /// Matches the full state of the stack. This method will clear the stack as it evaluates.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "aaaa";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.stack_push(|state| state.match_string("a")).and_then(|state| {
-    ///     state.stack_push(|state| state.match_string("a"))
-    /// }).and_then(|state| state.stack_match_peek());
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 4);
-    /// ```
-    #[inline]
-    pub fn stack_match_pop(mut self: Box<Self>) -> ParseResult<Box<Self>> {
-        let mut position = self.position.clone();
-        let mut result = true;
-        while let Some(span) = self.stack.pop() {
-            result = position.match_string(span.as_str());
-            if !result {
-                break;
-            }
-        }
-
-        if result {
-            self.position = position;
-            Ok(self)
-        } else {
-            Err(self)
-        }
-    }
-
-    /// Drops the top of the stack. Returns `Ok(Box<ParserState>)` if there was a value to drop, or
-    /// `Err(Box<ParserState>)` otherwise.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "aa";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.stack_push(|state| state.match_string("a")).and_then(
-    ///     |state| state.stack_drop()
-    /// );
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().pos(), 1);
-    /// ```
-    #[inline]
-    pub fn stack_drop(mut self: Box<Self>) -> ParseResult<Box<Self>> {
-        match self.stack.pop() {
-            Some(_) => Ok(self),
-            None => Err(self),
-        }
-    }
-
-    /// Restores the original state of the `ParserState` when `f` returns an `Err`. Currently,
-    /// this method only restores the stack.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "ab";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.restore_on_err(|state| state.stack_push(|state|
-    ///     state.match_string("a")).and_then(|state| state.match_string("a"))
-    /// );
-    ///
-    /// assert!(result.is_err());
-    ///
-    /// // Since the the rule doesn't match, the "a" pushed to the stack will be removed.
-    /// let catch_panic = std::panic::catch_unwind(|| result.unwrap_err().stack_pop());
-    /// assert!(catch_panic.is_err());
-    /// ```
-    #[inline]
-    pub fn restore_on_err<F>(self: Box<Self>, f: F) -> ParseResult<Box<Self>>
-    where
-        F: FnOnce(Box<Self>) -> ParseResult<Box<Self>>,
-    {
-        match f(self.checkpoint()) {
-            Ok(state) => Ok(state.checkpoint_ok()),
-            Err(state) => Err(state.restore()),
-        }
-    }
-
-    // Mark the current state as a checkpoint and return the `Box`.
-    #[inline]
-    pub(crate) fn checkpoint(mut self: Box<Self>) -> Box<Self> {
-        self.stack.snapshot();
-        self
-    }
-
-    // The checkpoint was cleared successfully
-    // so remove it without touching other stack state.
-    #[inline]
-    pub(crate) fn checkpoint_ok(mut self: Box<Self>) -> Box<Self> {
-        self.stack.clear_snapshot();
-        self
-    }
-
-    // Restore the current state to the most recent checkpoint.
-    #[inline]
-    pub(crate) fn restore(mut self: Box<Self>) -> Box<Self> {
-        self.stack.restore();
-        self
-    }
-}
-
-fn constrain_idxs(start: i32, end: Option<i32>, len: usize) -> Option<Range<usize>> {
-    let start_norm = normalize_index(start, len)?;
-    let end_norm = end.map_or(Some(len), |e| normalize_index(e, len))?;
-    Some(start_norm..end_norm)
-}
-
-/// Normalizes the index using its sequence’s length.
-/// Returns `None` if the normalized index is OOB.
-fn normalize_index(i: i32, len: usize) -> Option<usize> {
-    if i > len as i32 {
-        None
-    } else if i >= 0 {
-        Some(i as usize)
-    } else {
-        let real_i = len as i32 + i;
-        if real_i >= 0 {
-            Some(real_i as usize)
-        } else {
-            None
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn normalize_index_pos() {
-        assert_eq!(normalize_index(4, 6), Some(4));
-        assert_eq!(normalize_index(5, 5), Some(5));
-        assert_eq!(normalize_index(6, 3), None);
-    }
-
-    #[test]
-    fn normalize_index_neg() {
-        assert_eq!(normalize_index(-4, 6), Some(2));
-        assert_eq!(normalize_index(-5, 5), Some(0));
-        assert_eq!(normalize_index(-6, 3), None);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/position.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/position.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/position.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/position.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,619 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::cmp::Ordering;
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::ops::Range;
-use std::ptr;
-use std::str;
-
-use span;
-
-/// A cursor position in a `&str` which provides useful methods to manually parse that string.
-#[derive(Clone)]
-pub struct Position<'i> {
-    input: &'i str,
-    /// # Safety:
-    ///
-    /// `input[pos..]` must be a valid codepoint boundary (should not panic when indexing thus).
-    pos: usize,
-}
-
-impl<'i> Position<'i> {
-    /// Create a new `Position` without checking invariants. (Checked with `debug_assertions`.)
-    ///
-    /// # Safety:
-    ///
-    /// `input[pos..]` must be a valid codepoint boundary (should not panic when indexing thus).
-    pub(crate) unsafe fn new_unchecked(input: &str, pos: usize) -> Position {
-        debug_assert!(input.get(pos..).is_some());
-        Position { input, pos }
-    }
-
-    /// Attempts to create a new `Position` at the given position. If the specified position is
-    /// an invalid index, or the specified position is not a valid UTF8 boundary, then None is
-    /// returned.
-    ///
-    /// # Examples
-    /// ```
-    /// # use pest::Position;
-    /// let cheart = '💖';
-    /// let heart = "💖";
-    /// assert_eq!(Position::new(heart, 1), None);
-    /// assert_ne!(Position::new(heart, cheart.len_utf8()), None);
-    /// ```
-    #[allow(clippy::new_ret_no_self)]
-    pub fn new(input: &str, pos: usize) -> Option<Position> {
-        input.get(pos..).map(|_| Position { input, pos })
-    }
-
-    /// Creates a `Position` at the start of a `&str`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Position;
-    /// let start = Position::from_start("");
-    /// assert_eq!(start.pos(), 0);
-    /// ```
-    #[inline]
-    pub fn from_start(input: &'i str) -> Position<'i> {
-        // Position 0 is always safe because it's always a valid UTF-8 border.
-        Position { input, pos: 0 }
-    }
-
-    /// Returns the byte position of this `Position` as a `usize`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Position;
-    /// let input = "ab";
-    /// let mut start = Position::from_start(input);
-    ///
-    /// assert_eq!(start.pos(), 0);
-    /// ```
-    #[inline]
-    pub fn pos(&self) -> usize {
-        self.pos
-    }
-
-    /// Creates a `Span` from two `Position`s.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the positions come from different inputs.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Position;
-    /// let input = "ab";
-    /// let start = Position::from_start(input);
-    /// let span = start.span(&start.clone());
-    ///
-    /// assert_eq!(span.start(), 0);
-    /// assert_eq!(span.end(), 0);
-    /// ```
-    #[inline]
-    pub fn span(&self, other: &Position<'i>) -> span::Span<'i> {
-        if ptr::eq(self.input, other.input)
-        /* && self.input.get(self.pos..other.pos).is_some() */
-        {
-            // This is safe because the pos field of a Position should always be a valid str index.
-            unsafe { span::Span::new_unchecked(self.input, self.pos, other.pos) }
-        } else {
-            // TODO: maybe a panic if self.pos < other.pos
-            panic!("span created from positions from different inputs")
-        }
-    }
-
-    /// Returns the line and column number of this `Position`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "\na";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.match_string("\na");
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().line_col(), (2, 2));
-    /// ```
-    #[inline]
-    pub fn line_col(&self) -> (usize, usize) {
-        if self.pos > self.input.len() {
-            panic!("position out of bounds");
-        }
-
-        let mut pos = self.pos;
-        // Position's pos is always a UTF-8 border.
-        let slice = &self.input[..pos];
-        let mut chars = slice.chars().peekable();
-
-        let mut line_col = (1, 1);
-
-        while pos != 0 {
-            match chars.next() {
-                Some('\r') => {
-                    if let Some(&'\n') = chars.peek() {
-                        chars.next();
-
-                        if pos == 1 {
-                            pos -= 1;
-                        } else {
-                            pos -= 2;
-                        }
-
-                        line_col = (line_col.0 + 1, 1);
-                    } else {
-                        pos -= 1;
-                        line_col = (line_col.0, line_col.1 + 1);
-                    }
-                }
-                Some('\n') => {
-                    pos -= 1;
-                    line_col = (line_col.0 + 1, 1);
-                }
-                Some(c) => {
-                    pos -= c.len_utf8();
-                    line_col = (line_col.0, line_col.1 + 1);
-                }
-                None => unreachable!(),
-            }
-        }
-
-        line_col
-    }
-
-    /// Returns the entire line of the input that contains this `Position`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "\na";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input);
-    /// let mut result = state.match_string("\na");
-    /// assert!(result.is_ok());
-    /// assert_eq!(result.unwrap().position().line_of(), "a");
-    /// ```
-    #[inline]
-    pub fn line_of(&self) -> &'i str {
-        if self.pos > self.input.len() {
-            panic!("position out of bounds");
-        };
-        // Safe since start and end can only be valid UTF-8 borders.
-        &self.input[self.find_line_start()..self.find_line_end()]
-    }
-
-    pub(crate) fn find_line_start(&self) -> usize {
-        if self.input.is_empty() {
-            return 0;
-        };
-        // Position's pos is always a UTF-8 border.
-        let start = self
-            .input
-            .char_indices()
-            .rev()
-            .skip_while(|&(i, _)| i >= self.pos)
-            .find(|&(_, c)| c == '\n');
-        match start {
-            Some((i, _)) => i + 1,
-            None => 0,
-        }
-    }
-
-    pub(crate) fn find_line_end(&self) -> usize {
-        if self.input.is_empty() {
-            0
-        } else if self.pos == self.input.len() - 1 {
-            self.input.len()
-        } else {
-            // Position's pos is always a UTF-8 border.
-            let end = self
-                .input
-                .char_indices()
-                .skip_while(|&(i, _)| i < self.pos)
-                .find(|&(_, c)| c == '\n');
-            match end {
-                Some((i, _)) => i + 1,
-                None => self.input.len(),
-            }
-        }
-    }
-
-    /// Returns `true` when the `Position` points to the start of the input `&str`.
-    #[inline]
-    pub(crate) fn at_start(&self) -> bool {
-        self.pos == 0
-    }
-
-    /// Returns `true` when the `Position` points to the end of the input `&str`.
-    #[inline]
-    pub(crate) fn at_end(&self) -> bool {
-        self.pos == self.input.len()
-    }
-
-    /// Skips `n` `char`s from the `Position` and returns `true` if the skip was possible or `false`
-    /// otherwise. If the return value is `false`, `pos` will not be updated.
-    #[inline]
-    pub(crate) fn skip(&mut self, n: usize) -> bool {
-        let skipped = {
-            let mut len = 0;
-            // Position's pos is always a UTF-8 border.
-            let mut chars = (&self.input[self.pos..]).chars();
-            for _ in 0..n {
-                if let Some(c) = chars.next() {
-                    len += c.len_utf8();
-                } else {
-                    return false;
-                }
-            }
-            len
-        };
-
-        self.pos += skipped;
-        true
-    }
-
-    /// Goes back `n` `char`s from the `Position` and returns `true` if the skip was possible or `false`
-    /// otherwise. If the return value is `false`, `pos` will not be updated.
-    #[inline]
-    pub(crate) fn skip_back(&mut self, n: usize) -> bool {
-        let skipped = {
-            let mut len = 0;
-            // Position's pos is always a UTF-8 border.
-            let mut chars = (&self.input[..self.pos]).chars().rev();
-            for _ in 0..n {
-                if let Some(c) = chars.next() {
-                    len += c.len_utf8();
-                } else {
-                    return false;
-                }
-            }
-            len
-        };
-
-        self.pos -= skipped;
-        true
-    }
-
-    /// Skips until one of the given `strings` is found. If none of the `strings` can be found,
-    /// this function will return `false` but its `pos` will *still* be updated.
-    #[inline]
-    pub(crate) fn skip_until(&mut self, strings: &[&str]) -> bool {
-        for from in self.pos..self.input.len() {
-            let bytes = if let Some(string) = self.input.get(from..) {
-                string.as_bytes()
-            } else {
-                continue;
-            };
-
-            for slice in strings.iter() {
-                let to = slice.len();
-                if Some(slice.as_bytes()) == bytes.get(0..to) {
-                    self.pos = from;
-                    return true;
-                }
-            }
-        }
-
-        self.pos = self.input.len();
-        false
-    }
-
-    /// Matches the char at the `Position` against a filter function and returns `true` if a match
-    /// was made. If no match was made, returns `false` and `pos` will not be updated.
-    #[inline]
-    pub(crate) fn match_char_by<F>(&mut self, f: F) -> bool
-    where
-        F: FnOnce(char) -> bool,
-    {
-        if let Some(c) = (&self.input[self.pos..]).chars().next() {
-            if f(c) {
-                self.pos += c.len_utf8();
-                true
-            } else {
-                false
-            }
-        } else {
-            false
-        }
-    }
-
-    /// Matches `string` from the `Position` and returns `true` if a match was made or `false`
-    /// otherwise. If no match was made, `pos` will not be updated.
-    #[inline]
-    pub(crate) fn match_string(&mut self, string: &str) -> bool {
-        let to = self.pos + string.len();
-
-        if Some(string.as_bytes()) == self.input.as_bytes().get(self.pos..to) {
-            self.pos = to;
-            true
-        } else {
-            false
-        }
-    }
-
-    /// Case-insensitively matches `string` from the `Position` and returns `true` if a match was
-    /// made or `false` otherwise. If no match was made, `pos` will not be updated.
-    #[inline]
-    pub(crate) fn match_insensitive(&mut self, string: &str) -> bool {
-        let matched = {
-            let slice = &self.input[self.pos..];
-            if let Some(slice) = slice.get(0..string.len()) {
-                slice.eq_ignore_ascii_case(string)
-            } else {
-                false
-            }
-        };
-
-        if matched {
-            self.pos += string.len();
-            true
-        } else {
-            false
-        }
-    }
-
-    /// Matches `char` `range` from the `Position` and returns `true` if a match was made or `false`
-    /// otherwise. If no match was made, `pos` will not be updated.
-    #[inline]
-    pub(crate) fn match_range(&mut self, range: Range<char>) -> bool {
-        if let Some(c) = (&self.input[self.pos..]).chars().next() {
-            if range.start <= c && c <= range.end {
-                self.pos += c.len_utf8();
-                return true;
-            }
-        }
-
-        false
-    }
-}
-
-impl<'i> fmt::Debug for Position<'i> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Position").field("pos", &self.pos).finish()
-    }
-}
-
-impl<'i> PartialEq for Position<'i> {
-    fn eq(&self, other: &Position<'i>) -> bool {
-        ptr::eq(self.input, other.input) && self.pos == other.pos
-    }
-}
-
-impl<'i> Eq for Position<'i> {}
-
-impl<'i> PartialOrd for Position<'i> {
-    fn partial_cmp(&self, other: &Position<'i>) -> Option<Ordering> {
-        if ptr::eq(self.input, other.input) {
-            self.pos.partial_cmp(&other.pos)
-        } else {
-            None
-        }
-    }
-}
-
-impl<'i> Ord for Position<'i> {
-    fn cmp(&self, other: &Position<'i>) -> Ordering {
-        self.partial_cmp(other)
-            .expect("cannot compare positions from different strs")
-    }
-}
-
-impl<'i> Hash for Position<'i> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        (self.input as *const str).hash(state);
-        self.pos.hash(state);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashSet;
-
-    use super::*;
-
-    #[test]
-    fn empty() {
-        let input = "";
-        assert_eq!(Position::new(input, 0).unwrap().match_string(""), true);
-        assert_eq!(!Position::new(input, 0).unwrap().match_string("a"), true);
-    }
-
-    #[test]
-    fn parts() {
-        let input = "asdasdf";
-
-        assert_eq!(Position::new(input, 0).unwrap().match_string("asd"), true);
-        assert_eq!(Position::new(input, 3).unwrap().match_string("asdf"), true);
-    }
-
-    #[test]
-    fn line_col() {
-        let input = "a\rb\nc\r\ndå—¨";
-
-        assert_eq!(Position::new(input, 0).unwrap().line_col(), (1, 1));
-        assert_eq!(Position::new(input, 1).unwrap().line_col(), (1, 2));
-        assert_eq!(Position::new(input, 2).unwrap().line_col(), (1, 3));
-        assert_eq!(Position::new(input, 3).unwrap().line_col(), (1, 4));
-        assert_eq!(Position::new(input, 4).unwrap().line_col(), (2, 1));
-        assert_eq!(Position::new(input, 5).unwrap().line_col(), (2, 2));
-        assert_eq!(Position::new(input, 6).unwrap().line_col(), (2, 3));
-        assert_eq!(Position::new(input, 7).unwrap().line_col(), (3, 1));
-        assert_eq!(Position::new(input, 8).unwrap().line_col(), (3, 2));
-        assert_eq!(Position::new(input, 11).unwrap().line_col(), (3, 3));
-    }
-
-    #[test]
-    fn line_of() {
-        let input = "a\rb\nc\r\ndå—¨";
-
-        assert_eq!(Position::new(input, 0).unwrap().line_of(), "a\rb\n");
-        assert_eq!(Position::new(input, 1).unwrap().line_of(), "a\rb\n");
-        assert_eq!(Position::new(input, 2).unwrap().line_of(), "a\rb\n");
-        assert_eq!(Position::new(input, 3).unwrap().line_of(), "a\rb\n");
-        assert_eq!(Position::new(input, 4).unwrap().line_of(), "c\r\n");
-        assert_eq!(Position::new(input, 5).unwrap().line_of(), "c\r\n");
-        assert_eq!(Position::new(input, 6).unwrap().line_of(), "c\r\n");
-        assert_eq!(Position::new(input, 7).unwrap().line_of(), "då—¨");
-        assert_eq!(Position::new(input, 8).unwrap().line_of(), "då—¨");
-        assert_eq!(Position::new(input, 11).unwrap().line_of(), "då—¨");
-    }
-
-    #[test]
-    fn line_of_empty() {
-        let input = "";
-
-        assert_eq!(Position::new(input, 0).unwrap().line_of(), "");
-    }
-
-    #[test]
-    fn line_of_new_line() {
-        let input = "\n";
-
-        assert_eq!(Position::new(input, 0).unwrap().line_of(), "\n");
-    }
-
-    #[test]
-    fn line_of_between_new_line() {
-        let input = "\n\n";
-
-        assert_eq!(Position::new(input, 1).unwrap().line_of(), "\n");
-    }
-
-    fn measure_skip(input: &str, pos: usize, n: usize) -> Option<usize> {
-        let mut p = Position::new(input, pos).unwrap();
-        if p.skip(n) {
-            Some(p.pos - pos)
-        } else {
-            None
-        }
-    }
-
-    #[test]
-    fn skip_empty() {
-        let input = "";
-
-        assert_eq!(measure_skip(input, 0, 0), Some(0));
-        assert_eq!(measure_skip(input, 0, 1), None);
-    }
-
-    #[test]
-    fn skip() {
-        let input = "då—¨";
-
-        assert_eq!(measure_skip(input, 0, 0), Some(0));
-        assert_eq!(measure_skip(input, 0, 1), Some(1));
-        assert_eq!(measure_skip(input, 1, 1), Some(3));
-    }
-
-    #[test]
-    fn skip_until() {
-        let input = "ab ac";
-        let pos = Position::from_start(input);
-
-        let mut test_pos = pos.clone();
-        test_pos.skip_until(&["a", "b"]);
-        assert_eq!(test_pos.pos(), 0);
-
-        test_pos = pos.clone();
-        test_pos.skip_until(&["b"]);
-        assert_eq!(test_pos.pos(), 1);
-
-        test_pos = pos.clone();
-        test_pos.skip_until(&["ab"]);
-        assert_eq!(test_pos.pos(), 0);
-
-        test_pos = pos.clone();
-        test_pos.skip_until(&["ac", "z"]);
-        assert_eq!(test_pos.pos(), 3);
-
-        test_pos = pos.clone();
-        assert!(!test_pos.skip_until(&["z"]));
-        assert_eq!(test_pos.pos(), 5);
-    }
-
-    #[test]
-    fn match_range() {
-        let input = "b";
-
-        assert_eq!(Position::new(input, 0).unwrap().match_range('a'..'c'), true);
-        assert_eq!(Position::new(input, 0).unwrap().match_range('b'..'b'), true);
-        assert_eq!(
-            !Position::new(input, 0).unwrap().match_range('a'..'a'),
-            true
-        );
-        assert_eq!(
-            !Position::new(input, 0).unwrap().match_range('c'..'c'),
-            true
-        );
-        assert_eq!(
-            Position::new(input, 0).unwrap().match_range('a'..'å—¨'),
-            true
-        );
-    }
-
-    #[test]
-    fn match_insensitive() {
-        let input = "AsdASdF";
-
-        assert_eq!(
-            Position::new(input, 0).unwrap().match_insensitive("asd"),
-            true
-        );
-        assert_eq!(
-            Position::new(input, 3).unwrap().match_insensitive("asdf"),
-            true
-        );
-    }
-
-    #[test]
-    fn cmp() {
-        let input = "a";
-        let start = Position::from_start(input);
-        let mut end = start.clone();
-
-        assert!(end.skip(1));
-        let result = start.cmp(&end);
-
-        assert_eq!(result, Ordering::Less);
-    }
-
-    #[test]
-    #[should_panic]
-    fn cmp_panic() {
-        let input1 = "a";
-        let input2 = "b";
-        let pos1 = Position::from_start(input1);
-        let pos2 = Position::from_start(input2);
-
-        pos1.cmp(&pos2);
-    }
-
-    #[test]
-    fn hash() {
-        let input = "a";
-        let start = Position::from_start(input);
-        let mut positions = HashSet::new();
-
-        positions.insert(start);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/prec_climber.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/prec_climber.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/prec_climber.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/prec_climber.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,233 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-//! Constructs useful in infix operator parsing with the precedence climbing method.
-
-use std::collections::HashMap;
-use std::iter::Peekable;
-use std::ops::BitOr;
-
-use iterators::Pair;
-use RuleType;
-
-/// Associativity of an [`Operator`].
-///
-/// [`Operator`]: struct.Operator.html
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Assoc {
-    /// Left `Operator` associativity
-    Left,
-    /// Right `Operator` associativity
-    Right,
-}
-
-/// Infix operator used in [`PrecClimber`].
-///
-/// [`PrecClimber`]: struct.PrecClimber.html
-#[derive(Debug)]
-pub struct Operator<R: RuleType> {
-    rule: R,
-    assoc: Assoc,
-    next: Option<Box<Operator<R>>>,
-}
-
-impl<R: RuleType> Operator<R> {
-    /// Creates a new `Operator` from a `Rule` and `Assoc`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::prec_climber::{Assoc, Operator};
-    /// # #[allow(non_camel_case_types)]
-    /// # #[allow(dead_code)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// # enum Rule {
-    /// #     plus,
-    /// #     minus
-    /// # }
-    /// Operator::new(Rule::plus, Assoc::Left) | Operator::new(Rule::minus, Assoc::Right);
-    /// ```
-    pub fn new(rule: R, assoc: Assoc) -> Operator<R> {
-        Operator {
-            rule,
-            assoc,
-            next: None,
-        }
-    }
-}
-
-impl<R: RuleType> BitOr for Operator<R> {
-    type Output = Self;
-
-    fn bitor(mut self, rhs: Self) -> Self {
-        fn assign_next<R: RuleType>(op: &mut Operator<R>, next: Operator<R>) {
-            if let Some(ref mut child) = op.next {
-                assign_next(child, next);
-            } else {
-                op.next = Some(Box::new(next));
-            }
-        }
-
-        assign_next(&mut self, rhs);
-        self
-    }
-}
-
-/// List of operators and precedences, which can perform [precedence climbing][1] on infix
-/// expressions contained in a [`Pairs`]. The token pairs contained in the `Pairs` should start
-/// with a *primary* pair and then alternate between an *operator* and a *primary*.
-///
-/// [1]: https://en.wikipedia.org/wiki/Operator-precedence_parser#Precedence_climbing_method
-/// [`Pairs`]: ../iterators/struct.Pairs.html
-#[derive(Debug)]
-pub struct PrecClimber<R: RuleType> {
-    ops: HashMap<R, (u32, Assoc)>,
-}
-
-impl<R: RuleType> PrecClimber<R> {
-    /// Creates a new `PrecClimber` from the `Operator`s contained in `ops`. Every entry in the
-    /// `Vec` has precedence *index + 1*. In order to have operators with same precedence, they need
-    /// to be chained with `|` between them.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::prec_climber::{Assoc, Operator, PrecClimber};
-    /// # #[allow(non_camel_case_types)]
-    /// # #[allow(dead_code)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// # enum Rule {
-    /// #     plus,
-    /// #     minus,
-    /// #     times,
-    /// #     divide,
-    /// #     power
-    /// # }
-    /// PrecClimber::new(vec![
-    ///     Operator::new(Rule::plus, Assoc::Left) | Operator::new(Rule::minus, Assoc::Left),
-    ///     Operator::new(Rule::times, Assoc::Left) | Operator::new(Rule::divide, Assoc::Left),
-    ///     Operator::new(Rule::power, Assoc::Right)
-    /// ]);
-    /// ```
-    pub fn new(ops: Vec<Operator<R>>) -> PrecClimber<R> {
-        let ops = ops
-            .into_iter()
-            .zip(1..)
-            .fold(HashMap::new(), |mut map, (op, prec)| {
-                let mut next = Some(op);
-
-                while let Some(op) = next.take() {
-                    match op {
-                        Operator {
-                            rule,
-                            assoc,
-                            next: op_next,
-                        } => {
-                            map.insert(rule, (prec, assoc));
-                            next = op_next.map(|op| *op);
-                        }
-                    }
-                }
-
-                map
-            });
-
-        PrecClimber { ops }
-    }
-
-    /// Performs the precedence climbing algorithm on the `pairs` in a similar manner to map-reduce.
-    /// *Primary* pairs are mapped with `primary` and then reduced to one single result with
-    /// `infix`.
-    ///
-    /// # Panics
-    ///
-    /// Panics will occur when `pairs` is empty or when the alternating *primary*, *operator*,
-    /// *primary* order is not respected.
-    ///
-    /// # Examples
-    ///
-    /// ```ignore
-    /// let primary = |pair| {
-    ///     consume(pair, climber)
-    /// };
-    /// let infix = |lhs: i32, op: Pair<Rule>, rhs: i32| {
-    ///     match op.rule() {
-    ///         Rule::plus => lhs + rhs,
-    ///         Rule::minus => lhs - rhs,
-    ///         Rule::times => lhs * rhs,
-    ///         Rule::divide => lhs / rhs,
-    ///         Rule::power => lhs.pow(rhs as u32),
-    ///         _ => unreachable!()
-    ///     }
-    /// };
-    ///
-    /// let result = climber.climb(pairs, primary, infix);
-    /// ```
-    pub fn climb<'i, P, F, G, T>(&self, mut pairs: P, mut primary: F, mut infix: G) -> T
-    where
-        P: Iterator<Item = Pair<'i, R>>,
-        F: FnMut(Pair<'i, R>) -> T,
-        G: FnMut(T, Pair<'i, R>, T) -> T,
-    {
-        let lhs = primary(
-            pairs
-                .next()
-                .expect("precedence climbing requires a non-empty Pairs"),
-        );
-        self.climb_rec(lhs, 0, &mut pairs.peekable(), &mut primary, &mut infix)
-    }
-
-    fn climb_rec<'i, P, F, G, T>(
-        &self,
-        mut lhs: T,
-        min_prec: u32,
-        pairs: &mut Peekable<P>,
-        primary: &mut F,
-        infix: &mut G,
-    ) -> T
-    where
-        P: Iterator<Item = Pair<'i, R>>,
-        F: FnMut(Pair<'i, R>) -> T,
-        G: FnMut(T, Pair<'i, R>, T) -> T,
-    {
-        while pairs.peek().is_some() {
-            let rule = pairs.peek().unwrap().as_rule();
-            if let Some(&(prec, _)) = self.ops.get(&rule) {
-                if prec >= min_prec {
-                    let op = pairs.next().unwrap();
-                    let mut rhs = primary(pairs.next().expect(
-                        "infix operator must be followed by \
-                         a primary expression",
-                    ));
-
-                    while pairs.peek().is_some() {
-                        let rule = pairs.peek().unwrap().as_rule();
-                        if let Some(&(new_prec, assoc)) = self.ops.get(&rule) {
-                            if new_prec > prec || assoc == Assoc::Right && new_prec == prec {
-                                rhs = self.climb_rec(rhs, new_prec, pairs, primary, infix);
-                            } else {
-                                break;
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-
-                    lhs = infix(lhs, op, rhs);
-                } else {
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-
-        lhs
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/span.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/span.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/span.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/span.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,301 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::ptr;
-use std::str;
-
-use position;
-
-/// A span over a `&str`. It is created from either [two `Position`s] or from a [`Pair`].
-///
-/// [two `Position`s]: struct.Position.html#method.span
-/// [`Pair`]: ../iterators/struct.Pair.html#method.span
-#[derive(Clone)]
-pub struct Span<'i> {
-    input: &'i str,
-    /// # Safety
-    ///
-    /// Must be a valid character boundary index into `input`.
-    start: usize,
-    /// # Safety
-    ///
-    /// Must be a valid character boundary index into `input`.
-    end: usize,
-}
-
-impl<'i> Span<'i> {
-    /// Create a new `Span` without checking invariants. (Checked with `debug_assertions`.)
-    ///
-    /// # Safety
-    ///
-    /// `input[start..end]` must be a valid subslice; that is, said indexing should not panic.
-    pub(crate) unsafe fn new_unchecked(input: &str, start: usize, end: usize) -> Span {
-        debug_assert!(input.get(start..end).is_some());
-        Span { input, start, end }
-    }
-
-    /// Attempts to create a new span. Will return `None` if `input[start..end]` is an invalid index
-    /// into `input`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Span;
-    /// let input = "Hello!";
-    /// assert_eq!(None, Span::new(input, 100, 0));
-    /// assert!(Span::new(input, 0, input.len()).is_some());
-    /// ```
-    #[allow(clippy::new_ret_no_self)]
-    pub fn new(input: &str, start: usize, end: usize) -> Option<Span> {
-        if input.get(start..end).is_some() {
-            Some(Span { input, start, end })
-        } else {
-            None
-        }
-    }
-
-    /// Returns the `Span`'s start byte position as a `usize`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Position;
-    /// let input = "ab";
-    /// let start = Position::from_start(input);
-    /// let end = start.clone();
-    /// let span = start.span(&end);
-    ///
-    /// assert_eq!(span.start(), 0);
-    /// ```
-    #[inline]
-    pub fn start(&self) -> usize {
-        self.start
-    }
-
-    /// Returns the `Span`'s end byte position as a `usize`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Position;
-    /// let input = "ab";
-    /// let start = Position::from_start(input);
-    /// let end = start.clone();
-    /// let span = start.span(&end);
-    ///
-    /// assert_eq!(span.end(), 0);
-    /// ```
-    #[inline]
-    pub fn end(&self) -> usize {
-        self.end
-    }
-
-    /// Returns the `Span`'s start `Position`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Position;
-    /// let input = "ab";
-    /// let start = Position::from_start(input);
-    /// let end = start.clone();
-    /// let span = start.clone().span(&end);
-    ///
-    /// assert_eq!(span.start_pos(), start);
-    /// ```
-    #[inline]
-    pub fn start_pos(&self) -> position::Position<'i> {
-        // Span's start position is always a UTF-8 border.
-        unsafe { position::Position::new_unchecked(self.input, self.start) }
-    }
-
-    /// Returns the `Span`'s end `Position`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Position;
-    /// let input = "ab";
-    /// let start = Position::from_start(input);
-    /// let end = start.clone();
-    /// let span = start.span(&end);
-    ///
-    /// assert_eq!(span.end_pos(), end);
-    /// ```
-    #[inline]
-    pub fn end_pos(&self) -> position::Position<'i> {
-        // Span's end position is always a UTF-8 border.
-        unsafe { position::Position::new_unchecked(self.input, self.end) }
-    }
-
-    /// Splits the `Span` into a pair of `Position`s.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest::Position;
-    /// let input = "ab";
-    /// let start = Position::from_start(input);
-    /// let end = start.clone();
-    /// let span = start.clone().span(&end);
-    ///
-    /// assert_eq!(span.split(), (start, end));
-    /// ```
-    #[inline]
-    pub fn split(self) -> (position::Position<'i>, position::Position<'i>) {
-        // Span's start and end positions are always a UTF-8 borders.
-        let pos1 = unsafe { position::Position::new_unchecked(self.input, self.start) };
-        let pos2 = unsafe { position::Position::new_unchecked(self.input, self.end) };
-
-        (pos1, pos2)
-    }
-
-    /// Captures a slice from the `&str` defined by the `Span`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "abc";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input).skip(1).unwrap();
-    /// let start_pos = state.position().clone();
-    /// state = state.match_string("b").unwrap();
-    /// let span = start_pos.span(&state.position().clone());
-    /// assert_eq!(span.as_str(), "b");
-    /// ```
-    #[inline]
-    pub fn as_str(&self) -> &'i str {
-        // Span's start and end positions are always a UTF-8 borders.
-        &self.input[self.start..self.end]
-    }
-
-    /// Iterates over all lines (partially) covered by this span.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use pest;
-    /// # #[allow(non_camel_case_types)]
-    /// # #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-    /// enum Rule {}
-    ///
-    /// let input = "a\nb\nc";
-    /// let mut state: Box<pest::ParserState<Rule>> = pest::ParserState::new(input).skip(2).unwrap();
-    /// let start_pos = state.position().clone();
-    /// state = state.match_string("b\nc").unwrap();
-    /// let span = start_pos.span(&state.position().clone());
-    /// assert_eq!(span.lines().collect::<Vec<_>>(), vec!["b\n", "c"]);
-    /// ```
-    #[inline]
-    pub fn lines(&self) -> Lines {
-        Lines {
-            span: self,
-            pos: self.start,
-        }
-    }
-}
-
-impl<'i> fmt::Debug for Span<'i> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Span")
-            .field("str", &self.as_str())
-            .field("start", &self.start)
-            .field("end", &self.end)
-            .finish()
-    }
-}
-
-impl<'i> PartialEq for Span<'i> {
-    fn eq(&self, other: &Span<'i>) -> bool {
-        ptr::eq(self.input, other.input) && self.start == other.start && self.end == other.end
-    }
-}
-
-impl<'i> Eq for Span<'i> {}
-
-impl<'i> Hash for Span<'i> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        (self.input as *const str).hash(state);
-        self.start.hash(state);
-        self.end.hash(state);
-    }
-}
-
-/// Line iterator for Spans, created by [`Span::lines()`].
-///
-/// Iterates all lines that are at least partially covered by the span.
-///
-/// [`Span::lines()`]: struct.Span.html#method.lines
-pub struct Lines<'i> {
-    span: &'i Span<'i>,
-    pos: usize,
-}
-
-impl<'i> Iterator for Lines<'i> {
-    type Item = &'i str;
-    fn next(&mut self) -> Option<&'i str> {
-        if self.pos > self.span.end {
-            return None;
-        }
-        let pos = position::Position::new(self.span.input, self.pos)?;
-        if pos.at_end() {
-            return None;
-        }
-        let line = pos.line_of();
-        self.pos = pos.find_line_end();
-        Some(line)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn split() {
-        let input = "a";
-        let start = position::Position::from_start(input);
-        let mut end = start.clone();
-
-        assert!(end.skip(1));
-
-        let span = start.clone().span(&end.clone());
-
-        assert_eq!(span.split(), (start, end));
-    }
-
-    #[test]
-    fn lines_mid() {
-        let input = "abc\ndef\nghi";
-        let span = Span::new(input, 1, 7).unwrap();
-        let lines: Vec<_> = span.lines().collect();
-        println!("{:?}", lines);
-        assert_eq!(lines.len(), 2);
-        assert_eq!(lines[0], "abc\n".to_owned());
-        assert_eq!(lines[1], "def\n".to_owned());
-    }
-
-    #[test]
-    fn lines_eof() {
-        let input = "abc\ndef\nghi";
-        let span = Span::new(input, 5, 11).unwrap();
-        assert!(span.end_pos().at_end());
-        let lines: Vec<_> = span.lines().collect();
-        println!("{:?}", lines);
-        assert_eq!(lines.len(), 2);
-        assert_eq!(lines[0], "def\n".to_owned());
-        assert_eq!(lines[1], "ghi".to_owned());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/stack.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,219 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::ops::{Index, Range};
-
-/// Implementation of a `Stack` which maintains an log of `StackOp`s in order to rewind the stack
-/// to a previous state.
-#[derive(Debug)]
-pub struct Stack<T: Clone> {
-    ops: Vec<StackOp<T>>,
-    cache: Vec<T>,
-    snapshots: Vec<usize>,
-}
-
-impl<T: Clone> Stack<T> {
-    /// Creates a new `Stack`.
-    pub fn new() -> Self {
-        Stack {
-            ops: vec![],
-            cache: vec![],
-            snapshots: vec![],
-        }
-    }
-
-    /// Returns `true` if the stack is currently empty.
-    #[allow(dead_code)]
-    pub fn is_empty(&self) -> bool {
-        self.cache.is_empty()
-    }
-
-    /// Returns the top-most `&T` in the `Stack`.
-    pub fn peek(&self) -> Option<&T> {
-        self.cache.last()
-    }
-
-    /// Pushes a `T` onto the `Stack`.
-    pub fn push(&mut self, elem: T) {
-        self.ops.push(StackOp::Push(elem.clone()));
-        self.cache.push(elem);
-    }
-
-    /// Pops the top-most `T` from the `Stack`.
-    pub fn pop(&mut self) -> Option<T> {
-        let popped = self.cache.pop();
-        if let Some(ref val) = popped {
-            self.ops.push(StackOp::Pop(val.clone()));
-        }
-        popped
-    }
-
-    /// Returns the size of the stack
-    pub fn len(&self) -> usize {
-        self.cache.len()
-    }
-
-    /// Takes a snapshot of the current `Stack`.
-    pub fn snapshot(&mut self) {
-        self.snapshots.push(self.ops.len());
-    }
-
-    /// The parsing after the last snapshot was successful so clearing it.
-    pub fn clear_snapshot(&mut self) {
-        self.snapshots.pop();
-    }
-
-    /// Rewinds the `Stack` to the most recent `snapshot()`. If no `snapshot()` has been taken, this
-    /// function return the stack to its initial state.
-    pub fn restore(&mut self) {
-        match self.snapshots.pop() {
-            Some(ops_index) => {
-                self.rewind_to(ops_index);
-                self.ops.truncate(ops_index);
-            }
-            None => {
-                self.cache.clear();
-                self.ops.clear();
-            }
-        }
-    }
-
-    // Rewind the stack to a particular index
-    fn rewind_to(&mut self, index: usize) {
-        let ops_to_rewind = &self.ops[index..];
-        for op in ops_to_rewind.iter().rev() {
-            match *op {
-                StackOp::Push(_) => {
-                    self.cache.pop();
-                }
-                StackOp::Pop(ref elem) => {
-                    self.cache.push(elem.clone());
-                }
-            }
-        }
-    }
-}
-
-impl<T: Clone> Index<Range<usize>> for Stack<T> {
-    type Output = [T];
-
-    fn index(&self, range: Range<usize>) -> &[T] {
-        self.cache.index(range)
-    }
-}
-
-#[derive(Debug)]
-enum StackOp<T> {
-    Push(T),
-    Pop(T),
-}
-
-#[cfg(test)]
-mod test {
-    use super::Stack;
-
-    #[test]
-    fn snapshot_with_empty() {
-        let mut stack = Stack::new();
-
-        stack.snapshot();
-        // []
-        assert!(stack.is_empty());
-        // [0]
-        stack.push(0);
-        stack.restore();
-        assert!(stack.is_empty());
-    }
-
-    #[test]
-    fn snapshot_twice() {
-        let mut stack = Stack::new();
-
-        stack.push(0);
-
-        stack.snapshot();
-        stack.snapshot();
-        stack.restore();
-        stack.restore();
-
-        assert_eq!(stack[0..stack.len()], [0]);
-    }
-
-    #[test]
-    fn stack_ops() {
-        let mut stack = Stack::new();
-
-        // []
-        assert!(stack.is_empty());
-        assert_eq!(stack.peek(), None);
-        assert_eq!(stack.pop(), None);
-
-        // [0]
-        stack.push(0);
-        assert!(!stack.is_empty());
-        assert_eq!(stack.peek(), Some(&0));
-
-        // [0, 1]
-        stack.push(1);
-        assert!(!stack.is_empty());
-        assert_eq!(stack.peek(), Some(&1));
-
-        // [0]
-        assert_eq!(stack.pop(), Some(1));
-        assert!(!stack.is_empty());
-        assert_eq!(stack.peek(), Some(&0));
-
-        // [0, 2]
-        stack.push(2);
-        assert!(!stack.is_empty());
-        assert_eq!(stack.peek(), Some(&2));
-
-        // [0, 2, 3]
-        stack.push(3);
-        assert!(!stack.is_empty());
-        assert_eq!(stack.peek(), Some(&3));
-
-        // Take a snapshot of the current stack
-        // [0, 2, 3]
-        stack.snapshot();
-
-        // [0, 2]
-        assert_eq!(stack.pop(), Some(3));
-        assert!(!stack.is_empty());
-        assert_eq!(stack.peek(), Some(&2));
-
-        // Take a snapshot of the current stack
-        // [0, 2]
-        stack.snapshot();
-
-        // [0]
-        assert_eq!(stack.pop(), Some(2));
-        assert!(!stack.is_empty());
-        assert_eq!(stack.peek(), Some(&0));
-
-        // []
-        assert_eq!(stack.pop(), Some(0));
-        assert!(stack.is_empty());
-
-        // Test backtracking
-        // [0, 2]
-        stack.restore();
-        assert_eq!(stack.pop(), Some(2));
-        assert_eq!(stack.pop(), Some(0));
-        assert_eq!(stack.pop(), None);
-
-        // Test backtracking
-        // [0, 2, 3]
-        stack.restore();
-        assert_eq!(stack.pop(), Some(3));
-        assert_eq!(stack.pop(), Some(2));
-        assert_eq!(stack.pop(), Some(0));
-        assert_eq!(stack.pop(), None);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/token.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/token.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use position::Position;
-
-/// A token generated by a `Parser`.
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub enum Token<'i, R> {
-    /// The starting `Position` of a matched `Rule`
-    Start { rule: R, pos: Position<'i> },
-    /// The ending `Position` of a matched `Rule`
-    End { rule: R, pos: Position<'i> },
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/unicode/binary.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/unicode/binary.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/unicode/binary.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/unicode/binary.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4933 +0,0 @@
-// DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
-//
-//  ucd-generate.exe property-bool --trie-set ./target/ucd/
-//
-// ucd-generate is available on crates.io.
-
-pub const BY_NAME: &'static [(&'static str, &'static ::ucd_trie::TrieSet)] = &[
-  ("ASCII_Hex_Digit", ASCII_HEX_DIGIT), ("Alphabetic", ALPHABETIC),
-  ("Bidi_Control", BIDI_CONTROL), ("Case_Ignorable", CASE_IGNORABLE),
-  ("Cased", CASED), ("Changes_When_Casefolded", CHANGES_WHEN_CASEFOLDED),
-  ("Changes_When_Casemapped", CHANGES_WHEN_CASEMAPPED),
-  ("Changes_When_Lowercased", CHANGES_WHEN_LOWERCASED),
-  ("Changes_When_Titlecased", CHANGES_WHEN_TITLECASED),
-  ("Changes_When_Uppercased", CHANGES_WHEN_UPPERCASED), ("Dash", DASH),
-  ("Default_Ignorable_Code_Point", DEFAULT_IGNORABLE_CODE_POINT),
-  ("Deprecated", DEPRECATED), ("Diacritic", DIACRITIC),
-  ("Extender", EXTENDER), ("Grapheme_Base", GRAPHEME_BASE),
-  ("Grapheme_Extend", GRAPHEME_EXTEND), ("Grapheme_Link", GRAPHEME_LINK),
-  ("Hex_Digit", HEX_DIGIT), ("Hyphen", HYPHEN),
-  ("IDS_Binary_Operator", IDS_BINARY_OPERATOR),
-  ("IDS_Trinary_Operator", IDS_TRINARY_OPERATOR),
-  ("ID_Continue", ID_CONTINUE), ("ID_Start", ID_START),
-  ("Ideographic", IDEOGRAPHIC), ("Join_Control", JOIN_CONTROL),
-  ("Logical_Order_Exception", LOGICAL_ORDER_EXCEPTION),
-  ("Lowercase", LOWERCASE), ("Math", MATH),
-  ("Noncharacter_Code_Point", NONCHARACTER_CODE_POINT),
-  ("Other_Alphabetic", OTHER_ALPHABETIC),
-  ("Other_Default_Ignorable_Code_Point", OTHER_DEFAULT_IGNORABLE_CODE_POINT),
-  ("Other_Grapheme_Extend", OTHER_GRAPHEME_EXTEND),
-  ("Other_ID_Continue", OTHER_ID_CONTINUE),
-  ("Other_ID_Start", OTHER_ID_START), ("Other_Lowercase", OTHER_LOWERCASE),
-  ("Other_Math", OTHER_MATH), ("Other_Uppercase", OTHER_UPPERCASE),
-  ("Pattern_Syntax", PATTERN_SYNTAX),
-  ("Pattern_White_Space", PATTERN_WHITE_SPACE),
-  ("Prepended_Concatenation_Mark", PREPENDED_CONCATENATION_MARK),
-  ("Quotation_Mark", QUOTATION_MARK), ("Radical", RADICAL),
-  ("Regional_Indicator", REGIONAL_INDICATOR),
-  ("Sentence_Terminal", SENTENCE_TERMINAL), ("Soft_Dotted", SOFT_DOTTED),
-  ("Terminal_Punctuation", TERMINAL_PUNCTUATION),
-  ("Unified_Ideograph", UNIFIED_IDEOGRAPH), ("Uppercase", UPPERCASE),
-  ("Variation_Selector", VARIATION_SELECTOR), ("White_Space", WHITE_SPACE),
-  ("XID_Continue", XID_CONTINUE), ("XID_Start", XID_START),
-];
-
-pub const ASCII_HEX_DIGIT: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x3FF000000000000, 0x7E0000007E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-  ],
-  tree2_level2: &[
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const ALPHABETIC: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE07FFFFFE, 0x420040000000000, 0xFF7FFFFFFF7FFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0x501F0003FFC3, 0, 0xBCDF000000000020,
-    0xFFFFFFFBFFFFD740, 0xFFBFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFC03, 0xFFFFFFFFFFFFFFFF,
-    0xFFFEFFFFFFFFFFFF, 0xFFFFFFFF027FFFFF, 0xBFFF0000000001FF,
-    0x787FFFFFF00B6, 0xFFFFFFFF07FF0000, 0xFFFFC000FEFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0x9C00E1FE1FEFFFFF, 0xFFFFFFFFFFFF0000,
-    0xFFFFFFFFFFFFE000, 0x3FFFFFFFFFFFF, 0x43007FFFFFFFC00,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 36, 36,
-    36, 36, 37, 38, 39, 40, 41, 42, 43, 44, 36, 36, 36, 36, 36, 36, 36, 36,
-    45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
-    31, 63, 64, 65, 66, 55, 67, 68, 69, 36, 36, 36, 70, 36, 36, 36, 36, 71,
-    72, 73, 74, 31, 75, 76, 31, 77, 78, 79, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 80, 81, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 82, 83, 36,
-    84, 85, 86, 87, 88, 89, 31, 31, 31, 31, 31, 31, 31, 90, 44, 91, 92, 93,
-    36, 94, 95, 31, 31, 31, 31, 31, 31, 31, 31, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 55, 31, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 96, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 97, 98, 36, 36, 36, 36, 99,
-    100, 36, 96, 101, 36, 102, 103, 104, 105, 36, 106, 107, 108, 109, 110,
-    111, 112, 113, 114, 115, 116, 36, 117, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 118, 119, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 36, 36, 36, 36, 36, 120, 36,
-    121, 122, 123, 124, 125, 36, 36, 36, 36, 126, 127, 128, 129, 31, 130, 36,
-    131, 132, 133, 113, 134,
-  ],
-  tree2_level2: &[
-    0x1FFFFCFFFFFF, 0x7FF01FFFFFF, 0x3FDFFFFF00000000, 0xFFFF03F8FFF00000,
-    0xEFFFFFFFFFFFFFFF, 0xFFFE000FFFE1DFFF, 0xE3C5FDFFFFF99FEF,
-    0x1003000FB080599F, 0xC36DFDFFFFF987EE, 0x3F00005E021987,
-    0xE3EDFDFFFFFBBFEE, 0x1E00000F00011BBF, 0xE3EDFDFFFFF99FEE,
-    0x2000FB0C0199F, 0xC3FFC718D63DC7EC, 0x811DC7, 0xE3FFFDFFFFFDDFEF,
-    0xF07601DDF, 0xE3EFFDFFFFFDDFEF, 0x6000F40601DDF, 0xE7FFFFFFFFFDDFEF,
-    0xFC00000F80F05DDF, 0x2FFBFFFFFC7FFFEC, 0xC0000FF5F807F,
-    0x7FFFFFFFFFFFFFE, 0x207F, 0x3BFFECAEFEF02596, 0xF000205F, 0x1,
-    0xFFFE1FFFFFFFFEFF, 0x1FFFFFFFFEFFFF03, 0, 0xF97FFFFFFFFFFFFF,
-    0xFFFFC1E7FFFF0000, 0xFFFFFFFF3000407F, 0xF7FFFFFFFFFF20BF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFF3D7F3DFF, 0x7F3DFFFFFFFF3DFF,
-    0xFFFFFFFFFF7FFF3D, 0xFFFFFFFFFF3DFFFF, 0x87FFFFFF, 0xFFFFFFFF0000FFFF,
-    0x3F3FFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFE, 0xFFFF9FFFFFFFFFFF,
-    0xFFFFFFFF07FFFFFE, 0x1FFC7FFFFFFFFFF, 0xFFFFF000FDFFF, 0xDDFFF000FFFFF,
-    0xFFCFFFFFFFFFFFFF, 0x108001FF, 0xFFFFFFFF00000000, 0x1FFFFFFFFFFFFFF,
-    0xFFFF07FFFFFFFFFF, 0x3FFFFFFFFFFFFF, 0x1FF0FFF7FFFFFFF, 0x1F3FFFFFFF0000,
-    0xFFFF0FFFFFFFFFFF, 0x3FF, 0xFFFFFFFF0FFFFFFF, 0x1FFFFE7FFFFFFF,
-    0x8000000000, 0xFFEFFFFFFFFFFFFF, 0xFEF, 0xFC00F3FFFFFFFFFF,
-    0x3FFBFFFFFFFFF, 0x3FFFFFFFFC00E000, 0xE7FFFFFFFFFF01FF, 0x6FDE0000000000,
-    0x1FFF8000000000, 0xFFFFFFFF3F3FFFFF, 0x3FFFFFFFAAFF3F3F,
-    0x5FDFFFFFFFFFFFFF, 0x1FDC1FFF0FCF1FDC, 0x8002000000000000, 0x1FFF0000,
-    0xF3FFBD503E2FFC84, 0xFFFFFFFF000043E0, 0x1FF, 0xFFC0000000000000,
-    0x3FFFFFFFFFF, 0xFFFF7FFFFFFFFFFF, 0xFFFFFFFF7FFFFFFF, 0xC781FFFFFFFFF,
-    0xFFFF20BFFFFFFFFF, 0x80FFFFFFFFFF, 0x7F7F7F7F007FFFFF,
-    0xFFFFFFFF7F7F7F7F, 0x800000000000, 0x1F3E03FE000000E0,
-    0xFFFFFFFEE07FFFFF, 0xF7FFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFE0,
-    0x7FFFFFF00007FFF, 0xFFFF000000000000, 0xFFFFFFFFFFFF, 0x1FFF,
-    0x3FFFFFFFFFFF0000, 0xC00FFFF1FFF, 0x8FF07FFFFFFFFFFF, 0xFFFFFFFCFF800000,
-    0x3FFFFFFFFFFF9FF, 0xFF80000000000000, 0xFFFFFFF7BB, 0xFFFFFFFFFFFFF,
-    0x68FC00000000002F, 0xFFFF07FFFFFFFC00, 0x1FFFFFFF0007FFFF,
-    0xFFF7FFFFFFFFFFFF, 0x7C00FFDF00008000, 0x7FFFFFFFFFFFFF,
-    0xC47FFFFF00003FFF, 0x7FFFFFFFFFFFFFFF, 0x3CFFFF38000005,
-    0xFFFF7F7F007E7E7E, 0xFFFF003FF7FFFFFF, 0x7FFFFFFFFFF, 0xFFFF000FFFFFFFFF,
-    0xFFFFFFFFFFFF87F, 0xFFFF3FFFFFFFFFFF, 0x3FFFFFF, 0x5F7FFDFFE0F8007F,
-    0xFFFFFFFFFFFFFFDB, 0x3FFFFFFFFFFFF, 0xFFFFFFFFFFF80000,
-    0x3FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFCFFFF,
-    0xFFF0000000000FF, 0xFFDF000000000000, 0x1FFFFFFFFFFFFFFF,
-    0x7FFFFFE00000000, 0xFFFFFFC007FFFFFE, 0x1CFCFCFC,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 12, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 13, 14, 15, 7, 16, 17, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 5, 4, 4, 4, 4, 6, 7, 8, 9, 10, 11, 2, 2, 12, 13, 14, 15, 4,
-    4, 2, 2, 2, 2, 16, 17, 4, 4, 18, 19, 20, 21, 22, 4, 23, 4, 24, 25, 26, 27,
-    28, 29, 30, 4, 2, 31, 32, 32, 33, 4, 4, 4, 4, 4, 4, 4, 34, 35, 4, 4, 2,
-    35, 36, 37, 32, 38, 2, 39, 40, 4, 41, 42, 43, 44, 4, 4, 2, 45, 2, 46, 4,
-    4, 47, 48, 49, 50, 28, 4, 51, 4, 4, 4, 52, 4, 53, 54, 4, 4, 4, 4, 55, 56,
-    57, 52, 4, 4, 4, 4, 58, 59, 60, 4, 61, 62, 63, 4, 4, 4, 4, 64, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 65, 4, 2, 66, 2, 2, 2, 67, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 66, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 68, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2,
-    52, 20, 4, 69, 16, 70, 71, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 4, 4, 2, 72,
-    73, 74, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 75,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 32, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 20, 76, 2, 2, 2, 2, 2, 77, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 2, 78, 79, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 80, 81, 82, 83, 84, 2, 2,
-    2, 2, 85, 86, 87, 88, 89, 90, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 91, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    2, 2, 2, 92, 2, 93, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    94, 95, 96, 4, 4, 4, 4, 4, 4, 4, 4, 4, 76, 97, 98, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 99, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, 2, 2, 10, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 100, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 101, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2,
-    102, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  ],
-  tree3_level3: &[
-    0xB7FFFF7FFFFFEFFF, 0x3FFF3FFF, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFF, 0,
-    0x1FFFFFFFFFFFFF, 0xFFFFFFFF1FFFFFFF, 0x1FFFF, 0xFFFFE000FFFFFFFF,
-    0x7FFFFFFFFFF07FF, 0xFFFFFFFF3FFFFFFF, 0x3EFF0F, 0xFFFF00003FFFFFFF,
-    0xFFFFFFFFF0FFFFF, 0xFFFF00FFFFFFFFFF, 0xFFFFFFFFF, 0x7FFFFFFFFFFFFF,
-    0xFF003FFFFF, 0x91BFFFFFFFFFFD3F, 0x7FFFFF003FFFFF, 0x7FFFFFFF,
-    0x37FFFF00000000, 0x3FFFFFF003FFFFF, 0xC0FFFFFFFFFFFFFF, 0x3FFFFFFEEFF06F,
-    0x1FFFFFFF00000000, 0x1FFFFFFF, 0x1FFFFFFEFF, 0x3FFFFFFFFFFFFF,
-    0x7FFFF003FFFFF, 0x3FFFF, 0x1FF, 0x7FFFFFFFFFFFF, 0xFFFFFFFFFF,
-    0xFFFF00801FFFFFFF, 0x3F, 0x1FFFFFFFFFFFFFC, 0x1FFFFFF0000,
-    0x47FFFFFFFF0070, 0x1400001E, 0x409FFFFFFFFBFFFF, 0xFFFF01FFBFFFBD7F,
-    0x1FFFFFFFFFF, 0xE3EDFDFFFFF99FEF, 0xFE081199F, 0x7BB, 0xB3,
-    0x7F3FFFFFFFFFFFFF, 0x3F000000, 0x7FFFFFFFFFFFFFFF, 0x11, 0x7FFE7FFFFFF,
-    0x1FFFFFFFFFFFFFF, 0xFFFFFFFF00000000, 0x80000000FFFFFFFF,
-    0x7FE7FFFFFFFFFFFF, 0xFFFFFFFFFFFF0000, 0x20FFFFCF, 0x7F7FFFFFFFFFFDFF,
-    0xFFFC000000000001, 0x7FFEFFFFFCFFFF, 0xB47FFFFFFFFFFB7F,
-    0xFFFFFDBF000000CB, 0x17B7FFF, 0x7FFFFF00000000, 0x3FFFFFF,
-    0x7FFFFFFFFFFF, 0xF, 0x7F, 0x3FFFFFFF0000, 0xE0FFFFF80000000F, 0xFFFF,
-    0x7FFFFFFFFFFF001F, 0xFFF80000, 0x300000000, 0x3FFFFFFFFFFFF,
-    0xFFFF000000000000, 0xFFFFFFFFFFFFFFF, 0x1FFF07FFFFFFFFFF, 0x43FF01FF,
-    0xFFFFFFFFFFDFFFFF, 0xEBFFDE64DFFFFFFF, 0xFFFFFFFFFFFFFFEF,
-    0x7BFFFFFFDFDFE7BF, 0xFFFFFFFFFFFDFC5F, 0xFFFFFF3FFFFFFFFF,
-    0xF7FFFFFFF7FFFFFD, 0xFFDFFFFFFFDFFFFF, 0xFFFF7FFFFFFF7FFF,
-    0xFFFFFDFFFFFFFDFF, 0xFF7, 0x7DBF9FFFF7F, 0x1F, 0x8F, 0xAF7FE96FFFFFFEF,
-    0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF, 0xFFFF03FFFFFF03FF, 0x3FF,
-    0x7FFFFF, 0xFFFF0003FFFFFFFF, 0x1FFFFFFFF, 0x3FFFFFFF,
-  ],
-};
-
-pub const BIDI_CONTROL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0x10000000, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x7C000000C000, 0x3C000000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const CASE_IGNORABLE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x400408000000000, 0x140000000, 0x190A10000000000, 0, 0, 0, 0, 0, 0, 0,
-    0xFFFF000000000000, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0x430FFFFFFFFFFFF, 0xB0, 0, 0, 0, 0x3F8, 0, 0, 0x2000000,
-    0xBFFFFFFFFFFE0000, 0x100000000000B6, 0x17FF003F, 0x10000FFFFF801, 0,
-    0x3DFFBFC00000, 0xFFFF000000028000, 0x7FF, 0x1FFC000000000,
-    0x243FF80000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 10, 11, 12, 13, 14, 15, 16, 11, 17, 18,
-    19, 2, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 34, 35, 36, 37,
-    38, 39, 40, 2, 41, 2, 2, 2, 42, 43, 44, 2, 45, 46, 47, 48, 49, 50, 2, 51,
-    52, 53, 54, 55, 2, 2, 2, 2, 2, 2, 56, 57, 58, 59, 60, 61, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 62, 2, 63, 2, 64, 2, 65, 66,
-    2, 2, 2, 2, 2, 2, 2, 67, 2, 68, 69, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 70, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 50, 2, 2, 2, 2, 71, 72, 73, 74, 75, 76, 77, 78, 79, 2, 2, 80, 81, 82,
-    83, 84, 85, 86, 87, 88, 2, 89, 2, 90, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 91, 2, 92, 93, 2, 2, 2, 2, 2, 2, 2, 2, 94, 95, 2, 96, 97, 98,
-    99, 100,
-  ],
-  tree2_level2: &[
-    0x3FFFFFC00000, 0xE000000, 0, 0xFFFFFFFFFFF80000, 0x1400000000000007,
-    0x2000C00FE21FE, 0x1000000000000002, 0x4000000C0000201E,
-    0x1000000000000006, 0x23000000023986, 0xFC00000C000021BE,
-    0x9000000000000002, 0xC0040201E, 0x4, 0x2001, 0xC000000000000011,
-    0xC00603DC1, 0xC00003040, 0x1800000000000003, 0xC0000201E, 0x5C0400,
-    0x7F2000000000000, 0x7FC0, 0x1BF2000000000000, 0x3F40, 0x2A0000003000000,
-    0x7FFE000000000000, 0x1FFFFFFFFEFFE0DF, 0x40, 0x66FDE00000000000,
-    0x1E0001C3000000, 0x20002064, 0x1000000000000000, 0xE0000000,
-    0x1C0000001C0000, 0xC0000000C0000, 0x3FB0000000000000, 0x208FFE40, 0x7800,
-    0x8, 0x20000000060, 0xE04018700000000, 0x9800000, 0x9FF81FE57F400000,
-    0x7FFF008000000000, 0x17D000000000000F, 0xFF80000000004, 0x3B3C00000003,
-    0x3A34000000000, 0xCFF00000000000, 0x3F00000000000000, 0x31021FDFFF70000,
-    0xFFFFF00000000000, 0x10007FFFFFFFFFF, 0xFFFFFFFFF8000000,
-    0xFBFFFFFFFFFFFFFF, 0xA000000000000000, 0x6000E000E000E003,
-    0x7C900300F800, 0x8002FFDF00000000, 0x1FFF0000, 0x1FFFFFFFF0000,
-    0x3000000000000000, 0x3800000000000, 0x8000800000000000,
-    0xFFFFFFFF00000000, 0x800000000000, 0x83E3C0000000020, 0x7E000000,
-    0x7000000000000000, 0x200000, 0x1000, 0xBFF7800000000000, 0xF0000000,
-    0x3000000000000, 0x3FFFFFFFF, 0x1000000000000, 0x700, 0x300000000000000,
-    0x6000000844, 0x8003FFFF00000030, 0x3FC000000000, 0x3FF80,
-    0x13C8000000000007, 0x6000008000, 0x667E0000000000, 0x1001000000001008,
-    0xC19D000000000000, 0x58300020000002, 0xF8000000, 0x212000000000,
-    0x40000000, 0xFFFC000000000000, 0x3, 0xFFFF0008FFFF, 0x240000,
-    0x8000000000000000, 0x4000000004004080, 0x1000000000001, 0xC0000000,
-    0xE00000800000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 4, 2, 5, 6, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 0, 0, 0, 0, 0, 0,
-    0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 8, 9, 10, 11, 12, 13, 14, 15,
-    16, 0, 0, 17, 18, 19, 0, 0, 20, 21, 22, 23, 0, 0, 24, 25, 26, 27, 28, 0,
-    29, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 31, 32, 33, 0, 0, 0, 0, 0, 34, 0,
-    35, 0, 36, 37, 38, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40,
-    41, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 47, 0, 0, 48, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 49, 50, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 0, 54, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 57, 0, 0, 57, 57, 57, 58, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x2000000000000000, 0x100000000, 0x7C0000000000000, 0x870000000000F06E,
-    0x6000000000, 0xF000000000, 0x1FFC0, 0xFF00000000000002,
-    0x800000000000007F, 0x2678000000000003, 0x2000, 0x1FEF8000000007,
-    0x8000000000000, 0x7FC0000000000003, 0x1E00, 0x40D3800000000000,
-    0x7F880000000, 0x1800000000000003, 0x1F1FC000000001, 0xFF00000000000000,
-    0x4000005C, 0x85F8000000000000, 0xD, 0xB03C000000000000, 0x30000001,
-    0xA7F8000000000000, 0x1, 0xBF280000000000, 0xFBCE0000000,
-    0x6FF800000000000, 0x79F80000000007FE, 0xE7E0080, 0x37FFC00,
-    0xBF7F000000000000, 0x6DFCFFFFFC0000, 0xB47E000000000000, 0xBF, 0xA30000,
-    0x18000000000000, 0x1F000000000000, 0x7F000000000000, 0xF, 0xFFFF8000,
-    0x300000000, 0xF60000000, 0xFFF8038000000000, 0x3C0000000FE7, 0x1C,
-    0xF87FFFFFFFFFFFFF, 0x201FFFFFFFFFFF, 0xFFFEF8000010, 0x7DBF9FFFF7F,
-    0x7F0000, 0x7F0, 0xF800000000000000, 0xFFFFFFFF00000002,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF,
-  ],
-};
-
-pub const CASED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE07FFFFFE, 0x420040000000000, 0xFF7FFFFFFF7FFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xF7FFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFF0, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0x1FFFFFFFFEFFFFF, 0x1F00000003, 0, 0xBCCF000000000020,
-    0xFFFFFFFBFFFFD740, 0xFFBFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFC03, 0xFFFFFFFFFFFFFFFF,
-    0xFFFEFFFFFFFFFFFF, 0xFFFFFFFF007FFFFF, 0x1FF, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 4, 0, 5, 5, 5, 0, 5, 5, 5, 5, 6, 7, 8, 9, 0, 10, 11,
-    0, 12, 13, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 16, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18,
-    5, 19, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 22, 0, 23, 5, 24, 25, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 30, 0,
-    0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFF00000000, 0xE7FFFFFFFFFF20BF, 0x3F3FFFFFFFFFFFFF,
-    0xE7FFFFFFFFFF01FF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFF3F3FFFFF,
-    0x3FFFFFFFAAFF3F3F, 0x5FDFFFFFFFFFFFFF, 0x1FDC1FFF0FCF1FDC,
-    0x8002000000000000, 0x1FFF0000, 0xF21FBD503E2FFC84, 0xFFFFFFFF000043E0,
-    0x18, 0xFFC0000000000000, 0x3FFFFFFFFFF, 0xFFFF7FFFFFFFFFFF,
-    0xFFFFFFFF7FFFFFFF, 0xC781FFFFFFFFF, 0x20BFFFFFFFFF, 0x3FFFFFFFFFFF,
-    0x3FFFFFFF, 0xFFFFFFFC00000000, 0x3FFFFFFFFFF78FF, 0x700000000000000,
-    0xFFFF000000000000, 0xFFFF003FF7FFFFFF, 0xF8007F, 0x7FFFFFE00000000,
-    0x7FFFFFE,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 8, 9,
-    10, 11, 12, 1, 1, 1, 1, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 20, 21, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0xFFFF, 0xFFFF000000000000, 0xFFFFFFFFF0FFFFF,
-    0x7FFFFFFFFFFFF, 0xFFFFFFFF00000000, 0xFFFFFFFF, 0xFFFFFFFFFFDFFFFF,
-    0xEBFFDE64DFFFFFFF, 0xFFFFFFFFFFFFFFEF, 0x7BFFFFFFDFDFE7BF,
-    0xFFFFFFFFFFFDFC5F, 0xFFFFFF3FFFFFFFFF, 0xF7FFFFFFF7FFFFFD,
-    0xFFDFFFFFFFDFFFFF, 0xFFFF7FFFFFFF7FFF, 0xFFFFFDFFFFFFFDFF, 0xFF7, 0xF,
-    0xFFFF03FFFFFF03FF, 0x3FF,
-  ],
-};
-
-pub const CHANGES_WHEN_CASEFOLDED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE, 0x20000000000000, 0xFF7FFFFF, 0xAA55555555555555,
-    0xAB555555555556AA, 0x11AED2D5B1DBCED6, 0x55D655554AAAADB0,
-    0x6C05555555555555, 0x557A, 0, 0, 0, 0x8045000000000020, 0xFFBFFFED740,
-    0xE6B3555555638004, 0xFFFFFFFFFFFF, 0x5555555500000000,
-    0x5555555555555401, 0x5555555555552AAB, 0xFFFE555555555555, 0x7FFFFF,
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 5, 5, 6, 5, 7, 8, 9, 10, 0, 0, 0,
-    0, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 15, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17,
-    5, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 20, 0, 21, 22, 23, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0,
-    0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFF00000000, 0x20BF, 0x3F00000000000000, 0xE7FFFFFFFFFF01FF,
-    0x5555555555555555, 0x555555554C155555, 0xFF00FF003F00FF00,
-    0xFF00AA003F00, 0x1F9CFFFFFFFFFFFF, 0x1F9C1F000F001F9C, 0x40C4000000000,
-    0xFFFF00000000, 0x8, 0xFFC0000000000000, 0xFFFF, 0x7FFFFFFFFFFF,
-    0xC025EA9D00000000, 0x4280555555555, 0x155555555555, 0x5555555,
-    0x5554555400000000, 0x6A00555555555555, 0x15F7D5555452855,
-    0xFFFF000000000000, 0xFFFFFFFFFFFFFFFF, 0xF8007F, 0x7FFFFFE00000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 3, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFF, 0x7FFFFFFFFFFFF,
-    0xFFFFFFFF00000000, 0xFFFFFFFF, 0x3FFFFFFFF,
-  ],
-};
-
-pub const CHANGES_WHEN_CASEMAPPED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE07FFFFFE, 0x20000000000000, 0xFF7FFFFFFF7FFFFF,
-    0xFEFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xB3FFF3FFF7FFDFFF,
-    0xFFFFFFFFFFFFFFF0, 0xFC0FFFFDFFFFFFFF, 0x20269F6B1ADFFFFF, 0x60041F89, 0,
-    0, 0xB8CF000000000020, 0xFFFFFFFBFFFFD740, 0xEFBFFFFFFFE3FFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFC03,
-    0xFFFFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFFF, 0xFFFFFFFE007FFFFF, 0xFF, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 0, 0, 6, 6, 7, 6, 8, 9, 10, 11, 0, 0, 0,
-    0, 12, 13, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 16, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18,
-    6, 19, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 22, 0, 23, 24, 25, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 0,
-    0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFF00000000, 0xE7FFFFFFFFFF20BF, 0x3F3FFFFFFFFFFFFF,
-    0xE7FFFFFFFFFF01FF, 0x2200000000000000, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFF4FFFFFFF, 0xFFFFFFFF3F3FFFFF, 0x3FFFFFFFAAFF3F3F,
-    0x5FDFFFFFFFFFFFFF, 0x1FDC1FFF0FCF1FDC, 0x40C4000000000,
-    0xFFFFFFFF00004000, 0x18, 0xFFC0000000000000, 0x3FFFFFFFFFF,
-    0xFFFF7FFFFFFFFFFF, 0xC06DFFFF7FFFFFFF, 0xC780FFFFFFFFF, 0x20BFFFFFFFFF,
-    0x3FFFFFFFFFFF, 0xFFFFFFF, 0xFFFCFFFC00000000, 0xFE00FFFFFFFFFFFF,
-    0x3FF7FFFFFCF38FF, 0xFFFF000000080000, 0xF8007F, 0x7FFFFFE00000000,
-    0x7FFFFFE,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 8, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0xFFFF, 0xFFFF000000000000, 0xFFFFFFFFF0FFFFF,
-    0x7FFFFFFFFFFFF, 0xFFFFFFFF00000000, 0xFFFFFFFF, 0xF,
-  ],
-};
-
-pub const CHANGES_WHEN_LOWERCASED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE, 0, 0x7F7FFFFF, 0xAA55555555555555, 0x2B555555555554AA,
-    0x11AED2D5B1DBCED6, 0x55D655554AAAADB0, 0x6C05555555555555, 0x557A, 0, 0,
-    0, 0x8045000000000000, 0xFFBFFFED740, 0xE690555555008000, 0xFFFFFFFFFFFF,
-    0x5555555500000000, 0x5555555555555401, 0x5555555555552AAB,
-    0xFFFE555555555555, 0x7FFFFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 5, 5, 6, 5, 7, 8, 9, 10, 0, 0, 0,
-    0, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 15, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17,
-    5, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 20, 0, 21, 22, 23, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFF00000000, 0x20BF, 0x3FFFFFFFFFFFFF, 0xE7FFFFFFFFFF0000,
-    0x5555555555555555, 0x5555555540155555, 0xFF00FF003F00FF00,
-    0xFF00AA003F00, 0x1F00FF00FF00FF00, 0x1F001F000F001F00, 0x40C4000000000,
-    0xFFFF00000000, 0x8, 0xFFC0000000000000, 0xFFFF, 0x7FFFFFFFFFFF,
-    0xC025EA9D00000000, 0x4280555555555, 0x155555555555, 0x5555555,
-    0x5554555400000000, 0x6A00555555555555, 0x15F7D5555452855,
-    0x7FFFFFE00000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 3, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFF, 0x7FFFFFFFFFFFF,
-    0xFFFFFFFF00000000, 0xFFFFFFFF, 0x3FFFFFFFF,
-  ],
-};
-
-pub const CHANGES_WHEN_TITLECASED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE00000000, 0x20000000000000, 0xFF7FFFFF80000000,
-    0x54AAAAAAAAAAAAAA, 0xD4AAAAAAAAAAAB55, 0xA251212A46241129,
-    0xAA2BAAAAB55556D0, 0x900AAAA8AAAAAAAA, 0x20269F6B1ADFAA85, 0x60041F89, 0,
-    0, 0x388A000000000020, 0xFFFFF00000010000, 0x92FAAAAAAE37FFF,
-    0xFFFF000000000000, 0xAAAAAAAAFFFFFFFF, 0xAAAAAAAAAAAAA802,
-    0xAAAAAAAAAAAAD554, 0xAAAAAAAAAAAA, 0xFFFFFFFE00000000, 0xFF, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 3, 0, 0, 4, 4, 5, 4, 6, 7, 8, 9, 0, 0, 0, 0,
-    0, 10, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4, 15,
-    16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 0, 19, 20, 21, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x3F00000000000000, 0x1FF, 0x2200000000000000, 0xAAAAAAAAAAAAAAAA,
-    0xAAAAAAAA0FEAAAAA, 0xFF00FF003F00FF, 0x3FFF00FF00FF003F,
-    0x40DF00FF00FF00FF, 0xDC00FF00CF00DC, 0xFFFF000000004000, 0x10,
-    0x3FFFFFF0000, 0xFFFF000000000000, 0x4815627FFFFFFF, 0x8500AAAAAAAAA,
-    0x20BFFFFFFFFF, 0x2AAAAAAAAAAA, 0xAAAAAAA, 0xAAA8AAA800000000,
-    0x9400AAAAAAAAAAAA, 0x2A002AAAA8A10AA, 0xFFFF000000080000,
-    0xFFFFFFFFFFFFFFFF, 0xF8007F, 0x7FFFFFE,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 3, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFF0000000000, 0xFFFF, 0xFFFFFFFFF000000, 0x7FFFFFFFFFFFF,
-    0xFFFFFFFF, 0xFFFFFFFF00000000, 0xFFFFFFFC00000000, 0xF,
-  ],
-};
-
-pub const CHANGES_WHEN_UPPERCASED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE00000000, 0x20000000000000, 0xFF7FFFFF80000000,
-    0x54AAAAAAAAAAAAAA, 0xD4AAAAAAAAAAAB55, 0xA251212A46241129,
-    0xAA2DAAAAB5555B60, 0x900AAAA8AAAAAAAA, 0x20269F6B1ADFAA85, 0x60041F89, 0,
-    0, 0x388A000000000020, 0xFFFFF00000010000, 0x92FAAAAAAE37FFF,
-    0xFFFF000000000000, 0xAAAAAAAAFFFFFFFF, 0xAAAAAAAAAAAAA802,
-    0xAAAAAAAAAAAAD554, 0xAAAAAAAAAAAA, 0xFFFFFFFE00000000, 0xFF, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 4, 0, 0, 5, 5, 6, 5, 7, 8, 9, 10, 0, 0, 0,
-    0, 0, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 15, 5,
-    16, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 19, 0, 20, 21, 22, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xE7FFFFFFFFFF0000, 0x3F00000000000000, 0x1FF, 0x2200000000000000,
-    0xAAAAAAAAAAAAAAAA, 0xAAAAAAAA0FEAAAAA, 0xFF00FF003F00FF,
-    0x3FFF00FF00FF003F, 0x50DFFFFFFFFFFFFF, 0x10DC00FF00CF10DC,
-    0xFFFF000000004000, 0x10, 0x3FFFFFF0000, 0xFFFF000000000000,
-    0x4815627FFFFFFF, 0x8500AAAAAAAAA, 0x20BFFFFFFFFF, 0x2AAAAAAAAAAA,
-    0xAAAAAAA, 0xAAA8AAA800000000, 0x9400AAAAAAAAAAAA, 0x2A002AAAA8A10AA,
-    0xFFFF000000080000, 0xFFFFFFFFFFFFFFFF, 0xF8007F, 0x7FFFFFE,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 3, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFF0000000000, 0xFFFF, 0xFFFFFFFFF000000, 0x7FFFFFFFFFFFF,
-    0xFFFFFFFF, 0xFFFFFFFF00000000, 0xFFFFFFFC00000000, 0xF,
-  ],
-};
-
-pub const DASH: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x200000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0x4000000000000400, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 5, 0,
-    0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 7, 1, 0, 0, 0, 0, 0, 0, 8, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 11, 0, 0, 12, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1, 0x40, 0x3F0000, 0x800000000080000, 0x800, 0x40000,
-    0xC00000004800000, 0x1000010000000, 0x100000000, 0x6000000000000,
-    0x801000000, 0x2000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const DEFAULT_IGNORABLE_CODE_POINT: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x200000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x8000, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0x10000000, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 8, 0, 0, 9, 10,
-  ],
-  tree2_level2: &[
-    0, 0x180000000, 0x30000000000000, 0x7800, 0x7C000000F800, 0xFFFF00000000,
-    0x1000000000, 0xFFFF, 0x8000000000000000, 0x100000000, 0x1FF000000000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3,
-  ],
-  tree3_level3: &[
-    0, 0xF00000000, 0x7F8000000000000, 0xFFFFFFFFFFFFFFFF,
-  ],
-};
-
-pub const DEPRECATED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0x200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0x8000000000000, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x280000000000000, 0x1800000000, 0xFC0000000000, 0x60000000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x2,
-  ],
-};
-
-pub const DIACRITIC: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x140000000, 0x190810000000000, 0, 0, 0, 0, 0, 0, 0,
-    0xFFFF000000000000, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0x4300007E0FF7FFF, 0x30, 0, 0, 0, 0xF8, 0, 0, 0x2000000,
-    0xBFFFFFFBFFFE0000, 0x16, 0, 0x187F800, 0, 0x1C6180000000,
-    0xFFFF000000000000, 0x7FF, 0x1FFC000000000, 0x3FF80000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 1, 2, 3, 4, 3, 5, 3, 5, 3, 6, 3, 5, 1, 5, 1, 5, 3, 5, 7, 5, 1, 8, 1,
-    9, 1, 10, 11, 1, 12, 13, 14, 1, 15, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 17, 1, 1, 1,
-    1, 18, 19, 1, 20, 21, 22, 1, 23, 24, 1, 25, 26, 27, 1, 28, 1, 1, 1, 1, 1,
-    1, 29, 30, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 31, 1, 1, 1, 1, 32, 1, 1, 1, 1, 1, 1, 1, 33, 1, 34, 3, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 35, 36, 37, 38, 1,
-    39, 40, 1, 1, 1, 41, 42, 43, 44, 45, 1, 46, 47, 48, 1, 49, 1, 50, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 51, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 52, 1, 1, 1, 53, 54, 55, 56,
-  ],
-  tree2_level2: &[
-    0x3000000, 0, 0x7FFFFFF800000000, 0x1000000000000000, 0x20000001E2000,
-    0x2000, 0xE000000000002000, 0x1800000000000000, 0x400, 0x5F80, 0x1F00,
-    0xC2A0000003000000, 0xDC, 0x40, 0x680000000000000, 0xC00BF80, 0x200FFE00,
-    0xE00000000000000, 0x9FE0000000000000, 0x3FFF000000000000,
-    0x10000000000000, 0xFF80000000010, 0xC0000000000, 0xC0000000000000,
-    0x3F00000000000000, 0x39021FFFFFF0000, 0xFFFFF00000000000, 0x7FFFFFFFFFF,
-    0xE3E000000000FFF0, 0xA000000000000000, 0x6000E000E000E003,
-    0x3800000000000, 0x800000000000, 0xFC0000000000, 0x1E000000,
-    0xB000800000000000, 0x30000000, 0x3000000000000, 0x3FF800000, 0x100,
-    0x300000000000000, 0x3FFFF00000010, 0x780000000000, 0x80000,
-    0x8000000000000, 0x2000000001, 0x3800000000000000, 0x8000000000000000,
-    0x40000000000007, 0xF8000000, 0x300000000000, 0x40000000, 0xFFFF00000000,
-    0x4000000000000000, 0x1000000000001, 0xC0000000, 0x800000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0,
-    0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 5, 0, 6, 7, 0, 8, 9, 0, 0,
-    10, 11, 12, 0, 0, 0, 13, 0, 14, 0, 0, 15, 16, 15, 0, 17, 0, 18, 0, 0, 0,
-    5, 0, 0, 0, 0, 0, 0, 0, 19, 20, 21, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 22, 23,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 26, 27, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x100000000, 0x6000000000, 0xFC00000000, 0x1FFC0, 0x600000000000000,
-    0x18000000000000, 0x8000000000000, 0x1C01, 0x60000000000000,
-    0x60000000000, 0x1000000000000000, 0x1F1FC000002000, 0x44, 0xC,
-    0x8000000000000000, 0x1, 0xC0000000000000, 0x80000000000,
-    0x10000000000000, 0x80, 0x2000000, 0x34, 0x800000, 0x1F000000000000,
-    0xFFFF8000, 0xF807E38000000000, 0x3C0000000FE7, 0x7F0000, 0x770,
-  ],
-};
-
-pub const EXTENDER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x80000000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0x30000, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0x1, 0, 0, 0, 0, 0, 0x400000000000000,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 4,
-    0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12,
-    0, 13, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x40, 0x400, 0x8, 0x8000000000, 0x40000000000000, 0x800000000000000,
-    0x3E000000000020, 0x60000000, 0x7000000000000000, 0x200000, 0x1000,
-    0x4000008000, 0x1000000000000, 0x18000020000000,
-  ],
-  tree3_level1: &[
-    0, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x20000000, 0x1C0, 0x1000000, 0xC, 0x300000000, 0x70,
-  ],
-};
-
-pub const GRAPHEME_BASE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0xFFFFFFFF00000000, 0x7FFFFFFFFFFFFFFF, 0xFFFFDFFF00000000,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0,
-    0xFCFF000000000000, 0xFFFFFFFBFFFFD7F0, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFC07,
-    0xFFFFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFFF, 0xFFFFFFFFFE7FFFFF,
-    0x400000000000E7FF, 0x1F87FFFFFF0049, 0xFFFFFFFFC800FFC0,
-    0xFFFEFFFF000007FF, 0xFFFFFFFFFFFFFFFF, 0xFFFFC260403FFFFF,
-    0xFFFFFFFD3FFF, 0xFFFFFFFFFFFFE000, 0x2003FFFFFFFFF, 0xC7F007FFFFFFFFFF,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 36, 36,
-    36, 36, 37, 38, 39, 40, 41, 42, 43, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 44, 45, 46, 47, 48, 49, 50, 45, 51, 52, 53, 54, 55, 56, 57, 58, 59, 3,
-    60, 61, 62, 63, 64, 65, 66, 67, 36, 36, 36, 3, 36, 36, 36, 36, 68, 69, 70,
-    71, 72, 73, 74, 3, 36, 36, 75, 36, 36, 36, 36, 36, 36, 36, 36, 36, 76, 77,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 78, 79, 80, 81, 82, 36, 83, 84, 85,
-    86, 87, 36, 88, 89, 90, 36, 36, 36, 91, 92, 93, 94, 36, 95, 36, 96, 97,
-    82, 36, 36, 98, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 52, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 99, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 100, 101, 36, 36, 36, 36, 102, 103, 104,
-    105, 36, 36, 106, 107, 108, 109, 36, 110, 111, 112, 113, 114, 115, 116,
-    117, 118, 119, 120, 36, 121, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-    36, 97, 122, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 36, 36, 36, 36, 36, 123, 36, 124, 125,
-    126, 36, 127, 36, 36, 36, 36, 36, 128, 129, 130, 131, 132, 36, 133, 93,
-    36, 134, 135,
-  ],
-  tree2_level2: &[
-    0x7FFF0110043FFFFF, 0x7FF41FFFFFF, 0x3FDFFFFF00000000, 0,
-    0xEBFFFFFFFFFFFFF8, 0xFFFFFFF3FF01DE01, 0xA3C5FDFFFFF99FED,
-    0x3FFFFFC3B0005981, 0xC36DFDFFFFF987E8, 0x5CFFC05E000001,
-    0xE3EDFDFFFFFBBFE8, 0x203FFC300011A01, 0x23EDFDFFFFF99FEC,
-    0xFFFFC3B0001981, 0x83FFC718D63DC7E8, 0x7FFFFC000011DC6,
-    0x23FFFDFFFFFDDFEE, 0xFF00FFC30700001E, 0x63EFFDFFFFFDDFFD,
-    0x6FFC340000D9B, 0xA7FFFFFFFFFDDFEC, 0xFFFFFFC3FF70DDC1,
-    0x2FFBFFFFFC7FFFEC, 0x1CFFC07F03007F, 0x800DFFFFFFFFFFFE, 0xFFF807F,
-    0x200DECAEFEF02596, 0xF3FF005F, 0xFD5FFFFFFCFFFFFF, 0x80001FFFFFFFFEFF,
-    0xC000000000001F20, 0x7FFDFBF, 0x99021FFFFFFFFFFF, 0xFFE1FFFE3CFFFFFF,
-    0xFFFFFFFFDFFFDF9B, 0xFFFFFFFFFFFF20BF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFF3D7F3DFF, 0x7F3DFFFFFFFF3DFF, 0xFFFFFFFFFF7FFF3D,
-    0xFFFFFFFFFF3DFFFF, 0x1FFFFFFF07FFFFFF, 0xFFFFFFFF03FFFFFF,
-    0x3F3FFFFFFFFFFFFF, 0xFFFFFFFF1FFFFFFF, 0x1FFFFFFFFFFFFFF,
-    0x63FFFF0003DFFF, 0x1DFFF0003FFFF, 0xC04FFFFFFFFFFFFF, 0x3FF03FF1FF001BF,
-    0xFFFFFFFF03FF07FF, 0xFFFF05FFFFFFFF9F, 0x3FFFFFFFFFFFFF,
-    0x1FB0E787FFFFFFF, 0x1F3FFFFFFFFFF1, 0xFFFF0FFFFFFFFFFF,
-    0xFFFFFFFFC7FF03FF, 0xFFFFFFFFC67FFFFF, 0x7E01A00BFFFFF, 0x3FFF03FF03FF,
-    0xE82FFFFFFFFFFFF0, 0x1FF007FFFFFF0FFB, 0xFFFFC4C3FFFFFFFC,
-    0xF00C5CBFFFFFFFFF, 0xF8300FFFFFFFFFFF, 0xFFFFFFFFFFFFE3FF,
-    0xE7FFFFFFFFFF01FF, 0xEFDE02000800FF, 0xFFFFFFFF3F3FFFFF,
-    0x3FFFFFFFAAFF3F3F, 0xFFDFFFFFFFFFFFFF, 0x7FDCFFFFEFCFFFDF,
-    0xFFFF80FFFFFF07FF, 0xFFF30000FFFFFFFF, 0xFFFFFFFF1FFF7FFF,
-    0xFFFFFFFFFFFF0FFF, 0x7FFFFFFFFF, 0xFFFFFFFF000007FF, 0xFFCFFFFFFFFFFFFF,
-    0xFFFFFFFFFF3FFFFF, 0x7FFFFFFFFFFFFDFF, 0xFFFF7FFFFFFFFFFF,
-    0xFFFFFFFF7FFFFFFF, 0xFE0C7FFFFFFFFFFF, 0xFFFF20BFFFFFFFFF,
-    0x180FFFFFFFFFF, 0x7F7F7F7F007FFFFF, 0x7F7F7F7F, 0x7FFF,
-    0xFFFFFFFFFBFFFFFF, 0xFFFFFFFFFFFFF, 0xFFF0000003FFFFF,
-    0xFFFF03FFFFFFFFFF, 0xFFFFFFFFFFFFFFFE, 0xFFFFFFFFF87FFFFF,
-    0xFFFEFFFFFFFFFFE0, 0x7FFFFFFFFFF7FFF, 0xFFFF000FFFFFFFFF,
-    0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF, 0xFFFFFFFFFFFF1FFF,
-    0xFFFFFFFFFFFF007F, 0xFFFFFFFFFFF, 0xC0087FFFFFFFFFFF, 0xFFFFFFFF3FFFFFFF,
-    0xFCFFFFFFFFFFFF, 0x3FFFFFFFFFFFFFF, 0xFF80000000000000,
-    0x3FF0F9FFFFFF7BB, 0xFFFFFFFFFFFFFF, 0x7FFC000003FFC00F,
-    0xFFFFC03FFFFFFFFF, 0x1FFFFFFF800C007F, 0xEC37FFFFFFFFFFF8,
-    0x7FFFFFDFC3FFBFFF, 0x1981FFFFFFFFFF, 0xEFFFFFFFF3FF2FF7,
-    0x3E62FFFFFFFFFFFF, 0x3FCFFFF8000005, 0xFFFF7F7F007E7E7E,
-    0xFFFF003FFFFFFFFF, 0x3FF1EDFFFFFFFFF, 0xFFFFFFFFFFFF87F,
-    0xFFFF3FFFFFFFFFFF, 0x3FFFFFF, 0x5F7FFFFFA0F8007F, 0xFFFFFFFFFFFFFFDB,
-    0xFFFFFFFFFFF80003, 0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFCFFFF,
-    0x3FFF0000000000FF, 0xFFFF000003FF0000, 0xFFDF0F7FFFF7FFFF,
-    0x1FFFFFFFFFFFFFFF, 0x7FFFFFFF3FFFFFFF, 0x30007F7F1CFCFCFC,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 12, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 13, 14, 15, 7, 16, 17, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 2, 5, 6, 7, 7, 8, 9, 10, 11, 12, 13, 2, 2, 14, 15, 16, 17,
-    7, 7, 2, 2, 2, 2, 18, 19, 7, 7, 20, 21, 22, 23, 24, 7, 25, 26, 27, 28, 29,
-    30, 31, 32, 33, 7, 2, 34, 35, 36, 37, 7, 7, 7, 7, 38, 7, 7, 16, 39, 7, 7,
-    40, 41, 42, 43, 44, 45, 46, 47, 48, 7, 49, 50, 51, 52, 7, 7, 53, 54, 55,
-    56, 7, 7, 57, 58, 59, 60, 61, 62, 63, 7, 7, 7, 64, 7, 65, 66, 7, 7, 7, 7,
-    67, 68, 69, 70, 7, 7, 7, 7, 71, 72, 73, 7, 74, 75, 76, 7, 7, 7, 7, 77, 7,
-    7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 78, 7, 2, 79, 2, 2, 2,
-    80, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 81, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 82, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2,
-    2, 2, 2, 70, 83, 7, 84, 85, 86, 87, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 88,
-    7, 2, 89, 90, 91, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 92, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 35, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 93, 94, 2, 2, 2, 2, 2, 95, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 96, 97, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 2, 2, 2, 98, 99, 100, 101, 102, 2, 103, 7, 104, 2, 105, 7, 7, 2, 106,
-    107, 108, 109, 110, 2, 2, 2, 2, 111, 2, 2, 2, 2, 112, 2, 2, 2, 2, 2, 2, 2,
-    2, 113, 114, 115, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 116, 2, 117, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 118, 119, 7, 7, 7, 7, 7, 120, 121, 122, 123, 7, 7, 7, 7, 124, 2,
-    125, 126, 127, 124, 128, 129, 130, 131, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 132, 2, 133, 2, 134, 135, 136, 137, 7, 138, 139, 140,
-    141, 7, 142, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 143, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 119, 2, 2, 2,
-    144, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 145, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 146, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2,
-    2, 2, 2, 147, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7,
-  ],
-  tree3_level3: &[
-    0xB7FFFF7FFFFFEFFF, 0x3FFF3FFF, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFF,
-    0xFF8FFFFFFFFFFF87, 0x10FFF7FFF, 0x1FFFFFFFFFFF0000, 0,
-    0xFFFFFFFF1FFFFFFF, 0xFFFFFFE0001FFFF, 0xFFFFE00FFFFFFFFF,
-    0x3FFFFFFFFF07FF, 0xFFFFFFFFBFFFFFFF, 0x3FFF0F, 0xFFFF03FF3FFFFFFF,
-    0xFFFFFFFFF0FFFFF, 0xFFFF00FFFFFFFFFF, 0x800FFFFFFFFF, 0x7FFFFFFFFFFFFF,
-    0xFF003FFFFF, 0x91BFFFFFFFFFFD3F, 0xFFFFFFFFFFBFFFFF, 0xFF807FFFFFFF,
-    0xF837FFFF00000000, 0x83FFFFFF8FFFFFFF, 0xF0FFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFCFFFF, 0x3FFFFFFEEF0001, 0xFFFFFFFF01FF01FF, 0xFFFFFFFF,
-    0x7FF81FFFFFFFFF, 0xFE3FFFFFFFFFFFFF, 0xFF07FFFFFF3FFFFF, 0xFE001E03FFFF,
-    0x1FF, 0x7FFFFFFFFFFFF, 0xFC07FFFFFFFFFFFF, 0x3FF000FFFFFFFFF,
-    0x7FFFFFFF00000000, 0x3FE003F, 0xFFFFFFFFFFFFFD, 0xFFFFFFFC3F80,
-    0xD987FFFFFFFFFFFC, 0x3FF01FFFFFF0003, 0xFFC0107FFFFFFFF8,
-    0x77FFFFFFFF007F, 0x803FFFFFFFFFFFFC, 0x1FFFFEFFFF21FF,
-    0x3F2C7FFFFFFBFFFF, 0xFFFF03FFBFFFBD7F, 0x3FF00077FFFFFFF,
-    0xA3EDFDFFFFF99FEC, 0xFE001399E, 0xFFFFFFFFFFFFFF, 0x2BFFFFA3,
-    0x5A06FFFFFFFFFFFF, 0x3FF00F2, 0x4F037FFFFFFFFFFF, 0xFFFFFFE,
-    0x5807FFFFFFFFFFFF, 0x1FFF03FF001E, 0x40D7FFFFFFFFFF, 0x3FF,
-    0xFFFF004307FFFFFF, 0x9007FFFFFFFFFFF, 0xFFFFFFFF00000000,
-    0x8007FFFFFFFFFFFF, 0x8607FFFFFFFFF801, 0xFFFFFFFFF181007F, 0x7FC8003CF,
-    0x1FFFFFFFFFFFFFF, 0x4000FFFFFFFFFDFF, 0xFFFF1FFFFFFF003F,
-    0x1202000000FFFF, 0x1FFFFFFFFFB7F, 0xFFFFFDBF03FF0040, 0x3FF01587FFF,
-    0x1E7FFFF00000000, 0x3FFFFFF, 0x1F7FFFFFFFFFFF, 0xF, 0x7FFFFFFFFFFF, 0x7F,
-    0xC3FF7FFFFFFF, 0x203FFFFFFF0000, 0xFF80FFFFFFFFFFFF, 0xE0FFFFFBFBFF003F,
-    0xFFFF, 0x7FFFFFF, 0x7FFFFFFFFFFF001F, 0xFFF80000, 0x300000000,
-    0x3FFFFFFFFFFFF, 0x7FFFFFFF, 0xFFFF000000000000, 0xFFFFFFFFFFFFFFF,
-    0x1FFF07FFFFFFFFFF, 0x93FF01FF, 0x3FFFFFFFFFFFFF, 0xFFFFFE7FFFFFFFFF,
-    0x3C5FFFFFFFFF, 0xFFFFC3FFFFFFF018, 0x1FFFFFFFFFF, 0x23, 0xFFFFF00000000,
-    0x1FFFFFF007FFFFF, 0xFFFFFFFFFFDFFFFF, 0xEBFFDE64DFFFFFFF,
-    0xFFFFFFFFFFFFFFEF, 0x7BFFFFFFDFDFE7BF, 0xFFFFFFFFFFFDFC5F,
-    0xFFFFFF3FFFFFFFFF, 0xFFFFFFFFFFFFCFFF, 0x780000000000000,
-    0xFFDFE00000000000, 0xFEF, 0xFF9F, 0xC3FF000F, 0xFFFE000000000000,
-    0x1FFFFFFFFFFFFF, 0xAF7FE96FFFFFFEF, 0x5EF7F796AA96EA84,
-    0xFFFFBEE0FFFFBFF, 0x3000000000000, 0xFFFF0FFFFFFFFFFF,
-    0xFFFE7FFF000FFFFF, 0x3FFFFFFFFEFFFE, 0xFFFFFFFFFFFF1FFF, 0x1FFFFFFFFFFF,
-    0xFFFFFFC000000000, 0xFFFFFFFFFFF0007, 0x3F000301FF, 0x3FF1FFF001FFFFF,
-    0xFFFFFFFFFFFFF, 0x1FFFFFF, 0xFFFFFFFFFFFF0FFF, 0xFFFFFFFF03FF00FF,
-    0x3FFFFFFF00FF, 0x7FFFFFFFFFFF0FFF, 0xF479FFFFFFFFFFFF, 0x3FF0007FFFFFFFF,
-    0xFFFFFFFFFFFF0007, 0x3FFF00000000, 0x7FFFFF, 0xFFFFFFFF3FFFFFFF,
-    0xFFFF0003FFFFFFFF, 0x1FFFFFFFF, 0x3FFFFFFF,
-  ],
-};
-
-pub const GRAPHEME_EXTEND: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF, 0,
-    0, 0, 0, 0x3F8, 0, 0, 0, 0xBFFFFFFFFFFE0000, 0xB6, 0x7FF0000,
-    0x10000FFFFF800, 0, 0x3D9F9FC00000, 0xFFFF000000020000, 0x7FF,
-    0x1FFC000000000, 0x200FF80000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-    20, 2, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 34, 35, 36, 37,
-    38, 2, 39, 2, 40, 2, 2, 2, 41, 42, 43, 2, 44, 45, 46, 47, 48, 2, 2, 49, 2,
-    2, 2, 50, 2, 2, 2, 2, 2, 2, 2, 2, 51, 2, 2, 52, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 53, 2, 54, 2, 55, 2, 2, 2, 2, 2, 2,
-    2, 2, 56, 2, 57, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 58, 59, 60, 2, 2, 2, 2, 61, 2, 2, 62, 63, 64, 65, 66, 67, 68, 69, 70,
-    2, 2, 2, 71, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 72, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 73, 2, 2, 2, 2, 2, 59, 2,
-  ],
-  tree2_level2: &[
-    0x3EEFFBC00000, 0xE000000, 0, 0xFFFFFFFBFFF80000, 0x1400000000000007,
-    0xC00FE21FE, 0x5000000000000002, 0x4000000C0080201E, 0x1000000000000006,
-    0x23000000023986, 0xFC00000C000021BE, 0xD000000000000002, 0xC00C0201E,
-    0x4000000000000004, 0x802001, 0xC000000000000011, 0xC00603DC1,
-    0x9000000000000002, 0xC00603044, 0x5800000000000003, 0xC0080201E,
-    0x805C8400, 0x7F2000000000000, 0x7F80, 0x1BF2000000000000, 0x3F00,
-    0x2A0000003000000, 0x7FFE000000000000, 0x1FFFFFFFFEFFE0DF, 0x40,
-    0x66FDE00000000000, 0x1E0001C3000000, 0x20002064, 0xE0000000,
-    0x1C0000001C0000, 0xC0000000C0000, 0x3FB0000000000000, 0x200FFE40, 0x3800,
-    0x20000000060, 0xE04018700000000, 0x9800000, 0x9FF81FE57F400000,
-    0x7FFF000000000000, 0x17D000000000000F, 0xFF80000000004, 0x3B3C00000003,
-    0x3A34000000000, 0xCFF00000000000, 0x31021FDFFF70000, 0xFBFFFFFFFFFFFFFF,
-    0x1000, 0x1FFFFFFFF0000, 0x3800000000000, 0x8000000000000000,
-    0xFFFFFFFF00000000, 0xFC0000000000, 0x6000000, 0x3FF7800000000000,
-    0xC0000000, 0x3000000000000, 0x6000000844, 0x8003FFFF00000030,
-    0x3FC000000000, 0x3FF80, 0x13C8000000000007, 0x2000000000,
-    0x667E0000000000, 0x1000000000001008, 0xC19D000000000000,
-    0x40300000000002, 0x212000000000, 0x40000000, 0xFFFF0000FFFF,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 4, 2, 5, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 0, 0, 0, 0, 0, 0,
-    0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 8, 9, 10, 0, 11, 12, 13, 14, 15,
-    0, 0, 16, 17, 18, 0, 0, 19, 20, 21, 22, 0, 0, 23, 24, 25, 26, 27, 0, 28,
-    0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 30, 31, 32, 0, 0, 0, 0, 0, 33, 0, 34, 0,
-    35, 36, 37, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, 0, 45, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 53, 0, 0, 53, 53, 53,
-    54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x2000000000000000, 0x100000000, 0x7C0000000000000, 0x870000000000F06E,
-    0x6000000000, 0xF000000000, 0x1FFC0, 0xFF00000000000002,
-    0x800000000000007F, 0x678000000000003, 0x1FEF8000000007, 0x8000000000000,
-    0x7FC0000000000003, 0x1E00, 0x40D3800000000000, 0x7F880000000,
-    0x5800000000000003, 0x1F1FC000800001, 0xFF00000000000000, 0x4000005C,
-    0xA5F9000000000000, 0xD, 0xB03C800000000000, 0x30000001,
-    0xA7F8000000000000, 0x1, 0xBF280000000000, 0xFBCE0000000,
-    0x6FF800000000000, 0x79F80000000007FE, 0xE7E0080, 0x37FFC00,
-    0xBF7F000000000000, 0x6DFCFFFFFC0000, 0xB47E000000000000, 0xBF, 0xA30000,
-    0x18000000000000, 0x1F000000000000, 0x7F000000000000, 0x78000, 0x60000000,
-    0xF807C3A000000000, 0x3C0000000FE7, 0x1C, 0xF87FFFFFFFFFFFFF,
-    0x201FFFFFFFFFFF, 0xFFFEF8000010, 0x7DBF9FFFF7F, 0x7F0000, 0x7F0,
-    0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF,
-  ],
-};
-
-pub const GRAPHEME_LINK: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 2, 1, 0, 3, 4,
-    0, 0, 0, 0, 0, 5, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0,
-    0, 0, 5, 10, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 5, 0, 14, 0,
-    15, 0, 0, 0, 16, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x2000, 0x1800000000000000, 0x400, 0x400000000000000, 0x10,
-    0x600000000000000, 0x10000000100000, 0x40000, 0x100000000, 0xC0000000000,
-    0xC000000000000, 0x8000000000000000, 0x40, 0x80000, 0x1, 0x40000000000000,
-    0x200000000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 4, 0, 0, 5, 6, 0, 0,
-    7, 0, 8, 0, 0, 0, 9, 0, 9, 0, 0, 1, 0, 1, 0, 10, 0, 11, 0, 0, 0, 3, 0, 0,
-    0, 0, 0, 0, 0, 12, 13, 14, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 15, 16, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x8000000000000000, 0x8000000000000040, 0x200000000000000,
-    0x18000000000000, 0x1, 0x20000000000000, 0x40000000000, 0x2000, 0x4,
-    0x40000000000000, 0x80000000000, 0x10000000000000, 0x80, 0x2000000, 0x30,
-    0x800000,
-  ],
-};
-
-pub const HEX_DIGIT: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x3FF000000000000, 0x7E0000007E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x7E03FF0000, 0x7E,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const HYPHEN: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x200000000000, 0, 0x200000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0x400, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 6, 7, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x40, 0x30000, 0x800000, 0x800000000000000, 0x800000000, 0x2000,
-    0x2000000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const IDS_BINARY_OPERATOR: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFF3000000000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const IDS_TRINARY_OPERATOR: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xC000000000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const ID_CONTINUE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x3FF000000000000, 0x7FFFFFE87FFFFFE, 0x4A0040000000000,
-    0xFF7FFFFFFF7FFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0x501F0003FFC3,
-    0xFFFFFFFFFFFFFFFF, 0xBCDFFFFFFFFFFFFF, 0xFFFFFFFBFFFFD7C0,
-    0xFFBFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFCFB, 0xFFFFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFFF,
-    0xFFFFFFFF027FFFFF, 0xBFFFFFFFFFFE01FF, 0x787FFFFFF00B6,
-    0xFFFFFFFF07FF0000, 0xFFFFC3FFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0x9FFFFDFF9FEFFFFF, 0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFFE7FF,
-    0x3FFFFFFFFFFFF, 0x243FFFFFFFFFFFFF,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 4, 32, 33, 34, 4, 4, 4, 4, 4,
-    35, 36, 37, 38, 39, 40, 41, 42, 4, 4, 4, 4, 4, 4, 4, 4, 43, 44, 45, 46,
-    47, 4, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 4, 61, 4, 62,
-    63, 64, 65, 66, 4, 4, 4, 67, 4, 4, 4, 4, 68, 69, 70, 71, 72, 73, 74, 75,
-    76, 77, 78, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 79, 80, 4, 81, 82, 83, 84, 85, 60, 60, 60,
-    60, 60, 60, 60, 60, 86, 42, 87, 88, 89, 4, 90, 91, 60, 60, 60, 60, 60, 60,
-    60, 60, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 52, 60, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 92, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 93, 94, 4, 4, 4, 4, 95, 96, 4, 97, 98, 4, 99, 100, 101, 62,
-    4, 102, 103, 104, 4, 105, 106, 107, 4, 108, 109, 110, 4, 111, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 112, 113, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 4, 4, 4, 4, 4, 103, 4, 114, 115, 116, 97, 117, 4, 4,
-    4, 4, 118, 119, 120, 121, 122, 123, 4, 124, 125, 126, 127, 128,
-  ],
-  tree2_level2: &[
-    0x3FFFFFFFFFFF, 0x7FF0FFFFFFF, 0x3FDFFFFF00000000, 0xFFFFFFFBFFF80000,
-    0xFFFFFFFFFFFFFFFF, 0xFFFEFFCFFFFFFFFF, 0xF3C5FDFFFFF99FEF,
-    0x5003FFCFB080799F, 0xD36DFDFFFFF987EE, 0x3FFFC05E023987,
-    0xF3EDFDFFFFFBBFEE, 0xFE00FFCF00013BBF, 0xF3EDFDFFFFF99FEE,
-    0x2FFCFB0C0399F, 0xC3FFC718D63DC7EC, 0xFFC000813DC7, 0xE3FFFDFFFFFDDFFF,
-    0xFFCF07603DDF, 0xF3EFFDFFFFFDDFEF, 0x6FFCF40603DDF, 0xFFFFFFFFFFFDDFEF,
-    0xFC00FFCF80F07DDF, 0x2FFBFFFFFC7FFFEC, 0xCFFC0FF5F847F,
-    0x7FFFFFFFFFFFFFE, 0x3FF7FFF, 0x3BFFECAEFEF02596, 0xF3FF3F5F,
-    0xC2A003FF03000001, 0xFFFE1FFFFFFFFEFF, 0x1FFFFFFFFEFFFFDF, 0x40,
-    0xFFFFFFFFFFFF03FF, 0xFFFFFFFF3FFFFFFF, 0xF7FFFFFFFFFF20BF,
-    0xFFFFFFFF3D7F3DFF, 0x7F3DFFFFFFFF3DFF, 0xFFFFFFFFFF7FFF3D,
-    0xFFFFFFFFFF3DFFFF, 0x3FE00E7FFFFFF, 0xFFFFFFFF0000FFFF,
-    0x3F3FFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFE, 0xFFFF9FFFFFFFFFFF,
-    0xFFFFFFFF07FFFFFE, 0x1FFC7FFFFFFFFFF, 0x1FFFFF001FDFFF, 0xDDFFF000FFFFF,
-    0x3FF308FFFFF, 0xFFFFFFFF03FF3800, 0x1FFFFFFFFFFFFFF, 0xFFFF07FFFFFFFFFF,
-    0x3FFFFFFFFFFFFF, 0xFFF0FFF7FFFFFFF, 0x1F3FFFFFFFFFC0, 0xFFFF0FFFFFFFFFFF,
-    0x7FF03FF, 0xFFFFFFFF0FFFFFFF, 0x9FFFFFFF7FFFFFFF, 0x3FFF008003FF03FF, 0,
-    0xFF80003FF0FFF, 0xFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFF, 0x3FFFFFFFFFFFE3FF,
-    0xE7FFFFFFFFFF01FF, 0x3FFFFFFFFF70000, 0xFBFFFFFFFFFFFFFF,
-    0xFFFFFFFF3F3FFFFF, 0x3FFFFFFFAAFF3F3F, 0x5FDFFFFFFFFFFFFF,
-    0x1FDC1FFF0FCF1FDC, 0x8000000000000000, 0x8002000000100001, 0x1FFF0000,
-    0x1FFE21FFF0000, 0xF3FFFD503F2FFC84, 0xFFFFFFFF000043E0, 0x1FF,
-    0xFFFF7FFFFFFFFFFF, 0xFFFFFFFF7FFFFFFF, 0xFF81FFFFFFFFF,
-    0xFFFF20BFFFFFFFFF, 0x800080FFFFFFFFFF, 0x7F7F7F7F007FFFFF,
-    0xFFFFFFFF7F7F7F7F, 0x1F3EFFFE000000E0, 0xFFFFFFFEFE7FFFFF,
-    0xF7FFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFE0, 0x7FFFFFF00007FFF,
-    0xFFFF000000000000, 0xFFFFFFFFFFFF, 0x1FFF, 0x3FFFFFFFFFFF0000,
-    0xFFFFFFF1FFF, 0xBFF0FFFFFFFFFFFF, 0x3FFFFFFFFFFFF, 0xFFFFFFFCFF800000,
-    0x3FFFFFFFFFFF9FF, 0xFF80000000000000, 0xFFFFFFFFFF, 0xE8FFFFFF03FF003F,
-    0xFFFF3FFFFFFFFFFF, 0x1FFFFFFF000FFFFF, 0x7FFFFFFF03FF8001,
-    0x7FFFFFFFFFFFFF, 0xFC7FFFFF03FF3FFF, 0x7CFFFF38000007,
-    0xFFFF7F7F007E7E7E, 0xFFFF003FF7FFFFFF, 0x3FF37FFFFFFFFFF,
-    0xFFFF000FFFFFFFFF, 0xFFFFFFFFFFFF87F, 0x3FFFFFF, 0x5F7FFDFFE0F8007F,
-    0xFFFFFFFFFFFFFFDB, 0xFFFFFFFFFFF80000, 0x3FFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFCFFFF, 0xFFF0000000000FF,
-    0x18FFFF0000FFFF, 0xFFDF00000000E000, 0x1FFFFFFFFFFFFFFF,
-    0x87FFFFFE03FF0000, 0xFFFFFFC007FFFFFE, 0x7FFFFFFFFFFFFFFF, 0x1CFCFCFC,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 5, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 12, 13, 14, 7, 15, 16, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 17, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 5, 4, 6, 4, 4, 7, 8, 9, 10, 11, 12, 2, 2, 13, 14, 15, 16,
-    4, 4, 2, 2, 2, 2, 17, 18, 4, 4, 19, 20, 21, 22, 23, 4, 24, 4, 25, 26, 27,
-    28, 29, 30, 31, 4, 2, 32, 33, 33, 34, 4, 4, 4, 4, 4, 4, 4, 35, 36, 4, 4,
-    2, 37, 3, 38, 39, 40, 2, 41, 42, 4, 43, 44, 45, 46, 4, 4, 2, 47, 2, 48, 4,
-    4, 49, 50, 2, 51, 52, 53, 54, 4, 4, 4, 3, 4, 55, 56, 4, 4, 4, 4, 57, 58,
-    59, 60, 4, 4, 4, 4, 61, 62, 63, 4, 64, 65, 66, 4, 4, 4, 4, 67, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 68, 4, 2, 69, 2, 2, 2, 70, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 69, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 71, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2,
-    60, 72, 4, 73, 17, 74, 75, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 4, 4, 2, 76,
-    77, 78, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 79,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 33, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 21, 80, 2, 2, 2, 2, 2, 81, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 2, 82, 83, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 84, 85, 4, 4, 86, 4, 4, 4, 4, 4, 4, 2, 87, 88, 89, 90, 91, 2,
-    2, 2, 2, 92, 93, 94, 95, 96, 97, 4, 4, 4, 4, 4, 4, 4, 4, 98, 99, 100, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 101, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 2, 2, 2, 102, 2, 103, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 104, 105, 106, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 107, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 5, 2, 2, 2, 11, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 108, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 109, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 110, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 111, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4,
-  ],
-  tree3_level3: &[
-    0xB7FFFF7FFFFFEFFF, 0x3FFF3FFF, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFF, 0,
-    0x1FFFFFFFFFFFFF, 0x2000000000000000, 0xFFFFFFFF1FFFFFFF, 0x10001FFFF,
-    0xFFFFE000FFFFFFFF, 0x7FFFFFFFFFF07FF, 0xFFFFFFFF3FFFFFFF, 0x3EFF0F,
-    0xFFFF03FF3FFFFFFF, 0xFFFFFFFFF0FFFFF, 0xFFFF00FFFFFFFFFF, 0xFFFFFFFFF,
-    0x7FFFFFFFFFFFFF, 0xFF003FFFFF, 0x91BFFFFFFFFFFD3F, 0x7FFFFF003FFFFF,
-    0x7FFFFFFF, 0x37FFFF00000000, 0x3FFFFFF003FFFFF, 0xC0FFFFFFFFFFFFFF,
-    0x873FFFFFFEEFF06F, 0x1FFFFFFF00000000, 0x1FFFFFFF, 0x7FFFFFFEFF,
-    0x3FFFFFFFFFFFFF, 0x7FFFF003FFFFF, 0x3FFFF, 0x1FF, 0x7FFFFFFFFFFFF,
-    0x3FF00FFFFFFFFFF, 0xFFFF00801FFFFFFF, 0x1FFFF, 0x8000FFC00000007F,
-    0x3FF01FFFFFF0000, 0xFFDFFFFFFFFFFFFF, 0x4FFFFFFFFF0070, 0x17FF1E1F,
-    0x40FFFFFFFFFBFFFF, 0xFFFF01FFBFFFBD7F, 0x3FF07FFFFFFFFFF,
-    0xFBEDFDFFFFF99FEF, 0x1F1FCFE081399F, 0x43FF07FF, 0x3FF00BF,
-    0xFF3FFFFFFFFFFFFF, 0x3F000001, 0x3FF0011, 0xFFFFFFFFFFFFFF, 0x3FF,
-    0x3FF0FFFE7FFFFFF, 0xFFFFFFFF00000000, 0x800003FFFFFFFFFF,
-    0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0080, 0x23FFFFCF, 0x1FFFFFFFFFFFFFF,
-    0xFF7FFFFFFFFFFDFF, 0xFFFC000003FF0001, 0x7FFEFFFFFCFFFF,
-    0xB47FFFFFFFFFFB7F, 0xFFFFFDBF03FF00FF, 0x3FF01FB7FFF, 0x7FFFFF00000000,
-    0x3FFFFFF, 0x7FFFFFFFFFFF, 0xF, 0x7F, 0x3FF7FFFFFFF, 0x1F3FFFFFFF0000,
-    0xE0FFFFF803FF000F, 0xFFFF, 0x7FFFFFFFFFFF001F, 0xFFFF8000, 0x300000000,
-    0x3FFFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFFFFFFFFFFFF,
-    0x1FFF07FFFFFFFFFF, 0x63FF01FF, 0xF807E3E000000000, 0x3C0000000FE7, 0x1C,
-    0xFFFFFFFFFFDFFFFF, 0xEBFFDE64DFFFFFFF, 0xFFFFFFFFFFFFFFEF,
-    0x7BFFFFFFDFDFE7BF, 0xFFFFFFFFFFFDFC5F, 0xFFFFFF3FFFFFFFFF,
-    0xF7FFFFFFF7FFFFFD, 0xFFDFFFFFFFDFFFFF, 0xFFFF7FFFFFFF7FFF,
-    0xFFFFFDFFFFFFFDFF, 0xFFFFFFFFFFFFCFF7, 0xF87FFFFFFFFFFFFF,
-    0x201FFFFFFFFFFF, 0xFFFEF8000010, 0x7DBF9FFFF7F, 0x7F001F, 0x3FF07FF,
-    0xAF7FE96FFFFFFEF, 0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF, 0x7FFFFF,
-    0xFFFF0003FFFFFFFF, 0x1FFFFFFFF, 0x3FFFFFFF, 0xFFFFFFFFFFFF,
-  ],
-};
-
-pub const ID_START: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE07FFFFFE, 0x420040000000000, 0xFF7FFFFFFF7FFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0x501F0003FFC3, 0, 0xBCDF000000000000,
-    0xFFFFFFFBFFFFD740, 0xFFBFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFC03, 0xFFFFFFFFFFFFFFFF,
-    0xFFFEFFFFFFFFFFFF, 0xFFFFFFFF027FFFFF, 0x1FF, 0x787FFFFFF0000,
-    0xFFFFFFFF00000000, 0xFFFEC000000007FF, 0xFFFFFFFFFFFFFFFF,
-    0x9C00C060002FFFFF, 0xFFFFFFFD0000, 0xFFFFFFFFFFFFE000, 0x2003FFFFFFFFF,
-    0x43007FFFFFFFC00,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 23, 25, 26, 27, 28, 29, 3, 30, 31, 32, 33, 34, 34, 34, 34,
-    34, 35, 36, 37, 38, 39, 40, 41, 42, 34, 34, 34, 34, 34, 34, 34, 34, 43,
-    44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 3, 61,
-    62, 63, 64, 65, 66, 67, 68, 34, 34, 34, 3, 34, 34, 34, 34, 69, 70, 71, 72,
-    3, 73, 74, 3, 75, 76, 77, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    78, 79, 34, 80, 81, 82, 83, 84, 3, 3, 3, 3, 3, 3, 3, 3, 85, 42, 86, 87,
-    88, 34, 89, 90, 3, 3, 3, 3, 3, 3, 3, 3, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 53, 3, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 91, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 92, 93, 34, 34, 34, 34, 94, 95, 96,
-    91, 97, 34, 98, 99, 100, 48, 101, 102, 103, 104, 105, 106, 107, 108, 109,
-    110, 111, 112, 34, 113, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    114, 115, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 34, 34, 34, 34, 34, 116, 34, 117, 118,
-    119, 120, 121, 34, 34, 34, 34, 122, 123, 124, 125, 3, 126, 34, 127, 128,
-    129, 130, 131,
-  ],
-  tree2_level2: &[
-    0x110043FFFFF, 0x7FF01FFFFFF, 0x3FDFFFFF00000000, 0, 0x23FFFFFFFFFFFFF0,
-    0xFFFE0003FF010000, 0x23C5FDFFFFF99FE1, 0x10030003B0004000,
-    0x36DFDFFFFF987E0, 0x1C00005E000000, 0x23EDFDFFFFFBBFE0,
-    0x200000300010000, 0x23EDFDFFFFF99FE0, 0x20003B0000000, 0x3FFC718D63DC7E8,
-    0x10000, 0x23FFFDFFFFFDDFE0, 0x307000000, 0x23EFFDFFFFFDDFE1,
-    0x6000340000000, 0x27FFFFFFFFFDDFE0, 0xFC00000380704000,
-    0x2FFBFFFFFC7FFFE0, 0x7F, 0xDFFFFFFFFFFFE, 0x200DECAEFEF02596, 0xF000005F,
-    0x1, 0x1FFFFFFFFEFF, 0x1F00, 0x800007FFFFFFFFFF, 0xFFE1C0623C3F0000,
-    0xFFFFFFFF00004003, 0xF7FFFFFFFFFF20BF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFF3D7F3DFF, 0x7F3DFFFFFFFF3DFF, 0xFFFFFFFFFF7FFF3D,
-    0xFFFFFFFFFF3DFFFF, 0x7FFFFFF, 0xFFFFFFFF0000FFFF, 0x3F3FFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFE, 0xFFFF9FFFFFFFFFFF, 0xFFFFFFFF07FFFFFE,
-    0x1FFC7FFFFFFFFFF, 0x3FFFF0003DFFF, 0x1DFFF0003FFFF, 0xFFFFFFFFFFFFF,
-    0x10800000, 0xFFFFFFFF00000000, 0x1FFFFFFFFFFFFFF, 0xFFFF05FFFFFFFFFF,
-    0x3FFFFFFFFFFFFF, 0x7FFFFFFF, 0x1F3FFFFFFF0000, 0xFFFF0FFFFFFFFFFF, 0x3FF,
-    0xFFFFFFFF007FFFFF, 0x1FFFFF, 0x8000000000, 0xFFFFFFFFFFFE0, 0xFE0,
-    0xFC00C001FFFFFFF8, 0x3FFFFFFFFF, 0xFFFFFFFFF, 0x3FFFFFFFFC00E000,
-    0xE7FFFFFFFFFF01FF, 0x63DE0000000000, 0xFFFFFFFF3F3FFFFF,
-    0x3FFFFFFFAAFF3F3F, 0x5FDFFFFFFFFFFFFF, 0x1FDC1FFF0FCF1FDC,
-    0x8002000000000000, 0x1FFF0000, 0xF3FFFD503F2FFC84, 0xFFFFFFFF000043E0,
-    0x1FF, 0xFFFF7FFFFFFFFFFF, 0xFFFFFFFF7FFFFFFF, 0xC781FFFFFFFFF,
-    0xFFFF20BFFFFFFFFF, 0x80FFFFFFFFFF, 0x7F7F7F7F007FFFFF, 0x7F7F7F7F,
-    0x1F3E03FE000000E0, 0xFFFFFFFEF87FFFFF, 0xF7FFFFFFFFFFFFFF,
-    0xFFFEFFFFFFFFFFE0, 0x7FFFFFF00007FFF, 0xFFFF000000000000, 0xFFFFFFFFFFFF,
-    0x1FFF, 0x3FFFFFFFFFFF0000, 0xC00FFFF1FFF, 0x80007FFFFFFFFFFF,
-    0xFFFFFFFF3FFFFFFF, 0xFFFFFFFCFF800000, 0x3FFFFFFFFFFF9FF,
-    0xFF80000000000000, 0x7FFFFF7BB, 0xFFFFFFFFFFFFC, 0x68FC000000000000,
-    0xFFFF003FFFFFFC00, 0x1FFFFFFF0000007F, 0x7FFFFFFFFFFF0,
-    0x7C00FFDF00008000, 0x1FFFFFFFFFF, 0xC47FFFFF00000FF7, 0x3E62FFFFFFFFFFFF,
-    0x1C07FF38000005, 0xFFFF7F7F007E7E7E, 0xFFFF003FF7FFFFFF, 0x7FFFFFFFF,
-    0xFFFF000FFFFFFFFF, 0xFFFFFFFFFFFF87F, 0xFFFF3FFFFFFFFFFF, 0x3FFFFFF,
-    0x5F7FFDFFA0F8007F, 0xFFFFFFFFFFFFFFDB, 0x3FFFFFFFFFFFF,
-    0xFFFFFFFFFFF80000, 0x3FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0000,
-    0xFFFFFFFFFFFCFFFF, 0xFFF0000000000FF, 0xFFDF000000000000,
-    0x1FFFFFFFFFFFFFFF, 0x7FFFFFE00000000, 0xFFFFFFC007FFFFFE,
-    0x7FFFFFFFFFFFFFFF, 0x1CFCFCFC,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 5, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 12, 13, 14, 7, 15, 16, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 5, 4, 4, 4, 4, 6, 7, 8, 9, 10, 11, 2, 2, 12, 13, 14, 15, 4,
-    4, 2, 2, 2, 2, 16, 17, 4, 4, 18, 19, 20, 21, 22, 4, 23, 4, 24, 25, 26, 27,
-    28, 29, 30, 4, 2, 31, 32, 32, 15, 4, 4, 4, 4, 4, 4, 4, 33, 34, 4, 4, 35,
-    4, 36, 37, 38, 39, 40, 41, 42, 4, 43, 20, 44, 45, 4, 4, 5, 46, 47, 48, 4,
-    4, 49, 50, 47, 51, 52, 4, 53, 4, 4, 4, 54, 4, 55, 56, 4, 4, 4, 4, 57, 58,
-    59, 60, 4, 4, 4, 4, 61, 62, 63, 4, 64, 65, 66, 4, 4, 4, 4, 67, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 68, 4, 2, 49, 2, 2, 2, 69, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 49, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 70, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2,
-    60, 20, 4, 71, 47, 72, 63, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 4, 4, 2, 73,
-    74, 75, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 76,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 32, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 20, 77, 2, 2, 2, 2, 2, 78, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 2, 79, 80, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 81, 82, 83, 84, 85, 2, 2,
-    2, 2, 86, 87, 88, 89, 90, 91, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2,
-    2, 2, 92, 2, 69, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 93,
-    94, 95, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 96, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 5, 2, 2, 2, 10, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 97, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    98, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 99, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4,
-  ],
-  tree3_level3: &[
-    0xB7FFFF7FFFFFEFFF, 0x3FFF3FFF, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFF, 0,
-    0x1FFFFFFFFFFFFF, 0xFFFFFFFF1FFFFFFF, 0x1FFFF, 0xFFFFE000FFFFFFFF,
-    0x3FFFFFFFFF07FF, 0xFFFFFFFF3FFFFFFF, 0x3EFF0F, 0xFFFF00003FFFFFFF,
-    0xFFFFFFFFF0FFFFF, 0xFFFF00FFFFFFFFFF, 0xFFFFFFFFF, 0x7FFFFFFFFFFFFF,
-    0xFF003FFFFF, 0x91BFFFFFFFFFFD3F, 0x7FFFFF003FFFFF, 0x7FFFFFFF,
-    0x37FFFF00000000, 0x3FFFFFF003FFFFF, 0xC0FFFFFFFFFFFFFF, 0x3FFFFFFEEF0001,
-    0x1FFFFFFF00000000, 0x1FFFFFFF, 0x1FFFFFFEFF, 0x3FFFFFFFFFFFFF,
-    0x7FFFF003FFFFF, 0x3FFFF, 0x1FF, 0x7FFFFFFFFFFFF, 0xFFFF00801FFFFFFF,
-    0x3F, 0xFFFFFFFFFFFFF8, 0xFFFFFFFFFFF8, 0x1FFFFFF0000, 0x7FFFFFFFF8,
-    0x47FFFFFFFF0010, 0x7FFFFFFFFFFF8, 0x1400001E, 0xFFFFFFBFFFF,
-    0xFFFF01FFBFFFBD7F, 0x23EDFDFFFFF99FE0, 0x3E0010000, 0x780,
-    0xFFFFFFFFFFFF, 0xB0, 0x7FFFFFFFFFFF, 0xF000000, 0x10, 0x7FFFFFFFFFF,
-    0x7FFFFFF, 0xFFFFFFFFFFF, 0xFFFFFFFF00000000, 0x80000000FFFFFFFF,
-    0x407FFFFFFFFF801, 0xFFFFFFFFF0010000, 0x200003CF, 0x1FFFFFFFFFFFFFF,
-    0x7FFFFFFFFDFF, 0xFFFC000000000001, 0xFFFF, 0x1FFFFFFFFFB7F,
-    0xFFFFFDBF00000040, 0x10003FF, 0x7FFFF00000000, 0x3FFFFFF, 0xF, 0x7F,
-    0x3FFFFFFF0000, 0xE0FFFFF80000000F, 0x1001F, 0xFFF80000, 0x300000000,
-    0x3FFFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFFFFFFFFFFFF,
-    0x1FFF07FFFFFFFFFF, 0x3FF01FF, 0xFFFFFFFFFFDFFFFF, 0xEBFFDE64DFFFFFFF,
-    0xFFFFFFFFFFFFFFEF, 0x7BFFFFFFDFDFE7BF, 0xFFFFFFFFFFFDFC5F,
-    0xFFFFFF3FFFFFFFFF, 0xF7FFFFFFF7FFFFFD, 0xFFDFFFFFFFDFFFFF,
-    0xFFFF7FFFFFFF7FFF, 0xFFFFFDFFFFFFFDFF, 0xFF7, 0x1F, 0xAF7FE96FFFFFFEF,
-    0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF, 0x7FFFFF, 0xFFFF0003FFFFFFFF,
-    0x1FFFFFFFF, 0x3FFFFFFF,
-  ],
-};
-
-pub const IDEOGRAPHIC: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 3, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 5, 2, 6, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x70003FE000000C0, 0xFFFFFFFFFFFFFFFF, 0x3FFFFFFFFFFFFF,
-    0xFFFFFFFFFFFF, 0xFFFF3FFFFFFFFFFF, 0x3FFFFFF,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 3, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 4, 5, 6, 1, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 1, 1,
-    1, 1, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 1,
-    1, 1, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
-    1, 1, 1, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0x3FFFFFFFFFFFF, 0x7FFFFFFFFFFFF,
-    0xFFFF000000000000, 0xFFFFFFFFFFFFFFF, 0x7FFFFF, 0x1FFFFFFFFFFFFF,
-    0xFFFFFFFF3FFFFFFF, 0xFFFF0003FFFFFFFF, 0x1FFFFFFFF, 0x3FFFFFFF,
-  ],
-};
-
-pub const JOIN_CONTROL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x3000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const LOGICAL_ORDER_EXCEPTION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1F, 0x4E0000000000000, 0x1A60000000000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const LOWERCASE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE00000000, 0x420040000000000, 0xFF7FFFFF80000000,
-    0x55AAAAAAAAAAAAAA, 0xD4AAAAAAAAAAAB55, 0xE6512D2A4E243129,
-    0xAA29AAAAB5555240, 0x93FAAAAAAAAAAAAA, 0xFFFFFFFFFFFFAA85,
-    0x1FFFFFFFFEFFFFF, 0x1F00000003, 0, 0x3C8A000000000020,
-    0xFFFFF00000010000, 0x192FAAAAAAE37FFF, 0xFFFF000000000000,
-    0xAAAAAAAAFFFFFFFF, 0xAAAAAAAAAAAAA802, 0xAAAAAAAAAAAAD554,
-    0xAAAAAAAAAAAA, 0xFFFFFFFF00000000, 0x1FF, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 3, 0, 4, 4, 4, 0, 5, 5, 6, 5, 7, 8, 9, 10, 0, 11, 12,
-    0, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18,
-    5, 19, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 22, 0, 23, 24, 25, 26, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 27, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0,
-    0,
-  ],
-  tree2_level2: &[
-    0, 0xE7FFFFFFFFFF0000, 0x3F00000000000000, 0x1FF, 0xFFFFFFFFFFFFFFFF,
-    0xAAAAAAAAAAAAAAAA, 0xAAAAAAAABFEAAAAA, 0xFF00FF003F00FF,
-    0x3FFF00FF00FF003F, 0x40DF00FF00FF00FF, 0xDC00FF00CF00DC,
-    0x8002000000000000, 0x1FFF0000, 0x321080000008C400, 0xFFFF0000000043C0,
-    0x10, 0x3FFFFFF0000, 0xFFFF000000000000, 0x3FDA15627FFFFFFF,
-    0x8501AAAAAAAAA, 0x20BFFFFFFFFF, 0x2AAAAAAAAAAA, 0x3AAAAAAA,
-    0xAAABAAA800000000, 0x95FFAAAAAAAAAAAA, 0x2A082AAAABA50AA,
-    0x700000000000000, 0xFFFF003FF7FFFFFF, 0xF8007F, 0x7FFFFFE,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 3, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9,
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFF0000000000, 0xFFFF, 0xFFFFFFFFF000000, 0x7FFFFFFFFFFFF,
-    0xFFFFFFFF, 0xFFFFFFFF00000000, 0xFFFFFFC000000, 0xFFFFDFC000,
-    0xEBC000000FFFFFFC, 0xFFFFFC000000FFEF, 0xFFFFFFC000000F, 0xFFFFFFC0000,
-    0xFC000000FFFFFFC0, 0xFFFFC000000FFFFF, 0xFFFFFFC000000FF, 0xFFFFFFC00000,
-    0x3FFFFFFC00, 0xF0000003F7FFFFFC, 0xFFC000000FDFFFFF, 0xFFFF0000003F7FFF,
-    0xFFFFFC000000FDFF, 0xBF7, 0xFFFFFFFC00000000, 0xF,
-  ],
-};
-
-pub const MATH: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x7000080000000000, 0x5000000040000000, 0x2100000000000, 0x80000000800000,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x73000000270000, 0, 0, 0, 0, 0, 0, 0, 0,
-    0x1C0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4,
-    5, 6, 7, 8, 9, 9, 9, 9, 10, 11, 12, 13, 0, 0, 0, 0, 0, 0, 14, 15, 16, 17,
-    0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 18, 19, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 22, 23, 0, 24,
-  ],
-  tree2_level2: &[
-    0, 0x1C000000400000, 0x7C00001E00040011, 0x7C00, 0xF8621FFF0000,
-    0xF1FBB3103F2FFC84, 0xBFF, 0xF0C37EFFFFFF0000, 0xFFF000302FFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0x300000F00, 0x1000000000000000, 0xBFFFFFF8000000,
-    0x7F0010000, 0xF0FFC00300000000, 0xFF001F94000F8CC3, 0x60, 0xE00F00000005,
-    0xFFFF000000000000, 0x1F9F, 0x20000000000, 0x17E00000000,
-    0x5000000070000800, 0x50000000, 0x1E0400000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 1, 1, 1, 1, 7, 1, 1, 1, 1, 8, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 10, 11, 12, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFDFFFFF, 0xEBFFDE64DFFFFFFF,
-    0xFFFFFFFFFFFFFFEF, 0x7BFFFFFFDFDFE7BF, 0xFFFFFFFFFFFDFC5F,
-    0xFFFFFF3FFFFFFFFF, 0xFFFFFFFFFFFFCFFF, 0xAF7FE96FFFFFFEF,
-    0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF, 0x3000000000000,
-  ],
-};
-
-pub const NONCHARACTER_CODE_POINT: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFF0000, 0xC000000000000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 1,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 1,
-  ],
-  tree3_level3: &[
-    0, 0xC000000000000000,
-  ],
-};
-
-pub const OTHER_ALPHABETIC: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x20, 0, 0, 0, 0, 0, 0, 0, 0,
-    0xBFFF000000000000, 0xB6, 0x7FF0000, 0x10000FEFFF800, 0, 0x219E1FC00000,
-    0xFFFF000000020000, 0, 0x1FFC000000000, 0,
-  ],
-  tree2_level1: &[
-    0, 1, 1, 2, 3, 4, 5, 6, 5, 7, 5, 8, 5, 9, 10, 11, 12, 13, 5, 13, 12, 14,
-    15, 16, 17, 18, 19, 18, 1, 20, 21, 1, 22, 23, 24, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 26, 26, 27, 28, 1, 1,
-    29, 1, 30, 1, 1, 1, 31, 32, 1, 1, 33, 34, 35, 36, 37, 1, 1, 38, 1, 1, 1,
-    39, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 27, 40, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 41, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    42, 43, 1, 1, 1, 1, 1, 44, 1, 45, 46, 47, 48, 49, 1, 50, 51, 52, 53, 1, 1,
-    1, 54, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 55, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  ],
-  tree2_level2: &[
-    0x1EEFF8C00000, 0, 0xFFFF03F8FFF00000, 0xCC0000000000000F, 0xC00E0DFFF,
-    0xC00000000000000E, 0xC0080199F, 0x23000000021987, 0x1C00000C00001BBF,
-    0xC00C0199F, 0xC000000000000004, 0x801DC7, 0xC00000000000000F,
-    0xC00601DDF, 0xC00801DDF, 0xC, 0xC0000FF5F8000, 0x7F2000000000000, 0x2000,
-    0x1BF2000000000000, 0xFFFE000000000000, 0x1FFFFFFFFEFFE003,
-    0x797FF80000000000, 0x1E0185C3C00000, 0x3000007C, 0x80000000,
-    0xC0000000C0000, 0xFFC0000000000000, 0x1FF, 0x20000000060,
-    0x1FF0FFF00000000, 0xF800000, 0x1FFFFE7FE00000, 0xFFE000000000001F, 0xF,
-    0x33FE00000007, 0x3FF8000000000, 0x3FFFF000000000, 0xC000000000000,
-    0x1FFF8000000000, 0x3FFFFFFFFFF, 0xFFFFFFFF00000000, 0xFF0000000000000,
-    0xC0000000, 0xF800000000, 0xFFF0000000000003, 0x2F, 0x7C000000000,
-    0x7FF80, 0xFFF000000000000F, 0x7FFE0000000000, 0x3008, 0x419D000000000000,
-    0x20F80000000000, 0x7F800000000, 0x40000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 4, 2, 2, 5, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 0, 7, 8, 9, 0, 10, 0,
-    0, 11, 12, 13, 0, 0, 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, 22, 0, 23, 0,
-    0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 25, 26, 27, 0, 0, 0, 0, 0, 28, 0, 29, 0,
-    30, 31, 32, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 16, 39, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x7C0000000000000, 0xF06E, 0xF000000000, 0xFF00000000000007, 0x3F,
-    0x1FF000000000004, 0x7FF8000000007, 0x60, 0xFFF8000000000007,
-    0x409FF00000000000, 0x1FF80000000, 0xC00000000000000F, 0xC0080199F,
-    0xFFE0000000000000, 0x3B, 0xFFFF000000000000, 0x3, 0x7F3F800000000000,
-    0x30000000, 0x7FFF000000000000, 0x1, 0x3FF80000000000, 0x7FFE0000000,
-    0x1FFF00000000000, 0x7BE00000000007FE, 0xFFE0000, 0xFFFC00,
-    0x7F7F800000000000, 0x7FFEFFFFFC0000, 0xB47E000000000000, 0x8B, 0x7B7C00,
-    0x78000000000000, 0x7F000000000000, 0x7FFFFFFFFFFE0000, 0x40000000,
-    0x7DBF9FFFF7F, 0x80, 0xFFFF03FFFFFF03FF, 0x3FF,
-  ],
-};
-
-pub const OTHER_DEFAULT_IGNORABLE_CODE_POINT: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x8000, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 6,
-  ],
-  tree2_level2: &[
-    0, 0x180000000, 0x30000000000000, 0x2000000000, 0x1000000000, 0x100000000,
-    0x1FF000000000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 2, 0, 0, 0, 3, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFD, 0xFFFFFFFFFFFFFFFF, 0xFFFF000000000000,
-  ],
-};
-
-pub const OTHER_GRAPHEME_EXTEND: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 1, 2, 1, 2, 0, 0, 0, 3, 1, 2, 0, 4, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0,
-  ],
-  tree2_level2: &[
-    0, 0x4000000000000000, 0x800000, 0x600004, 0x80008000, 0x1000,
-    0xC00000000000, 0xC0000000,
-  ],
-  tree3_level1: &[
-    0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 1, 2, 0, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x4000000000000000, 0x800000, 0x2001000000000000, 0x800000000000,
-    0x7C02000000000, 0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF,
-  ],
-};
-
-pub const OTHER_ID_CONTINUE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x80000000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x3FE0000000000, 0x4000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const OTHER_ID_START: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x60, 0x400001000000, 0x18000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const OTHER_LOWERCASE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x400040000000000, 0, 0, 0, 0, 0, 0, 0, 0x1FF000000000000,
-    0x1F00000003, 0, 0x400000000000020, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 0,
-    0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFF00000000000, 0x10007FFFFFFFFFF, 0xFFFFFFFFF8000000,
-    0x8002000000000000, 0x1FFF0000, 0xFFFF000000000000, 0x3FFFFFF0000,
-    0x3000000000000000, 0x30000000, 0x1000000000000, 0x300000000000000,
-    0xF0000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const OTHER_MATH: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x40000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x33000000270000, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4,
-    5, 6, 7, 8, 0, 0, 0, 0, 9, 0, 10, 11, 0, 0, 0, 0, 0, 0, 12, 13, 14, 15, 0,
-    0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 20, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1C000000400000, 0x6000001E00000001, 0x6000, 0xF8621FFF0000,
-    0xF1FBB3103E2FFC84, 0x3E0, 0xF0C33EB6F3E00000, 0x302FEB3FFF, 0xF00,
-    0xB0000000000000, 0x400010000, 0xF07FC00300000000, 0x1F94000F8CC1, 0x60,
-    0x600F00000005, 0xFFC000000060, 0x1FFFFF8, 0x300000000F000000,
-    0x10A00000000, 0x5000000000000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 1, 1, 1, 1, 7, 8, 9, 10, 11, 12, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 15, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFDFFFFF, 0xEBFFDE64DFFFFFFF,
-    0xFFFFFFFFFFFFFFEF, 0x7BFFFFFFDFDFE7BF, 0xFFFFFFFFFFFDFC5F,
-    0xFFFFFF3FFFFFFFFF, 0xF7FFFFFFF7FFFFFD, 0xFFDFFFFFFFDFFFFF,
-    0xFFFF7FFFFFFF7FFF, 0xFFFFFDFFFFFFFDFF, 0xFFFFFFFFFFFFCFF7,
-    0xAF7FE96FFFFFFEF, 0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF,
-  ],
-};
-
-pub const OTHER_UPPERCASE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFF00000000, 0xFFC0000000000000, 0xFFFF,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFF000000000000, 0xFFFF03FFFFFF03FF, 0x3FF,
-  ],
-};
-
-pub const PATTERN_SYNTAX: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0xFC00FFFE00000000, 0x7800000178000001, 0x88435AFE00000000,
-    0x80000000800000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0,
-    0, 0, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    6, 7, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
-    0, 0, 4, 4, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x7FFF00FFFFFF0000, 0x7FEFFFFE, 0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFF, 0x3FFFFFFFFFFFFF, 0xFFFFFFFFFFF00000, 0x10001FFFFFF0E,
-    0xC000000000000000, 0x60,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const PATTERN_WHITE_SPACE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x100003E00, 0, 0x20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x3000000C000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const PREPENDED_CONCATENATION_MARK: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0x3F, 0, 0, 0x20000000, 0x8000, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x400000000,
-  ],
-  tree3_level1: &[
-    0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x2000000000000000, 0x2000,
-  ],
-};
-
-pub const QUOTATION_MARK: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x8400000000, 0, 0x800080000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 6, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x6000000FF000000, 0x4, 0xE000F000, 0x1E, 0x84, 0xC00000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const RADICAL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 1, 2, 3, 3, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFFFBFFFFFF, 0xFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0x3FFFFF,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const REGIONAL_INDICATOR: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-  ],
-  tree2_level2: &[
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFC000000000,
-  ],
-};
-
-pub const SENTENCE_TERMINAL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x8000400200000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0x200, 0, 0xC0000000, 0, 0, 0x100000, 0x7, 0, 0,
-    0x200000000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 5, 1, 1, 6, 1, 1, 1, 7, 1, 1, 1, 1, 8, 1, 1, 1, 1, 9,
-    1, 1, 10, 1, 1, 11, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 15, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 17, 1, 1, 1, 1, 18, 1, 1, 19, 1, 1, 1, 1, 1, 20, 1, 18, 21,
-    1, 1, 22, 1, 23, 1, 24, 1, 1, 1, 25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 26, 1, 1, 27, 28, 1, 1,
-  ],
-  tree2_level2: &[
-    0x6280000000000000, 0, 0x3000000000, 0xC00, 0x18400000000, 0x400000000000,
-    0x60000000000000, 0x208, 0x30, 0xF0000000000, 0xCC000000,
-    0x1800000000000000, 0xC000000000000000, 0x3000000000000000, 0x380,
-    0x1000400000000000, 0x4, 0x8000000000000000, 0xC000, 0x88000000000000,
-    0xC0000000000000, 0x800000000000, 0x300, 0xE0000000, 0x3000000000000,
-    0x80000000000, 0xC40000, 0x80004002, 0x200000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 4, 2, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 3, 4, 5, 0, 6, 0, 7, 8, 0, 9,
-    0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 11, 0, 12, 0, 0, 13, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 14, 15, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 18, 16, 19, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xC00000, 0x3E00000, 0x180, 0xC000000000000000, 0x3, 0xE, 0xC0002060,
-    0x1B00000000000000, 0x20000000000, 0x1800, 0xFFFE0C, 0x6,
-    0x7000000000000000, 0xC, 0x18000000, 0x180000000000000, 0xC00000000000,
-    0x20000000000000, 0x10, 0x1000000, 0x80000000, 0x100,
-  ],
-};
-
-pub const SOFT_DOTTED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x60000000000, 0, 0, 0x800000000000, 0, 0, 0, 0, 0x10000000200,
-    0x4000020000000, 0, 0, 0, 0, 0x8000000000000, 0, 0x1400000, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 3, 0, 0, 4, 0, 0, 0, 0, 0, 5, 0, 0,
-    0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x400000000, 0x11000400000, 0x200000000000, 0x800, 0x2000000000000,
-    0x300, 0x1000000000000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xC00000000, 0xC00000, 0xC000000000000C00, 0xC000000000000,
-    0xC000000000, 0xC000000, 0xC000, 0xC000000000000C, 0xC0000000000,
-    0xC0000000, 0xC0000,
-  ],
-};
-
-pub const TERMINAL_PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x8C00500200000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0x4000000000000000, 0x80, 0, 0, 0, 0, 0, 0, 0, 0x200, 0x8, 0xC8001000, 0,
-    0, 0x100000, 0x17FF, 0, 0, 0x300000000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    4, 2, 2, 5, 2, 2, 2, 2, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 7, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 8, 2, 9, 10, 2, 2, 11, 12, 2, 2, 2, 2, 13, 2, 2, 2,
-    2, 14, 2, 2, 15, 2, 2, 16, 17, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    18, 19, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 20, 21, 2, 2, 2, 2, 2, 2, 22, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 17, 2, 2, 2, 2, 23, 2, 2, 24, 2, 2, 2, 2, 2, 25,
-    2, 26, 27, 2, 2, 19, 2, 28, 2, 29, 2, 2, 2, 30, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 31, 2, 2, 32,
-    33, 2, 2,
-  ],
-  tree2_level2: &[
-    0x7FFF000000000000, 0x40000000, 0, 0x3000000000, 0xC000000, 0x7E100,
-    0xC00, 0x1FE00000000, 0x600000000000, 0x380000000000, 0x60000000000000,
-    0x4700000, 0x33C, 0x30, 0xF0000000000, 0xEC000000, 0xF800000000000000,
-    0xC000000000000000, 0x3000000000000000, 0x380, 0x1000400000000000, 0x5002,
-    0x6, 0xE000, 0xF8000000000000, 0xC0000000000000, 0xC000, 0x800000000000,
-    0xE0000000, 0x3000080000000, 0x80000000000, 0xF70000, 0x8C005002,
-    0x1200000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 3, 3, 4, 3, 3, 3, 3, 5, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0, 0, 4, 0, 5, 6, 0, 7, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 9, 10, 11, 0, 12, 0, 13, 14,
-    0, 15, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 17, 0, 18, 0, 0, 19, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 25, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x80000000, 0x10000, 0x800000, 0xC00000, 0x3F000000000000,
-    0xFC00000000000000, 0x1E000000, 0x3E00000, 0x3F80, 0xC000000000000000,
-    0x3, 0xE, 0xC0002060, 0x1F00000000000000, 0x20000000000, 0x8003800,
-    0xFFFE3C, 0x6, 0x7000000000000000, 0xC, 0x618000000, 0x200000000000E,
-    0x180000000000000, 0x1F000000000000, 0xC00000000000, 0x20000000000000,
-    0x380000000000000, 0x10, 0x1800000, 0x780,
-  ],
-};
-
-pub const UNIFIED_IDEOGRAPH: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0x3FFFFFFFFFFFFF, 0xFFFFFFFFFFFF, 0x39A801AC000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 2, 3, 4, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 4,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0x7FFFFF, 0x1FFFFFFFFFFFFF, 0xFFFFFFFF3FFFFFFF,
-    0xFFFF0003FFFFFFFF, 0x1FFFFFFFF,
-  ],
-};
-
-pub const UPPERCASE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE, 0, 0x7F7FFFFF, 0xAA55555555555555, 0x2B555555555554AA,
-    0x11AED2D5B1DBCED6, 0x55D255554AAAA490, 0x6C05555555555555, 0x557A, 0, 0,
-    0, 0x8045000000000000, 0xFFBFFFED740, 0xE6905555551C8000, 0xFFFFFFFFFFFF,
-    0x5555555500000000, 0x5555555555555401, 0x5555555555552AAB,
-    0xFFFE555555555555, 0x7FFFFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 5, 5, 6, 5, 7, 8, 9, 10, 0, 0, 0,
-    0, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 15, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17,
-    5, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 20, 0, 21, 22, 23, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFF00000000, 0x20BF, 0x3FFFFFFFFFFFFF, 0xE7FFFFFFFFFF0000,
-    0x5555555555555555, 0x5555555540155555, 0xFF00FF003F00FF00,
-    0xFF00AA003F00, 0xF00000000000000, 0xF001F000F000F00, 0xC00F3D503E273884,
-    0xFFFF00000020, 0x8, 0xFFC0000000000000, 0xFFFF, 0x7FFFFFFFFFFF,
-    0xC025EA9D00000000, 0x4280555555555, 0x155555555555, 0x5555555,
-    0x5554555400000000, 0x6A00555555555555, 0x15F7D5555452855,
-    0x7FFFFFE00000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 3, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9,
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 24, 25, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFF, 0x7FFFFFFFFFFFF,
-    0xFFFFFFFF00000000, 0xFFFFFFFF, 0xFFF0000003FFFFFF, 0xFFFFFF0000003FFF,
-    0x3FDE64D0000003, 0x3FFFFFF0000, 0x7B0000001FDFE7B0, 0xFFFFF0000001FC5F,
-    0x3FFFFFF0000003F, 0x3FFFFFF00000, 0xF0000003FFFFFF00, 0xFFFF0000003FFFFF,
-    0xFFFFFF00000003FF, 0x7FFFFFC00000001, 0x1FFFFFF0000000, 0x7FFFFFC00000,
-    0x1FFFFFF0000, 0x400, 0x3FFFFFFFF, 0xFFFF03FFFFFF03FF, 0x3FF,
-  ],
-};
-
-pub const VARIATION_SELECTOR: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x3800, 0xFFFF,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF,
-  ],
-};
-
-pub const WHITE_SPACE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x100003E00, 0, 0x100000020, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1, 0x8300000007FF, 0x80000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const XID_CONTINUE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x3FF000000000000, 0x7FFFFFE87FFFFFE, 0x4A0040000000000,
-    0xFF7FFFFFFF7FFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0x501F0003FFC3,
-    0xFFFFFFFFFFFFFFFF, 0xB8DFFFFFFFFFFFFF, 0xFFFFFFFBFFFFD7C0,
-    0xFFBFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFCFB, 0xFFFFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFFF,
-    0xFFFFFFFF027FFFFF, 0xBFFFFFFFFFFE01FF, 0x787FFFFFF00B6,
-    0xFFFFFFFF07FF0000, 0xFFFFC3FFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0x9FFFFDFF9FEFFFFF, 0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFFE7FF,
-    0x3FFFFFFFFFFFF, 0x243FFFFFFFFFFFFF,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 4, 32, 33, 34, 4, 4, 4, 4, 4,
-    35, 36, 37, 38, 39, 40, 41, 42, 4, 4, 4, 4, 4, 4, 4, 4, 43, 44, 45, 46,
-    47, 4, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 4, 61, 4, 62,
-    63, 64, 65, 66, 4, 4, 4, 67, 4, 4, 4, 4, 68, 69, 70, 71, 72, 73, 74, 75,
-    76, 77, 78, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 79, 80, 4, 81, 82, 83, 84, 85, 60, 60, 60,
-    60, 60, 60, 60, 60, 86, 42, 87, 88, 89, 4, 90, 91, 60, 60, 60, 60, 60, 60,
-    60, 60, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 52, 60, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 92, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 93, 94, 4, 4, 4, 4, 95, 96, 4, 97, 98, 4, 99, 100, 101, 62,
-    4, 102, 103, 104, 4, 105, 106, 107, 4, 108, 109, 110, 4, 111, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 112, 113, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60, 4, 4, 4, 4, 4, 103, 4, 114, 115, 116, 97, 117, 4, 118,
-    4, 4, 119, 120, 121, 122, 123, 124, 4, 125, 126, 127, 128, 129,
-  ],
-  tree2_level2: &[
-    0x3FFFFFFFFFFF, 0x7FF0FFFFFFF, 0x3FDFFFFF00000000, 0xFFFFFFFBFFF80000,
-    0xFFFFFFFFFFFFFFFF, 0xFFFEFFCFFFFFFFFF, 0xF3C5FDFFFFF99FEF,
-    0x5003FFCFB080799F, 0xD36DFDFFFFF987EE, 0x3FFFC05E023987,
-    0xF3EDFDFFFFFBBFEE, 0xFE00FFCF00013BBF, 0xF3EDFDFFFFF99FEE,
-    0x2FFCFB0C0399F, 0xC3FFC718D63DC7EC, 0xFFC000813DC7, 0xE3FFFDFFFFFDDFFF,
-    0xFFCF07603DDF, 0xF3EFFDFFFFFDDFEF, 0x6FFCF40603DDF, 0xFFFFFFFFFFFDDFEF,
-    0xFC00FFCF80F07DDF, 0x2FFBFFFFFC7FFFEC, 0xCFFC0FF5F847F,
-    0x7FFFFFFFFFFFFFE, 0x3FF7FFF, 0x3BFFECAEFEF02596, 0xF3FF3F5F,
-    0xC2A003FF03000001, 0xFFFE1FFFFFFFFEFF, 0x1FFFFFFFFEFFFFDF, 0x40,
-    0xFFFFFFFFFFFF03FF, 0xFFFFFFFF3FFFFFFF, 0xF7FFFFFFFFFF20BF,
-    0xFFFFFFFF3D7F3DFF, 0x7F3DFFFFFFFF3DFF, 0xFFFFFFFFFF7FFF3D,
-    0xFFFFFFFFFF3DFFFF, 0x3FE00E7FFFFFF, 0xFFFFFFFF0000FFFF,
-    0x3F3FFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFE, 0xFFFF9FFFFFFFFFFF,
-    0xFFFFFFFF07FFFFFE, 0x1FFC7FFFFFFFFFF, 0x1FFFFF001FDFFF, 0xDDFFF000FFFFF,
-    0x3FF308FFFFF, 0xFFFFFFFF03FF3800, 0x1FFFFFFFFFFFFFF, 0xFFFF07FFFFFFFFFF,
-    0x3FFFFFFFFFFFFF, 0xFFF0FFF7FFFFFFF, 0x1F3FFFFFFFFFC0, 0xFFFF0FFFFFFFFFFF,
-    0x7FF03FF, 0xFFFFFFFF0FFFFFFF, 0x9FFFFFFF7FFFFFFF, 0x3FFF008003FF03FF, 0,
-    0xFF80003FF0FFF, 0xFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFF, 0x3FFFFFFFFFFFE3FF,
-    0xE7FFFFFFFFFF01FF, 0x3FFFFFFFFF70000, 0xFBFFFFFFFFFFFFFF,
-    0xFFFFFFFF3F3FFFFF, 0x3FFFFFFFAAFF3F3F, 0x5FDFFFFFFFFFFFFF,
-    0x1FDC1FFF0FCF1FDC, 0x8000000000000000, 0x8002000000100001, 0x1FFF0000,
-    0x1FFE21FFF0000, 0xF3FFFD503F2FFC84, 0xFFFFFFFF000043E0, 0x1FF,
-    0xFFFF7FFFFFFFFFFF, 0xFFFFFFFF7FFFFFFF, 0xFF81FFFFFFFFF,
-    0xFFFF20BFFFFFFFFF, 0x800080FFFFFFFFFF, 0x7F7F7F7F007FFFFF,
-    0xFFFFFFFF7F7F7F7F, 0x1F3EFFFE000000E0, 0xFFFFFFFEE67FFFFF,
-    0xF7FFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFE0, 0x7FFFFFF00007FFF,
-    0xFFFF000000000000, 0xFFFFFFFFFFFF, 0x1FFF, 0x3FFFFFFFFFFF0000,
-    0xFFFFFFF1FFF, 0xBFF0FFFFFFFFFFFF, 0x3FFFFFFFFFFFF, 0xFFFFFFFCFF800000,
-    0x3FFFFFFFFFFF9FF, 0xFF80000000000000, 0xFFFFFFFFFF, 0xE8FFFFFF03FF003F,
-    0xFFFF3FFFFFFFFFFF, 0x1FFFFFFF000FFFFF, 0x7FFFFFFF03FF8001,
-    0x7FFFFFFFFFFFFF, 0xFC7FFFFF03FF3FFF, 0x7CFFFF38000007,
-    0xFFFF7F7F007E7E7E, 0xFFFF003FF7FFFFFF, 0x3FF37FFFFFFFFFF,
-    0xFFFF000FFFFFFFFF, 0xFFFFFFFFFFFF87F, 0x3FFFFFF, 0x5F7FFDFFE0F8007F,
-    0xFFFFFFFFFFFFFFDB, 0xFFFFFFFFFFF80000, 0xFFFFFFF03FFFFFFF,
-    0x3FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFCFFFF,
-    0x3FF0000000000FF, 0x18FFFF0000FFFF, 0xAA8A00000000E000,
-    0x1FFFFFFFFFFFFFFF, 0x87FFFFFE03FF0000, 0xFFFFFFC007FFFFFE,
-    0x7FFFFFFFFFFFFFFF, 0x1CFCFCFC,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 5, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 12, 13, 14, 7, 15, 16, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 17, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 5, 4, 6, 4, 4, 7, 8, 9, 10, 11, 12, 2, 2, 13, 14, 15, 16,
-    4, 4, 2, 2, 2, 2, 17, 18, 4, 4, 19, 20, 21, 22, 23, 4, 24, 4, 25, 26, 27,
-    28, 29, 30, 31, 4, 2, 32, 33, 33, 34, 4, 4, 4, 4, 4, 4, 4, 35, 36, 4, 4,
-    2, 37, 3, 38, 39, 40, 2, 41, 42, 4, 43, 44, 45, 46, 4, 4, 2, 47, 2, 48, 4,
-    4, 49, 50, 2, 51, 52, 53, 54, 4, 4, 4, 3, 4, 55, 56, 4, 4, 4, 4, 57, 58,
-    59, 60, 4, 4, 4, 4, 61, 62, 63, 4, 64, 65, 66, 4, 4, 4, 4, 67, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 68, 4, 2, 69, 2, 2, 2, 70, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 69, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 71, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2,
-    60, 72, 4, 73, 17, 74, 75, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 4, 4, 2, 76,
-    77, 78, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 79,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 33, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 21, 80, 2, 2, 2, 2, 2, 81, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 2, 82, 83, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 84, 85, 4, 4, 86, 4, 4, 4, 4, 4, 4, 2, 87, 88, 89, 90, 91, 2,
-    2, 2, 2, 92, 93, 94, 95, 96, 97, 4, 4, 4, 4, 4, 4, 4, 4, 98, 99, 100, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 101, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 2, 2, 2, 102, 2, 103, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 104, 105, 106, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 107, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 5, 2, 2, 2, 11, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 108, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 109, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 110, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 111, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4,
-  ],
-  tree3_level3: &[
-    0xB7FFFF7FFFFFEFFF, 0x3FFF3FFF, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFF, 0,
-    0x1FFFFFFFFFFFFF, 0x2000000000000000, 0xFFFFFFFF1FFFFFFF, 0x10001FFFF,
-    0xFFFFE000FFFFFFFF, 0x7FFFFFFFFFF07FF, 0xFFFFFFFF3FFFFFFF, 0x3EFF0F,
-    0xFFFF03FF3FFFFFFF, 0xFFFFFFFFF0FFFFF, 0xFFFF00FFFFFFFFFF, 0xFFFFFFFFF,
-    0x7FFFFFFFFFFFFF, 0xFF003FFFFF, 0x91BFFFFFFFFFFD3F, 0x7FFFFF003FFFFF,
-    0x7FFFFFFF, 0x37FFFF00000000, 0x3FFFFFF003FFFFF, 0xC0FFFFFFFFFFFFFF,
-    0x873FFFFFFEEFF06F, 0x1FFFFFFF00000000, 0x1FFFFFFF, 0x7FFFFFFEFF,
-    0x3FFFFFFFFFFFFF, 0x7FFFF003FFFFF, 0x3FFFF, 0x1FF, 0x7FFFFFFFFFFFF,
-    0x3FF00FFFFFFFFFF, 0xFFFF00801FFFFFFF, 0x1FFFF, 0x8000FFC00000007F,
-    0x3FF01FFFFFF0000, 0xFFDFFFFFFFFFFFFF, 0x4FFFFFFFFF0070, 0x17FF1E1F,
-    0x40FFFFFFFFFBFFFF, 0xFFFF01FFBFFFBD7F, 0x3FF07FFFFFFFFFF,
-    0xFBEDFDFFFFF99FEF, 0x1F1FCFE081399F, 0x43FF07FF, 0x3FF00BF,
-    0xFF3FFFFFFFFFFFFF, 0x3F000001, 0x3FF0011, 0xFFFFFFFFFFFFFF, 0x3FF,
-    0x3FF0FFFE7FFFFFF, 0xFFFFFFFF00000000, 0x800003FFFFFFFFFF,
-    0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0080, 0x23FFFFCF, 0x1FFFFFFFFFFFFFF,
-    0xFF7FFFFFFFFFFDFF, 0xFFFC000003FF0001, 0x7FFEFFFFFCFFFF,
-    0xB47FFFFFFFFFFB7F, 0xFFFFFDBF03FF00FF, 0x3FF01FB7FFF, 0x7FFFFF00000000,
-    0x3FFFFFF, 0x7FFFFFFFFFFF, 0xF, 0x7F, 0x3FF7FFFFFFF, 0x1F3FFFFFFF0000,
-    0xE0FFFFF803FF000F, 0xFFFF, 0x7FFFFFFFFFFF001F, 0xFFFF8000, 0x300000000,
-    0x3FFFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFFFFFFFFFFFF,
-    0x1FFF07FFFFFFFFFF, 0x63FF01FF, 0xF807E3E000000000, 0x3C0000000FE7, 0x1C,
-    0xFFFFFFFFFFDFFFFF, 0xEBFFDE64DFFFFFFF, 0xFFFFFFFFFFFFFFEF,
-    0x7BFFFFFFDFDFE7BF, 0xFFFFFFFFFFFDFC5F, 0xFFFFFF3FFFFFFFFF,
-    0xF7FFFFFFF7FFFFFD, 0xFFDFFFFFFFDFFFFF, 0xFFFF7FFFFFFF7FFF,
-    0xFFFFFDFFFFFFFDFF, 0xFFFFFFFFFFFFCFF7, 0xF87FFFFFFFFFFFFF,
-    0x201FFFFFFFFFFF, 0xFFFEF8000010, 0x7DBF9FFFF7F, 0x7F001F, 0x3FF07FF,
-    0xAF7FE96FFFFFFEF, 0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF, 0x7FFFFF,
-    0xFFFF0003FFFFFFFF, 0x1FFFFFFFF, 0x3FFFFFFF, 0xFFFFFFFFFFFF,
-  ],
-};
-
-pub const XID_START: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE07FFFFFE, 0x420040000000000, 0xFF7FFFFFFF7FFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0x501F0003FFC3, 0, 0xB8DF000000000000,
-    0xFFFFFFFBFFFFD740, 0xFFBFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFC03, 0xFFFFFFFFFFFFFFFF,
-    0xFFFEFFFFFFFFFFFF, 0xFFFFFFFF027FFFFF, 0x1FF, 0x787FFFFFF0000,
-    0xFFFFFFFF00000000, 0xFFFEC000000007FF, 0xFFFFFFFFFFFFFFFF,
-    0x9C00C060002FFFFF, 0xFFFFFFFD0000, 0xFFFFFFFFFFFFE000, 0x2003FFFFFFFFF,
-    0x43007FFFFFFFC00,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 23, 25, 26, 27, 28, 29, 3, 30, 31, 32, 33, 34, 34, 34, 34,
-    34, 35, 36, 37, 38, 39, 40, 41, 42, 34, 34, 34, 34, 34, 34, 34, 34, 43,
-    44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 3, 61,
-    62, 63, 64, 65, 66, 67, 68, 34, 34, 34, 3, 34, 34, 34, 34, 69, 70, 71, 72,
-    3, 73, 74, 3, 75, 76, 77, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    78, 79, 34, 80, 81, 82, 83, 84, 3, 3, 3, 3, 3, 3, 3, 3, 85, 42, 86, 87,
-    88, 34, 89, 90, 3, 3, 3, 3, 3, 3, 3, 3, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 53, 3, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 91, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 92, 93, 34, 34, 34, 34, 94, 95, 96,
-    91, 97, 34, 98, 99, 100, 48, 101, 102, 103, 104, 105, 106, 107, 108, 109,
-    110, 111, 112, 34, 113, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    114, 115, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 34, 34, 34, 34, 34, 116, 34, 117, 118,
-    119, 120, 121, 34, 122, 34, 34, 123, 124, 125, 126, 3, 127, 34, 128, 129,
-    130, 131, 132,
-  ],
-  tree2_level2: &[
-    0x110043FFFFF, 0x7FF01FFFFFF, 0x3FDFFFFF00000000, 0, 0x23FFFFFFFFFFFFF0,
-    0xFFFE0003FF010000, 0x23C5FDFFFFF99FE1, 0x10030003B0004000,
-    0x36DFDFFFFF987E0, 0x1C00005E000000, 0x23EDFDFFFFFBBFE0,
-    0x200000300010000, 0x23EDFDFFFFF99FE0, 0x20003B0000000, 0x3FFC718D63DC7E8,
-    0x10000, 0x23FFFDFFFFFDDFE0, 0x307000000, 0x23EFFDFFFFFDDFE1,
-    0x6000340000000, 0x27FFFFFFFFFDDFE0, 0xFC00000380704000,
-    0x2FFBFFFFFC7FFFE0, 0x7F, 0x5FFFFFFFFFFFE, 0x2005ECAEFEF02596, 0xF000005F,
-    0x1, 0x1FFFFFFFFEFF, 0x1F00, 0x800007FFFFFFFFFF, 0xFFE1C0623C3F0000,
-    0xFFFFFFFF00004003, 0xF7FFFFFFFFFF20BF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFF3D7F3DFF, 0x7F3DFFFFFFFF3DFF, 0xFFFFFFFFFF7FFF3D,
-    0xFFFFFFFFFF3DFFFF, 0x7FFFFFF, 0xFFFFFFFF0000FFFF, 0x3F3FFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFE, 0xFFFF9FFFFFFFFFFF, 0xFFFFFFFF07FFFFFE,
-    0x1FFC7FFFFFFFFFF, 0x3FFFF0003DFFF, 0x1DFFF0003FFFF, 0xFFFFFFFFFFFFF,
-    0x10800000, 0xFFFFFFFF00000000, 0x1FFFFFFFFFFFFFF, 0xFFFF05FFFFFFFFFF,
-    0x3FFFFFFFFFFFFF, 0x7FFFFFFF, 0x1F3FFFFFFF0000, 0xFFFF0FFFFFFFFFFF, 0x3FF,
-    0xFFFFFFFF007FFFFF, 0x1FFFFF, 0x8000000000, 0xFFFFFFFFFFFE0, 0xFE0,
-    0xFC00C001FFFFFFF8, 0x3FFFFFFFFF, 0xFFFFFFFFF, 0x3FFFFFFFFC00E000,
-    0xE7FFFFFFFFFF01FF, 0x63DE0000000000, 0xFFFFFFFF3F3FFFFF,
-    0x3FFFFFFFAAFF3F3F, 0x5FDFFFFFFFFFFFFF, 0x1FDC1FFF0FCF1FDC,
-    0x8002000000000000, 0x1FFF0000, 0xF3FFFD503F2FFC84, 0xFFFFFFFF000043E0,
-    0x1FF, 0xFFFF7FFFFFFFFFFF, 0xFFFFFFFF7FFFFFFF, 0xC781FFFFFFFFF,
-    0xFFFF20BFFFFFFFFF, 0x80FFFFFFFFFF, 0x7F7F7F7F007FFFFF, 0x7F7F7F7F,
-    0x1F3E03FE000000E0, 0xFFFFFFFEE07FFFFF, 0xF7FFFFFFFFFFFFFF,
-    0xFFFEFFFFFFFFFFE0, 0x7FFFFFF00007FFF, 0xFFFF000000000000, 0xFFFFFFFFFFFF,
-    0x1FFF, 0x3FFFFFFFFFFF0000, 0xC00FFFF1FFF, 0x80007FFFFFFFFFFF,
-    0xFFFFFFFF3FFFFFFF, 0xFFFFFFFCFF800000, 0x3FFFFFFFFFFF9FF,
-    0xFF80000000000000, 0x7FFFFF7BB, 0xFFFFFFFFFFFFC, 0x68FC000000000000,
-    0xFFFF003FFFFFFC00, 0x1FFFFFFF0000007F, 0x7FFFFFFFFFFF0,
-    0x7C00FFDF00008000, 0x1FFFFFFFFFF, 0xC47FFFFF00000FF7, 0x3E62FFFFFFFFFFFF,
-    0x1C07FF38000005, 0xFFFF7F7F007E7E7E, 0xFFFF003FF7FFFFFF, 0x7FFFFFFFF,
-    0xFFFF000FFFFFFFFF, 0xFFFFFFFFFFFF87F, 0xFFFF3FFFFFFFFFFF, 0x3FFFFFF,
-    0x5F7FFDFFA0F8007F, 0xFFFFFFFFFFFFFFDB, 0x3FFFFFFFFFFFF,
-    0xFFFFFFFFFFF80000, 0xFFFFFFF03FFFFFFF, 0x3FFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFCFFFF, 0x3FF0000000000FF,
-    0xAA8A000000000000, 0x1FFFFFFFFFFFFFFF, 0x7FFFFFE00000000,
-    0xFFFFFFC007FFFFFE, 0x7FFFFFFF3FFFFFFF, 0x1CFCFCFC,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 5, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 12, 13, 14, 7, 15, 16, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 5, 4, 4, 4, 4, 6, 7, 8, 9, 10, 11, 2, 2, 12, 13, 14, 15, 4,
-    4, 2, 2, 2, 2, 16, 17, 4, 4, 18, 19, 20, 21, 22, 4, 23, 4, 24, 25, 26, 27,
-    28, 29, 30, 4, 2, 31, 32, 32, 15, 4, 4, 4, 4, 4, 4, 4, 33, 34, 4, 4, 35,
-    4, 36, 37, 38, 39, 40, 41, 42, 4, 43, 20, 44, 45, 4, 4, 5, 46, 47, 48, 4,
-    4, 49, 50, 47, 51, 52, 4, 53, 4, 4, 4, 54, 4, 55, 56, 4, 4, 4, 4, 57, 58,
-    59, 60, 4, 4, 4, 4, 61, 62, 63, 4, 64, 65, 66, 4, 4, 4, 4, 67, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 68, 4, 2, 49, 2, 2, 2, 69, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 49, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 70, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2,
-    60, 20, 4, 71, 47, 72, 63, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 4, 4, 2, 73,
-    74, 75, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 76,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 32, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 20, 77, 2, 2, 2, 2, 2, 78, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 2, 79, 80, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 81, 82, 83, 84, 85, 2, 2,
-    2, 2, 86, 87, 88, 89, 90, 91, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2,
-    2, 2, 92, 2, 69, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 93,
-    94, 95, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 96, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 5, 2, 2, 2, 10, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 97, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    98, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 99, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4,
-  ],
-  tree3_level3: &[
-    0xB7FFFF7FFFFFEFFF, 0x3FFF3FFF, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFF, 0,
-    0x1FFFFFFFFFFFFF, 0xFFFFFFFF1FFFFFFF, 0x1FFFF, 0xFFFFE000FFFFFFFF,
-    0x3FFFFFFFFF07FF, 0xFFFFFFFF3FFFFFFF, 0x3EFF0F, 0xFFFF00003FFFFFFF,
-    0xFFFFFFFFF0FFFFF, 0xFFFF00FFFFFFFFFF, 0xFFFFFFFFF, 0x7FFFFFFFFFFFFF,
-    0xFF003FFFFF, 0x91BFFFFFFFFFFD3F, 0x7FFFFF003FFFFF, 0x7FFFFFFF,
-    0x37FFFF00000000, 0x3FFFFFF003FFFFF, 0xC0FFFFFFFFFFFFFF, 0x3FFFFFFEEF0001,
-    0x1FFFFFFF00000000, 0x1FFFFFFF, 0x1FFFFFFEFF, 0x3FFFFFFFFFFFFF,
-    0x7FFFF003FFFFF, 0x3FFFF, 0x1FF, 0x7FFFFFFFFFFFF, 0xFFFF00801FFFFFFF,
-    0x3F, 0xFFFFFFFFFFFFF8, 0xFFFFFFFFFFF8, 0x1FFFFFF0000, 0x7FFFFFFFF8,
-    0x47FFFFFFFF0010, 0x7FFFFFFFFFFF8, 0x1400001E, 0xFFFFFFBFFFF,
-    0xFFFF01FFBFFFBD7F, 0x23EDFDFFFFF99FE0, 0x3E0010000, 0x780,
-    0xFFFFFFFFFFFF, 0xB0, 0x7FFFFFFFFFFF, 0xF000000, 0x10, 0x7FFFFFFFFFF,
-    0x7FFFFFF, 0xFFFFFFFFFFF, 0xFFFFFFFF00000000, 0x80000000FFFFFFFF,
-    0x407FFFFFFFFF801, 0xFFFFFFFFF0010000, 0x200003CF, 0x1FFFFFFFFFFFFFF,
-    0x7FFFFFFFFDFF, 0xFFFC000000000001, 0xFFFF, 0x1FFFFFFFFFB7F,
-    0xFFFFFDBF00000040, 0x10003FF, 0x7FFFF00000000, 0x3FFFFFF, 0xF, 0x7F,
-    0x3FFFFFFF0000, 0xE0FFFFF80000000F, 0x1001F, 0xFFF80000, 0x300000000,
-    0x3FFFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFFFFFFFFFFFF,
-    0x1FFF07FFFFFFFFFF, 0x3FF01FF, 0xFFFFFFFFFFDFFFFF, 0xEBFFDE64DFFFFFFF,
-    0xFFFFFFFFFFFFFFEF, 0x7BFFFFFFDFDFE7BF, 0xFFFFFFFFFFFDFC5F,
-    0xFFFFFF3FFFFFFFFF, 0xF7FFFFFFF7FFFFFD, 0xFFDFFFFFFFDFFFFF,
-    0xFFFF7FFFFFFF7FFF, 0xFFFFFDFFFFFFFDFF, 0xFF7, 0x1F, 0xAF7FE96FFFFFFEF,
-    0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF, 0x7FFFFF, 0xFFFF0003FFFFFFFF,
-    0x1FFFFFFFF, 0x3FFFFFFF,
-  ],
-};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/unicode/category.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/unicode/category.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/unicode/category.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/unicode/category.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3549 +0,0 @@
-// DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
-//
-//  ucd-generate.exe general-category --trie-set ./target/ucd/
-//
-// ucd-generate is available on crates.io.
-
-pub const BY_NAME: &'static [(&'static str, &'static ::ucd_trie::TrieSet)] = &[
-  ("Cased_Letter", CASED_LETTER), ("Close_Punctuation", CLOSE_PUNCTUATION),
-  ("Connector_Punctuation", CONNECTOR_PUNCTUATION), ("Control", CONTROL),
-  ("Currency_Symbol", CURRENCY_SYMBOL),
-  ("Dash_Punctuation", DASH_PUNCTUATION), ("Decimal_Number", DECIMAL_NUMBER),
-  ("Enclosing_Mark", ENCLOSING_MARK),
-  ("Final_Punctuation", FINAL_PUNCTUATION), ("Format", FORMAT),
-  ("Initial_Punctuation", INITIAL_PUNCTUATION), ("Letter", LETTER),
-  ("Letter_Number", LETTER_NUMBER), ("Line_Separator", LINE_SEPARATOR),
-  ("Lowercase_Letter", LOWERCASE_LETTER), ("Mark", MARK),
-  ("Math_Symbol", MATH_SYMBOL), ("Modifier_Letter", MODIFIER_LETTER),
-  ("Modifier_Symbol", MODIFIER_SYMBOL), ("Nonspacing_Mark", NONSPACING_MARK),
-  ("Number", NUMBER), ("Open_Punctuation", OPEN_PUNCTUATION),
-  ("Other", OTHER), ("Other_Letter", OTHER_LETTER),
-  ("Other_Number", OTHER_NUMBER), ("Other_Punctuation", OTHER_PUNCTUATION),
-  ("Other_Symbol", OTHER_SYMBOL),
-  ("Paragraph_Separator", PARAGRAPH_SEPARATOR), ("Private_Use", PRIVATE_USE),
-  ("Punctuation", PUNCTUATION), ("Separator", SEPARATOR),
-  ("Space_Separator", SPACE_SEPARATOR), ("Spacing_Mark", SPACING_MARK),
-  ("Surrogate", SURROGATE), ("Symbol", SYMBOL),
-  ("Titlecase_Letter", TITLECASE_LETTER), ("Unassigned", UNASSIGNED),
-  ("Uppercase_Letter", UPPERCASE_LETTER),
-];
-
-pub const CASED_LETTER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE07FFFFFE, 0x20000000000000, 0xFF7FFFFFFF7FFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xF7FFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFF0, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFEFFFFF, 0, 0, 0xB8CF000000000000, 0xFFFFFFFBFFFFD740,
-    0xFFBFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFC03, 0xFFFFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFFF,
-    0xFFFFFFFF007FFFFF, 0x1FF, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 4, 0, 5, 6, 7, 0, 8, 8, 8, 8, 9, 10, 11, 12, 0, 0, 0,
-    0, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17, 8,
-    18, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 0, 22, 23, 24, 25, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 30, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFF00000000, 0xE7FFFFFFFFFF20BF, 0x3F3FFFFFFFFFFFFF,
-    0xE7FFFFFFFFFF01FF, 0xFFFFFFFFFFF, 0xFEFFF80000000000, 0x7FFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFF3F3FFFFF, 0x3FFFFFFFAAFF3F3F,
-    0x5FDFFFFFFFFFFFFF, 0x1FDC1FFF0FCF1FDC, 0xF21FBD503E2FFC84, 0x43E0, 0x18,
-    0xFFFF7FFFFFFFFFFF, 0xCFFFFFFF7FFFFFFF, 0xC781FFFFFFFFF, 0x20BFFFFFFFFF,
-    0x3FFFFFFFFFFF, 0xFFFFFFF, 0xFFFFFFFC00000000, 0xFFFEFFFFFFFFFFFF,
-    0x3FFFFFFFFFF78FF, 0x400000000000000, 0xFFFF000000000000,
-    0xFFFF003F07FFFFFF, 0xF8007F, 0x7FFFFFE00000000, 0x7FFFFFE,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 8, 9,
-    10, 11, 12, 1, 1, 1, 1, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0xFFFF, 0xFFFF000000000000, 0xFFFFFFFFF0FFFFF,
-    0x7FFFFFFFFFFFF, 0xFFFFFFFF00000000, 0xFFFFFFFF, 0xFFFFFFFFFFDFFFFF,
-    0xEBFFDE64DFFFFFFF, 0xFFFFFFFFFFFFFFEF, 0x7BFFFFFFDFDFE7BF,
-    0xFFFFFFFFFFFDFC5F, 0xFFFFFF3FFFFFFFFF, 0xF7FFFFFFF7FFFFFD,
-    0xFFDFFFFFFFDFFFFF, 0xFFFF7FFFFFFF7FFF, 0xFFFFFDFFFFFFFDFF, 0xFF7, 0xF,
-  ],
-};
-
-pub const CLOSE_PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x20000000000, 0x2000000020000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    6, 0, 7, 0, 0, 0, 0, 0, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 13, 14, 0, 0, 15, 16, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x2800000000000000, 0x10000000, 0x4000000000000040, 0x4000,
-    0x40000000A00, 0x2AAA0000000000, 0xAA8000000040, 0x1555550,
-    0x200000000A000000, 0x2A800000000, 0xCAA2AA00, 0x4000000000000000,
-    0x5540000001000000, 0x54000115, 0x2000000000000200, 0x920000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const CONNECTOR_PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x80000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 0, 0, 1, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x8000000000000000, 0x100001, 0x18000000000000, 0xE000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const CONTROL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0xFFFFFFFF, 0x8000000000000000, 0xFFFFFFFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-  ],
-  tree2_level2: &[
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const CURRENCY_SYMBOL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x1000000000, 0, 0x3C00000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0x8000, 0, 0x800, 0, 0, 0, 0, 0, 0, 0xC000000000000000,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 4,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 9, 0, 0, 10, 0, 0, 11,
-  ],
-  tree2_level2: &[
-    0, 0x80C000000000000, 0x2000000000000, 0x200000000000000,
-    0x8000000000000000, 0x8000000, 0xFFFFFFFF00000000, 0x100000000000000,
-    0x1000000000000000, 0x20000000000, 0x10, 0x6300000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x1000000000000,
-  ],
-};
-
-pub const DASH_PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x200000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0x4000000000000400, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 4, 1, 0, 0, 0, 0, 0, 0, 5, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 9, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1, 0x40, 0x3F0000, 0xC00000004800000, 0x1000010000000, 0x100000000,
-    0x6000000000000, 0x801000000, 0x2000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const DECIMAL_NUMBER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x3FF000000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0x3FF00000000, 0, 0x3FF000000000000, 0, 0, 0, 0x3FF,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
-    2, 0, 2, 3, 0, 0, 0, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 0, 0, 0, 0, 5, 0, 2, 0, 0, 6,
-    0, 0, 2, 7, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 0, 0, 8, 0, 2,
-    0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFC000000000, 0x3FF0000, 0x3FF00000000, 0x3FF, 0xFFC0, 0x3FF03FF,
-    0x3FF000000000000, 0x3FF000003FF0000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 4, 0, 0, 5, 0, 0, 0,
-    2, 0, 0, 0, 0, 0, 5, 0, 5, 0, 0, 0, 0, 0, 5, 0, 6, 2, 0, 0, 0, 0, 0, 0, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 5, 1, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x3FF00000000, 0x3FF000000000000, 0xFFC000000000, 0xFFC0000000000000,
-    0x3FF0000, 0x3FF, 0xFFFFFFFFFFFFC000,
-  ],
-};
-
-pub const ENCLOSING_MARK: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x300, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x4000000000000000, 0x1DE0000000, 0x7000000000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const FINAL_PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x800000000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x400000022000000, 0x220002428,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const FORMAT: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x200000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0x1000003F, 0, 0, 0x20000000, 0x8000, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 6,
-  ],
-  tree2_level2: &[
-    0, 0x400000000, 0x4000, 0x7C000000F800, 0xFFDF00000000,
-    0x8000000000000000, 0xE00000000000000,
-  ],
-  tree3_level1: &[
-    0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x2000000000000000, 0x2000, 0xF00000000, 0x7F8000000000000,
-    0xFFFFFFFF00000002, 0xFFFFFFFFFFFFFFFF,
-  ],
-};
-
-pub const INITIAL_PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x80000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x200000099000000, 0x110001214,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const LETTER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE07FFFFFE, 0x420040000000000, 0xFF7FFFFFFF7FFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0x501F0003FFC3, 0, 0xBCDF000000000000,
-    0xFFFFFFFBFFFFD740, 0xFFBFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFC03, 0xFFFFFFFFFFFFFFFF,
-    0xFFFEFFFFFFFFFFFF, 0xFFFFFFFF027FFFFF, 0x1FF, 0x787FFFFFF0000,
-    0xFFFFFFFF00000000, 0xFFFEC000000007FF, 0xFFFFFFFFFFFFFFFF,
-    0x9C00C060002FFFFF, 0xFFFFFFFD0000, 0xFFFFFFFFFFFFE000, 0x2003FFFFFFFFF,
-    0x43007FFFFFFFC00,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 23, 25, 26, 27, 28, 29, 3, 30, 31, 32, 33, 34, 34, 34, 34,
-    34, 35, 36, 37, 38, 39, 40, 41, 42, 34, 34, 34, 34, 34, 34, 34, 34, 43,
-    44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 3, 61,
-    62, 63, 64, 65, 66, 67, 68, 34, 34, 34, 3, 34, 34, 34, 34, 69, 70, 71, 72,
-    3, 73, 74, 3, 75, 76, 77, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    78, 79, 34, 80, 81, 82, 83, 84, 85, 3, 3, 3, 3, 3, 3, 3, 86, 42, 87, 88,
-    89, 34, 90, 91, 3, 3, 3, 3, 3, 3, 3, 3, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 53, 3, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 92, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 93, 94, 34, 34, 34, 34, 95, 96, 97,
-    64, 98, 34, 99, 100, 101, 48, 102, 103, 104, 105, 106, 107, 108, 109, 110,
-    111, 112, 113, 34, 114, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    115, 116, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 34, 34, 34, 34, 34, 117, 34, 118, 119,
-    120, 121, 122, 34, 34, 34, 34, 123, 124, 125, 126, 3, 127, 34, 128, 129,
-    130, 131, 132,
-  ],
-  tree2_level2: &[
-    0x110043FFFFF, 0x7FF01FFFFFF, 0x3FDFFFFF00000000, 0, 0x23FFFFFFFFFFFFF0,
-    0xFFFE0003FF010000, 0x23C5FDFFFFF99FE1, 0x10030003B0004000,
-    0x36DFDFFFFF987E0, 0x1C00005E000000, 0x23EDFDFFFFFBBFE0,
-    0x200000300010000, 0x23EDFDFFFFF99FE0, 0x20003B0000000, 0x3FFC718D63DC7E8,
-    0x10000, 0x23FFFDFFFFFDDFE0, 0x307000000, 0x23EFFDFFFFFDDFE1,
-    0x6000340000000, 0x27FFFFFFFFFDDFE0, 0xFC00000380704000,
-    0x2FFBFFFFFC7FFFE0, 0x7F, 0xDFFFFFFFFFFFE, 0x200DECAEFEF02596, 0xF000005F,
-    0x1, 0x1FFFFFFFFEFF, 0x1F00, 0x800007FFFFFFFFFF, 0xFFE1C0623C3F0000,
-    0xFFFFFFFF00004003, 0xF7FFFFFFFFFF20BF, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFFFFF3D7F3DFF, 0x7F3DFFFFFFFF3DFF, 0xFFFFFFFFFF7FFF3D,
-    0xFFFFFFFFFF3DFFFF, 0x7FFFFFF, 0xFFFFFFFF0000FFFF, 0x3F3FFFFFFFFFFFFF,
-    0xFFFFFFFFFFFFFFFE, 0xFFFF9FFFFFFFFFFF, 0xFFFFFFFF07FFFFFE,
-    0x1FE07FFFFFFFFFF, 0x3FFFF0003DFFF, 0x1DFFF0003FFFF, 0xFFFFFFFFFFFFF,
-    0x10800000, 0xFFFFFFFF00000000, 0x1FFFFFFFFFFFFFF, 0xFFFF05FFFFFFFF9F,
-    0x3FFFFFFFFFFFFF, 0x7FFFFFFF, 0x1F3FFFFFFF0000, 0xFFFF0FFFFFFFFFFF, 0x3FF,
-    0xFFFFFFFF007FFFFF, 0x1FFFFF, 0x8000000000, 0xFFFFFFFFFFFE0, 0xFE0,
-    0xFC00C001FFFFFFF8, 0x3FFFFFFFFF, 0xFFFFFFFFF, 0x3FFFFFFFFC00E000,
-    0xE7FFFFFFFFFF01FF, 0x63DE0000000000, 0xFFFFFFFF3F3FFFFF,
-    0x3FFFFFFFAAFF3F3F, 0x5FDFFFFFFFFFFFFF, 0x1FDC1FFF0FCF1FDC,
-    0x8002000000000000, 0x1FFF0000, 0xF3FFBD503E2FFC84, 0x43E0, 0x18,
-    0xFFFF7FFFFFFFFFFF, 0xFFFFFFFF7FFFFFFF, 0xC781FFFFFFFFF,
-    0xFFFF20BFFFFFFFFF, 0x80FFFFFFFFFF, 0x7F7F7F7F007FFFFF, 0x7F7F7F7F,
-    0x800000000000, 0x183E000000000060, 0xFFFFFFFEE07FFFFF,
-    0xF7FFFFFFFFFFFFFF, 0xFFFEFFFFFFFFFFE0, 0x7FFFFFF00007FFF,
-    0xFFFF000000000000, 0xFFFFFFFFFFFF, 0x1FFF, 0x3FFFFFFFFFFF0000,
-    0xC00FFFF1FFF, 0x80007FFFFFFFFFFF, 0xFFFFFFFF3FFFFFFF, 0xFFFFFFFCFF800000,
-    0x3FFFFFFFFFFF9FF, 0xFF80000000000000, 0x7FFFFF7BB, 0xFFFFFFFFFFFFC,
-    0x68FC000000000000, 0xFFFF003FFFFFFC00, 0x1FFFFFFF0000007F,
-    0x7FFFFFFFFFFF0, 0x7C00FFDF00008000, 0x1FFFFFFFFFF, 0xC47FFFFF00000FF7,
-    0x3E62FFFFFFFFFFFF, 0x1C07FF38000005, 0xFFFF7F7F007E7E7E,
-    0xFFFF003FF7FFFFFF, 0x7FFFFFFFF, 0xFFFF000FFFFFFFFF, 0xFFFFFFFFFFFF87F,
-    0xFFFF3FFFFFFFFFFF, 0x3FFFFFF, 0x5F7FFDFFA0F8007F, 0xFFFFFFFFFFFFFFDB,
-    0x3FFFFFFFFFFFF, 0xFFFFFFFFFFF80000, 0x3FFFFFFFFFFFFFFF,
-    0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFCFFFF, 0xFFF0000000000FF,
-    0xFFDF000000000000, 0x1FFFFFFFFFFFFFFF, 0x7FFFFFE00000000,
-    0xFFFFFFC007FFFFFE, 0x7FFFFFFFFFFFFFFF, 0x1CFCFCFC,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 5, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 12, 13, 14, 7, 15, 16, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 9, 10, 2, 2, 11, 12, 13, 14, 4,
-    4, 2, 2, 2, 2, 15, 16, 4, 4, 17, 18, 19, 20, 21, 4, 22, 4, 23, 24, 25, 26,
-    27, 28, 29, 4, 2, 30, 31, 31, 14, 4, 4, 4, 4, 4, 4, 4, 32, 33, 4, 4, 34,
-    4, 35, 36, 37, 38, 39, 40, 41, 4, 42, 19, 43, 44, 4, 4, 45, 46, 47, 48, 4,
-    4, 49, 50, 47, 51, 52, 4, 53, 4, 4, 4, 54, 4, 55, 56, 4, 4, 4, 4, 57, 58,
-    59, 60, 4, 4, 4, 4, 61, 62, 63, 4, 64, 65, 66, 4, 4, 4, 4, 67, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 68, 4, 4, 4, 2, 2, 2, 69, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 49, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 70, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2,
-    60, 19, 4, 71, 47, 72, 63, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 4, 4, 2, 73,
-    74, 75, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 76,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 31, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 19, 77, 2, 2, 2, 2, 2, 78, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 2, 79, 80, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 81, 82, 83, 84, 85, 2, 2,
-    2, 2, 86, 87, 88, 89, 90, 91, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2,
-    2, 2, 92, 2, 69, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 93,
-    94, 95, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 96, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 45, 2, 2, 2, 9, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 97, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    98, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 99, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4,
-  ],
-  tree3_level3: &[
-    0xB7FFFF7FFFFFEFFF, 0x3FFF3FFF, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFF, 0,
-    0xFFFFFFFF1FFFFFFF, 0x1FFFF, 0xFFFFE000FFFFFFFF, 0x3FFFFFFFFF03FD,
-    0xFFFFFFFF3FFFFFFF, 0xFF0F, 0xFFFF00003FFFFFFF, 0xFFFFFFFFF0FFFFF,
-    0xFFFF00FFFFFFFFFF, 0xFFFFFFFFF, 0x7FFFFFFFFFFFFF, 0xFF003FFFFF,
-    0x91BFFFFFFFFFFD3F, 0x7FFFFF003FFFFF, 0x7FFFFFFF, 0x37FFFF00000000,
-    0x3FFFFFF003FFFFF, 0xC0FFFFFFFFFFFFFF, 0x3FFFFFFEEF0001,
-    0x1FFFFFFF00000000, 0x1FFFFFFF, 0x1FFFFFFEFF, 0x3FFFFFFFFFFFFF,
-    0x7FFFF003FFFFF, 0x3FFFF, 0x1FF, 0x7FFFFFFFFFFFF, 0xFFFF00801FFFFFFF,
-    0x3F, 0xFFFFFFFFFFFFF8, 0xFFFFFFFFFFF8, 0x1FFFFFF0000, 0x7FFFFFFFF8,
-    0x47FFFFFFFF0010, 0x7FFFFFFFFFFF8, 0x1400001E, 0xFFFFFFBFFFF,
-    0xFFFF01FFBFFFBD7F, 0x23EDFDFFFFF99FE0, 0x3E0010000, 0x1FFFFFFFFFFFFF,
-    0x780, 0xFFFFFFFFFFFF, 0xB0, 0x7FFFFFFFFFFF, 0xF000000, 0x10,
-    0x7FFFFFFFFFF, 0x7FFFFFF, 0xFFFFFFFFFFF, 0xFFFFFFFF00000000,
-    0x80000000FFFFFFFF, 0x407FFFFFFFFF801, 0xFFFFFFFFF0010000, 0x200003CF,
-    0x1FFFFFFFFFFFFFF, 0x7FFFFFFFFDFF, 0xFFFC000000000001, 0xFFFF,
-    0x1FFFFFFFFFB7F, 0xFFFFFDBF00000040, 0x10003FF, 0x7FFFF00000000,
-    0x3FFFFFF, 0xF, 0x7F, 0x3FFFFFFF0000, 0xE0FFFFF80000000F, 0x1001F,
-    0xFFF80000, 0x300000000, 0x3FFFFFFFFFFFF, 0xFFFF000000000000,
-    0xFFFFFFFFFFFFFFF, 0x1FFF07FFFFFFFFFF, 0x3FF01FF, 0xFFFFFFFFFFDFFFFF,
-    0xEBFFDE64DFFFFFFF, 0xFFFFFFFFFFFFFFEF, 0x7BFFFFFFDFDFE7BF,
-    0xFFFFFFFFFFFDFC5F, 0xFFFFFF3FFFFFFFFF, 0xF7FFFFFFF7FFFFFD,
-    0xFFDFFFFFFFDFFFFF, 0xFFFF7FFFFFFF7FFF, 0xFFFFFDFFFFFFFDFF, 0xFF7, 0x1F,
-    0xAF7FE96FFFFFFEF, 0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF, 0x7FFFFF,
-    0xFFFF0003FFFFFFFF, 0x1FFFFFFFF, 0x3FFFFFFF,
-  ],
-};
-
-pub const LETTER_NUMBER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1C00000000000, 0xFFFFFFFF00000000, 0x1E7, 0x70003FE00000080,
-    0xFFC000000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x1FFFFFFFFFFFFF, 0x402, 0x3E0000, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFF,
-  ],
-};
-
-pub const LINE_SEPARATOR: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x10000000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const LOWERCASE_LETTER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE00000000, 0x20000000000000, 0xFF7FFFFF80000000,
-    0x55AAAAAAAAAAAAAA, 0xD4AAAAAAAAAAAB55, 0xE6512D2A4E243129,
-    0xAA29AAAAB5555240, 0x93FAAAAAAAAAAAAA, 0xFFFFFFFFFFFFAA85,
-    0xFFFFFFEFFFFF, 0, 0, 0x388A000000000000, 0xFFFFF00000010000,
-    0x192FAAAAAAE37FFF, 0xFFFF000000000000, 0xAAAAAAAAFFFFFFFF,
-    0xAAAAAAAAAAAAA802, 0xAAAAAAAAAAAAD554, 0xAAAAAAAAAAAA,
-    0xFFFFFFFF00000000, 0x1FF, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 3, 0, 4, 5, 6, 0, 7, 7, 8, 7, 9, 10, 11, 12, 0, 0, 0,
-    0, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17, 7,
-    18, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 0, 22, 23, 24, 25, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 16, 26, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xE7FFFFFFFFFF0000, 0x3F00000000000000, 0x1FF, 0xFFFFFFFFFFF,
-    0xFEFFF80000000000, 0x7FFFFFF, 0xAAAAAAAAAAAAAAAA, 0xAAAAAAAABFEAAAAA,
-    0xFF00FF003F00FF, 0x3FFF00FF00FF003F, 0x40DF00FF00FF00FF,
-    0xDC00FF00CF00DC, 0x321080000008C400, 0x43C0, 0x10, 0xFFFF000000000000,
-    0xFDA15627FFFFFFF, 0x8501AAAAAAAAA, 0x20BFFFFFFFFF, 0x2AAAAAAAAAAA,
-    0xAAAAAAA, 0xAAABAAA800000000, 0x95FEAAAAAAAAAAAA, 0x2A082AAAABA50AA,
-    0x400000000000000, 0xFFFF003F07FFFFFF, 0xFFFFFFFFFFFFFFFF, 0xF8007F,
-    0x7FFFFFE,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 3, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9,
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFF0000000000, 0xFFFF, 0xFFFFFFFFF000000, 0x7FFFFFFFFFFFF,
-    0xFFFFFFFF, 0xFFFFFFFF00000000, 0xFFFFFFC000000, 0xFFFFDFC000,
-    0xEBC000000FFFFFFC, 0xFFFFFC000000FFEF, 0xFFFFFFC000000F, 0xFFFFFFC0000,
-    0xFC000000FFFFFFC0, 0xFFFFC000000FFFFF, 0xFFFFFFC000000FF, 0xFFFFFFC00000,
-    0x3FFFFFFC00, 0xF0000003F7FFFFFC, 0xFFC000000FDFFFFF, 0xFFFF0000003F7FFF,
-    0xFFFFFC000000FDFF, 0xBF7, 0xFFFFFFFC00000000, 0xF,
-  ],
-};
-
-pub const MARK: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF, 0,
-    0, 0, 0, 0x3F8, 0, 0, 0, 0xBFFFFFFFFFFE0000, 0xB6, 0x7FF0000,
-    0x10000FFFFF800, 0, 0x3D9F9FC00000, 0xFFFF000000020000, 0x7FF,
-    0x1FFC000000000, 0x200FF80000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 6, 8, 6, 9, 6, 10, 11, 12, 13, 14, 6, 14, 15, 16,
-    17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 30, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 31, 32, 33, 34, 35,
-    2, 36, 2, 37, 2, 2, 2, 38, 39, 40, 2, 41, 42, 43, 44, 45, 2, 2, 46, 2, 2,
-    2, 47, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 48, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 49, 2, 50, 2, 51, 2, 2, 2, 2, 2, 2, 2,
-    2, 52, 2, 53, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    54, 55, 56, 2, 2, 2, 2, 57, 2, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 2,
-    2, 2, 68, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 69, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 70, 2, 2, 2, 2, 2, 2, 2,
-  ],
-  tree2_level2: &[
-    0x3EEFFBC00000, 0xE000000, 0, 0xFFFFFFFBFFF80000, 0xDC0000000000000F,
-    0xC00FEFFFF, 0xD00000000000000E, 0x4000000C0080399F, 0x23000000023987,
-    0xFC00000C00003BBF, 0xC00C0399F, 0xC000000000000004, 0x803DC7,
-    0xC00000000000001F, 0xC00603DDF, 0xD80000000000000F, 0xC00803DDF, 0xC,
-    0xC0000FF5F8400, 0x7F2000000000000, 0x7F80, 0x1BF2000000000000, 0x3F00,
-    0xC2A0000003000000, 0xFFFE000000000000, 0x1FFFFFFFFEFFE0DF, 0x40,
-    0x7FFFF80000000000, 0x1E3F9DC3C00000, 0x3C00BFFC, 0xE0000000,
-    0x1C0000001C0000, 0xC0000000C0000, 0xFFF0000000000000, 0x200FFFFF, 0x3800,
-    0x20000000060, 0xFFF0FFF00000000, 0xF800000, 0x9FFFFFFF7FE00000,
-    0x7FFF000000000000, 0xFFF000000000001F, 0xFF8000000001F, 0x3FFE00000007,
-    0xFFFC000000000, 0xFFFFF000000000, 0x39C21FFFFF70000, 0xFBFFFFFFFFFFFFFF,
-    0x1FFFFFFFF0000, 0x3800000000000, 0x8000000000000000, 0xFFFFFFFF00000000,
-    0xFC0000000000, 0x6000000, 0x3FF7800000000000, 0xC0000000,
-    0x3000000000000, 0xF800000844, 0xFFF0000000000003, 0x8003FFFF0000003F,
-    0x3FC000000000, 0xFFF80, 0xFFF800000000000F, 0x2000000001,
-    0x7FFE0000000000, 0x3800000000003008, 0xC19D000000000000,
-    0x60F80000000002, 0x37F800000000, 0x40000000, 0xFFFF0000FFFF,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 4, 2, 5, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 0, 0, 0, 0, 0, 0,
-    0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 8, 9, 10, 0, 11, 12, 13, 14, 15,
-    0, 0, 16, 17, 18, 0, 0, 19, 20, 21, 22, 0, 0, 23, 24, 21, 25, 26, 0, 27,
-    0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 32, 0, 33, 0,
-    34, 35, 36, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 39, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, 0, 45, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 52, 52,
-    53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x2000000000000000, 0x100000000, 0x7C0000000000000, 0x870000000000F06E,
-    0x6000000000, 0xF000000000, 0x1FFC0, 0xFF00000000000007,
-    0x800000000000007F, 0x7FF000000000007, 0x1FFF8000000007, 0x8000000000060,
-    0xFFF8000000000007, 0x1E01, 0x40FFF00000000000, 0x7FF80000000,
-    0xD80000000000000F, 0x1F1FCC0080399F, 0xFFE0000000000000, 0x4000007F,
-    0xFFFF000000000000, 0xF, 0xFF3F800000000000, 0x30000001, 0x1,
-    0xFFF80000000000, 0xFFFE0000000, 0x7FFF00000000000, 0x7BF80000000007FE,
-    0xFFE0080, 0x3FFFC00, 0xFF7F800000000000, 0x7FFEFFFFFC0000,
-    0xB47E000000000000, 0xBF, 0xFB7C00, 0x78000000000000, 0x1F000000000000,
-    0x7F000000000000, 0x7FFFFFFFFFFE0000, 0x78000, 0x60000000,
-    0xF807E3E000000000, 0x3C0000000FE7, 0x1C, 0xF87FFFFFFFFFFFFF,
-    0x201FFFFFFFFFFF, 0xFFFEF8000010, 0x7DBF9FFFF7F, 0x7F0000, 0x7F0,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF,
-  ],
-};
-
-pub const MATH_SYMBOL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x7000080000000000, 0x5000000000000000, 0x2100000000000, 0x80000000800000,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x40000000000000, 0, 0, 0, 0, 0, 0, 0, 0,
-    0x1C0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0,
-    3, 4, 5, 6, 7, 7, 7, 7, 8, 9, 10, 11, 0, 0, 0, 0, 0, 0, 12, 13, 0, 14, 0,
-    0, 0, 0, 0, 15, 0, 0, 0, 0, 7, 7, 16, 17, 7, 7, 7, 7, 18, 19, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 22, 23, 0, 24,
-  ],
-  tree2_level2: &[
-    0, 0x1C00000000040010, 0x1C00, 0x1000000, 0x81F, 0x40490C1F0000,
-    0xFFF000000014C000, 0xFFFFFFFFFFFFFFFF, 0x300000000, 0x1000000000000000,
-    0xFFFFFF8000000, 0x3F0000000, 0x80000000000000, 0xFF00000000000002,
-    0x800000000000, 0xFFFF003FFFFFFF9F, 0xFFFFFFFFFE000007,
-    0xCFFFFFFFF0FFFFFF, 0xFFFF000000000000, 0x1F9F, 0x20000000000,
-    0x7400000000, 0x70000800, 0x50000000, 0x1E0400000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x800000008000002, 0x20000000200000, 0x800000008000, 0x20000000200,
-    0x8, 0x3000000000000,
-  ],
-};
-
-pub const MODIFIER_LETTER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFFFF000000000000, 0x501F0003FFC3, 0,
-    0x410000000000000, 0, 0, 0, 0, 0, 0, 0, 0x2000000, 0, 0, 0, 0x1, 0,
-    0x6000000000, 0, 0, 0, 0x430000000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    1, 1, 1, 1, 1, 1, 8, 1, 1, 9, 10, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12,
-    13, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14,
-    1, 1, 1, 15, 1, 1, 15, 1, 1, 1, 1, 1, 1, 1, 16, 1, 17, 18, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 19, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 8, 1, 1, 1, 1, 20, 21, 22, 1, 23, 24, 25, 26,
-    1, 1, 1, 1, 1, 1, 1, 27, 1, 24, 1, 28, 1, 29, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 24, 30, 1,
-  ],
-  tree2_level2: &[
-    0x11004000000, 0, 0x2000000000000, 0x40, 0x1000000000000000, 0x800000,
-    0x8, 0x8000000000, 0x3F00000000000000, 0xFFFFF00000000000,
-    0x10007FFFFFFFFFF, 0xFFFFFFFFF8000000, 0x8002000000000000, 0x1FFF0000,
-    0x3000000000000000, 0x800000000000, 0x83E000000000020, 0x60000000,
-    0x7000000000000000, 0x200000, 0x1000, 0x8000000000000000, 0x30000000,
-    0xFF800000, 0x1000000000000, 0x100, 0x300000000000000, 0x4000008000,
-    0x18000020000000, 0xF0000000, 0xC0000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 2, 3,
-  ],
-  tree3_level3: &[
-    0, 0xF, 0xFFF80000, 0x300000000,
-  ],
-};
-
-pub const MODIFIER_SYMBOL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x140000000, 0x110810000000000, 0, 0, 0, 0, 0, 0, 0, 0,
-    0xFFFFAFE0FFFC003C, 0, 0x20000000000000, 0x30, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,
-    8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 10, 0, 11,
-  ],
-  tree2_level2: &[
-    0, 0xA000000000000000, 0x6000E000E000E003, 0x18000000, 0x3007FFFFF, 0x600,
-    0x8000000, 0xFFFC000000000000, 0x3, 0x4000000000000000, 0x1, 0x800000000,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xF800000000000000,
-  ],
-};
-
-pub const NONSPACING_MARK: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF, 0,
-    0, 0, 0, 0xF8, 0, 0, 0, 0xBFFFFFFFFFFE0000, 0xB6, 0x7FF0000,
-    0x10000FFFFF800, 0, 0x3D9F9FC00000, 0xFFFF000000020000, 0x7FF,
-    0x1FFC000000000, 0x200FF80000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 10, 11, 12, 13, 14, 15, 16, 11, 17, 18,
-    19, 2, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 32, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 33, 34, 35, 36,
-    37, 2, 38, 2, 39, 2, 2, 2, 40, 41, 42, 2, 43, 44, 45, 46, 47, 2, 2, 48, 2,
-    2, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 50, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 51, 2, 52, 2, 53, 2, 2, 2, 2, 2, 2,
-    2, 2, 54, 2, 55, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 56, 57, 58, 2, 2, 2, 2, 59, 2, 2, 60, 61, 62, 63, 64, 65, 66, 67, 68,
-    2, 2, 2, 69, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 70, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 71, 2, 2, 2, 2, 2, 2, 2,
-  ],
-  tree2_level2: &[
-    0x3EEFFBC00000, 0xE000000, 0, 0xFFFFFFFBFFF80000, 0x1400000000000007,
-    0xC00FE21FE, 0x1000000000000002, 0x4000000C0000201E, 0x1000000000000006,
-    0x23000000023986, 0xFC00000C000021BE, 0x9000000000000002, 0xC0040201E,
-    0x4, 0x2001, 0xC000000000000011, 0xC00603DC1, 0xC00003040,
-    0x1800000000000003, 0xC0000201E, 0x5C0400, 0x7F2000000000000, 0x7F80,
-    0x1BF2000000000000, 0x3F00, 0x2A0000003000000, 0x7FFE000000000000,
-    0x1FFFFFFFFEFFE0DF, 0x40, 0x66FDE00000000000, 0x1E0001C3000000,
-    0x20002064, 0xE0000000, 0x1C0000001C0000, 0xC0000000C0000,
-    0x3FB0000000000000, 0x200FFE40, 0x3800, 0x20000000060, 0xE04018700000000,
-    0x9800000, 0x9FF81FE57F400000, 0x3FFF000000000000, 0x17D000000000000F,
-    0xFF80000000004, 0x3B3C00000003, 0x3A34000000000, 0xCFF00000000000,
-    0x31021FDFFF70000, 0xFBFFFFFFFFFFFFFF, 0x1FFE21FFF0000, 0x3800000000000,
-    0x8000000000000000, 0xFFFFFFFF00000000, 0x3C0000000000, 0x6000000,
-    0x3FF0800000000000, 0xC0000000, 0x3000000000000, 0x6000000844,
-    0x8003FFFF00000030, 0x3FC000000000, 0x3FF80, 0x13C8000000000007,
-    0x2000000000, 0x667E0000000000, 0x1000000000001008, 0xC19D000000000000,
-    0x40300000000002, 0x212000000000, 0x40000000, 0xFFFF0000FFFF,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 4, 2, 5, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 0, 0, 0, 0, 0, 0,
-    0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 8, 9, 10, 0, 11, 12, 13, 14, 15,
-    0, 0, 16, 17, 18, 0, 0, 19, 20, 21, 22, 0, 0, 23, 24, 25, 26, 27, 0, 28,
-    0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 30, 31, 32, 0, 0, 0, 0, 0, 33, 0, 34, 0,
-    35, 36, 37, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, 0, 45, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 52, 52,
-    53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x2000000000000000, 0x100000000, 0x7C0000000000000, 0x870000000000F06E,
-    0x6000000000, 0xF000000000, 0x1FFC0, 0xFF00000000000002,
-    0x800000000000007F, 0x678000000000003, 0x1FEF8000000007, 0x8000000000000,
-    0x7FC0000000000003, 0x1E00, 0x40D3800000000000, 0x7F880000000,
-    0x1800000000000003, 0x1F1FC000000001, 0xFF00000000000000, 0x4000005C,
-    0x85F8000000000000, 0xD, 0xB03C000000000000, 0x30000001,
-    0xA7F8000000000000, 0x1, 0xBF280000000000, 0xFBCE0000000,
-    0x6FF800000000000, 0x79F80000000007FE, 0xE7E0080, 0x37FFC00,
-    0xBF7F000000000000, 0x6DFCFFFFFC0000, 0xB47E000000000000, 0xBF, 0xA30000,
-    0x18000000000000, 0x1F000000000000, 0x7F000000000000, 0x78000, 0x60000000,
-    0xF800038000000000, 0x3C0000000FE7, 0x1C, 0xF87FFFFFFFFFFFFF,
-    0x201FFFFFFFFFFF, 0xFFFEF8000010, 0x7DBF9FFFF7F, 0x7F0000, 0x7F0,
-    0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF,
-  ],
-};
-
-pub const NUMBER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x3FF000000000000, 0, 0x720C000000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x3FF00000000, 0, 0x3FF000000000000, 0,
-    0, 0, 0x3FF,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 1, 0, 2, 0, 1, 0, 1, 0, 3, 0, 4, 0, 5, 0, 1, 0, 6, 0, 1, 0,
-    7, 0, 7, 8, 0, 0, 0, 0, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 7, 0, 0, 0, 0, 13, 0, 14,
-    0, 0, 15, 0, 0, 7, 16, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 17, 9, 0, 0, 18, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 27,
-    0, 28, 29, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 1, 0, 0, 0, 0,
-    31, 0, 0, 7, 9, 0, 0, 32, 0, 7, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,
-    0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFC000000000, 0x3F0FFC000000000, 0xFCFFC000000000, 0x7FFC000000000,
-    0x7F00FFC000000000, 0x1FFFFC07F000000, 0x3FF0000, 0xFFFFF00000000, 0x3FF,
-    0x1FFFFE0000000000, 0x1C00000000000, 0x3FF03FF00000000, 0xFFC0, 0x7FF0000,
-    0x3FF03FF, 0x3FF000000000000, 0x3F1000000000000, 0xFFFFFFFFFFFF0000,
-    0x3E7, 0xFFFFFFFF00000000, 0xFFFFFFF, 0xFFFFFC0000000000,
-    0xFFC0000000000000, 0xFFFFF, 0x2000000000000000, 0x70003FE00000080,
-    0x3C0000, 0x3FF00000000, 0xFFFEFF00, 0xFFFE0000000003FF, 0x3F000000000000,
-    0x3FF000003FF0000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 3, 3, 4, 3, 3, 3, 3, 3, 3, 5, 6, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 4, 5, 6, 0, 7, 0, 0, 8, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 9, 10, 11, 12, 0, 13, 14, 0, 15, 16, 17, 0, 18,
-    19, 0, 0, 0, 0, 20, 21, 0, 0, 0, 0, 22, 0, 0, 23, 24, 0, 0, 0, 25, 0, 21,
-    26, 0, 0, 27, 0, 0, 0, 21, 0, 0, 0, 0, 0, 28, 0, 28, 0, 0, 0, 0, 0, 28, 0,
-    29, 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32,
-    0, 0, 0, 28, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 33, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, 38, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    41, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFF80, 0x1FFFFFFFFFFFFFF, 0xC00, 0xFFFFFFE00000000,
-    0xF00000000, 0x402, 0x3E0000, 0x3FF00000000, 0xFE000000FF000000,
-    0xFF8000000000, 0xF800000000000000, 0xFC00000, 0x3000000000000000,
-    0xFFFFFFFFFFFCFFFF, 0x60000000000001FF, 0xE0000000, 0xF80000000000,
-    0xFF000000FF000000, 0xFE0000000000, 0xFC00000000000000, 0x3FF000000000000,
-    0x7FFFFFFF00000000, 0x7FE0000000, 0x1E0000, 0xFFFFFFFC0000,
-    0xFFC0000000000000, 0x1FFFFE03FF0000, 0x3FF0000, 0x3FF, 0xFFF000000000000,
-    0x7FFFF00000000, 0x1FFFFFFF0000, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFF,
-    0x3FBFF0000, 0x7FFFFF, 0xFFFFF00000000, 0x1FFFFFF00000000,
-    0xFFFFFFFFFFFFC000, 0xFF80, 0xFFFE000000000000, 0x1EEFFFFFFFFFFF, 0x1FFF,
-  ],
-};
-
-pub const OPEN_PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x10000000000, 0x800000008000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 5, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    7, 0, 8, 0, 0, 0, 0, 0, 0, 9, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 11, 12, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 15, 16, 0, 0, 17, 18, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1400000000000000, 0x8000000, 0x44000000, 0x2000000000000020, 0x2000,
-    0x20000000500, 0x15550000000000, 0x554000000020, 0xAAAAA8,
-    0x1000000005000000, 0x15400000000, 0x4, 0x25515500, 0x8000000000000000,
-    0xAAA0000000800000, 0x2A00008A, 0x800000000000100, 0x488000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const OTHER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0xFFFFFFFF, 0x8000000000000000, 0x2000FFFFFFFF, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0x300000000000000, 0x40000280F, 0, 0, 0, 0, 0, 0x1000000000000,
-    0x1800000, 0x11800, 0xFFE078000000FF00, 0x3000003F, 0, 0, 0x20000000,
-    0xC000, 0x1800, 0xFFFC000000000000, 0x1800000000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-    20, 21, 22, 23, 24, 25, 26, 4, 27, 28, 29, 4, 4, 4, 30, 4, 4, 4, 4, 4, 31,
-    32, 33, 34, 35, 36, 37, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 38, 39, 40, 41, 4,
-    42, 43, 39, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 4, 54, 4, 55, 56, 57,
-    58, 59, 4, 4, 4, 60, 4, 4, 4, 4, 61, 62, 63, 64, 65, 66, 67, 68, 4, 4, 69,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 70, 71, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 72, 73, 74, 75, 76, 4, 77, 78,
-    79, 80, 81, 4, 82, 83, 84, 4, 4, 4, 85, 4, 86, 87, 4, 88, 4, 89, 90, 76,
-    4, 4, 91, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 45, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 92, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 93, 94, 4, 4, 4, 4, 95, 4, 4, 96, 4, 4, 97,
-    98, 99, 96, 4, 100, 4, 101, 4, 102, 103, 104, 4, 105, 106, 107, 4, 108, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 90,
-    109, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-    53, 53, 53, 53, 53, 53, 53, 4, 4, 4, 4, 4, 110, 4, 111, 112, 113, 4, 114,
-    4, 4, 4, 4, 4, 115, 116, 117, 36, 118, 4, 119, 86, 4, 91, 120,
-  ],
-  tree2_level2: &[
-    0x8000C00000000000, 0xFFFFF800B0000000, 0xC0200000FFFFFFFF, 0x40007FFFF,
-    0, 0xC3A020000066010, 0x800000304F7F8660, 0x2C92020000067811,
-    0xFF80003FA1FDC678, 0xC12020000044011, 0x1FC0030FFFEC440,
-    0xC12020000066011, 0xFF0000304F3FC660, 0x3C0038E729C23813,
-    0xF800003FFF7EC238, 0x1C00020000022000, 0xFF0030F89FC220,
-    0xC10020000022000, 0xFFF90030BF9FC220, 0x22010, 0x30000F0220,
-    0xD004000003800013, 0xFFE3003F00A07B80, 0x7800000000000001,
-    0xFFFFFFFFF0000000, 0xC4001351010FDA69, 0xFFFFFFFF0C00C0A0,
-    0x1E00000000100, 0x2000000001000000, 0xFFFFFFFFF8002000, 0xDF40,
-    0xC280C200, 0x80C200000000C200, 0x8000C2, 0xC20000, 0xE000000018000000,
-    0xFC000000, 0xC0C0000000000000, 0xE0000000, 0xFE00000000000000,
-    0xFF800000FFE02000, 0xFFF22000FFF00000, 0xFC00FC00C0000000, 0xFC00C000,
-    0xF80000000000, 0xFFC0000000000000, 0xF000F00080000000,
-    0xFFE0C0000000000E, 0xF00000000000, 0x3800FC00, 0x30000000,
-    0x6000000080000000, 0x8000C000FC00FC00, 0xFFFFFFFFFFFFFFFF,
-    0xE00000000000F000, 0xFF0000000000000, 0x700000000000000, 0x1C00,
-    0x180000000000FE00, 0xFC0000000000FF00, 0x400000000000000, 0xC0C00000,
-    0xC00000005500C0C0, 0x20000000000000, 0x8023000010300020, 0x7C000000F800,
-    0xCFFFF00000000, 0xE0008000, 0xFFFE00000000FFFF, 0xF000,
-    0xFFFFFF8000000000, 0xFFFFF800, 0x30000000000000, 0xC00000,
-    0x8000000000000200, 0x800000000000, 0x80000000, 0x1F0000000000000,
-    0xDF4000000000, 0x7FFE7F0000000000, 0x80808080FF800000, 0x80808080,
-    0xFFFFFFFFFFFF8000, 0x4000000, 0xFFF0000000000000, 0xF000FFFFFFC00000,
-    0x1, 0x1800000, 0x100000000001F, 0xF800000000008000, 0xFFF000000000,
-    0x8000000000000000, 0xFFFF000000000000, 0xE000, 0xFF80,
-    0xFFFFF00000000000, 0xFF00000000000000, 0xFC00000000000000,
-    0x7FFFFFFFFFFFFF, 0xFC00F00000000000, 0xFC003FC0, 0xE00000007FF00000,
-    0x800000003C004000, 0xFF80000000000000, 0xC00C000, 0xFF80000007FFFFF8,
-    0x8080FF818181, 0xFFC000000000, 0xFC00C00000000000, 0xF000000000000780,
-    0xC00000000000, 0xFFFFFFFFFC000000, 0xA08000001F07FF80, 0x24, 0x7FFFC,
-    0xFFFF, 0x30000, 0xC000FFFFFFFFFF00, 0x20F08000080000, 0xE000000000000000,
-    0xCFFF8080E3030303,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 12, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 13, 14, 15, 7, 16, 17, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 2, 5, 6, 7, 7, 8, 9, 10, 11, 12, 13, 2, 2, 14, 15, 16, 17,
-    7, 7, 2, 2, 2, 2, 18, 19, 7, 7, 20, 21, 22, 23, 24, 7, 25, 26, 27, 28, 29,
-    30, 31, 32, 33, 7, 2, 34, 35, 36, 37, 7, 7, 7, 7, 38, 7, 7, 16, 39, 7, 7,
-    2, 40, 41, 42, 43, 44, 2, 45, 46, 7, 47, 48, 49, 50, 7, 7, 2, 51, 2, 52,
-    7, 7, 53, 54, 2, 55, 56, 57, 58, 7, 7, 7, 59, 7, 60, 61, 7, 7, 7, 7, 2,
-    62, 63, 64, 7, 7, 7, 7, 65, 66, 67, 7, 68, 69, 70, 7, 7, 7, 7, 71, 7, 7,
-    7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 39, 7, 2, 72, 2, 2, 2, 73,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 74, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 75, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2,
-    2, 64, 76, 7, 77, 2, 78, 79, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 80, 7, 2,
-    81, 82, 83, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    84, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 35, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 85, 86, 2, 2, 2, 2, 2, 59, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 2, 87, 88, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    2, 2, 2, 89, 90, 91, 2, 92, 2, 93, 7, 94, 2, 95, 7, 7, 2, 96, 97, 98, 99,
-    100, 2, 2, 2, 2, 101, 2, 2, 2, 2, 102, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 103,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 104, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 2, 2, 2, 105, 2, 106, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 107,
-    108, 7, 7, 7, 7, 7, 109, 110, 111, 112, 7, 7, 7, 7, 113, 2, 114, 115, 116,
-    113, 117, 118, 119, 120, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 121, 2, 122, 2, 123, 124, 125, 126, 7, 127, 128, 129, 130, 7, 131, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 132,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 108, 2, 2, 2, 133, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 134, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 135, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 54, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 2, 2, 2, 136, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-  ],
-  tree3_level3: &[
-    0x4800008000001000, 0xFFFFFFFFC000C000, 0, 0xF800000000000000,
-    0x70000000000078, 0xFFFFFFFEF0008000, 0xC00000000000FFFF,
-    0xFFFFFFFFFFFFFFFF, 0xE0000000, 0xF0000000FFFE0000, 0x1FF000000000,
-    0xF80000000000F800, 0x40000000, 0xFFFFFFFFFFC000F0, 0xFC00C0000000,
-    0xF000000000F00000, 0xFF0000000000, 0xFFFF7FF000000000,
-    0xFF80000000000000, 0xFFFFFF00FFC00000, 0x6E400000000002C0, 0x400000,
-    0xFFFF007F80000000, 0x7C80000FFFFFFFF, 0x7C00000070000000,
-    0xF00000000000000, 0x30000, 0x78C0000001100F90, 0xFE00FE00,
-    0xFFFFFFFF00000000, 0xFF80078000000000, 0x1C0000000000000,
-    0xF8000000C00000, 0xFFFF01FFE1FC0000, 0xFFFFFFFFFFFFFE00,
-    0xFFF8000000000000, 0x3F8000000000000, 0xFC00FF0000000000,
-    0x80000000FFFFFFFF, 0xFFFFFFFFFC000000, 0x7FFF00000003C000,
-    0x2000000000000000, 0xFC00FE000000FFFC, 0x20000000000000,
-    0xFF8000000000FF80, 0xFFE000010000C000, 0x8000000000040000,
-    0xFC0040004280, 0xFC00F80000000000, 0x412020000066010, 0xFFE0E0301F7EC660,
-    0xFFFFFFFF94000000, 0xFFFFFFFFFC00FF00, 0xC0000000000000,
-    0xFFFFFFFFC0000000, 0xFFFFE000FC00FFE0, 0xFF00000000000000,
-    0xFFFFFFFFFFFFFC00, 0xF00018000000, 0xF000000000000000, 0xFFFFFFFF,
-    0x7FF8000000000000, 0xFF00, 0xFFFFFFF800000030, 0xFE00000000000000,
-    0x80000000000200, 0xE0000000FFC0, 0xFF80010000030000, 0x4B80000000000480,
-    0x240FC00FF00, 0xFFFFFC00FE048000, 0xFE000000FFFFFFFF, 0xFFE0800000000000,
-    0xFFFFFFFFFFFFFFF0, 0xFFFF800000000000, 0xFFFFFFFFFFFFFF80,
-    0xFFFF3C0080000000, 0xFFC0C0000000FFFF, 0x1F0000040400FFC0,
-    0xFFFFFFFFFFFF0000, 0xFFFFFFFFF8000000, 0x800000000000FFE0,
-    0xFFFFFFFF00007FFF, 0xFFFFFFFCFFFFFFFF, 0xFFFC000000000000,
-    0xFFFFFFFF80000000, 0xFFFFFFFFFFFF, 0xE000F80000000000,
-    0xFFFFFFFF0C00FE00, 0xFFC0000000000000, 0x18000000000, 0x7F8000000000000,
-    0xFFFFFE0000000000, 0xFFFFFFFFFFFFFFC0, 0xFFF00000FFFFFFFF,
-    0xFE000000FF800000, 0x200000, 0x1400219B20000000, 0x10,
-    0x8400000020201840, 0x203A0, 0xC000000000, 0x3000, 0xFFFF000107FFF000,
-    0xFFFFF82406000080, 0xFFFFFFFFFF800060, 0xFFFFFFFF3C00F800,
-    0x1FFFFFFFFFFFF, 0xFFE0000000000000, 0xF508016900000010,
-    0xA10808695569157B, 0xF0000411F0000400, 0xFFFCFFFFFFFFFFFF,
-    0xF00000000000, 0x18000FFF00000, 0xFFC0000000010001, 0xE000,
-    0xFFFFE00000000000, 0x3FFFFFFFFF, 0xF00000000000FFF8, 0xFFFFFFC0FFFCFE00,
-    0xFC00E000FFE00000, 0xFFF0000000000000, 0xFFFFFFFFFE000000, 0xF000,
-    0xFC00FF00, 0xFFFFC0000000FF00, 0x800000000000F000, 0xB86000000000000,
-    0xFC00FFF800000000, 0xFFF8, 0xFFFFC000FFFFFFFF, 0xFFFFFFFFFF800000,
-    0xC0000000, 0xFFFC00000000, 0xFFFFFFFE00000000, 0xFFFF000000000000,
-  ],
-};
-
-pub const OTHER_LETTER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x400040000000000, 0, 0, 0, 0x800000000000000, 0xF, 0, 0, 0x100000,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x787FFFFFF0000, 0xFFFFFFFF00000000,
-    0xFFFEC000000007FE, 0xFFFFFFFFFFFFFFFF, 0x9C00C000002FFFFF,
-    0xFFFFFFFD0000, 0xFFFFFFFFFFFFE000, 0x2003FFFFFFFFF, 0x7FFFFFFFC00,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 3, 31, 32, 33, 3, 34, 34, 34, 34,
-    34, 35, 36, 37, 38, 39, 40, 3, 41, 34, 34, 34, 34, 34, 34, 34, 34, 42, 43,
-    44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 3, 3, 59, 60,
-    61, 62, 63, 64, 3, 65, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 66,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 67, 68,
-    69, 70, 3, 3, 3, 3, 3, 3, 3, 3, 71, 41, 72, 73, 74, 34, 75, 67, 3, 3, 3,
-    3, 3, 3, 3, 3, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 52, 3, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 76, 77, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 78, 79, 34, 34, 34, 34, 80, 81, 49, 62, 3, 3, 82, 83, 84, 47, 85,
-    86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 3, 3, 96, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 97, 98, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 34, 34, 34, 34, 34,
-    99, 34, 100, 101, 102, 103, 104, 34, 34, 34, 34, 105, 106, 107, 108, 3,
-    109, 34, 110, 3, 111, 112, 113,
-  ],
-  tree2_level2: &[
-    0x3FFFFF, 0x7FF01FFFFFF, 0x3FDFFFFF00000000, 0, 0x23FFFFFFFFFFFFF0,
-    0xFFFC0003FF010000, 0x23C5FDFFFFF99FE1, 0x10030003B0004000,
-    0x36DFDFFFFF987E0, 0x1C00005E000000, 0x23EDFDFFFFFBBFE0,
-    0x200000300010000, 0x23EDFDFFFFF99FE0, 0x20003B0000000, 0x3FFC718D63DC7E8,
-    0x10000, 0x23FFFDFFFFFDDFE0, 0x307000000, 0x23EFFDFFFFFDDFE1,
-    0x6000340000000, 0x27FFFFFFFFFDDFE0, 0xFC00000380704000,
-    0x2FFBFFFFFC7FFFE0, 0x7F, 0xDFFFFFFFFFFFE, 0x3F, 0x200DECAEFEF02596,
-    0xF000001F, 0x1, 0x1FFFFFFFFEFF, 0x1F00, 0x800007FFFFFFFFFF,
-    0xFFE1C0623C3F0000, 0x4003, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFF3D7F3DFF,
-    0x7F3DFFFFFFFF3DFF, 0xFFFFFFFFFF7FFF3D, 0xFFFFFFFFFF3DFFFF, 0x7FFFFFF,
-    0xFFFF, 0xFFFFFFFFFFFFFFFE, 0xFFFF9FFFFFFFFFFF, 0xFFFFFFFF07FFFFFE,
-    0x1FE07FFFFFFFFFF, 0x3FFFF0003DFFF, 0x1DFFF0003FFFF, 0xFFFFFFFFFFFFF,
-    0x10000000, 0xFFFFFFFF00000000, 0x1FFFFFFFFFFFFF7, 0xFFFF05FFFFFFFF9F,
-    0x3FFFFFFFFFFFFF, 0x7FFFFFFF, 0x1F3FFFFFFF0000, 0xFFFF0FFFFFFFFFFF, 0x3FF,
-    0xFFFFFFFF007FFFFF, 0x1FFFFF, 0xFFFFFFFFFFFE0, 0xFE0, 0xFC00C001FFFFFFF8,
-    0x3FFFFFFFFF, 0xFFFFFFFFF, 0xFFFFFFFC00E000, 0x63DE0000000000,
-    0x1E0000000000000, 0xFFFF000000000000, 0xFFFFFFFFFF, 0x7F7F7F7F007FFFFF,
-    0x7F7F7F7F, 0x1000000000000040, 0xFFFFFFFE807FFFFF, 0x87FFFFFFFFFFFFFF,
-    0xFFFEFFFFFFFFFFE0, 0x7FFFFFF00007FFF, 0xFFFFFFFFFFFF, 0xFFFFFFFFFFDFFFFF,
-    0x1FFF, 0xFFFFFFFFFF0000, 0xC00FFFF0FFF, 0x400000000000, 0x8000,
-    0xF880000000000000, 0x7FFFFF7BB, 0xFFFFFFFFFFFFC, 0x68FC000000000000,
-    0xFFFF003FFFFFFC00, 0x1FFFFFFF0000007F, 0x7FFFFFFFFFFF0,
-    0x7C00FF9F00000000, 0x1FFFFFFFFFF, 0xC47EFFFF00000FF7, 0x3E62FFFFFFFFFFFF,
-    0x407FF18000005, 0x7F7F007E7E7E, 0x7FFFFFFFF, 0xFFFF000FFFFFFFFF,
-    0xFFFFFFFFFFFF87F, 0xFFFF3FFFFFFFFFFF, 0x3FFFFFF, 0x5F7FFDFFA0000000,
-    0xFFFFFFFFFFFFFFDB, 0x3FFFFFFFFFFFF, 0xFFFFFFFFFFF80000,
-    0x3FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFCFFFF,
-    0xFFF0000000000FF, 0xFFDF000000000000, 0x1FFFFFFFFFFFFFFF,
-    0xFFFEFFC000000000, 0x7FFFFFFF3FFFFFFF, 0x1CFCFCFC,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 5, 10, 5, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 11, 12, 13, 7, 14, 15, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 9, 10, 4, 11, 12, 4, 13, 14, 4,
-    4, 2, 2, 2, 2, 15, 16, 4, 4, 17, 18, 19, 20, 21, 4, 22, 4, 23, 24, 25, 26,
-    27, 28, 29, 4, 2, 30, 4, 4, 14, 4, 4, 4, 4, 4, 4, 4, 31, 32, 4, 4, 33, 4,
-    34, 35, 36, 37, 38, 39, 40, 4, 41, 19, 42, 43, 4, 4, 44, 45, 46, 47, 4, 4,
-    48, 49, 46, 50, 51, 4, 52, 4, 4, 4, 53, 4, 4, 54, 4, 4, 4, 4, 55, 56, 57,
-    58, 4, 4, 4, 4, 59, 60, 61, 4, 62, 63, 64, 4, 4, 4, 4, 65, 4, 4, 4, 4, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 66, 4, 4, 4, 2, 2, 2, 67, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 48, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 68, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 58,
-    19, 4, 69, 46, 70, 61, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 71, 4, 4,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 72, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 73, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 2, 2, 2, 2, 19, 74, 2, 2, 2, 2, 2, 75, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 2, 76, 77, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 2, 2, 2, 78, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 79, 80, 81, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 82, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 44, 2, 2, 2, 9, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    83, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 84, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 12, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  ],
-  tree3_level3: &[
-    0xB7FFFF7FFFFFEFFF, 0x3FFF3FFF, 0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFF, 0,
-    0xFFFFFFFF1FFFFFFF, 0x1FFFF, 0xFFFFE000FFFFFFFF, 0x3FFFFFFFFF03FD,
-    0xFFFFFFFF3FFFFFFF, 0xFF0F, 0xFFFFFFFFFFFF0000, 0x3FFFFFFF,
-    0xFFFF00FFFFFFFFFF, 0xFFFFFFFFF, 0x7FFFFFFFFFFFFF, 0xFF003FFFFF,
-    0x91BFFFFFFFFFFD3F, 0x7FFFFF003FFFFF, 0x7FFFFFFF, 0x37FFFF00000000,
-    0x3FFFFFF003FFFFF, 0xC0FFFFFFFFFFFFFF, 0x3FFFFFFEEF0001,
-    0x1FFFFFFF00000000, 0x1FFFFFFF, 0x1FFFFFFEFF, 0x3FFFFFFFFFFFFF,
-    0x7FFFF003FFFFF, 0x3FFFF, 0x1FF, 0xFFFF00801FFFFFFF, 0x3F,
-    0xFFFFFFFFFFFFF8, 0xFFFFFFFFFFF8, 0x1FFFFFF0000, 0x7FFFFFFFF8,
-    0x47FFFFFFFF0010, 0x7FFFFFFFFFFF8, 0x1400001E, 0xFFFFFFBFFFF,
-    0xFFFF01FFBFFFBD7F, 0x23EDFDFFFFF99FE0, 0x3E0010000, 0x1FFFFFFFFFFFFF,
-    0x780, 0xFFFFFFFFFFFF, 0xB0, 0x7FFFFFFFFFFF, 0xF000000, 0x10,
-    0x7FFFFFFFFFF, 0x7FFFFFF, 0xFFFFFFFFFFF, 0x8000000000000000,
-    0x407FFFFFFFFF801, 0xFFFFFFFFF0010000, 0x200003CF, 0x1FFFFFFFFFFFFFF,
-    0x7FFFFFFFFDFF, 0xFFFC000000000001, 0xFFFF, 0x1FFFFFFFFFB7F,
-    0xFFFFFDBF00000040, 0x10003FF, 0x7FFFF00000000, 0x3FFFFFF, 0xF, 0x7F,
-    0x3FFFFFFF0000, 0xE0FFFFF800000000, 0x1001F, 0x3FFFFFFFFFFFF,
-    0x7FFFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFFFFFFFFFFFF,
-    0x1FFF07FFFFFFFFFF, 0x3FF01FF, 0x1F, 0xAF7FE96FFFFFFEF,
-    0x5EF7F796AA96EA84, 0xFFFFBEE0FFFFBFF, 0x7FFFFF, 0xFFFF0003FFFFFFFF,
-    0x1FFFFFFFF,
-  ],
-};
-
-pub const OTHER_NUMBER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x720C000000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 3, 0, 4, 0, 0, 0, 5, 0, 0, 0,
-    0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 11,
-    0, 0, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 15, 16, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 21,
-    22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x3F0000000000000, 0xFC000000000000, 0x7000000000000,
-    0x7F00000000000000, 0x1FF00007F000000, 0xFFC0000000000,
-    0x1FFFFE0000000000, 0x3FF000000000000, 0x4000000, 0x3F1000000000000,
-    0x3FF, 0xFFFF0000, 0x200, 0xFFFFFFFF00000000, 0xFFFFFFF,
-    0xFFFFFC0000000000, 0xFFC0000000000000, 0xFFFFF, 0x2000000000000000,
-    0x3C0000, 0x3FF00000000, 0xFFFEFF00, 0xFFFE0000000003FF, 0x3F000000000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 8, 9, 0, 10, 11, 0, 12, 13, 14, 0, 15, 16,
-    0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 18, 0, 0, 19, 20, 0, 0, 0, 21, 0, 0, 0, 0,
-    0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0,
-    0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 28, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 31, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFF80, 0x1E0000000000000, 0xC00, 0xFFFFFFE00000000,
-    0xF00000000, 0xFE000000FF000000, 0xFF8000000000, 0xF800000000000000,
-    0xFC00000, 0x3000000000000000, 0xFFFFFFFFFFFCFFFF, 0x60000000000001FF,
-    0xE0000000, 0xF80000000000, 0xFF000000FF000000, 0xFE0000000000,
-    0xFC00000000000000, 0x7FFFFFFF00000000, 0x7FE0000000, 0x1E0000,
-    0x3FFFFC0000, 0x1FFFFE00000000, 0xC00000000000000, 0x7FC0000000000,
-    0x1FFFFC000000, 0x3F8000000, 0x7FFFFF, 0xFFFFF00000000, 0x1FFFFFF00000000,
-    0xFF80, 0xFFFE000000000000, 0x1EEFFFFFFFFFFF, 0x1FFF,
-  ],
-};
-
-pub const OTHER_PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x8C00D4EE00000000, 0x10000001, 0x80C0008200000000, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0x4000000000000000, 0x80, 0, 0, 0, 0, 0, 0, 0xFC000000, 0x200,
-    0x18000000000049, 0xC8003600, 0x3C0000000000, 0, 0x100000, 0x3FFF, 0, 0,
-    0x380000000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 2, 2, 3, 2, 4, 2, 5, 2, 6, 2, 2, 2, 2, 2, 2, 7, 2, 2, 2, 2, 8, 2,
-    9, 2, 2, 10, 2, 11, 12, 2, 13, 2, 14, 2, 2, 2, 2, 2, 2, 2, 2, 2, 15, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 16, 2, 17, 18, 2, 2, 19, 20, 2, 2, 2, 2, 21, 2,
-    2, 22, 2, 23, 2, 2, 24, 2, 25, 26, 27, 2, 28, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 29, 30, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 31, 2, 6, 2, 2, 32, 33, 2, 2, 2, 2, 2, 2, 34, 2, 2, 14, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 27, 2, 2, 2, 2, 35, 36, 2, 37, 2, 2,
-    2, 2, 2, 38, 2, 39, 40, 41, 2, 42, 2, 43, 2, 44, 2, 2, 2, 45, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    46, 47, 2, 2, 48, 49, 2, 2,
-  ],
-  tree2_level2: &[
-    0x7FFF000000000000, 0x40000000, 0, 0x1003000000000, 0x2000000000000000,
-    0x40000000000000, 0x1000000000000, 0x10, 0x10000000000000, 0xC008000,
-    0x17FFF0, 0x20, 0x61F0000, 0xFC00, 0x800000000000000, 0x1FF00000000,
-    0x600000000000, 0x380000000000, 0x60000000000000, 0x7700000, 0x7BF, 0x30,
-    0xC0000000, 0x3F7F00000000, 0x1FC000000, 0xF000000000000000,
-    0xF800000000000000, 0xC000000000000000, 0x800FF, 0x79FF00FF00C00000,
-    0x7FEBFF8E, 0xDE00000000000000, 0xF3FF7C00CB7FC9C3, 0x7FFA,
-    0x200000000000000E, 0xE000, 0x4008000000000000, 0xFC000000000000,
-    0xF0000000000000, 0x170000000000C000, 0xC00000000000, 0x80000000,
-    0xC0003FFE, 0xF0000000, 0x30000C0000000, 0x80000000000, 0x10000027F0000,
-    0xD0380F71E60, 0x100000018C00D4EE, 0x3200000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 3, 3, 4, 3, 3, 3, 3, 5, 3, 6, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 4, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 6, 0, 0, 0, 0, 7, 0, 8, 9, 0, 10, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 13, 14, 0, 15, 0, 16,
-    17, 0, 18, 0, 0, 0, 0, 0, 0, 19, 0, 20, 0, 0, 0, 21, 0, 22, 0, 0, 23, 0,
-    0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 25, 26, 27, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 31, 0, 32, 33, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x7, 0x80000000, 0x10000, 0x800000000000, 0x800000, 0x8000000080000000,
-    0x8000000001FF0000, 0x7F000000000000, 0xFE00000000000000, 0x1E000000,
-    0x3E00000, 0x3F80, 0xD800000000000000, 0x3, 0x3000000000000F, 0xE80021E0,
-    0x3F00000000000000, 0x20000000000, 0x2800F800, 0x40, 0xFFFFFE,
-    0x1FFF0000000E, 0x7000000000000000, 0x800000000000000, 0x8000000000000000,
-    0x7F, 0x7DC000000, 0x300000000003E, 0x180000000000000, 0x1F000000000000,
-    0xC00000000000, 0x20000000000000, 0xF80000000000000, 0x10, 0x7800000,
-    0xF80, 0xC0000000,
-  ],
-};
-
-pub const OTHER_SYMBOL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0x1424000000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x4,
-    0, 0, 0, 0x6000, 0, 0xC000, 0, 0, 0x6000020040000000, 0, 0, 0,
-    0x40000000000000,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 3, 0, 4, 0, 0, 0, 5, 0, 0, 0,
-    0, 0, 0, 6, 0, 7, 8, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 12, 0,
-    0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 14, 15, 16, 17, 0, 0, 0, 0, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-    26, 27, 28, 26, 29, 26, 26, 26, 30, 31, 0, 26, 26, 26, 26, 0, 0, 0, 0, 0,
-    0, 0, 0, 32, 33, 34, 35, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 37, 38, 26, 26,
-    26, 39, 40, 0, 0, 0, 0, 0, 41, 42, 43, 44, 45, 46, 26, 26, 26, 26, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0,
-    50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, 0, 0, 0, 0, 52,
-  ],
-  tree2_level2: &[
-    0, 0x400000000000000, 0x1000000000000, 0x5F8000000000000,
-    0x8000000000000000, 0x200000000008000, 0x1500000FCE8000E,
-    0xC000000000000000, 0x1E0DFBF, 0xC0000000, 0x3FF0000, 0x1,
-    0xFFFFFFFFC0000000, 0x1FF007FE00000000, 0xC0042AFC0D0037B, 0xB400,
-    0xFFFFBFB6F3E00C00, 0xFFFFFFFEB3FFF, 0xFFFFF9FCFFFFF0FF,
-    0xEFFFFFFFFFFFFFFF, 0xFFF0000007FFFFFF, 0xFFFFFFFC0FFFFFFF, 0x7FFFFFFFFF,
-    0x7FF, 0xFFFFFFFFF0000000, 0x3FFFFFFFFFF, 0xFFFFFFFFFFFFFFFF,
-    0xFF7FFFFFFFFFFFFF, 0xFFFFFFFFFFFFFD, 0xFFFF7FFFFFFFFFFF, 0xFFFFFFFFFF,
-    0xFFFFFFFFFFF00000, 0xFFFFFFFFFFFF, 0xFFCFFFFFFFFFE060,
-    0xFFFFFFFFFF3FFFFF, 0x7FFFFFFFFFFFFDFF, 0x7E000000000, 0xFFFFFFFFFBFFFFFF,
-    0xFFFFFFFFFFFFF, 0xFFF0000003FFFFF, 0xC0C00001000C0010, 0xFFC30000,
-    0xFFFFFFFFF, 0xFFFFFC007FFFFFFF, 0xFFFFFFFF000100FF, 0x1FFFFFFFFFC00,
-    0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0000, 0x7F, 0x2C00F0000000000,
-    0x380000000000000, 0x2000000000000000, 0x3000611000000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 4, 2, 5, 6, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 11, 11,
-    12, 13, 14, 15, 16, 11, 17, 0, 0, 11, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 11, 11, 11, 19, 20, 21, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 23, 11, 24, 25, 26, 23, 27, 28, 29, 30, 0, 0, 11,
-    11, 11, 31, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 32, 11, 33, 11,
-    34, 35, 36, 37, 0, 38, 39, 40, 41, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFF80000000000000, 0xFE00000000000000, 0x10FFF73FF,
-    0x1FFFFFFFFFFF0000, 0x180000000000000, 0x100, 0x8000000000000000,
-    0xF000000000000000, 0x20, 0x10000000, 0xFFFFFFFFFFFFFFFF,
-    0x3FFFFFFFFFFFFF, 0xFFFFFE7FFFFFFFFF, 0x1C1FFFFFFFFF, 0xFFFFC3FFFFFFF018,
-    0x1FFFFFFFFFF, 0x23, 0x7FFFFF, 0x780000000000000, 0xFFDFE00000000000,
-    0x6F, 0x100000000000, 0xFFFF0FFFFFFFFFFF, 0xFFFE7FFF000FFFFF,
-    0x3FFFFFFFFEFFFE, 0xFFFFFFFFFFFF0000, 0x1FFFFFFFFFFF, 0xFFFFFFC000000000,
-    0xFFFFFFFFFFF0007, 0x3F000301FF, 0x7FFFFFFFFFFFFFF, 0x3FF1FFF001FFFFF,
-    0xFFFFFFFFFFFFF, 0x1FFFFFF, 0xFFFFFFFFFFFF0FFF, 0xFFFFFFFF03FF00FF,
-    0x3FFFFFFF00FF, 0x7FFFFFFFFFFF0FFF, 0xF479FFFFFFFFFFFF, 0x3FF0007FFFFFFFF,
-    0xFFFFFFFFFFFF0007, 0x3FFF00000000,
-  ],
-};
-
-pub const PARAGRAPH_SEPARATOR: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x20000000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const PRIVATE_USE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFFFFFFFFFF,
-  ],
-  tree3_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFFFFFFFF, 0x3FFFFFFFFFFFFFFF,
-  ],
-};
-
-pub const PUNCTUATION: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x8C00F7EE00000000, 0x28000000B8000001, 0x88C0088200000000, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0x4000000000000000, 0x80, 0, 0, 0, 0, 0, 0, 0xFC000000,
-    0x4000000000000600, 0x18000000000049, 0xC8003600, 0x3C0000000000, 0,
-    0x100000, 0x3FFF, 0, 0, 0x380000000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 2, 2, 3, 2, 4, 2, 5, 2, 6, 2, 2, 2, 2, 2, 2, 7, 2, 2, 2, 2, 8, 2,
-    9, 2, 2, 10, 2, 11, 12, 2, 13, 2, 14, 2, 2, 2, 2, 2, 2, 2, 2, 2, 15, 2, 2,
-    16, 2, 2, 2, 2, 2, 2, 2, 2, 17, 18, 19, 20, 2, 2, 21, 22, 2, 2, 2, 2, 23,
-    2, 2, 24, 2, 25, 2, 2, 26, 2, 27, 28, 29, 2, 30, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 31, 32, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 34, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 35, 2, 36, 2, 2, 2, 2, 2, 2, 37, 38, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 39, 2, 6, 2, 2, 40, 41, 2, 2, 2, 2, 2, 2, 42,
-    2, 43, 14, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 29, 2, 2, 2, 2, 44, 45,
-    2, 46, 2, 2, 2, 2, 2, 47, 2, 48, 49, 50, 2, 51, 2, 52, 2, 53, 2, 2, 2, 54,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    29, 2, 2, 2, 55, 56, 2, 2, 57, 58, 2, 2,
-  ],
-  tree2_level2: &[
-    0x7FFF000000000000, 0x40000000, 0, 0x1003000000000, 0x2000000000000000,
-    0x40000000000000, 0x1000000000000, 0x10, 0x10000000000000, 0xC008000,
-    0x3C0000000017FFF0, 0x20, 0x61F0000, 0xFC00, 0x800000000000000,
-    0x1FF00000000, 0x1, 0x600000000000, 0x18000000, 0x380000000000,
-    0x60000000000000, 0x7700000, 0x7FF, 0x30, 0xC0000000, 0x3F7F00000000,
-    0x1FC000000, 0xF000000000000000, 0xF800000000000000, 0xC000000000000000,
-    0x800FF, 0xFFFF00FFFFFF0000, 0x600000007FFBFFEF, 0x6000, 0x60000000F00,
-    0x3FFF0000000000, 0xFFC000000060, 0x1FFFFF8, 0x300000000F000000,
-    0xDE00000000000000, 0xFFFF7FFFFFFFFFFF, 0x7FFF, 0x20010000FFF3FF0E,
-    0x100000000, 0xE000, 0x4008000000000000, 0xFC000000000000,
-    0xF0000000000000, 0x170000000000C000, 0xC00000000000, 0x80000000,
-    0xC0003FFE, 0xF0000000, 0x30000C0000000, 0x80000000000,
-    0xFFFF000003FF0000, 0xD0BFFF7FFFF, 0xB80000018C00F7EE, 0x3FA8000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 3, 3, 4, 3, 3, 3, 3, 5, 3, 6, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 4, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 6, 0, 0, 0, 0, 7, 0, 8, 9, 0, 10, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 13, 14, 0, 15, 0, 16,
-    17, 0, 18, 0, 0, 0, 0, 0, 0, 19, 0, 20, 0, 0, 0, 21, 0, 22, 0, 0, 23, 0,
-    0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 25, 26, 27, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 31, 0, 32, 33, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x7, 0x80000000, 0x10000, 0x800000000000, 0x800000, 0x8000000080000000,
-    0x8000000001FF0000, 0x7F000000000000, 0xFE00000000000000, 0x1E000000,
-    0x3E00000, 0x3F80, 0xD800000000000000, 0x3, 0x3000000000000F, 0xE80021E0,
-    0x3F00000000000000, 0x20000000000, 0x2800F800, 0x40, 0xFFFFFE,
-    0x1FFF0000000E, 0x7000000000000000, 0x800000000000000, 0x8000000000000000,
-    0x7F, 0x7DC000000, 0x300000000003E, 0x180000000000000, 0x1F000000000000,
-    0xC00000000000, 0x20000000000000, 0xF80000000000000, 0x10, 0x7800000,
-    0xF80, 0xC0000000,
-  ],
-};
-
-pub const SEPARATOR: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x100000000, 0, 0x100000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1, 0x8300000007FF, 0x80000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const SPACE_SEPARATOR: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x100000000, 0, 0x100000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1, 0x8000000007FF, 0x80000000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const SPACING_MARK: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 5, 7, 8, 4, 9, 10, 11, 12, 8, 13, 3, 14, 15,
-    16, 0, 0, 0, 0, 9, 17, 0, 0, 18, 19, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 22, 0, 0, 0, 0, 23, 0,
-    0, 0, 24, 25, 0, 0, 26, 27, 28, 29, 30, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    33, 0, 34, 35, 0, 36, 37, 6, 38, 39, 0, 40, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xC800000000000008, 0xDE01, 0xC00000000000000C, 0x801981,
-    0xC000000000000008, 0x1, 0x1A01, 0x400000000000000C, 0xC000000000000000,
-    0x801DC6, 0xE, 0x1E, 0x600D9F, 0x801DC1, 0xC, 0xC0000FF038000,
-    0x8000000000000000, 0x1902180000000000, 0x3F9C00C00000, 0x1C009F98,
-    0xC040000000000000, 0x1BF, 0x1FB0E7800000000, 0x6000000, 0x7E01A00A00000,
-    0xE820000000000010, 0x1B, 0x4C200000004, 0xC5C8000000000,
-    0x300FF000000000, 0x8C000200000000, 0xC00000000000, 0x9800000000,
-    0xFFF0000000000003, 0xF, 0xC0000, 0xEC30000000000008, 0x19800000000000,
-    0x2800000000002000, 0x20C80000000000, 0x16D800000000,
-  ],
-  tree3_level1: &[
-    0, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 4, 5, 6, 7, 0, 0,
-    8, 9, 10, 0, 0, 11, 12, 13, 14, 0, 0, 15, 0, 16, 0, 17, 0, 18, 0, 0, 0,
-    19, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 0, 0, 0, 0, 0, 23, 0, 24, 0, 0, 0,
-    25, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0,
-    0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0x5, 0x187000000000004, 0x100000000000, 0x60, 0x8038000000000004, 0x1,
-    0x2C700000000000, 0x700000000, 0xC00000000000000C, 0xC0080399E,
-    0xE0000000000000, 0x23, 0x7A07000000000000, 0x2, 0x4F03800000000000,
-    0x5807000000000000, 0x40D00000000000, 0x4300000000, 0x100700000000000,
-    0x200000000000000, 0x1800000, 0x800000, 0x4000800000000000,
-    0x12020000000000, 0x587C00, 0x60000000000000, 0x7FFFFFFFFFFE0000,
-    0x7E06000000000,
-  ],
-};
-
-pub const SURROGATE: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFFFFFFFFFF,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const SYMBOL: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0x7000081000000000, 0x5000000140000000, 0x113D37C00000000,
-    0x80000000800000, 0, 0, 0, 0, 0, 0, 0, 0xFFFFAFE0FFFC003C, 0,
-    0x20000000000000, 0x30, 0x40000000000000, 0, 0, 0x4, 0, 0, 0, 0xE000, 0,
-    0xC9C0, 0, 0, 0x6000020040000000, 0, 0, 0, 0xC040000000000000,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 3, 0, 4, 0, 5, 0, 0, 0, 6, 0, 0, 5,
-    0, 0, 0, 7, 0, 8, 9, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 13, 0, 14, 0,
-    0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17, 0,
-    18, 19, 0, 20, 21, 22, 23, 23, 23, 23, 23, 24, 23, 23, 23, 25, 26, 27, 28,
-    23, 23, 23, 23, 23, 23, 23, 23, 23, 29, 30, 31, 23, 23, 23, 23, 23, 23,
-    32, 33, 23, 23, 23, 23, 23, 34, 35, 36, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 38,
-    39, 23, 23, 23, 40, 41, 0, 42, 0, 0, 0, 43, 44, 45, 46, 47, 48, 23, 23,
-    23, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 49, 50, 0, 0, 0, 0, 0, 0, 0, 0, 51, 0, 52, 0, 53, 0, 0, 0, 0,
-    0, 0, 0, 0, 54, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 55, 0, 56, 57, 0, 0, 0, 0, 0, 0, 0, 58, 0, 59, 0, 0, 60, 61, 0,
-    62,
-  ],
-  tree2_level2: &[
-    0, 0xC0C000000000000, 0x2000000000000, 0x1000000000000, 0x7F8000000000000,
-    0x8000000000000000, 0x200000000008000, 0x1500000FCE8000E,
-    0xC000000000000000, 0x1E0DFBF, 0xC0000000, 0x3FF0000, 0x8000000, 0x1,
-    0xFFFFFFFFC0000000, 0x1FF007FE00000000, 0xA000000000000000,
-    0x6000E000E000E003, 0x1C00000000040010, 0xFFFFFFFF00001C00,
-    0xC0042AFC1D0037B, 0xBC1F, 0xFFFFFFFFFFFF0C00, 0xFFFFFFFFFFFFFFFF,
-    0xFFFFF9FFFFFFF0FF, 0x7FFFFFFFFF, 0x7FF, 0xFFFFFFFFF0000000,
-    0x3FFFFFFFFFF, 0xFFFFFFFFFF, 0xFFFFFFFFFFF00000, 0xFFFF003FFFFFFF9F,
-    0xFFFFFFFFFE000007, 0xCFFFFFFFF0FFFFFF, 0xFFCFFFFFFFFFFFFF,
-    0xFFFFFFFFFF3FFFFF, 0x7FFFFFFFFFFFFDFF, 0x7E000000000, 0xFFFFFFFFFBFFFFFF,
-    0xFFFFFFFFFFFFF, 0xFFF0000003FFFFF, 0xC0C00001000C0010, 0x18000000,
-    0xFFC30000, 0xFFFFFFFFF, 0xFFFFFC007FFFFFFF, 0xFFFFFFFF000100FF,
-    0x1FFFFFFFFFC00, 0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0000, 0x7F,
-    0x3007FFFFF, 0x600, 0x3C00F0000000000, 0x380000000000000, 0x20000000000,
-    0xFFFC000000000000, 0x3, 0x3000000000000000, 0x27400000000,
-    0x4000000070000810, 0x50000001, 0x30007F7F00000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 4, 2, 5, 6, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 11, 11,
-    12, 13, 14, 15, 16, 11, 17, 0, 0, 11, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 19, 20, 21, 22, 23, 11, 11, 11, 11, 11, 11, 11, 11, 24, 25, 26, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0,
-    0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 29, 11, 30, 31, 32, 29, 33, 34, 35, 36, 0,
-    0, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 37, 11, 38,
-    11, 39, 40, 41, 42, 0, 43, 44, 45, 46, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFF80000000000000, 0xFE00000000000000, 0x10FFF73FF,
-    0x1FFFFFFFFFFF0000, 0x180000000000000, 0x100, 0x8000000000000000,
-    0xF000000000000000, 0x20, 0x10000000, 0xFFFFFFFFFFFFFFFF,
-    0x3FFFFFFFFFFFFF, 0xFFFFFE7FFFFFFFFF, 0x1C1FFFFFFFFF, 0xFFFFC3FFFFFFF018,
-    0x1FFFFFFFFFF, 0x23, 0x7FFFFF, 0x800000008000002, 0x20000000200000,
-    0x800000008000, 0x20000000200, 0x8, 0x780000000000000, 0xFFDFE00000000000,
-    0x6F, 0x1100000000000, 0x3000000000000, 0xFFFF0FFFFFFFFFFF,
-    0xFFFE7FFF000FFFFF, 0x3FFFFFFFFEFFFE, 0xFFFFFFFFFFFF0000, 0x1FFFFFFFFFFF,
-    0xFFFFFFC000000000, 0xFFFFFFFFFFF0007, 0x3F000301FF, 0x3FF1FFF001FFFFF,
-    0xFFFFFFFFFFFFF, 0x1FFFFFF, 0xFFFFFFFFFFFF0FFF, 0xFFFFFFFF03FF00FF,
-    0x3FFFFFFF00FF, 0x7FFFFFFFFFFF0FFF, 0xF479FFFFFFFFFFFF, 0x3FF0007FFFFFFFF,
-    0xFFFFFFFFFFFF0007, 0x3FFF00000000,
-  ],
-};
-
-pub const TITLECASE_LETTER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0x4000000000920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0x1000FF00FF00FF00, 0x1000000000001000,
-  ],
-  tree3_level1: &[
-  ],
-  tree3_level2: &[
-  ],
-  tree3_level3: &[
-  ],
-};
-
-pub const UNASSIGNED: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x300000000000000, 0x40000280F, 0,
-    0, 0, 0, 0, 0x1000000000000, 0x1800000, 0x11800, 0xFFE078000000FF00,
-    0x20000000, 0, 0, 0, 0x4000, 0x1800, 0xFFFC000000000000,
-    0x1800000000000000,
-  ],
-  tree2_level1: &[
-    0, 1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-    20, 21, 22, 23, 24, 25, 26, 4, 27, 28, 29, 4, 4, 4, 30, 4, 4, 4, 4, 4, 31,
-    32, 33, 34, 35, 36, 37, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 38, 39, 40, 41, 4,
-    42, 43, 39, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 4, 54, 4, 55, 56, 57,
-    58, 59, 4, 4, 4, 60, 4, 4, 4, 4, 61, 62, 63, 64, 4, 65, 66, 67, 4, 4, 68,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 69, 70, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 71, 72, 73, 74, 75, 4, 76, 77,
-    78, 79, 80, 4, 81, 82, 83, 4, 4, 4, 84, 4, 85, 86, 4, 87, 4, 88, 89, 75,
-    4, 4, 90, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 45, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 91, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 92, 93, 4, 4, 4, 4, 94, 4, 4, 95, 4, 4, 96,
-    97, 98, 95, 4, 99, 4, 100, 4, 101, 102, 103, 4, 104, 105, 106, 4, 107, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 89,
-    108, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 109, 4, 110, 111, 112, 4, 113,
-    4, 4, 4, 4, 4, 114, 115, 116, 36, 117, 4, 118, 85, 4, 90, 119,
-  ],
-  tree2_level2: &[
-    0x8000C00000000000, 0xFFFFF800B0000000, 0xC0200000FFFFFFFF, 0x7FFFF, 0,
-    0xC3A020000066010, 0x800000304F7F8660, 0x2C92020000067811,
-    0xFF80003FA1FDC678, 0xC12020000044011, 0x1FC0030FFFEC440,
-    0xC12020000066011, 0xFF0000304F3FC660, 0x3C0038E729C23813,
-    0xF800003FFF7EC238, 0x1C00020000022000, 0xFF0030F89FC220,
-    0xC10020000022000, 0xFFF90030BF9FC220, 0x22010, 0x30000F0220,
-    0xD004000003800013, 0xFFE3003F00A07B80, 0x7800000000000001,
-    0xFFFFFFFFF0000000, 0xC4001351010FDA69, 0xFFFFFFFF0C00C0A0,
-    0x1E00000000100, 0x2000000001000000, 0xFFFFFFFFF8002000, 0xDF40,
-    0xC280C200, 0x80C200000000C200, 0x8000C2, 0xC20000, 0xE000000018000000,
-    0xFC000000, 0xC0C0000000000000, 0xE0000000, 0xFE00000000000000,
-    0xFF800000FFE02000, 0xFFF22000FFF00000, 0xFC00FC00C0000000, 0xFC008000,
-    0xF80000000000, 0xFFC0000000000000, 0xF000F00080000000,
-    0xFFE0C0000000000E, 0xF00000000000, 0x3800FC00, 0x30000000,
-    0x6000000080000000, 0x8000C000FC00FC00, 0xFFFFFFFFFFFFFFFF,
-    0xE00000000000F000, 0xFF0000000000000, 0x700000000000000, 0x1C00,
-    0x180000000000FE00, 0xFC0000000000FF00, 0x400000000000000, 0xC0C00000,
-    0xC00000005500C0C0, 0x20000000000000, 0x8023000010300020, 0xC002000000000,
-    0xE0008000, 0xFFFE00000000FFFF, 0xF000, 0xFFFFFF8000000000, 0xFFFFF800,
-    0x30000000000000, 0xC00000, 0x8000000000000200, 0x800000000000,
-    0x80000000, 0x1F0000000000000, 0xDF4000000000, 0x7FFE7F0000000000,
-    0x80808080FF800000, 0x80808080, 0xFFFFFFFFFFFF8000, 0x4000000,
-    0xFFF0000000000000, 0xF000FFFFFFC00000, 0x1, 0x1800000, 0x100000000001F,
-    0xF800000000008000, 0xFFF000000000, 0x8000000000000000,
-    0xFFFF000000000000, 0xE000, 0xFF80, 0xFFFFF00000000000,
-    0xFF00000000000000, 0xFC00000000000000, 0x7FFFFFFFFFFFFF,
-    0xFC00F00000000000, 0xFC003FC0, 0xE00000007FF00000, 0x800000003C004000,
-    0xFF80000000000000, 0xC00C000, 0xFF80000007FFFFF8, 0x8080FF818181,
-    0xFFC000000000, 0xFC00C00000000000, 0xF000000000000780, 0xC00000000000,
-    0xFFFFFFFFFC000000, 0xA08000001F07FF80, 0x24, 0x7FFFC, 0xFFFF, 0x30000,
-    0xC000FFFFFFFFFF00, 0x20F08000080000, 0x6000000000000000,
-    0xC1FF8080E3030303,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 5, 9, 5, 10, 11, 12, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 13, 14, 15, 7, 16, 17, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 19, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 19,
-  ],
-  tree3_level2: &[
-    0, 1, 2, 3, 4, 2, 5, 6, 7, 7, 8, 9, 10, 11, 12, 13, 2, 2, 14, 15, 16, 17,
-    7, 7, 2, 2, 2, 2, 18, 19, 7, 7, 20, 21, 22, 23, 24, 7, 25, 26, 27, 28, 29,
-    30, 31, 32, 33, 7, 2, 34, 35, 36, 37, 7, 7, 7, 7, 38, 7, 7, 16, 39, 7, 7,
-    2, 40, 2, 41, 42, 43, 2, 44, 45, 7, 46, 47, 48, 49, 7, 7, 2, 50, 2, 51, 7,
-    7, 52, 53, 2, 54, 55, 56, 57, 7, 7, 7, 58, 7, 59, 60, 7, 7, 7, 7, 2, 61,
-    62, 63, 7, 7, 7, 7, 64, 65, 66, 7, 67, 68, 69, 7, 7, 7, 7, 70, 7, 7, 7, 7,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 39, 7, 2, 71, 2, 2, 2, 72, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 73, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 74, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2,
-    63, 75, 7, 76, 2, 77, 78, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 79, 7, 2, 80,
-    81, 82, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 83,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 35, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 84, 85, 2, 2, 2, 2, 2, 58, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 2, 86, 87, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2,
-    2, 2, 88, 89, 2, 2, 90, 2, 91, 7, 92, 2, 93, 7, 7, 2, 94, 95, 96, 97, 98,
-    2, 2, 2, 2, 99, 2, 2, 2, 2, 100, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 101, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 102, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 2, 2, 2, 103, 2, 104, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 105, 106, 7,
-    7, 7, 7, 7, 107, 108, 109, 110, 7, 7, 7, 7, 111, 2, 112, 113, 114, 111,
-    115, 116, 117, 118, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    119, 2, 120, 2, 121, 122, 123, 124, 7, 125, 126, 127, 128, 7, 129, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 130, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 106, 2, 2, 2, 131, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 132, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 133, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 53, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 134, 2, 7,
-    7, 2, 2, 2, 135, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    136,
-  ],
-  tree3_level3: &[
-    0x4800008000001000, 0xFFFFFFFFC000C000, 0, 0xF800000000000000,
-    0x70000000000078, 0xFFFFFFFEF0008000, 0xC00000000000FFFF,
-    0xFFFFFFFFFFFFFFFF, 0xE0000000, 0xF0000000FFFE0000, 0x1FF000000000,
-    0xF80000000000F800, 0x40000000, 0xFFFFFFFFFFC000F0, 0xFC00C0000000,
-    0xF000000000F00000, 0xFF0000000000, 0xFFFF7FF000000000,
-    0xFF80000000000000, 0xFFFFFF00FFC00000, 0x6E400000000002C0, 0x400000,
-    0xFFFF007F80000000, 0x7C80000FFFFFFFF, 0x7C00000070000000,
-    0xF00000000000000, 0x30000, 0x78C0000001100F90, 0xFE00FE00,
-    0xFFFFFFFF00000000, 0xFF80078000000000, 0x1C0000000000000,
-    0xF8000000C00000, 0xFFFF01FFE1FC0000, 0xFFFFFFFFFFFFFE00,
-    0xFFF8000000000000, 0x3F8000000000000, 0xFC00FF0000000000,
-    0x80000000FFFFFFFF, 0xFFFFFFFFFC000000, 0x7FFF00000003C000,
-    0xFC00FE000000DFFC, 0x20000000000000, 0xFF8000000000FF80,
-    0xFFE000010000C000, 0x8000000000040000, 0xFC0040004280,
-    0xFC00F80000000000, 0x412020000066010, 0xFFE0E0301F7EC660,
-    0xFFFFFFFF94000000, 0xFFFFFFFFFC00FF00, 0xC0000000000000,
-    0xFFFFFFFFC0000000, 0xFFFFE000FC00FFE0, 0xFF00000000000000,
-    0xFFFFFFFFFFFFFC00, 0xF00018000000, 0xF000000000000000, 0xFFFFFFFF,
-    0x7FF8000000000000, 0xFF00, 0xFFFFFFF800000030, 0xFE00000000000000,
-    0x80000000000200, 0xE0000000FFC0, 0xFF80010000030000, 0x4B80000000000480,
-    0x240FC00FF00, 0xFFFFFC00FE048000, 0xFE000000FFFFFFFF, 0xFFE0800000000000,
-    0xFFFFFFFFFFFFFFF0, 0xFFFF800000000000, 0xFFFFFFFFFFFFFF80,
-    0xFFFF3C0080000000, 0xFFC0C0000000FFFF, 0x1F0000040400FFC0,
-    0xFFFFFFFFFFFF0000, 0xFFFFFFFFF8000000, 0x800000000000FFE0,
-    0xFFFFFFFF00007FFF, 0xFFFFFFFCFFFFFFFF, 0xFFFC000000000000,
-    0xFFFFFFFF80000000, 0xFFFFFFFFFFFF, 0xE000F80000000000,
-    0xFFFFFFF00C00FE00, 0xFFC0000000000000, 0x18000000000, 0xFFFFFE0000000000,
-    0xFFFFFFFFFFFFFFC0, 0xFFF00000FFFFFFFF, 0xFE000000FF800000, 0x200000,
-    0x1400219B20000000, 0x10, 0x8400000020201840, 0x203A0, 0xC000000000,
-    0x3000, 0xFFFF000107FFF000, 0xFFFFF82406000080, 0xFFFFFFFFFF800060,
-    0xFFFFFFFF3C00F800, 0x1FFFFFFFFFFFF, 0xFFE0000000000000,
-    0xF508016900000010, 0xA10808695569157B, 0xF0000411F0000400,
-    0xFFFCFFFFFFFFFFFF, 0xF00000000000, 0x18000FFF00000, 0xFFC0000000010001,
-    0xE000, 0xFFFFE00000000000, 0x3FFFFFFFFF, 0xF00000000000FFF8,
-    0xFFFFFFC0FFFCFE00, 0xFC00E000FFE00000, 0xFFF0000000000000,
-    0xFFFFFFFFFE000000, 0xF000, 0xFC00FF00, 0xFFFFC0000000FF00,
-    0x800000000000F000, 0xB86000000000000, 0xFC00FFF800000000, 0xFFF8,
-    0xFFFFC000FFFFFFFF, 0xFFFFFFFFFF800000, 0xC0000000, 0xFFFC00000000,
-    0xFFFFFFFE00000000, 0xFFFFFFFD, 0xFFFF000000000000, 0xC000000000000000,
-  ],
-};
-
-pub const UPPERCASE_LETTER: &'static ::ucd_trie::TrieSet = &::ucd_trie::TrieSet {
-  tree1_level1: &[
-    0, 0x7FFFFFE, 0, 0x7F7FFFFF, 0xAA55555555555555, 0x2B555555555554AA,
-    0x11AED2D5B1DBCED6, 0x55D255554AAAA490, 0x6C05555555555555, 0x557A, 0, 0,
-    0, 0x8045000000000000, 0xFFBFFFED740, 0xE6905555551C8000, 0xFFFFFFFFFFFF,
-    0x5555555500000000, 0x5555555555555401, 0x5555555555552AAB,
-    0xFFFE555555555555, 0x7FFFFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree2_level1: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 5, 5, 6, 5, 7, 8, 9, 10, 0, 0, 0,
-    0, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 15, 5,
-    16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 0, 19, 20, 21, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0,
-  ],
-  tree2_level2: &[
-    0, 0xFFFFFFFF00000000, 0x20BF, 0x3FFFFFFFFFFFFF, 0xE7FFFFFFFFFF0000,
-    0x5555555555555555, 0x5555555540155555, 0xFF00FF003F00FF00,
-    0xFF00AA003F00, 0xF00000000000000, 0xF001F000F000F00, 0xC00F3D503E273884,
-    0x20, 0x8, 0x7FFFFFFFFFFF, 0xC025EA9D00000000, 0x4280555555555,
-    0x155555555555, 0x5555555, 0x5554555400000000, 0x6A00555555555555,
-    0x15F7D5555452855, 0x7FFFFFE00000000,
-  ],
-  tree3_level1: &[
-    0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 4, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2,
-  ],
-  tree3_level2: &[
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 3, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9,
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  ],
-  tree3_level3: &[
-    0, 0xFFFFFFFFFF, 0xFFFF000000000000, 0xFFFFF, 0x7FFFFFFFFFFFF,
-    0xFFFFFFFF00000000, 0xFFFFFFFF, 0xFFF0000003FFFFFF, 0xFFFFFF0000003FFF,
-    0x3FDE64D0000003, 0x3FFFFFF0000, 0x7B0000001FDFE7B0, 0xFFFFF0000001FC5F,
-    0x3FFFFFF0000003F, 0x3FFFFFF00000, 0xF0000003FFFFFF00, 0xFFFF0000003FFFFF,
-    0xFFFFFF00000003FF, 0x7FFFFFC00000001, 0x1FFFFFF0000000, 0x7FFFFFC00000,
-    0x1FFFFFF0000, 0x400, 0x3FFFFFFFF,
-  ],
-};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/unicode/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/unicode/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/src/unicode/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/src/unicode/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-//! Character inclusion in binary or General_Category value Unicode sets.
-//!
-//! We rely on dead code elimination to remove the tables that aren't needed.
-
-#![allow(bad_style)]
-#![allow(clippy::all)]
-
-macro_rules! char_property_functions {
-    {$(
-        mod $module:ident;
-        [$(
-            $prop:ident,
-        )*];
-    )*} => {$(
-        #[allow(unused)]
-        mod $module;
-        $(pub fn $prop(c: char) -> bool {
-            self::$module::$prop.contains_char(c)
-        })*
-    )*};
-}
-
-char_property_functions! {
-    mod binary;
-    [
-        // ASCII_HEX_DIGIT, // let this one be stripped out -- the full trie is wasteful for ASCII
-        ALPHABETIC, BIDI_CONTROL, CASE_IGNORABLE, CASED, CHANGES_WHEN_CASEFOLDED,
-        CHANGES_WHEN_CASEMAPPED, CHANGES_WHEN_LOWERCASED, CHANGES_WHEN_TITLECASED,
-        CHANGES_WHEN_UPPERCASED, DASH, DEFAULT_IGNORABLE_CODE_POINT, DEPRECATED, DIACRITIC,
-        EXTENDER, GRAPHEME_BASE, GRAPHEME_EXTEND, GRAPHEME_LINK, HEX_DIGIT, HYPHEN,
-        IDS_BINARY_OPERATOR, IDS_TRINARY_OPERATOR, ID_CONTINUE, ID_START, IDEOGRAPHIC, JOIN_CONTROL,
-        LOGICAL_ORDER_EXCEPTION, LOWERCASE, MATH, NONCHARACTER_CODE_POINT, OTHER_ALPHABETIC,
-        OTHER_DEFAULT_IGNORABLE_CODE_POINT, OTHER_GRAPHEME_EXTEND, OTHER_ID_CONTINUE,
-        OTHER_ID_START, OTHER_LOWERCASE, OTHER_MATH, OTHER_UPPERCASE, PATTERN_SYNTAX,
-        PATTERN_WHITE_SPACE, PREPENDED_CONCATENATION_MARK, QUOTATION_MARK, RADICAL,
-        REGIONAL_INDICATOR, SENTENCE_TERMINAL, SOFT_DOTTED, TERMINAL_PUNCTUATION, UNIFIED_IDEOGRAPH,
-        UPPERCASE, VARIATION_SELECTOR, WHITE_SPACE, XID_CONTINUE, XID_START,
-    ];
-
-    mod category;
-    [
-        CASED_LETTER, CLOSE_PUNCTUATION, CONNECTOR_PUNCTUATION, CONTROL, CURRENCY_SYMBOL,
-        DASH_PUNCTUATION, DECIMAL_NUMBER, ENCLOSING_MARK, FINAL_PUNCTUATION, FORMAT,
-        INITIAL_PUNCTUATION, LETTER, LETTER_NUMBER, LINE_SEPARATOR, LOWERCASE_LETTER, MARK,
-        MATH_SYMBOL, MODIFIER_LETTER, MODIFIER_SYMBOL, NONSPACING_MARK, NUMBER, OPEN_PUNCTUATION,
-        OTHER, OTHER_LETTER, OTHER_NUMBER, OTHER_PUNCTUATION, OTHER_SYMBOL, PARAGRAPH_SEPARATOR,
-        PRIVATE_USE, PUNCTUATION, SEPARATOR, SPACE_SEPARATOR, SPACING_MARK, SURROGATE, SYMBOL,
-        TITLECASE_LETTER, UNASSIGNED, UPPERCASE_LETTER,
-    ];
-}
-
-pub fn by_name(name: &str) -> Option<Box<dyn Fn(char) -> bool>> {
-    for property in binary::BY_NAME {
-        if name == property.0.to_uppercase() {
-            return Some(Box::new(move |c| property.1.contains_char(c)));
-        }
-    }
-
-    for property in category::BY_NAME {
-        if name == property.0.to_uppercase() {
-            return Some(Box::new(move |c| property.1.contains_char(c)));
-        }
-    }
-
-    None
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/tests/calculator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/tests/calculator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/tests/calculator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/tests/calculator.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#[macro_use]
-extern crate pest;
-
-use pest::error::Error;
-use pest::iterators::{Pair, Pairs};
-use pest::prec_climber::{Assoc, Operator, PrecClimber};
-use pest::{state, ParseResult, Parser, ParserState};
-
-#[allow(dead_code, non_camel_case_types)]
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-enum Rule {
-    expression,
-    primary,
-    number,
-    plus,
-    minus,
-    times,
-    divide,
-    modulus,
-    power,
-}
-
-struct CalculatorParser;
-
-impl Parser<Rule> for CalculatorParser {
-    fn parse(rule: Rule, input: &str) -> Result<Pairs<Rule>, Error<Rule>> {
-        fn expression(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::expression, |s| {
-                s.sequence(|s| {
-                    primary(s).and_then(|s| {
-                        s.repeat(|s| {
-                            s.sequence(|s| {
-                                plus(s)
-                                    .or_else(|s| minus(s))
-                                    .or_else(|s| times(s))
-                                    .or_else(|s| divide(s))
-                                    .or_else(|s| modulus(s))
-                                    .or_else(|s| power(s))
-                                    .and_then(|s| primary(s))
-                            })
-                        })
-                    })
-                })
-            })
-        }
-
-        fn primary(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state
-                .sequence(|s| {
-                    s.match_string("(")
-                        .and_then(|s| expression(s))
-                        .and_then(|s| s.match_string(")"))
-                })
-                .or_else(|s| number(s))
-        }
-
-        fn number(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::number, |s| {
-                s.sequence(|s| {
-                    s.optional(|s| s.match_string("-")).and_then(|s| {
-                        s.match_string("0").or_else(|s| {
-                            s.sequence(|s| {
-                                s.match_range('1'..'9')
-                                    .and_then(|s| s.repeat(|s| s.match_range('0'..'9')))
-                            })
-                        })
-                    })
-                })
-            })
-        }
-
-        fn plus(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::plus, |s| s.match_string("+"))
-        }
-
-        fn minus(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::minus, |s| s.match_string("-"))
-        }
-
-        fn times(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::times, |s| s.match_string("*"))
-        }
-
-        fn divide(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::divide, |s| s.match_string("/"))
-        }
-
-        fn modulus(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::modulus, |s| s.match_string("%"))
-        }
-
-        fn power(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::power, |s| s.match_string("^"))
-        }
-
-        state(input, |state| match rule {
-            Rule::expression => expression(state),
-            _ => unreachable!(),
-        })
-    }
-}
-
-fn consume<'i>(pair: Pair<'i, Rule>, climber: &PrecClimber<Rule>) -> i32 {
-    let primary = |pair| consume(pair, climber);
-    let infix = |lhs: i32, op: Pair<Rule>, rhs: i32| match op.as_rule() {
-        Rule::plus => lhs + rhs,
-        Rule::minus => lhs - rhs,
-        Rule::times => lhs * rhs,
-        Rule::divide => lhs / rhs,
-        Rule::modulus => lhs % rhs,
-        Rule::power => lhs.pow(rhs as u32),
-        _ => unreachable!(),
-    };
-
-    match pair.as_rule() {
-        Rule::expression => climber.climb(pair.into_inner(), primary, infix),
-        Rule::number => pair.as_str().parse().unwrap(),
-        _ => unreachable!(),
-    }
-}
-
-#[test]
-fn number() {
-    parses_to! {
-        parser: CalculatorParser,
-        input: "-12",
-        rule: Rule::expression,
-        tokens: [
-            expression(0, 3, [
-                number(0, 3)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn parens() {
-    parses_to! {
-        parser: CalculatorParser,
-        input: "((-12))",
-        rule: Rule::expression,
-        tokens: [
-            expression(0, 7, [
-                expression(1, 6, [
-                    expression(2, 5, [
-                        number(2, 5)
-                    ])
-                ])
-            ])
-        ]
-    };
-}
-
-#[test]
-fn expression() {
-    parses_to! {
-        parser: CalculatorParser,
-        input: "-12+3*(4-9)^7^2",
-        rule: Rule::expression,
-        tokens: [
-            expression(0, 15, [
-                number(0, 3),
-                plus(3, 4),
-                number(4, 5),
-                times(5, 6),
-                expression(7, 10, [
-                    number(7, 8),
-                    minus(8, 9),
-                    number(9, 10)
-                ]),
-                power(11, 12),
-                number(12, 13),
-                power(13, 14),
-                number(14, 15)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn prec_climb() {
-    let climber = PrecClimber::new(vec![
-        Operator::new(Rule::plus, Assoc::Left) | Operator::new(Rule::minus, Assoc::Left),
-        Operator::new(Rule::times, Assoc::Left)
-            | Operator::new(Rule::divide, Assoc::Left)
-            | Operator::new(Rule::modulus, Assoc::Left),
-        Operator::new(Rule::power, Assoc::Right),
-    ]);
-
-    let pairs = CalculatorParser::parse(Rule::expression, "-12+3*(4-9)^3^2/9%7381");
-    assert_eq!(-1_525, consume(pairs.unwrap().next().unwrap(), &climber));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/tests/json.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/tests/json.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest/tests/json.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest/tests/json.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,465 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#[macro_use]
-extern crate pest;
-
-use std::collections::HashMap;
-
-use pest::error::Error;
-use pest::iterators::{Pair, Pairs};
-use pest::{state, ParseResult, Parser, ParserState, Span};
-
-#[allow(dead_code, non_camel_case_types)]
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-enum Rule {
-    json,
-    object,
-    pair,
-    array,
-    value,
-    string,
-    escape,
-    unicode,
-    hex,
-    number,
-    int,
-    exp,
-    bool,
-    null,
-}
-
-struct JsonParser;
-
-impl Parser<Rule> for JsonParser {
-    fn parse(rule: Rule, input: &str) -> Result<Pairs<Rule>, Error<Rule>> {
-        fn json(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            value(state)
-        }
-
-        fn object(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::object, |s| {
-                s.sequence(|s| {
-                    s.match_string("{")
-                        .and_then(|s| skip(s))
-                        .and_then(|s| pair(s))
-                        .and_then(|s| skip(s))
-                        .and_then(|s| {
-                            s.repeat(|s| {
-                                s.sequence(|s| {
-                                    s.match_string(",")
-                                        .and_then(|s| skip(s))
-                                        .and_then(|s| pair(s))
-                                        .and_then(|s| skip(s))
-                                })
-                            })
-                        })
-                        .and_then(|s| s.match_string("}"))
-                })
-                .or_else(|s| {
-                    s.sequence(|s| {
-                        s.match_string("{")
-                            .and_then(|s| skip(s))
-                            .and_then(|s| s.match_string("}"))
-                    })
-                })
-            })
-        }
-
-        fn pair(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::pair, |s| {
-                s.sequence(|s| {
-                    string(s)
-                        .and_then(|s| skip(s))
-                        .and_then(|s| s.match_string(":"))
-                        .and_then(|s| skip(s))
-                        .and_then(|s| value(s))
-                })
-            })
-        }
-
-        fn array(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::array, |s| {
-                s.sequence(|s| {
-                    s.match_string("[")
-                        .and_then(|s| skip(s))
-                        .and_then(|s| value(s))
-                        .and_then(|s| skip(s))
-                        .and_then(|s| {
-                            s.repeat(|s| {
-                                s.sequence(|s| {
-                                    s.match_string(",")
-                                        .and_then(|s| skip(s))
-                                        .and_then(|s| value(s))
-                                        .and_then(|s| skip(s))
-                                })
-                            })
-                        })
-                        .and_then(|s| s.match_string("]"))
-                })
-                .or_else(|s| {
-                    s.sequence(|s| {
-                        s.match_string("[")
-                            .and_then(|s| skip(s))
-                            .and_then(|s| s.match_string("]"))
-                    })
-                })
-            })
-        }
-
-        fn value(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::value, |s| {
-                string(s)
-                    .or_else(|s| number(s))
-                    .or_else(|s| object(s))
-                    .or_else(|s| array(s))
-                    .or_else(|s| bool(s))
-                    .or_else(|s| null(s))
-            })
-        }
-
-        fn string(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::string, |s| {
-                s.match_string("\"")
-                    .and_then(|s| {
-                        s.repeat(|s| {
-                            escape(s).or_else(|s| {
-                                s.sequence(|s| {
-                                    s.lookahead(false, |s| {
-                                        s.match_string("\"").or_else(|s| s.match_string("\\"))
-                                    })
-                                    .and_then(|s| s.skip(1))
-                                })
-                            })
-                        })
-                    })
-                    .and_then(|pos| pos.match_string("\""))
-            })
-        }
-
-        fn escape(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.sequence(|s| {
-                s.match_string("\\").and_then(|s| {
-                    s.match_string("\"")
-                        .or_else(|s| s.match_string("\\"))
-                        .or_else(|s| s.match_string("/"))
-                        .or_else(|s| s.match_string("b"))
-                        .or_else(|s| s.match_string("f"))
-                        .or_else(|s| s.match_string("n"))
-                        .or_else(|s| s.match_string("r"))
-                        .or_else(|s| s.match_string("t"))
-                        .or_else(|s| unicode(s))
-                })
-            })
-        }
-
-        fn unicode(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.sequence(|s| {
-                s.match_string("u")
-                    .and_then(|s| hex(s))
-                    .and_then(|s| hex(s))
-                    .and_then(|s| hex(s))
-            })
-        }
-
-        fn hex(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state
-                .match_range('0'..'9')
-                .or_else(|s| s.match_range('a'..'f'))
-                .or_else(|s| s.match_range('A'..'F'))
-        }
-
-        fn number(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::number, |s| {
-                s.sequence(|s| {
-                    s.optional(|s| s.match_string("-"))
-                        .and_then(|s| int(s))
-                        .and_then(|s| {
-                            s.optional(|s| {
-                                s.sequence(|s| {
-                                    s.match_string(".")
-                                        .and_then(|s| s.match_range('0'..'9'))
-                                        .and_then(|s| s.repeat(|s| s.match_range('0'..'9')))
-                                        .and_then(|s| s.optional(|s| exp(s)))
-                                        .or_else(|s| exp(s))
-                                })
-                            })
-                        })
-                })
-            })
-        }
-
-        fn int(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.match_string("0").or_else(|s| {
-                s.sequence(|s| {
-                    s.match_range('1'..'9')
-                        .and_then(|s| s.repeat(|s| s.match_range('0'..'9')))
-                })
-            })
-        }
-
-        fn exp(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.sequence(|s| {
-                s.match_string("E")
-                    .or_else(|s| s.match_string("e"))
-                    .and_then(|s| {
-                        s.optional(|s| s.match_string("+").or_else(|s| s.match_string("-")))
-                    })
-                    .and_then(|s| int(s))
-            })
-        }
-
-        fn bool(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::bool, |s| {
-                s.match_string("true").or_else(|s| s.match_string("false"))
-            })
-        }
-
-        fn null(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.rule(Rule::null, |s| s.match_string("null"))
-        }
-
-        fn skip(state: Box<ParserState<Rule>>) -> ParseResult<Box<ParserState<Rule>>> {
-            state.repeat(|s| {
-                s.match_string(" ")
-                    .or_else(|s| s.match_string("\t"))
-                    .or_else(|s| s.match_string("\r"))
-                    .or_else(|s| s.match_string("\n"))
-            })
-        }
-
-        state(input, |state| match rule {
-            Rule::json => json(state),
-            Rule::object => object(state),
-            Rule::pair => pair(state),
-            Rule::array => array(state),
-            Rule::value => value(state),
-            Rule::string => string(state),
-            Rule::escape => escape(state),
-            Rule::unicode => unicode(state),
-            Rule::hex => hex(state),
-            Rule::number => number(state),
-            Rule::int => int(state),
-            Rule::exp => exp(state),
-            Rule::bool => bool(state),
-            Rule::null => null(state),
-        })
-    }
-}
-
-#[derive(Debug, PartialEq)]
-enum Json<'i> {
-    Null,
-    Bool(bool),
-    Number(f64),
-    String(Span<'i>),
-    Array(Vec<Json<'i>>),
-    Object(HashMap<Span<'i>, Json<'i>>),
-}
-
-fn consume(pair: Pair<Rule>) -> Json {
-    fn value(pair: Pair<Rule>) -> Json {
-        let pair = pair.into_inner().next().unwrap();
-
-        match pair.as_rule() {
-            Rule::null => Json::Null,
-            Rule::bool => match pair.as_str() {
-                "false" => Json::Bool(false),
-                "true" => Json::Bool(true),
-                _ => unreachable!(),
-            },
-            Rule::number => Json::Number(pair.as_str().parse().unwrap()),
-            Rule::string => Json::String(pair.as_span()),
-            Rule::array => Json::Array(pair.into_inner().map(value).collect()),
-            Rule::object => {
-                let pairs = pair.into_inner().map(|pos| {
-                    let mut pair = pos.into_inner();
-
-                    let key = pair.next().unwrap().as_span();
-                    let value = value(pair.next().unwrap());
-
-                    (key, value)
-                });
-
-                Json::Object(pairs.collect())
-            }
-            _ => unreachable!(),
-        }
-    }
-
-    value(pair)
-}
-
-#[test]
-fn null() {
-    parses_to! {
-        parser: JsonParser,
-        input: "null",
-        rule: Rule::null,
-        tokens: [
-            null(0, 4)
-        ]
-    };
-}
-
-#[test]
-fn bool() {
-    parses_to! {
-        parser: JsonParser,
-        input: "false",
-        rule: Rule::bool,
-        tokens: [
-            bool(0, 5)
-        ]
-    };
-}
-
-#[test]
-fn number_zero() {
-    parses_to! {
-        parser: JsonParser,
-        input: "0",
-        rule: Rule::number,
-        tokens: [
-            number(0, 1)
-        ]
-    };
-}
-
-#[test]
-fn float() {
-    parses_to! {
-        parser: JsonParser,
-        input: "100.001",
-        rule: Rule::number,
-        tokens: [
-            number(0, 7)
-        ]
-    };
-}
-
-#[test]
-fn float_with_exp() {
-    parses_to! {
-        parser: JsonParser,
-        input: "100.001E+100",
-        rule: Rule::number,
-        tokens: [
-            number(0, 12)
-        ]
-    };
-}
-
-#[test]
-fn number_minus_zero() {
-    parses_to! {
-        parser: JsonParser,
-        input: "-0",
-        rule: Rule::number,
-        tokens: [
-            number(0, 2)
-        ]
-    };
-}
-
-#[test]
-fn string_with_escapes() {
-    parses_to! {
-        parser: JsonParser,
-        input: "\"asd\\u0000\\\"\"",
-        rule: Rule::string,
-        tokens: [
-            string(0, 13)
-        ]
-    };
-}
-
-#[test]
-fn array_empty() {
-    parses_to! {
-        parser: JsonParser,
-        input: "[ ]",
-        rule: Rule::array,
-        tokens: [
-            array(0, 3)
-        ]
-    };
-}
-
-#[test]
-fn array() {
-    parses_to! {
-        parser: JsonParser,
-        input: "[0.0e1, false, null, \"a\", [0]]",
-        rule: Rule::array,
-        tokens: [
-            array(0, 30, [
-                value(1,  6, [number(1, 6)]),
-                value(8, 13, [bool(8, 13)]),
-                value(15, 19, [null(15, 19)]),
-                value(21, 24, [string(21, 24)]),
-                value(26, 29, [
-                    array(26, 29, [
-                        value(27, 28, [number(27, 28)])
-                    ])
-                ])
-            ])
-        ]
-    };
-}
-
-#[test]
-fn object() {
-    parses_to! {
-        parser: JsonParser,
-        input: "{\"a\" : 3, \"b\" : [{}, 3]}",
-        rule: Rule::object,
-        tokens: [
-            object(0, 24, [
-                pair(1, 8, [
-                    string(1, 4),
-                    value(7, 8, [number(7, 8)])
-                ]),
-                pair(10, 23, [
-                    string(10, 13),
-                    value(16, 23, [
-                        array(16, 23, [
-                            value(17, 19, [object(17, 19)]),
-                            value(21, 22, [number(21, 22)])
-                        ])
-                    ])
-                ])
-            ])
-        ]
-    };
-}
-
-#[test]
-fn ast() {
-    let input = "{\"a\": [null, true, 3.4]}";
-
-    let ast = consume(
-        JsonParser::parse(Rule::json, input)
-            .unwrap()
-            .next()
-            .unwrap(),
-    );
-
-    match ast {
-        Json::Object(pairs) => {
-            let vals: Vec<&Json> = pairs.values().collect();
-
-            assert_eq!(
-                **vals.get(0).unwrap(),
-                Json::Array(vec![Json::Null, Json::Bool(true), Json::Number(3.4)])
-            );
-        }
-        _ => {}
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"3616e31e313d646dd0372ba0116b596a4c9dfc21cda88625ef00001ab13b0d68","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","_README.md":"7c31c505c267ac538b70deaa9ad95ef0cc68720c46b4d3276df8f3a278d233e2","src/lib.rs":"f343c474ce5ff5520907bd69dd52b965b4aec42750fe3bf7eaf2b5075b08cfd6","tests/grammar.pest":"3a2212c28dd560ba3169e0e1470394ae706eb9336360ecdc0f1d9934af9fc223","tests/grammar.rs":"75261bc1ba2817d59e35fa2a7c07a661f9f2200a0144cb768837d37d3c370aa0","tests/grammar_inline.rs":"675c55697df7b8d011cef7182f2b05d52b4e73d405c869b9ea361bff5f17b63a","tests/lists.pest":"96d90ad5eb7b14648fa8720f0a48e680327080b07251a4dd74e1a023625e9c1a","tests/lists.rs":"5cc0c79494685d5056ab6164bc8893e26d29810f5c5a20d895f27c1695bab31c","tests/reporting.pest":"f5bc8405ea117b76338e0003e359731a8aaf1a36672f31a6a639a4e67a65e331","tests/reporting.rs":"d1658fd9466278f80769384f4377056274bd06fff586c2422b4fe42d39967e4b"},"package":"833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "pest_derive"
-version = "2.1.0"
-authors = ["DragoÈ™ Tiselice <dragostiselice@gmail.com>"]
-description = "pest's derive macro"
-homepage = "https://pest-parser.github.io/"
-documentation = "https://docs.rs/pest"
-readme = "_README.md"
-keywords = ["pest", "parser", "peg", "grammar"]
-categories = ["parsing"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/pest-parser/pest"
-
-[lib]
-name = "pest_derive"
-proc-macro = true
-[dependencies.pest]
-version = "2.1.0"
-
-[dependencies.pest_generator]
-version = "2.1.0"
-[badges.codecov]
-repository = "pest-parser/pest"
-
-[badges.maintenance]
-status = "actively-developed"
-
-[badges.travis-ci]
-repository = "pest-parser/pest"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/_README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/_README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/_README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/_README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,167 +0,0 @@
-<p align="center">
-  <img src="https://raw.github.com/pest-parser/pest/master/pest-logo.svg?sanitize=true" width="80%"/>
-</p>
-
-# pest. The Elegant Parser
-
-[![Join the chat at https://gitter.im/dragostis/pest](https://badges.gitter.im/dragostis/pest.svg)](https://gitter.im/dragostis/pest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Book](https://img.shields.io/badge/book-WIP-4d76ae.svg)](https://pest-parser.github.io/book)
-[![Docs](https://docs.rs/pest/badge.svg)](https://docs.rs/pest)
-
-[![Build Status](https://travis-ci.org/pest-parser/pest.svg?branch=master)](https://travis-ci.org/pest-parser/pest)
-[![codecov](https://codecov.io/gh/pest-parser/pest/branch/master/graph/badge.svg)](https://codecov.io/gh/pest-parser/pest)
-[![Crates.io](https://img.shields.io/crates/d/pest.svg)](https://crates.io/crates/pest)
-[![Crates.io](https://img.shields.io/crates/v/pest.svg)](https://crates.io/crates/pest)
-
-pest is a general purpose parser written in Rust with a focus on accessibility,
-correctness, and performance. It uses parsing expression grammars
-(or [PEG]) as input, which are similar in spirit to regular expressions, but
-which offer the enhanced expressivity needed to parse complex languages.
-
-[PEG]: https://en.wikipedia.org/wiki/Parsing_expression_grammar
-
-## Getting started
-
-The recommended way to start parsing with pest is to read the official [book].
-
-Other helpful resources:
-
-* API reference on [docs.rs]
-* play with grammars and share them on our [fiddle]
-* leave feedback, ask questions, or greet us on [Gitter]
-
-[book]: https://pest-parser.github.io/book
-[docs.rs]: https://docs.rs/pest
-[fiddle]: https://pest-parser.github.io/#editor
-[Gitter]: https://gitter.im/dragostis/pest
-
-## Example
-
-The following is an example of a grammar for a list of alpha-numeric identifiers
-where the first identifier does not start with a digit:
-
-```rust
-alpha = { 'a'..'z' | 'A'..'Z' }
-digit = { '0'..'9' }
-
-ident = { (alpha | digit)+ }
-
-ident_list = _{ !digit ~ ident ~ (" " ~ ident)+ }
-          // ^
-          // ident_list rule is silent which means it produces no tokens
-```
-
-Grammars are saved in separate .pest files which are never mixed with procedural
-code. This results in an always up-to-date formalization of a language that is
-easy to read and maintain.
-
-## Meaningful error reporting
-
-Based on the grammar definition, the parser also includes automatic error
-reporting. For the example above, the input `"123"` will result in:
-
-```
-thread 'main' panicked at ' --> 1:1
-  |
-1 | 123
-  | ^---
-  |
-  = unexpected digit', src/main.rs:12
-```
-while `"ab *"` will result in:
-```
-thread 'main' panicked at ' --> 1:1
-  |
-1 | ab *
-  |    ^---
-  |
-  = expected ident', src/main.rs:12
-```
-
-## Pairs API
-
-The grammar can be used to derive a `Parser` implementation automatically.
-Parsing returns an iterator of nested token pairs:
-
-```rust
-extern crate pest;
-#[macro_use]
-extern crate pest_derive;
-
-use pest::Parser;
-
-#[derive(Parser)]
-#[grammar = "ident.pest"]
-struct IdentParser;
-
-fn main() {
-    let pairs = IdentParser::parse(Rule::ident_list, "a1 b2").unwrap_or_else(|e| panic!("{}", e));
-
-    // Because ident_list is silent, the iterator will contain idents
-    for pair in pairs {
-
-        let span = pair.clone().into_span();
-        // A pair is a combination of the rule which matched and a span of input
-        println!("Rule:    {:?}", pair.as_rule());
-        println!("Span:    {:?}", span);
-        println!("Text:    {}", span.as_str());
-
-        // A pair can be converted to an iterator of the tokens which make it up:
-        for inner_pair in pair.into_inner() {
-            let inner_span = inner_pair.clone().into_span();
-            match inner_pair.as_rule() {
-                Rule::alpha => println!("Letter:  {}", inner_span.as_str()),
-                Rule::digit => println!("Digit:   {}", inner_span.as_str()),
-                _ => unreachable!()
-            };
-        }
-    }
-}
-```
-
-This produces the following output:
-```
-Rule:    ident
-Span:    Span { start: 0, end: 2 }
-Text:    a1
-Letter:  a
-Digit:   1
-Rule:    ident
-Span:    Span { start: 3, end: 5 }
-Text:    b2
-Letter:  b
-Digit:   2
-```
-
-## Other features
-
-* Precedence climbing
-* Input handling
-* Custom errors
-* Runs on stable Rust
-
-## Projects using pest
-
-* [pest_meta](https://github.com/pest-parser/pest/blob/master/meta/src/grammar.pest) (bootstrapped)
-* [brain](https://github.com/brain-lang/brain)
-* [Chelone](https://github.com/Aaronepower/chelone)
-* [comrak](https://github.com/kivikakk/comrak)
-* [graphql-parser](https://github.com/Keats/graphql-parser)
-* [handlebars-rust](https://github.com/sunng87/handlebars-rust)
-* [hexdino](https://github.com/Luz/hexdino)
-* [Huia](https://gitlab.com/jimsy/huia/)
-* [json5-rs](https://github.com/callum-oakley/json5-rs)
-* [mt940](https://github.com/svenstaro/mt940-rs)
-* [py_literal](https://github.com/jturner314/py_literal)
-* [rouler](https://github.com/jarcane/rouler)
-* [RuSh](https://github.com/lwandrebeck/RuSh)
-* [rs_pbrt](https://github.com/wahn/rs_pbrt)
-* [stache](https://github.com/dgraham/stache)
-* [tera](https://github.com/Keats/tera)
-* [ui_gen](https://github.com/emoon/ui_gen)
-* [ukhasnet-parser](https://github.com/adamgreig/ukhasnet-parser)
-
-## Special thanks
-
-A special round of applause goes to prof. Marius Minea for his guidance and all
-pest contributors, some of which being none other than my friends.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,302 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-//! # pest. The Elegant Parser
-//!
-//! pest is a general purpose parser written in Rust with a focus on accessibility, correctness,
-//! and performance. It uses parsing expression grammars (or [PEG]) as input, which are similar in
-//! spirit to regular expressions, but which offer the enhanced expressivity needed to parse
-//! complex languages.
-//!
-//! [PEG]: https://en.wikipedia.org/wiki/Parsing_expression_grammar
-//!
-//! ## Getting started
-//!
-//! The recommended way to start parsing with pest is to read the official [book].
-//!
-//! Other helpful resources:
-//!
-//! * API reference on [docs.rs]
-//! * play with grammars and share them on our [fiddle]
-//! * leave feedback, ask questions, or greet us on [Gitter]
-//!
-//! [book]: https://pest-parser.github.io/book
-//! [docs.rs]: https://docs.rs/pest
-//! [fiddle]: https://pest-parser.github.io/#editor
-//! [Gitter]: https://gitter.im/dragostis/pest
-//!
-//! ## `.pest` files
-//!
-//! Grammar definitions reside in custom `.pest` files located in the `src` directory. Their path is
-//! relative to `src` and is specified between the `derive` attribute and empty `struct` that
-//! `Parser` will be derived on.
-//!
-//! ```ignore
-//! #[derive(Parser)]
-//! #[grammar = "path/to/my_grammar.pest"] // relative to src
-//! struct MyParser;
-//! ```
-//!
-//! ## Inline grammars
-//!
-//! Grammars can also be inlined by using the `#[grammar_inline = "..."]` attribute.
-//!
-//! ## Grammar
-//!
-//! A grammar is a series of rules separated by whitespace, possibly containing comments.
-//!
-//! ### Comments
-//!
-//! Comments start with `//` and end at the end of the line.
-//!
-//! ```ignore
-//! // a comment
-//! ```
-//!
-//! ### Rules
-//!
-//! Rules have the following form:
-//!
-//! ```ignore
-//! name = optional_modifier { expression }
-//! ```
-//!
-//! The name of the rule is formed from alphanumeric characters or `_` with the condition that the
-//! first character is not a digit and is used to create token pairs. When the rule starts being
-//! parsed, the starting part of the token is being produced, with the ending part being produced
-//! when the rule finishes parsing.
-//!
-//! The following token pair notation `a(b(), c())` denotes the tokens: start `a`, start `b`, end
-//! `b`, start `c`, end `c`, end `a`.
-//!
-//! #### Modifiers
-//!
-//! Modifiers are optional and can be one of `_`, `@`, `$`, or `!`. These modifiers change the
-//! behavior of the rules.
-//!
-//! 1. Silent (`_`)
-//!
-//!     Silent rules do not create token pairs during parsing, nor are they error-reported.
-//!
-//!     ```ignore
-//!     a = _{ "a" }
-//!     b =  { a ~ "b" }
-//!     ```
-//!
-//!     Parsing `"ab"` produces the token pair `b()`.
-//!
-//! 2. Atomic (`@`)
-//!
-//!     Atomic rules do not accept whitespace or comments within their expressions and have a
-//!     cascading effect on any rule they call. I.e. rules that are not atomic but are called by atomic
-//!     rules behave atomically.
-//!
-//!     Any rules called by atomic rules do not generate token pairs.
-//!
-//!     ```ignore
-//!     a =  { "a" }
-//!     b = @{ a ~ "b" }
-//!
-//!     WHITESPACE = _{ " " }
-//!     ```
-//!
-//!     Parsing `"ab"` produces the token pair `b()`, while `"a   b"` produces an error.
-//!
-//! 3. Compound-atomic (`$`)
-//!
-//!     Compound-atomic are identical to atomic rules with the exception that rules called by them are
-//!     not forbidden from generating token pairs.
-//!
-//!     ```ignore
-//!     a =  { "a" }
-//!     b = ${ a ~ "b" }
-//!
-//!     WHITESPACE = _{ " " }
-//!     ```
-//!
-//!     Parsing `"ab"` produces the token pairs `b(a())`, while `"a   b"` produces an error.
-//!
-//! 4. Non-atomic (`!`)
-//!
-//!     Non-atomic are identical to normal rules with the exception that they stop the cascading effect
-//!     of atomic and compound-atomic rules.
-//!
-//!     ```ignore
-//!     a =  { "a" }
-//!     b = !{ a ~ "b" }
-//!     c = @{ b }
-//!
-//!     WHITESPACE = _{ " " }
-//!     ```
-//!
-//!     Parsing both `"ab"` and `"a   b"` produce the token pairs `c(a())`.
-//!
-//! #### Expressions
-//!
-//! Expressions can be either terminals or non-terminals.
-//!
-//! 1. Terminals
-//!
-//!     | Terminal   | Usage                                                          |
-//!     |------------|----------------------------------------------------------------|
-//!     | `"a"`      | matches the exact string `"a"`                                 |
-//!     | `^"a"`     | matches the exact string `"a"` case insensitively (ASCII only) |
-//!     | `'a'..'z'` | matches one character between `'a'` and `'z'`                  |
-//!     | `a`        | matches rule `a`                                               |
-//!
-//! Strings and characters follow
-//! [Rust's escape mechanisms](https://doc.rust-lang.org/reference/tokens.html#byte-escapes), while
-//! identifiers can contain alpha-numeric characters and underscores (`_`), as long as they do not
-//! start with a digit.
-//!
-//! 2. Non-terminals
-//!
-//!     | Non-terminal          | Usage                                                      |
-//!     |-----------------------|------------------------------------------------------------|
-//!     | `(e)`                 | matches `e`                                                |
-//!     | `e1 ~ e2`             | matches the sequence `e1` `e2`                             |
-//!     | <code>e1 \| e2</code> | matches either `e1` or `e2`                                |
-//!     | `e*`                  | matches `e` zero or more times                             |
-//!     | `e+`                  | matches `e` one or more times                              |
-//!     | `e{n}`                | matches `e` exactly `n` times                              |
-//!     | `e{, n}`              | matches `e` at most `n` times                              |
-//!     | `e{n,} `              | matches `e` at least `n` times                             |
-//!     | `e{m, n}`             | matches `e` between `m` and `n` times inclusively          |
-//!     | `e?`                  | optionally matches `e`                                     |
-//!     | `&e`                  | matches `e` without making progress                        |
-//!     | `!e`                  | matches if `e` doesn't match without making progress       |
-//!     | `PUSH(e)`             | matches `e` and pushes it's captured string down the stack |
-//!
-//!     where `e`, `e1`, and `e2` are expressions.
-//!
-//! Expressions can modify the stack only if they match the input. For example,
-//! if `e1` in the compound expression `e1 | e2` does not match the input, then
-//! it does not modify the stack, so `e2` sees the stack in the same state as
-//! `e1` did. Repetitions and optionals (`e*`, `e+`, `e{, n}`, `e{n,}`,
-//! `e{m,n}`, `e?`) can modify the stack each time `e` matches. The `!e` and `&e`
-//! expressions are a special case; they never modify the stack.
-//!
-//! ## Special rules
-//!
-//! Special rules can be called within the grammar. They are:
-//!
-//! * `WHITESPACE` - runs between rules and sub-rules
-//! * `COMMENT` - runs between rules and sub-rules
-//! * `ANY` - matches exactly one `char`
-//! * `SOI` - (start-of-input) matches only when a `Parser` is still at the starting position
-//! * `EOI` - (end-of-input) matches only when a `Parser` has reached its end
-//! * `POP` - pops a string from the stack and matches it
-//! * `POP_ALL` - pops the entire state of the stack and matches it
-//! * `PEEK` - peeks a string from the stack and matches it
-//! * `PEEK[a..b]` - peeks part of the stack and matches it
-//! * `PEEK_ALL` - peeks the entire state of the stack and matches it
-//! * `DROP` - drops the top of the stack (fails to match if the stack is empty)
-//!
-//! `WHITESPACE` and `COMMENT` should be defined manually if needed. All other rules cannot be
-//! overridden.
-//!
-//! ## `WHITESPACE` and `COMMENT`
-//!
-//! When defined, these rules get matched automatically in sequences (`~`) and repetitions
-//! (`*`, `+`) between expressions. Atomic rules and those rules called by atomic rules are exempt
-//! from this behavior.
-//!
-//! These rules should be defined so as to match one whitespace character and one comment only since
-//! they are run in repetitions.
-//!
-//! If both `WHITESPACE` and `COMMENT` are defined, this grammar:
-//!
-//! ```ignore
-//! a = { b ~ c }
-//! ```
-//!
-//! is effectively transformed into this one behind the scenes:
-//!
-//! ```ignore
-//! a = { b ~ WHITESPACE* ~ (COMMENT ~ WHITESPACE*)* ~ c }
-//! ```
-//!
-//! ## `PUSH`, `POP`, `DROP`, and `PEEK`
-//!
-//! `PUSH(e)` simply pushes the captured string of the expression `e` down a stack. This stack can
-//! then later be used to match grammar based on its content with `POP` and `PEEK`.
-//!
-//! `PEEK` always matches the string at the top of stack. So, if the stack contains `["b", "a"]`
-//! (`"a"` being on top), this grammar:
-//!
-//! ```ignore
-//! a = { PEEK }
-//! ```
-//!
-//! is effectively transformed into at parse time:
-//!
-//! ```ignore
-//! a = { "a" }
-//! ```
-//!
-//! `POP` works the same way with the exception that it pops the string off of the stack if the
-//! match worked. With the stack from above, if `POP` matches `"a"`, the stack will be mutated
-//! to `["b"]`.
-//!
-//! `DROP` makes it possible to remove the string at the top of the stack
-//! without matching it. If the stack is nonempty, `DROP` drops the top of the
-//! stack. If the stack is empty, then `DROP` fails to match.
-//!
-//! ### Advanced peeking
-//!
-//! `PEEK[start..end]` and `PEEK_ALL` allow to peek deeper into the stack. The syntax works exactly
-//! like Rust’s exclusive slice syntax. Additionally, negative indices can be used to indicate an
-//! offset from the top. If the end lies before or at the start, the expression matches (as does
-//! a `PEEK_ALL` on an empty stack). With the stack `["c", "b", "a"]` (`"a"` on top):
-//!
-//! ```ignore
-//! fill = PUSH("c") ~ PUSH("b") ~ PUSH("a")
-//! v = { PEEK_ALL } = { "a" ~ "b" ~ "c" }  // top to bottom
-//! w = { PEEK[..] } = { "c" ~ "b" ~ "a" }  // bottom to top
-//! x = { PEEK[1..2] } = { PEEK[1..-1] } = { "b" }
-//! y = { PEEK[..-2] } = { PEEK[0..1] } = { "a" }
-//! z = { PEEK[1..] } = { PEEK[-2..3] } = { "c" ~ "b" }
-//! n = { PEEK[2..-2] } = { PEEK[2..1] } = { "" }
-//! ```
-//!
-//! For historical reasons, `PEEK_ALL` matches from top to bottom, while `PEEK[start..end]` matches
-//! from bottom to top. There is currectly no syntax to match a slice of the stack top to bottom.
-//!
-//! ## `Rule`
-//!
-//! All rules defined or used in the grammar populate a generated `enum` called `Rule`. This
-//! implements `pest`'s `RuleType` and can be used throughout the API.
-//!
-//! ## `Built-in rules`
-//!
-//! Pest also comes with a number of built-in rules for convenience. They are:
-//!
-//! * `ASCII_DIGIT` - matches a numeric character from 0..9
-//! * `ASCII_NONZERO_DIGIT` - matches a numeric character from 1..9
-//! * `ASCII_BIN_DIGIT` - matches a numeric character from 0..1
-//! * `ASCII_OCT_DIGIT` - matches a numeric character from 0..7
-//! * `ASCII_HEX_DIGIT` - matches a numeric character from 0..9 or a..f or A..F
-//! * `ASCII_ALPHA_LOWER` - matches a character from a..z
-//! * `ASCII_ALPHA_UPPER` - matches a character from A..Z
-//! * `ASCII_ALPHA` - matches a character from a..z or A..Z
-//! * `ASCII_ALPHANUMERIC` - matches a character from a..z or A..Z or 0..9
-//! * `ASCII` - matches a character from \x00..\x7f
-//! * `NEWLINE` - matches either "\n" or "\r\n" or "\r"
-
-#![doc(html_root_url = "https://docs.rs/pest_derive")]
-
-extern crate pest_generator;
-extern crate proc_macro;
-
-use proc_macro::TokenStream;
-
-#[proc_macro_derive(Parser, attributes(grammar, grammar_inline))]
-pub fn derive_parser(input: TokenStream) -> TokenStream {
-    pest_generator::derive_parser(input.into(), true).into()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/grammar_inline.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/grammar_inline.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/grammar_inline.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/grammar_inline.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#[macro_use]
-extern crate pest;
-#[macro_use]
-extern crate pest_derive;
-
-#[derive(Parser)]
-#[grammar_inline = "string = { \"abc\" }"]
-struct GrammarParser;
-
-#[test]
-fn inline_string() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::string,
-        tokens: [
-            string(0, 3)
-        ]
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/grammar.pest thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/grammar.pest
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/grammar.pest	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/grammar.pest	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-string = { "abc" }
-insensitive = { ^"abc" }
-range = { '0'..'9' }
-ident = { string }
-pos_pred = { &string }
-neg_pred = { !string }
-double_neg_pred = { !!string }
-sequence = !{ string ~ string }
-sequence_compound = ${ string ~ string }
-sequence_atomic = @{ string ~ string }
-sequence_non_atomic = @{ sequence }
-sequence_atomic_compound = @{ sequence_compound }
-sequence_nested = { string ~ string }
-sequence_compound_nested = ${ sequence_nested }
-choice = { string | range }
-optional = { string? }
-repeat = { string* }
-repeat_atomic = @{ string* }
-repeat_once = { string+ }
-repeat_once_atomic = @{ string+ }
-repeat_min_max = { string{2, 3} }
-repeat_min_max_atomic = @{ string{2, 3} }
-repeat_exact = { string{2} }
-repeat_min = { string{2,} }
-repeat_min_atomic = @{ string{2,} }
-repeat_max = { string{, 2} }
-repeat_max_atomic = @{ string{, 2} }
-soi_at_start = { SOI ~ string }
-repeat_mutate_stack = { (PUSH('a'..'c') ~ ",")* ~ POP ~ POP ~ POP }
-peek_ = { PUSH(range) ~ PUSH(range) ~ PEEK ~ PEEK }
-peek_all = { PUSH(range) ~ PUSH(range) ~ PEEK_ALL }
-peek_slice_23 = { PUSH(range) ~ PUSH(range) ~ PUSH(range) ~ PUSH(range) ~ PUSH(range) ~ PEEK[1..-2] }
-pop_ = { PUSH(range) ~ PUSH(range) ~ POP ~ POP }
-pop_all = { PUSH(range) ~ PUSH(range) ~ POP_ALL }
-pop_fail = { PUSH(range) ~ !POP ~ range ~ POP }
-checkpoint_restore = ${
-		PUSH("") ~ (PUSH("a") ~ "b" ~ POP | DROP ~ "b" | POP ~ "a") ~ EOI
-}
-ascii_digits = { ASCII_DIGIT+ }
-ascii_nonzero_digits = { ASCII_NONZERO_DIGIT+ }
-ascii_bin_digits = { ASCII_BIN_DIGIT+ }
-ascii_oct_digits = { ASCII_OCT_DIGIT+ }
-ascii_hex_digits = { ASCII_HEX_DIGIT+ }
-ascii_alpha_lowers = { ASCII_ALPHA_LOWER+ }
-ascii_alpha_uppers = { ASCII_ALPHA_UPPER+ }
-ascii_alphas = { ASCII_ALPHA+ }
-ascii_alphanumerics = { ASCII_ALPHANUMERIC+ }
-asciis = { ASCII+ }
-newline = { NEWLINE+ }
-unicode = { XID_START ~ XID_CONTINUE* }
-SYMBOL = { "shadows builtin" }
-
-WHITESPACE = _{ " " }
-COMMENT = _{ "$"+ }
-
-// Line comment
-
-/* 1-line multiline comment */
-
-/*
-	N-line multiline comment
-*/
-
-/*
-	// Line comment inside multiline
-
-	/*
-		(Multiline inside) multiline
-	*/
-
-	Invalid segment of grammar below (repeated rule)
-
-	WHITESPACE = _{ "hi" }
-*/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/grammar.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/grammar.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/grammar.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/grammar.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,951 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#[macro_use]
-extern crate pest;
-#[macro_use]
-extern crate pest_derive;
-
-#[derive(Parser)]
-#[grammar = "../tests/grammar.pest"]
-struct GrammarParser;
-
-#[test]
-fn string() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::string,
-        tokens: [
-            string(0, 3)
-        ]
-    };
-}
-
-#[test]
-fn insensitive() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "aBC",
-        rule: Rule::insensitive,
-        tokens: [
-            insensitive(0, 3)
-        ]
-    };
-}
-
-#[test]
-fn range() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "6",
-        rule: Rule::range,
-        tokens: [
-            range(0, 1)
-        ]
-    };
-}
-
-#[test]
-fn ident() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::ident,
-        tokens: [
-            ident(0, 3, [
-                string(0, 3)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn pos_pred() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::pos_pred,
-        tokens: [
-            pos_pred(0, 0)
-        ]
-    };
-}
-
-#[test]
-fn neg_pred() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "",
-        rule: Rule::neg_pred,
-        tokens: [
-            neg_pred(0, 0)
-        ]
-    };
-}
-
-#[test]
-fn double_neg_pred() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::double_neg_pred,
-        tokens: [
-            double_neg_pred(0, 0)
-        ]
-    };
-}
-
-#[test]
-fn sequence() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc   abc",
-        rule: Rule::sequence,
-        tokens: [
-            sequence(0, 9, [
-                string(0, 3),
-                string(6, 9)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn sequence_compound() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::sequence_compound,
-        tokens: [
-            sequence_compound(0, 6, [
-                string(0, 3),
-                string(3, 6)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn sequence_atomic() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::sequence_atomic,
-        tokens: [
-            sequence_atomic(0, 6)
-        ]
-    };
-}
-
-#[test]
-fn sequence_non_atomic() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc   abc",
-        rule: Rule::sequence_non_atomic,
-        tokens: [
-            sequence_non_atomic(0, 9, [
-                sequence(0, 9, [
-                    string(0, 3),
-                    string(6, 9)
-                ])
-            ])
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn sequence_atomic_space() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::sequence_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-fn sequence_atomic_compound() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::sequence_atomic_compound,
-        tokens: [
-            sequence_atomic_compound(0, 6, [
-                sequence_compound(0, 6, [
-                    string(0, 3),
-                    string(3, 6)
-                ])
-            ])
-        ]
-    };
-}
-
-#[test]
-fn sequence_compound_nested() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::sequence_compound_nested,
-        tokens: [
-            sequence_compound_nested(0, 6, [
-                sequence_nested(0, 6, [
-                    string(0, 3),
-                    string(3, 6)
-                ])
-            ])
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn sequence_compound_nested_space() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::sequence_compound_nested,
-        tokens: []
-    };
-}
-
-#[test]
-fn choice_string() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::choice,
-        tokens: [
-            choice(0, 3, [
-                string(0, 3)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn choice_range() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "0",
-        rule: Rule::choice,
-        tokens: [
-            choice(0, 1, [
-                range(0, 1)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn optional_string() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::optional,
-        tokens: [
-            optional(0, 3, [
-                string(0, 3)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn optional_empty() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "",
-        rule: Rule::optional,
-        tokens: [
-            optional(0, 0)
-        ]
-    };
-}
-
-#[test]
-fn repeat_empty() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "",
-        rule: Rule::repeat,
-        tokens: [
-            repeat(0, 0)
-        ]
-    };
-}
-
-#[test]
-fn repeat_strings() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc   abc",
-        rule: Rule::repeat,
-        tokens: [
-            repeat(0, 9, [
-                string(0, 3),
-                string(6, 9)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn repeat_atomic_empty() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "",
-        rule: Rule::repeat_atomic,
-        tokens: [
-            repeat_atomic(0, 0)
-        ]
-    };
-}
-
-#[test]
-fn repeat_atomic_strings() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::repeat_atomic,
-        tokens: [
-            repeat_atomic(0, 6)
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_atomic_space() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_once_empty() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "",
-        rule: Rule::repeat_once,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_once_strings() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc   abc",
-        rule: Rule::repeat_once,
-        tokens: [
-            repeat_once(0, 9, [
-                string(0, 3),
-                string(6, 9)
-            ])
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_once_atomic_empty() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "",
-        rule: Rule::repeat_once_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_once_atomic_strings() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::repeat_once_atomic,
-        tokens: [
-            repeat_once_atomic(0, 6)
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_once_atomic_space() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_once_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_min_max_twice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_min_max,
-        tokens: [
-            repeat_min_max(0, 7, [
-                string(0, 3),
-                string(4, 7)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn repeat_min_max_thrice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc abc",
-        rule: Rule::repeat_min_max,
-        tokens: [
-            repeat_min_max(0, 11, [
-                string(0, 3),
-                string(4, 7),
-                string(8, 11)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn repeat_min_max_atomic_twice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::repeat_min_max_atomic,
-        tokens: [
-            repeat_min_max_atomic(0, 6)
-        ]
-    };
-}
-
-#[test]
-fn repeat_min_max_atomic_thrice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabcabc",
-        rule: Rule::repeat_min_max_atomic,
-        tokens: [
-            repeat_min_max_atomic(0, 9)
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_min_max_atomic_space() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_min_max_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_exact() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_exact,
-        tokens: [
-            repeat_exact(0, 7, [
-                string(0, 3),
-                string(4, 7)
-            ])
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_min_once() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::repeat_min,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_min_twice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_min,
-        tokens: [
-            repeat_min(0, 7, [
-                string(0, 3),
-                string(4, 7)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn repeat_min_thrice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc  abc",
-        rule: Rule::repeat_min,
-        tokens: [
-            repeat_min(0, 12, [
-                string(0, 3),
-                string(4, 7),
-                string(9, 12)
-            ])
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_min_atomic_once() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::repeat_min_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_min_atomic_twice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::repeat_min_atomic,
-        tokens: [
-            repeat_min_atomic(0, 6)
-        ]
-    };
-}
-
-#[test]
-fn repeat_min_atomic_thrice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabcabc",
-        rule: Rule::repeat_min_atomic,
-        tokens: [
-            repeat_min_atomic(0, 9)
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_min_atomic_space() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_min_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_max_once() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::repeat_max,
-        tokens: [
-            repeat_max(0, 3, [
-                string(0, 3)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn repeat_max_twice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_max,
-        tokens: [
-            repeat_max(0, 7, [
-                string(0, 3),
-                string(4, 7)
-            ])
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_max_thrice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_max,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_max_atomic_once() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::repeat_max_atomic,
-        tokens: [
-            repeat_max_atomic(0, 3)
-        ]
-    };
-}
-
-#[test]
-fn repeat_max_atomic_twice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabc",
-        rule: Rule::repeat_max_atomic,
-        tokens: [
-            repeat_max_atomic(0, 6)
-        ]
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_max_atomic_thrice() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abcabcabc",
-        rule: Rule::repeat_max_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-#[should_panic]
-fn repeat_max_atomic_space() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc abc",
-        rule: Rule::repeat_max_atomic,
-        tokens: []
-    };
-}
-
-#[test]
-fn repeat_comment() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc$$$ $$$abc",
-        rule: Rule::repeat_once,
-        tokens: [
-            repeat_once(0, 13, [
-                string(0, 3),
-                string(10, 13)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn soi_at_start() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "abc",
-        rule: Rule::soi_at_start,
-        tokens: [
-            soi_at_start(0, 3, [
-                string(0, 3)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn peek() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "0111",
-        rule: Rule::peek_,
-        tokens: [
-            peek_(0, 4, [
-                range(0, 1),
-                range(1, 2)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn peek_all() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "0110",
-        rule: Rule::peek_all,
-        tokens: [
-            peek_all(0, 4, [
-                range(0, 1),
-                range(1, 2)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn peek_slice_23() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "0123412",
-        rule: Rule::peek_slice_23,
-        tokens: [
-            peek_slice_23(0, 7, [
-                range(0, 1),
-                range(1, 2),
-                range(2, 3),
-                range(3, 4),
-                range(4, 5),
-            ])
-        ]
-    };
-}
-
-#[test]
-fn pop() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "0110",
-        rule: Rule::pop_,
-        tokens: [
-            pop_(0, 4, [
-                range(0, 1),
-                range(1, 2)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn pop_all() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "0110",
-        rule: Rule::pop_all,
-        tokens: [
-            pop_all(0, 4, [
-                range(0, 1),
-                range(1, 2)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn pop_fail() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "010",
-        rule: Rule::pop_fail,
-        tokens: [
-            pop_fail(0, 3, [
-                range(0, 1),
-                range(1, 2)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn repeat_mutate_stack() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "a,b,c,cba",
-        rule: Rule::repeat_mutate_stack,
-        tokens: [
-            repeat_mutate_stack(0, 9)
-        ]
-    };
-}
-
-#[test]
-fn checkpoint_restore() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "a",
-        rule: Rule::checkpoint_restore,
-        tokens: [
-            checkpoint_restore(0, 1, [EOI(1, 1)])
-        ]
-    };
-}
-
-#[test]
-fn ascii_digits() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "6",
-        rule: Rule::ascii_digits,
-        tokens: [
-            ascii_digits(0, 1)
-        ]
-    };
-}
-
-#[test]
-fn ascii_nonzero_digits() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "5",
-        rule: Rule::ascii_nonzero_digits,
-        tokens: [
-            ascii_nonzero_digits(0, 1)
-        ]
-    };
-}
-
-#[test]
-fn ascii_bin_digits() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "1",
-        rule: Rule::ascii_bin_digits,
-        tokens: [
-            ascii_bin_digits(0, 1)
-        ]
-    };
-}
-
-#[test]
-fn ascii_oct_digits() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "3",
-        rule: Rule::ascii_oct_digits,
-        tokens: [
-            ascii_oct_digits(0, 1)
-        ]
-    };
-}
-
-#[test]
-fn ascii_hex_digits() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "6bC",
-        rule: Rule::ascii_hex_digits,
-        tokens: [
-            ascii_hex_digits(0, 3)
-        ]
-    };
-}
-
-#[test]
-fn ascii_alpha_lowers() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "a",
-        rule: Rule::ascii_alpha_lowers,
-        tokens: [
-            ascii_alpha_lowers(0, 1)
-        ]
-    };
-}
-
-#[test]
-fn ascii_alpha_uppers() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "K",
-        rule: Rule::ascii_alpha_uppers,
-        tokens: [
-            ascii_alpha_uppers(0, 1)
-        ]
-    };
-}
-
-#[test]
-fn ascii_alphas() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "wF",
-        rule: Rule::ascii_alphas,
-        tokens: [
-            ascii_alphas(0, 2)
-        ]
-    };
-}
-
-#[test]
-fn ascii_alphanumerics() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "4jU",
-        rule: Rule::ascii_alphanumerics,
-        tokens: [
-            ascii_alphanumerics(0, 3)
-        ]
-    };
-}
-
-#[test]
-fn asciis() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "x02",
-        rule: Rule::asciis,
-        tokens: [
-            asciis(0, 3)
-        ]
-    };
-}
-
-#[test]
-fn newline() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "\n\r\n\r",
-        rule: Rule::newline,
-        tokens: [
-            newline(0, 4)
-        ]
-    };
-}
-
-#[test]
-fn unicode() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "نامهای",
-        rule: Rule::unicode,
-        tokens: [
-            unicode(0, 12)
-        ]
-    }
-}
-
-#[test]
-fn shadowing() {
-    parses_to! {
-        parser: GrammarParser,
-        input: "shadows builtin",
-        rule: Rule::SYMBOL,
-        tokens: [
-            SYMBOL(0, 15)
-        ]
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/lists.pest thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/lists.pest
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/lists.pest	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/lists.pest	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-item = { (!"\n" ~ ANY)* }
-
-lists        = _{ lines ~ EOI }
-lines        = _{ top_first ~ ("\n" ~ top_continue)* }
-top_first    = _{ "- " ~ item ~ ("\n" ~ children)? }
-top_continue = _{ PEEK_ALL ~ "- " ~ item ~ ("\n" ~ children)? }
-
-indentation = _{ (" " | "\t")+ }
-children    =  { PEEK_ALL ~ PUSH(indentation) ~ lines ~ DROP }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/lists.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/lists.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/lists.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/lists.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#[macro_use]
-extern crate pest;
-#[macro_use]
-extern crate pest_derive;
-
-#[derive(Parser)]
-#[grammar = "../tests/lists.pest"]
-struct ListsParser;
-
-#[test]
-fn item() {
-    parses_to! {
-        parser: ListsParser,
-        input: "- a",
-        rule: Rule::lists,
-        tokens: [
-            item(2, 3)
-        ]
-    };
-}
-
-#[test]
-fn items() {
-    parses_to! {
-        parser: ListsParser,
-        input: "- a\n- b",
-        rule: Rule::lists,
-        tokens: [
-            item(2, 3),
-            item(6, 7)
-        ]
-    };
-}
-
-#[test]
-fn children() {
-    parses_to! {
-        parser: ListsParser,
-        input: "  - b",
-        rule: Rule::children,
-        tokens: [
-            children(0, 5, [
-                item(4, 5)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn nested_item() {
-    parses_to! {
-        parser: ListsParser,
-        input: "- a\n  - b",
-        rule: Rule::lists,
-        tokens: [
-            item(2, 3),
-            children(4, 9, [
-                item(8, 9)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn nested_items() {
-    parses_to! {
-        parser: ListsParser,
-        input: "- a\n  - b\n  - c",
-        rule: Rule::lists,
-        tokens: [
-            item(2, 3),
-            children(4, 15, [
-                item(8, 9),
-                item(14, 15)
-            ])
-        ]
-    };
-}
-
-#[test]
-fn nested_two_levels() {
-    parses_to! {
-        parser: ListsParser,
-        input: "- a\n  - b\n    - c",
-        rule: Rule::lists,
-        tokens: [
-            item(2, 3),
-            children(4, 17, [
-                item(8, 9),
-                children(10, 17, [
-                    item(16, 17)
-                ])
-            ])
-        ]
-    };
-}
-
-#[test]
-fn nested_then_not() {
-    parses_to! {
-        parser: ListsParser,
-        input: "- a\n  - b\n- c",
-        rule: Rule::lists,
-        tokens: [
-            item(2, 3),
-            children(4, 9, [
-                item(8, 9)
-            ]),
-            item(12, 13)
-        ]
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/reporting.pest thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/reporting.pest
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/reporting.pest	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/reporting.pest	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-a = { "a" }
-b = { "b" }
-c = { "c" }
-d = { ANY }
-
-choices = _{ a | b | c }
-choices_no_progress = { a | b | c }
-choices_a_progress = { a ~ a | b | c }
-choices_b_progress = { a | b ~ b | c }
-
-level1 = _{ level2 }
-level2 = _{ a | b | c }
-
-negative = _{ !d }
-negative_match = _{ !a ~ b }
-mixed = _{ !d | a }
-mixed_progress = _{ (!d | a | b) ~ a }
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/reporting.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/reporting.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_derive/tests/reporting.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_derive/tests/reporting.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#[macro_use]
-extern crate pest;
-#[macro_use]
-extern crate pest_derive;
-
-#[derive(Parser)]
-#[grammar = "../tests/reporting.pest"]
-struct ReportingParser;
-
-#[test]
-fn choices() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "x",
-        rule: Rule::choices,
-        positives: vec![Rule::a, Rule::b, Rule::c],
-        negatives: vec![],
-        pos: 0
-    };
-}
-
-#[test]
-fn choices_no_progress() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "x",
-        rule: Rule::choices_no_progress,
-        positives: vec![Rule::choices_no_progress],
-        negatives: vec![],
-        pos: 0
-    };
-}
-
-#[test]
-fn choices_a_progress() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "a",
-        rule: Rule::choices_a_progress,
-        positives: vec![Rule::a],
-        negatives: vec![],
-        pos: 1
-    };
-}
-
-#[test]
-fn choices_b_progress() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "b",
-        rule: Rule::choices_b_progress,
-        positives: vec![Rule::b],
-        negatives: vec![],
-        pos: 1
-    };
-}
-
-#[test]
-fn nested() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "x",
-        rule: Rule::level1,
-        positives: vec![Rule::a, Rule::b, Rule::c],
-        negatives: vec![],
-        pos: 0
-    };
-}
-
-#[test]
-fn negative() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "x",
-        rule: Rule::negative,
-        positives: vec![],
-        negatives: vec![Rule::d],
-        pos: 0
-    };
-}
-
-#[test]
-fn negative_match() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "x",
-        rule: Rule::negative_match,
-        positives: vec![Rule::b],
-        negatives: vec![],
-        pos: 0
-    };
-}
-
-#[test]
-fn mixed() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "x",
-        rule: Rule::mixed,
-        positives: vec![Rule::a],
-        negatives: vec![Rule::d],
-        pos: 0
-    };
-}
-
-#[test]
-fn mixed_progress() {
-    fails_with! {
-        parser: ReportingParser,
-        input: "b",
-        rule: Rule::mixed_progress,
-        positives: vec![Rule::a],
-        negatives: vec![],
-        pos: 1
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"0f2f8b8f880c20e4281e53b2675356ee672d7c04b015f4c182509ed2ca614e6e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","_README.md":"e9901b6c4d50403bfda7e08a92b5c395a8c51eba868c7bd07b03e00ccba702f3","src/generator.rs":"7b0b67ec000ccde0ec8df83b26f84e0a7b2a17e255e900ab28379984e7dbba27","src/lib.rs":"1cc63047aad721587a23eeea54d4c398bf5c085d934e41100a8766954a1b6071","src/macros.rs":"03ae0a9ec0210b19c8e6becc275df11b504003d22f3ff758d8bf3ee997d2b476"},"package":"99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "pest_generator"
-version = "2.1.3"
-authors = ["DragoÈ™ Tiselice <dragostiselice@gmail.com>"]
-description = "pest code generator"
-homepage = "https://pest-parser.github.io/"
-documentation = "https://docs.rs/pest"
-readme = "_README.md"
-keywords = ["pest", "generator"]
-categories = ["parsing"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/pest-parser/pest"
-[dependencies.pest]
-version = "2.1.0"
-
-[dependencies.pest_meta]
-version = "2.1.0"
-
-[dependencies.proc-macro2]
-version = "1.0"
-
-[dependencies.quote]
-version = "1.0"
-
-[dependencies.syn]
-version = "1.0"
-[badges.codecov]
-repository = "pest-parser/pest"
-
-[badges.maintenance]
-status = "actively-developed"
-
-[badges.travis-ci]
-repository = "pest-parser/pest"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/_README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/_README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/_README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/_README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-<p align="center">
-  <img src="https://raw.github.com/pest-parser/pest/master/pest-logo.svg?sanitize=true" width="80%"/>
-</p>
-
-# pest. The Elegant Parser
-
-[![Join the chat at https://gitter.im/dragostis/pest](https://badges.gitter.im/dragostis/pest.svg)](https://gitter.im/dragostis/pest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Book](https://img.shields.io/badge/book-WIP-4d76ae.svg)](https://pest-parser.github.io/book)
-[![Docs](https://docs.rs/pest/badge.svg)](https://docs.rs/pest)
-
-[![Build Status](https://travis-ci.org/pest-parser/pest.svg?branch=master)](https://travis-ci.org/pest-parser/pest)
-[![codecov](https://codecov.io/gh/pest-parser/pest/branch/master/graph/badge.svg)](https://codecov.io/gh/pest-parser/pest)
-[![Fuzzit Status](https://app.fuzzit.dev/badge?org_id=pest-parser)](https://app.fuzzit.dev/orgs/pest-parser/dashboard)
-[![Crates.io](https://img.shields.io/crates/d/pest.svg)](https://crates.io/crates/pest)
-[![Crates.io](https://img.shields.io/crates/v/pest.svg)](https://crates.io/crates/pest)
-
-pest is a general purpose parser written in Rust with a focus on accessibility,
-correctness, and performance. It uses parsing expression grammars
-(or [PEG]) as input, which are similar in spirit to regular expressions, but
-which offer the enhanced expressivity needed to parse complex languages.
-
-[PEG]: https://en.wikipedia.org/wiki/Parsing_expression_grammar
-
-## Getting started
-
-The recommended way to start parsing with pest is to read the official [book].
-
-Other helpful resources:
-
-* API reference on [docs.rs]
-* play with grammars and share them on our [fiddle]
-* leave feedback, ask questions, or greet us on [Gitter]
-
-[book]: https://pest-parser.github.io/book
-[docs.rs]: https://docs.rs/pest
-[fiddle]: https://pest-parser.github.io/#editor
-[Gitter]: https://gitter.im/dragostis/pest
-
-## Example
-
-The following is an example of a grammar for a list of alpha-numeric identifiers
-where the first identifier does not start with a digit:
-
-```rust
-alpha = { 'a'..'z' | 'A'..'Z' }
-digit = { '0'..'9' }
-
-ident = { (alpha | digit)+ }
-
-ident_list = _{ !digit ~ ident ~ (" " ~ ident)+ }
-          // ^
-          // ident_list rule is silent which means it produces no tokens
-```
-
-Grammars are saved in separate .pest files which are never mixed with procedural
-code. This results in an always up-to-date formalization of a language that is
-easy to read and maintain.
-
-## Meaningful error reporting
-
-Based on the grammar definition, the parser also includes automatic error
-reporting. For the example above, the input `"123"` will result in:
-
-```
-thread 'main' panicked at ' --> 1:1
-  |
-1 | 123
-  | ^---
-  |
-  = unexpected digit', src/main.rs:12
-```
-while `"ab *"` will result in:
-```
-thread 'main' panicked at ' --> 1:1
-  |
-1 | ab *
-  |    ^---
-  |
-  = expected ident', src/main.rs:12
-```
-
-## Pairs API
-
-The grammar can be used to derive a `Parser` implementation automatically.
-Parsing returns an iterator of nested token pairs:
-
-```rust
-extern crate pest;
-#[macro_use]
-extern crate pest_derive;
-
-use pest::Parser;
-
-#[derive(Parser)]
-#[grammar = "ident.pest"]
-struct IdentParser;
-
-fn main() {
-    let pairs = IdentParser::parse(Rule::ident_list, "a1 b2").unwrap_or_else(|e| panic!("{}", e));
-
-    // Because ident_list is silent, the iterator will contain idents
-    for pair in pairs {
-        // A pair is a combination of the rule which matched and a span of input
-        println!("Rule:    {:?}", pair.as_rule());
-        println!("Span:    {:?}", pair.as_span());
-        println!("Text:    {}", pair.as_str());
-
-        // A pair can be converted to an iterator of the tokens which make it up:
-        for inner_pair in pair.into_inner() {
-            match inner_pair.as_rule() {
-                Rule::alpha => println!("Letter:  {}", inner_pair.as_str()),
-                Rule::digit => println!("Digit:   {}", inner_pair.as_str()),
-                _ => unreachable!()
-            };
-        }
-    }
-}
-```
-
-This produces the following output:
-```
-Rule:    ident
-Span:    Span { start: 0, end: 2 }
-Text:    a1
-Letter:  a
-Digit:   1
-Rule:    ident
-Span:    Span { start: 3, end: 5 }
-Text:    b2
-Letter:  b
-Digit:   2
-```
-
-## Other features
-
-* Precedence climbing
-* Input handling
-* Custom errors
-* Runs on stable Rust
-
-## Projects using pest
-
-* [pest_meta](https://github.com/pest-parser/pest/blob/master/meta/src/grammar.pest) (bootstrapped)
-* [AshPaper](https://github.com/shnewto/ashpaper)
-* [brain](https://github.com/brain-lang/brain)
-* [Chelone](https://github.com/Aaronepower/chelone)
-* [comrak](https://github.com/kivikakk/comrak)
-* [elastic-rs](https://github.com/cch123/elastic-rs)
-* [graphql-parser](https://github.com/Keats/graphql-parser)
-* [handlebars-rust](https://github.com/sunng87/handlebars-rust)
-* [hexdino](https://github.com/Luz/hexdino)
-* [Huia](https://gitlab.com/jimsy/huia/)
-* [jql](https://github.com/yamafaktory/jql)
-* [json5-rs](https://github.com/callum-oakley/json5-rs)
-* [mt940](https://github.com/svenstaro/mt940-rs)
-* [py_literal](https://github.com/jturner314/py_literal)
-* [rouler](https://github.com/jarcane/rouler)
-* [RuSh](https://github.com/lwandrebeck/RuSh)
-* [rs_pbrt](https://github.com/wahn/rs_pbrt)
-* [stache](https://github.com/dgraham/stache)
-* [tera](https://github.com/Keats/tera)
-* [ui_gen](https://github.com/emoon/ui_gen)
-* [ukhasnet-parser](https://github.com/adamgreig/ukhasnet-parser)
-* [ZoKrates](https://github.com/ZoKrates/ZoKrates)
-
-## Special thanks
-
-A special round of applause goes to prof. Marius Minea for his guidance and all
-pest contributors, some of which being none other than my friends.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/src/generator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/src/generator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/src/generator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/src/generator.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1002 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::path::PathBuf;
-
-use proc_macro2::{Span, TokenStream};
-use quote::{ToTokens, TokenStreamExt};
-use syn::{self, Generics, Ident};
-
-use pest_meta::ast::*;
-use pest_meta::optimizer::*;
-use pest_meta::UNICODE_PROPERTY_NAMES;
-
-#[allow(clippy::needless_pass_by_value)]
-pub fn generate(
-    name: Ident,
-    generics: &Generics,
-    path: Option<PathBuf>,
-    rules: Vec<OptimizedRule>,
-    defaults: Vec<&str>,
-    include_grammar: bool,
-) -> TokenStream {
-    let uses_eoi = defaults.iter().any(|name| *name == "EOI");
-
-    let builtins = generate_builtin_rules();
-    let include_fix = if include_grammar {
-        match path {
-            Some(ref path) => generate_include(&name, path.to_str().expect("non-Unicode path")),
-            None => quote!(),
-        }
-    } else {
-        quote!()
-    };
-    let rule_enum = generate_enum(&rules, uses_eoi);
-    let patterns = generate_patterns(&rules, uses_eoi);
-    let skip = generate_skip(&rules);
-
-    let mut rules: Vec<_> = rules.into_iter().map(generate_rule).collect();
-    rules.extend(builtins.into_iter().filter_map(|(builtin, tokens)| {
-        if defaults.contains(&builtin) {
-            Some(tokens)
-        } else {
-            None
-        }
-    }));
-
-    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-
-    let parser_impl = quote! {
-        #[allow(clippy::all)]
-        impl #impl_generics ::pest::Parser<Rule> for #name #ty_generics #where_clause {
-            fn parse<'i>(
-                rule: Rule,
-                input: &'i str
-            ) -> ::std::result::Result<
-                ::pest::iterators::Pairs<'i, Rule>,
-                ::pest::error::Error<Rule>
-            > {
-                mod rules {
-                    pub mod hidden {
-                        use super::super::Rule;
-                        #skip
-                    }
-
-                    pub mod visible {
-                        use super::super::Rule;
-                        #( #rules )*
-                    }
-
-                    pub use self::visible::*;
-                }
-
-                ::pest::state(input, |state| {
-                    match rule {
-                        #patterns
-                    }
-                })
-            }
-        }
-    };
-
-    quote! {
-        #include_fix
-        #rule_enum
-        #parser_impl
-    }
-}
-
-// Note: All builtin rules should be validated as pest builtins in meta/src/validator.rs.
-// Some should also be keywords.
-fn generate_builtin_rules() -> Vec<(&'static str, TokenStream)> {
-    let mut builtins = Vec::new();
-
-    insert_builtin!(builtins, ANY, state.skip(1));
-    insert_public_builtin!(
-        builtins,
-        EOI,
-        state.rule(Rule::EOI, |state| state.end_of_input())
-    );
-    insert_builtin!(builtins, SOI, state.start_of_input());
-    insert_builtin!(builtins, PEEK, state.stack_peek());
-    insert_builtin!(builtins, PEEK_ALL, state.stack_match_peek());
-    insert_builtin!(builtins, POP, state.stack_pop());
-    insert_builtin!(builtins, POP_ALL, state.stack_match_pop());
-    insert_builtin!(builtins, DROP, state.stack_drop());
-
-    insert_builtin!(builtins, ASCII_DIGIT, state.match_range('0'..'9'));
-    insert_builtin!(builtins, ASCII_NONZERO_DIGIT, state.match_range('1'..'9'));
-    insert_builtin!(builtins, ASCII_BIN_DIGIT, state.match_range('0'..'1'));
-    insert_builtin!(builtins, ASCII_OCT_DIGIT, state.match_range('0'..'7'));
-    insert_builtin!(
-        builtins,
-        ASCII_HEX_DIGIT,
-        state
-            .match_range('0'..'9')
-            .or_else(|state| state.match_range('a'..'f'))
-            .or_else(|state| state.match_range('A'..'F'))
-    );
-    insert_builtin!(builtins, ASCII_ALPHA_LOWER, state.match_range('a'..'z'));
-    insert_builtin!(builtins, ASCII_ALPHA_UPPER, state.match_range('A'..'Z'));
-    insert_builtin!(
-        builtins,
-        ASCII_ALPHA,
-        state
-            .match_range('a'..'z')
-            .or_else(|state| state.match_range('A'..'Z'))
-    );
-    insert_builtin!(
-        builtins,
-        ASCII_ALPHANUMERIC,
-        state
-            .match_range('a'..'z')
-            .or_else(|state| state.match_range('A'..'Z'))
-            .or_else(|state| state.match_range('0'..'9'))
-    );
-    insert_builtin!(builtins, ASCII, state.match_range('\x00'..'\x7f'));
-    insert_builtin!(
-        builtins,
-        NEWLINE,
-        state
-            .match_string("\n")
-            .or_else(|state| state.match_string("\r\n"))
-            .or_else(|state| state.match_string("\r"))
-    );
-
-    for property in UNICODE_PROPERTY_NAMES {
-        let property_ident: Ident = syn::parse_str(property).unwrap();
-        // insert manually for #property substitution
-        builtins.push((property, quote! {
-            #[inline]
-            #[allow(dead_code, non_snake_case, unused_variables)]
-            fn #property_ident(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                state.match_char_by(::pest::unicode::#property_ident)
-            }
-        }));
-    }
-    builtins
-}
-
-// Needed because Cargo doesn't watch for changes in grammars.
-fn generate_include(name: &Ident, path: &str) -> TokenStream {
-    let const_name = Ident::new(&format!("_PEST_GRAMMAR_{}", name), Span::call_site());
-    // Need to make this relative to the current directory since the path to the file
-    // is derived from the CARGO_MANIFEST_DIR environment variable
-    let mut current_dir = std::env::current_dir().expect("Unable to get current directory");
-    current_dir.push(path);
-    let relative_path = current_dir.to_str().expect("path contains invalid unicode");
-    quote! {
-        #[allow(non_upper_case_globals)]
-        const #const_name: &'static str = include_str!(#relative_path);
-    }
-}
-
-fn generate_enum(rules: &[OptimizedRule], uses_eoi: bool) -> TokenStream {
-    let rules = rules
-        .iter()
-        .map(|rule| Ident::new(rule.name.as_str(), Span::call_site()));
-    if uses_eoi {
-        quote! {
-            #[allow(dead_code, non_camel_case_types)]
-            #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-            pub enum Rule {
-                EOI,
-                #( #rules ),*
-            }
-        }
-    } else {
-        quote! {
-            #[allow(dead_code, non_camel_case_types)]
-            #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-            pub enum Rule {
-                #( #rules ),*
-            }
-        }
-    }
-}
-
-fn generate_patterns(rules: &[OptimizedRule], uses_eoi: bool) -> TokenStream {
-    let mut rules: Vec<TokenStream> = rules
-        .iter()
-        .map(|rule| {
-            let rule = Ident::new(rule.name.as_str(), Span::call_site());
-            quote! {
-                Rule::#rule => rules::#rule(state)
-            }
-        })
-        .collect();
-
-    if uses_eoi {
-        rules.push(quote! {
-            Rule::EOI => rules::EOI(state)
-        });
-    }
-
-    quote! {
-        #( #rules ),*
-    }
-}
-
-fn generate_rule(rule: OptimizedRule) -> TokenStream {
-    let name = Ident::new(&rule.name, Span::call_site());
-    let expr = if rule.ty == RuleType::Atomic || rule.ty == RuleType::CompoundAtomic {
-        generate_expr_atomic(rule.expr)
-    } else if name == "WHITESPACE" || name == "COMMENT" {
-        let atomic = generate_expr_atomic(rule.expr);
-
-        quote! {
-            state.atomic(::pest::Atomicity::Atomic, |state| {
-                #atomic
-            })
-        }
-    } else {
-        generate_expr(rule.expr)
-    };
-
-    match rule.ty {
-        RuleType::Normal => quote! {
-            #[inline]
-            #[allow(non_snake_case, unused_variables)]
-            pub fn #name(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                state.rule(Rule::#name, |state| {
-                    #expr
-                })
-            }
-        },
-        RuleType::Silent => quote! {
-            #[inline]
-            #[allow(non_snake_case, unused_variables)]
-            pub fn #name(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                #expr
-            }
-        },
-        RuleType::Atomic => quote! {
-            #[inline]
-            #[allow(non_snake_case, unused_variables)]
-            pub fn #name(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                state.rule(Rule::#name, |state| {
-                    state.atomic(::pest::Atomicity::Atomic, |state| {
-                        #expr
-                    })
-                })
-            }
-        },
-        RuleType::CompoundAtomic => quote! {
-            #[inline]
-            #[allow(non_snake_case, unused_variables)]
-            pub fn #name(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                state.atomic(::pest::Atomicity::CompoundAtomic, |state| {
-                    state.rule(Rule::#name, |state| {
-                        #expr
-                    })
-                })
-            }
-        },
-        RuleType::NonAtomic => quote! {
-            #[inline]
-            #[allow(non_snake_case, unused_variables)]
-            pub fn #name(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                state.atomic(::pest::Atomicity::NonAtomic, |state| {
-                    state.rule(Rule::#name, |state| {
-                        #expr
-                    })
-                })
-            }
-        },
-    }
-}
-
-fn generate_skip(rules: &[OptimizedRule]) -> TokenStream {
-    let whitespace = rules.iter().any(|rule| rule.name == "WHITESPACE");
-    let comment = rules.iter().any(|rule| rule.name == "COMMENT");
-
-    match (whitespace, comment) {
-        (false, false) => generate_rule!(skip, Ok(state)),
-        (true, false) => generate_rule!(
-            skip,
-            if state.atomicity() == ::pest::Atomicity::NonAtomic {
-                state.repeat(|state| super::visible::WHITESPACE(state))
-            } else {
-                Ok(state)
-            }
-        ),
-        (false, true) => generate_rule!(
-            skip,
-            if state.atomicity() == ::pest::Atomicity::NonAtomic {
-                state.repeat(|state| super::visible::COMMENT(state))
-            } else {
-                Ok(state)
-            }
-        ),
-        (true, true) => generate_rule!(
-            skip,
-            if state.atomicity() == ::pest::Atomicity::NonAtomic {
-                state.sequence(|state| {
-                    state
-                        .repeat(|state| super::visible::WHITESPACE(state))
-                        .and_then(|state| {
-                            state.repeat(|state| {
-                                state.sequence(|state| {
-                                    super::visible::COMMENT(state).and_then(|state| {
-                                        state.repeat(|state| super::visible::WHITESPACE(state))
-                                    })
-                                })
-                            })
-                        })
-                })
-            } else {
-                Ok(state)
-            }
-        ),
-    }
-}
-
-fn generate_expr(expr: OptimizedExpr) -> TokenStream {
-    match expr {
-        OptimizedExpr::Str(string) => {
-            quote! {
-                state.match_string(#string)
-            }
-        }
-        OptimizedExpr::Insens(string) => {
-            quote! {
-                state.match_insensitive(#string)
-            }
-        }
-        OptimizedExpr::Range(start, end) => {
-            let start = start.chars().next().unwrap();
-            let end = end.chars().next().unwrap();
-
-            quote! {
-                state.match_range(#start..#end)
-            }
-        }
-        OptimizedExpr::Ident(ident) => {
-            let ident = Ident::new(&ident, Span::call_site());
-            quote! { self::#ident(state) }
-        }
-        OptimizedExpr::PeekSlice(start, end_) => {
-            let end = QuoteOption(end_);
-            quote! {
-                state.stack_match_peek_slice(#start, #end, ::pest::MatchDir::BottomToTop)
-            }
-        }
-        OptimizedExpr::PosPred(expr) => {
-            let expr = generate_expr(*expr);
-
-            quote! {
-                state.lookahead(true, |state| {
-                    #expr
-                })
-            }
-        }
-        OptimizedExpr::NegPred(expr) => {
-            let expr = generate_expr(*expr);
-
-            quote! {
-                state.lookahead(false, |state| {
-                    #expr
-                })
-            }
-        }
-        OptimizedExpr::Seq(lhs, rhs) => {
-            let head = generate_expr(*lhs);
-            let mut tail = vec![];
-            let mut current = *rhs;
-
-            while let OptimizedExpr::Seq(lhs, rhs) = current {
-                tail.push(generate_expr(*lhs));
-                current = *rhs;
-            }
-            tail.push(generate_expr(current));
-
-            quote! {
-                state.sequence(|state| {
-                    #head
-                    #(
-                        .and_then(|state| {
-                            super::hidden::skip(state)
-                        }).and_then(|state| {
-                            #tail
-                        })
-                    )*
-                })
-            }
-        }
-        OptimizedExpr::Choice(lhs, rhs) => {
-            let head = generate_expr(*lhs);
-            let mut tail = vec![];
-            let mut current = *rhs;
-
-            while let OptimizedExpr::Choice(lhs, rhs) = current {
-                tail.push(generate_expr(*lhs));
-                current = *rhs;
-            }
-            tail.push(generate_expr(current));
-
-            quote! {
-                #head
-                #(
-                    .or_else(|state| {
-                        #tail
-                    })
-                )*
-            }
-        }
-        OptimizedExpr::Opt(expr) => {
-            let expr = generate_expr(*expr);
-
-            quote! {
-                state.optional(|state| {
-                    #expr
-                })
-            }
-        }
-        OptimizedExpr::Rep(expr) => {
-            let expr = generate_expr(*expr);
-
-            quote! {
-                state.sequence(|state| {
-                    state.optional(|state| {
-                        #expr.and_then(|state| {
-                            state.repeat(|state| {
-                                state.sequence(|state| {
-                                    super::hidden::skip(
-                                        state
-                                    ).and_then(|state| {
-                                        #expr
-                                    })
-                                })
-                            })
-                        })
-                    })
-                })
-            }
-        }
-        OptimizedExpr::Skip(strings) => {
-            quote! {
-                let strings = [#(#strings),*];
-
-                state.skip_until(&strings)
-            }
-        }
-        OptimizedExpr::Push(expr) => {
-            let expr = generate_expr(*expr);
-
-            quote! {
-                state.stack_push(|state| #expr)
-            }
-        }
-        OptimizedExpr::RestoreOnErr(expr) => {
-            let expr = generate_expr(*expr);
-
-            quote! {
-                state.restore_on_err(|state| #expr)
-            }
-        }
-    }
-}
-
-fn generate_expr_atomic(expr: OptimizedExpr) -> TokenStream {
-    match expr {
-        OptimizedExpr::Str(string) => {
-            quote! {
-                state.match_string(#string)
-            }
-        }
-        OptimizedExpr::Insens(string) => {
-            quote! {
-                state.match_insensitive(#string)
-            }
-        }
-        OptimizedExpr::Range(start, end) => {
-            let start = start.chars().next().unwrap();
-            let end = end.chars().next().unwrap();
-
-            quote! {
-                state.match_range(#start..#end)
-            }
-        }
-        OptimizedExpr::Ident(ident) => {
-            let ident = Ident::new(&ident, Span::call_site());
-            quote! { self::#ident(state) }
-        }
-        OptimizedExpr::PeekSlice(start, end_) => {
-            let end = QuoteOption(end_);
-            quote! {
-                state.stack_match_peek_slice(#start, #end, ::pest::MatchDir::BottomToTop)
-            }
-        }
-        OptimizedExpr::PosPred(expr) => {
-            let expr = generate_expr_atomic(*expr);
-
-            quote! {
-                state.lookahead(true, |state| {
-                    #expr
-                })
-            }
-        }
-        OptimizedExpr::NegPred(expr) => {
-            let expr = generate_expr_atomic(*expr);
-
-            quote! {
-                state.lookahead(false, |state| {
-                    #expr
-                })
-            }
-        }
-        OptimizedExpr::Seq(lhs, rhs) => {
-            let head = generate_expr_atomic(*lhs);
-            let mut tail = vec![];
-            let mut current = *rhs;
-
-            while let OptimizedExpr::Seq(lhs, rhs) = current {
-                tail.push(generate_expr_atomic(*lhs));
-                current = *rhs;
-            }
-            tail.push(generate_expr_atomic(current));
-
-            quote! {
-                state.sequence(|state| {
-                    #head
-                    #(
-                        .and_then(|state| {
-                            #tail
-                        })
-                    )*
-                })
-            }
-        }
-        OptimizedExpr::Choice(lhs, rhs) => {
-            let head = generate_expr_atomic(*lhs);
-            let mut tail = vec![];
-            let mut current = *rhs;
-
-            while let OptimizedExpr::Choice(lhs, rhs) = current {
-                tail.push(generate_expr_atomic(*lhs));
-                current = *rhs;
-            }
-            tail.push(generate_expr_atomic(current));
-
-            quote! {
-                #head
-                #(
-                    .or_else(|state| {
-                        #tail
-                    })
-                )*
-            }
-        }
-        OptimizedExpr::Opt(expr) => {
-            let expr = generate_expr_atomic(*expr);
-
-            quote! {
-                state.optional(|state| {
-                    #expr
-                })
-            }
-        }
-        OptimizedExpr::Rep(expr) => {
-            let expr = generate_expr_atomic(*expr);
-
-            quote! {
-                state.repeat(|state| {
-                    #expr
-                })
-            }
-        }
-        OptimizedExpr::Skip(strings) => {
-            quote! {
-                let strings = [#(#strings),*];
-
-                state.skip_until(&strings)
-            }
-        }
-        OptimizedExpr::Push(expr) => {
-            let expr = generate_expr_atomic(*expr);
-
-            quote! {
-                state.stack_push(|state| #expr)
-            }
-        }
-        OptimizedExpr::RestoreOnErr(expr) => {
-            let expr = generate_expr_atomic(*expr);
-
-            quote! {
-                state.restore_on_err(|state| #expr)
-            }
-        }
-    }
-}
-
-struct QuoteOption<T>(Option<T>);
-
-impl<T: ToTokens> ToTokens for QuoteOption<T> {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        tokens.append_all(match self.0 {
-            Some(ref t) => quote! { ::std::option::Option::Some(#t) },
-            None => quote! { ::std::option::Option::None },
-        });
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn rule_enum_simple() {
-        let rules = vec![OptimizedRule {
-            name: "f".to_owned(),
-            ty: RuleType::Normal,
-            expr: OptimizedExpr::Ident("g".to_owned()),
-        }];
-
-        assert_eq!(
-            generate_enum(&rules, false).to_string(),
-            quote! {
-                #[allow(dead_code, non_camel_case_types)]
-                #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-                pub enum Rule {
-                    f
-                }
-            }
-            .to_string()
-        );
-    }
-
-    #[test]
-    fn sequence() {
-        let expr = OptimizedExpr::Seq(
-            Box::new(OptimizedExpr::Str("a".to_owned())),
-            Box::new(OptimizedExpr::Seq(
-                Box::new(OptimizedExpr::Str("b".to_owned())),
-                Box::new(OptimizedExpr::Seq(
-                    Box::new(OptimizedExpr::Str("c".to_owned())),
-                    Box::new(OptimizedExpr::Str("d".to_owned())),
-                )),
-            )),
-        );
-
-        assert_eq!(
-            generate_expr(expr).to_string(),
-            quote! {
-                state.sequence(|state| {
-                    state.match_string("a").and_then(|state| {
-                        super::hidden::skip(state)
-                    }).and_then(|state| {
-                        state.match_string("b")
-                    }).and_then(|state| {
-                        super::hidden::skip(state)
-                    }).and_then(|state| {
-                        state.match_string("c")
-                    }).and_then(|state| {
-                        super::hidden::skip(state)
-                    }).and_then(|state| {
-                        state.match_string("d")
-                    })
-                })
-            }
-            .to_string()
-        );
-    }
-
-    #[test]
-    fn sequence_atomic() {
-        let expr = OptimizedExpr::Seq(
-            Box::new(OptimizedExpr::Str("a".to_owned())),
-            Box::new(OptimizedExpr::Seq(
-                Box::new(OptimizedExpr::Str("b".to_owned())),
-                Box::new(OptimizedExpr::Seq(
-                    Box::new(OptimizedExpr::Str("c".to_owned())),
-                    Box::new(OptimizedExpr::Str("d".to_owned())),
-                )),
-            )),
-        );
-
-        assert_eq!(
-            generate_expr_atomic(expr).to_string(),
-            quote! {
-                state.sequence(|state| {
-                    state.match_string("a").and_then(|state| {
-                        state.match_string("b")
-                    }).and_then(|state| {
-                        state.match_string("c")
-                    }).and_then(|state| {
-                        state.match_string("d")
-                    })
-                })
-            }
-            .to_string()
-        );
-    }
-
-    #[test]
-    fn choice() {
-        let expr = OptimizedExpr::Choice(
-            Box::new(OptimizedExpr::Str("a".to_owned())),
-            Box::new(OptimizedExpr::Choice(
-                Box::new(OptimizedExpr::Str("b".to_owned())),
-                Box::new(OptimizedExpr::Choice(
-                    Box::new(OptimizedExpr::Str("c".to_owned())),
-                    Box::new(OptimizedExpr::Str("d".to_owned())),
-                )),
-            )),
-        );
-
-        assert_eq!(
-            generate_expr(expr).to_string(),
-            quote! {
-                state.match_string("a").or_else(|state| {
-                    state.match_string("b")
-                }).or_else(|state| {
-                    state.match_string("c")
-                }).or_else(|state| {
-                    state.match_string("d")
-                })
-            }
-            .to_string()
-        );
-    }
-
-    #[test]
-    fn choice_atomic() {
-        let expr = OptimizedExpr::Choice(
-            Box::new(OptimizedExpr::Str("a".to_owned())),
-            Box::new(OptimizedExpr::Choice(
-                Box::new(OptimizedExpr::Str("b".to_owned())),
-                Box::new(OptimizedExpr::Choice(
-                    Box::new(OptimizedExpr::Str("c".to_owned())),
-                    Box::new(OptimizedExpr::Str("d".to_owned())),
-                )),
-            )),
-        );
-
-        assert_eq!(
-            generate_expr_atomic(expr).to_string(),
-            quote! {
-                state.match_string("a").or_else(|state| {
-                    state.match_string("b")
-                }).or_else(|state| {
-                    state.match_string("c")
-                }).or_else(|state| {
-                    state.match_string("d")
-                })
-            }
-            .to_string()
-        );
-    }
-
-    #[test]
-    fn skip() {
-        let expr = OptimizedExpr::Skip(vec!["a".to_owned(), "b".to_owned()]);
-
-        assert_eq!(
-            generate_expr_atomic(expr).to_string(),
-            quote! {
-                let strings = ["a", "b"];
-
-                state.skip_until(&strings)
-            }
-            .to_string()
-        );
-    }
-
-    #[test]
-    fn expr_complex() {
-        let expr = OptimizedExpr::Choice(
-            Box::new(OptimizedExpr::Ident("a".to_owned())),
-            Box::new(OptimizedExpr::Seq(
-                Box::new(OptimizedExpr::Range("a".to_owned(), "b".to_owned())),
-                Box::new(OptimizedExpr::Seq(
-                    Box::new(OptimizedExpr::NegPred(Box::new(OptimizedExpr::Rep(
-                        Box::new(OptimizedExpr::Insens("b".to_owned())),
-                    )))),
-                    Box::new(OptimizedExpr::PosPred(Box::new(OptimizedExpr::Opt(
-                        Box::new(OptimizedExpr::Rep(Box::new(OptimizedExpr::Choice(
-                            Box::new(OptimizedExpr::Str("c".to_owned())),
-                            Box::new(OptimizedExpr::Str("d".to_owned())),
-                        )))),
-                    )))),
-                )),
-            )),
-        );
-
-        let sequence = quote! {
-            state.sequence(|state| {
-                super::hidden::skip(state).and_then(
-                    |state| {
-                        state.match_insensitive("b")
-                    }
-                )
-            })
-        };
-        let repeat = quote! {
-            state.repeat(|state| {
-                state.sequence(|state| {
-                    super::hidden::skip(state).and_then(|state| {
-                        state.match_string("c")
-                            .or_else(|state| {
-                                state.match_string("d")
-                            })
-                     })
-                })
-            })
-        };
-        assert_eq!(
-            generate_expr(expr).to_string(),
-            quote! {
-                self::a(state).or_else(|state| {
-                    state.sequence(|state| {
-                        state.match_range('a'..'b').and_then(|state| {
-                            super::hidden::skip(state)
-                        }).and_then(|state| {
-                            state.lookahead(false, |state| {
-                                state.sequence(|state| {
-                                    state.optional(|state| {
-                                        state.match_insensitive(
-                                            "b"
-                                        ).and_then(|state| {
-                                            state.repeat(|state| {
-                                                #sequence
-                                            })
-                                        })
-                                    })
-                                })
-                            })
-                        }).and_then(|state| {
-                            super::hidden::skip(state)
-                        }).and_then(|state| {
-                            state.lookahead(true, |state| {
-                                state.optional(|state| {
-                                    state.sequence(|state| {
-                                        state.optional(|state| {
-                                            state.match_string("c")
-                                            .or_else(|state| {
-                                                state.match_string("d")
-                                            }).and_then(|state| {
-                                                #repeat
-                                            })
-                                        })
-                                    })
-                                })
-                            })
-                        })
-                    })
-                })
-            }
-            .to_string()
-        );
-    }
-
-    #[test]
-    fn expr_complex_atomic() {
-        let expr = OptimizedExpr::Choice(
-            Box::new(OptimizedExpr::Ident("a".to_owned())),
-            Box::new(OptimizedExpr::Seq(
-                Box::new(OptimizedExpr::Range("a".to_owned(), "b".to_owned())),
-                Box::new(OptimizedExpr::Seq(
-                    Box::new(OptimizedExpr::NegPred(Box::new(OptimizedExpr::Rep(
-                        Box::new(OptimizedExpr::Insens("b".to_owned())),
-                    )))),
-                    Box::new(OptimizedExpr::PosPred(Box::new(OptimizedExpr::Opt(
-                        Box::new(OptimizedExpr::Rep(Box::new(OptimizedExpr::Choice(
-                            Box::new(OptimizedExpr::Str("c".to_owned())),
-                            Box::new(OptimizedExpr::Str("d".to_owned())),
-                        )))),
-                    )))),
-                )),
-            )),
-        );
-
-        assert_eq!(
-            generate_expr_atomic(expr).to_string(),
-            quote! {
-                self::a(state).or_else(|state| {
-                    state.sequence(|state| {
-                        state.match_range('a'..'b').and_then(|state| {
-                            state.lookahead(false, |state| {
-                                state.repeat(|state| {
-                                    state.match_insensitive("b")
-                                })
-                            })
-                        }).and_then(|state| {
-                            state.lookahead(true, |state| {
-                                state.optional(|state| {
-                                    state.repeat(|state| {
-                                        state.match_string("c")
-                                           .or_else(|state| {
-                                            state.match_string("d")
-                                        })
-                                    })
-                                })
-                            })
-                        })
-                    })
-                })
-            }
-            .to_string()
-        );
-    }
-
-    #[test]
-    fn generate_complete() {
-        let name = Ident::new("MyParser", Span::call_site());
-        let generics = Generics::default();
-        let rules = vec![OptimizedRule {
-            name: "a".to_owned(),
-            ty: RuleType::Silent,
-            expr: OptimizedExpr::Str("b".to_owned()),
-        }];
-        let defaults = vec!["ANY"];
-        let mut current_dir = std::env::current_dir().expect("Unable to get current directory");
-        current_dir.push("test.pest");
-        let test_path = current_dir.to_str().expect("path contains invalid unicode");
-        assert_eq!(
-            generate(name, &generics, Some(PathBuf::from("test.pest")), rules, defaults, true).to_string(),
-            quote! {
-                #[allow(non_upper_case_globals)]
-                const _PEST_GRAMMAR_MyParser: &'static str = include_str!(#test_path);
-
-                #[allow(dead_code, non_camel_case_types)]
-                #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-                pub enum Rule {
-                    a
-                }
-
-                #[allow(clippy::all)]
-                impl ::pest::Parser<Rule> for MyParser {
-                    fn parse<'i>(
-                        rule: Rule,
-                        input: &'i str
-                    ) -> ::std::result::Result<
-                        ::pest::iterators::Pairs<'i, Rule>,
-                        ::pest::error::Error<Rule>
-                    > {
-                        mod rules {
-                            pub mod hidden {
-                                use super::super::Rule;
-
-                                #[inline]
-                                #[allow(dead_code, non_snake_case, unused_variables)]
-                                pub fn skip(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                                    Ok(state)
-                                }
-                            }
-
-                            pub mod visible {
-                                use super::super::Rule;
-
-                                #[inline]
-                                #[allow(non_snake_case, unused_variables)]
-                                pub fn a(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                                    state.match_string("b")
-                                }
-
-                                #[inline]
-                                #[allow(dead_code, non_snake_case, unused_variables)]
-                                pub fn ANY(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                                    state.skip(1)
-                                }
-                            }
-
-                            pub use self::visible::*;
-                        }
-
-                        ::pest::state(input, |state| {
-                            match rule {
-                                Rule::a => rules::a(state)
-                            }
-                        })
-                    }
-                }
-            }.to_string()
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,208 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#![doc(html_root_url = "https://docs.rs/pest_derive")]
-#![recursion_limit = "256"]
-
-extern crate pest;
-extern crate pest_meta;
-
-extern crate proc_macro;
-extern crate proc_macro2;
-#[macro_use]
-extern crate quote;
-extern crate syn;
-
-use std::env;
-use std::fs::File;
-use std::io::{self, Read};
-use std::path::Path;
-
-use proc_macro2::TokenStream;
-use syn::{Attribute, DeriveInput, Generics, Ident, Lit, Meta};
-
-#[macro_use]
-mod macros;
-mod generator;
-
-use pest_meta::parser::{self, Rule};
-use pest_meta::{optimizer, unwrap_or_report, validator};
-
-pub fn derive_parser(input: TokenStream, include_grammar: bool) -> TokenStream {
-    let ast: DeriveInput = syn::parse2(input).unwrap();
-    let (name, generics, content) = parse_derive(ast);
-
-    let (data, path) = match content {
-        GrammarSource::File(ref path) => {
-            let root = env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".into());
-            let path = Path::new(&root).join("src/").join(&path);
-            let file_name = match path.file_name() {
-                Some(file_name) => file_name,
-                None => panic!("grammar attribute should point to a file"),
-            };
-
-            let data = match read_file(&path) {
-                Ok(data) => data,
-                Err(error) => panic!("error opening {:?}: {}", file_name, error),
-            };
-            (data, Some(path.clone()))
-        }
-        GrammarSource::Inline(content) => (content, None),
-    };
-
-    let pairs = match parser::parse(Rule::grammar_rules, &data) {
-        Ok(pairs) => pairs,
-        Err(error) => panic!(
-            "error parsing \n{}",
-            error.renamed_rules(|rule| match *rule {
-                Rule::grammar_rule => "rule".to_owned(),
-                Rule::_push => "PUSH".to_owned(),
-                Rule::assignment_operator => "`=`".to_owned(),
-                Rule::silent_modifier => "`_`".to_owned(),
-                Rule::atomic_modifier => "`@`".to_owned(),
-                Rule::compound_atomic_modifier => "`$`".to_owned(),
-                Rule::non_atomic_modifier => "`!`".to_owned(),
-                Rule::opening_brace => "`{`".to_owned(),
-                Rule::closing_brace => "`}`".to_owned(),
-                Rule::opening_brack => "`[`".to_owned(),
-                Rule::closing_brack => "`]`".to_owned(),
-                Rule::opening_paren => "`(`".to_owned(),
-                Rule::positive_predicate_operator => "`&`".to_owned(),
-                Rule::negative_predicate_operator => "`!`".to_owned(),
-                Rule::sequence_operator => "`&`".to_owned(),
-                Rule::choice_operator => "`|`".to_owned(),
-                Rule::optional_operator => "`?`".to_owned(),
-                Rule::repeat_operator => "`*`".to_owned(),
-                Rule::repeat_once_operator => "`+`".to_owned(),
-                Rule::comma => "`,`".to_owned(),
-                Rule::closing_paren => "`)`".to_owned(),
-                Rule::quote => "`\"`".to_owned(),
-                Rule::insensitive_string => "`^`".to_owned(),
-                Rule::range_operator => "`..`".to_owned(),
-                Rule::single_quote => "`'`".to_owned(),
-                other_rule => format!("{:?}", other_rule),
-            })
-        ),
-    };
-
-    let defaults = unwrap_or_report(validator::validate_pairs(pairs.clone()));
-    let ast = unwrap_or_report(parser::consume_rules(pairs));
-    let optimized = optimizer::optimize(ast);
-
-    generator::generate(name, &generics, path, optimized, defaults, include_grammar)
-}
-
-fn read_file<P: AsRef<Path>>(path: P) -> io::Result<String> {
-    let mut file = File::open(path.as_ref())?;
-    let mut string = String::new();
-    file.read_to_string(&mut string)?;
-    Ok(string)
-}
-
-#[derive(Debug, PartialEq)]
-enum GrammarSource {
-    File(String),
-    Inline(String),
-}
-
-fn parse_derive(ast: DeriveInput) -> (Ident, Generics, GrammarSource) {
-    let name = ast.ident;
-    let generics = ast.generics;
-
-    let grammar: Vec<&Attribute> = ast
-        .attrs
-        .iter()
-        .filter(|attr| match attr.parse_meta() {
-            Ok(Meta::NameValue(name_value)) => {
-                name_value.path.is_ident("grammar") || name_value.path.is_ident("grammar_inline")
-            }
-            _ => false,
-        })
-        .collect();
-
-    let argument = match grammar.len() {
-        0 => panic!("a grammar file needs to be provided with the #[grammar = \"PATH\"] or #[grammar_inline = \"GRAMMAR CONTENTS\"] attribute"),
-        1 => get_attribute(grammar[0]),
-        _ => panic!("only 1 grammar file can be provided"),
-    };
-
-    (name, generics, argument)
-}
-
-fn get_attribute(attr: &Attribute) -> GrammarSource {
-    match attr.parse_meta() {
-        Ok(Meta::NameValue(name_value)) => match name_value.lit {
-            Lit::Str(string) => {
-                if name_value.path.is_ident("grammar") {
-                    GrammarSource::File(string.value())
-                } else {
-                    GrammarSource::Inline(string.value())
-                }
-            }
-            _ => panic!("grammar attribute must be a string"),
-        },
-        _ => panic!("grammar attribute must be of the form `grammar = \"...\"`"),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::parse_derive;
-    use super::GrammarSource;
-    use syn;
-
-    #[test]
-    fn derive_inline_file() {
-        let definition = "
-            #[other_attr]
-            #[grammar_inline = \"GRAMMAR\"]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        let (_, _, filename) = parse_derive(ast);
-        assert_eq!(filename, GrammarSource::Inline("GRAMMAR".to_string()));
-    }
-
-    #[test]
-    fn derive_ok() {
-        let definition = "
-            #[other_attr]
-            #[grammar = \"myfile.pest\"]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        let (_, _, filename) = parse_derive(ast);
-        assert_eq!(filename, GrammarSource::File("myfile.pest".to_string()));
-    }
-
-    #[test]
-    #[should_panic(expected = "only 1 grammar file can be provided")]
-    fn derive_multiple_grammars() {
-        let definition = "
-            #[other_attr]
-            #[grammar = \"myfile1.pest\"]
-            #[grammar = \"myfile2.pest\"]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        parse_derive(ast);
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar attribute must be a string")]
-    fn derive_wrong_arg() {
-        let definition = "
-            #[other_attr]
-            #[grammar = 1]
-            pub struct MyParser<'a, T>;
-        ";
-        let ast = syn::parse_str(definition).unwrap();
-        parse_derive(ast);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_generator/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_generator/src/macros.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-macro_rules! insert_builtin {
-    ($builtin: expr, $name: ident, $pattern: expr) => {
-        $builtin.push((stringify!($name), generate_rule!($name, $pattern)));
-    };
-}
-
-macro_rules! insert_public_builtin {
-    ($builtin: expr, $name: ident, $pattern: expr) => {
-        $builtin.push((stringify!($name), generate_public_rule!($name, $pattern)));
-    };
-}
-
-macro_rules! generate_rule {
-    ($name: ident, $pattern: expr) => {
-        quote! {
-            #[inline]
-            #[allow(dead_code, non_snake_case, unused_variables)]
-            pub fn $name(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                $pattern
-            }
-        }
-    }
-}
-
-macro_rules! generate_public_rule {
-    ($name: ident, $pattern: expr) => {
-        quote! {
-            #[inline]
-            #[allow(dead_code, non_snake_case, unused_variables)]
-            pub fn $name(state: Box<::pest::ParserState<Rule>>) -> ::pest::ParseResult<Box<::pest::ParserState<Rule>>> {
-                $pattern
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"adf86f275ddc1ae02311ab5e1b51a165dc034edf466fc74dea6cbe63fe80d9b3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","_README.md":"e9901b6c4d50403bfda7e08a92b5c395a8c51eba868c7bd07b03e00ccba702f3","src/ast.rs":"b2d0b054d66525b6c9ceed7a9b24cabcdd1074b525b230fc99a1a31019010f58","src/grammar.pest":"fac55bde3f3b59058293d220fec96ef033e61cb24fc032cad21d76aa6f963bc1","src/grammar.rs":"eb8f1f0c964467c081564de8830f3db4966499311868127342b9b651e8cee06f","src/lib.rs":"b248cf6bc5d4a8537f682c23f8d2c8910eb764ee5f1cc02b2c344b0b920943da","src/optimizer/concatenator.rs":"94c2a79d39ebeddbc413d30f2c20d0b50ae2c0e2e86bff90a029b70aa028e2fc","src/optimizer/factorizer.rs":"84df67d6e3f1b507b3e970cb8fba1ab9e2254c3ba778c4a0cf100452b36f1e08","src/optimizer/mod.rs":"69f25916112cbfa4b3d2225f8af463a03ebe706ae757d9c97be523c5601d7b3c","src/optimizer/restorer.rs":"182561b972752ec961fa45d0ca705a9852462010003e4e1ab646e5cd486bedd1","src/optimizer/rotater.rs":"e59f6c3e9197dc3cb4f21edf0c5ffb1a2638a81e4ce9b0373a2d2147a12a3bd5","src/optimizer/skipper.rs":"ab52c7a44a35aefcd1546da5e2084af642c472f07565dcb1be1bb3e2b5fc5a41","src/optimizer/unroller.rs":"99b4940906b0eb443a8b0bf6499130098d59a8141f2693ec50a653cb21c534d5","src/parser.rs":"04a93b2d36bcf199cbc5ab3e943a85cc1730529af83bb3f4a1a9f6b80e2eda4a","src/validator.rs":"5436c0cafc8fa91e45e4988e280220057c8f43ec7a796491abb8e9b22f80582d"},"package":"54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "pest_meta"
-version = "2.1.3"
-authors = ["DragoÈ™ Tiselice <dragostiselice@gmail.com>"]
-exclude = ["src/grammar.pest"]
-include = ["Cargo.toml", "src/**/*", "src/grammar.rs", "_README.md", "LICENSE-*"]
-description = "pest meta language parser and validator"
-homepage = "https://pest-parser.github.io/"
-documentation = "https://docs.rs/pest"
-readme = "_README.md"
-keywords = ["pest", "parser", "meta", "optimizer"]
-categories = ["parsing"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/pest-parser/pest"
-[dependencies.maplit]
-version = "1.0"
-
-[dependencies.pest]
-version = "2.1.0"
-[build-dependencies.sha-1]
-version = "0.8"
-default-features = false
-[badges.codecov]
-repository = "pest-parser/pest"
-
-[badges.maintenance]
-status = "actively-developed"
-
-[badges.travis-ci]
-repository = "pest-parser/pest"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/_README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/_README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/_README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/_README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-<p align="center">
-  <img src="https://raw.github.com/pest-parser/pest/master/pest-logo.svg?sanitize=true" width="80%"/>
-</p>
-
-# pest. The Elegant Parser
-
-[![Join the chat at https://gitter.im/dragostis/pest](https://badges.gitter.im/dragostis/pest.svg)](https://gitter.im/dragostis/pest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Book](https://img.shields.io/badge/book-WIP-4d76ae.svg)](https://pest-parser.github.io/book)
-[![Docs](https://docs.rs/pest/badge.svg)](https://docs.rs/pest)
-
-[![Build Status](https://travis-ci.org/pest-parser/pest.svg?branch=master)](https://travis-ci.org/pest-parser/pest)
-[![codecov](https://codecov.io/gh/pest-parser/pest/branch/master/graph/badge.svg)](https://codecov.io/gh/pest-parser/pest)
-[![Fuzzit Status](https://app.fuzzit.dev/badge?org_id=pest-parser)](https://app.fuzzit.dev/orgs/pest-parser/dashboard)
-[![Crates.io](https://img.shields.io/crates/d/pest.svg)](https://crates.io/crates/pest)
-[![Crates.io](https://img.shields.io/crates/v/pest.svg)](https://crates.io/crates/pest)
-
-pest is a general purpose parser written in Rust with a focus on accessibility,
-correctness, and performance. It uses parsing expression grammars
-(or [PEG]) as input, which are similar in spirit to regular expressions, but
-which offer the enhanced expressivity needed to parse complex languages.
-
-[PEG]: https://en.wikipedia.org/wiki/Parsing_expression_grammar
-
-## Getting started
-
-The recommended way to start parsing with pest is to read the official [book].
-
-Other helpful resources:
-
-* API reference on [docs.rs]
-* play with grammars and share them on our [fiddle]
-* leave feedback, ask questions, or greet us on [Gitter]
-
-[book]: https://pest-parser.github.io/book
-[docs.rs]: https://docs.rs/pest
-[fiddle]: https://pest-parser.github.io/#editor
-[Gitter]: https://gitter.im/dragostis/pest
-
-## Example
-
-The following is an example of a grammar for a list of alpha-numeric identifiers
-where the first identifier does not start with a digit:
-
-```rust
-alpha = { 'a'..'z' | 'A'..'Z' }
-digit = { '0'..'9' }
-
-ident = { (alpha | digit)+ }
-
-ident_list = _{ !digit ~ ident ~ (" " ~ ident)+ }
-          // ^
-          // ident_list rule is silent which means it produces no tokens
-```
-
-Grammars are saved in separate .pest files which are never mixed with procedural
-code. This results in an always up-to-date formalization of a language that is
-easy to read and maintain.
-
-## Meaningful error reporting
-
-Based on the grammar definition, the parser also includes automatic error
-reporting. For the example above, the input `"123"` will result in:
-
-```
-thread 'main' panicked at ' --> 1:1
-  |
-1 | 123
-  | ^---
-  |
-  = unexpected digit', src/main.rs:12
-```
-while `"ab *"` will result in:
-```
-thread 'main' panicked at ' --> 1:1
-  |
-1 | ab *
-  |    ^---
-  |
-  = expected ident', src/main.rs:12
-```
-
-## Pairs API
-
-The grammar can be used to derive a `Parser` implementation automatically.
-Parsing returns an iterator of nested token pairs:
-
-```rust
-extern crate pest;
-#[macro_use]
-extern crate pest_derive;
-
-use pest::Parser;
-
-#[derive(Parser)]
-#[grammar = "ident.pest"]
-struct IdentParser;
-
-fn main() {
-    let pairs = IdentParser::parse(Rule::ident_list, "a1 b2").unwrap_or_else(|e| panic!("{}", e));
-
-    // Because ident_list is silent, the iterator will contain idents
-    for pair in pairs {
-        // A pair is a combination of the rule which matched and a span of input
-        println!("Rule:    {:?}", pair.as_rule());
-        println!("Span:    {:?}", pair.as_span());
-        println!("Text:    {}", pair.as_str());
-
-        // A pair can be converted to an iterator of the tokens which make it up:
-        for inner_pair in pair.into_inner() {
-            match inner_pair.as_rule() {
-                Rule::alpha => println!("Letter:  {}", inner_pair.as_str()),
-                Rule::digit => println!("Digit:   {}", inner_pair.as_str()),
-                _ => unreachable!()
-            };
-        }
-    }
-}
-```
-
-This produces the following output:
-```
-Rule:    ident
-Span:    Span { start: 0, end: 2 }
-Text:    a1
-Letter:  a
-Digit:   1
-Rule:    ident
-Span:    Span { start: 3, end: 5 }
-Text:    b2
-Letter:  b
-Digit:   2
-```
-
-## Other features
-
-* Precedence climbing
-* Input handling
-* Custom errors
-* Runs on stable Rust
-
-## Projects using pest
-
-* [pest_meta](https://github.com/pest-parser/pest/blob/master/meta/src/grammar.pest) (bootstrapped)
-* [AshPaper](https://github.com/shnewto/ashpaper)
-* [brain](https://github.com/brain-lang/brain)
-* [Chelone](https://github.com/Aaronepower/chelone)
-* [comrak](https://github.com/kivikakk/comrak)
-* [elastic-rs](https://github.com/cch123/elastic-rs)
-* [graphql-parser](https://github.com/Keats/graphql-parser)
-* [handlebars-rust](https://github.com/sunng87/handlebars-rust)
-* [hexdino](https://github.com/Luz/hexdino)
-* [Huia](https://gitlab.com/jimsy/huia/)
-* [jql](https://github.com/yamafaktory/jql)
-* [json5-rs](https://github.com/callum-oakley/json5-rs)
-* [mt940](https://github.com/svenstaro/mt940-rs)
-* [py_literal](https://github.com/jturner314/py_literal)
-* [rouler](https://github.com/jarcane/rouler)
-* [RuSh](https://github.com/lwandrebeck/RuSh)
-* [rs_pbrt](https://github.com/wahn/rs_pbrt)
-* [stache](https://github.com/dgraham/stache)
-* [tera](https://github.com/Keats/tera)
-* [ui_gen](https://github.com/emoon/ui_gen)
-* [ukhasnet-parser](https://github.com/adamgreig/ukhasnet-parser)
-* [ZoKrates](https://github.com/ZoKrates/ZoKrates)
-
-## Special thanks
-
-A special round of applause goes to prof. Marius Minea for his guidance and all
-pest contributors, some of which being none other than my friends.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/ast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/ast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/ast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/ast.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,315 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct Rule {
-    pub name: String,
-    pub ty: RuleType,
-    pub expr: Expr,
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum RuleType {
-    Normal,
-    Silent,
-    Atomic,
-    CompoundAtomic,
-    NonAtomic,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum Expr {
-    /// Matches an exact string, e.g. `"a"`
-    Str(String),
-    /// Matches an exact string, case insensitively (ASCII only), e.g. `^"a"`
-    Insens(String),
-    /// Matches one character in the range, e.g. `'a'..'z'`
-    Range(String, String),
-    /// Matches the rule with the given name, e.g. `a`
-    Ident(String),
-    /// Matches a custom part of the stack, e.g. `PEEK[..]`
-    PeekSlice(i32, Option<i32>),
-    /// Positive lookahead; matches expression without making progress, e.g. `&e`
-    PosPred(Box<Expr>),
-    /// Negative lookahead; matches if expression doesn't match, without making progress, e.g. `!e`
-    NegPred(Box<Expr>),
-    /// Matches a sequence of two expressions, e.g. `e1 ~ e2`
-    Seq(Box<Expr>, Box<Expr>),
-    /// Matches either of two expressions, e.g. `e1 | e2`
-    Choice(Box<Expr>, Box<Expr>),
-    /// Optionally matches an expression, e.g. `e?`
-    Opt(Box<Expr>),
-    /// Matches an expression zero or more times, e.g. `e*`
-    Rep(Box<Expr>),
-    /// Matches an expression one or more times, e.g. `e+`
-    RepOnce(Box<Expr>),
-    /// Matches an expression an exact number of times, e.g. `e{n}`
-    RepExact(Box<Expr>, u32),
-    /// Matches an expression at least a number of times, e.g. `e{n,}`
-    RepMin(Box<Expr>, u32),
-    /// Matches an expression at most a number of times, e.g. `e{,n}`
-    RepMax(Box<Expr>, u32),
-    /// Matches an expression a number of times within a range, e.g. `e{m, n}`
-    RepMinMax(Box<Expr>, u32, u32),
-    /// Continues to match expressions until one of the strings in the `Vec` is found
-    Skip(Vec<String>),
-    /// Matches an expression and pushes it to the stack, e.g. `push(e)`
-    Push(Box<Expr>),
-}
-
-impl Expr {
-    pub fn iter_top_down(&self) -> ExprTopDownIterator {
-        ExprTopDownIterator::new(self)
-    }
-
-    pub fn map_top_down<F>(self, mut f: F) -> Expr
-    where
-        F: FnMut(Expr) -> Expr,
-    {
-        fn map_internal<F>(expr: Expr, f: &mut F) -> Expr
-        where
-            F: FnMut(Expr) -> Expr,
-        {
-            let expr = f(expr);
-
-            match expr {
-                // TODO: Use box syntax when it gets stabilized.
-                Expr::PosPred(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::PosPred(mapped)
-                }
-                Expr::NegPred(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::NegPred(mapped)
-                }
-                Expr::Seq(lhs, rhs) => {
-                    let mapped_lhs = Box::new(map_internal(*lhs, f));
-                    let mapped_rhs = Box::new(map_internal(*rhs, f));
-                    Expr::Seq(mapped_lhs, mapped_rhs)
-                }
-                Expr::Choice(lhs, rhs) => {
-                    let mapped_lhs = Box::new(map_internal(*lhs, f));
-                    let mapped_rhs = Box::new(map_internal(*rhs, f));
-                    Expr::Choice(mapped_lhs, mapped_rhs)
-                }
-                Expr::Rep(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::Rep(mapped)
-                }
-                Expr::RepOnce(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepOnce(mapped)
-                }
-                Expr::RepExact(expr, max) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepExact(mapped, max)
-                }
-                Expr::RepMin(expr, num) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepMin(mapped, num)
-                }
-                Expr::RepMax(expr, num) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepMax(mapped, num)
-                }
-                Expr::RepMinMax(expr, min, max) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepMinMax(mapped, min, max)
-                }
-                Expr::Opt(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::Opt(mapped)
-                }
-                Expr::Push(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::Push(mapped)
-                }
-                expr => expr,
-            }
-        }
-
-        map_internal(self, &mut f)
-    }
-
-    pub fn map_bottom_up<F>(self, mut f: F) -> Expr
-    where
-        F: FnMut(Expr) -> Expr,
-    {
-        fn map_internal<F>(expr: Expr, f: &mut F) -> Expr
-        where
-            F: FnMut(Expr) -> Expr,
-        {
-            let mapped = match expr {
-                Expr::PosPred(expr) => {
-                    // TODO: Use box syntax when it gets stabilized.
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::PosPred(mapped)
-                }
-                Expr::NegPred(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::NegPred(mapped)
-                }
-                Expr::Seq(lhs, rhs) => {
-                    let mapped_lhs = Box::new(map_internal(*lhs, f));
-                    let mapped_rhs = Box::new(map_internal(*rhs, f));
-                    Expr::Seq(mapped_lhs, mapped_rhs)
-                }
-                Expr::Choice(lhs, rhs) => {
-                    let mapped_lhs = Box::new(map_internal(*lhs, f));
-                    let mapped_rhs = Box::new(map_internal(*rhs, f));
-                    Expr::Choice(mapped_lhs, mapped_rhs)
-                }
-                Expr::Rep(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::Rep(mapped)
-                }
-                Expr::RepOnce(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepOnce(mapped)
-                }
-                Expr::RepExact(expr, num) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepExact(mapped, num)
-                }
-                Expr::RepMin(expr, max) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepMin(mapped, max)
-                }
-                Expr::RepMax(expr, max) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepMax(mapped, max)
-                }
-                Expr::RepMinMax(expr, min, max) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::RepMinMax(mapped, min, max)
-                }
-                Expr::Opt(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::Opt(mapped)
-                }
-                Expr::Push(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    Expr::Push(mapped)
-                }
-                expr => expr,
-            };
-
-            f(mapped)
-        }
-
-        map_internal(self, &mut f)
-    }
-}
-
-pub struct ExprTopDownIterator {
-    current: Option<Expr>,
-    next: Option<Expr>,
-    right_branches: Vec<Expr>,
-}
-
-impl ExprTopDownIterator {
-    pub fn new(expr: &Expr) -> Self {
-        let mut iter = ExprTopDownIterator {
-            current: None,
-            next: None,
-            right_branches: vec![],
-        };
-        iter.iterate_expr(expr.clone());
-        iter
-    }
-
-    fn iterate_expr(&mut self, expr: Expr) {
-        self.current = Some(expr.clone());
-        match expr {
-            Expr::Seq(lhs, rhs) => {
-                self.right_branches.push(*rhs);
-                self.next = Some(*lhs);
-            }
-            Expr::Choice(lhs, rhs) => {
-                self.right_branches.push(*rhs);
-                self.next = Some(*lhs);
-            }
-            Expr::PosPred(expr)
-            | Expr::NegPred(expr)
-            | Expr::Rep(expr)
-            | Expr::RepOnce(expr)
-            | Expr::RepExact(expr, _)
-            | Expr::RepMin(expr, _)
-            | Expr::RepMax(expr, _)
-            | Expr::RepMinMax(expr, ..)
-            | Expr::Opt(expr)
-            | Expr::Push(expr) => {
-                self.next = Some(*expr);
-            }
-            _ => {
-                self.next = None;
-            }
-        }
-    }
-}
-
-impl Iterator for ExprTopDownIterator {
-    type Item = Expr;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let result = self.current.take();
-
-        if let Some(expr) = self.next.take() {
-            self.iterate_expr(expr);
-        } else if let Some(expr) = self.right_branches.pop() {
-            self.iterate_expr(expr);
-        }
-
-        result
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn top_down_iterator() {
-        let expr = Expr::Choice(
-            Box::new(Expr::Str(String::from("a"))),
-            Box::new(Expr::Str(String::from("b"))),
-        );
-        let mut top_down = expr.clone().iter_top_down();
-        assert_eq!(top_down.next(), Some(expr));
-        assert_eq!(top_down.next(), Some(Expr::Str(String::from("a"))));
-        assert_eq!(top_down.next(), Some(Expr::Str(String::from("b"))));
-        assert_eq!(top_down.next(), None);
-    }
-
-    #[test]
-    fn identity() {
-        let expr = Expr::Choice(
-            Box::new(Expr::Seq(
-                Box::new(Expr::Ident("a".to_owned())),
-                Box::new(Expr::Str("b".to_owned())),
-            )),
-            Box::new(Expr::PosPred(Box::new(Expr::NegPred(Box::new(Expr::Rep(
-                Box::new(Expr::RepOnce(Box::new(Expr::Opt(Box::new(Expr::Choice(
-                    Box::new(Expr::Insens("c".to_owned())),
-                    Box::new(Expr::Push(Box::new(Expr::Range(
-                        "'d'".to_owned(),
-                        "'e'".to_owned(),
-                    )))),
-                )))))),
-            )))))),
-        );
-
-        assert_eq!(
-            expr.clone()
-                .map_bottom_up(|expr| expr)
-                .map_top_down(|expr| expr),
-            expr
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/grammar.pest thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/grammar.pest
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/grammar.pest	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/grammar.pest	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-grammar_rules = _{ SOI ~ grammar_rule+ ~ EOI }
-
-grammar_rule = {
-    identifier ~ assignment_operator ~ modifier? ~
-    opening_brace ~ expression ~ closing_brace
-}
-
-assignment_operator = { "=" }
-opening_brace       = { "{" }
-closing_brace       = { "}" }
-opening_paren       = { "(" }
-closing_paren       = { ")" }
-opening_brack       = { "[" }
-closing_brack       = { "]" }
-
-modifier = _{
-    silent_modifier |
-    atomic_modifier |
-    compound_atomic_modifier |
-    non_atomic_modifier
-}
-
-silent_modifier          = { "_" }
-atomic_modifier          = { "@" }
-compound_atomic_modifier = { "$" }
-non_atomic_modifier      = { "!" }
-
-expression =  { term ~ (infix_operator ~ term)* }
-term       =  { prefix_operator* ~ node ~ postfix_operator* }
-node       = _{ opening_paren ~ expression ~ closing_paren | terminal }
-terminal   = _{ _push | peek_slice | identifier | string | insensitive_string | range }
-
-prefix_operator  = _{ positive_predicate_operator | negative_predicate_operator }
-infix_operator   = _{ sequence_operator | choice_operator }
-postfix_operator = _{
-    optional_operator |
-    repeat_operator |
-    repeat_once_operator |
-    repeat_exact |
-    repeat_min |
-    repeat_max |
-    repeat_min_max
-}
-
-positive_predicate_operator = { "&" }
-negative_predicate_operator = { "!" }
-sequence_operator           = { "~" }
-choice_operator             = { "|" }
-optional_operator           = { "?" }
-repeat_operator             = { "*" }
-repeat_once_operator        = { "+" }
-
-repeat_exact   = { opening_brace ~ number ~ closing_brace }
-repeat_min     = { opening_brace ~ number ~ comma ~ closing_brace }
-repeat_max     = { opening_brace ~ comma ~ number ~ closing_brace }
-repeat_min_max = { opening_brace ~ number ~ comma ~ number ~ closing_brace }
-
-number = @{ '0'..'9'+ }
-integer = @{ number | "-" ~ "0"* ~ '1'..'9' ~ number? }
-
-comma = { "," }
-
-_push = { "PUSH" ~ opening_paren ~ expression ~ closing_paren }
-peek_slice = { "PEEK" ~ opening_brack ~ integer? ~ range_operator ~ integer? ~ closing_brack }
-
-identifier = @{ !"PUSH" ~ ("_" | alpha) ~ ("_" | alpha_num)* }
-alpha      = _{ 'a'..'z' | 'A'..'Z' }
-alpha_num  = _{ alpha | '0'..'9' }
-
-string             = ${ quote ~ inner_str ~ quote }
-insensitive_string =  { "^" ~ string }
-range              =  { character ~ range_operator ~ character }
-character          = ${ single_quote ~ inner_chr ~ single_quote }
-
-inner_str = @{ (!("\"" | "\\") ~ ANY)* ~ (escape ~ inner_str)? }
-inner_chr = @{ escape | ANY }
-escape    = @{ "\\" ~ ("\"" | "\\" | "r" | "n" | "t" | "0" | "'" | code | unicode) }
-code      = @{ "x" ~ hex_digit{2} }
-unicode   = @{ "u" ~ opening_brace ~ hex_digit{2, 6} ~ closing_brace }
-hex_digit = @{ '0'..'9' | 'a'..'f' | 'A'..'F' }
-
-quote          = { "\"" }
-single_quote   = { "'" }
-range_operator = { ".." }
-
-newline    = _{ "\n" | "\r\n" }
-WHITESPACE = _{ " " | "\t" | newline }
-block_comment = _{ "/*" ~ (block_comment | !"*/" ~ ANY)* ~ "*/" }
-COMMENT    = _{ block_comment | ("//" ~ (!newline ~ ANY)*) }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/grammar.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/grammar.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/grammar.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/grammar.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-pub struct PestParser;
-# [ allow ( dead_code , non_camel_case_types ) ] # [ derive ( Clone , Copy , Debug , Eq , Hash , Ord , PartialEq , PartialOrd ) ] pub enum Rule { EOI , grammar_rules , grammar_rule , assignment_operator , opening_brace , closing_brace , opening_paren , closing_paren , opening_brack , closing_brack , modifier , silent_modifier , atomic_modifier , compound_atomic_modifier , non_atomic_modifier , expression , term , node , terminal , prefix_operator , infix_operator , postfix_operator , positive_predicate_operator , negative_predicate_operator , sequence_operator , choice_operator , optional_operator , repeat_operator , repeat_once_operator , repeat_exact , repeat_min , repeat_max , repeat_min_max , number , integer , comma , _push , peek_slice , identifier , alpha , alpha_num , string , insensitive_string , range , character , inner_str , inner_chr , escape , code , unicode , hex_digit , quote , single_quote , range_operator , newline , WHITESPACE , block_comment , COMMENT } # [ allow ( clippy :: all ) ] impl :: pest :: Parser < Rule > for PestParser { fn parse < 'i > ( rule : Rule , input : & 'i str ) -> :: std :: result :: Result < :: pest :: iterators :: Pairs < 'i , Rule > , :: pest :: error :: Error < Rule > > { mod rules { pub mod hidden { use super :: super :: Rule ; # [ inline ] # [ allow ( dead_code , non_snake_case , unused_variables ) ] pub fn skip ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { if state . atomicity ( ) == :: pest :: Atomicity :: NonAtomic { state . sequence ( | state | { state . repeat ( | state | super :: visible :: WHITESPACE ( state ) ) . and_then ( | state | { state . repeat ( | state | { state . sequence ( | state | { super :: visible :: COMMENT ( state ) . and_then ( | state | { state . repeat ( | state | super :: visible :: WHITESPACE ( state ) ) } ) } ) } ) } ) } ) } else { Ok ( state ) } } } pub mod visible { use super :: super :: Rule ; # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn grammar_rules ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . sequence ( | state | { self :: SOI ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . sequence ( | state | { self :: grammar_rule ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . sequence ( | state | { state . optional ( | state | { self :: grammar_rule ( state ) . and_then ( | state | { state . repeat ( | state | { state . sequence ( | state | { super :: hidden :: skip ( state ) . and_then ( | state | { self :: grammar_rule ( state ) } ) } ) } ) } ) } ) } ) } ) } ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: EOI ( state ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn grammar_rule ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: grammar_rule , | state | { state . sequence ( | state | { self :: identifier ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: assignment_operator ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . optional ( | state | { self :: modifier ( state ) } ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: opening_brace ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: expression ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: closing_brace ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn assignment_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: assignment_operator , | state | { state . match_string ( "=" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn opening_brace ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: opening_brace , | state | { state . match_string ( "{" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn closing_brace ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: closing_brace , | state | { state . match_string ( "}" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn opening_paren ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: opening_paren , | state | { state . match_string ( "(" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn closing_paren ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: closing_paren , | state | { state . match_string ( ")" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn opening_brack ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: opening_brack , | state | { state . match_string ( "[" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn closing_brack ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: closing_brack , | state | { state . match_string ( "]" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn modifier ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { self :: silent_modifier ( state ) . or_else ( | state | { self :: atomic_modifier ( state ) } ) . or_else ( | state | { self :: compound_atomic_modifier ( state ) } ) . or_else ( | state | { self :: non_atomic_modifier ( state ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn silent_modifier ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: silent_modifier , | state | { state . match_string ( "_" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn atomic_modifier ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: atomic_modifier , | state | { state . match_string ( "@" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn compound_atomic_modifier ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: compound_atomic_modifier , | state | { state . match_string ( "$" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn non_atomic_modifier ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: non_atomic_modifier , | state | { state . match_string ( "!" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn expression ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: expression , | state | { state . sequence ( | state | { self :: term ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . sequence ( | state | { state . optional ( | state | { state . sequence ( | state | { self :: infix_operator ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: term ( state ) } ) } ) . and_then ( | state | { state . repeat ( | state | { state . sequence ( | state | { super :: hidden :: skip ( state ) . and_then ( | state | { state . sequence ( | state | { self :: infix_operator ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: term ( state ) } ) } ) } ) } ) } ) } ) } ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn term ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: term , | state | { state . sequence ( | state | { state . sequence ( | state | { state . optional ( | state | { self :: prefix_operator ( state ) . and_then ( | state | { state . repeat ( | state | { state . sequence ( | state | { super :: hidden :: skip ( state ) . and_then ( | state | { self :: prefix_operator ( state ) } ) } ) } ) } ) } ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: node ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . sequence ( | state | { state . optional ( | state | { self :: postfix_operator ( state ) . and_then ( | state | { state . repeat ( | state | { state . sequence ( | state | { super :: hidden :: skip ( state ) . and_then ( | state | { self :: postfix_operator ( state ) } ) } ) } ) } ) } ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn node ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . sequence ( | state | { self :: opening_paren ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: expression ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: closing_paren ( state ) } ) } ) . or_else ( | state | { self :: terminal ( state ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn terminal ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { self :: _push ( state ) . or_else ( | state | { self :: peek_slice ( state ) } ) . or_else ( | state | { self :: identifier ( state ) } ) . or_else ( | state | { self :: string ( state ) } ) . or_else ( | state | { self :: insensitive_string ( state ) } ) . or_else ( | state | { self :: range ( state ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn prefix_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { self :: positive_predicate_operator ( state ) . or_else ( | state | { self :: negative_predicate_operator ( state ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn infix_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { self :: sequence_operator ( state ) . or_else ( | state | { self :: choice_operator ( state ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn postfix_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { self :: optional_operator ( state ) . or_else ( | state | { self :: repeat_operator ( state ) } ) . or_else ( | state | { self :: repeat_once_operator ( state ) } ) . or_else ( | state | { self :: repeat_exact ( state ) } ) . or_else ( | state | { self :: repeat_min ( state ) } ) . or_else ( | state | { self :: repeat_max ( state ) } ) . or_else ( | state | { self :: repeat_min_max ( state ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn positive_predicate_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: positive_predicate_operator , | state | { state . match_string ( "&" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn negative_predicate_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: negative_predicate_operator , | state | { state . match_string ( "!" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn sequence_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: sequence_operator , | state | { state . match_string ( "~" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn choice_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: choice_operator , | state | { state . match_string ( "|" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn optional_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: optional_operator , | state | { state . match_string ( "?" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn repeat_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: repeat_operator , | state | { state . match_string ( "*" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn repeat_once_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: repeat_once_operator , | state | { state . match_string ( "+" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn repeat_exact ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: repeat_exact , | state | { state . sequence ( | state | { self :: opening_brace ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: number ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: closing_brace ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn repeat_min ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: repeat_min , | state | { state . sequence ( | state | { self :: opening_brace ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: number ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: comma ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: closing_brace ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn repeat_max ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: repeat_max , | state | { state . sequence ( | state | { self :: opening_brace ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: comma ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: number ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: closing_brace ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn repeat_min_max ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: repeat_min_max , | state | { state . sequence ( | state | { self :: opening_brace ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: number ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: comma ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: number ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: closing_brace ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn number ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: number , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { state . sequence ( | state | { state . match_range ( '0' .. '9' ) . and_then ( | state | { state . repeat ( | state | { state . match_range ( '0' .. '9' ) } ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn integer ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: integer , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { self :: number ( state ) . or_else ( | state | { state . sequence ( | state | { state . match_string ( "-" ) . and_then ( | state | { state . repeat ( | state | { state . match_string ( "0" ) } ) } ) . and_then ( | state | { state . match_range ( '1' .. '9' ) } ) . and_then ( | state | { state . optional ( | state | { self :: number ( state ) } ) } ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn comma ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: comma , | state | { state . match_string ( "," ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn _push ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: _push , | state | { state . sequence ( | state | { state . match_string ( "PUSH" ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: opening_paren ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: expression ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: closing_paren ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn peek_slice ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: peek_slice , | state | { state . sequence ( | state | { state . match_string ( "PEEK" ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: opening_brack ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . optional ( | state | { self :: integer ( state ) } ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: range_operator ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . optional ( | state | { self :: integer ( state ) } ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: closing_brack ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn identifier ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: identifier , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { state . sequence ( | state | { state . lookahead ( false , | state | { state . match_string ( "PUSH" ) } ) . and_then ( | state | { state . match_string ( "_" ) . or_else ( | state | { self :: alpha ( state ) } ) } ) . and_then ( | state | { state . repeat ( | state | { state . match_string ( "_" ) . or_else ( | state | { self :: alpha_num ( state ) } ) } ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn alpha ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . match_range ( 'a' .. 'z' ) . or_else ( | state | { state . match_range ( 'A' .. 'Z' ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn alpha_num ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { self :: alpha ( state ) . or_else ( | state | { state . match_range ( '0' .. '9' ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn string ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . atomic ( :: pest :: Atomicity :: CompoundAtomic , | state | { state . rule ( Rule :: string , | state | { state . sequence ( | state | { self :: quote ( state ) . and_then ( | state | { self :: inner_str ( state ) } ) . and_then ( | state | { self :: quote ( state ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn insensitive_string ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: insensitive_string , | state | { state . sequence ( | state | { state . match_string ( "^" ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: string ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn range ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: range , | state | { state . sequence ( | state | { self :: character ( state ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: range_operator ( state ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: character ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn character ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . atomic ( :: pest :: Atomicity :: CompoundAtomic , | state | { state . rule ( Rule :: character , | state | { state . sequence ( | state | { self :: single_quote ( state ) . and_then ( | state | { self :: inner_chr ( state ) } ) . and_then ( | state | { self :: single_quote ( state ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn inner_str ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: inner_str , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { state . sequence ( | state | { let strings = [ "\"" , "\\" ] ; state . skip_until ( & strings ) . and_then ( | state | { state . optional ( | state | { state . sequence ( | state | { self :: escape ( state ) . and_then ( | state | { self :: inner_str ( state ) } ) } ) } ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn inner_chr ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: inner_chr , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { self :: escape ( state ) . or_else ( | state | { self :: ANY ( state ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn escape ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: escape , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { state . sequence ( | state | { state . match_string ( "\\" ) . and_then ( | state | { state . match_string ( "\"" ) . or_else ( | state | { state . match_string ( "\\" ) } ) . or_else ( | state | { state . match_string ( "r" ) } ) . or_else ( | state | { state . match_string ( "n" ) } ) . or_else ( | state | { state . match_string ( "t" ) } ) . or_else ( | state | { state . match_string ( "0" ) } ) . or_else ( | state | { state . match_string ( "'" ) } ) . or_else ( | state | { self :: code ( state ) } ) . or_else ( | state | { self :: unicode ( state ) } ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn code ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: code , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { state . sequence ( | state | { state . match_string ( "x" ) . and_then ( | state | { self :: hex_digit ( state ) } ) . and_then ( | state | { self :: hex_digit ( state ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn unicode ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: unicode , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { state . sequence ( | state | { state . match_string ( "u" ) . and_then ( | state | { self :: opening_brace ( state ) } ) . and_then ( | state | { state . sequence ( | state | { self :: hex_digit ( state ) . and_then ( | state | { self :: hex_digit ( state ) } ) . and_then ( | state | { state . optional ( | state | { self :: hex_digit ( state ) } ) } ) . and_then ( | state | { state . optional ( | state | { self :: hex_digit ( state ) } ) } ) . and_then ( | state | { state . optional ( | state | { self :: hex_digit ( state ) } ) } ) . and_then ( | state | { state . optional ( | state | { self :: hex_digit ( state ) } ) } ) } ) } ) . and_then ( | state | { self :: closing_brace ( state ) } ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn hex_digit ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: hex_digit , | state | { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { state . match_range ( '0' .. '9' ) . or_else ( | state | { state . match_range ( 'a' .. 'f' ) } ) . or_else ( | state | { state . match_range ( 'A' .. 'F' ) } ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn quote ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: quote , | state | { state . match_string ( "\"" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn single_quote ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: single_quote , | state | { state . match_string ( "'" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn range_operator ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: range_operator , | state | { state . match_string ( ".." ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn newline ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . match_string ( "\n" ) . or_else ( | state | { state . match_string ( "\r\n" ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn WHITESPACE ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { state . match_string ( " " ) . or_else ( | state | { state . match_string ( "\t" ) } ) . or_else ( | state | { self :: newline ( state ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn block_comment ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . sequence ( | state | { state . match_string ( "/*" ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . sequence ( | state | { state . optional ( | state | { self :: block_comment ( state ) . or_else ( | state | { state . sequence ( | state | { state . lookahead ( false , | state | { state . match_string ( "*/" ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: ANY ( state ) } ) } ) } ) . and_then ( | state | { state . repeat ( | state | { state . sequence ( | state | { super :: hidden :: skip ( state ) . and_then ( | state | { self :: block_comment ( state ) . or_else ( | state | { state . sequence ( | state | { state . lookahead ( false , | state | { state . match_string ( "*/" ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { self :: ANY ( state ) } ) } ) } ) } ) } ) } ) } ) } ) } ) } ) . and_then ( | state | { super :: hidden :: skip ( state ) } ) . and_then ( | state | { state . match_string ( "*/" ) } ) } ) } # [ inline ] # [ allow ( non_snake_case , unused_variables ) ] pub fn COMMENT ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . atomic ( :: pest :: Atomicity :: Atomic , | state | { self :: block_comment ( state ) . or_else ( | state | { state . sequence ( | state | { state . match_string ( "//" ) . and_then ( | state | { state . repeat ( | state | { state . sequence ( | state | { state . lookahead ( false , | state | { self :: newline ( state ) } ) . and_then ( | state | { self :: ANY ( state ) } ) } ) } ) } ) } ) } ) } ) } # [ inline ] # [ allow ( dead_code , non_snake_case , unused_variables ) ] pub fn SOI ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . start_of_input ( ) } # [ inline ] # [ allow ( dead_code , non_snake_case , unused_variables ) ] pub fn ANY ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . skip ( 1 ) } # [ inline ] # [ allow ( dead_code , non_snake_case , unused_variables ) ] pub fn EOI ( state : Box < :: pest :: ParserState < Rule >> ) -> :: pest :: ParseResult < Box < :: pest :: ParserState < Rule >> > { state . rule ( Rule :: EOI , | state | state . end_of_input ( ) ) } } pub use self :: visible :: * ; } :: pest :: state ( input , | state | { match rule { Rule :: grammar_rules => rules :: grammar_rules ( state ) , Rule :: grammar_rule => rules :: grammar_rule ( state ) , Rule :: assignment_operator => rules :: assignment_operator ( state ) , Rule :: opening_brace => rules :: opening_brace ( state ) , Rule :: closing_brace => rules :: closing_brace ( state ) , Rule :: opening_paren => rules :: opening_paren ( state ) , Rule :: closing_paren => rules :: closing_paren ( state ) , Rule :: opening_brack => rules :: opening_brack ( state ) , Rule :: closing_brack => rules :: closing_brack ( state ) , Rule :: modifier => rules :: modifier ( state ) , Rule :: silent_modifier => rules :: silent_modifier ( state ) , Rule :: atomic_modifier => rules :: atomic_modifier ( state ) , Rule :: compound_atomic_modifier => rules :: compound_atomic_modifier ( state ) , Rule :: non_atomic_modifier => rules :: non_atomic_modifier ( state ) , Rule :: expression => rules :: expression ( state ) , Rule :: term => rules :: term ( state ) , Rule :: node => rules :: node ( state ) , Rule :: terminal => rules :: terminal ( state ) , Rule :: prefix_operator => rules :: prefix_operator ( state ) , Rule :: infix_operator => rules :: infix_operator ( state ) , Rule :: postfix_operator => rules :: postfix_operator ( state ) , Rule :: positive_predicate_operator => rules :: positive_predicate_operator ( state ) , Rule :: negative_predicate_operator => rules :: negative_predicate_operator ( state ) , Rule :: sequence_operator => rules :: sequence_operator ( state ) , Rule :: choice_operator => rules :: choice_operator ( state ) , Rule :: optional_operator => rules :: optional_operator ( state ) , Rule :: repeat_operator => rules :: repeat_operator ( state ) , Rule :: repeat_once_operator => rules :: repeat_once_operator ( state ) , Rule :: repeat_exact => rules :: repeat_exact ( state ) , Rule :: repeat_min => rules :: repeat_min ( state ) , Rule :: repeat_max => rules :: repeat_max ( state ) , Rule :: repeat_min_max => rules :: repeat_min_max ( state ) , Rule :: number => rules :: number ( state ) , Rule :: integer => rules :: integer ( state ) , Rule :: comma => rules :: comma ( state ) , Rule :: _push => rules :: _push ( state ) , Rule :: peek_slice => rules :: peek_slice ( state ) , Rule :: identifier => rules :: identifier ( state ) , Rule :: alpha => rules :: alpha ( state ) , Rule :: alpha_num => rules :: alpha_num ( state ) , Rule :: string => rules :: string ( state ) , Rule :: insensitive_string => rules :: insensitive_string ( state ) , Rule :: range => rules :: range ( state ) , Rule :: character => rules :: character ( state ) , Rule :: inner_str => rules :: inner_str ( state ) , Rule :: inner_chr => rules :: inner_chr ( state ) , Rule :: escape => rules :: escape ( state ) , Rule :: code => rules :: code ( state ) , Rule :: unicode => rules :: unicode ( state ) , Rule :: hex_digit => rules :: hex_digit ( state ) , Rule :: quote => rules :: quote ( state ) , Rule :: single_quote => rules :: single_quote ( state ) , Rule :: range_operator => rules :: range_operator ( state ) , Rule :: newline => rules :: newline ( state ) , Rule :: WHITESPACE => rules :: WHITESPACE ( state ) , Rule :: block_comment => rules :: block_comment ( state ) , Rule :: COMMENT => rules :: COMMENT ( state ) , Rule :: EOI => rules :: EOI ( state ) } } ) } }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-#![allow(clippy::range_plus_one)]
-
-extern crate maplit;
-#[cfg(test)]
-#[macro_use]
-extern crate pest;
-#[cfg(not(test))]
-extern crate pest;
-
-use std::fmt::Display;
-
-pub mod ast;
-pub mod optimizer;
-pub mod parser;
-pub mod validator;
-
-pub fn unwrap_or_report<T, E>(result: Result<T, E>) -> T
-where
-    E: IntoIterator,
-    E::Item: Display,
-{
-    result.unwrap_or_else(|e| {
-        panic!(
-            "grammar error\n\n".to_owned()
-                + &e.into_iter()
-                    .map(|error| format!("{}", error))
-                    .collect::<Vec<_>>()
-                    .join("\n\n")
-        )
-    })
-}
-
-#[doc(hidden)]
-pub static UNICODE_PROPERTY_NAMES: &[&str] = &[
-    /* BINARY */ "ALPHABETIC",
-    "BIDI_CONTROL",
-    "CASE_IGNORABLE",
-    "CASED",
-    "CHANGES_WHEN_CASEFOLDED",
-    "CHANGES_WHEN_CASEMAPPED",
-    "CHANGES_WHEN_LOWERCASED",
-    "CHANGES_WHEN_TITLECASED",
-    "CHANGES_WHEN_UPPERCASED",
-    "DASH",
-    "DEFAULT_IGNORABLE_CODE_POINT",
-    "DEPRECATED",
-    "DIACRITIC",
-    "EXTENDER",
-    "GRAPHEME_BASE",
-    "GRAPHEME_EXTEND",
-    "GRAPHEME_LINK",
-    "HEX_DIGIT",
-    "HYPHEN",
-    "IDS_BINARY_OPERATOR",
-    "IDS_TRINARY_OPERATOR",
-    "ID_CONTINUE",
-    "ID_START",
-    "IDEOGRAPHIC",
-    "JOIN_CONTROL",
-    "LOGICAL_ORDER_EXCEPTION",
-    "LOWERCASE",
-    "MATH",
-    "NONCHARACTER_CODE_POINT",
-    "OTHER_ALPHABETIC",
-    "OTHER_DEFAULT_IGNORABLE_CODE_POINT",
-    "OTHER_GRAPHEME_EXTEND",
-    "OTHER_ID_CONTINUE",
-    "OTHER_ID_START",
-    "OTHER_LOWERCASE",
-    "OTHER_MATH",
-    "OTHER_UPPERCASE",
-    "PATTERN_SYNTAX",
-    "PATTERN_WHITE_SPACE",
-    "PREPENDED_CONCATENATION_MARK",
-    "QUOTATION_MARK",
-    "RADICAL",
-    "REGIONAL_INDICATOR",
-    "SENTENCE_TERMINAL",
-    "SOFT_DOTTED",
-    "TERMINAL_PUNCTUATION",
-    "UNIFIED_IDEOGRAPH",
-    "UPPERCASE",
-    "VARIATION_SELECTOR",
-    "WHITE_SPACE",
-    "XID_CONTINUE",
-    "XID_START",
-    /* CATEGORY */ "CASED_LETTER",
-    "CLOSE_PUNCTUATION",
-    "CONNECTOR_PUNCTUATION",
-    "CONTROL",
-    "CURRENCY_SYMBOL",
-    "DASH_PUNCTUATION",
-    "DECIMAL_NUMBER",
-    "ENCLOSING_MARK",
-    "FINAL_PUNCTUATION",
-    "FORMAT",
-    "INITIAL_PUNCTUATION",
-    "LETTER",
-    "LETTER_NUMBER",
-    "LINE_SEPARATOR",
-    "LOWERCASE_LETTER",
-    "MARK",
-    "MATH_SYMBOL",
-    "MODIFIER_LETTER",
-    "MODIFIER_SYMBOL",
-    "NONSPACING_MARK",
-    "NUMBER",
-    "OPEN_PUNCTUATION",
-    "OTHER",
-    "OTHER_LETTER",
-    "OTHER_NUMBER",
-    "OTHER_PUNCTUATION",
-    "OTHER_SYMBOL",
-    "PARAGRAPH_SEPARATOR",
-    "PRIVATE_USE",
-    "PUNCTUATION",
-    "SEPARATOR",
-    "SPACE_SEPARATOR",
-    "SPACING_MARK",
-    "SURROGATE",
-    "SYMBOL",
-    "TITLECASE_LETTER",
-    "UNASSIGNED",
-    "UPPERCASE_LETTER",
-];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/concatenator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/concatenator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/concatenator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/concatenator.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use ast::*;
-
-pub fn concatenate(rule: Rule) -> Rule {
-    match rule {
-        Rule { name, ty, expr } => Rule {
-            name,
-            ty,
-            expr: expr.map_bottom_up(|expr| {
-                if ty == RuleType::Atomic {
-                    // TODO: Use box syntax when it gets stabilized.
-                    match expr {
-                        Expr::Seq(lhs, rhs) => match (*lhs, *rhs) {
-                            (Expr::Str(lhs), Expr::Str(rhs)) => Expr::Str(lhs + &rhs),
-                            (Expr::Insens(lhs), Expr::Insens(rhs)) => Expr::Insens(lhs + &rhs),
-                            (lhs, rhs) => Expr::Seq(Box::new(lhs), Box::new(rhs)),
-                        },
-                        expr => expr,
-                    }
-                } else {
-                    expr
-                }
-            }),
-        },
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/factorizer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/factorizer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/factorizer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/factorizer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use ast::*;
-
-pub fn factor(rule: Rule) -> Rule {
-    match rule {
-        Rule { name, ty, expr } => Rule {
-            name,
-            ty,
-            expr: expr.map_top_down(|expr| {
-                // TODO: Use box syntax when it gets stabilized.
-                match expr {
-                    Expr::Choice(lhs, rhs) => match (*lhs, *rhs) {
-                        (Expr::Seq(l1, r1), Expr::Seq(l2, r2)) => {
-                            if l1 == l2 {
-                                Expr::Seq(l1, Box::new(Expr::Choice(r1, r2)))
-                            } else {
-                                Expr::Choice(
-                                    Box::new(Expr::Seq(l1, r1)),
-                                    Box::new(Expr::Seq(l2, r2)),
-                                )
-                            }
-                        }
-                        (lhs, rhs) => Expr::Choice(Box::new(lhs), Box::new(rhs)),
-                    },
-                    expr => expr,
-                }
-            }),
-        },
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,510 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use ast::*;
-use std::collections::HashMap;
-
-#[cfg(test)]
-macro_rules! box_tree {
-    ( $node:ident( $(                      $child:ident( $($args:tt)* )     ),+ ) ) => (
-      $node      ( $( Box::new( box_tree!( $child      ( $($args   )* ) ) ) ),+ )
-    );
-    ($expr:expr) => ($expr);
-}
-
-mod concatenator;
-mod factorizer;
-mod restorer;
-mod rotater;
-mod skipper;
-mod unroller;
-
-pub fn optimize(rules: Vec<Rule>) -> Vec<OptimizedRule> {
-    let optimized: Vec<OptimizedRule> = rules
-        .into_iter()
-        .map(rotater::rotate)
-        .map(skipper::skip)
-        .map(unroller::unroll)
-        .map(concatenator::concatenate)
-        .map(factorizer::factor)
-        .map(rule_to_optimized_rule)
-        .collect();
-
-    let rules = to_hash_map(&optimized);
-    optimized
-        .into_iter()
-        .map(|rule| restorer::restore_on_err(rule, &rules))
-        .collect()
-}
-
-fn rule_to_optimized_rule(rule: Rule) -> OptimizedRule {
-    fn to_optimized(expr: Expr) -> OptimizedExpr {
-        match expr {
-            Expr::Str(string) => OptimizedExpr::Str(string),
-            Expr::Insens(string) => OptimizedExpr::Insens(string),
-            Expr::Range(start, end) => OptimizedExpr::Range(start, end),
-            Expr::Ident(ident) => OptimizedExpr::Ident(ident),
-            Expr::PeekSlice(start, end) => OptimizedExpr::PeekSlice(start, end),
-            Expr::PosPred(expr) => OptimizedExpr::PosPred(Box::new(to_optimized(*expr))),
-            Expr::NegPred(expr) => OptimizedExpr::NegPred(Box::new(to_optimized(*expr))),
-            Expr::Seq(lhs, rhs) => {
-                OptimizedExpr::Seq(Box::new(to_optimized(*lhs)), Box::new(to_optimized(*rhs)))
-            }
-            Expr::Choice(lhs, rhs) => {
-                OptimizedExpr::Choice(Box::new(to_optimized(*lhs)), Box::new(to_optimized(*rhs)))
-            }
-            Expr::Opt(expr) => OptimizedExpr::Opt(Box::new(to_optimized(*expr))),
-            Expr::Rep(expr) => OptimizedExpr::Rep(Box::new(to_optimized(*expr))),
-            Expr::Skip(strings) => OptimizedExpr::Skip(strings),
-            Expr::Push(expr) => OptimizedExpr::Push(Box::new(to_optimized(*expr))),
-            Expr::RepOnce(_)
-            | Expr::RepExact(..)
-            | Expr::RepMin(..)
-            | Expr::RepMax(..)
-            | Expr::RepMinMax(..) => unreachable!("No valid transformation to OptimizedRule"),
-        }
-    }
-
-    OptimizedRule {
-        name: rule.name,
-        ty: rule.ty,
-        expr: to_optimized(rule.expr),
-    }
-}
-
-fn to_hash_map(rules: &[OptimizedRule]) -> HashMap<String, OptimizedExpr> {
-    rules
-        .iter()
-        .map(|r| (r.name.clone(), r.expr.clone()))
-        .collect()
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct OptimizedRule {
-    pub name: String,
-    pub ty: RuleType,
-    pub expr: OptimizedExpr,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum OptimizedExpr {
-    Str(String),
-    Insens(String),
-    Range(String, String),
-    Ident(String),
-    PeekSlice(i32, Option<i32>),
-    PosPred(Box<OptimizedExpr>),
-    NegPred(Box<OptimizedExpr>),
-    Seq(Box<OptimizedExpr>, Box<OptimizedExpr>),
-    Choice(Box<OptimizedExpr>, Box<OptimizedExpr>),
-    Opt(Box<OptimizedExpr>),
-    Rep(Box<OptimizedExpr>),
-    Skip(Vec<String>),
-    Push(Box<OptimizedExpr>),
-    RestoreOnErr(Box<OptimizedExpr>),
-}
-
-impl OptimizedExpr {
-    pub fn iter_top_down(&self) -> OptimizedExprTopDownIterator {
-        OptimizedExprTopDownIterator::new(self)
-    }
-
-    pub fn map_top_down<F>(self, mut f: F) -> OptimizedExpr
-    where
-        F: FnMut(OptimizedExpr) -> OptimizedExpr,
-    {
-        fn map_internal<F>(expr: OptimizedExpr, f: &mut F) -> OptimizedExpr
-        where
-            F: FnMut(OptimizedExpr) -> OptimizedExpr,
-        {
-            let expr = f(expr);
-
-            match expr {
-                // TODO: Use box syntax when it gets stabilized.
-                OptimizedExpr::PosPred(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::PosPred(mapped)
-                }
-                OptimizedExpr::NegPred(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::NegPred(mapped)
-                }
-                OptimizedExpr::Seq(lhs, rhs) => {
-                    let mapped_lhs = Box::new(map_internal(*lhs, f));
-                    let mapped_rhs = Box::new(map_internal(*rhs, f));
-                    OptimizedExpr::Seq(mapped_lhs, mapped_rhs)
-                }
-                OptimizedExpr::Choice(lhs, rhs) => {
-                    let mapped_lhs = Box::new(map_internal(*lhs, f));
-                    let mapped_rhs = Box::new(map_internal(*rhs, f));
-                    OptimizedExpr::Choice(mapped_lhs, mapped_rhs)
-                }
-                OptimizedExpr::Rep(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::Rep(mapped)
-                }
-                OptimizedExpr::Opt(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::Opt(mapped)
-                }
-                OptimizedExpr::Push(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::Push(mapped)
-                }
-                expr => expr,
-            }
-        }
-
-        map_internal(self, &mut f)
-    }
-
-    pub fn map_bottom_up<F>(self, mut f: F) -> OptimizedExpr
-    where
-        F: FnMut(OptimizedExpr) -> OptimizedExpr,
-    {
-        fn map_internal<F>(expr: OptimizedExpr, f: &mut F) -> OptimizedExpr
-        where
-            F: FnMut(OptimizedExpr) -> OptimizedExpr,
-        {
-            let mapped = match expr {
-                OptimizedExpr::PosPred(expr) => {
-                    // TODO: Use box syntax when it gets stabilized.
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::PosPred(mapped)
-                }
-                OptimizedExpr::NegPred(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::NegPred(mapped)
-                }
-                OptimizedExpr::Seq(lhs, rhs) => {
-                    let mapped_lhs = Box::new(map_internal(*lhs, f));
-                    let mapped_rhs = Box::new(map_internal(*rhs, f));
-                    OptimizedExpr::Seq(mapped_lhs, mapped_rhs)
-                }
-                OptimizedExpr::Choice(lhs, rhs) => {
-                    let mapped_lhs = Box::new(map_internal(*lhs, f));
-                    let mapped_rhs = Box::new(map_internal(*rhs, f));
-                    OptimizedExpr::Choice(mapped_lhs, mapped_rhs)
-                }
-                OptimizedExpr::Rep(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::Rep(mapped)
-                }
-                OptimizedExpr::Opt(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::Opt(mapped)
-                }
-                OptimizedExpr::Push(expr) => {
-                    let mapped = Box::new(map_internal(*expr, f));
-                    OptimizedExpr::Push(mapped)
-                }
-                expr => expr,
-            };
-
-            f(mapped)
-        }
-
-        map_internal(self, &mut f)
-    }
-}
-
-pub struct OptimizedExprTopDownIterator {
-    current: Option<OptimizedExpr>,
-    next: Option<OptimizedExpr>,
-    right_branches: Vec<OptimizedExpr>,
-}
-
-impl OptimizedExprTopDownIterator {
-    pub fn new(expr: &OptimizedExpr) -> Self {
-        let mut iter = OptimizedExprTopDownIterator {
-            current: None,
-            next: None,
-            right_branches: vec![],
-        };
-        iter.iterate_expr(expr.clone());
-        iter
-    }
-
-    fn iterate_expr(&mut self, expr: OptimizedExpr) {
-        self.current = Some(expr.clone());
-        match expr {
-            OptimizedExpr::Seq(lhs, rhs) => {
-                self.right_branches.push(*rhs);
-                self.next = Some(*lhs);
-            }
-            OptimizedExpr::Choice(lhs, rhs) => {
-                self.right_branches.push(*rhs);
-                self.next = Some(*lhs);
-            }
-            OptimizedExpr::PosPred(expr)
-            | OptimizedExpr::NegPred(expr)
-            | OptimizedExpr::Rep(expr)
-            | OptimizedExpr::Opt(expr)
-            | OptimizedExpr::Push(expr) => {
-                self.next = Some(*expr);
-            }
-            _ => {
-                self.next = None;
-            }
-        }
-    }
-}
-
-impl Iterator for OptimizedExprTopDownIterator {
-    type Item = OptimizedExpr;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let result = self.current.take();
-
-        if let Some(expr) = self.next.take() {
-            self.iterate_expr(expr);
-        } else if let Some(expr) = self.right_branches.pop() {
-            self.iterate_expr(expr);
-        }
-
-        result
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn rotate() {
-        let rules = {
-            use ast::Expr::*;
-            vec![Rule {
-                name: "rule".to_owned(),
-                ty: RuleType::Normal,
-                expr: box_tree!(Choice(
-                    Choice(
-                        Choice(Str(String::from("a")), Str(String::from("b"))),
-                        Str(String::from("c"))
-                    ),
-                    Str(String::from("d"))
-                )),
-            }]
-        };
-        let rotated = {
-            use optimizer::OptimizedExpr::*;
-            vec![OptimizedRule {
-                name: "rule".to_owned(),
-                ty: RuleType::Normal,
-                expr: box_tree!(Choice(
-                    Str(String::from("a")),
-                    Choice(
-                        Str(String::from("b")),
-                        Choice(Str(String::from("c")), Str(String::from("d")))
-                    )
-                )),
-            }]
-        };
-
-        assert_eq!(optimize(rules), rotated);
-    }
-
-    #[test]
-    fn skip() {
-        let rules = {
-            use ast::Expr::*;
-            vec![Rule {
-                name: "rule".to_owned(),
-                ty: RuleType::Atomic,
-                expr: box_tree!(Rep(Seq(
-                    NegPred(Choice(Str(String::from("a")), Str(String::from("b")))),
-                    Ident(String::from("ANY"))
-                ))),
-            }]
-        };
-        let skipped = vec![OptimizedRule {
-            name: "rule".to_owned(),
-            ty: RuleType::Atomic,
-            expr: OptimizedExpr::Skip(vec![String::from("a"), String::from("b")]),
-        }];
-
-        assert_eq!(optimize(rules), skipped);
-    }
-
-    #[test]
-    fn concat_strings() {
-        let rules = {
-            use ast::Expr::*;
-            vec![Rule {
-                name: "rule".to_owned(),
-                ty: RuleType::Atomic,
-                expr: box_tree!(Seq(
-                    Seq(Str(String::from("a")), Str(String::from("b"))),
-                    Seq(Str(String::from("c")), Str(String::from("d")))
-                )),
-            }]
-        };
-        let concatenated = vec![OptimizedRule {
-            name: "rule".to_owned(),
-            ty: RuleType::Atomic,
-            expr: OptimizedExpr::Str(String::from("abcd")),
-        }];
-
-        assert_eq!(optimize(rules), concatenated);
-    }
-
-    #[test]
-    fn unroll_loop_exact() {
-        let rules = vec![Rule {
-            name: "rule".to_owned(),
-            ty: RuleType::Atomic,
-            expr: Expr::RepExact(Box::new(Expr::Ident(String::from("a"))), 3),
-        }];
-        let unrolled = {
-            use optimizer::OptimizedExpr::*;
-            vec![OptimizedRule {
-                name: "rule".to_owned(),
-                ty: RuleType::Atomic,
-                expr: box_tree!(Seq(
-                    Ident(String::from("a")),
-                    Seq(Ident(String::from("a")), Ident(String::from("a")))
-                )),
-            }]
-        };
-
-        assert_eq!(optimize(rules), unrolled);
-    }
-
-    #[test]
-    fn unroll_loop_max() {
-        let rules = vec![Rule {
-            name: "rule".to_owned(),
-            ty: RuleType::Atomic,
-            expr: Expr::RepMax(Box::new(Expr::Str("a".to_owned())), 3),
-        }];
-        let unrolled = {
-            use optimizer::OptimizedExpr::*;
-            vec![OptimizedRule {
-                name: "rule".to_owned(),
-                ty: RuleType::Atomic,
-                expr: box_tree!(Seq(
-                    Opt(Str(String::from("a"))),
-                    Seq(Opt(Str(String::from("a"))), Opt(Str(String::from("a"))))
-                )),
-            }]
-        };
-
-        assert_eq!(optimize(rules), unrolled);
-    }
-
-    #[test]
-    fn unroll_loop_min() {
-        let rules = vec![Rule {
-            name: "rule".to_owned(),
-            ty: RuleType::Atomic,
-            expr: Expr::RepMin(Box::new(Expr::Str("a".to_owned())), 2),
-        }];
-        let unrolled = {
-            use optimizer::OptimizedExpr::*;
-            vec![OptimizedRule {
-                name: "rule".to_owned(),
-                ty: RuleType::Atomic,
-                expr: box_tree!(Seq(
-                    Str(String::from("a")),
-                    Seq(Str(String::from("a")), Rep(Str(String::from("a"))))
-                )),
-            }]
-        };
-
-        assert_eq!(optimize(rules), unrolled);
-    }
-
-    #[test]
-    fn unroll_loop_min_max() {
-        let rules = vec![Rule {
-            name: "rule".to_owned(),
-            ty: RuleType::Atomic,
-            expr: Expr::RepMinMax(Box::new(Expr::Str("a".to_owned())), 2, 3),
-        }];
-        let unrolled = {
-            use optimizer::OptimizedExpr::*;
-            vec![OptimizedRule {
-                name: "rule".to_owned(),
-                ty: RuleType::Atomic,
-                /* TODO possible room for improvement here:
-                 * if the sequences were rolled out in the opposite
-                 * order, we could further optimize the strings
-                 * in cases like this.
-                Str(String::from(("aa")),
-                Opt(Str(String::from("a")))
-                */
-                expr: box_tree!(Seq(
-                    Str(String::from("a")),
-                    Seq(Str(String::from("a")), Opt(Str(String::from("a"))))
-                )),
-            }]
-        };
-
-        assert_eq!(optimize(rules), unrolled);
-    }
-
-    #[test]
-    fn concat_insensitive_strings() {
-        let rules = {
-            use ast::Expr::*;
-            vec![Rule {
-                name: "rule".to_owned(),
-                ty: RuleType::Atomic,
-                expr: box_tree!(Seq(
-                    Seq(Insens(String::from("a")), Insens(String::from("b"))),
-                    Seq(Insens(String::from("c")), Insens(String::from("d")))
-                )),
-            }]
-        };
-        let concatenated = vec![OptimizedRule {
-            name: "rule".to_owned(),
-            ty: RuleType::Atomic,
-            expr: OptimizedExpr::Insens(String::from("abcd")),
-        }];
-
-        assert_eq!(optimize(rules), concatenated);
-    }
-
-    #[test]
-    fn long_common_sequence() {
-        let rules = {
-            use ast::Expr::*;
-            vec![Rule {
-                name: "rule".to_owned(),
-                ty: RuleType::Silent,
-                expr: box_tree!(Choice(
-                    Seq(
-                        Ident(String::from("a")),
-                        Seq(Ident(String::from("b")), Ident(String::from("c")))
-                    ),
-                    Seq(
-                        Seq(Ident(String::from("a")), Ident(String::from("b"))),
-                        Ident(String::from("d"))
-                    )
-                )),
-            }]
-        };
-        let optimized = {
-            use optimizer::OptimizedExpr::*;
-            vec![OptimizedRule {
-                name: "rule".to_owned(),
-                ty: RuleType::Silent,
-                expr: box_tree!(Seq(
-                    Ident(String::from("a")),
-                    Seq(
-                        Ident(String::from("b")),
-                        Choice(Ident(String::from("c")), Ident(String::from("d")))
-                    )
-                )),
-            }]
-        };
-
-        assert_eq!(optimize(rules), optimized);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/restorer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/restorer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/restorer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/restorer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-use std::collections::HashMap;
-
-use optimizer::*;
-
-pub fn restore_on_err(
-    rule: OptimizedRule,
-    rules: &HashMap<String, OptimizedExpr>,
-) -> OptimizedRule {
-    match rule {
-        OptimizedRule { name, ty, expr } => {
-            let expr = expr.map_bottom_up(|expr| wrap_branching_exprs(expr, rules));
-
-            OptimizedRule { name, ty, expr }
-        }
-    }
-}
-
-fn wrap_branching_exprs(
-    expr: OptimizedExpr,
-    rules: &HashMap<String, OptimizedExpr>,
-) -> OptimizedExpr {
-    match expr {
-        OptimizedExpr::Opt(expr) => {
-            if child_modifies_state(&expr, rules, &mut HashMap::new()) {
-                OptimizedExpr::Opt(Box::new(OptimizedExpr::RestoreOnErr(expr)))
-            } else {
-                OptimizedExpr::Opt(expr)
-            }
-        }
-        OptimizedExpr::Choice(lhs, rhs) => {
-            let wrapped_lhs = if child_modifies_state(&lhs, rules, &mut HashMap::new()) {
-                Box::new(OptimizedExpr::RestoreOnErr(lhs))
-            } else {
-                lhs
-            };
-            let wrapped_rhs = if child_modifies_state(&rhs, rules, &mut HashMap::new()) {
-                Box::new(OptimizedExpr::RestoreOnErr(rhs))
-            } else {
-                rhs
-            };
-            OptimizedExpr::Choice(wrapped_lhs, wrapped_rhs)
-        }
-        OptimizedExpr::Rep(expr) => {
-            if child_modifies_state(&expr, rules, &mut HashMap::new()) {
-                OptimizedExpr::Rep(Box::new(OptimizedExpr::RestoreOnErr(expr)))
-            } else {
-                OptimizedExpr::Rep(expr)
-            }
-        }
-        _ => expr,
-    }
-}
-
-fn child_modifies_state(
-    expr: &OptimizedExpr,
-    rules: &HashMap<String, OptimizedExpr>,
-    cache: &mut HashMap<String, Option<bool>>,
-) -> bool {
-    expr.iter_top_down().any(|expr| match expr {
-        OptimizedExpr::Push(_) => true,
-        OptimizedExpr::Ident(ref name) if name == "DROP" => true,
-        OptimizedExpr::Ident(ref name) if name == "POP" => true,
-        OptimizedExpr::Ident(ref name) => match cache.get(name).cloned() {
-            Some(option) => match option {
-                Some(cached) => cached,
-                None => {
-                    cache.insert(name.to_owned(), Some(false));
-                    false
-                }
-            },
-            None => {
-                cache.insert(name.to_owned(), None);
-
-                let result = match rules.get(name) {
-                    Some(expr) => child_modifies_state(expr, rules, cache),
-                    None => false,
-                };
-
-                cache.insert(name.to_owned(), Some(result));
-
-                result
-            }
-        },
-        _ => false,
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use optimizer::OptimizedExpr::*;
-
-    #[test]
-    fn restore_no_stack_children() {
-        let rules = vec![OptimizedRule {
-            name: "rule".to_owned(),
-            ty: RuleType::Normal,
-            expr: box_tree!(Opt(Str("a".to_string()))),
-        }];
-
-        assert_eq!(
-            restore_on_err(rules[0].clone(), &to_hash_map(&rules)),
-            rules[0].clone()
-        );
-    }
-
-    #[test]
-    fn restore_with_child_stack_ops() {
-        let rules = vec![OptimizedRule {
-            name: "rule".to_owned(),
-            ty: RuleType::Normal,
-            expr: box_tree!(Rep(Push(Str("a".to_string())))),
-        }];
-
-        let restored = OptimizedRule {
-            name: "rule".to_owned(),
-            ty: RuleType::Normal,
-            expr: box_tree!(Rep(RestoreOnErr(Push(Str("a".to_string()))))),
-        };
-
-        assert_eq!(
-            restore_on_err(rules[0].clone(), &to_hash_map(&rules)),
-            restored
-        );
-    }
-
-    #[test]
-    fn restore_choice_branch_with_and_branch_without() {
-        let rules = vec![OptimizedRule {
-            name: "rule".to_owned(),
-            ty: RuleType::Normal,
-            expr: box_tree!(Choice(Push(Str("a".to_string())), Str("a".to_string()))),
-        }];
-
-        let restored = OptimizedRule {
-            name: "rule".to_owned(),
-            ty: RuleType::Normal,
-            expr: box_tree!(Choice(
-                RestoreOnErr(Push(Str("a".to_string()))),
-                Str("a".to_string())
-            )),
-        };
-
-        assert_eq!(
-            restore_on_err(rules[0].clone(), &to_hash_map(&rules)),
-            restored
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/rotater.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/rotater.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/rotater.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/rotater.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use ast::*;
-
-pub fn rotate(rule: Rule) -> Rule {
-    fn rotate_internal(expr: Expr) -> Expr {
-        match expr {
-            // TODO: Use box syntax when it gets stabilized.
-            Expr::Seq(lhs, rhs) => {
-                let lhs = *lhs;
-                match lhs {
-                    Expr::Seq(ll, lr) => {
-                        rotate_internal(Expr::Seq(ll, Box::new(Expr::Seq(lr, rhs))))
-                    }
-                    lhs => Expr::Seq(Box::new(lhs), rhs),
-                }
-            }
-            Expr::Choice(lhs, rhs) => {
-                let lhs = *lhs;
-                match lhs {
-                    Expr::Choice(ll, lr) => {
-                        rotate_internal(Expr::Choice(ll, Box::new(Expr::Choice(lr, rhs))))
-                    }
-                    lhs => Expr::Choice(Box::new(lhs), rhs),
-                }
-            }
-            expr => expr,
-        }
-    }
-
-    match rule {
-        Rule { name, ty, expr } => Rule {
-            name,
-            ty,
-            expr: expr.map_top_down(rotate_internal),
-        },
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/skipper.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/skipper.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/skipper.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/skipper.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use ast::*;
-
-pub fn skip(rule: Rule) -> Rule {
-    fn populate_choices(expr: Expr, mut choices: Vec<String>) -> Option<Expr> {
-        match expr {
-            Expr::Choice(lhs, rhs) => {
-                if let Expr::Str(string) = *lhs {
-                    choices.push(string);
-                    populate_choices(*rhs, choices)
-                } else {
-                    None
-                }
-            }
-            Expr::Str(string) => {
-                choices.push(string);
-                Some(Expr::Skip(choices))
-            }
-            _ => None,
-        }
-    }
-
-    match rule {
-        Rule { name, ty, expr } => Rule {
-            name,
-            ty,
-            expr: if ty == RuleType::Atomic {
-                expr.map_top_down(|expr| {
-                    // TODO: Use box syntax when it gets stabilized.
-                    if let Expr::Rep(expr) = expr.clone() {
-                        if let Expr::Seq(lhs, rhs) = *expr.clone() {
-                            if let (Expr::NegPred(expr), Expr::Ident(ident)) = (*lhs, *rhs) {
-                                if ident == "ANY" {
-                                    if let Some(expr) = populate_choices(*expr, vec![]) {
-                                        return expr;
-                                    }
-                                }
-                            }
-                        }
-                    };
-
-                    expr
-                })
-            } else {
-                expr
-            },
-        },
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/unroller.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/unroller.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/optimizer/unroller.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/optimizer/unroller.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use ast::*;
-
-pub fn unroll(rule: Rule) -> Rule {
-    match rule {
-        Rule { name, ty, expr } => Rule {
-            name,
-            ty,
-            expr: expr.map_bottom_up(|expr| match expr {
-                Expr::RepOnce(expr) => Expr::Seq(expr.clone(), Box::new(Expr::Rep(expr))),
-                Expr::RepExact(expr, num) => (1..num + 1)
-                    .map(|_| *expr.clone())
-                    .rev()
-                    .fold(None, |rep, expr| match rep {
-                        None => Some(expr),
-                        Some(rep) => Some(Expr::Seq(Box::new(expr), Box::new(rep))),
-                    })
-                    .unwrap(),
-                Expr::RepMin(expr, min) => (1..min + 2)
-                    .map(|i| {
-                        if i <= min {
-                            *expr.clone()
-                        } else {
-                            Expr::Rep(expr.clone())
-                        }
-                    })
-                    .rev()
-                    .fold(None, |rep, expr| match rep {
-                        None => Some(expr),
-                        Some(rep) => Some(Expr::Seq(Box::new(expr), Box::new(rep))),
-                    })
-                    .unwrap(),
-                Expr::RepMax(expr, max) => (1..max + 1)
-                    .map(|_| Expr::Opt(expr.clone()))
-                    .rev()
-                    .fold(None, |rep, expr| match rep {
-                        None => Some(expr),
-                        Some(rep) => Some(Expr::Seq(Box::new(expr), Box::new(rep))),
-                    })
-                    .unwrap(),
-                Expr::RepMinMax(expr, min, max) => (1..max + 1)
-                    .map(|i| {
-                        if i <= min {
-                            *expr.clone()
-                        } else {
-                            Expr::Opt(expr.clone())
-                        }
-                    })
-                    .rev()
-                    .fold(None, |rep, expr| match rep {
-                        None => Some(expr),
-                        Some(rep) => Some(Expr::Seq(Box::new(expr), Box::new(rep))),
-                    })
-                    .unwrap(),
-                expr => expr,
-            }),
-        },
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/parser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/parser.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1488 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::char;
-use std::iter::Peekable;
-
-use pest::error::{Error, ErrorVariant};
-use pest::iterators::{Pair, Pairs};
-use pest::prec_climber::{Assoc, Operator, PrecClimber};
-use pest::{Parser, Span};
-
-use ast::{Expr, Rule as AstRule, RuleType};
-use validator;
-
-include!("grammar.rs");
-
-pub fn parse(rule: Rule, data: &str) -> Result<Pairs<Rule>, Error<Rule>> {
-    PestParser::parse(rule, data)
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct ParserRule<'i> {
-    pub name: String,
-    pub span: Span<'i>,
-    pub ty: RuleType,
-    pub node: ParserNode<'i>,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct ParserNode<'i> {
-    pub expr: ParserExpr<'i>,
-    pub span: Span<'i>,
-}
-
-impl<'i> ParserNode<'i> {
-    pub fn filter_map_top_down<F, T>(self, mut f: F) -> Vec<T>
-    where
-        F: FnMut(ParserNode<'i>) -> Option<T>,
-    {
-        pub fn filter_internal<'i, F, T>(node: ParserNode<'i>, f: &mut F, result: &mut Vec<T>)
-        where
-            F: FnMut(ParserNode<'i>) -> Option<T>,
-        {
-            if let Some(value) = f(node.clone()) {
-                result.push(value);
-            }
-
-            match node.expr {
-                // TODO: Use box syntax when it gets stabilized.
-                ParserExpr::PosPred(node) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::NegPred(node) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::Seq(lhs, rhs) => {
-                    filter_internal(*lhs, f, result);
-                    filter_internal(*rhs, f, result);
-                }
-                ParserExpr::Choice(lhs, rhs) => {
-                    filter_internal(*lhs, f, result);
-                    filter_internal(*rhs, f, result);
-                }
-                ParserExpr::Rep(node) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::RepOnce(node) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::RepExact(node, _) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::RepMin(node, _) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::RepMax(node, _) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::RepMinMax(node, ..) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::Opt(node) => {
-                    filter_internal(*node, f, result);
-                }
-                ParserExpr::Push(node) => {
-                    filter_internal(*node, f, result);
-                }
-                _ => (),
-            }
-        }
-
-        let mut result = vec![];
-
-        filter_internal(self, &mut f, &mut result);
-
-        result
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum ParserExpr<'i> {
-    Str(String),
-    Insens(String),
-    Range(String, String),
-    Ident(String),
-    PeekSlice(i32, Option<i32>),
-    PosPred(Box<ParserNode<'i>>),
-    NegPred(Box<ParserNode<'i>>),
-    Seq(Box<ParserNode<'i>>, Box<ParserNode<'i>>),
-    Choice(Box<ParserNode<'i>>, Box<ParserNode<'i>>),
-    Opt(Box<ParserNode<'i>>),
-    Rep(Box<ParserNode<'i>>),
-    RepOnce(Box<ParserNode<'i>>),
-    RepExact(Box<ParserNode<'i>>, u32),
-    RepMin(Box<ParserNode<'i>>, u32),
-    RepMax(Box<ParserNode<'i>>, u32),
-    RepMinMax(Box<ParserNode<'i>>, u32, u32),
-    Push(Box<ParserNode<'i>>),
-}
-
-fn convert_rule(rule: ParserRule) -> AstRule {
-    match rule {
-        ParserRule { name, ty, node, .. } => {
-            let expr = convert_node(node);
-
-            AstRule { name, ty, expr }
-        }
-    }
-}
-
-fn convert_node(node: ParserNode) -> Expr {
-    match node.expr {
-        ParserExpr::Str(string) => Expr::Str(string),
-        ParserExpr::Insens(string) => Expr::Insens(string),
-        ParserExpr::Range(start, end) => Expr::Range(start, end),
-        ParserExpr::Ident(ident) => Expr::Ident(ident),
-        ParserExpr::PeekSlice(start, end) => Expr::PeekSlice(start, end),
-        ParserExpr::PosPred(node) => Expr::PosPred(Box::new(convert_node(*node))),
-        ParserExpr::NegPred(node) => Expr::NegPred(Box::new(convert_node(*node))),
-        ParserExpr::Seq(node1, node2) => Expr::Seq(
-            Box::new(convert_node(*node1)),
-            Box::new(convert_node(*node2)),
-        ),
-        ParserExpr::Choice(node1, node2) => Expr::Choice(
-            Box::new(convert_node(*node1)),
-            Box::new(convert_node(*node2)),
-        ),
-        ParserExpr::Opt(node) => Expr::Opt(Box::new(convert_node(*node))),
-        ParserExpr::Rep(node) => Expr::Rep(Box::new(convert_node(*node))),
-        ParserExpr::RepOnce(node) => Expr::RepOnce(Box::new(convert_node(*node))),
-        ParserExpr::RepExact(node, num) => Expr::RepExact(Box::new(convert_node(*node)), num),
-        ParserExpr::RepMin(node, max) => Expr::RepMin(Box::new(convert_node(*node)), max),
-        ParserExpr::RepMax(node, max) => Expr::RepMax(Box::new(convert_node(*node)), max),
-        ParserExpr::RepMinMax(node, min, max) => {
-            Expr::RepMinMax(Box::new(convert_node(*node)), min, max)
-        }
-        ParserExpr::Push(node) => Expr::Push(Box::new(convert_node(*node))),
-    }
-}
-
-pub fn consume_rules(pairs: Pairs<Rule>) -> Result<Vec<AstRule>, Vec<Error<Rule>>> {
-    let rules = consume_rules_with_spans(pairs)?;
-    let errors = validator::validate_ast(&rules);
-    if errors.is_empty() {
-        Ok(rules.into_iter().map(convert_rule).collect())
-    } else {
-        Err(errors)
-    }
-}
-
-fn consume_rules_with_spans<'i>(
-    pairs: Pairs<'i, Rule>,
-) -> Result<Vec<ParserRule<'i>>, Vec<Error<Rule>>> {
-    let climber = PrecClimber::new(vec![
-        Operator::new(Rule::choice_operator, Assoc::Left),
-        Operator::new(Rule::sequence_operator, Assoc::Left),
-    ]);
-
-    pairs
-        .filter(|pair| pair.as_rule() == Rule::grammar_rule)
-        .map(|pair| {
-            let mut pairs = pair.into_inner().peekable();
-
-            let span = pairs.next().unwrap().as_span();
-            let name = span.as_str().to_owned();
-
-            pairs.next().unwrap(); // assignment_operator
-
-            let ty = if pairs.peek().unwrap().as_rule() != Rule::opening_brace {
-                match pairs.next().unwrap().as_rule() {
-                    Rule::silent_modifier => RuleType::Silent,
-                    Rule::atomic_modifier => RuleType::Atomic,
-                    Rule::compound_atomic_modifier => RuleType::CompoundAtomic,
-                    Rule::non_atomic_modifier => RuleType::NonAtomic,
-                    _ => unreachable!(),
-                }
-            } else {
-                RuleType::Normal
-            };
-
-            pairs.next().unwrap(); // opening_brace
-
-            let node = consume_expr(pairs.next().unwrap().into_inner().peekable(), &climber)?;
-
-            Ok(ParserRule {
-                name,
-                span,
-                ty,
-                node,
-            })
-        })
-        .collect()
-}
-
-fn consume_expr<'i>(
-    pairs: Peekable<Pairs<'i, Rule>>,
-    climber: &PrecClimber<Rule>,
-) -> Result<ParserNode<'i>, Vec<Error<Rule>>> {
-    fn unaries<'i>(
-        mut pairs: Peekable<Pairs<'i, Rule>>,
-        climber: &PrecClimber<Rule>,
-    ) -> Result<ParserNode<'i>, Vec<Error<Rule>>> {
-        let pair = pairs.next().unwrap();
-
-        let node = match pair.as_rule() {
-            Rule::opening_paren => {
-                let node = unaries(pairs, climber)?;
-                let end = node.span.end_pos();
-
-                ParserNode {
-                    expr: node.expr,
-                    span: pair.as_span().start_pos().span(&end),
-                }
-            }
-            Rule::positive_predicate_operator => {
-                let node = unaries(pairs, climber)?;
-                let end = node.span.end_pos();
-
-                ParserNode {
-                    expr: ParserExpr::PosPred(Box::new(node)),
-                    span: pair.as_span().start_pos().span(&end),
-                }
-            }
-            Rule::negative_predicate_operator => {
-                let node = unaries(pairs, climber)?;
-                let end = node.span.end_pos();
-
-                ParserNode {
-                    expr: ParserExpr::NegPred(Box::new(node)),
-                    span: pair.as_span().start_pos().span(&end),
-                }
-            }
-            other_rule => {
-                let node = match other_rule {
-                    Rule::expression => consume_expr(pair.into_inner().peekable(), climber)?,
-                    Rule::_push => {
-                        let start = pair.clone().as_span().start_pos();
-                        let mut pairs = pair.into_inner();
-                        pairs.next().unwrap(); // opening_paren
-                        let pair = pairs.next().unwrap();
-
-                        let node = consume_expr(pair.into_inner().peekable(), climber)?;
-                        let end = node.span.end_pos();
-
-                        ParserNode {
-                            expr: ParserExpr::Push(Box::new(node)),
-                            span: start.span(&end),
-                        }
-                    }
-                    Rule::peek_slice => {
-                        let mut pairs = pair.clone().into_inner();
-                        pairs.next().unwrap(); // opening_brack
-                        let pair_start = pairs.next().unwrap(); // .. or integer
-                        let start: i32 = match pair_start.as_rule() {
-                            Rule::range_operator => 0,
-                            Rule::integer => {
-                                pairs.next().unwrap(); // ..
-                                pair_start.as_str().parse().unwrap()
-                            }
-                            _ => unreachable!(),
-                        };
-                        let pair_end = pairs.next().unwrap(); // integer or }
-                        let end: Option<i32> = match pair_end.as_rule() {
-                            Rule::closing_brack => None,
-                            Rule::integer => {
-                                pairs.next().unwrap(); // }
-                                Some(pair_end.as_str().parse().unwrap())
-                            }
-                            _ => unreachable!(),
-                        };
-                        ParserNode {
-                            expr: ParserExpr::PeekSlice(start, end),
-                            span: pair.as_span(),
-                        }
-                    }
-                    Rule::identifier => ParserNode {
-                        expr: ParserExpr::Ident(pair.as_str().to_owned()),
-                        span: pair.clone().as_span(),
-                    },
-                    Rule::string => {
-                        let string = unescape(pair.as_str()).expect("incorrect string literal");
-                        ParserNode {
-                            expr: ParserExpr::Str(string[1..string.len() - 1].to_owned()),
-                            span: pair.clone().as_span(),
-                        }
-                    }
-                    Rule::insensitive_string => {
-                        let string = unescape(pair.as_str()).expect("incorrect string literal");
-                        ParserNode {
-                            expr: ParserExpr::Insens(string[2..string.len() - 1].to_owned()),
-                            span: pair.clone().as_span(),
-                        }
-                    }
-                    Rule::range => {
-                        let mut pairs = pair.into_inner();
-                        let pair = pairs.next().unwrap();
-                        let start = unescape(pair.as_str()).expect("incorrect char literal");
-                        let start_pos = pair.clone().as_span().start_pos();
-                        pairs.next();
-                        let pair = pairs.next().unwrap();
-                        let end = unescape(pair.as_str()).expect("incorrect char literal");
-                        let end_pos = pair.clone().as_span().end_pos();
-
-                        ParserNode {
-                            expr: ParserExpr::Range(
-                                start[1..start.len() - 1].to_owned(),
-                                end[1..end.len() - 1].to_owned(),
-                            ),
-                            span: start_pos.span(&end_pos),
-                        }
-                    }
-                    _ => unreachable!(),
-                };
-
-                pairs.fold(
-                    Ok(node),
-                    |node: Result<ParserNode<'i>, Vec<Error<Rule>>>, pair| {
-                        let node = node?;
-
-                        let node = match pair.as_rule() {
-                            Rule::optional_operator => {
-                                let start = node.span.start_pos();
-                                ParserNode {
-                                    expr: ParserExpr::Opt(Box::new(node)),
-                                    span: start.span(&pair.as_span().end_pos()),
-                                }
-                            }
-                            Rule::repeat_operator => {
-                                let start = node.span.start_pos();
-                                ParserNode {
-                                    expr: ParserExpr::Rep(Box::new(node)),
-                                    span: start.span(&pair.as_span().end_pos()),
-                                }
-                            }
-                            Rule::repeat_once_operator => {
-                                let start = node.span.start_pos();
-                                ParserNode {
-                                    expr: ParserExpr::RepOnce(Box::new(node)),
-                                    span: start.span(&pair.as_span().end_pos()),
-                                }
-                            }
-                            Rule::repeat_exact => {
-                                let mut inner = pair.clone().into_inner();
-
-                                inner.next().unwrap(); // opening_brace
-
-                                let number = inner.next().unwrap();
-                                let num = if let Ok(num) = number.as_str().parse::<u32>() {
-                                    num
-                                } else {
-                                    return Err(vec![Error::new_from_span(
-                                        ErrorVariant::CustomError {
-                                            message: "number cannot overflow u32".to_owned(),
-                                        },
-                                        number.as_span(),
-                                    )]);
-                                };
-
-                                if num == 0 {
-                                    let error: Error<Rule> = Error::new_from_span(
-                                        ErrorVariant::CustomError {
-                                            message: "cannot repeat 0 times".to_owned(),
-                                        },
-                                        number.as_span(),
-                                    );
-
-                                    return Err(vec![error]);
-                                }
-
-                                let start = node.span.start_pos();
-                                ParserNode {
-                                    expr: ParserExpr::RepExact(Box::new(node), num),
-                                    span: start.span(&pair.as_span().end_pos()),
-                                }
-                            }
-                            Rule::repeat_min => {
-                                let mut inner = pair.clone().into_inner();
-
-                                inner.next().unwrap(); // opening_brace
-
-                                let min_number = inner.next().unwrap();
-                                let min = if let Ok(min) = min_number.as_str().parse::<u32>() {
-                                    min
-                                } else {
-                                    return Err(vec![Error::new_from_span(
-                                        ErrorVariant::CustomError {
-                                            message: "number cannot overflow u32".to_owned(),
-                                        },
-                                        min_number.as_span(),
-                                    )]);
-                                };
-
-                                let start = node.span.start_pos();
-                                ParserNode {
-                                    expr: ParserExpr::RepMin(Box::new(node), min),
-                                    span: start.span(&pair.as_span().end_pos()),
-                                }
-                            }
-                            Rule::repeat_max => {
-                                let mut inner = pair.clone().into_inner();
-
-                                inner.next().unwrap(); // opening_brace
-                                inner.next().unwrap(); // comma
-
-                                let max_number = inner.next().unwrap();
-                                let max = if let Ok(max) = max_number.as_str().parse::<u32>() {
-                                    max
-                                } else {
-                                    return Err(vec![Error::new_from_span(
-                                        ErrorVariant::CustomError {
-                                            message: "number cannot overflow u32".to_owned(),
-                                        },
-                                        max_number.as_span(),
-                                    )]);
-                                };
-
-                                if max == 0 {
-                                    let error: Error<Rule> = Error::new_from_span(
-                                        ErrorVariant::CustomError {
-                                            message: "cannot repeat 0 times".to_owned(),
-                                        },
-                                        max_number.as_span(),
-                                    );
-
-                                    return Err(vec![error]);
-                                }
-
-                                let start = node.span.start_pos();
-                                ParserNode {
-                                    expr: ParserExpr::RepMax(Box::new(node), max),
-                                    span: start.span(&pair.as_span().end_pos()),
-                                }
-                            }
-                            Rule::repeat_min_max => {
-                                let mut inner = pair.clone().into_inner();
-
-                                inner.next().unwrap(); // opening_brace
-
-                                let min_number = inner.next().unwrap();
-                                let min = if let Ok(min) = min_number.as_str().parse::<u32>() {
-                                    min
-                                } else {
-                                    return Err(vec![Error::new_from_span(
-                                        ErrorVariant::CustomError {
-                                            message: "number cannot overflow u32".to_owned(),
-                                        },
-                                        min_number.as_span(),
-                                    )]);
-                                };
-
-                                inner.next().unwrap(); // comma
-
-                                let max_number = inner.next().unwrap();
-                                let max = if let Ok(max) = max_number.as_str().parse::<u32>() {
-                                    max
-                                } else {
-                                    return Err(vec![Error::new_from_span(
-                                        ErrorVariant::CustomError {
-                                            message: "number cannot overflow u32".to_owned(),
-                                        },
-                                        max_number.as_span(),
-                                    )]);
-                                };
-
-                                if max == 0 {
-                                    let error: Error<Rule> = Error::new_from_span(
-                                        ErrorVariant::CustomError {
-                                            message: "cannot repeat 0 times".to_owned(),
-                                        },
-                                        max_number.as_span(),
-                                    );
-
-                                    return Err(vec![error]);
-                                }
-
-                                let start = node.span.start_pos();
-                                ParserNode {
-                                    expr: ParserExpr::RepMinMax(Box::new(node), min, max),
-                                    span: start.span(&pair.as_span().end_pos()),
-                                }
-                            }
-                            Rule::closing_paren => {
-                                let start = node.span.start_pos();
-
-                                ParserNode {
-                                    expr: node.expr,
-                                    span: start.span(&pair.as_span().end_pos()),
-                                }
-                            }
-                            _ => unreachable!(),
-                        };
-
-                        Ok(node)
-                    },
-                )?
-            }
-        };
-
-        Ok(node)
-    }
-
-    let term = |pair: Pair<'i, Rule>| unaries(pair.into_inner().peekable(), climber);
-    let infix = |lhs: Result<ParserNode<'i>, Vec<Error<Rule>>>,
-                 op: Pair<'i, Rule>,
-                 rhs: Result<ParserNode<'i>, Vec<Error<Rule>>>| match op.as_rule() {
-        Rule::sequence_operator => {
-            let lhs = lhs?;
-            let rhs = rhs?;
-
-            let start = lhs.span.start_pos();
-            let end = rhs.span.end_pos();
-
-            Ok(ParserNode {
-                expr: ParserExpr::Seq(Box::new(lhs), Box::new(rhs)),
-                span: start.span(&end),
-            })
-        }
-        Rule::choice_operator => {
-            let lhs = lhs?;
-            let rhs = rhs?;
-
-            let start = lhs.span.start_pos();
-            let end = rhs.span.end_pos();
-
-            Ok(ParserNode {
-                expr: ParserExpr::Choice(Box::new(lhs), Box::new(rhs)),
-                span: start.span(&end),
-            })
-        }
-        _ => unreachable!(),
-    };
-
-    climber.climb(pairs, term, infix)
-}
-
-fn unescape(string: &str) -> Option<String> {
-    let mut result = String::new();
-    let mut chars = string.chars();
-
-    loop {
-        match chars.next() {
-            Some('\\') => match chars.next()? {
-                '"' => result.push('"'),
-                '\\' => result.push('\\'),
-                'r' => result.push('\r'),
-                'n' => result.push('\n'),
-                't' => result.push('\t'),
-                '0' => result.push('\0'),
-                '\'' => result.push('\''),
-                'x' => {
-                    let string: String = chars.clone().take(2).collect();
-
-                    if string.len() != 2 {
-                        return None;
-                    }
-
-                    for _ in 0..string.len() {
-                        chars.next()?;
-                    }
-
-                    let value = u8::from_str_radix(&string, 16).ok()?;
-
-                    result.push(char::from(value));
-                }
-                'u' => {
-                    if chars.next()? != '{' {
-                        return None;
-                    }
-
-                    let string: String = chars.clone().take_while(|c| *c != '}').collect();
-
-                    if string.len() < 2 || 6 < string.len() {
-                        return None;
-                    }
-
-                    for _ in 0..string.len() + 1 {
-                        chars.next()?;
-                    }
-
-                    let value = u32::from_str_radix(&string, 16).ok()?;
-
-                    result.push(char::from_u32(value)?);
-                }
-                _ => return None,
-            },
-            Some(c) => result.push(c),
-            None => return Some(result),
-        };
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::unwrap_or_report;
-    use super::*;
-
-    #[test]
-    fn rules() {
-        parses_to! {
-            parser: PestParser,
-            input: "a = { b } c = { d }",
-            rule: Rule::grammar_rules,
-            tokens: [
-                grammar_rule(0, 9, [
-                    identifier(0, 1),
-                    assignment_operator(2, 3),
-                    opening_brace(4, 5),
-                    expression(6, 8, [
-                        term(6, 8, [
-                            identifier(6, 7)
-                        ])
-                    ]),
-                    closing_brace(8, 9)
-                ]),
-                grammar_rule(10, 19, [
-                    identifier(10, 11),
-                    assignment_operator(12, 13),
-                    opening_brace(14, 15),
-                    expression(16, 18, [
-                        term(16, 18, [
-                            identifier(16, 17)
-                        ])
-                    ]),
-                    closing_brace(18, 19)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn rule() {
-        parses_to! {
-            parser: PestParser,
-            input: "a = ! { b ~ c }",
-            rule: Rule::grammar_rule,
-            tokens: [
-                grammar_rule(0, 15, [
-                    identifier(0, 1),
-                    assignment_operator(2, 3),
-                    non_atomic_modifier(4, 5),
-                    opening_brace(6, 7),
-                    expression(8, 14, [
-                        term(8, 10, [
-                            identifier(8, 9)
-                        ]),
-                        sequence_operator(10, 11),
-                        term(12, 14, [
-                            identifier(12, 13)
-                        ])
-                    ]),
-                    closing_brace(14, 15)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn expression() {
-        parses_to! {
-            parser: PestParser,
-            input: "_a | 'a'..'b' ~ !^\"abc\" ~ (d | e)*?",
-            rule: Rule::expression,
-            tokens: [
-                expression(0, 35, [
-                    term(0, 3, [
-                        identifier(0, 2)
-                    ]),
-                    choice_operator(3, 4),
-                    term(5, 14, [
-                        range(5, 13, [
-                            character(5, 8, [
-                                single_quote(5, 6),
-                                inner_chr(6, 7),
-                                single_quote(7, 8)
-                            ]),
-                            range_operator(8, 10),
-                            character(10, 13, [
-                                single_quote(10, 11),
-                                inner_chr(11, 12),
-                                single_quote(12, 13)
-                            ])
-                        ])
-                    ]),
-                    sequence_operator(14, 15),
-                    term(16, 24, [
-                        negative_predicate_operator(16, 17),
-                        insensitive_string(17, 23, [
-                            string(18, 23, [
-                                quote(18, 19),
-                                inner_str(19, 22),
-                                quote(22, 23)
-                            ])
-                        ])
-                    ]),
-                    sequence_operator(24, 25),
-                    term(26, 35, [
-                        opening_paren(26, 27),
-                        expression(27, 32, [
-                            term(27, 29, [
-                                identifier(27, 28)
-                            ]),
-                            choice_operator(29, 30),
-                            term(31, 32, [
-                                identifier(31, 32)
-                            ])
-                        ]),
-                        closing_paren(32, 33),
-                        repeat_operator(33, 34),
-                        optional_operator(34, 35)
-                    ])
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn repeat_exact() {
-        parses_to! {
-            parser: PestParser,
-            input: "{1}",
-            rule: Rule::repeat_exact,
-            tokens: [
-                repeat_exact(0, 3, [
-                    opening_brace(0, 1),
-                    number(1, 2),
-                    closing_brace(2, 3)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn repeat_min() {
-        parses_to! {
-            parser: PestParser,
-            input: "{2,}",
-            rule: Rule::repeat_min,
-            tokens: [
-                repeat_min(0, 4, [
-                    opening_brace(0,1),
-                    number(1,2),
-                    comma(2,3),
-                    closing_brace(3,4)
-                ])
-            ]
-        }
-    }
-
-    #[test]
-    fn repeat_max() {
-        parses_to! {
-            parser: PestParser,
-            input: "{, 3}",
-            rule: Rule::repeat_max,
-            tokens: [
-                repeat_max(0, 5, [
-                    opening_brace(0,1),
-                    comma(1,2),
-                    number(3,4),
-                    closing_brace(4,5)
-                ])
-            ]
-        }
-    }
-
-    #[test]
-    fn repeat_min_max() {
-        parses_to! {
-            parser: PestParser,
-            input: "{1, 2}",
-            rule: Rule::repeat_min_max,
-            tokens: [
-                repeat_min_max(0, 6, [
-                    opening_brace(0, 1),
-                    number(1, 2),
-                    comma(2, 3),
-                    number(4, 5),
-                    closing_brace(5, 6)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn push() {
-        parses_to! {
-            parser: PestParser,
-            input: "PUSH ( a )",
-            rule: Rule::_push,
-            tokens: [
-                _push(0, 10, [
-                    opening_paren(5, 6),
-                    expression(7, 9, [
-                        term(7, 9, [
-                            identifier(7, 8)
-                        ])
-                    ]),
-                    closing_paren(9, 10)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn peek_slice_all() {
-        parses_to! {
-            parser: PestParser,
-            input: "PEEK[..]",
-            rule: Rule::peek_slice,
-            tokens: [
-                peek_slice(0, 8, [
-                    opening_brack(4, 5),
-                    range_operator(5, 7),
-                    closing_brack(7, 8)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn peek_slice_start() {
-        parses_to! {
-            parser: PestParser,
-            input: "PEEK[1..]",
-            rule: Rule::peek_slice,
-            tokens: [
-                peek_slice(0, 9, [
-                    opening_brack(4, 5),
-                    integer(5, 6),
-                    range_operator(6, 8),
-                    closing_brack(8, 9)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn peek_slice_end() {
-        parses_to! {
-            parser: PestParser,
-            input: "PEEK[ ..-1]",
-            rule: Rule::peek_slice,
-            tokens: [
-                peek_slice(0, 11, [
-                    opening_brack(4, 5),
-                    range_operator(6, 8),
-                    integer(8, 10),
-                    closing_brack(10, 11)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn peek_slice_start_end() {
-        parses_to! {
-            parser: PestParser,
-            input: "PEEK[-5..10]",
-            rule: Rule::peek_slice,
-            tokens: [
-                peek_slice(0, 12, [
-                    opening_brack(4, 5),
-                    integer(5, 7),
-                    range_operator(7, 9),
-                    integer(9, 11),
-                    closing_brack(11, 12)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn identifier() {
-        parses_to! {
-            parser: PestParser,
-            input: "_a8943",
-            rule: Rule::identifier,
-            tokens: [
-                identifier(0, 6)
-            ]
-        };
-    }
-
-    #[test]
-    fn string() {
-        parses_to! {
-            parser: PestParser,
-            input: "\"aaaaa\\n\\r\\t\\\\\\0\\'\\\"\\x0F\\u{123abC}\\u{12}aaaaa\"",
-            rule: Rule::string,
-            tokens: [
-                string(0, 46, [
-                    quote(0, 1),
-                    inner_str(1, 45),
-                    quote(45, 46)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn insensitive_string() {
-        parses_to! {
-            parser: PestParser,
-            input: "^  \"\\\"hi\"",
-            rule: Rule::insensitive_string,
-            tokens: [
-                insensitive_string(0, 9, [
-                    string(3, 9, [
-                        quote(3, 4),
-                        inner_str(4, 8),
-                        quote(8, 9)
-                    ])
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn range() {
-        parses_to! {
-            parser: PestParser,
-            input: "'\\n' .. '\\x1a'",
-            rule: Rule::range,
-            tokens: [
-                range(0, 14, [
-                    character(0, 4, [
-                        single_quote(0, 1),
-                        inner_chr(1, 3),
-                        single_quote(3, 4)
-                    ]),
-                    range_operator(5, 7),
-                    character(8, 14, [
-                        single_quote(8, 9),
-                        inner_chr(9, 13),
-                        single_quote(13, 14)
-                    ])
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn character() {
-        parses_to! {
-            parser: PestParser,
-            input: "'\\u{123abC}'",
-            rule: Rule::character,
-            tokens: [
-                character(0, 12, [
-                    single_quote(0, 1),
-                    inner_chr(1, 11),
-                    single_quote(11, 12)
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn number() {
-        parses_to! {
-            parser: PestParser,
-            input: "0123",
-            rule: Rule::number,
-            tokens: [
-                number(0, 4)
-            ]
-        };
-    }
-
-    #[test]
-    fn comment() {
-        parses_to! {
-            parser: PestParser,
-            input: "a ~    // asda\n b",
-            rule: Rule::expression,
-            tokens: [
-                expression(0, 17, [
-                    term(0, 2, [
-                        identifier(0, 1)
-                    ]),
-                    sequence_operator(2, 3),
-                    term(16, 17, [
-                        identifier(16, 17)
-                    ])
-                ])
-            ]
-        };
-    }
-
-    #[test]
-    fn wrong_identifier() {
-        fails_with! {
-            parser: PestParser,
-            input: "0",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::identifier],
-            negatives: vec![],
-            pos: 0
-        };
-    }
-
-    #[test]
-    fn missing_assignment_operator() {
-        fails_with! {
-            parser: PestParser,
-            input: "a {}",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::assignment_operator],
-            negatives: vec![],
-            pos: 2
-        };
-    }
-
-    #[test]
-    fn wrong_modifier() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = *{}",
-            rule: Rule::grammar_rules,
-            positives: vec![
-                Rule::opening_brace,
-                Rule::silent_modifier,
-                Rule::atomic_modifier,
-                Rule::compound_atomic_modifier,
-                Rule::non_atomic_modifier
-            ],
-            negatives: vec![],
-            pos: 4
-        };
-    }
-
-    #[test]
-    fn missing_opening_brace() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = _",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::opening_brace],
-            negatives: vec![],
-            pos: 5
-        };
-    }
-
-    #[test]
-    fn empty_rule() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = {}",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::term],
-            negatives: vec![],
-            pos: 5
-        };
-    }
-
-    #[test]
-    fn missing_rhs() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { b ~ }",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::term],
-            negatives: vec![],
-            pos: 10
-        };
-    }
-
-    #[test]
-    fn wrong_op() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { b % }",
-            rule: Rule::grammar_rules,
-            positives: vec![
-                Rule::opening_brace,
-                Rule::closing_brace,
-                Rule::sequence_operator,
-                Rule::choice_operator,
-                Rule::optional_operator,
-                Rule::repeat_operator,
-                Rule::repeat_once_operator
-            ],
-            negatives: vec![],
-            pos: 8
-        };
-    }
-
-    #[test]
-    fn missing_closing_paren() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { (b }",
-            rule: Rule::grammar_rules,
-            positives: vec![
-                Rule::opening_brace,
-                Rule::closing_paren,
-                Rule::sequence_operator,
-                Rule::choice_operator,
-                Rule::optional_operator,
-                Rule::repeat_operator,
-                Rule::repeat_once_operator
-            ],
-            negatives: vec![],
-            pos: 9
-        };
-    }
-
-    #[test]
-    fn missing_term() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { ! }",
-            rule: Rule::grammar_rules,
-            positives: vec![
-                Rule::opening_paren,
-                Rule::positive_predicate_operator,
-                Rule::negative_predicate_operator,
-                Rule::_push,
-                Rule::peek_slice,
-                Rule::identifier,
-                Rule::insensitive_string,
-                Rule::quote,
-                Rule::single_quote
-            ],
-            negatives: vec![],
-            pos: 8
-        };
-    }
-
-    #[test]
-    fn string_missing_ending_quote() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { \" }",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::quote],
-            negatives: vec![],
-            pos: 9
-        };
-    }
-
-    #[test]
-    fn insensitive_missing_string() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { ^ }",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::quote],
-            negatives: vec![],
-            pos: 8
-        };
-    }
-
-    #[test]
-    fn char_missing_ending_single_quote() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { \' }",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::single_quote],
-            negatives: vec![],
-            pos: 8
-        };
-    }
-
-    #[test]
-    fn range_missing_range_operator() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { \'a\' }",
-            rule: Rule::grammar_rules,
-            positives: vec![Rule::range_operator],
-            negatives: vec![],
-            pos: 10
-        };
-    }
-
-    #[test]
-    fn wrong_postfix() {
-        fails_with! {
-            parser: PestParser,
-            input: "a = { a& }",
-            rule: Rule::grammar_rules,
-            positives: vec![
-                Rule::opening_brace,
-                Rule::closing_brace,
-                Rule::sequence_operator,
-                Rule::choice_operator,
-                Rule::optional_operator,
-                Rule::repeat_operator,
-                Rule::repeat_once_operator
-            ],
-            negatives: vec![],
-            pos: 7
-        };
-    }
-
-    #[test]
-    fn ast() {
-        let input =
-            "rule = _{ a{1} ~ \"a\"{3,} ~ b{, 2} ~ \"b\"{1, 2} | !(^\"c\" | PUSH('d'..'e'))?* }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        let ast = consume_rules_with_spans(pairs).unwrap();
-        let ast: Vec<_> = ast.into_iter().map(|rule| convert_rule(rule)).collect();
-
-        assert_eq!(
-            ast,
-            vec![AstRule {
-                name: "rule".to_owned(),
-                ty: RuleType::Silent,
-                expr: Expr::Choice(
-                    Box::new(Expr::Seq(
-                        Box::new(Expr::Seq(
-                            Box::new(Expr::Seq(
-                                Box::new(Expr::RepExact(Box::new(Expr::Ident("a".to_owned())), 1)),
-                                Box::new(Expr::RepMin(Box::new(Expr::Str("a".to_owned())), 3))
-                            )),
-                            Box::new(Expr::RepMax(Box::new(Expr::Ident("b".to_owned())), 2))
-                        )),
-                        Box::new(Expr::RepMinMax(Box::new(Expr::Str("b".to_owned())), 1, 2))
-                    )),
-                    Box::new(Expr::NegPred(Box::new(Expr::Rep(Box::new(Expr::Opt(
-                        Box::new(Expr::Choice(
-                            Box::new(Expr::Insens("c".to_owned())),
-                            Box::new(Expr::Push(Box::new(Expr::Range(
-                                "d".to_owned(),
-                                "e".to_owned()
-                            ))))
-                        ))
-                    ))))))
-                )
-            },]
-        );
-    }
-
-    #[test]
-    fn ast_peek_slice() {
-        let input = "rule = _{ PEEK[-04..] ~ PEEK[..3] }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        let ast = consume_rules_with_spans(pairs).unwrap();
-        let ast: Vec<_> = ast.into_iter().map(|rule| convert_rule(rule)).collect();
-
-        assert_eq!(
-            ast,
-            vec![AstRule {
-                name: "rule".to_owned(),
-                ty: RuleType::Silent,
-                expr: Expr::Seq(
-                    Box::new(Expr::PeekSlice(-4, None)),
-                    Box::new(Expr::PeekSlice(0, Some(3))),
-                )
-            }],
-        );
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:13
-  |
-1 | rule = { \"\"{4294967297} }
-  |             ^--------^
-  |
-  = number cannot overflow u32")]
-    fn repeat_exact_overflow() {
-        let input = "rule = { \"\"{4294967297} }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        unwrap_or_report(consume_rules_with_spans(pairs));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:13
-  |
-1 | rule = { \"\"{0} }
-  |             ^
-  |
-  = cannot repeat 0 times")]
-    fn repeat_exact_zero() {
-        let input = "rule = { \"\"{0} }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        unwrap_or_report(consume_rules_with_spans(pairs));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:13
-  |
-1 | rule = { \"\"{4294967297,} }
-  |             ^--------^
-  |
-  = number cannot overflow u32")]
-    fn repeat_min_overflow() {
-        let input = "rule = { \"\"{4294967297,} }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        unwrap_or_report(consume_rules_with_spans(pairs));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:14
-  |
-1 | rule = { \"\"{,4294967297} }
-  |              ^--------^
-  |
-  = number cannot overflow u32")]
-    fn repeat_max_overflow() {
-        let input = "rule = { \"\"{,4294967297} }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        unwrap_or_report(consume_rules_with_spans(pairs));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:14
-  |
-1 | rule = { \"\"{,0} }
-  |              ^
-  |
-  = cannot repeat 0 times")]
-    fn repeat_max_zero() {
-        let input = "rule = { \"\"{,0} }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        unwrap_or_report(consume_rules_with_spans(pairs));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:13
-  |
-1 | rule = { \"\"{4294967297,4294967298} }
-  |             ^--------^
-  |
-  = number cannot overflow u32")]
-    fn repeat_min_max_overflow() {
-        let input = "rule = { \"\"{4294967297,4294967298} }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        unwrap_or_report(consume_rules_with_spans(pairs));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:15
-  |
-1 | rule = { \"\"{0,0} }
-  |               ^
-  |
-  = cannot repeat 0 times")]
-    fn repeat_min_max_zero() {
-        let input = "rule = { \"\"{0,0} }";
-
-        let pairs = PestParser::parse(Rule::grammar_rules, input).unwrap();
-        unwrap_or_report(consume_rules_with_spans(pairs));
-    }
-
-    #[test]
-    fn unescape_all() {
-        let string = r"a\nb\x55c\u{111}d";
-
-        assert_eq!(unescape(string), Some("a\nb\x55c\u{111}d".to_owned()));
-    }
-
-    #[test]
-    fn unescape_empty_escape() {
-        let string = r"\";
-
-        assert_eq!(unescape(string), None);
-    }
-
-    #[test]
-    fn unescape_wrong_escape() {
-        let string = r"\w";
-
-        assert_eq!(unescape(string), None);
-    }
-
-    #[test]
-    fn unescape_backslash() {
-        let string = "\\\\";
-        assert_eq!(unescape(string), Some("\\".to_owned()));
-    }
-
-    #[test]
-    fn unescape_return() {
-        let string = "\\r";
-        assert_eq!(unescape(string), Some("\r".to_owned()));
-    }
-
-    #[test]
-    fn unescape_tab() {
-        let string = "\\t";
-        assert_eq!(unescape(string), Some("\t".to_owned()));
-    }
-
-    #[test]
-    fn unescape_null() {
-        let string = "\\0";
-        assert_eq!(unescape(string), Some("\0".to_owned()));
-    }
-
-    #[test]
-    fn unescape_single_quote() {
-        let string = "\\'";
-        assert_eq!(unescape(string), Some("\'".to_owned()));
-    }
-
-    #[test]
-    fn unescape_wrong_byte() {
-        let string = r"\xfg";
-
-        assert_eq!(unescape(string), None);
-    }
-
-    #[test]
-    fn unescape_short_byte() {
-        let string = r"\xf";
-
-        assert_eq!(unescape(string), None);
-    }
-
-    #[test]
-    fn unescape_no_open_brace_unicode() {
-        let string = r"\u11";
-
-        assert_eq!(unescape(string), None);
-    }
-
-    #[test]
-    fn unescape_no_close_brace_unicode() {
-        let string = r"\u{11";
-
-        assert_eq!(unescape(string), None);
-    }
-
-    #[test]
-    fn unescape_short_unicode() {
-        let string = r"\u{1}";
-
-        assert_eq!(unescape(string), None);
-    }
-
-    #[test]
-    fn unescape_long_unicode() {
-        let string = r"\u{1111111}";
-
-        assert_eq!(unescape(string), None);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/validator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/validator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pest_meta/src/validator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pest_meta/src/validator.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,851 +0,0 @@
-// pest. The Elegant Parser
-// Copyright (c) 2018 DragoÈ™ Tiselice
-//
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. All files in the project carrying such notice may not be copied,
-// modified, or distributed except according to those terms.
-
-use std::collections::{HashMap, HashSet};
-
-use pest::error::{Error, ErrorVariant, InputLocation};
-use pest::iterators::Pairs;
-use pest::Span;
-
-use parser::{ParserExpr, ParserNode, ParserRule, Rule};
-use UNICODE_PROPERTY_NAMES;
-
-#[allow(clippy::needless_pass_by_value)]
-pub fn validate_pairs<'i>(pairs: Pairs<'i, Rule>) -> Result<Vec<&'i str>, Vec<Error<Rule>>> {
-    let mut rust_keywords = HashSet::new();
-    rust_keywords.insert("abstract");
-    rust_keywords.insert("alignof");
-    rust_keywords.insert("as");
-    rust_keywords.insert("become");
-    rust_keywords.insert("box");
-    rust_keywords.insert("break");
-    rust_keywords.insert("const");
-    rust_keywords.insert("continue");
-    rust_keywords.insert("crate");
-    rust_keywords.insert("do");
-    rust_keywords.insert("else");
-    rust_keywords.insert("enum");
-    rust_keywords.insert("extern");
-    rust_keywords.insert("false");
-    rust_keywords.insert("final");
-    rust_keywords.insert("fn");
-    rust_keywords.insert("for");
-    rust_keywords.insert("if");
-    rust_keywords.insert("impl");
-    rust_keywords.insert("in");
-    rust_keywords.insert("let");
-    rust_keywords.insert("loop");
-    rust_keywords.insert("macro");
-    rust_keywords.insert("match");
-    rust_keywords.insert("mod");
-    rust_keywords.insert("move");
-    rust_keywords.insert("mut");
-    rust_keywords.insert("offsetof");
-    rust_keywords.insert("override");
-    rust_keywords.insert("priv");
-    rust_keywords.insert("proc");
-    rust_keywords.insert("pure");
-    rust_keywords.insert("pub");
-    rust_keywords.insert("ref");
-    rust_keywords.insert("return");
-    rust_keywords.insert("Self");
-    rust_keywords.insert("self");
-    rust_keywords.insert("sizeof");
-    rust_keywords.insert("static");
-    rust_keywords.insert("struct");
-    rust_keywords.insert("super");
-    rust_keywords.insert("trait");
-    rust_keywords.insert("true");
-    rust_keywords.insert("type");
-    rust_keywords.insert("typeof");
-    rust_keywords.insert("unsafe");
-    rust_keywords.insert("unsized");
-    rust_keywords.insert("use");
-    rust_keywords.insert("virtual");
-    rust_keywords.insert("where");
-    rust_keywords.insert("while");
-    rust_keywords.insert("yield");
-
-    let mut pest_keywords = HashSet::new();
-    pest_keywords.insert("_");
-    pest_keywords.insert("ANY");
-    pest_keywords.insert("DROP");
-    pest_keywords.insert("EOI");
-    pest_keywords.insert("PEEK");
-    pest_keywords.insert("PEEK_ALL");
-    pest_keywords.insert("POP");
-    pest_keywords.insert("POP_ALL");
-    pest_keywords.insert("PUSH");
-    pest_keywords.insert("SOI");
-
-    let mut builtins = HashSet::new();
-    builtins.insert("ANY");
-    builtins.insert("DROP");
-    builtins.insert("EOI");
-    builtins.insert("PEEK");
-    builtins.insert("PEEK_ALL");
-    builtins.insert("POP");
-    builtins.insert("POP_ALL");
-    builtins.insert("SOI");
-    builtins.insert("ASCII_DIGIT");
-    builtins.insert("ASCII_NONZERO_DIGIT");
-    builtins.insert("ASCII_BIN_DIGIT");
-    builtins.insert("ASCII_OCT_DIGIT");
-    builtins.insert("ASCII_HEX_DIGIT");
-    builtins.insert("ASCII_ALPHA_LOWER");
-    builtins.insert("ASCII_ALPHA_UPPER");
-    builtins.insert("ASCII_ALPHA");
-    builtins.insert("ASCII_ALPHANUMERIC");
-    builtins.insert("ASCII");
-    builtins.insert("NEWLINE");
-    builtins.extend(UNICODE_PROPERTY_NAMES);
-
-    let definitions: Vec<_> = pairs
-        .clone()
-        .filter(|pair| pair.as_rule() == Rule::grammar_rule)
-        .map(|pair| pair.into_inner().next().unwrap().as_span())
-        .collect();
-    let called_rules: Vec<_> = pairs
-        .clone()
-        .filter(|pair| pair.as_rule() == Rule::grammar_rule)
-        .flat_map(|pair| {
-            pair.into_inner()
-                .flatten()
-                .skip(1)
-                .filter(|pair| pair.as_rule() == Rule::identifier)
-                .map(|pair| pair.as_span())
-        })
-        .collect();
-
-    let mut errors = vec![];
-
-    errors.extend(validate_rust_keywords(&definitions, &rust_keywords));
-    errors.extend(validate_pest_keywords(&definitions, &pest_keywords));
-    errors.extend(validate_already_defined(&definitions));
-    errors.extend(validate_undefined(&definitions, &called_rules, &builtins));
-
-    if !errors.is_empty() {
-        return Err(errors);
-    }
-
-    let definitions: HashSet<_> = definitions.iter().map(|span| span.as_str()).collect();
-    let called_rules: HashSet<_> = called_rules.iter().map(|span| span.as_str()).collect();
-
-    let defaults = called_rules.difference(&definitions);
-
-    Ok(defaults.cloned().collect())
-}
-
-#[allow(clippy::implicit_hasher, clippy::ptr_arg)]
-pub fn validate_rust_keywords<'i>(
-    definitions: &Vec<Span<'i>>,
-    rust_keywords: &HashSet<&str>,
-) -> Vec<Error<Rule>> {
-    let mut errors = vec![];
-
-    for definition in definitions {
-        let name = definition.as_str();
-
-        if rust_keywords.contains(name) {
-            errors.push(Error::new_from_span(
-                ErrorVariant::CustomError {
-                    message: format!("{} is a rust keyword", name),
-                },
-                definition.clone(),
-            ))
-        }
-    }
-
-    errors
-}
-
-#[allow(clippy::implicit_hasher, clippy::ptr_arg)]
-pub fn validate_pest_keywords<'i>(
-    definitions: &Vec<Span<'i>>,
-    pest_keywords: &HashSet<&str>,
-) -> Vec<Error<Rule>> {
-    let mut errors = vec![];
-
-    for definition in definitions {
-        let name = definition.as_str();
-
-        if pest_keywords.contains(name) {
-            errors.push(Error::new_from_span(
-                ErrorVariant::CustomError {
-                    message: format!("{} is a pest keyword", name),
-                },
-                definition.clone(),
-            ))
-        }
-    }
-
-    errors
-}
-
-#[allow(clippy::ptr_arg)]
-pub fn validate_already_defined<'i>(definitions: &Vec<Span<'i>>) -> Vec<Error<Rule>> {
-    let mut errors = vec![];
-    let mut defined = HashSet::new();
-
-    for definition in definitions {
-        let name = definition.as_str();
-
-        if defined.contains(&name) {
-            errors.push(Error::new_from_span(
-                ErrorVariant::CustomError {
-                    message: format!("rule {} already defined", name),
-                },
-                definition.clone(),
-            ))
-        } else {
-            defined.insert(name);
-        }
-    }
-
-    errors
-}
-
-#[allow(clippy::implicit_hasher, clippy::ptr_arg)]
-pub fn validate_undefined<'i>(
-    definitions: &Vec<Span<'i>>,
-    called_rules: &Vec<Span<'i>>,
-    builtins: &HashSet<&str>,
-) -> Vec<Error<Rule>> {
-    let mut errors = vec![];
-    let definitions: HashSet<_> = definitions.iter().map(|span| span.as_str()).collect();
-
-    for rule in called_rules {
-        let name = rule.as_str();
-
-        if !definitions.contains(name) && !builtins.contains(name) {
-            errors.push(Error::new_from_span(
-                ErrorVariant::CustomError {
-                    message: format!("rule {} is undefined", name),
-                },
-                rule.clone(),
-            ))
-        }
-    }
-
-    errors
-}
-
-#[allow(clippy::ptr_arg)]
-pub fn validate_ast<'a, 'i: 'a>(rules: &'a Vec<ParserRule<'i>>) -> Vec<Error<Rule>> {
-    let mut errors = vec![];
-
-    errors.extend(validate_repetition(rules));
-    errors.extend(validate_choices(rules));
-    errors.extend(validate_whitespace_comment(rules));
-    errors.extend(validate_left_recursion(rules));
-
-    errors.sort_by_key(|error| match error.location {
-        InputLocation::Span(span) => span,
-        _ => unreachable!(),
-    });
-
-    errors
-}
-
-fn is_non_progressing<'i>(
-    expr: &ParserExpr<'i>,
-    rules: &HashMap<String, &ParserNode<'i>>,
-    trace: &mut Vec<String>,
-) -> bool {
-    match *expr {
-        ParserExpr::Str(ref string) => string == "",
-        ParserExpr::Ident(ref ident) => {
-            if ident == "soi" || ident == "eoi" {
-                return true;
-            }
-
-            if !trace.contains(ident) {
-                if let Some(node) = rules.get(ident) {
-                    trace.push(ident.clone());
-                    let result = is_non_progressing(&node.expr, rules, trace);
-                    trace.pop().unwrap();
-
-                    return result;
-                }
-            }
-
-            false
-        }
-        ParserExpr::PosPred(_) => true,
-        ParserExpr::NegPred(_) => true,
-        ParserExpr::Seq(ref lhs, ref rhs) => {
-            is_non_progressing(&lhs.expr, rules, trace)
-                && is_non_progressing(&rhs.expr, rules, trace)
-        }
-        ParserExpr::Choice(ref lhs, ref rhs) => {
-            is_non_progressing(&lhs.expr, rules, trace)
-                || is_non_progressing(&rhs.expr, rules, trace)
-        }
-        _ => false,
-    }
-}
-
-fn is_non_failing<'i>(
-    expr: &ParserExpr<'i>,
-    rules: &HashMap<String, &ParserNode<'i>>,
-    trace: &mut Vec<String>,
-) -> bool {
-    match *expr {
-        ParserExpr::Str(ref string) => string == "",
-        ParserExpr::Ident(ref ident) => {
-            if !trace.contains(ident) {
-                if let Some(node) = rules.get(ident) {
-                    trace.push(ident.clone());
-                    let result = is_non_failing(&node.expr, rules, trace);
-                    trace.pop().unwrap();
-
-                    return result;
-                }
-            }
-
-            false
-        }
-        ParserExpr::Opt(_) => true,
-        ParserExpr::Rep(_) => true,
-        ParserExpr::Seq(ref lhs, ref rhs) => {
-            is_non_failing(&lhs.expr, rules, trace) && is_non_failing(&rhs.expr, rules, trace)
-        }
-        ParserExpr::Choice(ref lhs, ref rhs) => {
-            is_non_failing(&lhs.expr, rules, trace) || is_non_failing(&rhs.expr, rules, trace)
-        }
-        _ => false,
-    }
-}
-
-fn validate_repetition<'a, 'i: 'a>(rules: &'a [ParserRule<'i>]) -> Vec<Error<Rule>> {
-    let mut result = vec![];
-    let map = to_hash_map(rules);
-
-    for rule in rules {
-        let mut errors = rule.node
-            .clone()
-            .filter_map_top_down(|node| match node.expr {
-                ParserExpr::Rep(ref other)
-                | ParserExpr::RepOnce(ref other)
-                | ParserExpr::RepMin(ref other, _) => {
-                    if is_non_failing(&other.expr, &map, &mut vec![]) {
-                        Some(Error::new_from_span(
-                            ErrorVariant::CustomError {
-                                message:
-                                    "expression inside repetition cannot fail and will repeat \
-                                     infinitely"
-                                        .to_owned()
-                            },
-                            node.span.clone()
-                        ))
-                    } else if is_non_progressing(&other.expr, &map, &mut vec![]) {
-                        Some(Error::new_from_span(
-                            ErrorVariant::CustomError {
-                                message:
-                                    "expression inside repetition is non-progressing and will repeat \
-                                     infinitely"
-                                        .to_owned(),
-                            },
-                            node.span.clone()
-                        ))
-                    } else {
-                        None
-                    }
-                }
-                _ => None
-            });
-
-        result.append(&mut errors);
-    }
-
-    result
-}
-
-fn validate_choices<'a, 'i: 'a>(rules: &'a [ParserRule<'i>]) -> Vec<Error<Rule>> {
-    let mut result = vec![];
-    let map = to_hash_map(rules);
-
-    for rule in rules {
-        let mut errors = rule
-            .node
-            .clone()
-            .filter_map_top_down(|node| match node.expr {
-                ParserExpr::Choice(ref lhs, _) => {
-                    let node = match lhs.expr {
-                        ParserExpr::Choice(_, ref rhs) => rhs,
-                        _ => lhs,
-                    };
-
-                    if is_non_failing(&node.expr, &map, &mut vec![]) {
-                        Some(Error::new_from_span(
-                            ErrorVariant::CustomError {
-                                message:
-                                    "expression cannot fail; following choices cannot be reached"
-                                        .to_owned(),
-                            },
-                            node.span.clone(),
-                        ))
-                    } else {
-                        None
-                    }
-                }
-                _ => None,
-            });
-
-        result.append(&mut errors);
-    }
-
-    result
-}
-
-fn validate_whitespace_comment<'a, 'i: 'a>(rules: &'a [ParserRule<'i>]) -> Vec<Error<Rule>> {
-    let map = to_hash_map(rules);
-
-    rules
-        .iter()
-        .filter_map(|rule| {
-            if rule.name == "WHITESPACE" || rule.name == "COMMENT" {
-                if is_non_failing(&rule.node.expr, &map, &mut vec![]) {
-                    Some(Error::new_from_span(
-                        ErrorVariant::CustomError {
-                            message: format!(
-                                "{} cannot fail and will repeat infinitely",
-                                &rule.name
-                            ),
-                        },
-                        rule.node.span.clone(),
-                    ))
-                } else if is_non_progressing(&rule.node.expr, &map, &mut vec![]) {
-                    Some(Error::new_from_span(
-                        ErrorVariant::CustomError {
-                            message: format!(
-                                "{} is non-progressing and will repeat infinitely",
-                                &rule.name
-                            ),
-                        },
-                        rule.node.span.clone(),
-                    ))
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
-        })
-        .collect()
-}
-
-fn validate_left_recursion<'a, 'i: 'a>(rules: &'a [ParserRule<'i>]) -> Vec<Error<Rule>> {
-    left_recursion(to_hash_map(rules))
-}
-
-fn to_hash_map<'a, 'i: 'a>(rules: &'a [ParserRule<'i>]) -> HashMap<String, &'a ParserNode<'i>> {
-    rules.iter().map(|r| (r.name.clone(), &r.node)).collect()
-}
-
-#[allow(clippy::needless_pass_by_value)]
-fn left_recursion<'a, 'i: 'a>(rules: HashMap<String, &'a ParserNode<'i>>) -> Vec<Error<Rule>> {
-    fn check_expr<'a, 'i: 'a>(
-        node: &'a ParserNode<'i>,
-        rules: &'a HashMap<String, &ParserNode<'i>>,
-        trace: &mut Vec<String>,
-    ) -> Option<Error<Rule>> {
-        match node.expr.clone() {
-            ParserExpr::Ident(other) => {
-                if trace[0] == other {
-                    trace.push(other);
-                    let chain = trace
-                        .iter()
-                        .map(|ident| ident.as_ref())
-                        .collect::<Vec<_>>()
-                        .join(" -> ");
-
-                    return Some(Error::new_from_span(
-                        ErrorVariant::CustomError {
-                            message: format!(
-                                "rule {} is left-recursive ({}); pest::prec_climber might be useful \
-                                 in this case",
-                                node.span.as_str(),
-                                chain
-                            )
-                        },
-                        node.span.clone()
-                    ));
-                }
-
-                if !trace.contains(&other) {
-                    if let Some(node) = rules.get(&other) {
-                        trace.push(other);
-                        let result = check_expr(node, rules, trace);
-                        trace.pop().unwrap();
-
-                        return result;
-                    }
-                }
-
-                None
-            }
-            ParserExpr::Seq(ref lhs, ref rhs) => {
-                if is_non_failing(&lhs.expr, rules, &mut vec![trace.last().unwrap().clone()]) {
-                    check_expr(rhs, rules, trace)
-                } else {
-                    check_expr(lhs, rules, trace)
-                }
-            }
-            ParserExpr::Choice(ref lhs, ref rhs) => {
-                check_expr(&lhs, rules, trace).or_else(|| check_expr(&rhs, rules, trace))
-            }
-            ParserExpr::Rep(ref node) => check_expr(&node, rules, trace),
-            ParserExpr::RepOnce(ref node) => check_expr(&node, rules, trace),
-            ParserExpr::Opt(ref node) => check_expr(&node, rules, trace),
-            ParserExpr::PosPred(ref node) => check_expr(&node, rules, trace),
-            ParserExpr::NegPred(ref node) => check_expr(&node, rules, trace),
-            ParserExpr::Push(ref node) => check_expr(&node, rules, trace),
-            _ => None,
-        }
-    }
-
-    let mut errors = vec![];
-
-    for (ref name, ref node) in &rules {
-        let name = (*name).clone();
-
-        if let Some(error) = check_expr(node, &rules, &mut vec![name]) {
-            errors.push(error);
-        }
-    }
-
-    errors
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::parser::{consume_rules, PestParser};
-    use super::super::unwrap_or_report;
-    use super::*;
-    use pest::Parser;
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:1
-  |
-1 | let = { \"a\" }
-  | ^-^
-  |
-  = let is a rust keyword")]
-    fn rust_keyword() {
-        let input = "let = { \"a\" }";
-        unwrap_or_report(validate_pairs(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:1
-  |
-1 | ANY = { \"a\" }
-  | ^-^
-  |
-  = ANY is a pest keyword")]
-    fn pest_keyword() {
-        let input = "ANY = { \"a\" }";
-        unwrap_or_report(validate_pairs(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:13
-  |
-1 | a = { \"a\" } a = { \"a\" }
-  |             ^
-  |
-  = rule a already defined")]
-    fn already_defined() {
-        let input = "a = { \"a\" } a = { \"a\" }";
-        unwrap_or_report(validate_pairs(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:7
-  |
-1 | a = { b }
-  |       ^
-  |
-  = rule b is undefined")]
-    fn undefined() {
-        let input = "a = { b }";
-        unwrap_or_report(validate_pairs(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    fn valid_recursion() {
-        let input = "a = { \"\" ~ \"a\"? ~ \"a\"* ~ (\"a\" | \"b\") ~ a }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:16
-  |
-1 | WHITESPACE = { \"\" }
-  |                ^^
-  |
-  = WHITESPACE cannot fail and will repeat infinitely")]
-    fn non_failing_whitespace() {
-        let input = "WHITESPACE = { \"\" }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:13
-  |
-1 | COMMENT = { soi }
-  |             ^-^
-  |
-  = COMMENT is non-progressing and will repeat infinitely")]
-    fn non_progressing_comment() {
-        let input = "COMMENT = { soi }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:7
-  |
-1 | a = { (\"\")* }
-  |       ^---^
-  |
-  = expression inside repetition cannot fail and will repeat infinitely")]
-    fn non_failing_repetition() {
-        let input = "a = { (\"\")* }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:18
-  |
-1 | a = { \"\" } b = { a* }
-  |                  ^^
-  |
-  = expression inside repetition cannot fail and will repeat infinitely")]
-    fn indirect_non_failing_repetition() {
-        let input = "a = { \"\" } b = { a* }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:20
-  |
-1 | a = { \"a\" ~ (\"b\" ~ (\"\")*) }
-  |                    ^---^
-  |
-  = expression inside repetition cannot fail and will repeat infinitely")]
-    fn deep_non_failing_repetition() {
-        let input = "a = { \"a\" ~ (\"b\" ~ (\"\")*) }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:7
-  |
-1 | a = { (\"\" ~ &\"a\" ~ !\"a\" ~ (soi | eoi))* }
-  |       ^-------------------------------^
-  |
-  = expression inside repetition is non-progressing and will repeat infinitely")]
-    fn non_progressing_repetition() {
-        let input = "a = { (\"\" ~ &\"a\" ~ !\"a\" ~ (soi | eoi))* }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:20
-  |
-1 | a = { !\"a\" } b = { a* }
-  |                    ^^
-  |
-  = expression inside repetition is non-progressing and will repeat infinitely")]
-    fn indirect_non_progressing_repetition() {
-        let input = "a = { !\"a\" } b = { a* }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:7
-  |
-1 | a = { a }
-  |       ^
-  |
-  = rule a is left-recursive (a -> a); pest::prec_climber might be useful in this case")]
-    fn simple_left_recursion() {
-        let input = "a = { a }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:7
-  |
-1 | a = { b } b = { a }
-  |       ^
-  |
-  = rule b is left-recursive (b -> a -> b); pest::prec_climber might be useful in this case
-
- --> 1:17
-  |
-1 | a = { b } b = { a }
-  |                 ^
-  |
-  = rule a is left-recursive (a -> b -> a); pest::prec_climber might be useful in this case")]
-    fn indirect_left_recursion() {
-        let input = "a = { b } b = { a }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:39
-  |
-1 | a = { \"\" ~ \"a\"? ~ \"a\"* ~ (\"a\" | \"\") ~ a }
-  |                                       ^
-  |
-  = rule a is left-recursive (a -> a); pest::prec_climber might be useful in this case")]
-    fn non_failing_left_recursion() {
-        let input = "a = { \"\" ~ \"a\"? ~ \"a\"* ~ (\"a\" | \"\") ~ a }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:13
-  |
-1 | a = { \"a\" | a }
-  |             ^
-  |
-  = rule a is left-recursive (a -> a); pest::prec_climber might be useful in this case")]
-    fn non_primary_choice_left_recursion() {
-        let input = "a = { \"a\" | a }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:7
-  |
-1 | a = { \"a\"* | \"a\" | \"b\" }
-  |       ^--^
-  |
-  = expression cannot fail; following choices cannot be reached")]
-    fn lhs_non_failing_choice() {
-        let input = "a = { \"a\"* | \"a\" | \"b\" }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:13
-  |
-1 | a = { \"a\" | \"a\"* | \"b\" }
-  |             ^--^
-  |
-  = expression cannot fail; following choices cannot be reached")]
-    fn lhs_non_failing_choice_middle() {
-        let input = "a = { \"a\" | \"a\"* | \"b\" }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    #[should_panic(expected = "grammar error
-
- --> 1:7
-  |
-1 | a = { b | \"a\" } b = { \"b\"* | \"c\" }
-  |       ^
-  |
-  = expression cannot fail; following choices cannot be reached
-
- --> 1:23
-  |
-1 | a = { b | \"a\" } b = { \"b\"* | \"c\" }
-  |                       ^--^
-  |
-  = expression cannot fail; following choices cannot be reached")]
-    fn lhs_non_failing_nested_choices() {
-        let input = "a = { b | \"a\" } b = { \"b\"* | \"c\" }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-
-    #[test]
-    fn skip_can_be_defined() {
-        let input = "skip = { \"\" }";
-        unwrap_or_report(consume_rules(
-            PestParser::parse(Rule::grammar_rules, input).unwrap(),
-        ));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/phf_shared/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/phf_shared/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/phf_shared/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/phf_shared/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"e1cbc0067c00766b07d95d15ec1147aafdaef4532e4be57aafe322d61c4aa65b","src/lib.rs":"f0cd229b01c055a5d2f0880de58a19ebf1a1a4a2125cd8a9782e50407a84c0c8"},"package":"c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/phf_shared/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/phf_shared/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/phf_shared/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/phf_shared/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,35 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "phf_shared"
+version = "0.8.0"
+authors = ["Steven Fackler <sfackler@gmail.com>"]
+description = "Support code shared by PHF libraries"
+license = "MIT"
+repository = "https://github.com/sfackler/rust-phf"
+
+[lib]
+name = "phf_shared"
+path = "src/lib.rs"
+test = false
+[dependencies.siphasher]
+version = "0.3"
+
+[dependencies.unicase]
+version = "2.4.0"
+optional = true
+
+[features]
+default = ["std"]
+std = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/phf_shared/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/phf_shared/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/phf_shared/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/phf_shared/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,278 @@
+#![doc(html_root_url = "https://docs.rs/phf_shared/0.7")]
+#![cfg_attr(not(feature = "std"), no_std)]
+
+#[cfg(feature = "std")]
+extern crate std as core;
+
+extern crate siphasher;
+
+#[cfg(feature = "unicase")]
+extern crate unicase;
+
+use core::fmt;
+use core::hash::{Hasher, Hash};
+use core::num::Wrapping;
+use siphasher::sip128::{Hash128, Hasher128, SipHasher13};
+
+pub struct Hashes {
+    pub g: u32,
+    pub f1: u32,
+    pub f2: u32,
+    _priv: (),
+}
+
+/// A central typedef for hash keys
+///
+/// Makes experimentation easier by only needing to be updated here.
+pub type HashKey = u64;
+
+#[inline]
+pub fn displace(f1: u32, f2: u32, d1: u32, d2: u32) -> u32 {
+    (Wrapping(d2) + Wrapping(f1) * Wrapping(d1) + Wrapping(f2)).0
+}
+
+/// `key` is from `phf_generator::HashState`.
+#[inline]
+pub fn hash<T: ?Sized + PhfHash>(x: &T, key: &HashKey) -> Hashes {
+    let mut hasher = SipHasher13::new_with_keys(0, *key);
+    x.phf_hash(&mut hasher);
+
+    let Hash128 { h1: lower, h2: upper} = hasher.finish128();
+
+    Hashes {
+        g: (lower >> 32) as u32,
+        f1: lower as u32,
+        f2: upper as u32,
+        _priv: (),
+    }
+}
+
+/// Return an index into `phf_generator::HashState::map`.
+///
+/// * `hash` is from `hash()` in this crate.
+/// * `disps` is from `phf_generator::HashState::disps`.
+/// * `len` is the length of `phf_generator::HashState::map`.
+#[inline]
+pub fn get_index(hashes: &Hashes, disps: &[(u32, u32)], len: usize) -> u32 {
+    let (d1, d2) = disps[(hashes.g % (disps.len() as u32)) as usize];
+    displace(hashes.f1, hashes.f2, d1, d2) % (len as u32)
+}
+
+/// A trait implemented by types which can be used in PHF data structures.
+///
+/// This differs from the standard library's `Hash` trait in that `PhfHash`'s
+/// results must be architecture independent so that hashes will be consistent
+/// between the host and target when cross compiling.
+pub trait PhfHash {
+    /// Feeds the value into the state given, updating the hasher as necessary.
+    fn phf_hash<H: Hasher>(&self, state: &mut H);
+
+    /// Feeds a slice of this type into the state provided.
+    fn phf_hash_slice<H: Hasher>(data: &[Self], state: &mut H)
+        where Self: Sized
+    {
+        for piece in data {
+            piece.phf_hash(state);
+        }
+    }
+}
+
+/// Trait for printing types with `const` constructors, used by `phf_codegen` and `phf_macros`.
+pub trait FmtConst {
+    /// Print a `const` expression representing this value.
+    fn fmt_const(&self, f: &mut fmt::Formatter) -> fmt::Result;
+}
+
+/// Create an impl of `FmtConst` delegating to `fmt::Debug` for types that can deal with it.
+///
+/// Ideally with specialization this could be just one default impl and then specialized where
+/// it doesn't apply.
+macro_rules! delegate_debug (
+    ($ty:ty) => {
+        impl FmtConst for $ty {
+            fn fmt_const(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                write!(f, "{:?}", self)
+            }
+        }
+    }
+);
+
+delegate_debug!(str);
+delegate_debug!(char);
+delegate_debug!(u8);
+delegate_debug!(i8);
+delegate_debug!(u16);
+delegate_debug!(i16);
+delegate_debug!(u32);
+delegate_debug!(i32);
+delegate_debug!(u64);
+delegate_debug!(i64);
+delegate_debug!(u128);
+delegate_debug!(i128);
+delegate_debug!(bool);
+
+#[cfg(feature = "std")]
+impl PhfHash for String {
+    #[inline]
+    fn phf_hash<H: Hasher>(&self, state: &mut H) {
+        (**self).phf_hash(state)
+    }
+}
+
+#[cfg(feature = "std")]
+impl PhfHash for Vec<u8> {
+    #[inline]
+    fn phf_hash<H: Hasher>(&self, state: &mut H) {
+        (**self).phf_hash(state)
+    }
+}
+
+impl<'a, T: 'a + PhfHash + ?Sized> PhfHash for &'a T {
+    fn phf_hash<H: Hasher>(&self, state: &mut H) {
+        (*self).phf_hash(state)
+    }
+}
+
+impl<'a, T: 'a + FmtConst + ?Sized> FmtConst for &'a T {
+    fn fmt_const(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        (*self).fmt_const(f)
+    }
+}
+
+impl PhfHash for str {
+    #[inline]
+    fn phf_hash<H: Hasher>(&self, state: &mut H) {
+        self.as_bytes().phf_hash(state)
+    }
+}
+
+impl PhfHash for [u8] {
+    #[inline]
+    fn phf_hash<H: Hasher>(&self, state: &mut H) {
+        state.write(self);
+    }
+}
+
+impl FmtConst for [u8] {
+    #[inline]
+    fn fmt_const(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // slices need a leading reference
+        write!(f, "&{:?}", self)
+    }
+}
+
+#[cfg(feature = "unicase")]
+impl<S> PhfHash for unicase::UniCase<S>
+    where unicase::UniCase<S>: Hash {
+    #[inline]
+    fn phf_hash<H: Hasher>(&self, state: &mut H) {
+        self.hash(state)
+    }
+}
+
+#[cfg(feature = "unicase")]
+impl<S> FmtConst for unicase::UniCase<S> where S: AsRef<str> {
+    fn fmt_const(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if self.is_ascii() {
+            f.write_str("UniCase::ascii(")?;
+        } else {
+            f.write_str("UniCase::unicode(")?;
+        }
+
+        self.as_ref().fmt_const(f)?;
+        f.write_str(")")
+    }
+}
+
+macro_rules! sip_impl (
+    (le $t:ty) => (
+        impl PhfHash for $t {
+            #[inline]
+            fn phf_hash<H: Hasher>(&self, state: &mut H) {
+                self.to_le().hash(state);
+            }
+        }
+    );
+    ($t:ty) => (
+        impl PhfHash for $t {
+            #[inline]
+            fn phf_hash<H: Hasher>(&self, state: &mut H) {
+                self.hash(state);
+            }
+        }
+    )
+);
+
+sip_impl!(u8);
+sip_impl!(i8);
+sip_impl!(le u16);
+sip_impl!(le i16);
+sip_impl!(le u32);
+sip_impl!(le i32);
+sip_impl!(le u64);
+sip_impl!(le i64);
+sip_impl!(le u128);
+sip_impl!(le i128);
+sip_impl!(bool);
+
+impl PhfHash for char {
+    #[inline]
+    fn phf_hash<H: Hasher>(&self, state: &mut H) {
+        (*self as u32).phf_hash(state)
+    }
+}
+
+// minimize duplicated code since formatting drags in quite a bit
+fn fmt_array(array: &[u8], f: &mut fmt::Formatter) -> fmt::Result {
+    write!(f, "{:?}", array)
+}
+
+macro_rules! array_impl (
+    ($t:ty, $n:expr) => (
+        impl PhfHash for [$t; $n] {
+            #[inline]
+            fn phf_hash<H: Hasher>(&self, state: &mut H) {
+                state.write(self);
+            }
+        }
+
+        impl FmtConst for [$t; $n] {
+            fn fmt_const(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                fmt_array(self, f)
+            }
+        }
+    )
+);
+
+array_impl!(u8, 1);
+array_impl!(u8, 2);
+array_impl!(u8, 3);
+array_impl!(u8, 4);
+array_impl!(u8, 5);
+array_impl!(u8, 6);
+array_impl!(u8, 7);
+array_impl!(u8, 8);
+array_impl!(u8, 9);
+array_impl!(u8, 10);
+array_impl!(u8, 11);
+array_impl!(u8, 12);
+array_impl!(u8, 13);
+array_impl!(u8, 14);
+array_impl!(u8, 15);
+array_impl!(u8, 16);
+array_impl!(u8, 17);
+array_impl!(u8, 18);
+array_impl!(u8, 19);
+array_impl!(u8, 20);
+array_impl!(u8, 21);
+array_impl!(u8, 22);
+array_impl!(u8, 23);
+array_impl!(u8, 24);
+array_impl!(u8, 25);
+array_impl!(u8, 26);
+array_impl!(u8, 27);
+array_impl!(u8, 28);
+array_impl!(u8, 29);
+array_impl!(u8, 30);
+array_impl!(u8, 31);
+array_impl!(u8, 32);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"d8ee4b66c74c646d7135dadf7d72489985b7265742bbb16258de454289b7ed3a","Cargo.lock":"5110e1b63ec07376a948ea3811f42f3ce9cea0aa1ababb10c63baf3d2442e7c4","Cargo.toml":"c785ea09b6658d3114ef61499041b226fe5bcb168abfbed9b5b9d67c9ff0478e","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"8e8f15eadda0440e499e66f8282b933dc40f0c9774b1785e4069339f2a413e41","examples/README.md":"80edc558a8be4c90230b00ca425cb7dc9d20cbaa3911e65f96120241856fc614","examples/enum-default-expanded.rs":"f6228c1877e87c1a7980830d5a5d2b6ae5151b4106781a3ef6e84d28c2fdc416","examples/enum-default.rs":"01e1d285ffbb87aa70950c0ec184b395f7faf0667a1fc874b4de509e3e3c8d5c","examples/not_unpin-expanded.rs":"5cf55d4a781359379f5d52d44256cf7beb4e60720c7df87f80e17b3f16933857","examples/not_unpin.rs":"3e43439c521089f7f58a411fb823827433c7476a0b41aecd26a6ce5f0c99e405","examples/pinned_drop-expanded.rs":"0885f9d818ea0a6ac9f155d28b9e73fe4be73d332c84064c8c725331d68c8697","examples/pinned_drop.rs":"afdbbbf5f8890bb5f8659362e1ab2e0a3b997e415b686b9f79084bfaa57be9cc","examples/project_replace-expanded.rs":"422d1b2a326daf3897669a6045a291457af704670c137bfcbf7aff76a6c5c8ef","examples/project_replace.rs":"352d10d7a2db3de0101faedd04d69c24b9bb5021c768199a379c233886a3881c","examples/struct-default-expanded.rs":"2a6158e6839b8ecab403e3201c19fe38843ecf0231f08b22d08c4774aa48a1f0","examples/struct-default.rs":"eb60ea5412e83ac9eba96794b31772afe0798bef304b26bff65b6845638bb729","examples/unsafe_unpin-expanded.rs":"ead95c25482d56c18a979f1e931c2424ca26c9cc1b846af603d98f7aeb203bee","examples/unsafe_unpin.rs":"7da585f423999dcbe03289a72b14a29fed41a45a774de1af2fe93cb20aa8d426","rustfmt.toml":"3103b36257c99c4c0fc5fdd35630418f8f3be59f1daa31fdd32c29f4c57405d2","scripts/README.md":"d8a7a81b5c98ced28bc4429ecf00f981c1f3550595e0f3705ddcd42fb0e9e850","scripts/check-minimal-versions.sh":"ffec04ed39597386411fbaa6fe6c0f97ce8932e7e42e1cafe8a9ba3acf77f0cc","scripts/ci.sh":"b139a5e67b5f05876c28a70daa2ec7832252bae9abc6e92f9fc408871595fb60","src/lib.rs":"061bca2b857769a24c0f4ad81e6d7e0bdabee771f8ee7a189325a96c70eb4932","tests/auxiliary/mod.rs":"7e263e987e09b77e384f734384a00a71c5b70230bb1b5376446ef003a8da9372","tests/cfg.rs":"85f262f6c3136d30d512479993734324c8fff8702842ffe5abadaccf1f9aff35","tests/compiletest.rs":"a3484dec67a0cd942482b328b43d2cf82bfd26457988da6c7ec469db399b3c51","tests/drop_order.rs":"9b03031408cc708c060d879e596c51351da3dbe218360bec4545ac3e3745caad","tests/include/basic-safe-part.rs":"6fb5accb7476f85233ef919eedaff83c30015e186414589db6e44d614016ad3e","tests/include/basic.rs":"855d9cc4657be080337c07f8bb5f82747a72a22e63e1103b00914a4448937970","tests/lint.rs":"3af41c817fa7dc3628b7b266a66c7e8c87472c43ce1548f7fc89dba4dce62f38","tests/lint.txt":"b0899596fd4210a1bfcb860e4e2dadbc1b5fb1f111e409eb22b610782e99eb4f","tests/pin_project.rs":"4ac66b651933a8013043f738ce6dc53d1eeae08579c993609d11124a40ba3828","tests/pinned_drop.rs":"8a2464507f8565fdde64c5be181c9eb94e313bb4c6f21d450336147baa08b1ea","tests/proper_unpin.rs":"6c211bac6c951538baee5dee7db7ef146f968fc62525d69d680accf2b852c8a3","tests/repr_packed.rs":"f5219e3f7508a488f7f94c564f7859aa328ab9648544d6fa1b8938ad3bdee0b6","tests/ui/cfg/cfg_attr-resolve.rs":"bb924ea9ceb6579e80774ef7fee1bb99ae08efc7d909e8d1edff40c3c1adaa7f","tests/ui/cfg/cfg_attr-resolve.stderr":"579a7359e68c40c653375e225f52aa97a2515e4b7b03ceebe6decb143858d551","tests/ui/cfg/cfg_attr-type-mismatch.rs":"bc8c14e33ba8fffff1b0bf661592daf44f5ec13632b7d91a5dbb832815945224","tests/ui/cfg/cfg_attr-type-mismatch.stderr":"3108bfcc2b1ab43a21ea41058625de42ee86291a70046c6c19acdaaf8c564bd4","tests/ui/cfg/packed_sneaky-span-issue-1.rs":"a5fe9a9d0300b240c5d71f344fb7811db2f8d6ecc38fb664acee78e39c06a1f2","tests/ui/cfg/packed_sneaky-span-issue-1.stderr":"2ee9dc9dd375b95f3d0440c8cfe4b3dae348f1a63973e5819e741b97faa034ae","tests/ui/cfg/packed_sneaky-span-issue-2.rs":"c721f6f5f4b7389268739c30825e976198ce9e42bf8233f5eb0a6698787df04a","tests/ui/cfg/packed_sneaky-span-issue-2.stderr":"2ee9dc9dd375b95f3d0440c8cfe4b3dae348f1a63973e5819e741b97faa034ae","tests/ui/cfg/packed_sneaky.rs":"785e77f597bfc0cdb7bebc040cf11b17b1e2aa727b0fc369b7fe073f8441cad0","tests/ui/cfg/packed_sneaky.stderr":"4c4528dab6d1a1e0055609e54811e4e18940c21cd2c3f812bc3eecc8c4c4fdd5","tests/ui/cfg/unsupported.rs":"83e759a50424dcad74b16c6048f41032b4c6e98d41462f1ff6fb037594ca5532","tests/ui/cfg/unsupported.stderr":"d00396874289996e80a7a11e4df9e0adbcf0de52c8ef9c19cfd27cebdc7ba278","tests/ui/not_unpin/conflict-unpin.rs":"5709b68bbf26c0b2b87ee7a0bbf83ae9e4f1bacd2266114114b4dcb8706d0080","tests/ui/not_unpin/conflict-unpin.stderr":"10fc857f512f96094f692b1e77b70fa4572813615e6c1fba3bbef1ea90b0d209","tests/ui/not_unpin/impl-unsafe-unpin.rs":"088374540354c4052a2daf2e97cdf49fc54287e0d943bf34bbb70298d62e8c9b","tests/ui/not_unpin/impl-unsafe-unpin.stderr":"06fe05c9add993d99bcc0861fa883f07b91ad24ea2d1197d82577167454cf524","tests/ui/pin_project/add-attr-to-struct.rs":"01f1787fe839d3ba203c7ccf430bad569d27c91a97aae35fbce09cd662f6559a","tests/ui/pin_project/add-attr-to-struct.stderr":"b23f7f2e477eb2357cb42b6ec00b8f2369233af931f3d2a8c7ea0f95d20dadbe","tests/ui/pin_project/add-pinned-field.rs":"791df5b427ba412fb25836569963e6a03ccacea9fcefa4bf3f789ee4de90762d","tests/ui/pin_project/add-pinned-field.stderr":"bc0187f0238bb610d387e99b9e18e8cab80976a89bf5e03f4022be40aa7df7cf","tests/ui/pin_project/conflict-drop.rs":"cb2d3d7d26e91db7832ac6c54fbdb2b68da54891852154604c1e6a3a8bc1425b","tests/ui/pin_project/conflict-drop.stderr":"9391babf5065f0f19e386625426b55f7583c64c1acd9a1153421d94458106988","tests/ui/pin_project/conflict-unpin.rs":"9e3b06ce53d97ebd79620d729b525fac1c87c67ed44b91d05dd4c3d48be455e3","tests/ui/pin_project/conflict-unpin.stderr":"3aed74d6895be645c3c81cdfc5f9a6ebfe3e7fa92713998b1a5dadf9b26c9709","tests/ui/pin_project/impl-unsafe-unpin.rs":"d24d630abd82e08aea529d358bf998011ead0e939c82dca410160764fc24e06b","tests/ui/pin_project/impl-unsafe-unpin.stderr":"7cc101828f7c344d6b04118e832822e31fef95b57803f5c6a317d57f92030d10","tests/ui/pin_project/import_unnamed.rs":"09fb23d22c044321f9bf3a526d16d694916adb7b5defeb6a353cdaff46df7efb","tests/ui/pin_project/import_unnamed.stderr":"4a0cd7583e0ddad8bc30a0abc44943148c8c95f2e369b6391085995bd4940ef7","tests/ui/pin_project/invalid.rs":"bbb60256e5b0b35950161935a569ae3e623e51486419170452c73c032f97ed1f","tests/ui/pin_project/invalid.stderr":"f1c46b4edc9c643b6b5d500273181fb206023dcad34ccc131cfebf0f5f5f318d","tests/ui/pin_project/overlapping_unpin_struct.rs":"f21486a85961eebfd3bfb0727eb801a4fd701e0b524cee322f35eb1066057f1c","tests/ui/pin_project/overlapping_unpin_struct.stderr":"069142606515370ba27c917f065f0adf63cf69e85a8b5b26b8fb7647c379279e","tests/ui/pin_project/packed-enum.rs":"31739a04fab97a3300c50ccefd5ddce7b8e200fab0e48fb7160fb8a54c0365da","tests/ui/pin_project/packed-enum.stderr":"3d7866edb7bfef91082dc897ae18e183d99df49fb80e5218145a9515ea7a0893","tests/ui/pin_project/packed-name-value.rs":"cb0b6043326074d49398f091215fd7e69202e0d7a132539aec0e302d59b99237","tests/ui/pin_project/packed-name-value.stderr":"1bd4384e9dae41d1c8a7cc017049e73d42a363c290eeedf51a129b0d75adff7d","tests/ui/pin_project/packed.rs":"694d4297f9c95e1d1b8d0ab8a129de0c18d5ea27a877a7427a4247aeb9763328","tests/ui/pin_project/packed.stderr":"e71e8148eeb4ffe4d8e8fce0ab8d33da0bf7de993a64df0977bb473413773b62","tests/ui/pin_project/packed_sneaky-1.rs":"36f82cad88f1ce5b05eb55761585c953b17f7f0abfc253280d4930e43c682906","tests/ui/pin_project/packed_sneaky-1.stderr":"0c12e50d8156c7936a3c38a48fd398f6a229003424b37124a771b9034a880612","tests/ui/pin_project/packed_sneaky-2.rs":"f1601aa4f642ed4aaaab2dd2e0328b7af145be9a3a7460ad36339b47b4d7ce14","tests/ui/pin_project/packed_sneaky-2.stderr":"16f1943a7f100713270dcb9771375cee6c399f8e6e4cde75cecf91a43764967f","tests/ui/pin_project/packed_sneaky-3.rs":"d9ee3366b5e3849f3ec0d0bd62d365cff0c6e8f0eb3434d70fb84e62a1976eb2","tests/ui/pin_project/packed_sneaky-3.stderr":"b34c61997a10bc7fdc2aa0cc25e5d634cca9ba165c74333fd31313fd194a997b","tests/ui/pin_project/private_in_public-enum.rs":"79a6ac31dc36cdf4a72c464d4f2702570724b3d33fe22e5b6c05c69129ea4458","tests/ui/pin_project/private_in_public-enum.stderr":"b38bf4f62c4981746af668ab1882cdd27f25a2e8a2c78909b5d4d50479c95275","tests/ui/pin_project/project_replace_unsized.rs":"7c35e6c8ebf8337b6abf6a7fa7106bd519cebbe32d3f33b8865fa251820e0e5a","tests/ui/pin_project/project_replace_unsized.stderr":"b21c52e151fc3037c43718752d734e29148c552afc39ae41a912d88f43b7a285","tests/ui/pin_project/project_replace_unsized_fn_params.rs":"db7c72e96119f245535627b887c1289b064dd657fbb524c0f6635287033b85e2","tests/ui/pin_project/project_replace_unsized_fn_params.stderr":"46a09f866f9595ebc3493017af457c7c8d7a251d17968712d6d2a48616718ae5","tests/ui/pin_project/remove-attr-from-field.rs":"744eece68516f7ce60cedfa4de9b634f0ef6eaf696407b4b822524cf650a598e","tests/ui/pin_project/remove-attr-from-field.stderr":"c8cc5ee1ab37c88e66e8954d174025f0037210f2994f26734e65b853f254ae6c","tests/ui/pin_project/remove-attr-from-struct.rs":"aad627e7650861a6ac73143ab04be904a008975144fdea6a559c03477202ccee","tests/ui/pin_project/remove-attr-from-struct.stderr":"11a335913e84690d6ea9f5be59f378f548513dfe558f5dfe38aea92d216f2985","tests/ui/pin_project/safe_packed_borrows.rs":"8ff4b20076f2da7a2d031372c4ad7c7fa54068356c1423397b3ff7e7813df128","tests/ui/pin_project/safe_packed_borrows.stderr":"65701d6211bd37a909b7db5aa56f5c5c23136e1fd3acefbe3361c4df9192660a","tests/ui/pin_project/unpin_sneaky.rs":"8d49b2dcb1695b4ae26669de58dd6dc73bd836f3cd836078d6be2a0ac2cc56f3","tests/ui/pin_project/unpin_sneaky.stderr":"478f0f04fa41bb7da94faa915d98e5a06550bdd243a1b427666d382568192424","tests/ui/pin_project/visibility.rs":"4345aa1fd270a99e631510097ab7fea51aa7cbe15e155cf19f406c63735e3daa","tests/ui/pin_project/visibility.stderr":"cd4d0e00a9665ff81833a8a7203abfd2d0d4e079337d447552d723cb08fc16fc","tests/ui/pinned_drop/call-drop-inner.rs":"1a7e2943394cd129bfc3b6019643034512407a48a1f9bd5b049996176bb5a127","tests/ui/pinned_drop/call-drop-inner.stderr":"91ed783229ca8c0bdc58b51134ebe0a5ea353e4e31473ab09bf270d5404a38ab","tests/ui/pinned_drop/conditional-drop-impl.rs":"4f555d2914bb4edaea779bfe24fda655039201fd3f633b3f3b524e0d1e38f872","tests/ui/pinned_drop/conditional-drop-impl.stderr":"d2552ac379788d2e2e085ed2db6b3a66627f143f5314fa8f4210c34b279cd8d6","tests/ui/pinned_drop/forget-pinned-drop-impl.rs":"9a6d08c98f1214d11aac8bbf67586130ad62d07d03f4ba6aae474fe30695b536","tests/ui/pinned_drop/forget-pinned-drop-impl.stderr":"86703f23de25249998d540bbf09110b013ffe255631a5d7486a9861ec44f8a46","tests/ui/pinned_drop/invalid-self.rs":"9c7e431b0808204d6a3bf3541668655cb72c76e8ebe8f4a04518d0c6dcdd1bd5","tests/ui/pinned_drop/invalid-self.stderr":"4acecae8d8aeede8ffb27d51e09c0b255a8d98b392475c717180de596202e019","tests/ui/pinned_drop/invalid.rs":"b385895285fc6183951ed9e281e6faeb8d839ff5f3b1ff805093d2c64789c907","tests/ui/pinned_drop/invalid.stderr":"e7e1c6a96852306196bfb550dc16c7e4e7c53f2b075c2cefb9cb7d24c2984dd4","tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs":"a91392c64973f1f6b8b569e1b335f6388f5d907248feaef47b621840a674a617","tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr":"b844b4f911962321ea559da02098b050c5529cf046d8bff82fc14dab86e91deb","tests/ui/pinned_drop/self.rs":"76b2c0363f1c8ca22287926f33aa72d4bd724837f0ebbb6d96468a38c6173009","tests/ui/pinned_drop/self.stderr":"2d2212d0aa42051c3222ec144f21f8e3960df0adabec2784fbc9f1b32ed9ffe3","tests/ui/pinned_drop/unsafe-call.rs":"86e5f40d16ff2728bca66be2d24936a5c4569555df973ab603bd73c6c805d42a","tests/ui/pinned_drop/unsafe-call.stderr":"1bc623b2caf15e050e372be5fa7be12414ec16744b90cb72c0497661f76d66c4","tests/ui/unsafe_unpin/conflict-unpin.rs":"a22831379eb1f2d597d5f8088130f7c91add5ec69bade962d555d1b49145f56a","tests/ui/unsafe_unpin/conflict-unpin.stderr":"b827aacd1cc6a8643286cc1fcafa5dd225bcd94388007131f9af46e3f786b572","tests/ui/unstable-features/README.md":"4d828aa223e725f5177513eb72fd0c9670f467aecdfbdd3d9758e35ab17f7daf","tests/ui/unstable-features/marker_trait_attr-feature-gate.rs":"aca360eb5ea4385fab2b341f97b1811ea5ca53aef73e3025c100c65614c3d485","tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr":"ac1c2a49f259bf9fc00bd279f76a2c51a7a318d0d51de829612722930b5c38b5","tests/ui/unstable-features/marker_trait_attr.rs":"447b013e0da49ca0b30b94c4af2cc52954a989b803353e3cd2b03c4a1d0065b9","tests/ui/unstable-features/marker_trait_attr.stderr":"94aa75cdcc28fb5c5c273040d24659686defb95f11223760c2c588b2c3c2a91c","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs":"095195b33d570780e15b34f8b33de0e449870c942f38815780f0a845955af174","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr":"d8858f24546c7bb6028e574c2c53aa616fe22f4283b9c3c49bf87bfcd5131ba1","tests/ui/unstable-features/overlapping_marker_traits.rs":"e77326673d8293c6e006fecc6fd4a285722d2542cbf9fa719bc2e19a123fd29d","tests/ui/unstable-features/overlapping_marker_traits.stderr":"b5b8333503a83adb5dfdb7ea6d0b20e36748aebaee2f687c7c3786d547b9558f","tests/ui/unstable-features/trivial_bounds-bug.rs":"4bf901287da21c757da24961a2122076de61a9d79ac201fd7301eeb2632c2b92","tests/ui/unstable-features/trivial_bounds-bug.stderr":"05a87e0c068ab662a1c2de316e96b0e1f98256df662150f359f134b37199d411","tests/ui/unstable-features/trivial_bounds-feature-gate.rs":"de2123040606bfcc7d31ed27bd49f7765e238802b1cc966a58505b637127db15","tests/ui/unstable-features/trivial_bounds-feature-gate.stderr":"86cc997d4456a217271fabe729190dde2548fd5ce39d3c00f7314f5f2702dc7f","tests/ui/unstable-features/trivial_bounds.rs":"e2b69a22254d6d6c1e30189165a94f86d5cb92b383c5534f80a7b6974d12f2cb","tests/ui/unstable-features/trivial_bounds.stderr":"353a44176436ee663eee83582d79163ace5084a9afd7a6b7643e3119ef87f33e","tests/unsafe_unpin.rs":"b5a03e61451406718c5fc02c24cf7577803aa391e03d030c4112ceda304a668b"},"package":"9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "pin-project"
-version = "1.0.2"
-dependencies = [
- "pin-project-auxiliary-macro",
- "pin-project-internal",
- "rustversion",
- "static_assertions",
- "trybuild",
-]
-
-[[package]]
-name = "pin-project-auxiliary-macro"
-version = "0.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cfcdf156df4231bda3b27e3c59ea733a8e7725d71b4378ed3da1b4d44364ba"
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "serde"
-version = "1.0.117"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.117"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "syn"
-version = "1.0.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "trybuild"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7d30fe369fd650072b352b1a9cb9587669de6b89be3b8225544012c1c45292d"
-dependencies = [
- "glob",
- "lazy_static",
- "serde",
- "serde_json",
- "termcolor",
- "toml",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "pin-project"
-version = "1.0.2"
-authors = ["Taiki Endo <te316e89@gmail.com>"]
-description = "A crate for safe and ergonomic pin-projection.\n"
-homepage = "https://github.com/taiki-e/pin-project"
-documentation = "https://docs.rs/pin-project"
-readme = "README.md"
-keywords = ["pin", "macros", "attribute"]
-categories = ["no-std", "rust-patterns"]
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/taiki-e/pin-project"
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-[dependencies.pin-project-internal]
-version = "=1.0.2"
-default-features = false
-[dev-dependencies.pin-project-auxiliary-macro]
-version = "0"
-
-[dev-dependencies.rustversion]
-version = "1"
-
-[dev-dependencies.static_assertions]
-version = "1"
-
-[dev-dependencies.trybuild]
-version = "1"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,728 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-This project adheres to [Semantic Versioning](https://semver.org).
-
-## [Unreleased]
-
-## [1.0.2] - 2020-10-19
-
-* [Suppress `clippy::unknown_clippy_lints` lint in generated code.](https://github.com/taiki-e/pin-project/pull/303)
-
-## [1.0.1] - 2020-10-15
-
-* [Fix warnings when `#[pin_project]` attribute used within `macro_rules!` macros.](https://github.com/taiki-e/pin-project/pull/298)
-
-## [1.0.0] - 2020-10-13
-
-* [Remove deprecated `#[project]`, `#[project_ref]`, and `#[project_replace]` attributes.](https://github.com/taiki-e/pin-project/pull/265)
-
-  Name the projected type by passing an argument with the same name as the method to the `#[pin_project]` attribute instead:
-
-  ```diff
-  - #[pin_project]
-  + #[pin_project(project = EnumProj)]
-    enum Enum<T> {
-        Variant(#[pin] T),
-    }
-
-  - #[project]
-    fn func<T>(x: Pin<&mut Enum<T>>) {
-  -     #[project]
-        match x.project() {
-  -         Enum::Variant(_) => { /* ... */ }
-  +         EnumProj::Variant(_) => { /* ... */ }
-        }
-    }
-  ```
-
-* [Remove deprecated `Replace` argument from `#[pin_project]` attribute.](https://github.com/taiki-e/pin-project/pull/266) Use `project_replace` argument instead.
-
-* [Optimize code generation when used on enums.](https://github.com/taiki-e/pin-project/pull/270)
-
-* [Raise the minimum supported Rust version of this crate from Rust 1.34 to Rust 1.37.](https://github.com/taiki-e/pin-project/pull/292)
-
-* Suppress `explicit_outlives_requirements`, `box_pointers`, `clippy::large_enum_variant`, `clippy::pattern_type_mismatch`, `clippy::implicit_return`, and `clippy::redundant_pub_crate` lints in generated code. ([#276](https://github.com/taiki-e/pin-project/pull/276), [#277](https://github.com/taiki-e/pin-project/pull/277), [#284](https://github.com/taiki-e/pin-project/pull/284))
-
-* Diagnostic improvements.
-
-Changes since the 1.0.0-alpha.1 release:
-
-* [Fix drop order of pinned fields in project_replace](https://github.com/taiki-e/pin-project/pull/287)
-
-* Update minimal version of `syn` to 1.0.44
-
-## [1.0.0-alpha.1] - 2020-09-22
-
-* [Remove deprecated `#[project]`, `#[project_ref]`, and `#[project_replace]` attributes.](https://github.com/taiki-e/pin-project/pull/265)
-
-  Name the projected type by passing an argument with the same name as the method to the `#[pin_project]` attribute instead:
-
-  ```diff
-  - #[pin_project]
-  + #[pin_project(project = EnumProj)]
-    enum Enum<T> {
-        Variant(#[pin] T),
-    }
-
-  - #[project]
-    fn func<T>(x: Pin<&mut Enum<T>>) {
-  -     #[project]
-        match x.project() {
-  -         Enum::Variant(_) => { /* ... */ }
-  +         EnumProj::Variant(_) => { /* ... */ }
-        }
-    }
-  ```
-
-* [Remove deprecated `Replace` argument from `#[pin_project]` attribute.](https://github.com/taiki-e/pin-project/pull/266) Use `project_replace` argument instead.
-
-* [Optimize code generation when used on enums.](https://github.com/taiki-e/pin-project/pull/270)
-
-* Suppress `explicit_outlives_requirements`, `box_pointers`, `clippy::large_enum_variant`, `clippy::pattern_type_mismatch`, and `clippy::implicit_return` lints in generated code. ([#276](https://github.com/taiki-e/pin-project/pull/276), [#277](https://github.com/taiki-e/pin-project/pull/277))
-
-* Diagnostic improvements.
-
-See also [tracking issue for 1.0 release](https://github.com/taiki-e/pin-project/issues/264).
-
-## [0.4.27] - 2020-10-11
-
-* Update minimal version of `syn` to 1.0.44
-
-## [0.4.26] - 2020-10-04
-
-* [Fix drop order of pinned fields in project_replace](https://github.com/taiki-e/pin-project/pull/287)
-
-## [0.4.25] - 2020-10-01
-
-* Suppress `drop_bounds` lint, which will be added to rustc in the future. See [#272](https://github.com/taiki-e/pin-project/issues/272) for more details.
-
-  (Note: 1.0.0-alpha.1 already contains this change.)
-
-## [0.4.24] - 2020-09-26
-
-* Fix compatibility of generated code with `forbid(future_incompatible)`
-
-  Note: This does not guarantee compatibility with `forbid(future_incompatible)` in the future.
-  If rustc adds a new lint, we may not be able to keep this.
-
-## [0.4.23] - 2020-07-27
-
-* [Fix compile error with `?Sized` type parameters.][263]
-
-[263]: https://github.com/taiki-e/pin-project/pull/263
-
-## [0.4.22] - 2020-06-14
-
-* Documentation improvements.
-
-## [0.4.21] - 2020-06-13
-
-* [Deprecated `#[project]`, `#[project_ref]`, and `#[project_replace]` attributes due to some unfixable limitations.][244]
-
-  Consider naming the projected type by passing an argument with the same name as the method to the `#[pin_project]` attribute instead.
-
-  ```rust
-  #[pin_project(project = EnumProj)]
-  enum Enum<T> {
-      Variant(#[pin] T),
-  }
-
-  fn func<T>(x: Pin<&mut Enum<T>>) {
-      match x.project() {
-          EnumProj::Variant(y) => {
-              let _: Pin<&mut T> = y;
-          }
-      }
-  }
-  ```
-
-  See [#225][225] for more details.
-
-* [Support `Self` in fields and generics in type definitions.][245]
-
-* [Fix errors involving *"`self` value is a keyword only available in methods with `self` parameter"* in apparently correct code.][250]
-
-* Diagnostic improvements.
-
-[225]: https://github.com/taiki-e/pin-project/pull/225
-[244]: https://github.com/taiki-e/pin-project/pull/244
-[245]: https://github.com/taiki-e/pin-project/pull/245
-[250]: https://github.com/taiki-e/pin-project/pull/250
-
-## [0.4.20] - 2020-06-07
-
-* [You can now use project_replace argument without Replace argument.][243]
-  This used to require you to specify both.
-
-  ```diff
-  - #[pin_project(Replace, project_replace = EnumProjOwn)]
-  + #[pin_project(project_replace = EnumProjOwn)]
-    enum Enum<T> {
-        Variant(#[pin] T)
-    }
-  ```
-
-* [Makes `project_replace` argument an alias for `Replace` argument so that it can be used without a value.][243]
-
-  ```rust
-  #[pin_project(project_replace)]
-  enum Enum<T> {
-      Variant(#[pin] T)
-  }
-  ```
-
-  *The `Replace` argument will be deprecated in the future.*
-
-* Suppress `unreachable_pub` lint in generated code.
-
-[243]: https://github.com/taiki-e/pin-project/pull/243
-
-## [0.4.19] - 2020-06-04
-
-* [Fix `unused_results` lint in generated code.][239]
-
-[239]: https://github.com/taiki-e/pin-project/pull/239
-
-## [0.4.18] - 2020-06-04
-
-* [Support `Self` in more syntax positions inside `#[pinned_drop]` impl.][230]
-
-* [Suppress `clippy::type_repetition_in_bounds` and `clippy::used_underscore_binding` lints in generated code.][233]
-
-* Documentation improvements.
-
-* Diagnostic improvements.
-
-[230]: https://github.com/taiki-e/pin-project/pull/230
-[233]: https://github.com/taiki-e/pin-project/pull/233
-
-## [0.4.17] - 2020-05-18
-
-* [Support naming the projection types.][202]
-
-  By passing an argument with the same name as the method to the attribute, you can name the projection type returned from the method:
-
-  ```rust
-  #[pin_project(project = EnumProj)]
-  enum Enum<T> {
-      Variant(#[pin] T),
-  }
-
-  fn func<T>(x: Pin<&mut Enum<T>>) {
-      match x.project() {
-          EnumProj::Variant(y) => {
-              let _: Pin<&mut T> = y;
-          }
-      }
-  }
-  ```
-
-[202]: https://github.com/taiki-e/pin-project/pull/202
-
-## [0.4.16] - 2020-05-11
-
-* [Fixed an issue that users can call internal function generated by `#[pinned_drop]`.][223]
-
-[223]: https://github.com/taiki-e/pin-project/pull/223
-
-## [0.4.15] - 2020-05-10
-
-* [`#[project]` attribute can now handle all project* attributes in that scope with one wrapper attribute.][220]
-
-[220]: https://github.com/taiki-e/pin-project/pull/220
-
-## [0.4.14] - 2020-05-09
-
-* [Added `!Unpin` option to `#[pin_project]` attribute for guarantee the type is `!Unpin`.][219]
-
-  ```rust
-  #[pin_project(!Unpin)]
-  struct Struct<T, U> {
-      field: T,
-  }
-  ```
-
-  This is equivalent to use `#[pin]` attribute for `PhantomPinned` field.
-
-  ```rust
-  #[pin_project]
-  struct Struct<T, U> {
-      field: T,
-      #[pin] // Note that using `PhantomPinned` without `#[pin]` attribute has no effect.
-      _pin: PhantomPinned,
-  }
-  ```
-
-  *[Note: This raises the minimum supported Rust version of this crate from Rust 1.33 to Rust 1.34.](https://github.com/taiki-e/pin-project/pull/219#pullrequestreview-408644187)*
-
-* [Fixed an issue where duplicate `#[project]` attributes were ignored.][218]
-
-* [Suppress `single_use_lifetimes` lint in generated code.][217]
-
-* [Support overlapping lifetime names in HRTB.][217]
-
-* [Hide generated items from --document-private-items.][211] See [#211][211] for details.
-
-* Documentation improvements.
-
-[211]: https://github.com/taiki-e/pin-project/pull/211
-[217]: https://github.com/taiki-e/pin-project/pull/217
-[218]: https://github.com/taiki-e/pin-project/pull/218
-[219]: https://github.com/taiki-e/pin-project/pull/219
-
-## [0.4.13] - 2020-05-07
-
-* [Fixed a regression in 0.4.11.][207]
-
-  Changes from [0.4.10](https://github.com/taiki-e/pin-project/releases/tag/v0.4.10) and [0.4.12](https://github.com/taiki-e/pin-project/releases/tag/v0.4.12):
-
-  * [Fixed an issue that `#[project]` on non-statement expression does not work without unstable features.][197]
-
-  * [Support overwriting the name of core crate.][199]
-
-  * [Suppress `clippy::needless_pass_by_value` lint in generated code of `#[pinned_drop]`.][200]
-
-  * Documentation improvements.
-
-  * Diagnostic improvements.
-
-[207]: https://github.com/taiki-e/pin-project/pull/207
-
-## [0.4.12] - 2020-05-07
-
-* A release to avoid [a regression in 0.4.11][206]. No code changes from [0.4.10](https://github.com/taiki-e/pin-project/releases/tag/v0.4.10).
-
-[206]: https://github.com/taiki-e/pin-project/issues/206
-
-## [0.4.11] - 2020-05-07
-
-**Note: This release has been yanked.** See [#206][206] for details.
-
-* [Fixed an issue that `#[project]` on non-statement expression does not work without unstable features.][197]
-
-* [Support overwriting the name of core crate.][199]
-
-* [Suppress `clippy::needless_pass_by_value` lint in generated code of `#[pinned_drop]`.][200]
-
-* Documentation improvements.
-
-* Diagnostic improvements.
-
-[197]: https://github.com/taiki-e/pin-project/pull/197
-[199]: https://github.com/taiki-e/pin-project/pull/199
-[200]: https://github.com/taiki-e/pin-project/pull/200
-
-## [0.4.10] - 2020-05-04
-
-* [Added `project_replace` method and `#[project_replace]` attribute.][194]
-  `project_replace` method is optional and can be enabled by passing the `Replace` argument to `#[pin_project]` attribute.
-  See [the documentation](https://docs.rs/pin-project/0.4/pin_project/attr.pin_project.html#project_replace) for more details.
-
-* [Support `Self` and `self` in more syntax positions inside `#[pinned_drop]` impl.][190]
-
-* [Hided all generated items except for projected types from calling code.][192] See [#192][192] for details.
-
-[190]: https://github.com/taiki-e/pin-project/pull/190
-[192]: https://github.com/taiki-e/pin-project/pull/192
-[194]: https://github.com/taiki-e/pin-project/pull/194
-
-## [0.4.9] - 2020-04-14
-
-* [Fixed lifetime inference error when associated types are used in fields.][188]
-
-* [Fixed compile error with tuple structs with `where` clauses.][186]
-
-* [`#[project]` attribute can now be used for `if let` expressions.][181]
-
-[181]: https://github.com/taiki-e/pin-project/pull/181
-[186]: https://github.com/taiki-e/pin-project/pull/186
-[188]: https://github.com/taiki-e/pin-project/pull/188
-
-## [0.4.8] - 2020-01-27
-
-* [Ensured that users cannot implement `PinnedDrop` without proper attribute argument.][180]
-
-* [Fixed use of `Self` in expression position inside `#[pinned_drop]` impl.][177]
-
-[177]: https://github.com/taiki-e/pin-project/pull/180
-[180]: https://github.com/taiki-e/pin-project/pull/180
-
-## [0.4.7] - 2020-01-20
-
-* [Fixed support for lifetime bounds.][176]
-
-[176]: https://github.com/taiki-e/pin-project/pull/176
-
-## [0.4.6] - 2019-11-20
-
-* [Fixed compile error when there is `Self` in the where clause.][169]
-
-[169]: https://github.com/taiki-e/pin-project/pull/169
-
-## [0.4.5] - 2019-10-21
-
-* [Fixed compile error with `dyn` types.][158]
-
-[158]: https://github.com/taiki-e/pin-project/pull/158
-
-## [0.4.4] - 2019-10-17
-
-* [Fixed an issue where `PinnedDrop` implementations can call unsafe code without an unsafe block.][149]
-
-[149]: https://github.com/taiki-e/pin-project/pull/149
-
-## [0.4.3] - 2019-10-15
-
-**Note: This release has been yanked.** See [#148] for details.
-
-* [`#[pin_project]` can now interoperate with `#[cfg_attr()]`.][135]
-
-* [`#[pin_project]` can now interoperate with `#[cfg()]` on tuple structs and tuple variants.][135]
-
-* [Fixed support for DSTs(Dynamically Sized Types) on `#[pin_project(UnsafeUnpin)]`][120]
-
-* Diagnostic improvements.
-
-[#148]: https://github.com/taiki-e/pin-project/pull/148
-[120]: https://github.com/taiki-e/pin-project/pull/120
-[135]: https://github.com/taiki-e/pin-project/pull/135
-
-## [0.4.2] - 2019-09-29
-
-**Note: This release has been yanked.** See [#148] for details.
-
-* [Fixed support for DSTs(Dynamically Sized Types).][113]
-
-[113]: https://github.com/taiki-e/pin-project/pull/113
-
-## [0.4.1] - 2019-09-26
-
-**Note: This release has been yanked.** See [#148] for details.
-
-* [Fixed an issue that caused an error when using `#[pin_project]` on a type that has `#[pin]` + `!Unpin` field with no generics or lifetime.][111]
-
-[111]: https://github.com/taiki-e/pin-project/pull/111
-
-## [0.4.0] - 2019-09-25
-
-**Note: This release has been yanked.** See [#148] for details.
-
-* [**Pin projection has become a safe operation.**][18] In the absence of other unsafe code that you write, it is impossible to cause undefined behavior.
-
-* `#[unsafe_project]` attribute has been replaced with `#[pin_project]` attribute. ([#18][18], [#33][33])
-
-* [The `Unpin` argument has been removed - an `Unpin` impl is now generated by default.][18]
-
-* Drop impls must be specified with `#[pinned_drop]` instead of via a normal `Drop` impl. ([#18][18], [#33][33], [#86][86])
-
-* [`Unpin` impls must be specified with an impl of `UnsafeUnpin`, instead of implementing the normal `Unpin` trait.][18]
-
-* [`#[pin_project]` attribute now determines the visibility of the projection type/method is based on the original type.][96]
-
-* [`#[pin_project]` can now be used for public type with private field types.][53]
-
-* [`#[pin_project]` can now interoperate with `#[cfg()]`.][77]
-
-* [Added `project_ref` method to `#[pin_project]` types.][93]
-
-* [Added `#[project_ref]` attribute.][93]
-
-* [Removed "project_attr" feature and always enable `#[project]` attribute.][94]
-
-* [`#[project]` attribute can now be used for `impl` blocks.][46]
-
-* [`#[project]` attribute can now be used for `use` statements.][85]
-
-* [`#[project]` attribute now supports `match` expressions at the position of the initializer expression of `let` expressions.][51]
-
-Changes since the 0.4.0-beta.1 release:
-
-* [Fixed an issue that caused an error when using `#[pin_project(UnsafeUnpin)]` and not providing a manual `UnsafeUnpin` implementation on a type with no generics or lifetime.][107]
-
-[18]: https://github.com/taiki-e/pin-project/pull/18
-[33]: https://github.com/taiki-e/pin-project/pull/107
-[107]: https://github.com/taiki-e/pin-project/pull/107
-
-## [0.4.0-beta.1] - 2019-09-21
-
-* [Changed the argument type of project method back to `self: Pin<&mut Self>`.][90]
-
-* [Removed "project_attr" feature and always enable `#[project]` attribute.][94]
-
-* [Removed "renamed" feature.][100]
-
-* [`#[project]` attribute can now be used for `use` statements.][85]
-
-* [Added `project_ref` method and `#[project_ref]` attribute.][93]
-
-* [`#[pin_project]` attribute now determines the visibility of the projection type/method is based on the original type.][96]
-
-[85]: https://github.com/taiki-e/pin-project/pull/85
-[90]: https://github.com/taiki-e/pin-project/pull/90
-[93]: https://github.com/taiki-e/pin-project/pull/93
-[94]: https://github.com/taiki-e/pin-project/pull/94
-[96]: https://github.com/taiki-e/pin-project/pull/96
-[100]: https://github.com/taiki-e/pin-project/pull/100
-
-## [0.4.0-alpha.11] - 2019-09-11
-
-* [Changed #[pinned_drop] to trait implementation.][86]
-
-  ```rust
-  #[pinned_drop]
-  impl<T> PinnedDrop for Foo<'_, T> {
-      fn drop(mut self: Pin<&mut Self>) {
-          **self.project().was_dropped = true;
-      }
-  }
-  ```
-
-* Added some examples and generated code.
-
-* Diagnostic improvements.
-
-[86]: https://github.com/taiki-e/pin-project/pull/86
-
-## [0.4.0-alpha.10] - 2019-09-07
-
-* [`#[pin_project]` can now interoperate with `#[cfg()]`.][77]
-
-* Documentation improvements.
-
-[77]: https://github.com/taiki-e/pin-project/pull/77
-
-## [0.4.0-alpha.9] - 2019-09-05
-
-* [Added 'project_into' method to `#[pin_project]` types][69]. This can be useful when returning a pin projection from a method.
-
-  ```rust
-  fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
-      self.project_into().pinned
-  }
-  ```
-
-* [Prevented UnpinStruct from appearing in the document by default.][71] See [#71][71] for more details.
-
-[69]: https://github.com/taiki-e/pin-project/pull/69
-[71]: https://github.com/taiki-e/pin-project/pull/69
-
-## [0.4.0-alpha.8] - 2019-09-03
-
-* [Improved document of generated code.][62]. Also added an option to control the document of generated code. See [#62][62] for more details.
-
-* [Diagnostic improvements.][61]
-
-[61]: https://github.com/taiki-e/pin-project/pull/61
-[62]: https://github.com/taiki-e/pin-project/pull/62
-
-## [0.4.0-alpha.7] - 2019-09-02
-
-* [Suppress `dead_code` lint in generated types.][57]
-
-[57]: https://github.com/taiki-e/pin-project/pull/57
-
-## [0.4.0-alpha.6] - 2019-09-01
-
-* [Allowed using `#[pin_project]` type with private field types][53]
-
-[53]: https://github.com/taiki-e/pin-project/pull/53
-
-## [0.4.0-alpha.5] - 2019-08-24
-
-* [`#[project]` attribute now supports `match` expressions at the position of the initializer expression of `let` expressions.][51]
-
-[51]: https://github.com/taiki-e/pin-project/pull/51
-
-## [0.4.0-alpha.4] - 2019-08-23
-
-* Suppress `clippy::drop_bounds` lint in generated code.
-
-## [0.4.0-alpha.3] - 2019-08-23
-
-* [Changed `project` method generated by `#[pin_project]` attribute to take an `&mut Pin<&mut Self>` argument.][47]
-
-* [`#[project]` attribute can now be used for impl blocks.][46]
-
-* [`#[pin_project]` attribute can now detect that the type used does not have its own drop implementation without actually implementing drop.][48] This removed some restrictions.
-
-[46]: https://github.com/taiki-e/pin-project/pull/46
-[47]: https://github.com/taiki-e/pin-project/pull/47
-[48]: https://github.com/taiki-e/pin-project/pull/48
-
-## [0.4.0-alpha.2] - 2019-08-13
-
-* Updated `proc-macro2`, `syn`, and `quote` to 1.0.
-
-## [0.4.0-alpha.1] - 2019-08-11
-
-* **Pin projection has become a safe operation.**
-
-* `#[unsafe_project]` has been replaced with `#[pin_project]`.
-
-* The `Unpin` argument has been removed - an `Unpin` impl is now generated by default.
-
-* Drop impls must be specified with `#[pinned_drop]` instead of via a normal `Drop` impl.
-
-* `Unpin` impls must be specified with an impl of `UnsafeUnpin`, instead of implementing the normal `Unpin` trait.
-
-* Made `#[project]` attribute disabled by default.
-
-See also [tracking issue for 0.4 release][21].
-
-[21]: https://github.com/taiki-e/pin-project/issues/21
-
-## [0.3.5] - 2019-08-14
-
-* Updated `proc-macro2`, `syn`, and `quote` to 1.0.
-
-## [0.3.4] - 2019-07-21
-
-* Diagnostic improvements.
-
-## [0.3.3] - 2019-07-15
-
-**Note: This release has been yanked.** See [#16] for details.
-
-* Diagnostic improvements.
-
-[#16]: https://github.com/taiki-e/pin-project/issues/16
-
-## [0.3.2] - 2019-03-30
-
-* Avoided suffixes on tuple index.
-
-## [0.3.1] - 2019-03-02
-
-* Documentation improvements.
-
-* Updated minimum `syn` version to 0.15.22.
-
-## [0.3.0] - 2019-02-20
-
-* Removed `unsafe_fields` attribute.
-
-* Removed `unsafe_variants` attribute.
-
-## [0.2.2] - 2019-02-20
-
-* Fixed a bug that generates incorrect code for the some structures with trait bounds on type generics.
-
-## [0.2.1] - 2019-02-20
-
-* Fixed a bug that generates incorrect code for the structures with where clause and associated type fields.
-
-## [0.2.0] - 2019-02-11
-
-* Made `unsafe_fields` optional.
-
-* Documentation improvements.
-
-## [0.1.8] - 2019-02-02
-
-* Added the feature to create projected enums to `unsafe_project`.
-
-* Added `project` attribute to support pattern matching.
-
-## [0.1.7] - 2019-01-19
-
-* Fixed documentation.
-
-## [0.1.6] - 2019-01-19
-
-* `unsafe_fields` can now opt-out.
-
-* Added `unsafe_variants` attribute. This attribute is available if pin-project is built with the "unsafe_variants" feature.
-
-## [0.1.5] - 2019-01-17
-
-* Added support for tuple struct to `unsafe_project`.
-
-## [0.1.4] - 2019-01-12
-
-* Added options for automatically implementing `Unpin` to both `unsafe_project` and `unsafe_fields`.
-
-## [0.1.3] - 2019-01-11
-
-* Fixed dependencies.
-
-* Added `unsafe_fields` attribute.
-
-## [0.1.2] - 2019-01-09
-
-* Documentation improvements.
-
-## [0.1.1] - 2019-01-08
-
-* Renamed from `unsafe_pin_project` to `unsafe_project`.
-
-## [0.1.0] - 2019-01-08
-
-**Note: This release has been yanked.**
-
-Initial release
-
-[Unreleased]: https://github.com/taiki-e/pin-project/compare/v1.0.2...HEAD
-[1.0.2]: https://github.com/taiki-e/pin-project/compare/v1.0.1...v1.0.2
-[1.0.1]: https://github.com/taiki-e/pin-project/compare/v1.0.0...v1.0.1
-[1.0.0]: https://github.com/taiki-e/pin-project/compare/v1.0.0-alpha.1...v1.0.0
-[1.0.0-alpha.1]: https://github.com/taiki-e/pin-project/compare/v0.4.23...v1.0.0-alpha.1
-[0.4.27]: https://github.com/taiki-e/pin-project/compare/v0.4.26...v0.4.27
-[0.4.26]: https://github.com/taiki-e/pin-project/compare/v0.4.25...v0.4.26
-[0.4.25]: https://github.com/taiki-e/pin-project/compare/v0.4.24...v0.4.25
-[0.4.24]: https://github.com/taiki-e/pin-project/compare/v0.4.23...v0.4.24
-[0.4.23]: https://github.com/taiki-e/pin-project/compare/v0.4.22...v0.4.23
-[0.4.22]: https://github.com/taiki-e/pin-project/compare/v0.4.21...v0.4.22
-[0.4.21]: https://github.com/taiki-e/pin-project/compare/v0.4.20...v0.4.21
-[0.4.20]: https://github.com/taiki-e/pin-project/compare/v0.4.19...v0.4.20
-[0.4.19]: https://github.com/taiki-e/pin-project/compare/v0.4.18...v0.4.19
-[0.4.18]: https://github.com/taiki-e/pin-project/compare/v0.4.17...v0.4.18
-[0.4.17]: https://github.com/taiki-e/pin-project/compare/v0.4.16...v0.4.17
-[0.4.16]: https://github.com/taiki-e/pin-project/compare/v0.4.15...v0.4.16
-[0.4.15]: https://github.com/taiki-e/pin-project/compare/v0.4.14...v0.4.15
-[0.4.14]: https://github.com/taiki-e/pin-project/compare/v0.4.13...v0.4.14
-[0.4.13]: https://github.com/taiki-e/pin-project/compare/v0.4.11...v0.4.13
-[0.4.12]: https://github.com/taiki-e/pin-project/compare/v0.4.10...v0.4.12
-[0.4.11]: https://github.com/taiki-e/pin-project/compare/v0.4.10...v0.4.11
-[0.4.10]: https://github.com/taiki-e/pin-project/compare/v0.4.9...v0.4.10
-[0.4.9]: https://github.com/taiki-e/pin-project/compare/v0.4.8...v0.4.9
-[0.4.8]: https://github.com/taiki-e/pin-project/compare/v0.4.7...v0.4.8
-[0.4.7]: https://github.com/taiki-e/pin-project/compare/v0.4.6...v0.4.7
-[0.4.6]: https://github.com/taiki-e/pin-project/compare/v0.4.5...v0.4.6
-[0.4.5]: https://github.com/taiki-e/pin-project/compare/v0.4.4...v0.4.5
-[0.4.4]: https://github.com/taiki-e/pin-project/compare/v0.4.3...v0.4.4
-[0.4.3]: https://github.com/taiki-e/pin-project/compare/v0.4.2...v0.4.3
-[0.4.2]: https://github.com/taiki-e/pin-project/compare/v0.4.1...v0.4.2
-[0.4.1]: https://github.com/taiki-e/pin-project/compare/v0.4.0...v0.4.1
-[0.4.0]: https://github.com/taiki-e/pin-project/compare/v0.4.0-beta.1...v0.4.0
-[0.4.0-beta.1]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.11...v0.4.0-beta.1
-[0.4.0-alpha.11]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.10...v0.4.0-alpha.11
-[0.4.0-alpha.10]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.9...v0.4.0-alpha.10
-[0.4.0-alpha.9]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.8...v0.4.0-alpha.9
-[0.4.0-alpha.8]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.7...v0.4.0-alpha.8
-[0.4.0-alpha.7]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.6...v0.4.0-alpha.7
-[0.4.0-alpha.6]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.5...v0.4.0-alpha.6
-[0.4.0-alpha.5]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.4...v0.4.0-alpha.5
-[0.4.0-alpha.4]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.3...v0.4.0-alpha.4
-[0.4.0-alpha.3]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.2...v0.4.0-alpha.3
-[0.4.0-alpha.2]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.1...v0.4.0-alpha.2
-[0.4.0-alpha.1]: https://github.com/taiki-e/pin-project/compare/v0.3.5...v0.4.0-alpha.1
-[0.3.5]: https://github.com/taiki-e/pin-project/compare/v0.3.4...v0.3.5
-[0.3.4]: https://github.com/taiki-e/pin-project/compare/v0.3.3...v0.3.4
-[0.3.3]: https://github.com/taiki-e/pin-project/compare/v0.3.2...v0.3.3
-[0.3.2]: https://github.com/taiki-e/pin-project/compare/v0.3.1...v0.3.2
-[0.3.1]: https://github.com/taiki-e/pin-project/compare/v0.3.0...v0.3.1
-[0.3.0]: https://github.com/taiki-e/pin-project/compare/v0.2.2...v0.3.0
-[0.2.2]: https://github.com/taiki-e/pin-project/compare/v0.2.1...v0.2.2
-[0.2.1]: https://github.com/taiki-e/pin-project/compare/v0.2.0...v0.2.1
-[0.2.0]: https://github.com/taiki-e/pin-project/compare/v0.1.8...v0.2.0
-[0.1.8]: https://github.com/taiki-e/pin-project/compare/v0.1.7...v0.1.8
-[0.1.7]: https://github.com/taiki-e/pin-project/compare/v0.1.6...v0.1.7
-[0.1.6]: https://github.com/taiki-e/pin-project/compare/v0.1.5...v0.1.6
-[0.1.5]: https://github.com/taiki-e/pin-project/compare/v0.1.4...v0.1.5
-[0.1.4]: https://github.com/taiki-e/pin-project/compare/v0.1.3...v0.1.4
-[0.1.3]: https://github.com/taiki-e/pin-project/compare/v0.1.2...v0.1.3
-[0.1.2]: https://github.com/taiki-e/pin-project/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/taiki-e/pin-project/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/taiki-e/pin-project/releases/tag/v0.1.0
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/enum-default-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/enum-default-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/enum-default-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/enum-default-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-// Original code (./enum-default.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::pin_project;
-//
-// #[pin_project(project = EnumProj)]
-// enum Enum<T, U> {
-//     Pinned(#[pin] T),
-//     Unpinned(U),
-// }
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes, clippy::just_underscores_and_digits)]
-
-use pin_project::pin_project;
-
-// #[pin_project(project = EnumProj)]
-enum Enum<T, U> {
-    Pinned(/* #[pin] */ T),
-    Unpinned(U),
-}
-
-enum EnumProj<'pin, T, U>
-where
-    Enum<T, U>: 'pin,
-{
-    Pinned(::pin_project::__private::Pin<&'pin mut (T)>),
-    Unpinned(&'pin mut (U)),
-}
-
-const _: () = {
-    // When `#[pin_project]` is used on enums, only named projection types and
-    // methods are generated because there is no way to access variants of
-    // projected types without naming it.
-    // (When `#[pin_project]` is used on structs, both methods are always generated.)
-
-    impl<T, U> Enum<T, U> {
-        fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> EnumProj<'pin, T, U> {
-            unsafe {
-                match self.get_unchecked_mut() {
-                    Self::Pinned(_0) => {
-                        EnumProj::Pinned(::pin_project::__private::Pin::new_unchecked(_0))
-                    }
-                    Self::Unpinned(_0) => EnumProj::Unpinned(_0),
-                }
-            }
-        }
-    }
-
-    // Automatically create the appropriate conditional `Unpin` implementation.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/53.
-    // for details.
-    struct __Enum<'pin, T, U> {
-        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<
-            'pin,
-            (::pin_project::__private::PhantomData<T>, ::pin_project::__private::PhantomData<U>),
-        >,
-        __field0: T,
-    }
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Enum<T, U> where
-        __Enum<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-    #[doc(hidden)]
-    unsafe impl<'pin, T, U> ::pin_project::UnsafeUnpin for Enum<T, U> where
-        __Enum<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-
-    // Ensure that enum does not implement `Drop`.
-    //
-    // See ./struct-default-expanded.rs for details.
-    trait EnumMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> EnumMustNotImplDrop for T {}
-    impl<T, U> EnumMustNotImplDrop for Enum<T, U> {}
-    // A dummy impl of `PinnedDrop`, to ensure that users don't accidentally
-    // write a non-functional `PinnedDrop` impls.
-    #[doc(hidden)]
-    impl<T, U> ::pin_project::__private::PinnedDrop for Enum<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-
-    // We don't need to check for `#[repr(packed)]`,
-    // since it does not apply to enums.
-};
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/enum-default.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/enum-default.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/enum-default.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/enum-default.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-// See ./enum-default-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project(project = EnumProj)]
-enum Enum<T, U> {
-    Pinned(#[pin] T),
-    Unpinned(U),
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/not_unpin-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/not_unpin-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/not_unpin-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/not_unpin-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-// Original code (./not_unpin.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::pin_project;
-//
-// #[pin_project(!Unpin)]
-// pub struct Struct<T, U> {
-//     #[pin]
-//     pinned: T,
-//     unpinned: U,
-// }
-//
-// fn main() {
-//     fn _is_unpin<T: Unpin>() {}
-//     // _is_unpin::<Struct<(), ()>>(); //~ ERROR `std::marker::PhantomPinned` cannot be unpinned
-// }
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
-
-use pin_project::pin_project;
-
-// #[pin_project(!Unpin)]
-pub struct Struct<T, U> {
-    // #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-const _: () = {
-    pub(crate) struct __StructProjection<'pin, T, U>
-    where
-        Struct<T, U>: 'pin,
-    {
-        pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
-        unpinned: &'pin mut (U),
-    }
-    pub(crate) struct __StructProjectionRef<'pin, T, U>
-    where
-        Struct<T, U>: 'pin,
-    {
-        pinned: ::pin_project::__private::Pin<&'pin (T)>,
-        unpinned: &'pin (U),
-    }
-
-    impl<T, U> Struct<T, U> {
-        pub(crate) fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_unchecked_mut();
-                __StructProjection {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        pub(crate) fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_ref();
-                __StructProjectionRef {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/34
-    // for details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
-        let _ = &this.pinned;
-        let _ = &this.unpinned;
-    }
-
-    // Create `Unpin` impl that has trivial `Unpin` bounds.
-    //
-    // See https://github.com/taiki-e/pin-project/issues/102#issuecomment-540472282
-    // for details.
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        ::pin_project::__private::Wrapper<'pin, ::pin_project::__private::PhantomPinned>:
-            ::pin_project::__private::Unpin
-    {
-    }
-    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-    //
-    // To ensure that users don't accidentally write a non-functional `UnsafeUnpin`
-    // impls, we emit one ourselves. If the user ends up writing an `UnsafeUnpin`
-    // impl, they'll get a "conflicting implementations of trait" error when
-    // coherence checks are run.
-    #[doc(hidden)]
-    unsafe impl<'pin, T, U> ::pin_project::UnsafeUnpin for Struct<T, U> where
-        ::pin_project::__private::Wrapper<'pin, ::pin_project::__private::PhantomPinned>:
-            ::pin_project::__private::Unpin
-    {
-    }
-
-    // Ensure that struct does not implement `Drop`.
-    //
-    // See ./struct-default-expanded.rs for details.
-    trait StructMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> StructMustNotImplDrop for T {}
-    impl<T, U> StructMustNotImplDrop for Struct<T, U> {}
-    // A dummy impl of `PinnedDrop`, to ensure that users don't accidentally
-    // write a non-functional `PinnedDrop` impls.
-    #[doc(hidden)]
-    impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-};
-
-fn main() {
-    fn _is_unpin<T: Unpin>() {}
-    // _is_unpin::<Struct<(), ()>>(); //~ ERROR `std::marker::PhantomPinned` cannot be unpinned
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/not_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/not_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/not_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/not_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-// See ./not_unpin-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project(!Unpin)]
-pub struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-fn main() {
-    fn _is_unpin<T: Unpin>() {}
-    // _is_unpin::<Struct<(), ()>>(); //~ ERROR `std::marker::PhantomPinned` cannot be unpinned
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/pinned_drop-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/pinned_drop-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/pinned_drop-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/pinned_drop-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-// Original code (./pinned_drop.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::{pin_project, pinned_drop};
-// use std::pin::Pin;
-//
-// #[pin_project(PinnedDrop)]
-// pub struct Struct<'a, T> {
-//     was_dropped: &'a mut bool,
-//     #[pin]
-//     field: T,
-// }
-//
-// #[pinned_drop]
-// fn drop_Struct<T>(mut this: Pin<&mut Struct<'_, T>>) {
-//     **this.project().was_dropped = true;
-// }
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
-
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-// #[pin_project(PinnedDrop)]
-pub struct Struct<'a, T> {
-    was_dropped: &'a mut bool,
-    // #[pin]
-    field: T,
-}
-
-const _: () = {
-    pub(crate) struct __StructProjection<'pin, 'a, T>
-    where
-        Struct<'a, T>: 'pin,
-    {
-        was_dropped: &'pin mut (&'a mut bool),
-        field: ::pin_project::__private::Pin<&'pin mut (T)>,
-    }
-    pub(crate) struct __StructProjectionRef<'pin, 'a, T>
-    where
-        Struct<'a, T>: 'pin,
-    {
-        was_dropped: &'pin (&'a mut bool),
-        field: ::pin_project::__private::Pin<&'pin (T)>,
-    }
-
-    impl<'a, T> Struct<'a, T> {
-        pub(crate) fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, 'a, T> {
-            unsafe {
-                let Self { was_dropped, field } = self.get_unchecked_mut();
-                __StructProjection {
-                    was_dropped,
-                    field: ::pin_project::__private::Pin::new_unchecked(field),
-                }
-            }
-        }
-        pub(crate) fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, 'a, T> {
-            unsafe {
-                let Self { was_dropped, field } = self.get_ref();
-                __StructProjectionRef {
-                    was_dropped,
-                    field: ::pin_project::__private::Pin::new_unchecked(field),
-                }
-            }
-        }
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/34
-    // for details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<'a, T>(this: &Struct<'a, T>) {
-        let _ = &this.was_dropped;
-        let _ = &this.field;
-    }
-
-    impl<'a, T> ::pin_project::__private::Drop for Struct<'a, T> {
-        fn drop(&mut self) {
-            // Safety - we're in 'drop', so we know that 'self' will
-            // never move again.
-            let pinned_self = unsafe { ::pin_project::__private::Pin::new_unchecked(self) };
-            // We call `pinned_drop` only once. Since `PinnedDrop::drop`
-            // is an unsafe method and a private API, it is never called again in safe
-            // code *unless the user uses a maliciously crafted macro*.
-            unsafe {
-                ::pin_project::__private::PinnedDrop::drop(pinned_self);
-            }
-        }
-    }
-
-    // Automatically create the appropriate conditional `Unpin` implementation.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/53.
-    // for details.
-    pub struct __Struct<'pin, 'a, T> {
-        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<'pin, (T)>,
-        __field0: T,
-        __lifetime0: &'a (),
-    }
-    impl<'pin, 'a, T> ::pin_project::__private::Unpin for Struct<'a, T> where
-        __Struct<'pin, 'a, T>: ::pin_project::__private::Unpin
-    {
-    }
-    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-    #[doc(hidden)]
-    unsafe impl<'pin, 'a, T> ::pin_project::UnsafeUnpin for Struct<'a, T> where
-        __Struct<'pin, 'a, T>: ::pin_project::__private::Unpin
-    {
-    }
-};
-
-// Implementing `PinnedDrop::drop` is safe, but calling it is not safe.
-// This is because destructors can be called multiple times in safe code and
-// [double dropping is unsound](https://github.com/rust-lang/rust/pull/62360).
-//
-// Ideally, it would be desirable to be able to forbid manual calls in
-// the same way as `Drop::drop`, but the library cannot do it. So, by using
-// macros and replacing them with private traits, we prevent users from
-// calling `PinnedDrop::drop`.
-//
-// Users can implement [`Drop`] safely using `#[pinned_drop]` and can drop a
-// type that implements `PinnedDrop` using the [`drop`] function safely.
-// **Do not call or implement this trait directly.**
-impl<T> ::pin_project::__private::PinnedDrop for Struct<'_, T> {
-    // Since calling it twice on the same object would be UB,
-    // this method is unsafe.
-    unsafe fn drop(self: Pin<&mut Self>) {
-        #[allow(clippy::needless_pass_by_value)]
-        fn __drop_inner<T>(__self: Pin<&mut Struct<'_, T>>) {
-            // A dummy `__drop_inner` function to prevent users call outer `__drop_inner`.
-            fn __drop_inner() {}
-
-            **__self.project().was_dropped = true;
-        }
-        __drop_inner(self);
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/pinned_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/pinned_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/pinned_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/pinned_drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-// See ./pinned_drop-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project(PinnedDrop)]
-pub struct Struct<'a, T> {
-    was_dropped: &'a mut bool,
-    #[pin]
-    field: T,
-}
-
-#[pinned_drop]
-impl<T> PinnedDrop for Struct<'_, T> {
-    fn drop(self: Pin<&mut Self>) {
-        **self.project().was_dropped = true;
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/project_replace-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/project_replace-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/project_replace-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/project_replace-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-// Original code (./struct-default.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::pin_project;
-//
-// #[pin_project(project_replace)]
-// struct Struct<T, U> {
-//     #[pin]
-//     pinned: T,
-//     unpinned: U,
-// }
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
-
-use pin_project::pin_project;
-
-// #[pin_project(project_replace)]
-struct Struct<T, U> {
-    // #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-const _: () = {
-    struct __StructProjection<'pin, T, U>
-    where
-        Struct<T, U>: 'pin,
-    {
-        pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
-        unpinned: &'pin mut (U),
-    }
-    struct __StructProjectionRef<'pin, T, U>
-    where
-        Struct<T, U>: 'pin,
-    {
-        pinned: ::pin_project::__private::Pin<&'pin (T)>,
-        unpinned: &'pin (U),
-    }
-    struct __StructProjectionOwned<T, U> {
-        pinned: ::pin_project::__private::PhantomData<T>,
-        unpinned: U,
-    }
-
-    impl<T, U> Struct<T, U> {
-        fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_unchecked_mut();
-                __StructProjection {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_ref();
-                __StructProjectionRef {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        fn project_replace(
-            self: ::pin_project::__private::Pin<&mut Self>,
-            __replacement: Self,
-        ) -> __StructProjectionOwned<T, U> {
-            unsafe {
-                let __self_ptr: *mut Self = self.get_unchecked_mut();
-                let Self { pinned, unpinned } = &mut *__self_ptr;
-
-                // First, extract all the unpinned fields
-                let __result = __StructProjectionOwned {
-                    pinned: ::pin_project::__private::PhantomData,
-                    unpinned: ::pin_project::__private::ptr::read(unpinned),
-                };
-
-                // Destructors will run in reverse order, so next create a guard to overwrite
-                // `self` with the replacement value without calling destructors.
-                let __guard = ::pin_project::__private::UnsafeOverwriteGuard {
-                    target: __self_ptr,
-                    value: ::pin_project::__private::ManuallyDrop::new(__replacement),
-                };
-
-                // Now create guards to drop all the pinned fields
-                //
-                // Due to a compiler bug (https://github.com/rust-lang/rust/issues/47949)
-                // this must be in its own scope, or else `__result` will not be dropped
-                // if any of the destructors panic.
-                {
-                    let __guard = ::pin_project::__private::UnsafeDropInPlaceGuard(pinned);
-                }
-
-                // Finally, return the result
-                __result
-            }
-        }
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/34
-    // for details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
-        let _ = &this.pinned;
-        let _ = &this.unpinned;
-    }
-
-    // Automatically create the appropriate conditional `Unpin` implementation.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/53.
-    // for details.
-    struct __Struct<'pin, T, U> {
-        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<
-            'pin,
-            (::pin_project::__private::PhantomData<T>, ::pin_project::__private::PhantomData<U>),
-        >,
-        __field0: T,
-    }
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-    #[doc(hidden)]
-    unsafe impl<'pin, T, U> ::pin_project::UnsafeUnpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-
-    // Ensure that struct does not implement `Drop`.
-    //
-    // See ./struct-default-expanded.rs for details.
-    trait StructMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> StructMustNotImplDrop for T {}
-    impl<T, U> StructMustNotImplDrop for Struct<T, U> {}
-    // A dummy impl of `PinnedDrop`, to ensure that users don't accidentally
-    // write a non-functional `PinnedDrop` impls.
-    #[doc(hidden)]
-    impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-};
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/project_replace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/project_replace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/project_replace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/project_replace.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// See ./struct-default-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project(project_replace)]
-struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# Examples and generated code of each feature of pin-project
-
-### Basic usage of `#[pin_project]` on structs
-
-  * [example](struct-default.rs)
-  * [generated code](struct-default-expanded.rs)
-
-### Basic usage of `#[pin_project]` on enums
-
-  * [example](enum-default.rs)
-  * [generated code](enum-default-expanded.rs)
-
-### Manual implementation of `Unpin` by `UnsafeUnpin`
-
-  * [example](unsafe_unpin.rs)
-  * [generated code](unsafe_unpin-expanded.rs)
-  * [`UnsafeUnpin` documentation](https://docs.rs/pin-project/1/pin_project/trait.UnsafeUnpin.html)
-
-### Manual implementation of `Drop` by `#[pinned_drop]`
-
-  * [example](pinned_drop.rs)
-  * [generated code](pinned_drop-expanded.rs)
-  * [`#[pinned_drop]` documentation](https://docs.rs/pin-project/1/pin_project/attr.pinned_drop.html)
-
-### `project_replace()` method
-
-  * [example](project_replace.rs)
-  * [generated code](project_replace-expanded.rs)
-  * [`project_replace()` documentation](https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#project_replace)
-
-### Ensure `!Unpin` by `#[pin_project(!Unpin)]`
-
-  * [example](not_unpin.rs)
-  * [generated code](not_unpin-expanded.rs)
-  * [`!Unpin` documentation](https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unpin)
-
-Note: These generated code examples are the little simplified version of the actual generated code.
-See [expansion tests](../tests/expand/README.md) if you want to see the exact version of the actual generated code.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/struct-default-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/struct-default-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/struct-default-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/struct-default-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-// Original code (./struct-default.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::pin_project;
-//
-// #[pin_project]
-// struct Struct<T, U> {
-//     #[pin]
-//     pinned: T,
-//     unpinned: U,
-// }
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
-
-use pin_project::pin_project;
-
-// #[pin_project]
-struct Struct<T, U> {
-    // #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-const _: () = {
-    struct __StructProjection<'pin, T, U>
-    where
-        Struct<T, U>: 'pin,
-    {
-        pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
-        unpinned: &'pin mut (U),
-    }
-    struct __StructProjectionRef<'pin, T, U>
-    where
-        Struct<T, U>: 'pin,
-    {
-        pinned: ::pin_project::__private::Pin<&'pin (T)>,
-        unpinned: &'pin (U),
-    }
-
-    impl<T, U> Struct<T, U> {
-        fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_unchecked_mut();
-                __StructProjection {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_ref();
-                __StructProjectionRef {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // Taking a reference to a packed field is unsafe, and applying
-    // #[forbid(safe_packed_borrows)] makes sure that doing this without
-    // an 'unsafe' block (which we deliberately do not generate)
-    // is a hard error.
-    //
-    // If the struct ends up having #[repr(packed)] applied somehow,
-    // this will generate an (unfriendly) error message. Under all reasonable
-    // circumstances, we'll detect the #[repr(packed)] attribute, and generate
-    // a much nicer error above.
-    //
-    // See https://github.com/taiki-e/pin-project/pull/34 for more details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
-        let _ = &this.pinned;
-        let _ = &this.unpinned;
-    }
-
-    // Automatically create the appropriate conditional `Unpin` implementation.
-    //
-    // Basically this is equivalent to the following code:
-    //
-    // ```rust
-    // impl<T, U> Unpin for Struct<T, U> where T: Unpin {}
-    // ```
-    //
-    // However, if struct is public and there is a private type field,
-    // this would cause an E0446 (private type in public interface).
-    //
-    // When RFC 2145 is implemented (rust-lang/rust#48054),
-    // this will become a lint, rather then a hard error.
-    //
-    // As a workaround for this, we generate a new struct, containing all of
-    // the pinned fields from our #[pin_project] type. This struct is declared
-    // within a function, which makes it impossible to be named by user code.
-    // This guarantees that it will use the default auto-trait impl for Unpin -
-    // that is, it will implement Unpin iff all of its fields implement Unpin.
-    // This type can be safely declared as 'public', satisfying the privacy
-    // checker without actually allowing user code to access it.
-    //
-    // This allows users to apply the #[pin_project] attribute to types
-    // regardless of the privacy of the types of their fields.
-    //
-    // See also https://github.com/taiki-e/pin-project/pull/53.
-    struct __Struct<'pin, T, U> {
-        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<
-            'pin,
-            (::pin_project::__private::PhantomData<T>, ::pin_project::__private::PhantomData<U>),
-        >,
-        __field0: T,
-    }
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-    //
-    // To ensure that users don't accidentally write a non-functional `UnsafeUnpin`
-    // impls, we emit one ourselves. If the user ends up writing an `UnsafeUnpin`
-    // impl, they'll get a "conflicting implementations of trait" error when
-    // coherence checks are run.
-    #[doc(hidden)]
-    unsafe impl<'pin, T, U> ::pin_project::UnsafeUnpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-
-    // Ensure that struct does not implement `Drop`.
-    //
-    // If you attempt to provide an Drop impl, the blanket impl will
-    // then apply to your type, causing a compile-time error due to
-    // the conflict with the second impl.
-    trait StructMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> StructMustNotImplDrop for T {}
-    impl<T, U> StructMustNotImplDrop for Struct<T, U> {}
-    // A dummy impl of `PinnedDrop`, to ensure that users don't accidentally
-    // write a non-functional `PinnedDrop` impls.
-    #[doc(hidden)]
-    impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-};
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/struct-default.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/struct-default.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/struct-default.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/struct-default.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// See ./struct-default-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project]
-struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/unsafe_unpin-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/unsafe_unpin-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/unsafe_unpin-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/unsafe_unpin-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-// Original code (./unsafe_unpin.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::{pin_project, UnsafeUnpin};
-//
-// #[pin_project(UnsafeUnpin)]
-// pub struct Struct<T, U> {
-//     #[pin]
-//     pinned: T,
-//     unpinned: U,
-// }
-//
-// unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes)]
-
-use pin_project::{pin_project, UnsafeUnpin};
-
-// #[pin_project(UnsafeUnpin)]
-pub struct Struct<T, U> {
-    // #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-const _: () = {
-    pub(crate) struct __StructProjection<'pin, T, U>
-    where
-        Struct<T, U>: 'pin,
-    {
-        pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
-        unpinned: &'pin mut (U),
-    }
-    pub(crate) struct __StructProjectionRef<'pin, T, U>
-    where
-        Struct<T, U>: 'pin,
-    {
-        pinned: ::pin_project::__private::Pin<&'pin (T)>,
-        unpinned: &'pin (U),
-    }
-
-    impl<T, U> Struct<T, U> {
-        pub(crate) fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_unchecked_mut();
-                __StructProjection {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        pub(crate) fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_ref();
-                __StructProjectionRef {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/34
-    // for details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
-        let _ = &this.pinned;
-        let _ = &this.unpinned;
-    }
-
-    // Implement `Unpin` via `UnsafeUnpin`.
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        ::pin_project::__private::Wrapper<'pin, Self>: ::pin_project::UnsafeUnpin
-    {
-    }
-
-    // Ensure that struct does not implement `Drop`.
-    //
-    // See ./struct-default-expanded.rs for details.
-    trait StructMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> StructMustNotImplDrop for T {}
-    impl<T, U> StructMustNotImplDrop for Struct<T, U> {}
-    // A dummy impl of `PinnedDrop`, to ensure that users don't accidentally
-    // write a non-functional `PinnedDrop` impls.
-    #[doc(hidden)]
-    impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-};
-
-unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/unsafe_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/unsafe_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/examples/unsafe_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/examples/unsafe_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-// See ./unsafe_unpin-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::{pin_project, UnsafeUnpin};
-
-#[pin_project(UnsafeUnpin)]
-pub struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-# pin-project
-
-[![crates-badge]][crates-url]
-[![docs-badge]][docs-url]
-[![license-badge]][license]
-[![rustc-badge]][rustc-url]
-
-[crates-badge]: https://img.shields.io/crates/v/pin-project.svg
-[crates-url]: https://crates.io/crates/pin-project
-[docs-badge]: https://docs.rs/pin-project/badge.svg
-[docs-url]: https://docs.rs/pin-project
-[license-badge]: https://img.shields.io/badge/license-Apache--2.0%20OR%20MIT-blue.svg
-[license]: #license
-[rustc-badge]: https://img.shields.io/badge/rustc-1.37+-lightgray.svg
-[rustc-url]: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
-
-A crate for safe and ergonomic [pin-projection].
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-pin-project = "1"
-```
-
-The current pin-project requires Rust 1.37 or later.
-
-## Examples
-
-[`#[pin_project]`][`pin_project`] attribute creates projection types
-covering all the fields of struct or enum.
-
-```rust
-use pin_project::pin_project;
-use std::pin::Pin;
-
-#[pin_project]
-struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-impl<T, U> Struct<T, U> {
-    fn method(self: Pin<&mut Self>) {
-        let this = self.project();
-        let _: Pin<&mut T> = this.pinned; // Pinned reference to the field
-        let _: &mut U = this.unpinned; // Normal reference to the field
-    }
-}
-```
-
-[*code like this will be generated*][struct-default-expanded]
-
-To use `#[pin_project]` on enums, you need to name the projection type
-returned from the method.
-
-```rust
-use pin_project::pin_project;
-use std::pin::Pin;
-
-#[pin_project(project = EnumProj)]
-enum Enum<T, U> {
-    Pinned(#[pin] T),
-    Unpinned(U),
-}
-
-impl<T, U> Enum<T, U> {
-    fn method(self: Pin<&mut Self>) {
-        match self.project() {
-            EnumProj::Pinned(x) => {
-                let _: Pin<&mut T> = x;
-            }
-            EnumProj::Unpinned(y) => {
-                let _: &mut U = y;
-            }
-        }
-    }
-}
-```
-
-[*code like this will be generated*][enum-default-expanded]
-
-See [documentation][docs-url] for more details, and
-see [examples] directory for more examples and generated code.
-
-[`pin_project`]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html
-[enum-default-expanded]: examples/enum-default-expanded.rs
-[examples]: examples/README.md
-[pin-projection]: https://doc.rust-lang.org/nightly/std/pin/index.html#projections-and-structural-pinning
-[struct-default-expanded]: examples/struct-default-expanded.rs
-
-## Related Projects
-
-* [pin-project-lite]: A lightweight version of pin-project written with declarative macros.
-
-[pin-project-lite]: https://github.com/taiki-e/pin-project-lite
-
-## License
-
-Licensed under either of [Apache License, Version 2.0](LICENSE-APACHE) or [MIT license](LICENSE-MIT) at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Rustfmt configuration
-# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md
-
-# This is required for bug-fixes, which technically can't be made to the stable
-# first version.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3383).
-version = "Two"
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3391)
-error_on_line_overflow = true
-
-# Override the default formatting style.
-# See https://internals.rust-lang.org/t/running-rustfmt-on-rust-lang-rust-and-other-rust-lang-repositories/8732/81.
-use_small_heuristics = "Max"
-# See https://github.com/rust-dev-tools/fmt-rfcs/issues/149.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3370)
-overflow_delimited_expr = true
-
-# Apply rustfmt to more places.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3362).
-merge_imports = true
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3348).
-format_code_in_doc_comments = true
-
-# Set the default settings again to always apply the proper formatting without
-# being affected by the editor settings.
-edition = "2018"
-hard_tabs = false
-newline_style = "Unix"
-tab_spaces = 4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/scripts/check-minimal-versions.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/scripts/check-minimal-versions.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/scripts/check-minimal-versions.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/scripts/check-minimal-versions.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# Check all public crates with minimal version dependencies.
-#
-# Usage:
-#    bash scripts/check-minimal-versions.sh [+toolchain] [check|test]
-#
-# Note:
-# - This script modifies Cargo.toml and Cargo.lock while running
-# - This script exits with 1 if there are any unstaged changes
-# - This script requires nightly Rust and cargo-hack
-#
-# Refs: https://github.com/rust-lang/cargo/issues/5657
-
-set -euo pipefail
-IFS=$'\n\t'
-
-cd "$(cd "$(dirname "${0}")" && pwd)"/..
-
-# Decide Rust toolchain.
-# Nightly is used by default if the `CI` environment variable is unset.
-if [[ "${1:-}" == "+"* ]]; then
-  toolchain="${1}"
-  shift
-elif [[ -z "${CI:-}" ]]; then
-  toolchain="+nightly"
-fi
-# Make sure toolchain is installed.
-cargo ${toolchain:-} -V >/dev/null
-# This script requires nightly Rust and cargo-hack
-if [[ "${toolchain:-+nightly}" != "+nightly"* ]] || ! cargo hack -V &>/dev/null; then
-  echo "error: check-minimal-versions.sh requires nightly Rust and cargo-hack"
-  exit 1
-fi
-
-# Parse subcommand.
-subcmd="${1:-check}"
-if [[ ! "${subcmd}" =~ ^(check|test)$ ]]; then
-  echo "error: invalid argument: ${1}"
-  exit 1
-elif [[ -n "${2:-}" ]]; then
-  echo "error: invalid argument: ${2}"
-  exit 1
-fi
-
-# This script modifies Cargo.toml and Cargo.lock, so make sure there are no
-# unstaged changes.
-git diff --exit-code
-# Restore original Cargo.toml and Cargo.lock on exit.
-trap 'git checkout .' EXIT
-
-if [[ "${subcmd}" == "check" ]]; then
-  # Remove dev-dependencies from Cargo.toml to prevent the next `cargo update`
-  # from determining minimal versions based on dev-dependencies.
-  cargo hack --remove-dev-deps --workspace
-fi
-
-# Update Cargo.lock to minimal version dependencies.
-cargo ${toolchain:-} update -Z minimal-versions
-# Run check for all public members of the workspace.
-cargo ${toolchain:-} hack "${subcmd}" --workspace --all-features --ignore-private -Z features=all
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/scripts/ci.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/scripts/ci.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/scripts/ci.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/scripts/ci.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# A script to run a simplified version of the checks done by CI.
-#
-# Usage:
-#     bash scripts/ci.sh
-#
-# Note: This script requires nightly Rust, rustfmt, clippy, and cargo-expand
-
-set -euo pipefail
-IFS=$'\n\t'
-
-# Decide Rust toolchain. Nightly is used by default.
-toolchain="+nightly"
-if [[ "${1:-}" == "+"* ]]; then
-  toolchain="${1}"
-  shift
-fi
-# Make sure toolchain is installed.
-cargo "${toolchain}" -V >/dev/null
-
-if [[ "${toolchain:-+nightly}" != "+nightly"* ]] || ! rustfmt -V &>/dev/null || ! cargo clippy -V &>/dev/null || ! cargo expand -V &>/dev/null; then
-  echo "error: ci.sh requires nightly Rust, rustfmt, clippy, and cargo-expand"
-  exit 1
-fi
-
-echo "Running 'cargo ${toolchain} fmt --all'"
-cargo "${toolchain}" fmt --all
-
-echo "Running 'cargo ${toolchain} clippy --all --all-targets'"
-cargo "${toolchain}" clippy --all --all-features --all-targets -Z unstable-options
-
-echo "Running 'cargo ${toolchain} test --all'"
-cargo "${toolchain}" test --all --all-features
-
-echo "Running 'cargo ${toolchain} doc --no-deps --all'"
-cargo "${toolchain}" doc --no-deps --all --all-features
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/scripts/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/scripts/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/scripts/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/scripts/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-This directory contains scripts used by the developers of this project.
-
-Some scripts in this directory are also used in CI, but scripts intended to be used only in CI and scripts not intended to be used directly by the developers are basically in the `ci` directory.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,288 +0,0 @@
-//! A crate for safe and ergonomic [pin-projection].
-//!
-//! # Examples
-//!
-//! [`#[pin_project]`][`pin_project`] attribute creates projection types
-//! covering all the fields of struct or enum.
-//!
-//! ```rust
-//! use pin_project::pin_project;
-//! use std::pin::Pin;
-//!
-//! #[pin_project]
-//! struct Struct<T, U> {
-//!     #[pin]
-//!     pinned: T,
-//!     unpinned: U,
-//! }
-//!
-//! impl<T, U> Struct<T, U> {
-//!     fn method(self: Pin<&mut Self>) {
-//!         let this = self.project();
-//!         let _: Pin<&mut T> = this.pinned; // Pinned reference to the field
-//!         let _: &mut U = this.unpinned; // Normal reference to the field
-//!     }
-//! }
-//! ```
-//!
-//! [*code like this will be generated*][struct-default-expanded]
-//!
-//! To use `#[pin_project]` on enums, you need to name the projection type
-//! returned from the method.
-//!
-//! ```rust
-//! use pin_project::pin_project;
-//! use std::pin::Pin;
-//!
-//! #[pin_project(project = EnumProj)]
-//! enum Enum<T, U> {
-//!     Pinned(#[pin] T),
-//!     Unpinned(U),
-//! }
-//!
-//! impl<T, U> Enum<T, U> {
-//!     fn method(self: Pin<&mut Self>) {
-//!         match self.project() {
-//!             EnumProj::Pinned(x) => {
-//!                 let _: Pin<&mut T> = x;
-//!             }
-//!             EnumProj::Unpinned(y) => {
-//!                 let _: &mut U = y;
-//!             }
-//!         }
-//!     }
-//! }
-//! ```
-//!
-//! [*code like this will be generated*][enum-default-expanded]
-//!
-//! See [`#[pin_project]`][`pin_project`] attribute for more details, and
-//! see [examples] directory for more examples and generated code.
-//!
-//! [examples]: https://github.com/taiki-e/pin-project/blob/master/examples/README.md
-//! [enum-default-expanded]: https://github.com/taiki-e/pin-project/blob/master/examples/enum-default-expanded.rs
-//! [pin-projection]: core::pin#projections-and-structural-pinning
-//! [struct-default-expanded]: https://github.com/taiki-e/pin-project/blob/master/examples/struct-default-expanded.rs
-
-#![no_std]
-#![doc(html_root_url = "https://docs.rs/pin-project/1.0.2")]
-#![doc(test(
-    no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms, single_use_lifetimes), allow(dead_code))
-))]
-#![warn(future_incompatible, rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
-#![warn(missing_docs)]
-#![warn(clippy::all, clippy::default_trait_access)]
-// mem::take, #[non_exhaustive], and Option::{as_deref, as_deref_mut} require Rust 1.40,
-// matches! requires Rust 1.42, str::{strip_prefix, strip_suffix} requires Rust 1.45
-#![allow(
-    clippy::mem_replace_with_default,
-    clippy::manual_non_exhaustive,
-    clippy::option_as_ref_deref,
-    clippy::match_like_matches_macro,
-    clippy::manual_strip
-)]
-#![allow(clippy::needless_doctest_main)]
-
-#[doc(inline)]
-pub use pin_project_internal::pin_project;
-
-#[doc(inline)]
-pub use pin_project_internal::pinned_drop;
-
-/// A trait used for custom implementations of [`Unpin`].
-///
-/// This trait is used in conjunction with the `UnsafeUnpin` argument to
-/// the [`#[pin_project]`][macro@pin_project] attribute.
-///
-/// The Rust [`Unpin`] trait is safe to implement - by itself,
-/// implementing it cannot lead to [undefined behavior][undefined-behavior].
-/// Undefined behavior can only occur when other unsafe code is used.
-///
-/// It turns out that using pin projections, which requires unsafe code,
-/// imposes additional requirements on an [`Unpin`] impl. Normally, all of this
-/// unsafety is contained within this crate, ensuring that it's impossible for
-/// you to violate any of the guarantees required by pin projection.
-///
-/// However, things change if you want to provide a custom [`Unpin`] impl
-/// for your `#[pin_project]` type. As stated in [the Rust
-/// documentation][pin-projection], you must be sure to only implement [`Unpin`]
-/// when all of your `#[pin]` fields (i.e. structurally pinned fields) are also
-/// [`Unpin`].
-///
-/// To help highlight this unsafety, the `UnsafeUnpin` trait is provided.
-/// Implementing this trait is logically equivalent to implementing [`Unpin`] -
-/// this crate will generate an [`Unpin`] impl for your type that 'forwards' to
-/// your `UnsafeUnpin` impl. However, this trait is `unsafe` - since your type
-/// uses structural pinning (otherwise, you wouldn't be using this crate!),
-/// you must be sure that your `UnsafeUnpin` impls follows all of
-/// the requirements for an [`Unpin`] impl of a structurally-pinned type.
-///
-/// Note that if you specify `#[pin_project(UnsafeUnpin)]`, but do *not*
-/// provide an impl of `UnsafeUnpin`, your type will never implement [`Unpin`].
-/// This is effectively the same thing as adding a [`PhantomPinned`] to your
-/// type.
-///
-/// Since this trait is `unsafe`, impls of it will be detected by the
-/// `unsafe_code` lint, and by tools like [`cargo geiger`][cargo-geiger].
-///
-/// # Examples
-///
-/// An `UnsafeUnpin` impl which, in addition to requiring that structurally
-/// pinned fields be [`Unpin`], imposes an additional requirement:
-///
-/// ```rust
-/// use pin_project::{pin_project, UnsafeUnpin};
-///
-/// #[pin_project(UnsafeUnpin)]
-/// struct Struct<K, V> {
-///     #[pin]
-///     field_1: K,
-///     field_2: V,
-/// }
-///
-/// unsafe impl<K, V> UnsafeUnpin for Struct<K, V> where K: Unpin + Clone {}
-/// ```
-///
-/// [`PhantomPinned`]: core::marker::PhantomPinned
-/// [cargo-geiger]: https://github.com/rust-secure-code/cargo-geiger
-/// [pin-projection]: core::pin#projections-and-structural-pinning
-/// [undefined-behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html
-pub unsafe trait UnsafeUnpin {}
-
-// Not public API.
-#[doc(hidden)]
-pub mod __private {
-    #[doc(hidden)]
-    pub use core::{
-        marker::{PhantomData, PhantomPinned, Unpin},
-        mem::ManuallyDrop,
-        ops::Drop,
-        pin::Pin,
-        ptr,
-    };
-
-    use super::UnsafeUnpin;
-
-    #[doc(hidden)]
-    pub use pin_project_internal::__PinProjectInternalDerive;
-
-    // An internal trait used for custom implementations of [`Drop`].
-    //
-    // **Do not call or implement this trait directly.**
-    //
-    // # Why this trait is private and `#[pinned_drop]` attribute is needed?
-    //
-    // Implementing `PinnedDrop::drop` is safe, but calling it is not safe.
-    // This is because destructors can be called multiple times in safe code and
-    // [double dropping is unsound][rust-lang/rust#62360].
-    //
-    // Ideally, it would be desirable to be able to forbid manual calls in
-    // the same way as [`Drop::drop`], but the library cannot do it. So, by using
-    // macros and replacing them with private traits,
-    // this crate prevent users from calling `PinnedDrop::drop` in safe code.
-    //
-    // This allows implementing [`Drop`] safely using `#[pinned_drop]`.
-    // Also by using the [`drop`] function just like dropping a type that directly
-    // implements [`Drop`], can drop safely a type that implements `PinnedDrop`.
-    //
-    // [rust-lang/rust#62360]: https://github.com/rust-lang/rust/pull/62360
-    #[doc(hidden)]
-    pub trait PinnedDrop {
-        #[doc(hidden)]
-        unsafe fn drop(self: Pin<&mut Self>);
-    }
-
-    // This is an internal helper struct used by `pin-project-internal`.
-    // This allows us to force an error if the user tries to provide
-    // a regular `Unpin` impl when they specify the `UnsafeUnpin` argument.
-    // This is why we need Wrapper:
-    //
-    // Supposed we have the following code:
-    //
-    // ```rust
-    // #[pin_project(UnsafeUnpin)]
-    // struct MyStruct<T> {
-    //     #[pin] field: T
-    // }
-    //
-    // impl<T> Unpin for MyStruct<T> where MyStruct<T>: UnsafeUnpin {} // generated by pin-project-internal
-    // impl<T> Unpin for MyStruct<T> where T: Copy // written by the user
-    // ```
-    //
-    // We want this code to be rejected - the user is completely bypassing
-    // `UnsafeUnpin`, and providing an unsound Unpin impl in safe code!
-    //
-    // Unfortunately, the Rust compiler will accept the above code.
-    // Because MyStruct is declared in the same crate as the user-provided impl,
-    // the compiler will notice that `MyStruct<T>: UnsafeUnpin` never holds.
-    //
-    // The solution is to introduce the `Wrapper` struct, which is defined
-    // in the `pin-project` crate.
-    //
-    // We now have code that looks like this:
-    //
-    // ```rust
-    // impl<T> Unpin for MyStruct<T> where Wrapper<MyStruct<T>>: UnsafeUnpin {} // generated by pin-project-internal
-    // impl<T> Unpin for MyStruct<T> where T: Copy // written by the user
-    // ```
-    //
-    // We also have `unsafe impl<T> UnsafeUnpin for Wrapper<T> where T: UnsafeUnpin {}`
-    // in the `pin-project` crate.
-    //
-    // Now, our generated impl has a bound involving a type defined in another
-    // crate - Wrapper. This will cause rust to conservatively assume that
-    // `Wrapper<MyStruct<T>>: UnsafeUnpin` holds, in the interest of preserving
-    // forwards compatibility (in case such an impl is added for Wrapper<T> in
-    // a new version of the crate).
-    //
-    // This will cause rust to reject any other `Unpin` impls for MyStruct<T>,
-    // since it will assume that our generated impl could potentially apply in
-    // any situation.
-    //
-    // This achieves the desired effect - when the user writes
-    // `#[pin_project(UnsafeUnpin)]`, the user must either provide no impl of
-    // `UnsafeUnpin` (which is equivalent to making the type never implement
-    // Unpin), or provide an impl of `UnsafeUnpin`. It is impossible for them to
-    // provide an impl of `Unpin`
-    #[doc(hidden)]
-    pub struct Wrapper<'a, T: ?Sized>(PhantomData<&'a ()>, T);
-
-    unsafe impl<T: ?Sized> UnsafeUnpin for Wrapper<'_, T> where T: UnsafeUnpin {}
-
-    // This is an internal helper struct used by `pin-project-internal`.
-    //
-    // See https://github.com/taiki-e/pin-project/pull/53 for more details.
-    #[doc(hidden)]
-    pub struct AlwaysUnpin<'a, T>(PhantomData<&'a ()>, PhantomData<T>);
-
-    impl<T> Unpin for AlwaysUnpin<'_, T> {}
-
-    // This is an internal helper used to ensure a value is dropped.
-    #[doc(hidden)]
-    pub struct UnsafeDropInPlaceGuard<T: ?Sized>(pub *mut T);
-
-    impl<T: ?Sized> Drop for UnsafeDropInPlaceGuard<T> {
-        fn drop(&mut self) {
-            unsafe {
-                ptr::drop_in_place(self.0);
-            }
-        }
-    }
-
-    // This is an internal helper used to ensure a value is overwritten without
-    // its destructor being called.
-    #[doc(hidden)]
-    pub struct UnsafeOverwriteGuard<T> {
-        pub value: ManuallyDrop<T>,
-        pub target: *mut T,
-    }
-
-    impl<T> Drop for UnsafeOverwriteGuard<T> {
-        fn drop(&mut self) {
-            unsafe {
-                ptr::write(self.target, ptr::read(&*self.value));
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/auxiliary/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/auxiliary/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/auxiliary/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/auxiliary/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#![allow(dead_code, unused_macros)]
-
-macro_rules! assert_unpin {
-    ($ty:ty) => {
-        static_assertions::assert_impl_all!($ty: Unpin);
-    };
-}
-macro_rules! assert_not_unpin {
-    ($ty:ty) => {
-        static_assertions::assert_not_impl_all!($ty: Unpin);
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/cfg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/cfg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/cfg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/cfg.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,253 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-// Refs: https://doc.rust-lang.org/reference/attributes.html
-
-#[macro_use]
-mod auxiliary;
-
-use pin_project::pin_project;
-use std::{marker::PhantomPinned, pin::Pin};
-
-#[cfg(target_os = "linux")]
-struct Linux;
-#[cfg(not(target_os = "linux"))]
-struct Other;
-
-// Use this type to check that `cfg(any())` is working properly.
-struct Any(PhantomPinned);
-
-#[test]
-fn cfg() {
-    // structs
-
-    #[pin_project(project_replace)]
-    struct SameName {
-        #[cfg(target_os = "linux")]
-        #[pin]
-        inner: Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[pin]
-        inner: Other,
-        #[cfg(any())]
-        #[pin]
-        any: Any,
-    }
-
-    assert_unpin!(SameName);
-
-    #[cfg(target_os = "linux")]
-    let _ = SameName { inner: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let _ = SameName { inner: Other };
-
-    #[pin_project(project_replace)]
-    struct DifferentName {
-        #[cfg(target_os = "linux")]
-        #[pin]
-        l: Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[pin]
-        o: Other,
-        #[cfg(any())]
-        #[pin]
-        a: Any,
-    }
-
-    assert_unpin!(DifferentName);
-
-    #[cfg(target_os = "linux")]
-    let _ = DifferentName { l: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let _ = DifferentName { o: Other };
-
-    #[pin_project(project_replace)]
-    struct TupleStruct(
-        #[cfg(target_os = "linux")]
-        #[pin]
-        Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[pin]
-        Other,
-        #[cfg(any())]
-        #[pin]
-        Any,
-    );
-
-    assert_unpin!(TupleStruct);
-
-    #[cfg(target_os = "linux")]
-    let _ = TupleStruct(Linux);
-    #[cfg(not(target_os = "linux"))]
-    let _ = TupleStruct(Other);
-
-    // enums
-
-    #[pin_project(
-        project = VariantProj,
-        project_ref = VariantProjRef,
-        project_replace = VariantProjOwn,
-    )]
-    enum Variant {
-        #[cfg(target_os = "linux")]
-        Inner(#[pin] Linux),
-        #[cfg(not(target_os = "linux"))]
-        Inner(#[pin] Other),
-
-        #[cfg(target_os = "linux")]
-        Linux(#[pin] Linux),
-        #[cfg(not(target_os = "linux"))]
-        Other(#[pin] Other),
-        #[cfg(any())]
-        Any(#[pin] Any),
-    }
-
-    assert_unpin!(Variant);
-
-    #[cfg(target_os = "linux")]
-    let _ = Variant::Inner(Linux);
-    #[cfg(not(target_os = "linux"))]
-    let _ = Variant::Inner(Other);
-
-    #[cfg(target_os = "linux")]
-    let _ = Variant::Linux(Linux);
-    #[cfg(not(target_os = "linux"))]
-    let _ = Variant::Other(Other);
-
-    #[pin_project(
-        project = FieldProj,
-        project_ref = FieldProjRef,
-        project_replace = FieldProjOwn,
-    )]
-    enum Field {
-        SameName {
-            #[cfg(target_os = "linux")]
-            #[pin]
-            inner: Linux,
-            #[cfg(not(target_os = "linux"))]
-            #[pin]
-            inner: Other,
-            #[cfg(any())]
-            #[pin]
-            any: Any,
-        },
-        DifferentName {
-            #[cfg(target_os = "linux")]
-            #[pin]
-            l: Linux,
-            #[cfg(not(target_os = "linux"))]
-            #[pin]
-            w: Other,
-            #[cfg(any())]
-            #[pin]
-            any: Any,
-        },
-        TupleVariant(
-            #[cfg(target_os = "linux")]
-            #[pin]
-            Linux,
-            #[cfg(not(target_os = "linux"))]
-            #[pin]
-            Other,
-            #[cfg(any())]
-            #[pin]
-            Any,
-        ),
-    }
-
-    assert_unpin!(Field);
-
-    #[cfg(target_os = "linux")]
-    let _ = Field::SameName { inner: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let _ = Field::SameName { inner: Other };
-
-    #[cfg(target_os = "linux")]
-    let _ = Field::DifferentName { l: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let _ = Field::DifferentName { w: Other };
-
-    #[cfg(target_os = "linux")]
-    let _ = Field::TupleVariant(Linux);
-    #[cfg(not(target_os = "linux"))]
-    let _ = Field::TupleVariant(Other);
-}
-
-#[test]
-fn cfg_attr() {
-    #[pin_project(project_replace)]
-    struct SameCfg {
-        #[cfg(target_os = "linux")]
-        #[cfg_attr(target_os = "linux", pin)]
-        inner: Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[cfg_attr(not(target_os = "linux"), pin)]
-        inner: Other,
-        #[cfg(any())]
-        #[cfg_attr(any(), pin)]
-        any: Any,
-    }
-
-    assert_unpin!(SameCfg);
-
-    #[cfg(target_os = "linux")]
-    let mut x = SameCfg { inner: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let mut x = SameCfg { inner: Other };
-
-    let x = Pin::new(&mut x).project();
-    #[cfg(target_os = "linux")]
-    let _: Pin<&mut Linux> = x.inner;
-    #[cfg(not(target_os = "linux"))]
-    let _: Pin<&mut Other> = x.inner;
-
-    #[pin_project(project_replace)]
-    struct DifferentCfg {
-        #[cfg(target_os = "linux")]
-        #[cfg_attr(target_os = "linux", pin)]
-        inner: Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[cfg_attr(target_os = "linux", pin)]
-        inner: Other,
-        #[cfg(any())]
-        #[cfg_attr(any(), pin)]
-        any: Any,
-    }
-
-    assert_unpin!(DifferentCfg);
-
-    #[cfg(target_os = "linux")]
-    let mut x = DifferentCfg { inner: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let mut x = DifferentCfg { inner: Other };
-
-    let x = Pin::new(&mut x).project();
-    #[cfg(target_os = "linux")]
-    let _: Pin<&mut Linux> = x.inner;
-    #[cfg(not(target_os = "linux"))]
-    let _: &mut Other = x.inner;
-
-    #[cfg_attr(not(any()), pin_project)]
-    struct Foo<T> {
-        #[cfg_attr(not(any()), pin)]
-        inner: T,
-    }
-
-    assert_unpin!(Foo<()>);
-    assert_not_unpin!(Foo<PhantomPinned>);
-
-    let mut x = Foo { inner: 0_u8 };
-    let x = Pin::new(&mut x).project();
-    let _: Pin<&mut u8> = x.inner;
-}
-
-#[test]
-fn cfg_attr_any_packed() {
-    // Since `cfg(any())` can never be true, it is okay for this to pass.
-    #[pin_project(project_replace)]
-    #[cfg_attr(any(), repr(packed))]
-    struct Struct {
-        #[pin]
-        f: u32,
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/compiletest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/compiletest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/compiletest.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/compiletest.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#![cfg(not(miri))]
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-use std::env;
-
-// Run `./dev.sh +$toolchain test --test compiletest` to update this.
-#[rustversion::attr(before(2020-10-28), ignore)] // Note: This date is commit-date and the day before the toolchain date.
-#[test]
-fn ui() {
-    if env::var_os("CI").is_none() {
-        env::set_var("TRYBUILD", "overwrite");
-    }
-
-    let t = trybuild::TestCases::new();
-    t.compile_fail("tests/ui/cfg/*.rs");
-    t.compile_fail("tests/ui/not_unpin/*.rs");
-    t.compile_fail("tests/ui/pin_project/*.rs");
-    t.compile_fail("tests/ui/pinned_drop/*.rs");
-    t.compile_fail("tests/ui/unsafe_unpin/*.rs");
-    t.compile_fail("tests/ui/unstable-features/*.rs");
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/drop_order.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/drop_order.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/drop_order.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/drop_order.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-// Refs: https://doc.rust-lang.org/reference/destructors.html
-
-use pin_project::pin_project;
-use std::{cell::Cell, pin::Pin, thread};
-
-struct D<'a>(&'a Cell<usize>, usize);
-
-impl Drop for D<'_> {
-    fn drop(&mut self) {
-        if !thread::panicking() {
-            let old = self.0.replace(self.1);
-            assert_eq!(old, self.1 - 1);
-        }
-    }
-}
-
-#[pin_project(project_replace)]
-struct StructPinned<'a> {
-    #[pin]
-    f1: D<'a>,
-    #[pin]
-    f2: D<'a>,
-}
-
-#[pin_project(project_replace)]
-struct StructUnpinned<'a> {
-    f1: D<'a>,
-    f2: D<'a>,
-}
-
-#[pin_project(project_replace)]
-struct TuplePinned<'a>(#[pin] D<'a>, #[pin] D<'a>);
-
-#[pin_project(project_replace)]
-struct TupleUnpinned<'a>(D<'a>, D<'a>);
-
-#[pin_project(project_replace = EnumProj)]
-enum Enum<'a> {
-    #[allow(dead_code)] // false positive that fixed in Rust 1.38
-    StructPinned {
-        #[pin]
-        f1: D<'a>,
-        #[pin]
-        f2: D<'a>,
-    },
-    #[allow(dead_code)] // false positive that fixed in Rust 1.38
-    StructUnpinned {
-        f1: D<'a>,
-        f2: D<'a>,
-    },
-    TuplePinned(#[pin] D<'a>, #[pin] D<'a>),
-    TupleUnpinned(D<'a>, D<'a>),
-}
-
-#[test]
-fn struct_pinned() {
-    {
-        let c = Cell::new(0);
-        let _x = StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
-    }
-    {
-        let c = Cell::new(0);
-        let mut x = StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
-        let y = Pin::new(&mut x);
-        let _z = y.project_replace(StructPinned { f1: D(&c, 3), f2: D(&c, 4) });
-    }
-}
-
-#[test]
-fn struct_unpinned() {
-    {
-        let c = Cell::new(0);
-        let _x = StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
-    }
-    {
-        let c = Cell::new(0);
-        let mut x = StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
-        let y = Pin::new(&mut x);
-        let _z = y.project_replace(StructUnpinned { f1: D(&c, 3), f2: D(&c, 4) });
-    }
-}
-
-#[test]
-fn tuple_pinned() {
-    {
-        let c = Cell::new(0);
-        let _x = TuplePinned(D(&c, 1), D(&c, 2));
-    }
-    {
-        let c = Cell::new(0);
-        let mut x = TuplePinned(D(&c, 1), D(&c, 2));
-        let y = Pin::new(&mut x);
-        let _z = y.project_replace(TuplePinned(D(&c, 3), D(&c, 4)));
-    }
-}
-
-#[test]
-fn tuple_unpinned() {
-    {
-        let c = Cell::new(0);
-        let _x = TupleUnpinned(D(&c, 1), D(&c, 2));
-    }
-    {
-        let c = Cell::new(0);
-        let mut x = TupleUnpinned(D(&c, 1), D(&c, 2));
-        let y = Pin::new(&mut x);
-        let _z = y.project_replace(TupleUnpinned(D(&c, 3), D(&c, 4)));
-    }
-}
-
-#[test]
-fn enum_struct() {
-    {
-        let c = Cell::new(0);
-        let _x = Enum::StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
-    }
-    {
-        let c = Cell::new(0);
-        let mut x = Enum::StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
-        let y = Pin::new(&mut x);
-        let _z = y.project_replace(Enum::StructPinned { f1: D(&c, 3), f2: D(&c, 4) });
-    }
-
-    {
-        let c = Cell::new(0);
-        let _x = Enum::StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
-    }
-    {
-        let c = Cell::new(0);
-        let mut x = Enum::StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
-        let y = Pin::new(&mut x);
-        let _z = y.project_replace(Enum::StructUnpinned { f1: D(&c, 3), f2: D(&c, 4) });
-    }
-}
-
-#[test]
-fn enum_tuple() {
-    {
-        let c = Cell::new(0);
-        let _x = Enum::TuplePinned(D(&c, 1), D(&c, 2));
-    }
-    {
-        let c = Cell::new(0);
-        let mut x = Enum::TuplePinned(D(&c, 1), D(&c, 2));
-        let y = Pin::new(&mut x);
-        let _z = y.project_replace(Enum::TuplePinned(D(&c, 3), D(&c, 4)));
-    }
-
-    {
-        let c = Cell::new(0);
-        let _x = Enum::TupleUnpinned(D(&c, 1), D(&c, 2));
-    }
-    {
-        let c = Cell::new(0);
-        let mut x = Enum::TupleUnpinned(D(&c, 1), D(&c, 2));
-        let y = Pin::new(&mut x);
-        let _z = y.project_replace(Enum::TupleUnpinned(D(&c, 3), D(&c, 4)));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/include/basic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/include/basic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/include/basic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/include/basic.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-include!("basic-safe-part.rs");
-
-unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-    ::pin_project::UnsafeUnpin for UnsafeUnpinStruct<T, U>
-{
-}
-unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-    ::pin_project::UnsafeUnpin for UnsafeUnpinTupleStruct<T, U>
-{
-}
-unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-    ::pin_project::UnsafeUnpin for UnsafeUnpinEnum<T, U>
-{
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/include/basic-safe-part.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/include/basic-safe-part.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/include/basic-safe-part.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/include/basic-safe-part.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,193 +0,0 @@
-// default #[pin_project], PinnedDrop, project_replace, !Unpin, and UnsafeUnpin without UnsafeUnpin impl are completely safe.
-
-#[::pin_project::pin_project]
-#[derive(Debug)]
-pub struct DefaultStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project(
-    project = DefaultStructNamedProj,
-    project_ref = DefaultStructNamedProjRef,
-)]
-#[derive(Debug)]
-pub struct DefaultStructNamed<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project]
-#[derive(Debug)]
-pub struct DefaultTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(
-    project = DefaultTupleStructNamedProj,
-    project_ref = DefaultTupleStructNamedProjRef,
-)]
-#[derive(Debug)]
-pub struct DefaultTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(
-    project = DefaultEnumProj,
-    project_ref = DefaultEnumProjRef,
-)]
-#[derive(Debug)]
-pub enum DefaultEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
-
-#[::pin_project::pin_project(PinnedDrop)]
-#[derive(Debug)]
-pub struct PinnedDropStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pinned_drop]
-impl<T, U> PinnedDrop for PinnedDropStruct<T, U> {
-    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-}
-
-#[::pin_project::pin_project(PinnedDrop)]
-#[derive(Debug)]
-pub struct PinnedDropTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pinned_drop]
-impl<T, U> PinnedDrop for PinnedDropTupleStruct<T, U> {
-    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-}
-
-#[::pin_project::pin_project(
-    PinnedDrop,
-    project = PinnedDropEnumProj,
-    project_ref = PinnedDropEnumProjRef,
-)]
-#[derive(Debug)]
-pub enum PinnedDropEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
-
-#[::pin_project::pinned_drop]
-impl<T, U> PinnedDrop for PinnedDropEnum<T, U> {
-    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-}
-
-#[::pin_project::pin_project(project_replace)]
-#[derive(Debug)]
-pub struct ReplaceStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project(
-    project = ReplaceStructNamedProj,
-    project_ref = ReplaceStructNamedProjRef,
-    project_replace = ReplaceStructNamedProjOwn,
-)]
-#[derive(Debug)]
-pub struct ReplaceStructNamed<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project(project_replace)]
-#[derive(Debug)]
-pub struct ReplaceTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(
-    project = ReplaceTupleStructNamedProj,
-    project_ref = ReplaceTupleStructNamedProjRef,
-    project_replace = ReplaceTupleStructNamedProjOwn,
-)]
-#[derive(Debug)]
-pub struct ReplaceTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(
-    project = ReplaceEnumProj,
-    project_ref = ReplaceEnumProjRef,
-    project_replace = ReplaceEnumProjOwn,
-)]
-#[derive(Debug)]
-pub enum ReplaceEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
-
-#[::pin_project::pin_project(UnsafeUnpin)]
-#[derive(Debug)]
-pub struct UnsafeUnpinStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project(UnsafeUnpin)]
-#[derive(Debug)]
-pub struct UnsafeUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(
-    UnsafeUnpin,
-    project = UnsafeUnpinEnumProj,
-    project_ref = UnsafeUnpinEnumProjRef,
-)]
-#[derive(Debug)]
-pub enum UnsafeUnpinEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
-
-#[::pin_project::pin_project(!Unpin)]
-#[derive(Debug)]
-pub struct NotUnpinStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project(!Unpin)]
-#[derive(Debug)]
-pub struct NotUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(
-    !Unpin,
-    project = NotUnpinEnumProj,
-    project_ref = NotUnpinEnumProjRef,
-)]
-#[derive(Debug)]
-pub enum NotUnpinEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/lint.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/lint.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/lint.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/lint.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1064 +0,0 @@
-#![warn(nonstandard_style, rust_2018_idioms, rustdoc, unused)]
-// Note: This does not guarantee compatibility with forbidding these lints in the future.
-// If rustc adds a new lint, we may not be able to keep this.
-#![forbid(future_incompatible, rust_2018_compatibility)]
-#![allow(unknown_lints)] // for old compilers
-#![warn(
-    box_pointers,
-    deprecated_in_future,
-    elided_lifetimes_in_paths,
-    explicit_outlives_requirements,
-    macro_use_extern_crate,
-    meta_variable_misuse,
-    missing_copy_implementations,
-    missing_crate_level_docs,
-    missing_debug_implementations,
-    missing_docs,
-    non_ascii_idents,
-    single_use_lifetimes,
-    trivial_casts,
-    trivial_numeric_casts,
-    unaligned_references,
-    unreachable_pub,
-    unused_extern_crates,
-    unused_import_braces,
-    unused_lifetimes,
-    unused_qualifications,
-    unused_results,
-    variant_size_differences
-)]
-// absolute_paths_not_starting_with_crate, anonymous_parameters, keyword_idents, pointer_structural_match: forbidden as a part of future_incompatible
-// missing_doc_code_examples, private_doc_tests, invalid_html_tags: warned as a part of rustdoc
-// unsafe_block_in_unsafe_fn: unstable
-// unsafe_code: checked in forbid_unsafe module
-// unstable_features: deprecated: https://doc.rust-lang.org/beta/rustc/lints/listing/allowed-by-default.html#unstable-features
-// unused_crate_dependencies: unrelated
-#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-#![warn(clippy::restriction)]
-#![allow(clippy::blanket_clippy_restriction_lints)] // this is a test, so enable all restriction lints intentionally.
-
-// Check interoperability with rustc and clippy lints.
-
-pub mod basic {
-    include!("include/basic.rs");
-
-    pub mod inside_macro {
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[::pin_project::pin_project]
-                #[derive(Debug)]
-                pub struct DefaultStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(
-                    project = DefaultStructNamedProj,
-                    project_ref = DefaultStructNamedProjRef,
-                )]
-                #[derive(Debug)]
-                pub struct DefaultStructNamed<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project]
-                #[derive(Debug)]
-                pub struct DefaultTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = DefaultTupleStructNamedProj,
-                    project_ref = DefaultTupleStructNamedProjRef,
-                )]
-                #[derive(Debug)]
-                pub struct DefaultTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = DefaultEnumProj,
-                    project_ref = DefaultEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum DefaultEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(PinnedDrop)]
-                #[derive(Debug)]
-                pub struct PinnedDropStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropStruct<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(PinnedDrop)]
-                #[derive(Debug)]
-                pub struct PinnedDropTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropTupleStruct<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(
-                    PinnedDrop,
-                    project = PinnedDropEnumProj,
-                    project_ref = PinnedDropEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum PinnedDropEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropEnum<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct ReplaceStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(
-                    project = ReplaceStructNamedProj,
-                    project_ref = ReplaceStructNamedProjRef,
-                    project_replace = ReplaceStructNamedProjOwn,
-                )]
-                #[derive(Debug)]
-                pub struct ReplaceStructNamed<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct ReplaceTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = ReplaceTupleStructNamedProj,
-                    project_ref = ReplaceTupleStructNamedProjRef,
-                    project_replace = ReplaceTupleStructNamedProjOwn,
-                )]
-                #[derive(Debug)]
-                pub struct ReplaceTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = ReplaceEnumProj,
-                    project_ref = ReplaceEnumProjRef,
-                    project_replace = ReplaceEnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum ReplaceEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(UnsafeUnpin)]
-                #[derive(Debug)]
-                pub struct UnsafeUnpinStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(UnsafeUnpin)]
-                #[derive(Debug)]
-                pub struct UnsafeUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    UnsafeUnpin,
-                    project = UnsafeUnpinEnumProj,
-                    project_ref = UnsafeUnpinEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum UnsafeUnpinEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(!Unpin)]
-                #[derive(Debug)]
-                pub struct NotUnpinStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(!Unpin)]
-                #[derive(Debug)]
-                pub struct NotUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    !Unpin,
-                    project = NotUnpinEnumProj,
-                    project_ref = NotUnpinEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum NotUnpinEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-                    ::pin_project::UnsafeUnpin for UnsafeUnpinStruct<T, U>
-                {
-                }
-                unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-                    ::pin_project::UnsafeUnpin for UnsafeUnpinTupleStruct<T, U>
-                {
-                }
-                unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-                    ::pin_project::UnsafeUnpin for UnsafeUnpinEnum<T, U>
-                {
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod forbid_unsafe {
-    #![forbid(unsafe_code)]
-
-    include!("include/basic-safe-part.rs");
-
-    pub mod inside_macro {
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[::pin_project::pin_project]
-                #[derive(Debug)]
-                pub struct DefaultStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(
-                    project = DefaultStructNamedProj,
-                    project_ref = DefaultStructNamedProjRef,
-                )]
-                #[derive(Debug)]
-                pub struct DefaultStructNamed<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project]
-                #[derive(Debug)]
-                pub struct DefaultTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = DefaultTupleStructNamedProj,
-                    project_ref = DefaultTupleStructNamedProjRef,
-                )]
-                #[derive(Debug)]
-                pub struct DefaultTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = DefaultEnumProj,
-                    project_ref = DefaultEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum DefaultEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(PinnedDrop)]
-                #[derive(Debug)]
-                pub struct PinnedDropStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropStruct<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(PinnedDrop)]
-                #[derive(Debug)]
-                pub struct PinnedDropTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropTupleStruct<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(
-                    PinnedDrop,
-                    project = PinnedDropEnumProj,
-                    project_ref = PinnedDropEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum PinnedDropEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pinned_drop]
-                impl<T, U> PinnedDrop for PinnedDropEnum<T, U> {
-                    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-
-                #[::pin_project::pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct ReplaceStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(
-                    project = ReplaceStructNamedProj,
-                    project_ref = ReplaceStructNamedProjRef,
-                    project_replace = ReplaceStructNamedProjOwn,
-                )]
-                #[derive(Debug)]
-                pub struct ReplaceStructNamed<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct ReplaceTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = ReplaceTupleStructNamedProj,
-                    project_ref = ReplaceTupleStructNamedProjRef,
-                    project_replace = ReplaceTupleStructNamedProjOwn,
-                )]
-                #[derive(Debug)]
-                pub struct ReplaceTupleStructNamed<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    project = ReplaceEnumProj,
-                    project_ref = ReplaceEnumProjRef,
-                    project_replace = ReplaceEnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum ReplaceEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(UnsafeUnpin)]
-                #[derive(Debug)]
-                pub struct UnsafeUnpinStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(UnsafeUnpin)]
-                #[derive(Debug)]
-                pub struct UnsafeUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    UnsafeUnpin,
-                    project = UnsafeUnpinEnumProj,
-                    project_ref = UnsafeUnpinEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum UnsafeUnpinEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-
-                #[::pin_project::pin_project(!Unpin)]
-                #[derive(Debug)]
-                pub struct NotUnpinStruct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[::pin_project::pin_project(!Unpin)]
-                #[derive(Debug)]
-                pub struct NotUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[::pin_project::pin_project(
-                    !Unpin,
-                    project = NotUnpinEnumProj,
-                    project_ref = NotUnpinEnumProjRef,
-                )]
-                #[derive(Debug)]
-                pub enum NotUnpinEnum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod box_pointers {
-    use pin_project::pin_project;
-
-    #[allow(box_pointers)] // for the type itself
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct {
-        #[pin]
-        pub p: Box<isize>,
-        pub u: Box<isize>,
-    }
-
-    #[allow(box_pointers)] // for the type itself
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TupleStruct(#[pin] pub Box<isize>, pub Box<isize>);
-
-    #[allow(box_pointers)] // for the type itself
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum {
-        Struct {
-            #[pin]
-            p: Box<isize>,
-            u: Box<isize>,
-        },
-        Tuple(#[pin] Box<isize>, Box<isize>),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(box_pointers)] // for the type itself
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct {
-                    #[pin]
-                    pub p: Box<isize>,
-                    pub u: Box<isize>,
-                }
-
-                #[allow(box_pointers)] // for the type itself
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct TupleStruct(#[pin] pub Box<isize>, pub Box<isize>);
-
-                #[allow(box_pointers)] // for the type itself
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum {
-                    Struct {
-                        #[pin]
-                        p: Box<isize>,
-                        u: Box<isize>,
-                    },
-                    Tuple(#[pin] Box<isize>, Box<isize>),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod explicit_outlives_requirements {
-    use pin_project::pin_project;
-
-    #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct<'a, T, U>
-    where
-        T: ?Sized,
-        U: ?Sized,
-    {
-        #[pin]
-        pub pinned: &'a mut T,
-        pub unpinned: &'a mut U,
-    }
-
-    #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TupleStruct<'a, T, U>(#[pin] pub &'a mut T, pub &'a mut U)
-    where
-        T: ?Sized,
-        U: ?Sized;
-
-    #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum<'a, T, U>
-    where
-        T: ?Sized,
-        U: ?Sized,
-    {
-        Struct {
-            #[pin]
-            pinned: &'a mut T,
-            unpinned: &'a mut U,
-        },
-        Tuple(#[pin] &'a mut T, &'a mut U),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct<'a, T, U>
-                where
-                    T: ?Sized,
-                    U: ?Sized,
-                {
-                    #[pin]
-                    pub pinned: &'a mut T,
-                    pub unpinned: &'a mut U,
-                }
-
-                #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct TupleStruct<'a, T, U>(#[pin] pub &'a mut T, pub &'a mut U)
-                where
-                    T: ?Sized,
-                    U: ?Sized;
-
-                #[allow(explicit_outlives_requirements)] // for the type itself: https://github.com/rust-lang/rust/issues/60993
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum<'a, T, U>
-                where
-                    T: ?Sized,
-                    U: ?Sized,
-                {
-                    Struct {
-                        #[pin]
-                        pinned: &'a mut T,
-                        unpinned: &'a mut U,
-                    },
-                    Tuple(#[pin] &'a mut T, &'a mut U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod single_use_lifetimes {
-    use pin_project::pin_project;
-
-    #[allow(unused_lifetimes)]
-    pub trait Trait<'a> {}
-
-    #[allow(unused_lifetimes)] // for the type itself
-    #[allow(single_use_lifetimes)] // for the type itself: https://github.com/rust-lang/rust/issues/55058
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct HRTB<'pin___, T>
-    where
-        for<'pin> &'pin T: Unpin,
-        T: for<'pin> Trait<'pin>,
-        for<'pin, 'pin_, 'pin__> &'pin &'pin_ &'pin__ T: Unpin,
-    {
-        #[pin]
-        f: &'pin___ mut T,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(unused_lifetimes)]
-                pub trait Trait<'a> {}
-
-                #[allow(unused_lifetimes)] // for the type itself
-                #[allow(single_use_lifetimes)] // for the type itself: https://github.com/rust-lang/rust/issues/55058
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct HRTB<'pin___, T>
-                where
-                    for<'pin> &'pin T: Unpin,
-                    T: for<'pin> Trait<'pin>,
-                    for<'pin, 'pin_, 'pin__> &'pin &'pin_ &'pin__ T: Unpin,
-                {
-                    #[pin]
-                    f: &'pin___ mut T,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod variant_size_differences {
-    use pin_project::pin_project;
-
-    #[allow(missing_debug_implementations, missing_copy_implementations)] // https://github.com/rust-lang/rust/pull/74060
-    #[allow(variant_size_differences)] // for the type itself
-    #[allow(clippy::large_enum_variant)] // for the type itself
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    pub enum Enum {
-        V1(u8),
-        V2([u8; 1024]),
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[allow(missing_debug_implementations, missing_copy_implementations)] // https://github.com/rust-lang/rust/pull/74060
-                #[allow(variant_size_differences)] // for the type itself
-                #[allow(clippy::large_enum_variant)] // for the type itself
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                pub enum Enum {
-                    V1(u8),
-                    V2([u8; 1024]),
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod clippy_mut_mut {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct<'a, T, U> {
-        #[pin]
-        pub pinned: &'a mut T,
-        pub unpinned: &'a mut U,
-    }
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TupleStruct<'a, T, U>(#[pin] &'a mut T, &'a mut U);
-
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum<'a, T, U> {
-        Struct {
-            #[pin]
-            pinned: &'a mut T,
-            unpinned: &'a mut U,
-        },
-        Tuple(#[pin] &'a mut T, &'a mut U),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct<'a, T, U> {
-                    #[pin]
-                    pub pinned: &'a mut T,
-                    pub unpinned: &'a mut U,
-                }
-
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct TupleStruct<'a, T, U>(#[pin] &'a mut T, &'a mut U);
-
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum<'a, T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: &'a mut T,
-                        unpinned: &'a mut U,
-                    },
-                    Tuple(#[pin] &'a mut T, &'a mut U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-#[allow(unreachable_pub)]
-mod clippy_redundant_pub_crate {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct<T, U> {
-        #[pin]
-        pub pinned: T,
-        pub unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TupleStruct<T, U>(#[pin] pub T, pub U);
-
-    #[allow(dead_code)]
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum<T, U> {
-        Struct {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        },
-        Tuple(#[pin] T, U),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct<T, U> {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct TupleStruct<T, U>(#[pin] pub T, pub U);
-
-                #[allow(dead_code)]
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum<T, U> {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod clippy_type_repetition_in_bounds {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct<T, U>
-    where
-        Self: Sized,
-    {
-        #[pin]
-        pub pinned: T,
-        pub unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TupleStruct<T, U>(#[pin] T, U)
-    where
-        Self: Sized;
-
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum<T, U>
-    where
-        Self: Sized,
-    {
-        Struct {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        },
-        Tuple(#[pin] T, U),
-        Unit,
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct<T, U>
-                where
-                    Self: Sized,
-                {
-                    #[pin]
-                    pub pinned: T,
-                    pub unpinned: U,
-                }
-
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct TupleStruct<T, U>(#[pin] T, U)
-                where
-                    Self: Sized;
-
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum<T, U>
-                where
-                    Self: Sized,
-                {
-                    Struct {
-                        #[pin]
-                        pinned: T,
-                        unpinned: U,
-                    },
-                    Tuple(#[pin] T, U),
-                    Unit,
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-pub mod clippy_used_underscore_binding {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct Struct<T, U> {
-        #[pin]
-        pub _pinned: T,
-        pub _unpinned: U,
-    }
-
-    #[pin_project(
-        project = EnumProj,
-        project_ref = EnumProjRef,
-        project_replace = EnumProjOwn,
-    )]
-    #[derive(Debug)]
-    pub enum Enum<T, U> {
-        Struct {
-            #[pin]
-            _pinned: T,
-            _unpinned: U,
-        },
-    }
-
-    pub mod inside_macro {
-        use pin_project::pin_project;
-
-        #[rustfmt::skip]
-        macro_rules! mac {
-            () => {
-                #[pin_project(project_replace)]
-                #[derive(Debug)]
-                pub struct Struct<T, U> {
-                    #[pin]
-                    pub _pinned: T,
-                    pub _unpinned: U,
-                }
-
-                #[pin_project(
-                    project = EnumProj,
-                    project_ref = EnumProjRef,
-                    project_replace = EnumProjOwn,
-                )]
-                #[derive(Debug)]
-                pub enum Enum<T, U> {
-                    Struct {
-                        #[pin]
-                        _pinned: T,
-                        _unpinned: U,
-                    },
-                }
-            };
-        }
-
-        mac!();
-    }
-}
-
-// Run `./dev.sh +$toolchain test --test lint` to update this.
-#[cfg(not(miri))]
-#[allow(box_pointers)]
-#[allow(clippy::restriction)]
-#[rustversion::attr(before(2020-11-08), ignore)] // Note: This date is commit-date and the day before the toolchain date.
-#[test]
-fn check_lint_list() {
-    use std::{env, fs, path::Path, process::Command, str};
-
-    type Result<T, E = Box<dyn std::error::Error>> = std::result::Result<T, E>;
-
-    fn assert_eq(expected_path: &str, actual: &str) -> Result<()> {
-        let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
-        let expected_path = &manifest_dir.join(expected_path);
-        let expected = fs::read_to_string(expected_path)?;
-        if expected != actual {
-            if env::var_os("CI").is_some() {
-                let actual_path =
-                    &manifest_dir.join("target").join(expected_path.file_name().unwrap());
-                fs::write(actual_path, actual)?;
-                let status = Command::new("git")
-                    .args(&["--no-pager", "diff", "--no-index", "--"])
-                    .args(&[expected_path, actual_path])
-                    .status()?;
-                assert!(!status.success());
-                panic!("assertion failed");
-            } else {
-                fs::write(expected_path, actual)?;
-            }
-        }
-        Ok(())
-    }
-
-    (|| -> Result<()> {
-        let rustc = env::var_os("RUSTC").unwrap_or_else(|| "rustc".into());
-        let output = Command::new(rustc).args(&["-W", "help"]).output()?;
-        let new = str::from_utf8(&output.stdout)?;
-        assert_eq("tests/lint.txt", new)
-    })()
-    .unwrap_or_else(|e| panic!("{}", e));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/lint.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/lint.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/lint.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/lint.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-
-Available lint options:
-    -W <foo>           Warn about <foo>
-    -A <foo>           Allow <foo>
-    -D <foo>           Deny <foo>
-    -F <foo>           Forbid <foo> (deny <foo> and all attempts to override)
-
-
-Lint checks provided by rustc:
-
-                                                       name  default  meaning
-                                                       ----  -------  -------
-                     absolute-paths-not-starting-with-crate  allow    fully qualified paths that start with a module name instead of `crate`, `self`, or an extern crate name
-                                       anonymous-parameters  allow    detects anonymous parameters
-                                               box-pointers  allow    use of owned (Box type) heap memory
-                                       deprecated-in-future  allow    detects use of items that will be deprecated in a future version
-                                  elided-lifetimes-in-paths  allow    hidden lifetime parameters in types are deprecated
-                             explicit-outlives-requirements  allow    outlives requirements can be inferred
-                                          invalid-html-tags  allow    detects invalid HTML tags in doc comments
-                                             keyword-idents  allow    detects edition keywords being used as an identifier
-                                     macro-use-extern-crate  allow    the `#[macro_use]` attribute is now deprecated in favor of using macros via the module system
-                                       meta-variable-misuse  allow    possible meta-variable misuse at macro definition
-                               missing-copy-implementations  allow    detects potentially-forgotten implementations of `Copy`
-                                   missing-crate-level-docs  allow    detects crates with no crate-level documentation
-                              missing-debug-implementations  allow    detects missing implementations of Debug
-                                               missing-docs  allow    detects missing documentation for public members
-                                  missing-doc-code-examples  allow    detects publicly-exported items without code samples in their documentation
-                                           non-ascii-idents  allow    detects non-ASCII identifiers
-                                   pointer-structural-match  allow    pointers are not structural-match
-                                          private-doc-tests  allow    detects code samples in docs of private items not documented by rustdoc
-                                       single-use-lifetimes  allow    detects lifetime parameters that are only used once
-                                              trivial-casts  allow    detects trivial casts which could be removed
-                                      trivial-numeric-casts  allow    detects trivial casts of numeric types which could be removed
-                                       unaligned-references  allow    detects unaligned references to fields of packed structs
-                                            unreachable-pub  allow    `pub` items not reachable from crate root
-                                                unsafe-code  allow    usage of `unsafe` code
-                                     unsafe-op-in-unsafe-fn  allow    unsafe operations in unsafe functions without an explicit unsafe block are deprecated
-                                          unstable-features  allow    enabling unstable features (deprecated. do not use)
-                                  unused-crate-dependencies  allow    crate dependencies that are never used
-                                       unused-extern-crates  allow    extern crates that are never used
-                                       unused-import-braces  allow    unnecessary braces around an imported item
-                                           unused-lifetimes  allow    detects lifetime parameters that are never used
-                                      unused-qualifications  allow    detects unnecessarily qualified names
-                                             unused-results  allow    unused result of an expression in a statement
-                                   variant-size-differences  allow    detects enums with widely varying variant sizes
-                                            array-into-iter  warn     detects calling `into_iter` on arrays
-                                           asm-sub-register  warn     using only a subset of a register for inline asm inputs
-                                         bare-trait-objects  warn     suggest using `dyn Trait` for trait objects
-                                 bindings-with-variant-name  warn     detects pattern bindings with the same name as one of the matched variants
-                                     broken-intra-doc-links  warn     failures in resolving intra-doc link targets
-                                       cenum-impl-drop-cast  warn     a C-like enum implementing Drop is cast
-                               clashing-extern-declarations  warn     detects when an extern fn has been declared with the same name but different types
-                                       coherence-leak-check  warn     distinct impls distinguished only by the leak-check code
-                                          confusable-idents  warn     detects visually confusable pairs between identifiers
-                                const-evaluatable-unchecked  warn     detects a generic constant is used in a type without a emitting a warning
-                                        const-item-mutation  warn     detects attempts to mutate a `const` item
-                                                  dead-code  warn     detect unused, unexported items
-                                                 deprecated  warn     detects use of deprecated items
-                                                drop-bounds  warn     bounds of the form `T: Drop` are useless
-                          ellipsis-inclusive-range-patterns  warn     `...` range patterns are deprecated
-                              exported-private-dependencies  warn     public interface leaks type from a private dependency
-                                   function-item-references  warn     suggest casting to a function pointer when attempting to take references to function items
-                     illegal-floating-point-literal-pattern  warn     floating-point literals cannot be used in patterns
-                                            improper-ctypes  warn     proper use of libc types in foreign modules
-                                improper-ctypes-definitions  warn     proper use of libc types in foreign item definitions
-                                        incomplete-features  warn     incomplete features that may function improperly in some or all cases
-                                  indirect-structural-match  warn     constant used in pattern contains value of non-structural-match type in a field or a variant
-                                         inline-no-sanitize  warn     detects incompatible use of `#[inline(always)]` and `#[no_sanitize(...)]`
-                               invalid-codeblock-attributes  warn     codeblock attribute looks a lot like a known one
-                                              invalid-value  warn     an invalid value is being created (such as a NULL reference)
-                                   irrefutable-let-patterns  warn     detects irrefutable patterns in if-let and while-let statements
-                              late-bound-lifetime-arguments  warn     detects generic lifetime arguments in path segments with late bound lifetime parameters
-                                   mixed-script-confusables  warn     detects Unicode scripts whose mixed script confusables codepoints are solely used
-                        mutable-borrow-reservation-conflict  warn     reservation of a two-phased borrow conflicts with other shared borrows
-                                nontrivial-structural-match  warn     constant used in pattern of non-structural-match type and the constant's initializer expression contains values of non-structural-match types
-                                              non-autolinks  warn     detects URLs that could be written using only angle brackets
-                                       non-camel-case-types  warn     types, variants, traits and type parameters should have camel case names
-                               non-shorthand-field-patterns  warn     using `Struct { x: x }` instead of `Struct { x }` in a pattern
-                                             non-snake-case  warn     variables, methods, functions, lifetime parameters and modules should have snake case names
-                                     non-upper-case-globals  warn     static constants should have uppercase identifiers
-                                    no-mangle-generic-items  warn     generic items must be mangled
-                                       overlapping-patterns  warn     detects overlapping patterns
-                                            path-statements  warn     path statements with no effect
-                                    private-intra-doc-links  warn     linking from a public item to a private one
-                                          private-in-public  warn     detect private items in public interfaces not caught by the old implementation
-                      proc-macro-derive-resolution-fallback  warn     detects proc macro derives using inaccessible names from parent modules
-                                       redundant-semicolons  warn     detects unnecessary trailing semicolons
-                                  renamed-and-removed-lints  warn     lints that have been renamed or removed
-                                        safe-packed-borrows  warn     safe borrows of fields of packed structs were erroneously allowed
-                                            stable-features  warn     stable features found in `#[feature]` directive
-                                   temporary-cstring-as-ptr  warn     detects getting the inner pointer of a temporary `CString`
-                                             trivial-bounds  warn     these bounds don't depend on an type parameters
-                                          type-alias-bounds  warn     bounds in type aliases are not enforced
-                                   tyvar-behind-raw-pointer  warn     raw pointer to an inference variable
-                                        uncommon-codepoints  warn     detects uncommon Unicode codepoints in identifiers
-                                    unconditional-recursion  warn     functions that cannot return without calling themselves
-                                         uninhabited-static  warn     uninhabited static
-                                              unknown-lints  warn     unrecognized lint attribute
-                                      unnameable-test-items  warn     detects an item that cannot be named being marked as `#[test_case]`
-                                           unreachable-code  warn     detects unreachable code paths
-                                       unreachable-patterns  warn     detects unreachable patterns
-                                   unstable-name-collisions  warn     detects name collision with an existing but unstable method
-                                          unused-allocation  warn     detects unnecessary allocations that can be eliminated
-                                         unused-assignments  warn     detect assignments that will never be read
-                                          unused-attributes  warn     detects attributes that were not used by the compiler
-                                              unused-braces  warn     unnecessary braces around an expression
-                                         unused-comparisons  warn     comparisons made useless by limits of the types involved
-                                        unused-doc-comments  warn     detects doc comments that aren't used by rustdoc
-                                            unused-features  warn     unused features found in crate-level `#[feature]` directives
-                                             unused-imports  warn     imports that are never used
-                                              unused-labels  warn     detects labels that are never used
-                                              unused-macros  warn     detects macros that were not used
-                                            unused-must-use  warn     unused result of a type flagged as `#[must_use]`
-                                                 unused-mut  warn     detect mut variables which don't need to be mutable
-                                              unused-parens  warn     `if`, `match`, `while` and `return` do not need parentheses
-                                              unused-unsafe  warn     unnecessary use of an `unsafe` block
-                                           unused-variables  warn     detect variables which are not used in any way
-                                                   warnings  warn     mass-change the level for lints which produce warnings
-                                where-clauses-object-safety  warn     checks the object safety of where clauses
-                                                 while-true  warn     suggest using `loop { }` instead of `while true { }`
-                                 ambiguous-associated-items  deny     ambiguous associated items
-                                        arithmetic-overflow  deny     arithmetic operation overflows
-                                     conflicting-repr-hints  deny     conflicts between `#[repr(..)]` hints that were previously accepted and used in practice
-                                                  const-err  deny     constant evaluation detected erroneous expression
-                                 ill-formed-attribute-input  deny     ill-formed attribute inputs that were previously accepted and used in practice
-                                         incomplete-include  deny     trailing content in included file
-                                 invalid-type-param-default  deny     type parameter default erroneously allowed in invalid location
-    macro-expanded-macro-exports-accessed-by-absolute-paths  deny     macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths
-                                         mutable-transmutes  deny     mutating transmuted &mut T from &T may cause undefined behavior
-                                      no-mangle-const-items  deny     const items will not have their symbols exported
-                              order-dependent-trait-objects  deny     trait-object types were treated as different depending on marker-trait order
-                                       overflowing-literals  deny     literal out of range for its type
-                               patterns-in-fns-without-body  deny     patterns in functions without body were erroneously allowed
-                            pub-use-of-private-extern-crate  deny     detect public re-exports of private extern crates
-                                              soft-unstable  deny     a feature gate that doesn't break dependent crates
-                                        unconditional-panic  deny     operation will cause a panic at runtime
-                                        unknown-crate-types  deny     unknown crate type found in `#[crate_type]` directive
-                                         useless-deprecated  deny     detects deprecation attributes with no effect
-
-
-Lint groups provided by rustc:
-
-                       name  sub-lints
-                       ----  ---------
-                   warnings  all lints that are set to issue warnings
-        future-incompatible  keyword-idents, anonymous-parameters, illegal-floating-point-literal-pattern, private-in-public, pub-use-of-private-extern-crate, invalid-type-param-default, safe-packed-borrows, patterns-in-fns-without-body, late-bound-lifetime-arguments, order-dependent-trait-objects, coherence-leak-check, tyvar-behind-raw-pointer, absolute-paths-not-starting-with-crate, unstable-name-collisions, where-clauses-object-safety, proc-macro-derive-resolution-fallback, macro-expanded-macro-exports-accessed-by-absolute-paths, ill-formed-attribute-input, conflicting-repr-hints, ambiguous-associated-items, mutable-borrow-reservation-conflict, indirect-structural-match, pointer-structural-match, nontrivial-structural-match, soft-unstable, cenum-impl-drop-cast, const-evaluatable-unchecked, uninhabited-static, array-into-iter
-          nonstandard-style  non-camel-case-types, non-snake-case, non-upper-case-globals
-    rust-2018-compatibility  keyword-idents, anonymous-parameters, tyvar-behind-raw-pointer, absolute-paths-not-starting-with-crate
-           rust-2018-idioms  bare-trait-objects, unused-extern-crates, ellipsis-inclusive-range-patterns, elided-lifetimes-in-paths, explicit-outlives-requirements
-                    rustdoc  non-autolinks, broken-intra-doc-links, private-intra-doc-links, invalid-codeblock-attributes, missing-doc-code-examples, private-doc-tests, invalid-html-tags
-                     unused  unused-imports, unused-variables, unused-assignments, dead-code, unused-mut, unreachable-code, unreachable-patterns, overlapping-patterns, unused-must-use, unused-unsafe, path-statements, unused-attributes, unused-macros, unused-allocation, unused-doc-comments, unused-extern-crates, unused-features, unused-labels, unused-parens, unused-braces, redundant-semicolons
-
-
-Compiler plugins can provide additional lints and lint groups. To see a listing of these, re-run `rustc -W help` with a crate filename.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/pinned_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/pinned_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/pinned_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/pinned_drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,263 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[test]
-fn safe_project() {
-    #[pin_project(PinnedDrop)]
-    pub struct Struct<'a> {
-        was_dropped: &'a mut bool,
-        #[pin]
-        field: u8,
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct<'_> {
-        fn drop(self: Pin<&mut Self>) {
-            **self.project().was_dropped = true;
-        }
-    }
-
-    let mut was_dropped = false;
-    drop(Struct { was_dropped: &mut was_dropped, field: 42 });
-    assert!(was_dropped);
-}
-
-#[test]
-fn self_call() {
-    #[pin_project(PinnedDrop)]
-    pub struct S<T>(T);
-
-    trait Trait {
-        fn self_ref(&self) {}
-        fn self_pin_ref(self: Pin<&Self>) {}
-        fn self_mut(&mut self) {}
-        fn self_pin_mut(self: Pin<&mut Self>) {}
-        fn assoc_fn(_this: Pin<&mut Self>) {}
-    }
-
-    impl<T> Trait for S<T> {}
-
-    #[pinned_drop]
-    impl<T> PinnedDrop for S<T> {
-        fn drop(mut self: Pin<&mut Self>) {
-            self.self_ref();
-            self.as_ref().self_pin_ref();
-            self.self_mut();
-            self.as_mut().self_pin_mut();
-            Self::assoc_fn(self.as_mut());
-            <Self>::assoc_fn(self.as_mut());
-        }
-    }
-}
-
-#[test]
-fn self_ty() {
-    #[pin_project(PinnedDrop)]
-    pub struct Struct {
-        pub f: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct {
-        #[allow(irrefutable_let_patterns)]
-        #[allow(clippy::match_single_binding)]
-        fn drop(mut self: Pin<&mut Self>) {
-            // expr
-            let _: Self = Self { f: () };
-
-            // pat
-            match *self {
-                Self { f: _ } => {}
-            }
-            if let Self { f: _ } = *self {}
-            let Self { f: _ } = *self;
-        }
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub struct TupleStruct(());
-
-    #[pinned_drop]
-    impl PinnedDrop for TupleStruct {
-        #[allow(irrefutable_let_patterns)]
-        fn drop(mut self: Pin<&mut Self>) {
-            // expr
-            let _: Self = Self(());
-
-            // pat
-            match *self {
-                Self(_) => {}
-            }
-            if let Self(_) = *self {}
-            let Self(_) = *self;
-        }
-    }
-
-    #[pin_project(PinnedDrop, project = EnumProj, project_ref = EnumProjRef)]
-    pub enum Enum {
-        Struct { f: () },
-        Tuple(()),
-        Unit,
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Enum {
-        fn drop(mut self: Pin<&mut Self>) {
-            // expr
-            let _: Self = Self::Struct { f: () };
-            let _: Self = Self::Tuple(());
-            let _: Self = Self::Unit;
-
-            // pat
-            match *self {
-                Self::Struct { f: _ } => {}
-                Self::Tuple(_) => {}
-                Self::Unit => {}
-            }
-            if let Self::Struct { f: _ } = *self {}
-            if let Self::Tuple(_) = *self {}
-            if let Self::Unit = *self {}
-        }
-    }
-}
-
-#[test]
-fn self_inside_macro_containing_fn() {
-    macro_rules! mac {
-        ($($tt:tt)*) => {
-            $($tt)*
-        };
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub struct S(());
-
-    #[pinned_drop]
-    impl PinnedDrop for S {
-        fn drop(self: Pin<&mut Self>) {
-            let _ = mac!({
-                impl S {
-                    pub fn _f(self) -> Self {
-                        self
-                    }
-                }
-            });
-        }
-    }
-}
-
-// See also `ui/pinned_drop/self.rs`.
-#[rustversion::since(1.40)] // https://github.com/rust-lang/rust/pull/64690
-#[test]
-fn self_inside_macro_def() {
-    #[pin_project(PinnedDrop)]
-    pub struct S(());
-
-    #[pinned_drop]
-    impl PinnedDrop for S {
-        fn drop(self: Pin<&mut Self>) {
-            macro_rules! mac {
-                () => {{
-                    let _ = self;
-                    let _ = Self(());
-                }};
-            }
-            mac!();
-        }
-    }
-}
-
-#[test]
-fn self_arg_inside_macro_call() {
-    #[pin_project(PinnedDrop)]
-    struct Struct {
-        f: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct {
-        fn drop(self: Pin<&mut Self>) {
-            let _: Vec<_> = vec![self.f];
-        }
-    }
-}
-
-#[test]
-fn self_ty_inside_macro_call() {
-    macro_rules! mac {
-        ($($tt:tt)*) => {
-            $($tt)*
-        };
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub struct Struct<T: Send>
-    where
-        mac!(Self): Send,
-    {
-        _f: T,
-    }
-
-    impl<T: Send> Struct<T> {
-        const ASSOC1: usize = 1;
-        fn assoc1() {}
-    }
-
-    trait Trait {
-        type Assoc2;
-        const ASSOC2: usize;
-        fn assoc2();
-    }
-
-    impl<T: Send> Trait for Struct<T> {
-        type Assoc2 = ();
-        const ASSOC2: usize = 2;
-        fn assoc2() {}
-    }
-
-    #[pinned_drop]
-    impl<T: Send> PinnedDrop for Struct<T>
-    where
-        mac!(Self): Send,
-    {
-        #[allow(path_statements)]
-        #[allow(clippy::no_effect)]
-        fn drop(self: Pin<&mut Self>) {
-            // inherent items
-            mac!(Self::ASSOC1;);
-            mac!(<Self>::ASSOC1;);
-            mac!(Self::assoc1(););
-            mac!(<Self>::assoc1(););
-
-            // trait items
-            mac!(let _: <Self as Trait>::Assoc2;);
-            mac!(Self::ASSOC2;);
-            mac!(<Self>::ASSOC2;);
-            mac!(<Self as Trait>::ASSOC2;);
-            mac!(Self::assoc2(););
-            mac!(<Self>::assoc2(););
-            mac!(<Self as Trait>::assoc2(););
-        }
-    }
-}
-
-#[test]
-fn inside_macro() {
-    #[pin_project(PinnedDrop)]
-    struct S(());
-
-    macro_rules! mac {
-        ($expr:expr) => {
-            #[pinned_drop]
-            impl PinnedDrop for S {
-                fn drop(self: Pin<&mut Self>) {
-                    let _ = $expr;
-                }
-            }
-        };
-    }
-
-    mac!(1);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/pin_project.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/pin_project.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/pin_project.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/pin_project.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,885 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-#[macro_use]
-mod auxiliary;
-
-use pin_project::{pin_project, pinned_drop, UnsafeUnpin};
-use std::{
-    marker::{PhantomData, PhantomPinned},
-    panic,
-    pin::Pin,
-};
-
-#[test]
-fn projection() {
-    #[pin_project(
-        project = StructProj,
-        project_ref = StructProjRef,
-        project_replace = StructProjOwn,
-    )]
-    struct Struct<T, U> {
-        #[pin]
-        f1: T,
-        f2: U,
-    }
-
-    let mut s = Struct { f1: 1, f2: 2 };
-    let mut s_orig = Pin::new(&mut s);
-    let s = s_orig.as_mut().project();
-
-    let _: Pin<&mut i32> = s.f1;
-    assert_eq!(*s.f1, 1);
-    let _: &mut i32 = s.f2;
-    assert_eq!(*s.f2, 2);
-
-    assert_eq!(s_orig.as_ref().f1, 1);
-    assert_eq!(s_orig.as_ref().f2, 2);
-
-    let mut s = Struct { f1: 1, f2: 2 };
-    let mut s = Pin::new(&mut s);
-    {
-        let StructProj { f1, f2 } = s.as_mut().project();
-        let _: Pin<&mut i32> = f1;
-        let _: &mut i32 = f2;
-    }
-    {
-        let StructProjRef { f1, f2 } = s.as_ref().project_ref();
-        let _: Pin<&i32> = f1;
-        let _: &i32 = f2;
-    }
-    {
-        let StructProjOwn { f1, f2 } = s.as_mut().project_replace(Struct { f1: 3, f2: 4 });
-        let _: PhantomData<i32> = f1;
-        let _: i32 = f2;
-        assert_eq!(f2, 2);
-        assert_eq!(s.f1, 3);
-        assert_eq!(s.f2, 4);
-    }
-
-    #[pin_project(project_replace)]
-    struct TupleStruct<T, U>(#[pin] T, U);
-
-    let mut s = TupleStruct(1, 2);
-    let s = Pin::new(&mut s).project();
-
-    let _: Pin<&mut i32> = s.0;
-    assert_eq!(*s.0, 1);
-    let _: &mut i32 = s.1;
-    assert_eq!(*s.1, 2);
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]
-    #[derive(Eq, PartialEq, Debug)]
-    enum Enum<A, B, C, D> {
-        Tuple(#[pin] A, B),
-        Struct {
-            #[pin]
-            f1: C,
-            f2: D,
-        },
-        Unit,
-    }
-
-    let mut e = Enum::Tuple(1, 2);
-    let mut e = Pin::new(&mut e);
-
-    match e.as_mut().project() {
-        EnumProj::Tuple(x, y) => {
-            let x: Pin<&mut i32> = x;
-            assert_eq!(*x, 1);
-            let y: &mut i32 = y;
-            assert_eq!(*y, 2);
-        }
-        EnumProj::Struct { f1, f2 } => {
-            let _: Pin<&mut i32> = f1;
-            let _: &mut i32 = f2;
-            unreachable!()
-        }
-        EnumProj::Unit => unreachable!(),
-    }
-
-    assert_eq!(&*e, &Enum::Tuple(1, 2));
-
-    let mut e = Enum::Struct { f1: 3, f2: 4 };
-    let mut e = Pin::new(&mut e);
-
-    match e.as_mut().project() {
-        EnumProj::Tuple(x, y) => {
-            let _: Pin<&mut i32> = x;
-            let _: &mut i32 = y;
-            unreachable!()
-        }
-        EnumProj::Struct { f1, f2 } => {
-            let _: Pin<&mut i32> = f1;
-            assert_eq!(*f1, 3);
-            let _: &mut i32 = f2;
-            assert_eq!(*f2, 4);
-        }
-        EnumProj::Unit => unreachable!(),
-    }
-
-    if let EnumProj::Struct { f1, f2 } = e.as_mut().project() {
-        let _: Pin<&mut i32> = f1;
-        assert_eq!(*f1, 3);
-        let _: &mut i32 = f2;
-        assert_eq!(*f2, 4);
-    }
-}
-
-#[test]
-fn enum_project_set() {
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]
-    #[derive(Eq, PartialEq, Debug)]
-    enum Enum {
-        V1(#[pin] u8),
-        V2(bool),
-    }
-
-    let mut e = Enum::V1(25);
-    let mut e_orig = Pin::new(&mut e);
-    let e_proj = e_orig.as_mut().project();
-
-    match e_proj {
-        EnumProj::V1(val) => {
-            let new_e = Enum::V2(val.as_ref().get_ref() == &25);
-            e_orig.set(new_e);
-        }
-        EnumProj::V2(_) => unreachable!(),
-    }
-
-    assert_eq!(e, Enum::V2(true));
-}
-
-#[test]
-fn where_clause() {
-    #[pin_project]
-    struct Struct<T>
-    where
-        T: Copy,
-    {
-        f: T,
-    }
-
-    #[pin_project]
-    struct TupleStruct<T>(T)
-    where
-        T: Copy;
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]
-    enum Enum<T>
-    where
-        T: Copy,
-    {
-        V(T),
-    }
-}
-
-#[test]
-fn where_clause_and_associated_type_field() {
-    #[pin_project(project_replace)]
-    struct Struct1<I>
-    where
-        I: Iterator,
-    {
-        #[pin]
-        f1: I,
-        f2: I::Item,
-    }
-
-    #[pin_project(project_replace)]
-    struct Struct2<I, J>
-    where
-        I: Iterator<Item = J>,
-    {
-        #[pin]
-        f1: I,
-        f2: J,
-    }
-
-    #[pin_project(project_replace)]
-    struct Struct3<T>
-    where
-        T: 'static,
-    {
-        f: T,
-    }
-
-    trait Static: 'static {}
-
-    impl<T> Static for Struct3<T> {}
-
-    #[pin_project(project_replace)]
-    struct TupleStruct<I>(#[pin] I, I::Item)
-    where
-        I: Iterator;
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]
-    enum Enum<I>
-    where
-        I: Iterator,
-    {
-        V1(#[pin] I),
-        V2(I::Item),
-    }
-}
-
-#[test]
-fn derive_copy() {
-    #[pin_project(project_replace)]
-    #[derive(Clone, Copy)]
-    struct Struct<T> {
-        f: T,
-    }
-
-    fn is_copy<T: Copy>() {}
-
-    is_copy::<Struct<u8>>();
-}
-
-#[test]
-fn move_out() {
-    struct NotCopy;
-
-    #[pin_project(project_replace)]
-    struct Struct {
-        f: NotCopy,
-    }
-
-    let x = Struct { f: NotCopy };
-    let _val: NotCopy = x.f;
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]
-    enum Enum {
-        V(NotCopy),
-    }
-
-    let x = Enum::V(NotCopy);
-    #[allow(clippy::infallible_destructuring_match)]
-    let _val: NotCopy = match x {
-        Enum::V(val) => val,
-    };
-}
-
-#[test]
-fn trait_bounds_on_type_generics() {
-    #[pin_project(project_replace)]
-    pub struct Struct1<'a, T: ?Sized> {
-        f: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct2<'a, T: ::core::fmt::Debug> {
-        f: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct3<'a, T: core::fmt::Debug> {
-        f: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct4<'a, T: core::fmt::Debug + core::fmt::Display> {
-        f: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct5<'a, T: core::fmt::Debug + ?Sized> {
-        f: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct6<'a, T: core::fmt::Debug = [u8; 16]> {
-        f: &'a mut T,
-    }
-
-    let _: Struct6<'_> = Struct6 { f: &mut [0_u8; 16] };
-
-    #[pin_project(project_replace)]
-    pub struct Struct7<T: 'static> {
-        f: T,
-    }
-
-    trait Static: 'static {}
-
-    impl<T> Static for Struct7<T> {}
-
-    #[pin_project(project_replace)]
-    pub struct Struct8<'a, 'b: 'a> {
-        f1: &'a u8,
-        f2: &'b u8,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct TupleStruct<'a, T: ?Sized>(&'a mut T);
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]
-    enum Enum<'a, T: ?Sized> {
-        V(&'a mut T),
-    }
-}
-
-#[test]
-fn overlapping_lifetime_names() {
-    #[pin_project(project_replace)]
-    pub struct Struct1<'pin, T> {
-        #[pin]
-        f: &'pin mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct2<'pin, 'pin_, 'pin__> {
-        #[pin]
-        f: &'pin &'pin_ &'pin__ (),
-    }
-
-    pub trait Trait<'a> {}
-
-    #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-    #[pin_project(project_replace)]
-    pub struct HRTB<'pin___, T>
-    where
-        for<'pin> &'pin T: Unpin,
-        T: for<'pin> Trait<'pin>,
-        for<'pin, 'pin_, 'pin__> &'pin &'pin_ &'pin__ T: Unpin,
-    {
-        #[pin]
-        f: &'pin___ mut T,
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub struct PinnedDropStruct<'pin> {
-        #[pin]
-        f: &'pin (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for PinnedDropStruct<'_> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(UnsafeUnpin)]
-    pub struct UnsafeUnpinStruct<'pin> {
-        #[pin]
-        f: &'pin (),
-    }
-
-    unsafe impl UnsafeUnpin for UnsafeUnpinStruct<'_> {}
-
-    #[pin_project(!Unpin)]
-    pub struct NotUnpinStruct<'pin> {
-        #[pin]
-        f: &'pin (),
-    }
-}
-
-#[test]
-fn combine() {
-    #[pin_project(PinnedDrop, UnsafeUnpin)]
-    pub struct PinnedDropWithUnsafeUnpin<T> {
-        #[pin]
-        f: T,
-    }
-
-    #[pinned_drop]
-    impl<T> PinnedDrop for PinnedDropWithUnsafeUnpin<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    unsafe impl<T: Unpin> UnsafeUnpin for PinnedDropWithUnsafeUnpin<T> {}
-
-    #[pin_project(PinnedDrop, !Unpin)]
-    pub struct PinnedDropWithNotUnpin<T> {
-        #[pin]
-        f: T,
-    }
-
-    #[pinned_drop]
-    impl<T> PinnedDrop for PinnedDropWithNotUnpin<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(UnsafeUnpin, project_replace)]
-    pub struct UnsafeUnpinWithReplace<T> {
-        #[pin]
-        f: T,
-    }
-
-    unsafe impl<T: Unpin> UnsafeUnpin for UnsafeUnpinWithReplace<T> {}
-
-    #[pin_project(!Unpin, project_replace)]
-    pub struct NotUnpinWithReplace<T> {
-        #[pin]
-        f: T,
-    }
-}
-
-#[test]
-fn private_type_in_public_type() {
-    #[pin_project(project_replace)]
-    pub struct PublicStruct<T> {
-        #[pin]
-        inner: PrivateStruct<T>,
-    }
-
-    struct PrivateStruct<T>(T);
-}
-
-#[allow(clippy::needless_lifetimes)]
-#[test]
-fn lifetime_project() {
-    #[pin_project(project_replace)]
-    struct Struct1<T, U> {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    struct Struct2<'a, T, U> {
-        #[pin]
-        pinned: &'a T,
-        unpinned: U,
-    }
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]
-    enum Enum<T, U> {
-        V {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        },
-    }
-
-    impl<T, U> Struct1<T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut T> {
-            self.project().pinned
-        }
-        fn get_pin_ref_elided(self: Pin<&Self>) -> Pin<&T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut_elided(self: Pin<&mut Self>) -> Pin<&mut T> {
-            self.project().pinned
-        }
-    }
-
-    impl<'b, T, U> Struct2<'b, T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a &'b T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut &'b T> {
-            self.project().pinned
-        }
-        fn get_pin_ref_elided(self: Pin<&Self>) -> Pin<&&'b T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut_elided(self: Pin<&mut Self>) -> Pin<&mut &'b T> {
-            self.project().pinned
-        }
-    }
-
-    impl<T, U> Enum<T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a T> {
-            match self.project_ref() {
-                EnumProjRef::V { pinned, .. } => pinned,
-            }
-        }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut T> {
-            match self.project() {
-                EnumProj::V { pinned, .. } => pinned,
-            }
-        }
-        fn get_pin_ref_elided(self: Pin<&Self>) -> Pin<&T> {
-            match self.project_ref() {
-                EnumProjRef::V { pinned, .. } => pinned,
-            }
-        }
-        fn get_pin_mut_elided(self: Pin<&mut Self>) -> Pin<&mut T> {
-            match self.project() {
-                EnumProj::V { pinned, .. } => pinned,
-            }
-        }
-    }
-}
-
-mod visibility {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    pub(crate) struct S {
-        pub f: u8,
-    }
-}
-
-#[test]
-fn visibility() {
-    let mut x = visibility::S { f: 0 };
-    let x = Pin::new(&mut x);
-    let y = x.as_ref().project_ref();
-    let _: &u8 = y.f;
-    let y = x.project();
-    let _: &mut u8 = y.f;
-}
-
-#[test]
-fn trivial_bounds() {
-    #[pin_project(project_replace)]
-    pub struct NoGenerics {
-        #[pin]
-        f: PhantomPinned,
-    }
-
-    assert_not_unpin!(NoGenerics);
-}
-
-#[test]
-fn dst() {
-    #[pin_project]
-    struct Struct1<T: ?Sized> {
-        f: T,
-    }
-
-    let mut x = Struct1 { f: 0_u8 };
-    let x: Pin<&mut Struct1<dyn core::fmt::Debug>> = Pin::new(&mut x as _);
-    let _: &mut (dyn core::fmt::Debug) = x.project().f;
-
-    #[pin_project]
-    struct Struct2<T: ?Sized> {
-        #[pin]
-        f: T,
-    }
-
-    let mut x = Struct2 { f: 0_u8 };
-    let x: Pin<&mut Struct2<dyn core::fmt::Debug + Unpin>> = Pin::new(&mut x as _);
-    let _: Pin<&mut (dyn core::fmt::Debug + Unpin)> = x.project().f;
-
-    #[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
-    #[pin_project]
-    struct Struct3<T>
-    where
-        T: ?Sized,
-    {
-        f: T,
-    }
-
-    #[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
-    #[pin_project]
-    struct Struct4<T>
-    where
-        T: ?Sized,
-    {
-        #[pin]
-        f: T,
-    }
-
-    #[pin_project(UnsafeUnpin)]
-    struct Struct5<T: ?Sized> {
-        f: T,
-    }
-
-    #[pin_project(UnsafeUnpin)]
-    struct Struct6<T: ?Sized> {
-        #[pin]
-        f: T,
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Struct7<T: ?Sized> {
-        f: T,
-    }
-
-    #[pinned_drop]
-    impl<T: ?Sized> PinnedDrop for Struct7<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Struct8<T: ?Sized> {
-        #[pin]
-        f: T,
-    }
-
-    #[pinned_drop]
-    impl<T: ?Sized> PinnedDrop for Struct8<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(!Unpin)]
-    struct Struct9<T: ?Sized> {
-        f: T,
-    }
-
-    #[pin_project(!Unpin)]
-    struct Struct10<T: ?Sized> {
-        #[pin]
-        f: T,
-    }
-
-    #[pin_project]
-    struct Struct11<'a, T: ?Sized, U: ?Sized> {
-        f1: &'a mut T,
-        f2: U,
-    }
-
-    #[pin_project]
-    struct TupleStruct1<T: ?Sized>(T);
-
-    #[pin_project]
-    struct TupleStruct2<T: ?Sized>(#[pin] T);
-
-    #[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
-    #[pin_project]
-    struct TupleStruct3<T>(T)
-    where
-        T: ?Sized;
-
-    #[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
-    #[pin_project]
-    struct TupleStruct4<T>(#[pin] T)
-    where
-        T: ?Sized;
-
-    #[pin_project(UnsafeUnpin)]
-    struct TupleStruct5<T: ?Sized>(T);
-
-    #[pin_project(UnsafeUnpin)]
-    struct TupleStruct6<T: ?Sized>(#[pin] T);
-
-    #[pin_project(PinnedDrop)]
-    struct TupleStruct7<T: ?Sized>(T);
-
-    #[pinned_drop]
-    impl<T: ?Sized> PinnedDrop for TupleStruct7<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct TupleStruct8<T: ?Sized>(#[pin] T);
-
-    #[pinned_drop]
-    impl<T: ?Sized> PinnedDrop for TupleStruct8<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(!Unpin)]
-    struct TupleStruct9<T: ?Sized>(T);
-
-    #[pin_project(!Unpin)]
-    struct TupleStruct10<T: ?Sized>(#[pin] T);
-
-    #[pin_project]
-    struct TupleStruct11<'a, T: ?Sized, U: ?Sized>(&'a mut T, U);
-}
-
-#[test]
-fn dyn_type() {
-    #[pin_project]
-    struct Struct1 {
-        f: dyn core::fmt::Debug,
-    }
-
-    #[pin_project]
-    struct Struct2 {
-        #[pin]
-        f: dyn core::fmt::Debug,
-    }
-
-    #[pin_project]
-    struct Struct3 {
-        f: dyn core::fmt::Debug + Send,
-    }
-
-    #[pin_project]
-    struct Struct4 {
-        #[pin]
-        f: dyn core::fmt::Debug + Send,
-    }
-
-    #[pin_project]
-    struct TupleStruct1(dyn core::fmt::Debug);
-
-    #[pin_project]
-    struct TupleStruct2(#[pin] dyn core::fmt::Debug);
-
-    #[pin_project]
-    struct TupleStruct3(dyn core::fmt::Debug + Send);
-
-    #[pin_project]
-    struct TupleStruct4(#[pin] dyn core::fmt::Debug + Send);
-}
-
-#[test]
-fn parse_self() {
-    macro_rules! mac {
-        ($($tt:tt)*) => {
-            $($tt)*
-        };
-    }
-
-    pub trait Trait {
-        type Assoc;
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Generics<T: Trait<Assoc = Self>>
-    where
-        Self: Trait<Assoc = Self>,
-        <Self as Trait>::Assoc: Sized,
-        mac!(Self): Trait<Assoc = mac!(Self)>,
-    {
-        _f: T,
-    }
-
-    impl<T: Trait<Assoc = Self>> Trait for Generics<T> {
-        type Assoc = Self;
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct {
-        _f1: Box<Self>,
-        _f2: Box<<Self as Trait>::Assoc>,
-        _f3: Box<mac!(Self)>,
-        _f4: [(); Self::ASSOC],
-        _f5: [(); Self::assoc()],
-        _f6: [(); mac!(Self::assoc())],
-    }
-
-    impl Struct {
-        const ASSOC: usize = 1;
-        const fn assoc() -> usize {
-            0
-        }
-    }
-
-    impl Trait for Struct {
-        type Assoc = Self;
-    }
-
-    #[pin_project(project_replace)]
-    struct Tuple(
-        Box<Self>,
-        Box<<Self as Trait>::Assoc>,
-        Box<mac!(Self)>,
-        [(); Self::ASSOC],
-        [(); Self::assoc()],
-        [(); mac!(Self::assoc())],
-    );
-
-    impl Tuple {
-        const ASSOC: usize = 1;
-        const fn assoc() -> usize {
-            0
-        }
-    }
-
-    impl Trait for Tuple {
-        type Assoc = Self;
-    }
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef, project_replace = EnumProjOwn)]
-    enum Enum {
-        Struct {
-            _f1: Box<Self>,
-            _f2: Box<<Self as Trait>::Assoc>,
-            _f3: Box<mac!(Self)>,
-            _f4: [(); Self::ASSOC],
-            _f5: [(); Self::assoc()],
-            _f6: [(); mac!(Self::assoc())],
-        },
-        Tuple(
-            Box<Self>,
-            Box<<Self as Trait>::Assoc>,
-            Box<mac!(Self)>,
-            [(); Self::ASSOC],
-            [(); Self::assoc()],
-            [(); mac!(Self::assoc())],
-        ),
-    }
-
-    impl Enum {
-        const ASSOC: usize = 1;
-        const fn assoc() -> usize {
-            0
-        }
-    }
-
-    impl Trait for Enum {
-        type Assoc = Self;
-    }
-}
-
-#[test]
-fn no_infer_outlives() {
-    trait Trait<X> {
-        type Y;
-    }
-
-    struct Struct1<A>(A);
-
-    impl<X, T> Trait<X> for Struct1<T> {
-        type Y = Option<T>;
-    }
-
-    #[pin_project(project_replace)]
-    struct Struct2<A, B> {
-        _f: <Struct1<A> as Trait<B>>::Y,
-    }
-}
-
-// https://github.com/rust-lang/rust/issues/47949
-// https://github.com/taiki-e/pin-project/pull/194#discussion_r419098111
-#[allow(clippy::many_single_char_names)]
-#[test]
-fn project_replace_panic() {
-    #[pin_project(project_replace)]
-    struct S<T, U> {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    }
-
-    struct D<'a>(&'a mut bool, bool);
-    impl Drop for D<'_> {
-        fn drop(&mut self) {
-            *self.0 = true;
-            if self.1 {
-                panic!()
-            }
-        }
-    }
-
-    let (mut a, mut b, mut c, mut d) = (false, false, false, false);
-    let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let mut x = S { pinned: D(&mut a, true), unpinned: D(&mut b, false) };
-        let _y = Pin::new(&mut x)
-            .project_replace(S { pinned: D(&mut c, false), unpinned: D(&mut d, false) });
-        // Previous `x.pinned` was dropped and panicked when `project_replace` is
-        // called, so this is unreachable.
-        unreachable!();
-    }));
-    assert!(res.is_err());
-    assert!(a);
-    assert!(b);
-    assert!(c);
-    assert!(d);
-
-    let (mut a, mut b, mut c, mut d) = (false, false, false, false);
-    let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let mut x = S { pinned: D(&mut a, false), unpinned: D(&mut b, true) };
-        {
-            let _y = Pin::new(&mut x)
-                .project_replace(S { pinned: D(&mut c, false), unpinned: D(&mut d, false) });
-            // `_y` (previous `x.unpinned`) live to the end of this scope, so
-            // this is not unreachable.
-            // unreachable!();
-        }
-        unreachable!();
-    }));
-    assert!(res.is_err());
-    assert!(a);
-    assert!(b);
-    assert!(c);
-    assert!(d);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/proper_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/proper_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/proper_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/proper_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-#[macro_use]
-mod auxiliary;
-
-pub mod default {
-    use pin_project::pin_project;
-    use std::marker::PhantomPinned;
-
-    struct Inner<T> {
-        f: T,
-    }
-
-    assert_unpin!(Inner<()>);
-    assert_not_unpin!(Inner<PhantomPinned>);
-
-    #[pin_project]
-    struct Struct<T, U> {
-        #[pin]
-        f1: Inner<T>,
-        f2: U,
-    }
-
-    assert_unpin!(Struct<(), ()>);
-    assert_unpin!(Struct<(), PhantomPinned>);
-    assert_not_unpin!(Struct<PhantomPinned, ()>);
-    assert_not_unpin!(Struct<PhantomPinned, PhantomPinned>);
-
-    #[pin_project(project = EnumProj, project_ref = EnumProjRef)]
-    enum Enum<T, U> {
-        V1 {
-            #[pin]
-            f1: Inner<T>,
-            f2: U,
-        },
-    }
-
-    assert_unpin!(Enum<(), ()>);
-    assert_unpin!(Enum<(), PhantomPinned>);
-    assert_not_unpin!(Enum<PhantomPinned, ()>);
-    assert_not_unpin!(Enum<PhantomPinned, PhantomPinned>);
-
-    #[pin_project]
-    struct TrivialBounds {
-        #[pin]
-        f: PhantomPinned,
-    }
-
-    assert_not_unpin!(TrivialBounds);
-
-    #[pin_project]
-    struct PinRef<'a, T, U> {
-        #[pin]
-        f1: &'a mut Inner<T>,
-        f2: U,
-    }
-
-    assert_unpin!(PinRef<'_, PhantomPinned, PhantomPinned>);
-}
-
-pub mod cfg {
-    use pin_project::pin_project;
-    use std::marker::PhantomPinned;
-
-    #[pin_project]
-    struct Foo<T> {
-        #[cfg(any())]
-        #[pin]
-        f: T,
-        #[cfg(not(any()))]
-        f: T,
-    }
-
-    assert_unpin!(Foo<PhantomPinned>);
-
-    #[pin_project]
-    struct Bar<T> {
-        #[cfg(any())]
-        f: T,
-        #[cfg(not(any()))]
-        #[pin]
-        f: T,
-    }
-
-    assert_unpin!(Bar<()>);
-    assert_not_unpin!(Bar<PhantomPinned>);
-}
-
-pub mod cfg_attr {
-    use pin_project::pin_project;
-    use std::marker::PhantomPinned;
-
-    #[cfg_attr(any(), pin_project)]
-    struct Foo<T> {
-        f: T,
-    }
-
-    assert_unpin!(Foo<()>);
-    assert_not_unpin!(Foo<PhantomPinned>);
-
-    #[cfg_attr(not(any()), pin_project)]
-    struct Bar<T> {
-        #[cfg_attr(not(any()), pin)]
-        f: T,
-    }
-
-    assert_unpin!(Bar<()>);
-    assert_not_unpin!(Bar<PhantomPinned>);
-}
-
-// pin_project(!Unpin)
-pub mod not_unpin {
-    use pin_project::pin_project;
-    use std::marker::PhantomPinned;
-
-    struct Inner<T> {
-        f: T,
-    }
-
-    #[pin_project(!Unpin)]
-    struct Struct<T, U> {
-        #[pin]
-        inner: Inner<T>,
-        other: U,
-    }
-
-    assert_not_unpin!(Struct<(), ()>);
-    assert_not_unpin!(Struct<(), PhantomPinned>);
-    assert_not_unpin!(Struct<PhantomPinned, ()>);
-    assert_not_unpin!(Struct<PhantomPinned, PhantomPinned>);
-
-    #[pin_project(!Unpin)]
-    struct TrivialBounds {
-        #[pin]
-        f: PhantomPinned,
-    }
-
-    assert_not_unpin!(TrivialBounds);
-
-    #[pin_project(!Unpin)]
-    struct PinRef<'a, T, U> {
-        #[pin]
-        inner: &'a mut Inner<T>,
-        other: U,
-    }
-
-    assert_not_unpin!(PinRef<'_, (), ()>);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/repr_packed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/repr_packed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/repr_packed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/repr_packed.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![forbid(safe_packed_borrows)]
-
-use std::cell::Cell;
-
-// Ensure that the compiler doesn't copy the fields
-// of #[repr(packed)] types during drop, if the field has alignment 1
-// (that is, any reference to the field is guaranteed to have proper alignment)
-// We are currently unable to statically prevent the usage of #[pin_project]
-// on #[repr(packed)] types composed entirely of fields of alignment 1.
-// This shouldn't lead to undefined behavior, as long as the compiler doesn't
-// try to move the field anyway during drop.
-//
-// This tests validates that the compiler is doing what we expect.
-#[test]
-fn weird_repr_packed() {
-    // We keep track of the field address during
-    // drop using a thread local, to avoid changing
-    // the layout of our #[repr(packed)] type.
-    thread_local! {
-        static FIELD_ADDR: Cell<usize> = Cell::new(0);
-    }
-
-    #[repr(packed)]
-    struct Struct {
-        field: u8,
-    }
-
-    impl Drop for Struct {
-        fn drop(&mut self) {
-            FIELD_ADDR.with(|f| {
-                f.set(&self.field as *const u8 as usize);
-            })
-        }
-    }
-
-    #[allow(clippy::let_and_return)]
-    let field_addr = {
-        // We let this field drop by going out of scope,
-        // rather than explicitly calling drop(foo).
-        // Calling drop(foo) causes 'foo' to be moved
-        // into the 'drop' function, resulting in a different
-        // address.
-        let x = Struct { field: 27 };
-        let field_addr = &x.field as *const u8 as usize;
-        field_addr
-    };
-    assert_eq!(field_addr, FIELD_ADDR.with(|f| f.get()));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-resolve.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-resolve.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-resolve.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-resolve.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-use std::pin::Pin;
-
-#[cfg_attr(any(), pin_project::pin_project)]
-struct Foo<T> {
-    f: T,
-}
-
-fn main() {
-    let mut x = Foo { f: 0_u8 };
-    let _ = Pin::new(&mut x).project(); //~ ERROR E0599
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-resolve.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-error[E0599]: no method named `project` found for struct `Pin<&mut Foo<u8>>` in the current scope
-  --> $DIR/cfg_attr-resolve.rs:10:30
-   |
-10 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0599
-   |                              ^^^^^^^ method not found in `Pin<&mut Foo<u8>>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-use pin_project::pin_project;
-use std::pin::Pin;
-
-#[cfg_attr(not(any()), pin_project)]
-struct Foo<T> {
-    #[cfg_attr(any(), pin)]
-    f: T,
-}
-
-#[cfg_attr(not(any()), pin_project)]
-struct Bar<T> {
-    #[cfg_attr(not(any()), pin)]
-    f: T,
-}
-
-fn main() {
-    let mut x = Foo { f: 0_u8 };
-    let x = Pin::new(&mut x).project();
-    let _: Pin<&mut u8> = x.f; //~ ERROR E0308
-
-    let mut x = Bar { f: 0_u8 };
-    let x = Pin::new(&mut x).project();
-    let _: &mut u8 = x.f; //~ ERROR E0308
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/cfg_attr-type-mismatch.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/cfg_attr-type-mismatch.rs:19:27
-   |
-19 |     let _: Pin<&mut u8> = x.f; //~ ERROR E0308
-   |            ------------   ^^^ expected struct `Pin`, found `&mut u8`
-   |            |
-   |            expected due to this
-   |
-   = note:         expected struct `Pin<&mut u8>`
-           found mutable reference `&mut u8`
-
-error[E0308]: mismatched types
-  --> $DIR/cfg_attr-type-mismatch.rs:23:22
-   |
-23 |     let _: &mut u8 = x.f; //~ ERROR E0308
-   |            -------   ^^^
-   |            |         |
-   |            |         expected `&mut u8`, found struct `Pin`
-   |            |         help: consider mutably borrowing here: `&mut x.f`
-   |            expected due to this
-   |
-   = note: expected mutable reference `&mut u8`
-                         found struct `Pin<&mut u8>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-use auxiliary_macro::hidden_repr_cfg_not_any;
-use pin_project::pin_project;
-
-// `#[hidden_repr_cfg_not_any(packed)]` generates `#[cfg_attr(not(any()), repr(packed))]`.
-#[pin_project]
-#[hidden_repr_cfg_not_any(packed)] //~ ERROR may not be used on #[repr(packed)] types
-struct S {
-    #[pin]
-    f: u32,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use auxiliary_macro::hidden_repr;
-use pin_project::pin_project;
-
-//~ ERROR may not be used on #[repr(packed)] types
-// span is lost.
-// Refs: https://github.com/rust-lang/rust/issues/43081
-#[pin_project]
-#[hidden_repr(packed)]
-struct S {
-    #[cfg(not(any()))]
-    #[pin]
-    f: u32,
-    #[cfg(any())]
-    #[pin]
-    f: u8,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-1.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use auxiliary_macro::hidden_repr;
-use pin_project::pin_project;
-
-//~ ERROR may not be used on #[repr(packed)] types
-// span is lost.
-// Refs: https://github.com/rust-lang/rust/issues/43081
-#[pin_project]
-#[hidden_repr(packed)]
-struct S {
-    #[cfg(any())]
-    #[pin]
-    f: u32,
-    #[cfg(not(any()))]
-    #[pin]
-    f: u8,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky-span-issue-2.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/packed_sneaky.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> $DIR/packed_sneaky.rs:6:27
-  |
-6 | #[hidden_repr_cfg_not_any(packed)] //~ ERROR may not be used on #[repr(packed)] types
-  |                           ^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/unsupported.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/unsupported.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/unsupported.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/unsupported.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-use pin_project::pin_project;
-
-//~ ERROR may not be used on structs with zero fields
-// span is lost.
-// Refs: https://github.com/rust-lang/rust/issues/43081
-#[pin_project]
-struct S {
-    #[cfg(any())]
-    #[pin]
-    f: u8,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/unsupported.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/unsupported.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/unsupported.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/cfg/unsupported.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-error: #[pin_project] attribute may not be used on structs with zero fields
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/conflict-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-impl<T, U> Unpin for Bar<T, U> {}
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/conflict-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`:
-  --> $DIR/conflict-unpin.rs:3:15
-   |
-3  | #[pin_project(!Unpin)] //~ ERROR E0119
-   |               ^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-   | --------------------------------------------- first implementation here
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`:
-  --> $DIR/conflict-unpin.rs:12:15
-   |
-12 | #[pin_project(!Unpin)] //~ ERROR E0119
-   |               ^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-19 | impl<T, U> Unpin for Bar<T, U> {}
-   | ------------------------------ first implementation here
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`:
-  --> $DIR/conflict-unpin.rs:21:15
-   |
-21 | #[pin_project(!Unpin)] //~ ERROR E0119
-   |               ^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-28 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
-   | -------------------------------------------- first implementation here
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use pin_project::{pin_project, UnsafeUnpin};
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/not_unpin/impl-unsafe-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Foo<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:3:1
-   |
-3  | #[pin_project(!Unpin)] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-   | ---------------------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Bar<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:12:1
-   |
-12 | #[pin_project(!Unpin)] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-19 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
-   | ------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Baz<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:21:1
-   |
-21 | #[pin_project(!Unpin)] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-28 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
-   | --------------------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/call-drop-inner.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/call-drop-inner.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/call-drop-inner.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/call-drop-inner.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project(PinnedDrop)]
-struct Struct {
-    f: bool,
-}
-
-#[pinned_drop]
-impl PinnedDrop for Struct {
-    fn drop(mut self: Pin<&mut Self>) {
-        __drop_inner(__self);
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/call-drop-inner.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-error[E0061]: this function takes 0 arguments but 1 argument was supplied
-  --> $DIR/call-drop-inner.rs:12:9
-   |
-12 |         __drop_inner(__self);
-   |         ^^^^^^^^^^^^ ------ supplied 1 argument
-   |         |
-   |         expected 0 arguments
-   |
-note: function defined here
-  --> $DIR/call-drop-inner.rs:9:1
-   |
-9  | #[pinned_drop]
-   | ^^^^^^^^^^^^^^
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/conditional-drop-impl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-// In `Drop` impl, the implementor must specify the same requirement as type definition.
-
-struct DropImpl<T> {
-    f: T,
-}
-
-impl<T: Unpin> Drop for DropImpl<T> {
-    //~^ ERROR E0367
-    fn drop(&mut self) {}
-}
-
-#[pin_project(PinnedDrop)] //~ ERROR E0277
-struct PinnedDropImpl<T> {
-    #[pin]
-    f: T,
-}
-
-#[pinned_drop]
-impl<T: Unpin> PinnedDrop for PinnedDropImpl<T> {
-    fn drop(self: Pin<&mut Self>) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/conditional-drop-impl.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-error[E0367]: `Drop` impl requires `T: Unpin` but the struct it is implemented for does not
-  --> $DIR/conditional-drop-impl.rs:10:9
-   |
-10 | impl<T: Unpin> Drop for DropImpl<T> {
-   |         ^^^^^
-   |
-note: the implementor must specify the same requirement
-  --> $DIR/conditional-drop-impl.rs:6:1
-   |
-6  | / struct DropImpl<T> {
-7  | |     f: T,
-8  | | }
-   | |_^
-
-error[E0277]: `T` cannot be unpinned
-  --> $DIR/conditional-drop-impl.rs:15:15
-   |
-15 | #[pin_project(PinnedDrop)] //~ ERROR E0277
-   |               ^^^^^^^^^^ the trait `Unpin` is not implemented for `T`
-   |
-   = note: required because of the requirements on the impl of `PinnedDrop` for `PinnedDropImpl<T>`
-   = note: required by `pin_project::__private::PinnedDrop::drop`
-help: consider restricting type parameter `T`
-   |
-16 | struct PinnedDropImpl<T: Unpin> {
-   |                        ^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(PinnedDrop)] //~ ERROR E0277
-struct Struct {
-    #[pin]
-    f: u8,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-error[E0277]: the trait bound `Struct: PinnedDrop` is not satisfied
- --> $DIR/forget-pinned-drop-impl.rs:3:15
-  |
-3 | #[pin_project(PinnedDrop)] //~ ERROR E0277
-  |               ^^^^^^^^^^ the trait `PinnedDrop` is not implemented for `Struct`
-  |
-  = note: required by `pin_project::__private::PinnedDrop::drop`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,229 +0,0 @@
-mod argument {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    struct UnexpectedArg1(());
-
-    #[pinned_drop(foo)] //~ ERROR unexpected token
-    impl PinnedDrop for UnexpectedArg1 {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct UnexpectedArg2(());
-
-    #[pinned_drop()] // Ok
-    impl PinnedDrop for UnexpectedArg2 {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-}
-
-mod attribute {
-    use pin_project::{pin_project, pinned_drop};
-
-    #[pin_project(PinnedDrop)]
-    struct Duplicate(());
-
-    #[pinned_drop]
-    #[pinned_drop] //~ ERROR duplicate #[pinned_drop] attribute
-    impl PinnedDrop for Duplicate {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-}
-
-mod item {
-    use pin_project::{pin_project, pinned_drop};
-
-    #[pin_project(PinnedDrop)]
-    struct TraitImpl(());
-
-    #[pinned_drop]
-    impl Drop for TraitImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
-
-    #[pin_project(PinnedDrop)]
-    struct InherentImpl(());
-
-    #[pinned_drop]
-    impl InherentImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
-
-    #[pinned_drop]
-    fn func(_: Pin<&mut ()>) {} //~ ERROR expected `impl`
-}
-
-mod unsafety {
-    use pin_project::{pin_project, pinned_drop};
-
-    #[pin_project(PinnedDrop)]
-    struct Impl(());
-
-    #[pinned_drop]
-    unsafe impl PinnedDrop for Impl {
-        //~^ ERROR implementing the trait `PinnedDrop` is not unsafe
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Method(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Method {
-        unsafe fn drop(self: Pin<&mut Self>) {} //~ ERROR implementing the method `drop` is not unsafe
-    }
-}
-
-mod assoc_item {
-    use pin_project::{pin_project, pinned_drop};
-
-    #[pin_project(PinnedDrop)]
-    struct Empty(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Empty {} //~ ERROR not all trait items implemented, missing: `drop`
-
-    #[pin_project(PinnedDrop)]
-    struct Const1(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Const1 {
-        const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Const2(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Const2 {
-        fn drop(self: Pin<&mut Self>) {}
-        const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Type1(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Type1 {
-        type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Type2(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Type2 {
-        fn drop(self: Pin<&mut Self>) {}
-        type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Duplicate(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Duplicate {
-        fn drop(self: Pin<&mut Self>) {}
-        fn drop(self: Pin<&mut Self>) {} //~ ERROR duplicate definitions with name `drop`
-    }
-}
-
-mod method {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    struct RetUnit(());
-
-    #[pinned_drop]
-    impl PinnedDrop for RetUnit {
-        fn drop(self: Pin<&mut Self>) -> () {} // Ok
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct RetTy(());
-
-    #[pinned_drop]
-    impl PinnedDrop for RetTy {
-        fn drop(self: Pin<&mut Self>) -> Self {} //~ ERROR method `drop` must return the unit type
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct NoArg(());
-
-    #[pinned_drop]
-    impl PinnedDrop for NoArg {
-        fn drop() {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct MultiArg(());
-
-    #[pinned_drop]
-    impl PinnedDrop for MultiArg {
-        fn drop(self: Pin<&mut Self>, _: ()) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidArg1(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidArg1 {
-        fn drop(&mut self) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidArg2(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidArg2 {
-        fn drop(_: Pin<&mut Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidArg3(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidArg3 {
-        fn drop(self: Pin<&Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidArg4(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidArg4 {
-        fn drop(self: Pin<&mut ()>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidName(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidName {
-        fn pinned_drop(self: Pin<&mut Self>) {} //~ ERROR method `pinned_drop` is not a member of trait `PinnedDrop
-    }
-}
-
-mod self_ty {
-    use pin_project::pinned_drop;
-
-    #[pinned_drop]
-    impl PinnedDrop for () {
-        //~^ ERROR implementing the trait `PinnedDrop` on this type is unsupported
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for &mut A {
-        //~^ ERROR implementing the trait `PinnedDrop` on this type is unsupported
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for [A] {
-        //~^ ERROR implementing the trait `PinnedDrop` on this type is unsupported
-        fn drop(self: Pin<&mut Self>) {}
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid-self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid-self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid-self.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid-self.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// by-ref binding `ref (mut) self` and sub-patterns `@` are not allowed in receivers (rejected by rustc).
-
-use std::pin::Pin;
-
-struct S {}
-
-impl S {
-    fn take_ref_self(ref self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-    fn take_ref_mut_self(ref mut self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-
-    fn self_subpat(self @ S {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid-self.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid-self.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid-self.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid-self.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-error: expected identifier, found keyword `self`
- --> $DIR/invalid-self.rs:8:26
-  |
-8 |     fn take_ref_self(ref self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-  |                          ^^^^ expected identifier, found keyword
-
-error: expected identifier, found keyword `self`
- --> $DIR/invalid-self.rs:9:34
-  |
-9 |     fn take_ref_mut_self(ref mut self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-  |                                  ^^^^ expected identifier, found keyword
-
-error: expected parameter name, found `@`
-  --> $DIR/invalid-self.rs:11:25
-   |
-11 |     fn self_subpat(self @ S {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
-   |                         ^ expected parameter name
-
-error: expected one of `)`, `,`, or `:`, found `@`
-  --> $DIR/invalid-self.rs:11:25
-   |
-11 |     fn self_subpat(self @ S {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
-   |                        -^ expected one of `)`, `,`, or `:`
-   |                        |
-   |                        help: missing `,`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/invalid.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +0,0 @@
-error: unexpected token: foo
- --> $DIR/invalid.rs:8:19
-  |
-8 |     #[pinned_drop(foo)] //~ ERROR unexpected token
-  |                   ^^^
-
-error: duplicate #[pinned_drop] attribute
-  --> $DIR/invalid.rs:29:5
-   |
-29 |     #[pinned_drop] //~ ERROR duplicate #[pinned_drop] attribute
-   |     ^^^^^^^^^^^^^^
-
-error: #[pinned_drop] may only be used on implementation for the `PinnedDrop` trait
-  --> $DIR/invalid.rs:42:10
-   |
-42 |     impl Drop for TraitImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
-   |          ^^^^
-
-error: #[pinned_drop] may only be used on implementation for the `PinnedDrop` trait
-  --> $DIR/invalid.rs:48:10
-   |
-48 |     impl InherentImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
-   |          ^^^^^^^^^^^^
-
-error: expected `impl`
-  --> $DIR/invalid.rs:51:5
-   |
-51 |     fn func(_: Pin<&mut ()>) {} //~ ERROR expected `impl`
-   |     ^^
-
-error: implementing the trait `PinnedDrop` is not unsafe
-  --> $DIR/invalid.rs:61:5
-   |
-61 |     unsafe impl PinnedDrop for Impl {
-   |     ^^^^^^
-
-error: implementing the method `drop` is not unsafe
-  --> $DIR/invalid.rs:71:9
-   |
-71 |         unsafe fn drop(self: Pin<&mut Self>) {} //~ ERROR implementing the method `drop` is not unsafe
-   |         ^^^^^^
-
-error: not all trait items implemented, missing: `drop`
-  --> $DIR/invalid.rs:82:5
-   |
-82 |     impl PinnedDrop for Empty {} //~ ERROR not all trait items implemented, missing: `drop`
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: const `A` is not a member of trait `PinnedDrop`
-  --> $DIR/invalid.rs:89:9
-   |
-89 |         const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
-   |         ^^^^^^^^^^^^^^^^
-
-error: const `A` is not a member of trait `PinnedDrop`
-  --> $DIR/invalid.rs:99:9
-   |
-99 |         const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
-   |         ^^^^^^^^^^^^^^^^
-
-error: type `A` is not a member of trait `PinnedDrop`
-   --> $DIR/invalid.rs:107:9
-    |
-107 |         type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
-    |         ^^^^^^^^^^^^
-
-error: type `A` is not a member of trait `PinnedDrop`
-   --> $DIR/invalid.rs:117:9
-    |
-117 |         type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
-    |         ^^^^^^^^^^^^
-
-error: duplicate definitions with name `drop`
-   --> $DIR/invalid.rs:126:9
-    |
-126 |         fn drop(self: Pin<&mut Self>) {} //~ ERROR duplicate definitions with name `drop`
-    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: method `drop` must return the unit type
-   --> $DIR/invalid.rs:147:42
-    |
-147 |         fn drop(self: Pin<&mut Self>) -> Self {} //~ ERROR method `drop` must return the unit type
-    |                                          ^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:155:16
-    |
-155 |         fn drop() {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                ^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:163:17
-    |
-163 |         fn drop(self: Pin<&mut Self>, _: ()) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:171:17
-    |
-171 |         fn drop(&mut self) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:179:17
-    |
-179 |         fn drop(_: Pin<&mut Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^^^^^^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:187:17
-    |
-187 |         fn drop(self: Pin<&Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^^^^^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:195:17
-    |
-195 |         fn drop(self: Pin<&mut ()>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^^^^^^^^^^
-
-error: method `pinned_drop` is not a member of trait `PinnedDrop
-   --> $DIR/invalid.rs:203:12
-    |
-203 |         fn pinned_drop(self: Pin<&mut Self>) {} //~ ERROR method `pinned_drop` is not a member of trait `PinnedDrop
-    |            ^^^^^^^^^^^
-
-error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> $DIR/invalid.rs:211:25
-    |
-211 |     impl PinnedDrop for () {
-    |                         ^^
-
-error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> $DIR/invalid.rs:217:25
-    |
-217 |     impl PinnedDrop for &mut A {
-    |                         ^^^^^^
-
-error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> $DIR/invalid.rs:223:25
-    |
-223 |     impl PinnedDrop for [A] {
-    |                         ^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project]
-struct S {
-    #[pin]
-    f: u8,
-}
-
-#[pinned_drop]
-impl PinnedDrop for S {
-    //~^ ERROR E0119
-    fn drop(self: Pin<&mut Self>) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-error[E0119]: conflicting implementations of trait `pin_project::__private::PinnedDrop` for type `S`:
-  --> $DIR/pinned-drop-no-attr-arg.rs:11:1
-   |
-4  | #[pin_project]
-   | -------------- first implementation here
-...
-11 | impl PinnedDrop for S {
-   | ^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `S`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/self.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/self.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-pub mod self_in_macro_def {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    pub struct S {
-        f: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for S {
-        fn drop(self: Pin<&mut Self>) {
-            macro_rules! t {
-                () => {{
-                    let _ = self; //~ ERROR E0434
-
-                    fn f(self: ()) {} //~ ERROR `self` parameter is only allowed in associated functions
-                }};
-            }
-            t!();
-        }
-    }
-}
-
-pub mod self_span {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    pub struct S {
-        f: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for S {
-        fn drop(self: Pin<&mut Self>) {
-            let _: () = self; //~ ERROR E0308
-            let _: Self = Self; //~ ERROR E0423
-        }
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub enum E {
-        V { f: () },
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for E {
-        fn drop(self: Pin<&mut Self>) {
-            let _: () = self; //~ ERROR E0308
-            let _: Self = Self::V; //~ ERROR E0533
-        }
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/self.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/self.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/self.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/self.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-error: `self` parameter is only allowed in associated functions
-  --> $DIR/self.rs:17:26
-   |
-17 |                     fn f(self: ()) {} //~ ERROR `self` parameter is only allowed in associated functions
-   |                          ^^^^ not semantically valid as function parameter
-...
-20 |             t!();
-   |             ----- in this macro invocation
-   |
-   = note: associated functions are those in `impl` or `trait` definitions
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0434]: can't capture dynamic environment in a fn item
-  --> $DIR/self.rs:15:29
-   |
-15 |                     let _ = self; //~ ERROR E0434
-   |                             ^^^^
-...
-20 |             t!();
-   |             ----- in this macro invocation
-   |
-   = help: use the `|| { ... }` closure form instead
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0423]: expected value, found struct `S`
-  --> $DIR/self.rs:38:27
-   |
-30 | /     pub struct S {
-31 | |         f: (),
-32 | |     }
-   | |_____- `S` defined here
-...
-38 |               let _: Self = Self; //~ ERROR E0423
-   |                             ^^^^ help: use struct literal syntax instead: `S { f: val }`
-
-error[E0308]: mismatched types
-  --> $DIR/self.rs:37:25
-   |
-37 |             let _: () = self; //~ ERROR E0308
-   |                    --   ^^^^ expected `()`, found struct `Pin`
-   |                    |
-   |                    expected due to this
-   |
-   = note: expected unit type `()`
-                 found struct `Pin<&mut self_span::S>`
-
-error[E0308]: mismatched types
-  --> $DIR/self.rs:50:25
-   |
-50 |             let _: () = self; //~ ERROR E0308
-   |                    --   ^^^^ expected `()`, found struct `Pin`
-   |                    |
-   |                    expected due to this
-   |
-   = note: expected unit type `()`
-                 found struct `Pin<&mut E>`
-
-error[E0533]: expected unit struct, unit variant or constant, found struct variant `Self::V`
-  --> $DIR/self.rs:51:27
-   |
-51 |             let _: Self = Self::V; //~ ERROR E0533
-   |                           ^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/unsafe-call.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/unsafe-call.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/unsafe-call.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/unsafe-call.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project(PinnedDrop)]
-struct S {
-    #[pin]
-    f: u8,
-}
-
-#[pinned_drop]
-impl PinnedDrop for S {
-    fn drop(self: Pin<&mut Self>) {
-        self.project().f.get_unchecked_mut(); //~ ERROR call to unsafe function is unsafe and requires unsafe function or block [E0133]
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/unsafe-call.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/unsafe-call.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/unsafe-call.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pinned_drop/unsafe-call.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
-  --> $DIR/unsafe-call.rs:13:9
-   |
-13 |         self.project().f.get_unchecked_mut(); //~ ERROR call to unsafe function is unsafe and requires unsafe function or block [E0133]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function
-   |
-   = note: consult the function's documentation for information on how to avoid undefined behavior
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-attr-to-struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-attr-to-struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-attr-to-struct.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-attr-to-struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-use auxiliary_macro::add_pin_attr;
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project]
-#[add_pin_attr(struct)] //~ ERROR duplicate #[pin] attribute
-struct Foo {
-    #[pin]
-    f: PhantomPinned,
-}
-
-#[add_pin_attr(struct)] //~ ERROR #[pin] attribute may only be used on fields of structs or variants
-#[pin_project]
-struct Bar {
-    #[pin]
-    f: PhantomPinned,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-attr-to-struct.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-error: duplicate #[pin] attribute
- --> $DIR/add-attr-to-struct.rs:6:1
-  |
-6 | #[add_pin_attr(struct)] //~ ERROR duplicate #[pin] attribute
-  | ^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: #[pin] attribute may only be used on fields of structs or variants
-  --> $DIR/add-attr-to-struct.rs:12:1
-   |
-12 | #[add_pin_attr(struct)] //~ ERROR #[pin] attribute may only be used on fields of structs or variants
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-pinned-field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-pinned-field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-pinned-field.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-pinned-field.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-use auxiliary_macro::add_pinned_field;
-use pin_project::pin_project;
-
-fn is_unpin<T: Unpin>() {}
-
-#[pin_project]
-#[add_pinned_field]
-struct Foo {
-    #[pin]
-    f: u32,
-}
-
-#[add_pinned_field]
-#[pin_project]
-struct Bar {
-    #[pin]
-    f: u32,
-}
-
-fn main() {
-    is_unpin::<Foo>(); //~ ERROR E0277
-    is_unpin::<Bar>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-pinned-field.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-pinned-field.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-pinned-field.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/add-pinned-field.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/add-pinned-field.rs:21:5
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-21 |     is_unpin::<Foo>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^ within `__Foo<'_>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `__Foo<'_>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/add-pinned-field.rs:22:5
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-22 |     is_unpin::<Bar>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^ within `__Bar<'_>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `__Bar<'_>`
-   = note: required because of the requirements on the impl of `Unpin` for `Bar`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-impl<T, U> Drop for Foo<T, U> {
-    fn drop(&mut self) {}
-}
-
-#[pin_project(PinnedDrop)] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-#[pinned_drop]
-impl<T, U> PinnedDrop for Bar<T, U> {
-    fn drop(self: Pin<&mut Self>) {}
-}
-
-impl<T, U> Drop for Bar<T, U> {
-    fn drop(&mut self) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-drop.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-drop.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-drop.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-drop.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for type `Foo<_, _>`:
- --> $DIR/conflict-drop.rs:4:1
-  |
-4 | #[pin_project] //~ ERROR E0119
-  | ^^^^^^^^^^^^^^
-  | |
-  | first implementation here
-  | conflicting implementation for `Foo<_, _>`
-  |
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `Bar<_, _>`:
-  --> $DIR/conflict-drop.rs:15:15
-   |
-15 | #[pin_project(PinnedDrop)] //~ ERROR E0119
-   |               ^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-27 | impl<T, U> Drop for Bar<T, U> {
-   | ----------------------------- first implementation here
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-use pin_project::pin_project;
-
-// The same implementation.
-
-#[pin_project] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-// conflicting implementations
-impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-
-// The implementation that under different conditions.
-
-#[pin_project] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-// conflicting implementations
-impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
-
-#[pin_project] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-// conflicting implementations
-impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`:
-  --> $DIR/conflict-unpin.rs:5:1
-   |
-5  | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-13 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-   | --------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`:
-  --> $DIR/conflict-unpin.rs:17:1
-   |
-17 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-25 | impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
-   | ------------------------------ first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`:
-  --> $DIR/conflict-unpin.rs:27:1
-   |
-27 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-35 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
-   | -------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/impl-unsafe-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use pin_project::{pin_project, UnsafeUnpin};
-
-#[pin_project] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-
-#[pin_project] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
-
-#[pin_project] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/impl-unsafe-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Foo<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:3:1
-   |
-3  | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-   | ---------------------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Bar<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:12:1
-   |
-12 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-19 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
-   | ------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Baz<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:21:1
-   |
-21 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-28 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
-   | --------------------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/import_unnamed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/import_unnamed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/import_unnamed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/import_unnamed.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/// Only named projected types can be imported.
-/// See visibility.rs for named projected types.
-
-mod pub_ {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    pub struct Default(());
-
-    #[pin_project(project_replace)]
-    pub struct Replace(());
-}
-#[allow(unused_imports)]
-pub mod use_ {
-    #[rustfmt::skip]
-    use crate::pub_::__DefaultProjection; //~ ERROR E0432
-    #[rustfmt::skip]
-    use crate::pub_::__DefaultProjectionRef; //~ ERROR E0432
-    #[rustfmt::skip]
-    use crate::pub_::__ReplaceProjection; //~ ERROR E0432
-    #[rustfmt::skip]
-    use crate::pub_::__ReplaceProjectionOwned; //~ ERROR E0432
-    #[rustfmt::skip]
-    use crate::pub_::__ReplaceProjectionRef; //~ ERROR E0432
-
-    // Confirm that the visibility of the original type is not changed.
-    pub use crate::pub_::{Default, Replace};
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/import_unnamed.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/import_unnamed.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/import_unnamed.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/import_unnamed.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-error[E0432]: unresolved import `crate::pub_::__DefaultProjection`
-  --> $DIR/import_unnamed.rs:16:9
-   |
-16 |     use crate::pub_::__DefaultProjection; //~ ERROR E0432
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__DefaultProjection` in `pub_`
-
-error[E0432]: unresolved import `crate::pub_::__DefaultProjectionRef`
-  --> $DIR/import_unnamed.rs:18:9
-   |
-18 |     use crate::pub_::__DefaultProjectionRef; //~ ERROR E0432
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__DefaultProjectionRef` in `pub_`
-
-error[E0432]: unresolved import `crate::pub_::__ReplaceProjection`
-  --> $DIR/import_unnamed.rs:20:9
-   |
-20 |     use crate::pub_::__ReplaceProjection; //~ ERROR E0432
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__ReplaceProjection` in `pub_`
-
-error[E0432]: unresolved import `crate::pub_::__ReplaceProjectionOwned`
-  --> $DIR/import_unnamed.rs:22:9
-   |
-22 |     use crate::pub_::__ReplaceProjectionOwned; //~ ERROR E0432
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__ReplaceProjectionOwned` in `pub_`
-
-error[E0432]: unresolved import `crate::pub_::__ReplaceProjectionRef`
-  --> $DIR/import_unnamed.rs:24:9
-   |
-24 |     use crate::pub_::__ReplaceProjectionRef; //~ ERROR E0432
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `__ReplaceProjectionRef` in `pub_`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/invalid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/invalid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/invalid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/invalid.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +0,0 @@
-mod pin_argument {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    struct Struct {
-        #[pin()] //~ ERROR unexpected token
-        f: (),
-    }
-
-    #[pin_project]
-    struct TupleStruct(#[pin(foo)] ()); //~ ERROR unexpected token
-
-    #[pin_project]
-    enum EnumTuple {
-        V(#[pin(foo)] ()), //~ ERROR unexpected token
-    }
-
-    #[pin_project]
-    enum EnumStruct {
-        V {
-            #[pin(foo)] //~ ERROR unexpected token
-            f: (),
-        },
-    }
-}
-
-mod pin_attribute {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    struct DuplicateStruct {
-        #[pin]
-        #[pin] //~ ERROR duplicate #[pin] attribute
-        f: (),
-    }
-
-    #[pin_project]
-    struct DuplicateTupleStruct(
-        #[pin]
-        #[pin]
-        (),
-        //~^^ ERROR duplicate #[pin] attribute
-    );
-
-    #[pin_project]
-    enum DuplicateEnumTuple {
-        V(
-            #[pin]
-            #[pin]
-            (),
-            //~^^ ERROR duplicate #[pin] attribute
-        ),
-    }
-
-    #[pin_project]
-    enum DuplicateEnumStruct {
-        V {
-            #[pin]
-            #[pin] //~ ERROR duplicate #[pin] attribute
-            f: (),
-        },
-    }
-}
-
-mod pin_item {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    #[pin] //~ ERROR may only be used on fields of structs or variants
-    struct Struct {
-        #[pin]
-        f: (),
-    }
-
-    #[pin_project]
-    enum Variant {
-        #[pin] //~ ERROR may only be used on fields of structs or variants
-        V(()),
-    }
-
-    #[pin_project]
-    #[pin] //~ ERROR may only be used on fields of structs or variants
-    enum Enum {
-        V(()),
-    }
-}
-
-mod pin_project_argument {
-    use pin_project::pin_project;
-
-    #[pin_project(Replace)] //~ ERROR `Replace` argument was removed, use `project_replace` argument instead
-    struct RemovedReplace(#[pin] ());
-
-    #[pin_project(UnsafeUnpin,,)] //~ ERROR expected identifier
-    struct Unexpected1(#[pin] ());
-
-    #[pin_project(Foo)] //~ ERROR unexpected argument
-    struct Unexpected2(#[pin] ());
-
-    #[pin_project(,UnsafeUnpin)] //~ ERROR expected identifier
-    struct Unexpected3(#[pin] ());
-
-    #[pin_project()] // Ok
-    struct Unexpected4(#[pin] ());
-
-    #[pin_project(PinnedDrop PinnedDrop)] //~ ERROR expected `,`
-    struct Unexpected5(#[pin] ());
-
-    #[pin_project(PinnedDrop, PinnedDrop)] //~ ERROR duplicate `PinnedDrop` argument
-    struct DuplicatePinnedDrop(#[pin] ());
-
-    #[pin_project(UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
-    struct DuplicateUnsafeUnpin(#[pin] ());
-
-    #[pin_project(!Unpin, !Unpin)] //~ ERROR duplicate `!Unpin` argument
-    struct DuplicateNotUnpin(#[pin] ());
-
-    #[pin_project(PinnedDrop, UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
-    struct Duplicate3(#[pin] ());
-
-    #[pin_project(PinnedDrop, UnsafeUnpin, PinnedDrop, UnsafeUnpin)] //~ ERROR duplicate `PinnedDrop` argument
-    struct Duplicate4(#[pin] ());
-
-    #[pin_project(project = A, project = B)] //~ ERROR duplicate `project` argument
-    struct DuplicateProject(#[pin] ());
-
-    #[pin_project(project = A, project_ref = A, project = B)] //~ ERROR duplicate `project` argument
-    struct DuplicateProject2(#[pin] ());
-
-    #[pin_project(project_ref = A, project_ref = B)] //~ ERROR duplicate `project_ref` argument
-    struct DuplicateProjectRef(#[pin] ());
-
-    #[pin_project(project_replace = A, project_replace = B)] //~ ERROR duplicate `project_replace` argument
-    struct DuplicateProjectReplace1(#[pin] ());
-
-    #[pin_project(project_replace, project_replace = B)] //~ ERROR duplicate `project_replace` argument
-    struct DuplicateProjectReplace2(#[pin] ());
-
-    #[pin_project(project_replace = A, project_replace)] //~ ERROR duplicate `project_replace` argument
-    struct DuplicateProjectReplace3(#[pin] ());
-
-    #[pin_project(project_replace = A)] // Ok
-    struct ProjectReplaceWithoutReplace(#[pin] ());
-
-    #[pin_project(PinnedDrop, project_replace)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
-    struct PinnedDropWithProjectReplace1(#[pin] ());
-
-    #[pin_project(project_replace, UnsafeUnpin, PinnedDrop)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
-    struct PinnedDropWithProjectReplace2(#[pin] ());
-
-    #[pin_project(UnsafeUnpin, !Unpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-    struct UnsafeUnpinWithNotUnpin1(#[pin] ());
-
-    #[pin_project(!Unpin, PinnedDrop, UnsafeUnpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-    struct UnsafeUnpinWithNotUnpin2(#[pin] ());
-
-    #[pin_project(!)] //~ ERROR expected `!Unpin`, found `!`
-    struct NotUnpin1(#[pin] ());
-
-    #[pin_project(Unpin)] //~ ERROR unexpected argument
-    struct NotUnpin2(#[pin] ());
-
-    #[pin_project(project)] //~ ERROR expected `project = <identifier>`, found `project`
-    struct Project1(#[pin] ());
-
-    #[pin_project(project = )] //~ ERROR expected `project = <identifier>`, found `project =`
-    struct Project2(#[pin] ());
-
-    #[pin_project(project = !)] //~ ERROR expected identifier
-    struct Project3(#[pin] ());
-
-    #[pin_project(project_ref)] //~ ERROR expected `project_ref = <identifier>`, found `project_ref`
-    struct ProjectRef1(#[pin] ());
-
-    #[pin_project(project_ref = )] //~ ERROR expected `project_ref = <identifier>`, found `project_ref =`
-    struct ProjectRef2(#[pin] ());
-
-    #[pin_project(project_ref = !)] //~ ERROR expected identifier
-    struct ProjectRef3(#[pin] ());
-
-    #[pin_project(project_replace)] // Ok
-    struct ProjectReplace1(#[pin] ());
-
-    #[pin_project(project_replace = )] //~ ERROR expected `project_replace = <identifier>`, found `project_replace =`
-    struct ProjectReplace2(#[pin] ());
-
-    #[pin_project(project_replace = !)] //~ ERROR expected identifier
-    struct ProjectReplace3(#[pin] ());
-
-    #[pin_project(project_replace)] //~ ERROR `project_replace` argument requires a value when used on enums
-    enum ProjectReplaceEnum {
-        V(#[pin] ()),
-    }
-}
-
-mod pin_project_conflict_naming {
-    use pin_project::pin_project;
-
-    #[pin_project(project = OrigAndProj)] //~ ERROR name `OrigAndProj` is the same as the original type name
-    struct OrigAndProj(#[pin] ());
-
-    #[pin_project(project_ref = OrigAndProjRef)] //~ ERROR name `OrigAndProjRef` is the same as the original type name
-    struct OrigAndProjRef(#[pin] ());
-
-    #[pin_project(project_replace = OrigAndProjOwn)] //~ ERROR name `OrigAndProjOwn` is the same as the original type name
-    struct OrigAndProjOwn(#[pin] ());
-
-    #[pin_project(project = A, project_ref = A)] //~ ERROR name `A` is already specified by `project` argument
-    struct ProjAndProjRef(#[pin] ());
-
-    #[pin_project(project = A, project_replace = A)] //~ ERROR name `A` is already specified by `project` argument
-    struct ProjAndProjOwn(#[pin] ());
-
-    #[pin_project(project_ref = A, project_replace = A)] //~ ERROR name `A` is already specified by `project_ref` argument
-    struct ProjRefAndProjOwn(#[pin] ());
-}
-
-mod pin_project_attribute {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    #[pin_project] //~ ERROR duplicate #[pin_project] attribute
-    struct Duplicate(#[pin] ());
-}
-
-mod pin_project_item {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    struct Struct {} //~ ERROR may not be used on structs with zero fields
-
-    #[pin_project]
-    struct TupleStruct(); //~ ERROR may not be used on structs with zero fields
-
-    #[pin_project]
-    struct UnitStruct; //~ ERROR may not be used on structs with zero fields
-
-    #[pin_project]
-    enum EnumEmpty {} //~ ERROR may not be used on enums without variants
-
-    #[pin_project]
-    enum EnumDiscriminant {
-        V = 2, //~ ERROR may not be used on enums with discriminants
-    }
-
-    #[pin_project]
-    enum EnumZeroFields {
-        Unit, //~ ERROR may not be used on enums with zero fields
-        Tuple(),
-        Struct {},
-    }
-
-    #[pin_project]
-    union Union {
-        //~^ ERROR may only be used on structs or enums
-        f: (),
-    }
-
-    #[pin_project]
-    impl Impl {} //~ ERROR may only be used on structs or enums
-}
-
-// #[repr(packed)] is always detected first, even on unsupported structs.
-mod pin_project_item_packed {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    #[repr(packed)]
-    struct Struct {} //~ ERROR may not be used on #[repr(packed)] types
-
-    #[pin_project]
-    #[repr(packed)]
-    struct TupleStruct(); //~ ERROR may not be used on #[repr(packed)] types
-
-    #[pin_project]
-    #[repr(packed)]
-    struct UnitStruct; //~ ERROR may not be used on #[repr(packed)] types
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/invalid.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/invalid.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/invalid.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/invalid.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,364 +0,0 @@
-error: unexpected token: ()
- --> $DIR/invalid.rs:6:14
-  |
-6 |         #[pin()] //~ ERROR unexpected token
-  |              ^^
-
-error: unexpected token: (foo)
-  --> $DIR/invalid.rs:11:29
-   |
-11 |     struct TupleStruct(#[pin(foo)] ()); //~ ERROR unexpected token
-   |                             ^^^^^
-
-error: unexpected token: (foo)
-  --> $DIR/invalid.rs:15:16
-   |
-15 |         V(#[pin(foo)] ()), //~ ERROR unexpected token
-   |                ^^^^^
-
-error: unexpected token: (foo)
-  --> $DIR/invalid.rs:21:18
-   |
-21 |             #[pin(foo)] //~ ERROR unexpected token
-   |                  ^^^^^
-
-error: duplicate #[pin] attribute
-  --> $DIR/invalid.rs:33:9
-   |
-33 |         #[pin] //~ ERROR duplicate #[pin] attribute
-   |         ^^^^^^
-
-error: duplicate #[pin] attribute
-  --> $DIR/invalid.rs:40:9
-   |
-40 |         #[pin]
-   |         ^^^^^^
-
-error: duplicate #[pin] attribute
-  --> $DIR/invalid.rs:49:13
-   |
-49 |             #[pin]
-   |             ^^^^^^
-
-error: duplicate #[pin] attribute
-  --> $DIR/invalid.rs:59:13
-   |
-59 |             #[pin] //~ ERROR duplicate #[pin] attribute
-   |             ^^^^^^
-
-error: #[pin] attribute may only be used on fields of structs or variants
-  --> $DIR/invalid.rs:69:5
-   |
-69 |     #[pin] //~ ERROR may only be used on fields of structs or variants
-   |     ^^^^^^
-
-error: #[pin] attribute may only be used on fields of structs or variants
-  --> $DIR/invalid.rs:77:9
-   |
-77 |         #[pin] //~ ERROR may only be used on fields of structs or variants
-   |         ^^^^^^
-
-error: #[pin] attribute may only be used on fields of structs or variants
-  --> $DIR/invalid.rs:82:5
-   |
-82 |     #[pin] //~ ERROR may only be used on fields of structs or variants
-   |     ^^^^^^
-
-error: `Replace` argument was removed, use `project_replace` argument instead
-  --> $DIR/invalid.rs:91:19
-   |
-91 |     #[pin_project(Replace)] //~ ERROR `Replace` argument was removed, use `project_replace` argument instead
-   |                   ^^^^^^^
-
-error: expected identifier
-  --> $DIR/invalid.rs:94:31
-   |
-94 |     #[pin_project(UnsafeUnpin,,)] //~ ERROR expected identifier
-   |                               ^
-
-error: unexpected argument: Foo
-  --> $DIR/invalid.rs:97:19
-   |
-97 |     #[pin_project(Foo)] //~ ERROR unexpected argument
-   |                   ^^^
-
-error: expected identifier
-   --> $DIR/invalid.rs:100:19
-    |
-100 |     #[pin_project(,UnsafeUnpin)] //~ ERROR expected identifier
-    |                   ^
-
-error: expected `,`
-   --> $DIR/invalid.rs:106:30
-    |
-106 |     #[pin_project(PinnedDrop PinnedDrop)] //~ ERROR expected `,`
-    |                              ^^^^^^^^^^
-
-error: duplicate `PinnedDrop` argument
-   --> $DIR/invalid.rs:109:31
-    |
-109 |     #[pin_project(PinnedDrop, PinnedDrop)] //~ ERROR duplicate `PinnedDrop` argument
-    |                               ^^^^^^^^^^
-
-error: duplicate `UnsafeUnpin` argument
-   --> $DIR/invalid.rs:112:32
-    |
-112 |     #[pin_project(UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
-    |                                ^^^^^^^^^^^
-
-error: duplicate `!Unpin` argument
-   --> $DIR/invalid.rs:115:27
-    |
-115 |     #[pin_project(!Unpin, !Unpin)] //~ ERROR duplicate `!Unpin` argument
-    |                           ^^^^^^
-
-error: duplicate `UnsafeUnpin` argument
-   --> $DIR/invalid.rs:118:44
-    |
-118 |     #[pin_project(PinnedDrop, UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
-    |                                            ^^^^^^^^^^^
-
-error: duplicate `PinnedDrop` argument
-   --> $DIR/invalid.rs:121:44
-    |
-121 |     #[pin_project(PinnedDrop, UnsafeUnpin, PinnedDrop, UnsafeUnpin)] //~ ERROR duplicate `PinnedDrop` argument
-    |                                            ^^^^^^^^^^
-
-error: duplicate `project` argument
-   --> $DIR/invalid.rs:124:32
-    |
-124 |     #[pin_project(project = A, project = B)] //~ ERROR duplicate `project` argument
-    |                                ^^^^^^^^^^^
-
-error: duplicate `project` argument
-   --> $DIR/invalid.rs:127:49
-    |
-127 |     #[pin_project(project = A, project_ref = A, project = B)] //~ ERROR duplicate `project` argument
-    |                                                 ^^^^^^^^^^^
-
-error: duplicate `project_ref` argument
-   --> $DIR/invalid.rs:130:36
-    |
-130 |     #[pin_project(project_ref = A, project_ref = B)] //~ ERROR duplicate `project_ref` argument
-    |                                    ^^^^^^^^^^^^^^^
-
-error: duplicate `project_replace` argument
-   --> $DIR/invalid.rs:133:40
-    |
-133 |     #[pin_project(project_replace = A, project_replace = B)] //~ ERROR duplicate `project_replace` argument
-    |                                        ^^^^^^^^^^^^^^^^^^^
-
-error: duplicate `project_replace` argument
-   --> $DIR/invalid.rs:136:36
-    |
-136 |     #[pin_project(project_replace, project_replace = B)] //~ ERROR duplicate `project_replace` argument
-    |                                    ^^^^^^^^^^^^^^^^^^^
-
-error: duplicate `project_replace` argument
-   --> $DIR/invalid.rs:139:40
-    |
-139 |     #[pin_project(project_replace = A, project_replace)] //~ ERROR duplicate `project_replace` argument
-    |                                        ^^^^^^^^^^^^^^^
-
-error: arguments `PinnedDrop` and `project_replace` are mutually exclusive
-   --> $DIR/invalid.rs:145:19
-    |
-145 |     #[pin_project(PinnedDrop, project_replace)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
-    |                   ^^^^^^^^^^
-
-error: arguments `PinnedDrop` and `project_replace` are mutually exclusive
-   --> $DIR/invalid.rs:148:49
-    |
-148 |     #[pin_project(project_replace, UnsafeUnpin, PinnedDrop)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
-    |                                                 ^^^^^^^^^^
-
-error: arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-   --> $DIR/invalid.rs:151:19
-    |
-151 |     #[pin_project(UnsafeUnpin, !Unpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-    |                   ^^^^^^^^^^^
-
-error: arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-   --> $DIR/invalid.rs:154:39
-    |
-154 |     #[pin_project(!Unpin, PinnedDrop, UnsafeUnpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-    |                                       ^^^^^^^^^^^
-
-error: expected `!Unpin`, found `!`
-   --> $DIR/invalid.rs:157:19
-    |
-157 |     #[pin_project(!)] //~ ERROR expected `!Unpin`, found `!`
-    |                   ^
-
-error: unexpected argument: Unpin
-   --> $DIR/invalid.rs:160:19
-    |
-160 |     #[pin_project(Unpin)] //~ ERROR unexpected argument
-    |                   ^^^^^
-
-error: expected `project = <identifier>`, found `project`
-   --> $DIR/invalid.rs:163:19
-    |
-163 |     #[pin_project(project)] //~ ERROR expected `project = <identifier>`, found `project`
-    |                   ^^^^^^^
-
-error: expected `project = <identifier>`, found `project =`
-   --> $DIR/invalid.rs:166:19
-    |
-166 |     #[pin_project(project = )] //~ ERROR expected `project = <identifier>`, found `project =`
-    |                   ^^^^^^^^^
-
-error: expected identifier
-   --> $DIR/invalid.rs:169:29
-    |
-169 |     #[pin_project(project = !)] //~ ERROR expected identifier
-    |                             ^
-
-error: expected `project_ref = <identifier>`, found `project_ref`
-   --> $DIR/invalid.rs:172:19
-    |
-172 |     #[pin_project(project_ref)] //~ ERROR expected `project_ref = <identifier>`, found `project_ref`
-    |                   ^^^^^^^^^^^
-
-error: expected `project_ref = <identifier>`, found `project_ref =`
-   --> $DIR/invalid.rs:175:19
-    |
-175 |     #[pin_project(project_ref = )] //~ ERROR expected `project_ref = <identifier>`, found `project_ref =`
-    |                   ^^^^^^^^^^^^^
-
-error: expected identifier
-   --> $DIR/invalid.rs:178:33
-    |
-178 |     #[pin_project(project_ref = !)] //~ ERROR expected identifier
-    |                                 ^
-
-error: expected `project_replace = <identifier>`, found `project_replace =`
-   --> $DIR/invalid.rs:184:19
-    |
-184 |     #[pin_project(project_replace = )] //~ ERROR expected `project_replace = <identifier>`, found `project_replace =`
-    |                   ^^^^^^^^^^^^^^^^^
-
-error: expected identifier
-   --> $DIR/invalid.rs:187:37
-    |
-187 |     #[pin_project(project_replace = !)] //~ ERROR expected identifier
-    |                                     ^
-
-error: `project_replace` argument requires a value when used on enums
-   --> $DIR/invalid.rs:190:19
-    |
-190 |     #[pin_project(project_replace)] //~ ERROR `project_replace` argument requires a value when used on enums
-    |                   ^^^^^^^^^^^^^^^
-
-error: name `OrigAndProj` is the same as the original type name
-   --> $DIR/invalid.rs:199:29
-    |
-199 |     #[pin_project(project = OrigAndProj)] //~ ERROR name `OrigAndProj` is the same as the original type name
-    |                             ^^^^^^^^^^^
-
-error: name `OrigAndProjRef` is the same as the original type name
-   --> $DIR/invalid.rs:202:33
-    |
-202 |     #[pin_project(project_ref = OrigAndProjRef)] //~ ERROR name `OrigAndProjRef` is the same as the original type name
-    |                                 ^^^^^^^^^^^^^^
-
-error: name `OrigAndProjOwn` is the same as the original type name
-   --> $DIR/invalid.rs:205:37
-    |
-205 |     #[pin_project(project_replace = OrigAndProjOwn)] //~ ERROR name `OrigAndProjOwn` is the same as the original type name
-    |                                     ^^^^^^^^^^^^^^
-
-error: name `A` is already specified by `project` argument
-   --> $DIR/invalid.rs:208:46
-    |
-208 |     #[pin_project(project = A, project_ref = A)] //~ ERROR name `A` is already specified by `project` argument
-    |                                              ^
-
-error: name `A` is already specified by `project` argument
-   --> $DIR/invalid.rs:211:50
-    |
-211 |     #[pin_project(project = A, project_replace = A)] //~ ERROR name `A` is already specified by `project` argument
-    |                                                  ^
-
-error: name `A` is already specified by `project_ref` argument
-   --> $DIR/invalid.rs:214:54
-    |
-214 |     #[pin_project(project_ref = A, project_replace = A)] //~ ERROR name `A` is already specified by `project_ref` argument
-    |                                                      ^
-
-error: duplicate #[pin_project] attribute
-   --> $DIR/invalid.rs:222:5
-    |
-222 |     #[pin_project] //~ ERROR duplicate #[pin_project] attribute
-    |     ^^^^^^^^^^^^^^
-
-error: #[pin_project] attribute may not be used on structs with zero fields
-   --> $DIR/invalid.rs:230:19
-    |
-230 |     struct Struct {} //~ ERROR may not be used on structs with zero fields
-    |                   ^^
-
-error: #[pin_project] attribute may not be used on structs with zero fields
-   --> $DIR/invalid.rs:233:23
-    |
-233 |     struct TupleStruct(); //~ ERROR may not be used on structs with zero fields
-    |                       ^^
-
-error: #[pin_project] attribute may not be used on structs with zero fields
-   --> $DIR/invalid.rs:236:12
-    |
-236 |     struct UnitStruct; //~ ERROR may not be used on structs with zero fields
-    |            ^^^^^^^^^^
-
-error: #[pin_project] attribute may not be used on enums without variants
-   --> $DIR/invalid.rs:239:20
-    |
-239 |     enum EnumEmpty {} //~ ERROR may not be used on enums without variants
-    |                    ^^
-
-error: #[pin_project] attribute may not be used on enums with discriminants
-   --> $DIR/invalid.rs:243:13
-    |
-243 |         V = 2, //~ ERROR may not be used on enums with discriminants
-    |             ^
-
-error: #[pin_project] attribute may not be used on enums with zero fields
-   --> $DIR/invalid.rs:248:9
-    |
-248 | /         Unit, //~ ERROR may not be used on enums with zero fields
-249 | |         Tuple(),
-250 | |         Struct {},
-    | |__________________^
-
-error: #[pin_project] attribute may only be used on structs or enums
-   --> $DIR/invalid.rs:254:5
-    |
-254 | /     union Union {
-255 | |         //~^ ERROR may only be used on structs or enums
-256 | |         f: (),
-257 | |     }
-    | |_____^
-
-error: #[pin_project] attribute may only be used on structs or enums
-   --> $DIR/invalid.rs:260:5
-    |
-260 |     impl Impl {} //~ ERROR may only be used on structs or enums
-    |     ^^^^^^^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> $DIR/invalid.rs:268:12
-    |
-268 |     #[repr(packed)]
-    |            ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> $DIR/invalid.rs:272:12
-    |
-272 |     #[repr(packed)]
-    |            ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> $DIR/invalid.rs:276:12
-    |
-276 |     #[repr(packed)]
-    |            ^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/overlapping_unpin_struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project]
-struct S<T> {
-    #[pin]
-    f: T,
-}
-
-struct __S {}
-
-impl Unpin for __S {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<S<PhantomPinned>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/overlapping_unpin_struct.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/overlapping_unpin_struct.rs:17:5
-   |
-14 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-17 |     is_unpin::<S<PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `_::__S<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `_::__S<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `S<PhantomPinned>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-enum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-enum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-enum.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-enum.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-use pin_project::pin_project;
-
-#[repr(packed)] //~ ERROR E0517
-enum E1 {
-    V(()),
-}
-
-#[pin_project]
-#[repr(packed)] //~ ERROR E0517
-enum E2 {
-    V(()),
-}
-
-#[repr(packed)] //~ ERROR E0517
-#[pin_project]
-enum E3 {
-    V(()),
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-enum.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-enum.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-enum.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-enum.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-error[E0517]: attribute should be applied to a struct or union
- --> $DIR/packed-enum.rs:3:8
-  |
-3 |   #[repr(packed)] //~ ERROR E0517
-  |          ^^^^^^
-4 | / enum E1 {
-5 | |     V(()),
-6 | | }
-  | |_- not a struct or union
-
-error[E0517]: attribute should be applied to a struct or union
-  --> $DIR/packed-enum.rs:9:8
-   |
-9  |   #[repr(packed)] //~ ERROR E0517
-   |          ^^^^^^
-10 | / enum E2 {
-11 | |     V(()),
-12 | | }
-   | |_- not a struct or union
-
-error[E0517]: attribute should be applied to a struct or union
-  --> $DIR/packed-enum.rs:14:8
-   |
-14 |   #[repr(packed)] //~ ERROR E0517
-   |          ^^^^^^
-15 |   #[pin_project]
-16 | / enum E3 {
-17 | |     V(()),
-18 | | }
-   | |_- not a struct or union
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-name-value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-name-value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-name-value.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-name-value.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-use pin_project::pin_project;
-
-#[repr(packed = "")] //~ ERROR E0552
-struct S1 {
-    f: (),
-}
-
-#[pin_project]
-#[repr(packed = "")] //~ ERROR E0552
-struct S2 {
-    f: (),
-}
-
-#[repr(packed = "")] //~ ERROR E0552
-#[pin_project]
-struct S3 {
-    f: (),
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-name-value.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-name-value.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-name-value.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed-name-value.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error[E0552]: unrecognized representation hint
- --> $DIR/packed-name-value.rs:3:8
-  |
-3 | #[repr(packed = "")] //~ ERROR E0552
-  |        ^^^^^^^^^^^
-
-error[E0552]: unrecognized representation hint
- --> $DIR/packed-name-value.rs:9:8
-  |
-9 | #[repr(packed = "")] //~ ERROR E0552
-  |        ^^^^^^^^^^^
-
-error[E0552]: unrecognized representation hint
-  --> $DIR/packed-name-value.rs:14:8
-   |
-14 | #[repr(packed = "")] //~ ERROR E0552
-   |        ^^^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project]
-#[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
-struct A {
-    #[pin]
-    f: u8,
-}
-
-// Test putting 'repr' before the 'pin_project' attribute
-#[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
-#[pin_project]
-struct B {
-    #[pin]
-    f: u8,
-}
-
-#[pin_project]
-#[repr(packed(2))] //~ ERROR may not be used on #[repr(packed)] types
-struct C {
-    #[pin]
-    f: u32,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-1.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-use auxiliary_macro::hidden_repr;
-use pin_project::{pin_project, pinned_drop, UnsafeUnpin};
-use std::pin::Pin;
-
-#[pin_project] //~ ERROR may not be used on #[repr(packed)] types
-#[hidden_repr(packed)]
-struct A {
-    #[pin]
-    f: u32,
-}
-
-#[pin_project(UnsafeUnpin)] //~ ERROR may not be used on #[repr(packed)] types
-#[hidden_repr(packed)]
-struct C {
-    #[pin]
-    f: u32,
-}
-
-unsafe impl UnsafeUnpin for C {}
-
-#[pin_project(PinnedDrop)] //~ ERROR may not be used on #[repr(packed)] types
-#[hidden_repr(packed)]
-struct D {
-    #[pin]
-    f: u32,
-}
-
-#[pinned_drop]
-impl PinnedDrop for D {
-    fn drop(self: Pin<&mut Self>) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-1.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> $DIR/packed_sneaky-1.rs:6:15
-  |
-6 | #[hidden_repr(packed)]
-  |               ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed_sneaky-1.rs:13:15
-   |
-13 | #[hidden_repr(packed)]
-   |               ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed_sneaky-1.rs:22:15
-   |
-22 | #[hidden_repr(packed)]
-   |               ^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-use auxiliary_macro::hidden_repr_macro;
-use pin_project::pin_project;
-
-hidden_repr_macro! { //~ ERROR may not be used on #[repr(packed)] types
-    #[pin_project]
-    struct B {
-        #[pin]
-        f: u32,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-2.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed_sneaky-2.rs:4:1
-   |
-4  | / hidden_repr_macro! { //~ ERROR may not be used on #[repr(packed)] types
-5  | |     #[pin_project]
-6  | |     struct B {
-7  | |         #[pin]
-8  | |         f: u32,
-9  | |     }
-10 | | }
-   | |_^
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-3.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-3.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-3.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-3.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-use auxiliary_macro::{hidden_repr_macro, HiddenRepr};
-use pin_project::pin_project;
-
-hidden_repr_macro! {} //~ ERROR expected item after attributes
-#[pin_project]
-struct S1 {
-    #[pin]
-    f: u32,
-}
-
-macro_rules! hidden_repr_macro2 {
-    () => {
-        #[repr(packed)] //~ ERROR expected item after attributes
-    };
-}
-
-hidden_repr_macro2! {}
-#[pin_project]
-struct S2 {
-    #[pin]
-    f: u32,
-}
-
-#[derive(HiddenRepr)] //~ ERROR expected item after attributes
-struct S3 {}
-#[pin_project]
-struct S4 {
-    #[pin]
-    f: u32,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed_sneaky-3.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-error: expected item after attributes
- --> $DIR/packed_sneaky-3.rs:4:1
-  |
-4 | hidden_repr_macro! {} //~ ERROR expected item after attributes
-  | ^^^^^^^^^^^^^^^^^^^^^
-
-error: expected item after attributes
-  --> $DIR/packed_sneaky-3.rs:13:9
-   |
-13 |         #[repr(packed)] //~ ERROR expected item after attributes
-   |         ^^^^^^^^^^^^^^^
-...
-17 | hidden_repr_macro2! {}
-   | ---------------------- in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected item after attributes
-  --> $DIR/packed_sneaky-3.rs:24:10
-   |
-24 | #[derive(HiddenRepr)] //~ ERROR expected item after attributes
-   |          ^^^^^^^^^^
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: proc-macro derive produced unparseable tokens
-  --> $DIR/packed_sneaky-3.rs:24:10
-   |
-24 | #[derive(HiddenRepr)] //~ ERROR expected item after attributes
-   |          ^^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/packed.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> $DIR/packed.rs:4:8
-  |
-4 | #[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
-  |        ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed.rs:11:8
-   |
-11 | #[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
-   |        ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed.rs:19:8
-   |
-19 | #[repr(packed(2))] //~ ERROR may not be used on #[repr(packed)] types
-   |        ^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/private_in_public-enum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/private_in_public-enum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/private_in_public-enum.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/private_in_public-enum.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-// Even if allows private_in_public, these are errors.
-
-#![allow(private_in_public)]
-
-pub enum PublicEnum {
-    V(PrivateEnum), //~ ERROR E0446
-}
-
-enum PrivateEnum {
-    V(u8),
-}
-
-mod foo {
-    pub(crate) enum CrateEnum {
-        V(PrivateEnum), //~ ERROR E0446
-    }
-
-    enum PrivateEnum {
-        V(u8),
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/private_in_public-enum.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/private_in_public-enum.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/private_in_public-enum.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/private_in_public-enum.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error[E0446]: private type `PrivateEnum` in public interface
- --> $DIR/private_in_public-enum.rs:6:7
-  |
-6 |     V(PrivateEnum), //~ ERROR E0446
-  |       ^^^^^^^^^^^ can't leak private type
-...
-9 | enum PrivateEnum {
-  | ---------------- `PrivateEnum` declared as private
-
-error[E0446]: private type `foo::PrivateEnum` in public interface
-  --> $DIR/private_in_public-enum.rs:15:11
-   |
-15 |         V(PrivateEnum), //~ ERROR E0446
-   |           ^^^^^^^^^^^ can't leak private type
-...
-18 |     enum PrivateEnum {
-   |     ---------------- `foo::PrivateEnum` declared as private
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#![feature(unsized_fn_params)]
-
-use pin_project::pin_project;
-
-#[pin_project(project_replace)] //~ ERROR E0277
-struct Struct<T: ?Sized> {
-    f: T,
-}
-
-#[pin_project(project_replace)] //~ ERROR E0277
-struct TupleStruct<T: ?Sized>(T);
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized_fn_params.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized_fn_params.rs:6:8
-  |
-6 | struct Struct<T: ?Sized> {
-  |        ^^^^^^^-^^^^^^^^^
-  |        |      |
-  |        |      this type parameter needs to be `Sized`
-  |        doesn't have a size known at compile-time
-  |
-  = note: required because it appears within the type `__StructProjectionOwned<T>`
-  = note: the return type of a function must have a statically known size
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-   --> $DIR/project_replace_unsized_fn_params.rs:7:5
-    |
-6   | struct Struct<T: ?Sized> {
-    |               - this type parameter needs to be `Sized`
-7   |     f: T,
-    |     ^ doesn't have a size known at compile-time
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized_fn_params.rs:5:1
-  |
-5 | #[pin_project(project_replace)] //~ ERROR E0277
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-6 | struct Struct<T: ?Sized> {
-  |               - this type parameter needs to be `Sized`
-  |
-  = note: required because it appears within the type `__StructProjectionOwned<T>`
-  = note: structs must have a statically known size to be initialized
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-  --> $DIR/project_replace_unsized_fn_params.rs:11:8
-   |
-11 | struct TupleStruct<T: ?Sized>(T);
-   |        ^^^^^^^^^^^^-^^^^^^^^^
-   |        |           |
-   |        |           this type parameter needs to be `Sized`
-   |        doesn't have a size known at compile-time
-   |
-   = note: required because it appears within the type `__TupleStructProjectionOwned<T>`
-   = note: the return type of a function must have a statically known size
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-   --> $DIR/project_replace_unsized_fn_params.rs:10:1
-    |
-10  | #[pin_project(project_replace)] //~ ERROR E0277
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-11  | struct TupleStruct<T: ?Sized>(T);
-    |                    - this type parameter needs to be `Sized`
-    |
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(project_replace)] //~ ERROR E0277
-struct Struct<T: ?Sized> {
-    f: T,
-}
-
-#[pin_project(project_replace)] //~ ERROR E0277
-struct TupleStruct<T: ?Sized>(T);
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/project_replace_unsized.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized.rs:3:15
-  |
-3 | #[pin_project(project_replace)] //~ ERROR E0277
-  |               ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-4 | struct Struct<T: ?Sized> {
-  |               - this type parameter needs to be `Sized`
-  |
-  = note: required because it appears within the type `Struct<T>`
-  = help: unsized fn params are gated as an unstable feature
-help: function arguments must have a statically known size, borrowed types always have a known size
-  |
-3 | #[pin_project(&project_replace)] //~ ERROR E0277
-  |               ^
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-   --> $DIR/project_replace_unsized.rs:5:5
-    |
-4   | struct Struct<T: ?Sized> {
-    |               - this type parameter needs to be `Sized`
-5   |     f: T,
-    |     ^ doesn't have a size known at compile-time
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized.rs:3:1
-  |
-3 | #[pin_project(project_replace)] //~ ERROR E0277
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-4 | struct Struct<T: ?Sized> {
-  |               - this type parameter needs to be `Sized`
-  |
-  = note: required because it appears within the type `__StructProjectionOwned<T>`
-  = note: structs must have a statically known size to be initialized
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized.rs:8:15
-  |
-8 | #[pin_project(project_replace)] //~ ERROR E0277
-  |               ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-9 | struct TupleStruct<T: ?Sized>(T);
-  |                    - this type parameter needs to be `Sized`
-  |
-  = note: required because it appears within the type `TupleStruct<T>`
-  = help: unsized fn params are gated as an unstable feature
-help: function arguments must have a statically known size, borrowed types always have a known size
-  |
-8 | #[pin_project(&project_replace)] //~ ERROR E0277
-  |               ^
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-   --> $DIR/project_replace_unsized.rs:8:1
-    |
-8   | #[pin_project(project_replace)] //~ ERROR E0277
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-9   | struct TupleStruct<T: ?Sized>(T);
-    |                    - this type parameter needs to be `Sized`
-    |
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized.rs:9:8
-  |
-9 | struct TupleStruct<T: ?Sized>(T);
-  |        ^^^^^^^^^^^ - this type parameter needs to be `Sized`
-  |        |
-  |        doesn't have a size known at compile-time
-  |
-  = note: all function arguments must have a statically known size
-  = help: unsized fn params are gated as an unstable feature
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-field.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-field.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-use auxiliary_macro::remove_attr;
-use pin_project::pin_project;
-use std::{marker::PhantomPinned, pin::Pin};
-
-fn is_unpin<T: Unpin>() {}
-
-#[pin_project]
-#[remove_attr(field_all)]
-struct A {
-    #[pin]
-    f: PhantomPinned,
-}
-
-#[remove_attr(field_all)]
-#[pin_project]
-struct B {
-    #[pin]
-    f: PhantomPinned,
-}
-
-fn main() {
-    is_unpin::<A>();
-    is_unpin::<B>();
-
-    let mut x = A { f: PhantomPinned };
-    let x = Pin::new(&mut x).project();
-    let _: Pin<&mut PhantomPinned> = x.f; //~ ERROR E0308
-
-    let mut x = B { f: PhantomPinned };
-    let x = Pin::new(&mut x).project();
-    let _: Pin<&mut PhantomPinned> = x.f; //~ ERROR E0308
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-field.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/remove-attr-from-field.rs:27:38
-   |
-27 |     let _: Pin<&mut PhantomPinned> = x.f; //~ ERROR E0308
-   |            -----------------------   ^^^ expected struct `Pin`, found `&mut PhantomPinned`
-   |            |
-   |            expected due to this
-   |
-   = note:         expected struct `Pin<&mut PhantomPinned>`
-           found mutable reference `&mut PhantomPinned`
-
-error[E0308]: mismatched types
-  --> $DIR/remove-attr-from-field.rs:31:38
-   |
-31 |     let _: Pin<&mut PhantomPinned> = x.f; //~ ERROR E0308
-   |            -----------------------   ^^^ expected struct `Pin`, found `&mut PhantomPinned`
-   |            |
-   |            expected due to this
-   |
-   = note:         expected struct `Pin<&mut PhantomPinned>`
-           found mutable reference `&mut PhantomPinned`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-use auxiliary_macro::remove_attr;
-use pin_project::pin_project;
-use std::{marker::PhantomPinned, pin::Pin};
-
-fn is_unpin<T: Unpin>() {}
-
-#[pin_project]
-#[remove_attr(struct_all)]
-struct A {
-    #[pin] //~ ERROR cannot find attribute `pin` in this scope
-    f: PhantomPinned,
-}
-
-#[remove_attr(struct_all)]
-#[pin_project]
-struct B {
-    #[pin] //~ ERROR cannot find attribute `pin` in this scope
-    f: PhantomPinned,
-}
-
-#[pin_project] //~ ERROR has been removed
-#[remove_attr(struct_pin)]
-struct C {
-    f: PhantomPinned,
-}
-
-#[remove_attr(struct_pin)]
-#[pin_project] // Ok
-struct D {
-    f: PhantomPinned,
-}
-
-fn main() {
-    is_unpin::<A>(); //~ ERROR E0277
-    is_unpin::<B>(); //~ ERROR E0277
-    is_unpin::<D>(); // Ok
-
-    let mut x = A { f: PhantomPinned };
-    let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-
-    let mut x = B { f: PhantomPinned };
-    let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-
-    let mut x = D { f: PhantomPinned };
-    let _ = Pin::new(&mut x).project(); //~ Ok
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/remove-attr-from-struct.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-error: #[pin_project] attribute has been removed
-  --> $DIR/remove-attr-from-struct.rs:21:1
-   |
-21 | #[pin_project] //~ ERROR has been removed
-   | ^^^^^^^^^^^^^^
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: cannot find attribute `pin` in this scope
-  --> $DIR/remove-attr-from-struct.rs:10:7
-   |
-10 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
-   |       ^^^
-
-error: cannot find attribute `pin` in this scope
-  --> $DIR/remove-attr-from-struct.rs:17:7
-   |
-17 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
-   |       ^^^
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/remove-attr-from-struct.rs:34:5
-   |
-5  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-34 |     is_unpin::<A>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^ within `A`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `A`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/remove-attr-from-struct.rs:35:5
-   |
-5  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-35 |     is_unpin::<B>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^ within `B`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `B`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/remove-attr-from-struct.rs:39:13
-   |
-39 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-   |             ^^^^^^^^ within `A`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `A`
-   = note: required by `Pin::<P>::new`
-
-error[E0599]: no method named `project` found for struct `Pin<&mut A>` in the current scope
-  --> $DIR/remove-attr-from-struct.rs:39:30
-   |
-39 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-   |                              ^^^^^^^ method not found in `Pin<&mut A>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/remove-attr-from-struct.rs:42:13
-   |
-42 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-   |             ^^^^^^^^ within `B`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `B`
-   = note: required by `Pin::<P>::new`
-
-error[E0599]: no method named `project` found for struct `Pin<&mut B>` in the current scope
-  --> $DIR/remove-attr-from-struct.rs:42:30
-   |
-42 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-   |                              ^^^^^^^ method not found in `Pin<&mut B>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/safe_packed_borrows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/safe_packed_borrows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/safe_packed_borrows.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/safe_packed_borrows.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#![forbid(safe_packed_borrows)]
-
-// Refs: https://github.com/rust-lang/rust/issues/46043
-
-#[repr(packed)]
-struct A {
-    f: u32,
-}
-
-#[repr(packed(2))]
-struct B {
-    f: u32,
-}
-
-fn main() {
-    let a = A { f: 1 };
-    &a.f; //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-
-    let b = B { f: 1 };
-    &b.f; //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/safe_packed_borrows.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-error: borrow of packed field is unsafe and requires unsafe function or block (error E0133)
-  --> $DIR/safe_packed_borrows.rs:17:5
-   |
-17 |     &a.f; //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-   |     ^^^^
-   |
-note: the lint level is defined here
-  --> $DIR/safe_packed_borrows.rs:1:11
-   |
-1  | #![forbid(safe_packed_borrows)]
-   |           ^^^^^^^^^^^^^^^^^^^
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
-   = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior
-
-error: borrow of packed field is unsafe and requires unsafe function or block (error E0133)
-  --> $DIR/safe_packed_borrows.rs:20:5
-   |
-20 |     &b.f; //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-   |     ^^^^
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
-   = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/unpin_sneaky.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/unpin_sneaky.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/unpin_sneaky.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/unpin_sneaky.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project]
-struct S {
-    #[pin]
-    f: u8,
-}
-
-impl Unpin for __S {} //~ ERROR E0412,E0321
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/unpin_sneaky.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/unpin_sneaky.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/unpin_sneaky.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/unpin_sneaky.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0412]: cannot find type `__S` in this scope
- --> $DIR/unpin_sneaky.rs:9:16
-  |
-9 | impl Unpin for __S {} //~ ERROR E0412,E0321
-  |                ^^^ not found in this scope
-
-error[E0321]: cross-crate traits with a default impl, like `Unpin`, can only be implemented for a struct/enum type, not `[type error]`
- --> $DIR/unpin_sneaky.rs:9:1
-  |
-9 | impl Unpin for __S {} //~ ERROR E0412,E0321
-  | ^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/visibility.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/visibility.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/visibility.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/visibility.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/// Only named projected types can be imported.
-/// See import_unnamed.rs for unnamed projected types.
-
-mod pub_ {
-    use pin_project::pin_project;
-
-    #[pin_project(project = DProj, project_ref = DProjRef)]
-    pub struct Default(());
-
-    #[pin_project(project = RProj, project_ref = RProjRef, project_replace = RProjOwn)]
-    pub struct Replace(());
-}
-pub mod pub_use {
-    #[rustfmt::skip]
-    pub use crate::pub_::DProj; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_::DProjRef; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_::RProj; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_::RProjOwn; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_::RProjRef; //~ ERROR E0365
-
-    // Confirm that the visibility of the original type is not changed.
-    pub use crate::pub_::{Default, Replace};
-}
-pub mod pub_use2 {
-    // Ok
-    #[allow(unused_imports)]
-    pub(crate) use crate::pub_::{DProj, DProjRef, RProj, RProjOwn, RProjRef};
-}
-
-mod pub_crate {
-    use pin_project::pin_project;
-
-    #[pin_project(project = DProj, project_ref = DProjRef)]
-    pub(crate) struct Default(());
-
-    #[pin_project(project = RProj, project_ref = RProjRef, project_replace = RProjOwn)]
-    pub(crate) struct Replace(());
-}
-pub mod pub_crate_use {
-    // Ok
-    #[allow(unused_imports)]
-    pub(crate) use crate::pub_crate::{DProj, DProjRef, RProj, RProjOwn, RProjRef};
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/visibility.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/visibility.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/visibility.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/pin_project/visibility.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-error[E0365]: `DProj` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:15:13
-   |
-15 |     pub use crate::pub_::DProj; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^ re-export of private `DProj`
-   |
-   = note: consider declaring type or module `DProj` with `pub`
-
-error[E0365]: `DProjRef` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:17:13
-   |
-17 |     pub use crate::pub_::DProjRef; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^ re-export of private `DProjRef`
-   |
-   = note: consider declaring type or module `DProjRef` with `pub`
-
-error[E0365]: `RProj` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:19:13
-   |
-19 |     pub use crate::pub_::RProj; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^ re-export of private `RProj`
-   |
-   = note: consider declaring type or module `RProj` with `pub`
-
-error[E0365]: `RProjOwn` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:21:13
-   |
-21 |     pub use crate::pub_::RProjOwn; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^ re-export of private `RProjOwn`
-   |
-   = note: consider declaring type or module `RProjOwn` with `pub`
-
-error[E0365]: `RProjRef` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:23:13
-   |
-23 |     pub use crate::pub_::RProjRef; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^ re-export of private `RProjRef`
-   |
-   = note: consider declaring type or module `RProjRef` with `pub`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unsafe_unpin/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(UnsafeUnpin)] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-
-#[pin_project(UnsafeUnpin)] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-impl<T, U> Unpin for Bar<T, U> {}
-
-#[pin_project(UnsafeUnpin)] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    f1: T,
-    f2: U,
-}
-
-impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unsafe_unpin/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`:
-  --> $DIR/conflict-unpin.rs:3:15
-   |
-3  | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
-   |               ^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-   | --------------------------------------------- first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `pin_project::UnsafeUnpin` for type `pin_project::__private::Wrapper<'_, Foo<_, _>>` in future versions
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`:
-  --> $DIR/conflict-unpin.rs:12:15
-   |
-12 | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
-   |               ^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-19 | impl<T, U> Unpin for Bar<T, U> {}
-   | ------------------------------ first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `pin_project::UnsafeUnpin` for type `pin_project::__private::Wrapper<'_, Bar<_, _>>` in future versions
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`:
-  --> $DIR/conflict-unpin.rs:21:15
-   |
-21 | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
-   |               ^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-28 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
-   | -------------------------------------------- first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `pin_project::UnsafeUnpin` for type `pin_project::__private::Wrapper<'_, Baz<_, _>>` in future versions
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// NB: If you change this test, change 'marker_trait_attr.rs' at the same time.
-
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project] //~ ERROR E0119
-struct Struct<T> {
-    #[pin]
-    f: T,
-}
-
-// unsound Unpin impl
-impl<T> Unpin for Struct<T> {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<PhantomPinned>>()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`:
-  --> $DIR/marker_trait_attr-feature-gate.rs:6:1
-   |
-6  | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
-...
-13 | impl<T> Unpin for Struct<T> {}
-   | --------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-// NB: If you change this test, change 'marker_trait_attr-feature-gate.rs' at the same time.
-
-// marker_trait_attr
-// Tracking issue: https://github.com/rust-lang/rust/issues/29864
-#![feature(marker_trait_attr)]
-
-// See https://github.com/taiki-e/pin-project/issues/105#issuecomment-535355974
-
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project] //~ ERROR E0119
-struct Struct<T> {
-    #[pin]
-    f: T,
-}
-
-// unsound Unpin impl
-impl<T> Unpin for Struct<T> {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<PhantomPinned>>()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/marker_trait_attr.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`:
-  --> $DIR/marker_trait_attr.rs:12:1
-   |
-12 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
-...
-19 | impl<T> Unpin for Struct<T> {}
-   | --------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// NB: If you change this test, change 'overlapping_marker_traits.rs' at the same time.
-
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project] //~ ERROR E0119
-struct Struct<T> {
-    #[pin]
-    f: T,
-}
-
-// unsound Unpin impl
-impl<T> Unpin for Struct<T> {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<PhantomPinned>>()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`:
-  --> $DIR/overlapping_marker_traits-feature-gate.rs:6:1
-   |
-6  | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
-...
-13 | impl<T> Unpin for Struct<T> {}
-   | --------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-// NB: If you change this test, change 'overlapping_marker_traits-feature-gate.rs' at the same time.
-
-// This feature could break the guarantee for Unpin provided by pin-project,
-// but was removed in https://github.com/rust-lang/rust/pull/68544 (nightly-2020-02-06).
-// Refs:
-// * https://github.com/rust-lang/rust/issues/29864#issuecomment-515780867.
-// * https://github.com/taiki-e/pin-project/issues/105
-
-// overlapping_marker_traits
-// Tracking issue: https://github.com/rust-lang/rust/issues/29864
-#![feature(overlapping_marker_traits)]
-
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project]
-struct Struct<T> {
-    #[pin]
-    f: T,
-}
-
-// unsound Unpin impl
-impl<T> Unpin for Struct<T> {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<PhantomPinned>>()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/overlapping_marker_traits.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-error[E0557]: feature has been removed
-  --> $DIR/overlapping_marker_traits.rs:11:12
-   |
-11 | #![feature(overlapping_marker_traits)]
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^ feature has been removed
-   |
-   = note: removed in favor of `#![feature(marker_trait_attr)]`
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`:
-  --> $DIR/overlapping_marker_traits.rs:16:1
-   |
-16 | #[pin_project]
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
-...
-23 | impl<T> Unpin for Struct<T> {}
-   | --------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# UI tests for unstable features
-
-These tests check how the guarantees and features provided by pin-project interact with unstable language features.
-
-The names of the files contained in this directory need to begin with the name of the feature.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-bug.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-bug.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-bug.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-bug.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-// NB: If you change this test, change 'trivial_bounds-feature-gate.rs' at the same time.
-
-// trivial_bounds
-// Tracking issue: https://github.com/rust-lang/rust/issues/48214
-#![feature(trivial_bounds)]
-
-mod phantom_pinned {
-    use std::marker::{PhantomData, PhantomPinned};
-
-    struct A(PhantomPinned);
-
-    // bug of trivial_bounds?
-    impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-
-    struct Wrapper<T>(T);
-
-    impl<T> Unpin for Wrapper<T> where T: Unpin {}
-
-    struct B(PhantomPinned);
-
-    impl Unpin for B where Wrapper<PhantomPinned>: Unpin {} // Ok
-
-    struct WrapperWithLifetime<'a, T>(PhantomData<&'a ()>, T);
-
-    impl<T> Unpin for WrapperWithLifetime<'_, T> where T: Unpin {}
-
-    struct C(PhantomPinned);
-
-    // Ok
-    impl<'a> Unpin for C where WrapperWithLifetime<'a, PhantomPinned>: Unpin {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-bug.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-bug.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-bug.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-bug.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-   --> $DIR/trivial_bounds-bug.rs:13:43
-    |
-13  |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-    |                                           ^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-// NB: If you change this test, change 'trivial_bounds.rs' at the same time.
-
-mod phantom_pinned {
-    use std::marker::{PhantomData, PhantomPinned};
-
-    struct A(PhantomPinned);
-
-    impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-
-    struct Wrapper<T>(T);
-
-    impl<T> Unpin for Wrapper<T> where T: Unpin {}
-
-    struct B(PhantomPinned);
-
-    impl Unpin for B where Wrapper<PhantomPinned>: Unpin {} //~ ERROR E0277
-
-    struct WrapperWithLifetime<'a, T>(PhantomData<&'a ()>, T);
-
-    impl<T> Unpin for WrapperWithLifetime<'_, T> where T: Unpin {}
-
-    struct C(PhantomPinned);
-
-    impl<'a> Unpin for C where WrapperWithLifetime<'a, PhantomPinned>: Unpin {} // Ok
-}
-
-mod inner {
-    use std::marker::{PhantomData, PhantomPinned};
-
-    struct Inner(PhantomPinned);
-
-    struct A(Inner);
-
-    impl Unpin for A where Inner: Unpin {} //~ ERROR E0277
-
-    struct Wrapper<T>(T);
-
-    impl<T> Unpin for Wrapper<T> where T: Unpin {}
-
-    struct B(Inner);
-
-    impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR E0277
-
-    struct WrapperWithLifetime<'a, T>(PhantomData<&'a ()>, T);
-
-    impl<T> Unpin for WrapperWithLifetime<'_, T> where T: Unpin {}
-
-    struct C(Inner);
-
-    impl<'a> Unpin for C where WrapperWithLifetime<'a, Inner>: Unpin {} // Ok
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
- --> $DIR/trivial_bounds-feature-gate.rs:8:5
-  |
-8 |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-  |
-  = help: see issue #48214
-  = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-   --> $DIR/trivial_bounds-feature-gate.rs:8:43
-    |
-8   |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-    |                                           ^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/trivial_bounds-feature-gate.rs:16:5
-   |
-16 |     impl Unpin for B where Wrapper<PhantomPinned>: Unpin {} //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because of the requirements on the impl of `Unpin` for `phantom_pinned::Wrapper<PhantomPinned>`
-   = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/trivial_bounds-feature-gate.rs:34:5
-   |
-34 |     impl Unpin for A where Inner: Unpin {} //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Inner`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Inner`
-   = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/trivial_bounds-feature-gate.rs:42:5
-   |
-42 |     impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Inner`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Inner`
-   = note: required because of the requirements on the impl of `Unpin` for `inner::Wrapper<Inner>`
-   = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-// NB: If you change this test, change 'trivial_bounds-feature-gate.rs' at the same time.
-
-// trivial_bounds
-// Tracking issue: https://github.com/rust-lang/rust/issues/48214
-#![feature(trivial_bounds)]
-#![deny(trivial_bounds)]
-
-use std::marker::{PhantomData, PhantomPinned};
-
-fn inner() {
-    struct Inner(PhantomPinned);
-
-    struct A(Inner);
-
-    impl Unpin for A where Inner: Unpin {} //~ ERROR std::marker::Unpin does not depend on any type or lifetime parameters
-
-    struct Wrapper<T>(T);
-
-    impl<T> Unpin for Wrapper<T> where T: Unpin {}
-
-    struct B(Inner);
-
-    impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR std::marker::Unpin does not depend on any type or lifetime parameters
-
-    struct WrapperWithLifetime<'a, T>(PhantomData<&'a ()>, T);
-
-    impl<T> Unpin for WrapperWithLifetime<'_, T> where T: Unpin {}
-
-    struct C(Inner);
-
-    impl<'a> Unpin for C where WrapperWithLifetime<'a, Inner>: Unpin {} // Ok
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/ui/unstable-features/trivial_bounds.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error: Trait bound Inner: Unpin does not depend on any type or lifetime parameters
-  --> $DIR/trivial_bounds.rs:15:35
-   |
-15 |     impl Unpin for A where Inner: Unpin {} //~ ERROR std::marker::Unpin does not depend on any type or lifetime parameters
-   |                                   ^^^^^
-   |
-note: the lint level is defined here
-  --> $DIR/trivial_bounds.rs:6:9
-   |
-6  | #![deny(trivial_bounds)]
-   |         ^^^^^^^^^^^^^^
-
-error: Trait bound Wrapper<Inner>: Unpin does not depend on any type or lifetime parameters
-  --> $DIR/trivial_bounds.rs:23:44
-   |
-23 |     impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR std::marker::Unpin does not depend on any type or lifetime parameters
-   |                                            ^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/unsafe_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/unsafe_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project/tests/unsafe_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project/tests/unsafe_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-#[macro_use]
-mod auxiliary;
-
-use pin_project::{pin_project, UnsafeUnpin};
-use std::marker::PhantomPinned;
-
-#[pin_project(UnsafeUnpin)]
-pub struct Blah<T, U> {
-    f1: U,
-    #[pin]
-    f2: T,
-}
-
-unsafe impl<T: Unpin, U> UnsafeUnpin for Blah<T, U> {}
-
-assert_unpin!(Blah<(), ()>);
-assert_unpin!(Blah<(), PhantomPinned>);
-assert_not_unpin!(Blah<PhantomPinned, ()>);
-assert_not_unpin!(Blah<PhantomPinned, PhantomPinned>);
-
-#[pin_project(UnsafeUnpin)]
-struct OverlappingLifetimeNames<'pin, T, U> {
-    #[pin]
-    f1: U,
-    #[pin]
-    f2: Option<T>,
-    f3: &'pin (),
-}
-
-unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for OverlappingLifetimeNames<'_, T, U> {}
-
-assert_unpin!(OverlappingLifetimeNames<'_, (), ()>);
-assert_not_unpin!(OverlappingLifetimeNames<'_, PhantomPinned, ()>);
-assert_not_unpin!(OverlappingLifetimeNames<'_, (), PhantomPinned>);
-assert_not_unpin!(OverlappingLifetimeNames<'_, PhantomPinned, PhantomPinned>);
-
-#[test]
-fn trivial_bounds() {
-    #[pin_project(UnsafeUnpin)]
-    pub struct NotImplementUnsafUnpin {
-        #[pin]
-        f: PhantomPinned,
-    }
-
-    assert_not_unpin!(NotImplementUnsafUnpin);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"ab8dd96a1e395cde68659b15cd68b2ad16ff56439b88b8c647cdd52111731fe4","Cargo.lock":"5893039c9aa92723089693c96d67dcd1a7be926c5ae62cb188d19002c48145a2","Cargo.toml":"0d2c844e36f68f447a7df3259000e176191c26c2bce7aae080fbeb969e116af6","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"18eac0021ee384fa8f377583887ba5da3ffe5255e8b9539dde8933aa555c6aa4","ci.sh":"679bd2fc961d7f8d4231d02693d3ad0054de3908631c3b560222b9d9183a504e","ci/check-minimal-versions.sh":"ee6a148c0622e4faf31476d6380cbdeb7a97dc0b641ec7f2bea9084ff5540349","ci/install-component.sh":"7c2f2358ba1680d580d3efc1b44f6c2a8fdd983986e944498532e6f209940015","ci/install-rust.sh":"bc48e6c8502f6ec698be8332b288155deab106a0372550ef8fcf887620b11736","examples/README.md":"86f688e188b258f706e9344b31d28bcf15e22e130acd84bb7af7201fb62e16f7","examples/enum-default-expanded.rs":"b0b334914c4a8f6edf8f84fbfcad2fca263d6842c8c614a8f1d9c521e90f6096","examples/enum-default.rs":"01e1d285ffbb87aa70950c0ec184b395f7faf0667a1fc874b4de509e3e3c8d5c","examples/not_unpin-expanded.rs":"c3ad624b7806541ece215ded09f7092a1ea9fb3cb4ab4186bdda79647fe4ff3f","examples/not_unpin.rs":"3e43439c521089f7f58a411fb823827433c7476a0b41aecd26a6ce5f0c99e405","examples/pinned_drop-expanded.rs":"d21b88cbd0be7f542bc343c7e4c59290b9300247dc9d74637ebd85850c57d01d","examples/pinned_drop.rs":"afdbbbf5f8890bb5f8659362e1ab2e0a3b997e415b686b9f79084bfaa57be9cc","examples/project_replace-expanded.rs":"4bd42ec8db75a284a29f0794d993cdfd31d9bf4f8cbcefb68d86762a07885c69","examples/project_replace.rs":"352d10d7a2db3de0101faedd04d69c24b9bb5021c768199a379c233886a3881c","examples/struct-default-expanded.rs":"2eb1e4ba229858ca956c970e77a8d9b627854ebcf7fff9d1f42e1edbfab434cc","examples/struct-default.rs":"eb60ea5412e83ac9eba96794b31772afe0798bef304b26bff65b6845638bb729","examples/unsafe_unpin-expanded.rs":"734502878f3eddbfa79a93a0fb49ea7ce726d1c7bc249a96ec4fb111c49eb72e","examples/unsafe_unpin.rs":"7da585f423999dcbe03289a72b14a29fed41a45a774de1af2fe93cb20aa8d426","rustfmt.toml":"fea1141ea1c38770e1233b46690325408c54e586dde02a4986f8a756ef3162ed","src/lib.rs":"e35f308ff211a87e3acedd6d64b90da277d3063106ef742baae7b6f9f0157739","tests/cfg.rs":"53e694786bf6937f59fa8324fb487d9303832bc7bf89764b59796841f1a25912","tests/compiletest.rs":"0bd788b5e52bd2778ba817292e1ba6174f74e779eb87489788ca5f5ee1a433e7","tests/drop_order.rs":"b0a05ca358f67b1bc8a08632ba4ee088a24019e703267550387eec556c259427","tests/include/basic-safe-part.rs":"dc7ae2a983e05028e55b6b00eba7490399991bec304762477b433bf59f06296a","tests/include/basic.rs":"855d9cc4657be080337c07f8bb5f82747a72a22e63e1103b00914a4448937970","tests/lint.rs":"ce188dacd4fbd5d9ebb3e16f23962a32eb0b26e2e6eccf58588b3ec03b3d4406","tests/pin_project.rs":"9e4c0ee0e739e21ec8af738e86cddf03bb7f5a96a42f93f33422792e2ebc2714","tests/pinned_drop.rs":"389730ed589a2f9657df152fdaf8d7012f0da925015712e06b36b1e425b97356","tests/project.rs":"b7b83b353c55e8cb0496f900e98feac9d63009c92589752b3be9bcb056e9b336","tests/project_if_attr.rs.in":"2030a358cbd6c722c173c84615ce07087cf67d9ab85cbff19fb2d36789acea56","tests/project_ref.rs":"91e89963d9d62f4b9794f33b04b1ec33b771110722fc559cbd9f151555f4e6a9","tests/project_replace.rs":"5ebd8e5f4a35bde0da8b81b5f979122bea8b8a2e2491cf840f9e6d9cb2e78d19","tests/repr_packed.rs":"c3c5f4de63cb78a5dc8ba012b8cd1c65fc2a92e8c5d9bae8169422c600f28ea8","tests/sized.rs":"d976a125da3691805383b32aaac9153145250bd0d013f3e9aad16faa5c7a604c","tests/ui/cfg/cfg_attr-resolve.rs":"f0807b6db56e2842d87cf694f929fd6695addf1ac4e8ce5fb83552447e1cb58d","tests/ui/cfg/cfg_attr-resolve.stderr":"b247cbcb9d02d99368ca708650d5d08d2c2beaf5817499e52d59fbb8be85f144","tests/ui/cfg/cfg_attr-type-mismatch.rs":"ef82a8dc600bad0fe861419119145d8f117cbe6ddbdbc5338dad8b7182756a2c","tests/ui/cfg/cfg_attr-type-mismatch.stderr":"2e6dc422f4c66a8370fb41dfcef9ae1445dfbf17089839b007d8d2f4ef1f36d3","tests/ui/cfg/cfg_attr-unpin.rs":"02cd72d7b6a9e08e85ec8cf3a325d773422c5ebe712213dc0907544d9976711e","tests/ui/cfg/cfg_attr-unpin.stderr":"7fc0b62d45e742ea9edcac6621421b457b6e97badf68bdfc8f1a28404cd7ee42","tests/ui/cfg/packed_sneaky-span-issue-1.rs":"22688e4dacaed9437d9fbcd18c2044a8f037bf77bd0bdf498a5118bda99813a7","tests/ui/cfg/packed_sneaky-span-issue-1.stderr":"2ee9dc9dd375b95f3d0440c8cfe4b3dae348f1a63973e5819e741b97faa034ae","tests/ui/cfg/packed_sneaky-span-issue-2.rs":"42d00141ddc12f6e7f7c779f51157cd8154c11f8eff54d53a9d93391c4caf51b","tests/ui/cfg/packed_sneaky-span-issue-2.stderr":"2ee9dc9dd375b95f3d0440c8cfe4b3dae348f1a63973e5819e741b97faa034ae","tests/ui/cfg/packed_sneaky.rs":"ebd6d5ccc813ad3939f25a20008ee97201db1d4dc6808461e98e46f2c83f56c3","tests/ui/cfg/packed_sneaky.stderr":"e1a1004b1ba981fcf7ffe984496db3c898c48653fc0af8a15f2ebb118424229b","tests/ui/cfg/proper_unpin.rs":"3e6ddbe86e8ee2c4366f83ce7ef89428bba73b2bb1b8ede166b1ce3bb1e88696","tests/ui/cfg/proper_unpin.stderr":"e913a77424b810de7af1f2aaef9224d11f2094cc9aace2459640a1fdf0a4f5be","tests/ui/cfg/unsupported.rs":"b774675e0cee115c5e64ddd59008671de313d15b3b14de825f904bd25e1c3dea","tests/ui/cfg/unsupported.stderr":"d00396874289996e80a7a11e4df9e0adbcf0de52c8ef9c19cfd27cebdc7ba278","tests/ui/not_unpin/assert-not-unpin.rs":"5b2f25d54a869eaf5840755c05cb2c74a1c12ca0470db1264442f6933185a2ad","tests/ui/not_unpin/assert-not-unpin.stderr":"590febacef1b855ad5a484ce147a5108c63f0cc5003f27bbeab921b48b9bb235","tests/ui/not_unpin/conflict-unpin.rs":"e83eaaa14879ed2cbfe64a81bb9da752d9cb90003f6f4f39195767f3edbc3aaf","tests/ui/not_unpin/conflict-unpin.stderr":"10fc857f512f96094f692b1e77b70fa4572813615e6c1fba3bbef1ea90b0d209","tests/ui/not_unpin/impl-unsafe-unpin.rs":"5da7d3f5e5ee95e18040b9a524515ec1af0e8b2fd78c017bf32e60d17e92234e","tests/ui/not_unpin/impl-unsafe-unpin.stderr":"06fe05c9add993d99bcc0861fa883f07b91ad24ea2d1197d82577167454cf524","tests/ui/pin_project/add-attr-to-struct.rs":"46db75d07e8e66078062fe9976f1341a82b5daac05cee04485970c23ce1ef4e5","tests/ui/pin_project/add-attr-to-struct.stderr":"b23f7f2e477eb2357cb42b6ec00b8f2369233af931f3d2a8c7ea0f95d20dadbe","tests/ui/pin_project/add-pinned-field.rs":"8b55ad123ed35191b988341e4747a2aa3ae115db307ff0bb3aecceff013aa710","tests/ui/pin_project/add-pinned-field.stderr":"bc0187f0238bb610d387e99b9e18e8cab80976a89bf5e03f4022be40aa7df7cf","tests/ui/pin_project/conflict-drop.rs":"93137ac53f3114038550037b304ee97c8f0e01c6f517bfdec32f9be867c5533b","tests/ui/pin_project/conflict-drop.stderr":"9391babf5065f0f19e386625426b55f7583c64c1acd9a1153421d94458106988","tests/ui/pin_project/conflict-unpin.rs":"56d8f0eb22d547f5f9954bd37ca31c5b58b9d60bc5dc5b8c70f7d73cf8844649","tests/ui/pin_project/conflict-unpin.stderr":"3aed74d6895be645c3c81cdfc5f9a6ebfe3e7fa92713998b1a5dadf9b26c9709","tests/ui/pin_project/impl-unsafe-unpin.rs":"0b8a032993740be80ba1510b21f0c664e9776421395707712dee12fbfc637efb","tests/ui/pin_project/impl-unsafe-unpin.stderr":"7cc101828f7c344d6b04118e832822e31fef95b57803f5c6a317d57f92030d10","tests/ui/pin_project/invalid.rs":"9ebc49e9038cc09ea92091cc7897b131b294520941d9b4eef47ccebe3243651d","tests/ui/pin_project/invalid.stderr":"fbb2c6e1306c242744a22beb95a25ecc68aab2ec2a868f4a76e12858ec25fd94","tests/ui/pin_project/overlapping_unpin_struct.rs":"d563525d945e970841002cc1f93822f50cfb9c81586363e2038a9aabf0a66ad3","tests/ui/pin_project/overlapping_unpin_struct.stderr":"99c6928adc63964a5e3a7e45690641a44351c090414d7a32f44132b4c18cf138","tests/ui/pin_project/packed-enum.rs":"31739a04fab97a3300c50ccefd5ddce7b8e200fab0e48fb7160fb8a54c0365da","tests/ui/pin_project/packed-enum.stderr":"6e036e21205ea9c74fb085948e074729f6b0f7f214b9418e1f452fed4609cc99","tests/ui/pin_project/packed-name-value.rs":"cb0b6043326074d49398f091215fd7e69202e0d7a132539aec0e302d59b99237","tests/ui/pin_project/packed-name-value.stderr":"1bd4384e9dae41d1c8a7cc017049e73d42a363c290eeedf51a129b0d75adff7d","tests/ui/pin_project/packed.rs":"279fe7005a0a69bbafd2adc1d4b1e444c0e7dd284e101d0986190039bbb05017","tests/ui/pin_project/packed.stderr":"e71e8148eeb4ffe4d8e8fce0ab8d33da0bf7de993a64df0977bb473413773b62","tests/ui/pin_project/packed_sneaky-1.rs":"96a01014669ccff0f4ea68c1695b885bdb4ebda88084396d15485534864255d6","tests/ui/pin_project/packed_sneaky-1.stderr":"ac490bd0b67b3740e9bac68115c07826ee9b6e6b99b35f9374f8ee7c6dfef7a8","tests/ui/pin_project/packed_sneaky-2.rs":"72d32a127f4e1430e7f964b574f224baf1a65aa7794cb9a6dd3d4d6669af4a12","tests/ui/pin_project/packed_sneaky-2.stderr":"7d9a3be663ed010b2d510c0d5a5a719df282630362786d73832c90276417b140","tests/ui/pin_project/private_in_public-enum.rs":"6c882b9c77773fe47ec083bfeff9624267b1efa1ef38438806c3fb9073c6c1a9","tests/ui/pin_project/private_in_public-enum.stderr":"9cf96fef5673037a3f47c9a232d9f375038654d5d76d2218da8ae58f03d81ebb","tests/ui/pin_project/project_replace_unsized.rs":"96b7ba5a511cac1fc94a942bbe0c922c9647584b7323f78b54f13f73047d8c7a","tests/ui/pin_project/project_replace_unsized.stderr":"6036d7cede1d4c09a175c52775e902c705b1c701ee0f95a3f498913b77ca5b04","tests/ui/pin_project/project_replace_unsized_locals.rs":"e1789fada8a5adbcb000d5400eb78d70836a7641abc3958d8edef577c8363840","tests/ui/pin_project/project_replace_unsized_locals.stderr":"2be1ead77e74e55f22f791f7fe183ffb4bfa8202f66a6eaec983c0c39fd21ccf","tests/ui/pin_project/proper_unpin.rs":"8a5d0990f2f300f8cd33d93da93340e2a73a3e277d780865a9c8f018f19d25f5","tests/ui/pin_project/proper_unpin.stderr":"0560d798ebddd44e41978b57fec33fcf1abf3ed23c525fd2a1da06a7a8eceec7","tests/ui/pin_project/remove-attr-from-field.rs":"2334cb1658ec4ecec34f9dea8bc47e1653436b08213291a57b436e111312eafc","tests/ui/pin_project/remove-attr-from-field.stderr":"1b8ebd6d32ebdfc9c6823173dce28e426783d47b381195151a86b5725bd353bb","tests/ui/pin_project/remove-attr-from-struct.rs":"567deece4945ebad3f3e667ce0290e040649bfa2987f71769006cb8e13b39e4d","tests/ui/pin_project/remove-attr-from-struct.stderr":"11a335913e84690d6ea9f5be59f378f548513dfe558f5dfe38aea92d216f2985","tests/ui/pin_project/safe_packed_borrows.rs":"b4da17f8c54d410150ffb57adef4d53012fd4018e10b572ff18bf262b93e31a7","tests/ui/pin_project/safe_packed_borrows.stderr":"e3e678e312422239bb6b3796f05be1d3ef67e04db39ee4b1318a7a1ea73d2988","tests/ui/pin_project/unpin_sneaky.rs":"7920d4e05142a0277bd9daeb40457586ec3be27372d797087aa9b693607efacd","tests/ui/pin_project/unpin_sneaky.stderr":"2325012761dad731f29453b7eaf6055c3041b92c36ab2eef0e9b989967d90156","tests/ui/pin_project/visibility.rs":"6f5ba3342d500623d81cb719135b7f8c15f7927d7d31c71bb506c1bd97e646f4","tests/ui/pin_project/visibility.stderr":"d51bcf8916b49916e6e9576850bcc679c7b9b26efcaf1a4c56380c0ac95555bd","tests/ui/pinned_drop/call-drop-inner.rs":"4ae96a18e16a1fe81132a2f5ed9a4a3c4ccda686b5b523bb061d0691559c84a0","tests/ui/pinned_drop/call-drop-inner.stderr":"dc6d61c0f16f2d5354e48bfb7a5ce7162e496fae7e80d919e99f3433f467f742","tests/ui/pinned_drop/conditional-drop-impl.rs":"c0d1633612f652d659d90fed585db7f95af6b3f09150a6d548ea247677c4537c","tests/ui/pinned_drop/conditional-drop-impl.stderr":"b01063e54a9e8336d308756a7c3f0b649a6292c34c118582845e04abe1613a2c","tests/ui/pinned_drop/forget-pinned-drop-impl.rs":"329ceecba3e51ead54aeb66d48553e988a00475c37d71c9c72c9a09094199131","tests/ui/pinned_drop/forget-pinned-drop-impl.stderr":"86703f23de25249998d540bbf09110b013ffe255631a5d7486a9861ec44f8a46","tests/ui/pinned_drop/invalid-self.rs":"77f671353e055f3673a4a864d99dafe2930a4d62c90454ab550427c4c062355f","tests/ui/pinned_drop/invalid-self.stderr":"c00cb19f737eed58a9b21624352d421a30d88af6af9965a95d2fd7c8d7f538a0","tests/ui/pinned_drop/invalid.rs":"e1ca69decc33bb26c971718e6c9a6cafd89d6644f41086879b27c034161de3c4","tests/ui/pinned_drop/invalid.stderr":"e743d00453f14bb7846b0f442ec189d58ab26c6284cd27cb7fe997ce630b31cb","tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs":"6097441094e69ae18887171c8528900ae018707d3cfa03e2d3dc13fd06c58837","tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr":"af119418b4a88f62d538e248313596b0c528ceedaf79b94f99207f00860a634d","tests/ui/pinned_drop/self.rs":"fcbea30041edafeb21aa18760aad87db38cda611ad936175fe164a164c771a92","tests/ui/pinned_drop/self.stderr":"b0abcc97f0eae9371c031a8fed0a5a6e9db768ef094d651a6b5755b09ada297c","tests/ui/pinned_drop/unsafe-call.rs":"1b23d07e843c9324c85472482ab3301af7d99c425cd275f2abfbeb5838281403","tests/ui/pinned_drop/unsafe-call.stderr":"08919a4a8ad8c4cd77b7825afcec63102711f4b218a7126644dba421ff9bf0b3","tests/ui/project/ambiguous-let.rs":"17fdbc0edf5156653ee4fb7687aab49457bd4e6bd20d98e30506fdd292dfb672","tests/ui/project/ambiguous-let.stderr":"9bc39a7da2a9a0a4e5d5731033c3a47ad9201085b1477d95ca64b66777ca2ef6","tests/ui/project/deprecated.rs":"afa0585ca3296572c10a2fdbb7ff8ae532311ed4384712886d6e9465281b546e","tests/ui/project/deprecated.stderr":"30a64fe74b20bf7472c531897c6859345950ceda82269f857ee78594edbc0e5b","tests/ui/project/invalid.rs":"72f196c25eda76828ef9f1217e786c019a831e9ca71f7d9292dde77171d83ae4","tests/ui/project/invalid.stderr":"4a2da80aad0882542f631ac1f31f002ebf102a4440be630847081cb1f486d715","tests/ui/project/type-mismatch.rs":"bea9bded3e610d338248a197e6159b0ebecdebe4095601ddb3eef0a43bee327b","tests/ui/project/type-mismatch.stderr":"97df0b71112805a7fa170b14a409823c2b9da7113dea479f659981f3758738f2","tests/ui/project/use-public.rs":"43fa6391c3b3018950d9d0a6dee29e9484e3d37a690f4c36c2d424b545ff949d","tests/ui/project/use-public.stderr":"d91abfdeb1305ca5c8dcbe4001c92b6569a640fd3834624bf1e1039646c753e3","tests/ui/project/use.rs":"bd87883ff31fa949dca57d05bcc27373accee8ee2c437ce78f1d3b74b8a33218","tests/ui/project/use.stderr":"8df2ee80d85d06e0eaea0c85436f8be3e9e867d11bcf30531db9a311b2979416","tests/ui/unsafe_unpin/conflict-unpin.rs":"5752570223ddfa9aebdbb27d466e4440aef94b2795b144e0af4935acdbf5677d","tests/ui/unsafe_unpin/conflict-unpin.stderr":"b827aacd1cc6a8643286cc1fcafa5dd225bcd94388007131f9af46e3f786b572","tests/ui/unsafe_unpin/not-implement-unsafe-unpin.rs":"cc63daa89bae170521449219e3b5b964decdcb4f5e7180d4df84ccc0031c0170","tests/ui/unsafe_unpin/not-implement-unsafe-unpin.stderr":"0b27feeca14e4456e42f53beb03ffcfa32020d7492b635d2c273be2b44a21f11","tests/ui/unsafe_unpin/proper_unpin.rs":"86c99f092bd3118e36c17f637e4884e90c9a7406b0c092c092c6cd292d611749","tests/ui/unsafe_unpin/proper_unpin.stderr":"1db86686398caca78b86d90ea835737c86c6bfb94c256fe68df79066d9f3f511","tests/ui/unstable-features/README.md":"4d828aa223e725f5177513eb72fd0c9670f467aecdfbdd3d9758e35ab17f7daf","tests/ui/unstable-features/marker_trait_attr-feature-gate.rs":"e403718e5f23f6ffb6afbaee87c291b80392fcc4462ac874250dcc089e9147fd","tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr":"ac1c2a49f259bf9fc00bd279f76a2c51a7a318d0d51de829612722930b5c38b5","tests/ui/unstable-features/marker_trait_attr.rs":"f4a5aabb76983ac286f26fbf29127ead115700adcf4373b7e74f78e6162ff28c","tests/ui/unstable-features/marker_trait_attr.stderr":"94aa75cdcc28fb5c5c273040d24659686defb95f11223760c2c588b2c3c2a91c","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs":"59f36a4b4e91fd97367679fd5decac8d603fc91a970df22e3f4628a5a02151da","tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr":"d8858f24546c7bb6028e574c2c53aa616fe22f4283b9c3c49bf87bfcd5131ba1","tests/ui/unstable-features/overlapping_marker_traits.rs":"30b3192c9bee17542edc9e1ba50010e2ba62e5a3bfc7b58adf7d10876e4159e1","tests/ui/unstable-features/overlapping_marker_traits.stderr":"b5b8333503a83adb5dfdb7ea6d0b20e36748aebaee2f687c7c3786d547b9558f","tests/ui/unstable-features/run-pass/stmt_expr_attributes.rs":"86f941e6f8924c5fc5c7fc821f9335601139d4d3e8b6c923fbab5673f8749eb7","tests/ui/unstable-features/stmt_expr_attributes-feature-gate.rs":"01b9a6f8eae9686c1803008c97e341fd1e7e4922e3cf88861a0df7ca53296efb","tests/ui/unstable-features/stmt_expr_attributes-feature-gate.stderr":"86c48776911cdff420ddd35d02276cbcf857b533a1b40673492e55482fab5f05","tests/ui/unstable-features/trivial_bounds-bug.rs":"4bf901287da21c757da24961a2122076de61a9d79ac201fd7301eeb2632c2b92","tests/ui/unstable-features/trivial_bounds-bug.stderr":"05a87e0c068ab662a1c2de316e96b0e1f98256df662150f359f134b37199d411","tests/ui/unstable-features/trivial_bounds-feature-gate.rs":"3b73733424449390a4083dfe222c728fcf964316efe6aa9794db384ffdf35686","tests/ui/unstable-features/trivial_bounds-feature-gate.stderr":"3a6da59e24cb87af318f4d8f5db35328752f815735faa1c31606a9b0f848bb77","tests/ui/unstable-features/trivial_bounds.rs":"e2b69a22254d6d6c1e30189165a94f86d5cb92b383c5534f80a7b6974d12f2cb","tests/ui/unstable-features/trivial_bounds.stderr":"353a44176436ee663eee83582d79163ace5084a9afd7a6b7643e3119ef87f33e","tests/unsafe_unpin.rs":"a92518812ce634bc6eca62b3adb20115eaf4121cce44d462de1acd0bb701d1a7"},"package":"2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "pin-project"
-version = "0.4.27"
-dependencies = [
- "pin-project-auxiliary-macro",
- "pin-project-internal",
- "rustversion",
- "trybuild",
-]
-
-[[package]]
-name = "pin-project-auxiliary-macro"
-version = "0.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cfcdf156df4231bda3b27e3c59ea733a8e7725d71b4378ed3da1b4d44364ba"
-
-[[package]]
-name = "pin-project-internal"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "serde"
-version = "1.0.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "trybuild"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7d30fe369fd650072b352b1a9cb9587669de6b89be3b8225544012c1c45292d"
-dependencies = [
- "glob",
- "lazy_static",
- "serde",
- "serde_json",
- "termcolor",
- "toml",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "pin-project"
-version = "0.4.27"
-authors = ["Taiki Endo <te316e89@gmail.com>"]
-description = "A crate for safe and ergonomic pin-projection.\n"
-homepage = "https://github.com/taiki-e/pin-project"
-documentation = "https://docs.rs/pin-project"
-readme = "README.md"
-keywords = ["pin", "macros", "attribute"]
-categories = ["no-std", "rust-patterns"]
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/taiki-e/pin-project"
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-[dependencies.pin-project-internal]
-version = "=0.4.27"
-default-features = false
-[dev-dependencies.pin-project-auxiliary-macro]
-version = "0"
-
-[dev-dependencies.rustversion]
-version = "1.0"
-
-[dev-dependencies.trybuild]
-version = "1.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,635 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-This project adheres to [Semantic Versioning](https://semver.org).
-
-## [Unreleased]
-
-## [0.4.27] - 2020-10-11
-
-* Update minimal version of syn to 1.0.44
-
-## [0.4.26] - 2020-10-04
-
-* [Fix drop order of pinned fields in project_replace](https://github.com/taiki-e/pin-project/pull/287)
-
-## [0.4.25] - 2020-10-01
-
-* Suppress `drop_bounds` lint, which will be added to rustc in the future. See [#272](https://github.com/taiki-e/pin-project/issues/272) for more details.
-
-  (Note: 1.0.0-alpha.1 already contains this change.)
-
-## [0.4.24] - 2020-09-26
-
-* Fix compatibility of generated code with `forbid(future_incompatible)`
-
-  Note: This does not guarantee compatibility with `forbid(future_incompatible)` in the future.
-  If rustc adds a new lint, we may not be able to keep this.
-
-## [0.4.23] - 2020-07-27
-
-* [Fix compile error with `?Sized` type parameters.][263]
-
-[263]: https://github.com/taiki-e/pin-project/pull/263
-
-## [0.4.22] - 2020-06-14
-
-* Documentation improvements.
-
-## [0.4.21] - 2020-06-13
-
-* [Deprecated `#[project]`, `#[project_ref]`, and `#[project_replace]` attributes due to some unfixable limitations.][244]
-
-  Consider naming the projected type by passing an argument with the same name as the method to the #[pin_project] attribute instead.
-
-  ```rust
-  use pin_project::pin_project;
-  use std::pin::Pin;
-
-  #[pin_project(project = EnumProj)]
-  enum Enum<T> {
-      Variant(#[pin] T),
-  }
-
-  fn func<T>(x: Pin<&mut Enum<T>>) {
-      match x.project() {
-          EnumProj::Variant(y) => {
-              let _: Pin<&mut T> = y;
-          }
-      }
-  }
-  ```
-
-  See [#225][225] for more details.
-
-* [Support `Self` in fields and generics in type definitions.][245]
-
-* [Fix errors involving *"`self` value is a keyword only available in methods with `self` parameter"* in apparently correct code.][250]
-
-* Diagnostic improvements.
-
-[225]: https://github.com/taiki-e/pin-project/pull/225
-[244]: https://github.com/taiki-e/pin-project/pull/244
-[245]: https://github.com/taiki-e/pin-project/pull/245
-[250]: https://github.com/taiki-e/pin-project/pull/250
-
-## [0.4.20] - 2020-06-07
-
-* [You can now use project_replace argument without Replace argument.][243]
-  This used to require you to specify both.
-
-  ```diff
-  - #[pin_project(Replace, project_replace = EnumProjOwn)]
-  + #[pin_project(project_replace = EnumProjOwn)]
-    enum Enum<T> {
-        Variant(#[pin] T)
-    }
-  ```
-
-* [Makes `project_replace` argument an alias for `Replace` argument so that it can be used without a value.][243]
-
-  ```rust
-  #[pin_project(project_replace)]
-  enum Enum<T> {
-      Variant(#[pin] T)
-  }
-  ```
-
-  *The `Replace` argument will be deprecated in the future.*
-
-* Suppress `unreachable_pub` lint in generated code.
-
-[243]: https://github.com/taiki-e/pin-project/pull/243
-
-## [0.4.19] - 2020-06-04
-
-* [Fix `unused_results` lint in generated code.][239]
-
-[239]: https://github.com/taiki-e/pin-project/pull/239
-
-## [0.4.18] - 2020-06-04
-
-* [Support `Self` in more syntax positions inside `#[pinned_drop]` impl.][230]
-
-* [Suppress `clippy::type_repetition_in_bounds` and `clippy::used_underscore_binding` lints in generated code.][233]
-
-* Documentation improvements.
-
-* Diagnostic improvements.
-
-[230]: https://github.com/taiki-e/pin-project/pull/230
-[233]: https://github.com/taiki-e/pin-project/pull/233
-
-## [0.4.17] - 2020-05-18
-
-* [Support naming the projection types.][202]
-
-  By passing an argument with the same name as the method to the attribute, you can name the projection type returned from the method:
-
-  ```rust
-  use pin_project::pin_project;
-  use std::pin::Pin;
-
-  #[pin_project(project = EnumProj)]
-  enum Enum<T> {
-      Variant(#[pin] T),
-  }
-
-  fn func<T>(x: Pin<&mut Enum<T>>) {
-      match x.project() {
-          EnumProj::Variant(y) => {
-              let _: Pin<&mut T> = y;
-          }
-      }
-  }
-  ```
-
-[202]: https://github.com/taiki-e/pin-project/pull/202
-
-## [0.4.16] - 2020-05-11
-
-* [Fixed an issue that users can call internal function generated by `#[pinned_drop]`.][223]
-
-[223]: https://github.com/taiki-e/pin-project/pull/223
-
-## [0.4.15] - 2020-05-10
-
-* [`#[project]` attribute can now handle all project* attributes in that scope with one wrapper attribute.][220]
-
-[220]: https://github.com/taiki-e/pin-project/pull/220
-
-## [0.4.14] - 2020-05-09
-
-* [Added `!Unpin` option to `#[pin_project]` attribute for guarantee the type is `!Unpin`.][219]
-
-  ```rust
-  use pin_project::pin_project;
-  #[pin_project(!Unpin)]
-  struct Struct<T, U> {
-      field: T,
-  }
-  ```
-
-  This is equivalent to use `#[pin]` attribute for `PhantomPinned` field.
-
-  ```rust
-  use pin_project::pin_project;
-  use std::marker::PhantomPinned;
-  #[pin_project]
-  struct Struct<T, U> {
-      field: T,
-      #[pin] // Note that using `PhantomPinned` without `#[pin]` attribute has no effect.
-      _pin: PhantomPinned,
-  }
-  ```
-
-  *[Note: This raises the minimum supported Rust version of this crate from rustc 1.33 to rustc 1.34.](https://github.com/taiki-e/pin-project/pull/219#pullrequestreview-408644187)*
-
-* [Fixed an issue where duplicate `#[project]` attributes were ignored.][218]
-
-* [Suppress `single_use_lifetimes` lint in generated code.][217]
-
-* [Support overlapping lifetime names in HRTB.][217]
-
-* [Hide generated items from --document-private-items.][211] See [#211][211] for details.
-
-* Documentation improvements.
-
-[211]: https://github.com/taiki-e/pin-project/pull/211
-[217]: https://github.com/taiki-e/pin-project/pull/217
-[218]: https://github.com/taiki-e/pin-project/pull/218
-[219]: https://github.com/taiki-e/pin-project/pull/219
-
-## [0.4.13] - 2020-05-07
-
-* [Fixed a regression in 0.4.11.][207]
-
-  Changes from [0.4.10](https://github.com/taiki-e/pin-project/releases/tag/v0.4.10) and [0.4.12](https://github.com/taiki-e/pin-project/releases/tag/v0.4.12):
-
-  * [Fixed an issue that `#[project]` on non-statement expression does not work without unstable features.][197]
-
-  * [Support overwriting the name of core crate.][199]
-
-  * [Suppress `clippy::needless_pass_by_value` lint in generated code of `#[pinned_drop]`.][200]
-
-  * Documentation improvements.
-
-  * Diagnostic improvements.
-
-[207]: https://github.com/taiki-e/pin-project/pull/207
-
-## [0.4.12] - 2020-05-07
-
-* A release to avoid [a regression in 0.4.11][206]. No code changes from [0.4.10](https://github.com/taiki-e/pin-project/releases/tag/v0.4.10).
-
-[206]: https://github.com/taiki-e/pin-project/issues/206
-
-## [0.4.11] - 2020-05-07 - YANKED
-
-* [Fixed an issue that `#[project]` on non-statement expression does not work without unstable features.][197]
-
-* [Support overwriting the name of core crate.][199]
-
-* [Suppress `clippy::needless_pass_by_value` lint in generated code of `#[pinned_drop]`.][200]
-
-* Documentation improvements.
-
-* Diagnostic improvements.
-
-[197]: https://github.com/taiki-e/pin-project/pull/197
-[199]: https://github.com/taiki-e/pin-project/pull/199
-[200]: https://github.com/taiki-e/pin-project/pull/200
-
-## [0.4.10] - 2020-05-04
-
-* [Added `project_replace` method and `#[project_replace]` attribute.][194]
-  `project_replace` method is optional and can be enabled by passing the `Replace` argument to `#[pin_project]` attribute.
-  See [the documentation](https://docs.rs/pin-project/0.4/pin_project/attr.pin_project.html#project_replace) for more details.
-
-* [Support `Self` and `self` in more syntax positions inside `#[pinned_drop]` impl.][190]
-
-* [Hided all generated items except for projected types from calling code.][192] See [#192][192] for details.
-
-[190]: https://github.com/taiki-e/pin-project/pull/190
-[192]: https://github.com/taiki-e/pin-project/pull/192
-[194]: https://github.com/taiki-e/pin-project/pull/194
-
-## [0.4.9] - 2020-04-14
-
-* [Fixed lifetime inference error when associated types are used in fields.][188]
-
-* [Fixed compile error with tuple structs with `where` clauses.][186]
-
-* [`#[project]` attribute can now be used for `if let` expressions.][181]
-
-[181]: https://github.com/taiki-e/pin-project/pull/181
-[186]: https://github.com/taiki-e/pin-project/pull/186
-[188]: https://github.com/taiki-e/pin-project/pull/188
-
-## [0.4.8] - 2020-01-27
-
-* [Ensured that users cannot implement `PinnedDrop` without proper attribute argument.][180]
-
-* [Fixed use of `Self` in expression position inside `#[pinned_drop]` impl.][177]
-
-[177]: https://github.com/taiki-e/pin-project/pull/180
-[180]: https://github.com/taiki-e/pin-project/pull/180
-
-## [0.4.7] - 2020-01-20
-
-* [Fixed support for lifetime bounds.][176]
-
-[176]: https://github.com/taiki-e/pin-project/pull/176
-
-## [0.4.6] - 2019-11-20
-
-* [Fixed compile error when there is `Self` in the where clause.][169]
-
-[169]: https://github.com/taiki-e/pin-project/pull/169
-
-## [0.4.5] - 2019-10-21
-
-* [Fixed compile error with `dyn` types.][158]
-
-[158]: https://github.com/taiki-e/pin-project/pull/158
-
-## [0.4.4] - 2019-10-17
-
-* [Fixed an issue where `PinnedDrop` implementations can call unsafe code without an unsafe block.][149]
-
-[149]: https://github.com/taiki-e/pin-project/pull/149
-
-## [0.4.3] - 2019-10-15 - YANKED
-
-* [`#[pin_project]` can now interoperate with `#[cfg_attr()]`.][135]
-
-* [`#[pin_project]` can now interoperate with `#[cfg()]` on tuple structs and tuple variants.][135]
-
-* [Fixed support for DSTs(Dynamically Sized Types) on `#[pin_project(UnsafeUnpin)]`][120]
-
-* Diagnostic improvements.
-
-[120]: https://github.com/taiki-e/pin-project/pull/120
-[135]: https://github.com/taiki-e/pin-project/pull/135
-
-## [0.4.2] - 2019-09-29 - YANKED
-
-* [Fixed support for DSTs(Dynamically Sized Types).][113]
-
-[113]: https://github.com/taiki-e/pin-project/pull/113
-
-## [0.4.1] - 2019-09-26 - YANKED
-
-* [Fixed an issue that caused an error when using `#[pin_project]` on a type that has `#[pin]` + `!Unpin` field with no generics or lifetime.][111]
-
-[111]: https://github.com/taiki-e/pin-project/pull/111
-
-## [0.4.0] - 2019-09-25 - YANKED
-
-* [**Pin projection has become a safe operation.**][18] In the absence of other unsafe code that you write, it is impossible to cause undefined behavior.
-
-* `#[unsafe_project]` attribute has been replaced with `#[pin_project]` attribute. ([#18][18], [#33][33])
-
-* [The `Unpin` argument has been removed - an `Unpin` impl is now generated by default.][18]
-
-* Drop impls must be specified with `#[pinned_drop]` instead of via a normal `Drop` impl. ([#18][18], [#33][33], [#86][86])
-
-* [`Unpin` impls must be specified with an impl of `UnsafeUnpin`, instead of implementing the normal `Unpin` trait.][18]
-
-* [`#[pin_project]` attribute now determines the visibility of the projection type/method is based on the original type.][96]
-
-* [`#[pin_project]` can now be used for public type with private field types.][53]
-
-* [`#[pin_project]` can now interoperate with `#[cfg()]`.][77]
-
-* [Added `project_ref` method to `#[pin_project]` types.][93]
-
-* [Added `#[project_ref]` attribute.][93]
-
-* [Removed "project_attr" feature and always enable `#[project]` attribute.][94]
-
-* [`#[project]` attribute can now be used for `impl` blocks.][46]
-
-* [`#[project]` attribute can now be used for `use` statements.][85]
-
-* [`#[project]` attribute now supports `match` expressions at the position of the initializer expression of `let` expressions.][51]
-
-Changes since the 0.4.0-beta.1 release:
-
-* [Fixed an issue that caused an error when using `#[pin_project(UnsafeUnpin)]` and not providing a manual `UnsafeUnpin` implementation on a type with no generics or lifetime.][107]
-
-[18]: https://github.com/taiki-e/pin-project/pull/18
-[33]: https://github.com/taiki-e/pin-project/pull/107
-[107]: https://github.com/taiki-e/pin-project/pull/107
-
-## [0.4.0-beta.1] - 2019-09-21
-
-* [Changed the argument type of project method back to `self: Pin<&mut Self>`.][90]
-
-* [Removed "project_attr" feature and always enable `#[project]` attribute.][94]
-
-* [Removed "renamed" feature.][100]
-
-* [`#[project]` attribute can now be used for `use` statements.][85]
-
-* [Added `project_ref` method and `#[project_ref]` attribute.][93]
-
-* [`#[pin_project]` attribute now determines the visibility of the projection type/method is based on the original type.][96]
-
-[85]: https://github.com/taiki-e/pin-project/pull/85
-[90]: https://github.com/taiki-e/pin-project/pull/90
-[93]: https://github.com/taiki-e/pin-project/pull/93
-[94]: https://github.com/taiki-e/pin-project/pull/94
-[96]: https://github.com/taiki-e/pin-project/pull/96
-[100]: https://github.com/taiki-e/pin-project/pull/100
-
-## [0.4.0-alpha.11] - 2019-09-11
-
-* [Changed #[pinned_drop] to trait implementation.][86]
-
-  ```rust
-  #[pinned_drop]
-  impl<T> PinnedDrop for Foo<'_, T> {
-      fn drop(mut self: Pin<&mut Self>) {
-          **self.project().was_dropped = true;
-      }
-  }
-  ```
-
-* Added some examples and generated code.
-
-* Diagnostic improvements.
-
-[86]: https://github.com/taiki-e/pin-project/pull/86
-
-## [0.4.0-alpha.10] - 2019-09-07
-
-* [`#[pin_project]` can now interoperate with `#[cfg()]`.][77]
-
-* Documentation improvements.
-
-[77]: https://github.com/taiki-e/pin-project/pull/77
-
-## [0.4.0-alpha.9] - 2019-09-05
-
-* [Added 'project_into' method to #[pin_project] types][69]. This can be useful when returning a pin projection from a method.
-  ```rust
-  fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
-      self.project_into().pinned
-  }
-  ```
-
-* [Prevented UnpinStruct from appearing in the document by default.][71] See [#71][71] for more details.
-
-[69]: https://github.com/taiki-e/pin-project/pull/69
-[71]: https://github.com/taiki-e/pin-project/pull/69
-
-## [0.4.0-alpha.8] - 2019-09-03
-
-* [Improved document of generated code.][62]. Also added an option to control the document of generated code. See [#62][62] for more details.
-
-* [Diagnostic improvements.][61]
-
-[61]: https://github.com/taiki-e/pin-project/pull/61
-[62]: https://github.com/taiki-e/pin-project/pull/62
-
-## [0.4.0-alpha.7] - 2019-09-02
-
-* [Suppress `dead_code` lint in generated types.][57]
-
-[57]: https://github.com/taiki-e/pin-project/pull/57
-
-## [0.4.0-alpha.6] - 2019-09-01
-
-* [Allowed using `#[pin_project]` type with private field types][53]
-
-[53]: https://github.com/taiki-e/pin-project/pull/53
-
-## [0.4.0-alpha.5] - 2019-08-24
-
-* [`#[project]` attribute now supports `match` expressions at the position of the initializer expression of `let` expressions.][51]
-
-[51]: https://github.com/taiki-e/pin-project/pull/51
-
-## [0.4.0-alpha.4] - 2019-08-23
-
-* Suppress `clippy::drop_bounds` lint in generated code.
-
-## [0.4.0-alpha.3] - 2019-08-23
-
-* [Changed `project` method generated by `#[pin_project]` attribute to take an `&mut Pin<&mut Self>` argument.][47]
-
-* [`#[project]` attribute can now be used for impl blocks.][46]
-
-* [`#[pin_project]` attribute can now detect that the type used does not have its own drop implementation without actually implementing drop.][48] This removed some restrictions.
-
-[46]: https://github.com/taiki-e/pin-project/pull/46
-[47]: https://github.com/taiki-e/pin-project/pull/47
-[48]: https://github.com/taiki-e/pin-project/pull/48
-
-## [0.4.0-alpha.2] - 2019-08-13
-
-* Updated `proc-macro2`, `syn`, and `quote` to 1.0.
-
-## [0.4.0-alpha.1] - 2019-08-11
-
-* **Pin projection has become a safe operation.**
-
-* `#[unsafe_project]` has been replaced with `#[pin_project]`.
-
-* The `Unpin` argument has been removed - an `Unpin` impl is now generated by default.
-
-* Drop impls must be specified with `#[pinned_drop]` instead of via a normal `Drop` impl.
-
-* `Unpin` impls must be specified with an impl of `UnsafeUnpin`, instead of implementing the normal `Unpin` trait.
-
-* Made `#[project]` attribute disabled by default.
-
-See also [tracking issue for 0.4 release][21].
-
-[21]: https://github.com/taiki-e/pin-project/issues/21
-
-## [0.3.5] - 2019-08-14
-
-* Updated `proc-macro2`, `syn`, and `quote` to 1.0.
-
-## [0.3.4] - 2019-07-21
-
-* Diagnostic improvements.
-
-## [0.3.3] - 2019-07-15 - YANKED
-
-* Diagnostic improvements.
-
-## [0.3.2] - 2019-03-30
-
-* Avoided suffixes on tuple index.
-
-## [0.3.1] - 2019-03-02
-
-* Documentation improvements.
-
-* Updated minimum `syn` version to 0.15.22.
-
-## [0.3.0] - 2019-02-20
-
-* Removed `unsafe_fields` attribute.
-
-* Removed `unsafe_variants` attribute.
-
-## [0.2.2] - 2019-02-20
-
-* Fixed a bug that generates incorrect code for the some structures with trait bounds on type generics.
-
-## [0.2.1] - 2019-02-20
-
-* Fixed a bug that generates incorrect code for the structures with where clause and associated type fields.
-
-## [0.2.0] - 2019-02-11
-
-* Made `unsafe_fields` optional.
-
-* Documentation improvements.
-
-## [0.1.8] - 2019-02-02
-
-* Added the feature to create projected enums to `unsafe_project`.
-
-* Added `project` attribute to support pattern matching.
-
-## [0.1.7] - 2019-01-19
-
-* Fixed documentation.
-
-## [0.1.6] - 2019-01-19
-
-* `unsafe_fields` can now opt-out.
-
-* Added `unsafe_variants` attribute. This attribute is available if pin-project is built with the "unsafe_variants" feature.
-
-## [0.1.5] - 2019-01-17
-
-* Added support for tuple struct to `unsafe_project`.
-
-## [0.1.4] - 2019-01-12
-
-* Added options for automatically implementing `Unpin` to both `unsafe_project` and `unsafe_fields`.
-
-## [0.1.3] - 2019-01-11
-
-* Fixed dependencies.
-
-* Added `unsafe_fields` attribute.
-
-## [0.1.2] - 2019-01-09
-
-* Documentation improvements.
-
-## [0.1.1] - 2019-01-08
-
-* Renamed from `unsafe_pin_project` to `unsafe_project`.
-
-## [0.1.0] - 2019-01-08 - YANKED
-
-Initial release
-
-[Unreleased]: https://github.com/taiki-e/pin-project/compare/v0.4.27...HEAD
-[0.4.27]: https://github.com/taiki-e/pin-project/compare/v0.4.26...v0.4.27
-[0.4.26]: https://github.com/taiki-e/pin-project/compare/v0.4.25...v0.4.26
-[0.4.25]: https://github.com/taiki-e/pin-project/compare/v0.4.24...v0.4.25
-[0.4.24]: https://github.com/taiki-e/pin-project/compare/v0.4.23...v0.4.24
-[0.4.23]: https://github.com/taiki-e/pin-project/compare/v0.4.22...v0.4.23
-[0.4.22]: https://github.com/taiki-e/pin-project/compare/v0.4.21...v0.4.22
-[0.4.21]: https://github.com/taiki-e/pin-project/compare/v0.4.20...v0.4.21
-[0.4.20]: https://github.com/taiki-e/pin-project/compare/v0.4.19...v0.4.20
-[0.4.19]: https://github.com/taiki-e/pin-project/compare/v0.4.18...v0.4.19
-[0.4.18]: https://github.com/taiki-e/pin-project/compare/v0.4.17...v0.4.18
-[0.4.17]: https://github.com/taiki-e/pin-project/compare/v0.4.16...v0.4.17
-[0.4.16]: https://github.com/taiki-e/pin-project/compare/v0.4.15...v0.4.16
-[0.4.15]: https://github.com/taiki-e/pin-project/compare/v0.4.14...v0.4.15
-[0.4.14]: https://github.com/taiki-e/pin-project/compare/v0.4.13...v0.4.14
-[0.4.13]: https://github.com/taiki-e/pin-project/compare/v0.4.11...v0.4.13
-[0.4.12]: https://github.com/taiki-e/pin-project/compare/v0.4.10...v0.4.12
-[0.4.11]: https://github.com/taiki-e/pin-project/compare/v0.4.10...v0.4.11
-[0.4.10]: https://github.com/taiki-e/pin-project/compare/v0.4.9...v0.4.10
-[0.4.9]: https://github.com/taiki-e/pin-project/compare/v0.4.8...v0.4.9
-[0.4.8]: https://github.com/taiki-e/pin-project/compare/v0.4.7...v0.4.8
-[0.4.7]: https://github.com/taiki-e/pin-project/compare/v0.4.6...v0.4.7
-[0.4.6]: https://github.com/taiki-e/pin-project/compare/v0.4.5...v0.4.6
-[0.4.5]: https://github.com/taiki-e/pin-project/compare/v0.4.4...v0.4.5
-[0.4.4]: https://github.com/taiki-e/pin-project/compare/v0.4.3...v0.4.4
-[0.4.3]: https://github.com/taiki-e/pin-project/compare/v0.4.2...v0.4.3
-[0.4.2]: https://github.com/taiki-e/pin-project/compare/v0.4.1...v0.4.2
-[0.4.1]: https://github.com/taiki-e/pin-project/compare/v0.4.0...v0.4.1
-[0.4.0]: https://github.com/taiki-e/pin-project/compare/v0.4.0-beta.1...v0.4.0
-[0.4.0-beta.1]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.11...v0.4.0-beta.1
-[0.4.0-alpha.11]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.10...v0.4.0-alpha.11
-[0.4.0-alpha.10]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.9...v0.4.0-alpha.10
-[0.4.0-alpha.9]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.8...v0.4.0-alpha.9
-[0.4.0-alpha.8]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.7...v0.4.0-alpha.8
-[0.4.0-alpha.7]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.6...v0.4.0-alpha.7
-[0.4.0-alpha.6]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.5...v0.4.0-alpha.6
-[0.4.0-alpha.5]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.4...v0.4.0-alpha.5
-[0.4.0-alpha.4]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.3...v0.4.0-alpha.4
-[0.4.0-alpha.3]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.2...v0.4.0-alpha.3
-[0.4.0-alpha.2]: https://github.com/taiki-e/pin-project/compare/v0.4.0-alpha.1...v0.4.0-alpha.2
-[0.4.0-alpha.1]: https://github.com/taiki-e/pin-project/compare/v0.3.5...v0.4.0-alpha.1
-[0.3.5]: https://github.com/taiki-e/pin-project/compare/v0.3.4...v0.3.5
-[0.3.4]: https://github.com/taiki-e/pin-project/compare/v0.3.3...v0.3.4
-[0.3.3]: https://github.com/taiki-e/pin-project/compare/v0.3.2...v0.3.3
-[0.3.2]: https://github.com/taiki-e/pin-project/compare/v0.3.1...v0.3.2
-[0.3.1]: https://github.com/taiki-e/pin-project/compare/v0.3.0...v0.3.1
-[0.3.0]: https://github.com/taiki-e/pin-project/compare/v0.2.2...v0.3.0
-[0.2.2]: https://github.com/taiki-e/pin-project/compare/v0.2.1...v0.2.2
-[0.2.1]: https://github.com/taiki-e/pin-project/compare/v0.2.0...v0.2.1
-[0.2.0]: https://github.com/taiki-e/pin-project/compare/v0.1.8...v0.2.0
-[0.1.8]: https://github.com/taiki-e/pin-project/compare/v0.1.7...v0.1.8
-[0.1.7]: https://github.com/taiki-e/pin-project/compare/v0.1.6...v0.1.7
-[0.1.6]: https://github.com/taiki-e/pin-project/compare/v0.1.5...v0.1.6
-[0.1.5]: https://github.com/taiki-e/pin-project/compare/v0.1.4...v0.1.5
-[0.1.4]: https://github.com/taiki-e/pin-project/compare/v0.1.3...v0.1.4
-[0.1.3]: https://github.com/taiki-e/pin-project/compare/v0.1.2...v0.1.3
-[0.1.2]: https://github.com/taiki-e/pin-project/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/taiki-e/pin-project/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/taiki-e/pin-project/releases/tag/v0.1.0
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/ci/check-minimal-versions.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/ci/check-minimal-versions.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/ci/check-minimal-versions.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/ci/check-minimal-versions.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#!/bin/bash
-# Check all public crates with minimal version dependencies.
-#
-# Note that this script modifies Cargo.toml and Cargo.lock while this script is
-# running, and it is an error if there are any unstaged changes.
-#
-# Refs:
-# * minimal versions: https://github.com/rust-lang/cargo/issues/5657
-# * features 2.0: https://github.com/rust-lang/cargo/issues/8088
-
-set -euo pipefail
-
-# This script modifies Cargo.toml and Cargo.lock, so make sure there are no
-# unstaged changes.
-git diff --exit-code
-
-# Remove dev-dependencies from Cargo.toml to prevent the next `cargo update`
-# from determining minimal versions based on dev-dependencies.
-cargo hack --remove-dev-deps --workspace
-
-# Update Cargo.lock to minimal version dependencies.
-cargo update -Zminimal-versions
-# Run check for all public members of the workspace.
-cargo hack check --workspace --all-features --ignore-private -Zfeatures=all
-
-# Restore original Cargo.toml and Cargo.lock.
-git checkout .
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/ci/install-component.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/ci/install-component.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/ci/install-component.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/ci/install-component.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-component="${1}"
-
-if ! rustup component add "${component}" 2>/dev/null; then
-    # If the component is unavailable on the latest nightly,
-    # use the latest toolchain with the component available.
-    # Refs: https://github.com/rust-lang/rustup-components-history#the-web-part
-    target=$(curl -sSf "https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/${component}")
-    echo "'${component}' is unavailable on the default toolchain, use the toolchain 'nightly-${target}' instead"
-
-    . ci/install-rust.sh "nightly-${target}"
-
-    rustup component add "${component}"
-fi
-
-case "${component}" in
-    rustfmt) "${component}" -V ;;
-    *) cargo "${component}" -V ;;
-esac
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/ci/install-rust.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/ci/install-rust.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/ci/install-rust.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/ci/install-rust.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-toolchain="${1:-nightly}"
-
-rustup set profile minimal
-rustup update "${toolchain}" --no-self-update
-rustup default "${toolchain}"
-
-rustup -V
-rustc -V
-cargo -V
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/ci.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/ci.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/ci.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/ci.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# A script to run a simplified version of the checks done by CI.
-#
-# Usage
-#
-# ```sh
-# . ./ci.sh
-# ```
-
-echo "Running 'cargo fmt'"
-cargo +nightly fmt --all
-
-echo "Running 'cargo clippy'"
-cargo +nightly clippy --all --all-features --all-targets
-
-echo "Running 'cargo test'"
-TRYBUILD=overwrite cargo +nightly test --all --all-features --exclude expandtest
-
-echo "Running 'cargo doc'"
-cargo +nightly doc --no-deps --all --all-features
-
-echo "Running 'expandtest'"
-# See also https://docs.rs/macrotest/1/macrotest/#updating-expandedrs
-# rm **/*.expanded.rs
-cargo +nightly test --manifest-path tests/expand/Cargo.toml
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/enum-default-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/enum-default-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/enum-default-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/enum-default-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-// Original code (./enum-default.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::pin_project;
-//
-// #[pin_project(project = EnumProj)]
-// enum Enum<T, U> {
-//     Pinned(#[pin] T),
-//     Unpinned(U),
-// }
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::needless_lifetimes, clippy::just_underscores_and_digits)]
-
-use pin_project::pin_project;
-
-enum Enum<T, U> {
-    Pinned(/* #[pin] */ T),
-    Unpinned(U),
-}
-
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::mut_mut)]
-#[allow(clippy::type_repetition_in_bounds)]
-enum EnumProj<'pin, T, U>
-where
-    Enum<T, U>: 'pin,
-{
-    Pinned(::pin_project::__private::Pin<&'pin mut (T)>),
-    Unpinned(&'pin mut (U)),
-}
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::type_repetition_in_bounds)]
-enum __EnumProjectionRef<'pin, T, U>
-where
-    Enum<T, U>: 'pin,
-{
-    Pinned(::pin_project::__private::Pin<&'pin (T)>),
-    Unpinned(&'pin (U)),
-}
-
-#[doc(hidden)]
-#[allow(non_upper_case_globals)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::used_underscore_binding)]
-const _: () = {
-    impl<T, U> Enum<T, U> {
-        fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> EnumProj<'pin, T, U> {
-            unsafe {
-                match self.get_unchecked_mut() {
-                    Enum::Pinned(_0) => {
-                        EnumProj::Pinned(::pin_project::__private::Pin::new_unchecked(_0))
-                    }
-                    Enum::Unpinned(_0) => EnumProj::Unpinned(_0),
-                }
-            }
-        }
-        fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __EnumProjectionRef<'pin, T, U> {
-            unsafe {
-                match self.get_ref() {
-                    Enum::Pinned(_0) => __EnumProjectionRef::Pinned(
-                        ::pin_project::__private::Pin::new_unchecked(_0),
-                    ),
-                    Enum::Unpinned(_0) => __EnumProjectionRef::Unpinned(_0),
-                }
-            }
-        }
-    }
-
-    // Automatically create the appropriate conditional `Unpin` implementation.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/53.
-    // for details.
-    struct __Enum<'pin, T, U> {
-        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<
-            'pin,
-            (::pin_project::__private::PhantomData<T>, ::pin_project::__private::PhantomData<U>),
-        >,
-        __field0: T,
-    }
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Enum<T, U> where
-        __Enum<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-    unsafe impl<T, U> ::pin_project::UnsafeUnpin for Enum<T, U> {}
-
-    // Ensure that enum does not implement `Drop`.
-    //
-    // See ./struct-default-expanded.rs for details.
-    trait EnumMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> EnumMustNotImplDrop for T {}
-    impl<T, U> EnumMustNotImplDrop for Enum<T, U> {}
-    impl<T, U> ::pin_project::__private::PinnedDrop for Enum<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-
-    // We don't need to check for `#[repr(packed)]`,
-    // since it does not apply to enums.
-};
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/enum-default.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/enum-default.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/enum-default.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/enum-default.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-// See ./enum-default-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project(project = EnumProj)]
-enum Enum<T, U> {
-    Pinned(#[pin] T),
-    Unpinned(U),
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/not_unpin-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/not_unpin-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/not_unpin-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/not_unpin-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-// Original code (./not_unpin.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::pin_project;
-//
-// #[pin_project(!Unpin)]
-// pub struct Struct<T, U> {
-//     #[pin]
-//     pinned: T,
-//     unpinned: U,
-// }
-//
-// fn main() {
-//     fn _is_unpin<T: Unpin>() {}
-//     // _is_unpin::<Struct<(), ()>>(); //~ ERROR `std::marker::PhantomPinned` cannot be unpinned
-// }
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::no_effect, clippy::needless_lifetimes)]
-
-use pin_project::pin_project;
-
-pub struct Struct<T, U> {
-    // #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::mut_mut)]
-#[allow(clippy::type_repetition_in_bounds)]
-pub(crate) struct __StructProjection<'pin, T, U>
-where
-    Struct<T, U>: 'pin,
-{
-    pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
-    unpinned: &'pin mut (U),
-}
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::type_repetition_in_bounds)]
-pub(crate) struct __StructProjectionRef<'pin, T, U>
-where
-    Struct<T, U>: 'pin,
-{
-    pinned: ::pin_project::__private::Pin<&'pin (T)>,
-    unpinned: &'pin (U),
-}
-
-#[doc(hidden)]
-#[allow(non_upper_case_globals)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::used_underscore_binding)]
-const _: () = {
-    impl<T, U> Struct<T, U> {
-        pub(crate) fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_unchecked_mut();
-                __StructProjection {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        pub(crate) fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_ref();
-                __StructProjectionRef {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-    }
-
-    // Create `Unpin` impl that has trivial `Unpin` bounds.
-    //
-    // See https://github.com/taiki-e/pin-project/issues/102#issuecomment-540472282
-    // for details.
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        ::pin_project::__private::Wrapper<'pin, ::pin_project::__private::PhantomPinned>:
-            ::pin_project::__private::Unpin
-    {
-    }
-    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-    //
-    // To ensure that users don't accidentally write a non-functional `UnsafeUnpin`
-    // impls, we emit one ourselves. If the user ends up writing an `UnsafeUnpin`
-    // impl, they'll get a "conflicting implementations of trait" error when
-    // coherence checks are run.
-    unsafe impl<T, U> ::pin_project::UnsafeUnpin for Struct<T, U> {}
-
-    // Ensure that struct does not implement `Drop`.
-    //
-    // See ./struct-default-expanded.rs for details.
-    trait StructMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> StructMustNotImplDrop for T {}
-    impl<T, U> StructMustNotImplDrop for Struct<T, U> {}
-    impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/34
-    // for details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<T, U>(val: &Struct<T, U>) {
-        &val.pinned;
-        &val.unpinned;
-    }
-};
-
-fn main() {
-    fn _is_unpin<T: Unpin>() {}
-    // _is_unpin::<Struct<(), ()>>(); //~ ERROR `std::marker::PhantomPinned` cannot be unpinned
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/not_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/not_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/not_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/not_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-// See ./not_unpin-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project(!Unpin)]
-pub struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-fn main() {
-    fn _is_unpin<T: Unpin>() {}
-    // _is_unpin::<Struct<(), ()>>(); //~ ERROR `std::marker::PhantomPinned` cannot be unpinned
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/pinned_drop-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/pinned_drop-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/pinned_drop-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/pinned_drop-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-// Original code (./pinned_drop.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::{pin_project, pinned_drop};
-// use std::pin::Pin;
-//
-// #[pin_project(PinnedDrop)]
-// pub struct Struct<'a, T> {
-//     was_dropped: &'a mut bool,
-//     #[pin]
-//     field: T,
-// }
-//
-// #[pinned_drop]
-// fn drop_Struct<T>(mut this: Pin<&mut Struct<'_, T>>) {
-//     **this.project().was_dropped = true;
-// }
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::no_effect, clippy::needless_lifetimes)]
-
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-pub struct Struct<'a, T> {
-    was_dropped: &'a mut bool,
-    // #[pin]
-    field: T,
-}
-
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::mut_mut)]
-#[allow(clippy::type_repetition_in_bounds)]
-pub(crate) struct __StructProjection<'pin, 'a, T>
-where
-    Struct<'a, T>: 'pin,
-{
-    was_dropped: &'pin mut (&'a mut bool),
-    field: ::pin_project::__private::Pin<&'pin mut (T)>,
-}
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::type_repetition_in_bounds)]
-pub(crate) struct __StructProjectionRef<'pin, 'a, T>
-where
-    Struct<'a, T>: 'pin,
-{
-    was_dropped: &'pin (&'a mut bool),
-    field: ::pin_project::__private::Pin<&'pin (T)>,
-}
-
-#[doc(hidden)]
-#[allow(non_upper_case_globals)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::used_underscore_binding)]
-const _: () = {
-    impl<'a, T> Struct<'a, T> {
-        pub(crate) fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, 'a, T> {
-            unsafe {
-                let Self { was_dropped, field } = self.get_unchecked_mut();
-                __StructProjection {
-                    was_dropped,
-                    field: ::pin_project::__private::Pin::new_unchecked(field),
-                }
-            }
-        }
-        pub(crate) fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, 'a, T> {
-            unsafe {
-                let Self { was_dropped, field } = self.get_ref();
-                __StructProjectionRef {
-                    was_dropped,
-                    field: ::pin_project::__private::Pin::new_unchecked(field),
-                }
-            }
-        }
-    }
-
-    impl<'a, T> ::pin_project::__private::Drop for Struct<'a, T> {
-        fn drop(&mut self) {
-            // Safety - we're in 'drop', so we know that 'self' will
-            // never move again.
-            let pinned_self = unsafe { ::pin_project::__private::Pin::new_unchecked(self) };
-            // We call `pinned_drop` only once. Since `PinnedDrop::drop`
-            // is an unsafe method and a private API, it is never called again in safe
-            // code *unless the user uses a maliciously crafted macro*.
-            unsafe {
-                ::pin_project::__private::PinnedDrop::drop(pinned_self);
-            }
-        }
-    }
-
-    // Automatically create the appropriate conditional `Unpin` implementation.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/53.
-    // for details.
-    pub struct __Struct<'pin, 'a, T> {
-        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<'pin, (T)>,
-        __field0: T,
-        __lifetime0: &'a (),
-    }
-    impl<'pin, 'a, T> ::pin_project::__private::Unpin for Struct<'a, T> where
-        __Struct<'pin, 'a, T>: ::pin_project::__private::Unpin
-    {
-    }
-    unsafe impl<'a, T> ::pin_project::UnsafeUnpin for Struct<'a, T> {}
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/34
-    // for details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<'a, T>(val: &Struct<'a, T>) {
-        &val.was_dropped;
-        &val.field;
-    }
-};
-
-// Implementing `PinnedDrop::drop` is safe, but calling it is not safe.
-// This is because destructors can be called multiple times in safe code and
-// [double dropping is unsound](https://github.com/rust-lang/rust/pull/62360).
-//
-// Ideally, it would be desirable to be able to forbid manual calls in
-// the same way as `Drop::drop`, but the library cannot do it. So, by using
-// macros and replacing them with private traits, we prevent users from
-// calling `PinnedDrop::drop`.
-//
-// Users can implement [`Drop`] safely using `#[pinned_drop]` and can drop a
-// type that implements `PinnedDrop` using the [`drop`] function safely.
-// **Do not call or implement this trait directly.**
-impl<T> ::pin_project::__private::PinnedDrop for Struct<'_, T> {
-    // Since calling it twice on the same object would be UB,
-    // this method is unsafe.
-    unsafe fn drop(self: Pin<&mut Self>) {
-        #[allow(clippy::needless_pass_by_value)]
-        fn __drop_inner<T>(__self: Pin<&mut Struct<'_, T>>) {
-            // A dummy `__drop_inner` function to prevent users call outer `__drop_inner`.
-            fn __drop_inner() {}
-
-            **__self.project().was_dropped = true;
-        }
-        __drop_inner(self);
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/pinned_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/pinned_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/pinned_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/pinned_drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-// See ./pinned_drop-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project(PinnedDrop)]
-pub struct Struct<'a, T> {
-    was_dropped: &'a mut bool,
-    #[pin]
-    field: T,
-}
-
-#[pinned_drop]
-impl<T> PinnedDrop for Struct<'_, T> {
-    fn drop(self: Pin<&mut Self>) {
-        **self.project().was_dropped = true;
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/project_replace-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/project_replace-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/project_replace-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/project_replace-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-// Original code (./struct-default.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::pin_project;
-//
-// #[pin_project(project_replace)]
-// struct Struct<T, U> {
-//     #[pin]
-//     pinned: T,
-//     unpinned: U,
-// }
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::no_effect, clippy::needless_lifetimes)]
-
-use pin_project::pin_project;
-
-struct Struct<T, U> {
-    // #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::mut_mut)]
-#[allow(clippy::type_repetition_in_bounds)]
-struct __StructProjection<'pin, T, U>
-where
-    Struct<T, U>: 'pin,
-{
-    pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
-    unpinned: &'pin mut (U),
-}
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::type_repetition_in_bounds)]
-struct __StructProjectionRef<'pin, T, U>
-where
-    Struct<T, U>: 'pin,
-{
-    pinned: ::pin_project::__private::Pin<&'pin (T)>,
-    unpinned: &'pin (U),
-}
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(unreachable_pub)]
-#[allow(single_use_lifetimes)]
-struct __StructProjectionOwned<T, U> {
-    pinned: ::pin_project::__private::PhantomData<T>,
-    unpinned: U,
-}
-
-#[doc(hidden)]
-#[allow(non_upper_case_globals)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::used_underscore_binding)]
-const _: () = {
-    impl<T, U> Struct<T, U> {
-        fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_unchecked_mut();
-                __StructProjection {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_ref();
-                __StructProjectionRef {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        fn project_replace(
-            self: ::pin_project::__private::Pin<&mut Self>,
-            __replacement: Self,
-        ) -> __StructProjectionOwned<T, U> {
-            unsafe {
-                let __self_ptr: *mut Self = self.get_unchecked_mut();
-                let Self { pinned, unpinned } = &mut *__self_ptr;
-
-                // First, extract all the unpinned fields
-                let __result = __StructProjectionOwned {
-                    pinned: ::pin_project::__private::PhantomData,
-                    unpinned: ::pin_project::__private::ptr::read(unpinned),
-                };
-
-                // Destructors will run in reverse order, so next create a guard to overwrite
-                // `self` with the replacement value without calling destructors.
-                let __guard = ::pin_project::__private::UnsafeOverwriteGuard {
-                    target: __self_ptr,
-                    value: ::pin_project::__private::ManuallyDrop::new(__replacement),
-                };
-
-                // Now create guards to drop all the pinned fields
-                //
-                // Due to a compiler bug (https://github.com/rust-lang/rust/issues/47949)
-                // this must be in its own scope, or else `__result` will not be dropped
-                // if any of the destructors panic.
-                {
-                    let __guard = ::pin_project::__private::UnsafeDropInPlaceGuard(pinned);
-                }
-
-                // Finally, return the result
-                __result
-            }
-        }
-    }
-
-    // Automatically create the appropriate conditional `Unpin` implementation.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/53.
-    // for details.
-    struct __Struct<'pin, T, U> {
-        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<
-            'pin,
-            (::pin_project::__private::PhantomData<T>, ::pin_project::__private::PhantomData<U>),
-        >,
-        __field0: T,
-    }
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-    unsafe impl<T, U> ::pin_project::UnsafeUnpin for Struct<T, U> {}
-
-    // Ensure that struct does not implement `Drop`.
-    //
-    // See ./struct-default-expanded.rs for details.
-    trait StructMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> StructMustNotImplDrop for T {}
-    impl<T, U> StructMustNotImplDrop for Struct<T, U> {}
-    impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/34
-    // for details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<T, U>(val: &Struct<T, U>) {
-        &val.pinned;
-        &val.unpinned;
-    }
-};
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/project_replace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/project_replace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/project_replace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/project_replace.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// See ./struct-default-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project(project_replace)]
-struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-# Examples and generated code of each feature of pin-project
-
-### Basic usage of `#[pin_project]` on structs
-
-  * [example](struct-default.rs)
-  * [generated code](struct-default-expanded.rs)
-
-### Basic usage of `#[pin_project]` on enums
-
-  * [example](enum-default.rs)
-  * [generated code](enum-default-expanded.rs)
-
-### Manual implementation of `Unpin` by `UnsafeUnpin`
-
-  * [example](unsafe_unpin.rs)
-  * [generated code](unsafe_unpin-expanded.rs)
-  * [`UnsafeUnpin` documentation](https://docs.rs/pin-project/0.4/pin_project/trait.UnsafeUnpin.html)
-
-### Manual implementation of `Drop` by `#[pinned_drop]`
-
-  * [example](pinned_drop.rs)
-  * [generated code](pinned_drop-expanded.rs)
-  * [`#[pinned_drop]` documentation](https://docs.rs/pin-project/0.4/pin_project/attr.pinned_drop.html)
-
-### `project_replace()` method
-
-  * [example](project_replace.rs)
-  * [generated code](project_replace-expanded.rs)
-  * [`project_replace()` documentation](https://docs.rs/pin-project/0.4/pin_project/attr.pin_project.html#project_replace)
-
-### Ensure `!Unpin` by `#[pin_project(!Unpin)]`
-
-  * [example](not_unpin.rs)
-  * [generated code](not_unpin-expanded.rs)
-  * [`!Unpin` documentation](https://docs.rs/pin-project/0.4/pin_project/attr.pin_project.html#unpin)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/struct-default-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/struct-default-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/struct-default-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/struct-default-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-// Original code (./struct-default.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::pin_project;
-//
-// #[pin_project]
-// struct Struct<T, U> {
-//     #[pin]
-//     pinned: T,
-//     unpinned: U,
-// }
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::no_effect, clippy::needless_lifetimes)]
-
-use pin_project::pin_project;
-
-struct Struct<T, U> {
-    // #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::mut_mut)]
-#[allow(clippy::type_repetition_in_bounds)]
-struct __StructProjection<'pin, T, U>
-where
-    Struct<T, U>: 'pin,
-{
-    pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
-    unpinned: &'pin mut (U),
-}
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::type_repetition_in_bounds)]
-struct __StructProjectionRef<'pin, T, U>
-where
-    Struct<T, U>: 'pin,
-{
-    pinned: ::pin_project::__private::Pin<&'pin (T)>,
-    unpinned: &'pin (U),
-}
-
-#[doc(hidden)]
-#[allow(non_upper_case_globals)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::used_underscore_binding)]
-const _: () = {
-    impl<T, U> Struct<T, U> {
-        fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_unchecked_mut();
-                __StructProjection {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_ref();
-                __StructProjectionRef {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-    }
-
-    // Automatically create the appropriate conditional `Unpin` implementation.
-    //
-    // Basically this is equivalent to the following code:
-    //
-    // ```rust
-    // impl<T, U> Unpin for Struct<T, U> where T: Unpin {}
-    // ```
-    //
-    // However, if struct is public and there is a private type field,
-    // this would cause an E0446 (private type in public interface).
-    //
-    // When RFC 2145 is implemented (rust-lang/rust#48054),
-    // this will become a lint, rather then a hard error.
-    //
-    // As a workaround for this, we generate a new struct, containing all of
-    // the pinned fields from our #[pin_project] type. This struct is declared
-    // within a function, which makes it impossible to be named by user code.
-    // This guarantees that it will use the default auto-trait impl for Unpin -
-    // that is, it will implement Unpin iff all of its fields implement Unpin.
-    // This type can be safely declared as 'public', satisfying the privacy
-    // checker without actually allowing user code to access it.
-    //
-    // This allows users to apply the #[pin_project] attribute to types
-    // regardless of the privacy of the types of their fields.
-    //
-    // See also https://github.com/taiki-e/pin-project/pull/53.
-    struct __Struct<'pin, T, U> {
-        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<
-            'pin,
-            (::pin_project::__private::PhantomData<T>, ::pin_project::__private::PhantomData<U>),
-        >,
-        __field0: T,
-    }
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        __Struct<'pin, T, U>: ::pin_project::__private::Unpin
-    {
-    }
-    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-    //
-    // To ensure that users don't accidentally write a non-functional `UnsafeUnpin`
-    // impls, we emit one ourselves. If the user ends up writing an `UnsafeUnpin`
-    // impl, they'll get a "conflicting implementations of trait" error when
-    // coherence checks are run.
-    unsafe impl<T, U> ::pin_project::UnsafeUnpin for Struct<T, U> {}
-
-    // Ensure that struct does not implement `Drop`.
-    //
-    // If you attempt to provide an Drop impl, the blanket impl will
-    // then apply to your type, causing a compile-time error due to
-    // the conflict with the second impl.
-    trait StructMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> StructMustNotImplDrop for T {}
-    impl<T, U> StructMustNotImplDrop for Struct<T, U> {}
-    // A dummy impl of `PinnedDrop`, to ensure that users don't accidentally
-    // write a non-functional `PinnedDrop` impls.
-    impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // Taking a reference to a packed field is unsafe, and applying
-    // #[forbid(safe_packed_borrows)] makes sure that doing this without
-    // an 'unsafe' block (which we deliberately do not generate)
-    // is a hard error.
-    //
-    // If the struct ends up having #[repr(packed)] applied somehow,
-    // this will generate an (unfriendly) error message. Under all reasonable
-    // circumstances, we'll detect the #[repr(packed)] attribute, and generate
-    // a much nicer error above.
-    //
-    // See https://github.com/taiki-e/pin-project/pull/34 for more details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<T, U>(val: &Struct<T, U>) {
-        &val.pinned;
-        &val.unpinned;
-    }
-};
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/struct-default.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/struct-default.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/struct-default.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/struct-default.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// See ./struct-default-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project]
-struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/unsafe_unpin-expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/unsafe_unpin-expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/unsafe_unpin-expanded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/unsafe_unpin-expanded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-// Original code (./unsafe_unpin.rs):
-//
-// ```rust
-// #![allow(dead_code)]
-//
-// use pin_project::{pin_project, UnsafeUnpin};
-//
-// #[pin_project(UnsafeUnpin)]
-// pub struct Struct<T, U> {
-//     #[pin]
-//     pinned: T,
-//     unpinned: U,
-// }
-//
-// unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
-//
-// fn main() {}
-// ```
-
-#![allow(dead_code, unused_imports, unused_parens, unknown_lints, renamed_and_removed_lints)]
-#![allow(clippy::no_effect, clippy::needless_lifetimes)]
-
-use pin_project::{pin_project, UnsafeUnpin};
-
-pub struct Struct<T, U> {
-    // #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::mut_mut)]
-#[allow(clippy::type_repetition_in_bounds)]
-pub(crate) struct __StructProjection<'pin, T, U>
-where
-    Struct<T, U>: 'pin,
-{
-    pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
-    unpinned: &'pin mut (U),
-}
-#[doc(hidden)]
-#[allow(dead_code)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::type_repetition_in_bounds)]
-pub(crate) struct __StructProjectionRef<'pin, T, U>
-where
-    Struct<T, U>: 'pin,
-{
-    pinned: ::pin_project::__private::Pin<&'pin (T)>,
-    unpinned: &'pin (U),
-}
-
-#[doc(hidden)]
-#[allow(non_upper_case_globals)]
-#[allow(single_use_lifetimes)]
-#[allow(clippy::used_underscore_binding)]
-const _: () = {
-    impl<T, U> Struct<T, U> {
-        pub(crate) fn project<'pin>(
-            self: ::pin_project::__private::Pin<&'pin mut Self>,
-        ) -> __StructProjection<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_unchecked_mut();
-                __StructProjection {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-        pub(crate) fn project_ref<'pin>(
-            self: ::pin_project::__private::Pin<&'pin Self>,
-        ) -> __StructProjectionRef<'pin, T, U> {
-            unsafe {
-                let Self { pinned, unpinned } = self.get_ref();
-                __StructProjectionRef {
-                    pinned: ::pin_project::__private::Pin::new_unchecked(pinned),
-                    unpinned,
-                }
-            }
-        }
-    }
-
-    impl<'pin, T, U> ::pin_project::__private::Unpin for Struct<T, U> where
-        ::pin_project::__private::Wrapper<'pin, Self>: ::pin_project::UnsafeUnpin
-    {
-    }
-
-    // Ensure that struct does not implement `Drop`.
-    //
-    // See ./struct-default-expanded.rs for details.
-    trait StructMustNotImplDrop {}
-    #[allow(clippy::drop_bounds, drop_bounds)]
-    impl<T: ::pin_project::__private::Drop> StructMustNotImplDrop for T {}
-    impl<T, U> StructMustNotImplDrop for Struct<T, U> {}
-    impl<T, U> ::pin_project::__private::PinnedDrop for Struct<T, U> {
-        unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-    }
-
-    // Ensure that it's impossible to use pin projections on a #[repr(packed)]
-    // struct.
-    //
-    // See ./struct-default-expanded.rs and https://github.com/taiki-e/pin-project/pull/34
-    // for details.
-    #[forbid(safe_packed_borrows)]
-    fn __assert_not_repr_packed<T, U>(val: &Struct<T, U>) {
-        &val.pinned;
-        &val.unpinned;
-    }
-};
-
-unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/unsafe_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/unsafe_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/examples/unsafe_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/examples/unsafe_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-// See ./unsafe_unpin-expanded.rs for generated code.
-
-#![allow(dead_code)]
-
-use pin_project::{pin_project, UnsafeUnpin};
-
-#[pin_project(UnsafeUnpin)]
-pub struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-# pin-project
-
-[![crates-badge]][crates-url]
-[![docs-badge]][docs-url]
-[![license-badge]][license]
-[![rustc-badge]][rustc-url]
-
-[crates-badge]: https://img.shields.io/crates/v/pin-project.svg
-[crates-url]: https://crates.io/crates/pin-project
-[docs-badge]: https://docs.rs/pin-project/badge.svg
-[docs-url]: https://docs.rs/pin-project
-[license-badge]: https://img.shields.io/badge/license-Apache--2.0%20OR%20MIT-blue.svg
-[license]: #license
-[rustc-badge]: https://img.shields.io/badge/rustc-1.34+-lightgray.svg
-[rustc-url]: https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html
-
-A crate for safe and ergonomic [pin-projection].
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-pin-project = "0.4"
-```
-
-The current pin-project requires Rust 1.34 or later.
-
-## Examples
-
-[`#[pin_project]`][`pin_project`] attribute creates projection types
-covering all the fields of struct or enum.
-
-```rust
-use pin_project::pin_project;
-use std::pin::Pin;
-
-#[pin_project]
-struct Struct<T, U> {
-    #[pin]
-    pinned: T,
-    unpinned: U,
-}
-
-impl<T, U> Struct<T, U> {
-    fn method(self: Pin<&mut Self>) {
-        let this = self.project();
-        let _: Pin<&mut T> = this.pinned; // Pinned reference to the field
-        let _: &mut U = this.unpinned; // Normal reference to the field
-    }
-}
-```
-
-[*code like this will be generated*][struct-default-expanded]
-
-See [documentation][docs-url] for more details, and
-see [examples] directory for more examples and generated code.
-
-[`pin_project`]: https://docs.rs/pin-project/0.4/pin_project/attr.pin_project.html
-[examples]: examples/README.md
-[pin-projection]: https://doc.rust-lang.org/nightly/std/pin/index.html#projections-and-structural-pinning
-[struct-default-expanded]: examples/struct-default-expanded.rs
-
-## Related Projects
-
-* [pin-project-lite]: A lightweight version of pin-project written with declarative macros.
-
-[pin-project-lite]: https://github.com/taiki-e/pin-project-lite
-
-## License
-
-Licensed under either of
-
-* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
-* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Rustfmt configuration
-# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md
-
-# This is required for bug-fixes, which technically can't be made to the stable
-# first version.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3383).
-version = "Two"
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3391)
-error_on_line_overflow = true
-
-# Override the default formatting style.
-# See https://internals.rust-lang.org/t/running-rustfmt-on-rust-lang-rust-and-other-rust-lang-repositories/8732/81.
-use_small_heuristics = "Max"
-# See https://github.com/rust-dev-tools/fmt-rfcs/issues/149.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3370)
-overflow_delimited_expr = true
-
-# Apply rustfmt to more places.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3362).
-merge_imports = true
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3348).
-format_code_in_doc_comments = true
-
-# Set the default settings again to always apply the proper formatting without
-# being affected by the editor settings.
-edition = "2018"
-tab_spaces = 4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,254 +0,0 @@
-//! A crate for safe and ergonomic [pin-projection].
-//!
-//! # Examples
-//!
-//! [`#[pin_project]`][`pin_project`] attribute creates projection types
-//! covering all the fields of struct or enum.
-//!
-//! ```rust
-//! use pin_project::pin_project;
-//! use std::pin::Pin;
-//!
-//! #[pin_project]
-//! struct Struct<T, U> {
-//!     #[pin]
-//!     pinned: T,
-//!     unpinned: U,
-//! }
-//!
-//! impl<T, U> Struct<T, U> {
-//!     fn method(self: Pin<&mut Self>) {
-//!         let this = self.project();
-//!         let _: Pin<&mut T> = this.pinned; // Pinned reference to the field
-//!         let _: &mut U = this.unpinned; // Normal reference to the field
-//!     }
-//! }
-//! ```
-//!
-//! [*code like this will be generated*][struct-default-expanded]
-//!
-//! See [`#[pin_project]`][`pin_project`] attribute for more details, and
-//! see [examples] directory for more examples and generated code.
-//!
-//! [`pin_project`]: attr.pin_project.html
-//! [examples]: https://github.com/taiki-e/pin-project/blob/master/examples/README.md
-//! [pin-projection]: https://doc.rust-lang.org/nightly/std/pin/index.html#projections-and-structural-pinning
-//! [struct-default-expanded]: https://github.com/taiki-e/pin-project/blob/master/examples/struct-default-expanded.rs
-
-#![no_std]
-#![doc(html_root_url = "https://docs.rs/pin-project/0.4.27")]
-#![doc(test(
-    no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms, single_use_lifetimes), allow(dead_code))
-))]
-#![warn(missing_docs, rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
-#![warn(clippy::all, clippy::default_trait_access)]
-// mem::take and #[non_exhaustive] requires Rust 1.40
-#![allow(clippy::mem_replace_with_default, clippy::manual_non_exhaustive)]
-#![allow(clippy::needless_doctest_main)]
-
-#[doc(inline)]
-pub use pin_project_internal::pin_project;
-
-#[doc(inline)]
-pub use pin_project_internal::pinned_drop;
-
-#[allow(deprecated)]
-#[doc(inline)]
-pub use pin_project_internal::project;
-
-#[allow(deprecated)]
-#[doc(inline)]
-pub use pin_project_internal::project_ref;
-
-#[allow(deprecated)]
-#[doc(inline)]
-pub use pin_project_internal::project_replace;
-
-/// A trait used for custom implementations of [`Unpin`].
-/// This trait is used in conjunction with the `UnsafeUnpin`
-/// argument to [`#[pin_project]`][`pin_project`]
-///
-/// The Rust [`Unpin`] trait is safe to implement - by itself,
-/// implementing it cannot lead to undefined behavior. Undefined
-/// behavior can only occur when other unsafe code is used.
-///
-/// It turns out that using pin projections, which requires unsafe code,
-/// imposes additional requirements on an [`Unpin`] impl. Normally, all of this
-/// unsafety is contained within this crate, ensuring that it's impossible for
-/// you to violate any of the guarantees required by pin projection.
-///
-/// However, things change if you want to provide a custom [`Unpin`] impl
-/// for your `#[pin_project]` type. As stated in [the Rust
-/// documentation][pin-projection], you must be sure to only implement [`Unpin`]
-/// when all of your `#[pin]` fields (i.e. structurally pinned fields) are also
-/// [`Unpin`].
-///
-/// To help highlight this unsafety, the `UnsafeUnpin` trait is provided.
-/// Implementing this trait is logically equivalent to implementing [`Unpin`] -
-/// this crate will generate an [`Unpin`] impl for your type that 'forwards' to
-/// your `UnsafeUnpin` impl. However, this trait is `unsafe` - since your type
-/// uses structural pinning (otherwise, you wouldn't be using this crate!),
-/// you must be sure that your `UnsafeUnpin` impls follows all of
-/// the requirements for an [`Unpin`] impl of a structurally-pinned type.
-///
-/// Note that if you specify `#[pin_project(UnsafeUnpin)]`, but do *not*
-/// provide an impl of `UnsafeUnpin`, your type will never implement [`Unpin`].
-/// This is effectively the same thing as adding a [`PhantomPinned`] to your
-/// type.
-///
-/// Since this trait is `unsafe`, impls of it will be detected by the
-/// `unsafe_code` lint, and by tools like [`cargo geiger`][cargo-geiger].
-///
-/// # Examples
-///
-/// An `UnsafeUnpin` impl which, in addition to requiring that structurally
-/// pinned fields be [`Unpin`], imposes an additional requirement:
-///
-/// ```rust
-/// use pin_project::{pin_project, UnsafeUnpin};
-///
-/// #[pin_project(UnsafeUnpin)]
-/// struct Foo<K, V> {
-///     #[pin]
-///     field_1: K,
-///     field_2: V,
-/// }
-///
-/// unsafe impl<K, V> UnsafeUnpin for Foo<K, V> where K: Unpin + Clone {}
-/// ```
-///
-/// [`PhantomPinned`]: core::marker::PhantomPinned
-/// [`pin_project`]: attr.pin_project.html
-/// [pin-projection]: https://doc.rust-lang.org/nightly/std/pin/index.html#projections-and-structural-pinning
-/// [cargo-geiger]: https://github.com/rust-secure-code/cargo-geiger
-pub unsafe trait UnsafeUnpin {}
-
-// Not public API.
-#[doc(hidden)]
-pub mod __private {
-    #[doc(hidden)]
-    pub use core::{
-        marker::{PhantomData, PhantomPinned, Unpin},
-        mem::ManuallyDrop,
-        ops::Drop,
-        pin::Pin,
-        ptr,
-    };
-
-    use super::UnsafeUnpin;
-
-    #[doc(hidden)]
-    pub use pin_project_internal::__PinProjectInternalDerive;
-
-    // Implementing `PinnedDrop::drop` is safe, but calling it is not safe.
-    // This is because destructors can be called multiple times in safe code and
-    // [double dropping is unsound](https://github.com/rust-lang/rust/pull/62360).
-    //
-    // Ideally, it would be desirable to be able to forbid manual calls in
-    // the same way as [`Drop::drop`], but the library cannot do it. So, by using
-    // macros and replacing them with private traits, we prevent users from
-    // calling `PinnedDrop::drop`.
-    //
-    // Users can implement [`Drop`] safely using `#[pinned_drop]` and can drop a
-    // type that implements `PinnedDrop` using the [`drop`] function safely.
-    // **Do not call or implement this trait directly.**
-    #[doc(hidden)]
-    pub trait PinnedDrop {
-        #[doc(hidden)]
-        unsafe fn drop(self: Pin<&mut Self>);
-    }
-
-    // This is an internal helper struct used by `pin-project-internal`.
-    // This allows us to force an error if the user tries to provide
-    // a regular `Unpin` impl when they specify the `UnsafeUnpin` argument.
-    // This is why we need Wrapper:
-    //
-    // Supposed we have the following code:
-    //
-    // ```rust
-    // #[pin_project(UnsafeUnpin)]
-    // struct MyStruct<T> {
-    //     #[pin] field: T
-    // }
-    //
-    // impl<T> Unpin for MyStruct<T> where MyStruct<T>: UnsafeUnpin {} // generated by pin-project-internal
-    // impl<T> Unpin for MyStruct<T> where T: Copy // written by the user
-    // ```
-    //
-    // We want this code to be rejected - the user is completely bypassing
-    // `UnsafeUnpin`, and providing an unsound Unpin impl in safe code!
-    //
-    // Unfortunately, the Rust compiler will accept the above code.
-    // Because MyStruct is declared in the same crate as the user-provided impl,
-    // the compiler will notice that `MyStruct<T>: UnsafeUnpin` never holds.
-    //
-    // The solution is to introduce the `Wrapper` struct, which is defined
-    // in the `pin-project` crate.
-    //
-    // We now have code that looks like this:
-    //
-    // ```rust
-    // impl<T> Unpin for MyStruct<T> where Wrapper<MyStruct<T>>: UnsafeUnpin {} // generated by pin-project-internal
-    // impl<T> Unpin for MyStruct<T> where T: Copy // written by the user
-    // ```
-    //
-    // We also have `unsafe impl<T> UnsafeUnpin for Wrapper<T> where T: UnsafeUnpin {}`
-    // in the `pin-project` crate.
-    //
-    // Now, our generated impl has a bound involving a type defined in another
-    // crate - Wrapper. This will cause rust to conservatively assume that
-    // `Wrapper<MyStruct<T>>: UnsafeUnpin` holds, in the interest of preserving
-    // forwards compatibility (in case such an impl is added for Wrapper<T> in
-    // a new version of the crate).
-    //
-    // This will cause rust to reject any other `Unpin` impls for MyStruct<T>,
-    // since it will assume that our generated impl could potentially apply in
-    // any situation.
-    //
-    // This achieves the desired effect - when the user writes
-    // `#[pin_project(UnsafeUnpin)]`, the user must either provide no impl of
-    // `UnsafeUnpin` (which is equivalent to making the type never implement
-    // Unpin), or provide an impl of `UnsafeUnpin`. It is impossible for them to
-    // provide an impl of `Unpin`
-    #[doc(hidden)]
-    pub struct Wrapper<'a, T: ?Sized>(PhantomData<&'a ()>, T);
-
-    unsafe impl<T: ?Sized> UnsafeUnpin for Wrapper<'_, T> where T: UnsafeUnpin {}
-
-    // This is an internal helper struct used by `pin-project-internal`.
-    //
-    // See https://github.com/taiki-e/pin-project/pull/53 for more details.
-    #[doc(hidden)]
-    pub struct AlwaysUnpin<'a, T>(PhantomData<&'a ()>, PhantomData<T>);
-
-    impl<T> Unpin for AlwaysUnpin<'_, T> {}
-
-    // This is an internal helper used to ensure a value is dropped.
-    #[doc(hidden)]
-    pub struct UnsafeDropInPlaceGuard<T: ?Sized>(pub *mut T);
-
-    impl<T: ?Sized> Drop for UnsafeDropInPlaceGuard<T> {
-        fn drop(&mut self) {
-            unsafe {
-                ptr::drop_in_place(self.0);
-            }
-        }
-    }
-
-    // This is an internal helper used to ensure a value is overwritten without
-    // its destructor being called.
-    #[doc(hidden)]
-    pub struct UnsafeOverwriteGuard<T> {
-        pub value: ManuallyDrop<T>,
-        pub target: *mut T,
-    }
-
-    impl<T> Drop for UnsafeOverwriteGuard<T> {
-        fn drop(&mut self) {
-            unsafe {
-                ptr::write(self.target, ptr::read(&*self.value));
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/cfg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/cfg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/cfg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/cfg.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-// Refs: https://doc.rust-lang.org/nightly/reference/attributes.html
-
-use pin_project::pin_project;
-use std::{marker::PhantomPinned, pin::Pin};
-
-fn is_unpin<T: Unpin>() {}
-
-#[cfg(target_os = "linux")]
-struct Linux;
-#[cfg(not(target_os = "linux"))]
-struct Other;
-
-// Use this type to check that `cfg(any())` is working properly.
-// If `cfg(any())` is not working properly, `is_unpin` will fail.
-struct Any(PhantomPinned);
-
-#[test]
-fn cfg() {
-    // structs
-
-    #[pin_project(project_replace)]
-    struct SameName {
-        #[cfg(target_os = "linux")]
-        #[pin]
-        inner: Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[pin]
-        inner: Other,
-        #[cfg(any())]
-        #[pin]
-        any: Any,
-    }
-
-    is_unpin::<SameName>();
-
-    #[cfg(target_os = "linux")]
-    let _x = SameName { inner: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let _x = SameName { inner: Other };
-
-    #[pin_project(project_replace)]
-    struct DifferentName {
-        #[cfg(target_os = "linux")]
-        #[pin]
-        l: Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[pin]
-        o: Other,
-        #[cfg(any())]
-        #[pin]
-        a: Any,
-    }
-
-    is_unpin::<DifferentName>();
-
-    #[cfg(target_os = "linux")]
-    let _x = DifferentName { l: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let _x = DifferentName { o: Other };
-
-    #[pin_project(project_replace)]
-    struct TupleStruct(
-        #[cfg(target_os = "linux")]
-        #[pin]
-        Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[pin]
-        Other,
-        #[cfg(any())]
-        #[pin]
-        Any,
-    );
-
-    is_unpin::<TupleStruct>();
-
-    #[cfg(target_os = "linux")]
-    let _x = TupleStruct(Linux);
-    #[cfg(not(target_os = "linux"))]
-    let _x = TupleStruct(Other);
-
-    // enums
-
-    #[pin_project(project_replace)]
-    enum Variant {
-        #[cfg(target_os = "linux")]
-        Inner(#[pin] Linux),
-        #[cfg(not(target_os = "linux"))]
-        Inner(#[pin] Other),
-
-        #[cfg(target_os = "linux")]
-        Linux(#[pin] Linux),
-        #[cfg(not(target_os = "linux"))]
-        Other(#[pin] Other),
-        #[cfg(any())]
-        Any(#[pin] Any),
-    }
-
-    is_unpin::<Variant>();
-
-    #[cfg(target_os = "linux")]
-    let _x = Variant::Inner(Linux);
-    #[cfg(not(target_os = "linux"))]
-    let _x = Variant::Inner(Other);
-
-    #[cfg(target_os = "linux")]
-    let _x = Variant::Linux(Linux);
-    #[cfg(not(target_os = "linux"))]
-    let _x = Variant::Other(Other);
-
-    #[pin_project(project_replace)]
-    enum Field {
-        SameName {
-            #[cfg(target_os = "linux")]
-            #[pin]
-            inner: Linux,
-            #[cfg(not(target_os = "linux"))]
-            #[pin]
-            inner: Other,
-            #[cfg(any())]
-            #[pin]
-            any: Any,
-        },
-        DifferentName {
-            #[cfg(target_os = "linux")]
-            #[pin]
-            l: Linux,
-            #[cfg(not(target_os = "linux"))]
-            #[pin]
-            w: Other,
-            #[cfg(any())]
-            #[pin]
-            any: Any,
-        },
-        TupleVariant(
-            #[cfg(target_os = "linux")]
-            #[pin]
-            Linux,
-            #[cfg(not(target_os = "linux"))]
-            #[pin]
-            Other,
-            #[cfg(any())]
-            #[pin]
-            Any,
-        ),
-    }
-
-    is_unpin::<Field>();
-
-    #[cfg(target_os = "linux")]
-    let _x = Field::SameName { inner: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let _x = Field::SameName { inner: Other };
-
-    #[cfg(target_os = "linux")]
-    let _x = Field::DifferentName { l: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let _x = Field::DifferentName { w: Other };
-
-    #[cfg(target_os = "linux")]
-    let _x = Field::TupleVariant(Linux);
-    #[cfg(not(target_os = "linux"))]
-    let _x = Field::TupleVariant(Other);
-}
-
-#[test]
-fn cfg_attr() {
-    #[pin_project(project_replace)]
-    struct SameCfg {
-        #[cfg(target_os = "linux")]
-        #[cfg_attr(target_os = "linux", pin)]
-        inner: Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[cfg_attr(not(target_os = "linux"), pin)]
-        inner: Other,
-        #[cfg(any())]
-        #[cfg_attr(any(), pin)]
-        any: Any,
-    }
-
-    is_unpin::<SameCfg>();
-
-    #[cfg(target_os = "linux")]
-    let mut x = SameCfg { inner: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let mut x = SameCfg { inner: Other };
-
-    let x = Pin::new(&mut x).project();
-    #[cfg(target_os = "linux")]
-    let _: Pin<&mut Linux> = x.inner;
-    #[cfg(not(target_os = "linux"))]
-    let _: Pin<&mut Other> = x.inner;
-
-    #[pin_project(project_replace)]
-    struct DifferentCfg {
-        #[cfg(target_os = "linux")]
-        #[cfg_attr(target_os = "linux", pin)]
-        inner: Linux,
-        #[cfg(not(target_os = "linux"))]
-        #[cfg_attr(target_os = "linux", pin)]
-        inner: Other,
-        #[cfg(any())]
-        #[cfg_attr(any(), pin)]
-        any: Any,
-    }
-
-    is_unpin::<DifferentCfg>();
-
-    #[cfg(target_os = "linux")]
-    let mut x = DifferentCfg { inner: Linux };
-    #[cfg(not(target_os = "linux"))]
-    let mut x = DifferentCfg { inner: Other };
-
-    let x = Pin::new(&mut x).project();
-    #[cfg(target_os = "linux")]
-    let _: Pin<&mut Linux> = x.inner;
-    #[cfg(not(target_os = "linux"))]
-    let _: &mut Other = x.inner;
-
-    #[cfg_attr(not(any()), pin_project)]
-    struct Foo<T> {
-        #[cfg_attr(not(any()), pin)]
-        inner: T,
-    }
-
-    let mut x = Foo { inner: 0_u8 };
-    let x = Pin::new(&mut x).project();
-    let _: Pin<&mut u8> = x.inner;
-}
-
-#[test]
-fn cfg_attr_any_packed() {
-    // Since `cfg(any())` can never be true, it is okay for this to pass.
-    #[pin_project(project_replace)]
-    #[cfg_attr(any(), repr(packed))]
-    struct Struct {
-        #[pin]
-        field: u32,
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/compiletest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/compiletest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/compiletest.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/compiletest.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-#[rustversion::attr(not(nightly), ignore)]
-#[test]
-fn ui() {
-    let t = trybuild::TestCases::new();
-    t.compile_fail("tests/ui/cfg/*.rs");
-    t.compile_fail("tests/ui/not_unpin/*.rs");
-    t.compile_fail("tests/ui/pin_project/*.rs");
-    t.compile_fail("tests/ui/pinned_drop/*.rs");
-    t.compile_fail("tests/ui/project/*.rs");
-    t.compile_fail("tests/ui/unsafe_unpin/*.rs");
-    t.compile_fail("tests/ui/unstable-features/*.rs");
-    t.pass("tests/ui/unstable-features/run-pass/*.rs");
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/drop_order.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/drop_order.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/drop_order.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/drop_order.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-use pin_project::pin_project;
-use std::{cell::Cell, pin::Pin, thread};
-
-struct D<'a>(&'a Cell<usize>, usize);
-
-impl Drop for D<'_> {
-    fn drop(&mut self) {
-        if !thread::panicking() {
-            let old = self.0.replace(self.1);
-            assert_eq!(old, self.1 - 1);
-        }
-    }
-}
-
-#[pin_project(project_replace)]
-struct StructPinned<'a> {
-    #[pin]
-    f1: D<'a>,
-    #[pin]
-    f2: D<'a>,
-}
-
-#[pin_project(project_replace)]
-struct StructUnpinned<'a> {
-    f1: D<'a>,
-    f2: D<'a>,
-}
-
-#[pin_project(project_replace)]
-struct TuplePinned<'a>(#[pin] D<'a>, #[pin] D<'a>);
-
-#[pin_project(project_replace)]
-struct TupleUnpinned<'a>(D<'a>, D<'a>);
-
-#[pin_project(project_replace= EnumProj)]
-enum Enum<'a> {
-    StructPinned {
-        #[pin]
-        f1: D<'a>,
-        #[pin]
-        f2: D<'a>,
-    },
-    StructUnpinned {
-        f1: D<'a>,
-        f2: D<'a>,
-    },
-    TuplePinned(#[pin] D<'a>, #[pin] D<'a>),
-    TupleUnpinned(D<'a>, D<'a>),
-}
-
-#[test]
-fn struct_pinned() {
-    {
-        let c = Cell::new(0);
-        let _x = StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
-    }
-    {
-        let c = Cell::new(0);
-        let mut _x = StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
-        let _y = Pin::new(&mut _x);
-        let _z = _y.project_replace(StructPinned { f1: D(&c, 3), f2: D(&c, 4) });
-    }
-}
-
-#[test]
-fn struct_unpinned() {
-    {
-        let c = Cell::new(0);
-        let _x = StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
-    }
-    {
-        let c = Cell::new(0);
-        let mut _x = StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
-        let _y = Pin::new(&mut _x);
-        let _z = _y.project_replace(StructUnpinned { f1: D(&c, 3), f2: D(&c, 4) });
-    }
-}
-
-#[test]
-fn tuple_pinned() {
-    {
-        let c = Cell::new(0);
-        let _x = TuplePinned(D(&c, 1), D(&c, 2));
-    }
-    {
-        let c = Cell::new(0);
-        let mut _x = TuplePinned(D(&c, 1), D(&c, 2));
-        let _y = Pin::new(&mut _x);
-        let _z = _y.project_replace(TuplePinned(D(&c, 3), D(&c, 4)));
-    }
-}
-
-#[test]
-fn tuple_unpinned() {
-    {
-        let c = Cell::new(0);
-        let _x = TupleUnpinned(D(&c, 1), D(&c, 2));
-    }
-    {
-        let c = Cell::new(0);
-        let mut _x = TupleUnpinned(D(&c, 1), D(&c, 2));
-        let _y = Pin::new(&mut _x);
-        let _z = _y.project_replace(TupleUnpinned(D(&c, 3), D(&c, 4)));
-    }
-}
-
-#[test]
-fn enum_struct() {
-    {
-        let c = Cell::new(0);
-        let _x = Enum::StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
-    }
-    {
-        let c = Cell::new(0);
-        let mut _x = Enum::StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
-        let _y = Pin::new(&mut _x);
-        let _z = _y.project_replace(Enum::StructPinned { f1: D(&c, 3), f2: D(&c, 4) });
-    }
-
-    {
-        let c = Cell::new(0);
-        let _x = Enum::StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
-    }
-    {
-        let c = Cell::new(0);
-        let mut _x = Enum::StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
-        let _y = Pin::new(&mut _x);
-        let _z = _y.project_replace(Enum::StructUnpinned { f1: D(&c, 3), f2: D(&c, 4) });
-    }
-}
-
-#[test]
-fn enum_tuple() {
-    {
-        let c = Cell::new(0);
-        let _x = Enum::TuplePinned(D(&c, 1), D(&c, 2));
-    }
-    {
-        let c = Cell::new(0);
-        let mut _x = Enum::TuplePinned(D(&c, 1), D(&c, 2));
-        let _y = Pin::new(&mut _x);
-        let _z = _y.project_replace(Enum::TuplePinned(D(&c, 3), D(&c, 4)));
-    }
-
-    {
-        let c = Cell::new(0);
-        let _x = Enum::TupleUnpinned(D(&c, 1), D(&c, 2));
-    }
-    {
-        let c = Cell::new(0);
-        let mut _x = Enum::TupleUnpinned(D(&c, 1), D(&c, 2));
-        let _y = Pin::new(&mut _x);
-        let _z = _y.project_replace(Enum::TupleUnpinned(D(&c, 3), D(&c, 4)));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/include/basic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/include/basic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/include/basic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/include/basic.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-include!("basic-safe-part.rs");
-
-unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-    ::pin_project::UnsafeUnpin for UnsafeUnpinStruct<T, U>
-{
-}
-unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-    ::pin_project::UnsafeUnpin for UnsafeUnpinTupleStruct<T, U>
-{
-}
-unsafe impl<T: ::pin_project::__private::Unpin, U: ::pin_project::__private::Unpin>
-    ::pin_project::UnsafeUnpin for UnsafeUnpinEnum<T, U>
-{
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/include/basic-safe-part.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/include/basic-safe-part.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/include/basic-safe-part.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/include/basic-safe-part.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,136 +0,0 @@
-// default #[pin_project], PinnedDrop, project_replace, !Unpin, and UnsafeUnpin without UnsafeUnpin impl are completely safe.
-
-#[::pin_project::pin_project]
-#[derive(Debug)]
-pub struct DefaultStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project]
-#[derive(Debug)]
-pub struct DefaultTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project]
-#[derive(Debug)]
-pub enum DefaultEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
-
-#[::pin_project::pin_project(PinnedDrop)]
-#[derive(Debug)]
-pub struct PinnedDropStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pinned_drop]
-impl<T, U> PinnedDrop for PinnedDropStruct<T, U> {
-    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-}
-
-#[::pin_project::pin_project(PinnedDrop)]
-#[derive(Debug)]
-pub struct PinnedDropTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pinned_drop]
-impl<T, U> PinnedDrop for PinnedDropTupleStruct<T, U> {
-    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-}
-
-#[::pin_project::pin_project(PinnedDrop)]
-#[derive(Debug)]
-pub enum PinnedDropEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
-
-#[::pin_project::pinned_drop]
-impl<T, U> PinnedDrop for PinnedDropEnum<T, U> {
-    fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-}
-
-#[::pin_project::pin_project(project_replace)]
-#[derive(Debug)]
-pub struct ReplaceStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project(project_replace)]
-#[derive(Debug)]
-pub struct ReplaceTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(project_replace)]
-#[derive(Debug)]
-pub enum ReplaceEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
-
-#[::pin_project::pin_project(UnsafeUnpin)]
-#[derive(Debug)]
-pub struct UnsafeUnpinStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project(UnsafeUnpin)]
-#[derive(Debug)]
-pub struct UnsafeUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(UnsafeUnpin)]
-#[derive(Debug)]
-pub enum UnsafeUnpinEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
-
-#[::pin_project::pin_project(!Unpin)]
-#[derive(Debug)]
-pub struct NotUnpinStruct<T, U> {
-    #[pin]
-    pub pinned: T,
-    pub unpinned: U,
-}
-
-#[::pin_project::pin_project(!Unpin)]
-#[derive(Debug)]
-pub struct NotUnpinTupleStruct<T, U>(#[pin] pub T, pub U);
-
-#[::pin_project::pin_project(!Unpin)]
-#[derive(Debug)]
-pub enum NotUnpinEnum<T, U> {
-    Struct {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    },
-    Tuple(#[pin] T, U),
-    Unit,
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/lint.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/lint.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/lint.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/lint.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-#![warn(nonstandard_style, rust_2018_idioms, rustdoc, unused)]
-// Note: This does not guarantee compatibility with forbidding these lints in the future.
-// If rustc adds a new lint, we may not be able to keep this.
-#![forbid(future_incompatible, rust_2018_compatibility)]
-#![allow(unknown_lints)] // for old compilers
-#![warn(
-    box_pointers,
-    deprecated_in_future,
-    elided_lifetimes_in_paths,
-    explicit_outlives_requirements,
-    macro_use_extern_crate,
-    meta_variable_misuse,
-    missing_copy_implementations,
-    missing_crate_level_docs,
-    missing_debug_implementations,
-    missing_docs,
-    non_ascii_idents,
-    single_use_lifetimes,
-    trivial_casts,
-    trivial_numeric_casts,
-    unaligned_references,
-    unreachable_pub,
-    unused_extern_crates,
-    unused_import_braces,
-    unused_lifetimes,
-    unused_qualifications,
-    unused_results,
-    variant_size_differences
-)]
-// absolute_paths_not_starting_with_crate, anonymous_parameters, keyword_idents, pointer_structural_match: forbidden as a part of future_incompatible
-// missing_doc_code_examples, private_doc_tests, invalid_html_tags: warned as a part of rustdoc
-// unsafe_block_in_unsafe_fn: unstable
-// unsafe_code: checked in forbid_unsafe module
-// unstable_features: deprecated: https://doc.rust-lang.org/beta/rustc/lints/listing/allowed-by-default.html#unstable-features
-// unused_crate_dependencies: unrelated
-#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-
-// Check interoperability with rustc and clippy lints.
-
-pub mod basic {
-    include!("include/basic.rs");
-}
-
-pub mod forbid_unsafe {
-    #![forbid(unsafe_code)]
-
-    include!("include/basic-safe-part.rs");
-}
-
-pub mod clippy {
-    use pin_project::pin_project;
-
-    #[rustversion::attr(before(1.37), allow(single_use_lifetimes))] // https://github.com/rust-lang/rust/issues/53738
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct MutMutStruct<'a, T, U> {
-        #[pin]
-        pub pinned: &'a mut T,
-        pub unpinned: &'a mut U,
-    }
-
-    #[rustversion::attr(before(1.37), allow(single_use_lifetimes))] // https://github.com/rust-lang/rust/issues/53738
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct MutMutTupleStruct<'a, T, U>(#[pin] &'a mut T, &'a mut U);
-
-    #[rustversion::attr(before(1.37), allow(single_use_lifetimes))] // https://github.com/rust-lang/rust/issues/53738
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub enum MutMutEnum<'a, T, U> {
-        Struct {
-            #[pin]
-            pinned: &'a mut T,
-            unpinned: &'a mut U,
-        },
-        Tuple(#[pin] &'a mut T, &'a mut U),
-        Unit,
-    }
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TypeRepetitionInBoundsStruct<T, U>
-    where
-        Self: Sized,
-    {
-        #[pin]
-        pub pinned: T,
-        pub unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct TypeRepetitionInBoundsTupleStruct<T, U>(#[pin] T, U)
-    where
-        Self: Sized;
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub enum TypeRepetitionInBoundsEnum<T, U>
-    where
-        Self: Sized,
-    {
-        Struct {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        },
-        Tuple(#[pin] T, U),
-        Unit,
-    }
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub struct UsedUnderscoreBindingStruct<T, U> {
-        #[pin]
-        pub _pinned: T,
-        pub _unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    #[derive(Debug)]
-    pub enum UsedUnderscoreBindingEnum<T, U> {
-        Struct {
-            #[pin]
-            _pinned: T,
-            _unpinned: U,
-        },
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/pinned_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/pinned_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/pinned_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/pinned_drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,293 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[test]
-fn safe_project() {
-    #[pin_project(PinnedDrop)]
-    pub struct Struct<'a> {
-        was_dropped: &'a mut bool,
-        #[pin]
-        field: u8,
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct<'_> {
-        fn drop(self: Pin<&mut Self>) {
-            **self.project().was_dropped = true;
-        }
-    }
-
-    let mut was_dropped = false;
-    drop(Struct { was_dropped: &mut was_dropped, field: 42 });
-    assert!(was_dropped);
-}
-
-#[test]
-fn self_argument_in_macro() {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    struct Struct {
-        x: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct {
-        fn drop(self: Pin<&mut Self>) {
-            let _: Vec<_> = vec![self.x];
-        }
-    }
-}
-
-#[test]
-fn self_in_macro_containing_fn() {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    macro_rules! mac {
-        ($($tt:tt)*) => {
-            $($tt)*
-        };
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub struct Struct {
-        _x: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct {
-        fn drop(self: Pin<&mut Self>) {
-            let _ = mac!({
-                impl Struct {
-                    pub fn _f(self) -> Self {
-                        self
-                    }
-                }
-            });
-        }
-    }
-}
-
-#[test]
-fn self_call() {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    pub struct Struct<T> {
-        _x: T,
-    }
-
-    trait Trait {
-        fn self_ref(&self) {}
-        fn self_pin_ref(self: Pin<&Self>) {}
-        fn self_mut(&mut self) {}
-        fn self_pin_mut(self: Pin<&mut Self>) {}
-        fn assoc_fn(_this: Pin<&mut Self>) {}
-    }
-
-    impl<T> Trait for Struct<T> {}
-
-    #[pinned_drop]
-    impl<T> PinnedDrop for Struct<T> {
-        fn drop(mut self: Pin<&mut Self>) {
-            self.self_ref();
-            self.as_ref().self_pin_ref();
-            self.self_mut();
-            self.as_mut().self_pin_mut();
-            Self::assoc_fn(self.as_mut());
-            <Self>::assoc_fn(self.as_mut());
-        }
-    }
-}
-
-#[test]
-fn self_struct() {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    pub struct Struct {
-        pub x: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct {
-        #[allow(irrefutable_let_patterns)]
-        #[allow(clippy::match_single_binding)]
-        fn drop(mut self: Pin<&mut Self>) {
-            // expr
-            let _: Self = Self { x: () };
-
-            // pat
-            match *self {
-                Self { x: _ } => {}
-            }
-            if let Self { x: _ } = *self {}
-            let Self { x: _ } = *self;
-        }
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub struct TupleStruct(());
-
-    #[pinned_drop]
-    impl PinnedDrop for TupleStruct {
-        #[allow(irrefutable_let_patterns)]
-        fn drop(mut self: Pin<&mut Self>) {
-            // expr
-            let _: Self = Self(());
-
-            // pat
-            match *self {
-                Self(_) => {}
-            }
-            if let Self(_) = *self {}
-            let Self(_) = *self;
-        }
-    }
-}
-
-#[rustversion::since(1.37)] // type_alias_enum_variants requires Rust 1.37
-#[test]
-fn self_enum() {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    pub enum Enum {
-        Struct { x: () },
-        Tuple(()),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Enum {
-        fn drop(mut self: Pin<&mut Self>) {
-            // expr
-            let _: Self = Self::Struct { x: () };
-            let _: Self = Self::Tuple(());
-
-            // pat
-            match *self {
-                Self::Struct { x: _ } => {}
-                Self::Tuple(_) => {}
-            }
-            if let Self::Struct { x: _ } = *self {}
-            if let Self::Tuple(_) = *self {}
-        }
-    }
-}
-
-// See also `ui/pinned_drop/self.rs`.
-#[rustversion::since(1.40)] // https://github.com/rust-lang/rust/pull/64690
-#[test]
-fn self_in_macro_def() {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    pub struct Struct {
-        _x: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct {
-        fn drop(self: Pin<&mut Self>) {
-            macro_rules! mac {
-                () => {{
-                    let _ = self;
-                }};
-            }
-            mac!();
-        }
-    }
-}
-
-#[test]
-fn self_inside_macro() {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    macro_rules! mac {
-        ($($tt:tt)*) => {
-            $($tt)*
-        };
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub struct Struct<T: Send>
-    where
-        mac!(Self): Send,
-    {
-        _x: T,
-    }
-
-    impl<T: Send> Struct<T> {
-        const ASSOCIATED1: &'static str = "1";
-        fn associated1() {}
-    }
-
-    trait Trait {
-        type Associated2;
-        const ASSOCIATED2: &'static str;
-        fn associated2();
-    }
-
-    impl<T: Send> Trait for Struct<T> {
-        type Associated2 = ();
-        const ASSOCIATED2: &'static str = "2";
-        fn associated2() {}
-    }
-
-    #[pinned_drop]
-    impl<T: Send> PinnedDrop for Struct<T>
-    where
-        mac!(Self): Send,
-    {
-        #[allow(path_statements)]
-        #[allow(clippy::no_effect)]
-        fn drop(self: Pin<&mut Self>) {
-            // inherent items
-            mac!(Self::ASSOCIATED1;);
-            mac!(<Self>::ASSOCIATED1;);
-            mac!(Self::associated1(););
-            mac!(<Self>::associated1(););
-
-            // trait items
-            mac!(let _: <Self as Trait>::Associated2;);
-            mac!(Self::ASSOCIATED2;);
-            mac!(<Self>::ASSOCIATED2;);
-            mac!(<Self as Trait>::ASSOCIATED2;);
-            mac!(Self::associated2(););
-            mac!(<Self>::associated2(););
-            mac!(<Self as Trait>::associated2(););
-        }
-    }
-}
-
-#[test]
-fn inside_macro() {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    struct Struct(());
-
-    macro_rules! mac {
-        ($expr:expr) => {
-            #[pinned_drop]
-            impl PinnedDrop for Struct {
-                #[allow(clippy::no_effect)]
-                fn drop(self: Pin<&mut Self>) {
-                    $expr;
-                }
-            }
-        };
-    }
-
-    mac!(1);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/pin_project.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/pin_project.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/pin_project.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/pin_project.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,885 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-use pin_project::{pin_project, pinned_drop, UnsafeUnpin};
-use std::{
-    marker::{PhantomData, PhantomPinned},
-    pin::Pin,
-};
-
-#[test]
-fn projection() {
-    #[pin_project(
-        project = StructProj,
-        project_ref = StructProjRef,
-        project_replace = StructProjOwn,
-    )]
-    struct Struct<T, U> {
-        #[pin]
-        field1: T,
-        field2: U,
-    }
-
-    let mut s = Struct { field1: 1, field2: 2 };
-    let mut s_orig = Pin::new(&mut s);
-    let s = s_orig.as_mut().project();
-
-    let x: Pin<&mut i32> = s.field1;
-    assert_eq!(*x, 1);
-
-    let y: &mut i32 = s.field2;
-    assert_eq!(*y, 2);
-
-    assert_eq!(s_orig.as_ref().field1, 1);
-    assert_eq!(s_orig.as_ref().field2, 2);
-
-    let mut s = Struct { field1: 1, field2: 2 };
-
-    let StructProj { field1, field2 } = Pin::new(&mut s).project();
-    let _: Pin<&mut i32> = field1;
-    let _: &mut i32 = field2;
-
-    let StructProjRef { field1, field2 } = Pin::new(&s).project_ref();
-    let _: Pin<&i32> = field1;
-    let _: &i32 = field2;
-
-    let mut s = Pin::new(&mut s);
-    let StructProjOwn { field1, field2 } =
-        s.as_mut().project_replace(Struct { field1: 3, field2: 4 });
-    let _: PhantomData<i32> = field1;
-    let _: i32 = field2;
-    assert_eq!(field2, 2);
-    assert_eq!(s.field1, 3);
-    assert_eq!(s.field2, 4);
-
-    #[pin_project(project_replace)]
-    struct TupleStruct<T, U>(#[pin] T, U);
-
-    let mut s = TupleStruct(1, 2);
-    let s = Pin::new(&mut s).project();
-
-    let x: Pin<&mut i32> = s.0;
-    assert_eq!(*x, 1);
-
-    let y: &mut i32 = s.1;
-    assert_eq!(*y, 2);
-
-    #[pin_project(project_replace, project = EnumProj)]
-    #[derive(Eq, PartialEq, Debug)]
-    enum Enum<A, B, C, D> {
-        Variant1(#[pin] A, B),
-        Variant2 {
-            #[pin]
-            field1: C,
-            field2: D,
-        },
-        None,
-    }
-
-    let mut e = Enum::Variant1(1, 2);
-    let mut e_orig = Pin::new(&mut e);
-    let e = e_orig.as_mut().project();
-
-    match e {
-        EnumProj::Variant1(x, y) => {
-            let x: Pin<&mut i32> = x;
-            assert_eq!(*x, 1);
-
-            let y: &mut i32 = y;
-            assert_eq!(*y, 2);
-        }
-        EnumProj::Variant2 { field1, field2 } => {
-            let _x: Pin<&mut i32> = field1;
-            let _y: &mut i32 = field2;
-        }
-        EnumProj::None => {}
-    }
-
-    assert_eq!(Pin::into_ref(e_orig).get_ref(), &Enum::Variant1(1, 2));
-
-    let mut e = Enum::Variant2 { field1: 3, field2: 4 };
-    let mut e = Pin::new(&mut e).project();
-
-    match &mut e {
-        EnumProj::Variant1(x, y) => {
-            let _x: &mut Pin<&mut i32> = x;
-            let _y: &mut &mut i32 = y;
-        }
-        EnumProj::Variant2 { field1, field2 } => {
-            let x: &mut Pin<&mut i32> = field1;
-            assert_eq!(**x, 3);
-
-            let y: &mut &mut i32 = field2;
-            assert_eq!(**y, 4);
-        }
-        EnumProj::None => {}
-    }
-
-    if let EnumProj::Variant2 { field1, field2 } = e {
-        let x: Pin<&mut i32> = field1;
-        assert_eq!(*x, 3);
-
-        let y: &mut i32 = field2;
-        assert_eq!(*y, 4);
-    }
-}
-
-#[test]
-fn enum_project_set() {
-    #[pin_project(project_replace, project = EnumProj)]
-    #[derive(Eq, PartialEq, Debug)]
-    enum Enum {
-        Variant1(#[pin] u8),
-        Variant2(bool),
-    }
-
-    let mut e = Enum::Variant1(25);
-    let mut e_orig = Pin::new(&mut e);
-    let e_proj = e_orig.as_mut().project();
-
-    match e_proj {
-        EnumProj::Variant1(val) => {
-            let new_e = Enum::Variant2(val.as_ref().get_ref() == &25);
-            e_orig.set(new_e);
-        }
-        _ => unreachable!(),
-    }
-
-    assert_eq!(e, Enum::Variant2(true));
-}
-
-#[test]
-fn where_clause() {
-    #[pin_project]
-    struct Struct<T>
-    where
-        T: Copy,
-    {
-        field: T,
-    }
-
-    #[pin_project]
-    struct TupleStruct<T>(T)
-    where
-        T: Copy;
-
-    #[pin_project]
-    enum EnumWhere<T>
-    where
-        T: Copy,
-    {
-        Variant(T),
-    }
-}
-
-#[test]
-fn where_clause_and_associated_type_field() {
-    #[pin_project(project_replace)]
-    struct Struct1<I>
-    where
-        I: Iterator,
-    {
-        #[pin]
-        field1: I,
-        field2: I::Item,
-    }
-
-    #[pin_project(project_replace)]
-    struct Struct2<I, J>
-    where
-        I: Iterator<Item = J>,
-    {
-        #[pin]
-        field1: I,
-        field2: J,
-    }
-
-    #[pin_project(project_replace)]
-    struct Struct3<T>
-    where
-        T: 'static,
-    {
-        field: T,
-    }
-
-    trait Static: 'static {}
-
-    impl<T> Static for Struct3<T> {}
-
-    #[pin_project(project_replace)]
-    struct TupleStruct<I>(#[pin] I, I::Item)
-    where
-        I: Iterator;
-
-    #[pin_project(project_replace)]
-    enum Enum<I>
-    where
-        I: Iterator,
-    {
-        Variant1(#[pin] I),
-        Variant2(I::Item),
-    }
-}
-
-#[test]
-fn derive_copy() {
-    #[pin_project(project_replace)]
-    #[derive(Clone, Copy)]
-    struct Struct<T> {
-        val: T,
-    }
-
-    fn is_copy<T: Copy>() {}
-
-    is_copy::<Struct<u8>>();
-}
-
-#[test]
-fn move_out() {
-    struct NotCopy;
-
-    #[pin_project(project_replace)]
-    struct Struct {
-        val: NotCopy,
-    }
-
-    let x = Struct { val: NotCopy };
-    let _val: NotCopy = x.val;
-
-    #[pin_project(project_replace)]
-    enum Enum {
-        Variant(NotCopy),
-    }
-
-    let x = Enum::Variant(NotCopy);
-    #[allow(clippy::infallible_destructuring_match)]
-    let _val: NotCopy = match x {
-        Enum::Variant(val) => val,
-    };
-}
-
-#[test]
-fn trait_bounds_on_type_generics() {
-    #[pin_project(project_replace)]
-    pub struct Struct1<'a, T: ?Sized> {
-        field: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct2<'a, T: ::core::fmt::Debug> {
-        field: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct3<'a, T: core::fmt::Debug> {
-        field: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct4<'a, T: core::fmt::Debug + core::fmt::Display> {
-        field: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct5<'a, T: core::fmt::Debug + ?Sized> {
-        field: &'a mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct6<'a, T: core::fmt::Debug = [u8; 16]> {
-        field: &'a mut T,
-    }
-
-    let _: Struct6<'_> = Struct6 { field: &mut [0u8; 16] };
-
-    #[pin_project(project_replace)]
-    pub struct Struct7<T: 'static> {
-        field: T,
-    }
-
-    trait Static: 'static {}
-
-    impl<T> Static for Struct7<T> {}
-
-    #[pin_project(project_replace)]
-    pub struct Struct8<'a, 'b: 'a> {
-        field1: &'a u8,
-        field2: &'b u8,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct TupleStruct<'a, T: ?Sized>(&'a mut T);
-
-    #[pin_project(project_replace)]
-    enum Enum<'a, T: ?Sized> {
-        Variant(&'a mut T),
-    }
-}
-
-#[test]
-fn overlapping_lifetime_names() {
-    #[pin_project(project_replace)]
-    pub struct Struct1<'pin, T> {
-        #[pin]
-        field: &'pin mut T,
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct2<'pin, 'pin_, 'pin__> {
-        #[pin]
-        field: &'pin &'pin_ &'pin__ (),
-    }
-
-    pub trait A<'a> {}
-
-    #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-    #[pin_project(project_replace)]
-    pub struct HRTB<'pin___, T>
-    where
-        for<'pin> &'pin T: Unpin,
-        T: for<'pin> A<'pin>,
-        for<'pin, 'pin_, 'pin__> &'pin &'pin_ &'pin__ T: Unpin,
-    {
-        #[pin]
-        field: &'pin___ mut T,
-    }
-}
-
-#[test]
-fn combine() {
-    #[pin_project(PinnedDrop, UnsafeUnpin)]
-    pub struct PinnedDropWithUnsafeUnpin<T> {
-        #[pin]
-        field: T,
-    }
-
-    #[pinned_drop]
-    impl<T> PinnedDrop for PinnedDropWithUnsafeUnpin<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    unsafe impl<T: Unpin> UnsafeUnpin for PinnedDropWithUnsafeUnpin<T> {}
-
-    #[pin_project(PinnedDrop, !Unpin)]
-    pub struct PinnedDropWithNotUnpin<T> {
-        #[pin]
-        field: T,
-    }
-
-    #[pinned_drop]
-    impl<T> PinnedDrop for PinnedDropWithNotUnpin<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(UnsafeUnpin, project_replace)]
-    pub struct UnsafeUnpinWithReplace<T> {
-        #[pin]
-        field: T,
-    }
-
-    unsafe impl<T: Unpin> UnsafeUnpin for UnsafeUnpinWithReplace<T> {}
-
-    #[pin_project(!Unpin, project_replace)]
-    pub struct NotUnpinWithReplace<T> {
-        #[pin]
-        field: T,
-    }
-}
-
-#[test]
-fn private_type_in_public_type() {
-    #[pin_project(project_replace)]
-    pub struct PublicStruct<T> {
-        #[pin]
-        inner: PrivateStruct<T>,
-    }
-
-    struct PrivateStruct<T>(T);
-}
-
-#[allow(clippy::needless_lifetimes)]
-#[test]
-fn lifetime_project() {
-    #[pin_project(project_replace)]
-    struct Struct1<T, U> {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    struct Struct2<'a, T, U> {
-        #[pin]
-        pinned: &'a mut T,
-        unpinned: U,
-    }
-
-    #[pin_project(project_replace, project = EnumProj, project_ref = EnumProjRef)]
-    enum Enum<T, U> {
-        Variant {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        },
-    }
-
-    impl<T, U> Struct1<T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut T> {
-            self.project().pinned
-        }
-    }
-
-    impl<'b, T, U> Struct2<'b, T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a &'b mut T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut &'b mut T> {
-            self.project().pinned
-        }
-    }
-
-    impl<T, U> Enum<T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a T> {
-            match self.project_ref() {
-                EnumProjRef::Variant { pinned, .. } => pinned,
-            }
-        }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut T> {
-            match self.project() {
-                EnumProj::Variant { pinned, .. } => pinned,
-            }
-        }
-    }
-}
-
-#[rustversion::since(1.36)] // https://github.com/rust-lang/rust/pull/61207
-#[test]
-fn lifetime_project_elided() {
-    #[pin_project(project_replace)]
-    struct Struct1<T, U> {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    }
-
-    #[pin_project(project_replace)]
-    struct Struct2<'a, T, U> {
-        #[pin]
-        pinned: &'a mut T,
-        unpinned: U,
-    }
-
-    #[pin_project(project_replace, project = EnumProj, project_ref = EnumProjRef)]
-    enum Enum<T, U> {
-        Variant {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        },
-    }
-
-    impl<T, U> Struct1<T, U> {
-        fn get_pin_ref(self: Pin<&Self>) -> Pin<&T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
-            self.project().pinned
-        }
-    }
-
-    impl<'b, T, U> Struct2<'b, T, U> {
-        fn get_pin_ref(self: Pin<&Self>) -> Pin<&&'b mut T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut &'b mut T> {
-            self.project().pinned
-        }
-    }
-
-    impl<T, U> Enum<T, U> {
-        fn get_pin_ref(self: Pin<&Self>) -> Pin<&T> {
-            match self.project_ref() {
-                EnumProjRef::Variant { pinned, .. } => pinned,
-            }
-        }
-        fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
-            match self.project() {
-                EnumProj::Variant { pinned, .. } => pinned,
-            }
-        }
-    }
-}
-
-mod visibility {
-    use pin_project::pin_project;
-
-    #[pin_project(project_replace)]
-    pub(crate) struct A {
-        pub b: u8,
-    }
-}
-
-#[test]
-fn visibility() {
-    let mut x = visibility::A { b: 0 };
-    let x = Pin::new(&mut x);
-    let y = x.as_ref().project_ref();
-    let _: &u8 = y.b;
-    let y = x.project();
-    let _: &mut u8 = y.b;
-}
-
-#[test]
-fn trivial_bounds() {
-    #[pin_project(project_replace)]
-    pub struct NoGenerics {
-        #[pin]
-        field: PhantomPinned,
-    }
-}
-
-#[test]
-fn dst() {
-    #[pin_project]
-    struct Struct1<T: ?Sized> {
-        x: T,
-    }
-
-    let mut x = Struct1 { x: 0_u8 };
-    let x: Pin<&mut Struct1<dyn core::fmt::Debug>> = Pin::new(&mut x as _);
-    let _y: &mut (dyn core::fmt::Debug) = x.project().x;
-
-    #[pin_project]
-    struct Struct2<T: ?Sized> {
-        #[pin]
-        x: T,
-    }
-
-    let mut x = Struct2 { x: 0_u8 };
-    let x: Pin<&mut Struct2<dyn core::fmt::Debug + Unpin>> = Pin::new(&mut x as _);
-    let _y: Pin<&mut (dyn core::fmt::Debug + Unpin)> = x.project().x;
-
-    #[pin_project(UnsafeUnpin)]
-    struct Struct5<T: ?Sized> {
-        x: T,
-    }
-
-    #[pin_project(UnsafeUnpin)]
-    struct Struct6<T: ?Sized> {
-        #[pin]
-        x: T,
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Struct7<T: ?Sized> {
-        x: T,
-    }
-
-    #[pinned_drop]
-    impl<T: ?Sized> PinnedDrop for Struct7<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Struct8<T: ?Sized> {
-        #[pin]
-        x: T,
-    }
-
-    #[pinned_drop]
-    impl<T: ?Sized> PinnedDrop for Struct8<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(!Unpin)]
-    struct Struct9<T: ?Sized> {
-        x: T,
-    }
-
-    #[pin_project(!Unpin)]
-    struct Struct10<T: ?Sized> {
-        #[pin]
-        x: T,
-    }
-
-    #[pin_project]
-    struct TupleStruct1<T: ?Sized>(T);
-
-    #[pin_project]
-    struct TupleStruct2<T: ?Sized>(#[pin] T);
-
-    #[pin_project(UnsafeUnpin)]
-    struct TupleStruct5<T: ?Sized>(T);
-
-    #[pin_project(UnsafeUnpin)]
-    struct TupleStruct6<T: ?Sized>(#[pin] T);
-
-    #[pin_project(PinnedDrop)]
-    struct TupleStruct7<T: ?Sized>(T);
-
-    #[pinned_drop]
-    impl<T: ?Sized> PinnedDrop for TupleStruct7<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct TupleStruct8<T: ?Sized>(#[pin] T);
-
-    #[pinned_drop]
-    impl<T: ?Sized> PinnedDrop for TupleStruct8<T> {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(!Unpin)]
-    struct TupleStruct9<T: ?Sized>(T);
-
-    #[pin_project(!Unpin)]
-    struct TupleStruct10<T: ?Sized>(#[pin] T);
-}
-
-#[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
-#[test]
-fn unsized_in_where_clause() {
-    #[pin_project]
-    struct Struct3<T>
-    where
-        T: ?Sized,
-    {
-        x: T,
-    }
-
-    #[pin_project]
-    struct Struct4<T>
-    where
-        T: ?Sized,
-    {
-        #[pin]
-        x: T,
-    }
-
-    #[pin_project]
-    struct TupleStruct3<T>(T)
-    where
-        T: ?Sized;
-
-    #[pin_project]
-    struct TupleStruct4<T>(#[pin] T)
-    where
-        T: ?Sized;
-}
-
-#[test]
-fn dyn_type() {
-    #[pin_project]
-    struct Struct1 {
-        f: dyn core::fmt::Debug,
-    }
-
-    #[pin_project]
-    struct Struct2 {
-        #[pin]
-        f: dyn core::fmt::Debug,
-    }
-
-    #[pin_project]
-    struct Struct3 {
-        f: dyn core::fmt::Debug + Send,
-    }
-
-    #[pin_project]
-    struct Struct4 {
-        #[pin]
-        f: dyn core::fmt::Debug + Send,
-    }
-
-    #[pin_project]
-    struct TupleStruct1(dyn core::fmt::Debug);
-
-    #[pin_project]
-    struct TupleStruct2(#[pin] dyn core::fmt::Debug);
-
-    #[pin_project]
-    struct TupleStruct3(dyn core::fmt::Debug + Send);
-
-    #[pin_project]
-    struct TupleStruct4(#[pin] dyn core::fmt::Debug + Send);
-}
-
-#[test]
-fn parse_self() {
-    macro_rules! mac {
-        ($($tt:tt)*) => {
-            $($tt)*
-        };
-    }
-
-    pub trait Trait {
-        type Assoc;
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Generics<T: Trait<Assoc = Self>>
-    where
-        Self: Trait<Assoc = Self>,
-        <Self as Trait>::Assoc: Sized,
-        mac!(Self): Trait<Assoc = mac!(Self)>,
-    {
-        _f: T,
-    }
-
-    impl<T: Trait<Assoc = Self>> Trait for Generics<T> {
-        type Assoc = Self;
-    }
-
-    #[pin_project(project_replace)]
-    pub struct Struct {
-        _f1: Box<Self>,
-        _f2: Box<<Self as Trait>::Assoc>,
-        _f3: Box<mac!(Self)>,
-        _f4: [(); Self::ASSOC],
-        _f5: [(); Self::assoc()],
-        _f6: [(); mac!(Self::assoc())],
-    }
-
-    impl Struct {
-        const ASSOC: usize = 1;
-        const fn assoc() -> usize {
-            0
-        }
-    }
-
-    impl Trait for Struct {
-        type Assoc = Self;
-    }
-
-    #[pin_project(project_replace)]
-    struct Tuple(
-        Box<Self>,
-        Box<<Self as Trait>::Assoc>,
-        Box<mac!(Self)>,
-        [(); Self::ASSOC],
-        [(); Self::assoc()],
-        [(); mac!(Self::assoc())],
-    );
-
-    impl Tuple {
-        const ASSOC: usize = 1;
-        const fn assoc() -> usize {
-            0
-        }
-    }
-
-    impl Trait for Tuple {
-        type Assoc = Self;
-    }
-
-    #[pin_project(project_replace)]
-    enum Enum {
-        Struct {
-            _f1: Box<Self>,
-            _f2: Box<<Self as Trait>::Assoc>,
-            _f3: Box<mac!(Self)>,
-            _f4: [(); Self::ASSOC],
-            _f5: [(); Self::assoc()],
-            _f6: [(); mac!(Self::assoc())],
-        },
-        Tuple(
-            Box<Self>,
-            Box<<Self as Trait>::Assoc>,
-            Box<mac!(Self)>,
-            [(); Self::ASSOC],
-            [(); Self::assoc()],
-            [(); mac!(Self::assoc())],
-        ),
-    }
-
-    impl Enum {
-        const ASSOC: usize = 1;
-        const fn assoc() -> usize {
-            0
-        }
-    }
-
-    impl Trait for Enum {
-        type Assoc = Self;
-    }
-}
-
-#[test]
-fn no_infer_outlives() {
-    trait Bar<X> {
-        type Y;
-    }
-
-    struct Example<A>(A);
-
-    impl<X, T> Bar<X> for Example<T> {
-        type Y = Option<T>;
-    }
-
-    #[pin_project(project_replace)]
-    struct Foo<A, B> {
-        _x: <Example<A> as Bar<B>>::Y,
-    }
-}
-
-// https://github.com/rust-lang/rust/issues/47949
-// https://github.com/taiki-e/pin-project/pull/194#discussion_r419098111
-#[allow(clippy::many_single_char_names)]
-#[test]
-fn project_replace_panic() {
-    use std::panic;
-
-    #[pin_project(project_replace)]
-    struct S<T, U> {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    }
-
-    struct D<'a>(&'a mut bool, bool);
-    impl Drop for D<'_> {
-        fn drop(&mut self) {
-            *self.0 = true;
-            if self.1 {
-                panic!()
-            }
-        }
-    }
-
-    let (mut a, mut b, mut c, mut d) = (false, false, false, false);
-    let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let mut x = S { pinned: D(&mut a, true), unpinned: D(&mut b, false) };
-        let _y = Pin::new(&mut x)
-            .project_replace(S { pinned: D(&mut c, false), unpinned: D(&mut d, false) });
-        // Previous `x.pinned` was dropped and panicked when `project_replace` is
-        // called, so this is unreachable.
-        unreachable!();
-    }));
-    assert!(res.is_err());
-    assert!(a);
-    assert!(b);
-    assert!(c);
-    assert!(d);
-
-    let (mut a, mut b, mut c, mut d) = (false, false, false, false);
-    let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let mut x = S { pinned: D(&mut a, false), unpinned: D(&mut b, true) };
-        {
-            let _y = Pin::new(&mut x)
-                .project_replace(S { pinned: D(&mut c, false), unpinned: D(&mut d, false) });
-            // `_y` (previous `x.unpinned`) live to the end of this scope, so
-            // this is not unreachable.
-            // unreachable!();
-        }
-        unreachable!();
-    }));
-    assert!(res.is_err());
-    assert!(a);
-    assert!(b);
-    assert!(c);
-    assert!(d);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_if_attr.rs.in thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_if_attr.rs.in
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_if_attr.rs.in	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_if_attr.rs.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#[test]
-#[project]
-fn project_if_let() {
-    #[pin_project]
-    enum Foo<A, B> {
-        Variant1(#[pin] A),
-        Variant2(u8),
-        Variant3 {
-            #[pin]
-            field: B,
-        },
-    }
-
-    let mut x: Foo<bool, f32> = Foo::Variant1(true);
-    let x = Pin::new(&mut x).project();
-
-    #[project]
-    if let Foo::Variant1(a) = x {
-        let a: Pin<&mut bool> = a;
-        assert_eq!(*a, true);
-    } else if let Foo::Variant2(_) = x {
-        unreachable!();
-    } else if let Foo::Variant3 { .. } = x {
-        unreachable!();
-    }
-}
-
-#[allow(clippy::unnecessary_operation, clippy::unit_arg)]
-#[test]
-#[project]
-fn non_stmt_expr_if_let() {
-    #[pin_project]
-    enum Enum<A> {
-        Variant(#[pin] A),
-    }
-
-    let mut x = Enum::Variant(1);
-    let x = Pin::new(&mut x).project();
-
-    #[allow(irrefutable_let_patterns)]
-    Some(
-        #[project]
-        if let Enum::Variant(_x) = x {},
-    );
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_ref.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_ref.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_ref.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_ref.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-#![allow(deprecated)]
-
-use pin_project::{pin_project, project_ref};
-use std::pin::Pin;
-
-#[project_ref] // Nightly does not need a dummy attribute to the function.
-#[test]
-fn project_stmt_expr() {
-    #[pin_project]
-    struct Struct<T, U> {
-        #[pin]
-        field1: T,
-        field2: U,
-    }
-
-    let s = Struct { field1: 1, field2: 2 };
-
-    #[project_ref]
-    let Struct { field1, field2 } = Pin::new(&s).project_ref();
-
-    let x: Pin<&i32> = field1;
-    assert_eq!(*x, 1);
-
-    let y: &i32 = field2;
-    assert_eq!(*y, 2);
-
-    // tuple struct
-
-    #[pin_project]
-    struct TupleStruct<T, U>(#[pin] T, U);
-
-    let s = TupleStruct(1, 2);
-
-    #[project_ref]
-    let TupleStruct(x, y) = Pin::new(&s).project_ref();
-
-    let x: Pin<&i32> = x;
-    assert_eq!(*x, 1);
-
-    let y: &i32 = y;
-    assert_eq!(*y, 2);
-
-    #[pin_project]
-    enum Enum<A, B, C, D> {
-        Variant1(#[pin] A, B),
-        Variant2 {
-            #[pin]
-            field1: C,
-            field2: D,
-        },
-        None,
-    }
-
-    let e = Enum::Variant1(1, 2);
-
-    let e = Pin::new(&e).project_ref();
-
-    #[project_ref]
-    match &e {
-        Enum::Variant1(x, y) => {
-            let x: &Pin<&i32> = x;
-            assert_eq!(**x, 1);
-
-            let y: &&i32 = y;
-            assert_eq!(**y, 2);
-        }
-        Enum::Variant2 { field1, field2 } => {
-            let _x: &Pin<&i32> = field1;
-            let _y: &&i32 = field2;
-        }
-        Enum::None => {}
-    }
-
-    #[project_ref]
-    let val = match &e {
-        Enum::Variant1(_, _) => true,
-        Enum::Variant2 { .. } => false,
-        Enum::None => false,
-    };
-    assert_eq!(val, true);
-}
-
-#[test]
-fn project_impl() {
-    #[pin_project]
-    struct HasGenerics<T, U> {
-        #[pin]
-        field1: T,
-        field2: U,
-    }
-
-    #[project_ref]
-    impl<T, U> HasGenerics<T, U> {
-        fn a(self) {
-            let Self { field1, field2 } = self;
-
-            let _x: Pin<&T> = field1;
-            let _y: &U = field2;
-        }
-    }
-
-    #[pin_project]
-    struct NoneGenerics {
-        #[pin]
-        field1: i32,
-        field2: u32,
-    }
-
-    #[project_ref]
-    impl NoneGenerics {}
-
-    #[pin_project]
-    struct HasLifetimes<'a, T, U> {
-        #[pin]
-        field1: &'a mut T,
-        field2: U,
-    }
-
-    #[project_ref]
-    impl<T, U> HasLifetimes<'_, T, U> {}
-
-    #[pin_project]
-    struct HasOverlappingLifetimes<'pin, T, U> {
-        #[pin]
-        field1: &'pin mut T,
-        field2: U,
-    }
-
-    #[allow(single_use_lifetimes)]
-    #[project_ref]
-    impl<'pin, T, U> HasOverlappingLifetimes<'pin, T, U> {}
-
-    #[pin_project]
-    struct HasOverlappingLifetimes2<T, U> {
-        #[pin]
-        field1: T,
-        field2: U,
-    }
-
-    #[allow(single_use_lifetimes)]
-    #[allow(clippy::needless_lifetimes)]
-    #[project_ref]
-    impl<T, U> HasOverlappingLifetimes2<T, U> {
-        fn foo<'pin>(&'pin self) {}
-    }
-}
-
-#[project_ref]
-#[test]
-fn combine() {
-    #[pin_project(project_replace)]
-    enum Enum<A> {
-        V1(#[pin] A),
-        V2,
-    }
-
-    let mut x = Enum::V1(1);
-    #[project]
-    match Pin::new(&mut x).project() {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-    #[project_ref]
-    match Pin::new(&x).project_ref() {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-    #[project_replace]
-    match Pin::new(&mut x).project_replace(Enum::V2) {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_replace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_replace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_replace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project_replace.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-#![allow(deprecated)]
-
-use pin_project::{pin_project, project_replace};
-use std::{marker::PhantomData, pin::Pin};
-
-#[project_replace] // Nightly does not need a dummy attribute to the function.
-#[test]
-fn project_replace_stmt_expr() {
-    #[pin_project(project_replace)]
-    struct Struct<T, U> {
-        #[pin]
-        field1: T,
-        field2: U,
-    }
-
-    let mut s = Struct { field1: 1, field2: 2 };
-
-    #[project_replace]
-    let Struct { field1, field2 } =
-        Pin::new(&mut s).project_replace(Struct { field1: 42, field2: 43 });
-
-    let _x: PhantomData<i32> = field1;
-
-    let y: i32 = field2;
-    assert_eq!(y, 2);
-
-    // tuple struct
-
-    #[pin_project(project_replace)]
-    struct TupleStruct<T, U>(#[pin] T, U);
-
-    let mut s = TupleStruct(1, 2);
-
-    #[project_replace]
-    let TupleStruct(x, y) = Pin::new(&mut s).project_replace(TupleStruct(42, 43));
-
-    let _x: PhantomData<i32> = x;
-    let y: i32 = y;
-    assert_eq!(y, 2);
-
-    #[pin_project(project_replace)]
-    enum Enum<A, B, C, D> {
-        Variant1(#[pin] A, B),
-        Variant2 {
-            #[pin]
-            field1: C,
-            field2: D,
-        },
-        None,
-    }
-
-    let mut e = Enum::Variant1(1, 2);
-
-    let e = Pin::new(&mut e).project_replace(Enum::None);
-
-    #[project_replace]
-    match e {
-        Enum::Variant1(x, y) => {
-            let _x: PhantomData<i32> = x;
-            let y: i32 = y;
-            assert_eq!(y, 2);
-        }
-        Enum::Variant2 { field1, field2 } => {
-            let _x: PhantomData<i32> = field1;
-            let _y: i32 = field2;
-            panic!()
-        }
-        Enum::None => panic!(),
-    }
-}
-
-#[project_replace]
-#[test]
-fn combine() {
-    #[pin_project(project_replace)]
-    enum Enum<A> {
-        V1(#[pin] A),
-        V2,
-    }
-
-    let mut x = Enum::V1(1);
-    #[project]
-    match Pin::new(&mut x).project() {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-    #[project_ref]
-    match Pin::new(&x).project_ref() {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-    #[project_replace]
-    match Pin::new(&mut x).project_replace(Enum::V2) {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/project.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,298 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-#![allow(deprecated)]
-
-// Ceurrently, `#[attr] if true {}` doesn't even *parse* on MSRV,
-// which means that it will error even behind a `#[rustversion::since(..)]`
-//
-// This trick makes sure that we don't even attempt to parse
-// the `#[project] if let _` test on MSRV.
-#[rustversion::since(1.43)]
-include!("project_if_attr.rs.in");
-
-use pin_project::{pin_project, project, project_ref, project_replace};
-use std::pin::Pin;
-
-#[project] // Nightly does not need a dummy attribute to the function.
-#[test]
-fn project_stmt_expr() {
-    #[pin_project]
-    struct Struct<T, U> {
-        #[pin]
-        field1: T,
-        field2: U,
-    }
-
-    let mut s = Struct { field1: 1, field2: 2 };
-
-    #[project]
-    let Struct { field1, field2 } = Pin::new(&mut s).project();
-
-    let x: Pin<&mut i32> = field1;
-    assert_eq!(*x, 1);
-
-    let y: &mut i32 = field2;
-    assert_eq!(*y, 2);
-
-    #[pin_project]
-    struct TupleStruct<T, U>(#[pin] T, U);
-
-    let mut s = TupleStruct(1, 2);
-
-    #[project]
-    let TupleStruct(x, y) = Pin::new(&mut s).project();
-
-    let x: Pin<&mut i32> = x;
-    assert_eq!(*x, 1);
-
-    let y: &mut i32 = y;
-    assert_eq!(*y, 2);
-
-    #[pin_project]
-    enum Enum<A, B, C, D> {
-        Variant1(#[pin] A, B),
-        Variant2 {
-            #[pin]
-            field1: C,
-            field2: D,
-        },
-        None,
-    }
-
-    let mut e = Enum::Variant1(1, 2);
-
-    let mut e = Pin::new(&mut e).project();
-
-    #[project]
-    match &mut e {
-        Enum::Variant1(x, y) => {
-            let x: &mut Pin<&mut i32> = x;
-            assert_eq!(**x, 1);
-
-            let y: &mut &mut i32 = y;
-            assert_eq!(**y, 2);
-        }
-        Enum::Variant2 { field1, field2 } => {
-            let _x: &mut Pin<&mut i32> = field1;
-            let _y: &mut &mut i32 = field2;
-        }
-        Enum::None => {}
-    }
-
-    #[project]
-    let val = match &mut e {
-        Enum::Variant1(_, _) => true,
-        Enum::Variant2 { .. } => false,
-        Enum::None => false,
-    };
-    assert_eq!(val, true);
-}
-
-#[test]
-fn project_impl() {
-    #[pin_project]
-    struct HasGenerics<T, U> {
-        #[pin]
-        field1: T,
-        field2: U,
-    }
-
-    #[project]
-    impl<T, U> HasGenerics<T, U> {
-        fn a(self) {
-            let Self { field1, field2 } = self;
-
-            let _x: Pin<&mut T> = field1;
-            let _y: &mut U = field2;
-        }
-    }
-
-    #[pin_project]
-    struct NoneGenerics {
-        #[pin]
-        field1: i32,
-        field2: u32,
-    }
-
-    #[project]
-    impl NoneGenerics {}
-
-    #[pin_project]
-    struct HasLifetimes<'a, T, U> {
-        #[pin]
-        field1: &'a mut T,
-        field2: U,
-    }
-
-    #[project]
-    impl<T, U> HasLifetimes<'_, T, U> {}
-
-    #[pin_project]
-    struct HasOverlappingLifetimes<'pin, T, U> {
-        #[pin]
-        field1: &'pin mut T,
-        field2: U,
-    }
-
-    #[allow(single_use_lifetimes)]
-    #[project]
-    impl<'pin, T, U> HasOverlappingLifetimes<'pin, T, U> {}
-
-    #[pin_project]
-    struct HasOverlappingLifetimes2<T, U> {
-        #[pin]
-        field1: T,
-        field2: U,
-    }
-
-    #[allow(single_use_lifetimes)]
-    #[allow(clippy::needless_lifetimes)]
-    #[project]
-    impl<T, U> HasOverlappingLifetimes2<T, U> {
-        fn foo<'pin>(&'pin self) {}
-    }
-}
-
-#[pin_project]
-struct A {
-    #[pin]
-    field: u8,
-}
-
-mod project_use_1 {
-    use crate::A;
-    use pin_project::project;
-    use std::pin::Pin;
-
-    #[project]
-    use crate::A;
-
-    #[project]
-    #[test]
-    fn project_use() {
-        let mut x = A { field: 0 };
-        #[project]
-        let A { field } = Pin::new(&mut x).project();
-        let _: Pin<&mut u8> = field;
-    }
-}
-
-mod project_use_2 {
-    #[project]
-    use crate::A;
-    use pin_project::project;
-
-    #[project]
-    impl A {
-        fn project_use(self) {}
-    }
-}
-
-#[allow(clippy::unnecessary_operation, clippy::unit_arg)]
-#[test]
-#[project]
-fn non_stmt_expr_match() {
-    #[pin_project]
-    enum Enum<A> {
-        Variant(#[pin] A),
-    }
-
-    let mut x = Enum::Variant(1);
-    let x = Pin::new(&mut x).project();
-
-    Some(
-        #[project]
-        match x {
-            Enum::Variant(_x) => {}
-        },
-    );
-}
-
-// https://github.com/taiki-e/pin-project/issues/206
-#[allow(clippy::unnecessary_operation, clippy::unit_arg)]
-#[test]
-#[project]
-fn issue_206() {
-    #[pin_project]
-    enum Enum<A> {
-        Variant(#[pin] A),
-    }
-
-    let mut x = Enum::Variant(1);
-    let x = Pin::new(&mut x).project();
-
-    Some({
-        #[project]
-        match &x {
-            Enum::Variant(_) => {}
-        }
-    });
-
-    #[allow(clippy::never_loop)]
-    loop {
-        let _ = {
-            #[project]
-            match &x {
-                Enum::Variant(_) => {}
-            }
-        };
-        break;
-    }
-}
-
-#[project]
-#[test]
-fn combine() {
-    #[pin_project(project_replace)]
-    enum Enum<A> {
-        V1(#[pin] A),
-        V2,
-    }
-
-    let mut x = Enum::V1(1);
-    #[project]
-    match Pin::new(&mut x).project() {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-    #[project_ref]
-    match Pin::new(&x).project_ref() {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-    #[project_replace]
-    match Pin::new(&mut x).project_replace(Enum::V2) {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-}
-
-// FIXME: This should be denied, but allowed for compatibility at this time.
-#[project]
-#[project_ref]
-#[project_replace]
-#[test]
-fn combine_compat() {
-    #[pin_project(project_replace)]
-    enum Enum<A> {
-        V1(#[pin] A),
-        V2,
-    }
-
-    let mut x = Enum::V1(1);
-    #[project]
-    match Pin::new(&mut x).project() {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-    #[project_ref]
-    match Pin::new(&x).project_ref() {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-    #[project_replace]
-    match Pin::new(&mut x).project_replace(Enum::V2) {
-        Enum::V1(_) => {}
-        Enum::V2 => unreachable!(),
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/repr_packed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/repr_packed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/repr_packed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/repr_packed.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![forbid(safe_packed_borrows)]
-
-use std::cell::Cell;
-
-// Ensure that the compiler doesn't copy the fields
-// of #[repr(packed)] types during drop, if the field has alignment 1
-// (that is, any reference to the field is guaranteed to have proper alignment)
-// We are currently unable to statically prevent the usage of #[pin_project]
-// on #[repr(packed)] types composed entirely of fields of alignment 1.
-// This shouldn't lead to undefined behavior, as long as the compiler doesn't
-// try to move the field anyway during drop.
-//
-// This tests validates that the compiler is doing what we expect.
-#[test]
-fn weird_repr_packed() {
-    // We keep track of the field address during
-    // drop using a thread local, to avoid changing
-    // the layout of our #[repr(packed)] type.
-    thread_local! {
-        static FIELD_ADDR: Cell<usize> = Cell::new(0);
-    }
-
-    #[repr(packed)]
-    struct Foo {
-        field: u8,
-    }
-
-    impl Drop for Foo {
-        fn drop(&mut self) {
-            FIELD_ADDR.with(|f| {
-                f.set(&self.field as *const u8 as usize);
-            })
-        }
-    }
-
-    #[allow(clippy::let_and_return)]
-    let field_addr = {
-        // We let this field drop by going out of scope,
-        // rather than explicitly calling drop(foo).
-        // Calling drop(foo) causes 'foo' to be moved
-        // into the 'drop' function, resulting in a different
-        // address.
-        let x = Foo { field: 27 };
-        let field_addr = &x.field as *const u8 as usize;
-        field_addr
-    };
-    assert_eq!(field_addr, FIELD_ADDR.with(|f| f.get()));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/sized.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/sized.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/sized.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/sized.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-use pin_project::pin_project;
-
-#[pin_project]
-struct Foo<'a, I: ?Sized, Item>
-where
-    I: Iterator,
-{
-    iter: &'a mut I,
-    item: Option<Item>,
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-resolve.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-resolve.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-resolve.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-resolve.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-use std::pin::Pin;
-
-#[cfg_attr(any(), pin_project::pin_project)]
-struct Foo<T> {
-    inner: T,
-}
-
-fn main() {
-    let mut x = Foo { inner: 0_u8 };
-    let _x = Pin::new(&mut x).project(); //~ ERROR E0599
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-resolve.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-resolve.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-resolve.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-resolve.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-error[E0599]: no method named `project` found for struct `Pin<&mut Foo<u8>>` in the current scope
-  --> $DIR/cfg_attr-resolve.rs:10:31
-   |
-10 |     let _x = Pin::new(&mut x).project(); //~ ERROR E0599
-   |                               ^^^^^^^ method not found in `Pin<&mut Foo<u8>>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-type-mismatch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-type-mismatch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-type-mismatch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-type-mismatch.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-use pin_project::pin_project;
-use std::pin::Pin;
-
-#[cfg_attr(not(any()), pin_project)]
-struct Foo<T> {
-    #[cfg_attr(any(), pin)]
-    inner: T,
-}
-
-#[cfg_attr(not(any()), pin_project)]
-struct Bar<T> {
-    #[cfg_attr(not(any()), pin)]
-    inner: T,
-}
-
-fn main() {
-    let mut x = Foo { inner: 0_u8 };
-    let x = Pin::new(&mut x).project();
-    let _: Pin<&mut u8> = x.inner; //~ ERROR E0308
-
-    let mut x = Bar { inner: 0_u8 };
-    let x = Pin::new(&mut x).project();
-    let _: &mut u8 = x.inner; //~ ERROR E0308
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-type-mismatch.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-type-mismatch.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-type-mismatch.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-type-mismatch.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/cfg_attr-type-mismatch.rs:19:27
-   |
-19 |     let _: Pin<&mut u8> = x.inner; //~ ERROR E0308
-   |            ------------   ^^^^^^^ expected struct `Pin`, found `&mut u8`
-   |            |
-   |            expected due to this
-   |
-   = note:         expected struct `Pin<&mut u8>`
-           found mutable reference `&mut u8`
-
-error[E0308]: mismatched types
-  --> $DIR/cfg_attr-type-mismatch.rs:23:22
-   |
-23 |     let _: &mut u8 = x.inner; //~ ERROR E0308
-   |            -------   ^^^^^^^
-   |            |         |
-   |            |         expected `&mut u8`, found struct `Pin`
-   |            |         help: consider mutably borrowing here: `&mut x.inner`
-   |            expected due to this
-   |
-   = note: expected mutable reference `&mut u8`
-                         found struct `Pin<&mut u8>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[cfg_attr(any(), pin_project)]
-struct Foo<T> {
-    inner: T,
-}
-
-#[cfg_attr(not(any()), pin_project)]
-struct Bar<T> {
-    #[cfg_attr(not(any()), pin)]
-    inner: T,
-}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Foo<PhantomPinned>>(); // ERROR E0277
-    is_unpin::<Bar<()>>(); // Ok
-    is_unpin::<Bar<PhantomPinned>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/cfg_attr-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/cfg_attr-unpin.rs:18:5
-   |
-15 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-18 |     is_unpin::<Foo<PhantomPinned>>(); // ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Foo<PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Foo<PhantomPinned>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/cfg_attr-unpin.rs:20:5
-   |
-15 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-20 |     is_unpin::<Bar<PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `__Bar<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `__Bar<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Bar<PhantomPinned>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-use auxiliary_macro::hidden_repr_cfg_not_any;
-use pin_project::pin_project;
-
-// `#[hidden_repr_cfg_not_any(packed)]` generates `#[cfg_attr(not(any()), repr(packed))]`.
-#[pin_project]
-#[hidden_repr_cfg_not_any(packed)] //~ ERROR may not be used on #[repr(packed)] types
-struct Foo {
-    #[pin]
-    field: u32,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-1.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use auxiliary_macro::hidden_repr;
-use pin_project::pin_project;
-
-//~ ERROR may not be used on #[repr(packed)] types
-// span is lost.
-// Refs: https://github.com/rust-lang/rust/issues/43081
-#[pin_project]
-#[hidden_repr(packed)]
-struct Foo {
-    #[cfg(not(any()))]
-    #[pin]
-    field: u32,
-    #[cfg(any())]
-    #[pin]
-    field: u8,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-1.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-1.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-1.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-1.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use auxiliary_macro::hidden_repr;
-use pin_project::pin_project;
-
-//~ ERROR may not be used on #[repr(packed)] types
-// span is lost.
-// Refs: https://github.com/rust-lang/rust/issues/43081
-#[pin_project]
-#[hidden_repr(packed)]
-struct Foo {
-    #[cfg(any())]
-    #[pin]
-    field: u32,
-    #[cfg(not(any()))]
-    #[pin]
-    field: u8,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-2.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-2.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-2.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky-span-issue-2.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/packed_sneaky.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> $DIR/packed_sneaky.rs:6:1
-  |
-6 | #[hidden_repr_cfg_not_any(packed)] //~ ERROR may not be used on #[repr(packed)] types
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/proper_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/proper_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/proper_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/proper_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project]
-struct Foo<T> {
-    #[cfg(any())]
-    #[pin]
-    inner: T,
-    #[cfg(not(any()))]
-    inner: T,
-}
-
-#[pin_project]
-struct Bar<T> {
-    #[cfg(any())]
-    inner: T,
-    #[cfg(not(any()))]
-    #[pin]
-    inner: T,
-}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Foo<PhantomPinned>>(); // Ok
-    is_unpin::<Bar<()>>(); // Ok
-    is_unpin::<Bar<PhantomPinned>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/proper_unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/proper_unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/proper_unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/proper_unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/proper_unpin.rs:27:5
-   |
-22 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-27 |     is_unpin::<Bar<PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `__Bar<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `__Bar<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Bar<PhantomPinned>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/unsupported.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/unsupported.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/unsupported.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/unsupported.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-use pin_project::pin_project;
-
-//~ ERROR may not be used on structs with zero fields
-// span is lost.
-// Refs: https://github.com/rust-lang/rust/issues/43081
-#[pin_project]
-struct Struct {
-    #[cfg(any())]
-    #[pin]
-    f: u8,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/unsupported.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/unsupported.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/unsupported.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/cfg/unsupported.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-error: #[pin_project] attribute may not be used on structs with zero fields
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/assert-not-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/assert-not-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/assert-not-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/assert-not-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-struct Inner<T> {
-    val: T,
-}
-
-#[pin_project(!Unpin)]
-struct Foo<T, U> {
-    #[pin]
-    inner: Inner<T>,
-    other: U,
-}
-
-#[pin_project(!Unpin)]
-struct TrivialBounds {
-    #[pin]
-    field1: PhantomPinned,
-}
-
-#[pin_project(!Unpin)]
-struct Bar<'a, T, U> {
-    #[pin]
-    inner: &'a mut Inner<T>,
-    other: U,
-}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Foo<(), ()>>(); //~ ERROR E0277
-    is_unpin::<Foo<PhantomPinned, ()>>(); //~ ERROR E0277
-    is_unpin::<Foo<(), PhantomPinned>>(); //~ ERROR E0277
-    is_unpin::<Foo<PhantomPinned, PhantomPinned>>(); //~ ERROR E0277
-
-    is_unpin::<TrivialBounds>(); //~ ERROR E0277
-
-    is_unpin::<Bar<'_, (), ()>>(); //~ ERROR E0277
-    is_unpin::<Bar<'_, PhantomPinned, PhantomPinned>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/assert-not-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/assert-not-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/assert-not-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/assert-not-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/assert-not-unpin.rs:31:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-31 |     is_unpin::<Foo<(), ()>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^ within `Wrapper<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Wrapper<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<(), ()>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/assert-not-unpin.rs:32:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-32 |     is_unpin::<Foo<PhantomPinned, ()>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Wrapper<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Wrapper<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<PhantomPinned, ()>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/assert-not-unpin.rs:33:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-33 |     is_unpin::<Foo<(), PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Wrapper<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Wrapper<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<(), PhantomPinned>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/assert-not-unpin.rs:34:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-34 |     is_unpin::<Foo<PhantomPinned, PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Wrapper<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Wrapper<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<PhantomPinned, PhantomPinned>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/assert-not-unpin.rs:36:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-36 |     is_unpin::<TrivialBounds>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^ within `Wrapper<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Wrapper<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `TrivialBounds`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/assert-not-unpin.rs:38:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-38 |     is_unpin::<Bar<'_, (), ()>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Wrapper<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Wrapper<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Bar<'_, (), ()>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/assert-not-unpin.rs:39:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-39 |     is_unpin::<Bar<'_, PhantomPinned, PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Wrapper<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Wrapper<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Bar<'_, PhantomPinned, PhantomPinned>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/conflict-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-impl<T, U> Unpin for Bar<T, U> {}
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/conflict-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`:
-  --> $DIR/conflict-unpin.rs:3:15
-   |
-3  | #[pin_project(!Unpin)] //~ ERROR E0119
-   |               ^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-   | --------------------------------------------- first implementation here
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`:
-  --> $DIR/conflict-unpin.rs:12:15
-   |
-12 | #[pin_project(!Unpin)] //~ ERROR E0119
-   |               ^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-19 | impl<T, U> Unpin for Bar<T, U> {}
-   | ------------------------------ first implementation here
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`:
-  --> $DIR/conflict-unpin.rs:21:15
-   |
-21 | #[pin_project(!Unpin)] //~ ERROR E0119
-   |               ^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-28 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
-   | -------------------------------------------- first implementation here
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/impl-unsafe-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/impl-unsafe-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/impl-unsafe-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/impl-unsafe-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use pin_project::{pin_project, UnsafeUnpin};
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
-
-#[pin_project(!Unpin)] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/impl-unsafe-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/impl-unsafe-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/impl-unsafe-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/not_unpin/impl-unsafe-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Foo<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:3:1
-   |
-3  | #[pin_project(!Unpin)] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-   | ---------------------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Bar<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:12:1
-   |
-12 | #[pin_project(!Unpin)] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-19 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
-   | ------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Baz<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:21:1
-   |
-21 | #[pin_project(!Unpin)] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-28 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
-   | --------------------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/call-drop-inner.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/call-drop-inner.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/call-drop-inner.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/call-drop-inner.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project(PinnedDrop)]
-struct Struct {
-    dropped: bool,
-}
-
-#[pinned_drop]
-impl PinnedDrop for Struct {
-    fn drop(mut self: Pin<&mut Self>) {
-        __drop_inner(__self);
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/call-drop-inner.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/call-drop-inner.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/call-drop-inner.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/call-drop-inner.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-error[E0061]: this function takes 0 arguments but 1 argument was supplied
-  --> $DIR/call-drop-inner.rs:12:9
-   |
-9  | #[pinned_drop]
-   | -------------- defined here
-...
-12 |         __drop_inner(__self);
-   |         ^^^^^^^^^^^^ ------ supplied 1 argument
-   |         |
-   |         expected 0 arguments
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/conditional-drop-impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/conditional-drop-impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/conditional-drop-impl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/conditional-drop-impl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-// In `Drop` impl, the implementor must specify the same requirement as type definition.
-
-struct DropImpl<T> {
-    field: T,
-}
-
-impl<T: Unpin> Drop for DropImpl<T> {
-    //~^ ERROR E0367
-    fn drop(&mut self) {}
-}
-
-#[pin_project(PinnedDrop)] //~ ERROR E0277
-struct PinnedDropImpl<T> {
-    #[pin]
-    field: T,
-}
-
-#[pinned_drop]
-impl<T: Unpin> PinnedDrop for PinnedDropImpl<T> {
-    fn drop(self: Pin<&mut Self>) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/conditional-drop-impl.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/conditional-drop-impl.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/conditional-drop-impl.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/conditional-drop-impl.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-error[E0367]: `Drop` impl requires `T: Unpin` but the struct it is implemented for does not
-  --> $DIR/conditional-drop-impl.rs:10:9
-   |
-10 | impl<T: Unpin> Drop for DropImpl<T> {
-   |         ^^^^^
-   |
-note: the implementor must specify the same requirement
-  --> $DIR/conditional-drop-impl.rs:6:1
-   |
-6  | / struct DropImpl<T> {
-7  | |     field: T,
-8  | | }
-   | |_^
-
-error[E0277]: `T` cannot be unpinned
-  --> $DIR/conditional-drop-impl.rs:15:15
-   |
-15 | #[pin_project(PinnedDrop)] //~ ERROR E0277
-   |               ^^^^^^^^^^ the trait `Unpin` is not implemented for `T`
-   |
-   = note: required because of the requirements on the impl of `PinnedDrop` for `PinnedDropImpl<T>`
-   = note: required by `pin_project::__private::PinnedDrop::drop`
-help: consider restricting type parameter `T`
-   |
-16 | struct PinnedDropImpl<T: Unpin> {
-   |                        ^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/forget-pinned-drop-impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/forget-pinned-drop-impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/forget-pinned-drop-impl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/forget-pinned-drop-impl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(PinnedDrop)] //~ ERROR E0277
-struct Struct {
-    #[pin]
-    field: u8,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/forget-pinned-drop-impl.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-error[E0277]: the trait bound `Struct: PinnedDrop` is not satisfied
- --> $DIR/forget-pinned-drop-impl.rs:3:15
-  |
-3 | #[pin_project(PinnedDrop)] //~ ERROR E0277
-  |               ^^^^^^^^^^ the trait `PinnedDrop` is not implemented for `Struct`
-  |
-  = note: required by `pin_project::__private::PinnedDrop::drop`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,229 +0,0 @@
-mod argument {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    struct UnexpectedArg1(());
-
-    #[pinned_drop(foo)] //~ ERROR unexpected token
-    impl PinnedDrop for UnexpectedArg1 {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct UnexpectedArg2(());
-
-    #[pinned_drop()] // Ok
-    impl PinnedDrop for UnexpectedArg2 {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-}
-
-mod attribute {
-    use pin_project::{pin_project, pinned_drop};
-
-    #[pin_project(PinnedDrop)]
-    struct Duplicate(());
-
-    #[pinned_drop]
-    #[pinned_drop] //~ ERROR duplicate #[pinned_drop] attribute
-    impl PinnedDrop for Duplicate {
-        fn drop(self: Pin<&mut Self>) {}
-    }
-}
-
-mod item {
-    use pin_project::{pin_project, pinned_drop};
-
-    #[pin_project(PinnedDrop)]
-    struct TraitImpl(());
-
-    #[pinned_drop]
-    impl Drop for TraitImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
-
-    #[pin_project(PinnedDrop)]
-    struct InherentImpl(());
-
-    #[pinned_drop]
-    impl InherentImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
-
-    #[pinned_drop]
-    fn drop(_: Pin<&mut ()>) {} //~ ERROR expected `impl`
-}
-
-mod unsafety {
-    use pin_project::{pin_project, pinned_drop};
-
-    #[pin_project(PinnedDrop)]
-    struct Impl(());
-
-    #[pinned_drop]
-    unsafe impl PinnedDrop for Impl {
-        //~^ ERROR implementing the trait `PinnedDrop` is not unsafe
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Method(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Method {
-        unsafe fn drop(self: Pin<&mut Self>) {} //~ ERROR implementing the method `drop` is not unsafe
-    }
-}
-
-mod assoc_item {
-    use pin_project::{pin_project, pinned_drop};
-
-    #[pin_project(PinnedDrop)]
-    struct Empty(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Empty {} //~ ERROR not all trait items implemented, missing: `drop`
-
-    #[pin_project(PinnedDrop)]
-    struct Const1(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Const1 {
-        const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Const2(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Const2 {
-        fn drop(self: Pin<&mut Self>) {}
-        const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Type1(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Type1 {
-        type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Type2(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Type2 {
-        fn drop(self: Pin<&mut Self>) {}
-        type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct Duplicate(());
-
-    #[pinned_drop]
-    impl PinnedDrop for Duplicate {
-        fn drop(self: Pin<&mut Self>) {}
-        fn drop(self: Pin<&mut Self>) {} //~ ERROR duplicate definitions with name `drop`
-    }
-}
-
-mod method {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    struct RetUnit(());
-
-    #[pinned_drop]
-    impl PinnedDrop for RetUnit {
-        fn drop(self: Pin<&mut Self>) -> () {} // Ok
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct RetTy(());
-
-    #[pinned_drop]
-    impl PinnedDrop for RetTy {
-        fn drop(self: Pin<&mut Self>) -> Self {} //~ ERROR method `drop` must return the unit type
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct NoArg(());
-
-    #[pinned_drop]
-    impl PinnedDrop for NoArg {
-        fn drop() {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct MultiArg(());
-
-    #[pinned_drop]
-    impl PinnedDrop for MultiArg {
-        fn drop(self: Pin<&mut Self>, _: ()) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidArg1(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidArg1 {
-        fn drop(&mut self) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidArg2(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidArg2 {
-        fn drop(_: Pin<&mut Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidArg3(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidArg3 {
-        fn drop(self: Pin<&Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidArg4(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidArg4 {
-        fn drop(self: Pin<&mut ()>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    }
-
-    #[pin_project(PinnedDrop)]
-    struct InvalidName(());
-
-    #[pinned_drop]
-    impl PinnedDrop for InvalidName {
-        fn pinned_drop(&mut self) {} //~ ERROR method `pinned_drop` is not a member of trait `PinnedDrop
-    }
-}
-
-mod self_ty {
-    use pin_project::pinned_drop;
-
-    #[pinned_drop]
-    impl PinnedDrop for () {
-        //~^ ERROR implementing the trait `PinnedDrop` on this type is unsupported
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for &mut A {
-        //~^ ERROR implementing the trait `PinnedDrop` on this type is unsupported
-        fn drop(self: Pin<&mut Self>) {}
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for [A] {
-        //~^ ERROR implementing the trait `PinnedDrop` on this type is unsupported
-        fn drop(self: Pin<&mut Self>) {}
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid-self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid-self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid-self.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid-self.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// by-ref binding `ref (mut) self` and sub-patterns `@` are not allowed in receivers (rejected by rustc).
-
-use std::pin::Pin;
-
-struct Struct {}
-
-impl Struct {
-    fn take_ref_self(ref self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-    fn take_ref_mut_self(ref mut self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-
-    fn self_subpat(self @ Struct {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid-self.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid-self.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid-self.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid-self.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-error: expected identifier, found keyword `self`
- --> $DIR/invalid-self.rs:8:26
-  |
-8 |     fn take_ref_self(ref self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-  |                          ^^^^ expected identifier, found keyword
-
-error: expected identifier, found keyword `self`
- --> $DIR/invalid-self.rs:9:34
-  |
-9 |     fn take_ref_mut_self(ref mut self: Pin<&mut Self>) {} //~ ERROR expected identifier, found keyword `self`
-  |                                  ^^^^ expected identifier, found keyword
-
-error: expected parameter name, found `@`
-  --> $DIR/invalid-self.rs:11:25
-   |
-11 |     fn self_subpat(self @ Struct {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
-   |                         ^ expected parameter name
-
-error: expected one of `)`, `,`, or `:`, found `@`
-  --> $DIR/invalid-self.rs:11:25
-   |
-11 |     fn self_subpat(self @ Struct {}: Self) {} //~ ERROR expected one of `)`, `,`, or `:`, found `@`
-   |                        -^ expected one of `)`, `,`, or `:`
-   |                        |
-   |                        help: missing `,`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/invalid.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +0,0 @@
-error: unexpected token: foo
- --> $DIR/invalid.rs:8:19
-  |
-8 |     #[pinned_drop(foo)] //~ ERROR unexpected token
-  |                   ^^^
-
-error: duplicate #[pinned_drop] attribute
-  --> $DIR/invalid.rs:29:5
-   |
-29 |     #[pinned_drop] //~ ERROR duplicate #[pinned_drop] attribute
-   |     ^^^^^^^^^^^^^^
-
-error: #[pinned_drop] may only be used on implementation for the `PinnedDrop` trait
-  --> $DIR/invalid.rs:42:10
-   |
-42 |     impl Drop for TraitImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
-   |          ^^^^
-
-error: #[pinned_drop] may only be used on implementation for the `PinnedDrop` trait
-  --> $DIR/invalid.rs:48:10
-   |
-48 |     impl InherentImpl {} //~ ERROR may only be used on implementation for the `PinnedDrop` trait
-   |          ^^^^^^^^^^^^
-
-error: expected `impl`
-  --> $DIR/invalid.rs:51:5
-   |
-51 |     fn drop(_: Pin<&mut ()>) {} //~ ERROR expected `impl`
-   |     ^^
-
-error: implementing the trait `PinnedDrop` is not unsafe
-  --> $DIR/invalid.rs:61:5
-   |
-61 |     unsafe impl PinnedDrop for Impl {
-   |     ^^^^^^
-
-error: implementing the method `drop` is not unsafe
-  --> $DIR/invalid.rs:71:9
-   |
-71 |         unsafe fn drop(self: Pin<&mut Self>) {} //~ ERROR implementing the method `drop` is not unsafe
-   |         ^^^^^^
-
-error: not all trait items implemented, missing: `drop`
-  --> $DIR/invalid.rs:82:5
-   |
-82 |     impl PinnedDrop for Empty {} //~ ERROR not all trait items implemented, missing: `drop`
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: const `A` is not a member of trait `PinnedDrop`
-  --> $DIR/invalid.rs:89:9
-   |
-89 |         const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
-   |         ^^^^^^^^^^^^^^^^
-
-error: const `A` is not a member of trait `PinnedDrop`
-  --> $DIR/invalid.rs:99:9
-   |
-99 |         const A: u8 = 0; //~ ERROR const `A` is not a member of trait `PinnedDrop`
-   |         ^^^^^^^^^^^^^^^^
-
-error: type `A` is not a member of trait `PinnedDrop`
-   --> $DIR/invalid.rs:107:9
-    |
-107 |         type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
-    |         ^^^^^^^^^^^^
-
-error: type `A` is not a member of trait `PinnedDrop`
-   --> $DIR/invalid.rs:117:9
-    |
-117 |         type A = u8; //~ ERROR type `A` is not a member of trait `PinnedDrop`
-    |         ^^^^^^^^^^^^
-
-error: duplicate definitions with name `drop`
-   --> $DIR/invalid.rs:126:9
-    |
-126 |         fn drop(self: Pin<&mut Self>) {} //~ ERROR duplicate definitions with name `drop`
-    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: method `drop` must return the unit type
-   --> $DIR/invalid.rs:147:42
-    |
-147 |         fn drop(self: Pin<&mut Self>) -> Self {} //~ ERROR method `drop` must return the unit type
-    |                                          ^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:155:16
-    |
-155 |         fn drop() {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                ^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:163:17
-    |
-163 |         fn drop(self: Pin<&mut Self>, _: ()) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:171:17
-    |
-171 |         fn drop(&mut self) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:179:17
-    |
-179 |         fn drop(_: Pin<&mut Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^^^^^^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:187:17
-    |
-187 |         fn drop(self: Pin<&Self>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^^^^^^^^
-
-error: method `drop` must take an argument `self: Pin<&mut Self>`
-   --> $DIR/invalid.rs:195:17
-    |
-195 |         fn drop(self: Pin<&mut ()>) {} //~ ERROR method `drop` must take an argument `self: Pin<&mut Self>`
-    |                 ^^^^^^^^^^^^^^^^^^
-
-error: method `pinned_drop` is not a member of trait `PinnedDrop
-   --> $DIR/invalid.rs:203:12
-    |
-203 |         fn pinned_drop(&mut self) {} //~ ERROR method `pinned_drop` is not a member of trait `PinnedDrop
-    |            ^^^^^^^^^^^
-
-error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> $DIR/invalid.rs:211:25
-    |
-211 |     impl PinnedDrop for () {
-    |                         ^^
-
-error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> $DIR/invalid.rs:217:25
-    |
-217 |     impl PinnedDrop for &mut A {
-    |                         ^^^^^^
-
-error: implementing the trait `PinnedDrop` on this type is unsupported
-   --> $DIR/invalid.rs:223:25
-    |
-223 |     impl PinnedDrop for [A] {
-    |                         ^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/pinned-drop-no-attr-arg.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project]
-struct Foo {
-    #[pin]
-    field: u8,
-}
-
-#[pinned_drop]
-impl PinnedDrop for Foo { //~ ERROR E0119
-    fn drop(self: Pin<&mut Self>) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/pinned-drop-no-attr-arg.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-error[E0119]: conflicting implementations of trait `pin_project::__private::PinnedDrop` for type `Foo`:
-  --> $DIR/pinned-drop-no-attr-arg.rs:11:1
-   |
-4  | #[pin_project]
-   | -------------- first implementation here
-...
-11 | impl PinnedDrop for Foo { //~ ERROR E0119
-   | ^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/self.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/self.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/self.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/self.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-pub mod self_in_macro_def {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    pub struct Struct {
-        x: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for Struct {
-        fn drop(self: Pin<&mut Self>) {
-            macro_rules! t {
-                () => {{
-                    let _ = self; //~ ERROR E0434
-
-                    fn f(self: ()) {} //~ ERROR `self` parameter is only allowed in associated functions
-                }};
-            }
-            t!();
-        }
-    }
-}
-
-pub mod self_span {
-    use pin_project::{pin_project, pinned_drop};
-    use std::pin::Pin;
-
-    #[pin_project(PinnedDrop)]
-    pub struct S {
-        x: (),
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for S {
-        fn drop(self: Pin<&mut Self>) {
-            let _: () = self; //~ ERROR E0308
-            let _: Self = Self; //~ ERROR E0423
-        }
-    }
-
-    #[pin_project(PinnedDrop)]
-    pub enum E {
-        V { x: () },
-    }
-
-    #[pinned_drop]
-    impl PinnedDrop for E {
-        fn drop(self: Pin<&mut Self>) {
-            let _: () = self; //~ ERROR E0308
-            let _: Self = Self::V; //~ ERROR E0533
-        }
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/self.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/self.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/self.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/self.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-error: `self` parameter is only allowed in associated functions
-  --> $DIR/self.rs:17:26
-   |
-17 |                     fn f(self: ()) {} //~ ERROR `self` parameter is only allowed in associated functions
-   |                          ^^^^ not semantically valid as function parameter
-...
-20 |             t!();
-   |             ----- in this macro invocation
-   |
-   = note: associated functions are those in `impl` or `trait` definitions
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0434]: can't capture dynamic environment in a fn item
-  --> $DIR/self.rs:15:29
-   |
-15 |                     let _ = self; //~ ERROR E0434
-   |                             ^^^^
-...
-20 |             t!();
-   |             ----- in this macro invocation
-   |
-   = help: use the `|| { ... }` closure form instead
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0423]: expected value, found struct `S`
-  --> $DIR/self.rs:38:27
-   |
-30 | /     pub struct S {
-31 | |         x: (),
-32 | |     }
-   | |_____- `S` defined here
-...
-38 |               let _: Self = Self; //~ ERROR E0423
-   |                             ^^^^ help: use struct literal syntax instead: `S { x: val }`
-
-error[E0308]: mismatched types
-  --> $DIR/self.rs:37:25
-   |
-37 |             let _: () = self; //~ ERROR E0308
-   |                    --   ^^^^ expected `()`, found struct `Pin`
-   |                    |
-   |                    expected due to this
-   |
-   = note: expected unit type `()`
-                 found struct `Pin<&mut S>`
-
-error[E0308]: mismatched types
-  --> $DIR/self.rs:50:25
-   |
-50 |             let _: () = self; //~ ERROR E0308
-   |                    --   ^^^^ expected `()`, found struct `Pin`
-   |                    |
-   |                    expected due to this
-   |
-   = note: expected unit type `()`
-                 found struct `Pin<&mut E>`
-
-error[E0533]: expected unit struct, unit variant or constant, found struct variant `Self::V`
-  --> $DIR/self.rs:51:27
-   |
-51 |             let _: Self = Self::V; //~ ERROR E0533
-   |                           ^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/unsafe-call.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/unsafe-call.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/unsafe-call.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/unsafe-call.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project(PinnedDrop)]
-struct Struct {
-    #[pin]
-    field: u8,
-}
-
-#[pinned_drop]
-impl PinnedDrop for Struct {
-    fn drop(self: Pin<&mut Self>) {
-        self.project().field.get_unchecked_mut(); //~ ERROR call to unsafe function is unsafe and requires unsafe function or block [E0133]
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/unsafe-call.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/unsafe-call.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/unsafe-call.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pinned_drop/unsafe-call.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
-  --> $DIR/unsafe-call.rs:13:9
-   |
-13 |         self.project().field.get_unchecked_mut(); //~ ERROR call to unsafe function is unsafe and requires unsafe function or block [E0133]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function
-   |
-   = note: consult the function's documentation for information on how to avoid undefined behavior
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-attr-to-struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-attr-to-struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-attr-to-struct.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-attr-to-struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-use auxiliary_macro::add_pin_attr;
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project]
-#[add_pin_attr(struct)] //~ ERROR duplicate #[pin] attribute
-struct Foo {
-    #[pin]
-    field: PhantomPinned,
-}
-
-#[add_pin_attr(struct)] //~ ERROR #[pin] attribute may only be used on fields of structs or variants
-#[pin_project]
-struct Bar {
-    #[pin]
-    field: PhantomPinned,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-attr-to-struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-attr-to-struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-attr-to-struct.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-attr-to-struct.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-error: duplicate #[pin] attribute
- --> $DIR/add-attr-to-struct.rs:6:1
-  |
-6 | #[add_pin_attr(struct)] //~ ERROR duplicate #[pin] attribute
-  | ^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: #[pin] attribute may only be used on fields of structs or variants
-  --> $DIR/add-attr-to-struct.rs:12:1
-   |
-12 | #[add_pin_attr(struct)] //~ ERROR #[pin] attribute may only be used on fields of structs or variants
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-pinned-field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-pinned-field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-pinned-field.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-pinned-field.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-use auxiliary_macro::add_pinned_field;
-use pin_project::pin_project;
-
-fn is_unpin<T: Unpin>() {}
-
-#[pin_project]
-#[add_pinned_field]
-struct Foo {
-    #[pin]
-    field: u32,
-}
-
-#[add_pinned_field]
-#[pin_project]
-struct Bar {
-    #[pin]
-    field: u32,
-}
-
-fn main() {
-    is_unpin::<Foo>(); //~ ERROR E0277
-    is_unpin::<Bar>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-pinned-field.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-pinned-field.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-pinned-field.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/add-pinned-field.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/add-pinned-field.rs:21:5
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-21 |     is_unpin::<Foo>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^ within `__Foo<'_>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `__Foo<'_>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/add-pinned-field.rs:22:5
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-22 |     is_unpin::<Bar>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^ within `__Bar<'_>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `__Bar<'_>`
-   = note: required because of the requirements on the impl of `Unpin` for `Bar`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-use pin_project::{pin_project, pinned_drop};
-use std::pin::Pin;
-
-#[pin_project] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-impl<T, U> Drop for Foo<T, U> {
-    fn drop(&mut self) {}
-}
-
-#[pin_project(PinnedDrop)] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-#[pinned_drop]
-impl<T, U> PinnedDrop for Bar<T, U> {
-    fn drop(self: Pin<&mut Self>) {}
-}
-
-impl<T, U> Drop for Bar<T, U> {
-    fn drop(&mut self) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-drop.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-drop.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-drop.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-drop.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-error[E0119]: conflicting implementations of trait `_::FooMustNotImplDrop` for type `Foo<_, _>`:
- --> $DIR/conflict-drop.rs:4:1
-  |
-4 | #[pin_project] //~ ERROR E0119
-  | ^^^^^^^^^^^^^^
-  | |
-  | first implementation here
-  | conflicting implementation for `Foo<_, _>`
-  |
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `Bar<_, _>`:
-  --> $DIR/conflict-drop.rs:15:15
-   |
-15 | #[pin_project(PinnedDrop)] //~ ERROR E0119
-   |               ^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-27 | impl<T, U> Drop for Bar<T, U> {
-   | ----------------------------- first implementation here
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-use pin_project::pin_project;
-
-// The same implementation.
-
-#[pin_project] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-// conflicting implementations
-impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-
-// The implementation that under different conditions.
-
-#[pin_project] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-// conflicting implementations
-impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
-
-#[pin_project] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-// conflicting implementations
-impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`:
-  --> $DIR/conflict-unpin.rs:5:1
-   |
-5  | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-13 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-   | --------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`:
-  --> $DIR/conflict-unpin.rs:17:1
-   |
-17 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-25 | impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
-   | ------------------------------ first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`:
-  --> $DIR/conflict-unpin.rs:27:1
-   |
-27 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-35 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
-   | -------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/impl-unsafe-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/impl-unsafe-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/impl-unsafe-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/impl-unsafe-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use pin_project::{pin_project, UnsafeUnpin};
-
-#[pin_project] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-
-#[pin_project] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
-
-#[pin_project] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/impl-unsafe-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/impl-unsafe-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/impl-unsafe-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/impl-unsafe-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Foo<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:3:1
-   |
-3  | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-10 | unsafe impl<T, U> UnsafeUnpin for Foo<T, U> where T: Unpin {}
-   | ---------------------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Bar<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:12:1
-   |
-12 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-19 | unsafe impl<T, U> UnsafeUnpin for Bar<T, U> {}
-   | ------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `pin_project::UnsafeUnpin` for type `Baz<_, _>`:
-  --> $DIR/impl-unsafe-unpin.rs:21:1
-   |
-21 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-28 | unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for Baz<T, U> {}
-   | --------------------------------------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/invalid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/invalid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/invalid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/invalid.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-mod pin_argument {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    struct Struct {
-        #[pin()] //~ ERROR unexpected token
-        field: (),
-    }
-
-    #[pin_project]
-    struct TupleStruct(#[pin(foo)] ()); //~ ERROR unexpected token
-
-    #[pin_project]
-    enum EnumTuple {
-        V(#[pin(foo)] ()), //~ ERROR unexpected token
-    }
-
-    #[pin_project]
-    enum EnumStruct {
-        V {
-            #[pin(foo)] //~ ERROR unexpected token
-            field: (),
-        },
-    }
-}
-
-mod pin_attribute {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    struct DuplicateStruct {
-        #[pin]
-        #[pin] //~ ERROR duplicate #[pin] attribute
-        field: (),
-    }
-
-    #[pin_project]
-    struct DuplicateTupleStruct(
-        #[pin]
-        #[pin]
-        (),
-        //~^^ ERROR duplicate #[pin] attribute
-    );
-
-    #[pin_project]
-    enum DuplicateEnumTuple {
-        V(
-            #[pin]
-            #[pin]
-            (),
-            //~^^ ERROR duplicate #[pin] attribute
-        ),
-    }
-
-    #[pin_project]
-    enum DuplicateEnumStruct {
-        V {
-            #[pin]
-            #[pin] //~ ERROR duplicate #[pin] attribute
-            field: (),
-        },
-    }
-}
-
-mod pin_item {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    #[pin] //~ ERROR may only be used on fields of structs or variants
-    struct Struct {
-        #[pin]
-        field: (),
-    }
-
-    #[pin_project]
-    enum Variant {
-        #[pin] //~ ERROR may only be used on fields of structs or variants
-        V(()),
-    }
-
-    #[pin_project]
-    #[pin] //~ ERROR may only be used on fields of structs or variants
-    enum Enum {
-        V(()),
-    }
-}
-
-mod pin_project_argument {
-    use pin_project::pin_project;
-
-    #[pin_project(UnsafeUnpin,,)] //~ ERROR expected identifier
-    struct Unexpected1(#[pin] ());
-
-    #[pin_project(Foo)] //~ ERROR unexpected argument
-    struct Unexpected2(#[pin] ());
-
-    #[pin_project(,UnsafeUnpin)] //~ ERROR expected identifier
-    struct Unexpected3(#[pin] ());
-
-    #[pin_project()] // Ok
-    struct Unexpected4(#[pin] ());
-
-    #[pin_project(PinnedDrop PinnedDrop)] //~ ERROR expected `,`
-    struct Unexpected5(#[pin] ());
-
-    #[pin_project(PinnedDrop, PinnedDrop)] //~ ERROR duplicate `PinnedDrop` argument
-    struct DuplicatePinnedDrop(#[pin] ());
-
-    #[pin_project(Replace, Replace)] //~ ERROR duplicate `Replace` argument
-    struct DuplicateReplace(#[pin] ());
-
-    #[pin_project(UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
-    struct DuplicateUnsafeUnpin(#[pin] ());
-
-    #[pin_project(!Unpin, !Unpin)] //~ ERROR duplicate `!Unpin` argument
-    struct DuplicateNotUnpin(#[pin] ());
-
-    #[pin_project(PinnedDrop, UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
-    struct Duplicate3(#[pin] ());
-
-    #[pin_project(PinnedDrop, UnsafeUnpin, PinnedDrop, UnsafeUnpin)] //~ ERROR duplicate `PinnedDrop` argument
-    struct Duplicate4(#[pin] ());
-
-    #[pin_project(project = A, project = B)] //~ ERROR duplicate `project` argument
-    struct DuplicateProject(#[pin] ());
-
-    #[pin_project(project = A, project_ref = A, project = B)] //~ ERROR duplicate `project` argument
-    struct DuplicateProject2(#[pin] ());
-
-    #[pin_project(project_ref = A, project_ref = B)] //~ ERROR duplicate `project_ref` argument
-    struct DuplicateProjectRef(#[pin] ());
-
-    #[pin_project(project_replace = A, project_replace = B)] //~ ERROR duplicate `project_replace` argument
-    struct DuplicateProjectReplace1(#[pin] ());
-
-    #[pin_project(project_replace, project_replace = B)] //~ ERROR duplicate `project_replace` argument
-    struct DuplicateProjectReplace2(#[pin] ());
-
-    #[pin_project(project_replace = A, project_replace)] //~ ERROR duplicate `project_replace` argument
-    struct DuplicateProjectReplace3(#[pin] ());
-
-    #[pin_project(project_replace = A)] // Ok
-    struct ProjectReplaceWithoutReplace(#[pin] ());
-
-    #[pin_project(PinnedDrop, Replace)] //~ ERROR arguments `PinnedDrop` and `Replace` are mutually exclusive
-    struct PinnedDropWithReplace1(#[pin] ());
-
-    #[pin_project(Replace, UnsafeUnpin, PinnedDrop)] //~ ERROR arguments `PinnedDrop` and `Replace` are mutually exclusive
-    struct PinnedDropWithReplace2(#[pin] ());
-
-    #[pin_project(PinnedDrop, project_replace)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
-    struct PinnedDropWithProjectReplace1(#[pin] ());
-
-    #[pin_project(project_replace, UnsafeUnpin, PinnedDrop)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
-    struct PinnedDropWithProjectReplace2(#[pin] ());
-
-    #[pin_project(project_replace, Replace)] // Ok
-    struct ProjectReplaceWithReplace1(#[pin] ());
-
-    #[pin_project(project_replace = B, Replace)] // Ok
-    struct ProjectReplaceWithReplace2(#[pin] ());
-
-    #[pin_project(UnsafeUnpin, !Unpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-    struct UnsafeUnpinWithNotUnpin1(#[pin] ());
-
-    #[pin_project(!Unpin, PinnedDrop, UnsafeUnpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-    struct UnsafeUnpinWithNotUnpin2(#[pin] ());
-
-    #[pin_project(!)] //~ ERROR expected `!Unpin`, found `!`
-    struct NotUnpin1(#[pin] ());
-
-    #[pin_project(Unpin)] //~ ERROR unexpected argument
-    struct NotUnpin2(#[pin] ());
-
-    #[pin_project(project)] //~ ERROR expected `project = <identifier>`, found `project`
-    struct Project1(#[pin] ());
-
-    #[pin_project(project = )] //~ ERROR expected `project = <identifier>`, found `project =`
-    struct Project2(#[pin] ());
-
-    #[pin_project(project = !)] //~ ERROR expected identifier
-    struct Project3(#[pin] ());
-
-    #[pin_project(project_ref)] //~ ERROR expected `project_ref = <identifier>`, found `project_ref`
-    struct ProjectRef1(#[pin] ());
-
-    #[pin_project(project_ref = )] //~ ERROR expected `project_ref = <identifier>`, found `project_ref =`
-    struct ProjectRef2(#[pin] ());
-
-    #[pin_project(project_ref = !)] //~ ERROR expected identifier
-    struct ProjectRef3(#[pin] ());
-
-    #[pin_project(project_replace)] // Ok
-    struct ProjectReplace1(#[pin] ());
-
-    #[pin_project(project_replace = )] //~ ERROR expected `project_replace = <identifier>`, found `project_replace =`
-    struct ProjectReplace2(#[pin] ());
-
-    #[pin_project(project_replace = !)] //~ ERROR expected identifier
-    struct ProjectReplace3(#[pin] ());
-}
-
-mod pin_project_conflict_naming {
-    use pin_project::pin_project;
-
-    #[pin_project(project = A, project_ref = A)] //~ ERROR name `A` is already specified by `project` argument
-    struct ProjAndProjRef(#[pin] ());
-
-    #[pin_project(project = A, project_replace = A)] //~ ERROR name `A` is already specified by `project` argument
-    struct ProjAndProjOwn(#[pin] ());
-
-    #[pin_project(project_ref = A, project_replace = A)] //~ ERROR name `A` is already specified by `project_ref` argument
-    struct ProjRefAndProjOwn(#[pin] ());
-}
-
-mod pin_project_attribute {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    #[pin_project] //~ ERROR duplicate #[pin_project] attribute
-    struct Duplicate(#[pin] ());
-}
-
-mod pin_project_item {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    struct Struct {} //~ ERROR may not be used on structs with zero fields
-
-    #[pin_project]
-    struct TupleStruct(); //~ ERROR may not be used on structs with zero fields
-
-    #[pin_project]
-    struct UnitStruct; //~ ERROR may not be used on structs with zero fields
-
-    #[pin_project]
-    enum EnumEmpty {} //~ ERROR may not be used on enums without variants
-
-    #[pin_project]
-    enum EnumDiscriminant {
-        V = 2, //~ ERROR may not be used on enums with discriminants
-    }
-
-    #[pin_project]
-    enum EnumZeroFields {
-        Unit, //~ ERROR may not be used on enums with zero fields
-        Tuple(),
-        Struct {},
-    }
-
-    #[pin_project]
-    union Union {
-        //~^ ERROR may only be used on structs or enums
-        f: (),
-    }
-}
-
-// #[repr(packed)] is always detected first, even on unsupported structs.
-mod pin_project_item_packed {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    #[repr(packed)]
-    struct Struct {} //~ ERROR may not be used on #[repr(packed)] types
-
-    #[pin_project]
-    #[repr(packed)]
-    struct TupleStruct(); //~ ERROR may not be used on #[repr(packed)] types
-
-    #[pin_project]
-    #[repr(packed)]
-    struct UnitStruct; //~ ERROR may not be used on #[repr(packed)] types
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/invalid.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/invalid.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/invalid.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/invalid.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-error: unexpected token: ()
- --> $DIR/invalid.rs:6:14
-  |
-6 |         #[pin()] //~ ERROR unexpected token
-  |              ^^
-
-error: unexpected token: (foo)
-  --> $DIR/invalid.rs:11:29
-   |
-11 |     struct TupleStruct(#[pin(foo)] ()); //~ ERROR unexpected token
-   |                             ^^^^^
-
-error: unexpected token: (foo)
-  --> $DIR/invalid.rs:15:16
-   |
-15 |         V(#[pin(foo)] ()), //~ ERROR unexpected token
-   |                ^^^^^
-
-error: unexpected token: (foo)
-  --> $DIR/invalid.rs:21:18
-   |
-21 |             #[pin(foo)] //~ ERROR unexpected token
-   |                  ^^^^^
-
-error: duplicate #[pin] attribute
-  --> $DIR/invalid.rs:33:9
-   |
-33 |         #[pin] //~ ERROR duplicate #[pin] attribute
-   |         ^^^^^^
-
-error: duplicate #[pin] attribute
-  --> $DIR/invalid.rs:40:9
-   |
-40 |         #[pin]
-   |         ^^^^^^
-
-error: duplicate #[pin] attribute
-  --> $DIR/invalid.rs:49:13
-   |
-49 |             #[pin]
-   |             ^^^^^^
-
-error: duplicate #[pin] attribute
-  --> $DIR/invalid.rs:59:13
-   |
-59 |             #[pin] //~ ERROR duplicate #[pin] attribute
-   |             ^^^^^^
-
-error: #[pin] attribute may only be used on fields of structs or variants
-  --> $DIR/invalid.rs:69:5
-   |
-69 |     #[pin] //~ ERROR may only be used on fields of structs or variants
-   |     ^^^^^^
-
-error: #[pin] attribute may only be used on fields of structs or variants
-  --> $DIR/invalid.rs:77:9
-   |
-77 |         #[pin] //~ ERROR may only be used on fields of structs or variants
-   |         ^^^^^^
-
-error: #[pin] attribute may only be used on fields of structs or variants
-  --> $DIR/invalid.rs:82:5
-   |
-82 |     #[pin] //~ ERROR may only be used on fields of structs or variants
-   |     ^^^^^^
-
-error: expected identifier
-  --> $DIR/invalid.rs:91:31
-   |
-91 |     #[pin_project(UnsafeUnpin,,)] //~ ERROR expected identifier
-   |                               ^
-
-error: unexpected argument: Foo
-  --> $DIR/invalid.rs:94:19
-   |
-94 |     #[pin_project(Foo)] //~ ERROR unexpected argument
-   |                   ^^^
-
-error: expected identifier
-  --> $DIR/invalid.rs:97:19
-   |
-97 |     #[pin_project(,UnsafeUnpin)] //~ ERROR expected identifier
-   |                   ^
-
-error: expected `,`
-   --> $DIR/invalid.rs:103:30
-    |
-103 |     #[pin_project(PinnedDrop PinnedDrop)] //~ ERROR expected `,`
-    |                              ^^^^^^^^^^
-
-error: duplicate `PinnedDrop` argument
-   --> $DIR/invalid.rs:106:31
-    |
-106 |     #[pin_project(PinnedDrop, PinnedDrop)] //~ ERROR duplicate `PinnedDrop` argument
-    |                               ^^^^^^^^^^
-
-error: duplicate `Replace` argument
-   --> $DIR/invalid.rs:109:28
-    |
-109 |     #[pin_project(Replace, Replace)] //~ ERROR duplicate `Replace` argument
-    |                            ^^^^^^^
-
-error: duplicate `UnsafeUnpin` argument
-   --> $DIR/invalid.rs:112:32
-    |
-112 |     #[pin_project(UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
-    |                                ^^^^^^^^^^^
-
-error: duplicate `!Unpin` argument
-   --> $DIR/invalid.rs:115:27
-    |
-115 |     #[pin_project(!Unpin, !Unpin)] //~ ERROR duplicate `!Unpin` argument
-    |                           ^^^^^^
-
-error: duplicate `UnsafeUnpin` argument
-   --> $DIR/invalid.rs:118:44
-    |
-118 |     #[pin_project(PinnedDrop, UnsafeUnpin, UnsafeUnpin)] //~ ERROR duplicate `UnsafeUnpin` argument
-    |                                            ^^^^^^^^^^^
-
-error: duplicate `PinnedDrop` argument
-   --> $DIR/invalid.rs:121:44
-    |
-121 |     #[pin_project(PinnedDrop, UnsafeUnpin, PinnedDrop, UnsafeUnpin)] //~ ERROR duplicate `PinnedDrop` argument
-    |                                            ^^^^^^^^^^
-
-error: duplicate `project` argument
-   --> $DIR/invalid.rs:124:32
-    |
-124 |     #[pin_project(project = A, project = B)] //~ ERROR duplicate `project` argument
-    |                                ^^^^^^^^^^^
-
-error: duplicate `project` argument
-   --> $DIR/invalid.rs:127:49
-    |
-127 |     #[pin_project(project = A, project_ref = A, project = B)] //~ ERROR duplicate `project` argument
-    |                                                 ^^^^^^^^^^^
-
-error: duplicate `project_ref` argument
-   --> $DIR/invalid.rs:130:36
-    |
-130 |     #[pin_project(project_ref = A, project_ref = B)] //~ ERROR duplicate `project_ref` argument
-    |                                    ^^^^^^^^^^^^^^^
-
-error: duplicate `project_replace` argument
-   --> $DIR/invalid.rs:133:40
-    |
-133 |     #[pin_project(project_replace = A, project_replace = B)] //~ ERROR duplicate `project_replace` argument
-    |                                        ^^^^^^^^^^^^^^^^^^^
-
-error: duplicate `project_replace` argument
-   --> $DIR/invalid.rs:136:36
-    |
-136 |     #[pin_project(project_replace, project_replace = B)] //~ ERROR duplicate `project_replace` argument
-    |                                    ^^^^^^^^^^^^^^^^^^^
-
-error: duplicate `project_replace` argument
-   --> $DIR/invalid.rs:139:40
-    |
-139 |     #[pin_project(project_replace = A, project_replace)] //~ ERROR duplicate `project_replace` argument
-    |                                        ^^^^^^^^^^^^^^^
-
-error: arguments `PinnedDrop` and `Replace` are mutually exclusive
-   --> $DIR/invalid.rs:145:19
-    |
-145 |     #[pin_project(PinnedDrop, Replace)] //~ ERROR arguments `PinnedDrop` and `Replace` are mutually exclusive
-    |                   ^^^^^^^^^^
-
-error: arguments `PinnedDrop` and `Replace` are mutually exclusive
-   --> $DIR/invalid.rs:148:41
-    |
-148 |     #[pin_project(Replace, UnsafeUnpin, PinnedDrop)] //~ ERROR arguments `PinnedDrop` and `Replace` are mutually exclusive
-    |                                         ^^^^^^^^^^
-
-error: arguments `PinnedDrop` and `project_replace` are mutually exclusive
-   --> $DIR/invalid.rs:151:19
-    |
-151 |     #[pin_project(PinnedDrop, project_replace)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
-    |                   ^^^^^^^^^^
-
-error: arguments `PinnedDrop` and `project_replace` are mutually exclusive
-   --> $DIR/invalid.rs:154:49
-    |
-154 |     #[pin_project(project_replace, UnsafeUnpin, PinnedDrop)] //~ ERROR arguments `PinnedDrop` and `project_replace` are mutually exclusive
-    |                                                 ^^^^^^^^^^
-
-error: arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-   --> $DIR/invalid.rs:163:19
-    |
-163 |     #[pin_project(UnsafeUnpin, !Unpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-    |                   ^^^^^^^^^^^
-
-error: arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-   --> $DIR/invalid.rs:166:39
-    |
-166 |     #[pin_project(!Unpin, PinnedDrop, UnsafeUnpin)] //~ ERROR arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive
-    |                                       ^^^^^^^^^^^
-
-error: expected `!Unpin`, found `!`
-   --> $DIR/invalid.rs:169:19
-    |
-169 |     #[pin_project(!)] //~ ERROR expected `!Unpin`, found `!`
-    |                   ^
-
-error: unexpected argument: Unpin
-   --> $DIR/invalid.rs:172:19
-    |
-172 |     #[pin_project(Unpin)] //~ ERROR unexpected argument
-    |                   ^^^^^
-
-error: expected `project = <identifier>`, found `project`
-   --> $DIR/invalid.rs:175:19
-    |
-175 |     #[pin_project(project)] //~ ERROR expected `project = <identifier>`, found `project`
-    |                   ^^^^^^^
-
-error: expected `project = <identifier>`, found `project =`
-   --> $DIR/invalid.rs:178:19
-    |
-178 |     #[pin_project(project = )] //~ ERROR expected `project = <identifier>`, found `project =`
-    |                   ^^^^^^^^^
-
-error: expected identifier
-   --> $DIR/invalid.rs:181:29
-    |
-181 |     #[pin_project(project = !)] //~ ERROR expected identifier
-    |                             ^
-
-error: expected `project_ref = <identifier>`, found `project_ref`
-   --> $DIR/invalid.rs:184:19
-    |
-184 |     #[pin_project(project_ref)] //~ ERROR expected `project_ref = <identifier>`, found `project_ref`
-    |                   ^^^^^^^^^^^
-
-error: expected `project_ref = <identifier>`, found `project_ref =`
-   --> $DIR/invalid.rs:187:19
-    |
-187 |     #[pin_project(project_ref = )] //~ ERROR expected `project_ref = <identifier>`, found `project_ref =`
-    |                   ^^^^^^^^^^^^^
-
-error: expected identifier
-   --> $DIR/invalid.rs:190:33
-    |
-190 |     #[pin_project(project_ref = !)] //~ ERROR expected identifier
-    |                                 ^
-
-error: expected `project_replace = <identifier>`, found `project_replace =`
-   --> $DIR/invalid.rs:196:19
-    |
-196 |     #[pin_project(project_replace = )] //~ ERROR expected `project_replace = <identifier>`, found `project_replace =`
-    |                   ^^^^^^^^^^^^^^^^^
-
-error: expected identifier
-   --> $DIR/invalid.rs:199:37
-    |
-199 |     #[pin_project(project_replace = !)] //~ ERROR expected identifier
-    |                                     ^
-
-error: name `A` is already specified by `project` argument
-   --> $DIR/invalid.rs:206:46
-    |
-206 |     #[pin_project(project = A, project_ref = A)] //~ ERROR name `A` is already specified by `project` argument
-    |                                              ^
-
-error: name `A` is already specified by `project` argument
-   --> $DIR/invalid.rs:209:50
-    |
-209 |     #[pin_project(project = A, project_replace = A)] //~ ERROR name `A` is already specified by `project` argument
-    |                                                  ^
-
-error: name `A` is already specified by `project_ref` argument
-   --> $DIR/invalid.rs:212:54
-    |
-212 |     #[pin_project(project_ref = A, project_replace = A)] //~ ERROR name `A` is already specified by `project_ref` argument
-    |                                                      ^
-
-error: duplicate #[pin_project] attribute
-   --> $DIR/invalid.rs:220:5
-    |
-220 |     #[pin_project] //~ ERROR duplicate #[pin_project] attribute
-    |     ^^^^^^^^^^^^^^
-
-error: #[pin_project] attribute may not be used on structs with zero fields
-   --> $DIR/invalid.rs:228:19
-    |
-228 |     struct Struct {} //~ ERROR may not be used on structs with zero fields
-    |                   ^^
-
-error: #[pin_project] attribute may not be used on structs with zero fields
-   --> $DIR/invalid.rs:231:23
-    |
-231 |     struct TupleStruct(); //~ ERROR may not be used on structs with zero fields
-    |                       ^^
-
-error: #[pin_project] attribute may not be used on structs with zero fields
-   --> $DIR/invalid.rs:234:12
-    |
-234 |     struct UnitStruct; //~ ERROR may not be used on structs with zero fields
-    |            ^^^^^^^^^^
-
-error: #[pin_project] attribute may not be used on enums without variants
-   --> $DIR/invalid.rs:237:20
-    |
-237 |     enum EnumEmpty {} //~ ERROR may not be used on enums without variants
-    |                    ^^
-
-error: #[pin_project] attribute may not be used on enums with discriminants
-   --> $DIR/invalid.rs:241:13
-    |
-241 |         V = 2, //~ ERROR may not be used on enums with discriminants
-    |             ^
-
-error: #[pin_project] attribute may not be used on enums with zero fields
-   --> $DIR/invalid.rs:246:9
-    |
-246 | /         Unit, //~ ERROR may not be used on enums with zero fields
-247 | |         Tuple(),
-248 | |         Struct {},
-    | |__________________^
-
-error: #[pin_project] attribute may only be used on structs or enums
-   --> $DIR/invalid.rs:252:5
-    |
-252 | /     union Union {
-253 | |         //~^ ERROR may only be used on structs or enums
-254 | |         f: (),
-255 | |     }
-    | |_____^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> $DIR/invalid.rs:263:12
-    |
-263 |     #[repr(packed)]
-    |            ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> $DIR/invalid.rs:267:12
-    |
-267 |     #[repr(packed)]
-    |            ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-   --> $DIR/invalid.rs:271:12
-    |
-271 |     #[repr(packed)]
-    |            ^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/overlapping_unpin_struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/overlapping_unpin_struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/overlapping_unpin_struct.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/overlapping_unpin_struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project]
-struct Foo<T> {
-    #[pin]
-    inner: T,
-}
-
-struct __Foo {}
-
-impl Unpin for __Foo {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/overlapping_unpin_struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/overlapping_unpin_struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/overlapping_unpin_struct.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/overlapping_unpin_struct.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/overlapping_unpin_struct.rs:17:5
-   |
-14 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-17 |     is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `_::__Foo<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `_::__Foo<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<PhantomPinned>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-enum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-enum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-enum.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-enum.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-use pin_project::pin_project;
-
-#[repr(packed)] //~ ERROR E0517
-enum E1 {
-    V(()),
-}
-
-#[pin_project]
-#[repr(packed)] //~ ERROR E0517
-enum E2 {
-    V(()),
-}
-
-#[repr(packed)] //~ ERROR E0517
-#[pin_project]
-enum E3 {
-    V(()),
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-enum.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-enum.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-enum.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-enum.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-error[E0517]: attribute should be applied to struct or union
- --> $DIR/packed-enum.rs:3:8
-  |
-3 |   #[repr(packed)] //~ ERROR E0517
-  |          ^^^^^^
-4 | / enum E1 {
-5 | |     V(()),
-6 | | }
-  | |_- not a struct or union
-
-error[E0517]: attribute should be applied to struct or union
-  --> $DIR/packed-enum.rs:9:8
-   |
-9  |   #[repr(packed)] //~ ERROR E0517
-   |          ^^^^^^
-10 | / enum E2 {
-11 | |     V(()),
-12 | | }
-   | |_- not a struct or union
-
-error[E0517]: attribute should be applied to struct or union
-  --> $DIR/packed-enum.rs:14:8
-   |
-14 |   #[repr(packed)] //~ ERROR E0517
-   |          ^^^^^^
-15 |   #[pin_project]
-16 | / enum E3 {
-17 | |     V(()),
-18 | | }
-   | |_- not a struct or union
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-name-value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-name-value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-name-value.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-name-value.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-use pin_project::pin_project;
-
-#[repr(packed = "")] //~ ERROR E0552
-struct S1 {
-    f: (),
-}
-
-#[pin_project]
-#[repr(packed = "")] //~ ERROR E0552
-struct S2 {
-    f: (),
-}
-
-#[repr(packed = "")] //~ ERROR E0552
-#[pin_project]
-struct S3 {
-    f: (),
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-name-value.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-name-value.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-name-value.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed-name-value.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error[E0552]: unrecognized representation hint
- --> $DIR/packed-name-value.rs:3:8
-  |
-3 | #[repr(packed = "")] //~ ERROR E0552
-  |        ^^^^^^^^^^^
-
-error[E0552]: unrecognized representation hint
- --> $DIR/packed-name-value.rs:9:8
-  |
-9 | #[repr(packed = "")] //~ ERROR E0552
-  |        ^^^^^^^^^^^
-
-error[E0552]: unrecognized representation hint
-  --> $DIR/packed-name-value.rs:14:8
-   |
-14 | #[repr(packed = "")] //~ ERROR E0552
-   |        ^^^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project]
-#[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
-struct A {
-    #[pin]
-    field: u8,
-}
-
-// Test putting 'repr' before the 'pin_project' attribute
-#[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
-#[pin_project]
-struct B {
-    #[pin]
-    field: u8,
-}
-
-#[pin_project]
-#[repr(packed(2))] //~ ERROR may not be used on #[repr(packed)] types
-struct C {
-    #[pin]
-    field: u32,
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-1.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-use auxiliary_macro::hidden_repr;
-use pin_project::{pin_project, pinned_drop, UnsafeUnpin};
-use std::pin::Pin;
-
-#[pin_project] //~ ERROR may not be used on #[repr(packed)] types
-#[hidden_repr(packed)]
-struct A {
-    #[pin]
-    field: u32,
-}
-
-#[pin_project(UnsafeUnpin)] //~ ERROR may not be used on #[repr(packed)] types
-#[hidden_repr(packed)]
-struct C {
-    #[pin]
-    field: u32,
-}
-
-unsafe impl UnsafeUnpin for C {}
-
-#[pin_project(PinnedDrop)] //~ ERROR may not be used on #[repr(packed)] types
-#[hidden_repr(packed)]
-struct D {
-    #[pin]
-    field: u32,
-}
-
-#[pinned_drop]
-impl PinnedDrop for D {
-    fn drop(self: Pin<&mut Self>) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-1.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-1.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-1.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-1.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> $DIR/packed_sneaky-1.rs:6:1
-  |
-6 | #[hidden_repr(packed)]
-  | ^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed_sneaky-1.rs:13:1
-   |
-13 | #[hidden_repr(packed)]
-   | ^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed_sneaky-1.rs:22:1
-   |
-22 | #[hidden_repr(packed)]
-   | ^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-use auxiliary_macro::hidden_repr_macro;
-use pin_project::pin_project;
-
-hidden_repr_macro! { //~ ERROR may not be used on #[repr(packed)] types
-    #[pin_project]
-    struct B {
-        #[pin]
-        field: u32,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-2.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-2.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-2.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed_sneaky-2.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed_sneaky-2.rs:4:1
-   |
-4  | / hidden_repr_macro! { //~ ERROR may not be used on #[repr(packed)] types
-5  | |     #[pin_project]
-6  | |     struct B {
-7  | |         #[pin]
-8  | |         field: u32,
-9  | |     }
-10 | | }
-   | |_^
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/packed.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
- --> $DIR/packed.rs:4:8
-  |
-4 | #[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
-  |        ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed.rs:11:8
-   |
-11 | #[repr(packed, C)] //~ ERROR may not be used on #[repr(packed)] types
-   |        ^^^^^^
-
-error: #[pin_project] attribute may not be used on #[repr(packed)] types
-  --> $DIR/packed.rs:19:8
-   |
-19 | #[repr(packed(2))] //~ ERROR may not be used on #[repr(packed)] types
-   |        ^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/private_in_public-enum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/private_in_public-enum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/private_in_public-enum.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/private_in_public-enum.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-// Even if allows private_in_public, these are errors.
-
-#![allow(private_in_public)]
-
-pub enum PublicEnum {
-    Variant(PrivateEnum), //~ ERROR E0446
-}
-
-enum PrivateEnum {
-    Variant(u8),
-}
-
-mod foo {
-    pub(crate) enum CrateEnum {
-        Variant(PrivateEnum), //~ ERROR E0446
-    }
-
-    enum PrivateEnum {
-        Variant(u8),
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/private_in_public-enum.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/private_in_public-enum.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/private_in_public-enum.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/private_in_public-enum.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error[E0446]: private type `PrivateEnum` in public interface
- --> $DIR/private_in_public-enum.rs:6:13
-  |
-6 |     Variant(PrivateEnum), //~ ERROR E0446
-  |             ^^^^^^^^^^^ can't leak private type
-...
-9 | enum PrivateEnum {
-  | - `PrivateEnum` declared as private
-
-error[E0446]: private type `foo::PrivateEnum` in public interface
-  --> $DIR/private_in_public-enum.rs:15:17
-   |
-15 |         Variant(PrivateEnum), //~ ERROR E0446
-   |                 ^^^^^^^^^^^ can't leak private type
-...
-18 |     enum PrivateEnum {
-   |     - `foo::PrivateEnum` declared as private
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized_locals.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized_locals.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized_locals.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized_locals.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#![feature(unsized_locals)]
-
-use pin_project::pin_project;
-
-#[pin_project(project_replace)] //~ ERROR E0277
-struct Struct<T: ?Sized> {
-    x: T,
-}
-
-#[pin_project(project_replace)] //~ ERROR E0277
-struct TupleStruct<T: ?Sized>(T);
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized_locals.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized_locals.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized_locals.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized_locals.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized_locals.rs:6:8
-  |
-6 | struct Struct<T: ?Sized> {
-  |        ^^^^^^^-^^^^^^^^^
-  |        |      |
-  |        |      this type parameter needs to be `Sized`
-  |        doesn't have a size known at compile-time
-  |
-  = note: required because it appears within the type `__StructProjectionOwned<T>`
-  = note: the return type of a function must have a statically known size
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-   --> $DIR/project_replace_unsized_locals.rs:7:5
-    |
-6   | struct Struct<T: ?Sized> {
-    |               - this type parameter needs to be `Sized`
-7   |     x: T,
-    |     ^ doesn't have a size known at compile-time
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized_locals.rs:5:1
-  |
-5 | #[pin_project(project_replace)] //~ ERROR E0277
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-6 | struct Struct<T: ?Sized> {
-  |               - this type parameter needs to be `Sized`
-  |
-  = note: required because it appears within the type `__StructProjectionOwned<T>`
-  = note: structs must have a statically known size to be initialized
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-  --> $DIR/project_replace_unsized_locals.rs:11:8
-   |
-11 | struct TupleStruct<T: ?Sized>(T);
-   |        ^^^^^^^^^^^^-^^^^^^^^^
-   |        |           |
-   |        |           this type parameter needs to be `Sized`
-   |        doesn't have a size known at compile-time
-   |
-   = note: required because it appears within the type `__TupleStructProjectionOwned<T>`
-   = note: the return type of a function must have a statically known size
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-   --> $DIR/project_replace_unsized_locals.rs:10:1
-    |
-10  | #[pin_project(project_replace)] //~ ERROR E0277
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-11  | struct TupleStruct<T: ?Sized>(T);
-    |                    - this type parameter needs to be `Sized`
-    |
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(project_replace)] //~ ERROR E0277
-struct Struct<T: ?Sized> {
-    x: T,
-}
-
-#[pin_project(project_replace)] //~ ERROR E0277
-struct TupleStruct<T: ?Sized>(T);
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/project_replace_unsized.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized.rs:3:15
-  |
-3 | #[pin_project(project_replace)] //~ ERROR E0277
-  |               ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-4 | struct Struct<T: ?Sized> {
-  |               - this type parameter needs to be `Sized`
-  |
-  = note: required because it appears within the type `Struct<T>`
-  = help: unsized locals are gated as an unstable feature
-help: function arguments must have a statically known size, borrowed types always have a known size
-  |
-3 | #[pin_project(&project_replace)] //~ ERROR E0277
-  |               ^
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-   --> $DIR/project_replace_unsized.rs:5:5
-    |
-4   | struct Struct<T: ?Sized> {
-    |               - this type parameter needs to be `Sized`
-5   |     x: T,
-    |     ^ doesn't have a size known at compile-time
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized.rs:3:1
-  |
-3 | #[pin_project(project_replace)] //~ ERROR E0277
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-4 | struct Struct<T: ?Sized> {
-  |               - this type parameter needs to be `Sized`
-  |
-  = note: required because it appears within the type `__StructProjectionOwned<T>`
-  = note: structs must have a statically known size to be initialized
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized.rs:8:15
-  |
-8 | #[pin_project(project_replace)] //~ ERROR E0277
-  |               ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-9 | struct TupleStruct<T: ?Sized>(T);
-  |                    - this type parameter needs to be `Sized`
-  |
-  = note: required because it appears within the type `TupleStruct<T>`
-  = help: unsized locals are gated as an unstable feature
-help: function arguments must have a statically known size, borrowed types always have a known size
-  |
-8 | #[pin_project(&project_replace)] //~ ERROR E0277
-  |               ^
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
-   --> $DIR/project_replace_unsized.rs:8:1
-    |
-8   | #[pin_project(project_replace)] //~ ERROR E0277
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
-9   | struct TupleStruct<T: ?Sized>(T);
-    |                    - this type parameter needs to be `Sized`
-    |
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0277]: the size for values of type `T` cannot be known at compilation time
- --> $DIR/project_replace_unsized.rs:9:8
-  |
-9 | struct TupleStruct<T: ?Sized>(T);
-  |        ^^^^^^^^^^^ - this type parameter needs to be `Sized`
-  |        |
-  |        doesn't have a size known at compile-time
-  |
-  = note: all function arguments must have a statically known size
-  = help: unsized locals are gated as an unstable feature
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/proper_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/proper_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/proper_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/proper_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-struct Inner<T> {
-    val: T,
-}
-
-#[pin_project]
-struct Foo<T, U> {
-    #[pin]
-    inner: Inner<T>,
-    other: U,
-}
-
-#[pin_project]
-struct TrivialBounds {
-    #[pin]
-    field1: PhantomPinned,
-}
-
-#[pin_project]
-struct Bar<'a, T, U> {
-    #[pin]
-    inner: &'a mut Inner<T>,
-    other: U,
-}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Foo<PhantomPinned, ()>>(); //~ ERROR E0277
-    is_unpin::<Foo<(), PhantomPinned>>(); // Ok
-    is_unpin::<Foo<PhantomPinned, PhantomPinned>>(); //~ ERROR E0277
-
-    is_unpin::<TrivialBounds>(); //~ ERROR E0277
-
-    is_unpin::<Bar<'_, PhantomPinned, PhantomPinned>>(); // Ok
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/proper_unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/proper_unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/proper_unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/proper_unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/proper_unpin.rs:31:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-31 |     is_unpin::<Foo<PhantomPinned, ()>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `__Foo<'_, PhantomPinned, ()>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Inner<PhantomPinned>`
-   = note: required because it appears within the type `__Foo<'_, PhantomPinned, ()>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<PhantomPinned, ()>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/proper_unpin.rs:33:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-33 |     is_unpin::<Foo<PhantomPinned, PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `__Foo<'_, PhantomPinned, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Inner<PhantomPinned>`
-   = note: required because it appears within the type `__Foo<'_, PhantomPinned, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<PhantomPinned, PhantomPinned>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/proper_unpin.rs:35:5
-   |
-28 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-35 |     is_unpin::<TrivialBounds>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^ within `__TrivialBounds<'_>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `__TrivialBounds<'_>`
-   = note: required because of the requirements on the impl of `Unpin` for `TrivialBounds`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-field.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-field.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-use auxiliary_macro::remove_attr;
-use pin_project::pin_project;
-use std::{marker::PhantomPinned, pin::Pin};
-
-fn is_unpin<T: Unpin>() {}
-
-#[pin_project]
-#[remove_attr(field_all)]
-struct A {
-    #[pin]
-    field: PhantomPinned,
-}
-
-#[remove_attr(field_all)]
-#[pin_project]
-struct B {
-    #[pin]
-    field: PhantomPinned,
-}
-
-fn main() {
-    is_unpin::<A>();
-    is_unpin::<B>();
-
-    let mut x = A { field: PhantomPinned };
-    let x = Pin::new(&mut x).project();
-    let _: Pin<&mut PhantomPinned> = x.field; //~ ERROR E0308
-
-    let mut x = B { field: PhantomPinned };
-    let x = Pin::new(&mut x).project();
-    let _: Pin<&mut PhantomPinned> = x.field; //~ ERROR E0308
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-field.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-field.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-field.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-field.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/remove-attr-from-field.rs:27:38
-   |
-27 |     let _: Pin<&mut PhantomPinned> = x.field; //~ ERROR E0308
-   |            -----------------------   ^^^^^^^ expected struct `Pin`, found `&mut PhantomPinned`
-   |            |
-   |            expected due to this
-   |
-   = note:         expected struct `Pin<&mut PhantomPinned>`
-           found mutable reference `&mut PhantomPinned`
-
-error[E0308]: mismatched types
-  --> $DIR/remove-attr-from-field.rs:31:38
-   |
-31 |     let _: Pin<&mut PhantomPinned> = x.field; //~ ERROR E0308
-   |            -----------------------   ^^^^^^^ expected struct `Pin`, found `&mut PhantomPinned`
-   |            |
-   |            expected due to this
-   |
-   = note:         expected struct `Pin<&mut PhantomPinned>`
-           found mutable reference `&mut PhantomPinned`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-struct.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-use auxiliary_macro::remove_attr;
-use pin_project::pin_project;
-use std::{marker::PhantomPinned, pin::Pin};
-
-fn is_unpin<T: Unpin>() {}
-
-#[pin_project]
-#[remove_attr(struct_all)]
-struct A {
-    #[pin] //~ ERROR cannot find attribute `pin` in this scope
-    field: PhantomPinned,
-}
-
-#[remove_attr(struct_all)]
-#[pin_project]
-struct B {
-    #[pin] //~ ERROR cannot find attribute `pin` in this scope
-    field: PhantomPinned,
-}
-
-#[pin_project] //~ ERROR has been removed
-#[remove_attr(struct_pin)]
-struct C {
-    field: PhantomPinned,
-}
-
-#[remove_attr(struct_pin)]
-#[pin_project] // Ok
-struct D {
-    field: PhantomPinned,
-}
-
-fn main() {
-    is_unpin::<A>(); //~ ERROR E0277
-    is_unpin::<B>(); //~ ERROR E0277
-    is_unpin::<D>(); // Ok
-
-    let mut x = A { field: PhantomPinned };
-    let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-
-    let mut x = B { field: PhantomPinned };
-    let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-
-    let mut x = D { field: PhantomPinned };
-    let _ = Pin::new(&mut x).project(); //~ Ok
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-struct.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/remove-attr-from-struct.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-error: #[pin_project] attribute has been removed
-  --> $DIR/remove-attr-from-struct.rs:21:1
-   |
-21 | #[pin_project] //~ ERROR has been removed
-   | ^^^^^^^^^^^^^^
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: cannot find attribute `pin` in this scope
-  --> $DIR/remove-attr-from-struct.rs:10:7
-   |
-10 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
-   |       ^^^
-
-error: cannot find attribute `pin` in this scope
-  --> $DIR/remove-attr-from-struct.rs:17:7
-   |
-17 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
-   |       ^^^
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/remove-attr-from-struct.rs:34:5
-   |
-5  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-34 |     is_unpin::<A>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^ within `A`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `A`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/remove-attr-from-struct.rs:35:5
-   |
-5  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-35 |     is_unpin::<B>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^ within `B`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `B`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/remove-attr-from-struct.rs:39:13
-   |
-39 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-   |             ^^^^^^^^ within `A`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `A`
-   = note: required by `Pin::<P>::new`
-
-error[E0599]: no method named `project` found for struct `Pin<&mut A>` in the current scope
-  --> $DIR/remove-attr-from-struct.rs:39:30
-   |
-39 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-   |                              ^^^^^^^ method not found in `Pin<&mut A>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/remove-attr-from-struct.rs:42:13
-   |
-42 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-   |             ^^^^^^^^ within `B`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `B`
-   = note: required by `Pin::<P>::new`
-
-error[E0599]: no method named `project` found for struct `Pin<&mut B>` in the current scope
-  --> $DIR/remove-attr-from-struct.rs:42:30
-   |
-42 |     let _ = Pin::new(&mut x).project(); //~ ERROR E0277,E0599
-   |                              ^^^^^^^ method not found in `Pin<&mut B>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/safe_packed_borrows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/safe_packed_borrows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/safe_packed_borrows.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/safe_packed_borrows.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#![forbid(safe_packed_borrows)]
-
-// Refs: https://github.com/rust-lang/rust/issues/46043
-
-#[repr(packed)]
-struct A {
-    field: u32,
-}
-
-#[repr(packed(2))]
-struct B {
-    field: u32,
-}
-
-fn main() {
-    let a = A { field: 1 };
-    &a.field; //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-
-    let b = B { field: 1 };
-    &b.field; //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/safe_packed_borrows.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/safe_packed_borrows.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/safe_packed_borrows.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/safe_packed_borrows.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-error: borrow of packed field is unsafe and requires unsafe function or block (error E0133)
-  --> $DIR/safe_packed_borrows.rs:17:5
-   |
-17 |     &a.field; //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-   |     ^^^^^^^^
-   |
-note: the lint level is defined here
-  --> $DIR/safe_packed_borrows.rs:1:11
-   |
-1  | #![forbid(safe_packed_borrows)]
-   |           ^^^^^^^^^^^^^^^^^^^
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
-   = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior
-
-error: borrow of packed field is unsafe and requires unsafe function or block (error E0133)
-  --> $DIR/safe_packed_borrows.rs:20:5
-   |
-20 |     &b.field; //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-   |     ^^^^^^^^
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
-   = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/unpin_sneaky.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/unpin_sneaky.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/unpin_sneaky.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/unpin_sneaky.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project]
-struct Foo {
-    #[pin]
-    inner: u8,
-}
-
-impl Unpin for __Foo {} //~ ERROR E0412,E0321
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/unpin_sneaky.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/unpin_sneaky.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/unpin_sneaky.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/unpin_sneaky.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0412]: cannot find type `__Foo` in this scope
- --> $DIR/unpin_sneaky.rs:9:16
-  |
-9 | impl Unpin for __Foo {} //~ ERROR E0412,E0321
-  |                ^^^^^ not found in this scope
-
-error[E0321]: cross-crate traits with a default impl, like `Unpin`, can only be implemented for a struct/enum type, not `[type error]`
- --> $DIR/unpin_sneaky.rs:9:1
-  |
-9 | impl Unpin for __Foo {} //~ ERROR E0412,E0321
-  | ^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/visibility.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/visibility.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/visibility.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/visibility.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-mod pub_ {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    pub struct Default(());
-
-    #[pin_project(project_replace)]
-    pub struct Replace(());
-}
-pub mod pub_use {
-    #[rustfmt::skip]
-    pub use crate::pub_::__DefaultProjection; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_::__DefaultProjectionRef; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_::__ReplaceProjection; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_::__ReplaceProjectionOwned; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_::__ReplaceProjectionRef; //~ ERROR E0365
-
-    // Confirm that the visibility of the original type is not changed.
-    pub use crate::pub_::{Default, Replace};
-}
-pub mod pub_use2 {
-    // Ok
-    #[allow(unused_imports)]
-    pub(crate) use crate::pub_::{
-        __DefaultProjection, __DefaultProjectionRef, __ReplaceProjection, __ReplaceProjectionOwned,
-        __ReplaceProjectionRef,
-    };
-}
-
-mod pub_crate {
-    use pin_project::pin_project;
-
-    #[pin_project]
-    pub(crate) struct Default(());
-
-    #[pin_project(project_replace)]
-    pub(crate) struct Replace(());
-}
-pub mod pub_crate_use {
-    // Ok
-    #[allow(unused_imports)]
-    pub(crate) use crate::pub_crate::{
-        __DefaultProjection, __DefaultProjectionRef, __ReplaceProjection, __ReplaceProjectionOwned,
-        __ReplaceProjectionRef,
-    };
-}
-
-mod pub_renamed {
-    use pin_project::pin_project;
-
-    #[pin_project(project = DProj, project_ref = DProjRef)]
-    pub struct Default(());
-
-    #[pin_project(project = RProj, project_ref = RProjRef, project_replace = RProjOwn)]
-    pub struct Replace(());
-}
-pub mod pub_renamed_use {
-    #[rustfmt::skip]
-    pub use crate::pub_renamed::DProj; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_renamed::DProjRef; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_renamed::RProj; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_renamed::RProjOwn; //~ ERROR E0365
-    #[rustfmt::skip]
-    pub use crate::pub_renamed::RProjRef; //~ ERROR E0365
-
-    // Confirm that the visibility of the original type is not changed.
-    pub use crate::pub_renamed::{Default, Replace};
-}
-pub mod pub_renamed_use2 {
-    // Ok
-    #[allow(unused_imports)]
-    pub(crate) use crate::pub_renamed::{DProj, DProjRef, RProj, RProjOwn, RProjRef};
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/visibility.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/visibility.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/visibility.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/pin_project/visibility.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-error[E0365]: `__DefaultProjection` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:12:13
-   |
-12 |     pub use crate::pub_::__DefaultProjection; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `__DefaultProjection`
-   |
-   = note: consider declaring type or module `__DefaultProjection` with `pub`
-
-error[E0365]: `__DefaultProjectionRef` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:14:13
-   |
-14 |     pub use crate::pub_::__DefaultProjectionRef; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `__DefaultProjectionRef`
-   |
-   = note: consider declaring type or module `__DefaultProjectionRef` with `pub`
-
-error[E0365]: `__ReplaceProjection` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:16:13
-   |
-16 |     pub use crate::pub_::__ReplaceProjection; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `__ReplaceProjection`
-   |
-   = note: consider declaring type or module `__ReplaceProjection` with `pub`
-
-error[E0365]: `__ReplaceProjectionOwned` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:18:13
-   |
-18 |     pub use crate::pub_::__ReplaceProjectionOwned; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `__ReplaceProjectionOwned`
-   |
-   = note: consider declaring type or module `__ReplaceProjectionOwned` with `pub`
-
-error[E0365]: `__ReplaceProjectionRef` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:20:13
-   |
-20 |     pub use crate::pub_::__ReplaceProjectionRef; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `__ReplaceProjectionRef`
-   |
-   = note: consider declaring type or module `__ReplaceProjectionRef` with `pub`
-
-error[E0365]: `DProj` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:63:13
-   |
-63 |     pub use crate::pub_renamed::DProj; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `DProj`
-   |
-   = note: consider declaring type or module `DProj` with `pub`
-
-error[E0365]: `DProjRef` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:65:13
-   |
-65 |     pub use crate::pub_renamed::DProjRef; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `DProjRef`
-   |
-   = note: consider declaring type or module `DProjRef` with `pub`
-
-error[E0365]: `RProj` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:67:13
-   |
-67 |     pub use crate::pub_renamed::RProj; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `RProj`
-   |
-   = note: consider declaring type or module `RProj` with `pub`
-
-error[E0365]: `RProjOwn` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:69:13
-   |
-69 |     pub use crate::pub_renamed::RProjOwn; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `RProjOwn`
-   |
-   = note: consider declaring type or module `RProjOwn` with `pub`
-
-error[E0365]: `RProjRef` is private, and cannot be re-exported
-  --> $DIR/visibility.rs:71:13
-   |
-71 |     pub use crate::pub_renamed::RProjRef; //~ ERROR E0365
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re-export of private `RProjRef`
-   |
-   = note: consider declaring type or module `RProjRef` with `pub`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/ambiguous-let.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/ambiguous-let.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/ambiguous-let.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/ambiguous-let.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#![allow(deprecated)]
-
-use pin_project::{pin_project, project};
-
-#[pin_project]
-enum Enum<A, B> {
-    A(#[pin] A),
-    B(B),
-}
-
-struct Struct<T>(T);
-
-#[project]
-fn foo() {
-    let mut foo: Enum<bool, bool> = Enum::A(true);
-
-    #[project]
-    let Struct(x) = match Pin::new(&mut foo).project() {
-        //~^ ERROR Both initializer expression and pattern are replaceable, you need to split the initializer expression into separate let bindings to avoid ambiguity
-        Enum::A(_) => Struct(true),
-        Enum::B(_) => unreachable!(),
-    };
-    assert!(x);
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/ambiguous-let.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/ambiguous-let.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/ambiguous-let.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/ambiguous-let.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-error: Both initializer expression and pattern are replaceable, you need to split the initializer expression into separate let bindings to avoid ambiguity
-  --> $DIR/ambiguous-let.rs:18:9
-   |
-18 |     let Struct(x) = match Pin::new(&mut foo).project() {
-   |         ^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/deprecated.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/deprecated.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/deprecated.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/deprecated.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#![deny(deprecated)]
-
-use pin_project::{project, project_ref, project_replace};
-
-#[project]
-#[project_ref]
-#[project_replace]
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/deprecated.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/deprecated.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/deprecated.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/deprecated.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-error: use of deprecated macro `project`: consider naming projected type by passing `project` argument to #[pin_project] attribute instead, see release note <https://github.com/taiki-e/pin-project/releases/tag/v0.4.21> for details
- --> $DIR/deprecated.rs:5:3
-  |
-5 | #[project]
-  |   ^^^^^^^
-  |
-note: the lint level is defined here
- --> $DIR/deprecated.rs:1:9
-  |
-1 | #![deny(deprecated)]
-  |         ^^^^^^^^^^
-
-error: use of deprecated macro `project_ref`: consider naming projected type by passing `project_ref` argument to #[pin_project] attribute instead, see release note <https://github.com/taiki-e/pin-project/releases/tag/v0.4.21> for details
- --> $DIR/deprecated.rs:6:3
-  |
-6 | #[project_ref]
-  |   ^^^^^^^^^^^
-
-error: use of deprecated macro `project_replace`: consider naming projected type by passing `project_replace` argument to #[pin_project] attribute instead, see release note <https://github.com/taiki-e/pin-project/releases/tag/v0.4.21> for details
- --> $DIR/deprecated.rs:7:3
-  |
-7 | #[project_replace]
-  |   ^^^^^^^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/invalid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/invalid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/invalid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/invalid.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-#![allow(deprecated)]
-
-mod argument {
-    use pin_project::{pin_project, project};
-
-    #[pin_project]
-    struct A(#[pin] ());
-
-    #[project]
-    fn unexpected_local1() {
-        let mut x = A(());
-        #[project()] //~ ERROR unexpected token
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project]
-    fn unexpected_local1() {
-        let mut x = A(());
-        #[project(foo)] //~ ERROR unexpected token
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project]
-    fn unexpected_expr1() {
-        let mut x = A(());
-        #[project()] //~ ERROR unexpected token
-        match Pin::new(&mut x).project() {
-            A(_) => {}
-        }
-    }
-
-    #[project]
-    fn unexpected_expr1() {
-        let mut x = A(());
-        #[project(foo)] //~ ERROR unexpected token
-        match Pin::new(&mut x).project() {
-            A(_) => {}
-        }
-    }
-
-    #[project()] // Ok
-    fn unexpected_item1() {}
-
-    #[project(foo)] //~ ERROR unexpected token
-    fn unexpected_item2() {}
-}
-
-mod attribute {
-    use pin_project::{pin_project, project, project_ref, project_replace};
-
-    #[pin_project(project_replace)]
-    struct A(#[pin] ());
-
-    #[project]
-    fn duplicate_stmt_project() {
-        let mut x = A(());
-        #[project]
-        #[project] //~ ERROR duplicate #[project] attribute
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project_ref]
-    fn duplicate_stmt_project_ref() {
-        let mut x = A(());
-        #[project_ref]
-        #[project_ref] //~ ERROR duplicate #[project_ref] attribute
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project_replace]
-    fn duplicate_stmt_project_replace() {
-        let mut x = A(());
-        #[project_replace]
-        #[project_replace] //~ ERROR duplicate #[project_replace] attribute
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project]
-    fn combine_stmt_project1() {
-        let mut x = A(());
-        #[project]
-        #[project_ref] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project]
-    fn combine_stmt_project2() {
-        let mut x = A(());
-        #[project]
-        #[project_replace] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project]
-    fn combine_stmt_project3() {
-        let mut x = A(());
-        #[project_ref]
-        #[project_replace] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project_ref]
-    fn combine_stmt_project_ref1() {
-        let mut x = A(());
-        #[project]
-        #[project_ref] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project_ref]
-    fn combine_stmt_project_ref2() {
-        let mut x = A(());
-        #[project]
-        #[project_replace] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project_ref]
-    fn combine_stmt_project_ref3() {
-        let mut x = A(());
-        #[project_ref]
-        #[project_replace] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project_replace]
-    fn combine_stmt_project_replace1() {
-        let mut x = A(());
-        #[project]
-        #[project_ref] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project_replace]
-    fn combine_stmt_project_replace2() {
-        let mut x = A(());
-        #[project]
-        #[project_replace] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project_replace]
-    fn combine_stmt_project_replace3() {
-        let mut x = A(());
-        #[project_ref]
-        #[project_replace] //~ ERROR are mutually exclusive
-        let A(_) = Pin::new(&mut x).project();
-    }
-
-    #[project]
-    #[project] //~ ERROR duplicate #[project] attribute
-    fn duplicate_fn_project() {}
-
-    #[project_ref]
-    #[project_ref] //~ ERROR duplicate #[project_ref] attribute
-    fn duplicate_fn_project_ref() {}
-
-    #[project_replace]
-    #[project_replace] //~ ERROR duplicate #[project_replace] attribute
-    fn duplicate_fn_project_replace() {}
-
-    #[project]
-    #[project] //~ ERROR duplicate #[project] attribute
-    impl A {}
-
-    #[project_ref]
-    #[project_ref] //~ ERROR duplicate #[project_ref] attribute
-    impl A {}
-
-    #[project_replace]
-    #[project_replace] //~ ERROR duplicate #[project_replace] attribute
-    impl A {}
-
-    #[allow(unused_imports)]
-    mod use_ {
-        use pin_project::{project, project_ref, project_replace};
-
-        #[project]
-        #[project] //~ ERROR duplicate #[project] attribute
-        use super::A;
-
-        #[project_ref]
-        #[project_ref] //~ ERROR duplicate #[project_ref] attribute
-        use super::A;
-
-        #[project_replace]
-        #[project_replace] //~ ERROR duplicate #[project_replace] attribute
-        use super::A;
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/invalid.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/invalid.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/invalid.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/invalid.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-error: unexpected token: ()
-  --> $DIR/invalid.rs:12:18
-   |
-12 |         #[project()] //~ ERROR unexpected token
-   |                  ^^
-
-error: unexpected token: (foo)
-  --> $DIR/invalid.rs:19:18
-   |
-19 |         #[project(foo)] //~ ERROR unexpected token
-   |                  ^^^^^
-
-error: unexpected token: ()
-  --> $DIR/invalid.rs:26:18
-   |
-26 |         #[project()] //~ ERROR unexpected token
-   |                  ^^
-
-error: unexpected token: (foo)
-  --> $DIR/invalid.rs:35:18
-   |
-35 |         #[project(foo)] //~ ERROR unexpected token
-   |                  ^^^^^
-
-error: unexpected token: foo
-  --> $DIR/invalid.rs:44:15
-   |
-44 |     #[project(foo)] //~ ERROR unexpected token
-   |               ^^^
-
-error: duplicate #[project] attribute
-  --> $DIR/invalid.rs:58:9
-   |
-58 |         #[project] //~ ERROR duplicate #[project] attribute
-   |         ^^^^^^^^^^
-
-error: duplicate #[project_ref] attribute
-  --> $DIR/invalid.rs:66:9
-   |
-66 |         #[project_ref] //~ ERROR duplicate #[project_ref] attribute
-   |         ^^^^^^^^^^^^^^
-
-error: duplicate #[project_replace] attribute
-  --> $DIR/invalid.rs:74:9
-   |
-74 |         #[project_replace] //~ ERROR duplicate #[project_replace] attribute
-   |         ^^^^^^^^^^^^^^^^^^
-
-error: attributes `project` and `project_ref` are mutually exclusive
-  --> $DIR/invalid.rs:82:9
-   |
-82 |         #[project_ref] //~ ERROR are mutually exclusive
-   |         ^^^^^^^^^^^^^^
-
-error: attributes `project` and `project_replace` are mutually exclusive
-  --> $DIR/invalid.rs:90:9
-   |
-90 |         #[project_replace] //~ ERROR are mutually exclusive
-   |         ^^^^^^^^^^^^^^^^^^
-
-error: attributes `project_ref` and `project_replace` are mutually exclusive
-  --> $DIR/invalid.rs:98:9
-   |
-98 |         #[project_replace] //~ ERROR are mutually exclusive
-   |         ^^^^^^^^^^^^^^^^^^
-
-error: attributes `project` and `project_ref` are mutually exclusive
-   --> $DIR/invalid.rs:106:9
-    |
-106 |         #[project_ref] //~ ERROR are mutually exclusive
-    |         ^^^^^^^^^^^^^^
-
-error: attributes `project` and `project_replace` are mutually exclusive
-   --> $DIR/invalid.rs:114:9
-    |
-114 |         #[project_replace] //~ ERROR are mutually exclusive
-    |         ^^^^^^^^^^^^^^^^^^
-
-error: attributes `project_ref` and `project_replace` are mutually exclusive
-   --> $DIR/invalid.rs:122:9
-    |
-122 |         #[project_replace] //~ ERROR are mutually exclusive
-    |         ^^^^^^^^^^^^^^^^^^
-
-error: attributes `project` and `project_ref` are mutually exclusive
-   --> $DIR/invalid.rs:130:9
-    |
-130 |         #[project_ref] //~ ERROR are mutually exclusive
-    |         ^^^^^^^^^^^^^^
-
-error: attributes `project` and `project_replace` are mutually exclusive
-   --> $DIR/invalid.rs:138:9
-    |
-138 |         #[project_replace] //~ ERROR are mutually exclusive
-    |         ^^^^^^^^^^^^^^^^^^
-
-error: attributes `project_ref` and `project_replace` are mutually exclusive
-   --> $DIR/invalid.rs:146:9
-    |
-146 |         #[project_replace] //~ ERROR are mutually exclusive
-    |         ^^^^^^^^^^^^^^^^^^
-
-error: duplicate #[project] attribute
-   --> $DIR/invalid.rs:151:5
-    |
-151 |     #[project] //~ ERROR duplicate #[project] attribute
-    |     ^^^^^^^^^^
-
-error: duplicate #[project_ref] attribute
-   --> $DIR/invalid.rs:155:5
-    |
-155 |     #[project_ref] //~ ERROR duplicate #[project_ref] attribute
-    |     ^^^^^^^^^^^^^^
-
-error: duplicate #[project_replace] attribute
-   --> $DIR/invalid.rs:159:5
-    |
-159 |     #[project_replace] //~ ERROR duplicate #[project_replace] attribute
-    |     ^^^^^^^^^^^^^^^^^^
-
-error: duplicate #[project] attribute
-   --> $DIR/invalid.rs:163:5
-    |
-163 |     #[project] //~ ERROR duplicate #[project] attribute
-    |     ^^^^^^^^^^
-
-error: duplicate #[project_ref] attribute
-   --> $DIR/invalid.rs:167:5
-    |
-167 |     #[project_ref] //~ ERROR duplicate #[project_ref] attribute
-    |     ^^^^^^^^^^^^^^
-
-error: duplicate #[project_replace] attribute
-   --> $DIR/invalid.rs:171:5
-    |
-171 |     #[project_replace] //~ ERROR duplicate #[project_replace] attribute
-    |     ^^^^^^^^^^^^^^^^^^
-
-error: duplicate #[project] attribute
-   --> $DIR/invalid.rs:179:9
-    |
-179 |         #[project] //~ ERROR duplicate #[project] attribute
-    |         ^^^^^^^^^^
-
-error: duplicate #[project_ref] attribute
-   --> $DIR/invalid.rs:183:9
-    |
-183 |         #[project_ref] //~ ERROR duplicate #[project_ref] attribute
-    |         ^^^^^^^^^^^^^^
-
-error: duplicate #[project_replace] attribute
-   --> $DIR/invalid.rs:187:9
-    |
-187 |         #[project_replace] //~ ERROR duplicate #[project_replace] attribute
-    |         ^^^^^^^^^^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/type-mismatch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/type-mismatch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/type-mismatch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/type-mismatch.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#![allow(deprecated)]
-#![feature(proc_macro_hygiene, stmt_expr_attributes)]
-
-use pin_project::{pin_project, project};
-use std::pin::Pin;
-
-#[project]
-fn type_mismatch() {
-    #[pin_project]
-    enum Enum<A, B, C, D> {
-        Variant1(#[pin] A, B),
-        Variant2 {
-            #[pin]
-            field1: C,
-            field2: D,
-        },
-        None,
-    }
-
-    let mut foo = Enum::Variant1(1, 2);
-    let mut foo = Pin::new(&mut foo).project();
-
-    #[project]
-    match &mut foo {
-        Enum::Variant1(x, y) => {
-            let x: &mut Pin<&mut i32> = x;
-            assert_eq!(**x, 1);
-
-            let y: &mut &mut i32 = y;
-            assert_eq!(**y, 2);
-        }
-        Enum::Variant2 { field1, field2 } => {
-            let _x: &mut Pin<&mut i32> = field1;
-            let _y: &mut &mut i32 = field2;
-        }
-        None => {} //~ ERROR mismatched types
-    }
-}
-
-fn type_mismatch_span_issue() {
-    #[pin_project]
-    enum Enum<A, B, C, D> {
-        Variant1(#[pin] A, B),
-        Variant2 {
-            #[pin]
-            field1: C,
-            field2: D,
-        },
-        None,
-    }
-
-    let mut foo = Enum::Variant1(1, 2);
-    let mut foo = Pin::new(&mut foo).project();
-
-    #[project]
-    match &mut foo {
-        Enum::Variant1(x, y) => {
-            let x: &mut Pin<&mut i32> = x;
-            assert_eq!(**x, 1);
-
-            let y: &mut &mut i32 = y;
-            assert_eq!(**y, 2);
-        }
-        Enum::Variant2 { field1, field2 } => {
-            let _x: &mut Pin<&mut i32> = field1;
-            let _y: &mut &mut i32 = field2;
-        }
-        None => {} //~ ERROR mismatched types
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/type-mismatch.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/type-mismatch.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/type-mismatch.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/type-mismatch.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/type-mismatch.rs:36:9
-   |
-24 |     match &mut foo {
-   |           -------- this expression has type `&mut type_mismatch::__EnumProjection<'_, {integer}, {integer}, _, _>`
-...
-36 |         None => {} //~ ERROR mismatched types
-   |         ^^^^ expected enum `type_mismatch::__EnumProjection`, found enum `Option`
-   |
-   = note: expected enum `type_mismatch::__EnumProjection<'_, {integer}, {integer}, _, _>`
-              found enum `Option<_>`
-
-error[E0308]: mismatched types
-  --> $DIR/type-mismatch.rs:68:9
-   |
-56 |     match &mut foo {
-   |           -------- this expression has type `&mut type_mismatch_span_issue::__EnumProjection<'_, {integer}, {integer}, _, _>`
-...
-68 |         None => {} //~ ERROR mismatched types
-   |         ^^^^ expected enum `type_mismatch_span_issue::__EnumProjection`, found enum `Option`
-   |
-   = note: expected enum `type_mismatch_span_issue::__EnumProjection<'_, {integer}, {integer}, _, _>`
-              found enum `Option<_>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use-public.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use-public.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use-public.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use-public.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#![allow(deprecated)]
-
-use pin_project::pin_project;
-
-#[pin_project]
-struct A {
-    field: u8,
-}
-
-pub mod b {
-    use pin_project::project;
-
-    #[project]
-    pub use crate::A; //~ ERROR E0365
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use-public.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use-public.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use-public.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use-public.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-error[E0365]: `__AProjection` is private, and cannot be re-exported
-  --> $DIR/use-public.rs:14:13
-   |
-14 |     pub use crate::A; //~ ERROR E0365
-   |             ^^^^^^^^ re-export of private `__AProjection`
-   |
-   = note: consider declaring type or module `__AProjection` with `pub`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#![allow(deprecated)]
-
-use pin_project::pin_project;
-
-#[pin_project]
-struct A {
-    field: u8,
-}
-
-mod b {
-    use pin_project::project;
-
-    #[project]
-    use crate::A as B; //~ ERROR #[project] attribute may not be used on renamed imports
-    #[project]
-    use crate::*; //~ ERROR #[project] attribute may not be used on glob imports
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/project/use.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error: #[project] attribute may not be used on renamed imports
-  --> $DIR/use.rs:14:16
-   |
-14 |     use crate::A as B; //~ ERROR #[project] attribute may not be used on renamed imports
-   |                ^^^^^^
-
-error: #[project] attribute may not be used on glob imports
-  --> $DIR/use.rs:16:16
-   |
-16 |     use crate::*; //~ ERROR #[project] attribute may not be used on glob imports
-   |                ^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/conflict-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(UnsafeUnpin)] //~ ERROR E0119
-struct Foo<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-
-#[pin_project(UnsafeUnpin)] //~ ERROR E0119
-struct Bar<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-impl<T, U> Unpin for Bar<T, U> {}
-
-#[pin_project(UnsafeUnpin)] //~ ERROR E0119
-struct Baz<T, U> {
-    #[pin]
-    future: T,
-    field: U,
-}
-
-impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/conflict-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`:
-  --> $DIR/conflict-unpin.rs:3:15
-   |
-3  | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
-   |               ^^^^^^^^^^^ conflicting implementation for `Foo<_, _>`
-...
-10 | impl<T, U> Unpin for Foo<T, U> where T: Unpin {}
-   | --------------------------------------------- first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `pin_project::UnsafeUnpin` for type `pin_project::__private::Wrapper<'_, Foo<_, _>>` in future versions
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`:
-  --> $DIR/conflict-unpin.rs:12:15
-   |
-12 | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
-   |               ^^^^^^^^^^^ conflicting implementation for `Bar<_, _>`
-...
-19 | impl<T, U> Unpin for Bar<T, U> {}
-   | ------------------------------ first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `pin_project::UnsafeUnpin` for type `pin_project::__private::Wrapper<'_, Bar<_, _>>` in future versions
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`:
-  --> $DIR/conflict-unpin.rs:21:15
-   |
-21 | #[pin_project(UnsafeUnpin)] //~ ERROR E0119
-   |               ^^^^^^^^^^^ conflicting implementation for `Baz<_, _>`
-...
-28 | impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {}
-   | -------------------------------------------- first implementation here
-   |
-   = note: upstream crates may add a new impl of trait `pin_project::UnsafeUnpin` for type `pin_project::__private::Wrapper<'_, Baz<_, _>>` in future versions
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/not-implement-unsafe-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/not-implement-unsafe-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/not-implement-unsafe-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/not-implement-unsafe-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-use pin_project::pin_project;
-
-#[pin_project(UnsafeUnpin)]
-struct Struct<T, U> {
-    #[pin]
-    inner: T,
-    other: U,
-}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<(), ()>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/not-implement-unsafe-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/not-implement-unsafe-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/not-implement-unsafe-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/not-implement-unsafe-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0277]: the trait bound `Struct<(), ()>: UnsafeUnpin` is not satisfied
-  --> $DIR/not-implement-unsafe-unpin.rs:13:16
-   |
-10 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-13 |     is_unpin::<Struct<(), ()>>(); //~ ERROR E0277
-   |                ^^^^^^^^^^^^^^ the trait `UnsafeUnpin` is not implemented for `Struct<(), ()>`
-   |
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `Wrapper<'_, Struct<(), ()>>`
-   = note: required because of the requirements on the impl of `Unpin` for `Struct<(), ()>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/proper_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/proper_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/proper_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/proper_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-use pin_project::{pin_project, UnsafeUnpin};
-use std::marker::PhantomPinned;
-
-fn is_unpin<T: Unpin>() {}
-
-#[pin_project(UnsafeUnpin)]
-struct Blah<T, U> {
-    field1: U,
-    #[pin]
-    field2: T,
-}
-
-unsafe impl<T: Unpin, U> UnsafeUnpin for Blah<T, U> {}
-
-#[pin_project(UnsafeUnpin)]
-struct TrivialBounds {
-    #[pin]
-    field1: PhantomPinned,
-}
-
-#[pin_project(UnsafeUnpin)]
-struct OverlappingLifetimeNames<'pin, T, U> {
-    #[pin]
-    field1: U,
-    #[pin]
-    field2: Option<T>,
-    field3: &'pin (),
-}
-
-unsafe impl<T: Unpin, U: Unpin> UnsafeUnpin for OverlappingLifetimeNames<'_, T, U> {}
-
-fn main() {
-    is_unpin::<Blah<PhantomPinned, ()>>(); //~ ERROR E0277
-    is_unpin::<Blah<(), PhantomPinned>>(); // Ok
-    is_unpin::<Blah<PhantomPinned, PhantomPinned>>(); //~ ERROR E0277
-
-    is_unpin::<TrivialBounds>(); //~ ERROR E0277
-
-    is_unpin::<OverlappingLifetimeNames<'_, PhantomPinned, ()>>(); //~ ERROR E0277
-    is_unpin::<OverlappingLifetimeNames<'_, (), PhantomPinned>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/proper_unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/proper_unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/proper_unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unsafe_unpin/proper_unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/proper_unpin.rs:33:5
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-33 |     is_unpin::<Blah<PhantomPinned, ()>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `Blah<PhantomPinned, ()>`
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `Wrapper<'_, Blah<PhantomPinned, ()>>`
-   = note: required because of the requirements on the impl of `Unpin` for `Blah<PhantomPinned, ()>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/proper_unpin.rs:35:5
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-35 |     is_unpin::<Blah<PhantomPinned, PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `Blah<PhantomPinned, PhantomPinned>`
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `Wrapper<'_, Blah<PhantomPinned, PhantomPinned>>`
-   = note: required because of the requirements on the impl of `Unpin` for `Blah<PhantomPinned, PhantomPinned>`
-
-error[E0277]: the trait bound `TrivialBounds: UnsafeUnpin` is not satisfied
-  --> $DIR/proper_unpin.rs:37:16
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-37 |     is_unpin::<TrivialBounds>(); //~ ERROR E0277
-   |                ^^^^^^^^^^^^^ the trait `UnsafeUnpin` is not implemented for `TrivialBounds`
-   |
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `Wrapper<'_, TrivialBounds>`
-   = note: required because of the requirements on the impl of `Unpin` for `TrivialBounds`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/proper_unpin.rs:39:5
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-39 |     is_unpin::<OverlappingLifetimeNames<'_, PhantomPinned, ()>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `OverlappingLifetimeNames<'_, PhantomPinned, ()>`
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `Wrapper<'_, OverlappingLifetimeNames<'_, PhantomPinned, ()>>`
-   = note: required because of the requirements on the impl of `Unpin` for `OverlappingLifetimeNames<'_, PhantomPinned, ()>`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/proper_unpin.rs:40:5
-   |
-4  | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-40 |     is_unpin::<OverlappingLifetimeNames<'_, (), PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `OverlappingLifetimeNames<'_, (), PhantomPinned>`
-   = note: required because of the requirements on the impl of `UnsafeUnpin` for `Wrapper<'_, OverlappingLifetimeNames<'_, (), PhantomPinned>>`
-   = note: required because of the requirements on the impl of `Unpin` for `OverlappingLifetimeNames<'_, (), PhantomPinned>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr-feature-gate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// NB: If you change this test, change 'marker_trait_attr.rs' at the same time.
-
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project] //~ ERROR E0119
-struct Struct<T> {
-    #[pin]
-    x: T,
-}
-
-// unsound Unpin impl
-impl<T> Unpin for Struct<T> {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<PhantomPinned>>()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr-feature-gate.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`:
-  --> $DIR/marker_trait_attr-feature-gate.rs:6:1
-   |
-6  | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
-...
-13 | impl<T> Unpin for Struct<T> {}
-   | --------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-// NB: If you change this test, change 'marker_trait_attr-feature-gate.rs' at the same time.
-
-// marker_trait_attr
-// Tracking issue: https://github.com/rust-lang/rust/issues/29864
-#![feature(marker_trait_attr)]
-
-// See https://github.com/taiki-e/pin-project/issues/105#issuecomment-535355974
-
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project] //~ ERROR E0119
-struct Struct<T> {
-    #[pin]
-    x: T,
-}
-
-// unsound Unpin impl
-impl<T> Unpin for Struct<T> {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<PhantomPinned>>()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/marker_trait_attr.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`:
-  --> $DIR/marker_trait_attr.rs:12:1
-   |
-12 | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
-...
-19 | impl<T> Unpin for Struct<T> {}
-   | --------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// NB: If you change this test, change 'overlapping_marker_traits.rs' at the same time.
-
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project] //~ ERROR E0119
-struct Struct<T> {
-    #[pin]
-    x: T,
-}
-
-// unsound Unpin impl
-impl<T> Unpin for Struct<T> {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<PhantomPinned>>()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits-feature-gate.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`:
-  --> $DIR/overlapping_marker_traits-feature-gate.rs:6:1
-   |
-6  | #[pin_project] //~ ERROR E0119
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
-...
-13 | impl<T> Unpin for Struct<T> {}
-   | --------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-// NB: If you change this test, change 'overlapping_marker_traits-feature-gate.rs' at the same time.
-
-// This feature could break the guarantee for Unpin provided by pin-project,
-// but was removed in https://github.com/rust-lang/rust/pull/68544 (nightly-2020-02-06).
-// Refs:
-// * https://github.com/rust-lang/rust/issues/29864#issuecomment-515780867.
-// * https://github.com/taiki-e/pin-project/issues/105
-
-// overlapping_marker_traits
-// Tracking issue: https://github.com/rust-lang/rust/issues/29864
-#![feature(overlapping_marker_traits)]
-
-use pin_project::pin_project;
-use std::marker::PhantomPinned;
-
-#[pin_project]
-struct Struct<T> {
-    #[pin]
-    x: T,
-}
-
-// unsound Unpin impl
-impl<T> Unpin for Struct<T> {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Struct<PhantomPinned>>()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/overlapping_marker_traits.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-error[E0557]: feature has been removed
-  --> $DIR/overlapping_marker_traits.rs:11:12
-   |
-11 | #![feature(overlapping_marker_traits)]
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^ feature has been removed
-   |
-   = note: removed in favor of `#![feature(marker_trait_attr)]`
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Struct<_>`:
-  --> $DIR/overlapping_marker_traits.rs:16:1
-   |
-16 | #[pin_project]
-   | ^^^^^^^^^^^^^^ conflicting implementation for `Struct<_>`
-...
-23 | impl<T> Unpin for Struct<T> {}
-   | --------------------------- first implementation here
-   |
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# UI tests for unstable features
-
-These tests check how the guarantees and features provided by pin-project interact with unstable language features.
-
-The names of the files contained in this directory need to begin with the name of the feature.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/run-pass/stmt_expr_attributes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/run-pass/stmt_expr_attributes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/run-pass/stmt_expr_attributes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/run-pass/stmt_expr_attributes.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-// NB: If you change this test, change 'stmt_expr_attributes-feature-gate.rs' at the same time.
-
-#![allow(deprecated)]
-// proc_macro_hygiene
-// Tracking issue: https://github.com/rust-lang/rust/issues/54727
-#![feature(proc_macro_hygiene)]
-// stmt_expr_attributes
-// Tracking issue: https://github.com/rust-lang/rust/issues/15701
-#![feature(stmt_expr_attributes)]
-
-use pin_project::{pin_project, project};
-use std::pin::Pin;
-
-fn project_stmt_expr_nightly() {
-    #[pin_project]
-    enum Baz<A, B, C, D> {
-        Variant1(#[pin] A, B),
-        Variant2 {
-            #[pin]
-            field1: C,
-            field2: D,
-        },
-        None,
-    }
-
-    let mut baz = Baz::Variant1(1, 2);
-
-    let mut baz = Pin::new(&mut baz).project();
-
-    #[project]
-    match &mut baz {
-        Baz::Variant1(x, y) => {
-            let x: &mut Pin<&mut i32> = x;
-            assert_eq!(**x, 1);
-
-            let y: &mut &mut i32 = y;
-            assert_eq!(**y, 2);
-        }
-        Baz::Variant2 { field1, field2 } => {
-            let _x: &mut Pin<&mut i32> = field1;
-            let _y: &mut &mut i32 = field2;
-        }
-        Baz::None => {}
-    }
-
-    let () = #[project]
-    match &mut baz {
-        Baz::Variant1(x, y) => {
-            let x: &mut Pin<&mut i32> = x;
-            assert_eq!(**x, 1);
-
-            let y: &mut &mut i32 = y;
-            assert_eq!(**y, 2);
-        }
-        Baz::Variant2 { field1, field2 } => {
-            let _x: &mut Pin<&mut i32> = field1;
-            let _y: &mut &mut i32 = field2;
-        }
-        Baz::None => {}
-    };
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/stmt_expr_attributes-feature-gate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/stmt_expr_attributes-feature-gate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/stmt_expr_attributes-feature-gate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/stmt_expr_attributes-feature-gate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-// NB: If you change this test, change 'stmt_expr_attributes.rs' at the same time.
-
-#![allow(deprecated)]
-
-use pin_project::{pin_project, project};
-use std::pin::Pin;
-
-fn project_stmt_expr_nightly() {
-    #[pin_project]
-    enum Enum<A, B, C, D> {
-        Variant1(#[pin] A, B),
-        Variant2 {
-            #[pin]
-            field1: C,
-            field2: D,
-        },
-        None,
-    }
-
-    let mut baz = Enum::Variant1(1, 2);
-
-    let mut baz = Pin::new(&mut baz).project();
-
-    #[project] //~ ERROR E0658
-    match &mut baz {
-        Enum::Variant1(x, y) => {
-            let x: &mut Pin<&mut i32> = x;
-            assert_eq!(**x, 1);
-
-            let y: &mut &mut i32 = y;
-            assert_eq!(**y, 2);
-        }
-        Enum::Variant2 { field1, field2 } => {
-            let _x: &mut Pin<&mut i32> = field1;
-            let _y: &mut &mut i32 = field2;
-        }
-        Enum::None => {}
-    }
-
-    let () = #[project] //~ ERROR E0658
-    match &mut baz {
-        Enum::Variant1(x, y) => {
-            let x: &mut Pin<&mut i32> = x;
-            assert_eq!(**x, 1);
-
-            let y: &mut &mut i32 = y;
-            assert_eq!(**y, 2);
-        }
-        Enum::Variant2 { field1, field2 } => {
-            let _x: &mut Pin<&mut i32> = field1;
-            let _y: &mut &mut i32 = field2;
-        }
-        Enum::None => {}
-    };
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/stmt_expr_attributes-feature-gate.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/stmt_expr_attributes-feature-gate.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/stmt_expr_attributes-feature-gate.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/stmt_expr_attributes-feature-gate.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-error[E0658]: attributes on expressions are experimental
-  --> $DIR/stmt_expr_attributes-feature-gate.rs:24:5
-   |
-24 |     #[project] //~ ERROR E0658
-   |     ^^^^^^^^^^
-   |
-   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
-   = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
-
-error[E0658]: attributes on expressions are experimental
-  --> $DIR/stmt_expr_attributes-feature-gate.rs:40:14
-   |
-40 |     let () = #[project] //~ ERROR E0658
-   |              ^^^^^^^^^^
-   |
-   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
-   = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
-
-error[E0658]: custom attributes cannot be applied to expressions
-  --> $DIR/stmt_expr_attributes-feature-gate.rs:24:5
-   |
-24 |     #[project] //~ ERROR E0658
-   |     ^^^^^^^^^^
-   |
-   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
-   = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
-
-error[E0658]: custom attributes cannot be applied to expressions
-  --> $DIR/stmt_expr_attributes-feature-gate.rs:40:14
-   |
-40 |     let () = #[project] //~ ERROR E0658
-   |              ^^^^^^^^^^
-   |
-   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
-   = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-bug.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-bug.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-bug.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-bug.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-// NB: If you change this test, change 'trivial_bounds-feature-gate.rs' at the same time.
-
-// trivial_bounds
-// Tracking issue: https://github.com/rust-lang/rust/issues/48214
-#![feature(trivial_bounds)]
-
-mod phantom_pinned {
-    use std::marker::{PhantomData, PhantomPinned};
-
-    struct A(PhantomPinned);
-
-    // bug of trivial_bounds?
-    impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-
-    struct Wrapper<T>(T);
-
-    impl<T> Unpin for Wrapper<T> where T: Unpin {}
-
-    struct B(PhantomPinned);
-
-    impl Unpin for B where Wrapper<PhantomPinned>: Unpin {} // Ok
-
-    struct WrapperWithLifetime<'a, T>(PhantomData<&'a ()>, T);
-
-    impl<T> Unpin for WrapperWithLifetime<'_, T> where T: Unpin {}
-
-    struct C(PhantomPinned);
-
-    // Ok
-    impl<'a> Unpin for C where WrapperWithLifetime<'a, PhantomPinned>: Unpin {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-bug.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-bug.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-bug.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-bug.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-   --> $DIR/trivial_bounds-bug.rs:13:43
-    |
-13  |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-    |                                           ^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-feature-gate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-feature-gate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-feature-gate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-feature-gate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-// NB: If you change this test, change 'trivial_bounds.rs' at the same time.
-
-mod phantom_pinned {
-    use std::marker::{PhantomData, PhantomPinned};
-
-    struct A(PhantomPinned);
-
-    impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-
-    struct Wrapper<T>(T);
-
-    impl<T> Unpin for Wrapper<T> where T: Unpin {}
-
-    struct B(PhantomPinned);
-
-    impl Unpin for B where Wrapper<PhantomPinned>: Unpin {} //~ ERROR E0277
-
-    struct WrapperWithLifetime<'a, T>(PhantomData<&'a ()>, T);
-
-    impl<T> Unpin for WrapperWithLifetime<'_, T> where T: Unpin {}
-
-    struct C(PhantomPinned);
-
-    impl<'a> Unpin for C where WrapperWithLifetime<'a, PhantomPinned>: Unpin {}
-    // Ok
-}
-
-mod inner {
-    use std::marker::{PhantomData, PhantomPinned};
-
-    struct Inner(PhantomPinned);
-
-    struct A(Inner);
-
-    impl Unpin for A where Inner: Unpin {} //~ ERROR E0277
-
-    struct Wrapper<T>(T);
-
-    impl<T> Unpin for Wrapper<T> where T: Unpin {}
-
-    struct B(Inner);
-
-    impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR E0277
-
-    struct WrapperWithLifetime<'a, T>(PhantomData<&'a ()>, T);
-
-    impl<T> Unpin for WrapperWithLifetime<'_, T> where T: Unpin {}
-
-    struct C(Inner);
-
-    impl<'a> Unpin for C where WrapperWithLifetime<'a, Inner>: Unpin {} // Ok
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds-feature-gate.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
- --> $DIR/trivial_bounds-feature-gate.rs:8:5
-  |
-8 |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-  |
-  = help: see issue #48214
-  = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-   --> $DIR/trivial_bounds-feature-gate.rs:8:43
-    |
-8   |     impl Unpin for A where PhantomPinned: Unpin {} //~ ERROR E0277
-    |                                           ^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/trivial_bounds-feature-gate.rs:16:5
-   |
-16 |     impl Unpin for B where Wrapper<PhantomPinned>: Unpin {} //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because of the requirements on the impl of `Unpin` for `phantom_pinned::Wrapper<PhantomPinned>`
-   = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/trivial_bounds-feature-gate.rs:35:5
-   |
-35 |     impl Unpin for A where Inner: Unpin {} //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Inner`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Inner`
-   = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
-
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/trivial_bounds-feature-gate.rs:43:5
-   |
-43 |     impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `Inner`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `Inner`
-   = note: required because of the requirements on the impl of `Unpin` for `inner::Wrapper<Inner>`
-   = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-// NB: If you change this test, change 'trivial_bounds-feature-gate.rs' at the same time.
-
-// trivial_bounds
-// Tracking issue: https://github.com/rust-lang/rust/issues/48214
-#![feature(trivial_bounds)]
-#![deny(trivial_bounds)]
-
-use std::marker::{PhantomData, PhantomPinned};
-
-fn inner() {
-    struct Inner(PhantomPinned);
-
-    struct A(Inner);
-
-    impl Unpin for A where Inner: Unpin {} //~ ERROR std::marker::Unpin does not depend on any type or lifetime parameters
-
-    struct Wrapper<T>(T);
-
-    impl<T> Unpin for Wrapper<T> where T: Unpin {}
-
-    struct B(Inner);
-
-    impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR std::marker::Unpin does not depend on any type or lifetime parameters
-
-    struct WrapperWithLifetime<'a, T>(PhantomData<&'a ()>, T);
-
-    impl<T> Unpin for WrapperWithLifetime<'_, T> where T: Unpin {}
-
-    struct C(Inner);
-
-    impl<'a> Unpin for C where WrapperWithLifetime<'a, Inner>: Unpin {} // Ok
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/ui/unstable-features/trivial_bounds.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error: Trait bound Inner: Unpin does not depend on any type or lifetime parameters
-  --> $DIR/trivial_bounds.rs:15:35
-   |
-15 |     impl Unpin for A where Inner: Unpin {} //~ ERROR std::marker::Unpin does not depend on any type or lifetime parameters
-   |                                   ^^^^^
-   |
-note: the lint level is defined here
-  --> $DIR/trivial_bounds.rs:6:9
-   |
-6  | #![deny(trivial_bounds)]
-   |         ^^^^^^^^^^^^^^
-
-error: Trait bound Wrapper<Inner>: Unpin does not depend on any type or lifetime parameters
-  --> $DIR/trivial_bounds.rs:23:44
-   |
-23 |     impl Unpin for B where Wrapper<Inner>: Unpin {} //~ ERROR std::marker::Unpin does not depend on any type or lifetime parameters
-   |                                            ^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/unsafe_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/unsafe_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-0.4.27/tests/unsafe_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-0.4.27/tests/unsafe_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-use pin_project::{pin_project, UnsafeUnpin};
-use std::{marker::PhantomPinned, pin::Pin};
-
-fn is_unpin<T: Unpin>() {}
-
-#[pin_project(UnsafeUnpin)]
-pub struct Blah<T, U> {
-    field1: U,
-    #[pin]
-    field2: T,
-}
-
-unsafe impl<T: Unpin, U> UnsafeUnpin for Blah<T, U> {}
-
-#[pin_project(UnsafeUnpin)]
-pub struct OverlappingLifetimeNames<'pin, T, U> {
-    #[pin]
-    field1: T,
-    field2: U,
-    field3: &'pin (),
-}
-
-unsafe impl<T: Unpin, U> UnsafeUnpin for OverlappingLifetimeNames<'_, T, U> {}
-
-#[test]
-fn unsafe_unpin() {
-    is_unpin::<Blah<(), PhantomPinned>>();
-    is_unpin::<OverlappingLifetimeNames<'_, (), ()>>();
-}
-
-#[test]
-fn trivial_bounds() {
-    #[pin_project(UnsafeUnpin)]
-    pub struct NotImplementUnsafUnpin {
-        #[pin]
-        field: PhantomPinned,
-    }
-}
-
-#[test]
-fn test() {
-    let mut x = OverlappingLifetimeNames { field1: 0, field2: 1, field3: &() };
-    let x = Pin::new(&mut x);
-    let y = x.as_ref().project_ref();
-    let _: Pin<&u8> = y.field1;
-    let _: &u8 = y.field2;
-    let y = x.project();
-    let _: Pin<&mut u8> = y.field1;
-    let _: &mut u8 = y.field2;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"63e552b140ebfb36b0f781dd4dbd7057262e7dd5d20315a7d01760806338bb66","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","src/lib.rs":"b6ad25bd4aac1c9e5ea532f3f509c31d967200b6456732344ca0ce0df87f73cf","src/pin_project/args.rs":"ec29f647b4885307bebf3a3a6b6c48f522c170c7c0c5651b98a176765e98b3d6","src/pin_project/attribute.rs":"e7bb04580bb179fe302244fa8fa8f12609bc28942249d35cb700fa2cc9ef314c","src/pin_project/derive.rs":"835079817fec94843516363f6ef98759235e27277fe8d3f4df1938a66ba0b44c","src/pin_project/mod.rs":"e6a0a932fcffc235a90a1f777cdf3f01f0ff1cbf969b013524e929e8c96830fd","src/pinned_drop.rs":"aa3602562a2fe634027ecbc952928caa641525e3870daca5f37aedbf469453c8","src/utils.rs":"88f1b44a0d07108a1efc8382520a71f2faf74ca6c22d0c25427092c2dc34704b"},"package":"f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "pin-project-internal"
-version = "1.0.2"
-authors = ["Taiki Endo <te316e89@gmail.com>"]
-description = "Implementation detail of the `pin-project` crate.\n"
-homepage = "https://github.com/taiki-e/pin-project"
-documentation = "https://docs.rs/pin-project-internal"
-keywords = ["pin", "macros", "attribute"]
-categories = ["no-std", "rust-patterns"]
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/taiki-e/pin-project"
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[lib]
-proc-macro = true
-[dependencies.proc-macro2]
-version = "1"
-
-[dependencies.quote]
-version = "1"
-
-[dependencies.syn]
-version = "1.0.44"
-features = ["full", "visit-mut"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,577 +0,0 @@
-//! Implementation detail of the `pin-project` crate. - **do not use directly**
-
-#![doc(html_root_url = "https://docs.rs/pin-project-internal/1.0.2")]
-#![doc(test(
-    no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms, single_use_lifetimes), allow(dead_code))
-))]
-#![warn(unsafe_code)]
-#![warn(future_incompatible, rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
-#![warn(clippy::all, clippy::default_trait_access)]
-// mem::take, #[non_exhaustive], and Option::{as_deref, as_deref_mut} require Rust 1.40,
-// matches! requires Rust 1.42, str::{strip_prefix, strip_suffix} requires Rust 1.45
-#![allow(
-    clippy::mem_replace_with_default,
-    clippy::manual_non_exhaustive,
-    clippy::option_as_ref_deref,
-    clippy::match_like_matches_macro,
-    clippy::manual_strip
-)]
-#![allow(clippy::needless_doctest_main)]
-
-// older compilers require explicit `extern crate`.
-#[allow(unused_extern_crates)]
-extern crate proc_macro;
-
-#[macro_use]
-mod utils;
-
-mod pin_project;
-mod pinned_drop;
-
-use proc_macro::TokenStream;
-
-/// An attribute that creates projection types covering all the fields of
-/// struct or enum.
-///
-/// This attribute creates projection types according to the following rules:
-///
-/// * For the fields that use `#[pin]` attribute, create the pinned reference to
-///   the field.
-/// * For the other fields, create a normal reference to the field.
-///
-/// And the following methods are implemented on the original type:
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// # type Projection<'a> = &'a ();
-/// # type ProjectionRef<'a> = &'a ();
-/// # trait Dox {
-/// fn project(self: Pin<&mut Self>) -> Projection<'_>;
-/// fn project_ref(self: Pin<&Self>) -> ProjectionRef<'_>;
-/// # }
-/// ```
-///
-/// By passing an argument with the same name as the method to the attribute,
-/// you can name the projection type returned from the method. This allows you
-/// to use pattern matching on the projected types.
-///
-/// ```rust
-/// # use pin_project::pin_project;
-/// # use std::pin::Pin;
-/// #[pin_project(project = EnumProj)]
-/// enum Enum<T> {
-///     Variant(#[pin] T),
-/// }
-///
-/// impl<T> Enum<T> {
-///     fn method(self: Pin<&mut Self>) {
-///         let this: EnumProj<'_, T> = self.project();
-///         match this {
-///             EnumProj::Variant(x) => {
-///                 let _: Pin<&mut T> = x;
-///             }
-///         }
-///     }
-/// }
-/// ```
-///
-/// Note that the projection types returned by `project` and `project_ref` have
-/// an additional lifetime at the beginning of generics.
-///
-/// ```text
-/// let this: EnumProj<'_, T> = self.project();
-///                    ^^
-/// ```
-///
-/// The visibility of the projected types and projection methods is based on the
-/// original type. However, if the visibility of the original type is `pub`, the
-/// visibility of the projected types and the projection methods is downgraded
-/// to `pub(crate)`.
-///
-/// # Safety
-///
-/// This attribute is completely safe. In the absence of other `unsafe` code
-/// *that you write*, it is impossible to cause [undefined
-/// behavior][undefined-behavior] with this attribute.
-///
-/// This is accomplished by enforcing the four requirements for pin projection
-/// stated in [the Rust documentation][pin-projection]:
-///
-/// 1. The struct must only be [`Unpin`] if all the structural fields are
-///    [`Unpin`].
-///
-///    To enforce this, this attribute will automatically generate an [`Unpin`]
-///    implementation for you, which will require that all structurally pinned
-///    fields be [`Unpin`].
-///
-///    If you attempt to provide an [`Unpin`] impl, the blanket impl will then
-///    apply to your type, causing a compile-time error due to the conflict with
-///    the second impl.
-///
-///    If you wish to provide a manual [`Unpin`] impl, you can do so via the
-///    [`UnsafeUnpin`][unsafe-unpin] argument.
-///
-/// 2. The destructor of the struct must not move structural fields out of its
-///    argument.
-///
-///    To enforce this, this attribute will generate code like this:
-///
-///    ```rust
-///    struct MyStruct {}
-///    trait MyStructMustNotImplDrop {}
-///    # #[allow(unknown_lints, drop_bounds)]
-///    impl<T: Drop> MyStructMustNotImplDrop for T {}
-///    impl MyStructMustNotImplDrop for MyStruct {}
-///    ```
-///
-///    If you attempt to provide an [`Drop`] impl, the blanket impl will then
-///    apply to your type, causing a compile-time error due to the conflict with
-///    the second impl.
-///
-///    If you wish to provide a custom [`Drop`] impl, you can annotate an impl
-///    with [`#[pinned_drop]`][pinned-drop]. This impl takes a pinned version of
-///    your struct - that is, [`Pin`]`<&mut MyStruct>` where `MyStruct` is the
-///    type of your struct.
-///
-///    You can call `.project()` on this type as usual, along with any other
-///    methods you have defined. Because your code is never provided with
-///    a `&mut MyStruct`, it is impossible to move out of pin-projectable
-///    fields in safe code in your destructor.
-///
-/// 3. You must make sure that you uphold the [`Drop`
-///    guarantee][drop-guarantee]: once your struct is pinned, the memory that
-///    contains the content is not overwritten or deallocated without calling
-///    the content's destructors.
-///
-///    Safe code doesn't need to worry about this - the only way to violate
-///    this requirement is to manually deallocate memory (which is `unsafe`),
-///    or to overwrite a field with something else.
-///    Because your custom destructor takes [`Pin`]`<&mut MyStruct>`, it's
-///    impossible to obtain a mutable reference to a pin-projected field in safe
-///    code.
-///
-/// 4. You must not offer any other operations that could lead to data being
-///    moved out of the structural fields when your type is pinned.
-///
-///    As with requirement 3, it is impossible for safe code to violate this.
-///    This crate ensures that safe code can never obtain a mutable reference to
-///    `#[pin]` fields, which prevents you from ever moving out of them in safe
-///    code.
-///
-/// Pin projections are also incompatible with [`#[repr(packed)]`][repr-packed]
-/// types. Attempting to use this attribute on a `#[repr(packed)]` type results
-/// in a compile-time error.
-///
-/// # Examples
-///
-/// `#[pin_project]` can be used on structs and enums.
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// struct Struct<T, U> {
-///     #[pin]
-///     pinned: T,
-///     unpinned: U,
-/// }
-///
-/// impl<T, U> Struct<T, U> {
-///     fn method(self: Pin<&mut Self>) {
-///         let this = self.project();
-///         let _: Pin<&mut T> = this.pinned;
-///         let _: &mut U = this.unpinned;
-///     }
-/// }
-/// ```
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// struct TupleStruct<T, U>(#[pin] T, U);
-///
-/// impl<T, U> TupleStruct<T, U> {
-///     fn method(self: Pin<&mut Self>) {
-///         let this = self.project();
-///         let _: Pin<&mut T> = this.0;
-///         let _: &mut U = this.1;
-///     }
-/// }
-/// ```
-///
-/// To use `#[pin_project]` on enums, you need to name the projection type
-/// returned from the method.
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project(project = EnumProj)]
-/// enum Enum<T, U> {
-///     Tuple(#[pin] T),
-///     Struct { field: U },
-///     Unit,
-/// }
-///
-/// impl<T, U> Enum<T, U> {
-///     fn method(self: Pin<&mut Self>) {
-///         match self.project() {
-///             EnumProj::Tuple(x) => {
-///                 let _: Pin<&mut T> = x;
-///             }
-///             EnumProj::Struct { field } => {
-///                 let _: &mut U = field;
-///             }
-///             EnumProj::Unit => {}
-///         }
-///     }
-/// }
-/// ```
-///
-/// When `#[pin_project]` is used on enums, only named projection types and
-/// methods are generated because there is no way to access variants of
-/// projected types without naming it.
-/// For example, in the above example, only the `project` method is generated,
-/// and the `project_ref` method is not generated.
-/// (When `#[pin_project]` is used on structs, both methods are always generated.)
-///
-/// ```rust,compile_fail,E0599
-/// # use pin_project::pin_project;
-/// # use std::pin::Pin;
-/// #
-/// # #[pin_project(project = EnumProj)]
-/// # enum Enum<T, U> {
-/// #     Tuple(#[pin] T),
-/// #     Struct { field: U },
-/// #     Unit,
-/// # }
-/// #
-/// impl<T, U> Enum<T, U> {
-///     fn call_project_ref(self: Pin<&Self>) {
-///         let _this = self.project_ref();
-///         //~^ ERROR no method named `project_ref` found for struct `Pin<&Enum<T, U>>` in the current scope
-///     }
-/// }
-/// ```
-///
-/// If you want to call `.project()` multiple times or later use the
-/// original [`Pin`] type, it needs to use [`.as_mut()`][`Pin::as_mut`] to avoid
-/// consuming the [`Pin`].
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// struct Struct<T> {
-///     #[pin]
-///     field: T,
-/// }
-///
-/// impl<T> Struct<T> {
-///     fn call_project_twice(mut self: Pin<&mut Self>) {
-///         // `project` consumes `self`, so reborrow the `Pin<&mut Self>` via `as_mut`.
-///         self.as_mut().project();
-///         self.as_mut().project();
-///     }
-/// }
-/// ```
-///
-/// # `!Unpin`
-///
-/// If you want to ensure that [`Unpin`] is not implemented, use the `!Unpin`
-/// argument to `#[pin_project]`.
-///
-/// ```rust
-/// use pin_project::pin_project;
-///
-/// #[pin_project(!Unpin)]
-/// struct Struct<T> {
-///     field: T,
-/// }
-/// ```
-///
-/// This is equivalent to using `#[pin]` attribute for the [`PhantomPinned`]
-/// field.
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::marker::PhantomPinned;
-///
-/// #[pin_project]
-/// struct Struct<T> {
-///     field: T,
-///     #[pin] // <------ This `#[pin]` is required to make `Struct` to `!Unpin`.
-///     _pin: PhantomPinned,
-/// }
-/// ```
-///
-/// Note that using [`PhantomPinned`] without `#[pin]` attribute has no effect.
-///
-/// # `UnsafeUnpin`
-///
-/// If you want to implement [`Unpin`] manually, you must use the `UnsafeUnpin`
-/// argument to `#[pin_project]`.
-///
-/// ```rust
-/// use pin_project::{pin_project, UnsafeUnpin};
-///
-/// #[pin_project(UnsafeUnpin)]
-/// struct Struct<T, U> {
-///     #[pin]
-///     pinned: T,
-///     unpinned: U,
-/// }
-///
-/// unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
-/// ```
-///
-/// Note the usage of the unsafe [`UnsafeUnpin`] trait, instead of the usual
-/// [`Unpin`] trait. [`UnsafeUnpin`] behaves exactly like [`Unpin`], except that
-/// is unsafe to implement. This unsafety comes from the fact that pin
-/// projections are being used. If you implement [`UnsafeUnpin`], you must
-/// ensure that it is only implemented when all pin-projected fields implement
-/// [`Unpin`].
-///
-/// See [`UnsafeUnpin`] trait for more details.
-///
-/// # `#[pinned_drop]`
-///
-/// In order to correctly implement pin projections, a type's [`Drop`] impl must
-/// not move out of any structurally pinned fields. Unfortunately,
-/// [`Drop::drop`] takes `&mut Self`, not [`Pin`]`<&mut Self>`.
-///
-/// To ensure that this requirement is upheld, the `#[pin_project]` attribute
-/// will provide a [`Drop`] impl for you. This [`Drop`] impl will delegate to
-/// an impl block annotated with `#[pinned_drop]` if you use the `PinnedDrop`
-/// argument to `#[pin_project]`.
-///
-/// This impl block acts just like a normal [`Drop`] impl,
-/// except for the following two:
-///
-/// * `drop` method takes [`Pin`]`<&mut Self>`
-/// * Name of the trait is `PinnedDrop`.
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// pub trait PinnedDrop {
-///     fn drop(self: Pin<&mut Self>);
-/// }
-/// ```
-///
-/// `#[pin_project]` implements the actual [`Drop`] trait via `PinnedDrop` you
-/// implemented. To drop a type that implements `PinnedDrop`, use the [`drop`]
-/// function just like dropping a type that directly implements [`Drop`].
-///
-/// In particular, it will never be called more than once, just like
-/// [`Drop::drop`].
-///
-/// For example:
-///
-/// ```rust
-/// use pin_project::{pin_project, pinned_drop};
-/// use std::{fmt::Debug, pin::Pin};
-///
-/// #[pin_project(PinnedDrop)]
-/// struct PrintOnDrop<T: Debug, U: Debug> {
-///     #[pin]
-///     pinned_field: T,
-///     unpin_field: U,
-/// }
-///
-/// #[pinned_drop]
-/// impl<T: Debug, U: Debug> PinnedDrop for PrintOnDrop<T, U> {
-///     fn drop(self: Pin<&mut Self>) {
-///         println!("Dropping pinned field: {:?}", self.pinned_field);
-///         println!("Dropping unpin field: {:?}", self.unpin_field);
-///     }
-/// }
-///
-/// fn main() {
-///     let _x = PrintOnDrop { pinned_field: true, unpin_field: 40 };
-/// }
-/// ```
-///
-/// See also [`#[pinned_drop]`][macro@pinned_drop] attribute.
-///
-/// # `project_replace` method
-///
-/// In addition to the `project` and `project_ref` methods which are always
-/// provided when you use the `#[pin_project]` attribute, there is a third
-/// method, `project_replace` which can be useful in some situations. It is
-/// equivalent to [`Pin::set`], except that the unpinned fields are moved and
-/// returned, instead of being dropped in-place.
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// # type ProjectionOwned = ();
-/// # trait Dox {
-/// fn project_replace(self: Pin<&mut Self>, other: Self) -> ProjectionOwned;
-/// # }
-/// ```
-///
-/// The `ProjectionOwned` type is identical to the `Self` type, except that
-/// all pinned fields have been replaced by equivalent [`PhantomData`] types.
-///
-/// This method is opt-in, because it is only supported for [`Sized`] types, and
-/// because it is incompatible with the [`#[pinned_drop]`][pinned-drop]
-/// attribute described above. It can be enabled by using
-/// `#[pin_project(project_replace)]`.
-///
-/// For example:
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::{marker::PhantomData, pin::Pin};
-///
-/// #[pin_project(project_replace)]
-/// struct Struct<T, U> {
-///     #[pin]
-///     pinned_field: T,
-///     unpinned_field: U,
-/// }
-///
-/// impl<T, U> Struct<T, U> {
-///     fn method(self: Pin<&mut Self>, other: Self) {
-///         let this = self.project_replace(other);
-///         let _: U = this.unpinned_field;
-///         let _: PhantomData<T> = this.pinned_field;
-///     }
-/// }
-/// ```
-///
-/// By passing the value to the `project_replace` argument, you can name the
-/// returned type of the `project_replace` method. This is necessary whenever
-/// destructuring the return type of the `project_replace` method, and work in exactly
-/// the same way as the `project` and `project_ref` arguments.
-///
-/// ```rust
-/// use pin_project::pin_project;
-///
-/// #[pin_project(project_replace = EnumProjOwn)]
-/// enum Enum<T, U> {
-///     A {
-///         #[pin]
-///         pinned_field: T,
-///         unpinned_field: U,
-///     },
-///     B,
-/// }
-///
-/// let mut x = Box::pin(Enum::A { pinned_field: 42, unpinned_field: "hello" });
-///
-/// match x.as_mut().project_replace(Enum::B) {
-///     EnumProjOwn::A { unpinned_field, .. } => assert_eq!(unpinned_field, "hello"),
-///     EnumProjOwn::B => unreachable!(),
-/// }
-/// ```
-///
-/// [`PhantomData`]: core::marker::PhantomData
-/// [`PhantomPinned`]: core::marker::PhantomPinned
-/// [`Pin::as_mut`]: core::pin::Pin::as_mut
-/// [`Pin::set`]: core::pin::Pin::set
-/// [`Pin`]: core::pin::Pin
-/// [`UnsafeUnpin`]: https://docs.rs/pin-project/1/pin_project/trait.UnsafeUnpin.html
-/// [drop-guarantee]: core::pin#drop-guarantee
-/// [pin-projection]: core::pin#projections-and-structural-pinning
-/// [pinned-drop]: macro@pin_project#pinned_drop
-/// [repr-packed]: https://doc.rust-lang.org/nomicon/other-reprs.html#reprpacked
-/// [undefined-behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html
-/// [unsafe-unpin]: macro@pin_project#unsafeunpin
-#[proc_macro_attribute]
-pub fn pin_project(args: TokenStream, input: TokenStream) -> TokenStream {
-    pin_project::attribute(&args.into(), input.into()).into()
-}
-
-/// An attribute used for custom implementations of [`Drop`].
-///
-/// This attribute is used in conjunction with the `PinnedDrop` argument to
-/// the [`#[pin_project]`][macro@pin_project] attribute.
-///
-/// The impl block annotated with this attribute acts just like a normal
-/// [`Drop`] impl, except for the following two:
-///
-/// * `drop` method takes [`Pin`]`<&mut Self>`
-/// * Name of the trait is `PinnedDrop`.
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// pub trait PinnedDrop {
-///     fn drop(self: Pin<&mut Self>);
-/// }
-/// ```
-///
-/// `#[pin_project]` implements the actual [`Drop`] trait via `PinnedDrop` you
-/// implemented. To drop a type that implements `PinnedDrop`, use the [`drop`]
-/// function just like dropping a type that directly implements [`Drop`].
-///
-/// In particular, it will never be called more than once, just like
-/// [`Drop::drop`].
-///
-/// # Examples
-///
-/// ```rust
-/// use pin_project::{pin_project, pinned_drop};
-/// use std::pin::Pin;
-///
-/// #[pin_project(PinnedDrop)]
-/// struct PrintOnDrop {
-///     #[pin]
-///     field: u8,
-/// }
-///
-/// #[pinned_drop]
-/// impl PinnedDrop for PrintOnDrop {
-///     fn drop(self: Pin<&mut Self>) {
-///         println!("Dropping: {}", self.field);
-///     }
-/// }
-///
-/// fn main() {
-///     let _x = PrintOnDrop { field: 50 };
-/// }
-/// ```
-///
-/// See also ["pinned-drop" section of `#[pin_project]` attribute][pinned-drop].
-///
-/// # Why `#[pinned_drop]` attribute is needed?
-///
-/// Implementing `PinnedDrop::drop` is safe, but calling it is not safe.
-/// This is because destructors can be called multiple times in safe code and
-/// [double dropping is unsound][rust-lang/rust#62360].
-///
-/// Ideally, it would be desirable to be able to forbid manual calls in
-/// the same way as [`Drop::drop`], but the library cannot do it. So, by using
-/// macros and replacing them with private traits like the following,
-/// this crate prevent users from calling `PinnedDrop::drop` in safe code.
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// pub trait PinnedDrop {
-///     unsafe fn drop(self: Pin<&mut Self>);
-/// }
-/// ```
-///
-/// This allows implementing [`Drop`] safely using `#[pinned_drop]`.
-/// Also by using the [`drop`] function just like dropping a type that directly
-/// implements [`Drop`], can drop safely a type that implements `PinnedDrop`.
-///
-/// [rust-lang/rust#62360]: https://github.com/rust-lang/rust/pull/62360
-/// [`Pin`]: core::pin::Pin
-/// [pinned-drop]: macro@pin_project#pinned_drop
-#[proc_macro_attribute]
-pub fn pinned_drop(args: TokenStream, input: TokenStream) -> TokenStream {
-    let input = syn::parse_macro_input!(input);
-    pinned_drop::attribute(&args.into(), input).into()
-}
-
-// Not public API.
-#[doc(hidden)]
-#[proc_macro_derive(__PinProjectInternalDerive, attributes(pin))]
-pub fn __pin_project_internal_derive(input: TokenStream) -> TokenStream {
-    pin_project::derive(input.into()).into()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pinned_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pinned_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pinned_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pinned_drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,228 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::{format_ident, quote, ToTokens};
-use syn::{
-    parse_quote, spanned::Spanned, visit_mut::VisitMut, Error, FnArg, GenericArgument, ImplItem,
-    ItemImpl, Pat, PatIdent, Path, PathArguments, Result, ReturnType, Signature, Token, Type,
-    TypePath, TypeReference,
-};
-
-use crate::utils::{parse_as_empty, prepend_underscore_to_self, ReplaceReceiver, SliceExt};
-
-pub(crate) fn attribute(args: &TokenStream, mut input: ItemImpl) -> TokenStream {
-    let res = (|| -> Result<()> {
-        parse_as_empty(args)?;
-        validate_impl(&input)?;
-        expand_impl(&mut input);
-        Ok(())
-    })();
-
-    if let Err(e) = res {
-        let mut tokens = e.to_compile_error();
-        if let Type::Path(self_ty) = &*input.self_ty {
-            let (impl_generics, _, where_clause) = input.generics.split_for_impl();
-
-            // Generate a dummy impl of `PinnedDrop`.
-            // In many cases, `#[pinned_drop] impl` is declared after `#[pin_project]`.
-            // Therefore, if `pinned_drop` compile fails, you will also get an error
-            // about `PinnedDrop` not being implemented.
-            // This can be prevented to some extent by generating a dummy
-            // `PinnedDrop` implementation.
-            // We already know that we will get a compile error, so this won't
-            // accidentally compile successfully.
-            //
-            // However, if `input.self_ty` is not Type::Path, there is a high possibility that
-            // the type does not exist (since #[pin_project] can only be used on struct/enum
-            // definitions), so do not generate a dummy impl.
-            tokens.extend(quote! {
-                impl #impl_generics ::pin_project::__private::PinnedDrop for #self_ty
-                #where_clause
-                {
-                    unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-            });
-        }
-        tokens
-    } else {
-        input.into_token_stream()
-    }
-}
-
-/// Validates the signature of given `PinnedDrop` impl.
-fn validate_impl(item: &ItemImpl) -> Result<()> {
-    const INVALID_ITEM: &str =
-        "#[pinned_drop] may only be used on implementation for the `PinnedDrop` trait";
-
-    if let Some(attr) = item.attrs.find("pinned_drop") {
-        return Err(error!(attr, "duplicate #[pinned_drop] attribute"));
-    }
-
-    if let Some((_, path, _)) = &item.trait_ {
-        if !path.is_ident("PinnedDrop") {
-            return Err(error!(path, INVALID_ITEM));
-        }
-    } else {
-        return Err(error!(item.self_ty, INVALID_ITEM));
-    }
-
-    if item.unsafety.is_some() {
-        return Err(error!(item.unsafety, "implementing the trait `PinnedDrop` is not unsafe"));
-    }
-    if item.items.is_empty() {
-        return Err(error!(item, "not all trait items implemented, missing: `drop`"));
-    }
-
-    match &*item.self_ty {
-        Type::Path(_) => {}
-        ty => {
-            return Err(error!(
-                ty,
-                "implementing the trait `PinnedDrop` on this type is unsupported"
-            ));
-        }
-    }
-
-    item.items.iter().enumerate().try_for_each(|(i, item)| match item {
-        ImplItem::Const(item) => {
-            Err(error!(item, "const `{}` is not a member of trait `PinnedDrop`", item.ident))
-        }
-        ImplItem::Type(item) => {
-            Err(error!(item, "type `{}` is not a member of trait `PinnedDrop`", item.ident))
-        }
-        ImplItem::Method(method) => {
-            validate_sig(&method.sig)?;
-            if i == 0 {
-                Ok(())
-            } else {
-                Err(error!(method, "duplicate definitions with name `drop`"))
-            }
-        }
-        _ => unreachable!("unexpected ImplItem"),
-    })
-}
-
-/// Validates the signature of given `PinnedDrop::drop` method.
-///
-/// The correct signature is: `(mut) self: (<path>::)Pin<&mut Self>`
-fn validate_sig(sig: &Signature) -> Result<()> {
-    fn get_ty_path(ty: &Type) -> Option<&Path> {
-        if let Type::Path(TypePath { qself: None, path }) = ty { Some(path) } else { None }
-    }
-
-    const INVALID_ARGUMENT: &str = "method `drop` must take an argument `self: Pin<&mut Self>`";
-
-    if sig.ident != "drop" {
-        return Err(error!(
-            sig.ident,
-            "method `{}` is not a member of trait `PinnedDrop", sig.ident,
-        ));
-    }
-
-    if let ReturnType::Type(_, ty) = &sig.output {
-        match &**ty {
-            Type::Tuple(ty) if ty.elems.is_empty() => {}
-            _ => return Err(error!(ty, "method `drop` must return the unit type")),
-        }
-    }
-
-    match sig.inputs.len() {
-        1 => {}
-        0 => return Err(Error::new(sig.paren_token.span, INVALID_ARGUMENT)),
-        _ => return Err(error!(sig.inputs, INVALID_ARGUMENT)),
-    }
-
-    if let Some(FnArg::Typed(arg)) = sig.receiver() {
-        // (mut) self: <path>
-        if let Some(path) = get_ty_path(&arg.ty) {
-            let ty = path.segments.last().unwrap();
-            if let PathArguments::AngleBracketed(args) = &ty.arguments {
-                // (mut) self: (<path>::)<ty><&mut <elem>..>
-                if let Some(GenericArgument::Type(Type::Reference(TypeReference {
-                    mutability: Some(_),
-                    elem,
-                    ..
-                }))) = args.args.first()
-                {
-                    // (mut) self: (<path>::)Pin<&mut Self>
-                    if args.args.len() == 1
-                        && ty.ident == "Pin"
-                        && get_ty_path(elem).map_or(false, |path| path.is_ident("Self"))
-                    {
-                        if sig.unsafety.is_some() {
-                            return Err(error!(
-                                sig.unsafety,
-                                "implementing the method `drop` is not unsafe"
-                            ));
-                        }
-                        return Ok(());
-                    }
-                }
-            }
-        }
-    }
-
-    Err(error!(sig.inputs[0], INVALID_ARGUMENT))
-}
-
-// from:
-//
-// fn drop(self: Pin<&mut Self>) {
-//     // ...
-// }
-//
-// into:
-//
-// unsafe fn drop(self: Pin<&mut Self>) {
-//     fn __drop_inner<T>(__self: Pin<&mut Foo<'_, T>>) {
-//         fn __drop_inner() {}
-//         // ...
-//     }
-//     __drop_inner(self);
-// }
-//
-fn expand_impl(item: &mut ItemImpl) {
-    fn get_arg_pat(arg: &mut FnArg) -> Option<&mut PatIdent> {
-        if let FnArg::Typed(arg) = arg {
-            if let Pat::Ident(ident) = &mut *arg.pat {
-                return Some(ident);
-            }
-        }
-        None
-    }
-
-    let path = &mut item.trait_.as_mut().unwrap().1;
-    *path = parse_quote_spanned! { path.span() =>
-        ::pin_project::__private::PinnedDrop
-    };
-
-    let method =
-        if let ImplItem::Method(method) = &mut item.items[0] { method } else { unreachable!() };
-
-    // `fn drop(mut self: Pin<&mut Self>)` -> `fn __drop_inner<T>(mut __self: Pin<&mut Receiver>)`
-    let drop_inner = {
-        let mut drop_inner = method.clone();
-        let ident = format_ident!("__drop_inner");
-        // Add a dummy `__drop_inner` function to prevent users call outer `__drop_inner`.
-        drop_inner.block.stmts.insert(0, parse_quote!(fn #ident() {}));
-        drop_inner.sig.ident = ident;
-        drop_inner.sig.generics = item.generics.clone();
-        let self_pat = get_arg_pat(&mut drop_inner.sig.inputs[0]).unwrap();
-        prepend_underscore_to_self(&mut self_pat.ident);
-        let self_ty = if let Type::Path(ty) = &*item.self_ty { ty } else { unreachable!() };
-        let mut visitor = ReplaceReceiver(self_ty);
-        visitor.visit_signature_mut(&mut drop_inner.sig);
-        visitor.visit_block_mut(&mut drop_inner.block);
-        drop_inner
-    };
-
-    // `fn drop(mut self: Pin<&mut Self>)` -> `unsafe fn drop(self: Pin<&mut Self>)`
-    method.sig.unsafety = Some(<Token![unsafe]>::default());
-    let self_pat = get_arg_pat(&mut method.sig.inputs[0]).unwrap();
-    self_pat.mutability = None;
-    let self_token = &self_pat.ident;
-
-    method.block.stmts = parse_quote! {
-        #[allow(clippy::needless_pass_by_value)] // This lint does not warn the receiver.
-        #drop_inner
-        __drop_inner(#self_token);
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/args.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/args.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/args.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/args.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,258 +0,0 @@
-use proc_macro2::{Span, TokenStream};
-use quote::quote;
-use syn::{
-    parse::{Parse, ParseStream},
-    spanned::Spanned,
-    Attribute, Error, Ident, Result, Token,
-};
-
-use super::PIN;
-use crate::utils::{ParseBufferExt, SliceExt};
-
-pub(super) fn parse_args(attrs: &[Attribute]) -> Result<Args> {
-    // `(__private(<args>))` -> `<args>`
-    struct Input(Option<TokenStream>);
-
-    impl Parse for Input {
-        fn parse(input: ParseStream<'_>) -> Result<Self> {
-            Ok(Self((|| {
-                let content = input.parenthesized().ok()?;
-                let private = content.parse::<Ident>().ok()?;
-                if private == "__private" {
-                    content.parenthesized().ok()?.parse::<TokenStream>().ok()
-                } else {
-                    None
-                }
-            })()))
-        }
-    }
-
-    if let Some(attr) = attrs.find("pin_project") {
-        return Err(error!(attr, "duplicate #[pin_project] attribute"));
-    }
-
-    let mut attrs = attrs.iter().filter(|attr| attr.path.is_ident(PIN));
-
-    let prev = if let Some(attr) = attrs.next() {
-        (attr, syn::parse2::<Input>(attr.tokens.clone()).unwrap().0)
-    } else {
-        // This only fails if another macro removes `#[pin]`.
-        return Err(error!(TokenStream::new(), "#[pin_project] attribute has been removed"));
-    };
-
-    if let Some(attr) = attrs.next() {
-        let (prev_attr, prev_res) = &prev;
-        // As the `#[pin]` attribute generated by `#[pin_project]`
-        // has the same span as `#[pin_project]`, it is possible
-        // that a useless error message will be generated.
-        // So, use the span of `prev_attr` if it is not a valid attribute.
-        let res = syn::parse2::<Input>(attr.tokens.clone()).unwrap().0;
-        let span = match (prev_res, res) {
-            (Some(_), _) => attr,
-            (None, _) => prev_attr,
-        };
-        Err(error!(span, "duplicate #[pin] attribute"))
-    } else {
-        // This `unwrap` only fails if another macro removes `#[pin]` and inserts own `#[pin]`.
-        syn::parse2(prev.1.unwrap())
-    }
-}
-
-pub(super) struct Args {
-    /// `PinnedDrop` argument.
-    pub(super) pinned_drop: Option<Span>,
-    /// `UnsafeUnpin` or `!Unpin` argument.
-    pub(super) unpin_impl: UnpinImpl,
-    /// `project = <ident>` argument.
-    pub(super) project: Option<Ident>,
-    /// `project_ref = <ident>` argument.
-    pub(super) project_ref: Option<Ident>,
-    /// `project_replace [= <ident>]` argument.
-    pub(super) project_replace: ProjReplace,
-}
-
-impl Parse for Args {
-    fn parse(input: ParseStream<'_>) -> Result<Self> {
-        mod kw {
-            syn::custom_keyword!(Unpin);
-        }
-
-        /// Parses `= <value>` in `<name> = <value>` and returns value and span of name-value pair.
-        fn parse_value(
-            input: ParseStream<'_>,
-            name: &Ident,
-            has_prev: bool,
-        ) -> Result<(Ident, TokenStream)> {
-            if input.is_empty() {
-                return Err(error!(name, "expected `{0} = <identifier>`, found `{0}`", name));
-            }
-            let eq_token: Token![=] = input.parse()?;
-            if input.is_empty() {
-                let span = quote!(#name #eq_token);
-                return Err(error!(span, "expected `{0} = <identifier>`, found `{0} =`", name));
-            }
-            let value: Ident = input.parse()?;
-            let span = quote!(#name #value);
-            if has_prev {
-                Err(error!(span, "duplicate `{}` argument", name))
-            } else {
-                Ok((value, span))
-            }
-        }
-
-        let mut pinned_drop = None;
-        let mut unsafe_unpin = None;
-        let mut not_unpin = None;
-        let mut project = None;
-        let mut project_ref = None;
-        let mut project_replace_value = None;
-        let mut project_replace_span = None;
-
-        while !input.is_empty() {
-            if input.peek(Token![!]) {
-                let bang: Token![!] = input.parse()?;
-                if input.is_empty() {
-                    return Err(error!(bang, "expected `!Unpin`, found `!`"));
-                }
-                let unpin: kw::Unpin = input.parse()?;
-                let span = quote!(#bang #unpin);
-                if not_unpin.replace(span.span()).is_some() {
-                    return Err(error!(span, "duplicate `!Unpin` argument"));
-                }
-            } else {
-                let token = input.parse::<Ident>()?;
-                match &*token.to_string() {
-                    "PinnedDrop" => {
-                        if pinned_drop.replace(token.span()).is_some() {
-                            return Err(error!(token, "duplicate `PinnedDrop` argument"));
-                        }
-                    }
-                    "UnsafeUnpin" => {
-                        if unsafe_unpin.replace(token.span()).is_some() {
-                            return Err(error!(token, "duplicate `UnsafeUnpin` argument"));
-                        }
-                    }
-                    "project" => {
-                        project = Some(parse_value(input, &token, project.is_some())?.0);
-                    }
-                    "project_ref" => {
-                        project_ref = Some(parse_value(input, &token, project_ref.is_some())?.0);
-                    }
-                    "project_replace" => {
-                        if input.peek(Token![=]) {
-                            let (value, span) =
-                                parse_value(input, &token, project_replace_span.is_some())?;
-                            project_replace_value = Some(value);
-                            project_replace_span = Some(span.span());
-                        } else if project_replace_span.is_some() {
-                            return Err(error!(token, "duplicate `project_replace` argument"));
-                        } else {
-                            project_replace_span = Some(token.span());
-                        }
-                    }
-                    "Replace" => {
-                        return Err(error!(
-                            token,
-                            "`Replace` argument was removed, use `project_replace` argument instead"
-                        ));
-                    }
-                    _ => return Err(error!(token, "unexpected argument: {}", token)),
-                }
-            }
-
-            if input.is_empty() {
-                break;
-            }
-            let _: Token![,] = input.parse()?;
-        }
-
-        if project.is_some() || project_ref.is_some() {
-            if project == project_ref {
-                return Err(error!(
-                    project_ref,
-                    "name `{}` is already specified by `project` argument",
-                    project_ref.as_ref().unwrap()
-                ));
-            }
-            if let Some(ident) = &project_replace_value {
-                if project == project_replace_value {
-                    return Err(error!(
-                        ident,
-                        "name `{}` is already specified by `project` argument", ident
-                    ));
-                } else if project_ref == project_replace_value {
-                    return Err(error!(
-                        ident,
-                        "name `{}` is already specified by `project_ref` argument", ident
-                    ));
-                }
-            }
-        }
-
-        if let Some(span) = pinned_drop {
-            if project_replace_span.is_some() {
-                return Err(Error::new(
-                    span,
-                    "arguments `PinnedDrop` and `project_replace` are mutually exclusive",
-                ));
-            }
-        }
-        let project_replace = match (project_replace_span, project_replace_value) {
-            (None, _) => ProjReplace::None,
-            (Some(span), Some(ident)) => ProjReplace::Named { ident, span },
-            (Some(span), None) => ProjReplace::Unnamed { span },
-        };
-        let unpin_impl = match (unsafe_unpin, not_unpin) {
-            (None, None) => UnpinImpl::Default,
-            (Some(span), None) => UnpinImpl::Unsafe(span),
-            (None, Some(span)) => UnpinImpl::Negative(span),
-            (Some(span), Some(_)) => {
-                return Err(Error::new(
-                    span,
-                    "arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive",
-                ));
-            }
-        };
-
-        Ok(Self { pinned_drop, unpin_impl, project, project_ref, project_replace })
-    }
-}
-
-/// `UnsafeUnpin` or `!Unpin` argument.
-#[derive(Clone, Copy)]
-pub(super) enum UnpinImpl {
-    Default,
-    /// `UnsafeUnpin`.
-    Unsafe(Span),
-    /// `!Unpin`.
-    Negative(Span),
-}
-
-/// `project_replace [= <ident>]` argument.
-pub(super) enum ProjReplace {
-    None,
-    /// `project_replace`.
-    Unnamed {
-        span: Span,
-    },
-    /// `project_replace = <ident>`.
-    #[allow(dead_code)] // false positive that fixed in Rust 1.38
-    Named {
-        span: Span,
-        ident: Ident,
-    },
-}
-
-impl ProjReplace {
-    /// Return the span of this argument.
-    pub(super) fn span(&self) -> Option<Span> {
-        match self {
-            Self::None => None,
-            Self::Named { span, .. } | Self::Unnamed { span, .. } => Some(*span),
-        }
-    }
-
-    pub(super) fn ident(&self) -> Option<&Ident> {
-        if let Self::Named { ident, .. } = self { Some(ident) } else { None }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/attribute.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/attribute.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/attribute.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/attribute.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::quote;
-use syn::{
-    parse::{Parse, ParseStream},
-    Attribute, Result, Token, Visibility,
-};
-
-use super::PIN;
-use crate::utils::SliceExt;
-
-// To generate the correct `Unpin` implementation and the projection methods,
-// we need to collect the types of the pinned fields.
-// However, since proc-macro-attribute is applied before `cfg` and `cfg_attr`
-// on fields, we cannot be collecting field types properly at this timing.
-// So instead of generating the `Unpin` implementation and the projection
-// methods here, delegate their processing to proc-macro-derive.
-//
-// At this stage, only attributes are parsed and the following attributes are
-// added to the attributes of the item.
-// * `#[derive(InternalDerive)]` - An internal helper macro that does the above
-//   processing.
-// * `#[pin(__private(#args))]` - Pass the argument of `#[pin_project]` to
-//   proc-macro-derive (`InternalDerive`).
-
-pub(super) fn parse_attribute(args: &TokenStream, input: TokenStream) -> Result<TokenStream> {
-    let Input { attrs, body } = syn::parse2(input)?;
-
-    Ok(quote! {
-        #(#attrs)*
-        #[derive(::pin_project::__private::__PinProjectInternalDerive)]
-        // Use `__private` to prevent users from trying to control `InternalDerive`
-        // manually. `__private` does not guarantee compatibility between patch
-        // versions, so it should be sufficient for this purpose in most cases.
-        #[pin(__private(#args))]
-        #body
-    })
-}
-
-#[allow(dead_code)] // false positive that fixed in Rust 1.39
-struct Input {
-    attrs: Vec<Attribute>,
-    body: TokenStream,
-}
-
-impl Parse for Input {
-    fn parse(input: ParseStream<'_>) -> Result<Self> {
-        let attrs = input.call(Attribute::parse_outer)?;
-
-        let ahead = input.fork();
-        let _: Visibility = ahead.parse()?;
-        if !ahead.peek(Token![struct]) && !ahead.peek(Token![enum]) {
-            // If we check this only on proc-macro-derive, it may generate unhelpful error
-            // messages. So it is preferable to be able to detect it here.
-            Err(error!(
-                input.parse::<TokenStream>()?,
-                "#[pin_project] attribute may only be used on structs or enums"
-            ))
-        } else if let Some(attr) = attrs.find(PIN) {
-            Err(error!(attr, "#[pin] attribute may only be used on fields of structs or variants"))
-        } else if let Some(attr) = attrs.find("pin_project") {
-            Err(error!(attr, "duplicate #[pin_project] attribute"))
-        } else {
-            Ok(Self { attrs, body: input.parse()? })
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/derive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/derive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/derive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/derive.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1085 +0,0 @@
-use proc_macro2::{Delimiter, Group, Span, TokenStream};
-use quote::{format_ident, quote, quote_spanned, ToTokens};
-use syn::{
-    parse_quote, token, visit_mut::VisitMut, Attribute, Data, DataEnum, DeriveInput, Error, Field,
-    Fields, FieldsNamed, FieldsUnnamed, Generics, Ident, Index, Lifetime, LifetimeDef, Meta,
-    MetaList, NestedMeta, Result, Token, Type, Variant, Visibility, WhereClause,
-};
-
-use super::{
-    args::{parse_args, Args, ProjReplace, UnpinImpl},
-    PIN,
-};
-use crate::utils::{
-    determine_lifetime_name, determine_visibility, insert_lifetime_and_bound, ReplaceReceiver,
-    SliceExt, Variants,
-};
-
-pub(super) fn parse_derive(input: TokenStream) -> Result<TokenStream> {
-    let mut input: DeriveInput = syn::parse2(input)?;
-
-    let mut cx;
-    let mut generate = GenerateTokens::default();
-
-    let ident = &input.ident;
-    let ty_generics = input.generics.split_for_impl().1;
-    let self_ty = parse_quote!(#ident #ty_generics);
-    let mut visitor = ReplaceReceiver(&self_ty);
-    visitor.visit_generics_mut(&mut input.generics);
-    visitor.visit_data_mut(&mut input.data);
-
-    match &input.data {
-        Data::Struct(data) => {
-            cx = Context::new(&input.attrs, &input.vis, ident, &mut input.generics, Struct)?;
-            parse_struct(&mut cx, &data.fields, &mut generate)?;
-        }
-        Data::Enum(data) => {
-            cx = Context::new(&input.attrs, &input.vis, ident, &mut input.generics, Enum)?;
-            parse_enum(&mut cx, data, &mut generate)?;
-        }
-        Data::Union(_) => {
-            return Err(error!(
-                input,
-                "#[pin_project] attribute may only be used on structs or enums"
-            ));
-        }
-    }
-
-    Ok(generate.into_tokens(&cx))
-}
-
-#[derive(Default)]
-struct GenerateTokens {
-    exposed: TokenStream,
-    scoped: TokenStream,
-}
-
-impl GenerateTokens {
-    fn extend(&mut self, expose: bool, tokens: TokenStream) {
-        if expose {
-            self.exposed.extend(tokens);
-        } else {
-            self.scoped.extend(tokens);
-        }
-    }
-
-    fn into_tokens(self, cx: &Context<'_>) -> TokenStream {
-        let mut tokens = self.exposed;
-        let scoped = self.scoped;
-
-        let unpin_impl = make_unpin_impl(cx);
-        let drop_impl = make_drop_impl(cx);
-        let allowed_lints = global_allowed_lints();
-
-        tokens.extend(quote! {
-            // All items except projected types are generated inside a `const` scope.
-            // This makes it impossible for user code to refer to these types.
-            // However, this prevents Rustdoc from displaying docs for any
-            // of our types. In particular, users cannot see the
-            // automatically generated `Unpin` impl for the '__UnpinStruct' types
-            //
-            // Previously, we provided a flag to correctly document the
-            // automatically generated `Unpin` impl by using def-site hygiene,
-            // but it is now removed.
-            //
-            // Refs:
-            // * https://github.com/rust-lang/rust/issues/63281
-            // * https://github.com/taiki-e/pin-project/pull/53#issuecomment-525906867
-            // * https://github.com/taiki-e/pin-project/pull/70
-            #allowed_lints
-            #[allow(clippy::used_underscore_binding)]
-            const _: () = {
-                #scoped
-                #unpin_impl
-                #drop_impl
-            };
-        });
-        tokens
-    }
-}
-
-/// Returns attributes that should be applied to all generated code.
-fn global_allowed_lints() -> TokenStream {
-    quote! {
-        #[allow(box_pointers)] // This lint warns use of the `Box` type.
-        #[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
-        #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-        #[allow(unreachable_pub)] // This lint warns `pub` field in private struct.
-        // This lint warns of `clippy::*` generated by external macros.
-        // We allow this lint for compatibility with older compilers.
-        #[allow(clippy::unknown_clippy_lints)]
-        #[allow(clippy::pattern_type_mismatch)]
-        #[allow(clippy::redundant_pub_crate)] // This lint warns `pub(crate)` field in private struct.
-    }
-}
-
-/// Returns attributes used on projected types.
-fn proj_allowed_lints(kind: TypeKind) -> (TokenStream, TokenStream, TokenStream) {
-    let large_enum_variant = if kind == Enum {
-        Some(quote! {
-            #[allow(variant_size_differences)]
-            #[allow(clippy::large_enum_variant)]
-        })
-    } else {
-        None
-    };
-    let global_allowed_lints = global_allowed_lints();
-    let proj_mut = quote! {
-        #global_allowed_lints
-        #[allow(dead_code)] // This lint warns unused fields/variants.
-        #[allow(clippy::mut_mut)] // This lint warns `&mut &mut <ty>`.
-        #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326}
-    };
-    let proj_ref = quote! {
-        #global_allowed_lints
-        #[allow(dead_code)] // This lint warns unused fields/variants.
-        #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
-    };
-    let proj_own = quote! {
-        #global_allowed_lints
-        #[allow(dead_code)] // This lint warns unused fields/variants.
-        #large_enum_variant
-    };
-    (proj_mut, proj_ref, proj_own)
-}
-
-struct Context<'a> {
-    /// The original type.
-    orig: OriginalType<'a>,
-    /// The projected types.
-    proj: ProjectedType,
-    /// Types of the pinned fields.
-    pinned_fields: Vec<Type>,
-    /// Kind of the original type: struct or enum
-    kind: TypeKind,
-
-    /// `PinnedDrop` argument.
-    pinned_drop: Option<Span>,
-    /// `UnsafeUnpin` or `!Unpin` argument.
-    unpin_impl: UnpinImpl,
-    /// `project` argument.
-    project: bool,
-    /// `project_ref` argument.
-    project_ref: bool,
-    /// `project_replace [= <ident>]` argument.
-    project_replace: ProjReplace,
-}
-
-impl<'a> Context<'a> {
-    fn new(
-        attrs: &'a [Attribute],
-        vis: &'a Visibility,
-        ident: &'a Ident,
-        generics: &'a mut Generics,
-        kind: TypeKind,
-    ) -> Result<Self> {
-        let Args { pinned_drop, unpin_impl, project, project_ref, project_replace } =
-            parse_args(attrs)?;
-
-        if let Some(name) = [project.as_ref(), project_ref.as_ref(), project_replace.ident()]
-            .iter()
-            .filter_map(Option::as_ref)
-            .find(|name| **name == ident)
-        {
-            return Err(error!(name, "name `{}` is the same as the original type name", name));
-        }
-
-        let mut lifetime_name = String::from("'pin");
-        determine_lifetime_name(&mut lifetime_name, generics);
-        let lifetime = Lifetime::new(&lifetime_name, Span::call_site());
-
-        let ty_generics = generics.split_for_impl().1;
-        let ty_generics_as_generics = parse_quote!(#ty_generics);
-        let mut proj_generics = generics.clone();
-        let pred = insert_lifetime_and_bound(
-            &mut proj_generics,
-            lifetime.clone(),
-            &ty_generics_as_generics,
-            ident,
-        );
-        let mut where_clause = generics.make_where_clause().clone();
-        where_clause.predicates.push(pred);
-
-        let own_ident = project_replace
-            .ident()
-            .cloned()
-            .unwrap_or_else(|| format_ident!("__{}ProjectionOwned", ident));
-
-        Ok(Self {
-            kind,
-            pinned_drop,
-            unpin_impl,
-            project: project.is_some(),
-            project_ref: project_ref.is_some(),
-            project_replace,
-            proj: ProjectedType {
-                vis: determine_visibility(vis),
-                mut_ident: project.unwrap_or_else(|| format_ident!("__{}Projection", ident)),
-                ref_ident: project_ref.unwrap_or_else(|| format_ident!("__{}ProjectionRef", ident)),
-                own_ident,
-                lifetime,
-                generics: proj_generics,
-                where_clause,
-            },
-            orig: OriginalType { attrs, vis, ident, generics },
-            pinned_fields: Vec::new(),
-        })
-    }
-}
-
-#[derive(Copy, Clone, Eq, PartialEq)]
-enum TypeKind {
-    Enum,
-    Struct,
-}
-
-use TypeKind::{Enum, Struct};
-
-struct OriginalType<'a> {
-    /// Attributes of the original type.
-    attrs: &'a [Attribute],
-    /// Visibility of the original type.
-    vis: &'a Visibility,
-    /// Name of the original type.
-    ident: &'a Ident,
-    /// Generics of the original type.
-    generics: &'a Generics,
-}
-
-struct ProjectedType {
-    /// Visibility of the projected types.
-    vis: Visibility,
-    /// Name of the projected type returned by `project` method.
-    mut_ident: Ident,
-    /// Name of the projected type returned by `project_ref` method.
-    ref_ident: Ident,
-    /// Name of the projected type returned by `project_replace` method.
-    own_ident: Ident,
-    /// Lifetime on the generated projected types.
-    lifetime: Lifetime,
-    /// Generics of the projected types.
-    generics: Generics,
-    /// `where` clause of the projected types. This has an additional
-    /// bound generated by `insert_lifetime_and_bound`
-    where_clause: WhereClause,
-}
-
-struct ProjectedVariants {
-    proj_variants: TokenStream,
-    proj_ref_variants: TokenStream,
-    proj_own_variants: TokenStream,
-    proj_arms: TokenStream,
-    proj_ref_arms: TokenStream,
-    proj_own_arms: TokenStream,
-}
-
-#[derive(Default)]
-struct ProjectedFields {
-    proj_pat: TokenStream,
-    proj_body: TokenStream,
-    proj_own_body: TokenStream,
-    proj_fields: TokenStream,
-    proj_ref_fields: TokenStream,
-    proj_own_fields: TokenStream,
-}
-
-fn validate_struct(ident: &Ident, fields: &Fields) -> Result<()> {
-    if fields.is_empty() {
-        let msg = "#[pin_project] attribute may not be used on structs with zero fields";
-        if let Fields::Unit = fields { Err(error!(ident, msg)) } else { Err(error!(fields, msg)) }
-    } else {
-        Ok(())
-    }
-}
-
-fn validate_enum(brace_token: token::Brace, variants: &Variants) -> Result<()> {
-    if variants.is_empty() {
-        return Err(Error::new(
-            brace_token.span,
-            "#[pin_project] attribute may not be used on enums without variants",
-        ));
-    }
-    let has_field = variants.iter().try_fold(false, |has_field, v| {
-        if let Some((_, e)) = &v.discriminant {
-            Err(error!(e, "#[pin_project] attribute may not be used on enums with discriminants"))
-        } else if let Some(attr) = v.attrs.find(PIN) {
-            Err(error!(attr, "#[pin] attribute may only be used on fields of structs or variants"))
-        } else if v.fields.is_empty() {
-            Ok(has_field)
-        } else {
-            Ok(true)
-        }
-    })?;
-    if has_field {
-        Ok(())
-    } else {
-        Err(error!(variants, "#[pin_project] attribute may not be used on enums with zero fields"))
-    }
-}
-
-fn parse_struct(
-    cx: &mut Context<'_>,
-    fields: &Fields,
-    generate: &mut GenerateTokens,
-) -> Result<()> {
-    // Do this first for a better error message.
-    let packed_check = ensure_not_packed(&cx.orig, fields)?;
-
-    validate_struct(cx.orig.ident, fields)?;
-
-    let ProjectedFields {
-        proj_pat,
-        proj_body,
-        proj_fields,
-        proj_ref_fields,
-        proj_own_fields,
-        proj_own_body,
-    } = match fields {
-        Fields::Named(_) => visit_fields(cx, None, fields, Delimiter::Brace)?,
-        Fields::Unnamed(_) => visit_fields(cx, None, fields, Delimiter::Parenthesis)?,
-        Fields::Unit => unreachable!(),
-    };
-
-    let proj_ident = &cx.proj.mut_ident;
-    let proj_ref_ident = &cx.proj.ref_ident;
-    let proj_own_ident = &cx.proj.own_ident;
-    let vis = &cx.proj.vis;
-    let mut orig_generics = cx.orig.generics.clone();
-    let orig_where_clause = orig_generics.where_clause.take();
-    let proj_generics = &cx.proj.generics;
-    let proj_where_clause = &cx.proj.where_clause;
-
-    // For tuple structs, we need to generate `(T1, T2) where Foo: Bar`
-    // For non-tuple structs, we need to generate `where Foo: Bar { field1: T }`
-    let (where_clause_fields, where_clause_ref_fields, where_clause_own_fields) = match fields {
-        Fields::Named(_) => (
-            quote!(#proj_where_clause #proj_fields),
-            quote!(#proj_where_clause #proj_ref_fields),
-            quote!(#orig_where_clause #proj_own_fields),
-        ),
-        Fields::Unnamed(_) => (
-            quote!(#proj_fields #proj_where_clause;),
-            quote!(#proj_ref_fields #proj_where_clause;),
-            quote!(#proj_own_fields #orig_where_clause;),
-        ),
-        Fields::Unit => unreachable!(),
-    };
-
-    let (proj_attrs, proj_ref_attrs, proj_own_attrs) = proj_allowed_lints(cx.kind);
-    generate.extend(cx.project, quote! {
-        #proj_attrs
-        #vis struct #proj_ident #proj_generics #where_clause_fields
-    });
-    generate.extend(cx.project_ref, quote! {
-        #proj_ref_attrs
-        #vis struct #proj_ref_ident #proj_generics #where_clause_ref_fields
-    });
-    if cx.project_replace.span().is_some() {
-        generate.extend(cx.project_replace.ident().is_some(), quote! {
-            #proj_own_attrs
-            #vis struct #proj_own_ident #orig_generics #where_clause_own_fields
-        });
-    }
-
-    let proj_mut_body = quote! {
-        let Self #proj_pat = self.get_unchecked_mut();
-        #proj_ident #proj_body
-    };
-    let proj_ref_body = quote! {
-        let Self #proj_pat = self.get_ref();
-        #proj_ref_ident #proj_body
-    };
-    let proj_own_body = quote! {
-        let __self_ptr: *mut Self = self.get_unchecked_mut();
-        let Self #proj_pat = &mut *__self_ptr;
-        #proj_own_body
-    };
-    generate.extend(false, make_proj_impl(cx, &proj_mut_body, &proj_ref_body, &proj_own_body));
-
-    generate.extend(false, packed_check);
-    Ok(())
-}
-
-fn parse_enum(
-    cx: &mut Context<'_>,
-    DataEnum { brace_token, variants, .. }: &DataEnum,
-    generate: &mut GenerateTokens,
-) -> Result<()> {
-    if let ProjReplace::Unnamed { span } = &cx.project_replace {
-        return Err(Error::new(
-            *span,
-            "`project_replace` argument requires a value when used on enums",
-        ));
-    }
-
-    // We don't need to check for `#[repr(packed)]`,
-    // since it does not apply to enums.
-
-    validate_enum(*brace_token, variants)?;
-
-    let ProjectedVariants {
-        proj_variants,
-        proj_ref_variants,
-        proj_own_variants,
-        proj_arms,
-        proj_ref_arms,
-        proj_own_arms,
-    } = visit_variants(cx, variants)?;
-
-    let proj_ident = &cx.proj.mut_ident;
-    let proj_ref_ident = &cx.proj.ref_ident;
-    let proj_own_ident = &cx.proj.own_ident;
-    let vis = &cx.proj.vis;
-    let mut orig_generics = cx.orig.generics.clone();
-    let orig_where_clause = orig_generics.where_clause.take();
-    let proj_generics = &cx.proj.generics;
-    let proj_where_clause = &cx.proj.where_clause;
-
-    let (proj_attrs, proj_ref_attrs, proj_own_attrs) = proj_allowed_lints(cx.kind);
-    if cx.project {
-        generate.extend(true, quote! {
-            #proj_attrs
-            #vis enum #proj_ident #proj_generics #proj_where_clause {
-                #proj_variants
-            }
-        });
-    }
-    if cx.project_ref {
-        generate.extend(true, quote! {
-            #proj_ref_attrs
-            #vis enum #proj_ref_ident #proj_generics #proj_where_clause {
-                #proj_ref_variants
-            }
-        });
-    }
-    if cx.project_replace.ident().is_some() {
-        generate.extend(true, quote! {
-            #proj_own_attrs
-            #vis enum #proj_own_ident #orig_generics #orig_where_clause {
-                #proj_own_variants
-            }
-        });
-    }
-
-    let proj_mut_body = quote! {
-        match self.get_unchecked_mut() {
-            #proj_arms
-        }
-    };
-    let proj_ref_body = quote! {
-        match self.get_ref() {
-            #proj_ref_arms
-        }
-    };
-    let proj_own_body = quote! {
-        let __self_ptr: *mut Self = self.get_unchecked_mut();
-        match &mut *__self_ptr {
-            #proj_own_arms
-        }
-    };
-    generate.extend(false, make_proj_impl(cx, &proj_mut_body, &proj_ref_body, &proj_own_body));
-
-    Ok(())
-}
-
-fn visit_variants(cx: &mut Context<'_>, variants: &Variants) -> Result<ProjectedVariants> {
-    let mut proj_variants = TokenStream::new();
-    let mut proj_ref_variants = TokenStream::new();
-    let mut proj_own_variants = TokenStream::new();
-    let mut proj_arms = TokenStream::new();
-    let mut proj_ref_arms = TokenStream::new();
-    let mut proj_own_arms = TokenStream::new();
-
-    for Variant { ident, fields, .. } in variants {
-        let ProjectedFields {
-            proj_pat,
-            proj_body,
-            proj_fields,
-            proj_ref_fields,
-            proj_own_fields,
-            proj_own_body,
-        } = match fields {
-            Fields::Named(_) => visit_fields(cx, Some(ident), fields, Delimiter::Brace)?,
-            Fields::Unnamed(_) => visit_fields(cx, Some(ident), fields, Delimiter::Parenthesis)?,
-            Fields::Unit => ProjectedFields {
-                proj_own_body: proj_own_body(cx, Some(ident), None, &[]),
-                ..ProjectedFields::default()
-            },
-        };
-
-        let proj_ident = &cx.proj.mut_ident;
-        let proj_ref_ident = &cx.proj.ref_ident;
-        proj_variants.extend(quote! {
-            #ident #proj_fields,
-        });
-        proj_ref_variants.extend(quote! {
-            #ident #proj_ref_fields,
-        });
-        proj_own_variants.extend(quote! {
-            #ident #proj_own_fields,
-        });
-        proj_arms.extend(quote! {
-            Self::#ident #proj_pat => #proj_ident::#ident #proj_body,
-        });
-        proj_ref_arms.extend(quote! {
-            Self::#ident #proj_pat => #proj_ref_ident::#ident #proj_body,
-        });
-        proj_own_arms.extend(quote! {
-            Self::#ident #proj_pat => { #proj_own_body }
-        });
-    }
-
-    Ok(ProjectedVariants {
-        proj_variants,
-        proj_ref_variants,
-        proj_own_variants,
-        proj_arms,
-        proj_ref_arms,
-        proj_own_arms,
-    })
-}
-
-fn visit_fields(
-    cx: &mut Context<'_>,
-    variant_ident: Option<&Ident>,
-    fields: &Fields,
-    delim: Delimiter,
-) -> Result<ProjectedFields> {
-    fn surround(delim: Delimiter, tokens: TokenStream) -> TokenStream {
-        Group::new(delim, tokens).into_token_stream()
-    }
-
-    let mut proj_pat = TokenStream::new();
-    let mut proj_body = TokenStream::new();
-    let mut proj_fields = TokenStream::new();
-    let mut proj_ref_fields = TokenStream::new();
-    let mut proj_own_fields = TokenStream::new();
-    let mut proj_move = TokenStream::new();
-    let mut pinned_bindings = Vec::with_capacity(fields.len());
-
-    for (i, Field { attrs, vis, ident, colon_token, ty }) in fields.iter().enumerate() {
-        let binding = ident.clone().unwrap_or_else(|| format_ident!("_{}", i));
-        proj_pat.extend(quote!(#binding,));
-        if attrs.position_exact(PIN)?.is_some() {
-            let lifetime = &cx.proj.lifetime;
-            proj_fields.extend(quote! {
-                #vis #ident #colon_token ::pin_project::__private::Pin<&#lifetime mut (#ty)>,
-            });
-            proj_ref_fields.extend(quote! {
-                #vis #ident #colon_token ::pin_project::__private::Pin<&#lifetime (#ty)>,
-            });
-            proj_own_fields.extend(quote! {
-                #vis #ident #colon_token ::pin_project::__private::PhantomData<#ty>,
-            });
-            proj_body.extend(quote! {
-                #ident #colon_token ::pin_project::__private::Pin::new_unchecked(#binding),
-            });
-            proj_move.extend(quote! {
-                #ident #colon_token ::pin_project::__private::PhantomData,
-            });
-
-            cx.pinned_fields.push(ty.clone());
-            pinned_bindings.push(binding);
-        } else {
-            let lifetime = &cx.proj.lifetime;
-            proj_fields.extend(quote! {
-                #vis #ident #colon_token &#lifetime mut (#ty),
-            });
-            proj_ref_fields.extend(quote! {
-                #vis #ident #colon_token &#lifetime (#ty),
-            });
-            proj_own_fields.extend(quote! {
-                #vis #ident #colon_token #ty,
-            });
-            proj_body.extend(quote! {
-                #binding,
-            });
-            proj_move.extend(quote! {
-                #ident #colon_token ::pin_project::__private::ptr::read(#binding),
-            });
-        }
-    }
-
-    let proj_pat = surround(delim, proj_pat);
-    let proj_body = surround(delim, proj_body);
-    let proj_fields = surround(delim, proj_fields);
-    let proj_ref_fields = surround(delim, proj_ref_fields);
-    let proj_own_fields = surround(delim, proj_own_fields);
-
-    let proj_move = Group::new(delim, proj_move);
-    let proj_own_body = proj_own_body(cx, variant_ident, Some(proj_move), &pinned_bindings);
-
-    Ok(ProjectedFields {
-        proj_pat,
-        proj_body,
-        proj_own_body,
-        proj_fields,
-        proj_ref_fields,
-        proj_own_fields,
-    })
-}
-
-/// Generates the processing that `project_replace` does for the struct or each variant.
-///
-/// Note: `pinned_fields` must be in declaration order.
-fn proj_own_body(
-    cx: &Context<'_>,
-    variant_ident: Option<&Ident>,
-    proj_move: Option<Group>,
-    pinned_fields: &[Ident],
-) -> TokenStream {
-    let ident = &cx.proj.own_ident;
-    let proj_own = match variant_ident {
-        Some(variant_ident) => quote!(#ident::#variant_ident),
-        None => quote!(#ident),
-    };
-
-    // The fields of the struct and the active enum variant are dropped
-    // in declaration order.
-    // Refs: https://doc.rust-lang.org/reference/destructors.html
-    let pinned_fields = pinned_fields.iter().rev();
-
-    quote! {
-        // First, extract all the unpinned fields.
-        let __result = #proj_own #proj_move;
-
-        // Destructors will run in reverse order, so next create a guard to overwrite
-        // `self` with the replacement value without calling destructors.
-        let __guard = ::pin_project::__private::UnsafeOverwriteGuard {
-            target: __self_ptr,
-            value: ::pin_project::__private::ManuallyDrop::new(__replacement),
-        };
-
-        // Now create guards to drop all the pinned fields.
-        //
-        // Due to a compiler bug (https://github.com/rust-lang/rust/issues/47949)
-        // this must be in its own scope, or else `__result` will not be dropped
-        // if any of the destructors panic.
-        {
-            #(
-                let __guard = ::pin_project::__private::UnsafeDropInPlaceGuard(#pinned_fields);
-            )*
-        }
-
-        // Finally, return the result.
-        __result
-    }
-}
-
-/// Creates `Unpin` implementation for the original type.
-///
-/// The kind of `Unpin` impl generated depends on `unpin_impl` field:
-/// * `UnpinImpl::Unsafe` - Implements `Unpin` via `UnsafeUnpin` impl.
-/// * `UnpinImpl::Negative` - Generates `Unpin` impl with bounds that will never be true.
-/// * `UnpinImpl::Default` - Generates `Unpin` impl that requires `Unpin` for all pinned fields.
-fn make_unpin_impl(cx: &Context<'_>) -> TokenStream {
-    match cx.unpin_impl {
-        UnpinImpl::Unsafe(span) => {
-            let mut proj_generics = cx.proj.generics.clone();
-            let orig_ident = cx.orig.ident;
-            let lifetime = &cx.proj.lifetime;
-
-            // Make the error message highlight `UnsafeUnpin` argument.
-            proj_generics.make_where_clause().predicates.push(parse_quote_spanned! { span =>
-                ::pin_project::__private::Wrapper<#lifetime, Self>: ::pin_project::UnsafeUnpin
-            });
-
-            let (impl_generics, _, where_clause) = proj_generics.split_for_impl();
-            let ty_generics = cx.orig.generics.split_for_impl().1;
-
-            quote_spanned! { span =>
-                impl #impl_generics ::pin_project::__private::Unpin for #orig_ident #ty_generics
-                #where_clause
-                {
-                }
-            }
-        }
-        UnpinImpl::Negative(span) => {
-            let mut proj_generics = cx.proj.generics.clone();
-            let orig_ident = cx.orig.ident;
-            let lifetime = &cx.proj.lifetime;
-
-            proj_generics.make_where_clause().predicates.push(parse_quote! {
-                ::pin_project::__private::Wrapper<
-                    #lifetime, ::pin_project::__private::PhantomPinned
-                >: ::pin_project::__private::Unpin
-            });
-
-            let (proj_impl_generics, _, proj_where_clause) = proj_generics.split_for_impl();
-            let ty_generics = cx.orig.generics.split_for_impl().1;
-
-            // For interoperability with `forbid(unsafe_code)`, `unsafe` token should be
-            // call-site span.
-            let unsafety = <Token![unsafe]>::default();
-            quote_spanned! { span =>
-                impl #proj_impl_generics ::pin_project::__private::Unpin
-                    for #orig_ident #ty_generics
-                #proj_where_clause
-                {
-                }
-
-                // Generate a dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-                //
-                // To ensure that users don't accidentally write a non-functional `UnsafeUnpin`
-                // impls, we emit one ourselves. If the user ends up writing an `UnsafeUnpin`
-                // impl, they'll get a "conflicting implementations of trait" error when
-                // coherence checks are run.
-                #[doc(hidden)]
-                #unsafety impl #proj_impl_generics ::pin_project::UnsafeUnpin
-                    for #orig_ident #ty_generics
-                #proj_where_clause
-                {
-                }
-            }
-        }
-        UnpinImpl::Default => {
-            let mut full_where_clause = cx.orig.generics.where_clause.clone().unwrap();
-
-            // Generate a field in our new struct for every
-            // pinned field in the original type.
-            let fields = cx.pinned_fields.iter().enumerate().map(|(i, ty)| {
-                let field_ident = format_ident!("__field{}", i);
-                quote!(#field_ident: #ty)
-            });
-
-            // We could try to determine the subset of type parameters
-            // and lifetimes that are actually used by the pinned fields
-            // (as opposed to those only used by unpinned fields).
-            // However, this would be tricky and error-prone, since
-            // it's possible for users to create types that would alias
-            // with generic parameters (e.g. 'struct T').
-            //
-            // Instead, we generate a use of every single type parameter
-            // and lifetime used in the original struct. For type parameters,
-            // we generate code like this:
-            //
-            // ```rust
-            // struct AlwaysUnpin<T: ?Sized>(PhantomData<T>) {}
-            // impl<T: ?Sized> Unpin for AlwaysUnpin<T> {}
-            //
-            // ...
-            // _field: AlwaysUnpin<(A, B, C)>
-            // ```
-            //
-            // This ensures that any unused type parameters
-            // don't end up with `Unpin` bounds.
-            let lifetime_fields = cx.orig.generics.lifetimes().enumerate().map(
-                |(i, LifetimeDef { lifetime, .. })| {
-                    let field_ident = format_ident!("__lifetime{}", i);
-                    quote!(#field_ident: &#lifetime ())
-                },
-            );
-
-            let orig_ident = cx.orig.ident;
-            let struct_ident = format_ident!("__{}", orig_ident);
-            let vis = cx.orig.vis;
-            let lifetime = &cx.proj.lifetime;
-            let type_params = cx.orig.generics.type_params().map(|t| &t.ident);
-            let proj_generics = &cx.proj.generics;
-            let (proj_impl_generics, proj_ty_generics, _) = proj_generics.split_for_impl();
-            let (_, ty_generics, where_clause) = cx.orig.generics.split_for_impl();
-
-            full_where_clause.predicates.push(parse_quote! {
-                #struct_ident #proj_ty_generics: ::pin_project::__private::Unpin
-            });
-
-            quote! {
-                // This needs to have the same visibility as the original type,
-                // due to the limitations of the 'public in private' error.
-                //
-                // Our goal is to implement the public trait `Unpin` for
-                // a potentially public user type. Because of this, rust
-                // requires that any types mentioned in the where clause of
-                // our `Unpin` impl also be public. This means that our generated
-                // `__UnpinStruct` type must also be public.
-                // However, we ensure that the user can never actually reference
-                // this 'public' type by creating this type in the inside of `const`.
-                #[allow(missing_debug_implementations)]
-                #vis struct #struct_ident #proj_generics #where_clause {
-                    __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<
-                        #lifetime, (#(::pin_project::__private::PhantomData<#type_params>),*)
-                    >,
-
-                    #(#fields,)*
-                    #(#lifetime_fields,)*
-                }
-
-                impl #proj_impl_generics ::pin_project::__private::Unpin
-                    for #orig_ident #ty_generics
-                #full_where_clause
-                {
-                }
-
-                // Generate a dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-                //
-                // To ensure that users don't accidentally write a non-functional `UnsafeUnpin`
-                // impls, we emit one ourselves. If the user ends up writing an `UnsafeUnpin`
-                // impl, they'll get a "conflicting implementations of trait" error when
-                // coherence checks are run.
-                #[doc(hidden)]
-                unsafe impl #proj_impl_generics ::pin_project::UnsafeUnpin
-                    for #orig_ident #ty_generics
-                #full_where_clause
-                {
-                }
-            }
-        }
-    }
-}
-
-/// Creates `Drop` implementation for the original type.
-///
-/// The kind of `Drop` impl generated depends on `pinned_drop` field:
-/// * `Some` - implements `Drop` via `PinnedDrop` impl.
-/// * `None` - generates code that ensures that `Drop` trait is not implemented,
-///            instead of generating `Drop` impl.
-fn make_drop_impl(cx: &Context<'_>) -> TokenStream {
-    let ident = cx.orig.ident;
-    let (impl_generics, ty_generics, where_clause) = cx.orig.generics.split_for_impl();
-
-    if let Some(span) = cx.pinned_drop {
-        // For interoperability with `forbid(unsafe_code)`, `unsafe` token should be
-        // call-site span.
-        let unsafety = <Token![unsafe]>::default();
-        quote_spanned! { span =>
-            impl #impl_generics ::pin_project::__private::Drop for #ident #ty_generics
-            #where_clause
-            {
-                fn drop(&mut self) {
-                    #unsafety {
-                        // Safety - we're in 'drop', so we know that 'self' will
-                        // never move again.
-                        let __pinned_self = ::pin_project::__private::Pin::new_unchecked(self);
-                        // We call `pinned_drop` only once. Since `PinnedDrop::drop`
-                        // is an unsafe method and a private API, it is never called again in safe
-                        // code *unless the user uses a maliciously crafted macro*.
-                        ::pin_project::__private::PinnedDrop::drop(__pinned_self);
-                    }
-                }
-            }
-        }
-    } else {
-        // If the user does not provide a `PinnedDrop` impl,
-        // we need to ensure that they don't provide a `Drop` impl of their
-        // own.
-        // Based on https://github.com/upsuper/assert-impl/blob/f503255b292ab0ba8d085b657f4065403cfa46eb/src/lib.rs#L80-L87
-        //
-        // We create a new identifier for each struct, so that the traits
-        // for different types do not conflict with each other.
-        //
-        // Another approach would be to provide an empty Drop impl,
-        // which would conflict with a user-provided Drop impl.
-        // However, this would trigger the compiler's special handling
-        // of Drop types (e.g. fields cannot be moved out of a Drop type).
-        // This approach prevents the creation of needless Drop impls,
-        // giving users more flexibility.
-        let trait_ident = format_ident!("{}MustNotImplDrop", ident);
-
-        quote! {
-            // There are two possible cases:
-            // 1. The user type does not implement Drop. In this case,
-            // the first blanked impl will not apply to it. This code
-            // will compile, as there is only one impl of MustNotImplDrop for the user type
-            // 2. The user type does impl Drop. This will make the blanket impl applicable,
-            // which will then conflict with the explicit MustNotImplDrop impl below.
-            // This will result in a compilation error, which is exactly what we want.
-            trait #trait_ident {}
-            #[allow(clippy::drop_bounds, drop_bounds)]
-            impl<T: ::pin_project::__private::Drop> #trait_ident for T {}
-            impl #impl_generics #trait_ident for #ident #ty_generics #where_clause {}
-
-            // Generate a dummy impl of `PinnedDrop`, to ensure that the user cannot implement it.
-            // Since the user did not pass `PinnedDrop` to `#[pin_project]`, any `PinnedDrop`
-            // impl will not actually be called. Unfortunately, we can't detect this situation
-            // directly from either the `#[pin_project]` or `#[pinned_drop]` attributes, since
-            // we don't know what other attirbutes/impl may exist.
-            //
-            // To ensure that users don't accidentally write a non-functional `PinnedDrop`
-            // impls, we emit one ourselves. If the user ends up writing a `PinnedDrop` impl,
-            // they'll get a "conflicting implementations of trait" error when coherence
-            // checks are run.
-            #[doc(hidden)]
-            impl #impl_generics ::pin_project::__private::PinnedDrop for #ident #ty_generics
-            #where_clause
-            {
-                unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-            }
-        }
-    }
-}
-
-/// Creates an implementation of the projection methods.
-///
-/// On structs, both the `project` and `project_ref` methods are always generated,
-/// and the `project_replace` method is only generated if `ProjReplace::span` is `Some`.
-///
-/// On enums, only methods that the returned projected type is named will be generated.
-fn make_proj_impl(
-    cx: &Context<'_>,
-    proj_body: &TokenStream,
-    proj_ref_body: &TokenStream,
-    proj_own_body: &TokenStream,
-) -> TokenStream {
-    let vis = &cx.proj.vis;
-    let lifetime = &cx.proj.lifetime;
-    let orig_ident = cx.orig.ident;
-    let proj_ident = &cx.proj.mut_ident;
-    let proj_ref_ident = &cx.proj.ref_ident;
-    let proj_own_ident = &cx.proj.own_ident;
-
-    let orig_ty_generics = cx.orig.generics.split_for_impl().1;
-    let proj_ty_generics = cx.proj.generics.split_for_impl().1;
-    let (impl_generics, ty_generics, where_clause) = cx.orig.generics.split_for_impl();
-
-    let mut project = Some(quote! {
-        #vis fn project<#lifetime>(
-            self: ::pin_project::__private::Pin<&#lifetime mut Self>,
-        ) -> #proj_ident #proj_ty_generics {
-            unsafe {
-                #proj_body
-            }
-        }
-    });
-    let mut project_ref = Some(quote! {
-        #[allow(clippy::missing_const_for_fn)]
-        #vis fn project_ref<#lifetime>(
-            self: ::pin_project::__private::Pin<&#lifetime Self>,
-        ) -> #proj_ref_ident #proj_ty_generics {
-            unsafe {
-                #proj_ref_body
-            }
-        }
-    });
-    let mut project_replace = cx.project_replace.span().map(|span| {
-        // It is enough to only set the span of the signature.
-        let sig = quote_spanned! { span =>
-            #vis fn project_replace(
-                self: ::pin_project::__private::Pin<&mut Self>,
-                __replacement: Self,
-            ) -> #proj_own_ident #orig_ty_generics
-        };
-        quote! {
-            #sig {
-                unsafe {
-                    #proj_own_body
-                }
-            }
-        }
-    });
-
-    if cx.kind == Enum {
-        if !cx.project {
-            project = None;
-        }
-        if !cx.project_ref {
-            project_ref = None;
-        }
-        if cx.project_replace.ident().is_none() {
-            project_replace = None;
-        }
-    }
-
-    quote! {
-        impl #impl_generics #orig_ident #ty_generics #where_clause {
-            #project
-            #project_ref
-            #project_replace
-        }
-    }
-}
-
-/// Checks that the `[repr(packed)]` attribute is not included.
-///
-/// This currently does two checks:
-/// * Checks the attributes of structs to ensure there is no `[repr(packed)]`.
-/// * Generates a function that borrows fields without an unsafe block and
-///   forbidding `safe_packed_borrows` lint.
-fn ensure_not_packed(orig: &OriginalType<'_>, fields: &Fields) -> Result<TokenStream> {
-    for meta in orig.attrs.iter().filter_map(|attr| attr.parse_meta().ok()) {
-        if let Meta::List(list) = meta {
-            if list.path.is_ident("repr") {
-                for repr in list.nested.iter() {
-                    match repr {
-                        NestedMeta::Meta(Meta::Path(path))
-                        | NestedMeta::Meta(Meta::List(MetaList { path, .. }))
-                            if path.is_ident("packed") =>
-                        {
-                            return Err(error!(
-                                repr,
-                                "#[pin_project] attribute may not be used on #[repr(packed)] types"
-                            ));
-                        }
-                        _ => {}
-                    }
-                }
-            }
-        }
-    }
-
-    // As proc-macro-derive can't rewrite the structure definition,
-    // it's probably no longer necessary, but it keeps it for now.
-
-    // Workaround for https://github.com/taiki-e/pin-project/issues/32
-    // Through the tricky use of proc macros, it's possible to bypass
-    // the above check for the `repr` attribute.
-    // To ensure that it's impossible to use pin projections on a `#[repr(packed)]`
-    // struct, we generate code like this:
-    //
-    // ```rust
-    // #[forbid(safe_packed_borrows)]
-    // fn assert_not_repr_packed(val: &MyStruct) {
-    //     let _field1 = &val.field1;
-    //     let _field2 = &val.field2;
-    //     ...
-    //     let _fieldn = &val.fieldn;
-    // }
-    // ```
-    //
-    // Taking a reference to a packed field is unsafe, and applying
-    // `#[forbid(safe_packed_borrows)]` makes sure that doing this without
-    // an `unsafe` block (which we deliberately do not generate)
-    // is a hard error.
-    //
-    // If the struct ends up having `#[repr(packed)]` applied somehow,
-    // this will generate an (unfriendly) error message. Under all reasonable
-    // circumstances, we'll detect the `#[repr(packed)]` attribute, and generate
-    // a much nicer error above.
-    //
-    // There is one exception: If the type of a struct field has an alignment of 1
-    // (e.g. u8), it is always safe to take a reference to it, even if the struct
-    // is `#[repr(packed)]`. If the struct is composed entirely of types of
-    // alignment 1, our generated method will not trigger an error if the
-    // struct is `#[repr(packed)]`.
-    //
-    // Fortunately, this should have no observable consequence - `#[repr(packed)]`
-    // is essentially a no-op on such a type. Nevertheless, we include a test
-    // to ensure that the compiler doesn't ever try to copy the fields on
-    // such a struct when trying to drop it - which is reason we prevent
-    // `#[repr(packed)]` in the first place.
-    //
-    // See also https://github.com/taiki-e/pin-project/pull/34.
-    let mut field_refs = vec![];
-    match fields {
-        Fields::Named(FieldsNamed { named, .. }) => {
-            for Field { ident, .. } in named {
-                field_refs.push(quote!(&this.#ident));
-            }
-        }
-        Fields::Unnamed(FieldsUnnamed { unnamed, .. }) => {
-            for (index, _) in unnamed.iter().enumerate() {
-                let index = Index::from(index);
-                field_refs.push(quote!(&this.#index));
-            }
-        }
-        Fields::Unit => {}
-    }
-
-    let (impl_generics, ty_generics, where_clause) = orig.generics.split_for_impl();
-    let ident = orig.ident;
-    Ok(quote! {
-        #[forbid(safe_packed_borrows)]
-        fn __assert_not_repr_packed #impl_generics (this: &#ident #ty_generics) #where_clause {
-            #(let _ = #field_refs;)*
-        }
-    })
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/pin_project/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-mod args;
-mod attribute;
-mod derive;
-
-use proc_macro2::TokenStream;
-
-/// The annotation for pinned type.
-const PIN: &str = "pin";
-
-pub(crate) fn attribute(args: &TokenStream, input: TokenStream) -> TokenStream {
-    attribute::parse_attribute(args, input).unwrap_or_else(|e| e.to_compile_error())
-}
-
-pub(crate) fn derive(input: TokenStream) -> TokenStream {
-    derive::parse_derive(input).unwrap_or_else(|e| e.to_compile_error())
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal/src/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal/src/utils.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,380 +0,0 @@
-use proc_macro2::{Group, Spacing, Span, TokenStream, TokenTree};
-use quote::{quote, quote_spanned, ToTokens};
-use std::{iter::FromIterator, mem};
-use syn::{
-    parse::{Parse, ParseBuffer, ParseStream},
-    parse_quote,
-    punctuated::Punctuated,
-    token,
-    visit_mut::{self, VisitMut},
-    Attribute, ExprPath, ExprStruct, Generics, Ident, Item, Lifetime, LifetimeDef, Macro, PatPath,
-    PatStruct, PatTupleStruct, Path, PathArguments, PredicateType, QSelf, Result, Token, Type,
-    TypeParamBound, TypePath, Variant, Visibility, WherePredicate,
-};
-
-pub(crate) type Variants = Punctuated<Variant, Token![,]>;
-
-macro_rules! error {
-    ($span:expr, $msg:expr) => {
-        syn::Error::new_spanned(&$span, $msg)
-    };
-    ($span:expr, $($tt:tt)*) => {
-        error!($span, format!($($tt)*))
-    };
-}
-
-macro_rules! parse_quote_spanned {
-    ($span:expr => $($tt:tt)*) => {
-        syn::parse2(quote::quote_spanned!($span => $($tt)*)).unwrap_or_else(|e| panic!("{}", e))
-    };
-}
-
-/// Determines the lifetime names. Ensure it doesn't overlap with any existing
-/// lifetime names.
-pub(crate) fn determine_lifetime_name(lifetime_name: &mut String, generics: &mut Generics) {
-    struct CollectLifetimes(Vec<String>);
-
-    impl VisitMut for CollectLifetimes {
-        fn visit_lifetime_def_mut(&mut self, def: &mut LifetimeDef) {
-            self.0.push(def.lifetime.to_string());
-        }
-    }
-
-    debug_assert!(lifetime_name.starts_with('\''));
-
-    let mut lifetimes = CollectLifetimes(Vec::new());
-    lifetimes.visit_generics_mut(generics);
-
-    while lifetimes.0.iter().any(|name| name.starts_with(&**lifetime_name)) {
-        lifetime_name.push('_');
-    }
-}
-
-/// Like `insert_lifetime`, but also generates a bound of the form
-/// `OriginalType<A, B>: 'lifetime`. Used when generating the definition
-/// of a projection type
-pub(crate) fn insert_lifetime_and_bound(
-    generics: &mut Generics,
-    lifetime: Lifetime,
-    orig_generics: &Generics,
-    orig_ident: &Ident,
-) -> WherePredicate {
-    insert_lifetime(generics, lifetime.clone());
-
-    let orig_type: Type = parse_quote!(#orig_ident #orig_generics);
-    let mut punct = Punctuated::new();
-    punct.push(TypeParamBound::Lifetime(lifetime));
-
-    WherePredicate::Type(PredicateType {
-        lifetimes: None,
-        bounded_ty: orig_type,
-        colon_token: <Token![:]>::default(),
-        bounds: punct,
-    })
-}
-
-/// Inserts a `lifetime` at position `0` of `generics.params`.
-pub(crate) fn insert_lifetime(generics: &mut Generics, lifetime: Lifetime) {
-    generics.lt_token.get_or_insert_with(<Token![<]>::default);
-    generics.gt_token.get_or_insert_with(<Token![>]>::default);
-    generics.params.insert(0, LifetimeDef::new(lifetime).into());
-}
-
-/// Determines the visibility of the projected types and projection methods.
-///
-/// If given visibility is `pub`, returned visibility is `pub(crate)`.
-/// Otherwise, returned visibility is the same as given visibility.
-pub(crate) fn determine_visibility(vis: &Visibility) -> Visibility {
-    if let Visibility::Public(token) = vis {
-        parse_quote_spanned!(token.pub_token.span => pub(crate))
-    } else {
-        vis.clone()
-    }
-}
-
-/// Checks if `tokens` is an empty `TokenStream`.
-///
-/// This is almost equivalent to `syn::parse2::<Nothing>()`, but produces
-/// a better error message and does not require ownership of `tokens`.
-pub(crate) fn parse_as_empty(tokens: &TokenStream) -> Result<()> {
-    if tokens.is_empty() { Ok(()) } else { Err(error!(tokens, "unexpected token: {}", tokens)) }
-}
-
-pub(crate) fn respan<T>(node: &T, span: Span) -> T
-where
-    T: ToTokens + Parse,
-{
-    let tokens = node.to_token_stream();
-    let respanned = respan_tokens(tokens, span);
-    syn::parse2(respanned).unwrap()
-}
-
-fn respan_tokens(tokens: TokenStream, span: Span) -> TokenStream {
-    tokens
-        .into_iter()
-        .map(|mut token| {
-            token.set_span(span);
-            token
-        })
-        .collect()
-}
-
-// =================================================================================================
-// extension traits
-
-pub(crate) trait SliceExt {
-    fn position_exact(&self, ident: &str) -> Result<Option<usize>>;
-    fn find(&self, ident: &str) -> Option<&Attribute>;
-}
-
-impl SliceExt for [Attribute] {
-    /// # Errors
-    ///
-    /// * There are multiple specified attributes.
-    /// * The `Attribute::tokens` field of the specified attribute is not empty.
-    fn position_exact(&self, ident: &str) -> Result<Option<usize>> {
-        self.iter()
-            .try_fold((0, None), |(i, mut prev), attr| {
-                if attr.path.is_ident(ident) {
-                    if prev.replace(i).is_some() {
-                        return Err(error!(attr, "duplicate #[{}] attribute", ident));
-                    }
-                    parse_as_empty(&attr.tokens)?;
-                }
-                Ok((i + 1, prev))
-            })
-            .map(|(_, pos)| pos)
-    }
-
-    fn find(&self, ident: &str) -> Option<&Attribute> {
-        self.iter().position(|attr| attr.path.is_ident(ident)).map(|i| &self[i])
-    }
-}
-
-pub(crate) trait ParseBufferExt<'a> {
-    fn parenthesized(self) -> Result<ParseBuffer<'a>>;
-}
-
-impl<'a> ParseBufferExt<'a> for ParseStream<'a> {
-    fn parenthesized(self) -> Result<ParseBuffer<'a>> {
-        let content;
-        let _: token::Paren = syn::parenthesized!(content in self);
-        Ok(content)
-    }
-}
-
-impl<'a> ParseBufferExt<'a> for ParseBuffer<'a> {
-    fn parenthesized(self) -> Result<ParseBuffer<'a>> {
-        let content;
-        let _: token::Paren = syn::parenthesized!(content in self);
-        Ok(content)
-    }
-}
-
-// =================================================================================================
-// visitors
-
-// Replace `self`/`Self` with `__self`/`self_ty`.
-// Based on https://github.com/dtolnay/async-trait/blob/0.1.35/src/receiver.rs
-
-pub(crate) struct ReplaceReceiver<'a>(pub(crate) &'a TypePath);
-
-impl ReplaceReceiver<'_> {
-    fn self_ty(&self, span: Span) -> TypePath {
-        respan(self.0, span)
-    }
-
-    fn self_to_qself(&self, qself: &mut Option<QSelf>, path: &mut Path) {
-        if path.leading_colon.is_some() {
-            return;
-        }
-
-        let first = &path.segments[0];
-        if first.ident != "Self" || !first.arguments.is_empty() {
-            return;
-        }
-
-        if path.segments.len() == 1 {
-            self.self_to_expr_path(path);
-            return;
-        }
-
-        let span = first.ident.span();
-        *qself = Some(QSelf {
-            lt_token: Token![<](span),
-            ty: Box::new(self.self_ty(span).into()),
-            position: 0,
-            as_token: None,
-            gt_token: Token![>](span),
-        });
-
-        path.leading_colon = Some(**path.segments.pairs().next().unwrap().punct().unwrap());
-
-        let segments = mem::replace(&mut path.segments, Punctuated::new());
-        path.segments = segments.into_pairs().skip(1).collect();
-    }
-
-    fn self_to_expr_path(&self, path: &mut Path) {
-        if path.leading_colon.is_some() {
-            return;
-        }
-
-        let first = &path.segments[0];
-        if first.ident != "Self" || !first.arguments.is_empty() {
-            return;
-        }
-
-        let self_ty = self.self_ty(first.ident.span());
-        let variant = mem::replace(path, self_ty.path);
-        for segment in &mut path.segments {
-            if let PathArguments::AngleBracketed(bracketed) = &mut segment.arguments {
-                if bracketed.colon2_token.is_none() && !bracketed.args.is_empty() {
-                    bracketed.colon2_token = Some(<Token![::]>::default());
-                }
-            }
-        }
-        if variant.segments.len() > 1 {
-            path.segments.push_punct(<Token![::]>::default());
-            path.segments.extend(variant.segments.into_pairs().skip(1));
-        }
-    }
-
-    fn visit_token_stream(&self, tokens: &mut TokenStream) -> bool {
-        let mut out = Vec::new();
-        let mut modified = false;
-        let mut iter = tokens.clone().into_iter().peekable();
-        while let Some(tt) = iter.next() {
-            match tt {
-                TokenTree::Ident(mut ident) => {
-                    modified |= prepend_underscore_to_self(&mut ident);
-                    if ident == "Self" {
-                        modified = true;
-                        let self_ty = self.self_ty(ident.span());
-                        match iter.peek() {
-                            Some(TokenTree::Punct(p))
-                                if p.as_char() == ':' && p.spacing() == Spacing::Joint =>
-                            {
-                                let next = iter.next().unwrap();
-                                match iter.peek() {
-                                    Some(TokenTree::Punct(p)) if p.as_char() == ':' => {
-                                        let span = ident.span();
-                                        out.extend(quote_spanned!(span=> <#self_ty>))
-                                    }
-                                    _ => out.extend(quote!(#self_ty)),
-                                }
-                                out.push(next);
-                            }
-                            _ => out.extend(quote!(#self_ty)),
-                        }
-                    } else {
-                        out.push(TokenTree::Ident(ident));
-                    }
-                }
-                TokenTree::Group(group) => {
-                    let mut content = group.stream();
-                    modified |= self.visit_token_stream(&mut content);
-                    let mut new = Group::new(group.delimiter(), content);
-                    new.set_span(group.span());
-                    out.push(TokenTree::Group(new));
-                }
-                other => out.push(other),
-            }
-        }
-        if modified {
-            *tokens = TokenStream::from_iter(out);
-        }
-        modified
-    }
-}
-
-impl VisitMut for ReplaceReceiver<'_> {
-    // `Self` -> `Receiver`
-    fn visit_type_mut(&mut self, ty: &mut Type) {
-        if let Type::Path(node) = ty {
-            if node.qself.is_none() && node.path.is_ident("Self") {
-                *ty = self.self_ty(node.path.segments[0].ident.span()).into();
-            } else {
-                self.visit_type_path_mut(node);
-            }
-        } else {
-            visit_mut::visit_type_mut(self, ty);
-        }
-    }
-
-    // `Self::Assoc` -> `<Receiver>::Assoc`
-    fn visit_type_path_mut(&mut self, ty: &mut TypePath) {
-        if ty.qself.is_none() {
-            self.self_to_qself(&mut ty.qself, &mut ty.path);
-        }
-        visit_mut::visit_type_path_mut(self, ty);
-    }
-
-    // `Self::method` -> `<Receiver>::method`
-    fn visit_expr_path_mut(&mut self, expr: &mut ExprPath) {
-        if expr.qself.is_none() {
-            prepend_underscore_to_self(&mut expr.path.segments[0].ident);
-            self.self_to_qself(&mut expr.qself, &mut expr.path);
-        }
-        visit_mut::visit_expr_path_mut(self, expr);
-    }
-
-    fn visit_expr_struct_mut(&mut self, expr: &mut ExprStruct) {
-        self.self_to_expr_path(&mut expr.path);
-        visit_mut::visit_expr_struct_mut(self, expr);
-    }
-
-    fn visit_pat_path_mut(&mut self, pat: &mut PatPath) {
-        if pat.qself.is_none() {
-            self.self_to_qself(&mut pat.qself, &mut pat.path);
-        }
-        visit_mut::visit_pat_path_mut(self, pat);
-    }
-
-    fn visit_pat_struct_mut(&mut self, pat: &mut PatStruct) {
-        self.self_to_expr_path(&mut pat.path);
-        visit_mut::visit_pat_struct_mut(self, pat);
-    }
-
-    fn visit_pat_tuple_struct_mut(&mut self, pat: &mut PatTupleStruct) {
-        self.self_to_expr_path(&mut pat.path);
-        visit_mut::visit_pat_tuple_struct_mut(self, pat);
-    }
-
-    fn visit_item_mut(&mut self, item: &mut Item) {
-        match item {
-            // Visit `macro_rules!` because locally defined macros can refer to `self`.
-            Item::Macro(item) if item.mac.path.is_ident("macro_rules") => {
-                self.visit_macro_mut(&mut item.mac)
-            }
-            // Otherwise, do not recurse into nested items.
-            _ => {}
-        }
-    }
-
-    fn visit_macro_mut(&mut self, mac: &mut Macro) {
-        // We can't tell in general whether `self` inside a macro invocation
-        // refers to the self in the argument list or a different self
-        // introduced within the macro. Heuristic: if the macro input contains
-        // `fn`, then `self` is more likely to refer to something other than the
-        // outer function's self argument.
-        if !contains_fn(mac.tokens.clone()) {
-            self.visit_token_stream(&mut mac.tokens);
-        }
-    }
-}
-
-fn contains_fn(tokens: TokenStream) -> bool {
-    tokens.into_iter().any(|tt| match tt {
-        TokenTree::Ident(ident) => ident == "fn",
-        TokenTree::Group(group) => contains_fn(group.stream()),
-        _ => false,
-    })
-}
-
-pub(crate) fn prepend_underscore_to_self(ident: &mut Ident) -> bool {
-    let modified = ident == "self";
-    if modified {
-        *ident = Ident::new("__self", ident.span());
-    }
-    modified
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-use std::{env, process::Command, str};
-
-// The rustc-cfg strings below are *not* public API. Please let us know by
-// opening a GitHub issue if your build environment requires some way to enable
-// these cfgs other than by executing our build script.
-fn main() {
-    let minor = match rustc_minor_version() {
-        Some(minor) => minor,
-        None => return,
-    };
-
-    // Underscore const names requires Rust 1.37:
-    // https://github.com/rust-lang/rust/pull/61347
-    if minor >= 37 {
-        println!("cargo:rustc-cfg=underscore_consts");
-    }
-
-    // #[deprecated] on proc-macro requires Rust 1.40:
-    // https://github.com/rust-lang/rust/pull/65666
-    if minor >= 40 {
-        println!("cargo:rustc-cfg=deprecated_proc_macro");
-    }
-}
-
-fn rustc_minor_version() -> Option<u32> {
-    let rustc = env::var_os("RUSTC")?;
-    let output = Command::new(rustc).arg("--version").output().ok()?;
-    let version = str::from_utf8(&output.stdout).ok()?;
-    let mut pieces = version.split('.');
-    if pieces.next() != Some("rustc 1") {
-        return None;
-    }
-    pieces.next()?.parse().ok()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"590d4c22cd2fe2c0e5664eb9d01fe195be2cb8b94941c78381e9a58ab6c1fb1e","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","build.rs":"ff90cd6a515a5eab716f63f3af90db47c411ac3a1629800731fb73de832495aa","src/lib.rs":"0519f948d983539d74beffa7f14214332c709fd9876bdd1411d6bbf7c4090414","src/pin_project/attribute.rs":"6601b126a642b25a4c0a5fbb2bbeb2bdc59ecb28eb678ef40595fc28001e5433","src/pin_project/derive.rs":"0ade5a3ebb7b046cb9fb0b63df59747b8cec612281e72837e85ff3631a3f1004","src/pin_project/mod.rs":"149bda261825c80b1043ce1a26f944f69d939d86e5fc37fd1f71969469202b2f","src/pinned_drop.rs":"1feb86175c035c2cbe5e5a0a43d18d2502d764d930644c5456d0ae249b4bbc2c","src/project.rs":"c1fe5164374317ada25ce0a26945c2fd2484d611de60b8ce05adc15013d768b2","src/utils.rs":"7d6bf7b0c4fbca3859ed991b2dd431b9f85dae7617d7d2ef9fc7ce10c103213d"},"package":"65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "pin-project-internal"
-version = "0.4.27"
-authors = ["Taiki Endo <te316e89@gmail.com>"]
-description = "An internal crate to support pin_project - do not use directly\n"
-homepage = "https://github.com/taiki-e/pin-project"
-documentation = "https://docs.rs/pin-project-internal"
-keywords = ["pin", "macros", "attribute"]
-categories = ["no-std", "rust-patterns"]
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/taiki-e/pin-project"
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[lib]
-proc-macro = true
-[dependencies.proc-macro2]
-version = "1"
-
-[dependencies.quote]
-version = "1"
-
-[dependencies.syn]
-version = "1.0.44"
-features = ["full", "visit-mut"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,769 +0,0 @@
-//! An internal crate to support pin_project - **do not use directly**
-
-#![doc(html_root_url = "https://docs.rs/pin-project-internal/0.4.27")]
-#![doc(test(
-    no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms, single_use_lifetimes), allow(dead_code))
-))]
-#![warn(unsafe_code)]
-#![warn(rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
-#![warn(clippy::all, clippy::default_trait_access)]
-// mem::take and #[non_exhaustive] requires Rust 1.40
-#![allow(clippy::mem_replace_with_default, clippy::manual_non_exhaustive)]
-#![allow(clippy::needless_doctest_main)]
-
-// older compilers require explicit `extern crate`.
-#[allow(unused_extern_crates)]
-extern crate proc_macro;
-
-#[macro_use]
-mod utils;
-
-mod pin_project;
-mod pinned_drop;
-mod project;
-
-use proc_macro::TokenStream;
-
-use crate::utils::ProjKind;
-
-/// An attribute that creates projection types covering all the fields of
-/// struct or enum.
-///
-/// This attribute creates projection types according to the following rules:
-///
-/// * For the fields that use `#[pin]` attribute, create the pinned reference to
-///   the field.
-/// * For the other fields, create a normal reference to the field.
-///
-/// And the following methods are implemented on the original type:
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// # type Projection<'a> = &'a ();
-/// # type ProjectionRef<'a> = &'a ();
-/// # trait Dox {
-/// fn project(self: Pin<&mut Self>) -> Projection<'_>;
-/// fn project_ref(self: Pin<&Self>) -> ProjectionRef<'_>;
-/// # }
-/// ```
-///
-/// By passing an argument with the same name as the method to the attribute,
-/// you can name the projection type returned from the method:
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project(project = StructProj)]
-/// struct Struct<T> {
-///     #[pin]
-///     field: T,
-/// }
-///
-/// impl<T> Struct<T> {
-///     fn method(self: Pin<&mut Self>) {
-///         let this: StructProj<'_, T> = self.project();
-///         let StructProj { field } = this;
-///         let _: Pin<&mut T> = field;
-///     }
-/// }
-/// ```
-///
-/// Note that the projection types returned by `project` and `project_ref` have
-/// an additional lifetime at the beginning of generics.
-///
-/// The visibility of the projected type and projection method is based on the
-/// original type. However, if the visibility of the original type is `pub`, the
-/// visibility of the projected type and the projection method is downgraded to
-/// `pub(crate)`.
-///
-/// # Safety
-///
-/// This attribute is completely safe. In the absence of other `unsafe` code
-/// *that you write*, it is impossible to cause [undefined
-/// behavior][undefined-behavior] with this attribute.
-///
-/// This is accomplished by enforcing the four requirements for pin projection
-/// stated in [the Rust documentation][pin-projection]:
-///
-/// 1. The struct must only be [`Unpin`] if all the structural fields are
-///    [`Unpin`].
-///
-///    To enforce this, this attribute will automatically generate an [`Unpin`]
-///    implementation for you, which will require that all structurally pinned
-///    fields be [`Unpin`].
-///
-///    If you attempt to provide an [`Unpin`] impl, the blanket impl will then
-///    apply to your type, causing a compile-time error due to the conflict with
-///    the second impl.
-///
-///    If you wish to provide a manual [`Unpin`] impl, you can do so via the
-///    [`UnsafeUnpin`][unsafe-unpin] argument.
-///
-/// 2. The destructor of the struct must not move structural fields out of its
-///    argument.
-///
-///    To enforce this, this attribute will generate code like this:
-///
-///    ```rust
-///    struct MyStruct {}
-///    trait MyStructMustNotImplDrop {}
-///    # #[allow(unknown_lints, drop_bounds)]
-///    impl<T: Drop> MyStructMustNotImplDrop for T {}
-///    impl MyStructMustNotImplDrop for MyStruct {}
-///    ```
-///
-///    If you attempt to provide an [`Drop`] impl, the blanket impl will then
-///    apply to your type, causing a compile-time error due to the conflict with
-///    the second impl.
-///
-///    If you wish to provide a custom [`Drop`] impl, you can annotate an impl
-///    with [`#[pinned_drop]`][pinned-drop]. This impl takes a pinned version of
-///    your struct - that is, [`Pin`]`<&mut MyStruct>` where `MyStruct` is the
-///    type of your struct.
-///
-///    You can call `project()` on this type as usual, along with any other
-///    methods you have defined. Because your code is never provided with
-///    a `&mut MyStruct`, it is impossible to move out of pin-projectable
-///    fields in safe code in your destructor.
-///
-/// 3. You must make sure that you uphold the [`Drop`
-///    guarantee][drop-guarantee]: once your struct is pinned, the memory that
-///    contains the content is not overwritten or deallocated without calling
-///    the content's destructors.
-///
-///    Safe code doesn't need to worry about this - the only way to violate
-///    this requirement is to manually deallocate memory (which is `unsafe`),
-///    or to overwrite a field with something else.
-///    Because your custom destructor takes [`Pin`]`<&mut MyStruct>`, it's
-///    impossible to obtain a mutable reference to a pin-projected field in safe
-///    code.
-///
-/// 4. You must not offer any other operations that could lead to data being
-///    moved out of the structural fields when your type is pinned.
-///
-///    As with requirement 3, it is impossible for safe code to violate this.
-///    This crate ensures that safe code can never obtain a mutable reference to
-///    `#[pin]` fields, which prevents you from ever moving out of them in safe
-///    code.
-///
-/// Pin projections are also incompatible with [`#[repr(packed)]`][repr-packed]
-/// structs. Attempting to use this attribute on a
-/// [`#[repr(packed)]`][repr-packed] struct results in a compile-time error.
-///
-/// # Examples
-///
-/// `#[pin_project]` can be used on structs and enums.
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// struct Struct<T, U> {
-///     #[pin]
-///     pinned: T,
-///     unpinned: U,
-/// }
-///
-/// impl<T, U> Struct<T, U> {
-///     fn method(self: Pin<&mut Self>) {
-///         let this = self.project();
-///         let _: Pin<&mut T> = this.pinned;
-///         let _: &mut U = this.unpinned;
-///     }
-/// }
-/// ```
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// struct TupleStruct<T, U>(#[pin] T, U);
-///
-/// impl<T, U> TupleStruct<T, U> {
-///     fn method(self: Pin<&mut Self>) {
-///         let this = self.project();
-///         let _: Pin<&mut T> = this.0;
-///         let _: &mut U = this.1;
-///     }
-/// }
-/// ```
-///
-/// To use `#[pin_project]` on enums, you need to name the projection type
-/// returned from the method.
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project(project = EnumProj)]
-/// enum Enum<T, U> {
-///     Tuple(#[pin] T),
-///     Struct { field: U },
-///     Unit,
-/// }
-///
-/// impl<T, U> Enum<T, U> {
-///     fn method(self: Pin<&mut Self>) {
-///         match self.project() {
-///             EnumProj::Tuple(x) => {
-///                 let _: Pin<&mut T> = x;
-///             }
-///             EnumProj::Struct { field } => {
-///                 let _: &mut U = field;
-///             }
-///             EnumProj::Unit => {}
-///         }
-///     }
-/// }
-/// ```
-///
-/// If you want to call the `project()` method multiple times or later use the
-/// original [`Pin`] type, it needs to use [`.as_mut()`][`Pin::as_mut`] to avoid
-/// consuming the [`Pin`].
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// struct Struct<T> {
-///     #[pin]
-///     field: T,
-/// }
-///
-/// impl<T> Struct<T> {
-///     fn call_project_twice(mut self: Pin<&mut Self>) {
-///         // `project` consumes `self`, so reborrow the `Pin<&mut Self>` via `as_mut`.
-///         self.as_mut().project();
-///         self.as_mut().project();
-///     }
-/// }
-/// ```
-///
-/// # `!Unpin`
-///
-/// If you want to ensure that [`Unpin`] is not implemented, use the `!Unpin`
-/// argument to `#[pin_project]`.
-///
-/// ```rust
-/// use pin_project::pin_project;
-///
-/// #[pin_project(!Unpin)]
-/// struct Struct<T> {
-///     field: T,
-/// }
-/// ```
-///
-/// This is equivalent to using `#[pin]` attribute for the [`PhantomPinned`]
-/// field.
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::marker::PhantomPinned;
-///
-/// #[pin_project]
-/// struct Struct<T> {
-///     field: T,
-///     #[pin]
-///     _pin: PhantomPinned,
-/// }
-/// ```
-///
-/// Note that using [`PhantomPinned`] without `#[pin]` attribute has no effect.
-///
-/// # `UnsafeUnpin`
-///
-/// If you want to implement [`Unpin`] manually, you must use the `UnsafeUnpin`
-/// argument to `#[pin_project]`.
-///
-/// ```rust
-/// use pin_project::{pin_project, UnsafeUnpin};
-///
-/// #[pin_project(UnsafeUnpin)]
-/// struct Struct<T, U> {
-///     #[pin]
-///     pinned: T,
-///     unpinned: U,
-/// }
-///
-/// unsafe impl<T: Unpin, U> UnsafeUnpin for Struct<T, U> {}
-/// ```
-///
-/// Note the usage of the unsafe [`UnsafeUnpin`] trait, instead of the usual
-/// [`Unpin`] trait. [`UnsafeUnpin`] behaves exactly like [`Unpin`], except that
-/// is unsafe to implement. This unsafety comes from the fact that pin
-/// projections are being used. If you implement [`UnsafeUnpin`], you must
-/// ensure that it is only implemented when all pin-projected fields implement
-/// [`Unpin`].
-///
-/// See [`UnsafeUnpin`] trait for more details.
-///
-/// # `#[pinned_drop]`
-///
-/// In order to correctly implement pin projections, a type's [`Drop`] impl must
-/// not move out of any structurally pinned fields. Unfortunately,
-/// [`Drop::drop`] takes `&mut Self`, not [`Pin`]`<&mut Self>`.
-///
-/// To ensure that this requirement is upheld, the `#[pin_project]` attribute
-/// will provide a [`Drop`] impl for you. This [`Drop`] impl will delegate to
-/// an impl block annotated with `#[pinned_drop]` if you use the `PinnedDrop`
-/// argument to `#[pin_project]`.
-///
-/// This impl block acts just like a normal [`Drop`] impl,
-/// except for the following two:
-///
-/// * `drop` method takes [`Pin`]`<&mut Self>`
-/// * Name of the trait is `PinnedDrop`.
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// pub trait PinnedDrop {
-///     fn drop(self: Pin<&mut Self>);
-/// }
-/// ```
-///
-/// `#[pin_project]` implements the actual [`Drop`] trait via `PinnedDrop` you
-/// implemented. To drop a type that implements `PinnedDrop`, use the [`drop`]
-/// function just like dropping a type that directly implements [`Drop`].
-///
-/// In particular, it will never be called more than once, just like
-/// [`Drop::drop`].
-///
-/// For example:
-///
-/// ```rust
-/// use pin_project::{pin_project, pinned_drop};
-/// use std::{fmt::Debug, pin::Pin};
-///
-/// #[pin_project(PinnedDrop)]
-/// struct Struct<T: Debug, U: Debug> {
-///     #[pin]
-///     pinned_field: T,
-///     unpin_field: U,
-/// }
-///
-/// #[pinned_drop]
-/// impl<T: Debug, U: Debug> PinnedDrop for Struct<T, U> {
-///     fn drop(self: Pin<&mut Self>) {
-///         println!("Dropping pinned field: {:?}", self.pinned_field);
-///         println!("Dropping unpin field: {:?}", self.unpin_field);
-///     }
-/// }
-///
-/// fn main() {
-///     let _x = Struct { pinned_field: true, unpin_field: 40 };
-/// }
-/// ```
-///
-/// See also [`#[pinned_drop]`][`pinned_drop`] attribute.
-///
-/// # `project_replace()`
-///
-/// In addition to the `project()` and `project_ref()` methods which are always
-/// provided when you use the `#[pin_project]` attribute, there is a third
-/// method, `project_replace()` which can be useful in some situations. It is
-/// equivalent to [`Pin::set`], except that the unpinned fields are moved and
-/// returned, instead of being dropped in-place.
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// # type ProjectionOwned = ();
-/// # trait Dox {
-/// fn project_replace(self: Pin<&mut Self>, other: Self) -> ProjectionOwned;
-/// # }
-/// ```
-///
-/// The `ProjectionOwned` type is identical to the `Self` type, except that
-/// all pinned fields have been replaced by equivalent [`PhantomData`] types.
-///
-/// This method is opt-in, because it is only supported for [`Sized`] types, and
-/// because it is incompatible with the [`#[pinned_drop]`][pinned-drop]
-/// attribute described above. It can be enabled by using
-/// `#[pin_project(project_replace)]`.
-///
-/// For example:
-///
-/// ```rust
-/// use pin_project::pin_project;
-/// use std::{marker::PhantomData, pin::Pin};
-///
-/// #[pin_project(project_replace)]
-/// struct Struct<T, U> {
-///     #[pin]
-///     pinned_field: T,
-///     unpinned_field: U,
-/// }
-///
-/// impl<T, U> Struct<T, U> {
-///     fn method(self: Pin<&mut Self>, other: Self) {
-///         let this = self.project_replace(other);
-///         let _: U = this.unpinned_field;
-///         let _: PhantomData<T> = this.pinned_field;
-///     }
-/// }
-/// ```
-///
-/// By passing the value to the `project_replace` argument, you can name the
-/// returned type of `project_replace()`. This is necessary whenever
-/// destructuring the return type of `project_replace()`, and work in exactly
-/// the same way as the `project` and `project_ref` arguments.
-///
-/// ```rust
-/// use pin_project::pin_project;
-///
-/// #[pin_project(project_replace = EnumProjOwn)]
-/// enum Enum<T, U> {
-///     A {
-///         #[pin]
-///         pinned_field: T,
-///         unpinned_field: U,
-///     },
-///     B,
-/// }
-///
-/// let mut x = Box::pin(Enum::A { pinned_field: 42, unpinned_field: "hello" });
-///
-/// match x.as_mut().project_replace(Enum::B) {
-///     EnumProjOwn::A { unpinned_field, .. } => assert_eq!(unpinned_field, "hello"),
-///     EnumProjOwn::B => unreachable!(),
-/// }
-/// ```
-///
-/// [`PhantomData`]: core::marker::PhantomData
-/// [`PhantomPinned`]: core::marker::PhantomPinned
-/// [`Pin::as_mut`]: core::pin::Pin::as_mut
-/// [`Pin::set`]: core::pin::Pin::set
-/// [`Pin`]: core::pin::Pin
-/// [`UnsafeUnpin`]: https://docs.rs/pin-project/0.4/pin_project/trait.UnsafeUnpin.html
-/// [`pinned_drop`]: ./attr.pinned_drop.html
-/// [drop-guarantee]: https://doc.rust-lang.org/nightly/std/pin/index.html#drop-guarantee
-/// [pin-projection]: https://doc.rust-lang.org/nightly/std/pin/index.html#projections-and-structural-pinning
-/// [pinned-drop]: ./attr.pin_project.html#pinned_drop
-/// [repr-packed]: https://doc.rust-lang.org/nomicon/other-reprs.html#reprpacked
-/// [undefined-behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html
-/// [unsafe-unpin]: ./attr.pin_project.html#unsafeunpin
-#[proc_macro_attribute]
-pub fn pin_project(args: TokenStream, input: TokenStream) -> TokenStream {
-    pin_project::attribute(&args.into(), input.into()).into()
-}
-
-/// An attribute for annotating an impl block that implements [`Drop`].
-///
-/// This attribute is only needed when you wish to provide a [`Drop`]
-/// impl for your type.
-///
-/// This impl block acts just like a normal [`Drop`] impl,
-/// except for the following two:
-///
-/// * `drop` method takes [`Pin`]`<&mut Self>`
-/// * Name of the trait is `PinnedDrop`.
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// pub trait PinnedDrop {
-///     fn drop(self: Pin<&mut Self>);
-/// }
-/// ```
-///
-/// `#[pin_project]` implements the actual [`Drop`] trait via `PinnedDrop` you
-/// implemented. To drop a type that implements `PinnedDrop`, use the [`drop`]
-/// function just like dropping a type that directly implements [`Drop`].
-///
-/// In particular, it will never be called more than once, just like
-/// [`Drop::drop`].
-///
-/// # Example
-///
-/// ```rust
-/// use pin_project::{pin_project, pinned_drop};
-/// use std::pin::Pin;
-///
-/// #[pin_project(PinnedDrop)]
-/// struct Foo {
-///     #[pin]
-///     field: u8,
-/// }
-///
-/// #[pinned_drop]
-/// impl PinnedDrop for Foo {
-///     fn drop(self: Pin<&mut Self>) {
-///         println!("Dropping: {}", self.field);
-///     }
-/// }
-///
-/// fn main() {
-///     let _x = Foo { field: 50 };
-/// }
-/// ```
-///
-/// See also ["pinned-drop" section of `#[pin_project]` attribute][pinned-drop].
-///
-/// # Why `#[pinned_drop]` attribute is needed?
-///
-/// Implementing `PinnedDrop::drop` is safe, but calling it is not safe.
-// This is because destructors can be called multiple times in safe code and
-/// [double dropping is unsound](https://github.com/rust-lang/rust/pull/62360).
-///
-/// Ideally, it would be desirable to be able to forbid manual calls in
-/// the same way as [`Drop::drop`], but the library cannot do it. So, by using
-/// macros and replacing them with private traits like the following, we prevent
-/// users from calling `PinnedDrop::drop` in safe code.
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// pub trait PinnedDrop {
-///     unsafe fn drop(self: Pin<&mut Self>);
-/// }
-/// ```
-///
-/// This allows implementing [`Drop`] safely using `#[pinned_drop]`.
-/// Also by using the [`drop`] function just like dropping a type that directly
-/// implements [`Drop`], can drop safely a type that implements `PinnedDrop`.
-///
-/// [`Pin`]: core::pin::Pin
-/// [pinned-drop]: ./attr.pin_project.html#pinned_drop
-#[proc_macro_attribute]
-pub fn pinned_drop(args: TokenStream, input: TokenStream) -> TokenStream {
-    let input = syn::parse_macro_input!(input);
-    pinned_drop::attribute(&args.into(), input).into()
-}
-
-/// (deprecated) An attribute to provide way to refer to the projected type returned by
-/// `project` method.
-///
-/// **This attribute is deprecated. Consider naming projected type by passing
-/// `project` argument to `#[pin_project]` attribute instead, see [release note]
-/// for details**
-///
-/// The following syntaxes are supported.
-///
-/// # `let` bindings
-///
-/// *The attribute at the expression position is not stable, so you need to use
-/// a dummy `#[project]` attribute for the function.*
-///
-/// ## Examples
-///
-/// ```rust
-/// # #![allow(deprecated)]
-/// use pin_project::{pin_project, project};
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// struct Foo<T, U> {
-///     #[pin]
-///     future: T,
-///     field: U,
-/// }
-///
-/// impl<T, U> Foo<T, U> {
-///     #[project] // Nightly does not need a dummy attribute to the function.
-///     fn baz(self: Pin<&mut Self>) {
-///         #[project]
-///         let Foo { future, field } = self.project();
-///
-///         let _: Pin<&mut T> = future;
-///         let _: &mut U = field;
-///     }
-/// }
-/// ```
-///
-/// # `match` expressions
-///
-/// *The attribute at the expression position is not stable, so you need to use
-/// a dummy `#[project]` attribute for the function.*
-///
-/// ## Examples
-///
-/// ```rust
-/// # #![allow(deprecated)]
-/// use pin_project::{pin_project, project};
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// enum Enum<A, B, C> {
-///     Tuple(#[pin] A, B),
-///     Struct { field: C },
-///     Unit,
-/// }
-///
-/// impl<A, B, C> Enum<A, B, C> {
-///     #[project] // Nightly does not need a dummy attribute to the function.
-///     fn baz(self: Pin<&mut Self>) {
-///         #[project]
-///         match self.project() {
-///             Enum::Tuple(x, y) => {
-///                 let _: Pin<&mut A> = x;
-///                 let _: &mut B = y;
-///             }
-///             Enum::Struct { field } => {
-///                 let _: &mut C = field;
-///             }
-///             Enum::Unit => {}
-///         }
-///     }
-/// }
-/// ```
-///
-/// # `impl` blocks
-///
-/// All methods and associated functions in `#[project] impl` block become
-/// methods of the projected type. If you want to implement methods on the
-/// original type, you need to create another (non-`#[project]`) `impl` block.
-///
-/// To call a method implemented in `#[project] impl` block, you need to first
-/// get the projected-type with `let this = self.project();`.
-///
-/// ## Examples
-///
-/// ```rust
-/// # #![allow(deprecated)]
-/// use pin_project::{pin_project, project};
-/// use std::pin::Pin;
-///
-/// #[pin_project]
-/// struct Foo<T, U> {
-///     #[pin]
-///     future: T,
-///     field: U,
-/// }
-///
-/// // impl for the original type
-/// impl<T, U> Foo<T, U> {
-///     fn bar(self: Pin<&mut Self>) {
-///         self.project().baz()
-///     }
-/// }
-///
-/// // impl for the projected type
-/// #[project]
-/// impl<T, U> Foo<T, U> {
-///     fn baz(self) {
-///         let Self { future, field } = self;
-///
-///         let _: Pin<&mut T> = future;
-///         let _: &mut U = field;
-///     }
-/// }
-/// ```
-///
-/// # `use` statements
-///
-/// ## Examples
-///
-/// ```rust
-/// # #![allow(deprecated)]
-/// # mod dox {
-/// use pin_project::pin_project;
-///
-/// #[pin_project]
-/// struct Foo<A> {
-///     #[pin]
-///     field: A,
-/// }
-///
-/// mod bar {
-///     use super::Foo;
-///     use pin_project::project;
-///     use std::pin::Pin;
-///
-///     #[project]
-///     use super::Foo;
-///
-///     #[project]
-///     fn baz<A>(foo: Pin<&mut Foo<A>>) {
-///         #[project]
-///         let Foo { field } = foo.project();
-///         let _: Pin<&mut A> = field;
-///     }
-/// }
-/// # }
-/// ```
-///
-/// [release note]: https://github.com/taiki-e/pin-project/releases/tag/v0.4.21
-#[cfg_attr(
-    deprecated_proc_macro,
-    deprecated(
-        since = "0.4.21",
-        note = "consider naming projected type by passing `project` \
-                argument to #[pin_project] attribute instead, see release note \
-                <https://github.com/taiki-e/pin-project/releases/tag/v0.4.21> \
-                for details"
-    )
-)]
-#[proc_macro_attribute]
-pub fn project(args: TokenStream, input: TokenStream) -> TokenStream {
-    let input = syn::parse_macro_input!(input);
-    project::attribute(&args.into(), input, ProjKind::Mutable).into()
-}
-
-/// (deprecated) An attribute to provide way to refer to the projected type returned by
-/// `project_ref` method.
-///
-/// **This attribute is deprecated. Consider naming projected type by passing
-/// `project_ref` argument to `#[pin_project]` attribute instead, see [release note]
-/// for details**
-///
-/// This is the same as [`#[project]`][`project`] attribute except it refers to
-/// the projected type returned by the `project_ref` method.
-///
-/// See [`#[project]`][`project`] attribute for more details.
-///
-/// [release note]: https://github.com/taiki-e/pin-project/releases/tag/v0.4.21
-/// [`project`]: ./attr.project.html
-#[cfg_attr(
-    deprecated_proc_macro,
-    deprecated(
-        since = "0.4.21",
-        note = "consider naming projected type by passing `project_ref` \
-                argument to #[pin_project] attribute instead, see release note \
-                <https://github.com/taiki-e/pin-project/releases/tag/v0.4.21> \
-                for details"
-    )
-)]
-#[proc_macro_attribute]
-pub fn project_ref(args: TokenStream, input: TokenStream) -> TokenStream {
-    let input = syn::parse_macro_input!(input);
-    project::attribute(&args.into(), input, ProjKind::Immutable).into()
-}
-
-/// (deprecated) An attribute to provide way to refer to the projected type returned by
-/// `project_replace` method.
-///
-/// **This attribute is deprecated. Consider naming projected type by passing
-/// `project_replace` argument to `#[pin_project]` attribute instead, see [release note]
-/// for details**
-///
-/// This is the same as [`#[project]`][`project`] attribute except it refers to
-/// the projected type returned by the `project_replace` method.
-///
-/// See [`#[project]`][`project`] attribute for more details.
-///
-/// [release note]: https://github.com/taiki-e/pin-project/releases/tag/v0.4.21
-/// [`project`]: ./attr.project.html
-#[cfg_attr(
-    deprecated_proc_macro,
-    deprecated(
-        since = "0.4.21",
-        note = "consider naming projected type by passing `project_replace` \
-                argument to #[pin_project] attribute instead, see release note \
-                <https://github.com/taiki-e/pin-project/releases/tag/v0.4.21> \
-                for details"
-    )
-)]
-#[proc_macro_attribute]
-pub fn project_replace(args: TokenStream, input: TokenStream) -> TokenStream {
-    let input = syn::parse_macro_input!(input);
-    project::attribute(&args.into(), input, ProjKind::Owned).into()
-}
-
-// An internal helper macro. Not public API.
-#[doc(hidden)]
-#[proc_macro_derive(__PinProjectInternalDerive, attributes(pin))]
-pub fn __pin_project_internal_derive(input: TokenStream) -> TokenStream {
-    pin_project::derive(input.into()).into()
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pinned_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pinned_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pinned_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pinned_drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,211 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::{quote, ToTokens};
-use syn::{spanned::Spanned, visit_mut::VisitMut, *};
-
-use crate::utils::{parse_as_empty, prepend_underscore_to_self, ReplaceReceiver, SliceExt};
-
-pub(crate) fn attribute(args: &TokenStream, mut input: ItemImpl) -> TokenStream {
-    if let Err(e) = parse_as_empty(args).and_then(|()| parse(&mut input)) {
-        let mut tokens = e.to_compile_error();
-        if let Type::Path(self_ty) = &*input.self_ty {
-            let (impl_generics, _, where_clause) = input.generics.split_for_impl();
-
-            // A dummy impl of `PinnedDrop`.
-            // In many cases, `#[pinned_drop] impl` is declared after `#[pin_project]`.
-            // Therefore, if `pinned_drop` compile fails, you will also get an error
-            // about `PinnedDrop` not being implemented.
-            // This can be prevented to some extent by generating a dummy
-            // `PinnedDrop` implementation.
-            // We already know that we will get a compile error, so this won't
-            // accidentally compile successfully.
-            //
-            // However, if `input.self_ty` is not Type::Path, there is a high possibility that
-            // the type does not exist, so do not generate a dummy impl.
-            tokens.extend(quote! {
-                impl #impl_generics ::pin_project::__private::PinnedDrop for #self_ty
-                #where_clause
-                {
-                    unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-            });
-        }
-        tokens
-    } else {
-        input.into_token_stream()
-    }
-}
-
-fn parse_method(method: &ImplItemMethod) -> Result<()> {
-    fn get_ty_path(ty: &Type) -> Option<&Path> {
-        if let Type::Path(TypePath { qself: None, path }) = ty { Some(path) } else { None }
-    }
-
-    const INVALID_ARGUMENT: &str = "method `drop` must take an argument `self: Pin<&mut Self>`";
-
-    if method.sig.ident != "drop" {
-        return Err(error!(
-            method.sig.ident,
-            "method `{}` is not a member of trait `PinnedDrop", method.sig.ident,
-        ));
-    }
-
-    if let ReturnType::Type(_, ty) = &method.sig.output {
-        match &**ty {
-            Type::Tuple(ty) if ty.elems.is_empty() => {}
-            _ => return Err(error!(ty, "method `drop` must return the unit type")),
-        }
-    }
-
-    match method.sig.inputs.len() {
-        1 => {}
-        0 => return Err(Error::new(method.sig.paren_token.span, INVALID_ARGUMENT)),
-        _ => return Err(error!(method.sig.inputs, INVALID_ARGUMENT)),
-    }
-
-    if let Some(FnArg::Typed(pat)) = method.sig.receiver() {
-        // (mut) self: <path>
-        if let Some(path) = get_ty_path(&pat.ty) {
-            let ty = path.segments.last().unwrap();
-            if let PathArguments::AngleBracketed(args) = &ty.arguments {
-                // (mut) self: (<path>::)<ty><&mut <elem>..>
-                if let Some(GenericArgument::Type(Type::Reference(TypeReference {
-                    mutability: Some(_),
-                    elem,
-                    ..
-                }))) = args.args.first()
-                {
-                    // (mut) self: (<path>::)Pin<&mut Self>
-                    if args.args.len() == 1
-                        && ty.ident == "Pin"
-                        && get_ty_path(elem).map_or(false, |path| path.is_ident("Self"))
-                    {
-                        if method.sig.unsafety.is_some() {
-                            return Err(error!(
-                                method.sig.unsafety,
-                                "implementing the method `drop` is not unsafe"
-                            ));
-                        }
-                        return Ok(());
-                    }
-                }
-            }
-        }
-    }
-
-    Err(error!(method.sig.inputs[0], INVALID_ARGUMENT))
-}
-
-fn parse(item: &mut ItemImpl) -> Result<()> {
-    const INVALID_ITEM: &str =
-        "#[pinned_drop] may only be used on implementation for the `PinnedDrop` trait";
-
-    if let Some(attr) = item.attrs.find("pinned_drop") {
-        return Err(error!(attr, "duplicate #[pinned_drop] attribute"));
-    }
-
-    if let Some((_, path, _)) = &mut item.trait_ {
-        if path.is_ident("PinnedDrop") {
-            *path = parse_quote_spanned! { path.span() =>
-                ::pin_project::__private::PinnedDrop
-            };
-        } else {
-            return Err(error!(path, INVALID_ITEM));
-        }
-    } else {
-        return Err(error!(item.self_ty, INVALID_ITEM));
-    }
-
-    if item.unsafety.is_some() {
-        return Err(error!(item.unsafety, "implementing the trait `PinnedDrop` is not unsafe"));
-    }
-    if item.items.is_empty() {
-        return Err(error!(item, "not all trait items implemented, missing: `drop`"));
-    }
-
-    match &*item.self_ty {
-        Type::Path(_) => {}
-        ty => {
-            return Err(error!(
-                ty,
-                "implementing the trait `PinnedDrop` on this type is unsupported"
-            ));
-        }
-    }
-
-    item.items
-        .iter()
-        .enumerate()
-        .try_for_each(|(i, item)| match item {
-            ImplItem::Const(item) => {
-                Err(error!(item, "const `{}` is not a member of trait `PinnedDrop`", item.ident))
-            }
-            ImplItem::Type(item) => {
-                Err(error!(item, "type `{}` is not a member of trait `PinnedDrop`", item.ident))
-            }
-            ImplItem::Method(method) => {
-                parse_method(method)?;
-                if i == 0 {
-                    Ok(())
-                } else {
-                    Err(error!(method, "duplicate definitions with name `drop`"))
-                }
-            }
-            _ => unreachable!("unexpected ImplItem"),
-        })
-        .map(|()| expand_item(item))
-}
-
-// from:
-//
-// fn drop(self: Pin<&mut Self>) {
-//     // something
-// }
-//
-// into:
-//
-// unsafe fn drop(self: Pin<&mut Self>) {
-//     fn __drop_inner<T>(__self: Pin<&mut Foo<'_, T>>) {
-//         fn __drop_inner() {}
-//         // something
-//     }
-//     __drop_inner(self);
-// }
-//
-fn expand_item(item: &mut ItemImpl) {
-    let method =
-        if let ImplItem::Method(method) = &mut item.items[0] { method } else { unreachable!() };
-    let mut drop_inner = method.clone();
-
-    // `fn drop(mut self: Pin<&mut Self>)` -> `fn __drop_inner<T>(mut __self: Pin<&mut Receiver>)`
-    let ident = Ident::new("__drop_inner", drop_inner.sig.ident.span());
-    // Add a dummy `__drop_inner` function to prevent users call outer `__drop_inner`.
-    drop_inner.block.stmts.insert(0, parse_quote!(fn #ident() {}));
-    drop_inner.sig.ident = ident;
-    drop_inner.sig.generics = item.generics.clone();
-    if let FnArg::Typed(arg) = &mut drop_inner.sig.inputs[0] {
-        if let Pat::Ident(ident) = &mut *arg.pat {
-            prepend_underscore_to_self(&mut ident.ident);
-        }
-    }
-    let self_ty = if let Type::Path(ty) = &*item.self_ty { ty } else { unreachable!() };
-    let mut visitor = ReplaceReceiver(self_ty);
-    visitor.visit_signature_mut(&mut drop_inner.sig);
-    visitor.visit_block_mut(&mut drop_inner.block);
-
-    // `fn drop(mut self: Pin<&mut Self>)` -> `unsafe fn drop(self: Pin<&mut Self>)`
-    method.sig.unsafety = Some(<Token![unsafe]>::default());
-    let mut self_token = None;
-    if let FnArg::Typed(arg) = &mut method.sig.inputs[0] {
-        if let Pat::Ident(ident) = &mut *arg.pat {
-            ident.mutability = None;
-            self_token = Some(&ident.ident);
-        }
-    }
-    assert!(self_token.is_some());
-
-    method.block.stmts = parse_quote! {
-        #[allow(clippy::needless_pass_by_value)] // This lint does not warn the receiver.
-        #drop_inner
-        __drop_inner(#self_token);
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/attribute.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/attribute.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/attribute.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/attribute.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::quote;
-use syn::{
-    parse::{Parse, ParseStream},
-    *,
-};
-
-use super::PIN;
-use crate::utils::SliceExt;
-
-// To generate the correct `Unpin` implementation and the projection methods,
-// we need to collect the types of the pinned fields.
-// However, since proc-macro-attribute is applied before `cfg` and `cfg_attr`
-// on fields, we cannot be collecting field types properly at this timing.
-// So instead of generating the `Unpin` implementation and the projection
-// methods here, delegate their processing to proc-macro-derive.
-//
-// At this stage, only attributes are parsed and the following attributes are
-// added to the attributes of the item.
-// * `#[derive(InternalDerive)]` - An internal helper macro that does the above
-//   processing.
-// * `#[pin(__private(#args))]` - Pass the argument of `#[pin_project]` to
-//   proc-macro-derive (`InternalDerive`).
-
-pub(super) fn parse_attribute(args: &TokenStream, input: TokenStream) -> Result<TokenStream> {
-    let Input { attrs, body } = syn::parse2(input)?;
-
-    Ok(quote! {
-        #(#attrs)*
-        #[derive(::pin_project::__private::__PinProjectInternalDerive)]
-        // Use `__private` to prevent users from trying to control `InternalDerive`
-        // manually. `__private` does not guarantee compatibility between patch
-        // versions, so it should be sufficient for this purpose in most cases.
-        #[pin(__private(#args))]
-        #body
-    })
-}
-
-#[allow(dead_code)] // https://github.com/rust-lang/rust/issues/56750
-struct Input {
-    attrs: Vec<Attribute>,
-    body: TokenStream,
-}
-
-impl Parse for Input {
-    fn parse(input: ParseStream<'_>) -> Result<Self> {
-        let attrs = input.call(Attribute::parse_outer)?;
-
-        let ahead = input.fork();
-        let _: Visibility = ahead.parse()?;
-        if !ahead.peek(Token![struct]) && !ahead.peek(Token![enum]) {
-            // If we check this only on proc-macro-derive, it may generate unhelpful error
-            // messages. So it is preferable to be able to detect it here.
-            Err(error!(
-                input.parse::<TokenStream>()?,
-                "#[pin_project] attribute may only be used on structs or enums"
-            ))
-        } else if let Some(attr) = attrs.find(PIN) {
-            Err(error!(attr, "#[pin] attribute may only be used on fields of structs or variants"))
-        } else if let Some(attr) = attrs.find("pin_project") {
-            Err(error!(attr, "duplicate #[pin_project] attribute"))
-        } else {
-            Ok(Self { attrs, body: input.parse()? })
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/derive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/derive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/derive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/derive.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1232 +0,0 @@
-use proc_macro2::{Delimiter, Group, Span, TokenStream};
-use quote::{format_ident, quote, quote_spanned, ToTokens};
-use syn::{
-    parse::{Parse, ParseStream},
-    spanned::Spanned,
-    visit_mut::VisitMut,
-    *,
-};
-
-use super::PIN;
-use crate::utils::{
-    determine_lifetime_name, determine_visibility, insert_lifetime_and_bound, ParseBufferExt,
-    ProjKind, ReplaceReceiver, SliceExt, Variants,
-};
-
-pub(super) fn parse_derive(input: TokenStream) -> Result<TokenStream> {
-    let mut input: DeriveInput = syn::parse2(input)?;
-
-    let ident = &input.ident;
-    let ty_generics = input.generics.split_for_impl().1;
-    let self_ty = parse_quote!(#ident #ty_generics);
-    let mut visitor = ReplaceReceiver(&self_ty);
-    visitor.visit_generics_mut(&mut input.generics);
-    visitor.visit_data_mut(&mut input.data);
-
-    let mut cx = Context::new(&input.attrs, &input.vis, &input.ident, &mut input.generics)?;
-    let packed_check;
-
-    let (mut items, scoped_items) = match &input.data {
-        Data::Struct(data) => {
-            // Do this first for a better error message.
-            packed_check = Some(cx.ensure_not_packed(&data.fields)?);
-            cx.parse_struct(data)?
-        }
-        Data::Enum(data) => {
-            // We don't need to check for `#[repr(packed)]`,
-            // since it does not apply to enums.
-            packed_check = None;
-            cx.parse_enum(data)?
-        }
-        Data::Union(_) => {
-            return Err(error!(
-                input,
-                "#[pin_project] attribute may only be used on structs or enums"
-            ));
-        }
-    };
-
-    let unpin_impl = cx.make_unpin_impl();
-    let drop_impl = cx.make_drop_impl();
-    let dummy_const = if cfg!(underscore_consts) {
-        format_ident!("_")
-    } else {
-        format_ident!("__SCOPE_{}", ident)
-    };
-    items.extend(quote! {
-        // All items except projected types are generated inside a `const` scope.
-        // This makes it impossible for user code to refer to these types.
-        // However, this prevents Rustdoc from displaying docs for any
-        // of our types. In particular, users cannot see the
-        // automatically generated `Unpin` impl for the '__UnpinStruct' types
-        //
-        // Previously, we provided a flag to correctly document the
-        // automatically generated `Unpin` impl by using def-site hygiene,
-        // but it is now removed.
-        //
-        // Refs:
-        // * https://github.com/rust-lang/rust/issues/63281
-        // * https://github.com/taiki-e/pin-project/pull/53#issuecomment-525906867
-        // * https://github.com/taiki-e/pin-project/pull/70
-        #[doc(hidden)]
-        #[allow(non_upper_case_globals)]
-        #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-        #[allow(clippy::used_underscore_binding)]
-        const #dummy_const: () = {
-            #scoped_items
-            #unpin_impl
-            #drop_impl
-            #packed_check
-        };
-    });
-    Ok(items)
-}
-
-fn validate_struct(ident: &Ident, fields: &Fields) -> Result<()> {
-    if fields.is_empty() {
-        let msg = "#[pin_project] attribute may not be used on structs with zero fields";
-        if let Fields::Unit = fields { Err(error!(ident, msg)) } else { Err(error!(fields, msg)) }
-    } else {
-        Ok(())
-    }
-}
-
-fn validate_enum(brace_token: token::Brace, variants: &Variants) -> Result<()> {
-    if variants.is_empty() {
-        return Err(Error::new(
-            brace_token.span,
-            "#[pin_project] attribute may not be used on enums without variants",
-        ));
-    }
-    let has_field = variants.iter().try_fold(false, |has_field, v| {
-        if let Some((_, e)) = &v.discriminant {
-            Err(error!(e, "#[pin_project] attribute may not be used on enums with discriminants"))
-        } else if let Some(attr) = v.attrs.find(PIN) {
-            Err(error!(attr, "#[pin] attribute may only be used on fields of structs or variants"))
-        } else if v.fields.is_empty() {
-            Ok(has_field)
-        } else {
-            Ok(true)
-        }
-    })?;
-    if has_field {
-        Ok(())
-    } else {
-        Err(error!(variants, "#[pin_project] attribute may not be used on enums with zero fields"))
-    }
-}
-
-struct Args {
-    /// `PinnedDrop` argument.
-    pinned_drop: Option<Span>,
-    /// `UnsafeUnpin` or `!Unpin` argument.
-    unpin_impl: UnpinImpl,
-    /// `project = <ident>` argument.
-    project: Option<Ident>,
-    /// `project_ref = <ident>` argument.
-    project_ref: Option<Ident>,
-    /// `project_replace [= <ident>]` or `Replace` argument.
-    project_replace: ProjReplace,
-}
-
-enum ProjReplace {
-    None,
-    /// `project_replace` or `Replace`.
-    Unnamed {
-        span: Span,
-    },
-    /// `project_replace = <ident>`.
-    Named {
-        span: Span,
-        ident: Ident,
-    },
-}
-
-impl ProjReplace {
-    fn span(&self) -> Option<Span> {
-        match self {
-            ProjReplace::None => None,
-            ProjReplace::Named { span, .. } | ProjReplace::Unnamed { span, .. } => Some(*span),
-        }
-    }
-
-    fn ident(&self) -> Option<&Ident> {
-        if let ProjReplace::Named { ident, .. } = self { Some(ident) } else { None }
-    }
-}
-
-const DUPLICATE_PIN: &str = "duplicate #[pin] attribute";
-
-impl Args {
-    fn get(attrs: &[Attribute]) -> Result<Self> {
-        // `(__private(<args>))` -> `<args>`
-        struct Input(Option<TokenStream>);
-
-        impl Parse for Input {
-            fn parse(input: ParseStream<'_>) -> Result<Self> {
-                Ok(Self((|| {
-                    let content = input.parenthesized().ok()?;
-                    let private = content.parse::<Ident>().ok()?;
-                    if private == "__private" {
-                        content.parenthesized().ok()?.parse::<TokenStream>().ok()
-                    } else {
-                        None
-                    }
-                })()))
-            }
-        }
-
-        if let Some(attr) = attrs.find("pin_project") {
-            return Err(error!(attr, "duplicate #[pin_project] attribute"));
-        }
-
-        let mut attrs = attrs.iter().filter(|attr| attr.path.is_ident(PIN));
-
-        let prev = if let Some(attr) = attrs.next() {
-            (attr, syn::parse2::<Input>(attr.tokens.clone()).unwrap().0)
-        } else {
-            // This only fails if another macro removes `#[pin]`.
-            return Err(error!(TokenStream::new(), "#[pin_project] attribute has been removed"));
-        };
-
-        if let Some(attr) = attrs.next() {
-            let (prev_attr, prev_res) = &prev;
-            // As the `#[pin]` attribute generated by `#[pin_project]`
-            // has the same span as `#[pin_project]`, it is possible
-            // that a useless error message will be generated.
-            let res = syn::parse2::<Input>(attr.tokens.clone()).unwrap().0;
-            let span = match (&prev_res, res) {
-                (Some(_), _) => attr,
-                (_, Some(_)) => prev_attr,
-                (None, None) => prev_attr,
-            };
-            Err(error!(span, DUPLICATE_PIN))
-        } else {
-            // This `unwrap` only fails if another macro removes `#[pin]` and inserts own `#[pin]`.
-            syn::parse2(prev.1.unwrap())
-        }
-    }
-}
-
-impl Parse for Args {
-    fn parse(input: ParseStream<'_>) -> Result<Self> {
-        mod kw {
-            syn::custom_keyword!(Unpin);
-        }
-
-        // Parses `= <value>` in `<name> = <value>` and returns value and span of name-value pair.
-        fn parse_value(
-            input: ParseStream<'_>,
-            name: &Ident,
-            has_prev: bool,
-        ) -> Result<(Ident, TokenStream)> {
-            if input.is_empty() {
-                return Err(error!(name, "expected `{0} = <identifier>`, found `{0}`", name));
-            }
-            let eq_token: Token![=] = input.parse()?;
-            if input.is_empty() {
-                let span = quote!(#name #eq_token);
-                return Err(error!(span, "expected `{0} = <identifier>`, found `{0} =`", name));
-            }
-            let value: Ident = input.parse()?;
-            let span = quote!(#name #value);
-            if has_prev {
-                Err(error!(span, "duplicate `{}` argument", name))
-            } else {
-                Ok((value, span))
-            }
-        }
-
-        let mut pinned_drop = None;
-        let mut unsafe_unpin = None;
-        let mut not_unpin = None;
-        let mut project = None;
-        let mut project_ref = None;
-
-        let mut replace = None;
-        let mut project_replace_value = None;
-        let mut project_replace_span = None;
-
-        while !input.is_empty() {
-            if input.peek(Token![!]) {
-                let bang: Token![!] = input.parse()?;
-                if input.is_empty() {
-                    return Err(error!(bang, "expected `!Unpin`, found `!`"));
-                }
-                let unpin: kw::Unpin = input.parse()?;
-                let span = quote!(#bang #unpin);
-                if not_unpin.replace(span.span()).is_some() {
-                    return Err(error!(span, "duplicate `!Unpin` argument"));
-                }
-            } else {
-                let token = input.parse::<Ident>()?;
-                match &*token.to_string() {
-                    "PinnedDrop" => {
-                        if pinned_drop.replace(token.span()).is_some() {
-                            return Err(error!(token, "duplicate `PinnedDrop` argument"));
-                        }
-                    }
-                    "UnsafeUnpin" => {
-                        if unsafe_unpin.replace(token.span()).is_some() {
-                            return Err(error!(token, "duplicate `UnsafeUnpin` argument"));
-                        }
-                    }
-                    "project" => {
-                        project = Some(parse_value(input, &token, project.is_some())?.0);
-                    }
-                    "project_ref" => {
-                        project_ref = Some(parse_value(input, &token, project_ref.is_some())?.0);
-                    }
-                    "project_replace" => {
-                        if input.peek(Token![=]) {
-                            let (value, span) =
-                                parse_value(input, &token, project_replace_span.is_some())?;
-                            project_replace_value = Some(value);
-                            project_replace_span = Some(span.span());
-                        } else if project_replace_span.is_some() {
-                            return Err(error!(token, "duplicate `project_replace` argument"));
-                        } else {
-                            project_replace_span = Some(token.span());
-                        }
-                    }
-                    "Replace" => {
-                        if replace.replace(token.span()).is_some() {
-                            return Err(error!(token, "duplicate `Replace` argument"));
-                        }
-                    }
-                    _ => return Err(error!(token, "unexpected argument: {}", token)),
-                }
-            }
-
-            if input.is_empty() {
-                break;
-            }
-            let _: Token![,] = input.parse()?;
-        }
-
-        if project.is_some() || project_ref.is_some() {
-            if project == project_ref {
-                return Err(error!(
-                    project_ref,
-                    "name `{}` is already specified by `project` argument",
-                    project_ref.as_ref().unwrap()
-                ));
-            }
-            if let Some(ident) = &project_replace_value {
-                if project == project_replace_value {
-                    return Err(error!(
-                        ident,
-                        "name `{}` is already specified by `project` argument", ident
-                    ));
-                } else if project_ref == project_replace_value {
-                    return Err(error!(
-                        ident,
-                        "name `{}` is already specified by `project_ref` argument", ident
-                    ));
-                }
-            }
-        }
-
-        if let Some(span) = pinned_drop {
-            if project_replace_span.is_some() {
-                return Err(Error::new(
-                    span,
-                    "arguments `PinnedDrop` and `project_replace` are mutually exclusive",
-                ));
-            } else if replace.is_some() {
-                return Err(Error::new(
-                    span,
-                    "arguments `PinnedDrop` and `Replace` are mutually exclusive",
-                ));
-            }
-        }
-        let project_replace = match (project_replace_span, project_replace_value, replace) {
-            (None, _, None) => ProjReplace::None,
-            // If both `project_replace` and `Replace` are specified,
-            // We always prefer `project_replace`'s span,
-            (Some(span), Some(ident), _) => ProjReplace::Named { ident, span },
-            (Some(span), ..) | (None, _, Some(span)) => ProjReplace::Unnamed { span },
-        };
-        let unpin_impl = match (unsafe_unpin, not_unpin) {
-            (None, None) => UnpinImpl::Default,
-            (Some(span), None) => UnpinImpl::Unsafe(span),
-            (None, Some(span)) => UnpinImpl::Negative(span),
-            (Some(span), Some(_)) => {
-                return Err(Error::new(
-                    span,
-                    "arguments `UnsafeUnpin` and `!Unpin` are mutually exclusive",
-                ));
-            }
-        };
-
-        Ok(Self { pinned_drop, unpin_impl, project, project_ref, project_replace })
-    }
-}
-
-struct OriginalType<'a> {
-    /// Attributes of the original type.
-    attrs: &'a [Attribute],
-    /// Visibility of the original type.
-    vis: &'a Visibility,
-    /// Name of the original type.
-    ident: &'a Ident,
-    /// Generics of the original type.
-    generics: &'a Generics,
-}
-
-struct ProjectedType {
-    /// Visibility of the projected types.
-    vis: Visibility,
-    /// Name of the projected type returned by `project` method.
-    mut_ident: Ident,
-    /// Name of the projected type returned by `project_ref` method.
-    ref_ident: Ident,
-    /// Name of the projected type returned by `project_replace` method.
-    own_ident: Ident,
-    /// Lifetime on the generated projected types.
-    lifetime: Lifetime,
-    /// Generics of the projected types.
-    generics: Generics,
-    /// `where` clause of the projected types. This has an additional
-    /// bound generated by `insert_lifetime_and_bound`
-    where_clause: WhereClause,
-}
-
-struct ProjectedVariants {
-    proj_variants: TokenStream,
-    proj_ref_variants: TokenStream,
-    proj_own_variants: TokenStream,
-    proj_arms: TokenStream,
-    proj_ref_arms: TokenStream,
-    proj_own_arms: TokenStream,
-}
-
-#[derive(Default)]
-struct ProjectedFields {
-    proj_pat: TokenStream,
-    proj_body: TokenStream,
-    proj_own_body: TokenStream,
-    proj_fields: TokenStream,
-    proj_ref_fields: TokenStream,
-    proj_own_fields: TokenStream,
-}
-
-struct Context<'a> {
-    /// The original type.
-    orig: OriginalType<'a>,
-    /// The projected types.
-    proj: ProjectedType,
-    /// Types of the pinned fields.
-    pinned_fields: Vec<Type>,
-
-    /// `PinnedDrop` argument.
-    pinned_drop: Option<Span>,
-    /// `UnsafeUnpin` or `!Unpin` argument.
-    unpin_impl: UnpinImpl,
-    /// `project` argument.
-    project: bool,
-    /// `project_ref` argument.
-    project_ref: bool,
-    /// `project_replace [= <ident>]` or `Replace` argument.
-    project_replace: ProjReplace,
-}
-
-#[derive(Clone, Copy)]
-enum UnpinImpl {
-    Default,
-    /// `UnsafeUnpin`.
-    Unsafe(Span),
-    /// `!Unpin`.
-    Negative(Span),
-}
-
-impl<'a> Context<'a> {
-    fn new(
-        attrs: &'a [Attribute],
-        vis: &'a Visibility,
-        ident: &'a Ident,
-        generics: &'a mut Generics,
-    ) -> Result<Self> {
-        let Args { pinned_drop, unpin_impl, project, project_ref, project_replace } =
-            Args::get(attrs)?;
-
-        let mut lifetime_name = String::from("'pin");
-        determine_lifetime_name(&mut lifetime_name, generics);
-        let lifetime = Lifetime::new(&lifetime_name, Span::call_site());
-
-        let ty_generics = generics.split_for_impl().1;
-        let ty_generics_as_generics = parse_quote!(#ty_generics);
-        let mut proj_generics = generics.clone();
-        let pred = insert_lifetime_and_bound(
-            &mut proj_generics,
-            lifetime.clone(),
-            &ty_generics_as_generics,
-            ident,
-        );
-        let mut where_clause = generics.make_where_clause().clone();
-        where_clause.predicates.push(pred);
-
-        let own_ident =
-            project_replace.ident().cloned().unwrap_or_else(|| ProjKind::Owned.proj_ident(ident));
-
-        Ok(Self {
-            pinned_drop,
-            unpin_impl,
-            project: project.is_some(),
-            project_ref: project_ref.is_some(),
-            project_replace,
-            proj: ProjectedType {
-                vis: determine_visibility(vis),
-                mut_ident: project.unwrap_or_else(|| ProjKind::Mutable.proj_ident(ident)),
-                ref_ident: project_ref.unwrap_or_else(|| ProjKind::Immutable.proj_ident(ident)),
-                own_ident,
-                lifetime,
-                generics: proj_generics,
-                where_clause,
-            },
-            orig: OriginalType { attrs, vis, ident, generics },
-            pinned_fields: Vec::new(),
-        })
-    }
-
-    /// Returns attributes used on projected types.
-    fn proj_attrs(&self) -> (TokenStream, TokenStream, TokenStream) {
-        // If the user gave it a name, it should appear in the document.
-        let doc_attr = quote!(#[doc(hidden)]);
-        let doc_proj = if self.project { None } else { Some(&doc_attr) };
-        let doc_proj_ref = if self.project_ref { None } else { Some(&doc_attr) };
-        let doc_proj_own =
-            if self.project_replace.ident().is_some() { None } else { Some(&doc_attr) };
-
-        let proj_mut = quote! {
-            #doc_proj
-            #[allow(dead_code)] // This lint warns unused fields/variants.
-            #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-            #[allow(clippy::mut_mut)] // This lint warns `&mut &mut <ty>`.
-            #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326}
-        };
-        let proj_ref = quote! {
-            #doc_proj_ref
-            #[allow(dead_code)] // This lint warns unused fields/variants.
-            #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-            #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
-        };
-        let proj_own = quote! {
-            #doc_proj_own
-            #[allow(dead_code)] // This lint warns unused fields/variants.
-            #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-            #[allow(unreachable_pub)] // This lint warns `pub` field in private struct.
-        };
-        (proj_mut, proj_ref, proj_own)
-    }
-
-    fn parse_struct(
-        &mut self,
-        DataStruct { fields, .. }: &DataStruct,
-    ) -> Result<(TokenStream, TokenStream)> {
-        validate_struct(self.orig.ident, fields)?;
-
-        let ProjectedFields {
-            proj_pat,
-            proj_body,
-            proj_fields,
-            proj_ref_fields,
-            proj_own_fields,
-            proj_own_body,
-        } = match fields {
-            Fields::Named(_) => self.visit_fields(None, fields, Delimiter::Brace)?,
-            Fields::Unnamed(_) => self.visit_fields(None, fields, Delimiter::Parenthesis)?,
-            Fields::Unit => unreachable!(),
-        };
-
-        let proj_ident = &self.proj.mut_ident;
-        let proj_ref_ident = &self.proj.ref_ident;
-        let proj_own_ident = &self.proj.own_ident;
-        let vis = &self.proj.vis;
-        let mut orig_generics = self.orig.generics.clone();
-        let orig_where_clause = orig_generics.where_clause.take();
-        let proj_generics = &self.proj.generics;
-        let proj_where_clause = &self.proj.where_clause;
-
-        // For tuple structs, we need to generate `(T1, T2) where Foo: Bar`
-        // For non-tuple structs, we need to generate `where Foo: Bar { field1: T }`
-        let (where_clause_fields, where_clause_ref_fields, where_clause_own_fields) = match fields {
-            Fields::Named(_) => (
-                quote!(#proj_where_clause #proj_fields),
-                quote!(#proj_where_clause #proj_ref_fields),
-                quote!(#orig_where_clause #proj_own_fields),
-            ),
-            Fields::Unnamed(_) => (
-                quote!(#proj_fields #proj_where_clause;),
-                quote!(#proj_ref_fields #proj_where_clause;),
-                quote!(#proj_own_fields #orig_where_clause;),
-            ),
-            Fields::Unit => unreachable!(),
-        };
-
-        let (proj_attrs, proj_ref_attrs, proj_own_attrs) = self.proj_attrs();
-        let mut proj_items = quote! {
-            #proj_attrs
-            #vis struct #proj_ident #proj_generics #where_clause_fields
-            #proj_ref_attrs
-            #vis struct #proj_ref_ident #proj_generics #where_clause_ref_fields
-        };
-        if self.project_replace.span().is_some() {
-            proj_items.extend(quote! {
-                #proj_own_attrs
-                #vis struct #proj_own_ident #orig_generics #where_clause_own_fields
-            });
-        }
-
-        let proj_mut_body = quote! {
-            let Self #proj_pat = self.get_unchecked_mut();
-            #proj_ident #proj_body
-        };
-        let proj_ref_body = quote! {
-            let Self #proj_pat = self.get_ref();
-            #proj_ref_ident #proj_body
-        };
-        let proj_own_body = quote! {
-            let __self_ptr: *mut Self = self.get_unchecked_mut();
-            let Self #proj_pat = &mut *__self_ptr;
-            #proj_own_body
-        };
-        let proj_impl = self.make_proj_impl(&proj_mut_body, &proj_ref_body, &proj_own_body);
-
-        Ok((proj_items, proj_impl))
-    }
-
-    fn parse_enum(
-        &mut self,
-        DataEnum { brace_token, variants, .. }: &DataEnum,
-    ) -> Result<(TokenStream, TokenStream)> {
-        validate_enum(*brace_token, variants)?;
-
-        let ProjectedVariants {
-            proj_variants,
-            proj_ref_variants,
-            proj_own_variants,
-            proj_arms,
-            proj_ref_arms,
-            proj_own_arms,
-        } = self.visit_variants(variants)?;
-
-        let proj_ident = &self.proj.mut_ident;
-        let proj_ref_ident = &self.proj.ref_ident;
-        let proj_own_ident = &self.proj.own_ident;
-        let vis = &self.proj.vis;
-        let mut orig_generics = self.orig.generics.clone();
-        let orig_where_clause = orig_generics.where_clause.take();
-        let proj_generics = &self.proj.generics;
-        let proj_where_clause = &self.proj.where_clause;
-
-        let (proj_attrs, proj_ref_attrs, proj_own_attrs) = self.proj_attrs();
-        let mut proj_items = quote! {
-            #proj_attrs
-            #vis enum #proj_ident #proj_generics #proj_where_clause {
-                #proj_variants
-            }
-            #proj_ref_attrs
-            #vis enum #proj_ref_ident #proj_generics #proj_where_clause {
-                #proj_ref_variants
-            }
-        };
-        if self.project_replace.span().is_some() {
-            proj_items.extend(quote! {
-                #proj_own_attrs
-                #vis enum #proj_own_ident #orig_generics #orig_where_clause {
-                    #proj_own_variants
-                }
-            });
-        }
-
-        let proj_mut_body = quote! {
-            match self.get_unchecked_mut() {
-                #proj_arms
-            }
-        };
-        let proj_ref_body = quote! {
-            match self.get_ref() {
-                #proj_ref_arms
-            }
-        };
-        let proj_own_body = quote! {
-            let __self_ptr: *mut Self = self.get_unchecked_mut();
-            match &mut *__self_ptr {
-                #proj_own_arms
-            }
-        };
-        let proj_impl = self.make_proj_impl(&proj_mut_body, &proj_ref_body, &proj_own_body);
-
-        Ok((proj_items, proj_impl))
-    }
-
-    fn visit_variants(&mut self, variants: &Variants) -> Result<ProjectedVariants> {
-        let mut proj_variants = TokenStream::new();
-        let mut proj_ref_variants = TokenStream::new();
-        let mut proj_own_variants = TokenStream::new();
-        let mut proj_arms = TokenStream::new();
-        let mut proj_ref_arms = TokenStream::new();
-        let mut proj_own_arms = TokenStream::new();
-
-        for Variant { ident, fields, .. } in variants {
-            let ProjectedFields {
-                proj_pat,
-                proj_body,
-                proj_fields,
-                proj_ref_fields,
-                proj_own_fields,
-                proj_own_body,
-            } = match fields {
-                Fields::Named(_) => self.visit_fields(Some(ident), fields, Delimiter::Brace)?,
-                Fields::Unnamed(_) => {
-                    self.visit_fields(Some(ident), fields, Delimiter::Parenthesis)?
-                }
-                Fields::Unit => ProjectedFields {
-                    proj_own_body: self.proj_own_body(Some(ident), None, &[]),
-                    ..ProjectedFields::default()
-                },
-            };
-
-            let orig_ident = self.orig.ident;
-            let proj_ident = &self.proj.mut_ident;
-            let proj_ref_ident = &self.proj.ref_ident;
-            proj_variants.extend(quote! {
-                #ident #proj_fields,
-            });
-            proj_ref_variants.extend(quote! {
-                #ident #proj_ref_fields,
-            });
-            proj_own_variants.extend(quote! {
-                #ident #proj_own_fields,
-            });
-            proj_arms.extend(quote! {
-                #orig_ident::#ident #proj_pat => {
-                    #proj_ident::#ident #proj_body
-                }
-            });
-            proj_ref_arms.extend(quote! {
-                #orig_ident::#ident #proj_pat => {
-                    #proj_ref_ident::#ident #proj_body
-                }
-            });
-            proj_own_arms.extend(quote! {
-                #orig_ident::#ident #proj_pat => {
-                    #proj_own_body
-                }
-            });
-        }
-
-        Ok(ProjectedVariants {
-            proj_variants,
-            proj_ref_variants,
-            proj_own_variants,
-            proj_arms,
-            proj_ref_arms,
-            proj_own_arms,
-        })
-    }
-
-    fn visit_fields(
-        &mut self,
-        variant_ident: Option<&Ident>,
-        fields: &Fields,
-        delim: Delimiter,
-    ) -> Result<ProjectedFields> {
-        let mut proj_pat = TokenStream::new();
-        let mut proj_body = TokenStream::new();
-        let mut proj_fields = TokenStream::new();
-        let mut proj_ref_fields = TokenStream::new();
-        let mut proj_own_fields = TokenStream::new();
-        let mut proj_move = TokenStream::new();
-        let mut pinned_bindings = Vec::with_capacity(fields.len());
-
-        for (i, Field { attrs, vis, ident, colon_token, ty, .. }) in fields.iter().enumerate() {
-            let binding = ident.clone().unwrap_or_else(|| format_ident!("_{}", i));
-            proj_pat.extend(quote!(#binding,));
-            if attrs.position_exact(PIN)?.is_some() {
-                let lifetime = &self.proj.lifetime;
-                proj_fields.extend(quote! {
-                    #vis #ident #colon_token ::pin_project::__private::Pin<&#lifetime mut (#ty)>,
-                });
-                proj_ref_fields.extend(quote! {
-                    #vis #ident #colon_token ::pin_project::__private::Pin<&#lifetime (#ty)>,
-                });
-                proj_own_fields.extend(quote! {
-                    #vis #ident #colon_token ::pin_project::__private::PhantomData<#ty>,
-                });
-                proj_body.extend(quote! {
-                    #ident #colon_token ::pin_project::__private::Pin::new_unchecked(#binding),
-                });
-                proj_move.extend(quote! {
-                    #ident #colon_token ::pin_project::__private::PhantomData,
-                });
-
-                self.pinned_fields.push(ty.clone());
-                pinned_bindings.push(binding);
-            } else {
-                let lifetime = &self.proj.lifetime;
-                proj_fields.extend(quote! {
-                    #vis #ident #colon_token &#lifetime mut (#ty),
-                });
-                proj_ref_fields.extend(quote! {
-                    #vis #ident #colon_token &#lifetime (#ty),
-                });
-                proj_own_fields.extend(quote! {
-                    #vis #ident #colon_token #ty,
-                });
-                proj_body.extend(quote! {
-                    #binding,
-                });
-                proj_move.extend(quote! {
-                    #ident #colon_token ::pin_project::__private::ptr::read(#binding),
-                });
-            }
-        }
-
-        fn surround(delim: Delimiter, tokens: TokenStream) -> TokenStream {
-            Group::new(delim, tokens).into_token_stream()
-        }
-
-        let proj_pat = surround(delim, proj_pat);
-        let proj_body = surround(delim, proj_body);
-        let proj_fields = surround(delim, proj_fields);
-        let proj_ref_fields = surround(delim, proj_ref_fields);
-        let proj_own_fields = surround(delim, proj_own_fields);
-
-        let proj_move = Group::new(delim, proj_move);
-        let proj_own_body = self.proj_own_body(variant_ident, Some(proj_move), &pinned_bindings);
-
-        Ok(ProjectedFields {
-            proj_pat,
-            proj_body,
-            proj_own_body,
-            proj_fields,
-            proj_ref_fields,
-            proj_own_fields,
-        })
-    }
-
-    /// Generates the processing that `project_replace` does for the struct or each variant.
-    ///
-    /// Note: `pinned_fields` must be in declaration order.
-    fn proj_own_body(
-        &self,
-        variant_ident: Option<&'a Ident>,
-        proj_move: Option<Group>,
-        pinned_fields: &[Ident],
-    ) -> TokenStream {
-        let ident = &self.proj.own_ident;
-        let proj_own = match variant_ident {
-            Some(variant_ident) => quote!(#ident::#variant_ident),
-            None => quote!(#ident),
-        };
-        // The fields of the struct and the active enum variant are dropped
-        // in declaration order.
-        // Refs: https://doc.rust-lang.org/reference/destructors.html
-        let pinned_fields = pinned_fields.iter().rev();
-
-        quote! {
-            // First, extract all the unpinned fields.
-            let __result = #proj_own #proj_move;
-
-            // Destructors will run in reverse order, so next create a guard to overwrite
-            // `self` with the replacement value without calling destructors.
-            let __guard = ::pin_project::__private::UnsafeOverwriteGuard {
-                target: __self_ptr,
-                value: ::pin_project::__private::ManuallyDrop::new(__replacement),
-            };
-
-            // Now create guards to drop all the pinned fields.
-            //
-            // Due to a compiler bug (https://github.com/rust-lang/rust/issues/47949)
-            // this must be in its own scope, or else `__result` will not be dropped
-            // if any of the destructors panic.
-            {
-                #(
-                    let __guard = ::pin_project::__private::UnsafeDropInPlaceGuard(#pinned_fields);
-                )*
-            }
-
-            // Finally, return the result.
-            __result
-        }
-    }
-
-    /// Creates `Unpin` implementation for original type.
-    fn make_unpin_impl(&self) -> TokenStream {
-        match self.unpin_impl {
-            UnpinImpl::Unsafe(span) => {
-                let mut proj_generics = self.proj.generics.clone();
-                let orig_ident = self.orig.ident;
-                let lifetime = &self.proj.lifetime;
-
-                // Make the error message highlight `UnsafeUnpin` argument.
-                proj_generics.make_where_clause().predicates.push(parse_quote_spanned! { span =>
-                    ::pin_project::__private::Wrapper<#lifetime, Self>: ::pin_project::UnsafeUnpin
-                });
-
-                let (impl_generics, _, where_clause) = proj_generics.split_for_impl();
-                let ty_generics = self.orig.generics.split_for_impl().1;
-
-                quote_spanned! { span =>
-                    impl #impl_generics ::pin_project::__private::Unpin for #orig_ident #ty_generics
-                    #where_clause
-                    {
-                    }
-                }
-            }
-            UnpinImpl::Negative(span) => {
-                let mut proj_generics = self.proj.generics.clone();
-                let orig_ident = self.orig.ident;
-                let lifetime = &self.proj.lifetime;
-
-                proj_generics.make_where_clause().predicates.push(parse_quote! {
-                    ::pin_project::__private::Wrapper<
-                        #lifetime, ::pin_project::__private::PhantomPinned
-                    >: ::pin_project::__private::Unpin
-                });
-
-                let (proj_impl_generics, _, proj_where_clause) = proj_generics.split_for_impl();
-                let (impl_generics, ty_generics, orig_where_clause) =
-                    self.orig.generics.split_for_impl();
-
-                // For interoperability with `forbid(unsafe_code)`, `unsafe` token should be
-                // call-site span.
-                let unsafety = <Token![unsafe]>::default();
-                quote_spanned! { span =>
-                    impl #proj_impl_generics ::pin_project::__private::Unpin
-                        for #orig_ident #ty_generics
-                    #proj_where_clause
-                    {
-                    }
-
-                    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-                    //
-                    // To ensure that users don't accidentally write a non-functional `UnsafeUnpin`
-                    // impls, we emit one ourselves. If the user ends up writing an `UnsafeUnpin`
-                    // impl, they'll get a "conflicting implementations of trait" error when
-                    // coherence checks are run.
-                    #unsafety impl #impl_generics ::pin_project::UnsafeUnpin
-                        for #orig_ident #ty_generics
-                    #orig_where_clause
-                    {
-                    }
-                }
-            }
-            UnpinImpl::Default => {
-                let mut full_where_clause = self.orig.generics.where_clause.clone().unwrap();
-
-                // Generate a field in our new struct for every
-                // pinned field in the original type.
-                let fields = self.pinned_fields.iter().enumerate().map(|(i, ty)| {
-                    let field_ident = format_ident!("__field{}", i);
-                    quote!(#field_ident: #ty)
-                });
-
-                // We could try to determine the subset of type parameters
-                // and lifetimes that are actually used by the pinned fields
-                // (as opposed to those only used by unpinned fields).
-                // However, this would be tricky and error-prone, since
-                // it's possible for users to create types that would alias
-                // with generic parameters (e.g. 'struct T').
-                //
-                // Instead, we generate a use of every single type parameter
-                // and lifetime used in the original struct. For type parameters,
-                // we generate code like this:
-                //
-                // ```rust
-                // struct AlwaysUnpin<T: ?Sized>(PhantomData<T>) {}
-                // impl<T: ?Sized> Unpin for AlwaysUnpin<T> {}
-                //
-                // ...
-                // _field: AlwaysUnpin<(A, B, C)>
-                // ```
-                //
-                // This ensures that any unused type parameters
-                // don't end up with `Unpin` bounds.
-                let lifetime_fields = self.orig.generics.lifetimes().enumerate().map(
-                    |(i, LifetimeDef { lifetime, .. })| {
-                        let field_ident = format_ident!("__lifetime{}", i);
-                        quote!(#field_ident: &#lifetime ())
-                    },
-                );
-
-                let orig_ident = self.orig.ident;
-                let struct_ident = format_ident!("__{}", orig_ident);
-                let vis = self.orig.vis;
-                let lifetime = &self.proj.lifetime;
-                let type_params = self.orig.generics.type_params().map(|t| &t.ident);
-                let proj_generics = &self.proj.generics;
-                let (proj_impl_generics, proj_ty_generics, _) = proj_generics.split_for_impl();
-                let (impl_generics, ty_generics, where_clause) =
-                    self.orig.generics.split_for_impl();
-
-                full_where_clause.predicates.push(parse_quote! {
-                    #struct_ident #proj_ty_generics: ::pin_project::__private::Unpin
-                });
-
-                quote! {
-                    // This needs to have the same visibility as the original type,
-                    // due to the limitations of the 'public in private' error.
-                    //
-                    // Our goal is to implement the public trait `Unpin` for
-                    // a potentially public user type. Because of this, rust
-                    // requires that any types mentioned in the where clause of
-                    // our `Unpin` impl also be public. This means that our generated
-                    // `__UnpinStruct` type must also be public.
-                    // However, we ensure that the user can never actually reference
-                    // this 'public' type by creating this type in the inside of `const`.
-                    #vis struct #struct_ident #proj_generics #where_clause {
-                        __pin_project_use_generics: ::pin_project::__private::AlwaysUnpin<
-                            #lifetime, (#(::pin_project::__private::PhantomData<#type_params>),*)
-                        >,
-
-                        #(#fields,)*
-                        #(#lifetime_fields,)*
-                    }
-
-                    impl #proj_impl_generics ::pin_project::__private::Unpin
-                        for #orig_ident #ty_generics
-                    #full_where_clause
-                    {
-                    }
-
-                    // A dummy impl of `UnsafeUnpin`, to ensure that the user cannot implement it.
-                    //
-                    // To ensure that users don't accidentally write a non-functional `UnsafeUnpin`
-                    // impls, we emit one ourselves. If the user ends up writing an `UnsafeUnpin`
-                    // impl, they'll get a "conflicting implementations of trait" error when
-                    // coherence checks are run.
-                    unsafe impl #impl_generics ::pin_project::UnsafeUnpin
-                        for #orig_ident #ty_generics
-                    #where_clause
-                    {
-                    }
-                }
-            }
-        }
-    }
-
-    /// Creates `Drop` implementation for original type.
-    fn make_drop_impl(&self) -> TokenStream {
-        let ident = self.orig.ident;
-        let (impl_generics, ty_generics, where_clause) = self.orig.generics.split_for_impl();
-
-        if let Some(span) = self.pinned_drop {
-            // For interoperability with `forbid(unsafe_code)`, `unsafe` token should be
-            // call-site span.
-            let unsafety = <Token![unsafe]>::default();
-            quote_spanned! { span =>
-                impl #impl_generics ::pin_project::__private::Drop for #ident #ty_generics
-                #where_clause
-                {
-                    fn drop(&mut self) {
-                        // Safety - we're in 'drop', so we know that 'self' will
-                        // never move again.
-                        let pinned_self = #unsafety {
-                            ::pin_project::__private::Pin::new_unchecked(self)
-                        };
-                        // We call `pinned_drop` only once. Since `PinnedDrop::drop`
-                        // is an unsafe method and a private API, it is never called again in safe
-                        // code *unless the user uses a maliciously crafted macro*.
-                        #unsafety {
-                            ::pin_project::__private::PinnedDrop::drop(pinned_self);
-                        }
-                    }
-                }
-            }
-        } else {
-            // If the user does not provide a `PinnedDrop` impl,
-            // we need to ensure that they don't provide a `Drop` impl of their
-            // own.
-            // Based on https://github.com/upsuper/assert-impl/blob/f503255b292ab0ba8d085b657f4065403cfa46eb/src/lib.rs#L80-L87
-            //
-            // We create a new identifier for each struct, so that the traits
-            // for different types do not conflict with each other.
-            //
-            // Another approach would be to provide an empty Drop impl,
-            // which would conflict with a user-provided Drop impl.
-            // However, this would trigger the compiler's special handling
-            // of Drop types (e.g. fields cannot be moved out of a Drop type).
-            // This approach prevents the creation of needless Drop impls,
-            // giving users more flexibility.
-            let trait_ident = format_ident!("{}MustNotImplDrop", ident);
-
-            quote! {
-                // There are two possible cases:
-                // 1. The user type does not implement Drop. In this case,
-                // the first blanked impl will not apply to it. This code
-                // will compile, as there is only one impl of MustNotImplDrop for the user type
-                // 2. The user type does impl Drop. This will make the blanket impl applicable,
-                // which will then conflict with the explicit MustNotImplDrop impl below.
-                // This will result in a compilation error, which is exactly what we want.
-                trait #trait_ident {}
-                #[allow(clippy::drop_bounds, drop_bounds)]
-                impl<T: ::pin_project::__private::Drop> #trait_ident for T {}
-                impl #impl_generics #trait_ident for #ident #ty_generics #where_clause {}
-
-                // A dummy impl of `PinnedDrop`, to ensure that the user cannot implement it.
-                // Since the user did not pass `PinnedDrop` to `#[pin_project]`, any `PinnedDrop`
-                // impl will not actually be called. Unfortunately, we can't detect this situation
-                // directly from either the `#[pin_project]` or `#[pinned_drop]` attributes, since
-                // we don't know what other attirbutes/impl may exist.
-                //
-                // To ensure that users don't accidentally write a non-functional `PinnedDrop`
-                // impls, we emit one ourselves. If the user ends up writing a `PinnedDrop` impl,
-                // they'll get a "conflicting implementations of trait" error when coherence
-                // checks are run.
-                impl #impl_generics ::pin_project::__private::PinnedDrop for #ident #ty_generics
-                #where_clause
-                {
-                    unsafe fn drop(self: ::pin_project::__private::Pin<&mut Self>) {}
-                }
-            }
-        }
-    }
-
-    /// Creates an implementation of the projection method.
-    fn make_proj_impl(
-        &self,
-        proj_body: &TokenStream,
-        proj_ref_body: &TokenStream,
-        proj_own_body: &TokenStream,
-    ) -> TokenStream {
-        let vis = &self.proj.vis;
-        let lifetime = &self.proj.lifetime;
-        let orig_ident = self.orig.ident;
-        let proj_ident = &self.proj.mut_ident;
-        let proj_ref_ident = &self.proj.ref_ident;
-        let proj_own_ident = &self.proj.own_ident;
-
-        let orig_ty_generics = self.orig.generics.split_for_impl().1;
-        let proj_ty_generics = self.proj.generics.split_for_impl().1;
-        let (impl_generics, ty_generics, where_clause) = self.orig.generics.split_for_impl();
-
-        let replace_impl = self.project_replace.span().map(|span| {
-            // For interoperability with `forbid(unsafe_code)`, `unsafe` token should be
-            // call-site span.
-            let unsafety = <Token![unsafe]>::default();
-            quote_spanned! { span =>
-                #vis fn project_replace(
-                    self: ::pin_project::__private::Pin<&mut Self>,
-                    __replacement: Self,
-                ) -> #proj_own_ident #orig_ty_generics {
-                    #unsafety {
-                        #proj_own_body
-                    }
-                }
-            }
-        });
-
-        quote! {
-            impl #impl_generics #orig_ident #ty_generics #where_clause {
-                #vis fn project<#lifetime>(
-                    self: ::pin_project::__private::Pin<&#lifetime mut Self>,
-                ) -> #proj_ident #proj_ty_generics {
-                    unsafe {
-                        #proj_body
-                    }
-                }
-                #vis fn project_ref<#lifetime>(
-                    self: ::pin_project::__private::Pin<&#lifetime Self>,
-                ) -> #proj_ref_ident #proj_ty_generics {
-                    unsafe {
-                        #proj_ref_body
-                    }
-                }
-                #replace_impl
-            }
-        }
-    }
-
-    fn ensure_not_packed(&self, fields: &Fields) -> Result<TokenStream> {
-        for meta in self.orig.attrs.iter().filter_map(|attr| attr.parse_meta().ok()) {
-            if let Meta::List(list) = meta {
-                if list.path.is_ident("repr") {
-                    for repr in list.nested.iter() {
-                        match repr {
-                            NestedMeta::Meta(Meta::Path(path))
-                            | NestedMeta::Meta(Meta::List(MetaList { path, .. }))
-                                if path.is_ident("packed") =>
-                            {
-                                return Err(error!(
-                                    repr,
-                                    "#[pin_project] attribute may not be used on #[repr(packed)] types"
-                                ));
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-            }
-        }
-
-        // As proc-macro-derive can't rewrite the structure definition,
-        // it's probably no longer necessary, but it keeps it for now.
-
-        // Workaround for https://github.com/taiki-e/pin-project/issues/32
-        // Through the tricky use of proc macros, it's possible to bypass
-        // the above check for the `repr` attribute.
-        // To ensure that it's impossible to use pin projections on a `#[repr(packed)]`
-        // struct, we generate code like this:
-        //
-        // ```rust
-        // #[forbid(safe_packed_borrows)]
-        // fn assert_not_repr_packed(val: &MyStruct) {
-        //     let _field1 = &val.field1;
-        //     let _field2 = &val.field2;
-        //     ...
-        //     let _fieldn = &val.fieldn;
-        // }
-        // ```
-        //
-        // Taking a reference to a packed field is unsafe, and applying
-        // `#[forbid(safe_packed_borrows)]` makes sure that doing this without
-        // an `unsafe` block (which we deliberately do not generate)
-        // is a hard error.
-        //
-        // If the struct ends up having `#[repr(packed)]` applied somehow,
-        // this will generate an (unfriendly) error message. Under all reasonable
-        // circumstances, we'll detect the `#[repr(packed)]` attribute, and generate
-        // a much nicer error above.
-        //
-        // There is one exception: If the type of a struct field has an alignment of 1
-        // (e.g. u8), it is always safe to take a reference to it, even if the struct
-        // is `#[repr(packed)]`. If the struct is composed entirely of types of
-        // alignment 1, our generated method will not trigger an error if the
-        // struct is `#[repr(packed)]`.
-        //
-        // Fortunately, this should have no observable consequence - `#[repr(packed)]`
-        // is essentially a no-op on such a type. Nevertheless, we include a test
-        // to ensure that the compiler doesn't ever try to copy the fields on
-        // such a struct when trying to drop it - which is reason we prevent
-        // `#[repr(packed)]` in the first place.
-        //
-        // See also https://github.com/taiki-e/pin-project/pull/34.
-        let mut field_refs = vec![];
-        match fields {
-            Fields::Named(FieldsNamed { named, .. }) => {
-                for Field { ident, .. } in named {
-                    field_refs.push(quote!(&val.#ident;));
-                }
-            }
-            Fields::Unnamed(FieldsUnnamed { unnamed, .. }) => {
-                for (index, _) in unnamed.iter().enumerate() {
-                    let index = Index::from(index);
-                    field_refs.push(quote!(&val.#index;));
-                }
-            }
-            Fields::Unit => {}
-        }
-
-        let (impl_generics, ty_generics, where_clause) = self.orig.generics.split_for_impl();
-        let ident = self.orig.ident;
-        Ok(quote! {
-            #[forbid(safe_packed_borrows)]
-            fn __assert_not_repr_packed #impl_generics (val: &#ident #ty_generics) #where_clause {
-                #(#field_refs)*
-            }
-        })
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/pin_project/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-mod attribute;
-mod derive;
-
-use proc_macro2::TokenStream;
-
-/// The annotation for pinned type.
-const PIN: &str = "pin";
-
-pub(crate) fn attribute(args: &TokenStream, input: TokenStream) -> TokenStream {
-    attribute::parse_attribute(args, input).unwrap_or_else(|e| e.to_compile_error())
-}
-
-pub(crate) fn derive(input: TokenStream) -> TokenStream {
-    derive::parse_derive(input).unwrap_or_else(|e| e.to_compile_error())
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/project.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/project.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/project.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/project.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,350 +0,0 @@
-use proc_macro2::{Span, TokenStream};
-use quote::ToTokens;
-use syn::{
-    visit_mut::{self, VisitMut},
-    *,
-};
-
-use crate::utils::{
-    determine_lifetime_name, insert_lifetime, parse_as_empty, ProjKind, SliceExt, VecExt,
-};
-
-pub(crate) fn attribute(args: &TokenStream, input: Stmt, kind: ProjKind) -> TokenStream {
-    parse_as_empty(args).and_then(|()| parse(input, kind)).unwrap_or_else(|e| e.to_compile_error())
-}
-
-fn replace_expr(expr: &mut Expr, kind: ProjKind) {
-    match expr {
-        Expr::Match(expr) => {
-            Context::new(kind).replace_expr_match(expr);
-        }
-        Expr::If(expr_if) => {
-            let mut expr_if = expr_if;
-            while let Expr::Let(ref mut expr) = &mut *expr_if.cond {
-                Context::new(kind).replace_expr_let(expr);
-                if let Some((_, ref mut expr)) = expr_if.else_branch {
-                    if let Expr::If(new_expr_if) = &mut **expr {
-                        expr_if = new_expr_if;
-                        continue;
-                    }
-                }
-                break;
-            }
-        }
-        _ => {}
-    }
-}
-
-fn parse(mut stmt: Stmt, kind: ProjKind) -> Result<TokenStream> {
-    match &mut stmt {
-        Stmt::Expr(expr) | Stmt::Semi(expr, _) => replace_expr(expr, kind),
-        Stmt::Local(local) => Context::new(kind).replace_local(local)?,
-        Stmt::Item(Item::Fn(item)) => replace_item_fn(item, kind)?,
-        Stmt::Item(Item::Impl(item)) => replace_item_impl(item, kind)?,
-        Stmt::Item(Item::Use(item)) => replace_item_use(item, kind)?,
-        _ => {}
-    }
-
-    Ok(stmt.into_token_stream())
-}
-
-struct Context {
-    register: Option<(Ident, usize)>,
-    replaced: bool,
-    kind: ProjKind,
-}
-
-impl Context {
-    fn new(kind: ProjKind) -> Self {
-        Self { register: None, replaced: false, kind }
-    }
-
-    fn update(&mut self, ident: &Ident, len: usize) {
-        self.register.get_or_insert_with(|| (ident.clone(), len));
-    }
-
-    fn compare_paths(&self, ident: &Ident, len: usize) -> bool {
-        match &self.register {
-            Some((i, l)) => *l == len && i == ident,
-            None => false,
-        }
-    }
-
-    fn replace_local(&mut self, local: &mut Local) -> Result<()> {
-        if let Some(attr) = local.attrs.find(self.kind.method_name()) {
-            return Err(error!(attr, "duplicate #[{}] attribute", self.kind.method_name()));
-        }
-
-        if let Some(Expr::Match(expr)) = local.init.as_mut().map(|(_, expr)| &mut **expr) {
-            self.replace_expr_match(expr);
-        }
-
-        if self.replaced {
-            if is_replaceable(&local.pat, false) {
-                return Err(error!(
-                    local.pat,
-                    "Both initializer expression and pattern are replaceable, \
-                     you need to split the initializer expression into separate let bindings \
-                     to avoid ambiguity"
-                ));
-            }
-        } else {
-            self.replace_pat(&mut local.pat, false);
-        }
-
-        Ok(())
-    }
-
-    fn replace_expr_let(&mut self, expr: &mut ExprLet) {
-        self.replace_pat(&mut expr.pat, true)
-    }
-
-    fn replace_expr_match(&mut self, expr: &mut ExprMatch) {
-        expr.arms.iter_mut().for_each(|arm| self.replace_pat(&mut arm.pat, true))
-    }
-
-    fn replace_pat(&mut self, pat: &mut Pat, allow_pat_path: bool) {
-        match pat {
-            Pat::Ident(PatIdent { subpat: Some((_, pat)), .. })
-            | Pat::Reference(PatReference { pat, .. })
-            | Pat::Box(PatBox { pat, .. })
-            | Pat::Type(PatType { pat, .. }) => self.replace_pat(pat, allow_pat_path),
-
-            Pat::Or(PatOr { cases, .. }) => {
-                cases.iter_mut().for_each(|pat| self.replace_pat(pat, allow_pat_path))
-            }
-
-            Pat::Struct(PatStruct { path, .. }) | Pat::TupleStruct(PatTupleStruct { path, .. }) => {
-                self.replace_path(path)
-            }
-            Pat::Path(PatPath { qself: None, path, .. }) if allow_pat_path => {
-                self.replace_path(path)
-            }
-            _ => {}
-        }
-    }
-
-    fn replace_path(&mut self, path: &mut Path) {
-        let len = match path.segments.len() {
-            // 1: struct
-            // 2: enum
-            len @ 1 | len @ 2 => len,
-            // other path
-            _ => return,
-        };
-
-        if self.register.is_none() || self.compare_paths(&path.segments[0].ident, len) {
-            self.update(&path.segments[0].ident, len);
-            self.replaced = true;
-            replace_ident(&mut path.segments[0].ident, self.kind);
-        }
-    }
-}
-
-fn is_replaceable(pat: &Pat, allow_pat_path: bool) -> bool {
-    match pat {
-        Pat::Ident(PatIdent { subpat: Some((_, pat)), .. })
-        | Pat::Reference(PatReference { pat, .. })
-        | Pat::Box(PatBox { pat, .. })
-        | Pat::Type(PatType { pat, .. }) => is_replaceable(pat, allow_pat_path),
-
-        Pat::Or(PatOr { cases, .. }) => cases.iter().any(|pat| is_replaceable(pat, allow_pat_path)),
-
-        Pat::Struct(_) | Pat::TupleStruct(_) => true,
-        Pat::Path(PatPath { qself: None, .. }) => allow_pat_path,
-        _ => false,
-    }
-}
-
-fn replace_ident(ident: &mut Ident, kind: ProjKind) {
-    *ident = kind.proj_ident(ident);
-}
-
-fn replace_item_impl(item: &mut ItemImpl, kind: ProjKind) -> Result<()> {
-    if let Some(attr) = item.attrs.find(kind.method_name()) {
-        return Err(error!(attr, "duplicate #[{}] attribute", kind.method_name()));
-    }
-
-    let PathSegment { ident, arguments } = match &mut *item.self_ty {
-        Type::Path(TypePath { qself: None, path }) => path.segments.last_mut().unwrap(),
-        _ => return Ok(()),
-    };
-
-    replace_ident(ident, kind);
-
-    let mut lifetime_name = String::from("'pin");
-    determine_lifetime_name(&mut lifetime_name, &mut item.generics);
-    item.items
-        .iter_mut()
-        .filter_map(|i| if let ImplItem::Method(i) = i { Some(i) } else { None })
-        .for_each(|item| determine_lifetime_name(&mut lifetime_name, &mut item.sig.generics));
-    let lifetime = Lifetime::new(&lifetime_name, Span::call_site());
-
-    insert_lifetime(&mut item.generics, lifetime.clone());
-
-    match arguments {
-        PathArguments::None => {
-            *arguments = PathArguments::AngleBracketed(parse_quote!(<#lifetime>));
-        }
-        PathArguments::AngleBracketed(args) => {
-            args.args.insert(0, parse_quote!(#lifetime));
-        }
-        PathArguments::Parenthesized(_) => unreachable!(),
-    }
-    Ok(())
-}
-
-fn replace_item_fn(item: &mut ItemFn, kind: ProjKind) -> Result<()> {
-    struct FnVisitor(Result<()>);
-
-    impl FnVisitor {
-        fn visit_stmt(&mut self, node: &mut Stmt) -> Result<()> {
-            match node {
-                Stmt::Expr(expr) | Stmt::Semi(expr, _) => self.visit_expr(expr),
-                Stmt::Local(local) => {
-                    visit_mut::visit_local_mut(self, local);
-
-                    let mut prev = None;
-                    for &kind in &ProjKind::ALL {
-                        if let Some(attr) = local.attrs.find_remove(kind.method_name())? {
-                            if let Some(prev) = prev.replace(kind) {
-                                return Err(error!(
-                                    attr,
-                                    "attributes `{}` and `{}` are mutually exclusive",
-                                    prev.method_name(),
-                                    kind.method_name(),
-                                ));
-                            }
-                            Context::new(kind).replace_local(local)?;
-                        }
-                    }
-
-                    Ok(())
-                }
-                // Do not recurse into nested items.
-                Stmt::Item(_) => Ok(()),
-            }
-        }
-
-        fn visit_expr(&mut self, node: &mut Expr) -> Result<()> {
-            visit_mut::visit_expr_mut(self, node);
-            match node {
-                Expr::Match(expr) => {
-                    let mut prev = None;
-                    for &kind in &ProjKind::ALL {
-                        if let Some(attr) = expr.attrs.find_remove(kind.method_name())? {
-                            if let Some(prev) = prev.replace(kind) {
-                                return Err(error!(
-                                    attr,
-                                    "attributes `{}` and `{}` are mutually exclusive",
-                                    prev.method_name(),
-                                    kind.method_name(),
-                                ));
-                            }
-                        }
-                    }
-                    if let Some(kind) = prev {
-                        replace_expr(node, kind);
-                    }
-                }
-                Expr::If(expr_if) => {
-                    if let Expr::Let(_) = &*expr_if.cond {
-                        let mut prev = None;
-                        for &kind in &ProjKind::ALL {
-                            if let Some(attr) = expr_if.attrs.find_remove(kind.method_name())? {
-                                if let Some(prev) = prev.replace(kind) {
-                                    return Err(error!(
-                                        attr,
-                                        "attributes `{}` and `{}` are mutually exclusive",
-                                        prev.method_name(),
-                                        kind.method_name(),
-                                    ));
-                                }
-                            }
-                        }
-                        if let Some(kind) = prev {
-                            replace_expr(node, kind);
-                        }
-                    }
-                }
-                _ => {}
-            }
-            Ok(())
-        }
-    }
-
-    impl VisitMut for FnVisitor {
-        fn visit_stmt_mut(&mut self, node: &mut Stmt) {
-            if self.0.is_err() {
-                return;
-            }
-            if let Err(e) = self.visit_stmt(node) {
-                self.0 = Err(e)
-            }
-        }
-
-        fn visit_expr_mut(&mut self, node: &mut Expr) {
-            if self.0.is_err() {
-                return;
-            }
-            if let Err(e) = self.visit_expr(node) {
-                self.0 = Err(e)
-            }
-        }
-
-        fn visit_item_mut(&mut self, _: &mut Item) {
-            // Do not recurse into nested items.
-        }
-    }
-
-    if let Some(attr) = item.attrs.find(kind.method_name()) {
-        return Err(error!(attr, "duplicate #[{}] attribute", kind.method_name()));
-    }
-
-    let mut visitor = FnVisitor(Ok(()));
-    visitor.visit_block_mut(&mut item.block);
-    visitor.0
-}
-
-fn replace_item_use(item: &mut ItemUse, kind: ProjKind) -> Result<()> {
-    struct UseTreeVisitor {
-        res: Result<()>,
-        kind: ProjKind,
-    }
-
-    impl VisitMut for UseTreeVisitor {
-        fn visit_use_tree_mut(&mut self, node: &mut UseTree) {
-            if self.res.is_err() {
-                return;
-            }
-
-            match node {
-                // Desugar `use tree::<name>` into `tree::__<name>Projection`.
-                UseTree::Name(name) => replace_ident(&mut name.ident, self.kind),
-                UseTree::Glob(glob) => {
-                    self.res = Err(error!(
-                        glob,
-                        "#[{}] attribute may not be used on glob imports",
-                        self.kind.method_name()
-                    ));
-                }
-                UseTree::Rename(rename) => {
-                    self.res = Err(error!(
-                        rename,
-                        "#[{}] attribute may not be used on renamed imports",
-                        self.kind.method_name()
-                    ));
-                }
-                UseTree::Path(_) | UseTree::Group(_) => visit_mut::visit_use_tree_mut(self, node),
-            }
-        }
-    }
-
-    if let Some(attr) = item.attrs.find(kind.method_name()) {
-        return Err(error!(attr, "duplicate #[{}] attribute", kind.method_name()));
-    }
-
-    let mut visitor = UseTreeVisitor { res: Ok(()), kind };
-    visitor.visit_item_use_mut(item);
-    visitor.res
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-internal-0.4.27/src/utils.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,408 +0,0 @@
-use proc_macro2::{Group, Spacing, Span, TokenStream, TokenTree};
-use quote::{format_ident, quote, quote_spanned, ToTokens};
-use std::{iter::FromIterator, mem};
-use syn::{
-    parse::{Parse, ParseBuffer, ParseStream},
-    punctuated::Punctuated,
-    visit_mut::{self, VisitMut},
-    *,
-};
-
-pub(crate) type Variants = Punctuated<Variant, Token![,]>;
-
-macro_rules! error {
-    ($span:expr, $msg:expr) => {
-        syn::Error::new_spanned(&$span, $msg)
-    };
-    ($span:expr, $($tt:tt)*) => {
-        error!($span, format!($($tt)*))
-    };
-}
-
-macro_rules! parse_quote_spanned {
-    ($span:expr => $($tt:tt)*) => {
-        syn::parse2(quote::quote_spanned!($span => $($tt)*)).unwrap_or_else(|e| panic!("{}", e))
-    };
-}
-
-#[derive(Clone, Copy, Eq, PartialEq)]
-pub(crate) enum ProjKind {
-    Mutable,
-    Immutable,
-    Owned,
-}
-
-impl ProjKind {
-    pub(crate) const ALL: [Self; 3] = [ProjKind::Mutable, ProjKind::Immutable, ProjKind::Owned];
-
-    /// Returns the name of the projection method.
-    pub(crate) fn method_name(self) -> &'static str {
-        match self {
-            ProjKind::Mutable => "project",
-            ProjKind::Immutable => "project_ref",
-            ProjKind::Owned => "project_replace",
-        }
-    }
-
-    /// Creates the ident of the projected type from the ident of the original
-    /// type.
-    pub(crate) fn proj_ident(self, ident: &Ident) -> Ident {
-        match self {
-            ProjKind::Mutable => format_ident!("__{}Projection", ident),
-            ProjKind::Immutable => format_ident!("__{}ProjectionRef", ident),
-            ProjKind::Owned => format_ident!("__{}ProjectionOwned", ident),
-        }
-    }
-}
-
-/// Determines the lifetime names. Ensure it doesn't overlap with any existing
-/// lifetime names.
-pub(crate) fn determine_lifetime_name(lifetime_name: &mut String, generics: &mut Generics) {
-    struct CollectLifetimes(Vec<String>);
-
-    impl VisitMut for CollectLifetimes {
-        fn visit_lifetime_def_mut(&mut self, def: &mut LifetimeDef) {
-            self.0.push(def.lifetime.to_string());
-        }
-    }
-
-    debug_assert!(lifetime_name.starts_with('\''));
-
-    let mut lifetimes = CollectLifetimes(Vec::new());
-    lifetimes.visit_generics_mut(generics);
-
-    while lifetimes.0.iter().any(|name| name.starts_with(&**lifetime_name)) {
-        lifetime_name.push('_');
-    }
-}
-
-/// Like `insert_lifetime`, but also generates a bound of the form
-/// `OriginalType<A, B>: 'lifetime`. Used when generating the definition
-/// of a projection type
-pub(crate) fn insert_lifetime_and_bound(
-    generics: &mut Generics,
-    lifetime: Lifetime,
-    orig_generics: &Generics,
-    orig_ident: &Ident,
-) -> WherePredicate {
-    insert_lifetime(generics, lifetime.clone());
-
-    let orig_type: Type = parse_quote!(#orig_ident #orig_generics);
-    let mut punct = Punctuated::new();
-    punct.push(TypeParamBound::Lifetime(lifetime));
-
-    WherePredicate::Type(PredicateType {
-        lifetimes: None,
-        bounded_ty: orig_type,
-        colon_token: <Token![:]>::default(),
-        bounds: punct,
-    })
-}
-
-/// Inserts a `lifetime` at position `0` of `generics.params`.
-pub(crate) fn insert_lifetime(generics: &mut Generics, lifetime: Lifetime) {
-    generics.lt_token.get_or_insert_with(<Token![<]>::default);
-    generics.gt_token.get_or_insert_with(<Token![>]>::default);
-    generics.params.insert(0, LifetimeDef::new(lifetime).into());
-}
-
-/// Determines the visibility of the projected type and projection method.
-pub(crate) fn determine_visibility(vis: &Visibility) -> Visibility {
-    if let Visibility::Public(token) = vis {
-        parse_quote_spanned!(token.pub_token.span => pub(crate))
-    } else {
-        vis.clone()
-    }
-}
-
-/// Check if `tokens` is an empty `TokenStream`.
-/// This is almost equivalent to `syn::parse2::<Nothing>()`, but produces
-/// a better error message and does not require ownership of `tokens`.
-pub(crate) fn parse_as_empty(tokens: &TokenStream) -> Result<()> {
-    if tokens.is_empty() { Ok(()) } else { Err(error!(tokens, "unexpected token: {}", tokens)) }
-}
-
-pub(crate) fn respan<T>(node: &T, span: Span) -> T
-where
-    T: ToTokens + Parse,
-{
-    let tokens = node.to_token_stream();
-    let respanned = respan_tokens(tokens, span);
-    syn::parse2(respanned).unwrap()
-}
-
-fn respan_tokens(tokens: TokenStream, span: Span) -> TokenStream {
-    tokens
-        .into_iter()
-        .map(|mut token| {
-            token.set_span(span);
-            token
-        })
-        .collect()
-}
-
-// =================================================================================================
-// extension traits
-
-pub(crate) trait SliceExt {
-    fn position_exact(&self, ident: &str) -> Result<Option<usize>>;
-    fn find(&self, ident: &str) -> Option<&Attribute>;
-}
-
-pub(crate) trait VecExt {
-    fn find_remove(&mut self, ident: &str) -> Result<Option<Attribute>>;
-}
-
-impl SliceExt for [Attribute] {
-    fn position_exact(&self, ident: &str) -> Result<Option<usize>> {
-        self.iter()
-            .try_fold((0, None), |(i, mut prev), attr| {
-                if attr.path.is_ident(ident) {
-                    if prev.replace(i).is_some() {
-                        return Err(error!(attr, "duplicate #[{}] attribute", ident));
-                    }
-                    parse_as_empty(&attr.tokens)?;
-                }
-                Ok((i + 1, prev))
-            })
-            .map(|(_, pos)| pos)
-    }
-
-    fn find(&self, ident: &str) -> Option<&Attribute> {
-        self.iter().position(|attr| attr.path.is_ident(ident)).and_then(|i| self.get(i))
-    }
-}
-
-impl VecExt for Vec<Attribute> {
-    fn find_remove(&mut self, ident: &str) -> Result<Option<Attribute>> {
-        self.position_exact(ident).map(|pos| pos.map(|i| self.remove(i)))
-    }
-}
-
-pub(crate) trait ParseBufferExt<'a> {
-    fn parenthesized(self) -> Result<ParseBuffer<'a>>;
-}
-
-impl<'a> ParseBufferExt<'a> for ParseStream<'a> {
-    fn parenthesized(self) -> Result<ParseBuffer<'a>> {
-        let content;
-        let _: token::Paren = syn::parenthesized!(content in self);
-        Ok(content)
-    }
-}
-
-impl<'a> ParseBufferExt<'a> for ParseBuffer<'a> {
-    fn parenthesized(self) -> Result<ParseBuffer<'a>> {
-        let content;
-        let _: token::Paren = syn::parenthesized!(content in self);
-        Ok(content)
-    }
-}
-
-// =================================================================================================
-// visitors
-
-// Replace `self`/`Self` with `__self`/`self_ty`.
-// Based on https://github.com/dtolnay/async-trait/blob/0.1.35/src/receiver.rs
-
-pub(crate) struct ReplaceReceiver<'a>(pub(crate) &'a TypePath);
-
-impl ReplaceReceiver<'_> {
-    fn self_ty(&self, span: Span) -> TypePath {
-        respan(self.0, span)
-    }
-
-    fn self_to_qself(&self, qself: &mut Option<QSelf>, path: &mut Path) {
-        if path.leading_colon.is_some() {
-            return;
-        }
-
-        let first = &path.segments[0];
-        if first.ident != "Self" || !first.arguments.is_empty() {
-            return;
-        }
-
-        if path.segments.len() == 1 {
-            self.self_to_expr_path(path);
-            return;
-        }
-
-        let span = first.ident.span();
-        *qself = Some(QSelf {
-            lt_token: Token![<](span),
-            ty: Box::new(self.self_ty(span).into()),
-            position: 0,
-            as_token: None,
-            gt_token: Token![>](span),
-        });
-
-        path.leading_colon = Some(**path.segments.pairs().next().unwrap().punct().unwrap());
-
-        let segments = mem::replace(&mut path.segments, Punctuated::new());
-        path.segments = segments.into_pairs().skip(1).collect();
-    }
-
-    fn self_to_expr_path(&self, path: &mut Path) {
-        if path.leading_colon.is_some() {
-            return;
-        }
-
-        let first = &path.segments[0];
-        if first.ident != "Self" || !first.arguments.is_empty() {
-            return;
-        }
-
-        let self_ty = self.self_ty(first.ident.span());
-        let variant = mem::replace(path, self_ty.path);
-        for segment in &mut path.segments {
-            if let PathArguments::AngleBracketed(bracketed) = &mut segment.arguments {
-                if bracketed.colon2_token.is_none() && !bracketed.args.is_empty() {
-                    bracketed.colon2_token = Some(<Token![::]>::default());
-                }
-            }
-        }
-        if variant.segments.len() > 1 {
-            path.segments.push_punct(<Token![::]>::default());
-            path.segments.extend(variant.segments.into_pairs().skip(1));
-        }
-    }
-
-    fn visit_token_stream(&self, tokens: &mut TokenStream) -> bool {
-        let mut out = Vec::new();
-        let mut modified = false;
-        let mut iter = tokens.clone().into_iter().peekable();
-        while let Some(tt) = iter.next() {
-            match tt {
-                TokenTree::Ident(mut ident) => {
-                    modified |= prepend_underscore_to_self(&mut ident);
-                    if ident == "Self" {
-                        modified = true;
-                        let self_ty = self.self_ty(ident.span());
-                        match iter.peek() {
-                            Some(TokenTree::Punct(p))
-                                if p.as_char() == ':' && p.spacing() == Spacing::Joint =>
-                            {
-                                let next = iter.next().unwrap();
-                                match iter.peek() {
-                                    Some(TokenTree::Punct(p)) if p.as_char() == ':' => {
-                                        let span = ident.span();
-                                        out.extend(quote_spanned!(span=> <#self_ty>))
-                                    }
-                                    _ => out.extend(quote!(#self_ty)),
-                                }
-                                out.push(next);
-                            }
-                            _ => out.extend(quote!(#self_ty)),
-                        }
-                    } else {
-                        out.push(TokenTree::Ident(ident));
-                    }
-                }
-                TokenTree::Group(group) => {
-                    let mut content = group.stream();
-                    modified |= self.visit_token_stream(&mut content);
-                    let mut new = Group::new(group.delimiter(), content);
-                    new.set_span(group.span());
-                    out.push(TokenTree::Group(new));
-                }
-                other => out.push(other),
-            }
-        }
-        if modified {
-            *tokens = TokenStream::from_iter(out);
-        }
-        modified
-    }
-}
-
-impl VisitMut for ReplaceReceiver<'_> {
-    // `Self` -> `Receiver`
-    fn visit_type_mut(&mut self, ty: &mut Type) {
-        if let Type::Path(node) = ty {
-            if node.qself.is_none() && node.path.is_ident("Self") {
-                *ty = self.self_ty(node.path.segments[0].ident.span()).into();
-            } else {
-                self.visit_type_path_mut(node);
-            }
-        } else {
-            visit_mut::visit_type_mut(self, ty);
-        }
-    }
-
-    // `Self::Assoc` -> `<Receiver>::Assoc`
-    fn visit_type_path_mut(&mut self, ty: &mut TypePath) {
-        if ty.qself.is_none() {
-            self.self_to_qself(&mut ty.qself, &mut ty.path);
-        }
-        visit_mut::visit_type_path_mut(self, ty);
-    }
-
-    // `Self::method` -> `<Receiver>::method`
-    fn visit_expr_path_mut(&mut self, expr: &mut ExprPath) {
-        if expr.qself.is_none() {
-            prepend_underscore_to_self(&mut expr.path.segments[0].ident);
-            self.self_to_qself(&mut expr.qself, &mut expr.path);
-        }
-        visit_mut::visit_expr_path_mut(self, expr);
-    }
-
-    fn visit_expr_struct_mut(&mut self, expr: &mut ExprStruct) {
-        self.self_to_expr_path(&mut expr.path);
-        visit_mut::visit_expr_struct_mut(self, expr);
-    }
-
-    fn visit_pat_path_mut(&mut self, pat: &mut PatPath) {
-        if pat.qself.is_none() {
-            self.self_to_qself(&mut pat.qself, &mut pat.path);
-        }
-        visit_mut::visit_pat_path_mut(self, pat);
-    }
-
-    fn visit_pat_struct_mut(&mut self, pat: &mut PatStruct) {
-        self.self_to_expr_path(&mut pat.path);
-        visit_mut::visit_pat_struct_mut(self, pat);
-    }
-
-    fn visit_pat_tuple_struct_mut(&mut self, pat: &mut PatTupleStruct) {
-        self.self_to_expr_path(&mut pat.path);
-        visit_mut::visit_pat_tuple_struct_mut(self, pat);
-    }
-
-    fn visit_item_mut(&mut self, item: &mut Item) {
-        match item {
-            // Visit `macro_rules!` because locally defined macros can refer to `self`.
-            Item::Macro(item) if item.mac.path.is_ident("macro_rules") => {
-                self.visit_macro_mut(&mut item.mac)
-            }
-            // Otherwise, do not recurse into nested items.
-            _ => {}
-        }
-    }
-
-    fn visit_macro_mut(&mut self, mac: &mut Macro) {
-        // We can't tell in general whether `self` inside a macro invocation
-        // refers to the self in the argument list or a different self
-        // introduced within the macro. Heuristic: if the macro input contains
-        // `fn`, then `self` is more likely to refer to something other than the
-        // outer function's self argument.
-        if !contains_fn(mac.tokens.clone()) {
-            self.visit_token_stream(&mut mac.tokens);
-        }
-    }
-}
-
-fn contains_fn(tokens: TokenStream) -> bool {
-    tokens.into_iter().any(|tt| match tt {
-        TokenTree::Ident(ident) => ident == "fn",
-        TokenTree::Group(group) => contains_fn(group.stream()),
-        _ => false,
-    })
-}
-
-pub(crate) fn prepend_underscore_to_self(ident: &mut Ident) -> bool {
-    let modified = ident == "self";
-    if modified {
-        *ident = Ident::new("__self", ident.span());
-    }
-    modified
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"f9bad905c893ac19058b49daec0dece6fac8b2539999296d671b0c6f1a7aea15","Cargo.toml":"a7437d7cea60925113d6ae7272e67b34b55a4d74fd2d7c17745421a2d545811f","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f3f8b744a7fab8d675636ecc8abb4181cbe15c810cbfb39cbf23800f9f0051c1","ci/create-release.sh":"438c342d7ac4378e4b3e88a2ef14f37f9fbd32a55133db3b846f1f15e277fcc6","ci/install-component.sh":"b233719d50f300937f2432685561f3a3e838a6478528a377d466e26279320fa1","ci/install-rust.sh":"565e063ba58c58bc64d8a7bef9a91dace81f950d980bbd6ba0856a5ddac6ef5e","rustfmt.toml":"3103b36257c99c4c0fc5fdd35630418f8f3be59f1daa31fdd32c29f4c57405d2","scripts/README.md":"d8a7a81b5c98ced28bc4429ecf00f981c1f3550595e0f3705ddcd42fb0e9e850","scripts/check-minimal-versions.sh":"ae61c3fdb73c80b7be654599eee79fece085b75617e3f7e4dd0aadf05977de32","scripts/ci.sh":"b139a5e67b5f05876c28a70daa2ec7832252bae9abc6e92f9fc408871595fb60","src/lib.rs":"0822257d4f63c75d2ef099553a1b2edad6bd9e95a5ebb9a138a61026d289732a","tests/auxiliary/mod.rs":"7e263e987e09b77e384f734384a00a71c5b70230bb1b5376446ef003a8da9372","tests/compiletest.rs":"d15696dad41d8cdeb4c3095eb17fba1b1880de3128546306de66a9db0d5d116c","tests/include/basic.rs":"9e399b682bc74c899d26924c2cab52a911f7392e29300defb6521e561fafafe4","tests/lint.rs":"a50e6b205045e296994553a0ad9a142bf6cdec209bf76afb00d04a4070fe8aee","tests/lint.txt":"b0899596fd4210a1bfcb860e4e2dadbc1b5fb1f111e409eb22b610782e99eb4f","tests/proper_unpin.rs":"4089d17e67c0974b9791986625c7871e7fee723432706fbe78459ddbb6f67a59","tests/test.rs":"492101f91971dbf2081aa227ae59f174dc1672d045767fc7ab013839f8d6a105","tests/ui/conflict-drop.rs":"55e6809b5f59dd81e32c2c89b742c0c76db6b099a1d2621e5b882c0d20f92837","tests/ui/conflict-drop.stderr":"b29a458533f0312b2b04e9a0dfea17fce2ba423ef764ec3e2996a315c00a4cf8","tests/ui/conflict-unpin.rs":"51b3b6720fa581b63167d6ac941a1ea1bf739b09954931b2bc2f7abe2d934f26","tests/ui/conflict-unpin.stderr":"ab8e9acab4ffcdff1d0065e9504d64a0220267ab9f18b2840c97da8c0bbbf984","tests/ui/invalid-bounds.rs":"f86f23d377df015182f2f5dae6464a4f98c37f2198e0646f721fedc4017cb82c","tests/ui/invalid-bounds.stderr":"e93d9bc35080dacb837f2e626947b7ec57fea36c0246d839c295a93c33bf7e5b","tests/ui/invalid.rs":"7304bd4a5bac1419382742432cfa8af83535d7be8cfad52c661410e0e9e8207a","tests/ui/invalid.stderr":"a9da7ba0d2dc729137c1736d355c52de1d34fdf10eb4fa35be07b2644d6dfad3","tests/ui/overlapping_lifetime_names.rs":"a64c42cc56fa4751d73a1db80a7deb568427dc96f30c1a29665067d8c0ecb2c9","tests/ui/overlapping_lifetime_names.stderr":"057258cbcd8094c61b9c24b1616e7058bb79721b5aa15d42fc705744fcf0c1dd","tests/ui/overlapping_unpin_struct.rs":"5fde23ef628d2dbd27377ffa472fc19b1c6873122f38c3fb1f84fda8602f55f3","tests/ui/overlapping_unpin_struct.stderr":"e83e99bacdf6564727c77dafe5eaf000b4de6e784e6032b9b0ecca831ecc528c","tests/ui/packed.rs":"12b14e183c809b267f0feff0b6c8bf8d664315e6959d236bd7a0887fc226b9bf","tests/ui/packed.stderr":"f4c443844179d45d7e56a20aae9246fccd38adf0eb9bff1540d3ab0c354c2b6e","tests/ui/unpin_sneaky.rs":"12e97a387ce1af6ee6a567687674aab70e96962a48f2433c39976d0b3e2c3341","tests/ui/unpin_sneaky.stderr":"7b2bc76faca39f77968c798674f2321111a74a5754512149320ea4cdd3e278d5","tests/ui/unsupported.rs":"14defa90e736f314bbbc219973929b77bdd22e5f7e4c4c88403db764f4d167d6","tests/ui/unsupported.stderr":"562db085e5e01dedaa3cb11c592f61f33c5a6388a31e6f1ed9554874cfa2c673"},"package":"6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"ec96e73a38410d7b26282cc53c41aecbbf65d5d799abc1438cb6dc6897188d15","Cargo.toml":"99321d72395cb43843563785603744c25500e127e3aa125c249ba631f0d2b5ee","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"019a22e1809732ec43b9a5e4f664778ea7843173619041314b0b9f887a5df0d5","src/lib.rs":"34951f11e5586e6558a01a34225f2f6b7865c5f59f7378d445c81fd36f9acda6","tests/auxiliary/mod.rs":"7e263e987e09b77e384f734384a00a71c5b70230bb1b5376446ef003a8da9372","tests/compiletest.rs":"e68e2850534f1e590e92216835bbedaf4be2ebaa2371f18a766240dc3a14460a","tests/drop_order.rs":"2cb31a8cd5cf4d9a4ba9faf25f99f0e85f9bd7b4778649f843d9c617c6af43fc","tests/expand/README.md":"060f1800da3356e601ba3995525cfa497b219930fe1dd9a2c5696d9a809b4268","tests/expand/default/enum.expanded.rs":"c3c209d45c02d22873e464a57d7342ec775b002e6f0056481909c8d56038e9be","tests/expand/default/enum.rs":"493d5752c4baa87ed4c48bd41b8e5e263fd5e3f43c4f9195818ef6d26951f63e","tests/expand/default/struct.expanded.rs":"c158632984eaf6ab8ae60b76ff2bf32b20ba10a3cbc4237c9a6ea28c614cdb01","tests/expand/default/struct.rs":"5a6e57d9b6d00cfd4e1e69f37ce0c9d5165a21230d0363f0791665b1015870ce","tests/expand/multifields/enum.expanded.rs":"194b02f37b170f297fa39375cca71c378acf66b1729e2799434c48a5c7e34ace","tests/expand/multifields/enum.rs":"9c79270a7d6d1d42cf8194b579d79e7d44a3fd003243742f0a568ecf0a4f3be3","tests/expand/multifields/struct.expanded.rs":"0c98b4d085237f123c5455d558e495b2754ca84048f63df6416ef271610ee1c0","tests/expand/multifields/struct.rs":"17f0447d522d48f14d516808bd66baacebdf3ac38188df72f649702a893cda68","tests/expand/naming/enum-all.expanded.rs":"c3c209d45c02d22873e464a57d7342ec775b002e6f0056481909c8d56038e9be","tests/expand/naming/enum-all.rs":"493d5752c4baa87ed4c48bd41b8e5e263fd5e3f43c4f9195818ef6d26951f63e","tests/expand/naming/enum-mut.expanded.rs":"ce1a12428d3906c8d98516b3afdcbbbda64776e2f0c039e90f3de8f734ab1878","tests/expand/naming/enum-mut.rs":"c1ff4ade049ebbceb2acb99dbc1af5db14de3ba9710ea1ff1b64348766a9e080","tests/expand/naming/enum-none.expanded.rs":"cf8ea074b8079af453a2f98e2217704e96174433e4ac0e07577f9242ad3d5de2","tests/expand/naming/enum-none.rs":"ff22be4ecf4168e2bc68ab249a0ed809a37e3b8e840ef8977d24209ef28ac839","tests/expand/naming/enum-ref.expanded.rs":"277e9642e49f4dc312ea09b4d9f8012994662f565529865102be0fe1657c2b13","tests/expand/naming/enum-ref.rs":"394cbd5d872449e9226cd0834ce7117c395a582567584218dabbef4eb2c1fbac","tests/expand/naming/struct-all.expanded.rs":"722a17838aa9734f58a23ee15ff478788af5998a1ffc97c28aa040bc50612118","tests/expand/naming/struct-all.rs":"c13c0aacee85b8fca58f85d2d75d2e3907b3e7642f8710ed8c8e54d6015881cc","tests/expand/naming/struct-mut.expanded.rs":"f08b34f7d49ad45ae0a1ae8b64995d63e7e4eed2910a912f6c622a0b8e410b89","tests/expand/naming/struct-mut.rs":"9a7752a6d30e0b7033f3577a72676676900a642cdaf59f942179d1f2a8ba2bb0","tests/expand/naming/struct-none.expanded.rs":"c158632984eaf6ab8ae60b76ff2bf32b20ba10a3cbc4237c9a6ea28c614cdb01","tests/expand/naming/struct-none.rs":"5a6e57d9b6d00cfd4e1e69f37ce0c9d5165a21230d0363f0791665b1015870ce","tests/expand/naming/struct-ref.expanded.rs":"dabc3fda847ab2f4e4ca0ec6f6dc4da43f8de087117dcafb3c15780cebc7af45","tests/expand/naming/struct-ref.rs":"33c4fd344b65650dee44087ada31d4b5acd9d122123360fb7d41718c46699574","tests/expand/pinned_drop/enum.expanded.rs":"56d709a0cfc0c951fe303bf2b034e7fae4fc5271b9a11ade9c6a9c20c89471b3","tests/expand/pinned_drop/enum.rs":"d7e087b6852338fabe7edf39529c8f893a426b4d0c6aba2d2a6be0d95f739cdc","tests/expand/pinned_drop/struct.expanded.rs":"c9b26224339f126ce5f0d36cd8d6c6e84970bf39b94dc11bc42743ad5bdba6be","tests/expand/pinned_drop/struct.rs":"164a25e12b9898c093b5dee2c47a40dd549e6f49ba1c6bb22f4e4c4b98fe76b2","tests/expand/pub/enum.expanded.rs":"56c81c0535f8fb9b83662fc3753f7c07b96eb12392669bb1ae23ffc82b7c4a2c","tests/expand/pub/enum.rs":"5b60dd354a489b0326f5c4f1026b89d1471ddbb45906bc3046a65425c4e5e160","tests/expand/pub/struct.expanded.rs":"525c52bf7185493046618ee0dc1b18bdc0c0a56383f5c7b11c98738211d024a7","tests/expand/pub/struct.rs":"15b7940ce0ad1d5d133dde1870319f2f96a000bfcf29508b8cce1a62876cbd80","tests/expandtest.rs":"898df948c7ee82df0e0823cbde16ccc2b9dba455475665e6d2c7c0a84493e9fb","tests/include/basic.rs":"9e399b682bc74c899d26924c2cab52a911f7392e29300defb6521e561fafafe4","tests/lint.rs":"471a10989664d84bb5d1c8753585de4dd701b2cdc24b71c0cb5f9ea192597c61","tests/proper_unpin.rs":"57a9e8c9029ba7920ec23670b66758916e067c9cecf4d3f8b0035bec25cdb570","tests/test.rs":"b58a8a938938bf46f1f710ecd551292f896f00ff9cbf84987967ed00e5d5107c","tests/ui/pin_project/conflict-drop.rs":"55e6809b5f59dd81e32c2c89b742c0c76db6b099a1d2621e5b882c0d20f92837","tests/ui/pin_project/conflict-drop.stderr":"9bbab8ff00a43104ce46f4e6d8a17b520997fea5a8f1743bab4fa1a995dcd24d","tests/ui/pin_project/conflict-unpin.rs":"51b3b6720fa581b63167d6ac941a1ea1bf739b09954931b2bc2f7abe2d934f26","tests/ui/pin_project/conflict-unpin.stderr":"827cb36a769110dc2844ff5c85d387f96a92ff95ac0066a60465caacb762f100","tests/ui/pin_project/invalid-bounds.rs":"f86f23d377df015182f2f5dae6464a4f98c37f2198e0646f721fedc4017cb82c","tests/ui/pin_project/invalid-bounds.stderr":"27c7b439575503d16617c37e36f5478e3803a5c958c37e438c4f1ce84a3991fe","tests/ui/pin_project/invalid.rs":"7304bd4a5bac1419382742432cfa8af83535d7be8cfad52c661410e0e9e8207a","tests/ui/pin_project/invalid.stderr":"b95ca63870e7687e3b1a1f69e470692d5bc3875c1c27958c6ccec0f636d70ed0","tests/ui/pin_project/overlapping_lifetime_names.rs":"36c849a4570c8c0c32ca6c01aa75afbe1136ef73d45f17eb66175e1936678722","tests/ui/pin_project/overlapping_lifetime_names.stderr":"19d61fbcaa9061224cf0f911d236c3552a5ff93e3cc138f231f267ce4ab92b2e","tests/ui/pin_project/overlapping_unpin_struct.rs":"9a126182d1fe15a30ac60bb223b376aad747d11293d3cf512ad2dce546e3725c","tests/ui/pin_project/overlapping_unpin_struct.stderr":"eb79df698bf9aaca8cd200d0e1064277cf5c56ed833ba7214b7bc78d94d2839c","tests/ui/pin_project/packed.rs":"2ede405a0d101eb843ea83c2836cc8399da54c105776f2c795f3138e03a1e5ef","tests/ui/pin_project/packed.stderr":"2c02336ae457222d87fb28197a8582528051ca13fdb74a615798fdf3da2f3db0","tests/ui/pin_project/unpin_sneaky.rs":"12e97a387ce1af6ee6a567687674aab70e96962a48f2433c39976d0b3e2c3341","tests/ui/pin_project/unpin_sneaky.stderr":"7b2bc76faca39f77968c798674f2321111a74a5754512149320ea4cdd3e278d5","tests/ui/pin_project/unsupported.rs":"14defa90e736f314bbbc219973929b77bdd22e5f7e4c4c88403db764f4d167d6","tests/ui/pin_project/unsupported.stderr":"982da28433932d3ea9458bd543d1c589a81e6011d3be830bf23e26a6f2486e6e","tests/ui/pinned_drop/call-drop-inner.rs":"032260da1fc0e649d97167a8a4ac47eea915000efebdfdc490f050b6f9351027","tests/ui/pinned_drop/call-drop-inner.stderr":"c4998f39aa6a6d18941d0806b0ff693b9f2f0ec3a8056b678e2d78470926634c","tests/ui/pinned_drop/conditional-drop-impl.rs":"0b28c74213cee83e7b27223d7d37f903f79abd3dddcc0f969e14047674908085","tests/ui/pinned_drop/conditional-drop-impl.stderr":"8e416b2c01632c33cec611beb5ffb4817a50b15ad08ab9d0175ee45ba1311900"},"package":"8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,18 +13,20 @@
 [package]
 edition = "2018"
 name = "pin-project-lite"
-version = "0.2.0"
+version = "0.2.7"
 authors = ["Taiki Endo <te316e89@gmail.com>"]
+exclude = ["/.*", "/tools"]
 description = "A lightweight version of pin-project written with declarative macros.\n"
-homepage = "https://github.com/taiki-e/pin-project-lite"
 documentation = "https://docs.rs/pin-project-lite"
-readme = "README.md"
 keywords = ["pin", "macros"]
 categories = ["no-std", "rust-patterns"]
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/taiki-e/pin-project-lite"
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+[dev-dependencies.macrotest]
+version = "1.0.8"
+
 [dev-dependencies.rustversion]
 version = "1"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,14 +4,55 @@
 
 This project adheres to [Semantic Versioning](https://semver.org).
 
+<!--
+Note: In this file, do not use the hard wrap in the middle of a sentence for compatibility with GitHub comment style markdown rendering.
+-->
+
 ## [Unreleased]
 
+## [0.2.7] - 2021-06-26
+
+- [Support custom Drop implementation.](https://github.com/taiki-e/pin-project-lite/pull/25) See [#25](https://github.com/taiki-e/pin-project-lite/pull/25) for details.
+
+## [0.2.6] - 2021-03-04
+
+- [Support item attributes in any order.](https://github.com/taiki-e/pin-project-lite/pull/57)
+
+## [0.2.5] - 2021-03-02
+
+- [Prepare for removal of `safe_packed_borrows` lint.](https://github.com/taiki-e/pin-project-lite/pull/55) See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+## [0.2.4] - 2021-01-11
+
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- [Add `project_replace`.](https://github.com/taiki-e/pin-project-lite/pull/43)
+
+## [0.2.3] - 2021-01-09
+
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- [Suppress `clippy::unknown_clippy_lints` lint in generated code.](https://github.com/taiki-e/pin-project-lite/pull/47)
+
+## [0.2.2] - 2021-01-09
+
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- [Suppress `clippy::ref_option_ref` lint in generated code.](https://github.com/taiki-e/pin-project-lite/pull/45)
+
+## [0.2.1] - 2021-01-05
+
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- Exclude unneeded files from crates.io.
+
 ## [0.2.0] - 2020-11-13
 
-* [`pin_project!` macro now supports enums.][28]
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- [`pin_project!` macro now supports enums.](https://github.com/taiki-e/pin-project-lite/pull/28)
 
-  To use `pin_project!` on enums, you need to name the projection type
-  returned from the method.
+  To use `pin_project!` on enums, you need to name the projection type returned from the method.
 
   ```rust
   use pin_project_lite::pin_project;
@@ -36,7 +77,7 @@
   }
   ```
 
-* [Support naming the projection types.][28]
+- [Support naming the projection types.](https://github.com/taiki-e/pin-project-lite/pull/28)
 
   By passing an attribute with the same name as the method, you can name the projection type returned from the method:
 
@@ -58,86 +99,105 @@
   }
   ```
 
-[28]: https://github.com/taiki-e/pin-project-lite/pull/28
+## [0.1.12] - 2021-03-02
+
+- [Prepare for removal of `safe_packed_borrows` lint.](https://github.com/taiki-e/pin-project-lite/pull/55) See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
 
 ## [0.1.11] - 2020-10-20
 
-* Suppress `clippy::redundant_pub_crate` lint in generated code.
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- Suppress `clippy::redundant_pub_crate` lint in generated code.
 
-* Documentation improvements.
+- Documentation improvements.
 
 ## [0.1.10] - 2020-10-01
 
-* Suppress `drop_bounds` lint, which will be added to rustc in the future. See [taiki-e/pin-project#272](https://github.com/taiki-e/pin-project/issues/272) for more details.
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- Suppress `drop_bounds` lint, which will be added to rustc in the future. See [taiki-e/pin-project#272](https://github.com/taiki-e/pin-project/issues/272) for more details.
 
 ## [0.1.9] - 2020-09-29
 
-* Fix trailing comma support in generics
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- [Fix trailing comma support in generics.](https://github.com/taiki-e/pin-project-lite/pull/32)
 
 ## [0.1.8] - 2020-09-26
 
-* Fix compatibility of generated code with `forbid(future_incompatible)`
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
+- [Fix compatibility of generated code with `forbid(future_incompatible)`.](https://github.com/taiki-e/pin-project-lite/pull/30)
 
   Note: This does not guarantee compatibility with `forbid(future_incompatible)` in the future.
   If rustc adds a new lint, we may not be able to keep this.
 
 ## [0.1.7] - 2020-06-04
 
-* [Support `?Sized` bounds in where clauses.][22]
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
 
-* [Fix lifetime inference error when an associated type is used in fields.][20]
+- [Support `?Sized` bounds in where clauses.](https://github.com/taiki-e/pin-project-lite/pull/22)
 
-* Suppress `clippy::used_underscore_binding` lint in generated code.
+- [Fix lifetime inference error when an associated type is used in fields.](https://github.com/taiki-e/pin-project-lite/pull/20)
 
-* Documentation improvements.
+- Suppress `clippy::used_underscore_binding` lint in generated code.
 
-[20]: https://github.com/taiki-e/pin-project-lite/pull/20
-[22]: https://github.com/taiki-e/pin-project-lite/pull/22
+- Documentation improvements.
 
 ## [0.1.6] - 2020-05-31
 
-* [Support lifetime bounds in where clauses.][18]
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
 
-* Documentation improvements.
+- [Support lifetime bounds in where clauses.](https://github.com/taiki-e/pin-project-lite/pull/18)
 
-[18]: https://github.com/taiki-e/pin-project-lite/pull/18
+- Documentation improvements.
 
 ## [0.1.5] - 2020-05-07
 
-* [Support overwriting the name of core crate.][14]
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
 
-[14]: https://github.com/taiki-e/pin-project-lite/pull/14
+- [Support overwriting the name of `core` crate.](https://github.com/taiki-e/pin-project-lite/pull/14)
 
 ## [0.1.4] - 2020-01-20
 
-* [Support ?Sized bounds in generic parameters.][9]
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
 
-[9]: https://github.com/taiki-e/pin-project-lite/pull/9
+- [Support ?Sized bounds in generic parameters.](https://github.com/taiki-e/pin-project-lite/pull/9)
 
 ## [0.1.3] - 2020-01-20
 
-* [Support lifetime bounds in generic parameters.][7]
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
 
-[7]: https://github.com/taiki-e/pin-project-lite/pull/7
+- [Support lifetime bounds in generic parameters.](https://github.com/taiki-e/pin-project-lite/pull/7)
 
 ## [0.1.2] - 2020-01-05
 
-* [Support recognizing default generic parameters.][6]
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
 
-[6]: https://github.com/taiki-e/pin-project-lite/pull/6
+- [Support recognizing default generic parameters.](https://github.com/taiki-e/pin-project-lite/pull/6)
 
 ## [0.1.1] - 2019-11-15
 
-* [`pin_project!` macro now determines the visibility of the projection type/method is based on the original type.][5]
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
 
-[5]: https://github.com/taiki-e/pin-project-lite/pull/5
+- [`pin_project!` macro now determines the visibility of the projection type/method is based on the original type.](https://github.com/taiki-e/pin-project-lite/pull/5)
 
 ## [0.1.0] - 2019-10-22
 
+**Note: This release has been yanked.** See [#55](https://github.com/taiki-e/pin-project-lite/pull/55) for details.
+
 Initial release
 
-[Unreleased]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.7...HEAD
+[0.2.7]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.6...v0.2.7
+[0.2.6]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.5...v0.2.6
+[0.2.5]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.4...v0.2.5
+[0.2.4]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.3...v0.2.4
+[0.2.3]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.2...v0.2.3
+[0.2.2]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/taiki-e/pin-project-lite/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.11...v0.2.0
+[0.1.12]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.11...v0.1.12
 [0.1.11]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.10...v0.1.11
 [0.1.10]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.9...v0.1.10
 [0.1.9]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.8...v0.1.9
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/ci/create-release.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/ci/create-release.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/ci/create-release.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/ci/create-release.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Create a new GitHub release.
-#
-# Note:
-# - The generated note format is:
-#   "See the [release notes]($LINK_TO_CHANGELOG) for a complete list of changes."
-# - The generated link format is:
-#   "https://github.com/$GITHUB_REPOSITORY/blob/HEAD/CHANGELOG.md#${TAG/v/}---${RELEASE_DATE}"
-# - This script assumes that the format (file name and title of section) of
-#   release notes is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0).
-# - The valid tag format is "vMAJOR.MINOR.PATCH(-PRERELEASE)(+BUILD_METADATA)"
-#   See also Semantic Versioning (https://semver.org)
-# - The release date is based on the time this script was run, the time zone is
-#   the UTC.
-# - The generated link to the release notes will be broken when the version
-#   yanked if the project adheres to the Keep a Changelog's yanking style.
-#   Consider adding a note like the following instead of using the "[YANKED]" tag:
-#   "**Note: This release has been yanked.** See $LINK_TO_YANKED_REASON for details."
-
-set -euo pipefail
-IFS=$'\n\t'
-
-ref="${GITHUB_REF:?}"
-tag="${ref#*/tags/}"
-
-if [[ ! "${tag}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z_0-9\.-]+)?(\+[a-zA-Z_0-9\.-]+)?$ ]]; then
-  echo "error: invalid tag format: ${tag}"
-  exit 1
-elif [[ "${tag}" =~ ^v[0-9\.]+-[a-zA-Z_0-9\.-]+(\+[a-zA-Z_0-9\.-]+)?$ ]]; then
-  prerelease="--prerelease"
-fi
-version="${tag/v/}"
-date=$(date --utc '+%Y-%m-%d')
-title="${version}"
-changelog="https://github.com/${GITHUB_REPOSITORY:?}/blob/HEAD/CHANGELOG.md#${version//./}---${date}"
-notes="See the [release notes](${changelog}) for a complete list of changes."
-
-if [[ -z "${GITHUB_TOKEN:-}" ]]; then
-  echo "GITHUB_TOKEN not set, skipping deploy"
-  exit 1
-else
-  if gh release view "${tag}" &>/dev/null; then
-    gh release delete "${tag}" -y
-  fi
-  gh release create "${tag}" ${prerelease:-} --title "${title}" --notes "${notes}"
-fi
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/ci/install-component.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/ci/install-component.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/ci/install-component.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/ci/install-component.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Install nightly Rust with a given component.
-#
-# If the component is unavailable on the latest nightly,
-# use the latest toolchain with the component available.
-#
-# When using stable Rust, this script is basically unnecessary as almost components available.
-#
-# Refs: https://github.com/rust-lang/rustup-components-history#the-web-part
-
-set -euo pipefail
-IFS=$'\n\t'
-
-package="${1:?}"
-target="${2:-x86_64-unknown-linux-gnu}"
-
-toolchain=nightly-$(curl -sSf https://rust-lang.github.io/rustup-components-history/"${target}"/"${package}")
-
-# shellcheck disable=1090
-"$(cd "$(dirname "${0}")" && pwd)"/install-rust.sh "${toolchain}"
-
-rustup component add "${package}"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/ci/install-rust.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/ci/install-rust.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/ci/install-rust.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/ci/install-rust.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-IFS=$'\n\t'
-
-toolchain="${1:-nightly}"
-
-# --no-self-update is necessary because the windows environment cannot self-update rustup.exe.
-rustup toolchain install "${toolchain}" --no-self-update --profile minimal
-rustup default "${toolchain}"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,10 @@
 # pin-project-lite
 
-[![crates-badge]][crates-url]
-[![docs-badge]][docs-url]
-[![license-badge]][license]
-[![rustc-badge]][rustc-url]
-
-[crates-badge]: https://img.shields.io/crates/v/pin-project-lite.svg
-[crates-url]: https://crates.io/crates/pin-project-lite
-[docs-badge]: https://docs.rs/pin-project-lite/badge.svg
-[docs-url]: https://docs.rs/pin-project-lite
-[license-badge]: https://img.shields.io/badge/license-Apache--2.0%20OR%20MIT-blue.svg
-[license]: #license
-[rustc-badge]: https://img.shields.io/badge/rustc-1.37+-lightgray.svg
-[rustc-url]: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
+[![crates.io](https://img.shields.io/crates/v/pin-project-lite?style=flat-square&logo=rust)](https://crates.io/crates/pin-project-lite)
+[![docs.rs](https://img.shields.io/badge/docs.rs-pin--project--lite-blue?style=flat-square)](https://docs.rs/pin-project-lite)
+[![license](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue?style=flat-square)](#license)
+[![rustc](https://img.shields.io/badge/rustc-1.37+-blue?style=flat-square&logo=rust)](https://www.rust-lang.org)
+[![build status](https://img.shields.io/github/workflow/status/taiki-e/pin-project-lite/CI/main?style=flat-square&logo=github)](https://github.com/taiki-e/pin-project-lite/actions)
 
 A lightweight version of [pin-project] written with declarative macros.
 
@@ -25,11 +17,12 @@
 pin-project-lite = "0.2"
 ```
 
-The current pin-project-lite requires Rust 1.37 or later.
+*Compiler support: requires rustc 1.37+*
 
 ## Examples
 
-[`pin_project!`] macro creates a projection type covering all the fields of struct.
+[`pin_project!`] macro creates a projection type covering all the fields of
+struct.
 
 ```rust
 use pin_project_lite::pin_project;
@@ -84,23 +77,28 @@
 
 ### Similar: Safety
 
-pin-project-lite guarantees safety in much the same way as [pin-project]. Both are completely safe unless you write other unsafe code.
+pin-project-lite guarantees safety in much the same way as [pin-project].
+Both are completely safe unless you write other unsafe code.
 
 ### Different: Minimal design
 
-This library does not tackle as expansive of a range of use cases as [pin-project] does. If your use case is not already covered, please use [pin-project].
+This library does not tackle as expansive of a range of use cases as
+[pin-project] does. If your use case is not already covered, please use
+[pin-project].
 
 ### Different: No proc-macro related dependencies
 
-This is the **only** reason to use this crate. However, **if you already have proc-macro related dependencies in your crate's dependency graph, there is no benefit from using this crate.** (Note: There is almost no difference in the amount of code generated between [pin-project] and pin-project-lite.)
+This is the **only** reason to use this crate. However, **if you already
+have proc-macro related dependencies in your crate's dependency graph, there
+is no benefit from using this crate.** (Note: There is almost no difference
+in the amount of code generated between [pin-project] and pin-project-lite.)
 
 ### Different: No useful error messages
 
-This macro does not handle any invalid input. So error messages are not to be useful in most cases. If you do need useful error messages, then upon error you can pass the same input to [pin-project] to receive a helpful description of the compile error.
-
-### Different: No support for custom Drop implementation
-
-pin-project supports this by [`#[pinned_drop]`][pinned-drop].
+This macro does not handle any invalid input. So error messages are not to
+be useful in most cases. If you do need useful error messages, then upon
+error you can pass the same input to [pin-project] to receive a helpful
+description of the compile error.
 
 ### Different: No support for custom Unpin implementation
 
@@ -113,13 +111,13 @@
 [`pin_project!`]: https://docs.rs/pin-project-lite/0.2/pin_project_lite/macro.pin_project.html
 [not-unpin]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unpin
 [pin-project]: https://github.com/taiki-e/pin-project
-[pinned-drop]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#pinned_drop
 [unsafe-unpin]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unsafeunpin
 
 ## License
 
-Licensed under either of [Apache License, Version 2.0](LICENSE-APACHE) or [MIT license](LICENSE-MIT) at your option.
-
-### Contribution
+Licensed under either of [Apache License, Version 2.0](LICENSE-APACHE) or
+[MIT license](LICENSE-MIT) at your option.
 
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall
+be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Rustfmt configuration
-# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md
-
-# This is required for bug-fixes, which technically can't be made to the stable
-# first version.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3383).
-version = "Two"
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3391)
-error_on_line_overflow = true
-
-# Override the default formatting style.
-# See https://internals.rust-lang.org/t/running-rustfmt-on-rust-lang-rust-and-other-rust-lang-repositories/8732/81.
-use_small_heuristics = "Max"
-# See https://github.com/rust-dev-tools/fmt-rfcs/issues/149.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3370)
-overflow_delimited_expr = true
-
-# Apply rustfmt to more places.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3362).
-merge_imports = true
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3348).
-format_code_in_doc_comments = true
-
-# Set the default settings again to always apply the proper formatting without
-# being affected by the editor settings.
-edition = "2018"
-hard_tabs = false
-newline_style = "Unix"
-tab_spaces = 4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/scripts/check-minimal-versions.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/scripts/check-minimal-versions.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/scripts/check-minimal-versions.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/scripts/check-minimal-versions.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-# Check all public crates with minimal version dependencies.
-#
-# Usage:
-#    bash scripts/check-minimal-versions.sh [+toolchain] [check|test]
-#
-# Note:
-# - This script modifies Cargo.toml and Cargo.lock while running
-# - This script exits with 1 if there are any unstaged changes
-# - This script requires nightly Rust and cargo-hack
-#
-# Refs: https://github.com/rust-lang/cargo/issues/5657
-
-set -euo pipefail
-IFS=$'\n\t'
-
-cd "$(cd "$(dirname "${0}")" && pwd)"/..
-
-# Decide Rust toolchain.
-# Nightly is used by default if the `CI` environment variable is unset.
-if [[ "${1:-}" == "+"* ]]; then
-  toolchain="${1}"
-  shift
-elif [[ -z "${CI:-}" ]]; then
-  toolchain="+nightly"
-fi
-# Make sure toolchain is installed.
-cargo ${toolchain:-} -V >/dev/null
-# This script requires nightly Rust and cargo-hack
-if [[ "${toolchain:-+nightly}" != "+nightly"* ]] || ! cargo hack -V &>/dev/null; then
-  echo "error: check-minimal-versions.sh requires nightly Rust and cargo-hack"
-  exit 1
-fi
-
-# Parse subcommand.
-subcmd="${1:-check}"
-if [[ ! "${subcmd}" =~ check|test ]]; then
-  echo "error: invalid argument \`${1}\`"
-  exit 1
-fi
-
-# This script modifies Cargo.toml and Cargo.lock, so make sure there are no
-# unstaged changes.
-git diff --exit-code
-# Restore original Cargo.toml and Cargo.lock on exit.
-trap 'git checkout .' EXIT
-
-if [[ "${subcmd}" == "check" ]]; then
-  # Remove dev-dependencies from Cargo.toml to prevent the next `cargo update`
-  # from determining minimal versions based on dev-dependencies.
-  cargo hack --remove-dev-deps --workspace
-fi
-
-# Update Cargo.lock to minimal version dependencies.
-cargo ${toolchain:-} update -Z minimal-versions
-# Run check for all public members of the workspace.
-cargo ${toolchain:-} hack "${subcmd}" --workspace --all-features --ignore-private -Z features=all
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/scripts/ci.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/scripts/ci.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/scripts/ci.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/scripts/ci.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# A script to run a simplified version of the checks done by CI.
-#
-# Usage:
-#     bash scripts/ci.sh
-#
-# Note: This script requires nightly Rust, rustfmt, clippy, and cargo-expand
-
-set -euo pipefail
-IFS=$'\n\t'
-
-# Decide Rust toolchain. Nightly is used by default.
-toolchain="+nightly"
-if [[ "${1:-}" == "+"* ]]; then
-  toolchain="${1}"
-  shift
-fi
-# Make sure toolchain is installed.
-cargo "${toolchain}" -V >/dev/null
-
-if [[ "${toolchain:-+nightly}" != "+nightly"* ]] || ! rustfmt -V &>/dev/null || ! cargo clippy -V &>/dev/null || ! cargo expand -V &>/dev/null; then
-  echo "error: ci.sh requires nightly Rust, rustfmt, clippy, and cargo-expand"
-  exit 1
-fi
-
-echo "Running 'cargo ${toolchain} fmt --all'"
-cargo "${toolchain}" fmt --all
-
-echo "Running 'cargo ${toolchain} clippy --all --all-targets'"
-cargo "${toolchain}" clippy --all --all-features --all-targets -Z unstable-options
-
-echo "Running 'cargo ${toolchain} test --all'"
-cargo "${toolchain}" test --all --all-features
-
-echo "Running 'cargo ${toolchain} doc --no-deps --all'"
-cargo "${toolchain}" doc --no-deps --all --all-features
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/scripts/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/scripts/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/scripts/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/scripts/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-This directory contains scripts used by the developers of this project.
-
-Some scripts in this directory are also used in CI, but scripts intended to be used only in CI and scripts not intended to be used directly by the developers are basically in the `ci` directory.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,9 +5,10 @@
 //! [`pin_project!`] macro creates a projection type covering all the fields of struct.
 //!
 //! ```rust
-//! use pin_project_lite::pin_project;
 //! use std::pin::Pin;
 //!
+//! use pin_project_lite::pin_project;
+//!
 //! pin_project! {
 //!     struct Struct<T, U> {
 //!         #[pin]
@@ -29,9 +30,10 @@
 //! returned from the method.
 //!
 //! ```rust
-//! use pin_project_lite::pin_project;
 //! use std::pin::Pin;
 //!
+//! use pin_project_lite::pin_project;
+//!
 //! pin_project! {
 //!     #[project = EnumProj]
 //!     enum Enum<T, U> {
@@ -57,23 +59,28 @@
 //!
 //! ## Similar: Safety
 //!
-//! pin-project-lite guarantees safety in much the same way as [pin-project]. Both are completely safe unless you write other unsafe code.
+//! pin-project-lite guarantees safety in much the same way as [pin-project].
+//! Both are completely safe unless you write other unsafe code.
 //!
 //! ## Different: Minimal design
 //!
-//! This library does not tackle as expansive of a range of use cases as [pin-project] does. If your use case is not already covered, please use [pin-project].
+//! This library does not tackle as expansive of a range of use cases as
+//! [pin-project] does. If your use case is not already covered, please use
+//! [pin-project].
 //!
 //! ## Different: No proc-macro related dependencies
 //!
-//! This is the **only** reason to use this crate. However, **if you already have proc-macro related dependencies in your crate's dependency graph, there is no benefit from using this crate.** (Note: There is almost no difference in the amount of code generated between [pin-project] and pin-project-lite.)
+//! This is the **only** reason to use this crate. However, **if you already
+//! have proc-macro related dependencies in your crate's dependency graph, there
+//! is no benefit from using this crate.** (Note: There is almost no difference
+//! in the amount of code generated between [pin-project] and pin-project-lite.)
 //!
 //! ## Different: No useful error messages
 //!
-//! This macro does not handle any invalid input. So error messages are not to be useful in most cases. If you do need useful error messages, then upon error you can pass the same input to [pin-project] to receive a helpful description of the compile error.
-//!
-//! ## Different: No support for custom Drop implementation
-//!
-//! pin-project supports this by [`#[pinned_drop]`][pinned-drop].
+//! This macro does not handle any invalid input. So error messages are not to
+//! be useful in most cases. If you do need useful error messages, then upon
+//! error you can pass the same input to [pin-project] to receive a helpful
+//! description of the compile error.
 //!
 //! ## Different: No support for custom Unpin implementation
 //!
@@ -85,27 +92,18 @@
 //!
 //! [not-unpin]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unpin
 //! [pin-project]: https://github.com/taiki-e/pin-project
-//! [pinned-drop]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#pinned_drop
 //! [unsafe-unpin]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unsafeunpin
 
 #![no_std]
-#![doc(html_root_url = "https://docs.rs/pin-project-lite/0.2.0")]
 #![doc(test(
     no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms, single_use_lifetimes), allow(dead_code))
+    attr(
+        deny(warnings, rust_2018_idioms, single_use_lifetimes),
+        allow(dead_code, unused_variables)
+    )
 ))]
-#![warn(unsafe_code)]
 #![warn(future_incompatible, rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
-#![warn(clippy::all, clippy::default_trait_access)]
-// mem::take, #[non_exhaustive], and Option::{as_deref, as_deref_mut} require Rust 1.40,
-// matches! requires Rust 1.42, str::{strip_prefix, strip_suffix} requires Rust 1.45
-#![allow(
-    clippy::mem_replace_with_default,
-    clippy::manual_non_exhaustive,
-    clippy::option_as_ref_deref,
-    clippy::match_like_matches_macro,
-    clippy::manual_strip
-)]
+#![warn(clippy::default_trait_access, clippy::wildcard_imports)]
 
 /// A macro that creates a projection type covering all the fields of struct.
 ///
@@ -152,21 +150,16 @@
 /// }
 /// ```
 ///
-/// The `#[project]` (and `#[project_ref]`) attribute must precede the other
-/// attributes except for `#[doc]`. For example, the following code will not be compiled:
+/// By passing the `#[project_replace = MyProjReplace]` attribute you may create an additional
+/// method which allows the contents of `Pin<&mut Self>` to be replaced while simultaneously moving
+/// out all unpinned fields in `Self`.
 ///
-/// ```rust,compile_fail
-/// # use pin_project_lite::pin_project;
+/// ```rust
 /// # use std::pin::Pin;
-/// pin_project! {
-///     /// documents (`#[doc]`) can be placed before `#[project]`.
-///     #[derive(Clone)] // <--- ERROR
-///     #[project = EnumProj]
-///     #[derive(Debug)] // <--- Ok
-///     enum Enum<T> {
-///         Variant { #[pin] field: T },
-///     }
-/// }
+/// # type MyProjReplace = ();
+/// # trait Dox {
+/// fn project_replace(self: Pin<&mut Self>, replacement: Self) -> MyProjReplace;
+/// # }
 /// ```
 ///
 /// Also, note that the projection types returned by `project` and `project_ref` have
@@ -192,9 +185,10 @@
 /// # Examples
 ///
 /// ```rust
-/// use pin_project_lite::pin_project;
 /// use std::pin::Pin;
 ///
+/// use pin_project_lite::pin_project;
+///
 /// pin_project! {
 ///     struct Struct<T, U> {
 ///         #[pin]
@@ -216,9 +210,10 @@
 /// returned from the method.
 ///
 /// ```rust
-/// use pin_project_lite::pin_project;
 /// use std::pin::Pin;
 ///
+/// use pin_project_lite::pin_project;
+///
 /// pin_project! {
 ///     #[project = EnumProj]
 ///     enum Enum<T> {
@@ -247,9 +242,10 @@
 /// consuming the [`Pin`].
 ///
 /// ```rust
-/// use pin_project_lite::pin_project;
 /// use std::pin::Pin;
 ///
+/// use pin_project_lite::pin_project;
+///
 /// pin_project! {
 ///     struct Struct<T> {
 ///         #[pin]
@@ -272,9 +268,10 @@
 /// attribute for a [`PhantomPinned`] field.
 ///
 /// ```rust
-/// use pin_project_lite::pin_project;
 /// use std::marker::PhantomPinned;
 ///
+/// use pin_project_lite::pin_project;
+///
 /// pin_project! {
 ///     struct Struct<T> {
 ///         field: T,
@@ -292,46 +289,9 @@
 /// [pin-project]: https://github.com/taiki-e/pin-project
 #[macro_export]
 macro_rules! pin_project {
-    // Parses options
-    (
-        $(#[doc $($doc:tt)*])*
-        #[project = $proj_mut_ident:ident]
-        #[project_ref = $proj_ref_ident:ident]
-        $($tt:tt)*
-    ) => {
-        $crate::__pin_project_internal! {
-            [$proj_mut_ident][$proj_ref_ident]
-            $(#[doc $($doc)*])*
-            $($tt)*
-        }
-    };
-    (
-        $(#[doc $($doc:tt)*])*
-        #[project = $proj_mut_ident:ident]
-        $($tt:tt)*
-    ) => {
-        $crate::__pin_project_internal! {
-            [$proj_mut_ident][]
-            $(#[doc $($doc)*])*
-            $($tt)*
-        }
-    };
-    (
-        $(#[doc $($doc:tt)*])*
-        #[project_ref = $proj_ref_ident:ident]
-        $($tt:tt)*
-    ) => {
+    ($($tt:tt)*) => {
         $crate::__pin_project_internal! {
-            [][$proj_ref_ident]
-            $(#[doc $($doc)*])*
-            $($tt)*
-        }
-    };
-    (
-        $($tt:tt)*
-    ) => {
-        $crate::__pin_project_internal! {
-            [][]
+            [][][][]
             $($tt)*
         }
     };
@@ -355,6 +315,7 @@
     (@struct=>internal;
         [$($proj_mut_ident:ident)?]
         [$($proj_ref_ident:ident)?]
+        [$($proj_replace_ident:ident)?]
         [$proj_vis:vis]
         [$(#[$attrs:meta])* $vis:vis struct $ident:ident]
         [$($def_generics:tt)*]
@@ -365,6 +326,7 @@
                 $field_vis:vis $field:ident: $field_ty:ty
             ),+
         }
+        $(impl $($pinned_drop:tt)*)?
     ) => {
         $(#[$attrs])*
         $vis struct $ident $($def_generics)*
@@ -402,10 +364,27 @@
                 ),+
             }
         }
+        $crate::__pin_project_internal! { @struct=>make_proj_replace_ty=>named;
+            [$proj_vis]
+            [$($proj_replace_ident)?]
+            [make_proj_field_replace]
+            [$ident]
+            [$($impl_generics)*] [$($ty_generics)*] [$(where $($where_clause)*)?]
+            [$(impl $($pinned_drop)*)?]
+            {
+                $(
+                    $(#[$pin])?
+                    $field_vis $field: $field_ty
+                ),+
+            }
+        }
 
-        #[allow(explicit_outlives_requirements)]
+        #[allow(explicit_outlives_requirements)] // https://github.com/rust-lang/rust/issues/60993
         #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-        #[allow(clippy::redundant_pub_crate)]
+        // This lint warns of `clippy::*` generated by external macros.
+        // We allow this lint for compatibility with older compilers.
+        #[allow(clippy::unknown_clippy_lints)]
+        #[allow(clippy::redundant_pub_crate)] // This lint warns `pub(crate)` field in private struct.
         #[allow(clippy::used_underscore_binding)]
         const _: () = {
             $crate::__pin_project_internal! { @struct=>make_proj_ty=>unnamed;
@@ -434,6 +413,20 @@
                     ),+
                 }
             }
+            $crate::__pin_project_internal! { @struct=>make_proj_replace_ty=>unnamed;
+                [$proj_vis]
+                [$($proj_replace_ident)?][ProjectionReplace]
+                [make_proj_field_replace]
+                [$ident]
+                [$($impl_generics)*] [$($ty_generics)*] [$(where $($where_clause)*)?]
+                [$(impl $($pinned_drop)*)?]
+                {
+                    $(
+                        $(#[$pin])?
+                        $field_vis $field: $field_ty
+                    ),+
+                }
+            }
 
             impl <$($impl_generics)*> $ident <$($ty_generics)*>
             $(where
@@ -463,6 +456,17 @@
                         ),+
                     }
                 }
+                $crate::__pin_project_internal! { @struct=>make_proj_replace_method;
+                    [$proj_vis]
+                    [$($proj_replace_ident)?][ProjectionReplace]
+                    [$($ty_generics)*]
+                    {
+                        $(
+                            $(#[$pin])?
+                            $field_vis $field
+                        ),+
+                    }
+                }
             }
 
             $crate::__pin_project_internal! { @make_unpin_impl;
@@ -478,14 +482,13 @@
             $crate::__pin_project_internal! { @make_drop_impl;
                 [$ident]
                 [$($impl_generics)*] [$($ty_generics)*] [$(where $($where_clause)*)?]
+                $(impl $($pinned_drop)*)?
             }
 
             // Ensure that it's impossible to use pin projections on a #[repr(packed)] struct.
             //
-            // Taking a reference to a packed field is unsafe, amd appplying
-            // #[forbid(safe_packed_borrows)] makes sure that doing this without
-            // an 'unsafe' block (which we deliberately do not generate)
-            // is a hard error.
+            // Taking a reference to a packed field is UB, and applying
+            // `#[forbid(unaligned_references)]` makes sure that doing this is a hard error.
             //
             // If the struct ends up having #[repr(packed)] applied somehow,
             // this will generate an (unfriendly) error message. Under all reasonable
@@ -493,7 +496,16 @@
             // a much nicer error above.
             //
             // See https://github.com/taiki-e/pin-project/pull/34 for more details.
-            #[forbid(safe_packed_borrows)]
+            //
+            // Note:
+            // - Lint-based tricks aren't perfect, but they're much better than nothing:
+            //   https://github.com/taiki-e/pin-project-lite/issues/26
+            //
+            // - Enable both unaligned_references and safe_packed_borrows lints
+            //   because unaligned_references lint does not exist in older compilers:
+            //   https://github.com/taiki-e/pin-project-lite/pull/55
+            //   https://github.com/rust-lang/rust/pull/82525
+            #[forbid(unaligned_references, safe_packed_borrows)]
             fn __assert_not_repr_packed <$($impl_generics)*> (this: &$ident <$($ty_generics)*>)
             $(where
                 $($where_clause)*)?
@@ -509,6 +521,7 @@
     (@enum=>internal;
         [$($proj_mut_ident:ident)?]
         [$($proj_ref_ident:ident)?]
+        [$($proj_replace_ident:ident)?]
         [$proj_vis:vis]
         [$(#[$attrs:meta])* $vis:vis enum $ident:ident]
         [$($def_generics:tt)*]
@@ -524,6 +537,7 @@
                 })?
             ),+
         }
+        $(impl $($pinned_drop:tt)*)?
     ) => {
         $(#[$attrs])*
         $vis enum $ident $($def_generics)*
@@ -574,8 +588,29 @@
                 ),+
             }
         }
+        $crate::__pin_project_internal! { @enum=>make_proj_replace_ty;
+            [$proj_vis]
+            [$($proj_replace_ident)?]
+            [make_proj_field_replace]
+            [$ident]
+            [$($impl_generics)*] [$($ty_generics)*] [$(where $($where_clause)*)?]
+            [$(impl $($pinned_drop)*)?]
+            {
+                $(
+                    $variant $({
+                        $(
+                            $(#[$pin])?
+                            $field: $field_ty
+                        ),+
+                    })?
+                ),+
+            }
+        }
 
         #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
+        // This lint warns of `clippy::*` generated by external macros.
+        // We allow this lint for compatibility with older compilers.
+        #[allow(clippy::unknown_clippy_lints)]
         #[allow(clippy::used_underscore_binding)]
         const _: () = {
             impl <$($impl_generics)*> $ident <$($ty_generics)*>
@@ -614,6 +649,21 @@
                         ),+
                     }
                 }
+                $crate::__pin_project_internal! { @enum=>make_proj_replace_method;
+                    [$proj_vis]
+                    [$($proj_replace_ident)?]
+                    [$($ty_generics)*]
+                    {
+                        $(
+                            $variant $({
+                                $(
+                                    $(#[$pin])?
+                                    $field
+                                ),+
+                            })?
+                        ),+
+                    }
+                }
             }
 
             $crate::__pin_project_internal! { @make_unpin_impl;
@@ -633,6 +683,7 @@
             $crate::__pin_project_internal! { @make_drop_impl;
                 [$ident]
                 [$($impl_generics)*] [$($ty_generics)*] [$(where $($where_clause)*)?]
+                $(impl $($pinned_drop)*)?
             }
 
             // We don't need to check for '#[repr(packed)]',
@@ -682,8 +733,12 @@
     ) => {
         #[allow(dead_code)] // This lint warns unused fields/variants.
         #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
+        // This lint warns of `clippy::*` generated by external macros.
+        // We allow this lint for compatibility with older compilers.
+        #[allow(clippy::unknown_clippy_lints)]
         #[allow(clippy::mut_mut)] // This lint warns `&mut &mut <ty>`. (only needed for project)
-        #[allow(clippy::redundant_pub_crate)]
+        #[allow(clippy::redundant_pub_crate)] // This lint warns `pub(crate)` field in private struct.
+        #[allow(clippy::ref_option_ref)] // This lint warns `&Option<&<ty>>`. (only needed for project_ref)
         #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
         $proj_vis struct $proj_ty_ident <'__pin, $($impl_generics)*>
         where
@@ -705,6 +760,64 @@
         [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
         $($field:tt)*
     ) => {};
+
+    (@struct=>make_proj_replace_ty=>unnamed;
+        [$proj_vis:vis]
+        [$_proj_ty_ident:ident][$proj_ty_ident:ident]
+        [$make_proj_field:ident]
+        [$ident:ident]
+        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
+        [$(impl $($pinned_drop:tt)*)?]
+        $($field:tt)*
+    ) => {};
+    (@struct=>make_proj_replace_ty=>unnamed;
+        [$proj_vis:vis]
+        [][$proj_ty_ident:ident]
+        [$make_proj_field:ident]
+        [$ident:ident]
+        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
+        [$(impl $($pinned_drop:tt)*)?]
+        $($field:tt)*
+    ) => {};
+    (@struct=>make_proj_replace_ty=>named;
+        [$proj_vis:vis]
+        [$proj_ty_ident:ident]
+        [$make_proj_field:ident]
+        [$ident:ident]
+        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
+        []
+        {
+            $(
+                $(#[$pin:ident])?
+                $field_vis:vis $field:ident: $field_ty:ty
+            ),+
+        }
+    ) => {
+        #[allow(dead_code)] // This lint warns unused fields/variants.
+        #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
+        #[allow(clippy::mut_mut)] // This lint warns `&mut &mut <ty>`. (only needed for project)
+        #[allow(clippy::redundant_pub_crate)] // This lint warns `pub(crate)` field in private struct.
+        #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
+        $proj_vis struct $proj_ty_ident <$($impl_generics)*>
+        where
+            $($($where_clause)*)?
+        {
+            $(
+                $field_vis $field: $crate::__pin_project_internal!(@$make_proj_field;
+                    $(#[$pin])? $field_ty
+                )
+            ),+
+        }
+    };
+    (@struct=>make_proj_replace_ty=>named;
+        [$proj_vis:vis]
+        []
+        [$make_proj_field:ident]
+        [$ident:ident]
+        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
+        [$(impl $($pinned_drop:tt)*)?]
+        $($field:tt)*
+    ) => {};
     // =============================================================================================
     // enum:make_proj_ty
     (@enum=>make_proj_ty;
@@ -726,8 +839,12 @@
     ) => {
         #[allow(dead_code)] // This lint warns unused fields/variants.
         #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
+        // This lint warns of `clippy::*` generated by external macros.
+        // We allow this lint for compatibility with older compilers.
+        #[allow(clippy::unknown_clippy_lints)]
         #[allow(clippy::mut_mut)] // This lint warns `&mut &mut <ty>`. (only needed for project)
-        #[allow(clippy::redundant_pub_crate)]
+        #[allow(clippy::redundant_pub_crate)] // This lint warns `pub(crate)` field in private struct.
+        #[allow(clippy::ref_option_ref)] // This lint warns `&Option<&<ty>>`. (only needed for project_ref)
         #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
         $proj_vis enum $proj_ty_ident <'__pin, $($impl_generics)*>
         where
@@ -754,6 +871,88 @@
         $($variant:tt)*
     ) => {};
 
+    (@enum=>make_proj_replace_ty;
+        [$proj_vis:vis]
+        [$proj_ty_ident:ident]
+        [$make_proj_field:ident]
+        [$ident:ident]
+        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
+        []
+        {
+            $(
+                $variant:ident $({
+                    $(
+                        $(#[$pin:ident])?
+                        $field:ident: $field_ty:ty
+                    ),+
+                })?
+            ),+
+        }
+    ) => {
+        #[allow(dead_code)] // This lint warns unused fields/variants.
+        #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
+        #[allow(clippy::mut_mut)] // This lint warns `&mut &mut <ty>`. (only needed for project)
+        #[allow(clippy::redundant_pub_crate)] // This lint warns `pub(crate)` field in private struct.
+        #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
+        $proj_vis enum $proj_ty_ident <$($impl_generics)*>
+        where
+            $($($where_clause)*)?
+        {
+            $(
+                $variant $({
+                    $(
+                        $field: $crate::__pin_project_internal!(@$make_proj_field;
+                            $(#[$pin])? $field_ty
+                        )
+                    ),+
+                })?
+            ),+
+        }
+    };
+    (@enum=>make_proj_replace_ty;
+        [$proj_vis:vis]
+        []
+        [$make_proj_field:ident]
+        [$ident:ident]
+        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
+        [$(impl $($pinned_drop:tt)*)?]
+        $($variant:tt)*
+    ) => {};
+
+    // =============================================================================================
+    (@make_proj_replace_block;
+        [$($proj_path: tt)+]
+        {
+            $(
+                $(#[$pin:ident])?
+                $field_vis:vis $field:ident
+            ),+
+        }
+    ) => {
+        let result = $($proj_path)* {
+            $(
+                $field: $crate::__pin_project_internal!(@make_replace_field_proj;
+                    $(#[$pin])? $field
+                )
+            ),+
+        };
+
+        {
+            ( $(
+                $crate::__pin_project_internal!(@make_unsafe_drop_in_place_guard;
+                    $(#[$pin])? $field
+                ),
+            )* );
+        }
+
+        result
+    };
+    (@make_proj_replace_block;
+        [$($proj_path: tt)+]
+    ) => {
+        $($proj_path)*
+    };
+
     // =============================================================================================
     // struct:make_proj_method
     (@struct=>make_proj_method;
@@ -798,6 +997,54 @@
             $($variant)*
         }
     };
+
+    (@struct=>make_proj_replace_method;
+        [$proj_vis:vis]
+        [$proj_ty_ident:ident][$_proj_ty_ident:ident]
+        [$($ty_generics:tt)*]
+        {
+            $(
+                $(#[$pin:ident])?
+                $field_vis:vis $field:ident
+            ),+
+        }
+    ) => {
+        $proj_vis fn project_replace(
+            self: $crate::__private::Pin<&mut Self>,
+            replacement: Self,
+        ) -> $proj_ty_ident <$($ty_generics)*> {
+            unsafe {
+                let __self_ptr: *mut Self = self.get_unchecked_mut();
+
+                // Destructors will run in reverse order, so next create a guard to overwrite
+                // `self` with the replacement value without calling destructors.
+                let __guard = $crate::__private::UnsafeOverwriteGuard {
+                    target: __self_ptr,
+                    value: $crate::__private::ManuallyDrop::new(replacement),
+                };
+
+                let Self { $($field),* } = &mut *__self_ptr;
+
+                $crate::__pin_project_internal!{@make_proj_replace_block;
+                    [$proj_ty_ident]
+                    {
+                        $(
+                            $(#[$pin])?
+                            $field
+                        ),+
+                    }
+                }
+            }
+        }
+    };
+    (@struct=>make_proj_replace_method;
+        [$proj_vis:vis]
+        [][$proj_ty_ident:ident]
+        [$($ty_generics:tt)*]
+        $($variant:tt)*
+    ) => {
+    };
+
     // =============================================================================================
     // enum:make_proj_method
     (@enum=>make_proj_method;
@@ -847,6 +1094,62 @@
         $($variant:tt)*
     ) => {};
 
+    (@enum=>make_proj_replace_method;
+        [$proj_vis:vis]
+        [$proj_ty_ident:ident]
+        [$($ty_generics:tt)*]
+        {
+            $(
+                $variant:ident $({
+                    $(
+                        $(#[$pin:ident])?
+                        $field:ident
+                    ),+
+                })?
+            ),+
+        }
+    ) => {
+        $proj_vis fn project_replace(
+            self: $crate::__private::Pin<&mut Self>,
+            replacement: Self,
+        ) -> $proj_ty_ident <$($ty_generics)*> {
+            unsafe {
+                let __self_ptr: *mut Self = self.get_unchecked_mut();
+
+                // Destructors will run in reverse order, so next create a guard to overwrite
+                // `self` with the replacement value without calling destructors.
+                let __guard = $crate::__private::UnsafeOverwriteGuard {
+                    target: __self_ptr,
+                    value: $crate::__private::ManuallyDrop::new(replacement),
+                };
+
+                match &mut *__self_ptr {
+                    $(
+                        Self::$variant $({
+                            $($field),+
+                        })? => {
+                            $crate::__pin_project_internal!{@make_proj_replace_block;
+                                [$proj_ty_ident :: $variant]
+                                $({
+                                    $(
+                                        $(#[$pin])?
+                                        $field
+                                    ),+
+                                })?
+                            }
+                        }
+                    ),+
+                }
+            }
+        }
+    };
+    (@enum=>make_proj_replace_method;
+        [$proj_vis:vis]
+        []
+        [$($ty_generics:tt)*]
+        $($variant:tt)*
+    ) => {};
+
     // =============================================================================================
     // make_unpin_impl
     (@make_unpin_impl;
@@ -868,11 +1171,11 @@
         // this will become a lint, rather then a hard error.
         //
         // As a workaround for this, we generate a new struct, containing all of the pinned
-        // fields from our #[pin_project] type. This struct is delcared within
+        // fields from our #[pin_project] type. This struct is declared within
         // a function, which makes it impossible to be named by user code.
-        // This guarnatees that it will use the default auto-trait impl for Unpin -
+        // This guarantees that it will use the default auto-trait impl for Unpin -
         // that is, it will implement Unpin iff all of its fields implement Unpin.
-        // This type can be safely declared as 'public', satisfiying the privacy
+        // This type can be safely declared as 'public', satisfying the privacy
         // checker without actually allowing user code to access it.
         //
         // This allows users to apply the #[pin_project] attribute to types
@@ -898,6 +1201,90 @@
     // =============================================================================================
     // make_drop_impl
     (@make_drop_impl;
+        [$_ident:ident]
+        [$($_impl_generics:tt)*] [$($_ty_generics:tt)*] [$(where $($_where_clause:tt)* )?]
+        impl $(<
+            $( $lifetime:lifetime $(: $lifetime_bound:lifetime)? ),* $(,)?
+            $( $generics:ident
+                $(: $generics_bound:path)?
+                $(: ?$generics_unsized_bound:path)?
+                $(: $generics_lifetime_bound:lifetime)?
+            ),*
+        >)? PinnedDrop for $self_ty:ty
+        $(where
+            $( $where_clause_ty:ty
+                $(: $where_clause_bound:path)?
+                $(: ?$where_clause_unsized_bound:path)?
+                $(: $where_clause_lifetime_bound:lifetime)?
+            ),*
+        )?
+        {
+            fn drop($($arg:ident)+: Pin<&mut Self>) {
+                $($tt:tt)*
+            }
+        }
+    ) => {
+        impl $(<
+            $( $lifetime $(: $lifetime_bound)? ,)*
+            $( $generics
+                $(: $generics_bound)?
+                $(: ?$generics_unsized_bound)?
+                $(: $generics_lifetime_bound)?
+            ),*
+        >)? $crate::__private::Drop for $self_ty
+        $(where
+            $( $where_clause_ty
+                $(: $where_clause_bound)?
+                $(: ?$where_clause_unsized_bound)?
+                $(: $where_clause_lifetime_bound)?
+            ),*
+        )?
+        {
+            fn drop(&mut self) {
+                // Implementing `__DropInner::__drop_inner` is safe, but calling it is not safe.
+                // This is because destructors can be called multiple times in safe code and
+                // [double dropping is unsound](https://github.com/rust-lang/rust/pull/62360).
+                //
+                // `__drop_inner` is defined as a safe method, but this is fine since
+                // `__drop_inner` is not accessible by the users and we call `__drop_inner` only
+                // once.
+                //
+                // Users can implement [`Drop`] safely using `pin_project!` and can drop a
+                // type that implements `PinnedDrop` using the [`drop`] function safely.
+                fn __drop_inner $(<
+                    $( $lifetime $(: $lifetime_bound)? ,)*
+                    $( $generics
+                        $(: $generics_bound)?
+                        $(: ?$generics_unsized_bound)?
+                        $(: $generics_lifetime_bound)?
+                    ),*
+                >)? (
+                    $($arg)+: $crate::__private::Pin<&mut $self_ty>,
+                )
+                $(where
+                    $( $where_clause_ty
+                        $(: $where_clause_bound)?
+                        $(: ?$where_clause_unsized_bound)?
+                        $(: $where_clause_lifetime_bound)?
+                    ),*
+                )?
+                {
+                    // A dummy `__drop_inner` function to prevent users call outer `__drop_inner`.
+                    fn __drop_inner() {}
+                    $($tt)*
+                }
+
+                // Safety - we're in 'drop', so we know that 'self' will
+                // never move again.
+                let pinned_self: $crate::__private::Pin<&mut Self>
+                    = unsafe { $crate::__private::Pin::new_unchecked(self) };
+                // We call `__drop_inner` only once. Since `__DropInner::__drop_inner`
+                // is not accessible by the users, it is never called again.
+                __drop_inner(pinned_self);
+            }
+        }
+    };
+    (@make_drop_impl;
         [$ident:ident]
         [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
     ) => {
@@ -908,7 +1295,7 @@
         // the first blanked impl will not apply to it. This code
         // will compile, as there is only one impl of MustNotImplDrop for the user type
         // 2. The user type does impl Drop. This will make the blanket impl applicable,
-        // which will then comflict with the explicit MustNotImplDrop impl below.
+        // which will then conflict with the explicit MustNotImplDrop impl below.
         // This will result in a compilation error, which is exactly what we want.
         trait MustNotImplDrop {}
         #[allow(clippy::drop_bounds, drop_bounds)]
@@ -949,6 +1336,35 @@
     };
 
     // =============================================================================================
+    // make_replace_field_proj
+    (@make_replace_field_proj;
+        #[pin]
+        $field:ident
+    ) => {
+        $crate::__private::PhantomData
+    };
+    (@make_replace_field_proj;
+        $field:ident
+    ) => {
+        $crate::__private::ptr::read($field)
+    };
+
+
+    // =============================================================================================
+    // make_unsafe_drop_in_place_guard
+    (@make_unsafe_drop_in_place_guard;
+        #[pin]
+        $field:ident
+    ) => {
+        $crate::__private::UnsafeDropInPlaceGuard($field)
+    };
+    (@make_unsafe_drop_in_place_guard;
+        $field:ident
+    ) => {
+        ()
+    };
+
+    // =============================================================================================
     // make_proj_field
     (@make_proj_field_mut;
         #[pin]
@@ -973,14 +1389,100 @@
         &'__pin ($field_ty)
     };
 
+    (@make_proj_field_replace;
+        #[pin]
+        $field_ty:ty
+    ) => {
+        $crate::__private::PhantomData<$field_ty>
+    };
+    (@make_proj_field_replace;
+        $field_ty:ty
+    ) => {
+        $field_ty
+    };
+
     // =============================================================================================
     // Parses input and determines visibility
+
+    (
+        []
+        [$($proj_ref_ident:ident)?]
+        [$($proj_replace_ident:ident)?]
+        [$($attrs:tt)*]
+
+        #[project = $proj_mut_ident:ident]
+        $($tt:tt)*
+    ) => {
+        $crate::__pin_project_internal! {
+            [$proj_mut_ident]
+            [$($proj_ref_ident)?]
+            [$($proj_replace_ident)?]
+            [$($attrs)*]
+            $($tt)*
+        }
+    };
+
+    {
+        [$($proj_mut_ident:ident)?]
+        []
+        [$($proj_replace_ident:ident)?]
+        [$($attrs:tt)*]
+
+        #[project_ref = $proj_ref_ident:ident]
+        $($tt:tt)*
+    } => {
+        $crate::__pin_project_internal! {
+            [$($proj_mut_ident)?]
+            [$proj_ref_ident]
+            [$($proj_replace_ident)?]
+            [$($attrs)*]
+            $($tt)*
+        }
+    };
+
+    {
+        [$($proj_mut_ident:ident)?]
+        [$($proj_ref_ident:ident)?]
+        []
+        [$($attrs:tt)*]
+
+        #[project_replace = $proj_replace_ident:ident]
+        $($tt:tt)*
+    } => {
+        $crate::__pin_project_internal! {
+            [$($proj_mut_ident)?]
+            [$($proj_ref_ident)?]
+            [$proj_replace_ident]
+            [$($attrs)*]
+            $($tt)*
+        }
+    };
+
+    {
+        [$($proj_mut_ident:ident)?]
+        [$($proj_ref_ident:ident)?]
+        [$($proj_replace_ident:ident)?]
+        [$($attrs:tt)*]
+
+        #[$($attr:tt)*]
+        $($tt:tt)*
+    } => {
+        $crate::__pin_project_internal! {
+            [$($proj_mut_ident)?]
+            [$($proj_ref_ident)?]
+            [$($proj_replace_ident)?]
+            [$($attrs)* #[$($attr)*]]
+            $($tt)*
+        }
+    };
+
     // struct
     (
         [$($proj_mut_ident:ident)?]
         [$($proj_ref_ident:ident)?]
+        [$($proj_replace_ident:ident)?]
+        [$($attrs:tt)*]
 
-        $(#[$attrs:meta])*
         pub struct $ident:ident $(<
             $( $lifetime:lifetime $(: $lifetime_bound:lifetime)? ),* $(,)?
             $( $generics:ident
@@ -1003,12 +1505,14 @@
                 $field_vis:vis $field:ident: $field_ty:ty
             ),+ $(,)?
         }
+        $(impl $($pinned_drop:tt)*)?
     ) => {
         $crate::__pin_project_internal! { @struct=>internal;
             [$($proj_mut_ident)?]
             [$($proj_ref_ident)?]
+            [$($proj_replace_ident)?]
             [pub(crate)]
-            [$(#[$attrs])* pub struct $ident]
+            [$($attrs)* pub struct $ident]
             [$(<
                 $( $lifetime $(: $lifetime_bound)? ,)*
                 $( $generics
@@ -1038,13 +1542,15 @@
                     $field_vis $field: $field_ty
                 ),+
             }
+            $(impl $($pinned_drop)*)?
         }
     };
     (
         [$($proj_mut_ident:ident)?]
         [$($proj_ref_ident:ident)?]
+        [$($proj_replace_ident:ident)?]
+        [$($attrs:tt)*]
 
-        $(#[$attrs:meta])*
         $vis:vis struct $ident:ident $(<
             $( $lifetime:lifetime $(: $lifetime_bound:lifetime)? ),* $(,)?
             $( $generics:ident
@@ -1067,12 +1573,14 @@
                 $field_vis:vis $field:ident: $field_ty:ty
             ),+ $(,)?
         }
+        $(impl $($pinned_drop:tt)*)?
     ) => {
         $crate::__pin_project_internal! { @struct=>internal;
             [$($proj_mut_ident)?]
             [$($proj_ref_ident)?]
+            [$($proj_replace_ident)?]
             [$vis]
-            [$(#[$attrs])* $vis struct $ident]
+            [$($attrs)* $vis struct $ident]
             [$(<
                 $( $lifetime $(: $lifetime_bound)? ,)*
                 $( $generics
@@ -1102,14 +1610,16 @@
                     $field_vis $field: $field_ty
                 ),+
             }
+            $(impl $($pinned_drop)*)?
         }
     };
     // enum
     (
         [$($proj_mut_ident:ident)?]
         [$($proj_ref_ident:ident)?]
+        [$($proj_replace_ident:ident)?]
+        [$($attrs:tt)*]
 
-        $(#[$attrs:meta])*
         pub enum $ident:ident $(<
             $( $lifetime:lifetime $(: $lifetime_bound:lifetime)? ),* $(,)?
             $( $generics:ident
@@ -1137,12 +1647,14 @@
                 })?
             ),+ $(,)?
         }
+        $(impl $($pinned_drop:tt)*)?
     ) => {
         $crate::__pin_project_internal! { @enum=>internal;
             [$($proj_mut_ident)?]
             [$($proj_ref_ident)?]
+            [$($proj_replace_ident)?]
             [pub(crate)]
-            [$(#[$attrs])* pub enum $ident]
+            [$($attrs)* pub enum $ident]
             [$(<
                 $( $lifetime $(: $lifetime_bound)? ,)*
                 $( $generics
@@ -1177,13 +1689,15 @@
                     })?
                 ),+
             }
+            $(impl $($pinned_drop)*)?
         }
     };
     (
         [$($proj_mut_ident:ident)?]
         [$($proj_ref_ident:ident)?]
+        [$($proj_replace_ident:ident)?]
+        [$($attrs:tt)*]
 
-        $(#[$attrs:meta])*
         $vis:vis enum $ident:ident $(<
             $( $lifetime:lifetime $(: $lifetime_bound:lifetime)? ),* $(,)?
             $( $generics:ident
@@ -1211,12 +1725,14 @@
                 })?
             ),+ $(,)?
         }
+        $(impl $($pinned_drop:tt)*)?
     ) => {
         $crate::__pin_project_internal! { @enum=>internal;
             [$($proj_mut_ident)?]
             [$($proj_ref_ident)?]
+            [$($proj_replace_ident)?]
             [$vis]
-            [$(#[$attrs])* $vis enum $ident]
+            [$($attrs)* $vis enum $ident]
             [$(<
                 $( $lifetime $(: $lifetime_bound)? ,)*
                 $( $generics
@@ -1251,6 +1767,7 @@
                     })?
                 ),+
             }
+            $(impl $($pinned_drop)*)?
         }
     };
 }
@@ -1261,8 +1778,10 @@
     #[doc(hidden)]
     pub use core::{
         marker::{PhantomData, Unpin},
+        mem::ManuallyDrop,
         ops::Drop,
         pin::Pin,
+        ptr,
     };
 
     // This is an internal helper struct used by `pin_project!`.
@@ -1270,4 +1789,32 @@
     pub struct AlwaysUnpin<T: ?Sized>(PhantomData<T>);
 
     impl<T: ?Sized> Unpin for AlwaysUnpin<T> {}
+
+    // This is an internal helper used to ensure a value is dropped.
+    #[doc(hidden)]
+    pub struct UnsafeDropInPlaceGuard<T: ?Sized>(pub *mut T);
+
+    impl<T: ?Sized> Drop for UnsafeDropInPlaceGuard<T> {
+        fn drop(&mut self) {
+            unsafe {
+                ptr::drop_in_place(self.0);
+            }
+        }
+    }
+
+    // This is an internal helper used to ensure a value is overwritten without
+    // its destructor being called.
+    #[doc(hidden)]
+    pub struct UnsafeOverwriteGuard<T> {
+        pub value: ManuallyDrop<T>,
+        pub target: *mut T,
+    }
+
+    impl<T> Drop for UnsafeOverwriteGuard<T> {
+        fn drop(&mut self) {
+            unsafe {
+                ptr::write(self.target, ptr::read(&*self.value));
+            }
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/compiletest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/compiletest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/compiletest.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/compiletest.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
+#![cfg(not(miri))]
 #![warn(rust_2018_idioms, single_use_lifetimes)]
 
 use std::env;
 
-#[rustversion::attr(not(nightly), ignore)]
+#[rustversion::attr(before(2021-05-15), ignore)] // Note: This date is commit-date and the day before the toolchain date.
 #[test]
 fn ui() {
     if env::var_os("CI").is_none() {
@@ -10,5 +11,5 @@
     }
 
     let t = trybuild::TestCases::new();
-    t.compile_fail("tests/ui/*.rs");
+    t.compile_fail("tests/ui/*/*.rs");
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/drop_order.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/drop_order.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/drop_order.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/drop_order.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,169 @@
+#![warn(rust_2018_idioms, single_use_lifetimes)]
+
+// Refs: https://doc.rust-lang.org/reference/destructors.html
+
+use std::{cell::Cell, panic, pin::Pin, thread};
+
+use pin_project_lite::pin_project;
+
+struct D<'a>(&'a Cell<usize>, usize);
+
+impl Drop for D<'_> {
+    fn drop(&mut self) {
+        if !thread::panicking() {
+            let old = self.0.replace(self.1);
+            assert_eq!(old, self.1 - 1);
+        }
+    }
+}
+
+pin_project! {
+#[project = StructPinnedProj]
+#[project_ref = StructPinnedProjRef]
+#[project_replace = StructPinnedProjReplace]
+struct StructPinned<'a> {
+    #[pin]
+    f1: D<'a>,
+    #[pin]
+    f2: D<'a>,
+}
+}
+
+pin_project! {
+#[project = StructUnpinnedProj]
+#[project_ref = StructUnpinnedProjRef]
+#[project_replace = StructUnpinnedProjReplace]
+struct StructUnpinned<'a> {
+    f1: D<'a>,
+    f2: D<'a>,
+}
+}
+
+pin_project! {
+#[project_replace = EnumProjReplace]
+enum Enum<'a> {
+    #[allow(dead_code)] // false positive that fixed in Rust 1.38
+    StructPinned {
+        #[pin]
+        f1: D<'a>,
+        #[pin]
+        f2: D<'a>,
+    },
+    #[allow(dead_code)] // false positive that fixed in Rust 1.38
+    StructUnpinned {
+        f1: D<'a>,
+        f2: D<'a>,
+    },
+}
+}
+
+#[test]
+fn struct_pinned() {
+    {
+        let c = Cell::new(0);
+        let _x = StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
+    }
+    {
+        let c = Cell::new(0);
+        let mut x = StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
+        let y = Pin::new(&mut x);
+        let _z = y.project_replace(StructPinned { f1: D(&c, 3), f2: D(&c, 4) });
+    }
+}
+
+#[test]
+fn struct_unpinned() {
+    {
+        let c = Cell::new(0);
+        let _x = StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
+    }
+    {
+        let c = Cell::new(0);
+        let mut x = StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
+        let y = Pin::new(&mut x);
+        let _z = y.project_replace(StructUnpinned { f1: D(&c, 3), f2: D(&c, 4) });
+    }
+}
+
+#[test]
+fn enum_struct() {
+    {
+        let c = Cell::new(0);
+        let _x = Enum::StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
+    }
+    {
+        let c = Cell::new(0);
+        let mut x = Enum::StructPinned { f1: D(&c, 1), f2: D(&c, 2) };
+        let y = Pin::new(&mut x);
+        let _z = y.project_replace(Enum::StructPinned { f1: D(&c, 3), f2: D(&c, 4) });
+    }
+
+    {
+        let c = Cell::new(0);
+        let _x = Enum::StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
+    }
+    {
+        let c = Cell::new(0);
+        let mut x = Enum::StructUnpinned { f1: D(&c, 1), f2: D(&c, 2) };
+        let y = Pin::new(&mut x);
+        let _z = y.project_replace(Enum::StructUnpinned { f1: D(&c, 3), f2: D(&c, 4) });
+    }
+}
+
+// https://github.com/rust-lang/rust/issues/47949
+// https://github.com/taiki-e/pin-project/pull/194#discussion_r419098111
+#[allow(clippy::many_single_char_names)]
+#[test]
+fn project_replace_panic() {
+    pin_project! {
+    #[project_replace = SProjReplace]
+    struct S<T, U> {
+        #[pin]
+        pinned: T,
+        unpinned: U,
+    }
+    }
+
+    struct D<'a>(&'a mut bool, bool);
+    impl Drop for D<'_> {
+        fn drop(&mut self) {
+            *self.0 = true;
+            if self.1 {
+                panic!();
+            }
+        }
+    }
+
+    let (mut a, mut b, mut c, mut d) = (false, false, false, false);
+    let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+        let mut x = S { pinned: D(&mut a, true), unpinned: D(&mut b, false) };
+        let _y = Pin::new(&mut x)
+            .project_replace(S { pinned: D(&mut c, false), unpinned: D(&mut d, false) });
+        // Previous `x.pinned` was dropped and panicked when `project_replace` is
+        // called, so this is unreachable.
+        unreachable!();
+    }));
+    assert!(res.is_err());
+    assert!(a);
+    assert!(b);
+    assert!(c);
+    assert!(d);
+
+    let (mut a, mut b, mut c, mut d) = (false, false, false, false);
+    let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+        let mut x = S { pinned: D(&mut a, false), unpinned: D(&mut b, true) };
+        {
+            let _y = Pin::new(&mut x)
+                .project_replace(S { pinned: D(&mut c, false), unpinned: D(&mut d, false) });
+            // `_y` (previous `x.unpinned`) live to the end of this scope, so
+            // this is not unreachable.
+            // unreachable!();
+        }
+        unreachable!();
+    }));
+    assert!(res.is_err());
+    assert!(a);
+    assert!(b);
+    assert!(c);
+    assert!(d);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/enum.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/enum.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/enum.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/enum.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,127 @@
+use pin_project_lite::pin_project;
+enum Enum<T, U> {
+    Struct { pinned: T, unpinned: U },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProj<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProjRef<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProjReplace<T, U> {
+    Struct {
+        pinned: ::pin_project_lite::__private::PhantomData<T>,
+        unpinned: U,
+    },
+    Unit,
+}
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Enum<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> EnumProj<'__pin, T, U> {
+            unsafe {
+                match self.get_unchecked_mut() {
+                    Self::Struct { pinned, unpinned } => EnumProj::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProj::Unit,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> EnumProjRef<'__pin, T, U> {
+            unsafe {
+                match self.get_ref() {
+                    Self::Struct { pinned, unpinned } => EnumProjRef::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProjRef::Unit,
+                }
+            }
+        }
+        fn project_replace(
+            self: ::pin_project_lite::__private::Pin<&mut Self>,
+            replacement: Self,
+        ) -> EnumProjReplace<T, U> {
+            unsafe {
+                let __self_ptr: *mut Self = self.get_unchecked_mut();
+                let __guard = ::pin_project_lite::__private::UnsafeOverwriteGuard {
+                    target: __self_ptr,
+                    value: ::pin_project_lite::__private::ManuallyDrop::new(replacement),
+                };
+                match &mut *__self_ptr {
+                    Self::Struct { pinned, unpinned } => {
+                        let result = EnumProjReplace::Struct {
+                            pinned: ::pin_project_lite::__private::PhantomData,
+                            unpinned: ::pin_project_lite::__private::ptr::read(unpinned),
+                        };
+                        {
+                            (
+                                ::pin_project_lite::__private::UnsafeDropInPlaceGuard(pinned),
+                                (),
+                            );
+                        }
+                        result
+                    }
+                    Self::Unit => EnumProjReplace::Unit,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        Struct: (T, ::pin_project_lite::__private::AlwaysUnpin<U>),
+        Unit: (),
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Enum<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Enum<T, U> {}
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/enum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/enum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/enum.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/enum.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[project = EnumProj]
+    #[project_ref = EnumProjRef]
+    #[project_replace = EnumProjReplace]
+    enum Enum<T, U> {
+        Struct {
+            #[pin]
+            pinned: T,
+            unpinned: U,
+        },
+        Unit,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/struct.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/struct.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/struct.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/struct.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,84 @@
+use pin_project_lite::pin_project;
+struct Struct<T, U> {
+    pinned: T,
+    unpinned: U,
+}
+#[allow(explicit_outlives_requirements)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct Projection<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    }
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct ProjectionRef<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    }
+    impl<T, U> Struct<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> Projection<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_unchecked_mut();
+                Projection {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> ProjectionRef<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_ref();
+                ProjectionRef {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        pinned: T,
+        unpinned: ::pin_project_lite::__private::AlwaysUnpin<U>,
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Struct<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Struct<T, U> {}
+    #[forbid(unaligned_references, safe_packed_borrows)]
+    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
+        let _ = &this.pinned;
+        let _ = &this.unpinned;
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/struct.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/default/struct.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    struct Struct<T, U> {
+        #[pin]
+        pinned: T,
+        unpinned: U,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/enum.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/enum.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/enum.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/enum.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,88 @@
+use pin_project_lite::pin_project;
+enum Enum<T, U> {
+    Struct {
+        pinned1: T,
+        pinned2: T,
+        unpinned1: U,
+        unpinned2: U,
+    },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProjReplace<T, U> {
+    Struct {
+        pinned1: ::pin_project_lite::__private::PhantomData<T>,
+        pinned2: ::pin_project_lite::__private::PhantomData<T>,
+        unpinned1: U,
+        unpinned2: U,
+    },
+    Unit,
+}
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Enum<T, U> {
+        fn project_replace(
+            self: ::pin_project_lite::__private::Pin<&mut Self>,
+            replacement: Self,
+        ) -> EnumProjReplace<T, U> {
+            unsafe {
+                let __self_ptr: *mut Self = self.get_unchecked_mut();
+                let __guard = ::pin_project_lite::__private::UnsafeOverwriteGuard {
+                    target: __self_ptr,
+                    value: ::pin_project_lite::__private::ManuallyDrop::new(replacement),
+                };
+                match &mut *__self_ptr {
+                    Self::Struct {
+                        pinned1,
+                        pinned2,
+                        unpinned1,
+                        unpinned2,
+                    } => {
+                        let result = EnumProjReplace::Struct {
+                            pinned1: ::pin_project_lite::__private::PhantomData,
+                            pinned2: ::pin_project_lite::__private::PhantomData,
+                            unpinned1: ::pin_project_lite::__private::ptr::read(unpinned1),
+                            unpinned2: ::pin_project_lite::__private::ptr::read(unpinned2),
+                        };
+                        {
+                            (
+                                ::pin_project_lite::__private::UnsafeDropInPlaceGuard(pinned1),
+                                ::pin_project_lite::__private::UnsafeDropInPlaceGuard(pinned2),
+                                (),
+                                (),
+                            );
+                        }
+                        result
+                    }
+                    Self::Unit => EnumProjReplace::Unit,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        Struct: (
+            T,
+            T,
+            ::pin_project_lite::__private::AlwaysUnpin<U>,
+            ::pin_project_lite::__private::AlwaysUnpin<U>,
+        ),
+        Unit: (),
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Enum<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Enum<T, U> {}
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/enum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/enum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/enum.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/enum.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+#[project_replace = EnumProjReplace]
+enum Enum<T, U> {
+    Struct {
+        #[pin]
+        pinned1: T,
+        #[pin]
+        pinned2: T,
+        unpinned1: U,
+        unpinned2: U,
+    },
+    Unit,
+}
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/struct.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/struct.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/struct.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/struct.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,152 @@
+use pin_project_lite::pin_project;
+struct Struct<T, U> {
+    pinned1: T,
+    pinned2: T,
+    unpinned1: U,
+    unpinned2: U,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::type_repetition_in_bounds)]
+struct StructProjReplace<T, U> {
+    pinned1: ::pin_project_lite::__private::PhantomData<T>,
+    pinned2: ::pin_project_lite::__private::PhantomData<T>,
+    unpinned1: U,
+    unpinned2: U,
+}
+#[allow(explicit_outlives_requirements)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct Projection<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned1: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        pinned2: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned1: &'__pin mut (U),
+        unpinned2: &'__pin mut (U),
+    }
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct ProjectionRef<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned1: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        pinned2: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned1: &'__pin (U),
+        unpinned2: &'__pin (U),
+    }
+    impl<T, U> Struct<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> Projection<'__pin, T, U> {
+            unsafe {
+                let Self {
+                    pinned1,
+                    pinned2,
+                    unpinned1,
+                    unpinned2,
+                } = self.get_unchecked_mut();
+                Projection {
+                    pinned1: ::pin_project_lite::__private::Pin::new_unchecked(pinned1),
+                    pinned2: ::pin_project_lite::__private::Pin::new_unchecked(pinned2),
+                    unpinned1: unpinned1,
+                    unpinned2: unpinned2,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> ProjectionRef<'__pin, T, U> {
+            unsafe {
+                let Self {
+                    pinned1,
+                    pinned2,
+                    unpinned1,
+                    unpinned2,
+                } = self.get_ref();
+                ProjectionRef {
+                    pinned1: ::pin_project_lite::__private::Pin::new_unchecked(pinned1),
+                    pinned2: ::pin_project_lite::__private::Pin::new_unchecked(pinned2),
+                    unpinned1: unpinned1,
+                    unpinned2: unpinned2,
+                }
+            }
+        }
+        fn project_replace(
+            self: ::pin_project_lite::__private::Pin<&mut Self>,
+            replacement: Self,
+        ) -> StructProjReplace<T, U> {
+            unsafe {
+                let __self_ptr: *mut Self = self.get_unchecked_mut();
+                let __guard = ::pin_project_lite::__private::UnsafeOverwriteGuard {
+                    target: __self_ptr,
+                    value: ::pin_project_lite::__private::ManuallyDrop::new(replacement),
+                };
+                let Self {
+                    pinned1,
+                    pinned2,
+                    unpinned1,
+                    unpinned2,
+                } = &mut *__self_ptr;
+                let result = StructProjReplace {
+                    pinned1: ::pin_project_lite::__private::PhantomData,
+                    pinned2: ::pin_project_lite::__private::PhantomData,
+                    unpinned1: ::pin_project_lite::__private::ptr::read(unpinned1),
+                    unpinned2: ::pin_project_lite::__private::ptr::read(unpinned2),
+                };
+                {
+                    (
+                        ::pin_project_lite::__private::UnsafeDropInPlaceGuard(pinned1),
+                        ::pin_project_lite::__private::UnsafeDropInPlaceGuard(pinned2),
+                        (),
+                        (),
+                    );
+                }
+                result
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        pinned1: T,
+        pinned2: T,
+        unpinned1: ::pin_project_lite::__private::AlwaysUnpin<U>,
+        unpinned2: ::pin_project_lite::__private::AlwaysUnpin<U>,
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Struct<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Struct<T, U> {}
+    #[forbid(unaligned_references, safe_packed_borrows)]
+    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
+        let _ = &this.pinned1;
+        let _ = &this.pinned2;
+        let _ = &this.unpinned1;
+        let _ = &this.unpinned2;
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/struct.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/multifields/struct.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+#[project_replace = StructProjReplace]
+struct Struct<T, U> {
+    #[pin]
+    pinned1: T,
+    #[pin]
+    pinned2: T,
+    unpinned1: U,
+    unpinned2: U,
+}
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-all.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-all.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-all.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-all.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,127 @@
+use pin_project_lite::pin_project;
+enum Enum<T, U> {
+    Struct { pinned: T, unpinned: U },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProj<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProjRef<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProjReplace<T, U> {
+    Struct {
+        pinned: ::pin_project_lite::__private::PhantomData<T>,
+        unpinned: U,
+    },
+    Unit,
+}
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Enum<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> EnumProj<'__pin, T, U> {
+            unsafe {
+                match self.get_unchecked_mut() {
+                    Self::Struct { pinned, unpinned } => EnumProj::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProj::Unit,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> EnumProjRef<'__pin, T, U> {
+            unsafe {
+                match self.get_ref() {
+                    Self::Struct { pinned, unpinned } => EnumProjRef::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProjRef::Unit,
+                }
+            }
+        }
+        fn project_replace(
+            self: ::pin_project_lite::__private::Pin<&mut Self>,
+            replacement: Self,
+        ) -> EnumProjReplace<T, U> {
+            unsafe {
+                let __self_ptr: *mut Self = self.get_unchecked_mut();
+                let __guard = ::pin_project_lite::__private::UnsafeOverwriteGuard {
+                    target: __self_ptr,
+                    value: ::pin_project_lite::__private::ManuallyDrop::new(replacement),
+                };
+                match &mut *__self_ptr {
+                    Self::Struct { pinned, unpinned } => {
+                        let result = EnumProjReplace::Struct {
+                            pinned: ::pin_project_lite::__private::PhantomData,
+                            unpinned: ::pin_project_lite::__private::ptr::read(unpinned),
+                        };
+                        {
+                            (
+                                ::pin_project_lite::__private::UnsafeDropInPlaceGuard(pinned),
+                                (),
+                            );
+                        }
+                        result
+                    }
+                    Self::Unit => EnumProjReplace::Unit,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        Struct: (T, ::pin_project_lite::__private::AlwaysUnpin<U>),
+        Unit: (),
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Enum<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Enum<T, U> {}
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-all.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[project = EnumProj]
+    #[project_ref = EnumProjRef]
+    #[project_replace = EnumProjReplace]
+    enum Enum<T, U> {
+        Struct {
+            #[pin]
+            pinned: T,
+            unpinned: U,
+        },
+        Unit,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-mut.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-mut.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-mut.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-mut.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,57 @@
+use pin_project_lite::pin_project;
+enum Enum<T, U> {
+    Struct { pinned: T, unpinned: U },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProj<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    },
+    Unit,
+}
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Enum<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> EnumProj<'__pin, T, U> {
+            unsafe {
+                match self.get_unchecked_mut() {
+                    Self::Struct { pinned, unpinned } => EnumProj::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProj::Unit,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        Struct: (T, ::pin_project_lite::__private::AlwaysUnpin<U>),
+        Unit: (),
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Enum<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Enum<T, U> {}
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-mut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-mut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-mut.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-mut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[project = EnumProj]
+    enum Enum<T, U> {
+        Struct {
+            #[pin]
+            pinned: T,
+            unpinned: U,
+        },
+        Unit,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-none.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-none.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-none.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-none.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+use pin_project_lite::pin_project;
+enum Enum<T, U> {
+    Struct { pinned: T, unpinned: U },
+    Unit,
+}
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Enum<T, U> {}
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        Struct: (T, ::pin_project_lite::__private::AlwaysUnpin<U>),
+        Unit: (),
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Enum<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Enum<T, U> {}
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-none.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-none.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-none.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-none.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    enum Enum<T, U> {
+        Struct {
+            #[pin]
+            pinned: T,
+            unpinned: U,
+        },
+        Unit,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-ref.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-ref.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-ref.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-ref.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,57 @@
+use pin_project_lite::pin_project;
+enum Enum<T, U> {
+    Struct { pinned: T, unpinned: U },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProjRef<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    },
+    Unit,
+}
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Enum<T, U> {
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> EnumProjRef<'__pin, T, U> {
+            unsafe {
+                match self.get_ref() {
+                    Self::Struct { pinned, unpinned } => EnumProjRef::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProjRef::Unit,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        Struct: (T, ::pin_project_lite::__private::AlwaysUnpin<U>),
+        Unit: (),
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Enum<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Enum<T, U> {}
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-ref.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-ref.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-ref.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/enum-ref.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[project_ref = EnumProjRef]
+    enum Enum<T, U> {
+        Struct {
+            #[pin]
+            pinned: T,
+            unpinned: U,
+        },
+        Unit,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-all.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-all.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-all.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-all.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,117 @@
+use pin_project_lite::pin_project;
+struct Struct<T, U> {
+    pinned: T,
+    unpinned: U,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+struct StructProj<'__pin, T, U>
+where
+    Struct<T, U>: '__pin,
+{
+    pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+    unpinned: &'__pin mut (U),
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+struct StructProjRef<'__pin, T, U>
+where
+    Struct<T, U>: '__pin,
+{
+    pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+    unpinned: &'__pin (U),
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::type_repetition_in_bounds)]
+struct StructProjReplace<T, U> {
+    pinned: ::pin_project_lite::__private::PhantomData<T>,
+    unpinned: U,
+}
+#[allow(explicit_outlives_requirements)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Struct<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> StructProj<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_unchecked_mut();
+                StructProj {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> StructProjRef<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_ref();
+                StructProjRef {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+        fn project_replace(
+            self: ::pin_project_lite::__private::Pin<&mut Self>,
+            replacement: Self,
+        ) -> StructProjReplace<T, U> {
+            unsafe {
+                let __self_ptr: *mut Self = self.get_unchecked_mut();
+                let __guard = ::pin_project_lite::__private::UnsafeOverwriteGuard {
+                    target: __self_ptr,
+                    value: ::pin_project_lite::__private::ManuallyDrop::new(replacement),
+                };
+                let Self { pinned, unpinned } = &mut *__self_ptr;
+                let result = StructProjReplace {
+                    pinned: ::pin_project_lite::__private::PhantomData,
+                    unpinned: ::pin_project_lite::__private::ptr::read(unpinned),
+                };
+                {
+                    (
+                        ::pin_project_lite::__private::UnsafeDropInPlaceGuard(pinned),
+                        (),
+                    );
+                }
+                result
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        pinned: T,
+        unpinned: ::pin_project_lite::__private::AlwaysUnpin<U>,
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Struct<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Struct<T, U> {}
+    #[forbid(unaligned_references, safe_packed_borrows)]
+    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
+        let _ = &this.pinned;
+        let _ = &this.unpinned;
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-all.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[project = StructProj]
+    #[project_ref = StructProjRef]
+    #[project_replace = StructProjReplace]
+    struct Struct<T, U> {
+        #[pin]
+        pinned: T,
+        unpinned: U,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-mut.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-mut.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-mut.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-mut.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,84 @@
+use pin_project_lite::pin_project;
+struct Struct<T, U> {
+    pinned: T,
+    unpinned: U,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+struct StructProj<'__pin, T, U>
+where
+    Struct<T, U>: '__pin,
+{
+    pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+    unpinned: &'__pin mut (U),
+}
+#[allow(explicit_outlives_requirements)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct ProjectionRef<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    }
+    impl<T, U> Struct<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> StructProj<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_unchecked_mut();
+                StructProj {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> ProjectionRef<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_ref();
+                ProjectionRef {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        pinned: T,
+        unpinned: ::pin_project_lite::__private::AlwaysUnpin<U>,
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Struct<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Struct<T, U> {}
+    #[forbid(unaligned_references, safe_packed_borrows)]
+    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
+        let _ = &this.pinned;
+        let _ = &this.unpinned;
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-mut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-mut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-mut.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-mut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,12 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[project = StructProj]
+    struct Struct<T, U> {
+        #[pin]
+        pinned: T,
+        unpinned: U,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-none.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-none.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-none.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-none.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,84 @@
+use pin_project_lite::pin_project;
+struct Struct<T, U> {
+    pinned: T,
+    unpinned: U,
+}
+#[allow(explicit_outlives_requirements)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct Projection<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    }
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct ProjectionRef<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    }
+    impl<T, U> Struct<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> Projection<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_unchecked_mut();
+                Projection {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> ProjectionRef<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_ref();
+                ProjectionRef {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        pinned: T,
+        unpinned: ::pin_project_lite::__private::AlwaysUnpin<U>,
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Struct<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Struct<T, U> {}
+    #[forbid(unaligned_references, safe_packed_borrows)]
+    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
+        let _ = &this.pinned;
+        let _ = &this.unpinned;
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-none.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-none.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-none.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-none.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    struct Struct<T, U> {
+        #[pin]
+        pinned: T,
+        unpinned: U,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-ref.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-ref.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-ref.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-ref.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,84 @@
+use pin_project_lite::pin_project;
+struct Struct<T, U> {
+    pinned: T,
+    unpinned: U,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+struct StructProjRef<'__pin, T, U>
+where
+    Struct<T, U>: '__pin,
+{
+    pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+    unpinned: &'__pin (U),
+}
+#[allow(explicit_outlives_requirements)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct Projection<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    }
+    impl<T, U> Struct<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> Projection<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_unchecked_mut();
+                Projection {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> StructProjRef<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_ref();
+                StructProjRef {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        pinned: T,
+        unpinned: ::pin_project_lite::__private::AlwaysUnpin<U>,
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Struct<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Struct<T, U> {}
+    #[forbid(unaligned_references, safe_packed_borrows)]
+    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
+        let _ = &this.pinned;
+        let _ = &this.unpinned;
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-ref.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-ref.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-ref.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/naming/struct-ref.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,12 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[project_ref = StructProjRef]
+    struct Struct<T, U> {
+        #[pin]
+        pinned: T,
+        unpinned: U,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/enum.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/enum.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/enum.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/enum.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,95 @@
+use pin_project_lite::pin_project;
+use std::pin::Pin;
+enum Enum<T, U> {
+    Struct { pinned: T, unpinned: U },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProj<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+enum EnumProjRef<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    },
+    Unit,
+}
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Enum<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> EnumProj<'__pin, T, U> {
+            unsafe {
+                match self.get_unchecked_mut() {
+                    Self::Struct { pinned, unpinned } => EnumProj::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProj::Unit,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> EnumProjRef<'__pin, T, U> {
+            unsafe {
+                match self.get_ref() {
+                    Self::Struct { pinned, unpinned } => EnumProjRef::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProjRef::Unit,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        Struct: (T, ::pin_project_lite::__private::AlwaysUnpin<U>),
+        Unit: (),
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Enum<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    impl<T, U> ::pin_project_lite::__private::Drop for Enum<T, U> {
+        fn drop(&mut self) {
+            fn __drop_inner<T, U>(this: ::pin_project_lite::__private::Pin<&mut Enum<T, U>>) {
+                fn __drop_inner() {}
+                let _ = this;
+            }
+            let pinned_self: ::pin_project_lite::__private::Pin<&mut Self> =
+                unsafe { ::pin_project_lite::__private::Pin::new_unchecked(self) };
+            __drop_inner(pinned_self);
+        }
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/enum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/enum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/enum.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/enum.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+use pin_project_lite::pin_project;
+use std::pin::Pin;
+
+pin_project! {
+    #[project = EnumProj]
+    #[project_ref = EnumProjRef]
+    enum Enum<T, U> {
+        Struct {
+            #[pin]
+            pinned: T,
+            unpinned: U,
+        },
+        Unit,
+    }
+    impl<T, U> PinnedDrop for Enum<T, U> {
+        fn drop(this: Pin<&mut Self>) {
+            let _ = this;
+        }
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/struct.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/struct.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/struct.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/struct.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,92 @@
+use pin_project_lite::pin_project;
+use std::pin::Pin;
+struct Struct<T, U> {
+    pinned: T,
+    unpinned: U,
+}
+#[allow(explicit_outlives_requirements)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct Projection<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    }
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    struct ProjectionRef<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    }
+    impl<T, U> Struct<T, U> {
+        fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> Projection<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_unchecked_mut();
+                Projection {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+        fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> ProjectionRef<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_ref();
+                ProjectionRef {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        pinned: T,
+        unpinned: ::pin_project_lite::__private::AlwaysUnpin<U>,
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Struct<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    impl<T, U> ::pin_project_lite::__private::Drop for Struct<T, U> {
+        fn drop(&mut self) {
+            fn __drop_inner<T, U>(this: ::pin_project_lite::__private::Pin<&mut Struct<T, U>>) {
+                fn __drop_inner() {}
+                let _ = this;
+            }
+            let pinned_self: ::pin_project_lite::__private::Pin<&mut Self> =
+                unsafe { ::pin_project_lite::__private::Pin::new_unchecked(self) };
+            __drop_inner(pinned_self);
+        }
+    }
+    #[forbid(unaligned_references, safe_packed_borrows)]
+    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
+        let _ = &this.pinned;
+        let _ = &this.unpinned;
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/struct.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pinned_drop/struct.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+use pin_project_lite::pin_project;
+use std::pin::Pin;
+
+pin_project! {
+    struct Struct<T, U> {
+        #[pin]
+        pinned: T,
+        unpinned: U,
+    }
+    impl<T, U> PinnedDrop for Struct<T, U> {
+        fn drop(this: Pin<&mut Self>) {
+            let _ = this;
+        }
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/enum.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/enum.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/enum.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/enum.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,87 @@
+use pin_project_lite::pin_project;
+pub enum Enum<T, U> {
+    Struct { pinned: T, unpinned: U },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+pub(crate) enum EnumProj<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        unpinned: &'__pin mut (U),
+    },
+    Unit,
+}
+#[allow(dead_code)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::mut_mut)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::ref_option_ref)]
+#[allow(clippy::type_repetition_in_bounds)]
+pub(crate) enum EnumProjRef<'__pin, T, U>
+where
+    Enum<T, U>: '__pin,
+{
+    Struct {
+        pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        unpinned: &'__pin (U),
+    },
+    Unit,
+}
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    impl<T, U> Enum<T, U> {
+        pub(crate) fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> EnumProj<'__pin, T, U> {
+            unsafe {
+                match self.get_unchecked_mut() {
+                    Self::Struct { pinned, unpinned } => EnumProj::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProj::Unit,
+                }
+            }
+        }
+        pub(crate) fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> EnumProjRef<'__pin, T, U> {
+            unsafe {
+                match self.get_ref() {
+                    Self::Struct { pinned, unpinned } => EnumProjRef::Struct {
+                        pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                        unpinned: unpinned,
+                    },
+                    Self::Unit => EnumProjRef::Unit,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    pub struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        Struct: (T, ::pin_project_lite::__private::AlwaysUnpin<U>),
+        Unit: (),
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Enum<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Enum<T, U> {}
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/enum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/enum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/enum.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/enum.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    #[project = EnumProj]
+    #[project_ref = EnumProjRef]
+    pub enum Enum<T, U> {
+        Struct {
+            #[pin]
+            pinned: T,
+            unpinned: U,
+        },
+        Unit,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/struct.expanded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/struct.expanded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/struct.expanded.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/struct.expanded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,84 @@
+use pin_project_lite::pin_project;
+pub struct Struct<T, U> {
+    pub pinned: T,
+    pub unpinned: U,
+}
+#[allow(explicit_outlives_requirements)]
+#[allow(single_use_lifetimes)]
+#[allow(clippy::unknown_clippy_lints)]
+#[allow(clippy::redundant_pub_crate)]
+#[allow(clippy::used_underscore_binding)]
+const _: () = {
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    pub(crate) struct Projection<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pub pinned: ::pin_project_lite::__private::Pin<&'__pin mut (T)>,
+        pub unpinned: &'__pin mut (U),
+    }
+    #[allow(dead_code)]
+    #[allow(single_use_lifetimes)]
+    #[allow(clippy::unknown_clippy_lints)]
+    #[allow(clippy::mut_mut)]
+    #[allow(clippy::redundant_pub_crate)]
+    #[allow(clippy::ref_option_ref)]
+    #[allow(clippy::type_repetition_in_bounds)]
+    pub(crate) struct ProjectionRef<'__pin, T, U>
+    where
+        Struct<T, U>: '__pin,
+    {
+        pub pinned: ::pin_project_lite::__private::Pin<&'__pin (T)>,
+        pub unpinned: &'__pin (U),
+    }
+    impl<T, U> Struct<T, U> {
+        pub(crate) fn project<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin mut Self>,
+        ) -> Projection<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_unchecked_mut();
+                Projection {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+        pub(crate) fn project_ref<'__pin>(
+            self: ::pin_project_lite::__private::Pin<&'__pin Self>,
+        ) -> ProjectionRef<'__pin, T, U> {
+            unsafe {
+                let Self { pinned, unpinned } = self.get_ref();
+                ProjectionRef {
+                    pinned: ::pin_project_lite::__private::Pin::new_unchecked(pinned),
+                    unpinned: unpinned,
+                }
+            }
+        }
+    }
+    #[allow(non_snake_case)]
+    pub struct __Origin<'__pin, T, U> {
+        __dummy_lifetime: ::pin_project_lite::__private::PhantomData<&'__pin ()>,
+        pinned: T,
+        unpinned: ::pin_project_lite::__private::AlwaysUnpin<U>,
+    }
+    impl<'__pin, T, U> ::pin_project_lite::__private::Unpin for Struct<T, U> where
+        __Origin<'__pin, T, U>: ::pin_project_lite::__private::Unpin
+    {
+    }
+    trait MustNotImplDrop {}
+    #[allow(clippy::drop_bounds, drop_bounds)]
+    impl<T: ::pin_project_lite::__private::Drop> MustNotImplDrop for T {}
+    impl<T, U> MustNotImplDrop for Struct<T, U> {}
+    #[forbid(unaligned_references, safe_packed_borrows)]
+    fn __assert_not_repr_packed<T, U>(this: &Struct<T, U>) {
+        let _ = &this.pinned;
+        let _ = &this.unpinned;
+    }
+};
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/struct.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/pub/struct.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    pub struct Struct<T, U> {
+        #[pin]
+        pub pinned: T,
+        pub unpinned: U,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expand/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expand/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+# Expansion tests
+
+Similar to ui tests, but instead of checking the compiler output, this checks
+the code generated by macros.
+
+See [examples](https://github.com/taiki-e/pin-project/tree/HEAD/examples) for
+descriptions of what the generated code does, and why it needs to be generated.
+
+To run this test, run the following command:
+
+```sh
+cargo +nightly test --test expandtest
+```
+
+Locally, this test updates the files in the `expand` directory if there are
+changes to the generated code. If there are any changes to the files in the
+`expand` directory after running the test, please commit them.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expandtest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expandtest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/expandtest.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/expandtest.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,43 @@
+#![cfg(not(miri))]
+#![warn(rust_2018_idioms, single_use_lifetimes)]
+
+use std::{
+    env,
+    process::{Command, ExitStatus, Stdio},
+};
+
+const PATH: &str = "tests/expand/**/*.rs";
+
+#[rustversion::attr(not(nightly), ignore)]
+#[test]
+fn expandtest() {
+    let is_ci = env::var_os("CI").is_some();
+    let cargo = &*env::var("CARGO").unwrap_or_else(|_| "cargo".into());
+    if !has_command(&[cargo, "expand"]) || !has_command(&[cargo, "fmt"]) {
+        if is_ci {
+            panic!("expandtest requires rustfmt and cargo-expand");
+        }
+        return;
+    }
+
+    let args = &["--all-features"];
+    if is_ci {
+        macrotest::expand_without_refresh_args(PATH, args);
+    } else {
+        env::set_var("MACROTEST", "overwrite");
+        macrotest::expand_args(PATH, args);
+    }
+}
+
+fn has_command(command: &[&str]) -> bool {
+    Command::new(command[0])
+        .args(&command[1..])
+        .arg("--version")
+        .stdin(Stdio::null())
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .status()
+        .as_ref()
+        .map(ExitStatus::success)
+        .unwrap_or(false)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/lint.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/lint.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/lint.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/lint.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,44 +1,43 @@
-#![forbid(unsafe_code)]
-#![warn(nonstandard_style, rust_2018_idioms, rustdoc, unused)]
+// Check interoperability with rustc and clippy lints.
+
+#![warn(nonstandard_style, rust_2018_idioms, unused)]
 // Note: This does not guarantee compatibility with forbidding these lints in the future.
 // If rustc adds a new lint, we may not be able to keep this.
-#![forbid(future_incompatible, rust_2018_compatibility)]
+#![forbid(future_incompatible)]
 #![allow(unknown_lints)] // for old compilers
+#![forbid(unsafe_code)]
 #![warn(
     box_pointers,
     deprecated_in_future,
-    elided_lifetimes_in_paths,
-    explicit_outlives_requirements,
+    disjoint_capture_migration,
     macro_use_extern_crate,
     meta_variable_misuse,
+    missing_abi,
     missing_copy_implementations,
-    missing_crate_level_docs,
     missing_debug_implementations,
     missing_docs,
     non_ascii_idents,
+    noop_method_call,
     single_use_lifetimes,
     trivial_casts,
     trivial_numeric_casts,
-    unaligned_references,
     unreachable_pub,
-    unused_extern_crates,
     unused_import_braces,
     unused_lifetimes,
     unused_qualifications,
     unused_results,
     variant_size_differences
 )]
-// absolute_paths_not_starting_with_crate, anonymous_parameters, keyword_idents, pointer_structural_match: forbidden as a part of future_incompatible
-// missing_doc_code_examples, private_doc_tests, invalid_html_tags: warned as a part of rustdoc
-// unsafe_block_in_unsafe_fn: unstable
-// unsafe_code: forbidden
-// unstable_features: deprecated: https://doc.rust-lang.org/beta/rustc/lints/listing/allowed-by-default.html#unstable-features
+// rust_2018_compatibility, rust_2021_compatibility, absolute_paths_not_starting_with_crate, etc.: forbidden as a part of future_incompatible
+// elided_lifetimes_in_paths, explicit_outlives_requirements, unused_extern_crates: warned as a part of rust_2018_idioms
+// unsafe_block_in_unsafe_fn: unsafe_block_in_unsafe_fn: requires Rust 1.52. and, we don't generate unsafe fn.
+// unstable_features: no way to generate #![feature(..)] by macros, expect for unstable inner attribute. and this lint is deprecated: https://doc.rust-lang.org/rustc/lints/listing/allowed-by-default.html#unstable-features
 // unused_crate_dependencies: unrelated
+// unsafe_code: forbidden
 #![warn(clippy::all, clippy::pedantic, clippy::nursery)]
 #![warn(clippy::restriction)]
 #![allow(clippy::blanket_clippy_restriction_lints)] // this is a test, so enable all restriction lints intentionally.
-
-// Check interoperability with rustc and clippy lints.
+#![allow(clippy::exhaustive_structs, clippy::exhaustive_enums)] // TODO
 
 pub mod basic {
     include!("include/basic.rs");
@@ -237,42 +236,26 @@
     }
 }
 
-#[allow(box_pointers)]
-#[allow(clippy::restriction)]
-#[rustversion::attr(before(2020-11-08), ignore)] // Note: This date is commit-date and the day before the toolchain date.
-#[test]
-fn check_lint_list() {
-    use std::{env, fs, path::Path, process::Command, str};
-
-    type Result<T, E = Box<dyn std::error::Error>> = std::result::Result<T, E>;
-
-    fn assert_eq(expected_path: &str, actual: &str) -> Result<()> {
-        let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
-        let expected_path = &manifest_dir.join(expected_path);
-        let expected = fs::read_to_string(expected_path)?;
-        if expected != actual {
-            if env::var_os("CI").is_some() {
-                let actual_path =
-                    &manifest_dir.join("target").join(expected_path.file_name().unwrap());
-                fs::write(actual_path, actual)?;
-                let status = Command::new("git")
-                    .args(&["--no-pager", "diff", "--no-index", "--"])
-                    .args(&[expected_path, actual_path])
-                    .status()?;
-                assert!(!status.success());
-                panic!("assertion failed");
-            } else {
-                fs::write(expected_path, actual)?;
-            }
-        }
-        Ok(())
-    }
-
-    (|| -> Result<()> {
-        let rustc = env::var_os("RUSTC").unwrap_or_else(|| "rustc".into());
-        let output = Command::new(rustc).args(&["-W", "help"]).output()?;
-        let new = str::from_utf8(&output.stdout)?;
-        assert_eq("tests/lint.txt", new)
-    })()
-    .unwrap_or_else(|e| panic!("{}", e));
+pub mod clippy_ref_option_ref {
+    use pin_project_lite::pin_project;
+
+    pin_project! {
+        pub struct Struct<'a> {
+            #[pin]
+            pub _pinned: Option<&'a ()>,
+            pub _unpinned: Option<&'a ()>,
+        }
+    }
+
+    pin_project! {
+        #[project = EnumProj]
+        #[project_ref = EnumProjRef]
+        pub enum Enum<'a> {
+            Struct {
+                #[pin]
+                _pinned: Option<&'a ()>,
+                _unpinned: Option<&'a ()>,
+            },
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/lint.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/lint.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/lint.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/lint.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-
-Available lint options:
-    -W <foo>           Warn about <foo>
-    -A <foo>           Allow <foo>
-    -D <foo>           Deny <foo>
-    -F <foo>           Forbid <foo> (deny <foo> and all attempts to override)
-
-
-Lint checks provided by rustc:
-
-                                                       name  default  meaning
-                                                       ----  -------  -------
-                     absolute-paths-not-starting-with-crate  allow    fully qualified paths that start with a module name instead of `crate`, `self`, or an extern crate name
-                                       anonymous-parameters  allow    detects anonymous parameters
-                                               box-pointers  allow    use of owned (Box type) heap memory
-                                       deprecated-in-future  allow    detects use of items that will be deprecated in a future version
-                                  elided-lifetimes-in-paths  allow    hidden lifetime parameters in types are deprecated
-                             explicit-outlives-requirements  allow    outlives requirements can be inferred
-                                          invalid-html-tags  allow    detects invalid HTML tags in doc comments
-                                             keyword-idents  allow    detects edition keywords being used as an identifier
-                                     macro-use-extern-crate  allow    the `#[macro_use]` attribute is now deprecated in favor of using macros via the module system
-                                       meta-variable-misuse  allow    possible meta-variable misuse at macro definition
-                               missing-copy-implementations  allow    detects potentially-forgotten implementations of `Copy`
-                                   missing-crate-level-docs  allow    detects crates with no crate-level documentation
-                              missing-debug-implementations  allow    detects missing implementations of Debug
-                                               missing-docs  allow    detects missing documentation for public members
-                                  missing-doc-code-examples  allow    detects publicly-exported items without code samples in their documentation
-                                           non-ascii-idents  allow    detects non-ASCII identifiers
-                                   pointer-structural-match  allow    pointers are not structural-match
-                                          private-doc-tests  allow    detects code samples in docs of private items not documented by rustdoc
-                                       single-use-lifetimes  allow    detects lifetime parameters that are only used once
-                                              trivial-casts  allow    detects trivial casts which could be removed
-                                      trivial-numeric-casts  allow    detects trivial casts of numeric types which could be removed
-                                       unaligned-references  allow    detects unaligned references to fields of packed structs
-                                            unreachable-pub  allow    `pub` items not reachable from crate root
-                                                unsafe-code  allow    usage of `unsafe` code
-                                     unsafe-op-in-unsafe-fn  allow    unsafe operations in unsafe functions without an explicit unsafe block are deprecated
-                                          unstable-features  allow    enabling unstable features (deprecated. do not use)
-                                  unused-crate-dependencies  allow    crate dependencies that are never used
-                                       unused-extern-crates  allow    extern crates that are never used
-                                       unused-import-braces  allow    unnecessary braces around an imported item
-                                           unused-lifetimes  allow    detects lifetime parameters that are never used
-                                      unused-qualifications  allow    detects unnecessarily qualified names
-                                             unused-results  allow    unused result of an expression in a statement
-                                   variant-size-differences  allow    detects enums with widely varying variant sizes
-                                            array-into-iter  warn     detects calling `into_iter` on arrays
-                                           asm-sub-register  warn     using only a subset of a register for inline asm inputs
-                                         bare-trait-objects  warn     suggest using `dyn Trait` for trait objects
-                                 bindings-with-variant-name  warn     detects pattern bindings with the same name as one of the matched variants
-                                     broken-intra-doc-links  warn     failures in resolving intra-doc link targets
-                                       cenum-impl-drop-cast  warn     a C-like enum implementing Drop is cast
-                               clashing-extern-declarations  warn     detects when an extern fn has been declared with the same name but different types
-                                       coherence-leak-check  warn     distinct impls distinguished only by the leak-check code
-                                          confusable-idents  warn     detects visually confusable pairs between identifiers
-                                const-evaluatable-unchecked  warn     detects a generic constant is used in a type without a emitting a warning
-                                        const-item-mutation  warn     detects attempts to mutate a `const` item
-                                                  dead-code  warn     detect unused, unexported items
-                                                 deprecated  warn     detects use of deprecated items
-                                                drop-bounds  warn     bounds of the form `T: Drop` are useless
-                          ellipsis-inclusive-range-patterns  warn     `...` range patterns are deprecated
-                              exported-private-dependencies  warn     public interface leaks type from a private dependency
-                                   function-item-references  warn     suggest casting to a function pointer when attempting to take references to function items
-                     illegal-floating-point-literal-pattern  warn     floating-point literals cannot be used in patterns
-                                            improper-ctypes  warn     proper use of libc types in foreign modules
-                                improper-ctypes-definitions  warn     proper use of libc types in foreign item definitions
-                                        incomplete-features  warn     incomplete features that may function improperly in some or all cases
-                                  indirect-structural-match  warn     constant used in pattern contains value of non-structural-match type in a field or a variant
-                                         inline-no-sanitize  warn     detects incompatible use of `#[inline(always)]` and `#[no_sanitize(...)]`
-                               invalid-codeblock-attributes  warn     codeblock attribute looks a lot like a known one
-                                              invalid-value  warn     an invalid value is being created (such as a NULL reference)
-                                   irrefutable-let-patterns  warn     detects irrefutable patterns in if-let and while-let statements
-                              late-bound-lifetime-arguments  warn     detects generic lifetime arguments in path segments with late bound lifetime parameters
-                                   mixed-script-confusables  warn     detects Unicode scripts whose mixed script confusables codepoints are solely used
-                        mutable-borrow-reservation-conflict  warn     reservation of a two-phased borrow conflicts with other shared borrows
-                                nontrivial-structural-match  warn     constant used in pattern of non-structural-match type and the constant's initializer expression contains values of non-structural-match types
-                                              non-autolinks  warn     detects URLs that could be written using only angle brackets
-                                       non-camel-case-types  warn     types, variants, traits and type parameters should have camel case names
-                               non-shorthand-field-patterns  warn     using `Struct { x: x }` instead of `Struct { x }` in a pattern
-                                             non-snake-case  warn     variables, methods, functions, lifetime parameters and modules should have snake case names
-                                     non-upper-case-globals  warn     static constants should have uppercase identifiers
-                                    no-mangle-generic-items  warn     generic items must be mangled
-                                       overlapping-patterns  warn     detects overlapping patterns
-                                            path-statements  warn     path statements with no effect
-                                    private-intra-doc-links  warn     linking from a public item to a private one
-                                          private-in-public  warn     detect private items in public interfaces not caught by the old implementation
-                      proc-macro-derive-resolution-fallback  warn     detects proc macro derives using inaccessible names from parent modules
-                                       redundant-semicolons  warn     detects unnecessary trailing semicolons
-                                  renamed-and-removed-lints  warn     lints that have been renamed or removed
-                                        safe-packed-borrows  warn     safe borrows of fields of packed structs were erroneously allowed
-                                            stable-features  warn     stable features found in `#[feature]` directive
-                                   temporary-cstring-as-ptr  warn     detects getting the inner pointer of a temporary `CString`
-                                             trivial-bounds  warn     these bounds don't depend on an type parameters
-                                          type-alias-bounds  warn     bounds in type aliases are not enforced
-                                   tyvar-behind-raw-pointer  warn     raw pointer to an inference variable
-                                        uncommon-codepoints  warn     detects uncommon Unicode codepoints in identifiers
-                                    unconditional-recursion  warn     functions that cannot return without calling themselves
-                                         uninhabited-static  warn     uninhabited static
-                                              unknown-lints  warn     unrecognized lint attribute
-                                      unnameable-test-items  warn     detects an item that cannot be named being marked as `#[test_case]`
-                                           unreachable-code  warn     detects unreachable code paths
-                                       unreachable-patterns  warn     detects unreachable patterns
-                                   unstable-name-collisions  warn     detects name collision with an existing but unstable method
-                                          unused-allocation  warn     detects unnecessary allocations that can be eliminated
-                                         unused-assignments  warn     detect assignments that will never be read
-                                          unused-attributes  warn     detects attributes that were not used by the compiler
-                                              unused-braces  warn     unnecessary braces around an expression
-                                         unused-comparisons  warn     comparisons made useless by limits of the types involved
-                                        unused-doc-comments  warn     detects doc comments that aren't used by rustdoc
-                                            unused-features  warn     unused features found in crate-level `#[feature]` directives
-                                             unused-imports  warn     imports that are never used
-                                              unused-labels  warn     detects labels that are never used
-                                              unused-macros  warn     detects macros that were not used
-                                            unused-must-use  warn     unused result of a type flagged as `#[must_use]`
-                                                 unused-mut  warn     detect mut variables which don't need to be mutable
-                                              unused-parens  warn     `if`, `match`, `while` and `return` do not need parentheses
-                                              unused-unsafe  warn     unnecessary use of an `unsafe` block
-                                           unused-variables  warn     detect variables which are not used in any way
-                                                   warnings  warn     mass-change the level for lints which produce warnings
-                                where-clauses-object-safety  warn     checks the object safety of where clauses
-                                                 while-true  warn     suggest using `loop { }` instead of `while true { }`
-                                 ambiguous-associated-items  deny     ambiguous associated items
-                                        arithmetic-overflow  deny     arithmetic operation overflows
-                                     conflicting-repr-hints  deny     conflicts between `#[repr(..)]` hints that were previously accepted and used in practice
-                                                  const-err  deny     constant evaluation detected erroneous expression
-                                 ill-formed-attribute-input  deny     ill-formed attribute inputs that were previously accepted and used in practice
-                                         incomplete-include  deny     trailing content in included file
-                                 invalid-type-param-default  deny     type parameter default erroneously allowed in invalid location
-    macro-expanded-macro-exports-accessed-by-absolute-paths  deny     macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths
-                                         mutable-transmutes  deny     mutating transmuted &mut T from &T may cause undefined behavior
-                                      no-mangle-const-items  deny     const items will not have their symbols exported
-                              order-dependent-trait-objects  deny     trait-object types were treated as different depending on marker-trait order
-                                       overflowing-literals  deny     literal out of range for its type
-                               patterns-in-fns-without-body  deny     patterns in functions without body were erroneously allowed
-                            pub-use-of-private-extern-crate  deny     detect public re-exports of private extern crates
-                                              soft-unstable  deny     a feature gate that doesn't break dependent crates
-                                        unconditional-panic  deny     operation will cause a panic at runtime
-                                        unknown-crate-types  deny     unknown crate type found in `#[crate_type]` directive
-                                         useless-deprecated  deny     detects deprecation attributes with no effect
-
-
-Lint groups provided by rustc:
-
-                       name  sub-lints
-                       ----  ---------
-                   warnings  all lints that are set to issue warnings
-        future-incompatible  keyword-idents, anonymous-parameters, illegal-floating-point-literal-pattern, private-in-public, pub-use-of-private-extern-crate, invalid-type-param-default, safe-packed-borrows, patterns-in-fns-without-body, late-bound-lifetime-arguments, order-dependent-trait-objects, coherence-leak-check, tyvar-behind-raw-pointer, absolute-paths-not-starting-with-crate, unstable-name-collisions, where-clauses-object-safety, proc-macro-derive-resolution-fallback, macro-expanded-macro-exports-accessed-by-absolute-paths, ill-formed-attribute-input, conflicting-repr-hints, ambiguous-associated-items, mutable-borrow-reservation-conflict, indirect-structural-match, pointer-structural-match, nontrivial-structural-match, soft-unstable, cenum-impl-drop-cast, const-evaluatable-unchecked, uninhabited-static, array-into-iter
-          nonstandard-style  non-camel-case-types, non-snake-case, non-upper-case-globals
-    rust-2018-compatibility  keyword-idents, anonymous-parameters, tyvar-behind-raw-pointer, absolute-paths-not-starting-with-crate
-           rust-2018-idioms  bare-trait-objects, unused-extern-crates, ellipsis-inclusive-range-patterns, elided-lifetimes-in-paths, explicit-outlives-requirements
-                    rustdoc  non-autolinks, broken-intra-doc-links, private-intra-doc-links, invalid-codeblock-attributes, missing-doc-code-examples, private-doc-tests, invalid-html-tags
-                     unused  unused-imports, unused-variables, unused-assignments, dead-code, unused-mut, unreachable-code, unreachable-patterns, overlapping-patterns, unused-must-use, unused-unsafe, path-statements, unused-attributes, unused-macros, unused-allocation, unused-doc-comments, unused-extern-crates, unused-features, unused-labels, unused-parens, unused-braces, redundant-semicolons
-
-
-Compiler plugins can provide additional lints and lint groups. To see a listing of these, re-run `rustc -W help` with a crate filename.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/proper_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/proper_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/proper_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/proper_unpin.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,9 +5,10 @@
 mod auxiliary;
 
 pub mod default {
-    use pin_project_lite::pin_project;
     use std::marker::PhantomPinned;
 
+    use pin_project_lite::pin_project;
+
     struct Inner<T> {
         f: T,
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/test.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,12 +4,20 @@
 #[macro_use]
 mod auxiliary;
 
-use core::{marker::PhantomPinned, pin::Pin};
+use core::{
+    marker::{PhantomData, PhantomPinned},
+    pin::Pin,
+};
+
 use pin_project_lite::pin_project;
 
 #[test]
 fn projection() {
     pin_project! {
+        #[project = StructProj]
+        #[project_ref = StructProjRef]
+        #[project_replace = StructProjReplace]
+        #[derive(Default)]
         struct Struct<T, U> {
             #[pin]
             f1: T,
@@ -21,25 +29,40 @@
     let mut s_orig = Pin::new(&mut s);
     let s = s_orig.as_mut().project();
 
-    let x: Pin<&mut i32> = s.f1;
-    assert_eq!(*x, 1);
-
-    let y: &mut i32 = s.f2;
-    assert_eq!(*y, 2);
+    let _: Pin<&mut i32> = s.f1;
+    assert_eq!(*s.f1, 1);
+    let _: &mut i32 = s.f2;
+    assert_eq!(*s.f2, 2);
 
     assert_eq!(s_orig.as_ref().f1, 1);
     assert_eq!(s_orig.as_ref().f2, 2);
 
     let mut s = Struct { f1: 1, f2: 2 };
-
-    let s = Pin::new(&mut s).project();
-
-    let _: Pin<&mut i32> = s.f1;
-    let _: &mut i32 = s.f2;
+    let mut s = Pin::new(&mut s);
+    {
+        let StructProj { f1, f2 } = s.as_mut().project();
+        let _: Pin<&mut i32> = f1;
+        let _: &mut i32 = f2;
+    }
+    {
+        let StructProjRef { f1, f2 } = s.as_ref().project_ref();
+        let _: Pin<&i32> = f1;
+        let _: &i32 = f2;
+    }
+
+    {
+        let StructProjReplace { f1: PhantomData, f2 } =
+            s.as_mut().project_replace(Struct::default());
+        assert_eq!(f2, 2);
+        let StructProj { f1, f2 } = s.project();
+        assert_eq!(*f1, 0);
+        assert_eq!(*f2, 0);
+    }
 
     pin_project! {
         #[project = EnumProj]
         #[project_ref = EnumProjRef]
+        #[project_replace = EnumProjReplace]
         #[derive(Eq, PartialEq, Debug)]
         enum Enum<C, D> {
             Struct {
@@ -52,39 +75,30 @@
     }
 
     let mut e = Enum::Struct { f1: 1, f2: 2 };
-    let mut e_orig = Pin::new(&mut e);
-    let e = e_orig.as_mut().project();
+    let mut e = Pin::new(&mut e);
 
-    match e {
+    match e.as_mut().project() {
         EnumProj::Struct { f1, f2 } => {
-            let x: Pin<&mut i32> = f1;
-            assert_eq!(*x, 1);
-            let y: &mut i32 = f2;
-            assert_eq!(*y, 2);
+            let _: Pin<&mut i32> = f1;
+            assert_eq!(*f1, 1);
+            let _: &mut i32 = f2;
+            assert_eq!(*f2, 2);
         }
-        EnumProj::Unit => {}
+        EnumProj::Unit => unreachable!(),
     }
 
-    assert_eq!(Pin::into_ref(e_orig).get_ref(), &Enum::Struct { f1: 1, f2: 2 });
-
-    let mut e = Enum::Struct { f1: 3, f2: 4 };
-    let mut e = Pin::new(&mut e).project();
+    assert_eq!(&*e, &Enum::Struct { f1: 1, f2: 2 });
 
-    match &mut e {
-        EnumProj::Struct { f1, f2 } => {
-            let x: &mut Pin<&mut i32> = f1;
-            assert_eq!(**x, 3);
-            let y: &mut &mut i32 = f2;
-            assert_eq!(**y, 4);
-        }
-        EnumProj::Unit => {}
+    if let EnumProj::Struct { f1, f2 } = e.as_mut().project() {
+        let _: Pin<&mut i32> = f1;
+        assert_eq!(*f1, 1);
+        let _: &mut i32 = f2;
+        assert_eq!(*f2, 2);
     }
 
-    if let EnumProj::Struct { f1, f2 } = e {
-        let x: Pin<&mut i32> = f1;
-        assert_eq!(*x, 3);
-        let y: &mut i32 = f2;
-        assert_eq!(*y, 4);
+    if let EnumProjReplace::Struct { f1: PhantomData, f2 } = e.as_mut().project_replace(Enum::Unit)
+    {
+        assert_eq!(f2, 2);
     }
 }
 
@@ -109,7 +123,7 @@
             let new_e = Enum::V2 { f: f.as_ref().get_ref() == &25 };
             e_orig.set(new_e);
         }
-        _ => unreachable!(),
+        EnumProj::V2 { .. } => unreachable!(),
     }
 
     assert_eq!(e, Enum::V2 { f: true });
@@ -322,7 +336,7 @@
     pin_project! {
         struct Struct2<'a, T, U> {
             #[pin]
-            pinned: &'a mut T,
+            pinned: &'a T,
             unpinned: U,
         }
     }
@@ -355,16 +369,16 @@
     }
 
     impl<'b, T, U> Struct2<'b, T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a &'b mut T> {
+        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a &'b T> {
             self.project_ref().pinned
         }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut &'b mut T> {
+        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut &'b T> {
             self.project().pinned
         }
-        fn get_pin_ref_elided(self: Pin<&Self>) -> Pin<&&'b mut T> {
+        fn get_pin_ref_elided(self: Pin<&Self>) -> Pin<&&'b T> {
             self.project_ref().pinned
         }
-        fn get_pin_mut_elided(self: Pin<&mut Self>) -> Pin<&mut &'b mut T> {
+        fn get_pin_mut_elided(self: Pin<&mut Self>) -> Pin<&mut &'b T> {
             self.project().pinned
         }
     }
@@ -574,6 +588,21 @@
 #[test]
 fn attrs() {
     pin_project! {
+        /// dox1
+        #[derive(Clone)]
+        #[project = StructProj]
+        #[project_ref = StructProjRef]
+        /// dox2
+        #[derive(Debug)]
+        /// dox3
+        struct Struct {
+            // TODO
+            // /// dox4
+            f: ()
+        }
+    }
+
+    pin_project! {
         #[project = Enum1Proj]
         #[project_ref = Enum1ProjRef]
         enum Enum1 {
@@ -585,15 +614,55 @@
     }
 
     pin_project! {
-        /// dox
+        /// dox1
+        #[derive(Clone)]
         #[project = Enum2Proj]
         #[project_ref = Enum2ProjRef]
+        /// dox2
+        #[derive(Debug)]
+        /// dox3
         enum Enum2 {
-            /// dox
-            V {
+            /// dox4
+            V1 {
                 // TODO
+                // /// dox5
                 f: ()
             },
+            /// dox6
+            V2,
+        }
+    }
+}
+
+#[test]
+fn pinned_drop() {
+    pin_project! {
+        pub struct Struct1<'a> {
+            was_dropped: &'a mut bool,
+            #[pin]
+            field: u8,
+        }
+        impl PinnedDrop for Struct1<'_> {
+            fn drop(this: Pin<&mut Self>) {
+                **this.project().was_dropped = true;
+            }
+        }
+    }
+
+    let mut was_dropped = false;
+    drop(Struct1 { was_dropped: &mut was_dropped, field: 42 });
+    assert!(was_dropped);
+
+    pin_project! {
+        pub struct Struct2<'a> {
+            was_dropped: &'a mut bool,
+            #[pin]
+            field: u8,
+        }
+        impl PinnedDrop for Struct2<'_> {
+            fn drop(mut this: Pin<&mut Self>) {
+                **this.as_mut().project().was_dropped = true;
+            }
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! { //~ ERROR E0119
-    struct Foo<T, U> {
-        #[pin]
-        future: T,
-        field: U,
-    }
-}
-
-impl<T, U> Drop for Foo<T, U> {
-    fn drop(&mut self) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-drop.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-drop.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-drop.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-drop.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-error[E0119]: conflicting implementations of trait `_::MustNotImplDrop` for type `Foo<_, _>`:
- --> $DIR/conflict-drop.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR E0119
-4 | |     struct Foo<T, U> {
-5 | |         #[pin]
-6 | |         future: T,
-7 | |         field: U,
-8 | |     }
-9 | | }
-  | | ^
-  | | |
-  | |_first implementation here
-  |   conflicting implementation for `Foo<_, _>`
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-use pin_project_lite::pin_project;
-
-// The same implementation.
-
-pin_project! { //~ ERROR E0119
-    struct Foo<T, U> {
-        #[pin]
-        future: T,
-        field: U,
-    }
-}
-
-// conflicting implementations
-impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-
-// The implementation that under different conditions.
-
-pin_project! { //~ ERROR E0119
-    struct Bar<T, U> {
-        #[pin]
-        future: T,
-        field: U,
-    }
-}
-
-// conflicting implementations
-impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
-
-pin_project! { //~ ERROR E0119
-    struct Baz<T, U> {
-        #[pin]
-        future: T,
-        field: U,
-    }
-}
-
-// conflicting implementations
-impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`:
-  --> $DIR/conflict-unpin.rs:5:1
-   |
-5  | / pin_project! { //~ ERROR E0119
-6  | |     struct Foo<T, U> {
-7  | |         #[pin]
-8  | |         future: T,
-9  | |         field: U,
-10 | |     }
-11 | | }
-   | |_^ conflicting implementation for `Foo<_, _>`
-...
-14 |   impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-   |   --------------------------------------------- first implementation here
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`:
-  --> $DIR/conflict-unpin.rs:18:1
-   |
-18 | / pin_project! { //~ ERROR E0119
-19 | |     struct Bar<T, U> {
-20 | |         #[pin]
-21 | |         future: T,
-22 | |         field: U,
-23 | |     }
-24 | | }
-   | |_^ conflicting implementation for `Bar<_, _>`
-...
-27 |   impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
-   |   ------------------------------ first implementation here
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`:
-  --> $DIR/conflict-unpin.rs:29:1
-   |
-29 | / pin_project! { //~ ERROR E0119
-30 | |     struct Baz<T, U> {
-31 | |         #[pin]
-32 | |         future: T,
-33 | |         field: U,
-34 | |     }
-35 | | }
-   | |_^ conflicting implementation for `Baz<_, _>`
-...
-38 |   impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
-   |   -------------------------------------------- first implementation here
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid-bounds.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid-bounds.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid-bounds.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid-bounds.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! {
-    struct Generics1<T: 'static : Sized> { //~ ERROR no rules expected the token `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics2<T: 'static : ?Sized> { //~ ERROR no rules expected the token `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics3<T: Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics4<T: ?Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics5<T: Sized : ?Sized> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics6<T: ?Sized : Sized> { //~ ERROR no rules expected the token `Sized`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause1<T>
-    where
-        T: 'static : Sized //~ ERROR no rules expected the token `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause2<T>
-    where
-        T: 'static : ?Sized //~ ERROR no rules expected the token `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause3<T>
-    where
-        T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause4<T>
-    where
-        T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause5<T>
-    where
-        T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause6<T>
-    where
-        T: ?Sized : Sized //~ ERROR no rules expected the token `Sized`
-    {
-        field: T,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid-bounds.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid-bounds.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid-bounds.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid-bounds.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-error: no rules expected the token `[`
- --> $DIR/invalid-bounds.rs:3:1
-  |
-3 | / pin_project! {
-4 | |     struct Generics1<T: 'static : Sized> { //~ ERROR no rules expected the token `:`
-5 | |         field: T,
-6 | |     }
-7 | | }
-  | |_^ no rules expected this token in macro call
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/invalid-bounds.rs:9:1
-   |
-9  | / pin_project! {
-10 | |     struct Generics2<T: 'static : ?Sized> { //~ ERROR no rules expected the token `:`
-11 | |         field: T,
-12 | |     }
-13 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected one of `+`, `,`, `=`, or `>`, found `:`
-  --> $DIR/invalid-bounds.rs:15:1
-   |
-15 | / pin_project! {
-16 | |     struct Generics3<T: Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-17 | |         field: T,
-18 | |     }
-19 | | }
-   | | ^
-   | | |
-   | | expected one of `+`, `,`, `=`, or `>`
-   | |_unexpected token
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected one of `+`, `,`, `=`, or `>`, found `:`
-  --> $DIR/invalid-bounds.rs:21:1
-   |
-21 | / pin_project! {
-22 | |     struct Generics4<T: ?Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-23 | |         field: T,
-24 | |     }
-25 | | }
-   | | ^
-   | | |
-   | | expected one of `+`, `,`, `=`, or `>`
-   | |_unexpected token
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected one of `+`, `,`, `=`, or `>`, found `:`
-  --> $DIR/invalid-bounds.rs:27:1
-   |
-27 | / pin_project! {
-28 | |     struct Generics5<T: Sized : ?Sized> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-29 | |         field: T,
-30 | |     }
-31 | | }
-   | | ^
-   | | |
-   | | expected one of `+`, `,`, `=`, or `>`
-   | |_unexpected token
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/invalid-bounds.rs:33:1
-   |
-33 | / pin_project! {
-34 | |     struct Generics6<T: ?Sized : Sized> { //~ ERROR no rules expected the token `Sized`
-35 | |         field: T,
-36 | |     }
-37 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/invalid-bounds.rs:39:1
-   |
-39 | / pin_project! {
-40 | |     struct WhereClause1<T>
-41 | |     where
-42 | |         T: 'static : Sized //~ ERROR no rules expected the token `:`
-...  |
-45 | |     }
-46 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/invalid-bounds.rs:48:1
-   |
-48 | / pin_project! {
-49 | |     struct WhereClause2<T>
-50 | |     where
-51 | |         T: 'static : ?Sized //~ ERROR no rules expected the token `:`
-...  |
-54 | |     }
-55 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected `where`, or `{` after struct name, found `:`
-  --> $DIR/invalid-bounds.rs:57:1
-   |
-57 | / pin_project! {
-58 | |     struct WhereClause3<T>
-59 | |     where
-60 | |         T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
-...  |
-63 | |     }
-64 | | }
-   | | ^
-   | | |
-   | |_expected `where`, or `{` after struct name
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected `where`, or `{` after struct name, found `:`
-  --> $DIR/invalid-bounds.rs:66:1
-   |
-66 | / pin_project! {
-67 | |     struct WhereClause4<T>
-68 | |     where
-69 | |         T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
-...  |
-72 | |     }
-73 | | }
-   | | ^
-   | | |
-   | |_expected `where`, or `{` after struct name
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected `where`, or `{` after struct name, found `:`
-  --> $DIR/invalid-bounds.rs:75:1
-   |
-75 | / pin_project! {
-76 | |     struct WhereClause5<T>
-77 | |     where
-78 | |         T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
-...  |
-81 | |     }
-82 | | }
-   | | ^
-   | | |
-   | |_expected `where`, or `{` after struct name
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/invalid-bounds.rs:84:1
-   |
-84 | / pin_project! {
-85 | |     struct WhereClause6<T>
-86 | |     where
-87 | |         T: ?Sized : Sized //~ ERROR no rules expected the token `Sized`
-...  |
-90 | |     }
-91 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! {
-    struct A<T> {
-        #[pin()] //~ ERROR no rules expected the token `(`
-        pinned: T,
-    }
-}
-
-pin_project! {
-    #[pin] //~ ERROR cannot find attribute `pin` in this scope
-    struct B<T> {
-        pinned: T,
-    }
-}
-
-pin_project! {
-    struct C<T> {
-        #[pin]
-        #[pin] //~ ERROR no rules expected the token `#`
-        pinned: T,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/invalid.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-error: no rules expected the token `[`
- --> $DIR/invalid.rs:3:1
-  |
-3 | / pin_project! {
-4 | |     struct A<T> {
-5 | |         #[pin()] //~ ERROR no rules expected the token `(`
-6 | |         pinned: T,
-7 | |     }
-8 | | }
-  | |_^ no rules expected this token in macro call
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/invalid.rs:17:1
-   |
-17 | / pin_project! {
-18 | |     struct C<T> {
-19 | |         #[pin]
-20 | |         #[pin] //~ ERROR no rules expected the token `#`
-21 | |         pinned: T,
-22 | |     }
-23 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: cannot find attribute `pin` in this scope
-  --> $DIR/invalid.rs:11:7
-   |
-11 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
-   |       ^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_lifetime_names.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_lifetime_names.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_lifetime_names.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_lifetime_names.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! { //~ ERROR E0496
-    pub struct Foo<'__pin, T> { //~ ERROR E0263
-        #[pin]
-        field: &'__pin mut T,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_lifetime_names.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_lifetime_names.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_lifetime_names.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_lifetime_names.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-error[E0496]: lifetime name `'__pin` shadows a lifetime name that is already in scope
- --> $DIR/overlapping_lifetime_names.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ------ first declared here
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_^ lifetime '__pin already in scope
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0496]: lifetime name `'__pin` shadows a lifetime name that is already in scope
- --> $DIR/overlapping_lifetime_names.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ------ first declared here
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_^ lifetime '__pin already in scope
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0263]: lifetime name `'__pin` declared twice in the same scope
- --> $DIR/overlapping_lifetime_names.rs:4:20
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ^^^^^^ declared twice
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_- previous declaration here
-
-error[E0263]: lifetime name `'__pin` declared twice in the same scope
- --> $DIR/overlapping_lifetime_names.rs:4:20
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ^^^^^^ declared twice
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_- previous declaration here
-
-error[E0263]: lifetime name `'__pin` declared twice in the same scope
- --> $DIR/overlapping_lifetime_names.rs:4:20
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ^^^^^^ declared twice
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_- previous declaration here
-
-error[E0263]: lifetime name `'__pin` declared twice in the same scope
- --> $DIR/overlapping_lifetime_names.rs:4:20
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ^^^^^^ declared twice
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_- previous declaration here
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_unpin_struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_unpin_struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_unpin_struct.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_unpin_struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-use pin_project_lite::pin_project;
-use std::marker::PhantomPinned;
-
-pin_project! {
-    struct Foo<T> {
-        #[pin]
-        inner: T,
-    }
-}
-
-struct __Origin {}
-
-impl Unpin for __Origin {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_unpin_struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_unpin_struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_unpin_struct.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/overlapping_unpin_struct.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/overlapping_unpin_struct.rs:18:5
-   |
-15 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-18 |     is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `_::__Origin<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `_::__Origin<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<PhantomPinned>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/packed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/packed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/packed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/packed.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-    #[repr(packed, C)]
-    struct A {
-        #[pin]
-        field: u16,
-    }
-}
-
-pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-    #[repr(packed(2))]
-    struct C {
-        #[pin]
-        field: u32,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/packed.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/packed.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/packed.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/packed.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-error: borrow of packed field is unsafe and requires unsafe function or block (error E0133)
- --> $DIR/packed.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-4 | |     #[repr(packed, C)]
-5 | |     struct A {
-6 | |         #[pin]
-7 | |         field: u16,
-8 | |     }
-9 | | }
-  | |_^
-  |
-note: the lint level is defined here
- --> $DIR/packed.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-4 | |     #[repr(packed, C)]
-5 | |     struct A {
-6 | |         #[pin]
-7 | |         field: u16,
-8 | |     }
-9 | | }
-  | |_^
-  = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-  = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
-  = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: borrow of packed field is unsafe and requires unsafe function or block (error E0133)
-  --> $DIR/packed.rs:11:1
-   |
-11 | / pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-12 | |     #[repr(packed(2))]
-13 | |     struct C {
-14 | |         #[pin]
-15 | |         field: u32,
-16 | |     }
-17 | | }
-   | |_^
-   |
-note: the lint level is defined here
-  --> $DIR/packed.rs:11:1
-   |
-11 | / pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-12 | |     #[repr(packed(2))]
-13 | |     struct C {
-14 | |         #[pin]
-15 | |         field: u32,
-16 | |     }
-17 | | }
-   | |_^
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
-   = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/call-drop-inner.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/call-drop-inner.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/call-drop-inner.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/call-drop-inner.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    pub struct S {
+        #[pin]
+        field: u8,
+    }
+    impl PinnedDrop for S {
+        fn drop(this: Pin<&mut Self>) {
+            __drop_inner(this);
+        }
+    }
+}
+
+fn main() {
+    let _x = S { field: 0 };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/call-drop-inner.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/call-drop-inner.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/call-drop-inner.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/call-drop-inner.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+error[E0061]: this function takes 0 arguments but 1 argument was supplied
+  --> $DIR/call-drop-inner.rs:10:13
+   |
+10 |             __drop_inner(this);
+   |             ^^^^^^^^^^^^ ---- supplied 1 argument
+   |             |
+   |             expected 0 arguments
+   |
+note: function defined here
+  --> $DIR/call-drop-inner.rs:3:1
+   |
+3  | / pin_project! {
+4  | |     pub struct S {
+5  | |         #[pin]
+6  | |         field: u8,
+...  |
+12 | |     }
+13 | | }
+   | |_^
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/conditional-drop-impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/conditional-drop-impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/conditional-drop-impl.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/conditional-drop-impl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+use pin_project_lite::pin_project;
+
+// In `Drop` impl, the implementor must specify the same requirement as type definition.
+
+struct DropImpl<T> {
+    f: T,
+}
+
+impl<T: Unpin> Drop for DropImpl<T> {
+    //~^ ERROR E0367
+    fn drop(&mut self) {}
+}
+
+pin_project! {
+    //~^ ERROR E0367
+    struct PinnedDropImpl<T> {
+        #[pin]
+        f: T,
+    }
+
+    impl<T: Unpin> PinnedDrop for PinnedDropImpl<T> {
+        fn drop(_this: Pin<&mut Self>) {}
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/conditional-drop-impl.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/conditional-drop-impl.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/conditional-drop-impl.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pinned_drop/conditional-drop-impl.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,38 @@
+error[E0367]: `Drop` impl requires `T: Unpin` but the struct it is implemented for does not
+ --> $DIR/conditional-drop-impl.rs:9:9
+  |
+9 | impl<T: Unpin> Drop for DropImpl<T> {
+  |         ^^^^^
+  |
+note: the implementor must specify the same requirement
+ --> $DIR/conditional-drop-impl.rs:5:1
+  |
+5 | / struct DropImpl<T> {
+6 | |     f: T,
+7 | | }
+  | |_^
+
+error[E0367]: `Drop` impl requires `T: Unpin` but the struct it is implemented for does not
+  --> $DIR/conditional-drop-impl.rs:14:1
+   |
+14 | / pin_project! {
+15 | |     //~^ ERROR E0367
+16 | |     struct PinnedDropImpl<T> {
+17 | |         #[pin]
+...  |
+23 | |     }
+24 | | }
+   | |_^
+   |
+note: the implementor must specify the same requirement
+  --> $DIR/conditional-drop-impl.rs:14:1
+   |
+14 | / pin_project! {
+15 | |     //~^ ERROR E0367
+16 | |     struct PinnedDropImpl<T> {
+17 | |         #[pin]
+...  |
+23 | |     }
+24 | | }
+   | |_^
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-drop.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-drop.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+use pin_project_lite::pin_project;
+
+pin_project! { //~ ERROR E0119
+    struct Foo<T, U> {
+        #[pin]
+        future: T,
+        field: U,
+    }
+}
+
+impl<T, U> Drop for Foo<T, U> {
+    fn drop(&mut self) {}
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-drop.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-drop.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-drop.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-drop.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+error[E0119]: conflicting implementations of trait `_::MustNotImplDrop` for type `Foo<_, _>`
+ --> $DIR/conflict-drop.rs:3:1
+  |
+3 | / pin_project! { //~ ERROR E0119
+4 | |     struct Foo<T, U> {
+5 | |         #[pin]
+6 | |         future: T,
+7 | |         field: U,
+8 | |     }
+9 | | }
+  | | ^
+  | | |
+  | |_first implementation here
+  |   conflicting implementation for `Foo<_, _>`
+  |
+  = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-unpin.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+use pin_project_lite::pin_project;
+
+// The same implementation.
+
+pin_project! { //~ ERROR E0119
+    struct Foo<T, U> {
+        #[pin]
+        future: T,
+        field: U,
+    }
+}
+
+// conflicting implementations
+impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
+
+// The implementation that under different conditions.
+
+pin_project! { //~ ERROR E0119
+    struct Bar<T, U> {
+        #[pin]
+        future: T,
+        field: U,
+    }
+}
+
+// conflicting implementations
+impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
+
+pin_project! { //~ ERROR E0119
+    struct Baz<T, U> {
+        #[pin]
+        future: T,
+        field: U,
+    }
+}
+
+// conflicting implementations
+impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/conflict-unpin.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,50 @@
+error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`
+  --> $DIR/conflict-unpin.rs:5:1
+   |
+5  | / pin_project! { //~ ERROR E0119
+6  | |     struct Foo<T, U> {
+7  | |         #[pin]
+8  | |         future: T,
+9  | |         field: U,
+10 | |     }
+11 | | }
+   | |_^ conflicting implementation for `Foo<_, _>`
+...
+14 |   impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
+   |   --------------------------------------------- first implementation here
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`
+  --> $DIR/conflict-unpin.rs:18:1
+   |
+18 | / pin_project! { //~ ERROR E0119
+19 | |     struct Bar<T, U> {
+20 | |         #[pin]
+21 | |         future: T,
+22 | |         field: U,
+23 | |     }
+24 | | }
+   | |_^ conflicting implementation for `Bar<_, _>`
+...
+27 |   impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
+   |   ------------------------------ first implementation here
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`
+  --> $DIR/conflict-unpin.rs:29:1
+   |
+29 | / pin_project! { //~ ERROR E0119
+30 | |     struct Baz<T, U> {
+31 | |         #[pin]
+32 | |         future: T,
+33 | |         field: U,
+34 | |     }
+35 | | }
+   | |_^ conflicting implementation for `Baz<_, _>`
+...
+38 |   impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
+   |   -------------------------------------------- first implementation here
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid-bounds.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid-bounds.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid-bounds.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid-bounds.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    struct Generics1<T: 'static : Sized> { //~ ERROR no rules expected the token `:`
+        field: T,
+    }
+}
+
+pin_project! {
+    struct Generics2<T: 'static : ?Sized> { //~ ERROR no rules expected the token `:`
+        field: T,
+    }
+}
+
+pin_project! {
+    struct Generics3<T: Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
+        field: T,
+    }
+}
+
+pin_project! {
+    struct Generics4<T: ?Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
+        field: T,
+    }
+}
+
+pin_project! {
+    struct Generics5<T: Sized : ?Sized> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
+        field: T,
+    }
+}
+
+pin_project! {
+    struct Generics6<T: ?Sized : Sized> { //~ ERROR no rules expected the token `Sized`
+        field: T,
+    }
+}
+
+pin_project! {
+    struct WhereClause1<T>
+    where
+        T: 'static : Sized //~ ERROR no rules expected the token `:`
+    {
+        field: T,
+    }
+}
+
+pin_project! {
+    struct WhereClause2<T>
+    where
+        T: 'static : ?Sized //~ ERROR no rules expected the token `:`
+    {
+        field: T,
+    }
+}
+
+pin_project! {
+    struct WhereClause3<T>
+    where
+        T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
+    {
+        field: T,
+    }
+}
+
+pin_project! {
+    struct WhereClause4<T>
+    where
+        T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
+    {
+        field: T,
+    }
+}
+
+pin_project! {
+    struct WhereClause5<T>
+    where
+        T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
+    {
+        field: T,
+    }
+}
+
+pin_project! {
+    struct WhereClause6<T>
+    where
+        T: ?Sized : Sized //~ ERROR no rules expected the token `Sized`
+    {
+        field: T,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid-bounds.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid-bounds.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid-bounds.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid-bounds.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,176 @@
+error: no rules expected the token `[`
+ --> $DIR/invalid-bounds.rs:3:1
+  |
+3 | / pin_project! {
+4 | |     struct Generics1<T: 'static : Sized> { //~ ERROR no rules expected the token `:`
+5 | |         field: T,
+6 | |     }
+7 | | }
+  | |_^ no rules expected this token in macro call
+  |
+  = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/invalid-bounds.rs:9:1
+   |
+9  | / pin_project! {
+10 | |     struct Generics2<T: 'static : ?Sized> { //~ ERROR no rules expected the token `:`
+11 | |         field: T,
+12 | |     }
+13 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected one of `+`, `,`, `=`, or `>`, found `:`
+  --> $DIR/invalid-bounds.rs:15:1
+   |
+15 | / pin_project! {
+16 | |     struct Generics3<T: Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
+17 | |         field: T,
+18 | |     }
+19 | | }
+   | | ^
+   | | |
+   | | expected one of `+`, `,`, `=`, or `>`
+   | |_unexpected token
+   |   in this macro invocation
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected one of `+`, `,`, `=`, or `>`, found `:`
+  --> $DIR/invalid-bounds.rs:21:1
+   |
+21 | / pin_project! {
+22 | |     struct Generics4<T: ?Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
+23 | |         field: T,
+24 | |     }
+25 | | }
+   | | ^
+   | | |
+   | | expected one of `+`, `,`, `=`, or `>`
+   | |_unexpected token
+   |   in this macro invocation
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected one of `+`, `,`, `=`, or `>`, found `:`
+  --> $DIR/invalid-bounds.rs:27:1
+   |
+27 | / pin_project! {
+28 | |     struct Generics5<T: Sized : ?Sized> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
+29 | |         field: T,
+30 | |     }
+31 | | }
+   | | ^
+   | | |
+   | | expected one of `+`, `,`, `=`, or `>`
+   | |_unexpected token
+   |   in this macro invocation
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/invalid-bounds.rs:33:1
+   |
+33 | / pin_project! {
+34 | |     struct Generics6<T: ?Sized : Sized> { //~ ERROR no rules expected the token `Sized`
+35 | |         field: T,
+36 | |     }
+37 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/invalid-bounds.rs:39:1
+   |
+39 | / pin_project! {
+40 | |     struct WhereClause1<T>
+41 | |     where
+42 | |         T: 'static : Sized //~ ERROR no rules expected the token `:`
+...  |
+45 | |     }
+46 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/invalid-bounds.rs:48:1
+   |
+48 | / pin_project! {
+49 | |     struct WhereClause2<T>
+50 | |     where
+51 | |         T: 'static : ?Sized //~ ERROR no rules expected the token `:`
+...  |
+54 | |     }
+55 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected `where`, or `{` after struct name, found `:`
+  --> $DIR/invalid-bounds.rs:57:1
+   |
+57 | / pin_project! {
+58 | |     struct WhereClause3<T>
+59 | |     where
+60 | |         T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
+...  |
+63 | |     }
+64 | | }
+   | | ^
+   | | |
+   | |_expected `where`, or `{` after struct name
+   |   in this macro invocation
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected `where`, or `{` after struct name, found `:`
+  --> $DIR/invalid-bounds.rs:66:1
+   |
+66 | / pin_project! {
+67 | |     struct WhereClause4<T>
+68 | |     where
+69 | |         T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
+...  |
+72 | |     }
+73 | | }
+   | | ^
+   | | |
+   | |_expected `where`, or `{` after struct name
+   |   in this macro invocation
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected `where`, or `{` after struct name, found `:`
+  --> $DIR/invalid-bounds.rs:75:1
+   |
+75 | / pin_project! {
+76 | |     struct WhereClause5<T>
+77 | |     where
+78 | |         T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
+...  |
+81 | |     }
+82 | | }
+   | | ^
+   | | |
+   | |_expected `where`, or `{` after struct name
+   |   in this macro invocation
+   |
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/invalid-bounds.rs:84:1
+   |
+84 | / pin_project! {
+85 | |     struct WhereClause6<T>
+86 | |     where
+87 | |         T: ?Sized : Sized //~ ERROR no rules expected the token `Sized`
+...  |
+90 | |     }
+91 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    struct A<T> {
+        #[pin()] //~ ERROR no rules expected the token `(`
+        pinned: T,
+    }
+}
+
+pin_project! {
+    #[pin] //~ ERROR cannot find attribute `pin` in this scope
+    struct B<T> {
+        pinned: T,
+    }
+}
+
+pin_project! {
+    struct C<T> {
+        #[pin]
+        #[pin] //~ ERROR no rules expected the token `#`
+        pinned: T,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/invalid.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,32 @@
+error: no rules expected the token `[`
+ --> $DIR/invalid.rs:3:1
+  |
+3 | / pin_project! {
+4 | |     struct A<T> {
+5 | |         #[pin()] //~ ERROR no rules expected the token `(`
+6 | |         pinned: T,
+7 | |     }
+8 | | }
+  | |_^ no rules expected this token in macro call
+  |
+  = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/invalid.rs:17:1
+   |
+17 | / pin_project! {
+18 | |     struct C<T> {
+19 | |         #[pin]
+20 | |         #[pin] //~ ERROR no rules expected the token `#`
+21 | |         pinned: T,
+22 | |     }
+23 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: cannot find attribute `pin` in this scope
+  --> $DIR/invalid.rs:11:7
+   |
+11 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
+   |       ^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_lifetime_names.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_lifetime_names.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_lifetime_names.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_lifetime_names.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+use pin_project_lite::pin_project;
+
+pin_project! { //~ ERROR E0263,E0496
+    pub struct Foo<'__pin, T> {
+        #[pin]
+        field: &'__pin mut T,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_lifetime_names.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_lifetime_names.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_lifetime_names.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_lifetime_names.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,75 @@
+error[E0263]: lifetime name `'__pin` declared twice in the same scope
+ --> $DIR/overlapping_lifetime_names.rs:4:20
+  |
+3 | / pin_project! { //~ ERROR E0263,E0496
+4 | |     pub struct Foo<'__pin, T> {
+  | |                    ^^^^^^ declared twice
+5 | |         #[pin]
+6 | |         field: &'__pin mut T,
+7 | |     }
+8 | | }
+  | |_- previous declaration here
+
+error[E0263]: lifetime name `'__pin` declared twice in the same scope
+ --> $DIR/overlapping_lifetime_names.rs:4:20
+  |
+3 | / pin_project! { //~ ERROR E0263,E0496
+4 | |     pub struct Foo<'__pin, T> {
+  | |                    ^^^^^^ declared twice
+5 | |         #[pin]
+6 | |         field: &'__pin mut T,
+7 | |     }
+8 | | }
+  | |_- previous declaration here
+
+error[E0263]: lifetime name `'__pin` declared twice in the same scope
+ --> $DIR/overlapping_lifetime_names.rs:4:20
+  |
+3 | / pin_project! { //~ ERROR E0263,E0496
+4 | |     pub struct Foo<'__pin, T> {
+  | |                    ^^^^^^ declared twice
+5 | |         #[pin]
+6 | |         field: &'__pin mut T,
+7 | |     }
+8 | | }
+  | |_- previous declaration here
+
+error[E0496]: lifetime name `'__pin` shadows a lifetime name that is already in scope
+ --> $DIR/overlapping_lifetime_names.rs:3:1
+  |
+3 | / pin_project! { //~ ERROR E0263,E0496
+4 | |     pub struct Foo<'__pin, T> {
+  | |                    ------ first declared here
+5 | |         #[pin]
+6 | |         field: &'__pin mut T,
+7 | |     }
+8 | | }
+  | |_^ lifetime `'__pin` already in scope
+  |
+  = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0496]: lifetime name `'__pin` shadows a lifetime name that is already in scope
+ --> $DIR/overlapping_lifetime_names.rs:3:1
+  |
+3 | / pin_project! { //~ ERROR E0263,E0496
+4 | |     pub struct Foo<'__pin, T> {
+  | |                    ------ first declared here
+5 | |         #[pin]
+6 | |         field: &'__pin mut T,
+7 | |     }
+8 | | }
+  | |_^ lifetime `'__pin` already in scope
+  |
+  = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0263]: lifetime name `'__pin` declared twice in the same scope
+ --> $DIR/overlapping_lifetime_names.rs:4:20
+  |
+3 | / pin_project! { //~ ERROR E0263,E0496
+4 | |     pub struct Foo<'__pin, T> {
+  | |                    ^^^^^^ declared twice
+5 | |         #[pin]
+6 | |         field: &'__pin mut T,
+7 | |     }
+8 | | }
+  | |_- previous declaration here
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_unpin_struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_unpin_struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_unpin_struct.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_unpin_struct.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+use std::marker::PhantomPinned;
+
+use pin_project_lite::pin_project;
+
+pin_project! {
+    struct Foo<T> {
+        #[pin]
+        inner: T,
+    }
+}
+
+struct __Origin {}
+
+impl Unpin for __Origin {}
+
+fn is_unpin<T: Unpin>() {}
+
+fn main() {
+    is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_unpin_struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_unpin_struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_unpin_struct.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/overlapping_unpin_struct.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+error[E0277]: `PhantomPinned` cannot be unpinned
+  --> $DIR/overlapping_unpin_struct.rs:19:5
+   |
+16 | fn is_unpin<T: Unpin>() {}
+   |                ----- required by this bound in `is_unpin`
+...
+19 |     is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `_::__Origin<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
+   |
+   = note: consider using `Box::pin`
+note: required because it appears within the type `_::__Origin<'_, PhantomPinned>`
+  --> $DIR/overlapping_unpin_struct.rs:5:1
+   |
+5  | / pin_project! {
+6  | |     struct Foo<T> {
+7  | |         #[pin]
+8  | |         inner: T,
+9  | |     }
+10 | | }
+   | |_^
+   = note: required because of the requirements on the impl of `Unpin` for `Foo<PhantomPinned>`
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/packed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/packed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/packed.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/packed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+#![allow(unaligned_references)]
+
+use pin_project_lite::pin_project;
+
+pin_project! { //~ ERROR reference to packed field is unaligned
+    #[repr(packed, C)]
+    struct Packed {
+        #[pin]
+        field: u16,
+    }
+}
+
+pin_project! { //~ ERROR reference to packed field is unaligned
+    #[repr(packed(2))]
+    struct PackedN {
+        #[pin]
+        field: u32,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/packed.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/packed.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/packed.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/packed.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,55 @@
+error: reference to packed field is unaligned
+  --> $DIR/packed.rs:5:1
+   |
+5  | / pin_project! { //~ ERROR reference to packed field is unaligned
+6  | |     #[repr(packed, C)]
+7  | |     struct Packed {
+8  | |         #[pin]
+9  | |         field: u16,
+10 | |     }
+11 | | }
+   | |_^
+   |
+note: the lint level is defined here
+  --> $DIR/packed.rs:5:1
+   |
+5  | / pin_project! { //~ ERROR reference to packed field is unaligned
+6  | |     #[repr(packed, C)]
+7  | |     struct Packed {
+8  | |         #[pin]
+9  | |         field: u16,
+10 | |     }
+11 | | }
+   | |_^
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #82523 <https://github.com/rust-lang/rust/issues/82523>
+   = note: fields of packed structs are not properly aligned, and creating a misaligned reference is undefined behavior (even if that reference is never dereferenced)
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: reference to packed field is unaligned
+  --> $DIR/packed.rs:13:1
+   |
+13 | / pin_project! { //~ ERROR reference to packed field is unaligned
+14 | |     #[repr(packed(2))]
+15 | |     struct PackedN {
+16 | |         #[pin]
+17 | |         field: u32,
+18 | |     }
+19 | | }
+   | |_^
+   |
+note: the lint level is defined here
+  --> $DIR/packed.rs:13:1
+   |
+13 | / pin_project! { //~ ERROR reference to packed field is unaligned
+14 | |     #[repr(packed(2))]
+15 | |     struct PackedN {
+16 | |         #[pin]
+17 | |         field: u32,
+18 | |     }
+19 | | }
+   | |_^
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #82523 <https://github.com/rust-lang/rust/issues/82523>
+   = note: fields of packed structs are not properly aligned, and creating a misaligned reference is undefined behavior (even if that reference is never dereferenced)
+   = note: this error originates in the macro `$crate::__pin_project_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unpin_sneaky.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unpin_sneaky.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unpin_sneaky.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unpin_sneaky.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,12 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    struct Foo {
+        #[pin]
+        inner: u8,
+    }
+}
+
+impl Unpin for __Origin {} //~ ERROR E0412,E0321
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unpin_sneaky.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unpin_sneaky.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unpin_sneaky.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unpin_sneaky.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+error[E0412]: cannot find type `__Origin` in this scope
+  --> $DIR/unpin_sneaky.rs:10:16
+   |
+10 | impl Unpin for __Origin {} //~ ERROR E0412,E0321
+   |                ^^^^^^^^ not found in this scope
+
+error[E0321]: cross-crate traits with a default impl, like `Unpin`, can only be implemented for a struct/enum type, not `[type error]`
+  --> $DIR/unpin_sneaky.rs:10:1
+   |
+10 | impl Unpin for __Origin {} //~ ERROR E0412,E0321
+   | ^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unsupported.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unsupported.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unsupported.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unsupported.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+use pin_project_lite::pin_project;
+
+pin_project! {
+    struct Struct1 {} //~ ERROR no rules expected the token `}`
+}
+
+pin_project! {
+    struct Struct2(); //~ ERROR no rules expected the token `(`
+}
+
+pin_project! {
+    struct Struct3; //~ ERROR no rules expected the token `;`
+}
+
+pin_project! {
+    enum Enum { //~ ERROR no rules expected the token `enum`
+        A(u8)
+    }
+}
+
+pin_project! {
+    union Union { //~ ERROR no rules expected the token `union`
+        x: u8,
+    }
+}
+
+fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unsupported.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unsupported.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unsupported.stderr	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/pin_project/unsupported.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+error: no rules expected the token `[`
+ --> $DIR/unsupported.rs:3:1
+  |
+3 | / pin_project! {
+4 | |     struct Struct1 {} //~ ERROR no rules expected the token `}`
+5 | | }
+  | |_^ no rules expected this token in macro call
+  |
+  = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+ --> $DIR/unsupported.rs:7:1
+  |
+7 | / pin_project! {
+8 | |     struct Struct2(); //~ ERROR no rules expected the token `(`
+9 | | }
+  | |_^ no rules expected this token in macro call
+  |
+  = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/unsupported.rs:11:1
+   |
+11 | / pin_project! {
+12 | |     struct Struct3; //~ ERROR no rules expected the token `;`
+13 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/unsupported.rs:15:1
+   |
+15 | / pin_project! {
+16 | |     enum Enum { //~ ERROR no rules expected the token `enum`
+17 | |         A(u8)
+18 | |     }
+19 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: no rules expected the token `[`
+  --> $DIR/unsupported.rs:21:1
+   |
+21 | / pin_project! {
+22 | |     union Union { //~ ERROR no rules expected the token `union`
+23 | |         x: u8,
+24 | |     }
+25 | | }
+   | |_^ no rules expected this token in macro call
+   |
+   = note: this error originates in the macro `pin_project` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unpin_sneaky.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unpin_sneaky.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unpin_sneaky.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unpin_sneaky.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! {
-    struct Foo {
-        #[pin]
-        inner: u8,
-    }
-}
-
-impl Unpin for __Origin {} //~ ERROR E0412,E0321
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unpin_sneaky.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unpin_sneaky.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unpin_sneaky.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unpin_sneaky.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0412]: cannot find type `__Origin` in this scope
-  --> $DIR/unpin_sneaky.rs:10:16
-   |
-10 | impl Unpin for __Origin {} //~ ERROR E0412,E0321
-   |                ^^^^^^^^ not found in this scope
-
-error[E0321]: cross-crate traits with a default impl, like `Unpin`, can only be implemented for a struct/enum type, not `[type error]`
-  --> $DIR/unpin_sneaky.rs:10:1
-   |
-10 | impl Unpin for __Origin {} //~ ERROR E0412,E0321
-   | ^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unsupported.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unsupported.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unsupported.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unsupported.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! {
-    struct Struct1 {} //~ ERROR no rules expected the token `}`
-}
-
-pin_project! {
-    struct Struct2(); //~ ERROR no rules expected the token `(`
-}
-
-pin_project! {
-    struct Struct3; //~ ERROR no rules expected the token `;`
-}
-
-pin_project! {
-    enum Enum { //~ ERROR no rules expected the token `enum`
-        A(u8)
-    }
-}
-
-pin_project! {
-    union Union { //~ ERROR no rules expected the token `union`
-        x: u8,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unsupported.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unsupported.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unsupported.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite/tests/ui/unsupported.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-error: no rules expected the token `[`
- --> $DIR/unsupported.rs:3:1
-  |
-3 | / pin_project! {
-4 | |     struct Struct1 {} //~ ERROR no rules expected the token `}`
-5 | | }
-  | |_^ no rules expected this token in macro call
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
- --> $DIR/unsupported.rs:7:1
-  |
-7 | / pin_project! {
-8 | |     struct Struct2(); //~ ERROR no rules expected the token `(`
-9 | | }
-  | |_^ no rules expected this token in macro call
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/unsupported.rs:11:1
-   |
-11 | / pin_project! {
-12 | |     struct Struct3; //~ ERROR no rules expected the token `;`
-13 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/unsupported.rs:15:1
-   |
-15 | / pin_project! {
-16 | |     enum Enum { //~ ERROR no rules expected the token `enum`
-17 | |         A(u8)
-18 | |     }
-19 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `[`
-  --> $DIR/unsupported.rs:21:1
-   |
-21 | / pin_project! {
-22 | |     union Union { //~ ERROR no rules expected the token `union`
-23 | |         x: u8,
-24 | |     }
-25 | | }
-   | |_^ no rules expected this token in macro call
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"b895b14cec64ffe6075e11fa69e8fdc733b341239453722776b0bf2a3374d7e0","CODE_OF_CONDUCT.md":"33042efe677068212dd54b70996bf2f686f917dd42d6bdc7128f18f76d918e3f","Cargo.toml":"7d4ac40f5419bbe08b1389735fd24eea8cd02b493f15ee9d5c42da88856c9afd","LICENSE-APACHE":"0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"00c5f78218b433dcb02ee227b583d23a1528514a307579d411a9d9920be53a19","ci/install-component.sh":"1a87334e634ef9a646b1860be8ad93d743e0cd800054984d0739bcae01783651","ci/install-rust.sh":"bd13c579c26be1de25d66375abfaeddc88d7178a29b563b1d5bca6d237a3db81","rustfmt.toml":"fea1141ea1c38770e1233b46690325408c54e586dde02a4986f8a756ef3162ed","scripts/README.md":"d8a7a81b5c98ced28bc4429ecf00f981c1f3550595e0f3705ddcd42fb0e9e850","scripts/check-minimal-versions.sh":"3ede220d797b0427afd494e9df4c7eeefdf7d1283282ac90dfcfbd36c6a9fb3f","scripts/ci.sh":"0c71c2071b35bab6d07a740b3f0b0eb6140690578a579fd291514034bcfc8e95","scripts/expandtest.sh":"e4ac387b19a84d7aea575c52b697a4370f1154703a242758fc9058e5ed559b41","src/lib.rs":"98ef4903e469e7095cd4be912573b64e5dbc189baa3591186067f38e5b61aa7d","tests/auxiliary/mod.rs":"7e263e987e09b77e384f734384a00a71c5b70230bb1b5376446ef003a8da9372","tests/compiletest.rs":"39d2a829c224453bb4eab9779001a919f5d97e865ca666afc448b8782ac3f733","tests/include/basic.rs":"c3f9a1703b7a4f370842e0678b4ecd739f8452aec184b1115f11e0c3822e79e0","tests/lint.rs":"01699b80d2358f837da55db6855077e088c35e091ada40acd2c04ed7d7e3163f","tests/lint.txt":"a1fb090cadc3e31545aa05e15493da3e7c5758877feae97f1f5e2b3f85993bf4","tests/proper_unpin.rs":"48a38027c845f798b974432319e13ad30e2922d13eb96efb66ea6314df24fd26","tests/test.rs":"143fa5c9f12a8358d5b0066ed65e7e8af590e8b815c873fb6c3fba62a7e86e9a","tests/ui/conflict-drop.rs":"55e6809b5f59dd81e32c2c89b742c0c76db6b099a1d2621e5b882c0d20f92837","tests/ui/conflict-drop.stderr":"b29a458533f0312b2b04e9a0dfea17fce2ba423ef764ec3e2996a315c00a4cf8","tests/ui/conflict-unpin.rs":"51b3b6720fa581b63167d6ac941a1ea1bf739b09954931b2bc2f7abe2d934f26","tests/ui/conflict-unpin.stderr":"ab8e9acab4ffcdff1d0065e9504d64a0220267ab9f18b2840c97da8c0bbbf984","tests/ui/invalid-bounds.rs":"f86f23d377df015182f2f5dae6464a4f98c37f2198e0646f721fedc4017cb82c","tests/ui/invalid-bounds.stderr":"59c3b887b5f2d87804c25c54f4427e616947821c8f3fc5642dfc1ced67520b71","tests/ui/invalid.rs":"7304bd4a5bac1419382742432cfa8af83535d7be8cfad52c661410e0e9e8207a","tests/ui/invalid.stderr":"cb935ec370a87ba511aeef64613e7351b2eac9e574b5a256c7cb3c30f4bd74a6","tests/ui/overlapping_lifetime_names.rs":"a64c42cc56fa4751d73a1db80a7deb568427dc96f30c1a29665067d8c0ecb2c9","tests/ui/overlapping_lifetime_names.stderr":"057258cbcd8094c61b9c24b1616e7058bb79721b5aa15d42fc705744fcf0c1dd","tests/ui/overlapping_unpin_struct.rs":"5fde23ef628d2dbd27377ffa472fc19b1c6873122f38c3fb1f84fda8602f55f3","tests/ui/overlapping_unpin_struct.stderr":"e83e99bacdf6564727c77dafe5eaf000b4de6e784e6032b9b0ecca831ecc528c","tests/ui/packed.rs":"12b14e183c809b267f0feff0b6c8bf8d664315e6959d236bd7a0887fc226b9bf","tests/ui/packed.stderr":"f4c443844179d45d7e56a20aae9246fccd38adf0eb9bff1540d3ab0c354c2b6e","tests/ui/unpin_sneaky.rs":"12e97a387ce1af6ee6a567687674aab70e96962a48f2433c39976d0b3e2c3341","tests/ui/unpin_sneaky.stderr":"7b2bc76faca39f77968c798674f2321111a74a5754512149320ea4cdd3e278d5","tests/ui/unsupported.rs":"14defa90e736f314bbbc219973929b77bdd22e5f7e4c4c88403db764f4d167d6","tests/ui/unsupported.stderr":"310a8a7ed4e8120fa570957800e6cc86ff5561580a241ab808092e99a1f3b8b2"},"package":"c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "pin-project-lite"
-version = "0.1.11"
-authors = ["Taiki Endo <te316e89@gmail.com>"]
-description = "A lightweight version of pin-project written with declarative macros.\n"
-homepage = "https://github.com/taiki-e/pin-project-lite"
-documentation = "https://docs.rs/pin-project-lite"
-readme = "README.md"
-keywords = ["pin", "macros"]
-categories = ["no-std", "rust-patterns"]
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/taiki-e/pin-project-lite"
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
-[dev-dependencies.rustversion]
-version = "1"
-
-[dev-dependencies.static_assertions]
-version = "1"
-
-[dev-dependencies.trybuild]
-version = "1"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-This project adheres to [Semantic Versioning](https://semver.org).
-
-## [Unreleased]
-
-## [0.1.11] - 2020-10-20
-
-* Suppress `clippy::redundant_pub_crate` lint in generated code.
-
-* Documentation improvements.
-
-## [0.1.10] - 2020-10-01
-
-* Suppress `drop_bounds` lint, which will be added to rustc in the future. See [taiki-e/pin-project#272](https://github.com/taiki-e/pin-project/issues/272) for more details.
-
-## [0.1.9] - 2020-09-29
-
-* Fix trailing comma support in generics
-
-## [0.1.8] - 2020-09-26
-
-* Fix compatibility of generated code with `forbid(future_incompatible)`
-
-  Note: This does not guarantee compatibility with `forbid(future_incompatible)` in the future.
-  If rustc adds a new lint, we may not be able to keep this.
-
-## [0.1.7] - 2020-06-04
-
-* [Support `?Sized` bounds in where clauses.][22]
-
-* [Fix lifetime inference error when an associated type is used in fields.][20]
-
-* Suppress `clippy::used_underscore_binding` lint in generated code.
-
-* Documentation improvements.
-
-[20]: https://github.com/taiki-e/pin-project-lite/pull/20
-[22]: https://github.com/taiki-e/pin-project-lite/pull/22
-
-## [0.1.6] - 2020-05-31
-
-* [Support lifetime bounds in where clauses.][18]
-
-* Documentation improvements.
-
-[18]: https://github.com/taiki-e/pin-project-lite/pull/18
-
-## [0.1.5] - 2020-05-07
-
-* [Support overwriting the name of core crate.][14]
-
-[14]: https://github.com/taiki-e/pin-project-lite/pull/14
-
-## [0.1.4] - 2020-01-20
-
-* [Support ?Sized bounds in generic parameters.][9]
-
-[9]: https://github.com/taiki-e/pin-project-lite/pull/9
-
-## [0.1.3] - 2020-01-20
-
-* [Support lifetime bounds in generic parameters.][7]
-
-[7]: https://github.com/taiki-e/pin-project-lite/pull/7
-
-## [0.1.2] - 2020-01-05
-
-* [Support recognizing default generic parameters.][6]
-
-[6]: https://github.com/taiki-e/pin-project-lite/pull/6
-
-## [0.1.1] - 2019-11-15
-
-* [`pin_project!` macro now determines the visibility of the projection type/method is based on the original type.][5]
-
-[5]: https://github.com/taiki-e/pin-project-lite/pull/5
-
-## [0.1.0] - 2019-10-22
-
-Initial release
-
-[Unreleased]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.11...HEAD
-[0.1.11]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.10...v0.1.11
-[0.1.10]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.9...v0.1.10
-[0.1.9]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.8...v0.1.9
-[0.1.8]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.7...v0.1.8
-[0.1.7]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.6...v0.1.7
-[0.1.6]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.5...v0.1.6
-[0.1.5]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.4...v0.1.5
-[0.1.4]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.3...v0.1.4
-[0.1.3]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.2...v0.1.3
-[0.1.2]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/taiki-e/pin-project-lite/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/taiki-e/pin-project-lite/releases/tag/v0.1.0
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/ci/install-component.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/ci/install-component.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/ci/install-component.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/ci/install-component.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Install nightly Rust with a given component.
-#
-# If the component is unavailable on the latest nightly,
-# use the latest toolchain with the component available.
-#
-# When using stable Rust, this script is basically unnecessary as almost components available.
-#
-# Refs: https://github.com/rust-lang/rustup-components-history#the-web-part
-
-set -euo pipefail
-
-package="${1:?}"
-target="${2:-x86_64-unknown-linux-gnu}"
-
-date=$(curl -sSf https://rust-lang.github.io/rustup-components-history/"${target}"/"${package}")
-
-# shellcheck disable=1090
-"$(cd "$(dirname "${0}")" && pwd)"/install-rust.sh nightly-"${date}"
-
-rustup component add "${package}"
-
-case "${package}" in
-    rustfmt) "${package}" -V ;;
-    *) cargo "${package}" -V ;;
-esac
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/ci/install-rust.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/ci/install-rust.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/ci/install-rust.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/ci/install-rust.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-toolchain="${1:-nightly}"
-
-rustup toolchain install "${toolchain}" --no-self-update --profile minimal
-rustup default "${toolchain}"
-
-rustup -V
-rustc -V
-cargo -V
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/CODE_OF_CONDUCT.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/CODE_OF_CONDUCT.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/CODE_OF_CONDUCT.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/CODE_OF_CONDUCT.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# Code of Conduct
-
-This project adheres to the [Rust Code of Conduct].
-
-## Enforcement
-
-If you believe someone is violating the code of conduct, we ask that you report it by contacting taiki-e (te316e89@gmail.com).
-
-[Rust Code of Conduct]: https://www.rust-lang.org/policies/code-of-conduct
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-# pin-project-lite
-
-[![crates-badge]][crates-url]
-[![docs-badge]][docs-url]
-[![license-badge]][license]
-[![rustc-badge]][rustc-url]
-
-[crates-badge]: https://img.shields.io/crates/v/pin-project-lite.svg
-[crates-url]: https://crates.io/crates/pin-project-lite
-[docs-badge]: https://docs.rs/pin-project-lite/badge.svg
-[docs-url]: https://docs.rs/pin-project-lite
-[license-badge]: https://img.shields.io/badge/license-Apache--2.0%20OR%20MIT-blue.svg
-[license]: #license
-[rustc-badge]: https://img.shields.io/badge/rustc-1.37+-lightgray.svg
-[rustc-url]: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
-
-A lightweight version of [pin-project] written with declarative macros.
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-pin-project-lite = "0.1"
-```
-
-The current pin-project-lite requires Rust 1.37 or later.
-
-## Examples
-
-[`pin_project!`] macro creates a projection type covering all the fields of struct.
-
-```rust
-use pin_project_lite::pin_project;
-use std::pin::Pin;
-
-pin_project! {
-    struct Struct<T, U> {
-        #[pin]
-        pinned: T,
-        unpinned: U,
-    }
-}
-
-impl<T, U> Struct<T, U> {
-    fn method(self: Pin<&mut Self>) {
-        let this = self.project();
-        let _: Pin<&mut T> = this.pinned; // Pinned reference to the field
-        let _: &mut U = this.unpinned; // Normal reference to the field
-    }
-}
-```
-
-## [pin-project] vs pin-project-lite
-
-Here are some similarities and differences compared to [pin-project].
-
-### Similar: Safety
-
-pin-project-lite guarantees safety in much the same way as [pin-project]. Both are completely safe unless you write other unsafe code.
-
-### Different: Minimal design
-
-This library does not tackle as expansive of a range of use cases as [pin-project] does. If your use case is not already covered, please use [pin-project].
-
-### Different: No proc-macro related dependencies
-
-This is the **only** reason to use this crate. However, **if you already have proc-macro related dependencies in your crate's dependency graph, there is no benefit from using this crate.** (Note: There is almost no difference in the amount of code generated between [pin-project] and pin-project-lite.)
-
-### Different: No useful error messages
-
-This macro does not handle any invalid input. So error messages are not to be useful in most cases. If you do need useful error messages, then upon error you can pass the same input to [pin-project] to receive a helpful description of the compile error.
-
-### Different: Structs only
-
-pin-project-lite will refuse anything other than a braced struct with named fields. Enums and tuple structs are not supported.
-
-### Different: No support for custom Drop implementation
-
-pin-project supports this by [`#[pinned_drop]`][pinned-drop].
-
-### Different: No support for custom Unpin implementation
-
-pin-project supports this by [`UnsafeUnpin`][unsafe-unpin] and [`!Unpin`][not-unpin].
-
-### Different: No support for pattern matching and destructing
-
-[pin-project supports this.][naming]
-
-[`pin_project!`]: https://docs.rs/pin-project-lite/0.1/pin_project_lite/macro.pin_project.html
-[naming]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html
-[not-unpin]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unpin
-[pin-project]: https://github.com/taiki-e/pin-project
-[pinned-drop]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#pinned_drop
-[unsafe-unpin]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unsafeunpin
-
-## License
-
-Licensed under either of
-
-* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
-* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# Rustfmt configuration
-# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md
-
-# This is required for bug-fixes, which technically can't be made to the stable
-# first version.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3383).
-version = "Two"
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3391)
-error_on_line_overflow = true
-
-# Override the default formatting style.
-# See https://internals.rust-lang.org/t/running-rustfmt-on-rust-lang-rust-and-other-rust-lang-repositories/8732/81.
-use_small_heuristics = "Max"
-# See https://github.com/rust-dev-tools/fmt-rfcs/issues/149.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3370)
-overflow_delimited_expr = true
-
-# Apply rustfmt to more places.
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3362).
-merge_imports = true
-# This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3348).
-format_code_in_doc_comments = true
-
-# Set the default settings again to always apply the proper formatting without
-# being affected by the editor settings.
-edition = "2018"
-tab_spaces = 4
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/check-minimal-versions.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/check-minimal-versions.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/check-minimal-versions.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/check-minimal-versions.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-# Check all public crates with minimal version dependencies.
-#
-# Usage:
-#    bash scripts/check-minimal-versions.sh [check|test]
-#
-# Note:
-# - This script modifies Cargo.toml and Cargo.lock while running
-# - This script exits with 1 if there are any unstaged changes
-# - This script requires nightly Rust and cargo-hack
-#
-# Refs: https://github.com/rust-lang/cargo/issues/5657
-
-set -euo pipefail
-
-cd "$(cd "$(dirname "${0}")" && pwd)"/..
-
-# Decide Rust toolchain.
-# If the `CI` environment variable is not set to `true`, then nightly is used by default.
-if [[ "${1:-none}" == "+"* ]]; then
-    toolchain="${1}"
-    shift
-elif [[ "${CI:-false}" != "true" ]]; then
-    cargo +nightly -V >/dev/null || exit 1
-    toolchain="+nightly"
-fi
-# This script requires nightly Rust and cargo-hack
-if [[ "${toolchain:-+nightly}" != "+nightly"* ]] || ! cargo hack -V &>/dev/null; then
-    echo "error: check-minimal-versions.sh requires nightly Rust and cargo-hack"
-    exit 1
-fi
-
-subcmd="${1:-check}"
-case "${subcmd}" in
-    check | test) ;;
-    *)
-        echo "error: invalid argument \`${1}\`"
-        exit 1
-        ;;
-esac
-
-# This script modifies Cargo.toml and Cargo.lock, so make sure there are no
-# unstaged changes.
-git diff --exit-code
-# Restore original Cargo.toml and Cargo.lock on exit.
-trap 'git checkout .' EXIT
-
-if [[ "${subcmd}" == "check" ]]; then
-    # Remove dev-dependencies from Cargo.toml to prevent the next `cargo update`
-    # from determining minimal versions based on dev-dependencies.
-    cargo hack --remove-dev-deps --workspace
-fi
-
-# Update Cargo.lock to minimal version dependencies.
-cargo ${toolchain:-} update -Zminimal-versions
-# Run check for all public members of the workspace.
-cargo ${toolchain:-} hack "${subcmd}" --workspace --all-features --ignore-private -Zfeatures=all
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/ci.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/ci.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/ci.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/ci.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# A script to run a simplified version of the checks done by CI.
-#
-# Usage:
-#     bash scripts/ci.sh
-#
-# Note: This script requires nightly Rust, rustfmt, clippy, and cargo-expand
-
-set -euo pipefail
-
-if [[ "${1:-none}" == "+"* ]]; then
-    toolchain="${1}"
-else
-    cargo +nightly -V >/dev/null || exit 1
-    toolchain="+nightly"
-fi
-
-if [[ "${toolchain:-+nightly}" != "+nightly"* ]] || ! rustfmt -V &>/dev/null || ! cargo clippy -V &>/dev/null || ! cargo expand -V &>/dev/null; then
-    echo "error: ci.sh requires nightly Rust, rustfmt, clippy, and cargo-expand"
-    exit 1
-fi
-
-echo "Running 'cargo ${toolchain} fmt --all'"
-cargo "${toolchain}" fmt --all
-
-echo "Running 'cargo ${toolchain} clippy --all --all-targets'"
-cargo "${toolchain}" clippy --all --all-features --all-targets -Zunstable-options
-
-echo "Running 'cargo ${toolchain} test --all --exclude expandtest'"
-TRYBUILD=overwrite cargo "${toolchain}" test --all --all-features --exclude expandtest
-
-echo "Running 'bash scripts/expandtest.sh ${toolchain}'"
-"$(cd "$(dirname "${0}")" && pwd)"/expandtest.sh "${toolchain}"
-
-echo "Running 'cargo ${toolchain} doc --no-deps --all'"
-cargo "${toolchain}" doc --no-deps --all --all-features
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/expandtest.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/expandtest.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/expandtest.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/expandtest.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# A script to run expandtest.
-#
-# Usage:
-#     bash scripts/expandtest.sh
-#
-# Note: This script requires nightly Rust, rustfmt, and cargo-expand
-
-set -euo pipefail
-
-script_dir="$(cd "$(dirname "${0}")" && pwd)"
-
-if [[ "${1:-none}" == "+"* ]]; then
-    toolchain="${1}"
-elif [[ "${CI:-false}" != "true" ]]; then
-    cargo +nightly -V >/dev/null || exit 1
-    toolchain="+nightly"
-fi
-
-if [[ "${toolchain:-+nightly}" != "+nightly"* ]] || ! rustfmt -V &>/dev/null || ! cargo expand -V &>/dev/null; then
-    echo "error: expandtest.sh requires nightly Rust, rustfmt, and cargo-expand"
-    exit 1
-fi
-
-if [[ "${CI:-false}" != "true" ]]; then
-    # First, check if the compile fails for another reason.
-    cargo ${toolchain} check --tests --manifest-path "${script_dir}"/../tests/expand/Cargo.toml
-
-    # Next, remove the `*.expanded.rs` files to allow updating those files.
-    # Refs: https://docs.rs/macrotest/1/macrotest/#updating-expandedrs
-    rm -rf "${script_dir}"/../tests/expand/tests/expand/*.expanded.rs
-fi
-
-cargo ${toolchain:-} test --manifest-path "${script_dir}"/../tests/expand/Cargo.toml
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/scripts/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-This directory contains scripts used by the developers of this project.
-
-Some scripts in this directory are also used in CI, but scripts intended to be used only in CI and scripts not intended to be used directly by the developers are basically in the `ci` directory.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,618 +0,0 @@
-//! A lightweight version of [pin-project] written with declarative macros.
-//!
-//! # Examples
-//!
-//! [`pin_project!`] macro creates a projection type covering all the fields of struct.
-//!
-//! ```rust
-//! use pin_project_lite::pin_project;
-//! use std::pin::Pin;
-//!
-//! pin_project! {
-//!     struct Struct<T, U> {
-//!         #[pin]
-//!         pinned: T,
-//!         unpinned: U,
-//!     }
-//! }
-//!
-//! impl<T, U> Struct<T, U> {
-//!     fn method(self: Pin<&mut Self>) {
-//!         let this = self.project();
-//!         let _: Pin<&mut T> = this.pinned; // Pinned reference to the field
-//!         let _: &mut U = this.unpinned; // Normal reference to the field
-//!     }
-//! }
-//! ```
-//!
-//! # [pin-project] vs pin-project-lite
-//!
-//! Here are some similarities and differences compared to [pin-project].
-//!
-//! ## Similar: Safety
-//!
-//! pin-project-lite guarantees safety in much the same way as [pin-project]. Both are completely safe unless you write other unsafe code.
-//!
-//! ## Different: Minimal design
-//!
-//! This library does not tackle as expansive of a range of use cases as [pin-project] does. If your use case is not already covered, please use [pin-project].
-//!
-//! ## Different: No proc-macro related dependencies
-//!
-//! This is the **only** reason to use this crate. However, **if you already have proc-macro related dependencies in your crate's dependency graph, there is no benefit from using this crate.** (Note: There is almost no difference in the amount of code generated between [pin-project] and pin-project-lite.)
-//!
-//! ## Different: No useful error messages
-//!
-//! This macro does not handle any invalid input. So error messages are not to be useful in most cases. If you do need useful error messages, then upon error you can pass the same input to [pin-project] to receive a helpful description of the compile error.
-//!
-//! ## Different: Structs only
-//!
-//! pin-project-lite will refuse anything other than a braced struct with named fields. Enums and tuple structs are not supported.
-//!
-//! ## Different: No support for custom Drop implementation
-//!
-//! pin-project supports this by [`#[pinned_drop]`][pinned-drop].
-//!
-//! ## Different: No support for custom Unpin implementation
-//!
-//! pin-project supports this by [`UnsafeUnpin`][unsafe-unpin] and [`!Unpin`][not-unpin].
-//!
-//! ## Different: No support for pattern matching and destructing
-//!
-//! [pin-project supports this.][naming]
-//!
-//! [naming]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html
-//! [not-unpin]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unpin
-//! [pin-project]: https://github.com/taiki-e/pin-project
-//! [pinned-drop]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#pinned_drop
-//! [unsafe-unpin]: https://docs.rs/pin-project/1/pin_project/attr.pin_project.html#unsafeunpin
-
-#![no_std]
-#![doc(html_root_url = "https://docs.rs/pin-project-lite/0.1.11")]
-#![doc(test(
-    no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms, single_use_lifetimes), allow(dead_code))
-))]
-#![warn(unsafe_code)]
-#![warn(future_incompatible, rust_2018_idioms, single_use_lifetimes, unreachable_pub)]
-#![warn(clippy::all, clippy::default_trait_access)]
-// mem::take and #[non_exhaustive] requires Rust 1.40, matches! requires Rust 1.42
-#![allow(
-    clippy::mem_replace_with_default,
-    clippy::manual_non_exhaustive,
-    clippy::match_like_matches_macro
-)]
-
-/// A macro that creates a projection type covering all the fields of struct.
-///
-/// This macro creates a projection type according to the following rules:
-///
-/// * For the field that uses `#[pin]` attribute, makes the pinned reference to the field.
-/// * For the other fields, makes the unpinned reference to the field.
-///
-/// And the following methods are implemented on the original type:
-///
-/// ```rust
-/// # use std::pin::Pin;
-/// # type Projection<'a> = &'a ();
-/// # type ProjectionRef<'a> = &'a ();
-/// # trait Dox {
-/// fn project(self: Pin<&mut Self>) -> Projection<'_>;
-/// fn project_ref(self: Pin<&Self>) -> ProjectionRef<'_>;
-/// # }
-/// ```
-///
-/// The visibility of the projected type and projection method is based on the
-/// original type. However, if the visibility of the original type is `pub`,
-/// the visibility of the projected type and the projection method is `pub(crate)`.
-///
-/// # Safety
-///
-/// `pin_project!` macro guarantees safety in much the same way as [pin-project] crate.
-/// Both are completely safe unless you write other unsafe code.
-///
-/// See [pin-project] crate for more details.
-///
-/// # Examples
-///
-/// ```rust
-/// use pin_project_lite::pin_project;
-/// use std::pin::Pin;
-///
-/// pin_project! {
-///     struct Struct<T, U> {
-///         #[pin]
-///         pinned: T,
-///         unpinned: U,
-///     }
-/// }
-///
-/// impl<T, U> Struct<T, U> {
-///     fn method(self: Pin<&mut Self>) {
-///         let this = self.project();
-///         let _: Pin<&mut T> = this.pinned; // Pinned reference to the field
-///         let _: &mut U = this.unpinned; // Normal reference to the field
-///     }
-/// }
-/// ```
-///
-/// If you want to call the `project()` method multiple times or later use the
-/// original [`Pin`] type, it needs to use [`.as_mut()`][`Pin::as_mut`] to avoid
-/// consuming the [`Pin`].
-///
-/// ```rust
-/// use pin_project_lite::pin_project;
-/// use std::pin::Pin;
-///
-/// pin_project! {
-///     struct Struct<T> {
-///         #[pin]
-///         field: T,
-///     }
-/// }
-///
-/// impl<T> Struct<T> {
-///     fn call_project_twice(mut self: Pin<&mut Self>) {
-///         // `project` consumes `self`, so reborrow the `Pin<&mut Self>` via `as_mut`.
-///         self.as_mut().project();
-///         self.as_mut().project();
-///     }
-/// }
-/// ```
-///
-/// # `!Unpin`
-///
-/// If you want to ensure that [`Unpin`] is not implemented, use `#[pin]`
-/// attribute for a [`PhantomPinned`] field.
-///
-/// ```rust
-/// use pin_project_lite::pin_project;
-/// use std::marker::PhantomPinned;
-///
-/// pin_project! {
-///     struct Struct<T> {
-///         field: T,
-///         #[pin] // <------ This `#[pin]` is required to make `Struct` to `!Unpin`.
-///         _pin: PhantomPinned,
-///     }
-/// }
-/// ```
-///
-/// Note that using [`PhantomPinned`] without `#[pin]` attribute has no effect.
-///
-/// [`PhantomPinned`]: core::marker::PhantomPinned
-/// [`Pin::as_mut`]: core::pin::Pin::as_mut
-/// [`Pin`]: core::pin::Pin
-/// [pin-project]: https://github.com/taiki-e/pin-project
-#[macro_export]
-macro_rules! pin_project {
-    ($($tt:tt)*) => {
-        $crate::__pin_project_internal! { $($tt)* }
-    };
-}
-
-// limitations:
-// * no support for tuple structs and enums.
-// * no support for naming the projection types.
-// * no support for multiple trait/lifetime bounds.
-// * no support for `Self` in where clauses. (wontfix)
-// * no support for overlapping lifetime names. (wontfix)
-// * no interoperability with other field attributes.
-// * no useful error messages. (wontfix)
-// etc...
-
-// Not public API.
-#[doc(hidden)]
-#[macro_export]
-macro_rules! __pin_project_internal {
-    // =============================================================================================
-    // main: struct
-    (@struct_internal;
-        [$proj_vis:vis]
-        [$(#[$attrs:meta])* $vis:vis struct $ident:ident]
-        [$($def_generics:tt)*]
-        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)*)?]
-        {
-            $(
-                $(#[$pin:ident])?
-                $field_vis:vis $field:ident: $field_ty:ty
-            ),+
-        }
-    ) => {
-        $(#[$attrs])*
-        $vis struct $ident $($def_generics)*
-        $(where
-            $($where_clause)*)?
-        {
-            $(
-                $field_vis $field: $field_ty
-            ),+
-        }
-
-        #[allow(explicit_outlives_requirements)]
-        #[allow(single_use_lifetimes)] // https://github.com/rust-lang/rust/issues/55058
-        #[allow(clippy::redundant_pub_crate)]
-        #[allow(clippy::used_underscore_binding)]
-        const _: () = {
-            $crate::__pin_project_internal! { @make_proj_ty_struct;
-                [$proj_vis]
-                [$vis struct $ident]
-                [$($impl_generics)*] [$($ty_generics)*] [$(where $($where_clause)*)?]
-                {
-                    $(
-                        $(#[$pin])?
-                        $field_vis $field: $field_ty
-                    ),+
-                }
-            }
-
-            impl <$($impl_generics)*> $ident <$($ty_generics)*>
-            $(where
-                $($where_clause)*)?
-            {
-                $proj_vis fn project<'__pin>(
-                    self: $crate::__private::Pin<&'__pin mut Self>,
-                ) -> Projection <'__pin, $($ty_generics)*> {
-                    unsafe {
-                        let Self { $($field),* } = self.get_unchecked_mut();
-                        Projection {
-                            $(
-                                $field: $crate::__pin_project_internal!(@make_unsafe_field_proj;
-                                    $(#[$pin])? $field
-                                )
-                            ),+
-                        }
-                    }
-                }
-                $proj_vis fn project_ref<'__pin>(
-                    self: $crate::__private::Pin<&'__pin Self>,
-                ) -> ProjectionRef <'__pin, $($ty_generics)*> {
-                    unsafe {
-                        let Self { $($field),* } = self.get_ref();
-                        ProjectionRef {
-                            $(
-                                $field: $crate::__pin_project_internal!(@make_unsafe_field_proj;
-                                    $(#[$pin])? $field
-                                )
-                            ),+
-                        }
-                    }
-                }
-            }
-
-            $crate::__pin_project_internal! { @make_unpin_impl;
-                [$vis $ident]
-                [$($impl_generics)*] [$($ty_generics)*] [$(where $($where_clause)*)?]
-                $(
-                    $field: $crate::__pin_project_internal!(@make_unpin_bound;
-                        $(#[$pin])? $field_ty
-                    )
-                ),+
-            }
-
-            $crate::__pin_project_internal! { @make_drop_impl;
-                [$ident]
-                [$($impl_generics)*] [$($ty_generics)*] [$(where $($where_clause)*)?]
-            }
-
-            // Ensure that it's impossible to use pin projections on a #[repr(packed)] struct.
-            //
-            // Taking a reference to a packed field is unsafe, amd appplying
-            // #[forbid(safe_packed_borrows)] makes sure that doing this without
-            // an 'unsafe' block (which we deliberately do not generate)
-            // is a hard error.
-            //
-            // If the struct ends up having #[repr(packed)] applied somehow,
-            // this will generate an (unfriendly) error message. Under all reasonable
-            // circumstances, we'll detect the #[repr(packed)] attribute, and generate
-            // a much nicer error above.
-            //
-            // See https://github.com/taiki-e/pin-project/pull/34 for more details.
-            #[forbid(safe_packed_borrows)]
-            fn __assert_not_repr_packed <$($impl_generics)*> (this: &$ident <$($ty_generics)*>)
-            $(where
-                $($where_clause)*)?
-            {
-                $(
-                    let _ = &this.$field;
-                )+
-            }
-        };
-    };
-
-    // =============================================================================================
-    // make_proj_ty: struct
-    (@make_proj_ty_struct;
-        [$proj_vis:vis]
-        [$vis:vis struct $ident:ident]
-        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
-        {
-            $(
-                $(#[$pin:ident])?
-                $field_vis:vis $field:ident: $field_ty:ty
-            ),+
-        }
-    ) => {
-        #[allow(dead_code)] // This lint warns unused fields/variants.
-        #[allow(clippy::mut_mut)] // This lint warns `&mut &mut <ty>`.
-        #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
-        $proj_vis struct Projection <'__pin, $($impl_generics)*>
-        where
-            $ident <$($ty_generics)*>: '__pin
-            $(, $($where_clause)*)?
-        {
-            $(
-                $field_vis $field: $crate::__pin_project_internal!(@make_proj_field;
-                    $(#[$pin])? $field_ty; mut
-                )
-            ),+
-        }
-        #[allow(dead_code)] // This lint warns unused fields/variants.
-        #[allow(clippy::type_repetition_in_bounds)] // https://github.com/rust-lang/rust-clippy/issues/4326
-        $proj_vis struct ProjectionRef <'__pin, $($impl_generics)*>
-        where
-            $ident <$($ty_generics)*>: '__pin
-            $(, $($where_clause)*)?
-        {
-            $(
-                $field_vis $field: $crate::__pin_project_internal!(@make_proj_field;
-                    $(#[$pin])? $field_ty;
-                )
-            ),+
-        }
-    };
-
-    // =============================================================================================
-    // make_unpin_impl
-    (@make_unpin_impl;
-        [$vis:vis $ident:ident]
-        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
-        $($field:tt)*
-    ) => {
-        // Automatically create the appropriate conditional `Unpin` implementation.
-        //
-        // Basically this is equivalent to the following code:
-        // ```rust
-        // impl<T, U> Unpin for Struct<T, U> where T: Unpin {}
-        // ```
-        //
-        // However, if struct is public and there is a private type field,
-        // this would cause an E0446 (private type in public interface).
-        //
-        // When RFC 2145 is implemented (rust-lang/rust#48054),
-        // this will become a lint, rather then a hard error.
-        //
-        // As a workaround for this, we generate a new struct, containing all of the pinned
-        // fields from our #[pin_project] type. This struct is delcared within
-        // a function, which makes it impossible to be named by user code.
-        // This guarnatees that it will use the default auto-trait impl for Unpin -
-        // that is, it will implement Unpin iff all of its fields implement Unpin.
-        // This type can be safely declared as 'public', satisfiying the privacy
-        // checker without actually allowing user code to access it.
-        //
-        // This allows users to apply the #[pin_project] attribute to types
-        // regardless of the privacy of the types of their fields.
-        //
-        // See also https://github.com/taiki-e/pin-project/pull/53.
-        $vis struct __Origin <'__pin, $($impl_generics)*>
-        $(where
-            $($where_clause)*)?
-        {
-            __dummy_lifetime: $crate::__private::PhantomData<&'__pin ()>,
-            $($field)*
-        }
-        impl <'__pin, $($impl_generics)*> $crate::__private::Unpin for $ident <$($ty_generics)*>
-        where
-            __Origin <'__pin, $($ty_generics)*>: $crate::__private::Unpin
-            $(, $($where_clause)*)?
-        {
-        }
-    };
-
-    // =============================================================================================
-    // make_drop_impl
-    (@make_drop_impl;
-        [$ident:ident]
-        [$($impl_generics:tt)*] [$($ty_generics:tt)*] [$(where $($where_clause:tt)* )?]
-    ) => {
-        // Ensure that struct does not implement `Drop`.
-        //
-        // There are two possible cases:
-        // 1. The user type does not implement Drop. In this case,
-        // the first blanked impl will not apply to it. This code
-        // will compile, as there is only one impl of MustNotImplDrop for the user type
-        // 2. The user type does impl Drop. This will make the blanket impl applicable,
-        // which will then comflict with the explicit MustNotImplDrop impl below.
-        // This will result in a compilation error, which is exactly what we want.
-        trait MustNotImplDrop {}
-        #[allow(clippy::drop_bounds, drop_bounds)]
-        impl<T: $crate::__private::Drop> MustNotImplDrop for T {}
-        impl <$($impl_generics)*> MustNotImplDrop for $ident <$($ty_generics)*>
-        $(where
-            $($where_clause)*)?
-        {
-        }
-    };
-
-    // =============================================================================================
-    // make_unpin_bound
-    (@make_unpin_bound;
-        #[pin]
-        $field_ty:ty
-    ) => {
-        $field_ty
-    };
-    (@make_unpin_bound;
-        $field_ty:ty
-    ) => {
-        $crate::__private::AlwaysUnpin<$field_ty>
-    };
-
-    // =============================================================================================
-    // make_unsafe_field_proj
-    (@make_unsafe_field_proj;
-        #[pin]
-        $field:ident
-    ) => {
-        $crate::__private::Pin::new_unchecked($field)
-    };
-    (@make_unsafe_field_proj;
-        $field:ident
-    ) => {
-        $field
-    };
-
-    // =============================================================================================
-    // make_proj_field
-    (@make_proj_field;
-        #[pin]
-        $field_ty:ty;
-        $($mut:ident)?
-    ) => {
-        $crate::__private::Pin<&'__pin $($mut)? ($field_ty)>
-    };
-    (@make_proj_field;
-        $field_ty:ty;
-        $($mut:ident)?
-    ) => {
-        &'__pin $($mut)? ($field_ty)
-    };
-
-    // =============================================================================================
-    // Parses input and determines visibility
-    (
-        $(#[$attrs:meta])*
-        pub struct $ident:ident $(<
-            $( $lifetime:lifetime $(: $lifetime_bound:lifetime)? ),* $(,)?
-            $( $generics:ident
-                $(: $generics_bound:path)?
-                $(: ?$generics_unsized_bound:path)?
-                $(: $generics_lifetime_bound:lifetime)?
-                $(= $generics_default:ty)?
-            ),* $(,)?
-        >)?
-        $(where
-            $( $where_clause_ty:ty
-                $(: $where_clause_bound:path)?
-                $(: ?$where_clause_unsized_bound:path)?
-                $(: $where_clause_lifetime_bound:lifetime)?
-            ),* $(,)?
-        )?
-        {
-            $(
-                $(#[$pin:ident])?
-                $field_vis:vis $field:ident: $field_ty:ty
-            ),+ $(,)?
-        }
-    ) => {
-        $crate::__pin_project_internal! { @struct_internal;
-            [pub(crate)]
-            [$(#[$attrs])* pub struct $ident]
-            [$(<
-                $( $lifetime $(: $lifetime_bound)? ,)*
-                $( $generics
-                    $(: $generics_bound)?
-                    $(: ?$generics_unsized_bound)?
-                    $(: $generics_lifetime_bound)?
-                    $(= $generics_default)?
-                ),*
-            >)?]
-            [$(
-                $( $lifetime $(: $lifetime_bound)? ,)*
-                $( $generics
-                    $(: $generics_bound)?
-                    $(: ?$generics_unsized_bound)?
-                    $(: $generics_lifetime_bound)?
-                ),*
-            )?]
-            [$( $( $lifetime ,)* $( $generics ),* )?]
-            [$(where $( $where_clause_ty
-                $(: $where_clause_bound)?
-                $(: ?$where_clause_unsized_bound)?
-                $(: $where_clause_lifetime_bound)?
-            ),* )?]
-            {
-                $(
-                    $(#[$pin])?
-                    $field_vis $field: $field_ty
-                ),+
-            }
-        }
-    };
-    (
-        $(#[$attrs:meta])*
-        $vis:vis struct $ident:ident $(<
-            $( $lifetime:lifetime $(: $lifetime_bound:lifetime)? ),* $(,)?
-            $( $generics:ident
-                $(: $generics_bound:path)?
-                $(: ?$generics_unsized_bound:path)?
-                $(: $generics_lifetime_bound:lifetime)?
-                $(= $generics_default:ty)?
-            ),* $(,)?
-        >)?
-        $(where
-            $( $where_clause_ty:ty
-                $(: $where_clause_bound:path)?
-                $(: ?$where_clause_unsized_bound:path)?
-                $(: $where_clause_lifetime_bound:lifetime)?
-            ),* $(,)?
-        )?
-        {
-            $(
-                $(#[$pin:ident])?
-                $field_vis:vis $field:ident: $field_ty:ty
-            ),+ $(,)?
-        }
-    ) => {
-        $crate::__pin_project_internal! { @struct_internal;
-            [$vis]
-            [$(#[$attrs])* $vis struct $ident]
-            [$(<
-                $( $lifetime $(: $lifetime_bound)? ,)*
-                $( $generics
-                    $(: $generics_bound)?
-                    $(: ?$generics_unsized_bound)?
-                    $(: $generics_lifetime_bound)?
-                    $(= $generics_default)?
-                ),*
-            >)?]
-            [$(
-                $( $lifetime $(: $lifetime_bound)? ,)*
-                $( $generics
-                    $(: $generics_bound)?
-                    $(: ?$generics_unsized_bound)?
-                    $(: $generics_lifetime_bound)?
-                ),*
-            )?]
-            [$( $( $lifetime ,)* $( $generics ),* )?]
-            [$(where $( $where_clause_ty
-                $(: $where_clause_bound)?
-                $(: ?$where_clause_unsized_bound)?
-                $(: $where_clause_lifetime_bound)?
-            ),* )?]
-            {
-                $(
-                    $(#[$pin])?
-                    $field_vis $field: $field_ty
-                ),+
-            }
-        }
-    };
-}
-
-// Not public API.
-#[doc(hidden)]
-pub mod __private {
-    #[doc(hidden)]
-    pub use core::{
-        marker::{PhantomData, Unpin},
-        ops::Drop,
-        pin::Pin,
-    };
-
-    // This is an internal helper struct used by `pin_project!`.
-    #[doc(hidden)]
-    pub struct AlwaysUnpin<T: ?Sized>(PhantomData<T>);
-
-    impl<T: ?Sized> Unpin for AlwaysUnpin<T> {}
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/auxiliary/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/auxiliary/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/auxiliary/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/auxiliary/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#![allow(dead_code, unused_macros)]
-
-macro_rules! assert_unpin {
-    ($ty:ty) => {
-        static_assertions::assert_impl_all!($ty: Unpin);
-    };
-}
-macro_rules! assert_not_unpin {
-    ($ty:ty) => {
-        static_assertions::assert_not_impl_all!($ty: Unpin);
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/compiletest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/compiletest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/compiletest.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/compiletest.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-
-#[rustversion::attr(not(nightly), ignore)]
-#[test]
-fn ui() {
-    let t = trybuild::TestCases::new();
-    t.compile_fail("tests/ui/*.rs");
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/include/basic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/include/basic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/include/basic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/include/basic.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-// default pin_project! is completely safe.
-
-::pin_project_lite::pin_project! {
-    #[derive(Debug)]
-    pub struct DefaultStruct<T, U> {
-        #[pin]
-        pub pinned: T,
-        pub unpinned: U,
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/lint.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/lint.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/lint.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/lint.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-#![forbid(unsafe_code)]
-#![warn(nonstandard_style, rust_2018_idioms, rustdoc, unused)]
-// Note: This does not guarantee compatibility with forbidding these lints in the future.
-// If rustc adds a new lint, we may not be able to keep this.
-#![forbid(future_incompatible, rust_2018_compatibility)]
-#![allow(unknown_lints)] // for old compilers
-#![warn(
-    box_pointers,
-    deprecated_in_future,
-    elided_lifetimes_in_paths,
-    explicit_outlives_requirements,
-    macro_use_extern_crate,
-    meta_variable_misuse,
-    missing_copy_implementations,
-    missing_crate_level_docs,
-    missing_debug_implementations,
-    missing_docs,
-    non_ascii_idents,
-    single_use_lifetimes,
-    trivial_casts,
-    trivial_numeric_casts,
-    unaligned_references,
-    unreachable_pub,
-    unused_extern_crates,
-    unused_import_braces,
-    unused_lifetimes,
-    unused_qualifications,
-    unused_results,
-    variant_size_differences
-)]
-// absolute_paths_not_starting_with_crate, anonymous_parameters, keyword_idents, pointer_structural_match: forbidden as a part of future_incompatible
-// missing_doc_code_examples, private_doc_tests, invalid_html_tags: warned as a part of rustdoc
-// unsafe_block_in_unsafe_fn: unstable
-// unsafe_code: forbidden
-// unstable_features: deprecated: https://doc.rust-lang.org/beta/rustc/lints/listing/allowed-by-default.html#unstable-features
-// unused_crate_dependencies: unrelated
-#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-#![warn(clippy::restriction)]
-#![allow(clippy::blanket_clippy_restriction_lints)] // this is a test, so enable all restriction lints intentionally.
-
-// Check interoperability with rustc and clippy lints.
-
-pub mod basic {
-    include!("include/basic.rs");
-}
-
-pub mod box_pointers {
-    use pin_project_lite::pin_project;
-
-    pin_project! {
-        #[derive(Debug)]
-        pub struct Struct {
-            #[pin]
-            pub p: Box<isize>,
-            pub u: Box<isize>,
-        }
-    }
-}
-
-pub mod explicit_outlives_requirements {
-    use pin_project_lite::pin_project;
-
-    pin_project! {
-        #[derive(Debug)]
-        pub struct Struct<'a, T, U>
-        where
-            T: ?Sized,
-            U: ?Sized,
-        {
-            #[pin]
-            pub pinned: &'a mut T,
-            pub unpinned: &'a mut U,
-        }
-    }
-}
-
-pub mod clippy_mut_mut {
-    use pin_project_lite::pin_project;
-
-    pin_project! {
-        #[derive(Debug)]
-        pub struct Struct<'a, T, U> {
-            #[pin]
-            pub pinned: &'a mut T,
-            pub unpinned: &'a mut U,
-        }
-    }
-}
-
-#[allow(unreachable_pub)]
-mod clippy_redundant_pub_crate {
-    use pin_project_lite::pin_project;
-
-    pin_project! {
-        #[derive(Debug)]
-        pub struct Struct<T, U> {
-            #[pin]
-            pub pinned: T,
-            pub unpinned: U,
-        }
-    }
-}
-
-pub mod clippy_type_repetition_in_bounds {
-    use pin_project_lite::pin_project;
-
-    pin_project! {
-        #[derive(Debug)]
-        pub struct Struct<T, U>
-        where
-            Struct<T, U>: Sized,
-        {
-            #[pin]
-            pub pinned: T,
-            pub unpinned: U,
-        }
-    }
-}
-
-pub mod clippy_used_underscore_binding {
-    use pin_project_lite::pin_project;
-
-    pin_project! {
-        #[derive(Debug)]
-        pub struct Struct<T, U> {
-            #[pin]
-            pub _pinned: T,
-            pub _unpinned: U,
-        }
-    }
-}
-
-#[allow(box_pointers)]
-#[allow(clippy::restriction)]
-#[rustversion::attr(not(nightly), ignore)]
-#[test]
-fn check_lint_list() {
-    use std::{env, fs, path::PathBuf, process::Command, str};
-
-    type Result<T, E = Box<dyn std::error::Error>> = std::result::Result<T, E>;
-
-    fn assert_eq(expected_path: &str, actual: &str) -> Result<()> {
-        let manifest_dir = env::var_os("CARGO_MANIFEST_DIR")
-            .map(PathBuf::from)
-            .expect("CARGO_MANIFEST_DIR not set");
-        let expected_path = manifest_dir.join(expected_path);
-        let expected = fs::read_to_string(&expected_path)?;
-        if expected != actual {
-            if env::var_os("CI").map_or(false, |v| v == "true") {
-                panic!(
-                    "assertion failed:\n\nEXPECTED:\n{0}\n{1}\n{0}\n\nACTUAL:\n{0}\n{2}\n{0}\n",
-                    "-".repeat(60),
-                    expected,
-                    actual,
-                );
-            } else {
-                fs::write(&expected_path, actual)?;
-            }
-        }
-        Ok(())
-    }
-
-    (|| -> Result<()> {
-        let rustc = env::var_os("RUSTC").unwrap_or_else(|| "rustc".into());
-        let output = Command::new(rustc).args(&["-W", "help"]).output()?;
-        let new = str::from_utf8(&output.stdout)?;
-        assert_eq("tests/lint.txt", new)
-    })()
-    .unwrap_or_else(|e| panic!("{}", e));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/lint.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/lint.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/lint.txt	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/lint.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-
-Available lint options:
-    -W <foo>           Warn about <foo>
-    -A <foo>           Allow <foo>
-    -D <foo>           Deny <foo>
-    -F <foo>           Forbid <foo> (deny <foo> and all attempts to override)
-
-
-Lint checks provided by rustc:
-
-                                                       name  default  meaning
-                                                       ----  -------  -------
-                     absolute-paths-not-starting-with-crate  allow    fully qualified paths that start with a module name instead of `crate`, `self`, or an extern crate name
-                                       anonymous-parameters  allow    detects anonymous parameters
-                                               box-pointers  allow    use of owned (Box type) heap memory
-                                       deprecated-in-future  allow    detects use of items that will be deprecated in a future version
-                                  elided-lifetimes-in-paths  allow    hidden lifetime parameters in types are deprecated
-                             explicit-outlives-requirements  allow    outlives requirements can be inferred
-                                          invalid-html-tags  allow    detects invalid HTML tags in doc comments
-                                             keyword-idents  allow    detects edition keywords being used as an identifier
-                                     macro-use-extern-crate  allow    the `#[macro_use]` attribute is now deprecated in favor of using macros via the module system
-                                       meta-variable-misuse  allow    possible meta-variable misuse at macro definition
-                               missing-copy-implementations  allow    detects potentially-forgotten implementations of `Copy`
-                                   missing-crate-level-docs  allow    detects crates with no crate-level documentation
-                              missing-debug-implementations  allow    detects missing implementations of Debug
-                                               missing-docs  allow    detects missing documentation for public members
-                                  missing-doc-code-examples  allow    detects publicly-exported items without code samples in their documentation
-                                           non-ascii-idents  allow    detects non-ASCII identifiers
-                                   pointer-structural-match  allow    pointers are not structural-match
-                                          private-doc-tests  allow    detects code samples in docs of private items not documented by rustdoc
-                                       single-use-lifetimes  allow    detects lifetime parameters that are only used once
-                                              trivial-casts  allow    detects trivial casts which could be removed
-                                      trivial-numeric-casts  allow    detects trivial casts of numeric types which could be removed
-                                       unaligned-references  allow    detects unaligned references to fields of packed structs
-                                            unreachable-pub  allow    `pub` items not reachable from crate root
-                                                unsafe-code  allow    usage of `unsafe` code
-                                     unsafe-op-in-unsafe-fn  allow    unsafe operations in unsafe functions without an explicit unsafe block are deprecated
-                                          unstable-features  allow    enabling unstable features (deprecated. do not use)
-                                  unused-crate-dependencies  allow    crate dependencies that are never used
-                                       unused-extern-crates  allow    extern crates that are never used
-                                       unused-import-braces  allow    unnecessary braces around an imported item
-                                           unused-lifetimes  allow    detects lifetime parameters that are never used
-                                      unused-qualifications  allow    detects unnecessarily qualified names
-                                             unused-results  allow    unused result of an expression in a statement
-                                   variant-size-differences  allow    detects enums with widely varying variant sizes
-                                            array-into-iter  warn     detects calling `into_iter` on arrays
-                                           asm-sub-register  warn     using only a subset of a register for inline asm inputs
-                                         bare-trait-objects  warn     suggest using `dyn Trait` for trait objects
-                                 bindings-with-variant-name  warn     detects pattern bindings with the same name as one of the matched variants
-                                     broken-intra-doc-links  warn     failures in resolving intra-doc link targets
-                                       cenum-impl-drop-cast  warn     a C-like enum implementing Drop is cast
-                               clashing-extern-declarations  warn     detects when an extern fn has been declared with the same name but different types
-                                       coherence-leak-check  warn     distinct impls distinguished only by the leak-check code
-                                          confusable-idents  warn     detects visually confusable pairs between identifiers
-                                const-evaluatable-unchecked  warn     detects a generic constant is used in a type without a emitting a warning
-                                        const-item-mutation  warn     detects attempts to mutate a `const` item
-                                                  dead-code  warn     detect unused, unexported items
-                                                 deprecated  warn     detects use of deprecated items
-                                                drop-bounds  warn     bounds of the form `T: Drop` are useless
-                          ellipsis-inclusive-range-patterns  warn     `...` range patterns are deprecated
-                              exported-private-dependencies  warn     public interface leaks type from a private dependency
-                     illegal-floating-point-literal-pattern  warn     floating-point literals cannot be used in patterns
-                                            improper-ctypes  warn     proper use of libc types in foreign modules
-                                improper-ctypes-definitions  warn     proper use of libc types in foreign item definitions
-                                        incomplete-features  warn     incomplete features that may function improperly in some or all cases
-                                  indirect-structural-match  warn     constant used in pattern contains value of non-structural-match type in a field or a variant
-                                         inline-no-sanitize  warn     detects incompatible use of `#[inline(always)]` and `#[no_sanitize(...)]`
-                               invalid-codeblock-attributes  warn     codeblock attribute looks a lot like a known one
-                                              invalid-value  warn     an invalid value is being created (such as a NULL reference)
-                                   irrefutable-let-patterns  warn     detects irrefutable patterns in if-let and while-let statements
-                              late-bound-lifetime-arguments  warn     detects generic lifetime arguments in path segments with late bound lifetime parameters
-                                   mixed-script-confusables  warn     detects Unicode scripts whose mixed script confusables codepoints are solely used
-                        mutable-borrow-reservation-conflict  warn     reservation of a two-phased borrow conflicts with other shared borrows
-                                nontrivial-structural-match  warn     constant used in pattern of non-structural-match type and the constant's initializer expression contains values of non-structural-match types
-                                       non-camel-case-types  warn     types, variants, traits and type parameters should have camel case names
-                               non-shorthand-field-patterns  warn     using `Struct { x: x }` instead of `Struct { x }` in a pattern
-                                             non-snake-case  warn     variables, methods, functions, lifetime parameters and modules should have snake case names
-                                     non-upper-case-globals  warn     static constants should have uppercase identifiers
-                                    no-mangle-generic-items  warn     generic items must be mangled
-                                       overlapping-patterns  warn     detects overlapping patterns
-                                            path-statements  warn     path statements with no effect
-                                          private-in-public  warn     detect private items in public interfaces not caught by the old implementation
-                      proc-macro-derive-resolution-fallback  warn     detects proc macro derives using inaccessible names from parent modules
-                                       redundant-semicolons  warn     detects unnecessary trailing semicolons
-                                  renamed-and-removed-lints  warn     lints that have been renamed or removed
-                                        safe-packed-borrows  warn     safe borrows of fields of packed structs were erroneously allowed
-                                            stable-features  warn     stable features found in `#[feature]` directive
-                                             trivial-bounds  warn     these bounds don't depend on an type parameters
-                                          type-alias-bounds  warn     bounds in type aliases are not enforced
-                                   tyvar-behind-raw-pointer  warn     raw pointer to an inference variable
-                                        uncommon-codepoints  warn     detects uncommon Unicode codepoints in identifiers
-                                    unconditional-recursion  warn     functions that cannot return without calling themselves
-                                              unknown-lints  warn     unrecognized lint attribute
-                                      unnameable-test-items  warn     detects an item that cannot be named being marked as `#[test_case]`
-                                           unreachable-code  warn     detects unreachable code paths
-                                       unreachable-patterns  warn     detects unreachable patterns
-                                   unstable-name-collisions  warn     detects name collision with an existing but unstable method
-                                          unused-allocation  warn     detects unnecessary allocations that can be eliminated
-                                         unused-assignments  warn     detect assignments that will never be read
-                                          unused-attributes  warn     detects attributes that were not used by the compiler
-                                              unused-braces  warn     unnecessary braces around an expression
-                                         unused-comparisons  warn     comparisons made useless by limits of the types involved
-                                        unused-doc-comments  warn     detects doc comments that aren't used by rustdoc
-                                            unused-features  warn     unused features found in crate-level `#[feature]` directives
-                                             unused-imports  warn     imports that are never used
-                                              unused-labels  warn     detects labels that are never used
-                                              unused-macros  warn     detects macros that were not used
-                                            unused-must-use  warn     unused result of a type flagged as `#[must_use]`
-                                                 unused-mut  warn     detect mut variables which don't need to be mutable
-                                              unused-parens  warn     `if`, `match`, `while` and `return` do not need parentheses
-                                              unused-unsafe  warn     unnecessary use of an `unsafe` block
-                                           unused-variables  warn     detect variables which are not used in any way
-                                                   warnings  warn     mass-change the level for lints which produce warnings
-                                where-clauses-object-safety  warn     checks the object safety of where clauses
-                                                 while-true  warn     suggest using `loop { }` instead of `while true { }`
-                                 ambiguous-associated-items  deny     ambiguous associated items
-                                        arithmetic-overflow  deny     arithmetic operation overflows
-                                     conflicting-repr-hints  deny     conflicts between `#[repr(..)]` hints that were previously accepted and used in practice
-                                                  const-err  deny     constant evaluation detected erroneous expression
-                                 ill-formed-attribute-input  deny     ill-formed attribute inputs that were previously accepted and used in practice
-                                         incomplete-include  deny     trailing content in included file
-                                 invalid-type-param-default  deny     type parameter default erroneously allowed in invalid location
-    macro-expanded-macro-exports-accessed-by-absolute-paths  deny     macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths
-                                         mutable-transmutes  deny     mutating transmuted &mut T from &T may cause undefined behavior
-                                      no-mangle-const-items  deny     const items will not have their symbols exported
-                              order-dependent-trait-objects  deny     trait-object types were treated as different depending on marker-trait order
-                                       overflowing-literals  deny     literal out of range for its type
-                               patterns-in-fns-without-body  deny     patterns in functions without body were erroneously allowed
-                            pub-use-of-private-extern-crate  deny     detect public re-exports of private extern crates
-                                              soft-unstable  deny     a feature gate that doesn't break dependent crates
-                                        unconditional-panic  deny     operation will cause a panic at runtime
-                                        unknown-crate-types  deny     unknown crate type found in `#[crate_type]` directive
-
-
-Lint groups provided by rustc:
-
-                       name  sub-lints
-                       ----  ---------
-                   warnings  all lints that are set to issue warnings
-        future-incompatible  keyword-idents, anonymous-parameters, illegal-floating-point-literal-pattern, private-in-public, pub-use-of-private-extern-crate, invalid-type-param-default, safe-packed-borrows, patterns-in-fns-without-body, late-bound-lifetime-arguments, order-dependent-trait-objects, coherence-leak-check, tyvar-behind-raw-pointer, absolute-paths-not-starting-with-crate, unstable-name-collisions, where-clauses-object-safety, proc-macro-derive-resolution-fallback, macro-expanded-macro-exports-accessed-by-absolute-paths, ill-formed-attribute-input, conflicting-repr-hints, ambiguous-associated-items, mutable-borrow-reservation-conflict, indirect-structural-match, pointer-structural-match, nontrivial-structural-match, soft-unstable, cenum-impl-drop-cast, const-evaluatable-unchecked, array-into-iter
-          nonstandard-style  non-camel-case-types, non-snake-case, non-upper-case-globals
-    rust-2018-compatibility  keyword-idents, anonymous-parameters, tyvar-behind-raw-pointer, absolute-paths-not-starting-with-crate
-           rust-2018-idioms  bare-trait-objects, unused-extern-crates, ellipsis-inclusive-range-patterns, elided-lifetimes-in-paths, explicit-outlives-requirements
-                    rustdoc  broken-intra-doc-links, private-intra-doc-links, invalid-codeblock-attributes, missing-doc-code-examples, private-doc-tests, invalid-html-tags
-                     unused  unused-imports, unused-variables, unused-assignments, dead-code, unused-mut, unreachable-code, unreachable-patterns, overlapping-patterns, unused-must-use, unused-unsafe, path-statements, unused-attributes, unused-macros, unused-allocation, unused-doc-comments, unused-extern-crates, unused-features, unused-labels, unused-parens, unused-braces, redundant-semicolons
-
-
-Compiler plugins can provide additional lints and lint groups. To see a listing of these, re-run `rustc -W help` with a crate filename.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/proper_unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/proper_unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/proper_unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/proper_unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-#[macro_use]
-mod auxiliary;
-
-pub mod default {
-    use pin_project_lite::pin_project;
-    use std::marker::PhantomPinned;
-
-    struct Inner<T> {
-        f: T,
-    }
-
-    assert_unpin!(Inner<()>);
-    assert_not_unpin!(Inner<PhantomPinned>);
-
-    pin_project! {
-        struct Foo<T, U> {
-            #[pin]
-            f1: Inner<T>,
-            f2: U,
-        }
-    }
-
-    assert_unpin!(Foo<(), ()>);
-    assert_unpin!(Foo<(), PhantomPinned>);
-    assert_not_unpin!(Foo<PhantomPinned, ()>);
-    assert_not_unpin!(Foo<PhantomPinned, PhantomPinned>);
-
-    pin_project! {
-        struct TrivialBounds {
-            #[pin]
-            f: PhantomPinned,
-        }
-    }
-
-    assert_not_unpin!(TrivialBounds);
-
-    pin_project! {
-        struct Bar<'a, T, U> {
-            #[pin]
-            f1: &'a mut Inner<T>,
-            f2: U,
-        }
-    }
-
-    assert_unpin!(Bar<'_, PhantomPinned, PhantomPinned>);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/test.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,415 +0,0 @@
-#![warn(rust_2018_idioms, single_use_lifetimes)]
-#![allow(dead_code)]
-
-#[macro_use]
-mod auxiliary;
-
-use core::{marker::PhantomPinned, pin::Pin};
-use pin_project_lite::pin_project;
-
-#[test]
-fn projection() {
-    pin_project! {
-        struct Struct<T, U> {
-            #[pin]
-            f1: T,
-            f2: U,
-        }
-    }
-
-    let mut s = Struct { f1: 1, f2: 2 };
-    let mut s_orig = Pin::new(&mut s);
-    let s = s_orig.as_mut().project();
-
-    let x: Pin<&mut i32> = s.f1;
-    assert_eq!(*x, 1);
-
-    let y: &mut i32 = s.f2;
-    assert_eq!(*y, 2);
-
-    assert_eq!(s_orig.as_ref().f1, 1);
-    assert_eq!(s_orig.as_ref().f2, 2);
-
-    let mut s = Struct { f1: 1, f2: 2 };
-
-    let s = Pin::new(&mut s).project();
-
-    let _: Pin<&mut i32> = s.f1;
-    let _: &mut i32 = s.f2;
-}
-
-#[test]
-fn where_clause() {
-    pin_project! {
-        struct Struct<T>
-        where
-            T: Copy,
-        {
-            f: T,
-        }
-    }
-}
-
-#[test]
-fn where_clause_and_associated_type_field() {
-    pin_project! {
-        struct Struct1<I>
-        where
-            I: Iterator,
-        {
-            #[pin]
-            f1: I,
-            f2: I::Item,
-        }
-    }
-
-    pin_project! {
-        struct Struct2<I, J>
-        where
-            I: Iterator<Item = J>,
-        {
-            #[pin]
-            f1: I,
-            f2: J,
-        }
-    }
-
-    pin_project! {
-        pub struct Struct3<T>
-        where
-            T: 'static,
-        {
-            f: T,
-        }
-    }
-
-    trait Static: 'static {}
-
-    impl<T> Static for Struct3<T> {}
-}
-
-#[test]
-fn derive_copy() {
-    pin_project! {
-        #[derive(Clone, Copy)]
-        struct Struct<T> {
-            f: T,
-        }
-    }
-
-    fn is_copy<T: Copy>() {}
-
-    is_copy::<Struct<u8>>();
-}
-
-#[test]
-fn move_out() {
-    struct NotCopy;
-
-    pin_project! {
-        struct Struct {
-            f: NotCopy,
-        }
-    }
-
-    let x = Struct { f: NotCopy };
-    let _val: NotCopy = x.f;
-}
-
-#[test]
-fn trait_bounds_on_type_generics() {
-    pin_project! {
-        pub struct Struct1<'a, T: ?Sized> {
-            f: &'a mut T,
-        }
-    }
-
-    pin_project! {
-        pub struct Struct2<'a, T: ::core::fmt::Debug> {
-            f: &'a mut T,
-        }
-    }
-
-    pin_project! {
-        pub struct Struct3<'a, T: core::fmt::Debug> {
-            f: &'a mut T,
-        }
-    }
-
-    // pin_project! {
-    //     pub struct Struct4<'a, T: core::fmt::Debug + core::fmt::Display> {
-    //         f: &'a mut T,
-    //     }
-    // }
-
-    // pin_project! {
-    //     pub struct Struct5<'a, T: core::fmt::Debug + ?Sized> {
-    //         f: &'a mut T,
-    //     }
-    // }
-
-    pin_project! {
-        pub struct Struct6<'a, T: core::fmt::Debug = [u8; 16]> {
-            f: &'a mut T,
-        }
-    }
-
-    let _: Struct6<'_> = Struct6 { f: &mut [0u8; 16] };
-
-    pin_project! {
-        pub struct Struct7<T: 'static> {
-            f: T,
-        }
-    }
-
-    trait Static: 'static {}
-
-    impl<T> Static for Struct7<T> {}
-
-    pin_project! {
-        pub struct Struct8<'a, 'b: 'a> {
-            f1: &'a u8,
-            f2: &'b u8,
-        }
-    }
-}
-
-#[test]
-fn private_type_in_public_type() {
-    pin_project! {
-        pub struct PublicStruct<T> {
-            #[pin]
-            inner: PrivateStruct<T>,
-        }
-    }
-
-    struct PrivateStruct<T>(T);
-}
-
-#[allow(clippy::needless_lifetimes)]
-#[test]
-fn lifetime_project() {
-    pin_project! {
-        struct Struct1<T, U> {
-            #[pin]
-            pinned: T,
-            unpinned: U,
-        }
-    }
-
-    pin_project! {
-        struct Struct2<'a, T, U> {
-            #[pin]
-            pinned: &'a mut T,
-            unpinned: U,
-        }
-    }
-
-    impl<T, U> Struct1<T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut T> {
-            self.project().pinned
-        }
-        fn get_pin_ref_elided(self: Pin<&Self>) -> Pin<&T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut_elided(self: Pin<&mut Self>) -> Pin<&mut T> {
-            self.project().pinned
-        }
-    }
-
-    impl<'b, T, U> Struct2<'b, T, U> {
-        fn get_pin_ref<'a>(self: Pin<&'a Self>) -> Pin<&'a &'b mut T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut &'b mut T> {
-            self.project().pinned
-        }
-        fn get_pin_ref_elided(self: Pin<&Self>) -> Pin<&&'b mut T> {
-            self.project_ref().pinned
-        }
-        fn get_pin_mut_elided(self: Pin<&mut Self>) -> Pin<&mut &'b mut T> {
-            self.project().pinned
-        }
-    }
-}
-
-mod visibility {
-    use pin_project_lite::pin_project;
-
-    pin_project! {
-        pub(crate) struct S {
-            pub f: u8,
-        }
-    }
-}
-
-#[test]
-fn visibility() {
-    let mut x = visibility::S { f: 0 };
-    let x = Pin::new(&mut x);
-    let y = x.as_ref().project_ref();
-    let _: &u8 = y.f;
-    let y = x.project();
-    let _: &mut u8 = y.f;
-}
-
-#[test]
-fn trivial_bounds() {
-    pin_project! {
-        pub struct NoGenerics {
-            #[pin]
-            f: PhantomPinned,
-        }
-    }
-
-    assert_not_unpin!(NoGenerics);
-}
-
-#[test]
-fn dst() {
-    pin_project! {
-        pub struct Struct1<T: ?Sized> {
-            f: T,
-        }
-    }
-
-    let mut x = Struct1 { f: 0_u8 };
-    let x: Pin<&mut Struct1<dyn core::fmt::Debug>> = Pin::new(&mut x as _);
-    let _y: &mut (dyn core::fmt::Debug) = x.project().f;
-
-    pin_project! {
-        pub struct Struct2<T: ?Sized> {
-            #[pin]
-            f: T,
-        }
-    }
-
-    let mut x = Struct2 { f: 0_u8 };
-    let x: Pin<&mut Struct2<dyn core::fmt::Debug + Unpin>> = Pin::new(&mut x as _);
-    let _y: Pin<&mut (dyn core::fmt::Debug + Unpin)> = x.project().f;
-
-    pin_project! {
-        struct Struct3<T>
-        where
-            T: ?Sized,
-        {
-            f: T,
-        }
-    }
-
-    pin_project! {
-        struct Struct4<T>
-        where
-            T: ?Sized,
-        {
-            #[pin]
-            f: T,
-        }
-    }
-
-    pin_project! {
-        struct Struct11<'a, T: ?Sized, U: ?Sized> {
-            f1: &'a mut T,
-            f2: U,
-        }
-    }
-}
-
-#[test]
-fn dyn_type() {
-    pin_project! {
-        struct Struct1 {
-            f: dyn core::fmt::Debug,
-        }
-    }
-
-    pin_project! {
-        struct Struct2 {
-            #[pin]
-            f: dyn core::fmt::Debug,
-        }
-    }
-
-    pin_project! {
-        struct Struct3 {
-            f: dyn core::fmt::Debug + Send,
-        }
-    }
-
-    pin_project! {
-        struct Struct4 {
-            #[pin]
-            f: dyn core::fmt::Debug + Send,
-        }
-    }
-}
-
-#[test]
-fn no_infer_outlives() {
-    trait Trait<X> {
-        type Y;
-    }
-
-    struct Struct1<A>(A);
-
-    impl<X, T> Trait<X> for Struct1<T> {
-        type Y = Option<T>;
-    }
-
-    pin_project! {
-        struct Struct2<A, B> {
-            _f: <Struct1<A> as Trait<B>>::Y,
-        }
-    }
-}
-
-// https://github.com/taiki-e/pin-project-lite/issues/31
-#[test]
-fn trailing_comma() {
-    pub trait T {}
-
-    pin_project! {
-        pub struct S1<
-            A: T,
-            B: T,
-        > {
-            f: (A, B),
-        }
-    }
-
-    pin_project! {
-        pub struct S2<
-            A,
-            B,
-        >
-        where
-            A: T,
-            B: T,
-        {
-            f: (A, B),
-        }
-    }
-
-    pin_project! {
-        #[allow(explicit_outlives_requirements)]
-        pub struct S3<
-            'a,
-            A: 'a,
-            B: 'a,
-        > {
-            f: &'a (A, B),
-        }
-    }
-
-    // pin_project! {
-    //     pub struct S4<
-    //         'a,
-    //         'b: 'a, // <-----
-    //     > {
-    //         f: &'a &'b (),
-    //     }
-    // }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-drop.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! { //~ ERROR E0119
-    struct Foo<T, U> {
-        #[pin]
-        future: T,
-        field: U,
-    }
-}
-
-impl<T, U> Drop for Foo<T, U> {
-    fn drop(&mut self) {}
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-drop.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-drop.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-drop.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-drop.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-error[E0119]: conflicting implementations of trait `_::MustNotImplDrop` for type `Foo<_, _>`:
- --> $DIR/conflict-drop.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR E0119
-4 | |     struct Foo<T, U> {
-5 | |         #[pin]
-6 | |         future: T,
-7 | |         field: U,
-8 | |     }
-9 | | }
-  | | ^
-  | | |
-  | |_first implementation here
-  |   conflicting implementation for `Foo<_, _>`
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-unpin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-unpin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-unpin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-unpin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-use pin_project_lite::pin_project;
-
-// The same implementation.
-
-pin_project! { //~ ERROR E0119
-    struct Foo<T, U> {
-        #[pin]
-        future: T,
-        field: U,
-    }
-}
-
-// conflicting implementations
-impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-
-// The implementation that under different conditions.
-
-pin_project! { //~ ERROR E0119
-    struct Bar<T, U> {
-        #[pin]
-        future: T,
-        field: U,
-    }
-}
-
-// conflicting implementations
-impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
-
-pin_project! { //~ ERROR E0119
-    struct Baz<T, U> {
-        #[pin]
-        future: T,
-        field: U,
-    }
-}
-
-// conflicting implementations
-impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-unpin.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-unpin.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-unpin.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/conflict-unpin.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Foo<_, _>`:
-  --> $DIR/conflict-unpin.rs:5:1
-   |
-5  | / pin_project! { //~ ERROR E0119
-6  | |     struct Foo<T, U> {
-7  | |         #[pin]
-8  | |         future: T,
-9  | |         field: U,
-10 | |     }
-11 | | }
-   | |_^ conflicting implementation for `Foo<_, _>`
-...
-14 |   impl<T, U> Unpin for Foo<T, U> where T: Unpin {} // Conditional Unpin impl
-   |   --------------------------------------------- first implementation here
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Bar<_, _>`:
-  --> $DIR/conflict-unpin.rs:18:1
-   |
-18 | / pin_project! { //~ ERROR E0119
-19 | |     struct Bar<T, U> {
-20 | |         #[pin]
-21 | |         future: T,
-22 | |         field: U,
-23 | |     }
-24 | | }
-   | |_^ conflicting implementation for `Bar<_, _>`
-...
-27 |   impl<T, U> Unpin for Bar<T, U> {} // Non-conditional Unpin impl
-   |   ------------------------------ first implementation here
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0119]: conflicting implementations of trait `std::marker::Unpin` for type `Baz<_, _>`:
-  --> $DIR/conflict-unpin.rs:29:1
-   |
-29 | / pin_project! { //~ ERROR E0119
-30 | |     struct Baz<T, U> {
-31 | |         #[pin]
-32 | |         future: T,
-33 | |         field: U,
-34 | |     }
-35 | | }
-   | |_^ conflicting implementation for `Baz<_, _>`
-...
-38 |   impl<T: Unpin, U: Unpin> Unpin for Baz<T, U> {} // Conditional Unpin impl
-   |   -------------------------------------------- first implementation here
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid-bounds.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid-bounds.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid-bounds.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid-bounds.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! {
-    struct Generics1<T: 'static : Sized> { //~ ERROR no rules expected the token `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics2<T: 'static : ?Sized> { //~ ERROR no rules expected the token `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics3<T: Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics4<T: ?Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics5<T: Sized : ?Sized> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct Generics6<T: ?Sized : Sized> { //~ ERROR no rules expected the token `Sized`
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause1<T>
-    where
-        T: 'static : Sized //~ ERROR no rules expected the token `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause2<T>
-    where
-        T: 'static : ?Sized //~ ERROR no rules expected the token `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause3<T>
-    where
-        T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause4<T>
-    where
-        T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause5<T>
-    where
-        T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
-    {
-        field: T,
-    }
-}
-
-pin_project! {
-    struct WhereClause6<T>
-    where
-        T: ?Sized : Sized //~ ERROR no rules expected the token `Sized`
-    {
-        field: T,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid-bounds.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid-bounds.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid-bounds.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid-bounds.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-error: no rules expected the token `:`
- --> $DIR/invalid-bounds.rs:4:33
-  |
-4 |     struct Generics1<T: 'static : Sized> { //~ ERROR no rules expected the token `:`
-  |                                 ^ no rules expected this token in macro call
-
-error: no rules expected the token `:`
-  --> $DIR/invalid-bounds.rs:10:33
-   |
-10 |     struct Generics2<T: 'static : ?Sized> { //~ ERROR no rules expected the token `:`
-   |                                 ^ no rules expected this token in macro call
-
-error: expected one of `+`, `,`, `=`, or `>`, found `:`
-  --> $DIR/invalid-bounds.rs:15:1
-   |
-15 | / pin_project! {
-16 | |     struct Generics3<T: Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-17 | |         field: T,
-18 | |     }
-19 | | }
-   | | ^
-   | | |
-   | | expected one of `+`, `,`, `=`, or `>`
-   | |_unexpected token
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected one of `+`, `,`, `=`, or `>`, found `:`
-  --> $DIR/invalid-bounds.rs:21:1
-   |
-21 | / pin_project! {
-22 | |     struct Generics4<T: ?Sized : 'static> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-23 | |         field: T,
-24 | |     }
-25 | | }
-   | | ^
-   | | |
-   | | expected one of `+`, `,`, `=`, or `>`
-   | |_unexpected token
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected one of `+`, `,`, `=`, or `>`, found `:`
-  --> $DIR/invalid-bounds.rs:27:1
-   |
-27 | / pin_project! {
-28 | |     struct Generics5<T: Sized : ?Sized> { //~ ERROR expected one of `+`, `,`, `=`, or `>`, found `:`
-29 | |         field: T,
-30 | |     }
-31 | | }
-   | | ^
-   | | |
-   | | expected one of `+`, `,`, `=`, or `>`
-   | |_unexpected token
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `Sized`
-  --> $DIR/invalid-bounds.rs:34:34
-   |
-34 |     struct Generics6<T: ?Sized : Sized> { //~ ERROR no rules expected the token `Sized`
-   |                                  ^^^^^ no rules expected this token in macro call
-
-error: no rules expected the token `:`
-  --> $DIR/invalid-bounds.rs:42:20
-   |
-42 |         T: 'static : Sized //~ ERROR no rules expected the token `:`
-   |                    ^ no rules expected this token in macro call
-
-error: no rules expected the token `:`
-  --> $DIR/invalid-bounds.rs:51:20
-   |
-51 |         T: 'static : ?Sized //~ ERROR no rules expected the token `:`
-   |                    ^ no rules expected this token in macro call
-
-error: expected `where`, or `{` after struct name, found `:`
-  --> $DIR/invalid-bounds.rs:57:1
-   |
-57 | / pin_project! {
-58 | |     struct WhereClause3<T>
-59 | |     where
-60 | |         T: Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
-...  |
-63 | |     }
-64 | | }
-   | | ^
-   | | |
-   | |_expected `where`, or `{` after struct name
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected `where`, or `{` after struct name, found `:`
-  --> $DIR/invalid-bounds.rs:66:1
-   |
-66 | / pin_project! {
-67 | |     struct WhereClause4<T>
-68 | |     where
-69 | |         T: ?Sized : 'static //~ ERROR expected `where`, or `{` after struct name, found `:`
-...  |
-72 | |     }
-73 | | }
-   | | ^
-   | | |
-   | |_expected `where`, or `{` after struct name
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: expected `where`, or `{` after struct name, found `:`
-  --> $DIR/invalid-bounds.rs:75:1
-   |
-75 | / pin_project! {
-76 | |     struct WhereClause5<T>
-77 | |     where
-78 | |         T: Sized : ?Sized //~ ERROR expected `where`, or `{` after struct name, found `:`
-...  |
-81 | |     }
-82 | | }
-   | | ^
-   | | |
-   | |_expected `where`, or `{` after struct name
-   |   in this macro invocation
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: no rules expected the token `Sized`
-  --> $DIR/invalid-bounds.rs:87:21
-   |
-87 |         T: ?Sized : Sized //~ ERROR no rules expected the token `Sized`
-   |                     ^^^^^ no rules expected this token in macro call
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! {
-    struct A<T> {
-        #[pin()] //~ ERROR no rules expected the token `(`
-        pinned: T,
-    }
-}
-
-pin_project! {
-    #[pin] //~ ERROR cannot find attribute `pin` in this scope
-    struct B<T> {
-        pinned: T,
-    }
-}
-
-pin_project! {
-    struct C<T> {
-        #[pin]
-        #[pin] //~ ERROR no rules expected the token `#`
-        pinned: T,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/invalid.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-error: no rules expected the token `(`
- --> $DIR/invalid.rs:5:14
-  |
-5 |         #[pin()] //~ ERROR no rules expected the token `(`
-  |              ^ no rules expected this token in macro call
-
-error: no rules expected the token `#`
-  --> $DIR/invalid.rs:20:9
-   |
-20 |         #[pin] //~ ERROR no rules expected the token `#`
-   |         ^ no rules expected this token in macro call
-
-error: cannot find attribute `pin` in this scope
-  --> $DIR/invalid.rs:11:7
-   |
-11 |     #[pin] //~ ERROR cannot find attribute `pin` in this scope
-   |       ^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_lifetime_names.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_lifetime_names.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_lifetime_names.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_lifetime_names.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! { //~ ERROR E0496
-    pub struct Foo<'__pin, T> { //~ ERROR E0263
-        #[pin]
-        field: &'__pin mut T,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_lifetime_names.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_lifetime_names.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_lifetime_names.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_lifetime_names.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-error[E0496]: lifetime name `'__pin` shadows a lifetime name that is already in scope
- --> $DIR/overlapping_lifetime_names.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ------ first declared here
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_^ lifetime '__pin already in scope
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0496]: lifetime name `'__pin` shadows a lifetime name that is already in scope
- --> $DIR/overlapping_lifetime_names.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ------ first declared here
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_^ lifetime '__pin already in scope
-  |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0263]: lifetime name `'__pin` declared twice in the same scope
- --> $DIR/overlapping_lifetime_names.rs:4:20
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ^^^^^^ declared twice
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_- previous declaration here
-
-error[E0263]: lifetime name `'__pin` declared twice in the same scope
- --> $DIR/overlapping_lifetime_names.rs:4:20
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ^^^^^^ declared twice
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_- previous declaration here
-
-error[E0263]: lifetime name `'__pin` declared twice in the same scope
- --> $DIR/overlapping_lifetime_names.rs:4:20
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ^^^^^^ declared twice
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_- previous declaration here
-
-error[E0263]: lifetime name `'__pin` declared twice in the same scope
- --> $DIR/overlapping_lifetime_names.rs:4:20
-  |
-3 | / pin_project! { //~ ERROR E0496
-4 | |     pub struct Foo<'__pin, T> { //~ ERROR E0263
-  | |                    ^^^^^^ declared twice
-5 | |         #[pin]
-6 | |         field: &'__pin mut T,
-7 | |     }
-8 | | }
-  | |_- previous declaration here
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_unpin_struct.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_unpin_struct.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_unpin_struct.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_unpin_struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-use pin_project_lite::pin_project;
-use std::marker::PhantomPinned;
-
-pin_project! {
-    struct Foo<T> {
-        #[pin]
-        inner: T,
-    }
-}
-
-struct __Origin {}
-
-impl Unpin for __Origin {}
-
-fn is_unpin<T: Unpin>() {}
-
-fn main() {
-    is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_unpin_struct.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_unpin_struct.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_unpin_struct.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/overlapping_unpin_struct.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0277]: `PhantomPinned` cannot be unpinned
-  --> $DIR/overlapping_unpin_struct.rs:18:5
-   |
-15 | fn is_unpin<T: Unpin>() {}
-   |                ----- required by this bound in `is_unpin`
-...
-18 |     is_unpin::<Foo<PhantomPinned>>(); //~ ERROR E0277
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ within `_::__Origin<'_, PhantomPinned>`, the trait `Unpin` is not implemented for `PhantomPinned`
-   |
-   = note: required because it appears within the type `_::__Origin<'_, PhantomPinned>`
-   = note: required because of the requirements on the impl of `Unpin` for `Foo<PhantomPinned>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/packed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/packed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/packed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/packed.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-    #[repr(packed, C)]
-    struct A {
-        #[pin]
-        field: u16,
-    }
-}
-
-pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-    #[repr(packed(2))]
-    struct C {
-        #[pin]
-        field: u32,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/packed.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/packed.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/packed.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/packed.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-error: borrow of packed field is unsafe and requires unsafe function or block (error E0133)
- --> $DIR/packed.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-4 | |     #[repr(packed, C)]
-5 | |     struct A {
-6 | |         #[pin]
-7 | |         field: u16,
-8 | |     }
-9 | | }
-  | |_^
-  |
-note: the lint level is defined here
- --> $DIR/packed.rs:3:1
-  |
-3 | / pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-4 | |     #[repr(packed, C)]
-5 | |     struct A {
-6 | |         #[pin]
-7 | |         field: u16,
-8 | |     }
-9 | | }
-  | |_^
-  = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-  = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
-  = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: borrow of packed field is unsafe and requires unsafe function or block (error E0133)
-  --> $DIR/packed.rs:11:1
-   |
-11 | / pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-12 | |     #[repr(packed(2))]
-13 | |     struct C {
-14 | |         #[pin]
-15 | |         field: u32,
-16 | |     }
-17 | | }
-   | |_^
-   |
-note: the lint level is defined here
-  --> $DIR/packed.rs:11:1
-   |
-11 | / pin_project! { //~ ERROR borrow of packed field is unsafe and requires unsafe function or block
-12 | |     #[repr(packed(2))]
-13 | |     struct C {
-14 | |         #[pin]
-15 | |         field: u32,
-16 | |     }
-17 | | }
-   | |_^
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
-   = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unpin_sneaky.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unpin_sneaky.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unpin_sneaky.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unpin_sneaky.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! {
-    struct Foo {
-        #[pin]
-        inner: u8,
-    }
-}
-
-impl Unpin for __Origin {} //~ ERROR E0412,E0321
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unpin_sneaky.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unpin_sneaky.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unpin_sneaky.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unpin_sneaky.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-error[E0412]: cannot find type `__Origin` in this scope
-  --> $DIR/unpin_sneaky.rs:10:16
-   |
-10 | impl Unpin for __Origin {} //~ ERROR E0412,E0321
-   |                ^^^^^^^^ not found in this scope
-
-error[E0321]: cross-crate traits with a default impl, like `Unpin`, can only be implemented for a struct/enum type, not `[type error]`
-  --> $DIR/unpin_sneaky.rs:10:1
-   |
-10 | impl Unpin for __Origin {} //~ ERROR E0412,E0321
-   | ^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unsupported.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unsupported.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unsupported.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unsupported.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-use pin_project_lite::pin_project;
-
-pin_project! {
-    struct Struct1 {} //~ ERROR no rules expected the token `}`
-}
-
-pin_project! {
-    struct Struct2(); //~ ERROR no rules expected the token `(`
-}
-
-pin_project! {
-    struct Struct3; //~ ERROR no rules expected the token `;`
-}
-
-pin_project! {
-    enum Enum { //~ ERROR no rules expected the token `enum`
-        A(u8)
-    }
-}
-
-pin_project! {
-    union Union { //~ ERROR no rules expected the token `union`
-        x: u8,
-    }
-}
-
-fn main() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unsupported.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unsupported.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unsupported.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/pin-project-lite-0.1.11/tests/ui/unsupported.stderr	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-error: no rules expected the token `}`
- --> $DIR/unsupported.rs:4:21
-  |
-4 |     struct Struct1 {} //~ ERROR no rules expected the token `}`
-  |                     ^ no rules expected this token in macro call
-
-error: no rules expected the token `(`
- --> $DIR/unsupported.rs:8:19
-  |
-8 |     struct Struct2(); //~ ERROR no rules expected the token `(`
-  |                   ^ no rules expected this token in macro call
-
-error: no rules expected the token `;`
-  --> $DIR/unsupported.rs:12:19
-   |
-12 |     struct Struct3; //~ ERROR no rules expected the token `;`
-   |                   ^ no rules expected this token in macro call
-
-error: no rules expected the token `enum`
-  --> $DIR/unsupported.rs:16:5
-   |
-16 |     enum Enum { //~ ERROR no rules expected the token `enum`
-   |     ^^^^ no rules expected this token in macro call
-
-error: no rules expected the token `union`
-  --> $DIR/unsupported.rs:22:5
-   |
-22 |     union Union { //~ ERROR no rules expected the token `union`
-   |     ^^^^^ no rules expected this token in macro call
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/appveyor.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/appveyor.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/appveyor.yml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# Appveyor configuration template for Rust using rustup for Rust installation
-# https://github.com/starkat99/appveyor-rust
-
-os: Visual Studio 2015
-
-environment:
-  matrix:
-
-  # Stable 64-bit MSVC
-    - channel: stable
-      target: x86_64-pc-windows-msvc
-  # Stable 32-bit MSVC
-    - channel: stable
-      target: i686-pc-windows-msvc
-  # Stable 64-bit GNU
-    - channel: stable
-      target: x86_64-pc-windows-gnu
-  # Stable 32-bit GNU
-    - channel: stable
-      target: i686-pc-windows-gnu
-
-install:
-  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init -yv --default-toolchain %channel% --default-host %target%
-  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
-  - ps: |
-      if ($env:target -like "*-gnu" -And $env:target -like "x86_64-*") {
-          Start-FileDownload "http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.1.0/threads-win32/seh/x86_64-5.1.0-release-win32-seh-rt_v4-rev0.7z/download" -FileName mingw64.7z
-          7z x -oC:\ mingw64.7z > $null
-          $env:path = "C:\mingw64\bin;" + $env:path
-          gcc --version
-      }
-      elseif ($env:target -like "*-gnu") {
-          $env:path = "C:\mingw\bin;" + $env:path
-          gcc --version
-      }
-  - rustc -vV
-  - cargo -vV
-
-build: false
-
-test_script:
-  - cargo test
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/benches/benchmark.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/benches/benchmark.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/benches/benchmark.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/benches/benchmark.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-// bench.rs
-#![feature(test)]
-
-extern crate podio;
-extern crate test;
-
-use test::Bencher;
-use podio::{Endianness, BigEndian, LittleEndian, WritePodExt, ReadPodExt};
-
-// bench: find the `BENCH_SIZE` first terms of the fibonacci sequence
-const BENCH_SIZE: usize = 2000;
-
-#[bench]
-fn write_u64_be(b: &mut Bencher) {
-    write_u64::<BigEndian>(b);
-}
-
-#[bench]
-fn write_u64_le(b: &mut Bencher) {
-    write_u64::<LittleEndian>(b);
-}
-
-fn write_u64<T: Endianness>(b: &mut Bencher) {
-    b.iter(|| {
-        let mut writer : &mut[u8] = &mut [0; BENCH_SIZE * 8];
-        for _ in 0..BENCH_SIZE {
-            writer.write_u64::<T>(0x012345678u64).unwrap();
-        }
-    })
-}
-
-#[bench]
-fn read_u64_be(b: &mut Bencher) {
-    read_u64::<BigEndian>(b);
-}
-
-#[bench]
-fn read_u64_le(b: &mut Bencher) {
-    read_u64::<LittleEndian>(b);
-}
-
-fn read_u64<T: Endianness>(b: &mut Bencher) {
-    b.iter(|| {
-        let mut reader : &[u8] = &[0; BENCH_SIZE * 8];
-        for _ in 0..BENCH_SIZE {
-            reader.read_u64::<T>().unwrap();
-        }
-    })
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"864dd81db21e85db5b74242b5f486b75bab2f5b9f666e6ee63e41d02520783f7","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"892ad0db8a971b86db947bae64542aa67d91cfae768b3ed3ea281c54844a4ae9","README.md":"4b66e3517754d9aabe44c17b224f1d1e72a6fb50507d49536e6825a3e4d0b347","appveyor.yml":"5940accb4ac2c4904459a7a600da6b8dca015653ba273eab7e87894df464d379","benches/benchmark.rs":"0adade342f2046c8d6f669097209f23b4d8a35c6b5dc2c3687addf2f4444aa40","script/doc-upload.cfg":"273e9501d95820583705e9f4c4f84afefba4fd227223fc3d165dfb1aba91c5d1","src/lib.rs":"32efe5d0a248a707c68ca7084d3855c6d918fc12d7f49b1fec56002116ecb735","tests/bytes.rs":"1cb1979745f35086a785df207f3b0f660cf6720e123c3e0042fb924d5795aa37","tests/io.rs":"19e4699082d0a0432dfa23bda2a54ed426d23bf7f07a579ba4305a1926d952ec"},"package":"b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "podio"
-version = "0.1.7"
-authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>"]
-description = "Additional trait for Read and Write to read and write Plain Old Data\n"
-documentation = "http://mvdnes.github.io/rust-docs/podio/podio/index.html"
-keywords = ["byte", "byteorder", "io"]
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/mvdnes/podio.git"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Copyright (c) 2015 The podio Developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-podio
-=====
-
-[![Build Status](https://travis-ci.org/mvdnes/podio.svg?branch=master)](https://travis-ci.org/mvdnes/podio)
-[![Build status](https://ci.appveyor.com/api/projects/status/hjc3icfjob7mocc9/branch/master?svg=true)](https://ci.appveyor.com/project/mvdnes/podio/branch/master)
-[![Crates.io version](https://img.shields.io/crates/v/podio.svg)](https://crates.io/crates/podio)
-
-[Documentation](http://mvdnes.github.io/rust-docs/podio/podio/index.html)
-
-Implementation for reading and writing POD (plain old data) values in Rust. The name stands for POD I/O.
-
-Keywords: byte, be, le, big-endian, little-endian
-
-Usage
------
-
-Include the following code:
-
-```toml
-[dependencies]
-podio = "0.1"
-```
-
-Example
--------
-
-```rust
-extern crate podio;
-
-use podio::{ReadPodExt, BigEndian};
-
-fn main() {
-    let slice: &[u8] = &[0x10, 0x20, 0x30, 0x40];
-    let mut reader = std::io::Cursor::new(slice);
-
-    let value = reader.read_u32::<BigEndian>().unwrap();
-
-    assert_eq!(value, 0x10203040);
-}
-```
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally
-submitted for inclusion in the work by you, as defined in the Apache-2.0
-license, shall be dual licensed as above, without any additional terms or
-conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/script/doc-upload.cfg thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/script/doc-upload.cfg
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/script/doc-upload.cfg	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/script/doc-upload.cfg	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-PROJECT_NAME=podio
-DOCS_REPO=mvdnes/rust-docs.git
-DOC_RUST_VERSION=stable
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,364 +0,0 @@
-//! Additional methods for Read and Write
-//!
-//! The additional methods implemented allow reading and writing integers and floats
-//! in the specified endianness.
-//!
-//! # Usage
-//!
-//! Basically, you need to `use` the trait WritePodExt or ReadPodExt.
-//!
-//! # Examples
-//!
-//! ## Reading
-//!
-//! To read some value from a reader, import ReadPodExt and the needed endianness.
-//!
-//! ```
-//! use podio::{ReadPodExt, BigEndian};
-//!
-//! let slice: &[u8] = &[0x10, 0x20, 0x30, 0x40];
-//! let mut reader = std::io::Cursor::new(slice);
-//!
-//! let value = reader.read_u32::<BigEndian>().unwrap();
-//!
-//! assert_eq!(value, 0x10203040);
-//! ```
-//!
-//! ## Writing
-//!
-//! For writing, you need to import the trait WritePodExt.
-//!
-//! ```
-//! use podio::{WritePodExt, LittleEndian};
-//!
-//! let slice: &mut [u8] = &mut [0; 2];
-//! let mut writer = std::io::Cursor::new(slice);
-//!
-//! writer.write_u16::<LittleEndian>(0x8802).unwrap();
-//!
-//! assert_eq!(writer.into_inner(), &[0x02, 0x88]);
-//! ```
-//!
-//! ## Read exact
-//!
-//! One additional method, not really dealing with POD, is `read_exact`.
-//!
-//! ```
-//! use podio::ReadPodExt;
-//!
-//! let slice: &[u8] = &[0, 1, 2, 3];
-//! let mut reader = std::io::Cursor::new(slice);
-//!
-//! assert_eq!(reader.read_exact(1).unwrap(), [0]);
-//! assert_eq!(reader.read_exact(2).unwrap(), [1,2]);
-//! assert_eq!(reader.read_exact(0).unwrap(), []);
-//! assert_eq!(reader.read_exact(1).unwrap(), [3]);
-//! assert!(reader.read_exact(1).is_err());
-
-#![warn(missing_docs)]
-
-use std::io;
-use std::io::prelude::*;
-
-/// Little endian. The number `0xABCD` is stored `[0xCD, 0xAB]`
-pub enum LittleEndian {}
-/// Big endian. The number `0xABCD` is stored `[0xAB, 0xCD]`
-pub enum BigEndian {}
-
-/// Trait implementing conversion methods for a specific endianness
-pub trait Endianness {
-    /// Converts a value from the platform type to the specified endianness
-    fn int_to_target<T: EndianConvert>(val: T) -> T;
-    /// Converts a value from the sepcified endianness to the platform type
-    fn int_from_target<T: EndianConvert>(val: T) -> T;
-}
-
-/// Generic trait for endian conversions on integers
-pub trait EndianConvert {
-    /// Convert self to a big-endian value
-    fn to_be(self) -> Self;
-    /// Convert self to a little-endian value
-    fn to_le(self) -> Self;
-    /// Convert a big-endian value to the target endianness
-    fn from_be(x: Self) -> Self;
-    /// Convert a little-endian value to the target endiannes
-    fn from_le(x: Self) -> Self;
-}
-
-/// Additional write methods for a io::Write
-pub trait WritePodExt {
-    /// Write a u64
-    fn write_u64<T: Endianness>(&mut self, u64) -> io::Result<()>;
-    /// Write a u32
-    fn write_u32<T: Endianness>(&mut self, u32) -> io::Result<()>;
-    /// Write a u16
-    fn write_u16<T: Endianness>(&mut self, u16) -> io::Result<()>;
-    /// Write a u8
-    fn write_u8(&mut self, u8) -> io::Result<()>;
-    /// Write a i64
-    fn write_i64<T: Endianness>(&mut self, i64) -> io::Result<()>;
-    /// Write a i32
-    fn write_i32<T: Endianness>(&mut self, i32) -> io::Result<()>;
-    /// Write a i16
-    fn write_i16<T: Endianness>(&mut self, i16) -> io::Result<()>;
-    /// Write a i8
-    fn write_i8(&mut self, i8) -> io::Result<()>;
-    /// Write a f32
-    fn write_f32<T: Endianness>(&mut self, f32) -> io::Result<()>;
-    /// Write a f64
-    fn write_f64<T: Endianness>(&mut self, f64) -> io::Result<()>;
-}
-
-/// Additional read methods for a io::Read
-pub trait ReadPodExt {
-    /// Read a u64
-    fn read_u64<T: Endianness>(&mut self) -> io::Result<u64>;
-    /// Read a u32
-    fn read_u32<T: Endianness>(&mut self) -> io::Result<u32>;
-    /// Read a u16
-    fn read_u16<T: Endianness>(&mut self) -> io::Result<u16>;
-    /// Read a u8
-    fn read_u8(&mut self) -> io::Result<u8>;
-    /// Read a i64
-    fn read_i64<T: Endianness>(&mut self) -> io::Result<i64>;
-    /// Read a i32
-    fn read_i32<T: Endianness>(&mut self) -> io::Result<i32>;
-    /// Read a i16
-    fn read_i16<T: Endianness>(&mut self) -> io::Result<i16>;
-    /// Read a i8
-    fn read_i8(&mut self) -> io::Result<i8>;
-    /// Read a f32
-    fn read_f32<T: Endianness>(&mut self) -> io::Result<f32>;
-    /// Read a f64
-    fn read_f64<T: Endianness>(&mut self) -> io::Result<f64>;
-    /// Read a specific number of bytes
-    fn read_exact(&mut self, usize) -> io::Result<Vec<u8>>;
-}
-
-impl Endianness for LittleEndian {
-    #[inline]
-    fn int_to_target<T: EndianConvert>(val: T) -> T {
-        val.to_le()
-    }
-    #[inline]
-    fn int_from_target<T: EndianConvert>(val: T) -> T {
-        <T as EndianConvert>::from_le(val)
-    }
-}
-
-impl Endianness for BigEndian {
-    #[inline]
-    fn int_to_target<T: EndianConvert>(val: T) -> T {
-        val.to_be()
-    }
-    #[inline]
-    fn int_from_target<T: EndianConvert>(val: T) -> T {
-        <T as EndianConvert>::from_be(val)
-    }
-}
-
-macro_rules! impl_platform_convert {
-    ($T:ty) => {
-        impl EndianConvert for $T {
-            #[inline]
-            fn to_be(self) -> $T {
-                self.to_be()
-            }
-
-            #[inline]
-            fn to_le(self) -> $T {
-                self.to_le()
-            }
-
-            #[inline]
-            fn from_be(x: $T) -> $T {
-                if cfg!(target_endian = "big") { x } else { x.swap_bytes() }
-            }
-
-            #[inline]
-            fn from_le(x: $T) -> $T {
-                if cfg!(target_endian = "little") { x } else { x.swap_bytes() }
-            }
-        }
-    };
-}
-
-impl_platform_convert!(u8);
-impl_platform_convert!(u16);
-impl_platform_convert!(u32);
-impl_platform_convert!(u64);
-
-#[cfg(target_endian = "little")]
-macro_rules! val_to_buf {
-    ($val:ident, $T:expr) => {
-        {
-            let mut buf = [0; $T];
-            for i in 0..buf.len() {
-                buf[i] = ($val >> (i * 8)) as u8;
-            }
-            buf
-        }
-    };
-}
-
-#[cfg(target_endian = "big")]
-macro_rules! val_to_buf {
-    ($val:ident, $T:expr) => {
-        {
-            let mut buf = [0; $T];
-            for i in 0..buf.len() {
-                buf[buf.len() - 1 - i] = ($val >> (i * 8)) as u8;
-            }
-            buf
-        }
-    };
-}
-
-impl<W: Write> WritePodExt for W {
-    fn write_u64<T: Endianness>(&mut self, val: u64) -> io::Result<()> {
-        let tval = <T as Endianness>::int_to_target(val);
-        let buf = val_to_buf!(tval, 8);
-        self.write_all(&buf)
-    }
-
-    fn write_u32<T: Endianness>(&mut self, val: u32) -> io::Result<()> {
-        let tval = <T as Endianness>::int_to_target(val);
-        let buf = val_to_buf!(tval, 4);
-        self.write_all(&buf)
-    }
-
-    fn write_u16<T: Endianness>(&mut self, val: u16) -> io::Result<()> {
-        let tval = <T as Endianness>::int_to_target(val);
-        let buf = val_to_buf!(tval, 2);
-        self.write_all(&buf)
-    }
-
-    fn write_u8(&mut self, val: u8) -> io::Result<()> {
-        self.write_all(&[val])
-    }
-
-    fn write_i64<T: Endianness>(&mut self, val: i64) -> io::Result<()> {
-        self.write_u64::<T>(val as u64)
-    }
-
-    fn write_i32<T: Endianness>(&mut self, val: i32) -> io::Result<()> {
-        self.write_u32::<T>(val as u32)
-    }
-
-    fn write_i16<T: Endianness>(&mut self, val: i16) -> io::Result<()> {
-        self.write_u16::<T>(val as u16)
-    }
-
-    fn write_i8(&mut self, val: i8) -> io::Result<()> {
-        self.write_u8(val as u8)
-    }
-
-    fn write_f32<T: Endianness>(&mut self, val: f32) -> io::Result<()> {
-        let tval: u32 = val.to_bits();
-        self.write_u32::<T>(tval)
-    }
-
-    fn write_f64<T: Endianness>(&mut self, val: f64) -> io::Result<()> {
-        let tval: u64 = val.to_bits();
-        self.write_u64::<T>(tval)
-    }
-}
-
-#[inline]
-fn fill_buf<R: Read>(reader: &mut R, buf: &mut [u8]) -> io::Result<()> {
-    let mut idx = 0;
-    while idx != buf.len() {
-        match reader.read(&mut buf[idx..]) {
-            Ok(0) => return Err(io::Error::new(io::ErrorKind::Other, "Could not read enough bytes")),
-            Ok(v) => { idx += v; }
-            Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
-            Err(e) => return Err(e),
-        }
-    }
-    Ok(())
-}
-
-#[cfg(target_endian = "little")]
-macro_rules! buf_to_val {
-    ($buf:ident, $T:ty) => {
-        {
-            let mut val: $T = 0;
-            for i in 0..$buf.len() {
-                val |= ($buf[i] as $T) << (i * 8);
-            }
-            val
-        }
-    };
-}
-
-#[cfg(target_endian = "big")]
-macro_rules! buf_to_val {
-    ($buf:ident, $T:ty) => {
-        {
-            let mut val: $T = 0;
-            for i in 0..$buf.len() {
-                val |= ($buf[$buf.len() - 1 - i] as $T) << (i * 8);
-            }
-            val
-        }
-    };
-}
-
-impl<R: Read> ReadPodExt for R {
-    fn read_u64<T: Endianness>(&mut self) -> io::Result<u64> {
-        let buf = &mut [0u8; 8];
-        try!(fill_buf(self, buf));
-        let tval = buf_to_val!(buf, u64);
-        Ok(<T as Endianness>::int_from_target(tval))
-    }
-
-    fn read_u32<T: Endianness>(&mut self) -> io::Result<u32> {
-        let buf = &mut [0u8; 4];
-        try!(fill_buf(self, buf));
-        let tval = buf_to_val!(buf, u32);
-        Ok(<T as Endianness>::int_from_target(tval))
-    }
-
-    fn read_u16<T: Endianness>(&mut self) -> io::Result<u16> {
-        let buf = &mut [0u8; 2];
-        try!(fill_buf(self, buf));
-        let tval = buf_to_val!(buf, u16);
-        Ok(<T as Endianness>::int_from_target(tval))
-    }
-
-    fn read_u8(&mut self) -> io::Result<u8> {
-        let buf = &mut [0u8; 1];
-        try!(fill_buf(self, buf));
-        Ok(buf[0])
-    }
-
-    fn read_i64<T: Endianness>(&mut self) -> io::Result<i64> {
-        self.read_u64::<T>().map(|v| v as i64)
-    }
-
-    fn read_i32<T: Endianness>(&mut self) -> io::Result<i32> {
-        self.read_u32::<T>().map(|v| v as i32)
-    }
-
-    fn read_i16<T: Endianness>(&mut self) -> io::Result<i16> {
-        self.read_u16::<T>().map(|v| v as i16)
-    }
-
-    fn read_i8(&mut self) -> io::Result<i8> {
-        self.read_u8().map(|v| v as i8)
-    }
-
-    fn read_f64<T: Endianness>(&mut self) -> io::Result<f64> {
-        self.read_u64::<T>().map(|v| f64::from_bits(v))
-    }
-
-    fn read_f32<T: Endianness>(&mut self) -> io::Result<f32> {
-        self.read_u32::<T>().map(|v| f32::from_bits(v))
-    }
-
-    fn read_exact(&mut self, len: usize) -> io::Result<Vec<u8>> {
-        let mut res = vec![0; len];
-        try!(fill_buf(self, &mut res));
-        Ok(res)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/tests/bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/tests/bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/tests/bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/tests/bytes.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-extern crate podio;
-
-use std::io;
-use podio::{LittleEndian, BigEndian};
-use podio::{ReadPodExt, WritePodExt};
-
-#[test]
-fn write_be() {
-    let buf: &mut [u8] = &mut [0u8; 8];
-    let mut writer = io::Cursor::new(buf);
-
-    writer.set_position(0);
-    writer.write_u64::<BigEndian>(0x01_23_45_67_89_ab_cd_ef).unwrap();
-    assert_eq!(&writer.get_ref()[0..8], &[0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef]);
-
-    writer.set_position(0);
-    writer.write_u32::<BigEndian>(0x01_23_45_67).unwrap();
-    assert_eq!(&writer.get_ref()[0..4], &[0x01, 0x23, 0x45, 0x67]);
-
-    writer.set_position(0);
-    writer.write_u16::<BigEndian>(0x01_23).unwrap();
-    assert_eq!(&writer.get_ref()[0..2], &[0x01, 0x23]);
-}
-
-#[test]
-fn write_le() {
-    let buf: &mut [u8] = &mut [0u8; 8];
-    let mut writer = io::Cursor::new(buf);
-
-    writer.set_position(0);
-    writer.write_u64::<LittleEndian>(0x01_23_45_67_89_ab_cd_ef).unwrap();
-    assert_eq!(&writer.get_ref()[0..8], &[0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01]);
-
-    writer.set_position(0);
-    writer.write_u32::<LittleEndian>(0x01_23_45_67).unwrap();
-    assert_eq!(&writer.get_ref()[0..4], &[0x67, 0x45, 0x23, 0x01]);
-
-    writer.set_position(0);
-    writer.write_u16::<LittleEndian>(0x01_23).unwrap();
-    assert_eq!(&writer.get_ref()[0..2], &[0x23, 0x01]);
-}
-
-#[test]
-fn write_octet() {
-    let buf: &mut [u8] = &mut [0u8; 8];
-    let mut writer = io::Cursor::new(buf);
-
-    writer.set_position(0);
-    writer.write_u8(0x01).unwrap();
-    assert_eq!(&writer.get_ref()[0..1], &[0x01]);
-}
-
-#[test]
-fn write_float() {
-    let buf: &mut [u8] = &mut [0u8; 8];
-    let mut writer = io::Cursor::new(buf);
-
-    writer.set_position(0);
-    writer.write_f32::<LittleEndian>(10.12f32).unwrap();
-    assert_eq!(&writer.get_ref()[0..4], &[0x85, 0xEB, 0x21, 0x41]);
-
-    writer.set_position(0);
-    writer.write_f32::<BigEndian>(10.12f32).unwrap();
-    assert_eq!(&writer.get_ref()[0..4], &[0x41, 0x21, 0xEB, 0x85]);
-
-    writer.set_position(0);
-    writer.write_f64::<LittleEndian>(10.12f64).unwrap();
-    assert_eq!(&writer.get_ref()[0..8], &[0x3D, 0x0A, 0xD7, 0xA3, 0x70, 0x3D, 0x24, 0x40]);
-
-    writer.set_position(0);
-    writer.write_f64::<BigEndian>(10.12f64).unwrap();
-    assert_eq!(&writer.get_ref()[0..8], &[0x40, 0x24, 0x3D, 0x70, 0xA3, 0xD7, 0x0A, 0x3D]);
-}
-
-#[test]
-fn read_be() {
-    let buf: &[u8] = &[0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef];
-    let mut reader = io::Cursor::new(buf);
-
-    reader.set_position(0);
-    assert_eq!(reader.read_u64::<BigEndian>().unwrap(), 0x0123456789abcdef);
-
-    reader.set_position(0);
-    assert_eq!(reader.read_u32::<BigEndian>().unwrap(), 0x01234567);
-
-    reader.set_position(0);
-    assert_eq!(reader.read_u16::<BigEndian>().unwrap(), 0x0123);
-}
-
-#[test]
-fn read_le() {
-    let buf: &[u8] = &[0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef];
-    let mut reader = io::Cursor::new(buf);
-
-    reader.set_position(0);
-    assert_eq!(reader.read_u64::<LittleEndian>().unwrap(), 0xefcdab8967452301);
-
-    reader.set_position(0);
-    assert_eq!(reader.read_u32::<LittleEndian>().unwrap(), 0x67452301);
-
-    reader.set_position(0);
-    assert_eq!(reader.read_u16::<LittleEndian>().unwrap(), 0x2301);
-}
-
-#[test]
-fn read_octet() {
-    let buf: &[u8] = &[0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef];
-    let mut reader = io::Cursor::new(buf);
-
-    reader.set_position(0);
-    assert_eq!(reader.read_u8().unwrap(), 0x01);
-}
-
-#[test]
-fn read_float() {
-    let mut buf: &[u8] = &[0x41, 0x21, 0xEB, 0x85];
-    assert_eq!(buf.read_f32::<BigEndian>().unwrap(), 10.12f32);
-
-    let mut buf: &[u8] = &[0x85, 0xEB, 0x21, 0x41];
-    assert_eq!(buf.read_f32::<LittleEndian>().unwrap(), 10.12f32);
-
-    let mut buf: &[u8] = &[0x40, 0x24, 0x3D, 0x70, 0xA3, 0xD7, 0x0A, 0x3D];
-    assert_eq!(buf.read_f64::<BigEndian>().unwrap(), 10.12f64);
-
-    let mut buf: &[u8] = &[0x3D, 0x0A, 0xD7, 0xA3, 0x70, 0x3D, 0x24, 0x40];
-    assert_eq!(buf.read_f64::<LittleEndian>().unwrap(), 10.12f64);
-}
-
-#[test]
-fn read_exact() {
-    let mut buf: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 8];
-    assert_eq!(buf.read_exact(2).unwrap(), [1,2]);
-    assert_eq!(buf.read_exact(1).unwrap(), [3]);
-    assert_eq!(buf.read_exact(0).unwrap(), []);
-    assert_eq!(buf.read_exact(5).unwrap(), [4,5,6,7,8]);
-    assert_eq!(buf.read_exact(0).unwrap(), []);
-    assert!(buf.read_exact(1).is_err());
-    assert_eq!(buf.read_exact(0).unwrap(), []);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/tests/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/tests/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/podio/tests/io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/podio/tests/io.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-extern crate podio;
-
-use std::io::{self, Read};
-use podio::ReadPodExt;
-
-struct TestReader {
-    state: Option<io::Result<usize>>,
-}
-
-impl TestReader {
-    fn new(first_return: io::Result<usize>) -> TestReader {
-        TestReader { state: Some(first_return) }
-    }
-
-    fn get(&mut self) -> io::Result<u32> {
-        self.read_u32::<podio::LittleEndian>()
-    }
-
-    fn test(first_return: io::Result<usize>) -> io::Result<u32> {
-        TestReader::new(first_return).get()
-    }
-}
-
-impl Read for TestReader {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        match self.state.take().unwrap_or(Ok(1)) {
-            Ok(n) => {
-                for i in buf.iter_mut().take(n) {
-                    *i = 0xA5;
-                }
-                Ok(n)
-            },
-            e @ Err(..) => e,
-        }
-    }
-}
-
-#[test]
-fn interrupted() {
-    // Getting an io::ErrorKind::Interrupted should be retried, and thus succeed
-    let first_read = Err(io::Error::new(io::ErrorKind::Interrupted, "Interrupted"));
-    assert_eq!(TestReader::test(first_read).unwrap(), 0xA5A5A5A5);
-}
-
-#[test]
-fn eof() {
-    // Getting a Ok(0) implies an unexpected EOF
-    let first_read = Ok(0);
-    assert!(TestReader::test(first_read).is_err());
-}
-
-#[test]
-fn err() {
-    // Getting any other error is still an error
-    let first_read = Err(io::Error::new(io::ErrorKind::Other, "Other"));
-    assert!(TestReader::test(first_read).is_err());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/precomputed-hash/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/precomputed-hash/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/precomputed-hash/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/precomputed-hash/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"594bc4437727edbf58c7cb9f88c3c1d80e89439dd4a505ef4771f9f344819386","LICENSE":"7ca6700600dfa9c9497bf5556365067daa802c871ea78239f129309c7a2048f7","src/lib.rs":"079a5f369a82b4573cca488a8c52a8427546e9050c89964a7b554215dd4da5f1"},"package":"925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/precomputed-hash/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/precomputed-hash/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/precomputed-hash/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/precomputed-hash/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "precomputed-hash"
+version = "0.1.1"
+authors = ["Emilio Cobos �lvarez <emilio@crisal.io>"]
+description = "A library intending to be a base dependency to expose a precomputed hash"
+license = "MIT"
+repository = "https://github.com/emilio/precomputed-hash"
+
+[dependencies]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/precomputed-hash/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/precomputed-hash/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/precomputed-hash/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/precomputed-hash/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Emilio Cobos �lvarez
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/precomputed-hash/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/precomputed-hash/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/precomputed-hash/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/precomputed-hash/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+//! A base trait to expose a precomputed hash for a type.
+
+/// A trait to expose a precomputed hash for a type.
+pub trait PrecomputedHash {
+    // TODO(emilio): Perhaps an associated type would be on point here.
+
+    /// Return the precomputed hash for this item.
+    fn precomputed_hash(&self) -> u32;
+}
+
+// These are equivalent to the `std::Hash` impls.
+impl<'a, T: PrecomputedHash> PrecomputedHash for &'a T {
+    fn precomputed_hash(&self) -> u32 {
+        (**self).precomputed_hash()
+    }
+}
+
+impl<'a, T: PrecomputedHash> PrecomputedHash for &'a mut T {
+    fn precomputed_hash(&self) -> u32 {
+        (**self).precomputed_hash()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -35,6 +35,7 @@
 //     location inside spans is a performance hit.
 
 use std::env;
+use std::iter;
 use std::process::{self, Command};
 use std::str;
 
@@ -77,6 +78,10 @@
         println!("cargo:rustc-cfg=hygiene");
     }
 
+    if version.minor >= 54 {
+        println!("cargo:rustc-cfg=literal_from_str");
+    }
+
     let target = env::var("TARGET").unwrap();
     if !enable_use_proc_macro(&target) {
         return;
@@ -132,15 +137,33 @@
     //
     //     -Zallow-features=feature1,feature2
 
-    if let Some(rustflags) = env::var_os("RUSTFLAGS") {
-        for mut flag in rustflags.to_string_lossy().split(' ') {
-            if flag.starts_with("-Z") {
-                flag = &flag["-Z".len()..];
-            }
-            if flag.starts_with("allow-features=") {
-                flag = &flag["allow-features=".len()..];
-                return flag.split(',').any(|allowed| allowed == feature);
-            }
+    let flags_var;
+    let flags_var_string;
+    let mut flags_var_split;
+    let mut flags_none;
+    let flags: &mut dyn Iterator<Item = &str> =
+        if let Some(encoded_rustflags) = env::var_os("CARGO_ENCODED_RUSTFLAGS") {
+            flags_var = encoded_rustflags;
+            flags_var_string = flags_var.to_string_lossy();
+            flags_var_split = flags_var_string.split('\x1f');
+            &mut flags_var_split
+        } else if let Some(rustflags) = env::var_os("RUSTFLAGS") {
+            flags_var = rustflags;
+            flags_var_string = flags_var.to_string_lossy();
+            flags_var_split = flags_var_string.split(' ');
+            &mut flags_var_split
+        } else {
+            flags_none = iter::empty();
+            &mut flags_none
+        };
+
+    for mut flag in flags {
+        if flag.starts_with("-Z") {
+            flag = &flag["-Z".len()..];
+        }
+        if flag.starts_with("allow-features=") {
+            flag = &flag["allow-features=".len()..];
+            return flag.split(',').any(|allowed| allowed == feature);
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"302d447d62c8d091d6241cf62bdad607c0d4ed8ff9f43d9b254c9d99c253ee8e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"e1f9d4fc22cff2c049f166a403b41458632a94357890d31cf0e3ad83807fb430","build.rs":"a71283fbc495095eebbbf46753df3fe2c19505c745b508dea157f65796b64dd7","src/detection.rs":"9d25d896889e65330858f2d6f6223c1b98cd1dad189813ad4161ff189fbda2b8","src/fallback.rs":"b114e013695260f6066395c8712cea112ec2a386010397a80f15a60f8b986444","src/lib.rs":"7f528764a958587f007f0c2a330a6a414bae2c8e73d5ed9fb64ff1b42b1805b1","src/marker.rs":"87fce2d0357f5b7998b6d9dfb064f4a0cbc9dabb19e33d4b514a446243ebe2e8","src/parse.rs":"1d2253eacbd40eb3a2a933be2adcee356af922bdb48cc89ff266252a41fd98a1","src/wrapper.rs":"f52646ce1705c1f6265516f30d4c43297b5f529dd31fb91f4c806be89d5a4122","tests/comments.rs":"ea6cbe6f4c8852e6a0612893c7d4f2c144a2e6a134a6c3db641a320cbfc3c800","tests/features.rs":"a86deb8644992a4eb64d9fd493eff16f9cf9c5cb6ade3a634ce0c990cf87d559","tests/marker.rs":"652db9f25c69ffc65baa60cdca8f195aa2e254d4de0a9ddc85de4dc2470544b6","tests/test.rs":"5f30a704eeb2b9198b57f416d622da72d25cb9bf8d8b12e6d0e90aa2cb0e43fc","tests/test_fmt.rs":"745dfdc41d09c5308c221395eb43f2041f0a1413d2927a813bc2ad4554438fe2"},"package":"1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"}
\ No newline at end of file
+{"files":{"Cargo.toml":"0a5984c855f13db167b90022183c267afcebbafa42a5a66bbcba04953d23b7d7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"e1f9d4fc22cff2c049f166a403b41458632a94357890d31cf0e3ad83807fb430","build.rs":"4a6ea112a069e927e40dd79c4b2eaf054521c49eb381c1b24cd5a8a035ee06b5","src/detection.rs":"9d25d896889e65330858f2d6f6223c1b98cd1dad189813ad4161ff189fbda2b8","src/fallback.rs":"c161f65f18d7d19bcbd568f5c0bea1cfc1ce3bd9c66427b1fdb4944ad7966ce0","src/lib.rs":"993e046f5777ea09500775b6323eadd9c48cb48e9f818ec0d39faf50479f019e","src/marker.rs":"87fce2d0357f5b7998b6d9dfb064f4a0cbc9dabb19e33d4b514a446243ebe2e8","src/parse.rs":"b82101576fdc493793f040aa17c11267e2747964729df1f88c81fe413aed407e","src/wrapper.rs":"624527eaa49c272824ab5f7286e6ecbdd80b6eac54e99be11b6e8b29dcb0015d","tests/comments.rs":"ea6cbe6f4c8852e6a0612893c7d4f2c144a2e6a134a6c3db641a320cbfc3c800","tests/features.rs":"a86deb8644992a4eb64d9fd493eff16f9cf9c5cb6ade3a634ce0c990cf87d559","tests/marker.rs":"652db9f25c69ffc65baa60cdca8f195aa2e254d4de0a9ddc85de4dc2470544b6","tests/test.rs":"597186c00ebf51191934c88ff970b5457ca0fb8e608bf896be1ebf8d74c17f4d","tests/test_fmt.rs":"745dfdc41d09c5308c221395eb43f2041f0a1413d2927a813bc2ad4554438fe2"},"package":"b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.29"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "David Tolnay <dtolnay@gmail.com>"]
 description = "A substitute implementation of the compiler's `proc_macro` API to decouple\ntoken-based libraries from the procedural macro use case.\n"
 documentation = "https://docs.rs/proc-macro2"
@@ -24,7 +23,7 @@
 repository = "https://github.com/alexcrichton/proc-macro2"
 [package.metadata.docs.rs]
 rustc-args = ["--cfg", "procmacro2_semver_exempt"]
-rustdoc-args = ["--cfg", "procmacro2_semver_exempt"]
+rustdoc-args = ["--cfg", "procmacro2_semver_exempt", "--cfg", "doc_cfg"]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [package.metadata.playground]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/src/fallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/src/fallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/src/fallback.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/src/fallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use crate::parse::{token_stream, Cursor};
+use crate::parse::{self, Cursor};
 use crate::{Delimiter, Spacing, TokenTree};
 #[cfg(span_locations)]
 use std::cell::RefCell;
@@ -35,7 +35,21 @@
 }
 
 #[derive(Debug)]
-pub(crate) struct LexError;
+pub(crate) struct LexError {
+    pub(crate) span: Span,
+}
+
+impl LexError {
+    pub(crate) fn span(&self) -> Span {
+        self.span
+    }
+
+    fn call_site() -> Self {
+        LexError {
+            span: Span::call_site(),
+        }
+    }
+}
 
 impl TokenStream {
     pub fn new() -> TokenStream {
@@ -139,12 +153,7 @@
         // Create a dummy file & add it to the source map
         let cursor = get_cursor(src);
 
-        let (rest, tokens) = token_stream(cursor)?;
-        if rest.is_empty() {
-            Ok(tokens)
-        } else {
-            Err(LexError)
-        }
+        parse::token_stream(cursor)
     }
 }
 
@@ -884,6 +893,20 @@
     }
 }
 
+impl FromStr for Literal {
+    type Err = LexError;
+
+    fn from_str(repr: &str) -> Result<Self, Self::Err> {
+        let cursor = get_cursor(repr);
+        if let Ok((_rest, literal)) = parse::literal(cursor) {
+            if literal.text.len() == repr.len() {
+                return Ok(literal);
+            }
+        }
+        Err(LexError::call_site())
+    }
+}
+
 impl Display for Literal {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         Display::fmt(&self.text, f)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -78,10 +78,11 @@
 //! a different thread.
 
 // Proc-macro2 types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.24")]
+#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.29")]
 #![cfg_attr(any(proc_macro_span, super_unstable), feature(proc_macro_span))]
 #![cfg_attr(super_unstable, feature(proc_macro_raw_ident, proc_macro_def_site))]
-#![allow(clippy::needless_doctest_main)]
+#![cfg_attr(doc_cfg, feature(doc_cfg))]
+#![allow(clippy::needless_doctest_main, clippy::vec_init_then_push)]
 
 #[cfg(use_proc_macro)]
 extern crate proc_macro;
@@ -249,6 +250,12 @@
     }
 }
 
+impl LexError {
+    pub fn span(&self) -> Span {
+        Span::_new(self.inner.span())
+    }
+}
+
 impl Debug for LexError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         Debug::fmt(&self.inner, f)
@@ -267,6 +274,7 @@
 ///
 /// This type is semver exempt and not exposed by default.
 #[cfg(procmacro2_semver_exempt)]
+#[cfg_attr(doc_cfg, doc(cfg(procmacro2_semver_exempt)))]
 #[derive(Clone, PartialEq, Eq)]
 pub struct SourceFile {
     inner: imp::SourceFile,
@@ -317,6 +325,7 @@
 ///
 /// This type is semver exempt and not exposed by default.
 #[cfg(span_locations)]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "span-locations")))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct LineColumn {
     /// The 1-indexed line in the source file on which the span starts or ends
@@ -388,6 +397,7 @@
     ///
     /// This method is semver exempt and not exposed by default.
     #[cfg(procmacro2_semver_exempt)]
+    #[cfg_attr(doc_cfg, doc(cfg(procmacro2_semver_exempt)))]
     pub fn def_site() -> Span {
         Span::_new(imp::Span::def_site())
     }
@@ -430,6 +440,7 @@
     ///
     /// This method is semver exempt and not exposed by default.
     #[cfg(procmacro2_semver_exempt)]
+    #[cfg_attr(doc_cfg, doc(cfg(procmacro2_semver_exempt)))]
     pub fn source_file(&self) -> SourceFile {
         SourceFile::_new(self.inner.source_file())
     }
@@ -437,7 +448,14 @@
     /// Get the starting line/column in the source file for this span.
     ///
     /// This method requires the `"span-locations"` feature to be enabled.
+    ///
+    /// When executing in a procedural macro context, the returned line/column
+    /// are only meaningful if compiled with a nightly toolchain. The stable
+    /// toolchain does not have this information available. When executing
+    /// outside of a procedural macro, such as main.rs or build.rs, the
+    /// line/column are always meaningful regardless of toolchain.
     #[cfg(span_locations)]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "span-locations")))]
     pub fn start(&self) -> LineColumn {
         let imp::LineColumn { line, column } = self.inner.start();
         LineColumn { line, column }
@@ -446,7 +464,14 @@
     /// Get the ending line/column in the source file for this span.
     ///
     /// This method requires the `"span-locations"` feature to be enabled.
+    ///
+    /// When executing in a procedural macro context, the returned line/column
+    /// are only meaningful if compiled with a nightly toolchain. The stable
+    /// toolchain does not have this information available. When executing
+    /// outside of a procedural macro, such as main.rs or build.rs, the
+    /// line/column are always meaningful regardless of toolchain.
     #[cfg(span_locations)]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "span-locations")))]
     pub fn end(&self) -> LineColumn {
         let imp::LineColumn { line, column } = self.inner.end();
         LineColumn { line, column }
@@ -469,6 +494,7 @@
     ///
     /// This method is semver exempt and not exposed by default.
     #[cfg(procmacro2_semver_exempt)]
+    #[cfg_attr(doc_cfg, doc(cfg(procmacro2_semver_exempt)))]
     pub fn eq(&self, other: &Span) -> bool {
         self.inner.eq(&other.inner)
     }
@@ -699,7 +725,7 @@
     }
 }
 
-/// An `Punct` is an single punctuation character like `+`, `-` or `#`.
+/// A `Punct` is a single punctuation character like `+`, `-` or `#`.
 ///
 /// Multicharacter operators like `+=` are represented as two instances of
 /// `Punct` with different forms of `Spacing` returned.
@@ -710,7 +736,7 @@
     span: Span,
 }
 
-/// Whether an `Punct` is followed immediately by another `Punct` or followed by
+/// Whether a `Punct` is followed immediately by another `Punct` or followed by
 /// another token or whitespace.
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum Spacing {
@@ -899,6 +925,7 @@
     ///
     /// This method is semver exempt and not exposed by default.
     #[cfg(procmacro2_semver_exempt)]
+    #[cfg_attr(doc_cfg, doc(cfg(procmacro2_semver_exempt)))]
     pub fn new_raw(string: &str, span: Span) -> Ident {
         Ident::_new_raw(string, span)
     }
@@ -987,7 +1014,7 @@
         /// This function will create an integer like `1u32` where the integer
         /// value specified is the first part of the token and the integral is
         /// also suffixed at the end. Literals created from negative numbers may
-        /// not survive rountrips through `TokenStream` or strings and may be
+        /// not survive roundtrips through `TokenStream` or strings and may be
         /// broken into two tokens (`-` and positive literal).
         ///
         /// Literals created through this method have the `Span::call_site()`
@@ -1008,7 +1035,7 @@
         /// specified on this token, meaning that invocations like
         /// `Literal::i8_unsuffixed(1)` are equivalent to
         /// `Literal::u32_unsuffixed(1)`. Literals created from negative numbers
-        /// may not survive rountrips through `TokenStream` or strings and may
+        /// may not survive roundtrips through `TokenStream` or strings and may
         /// be broken into two tokens (`-` and positive literal).
         ///
         /// Literals created through this method have the `Span::call_site()`
@@ -1176,6 +1203,17 @@
     }
 }
 
+impl FromStr for Literal {
+    type Err = LexError;
+
+    fn from_str(repr: &str) -> Result<Self, LexError> {
+        repr.parse().map(Literal::_new).map_err(|inner| LexError {
+            inner,
+            _marker: Marker,
+        })
+    }
+}
+
 impl Debug for Literal {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         Debug::fmt(&self.inner, f)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/src/parse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/src/parse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/src/parse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/src/parse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -26,7 +26,7 @@
         self.rest.starts_with(s)
     }
 
-    pub(crate) fn is_empty(&self) -> bool {
+    fn is_empty(&self) -> bool {
         self.rest.is_empty()
     }
 
@@ -50,16 +50,17 @@
         self.rest.char_indices()
     }
 
-    fn parse(&self, tag: &str) -> Result<Cursor<'a>, LexError> {
+    fn parse(&self, tag: &str) -> Result<Cursor<'a>, Reject> {
         if self.starts_with(tag) {
             Ok(self.advance(tag.len()))
         } else {
-            Err(LexError)
+            Err(Reject)
         }
     }
 }
 
-type PResult<'a, O> = Result<(Cursor<'a>, O), LexError>;
+pub(crate) struct Reject;
+type PResult<'a, O> = Result<(Cursor<'a>, O), Reject>;
 
 fn skip_whitespace(input: Cursor) -> Cursor {
     let mut s = input;
@@ -86,7 +87,7 @@
                         s = rest;
                         continue;
                     }
-                    Err(LexError) => return s,
+                    Err(Reject) => return s,
                 }
             }
         }
@@ -111,7 +112,7 @@
 
 fn block_comment(input: Cursor) -> PResult<&str> {
     if !input.starts_with("/*") {
-        return Err(LexError);
+        return Err(Reject);
     }
 
     let mut depth = 0;
@@ -133,7 +134,7 @@
         i += 1;
     }
 
-    Err(LexError)
+    Err(Reject)
 }
 
 fn is_whitespace(ch: char) -> bool {
@@ -141,14 +142,14 @@
     ch.is_whitespace() || ch == '\u{200e}' || ch == '\u{200f}'
 }
 
-fn word_break(input: Cursor) -> Result<Cursor, LexError> {
+fn word_break(input: Cursor) -> Result<Cursor, Reject> {
     match input.chars().next() {
-        Some(ch) if is_ident_continue(ch) => Err(LexError),
+        Some(ch) if is_ident_continue(ch) => Err(Reject),
         Some(_) | None => Ok(input),
     }
 }
 
-pub(crate) fn token_stream(mut input: Cursor) -> PResult<TokenStream> {
+pub(crate) fn token_stream(mut input: Cursor) -> Result<TokenStream, LexError> {
     let mut trees = Vec::new();
     let mut stack = Vec::new();
 
@@ -166,7 +167,17 @@
 
         let first = match input.bytes().next() {
             Some(first) => first,
-            None => break,
+            None => match stack.last() {
+                None => return Ok(TokenStream { inner: trees }),
+                #[cfg(span_locations)]
+                Some((lo, _frame)) => {
+                    return Err(LexError {
+                        span: Span { lo: *lo, hi: *lo },
+                    })
+                }
+                #[cfg(not(span_locations))]
+                Some(_frame) => return Err(LexError { span: Span {} }),
+            },
         };
 
         if let Some(open_delimiter) = match first {
@@ -187,14 +198,17 @@
             b'}' => Some(Delimiter::Brace),
             _ => None,
         } {
-            input = input.advance(1);
-            let frame = stack.pop().ok_or(LexError)?;
+            let frame = match stack.pop() {
+                Some(frame) => frame,
+                None => return Err(lex_error(input)),
+            };
             #[cfg(span_locations)]
             let (lo, frame) = frame;
             let (open_delimiter, outer) = frame;
             if open_delimiter != close_delimiter {
-                return Err(LexError);
+                return Err(lex_error(input));
             }
+            input = input.advance(1);
             let mut g = Group::new(open_delimiter, TokenStream { inner: trees });
             g.set_span(Span {
                 #[cfg(span_locations)]
@@ -205,7 +219,10 @@
             trees = outer;
             trees.push(TokenTree::Group(crate::Group::_new_stable(g)));
         } else {
-            let (rest, mut tt) = leaf_token(input)?;
+            let (rest, mut tt) = match leaf_token(input) {
+                Ok((rest, tt)) => (rest, tt),
+                Err(Reject) => return Err(lex_error(input)),
+            };
             tt.set_span(crate::Span::_new_stable(Span {
                 #[cfg(span_locations)]
                 lo,
@@ -216,11 +233,18 @@
             input = rest;
         }
     }
+}
 
-    if stack.is_empty() {
-        Ok((input, TokenStream { inner: trees }))
-    } else {
-        Err(LexError)
+fn lex_error(cursor: Cursor) -> LexError {
+    #[cfg(not(span_locations))]
+    let _ = cursor;
+    LexError {
+        span: Span {
+            #[cfg(span_locations)]
+            lo: cursor.off,
+            #[cfg(span_locations)]
+            hi: cursor.off,
+        },
     }
 }
 
@@ -233,7 +257,7 @@
     } else if let Ok((input, i)) = ident(input) {
         Ok((input, TokenTree::Ident(i)))
     } else {
-        Err(LexError)
+        Err(Reject)
     }
 }
 
@@ -242,7 +266,7 @@
         .iter()
         .any(|prefix| input.starts_with(prefix))
     {
-        Err(LexError)
+        Err(Reject)
     } else {
         ident_any(input)
     }
@@ -260,7 +284,7 @@
     }
 
     if sym == "_" {
-        return Err(LexError);
+        return Err(Reject);
     }
 
     let ident = crate::Ident::_new_raw(sym, crate::Span::call_site());
@@ -272,7 +296,7 @@
 
     match chars.next() {
         Some((_, ch)) if is_ident_start(ch) => {}
-        _ => return Err(LexError),
+        _ => return Err(Reject),
     }
 
     let mut end = input.len();
@@ -286,17 +310,13 @@
     Ok((input.advance(end), &input.rest[..end]))
 }
 
-fn literal(input: Cursor) -> PResult<Literal> {
-    match literal_nocapture(input) {
-        Ok(a) => {
-            let end = input.len() - a.len();
-            Ok((a, Literal::_new(input.rest[..end].to_string())))
-        }
-        Err(LexError) => Err(LexError),
-    }
+pub(crate) fn literal(input: Cursor) -> PResult<Literal> {
+    let rest = literal_nocapture(input)?;
+    let end = input.len() - rest.len();
+    Ok((rest, Literal::_new(input.rest[..end].to_string())))
 }
 
-fn literal_nocapture(input: Cursor) -> Result<Cursor, LexError> {
+fn literal_nocapture(input: Cursor) -> Result<Cursor, Reject> {
     if let Ok(ok) = string(input) {
         Ok(ok)
     } else if let Ok(ok) = byte_string(input) {
@@ -310,28 +330,28 @@
     } else if let Ok(ok) = int(input) {
         Ok(ok)
     } else {
-        Err(LexError)
+        Err(Reject)
     }
 }
 
 fn literal_suffix(input: Cursor) -> Cursor {
     match ident_not_raw(input) {
         Ok((input, _)) => input,
-        Err(LexError) => input,
+        Err(Reject) => input,
     }
 }
 
-fn string(input: Cursor) -> Result<Cursor, LexError> {
+fn string(input: Cursor) -> Result<Cursor, Reject> {
     if let Ok(input) = input.parse("\"") {
         cooked_string(input)
     } else if let Ok(input) = input.parse("r") {
         raw_string(input)
     } else {
-        Err(LexError)
+        Err(Reject)
     }
 }
 
-fn cooked_string(input: Cursor) -> Result<Cursor, LexError> {
+fn cooked_string(input: Cursor) -> Result<Cursor, Reject> {
     let mut chars = input.char_indices().peekable();
 
     while let Some((i, ch)) = chars.next() {
@@ -361,7 +381,7 @@
                     let mut last = ch;
                     loop {
                         if last == '\r' && chars.next().map_or(true, |(_, ch)| ch != '\n') {
-                            return Err(LexError);
+                            return Err(Reject);
                         }
                         match chars.peek() {
                             Some((_, ch)) if ch.is_whitespace() => {
@@ -377,20 +397,20 @@
             _ch => {}
         }
     }
-    Err(LexError)
+    Err(Reject)
 }
 
-fn byte_string(input: Cursor) -> Result<Cursor, LexError> {
+fn byte_string(input: Cursor) -> Result<Cursor, Reject> {
     if let Ok(input) = input.parse("b\"") {
         cooked_byte_string(input)
     } else if let Ok(input) = input.parse("br") {
         raw_string(input)
     } else {
-        Err(LexError)
+        Err(Reject)
     }
 }
 
-fn cooked_byte_string(mut input: Cursor) -> Result<Cursor, LexError> {
+fn cooked_byte_string(mut input: Cursor) -> Result<Cursor, Reject> {
     let mut bytes = input.bytes().enumerate();
     while let Some((offset, b)) = bytes.next() {
         match b {
@@ -416,7 +436,7 @@
                     let mut chars = rest.char_indices();
                     loop {
                         if last == '\r' && chars.next().map_or(true, |(_, ch)| ch != '\n') {
-                            return Err(LexError);
+                            return Err(Reject);
                         }
                         match chars.next() {
                             Some((_, ch)) if ch.is_whitespace() => last = ch,
@@ -425,7 +445,7 @@
                                 bytes = input.bytes().enumerate();
                                 break;
                             }
-                            None => return Err(LexError),
+                            None => return Err(Reject),
                         }
                     }
                 }
@@ -435,20 +455,20 @@
             _ => break,
         }
     }
-    Err(LexError)
+    Err(Reject)
 }
 
-fn raw_string(input: Cursor) -> Result<Cursor, LexError> {
+fn raw_string(input: Cursor) -> Result<Cursor, Reject> {
     let mut chars = input.char_indices();
     let mut n = 0;
-    while let Some((i, ch)) = chars.next() {
+    for (i, ch) in &mut chars {
         match ch {
             '"' => {
                 n = i;
                 break;
             }
             '#' => {}
-            _ => return Err(LexError),
+            _ => return Err(Reject),
         }
     }
     while let Some((i, ch)) = chars.next() {
@@ -464,10 +484,10 @@
             _ => {}
         }
     }
-    Err(LexError)
+    Err(Reject)
 }
 
-fn byte(input: Cursor) -> Result<Cursor, LexError> {
+fn byte(input: Cursor) -> Result<Cursor, Reject> {
     let input = input.parse("b'")?;
     let mut bytes = input.bytes().enumerate();
     let ok = match bytes.next().map(|(_, b)| b) {
@@ -480,17 +500,17 @@
         b => b.is_some(),
     };
     if !ok {
-        return Err(LexError);
+        return Err(Reject);
     }
-    let (offset, _) = bytes.next().ok_or(LexError)?;
+    let (offset, _) = bytes.next().ok_or(Reject)?;
     if !input.chars().as_str().is_char_boundary(offset) {
-        return Err(LexError);
+        return Err(Reject);
     }
     let input = input.advance(offset).parse("'")?;
     Ok(literal_suffix(input))
 }
 
-fn character(input: Cursor) -> Result<Cursor, LexError> {
+fn character(input: Cursor) -> Result<Cursor, Reject> {
     let input = input.parse("'")?;
     let mut chars = input.char_indices();
     let ok = match chars.next().map(|(_, ch)| ch) {
@@ -505,9 +525,9 @@
         ch => ch.is_some(),
     };
     if !ok {
-        return Err(LexError);
+        return Err(Reject);
     }
-    let (idx, _) = chars.next().ok_or(LexError)?;
+    let (idx, _) = chars.next().ok_or(Reject)?;
     let input = input.advance(idx).parse("'")?;
     Ok(literal_suffix(input))
 }
@@ -549,7 +569,7 @@
     next_ch!(chars @ '{');
     let mut value = 0;
     let mut len = 0;
-    while let Some((_, ch)) = chars.next() {
+    for (_, ch) in chars {
         let digit = match ch {
             '0'..='9' => ch as u8 - b'0',
             'a'..='f' => 10 + ch as u8 - b'a',
@@ -568,7 +588,7 @@
     false
 }
 
-fn float(input: Cursor) -> Result<Cursor, LexError> {
+fn float(input: Cursor) -> Result<Cursor, Reject> {
     let mut rest = float_digits(input)?;
     if let Some(ch) = rest.chars().next() {
         if is_ident_start(ch) {
@@ -578,11 +598,11 @@
     word_break(rest)
 }
 
-fn float_digits(input: Cursor) -> Result<Cursor, LexError> {
+fn float_digits(input: Cursor) -> Result<Cursor, Reject> {
     let mut chars = input.chars().peekable();
     match chars.next() {
         Some(ch) if ch >= '0' && ch <= '9' => {}
-        _ => return Err(LexError),
+        _ => return Err(Reject),
     }
 
     let mut len = 1;
@@ -604,7 +624,7 @@
                     .map(|&ch| ch == '.' || is_ident_start(ch))
                     .unwrap_or(false)
                 {
-                    return Err(LexError);
+                    return Err(Reject);
                 }
                 len += 1;
                 has_dot = true;
@@ -620,14 +640,14 @@
     }
 
     if !(has_dot || has_exp) {
-        return Err(LexError);
+        return Err(Reject);
     }
 
     if has_exp {
         let token_before_exp = if has_dot {
             Ok(input.advance(len - 1))
         } else {
-            Err(LexError)
+            Err(Reject)
         };
         let mut has_sign = false;
         let mut has_exp_value = false;
@@ -664,7 +684,7 @@
     Ok(input.advance(len))
 }
 
-fn int(input: Cursor) -> Result<Cursor, LexError> {
+fn int(input: Cursor) -> Result<Cursor, Reject> {
     let mut rest = digits(input)?;
     if let Some(ch) = rest.chars().next() {
         if is_ident_start(ch) {
@@ -674,7 +694,7 @@
     word_break(rest)
 }
 
-fn digits(mut input: Cursor) -> Result<Cursor, LexError> {
+fn digits(mut input: Cursor) -> Result<Cursor, Reject> {
     let base = if input.starts_with("0x") {
         input = input.advance(2);
         16
@@ -695,7 +715,7 @@
             b'0'..=b'9' => {
                 let digit = (b - b'0') as u64;
                 if digit >= base {
-                    return Err(LexError);
+                    return Err(Reject);
                 }
             }
             b'a'..=b'f' => {
@@ -712,7 +732,7 @@
             }
             b'_' => {
                 if empty && base == 10 {
-                    return Err(LexError);
+                    return Err(Reject);
                 }
                 len += 1;
                 continue;
@@ -723,50 +743,47 @@
         empty = false;
     }
     if empty {
-        Err(LexError)
+        Err(Reject)
     } else {
         Ok(input.advance(len))
     }
 }
 
 fn punct(input: Cursor) -> PResult<Punct> {
-    match punct_char(input) {
-        Ok((rest, '\'')) => {
-            if ident_any(rest)?.0.starts_with("'") {
-                Err(LexError)
-            } else {
-                Ok((rest, Punct::new('\'', Spacing::Joint)))
-            }
-        }
-        Ok((rest, ch)) => {
-            let kind = match punct_char(rest) {
-                Ok(_) => Spacing::Joint,
-                Err(LexError) => Spacing::Alone,
-            };
-            Ok((rest, Punct::new(ch, kind)))
+    let (rest, ch) = punct_char(input)?;
+    if ch == '\'' {
+        if ident_any(rest)?.0.starts_with("'") {
+            Err(Reject)
+        } else {
+            Ok((rest, Punct::new('\'', Spacing::Joint)))
         }
-        Err(LexError) => Err(LexError),
+    } else {
+        let kind = match punct_char(rest) {
+            Ok(_) => Spacing::Joint,
+            Err(Reject) => Spacing::Alone,
+        };
+        Ok((rest, Punct::new(ch, kind)))
     }
 }
 
 fn punct_char(input: Cursor) -> PResult<char> {
     if input.starts_with("//") || input.starts_with("/*") {
         // Do not accept `/` of a comment as a punct.
-        return Err(LexError);
+        return Err(Reject);
     }
 
     let mut chars = input.chars();
     let first = match chars.next() {
         Some(ch) => ch,
         None => {
-            return Err(LexError);
+            return Err(Reject);
         }
     };
     let recognized = "~!@#$%^&*-=+|;:,<.>/?'";
     if recognized.contains(first) {
         Ok((input.advance(first.len_utf8()), first))
     } else {
-        Err(LexError)
+        Err(Reject)
     }
 }
 
@@ -785,7 +802,7 @@
     while let Some(cr) = scan_for_bare_cr.find('\r') {
         let rest = &scan_for_bare_cr[cr + 1..];
         if !rest.starts_with('\n') {
-            return Err(LexError);
+            return Err(Reject);
         }
         scan_for_bare_cr = rest;
     }
@@ -822,7 +839,7 @@
     } else if input.starts_with("///") {
         let input = input.advance(3);
         if input.starts_with("/") {
-            return Err(LexError);
+            return Err(Reject);
         }
         let (input, s) = take_until_newline_or_eof(input);
         Ok((input, (s, false)))
@@ -830,7 +847,7 @@
         let (input, s) = block_comment(input)?;
         Ok((input, (&s[3..s.len() - 2], false)))
     } else {
-        Err(LexError)
+        Err(Reject)
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/src/wrapper.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/src/wrapper.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/src/wrapper.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/src/wrapper.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,6 +29,14 @@
     Fallback(fallback::LexError),
 }
 
+impl LexError {
+    fn call_site() -> Self {
+        LexError::Fallback(fallback::LexError {
+            span: fallback::Span::call_site(),
+        })
+    }
+}
+
 fn mismatch() -> ! {
     panic!("stable/nightly mismatch")
 }
@@ -107,8 +115,8 @@
 
 // Work around https://github.com/rust-lang/rust/issues/58736.
 fn proc_macro_parse(src: &str) -> Result<proc_macro::TokenStream, LexError> {
-    panic::catch_unwind(|| src.parse().map_err(LexError::Compiler))
-        .unwrap_or(Err(LexError::Fallback(fallback::LexError)))
+    let result = panic::catch_unwind(|| src.parse().map_err(LexError::Compiler));
+    result.unwrap_or_else(|_| Err(LexError::call_site()))
 }
 
 impl Display for TokenStream {
@@ -243,6 +251,15 @@
     }
 }
 
+impl LexError {
+    pub(crate) fn span(&self) -> Span {
+        match self {
+            LexError::Compiler(_) => Span::call_site(),
+            LexError::Fallback(e) => Span::Fallback(e.span()),
+        }
+    }
+}
+
 impl From<proc_macro::LexError> for LexError {
     fn from(e: proc_macro::LexError) -> LexError {
         LexError::Compiler(e)
@@ -270,7 +287,12 @@
             #[cfg(lexerror_display)]
             LexError::Compiler(e) => Display::fmt(e, f),
             #[cfg(not(lexerror_display))]
-            LexError::Compiler(_e) => Display::fmt(&fallback::LexError, f),
+            LexError::Compiler(_e) => Display::fmt(
+                &fallback::LexError {
+                    span: fallback::Span::call_site(),
+                },
+                f,
+            ),
             LexError::Fallback(e) => Display::fmt(e, f),
         }
     }
@@ -894,6 +916,37 @@
     }
 }
 
+impl FromStr for Literal {
+    type Err = LexError;
+
+    fn from_str(repr: &str) -> Result<Self, Self::Err> {
+        if inside_proc_macro() {
+            #[cfg(literal_from_str)]
+            {
+                proc_macro::Literal::from_str(repr)
+                    .map(Literal::Compiler)
+                    .map_err(LexError::Compiler)
+            }
+            #[cfg(not(literal_from_str))]
+            {
+                let tokens = proc_macro_parse(repr)?;
+                let mut iter = tokens.into_iter();
+                if let (Some(proc_macro::TokenTree::Literal(literal)), None) =
+                    (iter.next(), iter.next())
+                {
+                    if literal.to_string().len() == repr.len() {
+                        return Ok(Literal::Compiler(literal));
+                    }
+                }
+                Err(LexError::call_site())
+            }
+        } else {
+            let literal = fallback::Literal::from_str(repr)?;
+            Ok(Literal::Fallback(literal))
+        }
+    }
+}
+
 impl Display for Literal {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/tests/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/tests/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro2/tests/test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro2/tests/test.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 use proc_macro2::{Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
+use std::panic;
 use std::str::{self, FromStr};
 
 #[test]
@@ -71,9 +72,24 @@
 }
 
 #[test]
-#[should_panic(expected = r#""\'a#" is not a valid Ident"#)]
 fn lifetime_invalid() {
-    Ident::new("'a#", Span::call_site());
+    let result = panic::catch_unwind(|| Ident::new("'a#", Span::call_site()));
+    match result {
+        Err(box_any) => {
+            let message = box_any.downcast_ref::<String>().unwrap();
+            let expected1 = r#""\'a#" is not a valid Ident"#; // 1.31.0 .. 1.53.0
+            let expected2 = r#""'a#" is not a valid Ident"#; // 1.53.0 ..
+            assert!(
+                message == expected1 || message == expected2,
+                "panic message does not match expected string\n\
+                 \x20   panic message: `{:?}`\n\
+                 \x20expected message: `{:?}`",
+                message,
+                expected2,
+            );
+        }
+        Ok(_) => panic!("test did not panic as expected"),
+    }
 }
 
 #[test]
@@ -148,6 +164,20 @@
 }
 
 #[test]
+fn literal_parse() {
+    assert!("1".parse::<Literal>().is_ok());
+    assert!("1.0".parse::<Literal>().is_ok());
+    assert!("'a'".parse::<Literal>().is_ok());
+    assert!("\"\n\"".parse::<Literal>().is_ok());
+    assert!("0 1".parse::<Literal>().is_err());
+    assert!(" 0".parse::<Literal>().is_err());
+    assert!("0 ".parse::<Literal>().is_err());
+    assert!("/* comment */0".parse::<Literal>().is_err());
+    assert!("0/* comment */".parse::<Literal>().is_err());
+    assert!("0// comment".parse::<Literal>().is_err());
+}
+
+#[test]
 fn roundtrip() {
     fn roundtrip(p: &str) {
         println!("parse: {}", p);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro-nested/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro-nested/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro-nested/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro-nested/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 use std::env;
 use std::fs;
 use std::iter;
-use std::path::Path;
+use std::path::{self, Path};
 
 /*
 #[doc(hidden)]
@@ -27,7 +27,9 @@
         content += &format!("    ({}) => {{ proc_macro_call_{}!() }};\n", bangs, i);
     }
     content += "    ($(!)+) => {\n";
-    content += "        compile_error! { \"this macro does not support >64 nested macro invocations\" }\n";
+    content += "        compile_error! {\n";
+    content += "            \"this macro does not support >64 nested macro invocations\"\n";
+    content += "        }\n";
     content += "    };\n";
     content += "}\n";
 
@@ -43,4 +45,6 @@
     {
         fs::write(dest_path, content).unwrap();
     }
+
+    println!("cargo:rustc-env=PATH_SEPARATOR={}", path::MAIN_SEPARATOR);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro-nested/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro-nested/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro-nested/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro-nested/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"8a2258f734c2e1ae485266f3090b1d6a9d7bc72d5872fa2a5211ade8c84f6b94","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"d59d2723bbc1627b629429a9c779d5dcfde579c9723e6ded1052931c4e8efa0a","build.rs":"2e6f9ca28106d444ad1bae3d4b46a7eb4eb3dfc6e33589e9f928a118a4315840","src/lib.rs":"f8696f697a6fcfaacfc24c01c1f2d354ed78cc5dfb033b70d274d6486fd797f3"},"package":"eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"}
\ No newline at end of file
+{"files":{"Cargo.toml":"aa3269bb093b0d25256954f762d878102f57b461841a015d480d6fe656fc434b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"d59d2723bbc1627b629429a9c779d5dcfde579c9723e6ded1052931c4e8efa0a","build.rs":"94935831bcf86515f37d66a033a7ea394112ccfe7e598cf3b406f0a0e09ad40c","src/lib.rs":"d7be075c69a4d35138d86a4510ec01e5dbf47df8b6b3a0c0d0478d142e248525"},"package":"bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro-nested/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro-nested/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro-nested/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro-nested/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "proc-macro-nested"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "Support for nested proc-macro-hack invocations"
 license = "MIT OR Apache-2.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro-nested/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro-nested/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/proc-macro-nested/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/proc-macro-nested/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -40,7 +40,7 @@
 
 #![no_std]
 
-include!(concat!(env!("OUT_DIR"), "/count.rs"));
+include!(concat!(env!("OUT_DIR"), env!("PATH_SEPARATOR"), "count.rs"));
 
 #[doc(hidden)]
 #[macro_export]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/quote/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/quote/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/quote/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/quote/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"63a099cf11c03b8c25c019a137babf22622eaf847f938a2fe95efbd3bba542c5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"9209682116de84bb9cc7be6ccf44478b46b909c7857f9e186d90bcff522af864","src/ext.rs":"a9fed3a1a4c9d3f2de717ba808af99291b995db2cbf8067f4b6927c39cc62bc6","src/format.rs":"a9c3e3a333c6dacf6e330d02b4c726862e273df1c2c6be6da199049cd1e521db","src/ident_fragment.rs":"e66a63f6e9020f2639a71f120d627bc6cfd60081a6caf8a1d735b59ee2413d29","src/lib.rs":"f0fbd8d2e3d2ea51935c73c65a9c36bb1c06e6f9025fde36e044fe9eb368667a","src/runtime.rs":"f2d1fa6084764d98f98b96344cf675886a79b46a845c592e604f96bbde9aca07","src/spanned.rs":"adc0ed742ad17327c375879472d435cea168c208c303f53eb93cb2c0f10f3650","src/to_tokens.rs":"e589c1643479a9003d4dd1d9fa63714042b106f1b16d8ea3903cfe2f73a020f5","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test.rs":"6eb200350fa78405d4fd920ecf71d226e258c61aa88f850750efa99e065f06d6","tests/ui/does-not-have-iter-interpolated-dup.rs":"ad13eea21d4cdd2ab6c082f633392e1ff20fb0d1af5f2177041e0bf7f30da695","tests/ui/does-not-have-iter-interpolated.rs":"83a5b3f240651adcbe4b6e51076d76d653ad439b37442cf4054f1fd3c073f3b7","tests/ui/does-not-have-iter-separated.rs":"fe413c48331d5e3a7ae5fef6a5892a90c72f610d54595879eb49d0a94154ba3f","tests/ui/does-not-have-iter.rs":"09dc9499d861b63cebb0848b855b78e2dc9497bfde37ba6339f3625ae009a62f","tests/ui/not-quotable.rs":"5759d0884943417609f28faadc70254a3e2fd3d9bd6ff7297a3fb70a77fafd8a","tests/ui/not-repeatable.rs":"a4b115c04e4e41049a05f5b69450503fbffeba031218b4189cb931839f7f9a9c","tests/ui/wrong-type-span.rs":"5f310cb7fde3ef51bad01e7f286d244e3b6e67396cd2ea7eab77275c9d902699"},"package":"991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"}
\ No newline at end of file
+{"files":{"Cargo.toml":"d1e6bb8b4ac54b84f367a4e1b46e7dca3b1a744017d8f7fa2f4c11a8730e657a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"9209682116de84bb9cc7be6ccf44478b46b909c7857f9e186d90bcff522af864","src/ext.rs":"a9fed3a1a4c9d3f2de717ba808af99291b995db2cbf8067f4b6927c39cc62bc6","src/format.rs":"a9c3e3a333c6dacf6e330d02b4c726862e273df1c2c6be6da199049cd1e521db","src/ident_fragment.rs":"e66a63f6e9020f2639a71f120d627bc6cfd60081a6caf8a1d735b59ee2413d29","src/lib.rs":"2500b1955d139e5b467df046cda4f2837fb1edace838aa190020752ab79314c4","src/runtime.rs":"f2d1fa6084764d98f98b96344cf675886a79b46a845c592e604f96bbde9aca07","src/spanned.rs":"adc0ed742ad17327c375879472d435cea168c208c303f53eb93cb2c0f10f3650","src/to_tokens.rs":"e589c1643479a9003d4dd1d9fa63714042b106f1b16d8ea3903cfe2f73a020f5","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test.rs":"6eb200350fa78405d4fd920ecf71d226e258c61aa88f850750efa99e065f06d6","tests/ui/does-not-have-iter-interpolated-dup.rs":"ad13eea21d4cdd2ab6c082f633392e1ff20fb0d1af5f2177041e0bf7f30da695","tests/ui/does-not-have-iter-interpolated.rs":"83a5b3f240651adcbe4b6e51076d76d653ad439b37442cf4054f1fd3c073f3b7","tests/ui/does-not-have-iter-separated.rs":"fe413c48331d5e3a7ae5fef6a5892a90c72f610d54595879eb49d0a94154ba3f","tests/ui/does-not-have-iter.rs":"09dc9499d861b63cebb0848b855b78e2dc9497bfde37ba6339f3625ae009a62f","tests/ui/not-quotable.rs":"5759d0884943417609f28faadc70254a3e2fd3d9bd6ff7297a3fb70a77fafd8a","tests/ui/not-repeatable.rs":"a4b115c04e4e41049a05f5b69450503fbffeba031218b4189cb931839f7f9a9c","tests/ui/wrong-type-span.rs":"5f310cb7fde3ef51bad01e7f286d244e3b6e67396cd2ea7eab77275c9d902699"},"package":"c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/quote/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/quote/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/quote/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/quote/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "quote"
-version = "1.0.8"
+version = "1.0.9"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 include = ["Cargo.toml", "src/**/*.rs", "tests/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 description = "Quasi-quoting macro quote!(...)"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/quote/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/quote/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/quote/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/quote/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -80,9 +80,14 @@
 //! };
 //! ```
 
-#![forbid(unsafe_code)]
 // Quote types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/quote/1.0.8")]
+#![doc(html_root_url = "https://docs.rs/quote/1.0.9")]
+#![allow(
+    clippy::doc_markdown,
+    clippy::missing_errors_doc,
+    clippy::missing_panics_doc,
+    clippy::module_name_repetitions
+)]
 
 #[cfg(all(
     not(all(target_arch = "wasm32", target_os = "unknown")),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,104 @@
+//! Target detection
+//!
+//! This build script translates the target for which `radium` is being compiled
+//! into a set of directives that the crate can use to control which atomic
+//! symbols it attempts to name.
+//!
+//! The compiler maintains its store of target information here:
+//! <https://github.com/rust-lang/rust/tree/be28b6235e64e0f662b96b710bf3af9de169215c/compiler/rustc_target/src/spec>
+//!
+//! That module is not easily extracted into something that can be loaded here,
+//! so we are replicating it through string matching on the target name until
+//! we are able to uniquely identify targets through `cfg` checks.
+//!
+//! Use `rustc --print target-list` to enumerate the full list of targets
+//! available, and `rustc --print cfg` (optionally with `-Z unstable-options`)
+//! to see what `cfg` values are produced for a target.
+//!
+//! The missing `cfg` checks required for conditional compilation, rather than a
+//! build script, are:
+//!
+//! - [`accessible`](https://github.com/rust-lang/rust/issues/64797)
+//! - [`target_feature`](https://github.com/rust-lang/rust/issues/69098)
+//! - [`target_has_atomic`](https://github.com/rust-lang/rust/issues/32976)
+//!
+//! Once any of these becomes usable on the stable series, we can switch to a
+//! set of `cfg` checks instead of a build script.
+
+/// Collection of flags indicating whether the target processor supports atomic
+/// instructions for a certain width.
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+struct Atomics {
+    /// Target supports 8-bit atomics
+    has_8: bool,
+    /// Target supports 16-bit atomics
+    has_16: bool,
+    /// Target supports 32-bit atomics
+    has_32: bool,
+    /// Target supports 64-bit atomics
+    has_64: bool,
+    /// Target supports word-width atomics
+    has_ptr: bool,
+}
+
+impl Atomics {
+    const ALL: Self = Self {
+        has_8: true,
+        has_16: true,
+        has_32: true,
+        has_64: true,
+        has_ptr: true,
+    };
+    const NONE: Self = Self {
+        has_8: false,
+        has_16: false,
+        has_32: false,
+        has_64: false,
+        has_ptr: false,
+    };
+}
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let mut atomics = Atomics::ALL;
+
+    let target = std::env::var("TARGET")?;
+    // Add new target strings here with their atomic availability.
+    #[allow(clippy::match_single_binding, clippy::single_match)]
+    match &*target {
+        "arm-linux-androideabi" => atomics.has_64 = false,
+        _ => {}
+    }
+
+    let arch = target.split('-').next().ok_or("Invalid target triple")?;
+    // Add new architecture sections here with their atomic availability.
+    #[allow(clippy::match_single_binding, clippy::single_match)]
+    match arch {
+        // "riscv32imc-unknown-none-elf" and "riscv32imac-unknown-none-elf" are
+        // both `target_arch = "riscv32", and have no stable `cfg`-discoverable
+        // distinction. As such, the atomic RISC-V target must be discovered
+        // here.
+        "armv5te" | "mips" | "mipsel" | "powerpc" | "riscv32imac" | "thumbv7em" | "thumbv7m" => {
+            atomics.has_64 = false
+        }
+        "riscv32i" | "riscv32imc" | "thumbv6m" => atomics = Atomics::NONE,
+        _ => {}
+    }
+
+    if atomics.has_8 {
+        println!("cargo:rustc-cfg=radium_atomic_8");
+    }
+    if atomics.has_16 {
+        println!("cargo:rustc-cfg=radium_atomic_16");
+    }
+    if atomics.has_32 {
+        println!("cargo:rustc-cfg=radium_atomic_32");
+    }
+    if atomics.has_64 {
+        println!("cargo:rustc-cfg=radium_atomic_64");
+    }
+    if atomics.has_ptr {
+        println!("cargo:rustc-cfg=radium_atomic_ptr");
+    }
+
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"a438dc62c0f185e2d2ef7a041ebd8c9e5f09370ed16b3225fda2ae4036557920","README.md":"1d23d6c6e7649191af667f1ea2f86e883ec9c9230d1fe61ee4e84230edd4c5a2","build.rs":"ccd3c7506ff6644e1378d7aba5d7efaffa5591cd002fd191ddc35cdeae6b8af0","src/lib.rs":"05aba1ac56f6e67c98b4fb80ebad7a5095df47b36a1003157409e15514ab85f1","src/types.rs":"2759c899b481b73cc7cb47967b84d6724a68401aaf410f4e9680de27770c71cf"},"package":"941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "radium"
+version = "0.5.3"
+authors = ["Nika Layzell <nika@thelayzells.com>", "myrrlyn <self@myrrlyn.dev>"]
+include = ["src/**/*.rs", "Cargo.toml", "README.md", "build.rs"]
+description = "Helper traits for working with maybe-atomic values"
+homepage = "https://github.com/mystor/radium"
+documentation = "https://docs.rs/radium"
+readme = "README.md"
+keywords = ["atomic", "cell", "sync", "generic", "trait"]
+categories = ["concurrency", "no-std"]
+license = "MIT"
+repository = "https://github.com/mystor/radium"
+
+[dependencies]
+[dev-dependencies.static_assertions]
+version = "1"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+# radium
+
+[![Latest Version](https://img.shields.io/crates/v/radium.svg)](https://crates.io/crates/radium)
+[![Documentation](https://docs.rs/radium/badge.svg)](https://docs.rs/radium)
+
+`radium` provides a helper trait with a uniform API for interacting with both
+atomic types like [`AtomicUsize`], and non-atomic types like [`Cell<usize>`].
+
+This crate is `#![no_std]`-compatible, and uses no non-core types.
+
+For more details, see the trait's documentation.
+
+Additionally, the `radium::types` module provides a set of type aliases for all
+of the atomic primitive types (`bool`, signed and unsigned integers up to 64,
+`*mut T`) that map to the atomic type when it is present, and the `Cell` wrapper
+when it is not. This allows you to have stable, portable, type names that do not
+require `cfg` guards to remove them for targets that do not support them.
+
+[`AtomicUsize`]: https://doc.rust-lang.org/core/sync/atomic/struct.AtomicUsize.html
+[`Cell<usize>`]: https://doc.rust-lang.org/core/cell/struct.Cell.html
+
+## Target Architecture Compatibility
+
+Not all Rust targets have symbols for atomic types! The compiler knows what
+targets have what atomics, but does not yet expose this information on the
+stable channel for libraries to use.
+
+As such, `radium` uses a build script to detect the target architecture and emit
+our own directives that mark the presence or absence of an atomic integer.
+
+If `radium` does not work for your architecture, please update the build script
+to handle your target string and submit a pull request.
+
+---
+
+**@kneecaw** - <https://twitter.com/kneecaw/status/1132695060812849154>
+> Feelin' lazy: Has someone already written a helper trait abstracting
+> operations over `AtomicUsize` and `Cell<usize>` for generic code which may
+> not care about atomicity?
+
+**@ManishEarth** - <https://twitter.com/ManishEarth/status/1132706585300496384>
+> no but call the crate radium
+>
+> (since people didn't care that it was radioactive and used it in everything)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,822 @@
+//! `radium` provides a series of helper traits providing a uniform API for
+//! interacting with both atomic types like
+//! [`AtomicUsize`], and non-atomic types like [`Cell<T>`].
+//!
+//! This crate is `#![no_std]`-compatible, and uses no non-core types.
+//!
+//! For details, see the documentation for [`Radium`].
+//!
+//! Additionally, `radium` exports type aliases that map to the atomic types in
+//! `core::sync::atomic` when they exist, and fall back to `Cell` wrappers when
+//! the atomic is missing. These are accessible through the `types` module; you
+//! can use these names for a guaranteed-portable symbol with best-effort atomic
+//! behavior.
+//!
+//! ---
+//!
+//! **@kneecaw** - <https://twitter.com/kneecaw/status/1132695060812849154>
+//! > Feelin' lazy: Has someone already written a helper trait abstracting
+//! > operations over `AtomicUsize` and `Cell<usize>` for generic code which may
+//! > not care about atomicity?
+//!
+//! **@ManishEarth** - <https://twitter.com/ManishEarth/status/1132706585300496384>
+//! > no but call the crate radium
+//! >
+//! > (since people didn't care that it was radioactive and used it in everything)
+//!
+//! [`AtomicUsize`]: core::sync::atomic::AtomicUsize
+//! [`Cell<T>`]: core::cell::Cell
+
+#![no_std]
+#![deny(unconditional_recursion)]
+
+pub mod types;
+
+use core::cell::Cell;
+use core::sync::atomic::Ordering;
+
+#[cfg(radium_atomic_8)]
+use core::sync::atomic::{AtomicBool, AtomicI8, AtomicU8};
+
+#[cfg(radium_atomic_16)]
+use core::sync::atomic::{AtomicI16, AtomicU16};
+
+#[cfg(radium_atomic_32)]
+use core::sync::atomic::{AtomicI32, AtomicU32};
+
+#[cfg(radium_atomic_64)]
+use core::sync::atomic::{AtomicI64, AtomicU64};
+
+#[cfg(radium_atomic_ptr)]
+use core::sync::atomic::{AtomicIsize, AtomicPtr, AtomicUsize};
+
+/// A maybe-atomic shared mutable fundamental type `T`.
+///
+/// This trait is implemented by both the [atomic wrapper] type for `T`, and by
+/// [`Cell<T>`], providing a consistent interface for interacting with the two
+/// types.
+///
+/// This trait provides methods predicated on marker traits for the underlying
+/// fundamental. Only types which can be viewed as sequences of bits may use the
+/// functions for bit-wise arithmetic, and only types which can be used as
+/// integers may use the functions for numeric arithmetic. Use of these methods
+/// on insufficient underlying types (for example, `Radium::fetch_and` on an
+/// atomic or cell-wrapped pointer) will cause a compiler error.
+///
+/// [atomic wrapper]: core::sync::atomic
+/// [`Cell<T>`]: core::cell::Cell
+pub trait Radium {
+    type Item;
+    /// Creates a new value of this type.
+    fn new(value: Self::Item) -> Self;
+
+    /// If the underlying value is atomic, calls [`fence`] with the given
+    /// [`Ordering`]. Otherwise, does nothing.
+    ///
+    /// [`Ordering`]: core::sync::atomic::Ordering
+    /// [`fence`]: core::sync::atomic::fence
+    fn fence(order: Ordering);
+
+    /// Returns a mutable reference to the underlying value.
+    ///
+    /// This is safe because the mutable reference to `self` guarantees that no
+    /// other references exist to this value.
+    fn get_mut(&mut self) -> &mut Self::Item;
+
+    /// Consumes the wrapper and returns the contained value.
+    ///
+    /// This is safe as passing by value ensures no other references exist.
+    fn into_inner(self) -> Self::Item;
+
+    /// Load a value from this object.
+    ///
+    /// Ordering values are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::load`].
+    ///
+    /// [`AtomicUsize::load`]: core::sync::atomic::AtomicUsize::load
+    fn load(&self, order: Ordering) -> Self::Item;
+
+    /// Store a value in this object.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::store`].
+    ///
+    /// [`AtomicUsize::store`]: core::sync::atomic::AtomicUsize::store
+    fn store(&self, value: Self::Item, order: Ordering);
+
+    /// Swap with the value stored in this object.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::swap`].
+    ///
+    /// [`AtomicUsize::swap`]: core::sync::atomic::AtomicUsize::swap
+    fn swap(&self, value: Self::Item, order: Ordering) -> Self::Item;
+
+    /// Stores a value into this object if the currently-stored value is the
+    /// same as the `current` value.
+    ///
+    /// The return value is always the previously-stored value. If it is equal to
+    /// `current`, then the value was updated with `new`.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::compare_and_swap`].
+    ///
+    /// [`AtomicUsize::compare_and_swap`]: core::sync::atomic::AtomicUsize::compare_and_swap
+    fn compare_and_swap(&self, current: Self::Item, new: Self::Item, order: Ordering)
+        -> Self::Item;
+
+    /// Stores a value into this object if the currently-stored value is the
+    /// same as the `current` value.
+    ///
+    /// The return value is a `Result` indicating whether the new value was
+    /// written, and containing the previously-stored value. On success, this
+    /// value is guaranteed to be equal to `current`.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::compare_exchange`].
+    ///
+    /// [`AtomicUsize::compare_exchange`]: core::sync::atomic::AtomicUsize::compare_exchange
+    fn compare_exchange(
+        &self,
+        current: Self::Item,
+        new: Self::Item,
+        success: Ordering,
+        failure: Ordering,
+    ) -> Result<Self::Item, Self::Item>;
+
+    /// Stores a value into this object if the currently-stored value is the
+    /// same as the `current` value.
+    ///
+    /// Unlike `compare_exchange`, this function is allowed to spuriously fail
+    /// even when the comparison succeeds, which can result in more efficient
+    /// code on some platforms. The return value is a `Result` indicating
+    /// whether the new value was written, and containing the previously-stored
+    /// value.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::compare_exchange_weak`].
+    ///
+    /// [`AtomicUsize::compare_exchange_weak`]: core::sync::atomic::AtomicUsize::compare_exchange_weak
+    fn compare_exchange_weak(
+        &self,
+        current: Self::Item,
+        new: Self::Item,
+        success: Ordering,
+        failure: Ordering,
+    ) -> Result<Self::Item, Self::Item>;
+
+    /// Performs a bitwise "and" on the currently-stored value and the argument
+    /// `value`, and stores the result in `self`.
+    ///
+    /// Returns the previously-stored value.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::fetch_and`].
+    ///
+    /// [`AtomicUsize::fetch_and`]: core::sync::atomic::AtomicUsize::fetch_and
+    fn fetch_and(&self, value: Self::Item, order: Ordering) -> Self::Item
+    where
+        Self::Item: marker::BitOps;
+
+    /// Performs a bitwise "nand" on the currently-stored value and the argument
+    /// `value`, and stores the result in `self`.
+    ///
+    /// Returns the previously-stored value.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::fetch_nand`].
+    ///
+    /// [`AtomicUsize::fetch_nand`]: core::sync::atomic::AtomicUsize::fetch_nand
+    fn fetch_nand(&self, value: Self::Item, order: Ordering) -> Self::Item
+    where
+        Self::Item: marker::BitOps;
+
+    /// Performs a bitwise "or" on the currently-stored value and the argument
+    /// `value`, and stores the result in `self`.
+    ///
+    /// Returns the previously-stored value.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::fetch_or`].
+    ///
+    /// [`AtomicUsize::fetch_or`]: core::sync::atomic::AtomicUsize::fetch_or
+    fn fetch_or(&self, value: Self::Item, order: Ordering) -> Self::Item
+    where
+        Self::Item: marker::BitOps;
+
+    /// Performs a bitwise "xor" on the currently-stored value and the argument
+    /// `value`, and stores the result in `self`.
+    ///
+    /// Returns the previously-stored value.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::fetch_xor`].
+    ///
+    /// [`AtomicUsize::fetch_xor`]: core::sync::atomic::AtomicUsize::fetch_xor
+    fn fetch_xor(&self, value: Self::Item, order: Ordering) -> Self::Item
+    where
+        Self::Item: marker::BitOps;
+
+    /// Adds `value` to the currently-stored value, wrapping on overflow, and
+    /// stores the result in `self`.
+    ///
+    /// Returns the previously-stored value.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::fetch_add`].
+    ///
+    /// [`AtomicUsize::fetch_add`]: core::sync::atomic::AtomicUsize::fetch_add
+    fn fetch_add(&self, value: Self::Item, order: Ordering) -> Self::Item
+    where
+        Self::Item: marker::NumericOps;
+
+    /// Subtracts `value` from the currently-stored value, wrapping on
+    /// underflow, and stores the result in `self`.
+    ///
+    /// Returns the previously-stored value.
+    ///
+    /// Ordering arguments are ignored by non-atomic types.
+    ///
+    /// See also: [`AtomicUsize::fetch_sub`].
+    ///
+    /// [`AtomicUsize::fetch_sub`]: core::sync::atomic::AtomicUsize::fetch_sub
+    fn fetch_sub(&self, value: Self::Item, order: Ordering) -> Self::Item
+    where
+        Self::Item: marker::NumericOps;
+}
+
+/// Marker traits used by [`Radium`].
+pub mod marker {
+    /// Types supporting maybe-atomic bitwise operations.
+    ///
+    /// Types implementing this trait support the [`fetch_and`], [`fetch_nand`],
+    /// [`fetch_or`], and [`fetch_xor`] maybe-atomic operations.
+    ///
+    /// [`fetch_and`]: crate::Radium::fetch_and
+    /// [`fetch_nand`]: crate::Radium::fetch_nand
+    /// [`fetch_or`]: crate::Radium::fetch_or
+    /// [`fetch_xor`]: crate::Radium::fetch_xor
+    ///
+    /// `bool` and all integer fundamental types implement this.
+    ///
+    /// ```rust
+    /// # use core::sync::atomic::*;
+    /// # use radium::Radium;
+    /// let num: AtomicUsize = AtomicUsize::new(0);
+    /// Radium::fetch_or(&num, 2, Ordering::Relaxed);
+    /// ```
+    ///
+    /// Pointers do not. This will cause a compiler error.
+    ///
+    /// ```rust,compile_fail
+    /// # use core::sync::atomic::*;
+    /// # use radium::Radium;
+    /// # use core::ptr;
+    /// let ptr: AtomicPtr<usize> = Default::default();
+    /// Radium::fetch_or(&ptr, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    pub trait BitOps {}
+
+    /// Types supporting maybe-atomic arithmetic operations.
+    ///
+    /// Types implementing this trait support the [`fetch_add`] and
+    /// [`fetch_sub`] maybe-atomic operations.
+    ///
+    /// [`fetch_add`]: crate::Radium::fetch_add
+    /// [`fetch_sub`]: crate::Radium::fetch_sub
+    ///
+    /// The integer types, such as `usize` and `i32`, implement this trait.
+    ///
+    /// ```rust
+    /// # use core::sync::atomic::*;
+    /// # use radium::Radium;
+    /// let num: AtomicUsize = AtomicUsize::new(2);
+    /// Radium::fetch_add(&num, 2, Ordering::Relaxed);
+    /// ```
+    ///
+    /// `bool` and pointers do not. This will cause a compiler error.
+    ///
+    /// ```rust,compile_fail
+    /// # use core::sync::atomic::*;
+    /// # use radium::Radium;
+    /// let bit: AtomicBool = AtomicBool::new(false);
+    /// Radium::fetch_add(&bit, true, Ordering::Relaxed);
+    /// ```
+    pub trait NumericOps: BitOps {}
+}
+
+macro_rules! radium {
+    // Emit the universal `Radium` trait function bodies for atomic types.
+    ( atom $base:ty ) => {
+        #[inline]
+        fn new(value: $base) -> Self {
+            Self::new(value)
+        }
+
+        #[inline]
+        fn fence(order: Ordering) {
+            core::sync::atomic::fence(order);
+        }
+
+        #[inline]
+        fn get_mut(&mut self) -> &mut $base {
+            self.get_mut()
+        }
+
+        #[inline]
+        fn into_inner(self) -> $base {
+            self.into_inner()
+        }
+
+        #[inline]
+        fn load(&self, order: Ordering) -> $base {
+            self.load(order)
+        }
+
+        #[inline]
+        fn store(&self, value: $base, order: Ordering) {
+            self.store(value, order);
+        }
+
+        #[inline]
+        fn swap(&self, value: $base, order: Ordering) -> $base {
+            self.swap(value, order)
+        }
+
+        #[inline]
+        fn compare_and_swap(
+            &self,
+            current: $base,
+            new: $base,
+            order: Ordering,
+        ) -> $base {
+            self.compare_and_swap(current, new, order)
+        }
+
+        #[inline]
+        fn compare_exchange(
+            &self,
+            current: $base,
+            new: $base,
+            success: Ordering,
+            failure: Ordering,
+        ) -> Result<$base, $base> {
+            self.compare_exchange(current, new, success, failure)
+        }
+
+        #[inline]
+        fn compare_exchange_weak(
+            &self,
+            current: $base,
+            new: $base,
+            success: Ordering,
+            failure: Ordering,
+        ) -> Result<$base, $base> {
+            self.compare_exchange_weak(current, new, success, failure)
+        }
+    };
+
+    // Emit the `Radium` trait function bodies for bit-wise types.
+    ( atom_bit $base:ty ) => {
+        #[inline]
+        fn fetch_and(&self, value: $base, order: Ordering) -> $base {
+            self.fetch_and(value, order)
+        }
+
+        #[inline]
+        fn fetch_nand(&self, value: $base, order: Ordering) -> $base {
+            self.fetch_nand(value, order)
+        }
+
+        #[inline]
+        fn fetch_or(&self, value: $base, order: Ordering) -> $base {
+            self.fetch_or(value, order)
+        }
+
+        #[inline]
+        fn fetch_xor(&self, value: $base, order: Ordering) -> $base {
+            self.fetch_xor(value, order)
+        }
+    };
+
+    // Emit the `Radium` trait function bodies for integral types.
+    ( atom_int $base:ty ) => {
+        #[inline]
+        fn fetch_add(&self, value: $base, order: Ordering) -> $base {
+            self.fetch_add(value, order)
+        }
+
+        #[inline]
+        fn fetch_sub(&self, value: $base, order: Ordering) -> $base {
+            self.fetch_sub(value, order)
+        }
+    };
+
+    // Emit the universal `Radium` trait function bodies for `Cell<_>`.
+    ( cell $base:ty ) => {
+        #[inline]
+        fn new(value: $base) -> Self {
+            Cell::new(value)
+        }
+
+        #[inline]
+        fn fence(_: Ordering) {}
+
+        #[inline]
+        fn get_mut(&mut self) -> &mut $base {
+            self.get_mut()
+        }
+
+        #[inline]
+        fn into_inner(self) -> $base {
+            self.into_inner()
+        }
+
+        #[inline]
+        fn load(&self, _: Ordering) -> $base {
+            self.get()
+        }
+
+        #[inline]
+        fn store(&self, value: $base, _: Ordering) {
+            self.set(value);
+        }
+
+        #[inline]
+        fn swap(&self, value: $base, _: Ordering) -> $base {
+            self.replace(value)
+        }
+
+        #[inline]
+        fn compare_and_swap(
+            &self,
+            current: $base,
+            new: $base,
+            _: Ordering,
+        ) -> $base {
+            if self.get() == current {
+                self.replace(new)
+            } else {
+                self.get()
+            }
+        }
+
+        #[inline]
+        fn compare_exchange(
+            &self,
+            current: $base,
+            new: $base,
+            _: Ordering,
+            _: Ordering,
+        ) -> Result<$base, $base> {
+            if self.get() == current {
+                Ok(self.replace(new))
+            } else {
+                Err(self.get())
+            }
+        }
+
+        #[inline]
+        fn compare_exchange_weak(
+            &self,
+            current: $base,
+            new: $base,
+            success: Ordering,
+            failure: Ordering,
+        ) -> Result<$base, $base> {
+            Radium::compare_exchange(self, current, new, success, failure)
+        }
+    };
+
+    // Emit the `Radium` trait function bodies for bit-wise types.
+    ( cell_bit $base:ty ) => {
+        #[inline]
+        fn fetch_and(&self, value: $base, _: Ordering) -> $base {
+            self.replace(self.get() & value)
+        }
+
+        #[inline]
+        fn fetch_nand(&self, value: $base, _: Ordering) -> $base {
+            self.replace(!(self.get() & value))
+        }
+
+        #[inline]
+        fn fetch_or(&self, value: $base, _: Ordering) -> $base {
+            self.replace(self.get() | value)
+        }
+
+        #[inline]
+        fn fetch_xor(&self, value: $base, _: Ordering) -> $base {
+            self.replace(self.get() ^ value)
+        }
+    };
+
+    // Emit the `Radium` trait function bodies for integral types.
+    ( cell_int $base:ty ) => {
+        #[inline]
+        fn fetch_add(&self, value: $base, _: Ordering) -> $base {
+            self.replace(self.get().wrapping_add(value))
+        }
+
+        #[inline]
+        fn fetch_sub(&self, value: $base, _: Ordering) -> $base {
+            self.replace(self.get().wrapping_sub(value))
+        }
+    };
+
+    // Implement `Radium` for integral fundamentals.
+    ( int $flag:ident $( $base:ty , $atom:ty ; )* ) => { $(
+        impl marker::BitOps for $base {}
+        impl marker::NumericOps for $base {}
+
+        #[cfg($flag)]
+        impl Radium for $atom {
+            type Item = $base;
+
+            radium!(atom $base);
+            radium!(atom_bit $base);
+            radium!(atom_int $base);
+        }
+
+        impl Radium for Cell<$base> {
+            type Item = $base;
+
+            radium!(cell $base);
+            radium!(cell_bit $base);
+            radium!(cell_int $base);
+        }
+    )* };
+}
+
+radium![int radium_atomic_8 i8, AtomicI8; u8, AtomicU8;];
+radium![int radium_atomic_16 i16, AtomicI16; u16, AtomicU16;];
+radium![int radium_atomic_32 i32, AtomicI32; u32, AtomicU32;];
+radium![int radium_atomic_64 i64, AtomicI64; u64, AtomicU64;];
+radium![int radium_atomic_ptr isize, AtomicIsize; usize, AtomicUsize;];
+
+impl marker::BitOps for bool {}
+
+#[cfg(radium_atomic_8)]
+impl Radium for AtomicBool {
+    type Item = bool;
+
+    radium!(atom bool);
+    radium!(atom_bit bool);
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let atom = AtomicBool::new(false);
+    /// Radium::fetch_add(&atom, true, Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_add(&self, _value: bool, _order: Ordering) -> bool {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let atom = AtomicBool::new(false);
+    /// Radium::fetch_sub(&atom, true, Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_sub(&self, _value: bool, _order: Ordering) -> bool {
+        unreachable!("This method statically cannot be called")
+    }
+}
+
+impl Radium for Cell<bool> {
+    type Item = bool;
+
+    radium!(cell bool);
+    radium!(cell_bit bool);
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let cell = Cell::<bool>::new(false);
+    /// Radium::fetch_add(&cell, true, Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_add(&self, _value: bool, _order: Ordering) -> bool {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let cell = Cell::<bool>::new(false);
+    /// Radium::fetch_sub(&cell, true, Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_sub(&self, _value: bool, _order: Ordering) -> bool {
+        unreachable!("This method statically cannot be called")
+    }
+}
+
+#[cfg(radium_atomic_ptr)]
+impl<T> Radium for AtomicPtr<T> {
+    type Item = *mut T;
+
+    radium!(atom *mut T);
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let atom = AtomicPtr::<u8>::new(ptr::null_mut());
+    /// Radium::fetch_and(&atom, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_and(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let atom = AtomicPtr::<u8>::new(ptr::null_mut());
+    /// Radium::fetch_nand(&atom, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_nand(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let atom = AtomicPtr::<u8>::new(ptr::null_mut());
+    /// Radium::fetch_or(&atom, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_or(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let atom = AtomicPtr::<u8>::new(ptr::null_mut());
+    /// Radium::fetch_xor(&atom, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_xor(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let atom = AtomicPtr::<u8>::new(ptr::null_mut());
+    /// Radium::fetch_add(&atom, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_add(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let atom = AtomicPtr::<u8>::new(ptr::null_mut());
+    /// Radium::fetch_sub(&atom, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_sub(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+}
+
+impl<T> Radium for Cell<*mut T> {
+    type Item = *mut T;
+
+    radium!(cell *mut T);
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let cell = Cell::<*mut u8>::new(ptr::null_mut());
+    /// Radium::fetch_and(&cell, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_and(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let cell = Cell::<*mut u8>::new(ptr::null_mut());
+    /// Radium::fetch_nand(&cell, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_nand(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let cell = Cell::<*mut u8>::new(ptr::null_mut());
+    /// Radium::fetch_or(&cell, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_or(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let cell = Cell::<*mut u8>::new(ptr::null_mut());
+    /// Radium::fetch_xor(&cell, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_xor(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let cell = Cell::<*mut u8>::new(ptr::null_mut());
+    /// Radium::fetch_add(&cell, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_add(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+
+    /// ```compile_fail
+    /// # use std::{ptr, sync::atomic::*, cell::*};
+    /// # use radium::*;
+    /// let cell = Cell::<*mut u8>::new(ptr::null_mut());
+    /// Radium::fetch_sub(&cell, ptr::null_mut(), Ordering::Relaxed);
+    /// ```
+    #[doc(hidden)]
+    fn fetch_sub(&self, _value: *mut T, _order: Ordering) -> *mut T {
+        unreachable!("This method statically cannot be called")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use core::cell::Cell;
+
+    #[test]
+    fn absent_traits() {
+        static_assertions::assert_not_impl_any!(bool: marker::NumericOps);
+        static_assertions::assert_not_impl_any!(*mut u8: marker::BitOps, marker::NumericOps);
+    }
+
+    #[test]
+    fn present_traits() {
+        static_assertions::assert_impl_all!(bool: marker::BitOps);
+        static_assertions::assert_impl_all!(usize: marker::BitOps, marker::NumericOps);
+    }
+
+    #[test]
+    fn always_cell() {
+        static_assertions::assert_impl_all!(Cell<bool>: Radium<Item = bool>);
+        static_assertions::assert_impl_all!(Cell<i8>: Radium<Item = i8>);
+        static_assertions::assert_impl_all!(Cell<u8>: Radium<Item = u8>);
+        static_assertions::assert_impl_all!(Cell<i16>: Radium<Item = i16>);
+        static_assertions::assert_impl_all!(Cell<u16>: Radium<Item = u16>);
+        static_assertions::assert_impl_all!(Cell<i32>: Radium<Item = i32>);
+        static_assertions::assert_impl_all!(Cell<u32>: Radium<Item = u32>);
+        static_assertions::assert_impl_all!(Cell<i64>: Radium<Item = i64>);
+        static_assertions::assert_impl_all!(Cell<u64>: Radium<Item = u64>);
+        static_assertions::assert_impl_all!(Cell<isize>: Radium<Item = isize>);
+        static_assertions::assert_impl_all!(Cell<usize>: Radium<Item = usize>);
+        static_assertions::assert_impl_all!(Cell<*mut ()>: Radium<Item = *mut ()>);
+    }
+
+    #[test]
+    fn always_alias() {
+        static_assertions::assert_impl_all!(types::RadiumBool: Radium<Item = bool>);
+        static_assertions::assert_impl_all!(types::RadiumI8: Radium<Item = i8>);
+        static_assertions::assert_impl_all!(types::RadiumU8: Radium<Item = u8>);
+        static_assertions::assert_impl_all!(types::RadiumI16: Radium<Item = i16>);
+        static_assertions::assert_impl_all!(types::RadiumU16: Radium<Item = u16>);
+        static_assertions::assert_impl_all!(types::RadiumI32: Radium<Item = i32>);
+        static_assertions::assert_impl_all!(types::RadiumU32: Radium<Item = u32>);
+        static_assertions::assert_impl_all!(types::RadiumI64: Radium<Item = i64>);
+        static_assertions::assert_impl_all!(types::RadiumU64: Radium<Item = u64>);
+        static_assertions::assert_impl_all!(types::RadiumIsize: Radium<Item = isize>);
+        static_assertions::assert_impl_all!(types::RadiumUsize: Radium<Item = usize>);
+        static_assertions::assert_impl_all!(types::RadiumPtr<()>: Radium<Item = *mut ()>);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/src/types.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/src/types.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/radium/src/types.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/radium/src/types.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,52 @@
+//! Best-effort atomic types
+//!
+//! This module exports `RadiumType` aliases that map to the `AtomicType` on
+//! targets that have it, or `Cell<Type>` on targets that do not. This alias can
+//! be used as a consistent name for crates that need consistent names to
+//! portable types.
+
+macro_rules! radium_type {
+    ($flag:ident $( $name:ident $atom:ident => $inner:ty => $adoc:literal $cdoc:literal )*) => { $(
+        #[doc = $adoc]
+        #[cfg($flag)]
+        pub type $name = core::sync::atomic::$atom;
+
+        #[doc = $cdoc]
+        #[cfg(not($flag))]
+        pub type $name = core::cell::Cell<$inner>;
+    )* };
+}
+
+radium_type!(radium_atomic_8
+    RadiumBool AtomicBool => bool => "`AtomicBool`" "`Cell<bool>`"
+    RadiumI8 AtomicI8 => i8 => "`AtomicI8`" "`Cell<i8>`"
+    RadiumU8 AtomicU8 => u8 => "`AtomicU8`" "`Cell<u8>`"
+);
+
+radium_type!(radium_atomic_16
+    RadiumI16 AtomicI16 => i16 => "`AtomicI16`" "`Cell<i16>`"
+    RadiumU16 AtomicU16 => u16 => "`AtomicU16`" "`Cell<u16>`"
+);
+
+radium_type!(radium_atomic_32
+    RadiumI32 AtomicI32 => i32 => "`AtomicI32`" "`Cell<i32>`"
+    RadiumU32 AtomicU32 => u32 => "`AtomicU32`" "`Cell<u32>`"
+);
+
+radium_type!(radium_atomic_64
+    RadiumI64 AtomicI64 => i64 => "`AtomicI64`" "`Cell<i64>`"
+    RadiumU64 AtomicU64 => u64 => "`AtomicU64`" "`Cell<u64>`"
+);
+
+radium_type!(radium_atomic_ptr
+    RadiumIsize AtomicIsize => isize => "`AtomicIsize`" "`Cell<isize>`"
+    RadiumUsize AtomicUsize => usize => "`AtomicUsize`" "`Cell<usize>`"
+);
+
+/// `AtomicPtr`
+#[cfg(radium_atomic_ptr)]
+pub type RadiumPtr<T> = core::sync::atomic::AtomicPtr<T>;
+
+/// `Cell<*mut T>`
+#[cfg(not(radium_atomic_ptr))]
+pub type RadiumPtr<T> = core::cell::Cell<*mut T>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/benches/generators.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/benches/generators.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/benches/generators.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/benches/generators.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(test)]
-#![allow(non_snake_case)]
-
-extern crate test;
-
-const RAND_BENCH_N: u64 = 1000;
-const BYTES_LEN: usize = 1024;
-
-use std::mem::size_of;
-use test::{black_box, Bencher};
-
-use rand::prelude::*;
-use rand::rngs::adapter::ReseedingRng;
-use rand::rngs::{mock::StepRng, OsRng};
-use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
-use rand_hc::Hc128Rng;
-use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg};
-
-macro_rules! gen_bytes {
-    ($fnn:ident, $gen:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = $gen;
-            let mut buf = [0u8; BYTES_LEN];
-            b.iter(|| {
-                for _ in 0..RAND_BENCH_N {
-                    rng.fill_bytes(&mut buf);
-                    black_box(buf);
-                }
-            });
-            b.bytes = BYTES_LEN as u64 * RAND_BENCH_N;
-        }
-    };
-}
-
-gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
-gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
-gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
-gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
-gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
-gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
-gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
-gen_bytes!(gen_bytes_hc128, Hc128Rng::from_entropy());
-gen_bytes!(gen_bytes_std, StdRng::from_entropy());
-#[cfg(feature = "small_rng")]
-gen_bytes!(gen_bytes_small, SmallRng::from_entropy());
-gen_bytes!(gen_bytes_os, OsRng);
-
-macro_rules! gen_uint {
-    ($fnn:ident, $ty:ty, $gen:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = $gen;
-            b.iter(|| {
-                let mut accum: $ty = 0;
-                for _ in 0..RAND_BENCH_N {
-                    accum = accum.wrapping_add(rng.gen::<$ty>());
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * RAND_BENCH_N;
-        }
-    };
-}
-
-gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
-gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
-gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
-gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
-gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
-gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
-gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
-gen_uint!(gen_u32_hc128, u32, Hc128Rng::from_entropy());
-gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
-#[cfg(feature = "small_rng")]
-gen_uint!(gen_u32_small, u32, SmallRng::from_entropy());
-gen_uint!(gen_u32_os, u32, OsRng);
-
-gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
-gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
-gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
-gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
-gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
-gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
-gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
-gen_uint!(gen_u64_hc128, u64, Hc128Rng::from_entropy());
-gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
-#[cfg(feature = "small_rng")]
-gen_uint!(gen_u64_small, u64, SmallRng::from_entropy());
-gen_uint!(gen_u64_os, u64, OsRng);
-
-macro_rules! init_gen {
-    ($fnn:ident, $gen:ident) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = Pcg32::from_entropy();
-            b.iter(|| {
-                let r2 = $gen::from_rng(&mut rng).unwrap();
-                r2
-            });
-        }
-    };
-}
-
-init_gen!(init_pcg32, Pcg32);
-init_gen!(init_pcg64, Pcg64);
-init_gen!(init_pcg64mcg, Pcg64Mcg);
-init_gen!(init_hc128, Hc128Rng);
-init_gen!(init_chacha, ChaCha20Rng);
-
-const RESEEDING_BYTES_LEN: usize = 1024 * 1024;
-const RESEEDING_BENCH_N: u64 = 16;
-
-macro_rules! reseeding_bytes {
-    ($fnn:ident, $thresh:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
-            let mut buf = [0u8; RESEEDING_BYTES_LEN];
-            b.iter(|| {
-                for _ in 0..RESEEDING_BENCH_N {
-                    rng.fill_bytes(&mut buf);
-                    black_box(&buf);
-                }
-            });
-            b.bytes = RESEEDING_BYTES_LEN as u64 * RESEEDING_BENCH_N;
-        }
-    };
-}
-
-reseeding_bytes!(reseeding_chacha20_4k, 4);
-reseeding_bytes!(reseeding_chacha20_16k, 16);
-reseeding_bytes!(reseeding_chacha20_32k, 32);
-reseeding_bytes!(reseeding_chacha20_64k, 64);
-reseeding_bytes!(reseeding_chacha20_256k, 256);
-reseeding_bytes!(reseeding_chacha20_1M, 1024);
-
-
-macro_rules! threadrng_uint {
-    ($fnn:ident, $ty:ty) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = thread_rng();
-            b.iter(|| {
-                let mut accum: $ty = 0;
-                for _ in 0..RAND_BENCH_N {
-                    accum = accum.wrapping_add(rng.gen::<$ty>());
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * RAND_BENCH_N;
-        }
-    };
-}
-
-threadrng_uint!(thread_rng_u32, u32);
-threadrng_uint!(thread_rng_u64, u64);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/benches/misc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/benches/misc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/benches/misc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/benches/misc.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(test)]
-
-extern crate test;
-
-const RAND_BENCH_N: u64 = 1000;
-
-use test::Bencher;
-
-use rand::distributions::{Bernoulli, Distribution, Standard};
-use rand::prelude::*;
-use rand_pcg::{Pcg32, Pcg64Mcg};
-
-#[bench]
-fn misc_gen_bool_const(b: &mut Bencher) {
-    let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let mut accum = true;
-        for _ in 0..crate::RAND_BENCH_N {
-            accum ^= rng.gen_bool(0.18);
-        }
-        accum
-    })
-}
-
-#[bench]
-fn misc_gen_bool_var(b: &mut Bencher) {
-    let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let mut accum = true;
-        let mut p = 0.18;
-        for _ in 0..crate::RAND_BENCH_N {
-            accum ^= rng.gen_bool(p);
-            p += 0.0001;
-        }
-        accum
-    })
-}
-
-#[bench]
-fn misc_gen_ratio_const(b: &mut Bencher) {
-    let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let mut accum = true;
-        for _ in 0..crate::RAND_BENCH_N {
-            accum ^= rng.gen_ratio(2, 3);
-        }
-        accum
-    })
-}
-
-#[bench]
-fn misc_gen_ratio_var(b: &mut Bencher) {
-    let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let mut accum = true;
-        for i in 2..(crate::RAND_BENCH_N as u32 + 2) {
-            accum ^= rng.gen_ratio(i, i + 1);
-        }
-        accum
-    })
-}
-
-#[bench]
-fn misc_bernoulli_const(b: &mut Bencher) {
-    let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let d = rand::distributions::Bernoulli::new(0.18).unwrap();
-        let mut accum = true;
-        for _ in 0..crate::RAND_BENCH_N {
-            accum ^= rng.sample(d);
-        }
-        accum
-    })
-}
-
-#[bench]
-fn misc_bernoulli_var(b: &mut Bencher) {
-    let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let mut accum = true;
-        let mut p = 0.18;
-        for _ in 0..crate::RAND_BENCH_N {
-            let d = Bernoulli::new(p).unwrap();
-            accum ^= rng.sample(d);
-            p += 0.0001;
-        }
-        accum
-    })
-}
-
-#[bench]
-fn gen_1k_iter_repeat(b: &mut Bencher) {
-    use std::iter;
-    let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let v: Vec<u64> = iter::repeat(()).map(|()| rng.gen()).take(128).collect();
-        v
-    });
-    b.bytes = 1024;
-}
-
-#[bench]
-fn gen_1k_sample_iter(b: &mut Bencher) {
-    let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
-        v
-    });
-    b.bytes = 1024;
-}
-
-#[bench]
-fn gen_1k_gen_array(b: &mut Bencher) {
-    let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        // max supported array length is 32!
-        let v: [[u64; 32]; 4] = rng.gen();
-        v
-    });
-    b.bytes = 1024;
-}
-
-#[bench]
-fn gen_1k_fill(b: &mut Bencher) {
-    let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
-    let mut buf = [0u64; 128];
-    b.iter(|| {
-        rng.fill(&mut buf[..]);
-        buf
-    });
-    b.bytes = 1024;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/benches/seq.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/benches/seq.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/benches/seq.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/benches/seq.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(test)]
-#![allow(non_snake_case)]
-
-extern crate test;
-
-use test::Bencher;
-
-use rand::prelude::*;
-use rand::seq::*;
-use std::mem::size_of;
-
-// We force use of 32-bit RNG since seq code is optimised for use with 32-bit
-// generators on all platforms.
-use rand_pcg::Pcg32 as SmallRng;
-
-const RAND_BENCH_N: u64 = 1000;
-
-#[bench]
-fn seq_shuffle_100(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x: &mut [usize] = &mut [1; 100];
-    b.iter(|| {
-        x.shuffle(&mut rng);
-        x[0]
-    })
-}
-
-#[bench]
-fn seq_slice_choose_1_of_1000(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x: &mut [usize] = &mut [1; 1000];
-    for i in 0..1000 {
-        x[i] = i;
-    }
-    b.iter(|| {
-        let mut s = 0;
-        for _ in 0..RAND_BENCH_N {
-            s += x.choose(&mut rng).unwrap();
-        }
-        s
-    });
-    b.bytes = size_of::<usize>() as u64 * crate::RAND_BENCH_N;
-}
-
-macro_rules! seq_slice_choose_multiple {
-    ($name:ident, $amount:expr, $length:expr) => {
-        #[bench]
-        fn $name(b: &mut Bencher) {
-            let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-            let x: &[i32] = &[$amount; $length];
-            let mut result = [0i32; $amount];
-            b.iter(|| {
-                // Collect full result to prevent unwanted shortcuts getting
-                // first element (in case sample_indices returns an iterator).
-                for (slot, sample) in result.iter_mut().zip(x.choose_multiple(&mut rng, $amount)) {
-                    *slot = *sample;
-                }
-                result[$amount - 1]
-            })
-        }
-    };
-}
-
-seq_slice_choose_multiple!(seq_slice_choose_multiple_1_of_1000, 1, 1000);
-seq_slice_choose_multiple!(seq_slice_choose_multiple_950_of_1000, 950, 1000);
-seq_slice_choose_multiple!(seq_slice_choose_multiple_10_of_100, 10, 100);
-seq_slice_choose_multiple!(seq_slice_choose_multiple_90_of_100, 90, 100);
-
-#[bench]
-fn seq_iter_choose_from_1000(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x: &mut [usize] = &mut [1; 1000];
-    for i in 0..1000 {
-        x[i] = i;
-    }
-    b.iter(|| {
-        let mut s = 0;
-        for _ in 0..RAND_BENCH_N {
-            s += x.iter().choose(&mut rng).unwrap();
-        }
-        s
-    });
-    b.bytes = size_of::<usize>() as u64 * crate::RAND_BENCH_N;
-}
-
-#[derive(Clone)]
-struct UnhintedIterator<I: Iterator + Clone> {
-    iter: I,
-}
-impl<I: Iterator + Clone> Iterator for UnhintedIterator<I> {
-    type Item = I::Item;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.iter.next()
-    }
-}
-
-#[derive(Clone)]
-struct WindowHintedIterator<I: ExactSizeIterator + Iterator + Clone> {
-    iter: I,
-    window_size: usize,
-}
-impl<I: ExactSizeIterator + Iterator + Clone> Iterator for WindowHintedIterator<I> {
-    type Item = I::Item;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.iter.next()
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (std::cmp::min(self.iter.len(), self.window_size), None)
-    }
-}
-
-#[bench]
-fn seq_iter_unhinted_choose_from_1000(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x: &[usize] = &[1; 1000];
-    b.iter(|| {
-        UnhintedIterator { iter: x.iter() }
-            .choose(&mut rng)
-            .unwrap()
-    })
-}
-
-#[bench]
-fn seq_iter_window_hinted_choose_from_1000(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x: &[usize] = &[1; 1000];
-    b.iter(|| {
-        WindowHintedIterator {
-            iter: x.iter(),
-            window_size: 7,
-        }
-        .choose(&mut rng)
-    })
-}
-
-#[bench]
-fn seq_iter_choose_multiple_10_of_100(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x: &[usize] = &[1; 100];
-    b.iter(|| x.iter().cloned().choose_multiple(&mut rng, 10))
-}
-
-#[bench]
-fn seq_iter_choose_multiple_fill_10_of_100(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x: &[usize] = &[1; 100];
-    let mut buf = [0; 10];
-    b.iter(|| x.iter().cloned().choose_multiple_fill(&mut rng, &mut buf))
-}
-
-macro_rules! sample_indices {
-    ($name:ident, $fn:ident, $amount:expr, $length:expr) => {
-        #[bench]
-        fn $name(b: &mut Bencher) {
-            let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-            b.iter(|| index::$fn(&mut rng, $length, $amount))
-        }
-    };
-}
-
-sample_indices!(misc_sample_indices_1_of_1k, sample, 1, 1000);
-sample_indices!(misc_sample_indices_10_of_1k, sample, 10, 1000);
-sample_indices!(misc_sample_indices_100_of_1k, sample, 100, 1000);
-sample_indices!(misc_sample_indices_100_of_1M, sample, 100, 1000_000);
-sample_indices!(misc_sample_indices_100_of_1G, sample, 100, 1000_000_000);
-sample_indices!(misc_sample_indices_200_of_1G, sample, 200, 1000_000_000);
-sample_indices!(misc_sample_indices_400_of_1G, sample, 400, 1000_000_000);
-sample_indices!(misc_sample_indices_600_of_1G, sample, 600, 1000_000_000);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/benches/weighted.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/benches/weighted.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/benches/weighted.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/benches/weighted.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-// Copyright 2019 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(test)]
-
-extern crate test;
-
-use rand::distributions::WeightedIndex;
-use rand::Rng;
-use test::Bencher;
-
-#[bench]
-fn weighted_index_creation(b: &mut Bencher) {
-    let mut rng = rand::thread_rng();
-    let weights = [1u32, 2, 4, 0, 5, 1, 7, 1, 2, 3, 4, 5, 6, 7];
-    b.iter(|| {
-        let distr = WeightedIndex::new(weights.to_vec()).unwrap();
-        rng.sample(distr)
-    })
-}
-
-#[bench]
-fn weighted_index_modification(b: &mut Bencher) {
-    let mut rng = rand::thread_rng();
-    let weights = [1u32, 2, 3, 0, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7];
-    let mut distr = WeightedIndex::new(weights.to_vec()).unwrap();
-    b.iter(|| {
-        distr.update_weights(&[(2, &4), (5, &1)]).unwrap();
-        rng.sample(&distr)
-    })
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"28794454ddd6739a1c0cfc6df90a25af3a6a62827d7f7aaea3ee39440b9ab87b","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.lock":"ee32a72318ee8c6986509e36ae276406b622897cb82324c3f0e39551f0edc2cb","Cargo.toml":"4bc436e4b01131f4809c2d3dbdd3ede6987135d3fb53f718cd4a85cafa240224","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"cc7af91db7807de40503b3033ea596aeb78a89c0997894ffd0e56c2fb06eab36","SECURITY.md":"b1c8e24e88bd81bb65bad212b1176d18a73f5191ae650a75784954a74acc31d4","benches/generators.rs":"361886b55d31449e7a649518e5a751eff4494cad8f3e247aee741dddd82d99a4","benches/misc.rs":"6fa587fb3bab8502b7dd88805a4255c5fc6b42b8b3f5d8eb727af1b80b0ebe29","benches/seq.rs":"bdc6c92a8cedb5ff41ac028618053eaf5bf4c7be8b16c83c79e9467039381302","benches/weighted.rs":"3649964f75cd6cb4e50134fbb14e09fb995ca6667cb34f99d0bd27a9429de3ea","examples/monte-carlo.rs":"e55087f1e1f48d723ffc49fb107f5846c163a5e0c97206cd43a261cbdf6bb1b4","examples/monty-hall.rs":"c079293ec0633717b4d903c63f9db166c2a0fe6c8ba9a98f084fb4975fccbc07","rustfmt.toml":"a582a93dc6492d36daae52df7800e369887ba0984d68d98f70b99ca870fed268","src/distributions/bernoulli.rs":"fa81935ea2091d43d373bb7f2f579522a5beae33c9aa9598fe8490298753eba7","src/distributions/binomial.rs":"667f4f2cddb7994aa68926dbdda4482c24ce28f9d392d2a439a9eb675bfe04be","src/distributions/cauchy.rs":"bf55d4535960136351938a92254d4429689c20ebba051808c171f818adbb1191","src/distributions/dirichlet.rs":"ef28a435d9fa6b2f8d953613135cf1be7905f3909edd86b65be4e77685dd9c47","src/distributions/exponential.rs":"0419f25e369b66226ecaaf500395bf3b0decc5f90aedba1151553085774129bf","src/distributions/float.rs":"8dc11e2e4ae743e19e7799da02862480f4499789d8c58c47fbeca5f7930d7cb9","src/distributions/gamma.rs":"bfa848d6165e653d6e461e5b92f49bb119c6f9e259ffe7d7b8fbb34234d611d1","src/distributions/integer.rs":"3eb86fe2a1aca9125463cc581245b498d8c23c0f80422e5496582d2763e605fc","src/distributions/mod.rs":"d2a2b3e36f2f8bdeb93ffc1f3032175b6a062f485e6bf78502401aa854c4fb24","src/distributions/normal.rs":"2ef7e174877f7ccb7c4ff5cbce5dc24eaad0cc700fad33a6d3c20b52ed8f4bcb","src/distributions/other.rs":"e0a6f5e2d6699e460267f463c95797781daf347bff9192b7af7630a18885290c","src/distributions/pareto.rs":"2c1fee43a4b408e9da32abec384542a243b96c5303371a63d0fc2f1baaa02c64","src/distributions/poisson.rs":"ec123c26b0029cb96325e2551e6c82c9b7f7a41c933cc3f40f6f6f6ac7990cef","src/distributions/triangular.rs":"4be8ba5eccdda8ab90319325381ff6952caf59261b59a7a6f79f8867ac426249","src/distributions/uniform.rs":"5a1af322eb2b6cca701bd0a14247b4387e78686318fd01f3213d0f3252cbea18","src/distributions/unit_circle.rs":"36d8640cb8b26fcdb1b7d4d6c0b349316117f9300f480304c8a15d9d148f5937","src/distributions/unit_sphere.rs":"4ecc4260d4e4cc3ebea679a29d2ec343a54d56016c37b2632d78e888a92cb584","src/distributions/utils.rs":"6478e01b2bd0de99e917373f3c86db1142ea10c67488691cbc10af29891ac6dc","src/distributions/weibull.rs":"9b5acc5981a44309820d3a1fd3fff17984590aeebb41a1cdf5098890ad1dec04","src/distributions/weighted/alias_method.rs":"6172aad0d461f6816a944dec00aac09e943fd13123ec518184995658538de7ed","src/distributions/weighted/mod.rs":"54386cf92d39c69b38208bc9b0e2f74949512784a43684d63523bee03c1cc8bc","src/distributions/ziggurat_tables.rs":"2994bb821a60681e0d7a2bb45fcdcbea1040aa775c9aab2c80a7161d753d1ad0","src/lib.rs":"588e35ffc5c859b588d99de6d331251939440383b09da92b1017ddced19a3f41","src/prelude.rs":"cb49fcfc4f0d3b6eaa43c00a667dd3456e6a321e98eee17320ec4a703d6faf4b","src/rngs/adapter/mod.rs":"851918de58eda79c0cb3f2c0756fb756a7769f35115a77a5ae2025e05b4c1d93","src/rngs/adapter/read.rs":"c162cd131c9ed4868415360f627aba17046d4acdae6b7cdc9c75a41e60757caa","src/rngs/adapter/reseeding.rs":"93d2fbf62d1a5765437c4360b94a2df69921fb9cd5b704c4c2023f53eb15ee03","src/rngs/entropy.rs":"a7a07e1f23c45332994eb0b76d250f68a2394048ab6fe3c6691fef719e30fb42","src/rngs/mock.rs":"d1ac752afa589bc3925067f98fe6c13223bda6c3e22b85abe22e4cd60e22bf90","src/rngs/mod.rs":"9ae5e9aa965d3393ef90983ab85834599432c9fc2c1d40de1b9237ab3fc91eb1","src/rngs/small.rs":"8cc5d1ae357554181b4c5fa978e95b667147c251f8431881da66b97ff584224c","src/rngs/std.rs":"82117975ada00199c8ca3677fc4e00bb8b574c50cd321e04b37d0c7542fa0b30","src/rngs/thread.rs":"ccb98ead28d49f6e35d6e50150cbd89579409fcfd792565aceb03e716447de9b","src/seq/index.rs":"4f2566bd9c189fc68a68fc1ad913c6efe3d3ea0699b1b1e110df9d51725c5b3d","src/seq/mod.rs":"26707ad8595093746852799c1d2eee159b69044abfedfcbfe26263a25f8035fa"},"package":"6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"ec8e8a6faaef6b49f4b0331e6a38db554adf374726cc87c6c52815d68be15dbd","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"19b72692e71ffdbccfcb82cde731d6c50162878a72195968a78eacae64ebdfae","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"1d9910dfa2c3381755ec8641bcfbfb53ecb9c5d58eeba15f89cfd6d6f6d61a6b","src/distributions/bernoulli.rs":"24720a24a7cf8639f47b291a60e1333f10202c09593e125f43a92b095e82856a","src/distributions/distribution.rs":"d4f4b979f60e84e70402dce79be6b360b5c72eb4c11770d517219d83ce408174","src/distributions/float.rs":"e5c22bb31a2297ed554553b671084d9a41f110d414b52eaa24fd6e7759bccfc7","src/distributions/integer.rs":"16948664d86a506ed8a401d602238e08ae6f74744b4a656167f8c2a70f7455bb","src/distributions/mod.rs":"112924068dc39bf2f0daddab7b7e2cdfa9bf02953933e9266a7752259e5536b7","src/distributions/other.rs":"8e60821f2353f4fd0a784c0bea6bf57ca71b2d952f93536f055e498481b2f995","src/distributions/slice.rs":"94f5abfe602679e980e4561bb03dcac28bbd3bb5f7bd2821f396a6293c0878db","src/distributions/uniform.rs":"f3315c90d09c85708d499dfd0f5126cf59ea3509d5d6af987aa65c8674e47131","src/distributions/utils.rs":"e203b75ee056cc599a80847bb658f500e13c9e9c353136be290d5e7f3cb0f87c","src/distributions/weighted.rs":"049ed1ce8dcb66ebfa34bdfebea6c355732b099c564e047c7151e0c4e8fb3114","src/distributions/weighted_index.rs":"4a551193a435dd0ece82170c0ae837a1c786a099cb271cc290ebd617ce6f84a2","src/lib.rs":"a0badbc5c219edad8902910bc342cb9b8be3d0026dba0dfbffa1b9240a28479a","src/prelude.rs":"2f2132d74ce9f70513224baad3b161b1585a639f9136a254cdb0e7f8ffceb25b","src/rng.rs":"2dcbf03fa6b3083bd5fd191981391b37347764e4eb2a37baf10f7b6a0aed0004","src/rngs/adapter/mod.rs":"28318871529da61dccc0fe8c0bcafa99b133c721d4bb506fa34d0831f4ca2639","src/rngs/adapter/read.rs":"b044061c46d0b8e6a4f25c69d3e8bb6f9df08cd8df9b5eae131a1d4934020e03","src/rngs/adapter/reseeding.rs":"812ef23f0ff2a0a013a0716bfd55a3879f39f11a14946308c6b98e4a552fc2d0","src/rngs/mock.rs":"0074abe04cf84b1263218f50140931fa4188f4e0a43fe3205556a00e4c36d1e9","src/rngs/mod.rs":"a6dec3d19e1726ba05f130ab9b20719d79177b8c1584cdd7b5f37b9996315ed3","src/rngs/small.rs":"a8e61c6e0bad62f06db1325e3b93eff1d4aa9e82cf0316fbfd02da2ef5b85b83","src/rngs/std.rs":"0fe31f4a9b3f440801965d777b455b066516044b0c83cb69547c17cbd21bf57e","src/rngs/thread.rs":"3249717e00a4cc944829c6ffde289053ae08bc6159dc90a2d397bf583c2cd8ad","src/rngs/xoshiro128plusplus.rs":"deca2450a2d5ea826ca6f47cccb9ee06daeac38799a30a107b78c5dae78ae30c","src/rngs/xoshiro256plusplus.rs":"d7e214f8288041cede7ef26e829dd2196f7b4843455d7f1b9a3ef080d570bc5f","src/seq/index.rs":"5e235e1e92f8410bccdb47e4e7dc80752cfb4c89f9c5a726b38f42773f210ae0","src/seq/mod.rs":"27f5d8c07c9da8fefcd8ee8c05a574c9ba1038a77ac69d02f5c5d0f53ba2d4b5"},"package":"2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,388 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "base-x"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bumpalo"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "c2-chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "getrandom"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "stdweb 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.62"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "log"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "packed_simd"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-dependencies = [
- "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde"
-version = "1.0.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde_derive"
-version = "1.0.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "sha1"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "stdweb"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "stdweb-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "stdweb-internal-macros 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "stdweb-internal-runtime 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base-x 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wasi"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum base-x 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "76f4eae81729e69bb1819a26c6caac956cc429238388091f98cb6cd858f16443"
-"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
-"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
-"checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220"
-"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)" = "f4473e8506b213730ff2061073b48fa51dcc66349219e2e7c5608f0296a1d95a"
-"checksum serde_derive 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)" = "11e410fde43e157d789fc290d26bc940778ad0fdd47836426fbac36573710dbb"
-"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
-"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum stdweb 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)" = "a68c0ce28cf7400ed022e18da3c4591e14e1df02c70e93573cc59921b3923aeb"
-"checksum stdweb-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e21ebd9179de08f2300a65454268a17ea3de204627458588c84319c4def3930"
-"checksum stdweb-internal-macros 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e68f7d08b76979a43e93fe043b66d2626e35d41d68b0b85519202c6dd8ac59fa"
-"checksum stdweb-internal-runtime 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d52317523542cc0af5b7e31017ad0f7d1e78da50455e38d5657cd17754f617da"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-"checksum wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc"
-"checksum wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0"
-"checksum wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9"
-"checksum wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e"
-"checksum wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,13 +13,13 @@
 [package]
 edition = "2018"
 name = "rand"
-version = "0.7.3"
+version = "0.8.4"
 authors = ["The Rand Project Developers", "The Rust Project Developers"]
-exclude = ["/utils/*", "/.travis.yml", "/appveyor.yml", ".gitignore"]
+include = ["src/", "LICENSE-*", "README.md", "CHANGELOG.md", "COPYRIGHT"]
 autobenches = true
 description = "Random number generators and other randomness functionality.\n"
-homepage = "https://crates.io/crates/rand"
-documentation = "https://rust-random.github.io/rand/"
+homepage = "https://rust-random.github.io/book"
+documentation = "https://docs.rs/rand"
 readme = "README.md"
 keywords = ["random", "rng"]
 categories = ["algorithms", "no-std"]
@@ -27,54 +27,55 @@
 repository = "https://github.com/rust-random/rand"
 [package.metadata.docs.rs]
 all-features = true
-[dependencies.getrandom_package]
-version = "0.1.1"
-optional = true
-package = "getrandom"
+rustdoc-args = ["--cfg", "doc_cfg"]
 
+[package.metadata.playground]
+features = ["small_rng", "serde1"]
 [dependencies.log]
 version = "0.4.4"
 optional = true
 
 [dependencies.packed_simd]
-version = "0.3"
+version = "0.3.5"
 features = ["into_bits"]
 optional = true
+package = "packed_simd_2"
 
 [dependencies.rand_core]
-version = "0.5.1"
+version = "0.6.0"
 
-[dependencies.rand_pcg]
-version = "0.2"
+[dependencies.serde]
+version = "1.0.103"
+features = ["derive"]
 optional = true
+[dev-dependencies.bincode]
+version = "1.2.1"
+
 [dev-dependencies.rand_hc]
-version = "0.2"
+version = "0.3.0"
 
 [dev-dependencies.rand_pcg]
-version = "0.2"
+version = "0.3.0"
 
 [features]
 alloc = ["rand_core/alloc"]
-default = ["std"]
-getrandom = ["getrandom_package", "rand_core/getrandom"]
-nightly = ["simd_support"]
-serde1 = []
+default = ["std", "std_rng"]
+getrandom = ["rand_core/getrandom"]
+min_const_gen = []
+nightly = []
+serde1 = ["serde", "rand_core/serde1"]
 simd_support = ["packed_simd"]
-small_rng = ["rand_pcg"]
+small_rng = []
 std = ["rand_core/std", "rand_chacha/std", "alloc", "getrandom", "libc"]
-stdweb = ["getrandom_package/stdweb"]
-wasm-bindgen = ["getrandom_package/wasm-bindgen"]
+std_rng = ["rand_chacha", "rand_hc"]
 [target."cfg(not(target_os = \"emscripten\"))".dependencies.rand_chacha]
-version = "0.2.1"
+version = "0.3.0"
+optional = true
 default-features = false
 [target."cfg(target_os = \"emscripten\")".dependencies.rand_hc]
-version = "0.2"
+version = "0.3.0"
+optional = true
 [target."cfg(unix)".dependencies.libc]
 version = "0.2.22"
 optional = true
 default-features = false
-[badges.appveyor]
-repository = "rust-random/rand"
-
-[badges.travis-ci]
-repository = "rust-random/rand"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -8,6 +8,89 @@
 
 You may also find the [Upgrade Guide](https://rust-random.github.io/book/update.html) useful.
 
+## [0.8.4] - 2021-06-15
+### Additions
+- Use const-generics to support arrays of all sizes (#1104)
+- Implement `Clone` and `Copy` for `Alphanumeric` (#1126)
+- Add `Distribution::map` to derive a distribution using a closure (#1129)
+- Add `Slice` distribution (#1107)
+- Add `DistString` trait with impls for `Standard` and `Alphanumeric` (#1133)
+
+### Other
+- Reorder asserts in `Uniform` float distributions for easier debugging of non-finite arguments
+  (#1094, #1108)
+- Add range overflow check in `Uniform` float distributions (#1108)
+- Deprecate `rngs::adapter::ReadRng` (#1130)
+
+## [0.8.3] - 2021-01-25
+### Fixes
+- Fix `no-std` + `alloc` build by gating `choose_multiple_weighted` on `std` (#1088)
+
+## [0.8.2] - 2021-01-12
+### Fixes
+- Fix panic in `UniformInt::sample_single_inclusive` and `Rng::gen_range` when
+  providing a full integer range (eg `0..=MAX`) (#1087)
+
+## [0.8.1] - 2020-12-31
+### Other
+- Enable all stable features in the playground (#1081)
+
+## [0.8.0] - 2020-12-18
+### Platform support
+- The minimum supported Rust version is now 1.36 (#1011)
+- `getrandom` updated to v0.2 (#1041)
+- Remove `wasm-bindgen` and `stdweb` feature flags. For details of WASM support,
+  see the [getrandom documentation](https://docs.rs/getrandom/latest). (#948)
+- `ReadRng::next_u32` and `next_u64` now use little-Endian conversion instead
+  of native-Endian, affecting results on Big-Endian platforms (#1061)
+- The `nightly` feature no longer implies the `simd_support` feature (#1048)
+- Fix `simd_support` feature to work on current nightlies (#1056)
+
+### Rngs
+- `ThreadRng` is no longer `Copy` to enable safe usage within thread-local destructors (#1035)
+- `gen_range(a, b)` was replaced with `gen_range(a..b)`. `gen_range(a..=b)` is
+  also supported. Note that `a` and `b` can no longer be references or SIMD types. (#744, #1003)
+- Replace `AsByteSliceMut` with `Fill` and add support for `[bool], [char], [f32], [f64]` (#940)
+- Restrict `rand::rngs::adapter` to `std` (#1027; see also #928)
+- `StdRng`: add new `std_rng` feature flag (enabled by default, but might need
+  to be used if disabling default crate features) (#948)
+- `StdRng`: Switch from ChaCha20 to ChaCha12 for better performance (#1028)
+- `SmallRng`: Replace PCG algorithm with xoshiro{128,256}++ (#1038)
+
+### Sequences
+- Add `IteratorRandom::choose_stable` as an alternative to `choose` which does
+  not depend on size hints (#1057)
+- Improve accuracy and performance of `IteratorRandom::choose` (#1059)
+- Implement `IntoIterator` for `IndexVec`, replacing the `into_iter` method (#1007)
+- Add value stability tests for `seq` module (#933)
+
+### Misc
+- Support `PartialEq` and `Eq` for `StdRng`, `SmallRng` and `StepRng` (#979)
+- Added a `serde1` feature and added Serialize/Deserialize to `UniformInt` and `WeightedIndex` (#974)
+- Drop some unsafe code (#962, #963, #1011)
+- Reduce packaged crate size (#983)
+- Migrate to GitHub Actions from Travis+AppVeyor (#1073)
+
+### Distributions
+- `Alphanumeric` samples bytes instead of chars (#935)
+- `Uniform` now supports `char`, enabling `rng.gen_range('A'..='Z')` (#1068)
+- Add `UniformSampler::sample_single_inclusive` (#1003)
+
+#### Weighted sampling
+- Implement weighted sampling without replacement (#976, #1013)
+- `rand::distributions::alias_method::WeightedIndex` was moved to `rand_distr::WeightedAliasIndex`.
+  The simpler alternative `rand::distribution::WeightedIndex` remains. (#945)
+- Improve treatment of rounding errors in `WeightedIndex::update_weights` (#956)
+- `WeightedIndex`: return error on NaN instead of panic (#1005)
+
+### Documentation
+- Document types supported by `random` (#994)
+- Document notes on password generation (#995)
+- Note that `SmallRng` may not be the best choice for performance and in some
+  other cases (#1038)
+- Use `doc(cfg)` to annotate feature-gated items (#1019)
+- Adjust README (#1065)
+
 ## [0.7.3] - 2020-01-10
 ### Fixes
 - The `Bernoulli` distribution constructors now reports an error on NaN and on
@@ -40,7 +123,7 @@
 - Fix or squelch issues from Clippy lints (#840)
 
 ### Additions
-- Add a `no_std` target to CI to continously evaluate `no_std` status (#844)
+- Add a `no_std` target to CI to continuously evaluate `no_std` status (#844)
 - `WeightedIndex`: allow adjusting a sub-set of weights (#866)
 
 ## [0.7.0] - 2019-06-28
@@ -400,7 +483,7 @@
 
 ## [0.3.14] - 2016-02-13
 ### Fixed
-- Inline definitions from winapi/advapi32, wich decreases build times
+- Inline definitions from winapi/advapi32, which decreases build times
 
 
 ## [0.3.13] - 2016-01-09
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/examples/monte-carlo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/examples/monte-carlo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/examples/monte-carlo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/examples/monte-carlo.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2013-2018 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! # Monte Carlo estimation of π
-//!
-//! Imagine that we have a square with sides of length 2 and a unit circle
-//! (radius = 1), both centered at the origin. The areas are:
-//!
-//! ```text
-//!     area of circle  = πr² = π * r * r = π
-//!     area of square  = 2² = 4
-//! ```
-//!
-//! The circle is entirely within the square, so if we sample many points
-//! randomly from the square, roughly π / 4 of them should be inside the circle.
-//!
-//! We can use the above fact to estimate the value of π: pick many points in
-//! the square at random, calculate the fraction that fall within the circle,
-//! and multiply this fraction by 4.
-
-#![cfg(feature = "std")]
-
-use rand::distributions::{Distribution, Uniform};
-
-fn main() {
-    let range = Uniform::new(-1.0f64, 1.0);
-    let mut rng = rand::thread_rng();
-
-    let total = 1_000_000;
-    let mut in_circle = 0;
-
-    for _ in 0..total {
-        let a = range.sample(&mut rng);
-        let b = range.sample(&mut rng);
-        if a * a + b * b <= 1.0 {
-            in_circle += 1;
-        }
-    }
-
-    // prints something close to 3.14159...
-    println!(
-        "Ï€ is approximately {}",
-        4. * (in_circle as f64) / (total as f64)
-    );
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/examples/monty-hall.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/examples/monty-hall.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/examples/monty-hall.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/examples/monty-hall.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2013-2018 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! ## Monty Hall Problem
-//!
-//! This is a simulation of the [Monty Hall Problem][]:
-//!
-//! > Suppose you're on a game show, and you're given the choice of three doors:
-//! > Behind one door is a car; behind the others, goats. You pick a door, say
-//! > No. 1, and the host, who knows what's behind the doors, opens another
-//! > door, say No. 3, which has a goat. He then says to you, "Do you want to
-//! > pick door No. 2?" Is it to your advantage to switch your choice?
-//!
-//! The rather unintuitive answer is that you will have a 2/3 chance of winning
-//! if you switch and a 1/3 chance of winning if you don't, so it's better to
-//! switch.
-//!
-//! This program will simulate the game show and with large enough simulation
-//! steps it will indeed confirm that it is better to switch.
-//!
-//! [Monty Hall Problem]: https://en.wikipedia.org/wiki/Monty_Hall_problem
-
-#![cfg(feature = "std")]
-
-use rand::distributions::{Distribution, Uniform};
-use rand::Rng;
-
-struct SimulationResult {
-    win: bool,
-    switch: bool,
-}
-
-// Run a single simulation of the Monty Hall problem.
-fn simulate<R: Rng>(random_door: &Uniform<u32>, rng: &mut R) -> SimulationResult {
-    let car = random_door.sample(rng);
-
-    // This is our initial choice
-    let mut choice = random_door.sample(rng);
-
-    // The game host opens a door
-    let open = game_host_open(car, choice, rng);
-
-    // Shall we switch?
-    let switch = rng.gen();
-    if switch {
-        choice = switch_door(choice, open);
-    }
-
-    SimulationResult {
-        win: choice == car,
-        switch,
-    }
-}
-
-// Returns the door the game host opens given our choice and knowledge of
-// where the car is. The game host will never open the door with the car.
-fn game_host_open<R: Rng>(car: u32, choice: u32, rng: &mut R) -> u32 {
-    use rand::seq::SliceRandom;
-    *free_doors(&[car, choice]).choose(rng).unwrap()
-}
-
-// Returns the door we switch to, given our current choice and
-// the open door. There will only be one valid door.
-fn switch_door(choice: u32, open: u32) -> u32 {
-    free_doors(&[choice, open])[0]
-}
-
-fn free_doors(blocked: &[u32]) -> Vec<u32> {
-    (0..3).filter(|x| !blocked.contains(x)).collect()
-}
-
-fn main() {
-    // The estimation will be more accurate with more simulations
-    let num_simulations = 10000;
-
-    let mut rng = rand::thread_rng();
-    let random_door = Uniform::new(0u32, 3);
-
-    let (mut switch_wins, mut switch_losses) = (0, 0);
-    let (mut keep_wins, mut keep_losses) = (0, 0);
-
-    println!("Running {} simulations...", num_simulations);
-    for _ in 0..num_simulations {
-        let result = simulate(&random_door, &mut rng);
-
-        match (result.win, result.switch) {
-            (true, true) => switch_wins += 1,
-            (true, false) => keep_wins += 1,
-            (false, true) => switch_losses += 1,
-            (false, false) => keep_losses += 1,
-        }
-    }
-
-    let total_switches = switch_wins + switch_losses;
-    let total_keeps = keep_wins + keep_losses;
-
-    println!(
-        "Switched door {} times with {} wins and {} losses",
-        total_switches, switch_wins, switch_losses
-    );
-
-    println!(
-        "Kept our choice {} times with {} wins and {} losses",
-        total_keeps, keep_wins, keep_losses
-    );
-
-    // With a large number of simulations, the values should converge to
-    // 0.667 and 0.333 respectively.
-    println!(
-        "Estimated chance to win if we switch: {}",
-        switch_wins as f32 / total_switches as f32
-    );
-    println!(
-        "Estimated chance to win if we don't: {}",
-        keep_wins as f32 / total_keeps as f32
-    );
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,47 @@
 # Rand
 
-[![Build Status](https://travis-ci.org/rust-random/rand.svg?branch=master)](https://travis-ci.org/rust-random/rand)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
+[![Test Status](https://github.com/rust-random/rand/workflows/Tests/badge.svg?event=push)](https://github.com/rust-random/rand/actions)
 [![Crate](https://img.shields.io/crates/v/rand.svg)](https://crates.io/crates/rand)
 [![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
-[![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand)
+[![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand)
 [![API](https://docs.rs/rand/badge.svg)](https://docs.rs/rand)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.32+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.36+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
 
-A Rust library for random number generation.
+A Rust library for random number generation, featuring:
 
-Rand provides utilities to generate random numbers, to convert them to useful
-types and distributions, and some randomness-related algorithms.
-
-The core random number generation traits of Rand live in the [rand_core](
-https://crates.io/crates/rand_core) crate but are also exposed here; RNG
-implementations should prefer to use `rand_core` while most other users should
-depend on `rand`.
+-   Easy random value generation and usage via the [`Rng`](https://docs.rs/rand/*/rand/trait.Rng.html),
+    [`SliceRandom`](https://docs.rs/rand/*/rand/seq/trait.SliceRandom.html) and
+    [`IteratorRandom`](https://docs.rs/rand/*/rand/seq/trait.IteratorRandom.html) traits
+-   Secure seeding via the [`getrandom` crate](https://crates.io/crates/getrandom)
+    and fast, convenient generation via [`thread_rng`](https://docs.rs/rand/*/rand/fn.thread_rng.html)
+-   A modular design built over [`rand_core`](https://crates.io/crates/rand_core)
+    ([see the book](https://rust-random.github.io/book/crates.html))
+-   Fast implementations of the best-in-class [cryptographic](https://rust-random.github.io/book/guide-rngs.html#cryptographically-secure-pseudo-random-number-generators-csprngs) and
+    [non-cryptographic](https://rust-random.github.io/book/guide-rngs.html#basic-pseudo-random-number-generators-prngs) generators
+-   A flexible [`distributions`](https://docs.rs/rand/*/rand/distributions/index.html) module
+-   Samplers for a large number of random number distributions via our own
+    [`rand_distr`](https://docs.rs/rand_distr) and via
+    the [`statrs`](https://docs.rs/statrs/0.13.0/statrs/)
+-   [Portably reproducible output](https://rust-random.github.io/book/portability.html)
+-   `#[no_std]` compatibility (partial)
+-   *Many* performance optimisations
+
+It's also worth pointing out what `rand` *is not*:
+
+-   Small. Most low-level crates are small, but the higher-level `rand` and
+    `rand_distr` each contain a lot of functionality.
+-   Simple (implementation). We have a strong focus on correctness, speed and flexibility, but
+    not simplicity. If you prefer a small-and-simple library, there are
+    alternatives including [fastrand](https://crates.io/crates/fastrand)
+    and [oorandom](https://crates.io/crates/oorandom).
+-   Slow. We take performance seriously, with considerations also for set-up
+    time of new distributions, commonly-used parameters, and parameters of the
+    current sampler.
 
 Documentation:
+
 -   [The Rust Rand Book](https://rust-random.github.io/book)
--   [API reference (master)](https://rust-random.github.io/rand)
+-   [API reference (master branch)](https://rust-random.github.io/rand)
 -   [API reference (docs.rs)](https://docs.rs/rand)
 
 
@@ -30,7 +51,7 @@
 
 ```toml
 [dependencies]
-rand = "0.7"
+rand = "0.8.0"
 ```
 
 To get started using Rand, see [The Book](https://rust-random.github.io/book).
@@ -38,35 +59,36 @@
 
 ## Versions
 
-Rand libs have inter-dependencies and make use of the
-[semver trick](https://github.com/dtolnay/semver-trick/) in order to make traits
-compatible across crate versions. (This is especially important for `RngCore`
-and `SeedableRng`.) A few crate releases are thus compatibility shims,
-depending on the *next* lib version (e.g. `rand_core` versions `0.2.2` and
-`0.3.1`). This means, for example, that `rand_core_0_4_0::SeedableRng` and
-`rand_core_0_3_0::SeedableRng` are distinct, incompatible traits, which can
-cause build errors. Usually, running `cargo update` is enough to fix any issues.
+Rand is *mature* (suitable for general usage, with infrequent breaking releases
+which minimise breakage) but not yet at 1.0. We maintain compatibility with
+pinned versions of the Rust compiler (see below).
 
-The Rand lib is not yet stable, however we are careful to limit breaking changes
-and warn via deprecation wherever possible. Patch versions never introduce
-breaking changes. The following minor versions are supported:
+Current Rand versions are:
 
 -   Version 0.7 was released in June 2019, moving most non-uniform distributions
     to an external crate, moving `from_entropy` to `SeedableRng`, and many small
     changes and fixes.
--   Version 0.6 was released in November 2018, redesigning the `seq` module,
-    moving most PRNGs to external crates, and many small changes.
--   Version 0.5 was released in May 2018, as a major reorganisation
-    (introducing `RngCore` and `rand_core`, and deprecating `Rand` and the
-    previous distribution traits).
--   Version 0.4 was released in December 2017, but contained almost no breaking
-    changes from the 0.3 series.
+-   Version 0.8 was released in December 2020 with many small changes.
 
-A detailed [changelog](CHANGELOG.md) is available.
+A detailed [changelog](CHANGELOG.md) is available for releases.
 
 When upgrading to the next minor series (especially 0.4 → 0.5), we recommend
 reading the [Upgrade Guide](https://rust-random.github.io/book/update.html).
 
+Rand has not yet reached 1.0 implying some breaking changes may arrive in the
+future ([SemVer](https://semver.org/) allows each 0.x.0 release to include
+breaking changes), but is considered *mature*: breaking changes are minimised
+and breaking releases are infrequent.
+
+Rand libs have inter-dependencies and make use of the
+[semver trick](https://github.com/dtolnay/semver-trick/) in order to make traits
+compatible across crate versions. (This is especially important for `RngCore`
+and `SeedableRng`.) A few crate releases are thus compatibility shims,
+depending on the *next* lib version (e.g. `rand_core` versions `0.2.2` and
+`0.3.1`). This means, for example, that `rand_core_0_4_0::SeedableRng` and
+`rand_core_0_3_0::SeedableRng` are distinct, incompatible traits, which can
+cause build errors. Usually, running `cargo update` is enough to fix any issues.
+
 ### Yanked versions
 
 Some versions of Rand crates have been yanked ("unreleased"). Where this occurs,
@@ -75,14 +97,14 @@
 
 ### Rust version requirements
 
-Since version 0.7, Rand requires **Rustc version 1.32 or greater**.
-Rand 0.5 requires Rustc 1.22 or greater while versions
-0.4 and 0.3 (since approx. June 2017) require Rustc version 1.15 or
-greater. Subsets of the Rand code may work with older Rust versions, but this
-is not supported.
+Since version 0.8, Rand requires **Rustc version 1.36 or greater**.
+Rand 0.7 requires Rustc 1.32 or greater while versions 0.5 require Rustc 1.22 or
+greater, and 0.4 and 0.3 (since approx. June 2017) require Rustc version 1.15 or
+greater. Subsets of the Rand code may work with older Rust versions, but this is
+not supported.
 
-Travis CI always has a build with a pinned version of Rustc matching the oldest
-supported Rust release. The current policy is that this can be updated in any
+Continuous Integration (CI) will always test the minimum supported Rustc version
+(the MSRV). The current policy is that this can be updated in any
 Rand release if required, but the change must be noted in the changelog.
 
 ## Crate Features
@@ -90,26 +112,26 @@
 Rand is built with these features enabled by default:
 
 -   `std` enables functionality dependent on the `std` lib
--   `alloc` (implied by `std`) enables functionality requiring an allocator (when using this feature in `no_std`, Rand requires Rustc version 1.36 or greater)
+-   `alloc` (implied by `std`) enables functionality requiring an allocator
 -   `getrandom` (implied by `std`) is an optional dependency providing the code
     behind `rngs::OsRng`
+-   `std_rng` enables inclusion of `StdRng`, `thread_rng` and `random`
+    (the latter two *also* require that `std` be enabled)
 
 Optionally, the following dependencies can be enabled:
 
--   `log` enables logging via the `log` crate
--   `stdweb` implies `getrandom/stdweb` to enable
-    `getrandom` support on `wasm32-unknown-unknown`
-    (will be removed in rand 0.8; activate via `getrandom` crate instead)
--   `wasm-bindgen` implies `getrandom/wasm-bindgen` to enable
-    `getrandom` support on `wasm32-unknown-unknown`
-    (will be removed in rand 0.8; activate via `getrandom` crate instead)
+-   `log` enables logging via the `log` crate` crate
 
 Additionally, these features configure Rand:
 
 -   `small_rng` enables inclusion of the `SmallRng` PRNG
--   `nightly` enables all experimental features
+-   `nightly` enables some optimizations requiring nightly Rust
 -   `simd_support` (experimental) enables sampling of SIMD values
-    (uniformly random SIMD integers and floats)
+    (uniformly random SIMD integers and floats), requiring nightly Rust
+
+Note that nightly features are not stable and therefore not all library and
+compiler versions will be compatible. This is especially true of Rand's
+experimental `simd_support` feature.
 
 Rand supports limited functionality in `no_std` mode (enabled via
 `default-features = false`). In this case, `OsRng` and `from_entropy` are
@@ -117,6 +139,14 @@
 unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
 unavailable.
 
+### WASM support
+
+The WASM target `wasm32-unknown-unknown` is not *automatically* supported by
+`rand` or `getrandom`. To solve this, either use a different target such as
+`wasm32-wasi` or add a direct dependancy on `getrandom` with the `js` feature
+(if the target supports JavaScript). See
+[getrandom#WebAssembly support](https://docs.rs/getrandom/latest/getrandom/#webassembly-support).
+
 # License
 
 Rand is distributed under the terms of both the MIT license and the
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# This rustfmt file is added for configuration, but in practice much of our
-# code is hand-formatted, frequently with more readable results.
-
-# Comments:
-normalize_comments = true
-wrap_comments = false
-comment_width = 90      # small excess is okay but prefer 80
-
-# Arguments:
-use_small_heuristics = "Default"
-# TODO: single line functions only where short, please?
-# https://github.com/rust-lang/rustfmt/issues/3358
-fn_single_line = false
-fn_args_layout = "Compressed"
-overflow_delimited_expr = true
-where_single_line = true
-
-# enum_discrim_align_threshold = 20
-# struct_field_align_threshold = 20
-
-# Compatibility:
-edition = "2018"        # we require compatibility back to 1.32.0
-
-# Misc:
-inline_attribute_width = 80
-blank_lines_upper_bound = 2
-reorder_impl_items = true
-# report_todo = "Unnumbered"
-# report_fixme = "Unnumbered"
-
-# Ignored files:
-ignore = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/SECURITY.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/SECURITY.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/SECURITY.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/SECURITY.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-# Security Policy
-
-## No guarantees
-
-Support is provided on a best-effort bases only.
-No binding guarantees can be provided.
-
-## Security premises
-
-Rand provides the trait `rand_core::CryptoRng` aka `rand::CryptoRng` as a marker
-trait. Generators implementating `RngCore` *and* `CryptoRng`, and given the
-additional constraints that:
-
--   Instances of seedable RNGs (those implementing `SeedableRng`) are
-    constructed with cryptographically secure seed values
--   The state (memory) of the RNG and its seed value are not be exposed
-
-are expected to provide the following:
-
--   An attacker can gain no advantage over chance (50% for each bit) in
-    predicting the RNG output, even with full knowledge of all prior outputs.
-
-For some RNGs, notably `OsRng`, `ThreadRng` and those wrapped by `ReseedingRng`,
-we provide limited mitigations against side-channel attacks:
-
--   After a process fork on Unix, there is an upper-bound on the number of bits
-    output by the RNG before the processes diverge, after which outputs from
-    each process's RNG are uncorrelated
--   After the state (memory) of an RNG is leaked, there is an upper-bound on the
-    number of bits of output by the RNG before prediction of output by an
-    observer again becomes computationally-infeasible
-
-Additionally, derivations from such an RNG (including the `Rng` trait,
-implementations of the `Distribution` trait, and `seq` algorithms) should not
-introduce signficant bias other than that expected from the operation in
-question (e.g. bias from a weighted distribution).
-
-## Supported Versions
-
-We will attempt to uphold these premises in the following crate versions,
-provided that only the latest patch version is used, and with potential
-exceptions for theoretical issues without a known exploit:
-
-| Crate | Versions | Exceptions |
-| ----- | -------- | ---------- |
-| `rand` | 0.7 |  |
-| `rand` | 0.5, 0.6 | Jitter |
-| `rand` | 0.4 | Jitter, ISAAC |
-| `rand_core` | 0.2 - 0.5 | |
-| `rand_chacha` | 0.1 - 0.2 | |
-| `rand_hc` | 0.1 - 0.2 | |
-
-Explanation of exceptions:
-
--   Jitter: `JitterRng` is used as an entropy source when the primary source
-    fails; this source may not be secure against side-channel attacks, see #699.
--   ISAAC: the [ISAAC](https://burtleburtle.net/bob/rand/isaacafa.html) RNG used
-    to implement `thread_rng` is difficult to analyse and thus cannot provide
-    strong assertions of security.
-
-## Known issues
-
-In `rand` version 0.3 (0.3.18 and later), if `OsRng` fails, `thread_rng` is
-seeded from the system time in an insecure manner.
-
-## Reporting a Vulnerability
-
-To report a vulnerability, [open a new issue](https://github.com/rust-random/rand/issues/new).
-Once the issue is resolved, the vulnerability should be [reported to RustSec](https://github.com/RustSec/advisory-db/blob/master/CONTRIBUTING.md).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/bernoulli.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/bernoulli.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/bernoulli.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/bernoulli.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,6 +12,8 @@
 use crate::Rng;
 use core::{fmt, u64};
 
+#[cfg(feature = "serde1")]
+use serde::{Serialize, Deserialize};
 /// The Bernoulli distribution.
 ///
 /// This is a special case of the Binomial distribution where `n = 1`.
@@ -32,6 +34,7 @@
 /// so only probabilities that are multiples of 2<sup>-64</sup> can be
 /// represented.
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct Bernoulli {
     /// Probability of success, relative to the maximal integer.
     p_int: u64,
@@ -93,7 +96,7 @@
     /// 2<sup>-64</sup> in `[0, 1]` can be represented as a `f64`.)
     #[inline]
     pub fn new(p: f64) -> Result<Bernoulli, BernoulliError> {
-        if !(p >= 0.0 && p < 1.0) {
+        if !(0.0..1.0).contains(&p) {
             if p == 1.0 {
                 return Ok(Bernoulli { p_int: ALWAYS_TRUE });
             }
@@ -144,7 +147,19 @@
     use crate::Rng;
 
     #[test]
+    #[cfg(feature="serde1")]
+    fn test_serializing_deserializing_bernoulli() {
+        let coin_flip = Bernoulli::new(0.5).unwrap();
+        let de_coin_flip : Bernoulli = bincode::deserialize(&bincode::serialize(&coin_flip).unwrap()).unwrap();
+
+        assert_eq!(coin_flip.p_int, de_coin_flip.p_int);
+    }
+
+    #[test]
     fn test_trivial() {
+        // We prefer to be explicit here.
+        #![allow(clippy::bool_assert_comparison)]
+
         let mut r = crate::test::rng(1);
         let always_false = Bernoulli::new(0.0).unwrap();
         let always_true = Bernoulli::new(1.0).unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/binomial.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/binomial.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/binomial.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/binomial.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,321 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2016-2017 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The binomial distribution.
-#![allow(deprecated)]
-#![allow(clippy::all)]
-
-use crate::distributions::{Distribution, Uniform};
-use crate::Rng;
-
-/// The binomial distribution `Binomial(n, p)`.
-///
-/// This distribution has density function:
-/// `f(k) = n!/(k! (n-k)!) p^k (1-p)^(n-k)` for `k >= 0`.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Binomial {
-    /// Number of trials.
-    n: u64,
-    /// Probability of success.
-    p: f64,
-}
-
-impl Binomial {
-    /// Construct a new `Binomial` with the given shape parameters `n` (number
-    /// of trials) and `p` (probability of success).
-    ///
-    /// Panics if `p < 0` or `p > 1`.
-    pub fn new(n: u64, p: f64) -> Binomial {
-        assert!(p >= 0.0, "Binomial::new called with p < 0");
-        assert!(p <= 1.0, "Binomial::new called with p > 1");
-        Binomial { n, p }
-    }
-}
-
-/// Convert a `f64` to an `i64`, panicing on overflow.
-// In the future (Rust 1.34), this might be replaced with `TryFrom`.
-fn f64_to_i64(x: f64) -> i64 {
-    assert!(x < (::std::i64::MAX as f64));
-    x as i64
-}
-
-impl Distribution<u64> for Binomial {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u64 {
-        // Handle these values directly.
-        if self.p == 0.0 {
-            return 0;
-        } else if self.p == 1.0 {
-            return self.n;
-        }
-
-        // The binomial distribution is symmetrical with respect to p -> 1-p,
-        // k -> n-k switch p so that it is less than 0.5 - this allows for lower
-        // expected values we will just invert the result at the end
-        let p = if self.p <= 0.5 { self.p } else { 1.0 - self.p };
-
-        let result;
-        let q = 1. - p;
-
-        // For small n * min(p, 1 - p), the BINV algorithm based on the inverse
-        // transformation of the binomial distribution is efficient. Otherwise,
-        // the BTPE algorithm is used.
-        //
-        // Voratas Kachitvichyanukul and Bruce W. Schmeiser. 1988. Binomial
-        // random variate generation. Commun. ACM 31, 2 (February 1988),
-        // 216-222. http://dx.doi.org/10.1145/42372.42381
-
-        // Threshold for prefering the BINV algorithm. The paper suggests 10,
-        // Ranlib uses 30, and GSL uses 14.
-        const BINV_THRESHOLD: f64 = 10.;
-
-        if (self.n as f64) * p < BINV_THRESHOLD && self.n <= (::std::i32::MAX as u64) {
-            // Use the BINV algorithm.
-            let s = p / q;
-            let a = ((self.n + 1) as f64) * s;
-            let mut r = q.powi(self.n as i32);
-            let mut u: f64 = rng.gen();
-            let mut x = 0;
-            while u > r as f64 {
-                u -= r;
-                x += 1;
-                r *= a / (x as f64) - s;
-            }
-            result = x;
-        } else {
-            // Use the BTPE algorithm.
-
-            // Threshold for using the squeeze algorithm. This can be freely
-            // chosen based on performance. Ranlib and GSL use 20.
-            const SQUEEZE_THRESHOLD: i64 = 20;
-
-            // Step 0: Calculate constants as functions of `n` and `p`.
-            let n = self.n as f64;
-            let np = n * p;
-            let npq = np * q;
-            let f_m = np + p;
-            let m = f64_to_i64(f_m);
-            // radius of triangle region, since height=1 also area of region
-            let p1 = (2.195 * npq.sqrt() - 4.6 * q).floor() + 0.5;
-            // tip of triangle
-            let x_m = (m as f64) + 0.5;
-            // left edge of triangle
-            let x_l = x_m - p1;
-            // right edge of triangle
-            let x_r = x_m + p1;
-            let c = 0.134 + 20.5 / (15.3 + (m as f64));
-            // p1 + area of parallelogram region
-            let p2 = p1 * (1. + 2. * c);
-
-            fn lambda(a: f64) -> f64 {
-                a * (1. + 0.5 * a)
-            }
-
-            let lambda_l = lambda((f_m - x_l) / (f_m - x_l * p));
-            let lambda_r = lambda((x_r - f_m) / (x_r * q));
-            // p1 + area of left tail
-            let p3 = p2 + c / lambda_l;
-            // p1 + area of right tail
-            let p4 = p3 + c / lambda_r;
-
-            // return value
-            let mut y: i64;
-
-            let gen_u = Uniform::new(0., p4);
-            let gen_v = Uniform::new(0., 1.);
-
-            loop {
-                // Step 1: Generate `u` for selecting the region. If region 1 is
-                // selected, generate a triangularly distributed variate.
-                let u = gen_u.sample(rng);
-                let mut v = gen_v.sample(rng);
-                if !(u > p1) {
-                    y = f64_to_i64(x_m - p1 * v + u);
-                    break;
-                }
-
-                if !(u > p2) {
-                    // Step 2: Region 2, parallelograms. Check if region 2 is
-                    // used. If so, generate `y`.
-                    let x = x_l + (u - p1) / c;
-                    v = v * c + 1.0 - (x - x_m).abs() / p1;
-                    if v > 1. {
-                        continue;
-                    } else {
-                        y = f64_to_i64(x);
-                    }
-                } else if !(u > p3) {
-                    // Step 3: Region 3, left exponential tail.
-                    y = f64_to_i64(x_l + v.ln() / lambda_l);
-                    if y < 0 {
-                        continue;
-                    } else {
-                        v *= (u - p2) * lambda_l;
-                    }
-                } else {
-                    // Step 4: Region 4, right exponential tail.
-                    y = f64_to_i64(x_r - v.ln() / lambda_r);
-                    if y > 0 && (y as u64) > self.n {
-                        continue;
-                    } else {
-                        v *= (u - p3) * lambda_r;
-                    }
-                }
-
-                // Step 5: Acceptance/rejection comparison.
-
-                // Step 5.0: Test for appropriate method of evaluating f(y).
-                let k = (y - m).abs();
-                if !(k > SQUEEZE_THRESHOLD && (k as f64) < 0.5 * npq - 1.) {
-                    // Step 5.1: Evaluate f(y) via the recursive relationship. Start the
-                    // search from the mode.
-                    let s = p / q;
-                    let a = s * (n + 1.);
-                    let mut f = 1.0;
-                    if m < y {
-                        let mut i = m;
-                        loop {
-                            i += 1;
-                            f *= a / (i as f64) - s;
-                            if i == y {
-                                break;
-                            }
-                        }
-                    } else if m > y {
-                        let mut i = y;
-                        loop {
-                            i += 1;
-                            f /= a / (i as f64) - s;
-                            if i == m {
-                                break;
-                            }
-                        }
-                    }
-                    if v > f {
-                        continue;
-                    } else {
-                        break;
-                    }
-                }
-
-                // Step 5.2: Squeezing. Check the value of ln(v) againts upper and
-                // lower bound of ln(f(y)).
-                let k = k as f64;
-                let rho = (k / npq) * ((k * (k / 3. + 0.625) + 1. / 6.) / npq + 0.5);
-                let t = -0.5 * k * k / npq;
-                let alpha = v.ln();
-                if alpha < t - rho {
-                    break;
-                }
-                if alpha > t + rho {
-                    continue;
-                }
-
-                // Step 5.3: Final acceptance/rejection test.
-                let x1 = (y + 1) as f64;
-                let f1 = (m + 1) as f64;
-                let z = (f64_to_i64(n) + 1 - m) as f64;
-                let w = (f64_to_i64(n) - y + 1) as f64;
-
-                fn stirling(a: f64) -> f64 {
-                    let a2 = a * a;
-                    (13860. - (462. - (132. - (99. - 140. / a2) / a2) / a2) / a2) / a / 166320.
-                }
-
-                if alpha
-                        > x_m * (f1 / x1).ln()
-                        + (n - (m as f64) + 0.5) * (z / w).ln()
-                        + ((y - m) as f64) * (w * p / (x1 * q)).ln()
-                        // We use the signs from the GSL implementation, which are
-                        // different than the ones in the reference. According to
-                        // the GSL authors, the new signs were verified to be
-                        // correct by one of the original designers of the
-                        // algorithm.
-                        + stirling(f1)
-                        + stirling(z)
-                        - stirling(x1)
-                        - stirling(w)
-                {
-                    continue;
-                }
-
-                break;
-            }
-            assert!(y >= 0);
-            result = y as u64;
-        }
-
-        // Invert the result for p < 0.5.
-        if p != self.p {
-            self.n - result
-        } else {
-            result
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::Binomial;
-    use crate::distributions::Distribution;
-    use crate::Rng;
-
-    fn test_binomial_mean_and_variance<R: Rng>(n: u64, p: f64, rng: &mut R) {
-        let binomial = Binomial::new(n, p);
-
-        let expected_mean = n as f64 * p;
-        let expected_variance = n as f64 * p * (1.0 - p);
-
-        let mut results = [0.0; 1000];
-        for i in results.iter_mut() {
-            *i = binomial.sample(rng) as f64;
-        }
-
-        let mean = results.iter().sum::<f64>() / results.len() as f64;
-        assert!(
-            (mean as f64 - expected_mean).abs() < expected_mean / 50.0,
-            "mean: {}, expected_mean: {}",
-            mean,
-            expected_mean
-        );
-
-        let variance =
-            results.iter().map(|x| (x - mean) * (x - mean)).sum::<f64>() / results.len() as f64;
-        assert!(
-            (variance - expected_variance).abs() < expected_variance / 10.0,
-            "variance: {}, expected_variance: {}",
-            variance,
-            expected_variance
-        );
-    }
-
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_binomial() {
-        let mut rng = crate::test::rng(351);
-        test_binomial_mean_and_variance(150, 0.1, &mut rng);
-        test_binomial_mean_and_variance(70, 0.6, &mut rng);
-        test_binomial_mean_and_variance(40, 0.5, &mut rng);
-        test_binomial_mean_and_variance(20, 0.7, &mut rng);
-        test_binomial_mean_and_variance(20, 0.5, &mut rng);
-    }
-
-    #[test]
-    fn test_binomial_end_points() {
-        let mut rng = crate::test::rng(352);
-        assert_eq!(rng.sample(Binomial::new(20, 0.0)), 0);
-        assert_eq!(rng.sample(Binomial::new(20, 1.0)), 20);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_binomial_invalid_lambda_neg() {
-        Binomial::new(20, -10.0);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/cauchy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/cauchy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/cauchy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/cauchy.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2016-2017 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Cauchy distribution.
-#![allow(deprecated)]
-#![allow(clippy::all)]
-
-use crate::distributions::Distribution;
-use crate::Rng;
-use std::f64::consts::PI;
-
-/// The Cauchy distribution `Cauchy(median, scale)`.
-///
-/// This distribution has a density function:
-/// `f(x) = 1 / (pi * scale * (1 + ((x - median) / scale)^2))`
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Cauchy {
-    median: f64,
-    scale: f64,
-}
-
-impl Cauchy {
-    /// Construct a new `Cauchy` with the given shape parameters
-    /// `median` the peak location and `scale` the scale factor.
-    /// Panics if `scale <= 0`.
-    pub fn new(median: f64, scale: f64) -> Cauchy {
-        assert!(scale > 0.0, "Cauchy::new called with scale factor <= 0");
-        Cauchy { median, scale }
-    }
-}
-
-impl Distribution<f64> for Cauchy {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        // sample from [0, 1)
-        let x = rng.gen::<f64>();
-        // get standard cauchy random number
-        // note that π/2 is not exactly representable, even if x=0.5 the result is finite
-        let comp_dev = (PI * x).tan();
-        // shift and scale according to parameters
-        let result = self.median + self.scale * comp_dev;
-        result
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::Cauchy;
-    use crate::distributions::Distribution;
-
-    fn median(mut numbers: &mut [f64]) -> f64 {
-        sort(&mut numbers);
-        let mid = numbers.len() / 2;
-        numbers[mid]
-    }
-
-    fn sort(numbers: &mut [f64]) {
-        numbers.sort_by(|a, b| a.partial_cmp(b).unwrap());
-    }
-
-    #[test]
-    fn test_cauchy_averages() {
-        // NOTE: given that the variance and mean are undefined,
-        // this test does not have any rigorous statistical meaning.
-        let cauchy = Cauchy::new(10.0, 5.0);
-        let mut rng = crate::test::rng(123);
-        let mut numbers: [f64; 1000] = [0.0; 1000];
-        let mut sum = 0.0;
-        for i in 0..1000 {
-            numbers[i] = cauchy.sample(&mut rng);
-            sum += numbers[i];
-        }
-        let median = median(&mut numbers);
-        println!("Cauchy median: {}", median);
-        assert!((median - 10.0).abs() < 0.4); // not 100% certain, but probable enough
-        let mean = sum / 1000.0;
-        println!("Cauchy mean: {}", mean);
-        // for a Cauchy distribution the mean should not converge
-        assert!((mean - 10.0).abs() > 0.4); // not 100% certain, but probable enough
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_cauchy_invalid_scale_zero() {
-        Cauchy::new(0.0, 0.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_cauchy_invalid_scale_neg() {
-        Cauchy::new(0.0, -10.0);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/dirichlet.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/dirichlet.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/dirichlet.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/dirichlet.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2013 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The dirichlet distribution.
-#![allow(deprecated)]
-#![allow(clippy::all)]
-
-use crate::distributions::gamma::Gamma;
-use crate::distributions::Distribution;
-use crate::Rng;
-
-/// The dirichelet distribution `Dirichlet(alpha)`.
-///
-/// The Dirichlet distribution is a family of continuous multivariate
-/// probability distributions parameterized by a vector alpha of positive reals.
-/// It is a multivariate generalization of the beta distribution.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Debug)]
-pub struct Dirichlet {
-    /// Concentration parameters (alpha)
-    alpha: Vec<f64>,
-}
-
-impl Dirichlet {
-    /// Construct a new `Dirichlet` with the given alpha parameter `alpha`.
-    ///
-    /// # Panics
-    /// - if `alpha.len() < 2`
-    #[inline]
-    pub fn new<V: Into<Vec<f64>>>(alpha: V) -> Dirichlet {
-        let a = alpha.into();
-        assert!(a.len() > 1);
-        for i in 0..a.len() {
-            assert!(a[i] > 0.0);
-        }
-
-        Dirichlet { alpha: a }
-    }
-
-    /// Construct a new `Dirichlet` with the given shape parameter `alpha` and `size`.
-    ///
-    /// # Panics
-    /// - if `alpha <= 0.0`
-    /// - if `size < 2`
-    #[inline]
-    pub fn new_with_param(alpha: f64, size: usize) -> Dirichlet {
-        assert!(alpha > 0.0);
-        assert!(size > 1);
-        Dirichlet {
-            alpha: vec![alpha; size],
-        }
-    }
-}
-
-impl Distribution<Vec<f64>> for Dirichlet {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Vec<f64> {
-        let n = self.alpha.len();
-        let mut samples = vec![0.0f64; n];
-        let mut sum = 0.0f64;
-
-        for i in 0..n {
-            let g = Gamma::new(self.alpha[i], 1.0);
-            samples[i] = g.sample(rng);
-            sum += samples[i];
-        }
-        let invacc = 1.0 / sum;
-        for i in 0..n {
-            samples[i] *= invacc;
-        }
-        samples
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::Dirichlet;
-    use crate::distributions::Distribution;
-
-    #[test]
-    fn test_dirichlet() {
-        let d = Dirichlet::new(vec![1.0, 2.0, 3.0]);
-        let mut rng = crate::test::rng(221);
-        let samples = d.sample(&mut rng);
-        let _: Vec<f64> = samples
-            .into_iter()
-            .map(|x| {
-                assert!(x > 0.0);
-                x
-            })
-            .collect();
-    }
-
-    #[test]
-    fn test_dirichlet_with_param() {
-        let alpha = 0.5f64;
-        let size = 2;
-        let d = Dirichlet::new_with_param(alpha, size);
-        let mut rng = crate::test::rng(221);
-        let samples = d.sample(&mut rng);
-        let _: Vec<f64> = samples
-            .into_iter()
-            .map(|x| {
-                assert!(x > 0.0);
-                x
-            })
-            .collect();
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_dirichlet_invalid_length() {
-        Dirichlet::new_with_param(0.5f64, 1);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_dirichlet_invalid_alpha() {
-        Dirichlet::new_with_param(0.0f64, 2);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/distribution.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/distribution.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/distribution.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/distribution.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,272 @@
+// Copyright 2018 Developers of the Rand project.
+// Copyright 2013-2017 The Rust Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Distribution trait and associates
+
+use crate::Rng;
+use core::iter;
+#[cfg(feature = "alloc")]
+use alloc::string::String;
+
+/// Types (distributions) that can be used to create a random instance of `T`.
+///
+/// It is possible to sample from a distribution through both the
+/// `Distribution` and [`Rng`] traits, via `distr.sample(&mut rng)` and
+/// `rng.sample(distr)`. They also both offer the [`sample_iter`] method, which
+/// produces an iterator that samples from the distribution.
+///
+/// All implementations are expected to be immutable; this has the significant
+/// advantage of not needing to consider thread safety, and for most
+/// distributions efficient state-less sampling algorithms are available.
+///
+/// Implementations are typically expected to be portable with reproducible
+/// results when used with a PRNG with fixed seed; see the
+/// [portability chapter](https://rust-random.github.io/book/portability.html)
+/// of The Rust Rand Book. In some cases this does not apply, e.g. the `usize`
+/// type requires different sampling on 32-bit and 64-bit machines.
+///
+/// [`sample_iter`]: Distribution::sample_iter
+pub trait Distribution<T> {
+    /// Generate a random value of `T`, using `rng` as the source of randomness.
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T;
+
+    /// Create an iterator that generates random values of `T`, using `rng` as
+    /// the source of randomness.
+    ///
+    /// Note that this function takes `self` by value. This works since
+    /// `Distribution<T>` is impl'd for `&D` where `D: Distribution<T>`,
+    /// however borrowing is not automatic hence `distr.sample_iter(...)` may
+    /// need to be replaced with `(&distr).sample_iter(...)` to borrow or
+    /// `(&*distr).sample_iter(...)` to reborrow an existing reference.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::thread_rng;
+    /// use rand::distributions::{Distribution, Alphanumeric, Uniform, Standard};
+    ///
+    /// let mut rng = thread_rng();
+    ///
+    /// // Vec of 16 x f32:
+    /// let v: Vec<f32> = Standard.sample_iter(&mut rng).take(16).collect();
+    ///
+    /// // String:
+    /// let s: String = Alphanumeric
+    ///     .sample_iter(&mut rng)
+    ///     .take(7)
+    ///     .map(char::from)
+    ///     .collect();
+    ///
+    /// // Dice-rolling:
+    /// let die_range = Uniform::new_inclusive(1, 6);
+    /// let mut roll_die = die_range.sample_iter(&mut rng);
+    /// while roll_die.next().unwrap() != 6 {
+    ///     println!("Not a 6; rolling again!");
+    /// }
+    /// ```
+    fn sample_iter<R>(self, rng: R) -> DistIter<Self, R, T>
+    where
+        R: Rng,
+        Self: Sized,
+    {
+        DistIter {
+            distr: self,
+            rng,
+            phantom: ::core::marker::PhantomData,
+        }
+    }
+
+    /// Create a distribution of values of 'S' by mapping the output of `Self`
+    /// through the closure `F`
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::thread_rng;
+    /// use rand::distributions::{Distribution, Uniform};
+    ///
+    /// let mut rng = thread_rng();
+    ///
+    /// let die = Uniform::new_inclusive(1, 6);
+    /// let even_number = die.map(|num| num % 2 == 0);
+    /// while !even_number.sample(&mut rng) {
+    ///     println!("Still odd; rolling again!");
+    /// }
+    /// ```
+    fn map<F, S>(self, func: F) -> DistMap<Self, F, T, S>
+    where
+        F: Fn(T) -> S,
+        Self: Sized,
+    {
+        DistMap {
+            distr: self,
+            func,
+            phantom: ::core::marker::PhantomData,
+        }
+    }
+}
+
+impl<'a, T, D: Distribution<T>> Distribution<T> for &'a D {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T {
+        (*self).sample(rng)
+    }
+}
+
+/// An iterator that generates random values of `T` with distribution `D`,
+/// using `R` as the source of randomness.
+///
+/// This `struct` is created by the [`sample_iter`] method on [`Distribution`].
+/// See its documentation for more.
+///
+/// [`sample_iter`]: Distribution::sample_iter
+#[derive(Debug)]
+pub struct DistIter<D, R, T> {
+    distr: D,
+    rng: R,
+    phantom: ::core::marker::PhantomData<T>,
+}
+
+impl<D, R, T> Iterator for DistIter<D, R, T>
+where
+    D: Distribution<T>,
+    R: Rng,
+{
+    type Item = T;
+
+    #[inline(always)]
+    fn next(&mut self) -> Option<T> {
+        // Here, self.rng may be a reference, but we must take &mut anyway.
+        // Even if sample could take an R: Rng by value, we would need to do this
+        // since Rng is not copyable and we cannot enforce that this is "reborrowable".
+        Some(self.distr.sample(&mut self.rng))
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (usize::max_value(), None)
+    }
+}
+
+impl<D, R, T> iter::FusedIterator for DistIter<D, R, T>
+where
+    D: Distribution<T>,
+    R: Rng,
+{
+}
+
+#[cfg(features = "nightly")]
+impl<D, R, T> iter::TrustedLen for DistIter<D, R, T>
+where
+    D: Distribution<T>,
+    R: Rng,
+{
+}
+
+/// A distribution of values of type `S` derived from the distribution `D`
+/// by mapping its output of type `T` through the closure `F`.
+///
+/// This `struct` is created by the [`Distribution::map`] method.
+/// See its documentation for more.
+#[derive(Debug)]
+pub struct DistMap<D, F, T, S> {
+    distr: D,
+    func: F,
+    phantom: ::core::marker::PhantomData<fn(T) -> S>,
+}
+
+impl<D, F, T, S> Distribution<S> for DistMap<D, F, T, S>
+where
+    D: Distribution<T>,
+    F: Fn(T) -> S,
+{
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> S {
+        (self.func)(self.distr.sample(rng))
+    }
+}
+
+/// `String` sampler
+///
+/// Sampling a `String` of random characters is not quite the same as collecting
+/// a sequence of chars. This trait contains some helpers.
+#[cfg(feature = "alloc")]
+pub trait DistString {
+    /// Append `len` random chars to `string`
+    fn append_string<R: Rng + ?Sized>(&self, rng: &mut R, string: &mut String, len: usize);
+
+    /// Generate a `String` of `len` random chars
+    #[inline]
+    fn sample_string<R: Rng + ?Sized>(&self, rng: &mut R, len: usize) -> String {
+        let mut s = String::new();
+        self.append_string(rng, &mut s, len);
+        s
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::distributions::{Alphanumeric, Distribution, Standard, Uniform};
+    use crate::Rng;
+
+    #[test]
+    fn test_distributions_iter() {
+        use crate::distributions::Open01;
+        let mut rng = crate::test::rng(210);
+        let distr = Open01;
+        let mut iter = Distribution::<f32>::sample_iter(distr, &mut rng);
+        let mut sum: f32 = 0.;
+        for _ in 0..100 {
+            sum += iter.next().unwrap();
+        }
+        assert!(0. < sum && sum < 100.);
+    }
+
+    #[test]
+    fn test_distributions_map() {
+        let dist = Uniform::new_inclusive(0, 5).map(|val| val + 15);
+
+        let mut rng = crate::test::rng(212);
+        let val = dist.sample(&mut rng);
+        assert!(val >= 15 && val <= 20);
+    }
+
+    #[test]
+    fn test_make_an_iter() {
+        fn ten_dice_rolls_other_than_five<R: Rng>(
+            rng: &mut R,
+        ) -> impl Iterator<Item = i32> + '_ {
+            Uniform::new_inclusive(1, 6)
+                .sample_iter(rng)
+                .filter(|x| *x != 5)
+                .take(10)
+        }
+
+        let mut rng = crate::test::rng(211);
+        let mut count = 0;
+        for val in ten_dice_rolls_other_than_five(&mut rng) {
+            assert!((1..=6).contains(&val) && val != 5);
+            count += 1;
+        }
+        assert_eq!(count, 10);
+    }
+
+    #[test]
+    #[cfg(feature = "alloc")]
+    fn test_dist_string() {
+        use core::str;
+        use crate::distributions::DistString;
+        let mut rng = crate::test::rng(213);
+
+        let s1 = Alphanumeric.sample_string(&mut rng, 20);
+        assert_eq!(s1.len(), 20);
+        assert_eq!(str::from_utf8(s1.as_bytes()), Ok(s1.as_str()));
+
+        let s2 = Standard.sample_string(&mut rng, 20);
+        assert_eq!(s2.chars().count(), 20);
+        assert_eq!(str::from_utf8(s2.as_bytes()), Ok(s2.as_str()));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/exponential.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/exponential.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/exponential.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/exponential.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2013 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The exponential distribution.
-#![allow(deprecated)]
-
-use crate::distributions::utils::ziggurat;
-use crate::distributions::{ziggurat_tables, Distribution};
-use crate::Rng;
-
-/// Samples floating-point numbers according to the exponential distribution,
-/// with rate parameter `λ = 1`. This is equivalent to `Exp::new(1.0)` or
-/// sampling with `-rng.gen::<f64>().ln()`, but faster.
-///
-/// See `Exp` for the general exponential distribution.
-///
-/// Implemented via the ZIGNOR variant[^1] of the Ziggurat method. The exact
-/// description in the paper was adjusted to use tables for the exponential
-/// distribution rather than normal.
-///
-/// [^1]: Jurgen A. Doornik (2005). [*An Improved Ziggurat Method to
-///       Generate Normal Random Samples*](
-///       https://www.doornik.com/research/ziggurat.pdf).
-///       Nuffield College, Oxford
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Exp1;
-
-// This could be done via `-rng.gen::<f64>().ln()` but that is slower.
-impl Distribution<f64> for Exp1 {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        #[inline]
-        fn pdf(x: f64) -> f64 {
-            (-x).exp()
-        }
-        #[inline]
-        fn zero_case<R: Rng + ?Sized>(rng: &mut R, _u: f64) -> f64 {
-            ziggurat_tables::ZIG_EXP_R - rng.gen::<f64>().ln()
-        }
-
-        ziggurat(
-            rng,
-            false,
-            &ziggurat_tables::ZIG_EXP_X,
-            &ziggurat_tables::ZIG_EXP_F,
-            pdf,
-            zero_case,
-        )
-    }
-}
-
-/// The exponential distribution `Exp(lambda)`.
-///
-/// This distribution has density function: `f(x) = lambda * exp(-lambda * x)`
-/// for `x > 0`.
-///
-/// Note that [`Exp1`](crate::distributions::Exp1) is an optimised implementation for `lambda = 1`.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Exp {
-    /// `lambda` stored as `1/lambda`, since this is what we scale by.
-    lambda_inverse: f64,
-}
-
-impl Exp {
-    /// Construct a new `Exp` with the given shape parameter
-    /// `lambda`. Panics if `lambda <= 0`.
-    #[inline]
-    pub fn new(lambda: f64) -> Exp {
-        assert!(lambda > 0.0, "Exp::new called with `lambda` <= 0");
-        Exp {
-            lambda_inverse: 1.0 / lambda,
-        }
-    }
-}
-
-impl Distribution<f64> for Exp {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let n: f64 = rng.sample(Exp1);
-        n * self.lambda_inverse
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::Exp;
-    use crate::distributions::Distribution;
-
-    #[test]
-    fn test_exp() {
-        let exp = Exp::new(10.0);
-        let mut rng = crate::test::rng(221);
-        for _ in 0..1000 {
-            assert!(exp.sample(&mut rng) >= 0.0);
-        }
-    }
-    #[test]
-    #[should_panic]
-    fn test_exp_invalid_lambda_zero() {
-        Exp::new(0.0);
-    }
-    #[test]
-    #[should_panic]
-    fn test_exp_invalid_lambda_neg() {
-        Exp::new(-10.0);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/float.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/float.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/float.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/float.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,6 +14,9 @@
 use core::mem;
 #[cfg(feature = "simd_support")] use packed_simd::*;
 
+#[cfg(feature = "serde1")]
+use serde::{Serialize, Deserialize};
+
 /// A distribution to sample floating point numbers uniformly in the half-open
 /// interval `(0, 1]`, i.e. including 1 but not 0.
 ///
@@ -39,6 +42,7 @@
 /// [`Open01`]: crate::distributions::Open01
 /// [`Uniform`]: crate::distributions::uniform::Uniform
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct OpenClosed01;
 
 /// A distribution to sample floating point numbers uniformly in the open
@@ -65,6 +69,7 @@
 /// [`OpenClosed01`]: crate::distributions::OpenClosed01
 /// [`Uniform`]: crate::distributions::uniform::Uniform
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct Open01;
 
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/gamma.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/gamma.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/gamma.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/gamma.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,373 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2013 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Gamma and derived distributions.
-#![allow(deprecated)]
-
-use self::ChiSquaredRepr::*;
-use self::GammaRepr::*;
-
-use crate::distributions::normal::StandardNormal;
-use crate::distributions::{Distribution, Exp, Open01};
-use crate::Rng;
-
-/// The Gamma distribution `Gamma(shape, scale)` distribution.
-///
-/// The density function of this distribution is
-///
-/// ```text
-/// f(x) =  x^(k - 1) * exp(-x / θ) / (Γ(k) * θ^k)
-/// ```
-///
-/// where `Γ` is the Gamma function, `k` is the shape and `θ` is the
-/// scale and both `k` and `θ` are strictly positive.
-///
-/// The algorithm used is that described by Marsaglia & Tsang 2000[^1],
-/// falling back to directly sampling from an Exponential for `shape
-/// == 1`, and using the boosting technique described in that paper for
-/// `shape < 1`.
-///
-/// [^1]: George Marsaglia and Wai Wan Tsang. 2000. "A Simple Method for
-///       Generating Gamma Variables" *ACM Trans. Math. Softw.* 26, 3
-///       (September 2000), 363-372.
-///       DOI:[10.1145/358407.358414](https://doi.acm.org/10.1145/358407.358414)
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Gamma {
-    repr: GammaRepr,
-}
-
-#[derive(Clone, Copy, Debug)]
-enum GammaRepr {
-    Large(GammaLargeShape),
-    One(Exp),
-    Small(GammaSmallShape),
-}
-
-// These two helpers could be made public, but saving the
-// match-on-Gamma-enum branch from using them directly (e.g. if one
-// knows that the shape is always > 1) doesn't appear to be much
-// faster.
-
-/// Gamma distribution where the shape parameter is less than 1.
-///
-/// Note, samples from this require a compulsory floating-point `pow`
-/// call, which makes it significantly slower than sampling from a
-/// gamma distribution where the shape parameter is greater than or
-/// equal to 1.
-///
-/// See `Gamma` for sampling from a Gamma distribution with general
-/// shape parameters.
-#[derive(Clone, Copy, Debug)]
-struct GammaSmallShape {
-    inv_shape: f64,
-    large_shape: GammaLargeShape,
-}
-
-/// Gamma distribution where the shape parameter is larger than 1.
-///
-/// See `Gamma` for sampling from a Gamma distribution with general
-/// shape parameters.
-#[derive(Clone, Copy, Debug)]
-struct GammaLargeShape {
-    scale: f64,
-    c: f64,
-    d: f64,
-}
-
-impl Gamma {
-    /// Construct an object representing the `Gamma(shape, scale)`
-    /// distribution.
-    ///
-    /// Panics if `shape <= 0` or `scale <= 0`.
-    #[inline]
-    pub fn new(shape: f64, scale: f64) -> Gamma {
-        assert!(shape > 0.0, "Gamma::new called with shape <= 0");
-        assert!(scale > 0.0, "Gamma::new called with scale <= 0");
-
-        let repr = if shape == 1.0 {
-            One(Exp::new(1.0 / scale))
-        } else if shape < 1.0 {
-            Small(GammaSmallShape::new_raw(shape, scale))
-        } else {
-            Large(GammaLargeShape::new_raw(shape, scale))
-        };
-        Gamma { repr }
-    }
-}
-
-impl GammaSmallShape {
-    fn new_raw(shape: f64, scale: f64) -> GammaSmallShape {
-        GammaSmallShape {
-            inv_shape: 1. / shape,
-            large_shape: GammaLargeShape::new_raw(shape + 1.0, scale),
-        }
-    }
-}
-
-impl GammaLargeShape {
-    fn new_raw(shape: f64, scale: f64) -> GammaLargeShape {
-        let d = shape - 1. / 3.;
-        GammaLargeShape {
-            scale,
-            c: 1. / (9. * d).sqrt(),
-            d,
-        }
-    }
-}
-
-impl Distribution<f64> for Gamma {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        match self.repr {
-            Small(ref g) => g.sample(rng),
-            One(ref g) => g.sample(rng),
-            Large(ref g) => g.sample(rng),
-        }
-    }
-}
-impl Distribution<f64> for GammaSmallShape {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let u: f64 = rng.sample(Open01);
-
-        self.large_shape.sample(rng) * u.powf(self.inv_shape)
-    }
-}
-impl Distribution<f64> for GammaLargeShape {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        loop {
-            let x = rng.sample(StandardNormal);
-            let v_cbrt = 1.0 + self.c * x;
-            if v_cbrt <= 0.0 {
-                // a^3 <= 0 iff a <= 0
-                continue;
-            }
-
-            let v = v_cbrt * v_cbrt * v_cbrt;
-            let u: f64 = rng.sample(Open01);
-
-            let x_sqr = x * x;
-            if u < 1.0 - 0.0331 * x_sqr * x_sqr
-                || u.ln() < 0.5 * x_sqr + self.d * (1.0 - v + v.ln())
-            {
-                return self.d * v * self.scale;
-            }
-        }
-    }
-}
-
-/// The chi-squared distribution `χ²(k)`, where `k` is the degrees of
-/// freedom.
-///
-/// For `k > 0` integral, this distribution is the sum of the squares
-/// of `k` independent standard normal random variables. For other
-/// `k`, this uses the equivalent characterisation
-/// `χ²(k) = Gamma(k/2, 2)`.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct ChiSquared {
-    repr: ChiSquaredRepr,
-}
-
-#[derive(Clone, Copy, Debug)]
-enum ChiSquaredRepr {
-    // k == 1, Gamma(alpha, ..) is particularly slow for alpha < 1,
-    // e.g. when alpha = 1/2 as it would be for this case, so special-
-    // casing and using the definition of N(0,1)^2 is faster.
-    DoFExactlyOne,
-    DoFAnythingElse(Gamma),
-}
-
-impl ChiSquared {
-    /// Create a new chi-squared distribution with degrees-of-freedom
-    /// `k`. Panics if `k < 0`.
-    pub fn new(k: f64) -> ChiSquared {
-        let repr = if k == 1.0 {
-            DoFExactlyOne
-        } else {
-            assert!(k > 0.0, "ChiSquared::new called with `k` < 0");
-            DoFAnythingElse(Gamma::new(0.5 * k, 2.0))
-        };
-        ChiSquared { repr }
-    }
-}
-impl Distribution<f64> for ChiSquared {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        match self.repr {
-            DoFExactlyOne => {
-                // k == 1 => N(0,1)^2
-                let norm = rng.sample(StandardNormal);
-                norm * norm
-            }
-            DoFAnythingElse(ref g) => g.sample(rng),
-        }
-    }
-}
-
-/// The Fisher F distribution `F(m, n)`.
-///
-/// This distribution is equivalent to the ratio of two normalised
-/// chi-squared distributions, that is, `F(m,n) = (χ²(m)/m) /
-/// (χ²(n)/n)`.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct FisherF {
-    numer: ChiSquared,
-    denom: ChiSquared,
-    // denom_dof / numer_dof so that this can just be a straight
-    // multiplication, rather than a division.
-    dof_ratio: f64,
-}
-
-impl FisherF {
-    /// Create a new `FisherF` distribution, with the given
-    /// parameter. Panics if either `m` or `n` are not positive.
-    pub fn new(m: f64, n: f64) -> FisherF {
-        assert!(m > 0.0, "FisherF::new called with `m < 0`");
-        assert!(n > 0.0, "FisherF::new called with `n < 0`");
-
-        FisherF {
-            numer: ChiSquared::new(m),
-            denom: ChiSquared::new(n),
-            dof_ratio: n / m,
-        }
-    }
-}
-impl Distribution<f64> for FisherF {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        self.numer.sample(rng) / self.denom.sample(rng) * self.dof_ratio
-    }
-}
-
-/// The Student t distribution, `t(nu)`, where `nu` is the degrees of
-/// freedom.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct StudentT {
-    chi: ChiSquared,
-    dof: f64,
-}
-
-impl StudentT {
-    /// Create a new Student t distribution with `n` degrees of
-    /// freedom. Panics if `n <= 0`.
-    pub fn new(n: f64) -> StudentT {
-        assert!(n > 0.0, "StudentT::new called with `n <= 0`");
-        StudentT {
-            chi: ChiSquared::new(n),
-            dof: n,
-        }
-    }
-}
-impl Distribution<f64> for StudentT {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let norm = rng.sample(StandardNormal);
-        norm * (self.dof / self.chi.sample(rng)).sqrt()
-    }
-}
-
-/// The Beta distribution with shape parameters `alpha` and `beta`.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Beta {
-    gamma_a: Gamma,
-    gamma_b: Gamma,
-}
-
-impl Beta {
-    /// Construct an object representing the `Beta(alpha, beta)`
-    /// distribution.
-    ///
-    /// Panics if `shape <= 0` or `scale <= 0`.
-    pub fn new(alpha: f64, beta: f64) -> Beta {
-        assert!((alpha > 0.) & (beta > 0.));
-        Beta {
-            gamma_a: Gamma::new(alpha, 1.),
-            gamma_b: Gamma::new(beta, 1.),
-        }
-    }
-}
-
-impl Distribution<f64> for Beta {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let x = self.gamma_a.sample(rng);
-        let y = self.gamma_b.sample(rng);
-        x / (x + y)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::{Beta, ChiSquared, FisherF, StudentT};
-    use crate::distributions::Distribution;
-
-    const N: u32 = 100;
-
-    #[test]
-    fn test_chi_squared_one() {
-        let chi = ChiSquared::new(1.0);
-        let mut rng = crate::test::rng(201);
-        for _ in 0..N {
-            chi.sample(&mut rng);
-        }
-    }
-    #[test]
-    fn test_chi_squared_small() {
-        let chi = ChiSquared::new(0.5);
-        let mut rng = crate::test::rng(202);
-        for _ in 0..N {
-            chi.sample(&mut rng);
-        }
-    }
-    #[test]
-    fn test_chi_squared_large() {
-        let chi = ChiSquared::new(30.0);
-        let mut rng = crate::test::rng(203);
-        for _ in 0..N {
-            chi.sample(&mut rng);
-        }
-    }
-    #[test]
-    #[should_panic]
-    fn test_chi_squared_invalid_dof() {
-        ChiSquared::new(-1.0);
-    }
-
-    #[test]
-    fn test_f() {
-        let f = FisherF::new(2.0, 32.0);
-        let mut rng = crate::test::rng(204);
-        for _ in 0..N {
-            f.sample(&mut rng);
-        }
-    }
-
-    #[test]
-    fn test_t() {
-        let t = StudentT::new(11.0);
-        let mut rng = crate::test::rng(205);
-        for _ in 0..N {
-            t.sample(&mut rng);
-        }
-    }
-
-    #[test]
-    fn test_beta() {
-        let beta = Beta::new(1.0, 2.0);
-        let mut rng = crate::test::rng(201);
-        for _ in 0..N {
-            beta.sample(&mut rng);
-        }
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_beta_invalid_dof() {
-        Beta::new(0., 0.);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/integer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/integer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/integer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/integer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,9 +10,10 @@
 
 use crate::distributions::{Distribution, Standard};
 use crate::Rng;
-#[cfg(all(target_arch = "x86", feature = "nightly"))] use core::arch::x86::*;
-#[cfg(all(target_arch = "x86_64", feature = "nightly"))]
-use core::arch::x86_64::*;
+#[cfg(all(target_arch = "x86", feature = "simd_support"))]
+use core::arch::x86::{__m128i, __m256i};
+#[cfg(all(target_arch = "x86_64", feature = "simd_support"))]
+use core::arch::x86_64::{__m128i, __m256i};
 #[cfg(not(target_os = "emscripten"))] use core::num::NonZeroU128;
 use core::num::{NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU8, NonZeroUsize};
 #[cfg(feature = "simd_support")] use packed_simd::*;
@@ -155,10 +156,9 @@
 simd_impl!(512, u8x64, i8x64, u16x32, i16x32, u32x16, i32x16, u64x8, i64x8,);
 #[cfg(all(
     feature = "simd_support",
-    feature = "nightly",
     any(target_arch = "x86", target_arch = "x86_64")
 ))]
-simd_impl!((__m64, u8x8), (__m128i, u8x16), (__m256i, u8x32),);
+simd_impl!((__m128i, u8x16), (__m256i, u8x32),);
 
 #[cfg(test)]
 mod tests {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,11 +11,11 @@
 //!
 //! This module is the home of the [`Distribution`] trait and several of its
 //! implementations. It is the workhorse behind some of the convenient
-//! functionality of the [`Rng`] trait, e.g. [`Rng::gen`], [`Rng::gen_range`] and
-//! of course [`Rng::sample`].
+//! functionality of the [`Rng`] trait, e.g. [`Rng::gen`] and of course
+//! [`Rng::sample`].
 //!
 //! Abstractly, a [probability distribution] describes the probability of
-//! occurance of each value in its sample space.
+//! occurrence of each value in its sample space.
 //!
 //! More concretely, an implementation of `Distribution<T>` for type `X` is an
 //! algorithm for choosing values from the sample space (a subset of `T`)
@@ -54,16 +54,16 @@
 //! space to be specified as an arbitrary range within its target type `T`.
 //! Both [`Standard`] and [`Uniform`] are in some sense uniform distributions.
 //!
-//! Values may be sampled from this distribution using [`Rng::gen_range`] or
+//! Values may be sampled from this distribution using [`Rng::sample(Range)`] or
 //! by creating a distribution object with [`Uniform::new`],
 //! [`Uniform::new_inclusive`] or `From<Range>`. When the range limits are not
 //! known at compile time it is typically faster to reuse an existing
-//! distribution object than to call [`Rng::gen_range`].
+//! `Uniform` object than to call [`Rng::sample(Range)`].
 //!
 //! User types `T` may also implement `Distribution<T>` for [`Uniform`],
 //! although this is less straightforward than for [`Standard`] (see the
-//! documentation in the [`uniform`] module. Doing so enables generation of
-//! values of type `T` with  [`Rng::gen_range`].
+//! documentation in the [`uniform`] module). Doing so enables generation of
+//! values of type `T` with  [`Rng::sample(Range)`].
 //!
 //! ## Open and half-open ranges
 //!
@@ -79,7 +79,7 @@
 //! the [`Bernoulli`] distribution (this is used by [`Rng::gen_bool`]).
 //!
 //! For weighted sampling from a sequence of discrete values, use the
-//! [`weighted`] module.
+//! [`WeightedIndex`] distribution.
 //!
 //! This crate no longer includes other non-uniform distributions; instead
 //! it is recommended that you use either [`rand_distr`] or [`statrs`].
@@ -93,201 +93,43 @@
 //! [`rand_distr`]: https://crates.io/crates/rand_distr
 //! [`statrs`]: https://crates.io/crates/statrs
 
-use crate::Rng;
-use core::iter;
-
-pub use self::bernoulli::{Bernoulli, BernoulliError};
-pub use self::float::{Open01, OpenClosed01};
-pub use self::other::Alphanumeric;
-#[doc(inline)] pub use self::uniform::Uniform;
-#[cfg(feature = "alloc")]
-pub use self::weighted::{WeightedError, WeightedIndex};
-
-// The following are all deprecated after being moved to rand_distr
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::binomial::Binomial;
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::cauchy::Cauchy;
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::dirichlet::Dirichlet;
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::exponential::{Exp, Exp1};
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::gamma::{Beta, ChiSquared, FisherF, Gamma, StudentT};
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::normal::{LogNormal, Normal, StandardNormal};
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::pareto::Pareto;
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::poisson::Poisson;
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::triangular::Triangular;
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::unit_circle::UnitCircle;
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::unit_sphere::UnitSphereSurface;
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::weibull::Weibull;
-
 mod bernoulli;
-#[cfg(feature = "std")] mod binomial;
-#[cfg(feature = "std")] mod cauchy;
-#[cfg(feature = "std")] mod dirichlet;
-#[cfg(feature = "std")] mod exponential;
-#[cfg(feature = "std")] mod gamma;
-#[cfg(feature = "std")] mod normal;
-#[cfg(feature = "std")] mod pareto;
-#[cfg(feature = "std")] mod poisson;
-#[cfg(feature = "std")] mod triangular;
-pub mod uniform;
-#[cfg(feature = "std")] mod unit_circle;
-#[cfg(feature = "std")] mod unit_sphere;
-#[cfg(feature = "std")] mod weibull;
-#[cfg(feature = "alloc")] pub mod weighted;
-
+mod distribution;
 mod float;
-#[doc(hidden)]
-pub mod hidden_export {
-    pub use super::float::IntoFloat; // used by rand_distr
-}
 mod integer;
 mod other;
+mod slice;
 mod utils;
-#[cfg(feature = "std")] mod ziggurat_tables;
-
-/// Types (distributions) that can be used to create a random instance of `T`.
-///
-/// It is possible to sample from a distribution through both the
-/// `Distribution` and [`Rng`] traits, via `distr.sample(&mut rng)` and
-/// `rng.sample(distr)`. They also both offer the [`sample_iter`] method, which
-/// produces an iterator that samples from the distribution.
-///
-/// All implementations are expected to be immutable; this has the significant
-/// advantage of not needing to consider thread safety, and for most
-/// distributions efficient state-less sampling algorithms are available.
-///
-/// Implementations are typically expected to be portable with reproducible
-/// results when used with a PRNG with fixed seed; see the
-/// [portability chapter](https://rust-random.github.io/book/portability.html)
-/// of The Rust Rand Book. In some cases this does not apply, e.g. the `usize`
-/// type requires different sampling on 32-bit and 64-bit machines.
-///
-/// [`sample_iter`]: Distribution::method.sample_iter
-pub trait Distribution<T> {
-    /// Generate a random value of `T`, using `rng` as the source of randomness.
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T;
-
-    /// Create an iterator that generates random values of `T`, using `rng` as
-    /// the source of randomness.
-    ///
-    /// Note that this function takes `self` by value. This works since
-    /// `Distribution<T>` is impl'd for `&D` where `D: Distribution<T>`,
-    /// however borrowing is not automatic hence `distr.sample_iter(...)` may
-    /// need to be replaced with `(&distr).sample_iter(...)` to borrow or
-    /// `(&*distr).sample_iter(...)` to reborrow an existing reference.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::thread_rng;
-    /// use rand::distributions::{Distribution, Alphanumeric, Uniform, Standard};
-    ///
-    /// let rng = thread_rng();
-    ///
-    /// // Vec of 16 x f32:
-    /// let v: Vec<f32> = Standard.sample_iter(rng).take(16).collect();
-    ///
-    /// // String:
-    /// let s: String = Alphanumeric.sample_iter(rng).take(7).collect();
-    ///
-    /// // Dice-rolling:
-    /// let die_range = Uniform::new_inclusive(1, 6);
-    /// let mut roll_die = die_range.sample_iter(rng);
-    /// while roll_die.next().unwrap() != 6 {
-    ///     println!("Not a 6; rolling again!");
-    /// }
-    /// ```
-    fn sample_iter<R>(self, rng: R) -> DistIter<Self, R, T>
-    where
-        R: Rng,
-        Self: Sized,
-    {
-        DistIter {
-            distr: self,
-            rng,
-            phantom: ::core::marker::PhantomData,
-        }
-    }
-}
-
-impl<'a, T, D: Distribution<T>> Distribution<T> for &'a D {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T {
-        (*self).sample(rng)
-    }
-}
-
-
-/// An iterator that generates random values of `T` with distribution `D`,
-/// using `R` as the source of randomness.
-///
-/// This `struct` is created by the [`sample_iter`] method on [`Distribution`].
-/// See its documentation for more.
-///
-/// [`sample_iter`]: Distribution::sample_iter
-#[derive(Debug)]
-pub struct DistIter<D, R, T> {
-    distr: D,
-    rng: R,
-    phantom: ::core::marker::PhantomData<T>,
-}
-
-impl<D, R, T> Iterator for DistIter<D, R, T>
-where
-    D: Distribution<T>,
-    R: Rng,
-{
-    type Item = T;
-
-    #[inline(always)]
-    fn next(&mut self) -> Option<T> {
-        // Here, self.rng may be a reference, but we must take &mut anyway.
-        // Even if sample could take an R: Rng by value, we would need to do this
-        // since Rng is not copyable and we cannot enforce that this is "reborrowable".
-        Some(self.distr.sample(&mut self.rng))
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (usize::max_value(), None)
-    }
-}
+#[cfg(feature = "alloc")]
+mod weighted_index;
 
-impl<D, R, T> iter::FusedIterator for DistIter<D, R, T>
-where
-    D: Distribution<T>,
-    R: Rng,
-{
+#[doc(hidden)]
+pub mod hidden_export {
+    pub use super::float::IntoFloat; // used by rand_distr
 }
+pub mod uniform;
+#[deprecated(
+    since = "0.8.0",
+    note = "use rand::distributions::{WeightedIndex, WeightedError} instead"
+)]
+#[cfg(feature = "alloc")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
+pub mod weighted;
 
-#[cfg(features = "nightly")]
-impl<D, R, T> iter::TrustedLen for DistIter<D, R, T>
-where
-    D: Distribution<T>,
-    R: Rng,
-{
-}
+pub use self::bernoulli::{Bernoulli, BernoulliError};
+pub use self::distribution::{Distribution, DistIter, DistMap};
+#[cfg(feature = "alloc")]
+pub use self::distribution::DistString;
+pub use self::float::{Open01, OpenClosed01};
+pub use self::other::Alphanumeric;
+pub use self::slice::Slice;
+#[doc(inline)]
+pub use self::uniform::Uniform;
+#[cfg(feature = "alloc")]
+pub use self::weighted_index::{WeightedError, WeightedIndex};
 
+#[allow(unused)]
+use crate::Rng;
 
 /// A generic random value distribution, implemented for many primitive types.
 /// Usually generates values with a numerically uniform distribution, and with a
@@ -317,6 +159,12 @@
 /// *   Arrays (up to 32 elements): each element is generated sequentially;
 ///     see also [`Rng::fill`] which supports arbitrary array length for integer
 ///     types and tends to be faster for `u32` and smaller types.
+///     When using `rustc` ≥ 1.51, enable the `min_const_gen` feature to support
+///     arrays larger than 32 elements.
+///     Note that [`Rng::fill`] and `Standard`'s array support are *not* equivalent:
+///     the former is optimised for integer types (using fewer RNG calls for
+///     element types smaller than the RNG word size), while the latter supports
+///     any element type supported by `Standard`.
 /// *   `Option<T>` first generates a `bool`, and if true generates and returns
 ///     `Some(value)` where `value: T`, otherwise returning `None`.
 ///
@@ -359,48 +207,12 @@
 /// multiplicative method: `(rng.gen::<$uty>() >> N) as $ty * (ε/2)`.
 ///
 /// See also: [`Open01`] which samples from `(0, 1)`, [`OpenClosed01`] which
-/// samples from `(0, 1]` and `Rng::gen_range(0, 1)` which also samples from
-/// `[0, 1)`. Note that `Open01` and `gen_range` (which uses [`Uniform`]) use
-/// transmute-based methods which yield 1 bit less precision but may perform
-/// faster on some architectures (on modern Intel CPUs all methods have
-/// approximately equal performance).
+/// samples from `(0, 1]` and `Rng::gen_range(0..1)` which also samples from
+/// `[0, 1)`. Note that `Open01` uses transmute-based methods which yield 1 bit
+/// less precision but may perform faster on some architectures (on modern Intel
+/// CPUs all methods have approximately equal performance).
 ///
 /// [`Uniform`]: uniform::Uniform
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
 pub struct Standard;
-
-
-#[cfg(all(test, feature = "std"))]
-mod tests {
-    use super::{Distribution, Uniform};
-    use crate::Rng;
-
-    #[test]
-    fn test_distributions_iter() {
-        use crate::distributions::Open01;
-        let mut rng = crate::test::rng(210);
-        let distr = Open01;
-        let results: Vec<f32> = distr.sample_iter(&mut rng).take(100).collect();
-        println!("{:?}", results);
-    }
-
-    #[test]
-    fn test_make_an_iter() {
-        fn ten_dice_rolls_other_than_five<'a, R: Rng>(
-            rng: &'a mut R,
-        ) -> impl Iterator<Item = i32> + 'a {
-            Uniform::new_inclusive(1, 6)
-                .sample_iter(rng)
-                .filter(|x| *x != 5)
-                .take(10)
-        }
-
-        let mut rng = crate::test::rng(211);
-        let mut count = 0;
-        for val in ten_dice_rolls_other_than_five(&mut rng) {
-            assert!(val >= 1 && val <= 6 && val != 5);
-            count += 1;
-        }
-        assert_eq!(count, 10);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/normal.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/normal.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/normal.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/normal.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2013 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The normal and derived distributions.
-#![allow(deprecated)]
-
-use crate::distributions::utils::ziggurat;
-use crate::distributions::{ziggurat_tables, Distribution, Open01};
-use crate::Rng;
-
-/// Samples floating-point numbers according to the normal distribution
-/// `N(0, 1)` (a.k.a. a standard normal, or Gaussian). This is equivalent to
-/// `Normal::new(0.0, 1.0)` but faster.
-///
-/// See `Normal` for the general normal distribution.
-///
-/// Implemented via the ZIGNOR variant[^1] of the Ziggurat method.
-///
-/// [^1]: Jurgen A. Doornik (2005). [*An Improved Ziggurat Method to
-///       Generate Normal Random Samples*](
-///       https://www.doornik.com/research/ziggurat.pdf).
-///       Nuffield College, Oxford
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct StandardNormal;
-
-impl Distribution<f64> for StandardNormal {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        #[inline]
-        fn pdf(x: f64) -> f64 {
-            (-x * x / 2.0).exp()
-        }
-        #[inline]
-        fn zero_case<R: Rng + ?Sized>(rng: &mut R, u: f64) -> f64 {
-            // compute a random number in the tail by hand
-
-            // strange initial conditions, because the loop is not
-            // do-while, so the condition should be true on the first
-            // run, they get overwritten anyway (0 < 1, so these are
-            // good).
-            let mut x = 1.0f64;
-            let mut y = 0.0f64;
-
-            while -2.0 * y < x * x {
-                let x_: f64 = rng.sample(Open01);
-                let y_: f64 = rng.sample(Open01);
-
-                x = x_.ln() / ziggurat_tables::ZIG_NORM_R;
-                y = y_.ln();
-            }
-
-            if u < 0.0 {
-                x - ziggurat_tables::ZIG_NORM_R
-            } else {
-                ziggurat_tables::ZIG_NORM_R - x
-            }
-        }
-
-        ziggurat(
-            rng,
-            true, // this is symmetric
-            &ziggurat_tables::ZIG_NORM_X,
-            &ziggurat_tables::ZIG_NORM_F,
-            pdf,
-            zero_case,
-        )
-    }
-}
-
-/// The normal distribution `N(mean, std_dev**2)`.
-///
-/// This uses the ZIGNOR variant of the Ziggurat method, see [`StandardNormal`]
-/// for more details.
-///
-/// Note that [`StandardNormal`] is an optimised implementation for mean 0, and
-/// standard deviation 1.
-///
-/// [`StandardNormal`]: crate::distributions::StandardNormal
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Normal {
-    mean: f64,
-    std_dev: f64,
-}
-
-impl Normal {
-    /// Construct a new `Normal` distribution with the given mean and
-    /// standard deviation.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `std_dev < 0`.
-    #[inline]
-    pub fn new(mean: f64, std_dev: f64) -> Normal {
-        assert!(std_dev >= 0.0, "Normal::new called with `std_dev` < 0");
-        Normal { mean, std_dev }
-    }
-}
-impl Distribution<f64> for Normal {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let n = rng.sample(StandardNormal);
-        self.mean + self.std_dev * n
-    }
-}
-
-
-/// The log-normal distribution `ln N(mean, std_dev**2)`.
-///
-/// If `X` is log-normal distributed, then `ln(X)` is `N(mean, std_dev**2)`
-/// distributed.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct LogNormal {
-    norm: Normal,
-}
-
-impl LogNormal {
-    /// Construct a new `LogNormal` distribution with the given mean
-    /// and standard deviation.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `std_dev < 0`.
-    #[inline]
-    pub fn new(mean: f64, std_dev: f64) -> LogNormal {
-        assert!(std_dev >= 0.0, "LogNormal::new called with `std_dev` < 0");
-        LogNormal {
-            norm: Normal::new(mean, std_dev),
-        }
-    }
-}
-impl Distribution<f64> for LogNormal {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        self.norm.sample(rng).exp()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{LogNormal, Normal};
-    use crate::distributions::Distribution;
-
-    #[test]
-    fn test_normal() {
-        let norm = Normal::new(10.0, 10.0);
-        let mut rng = crate::test::rng(210);
-        for _ in 0..1000 {
-            norm.sample(&mut rng);
-        }
-    }
-    #[test]
-    #[should_panic]
-    fn test_normal_invalid_sd() {
-        Normal::new(10.0, -1.0);
-    }
-
-
-    #[test]
-    fn test_log_normal() {
-        let lnorm = LogNormal::new(10.0, 10.0);
-        let mut rng = crate::test::rng(211);
-        for _ in 0..1000 {
-            lnorm.sample(&mut rng);
-        }
-    }
-    #[test]
-    #[should_panic]
-    fn test_log_normal_invalid_sd() {
-        LogNormal::new(10.0, -1.0);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/other.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/other.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/other.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/other.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,13 +10,23 @@
 
 use core::char;
 use core::num::Wrapping;
+#[cfg(feature = "alloc")]
+use alloc::string::String;
 
 use crate::distributions::{Distribution, Standard, Uniform};
+#[cfg(feature = "alloc")]
+use crate::distributions::DistString;
 use crate::Rng;
 
+#[cfg(feature = "serde1")]
+use serde::{Serialize, Deserialize};
+#[cfg(feature = "min_const_gen")]
+use std::mem::{self, MaybeUninit};
+
+
 // ----- Sampling distributions -----
 
-/// Sample a `char`, uniformly distributed over ASCII letters and numbers:
+/// Sample a `u8`, uniformly distributed over ASCII letters and numbers:
 /// a-z, A-Z and 0-9.
 ///
 /// # Example
@@ -29,11 +39,30 @@
 /// let mut rng = thread_rng();
 /// let chars: String = iter::repeat(())
 ///         .map(|()| rng.sample(Alphanumeric))
+///         .map(char::from)
 ///         .take(7)
 ///         .collect();
 /// println!("Random chars: {}", chars);
 /// ```
-#[derive(Debug)]
+///
+/// # Passwords
+///
+/// Users sometimes ask whether it is safe to use a string of random characters
+/// as a password. In principle, all RNGs in Rand implementing `CryptoRng` are
+/// suitable as a source of randomness for generating passwords (if they are
+/// properly seeded), but it is more conservative to only use randomness
+/// directly from the operating system via the `getrandom` crate, or the
+/// corresponding bindings of a crypto library.
+///
+/// When generating passwords or keys, it is important to consider the threat
+/// model and in some cases the memorability of the password. This is out of
+/// scope of the Rand project, and therefore we defer to the following
+/// references:
+///
+/// - [Wikipedia article on Password Strength](https://en.wikipedia.org/wiki/Password_strength)
+/// - [Diceware for generating memorable passwords](https://en.wikipedia.org/wiki/Diceware)
+#[derive(Debug, Clone, Copy)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct Alphanumeric;
 
 
@@ -60,8 +89,21 @@
     }
 }
 
-impl Distribution<char> for Alphanumeric {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> char {
+/// Note: the `String` is potentially left with excess capacity; optionally the
+/// user may call `string.shrink_to_fit()` afterwards.
+#[cfg(feature = "alloc")]
+impl DistString for Standard {
+    fn append_string<R: Rng + ?Sized>(&self, rng: &mut R, s: &mut String, len: usize) {
+        // A char is encoded with at most four bytes, thus this reservation is
+        // guaranteed to be sufficient. We do not shrink_to_fit afterwards so
+        // that repeated usage on the same `String` buffer does not reallocate.
+        s.reserve(4 * len);
+        s.extend(Distribution::<char>::sample_iter(self, rng).take(len));
+    }
+}
+
+impl Distribution<u8> for Alphanumeric {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u8 {
         const RANGE: u32 = 26 + 26 + 10;
         const GEN_ASCII_STR_CHARSET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ\
                 abcdefghijklmnopqrstuvwxyz\
@@ -73,12 +115,22 @@
         loop {
             let var = rng.next_u32() >> (32 - 6);
             if var < RANGE {
-                return GEN_ASCII_STR_CHARSET[var as usize] as char;
+                return GEN_ASCII_STR_CHARSET[var as usize];
             }
         }
     }
 }
 
+#[cfg(feature = "alloc")]
+impl DistString for Alphanumeric {
+    fn append_string<R: Rng + ?Sized>(&self, rng: &mut R, string: &mut String, len: usize) {
+        unsafe {
+            let v = string.as_mut_vec();
+            v.extend(self.sample_iter(rng).take(len));
+        }
+    }
+}
+
 impl Distribution<bool> for Standard {
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> bool {
@@ -134,6 +186,23 @@
 tuple_impl! {A, B, C, D, E, F, G, H, I, J, K}
 tuple_impl! {A, B, C, D, E, F, G, H, I, J, K, L}
 
+#[cfg(feature = "min_const_gen")]
+impl<T, const N: usize> Distribution<[T; N]> for Standard
+where Standard: Distribution<T>
+{
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, _rng: &mut R) -> [T; N] {
+        let mut buff: [MaybeUninit<T>; N] = unsafe { MaybeUninit::uninit().assume_init() };
+
+        for elem in &mut buff {
+            *elem = MaybeUninit::new(_rng.gen());
+        }
+
+        unsafe { mem::transmute_copy::<_, _>(&buff) }
+    }
+}
+
+#[cfg(not(feature = "min_const_gen"))]
 macro_rules! array_impl {
     // recursive, given at least one type parameter:
     {$n:expr, $t:ident, $($ts:ident,)*} => {
@@ -154,6 +223,7 @@
     };
 }
 
+#[cfg(not(feature = "min_const_gen"))]
 array_impl! {32, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,}
 
 impl<T> Distribution<Option<T>> for Standard
@@ -184,7 +254,7 @@
 mod tests {
     use super::*;
     use crate::RngCore;
-    #[cfg(all(not(feature = "std"), feature = "alloc"))] use alloc::string::String;
+    #[cfg(feature = "alloc")] use alloc::string::String;
 
     #[test]
     fn test_misc() {
@@ -206,7 +276,7 @@
             .map(|()| rng.gen::<char>())
             .take(1000)
             .collect();
-        assert!(word.len() != 0);
+        assert!(!word.is_empty());
     }
 
     #[test]
@@ -217,12 +287,12 @@
         // take the rejection sampling path.
         let mut incorrect = false;
         for _ in 0..100 {
-            let c = rng.sample(Alphanumeric);
-            incorrect |= !((c >= '0' && c <= '9') ||
-                           (c >= 'A' && c <= 'Z') ||
-                           (c >= 'a' && c <= 'z') );
+            let c: char = rng.sample(Alphanumeric).into();
+            incorrect |= !(('0'..='9').contains(&c) ||
+                           ('A'..='Z').contains(&c) ||
+                           ('a'..='z').contains(&c) );
         }
-        assert!(incorrect == false);
+        assert!(!incorrect);
     }
 
     #[test]
@@ -245,7 +315,7 @@
             '\u{ed692}',
             '\u{35888}',
         ]);
-        test_samples(&Alphanumeric, 'a', &['h', 'm', 'e', '3', 'M']);
+        test_samples(&Alphanumeric, 0, &[104, 109, 101, 51, 77]);
         test_samples(&Standard, false, &[true, true, false, true, false]);
         test_samples(&Standard, None as Option<bool>, &[
             Some(true),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/pareto.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/pareto.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/pareto.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/pareto.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Pareto distribution.
-#![allow(deprecated)]
-
-use crate::distributions::{Distribution, OpenClosed01};
-use crate::Rng;
-
-/// Samples floating-point numbers according to the Pareto distribution
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Pareto {
-    scale: f64,
-    inv_neg_shape: f64,
-}
-
-impl Pareto {
-    /// Construct a new Pareto distribution with given `scale` and `shape`.
-    ///
-    /// In the literature, `scale` is commonly written as x<sub>m</sub> or k and
-    /// `shape` is often written as α.
-    ///
-    /// # Panics
-    ///
-    /// `scale` and `shape` have to be non-zero and positive.
-    pub fn new(scale: f64, shape: f64) -> Pareto {
-        assert!((scale > 0.) & (shape > 0.));
-        Pareto {
-            scale,
-            inv_neg_shape: -1.0 / shape,
-        }
-    }
-}
-
-impl Distribution<f64> for Pareto {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let u: f64 = rng.sample(OpenClosed01);
-        self.scale * u.powf(self.inv_neg_shape)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Pareto;
-    use crate::distributions::Distribution;
-
-    #[test]
-    #[should_panic]
-    fn invalid() {
-        Pareto::new(0., 0.);
-    }
-
-    #[test]
-    fn sample() {
-        let scale = 1.0;
-        let shape = 2.0;
-        let d = Pareto::new(scale, shape);
-        let mut rng = crate::test::rng(1);
-        for _ in 0..1000 {
-            let r = d.sample(&mut rng);
-            assert!(r >= scale);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/poisson.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/poisson.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/poisson.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/poisson.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2016-2017 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Poisson distribution.
-#![allow(deprecated)]
-
-use crate::distributions::utils::log_gamma;
-use crate::distributions::{Cauchy, Distribution};
-use crate::Rng;
-
-/// The Poisson distribution `Poisson(lambda)`.
-///
-/// This distribution has a density function:
-/// `f(k) = lambda^k * exp(-lambda) / k!` for `k >= 0`.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Poisson {
-    lambda: f64,
-    // precalculated values
-    exp_lambda: f64,
-    log_lambda: f64,
-    sqrt_2lambda: f64,
-    magic_val: f64,
-}
-
-impl Poisson {
-    /// Construct a new `Poisson` with the given shape parameter
-    /// `lambda`. Panics if `lambda <= 0`.
-    pub fn new(lambda: f64) -> Poisson {
-        assert!(lambda > 0.0, "Poisson::new called with lambda <= 0");
-        let log_lambda = lambda.ln();
-        Poisson {
-            lambda,
-            exp_lambda: (-lambda).exp(),
-            log_lambda,
-            sqrt_2lambda: (2.0 * lambda).sqrt(),
-            magic_val: lambda * log_lambda - log_gamma(1.0 + lambda),
-        }
-    }
-}
-
-impl Distribution<u64> for Poisson {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u64 {
-        // using the algorithm from Numerical Recipes in C
-
-        // for low expected values use the Knuth method
-        if self.lambda < 12.0 {
-            let mut result = 0;
-            let mut p = 1.0;
-            while p > self.exp_lambda {
-                p *= rng.gen::<f64>();
-                result += 1;
-            }
-            result - 1
-        }
-        // high expected values - rejection method
-        else {
-            let mut int_result: u64;
-
-            // we use the Cauchy distribution as the comparison distribution
-            // f(x) ~ 1/(1+x^2)
-            let cauchy = Cauchy::new(0.0, 1.0);
-
-            loop {
-                let mut result;
-                let mut comp_dev;
-
-                loop {
-                    // draw from the Cauchy distribution
-                    comp_dev = rng.sample(cauchy);
-                    // shift the peak of the comparison ditribution
-                    result = self.sqrt_2lambda * comp_dev + self.lambda;
-                    // repeat the drawing until we are in the range of possible values
-                    if result >= 0.0 {
-                        break;
-                    }
-                }
-                // now the result is a random variable greater than 0 with Cauchy distribution
-                // the result should be an integer value
-                result = result.floor();
-                int_result = result as u64;
-
-                // this is the ratio of the Poisson distribution to the comparison distribution
-                // the magic value scales the distribution function to a range of approximately 0-1
-                // since it is not exact, we multiply the ratio by 0.9 to avoid ratios greater than 1
-                // this doesn't change the resulting distribution, only increases the rate of failed drawings
-                let check = 0.9
-                    * (1.0 + comp_dev * comp_dev)
-                    * (result * self.log_lambda - log_gamma(1.0 + result) - self.magic_val).exp();
-
-                // check with uniform random value - if below the threshold, we are within the target distribution
-                if rng.gen::<f64>() <= check {
-                    break;
-                }
-            }
-            int_result
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::Poisson;
-    use crate::distributions::Distribution;
-
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_poisson_10() {
-        let poisson = Poisson::new(10.0);
-        let mut rng = crate::test::rng(123);
-        let mut sum = 0;
-        for _ in 0..1000 {
-            sum += poisson.sample(&mut rng);
-        }
-        let avg = (sum as f64) / 1000.0;
-        println!("Poisson average: {}", avg);
-        assert!((avg - 10.0).abs() < 0.5); // not 100% certain, but probable enough
-    }
-
-    #[test]
-    fn test_poisson_15() {
-        // Take the 'high expected values' path
-        let poisson = Poisson::new(15.0);
-        let mut rng = crate::test::rng(123);
-        let mut sum = 0;
-        for _ in 0..1000 {
-            sum += poisson.sample(&mut rng);
-        }
-        let avg = (sum as f64) / 1000.0;
-        println!("Poisson average: {}", avg);
-        assert!((avg - 15.0).abs() < 0.5); // not 100% certain, but probable enough
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_poisson_invalid_lambda_zero() {
-        Poisson::new(0.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_poisson_invalid_lambda_neg() {
-        Poisson::new(-10.0);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/slice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/slice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/slice.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/slice.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,117 @@
+// Copyright 2021 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::distributions::{Distribution, Uniform};
+
+/// A distribution to sample items uniformly from a slice.
+///
+/// [`Slice::new`] constructs a distribution referencing a slice and uniformly
+/// samples references from the items in the slice. It may do extra work up
+/// front to make sampling of multiple values faster; if only one sample from
+/// the slice is required, [`SliceRandom::choose`] can be more efficient.
+///
+/// Steps are taken to avoid bias which might be present in naive
+/// implementations; for example `slice[rng.gen() % slice.len()]` samples from
+/// the slice, but may be more likely to select numbers in the low range than
+/// other values.
+///
+/// This distribution samples with replacement; each sample is independent.
+/// Sampling without replacement requires state to be retained, and therefore
+/// cannot be handled by a distribution; you should instead consider methods
+/// on [`SliceRandom`], such as [`SliceRandom::choose_multiple`].
+///
+/// # Example
+///
+/// ```
+/// use rand::Rng;
+/// use rand::distributions::Slice;
+///
+/// let vowels = ['a', 'e', 'i', 'o', 'u'];
+/// let vowels_dist = Slice::new(&vowels).unwrap();
+/// let rng = rand::thread_rng();
+///
+/// // build a string of 10 vowels
+/// let vowel_string: String = rng
+///     .sample_iter(&vowels_dist)
+///     .take(10)
+///     .collect();
+///
+/// println!("{}", vowel_string);
+/// assert_eq!(vowel_string.len(), 10);
+/// assert!(vowel_string.chars().all(|c| vowels.contains(&c)));
+/// ```
+///
+/// For a single sample, [`SliceRandom::choose`][crate::seq::SliceRandom::choose]
+/// may be preferred:
+///
+/// ```
+/// use rand::seq::SliceRandom;
+///
+/// let vowels = ['a', 'e', 'i', 'o', 'u'];
+/// let mut rng = rand::thread_rng();
+///
+/// println!("{}", vowels.choose(&mut rng).unwrap())
+/// ```
+///
+/// [`SliceRandom`]: crate::seq::SliceRandom
+/// [`SliceRandom::choose`]: crate::seq::SliceRandom::choose
+/// [`SliceRandom::choose_multiple`]: crate::seq::SliceRandom::choose_multiple
+#[derive(Debug, Clone, Copy)]
+pub struct Slice<'a, T> {
+    slice: &'a [T],
+    range: Uniform<usize>,
+}
+
+impl<'a, T> Slice<'a, T> {
+    /// Create a new `Slice` instance which samples uniformly from the slice.
+    /// Returns `Err` if the slice is empty.
+    pub fn new(slice: &'a [T]) -> Result<Self, EmptySlice> {
+        match slice.len() {
+            0 => Err(EmptySlice),
+            len => Ok(Self {
+                slice,
+                range: Uniform::new(0, len),
+            }),
+        }
+    }
+}
+
+impl<'a, T> Distribution<&'a T> for Slice<'a, T> {
+    fn sample<R: crate::Rng + ?Sized>(&self, rng: &mut R) -> &'a T {
+        let idx = self.range.sample(rng);
+
+        debug_assert!(
+            idx < self.slice.len(),
+            "Uniform::new(0, {}) somehow returned {}",
+            self.slice.len(),
+            idx
+        );
+
+        // Safety: at construction time, it was ensured that the slice was
+        // non-empty, and that the `Uniform` range produces values in range
+        // for the slice
+        unsafe { self.slice.get_unchecked(idx) }
+    }
+}
+
+/// Error type indicating that a [`Slice`] distribution was improperly
+/// constructed with an empty slice.
+#[derive(Debug, Clone, Copy)]
+pub struct EmptySlice;
+
+impl core::fmt::Display for EmptySlice {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(
+            f,
+            "Tried to create a `distributions::Slice` with an empty slice"
+        )
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for EmptySlice {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/triangular.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/triangular.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/triangular.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/triangular.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The triangular distribution.
-#![allow(deprecated)]
-
-use crate::distributions::{Distribution, Standard};
-use crate::Rng;
-
-/// The triangular distribution.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Triangular {
-    min: f64,
-    max: f64,
-    mode: f64,
-}
-
-impl Triangular {
-    /// Construct a new `Triangular` with minimum `min`, maximum `max` and mode
-    /// `mode`.
-    ///
-    /// # Panics
-    ///
-    /// If `max < mode`, `mode < max` or `max == min`.
-    #[inline]
-    pub fn new(min: f64, max: f64, mode: f64) -> Triangular {
-        assert!(max >= mode);
-        assert!(mode >= min);
-        assert!(max != min);
-        Triangular { min, max, mode }
-    }
-}
-
-impl Distribution<f64> for Triangular {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let f: f64 = rng.sample(Standard);
-        let diff_mode_min = self.mode - self.min;
-        let diff_max_min = self.max - self.min;
-        if f * diff_max_min < diff_mode_min {
-            self.min + (f * diff_max_min * diff_mode_min).sqrt()
-        } else {
-            self.max - ((1. - f) * diff_max_min * (self.max - self.mode)).sqrt()
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::Triangular;
-    use crate::distributions::Distribution;
-
-    #[test]
-    fn test_new() {
-        for &(min, max, mode) in &[
-            (-1., 1., 0.),
-            (1., 2., 1.),
-            (5., 25., 25.),
-            (1e-5, 1e5, 1e-3),
-            (0., 1., 0.9),
-            (-4., -0.5, -2.),
-            (-13.039, 8.41, 1.17),
-        ] {
-            println!("{} {} {}", min, max, mode);
-            let _ = Triangular::new(min, max, mode);
-        }
-    }
-
-    #[test]
-    fn test_sample() {
-        let norm = Triangular::new(0., 1., 0.5);
-        let mut rng = crate::test::rng(1);
-        for _ in 0..1000 {
-            norm.sample(&mut rng);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/uniform.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/uniform.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/uniform.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/uniform.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-// Copyright 2018 Developers of the Rand project.
+// Copyright 2018-2020 Developers of the Rand project.
 // Copyright 2017 The Rust Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -34,7 +34,7 @@
 //! let side = Uniform::new(-10.0, 10.0);
 //!
 //! // sample between 1 and 10 points
-//! for _ in 0..rng.gen_range(1, 11) {
+//! for _ in 0..rng.gen_range(1..=10) {
 //!     // sample a point from the square with sides -10 - 10 in two dimensions
 //!     let (x, y) = (rng.sample(side), rng.sample(side));
 //!     println!("Point: {}, {}", x, y);
@@ -105,24 +105,28 @@
 
 #[cfg(not(feature = "std"))] use core::time::Duration;
 #[cfg(feature = "std")] use std::time::Duration;
+use core::ops::{Range, RangeInclusive};
 
 use crate::distributions::float::IntoFloat;
 use crate::distributions::utils::{BoolAsSIMD, FloatAsSIMD, FloatSIMDUtils, WideningMultiply};
 use crate::distributions::Distribution;
-use crate::Rng;
+use crate::{Rng, RngCore};
 
 #[cfg(not(feature = "std"))]
 #[allow(unused_imports)] // rustc doesn't detect that this is actually used
 use crate::distributions::utils::Float;
 
-
 #[cfg(feature = "simd_support")] use packed_simd::*;
 
+#[cfg(feature = "serde1")]
+use serde::{Serialize, Deserialize};
+
 /// Sample values uniformly between two bounds.
 ///
 /// [`Uniform::new`] and [`Uniform::new_inclusive`] construct a uniform
 /// distribution sampling from the given range; these functions may do extra
-/// work up front to make sampling of multiple values faster.
+/// work up front to make sampling of multiple values faster. If only one sample
+/// from the range is required, [`Rng::gen_range`] can be more efficient.
 ///
 /// When sampling from a constant range, many calculations can happen at
 /// compile-time and all methods should be fast; for floating-point ranges and
@@ -137,7 +141,7 @@
 /// are of lower quality than the high bits.
 ///
 /// Implementations must sample in `[low, high)` range for
-/// `Uniform::new(low, high)`, i.e., excluding `high`. In particular care must
+/// `Uniform::new(low, high)`, i.e., excluding `high`. In particular, care must
 /// be taken to ensure that rounding never results values `< low` or `>= high`.
 ///
 /// # Example
@@ -145,20 +149,29 @@
 /// ```
 /// use rand::distributions::{Distribution, Uniform};
 ///
-/// fn main() {
-///     let between = Uniform::from(10..10000);
-///     let mut rng = rand::thread_rng();
-///     let mut sum = 0;
-///     for _ in 0..1000 {
-///         sum += between.sample(&mut rng);
-///     }
-///     println!("{}", sum);
+/// let between = Uniform::from(10..10000);
+/// let mut rng = rand::thread_rng();
+/// let mut sum = 0;
+/// for _ in 0..1000 {
+///     sum += between.sample(&mut rng);
 /// }
+/// println!("{}", sum);
+/// ```
+///
+/// For a single sample, [`Rng::gen_range`] may be prefered:
+///
+/// ```
+/// use rand::Rng;
+///
+/// let mut rng = rand::thread_rng();
+/// println!("{}", rng.gen_range(0..10));
 /// ```
 ///
 /// [`new`]: Uniform::new
 /// [`new_inclusive`]: Uniform::new_inclusive
+/// [`Rng::gen_range`]: Rng::gen_range
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct Uniform<X: SampleUniform>(X::Sampler);
 
 impl<X: SampleUniform> Uniform<X> {
@@ -265,20 +278,38 @@
         let uniform: Self = UniformSampler::new(low, high);
         uniform.sample(rng)
     }
+
+    /// Sample a single value uniformly from a range with inclusive lower bound
+    /// and inclusive upper bound `[low, high]`.
+    ///
+    /// By default this is implemented using
+    /// `UniformSampler::new_inclusive(low, high).sample(rng)`. However, for
+    /// some types more optimal implementations for single usage may be provided
+    /// via this method.
+    /// Results may not be identical.
+    fn sample_single_inclusive<R: Rng + ?Sized, B1, B2>(low: B1, high: B2, rng: &mut R)
+        -> Self::X
+        where B1: SampleBorrow<Self::X> + Sized,
+              B2: SampleBorrow<Self::X> + Sized
+    {
+        let uniform: Self = UniformSampler::new_inclusive(low, high);
+        uniform.sample(rng)
+    }
 }
 
-impl<X: SampleUniform> From<::core::ops::Range<X>> for Uniform<X> {
+impl<X: SampleUniform> From<Range<X>> for Uniform<X> {
     fn from(r: ::core::ops::Range<X>) -> Uniform<X> {
         Uniform::new(r.start, r.end)
     }
 }
 
-impl<X: SampleUniform> From<::core::ops::RangeInclusive<X>> for Uniform<X> {
+impl<X: SampleUniform> From<RangeInclusive<X>> for Uniform<X> {
     fn from(r: ::core::ops::RangeInclusive<X>) -> Uniform<X> {
         Uniform::new_inclusive(r.start(), r.end())
     }
 }
 
+
 /// Helper trait similar to [`Borrow`] but implemented
 /// only for SampleUniform and references to SampleUniform in
 /// order to resolve ambiguity issues.
@@ -307,6 +338,43 @@
     }
 }
 
+/// Range that supports generating a single sample efficiently.
+///
+/// Any type implementing this trait can be used to specify the sampled range
+/// for `Rng::gen_range`.
+pub trait SampleRange<T> {
+    /// Generate a sample from the given range.
+    fn sample_single<R: RngCore + ?Sized>(self, rng: &mut R) -> T;
+
+    /// Check whether the range is empty.
+    fn is_empty(&self) -> bool;
+}
+
+impl<T: SampleUniform + PartialOrd> SampleRange<T> for Range<T> {
+    #[inline]
+    fn sample_single<R: RngCore + ?Sized>(self, rng: &mut R) -> T {
+        T::Sampler::sample_single(self.start, self.end, rng)
+    }
+
+    #[inline]
+    fn is_empty(&self) -> bool {
+        !(self.start < self.end)
+    }
+}
+
+impl<T: SampleUniform + PartialOrd> SampleRange<T> for RangeInclusive<T> {
+    #[inline]
+    fn sample_single<R: RngCore + ?Sized>(self, rng: &mut R) -> T {
+        T::Sampler::sample_single_inclusive(self.start(), self.end(), rng)
+    }
+
+    #[inline]
+    fn is_empty(&self) -> bool {
+        !(self.start() <= self.end())
+    }
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // What follows are all back-ends.
@@ -347,6 +415,7 @@
 /// multiply by `range`, the result is in the high word. Then comparing the low
 /// word against `zone` makes sure our distribution is uniform.
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct UniformInt<X> {
     low: X,
     range: X,
@@ -404,13 +473,14 @@
                 };
 
                 UniformInt {
-                    low: low,
+                    low,
                     // These are really $unsigned values, but store as $ty:
                     range: range as $ty,
                     z: ints_to_reject as $unsigned as $ty,
                 }
             }
 
+            #[inline]
             fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
                 let range = self.range as $unsigned as $u_large;
                 if range > 0 {
@@ -429,6 +499,7 @@
                 }
             }
 
+            #[inline]
             fn sample_single<R: Rng + ?Sized, B1, B2>(low_b: B1, high_b: B2, rng: &mut R) -> Self::X
             where
                 B1: SampleBorrow<Self::X> + Sized,
@@ -437,7 +508,25 @@
                 let low = *low_b.borrow();
                 let high = *high_b.borrow();
                 assert!(low < high, "UniformSampler::sample_single: low >= high");
-                let range = high.wrapping_sub(low) as $unsigned as $u_large;
+                Self::sample_single_inclusive(low, high - 1, rng)
+            }
+
+            #[inline]
+            fn sample_single_inclusive<R: Rng + ?Sized, B1, B2>(low_b: B1, high_b: B2, rng: &mut R) -> Self::X
+            where
+                B1: SampleBorrow<Self::X> + Sized,
+                B2: SampleBorrow<Self::X> + Sized,
+            {
+                let low = *low_b.borrow();
+                let high = *high_b.borrow();
+                assert!(low <= high, "UniformSampler::sample_single_inclusive: low > high");
+                let range = high.wrapping_sub(low).wrapping_add(1) as $unsigned as $u_large;
+                // If the above resulted in wrap-around to 0, the range is $ty::MIN..=$ty::MAX,
+                // and any integer will do.
+                if range == 0 {
+                    return rng.gen();
+                }
+
                 let zone = if ::core::$unsigned::MAX <= ::core::u16::MAX as $unsigned {
                     // Using a modulus is faster than the approximation for
                     // i8 and i16. I suppose we trade the cost of one
@@ -478,7 +567,7 @@
 #[cfg(not(target_os = "emscripten"))]
 uniform_int_impl! { u128, u128, u128 }
 
-#[cfg(all(feature = "simd_support", feature = "nightly"))]
+#[cfg(feature = "simd_support")]
 macro_rules! uniform_simd_int_impl {
     ($ty:ident, $unsigned:ident, $u_scalar:ident) => {
         // The "pick the largest zone that can fit in an `u32`" optimization
@@ -535,7 +624,7 @@
                 let zone = unsigned_max - ints_to_reject;
 
                 UniformInt {
-                    low: low,
+                    low,
                     // These are really $unsigned values, but store as $ty:
                     range: range.cast(),
                     z: zone.cast(),
@@ -585,7 +674,7 @@
     };
 }
 
-#[cfg(all(feature = "simd_support", feature = "nightly"))]
+#[cfg(feature = "simd_support")]
 uniform_simd_int_impl! {
     (u64x2, i64x2),
     (u64x4, i64x4),
@@ -593,7 +682,7 @@
     u64
 }
 
-#[cfg(all(feature = "simd_support", feature = "nightly"))]
+#[cfg(feature = "simd_support")]
 uniform_simd_int_impl! {
     (u32x2, i32x2),
     (u32x4, i32x4),
@@ -602,7 +691,7 @@
     u32
 }
 
-#[cfg(all(feature = "simd_support", feature = "nightly"))]
+#[cfg(feature = "simd_support")]
 uniform_simd_int_impl! {
     (u16x2, i16x2),
     (u16x4, i16x4),
@@ -612,7 +701,7 @@
     u16
 }
 
-#[cfg(all(feature = "simd_support", feature = "nightly"))]
+#[cfg(feature = "simd_support")]
 uniform_simd_int_impl! {
     (u8x2, i8x2),
     (u8x4, i8x4),
@@ -623,6 +712,78 @@
     u8
 }
 
+impl SampleUniform for char {
+    type Sampler = UniformChar;
+}
+
+/// The back-end implementing [`UniformSampler`] for `char`.
+///
+/// Unless you are implementing [`UniformSampler`] for your own type, this type
+/// should not be used directly, use [`Uniform`] instead.
+///
+/// This differs from integer range sampling since the range `0xD800..=0xDFFF`
+/// are used for surrogate pairs in UCS and UTF-16, and consequently are not
+/// valid Unicode code points. We must therefore avoid sampling values in this
+/// range.
+#[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+pub struct UniformChar {
+    sampler: UniformInt<u32>,
+}
+
+/// UTF-16 surrogate range start
+const CHAR_SURROGATE_START: u32 = 0xD800;
+/// UTF-16 surrogate range size
+const CHAR_SURROGATE_LEN: u32 = 0xE000 - CHAR_SURROGATE_START;
+
+/// Convert `char` to compressed `u32`
+fn char_to_comp_u32(c: char) -> u32 {
+    match c as u32 {
+        c if c >= CHAR_SURROGATE_START => c - CHAR_SURROGATE_LEN,
+        c => c,
+    }
+}
+
+impl UniformSampler for UniformChar {
+    type X = char;
+
+    #[inline] // if the range is constant, this helps LLVM to do the
+              // calculations at compile-time.
+    fn new<B1, B2>(low_b: B1, high_b: B2) -> Self
+    where
+        B1: SampleBorrow<Self::X> + Sized,
+        B2: SampleBorrow<Self::X> + Sized,
+    {
+        let low = char_to_comp_u32(*low_b.borrow());
+        let high = char_to_comp_u32(*high_b.borrow());
+        let sampler = UniformInt::<u32>::new(low, high);
+        UniformChar { sampler }
+    }
+
+    #[inline] // if the range is constant, this helps LLVM to do the
+              // calculations at compile-time.
+    fn new_inclusive<B1, B2>(low_b: B1, high_b: B2) -> Self
+    where
+        B1: SampleBorrow<Self::X> + Sized,
+        B2: SampleBorrow<Self::X> + Sized,
+    {
+        let low = char_to_comp_u32(*low_b.borrow());
+        let high = char_to_comp_u32(*high_b.borrow());
+        let sampler = UniformInt::<u32>::new_inclusive(low, high);
+        UniformChar { sampler }
+    }
+
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
+        let mut x = self.sampler.sample(rng);
+        if x >= CHAR_SURROGATE_START {
+            x += CHAR_SURROGATE_LEN;
+        }
+        // SAFETY: x must not be in surrogate range or greater than char::MAX.
+        // This relies on range constructors which accept char arguments.
+        // Validity of input char values is assumed.
+        unsafe { core::char::from_u32_unchecked(x) }
+    }
+}
 
 /// The back-end implementing [`UniformSampler`] for floating-point types.
 ///
@@ -644,6 +805,7 @@
 /// [`new_inclusive`]: UniformSampler::new_inclusive
 /// [`Standard`]: crate::distributions::Standard
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct UniformFloat<X> {
     low: X,
     scale: X,
@@ -665,16 +827,21 @@
             {
                 let low = *low_b.borrow();
                 let high = *high_b.borrow();
-                assert!(low.all_lt(high), "Uniform::new called with `low >= high`");
-                assert!(
-                    low.all_finite() && high.all_finite(),
-                    "Uniform::new called with non-finite boundaries"
+                debug_assert!(
+                    low.all_finite(),
+                    "Uniform::new called with `low` non-finite."
                 );
+                debug_assert!(
+                    high.all_finite(),
+                    "Uniform::new called with `high` non-finite."
+                );
+                assert!(low.all_lt(high), "Uniform::new called with `low >= high`");
                 let max_rand = <$ty>::splat(
                     (::core::$u_scalar::MAX >> $bits_to_discard).into_float_with_exponent(0) - 1.0,
                 );
 
                 let mut scale = high - low;
+                assert!(scale.all_finite(), "Uniform::new: range overflow");
 
                 loop {
                     let mask = (scale * max_rand + low).ge_mask(high);
@@ -696,19 +863,24 @@
             {
                 let low = *low_b.borrow();
                 let high = *high_b.borrow();
+                debug_assert!(
+                    low.all_finite(),
+                    "Uniform::new_inclusive called with `low` non-finite."
+                );
+                debug_assert!(
+                    high.all_finite(),
+                    "Uniform::new_inclusive called with `high` non-finite."
+                );
                 assert!(
                     low.all_le(high),
                     "Uniform::new_inclusive called with `low > high`"
                 );
-                assert!(
-                    low.all_finite() && high.all_finite(),
-                    "Uniform::new_inclusive called with non-finite boundaries"
-                );
                 let max_rand = <$ty>::splat(
                     (::core::$u_scalar::MAX >> $bits_to_discard).into_float_with_exponent(0) - 1.0,
                 );
 
                 let mut scale = (high - low) / max_rand;
+                assert!(scale.all_finite(), "Uniform::new_inclusive: range overflow");
 
                 loop {
                     let mask = (scale * max_rand + low).gt_mask(high);
@@ -747,11 +919,20 @@
             {
                 let low = *low_b.borrow();
                 let high = *high_b.borrow();
+                debug_assert!(
+                    low.all_finite(),
+                    "UniformSampler::sample_single called with `low` non-finite."
+                );
+                debug_assert!(
+                    high.all_finite(),
+                    "UniformSampler::sample_single called with `high` non-finite."
+                );
                 assert!(
                     low.all_lt(high),
                     "UniformSampler::sample_single: low >= high"
                 );
                 let mut scale = high - low;
+                assert!(scale.all_finite(), "UniformSampler::sample_single: range overflow");
 
                 loop {
                     // Generate a value in the range [1, 2)
@@ -837,12 +1018,14 @@
 /// Unless you are implementing [`UniformSampler`] for your own types, this type
 /// should not be used directly, use [`Uniform`] instead.
 #[derive(Clone, Copy, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct UniformDuration {
     mode: UniformDurationMode,
     offset: u32,
 }
 
 #[derive(Debug, Copy, Clone)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 enum UniformDurationMode {
     Small {
         secs: u64,
@@ -947,7 +1130,7 @@
                 max_nanos,
                 secs,
             } => {
-                // constant folding means this is at least as fast as `gen_range`
+                // constant folding means this is at least as fast as `Rng::sample(Range)`
                 let nano_range = Uniform::new(0, 1_000_000_000);
                 loop {
                     let s = secs.sample(rng);
@@ -967,6 +1150,56 @@
     use super::*;
     use crate::rngs::mock::StepRng;
 
+    #[test]
+    #[cfg(feature = "serde1")]
+    fn test_serialization_uniform_duration() {
+        let distr = UniformDuration::new(std::time::Duration::from_secs(10), std::time::Duration::from_secs(60));
+        let de_distr: UniformDuration = bincode::deserialize(&bincode::serialize(&distr).unwrap()).unwrap();
+        assert_eq!(
+            distr.offset, de_distr.offset
+        );
+        match (distr.mode, de_distr.mode) {
+            (UniformDurationMode::Small {secs: a_secs, nanos: a_nanos}, UniformDurationMode::Small {secs, nanos}) => {
+                assert_eq!(a_secs, secs);
+
+                assert_eq!(a_nanos.0.low, nanos.0.low);
+                assert_eq!(a_nanos.0.range, nanos.0.range);
+                assert_eq!(a_nanos.0.z, nanos.0.z);
+            }
+            (UniformDurationMode::Medium {nanos: a_nanos} , UniformDurationMode::Medium {nanos}) => {
+                assert_eq!(a_nanos.0.low, nanos.0.low);
+                assert_eq!(a_nanos.0.range, nanos.0.range);
+                assert_eq!(a_nanos.0.z, nanos.0.z);
+            }
+            (UniformDurationMode::Large {max_secs:a_max_secs, max_nanos:a_max_nanos, secs:a_secs}, UniformDurationMode::Large {max_secs, max_nanos, secs} ) => {
+                assert_eq!(a_max_secs, max_secs);
+                assert_eq!(a_max_nanos, max_nanos);
+
+                assert_eq!(a_secs.0.low, secs.0.low);
+                assert_eq!(a_secs.0.range, secs.0.range);
+                assert_eq!(a_secs.0.z, secs.0.z);
+            }
+            _ => panic!("`UniformDurationMode` was not serialized/deserialized correctly")
+        }
+    }
+    
+    #[test]
+    #[cfg(feature = "serde1")]
+    fn test_uniform_serialization() {
+        let unit_box: Uniform<i32>  = Uniform::new(-1, 1);
+        let de_unit_box: Uniform<i32> = bincode::deserialize(&bincode::serialize(&unit_box).unwrap()).unwrap();
+
+        assert_eq!(unit_box.0.low, de_unit_box.0.low);
+        assert_eq!(unit_box.0.range, de_unit_box.0.range);
+        assert_eq!(unit_box.0.z, de_unit_box.0.z);
+
+        let unit_box: Uniform<f32> = Uniform::new(-1., 1.);
+        let de_unit_box: Uniform<f32> = bincode::deserialize(&bincode::serialize(&unit_box).unwrap()).unwrap();
+
+        assert_eq!(unit_box.0.low, de_unit_box.0.low);
+        assert_eq!(unit_box.0.scale, de_unit_box.0.scale);
+    }
+
     #[should_panic]
     #[test]
     fn test_uniform_bad_limits_equal_int() {
@@ -1024,9 +1257,14 @@
                     }
 
                     for _ in 0..1000 {
-                        let v: $ty = rng.gen_range(low, high);
+                        let v = <$ty as SampleUniform>::Sampler::sample_single(low, high, &mut rng);
                         assert!($le(low, v) && $lt(v, high));
                     }
+
+                    for _ in 0..1000 {
+                        let v = <$ty as SampleUniform>::Sampler::sample_single_inclusive(low, high, &mut rng);
+                        assert!($le(low, v) && $le(v, high));
+                    }
                 }
             }};
 
@@ -1058,7 +1296,7 @@
         #[cfg(not(target_os = "emscripten"))]
         t!(i128, u128);
 
-        #[cfg(all(feature = "simd_support", feature = "nightly"))]
+        #[cfg(feature = "simd_support")]
         {
             t!(u8x2, u8x4, u8x8, u8x16, u8x32, u8x64 => u8);
             t!(i8x2, i8x4, i8x8, i8x16, i8x32, i8x64 => i8);
@@ -1073,6 +1311,27 @@
 
     #[test]
     #[cfg_attr(miri, ignore)] // Miri is too slow
+    fn test_char() {
+        let mut rng = crate::test::rng(891);
+        let mut max = core::char::from_u32(0).unwrap();
+        for _ in 0..100 {
+            let c = rng.gen_range('A'..='Z');
+            assert!(('A'..='Z').contains(&c));
+            max = max.max(c);
+        }
+        assert_eq!(max, 'Z');
+        let d = Uniform::new(
+            core::char::from_u32(0xD7F0).unwrap(),
+            core::char::from_u32(0xE010).unwrap(),
+        );
+        for _ in 0..100 {
+            let c = d.sample(&mut rng);
+            assert!((c as u32) < 0xD800 || (c as u32) > 0xDFFF);
+        }
+    }
+
+    #[test]
+    #[cfg_attr(miri, ignore)] // Miri is too slow
     fn test_floats() {
         let mut rng = crate::test::rng(252);
         let mut zero_rng = StepRng::new(0, 0);
@@ -1088,12 +1347,8 @@
                     (-<$f_scalar>::from_bits(10), -<$f_scalar>::from_bits(1)),
                     (-<$f_scalar>::from_bits(5), 0.0),
                     (-<$f_scalar>::from_bits(7), -0.0),
-                    (10.0, ::core::$f_scalar::MAX),
-                    (-100.0, ::core::$f_scalar::MAX),
-                    (-::core::$f_scalar::MAX / 5.0, ::core::$f_scalar::MAX),
-                    (-::core::$f_scalar::MAX, ::core::$f_scalar::MAX / 5.0),
-                    (-::core::$f_scalar::MAX * 0.8, ::core::$f_scalar::MAX * 0.7),
-                    (-::core::$f_scalar::MAX, ::core::$f_scalar::MAX),
+                    (0.1 * ::core::$f_scalar::MAX, ::core::$f_scalar::MAX),
+                    (-::core::$f_scalar::MAX * 0.2, ::core::$f_scalar::MAX * 0.7),
                 ];
                 for &(low_scalar, high_scalar) in v.iter() {
                     for lane in 0..<$ty>::lanes() {
@@ -1106,7 +1361,8 @@
                             assert!(low_scalar <= v && v < high_scalar);
                             let v = rng.sample(my_incl_uniform).extract(lane);
                             assert!(low_scalar <= v && v <= high_scalar);
-                            let v = rng.gen_range(low, high).extract(lane);
+                            let v = <$ty as SampleUniform>::Sampler
+                                ::sample_single(low, high, &mut rng).extract(lane);
                             assert!(low_scalar <= v && v < high_scalar);
                         }
 
@@ -1117,7 +1373,9 @@
 
                         assert_eq!(zero_rng.sample(my_uniform).extract(lane), low_scalar);
                         assert_eq!(zero_rng.sample(my_incl_uniform).extract(lane), low_scalar);
-                        assert_eq!(zero_rng.gen_range(low, high).extract(lane), low_scalar);
+                        assert_eq!(<$ty as SampleUniform>::Sampler
+                            ::sample_single(low, high, &mut zero_rng)
+                            .extract(lane), low_scalar);
                         assert!(max_rng.sample(my_uniform).extract(lane) < high_scalar);
                         assert!(max_rng.sample(my_incl_uniform).extract(lane) <= high_scalar);
 
@@ -1130,7 +1388,9 @@
                                 (-1i64 << $bits_shifted) as u64,
                             );
                             assert!(
-                                lowering_max_rng.gen_range(low, high).extract(lane) < high_scalar
+                                <$ty as SampleUniform>::Sampler
+                                    ::sample_single(low, high, &mut lowering_max_rng)
+                                    .extract(lane) < high_scalar
                             );
                         }
                     }
@@ -1168,6 +1428,19 @@
     }
 
     #[test]
+    #[should_panic]
+    fn test_float_overflow() {
+        Uniform::from(::core::f64::MIN..::core::f64::MAX);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_float_overflow_single() {
+        let mut rng = crate::test::rng(252);
+        rng.gen_range(::core::f64::MIN..::core::f64::MAX);
+    }
+
+    #[test]
     #[cfg(all(
         feature = "std",
         not(target_arch = "wasm32"),
@@ -1178,7 +1451,7 @@
         use std::panic::catch_unwind;
         fn range<T: SampleUniform>(low: T, high: T) {
             let mut rng = crate::test::rng(253);
-            rng.gen_range(low, high);
+            T::Sampler::sample_single(low, high, &mut rng);
         }
 
         macro_rules! t {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/unit_circle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/unit_circle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/unit_circle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/unit_circle.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(deprecated)]
-#![allow(clippy::all)]
-
-use crate::distributions::{Distribution, Uniform};
-use crate::Rng;
-
-/// Samples uniformly from the edge of the unit circle in two dimensions.
-///
-/// Implemented via a method by von Neumann[^1].
-///
-/// [^1]: von Neumann, J. (1951) [*Various Techniques Used in Connection with
-///       Random Digits.*](https://mcnp.lanl.gov/pdf_files/nbs_vonneumann.pdf)
-///       NBS Appl. Math. Ser., No. 12. Washington, DC: U.S. Government Printing
-///       Office, pp. 36-38.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct UnitCircle;
-
-impl UnitCircle {
-    /// Construct a new `UnitCircle` distribution.
-    #[inline]
-    pub fn new() -> UnitCircle {
-        UnitCircle
-    }
-}
-
-impl Distribution<[f64; 2]> for UnitCircle {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> [f64; 2] {
-        let uniform = Uniform::new(-1., 1.);
-        let mut x1;
-        let mut x2;
-        let mut sum;
-        loop {
-            x1 = uniform.sample(rng);
-            x2 = uniform.sample(rng);
-            sum = x1 * x1 + x2 * x2;
-            if sum < 1. {
-                break;
-            }
-        }
-        let diff = x1 * x1 - x2 * x2;
-        [diff / sum, 2. * x1 * x2 / sum]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::UnitCircle;
-    use crate::distributions::Distribution;
-
-    /// Assert that two numbers are almost equal to each other.
-    ///
-    /// On panic, this macro will print the values of the expressions with their
-    /// debug representations.
-    macro_rules! assert_almost_eq {
-        ($a:expr, $b:expr, $prec:expr) => {
-            let diff = ($a - $b).abs();
-            if diff > $prec {
-                panic!(format!(
-                    "assertion failed: `abs(left - right) = {:.1e} < {:e}`, \
-                     (left: `{}`, right: `{}`)",
-                    diff, $prec, $a, $b
-                ));
-            }
-        };
-    }
-
-    #[test]
-    fn norm() {
-        let mut rng = crate::test::rng(1);
-        let dist = UnitCircle::new();
-        for _ in 0..1000 {
-            let x = dist.sample(&mut rng);
-            assert_almost_eq!(x[0] * x[0] + x[1] * x[1], 1., 1e-15);
-        }
-    }
-
-    #[test]
-    fn value_stability() {
-        let mut rng = crate::test::rng(2);
-        let expected = [
-            [-0.9965658683520504, -0.08280380447614634],
-            [-0.9790853270389644, -0.20345004884984505],
-            [-0.8449189758898707, 0.5348943112253227],
-        ];
-        let samples = [
-            UnitCircle.sample(&mut rng),
-            UnitCircle.sample(&mut rng),
-            UnitCircle.sample(&mut rng),
-        ];
-        assert_eq!(samples, expected);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/unit_sphere.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/unit_sphere.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/unit_sphere.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/unit_sphere.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(deprecated)]
-#![allow(clippy::all)]
-
-use crate::distributions::{Distribution, Uniform};
-use crate::Rng;
-
-/// Samples uniformly from the surface of the unit sphere in three dimensions.
-///
-/// Implemented via a method by Marsaglia[^1].
-///
-/// [^1]: Marsaglia, George (1972). [*Choosing a Point from the Surface of a
-///       Sphere.*](https://doi.org/10.1214/aoms/1177692644)
-///       Ann. Math. Statist. 43, no. 2, 645--646.
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct UnitSphereSurface;
-
-impl UnitSphereSurface {
-    /// Construct a new `UnitSphereSurface` distribution.
-    #[inline]
-    pub fn new() -> UnitSphereSurface {
-        UnitSphereSurface
-    }
-}
-
-impl Distribution<[f64; 3]> for UnitSphereSurface {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> [f64; 3] {
-        let uniform = Uniform::new(-1., 1.);
-        loop {
-            let (x1, x2) = (uniform.sample(rng), uniform.sample(rng));
-            let sum = x1 * x1 + x2 * x2;
-            if sum >= 1. {
-                continue;
-            }
-            let factor = 2. * (1.0_f64 - sum).sqrt();
-            return [x1 * factor, x2 * factor, 1. - 2. * sum];
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::UnitSphereSurface;
-    use crate::distributions::Distribution;
-
-    /// Assert that two numbers are almost equal to each other.
-    ///
-    /// On panic, this macro will print the values of the expressions with their
-    /// debug representations.
-    macro_rules! assert_almost_eq {
-        ($a:expr, $b:expr, $prec:expr) => {
-            let diff = ($a - $b).abs();
-            if diff > $prec {
-                panic!(format!(
-                    "assertion failed: `abs(left - right) = {:.1e} < {:e}`, \
-                     (left: `{}`, right: `{}`)",
-                    diff, $prec, $a, $b
-                ));
-            }
-        };
-    }
-
-    #[test]
-    fn norm() {
-        let mut rng = crate::test::rng(1);
-        let dist = UnitSphereSurface::new();
-        for _ in 0..1000 {
-            let x = dist.sample(&mut rng);
-            assert_almost_eq!(x[0] * x[0] + x[1] * x[1] + x[2] * x[2], 1., 1e-15);
-        }
-    }
-
-    #[test]
-    fn value_stability() {
-        let mut rng = crate::test::rng(2);
-        let expected = [
-            [0.03247542860231647, -0.7830477442152738, 0.6211131755296027],
-            [-0.09978440840914075, 0.9706650829833128, -0.21875184231323952],
-            [0.2735582468624679, 0.9435374242279655, -0.1868234852870203],
-        ];
-        let samples = [
-            UnitSphereSurface.sample(&mut rng),
-            UnitSphereSurface.sample(&mut rng),
-            UnitSphereSurface.sample(&mut rng),
-        ];
-        assert_eq!(samples, expected);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/utils.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,12 +8,10 @@
 
 //! Math helper functions
 
-#[cfg(feature = "std")] use crate::distributions::ziggurat_tables;
-#[cfg(feature = "std")] use crate::Rng;
 #[cfg(feature = "simd_support")] use packed_simd::*;
 
 
-pub trait WideningMultiply<RHS = Self> {
+pub(crate) trait WideningMultiply<RHS = Self> {
     type Output;
 
     fn wmul(self, x: RHS) -> Self::Output;
@@ -145,7 +143,7 @@
 #[cfg(target_pointer_width = "64")]
 wmul_impl_usize! { u64 }
 
-#[cfg(all(feature = "simd_support", feature = "nightly"))]
+#[cfg(feature = "simd_support")]
 mod simd_wmul {
     use super::*;
     #[cfg(target_arch = "x86")] use core::arch::x86::*;
@@ -161,9 +159,8 @@
     }
 
     wmul_impl! { (u16x2, u32x2),, 16 }
-    #[cfg(not(target_feature = "sse2"))]
     wmul_impl! { (u16x4, u32x4),, 16 }
-    #[cfg(not(target_feature = "sse4.2"))]
+    #[cfg(not(target_feature = "sse2"))]
     wmul_impl! { (u16x8, u32x8),, 16 }
     #[cfg(not(target_feature = "avx2"))]
     wmul_impl! { (u16x16, u32x16),, 16 }
@@ -189,8 +186,6 @@
     }
 
     #[cfg(target_feature = "sse2")]
-    wmul_impl_16! { u16x4, __m64, _mm_mulhi_pu16, _mm_mullo_pi16 }
-    #[cfg(target_feature = "sse4.2")]
     wmul_impl_16! { u16x8, __m128i, _mm_mulhi_epu16, _mm_mullo_epi16 }
     #[cfg(target_feature = "avx2")]
     wmul_impl_16! { u16x16, __m256i, _mm256_mulhi_epu16, _mm256_mullo_epi16 }
@@ -210,9 +205,6 @@
     wmul_impl_large! { (u32x16,) u32, 16 }
     wmul_impl_large! { (u64x2, u64x4, u64x8,) u64, 32 }
 }
-#[cfg(all(feature = "simd_support", feature = "nightly"))]
-pub use self::simd_wmul::*;
-
 
 /// Helper trait when dealing with scalar and SIMD floating point types.
 pub(crate) trait FloatSIMDUtils {
@@ -243,6 +235,8 @@
 
 /// Implement functions available in std builds but missing from core primitives
 #[cfg(not(std))]
+// False positive: We are following `std` here.
+#[allow(clippy::wrong_self_convention)]
 pub(crate) trait Float: Sized {
     fn is_nan(self) -> bool;
     fn is_infinite(self) -> bool;
@@ -435,113 +429,3 @@
 #[cfg(feature="simd_support")] simd_impl! { f64x2, f64, m64x2, u64x2 }
 #[cfg(feature="simd_support")] simd_impl! { f64x4, f64, m64x4, u64x4 }
 #[cfg(feature="simd_support")] simd_impl! { f64x8, f64, m64x8, u64x8 }
-
-/// Calculates ln(gamma(x)) (natural logarithm of the gamma
-/// function) using the Lanczos approximation.
-///
-/// The approximation expresses the gamma function as:
-/// `gamma(z+1) = sqrt(2*pi)*(z+g+0.5)^(z+0.5)*exp(-z-g-0.5)*Ag(z)`
-/// `g` is an arbitrary constant; we use the approximation with `g=5`.
-///
-/// Noting that `gamma(z+1) = z*gamma(z)` and applying `ln` to both sides:
-/// `ln(gamma(z)) = (z+0.5)*ln(z+g+0.5)-(z+g+0.5) + ln(sqrt(2*pi)*Ag(z)/z)`
-///
-/// `Ag(z)` is an infinite series with coefficients that can be calculated
-/// ahead of time - we use just the first 6 terms, which is good enough
-/// for most purposes.
-#[cfg(feature = "std")]
-pub fn log_gamma(x: f64) -> f64 {
-    // precalculated 6 coefficients for the first 6 terms of the series
-    let coefficients: [f64; 6] = [
-        76.18009172947146,
-        -86.50532032941677,
-        24.01409824083091,
-        -1.231739572450155,
-        0.1208650973866179e-2,
-        -0.5395239384953e-5,
-    ];
-
-    // (x+0.5)*ln(x+g+0.5)-(x+g+0.5)
-    let tmp = x + 5.5;
-    let log = (x + 0.5) * tmp.ln() - tmp;
-
-    // the first few terms of the series for Ag(x)
-    let mut a = 1.000000000190015;
-    let mut denom = x;
-    for coeff in &coefficients {
-        denom += 1.0;
-        a += coeff / denom;
-    }
-
-    // get everything together
-    // a is Ag(x)
-    // 2.5066... is sqrt(2pi)
-    log + (2.5066282746310005 * a / x).ln()
-}
-
-/// Sample a random number using the Ziggurat method (specifically the
-/// ZIGNOR variant from Doornik 2005). Most of the arguments are
-/// directly from the paper:
-///
-/// * `rng`: source of randomness
-/// * `symmetric`: whether this is a symmetric distribution, or one-sided with P(x < 0) = 0.
-/// * `X`: the $x_i$ abscissae.
-/// * `F`: precomputed values of the PDF at the $x_i$, (i.e. $f(x_i)$)
-/// * `F_DIFF`: precomputed values of $f(x_i) - f(x_{i+1})$
-/// * `pdf`: the probability density function
-/// * `zero_case`: manual sampling from the tail when we chose the
-///    bottom box (i.e. i == 0)
-
-// the perf improvement (25-50%) is definitely worth the extra code
-// size from force-inlining.
-#[cfg(feature = "std")]
-#[inline(always)]
-pub fn ziggurat<R: Rng + ?Sized, P, Z>(
-    rng: &mut R,
-    symmetric: bool,
-    x_tab: ziggurat_tables::ZigTable,
-    f_tab: ziggurat_tables::ZigTable,
-    mut pdf: P,
-    mut zero_case: Z
-) -> f64
-where
-    P: FnMut(f64) -> f64,
-    Z: FnMut(&mut R, f64) -> f64,
-{
-    use crate::distributions::float::IntoFloat;
-    loop {
-        // As an optimisation we re-implement the conversion to a f64.
-        // From the remaining 12 most significant bits we use 8 to construct `i`.
-        // This saves us generating a whole extra random number, while the added
-        // precision of using 64 bits for f64 does not buy us much.
-        let bits = rng.next_u64();
-        let i = bits as usize & 0xff;
-
-        let u = if symmetric {
-            // Convert to a value in the range [2,4) and substract to get [-1,1)
-            // We can't convert to an open range directly, that would require
-            // substracting `3.0 - EPSILON`, which is not representable.
-            // It is possible with an extra step, but an open range does not
-            // seem neccesary for the ziggurat algorithm anyway.
-            (bits >> 12).into_float_with_exponent(1) - 3.0
-        } else {
-            // Convert to a value in the range [1,2) and substract to get (0,1)
-            (bits >> 12).into_float_with_exponent(0) - (1.0 - ::core::f64::EPSILON / 2.0)
-        };
-        let x = u * x_tab[i];
-
-        let test_x = if symmetric { x.abs() } else { x };
-
-        // algebraically equivalent to |u| < x_tab[i+1]/x_tab[i] (or u < x_tab[i+1]/x_tab[i])
-        if test_x < x_tab[i + 1] {
-            return x;
-        }
-        if i == 0 {
-            return zero_case(rng, u);
-        }
-        // algebraically equivalent to f1 + DRanU()*(f0 - f1) < 1
-        if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.gen::<f64>() < pdf(x) {
-            return x;
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weibull.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weibull.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weibull.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weibull.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Weibull distribution.
-#![allow(deprecated)]
-
-use crate::distributions::{Distribution, OpenClosed01};
-use crate::Rng;
-
-/// Samples floating-point numbers according to the Weibull distribution
-#[deprecated(since = "0.7.0", note = "moved to rand_distr crate")]
-#[derive(Clone, Copy, Debug)]
-pub struct Weibull {
-    inv_shape: f64,
-    scale: f64,
-}
-
-impl Weibull {
-    /// Construct a new `Weibull` distribution with given `scale` and `shape`.
-    ///
-    /// # Panics
-    ///
-    /// `scale` and `shape` have to be non-zero and positive.
-    pub fn new(scale: f64, shape: f64) -> Weibull {
-        assert!((scale > 0.) & (shape > 0.));
-        Weibull {
-            inv_shape: 1. / shape,
-            scale,
-        }
-    }
-}
-
-impl Distribution<f64> for Weibull {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let x: f64 = rng.sample(OpenClosed01);
-        self.scale * (-x.ln()).powf(self.inv_shape)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Weibull;
-    use crate::distributions::Distribution;
-
-    #[test]
-    #[should_panic]
-    fn invalid() {
-        Weibull::new(0., 0.);
-    }
-
-    #[test]
-    fn sample() {
-        let scale = 1.0;
-        let shape = 2.0;
-        let d = Weibull::new(scale, shape);
-        let mut rng = crate::test::rng(1);
-        for _ in 0..1000 {
-            let r = d.sample(&mut rng);
-            assert!(r >= 0.);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weighted/alias_method.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weighted/alias_method.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weighted/alias_method.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weighted/alias_method.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,517 +0,0 @@
-//! This module contains an implementation of alias method for sampling random
-//! indices with probabilities proportional to a collection of weights.
-
-use super::WeightedError;
-#[cfg(not(feature = "std"))] use crate::alloc::vec;
-#[cfg(not(feature = "std"))] use crate::alloc::vec::Vec;
-use crate::distributions::uniform::SampleUniform;
-use crate::distributions::Distribution;
-use crate::distributions::Uniform;
-use crate::Rng;
-use core::fmt;
-use core::iter::Sum;
-use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Sub, SubAssign};
-
-/// A distribution using weighted sampling to pick a discretely selected item.
-///
-/// Sampling a [`WeightedIndex<W>`] distribution returns the index of a randomly
-/// selected element from the vector used to create the [`WeightedIndex<W>`].
-/// The chance of a given element being picked is proportional to the value of
-/// the element. The weights can have any type `W` for which a implementation of
-/// [`Weight`] exists.
-///
-/// # Performance
-///
-/// Given that `n` is the number of items in the vector used to create an
-/// [`WeightedIndex<W>`], [`WeightedIndex<W>`] will require `O(n)` amount of
-/// memory. More specifically it takes up some constant amount of memory plus
-/// the vector used to create it and a [`Vec<u32>`] with capacity `n`.
-///
-/// Time complexity for the creation of a [`WeightedIndex<W>`] is `O(n)`.
-/// Sampling is `O(1)`, it makes a call to [`Uniform<u32>::sample`] and a call
-/// to [`Uniform<W>::sample`].
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::weighted::alias_method::WeightedIndex;
-/// use rand::prelude::*;
-///
-/// let choices = vec!['a', 'b', 'c'];
-/// let weights = vec![2, 1, 1];
-/// let dist = WeightedIndex::new(weights).unwrap();
-/// let mut rng = thread_rng();
-/// for _ in 0..100 {
-///     // 50% chance to print 'a', 25% chance to print 'b', 25% chance to print 'c'
-///     println!("{}", choices[dist.sample(&mut rng)]);
-/// }
-///
-/// let items = [('a', 0), ('b', 3), ('c', 7)];
-/// let dist2 = WeightedIndex::new(items.iter().map(|item| item.1).collect()).unwrap();
-/// for _ in 0..100 {
-///     // 0% chance to print 'a', 30% chance to print 'b', 70% chance to print 'c'
-///     println!("{}", items[dist2.sample(&mut rng)].0);
-/// }
-/// ```
-///
-/// [`WeightedIndex<W>`]: crate::distributions::weighted::alias_method::WeightedIndex
-/// [`Weight`]: crate::distributions::weighted::alias_method::Weight
-/// [`Vec<u32>`]: Vec
-/// [`Uniform<u32>::sample`]: Distribution::sample
-/// [`Uniform<W>::sample`]: Distribution::sample
-pub struct WeightedIndex<W: Weight> {
-    aliases: Vec<u32>,
-    no_alias_odds: Vec<W>,
-    uniform_index: Uniform<u32>,
-    uniform_within_weight_sum: Uniform<W>,
-}
-
-impl<W: Weight> WeightedIndex<W> {
-    /// Creates a new [`WeightedIndex`].
-    ///
-    /// Returns an error if:
-    /// - The vector is empty.
-    /// - The vector is longer than `u32::MAX`.
-    /// - For any weight `w`: `w < 0` or `w > max` where `max = W::MAX /
-    ///   weights.len()`.
-    /// - The sum of weights is zero.
-    pub fn new(weights: Vec<W>) -> Result<Self, WeightedError> {
-        let n = weights.len();
-        if n == 0 {
-            return Err(WeightedError::NoItem);
-        } else if n > ::core::u32::MAX as usize {
-            return Err(WeightedError::TooMany);
-        }
-        let n = n as u32;
-
-        let max_weight_size = W::try_from_u32_lossy(n)
-            .map(|n| W::MAX / n)
-            .unwrap_or(W::ZERO);
-        if !weights
-            .iter()
-            .all(|&w| W::ZERO <= w && w <= max_weight_size)
-        {
-            return Err(WeightedError::InvalidWeight);
-        }
-
-        // The sum of weights will represent 100% of no alias odds.
-        let weight_sum = Weight::sum(weights.as_slice());
-        // Prevent floating point overflow due to rounding errors.
-        let weight_sum = if weight_sum > W::MAX {
-            W::MAX
-        } else {
-            weight_sum
-        };
-        if weight_sum == W::ZERO {
-            return Err(WeightedError::AllWeightsZero);
-        }
-
-        // `weight_sum` would have been zero if `try_from_lossy` causes an error here.
-        let n_converted = W::try_from_u32_lossy(n).unwrap();
-
-        let mut no_alias_odds = weights;
-        for odds in no_alias_odds.iter_mut() {
-            *odds *= n_converted;
-            // Prevent floating point overflow due to rounding errors.
-            *odds = if *odds > W::MAX { W::MAX } else { *odds };
-        }
-
-        /// This struct is designed to contain three data structures at once,
-        /// sharing the same memory. More precisely it contains two linked lists
-        /// and an alias map, which will be the output of this method. To keep
-        /// the three data structures from getting in each other's way, it must
-        /// be ensured that a single index is only ever in one of them at the
-        /// same time.
-        struct Aliases {
-            aliases: Vec<u32>,
-            smalls_head: u32,
-            bigs_head: u32,
-        }
-
-        impl Aliases {
-            fn new(size: u32) -> Self {
-                Aliases {
-                    aliases: vec![0; size as usize],
-                    smalls_head: ::core::u32::MAX,
-                    bigs_head: ::core::u32::MAX,
-                }
-            }
-
-            fn push_small(&mut self, idx: u32) {
-                self.aliases[idx as usize] = self.smalls_head;
-                self.smalls_head = idx;
-            }
-
-            fn push_big(&mut self, idx: u32) {
-                self.aliases[idx as usize] = self.bigs_head;
-                self.bigs_head = idx;
-            }
-
-            fn pop_small(&mut self) -> u32 {
-                let popped = self.smalls_head;
-                self.smalls_head = self.aliases[popped as usize];
-                popped
-            }
-
-            fn pop_big(&mut self) -> u32 {
-                let popped = self.bigs_head;
-                self.bigs_head = self.aliases[popped as usize];
-                popped
-            }
-
-            fn smalls_is_empty(&self) -> bool {
-                self.smalls_head == ::core::u32::MAX
-            }
-
-            fn bigs_is_empty(&self) -> bool {
-                self.bigs_head == ::core::u32::MAX
-            }
-
-            fn set_alias(&mut self, idx: u32, alias: u32) {
-                self.aliases[idx as usize] = alias;
-            }
-        }
-
-        let mut aliases = Aliases::new(n);
-
-        // Split indices into those with small weights and those with big weights.
-        for (index, &odds) in no_alias_odds.iter().enumerate() {
-            if odds < weight_sum {
-                aliases.push_small(index as u32);
-            } else {
-                aliases.push_big(index as u32);
-            }
-        }
-
-        // Build the alias map by finding an alias with big weight for each index with
-        // small weight.
-        while !aliases.smalls_is_empty() && !aliases.bigs_is_empty() {
-            let s = aliases.pop_small();
-            let b = aliases.pop_big();
-
-            aliases.set_alias(s, b);
-            no_alias_odds[b as usize] =
-                no_alias_odds[b as usize] - weight_sum + no_alias_odds[s as usize];
-
-            if no_alias_odds[b as usize] < weight_sum {
-                aliases.push_small(b);
-            } else {
-                aliases.push_big(b);
-            }
-        }
-
-        // The remaining indices should have no alias odds of about 100%. This is due to
-        // numeric accuracy. Otherwise they would be exactly 100%.
-        while !aliases.smalls_is_empty() {
-            no_alias_odds[aliases.pop_small() as usize] = weight_sum;
-        }
-        while !aliases.bigs_is_empty() {
-            no_alias_odds[aliases.pop_big() as usize] = weight_sum;
-        }
-
-        // Prepare distributions for sampling. Creating them beforehand improves
-        // sampling performance.
-        let uniform_index = Uniform::new(0, n);
-        let uniform_within_weight_sum = Uniform::new(W::ZERO, weight_sum);
-
-        Ok(Self {
-            aliases: aliases.aliases,
-            no_alias_odds,
-            uniform_index,
-            uniform_within_weight_sum,
-        })
-    }
-}
-
-impl<W: Weight> Distribution<usize> for WeightedIndex<W> {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> usize {
-        let candidate = rng.sample(self.uniform_index);
-        if rng.sample(&self.uniform_within_weight_sum) < self.no_alias_odds[candidate as usize] {
-            candidate as usize
-        } else {
-            self.aliases[candidate as usize] as usize
-        }
-    }
-}
-
-impl<W: Weight> fmt::Debug for WeightedIndex<W>
-where
-    W: fmt::Debug,
-    Uniform<W>: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("WeightedIndex")
-            .field("aliases", &self.aliases)
-            .field("no_alias_odds", &self.no_alias_odds)
-            .field("uniform_index", &self.uniform_index)
-            .field("uniform_within_weight_sum", &self.uniform_within_weight_sum)
-            .finish()
-    }
-}
-
-impl<W: Weight> Clone for WeightedIndex<W>
-where Uniform<W>: Clone
-{
-    fn clone(&self) -> Self {
-        Self {
-            aliases: self.aliases.clone(),
-            no_alias_odds: self.no_alias_odds.clone(),
-            uniform_index: self.uniform_index.clone(),
-            uniform_within_weight_sum: self.uniform_within_weight_sum.clone(),
-        }
-    }
-}
-
-/// Trait that must be implemented for weights, that are used with
-/// [`WeightedIndex`]. Currently no guarantees on the correctness of
-/// [`WeightedIndex`] are given for custom implementations of this trait.
-pub trait Weight:
-    Sized
-    + Copy
-    + SampleUniform
-    + PartialOrd
-    + Add<Output = Self>
-    + AddAssign
-    + Sub<Output = Self>
-    + SubAssign
-    + Mul<Output = Self>
-    + MulAssign
-    + Div<Output = Self>
-    + DivAssign
-    + Sum
-{
-    /// Maximum number representable by `Self`.
-    const MAX: Self;
-
-    /// Element of `Self` equivalent to 0.
-    const ZERO: Self;
-
-    /// Produce an instance of `Self` from a `u32` value, or return `None` if
-    /// out of range. Loss of precision (where `Self` is a floating point type)
-    /// is acceptable.
-    fn try_from_u32_lossy(n: u32) -> Option<Self>;
-
-    /// Sums all values in slice `values`.
-    fn sum(values: &[Self]) -> Self {
-        values.iter().map(|x| *x).sum()
-    }
-}
-
-macro_rules! impl_weight_for_float {
-    ($T: ident) => {
-        impl Weight for $T {
-            const MAX: Self = ::core::$T::MAX;
-            const ZERO: Self = 0.0;
-
-            fn try_from_u32_lossy(n: u32) -> Option<Self> {
-                Some(n as $T)
-            }
-
-            fn sum(values: &[Self]) -> Self {
-                pairwise_sum(values)
-            }
-        }
-    };
-}
-
-/// In comparison to naive accumulation, the pairwise sum algorithm reduces
-/// rounding errors when there are many floating point values.
-fn pairwise_sum<T: Weight>(values: &[T]) -> T {
-    if values.len() <= 32 {
-        values.iter().map(|x| *x).sum()
-    } else {
-        let mid = values.len() / 2;
-        let (a, b) = values.split_at(mid);
-        pairwise_sum(a) + pairwise_sum(b)
-    }
-}
-
-macro_rules! impl_weight_for_int {
-    ($T: ident) => {
-        impl Weight for $T {
-            const MAX: Self = ::core::$T::MAX;
-            const ZERO: Self = 0;
-
-            fn try_from_u32_lossy(n: u32) -> Option<Self> {
-                let n_converted = n as Self;
-                if n_converted >= Self::ZERO && n_converted as u32 == n {
-                    Some(n_converted)
-                } else {
-                    None
-                }
-            }
-        }
-    };
-}
-
-impl_weight_for_float!(f64);
-impl_weight_for_float!(f32);
-impl_weight_for_int!(usize);
-#[cfg(not(target_os = "emscripten"))]
-impl_weight_for_int!(u128);
-impl_weight_for_int!(u64);
-impl_weight_for_int!(u32);
-impl_weight_for_int!(u16);
-impl_weight_for_int!(u8);
-impl_weight_for_int!(isize);
-#[cfg(not(target_os = "emscripten"))]
-impl_weight_for_int!(i128);
-impl_weight_for_int!(i64);
-impl_weight_for_int!(i32);
-impl_weight_for_int!(i16);
-impl_weight_for_int!(i8);
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_weighted_index_f32() {
-        test_weighted_index(f32::into);
-
-        // Floating point special cases
-        assert_eq!(
-            WeightedIndex::new(vec![::core::f32::INFINITY]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-        assert_eq!(
-            WeightedIndex::new(vec![-0_f32]).unwrap_err(),
-            WeightedError::AllWeightsZero
-        );
-        assert_eq!(
-            WeightedIndex::new(vec![-1_f32]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-        assert_eq!(
-            WeightedIndex::new(vec![-::core::f32::INFINITY]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-        assert_eq!(
-            WeightedIndex::new(vec![::core::f32::NAN]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-    }
-
-    #[cfg(not(target_os = "emscripten"))]
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_weighted_index_u128() {
-        test_weighted_index(|x: u128| x as f64);
-    }
-
-    #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_weighted_index_i128() {
-        test_weighted_index(|x: i128| x as f64);
-
-        // Signed integer special cases
-        assert_eq!(
-            WeightedIndex::new(vec![-1_i128]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-        assert_eq!(
-            WeightedIndex::new(vec![::core::i128::MIN]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-    }
-
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_weighted_index_u8() {
-        test_weighted_index(u8::into);
-    }
-
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_weighted_index_i8() {
-        test_weighted_index(i8::into);
-
-        // Signed integer special cases
-        assert_eq!(
-            WeightedIndex::new(vec![-1_i8]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-        assert_eq!(
-            WeightedIndex::new(vec![::core::i8::MIN]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-    }
-
-    fn test_weighted_index<W: Weight, F: Fn(W) -> f64>(w_to_f64: F)
-    where WeightedIndex<W>: fmt::Debug {
-        const NUM_WEIGHTS: u32 = 10;
-        const ZERO_WEIGHT_INDEX: u32 = 3;
-        const NUM_SAMPLES: u32 = 15000;
-        let mut rng = crate::test::rng(0x9c9fa0b0580a7031);
-
-        let weights = {
-            let mut weights = Vec::with_capacity(NUM_WEIGHTS as usize);
-            let random_weight_distribution = crate::distributions::Uniform::new_inclusive(
-                W::ZERO,
-                W::MAX / W::try_from_u32_lossy(NUM_WEIGHTS).unwrap(),
-            );
-            for _ in 0..NUM_WEIGHTS {
-                weights.push(rng.sample(&random_weight_distribution));
-            }
-            weights[ZERO_WEIGHT_INDEX as usize] = W::ZERO;
-            weights
-        };
-        let weight_sum = weights.iter().map(|w| *w).sum::<W>();
-        let expected_counts = weights
-            .iter()
-            .map(|&w| w_to_f64(w) / w_to_f64(weight_sum) * NUM_SAMPLES as f64)
-            .collect::<Vec<f64>>();
-        let weight_distribution = WeightedIndex::new(weights).unwrap();
-
-        let mut counts = vec![0; NUM_WEIGHTS as usize];
-        for _ in 0..NUM_SAMPLES {
-            counts[rng.sample(&weight_distribution)] += 1;
-        }
-
-        assert_eq!(counts[ZERO_WEIGHT_INDEX as usize], 0);
-        for (count, expected_count) in counts.into_iter().zip(expected_counts) {
-            let difference = (count as f64 - expected_count).abs();
-            let max_allowed_difference = NUM_SAMPLES as f64 / NUM_WEIGHTS as f64 * 0.1;
-            assert!(difference <= max_allowed_difference);
-        }
-
-        assert_eq!(
-            WeightedIndex::<W>::new(vec![]).unwrap_err(),
-            WeightedError::NoItem
-        );
-        assert_eq!(
-            WeightedIndex::new(vec![W::ZERO]).unwrap_err(),
-            WeightedError::AllWeightsZero
-        );
-        assert_eq!(
-            WeightedIndex::new(vec![W::MAX, W::MAX]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-    }
-
-    #[test]
-    fn value_stability() {
-        fn test_samples<W: Weight>(weights: Vec<W>, buf: &mut [usize], expected: &[usize]) {
-            assert_eq!(buf.len(), expected.len());
-            let distr = WeightedIndex::new(weights).unwrap();
-            let mut rng = crate::test::rng(0x9c9fa0b0580a7031);
-            for r in buf.iter_mut() {
-                *r = rng.sample(&distr);
-            }
-            assert_eq!(buf, expected);
-        }
-
-        let mut buf = [0; 10];
-        test_samples(vec![1i32, 1, 1, 1, 1, 1, 1, 1, 1], &mut buf, &[
-            6, 5, 7, 5, 8, 7, 6, 2, 3, 7,
-        ]);
-        test_samples(vec![0.7f32, 0.1, 0.1, 0.1], &mut buf, &[
-            2, 0, 0, 0, 0, 0, 0, 0, 1, 3,
-        ]);
-        test_samples(vec![1.0f64, 0.999, 0.998, 0.997], &mut buf, &[
-            2, 1, 2, 3, 2, 1, 3, 2, 1, 1,
-        ]);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weighted/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weighted/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weighted/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weighted/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,413 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Weighted index sampling
-//!
-//! This module provides two implementations for sampling indices:
-//!
-//! *   [`WeightedIndex`] allows `O(log N)` sampling
-//! *   [`alias_method::WeightedIndex`] allows `O(1)` sampling, but with
-//!      much greater set-up cost
-//!      
-//! [`alias_method::WeightedIndex`]: alias_method/struct.WeightedIndex.html
-
-pub mod alias_method;
-
-use crate::distributions::uniform::{SampleBorrow, SampleUniform, UniformSampler};
-use crate::distributions::Distribution;
-use crate::Rng;
-use core::cmp::PartialOrd;
-use core::fmt;
-
-// Note that this whole module is only imported if feature="alloc" is enabled.
-#[cfg(not(feature = "std"))] use crate::alloc::vec::Vec;
-
-/// A distribution using weighted sampling to pick a discretely selected
-/// item.
-///
-/// Sampling a `WeightedIndex` distribution returns the index of a randomly
-/// selected element from the iterator used when the `WeightedIndex` was
-/// created. The chance of a given element being picked is proportional to the
-/// value of the element. The weights can use any type `X` for which an
-/// implementation of [`Uniform<X>`] exists.
-///
-/// # Performance
-///
-/// A `WeightedIndex<X>` contains a `Vec<X>` and a [`Uniform<X>`] and so its
-/// size is the sum of the size of those objects, possibly plus some alignment.
-///
-/// Creating a `WeightedIndex<X>` will allocate enough space to hold `N - 1`
-/// weights of type `X`, where `N` is the number of weights. However, since
-/// `Vec` doesn't guarantee a particular growth strategy, additional memory
-/// might be allocated but not used. Since the `WeightedIndex` object also
-/// contains, this might cause additional allocations, though for primitive
-/// types, ['Uniform<X>`] doesn't allocate any memory.
-///
-/// Time complexity of sampling from `WeightedIndex` is `O(log N)` where
-/// `N` is the number of weights.
-///
-/// Sampling from `WeightedIndex` will result in a single call to
-/// `Uniform<X>::sample` (method of the [`Distribution`] trait), which typically
-/// will request a single value from the underlying [`RngCore`], though the
-/// exact number depends on the implementaiton of `Uniform<X>::sample`.
-///
-/// # Example
-///
-/// ```
-/// use rand::prelude::*;
-/// use rand::distributions::WeightedIndex;
-///
-/// let choices = ['a', 'b', 'c'];
-/// let weights = [2,   1,   1];
-/// let dist = WeightedIndex::new(&weights).unwrap();
-/// let mut rng = thread_rng();
-/// for _ in 0..100 {
-///     // 50% chance to print 'a', 25% chance to print 'b', 25% chance to print 'c'
-///     println!("{}", choices[dist.sample(&mut rng)]);
-/// }
-///
-/// let items = [('a', 0), ('b', 3), ('c', 7)];
-/// let dist2 = WeightedIndex::new(items.iter().map(|item| item.1)).unwrap();
-/// for _ in 0..100 {
-///     // 0% chance to print 'a', 30% chance to print 'b', 70% chance to print 'c'
-///     println!("{}", items[dist2.sample(&mut rng)].0);
-/// }
-/// ```
-///
-/// [`Uniform<X>`]: crate::distributions::uniform::Uniform
-/// [`RngCore`]: crate::RngCore
-#[derive(Debug, Clone)]
-pub struct WeightedIndex<X: SampleUniform + PartialOrd> {
-    cumulative_weights: Vec<X>,
-    total_weight: X,
-    weight_distribution: X::Sampler,
-}
-
-impl<X: SampleUniform + PartialOrd> WeightedIndex<X> {
-    /// Creates a new a `WeightedIndex` [`Distribution`] using the values
-    /// in `weights`. The weights can use any type `X` for which an
-    /// implementation of [`Uniform<X>`] exists.
-    ///
-    /// Returns an error if the iterator is empty, if any weight is `< 0`, or
-    /// if its total value is 0.
-    ///
-    /// [`Uniform<X>`]: crate::distributions::uniform::Uniform
-    pub fn new<I>(weights: I) -> Result<WeightedIndex<X>, WeightedError>
-    where
-        I: IntoIterator,
-        I::Item: SampleBorrow<X>,
-        X: for<'a> ::core::ops::AddAssign<&'a X> + Clone + Default,
-    {
-        let mut iter = weights.into_iter();
-        let mut total_weight: X = iter.next().ok_or(WeightedError::NoItem)?.borrow().clone();
-
-        let zero = <X as Default>::default();
-        if total_weight < zero {
-            return Err(WeightedError::InvalidWeight);
-        }
-
-        let mut weights = Vec::<X>::with_capacity(iter.size_hint().0);
-        for w in iter {
-            if *w.borrow() < zero {
-                return Err(WeightedError::InvalidWeight);
-            }
-            weights.push(total_weight.clone());
-            total_weight += w.borrow();
-        }
-
-        if total_weight == zero {
-            return Err(WeightedError::AllWeightsZero);
-        }
-        let distr = X::Sampler::new(zero, total_weight.clone());
-
-        Ok(WeightedIndex {
-            cumulative_weights: weights,
-            total_weight,
-            weight_distribution: distr,
-        })
-    }
-
-    /// Update a subset of weights, without changing the number of weights.
-    ///
-    /// `new_weights` must be sorted by the index.
-    ///
-    /// Using this method instead of `new` might be more efficient if only a small number of
-    /// weights is modified. No allocations are performed, unless the weight type `X` uses
-    /// allocation internally.
-    ///
-    /// In case of error, `self` is not modified.
-    pub fn update_weights(&mut self, new_weights: &[(usize, &X)]) -> Result<(), WeightedError>
-    where X: for<'a> ::core::ops::AddAssign<&'a X>
-            + for<'a> ::core::ops::SubAssign<&'a X>
-            + Clone
-            + Default {
-        if new_weights.is_empty() {
-            return Ok(());
-        }
-
-        let zero = <X as Default>::default();
-
-        let mut total_weight = self.total_weight.clone();
-
-        // Check for errors first, so we don't modify `self` in case something
-        // goes wrong.
-        let mut prev_i = None;
-        for &(i, w) in new_weights {
-            if let Some(old_i) = prev_i {
-                if old_i >= i {
-                    return Err(WeightedError::InvalidWeight);
-                }
-            }
-            if *w < zero {
-                return Err(WeightedError::InvalidWeight);
-            }
-            if i >= self.cumulative_weights.len() + 1 {
-                return Err(WeightedError::TooMany);
-            }
-
-            let mut old_w = if i < self.cumulative_weights.len() {
-                self.cumulative_weights[i].clone()
-            } else {
-                self.total_weight.clone()
-            };
-            if i > 0 {
-                old_w -= &self.cumulative_weights[i - 1];
-            }
-
-            total_weight -= &old_w;
-            total_weight += w;
-            prev_i = Some(i);
-        }
-        if total_weight == zero {
-            return Err(WeightedError::AllWeightsZero);
-        }
-
-        // Update the weights. Because we checked all the preconditions in the
-        // previous loop, this should never panic.
-        let mut iter = new_weights.iter();
-
-        let mut prev_weight = zero.clone();
-        let mut next_new_weight = iter.next();
-        let &(first_new_index, _) = next_new_weight.unwrap();
-        let mut cumulative_weight = if first_new_index > 0 {
-            self.cumulative_weights[first_new_index - 1].clone()
-        } else {
-            zero.clone()
-        };
-        for i in first_new_index..self.cumulative_weights.len() {
-            match next_new_weight {
-                Some(&(j, w)) if i == j => {
-                    cumulative_weight += w;
-                    next_new_weight = iter.next();
-                }
-                _ => {
-                    let mut tmp = self.cumulative_weights[i].clone();
-                    tmp -= &prev_weight; // We know this is positive.
-                    cumulative_weight += &tmp;
-                }
-            }
-            prev_weight = cumulative_weight.clone();
-            core::mem::swap(&mut prev_weight, &mut self.cumulative_weights[i]);
-        }
-
-        self.total_weight = total_weight;
-        self.weight_distribution = X::Sampler::new(zero, self.total_weight.clone());
-
-        Ok(())
-    }
-}
-
-impl<X> Distribution<usize> for WeightedIndex<X>
-where X: SampleUniform + PartialOrd
-{
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> usize {
-        use ::core::cmp::Ordering;
-        let chosen_weight = self.weight_distribution.sample(rng);
-        // Find the first item which has a weight *higher* than the chosen weight.
-        self.cumulative_weights
-            .binary_search_by(|w| {
-                if *w <= chosen_weight {
-                    Ordering::Less
-                } else {
-                    Ordering::Greater
-                }
-            })
-            .unwrap_err()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_weightedindex() {
-        let mut r = crate::test::rng(700);
-        const N_REPS: u32 = 5000;
-        let weights = [1u32, 2, 3, 0, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7];
-        let total_weight = weights.iter().sum::<u32>() as f32;
-
-        let verify = |result: [i32; 14]| {
-            for (i, count) in result.iter().enumerate() {
-                let exp = (weights[i] * N_REPS) as f32 / total_weight;
-                let mut err = (*count as f32 - exp).abs();
-                if err != 0.0 {
-                    err /= exp;
-                }
-                assert!(err <= 0.25);
-            }
-        };
-
-        // WeightedIndex from vec
-        let mut chosen = [0i32; 14];
-        let distr = WeightedIndex::new(weights.to_vec()).unwrap();
-        for _ in 0..N_REPS {
-            chosen[distr.sample(&mut r)] += 1;
-        }
-        verify(chosen);
-
-        // WeightedIndex from slice
-        chosen = [0i32; 14];
-        let distr = WeightedIndex::new(&weights[..]).unwrap();
-        for _ in 0..N_REPS {
-            chosen[distr.sample(&mut r)] += 1;
-        }
-        verify(chosen);
-
-        // WeightedIndex from iterator
-        chosen = [0i32; 14];
-        let distr = WeightedIndex::new(weights.iter()).unwrap();
-        for _ in 0..N_REPS {
-            chosen[distr.sample(&mut r)] += 1;
-        }
-        verify(chosen);
-
-        for _ in 0..5 {
-            assert_eq!(WeightedIndex::new(&[0, 1]).unwrap().sample(&mut r), 1);
-            assert_eq!(WeightedIndex::new(&[1, 0]).unwrap().sample(&mut r), 0);
-            assert_eq!(
-                WeightedIndex::new(&[0, 0, 0, 0, 10, 0])
-                    .unwrap()
-                    .sample(&mut r),
-                4
-            );
-        }
-
-        assert_eq!(
-            WeightedIndex::new(&[10][0..0]).unwrap_err(),
-            WeightedError::NoItem
-        );
-        assert_eq!(
-            WeightedIndex::new(&[0]).unwrap_err(),
-            WeightedError::AllWeightsZero
-        );
-        assert_eq!(
-            WeightedIndex::new(&[10, 20, -1, 30]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-        assert_eq!(
-            WeightedIndex::new(&[-10, 20, 1, 30]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-        assert_eq!(
-            WeightedIndex::new(&[-10]).unwrap_err(),
-            WeightedError::InvalidWeight
-        );
-    }
-
-    #[test]
-    fn test_update_weights() {
-        let data = [
-            (
-                &[10u32, 2, 3, 4][..],
-                &[(1, &100), (2, &4)][..], // positive change
-                &[10, 100, 4, 4][..],
-            ),
-            (
-                &[1u32, 2, 3, 0, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7][..],
-                &[(2, &1), (5, &1), (13, &100)][..], // negative change and last element
-                &[1u32, 2, 1, 0, 5, 1, 7, 1, 2, 3, 4, 5, 6, 100][..],
-            ),
-        ];
-
-        for (weights, update, expected_weights) in data.iter() {
-            let total_weight = weights.iter().sum::<u32>();
-            let mut distr = WeightedIndex::new(weights.to_vec()).unwrap();
-            assert_eq!(distr.total_weight, total_weight);
-
-            distr.update_weights(update).unwrap();
-            let expected_total_weight = expected_weights.iter().sum::<u32>();
-            let expected_distr = WeightedIndex::new(expected_weights.to_vec()).unwrap();
-            assert_eq!(distr.total_weight, expected_total_weight);
-            assert_eq!(distr.total_weight, expected_distr.total_weight);
-            assert_eq!(distr.cumulative_weights, expected_distr.cumulative_weights);
-        }
-    }
-
-    #[test]
-    fn value_stability() {
-        fn test_samples<X: SampleUniform + PartialOrd, I>(
-            weights: I, buf: &mut [usize], expected: &[usize],
-        ) where
-            I: IntoIterator,
-            I::Item: SampleBorrow<X>,
-            X: for<'a> ::core::ops::AddAssign<&'a X> + Clone + Default,
-        {
-            assert_eq!(buf.len(), expected.len());
-            let distr = WeightedIndex::new(weights).unwrap();
-            let mut rng = crate::test::rng(701);
-            for r in buf.iter_mut() {
-                *r = rng.sample(&distr);
-            }
-            assert_eq!(buf, expected);
-        }
-
-        let mut buf = [0; 10];
-        test_samples(&[1i32, 1, 1, 1, 1, 1, 1, 1, 1], &mut buf, &[
-            0, 6, 2, 6, 3, 4, 7, 8, 2, 5,
-        ]);
-        test_samples(&[0.7f32, 0.1, 0.1, 0.1], &mut buf, &[
-            0, 0, 0, 1, 0, 0, 2, 3, 0, 0,
-        ]);
-        test_samples(&[1.0f64, 0.999, 0.998, 0.997], &mut buf, &[
-            2, 2, 1, 3, 2, 1, 3, 3, 2, 1,
-        ]);
-    }
-}
-
-/// Error type returned from `WeightedIndex::new`.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum WeightedError {
-    /// The provided weight collection contains no items.
-    NoItem,
-
-    /// A weight is either less than zero, greater than the supported maximum or
-    /// otherwise invalid.
-    InvalidWeight,
-
-    /// All items in the provided weight collection are zero.
-    AllWeightsZero,
-
-    /// Too many weights are provided (length greater than `u32::MAX`)
-    TooMany,
-}
-
-#[cfg(feature = "std")]
-impl ::std::error::Error for WeightedError {}
-
-impl fmt::Display for WeightedError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            WeightedError::NoItem => write!(f, "No weights provided."),
-            WeightedError::InvalidWeight => write!(f, "A weight is invalid."),
-            WeightedError::AllWeightsZero => write!(f, "All weights are zero."),
-            WeightedError::TooMany => write!(f, "Too many weights (hit u32::MAX)"),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weighted_index.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weighted_index.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weighted_index.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weighted_index.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,453 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Weighted index sampling
+
+use crate::distributions::uniform::{SampleBorrow, SampleUniform, UniformSampler};
+use crate::distributions::Distribution;
+use crate::Rng;
+use core::cmp::PartialOrd;
+use core::fmt;
+
+// Note that this whole module is only imported if feature="alloc" is enabled.
+use alloc::vec::Vec;
+
+#[cfg(feature = "serde1")]
+use serde::{Serialize, Deserialize};
+
+/// A distribution using weighted sampling of discrete items
+///
+/// Sampling a `WeightedIndex` distribution returns the index of a randomly
+/// selected element from the iterator used when the `WeightedIndex` was
+/// created. The chance of a given element being picked is proportional to the
+/// value of the element. The weights can use any type `X` for which an
+/// implementation of [`Uniform<X>`] exists.
+///
+/// # Performance
+///
+/// Time complexity of sampling from `WeightedIndex` is `O(log N)` where
+/// `N` is the number of weights. As an alternative,
+/// [`rand_distr::weighted_alias`](https://docs.rs/rand_distr/*/rand_distr/weighted_alias/index.html)
+/// supports `O(1)` sampling, but with much higher initialisation cost.
+///
+/// A `WeightedIndex<X>` contains a `Vec<X>` and a [`Uniform<X>`] and so its
+/// size is the sum of the size of those objects, possibly plus some alignment.
+///
+/// Creating a `WeightedIndex<X>` will allocate enough space to hold `N - 1`
+/// weights of type `X`, where `N` is the number of weights. However, since
+/// `Vec` doesn't guarantee a particular growth strategy, additional memory
+/// might be allocated but not used. Since the `WeightedIndex` object also
+/// contains, this might cause additional allocations, though for primitive
+/// types, [`Uniform<X>`] doesn't allocate any memory.
+///
+/// Sampling from `WeightedIndex` will result in a single call to
+/// `Uniform<X>::sample` (method of the [`Distribution`] trait), which typically
+/// will request a single value from the underlying [`RngCore`], though the
+/// exact number depends on the implementation of `Uniform<X>::sample`.
+///
+/// # Example
+///
+/// ```
+/// use rand::prelude::*;
+/// use rand::distributions::WeightedIndex;
+///
+/// let choices = ['a', 'b', 'c'];
+/// let weights = [2,   1,   1];
+/// let dist = WeightedIndex::new(&weights).unwrap();
+/// let mut rng = thread_rng();
+/// for _ in 0..100 {
+///     // 50% chance to print 'a', 25% chance to print 'b', 25% chance to print 'c'
+///     println!("{}", choices[dist.sample(&mut rng)]);
+/// }
+///
+/// let items = [('a', 0), ('b', 3), ('c', 7)];
+/// let dist2 = WeightedIndex::new(items.iter().map(|item| item.1)).unwrap();
+/// for _ in 0..100 {
+///     // 0% chance to print 'a', 30% chance to print 'b', 70% chance to print 'c'
+///     println!("{}", items[dist2.sample(&mut rng)].0);
+/// }
+/// ```
+///
+/// [`Uniform<X>`]: crate::distributions::Uniform
+/// [`RngCore`]: crate::RngCore
+#[derive(Debug, Clone)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
+pub struct WeightedIndex<X: SampleUniform + PartialOrd> {
+    cumulative_weights: Vec<X>,
+    total_weight: X,
+    weight_distribution: X::Sampler,
+}
+
+impl<X: SampleUniform + PartialOrd> WeightedIndex<X> {
+    /// Creates a new a `WeightedIndex` [`Distribution`] using the values
+    /// in `weights`. The weights can use any type `X` for which an
+    /// implementation of [`Uniform<X>`] exists.
+    ///
+    /// Returns an error if the iterator is empty, if any weight is `< 0`, or
+    /// if its total value is 0.
+    ///
+    /// [`Uniform<X>`]: crate::distributions::uniform::Uniform
+    pub fn new<I>(weights: I) -> Result<WeightedIndex<X>, WeightedError>
+    where
+        I: IntoIterator,
+        I::Item: SampleBorrow<X>,
+        X: for<'a> ::core::ops::AddAssign<&'a X> + Clone + Default,
+    {
+        let mut iter = weights.into_iter();
+        let mut total_weight: X = iter.next().ok_or(WeightedError::NoItem)?.borrow().clone();
+
+        let zero = <X as Default>::default();
+        if !(total_weight >= zero) {
+            return Err(WeightedError::InvalidWeight);
+        }
+
+        let mut weights = Vec::<X>::with_capacity(iter.size_hint().0);
+        for w in iter {
+            // Note that `!(w >= x)` is not equivalent to `w < x` for partially
+            // ordered types due to NaNs which are equal to nothing.
+            if !(w.borrow() >= &zero) {
+                return Err(WeightedError::InvalidWeight);
+            }
+            weights.push(total_weight.clone());
+            total_weight += w.borrow();
+        }
+
+        if total_weight == zero {
+            return Err(WeightedError::AllWeightsZero);
+        }
+        let distr = X::Sampler::new(zero, total_weight.clone());
+
+        Ok(WeightedIndex {
+            cumulative_weights: weights,
+            total_weight,
+            weight_distribution: distr,
+        })
+    }
+
+    /// Update a subset of weights, without changing the number of weights.
+    ///
+    /// `new_weights` must be sorted by the index.
+    ///
+    /// Using this method instead of `new` might be more efficient if only a small number of
+    /// weights is modified. No allocations are performed, unless the weight type `X` uses
+    /// allocation internally.
+    ///
+    /// In case of error, `self` is not modified.
+    pub fn update_weights(&mut self, new_weights: &[(usize, &X)]) -> Result<(), WeightedError>
+    where X: for<'a> ::core::ops::AddAssign<&'a X>
+            + for<'a> ::core::ops::SubAssign<&'a X>
+            + Clone
+            + Default {
+        if new_weights.is_empty() {
+            return Ok(());
+        }
+
+        let zero = <X as Default>::default();
+
+        let mut total_weight = self.total_weight.clone();
+
+        // Check for errors first, so we don't modify `self` in case something
+        // goes wrong.
+        let mut prev_i = None;
+        for &(i, w) in new_weights {
+            if let Some(old_i) = prev_i {
+                if old_i >= i {
+                    return Err(WeightedError::InvalidWeight);
+                }
+            }
+            if !(*w >= zero) {
+                return Err(WeightedError::InvalidWeight);
+            }
+            if i > self.cumulative_weights.len() {
+                return Err(WeightedError::TooMany);
+            }
+
+            let mut old_w = if i < self.cumulative_weights.len() {
+                self.cumulative_weights[i].clone()
+            } else {
+                self.total_weight.clone()
+            };
+            if i > 0 {
+                old_w -= &self.cumulative_weights[i - 1];
+            }
+
+            total_weight -= &old_w;
+            total_weight += w;
+            prev_i = Some(i);
+        }
+        if total_weight <= zero {
+            return Err(WeightedError::AllWeightsZero);
+        }
+
+        // Update the weights. Because we checked all the preconditions in the
+        // previous loop, this should never panic.
+        let mut iter = new_weights.iter();
+
+        let mut prev_weight = zero.clone();
+        let mut next_new_weight = iter.next();
+        let &(first_new_index, _) = next_new_weight.unwrap();
+        let mut cumulative_weight = if first_new_index > 0 {
+            self.cumulative_weights[first_new_index - 1].clone()
+        } else {
+            zero.clone()
+        };
+        for i in first_new_index..self.cumulative_weights.len() {
+            match next_new_weight {
+                Some(&(j, w)) if i == j => {
+                    cumulative_weight += w;
+                    next_new_weight = iter.next();
+                }
+                _ => {
+                    let mut tmp = self.cumulative_weights[i].clone();
+                    tmp -= &prev_weight; // We know this is positive.
+                    cumulative_weight += &tmp;
+                }
+            }
+            prev_weight = cumulative_weight.clone();
+            core::mem::swap(&mut prev_weight, &mut self.cumulative_weights[i]);
+        }
+
+        self.total_weight = total_weight;
+        self.weight_distribution = X::Sampler::new(zero, self.total_weight.clone());
+
+        Ok(())
+    }
+}
+
+impl<X> Distribution<usize> for WeightedIndex<X>
+where X: SampleUniform + PartialOrd
+{
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> usize {
+        use ::core::cmp::Ordering;
+        let chosen_weight = self.weight_distribution.sample(rng);
+        // Find the first item which has a weight *higher* than the chosen weight.
+        self.cumulative_weights
+            .binary_search_by(|w| {
+                if *w <= chosen_weight {
+                    Ordering::Less
+                } else {
+                    Ordering::Greater
+                }
+            })
+            .unwrap_err()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[cfg(feature = "serde1")]
+    #[test]
+    fn test_weightedindex_serde1() {
+        let weighted_index = WeightedIndex::new(&[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]).unwrap();
+
+        let ser_weighted_index = bincode::serialize(&weighted_index).unwrap();
+        let de_weighted_index: WeightedIndex<i32> =
+            bincode::deserialize(&ser_weighted_index).unwrap();
+
+        assert_eq!(
+            de_weighted_index.cumulative_weights,
+            weighted_index.cumulative_weights
+        );
+        assert_eq!(de_weighted_index.total_weight, weighted_index.total_weight);
+    }
+
+    #[test]
+    fn test_accepting_nan(){
+        assert_eq!(
+            WeightedIndex::new(&[core::f32::NAN, 0.5]).unwrap_err(),
+            WeightedError::InvalidWeight,
+        );
+        assert_eq!(
+            WeightedIndex::new(&[core::f32::NAN]).unwrap_err(),
+            WeightedError::InvalidWeight,
+        );
+        assert_eq!(
+            WeightedIndex::new(&[0.5, core::f32::NAN]).unwrap_err(),
+            WeightedError::InvalidWeight,
+        );
+
+        assert_eq!(
+            WeightedIndex::new(&[0.5, 7.0])
+                .unwrap()
+                .update_weights(&[(0, &core::f32::NAN)])
+                .unwrap_err(),
+            WeightedError::InvalidWeight,
+        )
+    }
+
+
+    #[test]
+    #[cfg_attr(miri, ignore)] // Miri is too slow
+    fn test_weightedindex() {
+        let mut r = crate::test::rng(700);
+        const N_REPS: u32 = 5000;
+        let weights = [1u32, 2, 3, 0, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7];
+        let total_weight = weights.iter().sum::<u32>() as f32;
+
+        let verify = |result: [i32; 14]| {
+            for (i, count) in result.iter().enumerate() {
+                let exp = (weights[i] * N_REPS) as f32 / total_weight;
+                let mut err = (*count as f32 - exp).abs();
+                if err != 0.0 {
+                    err /= exp;
+                }
+                assert!(err <= 0.25);
+            }
+        };
+
+        // WeightedIndex from vec
+        let mut chosen = [0i32; 14];
+        let distr = WeightedIndex::new(weights.to_vec()).unwrap();
+        for _ in 0..N_REPS {
+            chosen[distr.sample(&mut r)] += 1;
+        }
+        verify(chosen);
+
+        // WeightedIndex from slice
+        chosen = [0i32; 14];
+        let distr = WeightedIndex::new(&weights[..]).unwrap();
+        for _ in 0..N_REPS {
+            chosen[distr.sample(&mut r)] += 1;
+        }
+        verify(chosen);
+
+        // WeightedIndex from iterator
+        chosen = [0i32; 14];
+        let distr = WeightedIndex::new(weights.iter()).unwrap();
+        for _ in 0..N_REPS {
+            chosen[distr.sample(&mut r)] += 1;
+        }
+        verify(chosen);
+
+        for _ in 0..5 {
+            assert_eq!(WeightedIndex::new(&[0, 1]).unwrap().sample(&mut r), 1);
+            assert_eq!(WeightedIndex::new(&[1, 0]).unwrap().sample(&mut r), 0);
+            assert_eq!(
+                WeightedIndex::new(&[0, 0, 0, 0, 10, 0])
+                    .unwrap()
+                    .sample(&mut r),
+                4
+            );
+        }
+
+        assert_eq!(
+            WeightedIndex::new(&[10][0..0]).unwrap_err(),
+            WeightedError::NoItem
+        );
+        assert_eq!(
+            WeightedIndex::new(&[0]).unwrap_err(),
+            WeightedError::AllWeightsZero
+        );
+        assert_eq!(
+            WeightedIndex::new(&[10, 20, -1, 30]).unwrap_err(),
+            WeightedError::InvalidWeight
+        );
+        assert_eq!(
+            WeightedIndex::new(&[-10, 20, 1, 30]).unwrap_err(),
+            WeightedError::InvalidWeight
+        );
+        assert_eq!(
+            WeightedIndex::new(&[-10]).unwrap_err(),
+            WeightedError::InvalidWeight
+        );
+    }
+
+    #[test]
+    fn test_update_weights() {
+        let data = [
+            (
+                &[10u32, 2, 3, 4][..],
+                &[(1, &100), (2, &4)][..], // positive change
+                &[10, 100, 4, 4][..],
+            ),
+            (
+                &[1u32, 2, 3, 0, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7][..],
+                &[(2, &1), (5, &1), (13, &100)][..], // negative change and last element
+                &[1u32, 2, 1, 0, 5, 1, 7, 1, 2, 3, 4, 5, 6, 100][..],
+            ),
+        ];
+
+        for (weights, update, expected_weights) in data.iter() {
+            let total_weight = weights.iter().sum::<u32>();
+            let mut distr = WeightedIndex::new(weights.to_vec()).unwrap();
+            assert_eq!(distr.total_weight, total_weight);
+
+            distr.update_weights(update).unwrap();
+            let expected_total_weight = expected_weights.iter().sum::<u32>();
+            let expected_distr = WeightedIndex::new(expected_weights.to_vec()).unwrap();
+            assert_eq!(distr.total_weight, expected_total_weight);
+            assert_eq!(distr.total_weight, expected_distr.total_weight);
+            assert_eq!(distr.cumulative_weights, expected_distr.cumulative_weights);
+        }
+    }
+
+    #[test]
+    fn value_stability() {
+        fn test_samples<X: SampleUniform + PartialOrd, I>(
+            weights: I, buf: &mut [usize], expected: &[usize],
+        ) where
+            I: IntoIterator,
+            I::Item: SampleBorrow<X>,
+            X: for<'a> ::core::ops::AddAssign<&'a X> + Clone + Default,
+        {
+            assert_eq!(buf.len(), expected.len());
+            let distr = WeightedIndex::new(weights).unwrap();
+            let mut rng = crate::test::rng(701);
+            for r in buf.iter_mut() {
+                *r = rng.sample(&distr);
+            }
+            assert_eq!(buf, expected);
+        }
+
+        let mut buf = [0; 10];
+        test_samples(&[1i32, 1, 1, 1, 1, 1, 1, 1, 1], &mut buf, &[
+            0, 6, 2, 6, 3, 4, 7, 8, 2, 5,
+        ]);
+        test_samples(&[0.7f32, 0.1, 0.1, 0.1], &mut buf, &[
+            0, 0, 0, 1, 0, 0, 2, 3, 0, 0,
+        ]);
+        test_samples(&[1.0f64, 0.999, 0.998, 0.997], &mut buf, &[
+            2, 2, 1, 3, 2, 1, 3, 3, 2, 1,
+        ]);
+    }
+}
+
+/// Error type returned from `WeightedIndex::new`.
+#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum WeightedError {
+    /// The provided weight collection contains no items.
+    NoItem,
+
+    /// A weight is either less than zero, greater than the supported maximum,
+    /// NaN, or otherwise invalid.
+    InvalidWeight,
+
+    /// All items in the provided weight collection are zero.
+    AllWeightsZero,
+
+    /// Too many weights are provided (length greater than `u32::MAX`)
+    TooMany,
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for WeightedError {}
+
+impl fmt::Display for WeightedError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(match *self {
+            WeightedError::NoItem => "No weights provided in distribution",
+            WeightedError::InvalidWeight => "A weight is invalid in distribution",
+            WeightedError::AllWeightsZero => "All weights are zero in distribution",
+            WeightedError::TooMany => "Too many weights (hit u32::MAX) in distribution",
+        })
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weighted.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weighted.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/weighted.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/weighted.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Weighted index sampling
+//!
+//! This module is deprecated. Use [`crate::distributions::WeightedIndex`] and
+//! [`crate::distributions::WeightedError`] instead.
+
+pub use super::{WeightedIndex, WeightedError};
+
+#[allow(missing_docs)]
+#[deprecated(since = "0.8.0", note = "moved to rand_distr crate")]
+pub mod alias_method {
+    // This module exists to provide a deprecation warning which minimises
+    // compile errors, but still fails to compile if ever used.
+    use core::marker::PhantomData;
+    use alloc::vec::Vec;
+    use super::WeightedError;
+
+    #[derive(Debug)]
+    pub struct WeightedIndex<W: Weight> {
+        _phantom: PhantomData<W>,
+    }
+    impl<W: Weight> WeightedIndex<W> {
+        pub fn new(_weights: Vec<W>) -> Result<Self, WeightedError> {
+            Err(WeightedError::NoItem)
+        }
+    }
+
+    pub trait Weight {}
+    macro_rules! impl_weight {
+        () => {};
+        ($T:ident, $($more:ident,)*) => {
+            impl Weight for $T {}
+            impl_weight!($($more,)*);
+        };
+    }
+    impl_weight!(f64, f32,);
+    impl_weight!(u8, u16, u32, u64, usize,);
+    impl_weight!(i8, i16, i32, i64, isize,);
+    #[cfg(not(target_os = "emscripten"))]
+    impl_weight!(u128, i128,);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/ziggurat_tables.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/ziggurat_tables.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/distributions/ziggurat_tables.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/distributions/ziggurat_tables.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,283 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2013 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Tables for distributions which are sampled using the ziggurat
-// algorithm. Autogenerated by `ziggurat_tables.py`.
-
-pub type ZigTable = &'static [f64; 257];
-pub const ZIG_NORM_R: f64 = 3.654152885361008796;
-#[rustfmt::skip]
-pub static ZIG_NORM_X: [f64; 257] =
-    [3.910757959537090045, 3.654152885361008796, 3.449278298560964462, 3.320244733839166074,
-     3.224575052047029100, 3.147889289517149969, 3.083526132001233044, 3.027837791768635434,
-     2.978603279880844834, 2.934366867207854224, 2.894121053612348060, 2.857138730872132548,
-     2.822877396825325125, 2.790921174000785765, 2.760944005278822555, 2.732685359042827056,
-     2.705933656121858100, 2.680514643284522158, 2.656283037575502437, 2.633116393630324570,
-     2.610910518487548515, 2.589575986706995181, 2.569035452680536569, 2.549221550323460761,
-     2.530075232158516929, 2.511544441625342294, 2.493583041269680667, 2.476149939669143318,
-     2.459208374333311298, 2.442725318198956774, 2.426670984935725972, 2.411018413899685520,
-     2.395743119780480601, 2.380822795170626005, 2.366237056715818632, 2.351967227377659952,
-     2.337996148795031370, 2.324308018869623016, 2.310888250599850036, 2.297723348901329565,
-     2.284800802722946056, 2.272108990226823888, 2.259637095172217780, 2.247375032945807760,
-     2.235313384928327984, 2.223443340090905718, 2.211756642882544366, 2.200245546609647995,
-     2.188902771624720689, 2.177721467738641614, 2.166695180352645966, 2.155817819875063268,
-     2.145083634046203613, 2.134487182844320152, 2.124023315687815661, 2.113687150684933957,
-     2.103474055713146829, 2.093379631137050279, 2.083399693996551783, 2.073530263516978778,
-     2.063767547809956415, 2.054107931648864849, 2.044547965215732788, 2.035084353727808715,
-     2.025713947862032960, 2.016433734904371722, 2.007240830558684852, 1.998132471356564244,
-     1.989106007615571325, 1.980158896898598364, 1.971288697931769640, 1.962493064942461896,
-     1.953769742382734043, 1.945116560006753925, 1.936531428273758904, 1.928012334050718257,
-     1.919557336591228847, 1.911164563769282232, 1.902832208548446369, 1.894558525668710081,
-     1.886341828534776388, 1.878180486290977669, 1.870072921069236838, 1.862017605397632281,
-     1.854013059758148119, 1.846057850283119750, 1.838150586580728607, 1.830289919680666566,
-     1.822474540091783224, 1.814703175964167636, 1.806974591348693426, 1.799287584547580199,
-     1.791640986550010028, 1.784033659547276329, 1.776464495522344977, 1.768932414909077933,
-     1.761436365316706665, 1.753975320315455111, 1.746548278279492994, 1.739154261283669012,
-     1.731792314050707216, 1.724461502945775715, 1.717160915015540690, 1.709889657069006086,
-     1.702646854797613907, 1.695431651932238548, 1.688243209434858727, 1.681080704722823338,
-     1.673943330923760353, 1.666830296159286684, 1.659740822855789499, 1.652674147080648526,
-     1.645629517902360339, 1.638606196773111146, 1.631603456932422036, 1.624620582830568427,
-     1.617656869570534228, 1.610711622367333673, 1.603784156023583041, 1.596873794420261339,
-     1.589979870021648534, 1.583101723393471438, 1.576238702733332886, 1.569390163412534456,
-     1.562555467528439657, 1.555733983466554893, 1.548925085471535512, 1.542128153226347553,
-     1.535342571438843118, 1.528567729435024614, 1.521803020758293101, 1.515047842773992404,
-     1.508301596278571965, 1.501563685112706548, 1.494833515777718391, 1.488110497054654369,
-     1.481394039625375747, 1.474683555695025516, 1.467978458615230908, 1.461278162507407830,
-     1.454582081885523293, 1.447889631277669675, 1.441200224845798017, 1.434513276002946425,
-     1.427828197027290358, 1.421144398672323117, 1.414461289772464658, 1.407778276843371534,
-     1.401094763676202559, 1.394410150925071257, 1.387723835686884621, 1.381035211072741964,
-     1.374343665770030531, 1.367648583594317957, 1.360949343030101844, 1.354245316759430606,
-     1.347535871177359290, 1.340820365893152122, 1.334098153216083604, 1.327368577624624679,
-     1.320630975217730096, 1.313884673146868964, 1.307128989027353860, 1.300363230327433728,
-     1.293586693733517645, 1.286798664489786415, 1.279998415710333237, 1.273185207661843732,
-     1.266358287014688333, 1.259516886060144225, 1.252660221891297887, 1.245787495544997903,
-     1.238897891102027415, 1.231990574742445110, 1.225064693752808020, 1.218119375481726552,
-     1.211153726239911244, 1.204166830140560140, 1.197157747875585931, 1.190125515422801650,
-     1.183069142678760732, 1.175987612011489825, 1.168879876726833800, 1.161744859441574240,
-     1.154581450355851802, 1.147388505416733873, 1.140164844363995789, 1.132909248648336975,
-     1.125620459211294389, 1.118297174115062909, 1.110938046009249502, 1.103541679420268151,
-     1.096106627847603487, 1.088631390649514197, 1.081114409698889389, 1.073554065787871714,
-     1.065948674757506653, 1.058296483326006454, 1.050595664586207123, 1.042844313139370538,
-     1.035040439828605274, 1.027181966030751292, 1.019266717460529215, 1.011292417434978441,
-     1.003256679539591412, 0.995156999629943084, 0.986990747093846266, 0.978755155288937750,
-     0.970447311058864615, 0.962064143217605250, 0.953602409875572654, 0.945058684462571130,
-     0.936429340280896860, 0.927710533396234771, 0.918898183643734989, 0.909987953490768997,
-     0.900975224455174528, 0.891855070726792376, 0.882622229578910122, 0.873271068082494550,
-     0.863795545546826915, 0.854189171001560554, 0.844444954902423661, 0.834555354079518752,
-     0.824512208745288633, 0.814306670128064347, 0.803929116982664893, 0.793369058833152785,
-     0.782615023299588763, 0.771654424216739354, 0.760473406422083165, 0.749056662009581653,
-     0.737387211425838629, 0.725446140901303549, 0.713212285182022732, 0.700661841097584448,
-     0.687767892786257717, 0.674499822827436479, 0.660822574234205984, 0.646695714884388928,
-     0.632072236375024632, 0.616896989996235545, 0.601104617743940417, 0.584616766093722262,
-     0.567338257040473026, 0.549151702313026790, 0.529909720646495108, 0.509423329585933393,
-     0.487443966121754335, 0.463634336771763245, 0.437518402186662658, 0.408389134588000746,
-     0.375121332850465727, 0.335737519180459465, 0.286174591747260509, 0.215241895913273806,
-     0.000000000000000000];
-#[rustfmt::skip]
-pub static ZIG_NORM_F: [f64; 257] =
-    [0.000477467764586655, 0.001260285930498598, 0.002609072746106363, 0.004037972593371872,
-     0.005522403299264754, 0.007050875471392110, 0.008616582769422917, 0.010214971439731100,
-     0.011842757857943104, 0.013497450601780807, 0.015177088307982072, 0.016880083152595839,
-     0.018605121275783350, 0.020351096230109354, 0.022117062707379922, 0.023902203305873237,
-     0.025705804008632656, 0.027527235669693315, 0.029365939758230111, 0.031221417192023690,
-     0.033093219458688698, 0.034980941461833073, 0.036884215688691151, 0.038802707404656918,
-     0.040736110656078753, 0.042684144916619378, 0.044646552251446536, 0.046623094902089664,
-     0.048613553216035145, 0.050617723861121788, 0.052635418276973649, 0.054666461325077916,
-     0.056710690106399467, 0.058767952921137984, 0.060838108349751806, 0.062921024437977854,
-     0.065016577971470438, 0.067124653828023989, 0.069245144397250269, 0.071377949059141965,
-     0.073522973714240991, 0.075680130359194964, 0.077849336702372207, 0.080030515814947509,
-     0.082223595813495684, 0.084428509570654661, 0.086645194450867782, 0.088873592068594229,
-     0.091113648066700734, 0.093365311913026619, 0.095628536713353335, 0.097903279039215627,
-     0.100189498769172020, 0.102487158942306270, 0.104796225622867056, 0.107116667775072880,
-     0.109448457147210021, 0.111791568164245583, 0.114145977828255210, 0.116511665626037014,
-     0.118888613443345698, 0.121276805485235437, 0.123676228202051403, 0.126086870220650349,
-     0.128508722280473636, 0.130941777174128166, 0.133386029692162844, 0.135841476571757352,
-     0.138308116449064322, 0.140785949814968309, 0.143274978974047118, 0.145775208006537926,
-     0.148286642733128721, 0.150809290682410169, 0.153343161060837674, 0.155888264725064563,
-     0.158444614156520225, 0.161012223438117663, 0.163591108232982951, 0.166181285765110071,
-     0.168782774801850333, 0.171395595638155623, 0.174019770082499359, 0.176655321444406654,
-     0.179302274523530397, 0.181960655600216487, 0.184630492427504539, 0.187311814224516926,
-     0.190004651671193070, 0.192709036904328807, 0.195425003514885592, 0.198152586546538112,
-     0.200891822495431333, 0.203642749311121501, 0.206405406398679298, 0.209179834621935651,
-     0.211966076307852941, 0.214764175252008499, 0.217574176725178370, 0.220396127481011589,
-     0.223230075764789593, 0.226076071323264877, 0.228934165415577484, 0.231804410825248525,
-     0.234686861873252689, 0.237581574432173676, 0.240488605941449107, 0.243408015423711988,
-     0.246339863502238771, 0.249284212419516704, 0.252241126056943765, 0.255210669955677150,
-     0.258192911338648023, 0.261187919133763713, 0.264195763998317568, 0.267216518344631837,
-     0.270250256366959984, 0.273297054069675804, 0.276356989296781264, 0.279430141762765316,
-     0.282516593084849388, 0.285616426816658109, 0.288729728483353931, 0.291856585618280984,
-     0.294997087801162572, 0.298151326697901342, 0.301319396102034120, 0.304501391977896274,
-     0.307697412505553769, 0.310907558127563710, 0.314131931597630143, 0.317370638031222396,
-     0.320623784958230129, 0.323891482377732021, 0.327173842814958593, 0.330470981380537099,
-     0.333783015832108509, 0.337110066638412809, 0.340452257045945450, 0.343809713148291340,
-     0.347182563958251478, 0.350570941482881204, 0.353974980801569250, 0.357394820147290515,
-     0.360830600991175754, 0.364282468130549597, 0.367750569780596226, 0.371235057669821344,
-     0.374736087139491414, 0.378253817247238111, 0.381788410875031348, 0.385340034841733958,
-     0.388908860020464597, 0.392495061461010764, 0.396098818517547080, 0.399720314981931668,
-     0.403359739222868885, 0.407017284331247953, 0.410693148271983222, 0.414387534042706784,
-     0.418100649839684591, 0.421832709231353298, 0.425583931339900579, 0.429354541031341519,
-     0.433144769114574058, 0.436954852549929273, 0.440785034667769915, 0.444635565397727750,
-     0.448506701509214067, 0.452398706863882505, 0.456311852680773566, 0.460246417814923481,
-     0.464202689050278838, 0.468180961407822172, 0.472181538469883255, 0.476204732721683788,
-     0.480250865911249714, 0.484320269428911598, 0.488413284707712059, 0.492530263646148658,
-     0.496671569054796314, 0.500837575128482149, 0.505028667945828791, 0.509245245998136142,
-     0.513487720749743026, 0.517756517232200619, 0.522052074674794864, 0.526374847174186700,
-     0.530725304406193921, 0.535103932383019565, 0.539511234259544614, 0.543947731192649941,
-     0.548413963257921133, 0.552910490428519918, 0.557437893621486324, 0.561996775817277916,
-     0.566587763258951771, 0.571211506738074970, 0.575868682975210544, 0.580559996103683473,
-     0.585286179266300333, 0.590047996335791969, 0.594846243770991268, 0.599681752622167719,
-     0.604555390700549533, 0.609468064928895381, 0.614420723892076803, 0.619414360609039205,
-     0.624450015550274240, 0.629528779928128279, 0.634651799290960050, 0.639820277456438991,
-     0.645035480824251883, 0.650298743114294586, 0.655611470583224665, 0.660975147780241357,
-     0.666391343912380640, 0.671861719900766374, 0.677388036222513090, 0.682972161648791376,
-     0.688616083008527058, 0.694321916130032579, 0.700091918140490099, 0.705928501336797409,
-     0.711834248882358467, 0.717811932634901395, 0.723864533472881599, 0.729995264565802437,
-     0.736207598131266683, 0.742505296344636245, 0.748892447223726720, 0.755373506511754500,
-     0.761953346841546475, 0.768637315803334831, 0.775431304986138326, 0.782341832659861902,
-     0.789376143571198563, 0.796542330428254619, 0.803849483176389490, 0.811307874318219935,
-     0.818929191609414797, 0.826726833952094231, 0.834716292992930375, 0.842915653118441077,
-     0.851346258465123684, 0.860033621203008636, 0.869008688043793165, 0.878309655816146839,
-     0.887984660763399880, 0.898095921906304051, 0.908726440060562912, 0.919991505048360247,
-     0.932060075968990209, 0.945198953453078028, 0.959879091812415930, 0.977101701282731328,
-     1.000000000000000000];
-pub const ZIG_EXP_R: f64 = 7.697117470131050077;
-#[rustfmt::skip]
-pub static ZIG_EXP_X: [f64; 257] =
-    [8.697117470131052741, 7.697117470131050077, 6.941033629377212577, 6.478378493832569696,
-     6.144164665772472667, 5.882144315795399869, 5.666410167454033697, 5.482890627526062488,
-     5.323090505754398016, 5.181487281301500047, 5.054288489981304089, 4.938777085901250530,
-     4.832939741025112035, 4.735242996601741083, 4.644491885420085175, 4.559737061707351380,
-     4.480211746528421912, 4.405287693473573185, 4.334443680317273007, 4.267242480277365857,
-     4.203313713735184365, 4.142340865664051464, 4.084051310408297830, 4.028208544647936762,
-     3.974606066673788796, 3.923062500135489739, 3.873417670399509127, 3.825529418522336744,
-     3.779270992411667862, 3.734528894039797375, 3.691201090237418825, 3.649195515760853770,
-     3.608428813128909507, 3.568825265648337020, 3.530315889129343354, 3.492837654774059608,
-     3.456332821132760191, 3.420748357251119920, 3.386035442460300970, 3.352149030900109405,
-     3.319047470970748037, 3.286692171599068679, 3.255047308570449882, 3.224079565286264160,
-     3.193757903212240290, 3.164053358025972873, 3.134938858084440394, 3.106389062339824481,
-     3.078380215254090224, 3.050890016615455114, 3.023897504455676621, 2.997382949516130601,
-     2.971327759921089662, 2.945714394895045718, 2.920526286512740821, 2.895747768600141825,
-     2.871364012015536371, 2.847360965635188812, 2.823725302450035279, 2.800444370250737780,
-     2.777506146439756574, 2.754899196562344610, 2.732612636194700073, 2.710636095867928752,
-     2.688959688741803689, 2.667573980773266573, 2.646469963151809157, 2.625639026797788489,
-     2.605072938740835564, 2.584763820214140750, 2.564704126316905253, 2.544886627111869970,
-     2.525304390037828028, 2.505950763528594027, 2.486819361740209455, 2.467904050297364815,
-     2.449198932978249754, 2.430698339264419694, 2.412396812688870629, 2.394289099921457886,
-     2.376370140536140596, 2.358635057409337321, 2.341079147703034380, 2.323697874390196372,
-     2.306486858283579799, 2.289441870532269441, 2.272558825553154804, 2.255833774367219213,
-     2.239262898312909034, 2.222842503111036816, 2.206569013257663858, 2.190438966723220027,
-     2.174449009937774679, 2.158595893043885994, 2.142876465399842001, 2.127287671317368289,
-     2.111826546019042183, 2.096490211801715020, 2.081275874393225145, 2.066180819490575526,
-     2.051202409468584786, 2.036338080248769611, 2.021585338318926173, 2.006941757894518563,
-     1.992404978213576650, 1.977972700957360441, 1.963642687789548313, 1.949412758007184943,
-     1.935280786297051359, 1.921244700591528076, 1.907302480018387536, 1.893452152939308242,
-     1.879691795072211180, 1.866019527692827973, 1.852433515911175554, 1.838931967018879954,
-     1.825513128903519799, 1.812175288526390649, 1.798916770460290859, 1.785735935484126014,
-     1.772631179231305643, 1.759600930889074766, 1.746643651946074405, 1.733757834985571566,
-     1.720942002521935299, 1.708194705878057773, 1.695514524101537912, 1.682900062917553896,
-     1.670349953716452118, 1.657862852574172763, 1.645437439303723659, 1.633072416535991334,
-     1.620766508828257901, 1.608518461798858379, 1.596327041286483395, 1.584191032532688892,
-     1.572109239386229707, 1.560080483527888084, 1.548103603714513499, 1.536177455041032092,
-     1.524300908219226258, 1.512472848872117082, 1.500692176842816750, 1.488957805516746058,
-     1.477268661156133867, 1.465623682245745352, 1.454021818848793446, 1.442462031972012504,
-     1.430943292938879674, 1.419464582769983219, 1.408024891569535697, 1.396623217917042137,
-     1.385258568263121992, 1.373929956328490576, 1.362636402505086775, 1.351376933258335189,
-     1.340150580529504643, 1.328956381137116560, 1.317793376176324749, 1.306660610415174117,
-     1.295557131686601027, 1.284481990275012642, 1.273434238296241139, 1.262412929069615330,
-     1.251417116480852521, 1.240445854334406572, 1.229498195693849105, 1.218573192208790124,
-     1.207669893426761121, 1.196787346088403092, 1.185924593404202199, 1.175080674310911677,
-     1.164254622705678921, 1.153445466655774743, 1.142652227581672841, 1.131873919411078511,
-     1.121109547701330200, 1.110358108727411031, 1.099618588532597308, 1.088889961938546813,
-     1.078171191511372307, 1.067461226479967662, 1.056759001602551429, 1.046063435977044209,
-     1.035373431790528542, 1.024687873002617211, 1.014005623957096480, 1.003325527915696735,
-     0.992646405507275897, 0.981967053085062602, 0.971286240983903260, 0.960602711668666509,
-     0.949915177764075969, 0.939222319955262286, 0.928522784747210395, 0.917815182070044311,
-     0.907098082715690257, 0.896370015589889935, 0.885629464761751528, 0.874874866291025066,
-     0.864104604811004484, 0.853317009842373353, 0.842510351810368485, 0.831682837734273206,
-     0.820832606554411814, 0.809957724057418282, 0.799056177355487174, 0.788125868869492430,
-     0.777164609759129710, 0.766170112735434672, 0.755139984181982249, 0.744071715500508102,
-     0.732962673584365398, 0.721810090308756203, 0.710611050909655040, 0.699362481103231959,
-     0.688061132773747808, 0.676703568029522584, 0.665286141392677943, 0.653804979847664947,
-     0.642255960424536365, 0.630634684933490286, 0.618936451394876075, 0.607156221620300030,
-     0.595288584291502887, 0.583327712748769489, 0.571267316532588332, 0.559100585511540626,
-     0.546820125163310577, 0.534417881237165604, 0.521885051592135052, 0.509211982443654398,
-     0.496388045518671162, 0.483401491653461857, 0.470239275082169006, 0.456886840931420235,
-     0.443327866073552401, 0.429543940225410703, 0.415514169600356364, 0.401214678896277765,
-     0.386617977941119573, 0.371692145329917234, 0.356399760258393816, 0.340696481064849122,
-     0.324529117016909452, 0.307832954674932158, 0.290527955491230394, 0.272513185478464703,
-     0.253658363385912022, 0.233790483059674731, 0.212671510630966620, 0.189958689622431842,
-     0.165127622564187282, 0.137304980940012589, 0.104838507565818778, 0.063852163815001570,
-     0.000000000000000000];
-#[rustfmt::skip]
-pub static ZIG_EXP_F: [f64; 257] =
-    [0.000167066692307963, 0.000454134353841497, 0.000967269282327174, 0.001536299780301573,
-     0.002145967743718907, 0.002788798793574076, 0.003460264777836904, 0.004157295120833797,
-     0.004877655983542396, 0.005619642207205489, 0.006381905937319183, 0.007163353183634991,
-     0.007963077438017043, 0.008780314985808977, 0.009614413642502212, 0.010464810181029981,
-     0.011331013597834600, 0.012212592426255378, 0.013109164931254991, 0.014020391403181943,
-     0.014945968011691148, 0.015885621839973156, 0.016839106826039941, 0.017806200410911355,
-     0.018786700744696024, 0.019780424338009740, 0.020787204072578114, 0.021806887504283581,
-     0.022839335406385240, 0.023884420511558174, 0.024942026419731787, 0.026012046645134221,
-     0.027094383780955803, 0.028188948763978646, 0.029295660224637411, 0.030414443910466622,
-     0.031545232172893622, 0.032687963508959555, 0.033842582150874358, 0.035009037697397431,
-     0.036187284781931443, 0.037377282772959382, 0.038578995503074871, 0.039792391023374139,
-     0.041017441380414840, 0.042254122413316254, 0.043502413568888197, 0.044762297732943289,
-     0.046033761076175184, 0.047316792913181561, 0.048611385573379504, 0.049917534282706379,
-     0.051235237055126281, 0.052564494593071685, 0.053905310196046080, 0.055257689676697030,
-     0.056621641283742870, 0.057997175631200659, 0.059384305633420280, 0.060783046445479660,
-     0.062193415408541036, 0.063615431999807376, 0.065049117786753805, 0.066494496385339816,
-     0.067951593421936643, 0.069420436498728783, 0.070901055162371843, 0.072393480875708752,
-     0.073897746992364746, 0.075413888734058410, 0.076941943170480517, 0.078481949201606435,
-     0.080033947542319905, 0.081597980709237419, 0.083174093009632397, 0.084762330532368146,
-     0.086362741140756927, 0.087975374467270231, 0.089600281910032886, 0.091237516631040197,
-     0.092887133556043569, 0.094549189376055873, 0.096223742550432825, 0.097910853311492213,
-     0.099610583670637132, 0.101322997425953631, 0.103048160171257702, 0.104786139306570145,
-     0.106537004050001632, 0.108300825451033755, 0.110077676405185357, 0.111867631670056283,
-     0.113670767882744286, 0.115487163578633506, 0.117316899211555525, 0.119160057175327641,
-     0.121016721826674792, 0.122886979509545108, 0.124770918580830933, 0.126668629437510671,
-     0.128580204545228199, 0.130505738468330773, 0.132445327901387494, 0.134399071702213602,
-     0.136367070926428829, 0.138349428863580176, 0.140346251074862399, 0.142357645432472146,
-     0.144383722160634720, 0.146424593878344889, 0.148480375643866735, 0.150551185001039839,
-     0.152637142027442801, 0.154738369384468027, 0.156854992369365148, 0.158987138969314129,
-     0.161134939917591952, 0.163298528751901734, 0.165478041874935922, 0.167673618617250081,
-     0.169885401302527550, 0.172113535315319977, 0.174358169171353411, 0.176619454590494829,
-     0.178897546572478278, 0.181192603475496261, 0.183504787097767436, 0.185834262762197083,
-     0.188181199404254262, 0.190545769663195363, 0.192928149976771296, 0.195328520679563189,
-     0.197747066105098818, 0.200183974691911210, 0.202639439093708962, 0.205113656293837654,
-     0.207606827724221982, 0.210119159388988230, 0.212650861992978224, 0.215202151075378628,
-     0.217773247148700472, 0.220364375843359439, 0.222975768058120111, 0.225607660116683956,
-     0.228260293930716618, 0.230933917169627356, 0.233628783437433291, 0.236345152457059560,
-     0.239083290262449094, 0.241843469398877131, 0.244625969131892024, 0.247431075665327543,
-     0.250259082368862240, 0.253110290015629402, 0.255985007030415324, 0.258883549749016173,
-     0.261806242689362922, 0.264753418835062149, 0.267725419932044739, 0.270722596799059967,
-     0.273745309652802915, 0.276793928448517301, 0.279868833236972869, 0.282970414538780746,
-     0.286099073737076826, 0.289255223489677693, 0.292439288161892630, 0.295651704281261252,
-     0.298892921015581847, 0.302163400675693528, 0.305463619244590256, 0.308794066934560185,
-     0.312155248774179606, 0.315547685227128949, 0.318971912844957239, 0.322428484956089223,
-     0.325917972393556354, 0.329440964264136438, 0.332998068761809096, 0.336589914028677717,
-     0.340217149066780189, 0.343880444704502575, 0.347580494621637148, 0.351318016437483449,
-     0.355093752866787626, 0.358908472948750001, 0.362762973354817997, 0.366658079781514379,
-     0.370594648435146223, 0.374573567615902381, 0.378595759409581067, 0.382662181496010056,
-     0.386773829084137932, 0.390931736984797384, 0.395136981833290435, 0.399390684475231350,
-     0.403694012530530555, 0.408048183152032673, 0.412454465997161457, 0.416914186433003209,
-     0.421428728997616908, 0.425999541143034677, 0.430628137288459167, 0.435316103215636907,
-     0.440065100842354173, 0.444876873414548846, 0.449753251162755330, 0.454696157474615836,
-     0.459707615642138023, 0.464789756250426511, 0.469944825283960310, 0.475175193037377708,
-     0.480483363930454543, 0.485871987341885248, 0.491343869594032867, 0.496901987241549881,
-     0.502549501841348056, 0.508289776410643213, 0.514126393814748894, 0.520063177368233931,
-     0.526104213983620062, 0.532253880263043655, 0.538516872002862246, 0.544898237672440056,
-     0.551403416540641733, 0.558038282262587892, 0.564809192912400615, 0.571723048664826150,
-     0.578787358602845359, 0.586010318477268366, 0.593400901691733762, 0.600968966365232560,
-     0.608725382079622346, 0.616682180915207878, 0.624852738703666200, 0.633251994214366398,
-     0.641896716427266423, 0.650805833414571433, 0.660000841079000145, 0.669506316731925177,
-     0.679350572264765806, 0.689566496117078431, 0.700192655082788606, 0.711274760805076456,
-     0.722867659593572465, 0.735038092431424039, 0.747868621985195658, 0.761463388849896838,
-     0.775956852040116218, 0.791527636972496285, 0.808421651523009044, 0.826993296643051101,
-     0.847785500623990496, 0.871704332381204705, 0.900469929925747703, 0.938143680862176477,
-     1.000000000000000000];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,7 +37,7 @@
 //!
 //! # The Book
 //!
-//! For the user guide and futher documentation, please read
+//! For the user guide and further documentation, please read
 //! [The Rust Rand Book](https://rust-random.github.io/book).
 
 #![doc(
@@ -48,15 +48,17 @@
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
 #![doc(test(attr(allow(unused_variables), deny(warnings))))]
-#![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(all(feature = "simd_support", feature = "nightly"), feature(stdsimd))]
+#![no_std]
+#![cfg_attr(feature = "simd_support", feature(stdsimd))]
+#![cfg_attr(feature = "nightly", feature(slice_partition_at_index))]
+#![cfg_attr(doc_cfg, feature(doc_cfg))]
 #![allow(
-    clippy::excessive_precision,
-    clippy::unreadable_literal,
-    clippy::float_cmp
+    clippy::float_cmp,
+    clippy::neg_cmp_op_on_partial_ord,
 )]
 
-#[cfg(all(feature = "alloc", not(feature = "std")))] extern crate alloc;
+#[cfg(feature = "std")] extern crate std;
+#[cfg(feature = "alloc")] extern crate alloc;
 
 #[allow(unused)]
 macro_rules! trace { ($($x:tt)*) => (
@@ -92,418 +94,20 @@
 // Re-exports from rand_core
 pub use rand_core::{CryptoRng, Error, RngCore, SeedableRng};
 
-// Public exports
-#[cfg(feature = "std")] pub use crate::rngs::thread::thread_rng;
-
 // Public modules
 pub mod distributions;
 pub mod prelude;
+mod rng;
 pub mod rngs;
 pub mod seq;
 
+// Public exports
+#[cfg(all(feature = "std", feature = "std_rng"))]
+pub use crate::rngs::thread::thread_rng;
+pub use rng::{Fill, Rng};
 
-use crate::distributions::uniform::{SampleBorrow, SampleUniform, UniformSampler};
+#[cfg(all(feature = "std", feature = "std_rng"))]
 use crate::distributions::{Distribution, Standard};
-use core::num::Wrapping;
-use core::{mem, slice};
-
-/// An automatically-implemented extension trait on [`RngCore`] providing high-level
-/// generic methods for sampling values and other convenience methods.
-///
-/// This is the primary trait to use when generating random values.
-///
-/// # Generic usage
-///
-/// The basic pattern is `fn foo<R: Rng + ?Sized>(rng: &mut R)`. Some
-/// things are worth noting here:
-///
-/// - Since `Rng: RngCore` and every `RngCore` implements `Rng`, it makes no
-///   difference whether we use `R: Rng` or `R: RngCore`.
-/// - The `+ ?Sized` un-bounding allows functions to be called directly on
-///   type-erased references; i.e. `foo(r)` where `r: &mut RngCore`. Without
-///   this it would be necessary to write `foo(&mut r)`.
-///
-/// An alternative pattern is possible: `fn foo<R: Rng>(rng: R)`. This has some
-/// trade-offs. It allows the argument to be consumed directly without a `&mut`
-/// (which is how `from_rng(thread_rng())` works); also it still works directly
-/// on references (including type-erased references). Unfortunately within the
-/// function `foo` it is not known whether `rng` is a reference type or not,
-/// hence many uses of `rng` require an extra reference, either explicitly
-/// (`distr.sample(&mut rng)`) or implicitly (`rng.gen()`); one may hope the
-/// optimiser can remove redundant references later.
-///
-/// Example:
-///
-/// ```
-/// # use rand::thread_rng;
-/// use rand::Rng;
-///
-/// fn foo<R: Rng + ?Sized>(rng: &mut R) -> f32 {
-///     rng.gen()
-/// }
-///
-/// # let v = foo(&mut thread_rng());
-/// ```
-pub trait Rng: RngCore {
-    /// Return a random value supporting the [`Standard`] distribution.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// let x: u32 = rng.gen();
-    /// println!("{}", x);
-    /// println!("{:?}", rng.gen::<(f64, bool)>());
-    /// ```
-    ///
-    /// # Arrays and tuples
-    ///
-    /// The `rng.gen()` method is able to generate arrays (up to 32 elements)
-    /// and tuples (up to 12 elements), so long as all element types can be
-    /// generated.
-    ///
-    /// For arrays of integers, especially for those with small element types
-    /// (< 64 bit), it will likely be faster to instead use [`Rng::fill`].
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// let tuple: (u8, i32, char) = rng.gen(); // arbitrary tuple support
-    ///
-    /// let arr1: [f32; 32] = rng.gen();        // array construction
-    /// let mut arr2 = [0u8; 128];
-    /// rng.fill(&mut arr2);                    // array fill
-    /// ```
-    ///
-    /// [`Standard`]: distributions::Standard
-    #[inline]
-    fn gen<T>(&mut self) -> T
-    where Standard: Distribution<T> {
-        Standard.sample(self)
-    }
-
-    /// Generate a random value in the range [`low`, `high`), i.e. inclusive of
-    /// `low` and exclusive of `high`.
-    ///
-    /// This function is optimised for the case that only a single sample is
-    /// made from the given range. See also the [`Uniform`] distribution
-    /// type which may be faster if sampling from the same range repeatedly.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `low >= high`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// let n: u32 = rng.gen_range(0, 10);
-    /// println!("{}", n);
-    /// let m: f64 = rng.gen_range(-40.0f64, 1.3e5f64);
-    /// println!("{}", m);
-    /// ```
-    ///
-    /// [`Uniform`]: distributions::uniform::Uniform
-    fn gen_range<T: SampleUniform, B1, B2>(&mut self, low: B1, high: B2) -> T
-    where
-        B1: SampleBorrow<T> + Sized,
-        B2: SampleBorrow<T> + Sized,
-    {
-        T::Sampler::sample_single(low, high, self)
-    }
-
-    /// Sample a new value, using the given distribution.
-    ///
-    /// ### Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    /// use rand::distributions::Uniform;
-    ///
-    /// let mut rng = thread_rng();
-    /// let x = rng.sample(Uniform::new(10u32, 15));
-    /// // Type annotation requires two types, the type and distribution; the
-    /// // distribution can be inferred.
-    /// let y = rng.sample::<u16, _>(Uniform::new(10, 15));
-    /// ```
-    fn sample<T, D: Distribution<T>>(&mut self, distr: D) -> T {
-        distr.sample(self)
-    }
-
-    /// Create an iterator that generates values using the given distribution.
-    ///
-    /// Note that this function takes its arguments by value. This works since
-    /// `(&mut R): Rng where R: Rng` and
-    /// `(&D): Distribution where D: Distribution`,
-    /// however borrowing is not automatic hence `rng.sample_iter(...)` may
-    /// need to be replaced with `(&mut rng).sample_iter(...)`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    /// use rand::distributions::{Alphanumeric, Uniform, Standard};
-    ///
-    /// let rng = thread_rng();
-    ///
-    /// // Vec of 16 x f32:
-    /// let v: Vec<f32> = rng.sample_iter(Standard).take(16).collect();
-    ///
-    /// // String:
-    /// let s: String = rng.sample_iter(Alphanumeric).take(7).collect();
-    ///
-    /// // Combined values
-    /// println!("{:?}", rng.sample_iter(Standard).take(5)
-    ///                              .collect::<Vec<(f64, bool)>>());
-    ///
-    /// // Dice-rolling:
-    /// let die_range = Uniform::new_inclusive(1, 6);
-    /// let mut roll_die = rng.sample_iter(die_range);
-    /// while roll_die.next().unwrap() != 6 {
-    ///     println!("Not a 6; rolling again!");
-    /// }
-    /// ```
-    fn sample_iter<T, D>(self, distr: D) -> distributions::DistIter<D, Self, T>
-    where
-        D: Distribution<T>,
-        Self: Sized,
-    {
-        distr.sample_iter(self)
-    }
-
-    /// Fill `dest` entirely with random bytes (uniform value distribution),
-    /// where `dest` is any type supporting [`AsByteSliceMut`], namely slices
-    /// and arrays over primitive integer types (`i8`, `i16`, `u32`, etc.).
-    ///
-    /// On big-endian platforms this performs byte-swapping to ensure
-    /// portability of results from reproducible generators.
-    ///
-    /// This uses [`fill_bytes`] internally which may handle some RNG errors
-    /// implicitly (e.g. waiting if the OS generator is not ready), but panics
-    /// on other errors. See also [`try_fill`] which returns errors.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut arr = [0i8; 20];
-    /// thread_rng().fill(&mut arr[..]);
-    /// ```
-    ///
-    /// [`fill_bytes`]: RngCore::fill_bytes
-    /// [`try_fill`]: Rng::try_fill
-    fn fill<T: AsByteSliceMut + ?Sized>(&mut self, dest: &mut T) {
-        self.fill_bytes(dest.as_byte_slice_mut());
-        dest.to_le();
-    }
-
-    /// Fill `dest` entirely with random bytes (uniform value distribution),
-    /// where `dest` is any type supporting [`AsByteSliceMut`], namely slices
-    /// and arrays over primitive integer types (`i8`, `i16`, `u32`, etc.).
-    ///
-    /// On big-endian platforms this performs byte-swapping to ensure
-    /// portability of results from reproducible generators.
-    ///
-    /// This is identical to [`fill`] except that it uses [`try_fill_bytes`]
-    /// internally and forwards RNG errors.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # use rand::Error;
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// # fn try_inner() -> Result<(), Error> {
-    /// let mut arr = [0u64; 4];
-    /// thread_rng().try_fill(&mut arr[..])?;
-    /// # Ok(())
-    /// # }
-    ///
-    /// # try_inner().unwrap()
-    /// ```
-    ///
-    /// [`try_fill_bytes`]: RngCore::try_fill_bytes
-    /// [`fill`]: Rng::fill
-    fn try_fill<T: AsByteSliceMut + ?Sized>(&mut self, dest: &mut T) -> Result<(), Error> {
-        self.try_fill_bytes(dest.as_byte_slice_mut())?;
-        dest.to_le();
-        Ok(())
-    }
-
-    /// Return a bool with a probability `p` of being true.
-    ///
-    /// See also the [`Bernoulli`] distribution, which may be faster if
-    /// sampling from the same probability repeatedly.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// println!("{}", rng.gen_bool(1.0 / 3.0));
-    /// ```
-    ///
-    /// # Panics
-    ///
-    /// If `p < 0` or `p > 1`.
-    ///
-    /// [`Bernoulli`]: distributions::bernoulli::Bernoulli
-    #[inline]
-    fn gen_bool(&mut self, p: f64) -> bool {
-        let d = distributions::Bernoulli::new(p).unwrap();
-        self.sample(d)
-    }
-
-    /// Return a bool with a probability of `numerator/denominator` of being
-    /// true. I.e. `gen_ratio(2, 3)` has chance of 2 in 3, or about 67%, of
-    /// returning true. If `numerator == denominator`, then the returned value
-    /// is guaranteed to be `true`. If `numerator == 0`, then the returned
-    /// value is guaranteed to be `false`.
-    ///
-    /// See also the [`Bernoulli`] distribution, which may be faster if
-    /// sampling from the same `numerator` and `denominator` repeatedly.
-    ///
-    /// # Panics
-    ///
-    /// If `denominator == 0` or `numerator > denominator`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// println!("{}", rng.gen_ratio(2, 3));
-    /// ```
-    ///
-    /// [`Bernoulli`]: distributions::bernoulli::Bernoulli
-    #[inline]
-    fn gen_ratio(&mut self, numerator: u32, denominator: u32) -> bool {
-        let d = distributions::Bernoulli::from_ratio(numerator, denominator).unwrap();
-        self.sample(d)
-    }
-}
-
-impl<R: RngCore + ?Sized> Rng for R {}
-
-/// Trait for casting types to byte slices
-///
-/// This is used by the [`Rng::fill`] and [`Rng::try_fill`] methods.
-pub trait AsByteSliceMut {
-    /// Return a mutable reference to self as a byte slice
-    fn as_byte_slice_mut(&mut self) -> &mut [u8];
-
-    /// Call `to_le` on each element (i.e. byte-swap on Big Endian platforms).
-    fn to_le(&mut self);
-}
-
-impl AsByteSliceMut for [u8] {
-    fn as_byte_slice_mut(&mut self) -> &mut [u8] {
-        self
-    }
-
-    fn to_le(&mut self) {}
-}
-
-macro_rules! impl_as_byte_slice {
-    () => {};
-    ($t:ty) => {
-        impl AsByteSliceMut for [$t] {
-            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
-                if self.len() == 0 {
-                    unsafe {
-                        // must not use null pointer
-                        slice::from_raw_parts_mut(0x1 as *mut u8, 0)
-                    }
-                } else {
-                    unsafe {
-                        slice::from_raw_parts_mut(self.as_mut_ptr()
-                            as *mut u8,
-                            self.len() * mem::size_of::<$t>()
-                        )
-                    }
-                }
-            }
-
-            fn to_le(&mut self) {
-                for x in self {
-                    *x = x.to_le();
-                }
-            }
-        }
-
-        impl AsByteSliceMut for [Wrapping<$t>] {
-            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
-                if self.len() == 0 {
-                    unsafe {
-                        // must not use null pointer
-                        slice::from_raw_parts_mut(0x1 as *mut u8, 0)
-                    }
-                } else {
-                    unsafe {
-                        slice::from_raw_parts_mut(self.as_mut_ptr()
-                            as *mut u8,
-                            self.len() * mem::size_of::<$t>()
-                        )
-                    }
-                }
-            }
-
-            fn to_le(&mut self) {
-                for x in self {
-                    *x = Wrapping(x.0.to_le());
-                }
-            }
-        }
-    };
-    ($t:ty, $($tt:ty,)*) => {
-        impl_as_byte_slice!($t);
-        // TODO: this could replace above impl once Rust #32463 is fixed
-        // impl_as_byte_slice!(Wrapping<$t>);
-        impl_as_byte_slice!($($tt,)*);
-    }
-}
-
-impl_as_byte_slice!(u16, u32, u64, usize,);
-#[cfg(not(target_os = "emscripten"))]
-impl_as_byte_slice!(u128);
-impl_as_byte_slice!(i8, i16, i32, i64, isize,);
-#[cfg(not(target_os = "emscripten"))]
-impl_as_byte_slice!(i128);
-
-macro_rules! impl_as_byte_slice_arrays {
-    ($n:expr,) => {};
-    ($n:expr, $N:ident) => {
-        impl<T> AsByteSliceMut for [T; $n] where [T]: AsByteSliceMut {
-            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
-                self[..].as_byte_slice_mut()
-            }
-
-            fn to_le(&mut self) {
-                self[..].to_le()
-            }
-        }
-    };
-    ($n:expr, $N:ident, $($NN:ident,)*) => {
-        impl_as_byte_slice_arrays!($n, $N);
-        impl_as_byte_slice_arrays!($n - 1, $($NN,)*);
-    };
-    (!div $n:expr,) => {};
-    (!div $n:expr, $N:ident, $($NN:ident,)*) => {
-        impl_as_byte_slice_arrays!($n, $N);
-        impl_as_byte_slice_arrays!(!div $n / 2, $($NN,)*);
-    };
-}
-#[rustfmt::skip]
-impl_as_byte_slice_arrays!(32, N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,);
-impl_as_byte_slice_arrays!(!div 4096, N,N,N,N,N,N,N,);
 
 /// Generates a random value using the thread-local random number generator.
 ///
@@ -511,6 +115,33 @@
 /// documentation of the entropy source and [`Standard`] for documentation of
 /// distributions and type-specific generation.
 ///
+/// # Provided implementations
+///
+/// The following types have provided implementations that
+/// generate values with the following ranges and distributions:
+///
+/// * Integers (`i32`, `u32`, `isize`, `usize`, etc.): Uniformly distributed
+///   over all values of the type.
+/// * `char`: Uniformly distributed over all Unicode scalar values, i.e. all
+///   code points in the range `0...0x10_FFFF`, except for the range
+///   `0xD800...0xDFFF` (the surrogate code points). This includes
+///   unassigned/reserved code points.
+/// * `bool`: Generates `false` or `true`, each with probability 0.5.
+/// * Floating point types (`f32` and `f64`): Uniformly distributed in the
+///   half-open range `[0, 1)`. See notes below.
+/// * Wrapping integers (`Wrapping<T>`), besides the type identical to their
+///   normal integer variants.
+///
+/// Also supported is the generation of the following
+/// compound types where all component types are supported:
+///
+/// *   Tuples (up to 12 elements): each element is generated sequentially.
+/// *   Arrays (up to 32 elements): each element is generated sequentially;
+///     see also [`Rng::fill`] which supports arbitrary array length for integer
+///     types and tends to be faster for `u32` and smaller types.
+/// *   `Option<T>` first generates a `bool`, and if true generates and returns
+///     `Some(value)` where `value: T`, otherwise returning `None`.
+///
 /// # Examples
 ///
 /// ```
@@ -547,7 +178,8 @@
 /// ```
 ///
 /// [`Standard`]: distributions::Standard
-#[cfg(feature = "std")]
+#[cfg(all(feature = "std", feature = "std_rng"))]
+#[cfg_attr(doc_cfg, doc(cfg(all(feature = "std", feature = "std_rng"))))]
 #[inline]
 pub fn random<T>() -> T
 where Standard: Distribution<T> {
@@ -557,8 +189,6 @@
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::rngs::mock::StepRng;
-    #[cfg(all(not(feature = "std"), feature = "alloc"))] use alloc::boxed::Box;
 
     /// Construct a deterministic RNG with the given seed
     pub fn rng(seed: u64) -> impl RngCore {
@@ -569,131 +199,12 @@
     }
 
     #[test]
-    fn test_fill_bytes_default() {
-        let mut r = StepRng::new(0x11_22_33_44_55_66_77_88, 0);
-
-        // check every remainder mod 8, both in small and big vectors.
-        let lengths = [0, 1, 2, 3, 4, 5, 6, 7, 80, 81, 82, 83, 84, 85, 86, 87];
-        for &n in lengths.iter() {
-            let mut buffer = [0u8; 87];
-            let v = &mut buffer[0..n];
-            r.fill_bytes(v);
-
-            // use this to get nicer error messages.
-            for (i, &byte) in v.iter().enumerate() {
-                if byte == 0 {
-                    panic!("byte {} of {} is zero", i, n)
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_fill() {
-        let x = 9041086907909331047; // a random u64
-        let mut rng = StepRng::new(x, 0);
-
-        // Convert to byte sequence and back to u64; byte-swap twice if BE.
-        let mut array = [0u64; 2];
-        rng.fill(&mut array[..]);
-        assert_eq!(array, [x, x]);
-        assert_eq!(rng.next_u64(), x);
-
-        // Convert to bytes then u32 in LE order
-        let mut array = [0u32; 2];
-        rng.fill(&mut array[..]);
-        assert_eq!(array, [x as u32, (x >> 32) as u32]);
-        assert_eq!(rng.next_u32(), x as u32);
-
-        // Check equivalence using wrapped arrays
-        let mut warray = [Wrapping(0u32); 2];
-        rng.fill(&mut warray[..]);
-        assert_eq!(array[0], warray[0].0);
-        assert_eq!(array[1], warray[1].0);
-    }
-
-    #[test]
-    fn test_fill_empty() {
-        let mut array = [0u32; 0];
-        let mut rng = StepRng::new(0, 1);
-        rng.fill(&mut array);
-        rng.fill(&mut array[..]);
-    }
-
-    #[test]
-    fn test_gen_range() {
-        let mut r = rng(101);
-        for _ in 0..1000 {
-            let a = r.gen_range(-4711, 17);
-            assert!(a >= -4711 && a < 17);
-            let a = r.gen_range(-3i8, 42);
-            assert!(a >= -3i8 && a < 42i8);
-            let a = r.gen_range(&10u16, 99);
-            assert!(a >= 10u16 && a < 99u16);
-            let a = r.gen_range(-100i32, &2000);
-            assert!(a >= -100i32 && a < 2000i32);
-            let a = r.gen_range(&12u32, &24u32);
-            assert!(a >= 12u32 && a < 24u32);
-
-            assert_eq!(r.gen_range(0u32, 1), 0u32);
-            assert_eq!(r.gen_range(-12i64, -11), -12i64);
-            assert_eq!(r.gen_range(3_000_000, 3_000_001), 3_000_000);
-        }
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_gen_range_panic_int() {
-        let mut r = rng(102);
-        r.gen_range(5, -2);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_gen_range_panic_usize() {
-        let mut r = rng(103);
-        r.gen_range(5, 2);
-    }
-
-    #[test]
-    fn test_gen_bool() {
-        let mut r = rng(105);
-        for _ in 0..5 {
-            assert_eq!(r.gen_bool(0.0), false);
-            assert_eq!(r.gen_bool(1.0), true);
-        }
-    }
-
-    #[test]
-    fn test_rng_trait_object() {
-        use crate::distributions::{Distribution, Standard};
-        let mut rng = rng(109);
-        let mut r = &mut rng as &mut dyn RngCore;
-        r.next_u32();
-        r.gen::<i32>();
-        assert_eq!(r.gen_range(0, 1), 0);
-        let _c: u8 = Standard.sample(&mut r);
-    }
-
-    #[test]
-    #[cfg(feature = "alloc")]
-    fn test_rng_boxed_trait() {
-        use crate::distributions::{Distribution, Standard};
-        let rng = rng(110);
-        let mut r = Box::new(rng) as Box<dyn RngCore>;
-        r.next_u32();
-        r.gen::<i32>();
-        assert_eq!(r.gen_range(0, 1), 0);
-        let _c: u8 = Standard.sample(&mut r);
-    }
-
-    #[test]
-    #[cfg(feature = "std")]
+    #[cfg(all(feature = "std", feature = "std_rng"))]
     fn test_random() {
-        // not sure how to test this aside from just getting some values
         let _n: usize = random();
         let _f: f32 = random();
         let _o: Option<Option<i8>> = random();
+        #[allow(clippy::type_complexity)]
         let _many: (
             (),
             (usize, isize, Option<(u32, (bool,))>),
@@ -701,23 +212,4 @@
             (f32, (f64, (f64,))),
         ) = random();
     }
-
-    #[test]
-    #[cfg_attr(miri, ignore)] // Miri is too slow
-    fn test_gen_ratio_average() {
-        const NUM: u32 = 3;
-        const DENOM: u32 = 10;
-        const N: u32 = 100_000;
-
-        let mut sum: u32 = 0;
-        let mut rng = rng(111);
-        for _ in 0..N {
-            if rng.gen_ratio(NUM, DENOM) {
-                sum += 1;
-            }
-        }
-        // Have Binomial(N, NUM/DENOM) distribution
-        let expected = (NUM * N) / DENOM; // exact integer
-        assert!(((sum - expected) as i32).abs() < 500);
-    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/prelude.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/prelude.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/prelude.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/prelude.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,12 +22,13 @@
 #[cfg(feature = "small_rng")]
 #[doc(no_inline)]
 pub use crate::rngs::SmallRng;
+#[cfg(feature = "std_rng")]
 #[doc(no_inline)] pub use crate::rngs::StdRng;
 #[doc(no_inline)]
-#[cfg(feature = "std")]
+#[cfg(all(feature = "std", feature = "std_rng"))]
 pub use crate::rngs::ThreadRng;
 #[doc(no_inline)] pub use crate::seq::{IteratorRandom, SliceRandom};
 #[doc(no_inline)]
-#[cfg(feature = "std")]
+#[cfg(all(feature = "std", feature = "std_rng"))]
 pub use crate::{random, thread_rng};
 #[doc(no_inline)] pub use crate::{CryptoRng, Rng, RngCore, SeedableRng};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rng.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rng.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rng.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rng.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,603 @@
+// Copyright 2018 Developers of the Rand project.
+// Copyright 2013-2017 The Rust Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! [`Rng`] trait
+
+use rand_core::{Error, RngCore};
+use crate::distributions::uniform::{SampleRange, SampleUniform};
+use crate::distributions::{self, Distribution, Standard};
+use core::num::Wrapping;
+use core::{mem, slice};
+
+/// An automatically-implemented extension trait on [`RngCore`] providing high-level
+/// generic methods for sampling values and other convenience methods.
+///
+/// This is the primary trait to use when generating random values.
+///
+/// # Generic usage
+///
+/// The basic pattern is `fn foo<R: Rng + ?Sized>(rng: &mut R)`. Some
+/// things are worth noting here:
+///
+/// - Since `Rng: RngCore` and every `RngCore` implements `Rng`, it makes no
+///   difference whether we use `R: Rng` or `R: RngCore`.
+/// - The `+ ?Sized` un-bounding allows functions to be called directly on
+///   type-erased references; i.e. `foo(r)` where `r: &mut dyn RngCore`. Without
+///   this it would be necessary to write `foo(&mut r)`.
+///
+/// An alternative pattern is possible: `fn foo<R: Rng>(rng: R)`. This has some
+/// trade-offs. It allows the argument to be consumed directly without a `&mut`
+/// (which is how `from_rng(thread_rng())` works); also it still works directly
+/// on references (including type-erased references). Unfortunately within the
+/// function `foo` it is not known whether `rng` is a reference type or not,
+/// hence many uses of `rng` require an extra reference, either explicitly
+/// (`distr.sample(&mut rng)`) or implicitly (`rng.gen()`); one may hope the
+/// optimiser can remove redundant references later.
+///
+/// Example:
+///
+/// ```
+/// # use rand::thread_rng;
+/// use rand::Rng;
+///
+/// fn foo<R: Rng + ?Sized>(rng: &mut R) -> f32 {
+///     rng.gen()
+/// }
+///
+/// # let v = foo(&mut thread_rng());
+/// ```
+pub trait Rng: RngCore {
+    /// Return a random value supporting the [`Standard`] distribution.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// let x: u32 = rng.gen();
+    /// println!("{}", x);
+    /// println!("{:?}", rng.gen::<(f64, bool)>());
+    /// ```
+    ///
+    /// # Arrays and tuples
+    ///
+    /// The `rng.gen()` method is able to generate arrays (up to 32 elements)
+    /// and tuples (up to 12 elements), so long as all element types can be
+    /// generated.
+    /// When using `rustc` ≥ 1.51, enable the `min_const_gen` feature to support
+    /// arrays larger than 32 elements.
+    ///
+    /// For arrays of integers, especially for those with small element types
+    /// (< 64 bit), it will likely be faster to instead use [`Rng::fill`].
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// let tuple: (u8, i32, char) = rng.gen(); // arbitrary tuple support
+    ///
+    /// let arr1: [f32; 32] = rng.gen();        // array construction
+    /// let mut arr2 = [0u8; 128];
+    /// rng.fill(&mut arr2);                    // array fill
+    /// ```
+    ///
+    /// [`Standard`]: distributions::Standard
+    #[inline]
+    fn gen<T>(&mut self) -> T
+    where Standard: Distribution<T> {
+        Standard.sample(self)
+    }
+
+    /// Generate a random value in the given range.
+    ///
+    /// This function is optimised for the case that only a single sample is
+    /// made from the given range. See also the [`Uniform`] distribution
+    /// type which may be faster if sampling from the same range repeatedly.
+    ///
+    /// Only `gen_range(low..high)` and `gen_range(low..=high)` are supported.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the range is empty.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    ///
+    /// // Exclusive range
+    /// let n: u32 = rng.gen_range(0..10);
+    /// println!("{}", n);
+    /// let m: f64 = rng.gen_range(-40.0..1.3e5);
+    /// println!("{}", m);
+    ///
+    /// // Inclusive range
+    /// let n: u32 = rng.gen_range(0..=10);
+    /// println!("{}", n);
+    /// ```
+    ///
+    /// [`Uniform`]: distributions::uniform::Uniform
+    fn gen_range<T, R>(&mut self, range: R) -> T
+    where
+        T: SampleUniform,
+        R: SampleRange<T>
+    {
+        assert!(!range.is_empty(), "cannot sample empty range");
+        range.sample_single(self)
+    }
+
+    /// Sample a new value, using the given distribution.
+    ///
+    /// ### Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    /// use rand::distributions::Uniform;
+    ///
+    /// let mut rng = thread_rng();
+    /// let x = rng.sample(Uniform::new(10u32, 15));
+    /// // Type annotation requires two types, the type and distribution; the
+    /// // distribution can be inferred.
+    /// let y = rng.sample::<u16, _>(Uniform::new(10, 15));
+    /// ```
+    fn sample<T, D: Distribution<T>>(&mut self, distr: D) -> T {
+        distr.sample(self)
+    }
+
+    /// Create an iterator that generates values using the given distribution.
+    ///
+    /// Note that this function takes its arguments by value. This works since
+    /// `(&mut R): Rng where R: Rng` and
+    /// `(&D): Distribution where D: Distribution`,
+    /// however borrowing is not automatic hence `rng.sample_iter(...)` may
+    /// need to be replaced with `(&mut rng).sample_iter(...)`.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    /// use rand::distributions::{Alphanumeric, Uniform, Standard};
+    ///
+    /// let mut rng = thread_rng();
+    ///
+    /// // Vec of 16 x f32:
+    /// let v: Vec<f32> = (&mut rng).sample_iter(Standard).take(16).collect();
+    ///
+    /// // String:
+    /// let s: String = (&mut rng).sample_iter(Alphanumeric)
+    ///     .take(7)
+    ///     .map(char::from)
+    ///     .collect();
+    ///
+    /// // Combined values
+    /// println!("{:?}", (&mut rng).sample_iter(Standard).take(5)
+    ///                              .collect::<Vec<(f64, bool)>>());
+    ///
+    /// // Dice-rolling:
+    /// let die_range = Uniform::new_inclusive(1, 6);
+    /// let mut roll_die = (&mut rng).sample_iter(die_range);
+    /// while roll_die.next().unwrap() != 6 {
+    ///     println!("Not a 6; rolling again!");
+    /// }
+    /// ```
+    fn sample_iter<T, D>(self, distr: D) -> distributions::DistIter<D, Self, T>
+    where
+        D: Distribution<T>,
+        Self: Sized,
+    {
+        distr.sample_iter(self)
+    }
+
+    /// Fill any type implementing [`Fill`] with random data
+    ///
+    /// The distribution is expected to be uniform with portable results, but
+    /// this cannot be guaranteed for third-party implementations.
+    ///
+    /// This is identical to [`try_fill`] except that it panics on error.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut arr = [0i8; 20];
+    /// thread_rng().fill(&mut arr[..]);
+    /// ```
+    ///
+    /// [`fill_bytes`]: RngCore::fill_bytes
+    /// [`try_fill`]: Rng::try_fill
+    fn fill<T: Fill + ?Sized>(&mut self, dest: &mut T) {
+        dest.try_fill(self).unwrap_or_else(|_| panic!("Rng::fill failed"))
+    }
+
+    /// Fill any type implementing [`Fill`] with random data
+    ///
+    /// The distribution is expected to be uniform with portable results, but
+    /// this cannot be guaranteed for third-party implementations.
+    ///
+    /// This is identical to [`fill`] except that it forwards errors.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use rand::Error;
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// # fn try_inner() -> Result<(), Error> {
+    /// let mut arr = [0u64; 4];
+    /// thread_rng().try_fill(&mut arr[..])?;
+    /// # Ok(())
+    /// # }
+    ///
+    /// # try_inner().unwrap()
+    /// ```
+    ///
+    /// [`try_fill_bytes`]: RngCore::try_fill_bytes
+    /// [`fill`]: Rng::fill
+    fn try_fill<T: Fill + ?Sized>(&mut self, dest: &mut T) -> Result<(), Error> {
+        dest.try_fill(self)
+    }
+
+    /// Return a bool with a probability `p` of being true.
+    ///
+    /// See also the [`Bernoulli`] distribution, which may be faster if
+    /// sampling from the same probability repeatedly.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// println!("{}", rng.gen_bool(1.0 / 3.0));
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// If `p < 0` or `p > 1`.
+    ///
+    /// [`Bernoulli`]: distributions::Bernoulli
+    #[inline]
+    fn gen_bool(&mut self, p: f64) -> bool {
+        let d = distributions::Bernoulli::new(p).unwrap();
+        self.sample(d)
+    }
+
+    /// Return a bool with a probability of `numerator/denominator` of being
+    /// true. I.e. `gen_ratio(2, 3)` has chance of 2 in 3, or about 67%, of
+    /// returning true. If `numerator == denominator`, then the returned value
+    /// is guaranteed to be `true`. If `numerator == 0`, then the returned
+    /// value is guaranteed to be `false`.
+    ///
+    /// See also the [`Bernoulli`] distribution, which may be faster if
+    /// sampling from the same `numerator` and `denominator` repeatedly.
+    ///
+    /// # Panics
+    ///
+    /// If `denominator == 0` or `numerator > denominator`.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// println!("{}", rng.gen_ratio(2, 3));
+    /// ```
+    ///
+    /// [`Bernoulli`]: distributions::Bernoulli
+    #[inline]
+    fn gen_ratio(&mut self, numerator: u32, denominator: u32) -> bool {
+        let d = distributions::Bernoulli::from_ratio(numerator, denominator).unwrap();
+        self.sample(d)
+    }
+}
+
+impl<R: RngCore + ?Sized> Rng for R {}
+
+/// Types which may be filled with random data
+///
+/// This trait allows arrays to be efficiently filled with random data.
+///
+/// Implementations are expected to be portable across machines unless
+/// clearly documented otherwise (see the
+/// [Chapter on Portability](https://rust-random.github.io/book/portability.html)).
+pub trait Fill {
+    /// Fill self with random data
+    fn try_fill<R: Rng + ?Sized>(&mut self, rng: &mut R) -> Result<(), Error>;
+}
+
+macro_rules! impl_fill_each {
+    () => {};
+    ($t:ty) => {
+        impl Fill for [$t] {
+            fn try_fill<R: Rng + ?Sized>(&mut self, rng: &mut R) -> Result<(), Error> {
+                for elt in self.iter_mut() {
+                    *elt = rng.gen();
+                }
+                Ok(())
+            }
+        }
+    };
+    ($t:ty, $($tt:ty,)*) => {
+        impl_fill_each!($t);
+        impl_fill_each!($($tt,)*);
+    };
+}
+
+impl_fill_each!(bool, char, f32, f64,);
+
+impl Fill for [u8] {
+    fn try_fill<R: Rng + ?Sized>(&mut self, rng: &mut R) -> Result<(), Error> {
+        rng.try_fill_bytes(self)
+    }
+}
+
+macro_rules! impl_fill {
+    () => {};
+    ($t:ty) => {
+        impl Fill for [$t] {
+            #[inline(never)] // in micro benchmarks, this improves performance
+            fn try_fill<R: Rng + ?Sized>(&mut self, rng: &mut R) -> Result<(), Error> {
+                if self.len() > 0 {
+                    rng.try_fill_bytes(unsafe {
+                        slice::from_raw_parts_mut(self.as_mut_ptr()
+                            as *mut u8,
+                            self.len() * mem::size_of::<$t>()
+                        )
+                    })?;
+                    for x in self {
+                        *x = x.to_le();
+                    }
+                }
+                Ok(())
+            }
+        }
+
+        impl Fill for [Wrapping<$t>] {
+            #[inline(never)]
+            fn try_fill<R: Rng + ?Sized>(&mut self, rng: &mut R) -> Result<(), Error> {
+                if self.len() > 0 {
+                    rng.try_fill_bytes(unsafe {
+                        slice::from_raw_parts_mut(self.as_mut_ptr()
+                            as *mut u8,
+                            self.len() * mem::size_of::<$t>()
+                        )
+                    })?;
+                    for x in self {
+                    *x = Wrapping(x.0.to_le());
+                    }
+                }
+                Ok(())
+            }
+        }
+    };
+    ($t:ty, $($tt:ty,)*) => {
+        impl_fill!($t);
+        // TODO: this could replace above impl once Rust #32463 is fixed
+        // impl_fill!(Wrapping<$t>);
+        impl_fill!($($tt,)*);
+    }
+}
+
+impl_fill!(u16, u32, u64, usize,);
+#[cfg(not(target_os = "emscripten"))]
+impl_fill!(u128);
+impl_fill!(i8, i16, i32, i64, isize,);
+#[cfg(not(target_os = "emscripten"))]
+impl_fill!(i128);
+
+#[cfg(feature = "min_const_gen")]
+impl<T, const N: usize> Fill for [T; N]
+where [T]: Fill
+{
+    fn try_fill<R: Rng + ?Sized>(&mut self, rng: &mut R) -> Result<(), Error> {
+        self[..].try_fill(rng)
+    }
+}
+
+#[cfg(not(feature = "min_const_gen"))]
+macro_rules! impl_fill_arrays {
+    ($n:expr,) => {};
+    ($n:expr, $N:ident) => {
+        impl<T> Fill for [T; $n] where [T]: Fill {
+            fn try_fill<R: Rng + ?Sized>(&mut self, rng: &mut R) -> Result<(), Error> {
+                self[..].try_fill(rng)
+            }
+        }
+    };
+    ($n:expr, $N:ident, $($NN:ident,)*) => {
+        impl_fill_arrays!($n, $N);
+        impl_fill_arrays!($n - 1, $($NN,)*);
+    };
+    (!div $n:expr,) => {};
+    (!div $n:expr, $N:ident, $($NN:ident,)*) => {
+        impl_fill_arrays!($n, $N);
+        impl_fill_arrays!(!div $n / 2, $($NN,)*);
+    };
+}
+#[cfg(not(feature = "min_const_gen"))]
+#[rustfmt::skip]
+impl_fill_arrays!(32, N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,);
+#[cfg(not(feature = "min_const_gen"))]
+impl_fill_arrays!(!div 4096, N,N,N,N,N,N,N,);
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::rng;
+    use crate::rngs::mock::StepRng;
+    #[cfg(feature = "alloc")] use alloc::boxed::Box;
+
+    #[test]
+    fn test_fill_bytes_default() {
+        let mut r = StepRng::new(0x11_22_33_44_55_66_77_88, 0);
+
+        // check every remainder mod 8, both in small and big vectors.
+        let lengths = [0, 1, 2, 3, 4, 5, 6, 7, 80, 81, 82, 83, 84, 85, 86, 87];
+        for &n in lengths.iter() {
+            let mut buffer = [0u8; 87];
+            let v = &mut buffer[0..n];
+            r.fill_bytes(v);
+
+            // use this to get nicer error messages.
+            for (i, &byte) in v.iter().enumerate() {
+                if byte == 0 {
+                    panic!("byte {} of {} is zero", i, n)
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_fill() {
+        let x = 9041086907909331047; // a random u64
+        let mut rng = StepRng::new(x, 0);
+
+        // Convert to byte sequence and back to u64; byte-swap twice if BE.
+        let mut array = [0u64; 2];
+        rng.fill(&mut array[..]);
+        assert_eq!(array, [x, x]);
+        assert_eq!(rng.next_u64(), x);
+
+        // Convert to bytes then u32 in LE order
+        let mut array = [0u32; 2];
+        rng.fill(&mut array[..]);
+        assert_eq!(array, [x as u32, (x >> 32) as u32]);
+        assert_eq!(rng.next_u32(), x as u32);
+
+        // Check equivalence using wrapped arrays
+        let mut warray = [Wrapping(0u32); 2];
+        rng.fill(&mut warray[..]);
+        assert_eq!(array[0], warray[0].0);
+        assert_eq!(array[1], warray[1].0);
+
+        // Check equivalence for generated floats
+        let mut array = [0f32; 2];
+        rng.fill(&mut array);
+        let gen: [f32; 2] = rng.gen();
+        assert_eq!(array, gen);
+    }
+
+    #[test]
+    fn test_fill_empty() {
+        let mut array = [0u32; 0];
+        let mut rng = StepRng::new(0, 1);
+        rng.fill(&mut array);
+        rng.fill(&mut array[..]);
+    }
+
+    #[test]
+    fn test_gen_range_int() {
+        let mut r = rng(101);
+        for _ in 0..1000 {
+            let a = r.gen_range(-4711..17);
+            assert!((-4711..17).contains(&a));
+            let a: i8 = r.gen_range(-3..42);
+            assert!((-3..42).contains(&a));
+            let a: u16 = r.gen_range(10..99);
+            assert!((10..99).contains(&a));
+            let a: i32 = r.gen_range(-100..2000);
+            assert!((-100..2000).contains(&a));
+            let a: u32 = r.gen_range(12..=24);
+            assert!((12..=24).contains(&a));
+
+            assert_eq!(r.gen_range(0u32..1), 0u32);
+            assert_eq!(r.gen_range(-12i64..-11), -12i64);
+            assert_eq!(r.gen_range(3_000_000..3_000_001), 3_000_000);
+        }
+    }
+
+    #[test]
+    fn test_gen_range_float() {
+        let mut r = rng(101);
+        for _ in 0..1000 {
+            let a = r.gen_range(-4.5..1.7);
+            assert!((-4.5..1.7).contains(&a));
+            let a = r.gen_range(-1.1..=-0.3);
+            assert!((-1.1..=-0.3).contains(&a));
+
+            assert_eq!(r.gen_range(0.0f32..=0.0), 0.);
+            assert_eq!(r.gen_range(-11.0..=-11.0), -11.);
+            assert_eq!(r.gen_range(3_000_000.0..=3_000_000.0), 3_000_000.);
+        }
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_gen_range_panic_int() {
+        #![allow(clippy::reversed_empty_ranges)]
+        let mut r = rng(102);
+        r.gen_range(5..-2);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_gen_range_panic_usize() {
+        #![allow(clippy::reversed_empty_ranges)]
+        let mut r = rng(103);
+        r.gen_range(5..2);
+    }
+
+    #[test]
+    fn test_gen_bool() {
+        #![allow(clippy::bool_assert_comparison)]
+
+        let mut r = rng(105);
+        for _ in 0..5 {
+            assert_eq!(r.gen_bool(0.0), false);
+            assert_eq!(r.gen_bool(1.0), true);
+        }
+    }
+
+    #[test]
+    fn test_rng_trait_object() {
+        use crate::distributions::{Distribution, Standard};
+        let mut rng = rng(109);
+        let mut r = &mut rng as &mut dyn RngCore;
+        r.next_u32();
+        r.gen::<i32>();
+        assert_eq!(r.gen_range(0..1), 0);
+        let _c: u8 = Standard.sample(&mut r);
+    }
+
+    #[test]
+    #[cfg(feature = "alloc")]
+    fn test_rng_boxed_trait() {
+        use crate::distributions::{Distribution, Standard};
+        let rng = rng(110);
+        let mut r = Box::new(rng) as Box<dyn RngCore>;
+        r.next_u32();
+        r.gen::<i32>();
+        assert_eq!(r.gen_range(0..1), 0);
+        let _c: u8 = Standard.sample(&mut r);
+    }
+
+    #[test]
+    #[cfg_attr(miri, ignore)] // Miri is too slow
+    fn test_gen_ratio_average() {
+        const NUM: u32 = 3;
+        const DENOM: u32 = 10;
+        const N: u32 = 100_000;
+
+        let mut sum: u32 = 0;
+        let mut rng = rng(111);
+        for _ in 0..N {
+            if rng.gen_ratio(NUM, DENOM) {
+                sum += 1;
+            }
+        }
+        // Have Binomial(N, NUM/DENOM) distribution
+        let expected = (NUM * N) / DENOM; // exact integer
+        assert!(((sum - expected) as i32).abs() < 500);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/adapter/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/adapter/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/adapter/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/adapter/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,8 +8,9 @@
 
 //! Wrappers / adapters forming RNGs
 
-#[cfg(feature = "std")] mod read;
+mod read;
 mod reseeding;
 
-#[cfg(feature = "std")] pub use self::read::{ReadError, ReadRng};
+#[allow(deprecated)]
+pub use self::read::{ReadError, ReadRng};
 pub use self::reseeding::ReseedingRng;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/adapter/read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/adapter/read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/adapter/read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/adapter/read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,6 +9,8 @@
 
 //! A wrapper around any Read to treat it as an RNG.
 
+#![allow(deprecated)]
+
 use std::fmt;
 use std::io::Read;
 
@@ -30,20 +32,10 @@
 /// have enough data, will only be reported through [`try_fill_bytes`].
 /// The other [`RngCore`] methods will panic in case of an error.
 ///
-/// # Example
-///
-/// ```
-/// use rand::Rng;
-/// use rand::rngs::adapter::ReadRng;
-///
-/// let data = vec![1, 2, 3, 4, 5, 6, 7, 8];
-/// let mut rng = ReadRng::new(&data[..]);
-/// println!("{:x}", rng.gen::<u32>());
-/// ```
-///
 /// [`OsRng`]: crate::rngs::OsRng
 /// [`try_fill_bytes`]: RngCore::try_fill_bytes
 #[derive(Debug)]
+#[deprecated(since="0.8.4", note="removal due to lack of usage")]
 pub struct ReadRng<R> {
     reader: R,
 }
@@ -86,6 +78,7 @@
 
 /// `ReadRng` error type
 #[derive(Debug)]
+#[deprecated(since="0.8.4")]
 pub struct ReadError(std::io::Error);
 
 impl fmt::Display for ReadError {
@@ -103,6 +96,8 @@
 
 #[cfg(test)]
 mod test {
+    use std::println;
+
     use super::ReadRng;
     use crate::RngCore;
 
@@ -110,24 +105,24 @@
     fn test_reader_rng_u64() {
         // transmute from the target to avoid endianness concerns.
         #[rustfmt::skip]
-        let v = vec![0u8, 0, 0, 0, 0, 0, 0, 1,
-                     0  , 0, 0, 0, 0, 0, 0, 2,
-                     0,   0, 0, 0, 0, 0, 0, 3];
+        let v = [0u8, 0, 0, 0, 0, 0, 0, 1,
+                 0,   4, 0, 0, 3, 0, 0, 2,
+                 5,   0, 0, 0, 0, 0, 0, 0];
         let mut rng = ReadRng::new(&v[..]);
 
-        assert_eq!(rng.next_u64(), 1_u64.to_be());
-        assert_eq!(rng.next_u64(), 2_u64.to_be());
-        assert_eq!(rng.next_u64(), 3_u64.to_be());
+        assert_eq!(rng.next_u64(), 1 << 56);
+        assert_eq!(rng.next_u64(), (2 << 56) + (3 << 32) + (4 << 8));
+        assert_eq!(rng.next_u64(), 5);
     }
 
     #[test]
     fn test_reader_rng_u32() {
-        let v = vec![0u8, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3];
+        let v = [0u8, 0, 0, 1, 0, 0, 2, 0, 3, 0, 0, 0];
         let mut rng = ReadRng::new(&v[..]);
 
-        assert_eq!(rng.next_u32(), 1_u32.to_be());
-        assert_eq!(rng.next_u32(), 2_u32.to_be());
-        assert_eq!(rng.next_u32(), 3_u32.to_be());
+        assert_eq!(rng.next_u32(), 1 << 24);
+        assert_eq!(rng.next_u32(), 2 << 16);
+        assert_eq!(rng.next_u32(), 3);
     }
 
     #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/adapter/reseeding.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/adapter/reseeding.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/adapter/reseeding.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/adapter/reseeding.rs	2021-12-09 12:01:26.000000000 +0000
@@ -279,7 +279,7 @@
 }
 
 
-#[cfg(all(unix, feature = "std", not(target_os = "emscripten")))]
+#[cfg(all(unix, not(target_os = "emscripten")))]
 mod fork {
     use core::sync::atomic::{AtomicUsize, Ordering};
     use std::sync::Once;
@@ -316,7 +316,7 @@
     }
 }
 
-#[cfg(not(all(unix, feature = "std", not(target_os = "emscripten"))))]
+#[cfg(not(all(unix, not(target_os = "emscripten"))))]
 mod fork {
     pub fn get_fork_counter() -> usize {
         0
@@ -325,6 +325,7 @@
 }
 
 
+#[cfg(feature = "std_rng")]
 #[cfg(test)]
 mod test {
     use super::ReseedingRng;
@@ -354,6 +355,8 @@
 
     #[test]
     fn test_clone_reseeding() {
+        #![allow(clippy::redundant_clone)]
+
         let mut zero = StepRng::new(0, 0);
         let rng = Core::from_rng(&mut zero).unwrap();
         let mut rng1 = ReseedingRng::new(rng, 32 * 4, zero);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/entropy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/entropy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/entropy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/entropy.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Entropy generator, or wrapper around external generators
-
-#![allow(deprecated)] // whole module is deprecated
-
-use crate::rngs::OsRng;
-use rand_core::{CryptoRng, Error, RngCore};
-
-/// An interface returning random data from external source(s), provided
-/// specifically for securely seeding algorithmic generators (PRNGs).
-///
-/// This is deprecated. It is suggested you use [`rngs::OsRng`] instead.
-///
-/// [`rngs::OsRng`]: crate::rngs::OsRng
-#[derive(Debug)]
-#[deprecated(since = "0.7.0", note = "use rngs::OsRng instead")]
-pub struct EntropyRng {
-    source: OsRng,
-}
-
-impl EntropyRng {
-    /// Create a new `EntropyRng`.
-    ///
-    /// This method will do no system calls or other initialization routines,
-    /// those are done on first use. This is done to make `new` infallible,
-    /// and `try_fill_bytes` the only place to report errors.
-    pub fn new() -> Self {
-        EntropyRng { source: OsRng }
-    }
-}
-
-impl Default for EntropyRng {
-    fn default() -> Self {
-        EntropyRng::new()
-    }
-}
-
-impl RngCore for EntropyRng {
-    fn next_u32(&mut self) -> u32 {
-        self.source.next_u32()
-    }
-
-    fn next_u64(&mut self) -> u64 {
-        self.source.next_u64()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.source.fill_bytes(dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.source.try_fill_bytes(dest)
-    }
-}
-
-impl CryptoRng for EntropyRng {}
-
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_entropy() {
-        let mut rng = EntropyRng::new();
-        let n = (rng.next_u32() ^ rng.next_u32()).count_ones();
-        assert!(n >= 2); // p(failure) approx 1e-7
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/mock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/mock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/mock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/mock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,6 +10,9 @@
 
 use rand_core::{impls, Error, RngCore};
 
+#[cfg(feature = "serde1")]
+use serde::{Serialize, Deserialize};
+
 /// A simple implementation of `RngCore` for testing purposes.
 ///
 /// This generates an arithmetic sequence (i.e. adds a constant each step)
@@ -24,7 +27,8 @@
 /// let sample: [u64; 3] = my_rng.gen();
 /// assert_eq!(sample, [2, 3, 4]);
 /// ```
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct StepRng {
     v: u64,
     a: u64,
@@ -65,3 +69,19 @@
         Ok(())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    #[cfg(feature = "serde1")]
+    fn test_serialization_step_rng() {
+        use super::StepRng;
+
+        let some_rng = StepRng::new(42, 7);
+        let de_some_rng: StepRng =
+            bincode::deserialize(&bincode::serialize(&some_rng).unwrap()).unwrap();
+        assert_eq!(some_rng.v, de_some_rng.v);
+        assert_eq!(some_rng.a, de_some_rng.a);
+
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -58,7 +58,7 @@
 //!     is local, it is typically much faster than [`OsRng`]. It should be
 //!     secure, though the paranoid may prefer [`OsRng`].
 //! -   [`StdRng`] is a CSPRNG chosen for good performance and trust of security
-//!     (based on reviews, maturity and usage). The current algorithm is ChaCha20,
+//!     (based on reviews, maturity and usage). The current algorithm is ChaCha12,
 //!     which is well established and rigorously analysed.
 //!     [`StdRng`] provides the algorithm used by [`ThreadRng`] but without
 //!     periodic reseeding.
@@ -96,21 +96,24 @@
 //! [`rand_xoshiro`]: https://crates.io/crates/rand_xoshiro
 //! [`rng` tag]: https://crates.io/keywords/rng
 
-pub mod adapter;
+#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+#[cfg(feature = "std")] pub mod adapter;
 
-#[cfg(feature = "std")] mod entropy;
 pub mod mock; // Public so we don't export `StepRng` directly, making it a bit
               // more clear it is intended for testing.
+
+#[cfg(all(feature = "small_rng", target_pointer_width = "64"))]
+mod xoshiro256plusplus;
+#[cfg(all(feature = "small_rng", not(target_pointer_width = "64")))]
+mod xoshiro128plusplus;
 #[cfg(feature = "small_rng")] mod small;
-mod std;
-#[cfg(feature = "std")] pub(crate) mod thread;
 
-#[allow(deprecated)]
-#[cfg(feature = "std")]
-pub use self::entropy::EntropyRng;
+#[cfg(feature = "std_rng")] mod std;
+#[cfg(all(feature = "std", feature = "std_rng"))] pub(crate) mod thread;
 
 #[cfg(feature = "small_rng")] pub use self::small::SmallRng;
-pub use self::std::StdRng;
-#[cfg(feature = "std")] pub use self::thread::ThreadRng;
+#[cfg(feature = "std_rng")] pub use self::std::StdRng;
+#[cfg(all(feature = "std", feature = "std_rng"))] pub use self::thread::ThreadRng;
 
+#[cfg_attr(doc_cfg, doc(cfg(feature = "getrandom")))]
 #[cfg(feature = "getrandom")] pub use rand_core::OsRng;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/small.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/small.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/small.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/small.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,33 +10,36 @@
 
 use rand_core::{Error, RngCore, SeedableRng};
 
-#[cfg(all(not(target_os = "emscripten"), target_pointer_width = "64"))]
-type Rng = rand_pcg::Pcg64Mcg;
-#[cfg(not(all(not(target_os = "emscripten"), target_pointer_width = "64")))]
-type Rng = rand_pcg::Pcg32;
+#[cfg(target_pointer_width = "64")]
+type Rng = super::xoshiro256plusplus::Xoshiro256PlusPlus;
+#[cfg(not(target_pointer_width = "64"))]
+type Rng = super::xoshiro128plusplus::Xoshiro128PlusPlus;
 
 /// A small-state, fast non-crypto PRNG
 ///
 /// `SmallRng` may be a good choice when a PRNG with small state, cheap
 /// initialization, good statistical quality and good performance are required.
-/// It is **not** a good choice when security against prediction or
-/// reproducibility are important.
-///
-/// This PRNG is **feature-gated**: to use, you must enable the crate feature
-/// `small_rng`.
+/// Note that depending on the application, [`StdRng`] may be faster on many
+/// modern platforms while providing higher-quality randomness. Furthermore,
+/// `SmallRng` is **not** a good choice when:
+/// - Security against prediction is important. Use [`StdRng`] instead.
+/// - Seeds with many zeros are provided. In such cases, it takes `SmallRng`
+///   about 10 samples to produce 0 and 1 bits with equal probability. Either
+///   provide seeds with an approximately equal number of 0 and 1 (for example
+///   by using [`SeedableRng::from_entropy`] or [`SeedableRng::seed_from_u64`]),
+///   or use [`StdRng`] instead.
 ///
 /// The algorithm is deterministic but should not be considered reproducible
 /// due to dependence on platform and possible replacement in future
 /// library versions. For a reproducible generator, use a named PRNG from an
-/// external crate, e.g. [rand_pcg] or [rand_chacha].
+/// external crate, e.g. [rand_xoshiro] or [rand_chacha].
 /// Refer also to [The Book](https://rust-random.github.io/book/guide-rngs.html).
 ///
-/// The PRNG algorithm in `SmallRng` is chosen to be
-/// efficient on the current platform, without consideration for cryptography
-/// or security. The size of its state is much smaller than [`StdRng`].
-/// The current algorithm is [`Pcg64Mcg`](rand_pcg::Pcg64Mcg) on 64-bit
-/// platforms and [`Pcg32`](rand_pcg::Pcg32) on 32-bit platforms. Both are
-/// implemented by the [rand_pcg] crate.
+/// The PRNG algorithm in `SmallRng` is chosen to be efficient on the current
+/// platform, without consideration for cryptography or security. The size of
+/// its state is much smaller than [`StdRng`]. The current algorithm is
+/// `Xoshiro256PlusPlus` on 64-bit platforms and `Xoshiro128PlusPlus` on 32-bit
+/// platforms. Both are also implemented by the [rand_xoshiro] crate.
 ///
 /// # Examples
 ///
@@ -72,8 +75,9 @@
 /// [`StdRng`]: crate::rngs::StdRng
 /// [`thread_rng`]: crate::thread_rng
 /// [rand_chacha]: https://crates.io/crates/rand_chacha
-/// [rand_pcg]: https://crates.io/crates/rand_pcg
-#[derive(Clone, Debug)]
+/// [rand_xoshiro]: https://crates.io/crates/rand_xoshiro
+#[cfg_attr(doc_cfg, doc(cfg(feature = "small_rng")))]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct SmallRng(Rng);
 
 impl RngCore for SmallRng {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/std.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/std.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/std.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/std.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,20 +11,20 @@
 use crate::{CryptoRng, Error, RngCore, SeedableRng};
 
 #[cfg(all(any(test, feature = "std"), not(target_os = "emscripten")))]
-pub(crate) use rand_chacha::ChaCha20Core as Core;
+pub(crate) use rand_chacha::ChaCha12Core as Core;
 #[cfg(all(any(test, feature = "std"), target_os = "emscripten"))]
 pub(crate) use rand_hc::Hc128Core as Core;
 
-#[cfg(not(target_os = "emscripten"))] use rand_chacha::ChaCha20Rng as Rng;
+#[cfg(not(target_os = "emscripten"))] use rand_chacha::ChaCha12Rng as Rng;
 #[cfg(target_os = "emscripten")] use rand_hc::Hc128Rng as Rng;
 
 /// The standard RNG. The PRNG algorithm in `StdRng` is chosen to be efficient
 /// on the current platform, to be statistically strong and unpredictable
 /// (meaning a cryptographically secure PRNG).
 ///
-/// The current algorithm used is the ChaCha block cipher with 20 rounds.
-/// This may change as new evidence of cipher security and performance
-/// becomes available.
+/// The current algorithm used is the ChaCha block cipher with 12 rounds. Please
+/// see this relevant [rand issue] for the discussion. This may change as new 
+/// evidence of cipher security and performance becomes available.
 ///
 /// The algorithm is deterministic but should not be considered reproducible
 /// due to dependence on configuration and possible replacement in future
@@ -32,7 +32,9 @@
 /// the [rand_chacha] crate directly.
 ///
 /// [rand_chacha]: https://crates.io/crates/rand_chacha
-#[derive(Clone, Debug)]
+/// [rand issue]: https://github.com/rust-random/rand/issues/932
+#[cfg_attr(doc_cfg, doc(cfg(feature = "std_rng")))]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct StdRng(Rng);
 
 impl RngCore for StdRng {
@@ -87,9 +89,6 @@
         let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
                     0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
 
-        #[cfg(any(feature = "stdrng_strong", not(feature = "stdrng_fast")))]
-        let target = [3950704604716924505, 5573172343717151650];
-        #[cfg(all(not(feature = "stdrng_strong"), feature = "stdrng_fast"))]
         let target = [10719222850664546238, 14064965282130556830];
 
         let mut rng0 = StdRng::from_seed(seed);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/thread.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/thread.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/thread.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/thread.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,8 +8,9 @@
 
 //! Thread-local random number generator
 
-use std::cell::UnsafeCell;
-use std::ptr::NonNull;
+use core::cell::UnsafeCell;
+use std::rc::Rc;
+use std::thread_local;
 
 use super::std::Core;
 use crate::rngs::adapter::ReseedingRng;
@@ -36,37 +37,42 @@
 // of 32 kB and less. We choose 64 kB to avoid significant overhead.
 const THREAD_RNG_RESEED_THRESHOLD: u64 = 1024 * 64;
 
-/// The type returned by [`thread_rng`], essentially just a reference to the
-/// PRNG in thread-local memory.
+/// A reference to the thread-local generator
 ///
-/// `ThreadRng` uses the same PRNG as [`StdRng`] for security and performance.
-/// As hinted by the name, the generator is thread-local. `ThreadRng` is a
-/// handle to this generator and thus supports `Copy`, but not `Send` or `Sync`.
+/// An instance can be obtained via [`thread_rng`] or via `ThreadRng::default()`.
+/// This handle is safe to use everywhere (including thread-local destructors)
+/// but cannot be passed between threads (is not `Send` or `Sync`).
 ///
-/// Unlike `StdRng`, `ThreadRng` uses the  [`ReseedingRng`] wrapper to reseed
-/// the PRNG from fresh entropy every 64 kiB of random data.
-/// [`OsRng`] is used to provide seed data.
+/// `ThreadRng` uses the same PRNG as [`StdRng`] for security and performance
+/// and is automatically seeded from [`OsRng`].
 ///
+/// Unlike `StdRng`, `ThreadRng` uses the  [`ReseedingRng`] wrapper to reseed
+/// the PRNG from fresh entropy every 64 kiB of random data as well as after a
+/// fork on Unix (though not quite immediately; see documentation of
+/// [`ReseedingRng`]).
 /// Note that the reseeding is done as an extra precaution against side-channel
 /// attacks and mis-use (e.g. if somehow weak entropy were supplied initially).
 /// The PRNG algorithms used are assumed to be secure.
 ///
 /// [`ReseedingRng`]: crate::rngs::adapter::ReseedingRng
 /// [`StdRng`]: crate::rngs::StdRng
-#[derive(Copy, Clone, Debug)]
+#[cfg_attr(doc_cfg, doc(cfg(all(feature = "std", feature = "std_rng"))))]
+#[derive(Clone, Debug)]
 pub struct ThreadRng {
-    // inner raw pointer implies type is neither Send nor Sync
-    rng: NonNull<ReseedingRng<Core, OsRng>>,
+    // Rc is explictly !Send and !Sync
+    rng: Rc<UnsafeCell<ReseedingRng<Core, OsRng>>>,
 }
 
 thread_local!(
-    static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Core, OsRng>> = {
+    // We require Rc<..> to avoid premature freeing when thread_rng is used
+    // within thread-local destructors. See #968.
+    static THREAD_RNG_KEY: Rc<UnsafeCell<ReseedingRng<Core, OsRng>>> = {
         let r = Core::from_rng(OsRng).unwrap_or_else(|err|
                 panic!("could not initialize thread_rng: {}", err));
         let rng = ReseedingRng::new(r,
                                     THREAD_RNG_RESEED_THRESHOLD,
                                     OsRng);
-        UnsafeCell::new(rng)
+        Rc::new(UnsafeCell::new(rng))
     }
 );
 
@@ -77,10 +83,10 @@
 /// `ThreadRng::default()` equivalent.
 ///
 /// For more information see [`ThreadRng`].
+#[cfg_attr(doc_cfg, doc(cfg(all(feature = "std", feature = "std_rng"))))]
 pub fn thread_rng() -> ThreadRng {
-    let raw = THREAD_RNG_KEY.with(|t| t.get());
-    let nn = NonNull::new(raw).unwrap();
-    ThreadRng { rng: nn }
+    let rng = THREAD_RNG_KEY.with(|t| t.clone());
+    ThreadRng { rng }
 }
 
 impl Default for ThreadRng {
@@ -92,20 +98,32 @@
 impl RngCore for ThreadRng {
     #[inline(always)]
     fn next_u32(&mut self) -> u32 {
-        unsafe { self.rng.as_mut().next_u32() }
+        // SAFETY: We must make sure to stop using `rng` before anyone else
+        // creates another mutable reference
+        let rng = unsafe { &mut *self.rng.get() };
+        rng.next_u32()
     }
 
     #[inline(always)]
     fn next_u64(&mut self) -> u64 {
-        unsafe { self.rng.as_mut().next_u64() }
+        // SAFETY: We must make sure to stop using `rng` before anyone else
+        // creates another mutable reference
+        let rng = unsafe { &mut *self.rng.get() };
+        rng.next_u64()
     }
 
     fn fill_bytes(&mut self, dest: &mut [u8]) {
-        unsafe { self.rng.as_mut().fill_bytes(dest) }
+        // SAFETY: We must make sure to stop using `rng` before anyone else
+        // creates another mutable reference
+        let rng = unsafe { &mut *self.rng.get() };
+        rng.fill_bytes(dest)
     }
 
     fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        unsafe { self.rng.as_mut().try_fill_bytes(dest) }
+        // SAFETY: We must make sure to stop using `rng` before anyone else
+        // creates another mutable reference
+        let rng = unsafe { &mut *self.rng.get() };
+        rng.try_fill_bytes(dest)
     }
 }
 
@@ -119,6 +137,6 @@
         use crate::Rng;
         let mut r = crate::thread_rng();
         r.gen::<i32>();
-        assert_eq!(r.gen_range(0, 1), 0);
+        assert_eq!(r.gen_range(0..1), 0);
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/xoshiro128plusplus.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/xoshiro128plusplus.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/xoshiro128plusplus.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/xoshiro128plusplus.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,118 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[cfg(feature="serde1")] use serde::{Serialize, Deserialize};
+use rand_core::impls::{next_u64_via_u32, fill_bytes_via_next};
+use rand_core::le::read_u32_into;
+use rand_core::{SeedableRng, RngCore, Error};
+
+/// A xoshiro128++ random number generator.
+///
+/// The xoshiro128++ algorithm is not suitable for cryptographic purposes, but
+/// is very fast and has excellent statistical properties.
+///
+/// The algorithm used here is translated from [the `xoshiro128plusplus.c`
+/// reference source code](http://xoshiro.di.unimi.it/xoshiro128plusplus.c) by
+/// David Blackman and Sebastiano Vigna.
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct Xoshiro128PlusPlus {
+    s: [u32; 4],
+}
+
+impl SeedableRng for Xoshiro128PlusPlus {
+    type Seed = [u8; 16];
+
+    /// Create a new `Xoshiro128PlusPlus`.  If `seed` is entirely 0, it will be
+    /// mapped to a different seed.
+    #[inline]
+    fn from_seed(seed: [u8; 16]) -> Xoshiro128PlusPlus {
+        if seed.iter().all(|&x| x == 0) {
+            return Self::seed_from_u64(0);
+        }
+        let mut state = [0; 4];
+        read_u32_into(&seed, &mut state);
+        Xoshiro128PlusPlus { s: state }
+    }
+
+    /// Create a new `Xoshiro128PlusPlus` from a `u64` seed.
+    ///
+    /// This uses the SplitMix64 generator internally.
+    fn seed_from_u64(mut state: u64) -> Self {
+        const PHI: u64 = 0x9e3779b97f4a7c15;
+        let mut seed = Self::Seed::default();
+        for chunk in seed.as_mut().chunks_mut(8) {
+            state = state.wrapping_add(PHI);
+            let mut z = state;
+            z = (z ^ (z >> 30)).wrapping_mul(0xbf58476d1ce4e5b9);
+            z = (z ^ (z >> 27)).wrapping_mul(0x94d049bb133111eb);
+            z = z ^ (z >> 31);
+            chunk.copy_from_slice(&z.to_le_bytes());
+        }
+        Self::from_seed(seed)
+    }
+}
+
+impl RngCore for Xoshiro128PlusPlus {
+    #[inline]
+    fn next_u32(&mut self) -> u32 {
+        let result_starstar = self.s[0]
+            .wrapping_add(self.s[3])
+            .rotate_left(7)
+            .wrapping_add(self.s[0]);
+
+        let t = self.s[1] << 9;
+
+        self.s[2] ^= self.s[0];
+        self.s[3] ^= self.s[1];
+        self.s[1] ^= self.s[2];
+        self.s[0] ^= self.s[3];
+
+        self.s[2] ^= t;
+
+        self.s[3] = self.s[3].rotate_left(11);
+
+        result_starstar
+    }
+
+    #[inline]
+    fn next_u64(&mut self) -> u64 {
+        next_u64_via_u32(self)
+    }
+
+    #[inline]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        fill_bytes_via_next(self, dest);
+    }
+
+    #[inline]
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.fill_bytes(dest);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn reference() {
+        let mut rng = Xoshiro128PlusPlus::from_seed(
+            [1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0]);
+        // These values were produced with the reference implementation:
+        // http://xoshiro.di.unimi.it/xoshiro128plusplus.c
+        let expected = [
+            641, 1573767, 3222811527, 3517856514, 836907274, 4247214768,
+            3867114732, 1355841295, 495546011, 621204420,
+        ];
+        for &e in &expected {
+            assert_eq!(rng.next_u32(), e);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/xoshiro256plusplus.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/xoshiro256plusplus.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/rngs/xoshiro256plusplus.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/rngs/xoshiro256plusplus.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,122 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[cfg(feature="serde1")] use serde::{Serialize, Deserialize};
+use rand_core::impls::fill_bytes_via_next;
+use rand_core::le::read_u64_into;
+use rand_core::{SeedableRng, RngCore, Error};
+
+/// A xoshiro256++ random number generator.
+///
+/// The xoshiro256++ algorithm is not suitable for cryptographic purposes, but
+/// is very fast and has excellent statistical properties.
+///
+/// The algorithm used here is translated from [the `xoshiro256plusplus.c`
+/// reference source code](http://xoshiro.di.unimi.it/xoshiro256plusplus.c) by
+/// David Blackman and Sebastiano Vigna.
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct Xoshiro256PlusPlus {
+    s: [u64; 4],
+}
+
+impl SeedableRng for Xoshiro256PlusPlus {
+    type Seed = [u8; 32];
+
+    /// Create a new `Xoshiro256PlusPlus`.  If `seed` is entirely 0, it will be
+    /// mapped to a different seed.
+    #[inline]
+    fn from_seed(seed: [u8; 32]) -> Xoshiro256PlusPlus {
+        if seed.iter().all(|&x| x == 0) {
+            return Self::seed_from_u64(0);
+        }
+        let mut state = [0; 4];
+        read_u64_into(&seed, &mut state);
+        Xoshiro256PlusPlus { s: state }
+    }
+
+    /// Create a new `Xoshiro256PlusPlus` from a `u64` seed.
+    ///
+    /// This uses the SplitMix64 generator internally.
+    fn seed_from_u64(mut state: u64) -> Self {
+        const PHI: u64 = 0x9e3779b97f4a7c15;
+        let mut seed = Self::Seed::default();
+        for chunk in seed.as_mut().chunks_mut(8) {
+            state = state.wrapping_add(PHI);
+            let mut z = state;
+            z = (z ^ (z >> 30)).wrapping_mul(0xbf58476d1ce4e5b9);
+            z = (z ^ (z >> 27)).wrapping_mul(0x94d049bb133111eb);
+            z = z ^ (z >> 31);
+            chunk.copy_from_slice(&z.to_le_bytes());
+        }
+        Self::from_seed(seed)
+    }
+}
+
+impl RngCore for Xoshiro256PlusPlus {
+    #[inline]
+    fn next_u32(&mut self) -> u32 {
+        // The lowest bits have some linear dependencies, so we use the
+        // upper bits instead.
+        (self.next_u64() >> 32) as u32
+    }
+
+    #[inline]
+    fn next_u64(&mut self) -> u64 {
+        let result_plusplus = self.s[0]
+            .wrapping_add(self.s[3])
+            .rotate_left(23)
+            .wrapping_add(self.s[0]);
+
+        let t = self.s[1] << 17;
+
+        self.s[2] ^= self.s[0];
+        self.s[3] ^= self.s[1];
+        self.s[1] ^= self.s[2];
+        self.s[0] ^= self.s[3];
+
+        self.s[2] ^= t;
+
+        self.s[3] = self.s[3].rotate_left(45);
+
+        result_plusplus
+    }
+
+    #[inline]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        fill_bytes_via_next(self, dest);
+    }
+
+    #[inline]
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.fill_bytes(dest);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn reference() {
+        let mut rng = Xoshiro256PlusPlus::from_seed(
+            [1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
+             3, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0]);
+        // These values were produced with the reference implementation:
+        // http://xoshiro.di.unimi.it/xoshiro256plusplus.c
+        let expected = [
+            41943041, 58720359, 3588806011781223, 3591011842654386,
+            9228616714210784205, 9973669472204895162, 14011001112246962877,
+            12406186145184390807, 15849039046786891736, 10450023813501588000,
+        ];
+        for &e in &expected {
+            assert_eq!(rng.next_u64(), e);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/seq/index.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/seq/index.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/seq/index.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/seq/index.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,22 +10,26 @@
 
 #[cfg(feature = "alloc")] use core::slice;
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
-use crate::alloc::vec::{self, Vec};
-#[cfg(feature = "std")] use std::vec;
+#[cfg(feature = "alloc")] use alloc::vec::{self, Vec};
 // BTreeMap is not as fast in tests, but better than nothing.
 #[cfg(all(feature = "alloc", not(feature = "std")))]
-use crate::alloc::collections::BTreeSet;
+use alloc::collections::BTreeSet;
 #[cfg(feature = "std")] use std::collections::HashSet;
 
 #[cfg(feature = "alloc")]
 use crate::distributions::{uniform::SampleUniform, Distribution, Uniform};
+#[cfg(feature = "std")]
+use crate::distributions::WeightedError;
 use crate::Rng;
 
+#[cfg(feature = "serde1")]
+use serde::{Serialize, Deserialize};
+
 /// A vector of indices.
 ///
 /// Multiple internal representations are possible.
 #[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub enum IndexVec {
     #[doc(hidden)]
     U32(Vec<u32>),
@@ -81,10 +85,15 @@
             IndexVec::USize(ref v) => IndexVecIter::USize(v.iter()),
         }
     }
+}
+
+impl IntoIterator for IndexVec {
+    type Item = usize;
+    type IntoIter = IndexVecIntoIter;
 
     /// Convert into an iterator over the indices as a sequence of `usize` values
     #[inline]
-    pub fn into_iter(self) -> IndexVecIntoIter {
+    fn into_iter(self) -> IndexVecIntoIter {
         match self {
             IndexVec::U32(v) => IndexVecIntoIter::U32(v.into_iter()),
             IndexVec::USize(v) => IndexVecIntoIter::USize(v.into_iter()),
@@ -249,6 +258,154 @@
     }
 }
 
+/// Randomly sample exactly `amount` distinct indices from `0..length`, and
+/// return them in an arbitrary order (there is no guarantee of shuffling or
+/// ordering). The weights are to be provided by the input function `weights`,
+/// which will be called once for each index.
+///
+/// This method is used internally by the slice sampling methods, but it can
+/// sometimes be useful to have the indices themselves so this is provided as
+/// an alternative.
+///
+/// This implementation uses `O(length + amount)` space and `O(length)` time
+/// if the "nightly" feature is enabled, or `O(length)` space and
+/// `O(length + amount * log length)` time otherwise.
+///
+/// Panics if `amount > length`.
+#[cfg(feature = "std")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+pub fn sample_weighted<R, F, X>(
+    rng: &mut R, length: usize, weight: F, amount: usize,
+) -> Result<IndexVec, WeightedError>
+where
+    R: Rng + ?Sized,
+    F: Fn(usize) -> X,
+    X: Into<f64>,
+{
+    if length > (core::u32::MAX as usize) {
+        sample_efraimidis_spirakis(rng, length, weight, amount)
+    } else {
+        assert!(amount <= core::u32::MAX as usize);
+        let amount = amount as u32;
+        let length = length as u32;
+        sample_efraimidis_spirakis(rng, length, weight, amount)
+    }
+}
+
+
+/// Randomly sample exactly `amount` distinct indices from `0..length`, and
+/// return them in an arbitrary order (there is no guarantee of shuffling or
+/// ordering). The weights are to be provided by the input function `weights`,
+/// which will be called once for each index.
+///
+/// This implementation uses the algorithm described by Efraimidis and Spirakis
+/// in this paper: https://doi.org/10.1016/j.ipl.2005.11.003
+/// It uses `O(length + amount)` space and `O(length)` time if the
+/// "nightly" feature is enabled, or `O(length)` space and `O(length
+/// + amount * log length)` time otherwise.
+///
+/// Panics if `amount > length`.
+#[cfg(feature = "std")]
+fn sample_efraimidis_spirakis<R, F, X, N>(
+    rng: &mut R, length: N, weight: F, amount: N,
+) -> Result<IndexVec, WeightedError>
+where
+    R: Rng + ?Sized,
+    F: Fn(usize) -> X,
+    X: Into<f64>,
+    N: UInt,
+    IndexVec: From<Vec<N>>,
+{
+    if amount == N::zero() {
+        return Ok(IndexVec::U32(Vec::new()));
+    }
+
+    if amount > length {
+        panic!("`amount` of samples must be less than or equal to `length`");
+    }
+
+    struct Element<N> {
+        index: N,
+        key: f64,
+    }
+    impl<N> PartialOrd for Element<N> {
+        fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
+            self.key.partial_cmp(&other.key)
+        }
+    }
+    impl<N> Ord for Element<N> {
+        fn cmp(&self, other: &Self) -> core::cmp::Ordering {
+             // partial_cmp will always produce a value,
+             // because we check that the weights are not nan
+            self.partial_cmp(other).unwrap()
+        }
+    }
+    impl<N> PartialEq for Element<N> {
+        fn eq(&self, other: &Self) -> bool {
+            self.key == other.key
+        }
+    }
+    impl<N> Eq for Element<N> {}
+
+    #[cfg(feature = "nightly")]
+    {
+        let mut candidates = Vec::with_capacity(length.as_usize());
+        let mut index = N::zero();
+        while index < length {
+            let weight = weight(index.as_usize()).into();
+            if !(weight >= 0.) {
+                return Err(WeightedError::InvalidWeight);
+            }
+
+            let key = rng.gen::<f64>().powf(1.0 / weight);
+            candidates.push(Element { index, key });
+
+            index += N::one();
+        }
+
+        // Partially sort the array to find the `amount` elements with the greatest
+        // keys. Do this by using `select_nth_unstable` to put the elements with
+        // the *smallest* keys at the beginning of the list in `O(n)` time, which
+        // provides equivalent information about the elements with the *greatest* keys.
+        let (_, mid, greater)
+            = candidates.select_nth_unstable(length.as_usize() - amount.as_usize());
+
+        let mut result: Vec<N> = Vec::with_capacity(amount.as_usize());
+        result.push(mid.index);
+        for element in greater {
+            result.push(element.index);
+        }
+        Ok(IndexVec::from(result))
+    }
+
+    #[cfg(not(feature = "nightly"))]
+    {
+        use std::collections::BinaryHeap;
+
+        // Partially sort the array such that the `amount` elements with the largest
+        // keys are first using a binary max heap.
+        let mut candidates = BinaryHeap::with_capacity(length.as_usize());
+        let mut index = N::zero();
+        while index < length {
+            let weight = weight(index.as_usize()).into();
+            if !(weight >= 0.) {
+                return Err(WeightedError::InvalidWeight);
+            }
+
+            let key = rng.gen::<f64>().powf(1.0 / weight);
+            candidates.push(Element { index, key });
+
+            index += N::one();
+        }
+
+        let mut result: Vec<N> = Vec::with_capacity(amount.as_usize());
+        while result.len() < amount.as_usize() {
+            result.push(candidates.pop().unwrap().index);
+        }
+        Ok(IndexVec::from(result))
+    }
+}
+
 /// Randomly sample exactly `amount` indices from `0..length`, using Floyd's
 /// combination algorithm.
 ///
@@ -265,7 +422,7 @@
     debug_assert!(amount <= length);
     let mut indices = Vec::with_capacity(amount as usize);
     for j in length - amount..length {
-        let t = rng.gen_range(0, j + 1);
+        let t = rng.gen_range(0..=j);
         if floyd_shuffle {
             if let Some(pos) = indices.iter().position(|&x| x == t) {
                 indices.insert(pos, j);
@@ -281,7 +438,7 @@
         // Reimplement SliceRandom::shuffle with smaller indices
         for i in (1..amount).rev() {
             // invariant: elements with index > i have been locked in place.
-            indices.swap(i as usize, rng.gen_range(0, i + 1) as usize);
+            indices.swap(i as usize, rng.gen_range(0..=i) as usize);
         }
     }
     IndexVec::from(indices)
@@ -305,7 +462,7 @@
     let mut indices: Vec<u32> = Vec::with_capacity(length as usize);
     indices.extend(0..length);
     for i in 0..amount {
-        let j: u32 = rng.gen_range(i, length);
+        let j: u32 = rng.gen_range(i..length);
         indices.swap(i as usize, j as usize);
     }
     indices.truncate(amount as usize);
@@ -313,8 +470,10 @@
     IndexVec::from(indices)
 }
 
-trait UInt: Copy + PartialOrd + Ord + PartialEq + Eq + SampleUniform + core::hash::Hash {
+trait UInt: Copy + PartialOrd + Ord + PartialEq + Eq + SampleUniform
+    + core::hash::Hash + core::ops::AddAssign {
     fn zero() -> Self;
+    fn one() -> Self;
     fn as_usize(self) -> usize;
 }
 impl UInt for u32 {
@@ -324,6 +483,11 @@
     }
 
     #[inline]
+    fn one() -> Self {
+        1
+    }
+
+    #[inline]
     fn as_usize(self) -> usize {
         self as usize
     }
@@ -335,6 +499,11 @@
     }
 
     #[inline]
+    fn one() -> Self {
+        1
+    }
+
+    #[inline]
     fn as_usize(self) -> usize {
         self
     }
@@ -376,8 +545,24 @@
 #[cfg(test)]
 mod test {
     use super::*;
-    #[cfg(all(feature = "alloc", not(feature = "std")))] use crate::alloc::vec;
-    #[cfg(feature = "std")] use std::vec;
+
+    #[test]
+    #[cfg(feature = "serde1")]
+    fn test_serialization_index_vec() {
+        let some_index_vec = IndexVec::from(vec![254_usize, 234, 2, 1]);
+        let de_some_index_vec: IndexVec = bincode::deserialize(&bincode::serialize(&some_index_vec).unwrap()).unwrap();
+        match (some_index_vec, de_some_index_vec) {
+            (IndexVec::U32(a), IndexVec::U32(b)) => {
+                assert_eq!(a, b);
+            },
+            (IndexVec::USize(a), IndexVec::USize(b)) => {
+                assert_eq!(a, b);
+            },
+            _ => {panic!("failed to seralize/deserialize `IndexVec`")}
+        }
+    }
+
+    #[cfg(feature = "alloc")] use alloc::vec;
 
     #[test]
     fn test_sample_boundaries() {
@@ -435,4 +620,59 @@
         assert!(v1.iter().all(|e| e < length));
         assert_eq!(v1, v2);
     }
+
+    #[cfg(feature = "std")]
+    #[test]
+    fn test_sample_weighted() {
+        let seed_rng = crate::test::rng;
+        for &(amount, len) in &[(0, 10), (5, 10), (10, 10)] {
+            let v = sample_weighted(&mut seed_rng(423), len, |i| i as f64, amount).unwrap();
+            match v {
+                IndexVec::U32(mut indices) => {
+                    assert_eq!(indices.len(), amount);
+                    indices.sort_unstable();
+                    indices.dedup();
+                    assert_eq!(indices.len(), amount);
+                    for &i in &indices {
+                        assert!((i as usize) < len);
+                    }
+                },
+                IndexVec::USize(_) => panic!("expected `IndexVec::U32`"),
+            }
+        }
+    }
+
+    #[test]
+    fn value_stability_sample() {
+        let do_test = |length, amount, values: &[u32]| {
+            let mut buf = [0u32; 8];
+            let mut rng = crate::test::rng(410);
+
+            let res = sample(&mut rng, length, amount);
+            let len = res.len().min(buf.len());
+            for (x, y) in res.into_iter().zip(buf.iter_mut()) {
+                *y = x as u32;
+            }
+            assert_eq!(
+                &buf[0..len],
+                values,
+                "failed sampling {}, {}",
+                length,
+                amount
+            );
+        };
+
+        do_test(10, 6, &[8, 0, 3, 5, 9, 6]); // floyd
+        do_test(25, 10, &[18, 15, 14, 9, 0, 13, 5, 24]); // floyd
+        do_test(300, 8, &[30, 283, 150, 1, 73, 13, 285, 35]); // floyd
+        do_test(300, 80, &[31, 289, 248, 154, 5, 78, 19, 286]); // inplace
+        do_test(300, 180, &[31, 289, 248, 154, 5, 78, 19, 286]); // inplace
+
+        do_test(1_000_000, 8, &[
+            103717, 963485, 826422, 509101, 736394, 807035, 5327, 632573,
+        ]); // floyd
+        do_test(1_000_000, 180, &[
+            103718, 963490, 826426, 509103, 736396, 807036, 5327, 632573,
+        ]); // rejection
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/seq/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/seq/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand/src/seq/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand/src/seq/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,19 +17,21 @@
 //!
 //! Also see:
 //!
-//! *   [`crate::distributions::weighted`] module which provides
-//!     implementations of weighted index sampling.
+//! *   [`crate::distributions::WeightedIndex`] distribution which provides
+//!     weighted index sampling.
 //!
 //! In order to make results reproducible across 32-64 bit architectures, all
 //! `usize` indices are sampled as a `u32` where possible (also providing a
 //! small performance boost in some cases).
 
 
-#[cfg(feature = "alloc")] pub mod index;
+#[cfg(feature = "alloc")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
+pub mod index;
 
 #[cfg(feature = "alloc")] use core::ops::Index;
 
-#[cfg(all(feature = "alloc", not(feature = "std")))] use crate::alloc::vec::Vec;
+#[cfg(feature = "alloc")] use alloc::vec::Vec;
 
 #[cfg(feature = "alloc")]
 use crate::distributions::uniform::{SampleBorrow, SampleUniform};
@@ -44,13 +46,11 @@
 /// ```
 /// use rand::seq::SliceRandom;
 ///
-/// fn main() {
-///     let mut rng = rand::thread_rng();
-///     let mut bytes = "Hello, random!".to_string().into_bytes();
-///     bytes.shuffle(&mut rng);
-///     let str = String::from_utf8(bytes).unwrap();
-///     println!("{}", str);
-/// }
+/// let mut rng = rand::thread_rng();
+/// let mut bytes = "Hello, random!".to_string().into_bytes();
+/// bytes.shuffle(&mut rng);
+/// let str = String::from_utf8(bytes).unwrap();
+/// println!("{}", str);
 /// ```
 /// Example output (non-deterministic):
 /// ```none
@@ -111,6 +111,7 @@
     /// }
     /// ```
     #[cfg(feature = "alloc")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
     fn choose_multiple<R>(&self, rng: &mut R, amount: usize) -> SliceChooseIter<Self, Self::Item>
     where R: Rng + ?Sized;
 
@@ -138,6 +139,7 @@
     /// [`choose_weighted_mut`]: SliceRandom::choose_weighted_mut
     /// [`distributions::weighted`]: crate::distributions::weighted
     #[cfg(feature = "alloc")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
     fn choose_weighted<R, F, B, X>(
         &self, rng: &mut R, weight: F,
     ) -> Result<&Self::Item, WeightedError>
@@ -165,6 +167,7 @@
     /// [`choose_weighted`]: SliceRandom::choose_weighted
     /// [`distributions::weighted`]: crate::distributions::weighted
     #[cfg(feature = "alloc")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
     fn choose_weighted_mut<R, F, B, X>(
         &mut self, rng: &mut R, weight: F,
     ) -> Result<&mut Self::Item, WeightedError>
@@ -178,6 +181,50 @@
             + Clone
             + Default;
 
+    /// Similar to [`choose_multiple`], but where the likelihood of each element's
+    /// inclusion in the output may be specified. The elements are returned in an
+    /// arbitrary, unspecified order.
+    ///
+    /// The specified function `weight` maps each item `x` to a relative
+    /// likelihood `weight(x)`. The probability of each item being selected is
+    /// therefore `weight(x) / s`, where `s` is the sum of all `weight(x)`.
+    ///
+    /// If all of the weights are equal, even if they are all zero, each element has
+    /// an equal likelihood of being selected.
+    ///
+    /// The complexity of this method depends on the feature `partition_at_index`.
+    /// If the feature is enabled, then for slices of length `n`, the complexity
+    /// is `O(n)` space and `O(n)` time. Otherwise, the complexity is `O(n)` space and
+    /// `O(n * log amount)` time.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::prelude::*;
+    ///
+    /// let choices = [('a', 2), ('b', 1), ('c', 1)];
+    /// let mut rng = thread_rng();
+    /// // First Draw * Second Draw = total odds
+    /// // -----------------------
+    /// // (50% * 50%) + (25% * 67%) = 41.7% chance that the output is `['a', 'b']` in some order.
+    /// // (50% * 50%) + (25% * 67%) = 41.7% chance that the output is `['a', 'c']` in some order.
+    /// // (25% * 33%) + (25% * 33%) = 16.6% chance that the output is `['b', 'c']` in some order.
+    /// println!("{:?}", choices.choose_multiple_weighted(&mut rng, 2, |item| item.1).unwrap().collect::<Vec<_>>());
+    /// ```
+    /// [`choose_multiple`]: SliceRandom::choose_multiple
+    //
+    // Note: this is feature-gated on std due to usage of f64::powf.
+    // If necessary, we may use alloc+libm as an alternative (see PR #1089).
+    #[cfg(feature = "std")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    fn choose_multiple_weighted<R, F, X>(
+        &self, rng: &mut R, amount: usize, weight: F,
+    ) -> Result<SliceChooseIter<Self, Self::Item>, WeightedError>
+    where
+        R: Rng + ?Sized,
+        F: Fn(&Self::Item) -> X,
+        X: Into<f64>;
+
     /// Shuffle a mutable slice in place.
     ///
     /// For slices of length `n`, complexity is `O(n)`.
@@ -222,18 +269,17 @@
 
 /// Extension trait on iterators, providing random sampling methods.
 ///
-/// This trait is implemented on all sized iterators, providing methods for
+/// This trait is implemented on all iterators `I` where `I: Iterator + Sized`
+/// and provides methods for
 /// choosing one or more elements. You must `use` this trait:
 ///
 /// ```
 /// use rand::seq::IteratorRandom;
 ///
-/// fn main() {
-///     let mut rng = rand::thread_rng();
-///     
-///     let faces = "😀😎�😕😠😢";
-///     println!("I am {}!", faces.chars().choose(&mut rng).unwrap());
-/// }
+/// let mut rng = rand::thread_rng();
+///
+/// let faces = "😀😎�😕😠😢";
+/// println!("I am {}!", faces.chars().choose(&mut rng).unwrap());
 /// ```
 /// Example output (non-deterministic):
 /// ```none
@@ -250,14 +296,20 @@
     /// available, complexity is `O(n)` where `n` is the iterator length.
     /// Partial hints (where `lower > 0`) also improve performance.
     ///
-    /// For slices, prefer [`SliceRandom::choose`] which guarantees `O(1)`
-    /// performance.
+    /// Note that the output values and the number of RNG samples used
+    /// depends on size hints. In particular, `Iterator` combinators that don't
+    /// change the values yielded but change the size hints may result in
+    /// `choose` returning different elements. If you want consistent results
+    /// and RNG usage consider using [`IteratorRandom::choose_stable`].
     fn choose<R>(mut self, rng: &mut R) -> Option<Self::Item>
     where R: Rng + ?Sized {
         let (mut lower, mut upper) = self.size_hint();
         let mut consumed = 0;
         let mut result = None;
 
+        // Handling for this condition outside the loop allows the optimizer to eliminate the loop
+        // when the Iterator is an ExactSizeIterator. This has a large performance impact on e.g.
+        // seq_iter_choose_from_1000.
         if upper == Some(lower) {
             return if lower == 0 {
                 None
@@ -289,8 +341,7 @@
                     return result;
                 }
                 consumed += 1;
-                let denom = consumed as f64; // accurate to 2^53 elements
-                if rng.gen_bool(1.0 / denom) {
+                if gen_index(rng, consumed) == 0 {
                     result = elem;
                 }
             }
@@ -301,6 +352,64 @@
         }
     }
 
+    /// Choose one element at random from the iterator.
+    ///
+    /// Returns `None` if and only if the iterator is empty.
+    ///
+    /// This method is very similar to [`choose`] except that the result
+    /// only depends on the length of the iterator and the values produced by
+    /// `rng`. Notably for any iterator of a given length this will make the
+    /// same requests to `rng` and if the same sequence of values are produced
+    /// the same index will be selected from `self`. This may be useful if you
+    /// need consistent results no matter what type of iterator you are working
+    /// with. If you do not need this stability prefer [`choose`].
+    ///
+    /// Note that this method still uses [`Iterator::size_hint`] to skip
+    /// constructing elements where possible, however the selection and `rng`
+    /// calls are the same in the face of this optimization. If you want to
+    /// force every element to be created regardless call `.inspect(|e| ())`.
+    ///
+    /// [`choose`]: IteratorRandom::choose
+    fn choose_stable<R>(mut self, rng: &mut R) -> Option<Self::Item>
+    where R: Rng + ?Sized {
+        let mut consumed = 0;
+        let mut result = None;
+
+        loop {
+            // Currently the only way to skip elements is `nth()`. So we need to
+            // store what index to access next here.
+            // This should be replaced by `advance_by()` once it is stable:
+            // https://github.com/rust-lang/rust/issues/77404
+            let mut next = 0;
+
+            let (lower, _) = self.size_hint();
+            if lower >= 2 {
+                let highest_selected = (0..lower)
+                    .filter(|ix| gen_index(rng, consumed+ix+1) == 0)
+                    .last();
+
+                consumed += lower;
+                next = lower;
+
+                if let Some(ix) = highest_selected {
+                    result = self.nth(ix);
+                    next -= ix + 1;
+                    debug_assert!(result.is_some(), "iterator shorter than size_hint().0");
+                }
+            }
+
+            let elem = self.nth(next);
+            if elem.is_none() {
+                return result
+            }
+
+            if gen_index(rng, consumed+1) == 0 {
+                result = elem;
+            }
+            consumed += 1;
+        }
+    }
+
     /// Collects values at random from the iterator into a supplied buffer
     /// until that buffer is filled.
     ///
@@ -353,6 +462,7 @@
     /// Complexity is `O(n)` where `n` is the length of the iterator.
     /// For slices, prefer [`SliceRandom::choose_multiple`].
     #[cfg(feature = "alloc")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
     fn choose_multiple<R>(mut self, rng: &mut R, amount: usize) -> Vec<Self::Item>
     where R: Rng + ?Sized {
         let mut reservoir = Vec::with_capacity(amount);
@@ -450,6 +560,29 @@
         Ok(&mut self[distr.sample(rng)])
     }
 
+    #[cfg(feature = "std")]
+    fn choose_multiple_weighted<R, F, X>(
+        &self, rng: &mut R, amount: usize, weight: F,
+    ) -> Result<SliceChooseIter<Self, Self::Item>, WeightedError>
+    where
+        R: Rng + ?Sized,
+        F: Fn(&Self::Item) -> X,
+        X: Into<f64>,
+    {
+        let amount = ::core::cmp::min(amount, self.len());
+        Ok(SliceChooseIter {
+            slice: self,
+            _phantom: Default::default(),
+            indices: index::sample_weighted(
+                rng,
+                self.len(),
+                |idx| weight(&self[idx]).into(),
+                amount,
+            )?
+            .into_iter(),
+        })
+    }
+
     fn shuffle<R>(&mut self, rng: &mut R)
     where R: Rng + ?Sized {
         for i in (1..self.len()).rev() {
@@ -487,6 +620,7 @@
 /// This struct is created by
 /// [`SliceRandom::choose_multiple`](trait.SliceRandom.html#tymethod.choose_multiple).
 #[cfg(feature = "alloc")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
 #[derive(Debug)]
 pub struct SliceChooseIter<'a, S: ?Sized + 'a, T: 'a> {
     slice: &'a S,
@@ -524,9 +658,9 @@
 #[inline]
 fn gen_index<R: Rng + ?Sized>(rng: &mut R, ubound: usize) -> usize {
     if ubound <= (core::u32::MAX as usize) {
-        rng.gen_range(0, ubound as u32) as usize
+        rng.gen_range(0..ubound as u32) as usize
     } else {
-        rng.gen_range(0, ubound)
+        rng.gen_range(0..ubound)
     }
 }
 
@@ -567,6 +701,40 @@
         assert_eq!(v.choose_mut(&mut r), None);
     }
 
+    #[test]
+    fn value_stability_slice() {
+        let mut r = crate::test::rng(413);
+        let chars = [
+            'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+        ];
+        let mut nums = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+
+        assert_eq!(chars.choose(&mut r), Some(&'l'));
+        assert_eq!(nums.choose_mut(&mut r), Some(&mut 10));
+
+        #[cfg(feature = "alloc")]
+        assert_eq!(
+            &chars
+                .choose_multiple(&mut r, 8)
+                .cloned()
+                .collect::<Vec<char>>(),
+            &['d', 'm', 'b', 'n', 'c', 'k', 'h', 'e']
+        );
+
+        #[cfg(feature = "alloc")]
+        assert_eq!(chars.choose_weighted(&mut r, |_| 1), Ok(&'f'));
+        #[cfg(feature = "alloc")]
+        assert_eq!(nums.choose_weighted_mut(&mut r, |_| 1), Ok(&mut 5));
+
+        let mut r = crate::test::rng(414);
+        nums.shuffle(&mut r);
+        assert_eq!(nums, [9, 5, 3, 10, 7, 12, 8, 11, 6, 4, 0, 2, 1]);
+        nums = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+        let res = nums.partial_shuffle(&mut r, 6);
+        assert_eq!(res.0, &mut [7, 4, 8, 6, 9, 3]);
+        assert_eq!(res.1, &mut [0, 1, 2, 12, 11, 5, 10]);
+    }
+
     #[derive(Clone)]
     struct UnhintedIterator<I: Iterator + Clone> {
         iter: I,
@@ -691,6 +859,103 @@
 
     #[test]
     #[cfg_attr(miri, ignore)] // Miri is too slow
+    fn test_iterator_choose_stable() {
+        let r = &mut crate::test::rng(109);
+        fn test_iter<R: Rng + ?Sized, Iter: Iterator<Item = usize> + Clone>(r: &mut R, iter: Iter) {
+            let mut chosen = [0i32; 9];
+            for _ in 0..1000 {
+                let picked = iter.clone().choose_stable(r).unwrap();
+                chosen[picked] += 1;
+            }
+            for count in chosen.iter() {
+                // Samples should follow Binomial(1000, 1/9)
+                // Octave: binopdf(x, 1000, 1/9) gives the prob of *count == x
+                // Note: have seen 153, which is unlikely but not impossible.
+                assert!(
+                    72 < *count && *count < 154,
+                    "count not close to 1000/9: {}",
+                    count
+                );
+            }
+        }
+
+        test_iter(r, 0..9);
+        test_iter(r, [0, 1, 2, 3, 4, 5, 6, 7, 8].iter().cloned());
+        #[cfg(feature = "alloc")]
+        test_iter(r, (0..9).collect::<Vec<_>>().into_iter());
+        test_iter(r, UnhintedIterator { iter: 0..9 });
+        test_iter(r, ChunkHintedIterator {
+            iter: 0..9,
+            chunk_size: 4,
+            chunk_remaining: 4,
+            hint_total_size: false,
+        });
+        test_iter(r, ChunkHintedIterator {
+            iter: 0..9,
+            chunk_size: 4,
+            chunk_remaining: 4,
+            hint_total_size: true,
+        });
+        test_iter(r, WindowHintedIterator {
+            iter: 0..9,
+            window_size: 2,
+            hint_total_size: false,
+        });
+        test_iter(r, WindowHintedIterator {
+            iter: 0..9,
+            window_size: 2,
+            hint_total_size: true,
+        });
+
+        assert_eq!((0..0).choose(r), None);
+        assert_eq!(UnhintedIterator { iter: 0..0 }.choose(r), None);
+    }
+
+    #[test]
+    #[cfg_attr(miri, ignore)] // Miri is too slow
+    fn test_iterator_choose_stable_stability() {
+        fn test_iter(iter: impl Iterator<Item = usize> + Clone) -> [i32; 9] {
+            let r = &mut crate::test::rng(109);
+            let mut chosen = [0i32; 9];
+            for _ in 0..1000 {
+                let picked = iter.clone().choose_stable(r).unwrap();
+                chosen[picked] += 1;
+            }
+            chosen
+        }
+
+        let reference = test_iter(0..9);
+        assert_eq!(test_iter([0, 1, 2, 3, 4, 5, 6, 7, 8].iter().cloned()), reference);
+
+        #[cfg(feature = "alloc")]
+        assert_eq!(test_iter((0..9).collect::<Vec<_>>().into_iter()), reference);
+        assert_eq!(test_iter(UnhintedIterator { iter: 0..9 }), reference);
+        assert_eq!(test_iter(ChunkHintedIterator {
+            iter: 0..9,
+            chunk_size: 4,
+            chunk_remaining: 4,
+            hint_total_size: false,
+        }), reference);
+        assert_eq!(test_iter(ChunkHintedIterator {
+            iter: 0..9,
+            chunk_size: 4,
+            chunk_remaining: 4,
+            hint_total_size: true,
+        }), reference);
+        assert_eq!(test_iter(WindowHintedIterator {
+            iter: 0..9,
+            window_size: 2,
+            hint_total_size: false,
+        }), reference);
+        assert_eq!(test_iter(WindowHintedIterator {
+            iter: 0..9,
+            window_size: 2,
+            hint_total_size: true,
+        }), reference);
+    }
+
+    #[test]
+    #[cfg_attr(miri, ignore)] // Miri is too slow
     fn test_shuffle() {
         let mut r = crate::test::rng(108);
         let empty: &mut [isize] = &mut [];
@@ -726,8 +991,8 @@
                 move_last(&mut arr, pos);
                 assert_eq!(arr[3], i);
             }
-            for i in 0..4 {
-                assert_eq!(arr[i], i);
+            for (i, &a) in arr.iter().enumerate() {
+                assert_eq!(a, i);
             }
             counts[permutation] += 1;
         }
@@ -847,4 +1112,248 @@
             Err(WeightedError::InvalidWeight)
         );
     }
+
+    #[test]
+    fn value_stability_choose() {
+        fn choose<I: Iterator<Item = u32>>(iter: I) -> Option<u32> {
+            let mut rng = crate::test::rng(411);
+            iter.choose(&mut rng)
+        }
+
+        assert_eq!(choose([].iter().cloned()), None);
+        assert_eq!(choose(0..100), Some(33));
+        assert_eq!(choose(UnhintedIterator { iter: 0..100 }), Some(40));
+        assert_eq!(
+            choose(ChunkHintedIterator {
+                iter: 0..100,
+                chunk_size: 32,
+                chunk_remaining: 32,
+                hint_total_size: false,
+            }),
+            Some(39)
+        );
+        assert_eq!(
+            choose(ChunkHintedIterator {
+                iter: 0..100,
+                chunk_size: 32,
+                chunk_remaining: 32,
+                hint_total_size: true,
+            }),
+            Some(39)
+        );
+        assert_eq!(
+            choose(WindowHintedIterator {
+                iter: 0..100,
+                window_size: 32,
+                hint_total_size: false,
+            }),
+            Some(90)
+        );
+        assert_eq!(
+            choose(WindowHintedIterator {
+                iter: 0..100,
+                window_size: 32,
+                hint_total_size: true,
+            }),
+            Some(90)
+        );
+    }
+
+    #[test]
+    fn value_stability_choose_stable() {
+        fn choose<I: Iterator<Item = u32>>(iter: I) -> Option<u32> {
+            let mut rng = crate::test::rng(411);
+            iter.choose_stable(&mut rng)
+        }
+
+        assert_eq!(choose([].iter().cloned()), None);
+        assert_eq!(choose(0..100), Some(40));
+        assert_eq!(choose(UnhintedIterator { iter: 0..100 }), Some(40));
+        assert_eq!(
+            choose(ChunkHintedIterator {
+                iter: 0..100,
+                chunk_size: 32,
+                chunk_remaining: 32,
+                hint_total_size: false,
+            }),
+            Some(40)
+        );
+        assert_eq!(
+            choose(ChunkHintedIterator {
+                iter: 0..100,
+                chunk_size: 32,
+                chunk_remaining: 32,
+                hint_total_size: true,
+            }),
+            Some(40)
+        );
+        assert_eq!(
+            choose(WindowHintedIterator {
+                iter: 0..100,
+                window_size: 32,
+                hint_total_size: false,
+            }),
+            Some(40)
+        );
+        assert_eq!(
+            choose(WindowHintedIterator {
+                iter: 0..100,
+                window_size: 32,
+                hint_total_size: true,
+            }),
+            Some(40)
+        );
+    }
+
+    #[test]
+    fn value_stability_choose_multiple() {
+        fn do_test<I: Iterator<Item = u32>>(iter: I, v: &[u32]) {
+            let mut rng = crate::test::rng(412);
+            let mut buf = [0u32; 8];
+            assert_eq!(iter.choose_multiple_fill(&mut rng, &mut buf), v.len());
+            assert_eq!(&buf[0..v.len()], v);
+        }
+
+        do_test(0..4, &[0, 1, 2, 3]);
+        do_test(0..8, &[0, 1, 2, 3, 4, 5, 6, 7]);
+        do_test(0..100, &[58, 78, 80, 92, 43, 8, 96, 7]);
+
+        #[cfg(feature = "alloc")]
+        {
+            fn do_test<I: Iterator<Item = u32>>(iter: I, v: &[u32]) {
+                let mut rng = crate::test::rng(412);
+                assert_eq!(iter.choose_multiple(&mut rng, v.len()), v);
+            }
+
+            do_test(0..4, &[0, 1, 2, 3]);
+            do_test(0..8, &[0, 1, 2, 3, 4, 5, 6, 7]);
+            do_test(0..100, &[58, 78, 80, 92, 43, 8, 96, 7]);
+        }
+    }
+
+    #[test]
+    #[cfg(feature = "std")]
+    fn test_multiple_weighted_edge_cases() {
+        use super::*;
+
+        let mut rng = crate::test::rng(413);
+
+        // Case 1: One of the weights is 0
+        let choices = [('a', 2), ('b', 1), ('c', 0)];
+        for _ in 0..100 {
+            let result = choices
+                .choose_multiple_weighted(&mut rng, 2, |item| item.1)
+                .unwrap()
+                .collect::<Vec<_>>();
+
+            assert_eq!(result.len(), 2);
+            assert!(!result.iter().any(|val| val.0 == 'c'));
+        }
+
+        // Case 2: All of the weights are 0
+        let choices = [('a', 0), ('b', 0), ('c', 0)];
+        let result = choices
+            .choose_multiple_weighted(&mut rng, 2, |item| item.1)
+            .unwrap()
+            .collect::<Vec<_>>();
+        assert_eq!(result.len(), 2);
+
+        // Case 3: Negative weights
+        let choices = [('a', -1), ('b', 1), ('c', 1)];
+        assert_eq!(
+            choices
+                .choose_multiple_weighted(&mut rng, 2, |item| item.1)
+                .unwrap_err(),
+            WeightedError::InvalidWeight
+        );
+
+        // Case 4: Empty list
+        let choices = [];
+        let result = choices
+            .choose_multiple_weighted(&mut rng, 0, |_: &()| 0)
+            .unwrap()
+            .collect::<Vec<_>>();
+        assert_eq!(result.len(), 0);
+
+        // Case 5: NaN weights
+        let choices = [('a', core::f64::NAN), ('b', 1.0), ('c', 1.0)];
+        assert_eq!(
+            choices
+                .choose_multiple_weighted(&mut rng, 2, |item| item.1)
+                .unwrap_err(),
+            WeightedError::InvalidWeight
+        );
+
+        // Case 6: +infinity weights
+        let choices = [('a', core::f64::INFINITY), ('b', 1.0), ('c', 1.0)];
+        for _ in 0..100 {
+            let result = choices
+                .choose_multiple_weighted(&mut rng, 2, |item| item.1)
+                .unwrap()
+                .collect::<Vec<_>>();
+            assert_eq!(result.len(), 2);
+            assert!(result.iter().any(|val| val.0 == 'a'));
+        }
+
+        // Case 7: -infinity weights
+        let choices = [('a', core::f64::NEG_INFINITY), ('b', 1.0), ('c', 1.0)];
+        assert_eq!(
+            choices
+                .choose_multiple_weighted(&mut rng, 2, |item| item.1)
+                .unwrap_err(),
+            WeightedError::InvalidWeight
+        );
+
+        // Case 8: -0 weights
+        let choices = [('a', -0.0), ('b', 1.0), ('c', 1.0)];
+        assert!(choices
+            .choose_multiple_weighted(&mut rng, 2, |item| item.1)
+            .is_ok());
+    }
+
+    #[test]
+    #[cfg(feature = "std")]
+    fn test_multiple_weighted_distributions() {
+        use super::*;
+
+        // The theoretical probabilities of the different outcomes are:
+        // AB: 0.5  * 0.5  = 0.250
+        // AC: 0.5  * 0.5  = 0.250
+        // BA: 0.25 * 0.67 = 0.167
+        // BC: 0.25 * 0.33 = 0.082
+        // CA: 0.25 * 0.67 = 0.167
+        // CB: 0.25 * 0.33 = 0.082
+        let choices = [('a', 2), ('b', 1), ('c', 1)];
+        let mut rng = crate::test::rng(414);
+
+        let mut results = [0i32; 3];
+        let expected_results = [4167, 4167, 1666];
+        for _ in 0..10000 {
+            let result = choices
+                .choose_multiple_weighted(&mut rng, 2, |item| item.1)
+                .unwrap()
+                .collect::<Vec<_>>();
+
+            assert_eq!(result.len(), 2);
+
+            match (result[0].0, result[1].0) {
+                ('a', 'b') | ('b', 'a') => {
+                    results[0] += 1;
+                }
+                ('a', 'c') | ('c', 'a') => {
+                    results[1] += 1;
+                }
+                ('b', 'c') | ('c', 'b') => {
+                    results[2] += 1;
+                }
+                (_, _) => panic!("unexpected result"),
+            }
+        }
+
+        let mut diffs = results
+            .iter()
+            .zip(&expected_results)
+            .map(|(a, b)| (a - b).abs());
+        assert!(!diffs.any(|deviation| deviation > 100));
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"cfa5a57b442ab6da8e03c4b5f82e63a74c97a999edfbf7841646d4612f399206","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"254d87eb2174bd4375fba1b2818d7295d558721582af12f600241da250250310","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"5b6d753b28e14cc08a25aaa56c941f038c0e3d8e340129492c3e2824401bdd66","src/chacha.rs":"1ce534f0a3c6d3cd86aa077a56feb72969cbe4d37237ef6c698623a768a48f7f","src/guts.rs":"e8ff037f9461cdbdd8338927acfdef1497b11fa695fdd4247ec7f081bb5f459f","src/lib.rs":"a27fe2bff676a764d43d604a20cf30a41dc1c5ef4053eb41129d2479f5ae83fe"},"package":"f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"deb20cd6e8be14e767b7fdea0e503ddd8226afd1253a5221aacc28a23d45db20","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"e2ef45f3c9d6f013da266b76ca1e1f664ad5fa1d526b46580a77fb311c659fd8","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"f4221f35b7086649fa77807e826af020b57eb65b19cb693482d4a7e1e4d80537","src/chacha.rs":"dfd79ed4762e8267148d1776381c71b898808014a4069cfafbc78177247d5fe9","src/guts.rs":"898fd129897fb44d15053044227307ee2bf416970adb8e63b4f5eabb7431aa1e","src/lib.rs":"a27fe2bff676a764d43d604a20cf30a41dc1c5ef4053eb41129d2479f5ae83fe"},"package":"e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,30 +13,33 @@
 [package]
 edition = "2018"
 name = "rand_chacha"
-version = "0.2.2"
+version = "0.3.1"
 authors = ["The Rand Project Developers", "The Rust Project Developers", "The CryptoCorrosion Contributors"]
 description = "ChaCha random number generator\n"
-homepage = "https://crates.io/crates/rand_chacha"
-documentation = "https://rust-random.github.io/rand/rand_chacha/"
+homepage = "https://rust-random.github.io/book"
+documentation = "https://docs.rs/rand_chacha"
 readme = "README.md"
 keywords = ["random", "rng", "chacha"]
 categories = ["algorithms", "no-std"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-random/rand"
 [dependencies.ppv-lite86]
-version = "0.2.6"
+version = "0.2.8"
 features = ["simd"]
 default-features = false
 
 [dependencies.rand_core]
-version = "0.5"
+version = "0.6.0"
+
+[dependencies.serde]
+version = "1.0"
+features = ["derive"]
+optional = true
+[dev-dependencies.serde_json]
+version = "1.0"
 
 [features]
-default = ["std", "simd"]
+default = ["std"]
+serde1 = ["serde"]
 simd = []
 std = ["ppv-lite86/std"]
-[badges.appveyor]
-repository = "rust-random/rand"
-
-[badges.travis-ci]
-repository = "rust-random/rand"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,19 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.1] - 2021-06-09
+- add getters corresponding to existing setters: `get_seed`, `get_stream` (#1124)
+- add serde support, gated by the `serde1` feature (#1124)
+- ensure expected layout via `repr(transparent)` (#1120)
+
+## [0.3.0] - 2020-12-08
+- Bump `rand_core` version to 0.6.0
+- Bump MSRV to 1.36 (#1011)
+- Remove usage of deprecated feature "simd" of `ppv-lite86` (#979), then revert
+  this change (#1023) since SIMD is only enabled by default from `ppv-lite86 v0.2.10`
+- impl PartialEq+Eq for ChaChaXRng and ChaChaXCore (#979)
+- Fix panic on block counter wrap that was occurring in debug builds (#980)
+
 ## [0.2.2] - 2020-03-09
 - Integrate `c2-chacha`, reducing dependency count (#931)
 - Add CryptoRng to ChaChaXCore (#944)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,11 @@
 # rand_chacha
 
-[![Build Status](https://travis-ci.org/rust-random/rand.svg)](https://travis-ci.org/rust-random/rand)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
+[![Test Status](https://github.com/rust-random/rand/workflows/Tests/badge.svg?event=push)](https://github.com/rust-random/rand/actions)
 [![Latest version](https://img.shields.io/crates/v/rand_chacha.svg)](https://crates.io/crates/rand_chacha)
 [![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
 [![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_chacha)
 [![API](https://docs.rs/rand_chacha/badge.svg)](https://docs.rs/rand_chacha)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.32+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.36+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
 
 A cryptographically secure random number generator that uses the ChaCha
 algorithm.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/src/chacha.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/src/chacha.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/src/chacha.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/src/chacha.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,9 +16,14 @@
 use rand_core::block::{BlockRng, BlockRngCore};
 use rand_core::{CryptoRng, Error, RngCore, SeedableRng};
 
-const STREAM_PARAM_NONCE: u32 = 1;
-const STREAM_PARAM_BLOCK: u32 = 0;
+#[cfg(feature = "serde1")] use serde::{Serialize, Deserialize, Serializer, Deserializer};
 
+// NB. this must remain consistent with some currently hard-coded numbers in this module
+const BUF_BLOCKS: u8 = 4;
+// number of 32-bit words per ChaCha block (fixed by algorithm definition)
+const BLOCK_WORDS: u8 = 16;
+
+#[repr(transparent)]
 pub struct Array64<T>([T; 64]);
 impl<T> Default for Array64<T>
 where T: Default
@@ -63,9 +68,9 @@
 }
 
 macro_rules! chacha_impl {
-    ($ChaChaXCore:ident, $ChaChaXRng:ident, $rounds:expr, $doc:expr) => {
+    ($ChaChaXCore:ident, $ChaChaXRng:ident, $rounds:expr, $doc:expr, $abst:ident) => {
         #[doc=$doc]
-        #[derive(Clone)]
+        #[derive(Clone, PartialEq, Eq)]
         pub struct $ChaChaXCore {
             state: ChaCha,
         }
@@ -187,10 +192,19 @@
             /// byte-offset.
             #[inline]
             pub fn get_word_pos(&self) -> u128 {
-                let mut block = u128::from(self.rng.core.state.get_stream_param(STREAM_PARAM_BLOCK));
-                // counter is incremented *after* filling buffer
-                block -= 4;
-                (block << 4) + self.rng.index() as u128
+                let buf_start_block = {
+                    let buf_end_block = self.rng.core.state.get_block_pos();
+                    u64::wrapping_sub(buf_end_block, BUF_BLOCKS.into())
+                };
+                let (buf_offset_blocks, block_offset_words) = {
+                    let buf_offset_words = self.rng.index() as u64;
+                    let blocks_part = buf_offset_words / u64::from(BLOCK_WORDS);
+                    let words_part = buf_offset_words % u64::from(BLOCK_WORDS);
+                    (blocks_part, words_part)
+                };
+                let pos_block = u64::wrapping_add(buf_start_block, buf_offset_blocks);
+                let pos_block_words = u128::from(pos_block) * u128::from(BLOCK_WORDS);
+                pos_block_words + u128::from(block_offset_words)
             }
 
             /// Set the offset from the start of the stream, in 32-bit words.
@@ -200,12 +214,12 @@
             /// 60 bits.
             #[inline]
             pub fn set_word_pos(&mut self, word_offset: u128) {
-                let block = (word_offset >> 4) as u64;
+                let block = (word_offset / u128::from(BLOCK_WORDS)) as u64;
                 self.rng
                     .core
                     .state
-                    .set_stream_param(STREAM_PARAM_BLOCK, block);
-                self.rng.generate_and_set((word_offset & 15) as usize);
+                    .set_block_pos(block);
+                self.rng.generate_and_set((word_offset % u128::from(BLOCK_WORDS)) as usize);
             }
 
             /// Set the stream number.
@@ -224,12 +238,30 @@
                 self.rng
                     .core
                     .state
-                    .set_stream_param(STREAM_PARAM_NONCE, stream);
+                    .set_nonce(stream);
                 if self.rng.index() != 64 {
                     let wp = self.get_word_pos();
                     self.set_word_pos(wp);
                 }
             }
+
+            /// Get the stream number.
+            #[inline]
+            pub fn get_stream(&self) -> u64 {
+                self.rng
+                    .core
+                    .state
+                    .get_nonce()
+            }
+
+            /// Get the seed.
+            #[inline]
+            pub fn get_seed(&self) -> [u8; 32] {
+                self.rng
+                    .core
+                    .state
+                    .get_seed()
+            }
         }
 
         impl CryptoRng for $ChaChaXRng {}
@@ -241,19 +273,132 @@
                 }
             }
         }
+
+        impl PartialEq<$ChaChaXRng> for $ChaChaXRng {
+            fn eq(&self, rhs: &$ChaChaXRng) -> bool {
+                let a: $abst::$ChaChaXRng = self.into();
+                let b: $abst::$ChaChaXRng = rhs.into();
+                a == b
+            }
+        }
+        impl Eq for $ChaChaXRng {}
+
+        #[cfg(feature = "serde1")]
+        impl Serialize for $ChaChaXRng {
+            fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
+            where S: Serializer {
+                $abst::$ChaChaXRng::from(self).serialize(s)
+            }
+        }
+        #[cfg(feature = "serde1")]
+        impl<'de> Deserialize<'de> for $ChaChaXRng {
+            fn deserialize<D>(d: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+                $abst::$ChaChaXRng::deserialize(d).map(|x| Self::from(&x))
+            }
+        }
+
+        mod $abst {
+            #[cfg(feature = "serde1")] use serde::{Serialize, Deserialize};
+
+            // The abstract state of a ChaCha stream, independent of implementation choices. The
+            // comparison and serialization of this object is considered a semver-covered part of
+            // the API.
+            #[derive(Debug, PartialEq, Eq)]
+            #[cfg_attr(
+                feature = "serde1",
+                derive(Serialize, Deserialize),
+            )]
+            pub(crate) struct $ChaChaXRng {
+                seed: [u8; 32],
+                stream: u64,
+                word_pos: u128,
+            }
+
+            impl From<&super::$ChaChaXRng> for $ChaChaXRng {
+                // Forget all information about the input except what is necessary to determine the
+                // outputs of any sequence of pub API calls.
+                fn from(r: &super::$ChaChaXRng) -> Self {
+                    Self {
+                        seed: r.get_seed(),
+                        stream: r.get_stream(),
+                        word_pos: r.get_word_pos(),
+                    }
+                }
+            }
+
+            impl From<&$ChaChaXRng> for super::$ChaChaXRng {
+                // Construct one of the possible concrete RNGs realizing an abstract state.
+                fn from(a: &$ChaChaXRng) -> Self {
+                    use rand_core::SeedableRng;
+                    let mut r = Self::from_seed(a.seed);
+                    r.set_stream(a.stream);
+                    r.set_word_pos(a.word_pos);
+                    r
+                }
+            }
+        }
     }
 }
 
-chacha_impl!(ChaCha20Core, ChaCha20Rng, 10, "ChaCha with 20 rounds");
-chacha_impl!(ChaCha12Core, ChaCha12Rng, 6, "ChaCha with 12 rounds");
-chacha_impl!(ChaCha8Core, ChaCha8Rng, 4, "ChaCha with 8 rounds");
+chacha_impl!(ChaCha20Core, ChaCha20Rng, 10, "ChaCha with 20 rounds", abstract20);
+chacha_impl!(ChaCha12Core, ChaCha12Rng, 6, "ChaCha with 12 rounds", abstract12);
+chacha_impl!(ChaCha8Core, ChaCha8Rng, 4, "ChaCha with 8 rounds", abstract8);
 
 #[cfg(test)]
 mod test {
     use rand_core::{RngCore, SeedableRng};
 
+    #[cfg(feature = "serde1")] use super::{ChaCha20Rng, ChaCha12Rng, ChaCha8Rng};
+
     type ChaChaRng = super::ChaCha20Rng;
 
+    #[cfg(feature = "serde1")]
+    #[test]
+    fn test_chacha_serde_roundtrip() {
+        let seed = [
+            1, 0, 52, 0, 0, 0, 0, 0, 1, 0, 10, 0, 22, 32, 0, 0, 2, 0, 55, 49, 0, 11, 0, 0, 3, 0, 0, 0, 0,
+            0, 2, 92,
+        ];
+        let mut rng1 = ChaCha20Rng::from_seed(seed);
+        let mut rng2 = ChaCha12Rng::from_seed(seed);
+        let mut rng3 = ChaCha8Rng::from_seed(seed);
+
+        let encoded1 = serde_json::to_string(&rng1).unwrap();
+        let encoded2 = serde_json::to_string(&rng2).unwrap();
+        let encoded3 = serde_json::to_string(&rng3).unwrap();
+
+        let mut decoded1: ChaCha20Rng = serde_json::from_str(&encoded1).unwrap();
+        let mut decoded2: ChaCha12Rng = serde_json::from_str(&encoded2).unwrap();
+        let mut decoded3: ChaCha8Rng = serde_json::from_str(&encoded3).unwrap();
+
+        assert_eq!(rng1, decoded1);
+        assert_eq!(rng2, decoded2);
+        assert_eq!(rng3, decoded3);
+
+        assert_eq!(rng1.next_u32(), decoded1.next_u32());
+        assert_eq!(rng2.next_u32(), decoded2.next_u32());
+        assert_eq!(rng3.next_u32(), decoded3.next_u32());
+    }
+
+    // This test validates that:
+    // 1. a hard-coded serialization demonstrating the format at time of initial release can still
+    //    be deserialized to a ChaChaRng
+    // 2. re-serializing the resultant object produces exactly the original string
+    //
+    // Condition 2 is stronger than necessary: an equivalent serialization (e.g. with field order
+    // permuted, or whitespace differences) would also be admissible, but would fail this test.
+    // However testing for equivalence of serialized data is difficult, and there shouldn't be any
+    // reason we need to violate the stronger-than-needed condition, e.g. by changing the field
+    // definition order.
+    #[cfg(feature = "serde1")]
+    #[test]
+    fn test_chacha_serde_format_stability() {
+        let j = r#"{"seed":[4,8,15,16,23,42,4,8,15,16,23,42,4,8,15,16,23,42,4,8,15,16,23,42,4,8,15,16,23,42,4,8],"stream":27182818284,"word_pos":314159265359}"#;
+        let r: ChaChaRng = serde_json::from_str(&j).unwrap();
+        let j1 = serde_json::to_string(&r).unwrap();
+        assert_eq!(j, j1);
+    }
+
     #[test]
     fn test_chacha_construction() {
         let seed = [
@@ -456,4 +601,32 @@
             assert_eq!(rng.next_u32(), clone.next_u32());
         }
     }
+
+    #[test]
+    fn test_chacha_word_pos_wrap_exact() {
+        use super::{BUF_BLOCKS, BLOCK_WORDS};
+        let mut rng = ChaChaRng::from_seed(Default::default());
+        // refilling the buffer in set_word_pos will wrap the block counter to 0
+        let last_block = (1 << 68) - u128::from(BUF_BLOCKS * BLOCK_WORDS);
+        rng.set_word_pos(last_block);
+        assert_eq!(rng.get_word_pos(), last_block);
+    }
+
+    #[test]
+    fn test_chacha_word_pos_wrap_excess() {
+        use super::BLOCK_WORDS;
+        let mut rng = ChaChaRng::from_seed(Default::default());
+        // refilling the buffer in set_word_pos will wrap the block counter past 0
+        let last_block = (1 << 68) - u128::from(BLOCK_WORDS);
+        rng.set_word_pos(last_block);
+        assert_eq!(rng.get_word_pos(), last_block);
+    }
+
+    #[test]
+    fn test_chacha_word_pos_zero() {
+        let mut rng = ChaChaRng::from_seed(Default::default());
+        assert_eq!(rng.get_word_pos(), 0);
+        rng.set_word_pos(0);
+        assert_eq!(rng.get_word_pos(), 0);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/src/guts.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/src/guts.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_chacha/src/guts.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_chacha/src/guts.rs	2021-12-09 12:01:26.000000000 +0000
@@ -21,7 +21,10 @@
 pub(crate) const BUFSZ64: u64 = BLOCK64 * BUFBLOCKS;
 pub(crate) const BUFSZ: usize = BUFSZ64 as usize;
 
-#[derive(Clone)]
+const STREAM_PARAM_NONCE: u32 = 1;
+const STREAM_PARAM_BLOCK: u32 = 0;
+
+#[derive(Clone, PartialEq, Eq)]
 pub struct ChaCha {
     pub(crate) b: vec128_storage,
     pub(crate) c: vec128_storage,
@@ -83,16 +86,32 @@
     }
 
     #[inline(always)]
-    pub fn set_stream_param(&mut self, param: u32, value: u64) {
-        set_stream_param(self, param, value)
+    pub fn set_block_pos(&mut self, value: u64) {
+        set_stream_param(self, STREAM_PARAM_BLOCK, value)
+    }
+
+    #[inline(always)]
+    pub fn get_block_pos(&self) -> u64 {
+        get_stream_param(self, STREAM_PARAM_BLOCK)
+    }
+
+    #[inline(always)]
+    pub fn set_nonce(&mut self, value: u64) {
+        set_stream_param(self, STREAM_PARAM_NONCE, value)
     }
 
     #[inline(always)]
-    pub fn get_stream_param(&self, param: u32) -> u64 {
-        get_stream_param(self, param)
+    pub fn get_nonce(&self) -> u64 {
+        get_stream_param(self, STREAM_PARAM_NONCE)
+    }
+
+    #[inline(always)]
+    pub fn get_seed(&self) -> [u8; 32] {
+        get_seed(self)
     }
 }
 
+#[allow(clippy::many_single_char_names)]
 #[inline(always)]
 fn refill_wide_impl<Mach: Machine>(
     m: Mach, state: &mut ChaCha, drounds: u32, out: &mut [u8; BUFSZ],
@@ -100,11 +119,11 @@
     let k = m.vec([0x6170_7865, 0x3320_646e, 0x7962_2d32, 0x6b20_6574]);
     let mut pos = state.pos64(m);
     let d0: Mach::u32x4 = m.unpack(state.d);
-    pos += 1;
+    pos = pos.wrapping_add(1);
     let d1 = d0.insert((pos >> 32) as u32, 1).insert(pos as u32, 0);
-    pos += 1;
+    pos = pos.wrapping_add(1);
     let d2 = d0.insert((pos >> 32) as u32, 1).insert(pos as u32, 0);
-    pos += 1;
+    pos = pos.wrapping_add(1);
     let d3 = d0.insert((pos >> 32) as u32, 1).insert(pos as u32, 0);
 
     let b = m.unpack(state.b);
@@ -121,13 +140,13 @@
     }
     let mut pos = state.pos64(m);
     let d0: Mach::u32x4 = m.unpack(state.d);
-    pos += 1;
+    pos = pos.wrapping_add(1);
     let d1 = d0.insert((pos >> 32) as u32, 1).insert(pos as u32, 0);
-    pos += 1;
+    pos = pos.wrapping_add(1);
     let d2 = d0.insert((pos >> 32) as u32, 1).insert(pos as u32, 0);
-    pos += 1;
+    pos = pos.wrapping_add(1);
     let d3 = d0.insert((pos >> 32) as u32, 1).insert(pos as u32, 0);
-    pos += 1;
+    pos = pos.wrapping_add(1);
     let d4 = d0.insert((pos >> 32) as u32, 1).insert(pos as u32, 0);
 
     let (a, b, c, d) = (
@@ -196,6 +215,17 @@
     }
 });
 
+dispatch_light128!(m, Mach, {
+    fn get_seed(state: &ChaCha) -> [u8; 32] {
+        let b: Mach::u32x4 = m.unpack(state.b);
+        let c: Mach::u32x4 = m.unpack(state.c);
+        let mut key = [0u8; 32];
+        b.write_le(&mut key[..16]);
+        c.write_le(&mut key[16..]);
+        key
+    }
+});
+
 fn read_u32le(xs: &[u8]) -> u32 {
     assert_eq!(xs.len(), 4);
     u32::from(xs[0]) | (u32::from(xs[1]) << 8) | (u32::from(xs[2]) << 16) | (u32::from(xs[3]) << 24)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"fe41510a0892dd4d79433ea093279d093de4b37601f672b480c06f8aaaf9f595","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"8f401d04ac2812f3861364f3eccc7a325a64e27beada85bf6f0beb0bad97534c","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"f39238c96e33b8a2d3545add73646fe7cd3d98c00f8524ef91b3ac31488e8d83","src/block.rs":"827e03e9b050175f1a9531323e203e576660a2582ac84490291a6e27e3d32412","src/error.rs":"bb7214f4db0ecdc66db711e688413e25b00ce4f5b583c516fe981063c16b26a6","src/impls.rs":"be460c286057857dd9dd7d925f36f98bea8ca336ef4663c1b06cfed7bb94a248","src/le.rs":"cb187f58f7514877918f7f47633397e08e20392dcf072bc245d62c9e5238198c","src/lib.rs":"225b6aa8ad2a0f5afeb6bc36226641c0dd2700d2686a7052c324537aec6d64f6","src/os.rs":"142db4cef4ceb3eb0232911f7472822d4aa824545e89f374b6714d7e09c6771a"},"package":"90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"25e64e1e95a61d0ba0eb476b3512cdacec6e64cbad44e560678efa16242ea291","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"262864cafee79bee4b22c53f4ba25bb938bab7e96495042241242e3472ba0262","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"bb3bd3831adc9eaabbcea108ab7f02f5837e9d2f81e872ffd7d340ad466df4de","src/block.rs":"724d13d7721396b46c18999231823c3ea9f6736492102c7c05ee057606372c39","src/error.rs":"0b6d5a188a256fa367dfa368e7dd846b58977a957489c03902307eb78ce4c9e8","src/impls.rs":"d6a97255d92c06bdd1a54590648bbe4cfb41111ac9e761496baf6b7eb5e92f6a","src/le.rs":"f302239d09cc8d915aa8d4fe46c32c8981900cb20d42b12eef9c34e2e820bc88","src/lib.rs":"8b17ae9af2eb43c28320a87893cb234c3889b4dd6246899bbc11e310ce142fa6","src/os.rs":"47849479e19c43dd01259eb14be7b4daf8474d23567dc32a1547c10b108b7069"},"package":"d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,18 +13,24 @@
 [package]
 edition = "2018"
 name = "rand_core"
-version = "0.5.1"
+version = "0.6.3"
 authors = ["The Rand Project Developers", "The Rust Project Developers"]
 description = "Core random number generator traits and tools for implementation.\n"
-homepage = "https://crates.io/crates/rand_core"
-documentation = "https://rust-random.github.io/rand/rand_core/"
+homepage = "https://rust-random.github.io/book"
+documentation = "https://docs.rs/rand_core"
 readme = "README.md"
 keywords = ["random", "rng"]
 categories = ["algorithms", "no-std"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-random/rand"
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "doc_cfg"]
+
+[package.metadata.playground]
+all-features = true
 [dependencies.getrandom]
-version = "0.1"
+version = "0.2"
 optional = true
 
 [dependencies.serde]
@@ -36,8 +42,3 @@
 alloc = []
 serde1 = ["serde"]
 std = ["alloc", "getrandom", "getrandom/std"]
-[badges.appveyor]
-repository = "rust-random/rand"
-
-[badges.travis-ci]
-repository = "rust-random/rand"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,37 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.3] - 2021-06-15
+### Changed
+- Improved bound for `serde` impls on `BlockRng` (#1130)
+- Minor doc additions (#1118)
+
+## [0.6.2] - 2021-02-12
+### Fixed
+- Fixed assertions in `le::read_u32_into` and `le::read_u64_into` which could
+  have allowed buffers not to be fully populated (#1096)
+
+## [0.6.1] - 2021-01-03
+### Fixed
+- Avoid panic when using `RngCore::seed_from_u64` with a seed which is not a
+  multiple of four (#1082)
+### Other
+- Enable all stable features in the playground (#1081)
+
+## [0.6.0] - 2020-12-08
+### Breaking changes
+- Bump MSRV to 1.36, various code improvements (#1011)
+- Update to getrandom v0.2 (#1041)
+- Fix: `next_u32_via_fill` and `next_u64_via_fill` now use LE as documented (#1061)
+
+### Other
+- Reduce usage of `unsafe` (#962, #963, #1011)
+- Annotate feature-gates in documentation (#1019)
+- Document available error codes (#1061)
+- Various documentation tweaks
+- Fix some clippy warnings (#1036)
+- Apply rustfmt (#926)
+
 ## [0.5.1] - 2019-08-28
 - `OsRng` added to `rand_core` (#863)
 - `Error::INTERNAL_START` and `Error::CUSTOM_START` constants (#864)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,11 @@
 # rand_core
 
-[![Build Status](https://travis-ci.org/rust-random/rand.svg)](https://travis-ci.org/rust-random/rand)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
+[![Test Status](https://github.com/rust-random/rand/workflows/Tests/badge.svg?event=push)](https://github.com/rust-random/rand/actions)
 [![Latest version](https://img.shields.io/crates/v/rand_core.svg)](https://crates.io/crates/rand_core)
 [![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
 [![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_core)
 [![API](https://docs.rs/rand_core/badge.svg)](https://docs.rs/rand_core)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.32+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.36+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
 
 Core traits and error types of the [rand] library, plus tools for implementing
 RNGs.
@@ -44,7 +43,7 @@
 
 The current version is:
 ```
-rand_core = "0.5.0"
+rand_core = "0.6.0"
 ```
 
 Rand libs have inter-dependencies and make use of the
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/block.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/block.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/block.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/block.rs	2021-12-09 12:01:26.000000000 +0000
@@ -21,12 +21,14 @@
 //!
 //! # Example
 //!
-//! ```norun
+//! ```no_run
+//! use rand_core::{RngCore, SeedableRng};
 //! use rand_core::block::{BlockRngCore, BlockRng};
 //!
 //! struct MyRngCore;
 //!
 //! impl BlockRngCore for MyRngCore {
+//!     type Item = u32;
 //!     type Results = [u32; 16];
 //!
 //!     fn generate(&mut self, results: &mut Self::Results) {
@@ -35,7 +37,7 @@
 //! }
 //!
 //! impl SeedableRng for MyRngCore {
-//!     type Seed = unimplemented!();
+//!     type Seed = [u8; 32];
 //!     fn from_seed(seed: Self::Seed) -> Self {
 //!         unimplemented!()
 //!     }
@@ -44,17 +46,19 @@
 //! // optionally, also implement CryptoRng for MyRngCore
 //!
 //! // Final RNG.
-//! type MyRng = BlockRng<u32, MyRngCore>;
+//! let mut rng = BlockRng::<MyRngCore>::seed_from_u64(0);
+//! println!("First value: {}", rng.next_u32());
 //! ```
 //!
 //! [`BlockRngCore`]: crate::block::BlockRngCore
 //! [`fill_bytes`]: RngCore::fill_bytes
 
-use core::convert::AsRef;
-use core::{fmt, ptr};
-#[cfg(feature="serde1")] use serde::{Serialize, Deserialize};
-use crate::{RngCore, CryptoRng, SeedableRng, Error};
 use crate::impls::{fill_via_u32_chunks, fill_via_u64_chunks};
+use crate::{CryptoRng, Error, RngCore, SeedableRng};
+use core::convert::AsRef;
+use core::fmt;
+#[cfg(feature = "serde1")]
+use serde::{Deserialize, Serialize};
 
 /// A trait for RNGs which do not generate random numbers individually, but in
 /// blocks (typically `[u32; N]`). This technique is commonly used by
@@ -73,7 +77,6 @@
     fn generate(&mut self, results: &mut Self::Results);
 }
 
-
 /// A wrapper type implementing [`RngCore`] for some type implementing
 /// [`BlockRngCore`] with `u32` array buffer; i.e. this can be used to implement
 /// a full RNG from just a `generate` function.
@@ -110,7 +113,13 @@
 /// [`fill_bytes`]: RngCore::fill_bytes
 /// [`try_fill_bytes`]: RngCore::try_fill_bytes
 #[derive(Clone)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+#[cfg_attr(
+    feature = "serde1",
+    serde(
+        bound = "for<'x> R: Serialize + Deserialize<'x> + Sized, for<'x> R::Results: Serialize + Deserialize<'x>"
+    )
+)]
 pub struct BlockRng<R: BlockRngCore + ?Sized> {
     results: R::Results,
     index: usize,
@@ -122,10 +131,10 @@
 impl<R: BlockRngCore + fmt::Debug> fmt::Debug for BlockRng<R> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt.debug_struct("BlockRng")
-           .field("core", &self.core)
-           .field("result_len", &self.results.as_ref().len())
-           .field("index", &self.index)
-           .finish()
+            .field("core", &self.core)
+            .field("result_len", &self.results.as_ref().len())
+            .field("index", &self.index)
+            .finish()
     }
 }
 
@@ -133,7 +142,7 @@
     /// Create a new `BlockRng` from an existing RNG implementing
     /// `BlockRngCore`. Results will be generated on first use.
     #[inline]
-    pub fn new(core: R) -> BlockRng<R>{
+    pub fn new(core: R) -> BlockRng<R> {
         let results_empty = R::Results::default();
         BlockRng {
             core,
@@ -169,8 +178,9 @@
     }
 }
 
-impl<R: BlockRngCore<Item=u32>> RngCore for BlockRng<R>
-where <R as BlockRngCore>::Results: AsRef<[u32]> + AsMut<[u32]>
+impl<R: BlockRngCore<Item = u32>> RngCore for BlockRng<R>
+where
+    <R as BlockRngCore>::Results: AsRef<[u32]> + AsMut<[u32]>,
 {
     #[inline]
     fn next_u32(&mut self) -> u32 {
@@ -186,22 +196,14 @@
     #[inline]
     fn next_u64(&mut self) -> u64 {
         let read_u64 = |results: &[u32], index| {
-            if cfg!(any(target_endian = "little")) {
-                // requires little-endian CPU
-                #[allow(clippy::cast_ptr_alignment)]  // false positive
-                let ptr: *const u64 = results[index..=index+1].as_ptr() as *const u64;
-                unsafe { ptr::read_unaligned(ptr) }
-            } else {
-                let x = u64::from(results[index]);
-                let y = u64::from(results[index + 1]);
-                (y << 32) | x
-            }
+            let data = &results[index..=index + 1];
+            u64::from(data[1]) << 32 | u64::from(data[0])
         };
 
         let len = self.results.as_ref().len();
 
         let index = self.index;
-        if index < len-1 {
+        if index < len - 1 {
             self.index += 2;
             // Read an u64 from the current index
             read_u64(self.results.as_ref(), index)
@@ -209,7 +211,7 @@
             self.generate_and_set(2);
             read_u64(self.results.as_ref(), 0)
         } else {
-            let x = u64::from(self.results.as_ref()[len-1]);
+            let x = u64::from(self.results.as_ref()[len - 1]);
             self.generate_and_set(1);
             let y = u64::from(self.results.as_ref()[0]);
             (y << 32) | x
@@ -224,8 +226,7 @@
                 self.generate_and_set(0);
             }
             let (consumed_u32, filled_u8) =
-                fill_via_u32_chunks(&self.results.as_ref()[self.index..],
-                                    &mut dest[read_len..]);
+                fill_via_u32_chunks(&self.results.as_ref()[self.index..], &mut dest[read_len..]);
 
             self.index += consumed_u32;
             read_len += filled_u8;
@@ -258,8 +259,6 @@
     }
 }
 
-
-
 /// A wrapper type implementing [`RngCore`] for some type implementing
 /// [`BlockRngCore`] with `u64` array buffer; i.e. this can be used to implement
 /// a full RNG from just a `generate` function.
@@ -283,7 +282,7 @@
 /// [`fill_bytes`]: RngCore::fill_bytes
 /// [`try_fill_bytes`]: RngCore::try_fill_bytes
 #[derive(Clone)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct BlockRng64<R: BlockRngCore + ?Sized> {
     results: R::Results,
     index: usize,
@@ -296,11 +295,11 @@
 impl<R: BlockRngCore + fmt::Debug> fmt::Debug for BlockRng64<R> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt.debug_struct("BlockRng64")
-           .field("core", &self.core)
-           .field("result_len", &self.results.as_ref().len())
-           .field("index", &self.index)
-           .field("half_used", &self.half_used)
-           .finish()
+            .field("core", &self.core)
+            .field("result_len", &self.results.as_ref().len())
+            .field("index", &self.index)
+            .field("half_used", &self.half_used)
+            .finish()
     }
 }
 
@@ -308,7 +307,7 @@
     /// Create a new `BlockRng` from an existing RNG implementing
     /// `BlockRngCore`. Results will be generated on first use.
     #[inline]
-    pub fn new(core: R) -> BlockRng64<R>{
+    pub fn new(core: R) -> BlockRng64<R> {
         let results_empty = R::Results::default();
         BlockRng64 {
             core,
@@ -347,8 +346,9 @@
     }
 }
 
-impl<R: BlockRngCore<Item=u64>> RngCore for BlockRng64<R>
-where <R as BlockRngCore>::Results: AsRef<[u64]> + AsMut<[u64]>
+impl<R: BlockRngCore<Item = u64>> RngCore for BlockRng64<R>
+where
+    <R as BlockRngCore>::Results: AsRef<[u64]> + AsMut<[u64]>,
 {
     #[inline]
     fn next_u32(&mut self) -> u32 {
@@ -366,8 +366,7 @@
 
         // Index as if this is a u32 slice.
         unsafe {
-            let results =
-                &*(self.results.as_ref() as *const [u64] as *const [u32]);
+            let results = &*(self.results.as_ref() as *const [u64] as *const [u32]);
             if cfg!(target_endian = "little") {
                 *results.get_unchecked(index)
             } else {
@@ -399,9 +398,10 @@
                 self.index = 0;
             }
 
-            let (consumed_u64, filled_u8) =
-                fill_via_u64_chunks(&self.results.as_ref()[self.index as usize..],
-                                    &mut dest[read_len..]);
+            let (consumed_u64, filled_u8) = fill_via_u64_chunks(
+                &self.results.as_ref()[self.index as usize..],
+                &mut dest[read_len..],
+            );
 
             self.index += consumed_u64;
             read_len += filled_u8;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,7 @@
 use core::fmt;
 use core::num::NonZeroU32;
 
+#[cfg(feature = "std")] use std::boxed::Box;
 
 /// Error type of random number generators
 ///
@@ -18,54 +19,64 @@
 /// possible implementations: with `std` a boxed `Error` trait object is stored,
 /// while with `no_std` we merely store an error code.
 pub struct Error {
-    #[cfg(feature="std")]
+    #[cfg(feature = "std")]
     inner: Box<dyn std::error::Error + Send + Sync + 'static>,
-    #[cfg(not(feature="std"))]
+    #[cfg(not(feature = "std"))]
     code: NonZeroU32,
 }
 
 impl Error {
+    /// Codes at or above this point can be used by users to define their own
+    /// custom errors.
+    ///
+    /// This has a fixed value of `(1 << 31) + (1 << 30) = 0xC000_0000`,
+    /// therefore the number of values available for custom codes is `1 << 30`.
+    ///
+    /// This is identical to [`getrandom::Error::CUSTOM_START`](https://docs.rs/getrandom/latest/getrandom/struct.Error.html#associatedconstant.CUSTOM_START).
+    pub const CUSTOM_START: u32 = (1 << 31) + (1 << 30);
+    /// Codes below this point represent OS Errors (i.e. positive i32 values).
+    /// Codes at or above this point, but below [`Error::CUSTOM_START`] are
+    /// reserved for use by the `rand` and `getrandom` crates.
+    ///
+    /// This is identical to [`getrandom::Error::INTERNAL_START`](https://docs.rs/getrandom/latest/getrandom/struct.Error.html#associatedconstant.INTERNAL_START).
+    pub const INTERNAL_START: u32 = 1 << 31;
+
     /// Construct from any type supporting `std::error::Error`
-    /// 
+    ///
     /// Available only when configured with `std`.
-    /// 
+    ///
     /// See also `From<NonZeroU32>`, which is available with and without `std`.
-    #[cfg(feature="std")]
+    #[cfg(feature = "std")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
     #[inline]
     pub fn new<E>(err: E) -> Self
-    where E: Into<Box<dyn std::error::Error + Send + Sync + 'static>>
+    where
+        E: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
     {
         Error { inner: err.into() }
     }
-    
+
     /// Reference the inner error (`std` only)
-    /// 
+    ///
     /// When configured with `std`, this is a trivial operation and never
     /// panics. Without `std`, this method is simply unavailable.
-    #[cfg(feature="std")]
+    #[cfg(feature = "std")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
     #[inline]
     pub fn inner(&self) -> &(dyn std::error::Error + Send + Sync + 'static) {
         &*self.inner
     }
-    
+
     /// Unwrap the inner error (`std` only)
-    /// 
+    ///
     /// When configured with `std`, this is a trivial operation and never
     /// panics. Without `std`, this method is simply unavailable.
-    #[cfg(feature="std")]
+    #[cfg(feature = "std")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
     #[inline]
     pub fn take_inner(self) -> Box<dyn std::error::Error + Send + Sync + 'static> {
         self.inner
     }
-    
-    /// Codes below this point represent OS Errors (i.e. positive i32 values).
-    /// Codes at or above this point, but below [`Error::CUSTOM_START`] are
-    /// reserved for use by the `rand` and `getrandom` crates.
-    pub const INTERNAL_START: u32 = 1 << 31;
-
-    /// Codes at or above this point can be used by users to define their own
-    /// custom errors.
-    pub const CUSTOM_START: u32 = (1 << 31) + (1 << 30);
 
     /// Extract the raw OS error code (if this error came from the OS)
     ///
@@ -74,29 +85,31 @@
     /// error value can still be formatted via the `Diplay` implementation.
     #[inline]
     pub fn raw_os_error(&self) -> Option<i32> {
-        #[cfg(feature="std")] {
+        #[cfg(feature = "std")]
+        {
             if let Some(e) = self.inner.downcast_ref::<std::io::Error>() {
                 return e.raw_os_error();
             }
         }
         match self.code() {
-            Some(code) if u32::from(code) < Self::INTERNAL_START =>
-                Some(u32::from(code) as i32),
+            Some(code) if u32::from(code) < Self::INTERNAL_START => Some(u32::from(code) as i32),
             _ => None,
         }
     }
 
     /// Retrieve the error code, if any.
-    /// 
+    ///
     /// If this `Error` was constructed via `From<NonZeroU32>`, then this method
     /// will return this `NonZeroU32` code (for `no_std` this is always the
     /// case). Otherwise, this method will return `None`.
     #[inline]
     pub fn code(&self) -> Option<NonZeroU32> {
-        #[cfg(feature="std")] {
+        #[cfg(feature = "std")]
+        {
             self.inner.downcast_ref::<ErrorCode>().map(|c| c.0)
         }
-        #[cfg(not(feature="std"))] {
+        #[cfg(not(feature = "std"))]
+        {
             Some(self.code)
         }
     }
@@ -104,13 +117,16 @@
 
 impl fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        #[cfg(feature="std")] {
+        #[cfg(feature = "std")]
+        {
             write!(f, "Error {{ inner: {:?} }}", self.inner)
         }
-        #[cfg(all(feature="getrandom", not(feature="std")))] {
+        #[cfg(all(feature = "getrandom", not(feature = "std")))]
+        {
             getrandom::Error::from(self.code).fmt(f)
         }
-        #[cfg(not(feature="getrandom"))] {
+        #[cfg(not(feature = "getrandom"))]
+        {
             write!(f, "Error {{ code: {} }}", self.code)
         }
     }
@@ -118,13 +134,16 @@
 
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        #[cfg(feature="std")] {
+        #[cfg(feature = "std")]
+        {
             write!(f, "{}", self.inner)
         }
-        #[cfg(all(feature="getrandom", not(feature="std")))] {
+        #[cfg(all(feature = "getrandom", not(feature = "std")))]
+        {
             getrandom::Error::from(self.code).fmt(f)
         }
-        #[cfg(not(feature="getrandom"))] {
+        #[cfg(not(feature = "getrandom"))]
+        {
             write!(f, "error code {}", self.code)
         }
     }
@@ -133,29 +152,37 @@
 impl From<NonZeroU32> for Error {
     #[inline]
     fn from(code: NonZeroU32) -> Self {
-        #[cfg(feature="std")] {
-            Error { inner: Box::new(ErrorCode(code)) }
+        #[cfg(feature = "std")]
+        {
+            Error {
+                inner: Box::new(ErrorCode(code)),
+            }
         }
-        #[cfg(not(feature="std"))] {
+        #[cfg(not(feature = "std"))]
+        {
             Error { code }
         }
     }
 }
 
-#[cfg(feature="getrandom")]
+#[cfg(feature = "getrandom")]
 impl From<getrandom::Error> for Error {
     #[inline]
     fn from(error: getrandom::Error) -> Self {
-        #[cfg(feature="std")] {
-            Error { inner: Box::new(error) }
+        #[cfg(feature = "std")]
+        {
+            Error {
+                inner: Box::new(error),
+            }
         }
-        #[cfg(not(feature="std"))] {
+        #[cfg(not(feature = "std"))]
+        {
             Error { code: error.code() }
         }
     }
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl std::error::Error for Error {
     #[inline]
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
@@ -163,7 +190,7 @@
     }
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl From<Error> for std::io::Error {
     #[inline]
     fn from(error: Error) -> Self {
@@ -175,16 +202,27 @@
     }
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 #[derive(Debug, Copy, Clone)]
 struct ErrorCode(NonZeroU32);
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl fmt::Display for ErrorCode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "error code {}", self.0)
     }
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl std::error::Error for ErrorCode {}
+
+#[cfg(test)]
+mod test {
+    #[cfg(feature = "getrandom")]
+    #[test]
+    fn test_error_codes() {
+        // Make sure the values are the same as in `getrandom`.
+        assert_eq!(super::Error::CUSTOM_START, getrandom::Error::CUSTOM_START);
+        assert_eq!(super::Error::INTERNAL_START, getrandom::Error::INTERNAL_START);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/impls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,12 +17,8 @@
 //! to/from byte sequences, and since its purpose is reproducibility,
 //! non-reproducible sources (e.g. `OsRng`) need not bother with it.
 
-use core::ptr::copy_nonoverlapping;
-use core::slice;
-use core::cmp::min;
-use core::mem::size_of;
 use crate::RngCore;
-
+use core::cmp::min;
 
 /// Implement `next_u64` via `next_u32`, little-endian order.
 pub fn next_u64_via_u32<R: RngCore + ?Sized>(rng: &mut R) -> u64 {
@@ -41,7 +37,7 @@
 pub fn fill_bytes_via_next<R: RngCore + ?Sized>(rng: &mut R, dest: &mut [u8]) {
     let mut left = dest;
     while left.len() >= 8 {
-        let (l, r) = {left}.split_at_mut(8);
+        let (l, r) = { left }.split_at_mut(8);
         left = r;
         let chunk: [u8; 8] = rng.next_u64().to_le_bytes();
         l.copy_from_slice(&chunk);
@@ -56,45 +52,36 @@
     }
 }
 
-macro_rules! impl_uint_from_fill {
-    ($rng:expr, $ty:ty, $N:expr) => ({
-        debug_assert!($N == size_of::<$ty>());
-
-        let mut int: $ty = 0;
-        unsafe {
-            let ptr = &mut int as *mut $ty as *mut u8;
-            let slice = slice::from_raw_parts_mut(ptr, $N);
-            $rng.fill_bytes(slice);
-        }
-        int
-    });
-}
-
 macro_rules! fill_via_chunks {
-    ($src:expr, $dst:expr, $ty:ty, $size:expr) => ({
-        let chunk_size_u8 = min($src.len() * $size, $dst.len());
-        let chunk_size = (chunk_size_u8 + $size - 1) / $size;
-        if cfg!(target_endian="little") {
+    ($src:expr, $dst:expr, $ty:ty) => {{
+        const SIZE: usize = core::mem::size_of::<$ty>();
+        let chunk_size_u8 = min($src.len() * SIZE, $dst.len());
+        let chunk_size = (chunk_size_u8 + SIZE - 1) / SIZE;
+
+        // The following can be replaced with safe code, but unfortunately it's
+        // ca. 8% slower.
+        if cfg!(target_endian = "little") {
             unsafe {
-                copy_nonoverlapping(
+                core::ptr::copy_nonoverlapping(
                     $src.as_ptr() as *const u8,
                     $dst.as_mut_ptr(),
                     chunk_size_u8);
             }
         } else {
-            for (&n, chunk) in $src.iter().zip($dst.chunks_mut($size)) {
+            for (&n, chunk) in $src.iter().zip($dst.chunks_mut(SIZE)) {
                 let tmp = n.to_le();
                 let src_ptr = &tmp as *const $ty as *const u8;
                 unsafe {
-                    copy_nonoverlapping(src_ptr,
-                                        chunk.as_mut_ptr(),
-                                        chunk.len());
+                    core::ptr::copy_nonoverlapping(
+                        src_ptr,
+                        chunk.as_mut_ptr(),
+                        chunk.len());
                 }
             }
         }
 
         (chunk_size, chunk_size_u8)
-    });
+    }};
 }
 
 /// Implement `fill_bytes` by reading chunks from the output buffer of a block
@@ -128,7 +115,7 @@
 /// }
 /// ```
 pub fn fill_via_u32_chunks(src: &[u32], dest: &mut [u8]) -> (usize, usize) {
-    fill_via_chunks!(src, dest, u32, 4)
+    fill_via_chunks!(src, dest, u32)
 }
 
 /// Implement `fill_bytes` by reading chunks from the output buffer of a block
@@ -142,17 +129,56 @@
 ///
 /// See `fill_via_u32_chunks` for an example.
 pub fn fill_via_u64_chunks(src: &[u64], dest: &mut [u8]) -> (usize, usize) {
-    fill_via_chunks!(src, dest, u64, 8)
+    fill_via_chunks!(src, dest, u64)
 }
 
 /// Implement `next_u32` via `fill_bytes`, little-endian order.
 pub fn next_u32_via_fill<R: RngCore + ?Sized>(rng: &mut R) -> u32 {
-    impl_uint_from_fill!(rng, u32, 4)
+    let mut buf = [0; 4];
+    rng.fill_bytes(&mut buf);
+    u32::from_le_bytes(buf)
 }
 
 /// Implement `next_u64` via `fill_bytes`, little-endian order.
 pub fn next_u64_via_fill<R: RngCore + ?Sized>(rng: &mut R) -> u64 {
-    impl_uint_from_fill!(rng, u64, 8)
-}
+    let mut buf = [0; 8];
+    rng.fill_bytes(&mut buf);
+    u64::from_le_bytes(buf)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_fill_via_u32_chunks() {
+        let src = [1, 2, 3];
+        let mut dst = [0u8; 11];
+        assert_eq!(fill_via_u32_chunks(&src, &mut dst), (3, 11));
+        assert_eq!(dst, [1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0]);
+
+        let mut dst = [0u8; 13];
+        assert_eq!(fill_via_u32_chunks(&src, &mut dst), (3, 12));
+        assert_eq!(dst, [1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0]);
+
+        let mut dst = [0u8; 5];
+        assert_eq!(fill_via_u32_chunks(&src, &mut dst), (2, 5));
+        assert_eq!(dst, [1, 0, 0, 0, 2]);
+    }
 
-// TODO: implement tests for the above
+    #[test]
+    fn test_fill_via_u64_chunks() {
+        let src = [1, 2];
+        let mut dst = [0u8; 11];
+        assert_eq!(fill_via_u64_chunks(&src, &mut dst), (2, 11));
+        assert_eq!(dst, [1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0]);
+
+        let mut dst = [0u8; 17];
+        assert_eq!(fill_via_u64_chunks(&src, &mut dst), (2, 16));
+        assert_eq!(dst, [1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0]);
+
+        let mut dst = [0u8; 5];
+        assert_eq!(fill_via_u64_chunks(&src, &mut dst), (1, 5));
+        assert_eq!(dst, [1, 0, 0, 0, 0]);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/le.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/le.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/le.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/le.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,61 +7,49 @@
 // except according to those terms.
 
 //! Little-Endian utilities
-//! 
+//!
 //! Little-Endian order has been chosen for internal usage; this makes some
 //! useful functions available.
 
-use core::ptr;
-
-macro_rules! read_slice {
-    ($src:expr, $dst:expr, $size:expr, $which:ident) => {{
-        assert_eq!($src.len(), $size * $dst.len());
-
-        unsafe {
-            ptr::copy_nonoverlapping(
-                $src.as_ptr(),
-                $dst.as_mut_ptr() as *mut u8,
-                $src.len());
-        }
-        for v in $dst.iter_mut() {
-            *v = v.$which();
-        }
-    }};
-}
+use core::convert::TryInto;
 
 /// Reads unsigned 32 bit integers from `src` into `dst`.
-/// Borrowed from the `byteorder` crate.
 #[inline]
 pub fn read_u32_into(src: &[u8], dst: &mut [u32]) {
-    read_slice!(src, dst, 4, to_le);
+    assert!(src.len() >= 4 * dst.len());
+    for (out, chunk) in dst.iter_mut().zip(src.chunks_exact(4)) {
+        *out = u32::from_le_bytes(chunk.try_into().unwrap());
+    }
 }
 
 /// Reads unsigned 64 bit integers from `src` into `dst`.
-/// Borrowed from the `byteorder` crate.
 #[inline]
 pub fn read_u64_into(src: &[u8], dst: &mut [u64]) {
-    read_slice!(src, dst, 8, to_le);
+    assert!(src.len() >= 8 * dst.len());
+    for (out, chunk) in dst.iter_mut().zip(src.chunks_exact(8)) {
+        *out = u64::from_le_bytes(chunk.try_into().unwrap());
+    }
 }
 
 #[test]
 fn test_read() {
     let bytes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16];
-    
+
     let mut buf = [0u32; 4];
     read_u32_into(&bytes, &mut buf);
     assert_eq!(buf[0], 0x04030201);
     assert_eq!(buf[3], 0x100F0E0D);
-    
+
     let mut buf = [0u32; 3];
-    read_u32_into(&bytes[1..13], &mut buf);  // unaligned
+    read_u32_into(&bytes[1..13], &mut buf); // unaligned
     assert_eq!(buf[0], 0x05040302);
     assert_eq!(buf[2], 0x0D0C0B0A);
-    
+
     let mut buf = [0u64; 2];
     read_u64_into(&bytes, &mut buf);
     assert_eq!(buf[0], 0x0807060504030201);
     assert_eq!(buf[1], 0x100F0E0D0C0B0A09);
-    
+
     let mut buf = [0u64; 1];
     read_u64_into(&bytes[7..15], &mut buf); // unaligned
     assert_eq!(buf[0], 0x0F0E0D0C0B0A0908);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -27,35 +27,33 @@
 //!
 //! [`rand`]: https://docs.rs/rand
 
-#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://rust-random.github.io/rand/")]
-
+#![doc(
+    html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+    html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+    html_root_url = "https://rust-random.github.io/rand/"
+)]
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
 #![doc(test(attr(allow(unused_variables), deny(warnings))))]
+#![cfg_attr(doc_cfg, feature(doc_cfg))]
+#![no_std]
 
-#![allow(clippy::unreadable_literal)]
-
-#![cfg_attr(not(feature="std"), no_std)]
-
-
-use core::default::Default;
 use core::convert::AsMut;
-use core::ptr::copy_nonoverlapping;
+use core::default::Default;
 
-#[cfg(all(feature="alloc", not(feature="std")))] extern crate alloc;
-#[cfg(all(feature="alloc", not(feature="std")))] use alloc::boxed::Box;
+#[cfg(feature = "std")] extern crate std;
+#[cfg(feature = "alloc")] extern crate alloc;
+#[cfg(feature = "alloc")] use alloc::boxed::Box;
 
 pub use error::Error;
-#[cfg(feature="getrandom")] pub use os::OsRng;
+#[cfg(feature = "getrandom")] pub use os::OsRng;
 
 
-mod error;
 pub mod block;
+mod error;
 pub mod impls;
 pub mod le;
-#[cfg(feature="getrandom")] mod os;
+#[cfg(feature = "getrandom")] mod os;
 
 
 /// The core of a random number generator.
@@ -69,19 +67,26 @@
 /// optimal implementation of each is dependent on the type of generator. There
 /// is no required relationship between the output of each; e.g. many
 /// implementations of [`fill_bytes`] consume a whole number of `u32` or `u64`
-/// values and drop any remaining unused bytes.
+/// values and drop any remaining unused bytes. The same can happen with the
+/// [`next_u32`] and [`next_u64`] methods, implementations may discard some
+/// random bits for efficiency.
 ///
 /// The [`try_fill_bytes`] method is a variant of [`fill_bytes`] allowing error
 /// handling; it is not deemed sufficiently useful to add equivalents for
 /// [`next_u32`] or [`next_u64`] since the latter methods are almost always used
 /// with algorithmic generators (PRNGs), which are normally infallible.
 ///
+/// Implementers should produce bits uniformly. Pathological RNGs (e.g. always
+/// returning the same value, or never setting certain bits) can break rejection
+/// sampling used by random distributions, and also break other RNGs when
+/// seeding them via [`SeedableRng::from_rng`].
+///
 /// Algorithmic generators implementing [`SeedableRng`] should normally have
 /// *portable, reproducible* output, i.e. fix Endianness when converting values
 /// to avoid platform differences, and avoid making any changes which affect
 /// output (except by communicating that the release has breaking changes).
 ///
-/// Typically implementators will implement only one of the methods available
+/// Typically an RNG will implement only one of the methods available
 /// in this trait directly, then use the helper functions from the
 /// [`impls`] module to implement the other methods.
 ///
@@ -139,24 +144,22 @@
     ///
     /// RNGs must implement at least one method from this trait directly. In
     /// the case this method is not implemented directly, it can be implemented
-    /// using `self.next_u64() as u32` or via
-    /// [`fill_bytes`](impls::next_u32_via_fill).
+    /// using `self.next_u64() as u32` or via [`impls::next_u32_via_fill`].
     fn next_u32(&mut self) -> u32;
 
     /// Return the next random `u64`.
     ///
     /// RNGs must implement at least one method from this trait directly. In
     /// the case this method is not implemented directly, it can be implemented
-    /// via [`next_u32`](impls::next_u64_via_u32) or via
-    /// [`fill_bytes`](impls::next_u64_via_fill).
+    /// via [`impls::next_u64_via_u32`] or via [`impls::next_u64_via_fill`].
     fn next_u64(&mut self) -> u64;
 
     /// Fill `dest` with random data.
     ///
     /// RNGs must implement at least one method from this trait directly. In
     /// the case this method is not implemented directly, it can be implemented
-    /// via [`next_u*`](impls::fill_bytes_via_next) or
-    /// via [`try_fill_bytes`](RngCore::try_fill_bytes); if this generator can
+    /// via [`impls::fill_bytes_via_next`] or
+    /// via [`RngCore::try_fill_bytes`]; if this generator can
     /// fail the implementation must choose how best to handle errors here
     /// (e.g. panic with a descriptive message or log a warning and retry a few
     /// times).
@@ -174,12 +177,10 @@
     /// by external (true) RNGs (e.g. `OsRng`) which can fail. It may be used
     /// directly to generate keys and to seed (infallible) PRNGs.
     ///
-    /// Other than error handling, this method is identical to [`fill_bytes`];
+    /// Other than error handling, this method is identical to [`RngCore::fill_bytes`];
     /// thus this may be implemented using `Ok(self.fill_bytes(dest))` or
     /// `fill_bytes` may be implemented with
     /// `self.try_fill_bytes(dest).unwrap()` or more specific error handling.
-    ///
-    /// [`fill_bytes`]: RngCore::fill_bytes
     fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error>;
 }
 
@@ -304,24 +305,30 @@
     /// considered a value-breaking change.
     fn seed_from_u64(mut state: u64) -> Self {
         // We use PCG32 to generate a u32 sequence, and copy to the seed
-        const MUL: u64 = 6364136223846793005;
-        const INC: u64 = 11634580027462260723;
+        fn pcg32(state: &mut u64) -> [u8; 4] {
+            const MUL: u64 = 6364136223846793005;
+            const INC: u64 = 11634580027462260723;
 
-        let mut seed = Self::Seed::default();
-        for chunk in seed.as_mut().chunks_mut(4) {
             // We advance the state first (to get away from the input value,
             // in case it has low Hamming Weight).
-            state = state.wrapping_mul(MUL).wrapping_add(INC);
+            *state = state.wrapping_mul(MUL).wrapping_add(INC);
+            let state = *state;
 
             // Use PCG output function with to_le to generate x:
             let xorshifted = (((state >> 18) ^ state) >> 27) as u32;
             let rot = (state >> 59) as u32;
-            let x = xorshifted.rotate_right(rot).to_le();
+            let x = xorshifted.rotate_right(rot);
+            x.to_le_bytes()
+        }
 
-            unsafe {
-                let p = &x as *const u32 as *const u8;
-                copy_nonoverlapping(p, chunk.as_mut_ptr(), chunk.len());
-            }
+        let mut seed = Self::Seed::default();
+        let mut iter = seed.as_mut().chunks_exact_mut(4);
+        for chunk in &mut iter {
+            chunk.copy_from_slice(&pcg32(&mut state));
+        }
+        let rem = iter.into_remainder();
+        if !rem.is_empty() {
+            rem.copy_from_slice(&pcg32(&mut state)[..rem.len()]);
         }
 
         Self::from_seed(seed)
@@ -351,7 +358,6 @@
     /// (in prior versions this was not required).
     ///
     /// [`rand`]: https://docs.rs/rand
-    /// [`rand_os`]: https://docs.rs/rand_os
     fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
         let mut seed = Self::Seed::default();
         rng.try_fill_bytes(seed.as_mut())?;
@@ -372,7 +378,8 @@
     /// If [`getrandom`] is unable to provide secure entropy this method will panic.
     ///
     /// [`getrandom`]: https://docs.rs/getrandom
-    #[cfg(feature="getrandom")]
+    #[cfg(feature = "getrandom")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "getrandom")))]
     fn from_entropy() -> Self {
         let mut seed = Self::Seed::default();
         if let Err(err) = getrandom::getrandom(seed.as_mut()) {
@@ -410,7 +417,7 @@
 // Implement `RngCore` for boxed references to an `RngCore`.
 // Force inlining all functions, so that it is up to the `RngCore`
 // implementation and the optimizer to decide on inlining.
-#[cfg(feature="alloc")]
+#[cfg(feature = "alloc")]
 impl<R: RngCore + ?Sized> RngCore for Box<R> {
     #[inline(always)]
     fn next_u32(&mut self) -> u32 {
@@ -433,7 +440,7 @@
     }
 }
 
-#[cfg(feature="std")]
+#[cfg(feature = "std")]
 impl std::io::Read for dyn RngCore {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, std::io::Error> {
         self.try_fill_bytes(buf)?;
@@ -445,7 +452,7 @@
 impl<'a, R: CryptoRng + ?Sized> CryptoRng for &'a mut R {}
 
 // Implement `CryptoRng` for boxed references to an `CryptoRng`.
-#[cfg(feature="alloc")]
+#[cfg(feature = "alloc")]
 impl<R: CryptoRng + ?Sized> CryptoRng for Box<R> {}
 
 #[cfg(test)]
@@ -457,6 +464,7 @@
         struct SeedableNum(u64);
         impl SeedableRng for SeedableNum {
             type Seed = [u8; 8];
+
             fn from_seed(seed: Self::Seed) -> Self {
                 let mut x = [0u64; 1];
                 le::read_u64_into(&seed, &mut x);
@@ -477,10 +485,12 @@
             // This is the binomial distribution B(64, 0.5), so chance of
             // weight < 20 is binocdf(19, 64, 0.5) = 7.8e-4, and same for
             // weight > 44.
-            assert!(weight >= 20 && weight <= 44);
+            assert!((20..=44).contains(&weight));
 
             for (i2, r2) in results.iter().enumerate() {
-                if i1 == i2 { continue; }
+                if i1 == i2 {
+                    continue;
+                }
                 let diff_weight = (r1 ^ r2).count_ones();
                 assert!(diff_weight >= 20);
             }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/os.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/os.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_core/src/os.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_core/src/os.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,12 +7,11 @@
 // except according to those terms.
 
 //! Interface to the random number generator of the operating system.
-// Note: keep this code in sync with the rand_os crate!
 
+use crate::{impls, CryptoRng, Error, RngCore};
 use getrandom::getrandom;
-use crate::{CryptoRng, RngCore, Error, impls};
 
-/// A random number generator that retrieves randomness from from the
+/// A random number generator that retrieves randomness from the
 /// operating system.
 ///
 /// This is a zero-sized struct. It can be freely constructed with `OsRng`.
@@ -44,6 +43,7 @@
 /// ```
 ///
 /// [getrandom]: https://crates.io/crates/getrandom
+#[cfg_attr(doc_cfg, doc(cfg(feature = "getrandom")))]
 #[derive(Clone, Copy, Debug, Default)]
 pub struct OsRng;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"011d4dd590882dd2e681c28f41bbfe089ab38587ca21336ca2332118cea0f662","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"7f51c625c5a4e1b9ca32192a914494d15a5568b8a7b7bbae72214c88d24d0a88","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"a771e4354f6b3ad4c92da1a5c9a239b6c291527db869632ecea4f20e24ca1135","README.md":"18ac2dc683ade79e01d509870b82fe68c4f868a1afaeb951f9e75bd0dd965d7b","src/hc128.rs":"94ff3bb8a986c381102ddfde72bc9638dd19ebc2a7e16d7124ed32d95bd85fe3","src/lib.rs":"1e51045313d177cd609bedeee31acfa81a536da1fee93069f900b4fae51a79a0"},"package":"ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"84792af9ac25dd83ae27cac766798dcab81854c0912fe679190fb0e410afc258","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"67517ddabd0838fad9740b14d524cfa6b3a96f4e840c6607688a8fe5bb553635","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"a771e4354f6b3ad4c92da1a5c9a239b6c291527db869632ecea4f20e24ca1135","README.md":"ff733a3325c745af3a4372578ef59a5d953cc5d1454139f490d73270bbc637bb","src/hc128.rs":"37edc95f1c3c95fc837c348a328d5dd0eb2b748c0727d982b21c1aba5336c3b2","src/lib.rs":"5bd63b49d1a0f4f8db05e910a0a376a863d028a0a6a18364e983d99eb7440c77"},"package":"d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,20 +13,15 @@
 [package]
 edition = "2018"
 name = "rand_hc"
-version = "0.2.0"
+version = "0.3.1"
 authors = ["The Rand Project Developers"]
 description = "HC128 random number generator\n"
-homepage = "https://crates.io/crates/rand_hc"
-documentation = "https://rust-random.github.io/rand/rand_hc/"
+homepage = "https://rust-random.github.io/book"
+documentation = "https://docs.rs/rand_hc"
 readme = "README.md"
 keywords = ["random", "rng", "hc128"]
 categories = ["algorithms", "no-std"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-random/rand"
 [dependencies.rand_core]
-version = "0.5"
-[badges.appveyor]
-repository = "rust-random/rand"
-
-[badges.travis-ci]
-repository = "rust-random/rand"
+version = "0.6.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,15 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.1] - 2021-06-15
+- Adjust crate links
+
+## [0.3.0] - 2020-12-08
+- Bump `rand_core` version to 0.6.0
+- Bump MSRV to 1.36 (#1011)
+- impl PartialEq+Eq for Hc128Rng and Hc128Core (#979)
+- Drop some unsafe code, fixing an unsound internal function (#960)
+
 ## [0.2.0] - 2019-06-12
 - Bump minor crate version since rand_core bump is a breaking change
 - Switch to Edition 2018
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,11 @@
 # rand_hc
 
-[![Build Status](https://travis-ci.org/rust-random/rand.svg)](https://travis-ci.org/rust-random/rand)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
+[![Test Status](https://github.com/rust-random/rand/workflows/Tests/badge.svg?event=push)](https://github.com/rust-random/rand/actions)
 [![Latest version](https://img.shields.io/crates/v/rand_hc.svg)](https://crates.io/crates/rand_hc)
 [[![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
 [![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_hc)
 [![API](https://docs.rs/rand_hc/badge.svg)](https://docs.rs/rand_hc)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.32+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.36+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
 
 A cryptographically secure random number generator that uses the HC-128
 algorithm.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/src/hc128.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/src/hc128.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/src/hc128.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/src/hc128.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,11 +6,17 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// Disable some noisy clippy lints.
+#![allow(clippy::many_single_char_names)]
+#![allow(clippy::identity_op)]
+// Disable a lint that cannot be fixed without increasing the MSRV
+#![allow(clippy::op_ref)]
+
 //! The HC-128 random number generator.
 
 use core::fmt;
-use rand_core::{CryptoRng, RngCore, SeedableRng, Error, le};
-use rand_core::block::{BlockRngCore, BlockRng};
+use rand_core::block::{BlockRng, BlockRngCore};
+use rand_core::{le, CryptoRng, Error, RngCore, SeedableRng};
 
 const SEED_WORDS: usize = 8; // 128 bit key followed by 128 bit iv
 
@@ -104,6 +110,13 @@
 
 impl CryptoRng for Hc128Rng {}
 
+impl PartialEq for Hc128Rng {
+    fn eq(&self, rhs: &Self) -> bool {
+        self.0.core == rhs.0.core && self.0.index() == rhs.0.index()
+    }
+}
+impl Eq for Hc128Rng {}
+
 /// The core of `Hc128Rng`, used with `BlockRng`.
 #[derive(Clone)]
 pub struct Hc128Core {
@@ -128,6 +141,12 @@
         let cc = self.counter1024 % 512;
         let dd = (cc + 16) % 512;
         let ee = cc.wrapping_sub(16) % 512;
+        // These asserts let the compiler optimize out the bounds checks.
+        // Some of them may be superflous, and that's fine:
+        // they'll be optimized out if that's the case.
+        assert!(ee + 15 < 512);
+        assert!(cc + 15 < 512);
+        assert!(dd < 512);
 
         if self.counter1024 & 512 == 0 {
             // P block
@@ -173,53 +192,43 @@
 impl Hc128Core {
     // One step of HC-128, update P and generate 32 bits keystream
     #[inline(always)]
-    fn step_p(&mut self, i: usize, i511: usize, i3: usize, i10: usize, i12: usize)
-         -> u32
-    {
+    fn step_p(&mut self, i: usize, i511: usize, i3: usize, i10: usize, i12: usize) -> u32 {
         let (p, q) = self.t.split_at_mut(512);
-        // FIXME: it would be great if we the bounds checks here could be
-        // optimized out, and we would not need unsafe.
-        // This improves performance by about 7%.
-        unsafe {
-            let temp0 = p.get_unchecked(i511).rotate_right(23);
-            let temp1 = p.get_unchecked(i3).rotate_right(10);
-            let temp2 = p.get_unchecked(i10).rotate_right(8);
-            *p.get_unchecked_mut(i) = p.get_unchecked(i)
-                                       .wrapping_add(temp2)
-                                       .wrapping_add(temp0 ^ temp1);
-            let temp3 = {
-                // The h1 function in HC-128
-                let a = *p.get_unchecked(i12) as u8;
-                let c = (p.get_unchecked(i12) >> 16) as u8;
-                q[a as usize].wrapping_add(q[256 + c as usize])
-            };
-            temp3 ^ p.get_unchecked(i)
-        }
+        let temp0 = p[i511].rotate_right(23);
+        let temp1 = p[i3].rotate_right(10);
+        let temp2 = p[i10].rotate_right(8);
+        p[i] = p[i]
+            .wrapping_add(temp2)
+            .wrapping_add(temp0 ^ temp1);
+        let temp3 = {
+            // The h1 function in HC-128
+            let a = p[i12] as u8;
+            let c = (p[i12] >> 16) as u8;
+            q[a as usize].wrapping_add(q[256 + c as usize])
+        };
+        temp3 ^ p[i]
     }
 
     // One step of HC-128, update Q and generate 32 bits keystream
     // Similar to `step_p`, but `p` and `q` are swapped, and the rotates are to
     // the left instead of to the right.
     #[inline(always)]
-    fn step_q(&mut self, i: usize, i511: usize, i3: usize, i10: usize, i12: usize)
-         -> u32
-    {
+    fn step_q(&mut self, i: usize, i511: usize, i3: usize, i10: usize, i12: usize) -> u32 {
         let (p, q) = self.t.split_at_mut(512);
-        unsafe {
-            let temp0 = q.get_unchecked(i511).rotate_left(23);
-            let temp1 = q.get_unchecked(i3).rotate_left(10);
-            let temp2 = q.get_unchecked(i10).rotate_left(8);
-            *q.get_unchecked_mut(i) = q.get_unchecked(i)
-                                       .wrapping_add(temp2)
-                                       .wrapping_add(temp0 ^ temp1);
-            let temp3 = {
-                // The h2 function in HC-128
-                let a = *q.get_unchecked(i12) as u8;
-                let c = (q.get_unchecked(i12) >> 16) as u8;
-                p[a as usize].wrapping_add(p[256 + c as usize])
-            };
-            temp3 ^ q.get_unchecked(i)
-        }
+        let temp0 = q[i511].rotate_left(23);
+        let temp1 = q[i3].rotate_left(10);
+        let temp2 = q[i10].rotate_left(8);
+        q[i] = q
+            [i]
+            .wrapping_add(temp2)
+            .wrapping_add(temp0 ^ temp1);
+        let temp3 = {
+            // The h2 function in HC-128
+            let a = q[i12] as u8;
+            let c = (q[i12] >> 16) as u8;
+            p[a as usize].wrapping_add(p[256 + c as usize])
+        };
+        temp3 ^ q[i]
     }
 
     fn sixteen_steps(&mut self) {
@@ -228,6 +237,12 @@
         let cc = self.counter1024 % 512;
         let dd = (cc + 16) % 512;
         let ee = cc.wrapping_sub(16) % 512;
+        // These asserts let the compiler optimize out the bounds checks.
+        // Some of them may be superflous, and that's fine:
+        // they'll be optimized out if that's the case.
+        assert!(ee + 15 < 512);
+        assert!(cc + 15 < 512);
+        assert!(dd < 512);
 
         if self.counter1024 < 512 {
             // P block
@@ -272,7 +287,7 @@
     // Initialize an HC-128 random number generator. The seed has to be
     // 256 bits in length (`[u32; 8]`), matching the 128 bit `key` followed by
     // 128 bit `iv` when HC-128 where to be used as a stream cipher.
-    #[inline(always)]   // single use: SeedableRng::from_seed
+    #[inline(always)] // single use: SeedableRng::from_seed
     fn init(seed: [u32; SEED_WORDS]) -> Self {
         #[inline]
         fn f1(x: u32) -> u32 {
@@ -295,9 +310,12 @@
 
         // Generate the 256 intermediate values W[16] ... W[256+16-1], and
         // copy the last 16 generated values to the start op P.
-        for i in 16..256+16 {
-            t[i] = f2(t[i-2]).wrapping_add(t[i-7]).wrapping_add(f1(t[i-15]))
-                   .wrapping_add(t[i-16]).wrapping_add(i as u32);
+        for i in 16..256 + 16 {
+            t[i] = f2(t[i - 2])
+                .wrapping_add(t[i - 7])
+                .wrapping_add(f1(t[i - 15]))
+                .wrapping_add(t[i - 16])
+                .wrapping_add(i as u32);
         }
         {
             let (p1, p2) = t.split_at_mut(256);
@@ -306,21 +324,26 @@
 
         // Generate both the P and Q tables
         for i in 16..1024 {
-            t[i] = f2(t[i-2]).wrapping_add(t[i-7]).wrapping_add(f1(t[i-15]))
-                   .wrapping_add(t[i-16]).wrapping_add(256 + i as u32);
+            t[i] = f2(t[i - 2])
+                .wrapping_add(t[i - 7])
+                .wrapping_add(f1(t[i - 15]))
+                .wrapping_add(t[i - 16])
+                .wrapping_add(256 + i as u32);
         }
 
         let mut core = Self { t, counter1024: 0 };
 
         // run the cipher 1024 steps
-        for _ in 0..64 { core.sixteen_steps() };
+        for _ in 0..64 {
+            core.sixteen_steps()
+        }
         core.counter1024 = 0;
         core
     }
 }
 
 impl SeedableRng for Hc128Core {
-    type Seed = [u8; SEED_WORDS*4];
+    type Seed = [u8; SEED_WORDS * 4];
 
     /// Create an HC-128 random number generator with a seed. The seed has to be
     /// 256 bits in length, matching the 128 bit `key` followed by 128 bit `iv`
@@ -334,20 +357,32 @@
 
 impl CryptoRng for Hc128Core {}
 
+// Custom PartialEq implementation as it can't currently be derived from an array of size 1024
+impl PartialEq for Hc128Core {
+    fn eq(&self, rhs: &Self) -> bool {
+        &self.t[..] == &rhs.t[..] && self.counter1024 == rhs.counter1024
+    }
+}
+impl Eq for Hc128Core {}
+
 #[cfg(test)]
 mod test {
-    use ::rand_core::{RngCore, SeedableRng};
     use super::Hc128Rng;
+    use ::rand_core::{RngCore, SeedableRng};
 
     #[test]
     // Test vector 1 from the paper "The Stream Cipher HC-128"
     fn test_hc128_true_values_a() {
+        #[rustfmt::skip]
         let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
                     0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
         let mut rng = Hc128Rng::from_seed(seed);
 
         let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
+        for i in results.iter_mut() {
+            *i = rng.next_u32();
+        }
+        #[rustfmt::skip]
         let expected = [0x73150082, 0x3bfd03a0, 0xfb2fd77f, 0xaa63af0e,
                         0xde122fc6, 0xa7dc29b6, 0x62a68527, 0x8b75ec68,
                         0x9036db1e, 0x81896005, 0x00ade078, 0x491fbf9a,
@@ -358,12 +393,16 @@
     #[test]
     // Test vector 2 from the paper "The Stream Cipher HC-128"
     fn test_hc128_true_values_b() {
+        #[rustfmt::skip]
         let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
                     1,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
         let mut rng = Hc128Rng::from_seed(seed);
 
         let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
+        for i in results.iter_mut() {
+            *i = rng.next_u32();
+        }
+        #[rustfmt::skip]
         let expected = [0xc01893d5, 0xb7dbe958, 0x8f65ec98, 0x64176604,
                         0x36fc6724, 0xc82c6eec, 0x1b1c38a7, 0xc9b42a95,
                         0x323ef123, 0x0a6a908b, 0xce757b68, 0x9f14f7bb,
@@ -374,12 +413,16 @@
     #[test]
     // Test vector 3 from the paper "The Stream Cipher HC-128"
     fn test_hc128_true_values_c() {
+        #[rustfmt::skip]
         let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
                     0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
         let mut rng = Hc128Rng::from_seed(seed);
 
         let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
+        for i in results.iter_mut() {
+            *i = rng.next_u32();
+        }
+        #[rustfmt::skip]
         let expected = [0x518251a4, 0x04b4930a, 0xb02af931, 0x0639f032,
                         0xbcb4a47a, 0x5722480b, 0x2bf99f72, 0xcdc0e566,
                         0x310f0c56, 0xd3cc83e8, 0x663db8ef, 0x62dfe07f,
@@ -389,12 +432,16 @@
 
     #[test]
     fn test_hc128_true_values_u64() {
+        #[rustfmt::skip]
         let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
                     0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
         let mut rng = Hc128Rng::from_seed(seed);
 
         let mut results = [0u64; 8];
-        for i in results.iter_mut() { *i = rng.next_u64(); }
+        for i in results.iter_mut() {
+            *i = rng.next_u64();
+        }
+        #[rustfmt::skip]
         let expected = [0x3bfd03a073150082, 0xaa63af0efb2fd77f,
                         0xa7dc29b6de122fc6, 0x8b75ec6862a68527,
                         0x818960059036db1e, 0x491fbf9a00ade078,
@@ -404,9 +451,14 @@
         // The RNG operates in a P block of 512 results and next a Q block.
         // After skipping 2*800 u32 results we end up somewhere in the Q block
         // of the second round
-        for _ in 0..800 { rng.next_u64(); }
+        for _ in 0..800 {
+            rng.next_u64();
+        }
 
-        for i in results.iter_mut() { *i = rng.next_u64(); }
+        for i in results.iter_mut() {
+            *i = rng.next_u64();
+        }
+        #[rustfmt::skip]
         let expected = [0xd8c4d6ca84d0fc10, 0xf16a5d91dc66e8e7,
                         0xd800de5bc37a8653, 0x7bae1f88c0dfbb4c,
                         0x3bfe1f374e6d4d14, 0x424b55676be3fa06,
@@ -416,9 +468,11 @@
 
     #[test]
     fn test_hc128_true_values_bytes() {
+        #[rustfmt::skip]
         let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
                     0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
         let mut rng = Hc128Rng::from_seed(seed);
+        #[rustfmt::skip]
         let expected = [0x31, 0xf9, 0x2a, 0xb0, 0x32, 0xf0, 0x39, 0x06,
                  0x7a, 0xa4, 0xb4, 0xbc, 0x0b, 0x48, 0x22, 0x57,
                  0x72, 0x9f, 0xf9, 0x2b, 0x66, 0xe5, 0xc0, 0xcd,
@@ -439,7 +493,7 @@
         // Pick a somewhat large buffer so we can test filling with the
         // remainder from `state.results`, directly filling the buffer, and
         // filling the remainder of the buffer.
-        let mut buffer = [0u8; 16*4*2];
+        let mut buffer = [0u8; 16 * 4 * 2];
         // Consume a value so that we have a remainder.
         assert!(rng.next_u64() == 0x04b4930a518251a4);
         rng.fill_bytes(&mut buffer);
@@ -453,6 +507,7 @@
 
     #[test]
     fn test_hc128_clone() {
+        #[rustfmt::skip]
         let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
                     0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
         let mut rng1 = Hc128Rng::from_seed(seed);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rand_hc/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rand_hc/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,16 +8,16 @@
 
 //! The HC128 random number generator.
 
-#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://rust-random.github.io/rand/")]
-
+#![doc(
+    html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+    html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+    html_root_url = "https://rust-random.github.io/rand/"
+)]
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
 #![doc(test(attr(allow(unused_variables), deny(warnings))))]
-
 #![no_std]
 
 mod hc128;
 
-pub use hc128::{Hc128Rng, Hc128Core};
+pub use hc128::{Hc128Core, Hc128Rng};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"9494475634c86ca0cfc30688aaf3e3961c0bdab1380e12a9e36597b24dece24c","LICENSE":"efcfee7981ff72431fffb06925cad00a23dce079ed4354f61030ad5abdb78829","README.md":"9161f18ba7f69b4ca51e844aee8ffb8237513a468c5c3b1f3a5f989044f895ac","src/arch/aarch64.rs":"5d9afb0813ca903cd5ac48add7f6f9b538d9e0346bc9bac0924d509d2004c07b","src/arch/arm.rs":"6f0eea58ea5dc7e87a66f335cb4264995bdf5352b379428dd0ba6a11887491a6","src/arch/nonredox.rs":"de54557f642218b34d451fc52fe3cff97e3e4307304ae02a678a900cab96cdb0","src/arch/x86.rs":"a433a3cfaf4fe2987e7516069e814f539172a1bb51d02bcfab74fa4c56dd9fdf","src/arch/x86_64.rs":"0bb1ebc3aba5d240b2ab813f6aa999b071d1230641849775d38d2074e2e4026a","src/call.rs":"b5b53aab18bb91bfef88d82f1708d05e210a30cde141fce0031dad543d988391","src/data.rs":"84f8beb9d40b753a8c1713b922e99ed9913d35e959694b2c849351b1a92d87c9","src/error.rs":"d832a641ccb1baf10315e2e1ce59b12c30d605a526fc65a31f63bb3a92c3a2f7","src/flag.rs":"1e944be3b134d3776725529e2190e2d1548dd67a631838281b8c5bc829523dbe","src/io/dma.rs":"740cd441f844718a14f77c2fe292d29b7c468d686505810d8b3281f9528a6fe7","src/io/io.rs":"1bcb36d1867e9bab6a8186cd6928efe70ae2655e9f9d0dd3def20bc0fb6a82f6","src/io/mmio.rs":"b9fdb37d37a25a48106d60f1a977c541cb5162b20b12507c7dcd6eb3dff0a2c8","src/io/mod.rs":"4df12af3e82e6b5fe22112c9f51552112ee4811b7d1131d2a43d608d8d1cac09","src/io/pio.rs":"39f4176a2995c7acfb32204b065af0ec14d7ff0d45dc51eff2679f3195c36ee2","src/lib.rs":"a5a56fa43f30d2d994075539425ffaa8da7106ccd77c3022950623eb82cd59b1","src/number.rs":"4718baa58a0f3e6b9b66d1f328cb2a145e9b1f807654c3079a13b226c4085a29","src/scheme/generate.sh":"b022adacb74f2af1470e691341c37acc1582f428e9b8b6b9dccb790dde594b40","src/scheme/mod.rs":"2679272397bf0247e1a4695853465243ca02960feb4ced1124969f67ebd3e3ce","src/scheme/scheme.rs":"879728e4d4e7d8f3057df5a3a6af1636079135652594ee50ca1b665e876be595","src/scheme/scheme_block.rs":"a8ea17b1101548e9b36f6c9000f68fd5438a796069252f948bde7dda44088a7f","src/scheme/scheme_block_mut.rs":"8b881f84a54e2477967d43eb68dac7c578ff6451dba59eba0d517037b2ac4def","src/scheme/scheme_mut.rs":"30f9b0750437b7f55d5bb24da546fd4afcb3c27b0af06d5f681b8f1c4877e7b4","src/tests.rs":"b9d60e419f7e57bb942756e8011e19704cfd46fb6ec96ffa925fb7deb35c5d43"},"package":"41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"}
\ No newline at end of file
+{"files":{"Cargo.toml":"143c264fb8f16ca8a2ea41a37dc4026720cba0f3062a744e62c68a0c0bbd3312","LICENSE":"efcfee7981ff72431fffb06925cad00a23dce079ed4354f61030ad5abdb78829","README.md":"9161f18ba7f69b4ca51e844aee8ffb8237513a468c5c3b1f3a5f989044f895ac","src/arch/aarch64.rs":"8c033147f6b21433e0cc1044040219d7f32fde918f17c81582381608f2f090ec","src/arch/arm.rs":"abc547bd2be32ff15f35032452e645668ec5050d2540e2dca073fc5670ca1a75","src/arch/nonredox.rs":"9eac0fa2cf9eae07f0cafa2dd63c4a820791897a3de9ad1a933ab4f53458dbd8","src/arch/riscv64.rs":"20bf9a8db779059773b113643d0cb3737fbb5d57f45ee39b8ae9d3396b6ef636","src/arch/x86.rs":"3a517a8f0a70ae1b513d7a44e7399ce47a2ca7aca72a8200662b9800b41455d6","src/arch/x86_64.rs":"d71d29327288f27782962c29598defff81b512c5f00f1995de042507ca7623c3","src/call.rs":"0d3e32e33ecdf75963e5d244f9e86e94047d155c5de5fa3c0085faf18ed97b33","src/data.rs":"bd4545d4c2fcc59ff26ae52ad7f773a697d5ccf639a2ffc253cece6b31e94d51","src/error.rs":"ef20f3817f997a1aeb7114628407f19cb8bc13c555d4e093918f38a5d098f798","src/flag.rs":"f07d6a7aa6766d30d0a303c7b3bda5bb4c473dd9dd51687cf8e0631b1bf3ec9d","src/io/dma.rs":"fbc46e924d5913f5a3fb723751d7a9dd1b079ccf058500fde4957aaf9fa7dd1c","src/io/io.rs":"e1d454ff47efac70fdaa709251a5a9c1c5637f931994ba3bf6a38c6db9145822","src/io/mmio.rs":"c71a956f57554b126080b14378f235f9e98c994648ba524231ceae841326251f","src/io/mod.rs":"4df12af3e82e6b5fe22112c9f51552112ee4811b7d1131d2a43d608d8d1cac09","src/io/pio.rs":"39f4176a2995c7acfb32204b065af0ec14d7ff0d45dc51eff2679f3195c36ee2","src/lib.rs":"d5b3fea867db8ad7cd7e142bdc06aa691225c768617af2391b53453560f4ab9b","src/number.rs":"fe7b47b06566aa1f8a75f50b685801259df03a1a5c85b91817b4552583cd7862","src/scheme/generate.sh":"dde4e30f4e0223fb1a24ed486a6c36e624c854dbf890862cb6866f4fa3c7a6eb","src/scheme/mod.rs":"cb622405deb0aef4ab04499ea1adfd338c9c5dd9c31a1fe9989786dbf69b49d8","src/scheme/scheme.rs":"30263996f0b4930edd76dace5f5750e48229066bc888bc13365846688d0a870b","src/scheme/scheme_block.rs":"b7a761e4349eb87d106c8af14894e8c4272769b9eb235cd500b075ac1f823683","src/scheme/scheme_block_mut.rs":"4a4fc03bce14757b64006b9bc3fa2779e95382b2d99579870146ee0c3be3f46c","src/scheme/scheme_mut.rs":"e6f0671b77f1bf5263e497c69dec553352249b75d52af62ac19477ba5127f803","src/scheme/seek.rs":"94e044de47b0f00eb0c2aea3fb21001ac2b9aa1e4b20d73fd54163fe92fa63f7","src/tests.rs":"416a428ba6a9c5f0d8f4c3dbe91d9aa940a04472ec9a2d17bc5a66c455b4416f"},"package":"8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,16 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "redox_syscall"
-version = "0.1.57"
+version = "0.2.10"
 authors = ["Jeremy Soller <jackpot51@gmail.com>"]
 description = "A Rust library to access raw Redox system calls"
 documentation = "https://docs.rs/redox_syscall"
@@ -21,3 +21,5 @@
 
 [lib]
 name = "syscall"
+[dependencies.bitflags]
+version = "1.1.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/aarch64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/aarch64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/aarch64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/aarch64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,77 +1,132 @@
-use super::error::{Error, Result};
-
-pub unsafe fn syscall0(mut a: usize) -> Result<usize> {
-    llvm_asm!("svc   0"
-          : "={x0}"(a)
-          : "{x8}"(a)
-          : "x0", "x8"
-          : "volatile");
-
-    Error::demux(a)
-}
-
-pub unsafe fn syscall1(mut a: usize, b: usize) -> Result<usize> {
-    llvm_asm!("svc   0"
-          : "={x0}"(a)
-          : "{x8}"(a), "{x0}"(b)
-          : "x0", "x8"
-          : "volatile");
-
-    Error::demux(a)
-}
-
-// Clobbers all registers - special for clone
-pub unsafe fn syscall1_clobber(mut a: usize, b: usize) -> Result<usize> {
-    llvm_asm!("svc   0"
-          : "={x0}"(a)
-          : "{x8}"(a), "{x0}"(b)
-          : "memory",
-            "x0", "x1",  "x2",  "x3",  "x4",  "x5", "x6", "x7",
-            "x8",  "x9", "x10", "x11", "x12", "x13", "x14", "x15",
-            "x16", "x17","x18", "x19", "x20", "x21", "x22", "x23",
-            "x24", "x25", "x26", "x27", "x28", "x29", "x30"
-          : "volatile");
-
-    Error::demux(a)
-}
+use core::{mem, slice};
+use core::ops::{Deref, DerefMut};
 
-pub unsafe fn syscall2(mut a: usize, b: usize, c: usize) -> Result<usize> {
-    llvm_asm!("svc   0"
-          : "={x0}"(a)
-          : "{x8}"(a), "{x0}"(b), "{x1}"(c)
-          : "x0", "x1", "x8"
-          : "volatile");
-
-    Error::demux(a)
-}
-
-pub unsafe fn syscall3(mut a: usize, b: usize, c: usize, d: usize) -> Result<usize> {
-    llvm_asm!("svc   0"
-          : "={x0}"(a)
-          : "{x8}"(a), "{x0}"(b), "{x1}"(c), "{x2}"(d)
-          : "x0", "x1", "x2", "x8"
-          : "volatile");
-
-    Error::demux(a)
-}
-
-pub unsafe fn syscall4(mut a: usize, b: usize, c: usize, d: usize, e: usize) -> Result<usize> {
-    llvm_asm!("svc   0"
-          : "={x0}"(a)
-          : "{x8}"(a), "{x0}"(b), "{x1}"(c), "{x2}"(d), "{x3}"(e)
-          : "x0", "x1", "x2", "x3", "x8"
-          : "volatile");
-
-    Error::demux(a)
-}
-
-pub unsafe fn syscall5(mut a: usize, b: usize, c: usize, d: usize, e: usize, f: usize)
-    -> Result<usize> {
-    llvm_asm!("svc   0"
-          : "={x0}"(a)
-          : "{x8}"(a), "{x0}"(b), "{x1}"(c), "{x2}"(d), "{x3}"(e), "{x4}"(f)
-          : "x0", "x1", "x2", "x3", "x4", "x8"
-          : "volatile");
+use super::error::{Error, Result};
 
-    Error::demux(a)
+macro_rules! syscall {
+    ($($name:ident($a:ident, $($b:ident, $($c:ident, $($d:ident, $($e:ident, $($f:ident, )?)?)?)?)?);)+) => {
+        $(
+            pub unsafe fn $name($a: usize, $($b: usize, $($c: usize, $($d: usize, $($e: usize, $($f: usize)?)?)?)?)?) -> Result<usize> {
+                let ret: usize;
+
+                asm!(
+                    "svc 0",
+                    in("x8") $a,
+                    $(
+                        in("x0") $b,
+                        $(
+                            in("x1") $c,
+                            $(
+                                in("x2") $d,
+                                $(
+                                    in("x3") $e,
+                                    $(
+                                        in("x4") $f,
+                                    )?
+                                )?
+                            )?
+                        )?
+                    )?
+                    lateout("x0") ret,
+                    options(nostack),
+                );
+
+                Error::demux(ret)
+            }
+        )+
+    };
+}
+
+syscall! {
+    syscall0(a,);
+    syscall1(a, b,);
+    syscall2(a, b, c,);
+    syscall3(a, b, c, d,);
+    syscall4(a, b, c, d, e,);
+    syscall5(a, b, c, d, e, f,);
+}
+
+#[derive(Copy, Clone, Debug, Default)]
+#[repr(C)]
+pub struct IntRegisters {
+    pub elr_el1: usize,
+    pub tpidr_el0: usize,
+    pub tpidrro_el0: usize,
+    pub spsr_el1: usize,
+    pub esr_el1: usize,
+    pub sp_el0: usize,      // Shouldn't be used if interrupt occurred at EL1
+    pub padding: usize,     // To keep the struct even number aligned
+    pub x30: usize,
+    pub x29: usize,
+    pub x28: usize,
+    pub x27: usize,
+    pub x26: usize,
+    pub x25: usize,
+    pub x24: usize,
+    pub x23: usize,
+    pub x22: usize,
+    pub x21: usize,
+    pub x20: usize,
+    pub x19: usize,
+    pub x18: usize,
+    pub x17: usize,
+    pub x16: usize,
+    pub x15: usize,
+    pub x14: usize,
+    pub x13: usize,
+    pub x12: usize,
+    pub x11: usize,
+    pub x10: usize,
+    pub x9: usize,
+    pub x8: usize,
+    pub x7: usize,
+    pub x6: usize,
+    pub x5: usize,
+    pub x4: usize,
+    pub x3: usize,
+    pub x2: usize,
+    pub x1: usize,
+    pub x0: usize
+}
+
+impl Deref for IntRegisters {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const IntRegisters as *const u8, mem::size_of::<IntRegisters>())
+        }
+    }
+}
+
+impl DerefMut for IntRegisters {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut IntRegisters as *mut u8, mem::size_of::<IntRegisters>())
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+#[repr(packed)]
+pub struct FloatRegisters {
+    pub fp_simd_regs: [u128; 32],
+    pub fpsr: u32,
+    pub fpcr: u32
+}
+
+impl Deref for FloatRegisters {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const FloatRegisters as *const u8, mem::size_of::<FloatRegisters>())
+        }
+    }
+}
+
+impl DerefMut for FloatRegisters {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut FloatRegisters as *mut u8, mem::size_of::<FloatRegisters>())
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/arm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/arm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/arm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/arm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,17 +20,6 @@
     Error::demux(a)
 }
 
-// Clobbers all registers - special for clone
-pub unsafe fn syscall1_clobber(mut a: usize, b: usize) -> Result<usize> {
-    llvm_asm!("swi $$0"
-        : "={r0}"(a)
-        : "{r7}"(a), "{r0}"(b)
-        : "memory", "r0", "r1", "r2", "r3", "r4"
-        : "volatile");
-
-    Error::demux(a)
-}
-
 pub unsafe fn syscall2(mut a: usize, b: usize, c: usize) -> Result<usize> {
     llvm_asm!("swi $$0"
         : "={r0}"(a)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/nonredox.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/nonredox.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/nonredox.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/nonredox.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,11 +8,6 @@
     Err(Error::new(ENOSYS))
 }
 
-// Clobbers all registers - special for clone
-pub unsafe fn syscall1_clobber(_a: usize, _b: usize) -> Result<usize> {
-    Err(Error::new(ENOSYS))
-}
-
 pub unsafe fn syscall2(_a: usize, _b: usize, _c: usize) -> Result<usize> {
     Err(Error::new(ENOSYS))
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/riscv64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/riscv64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/riscv64.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/riscv64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+use core::{mem, slice};
+use core::ops::{Deref, DerefMut};
+
+use super::error::{Error, Result};
+
+macro_rules! syscall {
+    ($($name:ident($a:ident, $($b:ident, $($c:ident, $($d:ident, $($e:ident, $($f:ident, )?)?)?)?)?);)+) => {
+        $(
+            pub unsafe fn $name($a: usize, $($b: usize, $($c: usize, $($d: usize, $($e: usize, $($f: usize)?)?)?)?)?) -> Result<usize> {
+                let ret: usize;
+
+                asm!(
+                    "ecall",
+                    in("a7") $a,
+                    $(
+                        in("a0") $b,
+                        $(
+                            in("a1") $c,
+                            $(
+                                in("a2") $d,
+                                $(
+                                    in("a3") $e,
+                                    $(
+                                        in("a4") $f,
+                                    )?
+                                )?
+                            )?
+                        )?
+                    )?
+                    lateout("a0") ret,
+                    options(nostack),
+                );
+
+                Error::demux(ret)
+            }
+        )+
+    };
+}
+
+syscall! {
+    syscall0(a,);
+    syscall1(a, b,);
+    syscall2(a, b, c,);
+    syscall3(a, b, c, d,);
+    syscall4(a, b, c, d, e,);
+    syscall5(a, b, c, d, e, f,);
+}
+
+#[derive(Copy, Clone, Debug, Default)]
+#[repr(C)]
+pub struct IntRegisters {
+    //TODO
+}
+
+impl Deref for IntRegisters {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const IntRegisters as *const u8, mem::size_of::<IntRegisters>())
+        }
+    }
+}
+
+impl DerefMut for IntRegisters {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut IntRegisters as *mut u8, mem::size_of::<IntRegisters>())
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+#[repr(packed)]
+pub struct FloatRegisters {
+    //TODO
+}
+
+impl Deref for FloatRegisters {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const FloatRegisters as *const u8, mem::size_of::<FloatRegisters>())
+        }
+    }
+}
+
+impl DerefMut for FloatRegisters {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut FloatRegisters as *mut u8, mem::size_of::<FloatRegisters>())
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/x86_64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/x86_64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/x86_64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/x86_64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,74 +1,154 @@
-use super::error::{Error, Result};
-
-pub unsafe fn syscall0(mut a: usize) -> Result<usize> {
-    llvm_asm!("syscall"
-        : "={rax}"(a)
-        : "{rax}"(a)
-        : "rcx", "r11", "memory"
-        : "intel", "volatile");
-
-    Error::demux(a)
-}
-
-pub unsafe fn syscall1(mut a: usize, b: usize) -> Result<usize> {
-    llvm_asm!("syscall"
-        : "={rax}"(a)
-        : "{rax}"(a), "{rdi}"(b)
-        : "rcx", "r11", "memory"
-        : "intel", "volatile");
-
-    Error::demux(a)
-}
-
-// Clobbers all registers - special for clone
-pub unsafe fn syscall1_clobber(mut a: usize, b: usize) -> Result<usize> {
-    llvm_asm!("syscall"
-        : "={rax}"(a)
-        : "{rax}"(a), "{rdi}"(b)
-        : "memory", "rbx", "rcx", "rdx", "rsi", "rdi", "r8",
-          "r9", "r10", "r11", "r12", "r13", "r14", "r15"
-        : "intel", "volatile");
-
-    Error::demux(a)
-}
+use core::{mem, slice};
+use core::ops::{Deref, DerefMut};
 
-pub unsafe fn syscall2(mut a: usize, b: usize, c: usize) -> Result<usize> {
-    llvm_asm!("syscall"
-        : "={rax}"(a)
-        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c)
-        : "rcx", "r11", "memory"
-        : "intel", "volatile");
-
-    Error::demux(a)
-}
-
-pub unsafe fn syscall3(mut a: usize, b: usize, c: usize, d: usize) -> Result<usize> {
-    llvm_asm!("syscall"
-        : "={rax}"(a)
-        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d)
-        : "rcx", "r11", "memory"
-        : "intel", "volatile");
-
-    Error::demux(a)
-}
-
-pub unsafe fn syscall4(mut a: usize, b: usize, c: usize, d: usize, e: usize) -> Result<usize> {
-    llvm_asm!("syscall"
-        : "={rax}"(a)
-        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d), "{r10}"(e)
-        : "rcx", "r11", "memory"
-        : "intel", "volatile");
-
-    Error::demux(a)
-}
-
-pub unsafe fn syscall5(mut a: usize, b: usize, c: usize, d: usize, e: usize, f: usize)
-                       -> Result<usize> {
-    llvm_asm!("syscall"
-        : "={rax}"(a)
-        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d), "{r10}"(e), "{r8}"(f)
-        : "rcx", "r11", "memory"
-        : "intel", "volatile");
+use super::error::{Error, Result};
 
-    Error::demux(a)
+macro_rules! syscall {
+    ($($name:ident($a:ident, $($b:ident, $($c:ident, $($d:ident, $($e:ident, $($f:ident, )?)?)?)?)?);)+) => {
+        $(
+            pub unsafe fn $name(mut $a: usize, $($b: usize, $($c: usize, $($d: usize, $($e: usize, $($f: usize)?)?)?)?)?) -> Result<usize> {
+                asm!(
+                    "syscall",
+                    inout("rax") $a,
+                    $(
+                        in("rdi") $b,
+                        $(
+                            in("rsi") $c,
+                            $(
+                                in("rdx") $d,
+                                $(
+                                    in("r10") $e,
+                                    $(
+                                        in("r8") $f,
+                                    )?
+                                )?
+                            )?
+                        )?
+                    )?
+                    out("rcx") _,
+                    out("r11") _,
+                    options(nostack),
+                );
+
+                Error::demux($a)
+            }
+        )+
+    };
+}
+
+syscall! {
+    syscall0(a,);
+    syscall1(a, b,);
+    syscall2(a, b, c,);
+    syscall3(a, b, c, d,);
+    syscall4(a, b, c, d, e,);
+    syscall5(a, b, c, d, e, f,);
+}
+
+#[derive(Copy, Clone, Debug, Default)]
+#[repr(C)]
+pub struct IntRegisters {
+    // TODO: Some of these don't get set by Redox yet. Should they?
+
+    pub r15: usize,
+    pub r14: usize,
+    pub r13: usize,
+    pub r12: usize,
+    pub rbp: usize,
+    pub rbx: usize,
+    pub r11: usize,
+    pub r10: usize,
+    pub r9: usize,
+    pub r8: usize,
+    pub rax: usize,
+    pub rcx: usize,
+    pub rdx: usize,
+    pub rsi: usize,
+    pub rdi: usize,
+    // pub orig_rax: usize,
+    pub rip: usize,
+    pub cs: usize,
+    pub rflags: usize,
+    pub rsp: usize,
+    pub ss: usize,
+    // pub fs_base: usize,
+    // pub gs_base: usize,
+    // pub ds: usize,
+    // pub es: usize,
+    pub fs: usize,
+    // pub gs: usize
+}
+
+impl Deref for IntRegisters {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const IntRegisters as *const u8, mem::size_of::<IntRegisters>())
+        }
+    }
+}
+
+impl DerefMut for IntRegisters {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut IntRegisters as *mut u8, mem::size_of::<IntRegisters>())
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+#[repr(packed)]
+pub struct FloatRegisters {
+    pub fcw: u16,
+    pub fsw: u16,
+    pub ftw: u8,
+    pub _reserved: u8,
+    pub fop: u16,
+    pub fip: u64,
+    pub fdp: u64,
+    pub mxcsr: u32,
+    pub mxcsr_mask: u32,
+    pub st_space: [u128; 8],
+    pub xmm_space: [u128; 16],
+    // TODO: YMM/ZMM
+}
+
+impl Deref for FloatRegisters {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const FloatRegisters as *const u8, mem::size_of::<FloatRegisters>())
+        }
+    }
+}
+
+impl DerefMut for FloatRegisters {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut FloatRegisters as *mut u8, mem::size_of::<FloatRegisters>())
+        }
+    }
+}
+#[derive(Clone, Copy, Debug, Default)]
+#[repr(packed)]
+pub struct EnvRegisters {
+    pub fsbase: u64,
+    pub gsbase: u64,
+    // TODO: PKRU?
+}
+impl Deref for EnvRegisters {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const EnvRegisters as *const u8, mem::size_of::<EnvRegisters>())
+        }
+    }
+}
+
+impl DerefMut for EnvRegisters {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut EnvRegisters as *mut u8, mem::size_of::<EnvRegisters>())
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/x86.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/x86.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/arch/x86.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/arch/x86.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,17 +20,6 @@
     Error::demux(a)
 }
 
-// Clobbers all registers - special for clone
-pub unsafe fn syscall1_clobber(mut a: usize, b: usize) -> Result<usize> {
-    llvm_asm!("int 0x80"
-        : "={eax}"(a)
-        : "{eax}"(a), "{ebx}"(b)
-        : "memory", "ebx", "ecx", "edx", "esi", "edi"
-        : "intel", "volatile");
-
-    Error::demux(a)
-}
-
 pub unsafe fn syscall2(mut a: usize, b: usize, c: usize) -> Result<usize> {
     llvm_asm!("int 0x80"
         : "={eax}"(a)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/call.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/call.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/call.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/call.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 use super::arch::*;
 use super::data::{Map, SigAction, Stat, StatVfs, TimeSpec};
 use super::error::Result;
+use super::flag::*;
 use super::number::*;
 
 use core::{mem, ptr};
@@ -11,20 +12,6 @@
     unreachable!();
 }
 
-/// Set the end of the process's heap
-///
-/// When `addr` is `0`, this function will return the current break.
-///
-/// When `addr` is nonzero, this function will attempt to set the end of the process's
-/// heap to `addr` and return the new program break. The new program break should be
-/// checked by the allocator, it may not be exactly `addr`, as it may be aligned to a page
-/// boundary.
-///
-/// On error, `Err(ENOMEM)` will be returned indicating that no memory is available
-pub unsafe fn brk(addr: usize) -> Result<usize> {
-    syscall1(SYS_BRK, addr)
-}
-
 /// Change the process's working directory
 ///
 /// This function will attempt to set the process's working directory to `path`, which can be
@@ -39,7 +26,7 @@
 /// * `EIO` - an I/O error occurred
 /// * `ENOENT` - `path` does not exit
 /// * `ENOTDIR` - `path` is not a directory
-pub fn chdir<T: AsRef<[u8]>>(path: T) -> Result<usize> {
+pub fn chdir<T: AsRef<str>>(path: T) -> Result<usize> {
     unsafe { syscall2(SYS_CHDIR, path.as_ref().as_ptr() as usize, path.as_ref().len()) }
 }
 
@@ -47,13 +34,13 @@
     since = "0.1.55",
     note = "use fchmod instead"
 )]
-pub fn chmod<T: AsRef<[u8]>>(path: T, mode: usize) -> Result<usize> {
+pub fn chmod<T: AsRef<str>>(path: T, mode: usize) -> Result<usize> {
     unsafe { syscall3(SYS_CHMOD, path.as_ref().as_ptr() as usize, path.as_ref().len(), mode) }
 }
 
 /// Produce a fork of the current process, or a new process thread
-pub unsafe fn clone(flags: usize) -> Result<usize> {
-    syscall1_clobber(SYS_CLONE, flags)
+pub unsafe fn clone(flags: CloneFlags) -> Result<usize> {
+    syscall1(SYS_CLONE, flags.bits())
 }
 
 /// Close a file
@@ -103,14 +90,23 @@
     unsafe { syscall5(SYS_FEXEC, fd, args.as_ptr() as usize, args.len(), vars.as_ptr() as usize, vars.len()) }
 }
 
-/// Map a file into memory
+/// Map a file into memory, but with the ability to set the address to map into, either as a hint
+/// or as a requirement of the map.
+///
+/// # Errors
+/// `EACCES` - the file descriptor was not open for reading
+/// `EBADF` - if the file descriptor was invalid
+/// `ENODEV` - mmapping was not supported
+/// `EINVAL` - invalid combination of flags
+/// `EEXIST` - if [`MapFlags::MAP_FIXED`] was set, and the address specified was already in use.
+///
 pub unsafe fn fmap(fd: usize, map: &Map) -> Result<usize> {
     syscall3(SYS_FMAP, fd, map as *const Map as usize, mem::size_of::<Map>())
 }
 
-/// Unmap a memory-mapped file
-pub unsafe fn funmap(addr: usize) -> Result<usize> {
-    syscall1(SYS_FUNMAP, addr)
+/// Unmap whole (or partial) continous memory-mapped files
+pub unsafe fn funmap(addr: usize, len: usize) -> Result<usize> {
+    syscall2(SYS_FUNMAP, addr, len)
 }
 
 /// Retrieve the canonical path of a file
@@ -119,7 +115,7 @@
 }
 
 /// Rename a file
-pub fn frename<T: AsRef<[u8]>>(fd: usize, path: T) -> Result<usize> {
+pub fn frename<T: AsRef<str>>(fd: usize, path: T) -> Result<usize> {
     unsafe { syscall3(SYS_FRENAME, fd, path.as_ref().as_ptr() as usize, path.as_ref().len()) }
 }
 
@@ -235,8 +231,8 @@
 }
 
 /// Change mapping flags
-pub unsafe fn mprotect(addr: usize, size: usize, flags: usize) -> Result<usize> {
-    syscall3(SYS_MPROTECT, addr, size, flags)
+pub unsafe fn mprotect(addr: usize, size: usize, flags: MapFlags) -> Result<usize> {
+    syscall3(SYS_MPROTECT, addr, size, flags.bits())
 }
 
 /// Sleep for the time specified in `req`
@@ -246,11 +242,11 @@
 }
 
 /// Open a file
-pub fn open<T: AsRef<[u8]>>(path: T, flags: usize) -> Result<usize> {
+pub fn open<T: AsRef<str>>(path: T, flags: usize) -> Result<usize> {
     unsafe { syscall3(SYS_OPEN, path.as_ref().as_ptr() as usize, path.as_ref().len(), flags) }
 }
 
-/// Allocate pages, linearly in physical memory
+/// Allocate frames, linearly in physical memory.
 ///
 /// # Errors
 ///
@@ -260,6 +256,37 @@
     syscall1(SYS_PHYSALLOC, size)
 }
 
+/// Allocate frames, linearly in physical memory, with an extra set of flags. If the flags contain
+/// [`PARTIAL_ALLOC`], this will result in `physalloc3` with `min = 1`.
+///
+/// Refer to the simpler [`physalloc`] and the more complex [`physalloc3`], that this convenience
+/// function is based on.
+///
+/// # Errors
+///
+/// * `EPERM` - `uid != 0`
+/// * `ENOMEM` - the system has run out of available memory
+pub unsafe fn physalloc2(size: usize, flags: usize) -> Result<usize> {
+    let mut ret = 1usize;
+    physalloc3(size, flags, &mut ret)
+}
+
+/// Allocate frames, linearly in physical memory, with an extra set of flags. If the flags contain
+/// [`PARTIAL_ALLOC`], the `min` parameter specifies the number of frames that have to be allocated
+/// for this operation to succeed. The return value is the offset of the first frame, and `min` is
+/// overwritten with the number of frames actually allocated.
+///
+/// Refer to the simpler [`physalloc`] and the simpler library function [`physalloc2`].
+///
+/// # Errors
+///
+/// * `EPERM` - `uid != 0`
+/// * `ENOMEM` - the system has run out of available memory
+/// * `EINVAL` - `min = 0`
+pub unsafe fn physalloc3(size: usize, flags: usize, min: &mut usize) -> Result<usize> {
+    syscall3(SYS_PHYSALLOC3, size, flags, min as *mut usize as usize)
+}
+
 /// Free physically allocated pages
 ///
 /// # Errors
@@ -274,8 +301,8 @@
 /// # Errors
 ///
 /// * `EPERM` - `uid != 0`
-pub unsafe fn physmap(physical_address: usize, size: usize, flags: usize) -> Result<usize> {
-    syscall3(SYS_PHYSMAP, physical_address, size, flags)
+pub unsafe fn physmap(physical_address: usize, size: usize, flags: PhysmapFlags) -> Result<usize> {
+    syscall3(SYS_PHYSMAP, physical_address, size, flags.bits())
 }
 
 /// Unmap previously mapped physical memory
@@ -299,7 +326,7 @@
 }
 
 /// Remove a directory
-pub fn rmdir<T: AsRef<[u8]>>(path: T) -> Result<usize> {
+pub fn rmdir<T: AsRef<str>>(path: T) -> Result<usize> {
     unsafe { syscall2(SYS_RMDIR, path.as_ref().as_ptr() as usize, path.as_ref().len()) }
 }
 
@@ -349,7 +376,7 @@
 }
 
 /// Remove a file
-pub fn unlink<T: AsRef<[u8]>>(path: T) -> Result<usize> {
+pub fn unlink<T: AsRef<str>>(path: T) -> Result<usize> {
     unsafe { syscall2(SYS_UNLINK, path.as_ref().as_ptr() as usize, path.as_ref().len()) }
 }
 
@@ -363,8 +390,8 @@
 }
 
 /// Check if a child process has exited or received a signal
-pub fn waitpid(pid: usize, status: &mut usize, options: usize) -> Result<usize> {
-    unsafe { syscall3(SYS_WAITPID, pid, status as *mut usize as usize, options) }
+pub fn waitpid(pid: usize, status: &mut usize, options: WaitFlags) -> Result<usize> {
+    unsafe { syscall3(SYS_WAITPID, pid, status as *mut usize as usize, options.bits()) }
 }
 
 /// Write a buffer to a file descriptor
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/data.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/data.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/data.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/data.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,12 @@
 use core::ops::{Deref, DerefMut};
 use core::{mem, slice};
+use crate::flag::{EventFlags, MapFlags, PtraceFlags, SigActionFlags};
 
 #[derive(Copy, Clone, Debug, Default)]
 #[repr(C)]
 pub struct Event {
     pub id: usize,
-    pub flags: usize,
+    pub flags: EventFlags,
     pub data: usize
 }
 
@@ -13,7 +14,7 @@
     type Target = [u8];
     fn deref(&self) -> &[u8] {
         unsafe {
-            slice::from_raw_parts(self as *const Event as *const u8, mem::size_of::<Event>()) as &[u8]
+            slice::from_raw_parts(self as *const Event as *const u8, mem::size_of::<Event>())
         }
     }
 }
@@ -21,7 +22,7 @@
 impl DerefMut for Event {
     fn deref_mut(&mut self) -> &mut [u8] {
         unsafe {
-            slice::from_raw_parts_mut(self as *mut Event as *mut u8, mem::size_of::<Event>()) as &mut [u8]
+            slice::from_raw_parts_mut(self as *mut Event as *mut u8, mem::size_of::<Event>())
         }
     }
 }
@@ -38,7 +39,7 @@
     fn deref(&self) -> &[u8] {
         unsafe {
             slice::from_raw_parts(self as *const ITimerSpec as *const u8,
-                                  mem::size_of::<ITimerSpec>()) as &[u8]
+                                  mem::size_of::<ITimerSpec>())
         }
     }
 }
@@ -47,24 +48,58 @@
     fn deref_mut(&mut self) -> &mut [u8] {
         unsafe {
             slice::from_raw_parts_mut(self as *mut ITimerSpec as *mut u8,
-                                      mem::size_of::<ITimerSpec>()) as &mut [u8]
+                                      mem::size_of::<ITimerSpec>())
         }
     }
 }
 
 #[derive(Copy, Clone, Debug, Default)]
 #[repr(C)]
+pub struct OldMap {
+    pub offset: usize,
+    pub size: usize,
+    pub flags: MapFlags,
+}
+
+impl Deref for OldMap {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const OldMap as *const u8, mem::size_of::<OldMap>())
+        }
+    }
+}
+
+impl DerefMut for OldMap {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut OldMap as *mut u8, mem::size_of::<OldMap>())
+        }
+    }
+}
+#[derive(Copy, Clone, Debug, Default)]
+#[repr(C)]
 pub struct Map {
+    /// The offset inside the file that is being mapped.
     pub offset: usize,
+
+    /// The size of the memory map.
     pub size: usize,
-    pub flags: usize,
+
+    /// Contains both prot and map flags.
+    pub flags: MapFlags,
+
+    /// Functions as a hint to where in the virtual address space of the running process, to place
+    /// the memory map. If [`MapFlags::MAP_FIXED`] is set, then this address must be the address to
+    /// map to.
+    pub address: usize,
 }
 
 impl Deref for Map {
     type Target = [u8];
     fn deref(&self) -> &[u8] {
         unsafe {
-            slice::from_raw_parts(self as *const Map as *const u8, mem::size_of::<Map>()) as &[u8]
+            slice::from_raw_parts(self as *const Map as *const u8, mem::size_of::<Map>())
         }
     }
 }
@@ -72,7 +107,7 @@
 impl DerefMut for Map {
     fn deref_mut(&mut self) -> &mut [u8] {
         unsafe {
-            slice::from_raw_parts_mut(self as *mut Map as *mut u8, mem::size_of::<Map>()) as &mut [u8]
+            slice::from_raw_parts_mut(self as *mut Map as *mut u8, mem::size_of::<Map>())
         }
     }
 }
@@ -94,7 +129,7 @@
     type Target = [u8];
     fn deref(&self) -> &[u8] {
         unsafe {
-            slice::from_raw_parts(self as *const Packet as *const u8, mem::size_of::<Packet>()) as &[u8]
+            slice::from_raw_parts(self as *const Packet as *const u8, mem::size_of::<Packet>())
         }
     }
 }
@@ -102,30 +137,29 @@
 impl DerefMut for Packet {
     fn deref_mut(&mut self) -> &mut [u8] {
         unsafe {
-            slice::from_raw_parts_mut(self as *mut Packet as *mut u8, mem::size_of::<Packet>()) as &mut [u8]
+            slice::from_raw_parts_mut(self as *mut Packet as *mut u8, mem::size_of::<Packet>())
         }
     }
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, Default, PartialEq)]
 #[repr(C)]
 pub struct SigAction {
-    pub sa_handler: extern "C" fn(usize),
+    pub sa_handler: Option<extern "C" fn(usize)>,
     pub sa_mask: [u64; 2],
-    pub sa_flags: usize,
+    pub sa_flags: SigActionFlags,
 }
 
-impl Default for SigAction {
-    fn default() -> Self {
-        Self {
-            sa_handler: unsafe { mem::transmute(0usize) },
-            sa_mask: [0; 2],
-            sa_flags: 0,
-        }
-    }
+#[allow(dead_code)]
+unsafe fn _assert_size_of_function_is_sane() {
+    // Transmuting will complain *at compile time* if sizes differ.
+    // Rust forbids a fn-pointer from being 0 so to allow SIG_DFL to
+    // exist, we use Option<extern "C" fn(usize)> which will mean 0
+    // becomes None
+    let _ = mem::transmute::<Option<extern "C" fn(usize)>, usize>(None);
 }
 
-#[derive(Copy, Clone, Debug, Default)]
+#[derive(Copy, Clone, Debug, Default, PartialEq)]
 #[repr(C)]
 pub struct Stat {
     pub st_dev: u64,
@@ -150,7 +184,7 @@
     fn deref(&self) -> &[u8] {
         unsafe {
             slice::from_raw_parts(self as *const Stat as *const u8,
-                                  mem::size_of::<Stat>()) as &[u8]
+                                  mem::size_of::<Stat>())
         }
     }
 }
@@ -159,12 +193,12 @@
     fn deref_mut(&mut self) -> &mut [u8] {
         unsafe {
             slice::from_raw_parts_mut(self as *mut Stat as *mut u8,
-                                      mem::size_of::<Stat>()) as &mut [u8]
+                                      mem::size_of::<Stat>())
         }
     }
 }
 
-#[derive(Copy, Clone, Debug, Default)]
+#[derive(Copy, Clone, Debug, Default, PartialEq)]
 #[repr(C)]
 pub struct StatVfs {
     pub f_bsize: u32,
@@ -178,7 +212,7 @@
     fn deref(&self) -> &[u8] {
         unsafe {
             slice::from_raw_parts(self as *const StatVfs as *const u8,
-                                  mem::size_of::<StatVfs>()) as &[u8]
+                                  mem::size_of::<StatVfs>())
         }
     }
 }
@@ -187,7 +221,7 @@
     fn deref_mut(&mut self) -> &mut [u8] {
         unsafe {
             slice::from_raw_parts_mut(self as *mut StatVfs as *mut u8,
-                                      mem::size_of::<StatVfs>()) as &mut [u8]
+                                      mem::size_of::<StatVfs>())
         }
     }
 }
@@ -204,7 +238,7 @@
     fn deref(&self) -> &[u8] {
         unsafe {
             slice::from_raw_parts(self as *const TimeSpec as *const u8,
-                                  mem::size_of::<TimeSpec>()) as &[u8]
+                                  mem::size_of::<TimeSpec>())
         }
     }
 }
@@ -213,97 +247,51 @@
     fn deref_mut(&mut self) -> &mut [u8] {
         unsafe {
             slice::from_raw_parts_mut(self as *mut TimeSpec as *mut u8,
-                                      mem::size_of::<TimeSpec>()) as &mut [u8]
+                                      mem::size_of::<TimeSpec>())
         }
     }
 }
 
-#[derive(Copy, Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[repr(C)]
-#[cfg(target_arch = "x86_64")]
-pub struct IntRegisters {
-    pub r15: usize,
-    pub r14: usize,
-    pub r13: usize,
-    pub r12: usize,
-    pub rbp: usize,
-    pub rbx: usize,
-    pub r11: usize,
-    pub r10: usize,
-    pub r9: usize,
-    pub r8: usize,
-    pub rax: usize,
-    pub rcx: usize,
-    pub rdx: usize,
-    pub rsi: usize,
-    pub rdi: usize,
-    // pub orig_rax: usize,
-    pub rip: usize,
-    pub cs: usize,
-    pub eflags: usize,
-    pub rsp: usize,
-    pub ss: usize,
-    pub fs_base: usize,
-    pub gs_base: usize,
-    pub ds: usize,
-    pub es: usize,
-    pub fs: usize,
-    pub gs: usize
+pub struct PtraceEvent {
+    pub cause: PtraceFlags,
+    pub a: usize,
+    pub b: usize,
+    pub c: usize,
+    pub d: usize,
+    pub e: usize,
+    pub f: usize
 }
 
-impl Deref for IntRegisters {
+impl Deref for PtraceEvent {
     type Target = [u8];
     fn deref(&self) -> &[u8] {
         unsafe {
-            slice::from_raw_parts(self as *const IntRegisters as *const u8, mem::size_of::<IntRegisters>()) as &[u8]
+            slice::from_raw_parts(self as *const PtraceEvent as *const u8, mem::size_of::<PtraceEvent>())
         }
     }
 }
 
-impl DerefMut for IntRegisters {
+impl DerefMut for PtraceEvent {
     fn deref_mut(&mut self) -> &mut [u8] {
         unsafe {
-            slice::from_raw_parts_mut(self as *mut IntRegisters as *mut u8, mem::size_of::<IntRegisters>()) as &mut [u8]
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-#[repr(C)]
-#[cfg(target_arch = "x86_64")]
-pub struct FloatRegisters {
-    pub cwd: u16,
-    pub swd: u16,
-    pub ftw: u16,
-    pub fop: u16,
-    pub rip: u64,
-    pub rdp: u64,
-    pub mxcsr: u32,
-    pub mxcr_mask: u32,
-    pub st_space: [u32; 32],
-    pub xmm_space: [u32; 64]
-}
-
-impl Default for FloatRegisters {
-    fn default() -> Self {
-        // xmm_space is not Default until const generics
-        unsafe { mem::zeroed() }
-    }
-}
-
-impl Deref for FloatRegisters {
-    type Target = [u8];
-    fn deref(&self) -> &[u8] {
-        unsafe {
-            slice::from_raw_parts(self as *const FloatRegisters as *const u8, mem::size_of::<FloatRegisters>()) as &[u8]
+            slice::from_raw_parts_mut(self as *mut PtraceEvent as *mut u8, mem::size_of::<PtraceEvent>())
         }
     }
 }
 
-impl DerefMut for FloatRegisters {
-    fn deref_mut(&mut self) -> &mut [u8] {
-        unsafe {
-            slice::from_raw_parts_mut(self as *mut FloatRegisters as *mut u8, mem::size_of::<FloatRegisters>()) as &mut [u8]
+#[macro_export]
+macro_rules! ptrace_event {
+    ($cause:expr $(, $a:expr $(, $b:expr $(, $c:expr)?)?)?) => {
+        $crate::data::PtraceEvent {
+            cause: $cause,
+            $(a: $a,
+              $(b: $b,
+                $(c: $c,)?
+              )?
+            )?
+            ..Default::default()
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
     pub errno: i32,
 }
 
-pub type Result<T> = result::Result<T, Error>;
+pub type Result<T, E = Error> = result::Result<T, E>;
 
 impl Error {
     pub fn new(errno: i32) -> Error {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/flag.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/flag.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/flag.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/flag.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,59 @@
-pub const CLONE_VM: usize = 0x100;
-pub const CLONE_FS: usize = 0x200;
-pub const CLONE_FILES: usize = 0x400;
-pub const CLONE_SIGHAND: usize = 0x800;
-pub const CLONE_VFORK: usize = 0x4000;
-pub const CLONE_THREAD: usize = 0x10000;
-pub const CLONE_STACK: usize = 0x1000_0000;
+use bitflags::bitflags as inner_bitflags;
+use core::{mem, ops::Deref, slice};
+
+macro_rules! bitflags {
+    (
+        $(#[$outer:meta])*
+        pub struct $BitFlags:ident: $T:ty {
+            $(
+                $(#[$inner:ident $($args:tt)*])*
+                const $Flag:ident = $value:expr;
+            )+
+        }
+    ) => {
+        // First, use the inner bitflags
+        inner_bitflags! {
+            #[derive(Default)]
+            $(#[$outer])*
+            pub struct $BitFlags: $T {
+                $(
+                    $(#[$inner $($args)*])*
+                    const $Flag = $value;
+                )+
+            }
+        }
+
+        // Secondly, re-export all inner constants
+        // (`pub use self::Struct::*` doesn't work)
+        $(
+            $(#[$inner $($args)*])*
+            pub const $Flag: $BitFlags = $BitFlags::$Flag;
+        )+
+    }
+}
+
+bitflags! {
+    pub struct CloneFlags: usize {
+        const CLONE_VM = 0x100;
+        const CLONE_FS = 0x200;
+        const CLONE_FILES = 0x400;
+        const CLONE_SIGHAND = 0x800;
+        const CLONE_VFORK = 0x4000;
+        const CLONE_THREAD = 0x10000;
+        const CLONE_STACK = 0x1000_0000;
+    }
+}
 
 pub const CLOCK_REALTIME: usize = 1;
 pub const CLOCK_MONOTONIC: usize = 4;
 
-pub const EVENT_NONE: usize = 0;
-pub const EVENT_READ: usize = 1;
-pub const EVENT_WRITE: usize = 2;
+bitflags! {
+    pub struct EventFlags: usize {
+        const EVENT_NONE = 0;
+        const EVENT_READ = 1;
+        const EVENT_WRITE = 2;
+    }
+}
 
 pub const F_DUPFD: usize = 0;
 pub const F_GETFD: usize = 1;
@@ -22,9 +64,23 @@
 pub const FUTEX_WAIT: usize = 0;
 pub const FUTEX_WAKE: usize = 1;
 pub const FUTEX_REQUEUE: usize = 2;
+pub const FUTEX_WAIT64: usize = 3;
 
-pub const MAP_SHARED: usize = 0x0001;
-pub const MAP_PRIVATE: usize = 0x0002;
+bitflags! {
+    pub struct MapFlags: usize {
+        const PROT_NONE = 0x0000_0000;
+        const PROT_EXEC = 0x0001_0000;
+        const PROT_WRITE = 0x0002_0000;
+        const PROT_READ = 0x0004_0000;
+
+        const MAP_SHARED = 0x0001;
+        const MAP_PRIVATE = 0x0002;
+
+        /// Only accepted for mmap2(2).
+        const MAP_FIXED = 0x0004;
+        const MAP_FIXED_NOREPLACE = 0x000C;
+    }
+}
 
 pub const MODE_TYPE: u16 = 0xF000;
 pub const MODE_DIR: u16 = 0x4000;
@@ -56,21 +112,129 @@
 pub const O_NOFOLLOW: usize =   0x8000_0000;
 pub const O_ACCMODE: usize =    O_RDONLY | O_WRONLY | O_RDWR;
 
-pub const PHYSMAP_WRITE: usize = 0x0000_0001;
-pub const PHYSMAP_WRITE_COMBINE: usize = 0x0000_0002;
-pub const PHYSMAP_NO_CACHE: usize = 0x0000_0004;
-
-pub const PROT_NONE: usize = 0x0000_0000;
-pub const PROT_EXEC: usize = 0x0001_0000;
-pub const PROT_WRITE: usize = 0x0002_0000;
-pub const PROT_READ: usize = 0x0004_0000;
-
-pub const PTRACE_CONT: u8 = 0b0000_0001;
-pub const PTRACE_SINGLESTEP: u8 = 0b0000_0010;
-pub const PTRACE_SYSCALL: u8 = 0b0000_0011;
-pub const PTRACE_WAIT: u8 = 0b0000_0100;
-pub const PTRACE_OPERATIONMASK: u8 = 0b0000_1111;
-pub const PTRACE_SYSEMU: u8 = 0b0001_0000;
+bitflags! {
+    pub struct PhysmapFlags: usize {
+        const PHYSMAP_WRITE = 0x0000_0001;
+        const PHYSMAP_WRITE_COMBINE = 0x0000_0002;
+        const PHYSMAP_NO_CACHE = 0x0000_0004;
+    }
+}
+bitflags! {
+    /// Extra flags for [`physalloc2`] or [`physalloc3`].
+    ///
+    /// [`physalloc2`]: ../call/fn.physalloc2.html
+    /// [`physalloc3`]: ../call/fn.physalloc3.html
+    pub struct PhysallocFlags: usize {
+        /// Only allocate memory within the 32-bit physical memory space. This is necessary for
+        /// some devices may not support 64-bit memory.
+        const SPACE_32 =        0x0000_0001;
+
+        /// The frame that will be allocated, is going to reside anywhere in 64-bit space. This
+        /// flag is redundant for the most part, except when overriding some other default.
+        const SPACE_64 =        0x0000_0002;
+
+        /// Do a "partial allocation", which means that not all of the frames specified in the
+        /// frame count `size` actually have to be allocated. This means that if the allocator was
+        /// unable to find a physical memory range large enough, it can instead return whatever
+        /// range it decides is optimal. Thus, instead of letting one driver get an expensive
+        /// 128MiB physical memory range when the physical memory has become fragmented, and
+        /// failing, it can instead be given a more optimal range. If the device supports
+        /// scatter-gather lists, then the driver only has to allocate more ranges, and the device
+        /// will do vectored I/O.
+        ///
+        /// PARTIAL_ALLOC supports different allocation strategies, refer to
+        /// [`Optimal`], [`GreatestRange`].
+        ///
+        /// [`Optimal`]: ./enum.PartialAllocStrategy.html
+        /// [`GreatestRange`]: ./enum.PartialAllocStrategy.html
+        const PARTIAL_ALLOC =   0x0000_0004;
+    }
+}
+
+/// The bitmask of the partial allocation strategy. Currently four different strategies are
+/// supported. If [`PARTIAL_ALLOC`] is not set, this bitmask is no longer reserved.
+pub const PARTIAL_ALLOC_STRATEGY_MASK: usize = 0x0003_0000;
+
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[repr(usize)]
+pub enum PartialAllocStrategy {
+    /// The allocator decides itself the size of the memory range, based on e.g. free memory ranges
+    /// and other processes which require large physical memory chunks.
+    Optimal = 0x0001_0000,
+
+    /// The allocator returns the absolute greatest range it can find.
+    GreatestRange = 0x0002_0000,
+
+    /// The allocator returns the first range that fits the minimum count, without searching extra.
+    Greedy = 0x0003_0000,
+}
+impl Default for PartialAllocStrategy {
+    fn default() -> Self {
+        Self::Optimal
+    }
+}
+
+impl PartialAllocStrategy {
+    pub fn from_raw(raw: usize) -> Option<Self> {
+        match raw {
+            0x0001_0000 => Some(Self::Optimal),
+            0x0002_0000 => Some(Self::GreatestRange),
+            0x0003_0000 => Some(Self::Greedy),
+            _ => None,
+        }
+    }
+}
+
+// The top 48 bits of PTRACE_* are reserved, for now
+
+bitflags! {
+    pub struct PtraceFlags: u64 {
+        /// Stop before a syscall is handled. Send PTRACE_FLAG_IGNORE to not
+        /// handle the syscall.
+        const PTRACE_STOP_PRE_SYSCALL = 0x0000_0000_0000_0001;
+        /// Stop after a syscall is handled.
+        const PTRACE_STOP_POST_SYSCALL = 0x0000_0000_0000_0002;
+        /// Stop after exactly one instruction. TODO: This may not handle
+        /// fexec/signal boundaries. Should it?
+        const PTRACE_STOP_SINGLESTEP = 0x0000_0000_0000_0004;
+        /// Stop before a signal is handled. Send PTRACE_FLAG_IGNORE to not
+        /// handle signal.
+        const PTRACE_STOP_SIGNAL = 0x0000_0000_0000_0008;
+        /// Stop on a software breakpoint, such as the int3 instruction for
+        /// x86_64.
+        const PTRACE_STOP_BREAKPOINT = 0x0000_0000_0000_0010;
+        /// Stop just before exiting for good.
+        const PTRACE_STOP_EXIT = 0x0000_0000_0000_0020;
+
+        const PTRACE_STOP_MASK = 0x0000_0000_0000_00FF;
+
+
+        /// Sent when a child is cloned, giving you the opportunity to trace it.
+        /// If you don't catch this, the child is started as normal.
+        const PTRACE_EVENT_CLONE = 0x0000_0000_0000_0100;
+
+        const PTRACE_EVENT_MASK = 0x0000_0000_0000_0F00;
+
+
+        /// Special meaning, depending on the event. Usually, when fired before
+        /// an action, it will skip performing that action.
+        const PTRACE_FLAG_IGNORE = 0x0000_0000_0000_1000;
+
+        const PTRACE_FLAG_MASK = 0x0000_0000_0000_F000;
+    }
+}
+impl Deref for PtraceFlags {
+    type Target = [u8];
+    fn deref(&self) -> &Self::Target {
+        // Same as to_ne_bytes but in-place
+        unsafe {
+            slice::from_raw_parts(
+                &self.bits as *const _ as *const u8,
+                mem::size_of::<u64>()
+            )
+        }
+    }
+}
 
 pub const SEEK_SET: usize = 0;
 pub const SEEK_CUR: usize = 1;
@@ -115,18 +279,33 @@
 pub const SIG_UNBLOCK: usize = 1;
 pub const SIG_SETMASK: usize = 2;
 
-pub const SA_NOCLDSTOP: usize = 0x00000001;
-pub const SA_NOCLDWAIT: usize = 0x00000002;
-pub const SA_SIGINFO: usize =   0x00000004;
-pub const SA_RESTORER: usize =  0x04000000;
-pub const SA_ONSTACK: usize =   0x08000000;
-pub const SA_RESTART: usize =   0x10000000;
-pub const SA_NODEFER: usize =   0x40000000;
-pub const SA_RESETHAND: usize = 0x80000000;
-
-pub const WNOHANG: usize =    0x01;
-pub const WUNTRACED: usize =  0x02;
-pub const WCONTINUED: usize = 0x08;
+bitflags! {
+    pub struct SigActionFlags: usize {
+        const SA_NOCLDSTOP = 0x00000001;
+        const SA_NOCLDWAIT = 0x00000002;
+        const SA_SIGINFO =   0x00000004;
+        const SA_RESTORER =  0x04000000;
+        const SA_ONSTACK =   0x08000000;
+        const SA_RESTART =   0x10000000;
+        const SA_NODEFER =   0x40000000;
+        const SA_RESETHAND = 0x80000000;
+    }
+}
+
+// Auxiliery vector types
+pub const AT_NULL: usize = 0;
+pub const AT_PHDR: usize = 3;
+pub const AT_PHENT: usize = 4;
+pub const AT_PHNUM: usize = 5;
+pub const AT_ENTRY: usize = 9;
+
+bitflags! {
+    pub struct WaitFlags: usize {
+        const WNOHANG =    0x01;
+        const WUNTRACED =  0x02;
+        const WCONTINUED = 0x08;
+    }
+}
 
 /// True if status indicates the child is stopped.
 pub fn wifstopped(status: usize) -> bool {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/io/dma.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/io/dma.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/io/dma.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/io/dma.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,76 +1,200 @@
-use core::{mem, ptr};
+use core::mem::{self, MaybeUninit};
 use core::ops::{Deref, DerefMut};
+use core::{ptr, slice};
 
-use Result;
+use crate::Result;
+use crate::{PartialAllocStrategy, PhysallocFlags};
 
-struct PhysBox {
+/// An RAII guard of a physical memory allocation. Currently all physically allocated memory are
+/// page-aligned and take up at least 4k of space (on x86_64).
+#[derive(Debug)]
+pub struct PhysBox {
     address: usize,
     size: usize
 }
 
 impl PhysBox {
-    fn new(size: usize) -> Result<PhysBox> {
-        let address = unsafe { ::physalloc(size)? };
-        Ok(PhysBox {
-            address: address,
-            size: size
+    /// Construct a PhysBox from an address and a size.
+    ///
+    /// # Safety
+    /// This function is unsafe because when dropping, Self has to a valid allocation.
+    pub unsafe fn from_raw_parts(address: usize, size: usize) -> Self {
+        Self {
+            address,
+            size,
+        }
+    }
+
+    /// Retrieve the byte address in physical memory, of this allocation.
+    pub fn address(&self) -> usize {
+        self.address
+    }
+
+    /// Retrieve the size in bytes of the alloc.
+    pub fn size(&self) -> usize {
+        self.size
+    }
+
+    /// Allocate physical memory that must reside in 32-bit space.
+    pub fn new_in_32bit_space(size: usize) -> Result<Self> {
+        Self::new_with_flags(size, PhysallocFlags::SPACE_32)
+    }
+
+    pub fn new_with_flags(size: usize, flags: PhysallocFlags) -> Result<Self> {
+        assert!(!flags.contains(PhysallocFlags::PARTIAL_ALLOC));
+
+        let address = unsafe { crate::physalloc2(size, flags.bits())? };
+        Ok(Self {
+            address,
+            size,
+        })
+    }
+
+    /// "Partially" allocate physical memory, in the sense that the allocation may be smaller than
+    /// expected, but still with a minimum limit. This is particularly useful when the physical
+    /// memory space is fragmented, and a device supports scatter-gather I/O. In that case, the
+    /// driver can optimistically request e.g. 1 alloc of 1 MiB, with the minimum of 512 KiB. If
+    /// that first allocation only returns half the size, the driver can do another allocation
+    /// and then let the device use both buffers.
+    pub fn new_partial_allocation(size: usize, flags: PhysallocFlags, strategy: Option<PartialAllocStrategy>, mut min: usize) -> Result<Self> {
+        debug_assert!(!(flags.contains(PhysallocFlags::PARTIAL_ALLOC) && strategy.is_none()));
+
+        let address = unsafe { crate::physalloc3(size, flags.bits() | strategy.map(|s| s as usize).unwrap_or(0), &mut min)? };
+        Ok(Self {
+            address,
+            size: min,
+        })
+    }
+
+    pub fn new(size: usize) -> Result<Self> {
+        let address = unsafe { crate::physalloc(size)? };
+        Ok(Self {
+            address,
+            size,
         })
     }
 }
 
 impl Drop for PhysBox {
     fn drop(&mut self) {
-        let _ = unsafe { ::physfree(self.address, self.size) };
+        let _ = unsafe { crate::physfree(self.address, self.size) };
     }
 }
 
-pub struct Dma<T> {
+pub struct Dma<T: ?Sized> {
     phys: PhysBox,
-    virt: *mut T
+    virt: *mut T,
 }
 
 impl<T> Dma<T> {
-    pub fn new(value: T) -> Result<Dma<T>> {
-        let phys = PhysBox::new(mem::size_of::<T>())?;
-        let virt = unsafe { ::physmap(phys.address, phys.size, ::PHYSMAP_WRITE)? } as *mut T;
-        unsafe { ptr::write(virt, value); }
+    pub fn from_physbox_uninit(phys: PhysBox) -> Result<Dma<MaybeUninit<T>>> {
+        let virt = unsafe { crate::physmap(phys.address, phys.size, crate::PHYSMAP_WRITE)? } as *mut MaybeUninit<T>;
+
         Ok(Dma {
-            phys: phys,
-            virt: virt
+            phys,
+            virt,
+        })
+    }
+    pub fn from_physbox_zeroed(phys: PhysBox) -> Result<Dma<MaybeUninit<T>>> {
+        let this = Self::from_physbox_uninit(phys)?;
+        unsafe { ptr::write_bytes(this.virt as *mut MaybeUninit<u8>, 0, this.phys.size) }
+        Ok(this)
+    }
+
+    pub fn from_physbox(phys: PhysBox, value: T) -> Result<Self> {
+        let this = Self::from_physbox_uninit(phys)?;
+
+        Ok(unsafe {
+            ptr::write(this.virt, MaybeUninit::new(value));
+            this.assume_init()
         })
     }
 
-    pub fn zeroed() -> Result<Dma<T>> {
+    pub fn new(value: T) -> Result<Self> {
+        let phys = PhysBox::new(mem::size_of::<T>())?;
+        Self::from_physbox(phys, value)
+    }
+    pub fn zeroed() -> Result<Dma<MaybeUninit<T>>> {
         let phys = PhysBox::new(mem::size_of::<T>())?;
-        let virt = unsafe { ::physmap(phys.address, phys.size, ::PHYSMAP_WRITE)? } as *mut T;
-        unsafe { ptr::write_bytes(virt as *mut u8, 0, phys.size); }
+        Self::from_physbox_zeroed(phys)
+    }
+}
+
+impl<T> Dma<MaybeUninit<T>> {
+    pub unsafe fn assume_init(self) -> Dma<T> {
+        let &Dma { phys: PhysBox { address, size }, virt } = &self;
+        mem::forget(self);
+
+        Dma {
+            phys: PhysBox { address, size },
+            virt: virt as *mut T,
+        }
+    }
+}
+impl<T: ?Sized> Dma<T> {
+    pub fn physical(&self) -> usize {
+        self.phys.address()
+    }
+    pub fn size(&self) -> usize {
+        self.phys.size()
+    }
+    pub fn phys(&self) -> &PhysBox {
+        &self.phys
+    }
+}
+
+impl<T> Dma<[T]> {
+    pub fn from_physbox_uninit_unsized(phys: PhysBox, len: usize) -> Result<Dma<[MaybeUninit<T>]>> {
+        let max_len = phys.size() / mem::size_of::<T>();
+        assert!(len <= max_len);
+
         Ok(Dma {
-            phys: phys,
-            virt: virt
+            virt: unsafe { slice::from_raw_parts_mut(crate::physmap(phys.address, phys.size, crate::PHYSMAP_WRITE)? as *mut MaybeUninit<T>, len) } as *mut [MaybeUninit<T>],
+            phys,
         })
     }
+    pub fn from_physbox_zeroed_unsized(phys: PhysBox, len: usize) -> Result<Dma<[MaybeUninit<T>]>> {
+        let this = Self::from_physbox_uninit_unsized(phys, len)?;
+        unsafe { ptr::write_bytes(this.virt as *mut MaybeUninit<u8>, 0, this.phys.size()) }
+        Ok(this)
+    }
+    /// Creates a new DMA buffer with a size only known at runtime.
+    /// ## Safety
+    /// * `T` must be properly aligned.
+    /// * `T` must be valid as zeroed (i.e. no NonNull pointers).
+    pub unsafe fn zeroed_unsized(count: usize) -> Result<Self> {
+        let phys = PhysBox::new(mem::size_of::<T>() * count)?;
+        Ok(Self::from_physbox_zeroed_unsized(phys, count)?.assume_init())
+    }
+}
+impl<T> Dma<[MaybeUninit<T>]> {
+    pub unsafe fn assume_init(self) -> Dma<[T]> {
+        let &Dma { phys: PhysBox { address, size }, virt } = &self;
+        mem::forget(self);
 
-    pub fn physical(&self) -> usize {
-        self.phys.address
+        Dma {
+            phys: PhysBox { address, size },
+            virt: virt as *mut [T],
+        }
     }
 }
 
-impl<T> Deref for Dma<T> {
+impl<T: ?Sized> Deref for Dma<T> {
     type Target = T;
     fn deref(&self) -> &T {
         unsafe { &*self.virt }
     }
 }
 
-impl<T> DerefMut for Dma<T> {
+impl<T: ?Sized> DerefMut for Dma<T> {
     fn deref_mut(&mut self) -> &mut T {
         unsafe { &mut *self.virt }
     }
 }
 
-impl<T> Drop for Dma<T> {
+impl<T: ?Sized> Drop for Dma<T> {
     fn drop(&mut self) {
-        unsafe { drop(ptr::read(self.virt)); }
-        let _ = unsafe { ::physunmap(self.virt as usize) };
+        unsafe { ptr::drop_in_place(self.virt) }
+        let _ = unsafe { crate::physunmap(self.virt as *mut u8 as usize) };
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/io/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/io/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/io/io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/io/io.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,17 +22,19 @@
     }
 }
 
-pub struct ReadOnly<I: Io> {
+pub struct ReadOnly<I> {
     inner: I
 }
 
-impl<I: Io> ReadOnly<I> {
+impl<I> ReadOnly<I> {
     pub const fn new(inner: I) -> ReadOnly<I> {
         ReadOnly {
             inner: inner
         }
     }
+}
 
+impl<I: Io> ReadOnly<I> {
     #[inline(always)]
     pub fn read(&self) -> I::Value {
         self.inner.read()
@@ -44,17 +46,19 @@
     }
 }
 
-pub struct WriteOnly<I: Io> {
+pub struct WriteOnly<I> {
     inner: I
 }
 
-impl<I: Io> WriteOnly<I> {
+impl<I> WriteOnly<I> {
     pub const fn new(inner: I) -> WriteOnly<I> {
         WriteOnly {
             inner: inner
         }
     }
+}
 
+impl<I: Io> WriteOnly<I> {
     #[inline(always)]
     pub fn write(&mut self, value: I::Value) {
         self.inner.write(value)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/io/mmio.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/io/mmio.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/io/mmio.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/io/mmio.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,33 @@
 use core::ptr::{read_volatile, write_volatile};
-use core::mem::uninitialized;
+use core::mem::MaybeUninit;
 use core::ops::{BitAnd, BitOr, Not};
 
 use super::io::Io;
 
 #[repr(packed)]
 pub struct Mmio<T> {
-    value: T,
+    value: MaybeUninit<T>,
 }
 
 impl<T> Mmio<T> {
     /// Create a new Mmio without initializing
+    #[deprecated = "unsound because it's possible to read even though it's uninitialized"]
     pub fn new() -> Self {
-        Mmio {
-            value: unsafe { uninitialized() }
+        unsafe { Self::uninit() }
+    }
+    pub unsafe fn zeroed() -> Self {
+        Self {
+            value: MaybeUninit::zeroed(),
+        }
+    }
+    pub unsafe fn uninit() -> Self {
+        Self {
+            value: MaybeUninit::uninit(),
+        }
+    }
+    pub const fn from(value: T) -> Self {
+        Self {
+            value: MaybeUninit::new(value),
         }
     }
 }
@@ -22,10 +36,10 @@
     type Value = T;
 
     fn read(&self) -> T {
-        unsafe { read_volatile(&self.value) }
+        unsafe { read_volatile(self.value.as_ptr()) }
     }
 
     fn write(&mut self, value: T) {
-        unsafe { write_volatile(&mut self.value, value) };
+        unsafe { write_volatile(self.value.as_mut_ptr(), value) };
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
+#![feature(asm)]
 #![feature(llvm_asm)]
-#![feature(const_fn)]
 #![cfg_attr(not(test), no_std)]
 
 #[cfg(test)]
@@ -14,23 +14,27 @@
 pub use self::number::*;
 pub use self::scheme::*;
 
-#[cfg(all(target_os = "redox", target_arch = "arm"))]
+#[cfg(all(any(target_os = "none", target_os = "redox"), target_arch = "arm"))]
 #[path="arch/arm.rs"]
 mod arch;
 
-#[cfg(all(target_os = "redox", target_arch = "aarch64"))]
+#[cfg(all(any(target_os = "none", target_os = "redox"), target_arch = "aarch64"))]
 #[path="arch/aarch64.rs"]
 mod arch;
 
-#[cfg(all(target_os = "redox", target_arch = "x86"))]
+#[cfg(all(any(target_os = "none", target_os = "redox"), target_arch = "riscv64"))]
+#[path="arch/riscv64.rs"]
+mod arch;
+
+#[cfg(all(any(target_os = "none", target_os = "redox"), target_arch = "x86"))]
 #[path="arch/x86.rs"]
 mod arch;
 
-#[cfg(all(target_os = "redox", target_arch = "x86_64"))]
+#[cfg(all(any(target_os = "none", target_os = "redox"), target_arch = "x86_64"))]
 #[path="arch/x86_64.rs"]
 mod arch;
 
-#[cfg(not(target_os = "redox"))]
+#[cfg(not(any(target_os = "none", target_os = "redox")))]
 #[path="arch/nonredox.rs"]
 mod arch;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/number.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/number.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/number.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/number.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,28 +16,29 @@
 pub const SYS_RMDIR: usize =    SYS_CLASS_PATH | 84;
 pub const SYS_UNLINK: usize =   SYS_CLASS_PATH | 10;
 
-pub const SYS_CLOSE: usize =    SYS_CLASS_FILE | 6;
-pub const SYS_DUP: usize =      SYS_CLASS_FILE | SYS_RET_FILE | 41;
-pub const SYS_DUP2: usize =     SYS_CLASS_FILE | SYS_RET_FILE | 63;
-pub const SYS_READ: usize =     SYS_CLASS_FILE | SYS_ARG_MSLICE | 3;
-pub const SYS_WRITE: usize =    SYS_CLASS_FILE | SYS_ARG_SLICE | 4;
-pub const SYS_LSEEK: usize =    SYS_CLASS_FILE | 19;
-pub const SYS_FCHMOD: usize =   SYS_CLASS_FILE | 94;
-pub const SYS_FCHOWN: usize =   SYS_CLASS_FILE | 207;
-pub const SYS_FCNTL: usize =    SYS_CLASS_FILE | 55;
-pub const SYS_FEVENT: usize =   SYS_CLASS_FILE | 927;
-pub const SYS_FEXEC: usize =    SYS_CLASS_FILE | 11;
-pub const SYS_FMAP: usize =     SYS_CLASS_FILE | SYS_ARG_SLICE | 90;
-pub const SYS_FUNMAP: usize =   SYS_CLASS_FILE | 91;
-pub const SYS_FPATH: usize =    SYS_CLASS_FILE | SYS_ARG_MSLICE | 928;
-pub const SYS_FRENAME: usize =  SYS_CLASS_FILE | SYS_ARG_PATH | 38;
-pub const SYS_FSTAT: usize =    SYS_CLASS_FILE | SYS_ARG_MSLICE | 28;
-pub const SYS_FSTATVFS: usize = SYS_CLASS_FILE | SYS_ARG_MSLICE | 100;
-pub const SYS_FSYNC: usize =    SYS_CLASS_FILE | 118;
-pub const SYS_FTRUNCATE: usize =SYS_CLASS_FILE | 93;
-pub const SYS_FUTIMENS: usize = SYS_CLASS_FILE | SYS_ARG_SLICE | 320;
+pub const SYS_CLOSE: usize =      SYS_CLASS_FILE | 6;
+pub const SYS_DUP: usize =        SYS_CLASS_FILE | SYS_RET_FILE | 41;
+pub const SYS_DUP2: usize =       SYS_CLASS_FILE | SYS_RET_FILE | 63;
+pub const SYS_READ: usize =       SYS_CLASS_FILE | SYS_ARG_MSLICE | 3;
+pub const SYS_WRITE: usize =      SYS_CLASS_FILE | SYS_ARG_SLICE | 4;
+pub const SYS_LSEEK: usize =      SYS_CLASS_FILE | 19;
+pub const SYS_FCHMOD: usize =     SYS_CLASS_FILE | 94;
+pub const SYS_FCHOWN: usize =     SYS_CLASS_FILE | 207;
+pub const SYS_FCNTL: usize =      SYS_CLASS_FILE | 55;
+pub const SYS_FEVENT: usize =     SYS_CLASS_FILE | 927;
+pub const SYS_FEXEC: usize =      SYS_CLASS_FILE | 11;
+pub const SYS_FMAP_OLD: usize =   SYS_CLASS_FILE | SYS_ARG_SLICE | 90;
+pub const SYS_FMAP: usize =       SYS_CLASS_FILE | SYS_ARG_SLICE | 900;
+pub const SYS_FUNMAP_OLD: usize = SYS_CLASS_FILE | 91;
+pub const SYS_FUNMAP: usize =     SYS_CLASS_FILE | 92;
+pub const SYS_FPATH: usize =      SYS_CLASS_FILE | SYS_ARG_MSLICE | 928;
+pub const SYS_FRENAME: usize =    SYS_CLASS_FILE | SYS_ARG_PATH | 38;
+pub const SYS_FSTAT: usize =      SYS_CLASS_FILE | SYS_ARG_MSLICE | 28;
+pub const SYS_FSTATVFS: usize =   SYS_CLASS_FILE | SYS_ARG_MSLICE | 100;
+pub const SYS_FSYNC: usize =      SYS_CLASS_FILE | 118;
+pub const SYS_FTRUNCATE: usize =  SYS_CLASS_FILE | 93;
+pub const SYS_FUTIMENS: usize =   SYS_CLASS_FILE | SYS_ARG_SLICE | 320;
 
-pub const SYS_BRK: usize =      45;
 pub const SYS_CHDIR: usize =    12;
 pub const SYS_CLOCK_GETTIME: usize = 265;
 pub const SYS_CLONE: usize =    120;
@@ -59,6 +60,7 @@
 pub const SYS_MKNS: usize =     984;
 pub const SYS_NANOSLEEP: usize =162;
 pub const SYS_PHYSALLOC: usize =945;
+pub const SYS_PHYSALLOC3: usize=9453;
 pub const SYS_PHYSFREE: usize = 946;
 pub const SYS_PHYSMAP: usize =  947;
 pub const SYS_PHYSUNMAP: usize =948;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/generate.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/generate.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/generate.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/generate.sh	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,10 @@
 sed 's/trait Scheme/trait SchemeBlock/' scheme.rs \
 | sed 's/fn handle(\&self, packet: \&mut Packet)/fn handle(\&self, packet: \&Packet) -> Option<usize>/' \
 | sed 's/packet.a = Error::mux(res);/res.transpose().map(Error::mux)/' \
-| sed 's/Result<usize>/Result<Option<usize>>/g' \
+| sed 's/\.map(|f| f\.bits())/\.map(|f| f.map(|f| f.bits()))/' \
+| sed 's/\.map(|o| o as usize)/.map(|o| o.map(|o| o as usize))/' \
+| sed 's/Ok(0)/Ok(Some(0))/g' \
+| sed 's/Result<\([^>]\+\)>/Result<Option<\1>>/g' \
 > scheme_block.rs
 
 echo "Generating SchemeBlockMut from SchemeBlock"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,18 @@
+use core::{slice, str};
+
 pub use self::scheme::Scheme;
 pub use self::scheme_mut::SchemeMut;
 pub use self::scheme_block::SchemeBlock;
 pub use self::scheme_block_mut::SchemeBlockMut;
+pub use self::seek::*;
+
+unsafe fn str_from_raw_parts(ptr: *const u8, len: usize) -> Option<&'static str> {
+    let slice = slice::from_raw_parts(ptr, len);
+    str::from_utf8(slice).ok()
+}
 
 mod scheme;
 mod scheme_mut;
 mod scheme_block;
 mod scheme_block_mut;
+mod seek;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_block_mut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_block_mut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_block_mut.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_block_mut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,61 @@
 use core::{mem, slice};
 
-use data::*;
-use error::*;
-use number::*;
+use crate::data::*;
+use crate::error::*;
+use crate::flag::*;
+use crate::number::*;
+use crate::scheme::str_from_raw_parts;
 
 pub trait SchemeBlockMut {
     fn handle(&mut self, packet: &Packet) -> Option<usize> {
         let res = match packet.a {
-            SYS_OPEN => self.open(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d, packet.uid, packet.gid),
-            SYS_CHMOD => self.chmod(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d as u16, packet.uid, packet.gid),
-            SYS_RMDIR => self.rmdir(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid),
-            SYS_UNLINK => self.unlink(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid),
+            SYS_OPEN => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.open(path, packet.d, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_CHMOD => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.chmod(path, packet.d as u16, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_RMDIR => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.rmdir(path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_UNLINK => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.unlink(path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
 
             SYS_DUP => self.dup(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }),
             SYS_READ => self.read(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
             SYS_WRITE => self.write(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }),
-            SYS_LSEEK => self.seek(packet.b, packet.c, packet.d),
+            SYS_LSEEK => self.seek(packet.b, packet.c as isize, packet.d).map(|o| o.map(|o| o as usize)),
             SYS_FCHMOD => self.fchmod(packet.b, packet.c as u16),
             SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
             SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
-            SYS_FEVENT => self.fevent(packet.b, packet.c),
+            SYS_FEVENT => self.fevent(packet.b, EventFlags::from_bits_truncate(packet.c)).map(|f| f.map(|f| f.bits())),
+            SYS_FMAP_OLD => if packet.d >= mem::size_of::<OldMap>() {
+                self.fmap_old(packet.b, unsafe { &*(packet.c as *const OldMap) })
+            } else {
+                Err(Error::new(EFAULT))
+            },
             SYS_FMAP => if packet.d >= mem::size_of::<Map>() {
                 self.fmap(packet.b, unsafe { &*(packet.c as *const Map) })
             } else {
                 Err(Error::new(EFAULT))
             },
-            SYS_FUNMAP => self.funmap(packet.b),
+            SYS_FUNMAP_OLD => self.funmap_old(packet.b),
+            SYS_FUNMAP => self.funmap(packet.b, packet.c),
             SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
-            SYS_FRENAME => self.frename(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }, packet.uid, packet.gid),
+            SYS_FRENAME => if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                self.frename(packet.b, path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
             SYS_FSTAT => if packet.d >= mem::size_of::<Stat>() {
                 self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) })
             } else {
@@ -55,22 +83,22 @@
     /* Scheme operations */
 
     #[allow(unused_variables)]
-    fn open(&mut self, path: &[u8], flags: usize, uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn open(&mut self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn chmod(&mut self, path: &[u8], mode: u16, uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn chmod(&mut self, path: &str, mode: u16, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn rmdir(&mut self, path: &[u8], uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn rmdir(&mut self, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn unlink(&mut self, path: &[u8], uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn unlink(&mut self, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(ENOENT))
     }
 
@@ -91,7 +119,7 @@
     }
 
     #[allow(unused_variables)]
-    fn seek(&mut self, id: usize, pos: usize, whence: usize) -> Result<Option<usize>> {
+    fn seek(&mut self, id: usize, pos: isize, whence: usize) -> Result<Option<isize>> {
         Err(Error::new(EBADF))
     }
 
@@ -111,18 +139,34 @@
     }
 
     #[allow(unused_variables)]
-    fn fevent(&mut self, id: usize, flags: usize) -> Result<Option<usize>> {
+    fn fevent(&mut self, id: usize, flags: EventFlags) -> Result<Option<EventFlags>> {
         Err(Error::new(EBADF))
     }
 
     #[allow(unused_variables)]
-    fn fmap(&mut self, id: usize, map: &Map) -> Result<Option<usize>> {
+    fn fmap_old(&mut self, id: usize, map: &OldMap) -> Result<Option<usize>> {
         Err(Error::new(EBADF))
     }
+    #[allow(unused_variables)]
+    fn fmap(&mut self, id: usize, map: &Map) -> Result<Option<usize>> {
+        if map.flags.contains(MapFlags::MAP_FIXED) {
+            return Err(Error::new(EINVAL));
+        }
+        self.fmap_old(id, &OldMap {
+            offset: map.offset,
+            size: map.size,
+            flags: map.flags,
+        })
+    }
 
     #[allow(unused_variables)]
-    fn funmap(&mut self, address: usize) -> Result<Option<usize>> {
-        Err(Error::new(EBADF))
+    fn funmap_old(&mut self, address: usize) -> Result<Option<usize>> {
+        Ok(Some(0))
+    }
+
+    #[allow(unused_variables)]
+    fn funmap(&mut self, address: usize, length: usize) -> Result<Option<usize>> {
+        Ok(Some(0))
     }
 
     #[allow(unused_variables)]
@@ -131,7 +175,7 @@
     }
 
     #[allow(unused_variables)]
-    fn frename(&mut self, id: usize, path: &[u8], uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn frename(&mut self, id: usize, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(EBADF))
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_block.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_block.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_block.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_block.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,61 @@
 use core::{mem, slice};
 
-use data::*;
-use error::*;
-use number::*;
+use crate::data::*;
+use crate::error::*;
+use crate::flag::*;
+use crate::number::*;
+use crate::scheme::str_from_raw_parts;
 
 pub trait SchemeBlock {
     fn handle(&self, packet: &Packet) -> Option<usize> {
         let res = match packet.a {
-            SYS_OPEN => self.open(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d, packet.uid, packet.gid),
-            SYS_CHMOD => self.chmod(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d as u16, packet.uid, packet.gid),
-            SYS_RMDIR => self.rmdir(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid),
-            SYS_UNLINK => self.unlink(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid),
+            SYS_OPEN => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.open(path, packet.d, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_CHMOD => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.chmod(path, packet.d as u16, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_RMDIR => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.rmdir(path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_UNLINK => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.unlink(path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
 
             SYS_DUP => self.dup(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }),
             SYS_READ => self.read(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
             SYS_WRITE => self.write(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }),
-            SYS_LSEEK => self.seek(packet.b, packet.c, packet.d),
+            SYS_LSEEK => self.seek(packet.b, packet.c as isize, packet.d).map(|o| o.map(|o| o as usize)),
             SYS_FCHMOD => self.fchmod(packet.b, packet.c as u16),
             SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
             SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
-            SYS_FEVENT => self.fevent(packet.b, packet.c),
+            SYS_FEVENT => self.fevent(packet.b, EventFlags::from_bits_truncate(packet.c)).map(|f| f.map(|f| f.bits())),
+            SYS_FMAP_OLD => if packet.d >= mem::size_of::<OldMap>() {
+                self.fmap_old(packet.b, unsafe { &*(packet.c as *const OldMap) })
+            } else {
+                Err(Error::new(EFAULT))
+            },
             SYS_FMAP => if packet.d >= mem::size_of::<Map>() {
                 self.fmap(packet.b, unsafe { &*(packet.c as *const Map) })
             } else {
                 Err(Error::new(EFAULT))
             },
-            SYS_FUNMAP => self.funmap(packet.b),
+            SYS_FUNMAP_OLD => self.funmap_old(packet.b),
+            SYS_FUNMAP => self.funmap(packet.b, packet.c),
             SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
-            SYS_FRENAME => self.frename(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }, packet.uid, packet.gid),
+            SYS_FRENAME => if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                self.frename(packet.b, path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
             SYS_FSTAT => if packet.d >= mem::size_of::<Stat>() {
                 self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) })
             } else {
@@ -55,22 +83,22 @@
     /* Scheme operations */
 
     #[allow(unused_variables)]
-    fn open(&self, path: &[u8], flags: usize, uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn open(&self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn chmod(&self, path: &[u8], mode: u16, uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn chmod(&self, path: &str, mode: u16, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn rmdir(&self, path: &[u8], uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn rmdir(&self, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn unlink(&self, path: &[u8], uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn unlink(&self, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(ENOENT))
     }
 
@@ -91,7 +119,7 @@
     }
 
     #[allow(unused_variables)]
-    fn seek(&self, id: usize, pos: usize, whence: usize) -> Result<Option<usize>> {
+    fn seek(&self, id: usize, pos: isize, whence: usize) -> Result<Option<isize>> {
         Err(Error::new(EBADF))
     }
 
@@ -111,18 +139,34 @@
     }
 
     #[allow(unused_variables)]
-    fn fevent(&self, id: usize, flags: usize) -> Result<Option<usize>> {
+    fn fevent(&self, id: usize, flags: EventFlags) -> Result<Option<EventFlags>> {
         Err(Error::new(EBADF))
     }
 
     #[allow(unused_variables)]
-    fn fmap(&self, id: usize, map: &Map) -> Result<Option<usize>> {
+    fn fmap_old(&self, id: usize, map: &OldMap) -> Result<Option<usize>> {
         Err(Error::new(EBADF))
     }
+    #[allow(unused_variables)]
+    fn fmap(&self, id: usize, map: &Map) -> Result<Option<usize>> {
+        if map.flags.contains(MapFlags::MAP_FIXED) {
+            return Err(Error::new(EINVAL));
+        }
+        self.fmap_old(id, &OldMap {
+            offset: map.offset,
+            size: map.size,
+            flags: map.flags,
+        })
+    }
 
     #[allow(unused_variables)]
-    fn funmap(&self, address: usize) -> Result<Option<usize>> {
-        Err(Error::new(EBADF))
+    fn funmap_old(&self, address: usize) -> Result<Option<usize>> {
+        Ok(Some(0))
+    }
+
+    #[allow(unused_variables)]
+    fn funmap(&self, address: usize, length: usize) -> Result<Option<usize>> {
+        Ok(Some(0))
     }
 
     #[allow(unused_variables)]
@@ -131,7 +175,7 @@
     }
 
     #[allow(unused_variables)]
-    fn frename(&self, id: usize, path: &[u8], uid: u32, gid: u32) -> Result<Option<usize>> {
+    fn frename(&self, id: usize, path: &str, uid: u32, gid: u32) -> Result<Option<usize>> {
         Err(Error::new(EBADF))
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_mut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_mut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_mut.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme_mut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,61 @@
 use core::{mem, slice};
 
-use data::*;
-use error::*;
-use number::*;
+use crate::data::*;
+use crate::error::*;
+use crate::flag::*;
+use crate::number::*;
+use crate::scheme::str_from_raw_parts;
 
 pub trait SchemeMut {
     fn handle(&mut self, packet: &mut Packet) {
         let res = match packet.a {
-            SYS_OPEN => self.open(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d, packet.uid, packet.gid),
-            SYS_CHMOD => self.chmod(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d as u16, packet.uid, packet.gid),
-            SYS_RMDIR => self.rmdir(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid),
-            SYS_UNLINK => self.unlink(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid),
+            SYS_OPEN => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.open(path, packet.d, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_CHMOD => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.chmod(path, packet.d as u16, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_RMDIR => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.rmdir(path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_UNLINK => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.unlink(path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
 
             SYS_DUP => self.dup(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }),
             SYS_READ => self.read(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
             SYS_WRITE => self.write(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }),
-            SYS_LSEEK => self.seek(packet.b, packet.c, packet.d),
+            SYS_LSEEK => self.seek(packet.b, packet.c as isize, packet.d).map(|o| o as usize),
             SYS_FCHMOD => self.fchmod(packet.b, packet.c as u16),
             SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
             SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
-            SYS_FEVENT => self.fevent(packet.b, packet.c),
+            SYS_FEVENT => self.fevent(packet.b, EventFlags::from_bits_truncate(packet.c)).map(|f| f.bits()),
+            SYS_FMAP_OLD => if packet.d >= mem::size_of::<OldMap>() {
+                self.fmap_old(packet.b, unsafe { &*(packet.c as *const OldMap) })
+            } else {
+                Err(Error::new(EFAULT))
+            },
             SYS_FMAP => if packet.d >= mem::size_of::<Map>() {
                 self.fmap(packet.b, unsafe { &*(packet.c as *const Map) })
             } else {
                 Err(Error::new(EFAULT))
             },
-            SYS_FUNMAP => self.funmap(packet.b),
+            SYS_FUNMAP_OLD => self.funmap_old(packet.b),
+            SYS_FUNMAP => self.funmap(packet.b, packet.c),
             SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
-            SYS_FRENAME => self.frename(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }, packet.uid, packet.gid),
+            SYS_FRENAME => if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                self.frename(packet.b, path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
             SYS_FSTAT => if packet.d >= mem::size_of::<Stat>() {
                 self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) })
             } else {
@@ -55,22 +83,22 @@
     /* Scheme operations */
 
     #[allow(unused_variables)]
-    fn open(&mut self, path: &[u8], flags: usize, uid: u32, gid: u32) -> Result<usize> {
+    fn open(&mut self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn chmod(&mut self, path: &[u8], mode: u16, uid: u32, gid: u32) -> Result<usize> {
+    fn chmod(&mut self, path: &str, mode: u16, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn rmdir(&mut self, path: &[u8], uid: u32, gid: u32) -> Result<usize> {
+    fn rmdir(&mut self, path: &str, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn unlink(&mut self, path: &[u8], uid: u32, gid: u32) -> Result<usize> {
+    fn unlink(&mut self, path: &str, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(ENOENT))
     }
 
@@ -91,7 +119,7 @@
     }
 
     #[allow(unused_variables)]
-    fn seek(&mut self, id: usize, pos: usize, whence: usize) -> Result<usize> {
+    fn seek(&mut self, id: usize, pos: isize, whence: usize) -> Result<isize> {
         Err(Error::new(EBADF))
     }
 
@@ -111,18 +139,34 @@
     }
 
     #[allow(unused_variables)]
-    fn fevent(&mut self, id: usize, flags: usize) -> Result<usize> {
+    fn fevent(&mut self, id: usize, flags: EventFlags) -> Result<EventFlags> {
         Err(Error::new(EBADF))
     }
 
     #[allow(unused_variables)]
-    fn fmap(&mut self, id: usize, map: &Map) -> Result<usize> {
+    fn fmap_old(&mut self, id: usize, map: &OldMap) -> Result<usize> {
         Err(Error::new(EBADF))
     }
+    #[allow(unused_variables)]
+    fn fmap(&mut self, id: usize, map: &Map) -> Result<usize> {
+        if map.flags.contains(MapFlags::MAP_FIXED) {
+            return Err(Error::new(EINVAL));
+        }
+        self.fmap_old(id, &OldMap {
+            offset: map.offset,
+            size: map.size,
+            flags: map.flags,
+        })
+    }
 
     #[allow(unused_variables)]
-    fn funmap(&mut self, address: usize) -> Result<usize> {
-        Err(Error::new(EBADF))
+    fn funmap_old(&mut self, address: usize) -> Result<usize> {
+        Ok(0)
+    }
+
+    #[allow(unused_variables)]
+    fn funmap(&mut self, address: usize, length: usize) -> Result<usize> {
+        Ok(0)
     }
 
     #[allow(unused_variables)]
@@ -131,7 +175,7 @@
     }
 
     #[allow(unused_variables)]
-    fn frename(&mut self, id: usize, path: &[u8], uid: u32, gid: u32) -> Result<usize> {
+    fn frename(&mut self, id: usize, path: &str, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(EBADF))
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/scheme.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,61 @@
 use core::{mem, slice};
 
-use data::*;
-use error::*;
-use number::*;
+use crate::data::*;
+use crate::error::*;
+use crate::flag::*;
+use crate::number::*;
+use crate::scheme::str_from_raw_parts;
 
 pub trait Scheme {
     fn handle(&self, packet: &mut Packet) {
         let res = match packet.a {
-            SYS_OPEN => self.open(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d, packet.uid, packet.gid),
-            SYS_CHMOD => self.chmod(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.d as u16, packet.uid, packet.gid),
-            SYS_RMDIR => self.rmdir(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid),
-            SYS_UNLINK => self.unlink(unsafe { slice::from_raw_parts(packet.b as *const u8, packet.c) }, packet.uid, packet.gid),
+            SYS_OPEN => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.open(path, packet.d, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_CHMOD => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.chmod(path, packet.d as u16, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_RMDIR => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.rmdir(path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
+            SYS_UNLINK => if let Some(path) = unsafe { str_from_raw_parts(packet.b as *const u8, packet.c) } {
+                self.unlink(path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
 
             SYS_DUP => self.dup(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }),
             SYS_READ => self.read(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
             SYS_WRITE => self.write(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }),
-            SYS_LSEEK => self.seek(packet.b, packet.c, packet.d),
+            SYS_LSEEK => self.seek(packet.b, packet.c as isize, packet.d).map(|o| o as usize),
             SYS_FCHMOD => self.fchmod(packet.b, packet.c as u16),
             SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
             SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
-            SYS_FEVENT => self.fevent(packet.b, packet.c),
+            SYS_FEVENT => self.fevent(packet.b, EventFlags::from_bits_truncate(packet.c)).map(|f| f.bits()),
+            SYS_FMAP_OLD => if packet.d >= mem::size_of::<OldMap>() {
+                self.fmap_old(packet.b, unsafe { &*(packet.c as *const OldMap) })
+            } else {
+                Err(Error::new(EFAULT))
+            },
             SYS_FMAP => if packet.d >= mem::size_of::<Map>() {
                 self.fmap(packet.b, unsafe { &*(packet.c as *const Map) })
             } else {
                 Err(Error::new(EFAULT))
             },
-            SYS_FUNMAP => self.funmap(packet.b),
+            SYS_FUNMAP_OLD => self.funmap_old(packet.b),
+            SYS_FUNMAP => self.funmap(packet.b, packet.c),
             SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
-            SYS_FRENAME => self.frename(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }, packet.uid, packet.gid),
+            SYS_FRENAME => if let Some(path) = unsafe { str_from_raw_parts(packet.c as *const u8, packet.d) } {
+                self.frename(packet.b, path, packet.uid, packet.gid)
+            } else {
+                Err(Error::new(EINVAL))
+            },
             SYS_FSTAT => if packet.d >= mem::size_of::<Stat>() {
                 self.fstat(packet.b, unsafe { &mut *(packet.c as *mut Stat) })
             } else {
@@ -55,22 +83,22 @@
     /* Scheme operations */
 
     #[allow(unused_variables)]
-    fn open(&self, path: &[u8], flags: usize, uid: u32, gid: u32) -> Result<usize> {
+    fn open(&self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn chmod(&self, path: &[u8], mode: u16, uid: u32, gid: u32) -> Result<usize> {
+    fn chmod(&self, path: &str, mode: u16, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn rmdir(&self, path: &[u8], uid: u32, gid: u32) -> Result<usize> {
+    fn rmdir(&self, path: &str, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(ENOENT))
     }
 
     #[allow(unused_variables)]
-    fn unlink(&self, path: &[u8], uid: u32, gid: u32) -> Result<usize> {
+    fn unlink(&self, path: &str, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(ENOENT))
     }
 
@@ -91,7 +119,7 @@
     }
 
     #[allow(unused_variables)]
-    fn seek(&self, id: usize, pos: usize, whence: usize) -> Result<usize> {
+    fn seek(&self, id: usize, pos: isize, whence: usize) -> Result<isize> {
         Err(Error::new(EBADF))
     }
 
@@ -111,18 +139,34 @@
     }
 
     #[allow(unused_variables)]
-    fn fevent(&self, id: usize, flags: usize) -> Result<usize> {
+    fn fevent(&self, id: usize, flags: EventFlags) -> Result<EventFlags> {
         Err(Error::new(EBADF))
     }
 
     #[allow(unused_variables)]
-    fn fmap(&self, id: usize, map: &Map) -> Result<usize> {
+    fn fmap_old(&self, id: usize, map: &OldMap) -> Result<usize> {
         Err(Error::new(EBADF))
     }
+    #[allow(unused_variables)]
+    fn fmap(&self, id: usize, map: &Map) -> Result<usize> {
+        if map.flags.contains(MapFlags::MAP_FIXED) {
+            return Err(Error::new(EINVAL));
+        }
+        self.fmap_old(id, &OldMap {
+            offset: map.offset,
+            size: map.size,
+            flags: map.flags,
+        })
+    }
 
     #[allow(unused_variables)]
-    fn funmap(&self, address: usize) -> Result<usize> {
-        Err(Error::new(EBADF))
+    fn funmap_old(&self, address: usize) -> Result<usize> {
+        Ok(0)
+    }
+
+    #[allow(unused_variables)]
+    fn funmap(&self, address: usize, length: usize) -> Result<usize> {
+        Ok(0)
     }
 
     #[allow(unused_variables)]
@@ -131,7 +175,7 @@
     }
 
     #[allow(unused_variables)]
-    fn frename(&self, id: usize, path: &[u8], uid: u32, gid: u32) -> Result<usize> {
+    fn frename(&self, id: usize, path: &str, uid: u32, gid: u32) -> Result<usize> {
         Err(Error::new(EBADF))
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/seek.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/seek.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/scheme/seek.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/scheme/seek.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+use core::cmp;
+use core::convert::TryFrom;
+use crate::error::*;
+use crate::flag::*;
+
+/// Helper for seek calls
+/// In most cases it's easier to use a usize to track the offset and buffer size internally,
+/// but the seek interface uses isize.  This wrapper ensures EOVERFLOW errors are returned
+/// as appropriate if the value in the usize can't fit in the isize.
+pub fn calc_seek_offset_usize(cur_offset: usize, pos: isize, whence: usize, buf_len: usize) -> Result<isize> {
+    let cur_offset = isize::try_from(cur_offset).or_else(|_| Err(Error::new(EOVERFLOW)))?;
+    let buf_len = isize::try_from(buf_len).or_else(|_| Err(Error::new(EOVERFLOW)))?;
+    calc_seek_offset_isize(cur_offset, pos, whence, buf_len)
+}
+
+/// Helper for seek calls
+/// Result is guaranteed to be positive.
+/// EOVERFLOW returned if the arguments would cause an overflow.
+/// EINVAL returned if the new offset is out of bounds.
+pub fn calc_seek_offset_isize(cur_offset: isize, pos: isize, whence: usize, buf_len: isize) -> Result<isize> {
+    let new_offset = match whence {
+        SEEK_CUR => pos.checked_add(cur_offset),
+        SEEK_END => pos.checked_add(buf_len),
+        SEEK_SET => Some(pos),
+        _ => None,
+    };
+
+    match new_offset {
+        Some(new_offset) if new_offset < 0 => Err(Error::new(EINVAL)),
+        Some(new_offset) => Ok(cmp::min(new_offset, buf_len)),
+        None => Err(Error::new(EOVERFLOW))
+    }
+}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_syscall/src/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_syscall/src/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,25 @@
 #[test]
-fn brk() {
-    unsafe {
-        let start = dbg!(crate::brk(0)).unwrap();
-        let end = start + 4 * 1024 * 1024;
-        assert_eq!(dbg!(crate::brk(end)), Ok(end));
+fn chdir() {
+    use std::str;
+
+    let mut current_buf = [0; 4096];
+    let current_count = dbg!(crate::getcwd(&mut current_buf)).unwrap();
+    let current = dbg!(str::from_utf8(&current_buf[..current_count])).unwrap();
+
+    let new = "file:";
+    assert_eq!(dbg!(crate::chdir(dbg!(new))), Ok(0));
+    {
+        let mut buf = [0; 4096];
+        let count = dbg!(crate::getcwd(&mut buf)).unwrap();
+        assert_eq!(dbg!(str::from_utf8(&buf[..count])), Ok(new));
     }
-}
 
-#[test]
-fn chdir() {
-    //TODO: Verify CWD
-    assert_eq!(dbg!(crate::chdir("file:/")), Ok(0));
-    assert_eq!(dbg!(crate::chdir("file:/root")), Ok(0));
+    assert_eq!(dbg!(crate::chdir(current)), Ok(0));
+    {
+        let mut buf = [0; 4096];
+        let count = dbg!(crate::getcwd(&mut buf)).unwrap();
+        assert_eq!(dbg!(str::from_utf8(&buf[..count])), Ok(current));
+    }
 }
 
 //TODO: chmod
@@ -19,14 +27,14 @@
 #[test]
 fn clone() {
     let expected_status = 42;
-    let pid_res = unsafe { crate::clone(0) };
+    let pid_res = unsafe { crate::clone(crate::CloneFlags::empty()) };
     if pid_res == Ok(0) {
         crate::exit(expected_status).unwrap();
         panic!("failed to exit");
     } else {
         let pid = dbg!(pid_res).unwrap();
         let mut status = 0;
-        assert_eq!(dbg!(crate::waitpid(pid, &mut status, 0)), Ok(pid));
+        assert_eq!(dbg!(crate::waitpid(pid, &mut status, crate::WaitFlags::empty())), Ok(pid));
         assert_eq!(dbg!(crate::wifexited(status)), true);
         assert_eq!(dbg!(crate::wexitstatus(status)), expected_status);
     }
@@ -61,7 +69,7 @@
 
 #[test]
 fn fexec() {
-    let name = "/bin/ls";
+    let name = "file:/bin/ls";
 
     let fd = dbg!(
         crate::open(name, crate::O_RDONLY | crate::O_CLOEXEC)
@@ -73,7 +81,7 @@
 
     let vars = &[];
 
-    let pid_res = unsafe { crate::clone(0) };
+    let pid_res = unsafe { crate::clone(crate::CloneFlags::empty()) };
     if pid_res == Ok(0) {
         crate::fexec(fd, args, vars).unwrap();
         panic!("failed to fexec");
@@ -82,7 +90,7 @@
 
         let pid = dbg!(pid_res).unwrap();
         let mut status = 0;
-        assert_eq!(dbg!(crate::waitpid(pid, &mut status, 0)), Ok(pid));
+        assert_eq!(dbg!(crate::waitpid(pid, &mut status, crate::WaitFlags::empty())), Ok(pid));
         assert_eq!(dbg!(crate::wifexited(status)), true);
         assert_eq!(dbg!(crate::wexitstatus(status)), 0);
     }
@@ -94,17 +102,20 @@
 
     let fd = dbg!(
         crate::open(
-            "/tmp/syscall-tests-fmap",
+            "file:/tmp/syscall-tests-fmap",
             crate::O_CREAT | crate::O_RDWR | crate::O_CLOEXEC
         )
     ).unwrap();
 
+    let size = 128;
+
     let map = unsafe {
         slice::from_raw_parts_mut(
             dbg!(
                 crate::fmap(fd, &crate::Map {
+                    address: 0,
                     offset: 0,
-                    size: 128,
+                    size,
                     flags: crate::PROT_READ | crate::PROT_WRITE
                 })
             ).unwrap() as *mut u8,
@@ -123,7 +134,337 @@
     //TODO: add msync
     unsafe {
         assert_eq!(dbg!(
-            crate::funmap(map.as_mut_ptr() as usize)
+            crate::funmap(map.as_mut_ptr() as usize, size)
         ), Ok(0));
     }
 }
+
+// funmap tested by fmap
+
+#[test]
+fn fpath() {
+    use std::str;
+
+    let path = "file:/tmp/syscall-tests-fpath";
+    let fd = dbg!(
+        crate::open(
+            dbg!(path),
+            crate::O_CREAT | crate::O_RDWR | crate::O_CLOEXEC
+        )
+    ).unwrap();
+
+    let mut buf = [0; 4096];
+    let count = dbg!(
+        crate::fpath(fd, &mut buf)
+    ).unwrap();
+
+    assert_eq!(dbg!(str::from_utf8(&buf[..count])), Ok(path));
+
+    assert_eq!(dbg!(crate::close(fd)), Ok(0));
+}
+
+//TODO: frename
+
+#[test]
+fn fstat() {
+    let path = "file:/tmp/syscall-tests-fstat";
+    let fd = dbg!(
+        crate::open(
+            dbg!(path),
+            crate::O_CREAT | crate::O_RDWR | crate::O_CLOEXEC
+        )
+    ).unwrap();
+
+    let mut stat = crate::Stat::default();
+    assert_eq!(dbg!(crate::fstat(fd, &mut stat)), Ok(0));
+    assert_ne!(dbg!(stat), crate::Stat::default());
+
+    assert_eq!(dbg!(crate::close(fd)), Ok(0));
+}
+
+#[test]
+fn fstatvfs() {
+    let path = "file:/tmp/syscall-tests-fstatvfs";
+    let fd = dbg!(
+        crate::open(
+            dbg!(path),
+            crate::O_CREAT | crate::O_RDWR | crate::O_CLOEXEC
+        )
+    ).unwrap();
+
+    let mut statvfs = crate::StatVfs::default();
+    assert_eq!(dbg!(crate::fstatvfs(fd, &mut statvfs)), Ok(0));
+    assert_ne!(dbg!(statvfs), crate::StatVfs::default());
+
+    assert_eq!(dbg!(crate::close(fd)), Ok(0));
+}
+
+//TODO: fsync
+
+//TODO: ftruncate
+
+//TODO: futimens
+
+//TODO: futex
+
+// getcwd tested by chdir
+
+#[test]
+fn getegid() {
+    assert_eq!(crate::getegid(), Ok(0));
+}
+
+#[test]
+fn getens() {
+    assert_eq!(crate::getens(), Ok(1));
+}
+
+#[test]
+fn geteuid() {
+    assert_eq!(crate::geteuid(), Ok(0));
+}
+
+#[test]
+fn getgid() {
+    assert_eq!(crate::getgid(), Ok(0));
+}
+
+#[test]
+fn getns() {
+    assert_eq!(crate::getns(), Ok(1));
+}
+
+//TODO: getpid
+
+//TODO: getpgid
+
+//TODO: getppid
+
+#[test]
+fn getuid() {
+    assert_eq!(crate::getuid(), Ok(0));
+}
+
+//TODO: iopl
+
+//TODO: kill
+
+//TODO: link (probably will not work)
+
+#[test]
+fn lseek() {
+    let path = "file:/tmp/syscall-tests-lseek";
+    let fd = dbg!(
+        crate::open(
+            dbg!(path),
+            crate::O_CREAT | crate::O_RDWR | crate::O_CLOEXEC
+        )
+    ).unwrap();
+
+    {
+        let mut buf = [0; 256];
+        for i in 0..buf.len() {
+            buf[i] = i as u8;
+        }
+        assert_eq!(dbg!(crate::write(fd, &buf)), Ok(buf.len()));
+
+        assert_eq!(dbg!(crate::lseek(fd, 0, crate::SEEK_CUR)), Ok(buf.len()));
+        assert_eq!(dbg!(crate::lseek(fd, 0, crate::SEEK_SET)), Ok(0));
+        assert_eq!(dbg!(crate::lseek(fd, 0, crate::SEEK_END)), Ok(buf.len()));
+        assert_eq!(dbg!(crate::lseek(fd, 0, crate::SEEK_SET)), Ok(0));
+    }
+
+    {
+        let mut buf = [0; 256];
+        assert_eq!(dbg!(crate::read(fd, &mut buf)), Ok(buf.len()));
+        for i in 0..buf.len() {
+            assert_eq!(buf[i], i as u8);
+        }
+
+        assert_eq!(dbg!(crate::lseek(fd, 0, crate::SEEK_CUR)), Ok(buf.len()));
+        assert_eq!(dbg!(crate::lseek(fd, 0, crate::SEEK_SET)), Ok(0));
+        assert_eq!(dbg!(crate::lseek(fd, 0, crate::SEEK_END)), Ok(buf.len()));
+        assert_eq!(dbg!(crate::lseek(fd, 0, crate::SEEK_SET)), Ok(0));
+    }
+
+    assert_eq!(dbg!(crate::close(fd)), Ok(0));
+}
+
+//TODO: mkns
+
+//TODO: mprotect
+
+#[test]
+fn nanosleep() {
+    let req = crate::TimeSpec {
+        tv_sec: 0,
+        tv_nsec: 0,
+    };
+    let mut rem = crate::TimeSpec::default();
+    assert_eq!(crate::nanosleep(&req, &mut rem), Ok(0));
+    assert_eq!(rem, crate::TimeSpec::default());
+}
+
+//TODO: open
+
+//TODO: physalloc
+
+//TODO: physfree
+
+//TODO: physmap
+
+//TODO: physunmap
+
+#[test]
+fn pipe2() {
+    let mut fds = [0, 0];
+    assert_eq!(dbg!(crate::pipe2(&mut fds, crate::O_CLOEXEC)), Ok(0));
+    assert_ne!(dbg!(fds), [0, 0]);
+
+    {
+        let mut buf = [0; 256];
+        for i in 0..buf.len() {
+            buf[i] = i as u8;
+        }
+        assert_eq!(dbg!(crate::write(fds[1], &buf)), Ok(buf.len()));
+    }
+
+    {
+        let mut buf = [0; 256];
+        assert_eq!(dbg!(crate::read(fds[0], &mut buf)), Ok(buf.len()));
+        for i in 0..buf.len() {
+            assert_eq!(buf[i], i as u8);
+        }
+    }
+
+    assert_eq!(dbg!(crate::close(fds[0])), Ok(0));
+    assert_eq!(dbg!(crate::close(fds[1])), Ok(0));
+}
+
+//TODO: read
+
+#[test]
+fn rmdir() {
+    let path = "file:/tmp/syscall-tests-rmdir";
+    let fd = dbg!(
+        crate::open(
+            dbg!(path),
+            crate::O_CREAT | crate::O_DIRECTORY | crate::O_CLOEXEC
+        )
+    ).unwrap();
+
+    assert_eq!(dbg!(crate::close(fd)), Ok(0));
+
+    assert_eq!(dbg!(crate::rmdir(path)), Ok(0));
+}
+
+//TODO: setpgid
+
+//TODO: setregid
+
+//TODO: setrens
+
+//TODO: setreuid
+
+//TODO: sigaction
+
+//TODO: sigprocmask
+
+//TODO: sigreturn
+
+#[test]
+fn umask() {
+    let old = dbg!(crate::umask(0o244)).unwrap();
+    assert_eq!(dbg!(crate::umask(old)), Ok(0o244));
+}
+
+#[test]
+fn unlink() {
+    let path = "file:/tmp/syscall-tests-unlink";
+    let fd = dbg!(
+        crate::open(
+            dbg!(path),
+            crate::O_CREAT | crate::O_RDWR | crate::O_CLOEXEC
+        )
+    ).unwrap();
+
+    assert_eq!(dbg!(crate::close(fd)), Ok(0));
+
+    assert_eq!(dbg!(crate::unlink(path)), Ok(0));
+}
+
+//TODO: virttophys
+
+// waitpid tested by clone
+
+//TODO: write
+
+#[test]
+fn sched_yield() {
+    assert_eq!(dbg!(crate::sched_yield()), Ok(0));
+}
+
+#[test]
+fn sigaction() {
+    use std::{
+        mem,
+        sync::atomic::{AtomicBool, Ordering}
+    };
+
+    static SA_HANDLER_WAS_RAN: AtomicBool = AtomicBool::new(false);
+    static SA_HANDLER_2_WAS_IGNORED: AtomicBool = AtomicBool::new(false);
+
+    let child = unsafe { crate::clone(crate::CLONE_VM).unwrap() };
+
+    if child == 0 {
+        let pid = crate::getpid().unwrap();
+
+        extern "C" fn hello_im_a_signal_handler(signal: usize) {
+            assert_eq!(signal, crate::SIGUSR1);
+            SA_HANDLER_WAS_RAN.store(true, Ordering::SeqCst);
+        }
+
+        let my_signal_handler = crate::SigAction {
+            sa_handler: Some(hello_im_a_signal_handler),
+            ..Default::default()
+        };
+        crate::sigaction(crate::SIGUSR1, Some(&my_signal_handler), None).unwrap();
+
+        crate::kill(pid, crate::SIGUSR1).unwrap(); // calls handler
+
+        let mut old_signal_handler = crate::SigAction::default();
+        crate::sigaction(
+            crate::SIGUSR1,
+            Some(&crate::SigAction {
+                sa_handler: unsafe { mem::transmute::<usize, Option<extern "C" fn(usize)>>(crate::SIG_IGN) },
+                ..Default::default()
+            }),
+            Some(&mut old_signal_handler)
+        ).unwrap();
+        assert_eq!(my_signal_handler, old_signal_handler);
+
+        crate::kill(pid, crate::SIGUSR1).unwrap(); // does nothing
+
+        SA_HANDLER_2_WAS_IGNORED.store(true, Ordering::SeqCst);
+
+        crate::sigaction(
+            crate::SIGUSR1,
+            Some(&crate::SigAction {
+                sa_handler: unsafe { mem::transmute::<usize, Option<extern "C" fn(usize)>>(crate::SIG_DFL) },
+                ..Default::default()
+            }),
+            Some(&mut old_signal_handler)
+        ).unwrap();
+
+        crate::kill(pid, crate::SIGUSR1).unwrap(); // actually exits
+    } else {
+        let mut status = 0;
+        dbg!(crate::waitpid(child, &mut status, crate::WaitFlags::empty())).unwrap();
+
+        assert!(crate::wifsignaled(status));
+        assert_eq!(crate::wtermsig(status), crate::SIGUSR1);
+
+        assert!(SA_HANDLER_WAS_RAN.load(Ordering::SeqCst));
+        assert!(SA_HANDLER_2_WAS_IGNORED.load(Ordering::SeqCst));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_users/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_users/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_users/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_users/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"1c598c990a0957aa81b038c1ece1d6b0c6d606c3cdd6420eb3ef5845510a4178","LICENSE":"e6a8ae2d796083783efc94b1e66271aa2929dc4dfb231d34239aa9c7db8396db","README.md":"9c3a6fd2a798bd1e105c5ee72f7b475471e3a9abec89b5be2b5263d654085d22","src/lib.rs":"d9d82538b9c6a3467407525e0db2c588981f2491fb40fbe237af925bc13a7551","tests/etc/group":"175d89e8d03e2976d3f37110050372163fcafd07a20c899ade3a9690b2cb4526","tests/etc/passwd":"aee0d4bd2abf55846683cc2e5daaa03641636a262519623d59b1ab8e1eb1db32","tests/etc/shadow":"ca7c1a6f96eaef3bd26da4faeae55e78cad04822c191e3263b539ee687de4d0a"},"package":"de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"}
\ No newline at end of file
+{"files":{"Cargo.toml":"2924323f7d907818842bd62777c75b0f8055cebd6cd0e5d26909d4a536d5a946","LICENSE":"e6a8ae2d796083783efc94b1e66271aa2929dc4dfb231d34239aa9c7db8396db","README.md":"9c3a6fd2a798bd1e105c5ee72f7b475471e3a9abec89b5be2b5263d654085d22","src/lib.rs":"8e6e1a2bffc3f63c2839b6a41ddeaa21da3134f6c937f16d6eacddad111b7fe2","tests/etc/group":"175d89e8d03e2976d3f37110050372163fcafd07a20c899ade3a9690b2cb4526","tests/etc/passwd":"aee0d4bd2abf55846683cc2e5daaa03641636a262519623d59b1ab8e1eb1db32","tests/etc/shadow":"ca7c1a6f96eaef3bd26da4faeae55e78cad04822c191e3263b539ee687de4d0a"},"package":"528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_users/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_users/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_users/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_users/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "redox_users"
-version = "0.3.5"
+version = "0.4.0"
 authors = ["Jose Narvaez <goyox86@gmail.com>", "Wesley Hershberger <mggmugginsmc@gmail.com>"]
 description = "A Rust library to access Redox users and groups functionality"
 documentation = "https://docs.rs/redox_users"
@@ -21,10 +22,11 @@
 license = "MIT"
 repository = "https://gitlab.redox-os.org/redox-os/users"
 [dependencies.getrandom]
-version = "0.1"
+version = "0.2"
+features = ["std"]
 
 [dependencies.redox_syscall]
-version = "0.1"
+version = "0.2"
 
 [dependencies.rust-argon2]
 version = "0.8"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_users/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_users/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/redox_users/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/redox_users/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 //! `redox-users` is designed to be a small, low-ish level interface
 //! to system user and group information, as well as user password
-//! authentication.
+//! authentication. It is OS-specific and will break horribly on platforms
+//! that are not [Redox-OS](https://redox-os.org).
 //!
 //! # Permissions
 //! Because this is a system level tool dealing with password
@@ -26,34 +27,35 @@
 //! schemes for redox in future without breakage of existing
 //! software.
 
-#[cfg(feature = "auth")]
-extern crate argon2;
-extern crate getrandom;
-extern crate syscall;
-
 use std::convert::From;
 use std::error::Error;
-use std::fmt::{self, Debug, Display};
-use std::fs::OpenOptions;
-use std::io::{Read, Write};
+use std::fmt::{self, Debug};
+use std::fs::{File, OpenOptions};
+use std::io::{Read, Seek, SeekFrom, Write};
+use std::marker::PhantomData;
 #[cfg(target_os = "redox")]
 use std::os::unix::fs::OpenOptionsExt;
+#[cfg(not(target_os = "redox"))]
+use std::os::unix::io::AsRawFd;
 use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::slice::{Iter, IterMut};
-use std::str::FromStr;
 #[cfg(not(test))]
 #[cfg(feature = "auth")]
 use std::thread;
 use std::time::Duration;
 
+//#[cfg(not(target_os = "redox"))]
+//use nix::fcntl::{flock, FlockArg};
+
 #[cfg(target_os = "redox")]
 use syscall::flag::{O_EXLOCK, O_SHLOCK};
 use syscall::Error as SyscallError;
 
 const PASSWD_FILE: &'static str = "/etc/passwd";
 const GROUP_FILE: &'static str = "/etc/group";
+#[cfg(feature = "auth")]
 const SHADOW_FILE: &'static str = "/etc/shadow";
 
 #[cfg(target_os = "redox")]
@@ -65,13 +67,16 @@
 const MAX_ID: usize = 6000;
 const DEFAULT_TIMEOUT: u64 = 3;
 
+#[cfg(feature = "auth")]
+const USER_AUTH_FULL_EXPECTED_HASH: &str = "A User<auth::Full> had no hash";
+
 pub type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>;
 
 /// Errors that might happen while using this crate
 #[derive(Debug, PartialEq)]
 pub enum UsersError {
     Os { reason: String },
-    Parsing { reason: String },
+    Parsing { reason: String, line: usize },
     NotFound,
     AlreadyExists
 }
@@ -80,8 +85,8 @@
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             UsersError::Os { reason } => write!(f, "os error: code {}", reason),
-            UsersError::Parsing { reason } => {
-                write!(f, "parse error: {}", reason)
+            UsersError::Parsing { reason, line } => {
+                write!(f, "parse error line {}: {}", line, reason)
             },
             UsersError::NotFound => write!(f, "user/group not found"),
             UsersError::AlreadyExists => write!(f, "user/group already exists")
@@ -96,9 +101,10 @@
 }
 
 #[inline]
-fn parse_error(reason: &str) -> UsersError {
+fn parse_error(line: usize, reason: &str) -> UsersError {
     UsersError::Parsing {
-        reason: reason.into()
+        reason: reason.into(),
+        line,
     }
 }
 
@@ -117,51 +123,85 @@
     }
 }
 
-fn read_locked_file(file: impl AsRef<Path>) -> Result<String> {
-    #[cfg(test)]
-    println!("Reading file: {}", file.as_ref().display());
+#[derive(Clone, Copy)]
+#[allow(dead_code)]
+enum Lock {
+    Shared,
+    Exclusive,
+}
 
+impl Lock {
     #[cfg(target_os = "redox")]
-    let mut file = OpenOptions::new()
-        .read(true)
-        .custom_flags(O_SHLOCK as i32)
-        .open(file)?;
-    #[cfg(not(target_os = "redox"))]
-    #[cfg_attr(rustfmt, rustfmt_skip)]
-    let mut file = OpenOptions::new()
-        .read(true)
-        .open(file)?;
-
-    let len = file.metadata()?.len();
-    let mut file_data = String::with_capacity(len as usize);
-    file.read_to_string(&mut file_data)?;
-    Ok(file_data)
+    fn as_olock(self) -> i32 {
+        (match self {
+            Lock::Shared => O_SHLOCK,
+            Lock::Exclusive => O_EXLOCK,
+        }) as i32
+    }
+    
+    /*#[cfg(not(target_os = "redox"))]
+    fn as_flock(self) -> FlockArg {
+        match self {
+            Lock::Shared => FlockArg::LockShared,
+            Lock::Exclusive => FlockArg::LockExclusive,
+        }
+    }*/
 }
 
-fn write_locked_file(file: impl AsRef<Path>, data: String) -> Result<()> {
+/// Naive semi-cross platform file locking (need to support linux for tests).
+#[allow(dead_code)]
+fn locked_file(file: impl AsRef<Path>, _lock: Lock) -> Result<File> {
     #[cfg(test)]
-    println!("Writing file: {}", file.as_ref().display());
+    println!("Open file: {}", file.as_ref().display());
 
     #[cfg(target_os = "redox")]
-    let mut file = OpenOptions::new()
-        .write(true)
-        .truncate(true)
-        .custom_flags(O_EXLOCK as i32)
-        .open(file)?;
+    {
+        Ok(OpenOptions::new()
+            .read(true)
+            .write(true)
+            .custom_flags(_lock.as_olock())
+            .open(file)?)
+    }
     #[cfg(not(target_os = "redox"))]
     #[cfg_attr(rustfmt, rustfmt_skip)]
-    let mut file = OpenOptions::new()
-        .write(true)
-        .truncate(true)
-        .open(file)?;
+    {
+        let file = OpenOptions::new()
+            .read(true)
+            .write(true)
+            .open(file)?;
+        let fd = file.as_raw_fd();
+        eprintln!("Fd: {}", fd);
+        //flock(fd, _lock.as_flock())?;
+        Ok(file)
+    }
+}
 
-    file.write(data.as_bytes())?;
+/// Reset a file for rewriting (user/group dbs must be erased before write-out)
+fn reset_file(fd: &mut File) -> Result<()> {
+    fd.set_len(0)?;
+    fd.seek(SeekFrom::Start(0))?;
     Ok(())
 }
 
+/// Marker types for [`User`] and [`AllUsers`].
+pub mod auth {
+    /// Marker type indicating that a `User` only has access to world-readable
+    /// user information, and cannot authenticate.
+    #[derive(Debug)]
+    pub struct Basic {}
+    
+    /// Marker type indicating that a `User` has access to all user
+    /// information, including password hashes.
+    #[cfg(feature = "auth")]
+    #[derive(Debug)]
+    pub struct Full {}
+}
+
 /// A struct representing a Redox user.
 /// Currently maps to an entry in the `/etc/passwd` file.
 ///
+/// `A` should be a type from [`crate::auth`].
+///
 /// # Unset vs. Blank Passwords
 /// A note on unset passwords vs. blank passwords. A blank password
 /// is a hash field that is completely blank (aka, `""`). According
@@ -173,38 +213,119 @@
 /// hash always returns `false` upon attempted verification. The
 /// most commonly used hash for an unset password is `"!"`, but
 /// this crate makes no distinction. The most common way to unset
-/// the password is to use [`unset_passwd`](struct.User.html#method.unset_passwd).
-pub struct User {
+/// the password is to use [`User::unset_passwd`].
+pub struct User<A> {
     /// Username (login name)
     pub user: String,
-    // Hashed password and Argon2 indicator, stored to simplify API
-    hash: Option<(String, bool)>,
     /// User id
     pub uid: usize,
     /// Group id
     pub gid: usize,
-    /// Real name (GECOS field)
+    /// Real name (human readable, can contain spaces)
     pub name: String,
     /// Home directory path
     pub home: String,
     /// Shell path
     pub shell: String,
-    /// Failed login delay duration
-    auth_delay: Duration
+    
+    // Stored password hash text and an indicator to determine if the text is a
+    // hash.
+    #[cfg(feature = "auth")]
+    hash: Option<(String, bool)>,
+    // Failed login delay duration
+    auth_delay: Duration,
+    auth: PhantomData<A>,
 }
 
-impl User {
-    /// Set the password for a user. Make sure the password you have
-    /// received is actually what the user wants as their password (this doesn't).
+impl<A> User<A> {
+    /// Get a Command to run the user's default shell (see [`User::login_cmd`]
+    /// for more docs).
+    pub fn shell_cmd(&self) -> Command { self.login_cmd(&self.shell) }
+
+    /// Provide a login command for the user, which is any entry point for
+    /// starting a user's session, whether a shell (use [`User::shell_cmd`]
+    /// instead) or a graphical init.
     ///
-    /// To set the password blank, use `""` as the password parameter.
+    /// The `Command` will use the user's `uid` and `gid`, its `current_dir`
+    /// will be set to the user's home directory, and the follwing enviroment
+    /// variables will be populated:
     ///
-    /// # Panics
-    /// If the User's hash fields are unpopulated, this function will `panic!`
-    /// (see [`AllUsers`](struct.AllUsers.html#shadowfile-handling) for more info).
-    #[cfg(feature = "auth")]
+    ///    - `USER` set to the user's `user` field.
+    ///    - `UID` set to the user's `uid` field.
+    ///    - `GROUPS` set the user's `gid` field.
+    ///    - `HOME` set to the user's `home` field.
+    ///    - `SHELL` set to the user's `shell` field.
+    pub fn login_cmd<T>(&self, cmd: T) -> Command
+        where T: std::convert::AsRef<std::ffi::OsStr> + AsRef<str>
+    {
+        let mut command = Command::new(cmd);
+        command
+            .uid(self.uid as u32)
+            .gid(self.gid as u32)
+            .current_dir(&self.home)
+            .env("USER", &self.user)
+            .env("UID", format!("{}", self.uid))
+            .env("GROUPS", format!("{}", self.gid))
+            .env("HOME", &self.home)
+            .env("SHELL", &self.shell);
+        command
+    }
+    
+    fn from_passwd_entry(s: &str, line: usize) -> Result<Self> {
+        let mut parts = s.split(';');
+
+        let user = parts
+            .next()
+            .ok_or(parse_error(line, "expected user"))?;
+        let uid = parts
+            .next()
+            .ok_or(parse_error(line, "expected uid"))?
+            .parse::<usize>()?;
+        let gid = parts
+            .next()
+            .ok_or(parse_error(line, "expected uid"))?
+            .parse::<usize>()?;
+        let name = parts
+            .next()
+            .ok_or(parse_error(line, "expected real name"))?;
+        let home = parts
+            .next()
+            .ok_or(parse_error(line, "expected home dir path"))?;
+        let shell = parts
+            .next()
+            .ok_or(parse_error(line, "expected shell path"))?;
+
+        Ok(User::<A> {
+            user: user.into(),
+            uid,
+            gid,
+            name: name.into(),
+            home: home.into(),
+            shell: shell.into(),
+            #[cfg(feature = "auth")]
+            hash: None,
+            auth: PhantomData,
+            auth_delay: Duration::default(),
+        })
+    }
+
+    /// Format this user as an entry in `/etc/passwd`.
+    fn passwd_entry(&self) -> String {
+        #[cfg_attr(rustfmt, rustfmt_skip)]
+        format!("{};{};{};{};{};{}\n",
+            self.user, self.uid, self.gid, self.name, self.home, self.shell
+        )
+    }
+}
+
+/// Additional methods for if this `User` is authenticatable.
+#[cfg(feature = "auth")]
+impl User<auth::Full> {
+    /// Set the password for a user. Make **sure** that `password`
+    /// is actually what the user wants as their password (this doesn't).
+    ///
+    /// To set the password blank, pass `""` as `password`.
     pub fn set_passwd(&mut self, password: impl AsRef<str>) -> Result<()> {
-        self.panic_if_unpopulated();
         let password = password.as_ref();
 
         self.hash = if password != "" {
@@ -224,30 +345,19 @@
         Ok(())
     }
 
-    /// Unset the password (do not allow logins).
-    ///
-    /// # Panics
-    /// If the User's hash fields are unpopulated, this function will `panic!`
-    /// (see [`AllUsers`](struct.AllUsers.html#shadowfile-handling) for more info).
+    /// Unset the password ([`User::verify_passwd`] always returns `false`).
     pub fn unset_passwd(&mut self) {
-        self.panic_if_unpopulated();
         self.hash = Some(("!".into(), false));
     }
 
-    /// Verify the password. If the hash is empty, this only
-    /// returns `true` if the password field is also empty.
-    /// Note that this is a blocking operation if the password
-    /// is incorrect. See [`Config::auth_delay`](struct.Config.html#method.auth_delay)
-    /// to set the wait time. Default is 3 seconds.
+    /// Verify the password. If the hash is empty, this only returns `true` if
+    /// `password` is also empty.
     ///
-    /// # Panics
-    /// If the User's hash fields are unpopulated, this function will `panic!`
-    /// (see [`AllUsers`](struct.AllUsers.html#shadowfile-handling) for more info).
-    #[cfg(feature = "auth")]
+    /// Note that this is a blocking operation if the password is incorrect.
+    /// See [`Config::auth_delay`] to set the wait time. Default is 3 seconds.
     pub fn verify_passwd(&self, password: impl AsRef<str>) -> bool {
-        self.panic_if_unpopulated();
-        // Safe because it will have panicked already if self.hash.is_none()
-        let &(ref hash, ref encoded) = self.hash.as_ref().unwrap();
+        let &(ref hash, ref encoded) = self.hash.as_ref()
+            .expect(USER_AUTH_FULL_EXPECTED_HASH);
         let password = password.as_ref();
 
         let verified = if *encoded {
@@ -263,73 +373,28 @@
         verified
     }
 
-    /// Determine if the hash for the password is blank
-    /// (any user can log in as this user with no password).
-    ///
-    /// # Panics
-    /// If the User's hash fields are unpopulated, this function will `panic!`
-    /// (see [`AllUsers`](struct.AllUsers.html#shadowfile-handling) for more info).
+    /// Determine if the hash for the password is blank ([`User::verify_passwd`]
+    /// returns `true` *only* when the password is blank).
     pub fn is_passwd_blank(&self) -> bool {
-        self.panic_if_unpopulated();
-        let &(ref hash, ref encoded) = self.hash.as_ref().unwrap();
+        let &(ref hash, ref encoded) = self.hash.as_ref()
+            .expect(USER_AUTH_FULL_EXPECTED_HASH);
         hash == "" && ! encoded
     }
 
     /// Determine if the hash for the password is unset
-    /// ([`verify_passwd`](struct.User.html#method.verify_passwd)
-    /// returns `false` regardless of input).
-    ///
-    /// # Panics
-    /// If the User's hash fields are unpopulated, this function will `panic!`
-    /// (see [`AllUsers`](struct.AllUsers.html#shadowfile-handling) for more info).
+    /// ([`User::verify_passwd`] returns `false` regardless of input).
     pub fn is_passwd_unset(&self) -> bool {
-        self.panic_if_unpopulated();
-        let &(ref hash, ref encoded) = self.hash.as_ref().unwrap();
+        let &(ref hash, ref encoded) = self.hash.as_ref()
+            .expect(USER_AUTH_FULL_EXPECTED_HASH);
         hash != "" && ! encoded
     }
 
-    /// Get a Command to run the user's default shell
-    /// (see [`login_cmd`](struct.User.html#method.login_cmd) for more docs).
-    pub fn shell_cmd(&self) -> Command { self.login_cmd(&self.shell) }
-
-    /// Provide a login command for the user, which is any
-    /// entry point for starting a user's session, whether
-    /// a shell (use [`shell_cmd`](struct.User.html#method.shell_cmd) instead) or a graphical init.
-    ///
-    /// The `Command` will use the user's `uid` and `gid`, its `current_dir` will be
-    /// set to the user's home directory, and the follwing enviroment variables will
-    /// be populated:
-    ///
-    ///    - `USER` set to the user's `user` field.
-    ///    - `UID` set to the user's `uid` field.
-    ///    - `GROUPS` set the user's `gid` field.
-    ///    - `HOME` set to the user's `home` field.
-    ///    - `SHELL` set to the user's `shell` field.
-    pub fn login_cmd<T>(&self, cmd: T) -> Command
-        where T: std::convert::AsRef<std::ffi::OsStr> + AsRef<str>
-    {
-        let mut command = Command::new(cmd);
-        command
-            .uid(self.uid as u32)
-            .gid(self.gid as u32)
-            .current_dir(&self.home)
-            .env("USER", &self.user)
-            .env("UID", format!("{}", self.uid))
-            .env("GROUPS", format!("{}", self.gid))
-            .env("HOME", &self.home)
-            .env("SHELL", &self.shell);
-        command
-    }
-
-    /// This returns an entry for `/etc/shadow`
-    /// Will panic!
-    fn shadowstring(&self) -> String {
-        self.panic_if_unpopulated();
+    fn shadow_entry(&self) -> String {
         let hashstring = match self.hash {
             Some((ref hash, _)) => hash,
-            None => panic!("Shadowfile not read!")
+            None => panic!(USER_AUTH_FULL_EXPECTED_HASH)
         };
-        format!("{};{}", self.user, hashstring)
+        format!("{};{}\n", self.user, hashstring)
     }
 
     /// Give this a hash string (not a shadowfile entry!!!)
@@ -342,89 +407,31 @@
         self.hash = Some((hash.to_string(), encoded));
         Ok(())
     }
-
-    #[inline]
-    fn panic_if_unpopulated(&self) {
-        if self.hash.is_none() {
-            panic!("Hash not populated!");
-        }
-    }
 }
 
-impl Name for User {
+impl<A> Name for User<A> {
     fn name(&self) -> &str {
         &self.user
     }
 }
 
-impl Id for User {
+impl<A> Id for User<A> {
     fn id(&self) -> usize {
         self.uid
     }
 }
 
-impl Debug for User {
+impl<A> Debug for User<A> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f,
-            "User {{\n\tuser: {:?}\n\tuid: {:?}\n\tgid: {:?}\n\tname: {:?}
-            home: {:?}\n\tshell: {:?}\n\tauth_delay: {:?}\n}}",
-            self.user, self.uid, self.gid, self.name, self.home, self.shell, self.auth_delay
-        )
-    }
-}
-
-impl Display for User {
-    /// Format this user as an entry in `/etc/passwd`. This
-    /// is an implementation detail, do NOT rely on this trait
-    /// being implemented in future.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        #[cfg_attr(rustfmt, rustfmt_skip)]
-        write!(f, "{};{};{};{};{};{}",
-            self.user, self.uid, self.gid, self.name, self.home, self.shell
-        )
-    }
-}
-
-impl FromStr for User {
-    type Err = Box<dyn Error + Send + Sync>;
-
-    /// Parse an entry from `/etc/passwd`. This
-    /// is an implementation detail, do NOT rely on this trait
-    /// being implemented in future.
-    fn from_str(s: &str) -> Result<Self> {
-        let mut parts = s.split(';');
-
-        let user = parts
-            .next()
-            .ok_or(parse_error("expected user"))?;
-        let uid = parts
-            .next()
-            .ok_or(parse_error("expected uid"))?
-            .parse::<usize>()?;
-        let gid = parts
-            .next()
-            .ok_or(parse_error("expected uid"))?
-            .parse::<usize>()?;
-        let name = parts
-            .next()
-            .ok_or(parse_error("expected real name"))?;
-        let home = parts
-            .next()
-            .ok_or(parse_error("expected home dir path"))?;
-        let shell = parts
-            .next()
-            .ok_or(parse_error("expected shell path"))?;
-
-        Ok(User {
-            user: user.into(),
-            hash: None,
-            uid,
-            gid,
-            name: name.into(),
-            home: home.into(),
-            shell: shell.into(),
-            auth_delay: Duration::default(),
-        })
+        f.debug_struct("User")
+            .field("user", &self.user)
+            .field("uid", &self.uid)
+            .field("gid", &self.gid)
+            .field("name", &self.name)
+            .field("home", &self.home)
+            .field("shell", &self.shell)
+            .field("auth_delay", &self.auth_delay)
+            .finish()
     }
 }
 
@@ -436,29 +443,45 @@
     pub group: String,
     /// Unique group id
     pub gid: usize,
-    /// Group members usernames
+    /// Group members' usernames
     pub users: Vec<String>,
 }
 
-impl Name for Group {
-    fn name(&self) -> &str {
-        &self.group
-    }
-}
+impl Group {
+    fn from_group_entry(s: &str, line: usize) -> Result<Self> {
+        let mut parts = s.trim()
+            .split(';');
 
-impl Id for Group {
-    fn id(&self) -> usize {
-        self.gid
+        let group = parts
+            .next()
+            .ok_or(parse_error(line, "expected group"))?;
+        let gid = parts
+            .next()
+            .ok_or(parse_error(line, "expected gid"))?
+            .parse::<usize>()?;
+        let users_str = parts.next()
+            .unwrap_or("");
+        let users = users_str.split(',')
+            .filter_map(|u| if u == "" {
+                None
+            } else {
+                Some(u.into())
+            })
+            .collect();
+
+        Ok(Group {
+            group: group.into(),
+            gid,
+            users,
+        })
     }
-}
 
-impl Display for Group {
     /// Format this group as an entry in `/etc/group`. This
     /// is an implementation detail, do NOT rely on this trait
     /// being implemented in future.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn group_entry(&self) -> String {
         #[cfg_attr(rustfmt, rustfmt_skip)]
-        write!(f, "{};{};{}",
+        format!("{};{};{}\n",
             self.group,
             self.gid,
             self.users.join(",").trim_matches(',')
@@ -466,31 +489,15 @@
     }
 }
 
-impl FromStr for Group {
-    type Err = Box<dyn Error + Send + Sync>;
-
-    /// Parse an entry from `/etc/group`. This
-    /// is an implementation detail, do NOT rely on this trait
-    /// being implemented in future.
-    fn from_str(s: &str) -> Result<Self> {
-        let mut parts = s.split(';');
-
-        let group = parts
-            .next()
-            .ok_or(parse_error("expected group"))?;
-        let gid = parts
-            .next()
-            .ok_or(parse_error("expected gid"))?
-            .parse::<usize>()?;
-        //Allow for an empty users field. If there is a better way to do this, do it
-        let users_str = parts.next().unwrap_or(" ");
-        let users = users_str.split(',').map(|u| u.into()).collect();
+impl Name for Group {
+    fn name(&self) -> &str {
+        &self.group
+    }
+}
 
-        Ok(Group {
-            group: group.into(),
-            gid,
-            users,
-        })
+impl Id for Group {
+    fn id(&self) -> usize {
+        self.gid
     }
 }
 
@@ -574,20 +581,27 @@
     }
 }
 
-/// A generic configuration that allows better control of
-/// `AllUsers` or `AllGroups` than might otherwise be possible.
+/// A generic configuration that allows fine control of an [`AllUsers`] or
+/// [`AllGroups`].
+///
+/// `auth_delay` is not used by [`AllGroups`]
+///
+/// In most situations, [`Config::default`](struct.Config.html#impl-Default)
+/// will work just fine. The other fields are for finer control if it is
+/// required.
+///
+/// # Example
+/// ```
+/// # use redox_users::Config;
+/// use std::time::Duration;
 ///
-/// The use of the fields of this struct is completely optional
-/// depending on what constructor it is passed to. For example,
-/// `AllGroups` doesn't care if auth is enabled or not, or what
-/// the duration is.
-///
-/// In most situations, `Config::default()` will work just fine.
-/// The other methods on this struct are usually for finer control
-/// of an `AllUsers` or `AllGroups` if it is required.
-#[derive(Clone)]
+/// let cfg = Config::default()
+///     .min_id(500)
+///     .max_id(1000)
+///     .auth_delay(Duration::from_secs(5));
+/// ```
+#[derive(Clone, Debug)]
 pub struct Config {
-    auth_enabled: bool,
     scheme: String,
     auth_delay: Duration,
     min_id: usize,
@@ -595,21 +609,6 @@
 }
 
 impl Config {
-    /// An alternative to the default constructor, this indicates that
-    /// authentication should be enabled.
-    pub fn with_auth() -> Config {
-        Config {
-            auth_enabled: true,
-            ..Default::default()
-        }
-    }
-
-    /// Builder pattern version of `Self::with_auth`.
-    pub fn auth(mut self, auth: bool) -> Config {
-        self.auth_enabled = auth;
-        self
-    }
-
     /// Set the delay for a failed authentication. Default is 3 seconds.
     pub fn auth_delay(mut self, delay: Duration) -> Config {
         self.auth_delay = delay;
@@ -628,7 +627,7 @@
         self
     }
 
-    /// Set the scheme relative to which the `AllUsers` or `AllGroups`
+    /// Set the scheme relative to which the [`AllUsers`] or [`AllGroups`]
     /// should be looking for its data files. This is a compromise between
     /// exposing implementation details and providing fine enough
     /// control over the behavior of this API.
@@ -652,10 +651,13 @@
 }
 
 impl Default for Config {
-    /// Authentication is not enabled; The default base scheme is `file`.
+    /// The default base scheme is `file:`.
+    ///
+    /// The default auth delay is 3 seconds.
+    ///
+    /// The default min and max ids are 1000 and 6000.
     fn default() -> Config {
         Config {
-            auth_enabled: false,
             scheme: String::from(DEFAULT_SCHEME),
             auth_delay: Duration::new(DEFAULT_TIMEOUT, 0),
             min_id: MIN_ID,
@@ -667,7 +669,7 @@
 // Nasty hack to prevent the compiler complaining about
 // "leaking" `AllInner`
 mod sealed {
-    use Config;
+    use crate::Config;
 
     pub trait Name {
         fn name(&self) -> &str;
@@ -696,20 +698,18 @@
 /// so that the implementations of functions can be implemented
 /// at the trait level. Do not try to implement this trait.
 pub trait All: AllInner {
-    /// Get an iterator borrowing all [`User`](struct.User.html)'s
-    /// or [`Group`](struct.Group.html)'s on the system.
+    /// Get an iterator borrowing all [`User`]s or [`Group`]s on the system.
     fn iter(&self) -> Iter<<Self as AllInner>::Gruser> {
         self.list().iter()
     }
 
-    /// Get an iterator mutably borrowing all [`User`](struct.User.html)'s
-    /// or [`Group`](struct.Group.html)'s on the system.
+    /// Get an iterator mutably borrowing all [`User`]s or [`Group`]s on the
+    /// system.
     fn iter_mut(&mut self) -> IterMut<<Self as AllInner>::Gruser> {
         self.list_mut().iter_mut()
     }
 
-    /// Borrow the [`User`](struct.User.html) or [`Group`](struct.Group.html)
-    /// with a given name.
+    /// Borrow the [`User`] or [`Group`] with a given name.
     ///
     /// # Examples
     ///
@@ -717,7 +717,7 @@
     ///
     /// ```no_run
     /// # use redox_users::{All, AllUsers, Config};
-    /// let users = AllUsers::new(Config::default()).unwrap();
+    /// let users = AllUsers::basic(Config::default()).unwrap();
     /// let user = users.get_by_name("root").unwrap();
     /// ```
     fn get_by_name(&self, name: impl AsRef<str>) -> Option<&<Self as AllInner>::Gruser> {
@@ -725,14 +725,13 @@
             .find(|gruser| gruser.name() == name.as_ref() )
     }
 
-    /// Mutable version of [`get_by_name`](trait.All.html#method.get_by_name).
+    /// Mutable version of [`All::get_by_name`].
     fn get_mut_by_name(&mut self, name: impl AsRef<str>) -> Option<&mut <Self as AllInner>::Gruser> {
         self.iter_mut()
             .find(|gruser| gruser.name() == name.as_ref() )
     }
 
-    /// Borrow the [`User`](struct.User.html) or [`Group`](struct.Group.html)
-    /// with the given ID.
+    /// Borrow the [`User`] or [`Group`] with the given ID.
     ///
     /// # Examples
     ///
@@ -740,7 +739,7 @@
     ///
     /// ```no_run
     /// # use redox_users::{All, AllUsers, Config};
-    /// let users = AllUsers::new(Config::default()).unwrap();
+    /// let users = AllUsers::basic(Config::default()).unwrap();
     /// let user = users.get_by_id(0).unwrap();
     /// ```
     fn get_by_id(&self, id: usize) -> Option<&<Self as AllInner>::Gruser> {
@@ -748,20 +747,20 @@
             .find(|gruser| gruser.id() == id )
     }
 
-    /// Mutable version of [`get_by_id`](trait.All.html#method.get_by_id).
+    /// Mutable version of [`All::get_by_id`].
     fn get_mut_by_id(&mut self, id: usize) -> Option<&mut <Self as AllInner>::Gruser> {
         self.iter_mut()
             .find(|gruser| gruser.id() == id )
     }
 
-    /// Provides an unused id based on the min and max values in
-    /// the [`Config`](struct.Config.html) passed to the `All`'s constructor.
+    /// Provides an unused id based on the min and max values in the [`Config`]
+    /// passed to the `All`'s constructor.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// # use redox_users::{All, AllUsers, Config};
-    /// let users = AllUsers::new(Config::default()).unwrap();
+    /// let users = AllUsers::basic(Config::default()).unwrap();
     /// let uid = users.get_unique_id().expect("no available uid");
     /// ```
     fn get_unique_id(&self) -> Option<usize> {
@@ -773,111 +772,136 @@
         None
     }
 
-    /// Remove a [`User`](struct.User.html) or [`Group`](struct.Group.html)
-    /// from this `All` given it's name. This won't provide an indication
-    /// of whether the user was removed or not, but is guaranteed to work
-    /// if a user with the specified name exists.
-    fn remove_by_name(&mut self, name: impl AsRef<str>) {
-        // Significantly more elegant than other possible solutions.
-        // I wish it could indicate if it removed anything.
-        self.list_mut()
-            .retain(|gruser| gruser.name() != name.as_ref() );
-    }
-
-    /// Id version of [`remove_by_name`](trait.All.html#method.remove_by_name).
-    fn remove_by_id(&mut self, id: usize) {
-        self.list_mut()
-            .retain(|gruser| gruser.id() != id );
+    /// Remove a [`User`] or [`Group`] from this `All` given it's name. If the
+    /// Gruser was removed return `true`, else return `false`. This ensures
+    /// that the Gruser no longer exists.
+    fn remove_by_name(&mut self, name: impl AsRef<str>) -> bool {
+        let list = self.list_mut();
+        let indx = list.iter()
+            .enumerate()
+            .find_map(|(indx, gruser)| if gruser.name() == name.as_ref() {
+                    Some(indx)
+                } else {
+                    None
+                });
+        if let Some(indx) = indx {
+            list.remove(indx);
+            true
+        } else {
+            false
+        }
+    }
+
+    /// Id version of [`All::remove_by_name`].
+    fn remove_by_id(&mut self, id: usize) -> bool {
+        let list = self.list_mut();
+        let indx = list.iter()
+            .enumerate()
+            .find_map(|(indx, gruser)| if gruser.id() == id {
+                    Some(indx)
+                } else {
+                    None
+                });
+        if let Some(indx) = indx {
+            list.remove(indx);
+            true
+        } else {
+            false
+        }
     }
 }
 
-/// [`AllUsers`](struct.AllUsers.html) provides
-/// (borrowed) access to all the users on the system.
-/// Note that this struct implements [`All`](trait.All.html) for
-/// a bunch of convenient access functions.
+/// `AllUsers` provides (borrowed) access to all the users on the system.
+/// Note that this struct implements [`All`] for all of its access functions.
 ///
 /// # Notes
-/// Note that everything in this section also applies to
-/// [`AllGroups`](struct.AllGroups.html)
+/// Note that everything in this section also applies to [`AllGroups`].
 ///
-/// * If you mutate anything owned by an `AllUsers`,
-///   you must call the [`save`](struct.AllUsers.html#method.save)
-///   method in order for those changes to be applied to the system.
-/// * The API here is kept small on purpose in order to reduce the
-///   surface area for security exploitation. Most mutating actions
-///   can be accomplished via the [`get_mut_by_id`](struct.AllUsers.html#method.get_mut_by_id)
-///   and [`get_mut_by_name`](struct.AllUsers.html#method.get_mut_by_name)
+/// * If you mutate anything owned by an `AllUsers`, you must call the
+///   [`AllUsers::save`] in order for those changes to be applied to the system.
+/// * The API here is kept small. Most mutating actions can be accomplished via
+///   the [`All::get_mut_by_id`] and [`All::get_mut_by_name`]
 ///   functions.
-///
-/// # Shadowfile handling
-/// This implementation of redox-users uses a shadowfile implemented primarily
-/// by this struct. `AllUsers` respects the `auth_enabled` status of the `Config`
-/// that is was passed. If auth is enabled, it populates the
-/// hash fields of each user struct that it parses from `/etc/passwd` with
-/// info from `/et/shadow`. If a caller attempts to perform an action that
-/// requires this info with an `AllUsers` config that does not have auth enabled,
-/// the `User` handling action will panic.
-pub struct AllUsers {
-    users: Vec<User>,
+#[derive(Debug)]
+pub struct AllUsers<A> {
+    users: Vec<User<A>>,
     config: Config,
-}
-
-impl AllUsers {
-    /// See [Shadowfile Handling](struct.AllUsers.html#shadowfile-handling) for
-    /// configuration information regarding this constructor.
-    //TODO: Indicate if parsing an individual line failed or not
-    pub fn new(config: Config) -> Result<AllUsers> {
-        let passwd_cntnt = read_locked_file(config.in_scheme(PASSWD_FILE))?;
-
-        let mut passwd_entries: Vec<User> = Vec::new();
-        for line in passwd_cntnt.lines() {
-            if let Ok(mut user) = User::from_str(line) {
-                user.auth_delay = config.auth_delay;
-                passwd_entries.push(user);
-            }
-        }
-
-        if config.auth_enabled {
-            let shadow_cntnt = read_locked_file(config.in_scheme(SHADOW_FILE))?;
-            let shadow_entries: Vec<&str> = shadow_cntnt.lines().collect();
-            for entry in shadow_entries.iter() {
-                let mut entry = entry.split(';');
-                let name = entry.next().ok_or(parse_error(
-                    "error parsing shadowfile: expected username"
-                ))?;
-                let hash = entry.next().ok_or(parse_error(
-                    "error parsing shadowfile: expected hash"
-                ))?;
-                passwd_entries
-                    .iter_mut()
-                    .find(|user| user.user == name)
-                    .ok_or(parse_error(
-                        "error parsing shadowfile: unkown user"
-                    ))?
-                    .populate_hash(hash)?;
-            }
+    
+    // Hold on to the locked fds to prevent race conditions
+    passwd_fd: File,
+    shadow_fd: Option<File>,
+}
+
+impl<A> AllUsers<A> {
+    fn new(config: Config) -> Result<AllUsers<A>> {
+        let mut passwd_fd = locked_file(config.in_scheme(PASSWD_FILE), Lock::Exclusive)?;
+        let mut passwd_cntnt = String::new();
+        passwd_fd.read_to_string(&mut passwd_cntnt)?;
+
+        let mut passwd_entries = Vec::new();
+        for (indx, line) in passwd_cntnt.lines().enumerate() {
+            let mut user = User::from_passwd_entry(line, indx)?;
+            user.auth_delay = config.auth_delay;
+            passwd_entries.push(user);
         }
-
-        Ok(AllUsers {
+        
+        Ok(AllUsers::<A> {
             users: passwd_entries,
-            config
+            config,
+            passwd_fd,
+            shadow_fd: None,
         })
     }
+}
+
+impl AllUsers<auth::Basic> {
+    /// Provide access to all user information on the system except
+    /// authentication. This is adequate for almost all uses of `AllUsers`.
+    pub fn basic(config: Config) -> Result<AllUsers<auth::Basic>> {
+        Self::new(config)
+    }
+}
 
+#[cfg(feature = "auth")]
+impl AllUsers<auth::Full> {
+    /// If access to password related methods for the [`User`]s yielded by this
+    /// `AllUsers` is required, use this constructor.
+    pub fn authenticator(config: Config) -> Result<AllUsers<auth::Full>> {
+        let mut shadow_fd = locked_file(config.in_scheme(SHADOW_FILE), Lock::Exclusive)?;
+        let mut shadow_cntnt = String::new();
+        shadow_fd.read_to_string(&mut shadow_cntnt)?;
+        let shadow_entries: Vec<&str> = shadow_cntnt.lines().collect();
+        
+        let mut new = Self::new(config)?;
+        new.shadow_fd = Some(shadow_fd);
+        
+        for (indx, entry) in shadow_entries.iter().enumerate() {
+            let mut entry = entry.split(';');
+            let name = entry.next().ok_or(parse_error(indx,
+                "error parsing shadowfile: expected username"
+            ))?;
+            let hash = entry.next().ok_or(parse_error(indx,
+                "error parsing shadowfile: expected hash"
+            ))?;
+            new.users
+                .iter_mut()
+                .find(|user| user.user == name)
+                .ok_or(parse_error(indx,
+                    "error parsing shadowfile: unkown user"
+                ))?
+                .populate_hash(hash)?;
+        }
+        
+        Ok(new)
+    }
+    
     /// Adds a user with the specified attributes to the `AllUsers`
     /// instance. Note that the user's password is set unset (see
     /// [Unset vs Blank Passwords](struct.User.html#unset-vs-blank-passwords))
     /// during this call.
     ///
-    /// This function is classified as a mutating operation,
-    /// and users must therefore call [`save`](struct.AllUsers.html#method.save)
-    /// in order for the new user to be applied to the system.
-    ///
-    /// # Panics
-    /// This function will `panic!` if the [`Config`](struct.Config.html)
-    /// passed to [`AllUsers::new`](struct.AllUsers.html#method.new)
-    /// does not have authentication enabled (see
-    /// [`Shadowfile handling`](struct.AllUsers.html#shadowfile-handling)).
+    /// Make sure to call [`AllUsers::save`] in order for the new user to be
+    /// applied to the system.
     //TODO: Take uid/gid as Option<usize> and if none, find an unused ID.
     pub fn add_user(
         &mut self,
@@ -894,45 +918,45 @@
             return Err(From::from(UsersError::AlreadyExists))
         }
 
-        if !self.config.auth_enabled {
-            panic!("Attempt to create user without access to the shadowfile");
-        }
-
         self.users.push(User {
             user: login.into(),
-            hash: Some(("!".into(), false)),
             uid,
             gid,
             name: name.into(),
             home: home.into(),
             shell: shell.into(),
+            hash: Some(("!".into(), false)),
+            auth: PhantomData,
             auth_delay: self.config.auth_delay
         });
         Ok(())
     }
 
     /// Syncs the data stored in the `AllUsers` instance to the filesystem.
-    /// To apply changes to the system from an `AllUsers`, you MUST call this function!
-    pub fn save(&self) -> Result<()> {
+    /// To apply changes to the system from an `AllUsers`, you MUST call this
+    /// function!
+    pub fn save(&mut self) -> Result<()> {
         let mut userstring = String::new();
         let mut shadowstring = String::new();
         for user in &self.users {
-            userstring.push_str(&format!("{}\n", user.to_string().as_str()));
-            if self.config.auth_enabled {
-                shadowstring.push_str(&format!("{}\n", user.shadowstring()));
-            }
+            userstring.push_str(&user.passwd_entry());
+            shadowstring.push_str(&user.shadow_entry());
         }
 
-        write_locked_file(self.config.in_scheme(PASSWD_FILE), userstring)?;
-        if self.config.auth_enabled {
-            write_locked_file(self.config.in_scheme(SHADOW_FILE), shadowstring)?;
-        }
+        let mut shadow_fd = self.shadow_fd.as_mut()
+            .expect("shadow_fd should exist for AllUsers<auth::Full>");
+
+        reset_file(&mut self.passwd_fd)?;
+        self.passwd_fd.write_all(userstring.as_bytes())?;
+
+        reset_file(&mut shadow_fd)?;
+        shadow_fd.write_all(shadowstring.as_bytes())?;
         Ok(())
     }
 }
 
-impl AllInner for AllUsers {
-    type Gruser = User;
+impl<A> AllInner for AllUsers<A> {
+    type Gruser = User<A>;
 
     fn list(&self) -> &Vec<Self::Gruser> {
         &self.users
@@ -947,50 +971,57 @@
     }
 }
 
-impl All for AllUsers {}
-
-impl Debug for AllUsers {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "AllUsers {{\nusers: {:?}\n}}", self.users)
+impl<A> All for AllUsers<A> {}
+/*
+#[cfg(not(target_os = "redox"))]
+impl<A> Drop for AllUsers<A> {
+    fn drop(&mut self) {
+        eprintln!("Dropping AllUsers");
+        let _ = flock(self.passwd_fd.as_raw_fd(), FlockArg::Unlock);
+        if let Some(fd) = self.shadow_fd.as_ref() {
+            eprintln!("Shadow");
+            let _ = flock(fd.as_raw_fd(), FlockArg::Unlock);
+        }
     }
 }
-
-/// [`AllGroups`](struct.AllGroups.html) provides
-/// (borrowed) access to all groups on the system. Note that this
-/// struct implements [`All`](trait.All.html), for a bunch of convenience
-/// functions.
+*/
+/// `AllGroups` provides (borrowed) access to all groups on the system. Note
+/// that this struct implements [`All`] for all of its access functions.
 ///
 /// General notes that also apply to this struct may be found with
-/// [`AllUsers`](struct.AllUsers.html).
+/// [`AllUsers`].
+#[derive(Debug)]
 pub struct AllGroups {
     groups: Vec<Group>,
     config: Config,
+    
+    group_fd: File,
 }
 
 impl AllGroups {
     /// Create a new `AllGroups`.
-    //TODO: Indicate if parsing an individual line failed or not
     pub fn new(config: Config) -> Result<AllGroups> {
-        let group_cntnt = read_locked_file(config.in_scheme(GROUP_FILE))?;
+        let mut group_fd = locked_file(config.in_scheme(GROUP_FILE), Lock::Exclusive)?;
+        let mut group_cntnt = String::new();
+        group_fd.read_to_string(&mut group_cntnt)?;
 
         let mut entries: Vec<Group> = Vec::new();
-        for line in group_cntnt.lines() {
-            if let Ok(group) = Group::from_str(line) {
-                entries.push(group);
-            }
+        for (indx, line) in group_cntnt.lines().enumerate() {
+            let group = Group::from_group_entry(line, indx)?;
+            entries.push(group);
         }
 
         Ok(AllGroups {
             groups: entries,
             config,
+            group_fd,
         })
     }
 
     /// Adds a group with the specified attributes to this `AllGroups`.
     ///
-    /// This function is classified as a mutating operation,
-    /// and users must therefore call [`save`](struct.AllGroups.html#method.save)
-    /// in order for the new group to be applied to the system.
+    /// Make sure to call [`AllGroups::save`] in order for the new group to be
+    /// applied to the system.
     //TODO: Take Option<usize> for gid and find unused ID if None
     pub fn add_group(
         &mut self,
@@ -1020,13 +1051,15 @@
 
     /// Syncs the data stored in this `AllGroups` instance to the filesystem.
     /// To apply changes from an `AllGroups`, you MUST call this function!
-    pub fn save(&self) -> Result<()> {
+    pub fn save(&mut self) -> Result<()> {
         let mut groupstring = String::new();
         for group in &self.groups {
-            groupstring.push_str(&format!("{}\n", group.to_string().as_str()));
+            groupstring.push_str(&group.group_entry());
         }
 
-        write_locked_file(self.config.in_scheme(GROUP_FILE), groupstring)
+        reset_file(&mut self.group_fd)?;
+        self.group_fd.write_all(groupstring.as_bytes())?;
+        Ok(())
     }
 }
 
@@ -1047,6 +1080,14 @@
 }
 
 impl All for AllGroups {}
+/*
+#[cfg(not(target_os = "redox"))]
+impl Drop for AllGroups {
+    fn drop(&mut self) {
+        eprintln!("Dropping AllGroups");
+        let _ = flock(self.group_fd.as_raw_fd(), FlockArg::Unlock);
+    }
+}*/
 
 #[cfg(test)]
 mod test {
@@ -1067,57 +1108,24 @@
             .scheme(TEST_PREFIX.to_string())
     }
 
-    fn test_auth_cfg() -> Config {
-        test_cfg().auth(true)
-    }
-
-    // *** struct.User ***
-    #[cfg(feature = "auth")]
-    #[test]
-    #[should_panic(expected = "Hash not populated!")]
-    fn wrong_attempt_set_password() {
-        let mut users = AllUsers::new(test_cfg()).unwrap();
-        let user = users.get_mut_by_id(1000).unwrap();
-        user.set_passwd("").unwrap();
-    }
-
-    #[test]
-    #[should_panic(expected = "Hash not populated!")]
-    fn wrong_attempt_unset_password() {
-        let mut users = AllUsers::new(test_cfg()).unwrap();
-        let user = users.get_mut_by_id(1000).unwrap();
-        user.unset_passwd();
+    fn read_locked_file(file: impl AsRef<Path>) -> Result<String> {
+        let mut fd = locked_file(file, Lock::Exclusive)?;
+        let mut cntnt = String::new();
+        fd.read_to_string(&mut cntnt)?;
+        Ok(cntnt)
     }
 
-    #[cfg(feature = "auth")]
-    #[test]
-    #[should_panic(expected = "Hash not populated!")]
-    fn wrong_attempt_verify_password() {
-        let mut users = AllUsers::new(test_cfg()).unwrap();
-        let user = users.get_mut_by_id(1000).unwrap();
-        user.verify_passwd("hi folks");
-    }
-
-    #[test]
-    #[should_panic(expected = "Hash not populated!")]
-    fn wrong_attempt_is_password_blank() {
-        let mut users = AllUsers::new(test_cfg()).unwrap();
-        let user = users.get_mut_by_id(1000).unwrap();
-        user.is_passwd_blank();
-    }
-
-    #[test]
-    #[should_panic(expected = "Hash not populated!")]
-    fn wrong_attempt_is_password_unset() {
-        let mut users = AllUsers::new(test_cfg()).unwrap();
-        let user = users.get_mut_by_id(1000).unwrap();
-        user.is_passwd_unset();
+    fn write_locked_file(file: impl AsRef<Path>, cntnt: impl AsRef<[u8]>) -> Result<()> {
+        locked_file(file, Lock::Exclusive)?
+            .write_all(cntnt.as_ref())?;
+        Ok(())
     }
 
+    // *** struct.User ***
     #[cfg(feature = "auth")]
     #[test]
     fn attempt_user_api() {
-        let mut users = AllUsers::new(test_auth_cfg()).unwrap();
+        let mut users = AllUsers::authenticator(test_cfg()).unwrap();
         let user = users.get_mut_by_id(1000).unwrap();
 
         assert_eq!(user.is_passwd_blank(), true);
@@ -1150,9 +1158,10 @@
     }
 
     // *** struct.AllUsers ***
+    #[cfg(feature = "auth")]
     #[test]
     fn get_user() {
-        let users = AllUsers::new(test_auth_cfg()).unwrap();
+        let users = AllUsers::authenticator(test_cfg()).unwrap();
 
         let root = users.get_by_id(0).expect("'root' user missing");
         assert_eq!(root.user, "root".to_string());
@@ -1203,11 +1212,11 @@
     #[cfg(feature = "auth")]
     #[test]
     fn manip_user() {
-        let mut users = AllUsers::new(test_auth_cfg()).unwrap();
+        let mut users = AllUsers::authenticator(test_cfg()).unwrap();
         // NOT testing `get_unique_id`
         let id = 7099;
         users
-            .add_user("fb", id, id, "FooBar", "/home/foob", "/bin/zsh")
+            .add_user("fb", id, id, "Foo Bar", "/home/foob", "/bin/zsh")
             .expect("failed to add user 'fb'");
         //                                            weirdo ^^^^^^^^ :P
         users.save().unwrap();
@@ -1218,7 +1227,7 @@
                 "root;0;0;root;file:/root;file:/bin/ion\n",
                 "user;1000;1000;user;file:/home/user;file:/bin/ion\n",
                 "li;1007;1007;Lorem;file:/home/lorem;file:/bin/ion\n",
-                "fb;7099;7099;FooBar;/home/foob;/bin/zsh\n"
+                "fb;7099;7099;Foo Bar;/home/foob;/bin/zsh\n"
             )
         );
         let s_file_content = read_locked_file(test_prefix(SHADOW_FILE)).unwrap();
@@ -1243,7 +1252,7 @@
                 "root;0;0;root;file:/root;file:/bin/ion\n",
                 "user;1000;1000;user;file:/home/user;file:/bin/ion\n",
                 "li;1007;1007;Lorem;file:/home/lorem;file:/bin/ion\n",
-                "fb;7099;7099;FooBar;/home/foob;/bin/fish\n"
+                "fb;7099;7099;Foo Bar;/home/foob;/bin/fish\n"
             )
         );
         let s_file_content = read_locked_file(test_prefix(SHADOW_FILE)).unwrap();
@@ -1267,6 +1276,21 @@
         );
     }
 
+    /* struct.Group */
+    #[test]
+    fn empty_groups() {
+        let group_trailing = Group::from_group_entry("nobody;2066; ", 0).unwrap();
+        assert_eq!(group_trailing.users.len(), 0);
+        
+        let group_no_trailing = Group::from_group_entry("nobody;2066;", 0).unwrap();
+        assert_eq!(group_no_trailing.users.len(), 0);
+        
+        assert_eq!(group_trailing.group, group_no_trailing.group);
+        assert_eq!(group_trailing.gid, group_no_trailing.gid);
+        assert_eq!(group_trailing.users, group_no_trailing.users);
+    }
+
+    /* struct.AllGroups */
     #[test]
     fn get_group() {
         let groups = AllGroups::new(test_cfg()).unwrap();
@@ -1331,11 +1355,47 @@
             )
         );
     }
+    
+    #[test]
+    fn empty_group() {
+        let mut groups = AllGroups::new(test_cfg()).unwrap();
+        
+        groups.add_group("nobody", 2260, &[]).unwrap();
+        groups.save().unwrap();
+        let file_content = read_locked_file(test_prefix(GROUP_FILE)).unwrap();
+        assert_eq!(
+            file_content,
+            concat!(
+                "root;0;root\n",
+                "user;1000;user\n",
+                "wheel;1;user,root\n",
+                "li;1007;li\n",
+                "nobody;2260;\n",
+            )
+        );
+        
+        drop(groups);
+        let mut groups = AllGroups::new(test_cfg()).unwrap();
+        
+        groups.remove_by_name("nobody");
+        groups.save().unwrap();
+        
+        let file_content = read_locked_file(test_prefix(GROUP_FILE)).unwrap();
+        assert_eq!(
+            file_content,
+            concat!(
+                "root;0;root\n",
+                "user;1000;user\n",
+                "wheel;1;user,root\n",
+                "li;1007;li\n"
+            )
+        );
+    }
 
     // *** Misc ***
     #[test]
     fn users_get_unused_ids() {
-        let users = AllUsers::new(test_cfg()).unwrap();
+        let users = AllUsers::basic(test_cfg()).unwrap();
         let id = users.get_unique_id().unwrap();
         if id < users.config.min_id || id > users.config.max_id {
             panic!("User ID is not between allowed margins")
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"3948880aff74f1a7025e8372cb7589e1228a910812ee226b9d31f0f2948b3387","Cargo.lock":"60f88c04a7090af68208fa7db066ce6858dfa76a59015bf92cd9bc979bd419fc","Cargo.toml":"7596370d3bb9123d29fc15f7d60bf3da24a94d5f3cbc4448da1861d23ccdaf25","HACKING.md":"17818f7a17723608f6bdbe6388ad0a913d4f96f76a16649aaf4e274b1fa0ea97","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","PERFORMANCE.md":"c776b18758b6dc8f2f9d37e9a95261f75c5f744925e8ddf216b83953bf7467b7","README.md":"ea639f8259ae4ff721ea3792d3d0529975e7d5ca80d67d0a27bd82ef464f5d0a","UNICODE.md":"27be97e94d0819ae18ae71029559c3de21c8ffd343d4a791959d0fc22b06dfe6","examples/regexdna-input.txt":"156a49710bb3e1ed4bc2bbb0af0f383b747b3d0281453cfff39c296124c598f8","examples/regexdna-output.txt":"35e85b19b70a893d752fd43e54e1e9da08bac43559191cea85b33387c24c4cc1","examples/shootout-regex-dna-bytes.rs":"e4f0d94e6d9cd4c7f6e340ed51b163f3331ce616dba4539d09f40919548d81d3","examples/shootout-regex-dna-cheat.rs":"bd5f4832c9a2e6f175d79064b2c4ee28dcae4b971f9618586664f99963bd0f8e","examples/shootout-regex-dna-replace.rs":"056e9ee51327a1cf9bd1da007e8c0af9c80a3e7fc2b3a3f63d0cf1b6b244ac74","examples/shootout-regex-dna-single-cheat.rs":"0beeb210972597db3a5c41901c78d78635681a833eba059064b28902e41d6f86","examples/shootout-regex-dna-single.rs":"a5d1ad8ebcfe9dd58bddc0d1ad838112cbce780f8f93c46892a70a1e25fd7c7f","examples/shootout-regex-dna.rs":"7724deec3d94cc5b55077380f7b9664edb5a49eaaa4cc7ba8356579c2ade7129","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/backtrack.rs":"bb24a32bc0d2f2f1c94439d8d0879ad8d15c910d4b9ab86c2833d93945cb088c","src/cache.rs":"df7b83b4f7278705ad1ecdf1284b962cc3b145797f1676c9a59e32c5944c848c","src/compile.rs":"81cf0b44924be2c0d66cbba92ee5649ff6403acbf8355d70e54acd977dc14cb4","src/dfa.rs":"50decee8c2460fa66276ecbf968223b242dd17f02ab731539911c5d261524d11","src/error.rs":"4d03ca3205e373125a0c9a4270fc1c5aa7b5a661b11db3508b563945a0827301","src/exec.rs":"a27ed0cb907dab6540fdf8cc785c799d7ea17f15f1236b80341934586874cd58","src/expand.rs":"6a1e012e84658f54ecefd6142173f1ca14eeeac52f4181a85ccc49eb94e5cd81","src/find_byte.rs":"b387247b77e3269f057c3399aefe5a815032c3af918c876f80eb4b282e4eb95e","src/freqs.rs":"255555f3d95b08a5bb3bc2f38d5a06cc100a39c0f0127fe4f50c33afa1cadc65","src/input.rs":"0bb20717cb630803f78b921260c96984a38a57685f07d9aee16b12deaa1d233b","src/lib.rs":"996120b528d88f27c3fc761a2f6e781236bb9cf48e25d576ba9b9ee8d31782b4","src/literal/imp.rs":"f242b29261423342e8cd941bdeb26b95eed73357fc313f8a019032374b77e056","src/literal/mod.rs":"46739643baa0cd5d1b8fc4521df3d727815c61e583af2ffca8b7b63bad3fa50e","src/pattern.rs":"e6124b403c18344675aa341faf9ae2f592193ef89f1c4a5e1cee135b8b34dd21","src/pikevm.rs":"3dd5794eecfe4ec80bee96d163025a417432c489732e84e125e51a4bc75d0235","src/prog.rs":"f47ac3accf7bd3456bd20902c6315f4063bbb6d9570c9b2f8309a0a1566d6323","src/re_builder.rs":"3ee35fa798c824be941c03e40e5dbeef47c96c2d19aeac2e2f7ca59727ff213b","src/re_bytes.rs":"c462d056c3d9f1b37c25d69ac352923e668fed40e5051c56b989023318c06d56","src/re_set.rs":"288d763014f428d0fed9aed9765688dfedce83e65174ae3648cb58548d5eea24","src/re_trait.rs":"e1964a8c601a692d41206f518709c26e9da81d389fcd6bdb6af99021b12e01d9","src/re_unicode.rs":"c26db778afde074d087c02768a93db952da0472a6d8244816e4482515248a480","src/sparse.rs":"43a0ad1c058228121523a2392bb20126b36760228845db157c8819f835e9bfde","src/testdata/LICENSE":"58cf078acc03da3e280a938c2bd9943f554fc9b6ced89ad93ba35ca436872899","src/testdata/README":"45f869e37f798905c773bfbe0ef19a5fb7e585cbf0b7c21b5b5a784e8cec3c14","src/testdata/basic.dat":"b5b33aa89d48a61cd67cb1fbfd8f70e62c83e30b86256f9f915a5190dd38ff06","src/testdata/nullsubexpr.dat":"496ac0278eec3b6d9170faace14554569032dd3d909618364d9326156de39ecf","src/testdata/repetition.dat":"1f7959063015b284b18a4a2c1c8b416d438a2d6c4b1a362da43406b865f50e69","src/utf8.rs":"708615a4859110cc9766b342a9c1da6c5c4a8a04ad239046b2725385db977efe","test":"bd7ca64a788d1f622ae10c5ac77160b10fc5f0d6adb7f3ba1828637f0ca68c81","tests/api.rs":"7b2a0ef75e99b9776094967bd66e9cdeaa8e11359f5f0a12bd08ef0e8d0c11fc","tests/api_str.rs":"2ae38c04e7e8fac008b609a820d0b1561ba75f39b0edc0987d6d3d06132da77f","tests/bytes.rs":"edc50f526c5fee43df89d639ef18b237e4eb91e9d533bfc43f3cbab7417d38ba","tests/consistent.rs":"8dadc60727306de8a539325d1d2af84172e5da2cbf50a71bb0c53eafe8039912","tests/crates_regex.rs":"91a59d470e0700b4bcb3ff735d06799f3107b8ef4875a2e9904607b164be0326","tests/crazy.rs":"d18ebe88bfe0f61df2761710a5f2362187f071bc952b4c0c898e5a8bfb58cce6","tests/flags.rs":"05caace2c81a99d2168037f3a38035d4dffe9f85ef3ebd7ef18b1bc6612f1ea8","tests/fowler.rs":"d78cf914de40b1e125cc92b65ccb444d462586bd07b5e05de4e4a1b5de16aa76","tests/macros.rs":"6db70c16fc90df13e6b30d2b606f8b6dd4dc976697967f6ee001b15aab6d0b19","tests/macros_bytes.rs":"73e2979f60acb009066c3a9a6c5809a0069a60c67fff7db675ea4e59299a7292","tests/macros_str.rs":"4c79ff4f2f5c379503794dd7e4116b3e7d4ac7679e47b81959fa054110a76c1a","tests/misc.rs":"395f52793fa022e4cdda78675b6a6fba1a3106b4b99c834c39f7801574054bd1","tests/multiline.rs":"1b1a3326ed976437c1357f01d81833ece7ea244f38826246eab55cacd5d0862a","tests/noparse.rs":"12b6be0eff3d80779d33c6459396c74c0f6ebf4ddc9f1d33c3e747ea9e3bf268","tests/regression.rs":"4d4aecf57ce5accf73fe8818267e8d45c9a15896d40093a5b5e1a09007a121a1","tests/regression_fuzz.rs":"f57b63e5fcc602d4ca6997411af4a706a6cf307f24ab0b5340a08fd4721bf373","tests/replace.rs":"fb3dd97c2877b71973065a74916cdef40d65a19a92c1ecfc117edfcd9eab3ced","tests/searcher.rs":"ce35e47b0a276a7e8c9060c6a0b225ffba163aebc61fbc15555a6897fa0e552c","tests/set.rs":"f1e2af6baeeaed3cc99ed347ff516fe7b2eb0027ef64b891502e1486598eaf8a","tests/shortest_match.rs":"a2c94390c0d61bc24796b4c1288c924e90c8c9c6156fdebb858175177a194a42","tests/suffix_reverse.rs":"b95f89397404871227d9efe6df23b9ded147f183db81597e608f693955c668b5","tests/test_backtrack.rs":"1e286679d643887f7b78ef5a74f5392ff27fa462b99891ce31938db1eacb3842","tests/test_backtrack_bytes.rs":"f66f2ed407795e92ae66eaa3b4b946acfe00d9ea422944c86353dd28812df5bb","tests/test_backtrack_utf8bytes.rs":"9d8c236fbdfa5092230f19ca4d2a7d647f68811d9ffa0813899d924e11d8fc0b","tests/test_crates_regex.rs":"b385d7ca10ed308b8d57074adb9525e18d3faadb5aa883e831dfa4f6669ba58d","tests/test_default.rs":"bb8a7a61fdf05dc52f65cad9ec80c95807f5911c6a1e9fa67fbe6538653a7f01","tests/test_default_bytes.rs":"fb3310fc315f7282358dcd98d156c31d66ca2432199afe012cf8921f459167a2","tests/test_nfa.rs":"97266c5edb15e5cde1496049a3ad0be4de33352dc32492f086d5351411ebe1ab","tests/test_nfa_bytes.rs":"9aa510e9583f847467c26ce902bd7e1c66cdd610cd50da4a1c1379afa35d4a53","tests/test_nfa_utf8bytes.rs":"2c22e16fa75edb5dbd278f2b8619404404a95b0792b31c440c9751c4aa2f7086","tests/unicode.rs":"4bf85f5c3d547fa8b5623194a09b6413067499dfbe7c1d29d8b50bf1cddacf6b","tests/word_boundary.rs":"7081317ddcec1e82dd4a2090a571c6abf2ff4bbfa8cd10395e1eb3f386157fae","tests/word_boundary_ascii.rs":"cd0be5b5b485de0ba7994b42e2864585556c3d2d8bf5eab05b58931d9aaf4b87","tests/word_boundary_unicode.rs":"75dbcc35d3abc0f9795c2ea99e216dc227b0a5b58e9ca5eef767815ff0513921"},"package":"38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"dc37d7389aa7f626a2a76f565b379378a63a043004674735e2b5859202b255ea","Cargo.lock":"b74b289188546209fb8b9024eb5cf7c43dc24b199cf2aaf2b11601ee24d9575d","Cargo.toml":"d5bf863bcab85700dc82190169003b7781f7985e51f7ba67a757fc2ba069ee6e","HACKING.md":"17818f7a17723608f6bdbe6388ad0a913d4f96f76a16649aaf4e274b1fa0ea97","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","PERFORMANCE.md":"0d5ef3866386918dfdefb1aa9a28cfe33cb3c8ceeb79f3f8ba5b88253dd95991","README.md":"c53b7bc36b660ca5fbd45a78e860107fa4deeaa35d23404e2ed37e5079a5352c","UNICODE.md":"a8a8399540eed000d19420135a527f400247a04572e44d124c786b870f518776","examples/regexdna-input.txt":"156a49710bb3e1ed4bc2bbb0af0f383b747b3d0281453cfff39c296124c598f8","examples/regexdna-output.txt":"35e85b19b70a893d752fd43e54e1e9da08bac43559191cea85b33387c24c4cc1","examples/shootout-regex-dna-bytes.rs":"fa2daedb4e0a05f64f33f4af62fbb0176db998e3676f8637ab684b725367a7b4","examples/shootout-regex-dna-cheat.rs":"1f871a6eaaf8372299fa3c762051112fa89a14235b03f734fc50ebd51ecaee72","examples/shootout-regex-dna-replace.rs":"32ffdf13ac6c4ce3fc32116a048e9cc682aa34cdb8e5beaf565a22addbdcd9ab","examples/shootout-regex-dna-single-cheat.rs":"809f75bf1e1917a53623eb6f1a3ce3b7d2ed98a6a1dbc0bd4853bec49a0c6f94","examples/shootout-regex-dna-single.rs":"1ab14f5703cd4be2e75a2e792e0ba1d322b9e4b14535d396805a4316d577f5bb","examples/shootout-regex-dna.rs":"20ea46ab63f91e3ac6a64e997eadd436a9cbc2f1bdade28e4512052f0e25bc34","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/backtrack.rs":"9018950f86564184a5dafd869a6c2cb3c4538ff302adbeccac33015f6e88f904","src/compile.rs":"84251b11081db43b712a887d424b79bdcd4738865e7df4d8667250cec553bac3","src/dfa.rs":"380580f54b0cee80c1a26caee3b4b76ad06ac63afdf8a8d351368a458454517d","src/error.rs":"71c85db839514f26ee024a689061743ea94a34eb7a3291e6c2b69b45a9682d09","src/exec.rs":"88b49098761db539e717c2965d2f56908c81aa10d91873d29a08484be7a11218","src/expand.rs":"ccba4798bd48ce40c34e91318f12258f46d8382e178a2c2b31c0d03b1ab51c5b","src/find_byte.rs":"b387247b77e3269f057c3399aefe5a815032c3af918c876f80eb4b282e4eb95e","src/freqs.rs":"255555f3d95b08a5bb3bc2f38d5a06cc100a39c0f0127fe4f50c33afa1cadc65","src/input.rs":"69595d1ea8d35351f5065ffdbf5965427d2e3fb5160a37008fa7e21d0eaa7720","src/lib.rs":"20bc28509e1853faea9581d43b21bc3ab144bb776e47fda4560082c4673854a6","src/literal/imp.rs":"5f73e0bcbee70c11041deca5ae84a8d30995963f452b29dd2fe5ab46d4978c12","src/literal/mod.rs":"533f1d68af088e9485170145e27518368e541a0337fdb44f63249ebf97310300","src/pattern.rs":"6f5909315f4542a989d9b1cee0bb3bc5b6749a665d73e32ec1c8ec4d71b78fac","src/pikevm.rs":"83423e5a94ea36e99dc6f69891ab200c1d0dadd3389ee296a816ec8d68bf556f","src/pool.rs":"942e991ae31ef349bd76efd78b2a712c01166dec965bf93742977ed0870d5a10","src/prog.rs":"78a02dcc1fc7b1d4f37a4a4eeb075eb5cc84aea1736e4de3a2cc7449a9ce5103","src/re_builder.rs":"943344bf6e2fc90902ee04b11b741c32418ac6814b21b7982cc0a3a817713f3e","src/re_bytes.rs":"c19bf2df00024e91f6f2b68be2d8971e847d6f16d7b949a04d2569736b1cdadb","src/re_set.rs":"a0cb76fafe7e33ea8c7b65aae53fa3432fc1651be186218b2284cb3c002ea966","src/re_trait.rs":"1c209fe30392b957f1bdcacdb900f222fc761a2e1634ab1c3f4ee97f315a0c22","src/re_unicode.rs":"1b25aa974065211a269e70b3636aef91e31f9ad7e395150c22e30317172169f8","src/sparse.rs":"0da3ddb7972109869248a764dbb10254555f4bb51c375e89fb3fab9cafa47320","src/testdata/LICENSE":"58cf078acc03da3e280a938c2bd9943f554fc9b6ced89ad93ba35ca436872899","src/testdata/README":"45f869e37f798905c773bfbe0ef19a5fb7e585cbf0b7c21b5b5a784e8cec3c14","src/testdata/basic.dat":"b5b33aa89d48a61cd67cb1fbfd8f70e62c83e30b86256f9f915a5190dd38ff06","src/testdata/nullsubexpr.dat":"496ac0278eec3b6d9170faace14554569032dd3d909618364d9326156de39ecf","src/testdata/repetition.dat":"1f7959063015b284b18a4a2c1c8b416d438a2d6c4b1a362da43406b865f50e69","src/utf8.rs":"708615a4859110cc9766b342a9c1da6c5c4a8a04ad239046b2725385db977efe","test":"0d62fdca7da12fc19ea5306b5de1d83e68d9365a029c043d524334da138b0304","tests/api.rs":"7b2a0ef75e99b9776094967bd66e9cdeaa8e11359f5f0a12bd08ef0e8d0c11fc","tests/api_str.rs":"2ae38c04e7e8fac008b609a820d0b1561ba75f39b0edc0987d6d3d06132da77f","tests/bytes.rs":"edc50f526c5fee43df89d639ef18b237e4eb91e9d533bfc43f3cbab7417d38ba","tests/consistent.rs":"d69435154c09478076497216e43081a835ac65147181a4fbddad7bff469605b2","tests/crates_regex.rs":"91a59d470e0700b4bcb3ff735d06799f3107b8ef4875a2e9904607b164be0326","tests/crazy.rs":"c0d56380dff19bdd5d7a3eb731d0e2dc564e169a1b73c81e1879b1e87f5f5f77","tests/flags.rs":"05caace2c81a99d2168037f3a38035d4dffe9f85ef3ebd7ef18b1bc6612f1ea8","tests/fowler.rs":"d78cf914de40b1e125cc92b65ccb444d462586bd07b5e05de4e4a1b5de16aa76","tests/macros.rs":"6db70c16fc90df13e6b30d2b606f8b6dd4dc976697967f6ee001b15aab6d0b19","tests/macros_bytes.rs":"a049f528a93173a1bb176cd46932dce1880679f4a1752e099be920f0e4546fd0","tests/macros_str.rs":"e585b1461374c45a2eca44ca045bc3c1fe984b2b4212e432b0c695b420e708b7","tests/misc.rs":"395f52793fa022e4cdda78675b6a6fba1a3106b4b99c834c39f7801574054bd1","tests/multiline.rs":"1b1a3326ed976437c1357f01d81833ece7ea244f38826246eab55cacd5d0862a","tests/noparse.rs":"12b6be0eff3d80779d33c6459396c74c0f6ebf4ddc9f1d33c3e747ea9e3bf268","tests/regression.rs":"4d4aecf57ce5accf73fe8818267e8d45c9a15896d40093a5b5e1a09007a121a1","tests/regression_fuzz.rs":"a504ec563e0d23bd2039493b7b1767fe1f831d7d668f6f4b2ecd124fc7899bcd","tests/replace.rs":"0efa042c0d531911e8ac41ce98a6b60236cbf40954102c59f9f6dea78d9d74dd","tests/searcher.rs":"ce35e47b0a276a7e8c9060c6a0b225ffba163aebc61fbc15555a6897fa0e552c","tests/set.rs":"f1e2af6baeeaed3cc99ed347ff516fe7b2eb0027ef64b891502e1486598eaf8a","tests/shortest_match.rs":"a2c94390c0d61bc24796b4c1288c924e90c8c9c6156fdebb858175177a194a42","tests/suffix_reverse.rs":"b95f89397404871227d9efe6df23b9ded147f183db81597e608f693955c668b5","tests/test_backtrack.rs":"b70c5e5f1241efd76dd9f9dd4a4df8a7b38113bd407d1f5f56867f1176177a59","tests/test_backtrack_bytes.rs":"b8a111d4b4109c8bba7e2afb650572c495a14d357fb1f743c1076fb001f704b5","tests/test_backtrack_utf8bytes.rs":"c0c279785d18beac2b4e178e7bf6c14ed235d65f00ca467cfd9c333d79487649","tests/test_crates_regex.rs":"fd9525c2eef0e2f8cb7f787bc2b721bcd0b5d84f3bca49adfe48d657a99c721a","tests/test_default.rs":"9dadd426a991683e601d3e52b1f6a551d531a23408ea791e5446eae83a3e8b6c","tests/test_default_bytes.rs":"831d3e6bfb882feb15f700e30304bd34328f888fb4c15c7169371e25024ce9a7","tests/test_nfa.rs":"f119fc43a018249c39c813d57096b0654ff69f337345f2bbd9b0e61cc9137285","tests/test_nfa_bytes.rs":"89eae3bef6a1d0bcea6b5de5be35ad72f613f2ceb8b58fe82a6c6ef2ccdc07d0","tests/test_nfa_utf8bytes.rs":"7d830b4aa401887d7cf098b62fed4cd8017ef8b61f625c7c9a2159a6b4cfeb71","tests/unicode.rs":"4bf85f5c3d547fa8b5623194a09b6413067499dfbe7c1d29d8b50bf1cddacf6b","tests/word_boundary.rs":"7081317ddcec1e82dd4a2090a571c6abf2ff4bbfa8cd10395e1eb3f386157fae","tests/word_boundary_ascii.rs":"cd0be5b5b485de0ba7994b42e2864585556c3d2d8bf5eab05b58931d9aaf4b87","tests/word_boundary_unicode.rs":"75dbcc35d3abc0f9795c2ea99e216dc227b0a5b58e9ca5eef767815ff0513921"},"package":"d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,42 +1,34 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "aho-corasick"
-version = "0.7.14"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "autocfg"
-version = "0.1.7"
+name = "cfg-if"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "bitflags"
-version = "1.2.1"
+name = "getrandom"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
 dependencies = [
- "bitflags",
+ "cfg-if",
+ "libc",
+ "wasi",
 ]
 
 [[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -50,138 +42,40 @@
 
 [[package]]
 name = "memchr"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "quickcheck"
-version = "0.8.5"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c35d9c36a562f37eca96e79f66d5fd56eefbc22560dacc4a864cabd2d277456"
+checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
  "rand",
- "rand_core 0.4.2",
 ]
 
 [[package]]
 name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg",
- "libc",
- "rand_chacha",
- "rand_core 0.4.2",
- "rand_hc",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
 dependencies = [
- "autocfg",
- "rand_core 0.3.1",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.3.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
+ "getrandom",
 ]
 
 [[package]]
 name = "regex"
-version = "1.4.2"
+version = "1.5.4"
 dependencies = [
  "aho-corasick",
  "lazy_static",
@@ -189,42 +83,16 @@
  "quickcheck",
  "rand",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
-
-[[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
+name = "wasi"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "regex"
-version = "1.4.2"
+version = "1.5.4"
 authors = ["The Rust Project Developers"]
 exclude = ["/scripts/*", "/.github/*"]
 autotests = false
@@ -72,35 +73,33 @@
 name = "crates-regex"
 path = "tests/test_crates_regex.rs"
 [dependencies.aho-corasick]
-version = "0.7.6"
+version = "0.7.18"
 optional = true
 
 [dependencies.memchr]
-version = "2.2.1"
+version = "2.4.0"
 optional = true
 
 [dependencies.regex-syntax]
-version = "0.6.21"
+version = "0.6.25"
 default-features = false
-
-[dependencies.thread_local]
-version = "1"
-optional = true
 [dev-dependencies.lazy_static]
 version = "1"
 
 [dev-dependencies.quickcheck]
-version = "0.8"
+version = "1.0.3"
 default-features = false
 
 [dev-dependencies.rand]
-version = "0.6.5"
+version = "0.8.3"
+features = ["getrandom", "small_rng"]
+default-features = false
 
 [features]
 default = ["std", "perf", "unicode", "regex-syntax/default"]
 pattern = []
 perf = ["perf-cache", "perf-dfa", "perf-inline", "perf-literal"]
-perf-cache = ["thread_local"]
+perf-cache = []
 perf-dfa = []
 perf-inline = []
 perf-literal = ["aho-corasick", "memchr"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,109 @@
+1.5.4 (2021-05-06)
+==================
+This release fixes another compilation failure when building regex. This time,
+the fix is for when the `pattern` feature is enabled, which only works on
+nightly Rust. CI has been updated to test this case.
+
+* [BUG #772](https://github.com/rust-lang/regex/pull/772):
+  Fix build when `pattern` feature is enabled.
+
+
+1.5.3 (2021-05-01)
+==================
+This releases fixes a bug when building regex with only the `unicode-perl`
+feature. It turns out that while CI was building this configuration, it wasn't
+actually failing the overall build on a failed compilation.
+
+* [BUG #769](https://github.com/rust-lang/regex/issues/769):
+  Fix build in `regex-syntax` when only the `unicode-perl` feature is enabled.
+
+
+1.5.2 (2021-05-01)
+==================
+This release fixes a performance bug when Unicode word boundaries are used.
+Namely, for certain regexes on certain inputs, it's possible for the lazy DFA
+to stop searching (causing a fallback to a slower engine) when it doesn't
+actually need to.
+
+[PR #768](https://github.com/rust-lang/regex/pull/768) fixes the bug, which was
+originally reported in
+[ripgrep#1860](https://github.com/BurntSushi/ripgrep/issues/1860).
+
+
+1.5.1 (2021-04-30)
+==================
+This is a patch release that fixes a compilation error when the `perf-literal`
+feature is not enabled.
+
+
+1.5.0 (2021-04-30)
+==================
+This release primarily updates to Rust 2018 (finally) and bumps the MSRV to
+Rust 1.41 (from Rust 1.28). Rust 1.41 was chosen because it's still reasonably
+old, and is what's in Debian stable at the time of writing.
+
+This release also drops this crate's own bespoke substring search algorithms
+in favor of a new
+[`memmem` implementation provided by the `memchr` crate](https://docs.rs/memchr/2.4.0/memchr/memmem/index.html).
+This will change the performance profile of some regexes, sometimes getting a
+little worse, and hopefully more frequently, getting a lot better. Please
+report any serious performance regressions if you find them.
+
+
+1.4.6 (2021-04-22)
+==================
+This is a small patch release that fixes the compiler's size check on how much
+heap memory a regex uses. Previously, the compiler did not account for the
+heap usage of Unicode character classes. Now it does. It's possible that this
+may make some regexes fail to compile that previously did compile. If that
+happens, please file an issue.
+
+* [BUG OSS-fuzz#33579](https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33579):
+  Some regexes can use more heap memory than one would expect.
+
+
+1.4.5 (2021-03-14)
+==================
+This is a small patch release that fixes a regression in the size of a `Regex`
+in the 1.4.4 release. Prior to 1.4.4, a `Regex` was 552 bytes. In the 1.4.4
+release, it was 856 bytes due to internal changes. In this release, a `Regex`
+is now 16 bytes. In general, the size of a `Regex` was never something that was
+on my radar, but this increased size in the 1.4.4 release seems to have crossed
+a threshold and resulted in stack overflows in some programs.
+
+* [BUG #750](https://github.com/rust-lang/regex/pull/750):
+  Fixes stack overflows seemingly caused by a large `Regex` size by decreasing
+  its size.
+
+
+1.4.4 (2021-03-11)
+==================
+This is a small patch release that contains some bug fixes. Notably, it also
+drops the `thread_local` (and `lazy_static`, via transitivity) dependencies.
+
+Bug fixes:
+
+* [BUG #362](https://github.com/rust-lang/regex/pull/362):
+  Memory leaks caused by an internal caching strategy should now be fixed.
+* [BUG #576](https://github.com/rust-lang/regex/pull/576):
+  All regex types now implement `UnwindSafe` and `RefUnwindSafe`.
+* [BUG #728](https://github.com/rust-lang/regex/pull/749):
+  Add missing `Replacer` impls for `Vec<u8>`, `String`, `Cow`, etc.
+
+
+1.4.3 (2021-01-08)
+==================
+This is a small patch release that adds some missing standard trait
+implementations for some types in the public API.
+
+Bug fixes:
+
+* [BUG #734](https://github.com/rust-lang/regex/pull/734):
+  Add `FusedIterator` and `ExactSizeIterator` impls to iterator types.
+* [BUG #735](https://github.com/rust-lang/regex/pull/735):
+  Add missing `Debug` impls to public API types.
+
+
 1.4.2 (2020-11-01)
 ==================
 This is a small bug fix release that bans `\P{any}`. We previously banned empty
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,10 @@
 // The Computer Language Benchmarks Game
-// http://benchmarksgame.alioth.debian.org/
+// https://benchmarksgame-team.pages.debian.net/benchmarksgame/
 //
 // contributed by the Rust Project Developers
 // contributed by TeXitoi
 // contributed by BurntSushi
 
-extern crate regex;
-
 use std::io::{self, Read};
 use std::sync::Arc;
 use std::thread;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-cheat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-cheat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-cheat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-cheat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 // The Computer Language Benchmarks Game
-// http://benchmarksgame.alioth.debian.org/
+// https://benchmarksgame-team.pages.debian.net/benchmarksgame/
 //
 // contributed by the Rust Project Developers
 // contributed by TeXitoi
@@ -10,8 +10,6 @@
 // replacing them with a single linear scan. i.e., it re-implements
 // `replace_all`. As a result, this is around 25% faster. ---AG
 
-extern crate regex;
-
 use std::io::{self, Read};
 use std::sync::Arc;
 use std::thread;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-replace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-replace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-replace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-replace.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,3 @@
-extern crate regex;
-
 use std::io::{self, Read};
 
 macro_rules! regex {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,10 @@
 // The Computer Language Benchmarks Game
-// http://benchmarksgame.alioth.debian.org/
+// https://benchmarksgame-team.pages.debian.net/benchmarksgame/
 //
 // contributed by the Rust Project Developers
 // contributed by TeXitoi
 // contributed by BurntSushi
 
-extern crate regex;
-
 use std::io::{self, Read};
 use std::sync::Arc;
 use std::thread;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-single-cheat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-single-cheat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-single-cheat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-single-cheat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,10 @@
 // The Computer Language Benchmarks Game
-// http://benchmarksgame.alioth.debian.org/
+// https://benchmarksgame-team.pages.debian.net/benchmarksgame/
 //
 // contributed by the Rust Project Developers
 // contributed by TeXitoi
 // contributed by BurntSushi
 
-extern crate regex;
-
 use std::io::{self, Read};
 
 macro_rules! regex {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-single.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-single.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-single.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/examples/shootout-regex-dna-single.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,10 @@
 // The Computer Language Benchmarks Game
-// http://benchmarksgame.alioth.debian.org/
+// https://benchmarksgame-team.pages.debian.net/benchmarksgame/
 //
 // contributed by the Rust Project Developers
 // contributed by TeXitoi
 // contributed by BurntSushi
 
-extern crate regex;
-
 use std::io::{self, Read};
 
 macro_rules! regex {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/PERFORMANCE.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/PERFORMANCE.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/PERFORMANCE.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/PERFORMANCE.md	2021-12-09 12:01:26.000000000 +0000
@@ -62,9 +62,7 @@
 [`lazy_static`](https://crates.io/crates/lazy_static)
 crate provides an answer that works well:
 
-    #[macro_use] extern crate lazy_static;
-    extern crate regex;
-
+    use lazy_static::lazy_static;
     use regex::Regex;
 
     fn some_helper_function(text: &str) -> bool {
@@ -147,9 +145,9 @@
 `is_match` is fastest because it doesn't actually need to find the start or the
 end of the leftmost-first match. It can quit immediately after it knows there
 is a match. For example, given the regex `a+` and the haystack, `aaaaa`, the
-search will quit after examing the first byte.
+search will quit after examining the first byte.
 
-In constrast, `find` must return both the start and end location of the
+In contrast, `find` must return both the start and end location of the
 leftmost-first match. It can use the DFA matcher for this, but must run it
 forwards once to find the end of the match *and then run it backwards* to find
 the start of the match. The two scans and the cost of finding the real end of
@@ -198,7 +196,7 @@
 
 Literals in anchored regexes can also be used for detecting non-matches very
 quickly. For example, `^foo\w+` and `\w+foo$` may be able to detect a non-match
-just by examing the first (or last) three bytes of the haystack.
+just by examining the first (or last) three bytes of the haystack.
 
 ## Unicode word boundaries may prevent the DFA from being used
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
 
 [![Build status](https://github.com/rust-lang/regex/workflows/ci/badge.svg)](https://github.com/rust-lang/regex/actions)
 [![](https://meritbadge.herokuapp.com/regex)](https://crates.io/crates/regex)
-[![Rust](https://img.shields.io/badge/rust-1.28.0%2B-blue.svg?maxAge=3600)](https://github.com/rust-lang/regex)
+[![Rust](https://img.shields.io/badge/rust-1.41.1%2B-blue.svg?maxAge=3600)](https://github.com/rust-lang/regex)
 
 ### Documentation
 
@@ -27,13 +27,7 @@
 
 ```toml
 [dependencies]
-regex = "1"
-```
-
-and this to your crate root (if you're using Rust 2015):
-
-```rust
-extern crate regex;
+regex = "1.5"
 ```
 
 Here's a simple example that matches a date in YYYY-MM-DD format and prints the
@@ -228,7 +222,7 @@
 
 ### Minimum Rust version policy
 
-This crate's minimum supported `rustc` version is `1.28.0`.
+This crate's minimum supported `rustc` version is `1.41.1`.
 
 The current **tentative** policy is that the minimum Rust version required
 to use this crate can be increased in minor version updates. For example, if
@@ -245,12 +239,12 @@
 This project is licensed under either of
 
  * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
+   https://www.apache.org/licenses/LICENSE-2.0)
  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
+   https://opensource.org/licenses/MIT)
 
 at your option.
 
 The data in `regex-syntax/src/unicode_tables/` is licensed under the Unicode
 License Agreement
-([LICENSE-UNICODE](http://www.unicode.org/copyright.html#License)).
+([LICENSE-UNICODE](https://www.unicode.org/copyright.html#License)).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/backtrack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/backtrack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/backtrack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/backtrack.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,10 +16,10 @@
 // the bitset has to be zeroed on each execution, which becomes quite expensive
 // on large bitsets.
 
-use exec::ProgramCache;
-use input::{Input, InputAt};
-use prog::{InstPtr, Program};
-use re_trait::Slot;
+use crate::exec::ProgramCache;
+use crate::input::{Input, InputAt};
+use crate::prog::{InstPtr, Program};
+use crate::re_trait::Slot;
 
 type Bits = u32;
 
@@ -115,8 +115,8 @@
         // Then we reset all existing allocated space to 0.
         // Finally, we request more space if we need it.
         //
-        // This is all a little circuitous, but doing this unsafely
-        // doesn't seem to have a measurable impact on performance.
+        // This is all a little circuitous, but doing this using unchecked
+        // operations doesn't seem to have a measurable impact on performance.
         // (Probably because backtracking is limited to such small
         // inputs/regexes in the first place.)
         let visited_len =
@@ -196,7 +196,7 @@
     }
 
     fn step(&mut self, mut ip: InstPtr, mut at: InputAt) -> bool {
-        use prog::Inst::*;
+        use crate::prog::Inst::*;
         loop {
             // This loop is an optimization to avoid constantly pushing/popping
             // from the stack. Namely, if we're pushing a job only to run it
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/cache.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/cache.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/cache.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/cache.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-// This module defines a common API for caching internal runtime state.
-// The `thread_local` crate provides an extremely optimized version of this.
-// However, if the perf-cache feature is disabled, then we drop the
-// thread_local dependency and instead use a pretty naive caching mechanism
-// with a mutex.
-//
-// Strictly speaking, the CachedGuard isn't necessary for the much more
-// flexible thread_local API, but implementing thread_local's API doesn't
-// seem possible in purely safe code.
-
-pub use self::imp::{Cached, CachedGuard};
-
-#[cfg(feature = "perf-cache")]
-mod imp {
-    use thread_local::CachedThreadLocal;
-
-    #[derive(Debug)]
-    pub struct Cached<T: Send>(CachedThreadLocal<T>);
-
-    #[derive(Debug)]
-    pub struct CachedGuard<'a, T: 'a>(&'a T);
-
-    impl<T: Send> Cached<T> {
-        pub fn new() -> Cached<T> {
-            Cached(CachedThreadLocal::new())
-        }
-
-        pub fn get_or(&self, create: impl FnOnce() -> T) -> CachedGuard<T> {
-            CachedGuard(self.0.get_or(|| create()))
-        }
-    }
-
-    impl<'a, T: Send> CachedGuard<'a, T> {
-        pub fn value(&self) -> &T {
-            self.0
-        }
-    }
-}
-
-#[cfg(not(feature = "perf-cache"))]
-mod imp {
-    use std::marker::PhantomData;
-    use std::panic::UnwindSafe;
-    use std::sync::Mutex;
-
-    #[derive(Debug)]
-    pub struct Cached<T: Send> {
-        stack: Mutex<Vec<T>>,
-        /// When perf-cache is enabled, the thread_local crate is used, and
-        /// its CachedThreadLocal impls Send, Sync and UnwindSafe, but NOT
-        /// RefUnwindSafe. However, a Mutex impls RefUnwindSafe. So in order
-        /// to keep the APIs consistent regardless of whether perf-cache is
-        /// enabled, we force this type to NOT impl RefUnwindSafe too.
-        ///
-        /// Ideally, we should always impl RefUnwindSafe, but it seems a little
-        /// tricky to do that right now.
-        ///
-        /// See also: https://github.com/rust-lang/regex/issues/576
-        _phantom: PhantomData<Box<dyn Send + Sync + UnwindSafe>>,
-    }
-
-    #[derive(Debug)]
-    pub struct CachedGuard<'a, T: 'a + Send> {
-        cache: &'a Cached<T>,
-        value: Option<T>,
-    }
-
-    impl<T: Send> Cached<T> {
-        pub fn new() -> Cached<T> {
-            Cached { stack: Mutex::new(vec![]), _phantom: PhantomData }
-        }
-
-        pub fn get_or(&self, create: impl FnOnce() -> T) -> CachedGuard<T> {
-            let mut stack = self.stack.lock().unwrap();
-            match stack.pop() {
-                None => CachedGuard { cache: self, value: Some(create()) },
-                Some(value) => CachedGuard { cache: self, value: Some(value) },
-            }
-        }
-
-        fn put(&self, value: T) {
-            let mut stack = self.stack.lock().unwrap();
-            stack.push(value);
-        }
-    }
-
-    impl<'a, T: Send> CachedGuard<'a, T> {
-        pub fn value(&self) -> &T {
-            self.value.as_ref().unwrap()
-        }
-    }
-
-    impl<'a, T: Send> Drop for CachedGuard<'a, T> {
-        fn drop(&mut self) {
-            if let Some(value) = self.value.take() {
-                self.cache.put(value);
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/compile.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/compile.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/compile.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/compile.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,19 @@
 use std::collections::HashMap;
+use std::fmt;
 use std::iter;
 use std::result;
 use std::sync::Arc;
 
-use syntax::hir::{self, Hir};
-use syntax::is_word_byte;
-use syntax::utf8::{Utf8Range, Utf8Sequence, Utf8Sequences};
+use regex_syntax::hir::{self, Hir};
+use regex_syntax::is_word_byte;
+use regex_syntax::utf8::{Utf8Range, Utf8Sequence, Utf8Sequences};
 
-use prog::{
+use crate::prog::{
     EmptyLook, Inst, InstBytes, InstChar, InstEmptyLook, InstPtr, InstRanges,
     InstSave, InstSplit, Program,
 };
 
-use Error;
+use crate::Error;
 
 type Result = result::Result<Patch, Error>;
 type ResultOrEmpty = result::Result<Option<Patch>, Error>;
@@ -25,6 +26,9 @@
 
 /// A compiler translates a regular expression AST to a sequence of
 /// instructions. The sequence of instructions represents an NFA.
+// `Compiler` is only public via the `internal` module, so avoid deriving
+// `Debug`.
+#[allow(missing_debug_implementations)]
 pub struct Compiler {
     insts: Vec<MaybeInst>,
     compiled: Program,
@@ -34,6 +38,7 @@
     suffix_cache: SuffixCache,
     utf8_seqs: Option<Utf8Sequences>,
     byte_classes: ByteClassSet,
+    extra_inst_bytes: usize,
 }
 
 impl Compiler {
@@ -50,6 +55,7 @@
             suffix_cache: SuffixCache::new(1000),
             utf8_seqs: Some(Utf8Sequences::new('\x00', '\x00')),
             byte_classes: ByteClassSet::new(),
+            extra_inst_bytes: 0,
         }
     }
 
@@ -249,8 +255,8 @@
     /// Ok(None) is returned when an expression is compiled to no
     /// instruction, and so no patch.entry value makes sense.
     fn c(&mut self, expr: &Hir) -> ResultOrEmpty {
-        use prog;
-        use syntax::hir::HirKind::*;
+        use crate::prog;
+        use regex_syntax::hir::HirKind::*;
 
         self.check_size()?;
         match *expr.kind() {
@@ -312,6 +318,13 @@
                 }
                 self.compiled.has_unicode_word_boundary = true;
                 self.byte_classes.set_word_boundary();
+                // We also make sure that all ASCII bytes are in a different
+                // class from non-ASCII bytes. Otherwise, it's possible for
+                // ASCII bytes to get lumped into the same class as non-ASCII
+                // bytes. This in turn may cause the lazy DFA to falsely start
+                // when it sees an ASCII byte that maps to a byte class with
+                // non-ASCII bytes. This ensures that never happens.
+                self.byte_classes.set_range(0, 0x7F);
                 self.c_empty_look(prog::EmptyLook::WordBoundary)
             }
             WordBoundary(hir::WordBoundary::UnicodeNegate) => {
@@ -324,6 +337,8 @@
                 }
                 self.compiled.has_unicode_word_boundary = true;
                 self.byte_classes.set_word_boundary();
+                // See comments above for why we set the ASCII range here.
+                self.byte_classes.set_range(0, 0x7F);
                 self.c_empty_look(prog::EmptyLook::NotWordBoundary)
             }
             WordBoundary(hir::WordBoundary::Ascii) => {
@@ -416,6 +431,8 @@
     }
 
     fn c_class(&mut self, ranges: &[hir::ClassUnicodeRange]) -> ResultOrEmpty {
+        use std::mem::size_of;
+
         assert!(!ranges.is_empty());
         if self.compiled.uses_bytes() {
             Ok(Some(CompileClass { c: self, ranges: ranges }.compile()?))
@@ -425,6 +442,8 @@
             let hole = if ranges.len() == 1 && ranges[0].0 == ranges[0].1 {
                 self.push_hole(InstHole::Char { c: ranges[0].0 })
             } else {
+                self.extra_inst_bytes +=
+                    ranges.len() * (size_of::<char>() * 2);
                 self.push_hole(InstHole::Ranges { ranges: ranges })
             };
             Ok(Some(Patch { hole: hole, entry: self.insts.len() - 1 }))
@@ -544,7 +563,7 @@
     }
 
     fn c_repeat(&mut self, rep: &hir::Repetition) -> ResultOrEmpty {
-        use syntax::hir::RepetitionKind::*;
+        use regex_syntax::hir::RepetitionKind::*;
         match rep.kind {
             ZeroOrOne => self.c_repeat_zero_or_one(&rep.hir, rep.greedy),
             ZeroOrMore => self.c_repeat_zero_or_more(&rep.hir, rep.greedy),
@@ -791,7 +810,9 @@
     fn check_size(&self) -> result::Result<(), Error> {
         use std::mem::size_of;
 
-        if self.insts.len() * size_of::<Inst>() > self.size_limit {
+        let size =
+            self.extra_inst_bytes + (self.insts.len() * size_of::<Inst>());
+        if size > self.size_limit {
             Err(Error::CompiledTooBig(self.size_limit))
         } else {
             Ok(())
@@ -923,9 +944,10 @@
                 Inst::EmptyLook(InstEmptyLook { goto: goto, look: look })
             }
             InstHole::Char { c } => Inst::Char(InstChar { goto: goto, c: c }),
-            InstHole::Ranges { ref ranges } => {
-                Inst::Ranges(InstRanges { goto: goto, ranges: ranges.clone() })
-            }
+            InstHole::Ranges { ref ranges } => Inst::Ranges(InstRanges {
+                goto: goto,
+                ranges: ranges.clone().into_boxed_slice(),
+            }),
             InstHole::Bytes { start, end } => {
                 Inst::Bytes(InstBytes { goto: goto, start: start, end: end })
             }
@@ -1051,6 +1073,7 @@
 /// This uses similar idea to [`SparseSet`](../sparse/struct.SparseSet.html),
 /// except it uses hashes as original indices and then compares full keys for
 /// validation against `dense` array.
+#[derive(Debug)]
 struct SuffixCache {
     sparse: Box<[usize]>,
     dense: Vec<SuffixCacheEntry>,
@@ -1159,6 +1182,12 @@
     }
 }
 
+impl fmt::Debug for ByteClassSet {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_tuple("ByteClassSet").field(&&self.0[..]).finish()
+    }
+}
+
 fn u32_to_usize(n: u32) -> usize {
     // In case usize is less than 32 bits, we need to guard against overflow.
     // On most platforms this compiles to nothing.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/dfa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/dfa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/dfa.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/dfa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -42,9 +42,9 @@
 use std::mem;
 use std::sync::Arc;
 
-use exec::ProgramCache;
-use prog::{Inst, Program};
-use sparse::SparseSet;
+use crate::exec::ProgramCache;
+use crate::prog::{Inst, Program};
+use crate::sparse::SparseSet;
 
 /// Return true if and only if the given program can be executed by a DFA.
 ///
@@ -55,7 +55,7 @@
 /// This function will also return false if the given program has any Unicode
 /// instructions (Char or Ranges) since the DFA operates on bytes only.
 pub fn can_exec(insts: &Program) -> bool {
-    use prog::Inst::*;
+    use crate::prog::Inst::*;
     // If for some reason we manage to allocate a regex program with more
     // than i32::MAX instructions, then we can't execute the DFA because we
     // use 32 bit instruction pointer deltas for memory savings.
@@ -306,7 +306,7 @@
         StateFlags(self.data[0])
     }
 
-    fn inst_ptrs(&self) -> InstPtrs {
+    fn inst_ptrs(&self) -> InstPtrs<'_> {
         InstPtrs { base: 0, data: &self.data[1..] }
     }
 }
@@ -848,7 +848,7 @@
     /// next_si transitions to the next state, where the transition input
     /// corresponds to text[i].
     ///
-    /// This elides bounds checks, and is therefore unsafe.
+    /// This elides bounds checks, and is therefore not safe.
     #[cfg_attr(feature = "perf-inline", inline(always))]
     unsafe fn next_si(&self, si: StatePtr, text: &[u8], i: usize) -> StatePtr {
         // What is the argument for safety here?
@@ -894,7 +894,7 @@
         mut si: StatePtr,
         b: Byte,
     ) -> Option<StatePtr> {
-        use prog::Inst::*;
+        use crate::prog::Inst::*;
 
         // Initialize a queue with the current DFA state's NFA states.
         qcur.clear();
@@ -1056,8 +1056,8 @@
         q: &mut SparseSet,
         flags: EmptyFlags,
     ) {
-        use prog::EmptyLook::*;
-        use prog::Inst::*;
+        use crate::prog::EmptyLook::*;
+        use crate::prog::Inst::*;
 
         // We need to traverse the NFA to follow epsilon transitions, so avoid
         // recursion with an explicit stack.
@@ -1190,7 +1190,7 @@
         q: &SparseSet,
         state_flags: &mut StateFlags,
     ) -> Option<State> {
-        use prog::Inst::*;
+        use crate::prog::Inst::*;
 
         // We need to build up enough information to recognize pre-built states
         // in the DFA. Generally speaking, this includes every instruction
@@ -1688,7 +1688,7 @@
         self.num_byte_classes * mem::size_of::<StatePtr>()
     }
 
-    /// Like `next`, but uses unchecked access and is therefore unsafe.
+    /// Like `next`, but uses unchecked access and is therefore not safe.
     unsafe fn next_unchecked(&self, si: StatePtr, cls: usize) -> StatePtr {
         debug_assert!((si as usize) < self.table.len());
         debug_assert!(cls < self.num_byte_classes);
@@ -1754,7 +1754,7 @@
 }
 
 impl fmt::Debug for State {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let ips: Vec<usize> = self.inst_ptrs().collect();
         f.debug_struct("State")
             .field("flags", &self.flags())
@@ -1764,7 +1764,7 @@
 }
 
 impl fmt::Debug for Transitions {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut fmtd = f.debug_map();
         for si in 0..self.num_states() {
             let s = si * self.num_byte_classes;
@@ -1778,7 +1778,7 @@
 struct TransitionsRow<'a>(&'a [StatePtr]);
 
 impl<'a> fmt::Debug for TransitionsRow<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut fmtd = f.debug_map();
         for (b, si) in self.0.iter().enumerate() {
             match *si {
@@ -1796,7 +1796,7 @@
 }
 
 impl fmt::Debug for StateFlags {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("StateFlags")
             .field("is_match", &self.is_match())
             .field("is_word", &self.is_word())
@@ -1889,18 +1889,27 @@
 
 #[cfg(test)]
 mod tests {
-    extern crate rand;
 
     use super::{
         push_inst_ptr, read_vari32, read_varu32, write_vari32, write_varu32,
         State, StateFlags,
     };
-    use quickcheck::{quickcheck, QuickCheck, StdGen};
+    use quickcheck::{quickcheck, Gen, QuickCheck};
     use std::sync::Arc;
 
     #[test]
     fn prop_state_encode_decode() {
-        fn p(ips: Vec<u32>, flags: u8) -> bool {
+        fn p(mut ips: Vec<u32>, flags: u8) -> bool {
+            // It looks like our encoding scheme can't handle instruction
+            // pointers at or above 2**31. We should fix that, but it seems
+            // unlikely to occur in real code due to the amount of memory
+            // required for such a state machine. So for now, we just clamp
+            // our test data.
+            for ip in &mut ips {
+                if *ip >= 1 << 31 {
+                    *ip = (1 << 31) - 1;
+                }
+            }
             let mut data = vec![flags];
             let mut prev = 0;
             for &ip in ips.iter() {
@@ -1914,7 +1923,7 @@
             expected == got && state.flags() == StateFlags(flags)
         }
         QuickCheck::new()
-            .gen(StdGen::new(self::rand::thread_rng(), 10_000))
+            .gen(Gen::new(10_000))
             .quickcheck(p as fn(Vec<u32>, u8) -> bool);
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -31,7 +31,7 @@
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             Error::Syntax(ref err) => err.fmt(f),
             Error::CompiledTooBig(limit) => write!(
@@ -49,7 +49,7 @@
 // but the `Syntax` variant is already storing a `String` anyway, so we might
 // as well format it nicely.
 impl fmt::Debug for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             Error::Syntax(ref err) => {
                 let hr: String = repeat('~').take(79).collect();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/exec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/exec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/exec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/exec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,40 +1,49 @@
 use std::cell::RefCell;
 use std::collections::HashMap;
+use std::panic::AssertUnwindSafe;
 use std::sync::Arc;
 
 #[cfg(feature = "perf-literal")]
 use aho_corasick::{AhoCorasick, AhoCorasickBuilder, MatchKind};
-use syntax::hir::literal::Literals;
-use syntax::hir::Hir;
-use syntax::ParserBuilder;
-
-use backtrack;
-use cache::{Cached, CachedGuard};
-use compile::Compiler;
+use regex_syntax::hir::literal::Literals;
+use regex_syntax::hir::Hir;
+use regex_syntax::ParserBuilder;
+
+use crate::backtrack;
+use crate::compile::Compiler;
 #[cfg(feature = "perf-dfa")]
-use dfa;
-use error::Error;
-use input::{ByteInput, CharInput};
-use literal::LiteralSearcher;
-use pikevm;
-use prog::Program;
-use re_builder::RegexOptions;
-use re_bytes;
-use re_set;
-use re_trait::{Locations, RegularExpression, Slot};
-use re_unicode;
-use utf8::next_utf8;
+use crate::dfa;
+use crate::error::Error;
+use crate::input::{ByteInput, CharInput};
+use crate::literal::LiteralSearcher;
+use crate::pikevm;
+use crate::pool::{Pool, PoolGuard};
+use crate::prog::Program;
+use crate::re_builder::RegexOptions;
+use crate::re_bytes;
+use crate::re_set;
+use crate::re_trait::{Locations, RegularExpression, Slot};
+use crate::re_unicode;
+use crate::utf8::next_utf8;
 
 /// `Exec` manages the execution of a regular expression.
 ///
 /// In particular, this manages the various compiled forms of a single regular
 /// expression and the choice of which matching engine to use to execute a
 /// regular expression.
+#[derive(Debug)]
 pub struct Exec {
     /// All read only state.
     ro: Arc<ExecReadOnly>,
-    /// Caches for the various matching engines.
-    cache: Cached<ProgramCache>,
+    /// A pool of reusable values for the various matching engines.
+    ///
+    /// Note that boxing this value is not strictly necessary, but it is an
+    /// easy way to ensure that T does not bloat the stack sized used by a pool
+    /// in the case where T is big. And this turns out to be the case at the
+    /// time of writing for regex's use of this pool. At the time of writing,
+    /// the size of a Regex on the stack is 856 bytes. Boxing this value
+    /// reduces that size to 16 bytes.
+    pool: Box<Pool<ProgramCache>>,
 }
 
 /// `ExecNoSync` is like `Exec`, except it embeds a reference to a cache. This
@@ -45,10 +54,11 @@
     /// All read only state.
     ro: &'c Arc<ExecReadOnly>,
     /// Caches for the various matching engines.
-    cache: CachedGuard<'c, ProgramCache>,
+    cache: PoolGuard<'c, ProgramCache>,
 }
 
 /// `ExecNoSyncStr` is like `ExecNoSync`, but matches on &str instead of &[u8].
+#[derive(Debug)]
 pub struct ExecNoSyncStr<'c>(ExecNoSync<'c>);
 
 /// `ExecReadOnly` comprises all read only state for a regex. Namely, all such
@@ -97,6 +107,9 @@
 /// Facilitates the construction of an executor by exposing various knobs
 /// to control how a regex is executed and what kinds of resources it's
 /// permitted to use.
+// `ExecBuilder` is only public via the `internal` module, so avoid deriving
+// `Debug`.
+#[allow(missing_debug_implementations)]
 pub struct ExecBuilder {
     options: RegexOptions,
     match_type: Option<MatchType>,
@@ -127,7 +140,7 @@
     ///
     /// Note that when compiling 2 or more regular expressions, capture groups
     /// are completely unsupported. (This means both `find` and `captures`
-    /// wont work.)
+    /// won't work.)
     pub fn new_many<I, S>(res: I) -> Self
     where
         S: AsRef<str>,
@@ -297,7 +310,8 @@
                 ac: None,
                 match_type: MatchType::Nothing,
             });
-            return Ok(Exec { ro: ro, cache: Cached::new() });
+            let pool = ExecReadOnly::new_pool(&ro);
+            return Ok(Exec { ro: ro, pool });
         }
         let parsed = self.parse()?;
         let mut nfa = Compiler::new()
@@ -337,7 +351,8 @@
         ro.match_type = ro.choose_match_type(self.match_type);
 
         let ro = Arc::new(ro);
-        Ok(Exec { ro: ro, cache: Cached::new() })
+        let pool = ExecReadOnly::new_pool(&ro);
+        Ok(Exec { ro, pool })
     }
 
     #[cfg(feature = "perf-literal")]
@@ -358,9 +373,6 @@
             AhoCorasickBuilder::new()
                 .match_kind(MatchKind::LeftmostFirst)
                 .auto_configure(&lits)
-                // We always want this to reduce size, regardless
-                // of what auto-configure does.
-                .byte_classes(true)
                 .build_with_size::<u32, _, _>(&lits)
                 // This should never happen because we'd long exceed the
                 // compilation limit for regexes first.
@@ -724,7 +736,7 @@
         text: &[u8],
         start: usize,
     ) -> dfa::Result<(usize, usize)> {
-        use dfa::Result::*;
+        use crate::dfa::Result::*;
         let end = match dfa::Fsm::forward(
             &self.ro.dfa,
             self.cache.value(),
@@ -764,7 +776,7 @@
         text: &[u8],
         start: usize,
     ) -> dfa::Result<(usize, usize)> {
-        use dfa::Result::*;
+        use crate::dfa::Result::*;
         match dfa::Fsm::reverse(
             &self.ro.dfa_reverse,
             self.cache.value(),
@@ -820,7 +832,7 @@
         text: &[u8],
         original_start: usize,
     ) -> Option<dfa::Result<(usize, usize)>> {
-        use dfa::Result::*;
+        use crate::dfa::Result::*;
 
         let lcs = self.ro.suffixes.lcs();
         debug_assert!(lcs.len() >= 1);
@@ -865,7 +877,7 @@
         text: &[u8],
         start: usize,
     ) -> dfa::Result<(usize, usize)> {
-        use dfa::Result::*;
+        use crate::dfa::Result::*;
 
         let match_start = match self.exec_dfa_reverse_suffix(text, start) {
             None => return self.find_dfa_forward(text, start),
@@ -1248,17 +1260,16 @@
 impl Exec {
     /// Get a searcher that isn't Sync.
     #[cfg_attr(feature = "perf-inline", inline(always))]
-    pub fn searcher(&self) -> ExecNoSync {
-        let create = || RefCell::new(ProgramCacheInner::new(&self.ro));
+    pub fn searcher(&self) -> ExecNoSync<'_> {
         ExecNoSync {
             ro: &self.ro, // a clone is too expensive here! (and not needed)
-            cache: self.cache.get_or(create),
+            cache: self.pool.get(),
         }
     }
 
     /// Get a searcher that isn't Sync and can match on &str.
     #[cfg_attr(feature = "perf-inline", inline(always))]
-    pub fn searcher_str(&self) -> ExecNoSyncStr {
+    pub fn searcher_str(&self) -> ExecNoSyncStr<'_> {
         ExecNoSyncStr(self.searcher())
     }
 
@@ -1304,7 +1315,8 @@
 
 impl Clone for Exec {
     fn clone(&self) -> Exec {
-        Exec { ro: self.ro.clone(), cache: Cached::new() }
+        let pool = ExecReadOnly::new_pool(&self.ro);
+        Exec { ro: self.ro.clone(), pool }
     }
 }
 
@@ -1437,6 +1449,13 @@
         let lcs_len = self.suffixes.lcs().char_len();
         lcs_len >= 3 && lcs_len > self.dfa.prefixes.lcp().char_len()
     }
+
+    fn new_pool(ro: &Arc<ExecReadOnly>) -> Box<Pool<ProgramCache>> {
+        let ro = ro.clone();
+        Box::new(Pool::new(Box::new(move || {
+            AssertUnwindSafe(RefCell::new(ProgramCacheInner::new(&ro)))
+        })))
+    }
 }
 
 #[derive(Clone, Copy, Debug)]
@@ -1495,7 +1514,11 @@
 
 /// `ProgramCache` maintains reusable allocations for each matching engine
 /// available to a particular program.
-pub type ProgramCache = RefCell<ProgramCacheInner>;
+///
+/// We declare this as unwind safe since it's a cache that's only used for
+/// performance purposes. If a panic occurs, it is (or should be) always safe
+/// to continue using the same regex object.
+pub type ProgramCache = AssertUnwindSafe<RefCell<ProgramCacheInner>>;
 
 #[derive(Debug)]
 pub struct ProgramCacheInner {
@@ -1524,7 +1547,7 @@
 /// literals, and if so, returns them. Otherwise, this returns None.
 #[cfg(feature = "perf-literal")]
 fn alternation_literals(expr: &Hir) -> Option<Vec<Vec<u8>>> {
-    use syntax::hir::{HirKind, Literal};
+    use regex_syntax::hir::{HirKind, Literal};
 
     // This is pretty hacky, but basically, if `is_alternation_literal` is
     // true, then we can make several assumptions about the structure of our
@@ -1576,7 +1599,7 @@
 mod test {
     #[test]
     fn uppercut_s_backtracking_bytes_default_bytes_mismatch() {
-        use internal::ExecBuilder;
+        use crate::internal::ExecBuilder;
 
         let backtrack_bytes_re = ExecBuilder::new("^S")
             .bounded_backtracking()
@@ -1604,7 +1627,7 @@
 
     #[test]
     fn unicode_lit_star_backtracking_utf8bytes_default_utf8bytes_mismatch() {
-        use internal::ExecBuilder;
+        use crate::internal::ExecBuilder;
 
         let backtrack_bytes_re = ExecBuilder::new(r"^(?u:\*)")
             .bounded_backtracking()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/expand.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/expand.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/expand.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/expand.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,12 @@
 use std::str;
 
-use find_byte::find_byte;
+use crate::find_byte::find_byte;
 
-use re_bytes;
-use re_unicode;
+use crate::re_bytes;
+use crate::re_unicode;
 
 pub fn expand_str(
-    caps: &re_unicode::Captures,
+    caps: &re_unicode::Captures<'_>,
     mut replacement: &str,
     dst: &mut String,
 ) {
@@ -48,7 +48,7 @@
 }
 
 pub fn expand_bytes(
-    caps: &re_bytes::Captures,
+    caps: &re_bytes::Captures<'_>,
     mut replacement: &[u8],
     dst: &mut Vec<u8>,
 ) {
@@ -125,7 +125,7 @@
 /// starting at the beginning of `replacement`.
 ///
 /// If no such valid reference could be found, None is returned.
-fn find_cap_ref(replacement: &[u8]) -> Option<CaptureRef> {
+fn find_cap_ref(replacement: &[u8]) -> Option<CaptureRef<'_>> {
     let mut i = 0;
     let rep: &[u8] = replacement.as_ref();
     if rep.len() <= 1 || rep[0] != b'$' {
@@ -144,7 +144,8 @@
     }
     // We just verified that the range 0..cap_end is valid ASCII, so it must
     // therefore be valid UTF-8. If we really cared, we could avoid this UTF-8
-    // check with either unsafe or by parsing the number straight from &[u8].
+    // check via an unchecked conversion or by parsing the number straight from
+    // &[u8].
     let cap =
         str::from_utf8(&rep[i..cap_end]).expect("valid UTF-8 capture name");
     Some(CaptureRef {
@@ -156,7 +157,7 @@
     })
 }
 
-fn find_cap_ref_braced(rep: &[u8], mut i: usize) -> Option<CaptureRef> {
+fn find_cap_ref_braced(rep: &[u8], mut i: usize) -> Option<CaptureRef<'_>> {
     let start = i;
     while rep.get(i).map_or(false, |&b| b != b'}') {
         i += 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/input.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/input.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/input.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/input.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,11 +4,9 @@
 use std::ops;
 use std::u32;
 
-use syntax;
-
-use literal::LiteralSearcher;
-use prog::InstEmptyLook;
-use utf8::{decode_last_utf8, decode_utf8};
+use crate::literal::LiteralSearcher;
+use crate::prog::InstEmptyLook;
+use crate::utf8::{decode_last_utf8, decode_utf8};
 
 /// Represents a location in the input.
 #[derive(Clone, Copy, Debug)]
@@ -175,7 +173,7 @@
     }
 
     fn is_empty_match(&self, at: InputAt, empty: &InstEmptyLook) -> bool {
-        use prog::EmptyLook::*;
+        use crate::prog::EmptyLook::*;
         match empty.look {
             StartLine => {
                 let c = self.previous_char(at);
@@ -268,7 +266,7 @@
     }
 
     fn is_empty_match(&self, at: InputAt, empty: &InstEmptyLook) -> bool {
-        use prog::EmptyLook::*;
+        use crate::prog::EmptyLook::*;
         match empty.look {
             StartLine => {
                 let c = self.previous_char(at);
@@ -348,7 +346,7 @@
 pub struct Char(u32);
 
 impl fmt::Debug for Char {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match char::from_u32(self.0) {
             None => write!(f, "Empty"),
             Some(c) => write!(f, "{:?}", c),
@@ -379,7 +377,7 @@
         // available. However, our compiler ensures that if a Unicode word
         // boundary is used, then the data must also be available. If it isn't,
         // then the compiler returns an error.
-        char::from_u32(self.0).map_or(false, syntax::is_word_character)
+        char::from_u32(self.0).map_or(false, regex_syntax::is_word_character)
     }
 
     /// Returns true iff the byte is a word byte.
@@ -387,7 +385,7 @@
     /// If the byte is absent, then false is returned.
     pub fn is_word_byte(self) -> bool {
         match char::from_u32(self.0) {
-            Some(c) if c <= '\u{7F}' => syntax::is_word_byte(c as u8),
+            Some(c) if c <= '\u{7F}' => regex_syntax::is_word_byte(c as u8),
             None | Some(_) => false,
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,12 +22,6 @@
 regex = "1"
 ```
 
-If you're using Rust 2015, then you'll also need to add it to your crate root:
-
-```rust
-extern crate regex;
-```
-
 # Example: find a date
 
 General use of regular expressions in this package involves compiling an
@@ -68,9 +62,7 @@
 For example:
 
 ```rust
-#[macro_use] extern crate lazy_static;
-extern crate regex;
-
+use lazy_static::lazy_static;
 use regex::Regex;
 
 fn some_helper_function(text: &str) -> bool {
@@ -94,7 +86,7 @@
 them by their component pieces:
 
 ```rust
-# extern crate regex; use regex::Regex;
+# use regex::Regex;
 # fn main() {
 let re = Regex::new(r"(\d{4})-(\d{2})-(\d{2})").unwrap();
 let text = "2012-03-14, 2013-01-01 and 2014-07-05";
@@ -119,7 +111,7 @@
 in our replacement text:
 
 ```rust
-# extern crate regex; use regex::Regex;
+# use regex::Regex;
 # fn main() {
 let re = Regex::new(r"(?P<y>\d{4})-(?P<m>\d{2})-(?P<d>\d{2})").unwrap();
 let before = "2012-03-14, 2013-01-01 and 2014-07-05";
@@ -136,7 +128,7 @@
 enable insignificant whitespace mode, which also lets you write comments:
 
 ```rust
-# extern crate regex; use regex::Regex;
+# use regex::Regex;
 # fn main() {
 let re = Regex::new(r"(?x)
   (?P<y>\d{4}) # the year
@@ -217,7 +209,7 @@
 in your expression:
 
 ```rust
-# extern crate regex; use regex::Regex;
+# use regex::Regex;
 # fn main() {
 let re = Regex::new(r"(?i)Δ+").unwrap();
 let mat = re.find("ΔδΔ").unwrap();
@@ -244,7 +236,7 @@
 match a sequence of numerals, Greek or Cherokee letters:
 
 ```rust
-# extern crate regex; use regex::Regex;
+# use regex::Regex;
 # fn main() {
 let re = Regex::new(r"[\pN\p{Greek}\p{Cherokee}]+").unwrap();
 let mat = re.find("abcΔᎠβⅠ�γδⅡxyz").unwrap();
@@ -253,7 +245,7 @@
 ```
 
 For a more detailed breakdown of Unicode support with respect to
-[UTS#18](http://unicode.org/reports/tr18/),
+[UTS#18](https://unicode.org/reports/tr18/),
 please see the
 [UNICODE](https://github.com/rust-lang/regex/blob/master/UNICODE.md)
 document in the root of the regex repository.
@@ -391,7 +383,7 @@
 case-insensitively for the first part but case-sensitively for the second part:
 
 ```rust
-# extern crate regex; use regex::Regex;
+# use regex::Regex;
 # fn main() {
 let re = Regex::new(r"(?i)a+(?-i)b+").unwrap();
 let cap = re.captures("AaAaAbbBBBb").unwrap();
@@ -425,7 +417,7 @@
 word boundary:
 
 ```rust
-# extern crate regex; use regex::Regex;
+# use regex::Regex;
 # fn main() {
 let re = Regex::new(r"(?-u:\b).+(?-u:\b)").unwrap();
 let cap = re.captures("$$abc$$").unwrap();
@@ -455,7 +447,7 @@
 ## Perl character classes (Unicode friendly)
 
 These classes are based on the definitions provided in
-[UTS#18](http://www.unicode.org/reports/tr18/#Compatibility_Properties):
+[UTS#18](https://www.unicode.org/reports/tr18/#Compatibility_Properties):
 
 <pre class="rust">
 \d     digit (\p{Nd})
@@ -523,11 +515,6 @@
   Enables all performance related features. This feature is enabled by default
   and will always cover all features that improve performance, even if more
   are added in the future.
-* **perf-cache** -
-  Enables the use of very fast thread safe caching for internal match state.
-  When this is disabled, caching is still used, but with a slower and simpler
-  implementation. Disabling this drops the `thread_local` and `lazy_static`
-  dependencies.
 * **perf-dfa** -
   Enables the use of a lazy DFA for matching. The lazy DFA is used to compile
   portions of a regex to a very fast DFA on an as-needed basis. This can
@@ -542,6 +529,11 @@
   Enables the use of literal optimizations for speeding up matches. In some
   cases, literal optimizations can result in speedups of _several_ orders of
   magnitude. Disabling this drops the `aho-corasick` and `memchr` dependencies.
+* **perf-cache** -
+  This feature used to enable a faster internal cache at the cost of using
+  additional dependencies, but this is no longer an option. A fast internal
+  cache is now used unconditionally with no additional dependencies. This may
+  change in the future.
 
 ### Unicode features
 
@@ -614,39 +606,30 @@
 */
 
 #![deny(missing_docs)]
-#![cfg_attr(test, deny(warnings))]
 #![cfg_attr(feature = "pattern", feature(pattern))]
+#![warn(missing_debug_implementations)]
 
 #[cfg(not(feature = "std"))]
 compile_error!("`std` feature is currently required to build this crate");
 
-#[cfg(feature = "perf-literal")]
-extern crate aho_corasick;
-// #[cfg(doctest)]
-// extern crate doc_comment;
-#[cfg(feature = "perf-literal")]
-extern crate memchr;
-#[cfg(test)]
-#[cfg_attr(feature = "perf-literal", macro_use)]
-extern crate quickcheck;
-extern crate regex_syntax as syntax;
-#[cfg(feature = "perf-cache")]
-extern crate thread_local;
-
+// To check README's example
+// TODO: Re-enable this once the MSRV is 1.43 or greater.
+// See: https://github.com/rust-lang/regex/issues/684
+// See: https://github.com/rust-lang/regex/issues/685
 // #[cfg(doctest)]
 // doc_comment::doctest!("../README.md");
 
 #[cfg(feature = "std")]
-pub use error::Error;
+pub use crate::error::Error;
 #[cfg(feature = "std")]
-pub use re_builder::set_unicode::*;
+pub use crate::re_builder::set_unicode::*;
 #[cfg(feature = "std")]
-pub use re_builder::unicode::*;
+pub use crate::re_builder::unicode::*;
 #[cfg(feature = "std")]
-pub use re_set::unicode::*;
+pub use crate::re_set::unicode::*;
 #[cfg(feature = "std")]
 #[cfg(feature = "std")]
-pub use re_unicode::{
+pub use crate::re_unicode::{
     escape, CaptureLocations, CaptureMatches, CaptureNames, Captures,
     Locations, Match, Matches, NoExpand, Regex, Replacer, ReplacerRef, Split,
     SplitN, SubCaptureMatches,
@@ -741,14 +724,13 @@
 */
 #[cfg(feature = "std")]
 pub mod bytes {
-    pub use re_builder::bytes::*;
-    pub use re_builder::set_bytes::*;
-    pub use re_bytes::*;
-    pub use re_set::bytes::*;
+    pub use crate::re_builder::bytes::*;
+    pub use crate::re_builder::set_bytes::*;
+    pub use crate::re_bytes::*;
+    pub use crate::re_set::bytes::*;
 }
 
 mod backtrack;
-mod cache;
 mod compile;
 #[cfg(feature = "perf-dfa")]
 mod dfa;
@@ -756,13 +738,12 @@
 mod exec;
 mod expand;
 mod find_byte;
-#[cfg(feature = "perf-literal")]
-mod freqs;
 mod input;
 mod literal;
 #[cfg(feature = "pattern")]
 mod pattern;
 mod pikevm;
+mod pool;
 mod prog;
 mod re_builder;
 mod re_bytes;
@@ -778,9 +759,9 @@
 #[doc(hidden)]
 #[cfg(feature = "std")]
 pub mod internal {
-    pub use compile::Compiler;
-    pub use exec::{Exec, ExecBuilder};
-    pub use input::{Char, CharInput, Input, InputAt};
-    pub use literal::LiteralSearcher;
-    pub use prog::{EmptyLook, Inst, InstRanges, Program};
+    pub use crate::compile::Compiler;
+    pub use crate::exec::{Exec, ExecBuilder};
+    pub use crate::input::{Char, CharInput, Input, InputAt};
+    pub use crate::literal::LiteralSearcher;
+    pub use crate::prog::{EmptyLook, Inst, InstRanges, Program};
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/literal/imp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/literal/imp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/literal/imp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/literal/imp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,8 @@
-use std::cmp;
 use std::mem;
 
 use aho_corasick::{self, packed, AhoCorasick, AhoCorasickBuilder};
-use memchr::{memchr, memchr2, memchr3};
-use syntax::hir::literal::{Literal, Literals};
-
-use freqs::BYTE_FREQUENCIES;
+use memchr::{memchr, memchr2, memchr3, memmem};
+use regex_syntax::hir::literal::{Literal, Literals};
 
 /// A prefix extracted from a compiled regular expression.
 ///
@@ -15,8 +12,8 @@
 #[derive(Clone, Debug)]
 pub struct LiteralSearcher {
     complete: bool,
-    lcp: FreqyPacked,
-    lcs: FreqyPacked,
+    lcp: Memmem,
+    lcs: Memmem,
     matcher: Matcher,
 }
 
@@ -26,10 +23,8 @@
     Empty,
     /// A set of four or more single byte literals.
     Bytes(SingleByteSet),
-    /// A single substring, find using memchr and frequency analysis.
-    FreqyPacked(FreqyPacked),
-    /// A single substring, find using Boyer-Moore.
-    BoyerMoore(BoyerMooreSearch),
+    /// A single substring, using vector accelerated routines when available.
+    Memmem(Memmem),
     /// An Aho-Corasick automaton.
     AC { ac: AhoCorasick<u32>, lits: Vec<Literal> },
     /// A packed multiple substring searcher, using SIMD.
@@ -63,8 +58,8 @@
         let complete = lits.all_complete();
         LiteralSearcher {
             complete: complete,
-            lcp: FreqyPacked::new(lits.longest_common_prefix().to_vec()),
-            lcs: FreqyPacked::new(lits.longest_common_suffix().to_vec()),
+            lcp: Memmem::new(lits.longest_common_prefix()),
+            lcs: Memmem::new(lits.longest_common_suffix()),
             matcher: matcher,
         }
     }
@@ -72,7 +67,7 @@
     /// Returns true if all matches comprise the entire regular expression.
     ///
     /// This does not necessarily mean that a literal match implies a match
-    /// of the regular expression. For example, the regular expresison `^a`
+    /// of the regular expression. For example, the regular expression `^a`
     /// is comprised of a single complete literal `a`, but the regular
     /// expression demands that it only match at the beginning of a string.
     pub fn complete(&self) -> bool {
@@ -86,8 +81,7 @@
         match self.matcher {
             Empty => Some((0, 0)),
             Bytes(ref sset) => sset.find(haystack).map(|i| (i, i + 1)),
-            FreqyPacked(ref s) => s.find(haystack).map(|i| (i, i + s.len())),
-            BoyerMoore(ref s) => s.find(haystack).map(|i| (i, i + s.len())),
+            Memmem(ref s) => s.find(haystack).map(|i| (i, i + s.len())),
             AC { ref ac, .. } => {
                 ac.find(haystack).map(|m| (m.start(), m.end()))
             }
@@ -124,24 +118,23 @@
     }
 
     /// Returns an iterator over all literals to be matched.
-    pub fn iter(&self) -> LiteralIter {
+    pub fn iter(&self) -> LiteralIter<'_> {
         match self.matcher {
             Matcher::Empty => LiteralIter::Empty,
             Matcher::Bytes(ref sset) => LiteralIter::Bytes(&sset.dense),
-            Matcher::FreqyPacked(ref s) => LiteralIter::Single(&s.pat),
-            Matcher::BoyerMoore(ref s) => LiteralIter::Single(&s.pattern),
+            Matcher::Memmem(ref s) => LiteralIter::Single(&s.finder.needle()),
             Matcher::AC { ref lits, .. } => LiteralIter::AC(lits),
             Matcher::Packed { ref lits, .. } => LiteralIter::Packed(lits),
         }
     }
 
     /// Returns a matcher for the longest common prefix of this matcher.
-    pub fn lcp(&self) -> &FreqyPacked {
+    pub fn lcp(&self) -> &Memmem {
         &self.lcp
     }
 
     /// Returns a matcher for the longest common suffix of this matcher.
-    pub fn lcs(&self) -> &FreqyPacked {
+    pub fn lcs(&self) -> &Memmem {
         &self.lcs
     }
 
@@ -156,8 +149,7 @@
         match self.matcher {
             Empty => 0,
             Bytes(ref sset) => sset.dense.len(),
-            FreqyPacked(_) => 1,
-            BoyerMoore(_) => 1,
+            Memmem(_) => 1,
             AC { ref ac, .. } => ac.pattern_count(),
             Packed { ref lits, .. } => lits.len(),
         }
@@ -169,8 +161,7 @@
         match self.matcher {
             Empty => 0,
             Bytes(ref sset) => sset.approximate_size(),
-            FreqyPacked(ref single) => single.approximate_size(),
-            BoyerMoore(ref single) => single.approximate_size(),
+            Memmem(ref single) => single.approximate_size(),
             AC { ref ac, .. } => ac.heap_bytes(),
             Packed { ref s, .. } => s.heap_bytes(),
         }
@@ -205,12 +196,7 @@
             return Matcher::Bytes(sset);
         }
         if lits.literals().len() == 1 {
-            let lit = lits.literals()[0].to_vec();
-            if BoyerMooreSearch::should_use(lit.as_slice()) {
-                return Matcher::BoyerMoore(BoyerMooreSearch::new(lit));
-            } else {
-                return Matcher::FreqyPacked(FreqyPacked::new(lit));
-            }
+            return Matcher::Memmem(Memmem::new(&lits.literals()[0]));
         }
 
         let pats = lits.literals().to_owned();
@@ -232,6 +218,7 @@
     }
 }
 
+#[derive(Debug)]
 pub enum LiteralIter<'a> {
     Empty,
     Bytes(&'a [u8]),
@@ -366,116 +353,27 @@
     }
 }
 
-/// Provides an implementation of fast subtring search using frequency
-/// analysis.
+/// A simple wrapper around the memchr crate's memmem implementation.
 ///
-/// memchr is so fast that we do everything we can to keep the loop in memchr
-/// for as long as possible. The easiest way to do this is to intelligently
-/// pick the byte to send to memchr. The best byte is the byte that occurs
-/// least frequently in the haystack. Since doing frequency analysis on the
-/// haystack is far too expensive, we compute a set of fixed frequencies up
-/// front and hard code them in src/freqs.rs. Frequency analysis is done via
-/// scripts/frequencies.py.
+/// The API this exposes mirrors the API of previous substring searchers that
+/// this supplanted.
 #[derive(Clone, Debug)]
-pub struct FreqyPacked {
-    /// The pattern.
-    pat: Vec<u8>,
-    /// The number of Unicode characters in the pattern. This is useful for
-    /// determining the effective length of a pattern when deciding which
-    /// optimizations to perform. A trailing incomplete UTF-8 sequence counts
-    /// as one character.
+pub struct Memmem {
+    finder: memmem::Finder<'static>,
     char_len: usize,
-    /// The rarest byte in the pattern, according to pre-computed frequency
-    /// analysis.
-    rare1: u8,
-    /// The offset of the rarest byte in `pat`.
-    rare1i: usize,
-    /// The second rarest byte in the pattern, according to pre-computed
-    /// frequency analysis. (This may be equivalent to the rarest byte.)
-    ///
-    /// The second rarest byte is used as a type of guard for quickly detecting
-    /// a mismatch after memchr locates an instance of the rarest byte. This
-    /// is a hedge against pathological cases where the pre-computed frequency
-    /// analysis may be off. (But of course, does not prevent *all*
-    /// pathological cases.)
-    rare2: u8,
-    /// The offset of the second rarest byte in `pat`.
-    rare2i: usize,
 }
 
-impl FreqyPacked {
-    fn new(pat: Vec<u8>) -> FreqyPacked {
-        if pat.is_empty() {
-            return FreqyPacked::empty();
-        }
-
-        // Find the rarest two bytes. Try to make them distinct (but it's not
-        // required).
-        let mut rare1 = pat[0];
-        let mut rare2 = pat[0];
-        for b in pat[1..].iter().cloned() {
-            if freq_rank(b) < freq_rank(rare1) {
-                rare1 = b;
-            }
-        }
-        for &b in &pat {
-            if rare1 == rare2 {
-                rare2 = b
-            } else if b != rare1 && freq_rank(b) < freq_rank(rare2) {
-                rare2 = b;
-            }
-        }
-
-        // And find the offsets of their last occurrences.
-        let rare1i = pat.iter().rposition(|&b| b == rare1).unwrap();
-        let rare2i = pat.iter().rposition(|&b| b == rare2).unwrap();
-
-        let char_len = char_len_lossy(&pat);
-        FreqyPacked {
-            pat: pat,
-            char_len: char_len,
-            rare1: rare1,
-            rare1i: rare1i,
-            rare2: rare2,
-            rare2i: rare2i,
-        }
-    }
-
-    fn empty() -> FreqyPacked {
-        FreqyPacked {
-            pat: vec![],
-            char_len: 0,
-            rare1: 0,
-            rare1i: 0,
-            rare2: 0,
-            rare2i: 0,
+impl Memmem {
+    fn new(pat: &[u8]) -> Memmem {
+        Memmem {
+            finder: memmem::Finder::new(pat).into_owned(),
+            char_len: char_len_lossy(pat),
         }
     }
 
     #[cfg_attr(feature = "perf-inline", inline(always))]
     pub fn find(&self, haystack: &[u8]) -> Option<usize> {
-        let pat = &*self.pat;
-        if haystack.len() < pat.len() || pat.is_empty() {
-            return None;
-        }
-        let mut i = self.rare1i;
-        while i < haystack.len() {
-            i += match memchr(self.rare1, &haystack[i..]) {
-                None => return None,
-                Some(i) => i,
-            };
-            let start = i - self.rare1i;
-            let end = start + pat.len();
-            if end > haystack.len() {
-                return None;
-            }
-            let aligned = &haystack[start..end];
-            if aligned[self.rare2i] == self.rare2 && aligned == &*self.pat {
-                return Some(start);
-            }
-            i += 1;
-        }
-        None
+        self.finder.find(haystack)
     }
 
     #[cfg_attr(feature = "perf-inline", inline(always))]
@@ -483,11 +381,11 @@
         if text.len() < self.len() {
             return false;
         }
-        text[text.len() - self.len()..] == *self.pat
+        &text[text.len() - self.len()..] == self.finder.needle()
     }
 
     pub fn len(&self) -> usize {
-        self.pat.len()
+        self.finder.needle().len()
     }
 
     pub fn char_len(&self) -> usize {
@@ -495,627 +393,10 @@
     }
 
     fn approximate_size(&self) -> usize {
-        self.pat.len() * mem::size_of::<u8>()
+        self.finder.needle().len() * mem::size_of::<u8>()
     }
 }
 
 fn char_len_lossy(bytes: &[u8]) -> usize {
     String::from_utf8_lossy(bytes).chars().count()
 }
-
-/// An implementation of Tuned Boyer-Moore as laid out by
-/// Andrew Hume and Daniel Sunday in "Fast String Searching".
-/// O(n) in the size of the input.
-///
-/// Fast string searching algorithms come in many variations,
-/// but they can generally be described in terms of three main
-/// components.
-///
-/// The skip loop is where the string searcher wants to spend
-/// as much time as possible. Exactly which character in the
-/// pattern the skip loop examines varies from algorithm to
-/// algorithm, but in the simplest case this loop repeated
-/// looks at the last character in the pattern and jumps
-/// forward in the input if it is not in the pattern.
-/// Robert Boyer and J Moore called this the "fast" loop in
-/// their original paper.
-///
-/// The match loop is responsible for actually examining the
-/// whole potentially matching substring. In order to fail
-/// faster, the match loop sometimes has a guard test attached.
-/// The guard test uses frequency analysis of the different
-/// characters in the pattern to choose the least frequency
-/// occurring character and use it to find match failures
-/// as quickly as possible.
-///
-/// The shift rule governs how the algorithm will shuffle its
-/// test window in the event of a failure during the match loop.
-/// Certain shift rules allow the worst-case run time of the
-/// algorithm to be shown to be O(n) in the size of the input
-/// rather than O(nm) in the size of the input and the size
-/// of the pattern (as naive Boyer-Moore is).
-///
-/// "Fast String Searching", in addition to presenting a tuned
-/// algorithm, provides a comprehensive taxonomy of the many
-/// different flavors of string searchers. Under that taxonomy
-/// TBM, the algorithm implemented here, uses an unrolled fast
-/// skip loop with memchr fallback, a forward match loop with guard,
-/// and the mini Sunday's delta shift rule. To unpack that you'll have to
-/// read the paper.
-#[derive(Clone, Debug)]
-pub struct BoyerMooreSearch {
-    /// The pattern we are going to look for in the haystack.
-    pattern: Vec<u8>,
-
-    /// The skip table for the skip loop.
-    ///
-    /// Maps the character at the end of the input
-    /// to a shift.
-    skip_table: Vec<usize>,
-
-    /// The guard character (least frequently occurring char).
-    guard: u8,
-    /// The reverse-index of the guard character in the pattern.
-    guard_reverse_idx: usize,
-
-    /// Daniel Sunday's mini generalized delta2 shift table.
-    ///
-    /// We use a skip loop, so we only have to provide a shift
-    /// for the skip char (last char). This is why it is a mini
-    /// shift rule.
-    md2_shift: usize,
-}
-
-impl BoyerMooreSearch {
-    /// Create a new string searcher, performing whatever
-    /// compilation steps are required.
-    fn new(pattern: Vec<u8>) -> Self {
-        debug_assert!(!pattern.is_empty());
-
-        let (g, gi) = Self::select_guard(pattern.as_slice());
-        let skip_table = Self::compile_skip_table(pattern.as_slice());
-        let md2_shift = Self::compile_md2_shift(pattern.as_slice());
-        BoyerMooreSearch {
-            pattern: pattern,
-            skip_table: skip_table,
-            guard: g,
-            guard_reverse_idx: gi,
-            md2_shift: md2_shift,
-        }
-    }
-
-    /// Find the pattern in `haystack`, returning the offset
-    /// of the start of the first occurrence of the pattern
-    /// in `haystack`.
-    #[inline]
-    fn find(&self, haystack: &[u8]) -> Option<usize> {
-        if haystack.len() < self.pattern.len() {
-            return None;
-        }
-
-        let mut window_end = self.pattern.len() - 1;
-
-        // Inspired by the grep source. It is a way
-        // to do correct loop unrolling without having to place
-        // a crashpad of terminating charicters at the end in
-        // the way described in the Fast String Searching paper.
-        const NUM_UNROLL: usize = 10;
-        // 1 for the initial position, and 1 for the md2 shift
-        let short_circut = (NUM_UNROLL + 2) * self.pattern.len();
-
-        if haystack.len() > short_circut {
-            // just 1 for the md2 shift
-            let backstop =
-                haystack.len() - ((NUM_UNROLL + 1) * self.pattern.len());
-            loop {
-                window_end =
-                    match self.skip_loop(haystack, window_end, backstop) {
-                        Some(i) => i,
-                        None => return None,
-                    };
-                if window_end >= backstop {
-                    break;
-                }
-
-                if self.check_match(haystack, window_end) {
-                    return Some(window_end - (self.pattern.len() - 1));
-                } else {
-                    let skip = self.skip_table[haystack[window_end] as usize];
-                    window_end +=
-                        if skip == 0 { self.md2_shift } else { skip };
-                    continue;
-                }
-            }
-        }
-
-        // now process the input after the backstop
-        while window_end < haystack.len() {
-            let mut skip = self.skip_table[haystack[window_end] as usize];
-            if skip == 0 {
-                if self.check_match(haystack, window_end) {
-                    return Some(window_end - (self.pattern.len() - 1));
-                } else {
-                    skip = self.md2_shift;
-                }
-            }
-            window_end += skip;
-        }
-
-        None
-    }
-
-    fn len(&self) -> usize {
-        return self.pattern.len();
-    }
-
-    /// The key heuristic behind which the BoyerMooreSearch lives.
-    ///
-    /// See `rust-lang/regex/issues/408`.
-    ///
-    /// Tuned Boyer-Moore is actually pretty slow! It turns out a handrolled
-    /// platform-specific memchr routine with a bit of frequency
-    /// analysis sprinkled on top actually wins most of the time.
-    /// However, there are a few cases where Tuned Boyer-Moore still
-    /// wins.
-    ///
-    /// If the haystack is random, frequency analysis doesn't help us,
-    /// so Boyer-Moore will win for sufficiently large needles.
-    /// Unfortunately, there is no obvious way to determine this
-    /// ahead of time.
-    ///
-    /// If the pattern itself consists of very common characters,
-    /// frequency analysis won't get us anywhere. The most extreme
-    /// example of this is a pattern like `eeeeeeeeeeeeeeee`. Fortunately,
-    /// this case is wholly determined by the pattern, so we can actually
-    /// implement the heuristic.
-    ///
-    /// A third case is if the pattern is sufficiently long. The idea
-    /// here is that once the pattern gets long enough the Tuned
-    /// Boyer-Moore skip loop will start making strides long enough
-    /// to beat the asm deep magic that is memchr.
-    fn should_use(pattern: &[u8]) -> bool {
-        // The minimum pattern length required to use TBM.
-        const MIN_LEN: usize = 9;
-        // The minimum frequency rank (lower is rarer) that every byte in the
-        // pattern must have in order to use TBM. That is, if the pattern
-        // contains _any_ byte with a lower rank, then TBM won't be used.
-        const MIN_CUTOFF: usize = 150;
-        // The maximum frequency rank for any byte.
-        const MAX_CUTOFF: usize = 255;
-        // The scaling factor used to determine the actual cutoff frequency
-        // to use (keeping in mind that the minimum frequency rank is bounded
-        // by MIN_CUTOFF). This scaling factor is an attempt to make TBM more
-        // likely to be used as the pattern grows longer. That is, longer
-        // patterns permit somewhat less frequent bytes than shorter patterns,
-        // under the assumption that TBM gets better as the pattern gets
-        // longer.
-        const LEN_CUTOFF_PROPORTION: usize = 4;
-
-        let scaled_rank = pattern.len().wrapping_mul(LEN_CUTOFF_PROPORTION);
-        let cutoff = cmp::max(
-            MIN_CUTOFF,
-            MAX_CUTOFF - cmp::min(MAX_CUTOFF, scaled_rank),
-        );
-        // The pattern must be long enough to be worthwhile. e.g., memchr will
-        // be faster on `e` because it is short even though e is quite common.
-        pattern.len() > MIN_LEN
-            // all the bytes must be more common than the cutoff.
-            && pattern.iter().all(|c| freq_rank(*c) >= cutoff)
-    }
-
-    /// Check to see if there is a match at the given position
-    #[inline]
-    fn check_match(&self, haystack: &[u8], window_end: usize) -> bool {
-        // guard test
-        if haystack[window_end - self.guard_reverse_idx] != self.guard {
-            return false;
-        }
-
-        // match loop
-        let window_start = window_end - (self.pattern.len() - 1);
-        for i in 0..self.pattern.len() {
-            if self.pattern[i] != haystack[window_start + i] {
-                return false;
-            }
-        }
-
-        true
-    }
-
-    /// Skip forward according to the shift table.
-    ///
-    /// Returns the offset of the next occurrence
-    /// of the last char in the pattern, or the none
-    /// if it never reappears. If `skip_loop` hits the backstop
-    /// it will leave early.
-    #[inline]
-    fn skip_loop(
-        &self,
-        haystack: &[u8],
-        mut window_end: usize,
-        backstop: usize,
-    ) -> Option<usize> {
-        let window_end_snapshot = window_end;
-        let skip_of = |we: usize| -> usize {
-            // Unsafe might make this faster, but the benchmarks
-            // were hard to interpret.
-            self.skip_table[haystack[we] as usize]
-        };
-
-        loop {
-            let mut skip = skip_of(window_end);
-            window_end += skip;
-            skip = skip_of(window_end);
-            window_end += skip;
-            if skip != 0 {
-                skip = skip_of(window_end);
-                window_end += skip;
-                skip = skip_of(window_end);
-                window_end += skip;
-                skip = skip_of(window_end);
-                window_end += skip;
-                if skip != 0 {
-                    skip = skip_of(window_end);
-                    window_end += skip;
-                    skip = skip_of(window_end);
-                    window_end += skip;
-                    skip = skip_of(window_end);
-                    window_end += skip;
-                    if skip != 0 {
-                        skip = skip_of(window_end);
-                        window_end += skip;
-                        skip = skip_of(window_end);
-                        window_end += skip;
-
-                        // If ten iterations did not make at least 16 words
-                        // worth of progress, we just fall back on memchr.
-                        if window_end - window_end_snapshot
-                            > 16 * mem::size_of::<usize>()
-                        {
-                            // Returning a window_end >= backstop will
-                            // immediatly break us out of the inner loop in
-                            // `find`.
-                            if window_end >= backstop {
-                                return Some(window_end);
-                            }
-
-                            continue; // we made enough progress
-                        } else {
-                            // In case we are already there, and so that
-                            // we will catch the guard char.
-                            window_end = window_end
-                                .checked_sub(1 + self.guard_reverse_idx)
-                                .unwrap_or(0);
-
-                            match memchr(self.guard, &haystack[window_end..]) {
-                                None => return None,
-                                Some(g_idx) => {
-                                    return Some(
-                                        window_end
-                                            + g_idx
-                                            + self.guard_reverse_idx,
-                                    );
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return Some(window_end);
-        }
-    }
-
-    /// Compute the ufast skip table.
-    fn compile_skip_table(pattern: &[u8]) -> Vec<usize> {
-        let mut tab = vec![pattern.len(); 256];
-
-        // For every char in the pattern, we write a skip
-        // that will line us up with the rightmost occurrence.
-        //
-        // N.B. the sentinel (0) is written by the last
-        // loop iteration.
-        for (i, c) in pattern.iter().enumerate() {
-            tab[*c as usize] = (pattern.len() - 1) - i;
-        }
-
-        tab
-    }
-
-    /// Select the guard character based off of the precomputed
-    /// frequency table.
-    fn select_guard(pattern: &[u8]) -> (u8, usize) {
-        let mut rarest = pattern[0];
-        let mut rarest_rev_idx = pattern.len() - 1;
-        for (i, c) in pattern.iter().enumerate() {
-            if freq_rank(*c) < freq_rank(rarest) {
-                rarest = *c;
-                rarest_rev_idx = (pattern.len() - 1) - i;
-            }
-        }
-
-        (rarest, rarest_rev_idx)
-    }
-
-    /// If there is another occurrence of the skip
-    /// char, shift to it, otherwise just shift to
-    /// the next window.
-    fn compile_md2_shift(pattern: &[u8]) -> usize {
-        let shiftc = *pattern.last().unwrap();
-
-        // For a pattern of length 1 we will never apply the
-        // shift rule, so we use a poison value on the principle
-        // that failing fast is a good thing.
-        if pattern.len() == 1 {
-            return 0xDEADBEAF;
-        }
-
-        let mut i = pattern.len() - 2;
-        while i > 0 {
-            if pattern[i] == shiftc {
-                return (pattern.len() - 1) - i;
-            }
-            i -= 1;
-        }
-
-        // The skip char never re-occurs in the pattern, so
-        // we can just shift the whole window length.
-        pattern.len() - 1
-    }
-
-    fn approximate_size(&self) -> usize {
-        (self.pattern.len() * mem::size_of::<u8>())
-            + (256 * mem::size_of::<usize>()) // skip table
-    }
-}
-
-fn freq_rank(b: u8) -> usize {
-    BYTE_FREQUENCIES[b as usize] as usize
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{BoyerMooreSearch, FreqyPacked};
-
-    //
-    // Unit Tests
-    //
-
-    // The "hello, world" of string searching
-    #[test]
-    fn bm_find_subs() {
-        let searcher = BoyerMooreSearch::new(Vec::from(&b"pattern"[..]));
-        let haystack = b"I keep seeing patterns in this text";
-        assert_eq!(14, searcher.find(haystack).unwrap());
-    }
-
-    #[test]
-    fn bm_find_no_subs() {
-        let searcher = BoyerMooreSearch::new(Vec::from(&b"pattern"[..]));
-        let haystack = b"I keep seeing needles in this text";
-        assert_eq!(None, searcher.find(haystack));
-    }
-
-    //
-    // Regression Tests
-    //
-
-    #[test]
-    fn bm_skip_reset_bug() {
-        let haystack = vec![0, 0, 0, 0, 0, 1, 1, 0];
-        let needle = vec![0, 1, 1, 0];
-
-        let searcher = BoyerMooreSearch::new(needle);
-        let offset = searcher.find(haystack.as_slice()).unwrap();
-        assert_eq!(4, offset);
-    }
-
-    #[test]
-    fn bm_backstop_underflow_bug() {
-        let haystack = vec![0, 0];
-        let needle = vec![0, 0];
-
-        let searcher = BoyerMooreSearch::new(needle);
-        let offset = searcher.find(haystack.as_slice()).unwrap();
-        assert_eq!(0, offset);
-    }
-
-    #[test]
-    fn bm_naive_off_by_one_bug() {
-        let haystack = vec![91];
-        let needle = vec![91];
-
-        let naive_offset = naive_find(&needle, &haystack).unwrap();
-        assert_eq!(0, naive_offset);
-    }
-
-    #[test]
-    fn bm_memchr_fallback_indexing_bug() {
-        let mut haystack = vec![
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        ];
-        let needle = vec![1, 1, 1, 1, 32, 32, 87];
-        let needle_start = haystack.len();
-        haystack.extend(needle.clone());
-
-        let searcher = BoyerMooreSearch::new(needle);
-        assert_eq!(needle_start, searcher.find(haystack.as_slice()).unwrap());
-    }
-
-    #[test]
-    fn bm_backstop_boundary() {
-        let haystack = b"\
-// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-e_data.clone_created(entity_id, entity_to_add.entity_id);
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-"
-        .to_vec();
-        let needle = b"clone_created".to_vec();
-
-        let searcher = BoyerMooreSearch::new(needle);
-        let result = searcher.find(&haystack);
-        assert_eq!(Some(43), result);
-    }
-
-    #[test]
-    fn bm_win_gnu_indexing_bug() {
-        let haystack_raw = vec![
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        ];
-        let needle = vec![1, 1, 1, 1, 1, 1, 1];
-        let haystack = haystack_raw.as_slice();
-
-        BoyerMooreSearch::new(needle.clone()).find(haystack);
-    }
-
-    //
-    // QuickCheck Properties
-    //
-
-    use quickcheck::TestResult;
-
-    fn naive_find(needle: &[u8], haystack: &[u8]) -> Option<usize> {
-        assert!(needle.len() <= haystack.len());
-
-        for i in 0..(haystack.len() - (needle.len() - 1)) {
-            if haystack[i] == needle[0]
-                && &haystack[i..(i + needle.len())] == needle
-            {
-                return Some(i);
-            }
-        }
-
-        None
-    }
-
-    quickcheck! {
-        fn qc_bm_equals_nieve_find(pile1: Vec<u8>, pile2: Vec<u8>) -> TestResult {
-            if pile1.len() == 0 || pile2.len() == 0 {
-                return TestResult::discard();
-            }
-
-            let (needle, haystack) = if pile1.len() < pile2.len() {
-                (pile1, pile2.as_slice())
-            } else {
-                (pile2, pile1.as_slice())
-            };
-
-            let searcher = BoyerMooreSearch::new(needle.clone());
-            TestResult::from_bool(
-                searcher.find(haystack) == naive_find(&needle, haystack))
-        }
-
-        fn qc_bm_equals_single(pile1: Vec<u8>, pile2: Vec<u8>) -> TestResult {
-            if pile1.len() == 0 || pile2.len() == 0 {
-                return TestResult::discard();
-            }
-
-            let (needle, haystack) = if pile1.len() < pile2.len() {
-                (pile1, pile2.as_slice())
-            } else {
-                (pile2, pile1.as_slice())
-            };
-
-            let bm_searcher = BoyerMooreSearch::new(needle.clone());
-            let freqy_memchr = FreqyPacked::new(needle);
-            TestResult::from_bool(
-                bm_searcher.find(haystack) == freqy_memchr.find(haystack))
-        }
-
-        fn qc_bm_finds_trailing_needle(
-            haystack_pre: Vec<u8>,
-            needle: Vec<u8>
-        ) -> TestResult {
-            if needle.len() == 0 {
-                return TestResult::discard();
-            }
-
-            let mut haystack = haystack_pre.clone();
-            let searcher = BoyerMooreSearch::new(needle.clone());
-
-            if haystack.len() >= needle.len() &&
-                searcher.find(haystack.as_slice()).is_some() {
-                return TestResult::discard();
-            }
-
-            haystack.extend(needle.clone());
-
-            // What if the the tail of the haystack can start the
-            // needle?
-            let start = haystack_pre.len()
-                .checked_sub(needle.len())
-                .unwrap_or(0);
-            for i in 0..(needle.len() - 1) {
-                if searcher.find(&haystack[(i + start)..]).is_some() {
-                    return TestResult::discard();
-                }
-            }
-
-            TestResult::from_bool(
-                searcher.find(haystack.as_slice())
-                        .map(|x| x == haystack_pre.len())
-                        .unwrap_or(false))
-        }
-
-        // qc_equals_* is only testing the negative case as @burntsushi
-        // pointed out in https://github.com/rust-lang/regex/issues/446.
-        // This quickcheck prop represents an effort to force testing of
-        // the positive case. qc_bm_finds_first and qc_bm_finds_trailing_needle
-        // already check some of the positive cases, but they don't cover
-        // cases where the needle is in the middle of haystack. This prop
-        // fills that hole.
-        fn qc_bm_finds_subslice(
-            haystack: Vec<u8>,
-            needle_start: usize,
-            needle_length: usize
-        ) -> TestResult {
-            if haystack.len() == 0 {
-                return TestResult::discard();
-            }
-
-            let needle_start = needle_start % haystack.len();
-            let needle_length = needle_length % (haystack.len() - needle_start);
-
-            if needle_length == 0 {
-                return TestResult::discard();
-            }
-
-            let needle = &haystack[needle_start..(needle_start + needle_length)];
-
-            let bm_searcher = BoyerMooreSearch::new(needle.to_vec());
-
-            let start = naive_find(&needle, &haystack);
-            match start {
-                None => TestResult::from_bool(false),
-                Some(nf_start) =>
-                    TestResult::from_bool(
-                        nf_start <= needle_start
-                            && bm_searcher.find(&haystack) == start
-                    )
-            }
-        }
-
-        fn qc_bm_finds_first(needle: Vec<u8>) -> TestResult {
-            if needle.len() == 0 {
-                return TestResult::discard();
-            }
-
-            let mut haystack = needle.clone();
-            let searcher = BoyerMooreSearch::new(needle.clone());
-            haystack.extend(needle);
-
-            TestResult::from_bool(
-                searcher.find(haystack.as_slice())
-                        .map(|x| x == 0)
-                        .unwrap_or(false))
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/literal/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/literal/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/literal/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/literal/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 #[allow(missing_docs)]
 #[cfg(not(feature = "perf-literal"))]
 mod imp {
-    use syntax::hir::literal::Literals;
+    use regex_syntax::hir::literal::Literals;
 
     #[derive(Clone, Debug)]
     pub struct LiteralSearcher(());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/pattern.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/pattern.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/pattern.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/pattern.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,8 @@
 use std::str::pattern::{Pattern, SearchStep, Searcher};
 
-use re_unicode::{Matches, Regex};
+use crate::re_unicode::{Matches, Regex};
 
+#[derive(Debug)]
 pub struct RegexSearcher<'r, 't> {
     haystack: &'t str,
     it: Matches<'r, 't>,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/pikevm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/pikevm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/pikevm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/pikevm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,11 +17,11 @@
 
 use std::mem;
 
-use exec::ProgramCache;
-use input::{Input, InputAt};
-use prog::{InstPtr, Program};
-use re_trait::Slot;
-use sparse::SparseSet;
+use crate::exec::ProgramCache;
+use crate::input::{Input, InputAt};
+use crate::prog::{InstPtr, Program};
+use crate::re_trait::Slot;
+use crate::sparse::SparseSet;
 
 /// An NFA simulation matching engine.
 #[derive(Debug)]
@@ -231,7 +231,7 @@
         at: InputAt,
         at_next: InputAt,
     ) -> bool {
-        use prog::Inst::*;
+        use crate::prog::Inst::*;
         match self.prog[ip] {
             Match(match_slot) => {
                 if match_slot < matches.len() {
@@ -300,7 +300,7 @@
         // traverse the set of states. We only push to the stack when we
         // absolutely need recursion (restoring captures or following a
         // branch).
-        use prog::Inst::*;
+        use crate::prog::Inst::*;
         loop {
             // Don't visit states we've already added.
             if nlist.set.contains(ip) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/pool.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/pool.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,333 @@
+// This module provides a relatively simple thread-safe pool of reusable
+// objects. For the most part, it's implemented by a stack represented by a
+// Mutex<Vec<T>>. It has one small trick: because unlocking a mutex is somewhat
+// costly, in the case where a pool is accessed by the first thread that tried
+// to get a value, we bypass the mutex. Here are some benchmarks showing the
+// difference.
+//
+// 1) misc::anchored_literal_long_non_match    21 (18571 MB/s)
+// 2) misc::anchored_literal_long_non_match   107 (3644 MB/s)
+// 3) misc::anchored_literal_long_non_match    45 (8666 MB/s)
+// 4) misc::anchored_literal_long_non_match    19 (20526 MB/s)
+//
+// (1) represents our baseline: the master branch at the time of writing when
+// using the 'thread_local' crate to implement the pool below.
+//
+// (2) represents a naive pool implemented completely via Mutex<Vec<T>>. There
+// is no special trick for bypassing the mutex.
+//
+// (3) is the same as (2), except it uses Mutex<Vec<Box<T>>>. It is twice as
+// fast because a Box<T> is much smaller than the T we use with a Pool in this
+// crate. So pushing and popping a Box<T> from a Vec is quite a bit faster
+// than for T.
+//
+// (4) is the same as (3), but with the trick for bypassing the mutex in the
+// case of the first-to-get thread.
+//
+// Why move off of thread_local? Even though (4) is a hair faster than (1)
+// above, this was not the main goal. The main goal was to move off of
+// thread_local and find a way to *simply* re-capture some of its speed for
+// regex's specific case. So again, why move off of it? The *primary* reason is
+// because of memory leaks. See https://github.com/rust-lang/regex/issues/362
+// for example. (Why do I want it to be simple? Well, I suppose what I mean is,
+// "use as much safe code as possible to minimize risk and be as sure as I can
+// be that it is correct.")
+//
+// My guess is that the thread_local design is probably not appropriate for
+// regex since its memory usage scales to the number of active threads that
+// have used a regex, where as the pool below scales to the number of threads
+// that simultaneously use a regex. While neither case permits contraction,
+// since we own the pool data structure below, we can add contraction if a
+// clear use case pops up in the wild. More pressingly though, it seems that
+// there are at least some use case patterns where one might have many threads
+// sitting around that might have used a regex at one point. While thread_local
+// does try to reuse space previously used by a thread that has since stopped,
+// its maximal memory usage still scales with the total number of active
+// threads. In contrast, the pool below scales with the total number of threads
+// *simultaneously* using the pool. The hope is that this uses less memory
+// overall. And if it doesn't, we can hopefully tune it somehow.
+//
+// It seems that these sort of conditions happen frequently
+// in FFI inside of other more "managed" languages. This was
+// mentioned in the issue linked above, and also mentioned here:
+// https://github.com/BurntSushi/rure-go/issues/3. And in particular, users
+// confirm that disabling the use of thread_local resolves the leak.
+//
+// There were other weaker reasons for moving off of thread_local as well.
+// Namely, at the time, I was looking to reduce dependencies. And for something
+// like regex, maintenance can be simpler when we own the full dependency tree.
+
+use std::panic::{RefUnwindSafe, UnwindSafe};
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Mutex;
+
+/// An atomic counter used to allocate thread IDs.
+static COUNTER: AtomicUsize = AtomicUsize::new(1);
+
+thread_local!(
+    /// A thread local used to assign an ID to a thread.
+    static THREAD_ID: usize = {
+        let next = COUNTER.fetch_add(1, Ordering::Relaxed);
+        // SAFETY: We cannot permit the reuse of thread IDs since reusing a
+        // thread ID might result in more than one thread "owning" a pool,
+        // and thus, permit accessing a mutable value from multiple threads
+        // simultaneously without synchronization. The intent of this panic is
+        // to be a sanity check. It is not expected that the thread ID space
+        // will actually be exhausted in practice.
+        //
+        // This checks that the counter never wraps around, since atomic
+        // addition wraps around on overflow.
+        if next == 0 {
+            panic!("regex: thread ID allocation space exhausted");
+        }
+        next
+    };
+);
+
+/// The type of the function used to create values in a pool when the pool is
+/// empty and the caller requests one.
+type CreateFn<T> =
+    Box<dyn Fn() -> T + Send + Sync + UnwindSafe + RefUnwindSafe + 'static>;
+
+/// A simple thread safe pool for reusing values.
+///
+/// Getting a value out comes with a guard. When that guard is dropped, the
+/// value is automatically put back in the pool.
+///
+/// A Pool<T> impls Sync when T is Send (even if it's not Sync). This means
+/// that T can use interior mutability. This is possible because a pool is
+/// guaranteed to provide a value to exactly one thread at any time.
+///
+/// Currently, a pool never contracts in size. Its size is proportional to the
+/// number of simultaneous uses.
+pub struct Pool<T> {
+    /// A stack of T values to hand out. These are used when a Pool is
+    /// accessed by a thread that didn't create it.
+    stack: Mutex<Vec<Box<T>>>,
+    /// A function to create more T values when stack is empty and a caller
+    /// has requested a T.
+    create: CreateFn<T>,
+    /// The ID of the thread that owns this pool. The owner is the thread
+    /// that makes the first call to 'get'. When the owner calls 'get', it
+    /// gets 'owner_val' directly instead of returning a T from 'stack'.
+    /// See comments elsewhere for details, but this is intended to be an
+    /// optimization for the common case that makes getting a T faster.
+    ///
+    /// It is initialized to a value of zero (an impossible thread ID) as a
+    /// sentinel to indicate that it is unowned.
+    owner: AtomicUsize,
+    /// A value to return when the caller is in the same thread that created
+    /// the Pool.
+    owner_val: T,
+}
+
+// SAFETY: Since we want to use a Pool from multiple threads simultaneously
+// behind an Arc, we need for it to be Sync. In cases where T is sync, Pool<T>
+// would be Sync. However, since we use a Pool to store mutable scratch space,
+// we wind up using a T that has interior mutability and is thus itself not
+// Sync. So what we *really* want is for our Pool<T> to by Sync even when T is
+// not Sync (but is at least Send).
+//
+// The only non-sync aspect of a Pool is its 'owner_val' field, which is used
+// to implement faster access to a pool value in the common case of a pool
+// being accessed in the same thread in which it was created. The 'stack' field
+// is also shared, but a Mutex<T> where T: Send is already Sync. So we only
+// need to worry about 'owner_val'.
+//
+// The key is to guarantee that 'owner_val' can only ever be accessed from one
+// thread. In our implementation below, we guarantee this by only returning the
+// 'owner_val' when the ID of the current thread matches the ID of the thread
+// that created the Pool. Since this can only ever be one thread, it follows
+// that only one thread can access 'owner_val' at any point in time. Thus, it
+// is safe to declare that Pool<T> is Sync when T is Send.
+//
+// NOTE: It would also be possible to make the owning thread be the *first*
+// thread that tries to get a value out of a Pool. However, the current
+// implementation is a little simpler and it's not clear if making the first
+// thread (rather than the creating thread) is meaningfully better.
+//
+// If there is a way to achieve our performance goals using safe code, then
+// I would very much welcome a patch. As it stands, the implementation below
+// tries to balance safety with performance. The case where a Regex is used
+// from multiple threads simultaneously will suffer a bit since getting a cache
+// will require unlocking a mutex.
+unsafe impl<T: Send> Sync for Pool<T> {}
+
+impl<T: ::std::fmt::Debug> ::std::fmt::Debug for Pool<T> {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        f.debug_struct("Pool")
+            .field("stack", &self.stack)
+            .field("owner", &self.owner)
+            .field("owner_val", &self.owner_val)
+            .finish()
+    }
+}
+
+/// A guard that is returned when a caller requests a value from the pool.
+///
+/// The purpose of the guard is to use RAII to automatically put the value back
+/// in the pool once it's dropped.
+#[derive(Debug)]
+pub struct PoolGuard<'a, T: Send> {
+    /// The pool that this guard is attached to.
+    pool: &'a Pool<T>,
+    /// This is None when the guard represents the special "owned" value. In
+    /// which case, the value is retrieved from 'pool.owner_val'.
+    value: Option<Box<T>>,
+}
+
+impl<T: Send> Pool<T> {
+    /// Create a new pool. The given closure is used to create values in the
+    /// pool when necessary.
+    pub fn new(create: CreateFn<T>) -> Pool<T> {
+        let owner = AtomicUsize::new(0);
+        let owner_val = create();
+        Pool { stack: Mutex::new(vec![]), create, owner, owner_val }
+    }
+
+    /// Get a value from the pool. The caller is guaranteed to have exclusive
+    /// access to the given value.
+    ///
+    /// Note that there is no guarantee provided about which value in the
+    /// pool is returned. That is, calling get, dropping the guard (causing
+    /// the value to go back into the pool) and then calling get again is NOT
+    /// guaranteed to return the same value received in the first get call.
+    #[cfg_attr(feature = "perf-inline", inline(always))]
+    pub fn get(&self) -> PoolGuard<'_, T> {
+        // Our fast path checks if the caller is the thread that "owns" this
+        // pool. Or stated differently, whether it is the first thread that
+        // tried to extract a value from the pool. If it is, then we can return
+        // a T to the caller without going through a mutex.
+        //
+        // SAFETY: We must guarantee that only one thread gets access to this
+        // value. Since a thread is uniquely identified by the THREAD_ID thread
+        // local, it follows that is the caller's thread ID is equal to the
+        // owner, then only one thread may receive this value.
+        let caller = THREAD_ID.with(|id| *id);
+        let owner = self.owner.load(Ordering::Relaxed);
+        if caller == owner {
+            return self.guard_owned();
+        }
+        self.get_slow(caller, owner)
+    }
+
+    /// This is the "slow" version that goes through a mutex to pop an
+    /// allocated value off a stack to return to the caller. (Or, if the stack
+    /// is empty, a new value is created.)
+    ///
+    /// If the pool has no owner, then this will set the owner.
+    #[cold]
+    fn get_slow(&self, caller: usize, owner: usize) -> PoolGuard<'_, T> {
+        use std::sync::atomic::Ordering::Relaxed;
+
+        if owner == 0 {
+            // The sentinel 0 value means this pool is not yet owned. We
+            // try to atomically set the owner. If we do, then this thread
+            // becomes the owner and we can return a guard that represents
+            // the special T for the owner.
+            let res = self.owner.compare_exchange(0, caller, Relaxed, Relaxed);
+            if res.is_ok() {
+                return self.guard_owned();
+            }
+        }
+        let mut stack = self.stack.lock().unwrap();
+        let value = match stack.pop() {
+            None => Box::new((self.create)()),
+            Some(value) => value,
+        };
+        self.guard_stack(value)
+    }
+
+    /// Puts a value back into the pool. Callers don't need to call this. Once
+    /// the guard that's returned by 'get' is dropped, it is put back into the
+    /// pool automatically.
+    fn put(&self, value: Box<T>) {
+        let mut stack = self.stack.lock().unwrap();
+        stack.push(value);
+    }
+
+    /// Create a guard that represents the special owned T.
+    fn guard_owned(&self) -> PoolGuard<'_, T> {
+        PoolGuard { pool: self, value: None }
+    }
+
+    /// Create a guard that contains a value from the pool's stack.
+    fn guard_stack(&self, value: Box<T>) -> PoolGuard<'_, T> {
+        PoolGuard { pool: self, value: Some(value) }
+    }
+}
+
+impl<'a, T: Send> PoolGuard<'a, T> {
+    /// Return the underlying value.
+    pub fn value(&self) -> &T {
+        match self.value {
+            None => &self.pool.owner_val,
+            Some(ref v) => &**v,
+        }
+    }
+}
+
+impl<'a, T: Send> Drop for PoolGuard<'a, T> {
+    #[cfg_attr(feature = "perf-inline", inline(always))]
+    fn drop(&mut self) {
+        if let Some(value) = self.value.take() {
+            self.pool.put(value);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::panic::{RefUnwindSafe, UnwindSafe};
+
+    use super::*;
+
+    #[test]
+    fn oibits() {
+        use crate::exec::ProgramCache;
+
+        fn has_oibits<T: Send + Sync + UnwindSafe + RefUnwindSafe>() {}
+        has_oibits::<Pool<ProgramCache>>();
+    }
+
+    // Tests that Pool implements the "single owner" optimization. That is, the
+    // thread that first accesses the pool gets its own copy, while all other
+    // threads get distinct copies.
+    #[test]
+    fn thread_owner_optimization() {
+        use std::cell::RefCell;
+        use std::sync::Arc;
+
+        let pool: Arc<Pool<RefCell<Vec<char>>>> =
+            Arc::new(Pool::new(Box::new(|| RefCell::new(vec!['a']))));
+        pool.get().value().borrow_mut().push('x');
+
+        let pool1 = pool.clone();
+        let t1 = std::thread::spawn(move || {
+            let guard = pool1.get();
+            let v = guard.value();
+            v.borrow_mut().push('y');
+        });
+
+        let pool2 = pool.clone();
+        let t2 = std::thread::spawn(move || {
+            let guard = pool2.get();
+            let v = guard.value();
+            v.borrow_mut().push('z');
+        });
+
+        t1.join().unwrap();
+        t2.join().unwrap();
+
+        // If we didn't implement the single owner optimization, then one of
+        // the threads above is likely to have mutated the [a, x] vec that
+        // we stuffed in the pool before spawning the threads. But since
+        // neither thread was first to access the pool, and because of the
+        // optimization, we should be guaranteed that neither thread mutates
+        // the special owned pool value.
+        //
+        // (Technically this is an implementation detail and not a contract of
+        // Pool's API.)
+        assert_eq!(vec!['a', 'x'], *pool.get().value().borrow());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/prog.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/prog.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/prog.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/prog.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,8 +6,8 @@
 use std::slice;
 use std::sync::Arc;
 
-use input::Char;
-use literal::LiteralSearcher;
+use crate::input::Char;
+use crate::literal::LiteralSearcher;
 
 /// `InstPtr` represents the index of an instruction in a regex program.
 pub type InstPtr = usize;
@@ -168,7 +168,7 @@
 }
 
 impl fmt::Debug for Program {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use self::Inst::*;
 
         fn with_goto(cur: usize, goto: usize, fmtd: String) -> String {
@@ -259,8 +259,8 @@
 ///
 /// Other than the benefit of moving invariants into the type system, another
 /// benefit is the decreased size. If we remove the `Char` and `Ranges`
-/// instructions from the `Inst` enum, then its size shrinks from 40 bytes to
-/// 24 bytes. (This is because of the removal of a `Vec` in the `Ranges`
+/// instructions from the `Inst` enum, then its size shrinks from 32 bytes to
+/// 24 bytes. (This is because of the removal of a `Box<[]>` in the `Ranges`
 /// variant.) Given that byte based machines are typically much bigger than
 /// their Unicode analogues (because they can decode UTF-8 directly), this ends
 /// up being a pretty significant savings.
@@ -374,7 +374,7 @@
     /// succeeds.
     pub goto: InstPtr,
     /// The set of Unicode scalar value ranges to test.
-    pub ranges: Vec<(char, char)>,
+    pub ranges: Box<[(char, char)]>,
 }
 
 impl InstRanges {
@@ -432,3 +432,16 @@
         self.start <= byte && byte <= self.end
     }
 }
+
+#[cfg(test)]
+mod test {
+    #[test]
+    #[cfg(target_pointer_width = "64")]
+    fn test_size_of_inst() {
+        use std::mem::size_of;
+
+        use super::Inst;
+
+        assert_eq!(32, size_of::<Inst>());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_builder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_builder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_builder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_builder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,16 +37,17 @@
     ($name:ident, $regex_mod:ident, $only_utf8:expr) => {
         pub mod $name {
             use super::RegexOptions;
-            use error::Error;
-            use exec::ExecBuilder;
+            use crate::error::Error;
+            use crate::exec::ExecBuilder;
 
-            use $regex_mod::Regex;
+            use crate::$regex_mod::Regex;
 
             /// A configurable builder for a regular expression.
             ///
             /// A builder can be used to configure how the regex is built, for example, by
             /// setting the default flags (which can be overridden in the expression
             /// itself) or setting various limits.
+            #[derive(Debug)]
             pub struct RegexBuilder(RegexOptions);
 
             impl RegexBuilder {
@@ -234,16 +235,17 @@
     ($name:ident, $regex_mod:ident, $only_utf8:expr) => {
         pub mod $name {
             use super::RegexOptions;
-            use error::Error;
-            use exec::ExecBuilder;
+            use crate::error::Error;
+            use crate::exec::ExecBuilder;
 
-            use re_set::$regex_mod::RegexSet;
+            use crate::re_set::$regex_mod::RegexSet;
 
             /// A configurable builder for a set of regular expressions.
             ///
             /// A builder can be used to configure how the regexes are built, for example,
             /// by setting the default flags (which can be overridden in the expression
             /// itself) or setting various limits.
+            #[derive(Debug)]
             pub struct RegexSetBuilder(RegexOptions);
 
             impl RegexSetBuilder {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,18 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fmt;
+use std::iter::FusedIterator;
 use std::ops::{Index, Range};
 use std::str::FromStr;
 use std::sync::Arc;
 
-use find_byte::find_byte;
+use crate::find_byte::find_byte;
 
-use error::Error;
-use exec::{Exec, ExecNoSync};
-use expand::expand_bytes;
-use re_builder::bytes::RegexBuilder;
-use re_trait::{self, RegularExpression, SubCapturesPosIter};
+use crate::error::Error;
+use crate::exec::{Exec, ExecNoSync};
+use crate::expand::expand_bytes;
+use crate::re_builder::bytes::RegexBuilder;
+use crate::re_trait::{self, RegularExpression, SubCapturesPosIter};
 
 /// Match represents a single match of a regex in a haystack.
 ///
@@ -78,14 +79,14 @@
 
 impl fmt::Display for Regex {
     /// Shows the original regular expression.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.as_str())
     }
 }
 
 impl fmt::Debug for Regex {
     /// Shows the original regular expression.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(self, f)
     }
 }
@@ -132,7 +133,7 @@
     /// bytes:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let text = b"I categorically deny having triskaidekaphobia.";
     /// assert!(Regex::new(r"\b\w{13}\b").unwrap().is_match(text));
@@ -155,7 +156,7 @@
     /// ASCII word bytes:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let text = b"I categorically deny having triskaidekaphobia.";
     /// let mat = Regex::new(r"\b\w{13}\b").unwrap().find(text).unwrap();
@@ -176,7 +177,7 @@
     /// word bytes:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let text = b"Retroactively relinquishing remunerations is reprehensible.";
     /// for mat in Regex::new(r"\b\w{13}\b").unwrap().find_iter(text) {
@@ -204,7 +205,7 @@
     /// year separately.
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"'([^']+)'\s+\((\d{4})\)").unwrap();
     /// let text = b"Not my favorite movie: 'Citizen Kane' (1941).";
@@ -226,7 +227,7 @@
     /// We can make this example a bit clearer by using *named* capture groups:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"'(?P<title>[^']+)'\s+\((?P<year>\d{4})\)")
     ///                .unwrap();
@@ -270,7 +271,7 @@
     /// some text, where the movie is formatted like "'Title' (xxxx)":
     ///
     /// ```rust
-    /// # extern crate regex; use std::str; use regex::bytes::Regex;
+    /// # use std::str; use regex::bytes::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"'(?P<title>[^']+)'\s+\((?P<year>\d{4})\)")
     ///                .unwrap();
@@ -304,7 +305,7 @@
     /// To split a string delimited by arbitrary amounts of spaces or tabs:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"[ \t]+").unwrap();
     /// let fields: Vec<&[u8]> = re.split(b"a b \t  c\td    e").collect();
@@ -330,7 +331,7 @@
     /// Get the first two words in some text:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"\W+").unwrap();
     /// let fields: Vec<&[u8]> = re.splitn(b"Hey! How are you?", 3).collect();
@@ -378,7 +379,7 @@
     /// In typical usage, this can just be a normal byte string:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let re = Regex::new("[^01]+").unwrap();
     /// assert_eq!(re.replace(b"1078910", &b""[..]), &b"1010"[..]);
@@ -391,7 +392,7 @@
     /// group matches easily:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # use regex::bytes::Captures; fn main() {
     /// let re = Regex::new(r"([^,\s]+),\s+(\S+)").unwrap();
     /// let result = re.replace(b"Springsteen, Bruce", |caps: &Captures| {
@@ -410,7 +411,7 @@
     /// with named capture groups:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"(?P<last>[^,\s]+),\s+(?P<first>\S+)").unwrap();
     /// let result = re.replace(b"Springsteen, Bruce", &b"$first $last"[..]);
@@ -427,7 +428,7 @@
     /// underscore:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"(?P<first>\w+)\s+(?P<second>\w+)").unwrap();
     /// let result = re.replace(b"deep fried", &b"${first}_$second"[..]);
@@ -444,7 +445,7 @@
     /// byte string with `NoExpand`:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// use regex::bytes::NoExpand;
     ///
@@ -545,7 +546,7 @@
     /// `a`.
     ///
     /// ```rust
-    /// # extern crate regex; use regex::bytes::Regex;
+    /// # use regex::bytes::Regex;
     /// # fn main() {
     /// let text = b"aaaaa";
     /// let pos = Regex::new(r"a+").unwrap().shortest_match(text);
@@ -657,7 +658,7 @@
     }
 
     /// Returns an iterator over the capture names.
-    pub fn capture_names(&self) -> CaptureNames {
+    pub fn capture_names(&self) -> CaptureNames<'_> {
         CaptureNames(self.0.capture_names().iter())
     }
 
@@ -690,6 +691,7 @@
 ///
 /// `'r` is the lifetime of the compiled regular expression and `'t` is the
 /// lifetime of the matched byte string.
+#[derive(Debug)]
 pub struct Matches<'r, 't>(re_trait::Matches<'t, ExecNoSync<'r>>);
 
 impl<'r, 't> Iterator for Matches<'r, 't> {
@@ -701,6 +703,8 @@
     }
 }
 
+impl<'r, 't> FusedIterator for Matches<'r, 't> {}
+
 /// An iterator that yields all non-overlapping capture groups matching a
 /// particular regular expression.
 ///
@@ -708,6 +712,7 @@
 ///
 /// `'r` is the lifetime of the compiled regular expression and `'t` is the
 /// lifetime of the matched byte string.
+#[derive(Debug)]
 pub struct CaptureMatches<'r, 't>(
     re_trait::CaptureMatches<'t, ExecNoSync<'r>>,
 );
@@ -724,10 +729,13 @@
     }
 }
 
+impl<'r, 't> FusedIterator for CaptureMatches<'r, 't> {}
+
 /// Yields all substrings delimited by a regular expression match.
 ///
 /// `'r` is the lifetime of the compiled regular expression and `'t` is the
 /// lifetime of the byte string being split.
+#[derive(Debug)]
 pub struct Split<'r, 't> {
     finder: Matches<'r, 't>,
     last: usize,
@@ -757,12 +765,15 @@
     }
 }
 
+impl<'r, 't> FusedIterator for Split<'r, 't> {}
+
 /// Yields at most `N` substrings delimited by a regular expression match.
 ///
 /// The last substring will be whatever remains after splitting.
 ///
 /// `'r` is the lifetime of the compiled regular expression and `'t` is the
 /// lifetime of the byte string being split.
+#[derive(Debug)]
 pub struct SplitN<'r, 't> {
     splits: Split<'r, 't>,
     n: usize,
@@ -790,14 +801,21 @@
             Some(&text[self.splits.last..])
         }
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (0, Some(self.n))
+    }
 }
 
+impl<'r, 't> FusedIterator for SplitN<'r, 't> {}
+
 /// An iterator over the names of all possible captures.
 ///
 /// `None` indicates an unnamed capture; the first element (capture 0, the
 /// whole matched region) is always unnamed.
 ///
 /// `'r` is the lifetime of the compiled regular expression.
+#[derive(Clone, Debug)]
 pub struct CaptureNames<'r>(::std::slice::Iter<'r, Option<String>>);
 
 impl<'r> Iterator for CaptureNames<'r> {
@@ -813,8 +831,16 @@
     fn size_hint(&self) -> (usize, Option<usize>) {
         self.0.size_hint()
     }
+
+    fn count(self) -> usize {
+        self.0.count()
+    }
 }
 
+impl<'r> ExactSizeIterator for CaptureNames<'r> {}
+
+impl<'r> FusedIterator for CaptureNames<'r> {}
+
 /// CaptureLocations is a low level representation of the raw offsets of each
 /// submatch.
 ///
@@ -964,15 +990,15 @@
 }
 
 impl<'t> fmt::Debug for Captures<'t> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_tuple("Captures").field(&CapturesDebug(self)).finish()
     }
 }
 
-struct CapturesDebug<'c, 't: 'c>(&'c Captures<'t>);
+struct CapturesDebug<'c, 't>(&'c Captures<'t>);
 
 impl<'c, 't> fmt::Debug for CapturesDebug<'c, 't> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fn escape_bytes(bytes: &[u8]) -> String {
             let mut s = String::new();
             for &b in bytes {
@@ -1057,8 +1083,8 @@
 ///
 /// The lifetime `'c` corresponds to the lifetime of the `Captures` value, and
 /// the lifetime `'t` corresponds to the originally matched text.
-#[derive(Clone)]
-pub struct SubCaptureMatches<'c, 't: 'c> {
+#[derive(Clone, Debug)]
+pub struct SubCaptureMatches<'c, 't> {
     caps: &'c Captures<'t>,
     it: SubCapturesPosIter<'c>,
 }
@@ -1073,13 +1099,15 @@
     }
 }
 
+impl<'c, 't> FusedIterator for SubCaptureMatches<'c, 't> {}
+
 /// Replacer describes types that can be used to replace matches in a byte
 /// string.
 ///
 /// In general, users of this crate shouldn't need to implement this trait,
-/// since implementations are already provided for `&[u8]` and
-/// `FnMut(&Captures) -> Vec<u8>` (or any `FnMut(&Captures) -> T`
-/// where `T: AsRef<[u8]>`), which covers most use cases.
+/// since implementations are already provided for `&[u8]` along with other
+/// variants of bytes types and `FnMut(&Captures) -> Vec<u8>` (or any
+/// `FnMut(&Captures) -> T` where `T: AsRef<[u8]>`), which covers most use cases.
 pub trait Replacer {
     /// Appends text to `dst` to replace the current match.
     ///
@@ -1088,7 +1116,7 @@
     ///
     /// For example, a no-op replacement would be
     /// `dst.extend(&caps[0])`.
-    fn replace_append(&mut self, caps: &Captures, dst: &mut Vec<u8>);
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut Vec<u8>);
 
     /// Return a fixed unchanging replacement byte string.
     ///
@@ -1131,10 +1159,10 @@
 ///
 /// Returned by [`Replacer::by_ref`](trait.Replacer.html#method.by_ref).
 #[derive(Debug)]
-pub struct ReplacerRef<'a, R: ?Sized + 'a>(&'a mut R);
+pub struct ReplacerRef<'a, R: ?Sized>(&'a mut R);
 
 impl<'a, R: Replacer + ?Sized + 'a> Replacer for ReplacerRef<'a, R> {
-    fn replace_append(&mut self, caps: &Captures, dst: &mut Vec<u8>) {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut Vec<u8>) {
         self.0.replace_append(caps, dst)
     }
     fn no_expansion<'r>(&'r mut self) -> Option<Cow<'r, [u8]>> {
@@ -1143,24 +1171,69 @@
 }
 
 impl<'a> Replacer for &'a [u8] {
-    fn replace_append(&mut self, caps: &Captures, dst: &mut Vec<u8>) {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut Vec<u8>) {
         caps.expand(*self, dst);
     }
 
-    fn no_expansion(&mut self) -> Option<Cow<[u8]>> {
-        match find_byte(b'$', *self) {
-            Some(_) => None,
-            None => Some(Cow::Borrowed(*self)),
-        }
+    fn no_expansion(&mut self) -> Option<Cow<'_, [u8]>> {
+        no_expansion(self)
+    }
+}
+
+impl<'a> Replacer for &'a Vec<u8> {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut Vec<u8>) {
+        caps.expand(*self, dst);
+    }
+
+    fn no_expansion(&mut self) -> Option<Cow<'_, [u8]>> {
+        no_expansion(self)
+    }
+}
+
+impl Replacer for Vec<u8> {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut Vec<u8>) {
+        caps.expand(self, dst);
+    }
+
+    fn no_expansion(&mut self) -> Option<Cow<'_, [u8]>> {
+        no_expansion(self)
+    }
+}
+
+impl<'a> Replacer for Cow<'a, [u8]> {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut Vec<u8>) {
+        caps.expand(self.as_ref(), dst);
+    }
+
+    fn no_expansion(&mut self) -> Option<Cow<'_, [u8]>> {
+        no_expansion(self)
+    }
+}
+
+impl<'a> Replacer for &'a Cow<'a, [u8]> {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut Vec<u8>) {
+        caps.expand(self.as_ref(), dst);
+    }
+
+    fn no_expansion(&mut self) -> Option<Cow<'_, [u8]>> {
+        no_expansion(self)
+    }
+}
+
+fn no_expansion<T: AsRef<[u8]>>(t: &T) -> Option<Cow<'_, [u8]>> {
+    let s = t.as_ref();
+    match find_byte(b'$', s) {
+        Some(_) => None,
+        None => Some(Cow::Borrowed(s)),
     }
 }
 
 impl<F, T> Replacer for F
 where
-    F: FnMut(&Captures) -> T,
+    F: FnMut(&Captures<'_>) -> T,
     T: AsRef<[u8]>,
 {
-    fn replace_append(&mut self, caps: &Captures, dst: &mut Vec<u8>) {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut Vec<u8>) {
         dst.extend_from_slice((*self)(caps).as_ref());
     }
 }
@@ -1173,14 +1246,15 @@
 /// and performant (since capture groups don't need to be found).
 ///
 /// `'t` is the lifetime of the literal text.
+#[derive(Clone, Debug)]
 pub struct NoExpand<'t>(pub &'t [u8]);
 
 impl<'t> Replacer for NoExpand<'t> {
-    fn replace_append(&mut self, _: &Captures, dst: &mut Vec<u8>) {
+    fn replace_append(&mut self, _: &Captures<'_>, dst: &mut Vec<u8>) {
         dst.extend_from_slice(self.0);
     }
 
-    fn no_expansion(&mut self) -> Option<Cow<[u8]>> {
+    fn no_expansion(&mut self) -> Option<Cow<'_, [u8]>> {
         Some(Cow::Borrowed(self.0))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_set.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_set.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_set.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_set.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,10 +7,10 @@
             use std::slice;
             use std::vec;
 
-            use error::Error;
-            use exec::Exec;
-            use re_builder::$builder_mod::RegexSetBuilder;
-            use re_trait::RegularExpression;
+            use crate::error::Error;
+            use crate::exec::Exec;
+            use crate::re_builder::$builder_mod::RegexSetBuilder;
+            use crate::re_trait::RegularExpression;
 
 /// Match multiple (possibly overlapping) regular expressions in a single scan.
 ///
@@ -43,7 +43,7 @@
 /// Note that it would be possible to adapt the above example to using `Regex`
 /// with an expression like:
 ///
-/// ```ignore
+/// ```text
 /// (?P<email>[a-z]+@(?P<email_domain>[a-z]+[.](com|org|net)))|(?P<domain>[a-z]+[.](com|org|net))
 /// ```
 ///
@@ -292,7 +292,7 @@
     /// This will always produces matches in ascending order of index, where
     /// the index corresponds to the index of the regex that matched with
     /// respect to its position when initially building the set.
-    pub fn iter(&self) -> SetMatchesIter {
+    pub fn iter(&self) -> SetMatchesIter<'_> {
         SetMatchesIter((&*self.matches).into_iter().enumerate())
     }
 }
@@ -320,6 +320,7 @@
 /// This will always produces matches in ascending order of index, where the
 /// index corresponds to the index of the regex that matched with respect to
 /// its position when initially building the set.
+#[derive(Debug)]
 pub struct SetMatchesIntoIter(iter::Enumerate<vec::IntoIter<bool>>);
 
 impl Iterator for SetMatchesIntoIter {
@@ -352,6 +353,8 @@
     }
 }
 
+impl iter::FusedIterator for SetMatchesIntoIter {}
+
 /// A borrowed iterator over the set of matches from a regex set.
 ///
 /// The lifetime `'a` refers to the lifetime of a `SetMatches` value.
@@ -359,7 +362,7 @@
 /// This will always produces matches in ascending order of index, where the
 /// index corresponds to the index of the regex that matched with respect to
 /// its position when initially building the set.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct SetMatchesIter<'a>(iter::Enumerate<slice::Iter<'a, bool>>);
 
 impl<'a> Iterator for SetMatchesIter<'a> {
@@ -392,6 +395,8 @@
     }
 }
 
+impl<'a> iter::FusedIterator for SetMatchesIter<'a> {}
+
 #[doc(hidden)]
 impl From<Exec> for RegexSet {
     fn from(exec: Exec) -> Self {
@@ -400,7 +405,7 @@
 }
 
 impl fmt::Debug for RegexSet {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "RegexSet({:?})", self.0.regex_strings())
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_trait.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_trait.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_trait.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_trait.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,6 @@
+use std::fmt;
+use std::iter::FusedIterator;
+
 /// Slot is a single saved capture location. Note that there are two slots for
 /// every capture in a regular expression (one slot each for the start and end
 /// of the capture).
@@ -27,7 +30,7 @@
     /// Creates an iterator of all the capture group positions in order of
     /// appearance in the regular expression. Positions are byte indices
     /// in terms of the original string matched.
-    pub fn iter(&self) -> SubCapturesPosIter {
+    pub fn iter(&self) -> SubCapturesPosIter<'_> {
         SubCapturesPosIter { idx: 0, locs: self }
     }
 
@@ -51,7 +54,7 @@
 /// Positions are byte indices in terms of the original string matched.
 ///
 /// `'c` is the lifetime of the captures.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct SubCapturesPosIter<'c> {
     idx: usize,
     locs: &'c Locations,
@@ -73,6 +76,8 @@
     }
 }
 
+impl<'c> FusedIterator for SubCapturesPosIter<'c> {}
+
 /// `RegularExpression` describes types that can implement regex searching.
 ///
 /// This trait is my attempt at reducing code duplication and to standardize
@@ -85,9 +90,9 @@
 /// somewhat reasonable. One particular thing this trait would expose would be
 /// the ability to start the search of a regex anywhere in a haystack, which
 /// isn't possible in the current public API.
-pub trait RegularExpression: Sized {
+pub trait RegularExpression: Sized + fmt::Debug {
     /// The type of the haystack.
-    type Text: ?Sized;
+    type Text: ?Sized + fmt::Debug;
 
     /// The number of capture slots in the compiled regular expression. This is
     /// always two times the number of capture groups (two slots per group).
@@ -133,18 +138,19 @@
 
     /// Returns an iterator over all non-overlapping successive leftmost-first
     /// matches.
-    fn find_iter(self, text: &Self::Text) -> Matches<Self> {
+    fn find_iter(self, text: &Self::Text) -> Matches<'_, Self> {
         Matches { re: self, text: text, last_end: 0, last_match: None }
     }
 
     /// Returns an iterator over all non-overlapping successive leftmost-first
     /// matches with captures.
-    fn captures_iter(self, text: &Self::Text) -> CaptureMatches<Self> {
+    fn captures_iter(self, text: &Self::Text) -> CaptureMatches<'_, Self> {
         CaptureMatches(self.find_iter(text))
     }
 }
 
 /// An iterator over all non-overlapping successive leftmost-first matches.
+#[derive(Debug)]
 pub struct Matches<'t, R>
 where
     R: RegularExpression,
@@ -205,8 +211,16 @@
     }
 }
 
+impl<'t, R> FusedIterator for Matches<'t, R>
+where
+    R: RegularExpression,
+    R::Text: 't + AsRef<[u8]>,
+{
+}
+
 /// An iterator over all non-overlapping successive leftmost-first matches with
 /// captures.
+#[derive(Debug)]
 pub struct CaptureMatches<'t, R>(Matches<'t, R>)
 where
     R: RegularExpression,
@@ -260,3 +274,10 @@
         Some(locs)
     }
 }
+
+impl<'t, R> FusedIterator for CaptureMatches<'t, R>
+where
+    R: RegularExpression,
+    R::Text: 't + AsRef<[u8]>,
+{
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_unicode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_unicode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/re_unicode.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/re_unicode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,25 +1,25 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fmt;
+use std::iter::FusedIterator;
 use std::ops::{Index, Range};
 use std::str::FromStr;
 use std::sync::Arc;
 
-use find_byte::find_byte;
-use syntax;
+use crate::find_byte::find_byte;
 
-use error::Error;
-use exec::{Exec, ExecNoSyncStr};
-use expand::expand_str;
-use re_builder::unicode::RegexBuilder;
-use re_trait::{self, RegularExpression, SubCapturesPosIter};
+use crate::error::Error;
+use crate::exec::{Exec, ExecNoSyncStr};
+use crate::expand::expand_str;
+use crate::re_builder::unicode::RegexBuilder;
+use crate::re_trait::{self, RegularExpression, SubCapturesPosIter};
 
 /// Escapes all regular expression meta characters in `text`.
 ///
 /// The string returned may be safely used as a literal in a regular
 /// expression.
 pub fn escape(text: &str) -> String {
-    syntax::escape(text)
+    regex_syntax::escape(text)
 }
 
 /// Match represents a single match of a regex in a haystack.
@@ -137,14 +137,14 @@
 
 impl fmt::Display for Regex {
     /// Shows the original regular expression.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.as_str())
     }
 }
 
 impl fmt::Debug for Regex {
     /// Shows the original regular expression.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(self, f)
     }
 }
@@ -188,7 +188,7 @@
     /// Unicode word characters:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let text = "I categorically deny having triskaidekaphobia.";
     /// assert!(Regex::new(r"\b\w{13}\b").unwrap().is_match(text));
@@ -211,7 +211,7 @@
     /// Unicode word characters:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let text = "I categorically deny having triskaidekaphobia.";
     /// let mat = Regex::new(r"\b\w{13}\b").unwrap().find(text).unwrap();
@@ -233,7 +233,7 @@
     /// word characters:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let text = "Retroactively relinquishing remunerations is reprehensible.";
     /// for mat in Regex::new(r"\b\w{13}\b").unwrap().find_iter(text) {
@@ -261,7 +261,7 @@
     /// year separately.
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"'([^']+)'\s+\((\d{4})\)").unwrap();
     /// let text = "Not my favorite movie: 'Citizen Kane' (1941).";
@@ -283,7 +283,7 @@
     /// We can make this example a bit clearer by using *named* capture groups:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"'(?P<title>[^']+)'\s+\((?P<year>\d{4})\)")
     ///                .unwrap();
@@ -327,7 +327,7 @@
     /// some text, where the movie is formatted like "'Title' (xxxx)":
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"'(?P<title>[^']+)'\s+\((?P<year>\d{4})\)")
     ///                .unwrap();
@@ -360,7 +360,7 @@
     /// To split a string delimited by arbitrary amounts of spaces or tabs:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"[ \t]+").unwrap();
     /// let fields: Vec<&str> = re.split("a b \t  c\td    e").collect();
@@ -384,7 +384,7 @@
     /// Get the first two words in some text:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"\W+").unwrap();
     /// let fields: Vec<&str> = re.splitn("Hey! How are you?", 3).collect();
@@ -431,7 +431,7 @@
     /// In typical usage, this can just be a normal string:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let re = Regex::new("[^01]+").unwrap();
     /// assert_eq!(re.replace("1078910", ""), "1010");
@@ -444,7 +444,7 @@
     /// capturing group matches easily:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # use regex::Captures; fn main() {
     /// let re = Regex::new(r"([^,\s]+),\s+(\S+)").unwrap();
     /// let result = re.replace("Springsteen, Bruce", |caps: &Captures| {
@@ -460,7 +460,7 @@
     /// with named capture groups:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"(?P<last>[^,\s]+),\s+(?P<first>\S+)").unwrap();
     /// let result = re.replace("Springsteen, Bruce", "$first $last");
@@ -477,7 +477,7 @@
     /// underscore:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let re = Regex::new(r"(?P<first>\w+)\s+(?P<second>\w+)").unwrap();
     /// let result = re.replace("deep fried", "${first}_$second");
@@ -494,7 +494,7 @@
     /// byte string with `NoExpand`:
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// use regex::NoExpand;
     ///
@@ -604,7 +604,7 @@
     /// `a`.
     ///
     /// ```rust
-    /// # extern crate regex; use regex::Regex;
+    /// # use regex::Regex;
     /// # fn main() {
     /// let text = "aaaaa";
     /// let pos = Regex::new(r"a+").unwrap().shortest_match(text);
@@ -716,7 +716,7 @@
     }
 
     /// Returns an iterator over the capture names.
-    pub fn capture_names(&self) -> CaptureNames {
+    pub fn capture_names(&self) -> CaptureNames<'_> {
         CaptureNames(self.0.capture_names().iter())
     }
 
@@ -747,6 +747,7 @@
 /// whole matched region) is always unnamed.
 ///
 /// `'r` is the lifetime of the compiled regular expression.
+#[derive(Clone, Debug)]
 pub struct CaptureNames<'r>(::std::slice::Iter<'r, Option<String>>);
 
 impl<'r> Iterator for CaptureNames<'r> {
@@ -762,12 +763,21 @@
     fn size_hint(&self) -> (usize, Option<usize>) {
         self.0.size_hint()
     }
+
+    fn count(self) -> usize {
+        self.0.count()
+    }
 }
 
+impl<'r> ExactSizeIterator for CaptureNames<'r> {}
+
+impl<'r> FusedIterator for CaptureNames<'r> {}
+
 /// Yields all substrings delimited by a regular expression match.
 ///
 /// `'r` is the lifetime of the compiled regular expression and `'t` is the
 /// lifetime of the string being split.
+#[derive(Debug)]
 pub struct Split<'r, 't> {
     finder: Matches<'r, 't>,
     last: usize,
@@ -797,12 +807,15 @@
     }
 }
 
+impl<'r, 't> FusedIterator for Split<'r, 't> {}
+
 /// Yields at most `N` substrings delimited by a regular expression match.
 ///
 /// The last substring will be whatever remains after splitting.
 ///
 /// `'r` is the lifetime of the compiled regular expression and `'t` is the
 /// lifetime of the string being split.
+#[derive(Debug)]
 pub struct SplitN<'r, 't> {
     splits: Split<'r, 't>,
     n: usize,
@@ -830,8 +843,14 @@
             Some(&text[self.splits.last..])
         }
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (0, Some(self.n))
+    }
 }
 
+impl<'r, 't> FusedIterator for SplitN<'r, 't> {}
+
 /// CaptureLocations is a low level representation of the raw offsets of each
 /// submatch.
 ///
@@ -981,15 +1000,15 @@
 }
 
 impl<'t> fmt::Debug for Captures<'t> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_tuple("Captures").field(&CapturesDebug(self)).finish()
     }
 }
 
-struct CapturesDebug<'c, 't: 'c>(&'c Captures<'t>);
+struct CapturesDebug<'c, 't>(&'c Captures<'t>);
 
 impl<'c, 't> fmt::Debug for CapturesDebug<'c, 't> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // We'd like to show something nice here, even if it means an
         // allocation to build a reverse index.
         let slot_to_name: HashMap<&usize, &String> =
@@ -1059,8 +1078,8 @@
 ///
 /// The lifetime `'c` corresponds to the lifetime of the `Captures` value, and
 /// the lifetime `'t` corresponds to the originally matched text.
-#[derive(Clone)]
-pub struct SubCaptureMatches<'c, 't: 'c> {
+#[derive(Clone, Debug)]
+pub struct SubCaptureMatches<'c, 't> {
     caps: &'c Captures<'t>,
     it: SubCapturesPosIter<'c>,
 }
@@ -1075,6 +1094,8 @@
     }
 }
 
+impl<'c, 't> FusedIterator for SubCaptureMatches<'c, 't> {}
+
 /// An iterator that yields all non-overlapping capture groups matching a
 /// particular regular expression.
 ///
@@ -1082,6 +1103,7 @@
 ///
 /// `'r` is the lifetime of the compiled regular expression and `'t` is the
 /// lifetime of the matched string.
+#[derive(Debug)]
 pub struct CaptureMatches<'r, 't>(
     re_trait::CaptureMatches<'t, ExecNoSyncStr<'r>>,
 );
@@ -1098,6 +1120,8 @@
     }
 }
 
+impl<'r, 't> FusedIterator for CaptureMatches<'r, 't> {}
+
 /// An iterator over all non-overlapping matches for a particular string.
 ///
 /// The iterator yields a `Match` value. The iterator stops when no more
@@ -1105,6 +1129,7 @@
 ///
 /// `'r` is the lifetime of the compiled regular expression and `'t` is the
 /// lifetime of the matched string.
+#[derive(Debug)]
 pub struct Matches<'r, 't>(re_trait::Matches<'t, ExecNoSyncStr<'r>>);
 
 impl<'r, 't> Iterator for Matches<'r, 't> {
@@ -1116,12 +1141,14 @@
     }
 }
 
+impl<'r, 't> FusedIterator for Matches<'r, 't> {}
+
 /// Replacer describes types that can be used to replace matches in a string.
 ///
 /// In general, users of this crate shouldn't need to implement this trait,
-/// since implementations are already provided for `&str` and
-/// `FnMut(&Captures) -> String` (or any `FnMut(&Captures) -> T`
-/// where `T: AsRef<str>`), which covers most use cases.
+/// since implementations are already provided for `&str` along with other
+/// variants of string types and `FnMut(&Captures) -> String` (or any
+/// `FnMut(&Captures) -> T` where `T: AsRef<str>`), which covers most use cases.
 pub trait Replacer {
     /// Appends text to `dst` to replace the current match.
     ///
@@ -1130,7 +1157,7 @@
     ///
     /// For example, a no-op replacement would be
     /// `dst.push_str(caps.get(0).unwrap().as_str())`.
-    fn replace_append(&mut self, caps: &Captures, dst: &mut String);
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String);
 
     /// Return a fixed unchanging replacement string.
     ///
@@ -1173,36 +1200,81 @@
 ///
 /// Returned by [`Replacer::by_ref`](trait.Replacer.html#method.by_ref).
 #[derive(Debug)]
-pub struct ReplacerRef<'a, R: ?Sized + 'a>(&'a mut R);
+pub struct ReplacerRef<'a, R: ?Sized>(&'a mut R);
 
 impl<'a, R: Replacer + ?Sized + 'a> Replacer for ReplacerRef<'a, R> {
-    fn replace_append(&mut self, caps: &Captures, dst: &mut String) {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String) {
         self.0.replace_append(caps, dst)
     }
-    fn no_expansion(&mut self) -> Option<Cow<str>> {
+    fn no_expansion(&mut self) -> Option<Cow<'_, str>> {
         self.0.no_expansion()
     }
 }
 
 impl<'a> Replacer for &'a str {
-    fn replace_append(&mut self, caps: &Captures, dst: &mut String) {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String) {
         caps.expand(*self, dst);
     }
 
-    fn no_expansion(&mut self) -> Option<Cow<str>> {
-        match find_byte(b'$', self.as_bytes()) {
-            Some(_) => None,
-            None => Some(Cow::Borrowed(*self)),
-        }
+    fn no_expansion(&mut self) -> Option<Cow<'_, str>> {
+        no_expansion(self)
+    }
+}
+
+impl<'a> Replacer for &'a String {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String) {
+        self.as_str().replace_append(caps, dst)
+    }
+
+    fn no_expansion(&mut self) -> Option<Cow<'_, str>> {
+        no_expansion(self)
+    }
+}
+
+impl Replacer for String {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String) {
+        self.as_str().replace_append(caps, dst)
+    }
+
+    fn no_expansion(&mut self) -> Option<Cow<'_, str>> {
+        no_expansion(self)
+    }
+}
+
+impl<'a> Replacer for Cow<'a, str> {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String) {
+        self.as_ref().replace_append(caps, dst)
+    }
+
+    fn no_expansion(&mut self) -> Option<Cow<'_, str>> {
+        no_expansion(self)
+    }
+}
+
+impl<'a> Replacer for &'a Cow<'a, str> {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String) {
+        self.as_ref().replace_append(caps, dst)
+    }
+
+    fn no_expansion(&mut self) -> Option<Cow<'_, str>> {
+        no_expansion(self)
+    }
+}
+
+fn no_expansion<T: AsRef<str>>(t: &T) -> Option<Cow<'_, str>> {
+    let s = t.as_ref();
+    match find_byte(b'$', s.as_bytes()) {
+        Some(_) => None,
+        None => Some(Cow::Borrowed(s)),
     }
 }
 
 impl<F, T> Replacer for F
 where
-    F: FnMut(&Captures) -> T,
+    F: FnMut(&Captures<'_>) -> T,
     T: AsRef<str>,
 {
-    fn replace_append(&mut self, caps: &Captures, dst: &mut String) {
+    fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String) {
         dst.push_str((*self)(caps).as_ref());
     }
 }
@@ -1215,14 +1287,15 @@
 /// and performant (since capture groups don't need to be found).
 ///
 /// `'t` is the lifetime of the literal text.
+#[derive(Clone, Debug)]
 pub struct NoExpand<'t>(pub &'t str);
 
 impl<'t> Replacer for NoExpand<'t> {
-    fn replace_append(&mut self, _: &Captures, dst: &mut String) {
+    fn replace_append(&mut self, _: &Captures<'_>, dst: &mut String) {
         dst.push_str(self.0);
     }
 
-    fn no_expansion(&mut self) -> Option<Cow<str>> {
+    fn no_expansion(&mut self) -> Option<Cow<'_, str>> {
         Some(Cow::Borrowed(self.0))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/sparse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/sparse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/src/sparse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/src/sparse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,7 +8,7 @@
 /// entire set can also be done in constant time. Iteration yields elements
 /// in the order in which they were inserted.
 ///
-/// The data structure is based on: http://research.swtch.com/sparse
+/// The data structure is based on: https://research.swtch.com/sparse
 /// Note though that we don't actually use uninitialized memory. We generally
 /// reuse allocations, so the initial allocation cost is bareable. However,
 /// its other properties listed above are extremely useful.
@@ -62,7 +62,7 @@
 }
 
 impl fmt::Debug for SparseSet {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "SparseSet({:?})", self.dense)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/test thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/test
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/test	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/test	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # This is a convenience script for running a broad swath of tests across
 # features. We don't test the complete space, since the complete space is quite
 # large. Hopefully once we migrate the test suite to better infrastructure
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/consistent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/consistent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/consistent.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/consistent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -157,10 +157,7 @@
             }
 
             impl quickcheck::Testable for RegexEqualityTest {
-                fn result<G: quickcheck::Gen>(
-                    &self,
-                    gen: &mut G,
-                ) -> TestResult {
+                fn result(&self, gen: &mut quickcheck::Gen) -> TestResult {
                     let input = $mk_input(gen);
                     let input = &input;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/crazy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/crazy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/crazy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/crazy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -137,9 +137,10 @@
 #[test]
 fn dfa_handles_pathological_case() {
     fn ones_and_zeroes(count: usize) -> String {
-        use rand::{thread_rng, Rng};
+        use rand::rngs::SmallRng;
+        use rand::{Rng, SeedableRng};
 
-        let mut rng = thread_rng();
+        let mut rng = SmallRng::from_entropy();
         let mut s = String::new();
         for _ in 0..count {
             if rng.gen() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/macros_bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/macros_bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/macros_bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/macros_bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,6 @@
 macro_rules! match_text { ($text:expr) => { $text.as_bytes() } }
 macro_rules! use_ { ($($path: tt)*) => { use regex::bytes::$($path)*; } }
 macro_rules! empty_vec { () => { <Vec<&[u8]>>::new() } }
-
 macro_rules! bytes { ($text:expr) => { $text } }
 
 macro_rules! no_expand {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/macros_str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/macros_str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/macros_str.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/macros_str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,7 @@
 macro_rules! match_text { ($text:expr) => { $text.as_str() } }
 macro_rules! use_ { ($($path: tt)*) => { use regex::$($path)*; } }
 macro_rules! empty_vec { () => { <Vec<&str>>::new() } }
+macro_rules! bytes { ($text:expr) => { std::str::from_utf8($text.as_ref()).unwrap() } }
 
 macro_rules! no_expand {
     ($text:expr) => {{
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/regression_fuzz.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/regression_fuzz.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/regression_fuzz.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/regression_fuzz.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,3 +17,15 @@
 fn empty_any_errors_no_panic() {
     assert!(regex_new!(r"\P{any}").is_err());
 }
+
+// This tests that a very large regex errors during compilation instead of
+// using gratuitous amounts of memory. The specific problem is that the
+// compiler wasn't accounting for the memory used by Unicode character classes
+// correctly.
+//
+// See: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33579
+#[test]
+fn big_regex_fails_to_compile() {
+    let pat = "[\u{0}\u{e}\u{2}\\w~~>[l\t\u{0}]p?<]{971158}";
+    assert!(regex_new!(pat).is_err());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/replace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/replace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/replace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/replace.rs	2021-12-09 12:01:26.000000000 +0000
@@ -94,7 +94,7 @@
     replace,
     r"([0-9]+)",
     "age: 26",
-    |captures: &Captures| {
+    |captures: &Captures<'_>| {
         match_text!(captures.get(1).unwrap())[0..1].to_owned()
     },
     "age: 2"
@@ -104,7 +104,7 @@
     replace,
     r"[0-9]+",
     "age: 26",
-    |_captures: &Captures| t!("Z").to_owned(),
+    |_captures: &Captures<'_>| t!("Z").to_owned(),
     "age: Z"
 );
 
@@ -130,3 +130,101 @@
     t!("${1}a $1a"),
     "ba "
 );
+
+replace!(
+    impl_string,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    t!("Z".to_string()),
+    "age: Z6"
+);
+replace!(
+    impl_string_ref,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    t!(&"Z".to_string()),
+    "age: Z6"
+);
+replace!(
+    impl_cow_str_borrowed,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    t!(std::borrow::Cow::<'_, str>::Borrowed("Z")),
+    "age: Z6"
+);
+replace!(
+    impl_cow_str_borrowed_ref,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    t!(&std::borrow::Cow::<'_, str>::Borrowed("Z")),
+    "age: Z6"
+);
+replace!(
+    impl_cow_str_owned,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    t!(std::borrow::Cow::<'_, str>::Owned("Z".to_string())),
+    "age: Z6"
+);
+replace!(
+    impl_cow_str_owned_ref,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    t!(&std::borrow::Cow::<'_, str>::Owned("Z".to_string())),
+    "age: Z6"
+);
+
+replace!(
+    impl_vec_u8,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    bytes!(vec![b'Z']),
+    "age: Z6"
+);
+replace!(
+    impl_vec_u8_ref,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    bytes!(&vec![b'Z']),
+    "age: Z6"
+);
+replace!(
+    impl_cow_slice_borrowed,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    bytes!(std::borrow::Cow::<'_, [u8]>::Borrowed(&[b'Z'])),
+    "age: Z6"
+);
+replace!(
+    impl_cow_slice_borrowed_ref,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    bytes!(&std::borrow::Cow::<'_, [u8]>::Borrowed(&[b'Z'])),
+    "age: Z6"
+);
+replace!(
+    impl_cow_slice_owned,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    bytes!(std::borrow::Cow::<'_, [u8]>::Owned(vec![b'Z'])),
+    "age: Z6"
+);
+replace!(
+    impl_cow_slice_owned_ref,
+    replace,
+    r"[0-9]",
+    "age: 26",
+    bytes!(&std::borrow::Cow::<'_, [u8]>::Owned(vec![b'Z'])),
+    "age: Z6"
+);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_backtrack_bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_backtrack_bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_backtrack_bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_backtrack_bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,3 @@
-extern crate rand;
-extern crate regex;
-
 macro_rules! regex_new {
     ($re:expr) => {{
         use regex::internal::ExecBuilder;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_backtrack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_backtrack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_backtrack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_backtrack.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,5 @@
 #![cfg_attr(feature = "pattern", feature(pattern))]
 
-extern crate rand;
-extern crate regex;
-
 macro_rules! regex_new {
     ($re:expr) => {{
         use regex::internal::ExecBuilder;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_backtrack_utf8bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_backtrack_utf8bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_backtrack_utf8bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_backtrack_utf8bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,5 @@
 #![cfg_attr(feature = "pattern", feature(pattern))]
 
-extern crate rand;
-extern crate regex;
-
 macro_rules! regex_new {
     ($re:expr) => {{
         use regex::internal::ExecBuilder;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_crates_regex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_crates_regex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_crates_regex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_crates_regex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,3 @@
-extern crate quickcheck;
-extern crate regex;
-
 /*
  * This test is a minimal version of <rofl_0> and <subdiff_0>
  *
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_default_bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_default_bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_default_bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_default_bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,3 @@
-extern crate rand;
-extern crate regex;
-
 macro_rules! regex_new {
     ($re:expr) => {{
         use regex::bytes::Regex;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_default.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_default.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_default.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_default.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,6 @@
 #![cfg_attr(feature = "pattern", feature(pattern))]
 
-extern crate rand;
-extern crate regex;
+use regex;
 
 // Due to macro scoping rules, this definition only applies for the modules
 // defined below. Effectively, it allows us to use the same tests for both
@@ -83,26 +82,49 @@
 #[test]
 fn oibits() {
     use regex::bytes;
-    use regex::{Regex, RegexBuilder};
-    use std::panic::UnwindSafe;
+    use regex::{Regex, RegexBuilder, RegexSet, RegexSetBuilder};
+    use std::panic::{RefUnwindSafe, UnwindSafe};
 
     fn assert_send<T: Send>() {}
     fn assert_sync<T: Sync>() {}
     fn assert_unwind_safe<T: UnwindSafe>() {}
+    fn assert_ref_unwind_safe<T: RefUnwindSafe>() {}
 
     assert_send::<Regex>();
     assert_sync::<Regex>();
     assert_unwind_safe::<Regex>();
+    assert_ref_unwind_safe::<Regex>();
     assert_send::<RegexBuilder>();
     assert_sync::<RegexBuilder>();
     assert_unwind_safe::<RegexBuilder>();
+    assert_ref_unwind_safe::<RegexBuilder>();
 
     assert_send::<bytes::Regex>();
     assert_sync::<bytes::Regex>();
     assert_unwind_safe::<bytes::Regex>();
+    assert_ref_unwind_safe::<bytes::Regex>();
     assert_send::<bytes::RegexBuilder>();
     assert_sync::<bytes::RegexBuilder>();
     assert_unwind_safe::<bytes::RegexBuilder>();
+    assert_ref_unwind_safe::<bytes::RegexBuilder>();
+
+    assert_send::<RegexSet>();
+    assert_sync::<RegexSet>();
+    assert_unwind_safe::<RegexSet>();
+    assert_ref_unwind_safe::<RegexSet>();
+    assert_send::<RegexSetBuilder>();
+    assert_sync::<RegexSetBuilder>();
+    assert_unwind_safe::<RegexSetBuilder>();
+    assert_ref_unwind_safe::<RegexSetBuilder>();
+
+    assert_send::<bytes::RegexSet>();
+    assert_sync::<bytes::RegexSet>();
+    assert_unwind_safe::<bytes::RegexSet>();
+    assert_ref_unwind_safe::<bytes::RegexSet>();
+    assert_send::<bytes::RegexSetBuilder>();
+    assert_sync::<bytes::RegexSetBuilder>();
+    assert_unwind_safe::<bytes::RegexSetBuilder>();
+    assert_ref_unwind_safe::<bytes::RegexSetBuilder>();
 }
 
 // See: https://github.com/rust-lang/regex/issues/568
@@ -113,3 +135,18 @@
 
     let _ = panic::catch_unwind(|| Regex::new("a").unwrap());
 }
+
+// See: https://github.com/rust-lang/regex/issues/750
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn regex_is_reasonably_small() {
+    use std::mem::size_of;
+
+    use regex::bytes;
+    use regex::{Regex, RegexSet};
+
+    assert_eq!(16, size_of::<Regex>());
+    assert_eq!(16, size_of::<RegexSet>());
+    assert_eq!(16, size_of::<bytes::Regex>());
+    assert_eq!(16, size_of::<bytes::RegexSet>());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_nfa_bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_nfa_bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_nfa_bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_nfa_bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,3 @@
-extern crate rand;
-extern crate regex;
-
 macro_rules! regex_new {
     ($re:expr) => {{
         use regex::internal::ExecBuilder;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_nfa.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_nfa.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_nfa.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_nfa.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,5 @@
 #![cfg_attr(feature = "pattern", feature(pattern))]
 
-extern crate rand;
-extern crate regex;
-
 macro_rules! regex_new {
     ($re:expr) => {{
         use regex::internal::ExecBuilder;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_nfa_utf8bytes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_nfa_utf8bytes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/tests/test_nfa_utf8bytes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/tests/test_nfa_utf8bytes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,5 @@
 #![cfg_attr(feature = "pattern", feature(pattern))]
 
-extern crate rand;
-extern crate regex;
-
 macro_rules! regex_new {
     ($re:expr) => {{
         use regex::internal::ExecBuilder;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/UNICODE.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/UNICODE.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex/UNICODE.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex/UNICODE.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 # Unicode conformance
 
 This document describes the regex crate's conformance to Unicode's
-[UTS#18](http://unicode.org/reports/tr18/)
+[UTS#18](https://unicode.org/reports/tr18/)
 report, which lays out 3 levels of support: Basic, Extended and Tailored.
 
 Full support for Level 1 ("Basic Unicode Support") is provided with two
@@ -10,7 +10,7 @@
 1. Line boundaries are not Unicode aware. Namely, only the `\n`
    (`END OF LINE`) character is recognized as a line boundary.
 2. The compatibility properties specified by
-   [RL1.2a](http://unicode.org/reports/tr18/#RL1.2a)
+   [RL1.2a](https://unicode.org/reports/tr18/#RL1.2a)
    are ASCII-only definitions.
 
 Little to no support is provided for either Level 2 or Level 3. For the most
@@ -61,18 +61,18 @@
 points specified by Unicode. The regex crate does not provide exhaustive
 support, but covers a useful subset. In particular:
 
-* [General categories](http://unicode.org/reports/tr18/#General_Category_Property)
-* [Scripts and Script Extensions](http://unicode.org/reports/tr18/#Script_Property)
-* [Age](http://unicode.org/reports/tr18/#Age)
+* [General categories](https://unicode.org/reports/tr18/#General_Category_Property)
+* [Scripts and Script Extensions](https://unicode.org/reports/tr18/#Script_Property)
+* [Age](https://unicode.org/reports/tr18/#Age)
 * A smattering of boolean properties, including all of those specified by
-  [RL1.2](http://unicode.org/reports/tr18/#RL1.2) explicitly.
+  [RL1.2](https://unicode.org/reports/tr18/#RL1.2) explicitly.
 
 In all cases, property name and value abbreviations are supported, and all
 names/values are matched loosely without regard for case, whitespace or
 underscores. Property name aliases can be found in Unicode's
-[`PropertyAliases.txt`](http://www.unicode.org/Public/UCD/latest/ucd/PropertyAliases.txt)
+[`PropertyAliases.txt`](https://www.unicode.org/Public/UCD/latest/ucd/PropertyAliases.txt)
 file, while property value aliases can be found in Unicode's
-[`PropertyValueAliases.txt`](http://www.unicode.org/Public/UCD/latest/ucd/PropertyValueAliases.txt)
+[`PropertyValueAliases.txt`](https://www.unicode.org/Public/UCD/latest/ucd/PropertyValueAliases.txt)
 file.
 
 The syntax supported is also consistent with the UTS#18 recommendation:
@@ -149,10 +149,10 @@
 
 ## RL1.2a Compatibility Properties
 
-[UTS#18 RL1.2a](http://unicode.org/reports/tr18/#RL1.2a)
+[UTS#18 RL1.2a](https://unicode.org/reports/tr18/#RL1.2a)
 
 The regex crate only provides ASCII definitions of the
-[compatibility properties documented in UTS#18 Annex C](http://unicode.org/reports/tr18/#Compatibility_Properties)
+[compatibility properties documented in UTS#18 Annex C](https://unicode.org/reports/tr18/#Compatibility_Properties)
 (sans the `\X` class, for matching grapheme clusters, which isn't provided
 at all). This is because it seems to be consistent with most other regular
 expression engines, and in particular, because these are often referred to as
@@ -165,7 +165,7 @@
 
 ## RL1.3 Subtraction and Intersection
 
-[UTS#18 RL1.3](http://unicode.org/reports/tr18/#Subtraction_and_Intersection)
+[UTS#18 RL1.3](https://unicode.org/reports/tr18/#Subtraction_and_Intersection)
 
 The regex crate provides full support for nested character classes, along with
 union, intersection (`&&`), difference (`--`) and symmetric difference (`~~`)
@@ -178,7 +178,7 @@
 
 ## RL1.4 Simple Word Boundaries
 
-[UTS#18 RL1.4](http://unicode.org/reports/tr18/#Simple_Word_Boundaries)
+[UTS#18 RL1.4](https://unicode.org/reports/tr18/#Simple_Word_Boundaries)
 
 The regex crate provides basic Unicode aware word boundary assertions. A word
 boundary assertion can be written as `\b`, or `\B` as its negation. A word
@@ -196,9 +196,9 @@
 * `\p{gc:Connector_Punctuation}`
 
 In particular, this differs slightly from the
-[prescription given in RL1.4](http://unicode.org/reports/tr18/#Simple_Word_Boundaries)
+[prescription given in RL1.4](https://unicode.org/reports/tr18/#Simple_Word_Boundaries)
 but is permissible according to
-[UTS#18 Annex C](http://unicode.org/reports/tr18/#Compatibility_Properties).
+[UTS#18 Annex C](https://unicode.org/reports/tr18/#Compatibility_Properties).
 Namely, it is convenient and simpler to have `\w` and `\b` be in sync with
 one another.
 
@@ -211,7 +211,7 @@
 
 ## RL1.5 Simple Loose Matches
 
-[UTS#18 RL1.5](http://unicode.org/reports/tr18/#Simple_Loose_Matches)
+[UTS#18 RL1.5](https://unicode.org/reports/tr18/#Simple_Loose_Matches)
 
 The regex crate provides full support for case insensitive matching in
 accordance with RL1.5. That is, it uses the "simple" case folding mapping. The
@@ -226,7 +226,7 @@
 
 ## RL1.6 Line Boundaries
 
-[UTS#18 RL1.6](http://unicode.org/reports/tr18/#Line_Boundaries)
+[UTS#18 RL1.6](https://unicode.org/reports/tr18/#Line_Boundaries)
 
 The regex crate only provides support for recognizing the `\n` (`END OF LINE`)
 character as a line boundary. This choice was made mostly for implementation
@@ -239,7 +239,7 @@
 
 ## RL1.7 Code Points
 
-[UTS#18 RL1.7](http://unicode.org/reports/tr18/#Supplementary_Characters)
+[UTS#18 RL1.7](https://unicode.org/reports/tr18/#Supplementary_Characters)
 
 The regex crate provides full support for Unicode code point matching. Namely,
 the fundamental atom of any match is always a single code point.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/benches/bench.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,5 @@
 #![feature(test)]
 
-extern crate regex_syntax;
 extern crate test;
 
 use regex_syntax::Parser;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"091a447127dacf249fff9aa782dc438ee42d6a4333a71efe4ba5195e1d35d9d9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7e9a134c72b09540e6f81f02133c5ae7d35067ea6fec44a94a1ebd20af47b151","benches/bench.rs":"f04160a876ee69bc9938bf51227513d6dbf3608643bc8ae422200f7ffc5ca85f","src/ast/mod.rs":"ff7e81186be4f7dea848363622bcd13cd8bf5b0826ea0fd7784a46547d9cf7c0","src/ast/parse.rs":"39fae33ce40c051086811861cec4df912da91c40b74f09e478592e770cf2edee","src/ast/print.rs":"b075392a6d5b48713e09aa510199bb7380aca2cf09fa4bc0efb5c49782630dda","src/ast/visitor.rs":"fb1489ed5ce019091dde244acd8b027e391be442aef3a9033c785c81a4c251fb","src/either.rs":"1758e3edd056884eccadd995708d1e374ba9aa65846bd0e13b1aae852607c560","src/error.rs":"dd937a59d5caed6ca430b884ca4d26116a57ba4c74e4f11797b255d1ac6ace51","src/hir/interval.rs":"fcd0babe3bddbe411e04adff7f4d8855db1d6aaa7d8e2180bba819abad576736","src/hir/literal/mod.rs":"b0a01a3d7e524277ada88d5b58efcced498a53addfac69355fcc368c4c4dfb0f","src/hir/mod.rs":"384d44974c90b3520f0ce1426749e6b3abaf29d7031504fd57e22a3c2e7ab3d0","src/hir/print.rs":"1bd12a70e5876d85eb2188d83c4b71c9533dc6fff0c1ab5c2b0e4701de7e7a90","src/hir/translate.rs":"1cf3f0822faeb45134e31d7dfa70ef873a92febfeabd64b694ae7c64c839ddb2","src/hir/visitor.rs":"203dbe93e4a8cde395c6ff5a0eb98c9c3737bc5ea11fe7163f5e7bf1babc1f69","src/lib.rs":"2b99d3e94a82a7ab3e1c54b262cb081b82ec0ba1eb77571a56ecbe3393c3b8f7","src/parser.rs":"10cc145d79c275c7e19b8cc9078754f23fc1da9a2c3a2e56041a8616d5f85dea","src/unicode.rs":"f1cd662a1df564be951a1df80560f1486dfe471ee9ea04d713fc6c5faf310642","src/unicode_tables/LICENSE-UNICODE":"74db5baf44a41b1000312c673544b3374e4198af5605c7f9080a402cec42cfa3","src/unicode_tables/age.rs":"b0932a020d3386478dd2f4839c59e30c525e8591735052b9e791e1ce3a2e2b72","src/unicode_tables/case_folding_simple.rs":"6d1f3d095132639228faf4806d05308c70ce2baa68cce69dca01ea159c4eaa15","src/unicode_tables/general_category.rs":"d21877600d387b8a0c5fbb0942458d0330c69aad6565e28134b8a1a371d2f4f4","src/unicode_tables/grapheme_cluster_break.rs":"f03a8be4a00265b568ca2a41d99f66a5d0f5fb423cb4113494153423a1123cda","src/unicode_tables/mod.rs":"26c837099cd934c8062e24bc9a0aaecf15fe1de03f9c6da3f3e1e5ac3ca24bee","src/unicode_tables/perl_decimal.rs":"e39a5934b504eb3282ccb26bbf50ecd764e720120eb7cf6c43662a2321665ab5","src/unicode_tables/perl_space.rs":"014e5d92b66730557e408c2d5c9b2f46d3d288aa85400ab9193c218c7b98ad21","src/unicode_tables/perl_word.rs":"ddf126f39171776ef83151d7a0dbc41da8dd09186723211fb966c4b304247a5e","src/unicode_tables/property_bool.rs":"21f72bd9f3955e3443549ef6609418817ae6df3c81fb5be90a0ceee9d7d3002d","src/unicode_tables/property_names.rs":"504ea44604cd15a7e827a89066bb81a847dd5c57cef360d9f4a914cf22afcf36","src/unicode_tables/property_values.rs":"4d793ad1b664c1913db146897c8eb4fa29d181b821f096de90dc889b738edb88","src/unicode_tables/script.rs":"5a7d2a958b93056081b8b2eb87c3a5609579ad791ad5b0c42959362ce6ea5b31","src/unicode_tables/script_extension.rs":"1d5f1985f7dcae833e78c3858231666b535bf60e032cfacc09d014c22bda6690","src/unicode_tables/sentence_break.rs":"cd5f0eb7ab6b0ec1c1fb4d78496dfecd691d0d0b76495538b9f376645a753deb","src/unicode_tables/word_break.rs":"eabeacfde7558cfe7b1556b0221f09c65f049de0b08c7cd464c1669040610a6b","src/utf8.rs":"f3e9564a0346be55356dfadac20e737c299900193c7fef5d7b4a4fc8ac2537a7","test":"9d0bc68616c249f317e783e5083102d2645a6ade3de735e8d8a414e97eaa76d0"},"package":"3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"}
\ No newline at end of file
+{"files":{"Cargo.toml":"f15a235fff5192b488e6259ed785c77cdab87f77ce17de1c91c997c622379722","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7e9a134c72b09540e6f81f02133c5ae7d35067ea6fec44a94a1ebd20af47b151","benches/bench.rs":"d2b6ae5b939abd6093064f144b981b7739d7f474ec0698a1268052fc92406635","src/ast/mod.rs":"b0fe9af7ae15d9448246c204977634e5827bbae247bd59ab2e61411996fc68d6","src/ast/parse.rs":"ed3badf248937c81d280f3f3e7573264e3d3587300bcf959579c42c47518d929","src/ast/print.rs":"521d7abeec518f85fe47803347348ebf08364308ebfa614b5eb471c84af43670","src/ast/visitor.rs":"8ffcad13eb2c2a2f745f7bc8d823bd2f0bb728bd150f439455be5a245731f1d2","src/either.rs":"1758e3edd056884eccadd995708d1e374ba9aa65846bd0e13b1aae852607c560","src/error.rs":"cc99a11392b52f7665ff5ee8ea350f7386ed7c6c6bedd46e216b2f396785317f","src/hir/interval.rs":"2ffab258f204fe47bc5fe9ca84376fcd9ecb4929649f683a9412f2e382e908dc","src/hir/literal/mod.rs":"79aa42009de070058a6388e587bfaa98706f8dd61ee1dca70f23d440f5d8bb70","src/hir/mod.rs":"325dc1e42eb8fb9daeb7a8a5e7f967fdee745a7a7c5e26c20dec0b6c66109ad7","src/hir/print.rs":"ab45ccdb61e32561e246cb564414cd9d0477900bd07b0fba13ef02db8973d8b3","src/hir/translate.rs":"4c595d2faee09aecfdafe5871e7b5b698159d846e3262cf694e6e0a59e8e6a5f","src/hir/visitor.rs":"e5bf7f8c09f6155e59c9d676fe25437f7e3700f9bf5d91101d7e246a64c11d5a","src/lib.rs":"0fc94332a971691862ca17531881302b10ef6fa4aba65c123f0b69ffb14b989a","src/parser.rs":"e45755fcdcc8e5c40c4ecfab34962652fe46ad4f23d445f90885c3c36969c8f7","src/unicode.rs":"3b486b36e2ffcae306cb6d7387a82069163c7269597ff2b50589a05462464c36","src/unicode_tables/LICENSE-UNICODE":"74db5baf44a41b1000312c673544b3374e4198af5605c7f9080a402cec42cfa3","src/unicode_tables/age.rs":"b0932a020d3386478dd2f4839c59e30c525e8591735052b9e791e1ce3a2e2b72","src/unicode_tables/case_folding_simple.rs":"6d1f3d095132639228faf4806d05308c70ce2baa68cce69dca01ea159c4eaa15","src/unicode_tables/general_category.rs":"d21877600d387b8a0c5fbb0942458d0330c69aad6565e28134b8a1a371d2f4f4","src/unicode_tables/grapheme_cluster_break.rs":"f03a8be4a00265b568ca2a41d99f66a5d0f5fb423cb4113494153423a1123cda","src/unicode_tables/mod.rs":"26c837099cd934c8062e24bc9a0aaecf15fe1de03f9c6da3f3e1e5ac3ca24bee","src/unicode_tables/perl_decimal.rs":"e39a5934b504eb3282ccb26bbf50ecd764e720120eb7cf6c43662a2321665ab5","src/unicode_tables/perl_space.rs":"014e5d92b66730557e408c2d5c9b2f46d3d288aa85400ab9193c218c7b98ad21","src/unicode_tables/perl_word.rs":"ddf126f39171776ef83151d7a0dbc41da8dd09186723211fb966c4b304247a5e","src/unicode_tables/property_bool.rs":"21f72bd9f3955e3443549ef6609418817ae6df3c81fb5be90a0ceee9d7d3002d","src/unicode_tables/property_names.rs":"504ea44604cd15a7e827a89066bb81a847dd5c57cef360d9f4a914cf22afcf36","src/unicode_tables/property_values.rs":"4d793ad1b664c1913db146897c8eb4fa29d181b821f096de90dc889b738edb88","src/unicode_tables/script.rs":"5a7d2a958b93056081b8b2eb87c3a5609579ad791ad5b0c42959362ce6ea5b31","src/unicode_tables/script_extension.rs":"1d5f1985f7dcae833e78c3858231666b535bf60e032cfacc09d014c22bda6690","src/unicode_tables/sentence_break.rs":"cd5f0eb7ab6b0ec1c1fb4d78496dfecd691d0d0b76495538b9f376645a753deb","src/unicode_tables/word_break.rs":"eabeacfde7558cfe7b1556b0221f09c65f049de0b08c7cd464c1669040610a6b","src/utf8.rs":"f145b2cb0324e6a39260db685fdf2d88675dead54c5b808fb1b7f73a4b530d66","test":"8a9bd1bd9fb389e08288f951319a9bbb0d4c5284a2ba63cbdab7f6afa2c2f76e"},"package":"f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.25"
 authors = ["The Rust Project Developers"]
 description = "A regular expression parser."
 homepage = "https://github.com/rust-lang/regex"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/ast/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/ast/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/ast/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/ast/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 use std::error;
 use std::fmt;
 
-pub use ast::visitor::{visit, Visitor};
+pub use crate::ast::visitor::{visit, Visitor};
 
 pub mod parse;
 pub mod print;
@@ -220,13 +220,13 @@
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        ::error::Formatter::from(self).fmt(f)
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        crate::error::Formatter::from(self).fmt(f)
     }
 }
 
 impl fmt::Display for ErrorKind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use self::ErrorKind::*;
         match *self {
             CaptureLimitExceeded => write!(
@@ -328,7 +328,7 @@
 }
 
 impl fmt::Debug for Span {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Span({:?}, {:?})", self.start, self.end)
     }
 }
@@ -361,7 +361,7 @@
 }
 
 impl fmt::Debug for Position {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
             "Position(o: {:?}, l: {:?}, c: {:?})",
@@ -542,8 +542,8 @@
 /// This implementation uses constant stack space and heap space proportional
 /// to the size of the `Ast`.
 impl fmt::Display for Ast {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use ast::print::Printer;
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use crate::ast::print::Printer;
         Printer::new().print(self, f)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/ast/parse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/ast/parse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/ast/parse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/ast/parse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,10 +7,10 @@
 use std::mem;
 use std::result;
 
-use ast::{self, Ast, Position, Span};
-use either::Either;
+use crate::ast::{self, Ast, Position, Span};
+use crate::either::Either;
 
-use is_meta_character;
+use crate::is_meta_character;
 
 type Result<T> = result::Result<T, ast::Error>;
 
@@ -58,10 +58,10 @@
     /// then return an error.
     fn into_class_set_item<P: Borrow<Parser>>(
         self,
-        p: &ParserI<P>,
+        p: &ParserI<'_, P>,
     ) -> Result<ast::ClassSetItem> {
         use self::Primitive::*;
-        use ast::ClassSetItem;
+        use crate::ast::ClassSetItem;
 
         match self {
             Literal(lit) => Ok(ClassSetItem::Literal(lit)),
@@ -79,7 +79,7 @@
     /// dot), then return an error.
     fn into_class_literal<P: Borrow<Parser>>(
         self,
-        p: &ParserI<P>,
+        p: &ParserI<'_, P>,
     ) -> Result<ast::Literal> {
         use self::Primitive::*;
 
@@ -2137,7 +2137,7 @@
 /// A type that traverses a fully parsed Ast and checks whether its depth
 /// exceeds the specified nesting limit. If it does, then an error is returned.
 #[derive(Debug)]
-struct NestLimiter<'p, 's: 'p, P: 'p + 's> {
+struct NestLimiter<'p, 's, P> {
     /// The parser that is checking the nest limit.
     p: &'p ParserI<'s, P>,
     /// The current depth while walking an Ast.
@@ -2312,7 +2312,7 @@
     use std::ops::Range;
 
     use super::{Parser, ParserBuilder, ParserI, Primitive};
-    use ast::{self, Ast, Position, Span};
+    use crate::ast::{self, Ast, Position, Span};
 
     // Our own assert_eq, which has slightly better formatting (but honestly
     // still kind of crappy).
@@ -2357,21 +2357,24 @@
         str.to_string()
     }
 
-    fn parser(pattern: &str) -> ParserI<Parser> {
+    fn parser(pattern: &str) -> ParserI<'_, Parser> {
         ParserI::new(Parser::new(), pattern)
     }
 
-    fn parser_octal(pattern: &str) -> ParserI<Parser> {
+    fn parser_octal(pattern: &str) -> ParserI<'_, Parser> {
         let parser = ParserBuilder::new().octal(true).build();
         ParserI::new(parser, pattern)
     }
 
-    fn parser_nest_limit(pattern: &str, nest_limit: u32) -> ParserI<Parser> {
+    fn parser_nest_limit(
+        pattern: &str,
+        nest_limit: u32,
+    ) -> ParserI<'_, Parser> {
         let p = ParserBuilder::new().nest_limit(nest_limit).build();
         ParserI::new(p, pattern)
     }
 
-    fn parser_ignore_whitespace(pattern: &str) -> ParserI<Parser> {
+    fn parser_ignore_whitespace(pattern: &str) -> ParserI<'_, Parser> {
         let p = ParserBuilder::new().ignore_whitespace(true).build();
         ParserI::new(p, pattern)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/ast/print.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/ast/print.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/ast/print.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/ast/print.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,8 +4,8 @@
 
 use std::fmt;
 
-use ast::visitor::{self, Visitor};
-use ast::{self, Ast};
+use crate::ast::visitor::{self, Visitor};
+use crate::ast::{self, Ast};
 
 /// A builder for constructing a printer.
 ///
@@ -86,7 +86,7 @@
     }
 
     fn visit_post(&mut self, ast: &Ast) -> fmt::Result {
-        use ast::Class;
+        use crate::ast::Class;
 
         match *ast {
             Ast::Empty(_) => Ok(()),
@@ -126,7 +126,7 @@
         &mut self,
         ast: &ast::ClassSetItem,
     ) -> Result<(), Self::Err> {
-        use ast::ClassSetItem::*;
+        use crate::ast::ClassSetItem::*;
 
         match *ast {
             Empty(_) => Ok(()),
@@ -155,7 +155,7 @@
 
 impl<'p, W: fmt::Write> Writer<'p, W> {
     fn fmt_group_pre(&mut self, ast: &ast::Group) -> fmt::Result {
-        use ast::GroupKind::*;
+        use crate::ast::GroupKind::*;
         match ast.kind {
             CaptureIndex(_) => self.wtr.write_str("("),
             CaptureName(ref x) => {
@@ -178,7 +178,7 @@
     }
 
     fn fmt_repetition(&mut self, ast: &ast::Repetition) -> fmt::Result {
-        use ast::RepetitionKind::*;
+        use crate::ast::RepetitionKind::*;
         match ast.op.kind {
             ZeroOrOne if ast.greedy => self.wtr.write_str("?"),
             ZeroOrOne => self.wtr.write_str("??"),
@@ -200,7 +200,7 @@
         &mut self,
         ast: &ast::RepetitionRange,
     ) -> fmt::Result {
-        use ast::RepetitionRange::*;
+        use crate::ast::RepetitionRange::*;
         match *ast {
             Exactly(x) => write!(self.wtr, "{{{}}}", x),
             AtLeast(x) => write!(self.wtr, "{{{},}}", x),
@@ -209,7 +209,7 @@
     }
 
     fn fmt_literal(&mut self, ast: &ast::Literal) -> fmt::Result {
-        use ast::LiteralKind::*;
+        use crate::ast::LiteralKind::*;
 
         match ast.kind {
             Verbatim => self.wtr.write_char(ast.c),
@@ -256,7 +256,7 @@
     }
 
     fn fmt_assertion(&mut self, ast: &ast::Assertion) -> fmt::Result {
-        use ast::AssertionKind::*;
+        use crate::ast::AssertionKind::*;
         match ast.kind {
             StartLine => self.wtr.write_str("^"),
             EndLine => self.wtr.write_str("$"),
@@ -275,7 +275,7 @@
     }
 
     fn fmt_flags(&mut self, ast: &ast::Flags) -> fmt::Result {
-        use ast::{Flag, FlagsItemKind};
+        use crate::ast::{Flag, FlagsItemKind};
 
         for item in &ast.items {
             match item.kind {
@@ -315,7 +315,7 @@
         &mut self,
         ast: &ast::ClassSetBinaryOpKind,
     ) -> fmt::Result {
-        use ast::ClassSetBinaryOpKind::*;
+        use crate::ast::ClassSetBinaryOpKind::*;
         match *ast {
             Intersection => self.wtr.write_str("&&"),
             Difference => self.wtr.write_str("--"),
@@ -324,7 +324,7 @@
     }
 
     fn fmt_class_perl(&mut self, ast: &ast::ClassPerl) -> fmt::Result {
-        use ast::ClassPerlKind::*;
+        use crate::ast::ClassPerlKind::*;
         match ast.kind {
             Digit if ast.negated => self.wtr.write_str(r"\D"),
             Digit => self.wtr.write_str(r"\d"),
@@ -336,7 +336,7 @@
     }
 
     fn fmt_class_ascii(&mut self, ast: &ast::ClassAscii) -> fmt::Result {
-        use ast::ClassAsciiKind::*;
+        use crate::ast::ClassAsciiKind::*;
         match ast.kind {
             Alnum if ast.negated => self.wtr.write_str("[:^alnum:]"),
             Alnum => self.wtr.write_str("[:alnum:]"),
@@ -370,8 +370,8 @@
     }
 
     fn fmt_class_unicode(&mut self, ast: &ast::ClassUnicode) -> fmt::Result {
-        use ast::ClassUnicodeKind::*;
-        use ast::ClassUnicodeOpKind::*;
+        use crate::ast::ClassUnicodeKind::*;
+        use crate::ast::ClassUnicodeOpKind::*;
 
         if ast.negated {
             self.wtr.write_str(r"\P")?;
@@ -397,7 +397,7 @@
 #[cfg(test)]
 mod tests {
     use super::Printer;
-    use ast::parse::ParserBuilder;
+    use crate::ast::parse::ParserBuilder;
 
     fn roundtrip(given: &str) {
         roundtrip_with(|b| b, given);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/ast/visitor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/ast/visitor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/ast/visitor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/ast/visitor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use ast::{self, Ast};
+use crate::ast::{self, Ast};
 
 /// A trait for visiting an abstract syntax tree (AST) in depth first order.
 ///
@@ -478,7 +478,7 @@
 }
 
 impl<'a> fmt::Debug for ClassFrame<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let x = match *self {
             ClassFrame::Union { .. } => "Union",
             ClassFrame::Binary { .. } => "Binary",
@@ -490,7 +490,7 @@
 }
 
 impl<'a> fmt::Debug for ClassInduct<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let x = match *self {
             ClassInduct::Item(it) => match *it {
                 ast::ClassSetItem::Empty(_) => "Item(Empty)",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,8 +3,8 @@
 use std::fmt;
 use std::result;
 
-use ast;
-use hir;
+use crate::ast;
+use crate::hir;
 
 /// A type alias for dealing with errors returned by this crate.
 pub type Result<T> = result::Result<T, Error>;
@@ -52,7 +52,7 @@
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             Error::Parse(ref x) => x.fmt(f),
             Error::Translate(ref x) => x.fmt(f),
@@ -67,7 +67,7 @@
 /// readable format. Most of its complexity is from interspersing notational
 /// markers pointing out the position where an error occurred.
 #[derive(Debug)]
-pub struct Formatter<'e, E: 'e> {
+pub struct Formatter<'e, E> {
     /// The original regex pattern in which the error occurred.
     pattern: &'e str,
     /// The error kind. It must impl fmt::Display.
@@ -102,7 +102,7 @@
 }
 
 impl<'e, E: fmt::Display> fmt::Display for Formatter<'e, E> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let spans = Spans::from_formatter(self);
         if self.pattern.contains('\n') {
             let divider = repeat_char('~', 79);
@@ -286,7 +286,7 @@
 
 #[cfg(test)]
 mod tests {
-    use ast::parse::Parser;
+    use crate::ast::parse::Parser;
 
     fn assert_panic_message(pattern: &str, expected_msg: &str) -> () {
         let result = Parser::new().parse(pattern);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/interval.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/interval.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/interval.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/interval.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 use std::slice;
 use std::u8;
 
-use unicode;
+use crate::unicode;
 
 // This module contains an *internal* implementation of interval sets.
 //
@@ -60,7 +60,7 @@
     /// Return an iterator over all intervals in this set.
     ///
     /// The iterator yields intervals in ascending order.
-    pub fn iter(&self) -> IntervalSetIter<I> {
+    pub fn iter(&self) -> IntervalSetIter<'_, I> {
         IntervalSetIter(self.ranges.iter())
     }
 
@@ -322,7 +322,7 @@
 
 /// An iterator over intervals.
 #[derive(Debug)]
-pub struct IntervalSetIter<'a, I: 'a>(slice::Iter<'a, I>);
+pub struct IntervalSetIter<'a, I>(slice::Iter<'a, I>);
 
 impl<'a, I> Iterator for IntervalSetIter<'a, I> {
     type Item = &'a I;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/literal/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/literal/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/literal/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/literal/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,7 +8,7 @@
 use std::mem;
 use std::ops;
 
-use hir::{self, Hir, HirKind};
+use crate::hir::{self, Hir, HirKind};
 
 /// A set of literal byte strings extracted from a regular expression.
 ///
@@ -838,7 +838,7 @@
 }
 
 impl fmt::Debug for Literals {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Literals")
             .field("lits", &self.lits)
             .field("limit_size", &self.limit_size)
@@ -882,7 +882,7 @@
 }
 
 impl fmt::Debug for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.is_cut() {
             write!(f, "Cut({})", escape_unicode(&self.v))
         } else {
@@ -977,8 +977,8 @@
     use std::fmt;
 
     use super::{escape_bytes, Literal, Literals};
-    use hir::Hir;
-    use ParserBuilder;
+    use crate::hir::Hir;
+    use crate::ParserBuilder;
 
     // To make test failures easier to read.
     #[derive(Debug, Eq, PartialEq)]
@@ -1017,7 +1017,7 @@
     }
 
     impl fmt::Debug for ULiteral {
-        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
             if self.is_cut() {
                 write!(f, "Cut({})", self.v)
             } else {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,12 +8,12 @@
 use std::result;
 use std::u8;
 
-use ast::Span;
-use hir::interval::{Interval, IntervalSet, IntervalSetIter};
-use unicode;
+use crate::ast::Span;
+use crate::hir::interval::{Interval, IntervalSet, IntervalSetIter};
+use crate::unicode;
 
-pub use hir::visitor::{visit, Visitor};
-pub use unicode::CaseFoldError;
+pub use crate::hir::visitor::{visit, Visitor};
+pub use crate::unicode::CaseFoldError;
 
 mod interval;
 pub mod literal;
@@ -123,13 +123,13 @@
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        ::error::Formatter::from(self).fmt(f)
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        crate::error::Formatter::from(self).fmt(f)
     }
 }
 
 impl fmt::Display for ErrorKind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // TODO: Remove this on the next breaking semver release.
         #[allow(deprecated)]
         f.write_str(self.description())
@@ -727,8 +727,8 @@
 /// This implementation uses constant stack space and heap space proportional
 /// to the size of the `Hir`.
 impl fmt::Display for Hir {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use hir::print::Printer;
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use crate::hir::print::Printer;
         Printer::new().print(self, f)
     }
 }
@@ -859,7 +859,7 @@
     /// Return an iterator over all ranges in this class.
     ///
     /// The iterator yields ranges in ascending order.
-    pub fn iter(&self) -> ClassUnicodeIter {
+    pub fn iter(&self) -> ClassUnicodeIter<'_> {
         ClassUnicodeIter(self.set.iter())
     }
 
@@ -972,7 +972,7 @@
 }
 
 impl fmt::Debug for ClassUnicodeRange {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let start = if !self.start.is_whitespace() && !self.start.is_control()
         {
             self.start.to_string()
@@ -1102,7 +1102,7 @@
     /// Return an iterator over all ranges in this class.
     ///
     /// The iterator yields ranges in ascending order.
-    pub fn iter(&self) -> ClassBytesIter {
+    pub fn iter(&self) -> ClassBytesIter<'_> {
         ClassBytesIter(self.set.iter())
     }
 
@@ -1258,7 +1258,7 @@
 }
 
 impl fmt::Debug for ClassBytesRange {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut debug = f.debug_struct("ClassBytesRange");
         if self.start <= 0x7F {
             debug.field("start", &(self.start as char));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/print.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/print.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/print.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/print.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,9 +4,9 @@
 
 use std::fmt;
 
-use hir::visitor::{self, Visitor};
-use hir::{self, Hir, HirKind};
-use is_meta_character;
+use crate::hir::visitor::{self, Visitor};
+use crate::hir::{self, Hir, HirKind};
+use crate::is_meta_character;
 
 /// A builder for constructing a printer.
 ///
@@ -239,7 +239,7 @@
 #[cfg(test)]
 mod tests {
     use super::Printer;
-    use ParserBuilder;
+    use crate::ParserBuilder;
 
     fn roundtrip(given: &str, expected: &str) {
         roundtrip_with(|b| b, given, expected);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/translate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/translate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/translate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/translate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,9 +5,9 @@
 use std::cell::{Cell, RefCell};
 use std::result;
 
-use ast::{self, Ast, Span, Visitor};
-use hir::{self, Error, ErrorKind, Hir};
-use unicode::{self, ClassQuery};
+use crate::ast::{self, Ast, Span, Visitor};
+use crate::hir::{self, Error, ErrorKind, Hir};
+use crate::unicode::{self, ClassQuery};
 
 type Result<T> = result::Result<T, Error>;
 
@@ -533,7 +533,7 @@
         &mut self,
         op: &ast::ClassSetBinaryOp,
     ) -> Result<()> {
-        use ast::ClassSetBinaryOpKind::*;
+        use crate::ast::ClassSetBinaryOpKind::*;
 
         if self.flags().unicode() {
             let mut rhs = self.pop().unwrap().unwrap_class_unicode();
@@ -819,7 +819,7 @@
         &self,
         ast_class: &ast::ClassUnicode,
     ) -> Result<hir::ClassUnicode> {
-        use ast::ClassUnicodeKind::*;
+        use crate::ast::ClassUnicodeKind::*;
 
         if !self.flags().unicode() {
             return Err(
@@ -857,7 +857,7 @@
         &self,
         ast_class: &ast::ClassPerl,
     ) -> Result<hir::ClassUnicode> {
-        use ast::ClassPerlKind::*;
+        use crate::ast::ClassPerlKind::*;
 
         assert!(self.flags().unicode());
         let result = match ast_class.kind {
@@ -879,7 +879,7 @@
         &self,
         ast_class: &ast::ClassPerl,
     ) -> hir::ClassBytes {
-        use ast::ClassPerlKind::*;
+        use crate::ast::ClassPerlKind::*;
 
         assert!(!self.flags().unicode());
         let mut class = match ast_class.kind {
@@ -1077,7 +1077,7 @@
 }
 
 fn ascii_class(kind: &ast::ClassAsciiKind) -> &'static [(char, char)] {
-    use ast::ClassAsciiKind::*;
+    use crate::ast::ClassAsciiKind::*;
     match *kind {
         Alnum => &[('0', '9'), ('A', 'Z'), ('a', 'z')],
         Alpha => &[('A', 'Z'), ('a', 'z')],
@@ -1105,10 +1105,10 @@
 
 #[cfg(test)]
 mod tests {
-    use ast::parse::ParserBuilder;
-    use ast::{self, Ast, Position, Span};
-    use hir::{self, Hir, HirKind};
-    use unicode::{self, ClassQuery};
+    use crate::ast::parse::ParserBuilder;
+    use crate::ast::{self, Ast, Position, Span};
+    use crate::hir::{self, Hir, HirKind};
+    use crate::unicode::{self, ClassQuery};
 
     use super::{ascii_class, TranslatorBuilder};
 
@@ -1256,7 +1256,7 @@
     }
 
     #[allow(dead_code)]
-    fn hir_uclass_query(query: ClassQuery) -> Hir {
+    fn hir_uclass_query(query: ClassQuery<'_>) -> Hir {
         Hir::class(hir::Class::Unicode(unicode::class(query).unwrap()))
     }
 
@@ -1315,7 +1315,7 @@
 
     #[allow(dead_code)]
     fn hir_union(expr1: Hir, expr2: Hir) -> Hir {
-        use hir::Class::{Bytes, Unicode};
+        use crate::hir::Class::{Bytes, Unicode};
 
         match (expr1.into_kind(), expr2.into_kind()) {
             (HirKind::Class(Unicode(mut c1)), HirKind::Class(Unicode(c2))) => {
@@ -1332,7 +1332,7 @@
 
     #[allow(dead_code)]
     fn hir_difference(expr1: Hir, expr2: Hir) -> Hir {
-        use hir::Class::{Bytes, Unicode};
+        use crate::hir::Class::{Bytes, Unicode};
 
         match (expr1.into_kind(), expr2.into_kind()) {
             (HirKind::Class(Unicode(mut c1)), HirKind::Class(Unicode(c2))) => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/visitor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/visitor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/hir/visitor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/hir/visitor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use hir::{self, Hir, HirKind};
+use crate::hir::{self, Hir, HirKind};
 
 /// A trait for visiting the high-level IR (HIR) in depth first order.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -155,11 +155,12 @@
 */
 
 #![deny(missing_docs)]
+#![warn(missing_debug_implementations)]
 #![forbid(unsafe_code)]
 
-pub use error::{Error, Result};
-pub use parser::{Parser, ParserBuilder};
-pub use unicode::UnicodeWordError;
+pub use crate::error::{Error, Result};
+pub use crate::parser::{Parser, ParserBuilder};
+pub use crate::unicode::UnicodeWordError;
 
 pub mod ast;
 mod either;
@@ -215,7 +216,7 @@
 /// character.
 ///
 /// A Unicode word character is defined by
-/// [UTS#18 Annex C](http://unicode.org/reports/tr18/#Compatibility_Properties).
+/// [UTS#18 Annex C](https://unicode.org/reports/tr18/#Compatibility_Properties).
 /// In particular, a character
 /// is considered a word character if it is in either of the `Alphabetic` or
 /// `Join_Control` properties, or is in one of the `Decimal_Number`, `Mark`
@@ -235,7 +236,7 @@
 /// character.
 ///
 /// A Unicode word character is defined by
-/// [UTS#18 Annex C](http://unicode.org/reports/tr18/#Compatibility_Properties).
+/// [UTS#18 Annex C](https://unicode.org/reports/tr18/#Compatibility_Properties).
 /// In particular, a character
 /// is considered a word character if it is in either of the `Alphabetic` or
 /// `Join_Control` properties, or is in one of the `Decimal_Number`, `Mark`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/parser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/parser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
-use ast;
-use hir;
+use crate::ast;
+use crate::hir;
 
-use Result;
+use crate::Result;
 
 /// A builder for a regular expression parser.
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/unicode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/unicode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/unicode.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/unicode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 use std::fmt;
 use std::result;
 
-use hir;
+use crate::hir;
 
 /// A type alias for errors specific to Unicode handling of classes.
 pub type Result<T> = result::Result<T, Error>;
@@ -38,7 +38,7 @@
 impl error::Error for CaseFoldError {}
 
 impl fmt::Display for CaseFoldError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
             "Unicode-aware case folding is not available \
@@ -58,7 +58,7 @@
 impl error::Error for UnicodeWordError {}
 
 impl fmt::Display for UnicodeWordError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
             "Unicode-aware \\w class is not available \
@@ -95,7 +95,7 @@
         c: char,
     ) -> FoldResult<result::Result<impl Iterator<Item = char>, Option<char>>>
     {
-        use unicode_tables::case_folding_simple::CASE_FOLDING_SIMPLE;
+        use crate::unicode_tables::case_folding_simple::CASE_FOLDING_SIMPLE;
 
         Ok(CASE_FOLDING_SIMPLE
             .binary_search_by_key(&c, |&(c1, _)| c1)
@@ -130,8 +130,8 @@
 
     #[cfg(feature = "unicode-case")]
     fn imp(start: char, end: char) -> FoldResult<bool> {
+        use crate::unicode_tables::case_folding_simple::CASE_FOLDING_SIMPLE;
         use std::cmp::Ordering;
-        use unicode_tables::case_folding_simple::CASE_FOLDING_SIMPLE;
 
         assert!(start <= end);
         Ok(CASE_FOLDING_SIMPLE
@@ -285,7 +285,7 @@
 
 /// Looks up a Unicode class given a query. If one doesn't exist, then
 /// `None` is returned.
-pub fn class(query: ClassQuery) -> Result<hir::ClassUnicode> {
+pub fn class(query: ClassQuery<'_>) -> Result<hir::ClassUnicode> {
     use self::CanonicalClassQuery::*;
 
     match query.canonicalize()? {
@@ -330,7 +330,7 @@
 
     #[cfg(feature = "unicode-perl")]
     fn imp() -> Result<hir::ClassUnicode> {
-        use unicode_tables::perl_word::PERL_WORD;
+        use crate::unicode_tables::perl_word::PERL_WORD;
         Ok(hir_class(PERL_WORD))
     }
 
@@ -348,13 +348,13 @@
 
     #[cfg(all(feature = "unicode-perl", not(feature = "unicode-bool")))]
     fn imp() -> Result<hir::ClassUnicode> {
-        use unicode_tables::perl_space::WHITE_SPACE;
+        use crate::unicode_tables::perl_space::WHITE_SPACE;
         Ok(hir_class(WHITE_SPACE))
     }
 
     #[cfg(feature = "unicode-bool")]
     fn imp() -> Result<hir::ClassUnicode> {
-        use unicode_tables::property_bool::WHITE_SPACE;
+        use crate::unicode_tables::property_bool::WHITE_SPACE;
         Ok(hir_class(WHITE_SPACE))
     }
 
@@ -372,13 +372,13 @@
 
     #[cfg(all(feature = "unicode-perl", not(feature = "unicode-gencat")))]
     fn imp() -> Result<hir::ClassUnicode> {
-        use unicode_tables::perl_decimal::DECIMAL_NUMBER;
+        use crate::unicode_tables::perl_decimal::DECIMAL_NUMBER;
         Ok(hir_class(DECIMAL_NUMBER))
     }
 
     #[cfg(feature = "unicode-gencat")]
     fn imp() -> Result<hir::ClassUnicode> {
-        use unicode_tables::general_category::DECIMAL_NUMBER;
+        use crate::unicode_tables::general_category::DECIMAL_NUMBER;
         Ok(hir_class(DECIMAL_NUMBER))
     }
 
@@ -405,9 +405,9 @@
 
     #[cfg(feature = "unicode-perl")]
     fn imp(c: char) -> result::Result<bool, UnicodeWordError> {
-        use is_word_byte;
+        use crate::is_word_byte;
+        use crate::unicode_tables::perl_word::PERL_WORD;
         use std::cmp::Ordering;
-        use unicode_tables::perl_word::PERL_WORD;
 
         if c <= 0x7F as char && is_word_byte(c as u8) {
             return Ok(true);
@@ -482,7 +482,7 @@
         feature = "unicode-segment",
     ))]
     fn imp(name: &str) -> Result<Option<&'static str>> {
-        use unicode_tables::property_names::PROPERTY_NAMES;
+        use crate::unicode_tables::property_names::PROPERTY_NAMES;
 
         Ok(PROPERTY_NAMES
             .binary_search_by_key(&name, |&(n, _)| n)
@@ -539,7 +539,7 @@
         feature = "unicode-segment",
     ))]
     fn imp(name: &'static str) -> Result<Option<PropertyValues>> {
-        use unicode_tables::property_values::PROPERTY_VALUES;
+        use crate::unicode_tables::property_values::PROPERTY_VALUES;
 
         Ok(PROPERTY_VALUES
             .binary_search_by_key(&name, |&(n, _)| n)
@@ -578,7 +578,7 @@
 
     #[cfg(feature = "unicode-age")]
     fn imp(canonical_age: &str) -> Result<impl Iterator<Item = Range>> {
-        use unicode_tables::age;
+        use crate::unicode_tables::age;
 
         const AGES: &'static [(&'static str, Range)] = &[
             ("V1_1", age::V1_1),
@@ -631,7 +631,7 @@
 
     #[cfg(feature = "unicode-gencat")]
     fn imp(name: &'static str) -> Result<hir::ClassUnicode> {
-        use unicode_tables::general_category::BY_NAME;
+        use crate::unicode_tables::general_category::BY_NAME;
         match name {
             "ASCII" => Ok(hir_class(&[('\0', '\x7F')])),
             "Any" => Ok(hir_class(&[('\0', '\u{10FFFF}')])),
@@ -666,7 +666,7 @@
 
     #[cfg(feature = "unicode-script")]
     fn imp(name: &'static str) -> Result<hir::ClassUnicode> {
-        use unicode_tables::script::BY_NAME;
+        use crate::unicode_tables::script::BY_NAME;
         property_set(BY_NAME, name)
             .map(hir_class)
             .ok_or(Error::PropertyValueNotFound)
@@ -691,7 +691,7 @@
 
     #[cfg(feature = "unicode-script")]
     fn imp(name: &'static str) -> Result<hir::ClassUnicode> {
-        use unicode_tables::script_extension::BY_NAME;
+        use crate::unicode_tables::script_extension::BY_NAME;
         property_set(BY_NAME, name)
             .map(hir_class)
             .ok_or(Error::PropertyValueNotFound)
@@ -715,7 +715,7 @@
 
     #[cfg(feature = "unicode-bool")]
     fn imp(name: &'static str) -> Result<hir::ClassUnicode> {
-        use unicode_tables::property_bool::BY_NAME;
+        use crate::unicode_tables::property_bool::BY_NAME;
         property_set(BY_NAME, name)
             .map(hir_class)
             .ok_or(Error::PropertyNotFound)
@@ -743,7 +743,7 @@
 
     #[cfg(feature = "unicode-segment")]
     fn imp(name: &'static str) -> Result<hir::ClassUnicode> {
-        use unicode_tables::grapheme_cluster_break::BY_NAME;
+        use crate::unicode_tables::grapheme_cluster_break::BY_NAME;
         property_set(BY_NAME, name)
             .map(hir_class)
             .ok_or(Error::PropertyValueNotFound)
@@ -767,7 +767,7 @@
 
     #[cfg(feature = "unicode-segment")]
     fn imp(name: &'static str) -> Result<hir::ClassUnicode> {
-        use unicode_tables::word_break::BY_NAME;
+        use crate::unicode_tables::word_break::BY_NAME;
         property_set(BY_NAME, name)
             .map(hir_class)
             .ok_or(Error::PropertyValueNotFound)
@@ -791,7 +791,7 @@
 
     #[cfg(feature = "unicode-segment")]
     fn imp(name: &'static str) -> Result<hir::ClassUnicode> {
-        use unicode_tables::sentence_break::BY_NAME;
+        use crate::unicode_tables::sentence_break::BY_NAME;
         property_set(BY_NAME, name)
             .map(hir_class)
             .ok_or(Error::PropertyValueNotFound)
@@ -823,7 +823,7 @@
 /// The slice returned is guaranteed to be valid UTF-8 for all possible values
 /// of `slice`.
 ///
-/// See: http://unicode.org/reports/tr44/#UAX44-LM3
+/// See: https://unicode.org/reports/tr44/#UAX44-LM3
 fn symbolic_name_normalize_bytes(slice: &mut [u8]) -> &mut [u8] {
     // I couldn't find a place in the standard that specified that property
     // names/aliases had a particular structure (unlike character names), but
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/utf8.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/utf8.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/src/utf8.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/src/utf8.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,7 +15,7 @@
 scalar value range is `[0400-04FF]`. The set of allowed bytes for this
 range can be expressed as a sequence of byte ranges:
 
-```ignore
+```text
 [D0-D3][80-BF]
 ```
 
@@ -32,7 +32,7 @@
 
 Instead, you need multiple sequences of byte ranges:
 
-```ignore
+```text
 [D0-D3][80-BF]  # matches codepoints 0400-04FF
 [D4][80-AF]     # matches codepoints 0500-052F
 ```
@@ -41,7 +41,7 @@
 they naively contain surrogate codepoints. For example, the sequence of byte
 ranges for the basic multilingual plane (`[0000-FFFF]`) look like this:
 
-```ignore
+```text
 [0-7F]
 [C2-DF][80-BF]
 [E0][A0-BF][80-BF]
@@ -55,7 +55,7 @@
 
 And, of course, for all of Unicode (`[000000-10FFFF]`):
 
-```ignore
+```text
 [0-7F]
 [C2-DF][80-BF]
 [E0][A0-BF][80-BF]
@@ -84,6 +84,7 @@
 
 use std::char;
 use std::fmt;
+use std::iter::FusedIterator;
 use std::slice;
 
 const MAX_UTF8_BYTES: usize = 4;
@@ -156,13 +157,13 @@
     ///
     /// For example, if this corresponds to the following sequence:
     ///
-    /// ```ignore
+    /// ```text
     /// [D0-D3][80-BF]
     /// ```
     ///
     /// Then after reversal, it will be
     ///
-    /// ```ignore
+    /// ```text
     /// [80-BF][D0-D3]
     /// ```
     ///
@@ -202,7 +203,7 @@
 }
 
 impl fmt::Debug for Utf8Sequence {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use self::Utf8Sequence::*;
         match *self {
             One(ref r) => write!(f, "{:?}", r),
@@ -236,7 +237,7 @@
 }
 
 impl fmt::Debug for Utf8Range {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.start == self.end {
             write!(f, "[{:X}]", self.start)
         } else {
@@ -295,6 +296,7 @@
 /// illustrative. In practice, you could just try to decode your byte sequence
 /// and compare it with the scalar value range directly. However, this is not
 /// always possible (for example, in a byte based automaton).
+#[derive(Debug)]
 pub struct Utf8Sequences {
     range_stack: Vec<ScalarRange>,
 }
@@ -329,7 +331,7 @@
 }
 
 impl fmt::Debug for ScalarRange {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "ScalarRange({:X}, {:X})", self.start, self.end)
     }
 }
@@ -388,6 +390,8 @@
     }
 }
 
+impl FusedIterator for Utf8Sequences {}
+
 impl ScalarRange {
     /// split splits this range if it overlaps with a surrogate codepoint.
     ///
@@ -453,7 +457,7 @@
 mod tests {
     use std::char;
 
-    use utf8::{Utf8Range, Utf8Sequences};
+    use crate::utf8::{Utf8Range, Utf8Sequences};
 
     fn rutf8(s: u8, e: u8) -> Utf8Range {
         Utf8Range::new(s, e)
@@ -500,7 +504,7 @@
 
     #[test]
     fn bmp() {
-        use utf8::Utf8Sequence::*;
+        use crate::utf8::Utf8Sequence::*;
 
         let seqs = Utf8Sequences::new('\u{0}', '\u{FFFF}').collect::<Vec<_>>();
         assert_eq!(
@@ -534,7 +538,7 @@
 
     #[test]
     fn reverse() {
-        use utf8::Utf8Sequence::*;
+        use crate::utf8::Utf8Sequence::*;
 
         let mut s = One(rutf8(0xA, 0xB));
         s.reverse();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/test thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/test
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/regex-syntax/test	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/regex-syntax/test	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # This is a convenience script for running a broad swath of the syntax tests.
 echo "===== DEFAULT FEATURES ==="
 cargo test
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"bc667f640154cdc1cdedc5ee6a385f1f83cf4c4e921403808e061fce9ea44786","Cargo.lock":"68ea197da873868c4e78a3c105578b91574fbaf22923d2c9904c0aa14f16cbf2","Cargo.toml":"881e776def1bc20fcc4f9ba9183bf51fbda7575366d6f4bb0e8e13a65ddb9a7a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"37ef4a3ef1391064b2f44aa9cb0c401faad37c8b240a7386ce5e77dea9526f3e","README.md":"b3e6b50bd99adea72a48bfc4a79e78a67f5669d51a6854b42b40e3a17b76a22b","examples/blocking.rs":"d79549550c0cc538dcb0e5bafa308d5b9b8316c3cd9ff3cd93f3e25326bb1396","examples/form.rs":"51aaa89b7fbfc2cdcd23a8f3d13392ee014a057996fd23465493bc731af0e23a","examples/json_dynamic.rs":"01a5e4e8da04387d7790fcf6532d7d82e3286eef29d6fd8482b904478e745bbf","examples/json_typed.rs":"cf965b58ec40666d2888f89985bf2ccd7eb1aaf223ef539b126a3f211cd82fbc","examples/simple.rs":"c314a835bf4503e92e3baaf1af92b705b61f19855925b02e5c0d5ef3c9f7acf5","examples/tor_socks.rs":"406de85074d0d643855fc0abc149873eb71495a347add9176cf50d4e3e7b0b91","src/async_impl/body.rs":"f3a30a6d063d2e3d4272a922fbfae847f42f6f82fdd269ac0fdc4c6b4f2b6fb5","src/async_impl/client.rs":"e0ca83704fda3e6d2821585fb06023f620d22019219cf81036de65d96242d6c6","src/async_impl/decoder.rs":"98f1744088024c3eeff38efc6d5db5cbeabb8fcfa857253e7abc5bae347c74cf","src/async_impl/mod.rs":"d121dbe586acd9aa3ea2ed95028a55ddd647241d2032083a1666982becb2898a","src/async_impl/multipart.rs":"b7e2b5465cba59084035916a00e679a6ebc2393132f465aa367113d9507d1c2f","src/async_impl/request.rs":"94edda865826f1ed1cf65e0cd88be72a6e17d174d9e5641306507c17ce1fa9b3","src/async_impl/response.rs":"ac3ed34e4539063deab884174e6a5f57c862c43c66e6c959ac90a60de52656c2","src/blocking/body.rs":"a5bc2be239aff27576db3d4f4dd60076b4a0779840af9719be2f24acddcf7d23","src/blocking/client.rs":"79c94e655c04fa4f174277eba8d114f29e7a862b9f8c409f341052bea7a21ac5","src/blocking/mod.rs":"8c93a7b8cf63ab27a2de137bad578252f26002275802f0b50785d632e50255bf","src/blocking/multipart.rs":"60c87ed8744903ae2f7ce62c5db6d7b155eaea7ce103da6ee2f7cb7576b80cc6","src/blocking/request.rs":"17d472a741c428859ff11cb3d8757e3395045e71bb374ce80eee526c73110787","src/blocking/response.rs":"996d3b0a22ebae2030c752b87b165ce5d7998ce800034b34ce49f43df4dcd445","src/blocking/wait.rs":"4a34977fd5e0526fae59ede87abaaac8a3e261af97dacdc58cc883c27d9fac47","src/connect.rs":"5c347255650904bdf034c82bcb622f10a774a16108368d9ab575b178b3007532","src/cookie.rs":"a974d25c91599824f60919549ba895e17638e7899fac5d5eb9b02ba4c42493a3","src/dns.rs":"49aa34b3db8ff0b7fcf9dd201d8b52d66e93a91e0d05aa9a0621bf65390a51d3","src/error.rs":"e5c7d577a00cfdfdca4a9dc8125cd0ddf8f1f32f09c94f0fd7c79f82929465aa","src/into_url.rs":"964d270645ffd96310ea6fd3f9210e92c371ec71be9ce17fed4d546ee7141a1b","src/lib.rs":"a4bfae3a0e8d2c304a9dfaa077ff5d272fcb47eaf513772364bfc7e4c0c5682e","src/proxy.rs":"bf934410b2dfa8e1d9baa826e8bf57b41f31669ce95f2393cccdaa06b48f49a6","src/redirect.rs":"aa2b6c8a0cb69f60c054abffec8102e2f901aa4af0fdad833a6e5666be8d1b01","src/tls.rs":"194072525bab09d1e32439e405da227e214f2a25a6a866c85c3d94fd51514445","src/util.rs":"75bdcbe8560e58f8aa60b763933fe1960da014cbc69e0c3b7d9037f33322960c","src/wasm/body.rs":"c2b51af4cc2675c1a9b62d82edd2da1f6e371b4d0c193dc36a4a07a734d3fd11","src/wasm/client.rs":"b3f814a3a5f52c267b98592216ed24296cdba0a4a8169ef3317cb6d61f933222","src/wasm/mod.rs":"b75255f6bf2c2dee6d10127bf4321fad4377868368ee7eceb7204f88a977f042","src/wasm/multipart.rs":"8fc3e491828088efff6d97a5296fcf959168ba577fb9f474af6250f6c8ea2539","src/wasm/request.rs":"52de05867da885a0478d33d610c40d0d8b5f0c950aab075451cfd53f572f5352","src/wasm/response.rs":"510a79f46268a34416fb2b43e985e620e8c7de730f270283f1692d8b4e33155f","tests/badssl.rs":"a83d309cab927c3ef86f82dde6944e80e4f9a4f486ca59b202237c8bc0b9b649","tests/blocking.rs":"119b7db8b0a6e59d857186161cdfaf5a097679f7dadc23f55eb0234d4e6dc7a4","tests/brotli.rs":"3eab53772278133cfbc2d1d79f92bdbd07e88717d39d9be81d593ba6b888cfb7","tests/client.rs":"cc96ec80500911a88da73b76d0779a278375a1f84c36aed86e37b20f0baedce8","tests/cookie.rs":"0b0dd242dbc7fbd28726b61db8ad47172d5407bb7ef993677da94e45e8764786","tests/gzip.rs":"f32cae0dd9e5ed3f73c12c8df7ebedd4d39e6df2fae08125ff9422abcee86791","tests/multipart.rs":"57b7a0255cce10f99e26eb3f5e24e3850fd8f76240c755f7fec43da81b395ede","tests/proxy.rs":"52fd0a655a471cc6e7da8b915dcf7db3c6b45c687f0bc4f28c821c76c75f422e","tests/redirect.rs":"d6af7a090cb8687681b8410be218c06163dae24697c4ead4315a337530229d15","tests/support/mod.rs":"fe7fe1fcb043f8ccc0da7eab1c9d39f5732a19aae4e82246ab02ec1cce3fb3cf","tests/support/server.rs":"41fe90b939a65d912cacfec332bf8a1a954214165c49171564d723eb76a8295a","tests/timeouts.rs":"7a6d597b0891eb0275210dff6532db9333640ada753f72fe648332eb7407d384","tests/wasm_simple.rs":"b24a55ac8f3bc3a4fe2a4a3454fdc289855dee072fde002f7d3f9624dbaabc50"},"package":"0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"c3c78347b1cea16edc768d85cca3b1af368ef6d4880b064c770158912d2566d6","Cargo.lock":"187c7bd921692c6acf883bd92542e5d6a0397514915dae9d0c78a76de667623c","Cargo.toml":"158ccc9cc7fe3b32637e8bc1be6b711ae04974c75858e8ef817a7ca63284ff4f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"37ef4a3ef1391064b2f44aa9cb0c401faad37c8b240a7386ce5e77dea9526f3e","README.md":"0aea0c4746d110da906a6fc0bdb8e02e12a0bad6997eb47c3f2ea41c5bc3df02","examples/blocking.rs":"d79549550c0cc538dcb0e5bafa308d5b9b8316c3cd9ff3cd93f3e25326bb1396","examples/form.rs":"6aa421acc636d2d8a39205549349fbcbee0ce288f151fe5b2582b21a11528466","examples/json_dynamic.rs":"50f863c34530bfaa2ee5eca79cd4e402f872e7bc20b43f3b2b237c67ce9bcce6","examples/json_typed.rs":"ec678ffca5197212f9f343f7bd18335d3ff765506ecc59f03dec93f351da0ce0","examples/simple.rs":"f47b5ca49f8398c2dde2365b88a1338ad5b8e2299328cf39f1acd61a244de4bd","examples/tor_socks.rs":"bda2391518d7fe32e32dd4acf03e65046afcf09010e6730dd055dc7b77da7e52","src/async_impl/body.rs":"02d50fba9e82a4cb1509d3fa0717aa96243dbd3349c0e066f450cc0479c41aba","src/async_impl/client.rs":"53c985c9388c5178888064b0a96ac4e222649cc3108570e63652119a42970c12","src/async_impl/decoder.rs":"1f0b26321b68607b77fe1c4cb5e8c4786fc42235bd7759682bc875306173f6af","src/async_impl/mod.rs":"944b6661f5f4575f908f6e54a2583e236a111115e2dbcc31e49ba10867b0e6a6","src/async_impl/multipart.rs":"bbbe4a80a60a14f9d747026889e2ed3ee56c42f5da971b5c0d0c2767e666178f","src/async_impl/request.rs":"8dbf5c38121729fb62e1446312857ce540b8cf28639f67b1401b649002012689","src/async_impl/response.rs":"71a5ec660ae16c37e6106215ddd06236f34a17a644cba1408066bf1a6d4aeaf5","src/blocking/body.rs":"d6b1011cb1c63e44b944c60e45feee5501cd70a4249ae73c8b476112d30db28f","src/blocking/client.rs":"37ab1569521190b84a5ccaba66d1d84d02a9fa8c6472fe45039c3e5aa83c3b3f","src/blocking/mod.rs":"8bc6003bb2395c9b1bbf4e8cd08c69d741914d0af7c4d78a682f1f0651696d21","src/blocking/multipart.rs":"36a4bfada56e8acad42fad3038dbe8bdf055b4d9ac41733eef682679b8a540f3","src/blocking/request.rs":"16e1bd4220129c0527fe4e795f2556d8873eb50241f15934f673406b49c41f72","src/blocking/response.rs":"7f74cde2ef34d9faadab9c6e34e8a3a9817fa4f7cf1767a77b550324913fefee","src/blocking/wait.rs":"095f3396efc5b6471c6337de850d1e570bcf8a214a892fd0aba87e5b2e2f72e7","src/connect.rs":"a8df49c6d5c8cf9c1950da49d38eea3950e8f73ba05dfb50d392c2d627b62111","src/cookie.rs":"2ebbfa2016088c3325869664954579e0d4e0b4f0aca2dcbbd748dc0c2c5e9f25","src/dns.rs":"dca1bbfacabc2a9d80c6b62da9a7ba166076c88668528804e3c51105a05553e1","src/error.rs":"f8b35dfeaad2fd91336d2edc2ddd3be7b6a6cc27702155c4c83c9f6c61afdd4f","src/into_url.rs":"c583571e80347662ef93a4039047488bafc325407739560bd724972cab154681","src/lib.rs":"aec134999e5641aeb94a9a4900e994f71ffeb1192e49adbb93b8a7206da511fe","src/proxy.rs":"cd58618a8b7aa0081a4081b4a3ca7ec322afa7584b808b69d75734b8c7f99293","src/redirect.rs":"9fe0e0e43458336f742b00d0b9ee9621c052c6ebbbdaa64820cd2ad2ba40fb9a","src/tls.rs":"4de251490ba0355fd30089ab6da1387ec71ef1e86d2d1ac52500efddfa0db0da","src/util.rs":"75bdcbe8560e58f8aa60b763933fe1960da014cbc69e0c3b7d9037f33322960c","src/wasm/body.rs":"8abc240da5a0ce6b7b9d51d343e934c1535ee896889baef76e075fe634b08e81","src/wasm/client.rs":"3bc3b394f0258c46b1d8f8014ae9f97491b02b3482a03ebce93ac9266a8042a7","src/wasm/mod.rs":"19e4635368b6a01f86bcd45b7eae39a73c56d8a3daaf3c1aa897dd2e1bd985f0","src/wasm/multipart.rs":"10167a3b26bd957fcad0c6562ed4fb1dc2ad93f52718a0146bfd99c9b13ce8fe","src/wasm/request.rs":"42ca6090a4b3b2369c43c163f113e73e4f87ce854b986989408ae41c69df1c30","src/wasm/response.rs":"b10c5abbff88658070877c08dc4066bee1ae3ddeb73629e630e243bd74f44172","tests/badssl.rs":"32af96c2423a0d958577f0ac93af2c11fec724a129a46de3aa907d831cba263e","tests/blocking.rs":"1780575d0c5b8313155d6443b1b754a0025be963b03b856fc6ee1703d57ea3cb","tests/brotli.rs":"3eab53772278133cfbc2d1d79f92bdbd07e88717d39d9be81d593ba6b888cfb7","tests/client.rs":"9d793dd2a06c32a2d0f11a857d9e48633dd2398b3ee4506901769d583817f32c","tests/cookie.rs":"0b0dd242dbc7fbd28726b61db8ad47172d5407bb7ef993677da94e45e8764786","tests/deflate.rs":"827bd28d305f859d1c1919cb773982ad3da52cb808207a3ebbe9c48bc7885807","tests/gzip.rs":"f32cae0dd9e5ed3f73c12c8df7ebedd4d39e6df2fae08125ff9422abcee86791","tests/multipart.rs":"57b7a0255cce10f99e26eb3f5e24e3850fd8f76240c755f7fec43da81b395ede","tests/proxy.rs":"52fd0a655a471cc6e7da8b915dcf7db3c6b45c687f0bc4f28c821c76c75f422e","tests/redirect.rs":"fef7404b930fb41f5dc8450d456bcd1e459f0bc2f896939b05b62dc2e5c12f8f","tests/support/mod.rs":"fe7fe1fcb043f8ccc0da7eab1c9d39f5732a19aae4e82246ab02ec1cce3fb3cf","tests/support/server.rs":"50cc68350577a056dba0627a29118b0e4d5857969bde35ce966da4996ebe55bd","tests/timeouts.rs":"ab12b14e28588eb4746efb523ea3c8c810a6682b9d890731450b343fff58f217","tests/wasm_simple.rs":"b24a55ac8f3bc3a4fe2a4a3454fdc289855dee072fde002f7d3f9624dbaabc50"},"package":"246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "addr2line"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
-dependencies = [
- "gimli",
-]
+version = 3
 
 [[package]]
 name = "adler"
-version = "0.2.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "adler32"
@@ -23,9 +16,9 @@
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.15"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
@@ -47,23 +40,23 @@
 
 [[package]]
 name = "async-compression"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1ff21a63d3262af46b9f33a826a8d134e2d0d9b2179c86034948b732ea8b2a"
+checksum = "5443ccbb270374a2b1055fc72da40e1f237809cd6bb0e97e66d264cd138473a6"
 dependencies = [
  "brotli",
- "bytes 0.5.6",
  "flate2",
  "futures-core",
  "memchr",
- "pin-project-lite 0.1.11",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.42"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
+checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -78,7 +71,7 @@
 dependencies = [
  "hermit-abi",
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -88,20 +81,6 @@
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
-name = "backtrace"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
-dependencies = [
- "addr2line",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
 name = "base-x"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -109,12 +88,6 @@
 
 [[package]]
 name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
-[[package]]
-name = "base64"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
@@ -148,37 +121,21 @@
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
 
 [[package]]
 name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
-[[package]]
-name = "bytes"
-version = "0.5.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
 [[package]]
 name = "cc"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
 
 [[package]]
 name = "cfg-if"
@@ -204,15 +161,15 @@
 
 [[package]]
 name = "const_fn"
-version = "0.4.4"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
+checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
 
 [[package]]
 name = "cookie"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f"
+checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951"
 dependencies = [
  "percent-encoding",
  "time",
@@ -237,32 +194,16 @@
 
 [[package]]
 name = "core-foundation"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
-]
-
-[[package]]
-name = "core-foundation"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
 dependencies = [
- "core-foundation-sys 0.8.2",
+ "core-foundation-sys",
  "libc",
 ]
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-
-[[package]]
-name = "core-foundation-sys"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
@@ -277,6 +218,12 @@
 ]
 
 [[package]]
+name = "data-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+
+[[package]]
 name = "discard"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -296,9 +243,9 @@
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.26"
+version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283"
+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -317,9 +264,9 @@
 
 [[package]]
 name = "env_logger"
-version = "0.7.1"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
 dependencies = [
  "atty",
  "humantime",
@@ -329,19 +276,10 @@
 ]
 
 [[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "version_check",
-]
-
-[[package]]
 name = "flate2"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
 dependencies = [
  "cfg-if 1.0.0",
  "crc32fast",
@@ -372,84 +310,42 @@
 
 [[package]]
 name = "form_urlencoded"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
 dependencies = [
  "matches",
  "percent-encoding",
 ]
 
 [[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
 name = "futures-channel"
-version = "0.3.8"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.8"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
+checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
 
 [[package]]
 name = "futures-io"
-version = "0.3.8"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.8"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
+checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
 dependencies = [
+ "autocfg",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -458,33 +354,29 @@
 
 [[package]]
 name = "futures-sink"
-version = "0.3.8"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
 
 [[package]]
 name = "futures-task"
-version = "0.3.8"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
-dependencies = [
- "once_cell",
-]
+checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
 
 [[package]]
 name = "futures-util"
-version = "0.3.8"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
 dependencies = [
- "futures-channel",
+ "autocfg",
  "futures-core",
  "futures-io",
  "futures-macro",
- "futures-sink",
  "futures-task",
  "memchr",
- "pin-project 1.0.2",
+ "pin-project-lite",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -493,28 +385,22 @@
 
 [[package]]
 name = "getrandom"
-version = "0.1.15"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
  "wasi",
 ]
 
 [[package]]
-name = "gimli"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
-
-[[package]]
 name = "h2"
-version = "0.2.7"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
+checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
 dependencies = [
- "bytes 0.5.6",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -525,7 +411,6 @@
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-futures",
 ]
 
 [[package]]
@@ -536,18 +421,18 @@
 
 [[package]]
 name = "heck"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
 dependencies = [
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
  "libc",
 ]
@@ -560,58 +445,56 @@
 dependencies = [
  "libc",
  "match_cfg",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
- "bytes 0.5.6",
+ "bytes",
  "fnv",
  "itoa",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.3.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
+checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
 dependencies = [
- "bytes 0.5.6",
+ "bytes",
  "http",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
 
 [[package]]
 name = "httpdate"
-version = "0.3.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
 
 [[package]]
 name = "humantime"
-version = "1.3.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.13.9"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
+checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83"
 dependencies = [
- "bytes 0.5.6",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -621,8 +504,8 @@
  "httparse",
  "httpdate",
  "itoa",
- "pin-project 1.0.2",
- "socket2",
+ "pin-project-lite",
+ "socket2 0.4.0",
  "tokio",
  "tower-service",
  "tracing",
@@ -631,11 +514,10 @@
 
 [[package]]
 name = "hyper-rustls"
-version = "0.21.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6"
+checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
 dependencies = [
- "bytes 0.5.6",
  "futures-util",
  "hyper",
  "log",
@@ -647,22 +529,22 @@
 
 [[package]]
 name = "hyper-tls"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 0.5.6",
+ "bytes",
  "hyper",
  "native-tls",
  "tokio",
- "tokio-tls",
+ "tokio-native-tls",
 ]
 
 [[package]]
 name = "idna"
-version = "0.2.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -671,21 +553,21 @@
 
 [[package]]
 name = "indexmap"
-version = "1.6.0"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
 dependencies = [
  "autocfg",
  "hashbrown",
 ]
 
 [[package]]
-name = "iovec"
-version = "0.1.4"
+name = "instant"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
 dependencies = [
- "libc",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -694,44 +576,34 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
 dependencies = [
- "socket2",
+ "socket2 0.3.19",
  "widestring",
- "winapi 0.3.9",
+ "winapi",
  "winreg 0.6.2",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
+checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "js-sys"
-version = "0.3.46"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
+checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -739,41 +611,52 @@
 
 [[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
 
 [[package]]
 name = "libflate"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389de7875e06476365974da3e7ff85d55f1972188ccd9f6020dd7c8156e17914"
+checksum = "6d87eae36b3f680f7f01645121b782798b56ef33c53f83d1c66ba3a22b60bfe3"
 dependencies = [
  "adler32",
  "crc32fast",
  "libflate_lz77",
- "rle-decode-fast",
 ]
 
 [[package]]
 name = "libflate_lz77"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b"
+checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a"
+dependencies = [
+ "rle-decode-fast",
+]
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+
+[[package]]
+name = "lock_api"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+dependencies = [
+ "scopeguard",
+]
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -799,9 +682,9 @@
 
 [[package]]
 name = "memchr"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "mime"
@@ -821,9 +704,9 @@
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
  "autocfg",
@@ -831,40 +714,31 @@
 
 [[package]]
 name = "mio"
-version = "0.6.23"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
  "libc",
  "log",
  "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
+ "ntapi",
+ "winapi",
 ]
 
 [[package]]
 name = "miow"
-version = "0.2.2"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
 dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "winapi",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
+checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
 dependencies = [
  "lazy_static",
  "libc",
@@ -873,20 +747,18 @@
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.0.0",
- "security-framework-sys 2.0.0",
+ "security-framework",
+ "security-framework-sys",
  "tempfile",
 ]
 
 [[package]]
-name = "net2"
-version = "0.2.37"
+name = "ntapi"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
 dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -900,51 +772,45 @@
 ]
 
 [[package]]
-name = "object"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
-
-[[package]]
 name = "once_cell"
-version = "1.5.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "openssl"
-version = "0.10.31"
+version = "0.10.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187"
+checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
  "foreign-types",
- "lazy_static",
  "libc",
+ "once_cell",
  "openssl-sys",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-src"
-version = "111.13.0+1.1.1i"
+version = "111.15.0+1.1.1k"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6"
+checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.59"
+version = "0.9.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe"
+checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98"
 dependencies = [
  "autocfg",
  "cc",
@@ -955,62 +821,41 @@
 ]
 
 [[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pin-project"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"
-dependencies = [
- "pin-project-internal 0.4.27",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
-dependencies = [
- "pin-project-internal 1.0.2",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "0.4.27"
+name = "parking_lot"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "instant",
+ "lock_api",
+ "parking_lot_core",
 ]
 
 [[package]]
-name = "pin-project-internal"
-version = "1.0.2"
+name = "parking_lot_core"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi",
 ]
 
 [[package]]
-name = "pin-project-lite"
-version = "0.1.11"
+name = "percent-encoding"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.0"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
 
 [[package]]
 name = "pin-utils"
@@ -1038,29 +883,26 @@
 
 [[package]]
 name = "proc-macro-nested"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "publicsuffix"
-version = "1.5.4"
+version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
+checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f"
 dependencies = [
- "error-chain",
  "idna",
- "lazy_static",
- "regex",
  "url",
 ]
 
@@ -1072,20 +914,19 @@
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rand"
-version = "0.7.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
- "getrandom",
  "libc",
  "rand_chacha",
  "rand_core",
@@ -1094,9 +935,9 @@
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
  "rand_core",
@@ -1104,45 +945,47 @@
 
 [[package]]
 name = "rand_core"
-version = "0.5.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
  "rand_core",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.57"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
+dependencies = [
+ "bitflags",
+]
 
 [[package]]
 name = "regex"
-version = "1.4.2"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -1150,17 +993,17 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.10.10"
+version = "0.11.4"
 dependencies = [
  "async-compression",
- "base64 0.13.0",
+ "base64",
  "brotli",
- "bytes 0.5.6",
+ "bytes",
  "cookie",
  "cookie_store",
  "doc-comment",
@@ -1182,7 +1025,7 @@
  "mime_guess",
  "native-tls",
  "percent-encoding",
- "pin-project-lite 0.2.0",
+ "pin-project-lite",
  "rustls",
  "rustls-native-certs",
  "serde",
@@ -1190,9 +1033,10 @@
  "serde_urlencoded",
  "time",
  "tokio",
+ "tokio-native-tls",
  "tokio-rustls",
  "tokio-socks",
- "tokio-tls",
+ "tokio-util",
  "trust-dns-resolver",
  "url",
  "wasm-bindgen",
@@ -1215,9 +1059,9 @@
 
 [[package]]
 name = "ring"
-version = "0.16.19"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
  "cc",
  "libc",
@@ -1225,7 +1069,7 @@
  "spin",
  "untrusted",
  "web-sys",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1235,12 +1079,6 @@
 checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac"
 
 [[package]]
-name = "rustc-demangle"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
-
-[[package]]
 name = "rustc_version"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1251,11 +1089,11 @@
 
 [[package]]
 name = "rustls"
-version = "0.18.1"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
- "base64 0.12.3",
+ "base64",
  "log",
  "ring",
  "sct",
@@ -1264,14 +1102,14 @@
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8"
+checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
 dependencies = [
  "openssl-probe",
  "rustls",
  "schannel",
- "security-framework 1.0.0",
+ "security-framework",
 ]
 
 [[package]]
@@ -1287,7 +1125,7 @@
 checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
 dependencies = [
  "lazy_static",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1297,58 +1135,41 @@
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 
 [[package]]
-name = "sct"
-version = "0.6.0"
+name = "scopeguard"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
-dependencies = [
- "ring",
- "untrusted",
-]
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
-name = "security-framework"
-version = "1.0.0"
+name = "sct"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b"
+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
 dependencies = [
- "bitflags",
- "core-foundation 0.7.0",
- "core-foundation-sys 0.7.0",
- "libc",
- "security-framework-sys 1.0.0",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "security-framework"
-version = "2.0.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
+checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467"
 dependencies = [
  "bitflags",
- "core-foundation 0.9.1",
- "core-foundation-sys 0.8.2",
+ "core-foundation",
+ "core-foundation-sys",
  "libc",
- "security-framework-sys 2.0.0",
+ "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.0.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
+checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284"
 dependencies = [
- "core-foundation-sys 0.8.2",
+ "core-foundation-sys",
  "libc",
 ]
 
@@ -1369,18 +1190,18 @@
 
 [[package]]
 name = "serde"
-version = "1.0.118"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.118"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1389,9 +1210,9 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.60"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
 dependencies = [
  "itoa",
  "ryu",
@@ -1418,26 +1239,35 @@
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
 
 [[package]]
 name = "smallvec"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "socket2"
-version = "0.3.17"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
- "winapi 0.3.9",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
+dependencies = [
+ "libc",
+ "winapi",
 ]
 
 [[package]]
@@ -1448,9 +1278,9 @@
 
 [[package]]
 name = "standback"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8"
+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
 dependencies = [
  "version_check",
 ]
@@ -1506,9 +1336,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.54"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
+checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1517,16 +1347,16 @@
 
 [[package]]
 name = "tempfile"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
  "rand",
  "redox_syscall",
  "remove_dir_all",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1540,18 +1370,18 @@
 
 [[package]]
 name = "thiserror"
-version = "1.0.22"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
+checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.22"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
+checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1559,19 +1389,10 @@
 ]
 
 [[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
 name = "time"
-version = "0.2.23"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b"
+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
 dependencies = [
  "const_fn",
  "libc",
@@ -1579,7 +1400,7 @@
  "stdweb",
  "time-macros",
  "version_check",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -1594,9 +1415,9 @@
 
 [[package]]
 name = "time-macros-impl"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -1607,9 +1428,9 @@
 
 [[package]]
 name = "tinyvec"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
+checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1622,28 +1443,26 @@
 
 [[package]]
 name = "tokio"
-version = "0.2.24"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
+checksum = "c79ba603c337335df6ba6dd6afc38c38a7d5e1b0c871678439ea973cd62a118e"
 dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
+ "autocfg",
+ "bytes",
+ "libc",
  "memchr",
  "mio",
  "num_cpus",
- "pin-project-lite 0.1.11",
- "slab",
+ "pin-project-lite",
  "tokio-macros",
+ "winapi",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "0.2.6"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
+checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1651,124 +1470,116 @@
 ]
 
 [[package]]
-name = "tokio-rustls"
-version = "0.14.1"
+name = "tokio-native-tls"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
- "futures-core",
- "rustls",
+ "native-tls",
  "tokio",
- "webpki",
 ]
 
 [[package]]
-name = "tokio-socks"
-version = "0.3.0"
+name = "tokio-rustls"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539"
+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
- "bytes 0.4.12",
- "either",
- "futures",
- "thiserror",
+ "rustls",
  "tokio",
+ "webpki",
 ]
 
 [[package]]
-name = "tokio-tls"
-version = "0.3.1"
+name = "tokio-socks"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
+checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
 dependencies = [
- "native-tls",
+ "either",
+ "futures-util",
+ "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.3.1"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
+checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
- "bytes 0.5.6",
+ "bytes",
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite 0.1.11",
+ "pin-project-lite",
  "tokio",
 ]
 
 [[package]]
 name = "tower-service"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.22"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
  "cfg-if 1.0.0",
- "log",
- "pin-project-lite 0.2.0",
+ "pin-project-lite",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
-name = "tracing-futures"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
-dependencies = [
- "pin-project 0.4.27",
- "tracing",
-]
-
-[[package]]
 name = "trust-dns-proto"
-version = "0.19.6"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53861fcb288a166aae4c508ae558ed18b53838db728d4d310aad08270a7d4c2b"
+checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4"
 dependencies = [
  "async-trait",
- "backtrace",
+ "cfg-if 1.0.0",
+ "data-encoding",
  "enum-as-inner",
- "futures",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
  "idna",
+ "ipnet",
  "lazy_static",
  "log",
  "rand",
  "smallvec",
  "thiserror",
+ "tinyvec",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "trust-dns-resolver"
-version = "0.19.6"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6759e8efc40465547b0dfce9500d733c65f969a4cbbfbe3ccf68daaa46ef179e"
+checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770"
 dependencies = [
- "backtrace",
- "cfg-if 0.1.10",
- "futures",
+ "cfg-if 1.0.0",
+ "futures-util",
  "ipconfig",
  "lazy_static",
  "log",
  "lru-cache",
+ "parking_lot",
  "resolv-conf",
  "smallvec",
  "thiserror",
@@ -1793,18 +1604,18 @@
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
 dependencies = [
  "matches",
 ]
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.16"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
@@ -1817,9 +1628,9 @@
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "untrusted"
@@ -1829,9 +1640,9 @@
 
 [[package]]
 name = "url"
-version = "2.2.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -1841,15 +1652,15 @@
 
 [[package]]
 name = "vcpkg"
-version = "0.2.11"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa"
 
 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
 
 [[package]]
 name = "want"
@@ -1863,15 +1674,15 @@
 
 [[package]]
 name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
+checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -1881,9 +1692,9 @@
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
+checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -1896,9 +1707,9 @@
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.19"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
+checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -1908,9 +1719,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
+checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1918,9 +1729,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
+checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1931,15 +1742,15 @@
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.69"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
+checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.19"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0355fa0c1f9b792a09b6dcb6a8be24d51e71e6d74972f9eb4a44c4c004d24a25"
+checksum = "8cab416a9b970464c2882ed92d55b0c33046b08e0bdc9d59b3b718acd4e1bae8"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -1951,9 +1762,9 @@
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.19"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27e07b46b98024c2ba2f9e83a10c2ef0515f057f2da299c1762a2017de80438b"
+checksum = "dd4543fc6cf3541ef0d98bf720104cc6bd856d7eba449fd2aa365ef4fed0e782"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1961,9 +1772,9 @@
 
 [[package]]
 name = "web-sys"
-version = "0.3.46"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
+checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1981,9 +1792,9 @@
 
 [[package]]
 name = "webpki-roots"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
+checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
 dependencies = [
  "webpki",
 ]
@@ -1996,12 +1807,6 @@
 
 [[package]]
 name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
@@ -2011,12 +1816,6 @@
 ]
 
 [[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2028,7 +1827,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2043,7 +1842,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2052,15 +1851,5 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
 dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
+ "winapi",
 ]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "reqwest"
-version = "0.10.10"
+version = "0.11.4"
 authors = ["Sean McArthur <sean@seanmonstar.com>"]
 autotests = true
 description = "higher level HTTP client library"
@@ -25,10 +25,11 @@
 repository = "https://github.com/seanmonstar/reqwest"
 [package.metadata.docs.rs]
 all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 
 [package.metadata.playground]
-features = ["blocking", "cookies", "json"]
+features = ["blocking", "cookies", "json", "multipart"]
 
 [[example]]
 name = "blocking"
@@ -77,14 +78,26 @@
 name = "brotli"
 path = "tests/brotli.rs"
 required-features = ["brotli"]
+
+[[test]]
+name = "deflate"
+path = "tests/deflate.rs"
+required-features = ["deflate"]
+
+[[test]]
+name = "multipart"
+path = "tests/multipart.rs"
+required-features = ["multipart"]
 [dependencies.bytes]
-version = "0.5"
+version = "1.0"
 
 [dependencies.http]
 version = "0.2"
 
 [dependencies.mime_guess]
 version = "2.0"
+optional = true
+default-features = false
 
 [dependencies.serde]
 version = "1.0"
@@ -103,14 +116,17 @@
 __internal_proxy_sys_no_cache = []
 __rustls = ["hyper-rustls", "tokio-rustls", "rustls", "__tls"]
 __tls = []
-blocking = ["futures-util/io", "tokio/rt-threaded", "tokio/rt-core", "tokio/sync"]
-brotli = ["async-compression", "async-compression/brotli"]
+blocking = ["futures-util/io", "tokio/rt-multi-thread", "tokio/sync"]
+brotli = ["async-compression", "async-compression/brotli", "tokio-util"]
 cookies = ["cookie_crate", "cookie_store", "time"]
 default = ["default-tls"]
-default-tls = ["hyper-tls", "native-tls-crate", "__tls", "tokio-tls"]
-gzip = ["async-compression", "async-compression/gzip"]
+default-tls = ["hyper-tls", "native-tls-crate", "__tls", "tokio-native-tls"]
+deflate = ["async-compression", "async-compression/zlib", "tokio-util"]
+gzip = ["async-compression", "async-compression/gzip", "tokio-util"]
 json = ["serde_json"]
+multipart = ["mime_guess"]
 native-tls = ["default-tls"]
+native-tls-alpn = ["native-tls", "native-tls-crate/alpn"]
 native-tls-vendored = ["native-tls", "native-tls-crate/vendored"]
 rustls-tls = ["rustls-tls-webpki-roots"]
 rustls-tls-manual-roots = ["__rustls"]
@@ -120,8 +136,8 @@
 stream = []
 trust-dns = ["trust-dns-resolver"]
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.async-compression]
-version = "0.3.0"
-features = ["stream"]
+version = "0.3.7"
+features = ["tokio"]
 optional = true
 default-features = false
 
@@ -149,20 +165,20 @@
 default-features = false
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.http-body]
-version = "0.3.0"
+version = "0.4.0"
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.hyper]
-version = "0.13.4"
-features = ["tcp"]
+version = "0.14"
+features = ["tcp", "http1", "http2", "client", "runtime"]
 default-features = false
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.hyper-rustls]
-version = "0.21"
+version = "0.22.1"
 optional = true
 default-features = false
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.hyper-tls]
-version = "0.4"
+version = "0.5"
 optional = true
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.ipnet]
@@ -175,10 +191,10 @@
 version = "0.4"
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.mime]
-version = "0.3.7"
+version = "0.3.16"
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.native-tls-crate]
-version = "0.2"
+version = "0.2.7"
 optional = true
 package = "native-tls"
 
@@ -189,12 +205,12 @@
 version = "0.2.0"
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.rustls]
-version = "0.18"
+version = "0.19"
 features = ["dangerous_configuration"]
 optional = true
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.rustls-native-certs]
-version = "0.4"
+version = "0.5"
 optional = true
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.time]
@@ -202,28 +218,34 @@
 optional = true
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
-version = "0.2.5"
-features = ["tcp", "time"]
+version = "1.0"
+features = ["net", "time"]
 default-features = false
 
+[target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-native-tls]
+version = "0.3.0"
+optional = true
+
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-rustls]
-version = "0.14"
+version = "0.22"
 optional = true
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-socks]
-version = "0.3"
+version = "0.5.1"
 optional = true
 
-[target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tls]
-version = "0.3.0"
+[target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-util]
+version = "0.6.0"
+features = ["codec", "io"]
 optional = true
+default-features = false
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.trust-dns-resolver]
-version = "0.19"
+version = "0.20"
 optional = true
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.webpki-roots]
-version = "0.20"
+version = "0.21"
 optional = true
 [target."cfg(not(target_arch = \"wasm32\"))".dev-dependencies.brotli_crate]
 version = "3.3.0"
@@ -233,11 +255,11 @@
 version = "0.3"
 
 [target."cfg(not(target_arch = \"wasm32\"))".dev-dependencies.env_logger]
-version = "0.7"
+version = "0.8"
 
 [target."cfg(not(target_arch = \"wasm32\"))".dev-dependencies.hyper]
-version = "0.13"
-features = ["tcp", "stream"]
+version = "0.14"
+features = ["tcp", "stream", "http1", "http2", "client", "server", "runtime"]
 default-features = false
 
 [target."cfg(not(target_arch = \"wasm32\"))".dev-dependencies.libflate]
@@ -248,8 +270,8 @@
 features = ["derive"]
 
 [target."cfg(not(target_arch = \"wasm32\"))".dev-dependencies.tokio]
-version = "0.2.0"
-features = ["macros"]
+version = "1.0"
+features = ["macros", "rt-multi-thread"]
 default-features = false
 [target."cfg(target_arch = \"wasm32\")".dependencies.js-sys]
 version = "0.3.45"
@@ -263,7 +285,7 @@
 
 [target."cfg(target_arch = \"wasm32\")".dependencies.web-sys]
 version = "0.3.25"
-features = ["Headers", "Request", "RequestInit", "RequestMode", "Response", "Window", "FormData", "Blob", "BlobPropertyBag", "ServiceWorkerGlobalScope"]
+features = ["Headers", "Request", "RequestInit", "RequestMode", "Response", "Window", "FormData", "Blob", "BlobPropertyBag", "ServiceWorkerGlobalScope", "RequestCredentials"]
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
 version = "0.3"
 [target."cfg(windows)".dependencies.winreg]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,42 @@
+## v0.11.4
+
+- Add `ClientBuilder::resolve()` option to override DNS resolution for specific domains.
+- Add `native-tls-alpn` Cargo feature to use ALPN with the native-tls backend.
+- Add `ClientBuilder::deflate()` option and `deflate` Cargo feature to support decoding response bodies using deflate.
+- Add `RequestBuilder::version()` to allow setting the HTTP version of a request.
+- Fix allowing "invalid" certificates with the `rustls-tls` backend, when the server uses TLS v1.2 or v1.3.
+- (wasm) Add `try_clone` to `Request` and `RequestBuilder`
+
+## v0.11.3
+
+- Add `impl From<hyper::Body> for reqwest::Body`.
+- (wasm) Add credentials mode methods to `RequestBuilder`.
+
+## v0.11.2
+
+- Add `CookieStore` trait to customize the type that stores and retrieves cookies for a session.
+- Add `cookie::Jar` as a default `CookieStore`, easing creating some session cookies before creating the `Client`.
+- Add `ClientBuilder::http2_adaptive_window()` option to configure an adaptive HTTP2 flow control behavior.
+- Add `ClientBuilder::http2_max_frame_size()` option to adjust the maximum HTTP2 frame size that can be received.
+- Implement `IntoUrl` for `String`, making it more convenient to create requests with `format!`.
+
+## v0.11.1
+
+- Add `ClientBuilder::tls_built_in_root_certs()` option to disable built-in root certificates.
+- Fix `rustls-tls` glue to more often support ALPN to upgrade to HTTP/2.
+- Fix proxy parsing to assume `http://` if no scheme is found.
+- Fix connection pool idle reaping by enabling hyper's `runtime` feature.
+- (wasm) Add `Request::new()` constructor.
+
+# v0.11.0
+
+- Change `multipart` to be an optional cargo feature.
+- Remove deprecated methods.
+
+- Update to Tokio v1.0.
+- Update to Bytes v1.0.
+- Update to hyper v0.14.
+
 ## v0.10.10
 
 - Add `tcp_keepalive` option to `blocking::ClientBuilder`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/form.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/form.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/form.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/form.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,8 @@
 // Short example of a POST request with form data.
 //
+// This is using the `tokio` runtime. You'll need the following dependency:
+//
+// `tokio = { version = "1", features = ["full"] }`
 #[cfg(not(target_arch = "wasm32"))]
 #[tokio::main]
 async fn main() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/json_dynamic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/json_dynamic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/json_dynamic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/json_dynamic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 
 // This is using the `tokio` runtime. You'll need the following dependency:
 //
-// `tokio = { version = "0.2", features = ["macros"] }`
+// `tokio = { version = "1", features = ["full"] }`
 #[tokio::main]
 async fn main() -> Result<(), reqwest::Error> {
     let echo_json: serde_json::Value = reqwest::Client::new()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/json_typed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/json_typed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/json_typed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/json_typed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,7 +18,7 @@
 
 // This is using the `tokio` runtime. You'll need the following dependency:
 //
-// `tokio = { version = "0.2", features = ["macros"] }`
+// `tokio = { version = "1", features = ["full"] }`
 #[tokio::main]
 async fn main() -> Result<(), reqwest::Error> {
     let new_post = Post {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/simple.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/simple.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/simple.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/simple.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 // This is using the `tokio` runtime. You'll need the following dependency:
 //
-// `tokio = { version = "0.2", features = ["macros"] }`
+// `tokio = { version = "1", features = ["full"] }`
 #[cfg(not(target_arch = "wasm32"))]
 #[tokio::main]
 async fn main() -> Result<(), reqwest::Error> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/tor_socks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/tor_socks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/examples/tor_socks.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/examples/tor_socks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 
 // This is using the `tokio` runtime. You'll need the following dependency:
 //
-// `tokio = { version = "0.2", features = ["macros"] }`
+// `tokio = { version = "1", features = ["full"] }`
 #[tokio::main]
 async fn main() -> Result<(), reqwest::Error> {
     // Make sure you are running tor and this is your socks port
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -23,8 +23,8 @@
 
 ```toml
 [dependencies]
-reqwest = { version = "0.10", features = ["json"] }
-tokio = { version = "0.2", features = ["full"] }
+reqwest = { version = "0.11", features = ["json"] }
+tokio = { version = "1", features = ["full"] }
 ```
 
 And then the code:
@@ -49,7 +49,7 @@
 
 ```toml
 [dependencies]
-reqwest = { version = "0.10", features = ["blocking", "json"] }
+reqwest = { version = "0.11", features = ["blocking", "json"] }
 ```
 
 ```rust,no_run
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/body.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/body.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/body.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/body.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
 use futures_core::Stream;
 use http_body::Body as HttpBody;
 use pin_project_lite::pin_project;
-use tokio::time::Delay;
+use tokio::time::Sleep;
 
 /// An asynchronous request body.
 pub struct Body {
@@ -27,7 +27,7 @@
                     + Sync,
             >,
         >,
-        timeout: Option<Delay>,
+        timeout: Option<Pin<Box<Sleep>>>,
     },
 }
 
@@ -103,7 +103,7 @@
         }
     }
 
-    pub(crate) fn response(body: hyper::Body, timeout: Option<Delay>) -> Body {
+    pub(crate) fn response(body: hyper::Body, timeout: Option<Pin<Box<Sleep>>>) -> Body {
         Body {
             inner: Inner::Streaming {
                 body: Box::pin(WrapHyper(body)),
@@ -152,6 +152,7 @@
         ImplStream(self)
     }
 
+    #[cfg(feature = "multipart")]
     pub(crate) fn content_length(&self) -> Option<u64> {
         match self.inner {
             Inner::Reusable(ref bytes) => Some(bytes.len() as u64),
@@ -160,6 +161,18 @@
     }
 }
 
+impl From<hyper::Body> for Body {
+    #[inline]
+    fn from(body: hyper::Body) -> Body {
+        Self {
+            inner: Inner::Streaming {
+                body: Box::pin(WrapHyper(body)),
+                timeout: None,
+            },
+        }
+    }
+}
+
 impl From<Bytes> for Body {
     #[inline]
     fn from(bytes: Bytes) -> Body {
@@ -217,7 +230,7 @@
                 ref mut timeout,
             } => {
                 if let Some(ref mut timeout) = timeout {
-                    if let Poll::Ready(()) = Pin::new(timeout).poll(cx) {
+                    if let Poll::Ready(()) = timeout.as_mut().poll(cx) {
                         return Poll::Ready(Some(Err(crate::error::body(crate::error::TimedOut))));
                     }
                 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,9 @@
-#[cfg(any(
-    feature = "native-tls",
-    feature = "__rustls",
-))]
+#[cfg(any(feature = "native-tls", feature = "__rustls",))]
 use std::any::Any;
-use std::convert::TryInto;
 use std::net::IpAddr;
 use std::sync::Arc;
-#[cfg(feature = "cookies")]
-use std::sync::RwLock;
 use std::time::Duration;
+use std::{collections::HashMap, convert::TryInto, net::SocketAddr};
 use std::{fmt, str};
 
 use bytes::Bytes;
@@ -21,13 +16,13 @@
 use hyper::client::ResponseFuture;
 #[cfg(feature = "native-tls-crate")]
 use native_tls_crate::TlsConnector;
+use pin_project_lite::pin_project;
 #[cfg(feature = "rustls-tls-native-roots")]
 use rustls::RootCertStore;
 use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use tokio::time::Delay;
-use pin_project_lite::pin_project;
+use tokio::time::Sleep;
 
 use log::debug;
 
@@ -44,7 +39,9 @@
 #[cfg(feature = "__tls")]
 use crate::tls::TlsBackend;
 #[cfg(feature = "__tls")]
-use crate::{Certificate, Identity};
+use crate::Certificate;
+#[cfg(any(feature = "native-tls", feature = "__rustls"))]
+use crate::Identity;
 use crate::{IntoUrl, Method, Proxy, StatusCode, Url};
 
 /// An asynchronous `Client` to make Requests with.
@@ -56,7 +53,7 @@
 /// The `Client` holds a connection pool internally, so it is advised that
 /// you create one and **reuse** it.
 ///
-/// You do **not** have to wrap the `Client` it in an [`Rc`] or [`Arc`] to **reuse** it,
+/// You do **not** have to wrap the `Client` in an [`Rc`] or [`Arc`] to **reuse** it,
 /// because it already uses an [`Arc`] internally.
 ///
 /// [`Rc`]: std::rc::Rc
@@ -65,7 +62,7 @@
     inner: Arc<ClientRef>,
 }
 
-/// A `ClientBuilder` can be used to create a `Client` with  custom configuration.
+/// A `ClientBuilder` can be used to create a `Client` with custom configuration.
 #[must_use]
 pub struct ClientBuilder {
     config: Config,
@@ -84,7 +81,7 @@
     pool_idle_timeout: Option<Duration>,
     pool_max_idle_per_host: usize,
     tcp_keepalive: Option<Duration>,
-    #[cfg(feature = "__tls")]
+    #[cfg(any(feature = "native-tls", feature = "__rustls"))]
     identity: Option<Identity>,
     proxies: Vec<Proxy>,
     auto_sys_proxy: bool,
@@ -94,19 +91,23 @@
     #[cfg(feature = "__tls")]
     root_certs: Vec<Certificate>,
     #[cfg(feature = "__tls")]
+    tls_built_in_root_certs: bool,
+    #[cfg(feature = "__tls")]
     tls: TlsBackend,
     http2_only: bool,
-    http1_writev: Option<bool>,
     http1_title_case_headers: bool,
     http2_initial_stream_window_size: Option<u32>,
     http2_initial_connection_window_size: Option<u32>,
+    http2_adaptive_window: bool,
+    http2_max_frame_size: Option<u32>,
     local_address: Option<IpAddr>,
     nodelay: bool,
     #[cfg(feature = "cookies")]
-    cookie_store: Option<cookie::CookieStore>,
+    cookie_store: Option<Arc<dyn cookie::CookieStore>>,
     trust_dns: bool,
     error: Option<crate::Error>,
     https_only: bool,
+    dns_overrides: HashMap<String, SocketAddr>,
 }
 
 impl Default for ClientBuilder {
@@ -147,20 +148,24 @@
                 #[cfg(feature = "__tls")]
                 root_certs: Vec::new(),
                 #[cfg(feature = "__tls")]
+                tls_built_in_root_certs: true,
+                #[cfg(any(feature = "native-tls", feature = "__rustls"))]
                 identity: None,
                 #[cfg(feature = "__tls")]
                 tls: TlsBackend::default(),
                 http2_only: false,
-                http1_writev: None,
                 http1_title_case_headers: false,
                 http2_initial_stream_window_size: None,
                 http2_initial_connection_window_size: None,
+                http2_adaptive_window: false,
+                http2_max_frame_size: None,
                 local_address: None,
                 nodelay: true,
                 trust_dns: cfg!(feature = "trust-dns"),
                 #[cfg(feature = "cookies")]
                 cookie_store: None,
                 https_only: false,
+                dns_overrides: HashMap::new(),
             },
         }
     }
@@ -169,7 +174,7 @@
     ///
     /// # Errors
     ///
-    /// This method fails if TLS backend cannot be initialized, or the resolver
+    /// This method fails if a TLS backend cannot be initialized, or the resolver
     /// cannot load the system configuration.
     pub fn build(self) -> crate::Result<Client> {
         let config = self.config;
@@ -191,9 +196,21 @@
             }
 
             let http = match config.trust_dns {
-                false => HttpConnector::new_gai(),
+                false => {
+                    if config.dns_overrides.is_empty() {
+                        HttpConnector::new_gai()
+                    } else {
+                        HttpConnector::new_gai_with_overrides(config.dns_overrides)
+                    }
+                }
                 #[cfg(feature = "trust-dns")]
-                true => HttpConnector::new_trust_dns()?,
+                true => {
+                    if config.dns_overrides.is_empty() {
+                        HttpConnector::new_trust_dns()?
+                    } else {
+                        HttpConnector::new_trust_dns_with_overrides(config.dns_overrides)?
+                    }
+                }
                 #[cfg(not(feature = "trust-dns"))]
                 true => unreachable!("trust-dns shouldn't be enabled unless the feature is"),
             };
@@ -204,6 +221,15 @@
                 TlsBackend::Default => {
                     let mut tls = TlsConnector::builder();
 
+                    #[cfg(feature = "native-tls-alpn")]
+                    {
+                        if config.http2_only {
+                            tls.request_alpns(&["h2"]);
+                        } else {
+                            tls.request_alpns(&["h2", "http/1.1"]);
+                        }
+                    }
+
                     #[cfg(feature = "native-tls")]
                     {
                         tls.danger_accept_invalid_hostnames(!config.hostname_verification);
@@ -211,6 +237,8 @@
 
                     tls.danger_accept_invalid_certs(!config.certs_verification);
 
+                    tls.disable_built_in_roots(!config.tls_built_in_root_certs);
+
                     for cert in config.root_certs {
                         cert.add_to_native_tls(&mut tls);
                     }
@@ -222,7 +250,6 @@
                         }
                     }
 
-
                     Connector::new_default_tls(
                         http,
                         tls,
@@ -231,27 +258,25 @@
                         config.local_address,
                         config.nodelay,
                     )?
-                },
+                }
                 #[cfg(feature = "native-tls")]
-                TlsBackend::BuiltNativeTls(conn) => {
-                    Connector::from_built_default_tls(
-                        http,
-                        conn,
-                        proxies.clone(),
-                        user_agent(&config.headers),
-                        config.local_address,
-                        config.nodelay)
-                },
+                TlsBackend::BuiltNativeTls(conn) => Connector::from_built_default_tls(
+                    http,
+                    conn,
+                    proxies.clone(),
+                    user_agent(&config.headers),
+                    config.local_address,
+                    config.nodelay,
+                ),
                 #[cfg(feature = "__rustls")]
-                TlsBackend::BuiltRustls(conn) => {
-                    Connector::new_rustls_tls(
-                        http,
-                        conn,
-                        proxies.clone(),
-                        user_agent(&config.headers),
-                        config.local_address,
-                        config.nodelay)
-                },
+                TlsBackend::BuiltRustls(conn) => Connector::new_rustls_tls(
+                    http,
+                    conn,
+                    proxies.clone(),
+                    user_agent(&config.headers),
+                    config.local_address,
+                    config.nodelay,
+                ),
                 #[cfg(feature = "__rustls")]
                 TlsBackend::Rustls => {
                     use crate::tls::NoVerifier;
@@ -263,10 +288,12 @@
                         tls.set_protocols(&["h2".into(), "http/1.1".into()]);
                     }
                     #[cfg(feature = "rustls-tls-webpki-roots")]
-                    tls.root_store
-                        .add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
+                    if config.tls_built_in_root_certs {
+                        tls.root_store
+                            .add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
+                    }
                     #[cfg(feature = "rustls-tls-native-roots")]
-                    {
+                    if config.tls_built_in_root_certs {
                         let roots_slice = NATIVE_ROOTS.as_ref().unwrap().roots.as_slice();
                         tls.root_store.roots.extend_from_slice(roots_slice);
                     }
@@ -292,16 +319,13 @@
                         config.local_address,
                         config.nodelay,
                     )
-                },
-                #[cfg(any(
-                    feature = "native-tls",
-                    feature = "__rustls",
-                ))]
+                }
+                #[cfg(any(feature = "native-tls", feature = "__rustls",))]
                 TlsBackend::UnknownPreconfigured => {
                     return Err(crate::error::builder(
-                        "Unknown TLS backend passed to `use_preconfigured_tls`"
+                        "Unknown TLS backend passed to `use_preconfigured_tls`",
                     ));
-                },
+                }
             }
 
             #[cfg(not(feature = "__tls"))]
@@ -316,10 +340,6 @@
             builder.http2_only(true);
         }
 
-        if let Some(http1_writev) = config.http1_writev {
-            builder.http1_writev(http1_writev);
-        }
-
         if let Some(http2_initial_stream_window_size) = config.http2_initial_stream_window_size {
             builder.http2_initial_stream_window_size(http2_initial_stream_window_size);
         }
@@ -328,6 +348,12 @@
         {
             builder.http2_initial_connection_window_size(http2_initial_connection_window_size);
         }
+        if config.http2_adaptive_window {
+            builder.http2_adaptive_window(true);
+        }
+        if let Some(http2_max_frame_size) = config.http2_max_frame_size {
+            builder.http2_max_frame_size(http2_max_frame_size);
+        }
 
         builder.pool_idle_timeout(config.pool_idle_timeout);
         builder.pool_max_idle_per_host(config.pool_max_idle_per_host);
@@ -345,7 +371,7 @@
             inner: Arc::new(ClientRef {
                 accepts: config.accepts,
                 #[cfg(feature = "cookies")]
-                cookie_store: config.cookie_store.map(RwLock::new),
+                cookie_store: config.cookie_store,
                 hyper: hyper_client,
                 headers: config.headers,
                 redirect_policy: config.redirect_policy,
@@ -403,7 +429,12 @@
     /// use reqwest::header;
     /// # async fn doc() -> Result<(), reqwest::Error> {
     /// let mut headers = header::HeaderMap::new();
-    /// headers.insert(header::AUTHORIZATION, header::HeaderValue::from_static("secret"));
+    /// headers.insert("X-MY-HEADER", header::HeaderValue::from_static("value"));
+    ///
+    /// // Consider marking security-sensitive headers with `set_sensitive`.
+    /// let mut auth_value = header::HeaderValue::from_static("secret");
+    /// auth_value.set_sensitive(true);
+    /// headers.insert(header::AUTHORIZATION, auth_value);
     ///
     /// // get a client builder
     /// let client = reqwest::Client::builder()
@@ -420,7 +451,7 @@
     /// use reqwest::header;
     /// # async fn doc() -> Result<(), reqwest::Error> {
     /// let mut headers = header::HeaderMap::new();
-    /// headers.insert(header::AUTHORIZATION, header::HeaderValue::from_static("secret"));
+    /// headers.insert("X-MY-HEADER", header::HeaderValue::from_static("value"));
     ///
     /// // get a client builder
     /// let client = reqwest::Client::builder()
@@ -428,7 +459,7 @@
     ///     .build()?;
     /// let res = client
     ///     .get("https://www.rust-lang.org")
-    ///     .header(header::AUTHORIZATION, "token")
+    ///     .header("X-MY-HEADER", "new_value")
     ///     .send()
     ///     .await?;
     /// # Ok(())
@@ -452,12 +483,33 @@
     ///
     /// This requires the optional `cookies` feature to be enabled.
     #[cfg(feature = "cookies")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
     pub fn cookie_store(mut self, enable: bool) -> ClientBuilder {
-        self.config.cookie_store = if enable {
-            Some(cookie::CookieStore::default())
+        if enable {
+            self.cookie_provider(Arc::new(cookie::Jar::default()))
         } else {
-            None
-        };
+            self.config.cookie_store = None;
+            self
+        }
+    }
+
+    /// Set the persistent cookie store for the client.
+    ///
+    /// Cookies received in responses will be passed to this store, and
+    /// additional requests will query this store for cookies.
+    ///
+    /// By default, no cookie store is used.
+    ///
+    /// # Optional
+    ///
+    /// This requires the optional `cookies` feature to be enabled.
+    #[cfg(feature = "cookies")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
+    pub fn cookie_provider<C: cookie::CookieStore + 'static>(
+        mut self,
+        cookie_store: Arc<C>,
+    ) -> ClientBuilder {
+        self.config.cookie_store = Some(cookie_store as _);
         self
     }
 
@@ -468,8 +520,8 @@
     /// - When sending a request and if the request's headers do not already contain
     ///   an `Accept-Encoding` **and** `Range` values, the `Accept-Encoding` header is set to `gzip`.
     ///   The request body is **not** automatically compressed.
-    /// - When receiving a response, if it's headers contain a `Content-Encoding` value that
-    ///   equals to `gzip`, both values `Content-Encoding` and `Content-Length` are removed from the
+    /// - When receiving a response, if its headers contain a `Content-Encoding` value of
+    ///   `gzip`, both `Content-Encoding` and `Content-Length` are removed from the
     ///   headers' set. The response body is automatically decompressed.
     ///
     /// If the `gzip` feature is turned on, the default option is enabled.
@@ -478,6 +530,7 @@
     ///
     /// This requires the optional `gzip` feature to be enabled
     #[cfg(feature = "gzip")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "gzip")))]
     pub fn gzip(mut self, enable: bool) -> ClientBuilder {
         self.config.accepts.gzip = enable;
         self
@@ -490,8 +543,8 @@
     /// - When sending a request and if the request's headers do not already contain
     ///   an `Accept-Encoding` **and** `Range` values, the `Accept-Encoding` header is set to `br`.
     ///   The request body is **not** automatically compressed.
-    /// - When receiving a response, if it's headers contain a `Content-Encoding` value that
-    ///   equals to `br`, both values `Content-Encoding` and `Content-Length` are removed from the
+    /// - When receiving a response, if its headers contain a `Content-Encoding` value of
+    ///   `br`, both `Content-Encoding` and `Content-Length` are removed from the
     ///   headers' set. The response body is automatically decompressed.
     ///
     /// If the `brotli` feature is turned on, the default option is enabled.
@@ -500,11 +553,35 @@
     ///
     /// This requires the optional `brotli` feature to be enabled
     #[cfg(feature = "brotli")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "brotli")))]
     pub fn brotli(mut self, enable: bool) -> ClientBuilder {
         self.config.accepts.brotli = enable;
         self
     }
 
+    /// Enable auto deflate decompression by checking the `Content-Encoding` response header.
+    ///
+    /// If auto deflate decompression is turned on:
+    ///
+    /// - When sending a request and if the request's headers do not already contain
+    ///   an `Accept-Encoding` **and** `Range` values, the `Accept-Encoding` header is set to `deflate`.
+    ///   The request body is **not** automatically compressed.
+    /// - When receiving a response, if it's headers contain a `Content-Encoding` value that
+    ///   equals to `deflate`, both values `Content-Encoding` and `Content-Length` are removed from the
+    ///   headers' set. The response body is automatically decompressed.
+    ///
+    /// If the `deflate` feature is turned on, the default option is enabled.
+    ///
+    /// # Optional
+    ///
+    /// This requires the optional `deflate` feature to be enabled
+    #[cfg(feature = "deflate")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "deflate")))]
+    pub fn deflate(mut self, enable: bool) -> ClientBuilder {
+        self.config.accepts.deflate = enable;
+        self
+    }
+
     /// Disable auto response body gzip decompression.
     ///
     /// This method exists even if the optional `gzip` feature is not enabled.
@@ -539,6 +616,23 @@
         }
     }
 
+    /// Disable auto response body deflate decompression.
+    ///
+    /// This method exists even if the optional `deflate` feature is not enabled.
+    /// This can be used to ensure a `Client` doesn't use deflate decompression
+    /// even if another dependency were to enable the optional `deflate` feature.
+    pub fn no_deflate(self) -> ClientBuilder {
+        #[cfg(feature = "deflate")]
+        {
+            self.deflate(false)
+        }
+
+        #[cfg(not(feature = "deflate"))]
+        {
+            self
+        }
+    }
+
     // Redirect options
 
     /// Set a `RedirectPolicy` for this client.
@@ -579,12 +673,6 @@
         self
     }
 
-    #[doc(hidden)]
-    #[deprecated(note = "the system proxy is used automatically")]
-    pub fn use_sys_proxy(self) -> ClientBuilder {
-        self
-    }
-
     // Timeout options
 
     /// Enables a request timeout.
@@ -643,26 +731,12 @@
         self
     }
 
-    #[doc(hidden)]
-    #[deprecated(note = "renamed to `pool_max_idle_per_host`")]
-    pub fn max_idle_per_host(self, max: usize) -> ClientBuilder {
-        self.pool_max_idle_per_host(max)
-    }
-
     /// Enable case sensitive headers.
     pub fn http1_title_case_headers(mut self) -> ClientBuilder {
         self.config.http1_title_case_headers = true;
         self
     }
 
-    /// Force hyper to use either queued(if true), or flattened(if false) write strategy
-    /// This may eliminate unnecessary cloning of buffers for some TLS backends
-    /// By default hyper will try to guess which strategy to use
-    pub fn http1_writev(mut self, writev: bool) -> ClientBuilder {
-        self.config.http1_writev = Some(writev);
-        self
-    }
-
     /// Only use HTTP/2.
     pub fn http2_prior_knowledge(mut self) -> ClientBuilder {
         self.config.http2_only = true;
@@ -688,24 +762,29 @@
         self
     }
 
-    // TCP options
+    /// Sets whether to use an adaptive flow control.
+    ///
+    /// Enabling this will override the limits set in `http2_initial_stream_window_size` and
+    /// `http2_initial_connection_window_size`.
+    pub fn http2_adaptive_window(mut self, enabled: bool) -> ClientBuilder {
+        self.config.http2_adaptive_window = enabled;
+        self
+    }
 
-    #[doc(hidden)]
-    #[deprecated(note = "tcp_nodelay is enabled by default, use `tcp_nodelay_` to disable")]
-    pub fn tcp_nodelay(self) -> ClientBuilder {
-        self.tcp_nodelay_(true)
+    /// Sets the maximum frame size to use for HTTP2.
+    ///
+    /// Default is currently 16,384 but may change internally to optimize for common uses.
+    pub fn http2_max_frame_size(mut self, sz: impl Into<Option<u32>>) -> ClientBuilder {
+        self.config.http2_max_frame_size = sz.into();
+        self
     }
 
+    // TCP options
+
     /// Set whether sockets have `SO_NODELAY` enabled.
     ///
     /// Default is `true`.
-    // NOTE: Regarding naming (trailing underscore):
-    //
-    // Due to the original `tcp_nodelay()` not taking an argument, changing
-    // the default means a user has no way of *disabling* this feature.
-    //
-    // TODO(v0.11.x): Remove trailing underscore.
-    pub fn tcp_nodelay_(mut self, enabled: bool) -> ClientBuilder {
+    pub fn tcp_nodelay(mut self, enabled: bool) -> ClientBuilder {
         self.config.nodelay = enabled;
         self
     }
@@ -733,8 +812,8 @@
     ///
     /// If `None`, the option will not be set.
     pub fn tcp_keepalive<D>(mut self, val: D) -> ClientBuilder
-        where
-            D: Into<Option<Duration>>,
+    where
+        D: Into<Option<Duration>>,
     {
         self.config.tcp_keepalive = val.into();
         self
@@ -752,18 +831,49 @@
     /// This requires the optional `default-tls`, `native-tls`, or `rustls-tls(-...)`
     /// feature to be enabled.
     #[cfg(feature = "__tls")]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            feature = "default-tls",
+            feature = "native-tls",
+            feature = "rustls-tls"
+        )))
+    )]
     pub fn add_root_certificate(mut self, cert: Certificate) -> ClientBuilder {
         self.config.root_certs.push(cert);
         self
     }
 
+    /// Controls the use of built-in/preloaded certificates during certificate validation.
+    ///
+    /// Defaults to `true` -- built-in system certs will be used.
+    ///
+    /// # Optional
+    ///
+    /// This requires the optional `default-tls`, `native-tls`, or `rustls-tls(-...)`
+    /// feature to be enabled.
+    #[cfg(feature = "__tls")]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            feature = "default-tls",
+            feature = "native-tls",
+            feature = "rustls-tls"
+        )))
+    )]
+    pub fn tls_built_in_root_certs(mut self, tls_built_in_root_certs: bool) -> ClientBuilder {
+        self.config.tls_built_in_root_certs = tls_built_in_root_certs;
+        self
+    }
+
     /// Sets the identity to be used for client certificate authentication.
     ///
     /// # Optional
     ///
     /// This requires the optional `native-tls` or `rustls-tls(-...)` feature to be
     /// enabled.
-    #[cfg(feature = "__tls")]
+    #[cfg(any(feature = "native-tls", feature = "__rustls"))]
+    #[cfg_attr(docsrs, doc(cfg(any(feature = "native-tls", feature = "rustls-tls"))))]
     pub fn identity(mut self, identity: Identity) -> ClientBuilder {
         self.config.identity = Some(identity);
         self
@@ -784,6 +894,7 @@
     ///
     /// This requires the optional `native-tls` feature to be enabled.
     #[cfg(feature = "native-tls")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "native-tls")))]
     pub fn danger_accept_invalid_hostnames(
         mut self,
         accept_invalid_hostname: bool,
@@ -809,6 +920,14 @@
     /// This requires the optional `default-tls`, `native-tls`, or `rustls-tls(-...)`
     /// feature to be enabled.
     #[cfg(feature = "__tls")]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            feature = "default-tls",
+            feature = "native-tls",
+            feature = "rustls-tls"
+        )))
+    )]
     pub fn danger_accept_invalid_certs(mut self, accept_invalid_certs: bool) -> ClientBuilder {
         self.config.certs_verification = !accept_invalid_certs;
         self
@@ -823,6 +942,7 @@
     ///
     /// This requires the optional `native-tls` feature to be enabled.
     #[cfg(feature = "native-tls")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "native-tls")))]
     pub fn use_native_tls(mut self) -> ClientBuilder {
         self.config.tls = TlsBackend::Default;
         self
@@ -837,6 +957,7 @@
     ///
     /// This requires the optional `rustls-tls(-...)` feature to be enabled.
     #[cfg(feature = "__rustls")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rustls-tls")))]
     pub fn use_rustls_tls(mut self) -> ClientBuilder {
         self.config.tls = TlsBackend::Rustls;
         self
@@ -860,15 +981,15 @@
     ///
     /// This requires one of the optional features `native-tls` or
     /// `rustls-tls(-...)` to be enabled.
-    #[cfg(any(
-        feature = "native-tls",
-        feature = "__rustls",
-    ))]
+    #[cfg(any(feature = "native-tls", feature = "__rustls",))]
+    #[cfg_attr(docsrs, doc(cfg(any(feature = "native-tls", feature = "rustls-tls"))))]
     pub fn use_preconfigured_tls(mut self, tls: impl Any) -> ClientBuilder {
         let mut tls = Some(tls);
         #[cfg(feature = "native-tls")]
         {
-            if let Some(conn) = (&mut tls as &mut dyn Any).downcast_mut::<Option<native_tls_crate::TlsConnector>>() {
+            if let Some(conn) =
+                (&mut tls as &mut dyn Any).downcast_mut::<Option<native_tls_crate::TlsConnector>>()
+            {
                 let tls = conn.take().expect("is definitely Some");
                 let tls = crate::tls::TlsBackend::BuiltNativeTls(tls);
                 self.config.tls = tls;
@@ -877,8 +998,9 @@
         }
         #[cfg(feature = "__rustls")]
         {
-            if let Some(conn) = (&mut tls as &mut dyn Any).downcast_mut::<Option<rustls::ClientConfig>>() {
-
+            if let Some(conn) =
+                (&mut tls as &mut dyn Any).downcast_mut::<Option<rustls::ClientConfig>>()
+            {
                 let tls = conn.take().expect("is definitely Some");
                 let tls = crate::tls::TlsBackend::BuiltRustls(tls);
                 self.config.tls = tls;
@@ -899,6 +1021,7 @@
     ///
     /// This requires the optional `trust-dns` feature to be enabled
     #[cfg(feature = "trust-dns")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "trust-dns")))]
     pub fn trust_dns(mut self, enable: bool) -> ClientBuilder {
         self.config.trust_dns = enable;
         self
@@ -922,12 +1045,25 @@
     }
 
     /// Restrict the Client to be used with HTTPS only requests.
-    /// 
+    ///
     /// Defaults to false.
     pub fn https_only(mut self, enabled: bool) -> ClientBuilder {
         self.config.https_only = enabled;
         self
     }
+
+    /// Override DNS resolution for specific domains to particular IP addresses.
+    ///
+    /// Warning
+    ///
+    /// Since the DNS protocol has no notion of ports, if you wish to send
+    /// traffic to a particular port you must include this port in the URL
+    /// itself, any port in the overridden addr will be ignored and traffic sent
+    /// to the conventional port for the given scheme (e.g. 80 for http).
+    pub fn resolve(mut self, domain: &str, addr: SocketAddr) -> ClientBuilder {
+        self.config.dns_overrides.insert(domain.to_string(), addr);
+        self
+    }
 }
 
 type HyperClient = hyper::Client<Connector, super::body::ImplStream>;
@@ -943,7 +1079,7 @@
     ///
     /// # Panics
     ///
-    /// This method panics if TLS backend cannot initialized, or the resolver
+    /// This method panics if a TLS backend cannot initialized, or the resolver
     /// cannot load the system configuration.
     ///
     /// Use `Client::builder()` if you wish to handle the failure as an `Error`
@@ -963,7 +1099,7 @@
     ///
     /// # Errors
     ///
-    /// This method fails whenever supplied `Url` cannot be parsed.
+    /// This method fails whenever the supplied `Url` cannot be parsed.
     pub fn get<U: IntoUrl>(&self, url: U) -> RequestBuilder {
         self.request(Method::GET, url)
     }
@@ -972,7 +1108,7 @@
     ///
     /// # Errors
     ///
-    /// This method fails whenever supplied `Url` cannot be parsed.
+    /// This method fails whenever the supplied `Url` cannot be parsed.
     pub fn post<U: IntoUrl>(&self, url: U) -> RequestBuilder {
         self.request(Method::POST, url)
     }
@@ -981,7 +1117,7 @@
     ///
     /// # Errors
     ///
-    /// This method fails whenever supplied `Url` cannot be parsed.
+    /// This method fails whenever the supplied `Url` cannot be parsed.
     pub fn put<U: IntoUrl>(&self, url: U) -> RequestBuilder {
         self.request(Method::PUT, url)
     }
@@ -990,7 +1126,7 @@
     ///
     /// # Errors
     ///
-    /// This method fails whenever supplied `Url` cannot be parsed.
+    /// This method fails whenever the supplied `Url` cannot be parsed.
     pub fn patch<U: IntoUrl>(&self, url: U) -> RequestBuilder {
         self.request(Method::PATCH, url)
     }
@@ -999,7 +1135,7 @@
     ///
     /// # Errors
     ///
-    /// This method fails whenever supplied `Url` cannot be parsed.
+    /// This method fails whenever the supplied `Url` cannot be parsed.
     pub fn delete<U: IntoUrl>(&self, url: U) -> RequestBuilder {
         self.request(Method::DELETE, url)
     }
@@ -1008,7 +1144,7 @@
     ///
     /// # Errors
     ///
-    /// This method fails whenever supplied `Url` cannot be parsed.
+    /// This method fails whenever the supplied `Url` cannot be parsed.
     pub fn head<U: IntoUrl>(&self, url: U) -> RequestBuilder {
         self.request(Method::HEAD, url)
     }
@@ -1016,11 +1152,11 @@
     /// Start building a `Request` with the `Method` and `Url`.
     ///
     /// Returns a `RequestBuilder`, which will allow setting headers and
-    /// request body before sending.
+    /// the request body before sending.
     ///
     /// # Errors
     ///
-    /// This method fails whenever supplied `Url` cannot be parsed.
+    /// This method fails whenever the supplied `Url` cannot be parsed.
     pub fn request<U: IntoUrl>(&self, method: Method, url: U) -> RequestBuilder {
         let req = url.into_url().map(move |url| Request::new(method, url));
         RequestBuilder::new(self.clone(), req)
@@ -1046,7 +1182,7 @@
     }
 
     pub(super) fn execute_request(&self, req: Request) -> Pending {
-        let (method, url, mut headers, body, timeout) = req.pieces();
+        let (method, url, mut headers, body, timeout, version) = req.pieces();
         if url.scheme() != "http" && url.scheme() != "https" {
             return Pending::new_err(error::url_bad_scheme(url));
         }
@@ -1067,10 +1203,9 @@
         // Add cookies from the cookie store.
         #[cfg(feature = "cookies")]
         {
-            if let Some(cookie_store_wrapper) = self.inner.cookie_store.as_ref() {
+            if let Some(cookie_store) = self.inner.cookie_store.as_ref() {
                 if headers.get(crate::header::COOKIE).is_none() {
-                    let cookie_store = cookie_store_wrapper.read().unwrap();
-                    add_cookie_header(&mut headers, &cookie_store, &url);
+                    add_cookie_header(&mut headers, &**cookie_store, &url);
                 }
             }
         }
@@ -1098,12 +1233,14 @@
         let mut req = hyper::Request::builder()
             .method(method.clone())
             .uri(uri)
+            .version(version)
             .body(body.into_stream())
             .expect("valid request parts");
 
         let timeout = timeout
             .or(self.inner.request_timeout)
-            .map(tokio::time::delay_for);
+            .map(tokio::time::sleep)
+            .map(Box::pin);
 
         *req.headers_mut() = headers.clone();
 
@@ -1240,13 +1377,17 @@
         {
             f.field("tls_backend", &self.tls);
         }
+
+        if !self.dns_overrides.is_empty() {
+            f.field("dns_overrides", &self.dns_overrides);
+        }
     }
 }
 
 struct ClientRef {
     accepts: Accepts,
     #[cfg(feature = "cookies")]
-    cookie_store: Option<RwLock<cookie::CookieStore>>,
+    cookie_store: Option<Arc<dyn cookie::CookieStore>>,
     headers: HeaderMap,
     hyper: HyperClient,
     redirect_policy: redirect::Policy,
@@ -1317,7 +1458,7 @@
         #[pin]
         in_flight: ResponseFuture,
         #[pin]
-        timeout: Option<Delay>,
+        timeout: Option<Pin<Box<Sleep>>>,
     }
 }
 
@@ -1326,7 +1467,7 @@
         self.project().in_flight
     }
 
-    fn timeout(self: Pin<&mut Self>) -> Pin<&mut Option<Delay>> {
+    fn timeout(self: Pin<&mut Self>) -> Pin<&mut Option<Pin<Box<Sleep>>>> {
         self.project().timeout
     }
 
@@ -1388,14 +1529,11 @@
 
             #[cfg(feature = "cookies")]
             {
-                if let Some(store_wrapper) = self.client.cookie_store.as_ref() {
-                    let mut cookies = cookie::extract_response_cookies(&res.headers())
-                        .filter_map(|res| res.ok())
-                        .map(|cookie| cookie.into_inner().into_owned())
-                        .peekable();
+                if let Some(ref cookie_store) = self.client.cookie_store {
+                    let mut cookies =
+                        cookie::extract_response_cookie_headers(&res.headers()).peekable();
                     if cookies.peek().is_some() {
-                      let mut store = store_wrapper.write().unwrap();
-                      store.0.store_response_cookies(cookies, &self.url);
+                        cookie_store.set_cookies(&mut cookies, &self.url);
                     }
                 }
             }
@@ -1488,11 +1626,8 @@
                             // Add cookies from the cookie store.
                             #[cfg(feature = "cookies")]
                             {
-                                if let Some(cookie_store_wrapper) =
-                                    self.client.cookie_store.as_ref()
-                                {
-                                    let cookie_store = cookie_store_wrapper.read().unwrap();
-                                    add_cookie_header(&mut headers, &cookie_store, &self.url);
+                                if let Some(ref cookie_store) = self.client.cookie_store {
+                                    add_cookie_header(&mut headers, &**cookie_store, &self.url);
                                 }
                             }
 
@@ -1549,24 +1684,16 @@
 }
 
 #[cfg(feature = "cookies")]
-fn add_cookie_header(headers: &mut HeaderMap, cookie_store: &cookie::CookieStore, url: &Url) {
-    let header = cookie_store
-        .0
-        .get_request_cookies(url)
-        .map(|c| format!("{}={}", c.name(), c.value()))
-        .collect::<Vec<_>>()
-        .join("; ");
-    if !header.is_empty() {
-        headers.insert(
-            crate::header::COOKIE,
-            HeaderValue::from_bytes(header.as_bytes()).unwrap(),
-        );
+fn add_cookie_header(headers: &mut HeaderMap, cookie_store: &dyn cookie::CookieStore, url: &Url) {
+    if let Some(header) = cookie_store.cookies(url) {
+        headers.insert(crate::header::COOKIE, header);
     }
 }
 
 #[cfg(feature = "rustls-tls-native-roots")]
 lazy_static! {
-    static ref NATIVE_ROOTS: std::io::Result<RootCertStore> = rustls_native_certs::load_native_certs().map_err(|e| e.1);
+    static ref NATIVE_ROOTS: std::io::Result<RootCertStore> =
+        rustls_native_certs::load_native_certs().map_err(|e| e.1);
 }
 
 #[cfg(test)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/decoder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/decoder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/decoder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/decoder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,10 +4,13 @@
 use std::task::{Context, Poll};
 
 #[cfg(feature = "gzip")]
-use async_compression::stream::GzipDecoder;
+use async_compression::tokio::bufread::GzipDecoder;
 
 #[cfg(feature = "brotli")]
-use async_compression::stream::BrotliDecoder;
+use async_compression::tokio::bufread::BrotliDecoder;
+
+#[cfg(feature = "deflate")]
+use async_compression::tokio::bufread::ZlibDecoder;
 
 use bytes::Bytes;
 use futures_core::Stream;
@@ -15,6 +18,11 @@
 use http::HeaderMap;
 use hyper::body::HttpBody;
 
+#[cfg(any(feature = "gzip", feature = "brotli", feature = "deflate"))]
+use tokio_util::codec::{BytesCodec, FramedRead};
+#[cfg(any(feature = "gzip", feature = "brotli", feature = "deflate"))]
+use tokio_util::io::StreamReader;
+
 use super::super::Body;
 use crate::error;
 
@@ -24,6 +32,8 @@
     pub(super) gzip: bool,
     #[cfg(feature = "brotli")]
     pub(super) brotli: bool,
+    #[cfg(feature = "deflate")]
+    pub(super) deflate: bool,
 }
 
 /// A response decompressor over a non-blocking stream of chunks.
@@ -39,14 +49,18 @@
 
     /// A `Gzip` decoder will uncompress the gzipped response content before returning it.
     #[cfg(feature = "gzip")]
-    Gzip(GzipDecoder<Peekable<IoStream>>),
+    Gzip(FramedRead<GzipDecoder<StreamReader<Peekable<IoStream>, Bytes>>, BytesCodec>),
 
     /// A `Brotli` decoder will uncompress the brotlied response content before returning it.
     #[cfg(feature = "brotli")]
-    Brotli(BrotliDecoder<Peekable<IoStream>>),
+    Brotli(FramedRead<BrotliDecoder<StreamReader<Peekable<IoStream>, Bytes>>, BytesCodec>),
+
+    /// A `Deflate` decoder will uncompress the deflated response content before returning it.
+    #[cfg(feature = "deflate")]
+    Deflate(FramedRead<ZlibDecoder<StreamReader<Peekable<IoStream>, Bytes>>, BytesCodec>),
 
     /// A decoder that doesn't have a value yet.
-    #[cfg(any(feature = "brotli", feature = "gzip"))]
+    #[cfg(any(feature = "brotli", feature = "gzip", feature = "deflate"))]
     Pending(Pending),
 }
 
@@ -60,6 +74,8 @@
     Gzip,
     #[cfg(feature = "brotli")]
     Brotli,
+    #[cfg(feature = "deflate")]
+    Deflate,
 }
 
 impl fmt::Debug for Decoder {
@@ -115,68 +131,49 @@
         }
     }
 
-    #[cfg(feature = "gzip")]
-    fn detect_gzip(headers: &mut HeaderMap) -> bool {
-        use http::header::{CONTENT_ENCODING, CONTENT_LENGTH, TRANSFER_ENCODING};
-        use log::warn;
+    /// A deflate decoder.
+    ///
+    /// This decoder will buffer and decompress chunks that are deflated.
+    #[cfg(feature = "deflate")]
+    fn deflate(body: Body) -> Decoder {
+        use futures_util::StreamExt;
 
-        let content_encoding_gzip: bool;
-        let mut is_gzip = {
-            content_encoding_gzip = headers
-                .get_all(CONTENT_ENCODING)
-                .iter()
-                .any(|enc| enc == "gzip");
-            content_encoding_gzip
-                || headers
-                    .get_all(TRANSFER_ENCODING)
-                    .iter()
-                    .any(|enc| enc == "gzip")
-        };
-        if is_gzip {
-            if let Some(content_length) = headers.get(CONTENT_LENGTH) {
-                if content_length == "0" {
-                    warn!("gzip response with content-length of 0");
-                    is_gzip = false;
-                }
-            }
-        }
-        if is_gzip {
-            headers.remove(CONTENT_ENCODING);
-            headers.remove(CONTENT_LENGTH);
+        Decoder {
+            inner: Inner::Pending(Pending(
+                IoStream(body.into_stream()).peekable(),
+                DecoderType::Deflate,
+            )),
         }
-        is_gzip
     }
 
-    #[cfg(feature = "brotli")]
-    fn detect_brotli(headers: &mut HeaderMap) -> bool {
+    #[cfg(any(feature = "brotli", feature = "gzip", feature = "deflate"))]
+    fn detect_encoding(headers: &mut HeaderMap, encoding_str: &str) -> bool {
         use http::header::{CONTENT_ENCODING, CONTENT_LENGTH, TRANSFER_ENCODING};
         use log::warn;
 
-        let content_encoding_gzip: bool;
-        let mut is_brotli = {
-            content_encoding_gzip = headers
+        let mut is_content_encoded = {
+            headers
                 .get_all(CONTENT_ENCODING)
                 .iter()
-                .any(|enc| enc == "br");
-            content_encoding_gzip
+                .any(|enc| enc == encoding_str)
                 || headers
                     .get_all(TRANSFER_ENCODING)
                     .iter()
-                    .any(|enc| enc == "br")
+                    .any(|enc| enc == encoding_str)
         };
-        if is_brotli {
+        if is_content_encoded {
             if let Some(content_length) = headers.get(CONTENT_LENGTH) {
                 if content_length == "0" {
-                    warn!("brotli response with content-length of 0");
-                    is_brotli = false;
+                    warn!("{} response with content-length of 0", encoding_str);
+                    is_content_encoded = false;
                 }
             }
         }
-        if is_brotli {
+        if is_content_encoded {
             headers.remove(CONTENT_ENCODING);
             headers.remove(CONTENT_LENGTH);
         }
-        is_brotli
+        is_content_encoded
     }
 
     /// Constructs a Decoder from a hyper request.
@@ -185,25 +182,28 @@
     /// how to decode the content body of the request.
     ///
     /// Uses the correct variant by inspecting the Content-Encoding header.
-    pub(super) fn detect(
-        _headers: &mut HeaderMap,
-        body: Body,
-        _accepts: Accepts,
-    ) -> Decoder {
+    pub(super) fn detect(_headers: &mut HeaderMap, body: Body, _accepts: Accepts) -> Decoder {
         #[cfg(feature = "gzip")]
         {
-            if _accepts.gzip && Decoder::detect_gzip(_headers) {
+            if _accepts.gzip && Decoder::detect_encoding(_headers, "gzip") {
                 return Decoder::gzip(body);
             }
         }
 
         #[cfg(feature = "brotli")]
         {
-            if _accepts.brotli && Decoder::detect_brotli(_headers) {
+            if _accepts.brotli && Decoder::detect_encoding(_headers, "br") {
                 return Decoder::brotli(body);
             }
         }
 
+        #[cfg(feature = "deflate")]
+        {
+            if _accepts.deflate && Decoder::detect_encoding(_headers, "deflate") {
+                return Decoder::deflate(body);
+            }
+        }
+
         Decoder::plain_text(body)
     }
 }
@@ -214,7 +214,7 @@
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
         // Do a read or poll for a pending decoder value.
         match self.inner {
-            #[cfg(any(feature = "brotli", feature = "gzip"))]
+            #[cfg(any(feature = "brotli", feature = "gzip", feature = "deflate"))]
             Inner::Pending(ref mut future) => match Pin::new(future).poll(cx) {
                 Poll::Ready(Ok(inner)) => {
                     self.inner = inner;
@@ -229,7 +229,7 @@
             #[cfg(feature = "gzip")]
             Inner::Gzip(ref mut decoder) => {
                 return match futures_core::ready!(Pin::new(decoder).poll_next(cx)) {
-                    Some(Ok(bytes)) => Poll::Ready(Some(Ok(bytes))),
+                    Some(Ok(bytes)) => Poll::Ready(Some(Ok(bytes.freeze()))),
                     Some(Err(err)) => Poll::Ready(Some(Err(crate::error::decode_io(err)))),
                     None => Poll::Ready(None),
                 };
@@ -237,7 +237,15 @@
             #[cfg(feature = "brotli")]
             Inner::Brotli(ref mut decoder) => {
                 return match futures_core::ready!(Pin::new(decoder).poll_next(cx)) {
-                    Some(Ok(bytes)) => Poll::Ready(Some(Ok(bytes))),
+                    Some(Ok(bytes)) => Poll::Ready(Some(Ok(bytes.freeze()))),
+                    Some(Err(err)) => Poll::Ready(Some(Err(crate::error::decode_io(err)))),
+                    None => Poll::Ready(None),
+                };
+            }
+            #[cfg(feature = "deflate")]
+            Inner::Deflate(ref mut decoder) => {
+                return match futures_core::ready!(Pin::new(decoder).poll_next(cx)) {
+                    Some(Ok(bytes)) => Poll::Ready(Some(Ok(bytes.freeze()))),
                     Some(Err(err)) => Poll::Ready(Some(Err(crate::error::decode_io(err)))),
                     None => Poll::Ready(None),
                 };
@@ -268,7 +276,7 @@
         match self.inner {
             Inner::PlainText(ref body) => HttpBody::size_hint(body),
             // the rest are "unknown", so default
-            #[cfg(any(feature = "brotli", feature = "gzip"))]
+            #[cfg(any(feature = "brotli", feature = "gzip", feature = "deflate"))]
             _ => http_body::SizeHint::default(),
         }
     }
@@ -302,9 +310,20 @@
 
         match self.1 {
             #[cfg(feature = "brotli")]
-            DecoderType::Brotli => Poll::Ready(Ok(Inner::Brotli(BrotliDecoder::new(_body)))),
+            DecoderType::Brotli => Poll::Ready(Ok(Inner::Brotli(FramedRead::new(
+                BrotliDecoder::new(StreamReader::new(_body)),
+                BytesCodec::new(),
+            )))),
             #[cfg(feature = "gzip")]
-            DecoderType::Gzip => Poll::Ready(Ok(Inner::Gzip(GzipDecoder::new(_body)))),
+            DecoderType::Gzip => Poll::Ready(Ok(Inner::Gzip(FramedRead::new(
+                GzipDecoder::new(StreamReader::new(_body)),
+                BytesCodec::new(),
+            )))),
+            #[cfg(feature = "deflate")]
+            DecoderType::Deflate => Poll::Ready(Ok(Inner::Deflate(FramedRead::new(
+                ZlibDecoder::new(StreamReader::new(_body)),
+                BytesCodec::new(),
+            )))),
         }
     }
 }
@@ -330,15 +349,21 @@
             gzip: false,
             #[cfg(feature = "brotli")]
             brotli: false,
+            #[cfg(feature = "deflate")]
+            deflate: false,
         }
     }
 
     pub(super) fn as_str(&self) -> Option<&'static str> {
-        match (self.is_gzip(), self.is_brotli()) {
-            (true, true) => Some("gzip, br"),
-            (true, false) => Some("gzip"),
-            (false, true) => Some("br"),
-            _ => None,
+        match (self.is_gzip(), self.is_brotli(), self.is_deflate()) {
+            (true, true, true) => Some("gzip, br, deflate"),
+            (true, true, false) => Some("gzip, br"),
+            (true, false, true) => Some("gzip, deflate"),
+            (false, true, true) => Some("br, deflate"),
+            (true, false, false) => Some("gzip"),
+            (false, true, false) => Some("br"),
+            (false, false, true) => Some("deflate"),
+            (false, false, false) => None,
         }
     }
 
@@ -365,6 +390,18 @@
             false
         }
     }
+
+    fn is_deflate(&self) -> bool {
+        #[cfg(feature = "deflate")]
+        {
+            self.deflate
+        }
+
+        #[cfg(not(feature = "deflate"))]
+        {
+            false
+        }
+    }
 }
 
 impl Default for Accepts {
@@ -374,6 +411,8 @@
             gzip: true,
             #[cfg(feature = "brotli")]
             brotli: true,
+            #[cfg(feature = "deflate")]
+            deflate: true,
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,6 +9,7 @@
 pub mod body;
 pub mod client;
 pub mod decoder;
+#[cfg(feature = "multipart")]
 pub mod multipart;
 pub(crate) mod request;
 mod response;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/multipart.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/multipart.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/multipart.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/multipart.rs	2021-12-09 12:01:26.000000000 +0000
@@ -521,8 +521,7 @@
     fn form_empty() {
         let form = Form::new();
 
-        let mut rt = runtime::Builder::new()
-            .basic_scheduler()
+        let rt = runtime::Builder::new_current_thread()
             .enable_all()
             .build()
             .expect("new rt");
@@ -572,8 +571,7 @@
              --boundary\r\n\
              Content-Disposition: form-data; name=\"key3\"; filename=\"filename\"\r\n\r\n\
              value3\r\n--boundary--\r\n";
-        let mut rt = runtime::Builder::new()
-            .basic_scheduler()
+        let rt = runtime::Builder::new_current_thread()
             .enable_all()
             .build()
             .expect("new rt");
@@ -603,8 +601,7 @@
                         \r\n\
                         value2\r\n\
                         --boundary--\r\n";
-        let mut rt = runtime::Builder::new()
-            .basic_scheduler()
+        let rt = runtime::Builder::new_current_thread()
             .enable_all()
             .build()
             .expect("new rt");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/request.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/request.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/request.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/request.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,11 +11,14 @@
 
 use super::body::Body;
 use super::client::{Client, Pending};
+#[cfg(feature = "multipart")]
 use super::multipart;
 use super::response::Response;
-use crate::header::{HeaderMap, HeaderName, HeaderValue, CONTENT_LENGTH, CONTENT_TYPE};
+#[cfg(feature = "multipart")]
+use crate::header::CONTENT_LENGTH;
+use crate::header::{HeaderMap, HeaderName, HeaderValue, CONTENT_TYPE};
 use crate::{Method, Url};
-use http::{Request as HttpRequest, request::Parts};
+use http::{request::Parts, Request as HttpRequest, Version};
 
 /// A request which can be executed with `Client::execute()`.
 pub struct Request {
@@ -24,6 +27,7 @@
     headers: HeaderMap,
     body: Option<Body>,
     timeout: Option<Duration>,
+    version: Version,
 }
 
 /// A builder to construct the properties of a `Request`.
@@ -44,7 +48,8 @@
             url,
             headers: HeaderMap::new(),
             body: None,
-            timeout: None
+            timeout: None,
+            version: Version::default(),
         }
     }
 
@@ -108,6 +113,18 @@
         &mut self.timeout
     }
 
+    /// Get the http version.
+    #[inline]
+    pub fn version(&self) -> Version {
+        self.version
+    }
+
+    /// Get a mutable reference to the http version.
+    #[inline]
+    pub fn version_mut(&mut self) -> &mut Version {
+        &mut self.version
+    }
+
     /// Attempt to clone the request.
     ///
     /// `None` is returned if the request can not be cloned, i.e. if the body is a stream.
@@ -119,12 +136,29 @@
         let mut req = Request::new(self.method().clone(), self.url().clone());
         *req.timeout_mut() = self.timeout().cloned();
         *req.headers_mut() = self.headers().clone();
+        *req.version_mut() = self.version().clone();
         req.body = body;
         Some(req)
     }
 
-    pub(super) fn pieces(self) -> (Method, Url, HeaderMap, Option<Body>, Option<Duration>) {
-        (self.method, self.url, self.headers, self.body, self.timeout)
+    pub(super) fn pieces(
+        self,
+    ) -> (
+        Method,
+        Url,
+        HeaderMap,
+        Option<Body>,
+        Option<Duration>,
+        Version,
+    ) {
+        (
+            self.method,
+            self.url,
+            self.headers,
+            self.body,
+            self.timeout,
+            self.version,
+        )
     }
 }
 
@@ -151,7 +185,7 @@
         HeaderName: TryFrom<K>,
         <HeaderName as TryFrom<K>>::Error: Into<http::Error>,
         HeaderValue: TryFrom<V>,
-        <HeaderValue as TryFrom<V>>::Error: Into<http::Error>, 
+        <HeaderValue as TryFrom<V>>::Error: Into<http::Error>,
     {
         self.header_sensitive(key, value, false)
     }
@@ -260,6 +294,8 @@
     /// # Ok(())
     /// # }
     /// ```
+    #[cfg(feature = "multipart")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "multipart")))]
     pub fn multipart(self, mut multipart: multipart::Form) -> RequestBuilder {
         let mut builder = self.header(
             CONTENT_TYPE,
@@ -317,6 +353,14 @@
         self
     }
 
+    /// Set HTTP version
+    pub fn version(mut self, version: Version) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            req.version = version;
+        }
+        self
+    }
+
     /// Send a form body.
     pub fn form<T: Serialize + ?Sized>(mut self, form: &T) -> RequestBuilder {
         let mut error = None;
@@ -349,6 +393,7 @@
     /// Serialization can fail if `T`'s implementation of `Serialize` decides to
     /// fail, or if `T` contains a map with non-string keys.
     #[cfg(feature = "json")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     pub fn json<T: Serialize + ?Sized>(mut self, json: &T) -> RequestBuilder {
         let mut error = None;
         if let Ok(ref mut req) = self.request {
@@ -470,7 +515,6 @@
         .field("headers", &req.headers)
 }
 
-
 /// Check the request URL for a "username:password" type authority, and if
 /// found, remove it from the URL and return it.
 pub(crate) fn extract_authority(url: &mut Url) -> Option<(String, Option<String>)> {
@@ -488,20 +532,21 @@
                 .map(String::from)
         });
         if !username.is_empty() || password.is_some() {
-            url
-                .set_username("")
+            url.set_username("")
                 .expect("has_authority means set_username shouldn't fail");
-            url
-                .set_password(None)
+            url.set_password(None)
                 .expect("has_authority means set_password shouldn't fail");
-            return Some((username, password))
+            return Some((username, password));
         }
     }
 
     None
 }
 
-impl<T> TryFrom<HttpRequest<T>> for Request where T:Into<Body>{
+impl<T> TryFrom<HttpRequest<T>> for Request
+where
+    T: Into<Body>,
+{
     type Error = crate::Error;
 
     fn try_from(req: HttpRequest<T>) -> crate::Result<Self> {
@@ -510,23 +555,24 @@
             method,
             uri,
             headers,
+            version,
             ..
         } = parts;
-        let url = Url::parse(&uri.to_string())
-            .map_err(crate::error::builder)?;
+        let url = Url::parse(&uri.to_string()).map_err(crate::error::builder)?;
         Ok(Request {
             method,
             url,
             headers,
             body: Some(body.into()),
             timeout: None,
+            version: version,
         })
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::{Client, HttpRequest, Request};
+    use super::{Client, HttpRequest, Request, Version};
     use crate::Method;
     use serde::Serialize;
     use std::collections::BTreeMap;
@@ -640,7 +686,8 @@
     #[test]
     fn try_clone_reusable() {
         let client = Client::new();
-        let builder = client.post("http://httpbin.org/post")
+        let builder = client
+            .post("http://httpbin.org/post")
             .header("foo", "bar")
             .body("from a &str!");
         let req = builder
@@ -670,14 +717,11 @@
     #[test]
     #[cfg(feature = "stream")]
     fn try_clone_stream() {
-        let chunks: Vec<Result<_, ::std::io::Error>> = vec![
-            Ok("hello"),
-            Ok(" "),
-            Ok("world"),
-        ];
+        let chunks: Vec<Result<_, ::std::io::Error>> = vec![Ok("hello"), Ok(" "), Ok("world")];
         let stream = futures_util::stream::iter(chunks);
         let client = Client::new();
-        let builder = client.get("http://httpbin.org/get")
+        let builder = client
+            .get("http://httpbin.org/get")
             .body(super::Body::wrap_stream(stream));
         let clone = builder.try_clone();
         assert!(clone.is_none());
@@ -688,13 +732,13 @@
         let client = Client::new();
         let some_url = "https://Aladdin:open sesame@localhost/";
 
-        let req = client
-            .get(some_url)
-            .build()
-            .expect("request build");
+        let req = client.get(some_url).build().expect("request build");
 
         assert_eq!(req.url().as_str(), "https://localhost/");
-        assert_eq!(req.headers()["authorization"], "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+        assert_eq!(
+            req.headers()["authorization"],
+            "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="
+        );
     }
 
     #[test]
@@ -709,7 +753,10 @@
             .expect("request build");
 
         assert_eq!(req.url().as_str(), "https://localhost/");
-        assert_eq!(req.headers()["authorization"], "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+        assert_eq!(
+            req.headers()["authorization"],
+            "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="
+        );
         assert_eq!(req.headers()["authorization"].is_sensitive(), true);
     }
 
@@ -729,13 +776,31 @@
         assert_eq!(req.headers()["authorization"].is_sensitive(), true);
     }
 
-    
-
     #[test]
     fn convert_from_http_request() {
-        let http_request = HttpRequest::builder().method("GET")
+        let http_request = HttpRequest::builder()
+            .method("GET")
+            .uri("http://localhost/")
+            .header("User-Agent", "my-awesome-agent/1.0")
+            .body("test test test")
+            .unwrap();
+        let req: Request = Request::try_from(http_request).unwrap();
+        assert_eq!(req.body().is_none(), false);
+        let test_data = b"test test test";
+        assert_eq!(req.body().unwrap().as_bytes(), Some(&test_data[..]));
+        let headers = req.headers();
+        assert_eq!(headers.get("User-Agent").unwrap(), "my-awesome-agent/1.0");
+        assert_eq!(req.method(), Method::GET);
+        assert_eq!(req.url().as_str(), "http://localhost/");
+    }
+
+    #[test]
+    fn set_http_request_version() {
+        let http_request = HttpRequest::builder()
+            .method("GET")
             .uri("http://localhost/")
             .header("User-Agent", "my-awesome-agent/1.0")
+            .version(Version::HTTP_11)
             .body("test test test")
             .unwrap();
         let req: Request = Request::try_from(http_request).unwrap();
@@ -746,6 +811,7 @@
         assert_eq!(headers.get("User-Agent").unwrap(), "my-awesome-agent/1.0");
         assert_eq!(req.method(), Method::GET);
         assert_eq!(req.url().as_str(), "http://localhost/");
+        assert_eq!(req.version(), Version::HTTP_11);
     }
 
     /*
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/response.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/response.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/async_impl/response.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/async_impl/response.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 use std::borrow::Cow;
 use std::fmt;
 use std::net::SocketAddr;
+use std::pin::Pin;
 
 use bytes::Bytes;
 use encoding_rs::{Encoding, UTF_8};
@@ -12,7 +13,7 @@
 use serde::de::DeserializeOwned;
 #[cfg(feature = "json")]
 use serde_json;
-use tokio::time::Delay;
+use tokio::time::Sleep;
 use url::Url;
 
 use super::body::Body;
@@ -37,7 +38,7 @@
         res: hyper::Response<hyper::Body>,
         url: Url,
         accepts: Accepts,
-        timeout: Option<Delay>,
+        timeout: Option<Pin<Box<Sleep>>>,
     ) -> Response {
         let (parts, body) = res.into_parts();
         let status = parts.status;
@@ -102,6 +103,7 @@
     ///
     /// This requires the optional `cookies` feature to be enabled.
     #[cfg(feature = "cookies")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
     pub fn cookies<'a>(&'a self) -> impl Iterator<Item = cookie::Cookie<'a>> + 'a {
         cookie::extract_response_cookies(&self.headers).filter_map(Result::ok)
     }
@@ -235,6 +237,7 @@
     ///
     /// [`serde_json::from_reader`]: https://docs.serde.rs/serde_json/fn.from_reader.html
     #[cfg(feature = "json")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     pub async fn json<T: DeserializeOwned>(self) -> crate::Result<T> {
         let full = self.bytes().await?;
 
@@ -307,6 +310,7 @@
     ///
     /// This requires the optional `stream` feature to be enabled.
     #[cfg(feature = "stream")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
     pub fn bytes_stream(self) -> impl futures_core::Stream<Item = crate::Result<Bytes>> {
         self.body
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/body.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/body.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/body.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/body.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,13 @@
 use std::fmt;
 use std::fs::File;
 use std::future::Future;
-use std::io::{self, Cursor, Read};
-use std::mem::{self, MaybeUninit};
+#[cfg(feature = "multipart")]
+use std::io::Cursor;
+use std::io::{self, Read};
+use std::mem;
 use std::ptr;
 
+use bytes::buf::UninitSlice;
 use bytes::Bytes;
 
 use crate::async_impl;
@@ -92,7 +95,7 @@
     /// Converts streamed requests to their buffered equivalent and
     /// returns a reference to the buffer. If the request is already
     /// buffered, this has no effect.
-    /// 
+    ///
     /// Be aware that for large requests this method is expensive
     /// and may cause your program to run out of memory.
     pub fn buffer(&mut self) -> Result<&[u8], crate::Error> {
@@ -103,15 +106,15 @@
                 } else {
                     Vec::new()
                 };
-                io::copy(reader, &mut bytes)
-                    .map_err(crate::error::builder)?;
+                io::copy(reader, &mut bytes).map_err(crate::error::builder)?;
                 self.kind = Kind::Bytes(bytes.into());
                 self.buffer()
-            },
+            }
             Kind::Bytes(ref bytes) => Ok(bytes.as_ref()),
         }
     }
 
+    #[cfg(feature = "multipart")]
     pub(crate) fn len(&self) -> Option<u64> {
         match self.kind {
             Kind::Reader(_, len) => len,
@@ -119,6 +122,7 @@
         }
     }
 
+    #[cfg(feature = "multipart")]
     pub(crate) fn into_reader(self) -> Reader {
         match self.kind {
             Kind::Reader(r, _) => Reader::Reader(r),
@@ -203,6 +207,14 @@
         }
     }
 }
+impl From<Bytes> for Body {
+    #[inline]
+    fn from(b: Bytes) -> Body {
+        Body {
+            kind: Kind::Bytes(b),
+        }
+    }
+}
 
 impl fmt::Debug for Kind {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -227,11 +239,13 @@
     }
 }
 
+#[cfg(feature = "multipart")]
 pub(crate) enum Reader {
     Reader(Box<dyn Read + Send>),
     Bytes(Cursor<Bytes>),
 }
 
+#[cfg(feature = "multipart")]
 impl Read for Reader {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         match *self {
@@ -281,15 +295,13 @@
             if buf.remaining_mut() == 0 {
                 buf.reserve(8192);
                 // zero out the reserved memory
+                let uninit = buf.chunk_mut();
                 unsafe {
-                    let uninit = mem::transmute::<&mut [MaybeUninit<u8>], &mut [u8]>(buf.bytes_mut());
                     ptr::write_bytes(uninit.as_mut_ptr(), 0, uninit.len());
                 }
             }
 
-            let bytes = unsafe {
-                mem::transmute::<&mut [MaybeUninit<u8>], &mut [u8]>(buf.bytes_mut())
-            };
+            let bytes = unsafe { mem::transmute::<&mut UninitSlice, &mut [u8]>(buf.chunk_mut()) };
             match body.read(bytes) {
                 Ok(0) => {
                     // The buffer was empty and nothing's left to
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,4 @@
-#[cfg(any(
-    feature = "native-tls",
-    feature = "__rustls",
-))]
+#[cfg(any(feature = "native-tls", feature = "__rustls",))]
 use std::any::Any;
 use std::convert::TryInto;
 use std::fmt;
@@ -18,9 +15,11 @@
 use super::request::{Request, RequestBuilder};
 use super::response::Response;
 use super::wait;
-use crate::{async_impl, header, IntoUrl, Method, Proxy, redirect};
 #[cfg(feature = "__tls")]
-use crate::{Certificate, Identity};
+use crate::Certificate;
+#[cfg(any(feature = "native-tls", feature = "__rustls"))]
+use crate::Identity;
+use crate::{async_impl, header, redirect, IntoUrl, Method, Proxy};
 
 /// A `Client` to make Requests with.
 ///
@@ -92,14 +91,17 @@
     ///
     /// This method fails if TLS backend cannot be initialized, or the resolver
     /// cannot load the system configuration.
+    ///
+    /// # Panics
+    ///
+    /// This method panics if called from within an async runtime. See docs on
+    /// [`reqwest::blocking`][crate::blocking] for details.
     pub fn build(self) -> crate::Result<Client> {
         ClientHandle::new(self).map(|handle| Client { inner: handle })
     }
 
-
     // Higher-level options
 
-
     /// Sets the `User-Agent` header to be used by this client.
     ///
     /// # Example
@@ -136,8 +138,14 @@
     /// use reqwest::header;
     /// # fn build_client() -> Result<(), reqwest::Error> {
     /// let mut headers = header::HeaderMap::new();
+    /// headers.insert("X-MY-HEADER", header::HeaderValue::from_static("value"));
     /// headers.insert(header::AUTHORIZATION, header::HeaderValue::from_static("secret"));
     ///
+    /// // Consider marking security-sensitive headers with `set_sensitive`.
+    /// let mut auth_value = header::HeaderValue::from_static("secret");
+    /// auth_value.set_sensitive(true);
+    /// headers.insert(header::AUTHORIZATION, auth_value);
+    ///
     /// // get a client builder
     /// let client = reqwest::blocking::Client::builder()
     ///     .default_headers(headers)
@@ -153,7 +161,7 @@
     /// use reqwest::header;
     /// # fn build_client() -> Result<(), reqwest::Error> {
     /// let mut headers = header::HeaderMap::new();
-    /// headers.insert(header::AUTHORIZATION, header::HeaderValue::from_static("secret"));
+    /// headers.insert("X-MY-HEADER", header::HeaderValue::from_static("value"));
     ///
     /// // get a client builder
     /// let client = reqwest::blocking::Client::builder()
@@ -161,7 +169,7 @@
     ///     .build()?;
     /// let res = client
     ///     .get("https://www.rust-lang.org")
-    ///     .header(header::AUTHORIZATION, "token")
+    ///     .header("X-MY-HEADER", "new_value")
     ///     .send()?;
     /// # Ok(())
     /// # }
@@ -181,10 +189,30 @@
     ///
     /// This requires the optional `cookies` feature to be enabled.
     #[cfg(feature = "cookies")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
     pub fn cookie_store(self, enable: bool) -> ClientBuilder {
         self.with_inner(|inner| inner.cookie_store(enable))
     }
 
+    /// Set the persistent cookie store for the client.
+    ///
+    /// Cookies received in responses will be passed to this store, and
+    /// additional requests will query this store for cookies.
+    ///
+    /// By default, no cookie store is used.
+    ///
+    /// # Optional
+    ///
+    /// This requires the optional `cookies` feature to be enabled.
+    #[cfg(feature = "cookies")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
+    pub fn cookie_provider<C: crate::cookie::CookieStore + 'static>(
+        self,
+        cookie_store: Arc<C>,
+    ) -> ClientBuilder {
+        self.with_inner(|inner| inner.cookie_provider(cookie_store))
+    }
+
     /// Enable auto gzip decompression by checking the `Content-Encoding` response header.
     ///
     /// If auto gzip decompresson is turned on:
@@ -202,6 +230,7 @@
     ///
     /// This requires the optional `gzip` feature to be enabled
     #[cfg(feature = "gzip")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "gzip")))]
     pub fn gzip(self, enable: bool) -> ClientBuilder {
         self.with_inner(|inner| inner.gzip(enable))
     }
@@ -223,7 +252,32 @@
     ///
     /// This requires the optional `brotli` feature to be enabled
     #[cfg(feature = "brotli")]
-    pub fn brotli(self, enable: bool) -> ClientBuilder { self.with_inner(|inner| inner.brotli(enable)) }
+    #[cfg_attr(docsrs, doc(cfg(feature = "brotli")))]
+    pub fn brotli(self, enable: bool) -> ClientBuilder {
+        self.with_inner(|inner| inner.brotli(enable))
+    }
+
+    /// Enable auto deflate decompression by checking the `Content-Encoding` response header.
+    ///
+    /// If auto deflate decompresson is turned on:
+    ///
+    /// - When sending a request and if the request's headers do not already contain
+    ///   an `Accept-Encoding` **and** `Range` values, the `Accept-Encoding` header is set to `deflate`.
+    ///   The request body is **not** automatically compressed.
+    /// - When receiving a response, if it's headers contain a `Content-Encoding` value that
+    ///   equals to `deflate`, both values `Content-Encoding` and `Content-Length` are removed from the
+    ///   headers' set. The response body is automatically decompressed.
+    ///
+    /// If the `deflate` feature is turned on, the default option is enabled.
+    ///
+    /// # Optional
+    ///
+    /// This requires the optional `deflate` feature to be enabled
+    #[cfg(feature = "deflate")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "deflate")))]
+    pub fn deflate(self, enable: bool) -> ClientBuilder {
+        self.with_inner(|inner| inner.deflate(enable))
+    }
 
     /// Disable auto response body gzip decompression.
     ///
@@ -239,7 +293,18 @@
     /// This method exists even if the optional `brotli` feature is not enabled.
     /// This can be used to ensure a `Client` doesn't use brotli decompression
     /// even if another dependency were to enable the optional `brotli` feature.
-    pub fn no_brotli(self) -> ClientBuilder { self.with_inner(|inner| inner.no_brotli()) }
+    pub fn no_brotli(self) -> ClientBuilder {
+        self.with_inner(|inner| inner.no_brotli())
+    }
+
+    /// Disable auto response body deflate decompression.
+    ///
+    /// This method exists even if the optional `deflate` feature is not enabled.
+    /// This can be used to ensure a `Client` doesn't use deflate decompression
+    /// even if another dependency were to enable the optional `deflate` feature.
+    pub fn no_deflate(self) -> ClientBuilder {
+        self.with_inner(|inner| inner.no_deflate())
+    }
 
     // Redirect options
 
@@ -275,12 +340,6 @@
         self.with_inner(move |inner| inner.no_proxy())
     }
 
-    #[doc(hidden)]
-    #[deprecated(note = "the system proxy is used automatically")]
-    pub fn use_sys_proxy(self) -> ClientBuilder {
-        self
-    }
-
     // Timeout options
 
     /// Set a timeout for connect, read and write operations of a `Client`.
@@ -340,12 +399,6 @@
         self.with_inner(move |inner| inner.pool_max_idle_per_host(max))
     }
 
-    #[doc(hidden)]
-    #[deprecated(note = "use pool_max_idle_per_host instead")]
-    pub fn max_idle_per_host(self, max: usize) -> ClientBuilder {
-        self.pool_max_idle_per_host(max)
-    }
-
     /// Enable case sensitive headers.
     pub fn http1_title_case_headers(self) -> ClientBuilder {
         self.with_inner(|inner| inner.http1_title_case_headers())
@@ -370,25 +423,28 @@
         self.with_inner(|inner| inner.http2_initial_connection_window_size(sz))
     }
 
-    // TCP options
+    /// Sets whether to use an adaptive flow control.
+    ///
+    /// Enabling this will override the limits set in `http2_initial_stream_window_size` and
+    /// `http2_initial_connection_window_size`.
+    pub fn http2_adaptive_window(self, enabled: bool) -> ClientBuilder {
+        self.with_inner(|inner| inner.http2_adaptive_window(enabled))
+    }
 
-    #[doc(hidden)]
-    #[deprecated(note = "tcp_nodelay is enabled by default, use `tcp_nodelay_` to disable")]
-    pub fn tcp_nodelay(self) -> ClientBuilder {
-        self.tcp_nodelay_(true)
+    /// Sets the maximum frame size to use for HTTP2.
+    ///
+    /// Default is currently 16,384 but may change internally to optimize for common uses.
+    pub fn http2_max_frame_size(self, sz: impl Into<Option<u32>>) -> ClientBuilder {
+        self.with_inner(|inner| inner.http2_max_frame_size(sz))
     }
 
+    // TCP options
+
     /// Set whether sockets have `SO_NODELAY` enabled.
     ///
     /// Default is `true`.
-    // NOTE: Regarding naming (trailing underscore):
-    //
-    // Due to the original `tcp_nodelay()` not taking an argument, changing
-    // the default means a user has no way of *disabling* this feature.
-    //
-    // TODO(v0.11.x): Remove trailing underscore.
-    pub fn tcp_nodelay_(self, enabled: bool) -> ClientBuilder {
-        self.with_inner(move |inner| inner.tcp_nodelay_(enabled))
+    pub fn tcp_nodelay(self, enabled: bool) -> ClientBuilder {
+        self.with_inner(move |inner| inner.tcp_nodelay(enabled))
     }
 
     /// Bind to a local IP Address.
@@ -413,8 +469,8 @@
     ///
     /// If `None`, the option will not be set.
     pub fn tcp_keepalive<D>(self, val: D) -> ClientBuilder
-        where
-            D: Into<Option<Duration>>,
+    where
+        D: Into<Option<Duration>>,
     {
         self.with_inner(move |inner| inner.tcp_keepalive(val))
     }
@@ -453,12 +509,47 @@
     /// This requires the optional `default-tls`, `native-tls`, or `rustls-tls(-...)`
     /// feature to be enabled.
     #[cfg(feature = "__tls")]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            feature = "default-tls",
+            feature = "native-tls",
+            feature = "rustls-tls"
+        )))
+    )]
     pub fn add_root_certificate(self, cert: Certificate) -> ClientBuilder {
         self.with_inner(move |inner| inner.add_root_certificate(cert))
     }
 
-    /// Sets the identity to be used for client certificate authentication.
+    /// Controls the use of built-in system certificates during certificate validation.
+    ///         
+    /// Defaults to `true` -- built-in system certs will be used.
+    ///
+    /// # Optional
+    ///
+    /// This requires the optional `default-tls`, `native-tls`, or `rustls-tls(-...)`
+    /// feature to be enabled.
     #[cfg(feature = "__tls")]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            feature = "default-tls",
+            feature = "native-tls",
+            feature = "rustls-tls"
+        )))
+    )]
+    pub fn tls_built_in_root_certs(self, tls_built_in_root_certs: bool) -> ClientBuilder {
+        self.with_inner(move |inner| inner.tls_built_in_root_certs(tls_built_in_root_certs))
+    }
+
+    /// Sets the identity to be used for client certificate authentication.
+    ///
+    /// # Optional
+    ///
+    /// This requires the optional `native-tls` or `rustls-tls(-...)` feature to be
+    /// enabled.
+    #[cfg(any(feature = "native-tls", feature = "__rustls"))]
+    #[cfg_attr(docsrs, doc(cfg(any(feature = "native-tls", feature = "rustls-tls"))))]
     pub fn identity(self, identity: Identity) -> ClientBuilder {
         self.with_inner(move |inner| inner.identity(identity))
     }
@@ -478,6 +569,7 @@
     ///
     /// This requires the optional `native-tls` feature to be enabled.
     #[cfg(feature = "native-tls")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "native-tls")))]
     pub fn danger_accept_invalid_hostnames(self, accept_invalid_hostname: bool) -> ClientBuilder {
         self.with_inner(|inner| inner.danger_accept_invalid_hostnames(accept_invalid_hostname))
     }
@@ -494,6 +586,14 @@
     /// introduces significant vulnerabilities, and should only be used
     /// as a last resort.
     #[cfg(feature = "__tls")]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(
+            feature = "default-tls",
+            feature = "native-tls",
+            feature = "rustls-tls"
+        )))
+    )]
     pub fn danger_accept_invalid_certs(self, accept_invalid_certs: bool) -> ClientBuilder {
         self.with_inner(|inner| inner.danger_accept_invalid_certs(accept_invalid_certs))
     }
@@ -507,6 +607,7 @@
     ///
     /// This requires the optional `native-tls` feature to be enabled.
     #[cfg(feature = "native-tls")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "native-tls")))]
     pub fn use_native_tls(self) -> ClientBuilder {
         self.with_inner(move |inner| inner.use_native_tls())
     }
@@ -520,6 +621,7 @@
     ///
     /// This requires the optional `rustls-tls(-...)` feature to be enabled.
     #[cfg(feature = "__rustls")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rustls-tls")))]
     pub fn use_rustls_tls(self) -> ClientBuilder {
         self.with_inner(move |inner| inner.use_rustls_tls())
     }
@@ -542,10 +644,8 @@
     ///
     /// This requires one of the optional features `native-tls` or
     /// `rustls-tls(-...)` to be enabled.
-    #[cfg(any(
-        feature = "native-tls",
-        feature = "__rustls",
-    ))]
+    #[cfg(any(feature = "native-tls", feature = "__rustls",))]
+    #[cfg_attr(docsrs, doc(cfg(any(feature = "native-tls", feature = "rustls-tls"))))]
     pub fn use_preconfigured_tls(self, tls: impl Any) -> ClientBuilder {
         self.with_inner(move |inner| inner.use_preconfigured_tls(tls))
     }
@@ -558,6 +658,7 @@
     ///
     /// This requires the optional `trust-dns` feature to be enabled
     #[cfg(feature = "trust-dns")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "trust-dns")))]
     pub fn trust_dns(self, enable: bool) -> ClientBuilder {
         self.with_inner(|inner| inner.trust_dns(enable))
     }
@@ -572,7 +673,7 @@
     }
 
     /// Restrict the Client to be used with HTTPS only requests.
-    /// 
+    ///
     /// Defaults to false.
     pub fn https_only(self, enabled: bool) -> ClientBuilder {
         self.with_inner(|inner| inner.https_only(enabled))
@@ -614,6 +715,9 @@
     ///
     /// Use `Client::builder()` if you wish to handle the failure as an `Error`
     /// instead of panicking.
+    ///
+    /// This method also panics if called from within an async runtime. See docs
+    /// on [`reqwest::blocking`][crate::blocking] for details.
     pub fn new() -> Client {
         ClientBuilder::new().build().expect("Client::new()")
     }
@@ -741,7 +845,8 @@
 
 impl Drop for InnerClientHandle {
     fn drop(&mut self) {
-        let id = self.thread
+        let id = self
+            .thread
             .as_ref()
             .map(|h| h.thread().id())
             .expect("thread not dropped yet");
@@ -764,7 +869,11 @@
             .name("reqwest-internal-sync-runtime".into())
             .spawn(move || {
                 use tokio::runtime;
-                let mut rt = match runtime::Builder::new().basic_scheduler().enable_all().build().map_err(crate::error::builder) {
+                let rt = match runtime::Builder::new_current_thread()
+                    .enable_all()
+                    .build()
+                    .map_err(crate::error::builder)
+                {
                     Err(e) => {
                         if let Err(e) = spawn_tx.send(Err(e)) {
                             error!("Failed to communicate runtime creation failure: {:?}", e);
@@ -846,9 +955,7 @@
                 };
                 wait::timeout(f, timeout)
             } else {
-                let f = async move {
-                    rx.await.map_err(|_canceled| event_loop_panicked())
-                };
+                let f = async move { rx.await.map_err(|_canceled| event_loop_panicked()) };
                 wait::timeout(f, timeout)
             };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,6 +3,13 @@
 //! The blocking `Client` will block the current thread to execute, instead
 //! of returning futures that need to be executed on a runtime.
 //!
+//! Conversely, the functionality in `reqwest::blocking` must *not* be executed
+//! within an async runtime, or it will panic when attempting to block. If
+//! calling directly from an async function, consider using an async
+//! [`reqwest::Client`][crate::Client] instead. If the immediate context is only
+//! synchronous, but a transitive caller is async, consider changing that caller
+//! to use [`tokio::task::spawn_blocking`] around the calls that need to block.
+//!
 //! # Optional
 //!
 //! This requires the optional `blocking` feature to be enabled.
@@ -59,6 +66,7 @@
 
 mod body;
 mod client;
+#[cfg(feature = "multipart")]
 pub mod multipart;
 mod request;
 mod response;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/multipart.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/multipart.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/multipart.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/multipart.rs	2021-12-09 12:01:26.000000000 +0000
@@ -392,8 +392,7 @@
             .part("key3", Part::text("value3").file_name("filename"));
         form.inner.boundary = "boundary".to_string();
         let length = form.compute_length();
-        let expected =
-            "--boundary\r\n\
+        let expected = "--boundary\r\n\
              Content-Disposition: form-data; name=\"reader1\"\r\n\r\n\
              \r\n\
              --boundary\r\n\
@@ -429,8 +428,7 @@
             .part("key3", Part::text("value3").file_name("filename"));
         form.inner.boundary = "boundary".to_string();
         let length = form.compute_length();
-        let expected =
-            "--boundary\r\n\
+        let expected = "--boundary\r\n\
              Content-Disposition: form-data; name=\"key1\"\r\n\r\n\
              value1\r\n\
              --boundary\r\n\
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/request.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/request.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/request.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/request.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,16 @@
-use std::fmt;
 use std::convert::TryFrom;
+use std::fmt;
 use std::time::Duration;
 
 use base64::encode;
-use http::{Request as HttpRequest, request::Parts};
+use http::{request::Parts, Request as HttpRequest, Version};
 use serde::Serialize;
 #[cfg(feature = "json")]
 use serde_json;
 use serde_urlencoded;
 
 use super::body::{self, Body};
+#[cfg(feature = "multipart")]
 use super::multipart;
 use super::Client;
 use crate::header::{HeaderMap, HeaderName, HeaderValue, CONTENT_TYPE};
@@ -77,6 +78,18 @@
         self.inner.headers_mut()
     }
 
+    /// Get the http version.
+    #[inline]
+    pub fn version(&self) -> Version {
+        self.inner.version()
+    }
+
+    /// Get a mutable reference to the http version.
+    #[inline]
+    pub fn version_mut(&mut self) -> &mut Version {
+        self.inner.version_mut()
+    }
+
     /// Get the body.
     #[inline]
     pub fn body(&self) -> Option<&Body> {
@@ -117,6 +130,7 @@
         };
         let mut req = Request::new(self.method().clone(), self.url().clone());
         *req.headers_mut() = self.headers().clone();
+        *req.version_mut() = self.version().clone();
         req.body = body;
         Some(req)
     }
@@ -393,6 +407,14 @@
         self
     }
 
+    /// Set HTTP version
+    pub fn version(mut self, version: Version) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            *req.version_mut() = version;
+        }
+        self
+    }
+
     /// Send a form body.
     ///
     /// Sets the body to the url encoded serialization of the passed value,
@@ -471,6 +493,7 @@
     /// Serialization can fail if `T`'s implementation of `Serialize` decides to
     /// fail, or if `T` contains a map with non-string keys.
     #[cfg(feature = "json")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     pub fn json<T: Serialize + ?Sized>(mut self, json: &T) -> RequestBuilder {
         let mut error = None;
         if let Ok(ref mut req) = self.request {
@@ -508,6 +531,8 @@
     /// ```
     ///
     /// See [`multipart`](multipart/) for more examples.
+    #[cfg(feature = "multipart")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "multipart")))]
     pub fn multipart(self, mut multipart: multipart::Form) -> RequestBuilder {
         let mut builder = self.header(
             CONTENT_TYPE,
@@ -594,7 +619,10 @@
     }
 }
 
-impl<T> TryFrom<HttpRequest<T>> for Request where T:Into<Body> {
+impl<T> TryFrom<HttpRequest<T>> for Request
+where
+    T: Into<Body>,
+{
     type Error = crate::Error;
 
     fn try_from(req: HttpRequest<T>) -> crate::Result<Self> {
@@ -605,8 +633,7 @@
             headers,
             ..
         } = parts;
-        let url = Url::parse(&uri.to_string())
-            .map_err(crate::error::builder)?;
+        let url = Url::parse(&uri.to_string()).map_err(crate::error::builder)?;
         let mut inner = async_impl::Request::new(method, url);
         crate::util::replace_headers(inner.headers_mut(), headers);
         Ok(Request {
@@ -633,8 +660,8 @@
 
 #[cfg(test)]
 mod tests {
-    use super::{HttpRequest, Request};
     use super::super::{body, Client};
+    use super::{HttpRequest, Request, Version};
     use crate::header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE, HOST};
     use crate::Method;
     use serde::Serialize;
@@ -955,20 +982,40 @@
         let client = Client::new();
         let some_url = "https://Aladdin:open sesame@localhost/";
 
-        let req = client
-            .get(some_url)
-            .build()
-            .expect("request build");
+        let req = client.get(some_url).build().expect("request build");
 
         assert_eq!(req.url().as_str(), "https://localhost/");
-        assert_eq!(req.headers()["authorization"], "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+        assert_eq!(
+            req.headers()["authorization"],
+            "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="
+        );
     }
 
     #[test]
     fn convert_from_http_request() {
-        let http_request = HttpRequest::builder().method("GET")
+        let http_request = HttpRequest::builder()
+            .method("GET")
+            .uri("http://localhost/")
+            .header("User-Agent", "my-awesome-agent/1.0")
+            .body("test test test")
+            .unwrap();
+        let req: Request = Request::try_from(http_request).unwrap();
+        assert_eq!(req.body().is_none(), false);
+        let test_data = b"test test test";
+        assert_eq!(req.body().unwrap().as_bytes(), Some(&test_data[..]));
+        let headers = req.headers();
+        assert_eq!(headers.get("User-Agent").unwrap(), "my-awesome-agent/1.0");
+        assert_eq!(req.method(), Method::GET);
+        assert_eq!(req.url().as_str(), "http://localhost/");
+    }
+
+    #[test]
+    fn set_http_request_version() {
+        let http_request = HttpRequest::builder()
+            .method("GET")
             .uri("http://localhost/")
             .header("User-Agent", "my-awesome-agent/1.0")
+            .version(Version::HTTP_11)
             .body("test test test")
             .unwrap();
         let req: Request = Request::try_from(http_request).unwrap();
@@ -979,6 +1026,7 @@
         assert_eq!(headers.get("User-Agent").unwrap(), "my-awesome-agent/1.0");
         assert_eq!(req.method(), Method::GET);
         assert_eq!(req.url().as_str(), "http://localhost/");
+        assert_eq!(req.version(), Version::HTTP_11);
     }
 
     #[test]
@@ -993,7 +1041,10 @@
             .expect("request build");
 
         assert_eq!(req.url().as_str(), "https://localhost/");
-        assert_eq!(req.headers()["authorization"], "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+        assert_eq!(
+            req.headers()["authorization"],
+            "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="
+        );
         assert_eq!(req.headers()["authorization"].is_sensitive(), true);
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/response.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/response.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/response.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/response.rs	2021-12-09 12:01:26.000000000 +0000
@@ -136,6 +136,7 @@
     ///
     /// This requires the optional `cookies` feature to be enabled.
     #[cfg(feature = "cookies")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
     pub fn cookies<'a>(&'a self) -> impl Iterator<Item = cookie::Cookie<'a>> + 'a {
         cookie::extract_response_cookies(self.headers()).filter_map(Result::ok)
     }
@@ -225,6 +226,7 @@
     ///
     /// [`serde_json::from_reader`]: https://docs.serde.rs/serde_json/fn.from_reader.html
     #[cfg(feature = "json")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     pub fn json<T: DeserializeOwned>(self) -> crate::Result<T> {
         wait::timeout(self.inner.json(), self.timeout).map_err(|e| match e {
             wait::Waited::TimedOut(e) => crate::error::decode(e),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/wait.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/wait.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/blocking/wait.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/blocking/wait.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,6 @@
 
 use tokio::time::Instant;
 
-
 pub(crate) fn timeout<F, I, E>(fut: F, timeout: Option<Duration>) -> Result<I, Waited<E>>
 where
     F: Future<Output = Result<I, E>>,
@@ -40,7 +39,11 @@
                 return Err(Waited::TimedOut(crate::error::TimedOut));
             }
 
-            log::trace!("({:?}) park timeout {:?}", thread::current().id(), deadline - now);
+            log::trace!(
+                "({:?}) park timeout {:?}",
+                thread::current().id(),
+                deadline - now
+            );
             thread::park_timeout(deadline - now);
         } else {
             log::trace!("({:?}) park without timeout", thread::current().id());
@@ -67,10 +70,9 @@
     // Check we aren't already in a runtime
     #[cfg(debug_assertions)]
     {
-        tokio::runtime::Builder::new()
-            .core_threads(1)
+        let _enter = tokio::runtime::Builder::new_current_thread()
             .build()
             .expect("build shell runtime")
-            .enter(|| {});
+            .enter();
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/connect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/connect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/connect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/connect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,39 +1,44 @@
-use hyper::service::Service;
-use http::uri::{Scheme, Authority};
+use futures_util::future::Either;
+#[cfg(feature = "__tls")]
+use http::header::HeaderValue;
+use http::uri::{Authority, Scheme};
 use http::Uri;
-use hyper::client::connect::{Connected, Connection};
-use tokio::io::{AsyncRead, AsyncWrite};
+use hyper::client::connect::{
+    dns::{GaiResolver, Name},
+    Connected, Connection,
+};
+use hyper::service::Service;
 #[cfg(feature = "native-tls-crate")]
 use native_tls_crate::{TlsConnector, TlsConnectorBuilder};
-#[cfg(feature = "__tls")]
-use http::header::HeaderValue;
-use futures_util::future::Either;
-use bytes::{Buf, BufMut};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
-use std::future::Future;
-use std::io;
+use pin_project_lite::pin_project;
+use std::io::IoSlice;
 use std::net::IpAddr;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 use std::time::Duration;
-use std::mem::MaybeUninit;
-use pin_project_lite::pin_project;
+use std::{collections::HashMap, io};
+use std::{future::Future, net::SocketAddr};
 
-#[cfg(feature = "trust-dns")]
-use crate::dns::TrustDnsResolver;
-use crate::proxy::{Proxy, ProxyScheme};
-use crate::error::BoxError;
 #[cfg(feature = "default-tls")]
 use self::native_tls_conn::NativeTlsConn;
 #[cfg(feature = "__rustls")]
 use self::rustls_tls_conn::RustlsTlsConn;
+#[cfg(feature = "trust-dns")]
+use crate::dns::TrustDnsResolver;
+use crate::error::BoxError;
+use crate::proxy::{Proxy, ProxyScheme};
 
 #[derive(Clone)]
 pub(crate) enum HttpConnector {
     Gai(hyper::client::HttpConnector),
+    GaiWithDnsOverrides(hyper::client::HttpConnector<DnsResolverWithOverrides<GaiResolver>>),
     #[cfg(feature = "trust-dns")]
     TrustDns(hyper::client::HttpConnector<TrustDnsResolver>),
+    #[cfg(feature = "trust-dns")]
+    TrustDnsWithOverrides(hyper::client::HttpConnector<DnsResolverWithOverrides<TrustDnsResolver>>),
 }
 
 impl HttpConnector {
@@ -41,6 +46,14 @@
         Self::Gai(hyper::client::HttpConnector::new())
     }
 
+    pub(crate) fn new_gai_with_overrides(overrides: HashMap<String, SocketAddr>) -> Self {
+        let gai = hyper::client::connect::dns::GaiResolver::new();
+        let overridden_resolver = DnsResolverWithOverrides::new(gai, overrides);
+        Self::GaiWithDnsOverrides(hyper::client::HttpConnector::new_with_resolver(
+            overridden_resolver,
+        ))
+    }
+
     #[cfg(feature = "trust-dns")]
     pub(crate) fn new_trust_dns() -> crate::Result<HttpConnector> {
         TrustDnsResolver::new()
@@ -48,6 +61,17 @@
             .map(Self::TrustDns)
             .map_err(crate::error::builder)
     }
+
+    #[cfg(feature = "trust-dns")]
+    pub(crate) fn new_trust_dns_with_overrides(
+        overrides: HashMap<String, SocketAddr>,
+    ) -> crate::Result<HttpConnector> {
+        TrustDnsResolver::new()
+            .map(|resolver| DnsResolverWithOverrides::new(resolver, overrides))
+            .map(hyper::client::HttpConnector::new_with_resolver)
+            .map(Self::TrustDnsWithOverrides)
+            .map_err(crate::error::builder)
+    }
 }
 
 macro_rules! impl_http_connector {
@@ -58,8 +82,11 @@
                 fn $name(&mut self, $($par_name: $par_type),*)$( -> $return)? {
                     match self {
                         Self::Gai(resolver) => resolver.$name($($par_name),*),
+                        Self::GaiWithDnsOverrides(resolver) => resolver.$name($($par_name),*),
                         #[cfg(feature = "trust-dns")]
                         Self::TrustDns(resolver) => resolver.$name($($par_name),*),
+                        #[cfg(feature = "trust-dns")]
+                        Self::TrustDnsWithOverrides(resolver) => resolver.$name($($par_name),*),
                     }
                 }
             )+
@@ -78,29 +105,55 @@
     type Response = <hyper::client::HttpConnector as Service<Uri>>::Response;
     type Error = <hyper::client::HttpConnector as Service<Uri>>::Error;
     #[cfg(feature = "trust-dns")]
-    type Future = Either<
-        <hyper::client::HttpConnector as Service<Uri>>::Future,
-        <hyper::client::HttpConnector<TrustDnsResolver> as Service<Uri>>::Future,
-    >;
+    type Future =
+        Either<
+            Either<
+                <hyper::client::HttpConnector as Service<Uri>>::Future,
+                <hyper::client::HttpConnector<DnsResolverWithOverrides<GaiResolver>> as Service<
+                    Uri,
+                >>::Future,
+            >,
+            Either<
+                    <hyper::client::HttpConnector<TrustDnsResolver> as Service<Uri>>::Future,
+                <hyper::client::HttpConnector<DnsResolverWithOverrides<TrustDnsResolver>> as Service<Uri>>::Future
+                 >
+        >;
     #[cfg(not(feature = "trust-dns"))]
-    type Future = Either<
-        <hyper::client::HttpConnector as Service<Uri>>::Future,
-        <hyper::client::HttpConnector as Service<Uri>>::Future,
-    >;
+    type Future =
+        Either<
+            Either<
+                <hyper::client::HttpConnector as Service<Uri>>::Future,
+                <hyper::client::HttpConnector<DnsResolverWithOverrides<GaiResolver>> as Service<
+                    Uri,
+                >>::Future,
+            >,
+            Either<
+                <hyper::client::HttpConnector as Service<Uri>>::Future,
+                <hyper::client::HttpConnector as Service<Uri>>::Future,
+            >,
+        >;
 
     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         match self {
             Self::Gai(resolver) => resolver.poll_ready(cx),
+            Self::GaiWithDnsOverrides(resolver) => resolver.poll_ready(cx),
             #[cfg(feature = "trust-dns")]
             Self::TrustDns(resolver) => resolver.poll_ready(cx),
+            #[cfg(feature = "trust-dns")]
+            Self::TrustDnsWithOverrides(resolver) => resolver.poll_ready(cx),
         }
     }
 
     fn call(&mut self, dst: Uri) -> Self::Future {
         match self {
-            Self::Gai(resolver) => Either::Left(resolver.call(dst)),
+            Self::Gai(resolver) => Either::Left(Either::Left(resolver.call(dst))),
+            Self::GaiWithDnsOverrides(resolver) => Either::Left(Either::Right(resolver.call(dst))),
+            #[cfg(feature = "trust-dns")]
+            Self::TrustDns(resolver) => Either::Right(Either::Left(resolver.call(dst))),
             #[cfg(feature = "trust-dns")]
-            Self::TrustDns(resolver) => Either::Right(resolver.call(dst)),
+            Self::TrustDnsWithOverrides(resolver) => {
+                Either::Right(Either::Right(resolver.call(dst)))
+            }
         }
     }
 }
@@ -166,25 +219,21 @@
     {
         let tls = tls.build().map_err(crate::error::builder)?;
         Ok(Self::from_built_default_tls(
-            http,
-            tls,
-            proxies,
-            user_agent,
-            local_addr,
-            nodelay,
+            http, tls, proxies, user_agent, local_addr, nodelay,
         ))
     }
 
     #[cfg(feature = "default-tls")]
-    pub(crate) fn from_built_default_tls<T> (
+    pub(crate) fn from_built_default_tls<T>(
         mut http: HttpConnector,
         tls: TlsConnector,
         proxies: Arc<Vec<Proxy>>,
         user_agent: Option<HeaderValue>,
         local_addr: T,
-        nodelay: bool) -> Connector
-        where
-            T: Into<Option<IpAddr>>,
+        nodelay: bool,
+    ) -> Connector
+    where
+        T: Into<Option<IpAddr>>,
     {
         http.set_local_address(local_addr.into());
         http.enforce_http(false);
@@ -246,11 +295,7 @@
     }
 
     #[cfg(feature = "socks")]
-    async fn connect_socks(
-        &self,
-        dst: Uri,
-        proxy: ProxyScheme,
-    ) -> Result<Conn, BoxError> {
+    async fn connect_socks(&self, dst: Uri, proxy: ProxyScheme) -> Result<Conn, BoxError> {
         let dns = match proxy {
             ProxyScheme::Socks5 {
                 remote_dns: false, ..
@@ -260,22 +305,17 @@
             } => socks::DnsResolve::Proxy,
             ProxyScheme::Http { .. } | ProxyScheme::Https { .. } => {
                 unreachable!("connect_socks is only called for socks proxies");
-            },
+            }
         };
 
         match &self.inner {
             #[cfg(feature = "default-tls")]
             Inner::DefaultTls(_http, tls) => {
                 if dst.scheme() == Some(&Scheme::HTTPS) {
-                    let host = dst
-                        .host()
-                        .ok_or("no host in url")?
-                        .to_string();
+                    let host = dst.host().ok_or("no host in url")?.to_string();
                     let conn = socks::connect(proxy, dst, dns).await?;
-                    let tls_connector = tokio_tls::TlsConnector::from(tls.clone());
-                    let io = tls_connector
-                        .connect(&host, conn)
-                        .await?;
+                    let tls_connector = tokio_native_tls::TlsConnector::from(tls.clone());
+                    let io = tls_connector.connect(&host, conn).await?;
                     return Ok(Conn {
                         inner: self.verbose.wrap(NativeTlsConn { inner: io }),
                         is_proxy: false,
@@ -289,10 +329,7 @@
                     use tokio_rustls::TlsConnector as RustlsConnector;
 
                     let tls = tls_proxy.clone();
-                    let host = dst
-                        .host()
-                        .ok_or("no host in url")?
-                        .to_string();
+                    let host = dst.host().ok_or("no host in url")?.to_string();
                     let conn = socks::connect(proxy, dst, dns).await?;
                     let dnsname = DNSNameRef::try_from_ascii_str(&host)
                         .map(|dnsname| dnsname.to_owned())
@@ -307,7 +344,7 @@
                 }
             }
             #[cfg(not(feature = "__tls"))]
-            Inner::Http(_) => ()
+            Inner::Http(_) => (),
         }
 
         socks::connect(proxy, dst, dns).await.map(|tcp| Conn {
@@ -316,11 +353,7 @@
         })
     }
 
-    async fn connect_with_maybe_proxy(
-        self,
-        dst: Uri,
-        is_proxy: bool,
-    ) -> Result<Conn, BoxError> {
+    async fn connect_with_maybe_proxy(self, dst: Uri, is_proxy: bool) -> Result<Conn, BoxError> {
         match self.inner {
             #[cfg(not(feature = "__tls"))]
             Inner::Http(mut http) => {
@@ -334,7 +367,6 @@
             Inner::DefaultTls(http, tls) => {
                 let mut http = http.clone();
 
-
                 // Disable Nagle's algorithm for TLS handshake
                 //
                 // https://www.openssl.org/docs/man1.1.1/man3/SSL_connect.html#NOTES
@@ -342,20 +374,24 @@
                     http.set_nodelay(true);
                 }
 
-                let tls_connector = tokio_tls::TlsConnector::from(tls.clone());
+                let tls_connector = tokio_native_tls::TlsConnector::from(tls.clone());
                 let mut http = hyper_tls::HttpsConnector::from((http, tls_connector));
                 let io = http.call(dst).await?;
 
-                if let hyper_tls::MaybeHttpsStream::Https(stream) = &io {
+                if let hyper_tls::MaybeHttpsStream::Https(stream) = io {
                     if !self.nodelay {
-                        stream.get_ref().set_nodelay(false)?;
+                        stream.get_ref().get_ref().get_ref().set_nodelay(false)?;
                     }
+                    Ok(Conn {
+                        inner: self.verbose.wrap(NativeTlsConn { inner: stream }),
+                        is_proxy,
+                    })
+                } else {
+                    Ok(Conn {
+                        inner: self.verbose.wrap(io),
+                        is_proxy,
+                    })
                 }
-
-                Ok(Conn {
-                    inner: self.verbose.wrap(io),
-                    is_proxy,
-                })
             }
             #[cfg(feature = "__rustls")]
             Inner::RustlsTls { http, tls, .. } => {
@@ -371,17 +407,21 @@
                 let mut http = hyper_rustls::HttpsConnector::from((http, tls.clone()));
                 let io = http.call(dst).await?;
 
-                if let hyper_rustls::MaybeHttpsStream::Https(stream) = &io {
+                if let hyper_rustls::MaybeHttpsStream::Https(stream) = io {
                     if !self.nodelay {
                         let (io, _) = stream.get_ref();
                         io.set_nodelay(false)?;
                     }
+                    Ok(Conn {
+                        inner: self.verbose.wrap(RustlsTlsConn { inner: stream }),
+                        is_proxy,
+                    })
+                } else {
+                    Ok(Conn {
+                        inner: self.verbose.wrap(io),
+                        is_proxy,
+                    })
                 }
-
-                Ok(Conn {
-                    inner: self.verbose.wrap(io),
-                    is_proxy,
-                })
             }
         }
     }
@@ -400,7 +440,6 @@
             ProxyScheme::Socks5 { .. } => return self.connect_socks(dst, proxy_scheme).await,
         };
 
-
         #[cfg(feature = "__tls")]
         let auth = _auth;
 
@@ -411,20 +450,19 @@
                     let host = dst.host().to_owned();
                     let port = dst.port().map(|p| p.as_u16()).unwrap_or(443);
                     let http = http.clone();
-                    let tls_connector = tokio_tls::TlsConnector::from(tls.clone());
+                    let tls_connector = tokio_native_tls::TlsConnector::from(tls.clone());
                     let mut http = hyper_tls::HttpsConnector::from((http, tls_connector));
                     let conn = http.call(proxy_dst).await?;
                     log::trace!("tunneling HTTPS over proxy");
                     let tunneled = tunnel(
                         conn,
-                        host
-                            .ok_or("no host in url")?
-                            .to_string(),
+                        host.ok_or("no host in url")?.to_string(),
                         port,
                         self.user_agent.clone(),
-                        auth
-                    ).await?;
-                    let tls_connector = tokio_tls::TlsConnector::from(tls.clone());
+                        auth,
+                    )
+                    .await?;
+                    let tls_connector = tokio_native_tls::TlsConnector::from(tls.clone());
                     let io = tls_connector
                         .connect(&host.ok_or("no host in url")?, tunneled)
                         .await?;
@@ -444,10 +482,7 @@
                     use tokio_rustls::webpki::DNSNameRef;
                     use tokio_rustls::TlsConnector as RustlsConnector;
 
-                    let host = dst
-                        .host()
-                        .ok_or("no host in url")?
-                        .to_string();
+                    let host = dst.host().ok_or("no host in url")?.to_string();
                     let port = dst.port().map(|r| r.as_u16()).unwrap_or(443);
                     let http = http.clone();
                     let mut http = hyper_rustls::HttpsConnector::from((http, tls_proxy.clone()));
@@ -541,7 +576,10 @@
     }
 }
 
-pub(crate) trait AsyncConn: AsyncRead + AsyncWrite + Connection + Send + Sync + Unpin + 'static {}
+pub(crate) trait AsyncConn:
+    AsyncRead + AsyncWrite + Connection + Send + Sync + Unpin + 'static
+{
+}
 
 impl<T: AsyncRead + AsyncWrite + Connection + Send + Sync + Unpin + 'static> AsyncConn for T {}
 
@@ -569,68 +607,48 @@
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context,
-        buf: &mut [u8]
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         let this = self.project();
         AsyncRead::poll_read(this.inner, cx, buf)
     }
-
-    unsafe fn prepare_uninitialized_buffer(
-        &self,
-        buf: &mut [MaybeUninit<u8>]
-    ) -> bool {
-        self.inner.prepare_uninitialized_buffer(buf)
-    }
-
-    fn poll_read_buf<B: BufMut>(
-        self: Pin<&mut Self>,
-        cx: &mut Context,
-        buf: &mut B
-    ) -> Poll<io::Result<usize>>
-        where
-            Self: Sized
-    {
-        let this = self.project();
-        AsyncRead::poll_read_buf(this.inner, cx, buf)
-    }
 }
 
 impl AsyncWrite for Conn {
     fn poll_write(
         self: Pin<&mut Self>,
         cx: &mut Context,
-        buf: &[u8]
+        buf: &[u8],
     ) -> Poll<Result<usize, io::Error>> {
         let this = self.project();
         AsyncWrite::poll_write(this.inner, cx, buf)
     }
 
-    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<Result<usize, io::Error>> {
         let this = self.project();
-        AsyncWrite::poll_flush(this.inner, cx)
+        AsyncWrite::poll_write_vectored(this.inner, cx, bufs)
     }
 
-    fn poll_shutdown(
-        self: Pin<&mut Self>,
-        cx: &mut Context
-    ) -> Poll<Result<(), io::Error>> {
+    fn is_write_vectored(&self) -> bool {
+        self.inner.is_write_vectored()
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
         let this = self.project();
-        AsyncWrite::poll_shutdown(this.inner, cx)
+        AsyncWrite::poll_flush(this.inner, cx)
     }
 
-    fn poll_write_buf<B: Buf>(
-        self: Pin<&mut Self>,
-        cx: &mut Context,
-        buf: &mut B
-    ) -> Poll<Result<usize, io::Error>> where
-        Self: Sized {
+    fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
         let this = self.project();
-        AsyncWrite::poll_write_buf(this.inner, cx, buf)
+        AsyncWrite::poll_shutdown(this.inner, cx)
     }
 }
 
-pub(crate) type Connecting =
-    Pin<Box<dyn Future<Output = Result<Conn, BoxError>> + Send>>;
+pub(crate) type Connecting = Pin<Box<dyn Future<Output = Result<Conn, BoxError>> + Send>>;
 
 #[cfg(feature = "__tls")]
 async fn tunnel<T>(
@@ -654,7 +672,6 @@
     )
     .into_bytes();
 
-
     // user-agent
     if let Some(user_agent) = user_agent {
         buf.extend_from_slice(b"User-Agent: ");
@@ -662,7 +679,6 @@
         buf.extend_from_slice(b"\r\n");
     }
 
-
     // proxy-authorization
     if let Some(value) = auth {
         log::debug!("tunnel to {}:{} using basic auth", host, port);
@@ -693,15 +709,11 @@
                 return Ok(conn);
             }
             if pos == buf.len() {
-                return Err(
-                    "proxy headers too long for tunnel".into()
-                );
+                return Err("proxy headers too long for tunnel".into());
             }
         // else read more
         } else if recvd.starts_with(b"HTTP/1.1 407") {
-            return Err(
-                "proxy authentication required".into()
-            );
+            return Err("proxy authentication required".into());
         } else {
             return Err("unsuccessful tunnel".into());
         }
@@ -715,14 +727,15 @@
 
 #[cfg(feature = "default-tls")]
 mod native_tls_conn {
-    use std::mem::MaybeUninit;
-    use std::{pin::Pin, task::{Context, Poll}};
-    use bytes::{Buf, BufMut};
     use hyper::client::connect::{Connected, Connection};
     use pin_project_lite::pin_project;
-    use tokio::io::{AsyncRead, AsyncWrite};
-    use tokio_tls::TlsStream;
-
+    use std::{
+        io::{self, IoSlice},
+        pin::Pin,
+        task::{Context, Poll},
+    };
+    use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+    use tokio_native_tls::TlsStream;
 
     pin_project! {
         pub(super) struct NativeTlsConn<T> {
@@ -731,8 +744,23 @@
     }
 
     impl<T: Connection + AsyncRead + AsyncWrite + Unpin> Connection for NativeTlsConn<T> {
+        #[cfg(feature = "native-tls-alpn")]
+        fn connected(&self) -> Connected {
+            match self.inner.get_ref().negotiated_alpn().ok() {
+                Some(Some(alpn_protocol)) if alpn_protocol == b"h2" => self
+                    .inner
+                    .get_ref()
+                    .get_ref()
+                    .get_ref()
+                    .connected()
+                    .negotiated_h2(),
+                _ => self.inner.get_ref().get_ref().get_ref().connected(),
+            }
+        }
+
+        #[cfg(not(feature = "native-tls-alpn"))]
         fn connected(&self) -> Connected {
-            self.inner.get_ref().connected()
+            self.inner.get_ref().get_ref().get_ref().connected()
         }
     }
 
@@ -740,79 +768,67 @@
         fn poll_read(
             self: Pin<&mut Self>,
             cx: &mut Context,
-            buf: &mut [u8]
-        ) -> Poll<tokio::io::Result<usize>> {
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<tokio::io::Result<()>> {
             let this = self.project();
             AsyncRead::poll_read(this.inner, cx, buf)
         }
-
-        unsafe fn prepare_uninitialized_buffer(
-            &self,
-            buf: &mut [MaybeUninit<u8>]
-        ) -> bool {
-            self.inner.prepare_uninitialized_buffer(buf)
-        }
-
-        fn poll_read_buf<B: BufMut>(
-            self: Pin<&mut Self>,
-            cx: &mut Context,
-            buf: &mut B
-        ) -> Poll<tokio::io::Result<usize>>
-            where
-                Self: Sized
-        {
-            let this = self.project();
-            AsyncRead::poll_read_buf(this.inner, cx, buf)
-        }
     }
 
     impl<T: AsyncRead + AsyncWrite + Unpin> AsyncWrite for NativeTlsConn<T> {
         fn poll_write(
             self: Pin<&mut Self>,
             cx: &mut Context,
-            buf: &[u8]
+            buf: &[u8],
         ) -> Poll<Result<usize, tokio::io::Error>> {
             let this = self.project();
             AsyncWrite::poll_write(this.inner, cx, buf)
         }
 
-        fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), tokio::io::Error>> {
+        fn poll_write_vectored(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            bufs: &[IoSlice<'_>],
+        ) -> Poll<Result<usize, io::Error>> {
             let this = self.project();
-            AsyncWrite::poll_flush(this.inner, cx)
+            AsyncWrite::poll_write_vectored(this.inner, cx, bufs)
         }
 
-        fn poll_shutdown(
+        fn is_write_vectored(&self) -> bool {
+            self.inner.is_write_vectored()
+        }
+
+        fn poll_flush(
             self: Pin<&mut Self>,
-            cx: &mut Context
+            cx: &mut Context,
         ) -> Poll<Result<(), tokio::io::Error>> {
             let this = self.project();
-            AsyncWrite::poll_shutdown(this.inner, cx)
+            AsyncWrite::poll_flush(this.inner, cx)
         }
 
-        fn poll_write_buf<B: Buf>(
+        fn poll_shutdown(
             self: Pin<&mut Self>,
             cx: &mut Context,
-            buf: &mut B
-        ) -> Poll<Result<usize, tokio::io::Error>> where
-            Self: Sized {
+        ) -> Poll<Result<(), tokio::io::Error>> {
             let this = self.project();
-            AsyncWrite::poll_write_buf(this.inner, cx, buf)
+            AsyncWrite::poll_shutdown(this.inner, cx)
         }
     }
 }
 
 #[cfg(feature = "__rustls")]
 mod rustls_tls_conn {
-    use rustls::Session;
-    use std::mem::MaybeUninit;
-    use std::{pin::Pin, task::{Context, Poll}};
-    use bytes::{Buf, BufMut};
     use hyper::client::connect::{Connected, Connection};
     use pin_project_lite::pin_project;
-    use tokio::io::{AsyncRead, AsyncWrite};
+    use rustls::Session;
+    use std::{
+        io::{self, IoSlice},
+        pin::Pin,
+        task::{Context, Poll},
+    };
+    use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
     use tokio_rustls::client::TlsStream;
 
-
     pin_project! {
         pub(super) struct RustlsTlsConn<T> {
             #[pin] pub(super) inner: TlsStream<T>,
@@ -833,63 +849,50 @@
         fn poll_read(
             self: Pin<&mut Self>,
             cx: &mut Context,
-            buf: &mut [u8]
-        ) -> Poll<tokio::io::Result<usize>> {
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<tokio::io::Result<()>> {
             let this = self.project();
             AsyncRead::poll_read(this.inner, cx, buf)
         }
-
-        unsafe fn prepare_uninitialized_buffer(
-            &self,
-            buf: &mut [MaybeUninit<u8>]
-        ) -> bool {
-            self.inner.prepare_uninitialized_buffer(buf)
-        }
-
-        fn poll_read_buf<B: BufMut>(
-            self: Pin<&mut Self>,
-            cx: &mut Context,
-            buf: &mut B
-        ) -> Poll<tokio::io::Result<usize>>
-            where
-                Self: Sized
-        {
-            let this = self.project();
-            AsyncRead::poll_read_buf(this.inner, cx, buf)
-        }
     }
 
     impl<T: AsyncRead + AsyncWrite + Unpin> AsyncWrite for RustlsTlsConn<T> {
         fn poll_write(
             self: Pin<&mut Self>,
             cx: &mut Context,
-            buf: &[u8]
+            buf: &[u8],
         ) -> Poll<Result<usize, tokio::io::Error>> {
             let this = self.project();
             AsyncWrite::poll_write(this.inner, cx, buf)
         }
 
-        fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), tokio::io::Error>> {
+        fn poll_write_vectored(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            bufs: &[IoSlice<'_>],
+        ) -> Poll<Result<usize, io::Error>> {
             let this = self.project();
-            AsyncWrite::poll_flush(this.inner, cx)
+            AsyncWrite::poll_write_vectored(this.inner, cx, bufs)
         }
 
-        fn poll_shutdown(
+        fn is_write_vectored(&self) -> bool {
+            self.inner.is_write_vectored()
+        }
+
+        fn poll_flush(
             self: Pin<&mut Self>,
-            cx: &mut Context
+            cx: &mut Context,
         ) -> Poll<Result<(), tokio::io::Error>> {
             let this = self.project();
-            AsyncWrite::poll_shutdown(this.inner, cx)
+            AsyncWrite::poll_flush(this.inner, cx)
         }
 
-        fn poll_write_buf<B: Buf>(
+        fn poll_shutdown(
             self: Pin<&mut Self>,
             cx: &mut Context,
-            buf: &mut B
-        ) -> Poll<Result<usize, tokio::io::Error>> where
-            Self: Sized {
+        ) -> Poll<Result<(), tokio::io::Error>> {
             let this = self.project();
-            AsyncWrite::poll_write_buf(this.inner, cx, buf)
+            AsyncWrite::poll_shutdown(this.inner, cx)
         }
     }
 }
@@ -959,12 +962,110 @@
     }
 }
 
+pub(crate) mod itertools {
+    pub(crate) enum Either<A, B> {
+        Left(A),
+        Right(B),
+    }
+
+    impl<A, B> Iterator for Either<A, B>
+    where
+        A: Iterator,
+        B: Iterator<Item = <A as Iterator>::Item>,
+    {
+        type Item = <A as Iterator>::Item;
+
+        fn next(&mut self) -> Option<Self::Item> {
+            match self {
+                Either::Left(a) => a.next(),
+                Either::Right(b) => b.next(),
+            }
+        }
+    }
+}
+
+pin_project! {
+    pub(crate) struct WrappedResolverFuture<Fut> {
+        #[pin]
+        fut: Fut,
+    }
+}
+
+impl<Fut, FutOutput, FutError> std::future::Future for WrappedResolverFuture<Fut>
+where
+    Fut: std::future::Future<Output = Result<FutOutput, FutError>>,
+    FutOutput: Iterator<Item = SocketAddr>,
+{
+    type Output = Result<itertools::Either<FutOutput, std::iter::Once<SocketAddr>>, FutError>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        this.fut
+            .poll(cx)
+            .map(|result| result.map(itertools::Either::Left))
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct DnsResolverWithOverrides<Resolver>
+where
+    Resolver: Clone,
+{
+    dns_resolver: Resolver,
+    overrides: Arc<HashMap<String, SocketAddr>>,
+}
+
+impl<Resolver: Clone> DnsResolverWithOverrides<Resolver> {
+    fn new(dns_resolver: Resolver, overrides: HashMap<String, SocketAddr>) -> Self {
+        DnsResolverWithOverrides {
+            dns_resolver,
+            overrides: Arc::new(overrides),
+        }
+    }
+}
+
+impl<Resolver, Iter> Service<Name> for DnsResolverWithOverrides<Resolver>
+where
+    Resolver: Service<Name, Response = Iter> + Clone,
+    Iter: Iterator<Item = SocketAddr>,
+{
+    type Response = itertools::Either<Iter, std::iter::Once<SocketAddr>>;
+    type Error = <Resolver as Service<Name>>::Error;
+    type Future = Either<
+        WrappedResolverFuture<<Resolver as Service<Name>>::Future>,
+        futures_util::future::Ready<
+            Result<itertools::Either<Iter, std::iter::Once<SocketAddr>>, Self::Error>,
+        >,
+    >;
+
+    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        self.dns_resolver.poll_ready(cx)
+    }
+
+    fn call(&mut self, name: Name) -> Self::Future {
+        match self.overrides.get(name.as_str()) {
+            Some(dest) => {
+                let fut = futures_util::future::ready(Ok(itertools::Either::Right(
+                    std::iter::once(dest.to_owned()),
+                )));
+                Either::Right(fut)
+            }
+            None => {
+                let resolver_fut = self.dns_resolver.call(name);
+                let y = WrappedResolverFuture { fut: resolver_fut };
+                Either::Left(y)
+            }
+        }
+    }
+}
+
 mod verbose {
+    use hyper::client::connect::{Connected, Connection};
     use std::fmt;
+    use std::io::{self, IoSlice};
     use std::pin::Pin;
     use std::task::{Context, Poll};
-    use hyper::client::connect::{Connected, Connection};
-    use tokio::io::{AsyncRead, AsyncWrite};
+    use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
     pub(super) const OFF: Wrapper = Wrapper(false);
 
@@ -1000,16 +1101,14 @@
         fn poll_read(
             mut self: Pin<&mut Self>,
             cx: &mut Context,
-            buf: &mut [u8]
-        ) -> Poll<std::io::Result<usize>> {
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<std::io::Result<()>> {
             match Pin::new(&mut self.inner).poll_read(cx, buf) {
-                Poll::Ready(Ok(n)) => {
-                    log::trace!("{:08x} read: {:?}", self.id, Escape(&buf[..n]));
-                    Poll::Ready(Ok(n))
-                },
-                Poll::Ready(Err(e)) => {
-                    Poll::Ready(Err(e))
-                },
+                Poll::Ready(Ok(())) => {
+                    log::trace!("{:08x} read: {:?}", self.id, Escape(buf.filled()));
+                    Poll::Ready(Ok(()))
+                }
+                Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
                 Poll::Pending => Poll::Pending,
             }
         }
@@ -1019,27 +1118,40 @@
         fn poll_write(
             mut self: Pin<&mut Self>,
             cx: &mut Context,
-            buf: &[u8]
+            buf: &[u8],
         ) -> Poll<Result<usize, std::io::Error>> {
             match Pin::new(&mut self.inner).poll_write(cx, buf) {
                 Poll::Ready(Ok(n)) => {
                     log::trace!("{:08x} write: {:?}", self.id, Escape(&buf[..n]));
                     Poll::Ready(Ok(n))
-                },
-                Poll::Ready(Err(e)) => {
-                    Poll::Ready(Err(e))
-                },
+                }
+                Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
                 Poll::Pending => Poll::Pending,
             }
         }
 
-        fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), std::io::Error>> {
+        fn poll_write_vectored(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            bufs: &[IoSlice<'_>],
+        ) -> Poll<Result<usize, io::Error>> {
+            Pin::new(&mut self.inner).poll_write_vectored(cx, bufs)
+        }
+
+        fn is_write_vectored(&self) -> bool {
+            self.inner.is_write_vectored()
+        }
+
+        fn poll_flush(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context,
+        ) -> Poll<Result<(), std::io::Error>> {
             Pin::new(&mut self.inner).poll_flush(cx)
         }
 
         fn poll_shutdown(
             mut self: Pin<&mut Self>,
-            cx: &mut Context
+            cx: &mut Context,
         ) -> Poll<Result<(), std::io::Error>> {
             Pin::new(&mut self.inner).poll_shutdown(cx)
         }
@@ -1137,7 +1249,10 @@
     fn test_tunnel() {
         let addr = mock_tunnel!();
 
-        let mut rt = runtime::Builder::new().basic_scheduler().enable_all().build().expect("new rt");
+        let rt = runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .expect("new rt");
         let f = async move {
             let tcp = TcpStream::connect(&addr).await?;
             let host = addr.ip().to_string();
@@ -1152,7 +1267,10 @@
     fn test_tunnel_eof() {
         let addr = mock_tunnel!(b"HTTP/1.1 200 OK");
 
-        let mut rt = runtime::Builder::new().basic_scheduler().enable_all().build().expect("new rt");
+        let rt = runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .expect("new rt");
         let f = async move {
             let tcp = TcpStream::connect(&addr).await?;
             let host = addr.ip().to_string();
@@ -1167,7 +1285,10 @@
     fn test_tunnel_non_http_response() {
         let addr = mock_tunnel!(b"foo bar baz hallo");
 
-        let mut rt = runtime::Builder::new().basic_scheduler().enable_all().build().expect("new rt");
+        let rt = runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .expect("new rt");
         let f = async move {
             let tcp = TcpStream::connect(&addr).await?;
             let host = addr.ip().to_string();
@@ -1188,7 +1309,10 @@
         "
         );
 
-        let mut rt = runtime::Builder::new().basic_scheduler().enable_all().build().expect("new rt");
+        let rt = runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .expect("new rt");
         let f = async move {
             let tcp = TcpStream::connect(&addr).await?;
             let host = addr.ip().to_string();
@@ -1207,7 +1331,10 @@
             "Proxy-Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==\r\n"
         );
 
-        let mut rt = runtime::Builder::new().basic_scheduler().enable_all().build().expect("new rt");
+        let rt = runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .expect("new rt");
         let f = async move {
             let tcp = TcpStream::connect(&addr).await?;
             let host = addr.ip().to_string();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/cookie.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/cookie.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/cookie.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/cookie.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,36 @@
 //! HTTP Cookies
 
 use std::convert::TryInto;
-
-use crate::header;
 use std::fmt;
+use std::sync::RwLock;
 use std::time::SystemTime;
 
+use crate::header::{HeaderValue, SET_COOKIE};
+use bytes::Bytes;
+
+/// Actions for a persistent cookie store providing session support.
+pub trait CookieStore: Send + Sync {
+    /// Store a set of Set-Cookie header values recevied from `url`
+    fn set_cookies(&self, cookie_headers: &mut dyn Iterator<Item = &HeaderValue>, url: &url::Url);
+    /// Get any Cookie values in the store for `url`
+    fn cookies(&self, url: &url::Url) -> Option<HeaderValue>;
+}
+
 /// A single HTTP cookie.
 pub struct Cookie<'a>(cookie_crate::Cookie<'a>);
 
+/// A good default `CookieStore` implementation.
+///
+/// This is the implementation used when simply calling `cookie_store(true)`.
+/// This type is exposed to allow creating one and filling it with some
+/// existing cookies more easily, before creating a `Client`.
+#[derive(Debug, Default)]
+pub struct Jar(RwLock<cookie_store::CookieStore>);
+
+// ===== impl Cookie =====
+
 impl<'a> Cookie<'a> {
-    fn parse(value: &'a crate::header::HeaderValue) -> Result<Cookie<'a>, CookieParseError> {
+    fn parse(value: &'a HeaderValue) -> Result<Cookie<'a>, CookieParseError> {
         std::str::from_utf8(value.as_bytes())
             .map_err(cookie_crate::ParseError::from)
             .and_then(cookie_crate::Cookie::parse)
@@ -18,10 +38,6 @@
             .map(Cookie)
     }
 
-    pub(crate) fn into_inner(self) -> cookie_crate::Cookie<'a> {
-        self.0
-    }
-
     /// The name of the cookie.
     pub fn name(&self) -> &str {
         self.0.name()
@@ -64,9 +80,10 @@
 
     /// Get the Max-Age information.
     pub fn max_age(&self) -> Option<std::time::Duration> {
-        self.0
-            .max_age()
-            .map(|d| d.try_into().expect("time::Duration into std::time::Duration"))
+        self.0.max_age().map(|d| {
+            d.try_into()
+                .expect("time::Duration into std::time::Duration")
+        })
     }
 
     /// The cookie expiration time.
@@ -81,25 +98,21 @@
     }
 }
 
+pub(crate) fn extract_response_cookie_headers<'a>(
+    headers: &'a hyper::HeaderMap,
+) -> impl Iterator<Item = &'a HeaderValue> + 'a {
+    headers.get_all(SET_COOKIE).iter()
+}
+
 pub(crate) fn extract_response_cookies<'a>(
     headers: &'a hyper::HeaderMap,
 ) -> impl Iterator<Item = Result<Cookie<'a>, CookieParseError>> + 'a {
     headers
-        .get_all(header::SET_COOKIE)
+        .get_all(SET_COOKIE)
         .iter()
         .map(|value| Cookie::parse(value))
 }
 
-/// A persistent cookie store that provides session support.
-#[derive(Default)]
-pub(crate) struct CookieStore(pub(crate) cookie_store::CookieStore);
-
-impl<'a> fmt::Debug for CookieStore {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
 /// Error representing a parse failure of a 'Set-Cookie' header.
 pub(crate) struct CookieParseError(cookie_crate::ParseError);
 
@@ -116,3 +129,56 @@
 }
 
 impl std::error::Error for CookieParseError {}
+
+// ===== impl Jar =====
+
+impl Jar {
+    /// Add a cookie to this jar.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use reqwest::{cookie::Jar, Url};
+    ///
+    /// let cookie = "foo=bar; Domain=yolo.local";
+    /// let url = "https://yolo.local".parse::<Url>().unwrap();
+    ///
+    /// let jar = Jar::default();
+    /// jar.add_cookie_str(cookie, &url);
+    ///
+    /// // and now add to a `ClientBuilder`?
+    /// ```
+    pub fn add_cookie_str(&self, cookie: &str, url: &url::Url) {
+        let cookies = cookie_crate::Cookie::parse(cookie)
+            .ok()
+            .map(|c| c.into_owned())
+            .into_iter();
+        self.0.write().unwrap().store_response_cookies(cookies, url);
+    }
+}
+
+impl CookieStore for Jar {
+    fn set_cookies(&self, cookie_headers: &mut dyn Iterator<Item = &HeaderValue>, url: &url::Url) {
+        let iter =
+            cookie_headers.filter_map(|val| Cookie::parse(val).map(|c| c.0.into_owned()).ok());
+
+        self.0.write().unwrap().store_response_cookies(iter, url);
+    }
+
+    fn cookies(&self, url: &url::Url) -> Option<HeaderValue> {
+        let s = self
+            .0
+            .read()
+            .unwrap()
+            .get_request_cookies(url)
+            .map(|c| format!("{}={}", c.name(), c.value()))
+            .collect::<Vec<_>>()
+            .join("; ");
+
+        if s.is_empty() {
+            return None;
+        }
+
+        HeaderValue::from_maybe_shared(Bytes::from(s)).ok()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/dns.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/dns.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/dns.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/dns.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
 use std::future::Future;
+use std::io;
+use std::net::SocketAddr;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{self, Poll};
-use std::io;
 
 use hyper::client::connect::dns as hyper_dns;
 use hyper::service::Service;
@@ -10,7 +11,7 @@
 use trust_dns_resolver::{
     config::{ResolverConfig, ResolverOpts},
     lookup_ip::LookupIpIntoIter,
-    system_conf, AsyncResolver, TokioConnection, TokioConnectionProvider,
+    system_conf, AsyncResolver, TokioConnection, TokioConnectionProvider, TokioHandle,
 };
 
 use crate::error::BoxError;
@@ -18,7 +19,8 @@
 type SharedResolver = Arc<AsyncResolver<TokioConnection, TokioConnectionProvider>>;
 
 lazy_static! {
-    static ref SYSTEM_CONF: io::Result<(ResolverConfig, ResolverOpts)> = system_conf::read_system_conf().map_err(io::Error::from);
+    static ref SYSTEM_CONF: io::Result<(ResolverConfig, ResolverOpts)> =
+        system_conf::read_system_conf().map_err(io::Error::from);
 }
 
 #[derive(Clone)]
@@ -26,6 +28,10 @@
     state: Arc<Mutex<State>>,
 }
 
+pub(crate) struct SocketAddrs {
+    iter: LookupIpIntoIter,
+}
+
 enum State {
     Init,
     Ready(SharedResolver),
@@ -47,7 +53,7 @@
 }
 
 impl Service<hyper_dns::Name> for TrustDnsResolver {
-    type Response = LookupIpIntoIter;
+    type Response = SocketAddrs;
     type Error = BoxError;
     type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
 
@@ -62,10 +68,10 @@
 
             let resolver = match &*lock {
                 State::Init => {
-                    let resolver = new_resolver(tokio::runtime::Handle::current()).await?;
+                    let resolver = new_resolver().await?;
                     *lock = State::Ready(resolver.clone());
                     resolver
-                },
+                }
                 State::Ready(resolver) => resolver.clone(),
             };
 
@@ -74,18 +80,26 @@
             drop(lock);
 
             let lookup = resolver.lookup_ip(name.as_str()).await?;
-            Ok(lookup.into_iter())
+            Ok(SocketAddrs {
+                iter: lookup.into_iter(),
+            })
         })
     }
 }
 
-/// Takes a `Handle` argument as an indicator that it must be called from
-/// within the context of a Tokio runtime.
-async fn new_resolver(handle: tokio::runtime::Handle) -> Result<SharedResolver, BoxError> {
+impl Iterator for SocketAddrs {
+    type Item = SocketAddr;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next().map(|ip_addr| SocketAddr::new(ip_addr, 0))
+    }
+}
+
+async fn new_resolver() -> Result<SharedResolver, BoxError> {
     let (config, opts) = SYSTEM_CONF
         .as_ref()
         .expect("can't construct TrustDnsResolver if SYSTEM_CONF is error")
         .clone();
-    let resolver = AsyncResolver::new(config, opts, handle).await?;
+    let resolver = AsyncResolver::new(config, opts, TokioHandle)?;
     Ok(Arc::new(resolver))
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -58,26 +58,17 @@
 
     /// Returns true if the error is from a type Builder.
     pub fn is_builder(&self) -> bool {
-        match self.inner.kind {
-            Kind::Builder => true,
-            _ => false,
-        }
+        matches!(self.inner.kind, Kind::Builder)
     }
 
     /// Returns true if the error is from a `RedirectPolicy`.
     pub fn is_redirect(&self) -> bool {
-        match self.inner.kind {
-            Kind::Redirect => true,
-            _ => false,
-        }
+        matches!(self.inner.kind, Kind::Redirect)
     }
 
     /// Returns true if the error is from `Response::error_for_status`.
     pub fn is_status(&self) -> bool {
-        match self.inner.kind {
-            Kind::Status(_) => true,
-            _ => false,
-        }
+        matches!(self.inner.kind, Kind::Status(_))
     }
 
     /// Returns true if the error is related to a timeout.
@@ -96,10 +87,7 @@
 
     /// Returns true if the error is related to the request
     pub fn is_request(&self) -> bool {
-        match self.inner.kind {
-            Kind::Request => true,
-            _ => false,
-        }
+        matches!(self.inner.kind, Kind::Request)
     }
 
     #[cfg(not(target_arch = "wasm32"))]
@@ -122,18 +110,12 @@
 
     /// Returns true if the error is related to the request or response body
     pub fn is_body(&self) -> bool {
-        match self.inner.kind {
-            Kind::Body => true,
-            _ => false,
-        }
+        matches!(self.inner.kind, Kind::Body)
     }
 
     /// Returns true if the error is related to decoding the response's body
     pub fn is_decode(&self) -> bool {
-        match self.inner.kind {
-            Kind::Decode => true,
-            _ => false,
-        }
+        matches!(self.inner.kind, Kind::Decode)
     }
 
     /// Returns the status code, if the error was generated from a response.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/into_url.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/into_url.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/into_url.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/into_url.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,19 +3,23 @@
 /// A trait to try to convert some type into a `Url`.
 ///
 /// This trait is "sealed", such that only types within reqwest can
-/// implement it. The reason is that it will eventually be deprecated
-/// and removed, when `std::convert::TryFrom` is stabilized.
-pub trait IntoUrl: PolyfillTryInto {}
+/// implement it.
+pub trait IntoUrl: IntoUrlSealed {}
 
-impl<T: PolyfillTryInto> IntoUrl for T {}
+impl IntoUrl for Url {}
+impl IntoUrl for String {}
+impl<'a> IntoUrl for &'a str {}
+impl<'a> IntoUrl for &'a String {}
 
-pub trait PolyfillTryInto {
+pub trait IntoUrlSealed {
     // Besides parsing as a valid `Url`, the `Url` must be a valid
     // `http::Uri`, in that it makes sense to use in a network request.
     fn into_url(self) -> crate::Result<Url>;
+
+    fn as_str(&self) -> &str;
 }
 
-impl PolyfillTryInto for Url {
+impl IntoUrlSealed for Url {
     fn into_url(self) -> crate::Result<Url> {
         if self.has_host() {
             Ok(self)
@@ -23,18 +27,40 @@
             Err(crate::error::url_bad_scheme(self))
         }
     }
+
+    fn as_str(&self) -> &str {
+        self.as_ref()
+    }
 }
 
-impl<'a> PolyfillTryInto for &'a str {
+impl<'a> IntoUrlSealed for &'a str {
     fn into_url(self) -> crate::Result<Url> {
         Url::parse(self).map_err(crate::error::builder)?.into_url()
     }
+
+    fn as_str(&self) -> &str {
+        self
+    }
 }
 
-impl<'a> PolyfillTryInto for &'a String {
+impl<'a> IntoUrlSealed for &'a String {
     fn into_url(self) -> crate::Result<Url> {
         (&**self).into_url()
     }
+
+    fn as_str(&self) -> &str {
+        self.as_ref()
+    }
+}
+
+impl<'a> IntoUrlSealed for String {
+    fn into_url(self) -> crate::Result<Url> {
+        (&*self).into_url()
+    }
+
+    fn as_str(&self) -> &str {
+        self.as_ref()
+    }
 }
 
 if_hyper! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,8 @@
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 #![cfg_attr(test, deny(warnings))]
-#![doc(html_root_url = "https://docs.rs/reqwest/0.10.10")]
+#![doc(html_root_url = "https://docs.rs/reqwest/0.11.4")]
 
 //! # reqwest
 //!
@@ -169,6 +170,7 @@
 //!   over HTTPS.
 //! - **native-tls**: Enables TLS functionality provided by `native-tls`.
 //! - **native-tls-vendored**: Enables the `vendored` feature of `native-tls`.
+//! - **native-tls-alpn**: Enables the `alpn` feature of `native-tls`.
 //! - **rustls-tls**: Enables TLS functionality provided by `rustls`.
 //!   Equivalent to `rustls-tls-webpki-roots`.
 //! - **rustls-tls-manual-roots**: Enables TLS functionality provided by `rustls`,
@@ -181,7 +183,9 @@
 //! - **cookies**: Provides cookie session support.
 //! - **gzip**: Provides response body gzip decompression.
 //! - **brotli**: Provides response body brotli decompression.
+//! - **deflate**: Provides response body deflate decompression.
 //! - **json**: Provides serialization and deserialization for JSON bodies.
+//! - **multipart**: Provides functionality for multipart forms.
 //! - **stream**: Adds support for `futures::Stream`.
 //! - **socks**: Provides SOCKS5 proxy support.
 //! - **trust-dns**: Enables a trust-dns async resolver instead of default
@@ -290,11 +294,13 @@
     doctest!("../README.md");
 
     pub use self::async_impl::{
-        multipart, Body, Client, ClientBuilder, Request, RequestBuilder, Response, ResponseBuilderExt,
+        Body, Client, ClientBuilder, Request, RequestBuilder, Response, ResponseBuilderExt,
     };
     pub use self::proxy::Proxy;
     #[cfg(feature = "__tls")]
     pub use self::tls::{Certificate, Identity};
+    #[cfg(feature = "multipart")]
+    pub use self::async_impl::multipart;
 
 
     mod async_impl;
@@ -316,5 +322,7 @@
     mod wasm;
     mod util;
 
-    pub use self::wasm::{multipart, Body, Client, ClientBuilder, Request, RequestBuilder, Response};
+    pub use self::wasm::{Body, Client, ClientBuilder, Request, RequestBuilder, Response};
+    #[cfg(feature = "multipart")]
+    pub use self::wasm::multipart;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/proxy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/proxy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/proxy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/proxy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,8 @@
 use std::net::SocketAddr;
 use std::sync::Arc;
 
-use crate::{IntoUrl, Url};
+use crate::into_url::{IntoUrl, IntoUrlSealed};
+use crate::Url;
 use http::{header::HeaderValue, Uri};
 use ipnet::IpNet;
 use percent_encoding::percent_decode;
@@ -107,9 +108,33 @@
     fn into_proxy_scheme(self) -> crate::Result<ProxyScheme>;
 }
 
-impl<T: IntoUrl> IntoProxyScheme for T {
+impl<S: IntoUrl> IntoProxyScheme for S {
     fn into_proxy_scheme(self) -> crate::Result<ProxyScheme> {
-        ProxyScheme::parse(self.into_url()?)
+        // validate the URL
+        let url = match self.as_str().into_url() {
+            Ok(ok) => ok,
+            Err(e) => {
+                // the issue could have been caused by a missing scheme, so we try adding http://
+                format!("http://{}", self.as_str())
+                    .into_url()
+                    .map_err(|_| {
+                        // return the original error
+                        crate::error::builder(e)
+                    })?
+            }
+        };
+        ProxyScheme::parse(url)
+    }
+}
+
+// These bounds are accidentally leaked by the blanket impl of IntoProxyScheme
+// for all types that implement IntoUrl. So, this function exists to detect
+// if we were to break those bounds for a user.
+fn _implied_bounds() {
+    fn prox<T: IntoProxyScheme>(_t: T) {}
+
+    fn url<T: IntoUrl>(t: T) {
+        prox(t);
     }
 }
 
@@ -254,11 +279,8 @@
             // Custom *may* match 'http', so assume so.
             | Intercept::Custom(_) => true,
             Intercept::System(ref system) => {
-                if let Some(proxy) = system.get("http") {
-                    match proxy {
-                        ProxyScheme::Http { auth, .. } => auth.is_some(),
-                        _ => false,
-                    }
+                if let Some(ProxyScheme::Http { auth, .. }) = system.get("http") {
+                    auth.is_some()
                 } else {
                     false
                 }
@@ -842,8 +864,7 @@
     if let Some(indice) = address.find("://") {
         if indice == 0 {
             None
-        }
-        else {
+        } else {
             let prefix = &address[..indice];
             let contains_banned = prefix.contains(|c| c == ':' || c == '/');
 
@@ -853,8 +874,7 @@
                 None
             }
         }
-    }
-    else {
+    } else {
         None
     }
 }
@@ -977,6 +997,33 @@
         }
     }
 
+    #[test]
+    fn test_proxy_scheme_ip_address_default_http() {
+        let ps = "192.168.1.1:8888".into_proxy_scheme().unwrap();
+
+        match ps {
+            ProxyScheme::Http { auth, host } => {
+                assert!(auth.is_none());
+                assert_eq!(host, "192.168.1.1:8888");
+            }
+            other => panic!("unexpected: {:?}", other),
+        }
+    }
+
+    #[test]
+    fn test_proxy_scheme_parse_default_http_with_auth() {
+        // this should fail because `foo` is interpreted as the scheme and no host can be found
+        let ps = "foo:bar@localhost:1239".into_proxy_scheme().unwrap();
+
+        match ps {
+            ProxyScheme::Http { auth, host } => {
+                assert_eq!(auth.unwrap(), encode_basic_auth("foo", "bar"));
+                assert_eq!(host, "localhost:1239");
+            }
+            other => panic!("unexpected: {:?}", other),
+        }
+    }
+
     // Smallest possible content for a mutex
     struct MutexInner;
 
@@ -996,10 +1043,10 @@
         // to avoid assert! -> panic! -> Mutex Poisoned.
         let baseline_proxies = get_sys_proxies(None);
         // the system proxy setting url is invalid.
-        env::set_var("http_proxy", "123465");
+        env::set_var("http_proxy", "file://123465");
         let invalid_proxies = get_sys_proxies(None);
         // set valid proxy
-        env::set_var("http_proxy", "http://127.0.0.1/");
+        env::set_var("http_proxy", "127.0.0.1/");
         let valid_proxies = get_sys_proxies(None);
 
         // reset user setting when guards drop
@@ -1033,9 +1080,16 @@
         // set valid proxy
         let valid_proxies = get_sys_proxies(Some((1, String::from("http://127.0.0.1/"))));
         let valid_proxies_no_schema = get_sys_proxies(Some((1, String::from("127.0.0.1"))));
-        let valid_proxies_explicit_https = get_sys_proxies(Some((1, String::from("https://127.0.0.1/"))));
-        let multiple_proxies = get_sys_proxies(Some((1, String::from("http=127.0.0.1:8888;https=127.0.0.2:8888"))));
-        let multiple_proxies_explicit_schema = get_sys_proxies(Some((1, String::from("http=http://127.0.0.1:8888;https=https://127.0.0.2:8888"))));
+        let valid_proxies_explicit_https =
+            get_sys_proxies(Some((1, String::from("https://127.0.0.1/"))));
+        let multiple_proxies = get_sys_proxies(Some((
+            1,
+            String::from("http=127.0.0.1:8888;https=127.0.0.2:8888"),
+        )));
+        let multiple_proxies_explicit_schema = get_sys_proxies(Some((
+            1,
+            String::from("http=http://127.0.0.1:8888;https=https://127.0.0.2:8888"),
+        )));
 
         // reset user setting when guards drop
         drop(_g1);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/redirect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/redirect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/redirect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/redirect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -148,10 +148,7 @@
     }
 
     pub(crate) fn is_default(&self) -> bool {
-        match self.inner {
-            PolicyKind::Limit(10) => true,
-            _ => false,
-        }
+        matches!(self.inner, PolicyKind::Limit(10))
     }
 }
 
@@ -267,7 +264,6 @@
         .map(|i| Url::parse(&format!("http://a.b/c/{}", i)).unwrap())
         .collect::<Vec<_>>();
 
-
     match policy.check(StatusCode::FOUND, &next, &previous) {
         ActionKind::Follow => (),
         other => panic!("unexpected {:?}", other),
@@ -298,7 +294,7 @@
     }
 
     let next = Url::parse("http://foo/baz").unwrap();
-     match policy.check(StatusCode::FOUND, &next, &[]) {
+    match policy.check(StatusCode::FOUND, &next, &[]) {
         ActionKind::Stop => (),
         other => panic!("unexpected {:?}", other),
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/tls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/tls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/tls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/tls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,8 @@
 #[cfg(feature = "__rustls")]
-use rustls::{RootCertStore, ServerCertVerified, ServerCertVerifier, TLSError};
+use rustls::{
+    internal::msgs::handshake::DigitallySignedStruct, HandshakeSignatureValid, RootCertStore,
+    ServerCertVerified, ServerCertVerifier, TLSError,
+};
 use std::fmt;
 #[cfg(feature = "__rustls")]
 use tokio_rustls::webpki::DNSNameRef;
@@ -22,10 +25,7 @@
 
 /// Represents a private key and X509 cert as a client certificate.
 pub struct Identity {
-    #[cfg_attr(
-        not(any(feature = "native-tls", feature = "__rustls")),
-        allow(unused)
-    )]
+    #[cfg_attr(not(any(feature = "native-tls", feature = "__rustls")), allow(unused))]
     inner: ClientCert,
 }
 
@@ -159,7 +159,8 @@
     pub fn from_pkcs12_der(der: &[u8], password: &str) -> crate::Result<Identity> {
         Ok(Identity {
             inner: ClientCert::Pkcs12(
-                native_tls_crate::Identity::from_pkcs12(der, password).map_err(crate::error::builder)?,
+                native_tls_crate::Identity::from_pkcs12(der, password)
+                    .map_err(crate::error::builder)?,
             ),
         })
     }
@@ -245,7 +246,8 @@
     pub(crate) fn add_to_rustls(self, tls: &mut rustls::ClientConfig) -> crate::Result<()> {
         match self.inner {
             ClientCert::Pem { key, certs } => {
-                tls.set_single_client_cert(certs, key).map_err(|e| crate::error::builder(e))?;
+                tls.set_single_client_cert(certs, key)
+                    .map_err(|e| crate::error::builder(e))?;
                 Ok(())
             }
             #[cfg(feature = "native-tls")]
@@ -275,10 +277,7 @@
     Rustls,
     #[cfg(feature = "__rustls")]
     BuiltRustls(rustls::ClientConfig),
-    #[cfg(any(
-        feature = "native-tls",
-        feature = "__rustls",
-    ))]
+    #[cfg(any(feature = "native-tls", feature = "__rustls",))]
     UnknownPreconfigured,
 }
 
@@ -293,10 +292,7 @@
             TlsBackend::Rustls => write!(f, "Rustls"),
             #[cfg(feature = "__rustls")]
             TlsBackend::BuiltRustls(_) => write!(f, "BuiltRustls"),
-            #[cfg(any(
-                feature = "native-tls",
-                feature = "__rustls",
-            ))]
+            #[cfg(any(feature = "native-tls", feature = "__rustls",))]
             TlsBackend::UnknownPreconfigured => write!(f, "UnknownPreconfigured"),
         }
     }
@@ -330,6 +326,24 @@
     ) -> Result<ServerCertVerified, TLSError> {
         Ok(ServerCertVerified::assertion())
     }
+
+    fn verify_tls12_signature(
+        &self,
+        _message: &[u8],
+        _cert: &rustls::Certificate,
+        _dss: &DigitallySignedStruct,
+    ) -> Result<HandshakeSignatureValid, TLSError> {
+        Ok(HandshakeSignatureValid::assertion())
+    }
+
+    fn verify_tls13_signature(
+        &self,
+        _message: &[u8],
+        _cert: &rustls::Certificate,
+        _dss: &DigitallySignedStruct,
+    ) -> Result<HandshakeSignatureValid, TLSError> {
+        Ok(HandshakeSignatureValid::assertion())
+    }
 }
 
 #[cfg(test)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/body.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/body.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/body.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/body.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
+#[cfg(feature = "multipart")]
 use super::multipart::Form;
 /// dox
 use bytes::Bytes;
-use std::fmt;
 use js_sys::Uint8Array;
+use std::fmt;
 use wasm_bindgen::JsValue;
 
 /// The body of a `Request`.
@@ -16,8 +17,10 @@
     inner: Inner,
 }
 
+#[derive(Clone)]
 enum Inner {
     Bytes(Bytes),
+    #[cfg(feature = "multipart")]
     Multipart(Form),
 }
 
@@ -30,6 +33,7 @@
                 let js_value: &JsValue = body_array.as_ref();
                 Ok(js_value.to_owned())
             }
+            #[cfg(feature = "multipart")]
             Inner::Multipart(form) => {
                 let form_data = form.to_form_data()?;
                 let js_value: &JsValue = form_data.as_ref();
@@ -39,6 +43,7 @@
     }
 
     #[inline]
+    #[cfg(feature = "multipart")]
     pub(crate) fn from_form(f: Form) -> Body {
         Self {
             inner: Inner::Multipart(f),
@@ -48,9 +53,16 @@
     pub(crate) fn is_empty(&self) -> bool {
         match &self.inner {
             Inner::Bytes(bytes) => bytes.is_empty(),
+            #[cfg(feature = "multipart")]
             Inner::Multipart(form) => form.is_empty(),
         }
     }
+
+    pub(crate) fn clone(&self) -> Body {
+        Self {
+            inner: self.inner.clone(),
+        }
+    }
 }
 
 impl From<Bytes> for Body {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -207,6 +207,10 @@
         init.mode(web_sys::RequestMode::NoCors);
     }
 
+    if let Some(creds) = req.credentials {
+        init.credentials(creds);
+    }
+
     if let Some(body) = req.body() {
         if !body.is_empty() {
             init.body(Some(&body.to_js_value()?.as_ref().as_ref()));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,30 +2,26 @@
 
 mod body;
 mod client;
-mod request;
-mod response;
 /// TODO
+#[cfg(feature = "multipart")]
 pub mod multipart;
+mod request;
+mod response;
 
 pub use self::body::Body;
 pub use self::client::{Client, ClientBuilder};
 pub use self::request::{Request, RequestBuilder};
 pub use self::response::Response;
 
-
 async fn promise<T>(promise: js_sys::Promise) -> Result<T, crate::error::BoxError>
 where
     T: JsCast,
 {
     use wasm_bindgen_futures::JsFuture;
 
-    let js_val = JsFuture::from(promise)
-        .await
-        .map_err(crate::error::wasm)?;
+    let js_val = JsFuture::from(promise).await.map_err(crate::error::wasm)?;
 
     js_val
         .dyn_into::<T>()
-        .map_err(|_js_val| {
-            "promise resolved to unexpected type".into()
-        })
+        .map_err(|_js_val| "promise resolved to unexpected type".into())
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/multipart.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/multipart.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/multipart.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/multipart.rs	2021-12-09 12:01:26.000000000 +0000
@@ -90,7 +90,6 @@
     }
 
     pub(crate) fn to_form_data(&self) -> crate::Result<FormData> {
-
         let form = FormData::new()
             .map_err(crate::error::wasm)
             .map_err(crate::error::builder)?;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/request.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/request.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/request.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/request.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,11 +2,12 @@
 use std::fmt;
 
 use http::{request::Parts, Method, Request as HttpRequest};
-use url::Url;
+use serde::Serialize;
 #[cfg(feature = "json")]
 use serde_json;
-use serde::Serialize;
 use serde_urlencoded;
+use url::Url;
+use web_sys::RequestCredentials;
 
 use super::{Body, Client, Response};
 use crate::header::{HeaderMap, HeaderName, HeaderValue, CONTENT_TYPE};
@@ -18,6 +19,7 @@
     headers: HeaderMap,
     body: Option<Body>,
     pub(super) cors: bool,
+    pub(super) credentials: Option<RequestCredentials>,
 }
 
 /// A builder to construct the properties of a `Request`.
@@ -27,13 +29,16 @@
 }
 
 impl Request {
-    pub(super) fn new(method: Method, url: Url) -> Self {
+    /// Constructs a new request.
+    #[inline]
+    pub fn new(method: Method, url: Url) -> Self {
         Request {
             method,
             url,
             headers: HeaderMap::new(),
             body: None,
             cors: true,
+            credentials: None,
         }
     }
 
@@ -84,6 +89,21 @@
     pub fn body_mut(&mut self) -> &mut Option<Body> {
         &mut self.body
     }
+
+    /// Attempts to clone the `Request`.
+    ///
+    /// None is returned if a body is which can not be cloned. This method
+    /// currently always returns `Some`, but that may change in the future.
+    pub fn try_clone(&self) -> Option<Request> {
+        Some(Self {
+            method: self.method.clone(),
+            url: self.url.clone(),
+            headers: self.headers.clone(),
+            body: self.body.as_ref().map(|body| body.clone()),
+            cors: self.cors,
+            credentials: self.credentials.clone(),
+        })
+    }
 }
 
 impl RequestBuilder {
@@ -153,6 +173,7 @@
     }
 
     #[cfg(feature = "json")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     /// Set the request json
     pub fn json<T: Serialize + ?Sized>(mut self, json: &T) -> RequestBuilder {
         let mut error = None;
@@ -181,7 +202,6 @@
         self.header(crate::header::AUTHORIZATION, header_value)
     }
 
-
     /// Set the request body.
     pub fn body<T: Into<Body>>(mut self, body: T) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
@@ -191,6 +211,8 @@
     }
 
     /// TODO
+    #[cfg(feature = "multipart")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "multipart")))]
     pub fn multipart(mut self, multipart: super::multipart::Form) -> RequestBuilder {
         if let Ok(ref mut req) = self.request {
             *req.body_mut() = Some(Body::from_form(multipart))
@@ -250,6 +272,54 @@
         self
     }
 
+    /// Set fetch credentials to 'same-origin'
+    ///
+    /// # WASM
+    ///
+    /// This option is only effective with WebAssembly target.
+    ///
+    /// The [request credentials][mdn] will be set to 'same-origin'.
+    ///
+    /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials
+    pub fn fetch_credentials_same_origin(mut self) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            req.credentials = Some(RequestCredentials::SameOrigin);
+        }
+        self
+    }
+
+    /// Set fetch credentials to 'include'
+    ///
+    /// # WASM
+    ///
+    /// This option is only effective with WebAssembly target.
+    ///
+    /// The [request credentials][mdn] will be set to 'include'.
+    ///
+    /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials
+    pub fn fetch_credentials_include(mut self) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            req.credentials = Some(RequestCredentials::Include);
+        }
+        self
+    }
+
+    /// Set fetch credentials to 'omit'
+    ///
+    /// # WASM
+    ///
+    /// This option is only effective with WebAssembly target.
+    ///
+    /// The [request credentials][mdn] will be set to 'omit'.
+    ///
+    /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials
+    pub fn fetch_credentials_omit(mut self) -> RequestBuilder {
+        if let Ok(ref mut req) = self.request {
+            req.credentials = Some(RequestCredentials::Omit);
+        }
+        self
+    }
+
     /// Build a `Request`, which can be inspected, modified and executed with
     /// `Client::execute()`.
     pub fn build(self) -> crate::Result<Request> {
@@ -280,6 +350,36 @@
         let req = self.request?;
         self.client.execute_request(req).await
     }
+
+    /// Attempt to clone the RequestBuilder.
+    ///
+    /// `None` is returned if the RequestBuilder can not be cloned. This method
+    /// currently always returns `Some`, but that may change in the future.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// # use reqwest::Error;
+    /// #
+    /// # fn run() -> Result<(), Error> {
+    /// let client = reqwest::Client::new();
+    /// let builder = client.post("http://httpbin.org/post")
+    ///     .body("from a &str!");
+    /// let clone = builder.try_clone();
+    /// assert!(clone.is_some());
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn try_clone(&self) -> Option<RequestBuilder> {
+        self.request
+            .as_ref()
+            .ok()
+            .and_then(|req| req.try_clone())
+            .map(|req| RequestBuilder {
+                client: self.client.clone(),
+                request: Ok(req),
+            })
+    }
 }
 
 impl fmt::Debug for Request {
@@ -328,6 +428,7 @@
             headers,
             body: Some(body.into()),
             cors: true,
+            credentials: None,
         })
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/response.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/response.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/src/wasm/response.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/src/wasm/response.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
 use std::fmt;
 
 use bytes::Bytes;
-use js_sys::Uint8Array;
 use http::{HeaderMap, StatusCode};
+use js_sys::Uint8Array;
 use url::Url;
 
 #[cfg(feature = "json")]
@@ -17,10 +17,7 @@
 }
 
 impl Response {
-    pub(super) fn new(
-        res: http::Response<web_sys::Response>,
-        url: Url,
-    ) -> Response {
+    pub(super) fn new(res: http::Response<web_sys::Response>, url: Url) -> Response {
         Response {
             http: res,
             url: Box::new(url),
@@ -51,7 +48,7 @@
     ///
     /// - The server didn't send a `content-length` header.
     /// - The response is compressed and automatically decoded (thus changing
-    //   the actual decoded length).
+    ///  the actual decoded length).
     pub fn content_length(&self) -> Option<u64> {
         self.headers()
             .get(http::header::CONTENT_LENGTH)?
@@ -77,6 +74,7 @@
 
     /// Try to deserialize the response body as JSON.
     #[cfg(feature = "json")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     pub async fn json<T: DeserializeOwned>(self) -> crate::Result<T> {
         let full = self.bytes().await?;
 
@@ -85,7 +83,10 @@
 
     /// Get the response text.
     pub async fn text(self) -> crate::Result<String> {
-        let p = self.http.body().text()
+        let p = self
+            .http
+            .body()
+            .text()
             .map_err(crate::error::wasm)
             .map_err(crate::error::decode)?;
         let js_val = super::promise::<wasm_bindgen::JsValue>(p)
@@ -100,7 +101,10 @@
 
     /// Get the response as bytes
     pub async fn bytes(self) -> crate::Result<Bytes> {
-        let p = self.http.body().array_buffer()
+        let p = self
+            .http
+            .body()
+            .array_buffer()
             .map_err(crate::error::wasm)
             .map_err(crate::error::decode)?;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/badssl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/badssl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/badssl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/badssl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -59,6 +59,21 @@
     assert!(text.contains("<title>self-signed.badssl.com</title>"));
 }
 
+#[cfg(feature = "__tls")]
+#[tokio::test]
+async fn test_badssl_no_built_in_roots() {
+    let result = reqwest::Client::builder()
+        .tls_built_in_root_certs(false)
+        .no_proxy()
+        .build()
+        .unwrap()
+        .get("https://mozilla-modern.badssl.com/")
+        .send()
+        .await;
+
+    assert!(result.is_err());
+}
+
 #[cfg(feature = "native-tls")]
 #[tokio::test]
 async fn test_badssl_wrong_host() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/blocking.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/blocking.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/blocking.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/blocking.rs	2021-12-09 12:01:26.000000000 +0000
@@ -282,7 +282,9 @@
 
     let url = format!("http://{}/text", server.addr());
 
-    let mut rt = tokio::runtime::Builder::new().build().expect("new rt");
+    let rt = tokio::runtime::Builder::new_current_thread()
+        .build()
+        .expect("new rt");
 
     rt.block_on(async move {
         let _should_panic = reqwest::blocking::get(&url);
@@ -310,3 +312,19 @@
 
     assert_eq!(resp.is_err(), true);
 }
+
+/// Test that a [`reqwest::blocking::Body`] can be created from [`bytes::Bytes`].
+#[test]
+fn test_body_from_bytes() {
+    let body = "abc";
+    // No external calls are needed. Only the request building is tested.
+    let request = reqwest::blocking::Client::builder()
+        .build()
+        .expect("Could not build the client")
+        .put("https://google.com")
+        .body(bytes::Bytes::from(body))
+        .build()
+        .expect("Invalid body");
+
+    assert_eq!(request.body().unwrap().as_bytes(), Some(body.as_bytes()));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/client.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/client.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/client.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/client.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,6 +24,12 @@
                 .unwrap()
                 .contains("br"));
         }
+        if cfg!(feature = "deflate") {
+            assert!(req.headers()["accept-encoding"]
+                .to_str()
+                .unwrap()
+                .contains("deflate"));
+        }
 
         http::Response::default()
     });
@@ -161,6 +167,54 @@
     assert_eq!(res2.status(), reqwest::StatusCode::OK);
 }
 
+#[tokio::test]
+async fn overridden_dns_resolution_with_gai() {
+    let _ = env_logger::builder().is_test(true).try_init();
+    let server = server::http(move |_req| async { http::Response::new("Hello".into()) });
+
+    let overridden_domain = "rust-lang.org";
+    let url = format!(
+        "http://{}:{}/domain_override",
+        overridden_domain,
+        server.addr().port()
+    );
+    let client = reqwest::Client::builder()
+        .resolve(overridden_domain, server.addr())
+        .build()
+        .expect("client builder");
+    let req = client.get(&url);
+    let res = req.send().await.expect("request");
+
+    assert_eq!(res.status(), reqwest::StatusCode::OK);
+    let text = res.text().await.expect("Failed to get text");
+    assert_eq!("Hello", text);
+}
+
+#[cfg(feature = "trust-dns")]
+#[tokio::test]
+async fn overridden_dns_resolution_with_trust_dns() {
+    let _ = env_logger::builder().is_test(true).try_init();
+    let server = server::http(move |_req| async { http::Response::new("Hello".into()) });
+
+    let overridden_domain = "rust-lang.org";
+    let url = format!(
+        "http://{}:{}/domain_override",
+        overridden_domain,
+        server.addr().port()
+    );
+    let client = reqwest::Client::builder()
+        .resolve(overridden_domain, server.addr())
+        .trust_dns(true)
+        .build()
+        .expect("client builder");
+    let req = client.get(&url);
+    let res = req.send().await.expect("request");
+
+    assert_eq!(res.status(), reqwest::StatusCode::OK);
+    let text = res.text().await.expect("Failed to get text");
+    assert_eq!("Hello", text);
+}
+
 #[cfg(any(feature = "native-tls", feature = "__rustls",))]
 #[test]
 fn use_preconfigured_tls_with_bogus_backend() {
@@ -200,6 +254,27 @@
         .expect("preconfigured rustls tls");
 }
 
+#[cfg(feature = "__rustls")]
+#[tokio::test]
+#[ignore = "Needs TLS support in the test server"]
+async fn http2_upgrade() {
+    let server = server::http(move |_| async move { http::Response::default() });
+
+    let url = format!("https://localhost:{}", server.addr().port());
+    let res = reqwest::Client::builder()
+        .danger_accept_invalid_certs(true)
+        .use_rustls_tls()
+        .build()
+        .expect("client builder")
+        .get(&url)
+        .send()
+        .await
+        .expect("request");
+
+    assert_eq!(res.status(), reqwest::StatusCode::OK);
+    assert_eq!(res.version(), reqwest::Version::HTTP_2);
+}
+
 #[cfg(feature = "default-tls")]
 #[tokio::test]
 async fn test_allowed_methods() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/deflate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/deflate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/deflate.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/deflate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,151 @@
+mod support;
+use std::io::Write;
+use support::*;
+
+#[tokio::test]
+async fn deflate_response() {
+    deflate_case(10_000, 4096).await;
+}
+
+#[tokio::test]
+async fn deflate_single_byte_chunks() {
+    deflate_case(10, 1).await;
+}
+
+#[tokio::test]
+async fn test_deflate_empty_body() {
+    let server = server::http(move |req| async move {
+        assert_eq!(req.method(), "HEAD");
+
+        http::Response::builder()
+            .header("content-encoding", "deflate")
+            .header("content-length", 100)
+            .body(Default::default())
+            .unwrap()
+    });
+
+    let client = reqwest::Client::new();
+    let res = client
+        .head(&format!("http://{}/deflate", server.addr()))
+        .send()
+        .await
+        .unwrap();
+
+    let body = res.text().await.unwrap();
+
+    assert_eq!(body, "");
+}
+
+#[tokio::test]
+async fn test_accept_header_is_not_changed_if_set() {
+    let server = server::http(move |req| async move {
+        assert_eq!(req.headers()["accept"], "application/json");
+        assert!(req.headers()["accept-encoding"]
+            .to_str()
+            .unwrap()
+            .contains("deflate"));
+        http::Response::default()
+    });
+
+    let client = reqwest::Client::new();
+
+    let res = client
+        .get(&format!("http://{}/accept", server.addr()))
+        .header(
+            reqwest::header::ACCEPT,
+            reqwest::header::HeaderValue::from_static("application/json"),
+        )
+        .send()
+        .await
+        .unwrap();
+
+    assert_eq!(res.status(), reqwest::StatusCode::OK);
+}
+
+#[tokio::test]
+async fn test_accept_encoding_header_is_not_changed_if_set() {
+    let server = server::http(move |req| async move {
+        assert_eq!(req.headers()["accept"], "*/*");
+        assert_eq!(req.headers()["accept-encoding"], "identity");
+        http::Response::default()
+    });
+
+    let client = reqwest::Client::new();
+
+    let res = client
+        .get(&format!("http://{}/accept-encoding", server.addr()))
+        .header(
+            reqwest::header::ACCEPT_ENCODING,
+            reqwest::header::HeaderValue::from_static("identity"),
+        )
+        .send()
+        .await
+        .unwrap();
+
+    assert_eq!(res.status(), reqwest::StatusCode::OK);
+}
+
+async fn deflate_case(response_size: usize, chunk_size: usize) {
+    use futures_util::stream::StreamExt;
+
+    let content: String = (0..response_size)
+        .into_iter()
+        .map(|i| format!("test {}", i))
+        .collect();
+    let mut encoder = libflate::zlib::Encoder::new(Vec::new()).unwrap();
+    match encoder.write(content.as_bytes()) {
+        Ok(n) => assert!(n > 0, "Failed to write to encoder."),
+        _ => panic!("Failed to deflate encode string."),
+    };
+
+    let deflated_content = encoder.finish().into_result().unwrap();
+
+    let mut response = format!(
+        "\
+         HTTP/1.1 200 OK\r\n\
+         Server: test-accept\r\n\
+         Content-Encoding: deflate\r\n\
+         Content-Length: {}\r\n\
+         \r\n",
+        &deflated_content.len()
+    )
+    .into_bytes();
+    response.extend(&deflated_content);
+
+    let server = server::http(move |req| {
+        assert!(req.headers()["accept-encoding"]
+            .to_str()
+            .unwrap()
+            .contains("deflate"));
+
+        let deflated = deflated_content.clone();
+        async move {
+            let len = deflated.len();
+            let stream =
+                futures_util::stream::unfold((deflated, 0), move |(deflated, pos)| async move {
+                    let chunk = deflated.chunks(chunk_size).nth(pos)?.to_vec();
+
+                    Some((chunk, (deflated, pos + 1)))
+                });
+
+            let body = hyper::Body::wrap_stream(stream.map(Ok::<_, std::convert::Infallible>));
+
+            http::Response::builder()
+                .header("content-encoding", "deflate")
+                .header("content-length", len)
+                .body(body)
+                .unwrap()
+        }
+    });
+
+    let client = reqwest::Client::new();
+
+    let res = client
+        .get(&format!("http://{}/deflate", server.addr()))
+        .send()
+        .await
+        .expect("response");
+
+    let body = res.text().await.expect("text");
+    assert_eq!(body, content);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/redirect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/redirect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/redirect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/redirect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -155,14 +155,15 @@
 async fn test_redirect_removes_sensitive_headers() {
     use tokio::sync::watch;
 
-    let (tx, rx) = watch::channel(None);
+    let (tx, rx) = watch::channel::<Option<std::net::SocketAddr>>(None);
 
     let end_server = server::http(move |req| {
         let mut rx = rx.clone();
         async move {
             assert_eq!(req.headers().get("cookie"), None);
 
-            let mid_addr = rx.recv().await.unwrap().unwrap();
+            rx.changed().await.unwrap();
+            let mid_addr = rx.borrow().unwrap();
             assert_eq!(
                 req.headers()["referer"],
                 format!("http://{}/sensitive", mid_addr)
@@ -182,7 +183,7 @@
             .unwrap()
     });
 
-    tx.broadcast(Some(mid_server.addr())).unwrap();
+    tx.send(Some(mid_server.addr())).unwrap();
 
     reqwest::Client::builder()
         .build()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/support/server.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/support/server.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/support/server.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/support/server.rs	2021-12-09 12:01:26.000000000 +0000
@@ -44,8 +44,7 @@
 {
     //Spawn new runtime in thread to prevent reactor execution context conflict
     thread::spawn(move || {
-        let mut rt = runtime::Builder::new()
-            .basic_scheduler()
+        let rt = runtime::Builder::new_current_thread()
             .enable_all()
             .build()
             .expect("new rt");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/timeouts.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/timeouts.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/reqwest/tests/timeouts.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/reqwest/tests/timeouts.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
     let server = server::http(move |_req| {
         async {
             // delay returning the response
-            tokio::time::delay_for(Duration::from_secs(2)).await;
+            tokio::time::sleep(Duration::from_secs(2)).await;
             http::Response::default()
         }
     });
@@ -38,7 +38,7 @@
     let server = server::http(move |_req| {
         async {
             // delay returning the response
-            tokio::time::delay_for(Duration::from_secs(2)).await;
+            tokio::time::sleep(Duration::from_secs(2)).await;
             http::Response::default()
         }
     });
@@ -94,7 +94,7 @@
         async {
             // immediate response, but delayed body
             let body = hyper::Body::wrap_stream(futures_util::stream::once(async {
-                tokio::time::delay_for(Duration::from_secs(2)).await;
+                tokio::time::sleep(Duration::from_secs(2)).await;
                 Ok::<_, std::convert::Infallible>("Hello")
             }));
 
@@ -134,7 +134,7 @@
     let server = server::http(move |_req| {
         async {
             // delay returning the response
-            tokio::time::delay_for(Duration::from_secs(2)).await;
+            tokio::time::sleep(Duration::from_secs(2)).await;
             http::Response::default()
         }
     });
@@ -158,7 +158,7 @@
     let server = server::http(move |_req| {
         async {
             // delay returning the response
-            tokio::time::delay_for(Duration::from_secs(2)).await;
+            tokio::time::sleep(Duration::from_secs(2)).await;
             http::Response::default()
         }
     });
@@ -191,7 +191,7 @@
     let server = server::http(move |_req| {
         async {
             // delay returning the response
-            tokio::time::delay_for(Duration::from_secs(2)).await;
+            tokio::time::sleep(Duration::from_secs(2)).await;
             http::Response::default()
         }
     });
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"5ec3f32d09a22757e0f36f39dbd57db8bb382e274446364eb0604b84ed9664e7","Cargo.toml":"847d8033f0dec82bee18fb3dc76f685f34431b7b0af813de9a18fd8a36b374d4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"26b997d1a1496df49cb1ad2cbe024714cd9126543c18e1bc6c7bbca1b3dc42b6","README.md":"2e5715166ab7b99342d7be096db244709d96c3dc2fbe393eb8afe7de198ecd37","src/argon2.rs":"c7ee856d807a6f3eb72efacd0af96d71f1075ae8e754831485f3b80c072caaab","src/block.rs":"08968700128c9d5de01a60b070fbe20fee8c5bf7428979515d3598ddc4268a6f","src/common.rs":"ff3d031e058e65cc03247008c61ba702e08d2d2545536c86aa208bbc05e7e8e2","src/config.rs":"60b2fcfca173d613e78edebb8827aacec4007675f64bdad5a038c7c7f8b1456c","src/context.rs":"3e774b14e97f336c0935b0eacec44e11daeda6d2039eefb93ed3568b4e48ba02","src/core.rs":"273633c52892dae6da3d4e4c9cd116d59f4235ab65c57a6dd0d31042657d27fa","src/decoded.rs":"0e7b4a64a1848809a9e0dd95618eb32851f13a5ac73f95e4547cfbb71d0dfdbb","src/encoding.rs":"532089c7233908b2ce7082f920f4c95b8d568160b9fd0b1a8f4d2a962623a681","src/error.rs":"e8fd91c80830d97af6d132dc8c7e9d0dcaf690ca7c1daf8b661b1ad5cb15443c","src/lib.rs":"22c795c286035f2dd5f5ea668b67cca2f25e46ba7f68a084edae91b65ef197e6","src/memory.rs":"bee7a02c738024c4a0fbfd2f4ae6515fb8ec36cb3922dd2ff0683f7864b3b713","src/result.rs":"54afe0972853b6e16c8a99118ddf4564112b8446ba4592131c4c66afd55822dd","src/thread_mode.rs":"21814ede00af01d43c0b04392bcfa0dc6fa24d0bedcef13248a100b2e9b290a8","src/variant.rs":"8ec67987dded48b1851085df99b1f25aa4c99b749acc60476db77f6d780672e5","src/version.rs":"6cdbb34892e1c09983eb81aec39be93bb5ea09ad001aa9f7c387f631be7feda4","tests/integration_test.rs":"25fbc41a35595223d074091844f934b816c75fbd535153e998470479fb1b7478"},"package":"4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "rust-argon2"
-version = "0.8.3"
-authors = ["Martijn Rijkeboer <mrr@sru-systems.com>"]
-description = "Rust implementation of the Argon2 password hashing function."
-homepage = "https://github.com/sru-systems/rust-argon2"
-documentation = "https://docs.sru-systems.com/rust-argon2/0.8.0/argon2/"
-readme = "README.md"
-keywords = ["argon2", "argon2d", "argon2i", "hash", "password"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/sru-systems/rust-argon2"
-
-[lib]
-name = "argon2"
-[dependencies.base64]
-version = "0.13"
-
-[dependencies.blake2b_simd]
-version = "0.5"
-
-[dependencies.constant_time_eq]
-version = "0.1.4"
-
-[dependencies.crossbeam-utils]
-version = "0.8"
-optional = true
-
-[dependencies.serde]
-version = "1.0.116"
-features = ["derive"]
-optional = true
-[dev-dependencies.hex]
-version = "0.4"
-
-[features]
-default = ["crossbeam-utils"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-ChangeLog for rust-argon2
-=========================
-
-This documents all notable changes to
-[rust-argon2](https://github.com/sru-systems/rust-argon2).
-
-
-## 0.8.3
-
-- Replace transmute with to_le_bytes.
-- Update base64 to version 0.13.
-- Update crossbeam-utils to version 0.8.
-- Update hex to version 0.4.
-- Derive Clone for Error struct.
-- Add optional serde support for Error struct.
-
-
-## 0.8.2
-
-- Change base64 to latest version (0.12).
-
-
-## 0.8.1
-
-- Fix issue with verifying multi-lane hashes with parallelism disabled (#27)
-
-## 0.8.0
-
-- Make parallelism optional via feature flag.
-
-
-## 0.7.0
-
-- Update crossbeam-utils dependency to 0.7.
-
-
-## 0.6.1
-
-- Use constant time equals to compare hashes.
-
-
-## 0.6.0
-
-- Use 2018 edition or Rust
-- Use &dyn error::Error instead of &error::Error
-- Fix clippy lints
-- Allow callers of encode_string to pass any &[u8]
-- Update base64 dependency.
-
-
-## 0.5.1
-
-- Use crossbeam utils 0.6 instead of crossbeam 0.5
-
-
-## 0.5.0
-
-- Replace blake2-rfc with blake2b_simd.
-
-
-## 0.4.0
-
-- Replace rustc-serialize dependency with base64 and hex.
-- Update base64 dependency.
-- Update crossbeam dependency.
-- Update hex dependency.
-- Allow updating to minor versions of blake2-rfc.
-
-
-## 0.3.0
-
-- Embed Config struct in Context struct.
-
-
-## 0.2.0
-
-- Use ThreadMode enum instead of explicit thread number.
-- Use a Config struct instead of explicit configuration arguments.
-- Use references instead of vectors for byte data in the Context struct.
-- Deprecate the following functions:
-  - hash_encoded_defaults
-  - hash_encoded_old
-  - hash_encoded_std
-  - hash_raw_defaults
-  - hash_raw_old
-  - hash_raw_std
-  - verify_raw_old
-  - verify_raw_std
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-The MIT license.
-
-Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-# Rust-argon2
-
-Rust library for hashing passwords using
-[Argon2](https://github.com/P-H-C/phc-winner-argon2), the password-hashing
-function that won the
-[Password Hashing Competition (PHC)](https://password-hashing.net).
-
-## Usage
-
-To use `rust-argon2`, add the following to your Cargo.toml:
-
-```toml
-[dependencies]
-rust-argon2 = "0.8"
-```
-
-And the following to your crate root:
-
-```rust
-extern crate argon2;
-```
-
-
-## Examples
-
-Create a password hash using the defaults and verify it:
-
-```rust
-use argon2::{self, Config};
-
-let password = b"password";
-let salt = b"randomsalt";
-let config = Config::default();
-let hash = argon2::hash_encoded(password, salt, &config).unwrap();
-let matches = argon2::verify_encoded(&hash, password).unwrap();
-assert!(matches);
-```
-
-Create a password hash with custom settings and verify it:
-
-```rust
-use argon2::{self, Config, ThreadMode, Variant, Version};
-
-let password = b"password";
-let salt = b"othersalt";
-let config = Config {
-    variant: Variant::Argon2i,
-    version: Version::Version13,
-    mem_cost: 65536,
-    time_cost: 10,
-    lanes: 4,
-    thread_mode: ThreadMode::Parallel,
-    secret: &[],
-    ad: &[],
-    hash_length: 32
-};
-let hash = argon2::hash_encoded(password, salt, &config).unwrap();
-let matches = argon2::verify_encoded(&hash, password).unwrap();
-assert!(matches);
-```
-
-
-## Limitations
-
-This crate has the same limitation as the `blake2-rfc` crate that it uses.
-It does not attempt to clear potentially sensitive data from its work
-memory. To do so correctly without a heavy performance penalty would
-require help from the compiler. It's better to not attempt to do so than to
-present a false assurance.
-
-This version uses the standard implementation and does not yet implement
-optimizations. Therefore, it is not the fastest implementation available.
-
-
-## License
-
-Rust-argon2 is dual licensed under the [MIT](LICENSE-MIT) and
-[Apache 2.0](LICENSE-APACHE) licenses, the same licenses as the Rust compiler.
-
-
-## Contributions
-
-Contributions are welcome. By submitting a pull request you are agreeing to
-make you work available under the license terms of the Rust-argon2 project.
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/argon2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/argon2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/argon2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/argon2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,760 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::config::Config;
-use crate::context::Context;
-use crate::core;
-use crate::encoding;
-use crate::memory::Memory;
-use crate::result::Result;
-use crate::thread_mode::ThreadMode;
-use crate::variant::Variant;
-use crate::version::Version;
-
-use constant_time_eq::constant_time_eq;
-
-/// Returns the length of the encoded string.
-///
-/// # Remarks
-///
-/// The length is **one** less that the original C version, since no null
-/// terminator is used.
-///
-/// # Examples
-///
-/// ```rust
-/// use argon2::{self, Variant};
-///
-/// let variant = Variant::Argon2i;
-/// let mem = 4096;
-/// let time = 10;
-/// let parallelism = 10;
-/// let salt_len = 8;
-/// let hash_len = 32;
-/// let enc_len = argon2::encoded_len(variant, mem, time, parallelism, salt_len, hash_len);
-/// assert_eq!(enc_len, 86);
-/// ```
-#[rustfmt::skip]
-pub fn encoded_len(
-    variant: Variant,
-    mem_cost: u32,
-    time_cost: u32,
-    parallelism: u32,
-    salt_len: u32,
-    hash_len: u32
-) -> u32 {
-    ("$$v=$m=,t=,p=$$".len() as u32)  +
-    (variant.as_lowercase_str().len() as u32) +
-    encoding::num_len(Version::default().as_u32()) +
-    encoding::num_len(mem_cost) +
-    encoding::num_len(time_cost) +
-    encoding::num_len(parallelism) +
-    encoding::base64_len(salt_len) +
-    encoding::base64_len(hash_len)
-}
-
-/// Hashes the password and returns the encoded hash.
-///
-/// # Examples
-///
-/// Create an encoded hash with the default configuration:
-///
-/// ```
-/// use argon2::{self, Config};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let config = Config::default();
-/// let encoded = argon2::hash_encoded(pwd, salt, &config).unwrap();
-/// ```
-///
-///
-/// Create an Argon2d encoded hash with 4 lanes and parallel execution:
-///
-/// ```
-/// use argon2::{self, Config, ThreadMode, Variant};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let mut config = Config::default();
-/// config.variant = Variant::Argon2d;
-#[cfg_attr(feature = "crossbeam-utils", doc = "config.lanes = 4;")]
-#[cfg_attr(
-    feature = "crossbeam-utils",
-    doc = "config.thread_mode = ThreadMode::Parallel;"
-)]
-#[cfg_attr(not(feature = "crossbeam-utils"), doc = "config.lanes = 1;")]
-#[cfg_attr(
-    not(feature = "crossbeam-utils"),
-    doc = "config.thread_mode = ThreadMode::Sequential;"
-)]
-/// let encoded = argon2::hash_encoded(pwd, salt, &config).unwrap();
-/// ```
-pub fn hash_encoded(pwd: &[u8], salt: &[u8], config: &Config) -> Result<String> {
-    let context = Context::new(config.clone(), pwd, salt)?;
-    let hash = run(&context);
-    let encoded = encoding::encode_string(&context, &hash);
-    Ok(encoded)
-}
-
-/// Hashes the password using default settings and returns the encoded hash.
-///
-/// # Examples
-///
-/// ```
-/// use argon2;
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let encoded = argon2::hash_encoded_defaults(pwd, salt).unwrap();
-/// ```
-///
-/// The above rewritten using `hash_encoded`:
-///
-/// ```
-/// use argon2::{self, Config};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let config = Config::default();
-/// let encoded = argon2::hash_encoded(pwd, salt, &config).unwrap();
-/// ```
-#[deprecated(since = "0.2.0", note = "please use `hash_encoded` instead")]
-pub fn hash_encoded_defaults(pwd: &[u8], salt: &[u8]) -> Result<String> {
-    hash_encoded(pwd, salt, &Config::default())
-}
-
-/// Hashes the password and returns the encoded hash (pre 0.2.0 `hash_encoded`).
-///
-/// # Examples
-///
-///
-/// ```
-/// use argon2::{self, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let mem_cost = 4096;
-/// let time_cost = 10;
-/// let lanes = 1;
-/// let threads = 1;
-/// let secret = b"secret value";
-/// let ad = b"associated data";
-/// let hash_len = 32;
-/// let encoded = argon2::hash_encoded_old(Variant::Argon2i,
-///                                        Version::Version13,
-///                                        mem_cost,
-///                                        time_cost,
-///                                        lanes,
-///                                        threads,
-///                                        pwd,
-///                                        salt,
-///                                        secret,
-///                                        ad,
-///                                        hash_len).unwrap();
-/// ```
-///
-/// The above rewritten using the new `hash_encoded`:
-///
-/// ```
-/// use argon2::{self, Config, ThreadMode, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let config = Config {
-///     variant: Variant::Argon2i,
-///     version: Version::Version13,
-///     mem_cost: 4096,
-///     time_cost: 10,
-///     lanes: 1,
-///     thread_mode: ThreadMode::Sequential,
-///     secret: b"secret value",
-///     ad: b"associated data",
-///     hash_length: 32,
-/// };
-/// let encoded = argon2::hash_encoded(pwd, salt, &config).unwrap();
-/// ```
-#[deprecated(since = "0.2.0", note = "please use new `hash_encoded` instead")]
-pub fn hash_encoded_old(
-    variant: Variant,
-    version: Version,
-    mem_cost: u32,
-    time_cost: u32,
-    lanes: u32,
-    threads: u32,
-    pwd: &[u8],
-    salt: &[u8],
-    secret: &[u8],
-    ad: &[u8],
-    hash_len: u32,
-) -> Result<String> {
-    let threads = if cfg!(feature = "crossbeam-utils") { threads } else { 1 };
-    let config = Config {
-        variant,
-        version,
-        mem_cost,
-        time_cost,
-        lanes,
-        thread_mode: ThreadMode::from_threads(threads),
-        secret,
-        ad,
-        hash_length: hash_len,
-    };
-    hash_encoded(pwd, salt, &config)
-}
-
-/// Hashes the password and returns the encoded hash (standard).
-///
-/// # Examples
-///
-///
-/// ```
-/// use argon2::{self, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let mem_cost = 4096;
-/// let time_cost = 10;
-/// let parallelism = 1;
-/// let hash_len = 32;
-/// let encoded = argon2::hash_encoded_std(Variant::Argon2i,
-///                                        Version::Version13,
-///                                        mem_cost,
-///                                        time_cost,
-///                                        parallelism,
-///                                        pwd,
-///                                        salt,
-///                                        hash_len).unwrap();
-/// ```
-///
-/// The above rewritten using `hash_encoded`:
-///
-/// ```
-/// use argon2::{self, Config, ThreadMode, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let config = Config {
-///     variant: Variant::Argon2i,
-///     version: Version::Version13,
-///     mem_cost: 4096,
-///     time_cost: 10,
-///     lanes: 1,
-///     thread_mode: ThreadMode::Sequential,
-///     secret: &[],
-///     ad: &[],
-///     hash_length: 32,
-/// };
-/// let encoded = argon2::hash_encoded(pwd, salt, &config).unwrap();
-/// ```
-#[deprecated(since = "0.2.0", note = "please use `hash_encoded` instead")]
-pub fn hash_encoded_std(
-    variant: Variant,
-    version: Version,
-    mem_cost: u32,
-    time_cost: u32,
-    parallelism: u32,
-    pwd: &[u8],
-    salt: &[u8],
-    hash_len: u32,
-) -> Result<String> {
-    let threads = if cfg!(feature = "crossbeam-utils") { parallelism } else { 1 };
-    let config = Config {
-        variant,
-        version,
-        mem_cost,
-        time_cost,
-        lanes: parallelism,
-        thread_mode: ThreadMode::from_threads(threads),
-        secret: &[],
-        ad: &[],
-        hash_length: hash_len,
-    };
-    hash_encoded(pwd, salt, &config)
-}
-
-/// Hashes the password and returns the hash as a vector.
-///
-/// # Examples
-///
-/// Create a hash with the default configuration:
-///
-/// ```
-/// use argon2::{self, Config};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let config = Config::default();
-/// let vec = argon2::hash_raw(pwd, salt, &config).unwrap();
-/// ```
-///
-///
-/// Create an Argon2d hash with 4 lanes and parallel execution:
-///
-/// ```
-/// use argon2::{self, Config, ThreadMode, Variant};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let mut config = Config::default();
-/// config.variant = Variant::Argon2d;
-#[cfg_attr(feature = "crossbeam-utils", doc = "config.lanes = 4;")]
-#[cfg_attr(
-    feature = "crossbeam-utils",
-    doc = "config.thread_mode = ThreadMode::Parallel;"
-)]
-#[cfg_attr(not(feature = "crossbeam-utils"), doc = "config.lanes = 1;")]
-#[cfg_attr(
-    not(feature = "crossbeam-utils"),
-    doc = "config.thread_mode = ThreadMode::Sequential;"
-)]
-/// let vec = argon2::hash_raw(pwd, salt, &config).unwrap();
-/// ```
-pub fn hash_raw(pwd: &[u8], salt: &[u8], config: &Config) -> Result<Vec<u8>> {
-    let context = Context::new(config.clone(), pwd, salt)?;
-    let hash = run(&context);
-    Ok(hash)
-}
-
-/// Hashes the password using default settings and returns the hash as a vector.
-///
-/// # Examples
-///
-/// ```
-/// use argon2;
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let vec = argon2::hash_raw_defaults(pwd, salt).unwrap();
-/// ```
-///
-/// The above rewritten using `hash_raw`:
-///
-/// ```
-/// use argon2::{self, Config};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let config = Config::default();
-/// let vec = argon2::hash_raw(pwd, salt, &config).unwrap();
-/// ```
-#[deprecated(since = "0.2.0", note = "please use `hash_raw` instead")]
-pub fn hash_raw_defaults(pwd: &[u8], salt: &[u8]) -> Result<Vec<u8>> {
-    hash_raw(pwd, salt, &Config::default())
-}
-
-/// Hashes the password and returns the hash as a vector (pre 0.2.0 `hash_raw`).
-///
-/// # Examples
-///
-///
-/// ```
-/// use argon2::{self, Variant, Version};
-///
-/// let mem_cost = 4096;
-/// let time_cost = 10;
-/// let lanes = 1;
-/// let threads = 1;
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let secret = b"secret value";
-/// let ad = b"associated data";
-/// let hash_len = 32;
-/// let vec = argon2::hash_raw_old(Variant::Argon2i,
-///                                Version::Version13,
-///                                mem_cost,
-///                                time_cost,
-///                                lanes,
-///                                threads,
-///                                pwd,
-///                                salt,
-///                                secret,
-///                                ad,
-///                                hash_len).unwrap();
-/// ```
-///
-/// The above rewritten using the new `hash_raw`:
-///
-/// ```
-/// use argon2::{self, Config, ThreadMode, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let config = Config {
-///     variant: Variant::Argon2i,
-///     version: Version::Version13,
-///     mem_cost: 4096,
-///     time_cost: 10,
-///     lanes: 1,
-///     thread_mode: ThreadMode::Sequential,
-///     secret: b"secret value",
-///     ad: b"associated data",
-///     hash_length: 32,
-/// };
-/// let vec = argon2::hash_raw(pwd, salt, &config);
-/// ```
-#[deprecated(since = "0.2.0", note = "please use new `hash_raw` instead")]
-pub fn hash_raw_old(
-    variant: Variant,
-    version: Version,
-    mem_cost: u32,
-    time_cost: u32,
-    lanes: u32,
-    threads: u32,
-    pwd: &[u8],
-    salt: &[u8],
-    secret: &[u8],
-    ad: &[u8],
-    hash_len: u32,
-) -> Result<Vec<u8>> {
-    let threads = if cfg!(feature = "crossbeam-utils") { threads } else { 1 };
-    let config = Config {
-        variant,
-        version,
-        mem_cost,
-        time_cost,
-        lanes,
-        thread_mode: ThreadMode::from_threads(threads),
-        secret,
-        ad,
-        hash_length: hash_len,
-    };
-    hash_raw(pwd, salt, &config)
-}
-
-/// Hashes the password and returns the hash as a vector (standard).
-///
-/// # Examples
-///
-///
-/// ```
-/// use argon2::{self, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let mem_cost = 4096;
-/// let time_cost = 10;
-/// let parallelism = 1;
-/// let hash_len = 32;
-/// let vec = argon2::hash_raw_std(Variant::Argon2i,
-///                                Version::Version13,
-///                                mem_cost,
-///                                time_cost,
-///                                parallelism,
-///                                pwd,
-///                                salt,
-///                                hash_len).unwrap();
-/// ```
-///
-/// The above rewritten using `hash_raw`:
-///
-/// ```
-/// use argon2::{self, Config, ThreadMode, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let config = Config {
-///     variant: Variant::Argon2i,
-///     version: Version::Version13,
-///     mem_cost: 4096,
-///     time_cost: 10,
-///     lanes: 1,
-///     thread_mode: ThreadMode::Sequential,
-///     secret: &[],
-///     ad: &[],
-///     hash_length: 32,
-/// };
-/// let vec = argon2::hash_raw(pwd, salt, &config);
-/// ```
-#[deprecated(since = "0.2.0", note = "please use `hash_raw` instead")]
-pub fn hash_raw_std(
-    variant: Variant,
-    version: Version,
-    mem_cost: u32,
-    time_cost: u32,
-    parallelism: u32,
-    pwd: &[u8],
-    salt: &[u8],
-    hash_len: u32,
-) -> Result<Vec<u8>> {
-    let threads = if cfg!(feature = "crossbeam-utils") { parallelism } else { 1 };
-    let config = Config {
-        variant,
-        version,
-        mem_cost,
-        time_cost,
-        lanes: parallelism,
-        thread_mode: ThreadMode::from_threads(threads),
-        secret: &[],
-        ad: &[],
-        hash_length: hash_len,
-    };
-    hash_raw(pwd, salt, &config)
-}
-
-/// Verifies the password with the encoded hash.
-///
-/// # Examples
-///
-/// ```
-/// use argon2;
-///
-/// let enc = "$argon2i$v=19$m=4096,t=3,p=1$c29tZXNhbHQ\
-///            $iWh06vD8Fy27wf9npn6FXWiCX4K6pW6Ue1Bnzz07Z8A";
-/// let pwd = b"password";
-/// let res = argon2::verify_encoded(enc, pwd).unwrap();
-/// assert!(res);
-/// ```
-pub fn verify_encoded(encoded: &str, pwd: &[u8]) -> Result<bool> {
-    verify_encoded_ext(encoded, pwd, &[], &[])
-}
-
-/// Verifies the password with the encoded hash, secret and associated data.
-///
-/// # Examples
-///
-/// ```
-/// use argon2;
-///
-/// let enc = "$argon2i$v=19$m=4096,t=3,p=1$c29tZXNhbHQ\
-///            $OlcSvlN20Lz43sK3jhCJ9K04oejhiY0AmI+ck6nuETo";
-/// let pwd = b"password";
-/// let secret = b"secret";
-/// let ad = b"ad";
-/// let res = argon2::verify_encoded_ext(enc, pwd, secret, ad).unwrap();
-/// assert!(res);
-/// ```
-pub fn verify_encoded_ext(encoded: &str, pwd: &[u8], secret: &[u8], ad: &[u8]) -> Result<bool> {
-    let decoded = encoding::decode_string(encoded)?;
-    let threads = if cfg!(feature = "crossbeam-utils") { decoded.parallelism } else { 1 };
-    let config = Config {
-        variant: decoded.variant,
-        version: decoded.version,
-        mem_cost: decoded.mem_cost,
-        time_cost: decoded.time_cost,
-        lanes: decoded.parallelism,
-        thread_mode: ThreadMode::from_threads(threads),
-        secret,
-        ad,
-        hash_length: decoded.hash.len() as u32,
-    };
-    verify_raw(pwd, &decoded.salt, &decoded.hash, &config)
-}
-
-/// Verifies the password with the supplied configuration.
-///
-/// # Examples
-///
-///
-/// ```
-/// use argon2::{self, Config};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let hash = &[137, 104, 116, 234, 240, 252, 23, 45, 187, 193, 255, 103, 166,
-///              126, 133, 93, 104, 130, 95, 130, 186, 165, 110, 148, 123, 80,
-///              103, 207, 61, 59, 103, 192];
-/// let config = Config::default();
-/// let res = argon2::verify_raw(pwd, salt, hash, &config).unwrap();
-/// assert!(res);
-/// ```
-pub fn verify_raw(pwd: &[u8], salt: &[u8], hash: &[u8], config: &Config) -> Result<bool> {
-    let config = Config {
-        hash_length: hash.len() as u32,
-        ..config.clone()
-    };
-    let context = Context::new(config, pwd, salt)?;
-    let calculated_hash = run(&context);
-    Ok(constant_time_eq(hash, &calculated_hash))
-}
-
-/// Verifies the password with the supplied settings (pre 0.2.0 `verify_raw`).
-///
-/// # Examples
-///
-/// ```
-/// use argon2::{self, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let hash = &[137, 104, 116, 234, 240, 252, 23, 45, 187, 193, 255, 103, 166,
-///              126, 133, 93, 104, 130, 95, 130, 186, 165, 110, 148, 123, 80,
-///              103, 207, 61, 59, 103, 192];
-/// let mem_cost = 4096;
-/// let time_cost = 3;
-/// let lanes = 1;
-/// let threads = 1;
-/// let secret = &[];
-/// let ad = &[];
-/// let res = argon2::verify_raw_old(Variant::Argon2i,
-///                                  Version::Version13,
-///                                  mem_cost,
-///                                  time_cost,
-///                                  lanes,
-///                                  threads,
-///                                  pwd,
-///                                  salt,
-///                                  secret,
-///                                  ad,
-///                                  hash).unwrap();
-/// assert!(res);
-/// ```
-///
-/// The above rewritten using the new `verify_raw`:
-///
-/// ```
-/// use argon2::{self, Config, ThreadMode, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let hash = &[137, 104, 116, 234, 240, 252, 23, 45, 187, 193, 255, 103, 166,
-///              126, 133, 93, 104, 130, 95, 130, 186, 165, 110, 148, 123, 80,
-///              103, 207, 61, 59, 103, 192];
-/// let config = Config {
-///     variant: Variant::Argon2i,
-///     version: Version::Version13,
-///     mem_cost: 4096,
-///     time_cost: 3,
-///     lanes: 1,
-///     thread_mode: ThreadMode::Sequential,
-///     secret: &[],
-///     ad: &[],
-///     hash_length: hash.len() as u32,
-/// };
-/// let res = argon2::verify_raw(pwd, salt, hash, &config).unwrap();
-/// assert!(res);
-/// ```
-#[deprecated(since = "0.2.0", note = "please use new `verify_raw` instead")]
-pub fn verify_raw_old(
-    variant: Variant,
-    version: Version,
-    mem_cost: u32,
-    time_cost: u32,
-    lanes: u32,
-    threads: u32,
-    pwd: &[u8],
-    salt: &[u8],
-    secret: &[u8],
-    ad: &[u8],
-    hash: &[u8],
-) -> Result<bool> {
-    let threads = if cfg!(feature = "crossbeam-utils") { threads } else { 1 };
-    let config = Config {
-        variant,
-        version,
-        mem_cost,
-        time_cost,
-        lanes,
-        thread_mode: ThreadMode::from_threads(threads),
-        secret,
-        ad,
-        hash_length: hash.len() as u32,
-    };
-    verify_raw(pwd, salt, hash, &config)
-}
-
-/// Verifies the password with the supplied settings (standard).
-///
-/// # Examples
-///
-///
-/// ```
-/// use argon2::{self, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let hash = &[137, 104, 116, 234, 240, 252, 23, 45, 187, 193, 255, 103, 166,
-///              126, 133, 93, 104, 130, 95, 130, 186, 165, 110, 148, 123, 80,
-///              103, 207, 61, 59, 103, 192];
-/// let mem_cost = 4096;
-/// let time_cost = 3;
-/// let parallelism = 1;
-/// let res = argon2::verify_raw_std(Variant::Argon2i,
-///                                  Version::Version13,
-///                                  mem_cost,
-///                                  time_cost,
-///                                  parallelism,
-///                                  pwd,
-///                                  salt,
-///                                  hash).unwrap();
-/// assert!(res);
-/// ```
-///
-/// The above rewritten using `verify_raw`:
-///
-/// ```
-/// use argon2::{self, Config, ThreadMode, Variant, Version};
-///
-/// let pwd = b"password";
-/// let salt = b"somesalt";
-/// let hash = &[137, 104, 116, 234, 240, 252, 23, 45, 187, 193, 255, 103, 166,
-///              126, 133, 93, 104, 130, 95, 130, 186, 165, 110, 148, 123, 80,
-///              103, 207, 61, 59, 103, 192];
-/// let config = Config {
-///     variant: Variant::Argon2i,
-///     version: Version::Version13,
-///     mem_cost: 4096,
-///     time_cost: 3,
-///     lanes: 1,
-///     thread_mode: ThreadMode::Sequential,
-///     secret: &[],
-///     ad: &[],
-///     hash_length: hash.len() as u32,
-/// };
-/// let res = argon2::verify_raw(pwd, salt, hash, &config).unwrap();
-/// assert!(res);
-/// ```
-#[deprecated(since = "0.2.0", note = "please use `verify_raw` instead")]
-pub fn verify_raw_std(
-    variant: Variant,
-    version: Version,
-    mem_cost: u32,
-    time_cost: u32,
-    parallelism: u32,
-    pwd: &[u8],
-    salt: &[u8],
-    hash: &[u8],
-) -> Result<bool> {
-    let threads = if cfg!(feature = "crossbeam-utils") { parallelism } else { 1 };
-    let config = Config {
-        variant,
-        version,
-        mem_cost,
-        time_cost,
-        lanes: parallelism,
-        thread_mode: ThreadMode::from_threads(threads),
-        secret: &[],
-        ad: &[],
-        hash_length: hash.len() as u32,
-    };
-    verify_raw(pwd, salt, hash, &config)
-}
-
-fn run(context: &Context) -> Vec<u8> {
-    let mut memory = Memory::new(context.config.lanes, context.lane_length);
-    core::initialize(context, &mut memory);
-    core::fill_memory_blocks(context, &mut memory);
-    core::finalize(context, &memory)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn single_thread_verification_multi_lane_hash() {
-        /*
-        let hash = hash_encoded(b"foo", b"abcdefghijklmnopqrstuvwxyz", &Config {
-            lanes: 4, thread_mode: ThreadMode::Parallel,
-            ..Config::default()
-        });
-        */
-        let hash = "$argon2i$v=19$m=4096,t=3,p=4$YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXo$BvBk2OaSofBHfbrUW61nHrWB/43xgfs/QJJ5DkMAd8I";
-        verify_encoded(hash, b"foo").unwrap();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/block.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/block.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/block.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/block.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::common;
-use std::fmt;
-use std::fmt::Debug;
-use std::ops::{BitXorAssign, Index, IndexMut};
-
-/// Structure for the (1KB) memory block implemented as 128 64-bit words.
-pub struct Block([u64; common::QWORDS_IN_BLOCK]);
-
-impl Block {
-    /// Gets the byte slice representation of the block.
-    pub fn as_u8(&self) -> &[u8] {
-        let bytes: &[u8; common::BLOCK_SIZE] = unsafe {
-            &*(&self.0 as *const [u64; common::QWORDS_IN_BLOCK] as *const [u8; common::BLOCK_SIZE])
-        };
-        bytes
-    }
-
-    /// Gets the mutable byte slice representation of the block.
-    pub fn as_u8_mut(&mut self) -> &mut [u8] {
-        let bytes: &mut [u8; common::BLOCK_SIZE] = unsafe {
-            &mut *(&mut self.0 as *mut [u64; common::QWORDS_IN_BLOCK]
-                as *mut [u8; common::BLOCK_SIZE])
-        };
-        bytes
-    }
-
-    /// Copies self to destination.
-    pub fn copy_to(&self, dst: &mut Block) {
-        for (d, s) in dst.0.iter_mut().zip(self.0.iter()) {
-            *d = *s
-        }
-    }
-
-    /// Creates a new block filled with zeros.
-    pub fn zero() -> Block {
-        Block([0u64; common::QWORDS_IN_BLOCK])
-    }
-}
-
-impl<'a> BitXorAssign<&'a Block> for Block {
-    fn bitxor_assign(&mut self, rhs: &Block) {
-        for (s, r) in self.0.iter_mut().zip(rhs.0.iter()) {
-            *s ^= *r
-        }
-    }
-}
-
-impl Clone for Block {
-    fn clone(&self) -> Block {
-        Block(self.0)
-    }
-}
-
-impl Debug for Block {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_list().entries(self.0.iter()).finish()
-    }
-}
-
-impl Eq for Block {}
-
-impl Index<usize> for Block {
-    type Output = u64;
-    fn index(&self, index: usize) -> &u64 {
-        &self.0[index]
-    }
-}
-
-impl IndexMut<usize> for Block {
-    fn index_mut(&mut self, index: usize) -> &mut u64 {
-        &mut self.0[index]
-    }
-}
-
-impl PartialEq for Block {
-    fn eq(&self, other: &Block) -> bool {
-        let mut equal = true;
-        for (s, o) in self.0.iter().zip(other.0.iter()) {
-            if s != o {
-                equal = false;
-            }
-        }
-        equal
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::block::Block;
-    use crate::common;
-
-    #[test]
-    fn as_u8_returns_correct_slice() {
-        let block = Block::zero();
-        let expected = vec![0u8; 1024];
-        let actual = block.as_u8();
-        assert_eq!(actual, expected.as_slice());
-    }
-
-    #[test]
-    fn as_u8_mut_returns_correct_slice() {
-        let mut block = Block::zero();
-        let mut expected = vec![0u8; 1024];
-        let actual = block.as_u8_mut();
-        assert_eq!(actual, expected.as_mut_slice());
-    }
-
-    #[test]
-    fn bitxor_assign_updates_lhs() {
-        let mut lhs = Block([0u64; common::QWORDS_IN_BLOCK]);
-        let rhs = Block([1u64; common::QWORDS_IN_BLOCK]);
-        lhs ^= &rhs;
-        assert_eq!(lhs, rhs);
-    }
-
-    #[test]
-    fn copy_to_copies_block() {
-        let src = Block([1u64; common::QWORDS_IN_BLOCK]);
-        let mut dst = Block([0u64; common::QWORDS_IN_BLOCK]);
-        src.copy_to(&mut dst);
-        assert_eq!(dst, src);
-    }
-
-    #[test]
-    fn clone_clones_block() {
-        let orig = Block([1u64; common::QWORDS_IN_BLOCK]);
-        let copy = orig.clone();
-        assert_eq!(copy, orig);
-    }
-
-    #[test]
-    fn zero_creates_block_will_all_zeros() {
-        let expected = Block([0u64; common::QWORDS_IN_BLOCK]);
-        let actual = Block::zero();
-        assert_eq!(actual, expected);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/common.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/common.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-/// Default number of lanes (degree of parallelism).
-pub const DEF_LANES: u32 = 1;
-
-/// Minimum number of lanes (degree of parallelism).
-pub const MIN_LANES: u32 = 1;
-
-/// Maximum number of lanes (degree of parallelism).
-pub const MAX_LANES: u32 = 0x00FF_FFFF;
-
-/// Number of synchronization points between lanes per pass.
-pub const SYNC_POINTS: u32 = 4;
-
-/// Default digest size in bytes.
-pub const DEF_HASH_LENGTH: u32 = 32;
-
-/// Minimum digest size in bytes.
-pub const MIN_HASH_LENGTH: u32 = 4;
-
-/// Maximum digest size in bytes.
-pub const MAX_HASH_LENGTH: u32 = 0xFFFF_FFFF;
-
-/// Default number of memory blocks (2^12).
-pub const DEF_MEMORY: u32 = 4096;
-
-/// Minimum number of memory blocks (each of BLOCK_SIZE bytes).
-pub const MIN_MEMORY: u32 = 2 * SYNC_POINTS;
-
-/// Maximum number of memory blocks (each of BLOCK_SIZE bytes).
-#[cfg(target_pointer_width = "32")]
-pub const MAX_MEMORY: u32 = 0x200000;
-#[cfg(target_pointer_width = "64")]
-pub const MAX_MEMORY: u32 = 0xFFFF_FFFF;
-
-/// Default number of passes.
-pub const DEF_TIME: u32 = 3;
-
-/// Minimum number of passes
-pub const MIN_TIME: u32 = 1;
-
-/// Maximum number of passes.
-pub const MAX_TIME: u32 = 0xFFFF_FFFF;
-
-/// Minimum password length in bytes.
-pub const MIN_PWD_LENGTH: u32 = 0;
-
-/// Maximum password length in bytes.
-pub const MAX_PWD_LENGTH: u32 = 0xFFFF_FFFF;
-
-/// Minimum associated data length in bytes.
-pub const MIN_AD_LENGTH: u32 = 0;
-
-/// Maximum associated data length in bytes.
-pub const MAX_AD_LENGTH: u32 = 0xFFFF_FFFF;
-
-/// Minimum salt length in bytes.
-pub const MIN_SALT_LENGTH: u32 = 8;
-
-/// Maximum salt length in bytes.
-pub const MAX_SALT_LENGTH: u32 = 0xFFFF_FFFF;
-
-/// Minimum key length in bytes.
-pub const MIN_SECRET_LENGTH: u32 = 0;
-
-/// Maximum key length in bytes.
-pub const MAX_SECRET_LENGTH: u32 = 0xFFFF_FFFF;
-
-/// Memory block size in bytes.
-pub const BLOCK_SIZE: usize = 1024;
-
-/// Number of quad words in a block.
-pub const QWORDS_IN_BLOCK: usize = BLOCK_SIZE / 8;
-
-/// Number of pseudo-random values generated by one call to Blake in Argon2i
-/// to generate reference block positions.
-pub const ADDRESSES_IN_BLOCK: u32 = 128;
-
-/// Pre-hashing digest length.
-pub const PREHASH_DIGEST_LENGTH: usize = 64;
-
-/// Pre-hashing digest length with extension.
-pub const PREHASH_SEED_LENGTH: usize = 72;
-
-/// Blake2b output length in bytes.
-pub const BLAKE2B_OUT_LENGTH: usize = 64;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/config.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/config.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/config.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/config.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::common;
-use crate::thread_mode::ThreadMode;
-use crate::variant::Variant;
-use crate::version::Version;
-
-/// Structure containing configuration settings.
-///
-/// # Examples
-///
-/// ```
-/// use argon2::{Config, ThreadMode, Variant, Version};
-///
-/// let config = Config::default();
-/// assert_eq!(config.ad, &[]);
-/// assert_eq!(config.hash_length, 32);
-/// assert_eq!(config.lanes, 1);
-/// assert_eq!(config.mem_cost, 4096);
-/// assert_eq!(config.secret, &[]);
-/// assert_eq!(config.thread_mode, ThreadMode::Sequential);
-/// assert_eq!(config.time_cost, 3);
-/// assert_eq!(config.variant, Variant::Argon2i);
-/// assert_eq!(config.version, Version::Version13);
-/// ```
-#[derive(Clone, Debug, PartialEq)]
-pub struct Config<'a> {
-    /// The associated data.
-    pub ad: &'a [u8],
-
-    /// The length of the resulting hash.
-    pub hash_length: u32,
-
-    /// The number of lanes.
-    pub lanes: u32,
-
-    /// The amount of memory requested (KB).
-    pub mem_cost: u32,
-
-    /// The key.
-    pub secret: &'a [u8],
-
-    /// The thread mode.
-    pub thread_mode: ThreadMode,
-
-    /// The number of passes.
-    pub time_cost: u32,
-
-    /// The variant.
-    pub variant: Variant,
-
-    /// The version number.
-    pub version: Version,
-}
-
-impl<'a> Config<'a> {
-    pub fn uses_sequential(&self) -> bool {
-        self.thread_mode == ThreadMode::Sequential || self.lanes == 1
-    }
-}
-
-impl<'a> Default for Config<'a> {
-    fn default() -> Config<'a> {
-        Config {
-            ad: &[],
-            hash_length: common::DEF_HASH_LENGTH,
-            lanes: common::DEF_LANES,
-            mem_cost: common::DEF_MEMORY,
-            secret: &[],
-            thread_mode: ThreadMode::default(),
-            time_cost: common::DEF_TIME,
-            variant: Variant::default(),
-            version: Version::default(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::config::Config;
-    use crate::thread_mode::ThreadMode;
-    use crate::variant::Variant;
-    use crate::version::Version;
-
-    #[test]
-    fn default_returns_correct_instance() {
-        let config = Config::default();
-        assert_eq!(config.ad, &[]);
-        assert_eq!(config.hash_length, 32);
-        assert_eq!(config.lanes, 1);
-        assert_eq!(config.mem_cost, 4096);
-        assert_eq!(config.secret, &[]);
-        assert_eq!(config.thread_mode, ThreadMode::Sequential);
-        assert_eq!(config.time_cost, 3);
-        assert_eq!(config.variant, Variant::Argon2i);
-        assert_eq!(config.version, Version::Version13);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/context.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/context.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/context.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/context.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::common;
-use crate::config::Config;
-use crate::error::Error;
-use crate::result::Result;
-
-/// Structure containing settings for the Argon2 algorithm. A combination of
-/// the original argon2_context and argon2_instance_t.
-#[derive(Debug, PartialEq)]
-pub struct Context<'a> {
-    /// The config for this context.
-    pub config: Config<'a>,
-
-    /// The length of a lane.
-    pub lane_length: u32,
-
-    /// The number of memory blocks.
-    pub memory_blocks: u32,
-
-    /// The password.
-    pub pwd: &'a [u8],
-
-    /// The salt.
-    pub salt: &'a [u8],
-
-    /// The length of a segment.
-    pub segment_length: u32,
-}
-
-impl<'a> Context<'a> {
-    /// Attempts to create a new context.
-    pub fn new(config: Config<'a>, pwd: &'a [u8], salt: &'a [u8]) -> Result<Context<'a>> {
-        if config.lanes < common::MIN_LANES {
-            return Err(Error::LanesTooFew);
-        } else if config.lanes > common::MAX_LANES {
-            return Err(Error::LanesTooMany);
-        }
-
-        let lanes = config.lanes;
-        if config.mem_cost < common::MIN_MEMORY {
-            return Err(Error::MemoryTooLittle);
-        } else if config.mem_cost > common::MAX_MEMORY {
-            return Err(Error::MemoryTooMuch);
-        } else if config.mem_cost < 8 * lanes {
-            return Err(Error::MemoryTooLittle);
-        }
-
-        if config.time_cost < common::MIN_TIME {
-            return Err(Error::TimeTooSmall);
-        } else if config.time_cost > common::MAX_TIME {
-            return Err(Error::TimeTooLarge);
-        }
-
-        let pwd_len = pwd.len();
-        if pwd_len < common::MIN_PWD_LENGTH as usize {
-            return Err(Error::PwdTooShort);
-        } else if pwd_len > common::MAX_PWD_LENGTH as usize {
-            return Err(Error::PwdTooLong);
-        }
-
-        let salt_len = salt.len();
-        if salt_len < common::MIN_SALT_LENGTH as usize {
-            return Err(Error::SaltTooShort);
-        } else if salt_len > common::MAX_SALT_LENGTH as usize {
-            return Err(Error::SaltTooLong);
-        }
-
-        let secret_len = config.secret.len();
-        if secret_len < common::MIN_SECRET_LENGTH as usize {
-            return Err(Error::SecretTooShort);
-        } else if secret_len > common::MAX_SECRET_LENGTH as usize {
-            return Err(Error::SecretTooLong);
-        }
-
-        let ad_len = config.ad.len();
-        if ad_len < common::MIN_AD_LENGTH as usize {
-            return Err(Error::AdTooShort);
-        } else if ad_len > common::MAX_AD_LENGTH as usize {
-            return Err(Error::AdTooLong);
-        }
-
-        if config.hash_length < common::MIN_HASH_LENGTH {
-            return Err(Error::OutputTooShort);
-        } else if config.hash_length > common::MAX_HASH_LENGTH {
-            return Err(Error::OutputTooLong);
-        }
-
-        let mut memory_blocks = config.mem_cost;
-        if memory_blocks < 2 * common::SYNC_POINTS * lanes {
-            memory_blocks = 2 * common::SYNC_POINTS * lanes;
-        }
-
-        let segment_length = memory_blocks / (lanes * common::SYNC_POINTS);
-        let memory_blocks = segment_length * (lanes * common::SYNC_POINTS);
-        let lane_length = segment_length * common::SYNC_POINTS;
-
-        Ok(Context {
-            config,
-            lane_length,
-            memory_blocks,
-            pwd,
-            salt,
-            segment_length,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::config::Config;
-    use crate::context::Context;
-    use crate::error::Error;
-    use crate::thread_mode::ThreadMode;
-    use crate::variant::Variant;
-    use crate::version::Version;
-
-    #[test]
-    fn new_returns_correct_instance() {
-        let config = Config {
-            ad: b"additionaldata",
-            hash_length: 32,
-            lanes: 4,
-            mem_cost: 4096,
-            secret: b"secret",
-            thread_mode: ThreadMode::Sequential,
-            time_cost: 3,
-            variant: Variant::Argon2i,
-            version: Version::Version13,
-        };
-        let pwd = b"password";
-        let salt = b"somesalt";
-        let result = Context::new(config.clone(), pwd, salt);
-        assert!(result.is_ok());
-
-        let context = result.unwrap();
-        assert_eq!(context.config, config);
-        assert_eq!(context.pwd, pwd);
-        assert_eq!(context.salt, salt);
-        assert_eq!(context.memory_blocks, 4096);
-        assert_eq!(context.segment_length, 256);
-        assert_eq!(context.lane_length, 1024);
-    }
-
-    #[test]
-    fn new_with_too_little_mem_cost_returns_correct_error() {
-        let config = Config {
-            mem_cost: 7,
-            ..Default::default()
-        };
-        assert_eq!(
-            Context::new(config, &[0u8; 8], &[0u8; 8]),
-            Err(Error::MemoryTooLittle)
-        );
-    }
-
-    #[test]
-    fn new_with_less_than_8_x_lanes_mem_cost_returns_correct_error() {
-        let config = Config {
-            lanes: 4,
-            mem_cost: 31,
-            ..Default::default()
-        };
-        assert_eq!(
-            Context::new(config, &[0u8; 8], &[0u8; 8]),
-            Err(Error::MemoryTooLittle)
-        );
-    }
-
-    #[test]
-    fn new_with_too_small_time_cost_returns_correct_error() {
-        let config = Config {
-            time_cost: 0,
-            ..Default::default()
-        };
-        assert_eq!(
-            Context::new(config, &[0u8; 8], &[0u8; 8]),
-            Err(Error::TimeTooSmall)
-        );
-    }
-
-    #[test]
-    fn new_with_too_few_lanes_returns_correct_error() {
-        let config = Config {
-            lanes: 0,
-            ..Default::default()
-        };
-        assert_eq!(
-            Context::new(config, &[0u8; 8], &[0u8; 8]),
-            Err(Error::LanesTooFew)
-        );
-    }
-
-    #[test]
-    fn new_with_too_many_lanes_returns_correct_error() {
-        let config = Config {
-            lanes: 1 << 24,
-            ..Default::default()
-        };
-        assert_eq!(
-            Context::new(config, &[0u8; 8], &[0u8; 8]),
-            Err(Error::LanesTooMany)
-        );
-    }
-
-    #[test]
-    fn new_with_too_short_salt_returns_correct_error() {
-        let config = Default::default();
-        let salt = [0u8; 7];
-        assert_eq!(
-            Context::new(config, &[0u8; 8], &salt),
-            Err(Error::SaltTooShort)
-        );
-    }
-
-    #[test]
-    fn new_with_too_short_hash_length_returns_correct_error() {
-        let config = Config {
-            hash_length: 3,
-            ..Default::default()
-        };
-        assert_eq!(
-            Context::new(config, &[0u8; 8], &[0u8; 8]),
-            Err(Error::OutputTooShort)
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/core.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/core.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/core.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/core.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,467 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::block::Block;
-use crate::common;
-use crate::context::Context;
-use crate::memory::Memory;
-use crate::variant::Variant;
-use crate::version::Version;
-use blake2b_simd::Params;
-#[cfg(feature = "crossbeam-utils")]
-use crossbeam_utils::thread::scope;
-
-/// Position of the block currently being operated on.
-#[derive(Clone, Debug)]
-struct Position {
-    pass: u32,
-    lane: u32,
-    slice: u32,
-    index: u32,
-}
-
-/// Initializes the memory.
-pub fn initialize(context: &Context, memory: &mut Memory) {
-    fill_first_blocks(context, memory, &mut h0(context));
-}
-
-/// Fills all the memory blocks.
-pub fn fill_memory_blocks(context: &Context, memory: &mut Memory) {
-    if context.config.uses_sequential() {
-        fill_memory_blocks_st(context, memory);
-    } else {
-        fill_memory_blocks_mt(context, memory);
-    }
-}
-
-/// Calculates the final hash and returns it.
-pub fn finalize(context: &Context, memory: &Memory) -> Vec<u8> {
-    let mut blockhash = memory[context.lane_length - 1].clone();
-    for l in 1..context.config.lanes {
-        let last_block_in_lane = l * context.lane_length + (context.lane_length - 1);
-        blockhash ^= &memory[last_block_in_lane];
-    }
-
-    let mut hash = vec![0u8; context.config.hash_length as usize];
-    hprime(hash.as_mut_slice(), blockhash.as_u8());
-    hash
-}
-
-fn blake2b(out: &mut [u8], input: &[&[u8]]) {
-    let mut blake = Params::new().hash_length(out.len()).to_state();
-    for slice in input {
-        blake.update(slice);
-    }
-    out.copy_from_slice(blake.finalize().as_bytes());
-}
-
-fn f_bla_mka(x: u64, y: u64) -> u64 {
-    let m = 0xFFFF_FFFFu64;
-    let xy = (x & m) * (y & m);
-    x.wrapping_add(y.wrapping_add(xy.wrapping_add(xy)))
-}
-
-fn fill_block(prev_block: &Block, ref_block: &Block, next_block: &mut Block, with_xor: bool) {
-    let mut block_r = ref_block.clone();
-    block_r ^= prev_block;
-    let mut block_tmp = block_r.clone();
-
-    // Now block_r = ref_block + prev_block and block_tmp = ref_block + prev_block
-    if with_xor {
-        // Saving the next block contents for XOR over
-        block_tmp ^= next_block;
-        // Now block_r = ref_block + prev_block and
-        // block_tmp = ref_block + prev_block + next_block
-    }
-
-    // Apply Blake2 on columns of 64-bit words: (0,1,...,15) , then
-    // (16,17,..31)... finally (112,113,...127)
-    for i in 0..8 {
-        let mut v0 = block_r[16 * i];
-        let mut v1 = block_r[16 * i + 1];
-        let mut v2 = block_r[16 * i + 2];
-        let mut v3 = block_r[16 * i + 3];
-        let mut v4 = block_r[16 * i + 4];
-        let mut v5 = block_r[16 * i + 5];
-        let mut v6 = block_r[16 * i + 6];
-        let mut v7 = block_r[16 * i + 7];
-        let mut v8 = block_r[16 * i + 8];
-        let mut v9 = block_r[16 * i + 9];
-        let mut v10 = block_r[16 * i + 10];
-        let mut v11 = block_r[16 * i + 11];
-        let mut v12 = block_r[16 * i + 12];
-        let mut v13 = block_r[16 * i + 13];
-        let mut v14 = block_r[16 * i + 14];
-        let mut v15 = block_r[16 * i + 15];
-
-        p(
-            &mut v0, &mut v1, &mut v2, &mut v3, &mut v4, &mut v5, &mut v6, &mut v7, &mut v8,
-            &mut v9, &mut v10, &mut v11, &mut v12, &mut v13, &mut v14, &mut v15,
-        );
-
-        block_r[16 * i] = v0;
-        block_r[16 * i + 1] = v1;
-        block_r[16 * i + 2] = v2;
-        block_r[16 * i + 3] = v3;
-        block_r[16 * i + 4] = v4;
-        block_r[16 * i + 5] = v5;
-        block_r[16 * i + 6] = v6;
-        block_r[16 * i + 7] = v7;
-        block_r[16 * i + 8] = v8;
-        block_r[16 * i + 9] = v9;
-        block_r[16 * i + 10] = v10;
-        block_r[16 * i + 11] = v11;
-        block_r[16 * i + 12] = v12;
-        block_r[16 * i + 13] = v13;
-        block_r[16 * i + 14] = v14;
-        block_r[16 * i + 15] = v15;
-    }
-
-    // Apply Blake2 on rows of 64-bit words: (0,1,16,17,...112,113), then
-    // (2,3,18,19,...,114,115).. finally (14,15,30,31,...,126,127)
-    for i in 0..8 {
-        let mut v0 = block_r[2 * i];
-        let mut v1 = block_r[2 * i + 1];
-        let mut v2 = block_r[2 * i + 16];
-        let mut v3 = block_r[2 * i + 17];
-        let mut v4 = block_r[2 * i + 32];
-        let mut v5 = block_r[2 * i + 33];
-        let mut v6 = block_r[2 * i + 48];
-        let mut v7 = block_r[2 * i + 49];
-        let mut v8 = block_r[2 * i + 64];
-        let mut v9 = block_r[2 * i + 65];
-        let mut v10 = block_r[2 * i + 80];
-        let mut v11 = block_r[2 * i + 81];
-        let mut v12 = block_r[2 * i + 96];
-        let mut v13 = block_r[2 * i + 97];
-        let mut v14 = block_r[2 * i + 112];
-        let mut v15 = block_r[2 * i + 113];
-
-        p(
-            &mut v0, &mut v1, &mut v2, &mut v3, &mut v4, &mut v5, &mut v6, &mut v7, &mut v8,
-            &mut v9, &mut v10, &mut v11, &mut v12, &mut v13, &mut v14, &mut v15,
-        );
-
-        block_r[2 * i] = v0;
-        block_r[2 * i + 1] = v1;
-        block_r[2 * i + 16] = v2;
-        block_r[2 * i + 17] = v3;
-        block_r[2 * i + 32] = v4;
-        block_r[2 * i + 33] = v5;
-        block_r[2 * i + 48] = v6;
-        block_r[2 * i + 49] = v7;
-        block_r[2 * i + 64] = v8;
-        block_r[2 * i + 65] = v9;
-        block_r[2 * i + 80] = v10;
-        block_r[2 * i + 81] = v11;
-        block_r[2 * i + 96] = v12;
-        block_r[2 * i + 97] = v13;
-        block_r[2 * i + 112] = v14;
-        block_r[2 * i + 113] = v15;
-    }
-
-    block_tmp.copy_to(next_block);
-    *next_block ^= &block_r;
-}
-
-fn fill_first_blocks(context: &Context, memory: &mut Memory, h0: &mut [u8]) {
-    for lane in 0..context.config.lanes {
-        let start = common::PREHASH_DIGEST_LENGTH;
-        // H'(H0||0||i)
-        h0[start..(start + 4)].clone_from_slice(&u32::to_le_bytes(0));
-        h0[(start + 4)..(start + 8)].clone_from_slice(&u32::to_le_bytes(lane));
-        hprime(memory[(lane, 0)].as_u8_mut(), &h0);
-
-        // H'(H0||1||i)
-        h0[start..(start + 4)].clone_from_slice(&u32::to_le_bytes(1));
-        hprime(memory[(lane, 1)].as_u8_mut(), &h0);
-    }
-}
-
-#[cfg(feature = "crossbeam-utils")]
-fn fill_memory_blocks_mt(context: &Context, memory: &mut Memory) {
-    for p in 0..context.config.time_cost {
-        for s in 0..common::SYNC_POINTS {
-            let _ = scope(|scoped| {
-                for (l, mem) in (0..context.config.lanes).zip(memory.as_lanes_mut()) {
-                    let position = Position {
-                        pass: p,
-                        lane: l,
-                        slice: s,
-                        index: 0,
-                    };
-                    scoped.spawn(move |_| {
-                        fill_segment(context, &position, mem);
-                    });
-                }
-            });
-        }
-    }
-}
-
-#[cfg(not(feature = "crossbeam-utils"))]
-fn fill_memory_blocks_mt(_: &Context, _: &mut Memory) {
-    unimplemented!()
-}
-
-fn fill_memory_blocks_st(context: &Context, memory: &mut Memory) {
-    for p in 0..context.config.time_cost {
-        for s in 0..common::SYNC_POINTS {
-            for l in 0..context.config.lanes {
-                let position = Position {
-                    pass: p,
-                    lane: l,
-                    slice: s,
-                    index: 0,
-                };
-                fill_segment(context, &position, memory);
-            }
-        }
-    }
-}
-
-fn fill_segment(context: &Context, position: &Position, memory: &mut Memory) {
-    let mut position = position.clone();
-    let data_independent_addressing = (context.config.variant == Variant::Argon2i)
-        || (context.config.variant == Variant::Argon2id && position.pass == 0)
-            && (position.slice < (common::SYNC_POINTS / 2));
-    let zero_block = Block::zero();
-    let mut input_block = Block::zero();
-    let mut address_block = Block::zero();
-
-    if data_independent_addressing {
-        input_block[0] = position.pass as u64;
-        input_block[1] = position.lane as u64;
-        input_block[2] = position.slice as u64;
-        input_block[3] = context.memory_blocks as u64;
-        input_block[4] = context.config.time_cost as u64;
-        input_block[5] = context.config.variant.as_u64();
-    }
-
-    let mut starting_index = 0u32;
-
-    if position.pass == 0 && position.slice == 0 {
-        starting_index = 2;
-
-        // Don't forget to generate the first block of addresses:
-        if data_independent_addressing {
-            next_addresses(&mut address_block, &mut input_block, &zero_block);
-        }
-    }
-
-    let mut curr_offset = (position.lane * context.lane_length)
-        + (position.slice * context.segment_length)
-        + starting_index;
-
-    let mut prev_offset = if curr_offset % context.lane_length == 0 {
-        // Last block in this lane
-        curr_offset + context.lane_length - 1
-    } else {
-        curr_offset - 1
-    };
-
-    let mut pseudo_rand;
-    for i in starting_index..context.segment_length {
-        // 1.1 Rotating prev_offset if needed
-        if curr_offset % context.lane_length == 1 {
-            prev_offset = curr_offset - 1;
-        }
-
-        // 1.2 Computing the index of the reference block
-        // 1.2.1 Taking pseudo-random value from the previous block
-        if data_independent_addressing {
-            if i % common::ADDRESSES_IN_BLOCK == 0 {
-                next_addresses(&mut address_block, &mut input_block, &zero_block);
-            }
-            pseudo_rand = address_block[(i % common::ADDRESSES_IN_BLOCK) as usize];
-        } else {
-            pseudo_rand = memory[(prev_offset)][0];
-        }
-
-        // 1.2.2 Computing the lane of the reference block
-        // If (position.pass == 0) && (position.slice == 0): can not reference other lanes yet
-        let ref_lane = if (position.pass == 0) && (position.slice == 0) {
-            position.lane as u64
-        } else {
-            (pseudo_rand >> 32) % context.config.lanes as u64
-        };
-
-        // 1.2.3 Computing the number of possible reference block within the lane.
-        position.index = i;
-        let pseudo_rand_u32 = (pseudo_rand & 0xFFFF_FFFF) as u32;
-        let same_lane = ref_lane == (position.lane as u64);
-        let ref_index = index_alpha(context, &position, pseudo_rand_u32, same_lane);
-
-        // 2 Creating a new block
-        let index = context.lane_length as u64 * ref_lane + ref_index as u64;
-        let mut curr_block = memory[curr_offset].clone();
-        {
-            let prev_block = &memory[prev_offset];
-            let ref_block = &memory[index];
-            if context.config.version == Version::Version10 || position.pass == 0 {
-                fill_block(prev_block, ref_block, &mut curr_block, false);
-            } else {
-                fill_block(prev_block, ref_block, &mut curr_block, true);
-            }
-        }
-
-        memory[curr_offset] = curr_block;
-        curr_offset += 1;
-        prev_offset += 1;
-    }
-}
-
-fn g(a: &mut u64, b: &mut u64, c: &mut u64, d: &mut u64) {
-    *a = f_bla_mka(*a, *b);
-    *d = rotr64(*d ^ *a, 32);
-    *c = f_bla_mka(*c, *d);
-    *b = rotr64(*b ^ *c, 24);
-    *a = f_bla_mka(*a, *b);
-    *d = rotr64(*d ^ *a, 16);
-    *c = f_bla_mka(*c, *d);
-    *b = rotr64(*b ^ *c, 63);
-}
-
-fn h0(context: &Context) -> [u8; common::PREHASH_SEED_LENGTH] {
-    let input = [
-        &u32::to_le_bytes(context.config.lanes),
-        &u32::to_le_bytes(context.config.hash_length),
-        &u32::to_le_bytes(context.config.mem_cost),
-        &u32::to_le_bytes(context.config.time_cost),
-        &u32::to_le_bytes(context.config.version.as_u32()),
-        &u32::to_le_bytes(context.config.variant.as_u32()),
-        &len_as_32le(context.pwd),
-        context.pwd,
-        &len_as_32le(context.salt),
-        context.salt,
-        &len_as_32le(context.config.secret),
-        context.config.secret,
-        &len_as_32le(context.config.ad),
-        context.config.ad,
-    ];
-    let mut out = [0u8; common::PREHASH_SEED_LENGTH];
-    blake2b(&mut out[0..common::PREHASH_DIGEST_LENGTH], &input);
-    out
-}
-
-fn hprime(out: &mut [u8], input: &[u8]) {
-    let out_len = out.len();
-    if out_len <= common::BLAKE2B_OUT_LENGTH {
-        blake2b(out, &[&u32::to_le_bytes(out_len as u32), input]);
-    } else {
-        let ai_len = 32;
-        let mut out_buffer = [0u8; common::BLAKE2B_OUT_LENGTH];
-        let mut in_buffer = [0u8; common::BLAKE2B_OUT_LENGTH];
-        blake2b(&mut out_buffer, &[&u32::to_le_bytes(out_len as u32), input]);
-        out[0..ai_len].clone_from_slice(&out_buffer[0..ai_len]);
-        let mut out_pos = ai_len;
-        let mut to_produce = out_len - ai_len;
-
-        while to_produce > common::BLAKE2B_OUT_LENGTH {
-            in_buffer.clone_from_slice(&out_buffer);
-            blake2b(&mut out_buffer, &[&in_buffer]);
-            out[out_pos..out_pos + ai_len].clone_from_slice(&out_buffer[0..ai_len]);
-            out_pos += ai_len;
-            to_produce -= ai_len;
-        }
-        blake2b(&mut out[out_pos..out_len], &[&out_buffer]);
-    }
-}
-
-fn index_alpha(context: &Context, position: &Position, pseudo_rand: u32, same_lane: bool) -> u32 {
-    // Pass 0:
-    // - This lane: all already finished segments plus already constructed blocks in this segment
-    // - Other lanes: all already finished segments
-    // Pass 1+:
-    // - This lane: (SYNC_POINTS - 1) last segments plus already constructed blocks in this segment
-    // - Other lanes : (SYNC_POINTS - 1) last segments
-    let reference_area_size: u32 = if position.pass == 0 {
-        // First pass
-        if position.slice == 0 {
-            // First slice
-            position.index - 1
-        } else if same_lane {
-            // The same lane => add current segment
-            position.slice * context.segment_length + position.index - 1
-        } else if position.index == 0 {
-            position.slice * context.segment_length - 1
-        } else {
-            position.slice * context.segment_length
-        }
-    } else {
-        // Second pass
-        if same_lane {
-            context.lane_length - context.segment_length + position.index - 1
-        } else if position.index == 0 {
-            context.lane_length - context.segment_length - 1
-        } else {
-            context.lane_length - context.segment_length
-        }
-    };
-    let reference_area_size = reference_area_size as u64;
-    let mut relative_position = pseudo_rand as u64;
-    relative_position = (relative_position * relative_position) >> 32;
-    relative_position = reference_area_size - 1 - ((reference_area_size * relative_position) >> 32);
-
-    // 1.2.5 Computing starting position
-    let start_position: u32 = if position.pass != 0 {
-        if position.slice == common::SYNC_POINTS - 1 {
-            0u32
-        } else {
-            (position.slice + 1) * context.segment_length
-        }
-    } else {
-        0u32
-    };
-    let start_position = start_position as u64;
-
-    // 1.2.6. Computing absolute position
-    ((start_position + relative_position) % context.lane_length as u64) as u32
-}
-
-fn len_as_32le(slice: &[u8]) -> [u8; 4] {
-    u32::to_le_bytes(slice.len() as u32)
-}
-
-fn next_addresses(address_block: &mut Block, input_block: &mut Block, zero_block: &Block) {
-    input_block[6] += 1;
-    fill_block(zero_block, input_block, address_block, false);
-    fill_block(zero_block, &address_block.clone(), address_block, false);
-}
-
-fn p(
-    v0: &mut u64,
-    v1: &mut u64,
-    v2: &mut u64,
-    v3: &mut u64,
-    v4: &mut u64,
-    v5: &mut u64,
-    v6: &mut u64,
-    v7: &mut u64,
-    v8: &mut u64,
-    v9: &mut u64,
-    v10: &mut u64,
-    v11: &mut u64,
-    v12: &mut u64,
-    v13: &mut u64,
-    v14: &mut u64,
-    v15: &mut u64,
-) {
-    g(v0, v4, v8, v12);
-    g(v1, v5, v9, v13);
-    g(v2, v6, v10, v14);
-    g(v3, v7, v11, v15);
-    g(v0, v5, v10, v15);
-    g(v1, v6, v11, v12);
-    g(v2, v7, v8, v13);
-    g(v3, v4, v9, v14);
-}
-
-fn rotr64(w: u64, c: u32) -> u64 {
-    (w >> c) | (w << (64 - c))
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/decoded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/decoded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/decoded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/decoded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::variant::Variant;
-use crate::version::Version;
-
-/// Structure that contains the decoded data.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Decoded {
-    /// The variant.
-    pub variant: Variant,
-
-    /// The version.
-    pub version: Version,
-
-    /// The amount of memory requested (KiB).
-    pub mem_cost: u32,
-
-    /// The number of passes.
-    pub time_cost: u32,
-
-    /// The parallelism.
-    pub parallelism: u32,
-
-    /// The salt.
-    pub salt: Vec<u8>,
-
-    /// The hash.
-    pub hash: Vec<u8>,
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/encoding.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/encoding.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/encoding.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/encoding.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,405 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::context::Context;
-use crate::decoded::Decoded;
-use crate::error::Error;
-use crate::result::Result;
-use crate::variant::Variant;
-use crate::version::Version;
-use base64;
-
-/// Structure containing the options.
-struct Options {
-    mem_cost: u32,
-    time_cost: u32,
-    parallelism: u32,
-}
-
-/// Gets the base64 encoded length of a byte slice with the specified length.
-pub fn base64_len(length: u32) -> u32 {
-    let olen = (length / 3) << 2;
-    match length % 3 {
-        2 => olen + 3,
-        1 => olen + 2,
-        _ => olen,
-    }
-}
-
-/// Attempts to decode the encoded string slice.
-pub fn decode_string(encoded: &str) -> Result<Decoded> {
-    let items: Vec<&str> = encoded.split('$').collect();
-    if items.len() == 6 {
-        decode_empty(items[0])?;
-        let variant = decode_variant(items[1])?;
-        let version = decode_version(items[2])?;
-        let options = decode_options(items[3])?;
-        let salt = base64::decode(items[4])?;
-        let hash = base64::decode(items[5])?;
-
-        Ok(Decoded {
-            variant,
-            version,
-            mem_cost: options.mem_cost,
-            time_cost: options.time_cost,
-            parallelism: options.parallelism,
-            salt,
-            hash,
-        })
-    } else if items.len() == 5 {
-        decode_empty(items[0])?;
-        let variant = decode_variant(items[1])?;
-        let options = decode_options(items[2])?;
-        let salt = base64::decode(items[3])?;
-        let hash = base64::decode(items[4])?;
-
-        Ok(Decoded {
-            variant,
-            version: Version::Version10,
-            mem_cost: options.mem_cost,
-            time_cost: options.time_cost,
-            parallelism: options.parallelism,
-            salt,
-            hash,
-        })
-    } else {
-        Err(Error::DecodingFail)
-    }
-}
-
-fn decode_empty(str: &str) -> Result<()> {
-    if str == "" {
-        Ok(())
-    } else {
-        Err(Error::DecodingFail)
-    }
-}
-
-fn decode_options(str: &str) -> Result<Options> {
-    let items: Vec<&str> = str.split(',').collect();
-    if items.len() == 3 {
-        Ok(Options {
-            mem_cost: decode_option(items[0], "m")?,
-            time_cost: decode_option(items[1], "t")?,
-            parallelism: decode_option(items[2], "p")?,
-        })
-    } else {
-        Err(Error::DecodingFail)
-    }
-}
-
-fn decode_option(str: &str, name: &str) -> Result<u32> {
-    let items: Vec<&str> = str.split('=').collect();
-    if items.len() == 2 {
-        if items[0] == name {
-            decode_u32(items[1])
-        } else {
-            Err(Error::DecodingFail)
-        }
-    } else {
-        Err(Error::DecodingFail)
-    }
-}
-
-fn decode_u32(str: &str) -> Result<u32> {
-    match str.parse() {
-        Ok(i) => Ok(i),
-        Err(_) => Err(Error::DecodingFail),
-    }
-}
-
-fn decode_variant(str: &str) -> Result<Variant> {
-    Variant::from_str(str)
-}
-
-fn decode_version(str: &str) -> Result<Version> {
-    let items: Vec<&str> = str.split('=').collect();
-    if items.len() == 2 {
-        if items[0] == "v" {
-            Version::from_str(items[1])
-        } else {
-            Err(Error::DecodingFail)
-        }
-    } else {
-        Err(Error::DecodingFail)
-    }
-}
-
-/// Encodes the hash and context.
-pub fn encode_string(context: &Context, hash: &[u8]) -> String {
-    format!(
-        "${}$v={}$m={},t={},p={}${}${}",
-        context.config.variant,
-        context.config.version,
-        context.config.mem_cost,
-        context.config.time_cost,
-        context.config.lanes,
-        base64::encode_config(context.salt, base64::STANDARD_NO_PAD),
-        base64::encode_config(hash, base64::STANDARD_NO_PAD),
-    )
-}
-
-/// Gets the string length of the specified number.
-pub fn num_len(number: u32) -> u32 {
-    let mut len = 1;
-    let mut num = number;
-    while num >= 10 {
-        len += 1;
-        num /= 10;
-    }
-    len
-}
-
-#[cfg(test)]
-mod tests {
-
-    #[cfg(feature = "crossbeam-utils")]
-    use crate::config::Config;
-    #[cfg(feature = "crossbeam-utils")]
-    use crate::context::Context;
-    use crate::decoded::Decoded;
-    #[cfg(feature = "crossbeam-utils")]
-    use crate::encoding::encode_string;
-    use crate::encoding::{base64_len, decode_string, num_len};
-    use crate::error::Error;
-    #[cfg(feature = "crossbeam-utils")]
-    use crate::thread_mode::ThreadMode;
-    use crate::variant::Variant;
-    use crate::version::Version;
-
-    #[test]
-    fn base64_len_returns_correct_length() {
-        let tests = vec![
-            (1, 2),
-            (2, 3),
-            (3, 4),
-            (4, 6),
-            (5, 7),
-            (6, 8),
-            (7, 10),
-            (8, 11),
-            (9, 12),
-            (10, 14),
-        ];
-        for (len, expected) in tests {
-            let actual = base64_len(len);
-            assert_eq!(actual, expected);
-        }
-    }
-
-    #[test]
-    fn decode_string_with_version10_returns_correct_result() {
-        let encoded = "$argon2i$v=16$m=4096,t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let expected = Decoded {
-            variant: Variant::Argon2i,
-            version: Version::Version10,
-            mem_cost: 4096,
-            time_cost: 3,
-            parallelism: 1,
-            salt: b"salt1234".to_vec(),
-            hash: b"12345678901234567890123456789012".to_vec(),
-        };
-        let actual = decode_string(encoded).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn decode_string_with_version13_returns_correct_result() {
-        let encoded = "$argon2i$v=19$m=4096,t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let expected = Decoded {
-            variant: Variant::Argon2i,
-            version: Version::Version13,
-            mem_cost: 4096,
-            time_cost: 3,
-            parallelism: 1,
-            salt: b"salt1234".to_vec(),
-            hash: b"12345678901234567890123456789012".to_vec(),
-        };
-        let actual = decode_string(encoded).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn decode_string_without_version_returns_correct_result() {
-        let encoded = "$argon2i$m=4096,t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let expected = Decoded {
-            variant: Variant::Argon2i,
-            version: Version::Version10,
-            mem_cost: 4096,
-            time_cost: 3,
-            parallelism: 1,
-            salt: b"salt1234".to_vec(),
-            hash: b"12345678901234567890123456789012".to_vec(),
-        };
-        let actual = decode_string(encoded).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn decode_string_without_variant_returns_error_result() {
-        let encoded = "$m=4096,t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_empty_variant_returns_error_result() {
-        let encoded = "$$m=4096,t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_invalid_variant_returns_error_result() {
-        let encoded = "$argon$m=4096,t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_without_mem_cost_returns_error_result() {
-        let encoded = "$argon2i$t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_empty_mem_cost_returns_error_result() {
-        let encoded = "$argon2i$m=,t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_non_numeric_mem_cost_returns_error_result() {
-        let encoded = "$argon2i$m=a,t=3,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_without_time_cost_returns_error_result() {
-        let encoded = "$argon2i$m=4096,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_empty_time_cost_returns_error_result() {
-        let encoded = "$argon2i$m=4096,t=,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_non_numeric_time_cost_returns_error_result() {
-        let encoded = "$argon2i$m=4096,t=a,p=1\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_without_parallelism_returns_error_result() {
-        let encoded = "$argon2i$m=4096,t=3\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_empty_parallelism_returns_error_result() {
-        let encoded = "$argon2i$m=4096,t=3,p=\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_non_numeric_parallelism_returns_error_result() {
-        let encoded = "$argon2i$m=4096,t=3,p=a\
-                       $c2FsdDEyMzQ=$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_without_salt_returns_error_result() {
-        let encoded = "$argon2i$m=4096,t=3,p=1\
-                       $MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_without_hash_returns_error_result() {
-        let encoded = "$argon2i$m=4096,t=3,p=a\
-                       $c2FsdDEyMzQ=";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn decode_string_with_empty_hash_returns_error_result() {
-        let encoded = "$argon2i$m=4096,t=3,p=a\
-                       $c2FsdDEyMzQ=$";
-        let result = decode_string(encoded);
-        assert_eq!(result, Err(Error::DecodingFail));
-    }
-
-    #[cfg(feature = "crossbeam-utils")]
-    #[test]
-    fn encode_string_returns_correct_string() {
-        let hash = b"12345678901234567890123456789012".to_vec();
-        let config = Config {
-            ad: &[],
-            hash_length: hash.len() as u32,
-            lanes: 1,
-            mem_cost: 4096,
-            secret: &[],
-            thread_mode: ThreadMode::Parallel,
-            time_cost: 3,
-            variant: Variant::Argon2i,
-            version: Version::Version13,
-        };
-        let pwd = b"password".to_vec();
-        let salt = b"salt1234".to_vec();
-        let context = Context::new(config, &pwd, &salt).unwrap();
-        let expected = "$argon2i$v=19$m=4096,t=3,p=1\
-                        $c2FsdDEyMzQ$MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI";
-        let actual = encode_string(&context, &hash);
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn num_len_returns_correct_length() {
-        let tests = vec![
-            (1, 1),
-            (10, 2),
-            (110, 3),
-            (1230, 4),
-            (12340, 5),
-            (123457, 6),
-        ];
-        for (num, expected) in tests {
-            let actual = num_len(num);
-            assert_eq!(actual, expected);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/error.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::{error, fmt};
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-/// Error type for Argon2 errors.
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
-pub enum Error {
-    /// The output (hash) is too short (minimum is 4).
-    OutputTooShort,
-
-    /// The output (hash) is too long (maximum is 2^32 - 1).
-    OutputTooLong,
-
-    /// The password is too short (minimum is 0).
-    PwdTooShort,
-
-    /// The password is too long (maximum is 2^32 - 1).
-    PwdTooLong,
-
-    /// The salt is too short (minimum is 8).
-    SaltTooShort,
-
-    /// The salt is too long (maximum is 2^32 - 1).
-    SaltTooLong,
-
-    /// The associated data is too short (minimum is 0).
-    AdTooShort,
-
-    /// The associated data is too long (maximum is 2^32 - 1).
-    AdTooLong,
-
-    /// The secret value is too short (minimum is 0).
-    SecretTooShort,
-
-    /// The secret value is too long (maximum is 2^32 - 1).
-    SecretTooLong,
-
-    /// The time cost (passes) is too small (minimum is 1).
-    TimeTooSmall,
-
-    /// The time cost (passes) is too large (maximum is 2^32 - 1).
-    TimeTooLarge,
-
-    /// The memory cost is too small (minimum is 8 x parallelism).
-    MemoryTooLittle,
-
-    /// The memory cost is too large (maximum 2GiB on 32-bit or 4TiB on 64-bit).
-    MemoryTooMuch,
-
-    /// The number of lanes (parallelism) is too small (minimum is 1).
-    LanesTooFew,
-
-    /// The number of lanes (parallelism) is too large (maximum is 2^24 - 1).
-    LanesTooMany,
-
-    /// Incorrect Argon2 variant.
-    IncorrectType,
-
-    /// Incorrect Argon2 version.
-    IncorrectVersion,
-
-    /// The decoding of the encoded data has failed.
-    DecodingFail,
-}
-
-impl Error {
-    fn msg(&self) -> &str {
-        match *self {
-            Error::OutputTooShort => "Output is too short",
-            Error::OutputTooLong => "Output is too long",
-            Error::PwdTooShort => "Password is too short",
-            Error::PwdTooLong => "Password is too long",
-            Error::SaltTooShort => "Salt is too short",
-            Error::SaltTooLong => "Salt is too long",
-            Error::AdTooShort => "Associated data is too short",
-            Error::AdTooLong => "Associated data is too long",
-            Error::SecretTooShort => "Secret is too short",
-            Error::SecretTooLong => "Secret is too long",
-            Error::TimeTooSmall => "Time cost is too small",
-            Error::TimeTooLarge => "Time cost is too large",
-            Error::MemoryTooLittle => "Memory cost is too small",
-            Error::MemoryTooMuch => "Memory cost is too large",
-            Error::LanesTooFew => "Too few lanes",
-            Error::LanesTooMany => "Too many lanes",
-            Error::IncorrectType => "There is no such type of Argon2",
-            Error::IncorrectVersion => "There is no such version of Argon2",
-            Error::DecodingFail => "Decoding failed",
-        }
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.msg())
-    }
-}
-
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        self.msg()
-    }
-
-    fn cause(&self) -> Option<&dyn error::Error> {
-        None
-    }
-}
-
-impl From<base64::DecodeError> for Error {
-    fn from(_: base64::DecodeError) -> Self {
-        Error::DecodingFail
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Library for hashing passwords using
-//! [Argon2](https://github.com/P-H-C/phc-winner-argon2), the password-hashing
-//! function that won the
-//! [Password Hashing Competition (PHC)](https://password-hashing.net).
-//!
-//! # Usage
-//!
-//! To use this crate, add the following to your Cargo.toml:
-//!
-//! ```toml
-//! [dependencies]
-//! rust-argon2 = "0.8"
-//! ```
-//!
-//! And the following to your crate root:
-//!
-//! ```rust
-//! extern crate argon2;
-//! ```
-//!
-//! # Examples
-//!
-//! Create a password hash using the defaults and verify it:
-//!
-//! ```rust
-//! use argon2::{self, Config};
-//!
-//! let password = b"password";
-//! let salt = b"randomsalt";
-//! let config = Config::default();
-//! let hash = argon2::hash_encoded(password, salt, &config).unwrap();
-//! let matches = argon2::verify_encoded(&hash, password).unwrap();
-//! assert!(matches);
-//! ```
-//!
-//! Create a password hash with custom settings and verify it:
-//!
-//! ```rust
-//! use argon2::{self, Config, ThreadMode, Variant, Version};
-//!
-//! let password = b"password";
-//! let salt = b"othersalt";
-//! let config = Config {
-//!     variant: Variant::Argon2i,
-//!     version: Version::Version13,
-//!     mem_cost: 65536,
-//!     time_cost: 10,
-#![cfg_attr(feature = "crossbeam-utils", doc = "    lanes: 4,")]
-#![cfg_attr(
-    feature = "crossbeam-utils",
-    doc = "    thread_mode: ThreadMode::Parallel,"
-)]
-#![cfg_attr(not(feature = "crossbeam-utils"), doc = "    lanes: 1,")]
-#![cfg_attr(
-    not(feature = "crossbeam-utils"),
-    doc = "    thread_mode: ThreadMode::Sequential,"
-)]
-//!     secret: &[],
-//!     ad: &[],
-//!     hash_length: 32
-//! };
-//! let hash = argon2::hash_encoded(password, salt, &config).unwrap();
-//! let matches = argon2::verify_encoded(&hash, password).unwrap();
-//! assert!(matches);
-//! ```
-//!
-//! # Limitations
-//!
-//! This crate has the same limitation as the `blake2-rfc` crate that it uses.
-//! It does not attempt to clear potentially sensitive data from its work
-//! memory. To do so correctly without a heavy performance penalty would
-//! require help from the compiler. It's better to not attempt to do so than to
-//! present a false assurance.
-//!
-//! This version uses the standard implementation and does not yet implement
-//! optimizations. Therefore, it is not the fastest implementation available.
-
-mod argon2;
-mod block;
-mod common;
-mod config;
-mod context;
-mod core;
-mod decoded;
-mod encoding;
-mod error;
-mod memory;
-mod result;
-mod thread_mode;
-mod variant;
-mod version;
-
-pub use crate::argon2::*;
-pub use crate::config::Config;
-pub use crate::error::Error;
-pub use crate::result::Result;
-pub use crate::thread_mode::ThreadMode;
-pub use crate::variant::Variant;
-pub use crate::version::Version;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/memory.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/memory.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/memory.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/memory.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::block::Block;
-use std::fmt;
-use std::fmt::Debug;
-use std::ops::{Index, IndexMut};
-
-/// Structure representing the memory matrix.
-pub struct Memory {
-    /// The number of rows.
-    rows: usize,
-
-    /// The number of columns.
-    cols: usize,
-
-    /// The flat array of blocks representing the memory matrix.
-    blocks: Box<[Block]>,
-}
-
-impl Memory {
-    /// Creates a new memory matrix.
-    pub fn new(lanes: u32, lane_length: u32) -> Memory {
-        let rows = lanes as usize;
-        let cols = lane_length as usize;
-        let total = rows * cols;
-        let blocks = vec![Block::zero(); total].into_boxed_slice();
-        Memory { rows, cols, blocks }
-    }
-
-    #[cfg(feature = "crossbeam-utils")]
-    /// Gets the mutable lanes representation of the memory matrix.
-    pub fn as_lanes_mut(&mut self) -> Vec<&mut Memory> {
-        let ptr: *mut Memory = self;
-        let mut vec = Vec::with_capacity(self.rows);
-        for _ in 0..self.rows {
-            vec.push(unsafe { &mut (*ptr) });
-        }
-        vec
-    }
-}
-
-impl Debug for Memory {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Memory {{ rows: {}, cols: {} }}", self.rows, self.cols)
-    }
-}
-
-impl Index<u32> for Memory {
-    type Output = Block;
-    fn index(&self, index: u32) -> &Block {
-        &self.blocks[index as usize]
-    }
-}
-
-impl Index<u64> for Memory {
-    type Output = Block;
-    fn index(&self, index: u64) -> &Block {
-        &self.blocks[index as usize]
-    }
-}
-
-impl Index<(u32, u32)> for Memory {
-    type Output = Block;
-    fn index(&self, index: (u32, u32)) -> &Block {
-        let pos = ((index.0 as usize) * self.cols) + (index.1 as usize);
-        &self.blocks[pos]
-    }
-}
-
-impl IndexMut<u32> for Memory {
-    fn index_mut(&mut self, index: u32) -> &mut Block {
-        &mut self.blocks[index as usize]
-    }
-}
-
-impl IndexMut<u64> for Memory {
-    fn index_mut(&mut self, index: u64) -> &mut Block {
-        &mut self.blocks[index as usize]
-    }
-}
-
-impl IndexMut<(u32, u32)> for Memory {
-    fn index_mut(&mut self, index: (u32, u32)) -> &mut Block {
-        let pos = ((index.0 as usize) * self.cols) + (index.1 as usize);
-        &mut self.blocks[pos]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::memory::Memory;
-
-    #[test]
-    fn new_returns_correct_instance() {
-        let lanes = 4;
-        let lane_length = 128;
-        let memory = Memory::new(lanes, lane_length);
-        assert_eq!(memory.rows, lanes as usize);
-        assert_eq!(memory.cols, lane_length as usize);
-        assert_eq!(memory.blocks.len(), 512);
-    }
-
-    #[cfg(feature = "crossbeam-utils")]
-    #[test]
-    fn as_lanes_mut_returns_correct_vec() {
-        let mut memory = Memory::new(4, 128);
-        let lanes = memory.as_lanes_mut();
-        assert_eq!(lanes.len(), 4);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/result.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/result.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/result.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/result.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::error::Error;
-use std::result;
-
-/// A specialized result type for Argon2 operations.
-pub type Result<T> = result::Result<T, Error>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/thread_mode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/thread_mode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/thread_mode.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/thread_mode.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-// Copyright (c) 2017 Xidorn Quan <me@upsuper.org>
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-/// The thread mode used to perform the hashing.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum ThreadMode {
-    /// Run in one thread.
-    Sequential,
-
-    #[cfg(feature = "crossbeam-utils")]
-    /// Run in the same number of threads as the number of lanes.
-    Parallel,
-}
-
-impl ThreadMode {
-    #[cfg(feature = "crossbeam-utils")]
-    /// Create a thread mode from the threads count.
-    pub fn from_threads(threads: u32) -> ThreadMode {
-        if threads > 1 {
-            ThreadMode::Parallel
-        } else {
-            ThreadMode::Sequential
-        }
-    }
-
-    #[cfg(not(feature = "crossbeam-utils"))]
-    pub fn from_threads(threads: u32) -> ThreadMode {
-        assert_eq!(threads, 1);
-        Self::default()
-    }
-}
-
-impl Default for ThreadMode {
-    fn default() -> ThreadMode {
-        ThreadMode::Sequential
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::thread_mode::ThreadMode;
-
-    #[test]
-    fn default_returns_correct_thread_mode() {
-        assert_eq!(ThreadMode::default(), ThreadMode::Sequential);
-    }
-
-    #[cfg(feature = "crossbeam-utils")]
-    #[test]
-    fn from_threads_returns_correct_thread_mode() {
-        assert_eq!(ThreadMode::from_threads(0), ThreadMode::Sequential);
-        assert_eq!(ThreadMode::from_threads(1), ThreadMode::Sequential);
-        assert_eq!(ThreadMode::from_threads(2), ThreadMode::Parallel);
-        assert_eq!(ThreadMode::from_threads(10), ThreadMode::Parallel);
-        assert_eq!(ThreadMode::from_threads(100), ThreadMode::Parallel);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/variant.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/variant.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/variant.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/variant.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::error::Error;
-use crate::result::Result;
-use std::fmt;
-
-/// The Argon2 variant.
-#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
-pub enum Variant {
-    /// Argon2 using data-dependent memory access to thwart tradeoff attacks.
-    /// Recommended for cryptocurrencies and backend servers.
-    Argon2d = 0,
-
-    /// Argon2 using data-independent memory access to thwart side-channel
-    /// attacks. Recommended for password hashing and password-based key
-    /// derivation.
-    Argon2i = 1,
-
-    /// Argon2 using hybrid construction.
-    Argon2id = 2,
-}
-
-impl Variant {
-    /// Gets the lowercase string slice representation of the variant.
-    pub fn as_lowercase_str(&self) -> &'static str {
-        match *self {
-            Variant::Argon2d => "argon2d",
-            Variant::Argon2i => "argon2i",
-            Variant::Argon2id => "argon2id",
-        }
-    }
-
-    /// Gets the u32 representation of the variant.
-    pub fn as_u32(&self) -> u32 {
-        *self as u32
-    }
-
-    /// Gets the u64 representation of the variant.
-    pub fn as_u64(&self) -> u64 {
-        *self as u64
-    }
-
-    /// Gets the uppercase string slice representation of the variant.
-    pub fn as_uppercase_str(&self) -> &'static str {
-        match *self {
-            Variant::Argon2d => "Argon2d",
-            Variant::Argon2i => "Argon2i",
-            Variant::Argon2id => "Argon2id",
-        }
-    }
-
-    /// Attempts to create a variant from a string slice.
-    pub fn from_str(str: &str) -> Result<Variant> {
-        match str {
-            "Argon2d" => Ok(Variant::Argon2d),
-            "Argon2i" => Ok(Variant::Argon2i),
-            "Argon2id" => Ok(Variant::Argon2id),
-            "argon2d" => Ok(Variant::Argon2d),
-            "argon2i" => Ok(Variant::Argon2i),
-            "argon2id" => Ok(Variant::Argon2id),
-            _ => Err(Error::DecodingFail),
-        }
-    }
-
-    /// Attempts to create a variant from an u32.
-    pub fn from_u32(val: u32) -> Result<Variant> {
-        match val {
-            0 => Ok(Variant::Argon2d),
-            1 => Ok(Variant::Argon2i),
-            2 => Ok(Variant::Argon2id),
-            _ => Err(Error::IncorrectType),
-        }
-    }
-}
-
-impl Default for Variant {
-    fn default() -> Variant {
-        Variant::Argon2i
-    }
-}
-
-impl fmt::Display for Variant {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.as_lowercase_str())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::error::Error;
-    use crate::variant::Variant;
-
-    #[test]
-    fn as_lowercase_str_returns_correct_str() {
-        assert_eq!(Variant::Argon2d.as_lowercase_str(), "argon2d");
-        assert_eq!(Variant::Argon2i.as_lowercase_str(), "argon2i");
-        assert_eq!(Variant::Argon2id.as_lowercase_str(), "argon2id");
-    }
-
-    #[test]
-    fn as_u32_returns_correct_u32() {
-        assert_eq!(Variant::Argon2d.as_u32(), 0);
-        assert_eq!(Variant::Argon2i.as_u32(), 1);
-        assert_eq!(Variant::Argon2id.as_u32(), 2);
-    }
-
-    #[test]
-    fn as_u64_returns_correct_u64() {
-        assert_eq!(Variant::Argon2d.as_u64(), 0);
-        assert_eq!(Variant::Argon2i.as_u64(), 1);
-        assert_eq!(Variant::Argon2id.as_u64(), 2);
-    }
-
-    #[test]
-    fn as_uppercase_str_returns_correct_str() {
-        assert_eq!(Variant::Argon2d.as_uppercase_str(), "Argon2d");
-        assert_eq!(Variant::Argon2i.as_uppercase_str(), "Argon2i");
-        assert_eq!(Variant::Argon2id.as_uppercase_str(), "Argon2id");
-    }
-
-    #[test]
-    fn default_returns_correct_variant() {
-        assert_eq!(Variant::default(), Variant::Argon2i);
-    }
-
-    #[test]
-    fn display_returns_correct_string() {
-        assert_eq!(format!("{}", Variant::Argon2d), "argon2d");
-        assert_eq!(format!("{}", Variant::Argon2i), "argon2i");
-        assert_eq!(format!("{}", Variant::Argon2id), "argon2id");
-    }
-
-    #[test]
-    fn from_str_returns_correct_result() {
-        assert_eq!(Variant::from_str("Argon2d"), Ok(Variant::Argon2d));
-        assert_eq!(Variant::from_str("Argon2i"), Ok(Variant::Argon2i));
-        assert_eq!(Variant::from_str("Argon2id"), Ok(Variant::Argon2id));
-        assert_eq!(Variant::from_str("argon2d"), Ok(Variant::Argon2d));
-        assert_eq!(Variant::from_str("argon2i"), Ok(Variant::Argon2i));
-        assert_eq!(Variant::from_str("argon2id"), Ok(Variant::Argon2id));
-        assert_eq!(Variant::from_str("foobar"), Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn from_u32_returns_correct_result() {
-        assert_eq!(Variant::from_u32(0), Ok(Variant::Argon2d));
-        assert_eq!(Variant::from_u32(1), Ok(Variant::Argon2i));
-        assert_eq!(Variant::from_u32(2), Ok(Variant::Argon2id));
-        assert_eq!(Variant::from_u32(3), Err(Error::IncorrectType));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/version.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/version.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/src/version.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/src/version.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::error::Error;
-use crate::result::Result;
-use std::fmt;
-
-/// The Argon2 version.
-#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
-pub enum Version {
-    /// Version 0x10.
-    Version10 = 0x10,
-
-    /// Version 0x13 (Recommended).
-    Version13 = 0x13,
-}
-
-impl Version {
-    /// Gets the u32 representation of the version.
-    pub fn as_u32(&self) -> u32 {
-        *self as u32
-    }
-
-    /// Attempts to create a version from a string slice.
-    pub fn from_str(str: &str) -> Result<Version> {
-        match str {
-            "16" => Ok(Version::Version10),
-            "19" => Ok(Version::Version13),
-            _ => Err(Error::DecodingFail),
-        }
-    }
-
-    /// Attempts to create a version from an u32.
-    pub fn from_u32(val: u32) -> Result<Version> {
-        match val {
-            0x10 => Ok(Version::Version10),
-            0x13 => Ok(Version::Version13),
-            _ => Err(Error::IncorrectVersion),
-        }
-    }
-}
-
-impl Default for Version {
-    fn default() -> Version {
-        Version::Version13
-    }
-}
-
-impl fmt::Display for Version {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.as_u32())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::error::Error;
-    use crate::version::Version;
-
-    #[test]
-    fn as_u32_returns_correct_u32() {
-        assert_eq!(Version::Version10.as_u32(), 0x10);
-        assert_eq!(Version::Version13.as_u32(), 0x13);
-    }
-
-    #[test]
-    fn default_returns_correct_version() {
-        assert_eq!(Version::default(), Version::Version13);
-    }
-
-    #[test]
-    fn display_returns_correct_string() {
-        assert_eq!(format!("{}", Version::Version10), "16");
-        assert_eq!(format!("{}", Version::Version13), "19");
-    }
-
-    #[test]
-    fn from_str_returns_correct_result() {
-        assert_eq!(Version::from_str("16"), Ok(Version::Version10));
-        assert_eq!(Version::from_str("19"), Ok(Version::Version13));
-        assert_eq!(Version::from_str("11"), Err(Error::DecodingFail));
-    }
-
-    #[test]
-    fn from_u32_returns_correct_result() {
-        assert_eq!(Version::from_u32(0x10), Ok(Version::Version10));
-        assert_eq!(Version::from_u32(0x13), Ok(Version::Version13));
-        assert_eq!(Version::from_u32(0), Err(Error::IncorrectVersion));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/tests/integration_test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/tests/integration_test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rust-argon2/tests/integration_test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rust-argon2/tests/integration_test.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1078 +0,0 @@
-// Copyright (c) 2017 Martijn Rijkeboer <mrr@sru-systems.com>
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// These tests are based on Argon's test.c test suite.
-
-use argon2::{Config, Error, ThreadMode, Variant, Version};
-use hex::ToHex;
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version10_1() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "2ec0d925358f5830caf0c1cc8a3ee58b34505759428b859c79b72415f51f9221",
-        "$argon2d$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $LsDZJTWPWDDK8MHMij7lizRQV1lCi4WcebckFfUfkiE",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version10_2() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        2,
-        1048576,
-        1,
-        b"password",
-        b"somesalt",
-        "28ae0d1037991b55faec18425274d5f9169b2f44bee19b45b7a561d489d6019a",
-        "$argon2d$m=1048576,t=2,p=1$c29tZXNhbHQ\
-               $KK4NEDeZG1X67BhCUnTV+RabL0S+4ZtFt6Vh1InWAZo",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version10_3() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        2,
-        262144,
-        1,
-        b"password",
-        b"somesalt",
-        "41c89760d85b80ba1be7e959ebd16390bfb4176db9466d70f670457ccade4ec8",
-        "$argon2d$m=262144,t=2,p=1$c29tZXNhbHQ\
-               $QciXYNhbgLob5+lZ69FjkL+0F225Rm1w9nBFfMreTsg",
-    );
-}
-
-#[test]
-fn test_argon2d_version10_4() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        2,
-        256,
-        1,
-        b"password",
-        b"somesalt",
-        "bd404868ff00c52e7543c8332e6a772a5724892d7e328d5cf253bbc8e726b371",
-        "$argon2d$m=256,t=2,p=1$c29tZXNhbHQ\
-               $vUBIaP8AxS51Q8gzLmp3KlckiS1+Mo1c8lO7yOcms3E",
-    );
-}
-
-#[test]
-fn test_argon2d_version10_5() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        2,
-        256,
-        2,
-        b"password",
-        b"somesalt",
-        "6a91d02b9f8854ba0841f04aa6e53c1d3374c0a0c646b8e431b03de805b91ec3",
-        "$argon2d$m=256,t=2,p=2$c29tZXNhbHQ\
-               $apHQK5+IVLoIQfBKpuU8HTN0wKDGRrjkMbA96AW5HsM",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version10_6() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        1,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "05d1d0a85f499e9397b9c1c936b20f366a7273ccf259e2edfdb44ca8f86dd11f",
-        "$argon2d$m=65536,t=1,p=1$c29tZXNhbHQ\
-               $BdHQqF9JnpOXucHJNrIPNmpyc8zyWeLt/bRMqPht0R8",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version10_7() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        4,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "99e787faced20949df5a3b9c8620712b45cfea061716adf8b13efb7feee44084",
-        "$argon2d$m=65536,t=4,p=1$c29tZXNhbHQ\
-               $meeH+s7SCUnfWjuchiBxK0XP6gYXFq34sT77f+7kQIQ",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version10_8() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"differentpassword",
-        b"somesalt",
-        "b9c2e4a4ec9a6db99ca4e2b549dd64256305b95754b0a70ad757cd1ff7eed4a4",
-        "$argon2d$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $ucLkpOyabbmcpOK1Sd1kJWMFuVdUsKcK11fNH/fu1KQ",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version10_9() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"password",
-        b"diffsalt",
-        "d1da14196c233e0a3cb687aa6e6c465cb50669ffdb891158c2b75722395f14d5",
-        "$argon2d$m=65536,t=2,p=1$ZGlmZnNhbHQ\
-               $0doUGWwjPgo8toeqbmxGXLUGaf/biRFYwrdXIjlfFNU",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version13_1() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "955e5d5b163a1b60bba35fc36d0496474fba4f6b59ad53628666f07fb2f93eaf",
-        "$argon2d$v=19$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $lV5dWxY6G2C7o1/DbQSWR0+6T2tZrVNihmbwf7L5Pq8",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version13_2() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        2,
-        1048576,
-        1,
-        b"password",
-        b"somesalt",
-        "c2d680a6e7ac1b75e2c2b1e5e71b1701584869492efea4a76ccc91fec622d1ae",
-        "$argon2d$v=19$m=1048576,t=2,p=1$c29tZXNhbHQ\
-               $wtaApuesG3XiwrHl5xsXAVhIaUku/qSnbMyR/sYi0a4",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version13_3() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        2,
-        262144,
-        1,
-        b"password",
-        b"somesalt",
-        "9678b3379ce20ddc96fa38f045c8cdc96282287ff2848efd867582b9528a2155",
-        "$argon2d$v=19$m=262144,t=2,p=1$c29tZXNhbHQ\
-               $lnizN5ziDdyW+jjwRcjNyWKCKH/yhI79hnWCuVKKIVU",
-    );
-}
-
-#[test]
-fn test_argon2d_version13_4() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        2,
-        256,
-        1,
-        b"password",
-        b"somesalt",
-        "25c4ee8ba448054b49efc804e478b9d823be1f9bd2e99f51d6ec4007a3a1501f",
-        "$argon2d$v=19$m=256,t=2,p=1$c29tZXNhbHQ\
-               $JcTui6RIBUtJ78gE5Hi52CO+H5vS6Z9R1uxAB6OhUB8",
-    );
-}
-
-#[test]
-fn test_argon2d_version13_5() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        2,
-        256,
-        2,
-        b"password",
-        b"somesalt",
-        "7b69c92d7c3889aad1281dbc8baefc12cc37c80f1c75e33ef2c2d40c28ebc573",
-        "$argon2d$v=19$m=256,t=2,p=2$c29tZXNhbHQ\
-               $e2nJLXw4iarRKB28i678Esw3yA8cdeM+8sLUDCjrxXM",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version13_6() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        1,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "8193708c030f09b121526b0efdffce738fef0ddb13937a65d43f3f1eab9aa802",
-        "$argon2d$v=19$m=65536,t=1,p=1$c29tZXNhbHQ\
-               $gZNwjAMPCbEhUmsO/f/Oc4/vDdsTk3pl1D8/HquaqAI",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version13_7() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        4,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "cd1e2816cf8895fffe535b87b7a0aa3612f73c6ce063de83b1e7b4621ca0afe6",
-        "$argon2d$v=19$m=65536,t=4,p=1$c29tZXNhbHQ\
-               $zR4oFs+Ilf/+U1uHt6CqNhL3PGzgY96Dsee0Yhygr+Y",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version13_8() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"differentpassword",
-        b"somesalt",
-        "a34dafc893182d521ae467bbfdce60f973a1223c4615654efeb0bfef8a930e25",
-        "$argon2d$v=19$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $o02vyJMYLVIa5Ge7/c5g+XOhIjxGFWVO/rC/74qTDiU",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2d_version13_9() {
-    hash_test(
-        Variant::Argon2d,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"password",
-        b"diffsalt",
-        "f00eb8a999a1c6949c61fbbee3c3cece5066e3ff5c79aed421266055e2bf4dd7",
-        "$argon2d$v=19$m=65536,t=2,p=1$ZGlmZnNhbHQ\
-               $8A64qZmhxpScYfu+48POzlBm4/9cea7UISZgVeK/Tdc",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version10_1() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "f6c4db4a54e2a370627aff3db6176b94a2a209a62c8e36152711802f7b30c694",
-        "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version10_2() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        2,
-        1048576,
-        1,
-        b"password",
-        b"somesalt",
-        "9690ec55d28d3ed32562f2e73ea62b02b018757643a2ae6e79528459de8106e9",
-        "$argon2i$m=1048576,t=2,p=1$c29tZXNhbHQ\
-               $lpDsVdKNPtMlYvLnPqYrArAYdXZDoq5ueVKEWd6BBuk",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version10_3() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        2,
-        262144,
-        1,
-        b"password",
-        b"somesalt",
-        "3e689aaa3d28a77cf2bc72a51ac53166761751182f1ee292e3f677a7da4c2467",
-        "$argon2i$m=262144,t=2,p=1$c29tZXNhbHQ\
-               $Pmiaqj0op3zyvHKlGsUxZnYXURgvHuKS4/Z3p9pMJGc",
-    );
-}
-
-#[test]
-fn test_argon2i_version10_4() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        2,
-        256,
-        1,
-        b"password",
-        b"somesalt",
-        "fd4dd83d762c49bdeaf57c47bdcd0c2f1babf863fdeb490df63ede9975fccf06",
-        "$argon2i$m=256,t=2,p=1$c29tZXNhbHQ\
-               $/U3YPXYsSb3q9XxHvc0MLxur+GP960kN9j7emXX8zwY",
-    );
-}
-
-#[test]
-fn test_argon2i_version10_5() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        2,
-        256,
-        2,
-        b"password",
-        b"somesalt",
-        "b6c11560a6a9d61eac706b79a2f97d68b4463aa3ad87e00c07e2b01e90c564fb",
-        "$argon2i$m=256,t=2,p=2$c29tZXNhbHQ\
-               $tsEVYKap1h6scGt5ovl9aLRGOqOth+AMB+KwHpDFZPs",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version10_6() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        1,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "81630552b8f3b1f48cdb1992c4c678643d490b2b5eb4ff6c4b3438b5621724b2",
-        "$argon2i$m=65536,t=1,p=1$c29tZXNhbHQ\
-               $gWMFUrjzsfSM2xmSxMZ4ZD1JCytetP9sSzQ4tWIXJLI",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version10_7() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        4,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "f212f01615e6eb5d74734dc3ef40ade2d51d052468d8c69440a3a1f2c1c2847b",
-        "$argon2i$m=65536,t=4,p=1$c29tZXNhbHQ\
-               $8hLwFhXm6110c03D70Ct4tUdBSRo2MaUQKOh8sHChHs",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version10_8() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"differentpassword",
-        b"somesalt",
-        "e9c902074b6754531a3a0be519e5baf404b30ce69b3f01ac3bf21229960109a3",
-        "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $6ckCB0tnVFMaOgvlGeW69ASzDOabPwGsO/ISKZYBCaM",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version10_9() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"password",
-        b"diffsalt",
-        "79a103b90fe8aef8570cb31fc8b22259778916f8336b7bdac3892569d4f1c497",
-        "$argon2i$m=65536,t=2,p=1$ZGlmZnNhbHQ\
-               $eaEDuQ/orvhXDLMfyLIiWXeJFvgza3vaw4kladTxxJc",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version13_1() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "c1628832147d9720c5bd1cfd61367078729f6dfb6f8fea9ff98158e0d7816ed0",
-        "$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version13_2() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        2,
-        1048576,
-        1,
-        b"password",
-        b"somesalt",
-        "d1587aca0922c3b5d6a83edab31bee3c4ebaef342ed6127a55d19b2351ad1f41",
-        "$argon2i$v=19$m=1048576,t=2,p=1$c29tZXNhbHQ\
-               $0Vh6ygkiw7XWqD7asxvuPE667zQu1hJ6VdGbI1GtH0E",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version13_3() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        2,
-        262144,
-        1,
-        b"password",
-        b"somesalt",
-        "296dbae80b807cdceaad44ae741b506f14db0959267b183b118f9b24229bc7cb",
-        "$argon2i$v=19$m=262144,t=2,p=1$c29tZXNhbHQ\
-               $KW266AuAfNzqrUSudBtQbxTbCVkmexg7EY+bJCKbx8s",
-    );
-}
-
-#[test]
-fn test_argon2i_version13_4() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        2,
-        256,
-        1,
-        b"password",
-        b"somesalt",
-        "89e9029f4637b295beb027056a7336c414fadd43f6b208645281cb214a56452f",
-        "$argon2i$v=19$m=256,t=2,p=1$c29tZXNhbHQ\
-               $iekCn0Y3spW+sCcFanM2xBT63UP2sghkUoHLIUpWRS8",
-    );
-}
-
-#[test]
-fn test_argon2i_version13_5() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        2,
-        256,
-        2,
-        b"password",
-        b"somesalt",
-        "4ff5ce2769a1d7f4c8a491df09d41a9fbe90e5eb02155a13e4c01e20cd4eab61",
-        "$argon2i$v=19$m=256,t=2,p=2$c29tZXNhbHQ\
-               $T/XOJ2mh1/TIpJHfCdQan76Q5esCFVoT5MAeIM1Oq2E",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version13_6() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        1,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "d168075c4d985e13ebeae560cf8b94c3b5d8a16c51916b6f4ac2da3ac11bbecf",
-        "$argon2i$v=19$m=65536,t=1,p=1$c29tZXNhbHQ\
-               $0WgHXE2YXhPr6uVgz4uUw7XYoWxRkWtvSsLaOsEbvs8",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version13_7() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        4,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "aaa953d58af3706ce3df1aefd4a64a84e31d7f54175231f1285259f88174ce5b",
-        "$argon2i$v=19$m=65536,t=4,p=1$c29tZXNhbHQ\
-               $qqlT1YrzcGzj3xrv1KZKhOMdf1QXUjHxKFJZ+IF0zls",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version13_8() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"differentpassword",
-        b"somesalt",
-        "14ae8da01afea8700c2358dcef7c5358d9021282bd88663a4562f59fb74d22ee",
-        "$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $FK6NoBr+qHAMI1jc73xTWNkCEoK9iGY6RWL1n7dNIu4",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2i_version13_9() {
-    hash_test(
-        Variant::Argon2i,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"password",
-        b"diffsalt",
-        "b0357cccfbef91f3860b0dba447b2348cbefecadaf990abfe9cc40726c521271",
-        "$argon2i$v=19$m=65536,t=2,p=1$ZGlmZnNhbHQ\
-               $sDV8zPvvkfOGCw26RHsjSMvv7K2vmQq/6cxAcmxSEnE",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version10_1() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "980ebd24a4e667f16346f9d4a78b175728783613e0cc6fb17c2ec884b16435df",
-        "$argon2id$v=16$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $mA69JKTmZ/FjRvnUp4sXVyh4NhPgzG+xfC7IhLFkNd8",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version10_2() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        2,
-        1048576,
-        1,
-        b"password",
-        b"somesalt",
-        "ce622fc2053acd224c06e7be122f9e9554b62b8a414b032056b46123422e32ab",
-        "$argon2id$v=16$m=1048576,t=2,p=1$c29tZXNhbHQ\
-               $zmIvwgU6zSJMBue+Ei+elVS2K4pBSwMgVrRhI0IuMqs",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version10_3() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        2,
-        262144,
-        1,
-        b"password",
-        b"somesalt",
-        "01cbafb58f2dc764adced1ab9a90fcb62f6ed8a066023b6ba0c204db6c9b90cd",
-        "$argon2id$v=16$m=262144,t=2,p=1$c29tZXNhbHQ\
-               $AcuvtY8tx2StztGrmpD8ti9u2KBmAjtroMIE22ybkM0",
-    );
-}
-
-#[test]
-fn test_argon2id_version10_4() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        2,
-        256,
-        1,
-        b"password",
-        b"somesalt",
-        "da070e576e50f2f38a3c897cbddc6c7fb4028e870971ff9eae7b4e1879295e6e",
-        "$argon2id$v=16$m=256,t=2,p=1$c29tZXNhbHQ\
-               $2gcOV25Q8vOKPIl8vdxsf7QCjocJcf+erntOGHkpXm4",
-    );
-}
-
-#[test]
-fn test_argon2id_version10_5() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        2,
-        256,
-        2,
-        b"password",
-        b"somesalt",
-        "f8aabb5315c63cddcdb3b4a021550928e525699da8fcbd1c2b0b1ccd35cc87a7",
-        "$argon2id$v=16$m=256,t=2,p=2$c29tZXNhbHQ\
-               $+Kq7UxXGPN3Ns7SgIVUJKOUlaZ2o/L0cKwsczTXMh6c",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version10_6() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        1,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "8e0f310407a989013a823defbd6cbae54d86b35d1ac16e4f88eb4645e1357956",
-        "$argon2id$v=16$m=65536,t=1,p=1$c29tZXNhbHQ\
-               $jg8xBAepiQE6gj3vvWy65U2Gs10awW5PiOtGReE1eVY",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version10_7() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        4,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "16653426e582143da6a0ff75daac9fa94c21ac2c221c96bd3645a5c15c2d962a",
-        "$argon2id$v=16$m=65536,t=4,p=1$c29tZXNhbHQ\
-               $FmU0JuWCFD2moP912qyfqUwhrCwiHJa9NkWlwVwtlio",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version10_8() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"differentpassword",
-        b"somesalt",
-        "75709d4c96a2c235696a77eefeecf33e64221f470b26177c19e5e27642612dbb",
-        "$argon2id$v=16$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $dXCdTJaiwjVpanfu/uzzPmQiH0cLJhd8GeXidkJhLbs",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version10_9() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version10,
-        2,
-        65536,
-        1,
-        b"password",
-        b"diffsalt",
-        "f0b57cfe03a9d78c4700e2fe802002343660a56b1b5d21ead788e6bb44ef48d3",
-        "$argon2id$v=16$m=65536,t=2,p=1$ZGlmZnNhbHQ\
-               $8LV8/gOp14xHAOL+gCACNDZgpWsbXSHq14jmu0TvSNM",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version13_1() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "09316115d5cf24ed5a15a31a3ba326e5cf32edc24702987c02b6566f61913cf7",
-        "$argon2id$v=19$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $CTFhFdXPJO1aFaMaO6Mm5c8y7cJHAph8ArZWb2GRPPc",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version13_2() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        2,
-        1048576,
-        1,
-        b"password",
-        b"somesalt",
-        "16a1cb8a061cf1f8b16fb195fe559fa6d1435e43dded2f4fb07293176be892fa",
-        "$argon2id$v=19$m=1048576,t=2,p=1$c29tZXNhbHQ\
-               $FqHLigYc8fixb7GV/lWfptFDXkPd7S9PsHKTF2vokvo",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version13_3() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        2,
-        262144,
-        1,
-        b"password",
-        b"somesalt",
-        "78fe1ec91fb3aa5657d72e710854e4c3d9b9198c742f9616c2f085bed95b2e8c",
-        "$argon2id$v=19$m=262144,t=2,p=1$c29tZXNhbHQ\
-               $eP4eyR+zqlZX1y5xCFTkw9m5GYx0L5YWwvCFvtlbLow",
-    );
-}
-
-#[test]
-fn test_argon2id_version13_4() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        2,
-        256,
-        1,
-        b"password",
-        b"somesalt",
-        "9dfeb910e80bad0311fee20f9c0e2b12c17987b4cac90c2ef54d5b3021c68bfe",
-        "$argon2id$v=19$m=256,t=2,p=1$c29tZXNhbHQ\
-               $nf65EOgLrQMR/uIPnA4rEsF5h7TKyQwu9U1bMCHGi/4",
-    );
-}
-
-#[test]
-fn test_argon2id_version13_5() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        2,
-        256,
-        2,
-        b"password",
-        b"somesalt",
-        "6d093c501fd5999645e0ea3bf620d7b8be7fd2db59c20d9fff9539da2bf57037",
-        "$argon2id$v=19$m=256,t=2,p=2$c29tZXNhbHQ\
-               $bQk8UB/VmZZF4Oo79iDXuL5/0ttZwg2f/5U52iv1cDc",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version13_6() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        1,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "f6a5adc1ba723dddef9b5ac1d464e180fcd9dffc9d1cbf76cca2fed795d9ca98",
-        "$argon2id$v=19$m=65536,t=1,p=1$c29tZXNhbHQ\
-               $9qWtwbpyPd3vm1rB1GThgPzZ3/ydHL92zKL+15XZypg",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version13_7() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        4,
-        65536,
-        1,
-        b"password",
-        b"somesalt",
-        "9025d48e68ef7395cca9079da4c4ec3affb3c8911fe4f86d1a2520856f63172c",
-        "$argon2id$v=19$m=65536,t=4,p=1$c29tZXNhbHQ\
-               $kCXUjmjvc5XMqQedpMTsOv+zyJEf5PhtGiUghW9jFyw",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version13_8() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"differentpassword",
-        b"somesalt",
-        "0b84d652cf6b0c4beaef0dfe278ba6a80df6696281d7e0d2891b817d8c458fde",
-        "$argon2id$v=19$m=65536,t=2,p=1$c29tZXNhbHQ\
-               $C4TWUs9rDEvq7w3+J4umqA32aWKB1+DSiRuBfYxFj94",
-    );
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_argon2id_version13_9() {
-    hash_test(
-        Variant::Argon2id,
-        Version::Version13,
-        2,
-        65536,
-        1,
-        b"password",
-        b"diffsalt",
-        "bdf32b05ccc42eb15d58fd19b1f856b113da1e9a5874fdcc544308565aa8141c",
-        "$argon2id$v=19$m=65536,t=2,p=1$ZGlmZnNhbHQ\
-               $vfMrBczELrFdWP0ZsfhWsRPaHppYdP3MVEMIVlqoFBw",
-    );
-}
-
-#[test]
-fn test_verify_encoded_with_missing_dollar_before_salt_version10() {
-    let encoded = "$argon2i$m=65536,t=2,p=1c29tZXNhbHQ\
-                   $9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ";
-    let password = b"password";
-    let res = argon2::verify_encoded(encoded, password);
-    assert_eq!(res, Err(Error::DecodingFail));
-}
-
-#[test]
-fn test_verify_encoded_with_missing_dollar_before_salt_version13() {
-    let encoded = "$argon2i$v=19$m=65536,t=2,p=1c29tZXNhbHQ\
-                   $wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA";
-    let password = b"password";
-    let res = argon2::verify_encoded(encoded, password);
-    assert_eq!(res, Err(Error::DecodingFail));
-}
-
-#[test]
-fn test_verify_encoded_with_missing_dollar_before_hash_version10() {
-    let encoded = "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ\
-                   9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ";
-    let password = b"password";
-    let res = argon2::verify_encoded(encoded, password);
-    assert_eq!(res, Err(Error::DecodingFail));
-}
-
-#[test]
-fn test_verify_encoded_with_missing_dollar_before_hash_version13() {
-    let encoded = "$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ\
-                   wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA";
-    let password = b"password";
-    let res = argon2::verify_encoded(encoded, password);
-    assert_eq!(res, Err(Error::DecodingFail));
-}
-
-#[test]
-fn test_verify_encoded_with_too_short_salt_version10() {
-    let encoded = "$argon2i$m=65536,t=2,p=1$\
-                   $9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ";
-    let password = b"password";
-    let res = argon2::verify_encoded(encoded, password);
-    assert_eq!(res, Err(Error::SaltTooShort));
-}
-
-#[test]
-fn test_verify_encoded_with_too_short_salt_version13() {
-    let encoded = "$argon2i$v=19$m=65536,t=2,p=1$\
-                   $9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ";
-    let password = b"password";
-    let res = argon2::verify_encoded(encoded, password);
-    assert_eq!(res, Err(Error::SaltTooShort));
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_verify_encoded_with_wrong_password_version10() {
-    let encoded = "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ\
-                   $b2G3seW+uPzerwQQC+/E1K50CLLO7YXy0JRcaTuswRo";
-    let password = b"password"; // should be passwore
-    let res = argon2::verify_encoded(encoded, password);
-    assert_eq!(res, Ok(false));
-}
-
-#[cfg(not(debug_assertions))]
-#[test]
-fn test_verify_encoded_with_wrong_password_version13() {
-    let encoded = "$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ\
-                   $8iIuixkI73Js3G1uMbezQXD0b8LG4SXGsOwoQkdAQIM";
-    let password = b"password"; // should be passwore
-    let res = argon2::verify_encoded(encoded, password);
-    assert_eq!(res, Ok(false));
-}
-
-#[test]
-fn test_encoded_len_returns_correct_length() {
-    assert_eq!(argon2::encoded_len(Variant::Argon2d, 256, 1, 1, 8, 32), 83);
-    assert_eq!(
-        argon2::encoded_len(Variant::Argon2i, 4096, 10, 10, 8, 32),
-        86
-    );
-    assert_eq!(
-        argon2::encoded_len(Variant::Argon2id, 65536, 100, 10, 8, 32),
-        89
-    );
-}
-
-#[test]
-fn test_hash_raw_with_not_enough_memory() {
-    let pwd = b"password";
-    let salt = b"diffsalt";
-    let config = Config {
-        variant: Variant::Argon2i,
-        version: Version::Version13,
-        mem_cost: 2,
-        time_cost: 2,
-        lanes: 1,
-        thread_mode: ThreadMode::Sequential,
-        secret: &[],
-        ad: &[],
-        hash_length: 32,
-    };
-    let res = argon2::hash_raw(pwd, salt, &config);
-    assert_eq!(res, Err(Error::MemoryTooLittle));
-}
-
-#[test]
-fn test_hash_raw_with_too_short_salt() {
-    let pwd = b"password";
-    let salt = b"s";
-    let config = Config {
-        variant: Variant::Argon2i,
-        version: Version::Version13,
-        mem_cost: 2048,
-        time_cost: 2,
-        lanes: 1,
-        thread_mode: ThreadMode::Sequential,
-        secret: &[],
-        ad: &[],
-        hash_length: 32,
-    };
-    let res = argon2::hash_raw(pwd, salt, &config);
-    assert_eq!(res, Err(Error::SaltTooShort));
-}
-
-fn hash_test(
-    var: Variant,
-    ver: Version,
-    t: u32,
-    m: u32,
-    p: u32,
-    pwd: &[u8],
-    salt: &[u8],
-    hex: &str,
-    enc: &str,
-) {
-    let threads = if cfg!(feature = "crossbeam-utils") { p } else { 1 };
-    let config = Config {
-        variant: var,
-        version: ver,
-        mem_cost: m,
-        time_cost: t,
-        lanes: p,
-        thread_mode: ThreadMode::from_threads(threads),
-        secret: &[],
-        ad: &[],
-        hash_length: 32,
-    };
-    let hash = argon2::hash_raw(pwd, salt, &config).unwrap();
-    let hex_str = hash.encode_hex::<String>();
-    assert_eq!(hex_str.as_str(), hex);
-
-    let encoded = argon2::hash_encoded(pwd, salt, &config).unwrap();
-    let result = argon2::verify_encoded(encoded.as_str(), pwd).unwrap();
-    assert!(result);
-
-    let result = argon2::verify_encoded(enc, pwd).unwrap();
-    assert!(result);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"745b2ebdbcb270e9ee9971499f6309d338734def0d8c2bbcb01d5f1f54019dc0","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"3bb7af78423e95b207beebd452cdd973d65663cf25a0fc9358c588f53783293c","src/legacy.rs":"b4d5a140ed0bf2d792431961d6fd44a21c99235489a2c9f6717d1577a42c09ce","src/lib.rs":"4a3b7a8cf55fc741be9b794825f606a466d008b7a5fd5c202ada3a79ee226438","src/v0.rs":"0e38a4ee8ac4991a06213de6d1e5180ddabbed18f5fe2e9225797c5ff945d2e2"},"package":"6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"}
\ No newline at end of file
+{"files":{"Cargo.toml":"574e364beff42bec64bc576759ff927d1d2ba3fb52c595dd8bc02864778f8406","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"3bb7af78423e95b207beebd452cdd973d65663cf25a0fc9358c588f53783293c","src/legacy.rs":"b4d5a140ed0bf2d792431961d6fd44a21c99235489a2c9f6717d1577a42c09ce","src/lib.rs":"a6aef558ecbdcad7ed63d4590863a29233264396b6b21745b498df1602776457","src/v0-large-test-symbols/early-recursion-limit":"96861a7042db35ee0bd04802820d0f2d6a3b534ce13547912b6364001ffd1494","src/v0.rs":"4e5bd069aa61def3dc732b3a285861914895272668ddfcb6b9eef46dd5713041"},"package":"7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "rustc-demangle"
-version = "0.1.18"
+version = "0.1.21"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Rust compiler symbol demangling.\n"
 homepage = "https://github.com/alexcrichton/rustc-demangle"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -30,10 +30,36 @@
 #[macro_use]
 extern crate std;
 
+// HACK(eddyb) helper macros for tests.
+#[cfg(test)]
+macro_rules! assert_contains {
+    ($s:expr, $needle:expr) => {{
+        let (s, needle) = ($s, $needle);
+        assert!(
+            s.contains(needle),
+            "{:?} should've contained {:?}",
+            s,
+            needle
+        );
+    }};
+}
+#[cfg(test)]
+macro_rules! assert_ends_with {
+    ($s:expr, $suffix:expr) => {{
+        let (s, suffix) = ($s, $suffix);
+        assert!(
+            s.ends_with(suffix),
+            "{:?} should've ended in {:?}",
+            s,
+            suffix
+        );
+    }};
+}
+
 mod legacy;
 mod v0;
 
-use core::fmt;
+use core::fmt::{self, Write as _};
 
 /// Representation of a demangled symbol name.
 pub struct Demangle<'a> {
@@ -90,7 +116,12 @@
                 suffix = s;
                 Some(DemangleStyle::V0(d))
             }
-            Err(v0::Invalid) => None,
+            // FIXME(eddyb) would it make sense to treat an unknown-validity
+            // symbol (e.g. one that errored with `RecursedTooDeep`) as
+            // v0-mangled, and have the error show up in the demangling?
+            // (that error already gets past this initial check, and therefore
+            // will show up in the demangling, if hidden behind a backref)
+            Err(v0::ParseError::Invalid) | Err(v0::ParseError::RecursedTooDeep) => None,
         },
     };
 
@@ -176,12 +207,69 @@
     }
 }
 
+impl<'a> fmt::Display for DemangleStyle<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            DemangleStyle::Legacy(ref d) => fmt::Display::fmt(d, f),
+            DemangleStyle::V0(ref d) => fmt::Display::fmt(d, f),
+        }
+    }
+}
+
+// Maximum size of the symbol that we'll print.
+const MAX_SIZE: usize = 1_000_000;
+
+#[derive(Copy, Clone, Debug)]
+struct SizeLimitExhausted;
+
+struct SizeLimitedFmtAdapter<F> {
+    remaining: Result<usize, SizeLimitExhausted>,
+    inner: F,
+}
+
+impl<F: fmt::Write> fmt::Write for SizeLimitedFmtAdapter<F> {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        self.remaining = self
+            .remaining
+            .and_then(|r| r.checked_sub(s.len()).ok_or(SizeLimitExhausted));
+
+        match self.remaining {
+            Ok(_) => self.inner.write_str(s),
+            Err(SizeLimitExhausted) => Err(fmt::Error),
+        }
+    }
+}
+
 impl<'a> fmt::Display for Demangle<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.style {
             None => f.write_str(self.original)?,
-            Some(DemangleStyle::Legacy(ref d)) => fmt::Display::fmt(d, f)?,
-            Some(DemangleStyle::V0(ref d)) => fmt::Display::fmt(d, f)?,
+            Some(ref d) => {
+                let alternate = f.alternate();
+                let mut size_limited_fmt = SizeLimitedFmtAdapter {
+                    remaining: Ok(MAX_SIZE),
+                    inner: &mut *f,
+                };
+                let fmt_result = if alternate {
+                    write!(size_limited_fmt, "{:#}", d)
+                } else {
+                    write!(size_limited_fmt, "{}", d)
+                };
+                let size_limit_result = size_limited_fmt.remaining.map(|_| ());
+
+                // Translate a `fmt::Error` generated by `SizeLimitedFmtAdapter`
+                // into an error message, instead of propagating it upwards
+                // (which could cause panicking from inside e.g. `std::io::print`).
+                match (fmt_result, size_limit_result) {
+                    (Err(_), Err(SizeLimitExhausted)) => f.write_str("{size limit reached}")?,
+
+                    _ => {
+                        fmt_result?;
+                        size_limit_result
+                            .expect("`fmt::Error` from `SizeLimitedFmtAdapter` was discarded");
+                    }
+                }
+            }
         }
         f.write_str(self.suffix)
     }
@@ -376,4 +464,30 @@
             "<core::result::Result<!, E> as std::process::Termination>::report::hfc41d0da4a40b3e8"
         );
     }
+
+    #[test]
+    fn limit_recursion() {
+        assert_contains!(
+            super::demangle("_RNvB_1a").to_string(),
+            "{recursion limit reached}"
+        );
+        assert_contains!(
+            super::demangle("_RMC0RB2_").to_string(),
+            "{recursion limit reached}"
+        );
+    }
+
+    #[test]
+    fn limit_output() {
+        assert_ends_with!(
+            super::demangle("RYFG_FGyyEvRYFF_EvRYFFEvERLB_B_B_ERLRjB_B_B_").to_string(),
+            "{size limit reached}"
+        );
+        // NOTE(eddyb) somewhat reduced version of the above, effectively
+        // `<for<...> fn()>` with a larger number of lifetimes in `...`.
+        assert_ends_with!(
+            super::demangle("_RMC0FGZZZ_Eu").to_string(),
+            "{size limit reached}"
+        );
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/src/v0-large-test-symbols/early-recursion-limit thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/src/v0-large-test-symbols/early-recursion-limit
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/src/v0-large-test-symbols/early-recursion-limit	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/src/v0-large-test-symbols/early-recursion-limit	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+# NOTE: empty lines, and lines starting with `#`, are ignored.
+
+# Large test symbols for `v0::test::demangling_limits`, that specifically cause
+# a `RecursedTooDeep` error from `v0::demangle`'s shallow traversal (sanity check)
+# of the mangled symbol, i.e. before any printing coudl be attempted.
+
+RICu4$TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOSOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTYTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu5,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu3.,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOxxxRICu4,-xxxxffff..ffffffffffffffffffffffffffffffffffffffffffffffffffffffffxxxxxxxxxxxxxxxxxxxRaRBRaR>R>xxxu2IC,-xxxxxxRIC4xxxOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTxxxxxRICu4.,-xOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOxxxRICu4,-xxxxffff..ffffffffffffffffffffffffffffffffffffffffffffffffffffffffxxxxxxxxxxxxxxxxxxxRaRBRaR>R>xxxu2IC,-xxxxxxRIC4xxx..K..xRBRaR>RICu6$-RBKIQARICu6$-RBKIQAA........TvvKKKKKKKKKxxxxxxxxxxxxxxxBKIQARICu6$-RBKIQAA...._.xxx
+RIYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYFhhhhYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYNYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYNYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYFhhhhYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYNYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRYYYYYYYYYXB_RXB_lYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYMYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRXB_RXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYIBRIIRIIBRCIByEEj_ByEEj_EEj
+RYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSYYYYSSSSSSSSSSSSSSSSSYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYSSSSRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRSSSSSSSRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRSSSSSSSRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRSSSSSSSYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSSRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYyYYYbYYYYYYYYYYYYYYRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRYYYYYYYYYYYYYmYYYYYYYYYYYYYYYYYYYYYRCu3YYYYYYYYYYYPYYYYYYbYYYYYYYYYRYYYYYYYYYYYYYYYYYYSSSSSSSSSSSS
+RYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYyYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYR;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/src/v0.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/src/v0.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/rustc-demangle/src/v0.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/rustc-demangle/src/v0.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,40 @@
-use core::char;
-use core::fmt;
-use core::fmt::Display;
+use core::convert::TryFrom;
+use core::{char, fmt, iter, mem, str};
+
+#[allow(unused_macros)]
+macro_rules! write {
+    ($($ignored:tt)*) => {
+        compile_error!(
+            "use `self.print(value)` or `fmt::Trait::fmt(&value, self.out)`, \
+             instead of `write!(self.out, \"{...}\", value)`"
+        )
+    };
+}
+
+// Maximum recursion depth when parsing symbols before we just bail out saying
+// "this symbol is invalid"
+const MAX_DEPTH: u32 = 500;
 
 /// Representation of a demangled symbol name.
 pub struct Demangle<'a> {
     inner: &'a str,
 }
 
+#[derive(PartialEq, Eq, Debug)]
+pub enum ParseError {
+    /// Symbol doesn't match the expected `v0` grammar.
+    Invalid,
+
+    /// Parsing the symbol crossed the recursion limit (see `MAX_DEPTH`).
+    RecursedTooDeep,
+}
+
 /// De-mangles a Rust symbol into a more readable version
 ///
 /// This function will take a **mangled** symbol and return a value. When printed,
 /// the de-mangled version will be written. If the symbol does not look like
 /// a mangled symbol, the original value will be written instead.
-pub fn demangle(s: &str) -> Result<(Demangle, &str), Invalid> {
+pub fn demangle(s: &str) -> Result<(Demangle, &str), ParseError> {
     // First validate the symbol. If it doesn't look like anything we're
     // expecting, we just print it literally. Note that we must handle non-Rust
     // symbols because we could have any function in the backtrace.
@@ -27,52 +49,62 @@
         // On OSX, symbols are prefixed with an extra _
         inner = &s[3..];
     } else {
-        return Err(Invalid);
+        return Err(ParseError::Invalid);
     }
 
     // Paths always start with uppercase characters.
     match inner.as_bytes()[0] {
         b'A'..=b'Z' => {}
-        _ => return Err(Invalid),
+        _ => return Err(ParseError::Invalid),
     }
 
     // only work with ascii text
     if inner.bytes().any(|c| c & 0x80 != 0) {
-        return Err(Invalid);
+        return Err(ParseError::Invalid);
     }
 
     // Verify that the symbol is indeed a valid path.
+    let try_parse_path = |parser| {
+        let mut dummy_printer = Printer {
+            parser: Ok(parser),
+            out: None,
+            bound_lifetime_depth: 0,
+        };
+        dummy_printer
+            .print_path(false)
+            .expect("`fmt::Error`s should be impossible without a `fmt::Formatter`");
+        dummy_printer.parser
+    };
     let mut parser = Parser {
         sym: inner,
         next: 0,
+        depth: 0,
     };
-    parser.skip_path()?;
+    parser = try_parse_path(parser)?;
 
     // Instantiating crate (paths always start with uppercase characters).
     if let Some(&(b'A'..=b'Z')) = parser.sym.as_bytes().get(parser.next) {
-        parser.skip_path()?;
+        parser = try_parse_path(parser)?;
     }
 
     Ok((Demangle { inner }, &parser.sym[parser.next..]))
 }
 
-impl<'s> Display for Demangle<'s> {
+impl<'s> fmt::Display for Demangle<'s> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut printer = Printer {
             parser: Ok(Parser {
                 sym: self.inner,
                 next: 0,
+                depth: 0,
             }),
-            out: f,
+            out: Some(f),
             bound_lifetime_depth: 0,
         };
         printer.print_path(true)
     }
 }
 
-#[derive(PartialEq, Eq)]
-pub struct Invalid;
-
 struct Ident<'s> {
     /// ASCII part of the identifier.
     ascii: &'s str,
@@ -205,7 +237,7 @@
     }
 }
 
-impl<'s> Display for Ident<'s> {
+impl<'s> fmt::Display for Ident<'s> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.try_small_punycode_decode(|chars| {
             for &c in chars {
@@ -233,6 +265,108 @@
     }
 }
 
+/// Sequence of lowercase hexadecimal nibbles (`0-9a-f`), used by leaf consts.
+struct HexNibbles<'s> {
+    nibbles: &'s str,
+}
+
+impl<'s> HexNibbles<'s> {
+    /// Decode an integer value (with the "most significant nibble" first),
+    /// returning `None` if it can't fit in an `u64`.
+    // FIXME(eddyb) should this "just" use `u128` instead?
+    fn try_parse_uint(&self) -> Option<u64> {
+        let nibbles = self.nibbles.trim_start_matches("0");
+
+        if nibbles.len() > 16 {
+            return None;
+        }
+
+        let mut v = 0;
+        for nibble in nibbles.chars() {
+            v = (v << 4) | (nibble.to_digit(16).unwrap() as u64);
+        }
+        Some(v)
+    }
+
+    /// Decode a UTF-8 byte sequence (with each byte using a pair of nibbles)
+    /// into individual `char`s, returning `None` for invalid UTF-8.
+    fn try_parse_str_chars(&self) -> Option<impl Iterator<Item = char> + 's> {
+        if self.nibbles.len() % 2 != 0 {
+            return None;
+        }
+
+        // FIXME(eddyb) use `array_chunks` instead, when that becomes stable.
+        let mut bytes = self
+            .nibbles
+            .as_bytes()
+            .chunks_exact(2)
+            .map(|slice| match slice {
+                [a, b] => [a, b],
+                _ => unreachable!(),
+            })
+            .map(|[&hi, &lo]| {
+                let half = |nibble: u8| (nibble as char).to_digit(16).unwrap() as u8;
+                (half(hi) << 4) | half(lo)
+            });
+
+        let chars = iter::from_fn(move || {
+            // As long as there are any bytes left, there's at least one more
+            // UTF-8-encoded `char` to decode (or the possibility of error).
+            bytes.next().map(|first_byte| -> Result<char, ()> {
+                // FIXME(eddyb) this `enum` and `fn` should be somewhere in `core`.
+                enum Utf8FirstByteError {
+                    ContinuationByte,
+                    TooLong,
+                }
+                fn utf8_len_from_first_byte(byte: u8) -> Result<usize, Utf8FirstByteError> {
+                    match byte {
+                        0x00..=0x7f => Ok(1),
+                        0x80..=0xbf => Err(Utf8FirstByteError::ContinuationByte),
+                        0xc0..=0xdf => Ok(2),
+                        0xe0..=0xef => Ok(3),
+                        0xf0..=0xf7 => Ok(4),
+                        0xf8..=0xff => Err(Utf8FirstByteError::TooLong),
+                    }
+                }
+
+                // Collect the appropriate amount of bytes (up to 4), according
+                // to the UTF-8 length implied by the first byte.
+                let utf8_len = utf8_len_from_first_byte(first_byte).map_err(|_| ())?;
+                let utf8 = &mut [first_byte, 0, 0, 0][..utf8_len];
+                for i in 1..utf8_len {
+                    utf8[i] = bytes.next().ok_or(())?;
+                }
+
+                // Fully validate the UTF-8 sequence.
+                let s = str::from_utf8(utf8).map_err(|_| ())?;
+
+                // Since we included exactly one UTF-8 sequence, and validation
+                // succeeded, `str::chars` should return exactly one `char`.
+                let mut chars = s.chars();
+                match (chars.next(), chars.next()) {
+                    (Some(c), None) => Ok(c),
+                    _ => unreachable!(
+                        "str::from_utf8({:?}) = {:?} was expected to have 1 char, \
+                         but {} chars were found",
+                        utf8,
+                        s,
+                        s.chars().count()
+                    ),
+                }
+            })
+        });
+
+        // HACK(eddyb) doing a separate validation iteration like this might be
+        // wasteful, but it's easier to avoid starting to print a string literal
+        // in the first place, than to abort it mid-string.
+        if chars.clone().any(|r| r.is_err()) {
+            None
+        } else {
+            Some(chars.map(Result::unwrap))
+        }
+    }
+}
+
 fn basic_type(tag: u8) -> Option<&'static str> {
     Some(match tag {
         b'b' => "bool",
@@ -264,9 +398,23 @@
 struct Parser<'s> {
     sym: &'s str,
     next: usize,
+    depth: u32,
 }
 
 impl<'s> Parser<'s> {
+    fn push_depth(&mut self) -> Result<(), ParseError> {
+        self.depth += 1;
+        if self.depth > MAX_DEPTH {
+            Err(ParseError::RecursedTooDeep)
+        } else {
+            Ok(())
+        }
+    }
+
+    fn pop_depth(&mut self) {
+        self.depth -= 1;
+    }
+
     fn peek(&self) -> Option<u8> {
         self.sym.as_bytes().get(self.next).cloned()
     }
@@ -280,45 +428,47 @@
         }
     }
 
-    fn next(&mut self) -> Result<u8, Invalid> {
-        let b = self.peek().ok_or(Invalid)?;
+    fn next(&mut self) -> Result<u8, ParseError> {
+        let b = self.peek().ok_or(ParseError::Invalid)?;
         self.next += 1;
         Ok(b)
     }
 
-    fn hex_nibbles(&mut self) -> Result<&'s str, Invalid> {
+    fn hex_nibbles(&mut self) -> Result<HexNibbles<'s>, ParseError> {
         let start = self.next;
         loop {
             match self.next()? {
                 b'0'..=b'9' | b'a'..=b'f' => {}
                 b'_' => break,
-                _ => return Err(Invalid),
+                _ => return Err(ParseError::Invalid),
             }
         }
-        Ok(&self.sym[start..self.next - 1])
+        Ok(HexNibbles {
+            nibbles: &self.sym[start..self.next - 1],
+        })
     }
 
-    fn digit_10(&mut self) -> Result<u8, Invalid> {
+    fn digit_10(&mut self) -> Result<u8, ParseError> {
         let d = match self.peek() {
             Some(d @ b'0'..=b'9') => d - b'0',
-            _ => return Err(Invalid),
+            _ => return Err(ParseError::Invalid),
         };
         self.next += 1;
         Ok(d)
     }
 
-    fn digit_62(&mut self) -> Result<u8, Invalid> {
+    fn digit_62(&mut self) -> Result<u8, ParseError> {
         let d = match self.peek() {
             Some(d @ b'0'..=b'9') => d - b'0',
             Some(d @ b'a'..=b'z') => 10 + (d - b'a'),
             Some(d @ b'A'..=b'Z') => 10 + 26 + (d - b'A'),
-            _ => return Err(Invalid),
+            _ => return Err(ParseError::Invalid),
         };
         self.next += 1;
         Ok(d)
     }
 
-    fn integer_62(&mut self) -> Result<u64, Invalid> {
+    fn integer_62(&mut self) -> Result<u64, ParseError> {
         if self.eat(b'_') {
             return Ok(0);
         }
@@ -326,24 +476,24 @@
         let mut x: u64 = 0;
         while !self.eat(b'_') {
             let d = self.digit_62()? as u64;
-            x = x.checked_mul(62).ok_or(Invalid)?;
-            x = x.checked_add(d).ok_or(Invalid)?;
+            x = x.checked_mul(62).ok_or(ParseError::Invalid)?;
+            x = x.checked_add(d).ok_or(ParseError::Invalid)?;
         }
-        x.checked_add(1).ok_or(Invalid)
+        x.checked_add(1).ok_or(ParseError::Invalid)
     }
 
-    fn opt_integer_62(&mut self, tag: u8) -> Result<u64, Invalid> {
+    fn opt_integer_62(&mut self, tag: u8) -> Result<u64, ParseError> {
         if !self.eat(tag) {
             return Ok(0);
         }
-        self.integer_62()?.checked_add(1).ok_or(Invalid)
+        self.integer_62()?.checked_add(1).ok_or(ParseError::Invalid)
     }
 
-    fn disambiguator(&mut self) -> Result<u64, Invalid> {
+    fn disambiguator(&mut self) -> Result<u64, ParseError> {
         self.opt_integer_62(b's')
     }
 
-    fn namespace(&mut self) -> Result<Option<char>, Invalid> {
+    fn namespace(&mut self) -> Result<Option<char>, ParseError> {
         match self.next()? {
             // Special namespaces, like closures and shims.
             ns @ b'A'..=b'Z' => Ok(Some(ns as char)),
@@ -351,29 +501,32 @@
             // Implementation-specific/unspecified namespaces.
             b'a'..=b'z' => Ok(None),
 
-            _ => Err(Invalid),
+            _ => Err(ParseError::Invalid),
         }
     }
 
-    fn backref(&mut self) -> Result<Parser<'s>, Invalid> {
+    fn backref(&mut self) -> Result<Parser<'s>, ParseError> {
         let s_start = self.next - 1;
         let i = self.integer_62()?;
         if i >= s_start as u64 {
-            return Err(Invalid);
+            return Err(ParseError::Invalid);
         }
-        Ok(Parser {
+        let mut new_parser = Parser {
             sym: self.sym,
             next: i as usize,
-        })
+            depth: self.depth,
+        };
+        new_parser.push_depth()?;
+        Ok(new_parser)
     }
 
-    fn ident(&mut self) -> Result<Ident<'s>, Invalid> {
+    fn ident(&mut self) -> Result<Ident<'s>, ParseError> {
         let is_punycode = self.eat(b'u');
         let mut len = self.digit_10()? as usize;
         if len != 0 {
             while let Ok(d) = self.digit_10() {
-                len = len.checked_mul(10).ok_or(Invalid)?;
-                len = len.checked_add(d as usize).ok_or(Invalid)?;
+                len = len.checked_mul(10).ok_or(ParseError::Invalid)?;
+                len = len.checked_add(d as usize).ok_or(ParseError::Invalid)?;
             }
         }
 
@@ -381,9 +534,9 @@
         self.eat(b'_');
 
         let start = self.next;
-        self.next = self.next.checked_add(len).ok_or(Invalid)?;
+        self.next = self.next.checked_add(len).ok_or(ParseError::Invalid)?;
         if self.next > self.sym.len() {
-            return Err(Invalid);
+            return Err(ParseError::Invalid);
         }
 
         let ident = &self.sym[start..self.next];
@@ -400,7 +553,7 @@
                 },
             };
             if ident.punycode.is_empty() {
-                return Err(Invalid);
+                return Err(ParseError::Invalid);
             }
             Ok(ident)
         } else {
@@ -410,226 +563,177 @@
             })
         }
     }
-
-    fn skip_path(&mut self) -> Result<(), Invalid> {
-        match self.next()? {
-            b'C' => {
-                self.disambiguator()?;
-                self.ident()?;
-            }
-            b'N' => {
-                self.namespace()?;
-                self.skip_path()?;
-                self.disambiguator()?;
-                self.ident()?;
-            }
-            b'M' => {
-                self.disambiguator()?;
-                self.skip_path()?;
-                self.skip_type()?;
-            }
-            b'X' => {
-                self.disambiguator()?;
-                self.skip_path()?;
-                self.skip_type()?;
-                self.skip_path()?;
-            }
-            b'Y' => {
-                self.skip_type()?;
-                self.skip_path()?;
-            }
-            b'I' => {
-                self.skip_path()?;
-                while !self.eat(b'E') {
-                    self.skip_generic_arg()?;
-                }
-            }
-            b'B' => {
-                self.backref()?;
-            }
-            _ => return Err(Invalid),
-        }
-        Ok(())
-    }
-
-    fn skip_generic_arg(&mut self) -> Result<(), Invalid> {
-        if self.eat(b'L') {
-            self.integer_62()?;
-            Ok(())
-        } else if self.eat(b'K') {
-            self.skip_const()
-        } else {
-            self.skip_type()
-        }
-    }
-
-    fn skip_type(&mut self) -> Result<(), Invalid> {
-        match self.next()? {
-            tag if basic_type(tag).is_some() => {}
-
-            b'R' | b'Q' => {
-                if self.eat(b'L') {
-                    self.integer_62()?;
-                }
-                self.skip_type()?;
-            }
-            b'P' | b'O' | b'S' => self.skip_type()?,
-            b'A' => {
-                self.skip_type()?;
-                self.skip_const()?;
-            }
-            b'T' => {
-                while !self.eat(b'E') {
-                    self.skip_type()?;
-                }
-            }
-            b'F' => {
-                let _binder = self.opt_integer_62(b'G')?;
-                let _is_unsafe = self.eat(b'U');
-                if self.eat(b'K') {
-                    let c_abi = self.eat(b'C');
-                    if !c_abi {
-                        let abi = self.ident()?;
-                        if abi.ascii.is_empty() || !abi.punycode.is_empty() {
-                            return Err(Invalid);
-                        }
-                    }
-                }
-                while !self.eat(b'E') {
-                    self.skip_type()?;
-                }
-                self.skip_type()?;
-            }
-            b'D' => {
-                let _binder = self.opt_integer_62(b'G')?;
-                while !self.eat(b'E') {
-                    self.skip_path()?;
-                    while self.eat(b'p') {
-                        self.ident()?;
-                        self.skip_type()?;
-                    }
-                }
-                if !self.eat(b'L') {
-                    return Err(Invalid);
-                }
-                self.integer_62()?;
-            }
-            b'B' => {
-                self.backref()?;
-            }
-            _ => {
-                // Go back to the tag, so `skip_path` also sees it.
-                self.next -= 1;
-                self.skip_path()?;
-            }
-        }
-        Ok(())
-    }
-
-    fn skip_const(&mut self) -> Result<(), Invalid> {
-        if self.eat(b'B') {
-            self.backref()?;
-            return Ok(());
-        }
-
-        let ty_tag = self.next()?;
-
-        if ty_tag == b'p' {
-            // We don't encode the type if the value is a placeholder.
-            return Ok(());
-        }
-
-        match ty_tag {
-            // Unsigned integer types.
-            b'h' | b't' | b'm' | b'y' | b'o' | b'j' |
-            // Bool.
-            b'b' |
-            // Char.
-            b'c' => {}
-
-            // Signed integer types.
-            b'a' | b's' | b'l' | b'x' | b'n' | b'i' => {
-                // Negation on signed integers.
-                let _ = self.eat(b'n');
-            }
-
-            _ => return Err(Invalid),
-        }
-
-        self.hex_nibbles()?;
-        Ok(())
-    }
 }
 
 struct Printer<'a, 'b: 'a, 's> {
-    parser: Result<Parser<'s>, Invalid>,
-    out: &'a mut fmt::Formatter<'b>,
+    /// The input parser to demangle from, or `Err` if any (parse) error was
+    /// encountered (in order to disallow further likely-incorrect demangling).
+    ///
+    /// See also the documentation on the `invalid!` and `parse!` macros below.
+    parser: Result<Parser<'s>, ParseError>,
+
+    /// The output formatter to demangle to, or `None` while skipping printing.
+    out: Option<&'a mut fmt::Formatter<'b>>,
+
+    /// Cumulative number of lifetimes bound by `for<...>` binders ('G'),
+    /// anywhere "around" the current entity (e.g. type) being demangled.
+    /// This value is not tracked while skipping printing, as it'd be unused.
+    ///
+    /// See also the documentation on the `Printer::in_binder` method.
     bound_lifetime_depth: u32,
 }
 
-/// Mark the parser as errored, print `?` and return early.
-/// This allows callers to keep printing the approximate
-/// syntax of the path/type/const, despite having errors.
-/// E.g. `Vec<[(A, ?); ?]>` instead of `Vec<[(A, ?`.
+impl ParseError {
+    /// Snippet to print when the error is initially encountered.
+    fn message(&self) -> &str {
+        match self {
+            ParseError::Invalid => "{invalid syntax}",
+            ParseError::RecursedTooDeep => "{recursion limit reached}",
+        }
+    }
+}
+
+/// Mark the parser as errored (with `ParseError::Invalid`), print the
+/// appropriate message (see `ParseError::message`) and return early.
 macro_rules! invalid {
     ($printer:ident) => {{
-        $printer.parser = Err(Invalid);
-        return $printer.out.write_str("?");
+        let err = ParseError::Invalid;
+        $printer.print(err.message())?;
+        $printer.parser = Err(err);
+        return Ok(());
     }};
 }
 
 /// Call a parser method (if the parser hasn't errored yet),
-/// and mark the parser as errored if it returns `Err(Invalid)`.
+/// and mark the parser as errored if it returns `Err`.
 ///
-/// If the parser errored, before or now, prints `?`, and
-/// returns early the current function (see `invalid!` above).
+/// If the parser errored, before or now, this returns early,
+/// from the current function, after printing either:
+/// * for a new error, the appropriate message (see `ParseError::message`)
+/// * for an earlier error, only `?` -  this allows callers to keep printing
+///   the approximate syntax of the path/type/const, despite having errors,
+///   e.g. `Vec<[(A, ?); ?]>` instead of `Vec<[(A, ?`
 macro_rules! parse {
     ($printer:ident, $method:ident $(($($arg:expr),*))*) => {
-        match $printer.parser_mut().and_then(|p| p.$method($($($arg),*)*)) {
-            Ok(x) => x,
-            Err(Invalid) => invalid!($printer),
+        match $printer.parser {
+            Ok(ref mut parser) => match parser.$method($($($arg),*)*) {
+                Ok(x) => x,
+                Err(err) => {
+                    $printer.print(err.message())?;
+                    $printer.parser = Err(err);
+                    return Ok(());
+                }
+            }
+            Err(_) => return $printer.print("?"),
         }
     };
 }
 
 impl<'a, 'b, 's> Printer<'a, 'b, 's> {
-    fn parser_mut<'c>(&'c mut self) -> Result<&'c mut Parser<'s>, Invalid> {
-        self.parser.as_mut().map_err(|_| Invalid)
-    }
-
     /// Eat the given character from the parser,
     /// returning `false` if the parser errored.
     fn eat(&mut self, b: u8) -> bool {
-        self.parser_mut().map(|p| p.eat(b)) == Ok(true)
+        self.parser.as_mut().map(|p| p.eat(b)) == Ok(true)
     }
 
-    /// Return a nested parser for a backref.
-    fn backref_printer<'c>(&'c mut self) -> Printer<'c, 'b, 's> {
-        Printer {
-            parser: self.parser_mut().and_then(|p| p.backref()),
-            out: self.out,
-            bound_lifetime_depth: self.bound_lifetime_depth,
+    /// Skip printing (i.e. `self.out` will be `None`) for the duration of the
+    /// given closure. This should not change parsing behavior, only disable the
+    /// output, but there may be optimizations (such as not traversing backrefs).
+    fn skipping_printing<F>(&mut self, f: F)
+    where
+        F: FnOnce(&mut Self) -> fmt::Result,
+    {
+        let orig_out = self.out.take();
+        f(self).expect("`fmt::Error`s should be impossible without a `fmt::Formatter`");
+        self.out = orig_out;
+    }
+
+    /// Print the target of a backref, using the given closure.
+    /// When printing is being skipped, the backref will only be parsed,
+    /// ignoring the backref's target completely.
+    fn print_backref<F>(&mut self, f: F) -> fmt::Result
+    where
+        F: FnOnce(&mut Self) -> fmt::Result,
+    {
+        let backref_parser = parse!(self, backref);
+
+        if self.out.is_none() {
+            return Ok(());
         }
+
+        let orig_parser = mem::replace(&mut self.parser, Ok(backref_parser));
+        let r = f(self);
+        self.parser = orig_parser;
+        r
+    }
+
+    fn pop_depth(&mut self) {
+        if let Ok(ref mut parser) = self.parser {
+            parser.pop_depth();
+        }
+    }
+
+    /// Output the given value to `self.out` (using `fmt::Display` formatting),
+    /// if printing isn't being skipped.
+    fn print(&mut self, x: impl fmt::Display) -> fmt::Result {
+        if let Some(out) = &mut self.out {
+            fmt::Display::fmt(&x, out)?;
+        }
+        Ok(())
+    }
+
+    /// Output the given `char`s (escaped using `char::escape_debug`), with the
+    /// whole sequence wrapped in quotes, for either a `char` or `&str` literal,
+    /// if printing isn't being skipped.
+    fn print_quoted_escaped_chars(
+        &mut self,
+        quote: char,
+        chars: impl Iterator<Item = char>,
+    ) -> fmt::Result {
+        if let Some(out) = &mut self.out {
+            use core::fmt::Write;
+
+            out.write_char(quote)?;
+            for c in chars {
+                // Special-case not escaping a single/double quote, when
+                // inside the opposite kind of quote.
+                if matches!((quote, c), ('\'', '"') | ('"', '\'')) {
+                    out.write_char(c)?;
+                    continue;
+                }
+
+                for escaped in c.escape_debug() {
+                    out.write_char(escaped)?;
+                }
+            }
+            out.write_char(quote)?;
+        }
+        Ok(())
     }
 
     /// Print the lifetime according to the previously decoded index.
     /// An index of `0` always refers to `'_`, but starting with `1`,
     /// indices refer to late-bound lifetimes introduced by a binder.
     fn print_lifetime_from_index(&mut self, lt: u64) -> fmt::Result {
-        self.out.write_str("'")?;
+        // Bound lifetimes aren't tracked when skipping printing.
+        if self.out.is_none() {
+            return Ok(());
+        }
+
+        self.print("'")?;
         if lt == 0 {
-            return self.out.write_str("_");
+            return self.print("_");
         }
         match (self.bound_lifetime_depth as u64).checked_sub(lt) {
             Some(depth) => {
                 // Try to print lifetimes alphabetically first.
                 if depth < 26 {
                     let c = (b'a' + depth as u8) as char;
-                    c.fmt(self.out)
+                    self.print(c)
                 } else {
                     // Use `'_123` after running out of letters.
-                    self.out.write_str("_")?;
-                    depth.fmt(self.out)
+                    self.print("_")?;
+                    self.print(depth)
                 }
             }
             None => invalid!(self),
@@ -645,16 +749,21 @@
     {
         let bound_lifetimes = parse!(self, opt_integer_62(b'G'));
 
+        // Don't track bound lifetimes when skipping printing.
+        if self.out.is_none() {
+            return f(self);
+        }
+
         if bound_lifetimes > 0 {
-            self.out.write_str("for<")?;
+            self.print("for<")?;
             for i in 0..bound_lifetimes {
                 if i > 0 {
-                    self.out.write_str(", ")?;
+                    self.print(", ")?;
                 }
                 self.bound_lifetime_depth += 1;
                 self.print_lifetime_from_index(1)?;
             }
-            self.out.write_str("> ")?;
+            self.print("> ")?;
         }
 
         let r = f(self);
@@ -675,7 +784,7 @@
         let mut i = 0;
         while self.parser.is_ok() && !self.eat(b'E') {
             if i > 0 {
-                self.out.write_str(sep)?;
+                self.print(sep)?;
             }
             f(self)?;
             i += 1;
@@ -684,17 +793,21 @@
     }
 
     fn print_path(&mut self, in_value: bool) -> fmt::Result {
+        parse!(self, push_depth);
+
         let tag = parse!(self, next);
         match tag {
             b'C' => {
                 let dis = parse!(self, disambiguator);
                 let name = parse!(self, ident);
 
-                name.fmt(self.out)?;
-                if !self.out.alternate() {
-                    self.out.write_str("[")?;
-                    fmt::LowerHex::fmt(&dis, self.out)?;
-                    self.out.write_str("]")?;
+                self.print(name)?;
+                if let Some(out) = &mut self.out {
+                    if !out.alternate() {
+                        out.write_str("[")?;
+                        fmt::LowerHex::fmt(&dis, out)?;
+                        out.write_str("]")?;
+                    }
                 }
             }
             b'N' => {
@@ -702,32 +815,41 @@
 
                 self.print_path(in_value)?;
 
+                // HACK(eddyb) if the parser is already marked as having errored,
+                // `parse!` below will print a `?` without its preceding `::`
+                // (because printing the `::` is skipped in certain conditions,
+                // i.e. a lowercase namespace with an empty identifier),
+                // so in order to get `::?`, the `::` has to be printed here.
+                if self.parser.is_err() {
+                    self.print("::")?;
+                }
+
                 let dis = parse!(self, disambiguator);
                 let name = parse!(self, ident);
 
                 match ns {
                     // Special namespaces, like closures and shims.
                     Some(ns) => {
-                        self.out.write_str("::{")?;
+                        self.print("::{")?;
                         match ns {
-                            'C' => self.out.write_str("closure")?,
-                            'S' => self.out.write_str("shim")?,
-                            _ => ns.fmt(self.out)?,
+                            'C' => self.print("closure")?,
+                            'S' => self.print("shim")?,
+                            _ => self.print(ns)?,
                         }
                         if !name.ascii.is_empty() || !name.punycode.is_empty() {
-                            self.out.write_str(":")?;
-                            name.fmt(self.out)?;
+                            self.print(":")?;
+                            self.print(name)?;
                         }
-                        self.out.write_str("#")?;
-                        dis.fmt(self.out)?;
-                        self.out.write_str("}")?;
+                        self.print("#")?;
+                        self.print(dis)?;
+                        self.print("}")?;
                     }
 
                     // Implementation-specific/unspecified namespaces.
                     None => {
                         if !name.ascii.is_empty() || !name.punycode.is_empty() {
-                            self.out.write_str("::")?;
-                            name.fmt(self.out)?;
+                            self.print("::")?;
+                            self.print(name)?;
                         }
                     }
                 }
@@ -736,31 +858,33 @@
                 if tag != b'Y' {
                     // Ignore the `impl`'s own path.
                     parse!(self, disambiguator);
-                    parse!(self, skip_path);
+                    self.skipping_printing(|this| this.print_path(false));
                 }
 
-                self.out.write_str("<")?;
+                self.print("<")?;
                 self.print_type()?;
                 if tag != b'M' {
-                    self.out.write_str(" as ")?;
+                    self.print(" as ")?;
                     self.print_path(false)?;
                 }
-                self.out.write_str(">")?;
+                self.print(">")?;
             }
             b'I' => {
                 self.print_path(in_value)?;
                 if in_value {
-                    self.out.write_str("::")?;
+                    self.print("::")?;
                 }
-                self.out.write_str("<")?;
+                self.print("<")?;
                 self.print_sep_list(Self::print_generic_arg, ", ")?;
-                self.out.write_str(">")?;
+                self.print(">")?;
             }
             b'B' => {
-                self.backref_printer().print_path(in_value)?;
+                self.print_backref(|this| this.print_path(in_value))?;
             }
             _ => invalid!(self),
         }
+
+        self.pop_depth();
         Ok(())
     }
 
@@ -769,7 +893,7 @@
             let lt = parse!(self, integer_62);
             self.print_lifetime_from_index(lt)
         } else if self.eat(b'K') {
-            self.print_const()
+            self.print_const(false)
         } else {
             self.print_type()
         }
@@ -779,51 +903,53 @@
         let tag = parse!(self, next);
 
         if let Some(ty) = basic_type(tag) {
-            return self.out.write_str(ty);
+            return self.print(ty);
         }
 
+        parse!(self, push_depth);
+
         match tag {
             b'R' | b'Q' => {
-                self.out.write_str("&")?;
+                self.print("&")?;
                 if self.eat(b'L') {
                     let lt = parse!(self, integer_62);
                     if lt != 0 {
                         self.print_lifetime_from_index(lt)?;
-                        self.out.write_str(" ")?;
+                        self.print(" ")?;
                     }
                 }
                 if tag != b'R' {
-                    self.out.write_str("mut ")?;
+                    self.print("mut ")?;
                 }
                 self.print_type()?;
             }
 
             b'P' | b'O' => {
-                self.out.write_str("*")?;
+                self.print("*")?;
                 if tag != b'P' {
-                    self.out.write_str("mut ")?;
+                    self.print("mut ")?;
                 } else {
-                    self.out.write_str("const ")?;
+                    self.print("const ")?;
                 }
                 self.print_type()?;
             }
 
             b'A' | b'S' => {
-                self.out.write_str("[")?;
+                self.print("[")?;
                 self.print_type()?;
                 if tag == b'A' {
-                    self.out.write_str("; ")?;
-                    self.print_const()?;
+                    self.print("; ")?;
+                    self.print_const(true)?;
                 }
-                self.out.write_str("]")?;
+                self.print("]")?;
             }
             b'T' => {
-                self.out.write_str("(")?;
+                self.print("(")?;
                 let count = self.print_sep_list(Self::print_type, ", ")?;
                 if count == 1 {
-                    self.out.write_str(",")?;
+                    self.print(",")?;
                 }
-                self.out.write_str(")")?;
+                self.print(")")?;
             }
             b'F' => self.in_binder(|this| {
                 let is_unsafe = this.eat(b'U');
@@ -842,39 +968,39 @@
                 };
 
                 if is_unsafe {
-                    this.out.write_str("unsafe ")?;
+                    this.print("unsafe ")?;
                 }
 
                 if let Some(abi) = abi {
-                    this.out.write_str("extern \"")?;
+                    this.print("extern \"")?;
 
                     // If the ABI had any `-`, they were replaced with `_`,
                     // so the parts between `_` have to be re-joined with `-`.
                     let mut parts = abi.split('_');
-                    this.out.write_str(parts.next().unwrap())?;
+                    this.print(parts.next().unwrap())?;
                     for part in parts {
-                        this.out.write_str("-")?;
-                        this.out.write_str(part)?;
+                        this.print("-")?;
+                        this.print(part)?;
                     }
 
-                    this.out.write_str("\" ")?;
+                    this.print("\" ")?;
                 }
 
-                this.out.write_str("fn(")?;
+                this.print("fn(")?;
                 this.print_sep_list(Self::print_type, ", ")?;
-                this.out.write_str(")")?;
+                this.print(")")?;
 
                 if this.eat(b'u') {
                     // Skip printing the return type if it's 'u', i.e. `()`.
                 } else {
-                    this.out.write_str(" -> ")?;
+                    this.print(" -> ")?;
                     this.print_type()?;
                 }
 
                 Ok(())
             })?,
             b'D' => {
-                self.out.write_str("dyn ")?;
+                self.print("dyn ")?;
                 self.in_binder(|this| {
                     this.print_sep_list(Self::print_dyn_trait, " + ")?;
                     Ok(())
@@ -885,19 +1011,21 @@
                 }
                 let lt = parse!(self, integer_62);
                 if lt != 0 {
-                    self.out.write_str(" + ")?;
+                    self.print(" + ")?;
                     self.print_lifetime_from_index(lt)?;
                 }
             }
             b'B' => {
-                self.backref_printer().print_type()?;
+                self.print_backref(Self::print_type)?;
             }
             _ => {
                 // Go back to the tag, so `print_path` also sees it.
-                let _ = self.parser_mut().map(|p| p.next -= 1);
+                let _ = self.parser.as_mut().map(|p| p.next -= 1);
                 self.print_path(false)?;
             }
         }
+
+        self.pop_depth();
         Ok(())
     }
 
@@ -908,10 +1036,17 @@
     /// open, by omitting the `>`, and return `Ok(true)` in that case.
     fn print_path_maybe_open_generics(&mut self) -> Result<bool, fmt::Error> {
         if self.eat(b'B') {
-            self.backref_printer().print_path_maybe_open_generics()
+            // NOTE(eddyb) the closure may not run if printing is being skipped,
+            // but in that case the returned boolean doesn't matter.
+            let mut open = false;
+            self.print_backref(|this| {
+                open = this.print_path_maybe_open_generics()?;
+                Ok(())
+            })?;
+            Ok(open)
         } else if self.eat(b'I') {
             self.print_path(false)?;
-            self.out.write_str("<")?;
+            self.print("<")?;
             self.print_sep_list(Self::print_generic_arg, ", ")?;
             Ok(true)
         } else {
@@ -925,115 +1060,194 @@
 
         while self.eat(b'p') {
             if !open {
-                self.out.write_str("<")?;
+                self.print("<")?;
                 open = true;
             } else {
-                self.out.write_str(", ")?;
+                self.print(", ")?;
             }
 
             let name = parse!(self, ident);
-            name.fmt(self.out)?;
-            self.out.write_str(" = ")?;
+            self.print(name)?;
+            self.print(" = ")?;
             self.print_type()?;
         }
 
         if open {
-            self.out.write_str(">")?;
+            self.print(">")?;
         }
 
         Ok(())
     }
 
-    fn print_const(&mut self) -> fmt::Result {
-        if self.eat(b'B') {
-            return self.backref_printer().print_const();
-        }
-
-        let ty_tag = parse!(self, next);
+    fn print_const(&mut self, in_value: bool) -> fmt::Result {
+        let tag = parse!(self, next);
 
-        if ty_tag == b'p' {
-            // We don't encode the type if the value is a placeholder.
-            self.out.write_str("_")?;
-            return Ok(());
-        }
+        parse!(self, push_depth);
 
-        match ty_tag {
-            // Unsigned integer types.
-            b'h' | b't' | b'm' | b'y' | b'o' | b'j' => self.print_const_uint()?,
-            // Signed integer types.
-            b'a' | b's' | b'l' | b'x' | b'n' | b'i' => self.print_const_int()?,
-            // Bool.
-            b'b' => self.print_const_bool()?,
-            // Char.
-            b'c' => self.print_const_char()?,
+        // Only literals (and the names of `const` generic parameters, but they
+        // don't get mangled at all), can appear in generic argument position
+        // without any disambiguation, all other expressions require braces.
+        // To avoid duplicating the mapping between `tag` and what syntax gets
+        // used (especially any special-casing), every case that needs braces
+        // has to call `open_brace(self)?` (and the closing brace is automatic).
+        let mut opened_brace = false;
+        let mut open_brace_if_outside_expr = |this: &mut Self| {
+            // If this expression is nested in another, braces aren't required.
+            if in_value {
+                return Ok(());
+            }
 
-            // This branch ought to be unreachable.
-            _ => invalid!(self),
+            opened_brace = true;
+            this.print("{")
         };
 
-        if !self.out.alternate() {
-            self.out.write_str(": ")?;
-            let ty = basic_type(ty_tag).unwrap();
-            self.out.write_str(ty)?;
-        }
+        match tag {
+            b'p' => self.print("_")?,
 
-        Ok(())
-    }
+            // Primitive leaves with hex-encoded values (see `basic_type`).
+            b'h' | b't' | b'm' | b'y' | b'o' | b'j' => self.print_const_uint(tag)?,
+            b'a' | b's' | b'l' | b'x' | b'n' | b'i' => {
+                if self.eat(b'n') {
+                    self.print("-")?;
+                }
 
-    fn print_const_uint(&mut self) -> fmt::Result {
-        let hex = parse!(self, hex_nibbles);
+                self.print_const_uint(tag)?;
+            }
+            b'b' => match parse!(self, hex_nibbles).try_parse_uint() {
+                Some(0) => self.print("false")?,
+                Some(1) => self.print("true")?,
+                _ => invalid!(self),
+            },
+            b'c' => {
+                let valid_char = parse!(self, hex_nibbles)
+                    .try_parse_uint()
+                    .and_then(|v| u32::try_from(v).ok())
+                    .and_then(char::from_u32);
+                match valid_char {
+                    Some(c) => self.print_quoted_escaped_chars('\'', iter::once(c))?,
+                    None => invalid!(self),
+                }
+            }
+            b'e' => {
+                // NOTE(eddyb) a string literal `"..."` has type `&str`, so
+                // to get back the type `str`, `*"..."` syntax is needed
+                // (even if that may not be valid in Rust itself).
+                open_brace_if_outside_expr(self)?;
+                self.print("*")?;
 
-        // Print anything that doesn't fit in `u64` verbatim.
-        if hex.len() > 16 {
-            self.out.write_str("0x")?;
-            return self.out.write_str(hex);
-        }
+                self.print_const_str_literal()?;
+            }
 
-        let mut v = 0;
-        for c in hex.chars() {
-            v = (v << 4) | (c.to_digit(16).unwrap() as u64);
+            b'R' | b'Q' => {
+                // NOTE(eddyb) this prints `"..."` instead of `&*"..."`, which
+                // is what `Re..._` would imply (see comment for `str` above).
+                if tag == b'R' && self.eat(b'e') {
+                    self.print_const_str_literal()?;
+                } else {
+                    open_brace_if_outside_expr(self)?;
+                    self.print("&")?;
+                    if tag != b'R' {
+                        self.print("mut ")?;
+                    }
+                    self.print_const(true)?;
+                }
+            }
+            b'A' => {
+                open_brace_if_outside_expr(self)?;
+                self.print("[")?;
+                self.print_sep_list(|this| this.print_const(true), ", ")?;
+                self.print("]")?;
+            }
+            b'T' => {
+                open_brace_if_outside_expr(self)?;
+                self.print("(")?;
+                let count = self.print_sep_list(|this| this.print_const(true), ", ")?;
+                if count == 1 {
+                    self.print(",")?;
+                }
+                self.print(")")?;
+            }
+            b'V' => {
+                open_brace_if_outside_expr(self)?;
+                self.print_path(true)?;
+                match parse!(self, next) {
+                    b'U' => {}
+                    b'T' => {
+                        self.print("(")?;
+                        self.print_sep_list(|this| this.print_const(true), ", ")?;
+                        self.print(")")?;
+                    }
+                    b'S' => {
+                        self.print(" { ")?;
+                        self.print_sep_list(
+                            |this| {
+                                parse!(this, disambiguator);
+                                let name = parse!(this, ident);
+                                this.print(name)?;
+                                this.print(": ")?;
+                                this.print_const(true)
+                            },
+                            ", ",
+                        )?;
+                        self.print(" }")?;
+                    }
+                    _ => invalid!(self),
+                }
+            }
+            b'B' => {
+                self.print_backref(|this| this.print_const(in_value))?;
+            }
+            _ => invalid!(self),
         }
-        v.fmt(self.out)
-    }
 
-    fn print_const_int(&mut self) -> fmt::Result {
-        if self.eat(b'n') {
-            self.out.write_str("-")?;
+        if opened_brace {
+            self.print("}")?;
         }
 
-        self.print_const_uint()
-    }
-
-    fn print_const_bool(&mut self) -> fmt::Result {
-        match parse!(self, hex_nibbles).as_bytes() {
-            b"0" => self.out.write_str("false"),
-            b"1" => self.out.write_str("true"),
-            _ => invalid!(self),
-        }
+        self.pop_depth();
+        Ok(())
     }
 
-    fn print_const_char(&mut self) -> fmt::Result {
+    fn print_const_uint(&mut self, ty_tag: u8) -> fmt::Result {
         let hex = parse!(self, hex_nibbles);
 
-        // Valid `char`s fit in `u32`.
-        if hex.len() > 8 {
-            invalid!(self);
+        match hex.try_parse_uint() {
+            Some(v) => self.print(v)?,
+
+            // Print anything that doesn't fit in `u64` verbatim.
+            None => {
+                self.print("0x")?;
+                self.print(hex.nibbles)?;
+            }
         }
 
-        let mut v = 0;
-        for c in hex.chars() {
-            v = (v << 4) | (c.to_digit(16).unwrap() as u32);
+        if let Some(out) = &mut self.out {
+            if !out.alternate() {
+                let ty = basic_type(ty_tag).unwrap();
+                self.print(ty)?;
+            }
         }
-        if let Some(c) = char::from_u32(v) {
-            write!(self.out, "{:?}", c)
-        } else {
-            invalid!(self)
+
+        Ok(())
+    }
+
+    fn print_const_str_literal(&mut self) -> fmt::Result {
+        match parse!(self, hex_nibbles).try_parse_str_chars() {
+            Some(chars) => self.print_quoted_escaped_chars('"', chars),
+            None => invalid!(self),
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use std::prelude::v1::*;
+
+    macro_rules! t {
+        ($a:expr, $b:expr) => {{
+            assert_eq!(format!("{}", ::demangle($a)), $b);
+        }};
+    }
     macro_rules! t_nohash {
         ($a:expr, $b:expr) => {{
             assert_eq!(format!("{:#}", ::demangle($a)), $b);
@@ -1044,6 +1258,23 @@
             t_nohash!(concat!("_RMC0", $a), concat!("<", $b, ">"))
         };
     }
+    macro_rules! t_const {
+        ($mangled:expr, $value:expr) => {
+            t_nohash!(
+                concat!("_RIC0K", $mangled, "E"),
+                concat!("::<", $value, ">")
+            )
+        };
+    }
+    macro_rules! t_const_suffixed {
+        ($mangled:expr, $value:expr, $value_ty_suffix:expr) => {{
+            t_const!($mangled, $value);
+            t!(
+                concat!("_RIC0K", $mangled, "E"),
+                concat!("[0]::<", $value, $value_ty_suffix, ">")
+            );
+        }};
+    }
 
     #[test]
     fn demangle_crate_with_leading_digit() {
@@ -1079,48 +1310,114 @@
     }
 
     #[test]
-    fn demangle_const_generics() {
+    fn demangle_const_generics_preview() {
         // NOTE(eddyb) this was hand-written, before rustc had working
         // const generics support (but the mangling format did include them).
         t_nohash_type!(
             "INtC8arrayvec8ArrayVechKj7b_E",
             "arrayvec::ArrayVec<u8, 123>"
         );
-        t_nohash!(
-            "_RMCs4fqI2P2rA04_13const_genericINtB0_8UnsignedKhb_E",
-            "<const_generic::Unsigned<11>>"
+        t_const_suffixed!("j7b_", "123", "usize");
+    }
+
+    #[test]
+    fn demangle_min_const_generics() {
+        t_const!("p", "_");
+        t_const_suffixed!("hb_", "11", "u8");
+        t_const_suffixed!("off00ff00ff00ff00ff_", "0xff00ff00ff00ff00ff", "u128");
+        t_const_suffixed!("s98_", "152", "i16");
+        t_const_suffixed!("anb_", "-11", "i8");
+        t_const!("b0_", "false");
+        t_const!("b1_", "true");
+        t_const!("c76_", "'v'");
+        t_const!("c22_", r#"'"'"#);
+        t_const!("ca_", "'\\n'");
+        t_const!("c2202_", "'∂'");
+    }
+
+    #[test]
+    fn demangle_const_str() {
+        t_const!("e616263_", "{*\"abc\"}");
+        t_const!("e27_", r#"{*"'"}"#);
+        t_const!("e090a_", "{*\"\\t\\n\"}");
+        t_const!("ee28882c3bc_", "{*\"∂ü\"}");
+        t_const!(
+            "ee183a1e18390e183ade1839be18394e1839ae18390e183935fe18392e18394e1839b\
+              e183a0e18398e18394e1839ae183985fe183a1e18390e18393e18398e1839ae18398_",
+            "{*\"ს�ჭმელ�დ_გემრიელი_ს�დილი\"}"
         );
-        t_nohash!(
-            "_RMCs4fqI2P2rA04_13const_genericINtB0_6SignedKs98_E",
-            "<const_generic::Signed<152>>"
+        t_const!(
+            "ef09f908af09fa688f09fa686f09f90ae20c2a720f09f90b6f09f9192e298\
+              95f09f94a520c2a720f09fa7a1f09f929bf09f929af09f9299f09f929c_",
+            "{*\"�🦈🦆� § �👒☕🔥 § 🧡💛💚💙💜\"}"
         );
-        t_nohash!(
-            "_RMCs4fqI2P2rA04_13const_genericINtB0_6SignedKanb_E",
-            "<const_generic::Signed<-11>>"
+    }
+
+    // NOTE(eddyb) this uses the same strings as `demangle_const_str` and should
+    // be kept in sync with it - while a macro could be used to generate both
+    // `str` and `&str` tests, from a single list of strings, this seems clearer.
+    #[test]
+    fn demangle_const_ref_str() {
+        t_const!("Re616263_", "\"abc\"");
+        t_const!("Re27_", r#""'""#);
+        t_const!("Re090a_", "\"\\t\\n\"");
+        t_const!("Ree28882c3bc_", "\"∂ü\"");
+        t_const!(
+            "Ree183a1e18390e183ade1839be18394e1839ae18390e183935fe18392e18394e1839b\
+               e183a0e18398e18394e1839ae183985fe183a1e18390e18393e18398e1839ae18398_",
+            "\"ს�ჭმელ�დ_გემრიელი_ს�დილი\""
         );
-        t_nohash!(
-            "_RMCs4fqI2P2rA04_13const_genericINtB0_4BoolKb0_E",
-            "<const_generic::Bool<false>>"
+        t_const!(
+            "Ref09f908af09fa688f09fa686f09f90ae20c2a720f09f90b6f09f9192e298\
+               95f09f94a520c2a720f09fa7a1f09f929bf09f929af09f9299f09f929c_",
+            "\"�🦈🦆� § �👒☕🔥 § 🧡💛💚💙💜\""
         );
-        t_nohash!(
-            "_RMCs4fqI2P2rA04_13const_genericINtB0_4BoolKb1_E",
-            "<const_generic::Bool<true>>"
-        );
-        t_nohash!(
-            "_RMCs4fqI2P2rA04_13const_genericINtB0_4CharKc76_E",
-            "<const_generic::Char<'v'>>"
+    }
+
+    #[test]
+    fn demangle_const_ref() {
+        t_const!("Rp", "{&_}");
+        t_const!("Rh7b_", "{&123}");
+        t_const!("Rb0_", "{&false}");
+        t_const!("Rc58_", "{&'X'}");
+        t_const!("RRRh0_", "{&&&0}");
+        t_const!("RRRe_", "{&&\"\"}");
+        t_const!("QAE", "{&mut []}");
+    }
+
+    #[test]
+    fn demangle_const_array() {
+        t_const!("AE", "{[]}");
+        t_const!("Aj0_E", "{[0]}");
+        t_const!("Ah1_h2_h3_E", "{[1, 2, 3]}");
+        t_const!("ARe61_Re62_Re63_E", "{[\"a\", \"b\", \"c\"]}");
+        t_const!("AAh1_h2_EAh3_h4_EE", "{[[1, 2], [3, 4]]}");
+    }
+
+    #[test]
+    fn demangle_const_tuple() {
+        t_const!("TE", "{()}");
+        t_const!("Tj0_E", "{(0,)}");
+        t_const!("Th1_b0_E", "{(1, false)}");
+        t_const!(
+            "TRe616263_c78_RAh1_h2_h3_EE",
+            "{(\"abc\", 'x', &[1, 2, 3])}"
         );
-        t_nohash!(
-            "_RMCs4fqI2P2rA04_13const_genericINtB0_4CharKca_E",
-            "<const_generic::Char<'\\n'>>"
+    }
+
+    #[test]
+    fn demangle_const_adt() {
+        t_const!(
+            "VNvINtNtC4core6option6OptionjE4NoneU",
+            "{core::option::Option::<usize>::None}"
         );
-        t_nohash!(
-            "_RMCs4fqI2P2rA04_13const_genericINtB0_4CharKc2202_E",
-            "<const_generic::Char<'∂'>>"
+        t_const!(
+            "VNvINtNtC4core6option6OptionjE4SomeTj0_E",
+            "{core::option::Option::<usize>::Some(0)}"
         );
-        t_nohash!(
-            "_RNvNvMCs4fqI2P2rA04_13const_genericINtB4_3FooKpE3foo3FOO",
-            "<const_generic::Foo<_>>::foo::FOO"
+        t_const!(
+            "VNtC3foo3BarS1sRe616263_2chc78_5sliceRAh1_h2_h3_EE",
+            "{foo::Bar { s: \"abc\", ch: 'x', slice: &[1, 2, 3] }}"
         );
     }
 
@@ -1155,4 +1452,79 @@
             "rand::rngs::adapter::reseeding::fork::FORK_HANDLER_REGISTERED.0.0"
         );
     }
+
+    #[test]
+    fn demangling_limits() {
+        // Stress tests found via fuzzing.
+
+        for sym in include_str!("v0-large-test-symbols/early-recursion-limit")
+            .lines()
+            .filter(|line| !line.is_empty() && !line.starts_with('#'))
+        {
+            assert_eq!(
+                super::demangle(sym).map(|_| ()),
+                Err(super::ParseError::RecursedTooDeep)
+            );
+        }
+
+        assert_contains!(
+            ::demangle(
+                "RIC20tRYIMYNRYFG05_EB5_B_B6_RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR\
+        RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRB_E",
+            )
+            .to_string(),
+            "{recursion limit reached}"
+        );
+    }
+
+    #[test]
+    fn recursion_limit_leaks() {
+        // NOTE(eddyb) this test checks that both paths and types support the
+        // recursion limit correctly, i.e. matching `push_depth` and `pop_depth`,
+        // and don't leak "recursion levels" and trip the limit.
+        // The test inputs are generated on the fly, using a repeated pattern,
+        // as hardcoding the actual strings would be too verbose.
+        // Also, `MAX_DEPTH` can be directly used, instead of assuming its value.
+        for &(sym_leaf, expected_leaf) in &[("p", "_"), ("Rp", "&_"), ("C1x", "x")] {
+            let mut sym = format!("_RIC0p");
+            let mut expected = format!("::<_");
+            for _ in 0..(super::MAX_DEPTH * 2) {
+                sym.push_str(sym_leaf);
+                expected.push_str(", ");
+                expected.push_str(expected_leaf);
+            }
+            sym.push('E');
+            expected.push('>');
+
+            t_nohash!(&sym, expected);
+        }
+    }
+
+    #[test]
+    fn recursion_limit_backref_free_bypass() {
+        // NOTE(eddyb) this test checks that long symbols cannot bypass the
+        // recursion limit by not using backrefs, and cause a stack overflow.
+
+        // This value was chosen to be high enough that stack overflows were
+        // observed even with `cargo test --release`.
+        let depth = 100_000;
+
+        // In order to hide the long mangling from the initial "shallow" parse,
+        // it's nested in an identifier (crate name), preceding its use.
+        let mut sym = format!("_RIC{}", depth);
+        let backref_start = sym.len() - 2;
+        for _ in 0..depth {
+            sym.push('R');
+        }
+
+        // Write a backref to just after the length of the identifier.
+        sym.push('B');
+        sym.push(char::from_digit((backref_start - 1) as u32, 36).unwrap());
+        sym.push('_');
+
+        // Close the `I` at the start.
+        sym.push('E');
+
+        assert_contains!(::demangle(&sym).to_string(), "{recursion limit reached}");
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"b83441b5c762eda87b9655dc87b0b5f9f9fa9f314a5c0de3fe0d6cfc9dd9f542","Cargo.toml":"40dd214a2a35a69de548d20696b6d4e76b0de2e4e8c114c692fc90f446f1359a","LICENSE":"afb11426e09da40a1ae4f8fa17ddcc6b6a52d14df04c29bc5bcd06eb8730624d","README.md":"f89c7768454b0d2b9db816afe05db3a4cea1125bef87f08ed3eefd65e9e2b180","examples/main.rs":"2e47cff7ea4946dd7fe58847edb132998d1e1936dfe7e1b65f80425d5db4f398","src/lib.rs":"4f13c35af86e3157a1340cf6e8c8b09b69b7d443a14ea62d0f45115547f23ff9","tests/tests.rs":"63bf3b5266e0f3e570326de40364fa2ecf77bbf611413a5f2ff0b436d7219279"},"package":"b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d"}
\ No newline at end of file
+{"files":{"Cargo.lock":"a2485772b983e64ef7c68ccc3565777766a33f5f4b4981ea3f3dab526be152b9","Cargo.toml":"65e5b6aa01b53fcedace46f5de0038f82de578e34f9b3e799ec700d35aecacd3","LICENSE":"afb11426e09da40a1ae4f8fa17ddcc6b6a52d14df04c29bc5bcd06eb8730624d","README.md":"f89c7768454b0d2b9db816afe05db3a4cea1125bef87f08ed3eefd65e9e2b180","examples/main.rs":"dc2f7f6ba45dcba4e6fe7c8ac100df0c101cb091ddd34f7dfc6599e58cc9e9a7","src/lib.rs":"a9cabe3c0b373f352357745b817f188ab841e9445056014dee9cc83c4d167483","tests/tests.rs":"ab4e6955d2e3bedd003b53b8f3423a6fc48424e37218ca989bf7e0debdf3c3f9"},"package":"aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -26,7 +26,7 @@
 
 [[package]]
 name = "scroll_derive"
-version = "0.10.4"
+version = "0.10.5"
 dependencies = [
  "proc-macro2",
  "quote",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "scroll_derive"
-version = "0.10.4"
+version = "0.10.5"
 authors = ["m4b <m4b.github.io@gmail.com>", "Ted Mielczarek <ted@mielczarek.org>", "Systemcluster <me@systemcluster.me>"]
 description = "A macros 1.1 derive implementation for Pread and Pwrite traits from the scroll crate"
 documentation = "https://docs.rs/scroll_derive"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/examples/main.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/examples/main.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/examples/main.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/examples/main.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use scroll_derive::{Pread, Pwrite, IOread, IOwrite, SizeWith};
+use scroll_derive::{IOread, IOwrite, Pread, Pwrite, SizeWith};
 
 #[derive(Debug, PartialEq, Pread, Pwrite, IOread, IOwrite, SizeWith)]
 #[repr(C)]
@@ -8,10 +8,12 @@
     arr: [u16; 2],
 }
 
-use scroll::{Pread, Pwrite, Cread, LE};
+use scroll::{Cread, Pread, Pwrite, LE};
 
-fn main () {
-    let bytes = [0xefu8, 0xbe, 0xad, 0xde, 0, 0, 0, 0, 0, 0, 224, 63, 0xad, 0xde, 0xef, 0xbe];
+fn main() {
+    let bytes = [
+        0xefu8, 0xbe, 0xad, 0xde, 0, 0, 0, 0, 0, 0, 224, 63, 0xad, 0xde, 0xef, 0xbe,
+    ];
     let data: Data = bytes.pread_with(0, LE).unwrap();
     println!("data: {:?}", &data);
     assert_eq!(data.id, 0xdeadbeefu32);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![recursion_limit="1024"]
+#![recursion_limit = "1024"]
 
 extern crate proc_macro;
 use proc_macro2;
@@ -8,20 +8,19 @@
 
 fn impl_field(ident: &proc_macro2::TokenStream, ty: &syn::Type) -> proc_macro2::TokenStream {
     match *ty {
-        syn::Type::Array(ref array) => {
-            match array.len {
-                syn::Expr::Lit(syn::ExprLit { lit: syn::Lit::Int(ref int), ..}) => {
-                    let size = int.base10_parse::<usize>().unwrap();
-                    quote! {
-                        #ident: { let mut __tmp: #ty = [0u8.into(); #size]; src.gread_inout_with(offset, &mut __tmp, ctx)?; __tmp }
-                    }
-                },
-                _ => panic!("Pread derive with bad array constexpr")
+        syn::Type::Array(ref array) => match array.len {
+            syn::Expr::Lit(syn::ExprLit {
+                lit: syn::Lit::Int(ref int),
+                ..
+            }) => {
+                let size = int.base10_parse::<usize>().unwrap();
+                quote! {
+                    #ident: { let mut __tmp: #ty = [0u8.into(); #size]; src.gread_inout_with(offset, &mut __tmp, ctx)?; __tmp }
+                }
             }
+            _ => panic!("Pread derive with bad array constexpr"),
         },
-        syn::Type::Group(ref group) => {
-            impl_field(ident, &group.elem)
-        }
+        syn::Type::Group(ref group) => impl_field(ident, &group.elem),
         _ => {
             quote! {
                 #ident: src.gread_with::<#ty>(offset, ctx)?
@@ -35,11 +34,18 @@
     fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>,
     generics: &syn::Generics,
 ) -> proc_macro2::TokenStream {
-    let items: Vec<_> = fields.iter().enumerate().map(|(i, f)| {
-        let ident = &f.ident.as_ref().map(|i|quote!{#i}).unwrap_or({let t = proc_macro2::Literal::usize_unsuffixed(i); quote!{#t}});
-        let ty = &f.ty;
-        impl_field(ident, ty)
-    }).collect();
+    let items: Vec<_> = fields
+        .iter()
+        .enumerate()
+        .map(|(i, f)| {
+            let ident = &f.ident.as_ref().map(|i| quote! {#i}).unwrap_or({
+                let t = proc_macro2::Literal::usize_unsuffixed(i);
+                quote! {#t}
+            });
+            let ty = &f.ty;
+            impl_field(ident, ty)
+        })
+        .collect();
 
     let gl = &generics.lt_token;
     let gp = &generics.params;
@@ -48,16 +54,16 @@
         syn::GenericParam::Type(ref t) => {
             let ident = &t.ident;
             quote! { #ident }
-        },
-        p => quote! { #p }
+        }
+        p => quote! { #p },
     });
     let gn = quote! { #gl #( #gn ),* #gg };
     let gw = if !gp.is_empty() {
         let gi = gp.iter().map(|param: &syn::GenericParam| match param {
             syn::GenericParam::Type(ref t) => {
                 let ident = &t.ident;
-                quote! { 
-                    #ident : ::scroll::ctx::TryFromCtx<'a, ::scroll::Endian> + ::std::convert::From<u8> + ::std::marker::Copy, 
+                quote! {
+                    #ident : ::scroll::ctx::TryFromCtx<'a, ::scroll::Endian> + ::std::convert::From<u8> + ::std::marker::Copy,
                     ::scroll::Error : ::std::convert::From<< #ident as ::scroll::ctx::TryFromCtx<'a, ::scroll::Endian>>::Error>,
                     < #ident as ::scroll::ctx::TryFromCtx<'a, ::scroll::Endian>>::Error : ::std::convert::From<scroll::Error>
                 }
@@ -65,7 +71,9 @@
             p => quote! { #p }
         });
         quote! { #( #gi ),* , }
-    } else { quote! { } };
+    } else {
+        quote! {}
+    };
 
     quote! {
         impl<'a, #gp > ::scroll::ctx::TryFromCtx<'a, ::scroll::Endian> for #name #gn where #gw #name #gn : 'a {
@@ -85,20 +93,14 @@
     let name = &ast.ident;
     let generics = &ast.generics;
     match ast.data {
-        syn::Data::Struct(ref data) => {
-            match data.fields {
-                syn::Fields::Named(ref fields) => {
-                    impl_struct(name, &fields.named, generics)
-                },
-                syn::Fields::Unnamed(ref fields) => {
-                    impl_struct(name, &fields.unnamed, generics)
-                },
-                _ => {
-                    panic!("Pread can not be derived for unit structs")
-                }
+        syn::Data::Struct(ref data) => match data.fields {
+            syn::Fields::Named(ref fields) => impl_struct(name, &fields.named, generics),
+            syn::Fields::Unnamed(ref fields) => impl_struct(name, &fields.unnamed, generics),
+            _ => {
+                panic!("Pread can not be derived for unit structs")
             }
         },
-        _ => panic!("Pread can only be derived for structs")
+        _ => panic!("Pread can only be derived for structs"),
     }
 }
 
@@ -109,25 +111,48 @@
     gen.into()
 }
 
-fn impl_try_into_ctx(name: &syn::Ident, fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>, generics: &syn::Generics) -> proc_macro2::TokenStream {
-    let items: Vec<_> = fields.iter().enumerate().map(|(i, f)| {
-        let ident = &f.ident.as_ref().map(|i|quote!{#i}).unwrap_or({let t = proc_macro2::Literal::usize_unsuffixed(i); quote!{#t}});
-        let ty = &f.ty;
-        match *ty {
-            syn::Type::Array(_) => {
+fn impl_pwrite_field(ident: &proc_macro2::TokenStream, ty: &syn::Type) -> proc_macro2::TokenStream {
+    match ty {
+        syn::Type::Array(ref array) => match array.len {
+            syn::Expr::Lit(syn::ExprLit {
+                lit: syn::Lit::Int(ref int),
+                ..
+            }) => {
+                let size = int.base10_parse::<usize>().unwrap();
                 quote! {
-                    for i in 0..self.#ident.len() {
+                    for i in 0..#size {
                         dst.gwrite_with(&self.#ident[i], offset, ctx)?;
                     }
                 }
-            },
-            _ => {
-                quote! {
-                    dst.gwrite_with(&self.#ident, offset, ctx)?
-                }
+            }
+            _ => panic!("Pwrite derive with bad array constexpr"),
+        },
+        syn::Type::Group(group) => impl_pwrite_field(ident, &group.elem),
+        _ => {
+            quote! {
+                dst.gwrite_with(&self.#ident, offset, ctx)?
             }
         }
-    }).collect();
+    }
+}
+
+fn impl_try_into_ctx(
+    name: &syn::Ident,
+    fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>,
+    generics: &syn::Generics,
+) -> proc_macro2::TokenStream {
+    let items: Vec<_> = fields
+        .iter()
+        .enumerate()
+        .map(|(i, f)| {
+            let ident = &f.ident.as_ref().map(|i| quote! {#i}).unwrap_or({
+                let t = proc_macro2::Literal::usize_unsuffixed(i);
+                quote! {#t}
+            });
+            let ty = &f.ty;
+            impl_pwrite_field(ident, ty)
+        })
+        .collect();
 
     let gl = &generics.lt_token;
     let gp = &generics.params;
@@ -136,15 +161,15 @@
         syn::GenericParam::Type(ref t) => {
             let ident = &t.ident;
             quote! { #ident }
-        },
-        p => quote! { #p }
+        }
+        p => quote! { #p },
     });
     let gn = quote! { #gl #( #gn ),* #gg };
     let gwref = if !gp.is_empty() {
         let gi = gp.iter().map(|param: &syn::GenericParam| match param {
             syn::GenericParam::Type(ref t) => {
                 let ident = &t.ident;
-                quote! { 
+                quote! {
                     &'a #ident : ::scroll::ctx::TryIntoCtx<::scroll::Endian>,
                     ::scroll::Error: ::std::convert::From<<&'a #ident as ::scroll::ctx::TryIntoCtx<::scroll::Endian>>::Error>,
                     <&'a #ident as ::scroll::ctx::TryIntoCtx<::scroll::Endian>>::Error: ::std::convert::From<scroll::Error>
@@ -153,12 +178,14 @@
             p => quote! { #p }
         });
         quote! { where #( #gi ),* }
-    } else { quote! { } };
+    } else {
+        quote! {}
+    };
     let gw = if !gp.is_empty() {
         let gi = gp.iter().map(|param: &syn::GenericParam| match param {
             syn::GenericParam::Type(ref t) => {
                 let ident = &t.ident;
-                quote! { 
+                quote! {
                     #ident : ::scroll::ctx::TryIntoCtx<::scroll::Endian>,
                     ::scroll::Error: ::std::convert::From<<#ident as ::scroll::ctx::TryIntoCtx<::scroll::Endian>>::Error>,
                     <#ident as ::scroll::ctx::TryIntoCtx<::scroll::Endian>>::Error: ::std::convert::From<scroll::Error>
@@ -167,8 +194,9 @@
             p => quote! { #p }
         });
         quote! { where Self: ::std::marker::Copy, #( #gi ),* }
-    } else { quote! { } };
-    
+    } else {
+        quote! {}
+    };
 
     quote! {
         impl<'a, #gp > ::scroll::ctx::TryIntoCtx<::scroll::Endian> for &'a #name #gn #gwref {
@@ -196,20 +224,14 @@
     let name = &ast.ident;
     let generics = &ast.generics;
     match ast.data {
-        syn::Data::Struct(ref data) => {
-            match data.fields {
-                syn::Fields::Named(ref fields) => {
-                    impl_try_into_ctx(name, &fields.named, generics)
-                },
-                syn::Fields::Unnamed(ref fields) => {
-                    impl_try_into_ctx(name, &fields.unnamed, generics)
-                },
-                _ => {
-                    panic!("Pwrite can not be derived for unit structs")
-                }
+        syn::Data::Struct(ref data) => match data.fields {
+            syn::Fields::Named(ref fields) => impl_try_into_ctx(name, &fields.named, generics),
+            syn::Fields::Unnamed(ref fields) => impl_try_into_ctx(name, &fields.unnamed, generics),
+            _ => {
+                panic!("Pwrite can not be derived for unit structs")
             }
         },
-        _ => panic!("Pwrite can only be derived for structs")
+        _ => panic!("Pwrite can only be derived for structs"),
     }
 }
 
@@ -220,29 +242,39 @@
     gen.into()
 }
 
-fn size_with(name: &syn::Ident, fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>, generics: &syn::Generics) -> proc_macro2::TokenStream {
-    let items: Vec<_> = fields.iter().map(|f| {
-        let ty = &f.ty;
-        match *ty {
-            syn::Type::Array(ref array) => {
-                let elem = &array.elem;
-                match array.len {
-                    syn::Expr::Lit(syn::ExprLit { lit: syn::Lit::Int(ref int), ..}) => {
-                        let size = int.base10_parse::<usize>().unwrap();
-                        quote! {
-                            (#size * <#elem>::size_with(ctx))
+fn size_with(
+    name: &syn::Ident,
+    fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>,
+    generics: &syn::Generics,
+) -> proc_macro2::TokenStream {
+    let items: Vec<_> = fields
+        .iter()
+        .map(|f| {
+            let ty = &f.ty;
+            match *ty {
+                syn::Type::Array(ref array) => {
+                    let elem = &array.elem;
+                    match array.len {
+                        syn::Expr::Lit(syn::ExprLit {
+                            lit: syn::Lit::Int(ref int),
+                            ..
+                        }) => {
+                            let size = int.base10_parse::<usize>().unwrap();
+                            quote! {
+                                (#size * <#elem>::size_with(ctx))
+                            }
                         }
-                    },
-                    _ => panic!("Pread derive with bad array constexpr")
+                        _ => panic!("Pread derive with bad array constexpr"),
+                    }
                 }
-            },
-            _ => {
-                quote! {
-                    <#ty>::size_with(ctx)
+                _ => {
+                    quote! {
+                        <#ty>::size_with(ctx)
+                    }
                 }
             }
-        }
-    }).collect();
+        })
+        .collect();
 
     let gl = &generics.lt_token;
     let gp = &generics.params;
@@ -251,22 +283,24 @@
         syn::GenericParam::Type(ref t) => {
             let ident = &t.ident;
             quote! { #ident }
-        },
-        p => quote! { #p }
+        }
+        p => quote! { #p },
     });
     let gn = quote! { #gl #( #gn ),* #gg };
     let gw = if !gp.is_empty() {
         let gi = gp.iter().map(|param: &syn::GenericParam| match param {
             syn::GenericParam::Type(ref t) => {
                 let ident = &t.ident;
-                quote! { 
+                quote! {
                     #ident : ::scroll::ctx::SizeWith<::scroll::Endian>
                 }
-            },
-            p => quote! { #p }
+            }
+            p => quote! { #p },
         });
         quote! { where #( #gi ),* }
-    } else { quote! { } };
+    } else {
+        quote! {}
+    };
 
     quote! {
         impl #gl #gp #gg ::scroll::ctx::SizeWith<::scroll::Endian> for #name #gn #gw {
@@ -282,21 +316,14 @@
     let name = &ast.ident;
     let generics = &ast.generics;
     match ast.data {
-        syn::Data::Struct(ref data) => {
-            match data.fields {
-                syn::Fields::Named(ref fields) => {
-                    size_with(name, &fields.named, generics)
-                },
-                syn::Fields::Unnamed(ref fields) => {
-                    size_with(name, &fields.unnamed, generics)
-                },
-                _ => {
-                    
-                    panic!("SizeWith can not be derived for unit structs")
-                }
+        syn::Data::Struct(ref data) => match data.fields {
+            syn::Fields::Named(ref fields) => size_with(name, &fields.named, generics),
+            syn::Fields::Unnamed(ref fields) => size_with(name, &fields.unnamed, generics),
+            _ => {
+                panic!("SizeWith can not be derived for unit structs")
             }
         },
-        _ => panic!("SizeWith can only be derived for structs")
+        _ => panic!("SizeWith can only be derived for structs"),
     }
 }
 
@@ -307,7 +334,11 @@
     gen.into()
 }
 
-fn impl_cread_struct(name: &syn::Ident, fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>, generics: &syn::Generics) -> proc_macro2::TokenStream {
+fn impl_cread_struct(
+    name: &syn::Ident,
+    fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>,
+    generics: &syn::Generics,
+) -> proc_macro2::TokenStream {
     let items: Vec<_> = fields.iter().enumerate().map(|(i, f)| {
         let ident = &f.ident.as_ref().map(|i|quote!{#i}).unwrap_or({let t = proc_macro2::Literal::usize_unsuffixed(i); quote!{#t}});
         let ty = &f.ty;
@@ -348,22 +379,24 @@
         syn::GenericParam::Type(ref t) => {
             let ident = &t.ident;
             quote! { #ident }
-        },
-        p => quote! { #p }
+        }
+        p => quote! { #p },
     });
     let gn = quote! { #gl #( #gn ),* #gg };
     let gw = if !gp.is_empty() {
         let gi = gp.iter().map(|param: &syn::GenericParam| match param {
             syn::GenericParam::Type(ref t) => {
                 let ident = &t.ident;
-                quote! { 
+                quote! {
                     #ident : ::scroll::ctx::FromCtx<::scroll::Endian> + ::std::convert::From<u8> + ::std::marker::Copy
                 }
             },
             p => quote! { #p }
         });
         quote! { where #( #gi ),* , }
-    } else { quote! { } };
+    } else {
+        quote! {}
+    };
 
     quote! {
         impl #gl #gp #gg ::scroll::ctx::FromCtx<::scroll::Endian> for #name #gn #gw {
@@ -382,20 +415,14 @@
     let name = &ast.ident;
     let generics = &ast.generics;
     match ast.data {
-        syn::Data::Struct(ref data) => {
-            match data.fields {
-                syn::Fields::Named(ref fields) => {
-                    impl_cread_struct(name, &fields.named, generics)
-                },
-                syn::Fields::Unnamed(ref fields) => {
-                    impl_cread_struct(name, &fields.unnamed, generics)
-                },
-                _ => {
-                    panic!("IOread can not be derived for unit structs")
-                }
+        syn::Data::Struct(ref data) => match data.fields {
+            syn::Fields::Named(ref fields) => impl_cread_struct(name, &fields.named, generics),
+            syn::Fields::Unnamed(ref fields) => impl_cread_struct(name, &fields.unnamed, generics),
+            _ => {
+                panic!("IOread can not be derived for unit structs")
             }
         },
-        _ => panic!("IOread can only be derived for structs")
+        _ => panic!("IOread can only be derived for structs"),
     }
 }
 
@@ -406,30 +433,41 @@
     gen.into()
 }
 
-fn impl_into_ctx(name: &syn::Ident, fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>, generics: &syn::Generics) -> proc_macro2::TokenStream {
-    let items: Vec<_> = fields.iter().enumerate().map(|(i, f)| {
-        let ident = &f.ident.as_ref().map(|i|quote!{#i}).unwrap_or({let t = proc_macro2::Literal::usize_unsuffixed(i); quote!{#t}});
-        let ty = &f.ty;
-        let size = quote! { ::scroll::export::mem::size_of::<#ty>() };
-        match *ty {
-            syn::Type::Array(ref array) => {
-                let arrty = &array.elem;
-                quote! {
-                    let size = ::scroll::export::mem::size_of::<#arrty>();
-                    for i in 0..self.#ident.len() {
-                        dst.cwrite_with(self.#ident[i], *offset, ctx);
-                        *offset += size;
+fn impl_into_ctx(
+    name: &syn::Ident,
+    fields: &syn::punctuated::Punctuated<syn::Field, syn::Token![,]>,
+    generics: &syn::Generics,
+) -> proc_macro2::TokenStream {
+    let items: Vec<_> = fields
+        .iter()
+        .enumerate()
+        .map(|(i, f)| {
+            let ident = &f.ident.as_ref().map(|i| quote! {#i}).unwrap_or({
+                let t = proc_macro2::Literal::usize_unsuffixed(i);
+                quote! {#t}
+            });
+            let ty = &f.ty;
+            let size = quote! { ::scroll::export::mem::size_of::<#ty>() };
+            match *ty {
+                syn::Type::Array(ref array) => {
+                    let arrty = &array.elem;
+                    quote! {
+                        let size = ::scroll::export::mem::size_of::<#arrty>();
+                        for i in 0..self.#ident.len() {
+                            dst.cwrite_with(self.#ident[i], *offset, ctx);
+                            *offset += size;
+                        }
                     }
                 }
-            },
-            _ => {
-                quote! {
-                    dst.cwrite_with(self.#ident, *offset, ctx);
-                    *offset += #size;
+                _ => {
+                    quote! {
+                        dst.cwrite_with(self.#ident, *offset, ctx);
+                        *offset += #size;
+                    }
                 }
             }
-        }
-    }).collect();
+        })
+        .collect();
 
     let gl = &generics.lt_token;
     let gp = &generics.params;
@@ -438,21 +476,23 @@
         syn::GenericParam::Type(ref t) => {
             let ident = &t.ident;
             quote! { #ident }
-        },
-        p => quote! { #p }
+        }
+        p => quote! { #p },
     });
     let gw = if !gp.is_empty() {
         let gi = gp.iter().map(|param: &syn::GenericParam| match param {
             syn::GenericParam::Type(ref t) => {
                 let ident = &t.ident;
-                quote! { 
+                quote! {
                     #ident : ::scroll::ctx::IntoCtx<::scroll::Endian> + ::std::marker::Copy
                 }
-            },
-            p => quote! { #p }
+            }
+            p => quote! { #p },
         });
         quote! { where #( #gi ),* }
-    } else { quote! { } };
+    } else {
+        quote! {}
+    };
     let gn = quote! { #gl #( #gn ),* #gg };
 
     quote! {
@@ -479,20 +519,14 @@
     let name = &ast.ident;
     let generics = &ast.generics;
     match ast.data {
-        syn::Data::Struct(ref data) => {
-            match data.fields {
-                syn::Fields::Named(ref fields) => {
-                    impl_into_ctx(name, &fields.named, generics)
-                },
-                syn::Fields::Unnamed(ref fields) => {
-                    impl_into_ctx(name, &fields.unnamed, generics)
-                },
-                _ => {
-                    panic!("IOwrite can not be derived for unit structs")
-                }
+        syn::Data::Struct(ref data) => match data.fields {
+            syn::Fields::Named(ref fields) => impl_into_ctx(name, &fields.named, generics),
+            syn::Fields::Unnamed(ref fields) => impl_into_ctx(name, &fields.unnamed, generics),
+            _ => {
+                panic!("IOwrite can not be derived for unit structs")
             }
         },
-        _ => panic!("IOwrite can only be derived for structs")
+        _ => panic!("IOwrite can only be derived for structs"),
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/tests/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/tests/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/scroll_derive/tests/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/scroll_derive/tests/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
     ( struct $name:ident { $( $field:ident: $t:ty, )* } ) => {
 	// check we can exist inside a macro_rules
 	// https://github.com/m4b/scroll/pull/75
-        #[derive(Pread)]
+        #[derive(Pread, Pwrite)]
         pub struct $name {
             $( pub $field: $t, )*
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"a748fbfb71f8335c26b6e6027eca8da1685a276858895ab3d978f9c2c20a5e28","Cargo.toml":"973ad49fcb72386f781236f7b1083a7b796ed46a7f60a9cb4af5c3313bed0596","README.md":"a2bc9b1505a12dc597791b8e9c425ee842b53623bb7c077920efe546101425a5","THIRD_PARTY":"522fccc56dcbadbe90ab5524a17b8127cde3f951c30c17002641caf44959c22a","examples/client.rs":"63cbec24a63ceb2ab7e37e7dce1122797183cdab7cf65158c1f5f1eb6fa5f904","examples/find_internet_password.rs":"61759d8cef8732c7aec7249d32feeb569c9242c2a53d36f973892c4b7d2ba5d7","examples/set_internet_password.rs":"f69cef325f744a957dd382731ac706a6424ed0a10ef7dad19719ad9b4a5294ca","src/authorization.rs":"9a56e9012b48e169519c5fb296f4cb4b27a969a32e228cac43671c217ec752a1","src/base.rs":"ae595d169ab13e068ff23389d99fa02e3ac9b57877e09c4091eade97f9eabc86","src/certificate.rs":"0e734831cd9f3ede4f2da672ec553cd47ec8463bfdfe9323d7d77057d009bfbf","src/cipher_suite.rs":"3a48259e06b035e987a2e15a0491306fe1bc74d158a6e3c95ab55318996821be","src/dlsym.rs":"0f66bb4843e4c82fe597168ccd153a7275d18ab849df18ce57210ecf43ffe6ff","src/identity.rs":"78b8db1023253c4d98c7215e41d04a5f03e57c3527eadc83c53a3e7020abd778","src/import_export.rs":"23335dc28cc7e603e22979bc06568414799a63d9dc94dca7e8174a3b7f0a9f7c","src/item.rs":"eefb7d4505dd74a22e2798a237a6ea4e27a6f128f327f08586e8fdc24f322a22","src/key.rs":"c33b3c65f3659afab64bd222743e692e3932ac3062914336953182c40e46ad61","src/lib.rs":"be860dabe1fbb73fb55d026b5b93799d429cd436403cb9b9c3b26498654ec57b","src/os/macos/access.rs":"0c3d5951751cf8753997dadfcd54a0941773f0071d6f5042778da8a865dc8932","src/os/macos/certificate.rs":"d185b4b47987e905c1f6c1386a742779ebb4471ee84d700fe605f12d4cccfe33","src/os/macos/certificate_oids.rs":"c34733aab2ad14566a3fe652f9599395c03d6fd7967d94d013ac131a1fb077ab","src/os/macos/digest_transform.rs":"55043cb31e5a1dcbd16509bdcc503ffdb1e293c24daa4c3cb44983bdd31e8bc6","src/os/macos/encrypt_transform.rs":"07f0d376dacf9cdfa01d129a42bd5e9cd95c79b06bef3270ad8811ec6c79bbba","src/os/macos/identity.rs":"f49e095142532540d2524eef6810c4201c1a28202f8f8986e8243a85939279ea","src/os/macos/import_export.rs":"919f40caf02cb8a42e582834413f02e6fb247667fcc7dac434557ee1803d6564","src/os/macos/item.rs":"51b81ad28bc9b7f51c65cdc5030876cfb6894168df9482511de2c7ddc555c4a6","src/os/macos/key.rs":"470af76b7e41a79fe3f39fba2111efae1536ac729ef44f4e6b481c95a437c76d","src/os/macos/keychain.rs":"049e335b595727af882c12dfb263b7a834181e2cb3ff312f38180088c93000e4","src/os/macos/keychain_item.rs":"7d7f4ccf1dcfcf0e4e9e2d3f0fc0d21b510339e86507c5ac39e50d83d771d4e1","src/os/macos/mod.rs":"df31488056370866b57a3d65e19f72b69df750248bece99ea29e72f029ab211a","src/os/macos/passwords.rs":"3c5c77620b47448a7c8f2faf2723b5f9cc10823bb706ddb6ac4521e72e23ccad","src/os/macos/secure_transport.rs":"d112ae53a3b7f93d3cd7e4da0e73393b054b7ec6fc6589305b65a313f356febf","src/os/macos/transform.rs":"00e25dd4e729883f4bc7b07e003fe7e7f1e4957dcadd7f72f712835cb59e58d9","src/os/mod.rs":"287f2cd9a3b93f5db523974ac5f395cd6e5d1245d96c9782300d35bc5762c2f3","src/policy.rs":"1508c3f39997cc51ad57e3fada1e132bb06780a09957c4dc36bef332dab0be53","src/random.rs":"744bd4f15996f10a1dc0e779736690fa0865b456611073ce246bab3c13ebd96f","src/secure_transport.rs":"35fcd5173a0ed3c71ecfc1dd5aaa840bb903b44218713d0f363e5866ce0a322a","src/trust.rs":"db1728a5cf7cc6172422c489528c15d88d55db6b65b73e442401f90a8817020a","src/trust_settings.rs":"d9e2df4d18633da37f02ae7e026147bf797efe5d2ee974ac3c1516ae647f1d92"},"package":"c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"}
\ No newline at end of file
+{"files":{"Cargo.lock":"d49975142bd7dafb24aa169b791ad56c86d2e3a764b0e4e87e86dd96767dcc55","Cargo.toml":"b4a59c3496836f52a27ed0e6406d26f7c1c52677e5273ddf1bb4e9b79401d3ac","README.md":"ff1d022f35ff76531a361ad421ba7ee61ce186dc6516f72fc819ec4b2a5567a4","THIRD_PARTY":"522fccc56dcbadbe90ab5524a17b8127cde3f951c30c17002641caf44959c22a","examples/client.rs":"63cbec24a63ceb2ab7e37e7dce1122797183cdab7cf65158c1f5f1eb6fa5f904","examples/find_internet_password.rs":"61759d8cef8732c7aec7249d32feeb569c9242c2a53d36f973892c4b7d2ba5d7","examples/set_internet_password.rs":"f69cef325f744a957dd382731ac706a6424ed0a10ef7dad19719ad9b4a5294ca","src/authorization.rs":"744b90df2e4da141318e9444f5e6b91f61f506387a457cfbcb0c2c9dc24904ed","src/base.rs":"2bc67e1da41074d50091d64b8cafa606cbafc60ea539d3fb24ce7eab3b205de2","src/certificate.rs":"acd1b112f6e238c1c21d9df9c43409a001d5baae25e90af02cb7154543f72689","src/cipher_suite.rs":"97cd0b094503959fc209bb01e822d26449fadac2ec494bfa8cde324b8cef2a70","src/dlsym.rs":"0f66bb4843e4c82fe597168ccd153a7275d18ab849df18ce57210ecf43ffe6ff","src/identity.rs":"7c2730693a2cd90f78459265b5e47672875b99a3c38d91f2883e7ddf136f36c8","src/import_export.rs":"4ff8e920ef843ea6d28bddef3509784304e92c057796aa076f5a83578c245c9e","src/item.rs":"2081851c14ae2700261e1e9f4420fbc6ce0dff353800c034d048674b5903334a","src/key.rs":"ff71c1b2bf290c907ce03a4a0d87c4b2b0570cbb9d9beec780336a6a088564d0","src/lib.rs":"d758d9ef76694a4c36fe37c21f14a7d85240fda0452294a2f264792677b93b35","src/os/macos/access.rs":"0c3d5951751cf8753997dadfcd54a0941773f0071d6f5042778da8a865dc8932","src/os/macos/certificate.rs":"c3e0d54df07d0713665eac371f9f47ffd33c774315bc7cbdbb7f6679432bfbd2","src/os/macos/certificate_oids.rs":"3fd230be625fa3f27bd83a62b73989f4ae1cc4f7fdfbfe5f1f8a9432b66d1f44","src/os/macos/code_signing.rs":"77b3152d42ea1f77fe51e119b7971b27bb4f818cf9ab60116ac5a0ebdf89af7e","src/os/macos/digest_transform.rs":"d74c4bf09f32256787df3b84e3264bce69d70b96133b4d55a19c2ac9d26f5541","src/os/macos/encrypt_transform.rs":"913dfeab4e77aa46e1f92eccd98c305553d69d0c3f5ff2d032587a3d6c3a97e0","src/os/macos/identity.rs":"f49e095142532540d2524eef6810c4201c1a28202f8f8986e8243a85939279ea","src/os/macos/import_export.rs":"bf11d037b1c2088a484b1323303f3952039078d9ac4d7bef242279ffa0d3ff10","src/os/macos/item.rs":"72aff126819036bbfcaca2bfeba40130cacbd6295158ee30a27c4b3de7d58b9e","src/os/macos/key.rs":"470af76b7e41a79fe3f39fba2111efae1536ac729ef44f4e6b481c95a437c76d","src/os/macos/keychain.rs":"be5a93aa25d9f8b7a319bf42eb41bbd2a0bdf633c970dcf846712523d7497770","src/os/macos/keychain_item.rs":"da209640bf61c902faf204bc6de88590d208ebcb105eef8183063a60440b8fb6","src/os/macos/mod.rs":"28e68e8bbc4053db35dd0455315f8c70999c21a8db1771878285fe293d669d3c","src/os/macos/passwords.rs":"e393bedbe6916827292acf75878dd1d157abcf3f8302d5b027a282be24f0b76a","src/os/macos/secure_transport.rs":"2345a2b2ee8e2a52d6046c2cd8cbb123cc2a82fcf546a1e01efbf5e9b1b88746","src/os/macos/transform.rs":"00e25dd4e729883f4bc7b07e003fe7e7f1e4957dcadd7f72f712835cb59e58d9","src/os/mod.rs":"287f2cd9a3b93f5db523974ac5f395cd6e5d1245d96c9782300d35bc5762c2f3","src/policy.rs":"e04a9525d1b3bd151e32c2c01f8f9e75eb670e17585dc9f8aa302a021915d7d2","src/random.rs":"f6b6fe79f0fba41be4f5c7ccbb4090608fc3e8885e43c342bef2387107f5b543","src/secure_transport.rs":"9874bbd4167a1625813c1e0264f4b607bc1f2b8e3b17dc12a034327f275308cf","src/trust.rs":"b16c9ada27d24d6059ae687f7370d301445de028cc46aec3e12f0b88418fcf5e","src/trust_settings.rs":"b2a1b68a3b6c06a3e654ce15d36a5e2c1d0e6c1163ca16299117b0e90fb212d0"},"package":"525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,84 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitvec"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
 
 [[package]]
 name = "core-foundation"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b5ed8e7e76c45974e15e41bfa8d5b0483cd90191639e01d8f5f1e606299d3fb"
+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -18,9 +86,53 @@
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.0"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+
+[[package]]
+name = "data-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+
+[[package]]
+name = "der-oid-macro"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4cccf60bb98c0fca115a581f894aed0e43fa55bf289fdac5599bec440bb4fd6"
+dependencies = [
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "syn",
+]
+
+[[package]]
+name = "der-parser"
+version = "5.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d7ededb7525bb4114bc209685ce7894edc2965f4914312a1ea578a645a237f0"
+dependencies = [
+ "der-oid-macro",
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a21fa21941700a3cd8fcb4091f361a6a712fac632f85d9f487cc892045d55c6"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
 
 [[package]]
 name = "fuchsia-cprng"
@@ -29,16 +141,147 @@
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
 [[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
 name = "hex"
-version = "0.4.2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lexical-core"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
+dependencies = [
+ "arrayvec",
+ "bitflags",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
 
 [[package]]
 name = "libc"
-version = "0.2.74"
+version = "0.2.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
+
+[[package]]
+name = "log"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "nom"
+version = "6.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
+dependencies = [
+ "bitvec",
+ "funty",
+ "lexical-core",
+ "memchr",
+ "version_check",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76e97c412795abf6c24ba30055a8f20642ea57ca12875220b854cfa501bf1e48"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "oid-registry"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6aae73e474f83beacd8ae2179e328e03d63d9223949d97e1b7c108059a34715"
+dependencies = [
+ "der-parser",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
 
 [[package]]
 name = "rand"
@@ -78,6 +321,23 @@
 ]
 
 [[package]]
+name = "regex"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
+[[package]]
 name = "remove_dir_all"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -87,29 +347,71 @@
 ]
 
 [[package]]
+name = "rusticata-macros"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbbee512c633ecabd4481c40111b6ded03ddd9ab10ba6caa5a74e14c889921ad"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
 name = "security-framework"
-version = "2.0.0"
+version = "2.4.2"
 dependencies = [
  "bitflags",
  "core-foundation",
  "core-foundation-sys",
+ "env_logger",
  "hex",
  "libc",
+ "log",
+ "num-bigint",
  "security-framework-sys",
  "tempdir",
+ "x509-parser",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "2.0.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
+checksum = "3f6f179cd85a30f8652b3f8830f73861c76e87e70b939773e72daf38be3afc02"
 dependencies = [
  "core-foundation-sys",
  "libc",
 ]
 
 [[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "syn"
+version = "1.0.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
 name = "tempdir"
 version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -120,6 +422,47 @@
 ]
 
 [[package]]
+name = "termcolor"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
+[[package]]
+name = "version_check"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+
+[[package]]
 name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -136,7 +479,39 @@
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
+[[package]]
+name = "x509-parser"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fdb27e60230e9d42a67fc3893ed5273b3dc74b4173e29ac52da8084014778d9"
+dependencies = [
+ "base64",
+ "chrono",
+ "data-encoding",
+ "der-parser",
+ "lazy_static",
+ "nom",
+ "oid-registry",
+ "rusticata-macros",
+ "thiserror",
+]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,12 +13,12 @@
 [package]
 edition = "2018"
 name = "security-framework"
-version = "2.0.0"
+version = "2.4.2"
 authors = ["Steven Fackler <sfackler@gmail.com>", "Kornel <kornel@geekhood.net>"]
 exclude = ["test/*"]
 description = "Security.framework bindings for macOS and iOS"
 homepage = "https://lib.rs/crates/security_framework"
-documentation = "https://kornelski.github.io/rust-security-framework/doc/security_framework/"
+documentation = "https://docs.rs/security_framework"
 readme = "README.md"
 keywords = ["iOS", "TLS", "SSL", "crypto", "keychain"]
 categories = ["os::macos-apis", "cryptography", "api-bindings"]
@@ -36,35 +36,51 @@
 [[example]]
 name = "set_internet_password"
 [dependencies.bitflags]
-version = "1.2.1"
+version = "1.3.2"
 
 [dependencies.core-foundation]
-version = "0.9"
+version = "0.9.1"
 
 [dependencies.core-foundation-sys]
-version = "0.8"
+version = "0.8.2"
 
 [dependencies.libc]
-version = "0.2.68"
+version = "0.2.100"
+
+[dependencies.log]
+version = "0.4.14"
+optional = true
+
+[dependencies.num-bigint]
+version = "0.4.1"
+optional = true
 
 [dependencies.security-framework-sys]
-version = "2.0.0"
+version = "2.4.1"
 default-features = false
+[dev-dependencies.env_logger]
+version = "0.9.0"
+
 [dev-dependencies.hex]
-version = "0.4.2"
+version = "0.4.3"
 
 [dev-dependencies.tempdir]
 version = "0.3.7"
 
+[dev-dependencies.x509-parser]
+version = "0.10.0"
+
 [features]
 OSX_10_10 = ["OSX_10_9", "security-framework-sys/OSX_10_10"]
 OSX_10_11 = ["OSX_10_10", "security-framework-sys/OSX_10_11"]
 OSX_10_12 = ["OSX_10_11", "security-framework-sys/OSX_10_12"]
-OSX_10_13 = ["OSX_10_12", "security-framework-sys/OSX_10_13", "alpn", "session-tickets"]
+OSX_10_13 = ["OSX_10_12", "security-framework-sys/OSX_10_13", "alpn", "session-tickets", "serial-number-bigint"]
+OSX_10_14 = ["OSX_10_13", "security-framework-sys/OSX_10_14"]
 OSX_10_9 = ["security-framework-sys/OSX_10_9"]
 alpn = []
 default = ["OSX_10_9"]
 nightly = []
+serial-number-bigint = ["num-bigint"]
 session-tickets = []
 [badges.maintenance]
 status = "passively-maintained"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
-# rust-security-framework
+# macOS/iOS Security framework for Rust
 
 [![Latest Version](https://img.shields.io/crates/v/security-framework.svg)](https://lib.rs/crates/security-framework)
 
-[Documentation](https://kornelski.github.io/rust-security-framework/doc/security_framework/)
+[Documentation](https://docs.rs/security-framework)
 
 Bindings to the Apple's `Security.framework`. Allows use of TLS and Keychain from Rust.
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/authorization.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/authorization.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/authorization.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/authorization.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,10 +13,15 @@
 use core_foundation::string::{CFString, CFStringRef};
 use security_framework_sys::authorization as sys;
 use security_framework_sys::base::errSecConversionError;
-use std::ffi::{CStr, CString};
-use std::marker::PhantomData;
 use std::mem::MaybeUninit;
 use std::os::raw::c_void;
+use std::{
+    convert::TryFrom,
+    ffi::{CStr, CString},
+    fs::File,
+};
+use std::{convert::TryInto, marker::PhantomData};
+use sys::AuthorizationExternalForm;
 
 macro_rules! optional_str_to_cfref {
     ($string:ident) => {{
@@ -60,6 +65,7 @@
 }
 
 impl Default for Flags {
+    #[inline(always)]
     fn default() -> Flags {
         Flags::DEFAULTS
     }
@@ -84,6 +90,7 @@
 
     /// The information pertaining to the name field. Do not rely on NULL
     /// termination of string data.
+    #[inline]
     pub fn value(&self) -> Option<&[u8]> {
         if self.0.value.is_null() {
             return None;
@@ -105,6 +112,7 @@
 }
 
 impl<'a> Drop for AuthorizationItemSet<'a> {
+    #[inline]
     fn drop(&mut self) {
         unsafe {
             sys::AuthorizationFreeItemSet(self.inner as *mut sys::AuthorizationItemSet);
@@ -131,6 +139,7 @@
 }
 
 impl Default for AuthorizationItemSetStorage {
+    #[inline]
     fn default() -> Self {
         AuthorizationItemSetStorage {
             names: Vec::new(),
@@ -155,6 +164,7 @@
 impl AuthorizationItemSetBuilder {
     /// Creates a new `AuthorizationItemSetStore`, which simplifies creating
     /// owned vectors of `AuthorizationItem`s.
+    #[inline(always)]
     pub fn new() -> AuthorizationItemSetBuilder {
         Default::default()
     }
@@ -244,9 +254,35 @@
     free_flags: Flags,
 }
 
+impl TryFrom<AuthorizationExternalForm> for Authorization {
+    type Error = Error;
+
+    /// Internalizes the external representation of an authorization reference.
+    #[cold]
+    fn try_from(external_form: AuthorizationExternalForm) -> Result<Self> {
+        let mut handle = MaybeUninit::<sys::AuthorizationRef>::uninit();
+
+        let status = unsafe {
+            sys::AuthorizationCreateFromExternalForm(&external_form, handle.as_mut_ptr())
+        };
+
+        if status != sys::errAuthorizationSuccess {
+            return Err(Error::from_code(status));
+        }
+
+        let auth = Authorization {
+            handle: unsafe { handle.assume_init() },
+            free_flags: Default::default(),
+        };
+
+        Ok(auth)
+    }
+}
+
 impl<'a> Authorization {
     /// Creates an authorization object which has no environment or associated
     /// rights.
+    #[inline]
     pub fn default() -> Result<Self> {
         Self::new(None, None, Default::default())
     }
@@ -291,32 +327,15 @@
     }
 
     /// Internalizes the external representation of an authorization reference.
-    ///
-    /// TODO: TryFrom when security-framework stops supporting rust versions
-    /// which don't have it.
+    #[deprecated(since = "2.0.1", note = "Please use the TryFrom trait instead")]
     pub fn from_external_form(external_form: sys::AuthorizationExternalForm) -> Result<Self> {
-        let mut handle = MaybeUninit::<sys::AuthorizationRef>::uninit();
-
-        let status = unsafe {
-            sys::AuthorizationCreateFromExternalForm(&external_form, handle.as_mut_ptr())
-        };
-
-        if status != sys::errAuthorizationSuccess {
-            return Err(Error::from_code(status));
-        }
-
-        let auth = Authorization {
-            handle: unsafe { handle.assume_init() },
-            free_flags: Default::default(),
-        };
-
-        Ok(auth)
+        external_form.try_into()
     }
 
     /// By default the rights acquired will be retained by the Security Server.
     /// Use this to ensure they are destroyed and to prevent shared rights'
     /// continued used by other processes.
-    #[inline]
+    #[inline(always)]
     pub fn destroy_rights(mut self) {
         self.free_flags = Flags::DESTROY_RIGHTS;
     }
@@ -481,9 +500,101 @@
 
         Ok(unsafe { external_form.assume_init() })
     }
+
+    /// Runs an executable tool with root privileges.
+    /// Discards executable's output
+    #[cfg(target_os = "macos")]
+    #[inline(always)]
+    pub fn execute_with_privileges<P, S, I>(
+        &self,
+        command: P,
+        arguments: I,
+        flags: Flags,
+    ) -> Result<()>
+    where
+        P: AsRef<std::path::Path>,
+        I: IntoIterator<Item = S>,
+        S: AsRef<std::ffi::OsStr>,
+    {
+        use std::os::unix::ffi::OsStrExt;
+
+        let arguments = arguments
+            .into_iter()
+            .map(|a| CString::new(a.as_ref().as_bytes()))
+            .flatten()
+            .collect::<Vec<_>>();
+        self.execute_with_privileges_internal(command.as_ref().as_os_str().as_bytes(), &arguments, flags, false)?;
+        Ok(())
+    }
+
+    /// Runs an executable tool with root privileges,
+    /// and returns a `File` handle to its communication pipe
+    #[cfg(target_os = "macos")]
+    #[inline(always)]
+    pub fn execute_with_privileges_piped<P, S, I>(
+        &self,
+        command: P,
+        arguments: I,
+        flags: Flags,
+    ) -> Result<File>
+    where
+        P: AsRef<std::path::Path>,
+        I: IntoIterator<Item = S>,
+        S: AsRef<std::ffi::OsStr>,
+    {
+        use std::os::unix::ffi::OsStrExt;
+
+        let arguments = arguments
+            .into_iter()
+            .map(|a| CString::new(a.as_ref().as_bytes()))
+            .flatten()
+            .collect::<Vec<_>>();
+        Ok(self.execute_with_privileges_internal(command.as_ref().as_os_str().as_bytes(), &arguments, flags, true)?.unwrap())
+    }
+
+    // Runs an executable tool with root privileges.
+    #[cfg(target_os = "macos")]
+    fn execute_with_privileges_internal(
+        &self,
+        command: &[u8],
+        arguments: &[CString],
+        flags: Flags,
+        make_pipe: bool,
+    ) -> Result<Option<File>>
+    {
+        use std::os::unix::io::{FromRawFd, RawFd};
+
+        let c_cmd = cstring_or_err!(command)?;
+
+        let mut c_args = arguments.iter().map(|a| a.as_ptr() as _).collect::<Vec<_>>();
+        c_args.push(std::ptr::null_mut());
+
+        let mut pipe: *mut libc::FILE = std::ptr::null_mut();
+
+        let status = unsafe {
+            sys::AuthorizationExecuteWithPrivileges(
+                self.handle,
+                c_cmd.as_ptr(),
+                flags.bits(),
+                c_args.as_ptr(),
+                if make_pipe { &mut pipe } else { std::ptr::null_mut() },
+            )
+        };
+
+        crate::cvt(status)?;
+        Ok(if make_pipe {
+            if pipe.is_null() {
+                return Err(Error::from_code(32)); // EPIPE?
+            }
+            Some(unsafe { File::from_raw_fd(libc::fileno(pipe) as RawFd)})
+        } else {
+            None
+        })
+    }
 }
 
 impl Drop for Authorization {
+    #[inline]
     fn drop(&mut self) {
         unsafe {
             sys::AuthorizationFree(self.handle, self.free_flags.bits());
@@ -574,8 +685,11 @@
     }
 
     #[test]
-    #[ignore]
     fn test_create_authorization_with_credentials() -> Result<()> {
+        if option_env!("PASSWORD").is_none() {
+            return Ok(());
+        }
+
         let rights = AuthorizationItemSetBuilder::new()
             .add_right("system.privilege.admin")?
             .build();
@@ -605,8 +719,11 @@
 
     /// This test will only pass if its process has a valid code signature.
     #[test]
-    #[ignore]
     fn test_modify_authorization_database() -> Result<()> {
+        if option_env!("PASSWORD").is_none() {
+            return Ok(());
+        }
+
         let rights = AuthorizationItemSetBuilder::new()
             .add_right("config.modify.")?
             .build();
@@ -634,4 +751,34 @@
 
         Ok(())
     }
+
+    /// This test will succeed if authorization popup is approved.
+    #[test]
+    fn test_execute_with_privileges() -> Result<()> {
+        if option_env!("PASSWORD").is_none() {
+            return Ok(());
+        }
+
+        let rights = AuthorizationItemSetBuilder::new()
+            .add_right("system.privilege.admin")?
+            .build();
+
+        let auth = Authorization::new(
+            Some(rights),
+            None,
+            Flags::DEFAULTS
+                | Flags::INTERACTION_ALLOWED
+                | Flags::PREAUTHORIZE
+                | Flags::EXTEND_RIGHTS,
+        )?;
+
+        let file = auth.execute_with_privileges_piped("/bin/ls", &["/"], Flags::DEFAULTS)?;
+
+        use std::io::{self, BufRead};
+        for line in io::BufReader::new(file).lines() {
+            let _ = line.unwrap();
+        }
+
+        Ok(())
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/base.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/base.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/base.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/base.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,22 @@
 //! Support types for other modules.
 
+#[cfg(target_os = "macos")]
 use core_foundation::string::CFString;
 use core_foundation_sys::base::OSStatus;
 use std::error;
 use std::fmt;
+use std::num::NonZeroI32;
 use std::result;
 
 /// A `Result` type commonly returned by functions.
-pub type Result<T> = result::Result<T, Error>;
+pub type Result<T, E = Error> = result::Result<T, E>;
 
 /// A Security Framework error.
 #[derive(Copy, Clone)]
-pub struct Error(OSStatus);
+pub struct Error(NonZeroI32);
 
 impl fmt::Debug for Error {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut builder = fmt.debug_struct("Error");
         builder.field("code", &self.0);
@@ -26,23 +29,27 @@
 
 impl Error {
     /// Creates a new `Error` from a status code.
+    /// The code must not be zero
+    #[inline]
     pub fn from_code(code: OSStatus) -> Self {
-        Self(code)
+        Self(NonZeroI32::new(code as i32).unwrap_or_else(|| NonZeroI32::new(1).unwrap()))
     }
 
     /// Returns a string describing the current error, if available.
+    #[inline(always)]
     pub fn message(self) -> Option<String> {
         self.inner_message()
     }
 
     #[cfg(target_os = "macos")]
+    #[cold]
     fn inner_message(self) -> Option<String> {
         use core_foundation::base::TCFType;
         use security_framework_sys::base::SecCopyErrorMessageString;
         use std::ptr;
 
         unsafe {
-            let s = SecCopyErrorMessageString(self.0, ptr::null_mut());
+            let s = SecCopyErrorMessageString(self.code(), ptr::null_mut());
             if s.is_null() {
                 None
             } else {
@@ -52,23 +59,27 @@
     }
 
     #[cfg(not(target_os = "macos"))]
+    #[inline(always)]
     fn inner_message(&self) -> Option<String> {
         None
     }
 
     /// Returns the code of the current error.
+    #[inline(always)]
     pub fn code(self) -> OSStatus {
-        self.0
+        self.0.get() as _
     }
 }
 
 impl From<OSStatus> for Error {
+    #[inline(always)]
     fn from(code: OSStatus) -> Self {
         Self::from_code(code)
     }
 }
 
 impl fmt::Display for Error {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         if let Some(message) = self.message() {
             write!(fmt, "{}", message)
@@ -79,7 +90,4 @@
 }
 
 impl error::Error for Error {
-    fn description(&self) -> &str {
-        "Security Framework error"
-    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/certificate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/certificate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/certificate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/certificate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 //! Certificate support.
 
+use core_foundation::array::{CFArray, CFArrayRef};
 use core_foundation::base::TCFType;
 use core_foundation::data::CFData;
 use core_foundation::string::CFString;
@@ -7,16 +8,22 @@
 use security_framework_sys::base::{errSecParam, SecCertificateRef};
 use security_framework_sys::certificate::*;
 use std::fmt;
-#[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
 use std::ptr;
 
 use crate::base::{Error, Result};
+use crate::cvt;
+#[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+use crate::key;
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
 use core_foundation::base::FromVoid;
+#[cfg(any(feature = "OSX_10_13", target_os = "ios"))]
+use core_foundation::error::{CFError, CFErrorRef};
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
 use core_foundation::number::CFNumber;
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
 use core_foundation_sys::base::CFRelease;
+#[cfg(feature = "serial-number-bigint")]
+use num_bigint::BigUint;
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
 use security_framework_sys::base::SecPolicyRef;
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
@@ -30,8 +37,6 @@
 };
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
 use std::ops::Deref;
-#[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
-use crate::{cvt, key};
 
 declare_TCFType! {
     /// A type representing a certificate.
@@ -43,6 +48,7 @@
 unsafe impl Send for SecCertificate {}
 
 impl fmt::Debug for SecCertificate {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("SecCertificate")
             .field("subject", &self.subject_summary())
@@ -81,6 +87,59 @@
         }
     }
 
+    /// Returns a vector of email addresses for the subject of the certificate.
+    pub fn email_addresses(&self) -> Result<Vec<String>, Error> {
+        let mut array: CFArrayRef = ptr::null();
+        unsafe {
+            cvt(SecCertificateCopyEmailAddresses(
+                self.as_concrete_TypeRef(),
+                &mut array,
+            ))?;
+
+            let array = CFArray::<CFString>::wrap_under_create_rule(array);
+            Ok(array.into_iter().map(|p| p.to_string()).collect())
+        }
+    }
+
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    /// Returns DER encoded X.509 distinguished name of the certificate issuer.
+    pub fn issuer(&self) -> Vec<u8> {
+        unsafe {
+            let issuer = SecCertificateCopyNormalizedIssuerSequence(self.0);
+            CFData::wrap_under_create_rule(issuer).to_vec()
+        }
+    }
+
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    /// Returns DER encoded X.509 distinguished name of the certificate subject.
+    pub fn subject(&self) -> Vec<u8> {
+        unsafe {
+            let subject = SecCertificateCopyNormalizedSubjectSequence(self.0);
+            CFData::wrap_under_create_rule(subject).to_vec()
+        }
+    }
+
+    #[cfg(any(feature = "OSX_10_13", target_os = "ios"))]
+    /// Returns DER encoded serial number of the certificate.
+    pub fn serial_number_bytes(&self) -> Result<Vec<u8>, CFError> {
+        unsafe {
+            let mut error: CFErrorRef = ptr::null_mut();
+            let serial_number = SecCertificateCopySerialNumberData(self.0, &mut error);
+            if !error.is_null() {
+                Err(CFError::wrap_under_create_rule(error))
+            } else {
+                Ok(CFData::wrap_under_create_rule(serial_number).to_vec())
+            }
+        }
+    }
+
+    /// Use `BigUint::from_bytes_be(serial_number_bytes())` instead
+    #[deprecated(note = "use serial_number_bytes()")]
+    #[cfg(feature = "serial-number-bigint")]
+    pub fn serial_number(&self) -> Result<BigUint, CFError> {
+        Ok(BigUint::from_bytes_be(&self.serial_number_bytes()?))
+    }
+
     #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
     /// Returns DER encoded subjectPublicKeyInfo of certificate if available. This can be used
     /// for certificate pinning.
@@ -114,25 +173,14 @@
     #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
     /// Get public key from certificate
     pub fn public_key(&self) -> Result<key::SecKey> {
-        unsafe {
-            // Create an X509 trust using the using the certificate
-            let mut trust: SecTrustRef = ptr::null_mut();
-            let policy: SecPolicyRef = SecPolicyCreateBasicX509();
-            cvt(SecTrustCreateWithCertificates(
-                self.as_concrete_TypeRef() as _,
-                policy as _,
-                &mut trust,
-            ))?;
-
-            // Get a public key reference for the certificate from the trust
-            let mut result: SecTrustResultType = 0;
-            cvt(SecTrustEvaluate(trust, &mut result))?;
-            let public_key = SecTrustCopyPublicKey(trust);
-            CFRelease(policy as _);
-            CFRelease(trust as _);
-
-            Ok(key::SecKey::wrap_under_create_rule(public_key))
-        }
+        use crate::trust::SecTrust;
+        use crate::policy::SecPolicy;
+        use std::slice::from_ref;
+
+        let policy = SecPolicy::create_x509();
+        let mut trust = SecTrust::create_with_certificates(from_ref(self), from_ref(&policy))?;
+        trust.evaluate()?;
+        trust.copy_public_key()
     }
 }
 
@@ -184,10 +232,54 @@
 #[cfg(test)]
 mod test {
     use crate::test::certificate;
+    #[cfg(feature = "serial-number-bigint")]
+    use num_bigint::BigUint;
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    use x509_parser::prelude::*;
 
     #[test]
     fn subject_summary() {
         let cert = certificate();
         assert_eq!("foobar.com", cert.subject_summary());
     }
+
+    #[test]
+    fn email_addresses() {
+        let cert = certificate();
+        assert_eq!(Vec::<String>::new(), cert.email_addresses().unwrap());
+    }
+
+    #[test]
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    fn issuer() {
+        let cert = certificate();
+        let issuer = cert.issuer();
+        let (_, name) = X509Name::from_der(&issuer).unwrap();
+        let name_str = name.to_string_with_registry(oid_registry()).unwrap();
+        assert_eq!(
+            "C=US, ST=CALIFORNIA, L=PALO ALTO, O=FOOBAR LLC, OU=DEV LAND, CN=FOOBAR.COM",
+            name_str
+        );
+    }
+
+    #[test]
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    fn subject() {
+        let cert = certificate();
+        let subject = cert.subject();
+        let (_, name) = X509Name::from_der(&subject).unwrap();
+        let name_str = name.to_string_with_registry(oid_registry()).unwrap();
+        assert_eq!(
+            "C=US, ST=CALIFORNIA, L=PALO ALTO, O=FOOBAR LLC, OU=DEV LAND, CN=FOOBAR.COM",
+            name_str
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "serial-number-bigint")]
+    fn serial_number() {
+        let cert = certificate();
+        let serial_number = cert.serial_number().unwrap();
+        assert_eq!(BigUint::from(16452297291294946383_u128), serial_number);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/cipher_suite.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/cipher_suite.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/cipher_suite.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/cipher_suite.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,10 +14,12 @@
                 pub const $suite: Self = Self($suite);
             )+
 
+            #[inline(always)]
             pub fn from_raw(raw: SSLCipherSuite) -> Self {
                 Self(raw)
             }
 
+            #[inline(always)]
             pub fn to_raw(&self) -> SSLCipherSuite {
                 self.0
             }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/identity.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/identity.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/identity.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/identity.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,6 +23,7 @@
 unsafe impl Send for SecIdentity {}
 
 impl fmt::Debug for SecIdentity {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut builder = fmt.debug_struct("SecIdentity");
         if let Ok(cert) = self.certificate() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/import_export.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/import_export.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/import_export.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/import_export.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,11 +45,13 @@
 
 #[cfg(target_os = "macos")]
 impl crate::Pkcs12ImportOptionsInternals for Pkcs12ImportOptions {
+    #[inline(always)]
     fn keychain(&mut self, keychain: SecKeychain) -> &mut Self {
         self.keychain = Some(keychain);
         self
     }
 
+    #[inline(always)]
     fn access(&mut self, access: SecAccess) -> &mut Self {
         self.access = Some(access);
         self
@@ -58,6 +60,7 @@
 
 impl Pkcs12ImportOptions {
     /// Creates a new builder with default options.
+    #[inline(always)]
     pub fn new() -> Self {
         Self::default()
     }
@@ -65,6 +68,7 @@
     /// Specifies the passphrase to be used to decrypt the data.
     ///
     /// This must be specified, as unencrypted PKCS#12 data is not supported.
+    #[inline]
     pub fn passphrase(&mut self, passphrase: &str) -> &mut Self {
         self.passphrase = Some(CFString::new(passphrase));
         self
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/item.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/item.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/item.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/item.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,7 @@
 use core_foundation_sys::base::{CFCopyDescription, CFGetTypeID, CFRelease, CFTypeRef};
 use core_foundation_sys::string::CFStringRef;
 use security_framework_sys::item::*;
+use security_framework_sys::keychain_item::SecItemCopyMatching;
 use std::collections::HashMap;
 use std::fmt;
 use std::ptr;
@@ -29,35 +30,68 @@
 
 impl ItemClass {
     /// Look for `SecKeychainItem`s corresponding to generic passwords.
+    #[inline(always)]
     pub fn generic_password() -> Self {
         unsafe { Self(kSecClassGenericPassword) }
     }
 
     /// Look for `SecKeychainItem`s corresponding to internet passwords.
+    #[inline(always)]
     pub fn internet_password() -> Self {
         unsafe { Self(kSecClassInternetPassword) }
     }
 
     /// Look for `SecCertificate`s.
+    #[inline(always)]
     pub fn certificate() -> Self {
         unsafe { Self(kSecClassCertificate) }
     }
 
     /// Look for `SecKey`s.
+    #[inline(always)]
     pub fn key() -> Self {
         unsafe { Self(kSecClassKey) }
     }
 
     /// Look for `SecIdentity`s.
+    #[inline(always)]
     pub fn identity() -> Self {
         unsafe { Self(kSecClassIdentity) }
     }
 
+    #[inline]
     fn to_value(self) -> CFType {
         unsafe { CFType::wrap_under_get_rule(self.0 as *const _) }
     }
 }
 
+/// Specifies the number of results returned by a search
+#[derive(Debug, Copy, Clone)]
+pub enum Limit {
+    /// Always return all results
+    All,
+
+    /// Return up to the specified number of results
+    Max(i64),
+}
+
+impl Limit {
+    #[inline]
+    fn to_value(self) -> CFType {
+        match self {
+            Self::All => unsafe { CFString::wrap_under_get_rule(kSecMatchLimitAll).as_CFType() }
+            Self::Max(l) => CFNumber::from(l).as_CFType()
+        }
+    }
+}
+
+impl From<i64> for Limit {
+    #[inline]
+    fn from(limit: i64) -> Self {
+        Self::Max(limit)
+    }
+}
+
 /// A builder type to search for items in keychains.
 #[derive(Default)]
 pub struct ItemSearchOptions {
@@ -69,12 +103,14 @@
     load_refs: bool,
     load_attributes: bool,
     load_data: bool,
-    limit: Option<i64>,
+    limit: Option<Limit>,
     label: Option<CFString>,
+    access_group: Option<CFString>,
 }
 
 #[cfg(target_os = "macos")]
 impl crate::ItemSearchOptionsInternals for ItemSearchOptions {
+    #[inline]
     fn keychains(&mut self, keychains: &[SecKeychain]) -> &mut Self {
         self.keychains = Some(CFArray::from_CFTypes(keychains));
         self
@@ -83,11 +119,13 @@
 
 impl ItemSearchOptions {
     /// Creates a new builder with default options.
+    #[inline(always)]
     pub fn new() -> Self {
         Self::default()
     }
 
     /// Search only for items of the specified class.
+    #[inline(always)]
     pub fn class(&mut self, class: ItemClass) -> &mut Self {
         self.class = Some(class);
         self
@@ -96,6 +134,7 @@
 
     /// Load Security Framework objects (`SecCertificate`, `SecKey`, etc) for
     /// the results.
+    #[inline(always)]
     pub fn load_refs(&mut self, load_refs: bool) -> &mut Self {
         self.load_refs = load_refs;
         self
@@ -103,6 +142,7 @@
 
     /// Load Security Framework object attributes for
     /// the results.
+    #[inline(always)]
     pub fn load_attributes(&mut self, load_attributes: bool) -> &mut Self {
         self.load_attributes = load_attributes;
         self
@@ -110,6 +150,7 @@
 
     /// Load Security Framework objects data for
     /// the results.
+    #[inline(always)]
     pub fn load_data(&mut self, load_data: bool) -> &mut Self {
         self.load_data = load_data;
         self
@@ -118,17 +159,26 @@
     /// Limit the number of search results.
     ///
     /// If this is not called, the default limit is 1.
-    pub fn limit(&mut self, limit: i64) -> &mut Self {
-        self.limit = Some(limit);
+    #[inline(always)]
+    pub fn limit<T: Into<Limit>>(&mut self, limit: T) -> &mut Self {
+        self.limit = Some(limit.into());
         self
     }
 
     /// Search for an item with the given label.
+    #[inline(always)]
     pub fn label(&mut self, label: &str) -> &mut Self {
         self.label = Some(CFString::new(label));
         self
     }
 
+    /// Sets kSecAttrAccessGroup to kSecAttrAccessGroupToken
+    #[inline(always)]
+    pub fn access_group_token(&mut self) -> &mut Self {
+        self.access_group = unsafe { Some(CFString::wrap_under_get_rule(kSecAttrAccessGroupToken)) };
+        self
+    }
+
     /// Search for objects.
     pub fn search(&self) -> Result<Vec<SearchResult>> {
         unsafe {
@@ -169,7 +219,7 @@
             if let Some(limit) = self.limit {
                 params.push((
                     CFString::wrap_under_get_rule(kSecMatchLimit),
-                    CFNumber::from(limit).as_CFType(),
+                    limit.to_value()
                 ));
             }
 
@@ -180,6 +230,13 @@
                 ));
             }
 
+            if let Some(ref access_group) = self.access_group {
+                params.push((
+                    CFString::wrap_under_get_rule(kSecAttrAccessGroup),
+                    access_group.as_CFType(),
+                ));
+            }
+
             let params = CFDictionary::from_CFType_pairs(&params);
 
             let mut ret = ptr::null();
@@ -285,6 +342,7 @@
 }
 
 impl fmt::Debug for SearchResult {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             Self::Ref(ref reference) => fmt
@@ -362,4 +420,14 @@
             .unwrap();
         assert_eq!(results.len(), 2);
     }
+
+    #[test]
+    fn limit_all() {
+        let results = ItemSearchOptions::new()
+            .class(ItemClass::certificate())
+            .limit(Limit::All)
+            .search()
+            .unwrap();
+        assert!(results.len() >= 2);
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/key.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/key.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/key.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/key.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,11 +8,15 @@
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
 use core_foundation::dictionary::CFDictionary;
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
-use core_foundation_sys::error::CFErrorRef;
+use core_foundation::error::{CFError, CFErrorRef};
 use security_framework_sys::base::SecKeyRef;
+#[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+pub use security_framework_sys::key::Algorithm;
 use security_framework_sys::key::SecKeyGetTypeID;
 #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
-use security_framework_sys::key::{SecKeyCopyAttributes, SecKeyCopyExternalRepresentation};
+use security_framework_sys::key::{
+    SecKeyCopyAttributes, SecKeyCopyExternalRepresentation, SecKeyCreateSignature,
+};
 use std::fmt;
 
 declare_TCFType! {
@@ -37,15 +41,43 @@
     pub fn external_representation(&self) -> Option<CFData> {
         let mut error: CFErrorRef = ::std::ptr::null_mut();
         let data = unsafe { SecKeyCopyExternalRepresentation(self.to_void() as _, &mut error) };
-        if data == ::std::ptr::null() {
+        if data.is_null() {
             return None;
         }
         Some(unsafe { CFData::wrap_under_create_rule(data) })
     }
+
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    /// Creates the cryptographic signature for a block of data using a private
+    /// key and specified algorithm.
+    pub fn create_signature(
+        &self,
+        algorithm: Algorithm,
+        input: impl AsRef<[u8]>,
+    ) -> Result<Vec<u8>, CFError> {
+        let mut error: CFErrorRef = std::ptr::null_mut();
+
+        let output = unsafe {
+            SecKeyCreateSignature(
+                self.as_concrete_TypeRef(),
+                algorithm.into(),
+                CFData::from_buffer(input.as_ref()).as_concrete_TypeRef(),
+                &mut error,
+            )
+        };
+
+        if !error.is_null() {
+            Err(unsafe { CFError::wrap_under_create_rule(error) })
+        } else {
+            let output = unsafe { CFData::wrap_under_create_rule(output) };
+            Ok(output.to_vec())
+        }
+    }
 }
 
 // FIXME
 impl fmt::Debug for SecKey {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(fmt, "SecKey")
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,7 @@
 //! Wrappers around the OSX Security Framework.
 #![warn(missing_docs)]
 #![allow(non_upper_case_globals)]
+#![allow(clippy::manual_non_exhaustive)] // MSRV
 
 #[macro_use]
 extern crate core_foundation;
@@ -61,6 +62,7 @@
     fn as_inner(&self) -> Self::Inner;
 }
 
+#[inline(always)]
 fn cvt(err: OSStatus) -> Result<()> {
     match err {
         errSecSuccess => Ok(()),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/certificate_oids.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/certificate_oids.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/certificate_oids.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/certificate_oids.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,16 +10,19 @@
 
 #[allow(missing_docs)]
 impl CertificateOid {
+    #[inline(always)]
     pub fn x509_v1_signature_algorithm() -> Self {
         unsafe { Self(kSecOIDX509V1SignatureAlgorithm) }
     }
 
     /// Returns the underlying raw pointer corresponding to this OID.
+    #[inline(always)]
     pub fn as_ptr(&self) -> CFStringRef {
         self.0
     }
 
     /// Returns the string representation of the OID.
+    #[inline]
     pub fn to_str(&self) -> CFString {
         unsafe { CFString::wrap_under_get_rule(self.0) }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/certificate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/certificate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/certificate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/certificate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,18 +3,21 @@
 use core_foundation::array::{CFArray, CFArrayIterator};
 use core_foundation::base::TCFType;
 use core_foundation::base::ToVoid;
+use core_foundation::data::CFData;
 use core_foundation::dictionary::CFDictionary;
 use core_foundation::error::CFError;
 use core_foundation::string::CFString;
 use security_framework_sys::certificate::*;
 use std::os::raw::c_void;
 use std::ptr;
+use std::convert::TryInto;
 
 use crate::base::Error;
 use crate::certificate::SecCertificate;
 use crate::cvt;
 use crate::key::SecKey;
 use crate::os::macos::certificate_oids::CertificateOid;
+use crate::os::macos::digest_transform::{Builder, DigestType};
 
 /// An extension trait adding OSX specific functionality to `SecCertificate`.
 pub trait SecCertificateExt {
@@ -22,6 +25,7 @@
     fn common_name(&self) -> Result<String, Error>;
 
     /// Returns the public key associated with the certificate.
+    #[cfg_attr(not(feature = "OSX_10_14"), deprecated(note = "Uses deprecated SecCertificateCopyPublicKey. Enable OSX_10_14 feature to avoid it"))]
     fn public_key(&self) -> Result<SecKey, Error>;
 
     /// Returns the set of properties associated with the certificate.
@@ -30,6 +34,9 @@
     /// subset.
     fn properties(&self, keys: Option<&[CertificateOid]>)
         -> Result<CertificateProperties, CFError>;
+
+    /// Returns the SHA-256 fingerprint of the certificate.
+    fn fingerprint(&self) -> Result<[u8; 32], CFError> { unimplemented!() }
 }
 
 impl SecCertificateExt for SecCertificate {
@@ -44,7 +51,20 @@
         }
     }
 
+    #[cfg(feature = "OSX_10_14")]
+    fn public_key(&self) -> Result<SecKey, Error> {
+        unsafe {
+            let key = SecCertificateCopyKey(self.as_concrete_TypeRef());
+            if key.is_null() {
+                return Err(Error::from_code(-26275));
+            }
+            Ok(SecKey::wrap_under_create_rule(key))
+        }
+    }
+
+    #[cfg(not(feature = "OSX_10_14"))]
     fn public_key(&self) -> Result<SecKey, Error> {
+        #[allow(deprecated)]
         unsafe {
             let mut key = ptr::null_mut();
             cvt(SecCertificateCopyPublicKey(
@@ -83,6 +103,16 @@
             }
         }
     }
+
+    /// Returns the SHA-256 fingerprint of the certificate.
+    fn fingerprint(&self) -> Result<[u8; 32], CFError> {
+        let data = CFData::from_buffer(&self.to_der());
+        let hash = Builder::new()
+            .type_(DigestType::sha2())
+            .length(256)
+            .execute(&data)?;
+        Ok(hash.bytes().try_into().unwrap())
+    }
 }
 
 /// Properties associated with a certificate.
@@ -137,6 +167,7 @@
 
 impl PropertySection {
     /// Returns an iterator over the properties in this section.
+    #[inline(always)]
     pub fn iter(&self) -> PropertySectionIter<'_> {
         PropertySectionIter(self.0.iter())
     }
@@ -146,6 +177,7 @@
     type IntoIter = PropertySectionIter<'a>;
     type Item = CertificateProperty;
 
+    #[inline(always)]
     fn into_iter(self) -> PropertySectionIter<'a> {
         self.iter()
     }
@@ -157,10 +189,12 @@
 impl<'a> Iterator for PropertySectionIter<'a> {
     type Item = CertificateProperty;
 
+    #[inline]
     fn next(&mut self) -> Option<CertificateProperty> {
         self.0.next().map(|t| CertificateProperty(t.clone()))
     }
 
+    #[inline(always)]
     fn size_hint(&self) -> (usize, Option<usize>) {
         self.0.size_hint()
     }
@@ -190,12 +224,23 @@
     }
 
     #[test]
+    #[allow(deprecated)]
     fn public_key() {
         let certificate = certificate();
         p!(certificate.public_key());
     }
 
     #[test]
+    fn fingerprint() {
+        let certificate = certificate();
+        let fingerprint = p!(certificate.fingerprint());
+        assert_eq!(
+            "af9dd180a326ae08b37e6398f9262f8b9d4c55674a233a7c84975024f873655d",
+            hex::encode(fingerprint)
+        );
+    }
+
+    #[test]
     fn signature_algorithm() {
         let certificate = certificate();
         let properties = certificate
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/code_signing.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/code_signing.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/code_signing.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/code_signing.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,484 @@
+//! Code signing services.
+
+use std::{fmt::Debug, mem::MaybeUninit, str::FromStr};
+
+use core_foundation::{
+    base::{TCFType, TCFTypeRef, ToVoid},
+    data::CFDataRef,
+    dictionary::CFMutableDictionary,
+    number::CFNumber,
+    string::{CFString, CFStringRef},
+    url::CFURL,
+};
+use libc::pid_t;
+use security_framework_sys::code_signing::{
+    kSecCSBasicValidateOnly, kSecCSCheckAllArchitectures, kSecCSCheckGatekeeperArchitectures,
+    kSecCSCheckNestedCode, kSecCSCheckTrustedAnchors, kSecCSConsiderExpiration,
+    kSecCSDoNotValidateExecutable, kSecCSDoNotValidateResources, kSecCSEnforceRevocationChecks,
+    kSecCSFullReport, kSecCSNoNetworkAccess, kSecCSQuickCheck, kSecCSReportProgress,
+    kSecCSRestrictSidebandData, kSecCSRestrictSymlinks, kSecCSRestrictToAppLike,
+    kSecCSSingleThreaded, kSecCSStrictValidate, kSecCSUseSoftwareSigningCert, kSecCSValidatePEH,
+    kSecGuestAttributeAudit, kSecGuestAttributePid, SecCodeCheckValidity,
+    SecCodeCopyGuestWithAttributes, SecCodeCopyPath, SecCodeCopySelf, SecCodeGetTypeID, SecCodeRef,
+    SecRequirementCreateWithString, SecRequirementGetTypeID, SecRequirementRef,
+    SecStaticCodeCheckValidity, SecStaticCodeCreateWithPath, SecStaticCodeGetTypeID,
+    SecStaticCodeRef,
+};
+
+use crate::{cvt, Result};
+
+bitflags::bitflags! {
+
+    /// Values that can be used in the flags parameter to most code signing
+    /// functions.
+    pub struct Flags: u32 {
+        /// Use the default behaviour.
+        const NONE = 0;
+
+        /// For multi-architecture (universal) Mach-O programs, validate all
+        /// architectures included.
+        const CHECK_ALL_ARCHITECTURES = kSecCSCheckAllArchitectures;
+
+        /// Do not validate the contents of the main executable.
+        const DO_NOT_VALIDATE_EXECUTABLE = kSecCSDoNotValidateExecutable;
+
+        /// Do not validate the presence and contents of all bundle resources
+        /// if any.
+        const DO_NOT_VALIDATE_RESOURCES = kSecCSDoNotValidateResources;
+
+        /// Do not validate either the main executable or the bundle resources,
+        /// if any.
+        const BASIC_VALIDATE_ONLY = kSecCSBasicValidateOnly;
+
+        /// For code in bundle form, locate and recursively check embedded code.
+        const CHECK_NESTED_CODE = kSecCSCheckNestedCode;
+
+        /// Perform additional checks to ensure the validity of code in bundle
+        /// form.
+        const STRICT_VALIDATE = kSecCSStrictValidate;
+
+        /// Apple have not documented this flag.
+        const FULL_REPORT = kSecCSFullReport;
+
+        /// Apple have not documented this flag.
+        const CHECK_GATEKEEPER_ARCHITECTURES = kSecCSCheckGatekeeperArchitectures;
+
+        /// Apple have not documented this flag.
+        const RESTRICT_SYMLINKS = kSecCSRestrictSymlinks;
+
+        /// Apple have not documented this flag.
+        const RESTRICT_TO_APP_LIKE = kSecCSRestrictToAppLike;
+
+        /// Apple have not documented this flag.
+        const RESTRICT_SIDEBAND_DATA = kSecCSRestrictSidebandData;
+
+        /// Apple have not documented this flag.
+        const USE_SOFTWARE_SIGNING_CERT = kSecCSUseSoftwareSigningCert;
+
+        /// Apple have not documented this flag.
+        const VALIDATE_PEH = kSecCSValidatePEH;
+
+        /// Apple have not documented this flag.
+        const SINGLE_THREADED = kSecCSSingleThreaded;
+
+        /// Apple have not documented this flag.
+        const QUICK_CHECK = kSecCSQuickCheck;
+
+        /// Apple have not documented this flag.
+        const CHECK_TRUSTED_ANCHORS = kSecCSCheckTrustedAnchors;
+
+        /// Apple have not documented this flag.
+        const REPORT_PROGRESS = kSecCSReportProgress;
+
+        /// Apple have not documented this flag.
+        const NO_NETWORK_ACCESS = kSecCSNoNetworkAccess;
+
+        /// Apple have not documented this flag.
+        const ENFORCE_REVOCATION_CHECKS = kSecCSEnforceRevocationChecks;
+
+        /// Apple have not documented this flag.
+        const CONSIDER_EXPIRATION = kSecCSConsiderExpiration;
+    }
+}
+
+impl Default for Flags {
+    #[inline(always)]
+    fn default() -> Self {
+        Self::NONE
+    }
+}
+
+/// A helper to create guest attributes, which are normally passed as a
+/// `CFDictionary` with varying types.
+pub struct GuestAttributes {
+    inner: CFMutableDictionary,
+}
+
+impl GuestAttributes {
+    // Not implemented:
+    // - architecture
+    // - canonical
+    // - dynamic code
+    // - dynamic code info plist
+    // - hash
+    // - mach port
+    // - sub-architecture
+
+    /// Creates a new, empty `GuestAttributes`. You must add values to it in
+    /// order for it to be of any use.
+    pub fn new() -> Self {
+        Self {
+            inner: CFMutableDictionary::new(),
+        }
+    }
+
+    /// The guest's audit token.
+    pub fn set_audit_token(&mut self, token: CFDataRef) {
+        let key = unsafe { CFString::wrap_under_get_rule(kSecGuestAttributeAudit) };
+        self.inner.add(&key.as_CFTypeRef(), &token.to_void());
+    }
+
+    /// The guest's pid.
+    pub fn set_pid(&mut self, pid: pid_t) {
+        let key = unsafe { CFString::wrap_under_get_rule(kSecGuestAttributePid) };
+        let pid = CFNumber::from(pid);
+        self.inner.add(&key.as_CFTypeRef(), &pid.as_CFTypeRef());
+    }
+
+    /// Support for arbirtary guest attributes.
+    pub fn set_other<V: ToVoid<V>>(&mut self, key: CFStringRef, value: V) {
+        self.inner.add(&key.as_void_ptr(), &value.to_void());
+    }
+}
+
+impl Default for GuestAttributes {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+declare_TCFType! {
+    /// A code object representing signed code running on the system.
+    SecRequirement, SecRequirementRef
+}
+impl_TCFType!(SecRequirement, SecRequirementRef, SecRequirementGetTypeID);
+
+impl FromStr for SecRequirement {
+    type Err = crate::base::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let text = CFString::new(s);
+        let mut requirement = MaybeUninit::uninit();
+
+        unsafe {
+            cvt(SecRequirementCreateWithString(
+                text.as_concrete_TypeRef(),
+                0,
+                requirement.as_mut_ptr(),
+            ))?;
+
+            Ok(Self::wrap_under_create_rule(requirement.assume_init()))
+        }
+    }
+}
+
+declare_TCFType! {
+    /// A code object representing signed code running on the system.
+    SecCode, SecCodeRef
+}
+impl_TCFType!(SecCode, SecCodeRef, SecCodeGetTypeID);
+
+impl Debug for SecCode {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str("SecCode")
+    }
+}
+
+impl SecCode {
+    /// Retrieves the code object for the code making the call.
+    pub fn for_self(flags: Flags) -> Result<Self> {
+        let mut code = MaybeUninit::uninit();
+
+        unsafe {
+            cvt(SecCodeCopySelf(flags.bits(), code.as_mut_ptr()))?;
+            Ok(Self::wrap_under_create_rule(code.assume_init()))
+        }
+    }
+
+    /// Performs dynamic validation of signed code.
+    pub fn check_validity(&self, flags: Flags, requirement: &SecRequirement) -> Result<()> {
+        unsafe {
+            cvt(SecCodeCheckValidity(
+                self.as_concrete_TypeRef(),
+                flags.bits(),
+                requirement.as_concrete_TypeRef(),
+            ))
+        }
+    }
+
+    /// Asks a code host to identify one of its guests given
+    /// the type and value of specific attributes of the guest code.
+    ///
+    /// If `host` is `None` then the code signing root of trust (currently, the
+    // system kernel) should be used as the code host.
+    pub fn copy_guest_with_attribues(
+        host: Option<&SecCode>,
+        attrs: &GuestAttributes,
+        flags: Flags,
+    ) -> Result<SecCode> {
+        let mut code = MaybeUninit::uninit();
+
+        let host = match host {
+            Some(host) => host.as_concrete_TypeRef(),
+            None => std::ptr::null_mut(),
+        };
+
+        unsafe {
+            cvt(SecCodeCopyGuestWithAttributes(
+                host,
+                attrs.inner.as_concrete_TypeRef(),
+                flags.bits(),
+                code.as_mut_ptr(),
+            ))?;
+
+            Ok(SecCode::wrap_under_create_rule(code.assume_init()))
+        }
+    }
+
+    /// Retrieves the location on disk of signed code, given a code or static
+    /// code object.
+    pub fn path(&self, flags: Flags) -> Result<CFURL> {
+        let mut url = MaybeUninit::uninit();
+
+        // The docs say we can pass a SecCodeRef instead of a SecStaticCodeRef.
+        unsafe {
+            cvt(SecCodeCopyPath(
+                self.as_CFTypeRef() as _,
+                flags.bits(),
+                url.as_mut_ptr(),
+            ))?;
+
+            Ok(CFURL::wrap_under_create_rule(url.assume_init()))
+        }
+    }
+}
+
+declare_TCFType! {
+    /// A static code object representing signed code on disk.
+    SecStaticCode, SecStaticCodeRef
+}
+impl_TCFType!(SecStaticCode, SecStaticCodeRef, SecStaticCodeGetTypeID);
+
+impl SecStaticCode {
+    /// Creates a static code object representing the code at a specified file
+    /// system path.
+    pub fn from_path(path: &CFURL, flags: Flags) -> Result<Self> {
+        let mut code = MaybeUninit::uninit();
+
+        unsafe {
+            cvt(SecStaticCodeCreateWithPath(
+                path.as_concrete_TypeRef(),
+                flags.bits(),
+                code.as_mut_ptr(),
+            ))?;
+
+            Ok(Self::wrap_under_get_rule(code.assume_init()))
+        }
+    }
+
+    /// Retrieves the location on disk of signed code, given a code or static
+    /// code object.
+    pub fn path(&self, flags: Flags) -> Result<CFURL> {
+        let mut url = MaybeUninit::uninit();
+
+        // The docs say we can pass a SecCodeRef instead of a SecStaticCodeRef.
+        unsafe {
+            cvt(SecCodeCopyPath(
+                self.as_concrete_TypeRef(),
+                flags.bits(),
+                url.as_mut_ptr(),
+            ))?;
+
+            Ok(CFURL::wrap_under_create_rule(url.assume_init()))
+        }
+    }
+
+    /// Performs dynamic validation of signed code.
+    pub fn check_validity(&self, flags: Flags, requirement: &SecRequirement) -> Result<()> {
+        unsafe {
+            cvt(SecStaticCodeCheckValidity(
+                self.as_concrete_TypeRef(),
+                flags.bits(),
+                requirement.as_concrete_TypeRef(),
+            ))
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use core_foundation::data::CFData;
+    use libc::{c_uint, c_void, KERN_SUCCESS};
+
+    #[test]
+    fn path_to_static_code_and_back() {
+        let path = CFURL::from_path("/bin/bash", false).unwrap();
+        let code = SecStaticCode::from_path(&path, Flags::NONE).unwrap();
+        assert_eq!(code.path(Flags::NONE).unwrap(), path);
+    }
+
+    #[test]
+    fn self_to_path() {
+        let path = CFURL::from_path(std::env::current_exe().unwrap(), false).unwrap();
+        let code = SecCode::for_self(Flags::NONE).unwrap();
+        assert_eq!(code.path(Flags::NONE).unwrap(), path);
+    }
+
+    #[test]
+    fn bash_is_signed_by_apple() {
+        let path = CFURL::from_path("/bin/bash", false).unwrap();
+        let code = SecStaticCode::from_path(&path, Flags::NONE).unwrap();
+        let requirement: SecRequirement = "anchor apple".parse().unwrap();
+        code.check_validity(Flags::NONE, &requirement).unwrap();
+    }
+
+    #[cfg(target_arch = "aarch64")]
+    #[test]
+    fn self_is_not_signed_by_apple() {
+        let code = SecCode::for_self(Flags::NONE).unwrap();
+        let requirement: SecRequirement = "anchor apple".parse().unwrap();
+
+        assert_eq!(
+            code.check_validity(Flags::NONE, &requirement)
+                .unwrap_err()
+                .code(),
+            // "code failed to satisfy specified code requirement(s)"
+            -67050
+        );
+    }
+
+    #[cfg(not(target_arch = "aarch64"))]
+    #[test]
+    fn self_is_not_signed_by_apple() {
+        let code = SecCode::for_self(Flags::NONE).unwrap();
+        let requirement: SecRequirement = "anchor apple".parse().unwrap();
+
+        assert_eq!(
+            code.check_validity(Flags::NONE, &requirement)
+                .unwrap_err()
+                .code(),
+            // "code object is not signed at all"
+            -67062
+        );
+    }
+
+    #[test]
+    fn copy_kernel_guest_with_launchd_pid() {
+        let mut attrs = GuestAttributes::new();
+        attrs.set_pid(1);
+
+        assert_eq!(
+            SecCode::copy_guest_with_attribues(None, &attrs, Flags::NONE)
+                .unwrap()
+                .path(Flags::NONE)
+                .unwrap()
+                .get_string()
+                .to_string(),
+            "file:///sbin/launchd"
+        );
+    }
+
+    #[test]
+    fn copy_current_guest_with_launchd_pid() {
+        let host_code = SecCode::for_self(Flags::NONE).unwrap();
+
+        let mut attrs = GuestAttributes::new();
+        attrs.set_pid(1);
+
+        assert_eq!(
+            SecCode::copy_guest_with_attribues(Some(&host_code), &attrs, Flags::NONE)
+                .unwrap_err()
+                .code(),
+            // "host has no guest with the requested attributes"
+            -67065
+        );
+    }
+
+    #[test]
+    fn copy_kernel_guest_with_unmatched_pid() {
+        let mut attrs = GuestAttributes::new();
+        attrs.set_pid(999_999_999);
+
+        assert_eq!(
+            SecCode::copy_guest_with_attribues(None, &attrs, Flags::NONE)
+                .unwrap_err()
+                .code(),
+            // "UNIX[No such process]"
+            100003
+        );
+    }
+
+    #[test]
+    fn copy_kernel_guest_with_current_token() {
+        let mut token: [u8; 32] = [0; 32];
+        let mut token_len = 32u32;
+
+        enum OpaqueTaskName {}
+
+        extern "C" {
+            fn mach_task_self() -> *const OpaqueTaskName;
+            fn task_info(
+                task_name: *const OpaqueTaskName,
+                task_flavor: u32,
+                out: *mut c_void,
+                out_len: *mut u32,
+            ) -> i32;
+        }
+
+        const TASK_AUDIT_TOKEN: c_uint = 15;
+
+        let result = unsafe {
+            task_info(
+                mach_task_self(),
+                TASK_AUDIT_TOKEN,
+                token.as_mut_ptr() as *mut c_void,
+                &mut token_len,
+            )
+        };
+
+        assert_eq!(result, KERN_SUCCESS);
+
+        let token_data = CFData::from_buffer(&token);
+
+        let mut attrs = GuestAttributes::new();
+        attrs.set_audit_token(token_data.as_concrete_TypeRef());
+
+        assert_eq!(
+            SecCode::copy_guest_with_attribues(None, &attrs, Flags::NONE)
+                .unwrap()
+                .path(Flags::NONE)
+                .unwrap()
+                .to_path()
+                .unwrap(),
+            std::env::current_exe().unwrap()
+        );
+    }
+
+    #[test]
+    fn copy_kernel_guest_with_unmatched_token() {
+        let token: [u8; 32] = [0; 32];
+        let token_data = CFData::from_buffer(&token);
+
+        let mut attrs = GuestAttributes::new();
+        attrs.set_audit_token(token_data.as_concrete_TypeRef());
+
+        assert_eq!(
+            SecCode::copy_guest_with_attribues(None, &attrs, Flags::NONE)
+                .unwrap_err()
+                .code(),
+            // "UNIX[No such process]"
+            100003
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/digest_transform.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/digest_transform.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/digest_transform.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/digest_transform.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,38 +19,47 @@
 
 #[allow(missing_docs)]
 impl DigestType {
+    #[inline(always)]
     pub fn hmac_md5() -> Self {
         unsafe { Self(kSecDigestHMACMD5) }
     }
 
+    #[inline(always)]
     pub fn hmac_sha1() -> Self {
         unsafe { Self(kSecDigestHMACSHA1) }
     }
 
+    #[inline(always)]
     pub fn hmac_sha2() -> Self {
         unsafe { Self(kSecDigestHMACSHA2) }
     }
 
+    #[inline(always)]
     pub fn md2() -> Self {
         unsafe { Self(kSecDigestMD2) }
     }
 
+    #[inline(always)]
     pub fn md4() -> Self {
         unsafe { Self(kSecDigestMD4) }
     }
 
+    #[inline(always)]
     pub fn md5() -> Self {
         unsafe { Self(kSecDigestMD5) }
     }
 
+    #[inline(always)]
     pub fn sha1() -> Self {
         unsafe { Self(kSecDigestSHA1) }
     }
 
+    #[inline(always)]
     pub fn sha2() -> Self {
         unsafe { Self(kSecDigestSHA2) }
     }
 
+    #[inline(always)]
     fn to_type(self) -> CFTypeRef {
         self.0 as CFTypeRef
     }
@@ -64,6 +73,7 @@
 }
 
 impl Default for Builder {
+    #[inline(always)]
     fn default() -> Self {
         Self::new()
     }
@@ -71,6 +81,7 @@
 
 impl Builder {
     /// Returns a new builder with default settings.
+    #[inline(always)]
     pub fn new() -> Self {
         Self {
             digest_type: None,
@@ -82,6 +93,7 @@
     /// Sets the type of digest to perform.
     ///
     /// If not set, an appropriate digest will be selected for you.
+    #[inline]
     pub fn type_(&mut self, digest_type: DigestType) -> &mut Self {
         self.digest_type = Some(digest_type);
         self
@@ -91,6 +103,7 @@
     ///
     /// If not set, an appropriate length will be selected for you. Some digest
     /// types only support specific output lengths.
+    #[inline]
     pub fn length(&mut self, digest_length: CFIndex) -> &mut Self {
         self.digest_length = Some(digest_length);
         self
@@ -99,6 +112,7 @@
     /// Sets the key used for HMAC digests.
     ///
     /// Only applies to `HmacMd5`, `HmacSha1`, and `HmacSha2` digests.
+    #[inline]
     pub fn hmac_key(&mut self, hmac_key: CFData) -> &mut Self {
         self.hmac_key = Some(hmac_key);
         self
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/encrypt_transform.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/encrypt_transform.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/encrypt_transform.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/encrypt_transform.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,30 +19,36 @@
 
 impl Padding {
     /// Do not pad.
+    #[inline(always)]
     pub fn none() -> Self {
         unsafe { Self(kSecPaddingNoneKey) }
     }
 
     /// Use PKCS#1 padding.
+    #[inline(always)]
     pub fn pkcs1() -> Self {
         unsafe { Self(kSecPaddingPKCS1Key) }
     }
 
     /// Use PKCS#5 padding.
+    #[inline(always)]
     pub fn pkcs5() -> Self {
         unsafe { Self(kSecPaddingPKCS5Key) }
     }
 
     /// Use PKCS#7 padding.
+    #[inline(always)]
     pub fn pkcs7() -> Self {
         unsafe { Self(kSecPaddingPKCS7Key) }
     }
 
     /// Use OAEP padding.
+    #[inline(always)]
     pub fn oaep() -> Self {
         unsafe { Self(kSecPaddingOAEPKey) }
     }
 
+    #[inline]
     fn to_str(self) -> CFString {
         unsafe { CFString::wrap_under_get_rule(self.0) }
     }
@@ -56,22 +62,27 @@
 
 #[allow(missing_docs)]
 impl Mode {
+    #[inline(always)]
     pub fn none() -> Self {
         unsafe { Self(kSecModeNoneKey) }
     }
 
+    #[inline(always)]
     pub fn ecb() -> Self {
         unsafe { Self(kSecModeECBKey) }
     }
 
+    #[inline(always)]
     pub fn cbc() -> Self {
         unsafe { Self(kSecModeCBCKey) }
     }
 
+    #[inline(always)]
     pub fn cfb() -> Self {
         unsafe { Self(kSecModeCFBKey) }
     }
 
+    #[inline(always)]
     pub fn ofb() -> Self {
         unsafe { Self(kSecModeOFBKey) }
     }
@@ -91,6 +102,7 @@
 
 impl Builder {
     /// Creates a new `Builder` with a default configuration.
+    #[inline(always)]
     pub fn new() -> Self {
         Self::default()
     }
@@ -98,6 +110,7 @@
     /// Selects the padding scheme to use.
     ///
     /// If not set, an appropriate scheme will be selected for you.
+    #[inline(always)]
     pub fn padding(&mut self, padding: Padding) -> &mut Self {
         self.padding = Some(padding);
         self
@@ -106,6 +119,7 @@
     /// Selects the encryption mode to use.
     ///
     /// If not set, an appropriate mode will be selected for you.
+    #[inline(always)]
     pub fn mode(&mut self, mode: Mode) -> &mut Self {
         self.mode = Some(mode);
         self
@@ -114,6 +128,7 @@
     /// Sets the initialization vector to use.
     ///
     /// If not set, an appropriate value will be supplied for you.
+    #[inline(always)]
     pub fn iv(&mut self, iv: CFData) -> &mut Self {
         self.iv = Some(iv);
         self
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/import_export.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/import_export.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/import_export.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/import_export.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,10 +29,12 @@
 }
 
 impl Pkcs12ImportOptionsExt for Pkcs12ImportOptions {
+    #[inline(always)]
     fn keychain(&mut self, keychain: SecKeychain) -> &mut Self {
         crate::Pkcs12ImportOptionsInternals::keychain(self, keychain)
     }
 
+    #[inline(always)]
     fn access(&mut self, access: SecAccess) -> &mut Self {
         crate::Pkcs12ImportOptionsInternals::access(self, access)
     }
@@ -53,6 +55,7 @@
 
 impl<'a> ImportOptions<'a> {
     /// Creates a new builder with default options.
+    #[inline(always)]
     pub fn new() -> ImportOptions<'a> {
         ImportOptions::default()
     }
@@ -60,18 +63,21 @@
     /// Sets the filename from which the imported data came.
     ///
     /// The extension of the file will used as a hint for parsing.
+    #[inline]
     pub fn filename(&mut self, filename: &str) -> &mut ImportOptions<'a> {
         self.filename = Some(CFString::from_str(filename).unwrap());
         self
     }
 
     /// Sets the passphrase to be used to decrypt the imported data.
+    #[inline]
     pub fn passphrase(&mut self, passphrase: &str) -> &mut ImportOptions<'a> {
         self.passphrase = Some(CFString::from_str(passphrase).unwrap().as_CFType());
         self
     }
 
     /// Sets the passphrase to be used to decrypt the imported data.
+    #[inline]
     pub fn passphrase_bytes(&mut self, passphrase: &[u8]) -> &mut ImportOptions<'a> {
         self.passphrase = Some(CFData::from_buffer(passphrase).as_CFType());
         self
@@ -79,12 +85,14 @@
 
     /// If set, the user will be prompted to imput the passphrase used to
     /// decrypt the imported data.
+    #[inline(always)]
     pub fn secure_passphrase(&mut self, secure_passphrase: bool) -> &mut ImportOptions<'a> {
         self.secure_passphrase = secure_passphrase;
         self
     }
 
     /// If set, imported items will have no access controls imposed on them.
+    #[inline(always)]
     pub fn no_access_control(&mut self, no_access_control: bool) -> &mut ImportOptions<'a> {
         self.no_access_control = no_access_control;
         self
@@ -92,6 +100,7 @@
 
     /// Sets the title of the alert popup used with the `secure_passphrase`
     /// option.
+    #[inline]
     pub fn alert_title(&mut self, alert_title: &str) -> &mut ImportOptions<'a> {
         self.alert_title = Some(CFString::from_str(alert_title).unwrap());
         self
@@ -99,12 +108,14 @@
 
     /// Sets the prompt of the alert popup used with the `secure_passphrase`
     /// option.
+    #[inline]
     pub fn alert_prompt(&mut self, alert_prompt: &str) -> &mut ImportOptions<'a> {
         self.alert_prompt = Some(CFString::from_str(alert_prompt).unwrap());
         self
     }
 
     /// Sets the object into which imported items will be placed.
+    #[inline(always)]
     pub fn items(&mut self, items: &'a mut SecItems) -> &mut ImportOptions<'a> {
         self.items = Some(items);
         self
@@ -113,6 +124,7 @@
     /// Sets the keychain into which items will be imported.
     ///
     /// This must be specified to import `SecIdentity`s.
+    #[inline]
     pub fn keychain(&mut self, keychain: &SecKeychain) -> &mut ImportOptions<'a> {
         self.keychain = Some(keychain.clone());
         self
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/item.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/item.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/item.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/item.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,35 +15,43 @@
 
 #[allow(missing_docs)]
 impl KeyType {
+    #[inline(always)]
     pub fn rsa() -> Self {
         unsafe { Self(kSecAttrKeyTypeRSA) }
     }
 
+    #[inline(always)]
     pub fn dsa() -> Self {
         unsafe { Self(kSecAttrKeyTypeDSA) }
     }
 
+    #[inline(always)]
     pub fn aes() -> Self {
         unsafe { Self(kSecAttrKeyTypeAES) }
     }
 
+    #[inline(always)]
     pub fn des() -> Self {
         unsafe { Self(kSecAttrKeyTypeDES) }
     }
 
+    #[inline(always)]
     pub fn triple_des() -> Self {
         unsafe { Self(kSecAttrKeyType3DES) }
     }
 
+    #[inline(always)]
     pub fn rc4() -> Self {
         unsafe { Self(kSecAttrKeyTypeRC4) }
     }
 
+    #[inline(always)]
     pub fn cast() -> Self {
         unsafe { Self(kSecAttrKeyTypeCAST) }
     }
 
     #[cfg(feature = "OSX_10_9")]
+    #[inline(always)]
     pub fn ec() -> Self {
         unsafe { Self(kSecAttrKeyTypeEC) }
     }
@@ -62,6 +70,7 @@
 }
 
 impl ItemSearchOptionsExt for ItemSearchOptions {
+    #[inline(always)]
     fn keychains(&mut self, keychains: &[SecKeychain]) -> &mut Self {
         ItemSearchOptionsInternals::keychains(self, keychains)
     }
@@ -69,11 +78,11 @@
 
 #[cfg(test)]
 mod test {
-    use tempdir::TempDir;
-    use crate::os::macos::item::ItemSearchOptionsExt;
     use crate::item::*;
     use crate::os::macos::certificate::SecCertificateExt;
+    use crate::os::macos::item::ItemSearchOptionsExt;
     use crate::os::macos::test::keychain;
+    use tempdir::TempDir;
 
     #[test]
     fn find_certificate() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/keychain_item.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/keychain_item.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/keychain_item.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/keychain_item.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,6 +20,7 @@
 
 // FIXME
 impl fmt::Debug for SecKeychainItem {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.write_str("SecKeychainItem")
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/keychain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/keychain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/keychain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/keychain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 //! Keychain support.
 
 use core_foundation::base::{Boolean, TCFType};
-use security_framework_sys::base::SecKeychainRef;
+use security_framework_sys::base::{errSecSuccess, SecKeychainRef};
 use security_framework_sys::keychain::*;
 use std::ffi::CString;
 use std::os::raw::c_void;
@@ -9,10 +9,12 @@
 use std::path::Path;
 use std::ptr;
 
-use crate::base::Result;
+use crate::base::{Error, Result};
 use crate::cvt;
 use crate::os::macos::access::SecAccess;
 
+pub use security_framework_sys::keychain::SecPreferencesDomain;
+
 declare_TCFType! {
     /// A type representing a keychain.
     SecKeychain, SecKeychainRef
@@ -25,6 +27,7 @@
 impl SecKeychain {
     /// Creates a `SecKeychain` object corresponding to the user's default
     /// keychain.
+    #[inline]
     pub fn default() -> Result<Self> {
         unsafe {
             let mut keychain = ptr::null_mut();
@@ -33,6 +36,16 @@
         }
     }
 
+    /// Creates a `SecKeychain` object corresponding to the user's default
+    /// keychain for the given domain.
+    pub fn default_for_domain(domain: SecPreferencesDomain) -> Result<Self> {
+        unsafe {
+            let mut keychain = ptr::null_mut();
+            cvt(SecKeychainCopyDomainDefault(domain, &mut keychain))?;
+            Ok(Self::wrap_under_create_rule(keychain))
+        }
+    }
+
     /// Opens a keychain from a file.
     pub fn open<P: AsRef<Path>>(path: P) -> Result<Self> {
         let path_name = path.as_ref().as_os_str().as_bytes();
@@ -66,6 +79,7 @@
     }
 
     /// Sets settings of the keychain.
+    #[inline]
     pub fn set_settings(&mut self, settings: &KeychainSettings) -> Result<()> {
         unsafe {
             cvt(SecKeychainSetSettings(
@@ -74,6 +88,33 @@
             ))
         }
     }
+
+    #[cfg(target_os = "macos")]
+    /// Disables the user interface for keychain services functions that
+    /// automatically display a user interface.
+    pub fn disable_user_interaction() -> Result<KeychainUserInteractionLock> {
+        let code = unsafe { SecKeychainSetUserInteractionAllowed(0u8) };
+
+        if code != errSecSuccess {
+            Err(Error::from_code(code))
+        } else {
+            Ok(KeychainUserInteractionLock)
+        }
+    }
+
+    #[cfg(target_os = "macos")]
+    /// Indicates whether keychain services functions that normally display a
+    /// user interaction are allowed to do so.
+    pub fn user_interaction_allowed() -> Result<bool> {
+        let mut state: Boolean = 0;
+        let code = unsafe { SecKeychainGetUserInteractionAllowed(&mut state) };
+
+        if code != errSecSuccess {
+            Err(Error::from_code(code))
+        } else {
+            Ok(state != 0)
+        }
+    }
 }
 
 /// A builder type to create new keychains.
@@ -86,11 +127,13 @@
 
 impl CreateOptions {
     /// Creates a new builder with default options.
+    #[inline(always)]
     pub fn new() -> Self {
         Self::default()
     }
 
     /// Sets the password to be used to protect the keychain.
+    #[inline]
     pub fn password(&mut self, password: &str) -> &mut Self {
         self.password = Some(password.into());
         self
@@ -98,12 +141,14 @@
 
     /// If set, the user will be prompted to provide a password used to
     /// protect the keychain.
+    #[inline(always)]
     pub fn prompt_user(&mut self, prompt_user: bool) -> &mut Self {
         self.prompt_user = prompt_user;
         self
     }
 
     /// Sets the access control applied to the keychain.
+    #[inline(always)]
     pub fn access(&mut self, access: SecAccess) -> &mut Self {
         self.access = Some(access);
         self
@@ -146,6 +191,7 @@
 
 impl KeychainSettings {
     /// Creates a new `KeychainSettings` with default settings.
+    #[inline]
     pub fn new() -> Self {
         Self(SecKeychainSettings {
             version: SEC_KEYCHAIN_SETTINGS_VERS1,
@@ -158,6 +204,7 @@
     /// If set, the keychain will automatically lock when the computer sleeps.
     ///
     /// Defaults to `false`.
+    #[inline(always)]
     pub fn set_lock_on_sleep(&mut self, lock_on_sleep: bool) {
         self.0.lockOnSleep = lock_on_sleep as Boolean;
     }
@@ -180,6 +227,26 @@
     }
 }
 
+impl Default for KeychainSettings {
+    #[inline(always)]
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[cfg(target_os = "macos")]
+#[must_use = "The user interaction is disabled for the lifetime of the returned object"]
+/// Automatically re-enables user interaction.
+pub struct KeychainUserInteractionLock;
+
+#[cfg(target_os = "macos")]
+impl Drop for KeychainUserInteractionLock {
+    #[inline(always)]
+    fn drop(&mut self) {
+        unsafe { SecKeychainSetUserInteractionAllowed(1u8) };
+    }
+}
+
 #[cfg(test)]
 mod test {
     use tempdir::TempDir;
@@ -197,4 +264,14 @@
 
         keychain.set_settings(&KeychainSettings::new()).unwrap();
     }
+
+    #[test]
+    fn disable_user_interaction() {
+        assert!(SecKeychain::user_interaction_allowed().unwrap());
+        {
+            let _lock = SecKeychain::disable_user_interaction().unwrap();
+            assert!(!SecKeychain::user_interaction_allowed().unwrap());
+        }
+        assert!(SecKeychain::user_interaction_allowed().unwrap());
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,6 +3,7 @@
 pub mod access;
 pub mod certificate;
 pub mod certificate_oids;
+pub mod code_signing;
 pub mod digest_transform;
 pub mod encrypt_transform;
 pub mod identity;
@@ -17,13 +18,13 @@
 
 #[cfg(test)]
 pub mod test {
-    use std::fs::File;
-    use std::io::prelude::*;
-    use std::path::Path;
-    use crate::os::macos::item::ItemSearchOptionsExt;
     use crate::identity::SecIdentity;
     use crate::item::{ItemClass, ItemSearchOptions, Reference, SearchResult};
+    use crate::os::macos::item::ItemSearchOptionsExt;
     use crate::os::macos::keychain::SecKeychain;
+    use std::fs::File;
+    use std::io::prelude::*;
+    use std::path::Path;
 
     pub fn identity(dir: &Path) -> SecIdentity {
         // FIXME https://github.com/rust-lang/rust/issues/30018
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/passwords.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/passwords.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/passwords.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/passwords.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,6 +28,7 @@
 }
 
 impl fmt::Debug for SecKeychainItemPassword {
+    #[cold]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         for _ in 0..self.data_len {
             f.write_char('•')?;
@@ -45,12 +46,14 @@
 
 impl Deref for SecKeychainItemPassword {
     type Target = [u8];
+    #[inline(always)]
     fn deref(&self) -> &Self::Target {
         self.as_ref()
     }
 }
 
 impl Drop for SecKeychainItemPassword {
+    #[inline]
     fn drop(&mut self) {
         unsafe {
             SecKeychainItemFreeContent(ptr::null_mut(), self.data as *mut _);
@@ -73,6 +76,7 @@
     }
 
     /// Delete this item from its keychain
+    #[inline]
     pub fn delete(self) {
         unsafe {
             SecKeychainItemDelete(self.as_CFTypeRef() as *mut _);
@@ -135,6 +139,7 @@
 /// * `port`: The TCP/IP port number.
 /// * `protocol`: The protocol associated with this password.
 /// * `authentication_type`: The authentication scheme used.
+#[allow(clippy::too_many_arguments)]
 pub fn find_internet_password(
     keychains: Option<&[SecKeychain]>,
     server: &str,
@@ -187,6 +192,7 @@
 
 impl SecKeychain {
     /// Find application password in this keychain
+    #[inline]
     pub fn find_generic_password(
         &self,
         service: &str,
@@ -196,6 +202,8 @@
     }
 
     /// Find internet password in this keychain
+    #[inline]
+    #[allow(clippy::too_many_arguments)]
     pub fn find_internet_password(
         &self,
         server: &str,
@@ -219,6 +227,7 @@
     }
 
     /// Update existing or add new internet password
+    #[allow(clippy::too_many_arguments)]
     pub fn set_internet_password(
         &self,
         server: &str,
@@ -275,6 +284,7 @@
     /// Add application password to the keychain, without checking if it exists already
     ///
     /// See `set_generic_password()`
+    #[inline]
     pub fn add_generic_password(
         &self,
         service: &str,
@@ -299,6 +309,8 @@
     /// Add internet password to the keychain, without checking if it exists already
     ///
     /// See `set_internet_password()`
+    #[inline]
+    #[allow(clippy::too_many_arguments)]
     pub fn add_internet_password(
         &self,
         server: &str,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/secure_transport.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/secure_transport.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/os/macos/secure_transport.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/os/macos/secure_transport.rs	2021-12-09 12:01:26.000000000 +0000
@@ -92,6 +92,7 @@
     ($($(#[$a:meta])* const $opt:ident: $get:ident & $set:ident,)*) => {
         $(
             $(#[$a])*
+            #[inline]
             fn $set(&mut self, value: bool) -> Result<()> {
                 unsafe {
                     cvt(SSLSetSessionOption(self.as_inner(),
@@ -101,6 +102,7 @@
             }
 
             $(#[$a])*
+            #[inline]
             fn $get(&self) -> Result<bool> {
                 let mut value = 0;
                 unsafe { cvt(SSLGetSessionOption(self.as_inner(), $opt, &mut value))?; }
@@ -259,8 +261,7 @@
         assert!(stream.server_auth_completed());
         let mut peer_trust = p!(stream.context().peer_trust2()).unwrap();
         p!(peer_trust.set_anchor_certificates(&[certificate()]));
-        let result = p!(peer_trust.evaluate());
-        assert!(result.success());
+        p!(peer_trust.evaluate_with_error());
 
         let mut stream = p!(stream.handshake());
         p!(stream.write_all(b"hello world!"));
@@ -269,6 +270,7 @@
     }
 
     #[test]
+    #[ignore]
     fn server_client_builders() {
         let listener = p!(TcpListener::bind("localhost:0"));
         let port = p!(listener.local_addr()).port();
@@ -299,6 +301,8 @@
 
     #[test]
     fn client_bad_cert() {
+        let _ = env_logger::try_init();
+
         let listener = p!(TcpListener::bind("localhost:0"));
         let port = p!(listener.local_addr()).port();
 
@@ -325,6 +329,7 @@
     }
 
     #[test]
+    #[ignore]
     fn client() {
         let listener = p!(TcpListener::bind("localhost:0"));
         let port = p!(listener.local_addr()).port();
@@ -577,6 +582,7 @@
     }
 
     #[test]
+    #[ignore]
     fn close() {
         let listener = p!(TcpListener::bind("localhost:0"));
         let port = p!(listener.local_addr()).port();
@@ -605,6 +611,7 @@
     }
 
     #[test]
+    #[ignore]
     fn short_read() {
         let listener = p!(TcpListener::bind("localhost:0"));
         let port = p!(listener.local_addr()).port();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/policy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/policy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/policy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/policy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,6 +18,7 @@
 unsafe impl Send for SecPolicy {}
 
 impl fmt::Debug for SecPolicy {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("SecPolicy").finish()
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/random.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/random.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/random.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/random.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,6 +10,7 @@
 unsafe impl Send for SecRandom {}
 
 impl Default for SecRandom {
+    #[inline(always)]
     fn default() -> Self {
         unsafe { Self(kSecRandomDefault) }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/secure_transport.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/secure_transport.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/secure_transport.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/secure_transport.rs	2021-12-09 12:01:26.000000000 +0000
@@ -94,7 +94,6 @@
 use std::io;
 use std::io::prelude::*;
 use std::marker::PhantomData;
-use std::mem;
 use std::panic::{self, AssertUnwindSafe};
 use std::ptr;
 use std::result;
@@ -104,9 +103,11 @@
 use crate::certificate::SecCertificate;
 use crate::cipher_suite::CipherSuite;
 use crate::identity::SecIdentity;
+use crate::import_export::Pkcs12ImportOptions;
 use crate::policy::SecPolicy;
-use crate::trust::{SecTrust, TrustResult};
+use crate::trust::SecTrust;
 use crate::{cvt, AsInner};
+use security_framework_sys::base::errSecParam;
 
 /// Specifies a side of a TLS session.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -142,6 +143,7 @@
 }
 
 impl<S> From<Error> for HandshakeError<S> {
+    #[inline(always)]
     fn from(err: Error) -> Self {
         Self::Failure(err)
     }
@@ -157,6 +159,7 @@
 }
 
 impl<S> From<Error> for ClientHandshakeError<S> {
+    #[inline(always)]
     fn from(err: Error) -> Self {
         Self::Failure(err)
     }
@@ -171,49 +174,58 @@
 
 impl<S> MidHandshakeSslStream<S> {
     /// Returns a shared reference to the inner stream.
+    #[inline(always)]
     pub fn get_ref(&self) -> &S {
         self.stream.get_ref()
     }
 
     /// Returns a mutable reference to the inner stream.
+    #[inline(always)]
     pub fn get_mut(&mut self) -> &mut S {
         self.stream.get_mut()
     }
 
     /// Returns a shared reference to the `SslContext` of the stream.
+    #[inline(always)]
     pub fn context(&self) -> &SslContext {
         self.stream.context()
     }
 
     /// Returns a mutable reference to the `SslContext` of the stream.
+    #[inline(always)]
     pub fn context_mut(&mut self) -> &mut SslContext {
         self.stream.context_mut()
     }
 
     /// Returns `true` iff `break_on_server_auth` was set and the handshake has
     /// progressed to that point.
+    #[inline(always)]
     pub fn server_auth_completed(&self) -> bool {
         self.error.code() == errSSLPeerAuthCompleted
     }
 
     /// Returns `true` iff `break_on_cert_requested` was set and the handshake
     /// has progressed to that point.
+    #[inline(always)]
     pub fn client_cert_requested(&self) -> bool {
         self.error.code() == errSSLClientCertRequested
     }
 
     /// Returns `true` iff the underlying stream returned an error with the
     /// `WouldBlock` kind.
+    #[inline(always)]
     pub fn would_block(&self) -> bool {
         self.error.code() == errSSLWouldBlock
     }
 
     /// Returns the error which caused the handshake interruption.
+    #[inline(always)]
     pub fn error(&self) -> &Error {
         &self.error
     }
 
     /// Restarts the handshake process.
+    #[inline(always)]
     pub fn handshake(self) -> result::Result<SslStream<S>, HandshakeError<S>> {
         self.stream.handshake()
     }
@@ -231,16 +243,19 @@
 
 impl<S> MidHandshakeClientBuilder<S> {
     /// Returns a shared reference to the inner stream.
+    #[inline(always)]
     pub fn get_ref(&self) -> &S {
         self.stream.get_ref()
     }
 
     /// Returns a mutable reference to the inner stream.
+    #[inline(always)]
     pub fn get_mut(&mut self) -> &mut S {
         self.stream.get_mut()
     }
 
     /// Returns the error which caused the handshake interruption.
+    #[inline(always)]
     pub fn error(&self) -> &Error {
         self.stream.error()
     }
@@ -291,27 +306,15 @@
                 trust.set_anchor_certificates(&certs)?;
                 trust.set_trust_anchor_certificates_only(self.trust_certs_only)?;
                 let policy =
-                    SecPolicy::create_ssl(SslProtocolSide::SERVER, domain.as_ref().map(|s| &**s));
+                    SecPolicy::create_ssl(SslProtocolSide::SERVER, domain.as_deref());
                 trust.set_policy(&policy)?;
-                let trusted = trust.evaluate()?;
-                match trusted {
-                    TrustResult::PROCEED | TrustResult::UNSPECIFIED => {
-                        result = stream.handshake();
-                        continue;
-                    }
-                    TrustResult::DENY => {
-                        let err = Error::from_code(errSecTrustSettingDeny);
-                        return Err(ClientHandshakeError::Failure(err));
-                    }
-                    TrustResult::RECOVERABLE_TRUST_FAILURE | TrustResult::FATAL_TRUST_FAILURE => {
-                        let err = Error::from_code(errSecNotTrusted);
-                        return Err(ClientHandshakeError::Failure(err));
-                    }
-                    TrustResult::INVALID | TrustResult::OTHER_ERROR | _ => {
-                        let err = Error::from_code(errSecBadReq);
-                        return Err(ClientHandshakeError::Failure(err));
-                    }
-                }
+                trust.evaluate_with_error().map_err(|error| {
+                    #[cfg(feature = "log")]
+                    log::warn!("SecTrustEvaluateWithError: {}", error.to_string());
+                    Error::from_code(error.code() as _)
+                })?;
+                result = stream.handshake();
+                continue;
             }
 
             let err = Error::from_code(stream.error().code());
@@ -424,6 +427,7 @@
 impl_TCFType!(SslContext, SSLContextRef, SSLContextGetTypeID);
 
 impl fmt::Debug for SslContext {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut builder = fmt.debug_struct("SslContext");
         if let Ok(state) = self.state() {
@@ -439,6 +443,7 @@
 impl AsInner for SslContext {
     type Inner = SSLContextRef;
 
+    #[inline(always)]
     fn as_inner(&self) -> SSLContextRef {
         self.0
     }
@@ -448,11 +453,13 @@
     ($($(#[$a:meta])* const $opt:ident: $get:ident & $set:ident,)*) => {
         $(
             $(#[$a])*
+            #[inline(always)]
             pub fn $set(&mut self, value: bool) -> Result<()> {
                 unsafe { cvt(SSLSetSessionOption(self.0, $opt, value as Boolean)) }
             }
 
             $(#[$a])*
+            #[inline]
             pub fn $get(&self) -> Result<bool> {
                 let mut value = 0;
                 unsafe { cvt(SSLGetSessionOption(self.0, $opt, &mut value))?; }
@@ -465,6 +472,7 @@
 impl SslContext {
     /// Creates a new `SslContext` for the specified side and type of SSL
     /// connection.
+    #[inline]
     pub fn new(side: SslProtocolSide, type_: SslConnectionType) -> Result<Self> {
         unsafe {
             let ctx = SSLCreateContext(kCFAllocatorDefault, side.0, type_.0);
@@ -480,6 +488,7 @@
     ///
     /// It is *highly* recommended to call this method before starting the
     /// handshake process.
+    #[inline]
     pub fn set_peer_domain_name(&mut self, peer_name: &str) -> Result<()> {
         unsafe {
             // SSLSetPeerDomainName doesn't need a null terminated string
@@ -531,6 +540,7 @@
     /// Transport to identify the peer of an SSL session. If the peer ID of
     /// this session matches that of a previously terminated session, the
     /// previous session can be resumed without requiring a full handshake.
+    #[inline]
     pub fn set_peer_id(&mut self, peer_id: &[u8]) -> Result<()> {
         unsafe {
             cvt(SSLSetPeerID(
@@ -599,6 +609,7 @@
     }
 
     /// Returns the cipher being used by the session.
+    #[inline]
     pub fn negotiated_cipher(&self) -> Result<CipherSuite> {
         unsafe {
             let mut cipher = 0;
@@ -610,11 +621,13 @@
     /// Sets the requirements for client certificates.
     ///
     /// Should only be called on server-side sessions.
+    #[inline]
     pub fn set_client_side_authenticate(&mut self, auth: SslAuthenticate) -> Result<()> {
         unsafe { cvt(SSLSetClientSideAuthenticate(self.0, auth.0)) }
     }
 
     /// Returns the state of client certificate processing.
+    #[inline]
     pub fn client_certificate_state(&self) -> Result<SslClientCertificateState> {
         let mut state = 0;
 
@@ -647,6 +660,7 @@
     }
 
     /// Returns the state of the session.
+    #[inline]
     pub fn state(&self) -> Result<SessionState> {
         unsafe {
             let mut state = 0;
@@ -656,6 +670,7 @@
     }
 
     /// Returns the protocol version being used by the session.
+    #[inline]
     pub fn negotiated_protocol_version(&self) -> Result<SslProtocol> {
         unsafe {
             let mut version = 0;
@@ -665,6 +680,7 @@
     }
 
     /// Returns the maximum protocol version allowed by the session.
+    #[inline]
     pub fn protocol_version_max(&self) -> Result<SslProtocol> {
         unsafe {
             let mut version = 0;
@@ -674,11 +690,13 @@
     }
 
     /// Sets the maximum protocol version allowed by the session.
+    #[inline]
     pub fn set_protocol_version_max(&mut self, max_version: SslProtocol) -> Result<()> {
         unsafe { cvt(SSLSetProtocolVersionMax(self.0, max_version.0)) }
     }
 
     /// Returns the minimum protocol version allowed by the session.
+    #[inline]
     pub fn protocol_version_min(&self) -> Result<SslProtocol> {
         unsafe {
             let mut version = 0;
@@ -688,6 +706,7 @@
     }
 
     /// Sets the minimum protocol version allowed by the session.
+    #[inline]
     pub fn set_protocol_version_min(&mut self, min_version: SslProtocol) -> Result<()> {
         unsafe { cvt(SSLSetProtocolVersionMin(self.0, min_version.0)) }
     }
@@ -800,6 +819,7 @@
 
     /// Returns the number of bytes which can be read without triggering a
     /// `read` call in the underlying stream.
+    #[inline]
     pub fn buffered_read_size(&self) -> Result<usize> {
         unsafe {
             let mut size = 0;
@@ -879,7 +899,7 @@
 }
 
 // the logic here is based off of libcurl's
-
+#[cold]
 fn translate_err(e: &io::Error) -> OSStatus {
     match e.kind() {
         io::ErrorKind::NotFound => errSSLClosedGraceful,
@@ -971,6 +991,7 @@
 }
 
 impl<S: fmt::Debug> fmt::Debug for SslStream<S> {
+    #[cold]
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("SslStream")
             .field("context", &self.ctx)
@@ -1011,21 +1032,25 @@
     }
 
     /// Returns a shared reference to the inner stream.
+    #[inline(always)]
     pub fn get_ref(&self) -> &S {
         &self.connection().stream
     }
 
     /// Returns a mutable reference to the underlying stream.
+    #[inline(always)]
     pub fn get_mut(&mut self) -> &mut S {
         &mut self.connection_mut().stream
     }
 
     /// Returns a shared reference to the `SslContext` of the stream.
+    #[inline(always)]
     pub fn context(&self) -> &SslContext {
         &self.ctx
     }
 
     /// Returns a mutable reference to the `SslContext` of the stream.
+    #[inline(always)]
     pub fn context_mut(&mut self) -> &mut SslContext {
         &mut self.ctx
     }
@@ -1048,7 +1073,7 @@
             let ret = SSLGetConnection(self.ctx.0, &mut conn);
             assert!(ret == errSecSuccess);
 
-            mem::transmute(conn)
+            &mut *(conn as *mut Connection<S>)
         }
     }
 
@@ -1058,10 +1083,11 @@
             let ret = SSLGetConnection(self.ctx.0, &mut conn);
             assert!(ret == errSecSuccess);
 
-            mem::transmute(conn)
+            &mut *(conn as *mut Connection<S>)
         }
     }
 
+    #[cold]
     fn check_panic(&mut self) {
         let conn = self.connection_mut();
         if let Some(err) = conn.panic.take() {
@@ -1069,6 +1095,7 @@
         }
     }
 
+    #[cold]
     fn get_error(&mut self, ret: OSStatus) -> io::Error {
         self.check_panic();
 
@@ -1166,6 +1193,7 @@
 }
 
 impl Default for ClientBuilder {
+    #[inline(always)]
     fn default() -> Self {
         Self::new()
     }
@@ -1173,6 +1201,7 @@
 
 impl ClientBuilder {
     /// Creates a new builder with default options.
+    #[inline]
     pub fn new() -> Self {
         Self {
             identity: None,
@@ -1193,13 +1222,23 @@
 
     /// Specifies the set of root certificates to trust when
     /// verifying the server's certificate.
+    #[inline]
     pub fn anchor_certificates(&mut self, certs: &[SecCertificate]) -> &mut Self {
         self.certs = certs.to_owned();
         self
     }
 
+    /// Add the certificate the set of root certificates to trust
+    /// when verifying the server's certificate.
+    #[inline]
+    pub fn add_anchor_certificate(&mut self, certs: &SecCertificate) -> &mut Self {
+        self.certs.push(certs.to_owned());
+        self
+    }
+
     /// Specifies whether to trust the built-in certificates in addition
     /// to specified anchor certificates.
+    #[inline(always)]
     pub fn trust_anchor_certificates_only(&mut self, only: bool) -> &mut Self {
         self.trust_certs_only = only;
         self
@@ -1213,12 +1252,14 @@
     /// certificates are trusted, *any* certificate for *any* site will be
     /// trusted for use. This includes expired certificates. This introduces
     /// significant vulnerabilities, and should only be used as a last resort.
+    #[inline(always)]
     pub fn danger_accept_invalid_certs(&mut self, noverify: bool) -> &mut Self {
         self.danger_accept_invalid_certs = noverify;
         self
     }
 
     /// Specifies whether to use Server Name Indication (SNI).
+    #[inline(always)]
     pub fn use_sni(&mut self, use_sni: bool) -> &mut Self {
         self.use_sni = use_sni;
         self
@@ -1231,6 +1272,7 @@
     /// You should think very carefully before using this method. If hostnames are not verified,
     /// *any* valid certificate for *any* site will be trusted for use. This introduces significant
     /// vulnerabilities, and should only be used as a last resort.
+    #[inline(always)]
     pub fn danger_accept_invalid_hostnames(
         &mut self,
         danger_accept_invalid_hostnames: bool,
@@ -1259,12 +1301,14 @@
     }
 
     /// Configure the minimum protocol that this client will support.
+    #[inline(always)]
     pub fn protocol_min(&mut self, min: SslProtocol) -> &mut Self {
         self.protocol_min = Some(min);
         self
     }
 
     /// Configure the minimum protocol that this client will support.
+    #[inline(always)]
     pub fn protocol_max(&mut self, max: SslProtocol) -> &mut Self {
         self.protocol_max = Some(max);
         self
@@ -1281,6 +1325,7 @@
     ///
     /// Defaults to `false`.
     #[cfg(feature = "session-tickets")]
+    #[inline(always)]
     pub fn enable_session_tickets(&mut self, enable: bool) -> &mut Self {
         self.enable_session_tickets = enable;
         self
@@ -1396,16 +1441,46 @@
         }
     }
 
+    /// Creates a new `ServerBuilder` which will use the identity
+    /// from the given PKCS #12 data.
+    ///
+    /// This operation fails if PKCS #12 file contains zero or more than one identity.
+    ///
+    /// This is a shortcut for the most common operation.
+    pub fn from_pkcs12(pkcs12_der: &[u8], passphrase: &str) -> Result<Self> {
+        let mut identities: Vec<(SecIdentity, Vec<SecCertificate>)> = Pkcs12ImportOptions::new()
+            .passphrase(passphrase)
+            .import(pkcs12_der)?
+            .into_iter()
+            .flat_map(|idendity| {
+                let certs = idendity.cert_chain.unwrap_or_default();
+                idendity.identity.map(|identity| (identity, certs))
+            })
+            .collect();
+        if identities.len() == 1 {
+            let (identity, certs) = identities.pop().unwrap();
+            Ok(ServerBuilder::new(&identity, &certs))
+        } else {
+            // This error code is not really helpful
+            Err(Error::from_code(errSecParam))
+        }
+    }
+
+    /// Create a SSL context for lower-level stream initialization.
+    pub fn new_ssl_context(&self) -> Result<SslContext> {
+        let mut ctx = SslContext::new(SslProtocolSide::SERVER, SslConnectionType::STREAM)?;
+        ctx.set_certificate(&self.identity, &self.certs)?;
+        Ok(ctx)
+    }
+
     /// Initiates a new SSL/TLS session over a stream.
     pub fn handshake<S>(&self, stream: S) -> Result<SslStream<S>>
     where
         S: Read + Write,
     {
-        let mut ctx = SslContext::new(SslProtocolSide::SERVER, SslConnectionType::STREAM)?;
-        ctx.set_certificate(&self.identity, &self.certs)?;
-        match ctx.handshake(stream) {
+        match self.new_ssl_context()?.handshake(stream) {
             Ok(stream) => Ok(stream),
-            Err(HandshakeError::Interrupted(stream)) => Err(stream.error().clone()),
+            Err(HandshakeError::Interrupted(stream)) => Err(*stream.error()),
             Err(HandshakeError::Failure(err)) => Err(err),
         }
     }
@@ -1420,6 +1495,12 @@
     use super::*;
 
     #[test]
+    fn server_builder_from_pkcs12() {
+        let pkcs12_der = include_bytes!("../test/server.p12");
+        ServerBuilder::from_pkcs12(pkcs12_der, "password123").unwrap();
+    }
+
+    #[test]
     fn connect() {
         let mut ctx = p!(SslContext::new(
             SslProtocolSide::CLIENT,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/trust.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/trust.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/trust.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/trust.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 //! Trust evaluation support.
 
-use core_foundation::array::CFArray;
+use core_foundation::array::{CFArray, CFArrayRef};
 use core_foundation::base::TCFType;
 use core_foundation_sys::base::{Boolean, CFIndex};
 
@@ -12,6 +12,7 @@
 use crate::cvt;
 use crate::key::SecKey;
 use crate::policy::SecPolicy;
+use core_foundation::error::{CFError, CFErrorRef};
 
 /// The result of trust evaluation.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -43,11 +44,9 @@
 
 impl TrustResult {
     /// Returns true if the result is "successful" - specifically `PROCEED` or `UNSPECIFIED`.
+    #[inline]
     pub fn success(self) -> bool {
-        match self {
-            Self::PROCEED | Self::UNSPECIFIED => true,
-            _ => false,
-        }
+        matches!(self, Self::PROCEED | Self::UNSPECIFIED)
     }
 }
 
@@ -67,8 +66,8 @@
         certs: &[SecCertificate],
         policies: &[SecPolicy],
     ) -> Result<Self> {
-        let cert_array = CFArray::from_CFTypes(&certs);
-        let policy_array = CFArray::from_CFTypes(&policies);
+        let cert_array = CFArray::from_CFTypes(certs);
+        let policy_array = CFArray::from_CFTypes(policies);
         let mut trust = ptr::null_mut();
         unsafe {
             cvt(SecTrustCreateWithCertificates(
@@ -82,7 +81,7 @@
 
     /// Sets additional anchor certificates used to validate trust.
     pub fn set_anchor_certificates(&mut self, certs: &[SecCertificate]) -> Result<()> {
-        let certs = CFArray::from_CFTypes(&certs);
+        let certs = CFArray::from_CFTypes(certs);
 
         unsafe {
             cvt(SecTrustSetAnchorCertificates(
@@ -92,19 +91,39 @@
         }
     }
 
+    /// Retrieves the anchor (root) certificates stored by macOS
+    #[cfg(target_os = "macos")]
+    pub fn copy_anchor_certificates() -> Result<Vec<SecCertificate>> {
+        let mut array: CFArrayRef = ptr::null();
+
+        unsafe {
+            cvt(SecTrustCopyAnchorCertificates(&mut array))?;
+        }
+
+        if array.is_null() {
+            return Ok(vec![]);
+        }
+
+        let array = unsafe { CFArray::<SecCertificate>::wrap_under_create_rule(array) };
+        Ok(array.into_iter().map(|c| c.clone()).collect())
+    }
+
     /// If set to `true`, only the certificates specified by
     /// `set_anchor_certificates` will be trusted, but not globally trusted
     /// certificates.
+    #[inline]
     pub fn set_trust_anchor_certificates_only(&mut self, only: bool) -> Result<()> {
         unsafe { cvt(SecTrustSetAnchorCertificatesOnly(self.0, only as Boolean)) }
     }
 
     /// Sets the policy used to evaluate trust.
+    #[inline]
     pub fn set_policy(&mut self, policy: &SecPolicy) -> Result<()> {
         unsafe { cvt(SecTrustSetPolicies(self.0, policy.as_CFTypeRef())) }
     }
 
     /// Returns the public key for a leaf certificate after it has been evaluated.
+    #[inline]
     pub fn copy_public_key(&mut self) -> Result<SecKey> {
         unsafe {
             Ok(SecKey::wrap_under_create_rule(SecTrustCopyPublicKey(
@@ -114,8 +133,9 @@
     }
 
     /// Evaluates trust.
-    // FIXME should return &mut self
+    #[deprecated(note = "use evaluate_with_error")]
     pub fn evaluate(&self) -> Result<TrustResult> {
+        #[allow(deprecated)]
         unsafe {
             let mut result = kSecTrustResultInvalid;
             cvt(SecTrustEvaluate(self.0, &mut result))?;
@@ -123,9 +143,38 @@
         }
     }
 
+    /// Evaluates trust. Requires macOS 10.14, otherwise it just calls `evaluate()`
+    pub fn evaluate_with_error(&self) -> Result<(), CFError> {
+        #[cfg(feature = "OSX_10_14")]
+        unsafe {
+            let mut error: CFErrorRef = ::std::ptr::null_mut();
+            if !SecTrustEvaluateWithError(self.0, &mut error) {
+                assert!(!error.is_null());
+                let error = CFError::wrap_under_create_rule(error);
+                return Err(error);
+            }
+            Ok(())
+        }
+        #[cfg(not(feature = "OSX_10_14"))]
+        #[allow(deprecated)]
+        {
+            use security_framework_sys::base::errSecNotTrusted;
+            use security_framework_sys::base::errSecTrustSettingDeny;
+
+            let code = match self.evaluate() {
+                Ok(res) if res.success() => return Ok(()),
+                Ok(TrustResult::DENY) => errSecTrustSettingDeny,
+                Ok(_) => errSecNotTrusted,
+                Err(err) => err.code(),
+            };
+            Err(cferror_from_osstatus(code))
+        }
+    }
+
     /// Returns the number of certificates in an evaluated certificate chain.
     ///
     /// Note: evaluate must first be called on the SecTrust.
+    #[inline(always)]
     pub fn certificate_count(&self) -> CFIndex {
         unsafe { SecTrustGetCertificateCount(self.0) }
     }
@@ -133,7 +182,9 @@
     /// Returns a specific certificate from the certificate chain used to evaluate trust.
     ///
     /// Note: evaluate must first be called on the SecTrust.
+    #[deprecated(note = "deprecated by Apple")]
     pub fn certificate_at_index(&self, ix: CFIndex) -> Option<SecCertificate> {
+        #[allow(deprecated)]
         unsafe {
             if self.certificate_count() <= ix {
                 None
@@ -145,6 +196,20 @@
     }
 }
 
+#[cfg(not(feature = "OSX_10_14"))]
+extern "C" {
+    fn CFErrorCreate(allocator: core_foundation_sys::base::CFAllocatorRef, domain: core_foundation_sys::string::CFStringRef, code: CFIndex, userInfo: core_foundation_sys::dictionary::CFDictionaryRef) -> CFErrorRef;
+}
+
+#[cfg(not(feature = "OSX_10_14"))]
+fn cferror_from_osstatus(code: core_foundation_sys::base::OSStatus) -> CFError {
+    unsafe {
+        let error = CFErrorCreate(ptr::null_mut(), core_foundation_sys::error::kCFErrorDomainOSStatus, code as _, ptr::null_mut());
+        assert!(!error.is_null());
+        CFError::wrap_under_create_rule(error)
+    }
+}
+
 #[cfg(test)]
 mod test {
     use crate::policy::SecPolicy;
@@ -153,6 +218,7 @@
     use crate::trust::SecTrust;
 
     #[test]
+    #[allow(deprecated)]
     fn create_with_certificates() {
         let cert = certificate();
         let ssl_policy = SecPolicy::create_ssl(SslProtocolSide::CLIENT, Some("certifi.io"));
@@ -161,6 +227,15 @@
     }
 
     #[test]
+    fn create_with_certificates_new() {
+        let cert = certificate();
+        let ssl_policy = SecPolicy::create_ssl(SslProtocolSide::CLIENT, Some("certifi.io"));
+        let trust = SecTrust::create_with_certificates(&[cert], &[ssl_policy]).unwrap();
+        assert!(trust.evaluate_with_error().is_err());
+    }
+
+    #[test]
+    #[allow(deprecated)]
     fn certificate_count_and_at_index() {
         let cert = certificate();
         let ssl_policy = SecPolicy::create_ssl(SslProtocolSide::CLIENT, Some("certifi.io"));
@@ -175,16 +250,37 @@
     }
 
     #[test]
-    fn certificate_at_index_out_of_bounds() {
+    #[allow(deprecated)]
+    fn certificate_count_and_at_index_new() {
         let cert = certificate();
         let ssl_policy = SecPolicy::create_ssl(SslProtocolSide::CLIENT, Some("certifi.io"));
         let trust = SecTrust::create_with_certificates(&[cert], &[ssl_policy]).unwrap();
+        assert!(trust.evaluate_with_error().is_err());
+
+        let count = trust.certificate_count();
+        assert_eq!(count, 1);
+
+        let cert_bytes = trust.certificate_at_index(0).unwrap().to_der();
+        assert_eq!(cert_bytes, certificate().to_der());
+    }
+
+    #[test]
+    #[allow(deprecated)]
+    fn certificate_at_index_out_of_bounds() {
+        let cert = certificate();
+        let ssl_policy = SecPolicy::create_ssl(SslProtocolSide::CLIENT, Some("certifi.io"));
+
+        let trust = SecTrust::create_with_certificates(&[cert.clone()], &[ssl_policy.clone()]).unwrap();
         trust.evaluate().unwrap();
+        assert!(trust.certificate_at_index(1).is_none());
 
+        let trust = SecTrust::create_with_certificates(&[cert], &[ssl_policy]).unwrap();
+        assert!(trust.evaluate_with_error().is_err());
         assert!(trust.certificate_at_index(1).is_none());
     }
 
     #[test]
+    #[allow(deprecated)]
     fn set_policy() {
         let cert = certificate();
         let ssl_policy = SecPolicy::create_ssl(SslProtocolSide::CLIENT, Some("certifi.io.bogus"));
@@ -193,4 +289,14 @@
         trust.set_policy(&ssl_policy).unwrap();
         assert_eq!(trust.evaluate().unwrap().success(), false)
     }
+
+    #[test]
+    fn set_policy_new() {
+        let cert = certificate();
+        let ssl_policy = SecPolicy::create_ssl(SslProtocolSide::CLIENT, Some("certifi.io.bogus"));
+        let mut trust = SecTrust::create_with_certificates(&[cert], &[ssl_policy]).unwrap();
+        let ssl_policy = SecPolicy::create_ssl(SslProtocolSide::CLIENT, Some("certifi.io"));
+        trust.set_policy(&ssl_policy).unwrap();
+        assert!(trust.evaluate_with_error().is_err());
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/trust_settings.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/trust_settings.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework/src/trust_settings.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework/src/trust_settings.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,12 +28,13 @@
     System,
 }
 
-impl Into<SecTrustSettingsDomain> for Domain {
-    fn into(self) -> SecTrustSettingsDomain {
-        match self {
-            Self::User => kSecTrustSettingsDomainUser,
-            Self::Admin => kSecTrustSettingsDomainAdmin,
-            Self::System => kSecTrustSettingsDomainSystem,
+impl From<Domain> for SecTrustSettingsDomain {
+    #[inline]
+    fn from (domain: Domain) -> SecTrustSettingsDomain {
+        match domain {
+            Domain::User => kSecTrustSettingsDomainUser,
+            Domain::Admin => kSecTrustSettingsDomainAdmin,
+            Domain::System => kSecTrustSettingsDomainSystem,
         }
     }
 }
@@ -86,6 +87,7 @@
     ///
     /// Then you can call `tls_trust_settings_for_certificate()` with a given certificate
     /// to learn what the aggregate trust setting for that certificate within this domain.
+    #[inline(always)]
     pub fn new(domain: Domain) -> Self {
         Self { domain }
     }
@@ -142,10 +144,7 @@
                     .find(policy_name_key.as_CFTypeRef() as *const _)
                     .map(|name| unsafe { CFString::wrap_under_get_rule(*name as *const _) });
 
-                match maybe_name {
-                    Some(ref name) if name != &ssl_policy_name => true,
-                    _ => false,
-                }
+                matches!(maybe_name, Some(ref name) if name != &ssl_policy_name)
             };
 
             if is_not_ssl_policy {
@@ -164,7 +163,7 @@
             // "Note that an empty Trust Settings array means "always trust this cert,
             //  with a resulting kSecTrustSettingsResult of kSecTrustSettingsResultTrustRoot"."
             let trust_result = TrustSettingsForCertificate::new(maybe_trust_result
-                .unwrap_or(i64::from(kSecTrustSettingsResultTrustRoot)));
+                .unwrap_or_else(|| i64::from(kSecTrustSettingsResultTrustRoot)));
 
             match trust_result {
                 TrustSettingsForCertificate::Unspecified |
@@ -189,6 +188,7 @@
 impl Iterator for TrustSettingsIter {
     type Item = SecCertificate;
 
+    #[inline]
     fn next(&mut self) -> Option<Self::Item> {
         if self.index >= self.array.len() {
             None
@@ -200,6 +200,7 @@
         }
     }
 
+    #[inline]
     fn size_hint(&self) -> (usize, Option<usize>) {
         let left = (self.array.len() as usize).saturating_sub(self.index as usize);
         (left, Some(left))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"d2907a84284e6d89a3c9e9e093e7db9667aeadfd54713b3817a5994ab21fa73b","README.md":"a2bc9b1505a12dc597791b8e9c425ee842b53623bb7c077920efe546101425a5","src/access.rs":"5a3793ee3b77360f183404c1543111d6e96f5a0728f7ebdf3f6112594d9c4deb","src/authorization.rs":"82823dc5a60a7cd23bd5ee551685dd2fdc3744ab6563d838a9def393b4bba235","src/base.rs":"9b66054d49c5dcb63ff98966ffc413e8eb01ee417fbbd7ec8394bf4b86fd3645","src/certificate.rs":"de552c891612a696ef18586c7b5f7e174cb185c6e283d7f83d3984446f5df569","src/certificate_oids.rs":"67f6b691925133c2501e0be31aea514b3ef0e9d382281cb283bd9aa6614dc580","src/cipher_suite.rs":"000a59626c6ef7e5b40d294d837746755ad24dff26f5ac39ef77ca0d0b05253b","src/digest_transform.rs":"230c1ca843df534de6d5ea33d623781c0e5fac6063f472b727b118a5abea99d2","src/encrypt_transform.rs":"0992ad3ac4da00e31bc3fc481ec94e35b37f2816903872bfe9a7ef0e7547c318","src/identity.rs":"7aa0472bbcb50fe1df6237d85a57cbfa67e5671d0b37d2a32803027b94724c79","src/import_export.rs":"6b55d03359e8b46dde9f8cb19436c67cdb412c1a1434c0d5bd22a165f047c628","src/item.rs":"48f76033843e50d78987b7dee44cb59c91ec5a05a91fddf00b4e5c5055c2570d","src/key.rs":"e871affc912075bfa38ec7a4b0915de149337d5337c5f561bbce1a001adbc3fe","src/keychain.rs":"04434beafb0f308f2b23363c229cf40410f13203ef67da3f396f3dc89b969516","src/keychain_item.rs":"ad0020b5df4d9754ef714c7a6d914ffca762ac7d617f768b37cf2cd75e7d76da","src/lib.rs":"ddfb42ff4387d17edf4e9e9e659acc3af86e93872b0d08e284bfae5d7f168064","src/policy.rs":"27d518b396f8c9d0a1d730bf7fa157b9ac9965768bdac19f105b32fad2d55264","src/random.rs":"4a9104ef3644d870d50cf3239bf690cd448225fc267214538c4f5bdb1e669052","src/secure_transport.rs":"43fb5dbc912e1dc1f570fcade35046d3def2cd61273916f11a8b2ec827b7b16d","src/transform.rs":"4768b1f14ad8e72c696c5c68bfddc7cc39caa223caf081c1ff119feeddc9733f","src/trust.rs":"8cb4cde312812d0fae693bf8f7493b2c4eb653508ffd7ac60175846c5b93a21d","src/trust_settings.rs":"18fa1351bc6e143065149b89c08390306346ea0d39c0b0deb619e0492d034f56"},"package":"f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"}
\ No newline at end of file
+{"files":{"Cargo.toml":"6a102faa4db7910cb53433d9b1fed8a507701e2331db0f48feb2044b5611bbd3","README.md":"ff1d022f35ff76531a361ad421ba7ee61ce186dc6516f72fc819ec4b2a5567a4","src/access.rs":"5a3793ee3b77360f183404c1543111d6e96f5a0728f7ebdf3f6112594d9c4deb","src/authorization.rs":"82823dc5a60a7cd23bd5ee551685dd2fdc3744ab6563d838a9def393b4bba235","src/base.rs":"9687c28b6df508f3a65f77f67f2fa14169c950887fdd900fb9fc308ef55c65f6","src/certificate.rs":"31b02418c40fea1bec73bcdbb86f2d2340ca3227714df3f5ba5a41573425fd84","src/certificate_oids.rs":"67f6b691925133c2501e0be31aea514b3ef0e9d382281cb283bd9aa6614dc580","src/cipher_suite.rs":"c647ef22dd4a48ecab47f449d257b5372558cc2f30aee0927bf4793048bb7259","src/code_signing.rs":"1120f85df71179a2261afcbbd4cf6d0c0c18c164f9b6d2c1f912fb58194ed23a","src/digest_transform.rs":"230c1ca843df534de6d5ea33d623781c0e5fac6063f472b727b118a5abea99d2","src/encrypt_transform.rs":"0992ad3ac4da00e31bc3fc481ec94e35b37f2816903872bfe9a7ef0e7547c318","src/identity.rs":"90d90db56ae650113bdb09743882b62cd426bca50be5ac2fb99e9375a932d91b","src/import_export.rs":"4efb4c41581ccdc16411e2b3a068a02a0b0ef68ebf689014240e4916ebab768e","src/item.rs":"813fc1657da9df64f72a2f994ec4c45cd3a9d638154e6401cec4bd3c9062de2c","src/key.rs":"f3ac6c47fc997a525209141b006568e8f632e1c50d1cf4832ca1de125ba7ba84","src/keychain.rs":"b1c1a5d5bab31e3658b4bcfa501d8e96f15cb76f38e15d1b86ed1edfc728b992","src/keychain_item.rs":"ac7be52b5e055f934379048623c0d68cd5e24a0cf9436fa0dcd9d66c2a0598ec","src/lib.rs":"5dcb0bc0a1c9837998678bf3d36cf648d1cc410bcb8f9dc89d7049fc585308a5","src/policy.rs":"27d518b396f8c9d0a1d730bf7fa157b9ac9965768bdac19f105b32fad2d55264","src/random.rs":"4a9104ef3644d870d50cf3239bf690cd448225fc267214538c4f5bdb1e669052","src/secure_transport.rs":"a120ea7bb3381f2fea7dde8435dd24032e26a905e8cd20b53c1b87053257597f","src/transform.rs":"4768b1f14ad8e72c696c5c68bfddc7cc39caa223caf081c1ff119feeddc9733f","src/trust.rs":"2dea1dc8e07c2af4bb31a508f5074d2a3d5f1ac16cc4a8ccd13f027aa5cc585f","src/trust_settings.rs":"18fa1351bc6e143065149b89c08390306346ea0d39c0b0deb619e0492d034f56"},"package":"a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "security-framework-sys"
-version = "2.0.0"
+version = "2.4.2"
 authors = ["Steven Fackler <sfackler@gmail.com>", "Kornel <kornel@geekhood.net>"]
 description = "Apple `Security.framework` low-level FFI bindings"
 homepage = "https://lib.rs/crates/security-framework-sys"
@@ -26,16 +26,17 @@
 [package.metadata.docs.rs]
 targets = ["x86_64-apple-darwin", "aarch64-apple-ios"]
 [dependencies.core-foundation-sys]
-version = "0.8"
+version = "0.8.2"
 
 [dependencies.libc]
-version = "0.2.47"
+version = "0.2.100"
 
 [features]
 OSX_10_10 = ["OSX_10_9"]
 OSX_10_11 = ["OSX_10_10"]
 OSX_10_12 = ["OSX_10_11"]
 OSX_10_13 = ["OSX_10_12"]
+OSX_10_14 = ["OSX_10_13"]
 OSX_10_9 = []
 default = ["OSX_10_9"]
 [badges.maintenance]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
-# rust-security-framework
+# macOS/iOS Security framework for Rust
 
 [![Latest Version](https://img.shields.io/crates/v/security-framework.svg)](https://lib.rs/crates/security-framework)
 
-[Documentation](https://kornelski.github.io/rust-security-framework/doc/security_framework/)
+[Documentation](https://docs.rs/security-framework)
 
 Bindings to the Apple's `Security.framework`. Allows use of TLS and Keychain from Rust.
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/base.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/base.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/base.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/base.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 use core_foundation_sys::base::OSStatus;
+#[cfg(target_os = "macos")]
 use core_foundation_sys::string::CFStringRef;
 use std::os::raw::c_void;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/certificate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/certificate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/certificate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/certificate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,15 @@
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 use core_foundation_sys::array::CFArrayRef;
 use core_foundation_sys::base::{CFAllocatorRef, CFTypeID, OSStatus};
 use core_foundation_sys::data::CFDataRef;
+#[cfg(target_os = "macos")]
 use core_foundation_sys::dictionary::CFDictionaryRef;
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 use core_foundation_sys::error::CFErrorRef;
 use core_foundation_sys::string::CFStringRef;
 
-use crate::base::{SecCertificateRef, SecKeyRef};
+use crate::base::SecCertificateRef;
+use crate::base::SecKeyRef;
 
 extern "C" {
     #[cfg(target_os = "macos")]
@@ -43,11 +47,29 @@
         certificate: SecCertificateRef,
         common_name: *mut CFStringRef,
     ) -> OSStatus;
+    pub fn SecCertificateCopyEmailAddresses(
+        certificate: SecCertificateRef,
+        email_addresses: *mut CFArrayRef,
+    ) -> OSStatus;
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    pub fn SecCertificateCopyNormalizedIssuerSequence(certificate: SecCertificateRef) -> CFDataRef;
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    pub fn SecCertificateCopyNormalizedSubjectSequence(certificate: SecCertificateRef)
+        -> CFDataRef;
     #[cfg(target_os = "macos")]
+    #[cfg_attr(target_arch = "aarch64", link_name = "SecCertificateCopyPublicKey$LEGACYMAC")]
+    #[deprecated(note = "Deprecated by Apple. May not work any more. Use SecCertificateCopyKey")]
     pub fn SecCertificateCopyPublicKey(
         certificate: SecCertificateRef,
         key: *mut SecKeyRef,
     ) -> OSStatus;
+    #[cfg(any(feature = "OSX_10_14", target_os = "ios"))]
+    pub fn SecCertificateCopyKey(certificate: SecCertificateRef) -> SecKeyRef;
+    #[cfg(any(feature = "OSX_10_13", target_os = "ios"))]
+    pub fn SecCertificateCopySerialNumberData(
+        certificate: SecCertificateRef,
+        error: *mut CFErrorRef,
+    ) -> CFDataRef;
     #[cfg(target_os = "macos")]
     pub fn SecCertificateCopyValues(
         certificate: SecCertificateRef,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/cipher_suite.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/cipher_suite.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/cipher_suite.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/cipher_suite.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,12 @@
-#[cfg(not(target_os = "ios"))]
-pub type SSLCipherSuite = u32;
-
 #[cfg(target_os = "ios")]
 pub type SSLCipherSuite = u16;
 
+#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
+pub type SSLCipherSuite = u16;
+
+#[cfg(all(target_os = "macos", not(target_arch = "aarch64")))]
+pub type SSLCipherSuite = u32;
+
 pub const SSL_NULL_WITH_NULL_NULL: SSLCipherSuite = 0x0000;
 pub const SSL_RSA_WITH_NULL_MD5: SSLCipherSuite = 0x0001;
 pub const SSL_RSA_WITH_NULL_SHA: SSLCipherSuite = 0x0002;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/code_signing.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/code_signing.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/code_signing.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/code_signing.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+use core_foundation_sys::base::CFTypeID;
+use core_foundation_sys::base::OSStatus;
+use core_foundation_sys::dictionary::CFDictionaryRef;
+use core_foundation_sys::string::CFStringRef;
+use core_foundation_sys::url::CFURLRef;
+
+pub enum OpaqueSecRequirementRef {}
+pub type SecRequirementRef = *mut OpaqueSecRequirementRef;
+
+pub enum OpaqueSecCodeRef {}
+pub type SecCodeRef = *mut OpaqueSecCodeRef;
+
+pub enum OpaqueSecStaticCodeRef {}
+pub type SecStaticCodeRef = *mut OpaqueSecStaticCodeRef;
+
+pub type SecCSFlags = u32;
+pub const kSecCSCheckAllArchitectures: SecCSFlags = 1 << 0;
+pub const kSecCSDoNotValidateExecutable: SecCSFlags = 1 << 1;
+pub const kSecCSDoNotValidateResources: SecCSFlags = 1 << 2;
+pub const kSecCSBasicValidateOnly: SecCSFlags =
+    kSecCSDoNotValidateExecutable | kSecCSDoNotValidateResources;
+pub const kSecCSCheckNestedCode: SecCSFlags = 1 << 3;
+pub const kSecCSStrictValidate: SecCSFlags = 1 << 4;
+pub const kSecCSFullReport: SecCSFlags = 1 << 5;
+pub const kSecCSCheckGatekeeperArchitectures: SecCSFlags = (1 << 6) | kSecCSCheckAllArchitectures;
+pub const kSecCSRestrictSymlinks: SecCSFlags = 1 << 7;
+pub const kSecCSRestrictToAppLike: SecCSFlags = 1 << 8;
+pub const kSecCSRestrictSidebandData: SecCSFlags = 1 << 9;
+pub const kSecCSUseSoftwareSigningCert: SecCSFlags = 1 << 10;
+pub const kSecCSValidatePEH: SecCSFlags = 1 << 11;
+pub const kSecCSSingleThreaded: SecCSFlags = 1 << 12;
+// 13 - 15 are unused
+// This is only available in macOS 11.3:
+// pub const kSecCSAllowNetworkAccess: SecCSFlags = 1 << 16;
+// 17 - 25 are unused
+pub const kSecCSQuickCheck: SecCSFlags = 1 << 26;
+pub const kSecCSCheckTrustedAnchors: SecCSFlags = 1 << 27;
+pub const kSecCSReportProgress: SecCSFlags = 1 << 28;
+pub const kSecCSNoNetworkAccess: SecCSFlags = 1 << 29;
+pub const kSecCSEnforceRevocationChecks: SecCSFlags = 1 << 30;
+pub const kSecCSConsiderExpiration: SecCSFlags = 1 << 31;
+
+extern "C" {
+    pub static kSecGuestAttributeArchitecture: CFStringRef;
+    pub static kSecGuestAttributeAudit: CFStringRef;
+    pub static kSecGuestAttributeCanonical: CFStringRef;
+    pub static kSecGuestAttributeDynamicCode: CFStringRef;
+    pub static kSecGuestAttributeDynamicCodeInfoPlist: CFStringRef;
+    pub static kSecGuestAttributeHash: CFStringRef;
+    pub static kSecGuestAttributeMachPort: CFStringRef;
+    pub static kSecGuestAttributePid: CFStringRef;
+    pub static kSecGuestAttributeSubarchitecture: CFStringRef;
+
+    pub fn SecCodeGetTypeID() -> CFTypeID;
+    pub fn SecStaticCodeGetTypeID() -> CFTypeID;
+    pub fn SecRequirementGetTypeID() -> CFTypeID;
+
+    pub fn SecCodeCheckValidity(
+        code: SecCodeRef,
+        flags: SecCSFlags,
+        requirement: SecRequirementRef,
+    ) -> OSStatus;
+
+    pub fn SecCodeCopyGuestWithAttributes(
+        host: SecCodeRef,
+        attrs: CFDictionaryRef,
+        flags: SecCSFlags,
+        guest: *mut SecCodeRef,
+    ) -> OSStatus;
+
+    pub fn SecCodeCopyPath(
+        code: SecStaticCodeRef,
+        flags: SecCSFlags,
+        path: *mut CFURLRef,
+    ) -> OSStatus;
+
+    pub fn SecCodeCopySelf(flags: SecCSFlags, out: *mut SecCodeRef) -> OSStatus;
+
+    pub fn SecRequirementCreateWithString(
+        text: CFStringRef,
+        flags: SecCSFlags,
+        requirement: *mut SecRequirementRef,
+    ) -> OSStatus;
+
+    pub fn SecStaticCodeCheckValidity(
+        code: SecStaticCodeRef,
+        flags: SecCSFlags,
+        requirement: SecRequirementRef,
+    ) -> OSStatus;
+
+    pub fn SecStaticCodeCreateWithPath(
+        path: CFURLRef,
+        flags: SecCSFlags,
+        code: *mut SecStaticCodeRef,
+    ) -> OSStatus;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/identity.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/identity.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/identity.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/identity.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,6 @@
-use core_foundation_sys::base::{CFTypeID, CFTypeRef, OSStatus};
+#[cfg(target_os = "macos")]
+use core_foundation_sys::base::CFTypeRef;
+use core_foundation_sys::base::{CFTypeID, OSStatus};
 
 use crate::base::{SecCertificateRef, SecIdentityRef, SecKeyRef};
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/import_export.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/import_export.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/import_export.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/import_export.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,14 @@
 use core_foundation_sys::array::CFArrayRef;
-use core_foundation_sys::base::{CFTypeRef, OSStatus};
+#[cfg(target_os = "macos")]
+use core_foundation_sys::base::CFTypeRef;
+use core_foundation_sys::base::OSStatus;
 use core_foundation_sys::data::CFDataRef;
 use core_foundation_sys::dictionary::CFDictionaryRef;
 use core_foundation_sys::string::CFStringRef;
+#[cfg(target_os = "macos")]
 use std::os::raw::c_uint;
 
+#[cfg(target_os = "macos")]
 use crate::base::{SecAccessRef, SecKeychainRef};
 
 #[cfg(target_os = "macos")]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/item.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/item.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/item.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/item.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,3 @@
-use core_foundation_sys::base::{CFTypeRef, OSStatus};
-use core_foundation_sys::dictionary::CFDictionaryRef;
 use core_foundation_sys::string::CFStringRef;
 
 extern "C" {
@@ -11,6 +9,7 @@
     pub static kSecClassIdentity: CFStringRef;
 
     pub static kSecMatchLimit: CFStringRef;
+    pub static kSecMatchLimitAll: CFStringRef;
 
     pub static kSecReturnData: CFStringRef;
     pub static kSecReturnAttributes: CFStringRef;
@@ -43,5 +42,6 @@
     #[cfg(feature = "OSX_10_9")]
     pub static kSecAttrKeyTypeEC: CFStringRef;
 
-    pub fn SecItemCopyMatching(query: CFDictionaryRef, result: *mut CFTypeRef) -> OSStatus;
+    pub static kSecAttrAccessGroup: CFStringRef;
+    pub static kSecAttrAccessGroupToken: CFStringRef;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/keychain_item.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/keychain_item.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/keychain_item.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/keychain_item.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,26 @@
 use crate::base::{SecKeychainAttributeList, SecKeychainItemRef};
-use core_foundation_sys::base::{CFTypeID, OSStatus};
+use core_foundation_sys::base::{CFTypeID, CFTypeRef, OSStatus};
 use core_foundation_sys::dictionary::CFDictionaryRef;
 use std::os::raw::c_void;
 
 extern "C" {
+
+    /// Returns the unique identifier of the opaque type to which a keychain item object belongs.
     pub fn SecKeychainItemGetTypeID() -> CFTypeID;
 
-    pub fn SecKeychainItemDelete(itemRef: SecKeychainItemRef) -> OSStatus;
+    /// Adds one or more items to a keychain.
+    pub fn SecItemAdd(attributes: CFDictionaryRef, result: *mut CFTypeRef) -> OSStatus;
+
+    /// Returns one or more keychain items that match a search query, or copies attributes of specific keychain items.
+    pub fn SecItemCopyMatching(query: CFDictionaryRef, result: *mut CFTypeRef) -> OSStatus;
 
+    /// Modifies items that match a search query.
     pub fn SecItemUpdate(query: CFDictionaryRef, attributesToUpdate: CFDictionaryRef) -> OSStatus;
 
+    /// Deletes items that match a search query.
+    pub fn SecItemDelete(query: CFDictionaryRef) -> OSStatus;
+
+    /// # Legacy API
     pub fn SecKeychainItemModifyAttributesAndData(
         itemRef: SecKeychainItemRef,
         attrList: *const SecKeychainAttributeList,
@@ -21,4 +32,6 @@
         attrList: *mut SecKeychainAttributeList,
         data: *mut c_void,
     ) -> OSStatus;
+
+    pub fn SecKeychainItemDelete(itemRef: SecKeychainItemRef) -> OSStatus;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/keychain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/keychain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/keychain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/keychain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,11 @@
-use core_foundation_sys::base::{Boolean, CFTypeID, CFTypeRef, OSStatus};
+#[cfg(target_os = "macos")]
+use core_foundation_sys::base::CFTypeRef;
+use core_foundation_sys::base::{Boolean, CFTypeID, OSStatus};
 use std::os::raw::{c_char, c_uint, c_void};
 
-use crate::base::{SecAccessRef, SecKeychainItemRef, SecKeychainRef};
+#[cfg(target_os = "macos")]
+use crate::base::SecKeychainItemRef;
+use crate::base::{SecAccessRef, SecKeychainRef};
 
 pub const SEC_KEYCHAIN_SETTINGS_VERS1: c_uint = 1;
 
@@ -29,6 +33,7 @@
 
 #[repr(u32)]
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
+#[allow(clippy::upper_case_acronyms)]
 pub enum SecProtocolType {
     FTP = char_lit!(b"ftp "),
     FTPAccount = char_lit!(b"ftpa"),
@@ -69,6 +74,7 @@
 
 #[repr(u32)]
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
+#[allow(clippy::upper_case_acronyms)]
 pub enum SecAuthenticationType {
     // [sic] Apple has got two related enums each with a different endianness!
     NTLM = char_lit_swapped!(b"ntlm"),
@@ -82,9 +88,22 @@
     Any = 0,
 }
 
+#[repr(i32)]
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum SecPreferencesDomain {
+    User = 0,
+    System = 1,
+    Common = 2,
+    Dynamic = 3,
+}
+
 extern "C" {
     pub fn SecKeychainGetTypeID() -> CFTypeID;
     pub fn SecKeychainCopyDefault(keychain: *mut SecKeychainRef) -> OSStatus;
+    pub fn SecKeychainCopyDomainDefault(
+        domain: SecPreferencesDomain,
+        keychain: *mut SecKeychainRef,
+    ) -> OSStatus;
     pub fn SecKeychainCreate(
         pathName: *const c_char,
         passwordLength: c_uint,
@@ -166,4 +185,10 @@
         keychain: SecKeychainRef,
         newSettings: *const SecKeychainSettings,
     ) -> OSStatus;
+
+    #[cfg(target_os = "macos")]
+    pub fn SecKeychainGetUserInteractionAllowed(state: *mut Boolean) -> OSStatus;
+
+    #[cfg(target_os = "macos")]
+    pub fn SecKeychainSetUserInteractionAllowed(state: Boolean) -> OSStatus;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/key.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/key.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/key.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/key.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,9 +2,14 @@
 use core_foundation_sys::data::CFDataRef;
 use core_foundation_sys::dictionary::CFDictionaryRef;
 use core_foundation_sys::error::CFErrorRef;
+#[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+use core_foundation_sys::string::CFStringRef;
 
 use crate::base::SecKeyRef;
 
+#[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+pub type SecKeyAlgorithm = CFStringRef;
+
 extern "C" {
     pub fn SecKeyGetTypeID() -> CFTypeID;
 
@@ -19,4 +24,131 @@
     pub fn SecKeyCopyExternalRepresentation(key: SecKeyRef, error: *mut CFErrorRef) -> CFDataRef;
     #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
     pub fn SecKeyCopyAttributes(key: SecKeyRef) -> CFDictionaryRef;
+
+    #[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+    pub fn SecKeyCreateSignature(
+        key: SecKeyRef,
+        algorithm: SecKeyAlgorithm,
+        dataToSign: CFDataRef,
+        error: *mut CFErrorRef,
+    ) -> CFDataRef;
+}
+
+#[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+macro_rules! names {
+    ($($i:ident => $x:ident),*) => {
+        extern "C" {
+            $(pub static $x: SecKeyAlgorithm;)*
+        }
+
+        pub enum Algorithm {
+            $( $i, )*
+            #[doc(hidden)]
+            _NonExhaustive,
+        }
+
+        impl From<Algorithm> for SecKeyAlgorithm {
+            fn from(m: Algorithm) -> Self {
+                unsafe { match m {
+                    $( Algorithm::$i => $x, )*
+                    Algorithm::_NonExhaustive => kSecKeyAlgorithmRSASignatureMessagePSSSHA512,
+                } }
+            }
+        }
+    }
+}
+
+#[cfg(any(feature = "OSX_10_12", target_os = "ios"))]
+names! {
+    ECIESEncryptionStandardX963SHA1AESGCM => kSecKeyAlgorithmECIESEncryptionStandardX963SHA1AESGCM,
+    ECIESEncryptionStandardX963SHA224AESGCM => kSecKeyAlgorithmECIESEncryptionStandardX963SHA224AESGCM,
+    ECIESEncryptionStandardX963SHA256AESGCM => kSecKeyAlgorithmECIESEncryptionStandardX963SHA256AESGCM,
+    ECIESEncryptionStandardX963SHA384AESGCM => kSecKeyAlgorithmECIESEncryptionStandardX963SHA384AESGCM,
+    ECIESEncryptionStandardX963SHA512AESGCM => kSecKeyAlgorithmECIESEncryptionStandardX963SHA512AESGCM,
+
+    ECIESEncryptionStandardVariableIVX963SHA224AESGCM => kSecKeyAlgorithmECIESEncryptionStandardVariableIVX963SHA224AESGCM,
+    ECIESEncryptionStandardVariableIVX963SHA256AESGCM => kSecKeyAlgorithmECIESEncryptionStandardVariableIVX963SHA256AESGCM,
+    ECIESEncryptionStandardVariableIVX963SHA384AESGCM => kSecKeyAlgorithmECIESEncryptionStandardVariableIVX963SHA384AESGCM,
+    ECIESEncryptionStandardVariableIVX963SHA512AESGCM => kSecKeyAlgorithmECIESEncryptionStandardVariableIVX963SHA512AESGCM,
+
+    ECIESEncryptionCofactorVariableIVX963SHA224AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorVariableIVX963SHA224AESGCM,
+    ECIESEncryptionCofactorVariableIVX963SHA256AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorVariableIVX963SHA256AESGCM,
+    ECIESEncryptionCofactorVariableIVX963SHA384AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorVariableIVX963SHA384AESGCM,
+    ECIESEncryptionCofactorVariableIVX963SHA512AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorVariableIVX963SHA512AESGCM,
+
+    ECIESEncryptionCofactorX963SHA1AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorX963SHA1AESGCM,
+    ECIESEncryptionCofactorX963SHA224AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorX963SHA224AESGCM,
+    ECIESEncryptionCofactorX963SHA256AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorX963SHA256AESGCM,
+    ECIESEncryptionCofactorX963SHA384AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorX963SHA384AESGCM,
+    ECIESEncryptionCofactorX963SHA512AESGCM => kSecKeyAlgorithmECIESEncryptionCofactorX963SHA512AESGCM,
+
+    ECDSASignatureRFC4754 => kSecKeyAlgorithmECDSASignatureRFC4754,
+
+    ECDSASignatureDigestX962 => kSecKeyAlgorithmECDSASignatureDigestX962,
+    ECDSASignatureDigestX962SHA1 => kSecKeyAlgorithmECDSASignatureDigestX962SHA1,
+    ECDSASignatureDigestX962SHA224 => kSecKeyAlgorithmECDSASignatureDigestX962SHA224,
+    ECDSASignatureDigestX962SHA256 => kSecKeyAlgorithmECDSASignatureDigestX962SHA256,
+    ECDSASignatureDigestX962SHA384 => kSecKeyAlgorithmECDSASignatureDigestX962SHA384,
+    ECDSASignatureDigestX962SHA512 => kSecKeyAlgorithmECDSASignatureDigestX962SHA512,
+
+    ECDSASignatureMessageX962SHA1 => kSecKeyAlgorithmECDSASignatureMessageX962SHA1,
+    ECDSASignatureMessageX962SHA224 => kSecKeyAlgorithmECDSASignatureMessageX962SHA224,
+    ECDSASignatureMessageX962SHA256 => kSecKeyAlgorithmECDSASignatureMessageX962SHA256,
+    ECDSASignatureMessageX962SHA384 => kSecKeyAlgorithmECDSASignatureMessageX962SHA384,
+    ECDSASignatureMessageX962SHA512 => kSecKeyAlgorithmECDSASignatureMessageX962SHA512,
+
+    ECDHKeyExchangeCofactor => kSecKeyAlgorithmECDHKeyExchangeCofactor,
+    ECDHKeyExchangeStandard => kSecKeyAlgorithmECDHKeyExchangeStandard,
+    ECDHKeyExchangeCofactorX963SHA1 => kSecKeyAlgorithmECDHKeyExchangeCofactorX963SHA1,
+    ECDHKeyExchangeStandardX963SHA1 => kSecKeyAlgorithmECDHKeyExchangeStandardX963SHA1,
+    ECDHKeyExchangeCofactorX963SHA224 => kSecKeyAlgorithmECDHKeyExchangeCofactorX963SHA224,
+    ECDHKeyExchangeCofactorX963SHA256 => kSecKeyAlgorithmECDHKeyExchangeCofactorX963SHA256,
+    ECDHKeyExchangeCofactorX963SHA384 => kSecKeyAlgorithmECDHKeyExchangeCofactorX963SHA384,
+    ECDHKeyExchangeCofactorX963SHA512 => kSecKeyAlgorithmECDHKeyExchangeCofactorX963SHA512,
+    ECDHKeyExchangeStandardX963SHA224 => kSecKeyAlgorithmECDHKeyExchangeStandardX963SHA224,
+    ECDHKeyExchangeStandardX963SHA256 => kSecKeyAlgorithmECDHKeyExchangeStandardX963SHA256,
+    ECDHKeyExchangeStandardX963SHA384 => kSecKeyAlgorithmECDHKeyExchangeStandardX963SHA384,
+    ECDHKeyExchangeStandardX963SHA512 => kSecKeyAlgorithmECDHKeyExchangeStandardX963SHA512,
+
+    RSAEncryptionRaw => kSecKeyAlgorithmRSAEncryptionRaw,
+    RSAEncryptionPKCS1 => kSecKeyAlgorithmRSAEncryptionPKCS1,
+
+    RSAEncryptionOAEPSHA1 => kSecKeyAlgorithmRSAEncryptionOAEPSHA1,
+    RSAEncryptionOAEPSHA224 => kSecKeyAlgorithmRSAEncryptionOAEPSHA224,
+    RSAEncryptionOAEPSHA256 => kSecKeyAlgorithmRSAEncryptionOAEPSHA256,
+    RSAEncryptionOAEPSHA384 => kSecKeyAlgorithmRSAEncryptionOAEPSHA384,
+    RSAEncryptionOAEPSHA512 => kSecKeyAlgorithmRSAEncryptionOAEPSHA512,
+
+    RSAEncryptionOAEPSHA1AESGCM => kSecKeyAlgorithmRSAEncryptionOAEPSHA1AESGCM,
+    RSAEncryptionOAEPSHA224AESGCM => kSecKeyAlgorithmRSAEncryptionOAEPSHA224AESGCM,
+    RSAEncryptionOAEPSHA256AESGCM => kSecKeyAlgorithmRSAEncryptionOAEPSHA256AESGCM,
+    RSAEncryptionOAEPSHA384AESGCM => kSecKeyAlgorithmRSAEncryptionOAEPSHA384AESGCM,
+    RSAEncryptionOAEPSHA512AESGCM => kSecKeyAlgorithmRSAEncryptionOAEPSHA512AESGCM,
+
+    RSASignatureRaw => kSecKeyAlgorithmRSASignatureRaw,
+
+    RSASignatureDigestPKCS1v15Raw => kSecKeyAlgorithmRSASignatureDigestPKCS1v15Raw,
+    RSASignatureDigestPKCS1v15SHA1 => kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA1,
+    RSASignatureDigestPKCS1v15SHA224 => kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA224,
+    RSASignatureDigestPKCS1v15SHA256 => kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA256,
+    RSASignatureDigestPKCS1v15SHA384 => kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA384,
+    RSASignatureDigestPKCS1v15SHA512 => kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA512,
+
+    RSASignatureMessagePKCS1v15SHA1 => kSecKeyAlgorithmRSASignatureMessagePKCS1v15SHA1,
+    RSASignatureMessagePKCS1v15SHA224 => kSecKeyAlgorithmRSASignatureMessagePKCS1v15SHA224,
+    RSASignatureMessagePKCS1v15SHA256 => kSecKeyAlgorithmRSASignatureMessagePKCS1v15SHA256,
+    RSASignatureMessagePKCS1v15SHA384 => kSecKeyAlgorithmRSASignatureMessagePKCS1v15SHA384,
+    RSASignatureMessagePKCS1v15SHA512 => kSecKeyAlgorithmRSASignatureMessagePKCS1v15SHA512,
+
+    RSASignatureDigestPSSSHA1 => kSecKeyAlgorithmRSASignatureDigestPSSSHA1,
+    RSASignatureDigestPSSSHA224 => kSecKeyAlgorithmRSASignatureDigestPSSSHA224,
+    RSASignatureDigestPSSSHA256 => kSecKeyAlgorithmRSASignatureDigestPSSSHA256,
+    RSASignatureDigestPSSSHA384 => kSecKeyAlgorithmRSASignatureDigestPSSSHA384,
+    RSASignatureDigestPSSSHA512 => kSecKeyAlgorithmRSASignatureDigestPSSSHA512,
+
+    RSASignatureMessagePSSSHA1 => kSecKeyAlgorithmRSASignatureMessagePSSSHA1,
+    RSASignatureMessagePSSSHA224 => kSecKeyAlgorithmRSASignatureMessagePSSSHA224,
+    RSASignatureMessagePSSSHA256 => kSecKeyAlgorithmRSASignatureMessagePSSSHA256,
+    RSASignatureMessagePSSSHA384 => kSecKeyAlgorithmRSASignatureMessagePSSSHA384,
+    RSASignatureMessagePSSSHA512 => kSecKeyAlgorithmRSASignatureMessagePSSSHA512
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,5 @@
 #![allow(bad_style)]
 
-
 #[cfg_attr(
     any(target_os = "macos", target_os = "ios"),
     link(name = "Security", kind = "framework")
@@ -17,6 +16,8 @@
 pub mod certificate_oids;
 pub mod cipher_suite;
 #[cfg(target_os = "macos")]
+pub mod code_signing;
+#[cfg(target_os = "macos")]
 pub mod digest_transform;
 #[cfg(target_os = "macos")]
 pub mod encrypt_transform;
@@ -24,9 +25,7 @@
 pub mod import_export;
 pub mod item;
 pub mod key;
-#[cfg(target_os = "macos")]
 pub mod keychain;
-#[cfg(target_os = "macos")]
 pub mod keychain_item;
 pub mod policy;
 pub mod random;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/secure_transport.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/secure_transport.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/secure_transport.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/secure_transport.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,8 @@
 use core_foundation_sys::array::CFArrayRef;
 use core_foundation_sys::base::CFAllocatorRef;
-use core_foundation_sys::base::{Boolean, CFTypeRef, OSStatus};
+#[cfg(target_os = "macos")]
+use core_foundation_sys::base::CFTypeRef;
+use core_foundation_sys::base::{Boolean, OSStatus};
 use std::os::raw::{c_char, c_int, c_void};
 
 use crate::cipher_suite::SSLCipherSuite;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/trust.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/trust.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/security-framework-sys/src/trust.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/security-framework-sys/src/trust.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,9 @@
 use crate::base::SecKeyRef;
 use core_foundation_sys::array::CFArrayRef;
 use core_foundation_sys::base::{Boolean, CFIndex, CFTypeID, CFTypeRef, OSStatus};
+#[cfg(any(feature = "OSX_10_13", target_os = "ios"))]
+use core_foundation_sys::error::CFErrorRef;
+
 pub type SecTrustResultType = u32;
 
 pub const kSecTrustResultInvalid: SecTrustResultType = 0;
@@ -19,6 +22,7 @@
 extern "C" {
     pub fn SecTrustGetTypeID() -> CFTypeID;
     pub fn SecTrustGetCertificateCount(trust: SecTrustRef) -> CFIndex;
+    #[deprecated(note = "deprecated by Apple")]
     pub fn SecTrustGetCertificateAtIndex(trust: SecTrustRef, ix: CFIndex) -> SecCertificateRef;
     pub fn SecTrustSetAnchorCertificates(
         trust: SecTrustRef,
@@ -28,7 +32,13 @@
         trust: SecTrustRef,
         anchorCertificatesOnly: Boolean,
     ) -> OSStatus;
+    #[cfg(target_os = "macos")]
+    pub fn SecTrustCopyAnchorCertificates(anchors: *mut CFArrayRef) -> OSStatus;
+    #[deprecated(note = "deprecated by Apple")]
     pub fn SecTrustEvaluate(trust: SecTrustRef, result: *mut SecTrustResultType) -> OSStatus;
+    // it should have been OSX_10_14, but due to back-compat it can't rely on the newer feature flag
+    #[cfg(any(feature = "OSX_10_13", target_os = "ios"))]
+    pub fn SecTrustEvaluateWithError(trust: SecTrustRef, error: *mut CFErrorRef) -> bool;
     pub fn SecTrustCreateWithCertificates(
         certificates: CFTypeRef,
         policies: CFTypeRef,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -53,16 +53,20 @@
     // 128-bit integers stabilized in Rust 1.26:
     // https://blog.rust-lang.org/2018/05/10/Rust-1.26.html
     //
-    // Disabled on Emscripten targets as Emscripten doesn't
-    // currently support integers larger than 64 bits.
-    if minor >= 26 && !emscripten {
+    // Disabled on Emscripten targets before Rust 1.40 since
+    // Emscripten did not support 128-bit integers until Rust 1.40
+    // (https://github.com/rust-lang/rust/pull/65251)
+    if minor >= 26 && (!emscripten || minor >= 40) {
         println!("cargo:rustc-cfg=integer128");
     }
 
     // Inclusive ranges methods stabilized in Rust 1.27:
     // https://github.com/rust-lang/rust/pull/50758
+    // Also Iterator::try_for_each:
+    // https://blog.rust-lang.org/2018/06/21/Rust-1.27.html#library-stabilizations
     if minor >= 27 {
         println!("cargo:rustc-cfg=range_inclusive");
+        println!("cargo:rustc-cfg=iterator_try_fold");
     }
 
     // Non-zero integers stabilized in Rust 1.28:
@@ -71,12 +75,19 @@
         println!("cargo:rustc-cfg=num_nonzero");
     }
 
-    // TryFrom, Atomic types, and non-zero signed integers stabilized in Rust 1.34:
+    // Current minimum supported version of serde_derive crate is Rust 1.31.
+    if minor >= 31 {
+        println!("cargo:rustc-cfg=serde_derive");
+    }
+
+    // TryFrom, Atomic types, non-zero signed integers, and SystemTime::checked_add
+    // stabilized in Rust 1.34:
     // https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html#tryfrom-and-tryinto
     // https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html#library-stabilizations
     if minor >= 34 {
         println!("cargo:rustc-cfg=core_try_from");
         println!("cargo:rustc-cfg=num_nonzero_signed");
+        println!("cargo:rustc-cfg=systemtime_checked_add");
 
         // Whitelist of archs that support std::sync::atomic module. Ideally we
         // would use #[cfg(target_has_atomic = "...")] but it is not stable yet.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"4a6098c5140bc095bf8f96fb08b3262ec6939ec3da831ff762a034ff98a017ce","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5cf9d2158d70048a2916360ad59d9079f6233c6f68781a7a792e70f8b772d8ce","build.rs":"d6af5a05be728765c2d98d960406ba648333745ed8644be311d2a1f52d7075f0","crates-io.md":"25ed421fe25d0f6f74c4b78674144bef2843a5f78bf552d0a8ec633be69d282b","src/de/from_primitive.rs":"058fa17313ed3a9c29ec04c6ec67f21a756f6f28cdeb4b0dfcd7012b3e702d0b","src/de/ignored_any.rs":"6a0527edd497a56a103ae65f5e73da675b3f99094d6dcad3c335c8d932daaf40","src/de/impls.rs":"5972a9c0d9a0e811b543ff3850a402b3adfc5237e62c5db18c5e0f71928ea74e","src/de/mod.rs":"b59c365b05e4e09a7467c958f85b2c64435514c59c17275be019397ad7ccb00e","src/de/utf8.rs":"f17524ee0af98ec3abcfd7d0b812fbd1033263bd8e2ce2f57c1e1999ce153558","src/de/value.rs":"1b58860694b753886b087e20f6afbeea2cb69a1d12b6e72d9934f5649a1ec219","src/export.rs":"2ebdf0eccaa64c5e98c6dfd13b4980474f627fc3fae90cfc2c741acf860afd5d","src/integer128.rs":"b213ec6c1ecf8c8228d9591e0b2c31b78d972cd4c6a0b231468090f15784f6f6","src/lib.rs":"45a70c9c81c0e2cdc8b4c9ed3441a1b605b38e0705cfa3d9fae06bd96614917d","src/macros.rs":"f18fc25c5fb857238bf119cdee5c7987a8584dea69c51f27ca718b7dfd871d0f","src/private/de.rs":"bce814fa2f2fd689c6d4a354839f38d7ea260509339181ce83d9b0fdbe0e1b3b","src/private/macros.rs":"ebb6affd4c89e3b5f9a42e03f8b7d966bc588875e9b44e962d0b7aba7f80a10f","src/private/mod.rs":"f8f2cd5edbfc26c268b34cdb89db1b34e6348f81384f03d18532e7568575006d","src/private/ser.rs":"96a1e23ad7f3c8ee51a02d799d92780e19dd3c18fa0f1ad791abef7cb346e224","src/ser/fmt.rs":"7827ed07fd8897e6324f75625ba0c926a4c4e7ec2914cd067391ce54d942ac7b","src/ser/impls.rs":"496b7ba45529e569ffdf5d755c6df99c1321fddc89b9f64f5cc58e24052caefc","src/ser/impossible.rs":"3dd0e165b88fc67e698e675f16569b91fab9e054caa4c3e1997f929ba364fe90","src/ser/mod.rs":"9c26100d8058a5c39aea72512fb78de959e4ed9199481eef47996f0864df0f2c","src/std_error.rs":"3aac687856c035517fae44ed2906dd4a1e3184bae4bf613adcdeb73f74126c57"},"package":"06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"}
\ No newline at end of file
+{"files":{"Cargo.toml":"3657dd930eecc3a6743fc25f341fb3bd06402ddbec2dcdfae6ef156c7167c6f4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5cf9d2158d70048a2916360ad59d9079f6233c6f68781a7a792e70f8b772d8ce","build.rs":"266866315e377f6f74f639bfd993192a46e203be31892e4173862816e8414767","crates-io.md":"25ed421fe25d0f6f74c4b78674144bef2843a5f78bf552d0a8ec633be69d282b","src/de/ignored_any.rs":"c69d6071191c2075372218442e9e73991335c6b4be18736a7a789f04bb305525","src/de/impls.rs":"8505b47b4fa97e426bedf97082005ee2d5700bfac0da41da9127c9826004c163","src/de/mod.rs":"5c176d8d909910a100f67eb26de8228c3e6465886100cdc3bcc146c16aec111e","src/de/seed.rs":"e8cf0233afe0af5b8fb9e4c94f301c92729c5ba417280af9e2201b732e374a72","src/de/utf8.rs":"f17524ee0af98ec3abcfd7d0b812fbd1033263bd8e2ce2f57c1e1999ce153558","src/de/value.rs":"82d530d0bc50cba75a095c819b4269d58229a7384043f7f6e674891cc6dae7bb","src/integer128.rs":"12f6ce6a513c1c293398db38cf1d3ea7c0c5a6717152621bcba61f49abc7b5b1","src/lib.rs":"c2739452e0bbff4727064a6fb9e24cd35271783a5c2c671e84e5fa985367035a","src/macros.rs":"3d695a51f0a07f9f719dcb5620012c21a1b084c06a6283349cabf574ceba8123","src/private/de.rs":"abcd02697fc887d6a9c450dfa1ceb640e069683532998ed4ba3c0b859b4744d7","src/private/doc.rs":"e9801a43c3088fccd5f1fac76416698f948e65b647024aa9da17d673e1e8c217","src/private/mod.rs":"761d198c739508117beeaae44ae4e11769aaa6c2e9a4acf584eb9adc1952879f","src/private/ser.rs":"3a90dfb5c17e81bf1d959fed60a9477713498e9d0934463627c98709132f066e","src/private/size_hint.rs":"605521227e9ba3100fbb9d5ea7fd5853385097c35015ce6908bd5f1ea20d59ad","src/ser/fmt.rs":"7827ed07fd8897e6324f75625ba0c926a4c4e7ec2914cd067391ce54d942ac7b","src/ser/impls.rs":"c99000b33b2b7cb1c9b275f769f0cb5dd6ecb3caf260b66f2d0157e6faf04d96","src/ser/impossible.rs":"db17913522c1c27389c5a085113911353b9813c1b116518681362e7c8b692c3a","src/ser/mod.rs":"4f686acd03f310a966194ef225a0cec5f96810bf73f636f670601c3d2d9018c6","src/std_error.rs":"3aac687856c035517fae44ed2906dd4a1e3184bae4bf613adcdeb73f74126c57"},"package":"f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,16 +3,15 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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]
 name = "serde"
-version = "1.0.118"
+version = "1.0.130"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 build = "build.rs"
 include = ["build.rs", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
@@ -30,7 +29,7 @@
 [package.metadata.playground]
 features = ["derive", "rc"]
 [dependencies.serde_derive]
-version = "=1.0.118"
+version = "=1.0.130"
 optional = true
 [dev-dependencies.serde_derive]
 version = "1.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/from_primitive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/from_primitive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/from_primitive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/from_primitive.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-use lib::*;
-
-macro_rules! int_to_int {
-    ($dst:ident, $n:ident) => {
-        if $dst::min_value() as i64 <= $n as i64 && $n as i64 <= $dst::max_value() as i64 {
-            Some($n as $dst)
-        } else {
-            None
-        }
-    };
-}
-
-macro_rules! int_to_uint {
-    ($dst:ident, $n:ident) => {
-        if 0 <= $n && $n as u64 <= $dst::max_value() as u64 {
-            Some($n as $dst)
-        } else {
-            None
-        }
-    };
-}
-
-macro_rules! uint_to {
-    ($dst:ident, $n:ident) => {
-        if $n as u64 <= $dst::max_value() as u64 {
-            Some($n as $dst)
-        } else {
-            None
-        }
-    };
-}
-
-pub trait FromPrimitive: Sized {
-    fn from_i8(n: i8) -> Option<Self>;
-    fn from_i16(n: i16) -> Option<Self>;
-    fn from_i32(n: i32) -> Option<Self>;
-    fn from_i64(n: i64) -> Option<Self>;
-    fn from_u8(n: u8) -> Option<Self>;
-    fn from_u16(n: u16) -> Option<Self>;
-    fn from_u32(n: u32) -> Option<Self>;
-    fn from_u64(n: u64) -> Option<Self>;
-}
-
-macro_rules! impl_from_primitive_for_int {
-    ($t:ident) => {
-        impl FromPrimitive for $t {
-            #[inline]
-            fn from_i8(n: i8) -> Option<Self> {
-                int_to_int!($t, n)
-            }
-            #[inline]
-            fn from_i16(n: i16) -> Option<Self> {
-                int_to_int!($t, n)
-            }
-            #[inline]
-            fn from_i32(n: i32) -> Option<Self> {
-                int_to_int!($t, n)
-            }
-            #[inline]
-            fn from_i64(n: i64) -> Option<Self> {
-                int_to_int!($t, n)
-            }
-            #[inline]
-            fn from_u8(n: u8) -> Option<Self> {
-                uint_to!($t, n)
-            }
-            #[inline]
-            fn from_u16(n: u16) -> Option<Self> {
-                uint_to!($t, n)
-            }
-            #[inline]
-            fn from_u32(n: u32) -> Option<Self> {
-                uint_to!($t, n)
-            }
-            #[inline]
-            fn from_u64(n: u64) -> Option<Self> {
-                uint_to!($t, n)
-            }
-        }
-    };
-}
-
-macro_rules! impl_from_primitive_for_uint {
-    ($t:ident) => {
-        impl FromPrimitive for $t {
-            #[inline]
-            fn from_i8(n: i8) -> Option<Self> {
-                int_to_uint!($t, n)
-            }
-            #[inline]
-            fn from_i16(n: i16) -> Option<Self> {
-                int_to_uint!($t, n)
-            }
-            #[inline]
-            fn from_i32(n: i32) -> Option<Self> {
-                int_to_uint!($t, n)
-            }
-            #[inline]
-            fn from_i64(n: i64) -> Option<Self> {
-                int_to_uint!($t, n)
-            }
-            #[inline]
-            fn from_u8(n: u8) -> Option<Self> {
-                uint_to!($t, n)
-            }
-            #[inline]
-            fn from_u16(n: u16) -> Option<Self> {
-                uint_to!($t, n)
-            }
-            #[inline]
-            fn from_u32(n: u32) -> Option<Self> {
-                uint_to!($t, n)
-            }
-            #[inline]
-            fn from_u64(n: u64) -> Option<Self> {
-                uint_to!($t, n)
-            }
-        }
-    };
-}
-
-macro_rules! impl_from_primitive_for_float {
-    ($t:ident) => {
-        impl FromPrimitive for $t {
-            #[inline]
-            fn from_i8(n: i8) -> Option<Self> {
-                Some(n as Self)
-            }
-            #[inline]
-            fn from_i16(n: i16) -> Option<Self> {
-                Some(n as Self)
-            }
-            #[inline]
-            fn from_i32(n: i32) -> Option<Self> {
-                Some(n as Self)
-            }
-            #[inline]
-            fn from_i64(n: i64) -> Option<Self> {
-                Some(n as Self)
-            }
-            #[inline]
-            fn from_u8(n: u8) -> Option<Self> {
-                Some(n as Self)
-            }
-            #[inline]
-            fn from_u16(n: u16) -> Option<Self> {
-                Some(n as Self)
-            }
-            #[inline]
-            fn from_u32(n: u32) -> Option<Self> {
-                Some(n as Self)
-            }
-            #[inline]
-            fn from_u64(n: u64) -> Option<Self> {
-                Some(n as Self)
-            }
-        }
-    };
-}
-
-impl_from_primitive_for_int!(isize);
-impl_from_primitive_for_int!(i8);
-impl_from_primitive_for_int!(i16);
-impl_from_primitive_for_int!(i32);
-impl_from_primitive_for_int!(i64);
-impl_from_primitive_for_uint!(usize);
-impl_from_primitive_for_uint!(u8);
-impl_from_primitive_for_uint!(u16);
-impl_from_primitive_for_uint!(u32);
-impl_from_primitive_for_uint!(u64);
-impl_from_primitive_for_float!(f32);
-impl_from_primitive_for_float!(f64);
-
-serde_if_integer128! {
-    impl FromPrimitive for i128 {
-        #[inline]
-        fn from_i8(n: i8) -> Option<Self> {
-            Some(n as i128)
-        }
-        #[inline]
-        fn from_i16(n: i16) -> Option<Self> {
-            Some(n as i128)
-        }
-        #[inline]
-        fn from_i32(n: i32) -> Option<Self> {
-            Some(n as i128)
-        }
-        #[inline]
-        fn from_i64(n: i64) -> Option<Self> {
-            Some(n as i128)
-        }
-        #[inline]
-        fn from_u8(n: u8) -> Option<Self> {
-            Some(n as i128)
-        }
-        #[inline]
-        fn from_u16(n: u16) -> Option<Self> {
-            Some(n as i128)
-        }
-        #[inline]
-        fn from_u32(n: u32) -> Option<Self> {
-            Some(n as i128)
-        }
-        #[inline]
-        fn from_u64(n: u64) -> Option<Self> {
-            Some(n as i128)
-        }
-    }
-
-    impl FromPrimitive for u128 {
-        #[inline]
-        fn from_i8(n: i8) -> Option<Self> {
-            if n >= 0 {
-                Some(n as u128)
-            } else {
-                None
-            }
-        }
-        #[inline]
-        fn from_i16(n: i16) -> Option<Self> {
-            if n >= 0 {
-                Some(n as u128)
-            } else {
-                None
-            }
-        }
-        #[inline]
-        fn from_i32(n: i32) -> Option<Self> {
-            if n >= 0 {
-                Some(n as u128)
-            } else {
-                None
-            }
-        }
-        #[inline]
-        fn from_i64(n: i64) -> Option<Self> {
-            if n >= 0 {
-                Some(n as u128)
-            } else {
-                None
-            }
-        }
-        #[inline]
-        fn from_u8(n: u8) -> Option<Self> {
-            Some(n as u128)
-        }
-        #[inline]
-        fn from_u16(n: u16) -> Option<Self> {
-            Some(n as u128)
-        }
-        #[inline]
-        fn from_u32(n: u32) -> Option<Self> {
-            Some(n as u128)
-        }
-        #[inline]
-        fn from_u64(n: u64) -> Option<Self> {
-            Some(n as u128)
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/ignored_any.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/ignored_any.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/ignored_any.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/ignored_any.rs	2021-12-09 12:01:26.000000000 +0000
@@ -130,12 +130,28 @@
         Ok(IgnoredAny)
     }
 
+    serde_if_integer128! {
+        #[inline]
+        fn visit_i128<E>(self, x: i128) -> Result<Self::Value, E> {
+            let _ = x;
+            Ok(IgnoredAny)
+        }
+    }
+
     #[inline]
     fn visit_u64<E>(self, x: u64) -> Result<Self::Value, E> {
         let _ = x;
         Ok(IgnoredAny)
     }
 
+    serde_if_integer128! {
+        #[inline]
+        fn visit_u128<E>(self, x: u128) -> Result<Self::Value, E> {
+            let _ = x;
+            Ok(IgnoredAny)
+        }
+    }
+
     #[inline]
     fn visit_f64<E>(self, x: f64) -> Result<Self::Value, E> {
         let _ = x;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/impls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,11 +7,10 @@
 #[cfg(any(core_duration, feature = "std", feature = "alloc"))]
 use de::MapAccess;
 
-use de::from_primitive::FromPrimitive;
-use private::de::InPlaceSeed;
+use seed::InPlaceSeed;
 
 #[cfg(any(feature = "std", feature = "alloc"))]
-use private::de::size_hint;
+use __private::size_hint;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -81,38 +80,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-macro_rules! visit_integer_method {
-    ($src_ty:ident, $method:ident, $from_method:ident, $group:ident, $group_ty:ident) => {
-        #[inline]
-        fn $method<E>(self, v: $src_ty) -> Result<Self::Value, E>
-        where
-            E: Error,
-        {
-            match FromPrimitive::$from_method(v) {
-                Some(v) => Ok(v),
-                None => Err(Error::invalid_value(
-                    Unexpected::$group(v as $group_ty),
-                    &self,
-                )),
-            }
-        }
-    };
-}
-
-macro_rules! visit_float_method {
-    ($src_ty:ident, $method:ident) => {
-        #[inline]
-        fn $method<E>(self, v: $src_ty) -> Result<Self::Value, E>
-        where
-            E: Error,
-        {
-            Ok(v as Self::Value)
-        }
-    };
-}
-
 macro_rules! impl_deserialize_num {
-    ($ty:ident, $method:ident, $($visit:ident),*) => {
+    ($ty:ident, $deserialize:ident $($methods:tt)*) => {
         impl<'de> Deserialize<'de> for $ty {
             #[inline]
             fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
@@ -128,131 +97,221 @@
                         formatter.write_str(stringify!($ty))
                     }
 
-                    $(
-                        impl_deserialize_num!($visit $ty);
-                    )*
+                    $($methods)*
                 }
 
-                deserializer.$method(PrimitiveVisitor)
+                deserializer.$deserialize(PrimitiveVisitor)
             }
         }
     };
-
-    (integer $ty:ident) => {
-        visit_integer_method!(i8, visit_i8, from_i8, Signed, i64);
-        visit_integer_method!(i16, visit_i16, from_i16, Signed, i64);
-        visit_integer_method!(i32, visit_i32, from_i32, Signed, i64);
-        visit_integer_method!(i64, visit_i64, from_i64, Signed, i64);
-
-        visit_integer_method!(u8, visit_u8, from_u8, Unsigned, u64);
-        visit_integer_method!(u16, visit_u16, from_u16, Unsigned, u64);
-        visit_integer_method!(u32, visit_u32, from_u32, Unsigned, u64);
-        visit_integer_method!(u64, visit_u64, from_u64, Unsigned, u64);
-    };
-
-    (float $ty:ident) => {
-        visit_float_method!(f32, visit_f32);
-        visit_float_method!(f64, visit_f64);
-    };
 }
 
-impl_deserialize_num!(i8, deserialize_i8, integer);
-impl_deserialize_num!(i16, deserialize_i16, integer);
-impl_deserialize_num!(i32, deserialize_i32, integer);
-impl_deserialize_num!(i64, deserialize_i64, integer);
-impl_deserialize_num!(isize, deserialize_i64, integer);
-
-impl_deserialize_num!(u8, deserialize_u8, integer);
-impl_deserialize_num!(u16, deserialize_u16, integer);
-impl_deserialize_num!(u32, deserialize_u32, integer);
-impl_deserialize_num!(u64, deserialize_u64, integer);
-impl_deserialize_num!(usize, deserialize_u64, integer);
-
-impl_deserialize_num!(f32, deserialize_f32, integer, float);
-impl_deserialize_num!(f64, deserialize_f64, integer, float);
-
-serde_if_integer128! {
-    impl<'de> Deserialize<'de> for i128 {
+macro_rules! num_self {
+    ($ty:ident : $visit:ident) => {
         #[inline]
-        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        fn $visit<E>(self, v: $ty) -> Result<Self::Value, E>
         where
-            D: Deserializer<'de>,
+            E: Error,
         {
-            struct PrimitiveVisitor;
+            Ok(v)
+        }
+    };
+}
 
-            impl<'de> Visitor<'de> for PrimitiveVisitor {
-                type Value = i128;
+macro_rules! num_as_self {
+    ($($ty:ident : $visit:ident)*) => {
+        $(
+            #[inline]
+            fn $visit<E>(self, v: $ty) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                Ok(v as Self::Value)
+            }
+        )*
+    };
+}
 
-                fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                    formatter.write_str("i128")
+macro_rules! int_to_int {
+    ($($ty:ident : $visit:ident)*) => {
+        $(
+            #[inline]
+            fn $visit<E>(self, v: $ty) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                if Self::Value::min_value() as i64 <= v as i64 && v as i64 <= Self::Value::max_value() as i64 {
+                    Ok(v as Self::Value)
+                } else {
+                    Err(Error::invalid_value(Unexpected::Signed(v as i64), &self))
                 }
+            }
+        )*
+    };
+}
 
-                impl_deserialize_num!(integer i128);
-
-                #[inline]
-                fn visit_i128<E>(self, v: i128) -> Result<Self::Value, E>
-                where
-                    E: Error,
-                {
-                    Ok(v)
+macro_rules! int_to_uint {
+    ($($ty:ident : $visit:ident)*) => {
+        $(
+            #[inline]
+            fn $visit<E>(self, v: $ty) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                if 0 <= v && v as u64 <= Self::Value::max_value() as u64 {
+                    Ok(v as Self::Value)
+                } else {
+                    Err(Error::invalid_value(Unexpected::Signed(v as i64), &self))
                 }
+            }
+        )*
+    };
+}
 
-                #[inline]
-                fn visit_u128<E>(self, v: u128) -> Result<Self::Value, E>
-                where
-                    E: Error,
-                {
-                    if v <= i128::max_value() as u128 {
-                        Ok(v as i128)
-                    } else {
-                        Err(Error::invalid_value(Unexpected::Other("u128"), &self))
-                    }
+macro_rules! uint_to_self {
+    ($($ty:ident : $visit:ident)*) => {
+        $(
+            #[inline]
+            fn $visit<E>(self, v: $ty) -> Result<Self::Value, E>
+            where
+                E: Error,
+            {
+                if v as u64 <= Self::Value::max_value() as u64 {
+                    Ok(v as Self::Value)
+                } else {
+                    Err(Error::invalid_value(Unexpected::Unsigned(v as u64), &self))
                 }
             }
+        )*
+    };
+}
 
-            deserializer.deserialize_i128(PrimitiveVisitor)
-        }
-    }
+impl_deserialize_num! {
+    i8, deserialize_i8
+    num_self!(i8:visit_i8);
+    int_to_int!(i16:visit_i16 i32:visit_i32 i64:visit_i64);
+    uint_to_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    i16, deserialize_i16
+    num_self!(i16:visit_i16);
+    num_as_self!(i8:visit_i8);
+    int_to_int!(i32:visit_i32 i64:visit_i64);
+    uint_to_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    i32, deserialize_i32
+    num_self!(i32:visit_i32);
+    num_as_self!(i8:visit_i8 i16:visit_i16);
+    int_to_int!(i64:visit_i64);
+    uint_to_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    i64, deserialize_i64
+    num_self!(i64:visit_i64);
+    num_as_self!(i8:visit_i8 i16:visit_i16 i32:visit_i32);
+    uint_to_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    isize, deserialize_i64
+    num_as_self!(i8:visit_i8 i16:visit_i16);
+    int_to_int!(i32:visit_i32 i64:visit_i64);
+    uint_to_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    u8, deserialize_u8
+    num_self!(u8:visit_u8);
+    int_to_uint!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
+    uint_to_self!(u16:visit_u16 u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    u16, deserialize_u16
+    num_self!(u16:visit_u16);
+    num_as_self!(u8:visit_u8);
+    int_to_uint!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
+    uint_to_self!(u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    u32, deserialize_u32
+    num_self!(u32:visit_u32);
+    num_as_self!(u8:visit_u8 u16:visit_u16);
+    int_to_uint!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
+    uint_to_self!(u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    u64, deserialize_u64
+    num_self!(u64:visit_u64);
+    num_as_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32);
+    int_to_uint!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
+}
+
+impl_deserialize_num! {
+    usize, deserialize_u64
+    num_as_self!(u8:visit_u8 u16:visit_u16);
+    int_to_uint!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
+    uint_to_self!(u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    f32, deserialize_f32
+    num_self!(f32:visit_f32);
+    num_as_self!(f64:visit_f64);
+    num_as_self!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
+    num_as_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
+}
+
+impl_deserialize_num! {
+    f64, deserialize_f64
+    num_self!(f64:visit_f64);
+    num_as_self!(f32:visit_f32);
+    num_as_self!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
+    num_as_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
+}
+
+serde_if_integer128! {
+    impl_deserialize_num! {
+        i128, deserialize_i128
+        num_self!(i128:visit_i128);
+        num_as_self!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
+        num_as_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
 
-    impl<'de> Deserialize<'de> for u128 {
         #[inline]
-        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        fn visit_u128<E>(self, v: u128) -> Result<Self::Value, E>
         where
-            D: Deserializer<'de>,
+            E: Error,
         {
-            struct PrimitiveVisitor;
-
-            impl<'de> Visitor<'de> for PrimitiveVisitor {
-                type Value = u128;
-
-                fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                    formatter.write_str("u128")
-                }
-
-                impl_deserialize_num!(integer u128);
+            if v <= i128::max_value() as u128 {
+                Ok(v as i128)
+            } else {
+                Err(Error::invalid_value(Unexpected::Other("u128"), &self))
+            }
+        }
+    }
 
-                #[inline]
-                fn visit_i128<E>(self, v: i128) -> Result<Self::Value, E>
-                where
-                    E: Error,
-                {
-                    if v >= 0 {
-                        Ok(v as u128)
-                    } else {
-                        Err(Error::invalid_value(Unexpected::Other("i128"), &self))
-                    }
-                }
+    impl_deserialize_num! {
+        u128, deserialize_u128
+        num_self!(u128:visit_u128);
+        num_as_self!(u8:visit_u8 u16:visit_u16 u32:visit_u32 u64:visit_u64);
+        int_to_uint!(i8:visit_i8 i16:visit_i16 i32:visit_i32 i64:visit_i64);
 
-                #[inline]
-                fn visit_u128<E>(self, v: u128) -> Result<Self::Value, E>
-                where
-                    E: Error,
-                {
-                    Ok(v)
-                }
+        #[inline]
+        fn visit_i128<E>(self, v: i128) -> Result<Self::Value, E>
+        where
+            E: Error,
+        {
+            if 0 <= v {
+                Ok(v as u128)
+            } else {
+                Err(Error::invalid_value(Unexpected::Other("i128"), &self))
             }
-
-            deserializer.deserialize_u128(PrimitiveVisitor)
         }
     }
 }
@@ -1260,24 +1319,7 @@
                 D: Deserializer<'de>,
             {
                 if deserializer.is_human_readable() {
-                    struct IpAddrVisitor;
-
-                    impl<'de> Visitor<'de> for IpAddrVisitor {
-                        type Value = $ty;
-
-                        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                            formatter.write_str($expecting)
-                        }
-
-                        fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
-                        where
-                            E: Error,
-                        {
-                            s.parse().map_err(Error::custom)
-                        }
-                    }
-
-                    deserializer.deserialize_str(IpAddrVisitor)
+                    deserializer.deserialize_str(FromStrVisitor::new($expecting))
                 } else {
                     <[u8; $size]>::deserialize(deserializer).map(<$ty>::from)
                 }
@@ -1405,24 +1447,7 @@
         D: Deserializer<'de>,
     {
         if deserializer.is_human_readable() {
-            struct IpAddrVisitor;
-
-            impl<'de> Visitor<'de> for IpAddrVisitor {
-                type Value = net::IpAddr;
-
-                fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                    formatter.write_str("IP address")
-                }
-
-                fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
-                where
-                    E: Error,
-                {
-                    s.parse().map_err(Error::custom)
-                }
-            }
-
-            deserializer.deserialize_str(IpAddrVisitor)
+            deserializer.deserialize_str(FromStrVisitor::new("IP address"))
         } else {
             use lib::net::IpAddr;
             deserialize_enum! {
@@ -1449,24 +1474,7 @@
                 D: Deserializer<'de>,
             {
                 if deserializer.is_human_readable() {
-                    struct SocketAddrVisitor;
-
-                    impl<'de> Visitor<'de> for SocketAddrVisitor {
-                        type Value = $ty;
-
-                        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                            formatter.write_str($expecting)
-                        }
-
-                        fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
-                        where
-                            E: Error,
-                        {
-                            s.parse().map_err(Error::custom)
-                        }
-                    }
-
-                    deserializer.deserialize_str(SocketAddrVisitor)
+                    deserializer.deserialize_str(FromStrVisitor::new($expecting))
                 } else {
                     <(_, u16)>::deserialize(deserializer).map(|(ip, port)| $new(ip, port))
                 }
@@ -1482,24 +1490,7 @@
         D: Deserializer<'de>,
     {
         if deserializer.is_human_readable() {
-            struct SocketAddrVisitor;
-
-            impl<'de> Visitor<'de> for SocketAddrVisitor {
-                type Value = net::SocketAddr;
-
-                fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                    formatter.write_str("socket address")
-                }
-
-                fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
-                where
-                    E: Error,
-                {
-                    s.parse().map_err(Error::custom)
-                }
-            }
-
-            deserializer.deserialize_str(SocketAddrVisitor)
+            deserializer.deserialize_str(FromStrVisitor::new("socket address"))
         } else {
             use lib::net::SocketAddr;
             deserialize_enum! {
@@ -1906,7 +1897,7 @@
                             b"secs" => Ok(Field::Secs),
                             b"nanos" => Ok(Field::Nanos),
                             _ => {
-                                let value = ::export::from_utf8_lossy(value);
+                                let value = ::__private::from_utf8_lossy(value);
                                 Err(Error::unknown_field(&value, FIELDS))
                             }
                         }
@@ -1917,6 +1908,17 @@
             }
         }
 
+        fn check_overflow<E>(secs: u64, nanos: u32) -> Result<(), E>
+        where
+            E: Error,
+        {
+            static NANOS_PER_SEC: u32 = 1_000_000_000;
+            match secs.checked_add((nanos / NANOS_PER_SEC) as u64) {
+                Some(_) => Ok(()),
+                None => Err(E::custom("overflow deserializing Duration")),
+            }
+        }
+
         struct DurationVisitor;
 
         impl<'de> Visitor<'de> for DurationVisitor {
@@ -1942,6 +1944,7 @@
                         return Err(Error::invalid_length(1, &self));
                     }
                 };
+                try!(check_overflow(secs, nanos));
                 Ok(Duration::new(secs, nanos))
             }
 
@@ -1975,6 +1978,7 @@
                     Some(nanos) => nanos,
                     None => return Err(<A::Error as Error>::missing_field("nanos")),
                 };
+                try!(check_overflow(secs, nanos));
                 Ok(Duration::new(secs, nanos))
             }
         }
@@ -2042,6 +2046,17 @@
             }
         }
 
+        fn check_overflow<E>(secs: u64, nanos: u32) -> Result<(), E>
+        where
+            E: Error,
+        {
+            static NANOS_PER_SEC: u32 = 1_000_000_000;
+            match secs.checked_add((nanos / NANOS_PER_SEC) as u64) {
+                Some(_) => Ok(()),
+                None => Err(E::custom("overflow deserializing SystemTime epoch offset")),
+            }
+        }
+
         struct DurationVisitor;
 
         impl<'de> Visitor<'de> for DurationVisitor {
@@ -2067,6 +2082,7 @@
                         return Err(Error::invalid_length(1, &self));
                     }
                 };
+                try!(check_overflow(secs, nanos));
                 Ok(Duration::new(secs, nanos))
             }
 
@@ -2104,13 +2120,20 @@
                     Some(nanos) => nanos,
                     None => return Err(<A::Error as Error>::missing_field("nanos_since_epoch")),
                 };
+                try!(check_overflow(secs, nanos));
                 Ok(Duration::new(secs, nanos))
             }
         }
 
         const FIELDS: &'static [&'static str] = &["secs_since_epoch", "nanos_since_epoch"];
         let duration = try!(deserializer.deserialize_struct("SystemTime", FIELDS, DurationVisitor));
-        Ok(UNIX_EPOCH + duration)
+        #[cfg(systemtime_checked_add)]
+        let ret = UNIX_EPOCH
+            .checked_add(duration)
+            .ok_or_else(|| D::Error::custom("overflow deserializing SystemTime"));
+        #[cfg(not(systemtime_checked_add))]
+        let ret = Ok(UNIX_EPOCH + duration);
+        ret
     }
 }
 
@@ -2214,7 +2237,7 @@
                         b"start" => Ok(Field::Start),
                         b"end" => Ok(Field::End),
                         _ => {
-                            let value = ::export::from_utf8_lossy(value);
+                            let value = ::__private::from_utf8_lossy(value);
                             Err(Error::unknown_field(&value, FIELDS))
                         }
                     }
@@ -2603,3 +2626,39 @@
 atomic_impl! {
     AtomicI64 AtomicU64
 }
+
+#[cfg(feature = "std")]
+struct FromStrVisitor<T> {
+    expecting: &'static str,
+    ty: PhantomData<T>,
+}
+
+#[cfg(feature = "std")]
+impl<T> FromStrVisitor<T> {
+    fn new(expecting: &'static str) -> Self {
+        FromStrVisitor {
+            expecting: expecting,
+            ty: PhantomData,
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl<'de, T> Visitor<'de> for FromStrVisitor<T>
+where
+    T: str::FromStr,
+    T::Err: fmt::Display,
+{
+    type Value = T;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str(self.expecting)
+    }
+
+    fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        s.parse().map_err(Error::custom)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -118,7 +118,6 @@
 
 pub mod value;
 
-mod from_primitive;
 mod ignored_any;
 mod impls;
 mod utf8;
@@ -393,7 +392,7 @@
 }
 
 impl<'a> fmt::Display for Unexpected<'a> {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         use self::Unexpected::*;
         match *self {
             Bool(b) => write!(formatter, "boolean `{}`", b),
@@ -1008,7 +1007,7 @@
     /// `Deserializer`.
     ///
     /// If the `Visitor` would benefit from taking ownership of `String` data,
-    /// indiciate this to the `Deserializer` by using `deserialize_string`
+    /// indicate this to the `Deserializer` by using `deserialize_string`
     /// instead.
     fn deserialize_str<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
@@ -1715,7 +1714,7 @@
     }
 }
 
-impl<'de, 'a, A> SeqAccess<'de> for &'a mut A
+impl<'de, 'a, A: ?Sized> SeqAccess<'de> for &'a mut A
 where
     A: SeqAccess<'de>,
 {
@@ -1868,7 +1867,7 @@
     }
 }
 
-impl<'de, 'a, A> MapAccess<'de> for &'a mut A
+impl<'de, 'a, A: ?Sized> MapAccess<'de> for &'a mut A
 where
     A: MapAccess<'de>,
 {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/seed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/seed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/seed.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/seed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+use de::{Deserialize, DeserializeSeed, Deserializer};
+
+/// A DeserializeSeed helper for implementing deserialize_in_place Visitors.
+///
+/// Wraps a mutable reference and calls deserialize_in_place on it.
+pub struct InPlaceSeed<'a, T: 'a>(pub &'a mut T);
+
+impl<'a, 'de, T> DeserializeSeed<'de> for InPlaceSeed<'a, T>
+where
+    T: Deserialize<'de>,
+{
+    type Value = ();
+    fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        T::deserialize_in_place(deserializer, self.0)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/value.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/value.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/de/value.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/de/value.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,8 +24,8 @@
 use lib::*;
 
 use self::private::{First, Second};
-use de::{self, Expected, IntoDeserializer, SeqAccess};
-use private::de::size_hint;
+use __private::size_hint;
+use de::{self, Deserializer, Expected, IntoDeserializer, SeqAccess, Visitor};
 use ser;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -48,7 +48,7 @@
 
 /// A minimal representation of all possible errors that can occur using the
 /// `IntoDeserializer` trait.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct Error {
     err: ErrorImpl,
 }
@@ -93,16 +93,25 @@
 
 impl Display for Error {
     #[cfg(any(feature = "std", feature = "alloc"))]
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.write_str(&self.err)
     }
 
     #[cfg(not(any(feature = "std", feature = "alloc")))]
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.write_str("Serde deserialization error")
     }
 }
 
+impl Debug for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        let mut debug = formatter.debug_tuple("Error");
+        #[cfg(any(feature = "std", feature = "alloc"))]
+        debug.field(&self.err);
+        debug.finish()
+    }
+}
+
 #[cfg(feature = "std")]
 impl error::Error for Error {
     fn description(&self) -> &str {
@@ -126,7 +135,6 @@
 }
 
 /// A deserializer holding a `()`.
-#[derive(Debug)]
 pub struct UnitDeserializer<E> {
     marker: PhantomData<E>,
 }
@@ -160,6 +168,12 @@
     }
 }
 
+impl<E> Debug for UnitDeserializer<E> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.debug_struct("UnitDeserializer").finish()
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /// A deserializer that cannot be instantiated.
@@ -208,7 +222,6 @@
     ($ty:ty, $doc:tt, $name:ident, $method:ident $($cast:tt)*) => {
         #[doc = "A deserializer holding"]
         #[doc = $doc]
-        #[derive(Debug)]
         pub struct $name<E> {
             value: $ty,
             marker: PhantomData<E>
@@ -249,6 +262,15 @@
                 visitor.$method(self.value $($cast)*)
             }
         }
+
+        impl<E> Debug for $name<E> {
+            fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter
+                    .debug_struct(stringify!($name))
+                    .field("value", &self.value)
+                    .finish()
+            }
+        }
     }
 }
 
@@ -272,7 +294,6 @@
 }
 
 /// A deserializer holding a `u32`.
-#[derive(Debug)]
 pub struct U32Deserializer<E> {
     value: u32,
     marker: PhantomData<E>,
@@ -343,10 +364,18 @@
     }
 }
 
+impl<E> Debug for U32Deserializer<E> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter
+            .debug_struct("U32Deserializer")
+            .field("value", &self.value)
+            .finish()
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /// A deserializer holding a `&str`.
-#[derive(Debug)]
 pub struct StrDeserializer<'a, E> {
     value: &'a str,
     marker: PhantomData<E>,
@@ -417,11 +446,19 @@
     }
 }
 
+impl<'a, E> Debug for StrDeserializer<'a, E> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter
+            .debug_struct("StrDeserializer")
+            .field("value", &self.value)
+            .finish()
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /// A deserializer holding a `&str` with a lifetime tied to another
 /// deserializer.
-#[derive(Debug)]
 pub struct BorrowedStrDeserializer<'de, E> {
     value: &'de str,
     marker: PhantomData<E>,
@@ -488,11 +525,19 @@
     }
 }
 
+impl<'de, E> Debug for BorrowedStrDeserializer<'de, E> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter
+            .debug_struct("BorrowedStrDeserializer")
+            .field("value", &self.value)
+            .finish()
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /// A deserializer holding a `String`.
 #[cfg(any(feature = "std", feature = "alloc"))]
-#[derive(Debug)]
 pub struct StringDeserializer<E> {
     value: String,
     marker: PhantomData<E>,
@@ -574,11 +619,20 @@
     }
 }
 
+#[cfg(any(feature = "std", feature = "alloc"))]
+impl<E> Debug for StringDeserializer<E> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter
+            .debug_struct("StringDeserializer")
+            .field("value", &self.value)
+            .finish()
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /// A deserializer holding a `Cow<str>`.
 #[cfg(any(feature = "std", feature = "alloc"))]
-#[derive(Debug)]
 pub struct CowStrDeserializer<'a, E> {
     value: Cow<'a, str>,
     marker: PhantomData<E>,
@@ -663,21 +717,86 @@
     }
 }
 
+#[cfg(any(feature = "std", feature = "alloc"))]
+impl<'a, E> Debug for CowStrDeserializer<'a, E> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter
+            .debug_struct("CowStrDeserializer")
+            .field("value", &self.value)
+            .finish()
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
+/// A deserializer holding a `&[u8]`. Always calls [`Visitor::visit_bytes`].
+pub struct BytesDeserializer<'a, E> {
+    value: &'a [u8],
+    marker: PhantomData<E>,
+}
+
+impl<'a, E> BytesDeserializer<'a, E> {
+    /// Create a new deserializer from the given bytes.
+    pub fn new(value: &'a [u8]) -> Self {
+        BytesDeserializer {
+            value: value,
+            marker: PhantomData,
+        }
+    }
+}
+
+impl_copy_clone!(BytesDeserializer<'a>);
+
+impl<'de, 'a, E> IntoDeserializer<'de, E> for &'a [u8]
+where
+    E: de::Error,
+{
+    type Deserializer = BytesDeserializer<'a, E>;
+
+    fn into_deserializer(self) -> BytesDeserializer<'a, E> {
+        BytesDeserializer::new(self)
+    }
+}
+
+impl<'de, 'a, E> Deserializer<'de> for BytesDeserializer<'a, E>
+where
+    E: de::Error,
+{
+    type Error = E;
+
+    fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+    where
+        V: Visitor<'de>,
+    {
+        visitor.visit_bytes(self.value)
+    }
+
+    forward_to_deserialize_any! {
+        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
+        bytes byte_buf option unit unit_struct newtype_struct seq tuple
+        tuple_struct map struct enum identifier ignored_any
+    }
+}
+
+impl<'a, E> Debug for BytesDeserializer<'a, E> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter
+            .debug_struct("BytesDeserializer")
+            .field("value", &self.value)
+            .finish()
+    }
+}
+
 /// A deserializer holding a `&[u8]` with a lifetime tied to another
-/// deserializer.
-#[derive(Debug)]
+/// deserializer. Always calls [`Visitor::visit_borrowed_bytes`].
 pub struct BorrowedBytesDeserializer<'de, E> {
     value: &'de [u8],
     marker: PhantomData<E>,
 }
 
-impl_copy_clone!(BorrowedBytesDeserializer<'de>);
-
 impl<'de, E> BorrowedBytesDeserializer<'de, E> {
-    /// Create a new borrowed deserializer from the given byte slice.
-    pub fn new(value: &'de [u8]) -> BorrowedBytesDeserializer<'de, E> {
+    /// Create a new borrowed deserializer from the given borrowed bytes.
+    pub fn new(value: &'de [u8]) -> Self {
         BorrowedBytesDeserializer {
             value: value,
             marker: PhantomData,
@@ -685,7 +804,9 @@
     }
 }
 
-impl<'de, E> de::Deserializer<'de> for BorrowedBytesDeserializer<'de, E>
+impl_copy_clone!(BorrowedBytesDeserializer<'de>);
+
+impl<'de, E> Deserializer<'de> for BorrowedBytesDeserializer<'de, E>
 where
     E: de::Error,
 {
@@ -693,7 +814,7 @@
 
     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
-        V: de::Visitor<'de>,
+        V: Visitor<'de>,
     {
         visitor.visit_borrowed_bytes(self.value)
     }
@@ -701,14 +822,23 @@
     forward_to_deserialize_any! {
         bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
         bytes byte_buf option unit unit_struct newtype_struct seq tuple
-        tuple_struct map struct identifier ignored_any enum
+        tuple_struct map struct enum identifier ignored_any
+    }
+}
+
+impl<'de, E> Debug for BorrowedBytesDeserializer<'de, E> {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter
+            .debug_struct("BorrowedBytesDeserializer")
+            .field("value", &self.value)
+            .finish()
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /// A deserializer that iterates over a sequence.
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct SeqDeserializer<I, E> {
     iter: iter::Fuse<I>,
     count: usize,
@@ -813,6 +943,19 @@
     }
 }
 
+impl<I, E> Debug for SeqDeserializer<I, E>
+where
+    I: Debug,
+{
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter
+            .debug_struct("SeqDeserializer")
+            .field("iter", &self.iter)
+            .field("count", &self.count)
+            .finish()
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 #[cfg(any(feature = "std", feature = "alloc"))]
@@ -1108,7 +1251,6 @@
     }
 }
 
-// Cannot #[derive(Debug)] because of the bound `Second<I::Item>: Debug`.
 impl<'de, I, E> Debug for MapDeserializer<'de, I, E>
 where
     I: Iterator + Debug,
@@ -1121,8 +1263,6 @@
             .field("iter", &self.iter)
             .field("value", &self.value)
             .field("count", &self.count)
-            .field("lifetime", &self.lifetime)
-            .field("error", &self.error)
             .finish()
     }
 }
@@ -1331,7 +1471,6 @@
 
     use de::{self, DeserializeSeed, Deserializer, MapAccess, Unexpected, VariantAccess, Visitor};
 
-    #[derive(Clone, Debug)]
     pub struct UnitOnly<E> {
         marker: PhantomData<E>,
     }
@@ -1390,7 +1529,6 @@
         }
     }
 
-    #[derive(Clone, Debug)]
     pub struct MapAsEnum<A> {
         map: A,
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/export.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/export.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/export.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/export.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-pub use lib::clone::Clone;
-pub use lib::convert::{From, Into};
-pub use lib::default::Default;
-pub use lib::fmt::{self, Formatter};
-pub use lib::marker::PhantomData;
-pub use lib::option::Option::{self, None, Some};
-pub use lib::result::Result::{self, Err, Ok};
-
-pub use self::string::from_utf8_lossy;
-
-#[cfg(any(feature = "alloc", feature = "std"))]
-pub use lib::{ToString, Vec};
-
-#[cfg(core_try_from)]
-pub use lib::convert::TryFrom;
-
-mod string {
-    use lib::*;
-
-    #[cfg(any(feature = "std", feature = "alloc"))]
-    pub fn from_utf8_lossy(bytes: &[u8]) -> Cow<str> {
-        String::from_utf8_lossy(bytes)
-    }
-
-    // The generated code calls this like:
-    //
-    //     let value = &_serde::export::from_utf8_lossy(bytes);
-    //     Err(_serde::de::Error::unknown_variant(value, VARIANTS))
-    //
-    // so it is okay for the return type to be different from the std case as long
-    // as the above works.
-    #[cfg(not(any(feature = "std", feature = "alloc")))]
-    pub fn from_utf8_lossy(bytes: &[u8]) -> &str {
-        // Three unicode replacement characters if it fails. They look like a
-        // white-on-black question mark. The user will recognize it as invalid
-        // UTF-8.
-        str::from_utf8(bytes).unwrap_or("\u{fffd}\u{fffd}\u{fffd}")
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/integer128.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/integer128.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/integer128.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/integer128.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
 /// bother with this macro and may assume support for 128-bit integers.
 ///
 /// ```edition2018
-/// # use serde::private::ser::Error;
+/// # use serde::__private::doc::Error;
 /// #
 /// # struct MySerializer;
 /// #
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,11 +9,9 @@
 //! these two groups interact with each other, allowing any supported data
 //! structure to be serialized and deserialized using any supported data format.
 //!
-//! See the Serde website [https://serde.rs/] for additional documentation and
+//! See the Serde website <https://serde.rs/> for additional documentation and
 //! usage examples.
 //!
-//! [https://serde.rs/]: https://serde.rs/
-//!
 //! ## Design
 //!
 //! Where many other languages rely on runtime reflection for serializing data,
@@ -46,7 +44,7 @@
 //! - [BSON], the data storage and network transfer format used by MongoDB.
 //! - [Avro], a binary format used within Apache Hadoop, with support for schema
 //!   definition.
-//! - [JSON5], A superset of JSON including some productions from ES5.
+//! - [JSON5], a superset of JSON including some productions from ES5.
 //! - [Postcard], a no\_std and embedded-systems friendly compact binary format.
 //! - [URL] query strings, in the x-www-form-urlencoded format.
 //! - [Envy], a way to deserialize environment variables into Rust structs.
@@ -57,6 +55,8 @@
 //!   Lisp language family.
 //! - [D-Bus]'s binary wire format.
 //! - [FlexBuffers], the schemaless cousin of Google's FlatBuffers zero-copy serialization format.
+//! - [DynamoDB Items], the format used by [rusoto_dynamodb] to transfer data to
+//!   and from DynamoDB.
 //!
 //! [JSON]: https://github.com/serde-rs/json
 //! [Bincode]: https://github.com/servo/bincode
@@ -78,11 +78,13 @@
 //! [S-expressions]: https://github.com/rotty/lexpr-rs
 //! [D-Bus]: https://docs.rs/zvariant
 //! [FlexBuffers]: https://github.com/google/flatbuffers/tree/master/rust/flexbuffers
+//! [DynamoDB Items]: https://docs.rs/serde_dynamo
+//! [rusoto_dynamodb]: https://docs.rs/rusoto_dynamodb
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.118")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.130")]
 // Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
 // Unstable functionality only if the user asks for it. For tracking and
@@ -118,6 +120,7 @@
         zero_prefixed_literal,
         // correctly used
         enum_glob_use,
+        let_underscore_drop,
         map_err_ignore,
         result_unit_err,
         wildcard_imports,
@@ -136,7 +139,6 @@
     )
 )]
 // Rustc lints.
-#![forbid(unsafe_code)]
 #![deny(missing_docs, unused_imports)]
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -155,7 +157,7 @@
         pub use std::*;
     }
 
-    pub use self::core::{cmp, iter, mem, num, slice, str};
+    pub use self::core::{cmp, iter, mem, num, ptr, slice, str};
     pub use self::core::{f32, f64};
     pub use self::core::{i16, i32, i64, i8, isize};
     pub use self::core::{u16, u32, u64, u8, usize};
@@ -264,13 +266,18 @@
 #[doc(inline)]
 pub use ser::{Serialize, Serializer};
 
-// Generated code uses these to support no_std. Not public API.
+// Used by generated code and doc tests. Not public API.
 #[doc(hidden)]
-pub mod export;
+#[path = "private/mod.rs"]
+pub mod __private;
 
-// Helpers used by generated code and doc tests. Not public API.
-#[doc(hidden)]
-pub mod private;
+#[allow(unused_imports)]
+use self::__private as export;
+#[allow(unused_imports)]
+use self::__private as private;
+
+#[path = "de/seed.rs"]
+mod seed;
 
 #[cfg(not(feature = "std"))]
 mod std_error;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -124,7 +124,7 @@
 macro_rules! forward_to_deserialize_any_method {
     ($func:ident<$l:tt, $v:ident>($($arg:ident : $ty:ty),*)) => {
         #[inline]
-        fn $func<$v>(self, $($arg: $ty,)* visitor: $v) -> $crate::export::Result<$v::Value, Self::Error>
+        fn $func<$v>(self, $($arg: $ty,)* visitor: $v) -> $crate::__private::Result<$v::Value, Self::Error>
         where
             $v: $crate::de::Visitor<$l>,
         {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/de.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/de.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/de.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/de.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,10 @@
 use lib::*;
 
-use de::{Deserialize, DeserializeSeed, Deserializer, Error, IntoDeserializer, Visitor};
+use de::value::{BorrowedBytesDeserializer, BytesDeserializer};
+use de::{Deserialize, Deserializer, Error, IntoDeserializer, Visitor};
 
 #[cfg(any(feature = "std", feature = "alloc"))]
-use de::{MapAccess, Unexpected};
+use de::{DeserializeSeed, MapAccess, Unexpected};
 
 #[cfg(any(feature = "std", feature = "alloc"))]
 pub use self::content::{
@@ -12,6 +13,8 @@
     TagOrContentField, TagOrContentFieldVisitor, TaggedContentVisitor, UntaggedUnitVisitor,
 };
 
+pub use seed::InPlaceSeed;
+
 /// If the missing field is of type `Option<T>` then treat is as `None`,
 /// otherwise it is an error.
 pub fn missing_field<'de, V, E>(field: &'static str) -> Result<V, E>
@@ -188,29 +191,6 @@
         .map(From::from)
 }
 
-pub mod size_hint {
-    use lib::*;
-
-    pub fn from_bounds<I>(iter: &I) -> Option<usize>
-    where
-        I: Iterator,
-    {
-        helper(iter.size_hint())
-    }
-
-    #[inline]
-    pub fn cautious(hint: Option<usize>) -> usize {
-        cmp::min(hint.unwrap_or(0), 4096)
-    }
-
-    fn helper(bounds: (usize, Option<usize>)) -> Option<usize> {
-        match bounds {
-            (lower, Some(upper)) if lower == upper => Some(upper),
-            _ => None,
-        }
-    }
-}
-
 #[cfg(any(feature = "std", feature = "alloc"))]
 mod content {
     // This module is private and nothing here should be used outside of
@@ -225,7 +205,7 @@
 
     use lib::*;
 
-    use super::size_hint;
+    use __private::size_hint;
     use de::{
         self, Deserialize, DeserializeSeed, Deserializer, EnumAccess, Expected, IgnoredAny,
         MapAccess, SeqAccess, Unexpected, Visitor,
@@ -824,15 +804,17 @@
     /// Not public API.
     pub struct TaggedContentVisitor<'de, T> {
         tag_name: &'static str,
+        expecting: &'static str,
         value: PhantomData<TaggedContent<'de, T>>,
     }
 
     impl<'de, T> TaggedContentVisitor<'de, T> {
         /// Visitor for the content of an internally tagged enum with the given
         /// tag name.
-        pub fn new(name: &'static str) -> Self {
+        pub fn new(name: &'static str, expecting: &'static str) -> Self {
             TaggedContentVisitor {
                 tag_name: name,
+                expecting: expecting,
                 value: PhantomData,
             }
         }
@@ -861,7 +843,7 @@
         type Value = TaggedContent<'de, T>;
 
         fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-            fmt.write_str("internally tagged enum")
+            fmt.write_str(self.expecting)
         }
 
         fn visit_seq<S>(self, mut seq: S) -> Result<Self::Value, S::Error>
@@ -1040,6 +1022,25 @@
                 _ => Err(self.invalid_type(&visitor)),
             }
         }
+
+        fn deserialize_float<V>(self, visitor: V) -> Result<V::Value, E>
+        where
+            V: Visitor<'de>,
+        {
+            match self.content {
+                Content::F32(v) => visitor.visit_f32(v),
+                Content::F64(v) => visitor.visit_f64(v),
+                Content::U8(v) => visitor.visit_u8(v),
+                Content::U16(v) => visitor.visit_u16(v),
+                Content::U32(v) => visitor.visit_u32(v),
+                Content::U64(v) => visitor.visit_u64(v),
+                Content::I8(v) => visitor.visit_i8(v),
+                Content::I16(v) => visitor.visit_i16(v),
+                Content::I32(v) => visitor.visit_i32(v),
+                Content::I64(v) => visitor.visit_i64(v),
+                _ => Err(self.invalid_type(&visitor)),
+            }
+        }
     }
 
     fn visit_content_seq<'de, V, E>(content: Vec<Content<'de>>, visitor: V) -> Result<V::Value, E>
@@ -1179,25 +1180,14 @@
         where
             V: Visitor<'de>,
         {
-            match self.content {
-                Content::F32(v) => visitor.visit_f32(v),
-                Content::F64(v) => visitor.visit_f64(v),
-                Content::U64(v) => visitor.visit_u64(v),
-                Content::I64(v) => visitor.visit_i64(v),
-                _ => Err(self.invalid_type(&visitor)),
-            }
+            self.deserialize_float(visitor)
         }
 
         fn deserialize_f64<V>(self, visitor: V) -> Result<V::Value, Self::Error>
         where
             V: Visitor<'de>,
         {
-            match self.content {
-                Content::F64(v) => visitor.visit_f64(v),
-                Content::U64(v) => visitor.visit_u64(v),
-                Content::I64(v) => visitor.visit_i64(v),
-                _ => Err(self.invalid_type(&visitor)),
-            }
+            self.deserialize_float(visitor)
         }
 
         fn deserialize_char<V>(self, visitor: V) -> Result<V::Value, Self::Error>
@@ -1297,8 +1287,9 @@
                 //     }
                 //
                 // We want {"topic":"Info"} to deserialize even though
-                // ordinarily unit structs do not deserialize from empty map.
+                // ordinarily unit structs do not deserialize from empty map/seq.
                 Content::Map(ref v) if v.is_empty() => visitor.visit_unit(),
+                Content::Seq(ref v) if v.is_empty() => visitor.visit_unit(),
                 _ => self.deserialize_any(visitor),
             }
         }
@@ -1751,6 +1742,25 @@
                 _ => Err(self.invalid_type(&visitor)),
             }
         }
+
+        fn deserialize_float<V>(self, visitor: V) -> Result<V::Value, E>
+        where
+            V: Visitor<'de>,
+        {
+            match *self.content {
+                Content::F32(v) => visitor.visit_f32(v),
+                Content::F64(v) => visitor.visit_f64(v),
+                Content::U8(v) => visitor.visit_u8(v),
+                Content::U16(v) => visitor.visit_u16(v),
+                Content::U32(v) => visitor.visit_u32(v),
+                Content::U64(v) => visitor.visit_u64(v),
+                Content::I8(v) => visitor.visit_i8(v),
+                Content::I16(v) => visitor.visit_i16(v),
+                Content::I32(v) => visitor.visit_i32(v),
+                Content::I64(v) => visitor.visit_i64(v),
+                _ => Err(self.invalid_type(&visitor)),
+            }
+        }
     }
 
     fn visit_content_seq_ref<'a, 'de, V, E>(
@@ -1898,25 +1908,14 @@
         where
             V: Visitor<'de>,
         {
-            match *self.content {
-                Content::F32(v) => visitor.visit_f32(v),
-                Content::F64(v) => visitor.visit_f64(v),
-                Content::U64(v) => visitor.visit_u64(v),
-                Content::I64(v) => visitor.visit_i64(v),
-                _ => Err(self.invalid_type(&visitor)),
-            }
+            self.deserialize_float(visitor)
         }
 
         fn deserialize_f64<V>(self, visitor: V) -> Result<V::Value, Self::Error>
         where
             V: Visitor<'de>,
         {
-            match *self.content {
-                Content::F64(v) => visitor.visit_f64(v),
-                Content::U64(v) => visitor.visit_u64(v),
-                Content::I64(v) => visitor.visit_i64(v),
-                _ => Err(self.invalid_type(&visitor)),
-            }
+            self.deserialize_float(visitor)
         }
 
         fn deserialize_char<V>(self, visitor: V) -> Result<V::Value, Self::Error>
@@ -2542,11 +2541,13 @@
     fn from(self) -> Self::Deserializer;
 }
 
-impl<'de, E> IdentifierDeserializer<'de, E> for u32
+pub struct Borrowed<'de, T: 'de + ?Sized>(pub &'de T);
+
+impl<'de, E> IdentifierDeserializer<'de, E> for u64
 where
     E: Error,
 {
-    type Deserializer = <u32 as IntoDeserializer<'de, E>>::Deserializer;
+    type Deserializer = <u64 as IntoDeserializer<'de, E>>::Deserializer;
 
     fn from(self) -> Self::Deserializer {
         self.into_deserializer()
@@ -2558,21 +2559,32 @@
     marker: PhantomData<E>,
 }
 
-impl<'a, E> IdentifierDeserializer<'a, E> for &'a str
+impl<'de, 'a, E> Deserializer<'de> for StrDeserializer<'a, E>
 where
     E: Error,
 {
-    type Deserializer = StrDeserializer<'a, E>;
+    type Error = E;
 
-    fn from(self) -> Self::Deserializer {
-        StrDeserializer {
-            value: self,
-            marker: PhantomData,
-        }
+    fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+    where
+        V: Visitor<'de>,
+    {
+        visitor.visit_str(self.value)
+    }
+
+    forward_to_deserialize_any! {
+        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
+        bytes byte_buf option unit unit_struct newtype_struct seq tuple
+        tuple_struct map struct enum identifier ignored_any
     }
 }
 
-impl<'de, 'a, E> Deserializer<'de> for StrDeserializer<'a, E>
+pub struct BorrowedStrDeserializer<'de, E> {
+    value: &'de str,
+    marker: PhantomData<E>,
+}
+
+impl<'de, E> Deserializer<'de> for BorrowedStrDeserializer<'de, E>
 where
     E: Error,
 {
@@ -2582,7 +2594,7 @@
     where
         V: Visitor<'de>,
     {
-        visitor.visit_str(self.value)
+        visitor.visit_borrowed_str(self.value)
     }
 
     forward_to_deserialize_any! {
@@ -2592,60 +2604,53 @@
     }
 }
 
-pub struct BytesDeserializer<'a, E> {
-    value: &'a [u8],
-    marker: PhantomData<E>,
-}
-
-impl<'a, E> IdentifierDeserializer<'a, E> for &'a [u8]
+impl<'a, E> IdentifierDeserializer<'a, E> for &'a str
 where
     E: Error,
 {
-    type Deserializer = BytesDeserializer<'a, E>;
+    type Deserializer = StrDeserializer<'a, E>;
 
     fn from(self) -> Self::Deserializer {
-        BytesDeserializer {
+        StrDeserializer {
             value: self,
             marker: PhantomData,
         }
     }
 }
 
-impl<'de, 'a, E> Deserializer<'de> for BytesDeserializer<'a, E>
+impl<'de, E> IdentifierDeserializer<'de, E> for Borrowed<'de, str>
 where
     E: Error,
 {
-    type Error = E;
+    type Deserializer = BorrowedStrDeserializer<'de, E>;
 
-    fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
-    where
-        V: Visitor<'de>,
-    {
-        visitor.visit_bytes(self.value)
+    fn from(self) -> Self::Deserializer {
+        BorrowedStrDeserializer {
+            value: self.0,
+            marker: PhantomData,
+        }
     }
+}
 
-    forward_to_deserialize_any! {
-        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
-        bytes byte_buf option unit unit_struct newtype_struct seq tuple
-        tuple_struct map struct enum identifier ignored_any
+impl<'a, E> IdentifierDeserializer<'a, E> for &'a [u8]
+where
+    E: Error,
+{
+    type Deserializer = BytesDeserializer<'a, E>;
+
+    fn from(self) -> Self::Deserializer {
+        BytesDeserializer::new(self)
     }
 }
 
-/// A DeserializeSeed helper for implementing deserialize_in_place Visitors.
-///
-/// Wraps a mutable reference and calls deserialize_in_place on it.
-pub struct InPlaceSeed<'a, T: 'a>(pub &'a mut T);
-
-impl<'a, 'de, T> DeserializeSeed<'de> for InPlaceSeed<'a, T>
+impl<'de, E> IdentifierDeserializer<'de, E> for Borrowed<'de, [u8]>
 where
-    T: Deserialize<'de>,
+    E: Error,
 {
-    type Value = ();
-    fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        T::deserialize_in_place(deserializer, self.0)
+    type Deserializer = BorrowedBytesDeserializer<'de, E>;
+
+    fn from(self) -> Self::Deserializer {
+        BorrowedBytesDeserializer::new(self.0)
     }
 }
 
@@ -2827,7 +2832,7 @@
     where
         T: DeserializeSeed<'de>,
     {
-        while let Some(item) = self.iter.next() {
+        for item in &mut self.iter {
             // Items in the vector are nulled out when used by a struct.
             if let Some((ref key, ref content)) = *item {
                 self.pending_content = Some(content);
@@ -2929,7 +2934,7 @@
     where
         T: DeserializeSeed<'de>,
     {
-        while let Some(item) = self.iter.next() {
+        for item in &mut self.iter {
             if let Some((ref key, ref content)) = *item {
                 // Do not take(), instead borrow this entry. The internally tagged
                 // enum does its own buffering so we can't tell whether this entry
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/doc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/doc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/doc.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/doc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,159 @@
+// Used only by Serde doc tests. Not public API.
+
+use lib::*;
+
+use ser;
+
+#[doc(hidden)]
+#[derive(Debug)]
+pub struct Error;
+
+impl ser::Error for Error {
+    fn custom<T>(_: T) -> Self
+    where
+        T: Display,
+    {
+        unimplemented!()
+    }
+}
+
+#[cfg(feature = "std")]
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        unimplemented!()
+    }
+}
+
+impl Display for Error {
+    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
+        unimplemented!()
+    }
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __private_serialize {
+    () => {
+        trait Serialize {
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where
+                S: $crate::Serializer;
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! __serialize_unimplemented {
+    ($($func:ident)*) => {
+        $(
+            __serialize_unimplemented_helper!($func);
+        )*
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __serialize_unimplemented_method {
+    ($func:ident $(<$t:ident>)* ($($arg:ty),*) -> $ret:ident) => {
+        fn $func $(<$t: ?Sized + $crate::Serialize>)* (self $(, _: $arg)*) -> $crate::__private::Result<Self::$ret, Self::Error> {
+            unimplemented!()
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! __serialize_unimplemented_helper {
+    (bool) => {
+        __serialize_unimplemented_method!(serialize_bool(bool) -> Ok);
+    };
+    (i8) => {
+        __serialize_unimplemented_method!(serialize_i8(i8) -> Ok);
+    };
+    (i16) => {
+        __serialize_unimplemented_method!(serialize_i16(i16) -> Ok);
+    };
+    (i32) => {
+        __serialize_unimplemented_method!(serialize_i32(i32) -> Ok);
+    };
+    (i64) => {
+        __serialize_unimplemented_method!(serialize_i64(i64) -> Ok);
+    };
+    (u8) => {
+        __serialize_unimplemented_method!(serialize_u8(u8) -> Ok);
+    };
+    (u16) => {
+        __serialize_unimplemented_method!(serialize_u16(u16) -> Ok);
+    };
+    (u32) => {
+        __serialize_unimplemented_method!(serialize_u32(u32) -> Ok);
+    };
+    (u64) => {
+        __serialize_unimplemented_method!(serialize_u64(u64) -> Ok);
+    };
+    (f32) => {
+        __serialize_unimplemented_method!(serialize_f32(f32) -> Ok);
+    };
+    (f64) => {
+        __serialize_unimplemented_method!(serialize_f64(f64) -> Ok);
+    };
+    (char) => {
+        __serialize_unimplemented_method!(serialize_char(char) -> Ok);
+    };
+    (str) => {
+        __serialize_unimplemented_method!(serialize_str(&str) -> Ok);
+    };
+    (bytes) => {
+        __serialize_unimplemented_method!(serialize_bytes(&[u8]) -> Ok);
+    };
+    (none) => {
+        __serialize_unimplemented_method!(serialize_none() -> Ok);
+    };
+    (some) => {
+        __serialize_unimplemented_method!(serialize_some<T>(&T) -> Ok);
+    };
+    (unit) => {
+        __serialize_unimplemented_method!(serialize_unit() -> Ok);
+    };
+    (unit_struct) => {
+        __serialize_unimplemented_method!(serialize_unit_struct(&str) -> Ok);
+    };
+    (unit_variant) => {
+        __serialize_unimplemented_method!(serialize_unit_variant(&str, u32, &str) -> Ok);
+    };
+    (newtype_struct) => {
+        __serialize_unimplemented_method!(serialize_newtype_struct<T>(&str, &T) -> Ok);
+    };
+    (newtype_variant) => {
+        __serialize_unimplemented_method!(serialize_newtype_variant<T>(&str, u32, &str, &T) -> Ok);
+    };
+    (seq) => {
+        type SerializeSeq = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_seq(Option<usize>) -> SerializeSeq);
+    };
+    (tuple) => {
+        type SerializeTuple = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple(usize) -> SerializeTuple);
+    };
+    (tuple_struct) => {
+        type SerializeTupleStruct = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple_struct(&str, usize) -> SerializeTupleStruct);
+    };
+    (tuple_variant) => {
+        type SerializeTupleVariant = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple_variant(&str, u32, &str, usize) -> SerializeTupleVariant);
+    };
+    (map) => {
+        type SerializeMap = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_map(Option<usize>) -> SerializeMap);
+    };
+    (struct) => {
+        type SerializeStruct = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_struct(&str, usize) -> SerializeStruct);
+    };
+    (struct_variant) => {
+        type SerializeStructVariant = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_struct_variant(&str, u32, &str, usize) -> SerializeStructVariant);
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/macros.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-#[doc(hidden)]
-#[macro_export]
-macro_rules! __private_serialize {
-    () => {
-        trait Serialize {
-            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-            where
-                S: $crate::Serializer;
-        }
-    };
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! __private_deserialize {
-    () => {
-        trait Deserialize<'de>: Sized {
-            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-            where
-                D: $crate::Deserializer<'de>;
-        }
-    };
-}
-
-/// Used only by Serde doc tests. Not public API.
-#[doc(hidden)]
-#[macro_export(local_inner_macros)]
-macro_rules! __serialize_unimplemented {
-    ($($func:ident)*) => {
-        $(
-            __serialize_unimplemented_helper!($func);
-        )*
-    };
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! __serialize_unimplemented_method {
-    ($func:ident $(<$t:ident>)* ($($arg:ty),*) -> $ret:ident) => {
-        fn $func $(<$t: ?Sized + $crate::Serialize>)* (self $(, _: $arg)*) -> $crate::export::Result<Self::$ret, Self::Error> {
-            unimplemented!()
-        }
-    };
-}
-
-#[doc(hidden)]
-#[macro_export(local_inner_macros)]
-macro_rules! __serialize_unimplemented_helper {
-    (bool) => {
-        __serialize_unimplemented_method!(serialize_bool(bool) -> Ok);
-    };
-    (i8) => {
-        __serialize_unimplemented_method!(serialize_i8(i8) -> Ok);
-    };
-    (i16) => {
-        __serialize_unimplemented_method!(serialize_i16(i16) -> Ok);
-    };
-    (i32) => {
-        __serialize_unimplemented_method!(serialize_i32(i32) -> Ok);
-    };
-    (i64) => {
-        __serialize_unimplemented_method!(serialize_i64(i64) -> Ok);
-    };
-    (u8) => {
-        __serialize_unimplemented_method!(serialize_u8(u8) -> Ok);
-    };
-    (u16) => {
-        __serialize_unimplemented_method!(serialize_u16(u16) -> Ok);
-    };
-    (u32) => {
-        __serialize_unimplemented_method!(serialize_u32(u32) -> Ok);
-    };
-    (u64) => {
-        __serialize_unimplemented_method!(serialize_u64(u64) -> Ok);
-    };
-    (f32) => {
-        __serialize_unimplemented_method!(serialize_f32(f32) -> Ok);
-    };
-    (f64) => {
-        __serialize_unimplemented_method!(serialize_f64(f64) -> Ok);
-    };
-    (char) => {
-        __serialize_unimplemented_method!(serialize_char(char) -> Ok);
-    };
-    (str) => {
-        __serialize_unimplemented_method!(serialize_str(&str) -> Ok);
-    };
-    (bytes) => {
-        __serialize_unimplemented_method!(serialize_bytes(&[u8]) -> Ok);
-    };
-    (none) => {
-        __serialize_unimplemented_method!(serialize_none() -> Ok);
-    };
-    (some) => {
-        __serialize_unimplemented_method!(serialize_some<T>(&T) -> Ok);
-    };
-    (unit) => {
-        __serialize_unimplemented_method!(serialize_unit() -> Ok);
-    };
-    (unit_struct) => {
-        __serialize_unimplemented_method!(serialize_unit_struct(&str) -> Ok);
-    };
-    (unit_variant) => {
-        __serialize_unimplemented_method!(serialize_unit_variant(&str, u32, &str) -> Ok);
-    };
-    (newtype_struct) => {
-        __serialize_unimplemented_method!(serialize_newtype_struct<T>(&str, &T) -> Ok);
-    };
-    (newtype_variant) => {
-        __serialize_unimplemented_method!(serialize_newtype_variant<T>(&str, u32, &str, &T) -> Ok);
-    };
-    (seq) => {
-        type SerializeSeq = $crate::ser::Impossible<Self::Ok, Self::Error>;
-        __serialize_unimplemented_method!(serialize_seq(Option<usize>) -> SerializeSeq);
-    };
-    (tuple) => {
-        type SerializeTuple = $crate::ser::Impossible<Self::Ok, Self::Error>;
-        __serialize_unimplemented_method!(serialize_tuple(usize) -> SerializeTuple);
-    };
-    (tuple_struct) => {
-        type SerializeTupleStruct = $crate::ser::Impossible<Self::Ok, Self::Error>;
-        __serialize_unimplemented_method!(serialize_tuple_struct(&str, usize) -> SerializeTupleStruct);
-    };
-    (tuple_variant) => {
-        type SerializeTupleVariant = $crate::ser::Impossible<Self::Ok, Self::Error>;
-        __serialize_unimplemented_method!(serialize_tuple_variant(&str, u32, &str, usize) -> SerializeTupleVariant);
-    };
-    (map) => {
-        type SerializeMap = $crate::ser::Impossible<Self::Ok, Self::Error>;
-        __serialize_unimplemented_method!(serialize_map(Option<usize>) -> SerializeMap);
-    };
-    (struct) => {
-        type SerializeStruct = $crate::ser::Impossible<Self::Ok, Self::Error>;
-        __serialize_unimplemented_method!(serialize_struct(&str, usize) -> SerializeStruct);
-    };
-    (struct_variant) => {
-        type SerializeStructVariant = $crate::ser::Impossible<Self::Ok, Self::Error>;
-        __serialize_unimplemented_method!(serialize_struct_variant(&str, u32, &str, usize) -> SerializeStructVariant);
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,50 @@
-mod macros;
-
+#[cfg(serde_derive)]
 pub mod de;
+#[cfg(serde_derive)]
 pub mod ser;
+
+pub mod size_hint;
+
+// FIXME: #[cfg(doctest)] once https://github.com/rust-lang/rust/issues/67295 is fixed.
+pub mod doc;
+
+pub use lib::clone::Clone;
+pub use lib::convert::{From, Into};
+pub use lib::default::Default;
+pub use lib::fmt::{self, Formatter};
+pub use lib::marker::PhantomData;
+pub use lib::option::Option::{self, None, Some};
+pub use lib::ptr;
+pub use lib::result::Result::{self, Err, Ok};
+
+pub use self::string::from_utf8_lossy;
+
+#[cfg(any(feature = "alloc", feature = "std"))]
+pub use lib::{ToString, Vec};
+
+#[cfg(core_try_from)]
+pub use lib::convert::TryFrom;
+
+mod string {
+    use lib::*;
+
+    #[cfg(any(feature = "std", feature = "alloc"))]
+    pub fn from_utf8_lossy(bytes: &[u8]) -> Cow<str> {
+        String::from_utf8_lossy(bytes)
+    }
+
+    // The generated code calls this like:
+    //
+    //     let value = &_serde::__private::from_utf8_lossy(bytes);
+    //     Err(_serde::de::Error::unknown_variant(value, VARIANTS))
+    //
+    // so it is okay for the return type to be different from the std case as long
+    // as the above works.
+    #[cfg(not(any(feature = "std", feature = "alloc")))]
+    pub fn from_utf8_lossy(bytes: &[u8]) -> &str {
+        // Three unicode replacement characters if it fails. They look like a
+        // white-on-black question mark. The user will recognize it as invalid
+        // UTF-8.
+        str::from_utf8(bytes).unwrap_or("\u{fffd}\u{fffd}\u{fffd}")
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/ser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/ser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/ser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/ser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -335,33 +335,6 @@
     }
 }
 
-/// Used only by Serde doc tests. Not public API.
-#[doc(hidden)]
-#[derive(Debug)]
-pub struct Error;
-
-impl ser::Error for Error {
-    fn custom<T>(_: T) -> Self
-    where
-        T: Display,
-    {
-        unimplemented!()
-    }
-}
-
-#[cfg(feature = "std")]
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        unimplemented!()
-    }
-}
-
-impl Display for Error {
-    fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
-        unimplemented!()
-    }
-}
-
 #[cfg(any(feature = "std", feature = "alloc"))]
 mod content {
     use lib::*;
@@ -452,7 +425,6 @@
         }
     }
 
-    #[derive(Debug)]
     pub enum Content {
         Bool(bool),
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/size_hint.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/size_hint.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/private/size_hint.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/private/size_hint.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+use lib::*;
+
+pub fn from_bounds<I>(iter: &I) -> Option<usize>
+where
+    I: Iterator,
+{
+    helper(iter.size_hint())
+}
+
+#[cfg(any(feature = "std", feature = "alloc"))]
+#[inline]
+pub fn cautious(hint: Option<usize>) -> usize {
+    cmp::min(hint.unwrap_or(0), 4096)
+}
+
+fn helper(bounds: (usize, Option<usize>)) -> Option<usize> {
+    match bounds {
+        (lower, Some(upper)) if lower == upper => Some(upper),
+        _ => None,
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/ser/impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/ser/impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/ser/impls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/ser/impls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -675,6 +675,52 @@
 }
 
 #[cfg(feature = "std")]
+const DEC_DIGITS_LUT: &'static [u8] = b"\
+      0001020304050607080910111213141516171819\
+      2021222324252627282930313233343536373839\
+      4041424344454647484950515253545556575859\
+      6061626364656667686970717273747576777879\
+      8081828384858687888990919293949596979899";
+
+#[cfg(feature = "std")]
+#[inline]
+fn format_u8(mut n: u8, out: &mut [u8]) -> usize {
+    if n >= 100 {
+        let d1 = ((n % 100) << 1) as usize;
+        n /= 100;
+        out[0] = b'0' + n;
+        out[1] = DEC_DIGITS_LUT[d1];
+        out[2] = DEC_DIGITS_LUT[d1 + 1];
+        3
+    } else if n >= 10 {
+        let d1 = (n << 1) as usize;
+        out[0] = DEC_DIGITS_LUT[d1];
+        out[1] = DEC_DIGITS_LUT[d1 + 1];
+        2
+    } else {
+        out[0] = b'0' + n;
+        1
+    }
+}
+
+#[cfg(feature = "std")]
+#[test]
+fn test_format_u8() {
+    let mut i = 0u8;
+
+    loop {
+        let mut buf = [0u8; 3];
+        let written = format_u8(i, &mut buf);
+        assert_eq!(i.to_string().as_bytes(), &buf[..written]);
+
+        match i.checked_add(1) {
+            Some(next) => i = next,
+            None => break,
+        }
+    }
+}
+
+#[cfg(feature = "std")]
 impl Serialize for net::Ipv4Addr {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -683,7 +729,14 @@
         if serializer.is_human_readable() {
             const MAX_LEN: usize = 15;
             debug_assert_eq!(MAX_LEN, "101.102.103.104".len());
-            serialize_display_bounded_length!(self, MAX_LEN, serializer)
+            let mut buf = [b'.'; MAX_LEN];
+            let mut written = format_u8(self.octets()[0], &mut buf);
+            for oct in &self.octets()[1..] {
+                // Skip over delimiters that we initialized buf with
+                written += format_u8(*oct, &mut buf[written + 1..]) + 1;
+            }
+            // We've only written ASCII bytes to the buffer, so it is valid UTF-8
+            serializer.serialize_str(unsafe { str::from_utf8_unchecked(&buf[..written]) })
         } else {
             self.octets().serialize(serializer)
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/ser/impossible.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/ser/impossible.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/ser/impossible.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/ser/impossible.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,7 +17,7 @@
 ///
 /// ```edition2018
 /// # use serde::ser::{Serializer, Impossible};
-/// # use serde::private::ser::Error;
+/// # use serde::__private::doc::Error;
 /// #
 /// # struct MySerializer;
 /// #
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/ser/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/ser/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde/src/ser/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde/src/ser/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -711,7 +711,7 @@
     ///
     /// ```edition2018
     /// # use serde::ser::{Serializer, SerializeSeq};
-    /// # use serde::private::ser::Error;
+    /// # use serde::__private::doc::Error;
     /// #
     /// # struct MySerializer;
     /// #
@@ -1279,9 +1279,20 @@
     {
         let iter = iter.into_iter();
         let mut serializer = try!(self.serialize_seq(iterator_len_hint(&iter)));
-        for item in iter {
-            try!(serializer.serialize_element(&item));
+
+        #[cfg(iterator_try_fold)]
+        {
+            let mut iter = iter;
+            try!(iter.try_for_each(|item| serializer.serialize_element(&item)));
+        }
+
+        #[cfg(not(iterator_try_fold))]
+        {
+            for item in iter {
+                try!(serializer.serialize_element(&item));
+            }
         }
+
         serializer.end()
     }
 
@@ -1319,9 +1330,20 @@
     {
         let iter = iter.into_iter();
         let mut serializer = try!(self.serialize_map(iterator_len_hint(&iter)));
-        for (key, value) in iter {
-            try!(serializer.serialize_entry(&key, &value));
+
+        #[cfg(iterator_try_fold)]
+        {
+            let mut iter = iter;
+            try!(iter.try_for_each(|(key, value)| serializer.serialize_entry(&key, &value)));
+        }
+
+        #[cfg(not(iterator_try_fold))]
+        {
+            for (key, value) in iter {
+                try!(serializer.serialize_entry(&key, &value));
+            }
         }
+
         serializer.end()
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,6 +16,12 @@
     if minor >= 37 {
         println!("cargo:rustc-cfg=underscore_consts");
     }
+
+    // The ptr::addr_of! macro stabilized in Rust 1.51:
+    // https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#stabilized-apis
+    if minor >= 51 {
+        println!("cargo:rustc-cfg=ptr_addr_of");
+    }
 }
 
 fn rustc_minor_version() -> Option<u32> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"11158dadd2edd6f90098847974f61b27958d992874cb82b345a807d8dad0d745","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5cf9d2158d70048a2916360ad59d9079f6233c6f68781a7a792e70f8b772d8ce","build.rs":"17fac4a28904e90c1e46b517839bd17fd54dbc69cfbff7451f695ecf7bab34ef","crates-io.md":"25ed421fe25d0f6f74c4b78674144bef2843a5f78bf552d0a8ec633be69d282b","src/bound.rs":"66643d6cd044a2167b2bb8a1970e5b2a07069e362ce1326a4b00fef7bcfcd5c8","src/de.rs":"39832ecad5aedbb57bc1e8f8f62e18e1cc7e659456aca9856c3dfcceb6cf0d16","src/dummy.rs":"7bc4267039808046fe0a7fbeb462b301ac30ea1152fcbde8a3b934dc143fe468","src/fragment.rs":"5548ba65a53d90a296f60c1328a7a7fb040db467f59c2f5210b2fb320457145d","src/internals/ast.rs":"f1a1b13cf6b68e2bf27c5cdcdbde6883f86cde1ba8c0595dffdbf2e11c4ec8b1","src/internals/attr.rs":"554bf48da8fb4e8a5ac2d16143cc9dc05e9bc493b4a4c8a196ace360bce110d5","src/internals/case.rs":"b2024f414f5d832bafa53b9ae7924b2d43a29175b19bb3da36f15c9071666558","src/internals/check.rs":"9a01a0db1fc3086891e998f544836e7498ebfc7cc5e1956199d0526e6a8d9a3c","src/internals/ctxt.rs":"6fa544ae52914498a62a395818ebdc1b36ac2fb5903c60afb741a864ad559f1c","src/internals/mod.rs":"989df41dae7a9066eec3e5afd5b262fd94a12281df30f4c03f319370811beea0","src/internals/symbol.rs":"9f2b4b9cd83dc09def75165187c97d0050bffa4218782c27b478bcf93f925a74","src/lib.rs":"03d0fc248521ae2ea1ef52ffd4db3839131358ccaf79145942deffded2f743c1","src/pretend.rs":"ffeb23da4c2abc4e501c378cffa8b776bab506735ea70d4ed10f4c0f3755321b","src/ser.rs":"4ac3d23e5a84b72137d42eaa38ef8ec1516c4d4d9ca040dc5ce2abbf33126443","src/try.rs":"b9a10c8690d442a57fc7097d42c9a4f13034c7b4a30b7eb02d538fdbf8ae0a8d"},"package":"c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"}
\ No newline at end of file
+{"files":{"Cargo.toml":"900a8fd1ed5ed528dee953b986d99caef871be0e180d75a867e4d6d552c15ef2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5cf9d2158d70048a2916360ad59d9079f6233c6f68781a7a792e70f8b772d8ce","build.rs":"d0fc2047a792e90b95df7be8d1e75732b231b3a60cb481feebfca46b7edb1209","crates-io.md":"25ed421fe25d0f6f74c4b78674144bef2843a5f78bf552d0a8ec633be69d282b","src/bound.rs":"afb3550b77f271f38d8b5c38141a6a45687a8264dc3c6349ccf14ef0dd911dfe","src/de.rs":"c35ef3bccfc23d07fb6f87e7c52c7cac8a63ce15e35b9000bed406cb2f98685b","src/dummy.rs":"ad78556876053e74be976e91032200666ffbeeb6f7e92f3a7a8463fea1f60ac5","src/fragment.rs":"5548ba65a53d90a296f60c1328a7a7fb040db467f59c2f5210b2fb320457145d","src/internals/ast.rs":"b019865eef92c1ddbb9029423ac22179f132dc655a51c09fb2a42f4aaef172fd","src/internals/attr.rs":"d3ae0ad0e7d40fbf3c8a5f86c8a8c5b5f289c3318dd79afc6c5c2ce9b3523931","src/internals/case.rs":"9492f0c5142d7b7e8cd39c86d13a855e5ce4489425adb2b96aed89e1b7851ac0","src/internals/check.rs":"11ea94257d2a2ee2276938a6beb4ae11b74c39225c1e342e6df1e7d2b2924496","src/internals/ctxt.rs":"6fa544ae52914498a62a395818ebdc1b36ac2fb5903c60afb741a864ad559f1c","src/internals/mod.rs":"f32138ff19d57eb00f88ba11f6b015efab2102657804f71ebbf386a3698dad91","src/internals/receiver.rs":"ad30c3e4583ef07f74c7905f22a6580af25ebd431fdf1e04878b9a770ca4ede6","src/internals/respan.rs":"899753859c58ce5f532a3ec4584796a52f13ed5a0533191e48c953ba5c1b52ff","src/internals/symbol.rs":"3c9ce461773b7df3bb64d82aa5a0d93052c3bb0e60209db6c0b5c10ee9cfc9cf","src/lib.rs":"3f75e3a849cbe74bac87e7ef2f9d97caabc1e5a5a159bb3ba2da855e55e2ddb0","src/pretend.rs":"113ff3ba6dbf42d4999663b1abe57fdeb72ba7376cfd90dc81829439be7dfbb0","src/ser.rs":"0d99c841f6c7bc9751ab225fe42d1f8b7fe56e36903efcb4ff10bf6e35c390ba","src/try.rs":"b171b0088c23ebf4bfa07ba457881b41ac5e547d55dd16f737ea988d34badf61"},"package":"d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,16 +3,15 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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]
 name = "serde_derive"
-version = "1.0.118"
+version = "1.0.130"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 include = ["build.rs", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
@@ -35,8 +34,7 @@
 version = "1.0"
 
 [dependencies.syn]
-version = "1.0.33"
-features = ["visit"]
+version = "1.0.60"
 [dev-dependencies.serde]
 version = "1.0"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/bound.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/bound.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/bound.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/bound.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,6 @@
 
 use syn;
 use syn::punctuated::{Pair, Punctuated};
-use syn::visit::{self, Visit};
 
 use internals::ast::{Container, Data};
 use internals::{attr, ungroup};
@@ -50,7 +49,7 @@
     let predicates = cont
         .data
         .all_fields()
-        .flat_map(|field| from_field(&field.attrs))
+        .filter_map(|field| from_field(&field.attrs))
         .flat_map(|predicates| predicates.to_vec());
 
     let mut generics = generics.clone();
@@ -72,7 +71,7 @@
 
     let predicates = variants
         .iter()
-        .flat_map(|variant| from_variant(&variant.attrs))
+        .filter_map(|variant| from_variant(&variant.attrs))
         .flat_map(|predicates| predicates.to_vec());
 
     let mut generics = generics.clone();
@@ -112,7 +111,8 @@
         // parameters.
         associated_type_usage: Vec<&'ast syn::TypePath>,
     }
-    impl<'ast> Visit<'ast> for FindTyParams<'ast> {
+
+    impl<'ast> FindTyParams<'ast> {
         fn visit_field(&mut self, field: &'ast syn::Field) {
             if let syn::Type::Path(ty) = ungroup(&field.ty) {
                 if let Some(Pair::Punctuated(t, _)) = ty.path.segments.pairs().next() {
@@ -138,7 +138,98 @@
                     self.relevant_type_params.insert(id.clone());
                 }
             }
-            visit::visit_path(self, path);
+            for segment in &path.segments {
+                self.visit_path_segment(segment);
+            }
+        }
+
+        // Everything below is simply traversing the syntax tree.
+
+        fn visit_type(&mut self, ty: &'ast syn::Type) {
+            match ty {
+                syn::Type::Array(ty) => self.visit_type(&ty.elem),
+                syn::Type::BareFn(ty) => {
+                    for arg in &ty.inputs {
+                        self.visit_type(&arg.ty);
+                    }
+                    self.visit_return_type(&ty.output);
+                }
+                syn::Type::Group(ty) => self.visit_type(&ty.elem),
+                syn::Type::ImplTrait(ty) => {
+                    for bound in &ty.bounds {
+                        self.visit_type_param_bound(bound);
+                    }
+                }
+                syn::Type::Macro(ty) => self.visit_macro(&ty.mac),
+                syn::Type::Paren(ty) => self.visit_type(&ty.elem),
+                syn::Type::Path(ty) => {
+                    if let Some(qself) = &ty.qself {
+                        self.visit_type(&qself.ty);
+                    }
+                    self.visit_path(&ty.path);
+                }
+                syn::Type::Ptr(ty) => self.visit_type(&ty.elem),
+                syn::Type::Reference(ty) => self.visit_type(&ty.elem),
+                syn::Type::Slice(ty) => self.visit_type(&ty.elem),
+                syn::Type::TraitObject(ty) => {
+                    for bound in &ty.bounds {
+                        self.visit_type_param_bound(bound);
+                    }
+                }
+                syn::Type::Tuple(ty) => {
+                    for elem in &ty.elems {
+                        self.visit_type(elem);
+                    }
+                }
+
+                syn::Type::Infer(_) | syn::Type::Never(_) | syn::Type::Verbatim(_) => {}
+
+                #[cfg(test)]
+                syn::Type::__TestExhaustive(_) => unimplemented!(),
+                #[cfg(not(test))]
+                _ => {}
+            }
+        }
+
+        fn visit_path_segment(&mut self, segment: &'ast syn::PathSegment) {
+            self.visit_path_arguments(&segment.arguments);
+        }
+
+        fn visit_path_arguments(&mut self, arguments: &'ast syn::PathArguments) {
+            match arguments {
+                syn::PathArguments::None => {}
+                syn::PathArguments::AngleBracketed(arguments) => {
+                    for arg in &arguments.args {
+                        match arg {
+                            syn::GenericArgument::Type(arg) => self.visit_type(arg),
+                            syn::GenericArgument::Binding(arg) => self.visit_type(&arg.ty),
+                            syn::GenericArgument::Lifetime(_)
+                            | syn::GenericArgument::Constraint(_)
+                            | syn::GenericArgument::Const(_) => {}
+                        }
+                    }
+                }
+                syn::PathArguments::Parenthesized(arguments) => {
+                    for argument in &arguments.inputs {
+                        self.visit_type(argument);
+                    }
+                    self.visit_return_type(&arguments.output);
+                }
+            }
+        }
+
+        fn visit_return_type(&mut self, return_type: &'ast syn::ReturnType) {
+            match return_type {
+                syn::ReturnType::Default => {}
+                syn::ReturnType::Type(_, output) => self.visit_type(output),
+            }
+        }
+
+        fn visit_type_param_bound(&mut self, bound: &'ast syn::TypeParamBound) {
+            match bound {
+                syn::TypeParamBound::Trait(bound) => self.visit_path(&bound.path),
+                syn::TypeParamBound::Lifetime(_) => {}
+            }
         }
 
         // Type parameter should not be considered used by a macro path.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/de.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/de.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/de.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/de.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,13 +8,17 @@
 use dummy;
 use fragment::{Expr, Fragment, Match, Stmts};
 use internals::ast::{Container, Data, Field, Style, Variant};
-use internals::{attr, ungroup, Ctxt, Derive};
+use internals::{attr, replace_receiver, ungroup, Ctxt, Derive};
 use pretend;
 
 use std::collections::BTreeSet;
 use std::ptr;
 
-pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result<TokenStream, Vec<syn::Error>> {
+pub fn expand_derive_deserialize(
+    input: &mut syn::DeriveInput,
+) -> Result<TokenStream, Vec<syn::Error>> {
+    replace_receiver(input);
+
     let ctxt = Ctxt::new();
     let cont = match Container::from_ast(&ctxt, input, Derive::Deserialize) {
         Some(cont) => cont,
@@ -32,10 +36,10 @@
 
     let impl_block = if let Some(remote) = cont.attrs.remote() {
         let vis = &input.vis;
-        let used = pretend::pretend_used(&cont);
+        let used = pretend::pretend_used(&cont, params.is_packed);
         quote! {
             impl #de_impl_generics #ident #ty_generics #where_clause {
-                #vis fn deserialize<__D>(__deserializer: __D) -> #serde::export::Result<#remote #ty_generics, __D::Error>
+                #vis fn deserialize<__D>(__deserializer: __D) -> #serde::__private::Result<#remote #ty_generics, __D::Error>
                 where
                     __D: #serde::Deserializer<#delife>,
                 {
@@ -50,7 +54,7 @@
         quote! {
             #[automatically_derived]
             impl #de_impl_generics #serde::Deserialize<#delife> for #ident #ty_generics #where_clause {
-                fn deserialize<__D>(__deserializer: __D) -> #serde::export::Result<Self, __D::Error>
+                fn deserialize<__D>(__deserializer: __D) -> #serde::__private::Result<Self, __D::Error>
                 where
                     __D: #serde::Deserializer<#delife>,
                 {
@@ -121,6 +125,9 @@
     /// At least one field has a serde(getter) attribute, implying that the
     /// remote type has a private field.
     has_getter: bool,
+
+    /// Type has a repr(packed) attribute.
+    is_packed: bool,
 }
 
 impl Parameters {
@@ -133,6 +140,7 @@
         let borrowed = borrowed_lifetimes(cont);
         let generics = build_generics(cont, &borrowed);
         let has_getter = cont.data.has_getter();
+        let is_packed = cont.attrs.is_packed();
 
         Parameters {
             local,
@@ -140,6 +148,7 @@
             generics,
             borrowed,
             has_getter,
+            is_packed,
         }
     }
 
@@ -165,9 +174,11 @@
         Some(predicates) => bound::with_where_predicates(&generics, predicates),
         None => {
             let generics = match *cont.attrs.default() {
-                attr::Default::Default => {
-                    bound::with_self_bound(cont, &generics, &parse_quote!(_serde::export::Default))
-                }
+                attr::Default::Default => bound::with_self_bound(
+                    cont,
+                    &generics,
+                    &parse_quote!(_serde::__private::Default),
+                ),
                 attr::Default::None | attr::Default::Path(_) => generics,
             };
 
@@ -183,7 +194,7 @@
                 cont,
                 &generics,
                 requires_default,
-                &parse_quote!(_serde::export::Default),
+                &parse_quote!(_serde::__private::Default),
             )
         }
     }
@@ -325,7 +336,7 @@
     let stmts = Stmts(code);
 
     let fn_deserialize_in_place = quote_block! {
-        fn deserialize_in_place<__D>(__deserializer: __D, __place: &mut Self) -> _serde::export::Result<(), __D::Error>
+        fn deserialize_in_place<__D>(__deserializer: __D, __place: &mut Self) -> _serde::__private::Result<(), __D::Error>
         where
             __D: _serde::Deserializer<#delife>,
         {
@@ -364,16 +375,16 @@
             quote!(#member: __transparent)
         } else {
             let value = match field.attrs.default() {
-                attr::Default::Default => quote!(_serde::export::Default::default()),
+                attr::Default::Default => quote!(_serde::__private::Default::default()),
                 attr::Default::Path(path) => quote!(#path()),
-                attr::Default::None => quote!(_serde::export::PhantomData),
+                attr::Default::None => quote!(_serde::__private::PhantomData),
             };
             quote!(#member: #value)
         }
     });
 
     quote_block! {
-        _serde::export::Result::map(
+        _serde::__private::Result::map(
             #path(__deserializer),
             |__transparent| #this { #(#assign),* })
     }
@@ -381,17 +392,17 @@
 
 fn deserialize_from(type_from: &syn::Type) -> Fragment {
     quote_block! {
-        _serde::export::Result::map(
+        _serde::__private::Result::map(
             <#type_from as _serde::Deserialize>::deserialize(__deserializer),
-            _serde::export::From::from)
+            _serde::__private::From::from)
     }
 }
 
 fn deserialize_try_from(type_try_from: &syn::Type) -> Fragment {
     quote_block! {
-        _serde::export::Result::and_then(
+        _serde::__private::Result::and_then(
             <#type_try_from as _serde::Deserialize>::deserialize(__deserializer),
-            |v| _serde::export::TryFrom::try_from(v).map_err(_serde::de::Error::custom))
+            |v| _serde::__private::TryFrom::try_from(v).map_err(_serde::de::Error::custom))
     }
 }
 
@@ -400,6 +411,7 @@
     let type_name = cattrs.name().deserialize_name();
 
     let expecting = format!("unit struct {}", params.type_name());
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
 
     quote_block! {
         struct __Visitor;
@@ -407,16 +419,16 @@
         impl<'de> _serde::de::Visitor<'de> for __Visitor {
             type Value = #this;
 
-            fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                _serde::export::Formatter::write_str(__formatter, #expecting)
+            fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
+                _serde::__private::Formatter::write_str(__formatter, #expecting)
             }
 
             #[inline]
-            fn visit_unit<__E>(self) -> _serde::export::Result<Self::Value, __E>
+            fn visit_unit<__E>(self) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(#this)
+                _serde::__private::Ok(#this)
             }
         }
 
@@ -457,6 +469,7 @@
         Some(variant_ident) => format!("tuple variant {}::{}", params.type_name(), variant_ident),
         None => format!("tuple struct {}", params.type_name()),
     };
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
 
     let nfields = fields.len();
 
@@ -467,13 +480,13 @@
     };
 
     let visit_seq = Stmts(deserialize_seq(
-        &type_path, params, fields, false, cattrs, &expecting,
+        &type_path, params, fields, false, cattrs, expecting,
     ));
 
     let visitor_expr = quote! {
         __Visitor {
-            marker: _serde::export::PhantomData::<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData,
+            marker: _serde::__private::PhantomData::<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData,
         }
     };
     let dispatch = if let Some(deserializer) = deserializer {
@@ -497,21 +510,21 @@
 
     quote_block! {
         struct __Visitor #de_impl_generics #where_clause {
-            marker: _serde::export::PhantomData<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            marker: _serde::__private::PhantomData<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #de_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_ty_generics #where_clause {
             type Value = #this #ty_generics;
 
-            fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                _serde::export::Formatter::write_str(__formatter, #expecting)
+            fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
+                _serde::__private::Formatter::write_str(__formatter, #expecting)
             }
 
             #visit_newtype_struct
 
             #[inline]
-            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
+            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::__private::Result<Self::Value, __A::Error>
             where
                 __A: _serde::de::SeqAccess<#delife>,
             {
@@ -543,6 +556,7 @@
         Some(variant_ident) => format!("tuple variant {}::{}", params.type_name(), variant_ident),
         None => format!("tuple struct {}", params.type_name()),
     };
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
 
     let nfields = fields.len();
 
@@ -552,12 +566,12 @@
         None
     };
 
-    let visit_seq = Stmts(deserialize_seq_in_place(params, fields, cattrs, &expecting));
+    let visit_seq = Stmts(deserialize_seq_in_place(params, fields, cattrs, expecting));
 
     let visitor_expr = quote! {
         __Visitor {
             place: __place,
-            lifetime: _serde::export::PhantomData,
+            lifetime: _serde::__private::PhantomData,
         }
     };
 
@@ -587,20 +601,20 @@
     quote_block! {
         struct __Visitor #in_place_impl_generics #where_clause {
             place: &#place_life mut #this #ty_generics,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #in_place_impl_generics _serde::de::Visitor<#delife> for __Visitor #in_place_ty_generics #where_clause {
             type Value = ();
 
-            fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                _serde::export::Formatter::write_str(__formatter, #expecting)
+            fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
+                _serde::__private::Formatter::write_str(__formatter, #expecting)
             }
 
             #visit_newtype_struct
 
             #[inline]
-            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
+            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::__private::Result<Self::Value, __A::Error>
             where
                 __A: _serde::de::SeqAccess<#delife>,
             {
@@ -631,6 +645,7 @@
     } else {
         format!("{} with {} elements", expecting, deserialized_count)
     };
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
 
     let mut index_in_seq = 0_usize;
     let let_values = vars.clone().zip(fields).map(|(var, field)| {
@@ -652,23 +667,23 @@
                     let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
                     quote!({
                         #wrapper
-                        _serde::export::Option::map(
+                        _serde::__private::Option::map(
                             try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)),
                             |__wrap| __wrap.value)
                     })
                 }
             };
             let value_if_none = match field.attrs.default() {
-                attr::Default::Default => quote!(_serde::export::Default::default()),
+                attr::Default::Default => quote!(_serde::__private::Default::default()),
                 attr::Default::Path(path) => quote!(#path()),
                 attr::Default::None => quote!(
-                    return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
+                    return _serde::__private::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
                 ),
             };
             let assign = quote! {
                 let #var = match #visit {
-                    _serde::export::Some(__value) => __value,
-                    _serde::export::None => {
+                    _serde::__private::Some(__value) => __value,
+                    _serde::__private::None => {
                         #value_if_none
                     }
                 };
@@ -692,13 +707,13 @@
     if params.has_getter {
         let this = &params.this;
         result = quote! {
-            _serde::export::Into::<#this>::into(#result)
+            _serde::__private::Into::<#this>::into(#result)
         };
     }
 
     let let_default = match cattrs.default() {
         attr::Default::Default => Some(quote!(
-            let __default: Self::Value = _serde::export::Default::default();
+            let __default: Self::Value = _serde::__private::Default::default();
         )),
         attr::Default::Path(path) => Some(quote!(
             let __default: Self::Value = #path();
@@ -713,7 +728,7 @@
     quote_block! {
         #let_default
         #(#let_values)*
-        _serde::export::Ok(#result)
+        _serde::__private::Ok(#result)
     }
 }
 
@@ -733,6 +748,7 @@
     } else {
         format!("{} with {} elements", expecting, deserialized_count)
     };
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
 
     let mut index_in_seq = 0usize;
     let write_values = fields.iter().map(|field| {
@@ -746,20 +762,20 @@
         } else {
             let value_if_none = match field.attrs.default() {
                 attr::Default::Default => quote!(
-                    self.place.#member = _serde::export::Default::default();
+                    self.place.#member = _serde::__private::Default::default();
                 ),
                 attr::Default::Path(path) => quote!(
                     self.place.#member = #path();
                 ),
                 attr::Default::None => quote!(
-                    return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
+                    return _serde::__private::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
                 ),
             };
             let write = match field.attrs.deserialize_with() {
                 None => {
                     quote! {
-                        if let _serde::export::None = try!(_serde::de::SeqAccess::next_element_seed(&mut __seq,
-                            _serde::private::de::InPlaceSeed(&mut self.place.#member)))
+                        if let _serde::__private::None = try!(_serde::de::SeqAccess::next_element_seed(&mut __seq,
+                            _serde::__private::de::InPlaceSeed(&mut self.place.#member)))
                         {
                             #value_if_none
                         }
@@ -770,10 +786,10 @@
                     quote!({
                         #wrapper
                         match try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)) {
-                            _serde::export::Some(__wrap) => {
+                            _serde::__private::Some(__wrap) => {
                                 self.place.#member = __wrap.value;
                             }
-                            _serde::export::None => {
+                            _serde::__private::None => {
                                 #value_if_none
                             }
                         }
@@ -789,7 +805,7 @@
     let (_, ty_generics, _) = params.generics.split_for_impl();
     let let_default = match cattrs.default() {
         attr::Default::Default => Some(quote!(
-            let __default: #this #ty_generics  = _serde::export::Default::default();
+            let __default: #this #ty_generics  = _serde::__private::Default::default();
         )),
         attr::Default::Path(path) => Some(quote!(
             let __default: #this #ty_generics  = #path();
@@ -804,7 +820,7 @@
     quote_block! {
         #let_default
         #(#write_values)*
-        _serde::export::Ok(())
+        _serde::__private::Ok(())
     }
 }
 
@@ -835,18 +851,18 @@
     if params.has_getter {
         let this = &params.this;
         result = quote! {
-            _serde::export::Into::<#this>::into(#result)
+            _serde::__private::Into::<#this>::into(#result)
         };
     }
 
     quote! {
         #[inline]
-        fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result<Self::Value, __E::Error>
+        fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::__private::Result<Self::Value, __E::Error>
         where
             __E: _serde::Deserializer<#delife>,
         {
             let __field0: #field_ty = #value;
-            _serde::export::Ok(#result)
+            _serde::__private::Ok(#result)
         }
     }
 }
@@ -861,7 +877,7 @@
 
     quote! {
         #[inline]
-        fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result<Self::Value, __E::Error>
+        fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::__private::Result<Self::Value, __E::Error>
         where
             __E: _serde::Deserializer<#delife>,
         {
@@ -908,9 +924,10 @@
         Some(variant_ident) => format!("struct variant {}::{}", params.type_name(), variant_ident),
         None => format!("struct {}", params.type_name()),
     };
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
 
     let visit_seq = Stmts(deserialize_seq(
-        &type_path, params, fields, true, cattrs, &expecting,
+        &type_path, params, fields, true, cattrs, expecting,
     ));
 
     let (field_visitor, fields_stmt, visit_map) = if cattrs.has_flatten() {
@@ -924,8 +941,8 @@
 
     let visitor_expr = quote! {
         __Visitor {
-            marker: _serde::export::PhantomData::<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData,
+            marker: _serde::__private::PhantomData::<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData,
         }
     };
     let dispatch = if let Some(deserializer) = deserializer {
@@ -963,7 +980,7 @@
     let visit_seq = match *untagged {
         Untagged::No if !cattrs.has_flatten() => Some(quote! {
             #[inline]
-            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
+            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::__private::Result<Self::Value, __A::Error>
             where
                 __A: _serde::de::SeqAccess<#delife>,
             {
@@ -978,7 +995,7 @@
             impl #de_impl_generics _serde::de::DeserializeSeed<#delife> for __Visitor #de_ty_generics #where_clause {
                 type Value = #this #ty_generics;
 
-                fn deserialize<__D>(self, __deserializer: __D) -> _serde::export::Result<Self::Value, __D::Error>
+                fn deserialize<__D>(self, __deserializer: __D) -> _serde::__private::Result<Self::Value, __D::Error>
                 where
                     __D: _serde::Deserializer<'de>,
                 {
@@ -994,21 +1011,21 @@
         #field_visitor
 
         struct __Visitor #de_impl_generics #where_clause {
-            marker: _serde::export::PhantomData<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            marker: _serde::__private::PhantomData<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #de_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_ty_generics #where_clause {
             type Value = #this #ty_generics;
 
-            fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                _serde::export::Formatter::write_str(__formatter, #expecting)
+            fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
+                _serde::__private::Formatter::write_str(__formatter, #expecting)
             }
 
             #visit_seq
 
             #[inline]
-            fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result<Self::Value, __A::Error>
+            fn visit_map<__A>(self, mut __map: __A) -> _serde::__private::Result<Self::Value, __A::Error>
             where
                 __A: _serde::de::MapAccess<#delife>,
             {
@@ -1049,8 +1066,9 @@
         Some(variant_ident) => format!("struct variant {}::{}", params.type_name(), variant_ident),
         None => format!("struct {}", params.type_name()),
     };
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
 
-    let visit_seq = Stmts(deserialize_seq_in_place(params, fields, cattrs, &expecting));
+    let visit_seq = Stmts(deserialize_seq_in_place(params, fields, cattrs, expecting));
 
     let (field_visitor, fields_stmt, visit_map) =
         deserialize_struct_as_struct_in_place_visitor(params, fields, cattrs);
@@ -1062,7 +1080,7 @@
     let visitor_expr = quote! {
         __Visitor {
             place: __place,
-            lifetime: _serde::export::PhantomData,
+            lifetime: _serde::__private::PhantomData,
         }
     };
     let dispatch = if let Some(deserializer) = deserializer {
@@ -1089,7 +1107,7 @@
 
     let visit_seq = quote! {
         #[inline]
-        fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
+        fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::__private::Result<Self::Value, __A::Error>
         where
             __A: _serde::de::SeqAccess<#delife>,
         {
@@ -1106,20 +1124,20 @@
 
         struct __Visitor #in_place_impl_generics #where_clause {
             place: &#place_life mut #this #ty_generics,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #in_place_impl_generics _serde::de::Visitor<#delife> for __Visitor #in_place_ty_generics #where_clause {
             type Value = ();
 
-            fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                _serde::export::Formatter::write_str(__formatter, #expecting)
+            fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
+                _serde::__private::Formatter::write_str(__formatter, #expecting)
             }
 
             #visit_seq
 
             #[inline]
-            fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result<Self::Value, __A::Error>
+            fn visit_map<__A>(self, mut __map: __A) -> _serde::__private::Result<Self::Value, __A::Error>
             where
                 __A: _serde::de::MapAccess<#delife>,
             {
@@ -1201,6 +1219,7 @@
 
     let type_name = cattrs.name().deserialize_name();
     let expecting = format!("enum {}", params.type_name());
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
 
     let (variants_stmt, variant_visitor) = prepare_enum_variant_enum(variants, cattrs);
 
@@ -1229,9 +1248,9 @@
         // all variants have `#[serde(skip_deserializing)]`.
         quote! {
             // FIXME: Once we drop support for Rust 1.15:
-            // let _serde::export::Err(__err) = _serde::de::EnumAccess::variant::<__Field>(__data);
-            // _serde::export::Err(__err)
-            _serde::export::Result::map(
+            // let _serde::__private::Err(__err) = _serde::de::EnumAccess::variant::<__Field>(__data);
+            // _serde::__private::Err(__err)
+            _serde::__private::Result::map(
                 _serde::de::EnumAccess::variant::<__Field>(__data),
                 |(__impossible, _)| match __impossible {})
         }
@@ -1247,18 +1266,18 @@
         #variant_visitor
 
         struct __Visitor #de_impl_generics #where_clause {
-            marker: _serde::export::PhantomData<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            marker: _serde::__private::PhantomData<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #de_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_ty_generics #where_clause {
             type Value = #this #ty_generics;
 
-            fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                _serde::export::Formatter::write_str(__formatter, #expecting)
+            fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
+                _serde::__private::Formatter::write_str(__formatter, #expecting)
             }
 
-            fn visit_enum<__A>(self, __data: __A) -> _serde::export::Result<Self::Value, __A::Error>
+            fn visit_enum<__A>(self, __data: __A) -> _serde::__private::Result<Self::Value, __A::Error>
             where
                 __A: _serde::de::EnumAccess<#delife>,
             {
@@ -1273,8 +1292,8 @@
             #type_name,
             VARIANTS,
             __Visitor {
-                marker: _serde::export::PhantomData::<#this #ty_generics>,
-                lifetime: _serde::export::PhantomData,
+                marker: _serde::__private::PhantomData::<#this #ty_generics>,
+                lifetime: _serde::__private::PhantomData,
             },
         )
     }
@@ -1301,7 +1320,7 @@
                 variant,
                 cattrs,
                 quote! {
-                    _serde::private::de::ContentDeserializer::<__D::Error>::new(__tagged.content)
+                    _serde::__private::de::ContentDeserializer::<__D::Error>::new(__tagged.content)
                 },
             ));
 
@@ -1310,6 +1329,9 @@
             }
         });
 
+    let expecting = format!("internally tagged enum {}", params.type_name());
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
+
     quote_block! {
         #variant_visitor
 
@@ -1317,7 +1339,7 @@
 
         let __tagged = try!(_serde::Deserializer::deserialize_any(
             __deserializer,
-            _serde::private::de::TaggedContentVisitor::<__Field>::new(#tag)));
+            _serde::__private::de::TaggedContentVisitor::<__Field>::new(#tag, #expecting)));
 
         match __tagged.tag {
             #(#variant_arms)*
@@ -1360,15 +1382,16 @@
         .collect();
 
     let expecting = format!("adjacently tagged enum {}", params.type_name());
+    let expecting = cattrs.expecting().unwrap_or(&expecting);
     let type_name = cattrs.name().deserialize_name();
     let deny_unknown_fields = cattrs.deny_unknown_fields();
 
     // If unknown fields are allowed, we pick the visitor that can step over
     // those. Otherwise we pick the visitor that fails on unknown keys.
     let field_visitor_ty = if deny_unknown_fields {
-        quote! { _serde::private::de::TagOrContentFieldVisitor }
+        quote! { _serde::__private::de::TagOrContentFieldVisitor }
     } else {
-        quote! { _serde::private::de::TagContentOtherFieldVisitor }
+        quote! { _serde::__private::de::TagContentOtherFieldVisitor }
     };
 
     let tag_or_content = quote! {
@@ -1379,7 +1402,7 @@
     };
 
     let mut missing_content = quote! {
-        _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#content))
+        _serde::__private::Err(<__A::Error as _serde::de::Error>::missing_field(#content))
     };
     let mut missing_content_fallthrough = quote!();
     let missing_content_arms = variants
@@ -1392,11 +1415,11 @@
 
             let arm = match variant.style {
                 Style::Unit => quote! {
-                    _serde::export::Ok(#this::#variant_ident)
+                    _serde::__private::Ok(#this::#variant_ident)
                 },
                 Style::Newtype if variant.attrs.deserialize_with().is_none() => {
                     let span = variant.original.span();
-                    let func = quote_spanned!(span=> _serde::private::de::missing_field);
+                    let func = quote_spanned!(span=> _serde::__private::de::missing_field);
                     quote! {
                         #func(#content).map(#this::#variant_ident)
                     }
@@ -1431,19 +1454,19 @@
         next_key
     } else {
         quote!({
-            let mut __rk : _serde::export::Option<_serde::private::de::TagOrContentField> = _serde::export::None;
-            while let _serde::export::Some(__k) = #next_key {
+            let mut __rk : _serde::__private::Option<_serde::__private::de::TagOrContentField> = _serde::__private::None;
+            while let _serde::__private::Some(__k) = #next_key {
                 match __k {
-                    _serde::private::de::TagContentOtherField::Other => {
+                    _serde::__private::de::TagContentOtherField::Other => {
                         try!(_serde::de::MapAccess::next_value::<_serde::de::IgnoredAny>(&mut __map));
                         continue;
                     },
-                    _serde::private::de::TagContentOtherField::Tag => {
-                        __rk = _serde::export::Some(_serde::private::de::TagOrContentField::Tag);
+                    _serde::__private::de::TagContentOtherField::Tag => {
+                        __rk = _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag);
                         break;
                     }
-                    _serde::private::de::TagContentOtherField::Content => {
-                        __rk = _serde::export::Some(_serde::private::de::TagOrContentField::Content);
+                    _serde::__private::de::TagContentOtherField::Content => {
+                        __rk = _serde::__private::Some(_serde::__private::de::TagOrContentField::Content);
                         break;
                     }
                 }
@@ -1458,13 +1481,13 @@
     // at this point immediately produce an error.
     let visit_remaining_keys = quote! {
         match #next_relevant_key {
-            _serde::export::Some(_serde::private::de::TagOrContentField::Tag) => {
-                _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#tag))
+            _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag) => {
+                _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#tag))
             }
-            _serde::export::Some(_serde::private::de::TagOrContentField::Content) => {
-                _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#content))
+            _serde::__private::Some(_serde::__private::de::TagOrContentField::Content) => {
+                _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#content))
             }
-            _serde::export::None => _serde::export::Ok(__ret),
+            _serde::__private::None => _serde::__private::Ok(__ret),
         }
     };
 
@@ -1490,14 +1513,14 @@
 
         struct __Seed #de_impl_generics #where_clause {
             field: __Field,
-            marker: _serde::export::PhantomData<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            marker: _serde::__private::PhantomData<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #de_impl_generics _serde::de::DeserializeSeed<#delife> for __Seed #de_ty_generics #where_clause {
             type Value = #this #ty_generics;
 
-            fn deserialize<__D>(self, __deserializer: __D) -> _serde::export::Result<Self::Value, __D::Error>
+            fn deserialize<__D>(self, __deserializer: __D) -> _serde::__private::Result<Self::Value, __D::Error>
             where
                 __D: _serde::Deserializer<#delife>,
             {
@@ -1508,102 +1531,102 @@
         }
 
         struct __Visitor #de_impl_generics #where_clause {
-            marker: _serde::export::PhantomData<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            marker: _serde::__private::PhantomData<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #de_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_ty_generics #where_clause {
             type Value = #this #ty_generics;
 
-            fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                _serde::export::Formatter::write_str(__formatter, #expecting)
+            fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
+                _serde::__private::Formatter::write_str(__formatter, #expecting)
             }
 
-            fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result<Self::Value, __A::Error>
+            fn visit_map<__A>(self, mut __map: __A) -> _serde::__private::Result<Self::Value, __A::Error>
             where
                 __A: _serde::de::MapAccess<#delife>,
             {
                 // Visit the first relevant key.
                 match #next_relevant_key {
                     // First key is the tag.
-                    _serde::export::Some(_serde::private::de::TagOrContentField::Tag) => {
+                    _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag) => {
                         // Parse the tag.
                         let __field = try!(_serde::de::MapAccess::next_value(&mut __map));
                         // Visit the second key.
                         match #next_relevant_key {
                             // Second key is a duplicate of the tag.
-                            _serde::export::Some(_serde::private::de::TagOrContentField::Tag) => {
-                                _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#tag))
+                            _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag) => {
+                                _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#tag))
                             }
                             // Second key is the content.
-                            _serde::export::Some(_serde::private::de::TagOrContentField::Content) => {
+                            _serde::__private::Some(_serde::__private::de::TagOrContentField::Content) => {
                                 let __ret = try!(_serde::de::MapAccess::next_value_seed(&mut __map,
                                     __Seed {
                                         field: __field,
-                                        marker: _serde::export::PhantomData,
-                                        lifetime: _serde::export::PhantomData,
+                                        marker: _serde::__private::PhantomData,
+                                        lifetime: _serde::__private::PhantomData,
                                     }));
                                 // Visit remaining keys, looking for duplicates.
                                 #visit_remaining_keys
                             }
                             // There is no second key; might be okay if the we have a unit variant.
-                            _serde::export::None => #missing_content
+                            _serde::__private::None => #missing_content
                         }
                     }
                     // First key is the content.
-                    _serde::export::Some(_serde::private::de::TagOrContentField::Content) => {
+                    _serde::__private::Some(_serde::__private::de::TagOrContentField::Content) => {
                         // Buffer up the content.
-                        let __content = try!(_serde::de::MapAccess::next_value::<_serde::private::de::Content>(&mut __map));
+                        let __content = try!(_serde::de::MapAccess::next_value::<_serde::__private::de::Content>(&mut __map));
                         // Visit the second key.
                         match #next_relevant_key {
                             // Second key is the tag.
-                            _serde::export::Some(_serde::private::de::TagOrContentField::Tag) => {
-                                let __deserializer = _serde::private::de::ContentDeserializer::<__A::Error>::new(__content);
+                            _serde::__private::Some(_serde::__private::de::TagOrContentField::Tag) => {
+                                let __deserializer = _serde::__private::de::ContentDeserializer::<__A::Error>::new(__content);
                                 #finish_content_then_tag
                             }
                             // Second key is a duplicate of the content.
-                            _serde::export::Some(_serde::private::de::TagOrContentField::Content) => {
-                                _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#content))
+                            _serde::__private::Some(_serde::__private::de::TagOrContentField::Content) => {
+                                _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#content))
                             }
                             // There is no second key.
-                            _serde::export::None => {
-                                _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#tag))
+                            _serde::__private::None => {
+                                _serde::__private::Err(<__A::Error as _serde::de::Error>::missing_field(#tag))
                             }
                         }
                     }
                     // There is no first key.
-                    _serde::export::None => {
-                        _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#tag))
+                    _serde::__private::None => {
+                        _serde::__private::Err(<__A::Error as _serde::de::Error>::missing_field(#tag))
                     }
                 }
             }
 
-            fn visit_seq<__A>(self, mut __seq: __A) -> _serde::export::Result<Self::Value, __A::Error>
+            fn visit_seq<__A>(self, mut __seq: __A) -> _serde::__private::Result<Self::Value, __A::Error>
             where
                 __A: _serde::de::SeqAccess<#delife>,
             {
                 // Visit the first element - the tag.
                 match try!(_serde::de::SeqAccess::next_element(&mut __seq)) {
-                    _serde::export::Some(__field) => {
+                    _serde::__private::Some(__field) => {
                         // Visit the second element - the content.
                         match try!(_serde::de::SeqAccess::next_element_seed(
                             &mut __seq,
                             __Seed {
                                 field: __field,
-                                marker: _serde::export::PhantomData,
-                                lifetime: _serde::export::PhantomData,
+                                marker: _serde::__private::PhantomData,
+                                lifetime: _serde::__private::PhantomData,
                             },
                         )) {
-                            _serde::export::Some(__ret) => _serde::export::Ok(__ret),
+                            _serde::__private::Some(__ret) => _serde::__private::Ok(__ret),
                             // There is no second element.
-                            _serde::export::None => {
-                                _serde::export::Err(_serde::de::Error::invalid_length(1, &self))
+                            _serde::__private::None => {
+                                _serde::__private::Err(_serde::de::Error::invalid_length(1, &self))
                             }
                         }
                     }
                     // There is no first element.
-                    _serde::export::None => {
-                        _serde::export::Err(_serde::de::Error::invalid_length(0, &self))
+                    _serde::__private::None => {
+                        _serde::__private::Err(_serde::de::Error::invalid_length(0, &self))
                     }
                 }
             }
@@ -1615,8 +1638,8 @@
             #type_name,
             FIELDS,
             __Visitor {
-                marker: _serde::export::PhantomData::<#this #ty_generics>,
-                lifetime: _serde::export::PhantomData,
+                marker: _serde::__private::PhantomData::<#this #ty_generics>,
+                lifetime: _serde::__private::PhantomData,
             },
         )
     }
@@ -1635,7 +1658,9 @@
                 params,
                 variant,
                 cattrs,
-                quote!(_serde::private::de::ContentRefDeserializer::<__D::Error>::new(&__content)),
+                quote!(
+                    _serde::__private::de::ContentRefDeserializer::<__D::Error>::new(&__content)
+                ),
             ))
         });
 
@@ -1649,17 +1674,18 @@
         "data did not match any variant of untagged enum {}",
         params.type_name()
     );
+    let fallthrough_msg = cattrs.expecting().unwrap_or(&fallthrough_msg);
 
     quote_block! {
-        let __content = try!(<_serde::private::de::Content as _serde::Deserialize>::deserialize(__deserializer));
+        let __content = try!(<_serde::__private::de::Content as _serde::Deserialize>::deserialize(__deserializer));
 
         #(
-            if let _serde::export::Ok(__ok) = #attempts {
-                return _serde::export::Ok(__ok);
+            if let _serde::__private::Ok(__ok) = #attempts {
+                return _serde::__private::Ok(__ok);
             }
         )*
 
-        _serde::export::Err(_serde::de::Error::custom(#fallthrough_msg))
+        _serde::__private::Err(_serde::de::Error::custom(#fallthrough_msg))
     }
 }
 
@@ -1672,7 +1698,7 @@
         let (wrapper, wrapper_ty, unwrap_fn) = wrap_deserialize_variant_with(params, variant, path);
         return quote_block! {
             #wrapper
-            _serde::export::Result::map(
+            _serde::__private::Result::map(
                 _serde::de::VariantAccess::newtype_variant::<#wrapper_ty>(__variant), #unwrap_fn)
         };
     }
@@ -1684,7 +1710,7 @@
             let this = &params.this;
             quote_block! {
                 try!(_serde::de::VariantAccess::unit_variant(__variant));
-                _serde::export::Ok(#this::#variant_ident)
+                _serde::__private::Ok(#this::#variant_ident)
             }
         }
         Style::Newtype => deserialize_externally_tagged_newtype_variant(
@@ -1707,6 +1733,8 @@
     }
 }
 
+// Generates significant part of the visit_seq and visit_map bodies of visitors
+// for the variants of internally tagged enum.
 fn deserialize_internally_tagged_variant(
     params: &Parameters,
     variant: &Variant,
@@ -1729,8 +1757,8 @@
                 quote!((#default))
             });
             quote_block! {
-                try!(_serde::Deserializer::deserialize_any(#deserializer, _serde::private::de::InternallyTaggedUnitVisitor::new(#type_name, #variant_name)));
-                _serde::export::Ok(#this::#variant_ident #default)
+                try!(_serde::Deserializer::deserialize_any(#deserializer, _serde::__private::de::InternallyTaggedUnitVisitor::new(#type_name, #variant_name)));
+                _serde::__private::Ok(#this::#variant_ident #default)
             }
         }
         Style::Newtype => deserialize_untagged_newtype_variant(
@@ -1758,11 +1786,9 @@
     deserializer: TokenStream,
 ) -> Fragment {
     if let Some(path) = variant.attrs.deserialize_with() {
-        let (wrapper, wrapper_ty, unwrap_fn) = wrap_deserialize_variant_with(params, variant, path);
+        let unwrap_fn = unwrap_to_variant_closure(params, variant, false);
         return quote_block! {
-            #wrapper
-            _serde::export::Result::map(
-                <#wrapper_ty as _serde::Deserialize>::deserialize(#deserializer), #unwrap_fn)
+            _serde::__private::Result::map(#path(#deserializer), #unwrap_fn)
         };
     }
 
@@ -1780,10 +1806,10 @@
             quote_expr! {
                 match _serde::Deserializer::deserialize_any(
                     #deserializer,
-                    _serde::private::de::UntaggedUnitVisitor::new(#type_name, #variant_name)
+                    _serde::__private::de::UntaggedUnitVisitor::new(#type_name, #variant_name)
                 ) {
-                    _serde::export::Ok(()) => _serde::export::Ok(#this::#variant_ident #default),
-                    _serde::export::Err(__err) => _serde::export::Err(__err),
+                    _serde::__private::Ok(()) => _serde::__private::Ok(#this::#variant_ident #default),
+                    _serde::__private::Err(__err) => _serde::__private::Err(__err),
                 }
             }
         }
@@ -1824,7 +1850,7 @@
         let default = Expr(expr_is_missing(field, cattrs));
         return quote_block! {
             try!(_serde::de::VariantAccess::unit_variant(__variant));
-            _serde::export::Ok(#this::#variant_ident(#default))
+            _serde::__private::Ok(#this::#variant_ident(#default))
         };
     }
 
@@ -1835,14 +1861,14 @@
             let func =
                 quote_spanned!(span=> _serde::de::VariantAccess::newtype_variant::<#field_ty>);
             quote_expr! {
-                _serde::export::Result::map(#func(__variant), #this::#variant_ident)
+                _serde::__private::Result::map(#func(__variant), #this::#variant_ident)
             }
         }
         Some(path) => {
             let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
             quote_block! {
                 #wrapper
-                _serde::export::Result::map(
+                _serde::__private::Result::map(
                     _serde::de::VariantAccess::newtype_variant::<#wrapper_ty>(__variant),
                     |__wrapper| #this::#variant_ident(__wrapper.value))
             }
@@ -1863,13 +1889,13 @@
             let span = field.original.span();
             let func = quote_spanned!(span=> <#field_ty as _serde::Deserialize>::deserialize);
             quote_expr! {
-                _serde::export::Result::map(#func(#deserializer), #this::#variant_ident)
+                _serde::__private::Result::map(#func(#deserializer), #this::#variant_ident)
             }
         }
         Some(path) => {
             quote_block! {
-                let __value: _serde::export::Result<#field_ty, _> = #path(#deserializer);
-                _serde::export::Result::map(__value, #this::#variant_ident)
+                let __value: _serde::__private::Result<#field_ty, _> = #path(#deserializer);
+                _serde::__private::Result::map(__value, #this::#variant_ident)
             }
         }
     }
@@ -1885,18 +1911,18 @@
     let field_idents: &Vec<_> = &fields.iter().map(|(_, ident, _)| ident).collect();
 
     let (ignore_variant, fallthrough) = if !is_variant && cattrs.has_flatten() {
-        let ignore_variant = quote!(__other(_serde::private::de::Content<'de>),);
-        let fallthrough = quote!(_serde::export::Ok(__Field::__other(__value)));
+        let ignore_variant = quote!(__other(_serde::__private::de::Content<'de>),);
+        let fallthrough = quote!(_serde::__private::Ok(__Field::__other(__value)));
         (Some(ignore_variant), Some(fallthrough))
     } else if let Some(other_idx) = other_idx {
         let ignore_variant = fields[other_idx].1.clone();
-        let fallthrough = quote!(_serde::export::Ok(__Field::#ignore_variant));
+        let fallthrough = quote!(_serde::__private::Ok(__Field::#ignore_variant));
         (None, Some(fallthrough))
     } else if is_variant || cattrs.deny_unknown_fields() {
         (None, None)
     } else {
         let ignore_variant = quote!(__ignore,);
-        let fallthrough = quote!(_serde::export::Ok(__Field::__ignore));
+        let fallthrough = quote!(_serde::__private::Ok(__Field::__ignore));
         (Some(ignore_variant), Some(fallthrough))
     };
 
@@ -1905,7 +1931,9 @@
         fields,
         is_variant,
         fallthrough,
+        None,
         !is_variant && cattrs.has_flatten(),
+        None,
     ));
 
     let lifetime = if !is_variant && cattrs.has_flatten() {
@@ -1931,7 +1959,7 @@
 
         impl<'de> _serde::Deserialize<'de> for __Field #lifetime {
             #[inline]
-            fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result<Self, __D::Error>
+            fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result<Self, __D::Error>
             where
                 __D: _serde::Deserializer<'de>,
             {
@@ -1941,6 +1969,8 @@
     }
 }
 
+// Generates `Deserialize::deserialize` body for an enum with
+// `serde(field_identifier)` or `serde(variant_identifier)` attribute.
 fn deserialize_custom_identifier(
     params: &Parameters,
     variants: &[Variant],
@@ -1955,26 +1985,38 @@
     let this = &params.this;
     let this = quote!(#this);
 
-    let (ordinary, fallthrough) = if let Some(last) = variants.last() {
+    let (ordinary, fallthrough, fallthrough_borrowed) = if let Some(last) = variants.last() {
         let last_ident = &last.ident;
         if last.attrs.other() {
+            // Process `serde(other)` attribute. It would always be found on the
+            // last variant (checked in `check_identifier`), so all preceding
+            // are ordinary variants.
             let ordinary = &variants[..variants.len() - 1];
-            let fallthrough = quote!(_serde::export::Ok(#this::#last_ident));
-            (ordinary, Some(fallthrough))
+            let fallthrough = quote!(_serde::__private::Ok(#this::#last_ident));
+            (ordinary, Some(fallthrough), None)
         } else if let Style::Newtype = last.style {
             let ordinary = &variants[..variants.len() - 1];
-            let deserializer = quote!(_serde::private::de::IdentifierDeserializer::from(__value));
-            let fallthrough = quote! {
-                _serde::export::Result::map(
-                    _serde::Deserialize::deserialize(#deserializer),
-                    #this::#last_ident)
+            let fallthrough = |value| {
+                quote! {
+                    _serde::__private::Result::map(
+                        _serde::Deserialize::deserialize(
+                            _serde::__private::de::IdentifierDeserializer::from(#value)
+                        ),
+                        #this::#last_ident)
+                }
             };
-            (ordinary, Some(fallthrough))
+            (
+                ordinary,
+                Some(fallthrough(quote!(__value))),
+                Some(fallthrough(quote!(_serde::__private::de::Borrowed(
+                    __value
+                )))),
+            )
         } else {
-            (variants, None)
+            (variants, None, None)
         }
     } else {
-        (variants, None)
+        (variants, None, None)
     };
 
     let names_idents: Vec<_> = ordinary
@@ -2012,15 +2054,17 @@
         &names_idents,
         is_variant,
         fallthrough,
+        fallthrough_borrowed,
         false,
+        cattrs.expecting(),
     ));
 
     quote_block! {
         #names_const
 
         struct __FieldVisitor #de_impl_generics #where_clause {
-            marker: _serde::export::PhantomData<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            marker: _serde::__private::PhantomData<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #de_impl_generics _serde::de::Visitor<#delife> for __FieldVisitor #de_ty_generics #where_clause {
@@ -2030,8 +2074,8 @@
         }
 
         let __visitor = __FieldVisitor {
-            marker: _serde::export::PhantomData::<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData,
+            marker: _serde::__private::PhantomData::<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData,
         };
         _serde::Deserializer::deserialize_identifier(__deserializer, __visitor)
     }
@@ -2042,21 +2086,20 @@
     fields: &[(String, Ident, Vec<String>)],
     is_variant: bool,
     fallthrough: Option<TokenStream>,
+    fallthrough_borrowed: Option<TokenStream>,
     collect_other_fields: bool,
+    expecting: Option<&str>,
 ) -> Fragment {
     let mut flat_fields = Vec::new();
     for (_, ident, aliases) in fields {
-        flat_fields.extend(aliases.iter().map(|alias| (alias, ident)))
+        flat_fields.extend(aliases.iter().map(|alias| (alias, ident)));
     }
 
-    let field_strs = flat_fields.iter().map(|(name, _)| name);
-    let field_borrowed_strs = flat_fields.iter().map(|(name, _)| name);
-    let field_bytes = flat_fields
-        .iter()
-        .map(|(name, _)| Literal::byte_string(name.as_bytes()));
-    let field_borrowed_bytes = flat_fields
+    let field_strs: &Vec<_> = &flat_fields.iter().map(|(name, _)| name).collect();
+    let field_bytes: &Vec<_> = &flat_fields
         .iter()
-        .map(|(name, _)| Literal::byte_string(name.as_bytes()));
+        .map(|(name, _)| Literal::byte_string(name.as_bytes()))
+        .collect();
 
     let constructors: &Vec<_> = &flat_fields
         .iter()
@@ -2067,11 +2110,11 @@
         .map(|(_, ident, _)| quote!(#this::#ident))
         .collect();
 
-    let expecting = if is_variant {
+    let expecting = expecting.unwrap_or(if is_variant {
         "variant identifier"
     } else {
         "field identifier"
-    };
+    });
 
     let index_expecting = if is_variant { "variant" } else { "field" };
 
@@ -2079,7 +2122,7 @@
         None
     } else {
         Some(quote! {
-            let __value = &_serde::export::from_utf8_lossy(__value);
+            let __value = &_serde::__private::from_utf8_lossy(__value);
         })
     };
 
@@ -2091,193 +2134,213 @@
     ) = if collect_other_fields {
         (
             Some(quote! {
-                let __value = _serde::private::de::Content::String(_serde::export::ToString::to_string(__value));
+                let __value = _serde::__private::de::Content::String(_serde::__private::ToString::to_string(__value));
             }),
             Some(quote! {
-                let __value = _serde::private::de::Content::Str(__value);
+                let __value = _serde::__private::de::Content::Str(__value);
             }),
             Some(quote! {
-                let __value = _serde::private::de::Content::ByteBuf(__value.to_vec());
+                let __value = _serde::__private::de::Content::ByteBuf(__value.to_vec());
             }),
             Some(quote! {
-                let __value = _serde::private::de::Content::Bytes(__value);
+                let __value = _serde::__private::de::Content::Bytes(__value);
             }),
         )
     } else {
         (None, None, None, None)
     };
 
-    let fallthrough_arm = if let Some(fallthrough) = fallthrough {
+    let fallthrough_arm_tokens;
+    let fallthrough_arm = if let Some(fallthrough) = &fallthrough {
         fallthrough
     } else if is_variant {
-        quote! {
-            _serde::export::Err(_serde::de::Error::unknown_variant(__value, VARIANTS))
-        }
+        fallthrough_arm_tokens = quote! {
+            _serde::__private::Err(_serde::de::Error::unknown_variant(__value, VARIANTS))
+        };
+        &fallthrough_arm_tokens
     } else {
-        quote! {
-            _serde::export::Err(_serde::de::Error::unknown_field(__value, FIELDS))
-        }
+        fallthrough_arm_tokens = quote! {
+            _serde::__private::Err(_serde::de::Error::unknown_field(__value, FIELDS))
+        };
+        &fallthrough_arm_tokens
+    };
+
+    let u64_fallthrough_arm_tokens;
+    let u64_fallthrough_arm = if let Some(fallthrough) = &fallthrough {
+        fallthrough
+    } else {
+        let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len());
+        u64_fallthrough_arm_tokens = quote! {
+            _serde::__private::Err(_serde::de::Error::invalid_value(
+                _serde::de::Unexpected::Unsigned(__value),
+                &#fallthrough_msg,
+            ))
+        };
+        &u64_fallthrough_arm_tokens
     };
 
     let variant_indices = 0_u64..;
-    let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len());
     let visit_other = if collect_other_fields {
         quote! {
-            fn visit_bool<__E>(self, __value: bool) -> _serde::export::Result<Self::Value, __E>
+            fn visit_bool<__E>(self, __value: bool) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::Bool(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::Bool(__value)))
             }
 
-            fn visit_i8<__E>(self, __value: i8) -> _serde::export::Result<Self::Value, __E>
+            fn visit_i8<__E>(self, __value: i8) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::I8(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::I8(__value)))
             }
 
-            fn visit_i16<__E>(self, __value: i16) -> _serde::export::Result<Self::Value, __E>
+            fn visit_i16<__E>(self, __value: i16) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::I16(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::I16(__value)))
             }
 
-            fn visit_i32<__E>(self, __value: i32) -> _serde::export::Result<Self::Value, __E>
+            fn visit_i32<__E>(self, __value: i32) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::I32(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::I32(__value)))
             }
 
-            fn visit_i64<__E>(self, __value: i64) -> _serde::export::Result<Self::Value, __E>
+            fn visit_i64<__E>(self, __value: i64) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::I64(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::I64(__value)))
             }
 
-            fn visit_u8<__E>(self, __value: u8) -> _serde::export::Result<Self::Value, __E>
+            fn visit_u8<__E>(self, __value: u8) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::U8(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::U8(__value)))
             }
 
-            fn visit_u16<__E>(self, __value: u16) -> _serde::export::Result<Self::Value, __E>
+            fn visit_u16<__E>(self, __value: u16) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::U16(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::U16(__value)))
             }
 
-            fn visit_u32<__E>(self, __value: u32) -> _serde::export::Result<Self::Value, __E>
+            fn visit_u32<__E>(self, __value: u32) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::U32(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::U32(__value)))
             }
 
-            fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result<Self::Value, __E>
+            fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::U64(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::U64(__value)))
             }
 
-            fn visit_f32<__E>(self, __value: f32) -> _serde::export::Result<Self::Value, __E>
+            fn visit_f32<__E>(self, __value: f32) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::F32(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::F32(__value)))
             }
 
-            fn visit_f64<__E>(self, __value: f64) -> _serde::export::Result<Self::Value, __E>
+            fn visit_f64<__E>(self, __value: f64) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::F64(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::F64(__value)))
             }
 
-            fn visit_char<__E>(self, __value: char) -> _serde::export::Result<Self::Value, __E>
+            fn visit_char<__E>(self, __value: char) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::Char(__value)))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::Char(__value)))
             }
 
-            fn visit_unit<__E>(self) -> _serde::export::Result<Self::Value, __E>
+            fn visit_unit<__E>(self) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
-                _serde::export::Ok(__Field::__other(_serde::private::de::Content::Unit))
+                _serde::__private::Ok(__Field::__other(_serde::__private::de::Content::Unit))
             }
-
-            fn visit_borrowed_str<__E>(self, __value: &'de str) -> _serde::export::Result<Self::Value, __E>
+        }
+    } else {
+        quote! {
+            fn visit_u64<__E>(self, __value: u64) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
                 match __value {
                     #(
-                        #field_borrowed_strs => _serde::export::Ok(#constructors),
+                        #variant_indices => _serde::__private::Ok(#main_constructors),
                     )*
-                    _ => {
-                        #value_as_borrowed_str_content
-                        #fallthrough_arm
-                    }
+                    _ => #u64_fallthrough_arm,
                 }
             }
+        }
+    };
 
-            fn visit_borrowed_bytes<__E>(self, __value: &'de [u8]) -> _serde::export::Result<Self::Value, __E>
+    let visit_borrowed = if fallthrough_borrowed.is_some() || collect_other_fields {
+        let fallthrough_borrowed_arm = fallthrough_borrowed.as_ref().unwrap_or(fallthrough_arm);
+        Some(quote! {
+            fn visit_borrowed_str<__E>(self, __value: &'de str) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
                 match __value {
                     #(
-                        #field_borrowed_bytes => _serde::export::Ok(#constructors),
+                        #field_strs => _serde::__private::Ok(#constructors),
                     )*
                     _ => {
-                        #bytes_to_str
-                        #value_as_borrowed_bytes_content
-                        #fallthrough_arm
+                        #value_as_borrowed_str_content
+                        #fallthrough_borrowed_arm
                     }
                 }
             }
-        }
-    } else {
-        quote! {
-            fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result<Self::Value, __E>
+
+            fn visit_borrowed_bytes<__E>(self, __value: &'de [u8]) -> _serde::__private::Result<Self::Value, __E>
             where
                 __E: _serde::de::Error,
             {
                 match __value {
                     #(
-                        #variant_indices => _serde::export::Ok(#main_constructors),
+                        #field_bytes => _serde::__private::Ok(#constructors),
                     )*
-                    _ => _serde::export::Err(_serde::de::Error::invalid_value(
-                        _serde::de::Unexpected::Unsigned(__value),
-                        &#fallthrough_msg,
-                    ))
+                    _ => {
+                        #bytes_to_str
+                        #value_as_borrowed_bytes_content
+                        #fallthrough_borrowed_arm
+                    }
                 }
             }
-        }
+        })
+    } else {
+        None
     };
 
     quote_block! {
-        fn expecting(&self, __formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-            _serde::export::Formatter::write_str(__formatter, #expecting)
+        fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
+            _serde::__private::Formatter::write_str(__formatter, #expecting)
         }
 
         #visit_other
 
-        fn visit_str<__E>(self, __value: &str) -> _serde::export::Result<Self::Value, __E>
+        fn visit_str<__E>(self, __value: &str) -> _serde::__private::Result<Self::Value, __E>
         where
             __E: _serde::de::Error,
         {
             match __value {
                 #(
-                    #field_strs => _serde::export::Ok(#constructors),
+                    #field_strs => _serde::__private::Ok(#constructors),
                 )*
                 _ => {
                     #value_as_str_content
@@ -2286,13 +2349,13 @@
             }
         }
 
-        fn visit_bytes<__E>(self, __value: &[u8]) -> _serde::export::Result<Self::Value, __E>
+        fn visit_bytes<__E>(self, __value: &[u8]) -> _serde::__private::Result<Self::Value, __E>
         where
             __E: _serde::de::Error,
         {
             match __value {
                 #(
-                    #field_bytes => _serde::export::Ok(#constructors),
+                    #field_bytes => _serde::__private::Ok(#constructors),
                 )*
                 _ => {
                     #bytes_to_str
@@ -2301,6 +2364,8 @@
                 }
             }
         }
+
+        #visit_borrowed
     }
 }
 
@@ -2385,16 +2450,16 @@
         .map(|(field, name)| {
             let field_ty = field.ty;
             quote! {
-                let mut #name: _serde::export::Option<#field_ty> = _serde::export::None;
+                let mut #name: _serde::__private::Option<#field_ty> = _serde::__private::None;
             }
         });
 
     // Collect contents for flatten fields into a buffer
     let let_collect = if cattrs.has_flatten() {
         Some(quote! {
-            let mut __collect = _serde::export::Vec::<_serde::export::Option<(
-                _serde::private::de::Content,
-                _serde::private::de::Content
+            let mut __collect = _serde::__private::Vec::<_serde::__private::Option<(
+                _serde::__private::de::Content,
+                _serde::__private::de::Content
             )>>::new();
         })
     } else {
@@ -2423,9 +2488,9 @@
                     quote!({
                         #wrapper
                         match _serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map) {
-                            _serde::export::Ok(__wrapper) => __wrapper.value,
-                            _serde::export::Err(__err) => {
-                                return _serde::export::Err(__err);
+                            _serde::__private::Ok(__wrapper) => __wrapper.value,
+                            _serde::__private::Err(__err) => {
+                                return _serde::__private::Err(__err);
                             }
                         }
                     })
@@ -2433,10 +2498,10 @@
             };
             quote! {
                 __Field::#name => {
-                    if _serde::export::Option::is_some(&#name) {
-                        return _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#deser_name));
+                    if _serde::__private::Option::is_some(&#name) {
+                        return _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#deser_name));
                     }
-                    #name = _serde::export::Some(#visit);
+                    #name = _serde::__private::Some(#visit);
                 }
             }
         });
@@ -2445,7 +2510,7 @@
     let ignored_arm = if cattrs.has_flatten() {
         Some(quote! {
             __Field::__other(__name) => {
-                __collect.push(_serde::export::Some((
+                __collect.push(_serde::__private::Some((
                     __name,
                     try!(_serde::de::MapAccess::next_value(&mut __map)))));
             }
@@ -2462,14 +2527,14 @@
     let match_keys = if cattrs.deny_unknown_fields() && all_skipped {
         quote! {
             // FIXME: Once we drop support for Rust 1.15:
-            // let _serde::export::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map));
-            _serde::export::Option::map(
+            // let _serde::__private::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map));
+            _serde::__private::Option::map(
                 try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)),
                 |__impossible| match __impossible {});
         }
     } else {
         quote! {
-            while let _serde::export::Some(__key) = try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)) {
+            while let _serde::__private::Some(__key) = try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)) {
                 match __key {
                     #(#value_arms)*
                     #ignored_arm
@@ -2486,8 +2551,8 @@
 
             quote! {
                 let #name = match #name {
-                    _serde::export::Some(#name) => #name,
-                    _serde::export::None => #missing_expr
+                    _serde::__private::Some(#name) => #name,
+                    _serde::__private::None => #missing_expr
                 };
             }
         });
@@ -2506,22 +2571,22 @@
             };
             quote! {
                 let #name: #field_ty = try!(#func(
-                    _serde::private::de::FlatMapDeserializer(
+                    _serde::__private::de::FlatMapDeserializer(
                         &mut __collect,
-                        _serde::export::PhantomData)));
+                        _serde::__private::PhantomData)));
             }
         });
 
     let collected_deny_unknown_fields = if cattrs.has_flatten() && cattrs.deny_unknown_fields() {
         Some(quote! {
-            if let _serde::export::Some(_serde::export::Some((__key, _))) =
-                __collect.into_iter().filter(_serde::export::Option::is_some).next()
+            if let _serde::__private::Some(_serde::__private::Some((__key, _))) =
+                __collect.into_iter().filter(_serde::__private::Option::is_some).next()
             {
-                if let _serde::export::Some(__key) = __key.as_str() {
-                    return _serde::export::Err(
+                if let _serde::__private::Some(__key) = __key.as_str() {
+                    return _serde::__private::Err(
                         _serde::de::Error::custom(format_args!("unknown field `{}`", &__key)));
                 } else {
-                    return _serde::export::Err(
+                    return _serde::__private::Err(
                         _serde::de::Error::custom(format_args!("unexpected map key")));
                 }
             }
@@ -2542,7 +2607,7 @@
 
     let let_default = match cattrs.default() {
         attr::Default::Default => Some(quote!(
-            let __default: Self::Value = _serde::export::Default::default();
+            let __default: Self::Value = _serde::__private::Default::default();
         )),
         attr::Default::Path(path) => Some(quote!(
             let __default: Self::Value = #path();
@@ -2558,7 +2623,7 @@
     if params.has_getter {
         let this = &params.this;
         result = quote! {
-            _serde::export::Into::<#this>::into(#result)
+            _serde::__private::Into::<#this>::into(#result)
         };
     }
 
@@ -2577,7 +2642,7 @@
 
         #collected_deny_unknown_fields
 
-        _serde::export::Ok(#result)
+        _serde::__private::Ok(#result)
     }
 }
 
@@ -2653,7 +2718,7 @@
             let visit = match field.attrs.deserialize_with() {
                 None => {
                     quote! {
-                        try!(_serde::de::MapAccess::next_value_seed(&mut __map, _serde::private::de::InPlaceSeed(&mut self.place.#member)))
+                        try!(_serde::de::MapAccess::next_value_seed(&mut __map, _serde::__private::de::InPlaceSeed(&mut self.place.#member)))
                     }
                 }
                 Some(path) => {
@@ -2661,9 +2726,9 @@
                     quote!({
                         #wrapper
                         self.place.#member = match _serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map) {
-                            _serde::export::Ok(__wrapper) => __wrapper.value,
-                            _serde::export::Err(__err) => {
-                                return _serde::export::Err(__err);
+                            _serde::__private::Ok(__wrapper) => __wrapper.value,
+                            _serde::__private::Err(__err) => {
+                                return _serde::__private::Err(__err);
                             }
                         };
                     })
@@ -2672,7 +2737,7 @@
             quote! {
                 __Field::#name => {
                     if #name {
-                        return _serde::export::Err(<__A::Error as _serde::de::Error>::duplicate_field(#deser_name));
+                        return _serde::__private::Err(<__A::Error as _serde::de::Error>::duplicate_field(#deser_name));
                     }
                     #visit;
                     #name = true;
@@ -2694,14 +2759,14 @@
     let match_keys = if cattrs.deny_unknown_fields() && all_skipped {
         quote! {
             // FIXME: Once we drop support for Rust 1.15:
-            // let _serde::export::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map));
-            _serde::export::Option::map(
+            // let _serde::__private::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map));
+            _serde::__private::Option::map(
                 try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)),
                 |__impossible| match __impossible {});
         }
     } else {
         quote! {
-            while let _serde::export::Some(__key) = try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)) {
+            while let _serde::__private::Some(__key) = try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)) {
                 match __key {
                     #(#value_arms_from)*
                     #ignored_arm
@@ -2743,7 +2808,7 @@
 
     let let_default = match cattrs.default() {
         attr::Default::Default => Some(quote!(
-            let __default: #this #ty_generics = _serde::export::Default::default();
+            let __default: #this #ty_generics = _serde::__private::Default::default();
         )),
         attr::Default::Path(path) => Some(quote!(
             let __default: #this #ty_generics = #path();
@@ -2764,7 +2829,7 @@
 
         #(#check_flags)*
 
-        _serde::export::Ok(())
+        _serde::__private::Ok(())
     }
 }
 
@@ -2787,19 +2852,19 @@
     let wrapper = quote! {
         struct __DeserializeWith #de_impl_generics #where_clause {
             value: #value_ty,
-            phantom: _serde::export::PhantomData<#this #ty_generics>,
-            lifetime: _serde::export::PhantomData<&#delife ()>,
+            phantom: _serde::__private::PhantomData<#this #ty_generics>,
+            lifetime: _serde::__private::PhantomData<&#delife ()>,
         }
 
         impl #de_impl_generics _serde::Deserialize<#delife> for __DeserializeWith #de_ty_generics #where_clause {
-            fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result<Self, __D::Error>
+            fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result<Self, __D::Error>
             where
                 __D: _serde::Deserializer<#delife>,
             {
-                _serde::export::Ok(__DeserializeWith {
+                _serde::__private::Ok(__DeserializeWith {
                     value: try!(#deserialize_with(__deserializer)),
-                    phantom: _serde::export::PhantomData,
-                    lifetime: _serde::export::PhantomData,
+                    phantom: _serde::__private::PhantomData,
+                    lifetime: _serde::__private::PhantomData,
                 })
             }
         }
@@ -2823,51 +2888,68 @@
     variant: &Variant,
     deserialize_with: &syn::ExprPath,
 ) -> (TokenStream, TokenStream, TokenStream) {
-    let this = &params.this;
-    let variant_ident = &variant.ident;
-
     let field_tys = variant.fields.iter().map(|field| field.ty);
     let (wrapper, wrapper_ty) =
         wrap_deserialize_with(params, &quote!((#(#field_tys),*)), deserialize_with);
 
+    let unwrap_fn = unwrap_to_variant_closure(params, variant, true);
+
+    (wrapper, wrapper_ty, unwrap_fn)
+}
+
+// Generates closure that converts single input parameter to the final value.
+fn unwrap_to_variant_closure(
+    params: &Parameters,
+    variant: &Variant,
+    with_wrapper: bool,
+) -> TokenStream {
+    let this = &params.this;
+    let variant_ident = &variant.ident;
+
+    let (arg, wrapper) = if with_wrapper {
+        (quote! { __wrap }, quote! { __wrap.value })
+    } else {
+        let field_tys = variant.fields.iter().map(|field| field.ty);
+        (quote! { __wrap: (#(#field_tys),*) }, quote! { __wrap })
+    };
+
     let field_access = (0..variant.fields.len()).map(|n| {
         Member::Unnamed(Index {
             index: n as u32,
             span: Span::call_site(),
         })
     });
-    let unwrap_fn = match variant.style {
+
+    match variant.style {
         Style::Struct if variant.fields.len() == 1 => {
             let member = &variant.fields[0].member;
             quote! {
-                |__wrap| #this::#variant_ident { #member: __wrap.value }
+                |#arg| #this::#variant_ident { #member: #wrapper }
             }
         }
         Style::Struct => {
             let members = variant.fields.iter().map(|field| &field.member);
             quote! {
-                |__wrap| #this::#variant_ident { #(#members: __wrap.value.#field_access),* }
+                |#arg| #this::#variant_ident { #(#members: #wrapper.#field_access),* }
             }
         }
         Style::Tuple => quote! {
-            |__wrap| #this::#variant_ident(#(__wrap.value.#field_access),*)
+            |#arg| #this::#variant_ident(#(#wrapper.#field_access),*)
         },
         Style::Newtype => quote! {
-            |__wrap| #this::#variant_ident(__wrap.value)
+            |#arg| #this::#variant_ident(#wrapper)
         },
         Style::Unit => quote! {
-            |__wrap| #this::#variant_ident
+            |#arg| #this::#variant_ident
         },
-    };
-
-    (wrapper, wrapper_ty, unwrap_fn)
+    }
 }
 
 fn expr_is_missing(field: &Field, cattrs: &attr::Container) -> Fragment {
     match field.attrs.default() {
         attr::Default::Default => {
             let span = field.original.span();
-            let func = quote_spanned!(span=> _serde::export::Default::default);
+            let func = quote_spanned!(span=> _serde::__private::Default::default);
             return quote_expr!(#func());
         }
         attr::Default::Path(path) => {
@@ -2888,14 +2970,14 @@
     match field.attrs.deserialize_with() {
         None => {
             let span = field.original.span();
-            let func = quote_spanned!(span=> _serde::private::de::missing_field);
+            let func = quote_spanned!(span=> _serde::__private::de::missing_field);
             quote_expr! {
                 try!(#func(#name))
             }
         }
         Some(_) => {
             quote_expr! {
-                return _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#name))
+                return _serde::__private::Err(<__A::Error as _serde::de::Error>::missing_field(#name))
             }
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/dummy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/dummy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/dummy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/dummy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,7 +23,7 @@
             use #path as _serde;
         },
         None => quote! {
-            #[allow(rust_2018_idioms, clippy::useless_attribute)]
+            #[allow(unused_extern_crates, clippy::useless_attribute)]
             extern crate serde as _serde;
         },
     };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/ast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/ast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/ast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/ast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,7 +23,7 @@
 
 /// The fields of a struct or enum.
 ///
-/// Analagous to `syn::Data`.
+/// Analogous to `syn::Data`.
 pub enum Data<'a> {
     Enum(Vec<Variant<'a>>),
     Struct(Style, Vec<Field<'a>>),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/attr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/attr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/attr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/attr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,10 @@
+use internals::respan::respan;
 use internals::symbol::*;
 use internals::{ungroup, Ctxt};
-use proc_macro2::{Group, Span, TokenStream, TokenTree};
+use proc_macro2::{Spacing, Span, TokenStream, TokenTree};
 use quote::ToTokens;
 use std::borrow::Cow;
 use std::collections::BTreeSet;
-use std::str::FromStr;
 use syn;
 use syn::parse::{self, Parse, ParseStream};
 use syn::punctuated::Punctuated;
@@ -223,6 +223,8 @@
     has_flatten: bool,
     serde_path: Option<syn::Path>,
     is_packed: bool,
+    /// Error message generated when type can't be deserialized
+    expecting: Option<String>,
 }
 
 /// Styles of representing an enum.
@@ -305,6 +307,7 @@
         let mut field_identifier = BoolAttr::none(cx, FIELD_IDENTIFIER);
         let mut variant_identifier = BoolAttr::none(cx, VARIANT_IDENTIFIER);
         let mut serde_path = Attr::none(cx, CRATE);
+        let mut expecting = Attr::none(cx, EXPECTING);
 
         for meta_item in item
             .attrs
@@ -337,13 +340,7 @@
                                 rename_all_ser_rule.set(&m.path, rename_rule);
                                 rename_all_de_rule.set(&m.path, rename_rule);
                             }
-                            Err(()) => cx.error_spanned_by(
-                                s,
-                                format!(
-                                    "unknown rename rule for #[serde(rename_all = {:?})]",
-                                    s.value(),
-                                ),
-                            ),
+                            Err(err) => cx.error_spanned_by(s, err),
                         }
                     }
                 }
@@ -354,25 +351,13 @@
                         if let Some(ser) = ser {
                             match RenameRule::from_str(&ser.value()) {
                                 Ok(rename_rule) => rename_all_ser_rule.set(&m.path, rename_rule),
-                                Err(()) => cx.error_spanned_by(
-                                    ser,
-                                    format!(
-                                        "unknown rename rule for #[serde(rename_all = {:?})]",
-                                        ser.value(),
-                                    ),
-                                ),
+                                Err(err) => cx.error_spanned_by(ser, err),
                             }
                         }
                         if let Some(de) = de {
                             match RenameRule::from_str(&de.value()) {
                                 Ok(rename_rule) => rename_all_de_rule.set(&m.path, rename_rule),
-                                Err(()) => cx.error_spanned_by(
-                                    de,
-                                    format!(
-                                        "unknown rename rule for #[serde(rename_all = {:?})]",
-                                        de.value(),
-                                    ),
-                                ),
+                                Err(err) => cx.error_spanned_by(de, err),
                             }
                         }
                     }
@@ -571,7 +556,14 @@
                 // Parse `#[serde(crate = "foo")]`
                 Meta(NameValue(m)) if m.path == CRATE => {
                     if let Ok(path) = parse_lit_into_path(cx, CRATE, &m.lit) {
-                        serde_path.set(&m.path, path)
+                        serde_path.set(&m.path, path);
+                    }
+                }
+
+                // Parse `#[serde(expecting = "a message")]`
+                Meta(NameValue(m)) if m.path == EXPECTING => {
+                    if let Ok(s) = get_lit_str(cx, EXPECTING, &m.lit) {
+                        expecting.set(&m.path, s.value());
                     }
                 }
 
@@ -627,6 +619,7 @@
             has_flatten: false,
             serde_path: serde_path.get(),
             is_packed,
+            expecting: expecting.get(),
         }
     }
 
@@ -702,6 +695,12 @@
         self.custom_serde_path()
             .map_or_else(|| Cow::Owned(parse_quote!(_serde)), Cow::Borrowed)
     }
+
+    /// Error message generated when type can't be deserialized.
+    /// If `None`, default message will be used
+    pub fn expecting(&self) -> Option<&str> {
+        self.expecting.as_ref().map(String::as_ref)
+    }
 }
 
 fn decide_tag(
@@ -914,13 +913,7 @@
                                 rename_all_ser_rule.set(&m.path, rename_rule);
                                 rename_all_de_rule.set(&m.path, rename_rule);
                             }
-                            Err(()) => cx.error_spanned_by(
-                                s,
-                                format!(
-                                    "unknown rename rule for #[serde(rename_all = {:?})]",
-                                    s.value()
-                                ),
-                            ),
+                            Err(err) => cx.error_spanned_by(s, err),
                         }
                     }
                 }
@@ -931,25 +924,13 @@
                         if let Some(ser) = ser {
                             match RenameRule::from_str(&ser.value()) {
                                 Ok(rename_rule) => rename_all_ser_rule.set(&m.path, rename_rule),
-                                Err(()) => cx.error_spanned_by(
-                                    ser,
-                                    format!(
-                                        "unknown rename rule for #[serde(rename_all = {:?})]",
-                                        ser.value(),
-                                    ),
-                                ),
+                                Err(err) => cx.error_spanned_by(ser, err),
                             }
                         }
                         if let Some(de) = de {
                             match RenameRule::from_str(&de.value()) {
                                 Ok(rename_rule) => rename_all_de_rule.set(&m.path, rename_rule),
-                                Err(()) => cx.error_spanned_by(
-                                    de,
-                                    format!(
-                                        "unknown rename rule for #[serde(rename_all = {:?})]",
-                                        de.value(),
-                                    ),
-                                ),
+                                Err(err) => cx.error_spanned_by(de, err),
                             }
                         }
                     }
@@ -1393,7 +1374,7 @@
                 };
                 let span = Span::call_site();
                 path.segments.push(Ident::new("_serde", span).into());
-                path.segments.push(Ident::new("private", span).into());
+                path.segments.push(Ident::new("__private", span).into());
                 path.segments.push(Ident::new("de", span).into());
                 path.segments
                     .push(Ident::new("borrow_cow_str", span).into());
@@ -1410,7 +1391,7 @@
                 };
                 let span = Span::call_site();
                 path.segments.push(Ident::new("_serde", span).into());
-                path.segments.push(Ident::new("private", span).into());
+                path.segments.push(Ident::new("__private", span).into());
                 path.segments.push(Ident::new("de", span).into());
                 path.segments
                     .push(Ident::new("borrow_cow_bytes", span).into());
@@ -1628,7 +1609,7 @@
 fn parse_lit_into_path(cx: &Ctxt, attr_name: Symbol, lit: &syn::Lit) -> Result<syn::Path, ()> {
     let string = get_lit_str(cx, attr_name, lit)?;
     parse_lit_str(string).map_err(|_| {
-        cx.error_spanned_by(lit, format!("failed to parse path: {:?}", string.value()))
+        cx.error_spanned_by(lit, format!("failed to parse path: {:?}", string.value()));
     })
 }
 
@@ -1639,7 +1620,7 @@
 ) -> Result<syn::ExprPath, ()> {
     let string = get_lit_str(cx, attr_name, lit)?;
     parse_lit_str(string).map_err(|_| {
-        cx.error_spanned_by(lit, format!("failed to parse path: {:?}", string.value()))
+        cx.error_spanned_by(lit, format!("failed to parse path: {:?}", string.value()));
     })
 }
 
@@ -1668,7 +1649,7 @@
         cx.error_spanned_by(
             lit,
             format!("failed to parse type: {} = {:?}", attr_name, string.value()),
-        )
+        );
     })
 }
 
@@ -1921,14 +1902,41 @@
         syn::Type::Group(ty) => {
             collect_lifetimes(&ty.elem, out);
         }
+        syn::Type::Macro(ty) => {
+            collect_lifetimes_from_tokens(ty.mac.tokens.clone(), out);
+        }
         syn::Type::BareFn(_)
         | syn::Type::Never(_)
         | syn::Type::TraitObject(_)
         | syn::Type::ImplTrait(_)
         | syn::Type::Infer(_)
-        | syn::Type::Macro(_)
-        | syn::Type::Verbatim(_)
-        | _ => {}
+        | syn::Type::Verbatim(_) => {}
+
+        #[cfg(test)]
+        syn::Type::__TestExhaustive(_) => unimplemented!(),
+        #[cfg(not(test))]
+        _ => {}
+    }
+}
+
+fn collect_lifetimes_from_tokens(tokens: TokenStream, out: &mut BTreeSet<syn::Lifetime>) {
+    let mut iter = tokens.into_iter();
+    while let Some(tt) = iter.next() {
+        match &tt {
+            TokenTree::Punct(op) if op.as_char() == '\'' && op.spacing() == Spacing::Joint => {
+                if let Some(TokenTree::Ident(ident)) = iter.next() {
+                    out.insert(syn::Lifetime {
+                        apostrophe: op.span(),
+                        ident,
+                    });
+                }
+            }
+            TokenTree::Group(group) => {
+                let tokens = group.stream();
+                collect_lifetimes_from_tokens(tokens, out);
+            }
+            _ => {}
+        }
     }
 }
 
@@ -1942,20 +1950,5 @@
 
 fn spanned_tokens(s: &syn::LitStr) -> parse::Result<TokenStream> {
     let stream = syn::parse_str(&s.value())?;
-    Ok(respan_token_stream(stream, s.span()))
-}
-
-fn respan_token_stream(stream: TokenStream, span: Span) -> TokenStream {
-    stream
-        .into_iter()
-        .map(|token| respan_token_tree(token, span))
-        .collect()
-}
-
-fn respan_token_tree(mut token: TokenTree, span: Span) -> TokenTree {
-    if let TokenTree::Group(g) = &mut token {
-        *g = Group::new(g.delimiter(), respan_token_stream(g.stream(), span));
-    }
-    token.set_span(span);
-    token
+    Ok(respan(stream, s.span()))
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/case.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/case.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/case.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/case.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
 #[allow(deprecated, unused_imports)]
 use std::ascii::AsciiExt;
 
-use std::str::FromStr;
+use std::fmt::{self, Debug, Display};
 
 use self::RenameRule::*;
 
@@ -17,7 +17,7 @@
     /// Rename direct children to "lowercase" style.
     LowerCase,
     /// Rename direct children to "UPPERCASE" style.
-    UPPERCASE,
+    UpperCase,
     /// Rename direct children to "PascalCase" style, as typically used for
     /// enum variants.
     PascalCase,
@@ -35,13 +35,35 @@
     ScreamingKebabCase,
 }
 
+static RENAME_RULES: &[(&str, RenameRule)] = &[
+    ("lowercase", LowerCase),
+    ("UPPERCASE", UpperCase),
+    ("PascalCase", PascalCase),
+    ("camelCase", CamelCase),
+    ("snake_case", SnakeCase),
+    ("SCREAMING_SNAKE_CASE", ScreamingSnakeCase),
+    ("kebab-case", KebabCase),
+    ("SCREAMING-KEBAB-CASE", ScreamingKebabCase),
+];
+
 impl RenameRule {
+    pub fn from_str(rename_all_str: &str) -> Result<Self, ParseError> {
+        for (name, rule) in RENAME_RULES {
+            if rename_all_str == *name {
+                return Ok(*rule);
+            }
+        }
+        Err(ParseError {
+            unknown: rename_all_str,
+        })
+    }
+
     /// Apply a renaming rule to an enum variant, returning the version expected in the source.
     pub fn apply_to_variant(&self, variant: &str) -> String {
         match *self {
             None | PascalCase => variant.to_owned(),
             LowerCase => variant.to_ascii_lowercase(),
-            UPPERCASE => variant.to_ascii_uppercase(),
+            UpperCase => variant.to_ascii_uppercase(),
             CamelCase => variant[..1].to_ascii_lowercase() + &variant[1..],
             SnakeCase => {
                 let mut snake = String::new();
@@ -65,7 +87,7 @@
     pub fn apply_to_field(&self, field: &str) -> String {
         match *self {
             None | LowerCase | SnakeCase => field.to_owned(),
-            UPPERCASE => field.to_ascii_uppercase(),
+            UpperCase => field.to_ascii_uppercase(),
             PascalCase => {
                 let mut pascal = String::new();
                 let mut capitalize = true;
@@ -92,21 +114,22 @@
     }
 }
 
-impl FromStr for RenameRule {
-    type Err = ();
+pub struct ParseError<'a> {
+    unknown: &'a str,
+}
 
-    fn from_str(rename_all_str: &str) -> Result<Self, Self::Err> {
-        match rename_all_str {
-            "lowercase" => Ok(LowerCase),
-            "UPPERCASE" => Ok(UPPERCASE),
-            "PascalCase" => Ok(PascalCase),
-            "camelCase" => Ok(CamelCase),
-            "snake_case" => Ok(SnakeCase),
-            "SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase),
-            "kebab-case" => Ok(KebabCase),
-            "SCREAMING-KEBAB-CASE" => Ok(ScreamingKebabCase),
-            _ => Err(()),
+impl<'a> Display for ParseError<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str("unknown rename rule `rename_all = ")?;
+        Debug::fmt(self.unknown, f)?;
+        f.write_str("`, expected one of ")?;
+        for (i, (name, _rule)) in RENAME_RULES.iter().enumerate() {
+            if i > 0 {
+                f.write_str(", ")?;
+            }
+            Debug::fmt(name, f)?;
         }
+        Ok(())
     }
 }
 
@@ -131,7 +154,7 @@
     ] {
         assert_eq!(None.apply_to_variant(original), original);
         assert_eq!(LowerCase.apply_to_variant(original), lower);
-        assert_eq!(UPPERCASE.apply_to_variant(original), upper);
+        assert_eq!(UpperCase.apply_to_variant(original), upper);
         assert_eq!(PascalCase.apply_to_variant(original), original);
         assert_eq!(CamelCase.apply_to_variant(original), camel);
         assert_eq!(SnakeCase.apply_to_variant(original), snake);
@@ -163,7 +186,7 @@
         ("z42", "Z42", "Z42", "z42", "Z42", "z42", "Z42"),
     ] {
         assert_eq!(None.apply_to_field(original), original);
-        assert_eq!(UPPERCASE.apply_to_field(original), upper);
+        assert_eq!(UpperCase.apply_to_field(original), upper);
         assert_eq!(PascalCase.apply_to_field(original), pascal);
         assert_eq!(CamelCase.apply_to_field(original), camel);
         assert_eq!(SnakeCase.apply_to_field(original), original);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/check.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/check.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/check.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/check.rs	2021-12-09 12:01:26.000000000 +0000
@@ -260,7 +260,7 @@
         cx.error_spanned_by(
             cont.original,
             format!("variant field name `{}` conflicts with internal tag", tag),
-        )
+        );
     };
 
     for variant in variants {
@@ -396,7 +396,7 @@
 }
 
 fn allow_transparent(field: &Field, derive: Derive) -> bool {
-    if let Type::Path(ty) = ungroup(&field.ty) {
+    if let Type::Path(ty) = ungroup(field.ty) {
         if let Some(seg) = ty.path.segments.last() {
             if seg.ident == "PhantomData" {
                 return false;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,8 +4,12 @@
 mod ctxt;
 pub use self::ctxt::Ctxt;
 
+mod receiver;
+pub use self::receiver::replace_receiver;
+
 mod case;
 mod check;
+mod respan;
 mod symbol;
 
 use syn::Type;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/receiver.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/receiver.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/receiver.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/receiver.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,287 @@
+use internals::respan::respan;
+use proc_macro2::Span;
+use quote::ToTokens;
+use std::mem;
+use syn::punctuated::Punctuated;
+use syn::{
+    parse_quote, Data, DeriveInput, Expr, ExprPath, GenericArgument, GenericParam, Generics, Macro,
+    Path, PathArguments, QSelf, ReturnType, Type, TypeParamBound, TypePath, WherePredicate,
+};
+
+pub fn replace_receiver(input: &mut DeriveInput) {
+    let self_ty = {
+        let ident = &input.ident;
+        let ty_generics = input.generics.split_for_impl().1;
+        parse_quote!(#ident #ty_generics)
+    };
+    let mut visitor = ReplaceReceiver(&self_ty);
+    visitor.visit_generics_mut(&mut input.generics);
+    visitor.visit_data_mut(&mut input.data);
+}
+
+struct ReplaceReceiver<'a>(&'a TypePath);
+
+impl ReplaceReceiver<'_> {
+    fn self_ty(&self, span: Span) -> TypePath {
+        let tokens = self.0.to_token_stream();
+        let respanned = respan(tokens, span);
+        syn::parse2(respanned).unwrap()
+    }
+
+    fn self_to_qself(&self, qself: &mut Option<QSelf>, path: &mut Path) {
+        if path.leading_colon.is_some() || path.segments[0].ident != "Self" {
+            return;
+        }
+
+        if path.segments.len() == 1 {
+            self.self_to_expr_path(path);
+            return;
+        }
+
+        let span = path.segments[0].ident.span();
+        *qself = Some(QSelf {
+            lt_token: Token![<](span),
+            ty: Box::new(Type::Path(self.self_ty(span))),
+            position: 0,
+            as_token: None,
+            gt_token: Token![>](span),
+        });
+
+        path.leading_colon = Some(**path.segments.pairs().next().unwrap().punct().unwrap());
+
+        let segments = mem::replace(&mut path.segments, Punctuated::new());
+        path.segments = segments.into_pairs().skip(1).collect();
+    }
+
+    fn self_to_expr_path(&self, path: &mut Path) {
+        let self_ty = self.self_ty(path.segments[0].ident.span());
+        let variant = mem::replace(path, self_ty.path);
+        for segment in &mut path.segments {
+            if let PathArguments::AngleBracketed(bracketed) = &mut segment.arguments {
+                if bracketed.colon2_token.is_none() && !bracketed.args.is_empty() {
+                    bracketed.colon2_token = Some(<Token![::]>::default());
+                }
+            }
+        }
+        if variant.segments.len() > 1 {
+            path.segments.push_punct(<Token![::]>::default());
+            path.segments.extend(variant.segments.into_pairs().skip(1));
+        }
+    }
+}
+
+impl ReplaceReceiver<'_> {
+    // `Self` -> `Receiver`
+    fn visit_type_mut(&mut self, ty: &mut Type) {
+        let span = if let Type::Path(node) = ty {
+            if node.qself.is_none() && node.path.is_ident("Self") {
+                node.path.segments[0].ident.span()
+            } else {
+                self.visit_type_path_mut(node);
+                return;
+            }
+        } else {
+            self.visit_type_mut_impl(ty);
+            return;
+        };
+        *ty = self.self_ty(span).into();
+    }
+
+    // `Self::Assoc` -> `<Receiver>::Assoc`
+    fn visit_type_path_mut(&mut self, ty: &mut TypePath) {
+        if ty.qself.is_none() {
+            self.self_to_qself(&mut ty.qself, &mut ty.path);
+        }
+        self.visit_type_path_mut_impl(ty);
+    }
+
+    // `Self::method` -> `<Receiver>::method`
+    fn visit_expr_path_mut(&mut self, expr: &mut ExprPath) {
+        if expr.qself.is_none() {
+            self.self_to_qself(&mut expr.qself, &mut expr.path);
+        }
+        self.visit_expr_path_mut_impl(expr);
+    }
+
+    // Everything below is simply traversing the syntax tree.
+
+    fn visit_type_mut_impl(&mut self, ty: &mut Type) {
+        match ty {
+            Type::Array(ty) => {
+                self.visit_type_mut(&mut ty.elem);
+                self.visit_expr_mut(&mut ty.len);
+            }
+            Type::BareFn(ty) => {
+                for arg in &mut ty.inputs {
+                    self.visit_type_mut(&mut arg.ty);
+                }
+                self.visit_return_type_mut(&mut ty.output);
+            }
+            Type::Group(ty) => self.visit_type_mut(&mut ty.elem),
+            Type::ImplTrait(ty) => {
+                for bound in &mut ty.bounds {
+                    self.visit_type_param_bound_mut(bound);
+                }
+            }
+            Type::Macro(ty) => self.visit_macro_mut(&mut ty.mac),
+            Type::Paren(ty) => self.visit_type_mut(&mut ty.elem),
+            Type::Path(ty) => {
+                if let Some(qself) = &mut ty.qself {
+                    self.visit_type_mut(&mut qself.ty);
+                }
+                self.visit_path_mut(&mut ty.path);
+            }
+            Type::Ptr(ty) => self.visit_type_mut(&mut ty.elem),
+            Type::Reference(ty) => self.visit_type_mut(&mut ty.elem),
+            Type::Slice(ty) => self.visit_type_mut(&mut ty.elem),
+            Type::TraitObject(ty) => {
+                for bound in &mut ty.bounds {
+                    self.visit_type_param_bound_mut(bound);
+                }
+            }
+            Type::Tuple(ty) => {
+                for elem in &mut ty.elems {
+                    self.visit_type_mut(elem);
+                }
+            }
+
+            Type::Infer(_) | Type::Never(_) | Type::Verbatim(_) => {}
+
+            #[cfg(test)]
+            Type::__TestExhaustive(_) => unimplemented!(),
+            #[cfg(not(test))]
+            _ => {}
+        }
+    }
+
+    fn visit_type_path_mut_impl(&mut self, ty: &mut TypePath) {
+        if let Some(qself) = &mut ty.qself {
+            self.visit_type_mut(&mut qself.ty);
+        }
+        self.visit_path_mut(&mut ty.path);
+    }
+
+    fn visit_expr_path_mut_impl(&mut self, expr: &mut ExprPath) {
+        if let Some(qself) = &mut expr.qself {
+            self.visit_type_mut(&mut qself.ty);
+        }
+        self.visit_path_mut(&mut expr.path);
+    }
+
+    fn visit_path_mut(&mut self, path: &mut Path) {
+        for segment in &mut path.segments {
+            self.visit_path_arguments_mut(&mut segment.arguments);
+        }
+    }
+
+    fn visit_path_arguments_mut(&mut self, arguments: &mut PathArguments) {
+        match arguments {
+            PathArguments::None => {}
+            PathArguments::AngleBracketed(arguments) => {
+                for arg in &mut arguments.args {
+                    match arg {
+                        GenericArgument::Type(arg) => self.visit_type_mut(arg),
+                        GenericArgument::Binding(arg) => self.visit_type_mut(&mut arg.ty),
+                        GenericArgument::Lifetime(_)
+                        | GenericArgument::Constraint(_)
+                        | GenericArgument::Const(_) => {}
+                    }
+                }
+            }
+            PathArguments::Parenthesized(arguments) => {
+                for argument in &mut arguments.inputs {
+                    self.visit_type_mut(argument);
+                }
+                self.visit_return_type_mut(&mut arguments.output);
+            }
+        }
+    }
+
+    fn visit_return_type_mut(&mut self, return_type: &mut ReturnType) {
+        match return_type {
+            ReturnType::Default => {}
+            ReturnType::Type(_, output) => self.visit_type_mut(output),
+        }
+    }
+
+    fn visit_type_param_bound_mut(&mut self, bound: &mut TypeParamBound) {
+        match bound {
+            TypeParamBound::Trait(bound) => self.visit_path_mut(&mut bound.path),
+            TypeParamBound::Lifetime(_) => {}
+        }
+    }
+
+    fn visit_generics_mut(&mut self, generics: &mut Generics) {
+        for param in &mut generics.params {
+            match param {
+                GenericParam::Type(param) => {
+                    for bound in &mut param.bounds {
+                        self.visit_type_param_bound_mut(bound);
+                    }
+                }
+                GenericParam::Lifetime(_) | GenericParam::Const(_) => {}
+            }
+        }
+        if let Some(where_clause) = &mut generics.where_clause {
+            for predicate in &mut where_clause.predicates {
+                match predicate {
+                    WherePredicate::Type(predicate) => {
+                        self.visit_type_mut(&mut predicate.bounded_ty);
+                        for bound in &mut predicate.bounds {
+                            self.visit_type_param_bound_mut(bound);
+                        }
+                    }
+                    WherePredicate::Lifetime(_) | WherePredicate::Eq(_) => {}
+                }
+            }
+        }
+    }
+
+    fn visit_data_mut(&mut self, data: &mut Data) {
+        match data {
+            Data::Struct(data) => {
+                for field in &mut data.fields {
+                    self.visit_type_mut(&mut field.ty);
+                }
+            }
+            Data::Enum(data) => {
+                for variant in &mut data.variants {
+                    for field in &mut variant.fields {
+                        self.visit_type_mut(&mut field.ty);
+                    }
+                }
+            }
+            Data::Union(_) => {}
+        }
+    }
+
+    fn visit_expr_mut(&mut self, expr: &mut Expr) {
+        match expr {
+            Expr::Binary(expr) => {
+                self.visit_expr_mut(&mut expr.left);
+                self.visit_expr_mut(&mut expr.right);
+            }
+            Expr::Call(expr) => {
+                self.visit_expr_mut(&mut expr.func);
+                for arg in &mut expr.args {
+                    self.visit_expr_mut(arg);
+                }
+            }
+            Expr::Cast(expr) => {
+                self.visit_expr_mut(&mut expr.expr);
+                self.visit_type_mut(&mut expr.ty);
+            }
+            Expr::Field(expr) => self.visit_expr_mut(&mut expr.base),
+            Expr::Index(expr) => {
+                self.visit_expr_mut(&mut expr.expr);
+                self.visit_expr_mut(&mut expr.index);
+            }
+            Expr::Paren(expr) => self.visit_expr_mut(&mut expr.expr),
+            Expr::Path(expr) => self.visit_expr_path_mut(expr),
+            Expr::Unary(expr) => self.visit_expr_mut(&mut expr.expr),
+            _ => {}
+        }
+    }
+
+    fn visit_macro_mut(&mut self, _mac: &mut Macro) {}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/respan.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/respan.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/respan.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/respan.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+use proc_macro2::{Group, Span, TokenStream, TokenTree};
+
+pub(crate) fn respan(stream: TokenStream, span: Span) -> TokenStream {
+    stream
+        .into_iter()
+        .map(|token| respan_token(token, span))
+        .collect()
+}
+
+fn respan_token(mut token: TokenTree, span: Span) -> TokenTree {
+    if let TokenTree::Group(g) = &mut token {
+        *g = Group::new(g.delimiter(), respan(g.stream(), span));
+    }
+    token.set_span(span);
+    token
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/symbol.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/symbol.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/internals/symbol.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/internals/symbol.rs	2021-12-09 12:01:26.000000000 +0000
@@ -35,6 +35,7 @@
 pub const UNTAGGED: Symbol = Symbol("untagged");
 pub const VARIANT_IDENTIFIER: Symbol = Symbol("variant_identifier");
 pub const WITH: Symbol = Symbol("with");
+pub const EXPECTING: Symbol = Symbol("expecting");
 
 impl PartialEq<Symbol> for Ident {
     fn eq(&self, word: &Symbol) -> bool {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,13 +13,19 @@
 //!
 //! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.118")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.130")]
 #![allow(unknown_lints, bare_trait_objects)]
 #![deny(clippy::all, clippy::pedantic)]
 // Ignored clippy lints
 #![allow(
+    // clippy false positive: https://github.com/rust-lang/rust-clippy/issues/7054
+    clippy::branches_sharing_code,
     clippy::cognitive_complexity,
+    // clippy bug: https://github.com/rust-lang/rust-clippy/issues/7575
+    clippy::collapsible_match,
     clippy::enum_variant_names,
+    // clippy bug: https://github.com/rust-lang/rust-clippy/issues/6797
+    clippy::manual_map,
     clippy::match_like_matches_macro,
     clippy::needless_pass_by_value,
     clippy::too_many_arguments,
@@ -35,11 +41,13 @@
     clippy::checked_conversions,
     clippy::doc_markdown,
     clippy::enum_glob_use,
-    clippy::filter_map,
     clippy::indexing_slicing,
     clippy::items_after_statements,
+    clippy::let_underscore_drop,
     clippy::map_err_ignore,
     clippy::match_same_arms,
+    // clippy bug: https://github.com/rust-lang/rust-clippy/issues/6984
+    clippy::match_wildcard_for_single_variants,
     clippy::module_name_repetitions,
     clippy::must_use_candidate,
     clippy::option_if_let_else,
@@ -48,6 +56,7 @@
     clippy::struct_excessive_bools,
     clippy::too_many_lines,
     clippy::unseparated_literal_suffix,
+    clippy::unused_self,
     clippy::use_self,
     clippy::wildcard_imports
 )]
@@ -78,16 +87,16 @@
 
 #[proc_macro_derive(Serialize, attributes(serde))]
 pub fn derive_serialize(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-    ser::expand_derive_serialize(&input)
+    let mut input = parse_macro_input!(input as DeriveInput);
+    ser::expand_derive_serialize(&mut input)
         .unwrap_or_else(to_compile_errors)
         .into()
 }
 
 #[proc_macro_derive(Deserialize, attributes(serde))]
 pub fn derive_deserialize(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-    de::expand_derive_deserialize(&input)
+    let mut input = parse_macro_input!(input as DeriveInput);
+    de::expand_derive_deserialize(&mut input)
         .unwrap_or_else(to_compile_errors)
         .into()
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/pretend.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/pretend.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/pretend.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/pretend.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
-use proc_macro2::{Span, TokenStream};
-use syn::Ident;
+use proc_macro2::TokenStream;
+use quote::format_ident;
 
-use internals::ast::{Container, Data, Field, Style};
+use internals::ast::{Container, Data, Field, Style, Variant};
 
 // Suppress dead_code warnings that would otherwise appear when using a remote
 // derive. Other than this pretend code, a struct annotated with remote derive
@@ -20,8 +20,8 @@
 //     8 | enum EnumDef { V }
 //       |                ^
 //
-pub fn pretend_used(cont: &Container) -> TokenStream {
-    let pretend_fields = pretend_fields_used(cont);
+pub fn pretend_used(cont: &Container, is_packed: bool) -> TokenStream {
+    let pretend_fields = pretend_fields_used(cont, is_packed);
     let pretend_variants = pretend_variants_used(cont);
 
     quote! {
@@ -32,51 +32,117 @@
 
 // For structs with named fields, expands to:
 //
+//     match None::<&T> {
+//         Some(T { a: __v0, b: __v1 }) => {}
+//         _ => {}
+//     }
+//
+// For packed structs on sufficiently new rustc, expands to:
+//
+//     match None::<&T> {
+//         Some(__v @ T { a: _, b: _ }) => {
+//             let _ = addr_of!(__v.a);
+//             let _ = addr_of!(__v.b);
+//         }
+//         _ => {}
+//     }
+//
+// For packed structs on older rustc, we assume Sized and !Drop, and expand to:
+//
 //     match None::<T> {
-//         Some(T { a: ref __v0, b: ref __v1 }) => {}
+//         Some(T { a: __v0, b: __v1 }) => {}
 //         _ => {}
 //     }
 //
 // For enums, expands to the following but only including struct variants:
 //
-//     match None::<T> {
-//         Some(T::A { a: ref __v0 }) => {}
-//         Some(T::B { b: ref __v0 }) => {}
+//     match None::<&T> {
+//         Some(T::A { a: __v0 }) => {}
+//         Some(T::B { b: __v0 }) => {}
 //         _ => {}
 //     }
 //
-// The `ref` is important in case the user has written a Drop impl on their
-// type. Rust does not allow destructuring a struct or enum that has a Drop
-// impl.
-fn pretend_fields_used(cont: &Container) -> TokenStream {
+fn pretend_fields_used(cont: &Container, is_packed: bool) -> TokenStream {
+    match &cont.data {
+        Data::Enum(variants) => pretend_fields_used_enum(cont, variants),
+        Data::Struct(Style::Struct, fields) => if is_packed {
+            pretend_fields_used_struct_packed(cont, fields)
+        } else {
+            pretend_fields_used_struct(cont, fields)
+        },
+        Data::Struct(_, _) => quote!(),
+    }
+}
+
+fn pretend_fields_used_struct(cont: &Container, fields: &[Field]) -> TokenStream {
     let type_ident = &cont.ident;
     let (_, ty_generics, _) = cont.generics.split_for_impl();
 
-    let patterns = match &cont.data {
-        Data::Enum(variants) => variants
-            .iter()
-            .filter_map(|variant| match variant.style {
-                Style::Struct => {
-                    let variant_ident = &variant.ident;
-                    let pat = struct_pattern(&variant.fields);
-                    Some(quote!(#type_ident::#variant_ident #pat))
+    let members = fields.iter().map(|field| &field.member);
+    let placeholders = (0usize..).map(|i| format_ident!("__v{}", i));
+
+    quote! {
+        match _serde::__private::None::<&#type_ident #ty_generics> {
+            _serde::__private::Some(#type_ident { #(#members: #placeholders),* }) => {}
+            _ => {}
+        }
+    }
+}
+
+fn pretend_fields_used_struct_packed(cont: &Container, fields: &[Field]) -> TokenStream {
+    let type_ident = &cont.ident;
+    let (_, ty_generics, _) = cont.generics.split_for_impl();
+
+    let members = fields.iter().map(|field| &field.member).collect::<Vec<_>>();
+
+    #[cfg(ptr_addr_of)]
+    {
+        quote! {
+            match _serde::__private::None::<&#type_ident #ty_generics> {
+                _serde::__private::Some(__v @ #type_ident { #(#members: _),* }) => {
+                    #(
+                        let _ = _serde::__private::ptr::addr_of!(__v.#members);
+                    )*
                 }
-                _ => None,
-            })
-            .collect::<Vec<_>>(),
-        Data::Struct(Style::Struct, fields) => {
-            let pat = struct_pattern(fields);
-            vec![quote!(#type_ident #pat)]
+                _ => {}
+            }
         }
-        Data::Struct(_, _) => {
-            return quote!();
+    }
+
+    #[cfg(not(ptr_addr_of))]
+    {
+        let placeholders = (0usize..).map(|i| format_ident!("__v{}", i));
+
+        quote! {
+            match _serde::__private::None::<#type_ident #ty_generics> {
+                _serde::__private::Some(#type_ident { #(#members: #placeholders),* }) => {}
+                _ => {}
+            }
         }
-    };
+    }
+}
+
+fn pretend_fields_used_enum(cont: &Container, variants: &[Variant]) -> TokenStream {
+    let type_ident = &cont.ident;
+    let (_, ty_generics, _) = cont.generics.split_for_impl();
+
+    let patterns = variants
+        .iter()
+        .filter_map(|variant| match variant.style {
+            Style::Struct => {
+                let variant_ident = &variant.ident;
+                let members = variant.fields.iter().map(|field| &field.member);
+                let placeholders = (0usize..).map(|i| format_ident!("__v{}", i));
+                Some(quote!(#type_ident::#variant_ident { #(#members: #placeholders),* }))
+            }
+            _ => None,
+        })
+        .collect::<Vec<_>>();
 
     quote! {
-        match _serde::export::None::<#type_ident #ty_generics> {
+        match _serde::__private::None::<&#type_ident #ty_generics> {
             #(
-                _serde::export::Some(#patterns) => {}
+                _serde::__private::Some(#patterns) => {}
             )*
             _ => {}
         }
@@ -107,7 +173,7 @@
     let cases = variants.iter().map(|variant| {
         let variant_ident = &variant.ident;
         let placeholders = &(0..variant.fields.len())
-            .map(|i| Ident::new(&format!("__v{}", i), Span::call_site()))
+            .map(|i| format_ident!("__v{}", i))
             .collect::<Vec<_>>();
 
         let pat = match variant.style {
@@ -120,8 +186,8 @@
         };
 
         quote! {
-            match _serde::export::None {
-                _serde::export::Some((#(#placeholders,)*)) => {
+            match _serde::__private::None {
+                _serde::__private::Some((#(#placeholders,)*)) => {
                     let _ = #type_ident::#variant_ident #turbofish #pat;
                 }
                 _ => {}
@@ -131,10 +197,3 @@
 
     quote!(#(#cases)*)
 }
-
-fn struct_pattern(fields: &[Field]) -> TokenStream {
-    let members = fields.iter().map(|field| &field.member);
-    let placeholders =
-        (0..fields.len()).map(|i| Ident::new(&format!("__v{}", i), Span::call_site()));
-    quote!({ #(#members: ref #placeholders),* })
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/ser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/ser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/ser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/ser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,10 +6,14 @@
 use dummy;
 use fragment::{Fragment, Match, Stmts};
 use internals::ast::{Container, Data, Field, Style, Variant};
-use internals::{attr, Ctxt, Derive};
+use internals::{attr, replace_receiver, Ctxt, Derive};
 use pretend;
 
-pub fn expand_derive_serialize(input: &syn::DeriveInput) -> Result<TokenStream, Vec<syn::Error>> {
+pub fn expand_derive_serialize(
+    input: &mut syn::DeriveInput,
+) -> Result<TokenStream, Vec<syn::Error>> {
+    replace_receiver(input);
+
     let ctxt = Ctxt::new();
     let cont = match Container::from_ast(&ctxt, input, Derive::Serialize) {
         Some(cont) => cont,
@@ -26,10 +30,10 @@
 
     let impl_block = if let Some(remote) = cont.attrs.remote() {
         let vis = &input.vis;
-        let used = pretend::pretend_used(&cont);
+        let used = pretend::pretend_used(&cont, params.is_packed);
         quote! {
             impl #impl_generics #ident #ty_generics #where_clause {
-                #vis fn serialize<__S>(__self: &#remote #ty_generics, __serializer: __S) -> #serde::export::Result<__S::Ok, __S::Error>
+                #vis fn serialize<__S>(__self: &#remote #ty_generics, __serializer: __S) -> #serde::__private::Result<__S::Ok, __S::Error>
                 where
                     __S: #serde::Serializer,
                 {
@@ -42,7 +46,7 @@
         quote! {
             #[automatically_derived]
             impl #impl_generics #serde::Serialize for #ident #ty_generics #where_clause {
-                fn serialize<__S>(&self, __serializer: __S) -> #serde::export::Result<__S::Ok, __S::Error>
+                fn serialize<__S>(&self, __serializer: __S) -> #serde::__private::Result<__S::Ok, __S::Error>
                 where
                     __S: #serde::Serializer,
                 {
@@ -211,7 +215,7 @@
     let self_var = &params.self_var;
     quote_block! {
         _serde::Serialize::serialize(
-            &_serde::export::Into::<#type_into>::into(_serde::export::Clone::clone(#self_var)),
+            &_serde::__private::Into::<#type_into>::into(_serde::__private::Clone::clone(#self_var)),
             __serializer)
     }
 }
@@ -372,7 +376,7 @@
     let let_mut = mut_if(serialized_fields.peek().is_some() || tag_field_exists);
 
     let len = if cattrs.has_flatten() {
-        quote!(_serde::export::None)
+        quote!(_serde::__private::None)
     } else {
         let len = serialized_fields
             .map(|field| match field.attrs.skip_serializing_if() {
@@ -386,7 +390,7 @@
                 quote!(#tag_field_exists as usize),
                 |sum, expr| quote!(#sum + #expr),
             );
-        quote!(_serde::export::Some(#len))
+        quote!(_serde::__private::Some(#len))
     };
 
     quote_block! {
@@ -433,7 +437,7 @@
             variant_ident
         );
         let skipped_err = quote! {
-            _serde::export::Err(_serde::ser::Error::custom(#skipped_msg))
+            _serde::__private::Err(_serde::ser::Error::custom(#skipped_msg))
         };
         let fields_pat = match variant.style {
             Style::Unit => quote!(),
@@ -578,7 +582,7 @@
     if let Some(path) = variant.attrs.serialize_with() {
         let ser = wrap_serialize_variant_with(params, path, variant);
         return quote_expr! {
-            _serde::private::ser::serialize_tagged_newtype(
+            _serde::__private::ser::serialize_tagged_newtype(
                 __serializer,
                 #enum_ident_str,
                 #variant_ident_str,
@@ -607,7 +611,7 @@
             }
 
             let span = field.original.span();
-            let func = quote_spanned!(span=> _serde::private::ser::serialize_tagged_newtype);
+            let func = quote_spanned!(span=> _serde::__private::ser::serialize_tagged_newtype);
             quote_expr! {
                 #func(
                     __serializer,
@@ -715,11 +719,11 @@
     quote_block! {
         struct __AdjacentlyTagged #wrapper_generics #where_clause {
             data: (#(&'__a #fields_ty,)*),
-            phantom: _serde::export::PhantomData<#this #ty_generics>,
+            phantom: _serde::__private::PhantomData<#this #ty_generics>,
         }
 
         impl #wrapper_impl_generics _serde::Serialize for __AdjacentlyTagged #wrapper_ty_generics #where_clause {
-            fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error>
+            fn serialize<__S>(&self, __serializer: __S) -> _serde::__private::Result<__S::Ok, __S::Error>
             where
                 __S: _serde::Serializer,
             {
@@ -737,7 +741,7 @@
         try!(_serde::ser::SerializeStruct::serialize_field(
             &mut __struct, #content, &__AdjacentlyTagged {
                 data: (#(#fields_ident,)*),
-                phantom: _serde::export::PhantomData::<#this #ty_generics>,
+                phantom: _serde::__private::PhantomData::<#this #ty_generics>,
             }));
         _serde::ser::SerializeStruct::end(__struct)
     }
@@ -978,18 +982,18 @@
             quote_block! {
                 struct __EnumFlatten #wrapper_generics #where_clause {
                     data: (#(&'__a #fields_ty,)*),
-                    phantom: _serde::export::PhantomData<#this #ty_generics>,
+                    phantom: _serde::__private::PhantomData<#this #ty_generics>,
                 }
 
                 impl #wrapper_impl_generics _serde::Serialize for __EnumFlatten #wrapper_ty_generics #where_clause {
-                    fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error>
+                    fn serialize<__S>(&self, __serializer: __S) -> _serde::__private::Result<__S::Ok, __S::Error>
                     where
                         __S: _serde::Serializer,
                     {
                         let (#(#members,)*) = self.data;
                         let #let_mut __serde_state = try!(_serde::Serializer::serialize_map(
                             __serializer,
-                            _serde::export::None));
+                            _serde::__private::None));
                         #(#serialize_fields)*
                         _serde::ser::SerializeMap::end(__serde_state)
                     }
@@ -1002,7 +1006,7 @@
                     #variant_name,
                     &__EnumFlatten {
                         data: (#(#members,)*),
-                        phantom: _serde::export::PhantomData::<#this #ty_generics>,
+                        phantom: _serde::__private::PhantomData::<#this #ty_generics>,
                     })
             }
         }
@@ -1010,7 +1014,7 @@
             quote_block! {
                 let #let_mut __serde_state = try!(_serde::Serializer::serialize_map(
                     __serializer,
-                    _serde::export::None));
+                    _serde::__private::None));
                 try!(_serde::ser::SerializeMap::serialize_entry(
                     &mut __serde_state,
                     #tag,
@@ -1024,7 +1028,7 @@
             quote_block! {
                 let #let_mut __serde_state = try!(_serde::Serializer::serialize_map(
                     __serializer,
-                    _serde::export::None));
+                    _serde::__private::None));
                 #(#serialize_fields)*
                 _serde::ser::SerializeMap::end(__serde_state)
             }
@@ -1095,7 +1099,7 @@
             let mut field_expr = if is_enum {
                 quote!(#member)
             } else {
-                get_member(params, field, &member)
+                get_member(params, field, member)
             };
 
             let key_expr = field.attrs.name().serialize_name();
@@ -1113,7 +1117,7 @@
             let ser = if field.attrs.flatten() {
                 let func = quote_spanned!(span=> _serde::Serialize::serialize);
                 quote! {
-                    try!(#func(&#field_expr, _serde::private::ser::FlatMapSerializer(&mut __serde_state)));
+                    try!(#func(&#field_expr, _serde::__private::ser::FlatMapSerializer(&mut __serde_state)));
                 }
             } else {
                 let func = struct_trait.serialize_field(span);
@@ -1208,11 +1212,11 @@
     quote!({
         struct __SerializeWith #wrapper_impl_generics #where_clause {
             values: (#(&'__a #field_tys, )*),
-            phantom: _serde::export::PhantomData<#this #ty_generics>,
+            phantom: _serde::__private::PhantomData<#this #ty_generics>,
         }
 
         impl #wrapper_impl_generics _serde::Serialize for __SerializeWith #wrapper_ty_generics #where_clause {
-            fn serialize<__S>(&self, __s: __S) -> _serde::export::Result<__S::Ok, __S::Error>
+            fn serialize<__S>(&self, __s: __S) -> _serde::__private::Result<__S::Ok, __S::Error>
             where
                 __S: _serde::Serializer,
             {
@@ -1222,7 +1226,7 @@
 
         &__SerializeWith {
             values: (#(#field_exprs, )*),
-            phantom: _serde::export::PhantomData::<#this #ty_generics>,
+            phantom: _serde::__private::PhantomData::<#this #ty_generics>,
         }
     })
 }
@@ -1258,11 +1262,11 @@
                 quote!(&#self_var.#member)
             };
             let ty = field.ty;
-            quote!(_serde::private::ser::constrain::<#ty>(#inner))
+            quote!(_serde::__private::ser::constrain::<#ty>(#inner))
         }
         (true, Some(getter)) => {
             let ty = field.ty;
-            quote!(_serde::private::ser::constrain::<#ty>(&#getter(#self_var)))
+            quote!(_serde::__private::ser::constrain::<#ty>(&#getter(#self_var)))
         }
         (false, Some(_)) => {
             unreachable!("getter is only allowed for remote impls");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/try.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/try.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_derive/src/try.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_derive/src/try.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,9 +13,9 @@
         macro_rules! try {
             (#dollar __expr:expr) => {
                 match #dollar __expr {
-                    _serde::export::Ok(__val) => __val,
-                    _serde::export::Err(__err) => {
-                        return _serde::export::Err(__err);
+                    _serde::__private::Ok(__val) => __val,
+                    _serde::__private::Err(__err) => {
+                        return _serde::__private::Err(__err);
                     }
                 }
             }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"515fa57feeb3c3d71887a90bf850b0303ac2052fd095efa185a9d57eabb17eb6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"77e79209b7538caa7210ab8339cae6add51381b6495d01f096d0eefa69d559d5","build.rs":"daedcb68b22aa393d96aa2276e8b84e86c2353a2a3594040e66ed2ff08b2b0d4","src/de.rs":"ce54eef7261e2e8754a3c63bdd206ce982d83bcac8ef91c27b4c4adc501f8fc6","src/error.rs":"33bc78ddf5d792923f36398bfb095dea649b4e082742ad5a86c55580ed132895","src/features_check/error.rs":"d7359f864afbfe105a38abea9f563dc423036ebc4c956a5695a4beef144dc7ec","src/features_check/mod.rs":"2209f8d5c46b50c8a3b8dc22338dcaf0135d192e8b05d2f456cbe6a73104e958","src/io/core.rs":"ebe5bd5d74892fdfb630073a7961beaab18dfa155d6c551d18c2bb0e52947f99","src/io/mod.rs":"fd1ed5080495cab21117f6f7d3c2c9e3687cad0c69a0cd087b08a145a9e672da","src/iter.rs":"d9a6297dcf8cfa8add82d0250bde50ab1b8998c351800d26ec5e6e5b654cc560","src/lexical/algorithm.rs":"e35fb1d0c99cc706b0e3bd6d9fb4db25ecd5743fdba62aa45980637d12420704","src/lexical/bhcomp.rs":"56a36b0c06b962b0c620739fd5201e6ab529ef872582f297ed5ce845db8f1721","src/lexical/bignum.rs":"5fbab729044cbd9b0b63d8e2443a31f958828abfbe03a365a454856dfcf64750","src/lexical/cached.rs":"0e127398691f8042c19cde209e7f4b0161f0f3150342430145929f711e6fdac8","src/lexical/cached_float80.rs":"0f8f74a22cb7d871322a9893bffd0255ca10bf9dffd13afb2462dd3d7f51805f","src/lexical/digit.rs":"a265b9072194a62a67dfc4df3c86d4213097cf3f82280d025e0012a5a262fd9d","src/lexical/errors.rs":"6bc993febceb7dd96ac1c8c5c53b5f5a30297016c0f813ed8ff8d7938d01534d","src/lexical/exponent.rs":"387e945b97dc7ba48a7091c50d228a0dde3a1c4145703d4ab9c31191a91693b0","src/lexical/float.rs":"f3e6bd9abd88d50d82803fa550f8307112c25cccc0259218a382b7c8a1e899f5","src/lexical/large_powers.rs":"34537f5c701afce1ec2a1fd3c14950381b2e27c9ad74f002c91f3708e8da9ca5","src/lexical/large_powers32.rs":"d533037c6141e6671102aee490c9cdeaba81e667ddca781b2b99db2c455e4a1a","src/lexical/large_powers64.rs":"745dd7c0cbe499eec027ef586248881011d9df20c7efab7929c1807b59886ba1","src/lexical/math.rs":"78beaf6d38105b92b8252731d2b0bb8643e974a5b024ec29d649441d1b064863","src/lexical/mod.rs":"4b4c5228779c0f135a4cb018700e3bcd495da48b74421a86f6b8b304acdef924","src/lexical/num.rs":"cfc84a6769586aefec9949284e0e4c22e4480172ba7ccef6b9adeb76fc9cc825","src/lexical/parse.rs":"c2bfac4c70a19938ced61e991f4ec606764887cf12bac1a0978b5b5318a56aac","src/lexical/rounding.rs":"309e9d2cfd9f5253ae767e8cca292aee274bb57898beaf1b6b247674c064d321","src/lexical/shift.rs":"d932e88d13fab783ede722295cb958bf974b4606ea925445cad81d32fdcee900","src/lexical/small_powers.rs":"4608dd218b8002435db7e1ec79d2d0fef5f47ae257b93353326d52ecc80cccda","src/lib.rs":"5eb3f5db0d7c656ebcceb6ddd2ec4aeac238e0c1cf76d67da7cd61c90c47f3ba","src/macros.rs":"c9f23156faec8d5216d72b6a97eebd768efb3f75870a6e2beed824308587b998","src/map.rs":"68364902639d1549f98212839abad54e385bf0764d263b796bebf31c8d8f6f2a","src/number.rs":"722536634c94e165722a40615c941de6998b644343e23432c851bef3785f4109","src/raw.rs":"8a0d29cd885510461fddff0a8d52de117c98e89f77d7cc5167ff062d2f46e6ab","src/read.rs":"842de0abf4a2b01bdd0cf87e259738e0d579d0223a13b6185c170d92ceb475d4","src/ser.rs":"a0e5a9f443cb07be1c2ec9045673c14ee126af2eeff35ab8631ceb64c01074eb","src/value/de.rs":"b0bbc3bdd9dc9c034912a3dce49ad37cb77d5f90a34adffd89d7352f90fb3b1e","src/value/from.rs":"7a8cca6403351021f517fa539215945545e1ddbb5d0d711be871a42f27933b94","src/value/index.rs":"3486361b3b94ebb9cb04cde5da7bc52e37c1cbb8b6258872441d77b42db526b3","src/value/mod.rs":"5fb7a62a4409348c757cb24245420c7f5707aed933a10e19f154986b2808720c","src/value/partial_eq.rs":"4caacbab433a29f51bfbb3ad5c93f6b08da254e8ed174e491b3ebc509747d72a","src/value/ser.rs":"def8b03dd30c61a524cd9ccab6d6d2d5d4d7b615666206efc9600e2b30272854"},"package":"1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"}
\ No newline at end of file
+{"files":{"Cargo.toml":"52941dd04d572ed9709c80b8ae97ef54483280c516443218f4da743a7e667ffe","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"4b3cc9514970c36469bd7ffcf30dcaa86b876f3c9e4720142d2414cb042e976e","build.rs":"daedcb68b22aa393d96aa2276e8b84e86c2353a2a3594040e66ed2ff08b2b0d4","src/de.rs":"950dc1331b4c5c13f13d7e1327f2330f1f2a2c19fa93be62197ada0be3a6d8ad","src/error.rs":"794a2953df09ffae60ee1d14a3c868f3838e40cbd08ba147fc27f5fd4aec40ea","src/features_check/error.rs":"d7359f864afbfe105a38abea9f563dc423036ebc4c956a5695a4beef144dc7ec","src/features_check/mod.rs":"2209f8d5c46b50c8a3b8dc22338dcaf0135d192e8b05d2f456cbe6a73104e958","src/io/core.rs":"ebe5bd5d74892fdfb630073a7961beaab18dfa155d6c551d18c2bb0e52947f99","src/io/mod.rs":"fd1ed5080495cab21117f6f7d3c2c9e3687cad0c69a0cd087b08a145a9e672da","src/iter.rs":"f832c469cd7999d26ba9b76baa69b257a212a7edb3dfdf9b1d1bb35e8da85fa9","src/lexical/algorithm.rs":"e35fb1d0c99cc706b0e3bd6d9fb4db25ecd5743fdba62aa45980637d12420704","src/lexical/bhcomp.rs":"56a36b0c06b962b0c620739fd5201e6ab529ef872582f297ed5ce845db8f1721","src/lexical/bignum.rs":"5fbab729044cbd9b0b63d8e2443a31f958828abfbe03a365a454856dfcf64750","src/lexical/cached.rs":"0e127398691f8042c19cde209e7f4b0161f0f3150342430145929f711e6fdac8","src/lexical/cached_float80.rs":"0f8f74a22cb7d871322a9893bffd0255ca10bf9dffd13afb2462dd3d7f51805f","src/lexical/digit.rs":"a265b9072194a62a67dfc4df3c86d4213097cf3f82280d025e0012a5a262fd9d","src/lexical/errors.rs":"6bc993febceb7dd96ac1c8c5c53b5f5a30297016c0f813ed8ff8d7938d01534d","src/lexical/exponent.rs":"387e945b97dc7ba48a7091c50d228a0dde3a1c4145703d4ab9c31191a91693b0","src/lexical/float.rs":"f3e6bd9abd88d50d82803fa550f8307112c25cccc0259218a382b7c8a1e899f5","src/lexical/large_powers.rs":"34537f5c701afce1ec2a1fd3c14950381b2e27c9ad74f002c91f3708e8da9ca5","src/lexical/large_powers32.rs":"d533037c6141e6671102aee490c9cdeaba81e667ddca781b2b99db2c455e4a1a","src/lexical/large_powers64.rs":"745dd7c0cbe499eec027ef586248881011d9df20c7efab7929c1807b59886ba1","src/lexical/math.rs":"78beaf6d38105b92b8252731d2b0bb8643e974a5b024ec29d649441d1b064863","src/lexical/mod.rs":"4b4c5228779c0f135a4cb018700e3bcd495da48b74421a86f6b8b304acdef924","src/lexical/num.rs":"cfc84a6769586aefec9949284e0e4c22e4480172ba7ccef6b9adeb76fc9cc825","src/lexical/parse.rs":"c2bfac4c70a19938ced61e991f4ec606764887cf12bac1a0978b5b5318a56aac","src/lexical/rounding.rs":"309e9d2cfd9f5253ae767e8cca292aee274bb57898beaf1b6b247674c064d321","src/lexical/shift.rs":"d932e88d13fab783ede722295cb958bf974b4606ea925445cad81d32fdcee900","src/lexical/small_powers.rs":"4608dd218b8002435db7e1ec79d2d0fef5f47ae257b93353326d52ecc80cccda","src/lib.rs":"dfe64b00c002eb4993cf0a32e0d7792d5be1ce80fbe898512056f3a5f0699d09","src/macros.rs":"c9f23156faec8d5216d72b6a97eebd768efb3f75870a6e2beed824308587b998","src/map.rs":"33489e341b1bace2a7cf4b580ec1ccfd6251b6cb7ab00de4cf76634c9c47de82","src/number.rs":"722536634c94e165722a40615c941de6998b644343e23432c851bef3785f4109","src/raw.rs":"134dddc1cb97f1ddb79b5c8b9ac14a1f2f02db49daa583e5f4df91b542b24b73","src/read.rs":"b754797f6388cf484c6c5093ac97f85d619da44e5bbfd741404d35a0024e8022","src/ser.rs":"9cbe44a2ba6415d6828f827dc49fabe15586eca4d8bdc6660bed71e0610f2aab","src/value/de.rs":"03a428932701c043c0884c7b32de93e11bf028d80b312685531f7b1739684754","src/value/from.rs":"a7e2a4363c539f9d64c44d26fc705bc8e1003cad1876f3a64c7eb1d537df2b2c","src/value/index.rs":"3486361b3b94ebb9cb04cde5da7bc52e37c1cbb8b6258872441d77b42db526b3","src/value/mod.rs":"62c8f387db68de2c134a085b9379fdc89f8505abad7c95bbf6c282ddcfe410b6","src/value/partial_eq.rs":"4caacbab433a29f51bfbb3ad5c93f6b08da254e8ed174e491b3ebc509747d72a","src/value/ser.rs":"def8b03dd30c61a524cd9ccab6d6d2d5d4d7b615666206efc9600e2b30272854"},"package":"a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "serde_json"
-version = "1.0.60"
+version = "1.0.67"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 include = ["build.rs", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 description = "A JSON serialization file format"
@@ -25,6 +24,7 @@
 repository = "https://github.com/serde-rs/json"
 [package.metadata.docs.rs]
 features = ["raw_value", "unbounded_depth"]
+rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [package.metadata.playground]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -81,9 +81,11 @@
 [`from_reader`][from_reader] for parsing from any `io::Read` like a File or
 a TCP stream.
 
+<div align="right">
 <a href="https://play.rust-lang.org/?edition=2018&gist=d69d8e3156d4bb81c4461b60b772ab72" target="_blank">
-<img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
+<img align="center" width="85" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/runtab.png">
 </a>
+</div>
 
 ```rust
 use serde_json::{Result, Value};
@@ -139,9 +141,11 @@
 Serde provides a powerful way of mapping JSON data into Rust data structures
 largely automatically.
 
+<div align="right">
 <a href="https://play.rust-lang.org/?edition=2018&gist=15cfab66d38ff8a15a9cf1d8d897ac68" target="_blank">
-<img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
+<img align="center" width="85" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/runtab.png">
 </a>
+</div>
 
 ```rust
 use serde::{Deserialize, Serialize};
@@ -206,9 +210,11 @@
 Serde JSON provides a [`json!` macro][macro] to build `serde_json::Value`
 objects with very natural JSON syntax.
 
+<div align="right">
 <a href="https://play.rust-lang.org/?edition=2018&gist=6ccafad431d72b62e77cc34c8e879b24" target="_blank">
-<img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
+<img align="center" width="85" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/runtab.png">
 </a>
+</div>
 
 ```rust
 use serde_json::json;
@@ -239,9 +245,11 @@
 will check at compile time that the value you are interpolating is able to
 be represented as JSON.
 
+<div align="right">
 <a href="https://play.rust-lang.org/?edition=2018&gist=f9101a6e61dfc9e02c6a67f315ed24f2" target="_blank">
-<img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
+<img align="center" width="85" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/runtab.png">
 </a>
+</div>
 
 ```rust
 let full_name = "John Doe";
@@ -270,9 +278,11 @@
 [`serde_json::to_writer`][to_writer] which serializes to any `io::Write`
 such as a File or a TCP stream.
 
+<div align="right">
 <a href="https://play.rust-lang.org/?edition=2018&gist=3472242a08ed2ff88a944f2a2283b0ee" target="_blank">
-<img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
+<img align="center" width="85" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/runtab.png">
 </a>
+</div>
 
 ```rust
 use serde::{Deserialize, Serialize};
@@ -350,7 +360,7 @@
 For JSON support in Serde without a memory allocator, please see the
 [`serde-json-core`] crate.
 
-[`serde-json-core`]: https://japaric.github.io/serde-json-core/serde_json_core/
+[`serde-json-core`]: https://github.com/rust-embedded-community/serde-json-core
 
 [value]: https://docs.serde.rs/serde_json/value/enum.Value.html
 [from_str]: https://docs.serde.rs/serde_json/de/fn.from_str.html
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/de.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/de.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/de.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/de.rs	2021-12-09 12:01:26.000000000 +0000
@@ -41,7 +41,7 @@
     /// Typically it is more convenient to use one of these methods instead:
     ///
     ///   - Deserializer::from_str
-    ///   - Deserializer::from_bytes
+    ///   - Deserializer::from_slice
     ///   - Deserializer::from_reader
     pub fn new(read: R) -> Self {
         Deserializer {
@@ -196,6 +196,7 @@
     /// }
     /// ```
     #[cfg(feature = "unbounded_depth")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "unbounded_depth")))]
     pub fn disable_recursion_limit(&mut self) {
         self.disable_recursion_limit = true;
     }
@@ -898,7 +899,7 @@
     fn scan_number(&mut self, buf: &mut String) -> Result<()> {
         match tri!(self.peek_or_null()) {
             b'.' => self.scan_decimal(buf),
-            b'e' | b'E' => self.scan_exponent(buf),
+            e @ b'e' | e @ b'E' => self.scan_exponent(e as char, buf),
             _ => Ok(()),
         }
     }
@@ -923,19 +924,20 @@
         }
 
         match tri!(self.peek_or_null()) {
-            b'e' | b'E' => self.scan_exponent(buf),
+            e @ b'e' | e @ b'E' => self.scan_exponent(e as char, buf),
             _ => Ok(()),
         }
     }
 
     #[cfg(feature = "arbitrary_precision")]
-    fn scan_exponent(&mut self, buf: &mut String) -> Result<()> {
+    fn scan_exponent(&mut self, e: char, buf: &mut String) -> Result<()> {
         self.eat_char();
-        buf.push('e');
+        buf.push(e);
 
         match tri!(self.peek_or_null()) {
             b'+' => {
                 self.eat_char();
+                buf.push('+');
             }
             b'-' => {
                 self.eat_char();
@@ -2250,7 +2252,7 @@
     /// Typically it is more convenient to use one of these methods instead:
     ///
     ///   - Deserializer::from_str(...).into_iter()
-    ///   - Deserializer::from_bytes(...).into_iter()
+    ///   - Deserializer::from_slice(...).into_iter()
     ///   - Deserializer::from_reader(...).into_iter()
     pub fn new(read: R) -> Self {
         let offset = read.byte_offset();
@@ -2432,7 +2434,7 @@
 ///     location: String,
 /// }
 ///
-/// fn read_user_from_file<P: AsRef<Path>>(path: P) -> Result<User, Box<Error>> {
+/// fn read_user_from_file<P: AsRef<Path>>(path: P) -> Result<User, Box<dyn Error>> {
 ///     // Open the file in read-only mode with buffer.
 ///     let file = File::open(path)?;
 ///     let reader = BufReader::new(file);
@@ -2494,6 +2496,7 @@
 /// the JSON map or some number is too big to fit in the expected primitive
 /// type.
 #[cfg(feature = "std")]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 pub fn from_reader<R, T>(rdr: R) -> Result<T>
 where
     R: crate::io::Read,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -234,7 +234,7 @@
     /// JSON has non-whitespace trailing characters after the value.
     TrailingCharacters,
 
-    /// Unexpected end of hex excape.
+    /// Unexpected end of hex escape.
     UnexpectedEndOfHexEscape,
 
     /// Encountered nesting of JSON maps and arrays more than 128 layers deep.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/iter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
     /// The column is 0 immediately after a newline character has been read.
     col: usize,
 
-    /// Byte offset of the start of the current line. This is the sum of lenghts
+    /// Byte offset of the start of the current line. This is the sum of lengths
     /// of all previous lines. Keeping track of things this way allows efficient
     /// computation of the current line, column, and byte offset while only
     /// updating one of the counters in `next()` in the common case.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -298,9 +298,9 @@
 //! [to_vec]: https://docs.serde.rs/serde_json/ser/fn.to_vec.html
 //! [to_writer]: https://docs.serde.rs/serde_json/ser/fn.to_writer.html
 //! [macro]: https://docs.serde.rs/serde_json/macro.json.html
-//! [`serde-json-core`]: https://japaric.github.io/serde-json-core/serde_json_core/
+//! [`serde-json-core`]: https://github.com/rust-embedded-community/serde-json-core
 
-#![doc(html_root_url = "https://docs.rs/serde_json/1.0.60")]
+#![doc(html_root_url = "https://docs.rs/serde_json/1.0.67")]
 #![deny(clippy::all, clippy::pedantic)]
 // Ignored clippy lints
 #![allow(
@@ -339,6 +339,7 @@
     // things are often more readable this way
     clippy::cast_lossless,
     clippy::module_name_repetitions,
+    clippy::redundant_else,
     clippy::shadow_unrelated,
     clippy::single_match_else,
     clippy::too_many_lines,
@@ -356,6 +357,7 @@
 #![allow(non_upper_case_globals)]
 #![deny(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -452,6 +454,7 @@
 pub mod error;
 pub mod map;
 #[cfg(feature = "std")]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 pub mod ser;
 #[cfg(not(feature = "std"))]
 mod ser;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/map.rs	2021-12-09 12:01:26.000000000 +0000
@@ -52,7 +52,7 @@
     /// Clears the map, removing all values.
     #[inline]
     pub fn clear(&mut self) {
-        self.map.clear()
+        self.map.clear();
     }
 
     /// Returns a reference to the value corresponding to the key.
@@ -542,6 +542,40 @@
             Entry::Occupied(entry) => entry.into_mut(),
         }
     }
+
+    /// Provides in-place mutable access to an occupied entry before any
+    /// potential inserts into the map.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use serde_json::json;
+    /// #
+    /// let mut map = serde_json::Map::new();
+    /// map.entry("serde")
+    ///     .and_modify(|e| *e = json!("rust"))
+    ///     .or_insert(json!("cpp"));
+    ///
+    /// assert_eq!(map["serde"], "cpp");
+    ///
+    /// map.entry("serde")
+    ///     .and_modify(|e| *e = json!("rust"))
+    ///     .or_insert(json!("cpp"));
+    ///
+    /// assert_eq!(map["serde"], "rust");
+    /// ```
+    pub fn and_modify<F>(self, f: F) -> Self
+    where
+        F: FnOnce(&mut Value),
+    {
+        match self {
+            Entry::Occupied(mut entry) => {
+                f(entry.get_mut());
+                Entry::Occupied(entry)
+            }
+            Entry::Vacant(entry) => Entry::Vacant(entry),
+        }
+    }
 }
 
 impl<'a> VacantEntry<'a> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/raw.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/raw.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/raw.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/raw.rs	2021-12-09 12:01:26.000000000 +0000
@@ -109,6 +109,7 @@
 /// }
 /// ```
 #[repr(C)]
+#[cfg_attr(docsrs, doc(cfg(feature = "raw_value")))]
 pub struct RawValue {
     json: str,
 }
@@ -267,6 +268,7 @@
 ///
 /// println!("{}", serde_json::value::to_raw_value(&map).unwrap_err());
 /// ```
+#[cfg_attr(docsrs, doc(cfg(feature = "raw_value")))]
 pub fn to_raw_value<T>(value: &T) -> Result<Box<RawValue>, Error>
 where
     T: Serialize,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -140,6 +140,7 @@
 
 /// JSON input source that reads from a std::io input stream.
 #[cfg(feature = "std")]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 pub struct IoRead<R>
 where
     R: io::Read,
@@ -377,7 +378,10 @@
         V: Visitor<'de>,
     {
         let raw = self.raw_buffer.take().unwrap();
-        let raw = String::from_utf8(raw).unwrap();
+        let raw = match String::from_utf8(raw) {
+            Ok(raw) => raw,
+            Err(_) => return error(self, ErrorCode::InvalidUnicodeCodePoint),
+        };
         visitor.visit_map(OwnedRawDeserializer {
             raw_value: Some(raw),
         })
@@ -587,7 +591,10 @@
         V: Visitor<'a>,
     {
         let raw = &self.slice[self.raw_buffering_start_index..self.index];
-        let raw = str::from_utf8(raw).unwrap();
+        let raw = match str::from_utf8(raw) {
+            Ok(raw) => raw,
+            Err(_) => return error(self, ErrorCode::InvalidUnicodeCodePoint),
+        };
         visitor.visit_map(BorrowedRawDeserializer {
             raw_value: Some(raw),
         })
@@ -710,7 +717,7 @@
     }
 
     fn discard(&mut self) {
-        R::discard(self)
+        R::discard(self);
     }
 
     fn position(&self) -> Position {
@@ -760,7 +767,7 @@
     const should_early_return_if_failed: bool = R::should_early_return_if_failed;
 
     fn set_failed(&mut self, failed: &mut bool) {
-        R::set_failed(self, failed)
+        R::set_failed(self, failed);
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/ser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/ser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/ser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/ser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,6 +8,7 @@
 use serde::serde_if_integer128;
 
 /// A structure for serializing Rust values into JSON.
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 pub struct Serializer<W, F = CompactFormatter> {
     writer: W,
     formatter: F,
@@ -316,13 +317,13 @@
 
     #[inline]
     fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq> {
+        tri!(self
+            .formatter
+            .begin_array(&mut self.writer)
+            .map_err(Error::io));
         if len == Some(0) {
             tri!(self
                 .formatter
-                .begin_array(&mut self.writer)
-                .map_err(Error::io));
-            tri!(self
-                .formatter
                 .end_array(&mut self.writer)
                 .map_err(Error::io));
             Ok(Compound::Map {
@@ -330,10 +331,6 @@
                 state: State::Empty,
             })
         } else {
-            tri!(self
-                .formatter
-                .begin_array(&mut self.writer)
-                .map_err(Error::io));
             Ok(Compound::Map {
                 ser: self,
                 state: State::First,
@@ -385,13 +382,13 @@
 
     #[inline]
     fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap> {
+        tri!(self
+            .formatter
+            .begin_object(&mut self.writer)
+            .map_err(Error::io));
         if len == Some(0) {
             tri!(self
                 .formatter
-                .begin_object(&mut self.writer)
-                .map_err(Error::io));
-            tri!(self
-                .formatter
                 .end_object(&mut self.writer)
                 .map_err(Error::io));
             Ok(Compound::Map {
@@ -399,10 +396,6 @@
                 state: State::Empty,
             })
         } else {
-            tri!(self
-                .formatter
-                .begin_object(&mut self.writer)
-                .map_err(Error::io));
             Ok(Compound::Map {
                 ser: self,
                 state: State::First,
@@ -2149,6 +2142,7 @@
 /// Serialization can fail if `T`'s implementation of `Serialize` decides to
 /// fail, or if `T` contains a map with non-string keys.
 #[inline]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 pub fn to_writer<W, T>(writer: W, value: &T) -> Result<()>
 where
     W: io::Write,
@@ -2167,6 +2161,7 @@
 /// Serialization can fail if `T`'s implementation of `Serialize` decides to
 /// fail, or if `T` contains a map with non-string keys.
 #[inline]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 pub fn to_writer_pretty<W, T>(writer: W, value: &T) -> Result<()>
 where
     W: io::Write,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/value/de.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/value/de.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/value/de.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/value/de.rs	2021-12-09 12:01:26.000000000 +0000
@@ -512,7 +512,11 @@
     {
         match self.value {
             Some(Value::Array(v)) => {
-                serde::Deserializer::deserialize_any(SeqDeserializer::new(v), visitor)
+                if v.is_empty() {
+                    visitor.visit_unit()
+                } else {
+                    visit_array(v, visitor)
+                }
             }
             Some(other) => Err(serde::de::Error::invalid_type(
                 other.unexpected(),
@@ -534,9 +538,7 @@
         V: Visitor<'de>,
     {
         match self.value {
-            Some(Value::Object(v)) => {
-                serde::Deserializer::deserialize_any(MapDeserializer::new(v), visitor)
-            }
+            Some(Value::Object(v)) => visit_object(v, visitor),
             Some(other) => Err(serde::de::Error::invalid_type(
                 other.unexpected(),
                 &"struct variant",
@@ -561,38 +563,6 @@
     }
 }
 
-impl<'de> serde::Deserializer<'de> for SeqDeserializer {
-    type Error = Error;
-
-    #[inline]
-    fn deserialize_any<V>(mut self, visitor: V) -> Result<V::Value, Error>
-    where
-        V: Visitor<'de>,
-    {
-        let len = self.iter.len();
-        if len == 0 {
-            visitor.visit_unit()
-        } else {
-            let ret = tri!(visitor.visit_seq(&mut self));
-            let remaining = self.iter.len();
-            if remaining == 0 {
-                Ok(ret)
-            } else {
-                Err(serde::de::Error::invalid_length(
-                    len,
-                    &"fewer elements in array",
-                ))
-            }
-        }
-    }
-
-    forward_to_deserialize_any! {
-        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
-        bytes byte_buf option unit unit_struct newtype_struct seq tuple
-        tuple_struct map struct enum identifier ignored_any
-    }
-}
-
 impl<'de> SeqAccess<'de> for SeqDeserializer {
     type Error = Error;
 
@@ -665,24 +635,6 @@
     }
 }
 
-impl<'de> serde::Deserializer<'de> for MapDeserializer {
-    type Error = Error;
-
-    #[inline]
-    fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Error>
-    where
-        V: Visitor<'de>,
-    {
-        visitor.visit_map(self)
-    }
-
-    forward_to_deserialize_any! {
-        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
-        bytes byte_buf option unit unit_struct newtype_struct seq tuple
-        tuple_struct map struct enum identifier ignored_any
-    }
-}
-
 macro_rules! deserialize_value_ref_number {
     ($method:ident) => {
         #[cfg(not(feature = "arbitrary_precision"))]
@@ -1043,7 +995,11 @@
     {
         match self.value {
             Some(&Value::Array(ref v)) => {
-                serde::Deserializer::deserialize_any(SeqRefDeserializer::new(v), visitor)
+                if v.is_empty() {
+                    visitor.visit_unit()
+                } else {
+                    visit_array_ref(v, visitor)
+                }
             }
             Some(other) => Err(serde::de::Error::invalid_type(
                 other.unexpected(),
@@ -1065,9 +1021,7 @@
         V: Visitor<'de>,
     {
         match self.value {
-            Some(&Value::Object(ref v)) => {
-                serde::Deserializer::deserialize_any(MapRefDeserializer::new(v), visitor)
-            }
+            Some(&Value::Object(ref v)) => visit_object_ref(v, visitor),
             Some(other) => Err(serde::de::Error::invalid_type(
                 other.unexpected(),
                 &"struct variant",
@@ -1090,38 +1044,6 @@
     }
 }
 
-impl<'de> serde::Deserializer<'de> for SeqRefDeserializer<'de> {
-    type Error = Error;
-
-    #[inline]
-    fn deserialize_any<V>(mut self, visitor: V) -> Result<V::Value, Error>
-    where
-        V: Visitor<'de>,
-    {
-        let len = self.iter.len();
-        if len == 0 {
-            visitor.visit_unit()
-        } else {
-            let ret = tri!(visitor.visit_seq(&mut self));
-            let remaining = self.iter.len();
-            if remaining == 0 {
-                Ok(ret)
-            } else {
-                Err(serde::de::Error::invalid_length(
-                    len,
-                    &"fewer elements in array",
-                ))
-            }
-        }
-    }
-
-    forward_to_deserialize_any! {
-        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
-        bytes byte_buf option unit unit_struct newtype_struct seq tuple
-        tuple_struct map struct enum identifier ignored_any
-    }
-}
-
 impl<'de> SeqAccess<'de> for SeqRefDeserializer<'de> {
     type Error = Error;
 
@@ -1194,24 +1116,6 @@
     }
 }
 
-impl<'de> serde::Deserializer<'de> for MapRefDeserializer<'de> {
-    type Error = Error;
-
-    #[inline]
-    fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Error>
-    where
-        V: Visitor<'de>,
-    {
-        visitor.visit_map(self)
-    }
-
-    forward_to_deserialize_any! {
-        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
-        bytes byte_buf option unit unit_struct newtype_struct seq tuple
-        tuple_struct map struct enum identifier ignored_any
-    }
-}
-
 struct MapKeyDeserializer<'de> {
     key: Cow<'de, str>,
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/value/from.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/value/from.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/value/from.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/value/from.rs	2021-12-09 12:01:26.000000000 +0000
@@ -136,6 +136,22 @@
     }
 }
 
+impl From<Number> for Value {
+    /// Convert `Number` to `Value`
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use serde_json::{Number, Value};
+    ///
+    /// let n = Number::from(7);
+    /// let x: Value = n.into();
+    /// ```
+    fn from(f: Number) -> Self {
+        Value::Number(f)
+    }
+}
+
 impl From<Map<String, Value>> for Value {
     /// Convert map (with string keys) to `Value`
     ///
@@ -227,7 +243,11 @@
     /// let x: Value = v.into_iter().collect();
     /// ```
     fn from_iter<I: IntoIterator<Item = (K, V)>>(iter: I) -> Self {
-        Value::Object(iter.into_iter().map(|(k, v)| (k.into(), v.into())).collect())
+        Value::Object(
+            iter.into_iter()
+                .map(|(k, v)| (k.into(), v.into()))
+                .collect(),
+        )
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/value/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/value/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/serde_json/src/value/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/serde_json/src/value/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -106,7 +106,7 @@
 
 /// Represents any valid JSON value.
 ///
-/// See the `serde_json::value` module documentation for usage examples.
+/// See the [`serde_json::value` module documentation](self) for usage examples.
 #[derive(Clone, Eq, PartialEq)]
 pub enum Value {
     /// Represents a JSON null value.
@@ -191,27 +191,6 @@
     }
 }
 
-struct WriterFormatter<'a, 'b: 'a> {
-    inner: &'a mut fmt::Formatter<'b>,
-}
-
-impl<'a, 'b> io::Write for WriterFormatter<'a, 'b> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        fn io_error<E>(_: E) -> io::Error {
-            // Error value does not matter because fmt::Display impl below just
-            // maps it to fmt::Error
-            io::Error::new(io::ErrorKind::Other, "fmt error")
-        }
-        let s = tri!(str::from_utf8(buf).map_err(io_error));
-        tri!(self.inner.write_str(s).map_err(io_error));
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
 impl fmt::Display for Value {
     /// Display a JSON value as a string.
     ///
@@ -238,6 +217,30 @@
     ///     "{\n  \"city\": \"London\",\n  \"street\": \"10 Downing Street\"\n}");
     /// ```
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        struct WriterFormatter<'a, 'b: 'a> {
+            inner: &'a mut fmt::Formatter<'b>,
+        }
+
+        impl<'a, 'b> io::Write for WriterFormatter<'a, 'b> {
+            fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+                // Safety: the serializer below only emits valid utf8 when using
+                // the default formatter.
+                let s = unsafe { str::from_utf8_unchecked(buf) };
+                tri!(self.inner.write_str(s).map_err(io_error));
+                Ok(buf.len())
+            }
+
+            fn flush(&mut self) -> io::Result<()> {
+                Ok(())
+            }
+        }
+
+        fn io_error(_: fmt::Error) -> io::Error {
+            // Error value does not matter because Display impl just maps it
+            // back to fmt::Error.
+            io::Error::new(io::ErrorKind::Other, "fmt error")
+        }
+
         let alternate = f.alternate();
         let mut wr = WriterFormatter { inner: f };
         if alternate {
@@ -755,25 +758,15 @@
         if !pointer.starts_with('/') {
             return None;
         }
-        let tokens = pointer
+        pointer
             .split('/')
             .skip(1)
-            .map(|x| x.replace("~1", "/").replace("~0", "~"));
-        let mut target = self;
-
-        for token in tokens {
-            let target_opt = match *target {
-                Value::Object(ref map) => map.get(&token),
-                Value::Array(ref list) => parse_index(&token).and_then(|x| list.get(x)),
-                _ => return None,
-            };
-            if let Some(t) = target_opt {
-                target = t;
-            } else {
-                return None;
-            }
-        }
-        Some(target)
+            .map(|x| x.replace("~1", "/").replace("~0", "~"))
+            .try_fold(self, |target, token| match target {
+                Value::Object(map) => map.get(&token),
+                Value::Array(list) => parse_index(&token).and_then(|x| list.get(x)),
+                _ => None,
+            })
     }
 
     /// Looks up a value by a JSON Pointer and returns a mutable reference to
@@ -820,30 +813,15 @@
         if !pointer.starts_with('/') {
             return None;
         }
-        let tokens = pointer
+        pointer
             .split('/')
             .skip(1)
-            .map(|x| x.replace("~1", "/").replace("~0", "~"));
-        let mut target = self;
-
-        for token in tokens {
-            // borrow checker gets confused about `target` being mutably borrowed too many times because of the loop
-            // this once-per-loop binding makes the scope clearer and circumvents the error
-            let target_once = target;
-            let target_opt = match *target_once {
-                Value::Object(ref mut map) => map.get_mut(&token),
-                Value::Array(ref mut list) => {
-                    parse_index(&token).and_then(move |x| list.get_mut(x))
-                }
-                _ => return None,
-            };
-            if let Some(t) = target_opt {
-                target = t;
-            } else {
-                return None;
-            }
-        }
-        Some(target)
+            .map(|x| x.replace("~1", "/").replace("~0", "~"))
+            .try_fold(self, |target, token| match target {
+                Value::Object(map) => map.get_mut(&token),
+                Value::Array(list) => parse_index(&token).and_then(move |x| list.get_mut(x)),
+                _ => None,
+            })
     }
 
     /// Takes the value out of the `Value`, leaving a `Null` in its place.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/benches/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/benches/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/benches/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/benches/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-#![no_std]
-#![feature(test)]
-#[macro_use]
-extern crate digest;
-extern crate sha1;
-
-bench!(sha1::Sha1);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.lock":"cb91ffff371524a65d00a6d075e7d94d01f253393661058750217edc1005b76e","Cargo.toml":"80517f782161bae604f15650e2ef9ddbfd4c25c68a61d023e183483412bce8dd","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"b4eb00df6e2a4d22518fcaa6a2b4646f249b3a3c9814509b22bd2091f1392ff1","benches/lib.rs":"a37a0e99c673a3049d4ffa229eb1b3e1a3006f611a76b881f12440fcb075c361","examples/sha1sum.rs":"3b52d8ba4cc4271d3111b5cb578095761eab7ded2fede3c498d11eaf68a120b8","src/aarch64.rs":"150de941565333e50edb5b156e9448ce613621fac0660f6ed114d061ab97be6a","src/consts.rs":"b4346e3e6d28ad3f0a24cc199ebc73784466202a2cab09dfc938c14a41d5b4b2","src/lib.rs":"31e1c136ed0e41bf83fc5b32e8a456b89b556e541c3fe3fd78c9284a78bf7930","src/utils.rs":"a38e6d9df1994357f292c846e9fce3026bc02374fae8cbca18b9884e8a4759c6","tests/data/one_million_a.bin":"e53c99dcb3ee1436b1c01e53799a07891009be5cdb244133e5eda0ec56d7233a","tests/data/sha1.blb":"b620d6ab76fd26fea6b7be1be720652926b6cea9901a294ff8ba855666ddf19a","tests/lib.rs":"adce369751e6faab77582c03436abcd7dae816843501e1c63cbfd72942b76100"},"package":"f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "blobby"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe5f8c2940b65859ece4b3b2ba02d2b12c87cab455fd42dee2556a187bb2cf6"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-
-[[package]]
-name = "cc"
-version = "1.0.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "blobby",
- "generic-array",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "generic-array"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "hex-literal"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc2928beef125e519d69ae1baa8c37ea2e0d3848545217f6db0179c5eb1d639"
-dependencies = [
- "hex-literal-impl",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "hex-literal-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520870c3213943eb8d7803e80180d12a6c7ceb4ae74602544529d1643dc4ddda"
-dependencies = [
- "proc-macro-hack",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463bf29e7f11344e58c9e01f171470ab15c925c6822ad75028cc1c0e1d1eb63b"
-dependencies = [
- "proc-macro-hack-impl",
-]
-
-[[package]]
-name = "proc-macro-hack-impl"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c47dcb1594802de8c02f3b899e2018c78291168a22c281be21ea0fb4796842"
-
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-dependencies = [
- "block-buffer",
- "digest",
- "fake-simd",
- "hex-literal",
- "libc",
- "opaque-debug",
- "sha1-asm",
-]
-
-[[package]]
-name = "sha1-asm"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9dae2289dd5f5dc67fb0f341a5676c5c197415c51ce7345ae1bd0d36a6cbbfc"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "typenum"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "sha-1"
-version = "0.8.2"
-authors = ["RustCrypto Developers"]
-description = "SHA-1 hash function"
-documentation = "https://docs.rs/sha-1"
-keywords = ["crypto", "sha1", "hash", "digest"]
-categories = ["cryptography", "no-std"]
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/RustCrypto/hashes"
-
-[lib]
-name = "sha1"
-[dependencies.block-buffer]
-version = "0.7"
-
-[dependencies.digest]
-version = "0.8"
-
-[dependencies.fake-simd]
-version = "0.1"
-
-[dependencies.libc]
-version = "0.2"
-optional = true
-
-[dependencies.opaque-debug]
-version = "0.2"
-
-[dependencies.sha1-asm]
-version = "0.4"
-optional = true
-[dev-dependencies.digest]
-version = "0.8"
-features = ["dev"]
-
-[dev-dependencies.hex-literal]
-version = "0.1"
-
-[features]
-asm = ["sha1-asm"]
-asm-aarch64 = ["asm", "libc"]
-default = ["std"]
-std = ["digest/std"]
-[badges.travis-ci]
-repository = "RustCrypto/hashes"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/examples/sha1sum.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/examples/sha1sum.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/examples/sha1sum.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/examples/sha1sum.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-extern crate sha1;
-
-use sha1::{Sha1, Digest};
-use std::env;
-use std::fs;
-use std::io::{self, Read};
-
-const BUFFER_SIZE: usize = 1024;
-
-/// Print digest result as hex string and name pair
-fn print_result(sum: &[u8], name: &str) {
-    for byte in sum {
-        print!("{:02x}", byte);
-    }
-    println!("\t{}", name);
-}
-
-/// Compute digest value for given `Reader` and print it
-/// On any error simply return without doing anything
-fn process<D: Digest + Default, R: Read>(reader: &mut R, name: &str) {
-    let mut sh = D::default();
-    let mut buffer = [0u8; BUFFER_SIZE];
-    loop {
-        let n = match reader.read(&mut buffer) {
-            Ok(n) => n,
-            Err(_) => return,
-        };
-        sh.input(&buffer[..n]);
-        if n == 0 || n < BUFFER_SIZE {
-            break;
-        }
-    }
-    print_result(&sh.result(), name);
-}
-
-fn main() {
-    let args = env::args();
-    // Process files listed in command line arguments one by one
-    // If no files provided process input from stdin
-    if args.len() > 1 {
-        for path in args.skip(1) {
-            if let Ok(mut file) = fs::File::open(&path) {
-                process::<Sha1, _>(&mut file, &path);
-            }
-        }
-    } else {
-        process::<Sha1, _>(&mut io::stdin(), "-");
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-Copyright (c) 2006-2009 Graydon Hoare
-Copyright (c) 2009-2013 Mozilla Foundation
-Copyright (c) 2016 Artyom Pavlov
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/src/aarch64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/src/aarch64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/src/aarch64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/src/aarch64.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-// TODO: Import those from libc, see https://github.com/rust-lang/libc/pull/1638
-const AT_HWCAP: u64 = 16;
-const HWCAP_SHA1: u64 = 32;
-
-#[inline(always)]
-pub fn sha1_supported() -> bool {
-    let hwcaps: u64 = unsafe { ::libc::getauxval(AT_HWCAP) };
-    (hwcaps & HWCAP_SHA1) != 0
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/src/consts.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/src/consts.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/src/consts.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/src/consts.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#![cfg_attr(feature = "cargo-clippy", allow(unreadable_literal))]
-
-pub const STATE_LEN: usize = 5;
-
-#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))]
-pub const BLOCK_LEN: usize = 16;
-
-#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))]
-pub const K0: u32 = 0x5A827999u32;
-#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))]
-pub const K1: u32 = 0x6ED9EBA1u32;
-#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))]
-pub const K2: u32 = 0x8F1BBCDCu32;
-#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))]
-pub const K3: u32 = 0xCA62C1D6u32;
-
-pub const H: [u32; STATE_LEN] = [
-    0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0
-];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-//! An implementation of the [SHA-1][1] cryptographic hash algorithm.
-//!
-//! # Usage
-//!
-//! ```rust
-//! # #[macro_use] extern crate hex_literal;
-//! # extern crate sha1;
-//! # fn main() {
-//! use sha1::{Sha1, Digest};
-//!
-//! // create a Sha1 object
-//! let mut hasher = Sha1::new();
-//!
-//! // process input message
-//! hasher.input(b"hello world");
-//!
-//! // acquire hash digest in the form of GenericArray,
-//! // which in this case is equivalent to [u8; 20]
-//! let result = hasher.result();
-//! assert_eq!(result[..], hex!("2aae6c35c94fcfb415dbe95f408b9ce91ee846ed"));
-//! # }
-//! ```
-//!
-//! Also see [RustCrypto/hashes][2] readme.
-//!
-//! [1]: https://en.wikipedia.org/wiki/SHA-1
-//! [2]: https://github.com/RustCrypto/hashes
-#![no_std]
-#![doc(html_logo_url =
-    "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
-
-// Give relevant error messages if the user tries to enable AArch64 asm on unsupported platforms.
-#[cfg(all(feature = "asm-aarch64", target_arch = "aarch64", not(target_os = "linux")))]
-compile_error!("Your OS isn’t yet supported for runtime-checking of AArch64 features.");
-#[cfg(all(feature = "asm-aarch64", target_os = "linux", not(target_arch = "aarch64")))]
-compile_error!("Enable the \"asm\" feature instead of \"asm-aarch64\" on non-AArch64 Linux systems.");
-#[cfg(all(not(feature = "asm-aarch64"), feature = "asm", target_arch = "aarch64", target_os = "linux"))]
-compile_error!("Enable the \"asm-aarch64\" feature on AArch64 if you want to use asm.");
-
-extern crate block_buffer;
-#[macro_use] extern crate opaque_debug;
-#[macro_use] pub extern crate digest;
-#[cfg(feature = "std")]
-extern crate std;
-#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))]
-extern crate fake_simd as simd;
-#[cfg(feature = "asm-aarch64")]
-extern crate libc;
-
-#[cfg(feature = "asm")]
-extern crate sha1_asm;
-#[cfg(all(feature = "asm", not(feature = "asm-aarch64")))]
-#[inline(always)]
-fn compress(state: &mut [u32; 5], block: &GenericArray<u8, U64>) {
-    let block: &[u8; 64] = unsafe { core::mem::transmute(block) };
-    sha1_asm::compress(state, block);
-}
-#[cfg(feature = "asm-aarch64")]
-mod aarch64;
-#[cfg(feature = "asm-aarch64")]
-#[inline(always)]
-fn compress(state: &mut [u32; 5], block: &GenericArray<u8, U64>) {
-    // TODO: Replace this platform-specific call with is_aarch64_feature_detected!("sha1") once
-    // that macro is stabilised and https://github.com/rust-lang/rfcs/pull/2725 is implemented
-    // to let us use it on no_std.
-    if aarch64::sha1_supported() {
-        let block: &[u8; 64] = unsafe { core::mem::transmute(block) };
-        sha1_asm::compress(state, block);
-    } else {
-        utils::compress(state, block);
-    }
-}
-
-#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))]
-mod utils;
-#[cfg(not(feature = "asm"))]
-use utils::compress;
-
-pub use digest::Digest;
-use digest::{Input, BlockInput, FixedOutput, Reset};
-use digest::generic_array::GenericArray;
-use digest::generic_array::typenum::{U20, U64};
-use block_buffer::BlockBuffer;
-use block_buffer::byteorder::{BE, ByteOrder};
-
-mod consts;
-use consts::{STATE_LEN, H};
-
-/// Structure representing the state of a SHA-1 computation
-#[derive(Clone)]
-pub struct Sha1 {
-    h: [u32; STATE_LEN],
-    len: u64,
-    buffer: BlockBuffer<U64>,
-}
-
-impl Default for Sha1 {
-    fn default() -> Self {
-        Sha1{ h: H, len: 0u64, buffer: Default::default() }
-    }
-}
-
-impl BlockInput for Sha1 {
-    type BlockSize = U64;
-}
-
-impl Input for Sha1 {
-    fn input<B: AsRef<[u8]>>(&mut self, input: B) {
-        let input = input.as_ref();
-        // Assumes that `length_bits<<3` will not overflow
-        self.len += input.len() as u64;
-        let state = &mut self.h;
-        self.buffer.input(input, |d| compress(state, d));
-    }
-}
-
-impl FixedOutput for Sha1 {
-    type OutputSize = U20;
-
-    fn fixed_result(mut self) -> GenericArray<u8, Self::OutputSize> {
-        {
-            let state = &mut self.h;
-            let l = self.len << 3;
-            self.buffer.len64_padding::<BE, _>(l, |d| compress(state, d));
-        }
-        let mut out = GenericArray::default();
-        BE::write_u32_into(&self.h,&mut out);
-        out
-    }
-}
-
-impl Reset for Sha1 {
-    fn reset(&mut self) {
-        self.h = H;
-        self.len = 0;
-        self.buffer.reset();
-    }
-}
-
-impl_opaque_debug!(Sha1);
-impl_write!(Sha1);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/src/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/src/utils.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,300 +0,0 @@
-#![cfg_attr(feature = "cargo-clippy", allow(many_single_char_names))]
-
-use consts::{BLOCK_LEN, K0, K1, K2, K3};
-use block_buffer::byteorder::{BE, ByteOrder};
-use simd::u32x4;
-use digest::generic_array::GenericArray;
-use digest::generic_array::typenum::U64;
-
-type Block = GenericArray<u8, U64>;
-
-/// Not an intrinsic, but gets the first element of a vector.
-#[inline]
-pub fn sha1_first(w0: u32x4) -> u32 {
-    w0.0
-}
-
-/// Not an intrinsic, but adds a word to the first element of a vector.
-#[inline]
-pub fn sha1_first_add(e: u32, w0: u32x4) -> u32x4 {
-    let u32x4(a, b, c, d) = w0;
-    u32x4(e.wrapping_add(a), b, c, d)
-}
-
-/// Emulates `llvm.x86.sha1msg1` intrinsic.
-fn sha1msg1(a: u32x4, b: u32x4) -> u32x4 {
-    let u32x4(_, _, w2, w3) = a;
-    let u32x4(w4, w5, _, _) = b;
-    a ^ u32x4(w2, w3, w4, w5)
-}
-
-/// Emulates `llvm.x86.sha1msg2` intrinsic.
-fn sha1msg2(a: u32x4, b: u32x4) -> u32x4 {
-    let u32x4(x0, x1, x2, x3) = a;
-    let u32x4(_, w13, w14, w15) = b;
-
-    let w16 = (x0 ^ w13).rotate_left(1);
-    let w17 = (x1 ^ w14).rotate_left(1);
-    let w18 = (x2 ^ w15).rotate_left(1);
-    let w19 = (x3 ^ w16).rotate_left(1);
-
-    u32x4(w16, w17, w18, w19)
-}
-
-/// Performs 4 rounds of the message schedule update.
-/*
-pub fn sha1_schedule_x4(v0: u32x4, v1: u32x4, v2: u32x4, v3: u32x4) -> u32x4 {
-    sha1msg2(sha1msg1(v0, v1) ^ v2, v3)
-}
-*/
-
-/// Emulates `llvm.x86.sha1nexte` intrinsic.
-#[inline]
-fn sha1_first_half(abcd: u32x4, msg: u32x4) -> u32x4 {
-    sha1_first_add(sha1_first(abcd).rotate_left(30), msg)
-}
-
-/// Emulates `llvm.x86.sha1rnds4` intrinsic.
-/// Performs 4 rounds of the message block digest.
-fn sha1_digest_round_x4(abcd: u32x4, work: u32x4, i: i8) -> u32x4 {
-    const K0V: u32x4 = u32x4(K0, K0, K0, K0);
-    const K1V: u32x4 = u32x4(K1, K1, K1, K1);
-    const K2V: u32x4 = u32x4(K2, K2, K2, K2);
-    const K3V: u32x4 = u32x4(K3, K3, K3, K3);
-
-    match i {
-        0 => sha1rnds4c(abcd, work + K0V),
-        1 => sha1rnds4p(abcd, work + K1V),
-        2 => sha1rnds4m(abcd, work + K2V),
-        3 => sha1rnds4p(abcd, work + K3V),
-        _ => unreachable!("unknown icosaround index"),
-    }
-}
-
-/// Not an intrinsic, but helps emulate `llvm.x86.sha1rnds4` intrinsic.
-fn sha1rnds4c(abcd: u32x4, msg: u32x4) -> u32x4 {
-    let u32x4(mut a, mut b, mut c, mut d) = abcd;
-    let u32x4(t, u, v, w) = msg;
-    let mut e = 0u32;
-
-    macro_rules! bool3ary_202 {
-        ($a:expr, $b:expr, $c:expr) => ($c ^ ($a & ($b ^ $c)))
-    } // Choose, MD5F, SHA1C
-
-    e = e.wrapping_add(a.rotate_left(5))
-        .wrapping_add(bool3ary_202!(b, c, d))
-        .wrapping_add(t);
-    b = b.rotate_left(30);
-
-    d = d.wrapping_add(e.rotate_left(5))
-        .wrapping_add(bool3ary_202!(a, b, c))
-        .wrapping_add(u);
-    a = a.rotate_left(30);
-
-    c = c.wrapping_add(d.rotate_left(5))
-        .wrapping_add(bool3ary_202!(e, a, b))
-        .wrapping_add(v);
-    e = e.rotate_left(30);
-
-    b = b.wrapping_add(c.rotate_left(5))
-        .wrapping_add(bool3ary_202!(d, e, a))
-        .wrapping_add(w);
-    d = d.rotate_left(30);
-
-    u32x4(b, c, d, e)
-}
-
-/// Not an intrinsic, but helps emulate `llvm.x86.sha1rnds4` intrinsic.
-fn sha1rnds4p(abcd: u32x4, msg: u32x4) -> u32x4 {
-    let u32x4(mut a, mut b, mut c, mut d) = abcd;
-    let u32x4(t, u, v, w) = msg;
-    let mut e = 0u32;
-
-    macro_rules! bool3ary_150 {
-        ($a:expr, $b:expr, $c:expr) => ($a ^ $b ^ $c)
-    } // Parity, XOR, MD5H, SHA1P
-
-    e = e.wrapping_add(a.rotate_left(5))
-        .wrapping_add(bool3ary_150!(b, c, d))
-        .wrapping_add(t);
-    b = b.rotate_left(30);
-
-    d = d.wrapping_add(e.rotate_left(5))
-        .wrapping_add(bool3ary_150!(a, b, c))
-        .wrapping_add(u);
-    a = a.rotate_left(30);
-
-    c = c.wrapping_add(d.rotate_left(5))
-        .wrapping_add(bool3ary_150!(e, a, b))
-        .wrapping_add(v);
-    e = e.rotate_left(30);
-
-    b = b.wrapping_add(c.rotate_left(5))
-        .wrapping_add(bool3ary_150!(d, e, a))
-        .wrapping_add(w);
-    d = d.rotate_left(30);
-
-    u32x4(b, c, d, e)
-}
-
-/// Not an intrinsic, but helps emulate `llvm.x86.sha1rnds4` intrinsic.
-fn sha1rnds4m(abcd: u32x4, msg: u32x4) -> u32x4 {
-    let u32x4(mut a, mut b, mut c, mut d) = abcd;
-    let u32x4(t, u, v, w) = msg;
-    let mut e = 0u32;
-
-    macro_rules! bool3ary_232 {
-        ($a:expr, $b:expr, $c:expr) => (($a & $b) ^ ($a & $c) ^ ($b & $c))
-    } // Majority, SHA1M
-
-    e = e.wrapping_add(a.rotate_left(5))
-        .wrapping_add(bool3ary_232!(b, c, d))
-        .wrapping_add(t);
-    b = b.rotate_left(30);
-
-    d = d.wrapping_add(e.rotate_left(5))
-        .wrapping_add(bool3ary_232!(a, b, c))
-        .wrapping_add(u);
-    a = a.rotate_left(30);
-
-    c = c.wrapping_add(d.rotate_left(5))
-        .wrapping_add(bool3ary_232!(e, a, b))
-        .wrapping_add(v);
-    e = e.rotate_left(30);
-
-    b = b.wrapping_add(c.rotate_left(5))
-        .wrapping_add(bool3ary_232!(d, e, a))
-        .wrapping_add(w);
-    d = d.rotate_left(30);
-
-    u32x4(b, c, d, e)
-}
-
-/// Process a block with the SHA-1 algorithm.
-fn sha1_digest_block_u32(state: &mut [u32; 5], block: &[u32; 16]) {
-
-    macro_rules! schedule {
-        ($v0:expr, $v1:expr, $v2:expr, $v3:expr) => (
-            sha1msg2(sha1msg1($v0, $v1) ^ $v2, $v3)
-        )
-    }
-
-    macro_rules! rounds4 {
-        ($h0:ident, $h1:ident, $wk:expr, $i:expr) => (
-            sha1_digest_round_x4($h0, sha1_first_half($h1, $wk), $i)
-        )
-    }
-
-    // Rounds 0..20
-    // TODO: replace with `u32x4::load`
-    let mut h0 = u32x4(state[0], state[1], state[2], state[3]);
-    let mut w0 = u32x4(block[0], block[1], block[2], block[3]);
-    let mut h1 = sha1_digest_round_x4(h0, sha1_first_add(state[4], w0), 0);
-    let mut w1 = u32x4(block[4], block[5], block[6], block[7]);
-    h0 = rounds4!(h1, h0, w1, 0);
-    let mut w2 = u32x4(block[8], block[9], block[10], block[11]);
-    h1 = rounds4!(h0, h1, w2, 0);
-    let mut w3 = u32x4(block[12], block[13], block[14], block[15]);
-    h0 = rounds4!(h1, h0, w3, 0);
-    let mut w4 = schedule!(w0, w1, w2, w3);
-    h1 = rounds4!(h0, h1, w4, 0);
-
-    // Rounds 20..40
-    w0 = schedule!(w1, w2, w3, w4);
-    h0 = rounds4!(h1, h0, w0, 1);
-    w1 = schedule!(w2, w3, w4, w0);
-    h1 = rounds4!(h0, h1, w1, 1);
-    w2 = schedule!(w3, w4, w0, w1);
-    h0 = rounds4!(h1, h0, w2, 1);
-    w3 = schedule!(w4, w0, w1, w2);
-    h1 = rounds4!(h0, h1, w3, 1);
-    w4 = schedule!(w0, w1, w2, w3);
-    h0 = rounds4!(h1, h0, w4, 1);
-
-    // Rounds 40..60
-    w0 = schedule!(w1, w2, w3, w4);
-    h1 = rounds4!(h0, h1, w0, 2);
-    w1 = schedule!(w2, w3, w4, w0);
-    h0 = rounds4!(h1, h0, w1, 2);
-    w2 = schedule!(w3, w4, w0, w1);
-    h1 = rounds4!(h0, h1, w2, 2);
-    w3 = schedule!(w4, w0, w1, w2);
-    h0 = rounds4!(h1, h0, w3, 2);
-    w4 = schedule!(w0, w1, w2, w3);
-    h1 = rounds4!(h0, h1, w4, 2);
-
-    // Rounds 60..80
-    w0 = schedule!(w1, w2, w3, w4);
-    h0 = rounds4!(h1, h0, w0, 3);
-    w1 = schedule!(w2, w3, w4, w0);
-    h1 = rounds4!(h0, h1, w1, 3);
-    w2 = schedule!(w3, w4, w0, w1);
-    h0 = rounds4!(h1, h0, w2, 3);
-    w3 = schedule!(w4, w0, w1, w2);
-    h1 = rounds4!(h0, h1, w3, 3);
-    w4 = schedule!(w0, w1, w2, w3);
-    h0 = rounds4!(h1, h0, w4, 3);
-
-    let e = sha1_first(h1).rotate_left(30);
-    let u32x4(a, b, c, d) = h0;
-
-    state[0] = state[0].wrapping_add(a);
-    state[1] = state[1].wrapping_add(b);
-    state[2] = state[2].wrapping_add(c);
-    state[3] = state[3].wrapping_add(d);
-    state[4] = state[4].wrapping_add(e);
-}
-
-/// Process a block with the SHA-1 algorithm. (See more...)
-///
-/// SHA-1 is a cryptographic hash function, and as such, it operates
-/// on an arbitrary number of bytes. This function operates on a fixed
-/// number of bytes. If you call this function with anything other than
-/// 64 bytes, then it will panic! This function takes two arguments:
-///
-/// * `state` is reference to an **array** of 5 words.
-/// * `block` is reference to a **slice** of 64 bytes.
-///
-/// If you want the function that performs a message digest on an arbitrary
-/// number of bytes, then see also the `Sha1` struct above.
-///
-/// # Implementation
-///
-/// First, some background. Both ARM and Intel are releasing documentation
-/// that they plan to include instruction set extensions for SHA1 and SHA256
-/// sometime in the near future. Second, LLVM won't lower these intrinsics yet,
-/// so these functions were written emulate these instructions. Finally,
-/// the block function implemented with these emulated intrinsics turned out
-/// to be quite fast! What follows is a discussion of this CPU-level view
-/// of the SHA-1 algorithm and how it relates to the mathematical definition.
-///
-/// The SHA instruction set extensions can be divided up into two categories:
-///
-/// * message work schedule update calculation ("schedule" v., "work" n.)
-/// * message block 80-round digest calculation ("digest" v., "block" n.)
-///
-/// The schedule-related functions can be used to easily perform 4 rounds
-/// of the message work schedule update calculation, as shown below:
-///
-/// ```ignore
-/// macro_rules! schedule_x4 {
-///     ($v0:expr, $v1:expr, $v2:expr, $v3:expr) => (
-///         sha1msg2(sha1msg1($v0, $v1) ^ $v2, $v3)
-///     )
-/// }
-///
-/// macro_rules! round_x4 {
-///     ($h0:ident, $h1:ident, $wk:expr, $i:expr) => (
-///         sha1rnds4($h0, sha1_first_half($h1, $wk), $i)
-///     )
-/// }
-/// ```
-///
-/// and also shown above is how the digest-related functions can be used to
-/// perform 4 rounds of the message block digest calculation.
-///
-pub fn compress(state: &mut [u32; 5], block: &Block) {
-    let mut block_u32 = [0u32; BLOCK_LEN];
-    BE::read_u32_into(block, &mut block_u32[..]);
-    sha1_digest_block_u32(state, &block_u32);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/tests/data/one_million_a.bin thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/tests/data/one_million_a.bin
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/tests/data/one_million_a.bin	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/tests/data/one_million_a.bin	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-4ª—<ÔÄÚ¤öë+Û­'1e4
o
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/tests/data/sha1.blb thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/tests/data/sha1.blb
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/tests/data/sha1.blb	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/tests/data/sha1.blb	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-blobby1abc©™>6G�jº>%qxPÂlœÐØ�8abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq„˜>D;Ònº®J¡ùQ)ååFpñ+The quick brown fox jumps over the lazy dog/ÔáÆz-(üí„žá»vç9“ë+The quick brown fox jumps over the lazy cogÞŸ,Ò^:úÓèZÑ}›
´³
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/tests/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/tests/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha-1/tests/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha-1/tests/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#![no_std]
-#[macro_use]
-extern crate digest;
-extern crate sha1;
-
-use digest::dev::{one_million_a, digest_test};
-
-new_test!(sha1_main, "sha1", sha1::Sha1, digest_test);
-
-#[test]
-fn sha1_1million_a() {
-    let output = include_bytes!("data/one_million_a.bin");
-    one_million_a::<sha1::Sha1>(output);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"e5f725cc7e69b573b77411b1c94c0ff11c3ced59bb617a3f815dd2a4427483a2","Cargo.lock":"6474d17dfbe13d6ca84c1e52259e7d58c34bbcc635fd9fce86e52aa7f3c9acdb","Cargo.toml":"042ec3ac53e915b0158544d3cfd665ba084e2538385876d14c055cbee513ec31","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"b4eb00df6e2a4d22518fcaa6a2b4646f249b3a3c9814509b22bd2091f1392ff1","README.md":"b7af562922e4a631657acf264772d2af2b72a08d9bbc5fbcf56d9324f9027708","benches/sha256.rs":"b4c350e12041ba0bd9b99bac401dedb26d6429570787cc3562467e7a129e4f75","benches/sha512.rs":"7550ba0ed7915193977e19a426ba39a6825fc7337beaac6538155f0486d1d1af","examples/sha256sum.rs":"93ecb1972af2193ff88d57644d1807be9ee90f9142f1508fb3fec95a5277dbc3","examples/sha512sum.rs":"385a40d67c9637b220d90820a921c4eb57a5a4f752dcfaf2a4737a8d051c790d","src/consts.rs":"fda715379ca4b68f2deb7413328c91d018221d0af2f592d43871b4ce8a8b2b51","src/lib.rs":"cf9c700272b5b713fb8131198a1e2f24702d0b0bf222b3b4427435c9ae17afb4","src/sha256.rs":"043139959b719b66827cc97e8e0ff6f51ede97e6ed6094ce6de64d171d4fa80f","src/sha256/aarch64.rs":"3ce2b975a0f26a666e7449bbdd9454353f6506c4cefc1231da6f4572e2dc54c0","src/sha256/soft.rs":"b7f78d833f231996598f69086de25fcaf268faed1466e40075a6ec3d822ee8d1","src/sha256/x86.rs":"fa342ddf524eb172b0f5afd93e825c21b06c8f7b997b4711fc7ac05f73587f81","src/sha512.rs":"19db8ea84fd16cbd7e0a06c75139258a1a937b36116ebb464cc38d3c02439f88","src/sha512/soft.rs":"87caece42b26b532ff7ebca8776ac34a0bc51ccd82a3416ef6e04257c510456d","tests/data/sha224.blb":"b20c77259744a50b96e73c602e8473bf811f820f072cf3313d3f254d1d532f30","tests/data/sha256.blb":"9f984fbe1f9b89115db731d9058036dcdaf450d03d732a0a8cf6fb16c7e08a92","tests/data/sha256_one_million_a.bin":"80d1189477563e1b5206b2749f1afe4807e5705e8bd77887a60187a712156688","tests/data/sha384.blb":"305f96c4237a2aeb5d9b66cf30a13d5b41b749c6c8cb079192f45bd81ad404e3","tests/data/sha512.blb":"e3c964b9a735473cf14e64953a0dfee9d98e445ba242d439ffef216e9cfe36e6","tests/data/sha512_224.blb":"8baa081f40124f5a69892d8f1e06867acba094358ad6304b60405210af27160b","tests/data/sha512_256.blb":"f1f15c1040958ed32bc1c44d2947c7827f55e53107e026535343840176cb3608","tests/data/sha512_one_million_a.bin":"a872d736156b28b7784fcc124cfb9993ed31707f1754a0a448d26bf84f5cc7f5","tests/lib.rs":"c7e5067377c91e64c76e6c7f5872f6bb491be8c1eaf2f77be4f10b38d730db24"},"package":"6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"1474e6c31013a44e90f51d4a580398dbc39a4adf637b68245594dd013325973c","Cargo.lock":"d3908be8284bd984e10b32157804a810f2e6617addf54e6920fbf141a242fcec","Cargo.toml":"01bc2a318c8035b3b79ef8a1c85a3f79dd1f9f66691c94ee30e93f4d013fac9d","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"b4eb00df6e2a4d22518fcaa6a2b4646f249b3a3c9814509b22bd2091f1392ff1","README.md":"b7af562922e4a631657acf264772d2af2b72a08d9bbc5fbcf56d9324f9027708","benches/sha256.rs":"b4c350e12041ba0bd9b99bac401dedb26d6429570787cc3562467e7a129e4f75","benches/sha512.rs":"7550ba0ed7915193977e19a426ba39a6825fc7337beaac6538155f0486d1d1af","examples/sha256sum.rs":"93ecb1972af2193ff88d57644d1807be9ee90f9142f1508fb3fec95a5277dbc3","examples/sha512sum.rs":"385a40d67c9637b220d90820a921c4eb57a5a4f752dcfaf2a4737a8d051c790d","src/consts.rs":"fda715379ca4b68f2deb7413328c91d018221d0af2f592d43871b4ce8a8b2b51","src/lib.rs":"875a5430c3412cad0f1e5f17c3fb03031c7a7850f9a75eb8c9421aa92bc603cd","src/sha256.rs":"b6d8e869b87fde0df42a41fa0df4cabb02da8320c733ab8c4903e05798158b3c","src/sha256/aarch64.rs":"02dbac483409a853126fec642f964a464e4372f53da2fa4120b29bed204f72b7","src/sha256/soft.rs":"98e765a8e8dfa0af31f2b76570f212e6b3099522bf300e1554cbbd9fd5d02960","src/sha256/x86.rs":"70f1597f2029522b35bfd026df0a8908f086523ab2a80ba3ef35e6231b56353c","src/sha512.rs":"2330f7767d25b519b05084c58fce800119ec448fd864f1c1acb55ab44adb6259","src/sha512/soft.rs":"0183ad89418b886859d2afa9bf061bc92759ae337c1d26147b4300042e63ef42","tests/data/sha224.blb":"b20c77259744a50b96e73c602e8473bf811f820f072cf3313d3f254d1d532f30","tests/data/sha256.blb":"9f984fbe1f9b89115db731d9058036dcdaf450d03d732a0a8cf6fb16c7e08a92","tests/data/sha256_one_million_a.bin":"80d1189477563e1b5206b2749f1afe4807e5705e8bd77887a60187a712156688","tests/data/sha384.blb":"305f96c4237a2aeb5d9b66cf30a13d5b41b749c6c8cb079192f45bd81ad404e3","tests/data/sha512.blb":"e3c964b9a735473cf14e64953a0dfee9d98e445ba242d439ffef216e9cfe36e6","tests/data/sha512_224.blb":"8baa081f40124f5a69892d8f1e06867acba094358ad6304b60405210af27160b","tests/data/sha512_256.blb":"f1f15c1040958ed32bc1c44d2947c7827f55e53107e026535343840176cb3608","tests/data/sha512_one_million_a.bin":"a872d736156b28b7784fcc124cfb9993ed31707f1754a0a448d26bf84f5cc7f5","tests/lib.rs":"c7e5067377c91e64c76e6c7f5872f6bb491be8c1eaf2f77be4f10b38d730db24"},"package":"9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "blobby"
 version = "0.1.2"
@@ -20,15 +22,15 @@
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.61"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 
 [[package]]
 name = "cfg-if"
@@ -37,10 +39,13 @@
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "cpuid-bool"
-version = "0.1.2"
+name = "cpufeatures"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "digest"
@@ -83,9 +88,9 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
 
 [[package]]
 name = "opaque-debug"
@@ -101,35 +106,34 @@
 
 [[package]]
 name = "sha2"
-version = "0.9.2"
+version = "0.9.6"
 dependencies = [
  "block-buffer",
  "cfg-if",
- "cpuid-bool",
+ "cpufeatures",
  "digest",
  "hex-literal",
- "libc",
  "opaque-debug",
  "sha2-asm",
 ]
 
 [[package]]
 name = "sha2-asm"
-version = "0.5.4"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92cfa120723b595090343400d71e4921ba4fbc7d0d48718d72c20b3348469678"
+checksum = "bf27176fb5d15398e3a479c652c20459d9dac830dedd1fa55b42a77dbcdbfcea"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
+checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
 
 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "sha2"
-version = "0.9.2"
+version = "0.9.6"
 authors = ["RustCrypto Developers"]
 description = "Pure Rust implementation of the SHA-2 hash function family\nincluding SHA-224, SHA-256, SHA-384, and SHA-512.\n"
 documentation = "https://docs.rs/sha2"
@@ -22,6 +22,9 @@
 categories = ["cryptography", "no-std"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/RustCrypto/hashes"
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.block-buffer]
 version = "0.9"
 
@@ -35,7 +38,7 @@
 version = "0.3"
 
 [dependencies.sha2-asm]
-version = "0.5"
+version = "0.6.1"
 optional = true
 [dev-dependencies.digest]
 version = "0.9"
@@ -45,14 +48,11 @@
 version = "0.2"
 
 [features]
-asm = ["sha2-asm", "libc"]
+asm = ["sha2-asm"]
 asm-aarch64 = ["asm"]
 compress = []
 default = ["std"]
 force-soft = []
 std = ["digest/std"]
-[target."cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))".dependencies.libc]
-version = "0.2.80"
-optional = true
-[target."cfg(any(target_arch = \"x86\", target_arch = \"x86_64\"))".dependencies.cpuid-bool]
-version = "0.1"
+[target."cfg(any(target_arch = \"aarch64\", target_arch = \"x86_64\", target_arch = \"x86\"))".dependencies.cpufeatures]
+version = "0.2"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -5,6 +5,35 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.9.6 (2021-08-27)
+### Changed
+- Bump `cpufeatures` dependency to 0.2 ([#306])
+
+[#306]: https://github.com/RustCrypto/hashes/pull/306
+
+## 0.9.5 (2021-05-11)
+### Changed
+- Use `cpufeatures` to detect intrinsics support on `aarch64` targets ([#267])
+
+[#267]: https://github.com/RustCrypto/hashes/pull/267
+
+## 0.9.4 (2021-05-05)
+### Added
+- Hardware accelerated SHA-256 for Apple M1 CPUs with `asm` feature ([#262])
+
+### Changed
+- Bump `sha2-asm` to v0.6.1 release ([#262])
+- Switch from `cpuid-bool` to `cpufeatures` ([#263])
+
+[#262]: https://github.com/RustCrypto/hashes/pull/262
+[#263]: https://github.com/RustCrypto/hashes/pull/263
+
+## 0.9.3 (2021-01-30)
+### Changed
+- Use the SHA-NI extension backend with enabled `asm` feature. ([#224])
+
+[#224]: https://github.com/RustCrypto/hashes/pull/224
+
 ## 0.9.2 (2020-11-04)
 ### Added
 - `force-soft` feature to enforce use of software implementation. ([#203])
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,15 +2,15 @@
 //!
 //! There are 6 standard algorithms specified in the SHA-2 standard:
 //!
-//! * `Sha224`, which is the 32-bit `Sha256` algorithm with the result truncated
+//! * `Sha224`, which is the 8 x 32-bit `Sha256` algorithm with the result truncated
 //! to 224 bits.
-//! * `Sha256`, which is the 32-bit `Sha256` algorithm.
-//! * `Sha384`, which is the 64-bit `Sha512` algorithm with the result truncated
+//! * `Sha256`, which is the 8 x 32-bit `Sha256` algorithm.
+//! * `Sha384`, which is the 8 x 64-bit `Sha512` algorithm with the result truncated
 //! to 384 bits.
-//! * `Sha512`, which is the 64-bit `Sha512` algorithm.
-//! * `Sha512Trunc224`, which is the 64-bit `Sha512` algorithm with the result
+//! * `Sha512`, which is the 8 x 64-bit `Sha512` algorithm.
+//! * `Sha512Trunc224`, which is the 8 x 64-bit `Sha512` algorithm with the result
 //! truncated to 224 bits.
-//! * `Sha512Trunc256`, which is the 64-bit `Sha512` algorithm with the result
+//! * `Sha512Trunc256`, which is the 8 x 64-bit `Sha512` algorithm with the result
 //! truncated to 256 bits.
 //!
 //! Algorithmically, there are only 2 core algorithms: `Sha256` and `Sha512`.
@@ -53,6 +53,7 @@
 //! [2]: https://github.com/RustCrypto/hashes
 
 #![no_std]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo.svg"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha256/aarch64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha256/aarch64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha256/aarch64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha256/aarch64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,15 @@
-use libc::{getauxval, AT_HWCAP, HWCAP_SHA2};
+//! SHA-256 `aarch64` backend.
 
-#[inline(always)]
-pub fn sha2_supported() -> bool {
-    let hwcaps: u64 = unsafe { getauxval(AT_HWCAP) };
-    (hwcaps & HWCAP_SHA2) != 0
-}
+// TODO: stdarch intrinsics: RustCrypto/hashes#257
+
+cpufeatures::new!(sha2_hwcap, "sha2");
 
 pub fn compress(state: &mut [u32; 8], blocks: &[[u8; 64]]) {
     // TODO: Replace with https://github.com/rust-lang/rfcs/pull/2725
     // after stabilization
-    if sha2_supported() {
-        // TODO: replace after sha2-asm rework
-        for block in blocks {
-            sha2_asm::compress256(&mut self.h, block);
-        }
+    if sha2_hwcap::get() {
+        sha2_asm::compress256(state, blocks);
     } else {
-        super::soft::compress(&mut self.h, block);
+        super::soft::compress(state, blocks);
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha256/soft.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha256/soft.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha256/soft.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha256/soft.rs	2021-12-09 12:01:26.000000000 +0000
@@ -166,7 +166,6 @@
     let mut abef = [state[0], state[1], state[4], state[5]];
     let mut cdgh = [state[2], state[3], state[6], state[7]];
 
-
     // Rounds 0..64
     let mut w0 = [block[3], block[2], block[1], block[0]];
     let mut w1 = [block[7], block[6], block[5], block[4]];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha256/x86.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha256/x86.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha256/x86.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha256/x86.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,11 @@
+//! SHA-256 `x86`/`x86_64` backend
+
 #![allow(clippy::many_single_char_names)]
 
-#[cfg(target_arch = "x86_64")]
-use core::arch::x86_64::*;
 #[cfg(target_arch = "x86")]
 use core::arch::x86::*;
+#[cfg(target_arch = "x86_64")]
+use core::arch::x86_64::*;
 
 unsafe fn schedule(v0: __m128i, v1: __m128i, v2: __m128i, v3: __m128i) -> __m128i {
     let t1 = _mm_sha256msg1_epu32(v0, v1);
@@ -61,7 +63,7 @@
         let mut w0 = _mm_shuffle_epi8(_mm_loadu_si128(data_ptr.add(0)), MASK);
         let mut w1 = _mm_shuffle_epi8(_mm_loadu_si128(data_ptr.add(1)), MASK);
         let mut w2 = _mm_shuffle_epi8(_mm_loadu_si128(data_ptr.add(2)), MASK);
-        let mut w3 = _mm_shuffle_epi8( _mm_loadu_si128(data_ptr.add(3)), MASK);
+        let mut w3 = _mm_shuffle_epi8(_mm_loadu_si128(data_ptr.add(3)), MASK);
         let mut w4;
 
         rounds4!(abef, cdgh, w0, 0);
@@ -95,10 +97,12 @@
     _mm_storeu_si128(state_ptr_mut.add(1), hgef);
 }
 
+cpufeatures::new!(shani_cpuid, "sha", "sse2", "ssse3", "sse4.1");
+
 pub fn compress(state: &mut [u32; 8], blocks: &[[u8; 64]]) {
     // TODO: Replace with https://github.com/rust-lang/rfcs/pull/2725
     // after stabilization
-    if cpuid_bool::cpuid_bool!("sha", "sse2", "ssse3", "sse4.1") {
+    if shani_cpuid::get() {
         unsafe {
             digest_blocks(state, blocks);
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha256.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha256.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha256.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha256.rs	2021-12-09 12:01:26.000000000 +0000
@@ -142,27 +142,32 @@
     if #[cfg(feature = "force-soft")] {
         mod soft;
         use soft::compress;
-    } else if #[cfg(all(feature = "asm", target_arch = "aarch64", target_os = "linux"))] {
+    } else if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
+        #[cfg(not(feature = "asm"))]
         mod soft;
-        mod aarch64;
-        use aarch64::compress;
-    } else if #[cfg(all(feature = "asm", any(target_arch = "x86", target_arch = "x86_64")))] {
-        // TODO: replace after sha2-asm rework
-        fn compress(state: &mut [u32; 8], blocks: &[[u8; 64]]) {
-            for block in blocks {
-                sha2_asm::compress256(state, block);
+        #[cfg(feature = "asm")]
+        mod soft {
+            pub(crate) fn compress(state: &mut [u32; 8], blocks: &[[u8; 64]]) {
+                sha2_asm::compress256(state, blocks);
             }
         }
-    } else if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
-        mod soft;
         mod x86;
         use x86::compress;
+    } else if #[cfg(all(feature = "asm", target_arch = "aarch64"))] {
+        mod soft;
+        mod aarch64;
+        use aarch64::compress;
     } else {
         mod soft;
         use soft::compress;
     }
 }
 
+/// Raw SHA-256 compression function.
+///
+/// This is a low-level "hazmat" API which provides direct access to the core
+/// functionality of SHA-256.
+#[cfg_attr(docsrs, doc(cfg(feature = "compress")))]
 pub fn compress256(state: &mut [u32; 8], blocks: &[GenericArray<u8, U64>]) {
     // SAFETY: GenericArray<u8, U64> and [u8; 64] have
     // exactly the same memory layout
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha512/soft.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha512/soft.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha512/soft.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha512/soft.rs	2021-12-09 12:01:26.000000000 +0000
@@ -200,7 +200,6 @@
     state[7] = state[7].wrapping_add(h);
 }
 
-
 pub fn compress(state: &mut [u64; 8], blocks: &[[u8; 128]]) {
     let mut block_u32 = [0u64; BLOCK_LEN];
     // since LLVM can't properly use aliasing yet it will make
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha512.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha512.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/sha2/src/sha512.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/sha2/src/sha512.rs	2021-12-09 12:01:26.000000000 +0000
@@ -232,11 +232,8 @@
         mod soft;
         use soft::compress;
     } else if #[cfg(all(feature = "asm", any(target_arch = "x86", target_arch = "x86_64")))] {
-        // TODO: replace after sha2-asm rework
         fn compress(state: &mut [u64; 8], blocks: &[[u8; 128]]) {
-            for block in blocks {
-                sha2_asm::compress512(state, block);
-            }
+            sha2_asm::compress512(state, blocks);
         }
     } else {
         mod soft;
@@ -244,6 +241,11 @@
     }
 }
 
+/// Raw SHA-512 compression function.
+///
+/// This is a low-level "hazmat" API which provides direct access to the core
+/// functionality of SHA-512.
+#[cfg_attr(docsrs, doc(cfg(feature = "compress")))]
 pub fn compress512(state: &mut [u64; 8], blocks: &[GenericArray<u8, U128>]) {
     // SAFETY: GenericArray<u8, U128> and [u8; 128] have
     // exactly the same memory layout
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"b9860cd0a40e22f7bccd13e4b6363fa14c78c250cd3e874c8be30108c569c8e1","Cargo.lock":"02586ebba7433d5ae877cd40dc36b41cf8f586d1eb6b16489869247719bfe5d4","Cargo.toml":"6dedae99295f3d8c3024a21b401075c241d6bdc51c9f6cdd7bef8d29ed771d55","LICENSE.APACHE2":"9cf5de169b595cdae317551ef69a794b59fa3d1e151db4190d337fe08d13d5f8","LICENSE.MIT":"1e147868153db048dbf42e9e1306f7d341e7824b55ade822f98c61bf7b3c3f79","README.md":"cdc643128196441f26b99bc2a48da1c04e789216cd66c27cf59f0ba0fc9411f6","examples/custom_colors.rs":"3e76832b80367082894d15037db7c7d7f4b621e727f827ceb7b01251e84943c0","examples/default_colors.rs":"e8e73b441917f99479d708511aecc9bb8e2801b37cbfe151e7e404e4e5fec7b7","examples/rgb_colors.rs":"4023dc86bb17b3662ebfb259cf8e301e37e856147d073ef7aa79a4e8c63c008b","examples/usage.rs":"009d4089931d7a1899947ddeafd744d4654875856feca04e137d02673bb6cc4e","src/config.rs":"5259e5fb36d851c797d98792981aa7c909d6f9509357bad64ecb7ba7dd7bff69","src/lib.rs":"c37785dd07fcaa2082a6a53a4228859c182090f72836b97db772477388c0db3b","src/loggers/comblog.rs":"887f553a9322a6df371f1f1d309d85f5e6bdd108d82d308f6a2da41a77985ea2","src/loggers/logging.rs":"4729cb1df8968f9931a5c7083f9094a0432a74eed2ff37b6e3d071f22523e647","src/loggers/mod.rs":"1ca067f8af098adf59ea70c746b19afdd667a657c340b7fa66eed75bf5f50e9b","src/loggers/simplelog.rs":"3e93772a8f01978e30e2c0f781fc2c3ad02b882a33b38af83318f80bab2bc041","src/loggers/termlog.rs":"cab4fe4aea7d65bd7c1642c82b805d80c11243309a2dd904fd8a3cd0299af099","src/loggers/testlog.rs":"569ffb6760664d1cdbab66df52bdc43e5f7a3c7d47107859fa97c43c305b5a14","src/loggers/writelog.rs":"d0b2aa86cb8b7fcd4775150750f225c60311f1b21b62bafe4e2ce83f5f87cf07"},"package":"4bc0ffd69814a9b251d43afcabf96dad1b29f5028378056257be9e3fecc9f720"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"df3d7c122ebac121a4249f5dd0ebf3d071a5388fa600a07ded984082d3bff241","Cargo.lock":"e1144fa6e00e4e74caeb1268fcd7a154987adb3802881b9cefa3b094f7887e21","Cargo.toml":"2f7a553d0d7f4bf87ac2e39a963f360024bd5534227d1d7302a9b1284f5261c5","LICENSE.APACHE2":"9cf5de169b595cdae317551ef69a794b59fa3d1e151db4190d337fe08d13d5f8","LICENSE.MIT":"1e147868153db048dbf42e9e1306f7d341e7824b55ade822f98c61bf7b3c3f79","README.md":"e1388ebb94843f57ff09b5eb514de6ae84cf2f6e0b571101dc813f518d748b10","examples/custom_colors.rs":"2b9e004990fc3243f6a9d018ce50743f2d2aad75190a5fcf266cd36ecaf861c4","examples/default_colors.rs":"27c4ec1173c3d0a6e36fa594277c3e74a14b4bc5206ca9a6516d0fc94bc9fab5","examples/rgb_colors.rs":"cd54ed611785e0dfc534138da5b7bb74d3a2c5cda799abf0b858b96ca6079c82","examples/usage.rs":"39e4013b6182445dbcf7cb945df05409e2d32c8feae9f1c1fcc3441bae77577e","src/config.rs":"4fb4696f5cc9544c0928adcea95f439bc663921d7413b9278e03b0af01902f9c","src/lib.rs":"73fcf6202d24cda489d9233014ab472556ef463ea511abf6adf9b8efce567ca0","src/loggers/comblog.rs":"ab1d647a1aae4bd9b0189fb6d5eeb749d4ad6ac759bddea6d1619aa9d6ac0efe","src/loggers/logging.rs":"5574bdd5c1dfa80518cc69866bf33195d00c5aa17865a628623b85ff5b311dcf","src/loggers/mod.rs":"1ca067f8af098adf59ea70c746b19afdd667a657c340b7fa66eed75bf5f50e9b","src/loggers/simplelog.rs":"b025c28008096e959a7cc2c3e86c9b2f4de0def0918a96840ef7f4e1fa7d02bb","src/loggers/termlog.rs":"aff225427373cb2e3ee5f3bbb0f3c81f2fba412f25f480e03aec9945a7cd10e3","src/loggers/testlog.rs":"8648611576ae8fe5dfe694e2935a16ec41f11d5ec4e8eba29106baa85e9599dd","src/loggers/writelog.rs":"405dd56820b55b40756be921405b23a53c499fb2e39bb583128c45d9e5776b03"},"package":"59d0fe306a0ced1c88a58042dc22fc2ddd000982c26d75f6aa09a394547c41e0"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -1,71 +1,67 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
 [[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
 name = "cfg-if"
-version = "0.1.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.1"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5f60682a4c264e7f8d77b82e7788938a76befdf949d4a98026d19099c9d873"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
+ "libc",
  "num-integer",
  "num-traits",
  "time",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1ca084b49bfd975182288e1a5f1d27ea34ff2d6ae084ae5e66e1652427eada"
-dependencies = [
- "winapi 0.2.4",
- "winapi-build",
+ "winapi",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.1"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff7bf059aff5b88320556e113a4b2edbb3ce4a82ed6474d0f2574e8934cb8974"
+checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
 
 [[package]]
 name = "log"
-version = "0.4.0"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a89a0c46ba789b8a247d4c567aed4d7c68e624672d238b45cc3ec20dc9f940"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.36"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
+ "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.0"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7de20f146db9d920c45ee8ed8f71681fd9ade71909b48c3acbd766aa504cf10"
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35a48131ab10dbeb17202bd1dcb9c9798963a58a50c9ec31640f237358832094"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "simplelog"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "chrono",
  "log",
@@ -74,64 +70,57 @@
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.36"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "211b63c112206356ef1ff9b19355f43740fc3f85960c598a93d3a3d3ba7beade"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
- "kernel32-sys",
  "libc",
- "redox_syscall",
- "winapi 0.2.4",
+ "wasi",
+ "winapi",
 ]
 
 [[package]]
-name = "winapi"
-version = "0.2.4"
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5350e40d908c7e8b9e5c9edb541ca47cc617c6229d3575a46da6f550f36c96fd"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "winapi"
-version = "0.3.0"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3ad91d846a4a5342c1fb7008d26124ee6cf94a3953751618577295373b32117"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
  "winapi-i686-pc-windows-gnu",
  "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
 name = "winapi-i686-pc-windows-gnu"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a16a8e2ebfc883e2b1771c6482b1fb3c6831eab289ba391619a2d93a7356220f"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.0",
+ "winapi",
 ]
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca29cb03c8ceaf20f8224a18a530938305e9872b1478ea24ff44b4f503a1d1d"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "simplelog"
-version = "0.9.0"
+version = "0.10.0"
 authors = ["Drakulix <github@drakulix.de>"]
 include = ["**/*.rs", "Cargo.toml", "CHANGELOG.md", "README.md", "LICENSE.APACHE2", "LICENSE.MIT"]
 description = "A simple and easy-to-use logging facility for Rust's log crate"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,8 @@
+## v0.10.0
+    - Fix wrong argument naming (PR #70, credits to @scvalex)
+    - *Breaking*: More color customization options (PR #72, credits to @mrkline)
+    - Clarify docs on config levels
+
 ## v0.9.0
     - Add customizable level label colors (PR #69. credits to @JarrettBillingsley)
     - Remove unneeded TermLogError
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/examples/custom_colors.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/examples/custom_colors.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/examples/custom_colors.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/examples/custom_colors.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,22 @@
+#[cfg(feature = "termcolor")]
 use log::*;
+#[cfg(feature = "termcolor")]
 use simplelog::*;
 
 #[cfg(feature = "termcolor")]
 fn main() {
     let config = ConfigBuilder::new()
-        .set_level_color(Level::Error, Color::Magenta)
-        .set_level_color(Level::Trace, Color::Green)
+        .set_level_color(Level::Error, Some(Color::Magenta))
+        .set_level_color(Level::Trace, Some(Color::Green))
         .build();
 
-    TermLogger::init(LevelFilter::Trace, config, TerminalMode::Stdout).unwrap();
+    TermLogger::init(
+        LevelFilter::Trace,
+        config,
+        TerminalMode::Stdout,
+        ColorChoice::Auto,
+    )
+    .unwrap();
     error!("Magenta error");
     warn!("Yellow warning");
     info!("Blue info");
@@ -19,4 +27,4 @@
 #[cfg(not(feature = "termcolor"))]
 fn main() {
     println!("this example requires the termcolor feature.");
-}
\ No newline at end of file
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/examples/default_colors.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/examples/default_colors.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/examples/default_colors.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/examples/default_colors.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,17 @@
+#[cfg(feature = "termcolor")]
 use log::*;
+#[cfg(feature = "termcolor")]
 use simplelog::*;
 
 #[cfg(feature = "termcolor")]
 fn main() {
-    TermLogger::init(LevelFilter::Trace, Config::default(), TerminalMode::Stdout).unwrap();
+    TermLogger::init(
+        LevelFilter::Trace,
+        Config::default(),
+        TerminalMode::Stdout,
+        ColorChoice::Auto,
+    )
+    .unwrap();
     error!("Red error");
     warn!("Yellow warning");
     info!("Blue info");
@@ -14,4 +22,4 @@
 #[cfg(not(feature = "termcolor"))]
 fn main() {
     println!("this example requires the termcolor feature.");
-}
\ No newline at end of file
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/examples/rgb_colors.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/examples/rgb_colors.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/examples/rgb_colors.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/examples/rgb_colors.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,25 @@
+#[cfg(all(not(target_family = "windows"), feature = "termcolor"))]
 use log::*;
+#[cfg(all(not(target_family = "windows"), feature = "termcolor"))]
 use simplelog::*;
 
 #[cfg(all(not(target_family = "windows"), feature = "termcolor"))]
 fn main() {
     let config = ConfigBuilder::new()
-        .set_level_color(Level::Error, Color::Rgb(191, 0, 0))
-        .set_level_color(Level::Warn,  Color::Rgb(255, 127, 0))
-        .set_level_color(Level::Info,  Color::Rgb(192, 192, 0))
-        .set_level_color(Level::Debug, Color::Rgb(63, 127, 0))
-        .set_level_color(Level::Trace, Color::Rgb(127, 127, 255))
+        .set_level_color(Level::Error, Some(Color::Rgb(191, 0, 0)))
+        .set_level_color(Level::Warn, Some(Color::Rgb(255, 127, 0)))
+        .set_level_color(Level::Info, Some(Color::Rgb(192, 192, 0)))
+        .set_level_color(Level::Debug, Some(Color::Rgb(63, 127, 0)))
+        .set_level_color(Level::Trace, Some(Color::Rgb(127, 127, 255)))
         .build();
 
-    TermLogger::init(LevelFilter::Trace, config, TerminalMode::Stdout).unwrap();
+    TermLogger::init(
+        LevelFilter::Trace,
+        config,
+        TerminalMode::Stdout,
+        ColorChoice::Auto,
+    )
+    .unwrap();
     error!("Red error");
     warn!("Orange warning");
     info!("Yellow info");
@@ -22,4 +30,4 @@
 #[cfg(any(target_family = "windows", not(feature = "termcolor")))]
 fn main() {
     println!("this example requires the termcolor feature and a non-Windows OS.");
-}
\ No newline at end of file
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/examples/usage.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/examples/usage.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/examples/usage.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/examples/usage.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,12 @@
 fn main() {
     CombinedLogger::init(vec![
         #[cfg(feature = "termcolor")]
-        TermLogger::new(LevelFilter::Warn, Config::default(), TerminalMode::Mixed),
+        TermLogger::new(
+            LevelFilter::Warn,
+            Config::default(),
+            TerminalMode::Mixed,
+            ColorChoice::Auto,
+        ),
         #[cfg(not(feature = "termcolor"))]
         SimpleLogger::new(LevelFilter::Warn, Config::default()),
         WriteLogger::new(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-# simplelog [![Build Status](https://travis-ci.org/Drakulix/simplelog.rs.svg?branch=master)](https://travis-ci.org/Drakulix/simplelog.rs) [![Coverage Status](https://coveralls.io/repos/github/Drakulix/simplelog.rs/badge.svg?branch=master)](https://coveralls.io/github/Drakulix/simplelog.rs?branch=master) [![Crates.io](https://img.shields.io/crates/v/simplelog.svg)](https://crates.io/crates/simplelog) [![Crates.io](https://img.shields.io/crates/l/simplelog.svg)](https://crates.io/crates/simplelog)
+# simplelog [![Build Status](https://github.com/drakulix/simplelog.rs/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/Drakulix/simplelog.rs/actions) [![Coverage Status](https://coveralls.io/repos/github/Drakulix/simplelog.rs/badge.svg?branch=master)](https://coveralls.io/github/Drakulix/simplelog.rs?branch=master) [![Crates.io](https://img.shields.io/crates/v/simplelog.svg)](https://crates.io/crates/simplelog) [![Crates.io](https://img.shields.io/crates/l/simplelog.svg)](https://crates.io/crates/simplelog)
 ## A simple and easy-to-use logging facility for Rust's [log](https://crates.io/crates/log) crate
 
 `simplelog` does not aim to provide a rich set of features, nor to provide the
@@ -42,7 +42,7 @@
 ### Results in
 ```
 $ cargo run --example usage
-   Compiling simplelog v0.7.6 (file:///home/drakulix/Projects/simplelog)
+   Compiling simplelog v0.10.0 (file:///home/drakulix/Projects/simplelog)
      Running `target/debug/examples/usage`
 [ERROR] Bright red error
 ```
@@ -57,7 +57,7 @@
 Just add
 ```
 [dependencies]
-simplelog = "^0.7.6"
+simplelog = "^0.10.0"
 ```
 to your `Cargo.toml`
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/config.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/config.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/config.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/config.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,11 @@
-use log::{Level, LevelFilter};
+#[cfg(feature = "termcolor")]
+use log::Level;
+use log::LevelFilter;
 
 pub use chrono::offset::{FixedOffset, Local, Offset, TimeZone, Utc};
+use std::borrow::Cow;
 #[cfg(feature = "termcolor")]
 use termcolor::Color;
-use std::borrow::Cow;
 
 #[derive(Debug, Clone, Copy)]
 /// Padding to be used for logging the level
@@ -64,7 +66,7 @@
     pub(crate) filter_allow: Cow<'static, [Cow<'static, str>]>,
     pub(crate) filter_ignore: Cow<'static, [Cow<'static, str>]>,
     #[cfg(feature = "termcolor")]
-    pub(crate) level_color: [Color; 6],
+    pub(crate) level_color: [Option<Color>; 6],
 }
 
 /// Builder for the Logger Configurations (`Config`)
@@ -90,57 +92,58 @@
         ConfigBuilder(Config::default())
     }
 
-    /// Set at which level and below the level itself shall be logged (default is Error)
-    pub fn set_max_level<'a>(&'a mut self, level: LevelFilter) -> &'a mut ConfigBuilder {
+    /// Set at which level and above (more verbose) the level itself shall be logged (default is Error)
+    pub fn set_max_level(&mut self, level: LevelFilter) -> &mut ConfigBuilder {
         self.0.level = level;
         self
     }
 
-    /// Set at which level and below the current time shall be logged (default is Error)
-    pub fn set_time_level<'a>(&'a mut self, time: LevelFilter) -> &'a mut ConfigBuilder {
+    /// Set at which level and  above (more verbose) the current time shall be logged (default is Error)
+    pub fn set_time_level(&mut self, time: LevelFilter) -> &mut ConfigBuilder {
         self.0.time = time;
         self
     }
 
-    /// Set at which level and below the thread id shall be logged. (default is Debug)
-    pub fn set_thread_level<'a>(&'a mut self, thread: LevelFilter) -> &'a mut ConfigBuilder {
+    /// Set at which level and above (more verbose) the thread id shall be logged. (default is Debug)
+    pub fn set_thread_level(&mut self, thread: LevelFilter) -> &mut ConfigBuilder {
         self.0.thread = thread;
         self
     }
 
-    /// Set at which level and below the target shall be logged. (default is Debug)
-    pub fn set_target_level<'a>(&'a mut self, target: LevelFilter) -> &'a mut ConfigBuilder {
+    /// Set at which level and above (more verbose) the target shall be logged. (default is Debug)
+    pub fn set_target_level(&mut self, target: LevelFilter) -> &mut ConfigBuilder {
         self.0.target = target;
         self
     }
 
-    /// Set at which level and below a source code reference shall be logged (default is Trace)
-    pub fn set_location_level<'a>(&'a mut self, location: LevelFilter) -> &'a mut ConfigBuilder {
+    /// Set at which level and above (more verbose) a source code reference shall be logged (default is Trace)
+    pub fn set_location_level(&mut self, location: LevelFilter) -> &mut ConfigBuilder {
         self.0.location = location;
         self
     }
 
     /// Set how the levels should be padded, when logging (default is Left)
-    pub fn set_level_padding<'a>(&'a mut self, padding: LevelPadding) -> &'a mut ConfigBuilder {
+    pub fn set_level_padding(&mut self, padding: LevelPadding) -> &mut ConfigBuilder {
         self.0.level_padding = padding;
         self
     }
 
     /// Set how the thread should be padded
-    pub fn set_thread_padding<'a>(&'a mut self, padding: ThreadPadding) -> &'a mut ConfigBuilder {
+    pub fn set_thread_padding(&mut self, padding: ThreadPadding) -> &mut ConfigBuilder {
         self.0.thread_padding = padding;
         self
     }
 
     /// Set the mode for logging the thread
-    pub fn set_thread_mode<'a>(&'a mut self, mode: ThreadLogMode) -> &'a mut ConfigBuilder {
+    pub fn set_thread_mode(&mut self, mode: ThreadLogMode) -> &mut ConfigBuilder {
         self.0.thread_log_mode = mode;
         self
     }
 
-    /// Set the color used for printing the level (if the logger supports it)
+    /// Set the color used for printing the level (if the logger supports it),
+    /// or None to use the default foreground color
     #[cfg(feature = "termcolor")]
-    pub fn set_level_color<'a>(&'a mut self, level: Level, color: Color) -> &'a mut ConfigBuilder {
+    pub fn set_level_color(&mut self, level: Level, color: Option<Color>) -> &mut ConfigBuilder {
         self.0.level_color[level as usize] = color;
         self
     }
@@ -148,10 +151,7 @@
     /// Set time chrono [strftime] format string.
     ///
     /// [strftime]: https://docs.rs/chrono/0.4.0/chrono/format/strftime/index.html#specifiers
-    pub fn set_time_format_str<'a>(
-        &'a mut self,
-        time_format: &'static str,
-    ) -> &'a mut ConfigBuilder {
+    pub fn set_time_format_str(&mut self, time_format: &'static str) -> &mut ConfigBuilder {
         self.0.time_format = Cow::Borrowed(time_format);
         self
     }
@@ -159,19 +159,19 @@
     /// Set time chrono [strftime] format string.
     ///
     /// [strftime]: https://docs.rs/chrono/0.4.0/chrono/format/strftime/index.html#specifiers
-    pub fn set_time_format<'a>(&'a mut self, time_format: String) -> &'a mut ConfigBuilder {
+    pub fn set_time_format(&mut self, time_format: String) -> &mut ConfigBuilder {
         self.0.time_format = Cow::Owned(time_format);
         self
     }
 
     /// Set offset used for logging time (default is 0)
-    pub fn set_time_offset<'a>(&'a mut self, time_offset: FixedOffset) -> &'a mut ConfigBuilder {
+    pub fn set_time_offset(&mut self, time_offset: FixedOffset) -> &mut ConfigBuilder {
         self.0.time_offset = time_offset;
         self
     }
 
     /// set if you log in local timezone or UTC (default is UTC)
-    pub fn set_time_to_local<'a>(&'a mut self, local: bool) -> &'a mut ConfigBuilder {
+    pub fn set_time_to_local(&mut self, local: bool) -> &mut ConfigBuilder {
         self.0.time_local = local;
         self
     }
@@ -180,12 +180,9 @@
     /// If any are specified, only records from modules starting with one of these entries will be printed
     ///
     /// For example, `add_filter_allow_str("tokio::uds")` would allow only logging from the `tokio` crates `uds` module.
-    pub fn add_filter_allow_str<'a>(
-        &'a mut self,
-        time_format: &'static str,
-    ) -> &'a mut ConfigBuilder {
+    pub fn add_filter_allow_str(&mut self, filter_allow: &'static str) -> &mut ConfigBuilder {
         let mut list = Vec::from(&*self.0.filter_allow);
-        list.push(Cow::Borrowed(time_format));
+        list.push(Cow::Borrowed(filter_allow));
         self.0.filter_allow = Cow::Owned(list);
         self
     }
@@ -194,16 +191,16 @@
     /// If any are specified, only records from modules starting with one of these entries will be printed
     ///
     /// For example, `add_filter_allow(format!("{}{}","tokio", "uds"))` would allow only logging from the `tokio` crates `uds` module.
-    pub fn add_filter_allow<'a>(&'a mut self, time_format: String) -> &'a mut ConfigBuilder {
+    pub fn add_filter_allow(&mut self, filter_allow: String) -> &mut ConfigBuilder {
         let mut list = Vec::from(&*self.0.filter_allow);
-        list.push(Cow::Owned(time_format));
+        list.push(Cow::Owned(filter_allow));
         self.0.filter_allow = Cow::Owned(list);
         self
     }
 
     /// Clear allowed module filters.
     /// If none are specified, nothing is filtered out
-    pub fn clear_filter_allow<'a>(&'a mut self) -> &'a mut ConfigBuilder {
+    pub fn clear_filter_allow(&mut self) -> &mut ConfigBuilder {
         self.0.filter_allow = Cow::Borrowed(&[]);
         self
     }
@@ -212,12 +209,9 @@
     /// If any are specified, records from modules starting with one of these entries will be ignored
     ///
     /// For example, `add_filter_ignore_str("tokio::uds")` would deny logging from the `tokio` crates `uds` module.
-    pub fn add_filter_ignore_str<'a>(
-        &'a mut self,
-        time_format: &'static str,
-    ) -> &'a mut ConfigBuilder {
+    pub fn add_filter_ignore_str(&mut self, filter_ignore: &'static str) -> &mut ConfigBuilder {
         let mut list = Vec::from(&*self.0.filter_ignore);
-        list.push(Cow::Borrowed(time_format));
+        list.push(Cow::Borrowed(filter_ignore));
         self.0.filter_ignore = Cow::Owned(list);
         self
     }
@@ -226,16 +220,16 @@
     /// If any are specified, records from modules starting with one of these entries will be ignored
     ///
     /// For example, `add_filter_ignore(format!("{}{}","tokio", "uds"))` would deny logging from the `tokio` crates `uds` module.
-    pub fn add_filter_ignore<'a>(&'a mut self, time_format: String) -> &'a mut ConfigBuilder {
+    pub fn add_filter_ignore(&mut self, filter_ignore: String) -> &mut ConfigBuilder {
         let mut list = Vec::from(&*self.0.filter_ignore);
-        list.push(Cow::Owned(time_format));
+        list.push(Cow::Owned(filter_ignore));
         self.0.filter_ignore = Cow::Owned(list);
         self
     }
 
     /// Clear ignore module filters.
     /// If none are specified, nothing is filtered
-    pub fn clear_filter_ignore<'a>(&'a mut self) -> &'a mut ConfigBuilder {
+    pub fn clear_filter_ignore(&mut self) -> &mut ConfigBuilder {
         self.0.filter_ignore = Cow::Borrowed(&[]);
         self
     }
@@ -246,6 +240,12 @@
     }
 }
 
+impl Default for ConfigBuilder {
+    fn default() -> Self {
+        ConfigBuilder::new()
+    }
+}
+
 impl Default for Config {
     fn default() -> Config {
         Config {
@@ -265,12 +265,12 @@
 
             #[cfg(feature = "termcolor")]
             level_color: [
-                Color::White,  // (dummy)
-                Color::Red,    // Error
-                Color::Yellow, // Warn
-                Color::Blue,   // Info
-                Color::Cyan,   // Debug
-                Color::White,  // Trace
+                None,                // Default foreground
+                Some(Color::Red),    // Error
+                Some(Color::Yellow), // Warn
+                Some(Color::Blue),   // Info
+                Some(Color::Cyan),   // Debug
+                Some(Color::White),  // Trace
             ],
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,14 +24,14 @@
 mod config;
 mod loggers;
 
-pub use self::config::{Config, ConfigBuilder, LevelPadding, ThreadPadding, ThreadLogMode};
+pub use self::config::{Config, ConfigBuilder, LevelPadding, ThreadLogMode, ThreadPadding};
 #[cfg(feature = "test")]
 pub use self::loggers::TestLogger;
 pub use self::loggers::{CombinedLogger, SimpleLogger, WriteLogger};
 #[cfg(feature = "termcolor")]
 pub use self::loggers::{TermLogger, TerminalMode};
 #[cfg(feature = "termcolor")]
-pub use termcolor::Color;
+pub use termcolor::{Color, ColorChoice};
 
 pub use log::{Level, LevelFilter};
 
@@ -100,9 +100,11 @@
                 .set_thread_mode(ThreadLogMode::Names)
                 .build();
 
-            vec.push(
-                WriteLogger::new(LevelFilter::Error, conf_thread_name, File::create("thread_naming.log").unwrap()) as Box<dyn SharedLogger>
-            );
+            vec.push(WriteLogger::new(
+                LevelFilter::Error,
+                conf_thread_name,
+                File::create("thread_naming.log").unwrap(),
+            ) as Box<dyn SharedLogger>);
 
             for elem in vec![
                 LevelFilter::Off,
@@ -125,10 +127,12 @@
                     SimpleLogger::new(LevelFilter::Error, conf.clone()) as Box<dyn SharedLogger>
                 );
                 #[cfg(feature = "termcolor")]
-                vec.push(
-                    TermLogger::new(LevelFilter::Error, conf.clone(), TerminalMode::Mixed)
-                        as Box<dyn SharedLogger>,
-                );
+                vec.push(TermLogger::new(
+                    LevelFilter::Error,
+                    conf.clone(),
+                    TerminalMode::Mixed,
+                    ColorChoice::Auto,
+                ) as Box<dyn SharedLogger>);
                 vec.push(WriteLogger::new(
                     LevelFilter::Error,
                     conf.clone(),
@@ -142,10 +146,12 @@
                     SimpleLogger::new(LevelFilter::Warn, conf.clone()) as Box<dyn SharedLogger>
                 );
                 #[cfg(feature = "termcolor")]
-                vec.push(
-                    TermLogger::new(LevelFilter::Warn, conf.clone(), TerminalMode::Mixed)
-                        as Box<dyn SharedLogger>,
-                );
+                vec.push(TermLogger::new(
+                    LevelFilter::Warn,
+                    conf.clone(),
+                    TerminalMode::Mixed,
+                    ColorChoice::Auto,
+                ) as Box<dyn SharedLogger>);
                 vec.push(WriteLogger::new(
                     LevelFilter::Warn,
                     conf.clone(),
@@ -159,10 +165,12 @@
                     SimpleLogger::new(LevelFilter::Info, conf.clone()) as Box<dyn SharedLogger>
                 );
                 #[cfg(feature = "termcolor")]
-                vec.push(
-                    TermLogger::new(LevelFilter::Info, conf.clone(), TerminalMode::Mixed)
-                        as Box<dyn SharedLogger>,
-                );
+                vec.push(TermLogger::new(
+                    LevelFilter::Info,
+                    conf.clone(),
+                    TerminalMode::Mixed,
+                    ColorChoice::Auto,
+                ) as Box<dyn SharedLogger>);
                 vec.push(WriteLogger::new(
                     LevelFilter::Info,
                     conf.clone(),
@@ -176,10 +184,12 @@
                     SimpleLogger::new(LevelFilter::Debug, conf.clone()) as Box<dyn SharedLogger>
                 );
                 #[cfg(feature = "termcolor")]
-                vec.push(
-                    TermLogger::new(LevelFilter::Debug, conf.clone(), TerminalMode::Mixed)
-                        as Box<dyn SharedLogger>,
-                );
+                vec.push(TermLogger::new(
+                    LevelFilter::Debug,
+                    conf.clone(),
+                    TerminalMode::Mixed,
+                    ColorChoice::Auto,
+                ) as Box<dyn SharedLogger>);
                 vec.push(WriteLogger::new(
                     LevelFilter::Debug,
                     conf.clone(),
@@ -193,10 +203,12 @@
                     SimpleLogger::new(LevelFilter::Trace, conf.clone()) as Box<dyn SharedLogger>
                 );
                 #[cfg(feature = "termcolor")]
-                vec.push(
-                    TermLogger::new(LevelFilter::Trace, conf.clone(), TerminalMode::Mixed)
-                        as Box<dyn SharedLogger>,
-                );
+                vec.push(TermLogger::new(
+                    LevelFilter::Trace,
+                    conf.clone(),
+                    TerminalMode::Mixed,
+                    ColorChoice::Auto,
+                ) as Box<dyn SharedLogger>);
                 vec.push(WriteLogger::new(
                     LevelFilter::Trace,
                     conf.clone(),
@@ -217,7 +229,10 @@
         trace!("Test Trace");
 
         let mut thread_naming = String::new();
-        File::open("thread_naming.log").unwrap().read_to_string(&mut thread_naming).unwrap();
+        File::open("thread_naming.log")
+            .unwrap()
+            .read_to_string(&mut thread_naming)
+            .unwrap();
 
         if let Some(name) = std::thread::current().name() {
             assert!(thread_naming.contains(&format!("({})", name)));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/comblog.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/comblog.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/comblog.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/comblog.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,7 +37,7 @@
     /// let _ = CombinedLogger::init(
     ///             vec![
     /// #               #[cfg(feature = "termcolor")]
-    ///                 TermLogger::new(LevelFilter::Info, Config::default(), TerminalMode::Mixed),
+    ///                 TermLogger::new(LevelFilter::Info, Config::default(), TerminalMode::Mixed, ColorChoice::Auto),
     ///                 WriteLogger::new(LevelFilter::Info, Config::default(), File::create("my_rust_bin.log").unwrap())
     ///             ]
     ///         );
@@ -68,7 +68,7 @@
     /// let combined_logger = CombinedLogger::new(
     ///             vec![
     /// #               #[cfg(feature = "termcolor")]
-    ///                 TermLogger::new(LevelFilter::Debug, Config::default(), TerminalMode::Mixed),
+    ///                 TermLogger::new(LevelFilter::Debug, Config::default(), TerminalMode::Mixed, ColorChoice::Auto),
     ///                 WriteLogger::new(LevelFilter::Info, Config::default(), File::create("my_rust_bin.log").unwrap())
     ///             ]
     ///         );
@@ -84,7 +84,7 @@
 
         Box::new(CombinedLogger {
             level: log_level,
-            logger: logger,
+            logger,
         })
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/logging.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/logging.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/logging.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/logging.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,4 @@
-use crate::{Config, LevelPadding, ThreadPadding, ThreadLogMode};
-use chrono;
+use crate::{Config, LevelPadding, ThreadLogMode, ThreadPadding};
 use log::{LevelFilter, Record};
 use std::io::{Error, Write};
 use std::thread;
@@ -100,11 +99,11 @@
 {
     if let Some(name) = thread::current().name() {
         match config.thread_padding {
-            ThreadPadding::Left{0: qty} => {
-                write!(write, "({name:>0$}) ", qty, name=name)?;
+            ThreadPadding::Left { 0: qty } => {
+                write!(write, "({name:>0$}) ", qty, name = name)?;
             }
-            ThreadPadding::Right{0: qty} => {
-                write!(write, "({name:<0$}) ", qty, name=name)?;
+            ThreadPadding::Right { 0: qty } => {
+                write!(write, "({name:<0$}) ", qty, name = name)?;
             }
             ThreadPadding::Off => {
                 write!(write, "({}) ", name)?;
@@ -125,11 +124,11 @@
     let id = id.replace("ThreadId(", "");
     let id = id.replace(")", "");
     match config.thread_padding {
-        ThreadPadding::Left{0: qty} => {
-            write!(write, "({id:>0$}) ", qty, id=id)?;
+        ThreadPadding::Left { 0: qty } => {
+            write!(write, "({id:>0$}) ", qty, id = id)?;
         }
-        ThreadPadding::Right{0: qty} => {
-            write!(write, "({id:<0$}) ", qty, id=id)?;
+        ThreadPadding::Right { 0: qty } => {
+            write!(write, "({id:<0$}) ", qty, id = id)?;
         }
         ThreadPadding::Off => {
             write!(write, "({}) ", id)?;
@@ -151,9 +150,9 @@
 pub fn should_skip(config: &Config, record: &Record<'_>) -> bool {
     // If a module path and allowed list are available
     match (record.target(), &*config.filter_allow) {
-        (path, allowed) if allowed.len() > 0 => {
+        (path, allowed) if !allowed.is_empty() => {
             // Check that the module path matches at least one allow filter
-            if let None = allowed.iter().find(|v| path.starts_with(&***v)) {
+            if !allowed.iter().any(|v| path.starts_with(&**v)) {
                 // If not, skip any further writing
                 return true;
             }
@@ -163,9 +162,9 @@
 
     // If a module path and ignore list are available
     match (record.target(), &*config.filter_ignore) {
-        (path, ignore) if ignore.len() > 0 => {
+        (path, ignore) if !ignore.is_empty() => {
             // Check that the module path does not match any ignore filters
-            if let Some(_) = ignore.iter().find(|v| path.starts_with(&***v)) {
+            if ignore.iter().any(|v| path.starts_with(&**v)) {
                 // If not, skip any further writing
                 return true;
             }
@@ -173,5 +172,5 @@
         _ => {}
     }
 
-    return false;
+    false
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/simplelog.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/simplelog.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/simplelog.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/simplelog.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,7 +37,7 @@
     /// # }
     /// ```
     pub fn init(log_level: LevelFilter, config: Config) -> Result<(), SetLoggerError> {
-        set_max_level(log_level.clone());
+        set_max_level(log_level);
         set_boxed_logger(SimpleLogger::new(log_level, config))
     }
 
@@ -59,7 +59,7 @@
     pub fn new(log_level: LevelFilter, config: Config) -> Box<SimpleLogger> {
         Box::new(SimpleLogger {
             level: log_level,
-            config: config,
+            config,
             output_lock: Mutex::new(()),
         })
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/termlog.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/termlog.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/termlog.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/termlog.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,8 +5,7 @@
 };
 use std::io::{Error, Write};
 use std::sync::Mutex;
-use termcolor;
-use termcolor::{StandardStream, ColorChoice, WriteColor, ColorSpec};
+use termcolor::{ColorChoice, ColorSpec, StandardStream, WriteColor};
 
 use super::logging::*;
 
@@ -68,16 +67,22 @@
     /// # extern crate simplelog;
     /// # use simplelog::*;
     /// # fn main() {
-    ///     TermLogger::init(LevelFilter::Info, Config::default(), TerminalMode::Mixed);
+    ///     TermLogger::init(
+    ///         LevelFilter::Info,
+    ///         Config::default(),
+    ///         TerminalMode::Mixed,
+    ///         ColorChoice::Auto
+    ///     );
     /// # }
     /// ```
     pub fn init(
         log_level: LevelFilter,
         config: Config,
         mode: TerminalMode,
+        color_choice: ColorChoice,
     ) -> Result<(), SetLoggerError> {
-        let logger = TermLogger::new(log_level, config, mode);
-        set_max_level(log_level.clone());
+        let logger = TermLogger::new(log_level, config, mode, color_choice);
+        set_max_level(log_level);
         set_boxed_logger(logger)?;
         Ok(())
     }
@@ -96,33 +101,38 @@
     /// # extern crate simplelog;
     /// # use simplelog::*;
     /// # fn main() {
-    /// let term_logger = TermLogger::new(LevelFilter::Info, Config::default(), TerminalMode::Mixed);
+    /// let term_logger = TermLogger::new(
+    ///     LevelFilter::Info,
+    ///     Config::default(),
+    ///     TerminalMode::Mixed,
+    ///     ColorChoice::Auto
+    /// );
     /// # }
     /// ```
     pub fn new(
         log_level: LevelFilter,
         config: Config,
         mode: TerminalMode,
+        color_choice: ColorChoice,
     ) -> Box<TermLogger> {
         let streams = match mode {
             TerminalMode::Stdout => OutputStreams {
-                err: StdTerminal::Stdout(Box::new(StandardStream::stdout(ColorChoice::Always))),
-                out: StdTerminal::Stdout(Box::new(StandardStream::stdout(ColorChoice::Always)))
+                err: StdTerminal::Stdout(Box::new(StandardStream::stdout(color_choice))),
+                out: StdTerminal::Stdout(Box::new(StandardStream::stdout(color_choice))),
             },
             TerminalMode::Stderr => OutputStreams {
-                err: StdTerminal::Stderr(Box::new(StandardStream::stderr(ColorChoice::Always))),
-                out: StdTerminal::Stderr(Box::new(StandardStream::stderr(ColorChoice::Always)))
+                err: StdTerminal::Stderr(Box::new(StandardStream::stderr(color_choice))),
+                out: StdTerminal::Stderr(Box::new(StandardStream::stderr(color_choice))),
             },
             TerminalMode::Mixed => OutputStreams {
-                err: StdTerminal::Stderr(Box::new(StandardStream::stderr(ColorChoice::Always))),
-                out: StdTerminal::Stdout(Box::new(StandardStream::stdout(ColorChoice::Always)))
+                err: StdTerminal::Stderr(Box::new(StandardStream::stderr(color_choice))),
+                out: StdTerminal::Stdout(Box::new(StandardStream::stdout(color_choice))),
             },
         };
 
-
         Box::new(TermLogger {
             level: log_level,
-            config: config,
+            config,
             streams: Mutex::new(streams),
         })
     }
@@ -139,7 +149,7 @@
         }
 
         if self.config.level <= record.level() && self.config.level != LevelFilter::Off {
-            term_lock.set_color(ColorSpec::new().set_fg(Some(color)))?;
+            term_lock.set_color(ColorSpec::new().set_fg(color))?;
             write_level(record, &mut *term_lock, &self.config)?;
             term_lock.reset()?;
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/testlog.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/testlog.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/testlog.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/testlog.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,7 +8,7 @@
 //! Module providing the TestLogger Implementation
 
 use super::logging::should_skip;
-use crate::{Config, SharedLogger, LevelPadding};
+use crate::{Config, LevelPadding, SharedLogger};
 use log::{set_boxed_logger, set_max_level, LevelFilter, Log, Metadata, Record, SetLoggerError};
 
 use std::thread;
@@ -38,7 +38,7 @@
     /// # }
     /// ```
     pub fn init(log_level: LevelFilter, config: Config) -> Result<(), SetLoggerError> {
-        set_max_level(log_level.clone());
+        set_max_level(log_level);
         set_boxed_logger(TestLogger::new(log_level, config))
     }
 
@@ -133,10 +133,7 @@
     } else {
         chrono::Utc::now().naive_utc() + config.time_offset
     };
-    print!(
-        "{} ",
-        cur_time.format(&*config.time_format)
-    );
+    print!("{} ", cur_time.format(&*config.time_format));
 }
 
 #[inline(always)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/writelog.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/writelog.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/simplelog/src/loggers/writelog.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/simplelog/src/loggers/writelog.rs	2021-12-09 12:01:26.000000000 +0000
@@ -36,7 +36,7 @@
     /// # }
     /// ```
     pub fn init(log_level: LevelFilter, config: Config, writable: W) -> Result<(), SetLoggerError> {
-        set_max_level(log_level.clone());
+        set_max_level(log_level);
         set_boxed_logger(WriteLogger::new(log_level, config, writable))
     }
 
@@ -59,7 +59,7 @@
     pub fn new(log_level: LevelFilter, config: Config, writable: W) -> Box<WriteLogger<W>> {
         Box::new(WriteLogger {
             level: log_level,
-            config: config,
+            config,
             writable: Mutex::new(writable),
         })
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"COPYING":"2667c3da82a038bfbbd64cdb0fde6ecabda683e473fc1c10cc2b31c1c65e7fb6","Cargo.toml":"fa1de7b88148b860d04aa6fe8704bf38385470152563b8521de7e7ad555eaee4","README.md":"c0ffa167eca7e8aa8efc05c0514234aff3f522fc2e327edf6f86d4fbfa8502a8","src/lib.rs":"dac421e799bfb49f9721af1083101af6846fef78268362172450f2a2c0f6250c","src/sip.rs":"86b2f2e4667d140a2eb6bca23fbc9e11e46f20decb9164b494d04a5c29f46110","src/sip128.rs":"1a73114087cb64b8aa63c9e56d8fcb15efa5c2007c6c8e167cd528ebab54bdf9","src/tests.rs":"0195439c356f3557cf83dab2a8e6adbe5eac1c9f6ba66bf27b3c2e40f9345066","src/tests128.rs":"b85b8893c14a3b4ea782d2084b6de414456ef6dd0b55d1c29c68a3e46516d07c"},"package":"729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies.
+#
+# If you 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"
+name = "siphasher"
+version = "0.3.6"
+authors = ["Frank Denis <github@pureftpd.org>"]
+description = "SipHash-2-4, SipHash-1-3 and 128-bit variants in pure Rust"
+homepage = "https://docs.rs/siphasher"
+documentation = "https://docs.rs/siphasher"
+readme = "README.md"
+keywords = ["crypto", "hash", "siphash"]
+categories = ["algorithms", "cryptography"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/jedisct1/rust-siphash"
+[profile.release]
+opt-level = 3
+lto = true
+panic = "abort"
+[dependencies.serde]
+version = "1.0"
+features = ["derive"]
+optional = true
+[dev-dependencies.serde_json]
+version = "1.0"
+
+[features]
+default = ["std"]
+serde_no_std = ["serde/alloc"]
+serde_std = ["std", "serde/std"]
+std = []
+[badges.travis-ci]
+repository = "jedisct1/rust-siphash"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/COPYING thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/COPYING
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/COPYING	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/COPYING	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Copyright 2012-2016 The Rust Project Developers.
+Copyright 2016-2021 Frank Denis.
+
+Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+option.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,43 @@
+SipHash implementation for Rust
+===============================
+
+This crates implements SipHash-2-4 and SipHash-1-3 in Rust.
+
+It is based on the original implementation from rust-core and exposes the
+same API.
+
+It also implements SipHash variants returning 128-bit tags.
+
+The `sip` module implements the standard 64-bit mode, whereas the `sip128`
+module implements the 128-bit mode.
+
+Usage
+-----
+In `Cargo.toml`:
+
+```toml
+[dependencies]
+siphasher = "0.3"
+```
+
+If you want [serde](https://github.com/serde-rs/serde) support, include the feature like this:
+
+```toml
+[dependencies]
+siphasher = { version = "0.3", features = ["serde"] }
+```
+
+64-bit mode:
+```rust
+extern crate siphasher;
+
+use siphasher::sip::{SipHasher, SipHasher13, SipHasher24};
+```
+
+128-bit mode:
+```rust
+use siphasher::sip128::{Hasher128, Siphasher, SipHasher13, SipHasher24};
+```
+
+[API documentation](https://docs.rs/siphasher/)
+-----------------------------------------------
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+#![cfg_attr(not(test), no_std)]
+#![allow(clippy::unreadable_literal)]
+#![allow(clippy::cast_lossless)]
+#![allow(clippy::many_single_char_names)]
+
+pub mod sip;
+pub mod sip128;
+
+#[cfg(test)]
+mod tests;
+
+#[cfg(test)]
+mod tests128;
+
+#[cfg(any(feature = "serde", feature = "serde_std", feature = "serde_no_std"))]
+pub mod reexports {
+    pub use serde;
+}
+
+pub mod prelude {
+    pub use crate::{sip, sip128};
+    pub use core::hash::Hasher as _;
+    pub use sip128::Hasher128 as _;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/sip128.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/sip128.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/sip128.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/sip128.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,613 @@
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! An implementation of SipHash with a 128-bit output.
+
+use core::cmp;
+use core::hash;
+use core::marker::PhantomData;
+use core::mem;
+use core::ptr;
+
+/// A 128-bit (2x64) hash output
+#[derive(Debug, Clone, Copy, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct Hash128 {
+    pub h1: u64,
+    pub h2: u64,
+}
+
+impl From<u128> for Hash128 {
+    fn from(v: u128) -> Self {
+        Hash128 {
+            h1: v as u64,
+            h2: (v >> 64) as u64,
+        }
+    }
+}
+
+impl From<Hash128> for u128 {
+    fn from(h: Hash128) -> u128 {
+        (h.h1 as u128) | ((h.h2 as u128) << 64)
+    }
+}
+
+/// An implementation of SipHash128 1-3.
+#[derive(Debug, Clone, Copy, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct SipHasher13 {
+    hasher: Hasher<Sip13Rounds>,
+}
+
+/// An implementation of SipHash128 2-4.
+#[derive(Debug, Clone, Copy, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct SipHasher24 {
+    hasher: Hasher<Sip24Rounds>,
+}
+
+/// An implementation of SipHash128 2-4.
+///
+/// SipHash is a general-purpose hashing function: it runs at a good
+/// speed (competitive with Spooky and City) and permits strong _keyed_
+/// hashing. This lets you key your hashtables from a strong RNG, such as
+/// [`rand::os::OsRng`](https://doc.rust-lang.org/rand/rand/os/struct.OsRng.html).
+///
+/// Although the SipHash algorithm is considered to be generally strong,
+/// it is not intended for cryptographic purposes. As such, all
+/// cryptographic uses of this implementation are _strongly discouraged_.
+#[derive(Debug, Clone, Copy, Default)]
+pub struct SipHasher(SipHasher24);
+
+#[derive(Debug, Copy)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+struct Hasher<S: Sip> {
+    k0: u64,
+    k1: u64,
+    length: usize, // how many bytes we've processed
+    state: State,  // hash State
+    tail: u64,     // unprocessed bytes le
+    ntail: usize,  // how many bytes in tail are valid
+    _marker: PhantomData<S>,
+}
+
+#[derive(Debug, Clone, Copy)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+struct State {
+    // v0, v2 and v1, v3 show up in pairs in the algorithm,
+    // and simd implementations of SipHash will use vectors
+    // of v02 and v13. By placing them in this order in the struct,
+    // the compiler can pick up on just a few simd optimizations by itself.
+    v0: u64,
+    v2: u64,
+    v1: u64,
+    v3: u64,
+}
+
+macro_rules! compress {
+    ($state:expr) => {{
+        compress!($state.v0, $state.v1, $state.v2, $state.v3)
+    }};
+    ($v0:expr, $v1:expr, $v2:expr, $v3:expr) => {{
+        $v0 = $v0.wrapping_add($v1);
+        $v1 = $v1.rotate_left(13);
+        $v1 ^= $v0;
+        $v0 = $v0.rotate_left(32);
+        $v2 = $v2.wrapping_add($v3);
+        $v3 = $v3.rotate_left(16);
+        $v3 ^= $v2;
+        $v0 = $v0.wrapping_add($v3);
+        $v3 = $v3.rotate_left(21);
+        $v3 ^= $v0;
+        $v2 = $v2.wrapping_add($v1);
+        $v1 = $v1.rotate_left(17);
+        $v1 ^= $v2;
+        $v2 = $v2.rotate_left(32);
+    }};
+}
+
+/// Loads an integer of the desired type from a byte stream, in LE order. Uses
+/// `copy_nonoverlapping` to let the compiler generate the most efficient way
+/// to load it from a possibly unaligned address.
+///
+/// Unsafe because: unchecked indexing at `i..i+size_of(int_ty)`
+macro_rules! load_int_le {
+    ($buf:expr, $i:expr, $int_ty:ident) => {{
+        debug_assert!($i + mem::size_of::<$int_ty>() <= $buf.len());
+        let mut data = 0 as $int_ty;
+        ptr::copy_nonoverlapping(
+            $buf.get_unchecked($i),
+            &mut data as *mut _ as *mut u8,
+            mem::size_of::<$int_ty>(),
+        );
+        data.to_le()
+    }};
+}
+
+/// Loads a u64 using up to 7 bytes of a byte slice. It looks clumsy but the
+/// `copy_nonoverlapping` calls that occur (via `load_int_le!`) all have fixed
+/// sizes and avoid calling `memcpy`, which is good for speed.
+///
+/// Unsafe because: unchecked indexing at start..start+len
+#[inline]
+unsafe fn u8to64_le(buf: &[u8], start: usize, len: usize) -> u64 {
+    debug_assert!(len < 8);
+    let mut i = 0; // current byte index (from LSB) in the output u64
+    let mut out = 0;
+    if i + 3 < len {
+        out = load_int_le!(buf, start + i, u32) as u64;
+        i += 4;
+    }
+    if i + 1 < len {
+        out |= (load_int_le!(buf, start + i, u16) as u64) << (i * 8);
+        i += 2
+    }
+    if i < len {
+        out |= (*buf.get_unchecked(start + i) as u64) << (i * 8);
+        i += 1;
+    }
+    debug_assert_eq!(i, len);
+    out
+}
+
+pub trait Hasher128 {
+    /// Return a 128-bit hash
+    fn finish128(&self) -> Hash128;
+}
+
+impl SipHasher {
+    /// Creates a new `SipHasher` with the two initial keys set to 0.
+    #[inline]
+    pub fn new() -> SipHasher {
+        SipHasher::new_with_keys(0, 0)
+    }
+
+    /// Creates a `SipHasher` that is keyed off the provided keys.
+    #[inline]
+    pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher {
+        SipHasher(SipHasher24::new_with_keys(key0, key1))
+    }
+
+    /// Get the keys used by this hasher
+    pub fn keys(&self) -> (u64, u64) {
+        (self.0.hasher.k0, self.0.hasher.k1)
+    }
+}
+
+impl Hasher128 for SipHasher {
+    /// Return a 128-bit hash
+    #[inline]
+    fn finish128(&self) -> Hash128 {
+        self.0.finish128()
+    }
+}
+
+impl SipHasher13 {
+    /// Creates a new `SipHasher13` with the two initial keys set to 0.
+    #[inline]
+    pub fn new() -> SipHasher13 {
+        SipHasher13::new_with_keys(0, 0)
+    }
+
+    /// Creates a `SipHasher13` that is keyed off the provided keys.
+    #[inline]
+    pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher13 {
+        SipHasher13 {
+            hasher: Hasher::new_with_keys(key0, key1),
+        }
+    }
+
+    /// Get the keys used by this hasher
+    pub fn keys(&self) -> (u64, u64) {
+        (self.hasher.k0, self.hasher.k1)
+    }
+}
+
+impl Hasher128 for SipHasher13 {
+    /// Return a 128-bit hash
+    #[inline]
+    fn finish128(&self) -> Hash128 {
+        self.hasher.finish128()
+    }
+}
+
+impl SipHasher24 {
+    /// Creates a new `SipHasher24` with the two initial keys set to 0.
+    #[inline]
+    pub fn new() -> SipHasher24 {
+        SipHasher24::new_with_keys(0, 0)
+    }
+
+    /// Creates a `SipHasher24` that is keyed off the provided keys.
+    #[inline]
+    pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher24 {
+        SipHasher24 {
+            hasher: Hasher::new_with_keys(key0, key1),
+        }
+    }
+
+    /// Get the keys used by this hasher
+    pub fn keys(&self) -> (u64, u64) {
+        (self.hasher.k0, self.hasher.k1)
+    }
+}
+
+impl Hasher128 for SipHasher24 {
+    /// Return a 128-bit hash
+    #[inline]
+    fn finish128(&self) -> Hash128 {
+        self.hasher.finish128()
+    }
+}
+
+impl<S: Sip> Hasher<S> {
+    #[inline]
+    fn new_with_keys(key0: u64, key1: u64) -> Hasher<S> {
+        let mut state = Hasher {
+            k0: key0,
+            k1: key1,
+            length: 0,
+            state: State {
+                v0: 0,
+                v1: 0xee,
+                v2: 0,
+                v3: 0,
+            },
+            tail: 0,
+            ntail: 0,
+            _marker: PhantomData,
+        };
+        state.reset();
+        state
+    }
+
+    #[inline]
+    fn reset(&mut self) {
+        self.length = 0;
+        self.state.v0 = self.k0 ^ 0x736f6d6570736575;
+        self.state.v1 = self.k1 ^ 0x646f72616e646f83;
+        self.state.v2 = self.k0 ^ 0x6c7967656e657261;
+        self.state.v3 = self.k1 ^ 0x7465646279746573;
+        self.ntail = 0;
+    }
+
+    // A specialized write function for values with size <= 8.
+    //
+    // The hashing of multi-byte integers depends on endianness. E.g.:
+    // - little-endian: `write_u32(0xDDCCBBAA)` == `write([0xAA, 0xBB, 0xCC, 0xDD])`
+    // - big-endian:    `write_u32(0xDDCCBBAA)` == `write([0xDD, 0xCC, 0xBB, 0xAA])`
+    //
+    // This function does the right thing for little-endian hardware. On
+    // big-endian hardware `x` must be byte-swapped first to give the right
+    // behaviour. After any byte-swapping, the input must be zero-extended to
+    // 64-bits. The caller is responsible for the byte-swapping and
+    // zero-extension.
+    #[inline]
+    fn short_write<T>(&mut self, _x: T, x: u64) {
+        let size = mem::size_of::<T>();
+        self.length += size;
+
+        // The original number must be zero-extended, not sign-extended.
+        debug_assert!(if size < 8 { x >> (8 * size) == 0 } else { true });
+
+        // The number of bytes needed to fill `self.tail`.
+        let needed = 8 - self.ntail;
+
+        self.tail |= x << (8 * self.ntail);
+        if size < needed {
+            self.ntail += size;
+            return;
+        }
+
+        // `self.tail` is full, process it.
+        self.state.v3 ^= self.tail;
+        S::c_rounds(&mut self.state);
+        self.state.v0 ^= self.tail;
+
+        self.ntail = size - needed;
+        self.tail = if needed < 8 { x >> (8 * needed) } else { 0 };
+    }
+}
+
+impl<S: Sip> Hasher<S> {
+    #[inline]
+    pub fn finish128(&self) -> Hash128 {
+        let mut state = self.state;
+
+        let b: u64 = ((self.length as u64 & 0xff) << 56) | self.tail;
+
+        state.v3 ^= b;
+        S::c_rounds(&mut state);
+        state.v0 ^= b;
+
+        state.v2 ^= 0xee;
+        S::d_rounds(&mut state);
+        let h1 = state.v0 ^ state.v1 ^ state.v2 ^ state.v3;
+
+        state.v1 ^= 0xdd;
+        S::d_rounds(&mut state);
+        let h2 = state.v0 ^ state.v1 ^ state.v2 ^ state.v3;
+
+        Hash128 { h1, h2 }
+    }
+}
+
+impl hash::Hasher for SipHasher {
+    #[inline]
+    fn write(&mut self, msg: &[u8]) {
+        self.0.write(msg)
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.0.finish()
+    }
+
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.0.write_usize(i);
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.0.write_u8(i);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.0.write_u16(i);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.0.write_u32(i);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.0.write_u64(i);
+    }
+}
+
+impl hash::Hasher for SipHasher13 {
+    #[inline]
+    fn write(&mut self, msg: &[u8]) {
+        self.hasher.write(msg)
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.hasher.finish()
+    }
+
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.hasher.write_usize(i);
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.hasher.write_u8(i);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.hasher.write_u16(i);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.hasher.write_u32(i);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.hasher.write_u64(i);
+    }
+}
+
+impl hash::Hasher for SipHasher24 {
+    #[inline]
+    fn write(&mut self, msg: &[u8]) {
+        self.hasher.write(msg)
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.hasher.finish()
+    }
+
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.hasher.write_usize(i);
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.hasher.write_u8(i);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.hasher.write_u16(i);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.hasher.write_u32(i);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.hasher.write_u64(i);
+    }
+}
+
+impl<S: Sip> hash::Hasher for Hasher<S> {
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.short_write(i, i.to_le() as u64);
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.short_write(i, i as u64);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.short_write(i, i.to_le() as u64);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.short_write(i, i.to_le() as u64);
+    }
+
+    #[inline]
+    fn write(&mut self, msg: &[u8]) {
+        let length = msg.len();
+        self.length += length;
+
+        let mut needed = 0;
+
+        if self.ntail != 0 {
+            needed = 8 - self.ntail;
+            self.tail |= unsafe { u8to64_le(msg, 0, cmp::min(length, needed)) } << (8 * self.ntail);
+            if length < needed {
+                self.ntail += length;
+                return;
+            } else {
+                self.state.v3 ^= self.tail;
+                S::c_rounds(&mut self.state);
+                self.state.v0 ^= self.tail;
+                self.ntail = 0;
+            }
+        }
+
+        // Buffered tail is now flushed, process new input.
+        let len = length - needed;
+        let left = len & 0x7;
+
+        let mut i = needed;
+        while i < len - left {
+            let mi = unsafe { load_int_le!(msg, i, u64) };
+
+            self.state.v3 ^= mi;
+            S::c_rounds(&mut self.state);
+            self.state.v0 ^= mi;
+
+            i += 8;
+        }
+
+        self.tail = unsafe { u8to64_le(msg, i, left) };
+        self.ntail = left;
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.finish128().h2
+    }
+}
+
+impl<S: Sip> Clone for Hasher<S> {
+    #[inline]
+    fn clone(&self) -> Hasher<S> {
+        Hasher {
+            k0: self.k0,
+            k1: self.k1,
+            length: self.length,
+            state: self.state,
+            tail: self.tail,
+            ntail: self.ntail,
+            _marker: self._marker,
+        }
+    }
+}
+
+impl<S: Sip> Default for Hasher<S> {
+    /// Creates a `Hasher<S>` with the two initial keys set to 0.
+    #[inline]
+    fn default() -> Hasher<S> {
+        Hasher::new_with_keys(0, 0)
+    }
+}
+
+#[doc(hidden)]
+trait Sip {
+    fn c_rounds(_: &mut State);
+    fn d_rounds(_: &mut State);
+}
+
+#[derive(Debug, Clone, Copy, Default)]
+struct Sip13Rounds;
+
+impl Sip for Sip13Rounds {
+    #[inline]
+    fn c_rounds(state: &mut State) {
+        compress!(state);
+    }
+
+    #[inline]
+    fn d_rounds(state: &mut State) {
+        compress!(state);
+        compress!(state);
+        compress!(state);
+    }
+}
+
+#[derive(Debug, Clone, Copy, Default)]
+struct Sip24Rounds;
+
+impl Sip for Sip24Rounds {
+    #[inline]
+    fn c_rounds(state: &mut State) {
+        compress!(state);
+        compress!(state);
+    }
+
+    #[inline]
+    fn d_rounds(state: &mut State) {
+        compress!(state);
+        compress!(state);
+        compress!(state);
+        compress!(state);
+    }
+}
+
+impl Hash128 {
+    /// Convert into a 16-bytes vector
+    pub fn as_bytes(&self) -> [u8; 16] {
+        let mut bytes = [0u8; 16];
+        let h1 = self.h1.to_le();
+        let h2 = self.h2.to_le();
+        unsafe {
+            ptr::copy_nonoverlapping(&h1 as *const _ as *const u8, bytes.get_unchecked_mut(0), 8);
+            ptr::copy_nonoverlapping(&h2 as *const _ as *const u8, bytes.get_unchecked_mut(8), 8);
+        }
+        bytes
+    }
+
+    /// Convert into a `u128`
+    #[inline]
+    pub fn as_u128(&self) -> u128 {
+        let h1 = self.h1.to_le();
+        let h2 = self.h2.to_le();
+        h1 as u128 | ((h2 as u128) << 64)
+    }
+
+    /// Convert into `(u64, u64)`
+    #[inline]
+    pub fn as_u64(&self) -> (u64, u64) {
+        let h1 = self.h1.to_le();
+        let h2 = self.h2.to_le();
+        (h1, h2)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/sip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/sip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/sip.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/sip.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,511 @@
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! An implementation of SipHash.
+
+use core::cmp;
+use core::hash;
+use core::marker::PhantomData;
+use core::mem;
+use core::ptr;
+
+/// An implementation of SipHash 1-3.
+///
+/// See: <https://www.aumasson.jp/siphash/siphash.pdf>
+#[derive(Debug, Clone, Copy, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct SipHasher13 {
+    hasher: Hasher<Sip13Rounds>,
+}
+
+/// An implementation of SipHash 2-4.
+///
+/// See: <https://www.aumasson.jp/siphash/siphash.pdf>
+#[derive(Debug, Clone, Copy, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct SipHasher24 {
+    hasher: Hasher<Sip24Rounds>,
+}
+
+/// An implementation of SipHash 2-4.
+///
+/// See: <https://www.aumasson.jp/siphash/siphash.pdf>
+///
+/// SipHash is a general-purpose hashing function: it runs at a good
+/// speed (competitive with Spooky and City) and permits strong _keyed_
+/// hashing. This lets you key your hashtables from a strong RNG, such as
+/// [`rand::os::OsRng`](https://doc.rust-lang.org/rand/rand/os/struct.OsRng.html).
+///
+/// Although the SipHash algorithm is considered to be generally strong,
+/// it is not intended for cryptographic purposes. As such, all
+/// cryptographic uses of this implementation are _strongly discouraged_.
+#[derive(Debug, Clone, Copy, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct SipHasher(SipHasher24);
+
+#[derive(Debug, Clone, Copy)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+struct Hasher<S: Sip> {
+    k0: u64,
+    k1: u64,
+    length: usize, // how many bytes we've processed
+    state: State,  // hash State
+    tail: u64,     // unprocessed bytes le
+    ntail: usize,  // how many bytes in tail are valid
+    _marker: PhantomData<S>,
+}
+
+#[derive(Debug, Clone, Copy)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+struct State {
+    // v0, v2 and v1, v3 show up in pairs in the algorithm,
+    // and simd implementations of SipHash will use vectors
+    // of v02 and v13. By placing them in this order in the struct,
+    // the compiler can pick up on just a few simd optimizations by itself.
+    v0: u64,
+    v2: u64,
+    v1: u64,
+    v3: u64,
+}
+
+macro_rules! compress {
+    ($state:expr) => {{
+        compress!($state.v0, $state.v1, $state.v2, $state.v3)
+    }};
+    ($v0:expr, $v1:expr, $v2:expr, $v3:expr) => {{
+        $v0 = $v0.wrapping_add($v1);
+        $v1 = $v1.rotate_left(13);
+        $v1 ^= $v0;
+        $v0 = $v0.rotate_left(32);
+        $v2 = $v2.wrapping_add($v3);
+        $v3 = $v3.rotate_left(16);
+        $v3 ^= $v2;
+        $v0 = $v0.wrapping_add($v3);
+        $v3 = $v3.rotate_left(21);
+        $v3 ^= $v0;
+        $v2 = $v2.wrapping_add($v1);
+        $v1 = $v1.rotate_left(17);
+        $v1 ^= $v2;
+        $v2 = $v2.rotate_left(32);
+    }};
+}
+
+/// Loads an integer of the desired type from a byte stream, in LE order. Uses
+/// `copy_nonoverlapping` to let the compiler generate the most efficient way
+/// to load it from a possibly unaligned address.
+///
+/// Unsafe because: unchecked indexing at `i..i+size_of(int_ty)`
+macro_rules! load_int_le {
+    ($buf:expr, $i:expr, $int_ty:ident) => {{
+        debug_assert!($i + mem::size_of::<$int_ty>() <= $buf.len());
+        let mut data = 0 as $int_ty;
+        ptr::copy_nonoverlapping(
+            $buf.get_unchecked($i),
+            &mut data as *mut _ as *mut u8,
+            mem::size_of::<$int_ty>(),
+        );
+        data.to_le()
+    }};
+}
+
+/// Loads a u64 using up to 7 bytes of a byte slice. It looks clumsy but the
+/// `copy_nonoverlapping` calls that occur (via `load_int_le!`) all have fixed
+/// sizes and avoid calling `memcpy`, which is good for speed.
+///
+/// Unsafe because: unchecked indexing at start..start+len
+#[inline]
+unsafe fn u8to64_le(buf: &[u8], start: usize, len: usize) -> u64 {
+    debug_assert!(len < 8);
+    let mut i = 0; // current byte index (from LSB) in the output u64
+    let mut out = 0;
+    if i + 3 < len {
+        out = load_int_le!(buf, start + i, u32) as u64;
+        i += 4;
+    }
+    if i + 1 < len {
+        out |= (load_int_le!(buf, start + i, u16) as u64) << (i * 8);
+        i += 2
+    }
+    if i < len {
+        out |= (*buf.get_unchecked(start + i) as u64) << (i * 8);
+        i += 1;
+    }
+    debug_assert_eq!(i, len);
+    out
+}
+
+impl SipHasher {
+    /// Creates a new `SipHasher` with the two initial keys set to 0.
+    #[inline]
+    pub fn new() -> SipHasher {
+        SipHasher::new_with_keys(0, 0)
+    }
+
+    /// Creates a `SipHasher` that is keyed off the provided keys.
+    #[inline]
+    pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher {
+        SipHasher(SipHasher24::new_with_keys(key0, key1))
+    }
+
+    /// Get the keys used by this hasher
+    pub fn keys(&self) -> (u64, u64) {
+        (self.0.hasher.k0, self.0.hasher.k1)
+    }
+}
+
+impl SipHasher13 {
+    /// Creates a new `SipHasher13` with the two initial keys set to 0.
+    #[inline]
+    pub fn new() -> SipHasher13 {
+        SipHasher13::new_with_keys(0, 0)
+    }
+
+    /// Creates a `SipHasher13` that is keyed off the provided keys.
+    #[inline]
+    pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher13 {
+        SipHasher13 {
+            hasher: Hasher::new_with_keys(key0, key1),
+        }
+    }
+
+    /// Get the keys used by this hasher
+    pub fn keys(&self) -> (u64, u64) {
+        (self.hasher.k0, self.hasher.k1)
+    }
+}
+
+impl SipHasher24 {
+    /// Creates a new `SipHasher24` with the two initial keys set to 0.
+    #[inline]
+    pub fn new() -> SipHasher24 {
+        SipHasher24::new_with_keys(0, 0)
+    }
+
+    /// Creates a `SipHasher24` that is keyed off the provided keys.
+    #[inline]
+    pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher24 {
+        SipHasher24 {
+            hasher: Hasher::new_with_keys(key0, key1),
+        }
+    }
+
+    /// Get the keys used by this hasher
+    pub fn keys(&self) -> (u64, u64) {
+        (self.hasher.k0, self.hasher.k1)
+    }
+}
+
+impl<S: Sip> Hasher<S> {
+    #[inline]
+    fn new_with_keys(key0: u64, key1: u64) -> Hasher<S> {
+        let mut state = Hasher {
+            k0: key0,
+            k1: key1,
+            length: 0,
+            state: State {
+                v0: 0,
+                v1: 0,
+                v2: 0,
+                v3: 0,
+            },
+            tail: 0,
+            ntail: 0,
+            _marker: PhantomData,
+        };
+        state.reset();
+        state
+    }
+
+    #[inline]
+    fn reset(&mut self) {
+        self.length = 0;
+        self.state.v0 = self.k0 ^ 0x736f6d6570736575;
+        self.state.v1 = self.k1 ^ 0x646f72616e646f6d;
+        self.state.v2 = self.k0 ^ 0x6c7967656e657261;
+        self.state.v3 = self.k1 ^ 0x7465646279746573;
+        self.ntail = 0;
+    }
+
+    // A specialized write function for values with size <= 8.
+    //
+    // The hashing of multi-byte integers depends on endianness. E.g.:
+    // - little-endian: `write_u32(0xDDCCBBAA)` == `write([0xAA, 0xBB, 0xCC, 0xDD])`
+    // - big-endian:    `write_u32(0xDDCCBBAA)` == `write([0xDD, 0xCC, 0xBB, 0xAA])`
+    //
+    // This function does the right thing for little-endian hardware. On
+    // big-endian hardware `x` must be byte-swapped first to give the right
+    // behaviour. After any byte-swapping, the input must be zero-extended to
+    // 64-bits. The caller is responsible for the byte-swapping and
+    // zero-extension.
+    #[inline]
+    fn short_write<T>(&mut self, _x: T, x: u64) {
+        let size = mem::size_of::<T>();
+        self.length += size;
+
+        // The original number must be zero-extended, not sign-extended.
+        debug_assert!(if size < 8 { x >> (8 * size) == 0 } else { true });
+
+        // The number of bytes needed to fill `self.tail`.
+        let needed = 8 - self.ntail;
+
+        self.tail |= x << (8 * self.ntail);
+        if size < needed {
+            self.ntail += size;
+            return;
+        }
+
+        // `self.tail` is full, process it.
+        self.state.v3 ^= self.tail;
+        S::c_rounds(&mut self.state);
+        self.state.v0 ^= self.tail;
+
+        self.ntail = size - needed;
+        self.tail = if needed < 8 { x >> (8 * needed) } else { 0 };
+    }
+}
+
+impl hash::Hasher for SipHasher {
+    #[inline]
+    fn write(&mut self, msg: &[u8]) {
+        self.0.write(msg)
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.0.finish()
+    }
+
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.0.write_usize(i);
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.0.write_u8(i);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.0.write_u16(i);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.0.write_u32(i);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.0.write_u64(i);
+    }
+}
+
+impl hash::Hasher for SipHasher13 {
+    #[inline]
+    fn write(&mut self, msg: &[u8]) {
+        self.hasher.write(msg)
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.hasher.finish()
+    }
+
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.hasher.write_usize(i);
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.hasher.write_u8(i);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.hasher.write_u16(i);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.hasher.write_u32(i);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.hasher.write_u64(i);
+    }
+}
+
+impl hash::Hasher for SipHasher24 {
+    #[inline]
+    fn write(&mut self, msg: &[u8]) {
+        self.hasher.write(msg)
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        self.hasher.finish()
+    }
+
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.hasher.write_usize(i);
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.hasher.write_u8(i);
+    }
+
+    #[inline]
+    fn write_u16(&mut self, i: u16) {
+        self.hasher.write_u16(i);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.hasher.write_u32(i);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.hasher.write_u64(i);
+    }
+}
+
+impl<S: Sip> hash::Hasher for Hasher<S> {
+    #[inline]
+    fn write_usize(&mut self, i: usize) {
+        self.short_write(i, i.to_le() as u64);
+    }
+
+    #[inline]
+    fn write_u8(&mut self, i: u8) {
+        self.short_write(i, i as u64);
+    }
+
+    #[inline]
+    fn write_u32(&mut self, i: u32) {
+        self.short_write(i, i.to_le() as u64);
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.short_write(i, i.to_le() as u64);
+    }
+
+    #[inline]
+    fn write(&mut self, msg: &[u8]) {
+        let length = msg.len();
+        self.length += length;
+
+        let mut needed = 0;
+
+        if self.ntail != 0 {
+            needed = 8 - self.ntail;
+            self.tail |= unsafe { u8to64_le(msg, 0, cmp::min(length, needed)) } << (8 * self.ntail);
+            if length < needed {
+                self.ntail += length;
+                return;
+            } else {
+                self.state.v3 ^= self.tail;
+                S::c_rounds(&mut self.state);
+                self.state.v0 ^= self.tail;
+                self.ntail = 0;
+            }
+        }
+
+        // Buffered tail is now flushed, process new input.
+        let len = length - needed;
+        let left = len & 0x7;
+
+        let mut i = needed;
+        while i < len - left {
+            let mi = unsafe { load_int_le!(msg, i, u64) };
+
+            self.state.v3 ^= mi;
+            S::c_rounds(&mut self.state);
+            self.state.v0 ^= mi;
+
+            i += 8;
+        }
+
+        self.tail = unsafe { u8to64_le(msg, i, left) };
+        self.ntail = left;
+    }
+
+    #[inline]
+    fn finish(&self) -> u64 {
+        let mut state = self.state;
+
+        let b: u64 = ((self.length as u64 & 0xff) << 56) | self.tail;
+
+        state.v3 ^= b;
+        S::c_rounds(&mut state);
+        state.v0 ^= b;
+
+        state.v2 ^= 0xff;
+        S::d_rounds(&mut state);
+
+        state.v0 ^ state.v1 ^ state.v2 ^ state.v3
+    }
+}
+
+impl<S: Sip> Default for Hasher<S> {
+    /// Creates a `Hasher<S>` with the two initial keys set to 0.
+    #[inline]
+    fn default() -> Hasher<S> {
+        Hasher::new_with_keys(0, 0)
+    }
+}
+
+#[doc(hidden)]
+trait Sip {
+    fn c_rounds(_: &mut State);
+    fn d_rounds(_: &mut State);
+}
+
+#[derive(Debug, Clone, Copy, Default)]
+struct Sip13Rounds;
+
+impl Sip for Sip13Rounds {
+    #[inline]
+    fn c_rounds(state: &mut State) {
+        compress!(state);
+    }
+
+    #[inline]
+    fn d_rounds(state: &mut State) {
+        compress!(state);
+        compress!(state);
+        compress!(state);
+    }
+}
+
+#[derive(Debug, Clone, Copy, Default)]
+struct Sip24Rounds;
+
+impl Sip for Sip24Rounds {
+    #[inline]
+    fn c_rounds(state: &mut State) {
+        compress!(state);
+        compress!(state);
+    }
+
+    #[inline]
+    fn d_rounds(state: &mut State) {
+        compress!(state);
+        compress!(state);
+        compress!(state);
+        compress!(state);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/tests128.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/tests128.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/tests128.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/tests128.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,103 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use super::sip128::{Hasher128, SipHasher, SipHasher13, SipHasher24};
+use std::hash::{Hash, Hasher};
+
+// Hash just the bytes of the slice, without length prefix
+struct Bytes<'a>(&'a [u8]);
+
+impl<'a> Hash for Bytes<'a> {
+    #[allow(unused_must_use)]
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        let Bytes(v) = *self;
+        state.write(v);
+    }
+}
+
+fn hash_with<H: Hasher + Hasher128, T: Hash>(mut st: H, x: &T) -> [u8; 16] {
+    x.hash(&mut st);
+    st.finish128().as_bytes()
+}
+
+fn hash<T: Hash>(x: &T) -> [u8; 16] {
+    hash_with(SipHasher::new(), x)
+}
+
+#[test]
+#[allow(unused_must_use)]
+fn test_siphash128_1_3() {
+    let vecs: [[u8; 16]; 1] = [[
+        231, 126, 188, 178, 39, 136, 165, 190, 253, 98, 219, 106, 221, 48, 48, 1,
+    ]];
+
+    let k0 = 0x_07_06_05_04_03_02_01_00;
+    let k1 = 0x_0f_0e_0d_0c_0b_0a_09_08;
+    let mut buf = Vec::new();
+    let mut t = 0;
+    let mut state_inc = SipHasher13::new_with_keys(k0, k1);
+
+    while t < 1 {
+        let vec = vecs[t];
+        let out = hash_with(SipHasher13::new_with_keys(k0, k1), &Bytes(&buf));
+        assert_eq!(vec, out[..]);
+
+        let full = hash_with(SipHasher13::new_with_keys(k0, k1), &Bytes(&buf));
+        let i = state_inc.finish128().as_bytes();
+
+        assert_eq!(full, i);
+        assert_eq!(full, vec);
+
+        buf.push(t as u8);
+        Hasher::write(&mut state_inc, &[t as u8]);
+
+        t += 1;
+    }
+}
+
+#[test]
+#[allow(unused_must_use)]
+fn test_siphash128_2_4() {
+    let vecs: [[u8; 16]; 1] = [[
+        163, 129, 127, 4, 186, 37, 168, 230, 109, 246, 114, 20, 199, 85, 2, 147,
+    ]];
+
+    let k0 = 0x_07_06_05_04_03_02_01_00;
+    let k1 = 0x_0f_0e_0d_0c_0b_0a_09_08;
+    let mut buf = Vec::new();
+    let mut t = 0;
+    let mut state_inc = SipHasher24::new_with_keys(k0, k1);
+
+    while t < 1 {
+        let vec = vecs[t];
+        let out = hash_with(SipHasher24::new_with_keys(k0, k1), &Bytes(&buf));
+        assert_eq!(vec, out[..]);
+
+        let full = hash_with(SipHasher24::new_with_keys(k0, k1), &Bytes(&buf));
+        let i = state_inc.finish128().as_bytes();
+
+        assert_eq!(full, i);
+        assert_eq!(full, vec);
+
+        buf.push(t as u8);
+        Hasher::write(&mut state_inc, &[t as u8]);
+
+        t += 1;
+    }
+}
+
+#[test]
+fn test_siphash128_serde() {
+    let val64 = 0xdead_beef_dead_beef_u64;
+    let hash = hash(&val64);
+    let serialized = serde_json::to_string(&hash).unwrap();
+    let deserialized: [u8; 16] = serde_json::from_str(&serialized).unwrap();
+    assert_eq!(hash, deserialized);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/siphasher/src/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/siphasher/src/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,331 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use super::sip::{SipHasher, SipHasher13, SipHasher24};
+use std::hash::{Hash, Hasher};
+
+// Hash just the bytes of the slice, without length prefix
+struct Bytes<'a>(&'a [u8]);
+
+impl<'a> Hash for Bytes<'a> {
+    #[allow(unused_must_use)]
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        let Bytes(v) = *self;
+        state.write(v);
+    }
+}
+
+macro_rules! u8to64_le {
+    ($buf:expr, $i:expr) => {
+        $buf[0 + $i] as u64
+            | ($buf[1 + $i] as u64) << 8
+            | ($buf[2 + $i] as u64) << 16
+            | ($buf[3 + $i] as u64) << 24
+            | ($buf[4 + $i] as u64) << 32
+            | ($buf[5 + $i] as u64) << 40
+            | ($buf[6 + $i] as u64) << 48
+            | ($buf[7 + $i] as u64) << 56
+    };
+    ($buf:expr, $i:expr, $len:expr) => {{
+        let mut t = 0;
+        let mut out = 0;
+        while t < $len {
+            out |= ($buf[t + $i] as u64) << t * 8;
+            t += 1;
+        }
+        out
+    }};
+}
+
+fn hash_with<H: Hasher, T: Hash>(mut st: H, x: &T) -> u64 {
+    x.hash(&mut st);
+    st.finish()
+}
+
+fn hash<T: Hash>(x: &T) -> u64 {
+    hash_with(SipHasher::new(), x)
+}
+
+#[test]
+#[allow(unused_must_use)]
+fn test_siphash_1_3() {
+    let vecs: [[u8; 8]; 64] = [
+        [0xdc, 0xc4, 0x0f, 0x05, 0x58, 0x01, 0xac, 0xab],
+        [0x93, 0xca, 0x57, 0x7d, 0xf3, 0x9b, 0xf4, 0xc9],
+        [0x4d, 0xd4, 0xc7, 0x4d, 0x02, 0x9b, 0xcb, 0x82],
+        [0xfb, 0xf7, 0xdd, 0xe7, 0xb8, 0x0a, 0xf8, 0x8b],
+        [0x28, 0x83, 0xd3, 0x88, 0x60, 0x57, 0x75, 0xcf],
+        [0x67, 0x3b, 0x53, 0x49, 0x2f, 0xd5, 0xf9, 0xde],
+        [0xa7, 0x22, 0x9f, 0xc5, 0x50, 0x2b, 0x0d, 0xc5],
+        [0x40, 0x11, 0xb1, 0x9b, 0x98, 0x7d, 0x92, 0xd3],
+        [0x8e, 0x9a, 0x29, 0x8d, 0x11, 0x95, 0x90, 0x36],
+        [0xe4, 0x3d, 0x06, 0x6c, 0xb3, 0x8e, 0xa4, 0x25],
+        [0x7f, 0x09, 0xff, 0x92, 0xee, 0x85, 0xde, 0x79],
+        [0x52, 0xc3, 0x4d, 0xf9, 0xc1, 0x18, 0xc1, 0x70],
+        [0xa2, 0xd9, 0xb4, 0x57, 0xb1, 0x84, 0xa3, 0x78],
+        [0xa7, 0xff, 0x29, 0x12, 0x0c, 0x76, 0x6f, 0x30],
+        [0x34, 0x5d, 0xf9, 0xc0, 0x11, 0xa1, 0x5a, 0x60],
+        [0x56, 0x99, 0x51, 0x2a, 0x6d, 0xd8, 0x20, 0xd3],
+        [0x66, 0x8b, 0x90, 0x7d, 0x1a, 0xdd, 0x4f, 0xcc],
+        [0x0c, 0xd8, 0xdb, 0x63, 0x90, 0x68, 0xf2, 0x9c],
+        [0x3e, 0xe6, 0x73, 0xb4, 0x9c, 0x38, 0xfc, 0x8f],
+        [0x1c, 0x7d, 0x29, 0x8d, 0xe5, 0x9d, 0x1f, 0xf2],
+        [0x40, 0xe0, 0xcc, 0xa6, 0x46, 0x2f, 0xdc, 0xc0],
+        [0x44, 0xf8, 0x45, 0x2b, 0xfe, 0xab, 0x92, 0xb9],
+        [0x2e, 0x87, 0x20, 0xa3, 0x9b, 0x7b, 0xfe, 0x7f],
+        [0x23, 0xc1, 0xe6, 0xda, 0x7f, 0x0e, 0x5a, 0x52],
+        [0x8c, 0x9c, 0x34, 0x67, 0xb2, 0xae, 0x64, 0xf4],
+        [0x79, 0x09, 0x5b, 0x70, 0x28, 0x59, 0xcd, 0x45],
+        [0xa5, 0x13, 0x99, 0xca, 0xe3, 0x35, 0x3e, 0x3a],
+        [0x35, 0x3b, 0xde, 0x4a, 0x4e, 0xc7, 0x1d, 0xa9],
+        [0x0d, 0xd0, 0x6c, 0xef, 0x02, 0xed, 0x0b, 0xfb],
+        [0xf4, 0xe1, 0xb1, 0x4a, 0xb4, 0x3c, 0xd9, 0x88],
+        [0x63, 0xe6, 0xc5, 0x43, 0xd6, 0x11, 0x0f, 0x54],
+        [0xbc, 0xd1, 0x21, 0x8c, 0x1f, 0xdd, 0x70, 0x23],
+        [0x0d, 0xb6, 0xa7, 0x16, 0x6c, 0x7b, 0x15, 0x81],
+        [0xbf, 0xf9, 0x8f, 0x7a, 0xe5, 0xb9, 0x54, 0x4d],
+        [0x3e, 0x75, 0x2a, 0x1f, 0x78, 0x12, 0x9f, 0x75],
+        [0x91, 0x6b, 0x18, 0xbf, 0xbe, 0xa3, 0xa1, 0xce],
+        [0x06, 0x62, 0xa2, 0xad, 0xd3, 0x08, 0xf5, 0x2c],
+        [0x57, 0x30, 0xc3, 0xa3, 0x2d, 0x1c, 0x10, 0xb6],
+        [0xa1, 0x36, 0x3a, 0xae, 0x96, 0x74, 0xf4, 0xb3],
+        [0x92, 0x83, 0x10, 0x7b, 0x54, 0x57, 0x6b, 0x62],
+        [0x31, 0x15, 0xe4, 0x99, 0x32, 0x36, 0xd2, 0xc1],
+        [0x44, 0xd9, 0x1a, 0x3f, 0x92, 0xc1, 0x7c, 0x66],
+        [0x25, 0x88, 0x13, 0xc8, 0xfe, 0x4f, 0x70, 0x65],
+        [0xa6, 0x49, 0x89, 0xc2, 0xd1, 0x80, 0xf2, 0x24],
+        [0x6b, 0x87, 0xf8, 0xfa, 0xed, 0x1c, 0xca, 0xc2],
+        [0x96, 0x21, 0x04, 0x9f, 0xfc, 0x4b, 0x16, 0xc2],
+        [0x23, 0xd6, 0xb1, 0x68, 0x93, 0x9c, 0x6e, 0xa1],
+        [0xfd, 0x14, 0x51, 0x8b, 0x9c, 0x16, 0xfb, 0x49],
+        [0x46, 0x4c, 0x07, 0xdf, 0xf8, 0x43, 0x31, 0x9f],
+        [0xb3, 0x86, 0xcc, 0x12, 0x24, 0xaf, 0xfd, 0xc6],
+        [0x8f, 0x09, 0x52, 0x0a, 0xd1, 0x49, 0xaf, 0x7e],
+        [0x9a, 0x2f, 0x29, 0x9d, 0x55, 0x13, 0xf3, 0x1c],
+        [0x12, 0x1f, 0xf4, 0xa2, 0xdd, 0x30, 0x4a, 0xc4],
+        [0xd0, 0x1e, 0xa7, 0x43, 0x89, 0xe9, 0xfa, 0x36],
+        [0xe6, 0xbc, 0xf0, 0x73, 0x4c, 0xb3, 0x8f, 0x31],
+        [0x80, 0xe9, 0xa7, 0x70, 0x36, 0xbf, 0x7a, 0xa2],
+        [0x75, 0x6d, 0x3c, 0x24, 0xdb, 0xc0, 0xbc, 0xb4],
+        [0x13, 0x15, 0xb7, 0xfd, 0x52, 0xd8, 0xf8, 0x23],
+        [0x08, 0x8a, 0x7d, 0xa6, 0x4d, 0x5f, 0x03, 0x8f],
+        [0x48, 0xf1, 0xe8, 0xb7, 0xe5, 0xd0, 0x9c, 0xd8],
+        [0xee, 0x44, 0xa6, 0xf7, 0xbc, 0xe6, 0xf4, 0xf6],
+        [0xf2, 0x37, 0x18, 0x0f, 0xd8, 0x9a, 0xc5, 0xae],
+        [0xe0, 0x94, 0x66, 0x4b, 0x15, 0xf6, 0xb2, 0xc3],
+        [0xa8, 0xb3, 0xbb, 0xb7, 0x62, 0x90, 0x19, 0x9d],
+    ];
+
+    let k0 = 0x_07_06_05_04_03_02_01_00;
+    let k1 = 0x_0f_0e_0d_0c_0b_0a_09_08;
+    let mut buf = Vec::new();
+    let mut t = 0;
+    let mut state_inc = SipHasher13::new_with_keys(k0, k1);
+
+    while t < 64 {
+        let vec = u8to64_le!(vecs[t], 0);
+        let out = hash_with(SipHasher13::new_with_keys(k0, k1), &Bytes(&buf));
+        assert_eq!(vec, out);
+
+        let full = hash_with(SipHasher13::new_with_keys(k0, k1), &Bytes(&buf));
+        let i = state_inc.finish();
+
+        assert_eq!(full, i);
+        assert_eq!(full, vec);
+
+        buf.push(t as u8);
+        Hasher::write(&mut state_inc, &[t as u8]);
+
+        t += 1;
+    }
+}
+
+#[test]
+#[allow(unused_must_use)]
+fn test_siphash_2_4() {
+    let vecs: [[u8; 8]; 64] = [
+        [0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72],
+        [0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74],
+        [0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d],
+        [0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85],
+        [0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf],
+        [0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18],
+        [0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb],
+        [0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab],
+        [0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93],
+        [0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e],
+        [0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a],
+        [0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4],
+        [0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75],
+        [0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14],
+        [0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7],
+        [0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1],
+        [0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f],
+        [0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69],
+        [0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b],
+        [0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb],
+        [0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe],
+        [0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0],
+        [0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93],
+        [0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8],
+        [0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8],
+        [0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc],
+        [0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17],
+        [0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f],
+        [0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde],
+        [0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6],
+        [0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad],
+        [0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32],
+        [0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71],
+        [0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7],
+        [0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12],
+        [0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15],
+        [0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31],
+        [0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02],
+        [0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca],
+        [0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a],
+        [0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e],
+        [0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad],
+        [0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18],
+        [0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4],
+        [0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9],
+        [0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9],
+        [0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb],
+        [0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0],
+        [0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6],
+        [0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7],
+        [0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee],
+        [0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1],
+        [0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a],
+        [0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81],
+        [0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f],
+        [0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24],
+        [0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7],
+        [0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea],
+        [0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60],
+        [0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66],
+        [0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c],
+        [0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f],
+        [0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5],
+        [0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95],
+    ];
+
+    let k0 = 0x_07_06_05_04_03_02_01_00;
+    let k1 = 0x_0f_0e_0d_0c_0b_0a_09_08;
+    let mut buf = Vec::new();
+    let mut t = 0;
+    let mut state_inc = SipHasher24::new_with_keys(k0, k1);
+
+    while t < 64 {
+        let vec = u8to64_le!(vecs[t], 0);
+        let out = hash_with(SipHasher24::new_with_keys(k0, k1), &Bytes(&buf));
+        assert_eq!(vec, out);
+
+        let full = hash_with(SipHasher24::new_with_keys(k0, k1), &Bytes(&buf));
+        let i = state_inc.finish();
+
+        assert_eq!(full, i);
+        assert_eq!(full, vec);
+
+        buf.push(t as u8);
+        Hasher::write(&mut state_inc, &[t as u8]);
+
+        t += 1;
+    }
+}
+#[test]
+#[cfg(target_arch = "arm")]
+fn test_hash_usize() {
+    let val = 0xdeadbeef_deadbeef_u64;
+    assert_ne!(hash(&(val as u64)), hash(&(val as usize)));
+    assert_eq!(hash(&(val as u32)), hash(&(val as usize)));
+}
+#[test]
+#[cfg(target_arch = "x86_64")]
+fn test_hash_usize() {
+    let val = 0xdead_beef_dead_beef_u64;
+    assert_eq!(hash(&(val as u64)), hash(&(val as usize)));
+    assert_ne!(hash(&(val as u32)), hash(&(val as usize)));
+}
+#[test]
+#[cfg(target_arch = "x86")]
+fn test_hash_usize() {
+    let val = 0xdeadbeef_deadbeef_u64;
+    assert_ne!(hash(&(val as u64)), hash(&(val as usize)));
+    assert_eq!(hash(&(val as u32)), hash(&(val as usize)));
+}
+
+#[test]
+fn test_hash_idempotent() {
+    let val64 = 0xdead_beef_dead_beef_u64;
+    assert_eq!(hash(&val64), hash(&val64));
+    let val32 = 0xdeadbeef_u32;
+    assert_eq!(hash(&val32), hash(&val32));
+}
+
+#[test]
+fn test_hash_no_bytes_dropped_64() {
+    let val = 0xdead_beef_dead_beef_u64;
+
+    assert_ne!(hash(&val), hash(&zero_byte(val, 0)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 1)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 2)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 3)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 4)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 5)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 6)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 7)));
+
+    fn zero_byte(val: u64, byte: usize) -> u64 {
+        assert!(byte < 8);
+        val & !(0xff << (byte * 8))
+    }
+}
+
+#[test]
+fn test_hash_no_bytes_dropped_32() {
+    let val = 0xdeadbeef_u32;
+
+    assert_ne!(hash(&val), hash(&zero_byte(val, 0)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 1)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 2)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 3)));
+
+    fn zero_byte(val: u32, byte: usize) -> u32 {
+        assert!(byte < 4);
+        val & !(0xff << (byte * 8))
+    }
+}
+
+#[test]
+fn test_hash_no_concat_alias() {
+    let s = ("aa", "bb");
+    let t = ("aabb", "");
+    let u = ("a", "abb");
+
+    assert!(s != t && t != u);
+    assert!(hash(&s) != hash(&t) && hash(&s) != hash(&u));
+
+    let u = [1, 0, 0, 0];
+    let v = (&u[..1], &u[1..3], &u[3..]);
+    let w = (&u[..], &u[4..4], &u[4..4]);
+
+    assert_ne!(v, w);
+    assert_ne!(hash(&v), hash(&w));
+}
+
+#[test]
+fn test_hash_serde() {
+    let val64 = 0xdead_beef_dead_beef_u64;
+    let hash = hash(&val64);
+    let serialized = serde_json::to_string(&hash).unwrap();
+    let deserialized: u64 = serde_json::from_str(&serialized).unwrap();
+    assert_eq!(hash, deserialized);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"f6f61243fdf15892a03150fad73f0e9bb959845e91596df87d1733874800f34e","Cargo.toml":"c28fd4f04c85aa8099590d4f3b120902a0466c1cf3cbfa2aace227b8389fc173","LICENSE":"8ce0830173fdac609dfb4ea603fdc002c2f4af0dc9b1a005653f5da9cf534b18","README.md":"8b455097ac90777929da00702b384d9b363bb8535e292df2f98d2f2ff321eff5","src/lib.rs":"a78013cc8ceb83bf096b035cda8710474b0c353bcd52a46e5d27ef0efb636f5c","tests/slab.rs":"f9be8e2a6f54285c61238b0a1cde26f7591a7abad5a22a42ea6d195679c1bd91"},"package":"c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"1a149a1a99147a38cdb31bffad7385d7e00d8d60b61a2af28fe5a7ff738ae796","Cargo.toml":"fade7f2a2c66209949c4aedaf4b0505027133e72cd1b65f78ae9e216a547be17","LICENSE":"8ce0830173fdac609dfb4ea603fdc002c2f4af0dc9b1a005653f5da9cf534b18","README.md":"6b7d00e9fc318b890c746d74f62c5f229d06b5cb39a02cb7614b0b887e2d33ba","src/lib.rs":"d5ae89f12005c7cc97b9f43bab531b90fd13c99f1f144b10b34696303ef37ece","src/serde.rs":"a0aaf61b886bdee7fd44b24a12177e5c04e2b1f9857ae644977aab18fbffff6b","tests/serde.rs":"bb28112509dbb6949528802d05a1b1e34d2e5ff9d3ba5f62aa801cfb3de7a78e","tests/slab.rs":"cd13735fcf63546caecfbbe3205247e183443f5d4e3ba28d8c2f1fe5f9b313b7"},"package":"c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,22 +3,38 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "slab"
-version = "0.4.2"
+version = "0.4.4"
 authors = ["Carl Lerche <me@carllerche.com>"]
+exclude = ["/.*"]
 description = "Pre-allocated storage for a uniform data type"
-homepage = "https://github.com/carllerche/slab"
-documentation = "https://docs.rs/slab/0.4.2/slab/"
+homepage = "https://github.com/tokio-rs/slab"
+documentation = "https://docs.rs/slab"
 readme = "README.md"
-keywords = ["slab", "allocator"]
-categories = ["memory-management", "data-structures"]
+keywords = ["slab", "allocator", "no_std"]
+categories = ["memory-management", "data-structures", "no-std"]
 license = "MIT"
-repository = "https://github.com/carllerche/slab"
+repository = "https://github.com/tokio-rs/slab"
+[dependencies.serde]
+version = "1.0.95"
+features = ["alloc"]
+optional = true
+default-features = false
+[dev-dependencies.serde]
+version = "1"
+features = ["derive"]
+
+[dev-dependencies.serde_test]
+version = "1"
+
+[features]
+default = ["std"]
+std = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,23 @@
+# 0.4.4 (August 06, 2021)
+
+* Fix panic in `FromIterator` impl (#102)
+* Fix compatibility with older clippy versions (#104)
+* Add `try_remove` method (#89)
+* Implement `ExactSizeIterator` and `FusedIterator` for iterators (#92)
+
+# 0.4.3 (April 20, 2021)
+
+* Add no_std support for Rust 1.36 and above (#71).
+* Add `get2_mut` and `get2_unchecked_mut` methods (#65).
+* Make `shrink_to_fit()` remove trailing vacant entries (#62).
+* Implement `FromIterator<(usize, T)>` (#62).
+* Implement `IntoIterator<Item = (usize, T)>` (#62).
+* Provide `size_hint()` of the iterators (#62).
+* Make all iterators reversible (#62).
+* Add `key_of()` method (#61)
+* Add `compact()` method (#60)
+* Add support for serde (#85)
+
 # 0.4.2 (January 11, 2019)
 
 * Add `Slab::drain` (#56).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,10 +2,15 @@
 
 Pre-allocated storage for a uniform data type.
 
-[![Crates.io](https://img.shields.io/crates/v/slab.svg?maxAge=2592000)](https://crates.io/crates/slab)
-[![Build Status](https://travis-ci.org/carllerche/slab.svg?branch=master)](https://travis-ci.org/carllerche/slab)
+[![Crates.io][crates-badge]][crates-url]
+[![Build Status][ci-badge]][ci-url]
 
-[Documentation](https://docs.rs/slab/0.4.2/slab/)
+[crates-badge]: https://img.shields.io/crates/v/slab
+[crates-url]: https://crates.io/crates/slab
+[ci-badge]: https://img.shields.io/github/workflow/status/tokio-rs/slab/CI/master
+[ci-url]: https://github.com/tokio-rs/slab/actions
+
+[Documentation](https://docs.rs/slab)
 
 ## Usage
 
@@ -13,14 +18,12 @@
 
 ```toml
 [dependencies]
-slab = "0.4.2"
+slab = "0.4"
 ```
 
 Next, add this to your crate:
 
 ```rust
-extern crate slab;
-
 use slab::Slab;
 
 let mut slab = Slab::new();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,14 @@
-#![doc(html_root_url = "https://docs.rs/slab/0.4.2")]
-#![deny(warnings, missing_docs, missing_debug_implementations)]
-#![cfg_attr(test, deny(warnings, unreachable_pub))]
+#![cfg_attr(not(feature = "std"), no_std)]
+#![warn(
+    missing_debug_implementations,
+    missing_docs,
+    rust_2018_idioms,
+    unreachable_pub
+)]
+#![doc(test(
+    no_crate_inject,
+    attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
+))]
 
 //! Pre-allocated storage for a uniform data type.
 //!
@@ -102,10 +110,17 @@
 //!
 //! [`Slab::with_capacity`]: struct.Slab.html#with_capacity
 
-use std::iter::IntoIterator;
-use std::ops;
-use std::vec;
-use std::{fmt, mem};
+#[cfg(not(feature = "std"))]
+extern crate alloc;
+#[cfg(feature = "std")]
+extern crate std as alloc;
+
+#[cfg(feature = "serde")]
+mod serde;
+
+use alloc::vec::{self, Vec};
+use core::iter::{self, FromIterator, FusedIterator};
+use core::{fmt, mem, ops, slice};
 
 /// Pre-allocated storage for a uniform data type
 ///
@@ -154,25 +169,34 @@
 /// assert_eq!("hello", slab[hello].1);
 /// ```
 #[derive(Debug)]
-pub struct VacantEntry<'a, T: 'a> {
+pub struct VacantEntry<'a, T> {
     slab: &'a mut Slab<T>,
     key: usize,
 }
 
+/// A consuming iterator over the values stored in a `Slab`
+pub struct IntoIter<T> {
+    entries: iter::Enumerate<vec::IntoIter<Entry<T>>>,
+    len: usize,
+}
+
 /// An iterator over the values stored in the `Slab`
-pub struct Iter<'a, T: 'a> {
-    entries: std::slice::Iter<'a, Entry<T>>,
-    curr: usize,
+pub struct Iter<'a, T> {
+    entries: iter::Enumerate<slice::Iter<'a, Entry<T>>>,
+    len: usize,
 }
 
 /// A mutable iterator over the values stored in the `Slab`
-pub struct IterMut<'a, T: 'a> {
-    entries: std::slice::IterMut<'a, Entry<T>>,
-    curr: usize,
+pub struct IterMut<'a, T> {
+    entries: iter::Enumerate<slice::IterMut<'a, Entry<T>>>,
+    len: usize,
 }
 
 /// A draining iterator for `Slab`
-pub struct Drain<'a, T: 'a>(vec::Drain<'a, Entry<T>>);
+pub struct Drain<'a, T> {
+    inner: vec::Drain<'a, Entry<T>>,
+    len: usize,
+}
 
 #[derive(Clone)]
 enum Entry<T> {
@@ -274,7 +298,7 @@
         if self.capacity() - self.len >= additional {
             return;
         }
-        let need_add = self.len + additional - self.entries.len();
+        let need_add = additional - (self.entries.len() - self.len);
         self.entries.reserve(need_add);
     }
 
@@ -282,7 +306,7 @@
     /// more values.
     ///
     /// `reserve_exact` does nothing if the slab already has sufficient capacity
-    /// for `additional` more valus. If more capacity is required, a new segment
+    /// for `additional` more values. If more capacity is required, a new segment
     /// of memory will be allocated and all existing values will be copied into
     /// it.  As such, if the slab is already very large, a call to `reserve` can
     /// end up being expensive.
@@ -308,16 +332,19 @@
         if self.capacity() - self.len >= additional {
             return;
         }
-        let need_add = self.len + additional - self.entries.len();
+        let need_add = additional - (self.entries.len() - self.len);
         self.entries.reserve_exact(need_add);
     }
 
-    /// Shrink the capacity of the slab as much as possible.
+    /// Shrink the capacity of the slab as much as possible without invalidating keys.
     ///
-    /// It will drop down as close as possible to the length but the allocator
-    /// may still inform the vector that there is space for a few more elements.
-    /// Also, since values are not moved, the slab cannot shrink past any stored
-    /// values.
+    /// Because values cannot be moved to a different index, the slab cannot
+    /// shrink past any stored values.
+    /// It will drop down as close as possible to the length but the allocator may
+    /// still inform the underlying vector that there is space for a few more elements.
+    ///
+    /// This function can take O(n) time even when the capacity cannot be reduced
+    /// or the allocation is shrunk in place. Repeated calls run in O(1) though.
     ///
     /// # Examples
     ///
@@ -329,33 +356,171 @@
     ///     slab.insert(i);
     /// }
     ///
-    /// assert_eq!(slab.capacity(), 10);
     /// slab.shrink_to_fit();
-    /// assert!(slab.capacity() >= 3);
+    /// assert!(slab.capacity() >= 3 && slab.capacity() < 10);
     /// ```
     ///
-    /// In this case, even though two values are removed, the slab cannot shrink
-    /// past the last value.
+    /// The slab cannot shrink past the last present value even if previous
+    /// values are removed:
     ///
     /// ```
     /// # use slab::*;
     /// let mut slab = Slab::with_capacity(10);
     ///
-    /// for i in 0..3 {
+    /// for i in 0..4 {
     ///     slab.insert(i);
     /// }
     ///
     /// slab.remove(0);
-    /// slab.remove(1);
+    /// slab.remove(3);
     ///
-    /// assert_eq!(slab.capacity(), 10);
     /// slab.shrink_to_fit();
-    /// assert!(slab.capacity() >= 3);
+    /// assert!(slab.capacity() >= 3 && slab.capacity() < 10);
     /// ```
     pub fn shrink_to_fit(&mut self) {
+        // Remove all vacant entries after the last occupied one, so that
+        // the capacity can be reduced to what is actually needed.
+        // If the slab is empty the vector can simply be cleared, but that
+        // optimization would not affect time complexity when T: Drop.
+        let len_before = self.entries.len();
+        while let Some(&Entry::Vacant(_)) = self.entries.last() {
+            self.entries.pop();
+        }
+
+        // Removing entries breaks the list of vacant entries,
+        // so it must be repaired
+        if self.entries.len() != len_before {
+            // Some vacant entries were removed, so the list now likely¹
+            // either contains references to the removed entries, or has an
+            // invalid end marker. Fix this by recreating the list.
+            self.recreate_vacant_list();
+            // ¹: If the removed entries formed the tail of the list, with the
+            // most recently popped entry being the head of them, (so that its
+            // index is now the end marker) the list is still valid.
+            // Checking for that unlikely scenario of this infrequently called
+            // is not worth the code complexity.
+        }
+
         self.entries.shrink_to_fit();
     }
 
+    /// Iterate through all entries to recreate and repair the vacant list.
+    /// self.len must be correct and is not modified.
+    fn recreate_vacant_list(&mut self) {
+        self.next = self.entries.len();
+        // We can stop once we've found all vacant entries
+        let mut remaining_vacant = self.entries.len() - self.len;
+        // Iterate in reverse order so that lower keys are at the start of
+        // the vacant list. This way future shrinks are more likely to be
+        // able to remove vacant entries.
+        for (i, entry) in self.entries.iter_mut().enumerate().rev() {
+            if remaining_vacant == 0 {
+                break;
+            }
+            if let Entry::Vacant(ref mut next) = *entry {
+                *next = self.next;
+                self.next = i;
+                remaining_vacant -= 1;
+            }
+        }
+    }
+
+    /// Reduce the capacity as much as possible, changing the key for elements when necessary.
+    ///
+    /// To allow updating references to the elements which must be moved to a new key,
+    /// this function takes a closure which is called before moving each element.
+    /// The second and third parameters to the closure are the current key and
+    /// new key respectively.
+    /// In case changing the key for one element turns out not to be possible,
+    /// the move can be cancelled by returning `false` from the closure.
+    /// In that case no further attempts at relocating elements is made.
+    /// If the closure unwinds, the slab will be left in a consistent state,
+    /// but the value that the closure panicked on might be removed.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use slab::*;
+    ///
+    /// let mut slab = Slab::with_capacity(10);
+    /// let a = slab.insert('a');
+    /// slab.insert('b');
+    /// slab.insert('c');
+    /// slab.remove(a);
+    /// slab.compact(|&mut value, from, to| {
+    ///     assert_eq!((value, from, to), ('c', 2, 0));
+    ///     true
+    /// });
+    /// assert!(slab.capacity() >= 2 && slab.capacity() < 10);
+    /// ```
+    ///
+    /// The value is not moved when the closure returns `Err`:
+    ///
+    /// ```
+    /// # use slab::*;
+    ///
+    /// let mut slab = Slab::with_capacity(100);
+    /// let a = slab.insert('a');
+    /// let b = slab.insert('b');
+    /// slab.remove(a);
+    /// slab.compact(|&mut value, from, to| false);
+    /// assert_eq!(slab.iter().next(), Some((b, &'b')));
+    /// ```
+    pub fn compact<F>(&mut self, mut rekey: F)
+    where
+        F: FnMut(&mut T, usize, usize) -> bool,
+    {
+        // If the closure unwinds, we need to restore a valid list of vacant entries
+        struct CleanupGuard<'a, T> {
+            slab: &'a mut Slab<T>,
+            decrement: bool,
+        }
+        impl<T> Drop for CleanupGuard<'_, T> {
+            fn drop(&mut self) {
+                if self.decrement {
+                    // Value was popped and not pushed back on
+                    self.slab.len -= 1;
+                }
+                self.slab.recreate_vacant_list();
+            }
+        }
+        let mut guard = CleanupGuard {
+            slab: self,
+            decrement: true,
+        };
+
+        let mut occupied_until = 0;
+        // While there are vacant entries
+        while guard.slab.entries.len() > guard.slab.len {
+            // Find a value that needs to be moved,
+            // by popping entries until we find an occupied one.
+            // (entries cannot be empty because 0 is not greater than anything)
+            if let Some(Entry::Occupied(mut value)) = guard.slab.entries.pop() {
+                // Found one, now find a vacant entry to move it to
+                while let Some(&Entry::Occupied(_)) = guard.slab.entries.get(occupied_until) {
+                    occupied_until += 1;
+                }
+                // Let the caller try to update references to the key
+                if !rekey(&mut value, guard.slab.entries.len(), occupied_until) {
+                    // Changing the key failed, so push the entry back on at its old index.
+                    guard.slab.entries.push(Entry::Occupied(value));
+                    guard.decrement = false;
+                    guard.slab.entries.shrink_to_fit();
+                    return;
+                    // Guard drop handles cleanup
+                }
+                // Put the value in its new spot
+                guard.slab.entries[occupied_until] = Entry::Occupied(value);
+                // ... and mark it as occupied (this is optional)
+                occupied_until += 1;
+            }
+        }
+        guard.slab.next = guard.slab.len;
+        guard.slab.entries.shrink_to_fit();
+        // Normal cleanup is not necessary
+        mem::forget(guard);
+    }
+
     /// Clear the slab of all values.
     ///
     /// # Examples
@@ -435,10 +600,10 @@
     /// assert_eq!(iterator.next(), Some((2, &2)));
     /// assert_eq!(iterator.next(), None);
     /// ```
-    pub fn iter(&self) -> Iter<T> {
+    pub fn iter(&self) -> Iter<'_, T> {
         Iter {
-            entries: self.entries.iter(),
-            curr: 0,
+            entries: self.entries.iter().enumerate(),
+            len: self.len,
         }
     }
 
@@ -467,10 +632,10 @@
     /// assert_eq!(slab[key1], 2);
     /// assert_eq!(slab[key2], 1);
     /// ```
-    pub fn iter_mut(&mut self) -> IterMut<T> {
+    pub fn iter_mut(&mut self) -> IterMut<'_, T> {
         IterMut {
-            entries: self.entries.iter_mut(),
-            curr: 0,
+            entries: self.entries.iter_mut().enumerate(),
+            len: self.len,
         }
     }
 
@@ -520,11 +685,64 @@
         }
     }
 
+    /// Return two mutable references to the values associated with the two
+    /// given keys simultaneously.
+    ///
+    /// If any one of the given keys is not associated with a value, then `None`
+    /// is returned.
+    ///
+    /// This function can be used to get two mutable references out of one slab,
+    /// so that you can manipulate both of them at the same time, eg. swap them.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use slab::*;
+    /// use std::mem;
+    ///
+    /// let mut slab = Slab::new();
+    /// let key1 = slab.insert(1);
+    /// let key2 = slab.insert(2);
+    /// let (value1, value2) = slab.get2_mut(key1, key2).unwrap();
+    /// mem::swap(value1, value2);
+    /// assert_eq!(slab[key1], 2);
+    /// assert_eq!(slab[key2], 1);
+    /// ```
+    pub fn get2_mut(&mut self, key1: usize, key2: usize) -> Option<(&mut T, &mut T)> {
+        assert!(key1 != key2);
+
+        let (entry1, entry2);
+
+        if key1 > key2 {
+            let (slice1, slice2) = self.entries.split_at_mut(key1);
+            entry1 = slice2.get_mut(0);
+            entry2 = slice1.get_mut(key2);
+        } else {
+            let (slice1, slice2) = self.entries.split_at_mut(key2);
+            entry1 = slice1.get_mut(key1);
+            entry2 = slice2.get_mut(0);
+        }
+
+        match (entry1, entry2) {
+            (
+                Some(&mut Entry::Occupied(ref mut val1)),
+                Some(&mut Entry::Occupied(ref mut val2)),
+            ) => Some((val1, val2)),
+            _ => None,
+        }
+    }
+
     /// Return a reference to the value associated with the given key without
     /// performing bounds checking.
     ///
+    /// For a safe alternative see [`get`](Slab::get).
+    ///
     /// This function should be used with care.
     ///
+    /// # Safety
+    ///
+    /// The key must be within bounds.
+    ///
     /// # Examples
     ///
     /// ```
@@ -546,8 +764,14 @@
     /// Return a mutable reference to the value associated with the given key
     /// without performing bounds checking.
     ///
+    /// For a safe alternative see [`get_mut`](Slab::get_mut).
+    ///
     /// This function should be used with care.
     ///
+    /// # Safety
+    ///
+    /// The key must be within bounds.
+    ///
     /// # Examples
     ///
     /// ```
@@ -569,6 +793,95 @@
         }
     }
 
+    /// Return two mutable references to the values associated with the two
+    /// given keys simultaneously without performing bounds checking and safety
+    /// condition checking.
+    ///
+    /// For a safe alternative see [`get2_mut`](Slab::get2_mut).
+    ///
+    /// This function should be used with care.
+    ///
+    /// # Safety
+    ///
+    /// - Both keys must be within bounds.
+    /// - The condition `key1 != key2` must hold.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use slab::*;
+    /// use std::mem;
+    ///
+    /// let mut slab = Slab::new();
+    /// let key1 = slab.insert(1);
+    /// let key2 = slab.insert(2);
+    /// let (value1, value2) = unsafe { slab.get2_unchecked_mut(key1, key2) };
+    /// mem::swap(value1, value2);
+    /// assert_eq!(slab[key1], 2);
+    /// assert_eq!(slab[key2], 1);
+    /// ```
+    pub unsafe fn get2_unchecked_mut(&mut self, key1: usize, key2: usize) -> (&mut T, &mut T) {
+        let ptr1 = self.entries.get_unchecked_mut(key1) as *mut Entry<T>;
+        let ptr2 = self.entries.get_unchecked_mut(key2) as *mut Entry<T>;
+        match (&mut *ptr1, &mut *ptr2) {
+            (&mut Entry::Occupied(ref mut val1), &mut Entry::Occupied(ref mut val2)) => {
+                (val1, val2)
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    /// Get the key for an element in the slab.
+    ///
+    /// The reference must point to an element owned by the slab.
+    /// Otherwise this function will panic.
+    /// This is a constant-time operation because the key can be calculated
+    /// from the reference with pointer arithmetic.
+    ///
+    /// # Panics
+    ///
+    /// This function will panic if the reference does not point to an element
+    /// of the slab.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use slab::*;
+    ///
+    /// let mut slab = Slab::new();
+    /// let key = slab.insert(String::from("foo"));
+    /// let value = &slab[key];
+    /// assert_eq!(slab.key_of(value), key);
+    /// ```
+    ///
+    /// Values are not compared, so passing a reference to a different location
+    /// will result in a panic:
+    ///
+    /// ```should_panic
+    /// # use slab::*;
+    ///
+    /// let mut slab = Slab::new();
+    /// let key = slab.insert(0);
+    /// let bad = &0;
+    /// slab.key_of(bad); // this will panic
+    /// unreachable!();
+    /// ```
+    pub fn key_of(&self, present_element: &T) -> usize {
+        let element_ptr = present_element as *const T as usize;
+        let base_ptr = self.entries.as_ptr() as usize;
+        // Use wrapping subtraction in case the reference is bad
+        let byte_offset = element_ptr.wrapping_sub(base_ptr);
+        // The division rounds away any offset of T inside Entry
+        // The size of Entry<T> is never zero even if T is due to Vacant(usize)
+        let key = byte_offset / mem::size_of::<Entry<T>>();
+        // Prevent returning unspecified (but out of bounds) values
+        if key >= self.entries.len() {
+            panic!("The reference points to a value outside this slab");
+        }
+        // The reference cannot point to a vacant entry, because then it would not be valid
+        key
+    }
+
     /// Insert a value in the slab, returning key assigned to the value.
     ///
     /// The returned key can later be used to retrieve or remove the value using indexed
@@ -618,7 +931,7 @@
     /// assert_eq!(hello, slab[hello].0);
     /// assert_eq!("hello", slab[hello].1);
     /// ```
-    pub fn vacant_entry(&mut self) -> VacantEntry<T> {
+    pub fn vacant_entry(&mut self) -> VacantEntry<'_, T> {
         VacantEntry {
             key: self.next,
             slab: self,
@@ -632,15 +945,49 @@
             self.entries.push(Entry::Occupied(val));
             self.next = key + 1;
         } else {
-            let prev = mem::replace(&mut self.entries[key], Entry::Occupied(val));
+            self.next = match self.entries.get(key) {
+                Some(&Entry::Vacant(next)) => next,
+                _ => unreachable!(),
+            };
+            self.entries[key] = Entry::Occupied(val);
+        }
+    }
+
+    /// Tries to remove the value associated with the given key,
+    /// returning the value if the key existed.
+    ///
+    /// The key is then released and may be associated with future stored
+    /// values.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use slab::*;
+    /// let mut slab = Slab::new();
+    ///
+    /// let hello = slab.insert("hello");
+    ///
+    /// assert_eq!(slab.try_remove(hello), Some("hello"));
+    /// assert!(!slab.contains(hello));
+    /// ```
+    pub fn try_remove(&mut self, key: usize) -> Option<T> {
+        if let Some(entry) = self.entries.get_mut(key) {
+            // Swap the entry at the provided value
+            let prev = mem::replace(entry, Entry::Vacant(self.next));
 
             match prev {
-                Entry::Vacant(next) => {
-                    self.next = next;
+                Entry::Occupied(val) => {
+                    self.len -= 1;
+                    self.next = key;
+                    return val.into();
+                }
+                _ => {
+                    // Woops, the entry is actually vacant, restore the state
+                    *entry = prev;
                 }
-                _ => unreachable!(),
             }
         }
+        None
     }
 
     /// Remove and return the value associated with the given key.
@@ -664,21 +1011,7 @@
     /// assert!(!slab.contains(hello));
     /// ```
     pub fn remove(&mut self, key: usize) -> T {
-        // Swap the entry at the provided value
-        let prev = mem::replace(&mut self.entries[key], Entry::Vacant(self.next));
-
-        match prev {
-            Entry::Occupied(val) => {
-                self.len -= 1;
-                self.next = key;
-                val
-            }
-            _ => {
-                // Woops, the entry is actually vacant, restore the state
-                self.entries[key] = prev;
-                panic!("invalid key");
-            }
-        }
+        self.try_remove(key).expect("invalid key")
     }
 
     /// Return `true` if a value is associated with the given key.
@@ -697,13 +1030,10 @@
     /// assert!(!slab.contains(hello));
     /// ```
     pub fn contains(&self, key: usize) -> bool {
-        self.entries
-            .get(key)
-            .map(|e| match *e {
-                Entry::Occupied(_) => true,
-                _ => false,
-            })
-            .unwrap_or(false)
+        match self.entries.get(key) {
+            Some(&Entry::Occupied(_)) => true,
+            _ => false,
+        }
     }
 
     /// Retain only the elements specified by the predicate.
@@ -773,10 +1103,14 @@
     ///
     /// assert!(slab.is_empty());
     /// ```
-    pub fn drain(&mut self) -> Drain<T> {
+    pub fn drain(&mut self) -> Drain<'_, T> {
+        let old_len = self.len;
         self.len = 0;
         self.next = 0;
-        Drain(self.entries.drain(..))
+        Drain {
+            inner: self.entries.drain(..),
+            len: old_len,
+        }
     }
 }
 
@@ -784,8 +1118,8 @@
     type Output = T;
 
     fn index(&self, key: usize) -> &T {
-        match self.entries[key] {
-            Entry::Occupied(ref v) => v,
+        match self.entries.get(key) {
+            Some(&Entry::Occupied(ref v)) => v,
             _ => panic!("invalid key"),
         }
     }
@@ -793,13 +1127,25 @@
 
 impl<T> ops::IndexMut<usize> for Slab<T> {
     fn index_mut(&mut self, key: usize) -> &mut T {
-        match self.entries[key] {
-            Entry::Occupied(ref mut v) => v,
+        match self.entries.get_mut(key) {
+            Some(&mut Entry::Occupied(ref mut v)) => v,
             _ => panic!("invalid key"),
         }
     }
 }
 
+impl<T> IntoIterator for Slab<T> {
+    type Item = (usize, T);
+    type IntoIter = IntoIter<T>;
+
+    fn into_iter(self) -> IntoIter<T> {
+        IntoIter {
+            entries: self.entries.into_iter().enumerate(),
+            len: self.len,
+        }
+    }
+}
+
 impl<'a, T> IntoIterator for &'a Slab<T> {
     type Item = (usize, &'a T);
     type IntoIter = Iter<'a, T>;
@@ -818,46 +1164,137 @@
     }
 }
 
+/// Create a slab from an iterator of key-value pairs.
+///
+/// If the iterator produces duplicate keys, the previous value is replaced with the later one.
+/// The keys does not need to be sorted beforehand, and this function always
+/// takes O(n) time.
+/// Note that the returned slab will use space proportional to the largest key,
+/// so don't use `Slab` with untrusted keys.
+///
+/// # Examples
+///
+/// ```
+/// # use slab::*;
+///
+/// let vec = vec![(2,'a'), (6,'b'), (7,'c')];
+/// let slab = vec.into_iter().collect::<Slab<char>>();
+/// assert_eq!(slab.len(), 3);
+/// assert!(slab.capacity() >= 8);
+/// assert_eq!(slab[2], 'a');
+/// ```
+///
+/// With duplicate and unsorted keys:
+///
+/// ```
+/// # use slab::*;
+///
+/// let vec = vec![(20,'a'), (10,'b'), (11,'c'), (10,'d')];
+/// let slab = vec.into_iter().collect::<Slab<char>>();
+/// assert_eq!(slab.len(), 3);
+/// assert_eq!(slab[10], 'd');
+/// ```
+impl<T> FromIterator<(usize, T)> for Slab<T> {
+    fn from_iter<I>(iterable: I) -> Self
+    where
+        I: IntoIterator<Item = (usize, T)>,
+    {
+        let iterator = iterable.into_iter();
+        let mut slab = Self::with_capacity(iterator.size_hint().0);
+
+        let mut vacant_list_broken = false;
+        let mut first_vacant_index = None;
+        for (key, value) in iterator {
+            if key < slab.entries.len() {
+                // iterator is not sorted, might need to recreate vacant list
+                if let Entry::Vacant(_) = slab.entries[key] {
+                    vacant_list_broken = true;
+                    slab.len += 1;
+                }
+                // if an element with this key already exists, replace it.
+                // This is consistent with HashMap and BtreeMap
+                slab.entries[key] = Entry::Occupied(value);
+            } else {
+                if first_vacant_index.is_none() && slab.entries.len() < key {
+                    first_vacant_index = Some(slab.entries.len());
+                }
+                // insert holes as necessary
+                while slab.entries.len() < key {
+                    // add the entry to the start of the vacant list
+                    let next = slab.next;
+                    slab.next = slab.entries.len();
+                    slab.entries.push(Entry::Vacant(next));
+                }
+                slab.entries.push(Entry::Occupied(value));
+                slab.len += 1;
+            }
+        }
+        if slab.len == slab.entries.len() {
+            // no vacant entries, so next might not have been updated
+            slab.next = slab.entries.len();
+        } else if vacant_list_broken {
+            slab.recreate_vacant_list();
+        } else if let Some(first_vacant_index) = first_vacant_index {
+            let next = slab.entries.len();
+            match &mut slab.entries[first_vacant_index] {
+                Entry::Vacant(n) => *n = next,
+                _ => unreachable!(),
+            }
+        } else {
+            unreachable!()
+        }
+
+        slab
+    }
+}
+
 impl<T> fmt::Debug for Slab<T>
 where
     T: fmt::Debug,
 {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            fmt,
-            "Slab {{ len: {}, cap: {} }}",
-            self.len,
-            self.capacity()
-        )
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Slab")
+            .field("len", &self.len)
+            .field("cap", &self.capacity())
+            .finish()
+    }
+}
+
+impl<T> fmt::Debug for IntoIter<T>
+where
+    T: fmt::Debug,
+{
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Iter")
+            .field("remaining", &self.len)
+            .finish()
     }
 }
 
-impl<'a, T: 'a> fmt::Debug for Iter<'a, T>
+impl<T> fmt::Debug for Iter<'_, T>
 where
     T: fmt::Debug,
 {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Iter")
-            .field("curr", &self.curr)
-            .field("remaining", &self.entries.len())
+            .field("remaining", &self.len)
             .finish()
     }
 }
 
-impl<'a, T: 'a> fmt::Debug for IterMut<'a, T>
+impl<T> fmt::Debug for IterMut<'_, T>
 where
     T: fmt::Debug,
 {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("IterMut")
-            .field("curr", &self.curr)
-            .field("remaining", &self.entries.len())
+            .field("remaining", &self.len)
             .finish()
     }
 }
 
-impl<'a, T: 'a> fmt::Debug for Drain<'a, T> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+impl<T> fmt::Debug for Drain<'_, T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Drain").finish()
     }
 }
@@ -890,8 +1327,8 @@
     pub fn insert(self, val: T) -> &'a mut T {
         self.slab.insert_at(self.key, val);
 
-        match self.slab.entries[self.key] {
-            Entry::Occupied(ref mut v) => v,
+        match self.slab.entries.get_mut(self.key) {
+            Some(&mut Entry::Occupied(ref mut v)) => v,
             _ => unreachable!(),
         }
     }
@@ -922,56 +1359,178 @@
     }
 }
 
+// ===== IntoIter =====
+
+impl<T> Iterator for IntoIter<T> {
+    type Item = (usize, T);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        for (key, entry) in &mut self.entries {
+            if let Entry::Occupied(v) = entry {
+                self.len -= 1;
+                return Some((key, v));
+            }
+        }
+
+        debug_assert_eq!(self.len, 0);
+        None
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.len, Some(self.len))
+    }
+}
+
+impl<T> DoubleEndedIterator for IntoIter<T> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        while let Some((key, entry)) = self.entries.next_back() {
+            if let Entry::Occupied(v) = entry {
+                self.len -= 1;
+                return Some((key, v));
+            }
+        }
+
+        debug_assert_eq!(self.len, 0);
+        None
+    }
+}
+
+impl<T> ExactSizeIterator for IntoIter<T> {
+    fn len(&self) -> usize {
+        self.len
+    }
+}
+
+impl<T> FusedIterator for IntoIter<T> {}
+
 // ===== Iter =====
 
 impl<'a, T> Iterator for Iter<'a, T> {
     type Item = (usize, &'a T);
 
-    fn next(&mut self) -> Option<(usize, &'a T)> {
-        while let Some(entry) = self.entries.next() {
-            let curr = self.curr;
-            self.curr += 1;
+    fn next(&mut self) -> Option<Self::Item> {
+        for (key, entry) in &mut self.entries {
+            if let Entry::Occupied(ref v) = *entry {
+                self.len -= 1;
+                return Some((key, v));
+            }
+        }
 
+        debug_assert_eq!(self.len, 0);
+        None
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.len, Some(self.len))
+    }
+}
+
+impl<T> DoubleEndedIterator for Iter<'_, T> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        while let Some((key, entry)) = self.entries.next_back() {
             if let Entry::Occupied(ref v) = *entry {
-                return Some((curr, v));
+                self.len -= 1;
+                return Some((key, v));
             }
         }
 
+        debug_assert_eq!(self.len, 0);
         None
     }
 }
 
+impl<T> ExactSizeIterator for Iter<'_, T> {
+    fn len(&self) -> usize {
+        self.len
+    }
+}
+
+impl<T> FusedIterator for Iter<'_, T> {}
+
 // ===== IterMut =====
 
 impl<'a, T> Iterator for IterMut<'a, T> {
     type Item = (usize, &'a mut T);
 
-    fn next(&mut self) -> Option<(usize, &'a mut T)> {
-        while let Some(entry) = self.entries.next() {
-            let curr = self.curr;
-            self.curr += 1;
+    fn next(&mut self) -> Option<Self::Item> {
+        for (key, entry) in &mut self.entries {
+            if let Entry::Occupied(ref mut v) = *entry {
+                self.len -= 1;
+                return Some((key, v));
+            }
+        }
+
+        debug_assert_eq!(self.len, 0);
+        None
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.len, Some(self.len))
+    }
+}
 
+impl<T> DoubleEndedIterator for IterMut<'_, T> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        while let Some((key, entry)) = self.entries.next_back() {
             if let Entry::Occupied(ref mut v) = *entry {
-                return Some((curr, v));
+                self.len -= 1;
+                return Some((key, v));
             }
         }
 
+        debug_assert_eq!(self.len, 0);
         None
     }
 }
 
+impl<T> ExactSizeIterator for IterMut<'_, T> {
+    fn len(&self) -> usize {
+        self.len
+    }
+}
+
+impl<T> FusedIterator for IterMut<'_, T> {}
+
 // ===== Drain =====
 
-impl<'a, T> Iterator for Drain<'a, T> {
+impl<T> Iterator for Drain<'_, T> {
     type Item = T;
 
-    fn next(&mut self) -> Option<T> {
-        while let Some(entry) = self.0.next() {
+    fn next(&mut self) -> Option<Self::Item> {
+        for entry in &mut self.inner {
             if let Entry::Occupied(v) = entry {
+                self.len -= 1;
                 return Some(v);
             }
         }
 
+        debug_assert_eq!(self.len, 0);
         None
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.len, Some(self.len))
+    }
+}
+
+impl<T> DoubleEndedIterator for Drain<'_, T> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        while let Some(entry) = self.inner.next_back() {
+            if let Entry::Occupied(v) = entry {
+                self.len -= 1;
+                return Some(v);
+            }
+        }
+
+        debug_assert_eq!(self.len, 0);
+        None
+    }
+}
+
+impl<T> ExactSizeIterator for Drain<'_, T> {
+    fn len(&self) -> usize {
+        self.len
+    }
 }
+
+impl<T> FusedIterator for Drain<'_, T> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/src/serde.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/src/serde.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/src/serde.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/src/serde.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,101 @@
+use core::fmt;
+use core::marker::PhantomData;
+
+use serde::de::{Deserialize, Deserializer, MapAccess, Visitor};
+use serde::ser::{Serialize, SerializeMap, Serializer};
+
+use super::{Entry, Slab};
+
+impl<T> Serialize for Slab<T>
+where
+    T: Serialize,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut map_serializer = serializer.serialize_map(Some(self.len()))?;
+        for (key, value) in self {
+            map_serializer.serialize_key(&key)?;
+            map_serializer.serialize_value(value)?;
+        }
+        map_serializer.end()
+    }
+}
+
+struct SlabVisitor<T>(PhantomData<T>);
+
+impl<'de, T> Visitor<'de> for SlabVisitor<T>
+where
+    T: Deserialize<'de>,
+{
+    type Value = Slab<T>;
+
+    fn expecting(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "a map")
+    }
+
+    fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
+    where
+        A: MapAccess<'de>,
+    {
+        let mut slab = Slab::with_capacity(map.size_hint().unwrap_or(0));
+
+        // same as FromIterator impl
+        let mut vacant_list_broken = false;
+        let mut first_vacant_index = None;
+        while let Some((key, value)) = map.next_entry()? {
+            if key < slab.entries.len() {
+                // iterator is not sorted, might need to recreate vacant list
+                if let Entry::Vacant(_) = slab.entries[key] {
+                    vacant_list_broken = true;
+                    slab.len += 1;
+                }
+                // if an element with this key already exists, replace it.
+                // This is consistent with HashMap and BtreeMap
+                slab.entries[key] = Entry::Occupied(value);
+            } else {
+                if first_vacant_index.is_none() && slab.entries.len() < key {
+                    first_vacant_index = Some(slab.entries.len());
+                }
+                // insert holes as necessary
+                while slab.entries.len() < key {
+                    // add the entry to the start of the vacant list
+                    let next = slab.next;
+                    slab.next = slab.entries.len();
+                    slab.entries.push(Entry::Vacant(next));
+                }
+                slab.entries.push(Entry::Occupied(value));
+                slab.len += 1;
+            }
+        }
+        if slab.len == slab.entries.len() {
+            // no vacant entries, so next might not have been updated
+            slab.next = slab.entries.len();
+        } else if vacant_list_broken {
+            slab.recreate_vacant_list();
+        } else if let Some(first_vacant_index) = first_vacant_index {
+            let next = slab.entries.len();
+            match &mut slab.entries[first_vacant_index] {
+                Entry::Vacant(n) => *n = next,
+                _ => unreachable!(),
+            }
+        } else {
+            unreachable!()
+        }
+
+        Ok(slab)
+    }
+}
+
+impl<'de, T> Deserialize<'de> for Slab<T>
+where
+    T: Deserialize<'de>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_map(SlabVisitor(PhantomData))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/tests/serde.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/tests/serde.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/tests/serde.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/tests/serde.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,49 @@
+#![cfg(feature = "serde")]
+#![warn(rust_2018_idioms)]
+
+use serde::{Deserialize, Serialize};
+use serde_test::{assert_tokens, Token};
+use slab::Slab;
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(transparent)]
+struct SlabPartialEq<T>(Slab<T>);
+
+impl<T: PartialEq> PartialEq for SlabPartialEq<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.0.len() == other.0.len()
+            && self
+                .0
+                .iter()
+                .zip(other.0.iter())
+                .all(|(this, other)| this.0 == other.0 && this.1 == other.1)
+    }
+}
+
+#[test]
+fn test_serde_empty() {
+    let slab = Slab::<usize>::new();
+    assert_tokens(
+        &SlabPartialEq(slab),
+        &[Token::Map { len: Some(0) }, Token::MapEnd],
+    );
+}
+
+#[test]
+fn test_serde() {
+    let vec = vec![(1, 2), (3, 4), (5, 6)];
+    let slab: Slab<_> = vec.iter().cloned().collect();
+    assert_tokens(
+        &SlabPartialEq(slab),
+        &[
+            Token::Map { len: Some(3) },
+            Token::U64(1),
+            Token::I32(2),
+            Token::U64(3),
+            Token::I32(4),
+            Token::U64(5),
+            Token::I32(6),
+            Token::MapEnd,
+        ],
+    );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/tests/slab.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/tests/slab.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/slab/tests/slab.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/slab/tests/slab.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,9 @@
-extern crate slab;
+#![warn(rust_2018_idioms)]
 
 use slab::*;
 
+use std::panic::{catch_unwind, resume_unwind, AssertUnwindSafe};
+
 #[test]
 fn insert_get_remove_one() {
     let mut slab = Slab::new();
@@ -82,14 +84,21 @@
 }
 
 #[test]
-#[should_panic]
+#[should_panic(expected = "invalid key")]
 fn invalid_get_panics() {
     let slab = Slab::<usize>::with_capacity(1);
-    slab[0];
+    let _ = &slab[0];
+}
+
+#[test]
+#[should_panic(expected = "invalid key")]
+fn invalid_get_mut_panics() {
+    let mut slab = Slab::<usize>::new();
+    let _ = &mut slab[0];
 }
 
 #[test]
-#[should_panic]
+#[should_panic(expected = "invalid key")]
 fn double_remove_panics() {
     let mut slab = Slab::<usize>::with_capacity(1);
     let key = slab.insert(123);
@@ -98,7 +107,7 @@
 }
 
 #[test]
-#[should_panic]
+#[should_panic(expected = "invalid key")]
 fn invalid_remove_panics() {
     let mut slab = Slab::<usize>::with_capacity(1);
     slab.remove(0);
@@ -117,6 +126,34 @@
 }
 
 #[test]
+fn key_of_tagged() {
+    let mut slab = Slab::new();
+    slab.insert(0);
+    assert_eq!(slab.key_of(&slab[0]), 0);
+}
+
+#[test]
+fn key_of_layout_optimizable() {
+    // Entry<&str> doesn't need a discriminant tag because it can use the
+    // nonzero-ness of ptr and store Vacant's next at the same offset as len
+    let mut slab = Slab::new();
+    slab.insert("foo");
+    slab.insert("bar");
+    let third = slab.insert("baz");
+    slab.insert("quux");
+    assert_eq!(slab.key_of(&slab[third]), third);
+}
+
+#[test]
+fn key_of_zst() {
+    let mut slab = Slab::new();
+    slab.insert(());
+    let second = slab.insert(());
+    slab.insert(());
+    assert_eq!(slab.key_of(&slab[second]), second);
+}
+
+#[test]
 fn reserve_does_not_allocate_if_available() {
     let mut slab = Slab::with_capacity(10);
     let mut keys = vec![];
@@ -150,11 +187,27 @@
 
     assert!(slab.capacity() - slab.len() == 8);
 
-    slab.reserve(8);
+    slab.reserve_exact(8);
     assert_eq!(10, slab.capacity());
 }
 
 #[test]
+#[should_panic(expected = "capacity overflow")]
+fn reserve_does_panic_with_capacity_overflow() {
+    let mut slab = Slab::with_capacity(10);
+    slab.insert(true);
+    slab.reserve(std::usize::MAX);
+}
+
+#[test]
+#[should_panic(expected = "capacity overflow")]
+fn reserve_exact_does_panic_with_capacity_overflow() {
+    let mut slab = Slab::with_capacity(10);
+    slab.insert(true);
+    slab.reserve_exact(std::usize::MAX);
+}
+
+#[test]
 fn retain() {
     let mut slab = Slab::with_capacity(2);
 
@@ -185,6 +238,43 @@
 }
 
 #[test]
+fn into_iter() {
+    let mut slab = Slab::new();
+
+    for i in 0..8 {
+        slab.insert(i);
+    }
+    slab.remove(0);
+    slab.remove(4);
+    slab.remove(5);
+    slab.remove(7);
+
+    let vals: Vec<_> = slab
+        .into_iter()
+        .inspect(|&(key, val)| assert_eq!(key, val))
+        .map(|(_, val)| val)
+        .collect();
+    assert_eq!(vals, vec![1, 2, 3, 6]);
+}
+
+#[test]
+fn into_iter_rev() {
+    let mut slab = Slab::new();
+
+    for i in 0..4 {
+        slab.insert(i);
+    }
+
+    let mut iter = slab.into_iter();
+    assert_eq!(iter.next_back(), Some((3, 3)));
+    assert_eq!(iter.next_back(), Some((2, 2)));
+    assert_eq!(iter.next(), Some((0, 0)));
+    assert_eq!(iter.next_back(), Some((1, 1)));
+    assert_eq!(iter.next_back(), None);
+    assert_eq!(iter.next(), None);
+}
+
+#[test]
 fn iter() {
     let mut slab = Slab::new();
 
@@ -209,6 +299,19 @@
 }
 
 #[test]
+fn iter_rev() {
+    let mut slab = Slab::new();
+
+    for i in 0..4 {
+        slab.insert(i);
+    }
+    slab.remove(0);
+
+    let vals = slab.iter().rev().collect::<Vec<_>>();
+    assert_eq!(vals, vec![(3, &3), (2, &2), (1, &1)]);
+}
+
+#[test]
 fn iter_mut() {
     let mut slab = Slab::new();
 
@@ -218,7 +321,7 @@
 
     for (i, (key, e)) in slab.iter_mut().enumerate() {
         assert_eq!(i, key);
-        *e = *e + 1;
+        *e += 1;
     }
 
     let vals: Vec<_> = slab.iter().map(|(_, r)| *r).collect();
@@ -227,7 +330,7 @@
     slab.remove(2);
 
     for (_, e) in slab.iter_mut() {
-        *e = *e + 1;
+        *e += 1;
     }
 
     let vals: Vec<_> = slab.iter().map(|(_, r)| *r).collect();
@@ -235,6 +338,102 @@
 }
 
 #[test]
+fn iter_mut_rev() {
+    let mut slab = Slab::new();
+
+    for i in 0..4 {
+        slab.insert(i);
+    }
+    slab.remove(2);
+
+    {
+        let mut iter = slab.iter_mut();
+        assert_eq!(iter.next(), Some((0, &mut 0)));
+        let mut prev_key = !0;
+        for (key, e) in iter.rev() {
+            *e += 10;
+            assert!(prev_key > key);
+            prev_key = key;
+        }
+    }
+
+    assert_eq!(slab[0], 0);
+    assert_eq!(slab[1], 11);
+    assert_eq!(slab[3], 13);
+    assert!(!slab.contains(2));
+}
+
+#[test]
+fn from_iterator_sorted() {
+    let mut slab = (0..5).map(|i| (i, i)).collect::<Slab<_>>();
+    assert_eq!(slab.len(), 5);
+    assert_eq!(slab[0], 0);
+    assert_eq!(slab[2], 2);
+    assert_eq!(slab[4], 4);
+    assert_eq!(slab.vacant_entry().key(), 5);
+}
+
+#[test]
+fn from_iterator_new_in_order() {
+    // all new keys come in increasing order, but existing keys are overwritten
+    let mut slab = [(0, 'a'), (1, 'a'), (1, 'b'), (0, 'b'), (9, 'a'), (0, 'c')]
+        .iter()
+        .cloned()
+        .collect::<Slab<_>>();
+    assert_eq!(slab.len(), 3);
+    assert_eq!(slab[0], 'c');
+    assert_eq!(slab[1], 'b');
+    assert_eq!(slab[9], 'a');
+    assert_eq!(slab.get(5), None);
+    assert_eq!(slab.vacant_entry().key(), 8);
+}
+
+#[test]
+fn from_iterator_unordered() {
+    let mut slab = vec![(1, "one"), (50, "fifty"), (3, "three"), (20, "twenty")]
+        .into_iter()
+        .collect::<Slab<_>>();
+    assert_eq!(slab.len(), 4);
+    assert_eq!(slab.vacant_entry().key(), 0);
+    let mut iter = slab.iter();
+    assert_eq!(iter.next(), Some((1, &"one")));
+    assert_eq!(iter.next(), Some((3, &"three")));
+    assert_eq!(iter.next(), Some((20, &"twenty")));
+    assert_eq!(iter.next(), Some((50, &"fifty")));
+    assert_eq!(iter.next(), None);
+}
+
+// https://github.com/tokio-rs/slab/issues/100
+#[test]
+fn from_iterator_issue_100() {
+    let mut slab: slab::Slab<()> = vec![(1, ())].into_iter().collect();
+    assert_eq!(slab.len(), 1);
+    assert_eq!(slab.insert(()), 0);
+    assert_eq!(slab.insert(()), 2);
+    assert_eq!(slab.insert(()), 3);
+
+    let mut slab: slab::Slab<()> = vec![(1, ()), (2, ())].into_iter().collect();
+    assert_eq!(slab.len(), 2);
+    assert_eq!(slab.insert(()), 0);
+    assert_eq!(slab.insert(()), 3);
+    assert_eq!(slab.insert(()), 4);
+
+    let mut slab: slab::Slab<()> = vec![(1, ()), (3, ())].into_iter().collect();
+    assert_eq!(slab.len(), 2);
+    assert_eq!(slab.insert(()), 2);
+    assert_eq!(slab.insert(()), 0);
+    assert_eq!(slab.insert(()), 4);
+
+    let mut slab: slab::Slab<()> = vec![(0, ()), (2, ()), (3, ()), (5, ())]
+        .into_iter()
+        .collect();
+    assert_eq!(slab.len(), 4);
+    assert_eq!(slab.insert(()), 4);
+    assert_eq!(slab.insert(()), 1);
+    assert_eq!(slab.insert(()), 6);
+}
+
+#[test]
 fn clear() {
     let mut slab = Slab::new();
 
@@ -244,9 +443,7 @@
 
     // clear full
     slab.clear();
-
-    let vals: Vec<_> = slab.iter().map(|(_, r)| *r).collect();
-    assert!(vals.is_empty());
+    assert!(slab.is_empty());
 
     assert_eq!(0, slab.len());
     assert_eq!(4, slab.capacity());
@@ -260,9 +457,186 @@
 
     // clear half-filled
     slab.clear();
+    assert!(slab.is_empty());
+}
 
-    let vals: Vec<_> = slab.iter().map(|(_, r)| *r).collect();
-    assert!(vals.is_empty());
+#[test]
+fn shrink_to_fit_empty() {
+    let mut slab = Slab::<bool>::with_capacity(20);
+    slab.shrink_to_fit();
+    assert_eq!(slab.capacity(), 0);
+}
+
+#[test]
+fn shrink_to_fit_no_vacant() {
+    let mut slab = Slab::with_capacity(20);
+    slab.insert(String::new());
+    slab.shrink_to_fit();
+    assert!(slab.capacity() < 10);
+}
+
+#[test]
+fn shrink_to_fit_doesnt_move() {
+    let mut slab = Slab::with_capacity(8);
+    slab.insert("foo");
+    let bar = slab.insert("bar");
+    slab.insert("baz");
+    let quux = slab.insert("quux");
+    slab.remove(quux);
+    slab.remove(bar);
+    slab.shrink_to_fit();
+    assert_eq!(slab.len(), 2);
+    assert!(slab.capacity() >= 3);
+    assert_eq!(slab.get(0), Some(&"foo"));
+    assert_eq!(slab.get(2), Some(&"baz"));
+    assert_eq!(slab.vacant_entry().key(), bar);
+}
+
+#[test]
+fn shrink_to_fit_doesnt_recreate_list_when_nothing_can_be_done() {
+    let mut slab = Slab::with_capacity(16);
+    for i in 0..4 {
+        slab.insert(Box::new(i));
+    }
+    slab.remove(0);
+    slab.remove(2);
+    slab.remove(1);
+    assert_eq!(slab.vacant_entry().key(), 1);
+    slab.shrink_to_fit();
+    assert_eq!(slab.len(), 1);
+    assert!(slab.capacity() >= 4);
+    assert_eq!(slab.vacant_entry().key(), 1);
+}
+
+#[test]
+fn compact_empty() {
+    let mut slab = Slab::new();
+    slab.compact(|_, _, _| panic!());
+    assert_eq!(slab.len(), 0);
+    assert_eq!(slab.capacity(), 0);
+    slab.reserve(20);
+    slab.compact(|_, _, _| panic!());
+    assert_eq!(slab.len(), 0);
+    assert_eq!(slab.capacity(), 0);
+    slab.insert(0);
+    slab.insert(1);
+    slab.insert(2);
+    slab.remove(1);
+    slab.remove(2);
+    slab.remove(0);
+    slab.compact(|_, _, _| panic!());
+    assert_eq!(slab.len(), 0);
+    assert_eq!(slab.capacity(), 0);
+}
+
+#[test]
+fn compact_no_moves_needed() {
+    let mut slab = Slab::new();
+    for i in 0..10 {
+        slab.insert(i);
+    }
+    slab.remove(8);
+    slab.remove(9);
+    slab.remove(6);
+    slab.remove(7);
+    slab.compact(|_, _, _| panic!());
+    assert_eq!(slab.len(), 6);
+    for ((index, &value), want) in slab.iter().zip(0..6) {
+        assert!(index == value);
+        assert_eq!(index, want);
+    }
+    assert!(slab.capacity() >= 6 && slab.capacity() < 10);
+}
+
+#[test]
+fn compact_moves_successfully() {
+    let mut slab = Slab::with_capacity(20);
+    for i in 0..10 {
+        slab.insert(i);
+    }
+    for &i in &[0, 5, 9, 6, 3] {
+        slab.remove(i);
+    }
+    let mut moved = 0;
+    slab.compact(|&mut v, from, to| {
+        assert!(from > to);
+        assert!(from >= 5);
+        assert!(to < 5);
+        assert_eq!(from, v);
+        moved += 1;
+        true
+    });
+    assert_eq!(slab.len(), 5);
+    assert_eq!(moved, 2);
+    assert_eq!(slab.vacant_entry().key(), 5);
+    assert!(slab.capacity() >= 5 && slab.capacity() < 20);
+    let mut iter = slab.iter();
+    assert_eq!(iter.next(), Some((0, &8)));
+    assert_eq!(iter.next(), Some((1, &1)));
+    assert_eq!(iter.next(), Some((2, &2)));
+    assert_eq!(iter.next(), Some((3, &7)));
+    assert_eq!(iter.next(), Some((4, &4)));
+    assert_eq!(iter.next(), None);
+}
+
+#[test]
+fn compact_doesnt_move_if_closure_errors() {
+    let mut slab = Slab::with_capacity(20);
+    for i in 0..10 {
+        slab.insert(i);
+    }
+    for &i in &[9, 3, 1, 4, 0] {
+        slab.remove(i);
+    }
+    slab.compact(|&mut v, from, to| {
+        assert!(from > to);
+        assert_eq!(from, v);
+        v != 6
+    });
+    assert_eq!(slab.len(), 5);
+    assert!(slab.capacity() >= 7 && slab.capacity() < 20);
+    assert_eq!(slab.vacant_entry().key(), 3);
+    let mut iter = slab.iter();
+    assert_eq!(iter.next(), Some((0, &8)));
+    assert_eq!(iter.next(), Some((1, &7)));
+    assert_eq!(iter.next(), Some((2, &2)));
+    assert_eq!(iter.next(), Some((5, &5)));
+    assert_eq!(iter.next(), Some((6, &6)));
+    assert_eq!(iter.next(), None);
+}
+
+#[test]
+fn compact_handles_closure_panic() {
+    let mut slab = Slab::new();
+    for i in 0..10 {
+        slab.insert(i);
+    }
+    for i in 1..6 {
+        slab.remove(i);
+    }
+    let result = catch_unwind(AssertUnwindSafe(|| {
+        slab.compact(|&mut v, from, to| {
+            assert!(from > to);
+            assert_eq!(from, v);
+            if v == 7 {
+                panic!("test");
+            }
+            true
+        })
+    }));
+    match result {
+        Err(ref payload) if payload.downcast_ref() == Some(&"test") => {}
+        Err(bug) => resume_unwind(bug),
+        Ok(()) => unreachable!(),
+    }
+    assert_eq!(slab.len(), 5 - 1);
+    assert_eq!(slab.vacant_entry().key(), 3);
+    let mut iter = slab.iter();
+    assert_eq!(iter.next(), Some((0, &0)));
+    assert_eq!(iter.next(), Some((1, &9)));
+    assert_eq!(iter.next(), Some((2, &8)));
+    assert_eq!(iter.next(), Some((6, &6)));
+    assert_eq!(iter.next(), None);
 }
 
 #[test]
@@ -299,3 +673,26 @@
 
     assert!(slab.is_empty())
 }
+
+#[test]
+fn drain_rev() {
+    let mut slab = Slab::new();
+    for i in 0..10 {
+        slab.insert(i);
+    }
+    slab.remove(9);
+
+    let vals: Vec<u64> = slab.drain().rev().collect();
+    assert_eq!(vals, (0..9).rev().collect::<Vec<u64>>());
+}
+
+#[test]
+fn try_remove() {
+    let mut slab = Slab::new();
+
+    let key = slab.insert(1);
+
+    assert_eq!(slab.try_remove(key), Some(1));
+    assert_eq!(slab.try_remove(key), None);
+    assert_eq!(slab.get(key), None);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/smallvec/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/smallvec/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/smallvec/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/smallvec/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b4ebf6d0390e423f1469cbce0a7307439550dd2d3f1bb8b0eff49641b421c94c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0b28172679e0009b655da42797c03fd163a3379d5cfa67ba1f1655e974a2a1a9","README.md":"a01127c37308457e8d396b176fb790846be0978c173be3f13260b62efcef011b","benches/bench.rs":"7425b60d83d01a0bcedb5855ec8652fb1089194da5b5d8f7d7d9072c8ea9d133","scripts/run_miri.sh":"0d0b8c54c73fa9da1217d29ed0984f8328dd9fb61bb5a02db44458c360cdc3c4","src/lib.rs":"70df33b1507de61218d477d3fea90347db66986a7c6815aa6fb5c3408a5539ba","src/specialization.rs":"46433586203399251cba496d67b88d34e1be3c2b591986b77463513da1c66471","src/tests.rs":"1c4763444139813d335d33f9eda8b8b719da60a2b13ddcb44e1a6cc278c319cc","tests/macro.rs":"22ad4f6f104a599fdcba19cad8834105b8656b212fb6c7573a427d447f5db14f"},"package":"ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"}
\ No newline at end of file
+{"files":{"Cargo.toml":"46f2d60c34053a4d9fb34db9f8ea2a84bc29175d16c476e74f7a71d1d5ce10d0","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0b28172679e0009b655da42797c03fd163a3379d5cfa67ba1f1655e974a2a1a9","README.md":"a01127c37308457e8d396b176fb790846be0978c173be3f13260b62efcef011b","benches/bench.rs":"7425b60d83d01a0bcedb5855ec8652fb1089194da5b5d8f7d7d9072c8ea9d133","scripts/run_miri.sh":"0d0b8c54c73fa9da1217d29ed0984f8328dd9fb61bb5a02db44458c360cdc3c4","src/lib.rs":"1d4ed3854a0a9c3731a62e485f8eab721d450c0f42de45baaac1f3ce4415419a","src/specialization.rs":"46433586203399251cba496d67b88d34e1be3c2b591986b77463513da1c66471","src/tests.rs":"3a8f9d998a7c813d54b7214f80d0edf29ebb618821eb23f8e443bcdf60827556","tests/macro.rs":"22ad4f6f104a599fdcba19cad8834105b8656b212fb6c7573a427d447f5db14f"},"package":"fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/smallvec/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/smallvec/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/smallvec/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/smallvec/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "smallvec"
-version = "1.5.1"
+version = "1.6.1"
 authors = ["The Servo Project Developers"]
 description = "'Small vector' optimization: store up to a small number of items on the stack"
 documentation = "https://docs.rs/smallvec/"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/smallvec/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/smallvec/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/smallvec/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/smallvec/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,7 +28,7 @@
 //!
 //! ### `union`
 //!
-//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//! **This feature requires Rust 1.49.**
 //!
 //! When the `union` feature is enabled `smallvec` will track its state (inline or spilled)
 //! without the use of an enum tag, reducing the size of the `smallvec` by one machine word.
@@ -37,7 +37,7 @@
 //! machine words.
 //!
 //! To use this feature add `features = ["union"]` in the `smallvec` section of Cargo.toml.
-//! Note that this feature requires a nightly compiler (for now).
+//! Note that this feature requires Rust 1.49.
 //!
 //! Tracking issue: [rust-lang/rust#55149](https://github.com/rust-lang/rust/issues/55149)
 //!
@@ -71,11 +71,9 @@
 //! Tracking issue: [rust-lang/rust#34761](https://github.com/rust-lang/rust/issues/34761)
 
 #![no_std]
-#![cfg_attr(feature = "union", feature(untagged_unions))]
 #![cfg_attr(feature = "specialization", allow(incomplete_features))]
 #![cfg_attr(feature = "specialization", feature(specialization))]
 #![cfg_attr(feature = "may_dangle", feature(dropck_eyepatch))]
-#![cfg_attr(feature = "const_generics", feature(min_const_generics))]
 #![deny(missing_docs)]
 
 #[doc(hidden)]
@@ -87,6 +85,7 @@
 #[cfg(test)]
 mod tests;
 
+#[allow(deprecated)]
 use alloc::alloc::{Layout, LayoutErr};
 use alloc::boxed::Box;
 use alloc::{vec, vec::Vec};
@@ -239,6 +238,7 @@
     }
 }
 
+#[allow(deprecated)]
 impl From<LayoutErr> for CollectionAllocErr {
     fn from(_: LayoutErr) -> Self {
         CollectionAllocErr::CapacityOverflow
@@ -351,7 +351,7 @@
 
 #[cfg(feature = "union")]
 union SmallVecData<A: Array> {
-    inline: MaybeUninit<A>,
+    inline: core::mem::ManuallyDrop<MaybeUninit<A>>,
     heap: (*mut A::Item, usize),
 }
 
@@ -367,11 +367,13 @@
     }
     #[inline]
     fn from_inline(inline: MaybeUninit<A>) -> SmallVecData<A> {
-        SmallVecData { inline }
+        SmallVecData {
+            inline: core::mem::ManuallyDrop::new(inline),
+        }
     }
     #[inline]
     unsafe fn into_inline(self) -> MaybeUninit<A> {
-        self.inline
+        core::mem::ManuallyDrop::into_inner(self.inline)
     }
     #[inline]
     unsafe fn heap(&self) -> (*mut A::Item, usize) {
@@ -792,7 +794,8 @@
     /// assert_eq!(*v1, []);
     /// ```
     pub fn append<B>(&mut self, other: &mut SmallVec<B>)
-    where B: Array<Item = A::Item>
+    where
+        B: Array<Item = A::Item>,
     {
         self.extend(other.drain(..))
     }
@@ -1006,7 +1009,7 @@
     /// Insert multiple elements at position `index`, shifting all following elements toward the
     /// back.
     pub fn insert_many<I: IntoIterator<Item = A::Item>>(&mut self, index: usize, iterable: I) {
-        let iter = iterable.into_iter();
+        let mut iter = iterable.into_iter();
         if index == self.len() {
             return self.extend(iter);
         }
@@ -1014,13 +1017,16 @@
         let (lower_size_bound, _) = iter.size_hint();
         assert!(lower_size_bound <= core::isize::MAX as usize); // Ensure offset is indexable
         assert!(index + lower_size_bound >= index); // Protect against overflow
-        self.reserve(lower_size_bound);
+
+        let mut num_added = 0;
+        let old_len = self.len();
+        assert!(index <= old_len);
 
         unsafe {
-            let old_len = self.len();
-            assert!(index <= old_len);
+            // Reserve space for `lower_size_bound` elements.
+            self.reserve(lower_size_bound);
             let start = self.as_mut_ptr();
-            let mut ptr = start.add(index);
+            let ptr = start.add(index);
 
             // Move the trailing elements.
             ptr::copy(ptr, ptr.add(lower_size_bound), old_len - index);
@@ -1033,42 +1039,39 @@
                 len: old_len + lower_size_bound,
             };
 
-            let mut num_added = 0;
-            for element in iter {
-                let mut cur = ptr.add(num_added);
-                if num_added >= lower_size_bound {
-                    // Iterator provided more elements than the hint.  Move trailing items again.
-                    self.reserve(1);
-                    let start = self.as_mut_ptr();
-                    ptr = start.add(index);
-                    cur = ptr.add(num_added);
-                    ptr::copy(cur, cur.add(1), old_len - index);
-
-                    guard.start = start;
-                    guard.len += 1;
-                    guard.skip.end += 1;
-                }
+            while num_added < lower_size_bound {
+                let element = match iter.next() {
+                    Some(x) => x,
+                    None => break,
+                };
+                let cur = ptr.add(num_added);
                 ptr::write(cur, element);
                 guard.skip.start += 1;
                 num_added += 1;
             }
-            mem::forget(guard);
 
             if num_added < lower_size_bound {
-                // Iterator provided fewer elements than the hint
+                // Iterator provided fewer elements than the hint. Move the tail backward.
                 ptr::copy(
                     ptr.add(lower_size_bound),
                     ptr.add(num_added),
                     old_len - index,
                 );
             }
-
+            // There are no more duplicate or uninitialized slots, so the guard is not needed.
             self.set_len(old_len + num_added);
+            mem::forget(guard);
+        }
+
+        // Insert any remaining elements one-by-one.
+        for element in iter {
+            self.insert(index + num_added, element);
+            num_added += 1;
         }
 
         struct DropOnPanic<T> {
             start: *mut T,
-            skip: Range<usize>,
+            skip: Range<usize>, // Space we copied-out-of, but haven't written-to yet.
             len: usize,
         }
 
@@ -1956,10 +1959,9 @@
 
 #[cfg(not(feature = "const_generics"))]
 impl_array!(
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 36, 0x40, 0x60, 0x80,
-    0x100, 0x200, 0x400, 0x600, 0x800, 0x1000, 0x2000, 0x4000, 0x6000, 0x8000, 0x10000, 0x20000,
-    0x40000, 0x60000, 0x80000, 0x10_0000
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+    26, 27, 28, 29, 30, 31, 32, 36, 0x40, 0x60, 0x80, 0x100, 0x200, 0x400, 0x600, 0x800, 0x1000,
+    0x2000, 0x4000, 0x6000, 0x8000, 0x10000, 0x20000, 0x40000, 0x60000, 0x80000, 0x10_0000
 );
 
 /// Convenience trait for constructing a `SmallVec`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/smallvec/src/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/smallvec/src/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/smallvec/src/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/smallvec/src/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -905,3 +905,16 @@
 fn zero_size_items() {
     SmallVec::<[(); 0]>::new().push(());
 }
+
+#[test]
+fn test_insert_many_overflow() {
+    let mut v: SmallVec<[u8; 1]> = SmallVec::new();
+    v.push(123);
+
+    // Prepare an iterator with small lower bound
+    let iter = (0u8..5).filter(|n| n % 2 == 0);
+    assert_eq!(iter.size_hint().0, 0);
+
+    v.insert_many(0, iter);
+    assert_eq!(&*v, &[0, 2, 4, 123]);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"54fecae223099432de172b711c6f23f4bb46d99e8fcb3f63f52ae1960c23b8c6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"9c3d94f57a3464986df30edf46250fa70200b40b9c70d8cac6b2fc3a76d24631","SO_ACCEPTCONN.patch":"e942fd2208a41d2b895354a6d80bc0c4aed875d48e6f5a66fa94cf193233c5c2","TODO":"4d0c6a6a858204015a6eac72f2e6d6fc8638ee78595c5600a07a8015975fdaf2","check_targets.bash":"dd9de020e3991988c8183327ab1d1b7c0cfbb21364676a6c4b8a4a0f8fafd6ef","diff.patch":"acb27c495149dab10f9436efcca5f5637d2f4a1527028eeeb58858a3e1ad13e0","src/lib.rs":"1f2159502b551883652e32a02a6f4d60b284ad916cd970994c8beb40b4cc9118","src/sockaddr.rs":"109824754ba77687a47e51a3ed5f8b0abecbe397a633a99fc94cc637bc698d76","src/socket.rs":"6aeb83003381e4a4424c2c7b08bd01bbd837fd4edcec156983df07316e1dca57","src/sys/unix.rs":"10e3d4d2e4e460f45acc670c7fb9ad24f3f60cdf0971bf4ed6f94e158e0551a8","src/sys/windows.rs":"5180e6fbe029fcfc710e1d3498646f4a13b39a7eb62a2b3b0b01c29a7e9dc411","src/tests.rs":"d17e44cc61c646f41b4a18a7f7cb4e632ea34dc1c7d347928e0ed6295840a0ae","src/utils.rs":"53968de8c8e078a650fa316438622be9bb78bca95ed07c4f8da2c940ae27e0ae"},"package":"122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"}
\ No newline at end of file
+{"files":{"Cargo.toml":"132904af796323d037c82381fc97a3f1d696f93c128fc7b2009d827dfdd5230f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"b870d442505bc8047b641815c8283f29fc213dcfd1331894802e6ae55cc09f1b","src/lib.rs":"df42802e8487a5491957d13c6fe987a81f0ac4b766809b104279df65908040ea","src/sockaddr.rs":"da658f12e226ea69e2f4880c24c023db1ea11e6609c596fa2abdaf0296fce427","src/socket.rs":"f99ab91141609de7016fa972aad0ba9e4e57bbf0c690cd436b7a0f765bae1a74","src/sockref.rs":"02de263cce039aaddaee5d6c2bb3940bdfae5697a3fc9df47d226fb3cac03cd9","src/sys/unix.rs":"59c6d13c6dd0edbd388df4ac3404765469144ed356ef7a03127a75f11cff6058","src/sys/windows.rs":"9bcd8446e5f0aac866dc1c673568652a40fd54cbf699e33262bd2a1055974437"},"package":"765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,38 +3,37 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "socket2"
-version = "0.3.19"
-authors = ["Alex Crichton <alex@alexcrichton.com>"]
+version = "0.4.1"
+authors = ["Alex Crichton <alex@alexcrichton.com>", "Thomas de Zeeuw <thomasdezeeuw@gmail.com>"]
+include = ["Cargo.toml", "LICENSE-APACHE", "LICENSE-MIT", "README.md", "src/**/*.rs"]
 description = "Utilities for handling networking sockets with a maximal amount of configuration\npossible intended.\n"
-homepage = "https://github.com/alexcrichton/socket2-rs"
+homepage = "https://github.com/rust-lang/socket2"
+documentation = "https://docs.rs/socket2"
 readme = "README.md"
+keywords = ["io", "socket", "network"]
+categories = ["api-bindings", "network-programming"]
 license = "MIT/Apache-2.0"
-repository = "https://github.com/alexcrichton/socket2-rs"
+repository = "https://github.com/rust-lang/socket2"
 [package.metadata.docs.rs]
 all-features = true
-[dev-dependencies.tempdir]
-version = "0.3"
+rustdoc-args = ["--cfg", "docsrs"]
 
-[features]
-pair = []
-reuseport = []
-unix = []
-[target."cfg(unix)".dependencies.cfg-if]
-version = "1.0"
+[package.metadata.playground]
+features = ["all"]
 
+[features]
+all = []
 [target."cfg(unix)".dependencies.libc]
-version = "0.2.66"
-features = ["align"]
+version = "0.2.96"
 [target."cfg(windows)".dependencies.winapi]
-version = "0.3.3"
-features = ["handleapi", "ws2def", "ws2ipdef", "ws2tcpip", "minwindef"]
+version = "0.3.9"
+features = ["handleapi", "ws2ipdef", "ws2tcpip"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/check_targets.bash thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/check_targets.bash
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/check_targets.bash	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/check_targets.bash	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-declare -a targets=(
-	"x86_64-apple-darwin"
-	"x86_64-unknown-freebsd"
-	"x86_64-unknown-linux-gnu"
-	"x86_64-pc-windows-gnu"
-)
-
-for target in "${targets[@]}"; do
-	cargo check --target "$target" --all-targets --examples --bins --tests --no-default-features
-	cargo check --target "$target" --all-targets --examples --bins --tests --all-features
-done
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/diff.patch thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/diff.patch
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/diff.patch	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/diff.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-commit 3851430dec41c204d6219a84c47ca6885622a98e
-Author: kolapapa <kola@kolapapas-MacBook-Pro.local>
-Date:   Sun Dec 20 14:02:52 2020 +0100
-
-    Add Socket::(bind_)device
-    
-    Co-authored-by: Thomas de Zeeuw <thomasdezeeuw@gmail.com>
-
-diff --git a/src/sys/unix.rs b/src/sys/unix.rs
-index 72097ae..1a0f24e 100644
---- a/src/sys/unix.rs
-+++ b/src/sys/unix.rs
-@@ -7,6 +7,8 @@
- // except according to those terms.
- 
- use std::cmp::min;
-+#[cfg(all(feature = "all", target_os = "linux"))]
-+use std::ffi::{CStr, CString};
- #[cfg(not(target_os = "redox"))]
- use std::io::{IoSlice, IoSliceMut};
- use std::mem::{self, size_of, MaybeUninit};
-@@ -19,6 +21,8 @@
- use std::os::unix::net::{UnixDatagram, UnixListener, UnixStream};
- #[cfg(feature = "all")]
- use std::path::Path;
-+#[cfg(all(feature = "all", target_os = "linux"))]
-+use std::slice;
- use std::time::Duration;
- use std::{io, ptr};
- 
-@@ -867,6 +871,73 @@ pub fn set_mark(&self, mark: u32) -> io::Result<()> {
-         unsafe { setsockopt::<c_int>(self.inner, libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
-     }
- 
-+    /// Gets the value for the `SO_BINDTODEVICE` option on this socket.
-+    ///
-+    /// This value gets the socket binded device's interface name.
-+    ///
-+    /// This function is only available on Linux.
-+    #[cfg(all(feature = "all", target_os = "linux"))]
-+    pub fn device(&self) -> io::Result<Option<CString>> {
-+        // TODO: replace with `MaybeUninit::uninit_array` once stable.
-+        let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
-+            unsafe { MaybeUninit::<[MaybeUninit<u8>; libc::IFNAMSIZ]>::uninit().assume_init() };
-+        let mut len = buf.len() as libc::socklen_t;
-+        unsafe {
-+            syscall!(getsockopt(
-+                self.inner,
-+                libc::SOL_SOCKET,
-+                libc::SO_BINDTODEVICE,
-+                buf.as_mut_ptr().cast(),
-+                &mut len,
-+            ))?;
-+        }
-+        if len == 0 {
-+            Ok(None)
-+        } else {
-+            // Allocate a buffer for `CString` with the length including the
-+            // null terminator.
-+            let len = len as usize;
-+            let mut name = Vec::with_capacity(len);
-+
-+            // TODO: use `MaybeUninit::slice_assume_init_ref` once stable.
-+            // Safety: `len` bytes are writen by the OS, this includes a null
-+            // terminator. However we don't copy the null terminator because
-+            // `CString::from_vec_unchecked` adds its own null terminator.
-+            let buf = unsafe { slice::from_raw_parts(buf.as_ptr().cast(), len - 1) };
-+            name.extend_from_slice(buf);
-+
-+            // Safety: the OS initialised the string for us, which shouldn't
-+            // include any null bytes.
-+            Ok(Some(unsafe { CString::from_vec_unchecked(name) }))
-+        }
-+    }
-+
-+    /// Sets the value for the `SO_BINDTODEVICE` option on this socket.
-+    ///
-+    /// If a socket is bound to an interface, only packets received from that
-+    /// particular interface are processed by the socket. Note that this only
-+    /// works for some socket types, particularly `AF_INET` sockets.
-+    ///
-+    /// If `interface` is `None` or an empty string it removes the binding.
-+    ///
-+    /// This function is only available on Linux.
-+    #[cfg(all(feature = "all", target_os = "linux"))]
-+    pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
-+        let (value, len) = if let Some(interface) = interface {
-+            (interface.as_ptr(), interface.to_bytes_with_nul().len())
-+        } else {
-+            (ptr::null(), 0)
-+        };
-+        syscall!(setsockopt(
-+            self.inner,
-+            libc::SOL_SOCKET,
-+            libc::SO_BINDTODEVICE,
-+            value.cast(),
-+            len as libc::socklen_t,
-+        ))
-+        .map(|_| ())
-+    }
-+
-     /// Get the value of the `SO_REUSEPORT` option on this socket.
-     ///
-     /// For more information about this option, see [`set_reuse_port`].
-diff --git a/tests/socket.rs b/tests/socket.rs
-index 11a3d9c..75890af 100644
---- a/tests/socket.rs
-+++ b/tests/socket.rs
-@@ -1,3 +1,5 @@
-+#[cfg(all(feature = "all", target_os = "linux"))]
-+use std::ffi::CStr;
- #[cfg(any(windows, target_vendor = "apple"))]
- use std::io;
- #[cfg(unix)]
-@@ -271,3 +273,19 @@ fn keepalive() {
-     ))]
-     assert_eq!(socket.keepalive_retries().unwrap(), 10);
- }
-+
-+#[cfg(all(feature = "all", target_os = "linux"))]
-+#[test]
-+fn device() {
-+    const INTERFACE: &str = "lo0\0";
-+    let interface = CStr::from_bytes_with_nul(INTERFACE.as_bytes()).unwrap();
-+    let socket = Socket::new(Domain::IPV4, Type::STREAM, None).unwrap();
-+
-+    assert_eq!(socket.device().unwrap(), None);
-+
-+    socket.bind_device(Some(interface)).unwrap();
-+    assert_eq!(socket.device().unwrap().as_deref(), Some(interface));
-+
-+    socket.bind_device(None).unwrap();
-+    assert_eq!(socket.device().unwrap(), None);
-+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,70 @@
-# socket2-rs
+# Socket2
 
-[Documentation](https://docs.rs/socket2)
+Socket2 is a crate that provides utilities for creating and using sockets.
+
+The goal of this crate is to create and use a socket using advanced
+configuration options (those that are not available in the types in the standard
+library) without using any unsafe code.
+
+This crate provides as direct as possible access to the system's functionality
+for sockets, this means little effort to provide cross-platform utilities. It is
+up to the user to know how to use sockets when using this crate. *If you don't
+know how to create a socket using libc/system calls then this crate is not for
+you*. Most, if not all, functions directly relate to the equivalent system call
+with no error handling applied, so no handling errors such as `EINTR`. As a
+result using this crate can be a little wordy, but it should give you maximal
+flexibility over configuration of sockets.
+
+See the [API documentation] for more.
+
+[API documentation]: https://docs.rs/socket2
+
+# Two branches
+
+Currently Socket2 supports two versions: v0.4 and v0.3. Version 0.4 is developed
+in the master branch, version 0.3 in the [v0.3.x branch].
+
+[v0.3.x branch]: https://github.com/rust-lang/socket2/tree/v0.3.x
+
+# OS support
+
+Socket2 attempts to support the same OS/architectures as Rust does, see
+https://doc.rust-lang.org/nightly/rustc/platform-support.html. However this is
+not always possible, below is current list of support OSs.
+
+*If your favorite OS is not on the list consider contributing it! See [issue
+#78].*
+
+[issue #78]: https://github.com/rust-lang/socket2/issues/78
+
+### Tier 1
+
+These OSs are tested with each commit in the CI and must always pass the tests.
+All functions/types/etc., excluding ones behind the `all` feature, must work on
+these OSs.
+
+* Linux
+* macOS
+* Windows
+
+### Tier 2
+
+These OSs are currently build in the CI, but not tested. Not all
+functions/types/etc. may work on these OSs, even ones **not** behind the `all`
+feature flag.
+
+* Android
+* FreeBSD
+* Fuchsia
+* iOS
+* illumos
+* NetBSD
+* Redox
+* Solaris
+
+# Minimum Supported Rust Version (MSRV)
+
+Socket2 uses 1.46.0 as MSRV.
 
 # License
 
@@ -17,4 +81,4 @@
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in this project by you, as defined in the Apache-2.0 license,
-  shall be dual licensed as above, without any additional terms or conditions.
+shall be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/SO_ACCEPTCONN.patch thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/SO_ACCEPTCONN.patch
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/SO_ACCEPTCONN.patch	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/SO_ACCEPTCONN.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-diff --git a/src/socket.rs b/src/socket.rs
-index 725ad2a..3f7b499 100644
---- a/src/socket.rs
-+++ b/src/socket.rs
-@@ -963,6 +963,26 @@ fn inner(&self) -> &sys::Socket {
-     }
- }
- 
-+/// Socket options get/set using `SOL_SOCKET`.
-+///
-+/// Additional documentation can be found in documentation of the OS.
-+/// * Linux: <https://man7.org/linux/man-pages/man7/socket.7.html>
-+/// * Windows: <https://docs.microsoft.com/en-us/windows/win32/winsock/sol-socket-socket-options>
-+impl Socket {
-+    /// Gets the value of the `SO_ACCEPTCONN` option on this socket.
-+    ///
-+    /// Returns `true` if this socket has been marked to accept connections with
-+    /// [`listen`].
-+    ///
-+    /// [`listen`]: Socket::listen
-+    pub fn is_listener(&self) -> io::Result<bool> {
-+        unsafe {
-+            getsockopt::<c_int>(self.inner, sys::SOL_SOCKET, sys::SO_ACCEPTCONN)
-+                .map(|is_listener| is_listener != 0)
-+        }
-+    }
-+}
-+
- /// Socket options for TCP socket, get/set using `IPPROTO_TCP`.
- ///
- /// Additional documentation can be found in documentation of the OS.
-diff --git a/src/sys/unix.rs b/src/sys/unix.rs
-index 60593a1..51b916a 100644
---- a/src/sys/unix.rs
-+++ b/src/sys/unix.rs
-@@ -54,8 +54,8 @@
- pub(crate) use libc::MSG_OOB;
- pub(crate) use libc::{
-     IPPROTO_IP, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, IPV6_MULTICAST_LOOP, IPV6_UNICAST_HOPS,
--    IPV6_V6ONLY, IP_MULTICAST_LOOP, IP_MULTICAST_TTL, IP_TTL, MSG_PEEK, SOL_SOCKET, SO_BROADCAST,
--    SO_ERROR, TCP_NODELAY,
-+    IPV6_V6ONLY, IP_MULTICAST_LOOP, IP_MULTICAST_TTL, IP_TTL, MSG_PEEK, SOL_SOCKET, SO_ACCEPTCONN,
-+    SO_BROADCAST, SO_ERROR, TCP_NODELAY,
- };
- 
- // See this type in the Windows file.
-diff --git a/src/sys/windows.rs b/src/sys/windows.rs
-index 663b63f..a212525 100644
---- a/src/sys/windows.rs
-+++ b/src/sys/windows.rs
-@@ -60,7 +60,7 @@
- pub(crate) use winapi::um::ws2tcpip::socklen_t;
- // Used in `Socket`.
- pub(crate) use winapi::shared::ws2def::{
--    IPPROTO_IP, SOL_SOCKET, SO_BROADCAST, SO_ERROR, TCP_NODELAY,
-+    IPPROTO_IP, SOL_SOCKET, SO_ACCEPTCONN, SO_BROADCAST, SO_ERROR, TCP_NODELAY,
- };
- pub(crate) use winapi::shared::ws2ipdef::{
-     IPV6_MULTICAST_HOPS, IPV6_MULTICAST_LOOP, IPV6_UNICAST_HOPS, IPV6_V6ONLY, IP_MULTICAST_LOOP,
-diff --git a/tests/options.rs b/tests/options.rs
-index 9c3d1c2..2d256a7 100644
---- a/tests/options.rs
-+++ b/tests/options.rs
-@@ -1,6 +1,8 @@
- //! Tests for getting and setting socket options.
- 
--use socket2::{Domain, Socket, Type};
-+use std::net::SocketAddr;
-+
-+use socket2::{Domain, Protocol, Socket, Type};
- 
- /// Macro to create a simple test to set and get a socket option.
- macro_rules! test {
-@@ -86,6 +88,22 @@ fn $get_fn() {
-     set_mark(123)
- );
- 
-+#[test]
-+fn is_listener() {
-+    // TODO: IPv6.
-+
-+    let socket = Socket::new(Domain::IPV4, Type::STREAM, Some(Protocol::TCP))
-+        .expect("failed to create `Socket`");
-+    //assert_eq!(socket.is_listener().unwrap(), false);
-+
-+    let addr: SocketAddr = "127.0.0.1:0".parse().unwrap();
-+    let addr = addr.into();
-+    socket.bind(&addr).unwrap();
-+    socket.listen(1).unwrap();
-+    dbg!(socket.is_listener());
-+    assert_eq!(socket.is_listener().unwrap(), true);
-+}
-+
- test!(IPv4 ttl, set_ttl(40));
- #[cfg(not(windows))] // TODO: returns `WSAENOPROTOOPT` (10042) on Windows.
- test!(IPv4 broadcast, set_broadcast(true));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,4 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
+// Copyright 2015 The Rust Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -8,36 +6,64 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Utilities for handling sockets
+//! Utilities for creating and using sockets.
 //!
-//! This crate is sort of an evolution of the `net2` crate after seeing the
-//! issues on it over time. The intention of this crate is to provide as direct
-//! as possible access to the system's functionality for sockets as possible. No
-//! extra fluff (e.g. multiple syscalls or builders) provided in this crate. As
-//! a result using this crate can be a little wordy, but it should give you
-//! maximal flexibility over configuration of sockets.
+//! The goal of this crate is to create and use a socket using advanced
+//! configuration options (those that are not available in the types in the
+//! standard library) without using any unsafe code.
+//!
+//! This crate provides as direct as possible access to the system's
+//! functionality for sockets, this means little effort to provide
+//! cross-platform utilities. It is up to the user to know how to use sockets
+//! when using this crate. *If you don't know how to create a socket using
+//! libc/system calls then this crate is not for you*. Most, if not all,
+//! functions directly relate to the equivalent system call with no error
+//! handling applied, so no handling errors such as [`EINTR`]. As a result using
+//! this crate can be a little wordy, but it should give you maximal flexibility
+//! over configuration of sockets.
+//!
+//! [`EINTR`]: std::io::ErrorKind::Interrupted
 //!
 //! # Examples
 //!
 //! ```no_run
-//! use std::net::SocketAddr;
+//! # fn main() -> std::io::Result<()> {
+//! use std::net::{SocketAddr, TcpListener};
 //! use socket2::{Socket, Domain, Type};
 //!
-//! // create a TCP listener bound to two addresses
-//! let socket = Socket::new(Domain::ipv6(), Type::stream(), None).unwrap();
+//! // Create a TCP listener bound to two addresses.
+//! let socket = Socket::new(Domain::IPV6, Type::STREAM, None)?;
 //!
-//! socket.bind(&"[::1]:12345".parse::<SocketAddr>().unwrap().into()).unwrap();
-//! socket.set_only_v6(false);
-//! socket.listen(128).unwrap();
+//! let address: SocketAddr = "[::1]:12345".parse().unwrap();
+//! socket.bind(&address.into())?;
+//! socket.set_only_v6(false)?;
+//! socket.listen(128)?;
 //!
-//! let listener = socket.into_tcp_listener();
+//! let listener: TcpListener = socket.into();
 //! // ...
+//! # drop(listener);
+//! # Ok(()) }
 //! ```
+//!
+//! ## Features
+//!
+//! This crate has a single feature `all`, which enables all functions even ones
+//! that are not available on all OSs.
 
 #![doc(html_root_url = "https://docs.rs/socket2/0.3")]
-#![deny(missing_docs)]
-
-use crate::utils::NetInt;
+#![deny(missing_docs, missing_debug_implementations, rust_2018_idioms)]
+// Show required OS/features on docs.rs.
+#![cfg_attr(docsrs, feature(doc_cfg))]
+// Disallow warnings when running tests.
+#![cfg_attr(test, deny(warnings))]
+// Disallow warnings in examples.
+#![doc(test(attr(deny(warnings))))]
+
+use std::fmt;
+use std::mem::MaybeUninit;
+use std::net::SocketAddr;
+use std::ops::{Deref, DerefMut};
+use std::time::Duration;
 
 /// Macro to implement `fmt::Debug` for a type, printing the constant names
 /// rather than a number.
@@ -71,12 +97,27 @@
     };
 }
 
+/// Macro to convert from one network type to another.
+macro_rules! from {
+    ($from: ty, $for: ty) => {
+        impl From<$from> for $for {
+            fn from(socket: $from) -> $for {
+                #[cfg(unix)]
+                unsafe {
+                    <$for>::from_raw_fd(socket.into_raw_fd())
+                }
+                #[cfg(windows)]
+                unsafe {
+                    <$for>::from_raw_socket(socket.into_raw_socket())
+                }
+            }
+        }
+    };
+}
+
 mod sockaddr;
 mod socket;
-mod utils;
-
-#[cfg(test)]
-mod tests;
+mod sockref;
 
 #[cfg(unix)]
 #[path = "sys/unix.rs"]
@@ -89,28 +130,33 @@
 
 pub use sockaddr::SockAddr;
 pub use socket::Socket;
+pub use sockref::SockRef;
 
 /// Specification of the communication domain for a socket.
 ///
 /// This is a newtype wrapper around an integer which provides a nicer API in
-/// addition to an injection point for documentation. Convenience constructors
-/// such as `Domain::ipv4`, `Domain::ipv6`, etc, are provided to avoid reaching
+/// addition to an injection point for documentation. Convenience constants such
+/// as [`Domain::IPV4`], [`Domain::IPV6`], etc, are provided to avoid reaching
 /// into libc for various constants.
 ///
 /// This type is freely interconvertible with C's `int` type, however, if a raw
 /// value needs to be provided.
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Eq, PartialEq)]
 pub struct Domain(c_int);
 
 impl Domain {
     /// Domain for IPv4 communication, corresponding to `AF_INET`.
-    pub fn ipv4() -> Domain {
-        Domain(sys::AF_INET)
-    }
+    pub const IPV4: Domain = Domain(sys::AF_INET);
 
     /// Domain for IPv6 communication, corresponding to `AF_INET6`.
-    pub fn ipv6() -> Domain {
-        Domain(sys::AF_INET6)
+    pub const IPV6: Domain = Domain(sys::AF_INET6);
+
+    /// Returns the correct domain for `address`.
+    pub const fn for_address(address: SocketAddr) -> Domain {
+        match address {
+            SocketAddr::V4(_) => Domain::IPV4,
+            SocketAddr::V6(_) => Domain::IPV6,
+        }
     }
 }
 
@@ -129,40 +175,35 @@
 /// Specification of communication semantics on a socket.
 ///
 /// This is a newtype wrapper around an integer which provides a nicer API in
-/// addition to an injection point for documentation. Convenience constructors
-/// such as `Type::stream`, `Type::dgram`, etc, are provided to avoid reaching
+/// addition to an injection point for documentation. Convenience constants such
+/// as [`Type::STREAM`], [`Type::DGRAM`], etc, are provided to avoid reaching
 /// into libc for various constants.
 ///
 /// This type is freely interconvertible with C's `int` type, however, if a raw
 /// value needs to be provided.
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Eq, PartialEq)]
 pub struct Type(c_int);
 
 impl Type {
     /// Type corresponding to `SOCK_STREAM`.
     ///
     /// Used for protocols such as TCP.
-    pub fn stream() -> Type {
-        Type(sys::SOCK_STREAM)
-    }
+    pub const STREAM: Type = Type(sys::SOCK_STREAM);
 
     /// Type corresponding to `SOCK_DGRAM`.
     ///
     /// Used for protocols such as UDP.
-    pub fn dgram() -> Type {
-        Type(sys::SOCK_DGRAM)
-    }
+    pub const DGRAM: Type = Type(sys::SOCK_DGRAM);
 
     /// Type corresponding to `SOCK_SEQPACKET`.
-    pub fn seqpacket() -> Type {
-        Type(sys::SOCK_SEQPACKET)
-    }
+    #[cfg(feature = "all")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "all")))]
+    pub const SEQPACKET: Type = Type(sys::SOCK_SEQPACKET);
 
     /// Type corresponding to `SOCK_RAW`.
-    #[cfg(not(target_os = "redox"))]
-    pub fn raw() -> Type {
-        Type(sys::SOCK_RAW)
-    }
+    #[cfg(all(feature = "all", not(target_os = "redox")))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", not(target_os = "redox")))))]
+    pub const RAW: Type = Type(sys::SOCK_RAW);
 }
 
 impl From<c_int> for Type {
@@ -184,29 +225,21 @@
 ///
 /// This type is freely interconvertible with C's `int` type, however, if a raw
 /// value needs to be provided.
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Eq, PartialEq)]
 pub struct Protocol(c_int);
 
 impl Protocol {
     /// Protocol corresponding to `ICMPv4`.
-    pub fn icmpv4() -> Self {
-        Protocol(sys::IPPROTO_ICMP)
-    }
+    pub const ICMPV4: Protocol = Protocol(sys::IPPROTO_ICMP);
 
     /// Protocol corresponding to `ICMPv6`.
-    pub fn icmpv6() -> Self {
-        Protocol(sys::IPPROTO_ICMPV6)
-    }
+    pub const ICMPV6: Protocol = Protocol(sys::IPPROTO_ICMPV6);
 
     /// Protocol corresponding to `TCP`.
-    pub fn tcp() -> Self {
-        Protocol(sys::IPPROTO_TCP)
-    }
+    pub const TCP: Protocol = Protocol(sys::IPPROTO_TCP);
 
     /// Protocol corresponding to `UDP`.
-    pub fn udp() -> Self {
-        Protocol(sys::IPPROTO_UDP)
-    }
+    pub const UDP: Protocol = Protocol(sys::IPPROTO_UDP);
 }
 
 impl From<c_int> for Protocol {
@@ -221,10 +254,180 @@
     }
 }
 
-fn hton<I: NetInt>(i: I) -> I {
-    i.to_be()
+/// Flags for incoming messages.
+///
+/// Flags provide additional information about incoming messages.
+#[cfg(not(target_os = "redox"))]
+#[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+#[derive(Copy, Clone, Eq, PartialEq)]
+pub struct RecvFlags(c_int);
+
+#[cfg(not(target_os = "redox"))]
+impl RecvFlags {
+    /// Check if the message contains a truncated datagram.
+    ///
+    /// This flag is only used for datagram-based sockets,
+    /// not for stream sockets.
+    ///
+    /// On Unix this corresponds to the `MSG_TRUNC` flag.
+    /// On Windows this corresponds to the `WSAEMSGSIZE` error code.
+    pub const fn is_truncated(self) -> bool {
+        self.0 & sys::MSG_TRUNC != 0
+    }
+}
+
+/// A version of [`IoSliceMut`] that allows the buffer to be uninitialised.
+///
+/// [`IoSliceMut`]: std::io::IoSliceMut
+#[repr(transparent)]
+pub struct MaybeUninitSlice<'a>(sys::MaybeUninitSlice<'a>);
+
+unsafe impl<'a> Send for MaybeUninitSlice<'a> {}
+
+unsafe impl<'a> Sync for MaybeUninitSlice<'a> {}
+
+impl<'a> fmt::Debug for MaybeUninitSlice<'a> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(self.0.as_slice(), fmt)
+    }
+}
+
+impl<'a> MaybeUninitSlice<'a> {
+    /// Creates a new `MaybeUninitSlice` wrapping a byte slice.
+    ///
+    /// # Panics
+    ///
+    /// Panics on Windows if the slice is larger than 4GB.
+    pub fn new(buf: &'a mut [MaybeUninit<u8>]) -> MaybeUninitSlice<'a> {
+        MaybeUninitSlice(sys::MaybeUninitSlice::new(buf))
+    }
+}
+
+impl<'a> Deref for MaybeUninitSlice<'a> {
+    type Target = [MaybeUninit<u8>];
+
+    fn deref(&self) -> &[MaybeUninit<u8>] {
+        self.0.as_slice()
+    }
+}
+
+impl<'a> DerefMut for MaybeUninitSlice<'a> {
+    fn deref_mut(&mut self) -> &mut [MaybeUninit<u8>] {
+        self.0.as_mut_slice()
+    }
+}
+
+/// Configures a socket's TCP keepalive parameters.
+///
+/// See [`Socket::set_tcp_keepalive`].
+#[derive(Debug, Clone)]
+pub struct TcpKeepalive {
+    time: Option<Duration>,
+    interval: Option<Duration>,
+    retries: Option<u32>,
 }
 
-fn ntoh<I: NetInt>(i: I) -> I {
-    I::from_be(i)
+impl TcpKeepalive {
+    /// Returns a new, empty set of TCP keepalive parameters.
+    pub const fn new() -> TcpKeepalive {
+        TcpKeepalive {
+            time: None,
+            interval: None,
+            retries: None,
+        }
+    }
+
+    /// Set the amount of time after which TCP keepalive probes will be sent on
+    /// idle connections.
+    ///
+    /// This will set `TCP_KEEPALIVE` on macOS and iOS, and
+    /// `TCP_KEEPIDLE` on all other Unix operating systems, except
+    /// OpenBSD and Haiku which don't support any way to set this
+    /// option. On Windows, this sets the value of the `tcp_keepalive`
+    /// struct's `keepalivetime` field.
+    ///
+    /// Some platforms specify this value in seconds, so sub-second
+    /// specifications may be omitted.
+    pub const fn with_time(self, time: Duration) -> Self {
+        Self {
+            time: Some(time),
+            ..self
+        }
+    }
+
+    /// Set the value of the `TCP_KEEPINTVL` option. On Windows, this sets the
+    /// value of the `tcp_keepalive` struct's `keepaliveinterval` field.
+    ///
+    /// Sets the time interval between TCP keepalive probes.
+    ///
+    /// Some platforms specify this value in seconds, so sub-second
+    /// specifications may be omitted.
+    #[cfg(all(
+        feature = "all",
+        any(
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_vendor = "apple",
+            windows,
+        )
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "linux",
+                target_os = "netbsd",
+                target_vendor = "apple",
+                windows,
+            )
+        )))
+    )]
+    pub const fn with_interval(self, interval: Duration) -> Self {
+        Self {
+            interval: Some(interval),
+            ..self
+        }
+    }
+
+    /// Set the value of the `TCP_KEEPCNT` option.
+    ///
+    /// Set the maximum number of TCP keepalive probes that will be sent before
+    /// dropping a connection, if TCP keepalive is enabled on this socket.
+    #[cfg(all(
+        feature = "all",
+        any(
+            doc,
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_vendor = "apple",
+        )
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "linux",
+                target_os = "netbsd",
+                target_vendor = "apple",
+            )
+        )))
+    )]
+    pub const fn with_retries(self, retries: u32) -> Self {
+        Self {
+            retries: Some(retries),
+            ..self
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/sockaddr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/sockaddr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/sockaddr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/sockaddr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,171 +1,179 @@
-use std::fmt;
-use std::mem::{self, MaybeUninit};
-use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
-use std::ptr;
-
-#[cfg(any(unix, target_os = "redox"))]
-use libc::{
-    in6_addr, in_addr, sa_family_t, sockaddr, sockaddr_in, sockaddr_in6, sockaddr_storage,
-    socklen_t, AF_INET, AF_INET6,
+use std::mem::{self, size_of, MaybeUninit};
+use std::net::{SocketAddr, SocketAddrV4, SocketAddrV6};
+use std::{fmt, io};
+
+use crate::sys::{
+    sa_family_t, sockaddr, sockaddr_in, sockaddr_in6, sockaddr_storage, socklen_t, AF_INET,
+    AF_INET6,
 };
 #[cfg(windows)]
-use winapi::shared::in6addr::{in6_addr_u, IN6_ADDR as in6_addr};
-#[cfg(windows)]
-use winapi::shared::inaddr::{in_addr_S_un, IN_ADDR as in_addr};
-#[cfg(windows)]
-use winapi::shared::ws2def::{
-    ADDRESS_FAMILY as sa_family_t, AF_INET, AF_INET6, SOCKADDR as sockaddr,
-    SOCKADDR_IN as sockaddr_in, SOCKADDR_STORAGE as sockaddr_storage,
-};
-#[cfg(windows)]
-use winapi::shared::ws2ipdef::{SOCKADDR_IN6_LH_u, SOCKADDR_IN6_LH as sockaddr_in6};
-#[cfg(windows)]
-use winapi::um::ws2tcpip::socklen_t;
+use winapi::shared::ws2ipdef::SOCKADDR_IN6_LH_u;
 
 /// The address of a socket.
 ///
 /// `SockAddr`s may be constructed directly to and from the standard library
-/// `SocketAddr`, `SocketAddrV4`, and `SocketAddrV6` types.
+/// [`SocketAddr`], [`SocketAddrV4`], and [`SocketAddrV6`] types.
 pub struct SockAddr {
     storage: sockaddr_storage,
     len: socklen_t,
 }
 
-impl fmt::Debug for SockAddr {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut builder = fmt.debug_struct("SockAddr");
-        builder.field("family", &self.family());
-        if let Some(addr) = self.as_inet() {
-            builder.field("inet", &addr);
-        } else if let Some(addr) = self.as_inet6() {
-            builder.field("inet6", &addr);
-        }
-        builder.finish()
-    }
-}
-
+#[allow(clippy::len_without_is_empty)]
 impl SockAddr {
-    /// Constructs a `SockAddr` from its raw components.
-    pub unsafe fn from_raw_parts(addr: *const sockaddr, len: socklen_t) -> SockAddr {
-        let mut storage = MaybeUninit::<sockaddr_storage>::zeroed();
-        ptr::copy_nonoverlapping(
-            addr as *const _ as *const u8,
-            storage.as_mut_ptr() as *mut u8,
-            len as usize,
-        );
-
-        SockAddr {
-            // This is safe as we written the address to `storage` above.
-            storage: storage.assume_init(),
-            len,
-        }
+    /// Create a `SockAddr` from the underlying storage and its length.
+    ///
+    /// # Safety
+    ///
+    /// Caller must ensure that the address family and length match the type of
+    /// storage address. For example if `storage.ss_family` is set to `AF_INET`
+    /// the `storage` must be initialised as `sockaddr_in`, setting the content
+    /// and length appropriately.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # fn main() -> std::io::Result<()> {
+    /// # #[cfg(unix)] {
+    /// use std::io;
+    /// use std::mem;
+    /// use std::os::unix::io::AsRawFd;
+    ///
+    /// use socket2::{SockAddr, Socket, Domain, Type};
+    ///
+    /// let socket = Socket::new(Domain::IPV4, Type::STREAM, None)?;
+    ///
+    /// // Initialise a `SocketAddr` byte calling `getsockname(2)`.
+    /// let mut addr_storage: libc::sockaddr_storage = unsafe { mem::zeroed() };
+    /// let mut len = mem::size_of_val(&addr_storage) as libc::socklen_t;
+    ///
+    /// // The `getsockname(2)` system call will intiliase `storage` for
+    /// // us, setting `len` to the correct length.
+    /// let res = unsafe {
+    ///     libc::getsockname(
+    ///         socket.as_raw_fd(),
+    ///         (&mut addr_storage as *mut libc::sockaddr_storage).cast(),
+    ///         &mut len,
+    ///     )
+    /// };
+    /// if res == -1 {
+    ///     return Err(io::Error::last_os_error());
+    /// }
+    ///
+    /// let address = unsafe { SockAddr::new(addr_storage, len) };
+    /// # drop(address);
+    /// # }
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub const unsafe fn new(storage: sockaddr_storage, len: socklen_t) -> SockAddr {
+        SockAddr { storage, len }
     }
 
-    /// Constructs a `SockAddr` with the family `AF_UNIX` and the provided path.
+    /// Initialise a `SockAddr` by calling the function `init`.
+    ///
+    /// The type of the address storage and length passed to the function `init`
+    /// is OS/architecture specific.
     ///
-    /// This function is only available on Unix when the `unix` feature is
-    /// enabled.
+    /// The address is zeroed before `init` is called and is thus valid to
+    /// dereference and read from. The length initialised to the maximum length
+    /// of the storage.
     ///
-    /// # Failure
+    /// # Safety
     ///
-    /// Returns an error if the path is longer than `SUN_LEN`.
-    #[cfg(all(unix, feature = "unix"))]
-    pub fn unix<P>(path: P) -> ::std::io::Result<SockAddr>
+    /// Caller must ensure that the address family and length match the type of
+    /// storage address. For example if `storage.ss_family` is set to `AF_INET`
+    /// the `storage` must be initialised as `sockaddr_in`, setting the content
+    /// and length appropriately.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # fn main() -> std::io::Result<()> {
+    /// # #[cfg(unix)] {
+    /// use std::io;
+    /// use std::os::unix::io::AsRawFd;
+    ///
+    /// use socket2::{SockAddr, Socket, Domain, Type};
+    ///
+    /// let socket = Socket::new(Domain::IPV4, Type::STREAM, None)?;
+    ///
+    /// // Initialise a `SocketAddr` byte calling `getsockname(2)`.
+    /// let (_, address) = unsafe {
+    ///     SockAddr::init(|addr_storage, len| {
+    ///         // The `getsockname(2)` system call will intiliase `storage` for
+    ///         // us, setting `len` to the correct length.
+    ///         if libc::getsockname(socket.as_raw_fd(), addr_storage.cast(), len) == -1 {
+    ///             Err(io::Error::last_os_error())
+    ///         } else {
+    ///             Ok(())
+    ///         }
+    ///     })
+    /// }?;
+    /// # drop(address);
+    /// # }
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub unsafe fn init<F, T>(init: F) -> io::Result<(T, SockAddr)>
     where
-        P: AsRef<::std::path::Path>,
+        F: FnOnce(*mut sockaddr_storage, *mut socklen_t) -> io::Result<T>,
     {
-        use libc::{c_char, sockaddr_un, AF_UNIX};
-        use std::cmp::Ordering;
-        use std::io;
-        use std::os::unix::ffi::OsStrExt;
-
-        unsafe {
-            let mut addr = mem::zeroed::<sockaddr_un>();
-            addr.sun_family = AF_UNIX as sa_family_t;
-
-            let bytes = path.as_ref().as_os_str().as_bytes();
-
-            match (bytes.get(0), bytes.len().cmp(&addr.sun_path.len())) {
-                // Abstract paths don't need a null terminator
-                (Some(&0), Ordering::Greater) => {
-                    return Err(io::Error::new(
-                        io::ErrorKind::InvalidInput,
-                        "path must be no longer than SUN_LEN",
-                    ));
-                }
-                (Some(&0), _) => {}
-                (_, Ordering::Greater) | (_, Ordering::Equal) => {
-                    return Err(io::Error::new(
-                        io::ErrorKind::InvalidInput,
-                        "path must be shorter than SUN_LEN",
-                    ));
-                }
-                _ => {}
-            }
-
-            for (dst, src) in addr.sun_path.iter_mut().zip(bytes) {
-                *dst = *src as c_char;
-            }
-            // null byte for pathname is already there since we zeroed up front
-
-            let base = &addr as *const _ as usize;
-            let path = &addr.sun_path as *const _ as usize;
-            let sun_path_offset = path - base;
-
-            let mut len = sun_path_offset + bytes.len();
-            match bytes.get(0) {
-                Some(&0) | None => {}
-                Some(_) => len += 1,
-            }
-            Ok(SockAddr::from_raw_parts(
-                &addr as *const _ as *const _,
-                len as socklen_t,
-            ))
-        }
+        const STORAGE_SIZE: socklen_t = size_of::<sockaddr_storage>() as socklen_t;
+        // NOTE: `SockAddr::unix` depends on the storage being zeroed before
+        // calling `init`.
+        // NOTE: calling `recvfrom` with an empty buffer also depends on the
+        // storage being zeroed before calling `init` as the OS might not
+        // initialise it.
+        let mut storage = MaybeUninit::<sockaddr_storage>::zeroed();
+        let mut len = STORAGE_SIZE;
+        init(storage.as_mut_ptr(), &mut len).map(|res| {
+            debug_assert!(len <= STORAGE_SIZE, "overflown address storage");
+            let addr = SockAddr {
+                // Safety: zeroed-out `sockaddr_storage` is valid, caller must
+                // ensure at least `len` bytes are valid.
+                storage: storage.assume_init(),
+                len,
+            };
+            (res, addr)
+        })
     }
 
-    /// Returns this address as a `SocketAddrV4` if it is in the `AF_INET`
-    /// family.
-    pub fn as_inet(&self) -> Option<SocketAddrV4> {
-        match self.as_std() {
-            Some(SocketAddr::V4(addr)) => Some(addr),
-            _ => None,
-        }
+    /// Returns this address's family.
+    pub const fn family(&self) -> sa_family_t {
+        self.storage.ss_family
     }
 
-    /// Returns this address as a `SocketAddrV6` if it is in the `AF_INET6`
-    /// family.
-    pub fn as_inet6(&self) -> Option<SocketAddrV6> {
-        match self.as_std() {
-            Some(SocketAddr::V6(addr)) => Some(addr),
-            _ => None,
-        }
+    /// Returns the size of this address in bytes.
+    pub const fn len(&self) -> socklen_t {
+        self.len
     }
 
-    /// Returns this address as a `SocketAddr` if it is in the `AF_INET`
-    /// or `AF_INET6` family, otherwise returns `None`.
-    pub fn as_std(&self) -> Option<SocketAddr> {
+    /// Returns a raw pointer to the address.
+    pub const fn as_ptr(&self) -> *const sockaddr {
+        &self.storage as *const _ as *const _
+    }
+
+    /// Returns a raw pointer to the address storage.
+    #[cfg(all(unix, not(target_os = "redox")))]
+    pub(crate) const fn as_storage_ptr(&self) -> *const sockaddr_storage {
+        &self.storage
+    }
+
+    /// Returns this address as a `SocketAddr` if it is in the `AF_INET` (IPv4)
+    /// or `AF_INET6` (IPv6) family, otherwise returns `None`.
+    pub fn as_socket(&self) -> Option<SocketAddr> {
         if self.storage.ss_family == AF_INET as sa_family_t {
             // Safety: if the ss_family field is AF_INET then storage must be a sockaddr_in.
             let addr = unsafe { &*(&self.storage as *const _ as *const sockaddr_in) };
 
-            #[cfg(unix)]
-            let ip = Ipv4Addr::from(addr.sin_addr.s_addr.to_ne_bytes());
-            #[cfg(windows)]
-            let ip = {
-                let ip_bytes = unsafe { addr.sin_addr.S_un.S_un_b() };
-                Ipv4Addr::from([ip_bytes.s_b1, ip_bytes.s_b2, ip_bytes.s_b3, ip_bytes.s_b4])
-            };
+            let ip = crate::sys::from_in_addr(addr.sin_addr);
             let port = u16::from_be(addr.sin_port);
             Some(SocketAddr::V4(SocketAddrV4::new(ip, port)))
         } else if self.storage.ss_family == AF_INET6 as sa_family_t {
             // Safety: if the ss_family field is AF_INET6 then storage must be a sockaddr_in6.
             let addr = unsafe { &*(&self.storage as *const _ as *const sockaddr_in6) };
 
-            #[cfg(unix)]
-            let ip = Ipv6Addr::from(addr.sin6_addr.s6_addr);
-            #[cfg(windows)]
-            let ip = Ipv6Addr::from(*unsafe { addr.sin6_addr.u.Byte() });
+            let ip = crate::sys::from_in6_addr(addr.sin6_addr);
             let port = u16::from_be(addr.sin6_port);
             Some(SocketAddr::V6(SocketAddrV6::new(
                 ip,
@@ -183,39 +191,40 @@
         }
     }
 
-    /// Returns this address's family.
-    pub fn family(&self) -> sa_family_t {
-        self.storage.ss_family
+    /// Returns this address as a [`SocketAddrV4`] if it is in the `AF_INET`
+    /// family.
+    pub fn as_socket_ipv4(&self) -> Option<SocketAddrV4> {
+        match self.as_socket() {
+            Some(SocketAddr::V4(addr)) => Some(addr),
+            _ => None,
+        }
     }
 
-    /// Returns the size of this address in bytes.
-    pub fn len(&self) -> socklen_t {
-        self.len
+    /// Returns this address as a [`SocketAddrV6`] if it is in the `AF_INET6`
+    /// family.
+    pub fn as_socket_ipv6(&self) -> Option<SocketAddrV6> {
+        match self.as_socket() {
+            Some(SocketAddr::V6(addr)) => Some(addr),
+            _ => None,
+        }
     }
+}
 
-    /// Returns a raw pointer to the address.
-    pub fn as_ptr(&self) -> *const sockaddr {
-        &self.storage as *const _ as *const _
+impl From<SocketAddr> for SockAddr {
+    fn from(addr: SocketAddr) -> SockAddr {
+        match addr {
+            SocketAddr::V4(addr) => addr.into(),
+            SocketAddr::V6(addr) => addr.into(),
+        }
     }
 }
 
 impl From<SocketAddrV4> for SockAddr {
     fn from(addr: SocketAddrV4) -> SockAddr {
-        #[cfg(unix)]
-        let sin_addr = in_addr {
-            s_addr: u32::from_ne_bytes(addr.ip().octets()),
-        };
-        #[cfg(windows)]
-        let sin_addr = unsafe {
-            let mut s_un = mem::zeroed::<in_addr_S_un>();
-            *s_un.S_addr_mut() = u32::from_ne_bytes(addr.ip().octets());
-            in_addr { S_un: s_un }
-        };
-
         let sockaddr_in = sockaddr_in {
             sin_family: AF_INET as sa_family_t,
             sin_port: addr.port().to_be(),
-            sin_addr,
+            sin_addr: crate::sys::to_in_addr(&addr.ip()),
             sin_zero: Default::default(),
             #[cfg(any(
                 target_os = "dragonfly",
@@ -240,16 +249,6 @@
 
 impl From<SocketAddrV6> for SockAddr {
     fn from(addr: SocketAddrV6) -> SockAddr {
-        #[cfg(unix)]
-        let sin6_addr = in6_addr {
-            s6_addr: addr.ip().octets(),
-        };
-        #[cfg(windows)]
-        let sin6_addr = unsafe {
-            let mut u = mem::zeroed::<in6_addr_u>();
-            *u.Byte_mut() = addr.ip().octets();
-            in6_addr { u }
-        };
         #[cfg(windows)]
         let u = unsafe {
             let mut u = mem::zeroed::<SOCKADDR_IN6_LH_u>();
@@ -260,7 +259,7 @@
         let sockaddr_in6 = sockaddr_in6 {
             sin6_family: AF_INET6 as sa_family_t,
             sin6_port: addr.port().to_be(),
-            sin6_addr,
+            sin6_addr: crate::sys::to_in6_addr(addr.ip()),
             sin6_flowinfo: addr.flowinfo(),
             #[cfg(unix)]
             sin6_scope_id: addr.scope_id(),
@@ -289,36 +288,61 @@
     }
 }
 
-impl From<SocketAddr> for SockAddr {
-    fn from(addr: SocketAddr) -> SockAddr {
-        match addr {
-            SocketAddr::V4(addr) => addr.into(),
-            SocketAddr::V6(addr) => addr.into(),
-        }
+impl fmt::Debug for SockAddr {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut f = fmt.debug_struct("SockAddr");
+        #[cfg(any(
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "haiku",
+            target_os = "hermit",
+            target_os = "ios",
+            target_os = "macos",
+            target_os = "netbsd",
+            target_os = "openbsd",
+            target_os = "vxworks",
+        ))]
+        f.field("ss_len", &self.storage.ss_len);
+        f.field("ss_family", &self.storage.ss_family)
+            .field("len", &self.len)
+            .finish()
     }
 }
 
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn inet() {
-        let raw = "127.0.0.1:80".parse::<SocketAddrV4>().unwrap();
-        let addr = SockAddr::from(raw);
-        assert!(addr.as_inet6().is_none());
-        let addr = addr.as_inet().unwrap();
-        assert_eq!(raw, addr);
-    }
-
-    #[test]
-    fn inet6() {
-        let raw = "[2001:db8::ff00:42:8329]:80"
-            .parse::<SocketAddrV6>()
-            .unwrap();
-        let addr = SockAddr::from(raw);
-        assert!(addr.as_inet().is_none());
-        let addr = addr.as_inet6().unwrap();
-        assert_eq!(raw, addr);
-    }
+#[test]
+fn ipv4() {
+    use std::net::Ipv4Addr;
+    let std = SocketAddrV4::new(Ipv4Addr::new(1, 2, 3, 4), 9876);
+    let addr = SockAddr::from(std);
+    assert_eq!(addr.family(), AF_INET as sa_family_t);
+    assert_eq!(addr.len(), size_of::<sockaddr_in>() as socklen_t);
+    assert_eq!(addr.as_socket(), Some(SocketAddr::V4(std)));
+    assert_eq!(addr.as_socket_ipv4(), Some(std));
+    assert!(addr.as_socket_ipv6().is_none());
+
+    let addr = SockAddr::from(SocketAddr::from(std));
+    assert_eq!(addr.family(), AF_INET as sa_family_t);
+    assert_eq!(addr.len(), size_of::<sockaddr_in>() as socklen_t);
+    assert_eq!(addr.as_socket(), Some(SocketAddr::V4(std)));
+    assert_eq!(addr.as_socket_ipv4(), Some(std));
+    assert!(addr.as_socket_ipv6().is_none());
+}
+
+#[test]
+fn ipv6() {
+    use std::net::Ipv6Addr;
+    let std = SocketAddrV6::new(Ipv6Addr::new(1, 2, 3, 4, 5, 6, 7, 8), 9876, 11, 12);
+    let addr = SockAddr::from(std);
+    assert_eq!(addr.family(), AF_INET6 as sa_family_t);
+    assert_eq!(addr.len(), size_of::<sockaddr_in6>() as socklen_t);
+    assert_eq!(addr.as_socket(), Some(SocketAddr::V6(std)));
+    assert!(addr.as_socket_ipv4().is_none());
+    assert_eq!(addr.as_socket_ipv6(), Some(std));
+
+    let addr = SockAddr::from(SocketAddr::from(std));
+    assert_eq!(addr.family(), AF_INET6 as sa_family_t);
+    assert_eq!(addr.len(), size_of::<sockaddr_in6>() as socklen_t);
+    assert_eq!(addr.as_socket(), Some(SocketAddr::V6(std)));
+    assert!(addr.as_socket_ipv4().is_none());
+    assert_eq!(addr.as_socket_ipv6(), Some(std));
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/socket.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/socket.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/socket.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/socket.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,4 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
+// Copyright 2015 The Rust Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -8,24 +6,24 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[cfg(target_os = "linux")]
-use std::ffi::{CStr, CString};
 use std::fmt;
 use std::io::{self, Read, Write};
+#[cfg(not(target_os = "redox"))]
+use std::io::{IoSlice, IoSliceMut};
+use std::mem::MaybeUninit;
 use std::net::{self, Ipv4Addr, Ipv6Addr, Shutdown};
-#[cfg(all(unix, feature = "unix"))]
-use std::os::unix::net::{UnixDatagram, UnixListener, UnixStream};
-use std::time::Duration;
-
-#[cfg(any(unix, target_os = "redox"))]
-use libc::MSG_OOB;
+#[cfg(unix)]
+use std::os::unix::io::{FromRawFd, IntoRawFd};
 #[cfg(windows)]
-use winapi::um::winsock2::MSG_OOB;
+use std::os::windows::io::{FromRawSocket, IntoRawSocket};
+use std::time::Duration;
 
-use crate::sys;
-use crate::{Domain, Protocol, SockAddr, Type};
+use crate::sys::{self, c_int, getsockopt, setsockopt, Bool};
+use crate::{Domain, Protocol, SockAddr, TcpKeepalive, Type};
+#[cfg(not(target_os = "redox"))]
+use crate::{MaybeUninitSlice, RecvFlags};
 
-/// Newtype, owned, wrapper around a system socket.
+/// Owned wrapper around a system socket.
 ///
 /// This type simply wraps an instance of a file descriptor (`c_int`) on Unix
 /// and an instance of `SOCKET` on Windows. This is the main type exported by
@@ -34,108 +32,169 @@
 /// precisely one libc or OS API call which is essentially just a "Rustic
 /// translation" of what's below.
 ///
-/// # Examples
+/// This type can be freely converted into the network primitives provided by
+/// the standard library, such as [`TcpStream`] or [`UdpSocket`], using the
+/// [`Into`] trait, see the example below.
 ///
+/// [`TcpStream`]: std::net::TcpStream
+/// [`UdpSocket`]: std::net::UdpSocket
+///
+/// # Notes
+///
+/// Some methods that set options on `Socket` require two system calls to set
+/// there options without overwriting previously set options. We do this by
+/// first getting the current settings, applying the desired changes and than
+/// updating the settings. This means that the operation is **not** atomic. This
+/// can lead to a data race when two threads are changing options in parallel.
+///
+/// # Examples
 /// ```no_run
-/// use std::net::SocketAddr;
-/// use socket2::{Socket, Domain, Type, SockAddr};
+/// # fn main() -> std::io::Result<()> {
+/// use std::net::{SocketAddr, TcpListener};
+/// use socket2::{Socket, Domain, Type};
 ///
 /// // create a TCP listener bound to two addresses
-/// let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
+/// let socket = Socket::new(Domain::IPV4, Type::STREAM, None)?;
 ///
-/// socket.bind(&"127.0.0.1:12345".parse::<SocketAddr>().unwrap().into()).unwrap();
-/// socket.bind(&"127.0.0.1:12346".parse::<SocketAddr>().unwrap().into()).unwrap();
-/// socket.listen(128).unwrap();
+/// let address: SocketAddr = "[::1]:12345".parse().unwrap();
+/// let address = address.into();
+/// socket.bind(&address)?;
+/// socket.bind(&address)?;
+/// socket.listen(128)?;
 ///
-/// let listener = socket.into_tcp_listener();
+/// let listener: TcpListener = socket.into();
 /// // ...
+/// # drop(listener);
+/// # Ok(()) }
 /// ```
 pub struct Socket {
-    // The `sys` module most have access to the socket.
-    pub(crate) inner: sys::Socket,
+    inner: Inner,
 }
 
+/// Store a `TcpStream` internally to take advantage of its niche optimizations on Unix platforms.
+pub(crate) type Inner = std::net::TcpStream;
+
 impl Socket {
+    /// # Safety
+    ///
+    /// The caller must ensure `raw` is a valid file descriptor/socket. NOTE:
+    /// this should really be marked `unsafe`, but this being an internal
+    /// function, often passed as mapping function, it's makes it very
+    /// inconvenient to mark it as `unsafe`.
+    pub(crate) fn from_raw(raw: sys::Socket) -> Socket {
+        Socket {
+            inner: unsafe {
+                // SAFETY: the caller must ensure that `raw` is a valid file
+                // descriptor, but when it isn't it could return I/O errors, or
+                // potentially close a fd it doesn't own. All of that isn't
+                // memory unsafe, so it's not desired but never memory unsafe or
+                // causes UB.
+                //
+                // However there is one exception. We use `TcpStream` to
+                // represent the `Socket` internally (see `Inner` type),
+                // `TcpStream` has a layout optimisation that doesn't allow for
+                // negative file descriptors (as those are always invalid).
+                // Violating this assumption (fd never negative) causes UB,
+                // something we don't want. So check for that we have this
+                // `assert!`.
+                #[cfg(unix)]
+                assert!(raw >= 0, "tried to create a `Socket` with an invalid fd");
+                sys::socket_from_raw(raw)
+            },
+        }
+    }
+
+    pub(crate) fn as_raw(&self) -> sys::Socket {
+        sys::socket_as_raw(&self.inner)
+    }
+
+    pub(crate) fn into_raw(self) -> sys::Socket {
+        sys::socket_into_raw(self.inner)
+    }
+
+    /// Creates a new socket and sets common flags.
+    ///
+    /// This function corresponds to `socket(2)` on Unix and `WSASocketW` on
+    /// Windows.
+    ///
+    /// On Unix-like systems, the close-on-exec flag is set on the new socket.
+    /// Additionally, on Apple platforms `SOCK_NOSIGPIPE` is set. On Windows,
+    /// the socket is made non-inheritable.
+    ///
+    /// [`Socket::new_raw`] can be used if you don't want these flags to be set.
+    pub fn new(domain: Domain, ty: Type, protocol: Option<Protocol>) -> io::Result<Socket> {
+        let ty = set_common_type(ty);
+        Socket::new_raw(domain, ty, protocol).and_then(set_common_flags)
+    }
+
     /// Creates a new socket ready to be configured.
     ///
-    /// This function corresponds to `socket(2)` and simply creates a new
-    /// socket, no other configuration is done and further functions must be
-    /// invoked to configure this socket.
-    pub fn new(domain: Domain, type_: Type, protocol: Option<Protocol>) -> io::Result<Socket> {
+    /// This function corresponds to `socket(2)` on Unix and `WSASocketW` on
+    /// Windows and simply creates a new socket, no other configuration is done.
+    pub fn new_raw(domain: Domain, ty: Type, protocol: Option<Protocol>) -> io::Result<Socket> {
         let protocol = protocol.map(|p| p.0).unwrap_or(0);
-        Ok(Socket {
-            inner: sys::Socket::new(domain.0, type_.0, protocol)?,
-        })
+        sys::socket(domain.0, ty.0, protocol).map(Socket::from_raw)
     }
 
     /// Creates a pair of sockets which are connected to each other.
     ///
     /// This function corresponds to `socketpair(2)`.
     ///
-    /// This function is only available on Unix when the `pair` feature is
-    /// enabled.
-    #[cfg(all(unix, feature = "pair"))]
+    /// This function sets the same flags as in done for [`Socket::new`],
+    /// [`Socket::pair_raw`] can be used if you don't want to set those flags.
+    #[cfg(any(doc, all(feature = "all", unix)))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", unix))))]
     pub fn pair(
         domain: Domain,
-        type_: Type,
+        ty: Type,
         protocol: Option<Protocol>,
     ) -> io::Result<(Socket, Socket)> {
-        let protocol = protocol.map(|p| p.0).unwrap_or(0);
-        let sockets = sys::Socket::pair(domain.0, type_.0, protocol)?;
-        Ok((Socket { inner: sockets.0 }, Socket { inner: sockets.1 }))
+        let ty = set_common_type(ty);
+        let (a, b) = Socket::pair_raw(domain, ty, protocol)?;
+        let a = set_common_flags(a)?;
+        let b = set_common_flags(b)?;
+        Ok((a, b))
     }
 
-    /// Consumes this `Socket`, converting it to a `TcpStream`.
-    pub fn into_tcp_stream(self) -> net::TcpStream {
-        self.into()
-    }
-
-    /// Consumes this `Socket`, converting it to a `TcpListener`.
-    pub fn into_tcp_listener(self) -> net::TcpListener {
-        self.into()
-    }
-
-    /// Consumes this `Socket`, converting it to a `UdpSocket`.
-    pub fn into_udp_socket(self) -> net::UdpSocket {
-        self.into()
-    }
-
-    /// Consumes this `Socket`, converting it into a `UnixStream`.
-    ///
-    /// This function is only available on Unix when the `unix` feature is
-    /// enabled.
-    #[cfg(all(unix, feature = "unix"))]
-    pub fn into_unix_stream(self) -> UnixStream {
-        self.into()
-    }
-
-    /// Consumes this `Socket`, converting it into a `UnixListener`.
+    /// Creates a pair of sockets which are connected to each other.
     ///
-    /// This function is only available on Unix when the `unix` feature is
-    /// enabled.
-    #[cfg(all(unix, feature = "unix"))]
-    pub fn into_unix_listener(self) -> UnixListener {
-        self.into()
+    /// This function corresponds to `socketpair(2)`.
+    #[cfg(any(doc, all(feature = "all", unix)))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", unix))))]
+    pub fn pair_raw(
+        domain: Domain,
+        ty: Type,
+        protocol: Option<Protocol>,
+    ) -> io::Result<(Socket, Socket)> {
+        let protocol = protocol.map(|p| p.0).unwrap_or(0);
+        sys::socketpair(domain.0, ty.0, protocol)
+            .map(|[a, b]| (Socket::from_raw(a), Socket::from_raw(b)))
     }
 
-    /// Consumes this `Socket`, converting it into a `UnixDatagram`.
+    /// Binds this socket to the specified address.
     ///
-    /// This function is only available on Unix when the `unix` feature is
-    /// enabled.
-    #[cfg(all(unix, feature = "unix"))]
-    pub fn into_unix_datagram(self) -> UnixDatagram {
-        self.into()
+    /// This function directly corresponds to the `bind(2)` function on Windows
+    /// and Unix.
+    pub fn bind(&self, address: &SockAddr) -> io::Result<()> {
+        sys::bind(self.as_raw(), address)
     }
 
     /// Initiate a connection on this socket to the specified address.
     ///
-    /// This function directly corresponds to the connect(2) function on Windows
-    /// and Unix.
+    /// This function directly corresponds to the `connect(2)` function on
+    /// Windows and Unix.
     ///
     /// An error will be returned if `listen` or `connect` has already been
     /// called on this builder.
-    pub fn connect(&self, addr: &SockAddr) -> io::Result<()> {
-        self.inner.connect(addr)
+    ///
+    /// # Notes
+    ///
+    /// When using a non-blocking connect (by setting the socket into
+    /// non-blocking mode before calling this function), socket option can't be
+    /// set *while connecting*. This will cause errors on Windows. Socket
+    /// options can be safely set before and after connecting the socket.
+    pub fn connect(&self, address: &SockAddr) -> io::Result<()> {
+        sys::connect(self.as_raw(), address)
     }
 
     /// Initiate a connection on this socket to the specified address, only
@@ -151,82 +210,147 @@
     ///
     /// # Warnings
     ///
-    /// The nonblocking state of the socket is overridden by this function -
+    /// The non-blocking state of the socket is overridden by this function -
     /// it will be returned in blocking mode on success, and in an indeterminate
     /// state on failure.
     ///
     /// If the connection request times out, it may still be processing in the
     /// background - a second call to `connect` or `connect_timeout` may fail.
     pub fn connect_timeout(&self, addr: &SockAddr, timeout: Duration) -> io::Result<()> {
-        self.inner.connect_timeout(addr, timeout)
-    }
+        self.set_nonblocking(true)?;
+        let res = self.connect(addr);
+        self.set_nonblocking(false)?;
+
+        match res {
+            Ok(()) => return Ok(()),
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {}
+            #[cfg(unix)]
+            Err(ref e) if e.raw_os_error() == Some(libc::EINPROGRESS) => {}
+            Err(e) => return Err(e),
+        }
 
-    /// Binds this socket to the specified address.
-    ///
-    /// This function directly corresponds to the bind(2) function on Windows
-    /// and Unix.
-    pub fn bind(&self, addr: &SockAddr) -> io::Result<()> {
-        self.inner.bind(addr)
+        sys::poll_connect(self, timeout)
     }
 
     /// Mark a socket as ready to accept incoming connection requests using
-    /// accept()
+    /// [`Socket::accept()`].
     ///
-    /// This function directly corresponds to the listen(2) function on Windows
-    /// and Unix.
+    /// This function directly corresponds to the `listen(2)` function on
+    /// Windows and Unix.
     ///
     /// An error will be returned if `listen` or `connect` has already been
     /// called on this builder.
-    pub fn listen(&self, backlog: i32) -> io::Result<()> {
-        self.inner.listen(backlog)
+    pub fn listen(&self, backlog: c_int) -> io::Result<()> {
+        sys::listen(self.as_raw(), backlog)
     }
 
     /// Accept a new incoming connection from this listener.
     ///
-    /// This function will block the calling thread until a new connection is
-    /// established. When established, the corresponding `Socket` and the
-    /// remote peer's address will be returned.
+    /// This function uses `accept4(2)` on platforms that support it and
+    /// `accept(2)` platforms that do not.
+    ///
+    /// This function sets the same flags as in done for [`Socket::new`],
+    /// [`Socket::accept_raw`] can be used if you don't want to set those flags.
     pub fn accept(&self) -> io::Result<(Socket, SockAddr)> {
-        self.inner
-            .accept()
-            .map(|(socket, addr)| (Socket { inner: socket }, addr))
+        // Use `accept4` on platforms that support it.
+        #[cfg(any(
+            target_os = "android",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "illumos",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_os = "openbsd",
+        ))]
+        return self._accept4(libc::SOCK_CLOEXEC);
+
+        // Fall back to `accept` on platforms that do not support `accept4`.
+        #[cfg(not(any(
+            target_os = "android",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "illumos",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_os = "openbsd",
+        )))]
+        {
+            let (socket, addr) = self.accept_raw()?;
+            let socket = set_common_flags(socket)?;
+            // `set_common_flags` does not disable inheritance on Windows because `Socket::new`
+            // unlike `accept` is able to create the socket with inheritance disabled.
+            #[cfg(windows)]
+            socket._set_no_inherit(true)?;
+            Ok((socket, addr))
+        }
     }
 
-    /// Returns the socket address of the local half of this TCP connection.
+    /// Accept a new incoming connection from this listener.
+    ///
+    /// This function directly corresponds to the `accept(2)` function on
+    /// Windows and Unix.
+    pub fn accept_raw(&self) -> io::Result<(Socket, SockAddr)> {
+        sys::accept(self.as_raw()).map(|(inner, addr)| (Socket::from_raw(inner), addr))
+    }
+
+    /// Returns the socket address of the local half of this socket.
+    ///
+    /// # Notes
+    ///
+    /// Depending on the OS this may return an error if the socket is not
+    /// [bound].
+    ///
+    /// [bound]: Socket::bind
     pub fn local_addr(&self) -> io::Result<SockAddr> {
-        self.inner.local_addr()
+        sys::getsockname(self.as_raw())
     }
 
-    /// Returns the socket address of the remote peer of this TCP connection.
+    /// Returns the socket address of the remote peer of this socket.
+    ///
+    /// # Notes
+    ///
+    /// This returns an error if the socket is not [`connect`ed].
+    ///
+    /// [`connect`ed]: Socket::connect
     pub fn peer_addr(&self) -> io::Result<SockAddr> {
-        self.inner.peer_addr()
+        sys::getpeername(self.as_raw())
     }
 
-    /// Creates a new independently owned handle to the underlying socket.
-    ///
-    /// The returned `TcpStream` is a reference to the same stream that this
-    /// object references. Both handles will read and write the same stream of
-    /// data, and options set on one stream will be propagated to the other
-    /// stream.
-    pub fn try_clone(&self) -> io::Result<Socket> {
-        self.inner.try_clone().map(|s| Socket { inner: s })
+    /// Returns the [`Type`] of this socket by checking the `SO_TYPE` option on
+    /// this socket.
+    pub fn r#type(&self) -> io::Result<Type> {
+        unsafe { getsockopt::<c_int>(self.as_raw(), sys::SOL_SOCKET, sys::SO_TYPE).map(Type) }
     }
 
-    /// Get the value of the `SO_ERROR` option on this socket.
+    /// Creates a new independently owned handle to the underlying socket.
     ///
-    /// This will retrieve the stored error in the underlying socket, clearing
-    /// the field in the process. This can be useful for checking errors between
-    /// calls.
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.inner.take_error()
+    /// # Notes
+    ///
+    /// On Unix this uses `F_DUPFD_CLOEXEC` and thus sets the `FD_CLOEXEC` on
+    /// the returned socket.
+    ///
+    /// On Windows this uses `WSA_FLAG_NO_HANDLE_INHERIT` setting inheriting to
+    /// false.
+    ///
+    /// On Windows this can **not** be used function cannot be used on a
+    /// QOS-enabled socket, see
+    /// <https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsaduplicatesocketw>.
+    pub fn try_clone(&self) -> io::Result<Socket> {
+        sys::try_clone(self.as_raw()).map(Socket::from_raw)
     }
 
     /// Moves this TCP stream into or out of nonblocking mode.
     ///
-    /// On Unix this corresponds to calling fcntl, and on Windows this
-    /// corresponds to calling ioctlsocket.
+    /// # Notes
+    ///
+    /// On Unix this corresponds to calling `fcntl` (un)setting `O_NONBLOCK`.
+    ///
+    /// On Windows this corresponds to calling `ioctlsocket` (un)setting
+    /// `FIONBIO`.
     pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
-        self.inner.set_nonblocking(nonblocking)
+        sys::set_nonblocking(self.as_raw(), nonblocking)
     }
 
     /// Shuts down the read, write, or both halves of this connection.
@@ -234,26 +358,31 @@
     /// This function will cause all pending and future I/O on the specified
     /// portions to return immediately with an appropriate value.
     pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        self.inner.shutdown(how)
+        sys::shutdown(self.as_raw(), how)
     }
 
     /// Receives data on the socket from the remote address to which it is
     /// connected.
     ///
-    /// The [`connect`] method will connect this socket to a remote address. This
-    /// method will fail if the socket is not connected.
+    /// The [`connect`] method will connect this socket to a remote address.
+    /// This method might fail if the socket is not connected.
     ///
-    /// [`connect`]: #method.connect
-    pub fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.inner.recv(buf, 0)
-    }
-
-    /// Identical to [`recv`] but allows for specification of arbitrary flags to the underlying
-    /// `recv` call.
+    /// [`connect`]: Socket::connect
+    ///
+    /// # Safety
     ///
-    /// [`recv`]: #method.recv
-    pub fn recv_with_flags(&self, buf: &mut [u8], flags: i32) -> io::Result<usize> {
-        self.inner.recv(buf, flags)
+    /// Normally casting a `&mut [u8]` to `&mut [MaybeUninit<u8>]` would be
+    /// unsound, as that allows us to write uninitialised bytes to the buffer.
+    /// However this implementation promises to not write uninitialised bytes to
+    /// the `buf`fer and passes it directly to `recv(2)` system call. This
+    /// promise ensures that this function can be called using a `buf`fer of
+    /// type `&mut [u8]`.
+    ///
+    /// Note that the [`io::Read::read`] implementation calls this function with
+    /// a `buf`fer of type `&mut [u8]`, allowing initialised buffers to be used
+    /// without using `unsafe`.
+    pub fn recv(&self, buf: &mut [MaybeUninit<u8>]) -> io::Result<usize> {
+        self.recv_with_flags(buf, 0)
     }
 
     /// Receives out-of-band (OOB) data on the socket from the remote address to
@@ -261,10 +390,77 @@
     ///
     /// For more information, see [`recv`], [`out_of_band_inline`].
     ///
-    /// [`recv`]: #method.recv
-    /// [`out_of_band_inline`]: #method.out_of_band_inline
-    pub fn recv_out_of_band(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.inner.recv(buf, MSG_OOB)
+    /// [`recv`]: Socket::recv
+    /// [`out_of_band_inline`]: Socket::out_of_band_inline
+    pub fn recv_out_of_band(&self, buf: &mut [MaybeUninit<u8>]) -> io::Result<usize> {
+        self.recv_with_flags(buf, sys::MSG_OOB)
+    }
+
+    /// Identical to [`recv`] but allows for specification of arbitrary flags to
+    /// the underlying `recv` call.
+    ///
+    /// [`recv`]: Socket::recv
+    pub fn recv_with_flags(
+        &self,
+        buf: &mut [MaybeUninit<u8>],
+        flags: sys::c_int,
+    ) -> io::Result<usize> {
+        sys::recv(self.as_raw(), buf, flags)
+    }
+
+    /// Receives data on the socket from the remote address to which it is
+    /// connected. Unlike [`recv`] this allows passing multiple buffers.
+    ///
+    /// The [`connect`] method will connect this socket to a remote address.
+    /// This method might fail if the socket is not connected.
+    ///
+    /// In addition to the number of bytes read, this function returns the flags
+    /// for the received message. See [`RecvFlags`] for more information about
+    /// the returned flags.
+    ///
+    /// [`recv`]: Socket::recv
+    /// [`connect`]: Socket::connect
+    ///
+    /// # Safety
+    ///
+    /// Normally casting a `IoSliceMut` to `MaybeUninitSlice` would be unsound,
+    /// as that allows us to write uninitialised bytes to the buffer. However
+    /// this implementation promises to not write uninitialised bytes to the
+    /// `bufs` and passes it directly to `recvmsg(2)` system call. This promise
+    /// ensures that this function can be called using `bufs` of type `&mut
+    /// [IoSliceMut]`.
+    ///
+    /// Note that the [`io::Read::read_vectored`] implementation calls this
+    /// function with `buf`s of type `&mut [IoSliceMut]`, allowing initialised
+    /// buffers to be used without using `unsafe`.
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn recv_vectored(
+        &self,
+        bufs: &mut [MaybeUninitSlice<'_>],
+    ) -> io::Result<(usize, RecvFlags)> {
+        self.recv_vectored_with_flags(bufs, 0)
+    }
+
+    /// Identical to [`recv_vectored`] but allows for specification of arbitrary
+    /// flags to the underlying `recvmsg`/`WSARecv` call.
+    ///
+    /// [`recv_vectored`]: Socket::recv_vectored
+    ///
+    /// # Safety
+    ///
+    /// `recv_from_vectored` makes the same safety guarantees regarding `bufs`
+    /// as [`recv_vectored`].
+    ///
+    /// [`recv_vectored`]: Socket::recv_vectored
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn recv_vectored_with_flags(
+        &self,
+        bufs: &mut [MaybeUninitSlice<'_>],
+        flags: c_int,
+    ) -> io::Result<(usize, RecvFlags)> {
+        sys::recv_vectored(self.as_raw(), bufs, flags)
     }
 
     /// Receives data on the socket from the remote adress to which it is
@@ -273,26 +469,82 @@
     ///
     /// Successive calls return the same data. This is accomplished by passing
     /// `MSG_PEEK` as a flag to the underlying `recv` system call.
-    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.inner.peek(buf)
+    ///
+    /// # Safety
+    ///
+    /// `peek` makes the same safety guarantees regarding the `buf`fer as
+    /// [`recv`].
+    ///
+    /// [`recv`]: Socket::recv
+    pub fn peek(&self, buf: &mut [MaybeUninit<u8>]) -> io::Result<usize> {
+        self.recv_with_flags(buf, sys::MSG_PEEK)
     }
 
     /// Receives data from the socket. On success, returns the number of bytes
     /// read and the address from whence the data came.
-    pub fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SockAddr)> {
-        self.inner.recv_from(buf, 0)
+    ///
+    /// # Safety
+    ///
+    /// `recv_from` makes the same safety guarantees regarding the `buf`fer as
+    /// [`recv`].
+    ///
+    /// [`recv`]: Socket::recv
+    pub fn recv_from(&self, buf: &mut [MaybeUninit<u8>]) -> io::Result<(usize, SockAddr)> {
+        self.recv_from_with_flags(buf, 0)
     }
 
-    /// Identical to [`recv_from`] but allows for specification of arbitrary flags to the underlying
-    /// `recvfrom` call.
+    /// Identical to [`recv_from`] but allows for specification of arbitrary
+    /// flags to the underlying `recvfrom` call.
     ///
-    /// [`recv_from`]: #method.recv_from
+    /// [`recv_from`]: Socket::recv_from
     pub fn recv_from_with_flags(
         &self,
-        buf: &mut [u8],
-        flags: i32,
+        buf: &mut [MaybeUninit<u8>],
+        flags: c_int,
     ) -> io::Result<(usize, SockAddr)> {
-        self.inner.recv_from(buf, flags)
+        sys::recv_from(self.as_raw(), buf, flags)
+    }
+
+    /// Receives data from the socket. Returns the amount of bytes read, the
+    /// [`RecvFlags`] and the remote address from the data is coming. Unlike
+    /// [`recv_from`] this allows passing multiple buffers.
+    ///
+    /// [`recv_from`]: Socket::recv_from
+    ///
+    /// # Safety
+    ///
+    /// `recv_from_vectored` makes the same safety guarantees regarding `bufs`
+    /// as [`recv_vectored`].
+    ///
+    /// [`recv_vectored`]: Socket::recv_vectored
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn recv_from_vectored(
+        &self,
+        bufs: &mut [MaybeUninitSlice<'_>],
+    ) -> io::Result<(usize, RecvFlags, SockAddr)> {
+        self.recv_from_vectored_with_flags(bufs, 0)
+    }
+
+    /// Identical to [`recv_from_vectored`] but allows for specification of
+    /// arbitrary flags to the underlying `recvmsg`/`WSARecvFrom` call.
+    ///
+    /// [`recv_from_vectored`]: Socket::recv_from_vectored
+    ///
+    /// # Safety
+    ///
+    /// `recv_from_vectored` makes the same safety guarantees regarding `bufs`
+    /// as [`recv_vectored`].
+    ///
+    /// [`recv_vectored`]: Socket::recv_vectored
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn recv_from_vectored_with_flags(
+        &self,
+        bufs: &mut [MaybeUninitSlice<'_>],
+        flags: c_int,
+    ) -> io::Result<(usize, RecvFlags, SockAddr)> {
+        sys::recv_from_vectored(self.as_raw(), bufs, flags)
     }
 
     /// Receives data from the socket, without removing it from the queue.
@@ -302,8 +554,15 @@
     ///
     /// On success, returns the number of bytes peeked and the address from
     /// whence the data came.
-    pub fn peek_from(&self, buf: &mut [u8]) -> io::Result<(usize, SockAddr)> {
-        self.inner.peek_from(buf)
+    ///
+    /// # Safety
+    ///
+    /// `peek_from` makes the same safety guarantees regarding the `buf`fer as
+    /// [`recv`].
+    ///
+    /// [`recv`]: Socket::recv
+    pub fn peek_from(&self, buf: &mut [MaybeUninit<u8>]) -> io::Result<(usize, SockAddr)> {
+        self.recv_from_with_flags(buf, sys::MSG_PEEK)
     }
 
     /// Sends data on the socket to a connected peer.
@@ -313,15 +572,36 @@
     ///
     /// On success returns the number of bytes that were sent.
     pub fn send(&self, buf: &[u8]) -> io::Result<usize> {
-        self.inner.send(buf, 0)
+        self.send_with_flags(buf, 0)
     }
 
     /// Identical to [`send`] but allows for specification of arbitrary flags to the underlying
     /// `send` call.
     ///
     /// [`send`]: #method.send
-    pub fn send_with_flags(&self, buf: &[u8], flags: i32) -> io::Result<usize> {
-        self.inner.send(buf, flags)
+    pub fn send_with_flags(&self, buf: &[u8], flags: c_int) -> io::Result<usize> {
+        sys::send(self.as_raw(), buf, flags)
+    }
+
+    /// Send data to the connected peer. Returns the amount of bytes written.
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn send_vectored(&self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.send_vectored_with_flags(bufs, 0)
+    }
+
+    /// Identical to [`send_vectored`] but allows for specification of arbitrary
+    /// flags to the underlying `sendmsg`/`WSASend` call.
+    ///
+    /// [`send_vectored`]: Socket::send_vectored
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn send_vectored_with_flags(
+        &self,
+        bufs: &[IoSlice<'_>],
+        flags: c_int,
+    ) -> io::Result<usize> {
+        sys::send_vectored(self.as_raw(), bufs, flags)
     }
 
     /// Sends out-of-band (OOB) data on the socket to connected peer
@@ -332,797 +612,1042 @@
     /// [`send`]: #method.send
     /// [`out_of_band_inline`]: #method.out_of_band_inline
     pub fn send_out_of_band(&self, buf: &[u8]) -> io::Result<usize> {
-        self.inner.send(buf, MSG_OOB)
+        self.send_with_flags(buf, sys::MSG_OOB)
     }
 
     /// Sends data on the socket to the given address. On success, returns the
     /// number of bytes written.
     ///
-    /// This is typically used on UDP or datagram-oriented sockets. On success
-    /// returns the number of bytes that were sent.
+    /// This is typically used on UDP or datagram-oriented sockets.
     pub fn send_to(&self, buf: &[u8], addr: &SockAddr) -> io::Result<usize> {
-        self.inner.send_to(buf, 0, addr)
+        self.send_to_with_flags(buf, addr, 0)
     }
 
-    /// Identical to [`send_to`] but allows for specification of arbitrary flags to the underlying
-    /// `sendto` call.
+    /// Identical to [`send_to`] but allows for specification of arbitrary flags
+    /// to the underlying `sendto` call.
     ///
-    /// [`send_to`]: #method.send_to
-    pub fn send_to_with_flags(&self, buf: &[u8], addr: &SockAddr, flags: i32) -> io::Result<usize> {
-        self.inner.send_to(buf, flags, addr)
+    /// [`send_to`]: Socket::send_to
+    pub fn send_to_with_flags(
+        &self,
+        buf: &[u8],
+        addr: &SockAddr,
+        flags: c_int,
+    ) -> io::Result<usize> {
+        sys::send_to(self.as_raw(), buf, addr, flags)
+    }
+
+    /// Send data to a peer listening on `addr`. Returns the amount of bytes
+    /// written.
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn send_to_vectored(&self, bufs: &[IoSlice<'_>], addr: &SockAddr) -> io::Result<usize> {
+        self.send_to_vectored_with_flags(bufs, addr, 0)
+    }
+
+    /// Identical to [`send_to_vectored`] but allows for specification of
+    /// arbitrary flags to the underlying `sendmsg`/`WSASendTo` call.
+    ///
+    /// [`send_to_vectored`]: Socket::send_to_vectored
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn send_to_vectored_with_flags(
+        &self,
+        bufs: &[IoSlice<'_>],
+        addr: &SockAddr,
+        flags: c_int,
+    ) -> io::Result<usize> {
+        sys::send_to_vectored(self.as_raw(), bufs, addr, flags)
     }
+}
 
-    // ================================================
+/// Set `SOCK_CLOEXEC` and `NO_HANDLE_INHERIT` on the `ty`pe on platforms that
+/// support it.
+#[inline(always)]
+fn set_common_type(ty: Type) -> Type {
+    // On platforms that support it set `SOCK_CLOEXEC`.
+    #[cfg(any(
+        target_os = "android",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "fuchsia",
+        target_os = "illumos",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_os = "openbsd",
+    ))]
+    let ty = ty._cloexec();
 
-    /// Gets the value of the `IP_TTL` option for this socket.
-    ///
-    /// For more information about this option, see [`set_ttl`][link].
-    ///
-    /// [link]: #method.set_ttl
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.inner.ttl()
-    }
+    // On windows set `NO_HANDLE_INHERIT`.
+    #[cfg(windows)]
+    let ty = ty._no_inherit();
+
+    ty
+}
 
-    /// Sets the value for the `IP_TTL` option on this socket.
+/// Set `FD_CLOEXEC` and `NOSIGPIPE` on the `socket` for platforms that need it.
+#[inline(always)]
+#[allow(clippy::unnecessary_wraps)]
+fn set_common_flags(socket: Socket) -> io::Result<Socket> {
+    // On platforms that don't have `SOCK_CLOEXEC` use `FD_CLOEXEC`.
+    #[cfg(all(
+        unix,
+        not(any(
+            target_os = "android",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "illumos",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_os = "openbsd",
+        ))
+    ))]
+    socket._set_cloexec(true)?;
+
+    // On Apple platforms set `NOSIGPIPE`.
+    #[cfg(target_vendor = "apple")]
+    socket._set_nosigpipe(true)?;
+
+    Ok(socket)
+}
+
+/// Socket options get/set using `SOL_SOCKET`.
+///
+/// Additional documentation can be found in documentation of the OS.
+/// * Linux: <https://man7.org/linux/man-pages/man7/socket.7.html>
+/// * Windows: <https://docs.microsoft.com/en-us/windows/win32/winsock/sol-socket-socket-options>
+impl Socket {
+    /// Get the value of the `SO_BROADCAST` option for this socket.
     ///
-    /// This value sets the time-to-live field that is used in every packet sent
-    /// from this socket.
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.inner.set_ttl(ttl)
+    /// For more information about this option, see [`set_broadcast`].
+    ///
+    /// [`set_broadcast`]: Socket::set_broadcast
+    pub fn broadcast(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::SOL_SOCKET, sys::SO_BROADCAST)
+                .map(|broadcast| broadcast != 0)
+        }
     }
 
-    /// Gets the value of the `TCP_MAXSEG` option on this socket.
+    /// Set the value of the `SO_BROADCAST` option for this socket.
     ///
-    /// The `TCP_MAXSEG` option denotes the TCP Maximum Segment
-    /// Size and is only available on TCP sockets.
-    #[cfg(all(unix, not(target_os = "redox")))]
-    pub fn mss(&self) -> io::Result<u32> {
-        self.inner.mss()
+    /// When enabled, this socket is allowed to send packets to a broadcast
+    /// address.
+    pub fn set_broadcast(&self, broadcast: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::SOL_SOCKET,
+                sys::SO_BROADCAST,
+                broadcast as c_int,
+            )
+        }
     }
 
-    /// Sets the value of the `TCP_MAXSEG` option on this socket.
+    /// Get the value of the `SO_ERROR` option on this socket.
     ///
-    /// The `TCP_MAXSEG` option denotes the TCP Maximum Segment
-    /// Size and is only available on TCP sockets.
-    #[cfg(all(unix, not(target_os = "redox")))]
-    pub fn set_mss(&self, mss: u32) -> io::Result<()> {
-        self.inner.set_mss(mss)
+    /// This will retrieve the stored error in the underlying socket, clearing
+    /// the field in the process. This can be useful for checking errors between
+    /// calls.
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        match unsafe { getsockopt::<c_int>(self.as_raw(), sys::SOL_SOCKET, sys::SO_ERROR) } {
+            Ok(0) => Ok(None),
+            Ok(errno) => Ok(Some(io::Error::from_raw_os_error(errno))),
+            Err(err) => Err(err),
+        }
     }
 
-    /// Gets the value for the `SO_MARK` option on this socket.
+    /// Get the value of the `SO_KEEPALIVE` option on this socket.
     ///
-    /// This value gets the socket mark field for each packet sent through
-    /// this socket.
+    /// For more information about this option, see [`set_keepalive`].
     ///
-    /// This function is only available on Linux and requires the
-    /// `CAP_NET_ADMIN` capability.
-    #[cfg(target_os = "linux")]
-    pub fn mark(&self) -> io::Result<u32> {
-        self.inner.mark()
+    /// [`set_keepalive`]: Socket::set_keepalive
+    pub fn keepalive(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<Bool>(self.as_raw(), sys::SOL_SOCKET, sys::SO_KEEPALIVE)
+                .map(|keepalive| keepalive != 0)
+        }
     }
 
-    /// Sets the value for the `SO_MARK` option on this socket.
+    /// Set value for the `SO_KEEPALIVE` option on this socket.
     ///
-    /// This value sets the socket mark field for each packet sent through
-    /// this socket. Changing the mark can be used for mark-based routing
-    /// without netfilter or for packet filtering.
-    ///
-    /// This function is only available on Linux and requires the
-    /// `CAP_NET_ADMIN` capability.
-    #[cfg(target_os = "linux")]
-    pub fn set_mark(&self, mark: u32) -> io::Result<()> {
-        self.inner.set_mark(mark)
+    /// Enable sending of keep-alive messages on connection-oriented sockets.
+    pub fn set_keepalive(&self, keepalive: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::SOL_SOCKET,
+                sys::SO_KEEPALIVE,
+                keepalive as c_int,
+            )
+        }
     }
 
-    /// Gets the value for the `SO_BINDTODEVICE` option on this socket.
+    /// Get the value of the `SO_LINGER` option on this socket.
     ///
-    /// This value gets the socket binded device's interface name.
+    /// For more information about this option, see [`set_linger`].
     ///
-    /// This function is only available on Linux.
-    #[cfg(target_os = "linux")]
-    pub fn device(&self) -> io::Result<Option<CString>> {
-        self.inner.device()
+    /// [`set_linger`]: Socket::set_linger
+    pub fn linger(&self) -> io::Result<Option<Duration>> {
+        unsafe {
+            getsockopt::<sys::linger>(self.as_raw(), sys::SOL_SOCKET, sys::SO_LINGER)
+                .map(from_linger)
+        }
     }
 
-    /// Sets the value for the `SO_BINDTODEVICE` option on this socket.
+    /// Set value for the `SO_LINGER` option on this socket.
+    ///
+    /// If `linger` is not `None`, a close(2) or shutdown(2) will not return
+    /// until all queued messages for the socket have been successfully sent or
+    /// the linger timeout has been reached. Otherwise, the call returns
+    /// immediately and the closing is done in the background. When the socket
+    /// is closed as part of exit(2), it always lingers in the background.
     ///
-    /// If a socket is bound to an interface, only packets received from that
-    /// particular interface are processed by the socket. Note that this only
-    /// works for some socket types, particularly `AF_INET` sockets.
+    /// # Notes
     ///
-    /// If `interface` is `None` or an empty string it removes the binding.
+    /// On most OSs the duration only has a precision of seconds and will be
+    /// silently truncated.
     ///
-    /// This function is only available on Linux.
-    #[cfg(target_os = "linux")]
-    pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
-        self.inner.bind_device(interface)
+    /// On Apple platforms (e.g. macOS, iOS, etc) this uses `SO_LINGER_SEC`.
+    pub fn set_linger(&self, linger: Option<Duration>) -> io::Result<()> {
+        let linger = into_linger(linger);
+        unsafe { setsockopt(self.as_raw(), sys::SOL_SOCKET, sys::SO_LINGER, linger) }
     }
 
-    /// Gets the value of the `IPV6_UNICAST_HOPS` option for this socket.
+    /// Get value for the `SO_OOBINLINE` option on this socket.
     ///
-    /// Specifies the hop limit for ipv6 unicast packets
-    pub fn unicast_hops_v6(&self) -> io::Result<u32> {
-        self.inner.unicast_hops_v6()
+    /// For more information about this option, see [`set_out_of_band_inline`].
+    ///
+    /// [`set_out_of_band_inline`]: Socket::set_out_of_band_inline
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn out_of_band_inline(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::SOL_SOCKET, sys::SO_OOBINLINE)
+                .map(|oob_inline| oob_inline != 0)
+        }
     }
 
-    /// Sets the value for the `IPV6_UNICAST_HOPS` option on this socket.
+    /// Set value for the `SO_OOBINLINE` option on this socket.
     ///
-    /// Specifies the hop limit for ipv6 unicast packets
-    pub fn set_unicast_hops_v6(&self, ttl: u32) -> io::Result<()> {
-        self.inner.set_unicast_hops_v6(ttl)
+    /// If this option is enabled, out-of-band data is directly placed into the
+    /// receive data stream. Otherwise, out-of-band data is passed only when the
+    /// `MSG_OOB` flag is set during receiving. As per RFC6093, TCP sockets
+    /// using the Urgent mechanism are encouraged to set this flag.
+    #[cfg(not(target_os = "redox"))]
+    #[cfg_attr(docsrs, doc(cfg(not(target_os = "redox"))))]
+    pub fn set_out_of_band_inline(&self, oob_inline: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::SOL_SOCKET,
+                sys::SO_OOBINLINE,
+                oob_inline as c_int,
+            )
+        }
     }
 
-    /// Gets the value of the `IPV6_V6ONLY` option for this socket.
+    /// Get value for the `SO_RCVBUF` option on this socket.
     ///
-    /// For more information about this option, see [`set_only_v6`][link].
+    /// For more information about this option, see [`set_recv_buffer_size`].
     ///
-    /// [link]: #method.set_only_v6
-    pub fn only_v6(&self) -> io::Result<bool> {
-        self.inner.only_v6()
+    /// [`set_recv_buffer_size`]: Socket::set_recv_buffer_size
+    pub fn recv_buffer_size(&self) -> io::Result<usize> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::SOL_SOCKET, sys::SO_RCVBUF)
+                .map(|size| size as usize)
+        }
     }
 
-    /// Sets the value for the `IPV6_V6ONLY` option on this socket.
+    /// Set value for the `SO_RCVBUF` option on this socket.
     ///
-    /// If this is set to `true` then the socket is restricted to sending and
-    /// receiving IPv6 packets only. In this case two IPv4 and IPv6 applications
-    /// can bind the same port at the same time.
-    ///
-    /// If this is set to `false` then the socket can be used to send and
-    /// receive packets from an IPv4-mapped IPv6 address.
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        self.inner.set_only_v6(only_v6)
+    /// Changes the size of the operating system's receive buffer associated
+    /// with the socket.
+    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::SOL_SOCKET,
+                sys::SO_RCVBUF,
+                size as c_int,
+            )
+        }
     }
 
-    /// Returns the read timeout of this socket.
+    /// Get value for the `SO_RCVTIMEO` option on this socket.
     ///
-    /// If the timeout is `None`, then `read` calls will block indefinitely.
+    /// If the returned timeout is `None`, then `read` and `recv` calls will
+    /// block indefinitely.
     pub fn read_timeout(&self) -> io::Result<Option<Duration>> {
-        self.inner.read_timeout()
+        sys::timeout_opt(self.as_raw(), sys::SOL_SOCKET, sys::SO_RCVTIMEO)
     }
 
-    /// Sets the read timeout to the timeout specified.
+    /// Set value for the `SO_RCVTIMEO` option on this socket.
     ///
-    /// If the value specified is `None`, then `read` calls will block
-    /// indefinitely. It is an error to pass the zero `Duration` to this
-    /// method.
-    pub fn set_read_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.inner.set_read_timeout(dur)
+    /// If `timeout` is `None`, then `read` and `recv` calls will block
+    /// indefinitely.
+    pub fn set_read_timeout(&self, duration: Option<Duration>) -> io::Result<()> {
+        sys::set_timeout_opt(self.as_raw(), sys::SOL_SOCKET, sys::SO_RCVTIMEO, duration)
     }
 
-    /// Returns the write timeout of this socket.
+    /// Get the value of the `SO_REUSEADDR` option on this socket.
     ///
-    /// If the timeout is `None`, then `write` calls will block indefinitely.
-    pub fn write_timeout(&self) -> io::Result<Option<Duration>> {
-        self.inner.write_timeout()
+    /// For more information about this option, see [`set_reuse_address`].
+    ///
+    /// [`set_reuse_address`]: Socket::set_reuse_address
+    pub fn reuse_address(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::SOL_SOCKET, sys::SO_REUSEADDR)
+                .map(|reuse| reuse != 0)
+        }
     }
 
-    /// Sets the write timeout to the timeout specified.
+    /// Set value for the `SO_REUSEADDR` option on this socket.
     ///
-    /// If the value specified is `None`, then `write` calls will block
-    /// indefinitely. It is an error to pass the zero `Duration` to this
-    /// method.
-    pub fn set_write_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.inner.set_write_timeout(dur)
+    /// This indicates that futher calls to `bind` may allow reuse of local
+    /// addresses. For IPv4 sockets this means that a socket may bind even when
+    /// there's a socket already listening on this port.
+    pub fn set_reuse_address(&self, reuse: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::SOL_SOCKET,
+                sys::SO_REUSEADDR,
+                reuse as c_int,
+            )
+        }
     }
 
-    /// Gets the value of the `TCP_NODELAY` option on this socket.
+    /// Get the value of the `SO_SNDBUF` option on this socket.
     ///
-    /// For more information about this option, see [`set_nodelay`][link].
+    /// For more information about this option, see [`set_send_buffer_size`].
     ///
-    /// [link]: #method.set_nodelay
-    pub fn nodelay(&self) -> io::Result<bool> {
-        self.inner.nodelay()
+    /// [`set_send_buffer_size`]: Socket::set_send_buffer_size
+    pub fn send_buffer_size(&self) -> io::Result<usize> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::SOL_SOCKET, sys::SO_SNDBUF)
+                .map(|size| size as usize)
+        }
     }
 
-    /// Sets the value of the `TCP_NODELAY` option on this socket.
+    /// Set value for the `SO_SNDBUF` option on this socket.
     ///
-    /// If set, this option disables the Nagle algorithm. This means that
-    /// segments are always sent as soon as possible, even if there is only a
-    /// small amount of data. When not set, data is buffered until there is a
-    /// sufficient amount to send out, thereby avoiding the frequent sending of
-    /// small packets.
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        self.inner.set_nodelay(nodelay)
+    /// Changes the size of the operating system's send buffer associated with
+    /// the socket.
+    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::SOL_SOCKET,
+                sys::SO_SNDBUF,
+                size as c_int,
+            )
+        }
     }
 
-    /// Sets the value of the `SO_BROADCAST` option for this socket.
+    /// Get value for the `SO_SNDTIMEO` option on this socket.
     ///
-    /// When enabled, this socket is allowed to send packets to a broadcast
-    /// address.
-    pub fn broadcast(&self) -> io::Result<bool> {
-        self.inner.broadcast()
+    /// If the returned timeout is `None`, then `write` and `send` calls will
+    /// block indefinitely.
+    pub fn write_timeout(&self) -> io::Result<Option<Duration>> {
+        sys::timeout_opt(self.as_raw(), sys::SOL_SOCKET, sys::SO_SNDTIMEO)
     }
 
-    /// Gets the value of the `SO_BROADCAST` option for this socket.
+    /// Set value for the `SO_SNDTIMEO` option on this socket.
     ///
-    /// For more information about this option, see
-    /// [`set_broadcast`][link].
-    ///
-    /// [link]: #method.set_broadcast
-    pub fn set_broadcast(&self, broadcast: bool) -> io::Result<()> {
-        self.inner.set_broadcast(broadcast)
+    /// If `timeout` is `None`, then `write` and `send` calls will block
+    /// indefinitely.
+    pub fn set_write_timeout(&self, duration: Option<Duration>) -> io::Result<()> {
+        sys::set_timeout_opt(self.as_raw(), sys::SOL_SOCKET, sys::SO_SNDTIMEO, duration)
     }
+}
 
-    /// Gets the value of the `IP_MULTICAST_LOOP` option for this socket.
-    ///
-    /// For more information about this option, see
-    /// [`set_multicast_loop_v4`][link].
-    ///
-    /// [link]: #method.set_multicast_loop_v4
-    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
-        self.inner.multicast_loop_v4()
+fn from_linger(linger: sys::linger) -> Option<Duration> {
+    if linger.l_onoff == 0 {
+        None
+    } else {
+        Some(Duration::from_secs(linger.l_linger as u64))
     }
+}
 
-    /// Sets the value of the `IP_MULTICAST_LOOP` option for this socket.
-    ///
-    /// If enabled, multicast packets will be looped back to the local socket.
-    /// Note that this may not have any affect on IPv6 sockets.
-    pub fn set_multicast_loop_v4(&self, multicast_loop_v4: bool) -> io::Result<()> {
-        self.inner.set_multicast_loop_v4(multicast_loop_v4)
+fn into_linger(duration: Option<Duration>) -> sys::linger {
+    match duration {
+        Some(duration) => sys::linger {
+            l_onoff: 1,
+            l_linger: duration.as_secs() as _,
+        },
+        None => sys::linger {
+            l_onoff: 0,
+            l_linger: 0,
+        },
     }
+}
 
-    /// Gets the value of the `IP_MULTICAST_TTL` option for this socket.
+/// Socket options for IPv4 sockets, get/set using `IPPROTO_IP`.
+///
+/// Additional documentation can be found in documentation of the OS.
+/// * Linux: <https://man7.org/linux/man-pages/man7/ip.7.html>
+/// * Windows: <https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-ip-socket-options>
+impl Socket {
+    /// Get the value of the `IP_TRANSPARENT` option on this socket.
     ///
-    /// For more information about this option, see
-    /// [`set_multicast_ttl_v4`][link].
+    /// For more information about this option, see [`set_ip_transparent`].
     ///
-    /// [link]: #method.set_multicast_ttl_v4
-    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        self.inner.multicast_ttl_v4()
+    /// [`set_ip_transparent`]: Socket::set_ip_transparent
+    #[cfg(any(doc, all(feature = "all", target_os = "linux")))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", target_os = "linux"))))]
+    pub fn ip_transparent(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IP, libc::IP_TRANSPARENT)
+                .map(|transparent| transparent != 0)
+        }
     }
 
-    /// Sets the value of the `IP_MULTICAST_TTL` option for this socket.
+    /// Set the value of the `IP_TRANSPARENT` option on this socket.
     ///
-    /// Indicates the time-to-live value of outgoing multicast packets for
-    /// this socket. The default value is 1 which means that multicast packets
-    /// don't leave the local network unless explicitly requested.
-    ///
-    /// Note that this may not have any affect on IPv6 sockets.
-    pub fn set_multicast_ttl_v4(&self, multicast_ttl_v4: u32) -> io::Result<()> {
-        self.inner.set_multicast_ttl_v4(multicast_ttl_v4)
+    /// Setting this boolean option enables transparent proxying
+    /// on this socket.  This socket option allows the calling
+    /// application to bind to a nonlocal IP address and operate
+    /// both as a client and a server with the foreign address as
+    /// the local endpoint.  NOTE: this requires that routing be
+    /// set up in a way that packets going to the foreign address
+    /// are routed through the TProxy box (i.e., the system
+    /// hosting the application that employs the IP_TRANSPARENT
+    /// socket option).  Enabling this socket option requires
+    /// superuser privileges (the CAP_NET_ADMIN capability).
+    ///
+    /// TProxy redirection with the iptables TPROXY target also
+    /// requires that this option be set on the redirected socket.
+    #[cfg(any(doc, all(feature = "all", target_os = "linux")))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", target_os = "linux"))))]
+    pub fn set_ip_transparent(&self, transparent: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IP,
+                libc::IP_TRANSPARENT,
+                transparent as c_int,
+            )
+        }
     }
 
-    /// Gets the value of the `IPV6_MULTICAST_HOPS` option for this socket
+    /// Join a multicast group using `IP_ADD_MEMBERSHIP` option on this socket.
     ///
-    /// For more information about this option, see
-    /// [`set_multicast_hops_v6`][link].
-    ///
-    /// [link]: #method.set_multicast_hops_v6
-    pub fn multicast_hops_v6(&self) -> io::Result<u32> {
-        self.inner.multicast_hops_v6()
+    /// This function specifies a new multicast group for this socket to join.
+    /// The address must be a valid multicast address, and `interface` is the
+    /// address of the local interface with which the system should join the
+    /// multicast group. If it's [`Ipv4Addr::UNSPECIFIED`] (`INADDR_ANY`) then
+    /// an appropriate interface is chosen by the system.
+    pub fn join_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
+        let mreq = sys::IpMreq {
+            imr_multiaddr: sys::to_in_addr(multiaddr),
+            imr_interface: sys::to_in_addr(interface),
+        };
+        unsafe { setsockopt(self.as_raw(), sys::IPPROTO_IP, sys::IP_ADD_MEMBERSHIP, mreq) }
     }
 
-    /// Sets the value of the `IPV6_MULTICAST_HOPS` option for this socket
+    /// Leave a multicast group using `IP_DROP_MEMBERSHIP` option on this socket.
     ///
-    /// Indicates the number of "routers" multicast packets will transit for
-    /// this socket. The default value is 1 which means that multicast packets
-    /// don't leave the local network unless explicitly requested.
-    pub fn set_multicast_hops_v6(&self, hops: u32) -> io::Result<()> {
-        self.inner.set_multicast_hops_v6(hops)
+    /// For more information about this option, see [`join_multicast_v4`].
+    ///
+    /// [`join_multicast_v4`]: Socket::join_multicast_v4
+    pub fn leave_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
+        let mreq = sys::IpMreq {
+            imr_multiaddr: sys::to_in_addr(multiaddr),
+            imr_interface: sys::to_in_addr(interface),
+        };
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IP,
+                sys::IP_DROP_MEMBERSHIP,
+                mreq,
+            )
+        }
     }
 
-    /// Gets the value of the `IP_MULTICAST_IF` option for this socket.
+    /// Get the value of the `IP_MULTICAST_IF` option for this socket.
     ///
-    /// For more information about this option, see
-    /// [`set_multicast_if_v4`][link].
+    /// For more information about this option, see [`set_multicast_if_v4`].
     ///
-    /// [link]: #method.set_multicast_if_v4
-    ///
-    /// Returns the interface to use for routing multicast packets.
+    /// [`set_multicast_if_v4`]: Socket::set_multicast_if_v4
     pub fn multicast_if_v4(&self) -> io::Result<Ipv4Addr> {
-        self.inner.multicast_if_v4()
+        unsafe {
+            getsockopt(self.as_raw(), sys::IPPROTO_IP, sys::IP_MULTICAST_IF).map(sys::from_in_addr)
+        }
     }
 
-    /// Sets the value of the `IP_MULTICAST_IF` option for this socket.
+    /// Set the value of the `IP_MULTICAST_IF` option for this socket.
     ///
     /// Specifies the interface to use for routing multicast packets.
     pub fn set_multicast_if_v4(&self, interface: &Ipv4Addr) -> io::Result<()> {
-        self.inner.set_multicast_if_v4(interface)
+        let interface = sys::to_in_addr(interface);
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IP,
+                sys::IP_MULTICAST_IF,
+                interface,
+            )
+        }
     }
 
-    /// Gets the value of the `IPV6_MULTICAST_IF` option for this socket.
+    /// Get the value of the `IP_MULTICAST_LOOP` option for this socket.
     ///
-    /// For more information about this option, see
-    /// [`set_multicast_if_v6`][link].
+    /// For more information about this option, see [`set_multicast_loop_v4`].
     ///
-    /// [link]: #method.set_multicast_if_v6
+    /// [`set_multicast_loop_v4`]: Socket::set_multicast_loop_v4
+    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IP, sys::IP_MULTICAST_LOOP)
+                .map(|loop_v4| loop_v4 != 0)
+        }
+    }
+
+    /// Set the value of the `IP_MULTICAST_LOOP` option for this socket.
     ///
-    /// Returns the interface to use for routing multicast packets.
-    pub fn multicast_if_v6(&self) -> io::Result<u32> {
-        self.inner.multicast_if_v6()
+    /// If enabled, multicast packets will be looped back to the local socket.
+    /// Note that this may not have any affect on IPv6 sockets.
+    pub fn set_multicast_loop_v4(&self, loop_v4: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IP,
+                sys::IP_MULTICAST_LOOP,
+                loop_v4 as c_int,
+            )
+        }
     }
 
-    /// Sets the value of the `IPV6_MULTICAST_IF` option for this socket.
+    /// Get the value of the `IP_MULTICAST_TTL` option for this socket.
     ///
-    /// Specifies the interface to use for routing multicast packets. Unlike ipv4, this
-    /// is generally required in ipv6 contexts where network routing prefixes may
-    /// overlap.
-    pub fn set_multicast_if_v6(&self, interface: u32) -> io::Result<()> {
-        self.inner.set_multicast_if_v6(interface)
+    /// For more information about this option, see [`set_multicast_ttl_v4`].
+    ///
+    /// [`set_multicast_ttl_v4`]: Socket::set_multicast_ttl_v4
+    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IP, sys::IP_MULTICAST_TTL)
+                .map(|ttl| ttl as u32)
+        }
     }
 
-    /// Gets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
+    /// Set the value of the `IP_MULTICAST_TTL` option for this socket.
     ///
-    /// For more information about this option, see
-    /// [`set_multicast_loop_v6`][link].
+    /// Indicates the time-to-live value of outgoing multicast packets for
+    /// this socket. The default value is 1 which means that multicast packets
+    /// don't leave the local network unless explicitly requested.
     ///
-    /// [link]: #method.set_multicast_loop_v6
-    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
-        self.inner.multicast_loop_v6()
+    /// Note that this may not have any affect on IPv6 sockets.
+    pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IP,
+                sys::IP_MULTICAST_TTL,
+                ttl as c_int,
+            )
+        }
     }
 
-    /// Sets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
+    /// Get the value of the `IP_TTL` option for this socket.
     ///
-    /// Controls whether this socket sees the multicast packets it sends itself.
-    /// Note that this may not have any affect on IPv4 sockets.
-    pub fn set_multicast_loop_v6(&self, multicast_loop_v6: bool) -> io::Result<()> {
-        self.inner.set_multicast_loop_v6(multicast_loop_v6)
+    /// For more information about this option, see [`set_ttl`].
+    ///
+    /// [`set_ttl`]: Socket::set_ttl
+    pub fn ttl(&self) -> io::Result<u32> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IP, sys::IP_TTL).map(|ttl| ttl as u32)
+        }
     }
 
-    /// Executes an operation of the `IP_ADD_MEMBERSHIP` type.
+    /// Set the value of the `IP_TTL` option for this socket.
     ///
-    /// This function specifies a new multicast group for this socket to join.
-    /// The address must be a valid multicast address, and `interface` is the
-    /// address of the local interface with which the system should join the
-    /// multicast group. If it's equal to `INADDR_ANY` then an appropriate
-    /// interface is chosen by the system.
-    pub fn join_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
-        self.inner.join_multicast_v4(multiaddr, interface)
+    /// This value sets the time-to-live field that is used in every packet sent
+    /// from this socket.
+    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
+        unsafe { setsockopt(self.as_raw(), sys::IPPROTO_IP, sys::IP_TTL, ttl as c_int) }
+    }
+
+    /// Set the value of the `IP_TOS` option for this socket.
+    ///
+    /// This value sets the type-of-service field that is used in every packet
+    /// sent from this socket.
+    ///
+    /// NOTE: <https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-ip-socket-options>
+    /// documents that not all versions of windows support `IP_TOS`.
+    #[cfg(not(any(
+        target_os = "fuschia",
+        target_os = "redox",
+        target_os = "solaris",
+        target_os = "illumos",
+    )))]
+    pub fn set_tos(&self, tos: u32) -> io::Result<()> {
+        unsafe { setsockopt(self.as_raw(), sys::IPPROTO_IP, sys::IP_TOS, tos as c_int) }
+    }
+
+    /// Get the value of the `IP_TOS` option for this socket.
+    ///
+    /// For more information about this option, see [`set_tos`].
+    ///
+    /// NOTE: <https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-ip-socket-options>
+    /// documents that not all versions of windows support `IP_TOS`.
+    /// [`set_tos`]: Socket::set_tos
+    #[cfg(not(any(
+        target_os = "fuschia",
+        target_os = "redox",
+        target_os = "solaris",
+        target_os = "illumos",
+    )))]
+    pub fn tos(&self) -> io::Result<u32> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IP, sys::IP_TOS).map(|tos| tos as u32)
+        }
     }
+}
 
-    /// Executes an operation of the `IPV6_ADD_MEMBERSHIP` type.
+/// Socket options for IPv6 sockets, get/set using `IPPROTO_IPV6`.
+///
+/// Additional documentation can be found in documentation of the OS.
+/// * Linux: <https://man7.org/linux/man-pages/man7/ipv6.7.html>
+/// * Windows: <https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-ipv6-socket-options>
+impl Socket {
+    /// Join a multicast group using `IPV6_ADD_MEMBERSHIP` option on this socket.
+    ///
+    /// Some OSs use `IPV6_JOIN_GROUP` for this option.
     ///
     /// This function specifies a new multicast group for this socket to join.
     /// The address must be a valid multicast address, and `interface` is the
     /// index of the interface to join/leave (or 0 to indicate any interface).
     pub fn join_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
-        self.inner.join_multicast_v6(multiaddr, interface)
+        let mreq = sys::Ipv6Mreq {
+            ipv6mr_multiaddr: sys::to_in6_addr(multiaddr),
+            // NOTE: some OSs use `c_int`, others use `c_uint`.
+            ipv6mr_interface: interface as _,
+        };
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IPV6,
+                sys::IPV6_ADD_MEMBERSHIP,
+                mreq,
+            )
+        }
     }
 
-    /// Executes an operation of the `IP_DROP_MEMBERSHIP` type.
+    /// Leave a multicast group using `IPV6_DROP_MEMBERSHIP` option on this socket.
     ///
-    /// For more information about this option, see
-    /// [`join_multicast_v4`][link].
+    /// Some OSs use `IPV6_LEAVE_GROUP` for this option.
     ///
-    /// [link]: #method.join_multicast_v4
-    pub fn leave_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
-        self.inner.leave_multicast_v4(multiaddr, interface)
-    }
-
-    /// Executes an operation of the `IPV6_DROP_MEMBERSHIP` type.
+    /// For more information about this option, see [`join_multicast_v6`].
     ///
-    /// For more information about this option, see
-    /// [`join_multicast_v6`][link].
-    ///
-    /// [link]: #method.join_multicast_v6
+    /// [`join_multicast_v6`]: Socket::join_multicast_v6
     pub fn leave_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
-        self.inner.leave_multicast_v6(multiaddr, interface)
+        let mreq = sys::Ipv6Mreq {
+            ipv6mr_multiaddr: sys::to_in6_addr(multiaddr),
+            // NOTE: some OSs use `c_int`, others use `c_uint`.
+            ipv6mr_interface: interface as _,
+        };
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IPV6,
+                sys::IPV6_DROP_MEMBERSHIP,
+                mreq,
+            )
+        }
     }
 
-    /// Reads the linger duration for this socket by getting the SO_LINGER
-    /// option
-    pub fn linger(&self) -> io::Result<Option<Duration>> {
-        self.inner.linger()
+    /// Get the value of the `IPV6_MULTICAST_HOPS` option for this socket
+    ///
+    /// For more information about this option, see [`set_multicast_hops_v6`].
+    ///
+    /// [`set_multicast_hops_v6`]: Socket::set_multicast_hops_v6
+    pub fn multicast_hops_v6(&self) -> io::Result<u32> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IPV6, sys::IPV6_MULTICAST_HOPS)
+                .map(|hops| hops as u32)
+        }
     }
 
-    /// Sets the linger duration of this socket by setting the SO_LINGER option
-    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.inner.set_linger(dur)
+    /// Set the value of the `IPV6_MULTICAST_HOPS` option for this socket
+    ///
+    /// Indicates the number of "routers" multicast packets will transit for
+    /// this socket. The default value is 1 which means that multicast packets
+    /// don't leave the local network unless explicitly requested.
+    pub fn set_multicast_hops_v6(&self, hops: u32) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IPV6,
+                sys::IPV6_MULTICAST_HOPS,
+                hops as c_int,
+            )
+        }
     }
 
-    /// Check the `SO_REUSEADDR` option on this socket.
-    pub fn reuse_address(&self) -> io::Result<bool> {
-        self.inner.reuse_address()
+    /// Get the value of the `IPV6_MULTICAST_IF` option for this socket.
+    ///
+    /// For more information about this option, see [`set_multicast_if_v6`].
+    ///
+    /// [`set_multicast_if_v6`]: Socket::set_multicast_if_v6
+    pub fn multicast_if_v6(&self) -> io::Result<u32> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IPV6, sys::IPV6_MULTICAST_IF)
+                .map(|interface| interface as u32)
+        }
     }
 
-    /// Set value for the `SO_REUSEADDR` option on this socket.
+    /// Set the value of the `IPV6_MULTICAST_IF` option for this socket.
     ///
-    /// This indicates that futher calls to `bind` may allow reuse of local
-    /// addresses. For IPv4 sockets this means that a socket may bind even when
-    /// there's a socket already listening on this port.
-    pub fn set_reuse_address(&self, reuse: bool) -> io::Result<()> {
-        self.inner.set_reuse_address(reuse)
+    /// Specifies the interface to use for routing multicast packets. Unlike
+    /// ipv4, this is generally required in ipv6 contexts where network routing
+    /// prefixes may overlap.
+    pub fn set_multicast_if_v6(&self, interface: u32) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IPV6,
+                sys::IPV6_MULTICAST_IF,
+                interface as c_int,
+            )
+        }
     }
 
-    /// Gets the value of the `SO_RCVBUF` option on this socket.
+    /// Get the value of the `IPV6_MULTICAST_LOOP` option for this socket.
     ///
-    /// For more information about this option, see
-    /// [`set_recv_buffer_size`][link].
+    /// For more information about this option, see [`set_multicast_loop_v6`].
     ///
-    /// [link]: #method.set_recv_buffer_size
-    pub fn recv_buffer_size(&self) -> io::Result<usize> {
-        self.inner.recv_buffer_size()
+    /// [`set_multicast_loop_v6`]: Socket::set_multicast_loop_v6
+    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IPV6, sys::IPV6_MULTICAST_LOOP)
+                .map(|loop_v6| loop_v6 != 0)
+        }
     }
 
-    /// Sets the value of the `SO_RCVBUF` option on this socket.
+    /// Set the value of the `IPV6_MULTICAST_LOOP` option for this socket.
     ///
-    /// Changes the size of the operating system's receive buffer associated
-    /// with the socket.
-    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.inner.set_recv_buffer_size(size)
+    /// Controls whether this socket sees the multicast packets it sends itself.
+    /// Note that this may not have any affect on IPv4 sockets.
+    pub fn set_multicast_loop_v6(&self, loop_v6: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IPV6,
+                sys::IPV6_MULTICAST_LOOP,
+                loop_v6 as c_int,
+            )
+        }
     }
 
-    /// Gets the value of the `SO_SNDBUF` option on this socket.
-    ///
-    /// For more information about this option, see [`set_send_buffer`][link].
+    /// Get the value of the `IPV6_UNICAST_HOPS` option for this socket.
     ///
-    /// [link]: #method.set_send_buffer
-    pub fn send_buffer_size(&self) -> io::Result<usize> {
-        self.inner.send_buffer_size()
+    /// Specifies the hop limit for ipv6 unicast packets
+    pub fn unicast_hops_v6(&self) -> io::Result<u32> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IPV6, sys::IPV6_UNICAST_HOPS)
+                .map(|hops| hops as u32)
+        }
     }
 
-    /// Sets the value of the `SO_SNDBUF` option on this socket.
+    /// Set the value for the `IPV6_UNICAST_HOPS` option on this socket.
     ///
-    /// Changes the size of the operating system's send buffer associated with
-    /// the socket.
-    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.inner.set_send_buffer_size(size)
+    /// Specifies the hop limit for ipv6 unicast packets
+    pub fn set_unicast_hops_v6(&self, hops: u32) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IPV6,
+                sys::IPV6_UNICAST_HOPS,
+                hops as c_int,
+            )
+        }
     }
 
-    /// Returns whether keepalive messages are enabled on this socket, and if so
-    /// the duration of time between them.
+    /// Get the value of the `IPV6_V6ONLY` option for this socket.
     ///
-    /// For more information about this option, see [`set_keepalive`][link].
+    /// For more information about this option, see [`set_only_v6`].
     ///
-    /// [link]: #method.set_keepalive
-    pub fn keepalive(&self) -> io::Result<Option<Duration>> {
-        self.inner.keepalive()
+    /// [`set_only_v6`]: Socket::set_only_v6
+    pub fn only_v6(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_IPV6, sys::IPV6_V6ONLY)
+                .map(|only_v6| only_v6 != 0)
+        }
     }
 
-    /// Sets whether keepalive messages are enabled to be sent on this socket.
+    /// Set the value for the `IPV6_V6ONLY` option on this socket.
     ///
-    /// On Unix, this option will set the `SO_KEEPALIVE` as well as the
-    /// `TCP_KEEPALIVE` or `TCP_KEEPIDLE` option (depending on your platform).
-    /// On Windows, this will set the `SIO_KEEPALIVE_VALS` option.
-    ///
-    /// If `None` is specified then keepalive messages are disabled, otherwise
-    /// the duration specified will be the time to remain idle before sending a
-    /// TCP keepalive probe.
+    /// If this is set to `true` then the socket is restricted to sending and
+    /// receiving IPv6 packets only. In this case two IPv4 and IPv6 applications
+    /// can bind the same port at the same time.
     ///
-    /// Some platforms specify this value in seconds, so sub-second
-    /// specifications may be omitted.
-    pub fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
-        self.inner.set_keepalive(keepalive)
+    /// If this is set to `false` then the socket can be used to send and
+    /// receive packets from an IPv4-mapped IPv6 address.
+    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_IPV6,
+                sys::IPV6_V6ONLY,
+                only_v6 as c_int,
+            )
+        }
     }
+}
 
-    /// Returns the value of the `SO_OOBINLINE` flag of the underlying socket.
-    /// For more information about this option, see [`set_out_of_band_inline`][link].
+/// Socket options for TCP sockets, get/set using `IPPROTO_TCP`.
+///
+/// Additional documentation can be found in documentation of the OS.
+/// * Linux: <https://man7.org/linux/man-pages/man7/tcp.7.html>
+/// * Windows: <https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-options>
+impl Socket {
+    /// Get the value of the `TCP_KEEPIDLE` option on this socket.
     ///
-    /// [link]: #method.set_out_of_band_inline
-    pub fn out_of_band_inline(&self) -> io::Result<bool> {
-        self.inner.out_of_band_inline()
+    /// This returns the value of `SO_KEEPALIVE` on OpenBSD and Haiku,
+    /// `TCP_KEEPALIVE` on macOS and iOS, and `TCP_KEEPIDLE` on all other Unix
+    /// operating systems.
+    #[cfg(any(doc, all(feature = "all", not(windows))))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", not(windows)))))]
+    pub fn keepalive_time(&self) -> io::Result<Duration> {
+        sys::keepalive_time(self.as_raw())
     }
 
-    /// Sets the `SO_OOBINLINE` flag of the underlying socket.
-    /// as per RFC6093, TCP sockets using the Urgent mechanism
-    /// are encouraged to set this flag.
+    /// Get the value of the `TCP_KEEPINTVL` option on this socket.
     ///
-    /// If this flag is not set, the `MSG_OOB` flag is needed
-    /// while `recv`ing to aquire the out-of-band data.
-    pub fn set_out_of_band_inline(&self, oob_inline: bool) -> io::Result<()> {
-        self.inner.set_out_of_band_inline(oob_inline)
-    }
-
-    /// Check the value of the `SO_REUSEPORT` option on this socket.
+    /// For more information about this option, see [`set_tcp_keepalive`].
     ///
-    /// This function is only available on Unix when the `reuseport` feature is
-    /// enabled.
+    /// [`set_tcp_keepalive`]: Socket::set_tcp_keepalive
     #[cfg(all(
-        unix,
-        not(any(target_os = "solaris", target_os = "illumos")),
-        feature = "reuseport"
+        feature = "all",
+        any(
+            doc,
+            target_os = "android",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "illumos",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_vendor = "apple",
+        )
     ))]
-    pub fn reuse_port(&self) -> io::Result<bool> {
-        self.inner.reuse_port()
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "android",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "illumos",
+                target_os = "linux",
+                target_os = "netbsd",
+                target_vendor = "apple",
+            )
+        )))
+    )]
+    pub fn keepalive_interval(&self) -> io::Result<Duration> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_TCP, sys::TCP_KEEPINTVL)
+                .map(|secs| Duration::from_secs(secs as u64))
+        }
     }
 
-    /// Set value for the `SO_REUSEPORT` option on this socket.
+    /// Get the value of the `TCP_KEEPCNT` option on this socket.
     ///
-    /// This indicates that further calls to `bind` may allow reuse of local
-    /// addresses. For IPv4 sockets this means that a socket may bind even when
-    /// there's a socket already listening on this port.
+    /// For more information about this option, see [`set_tcp_keepalive`].
     ///
-    /// This function is only available on Unix when the `reuseport` feature is
-    /// enabled.
+    /// [`set_tcp_keepalive`]: Socket::set_tcp_keepalive
     #[cfg(all(
-        unix,
-        not(any(target_os = "solaris", target_os = "illumos")),
-        feature = "reuseport"
+        feature = "all",
+        any(
+            doc,
+            target_os = "android",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "illumos",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_vendor = "apple",
+        )
     ))]
-    pub fn set_reuse_port(&self, reuse: bool) -> io::Result<()> {
-        self.inner.set_reuse_port(reuse)
-    }
-}
-
-impl Read for Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.inner.read(buf)
-    }
-}
-
-impl<'a> Read for &'a Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        (&self.inner).read(buf)
-    }
-}
-
-impl Write for Socket {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.inner.write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.inner.flush()
-    }
-}
-
-impl<'a> Write for &'a Socket {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        (&self.inner).write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&self.inner).flush()
-    }
-}
-
-impl fmt::Debug for Socket {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-impl From<net::TcpStream> for Socket {
-    fn from(socket: net::TcpStream) -> Socket {
-        Socket {
-            inner: socket.into(),
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "android",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "illumos",
+                target_os = "linux",
+                target_os = "netbsd",
+                target_vendor = "apple",
+            )
+        )))
+    )]
+    pub fn keepalive_retries(&self) -> io::Result<u32> {
+        unsafe {
+            getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_TCP, sys::TCP_KEEPCNT)
+                .map(|retries| retries as u32)
         }
     }
-}
 
-impl From<net::TcpListener> for Socket {
-    fn from(socket: net::TcpListener) -> Socket {
-        Socket {
-            inner: socket.into(),
-        }
-    }
-}
-
-impl From<net::UdpSocket> for Socket {
-    fn from(socket: net::UdpSocket) -> Socket {
-        Socket {
-            inner: socket.into(),
-        }
+    /// Set parameters configuring TCP keepalive probes for this socket.
+    ///
+    /// The supported parameters depend on the operating system, and are
+    /// configured using the [`TcpKeepalive`] struct. At a minimum, all systems
+    /// support configuring the [keepalive time]: the time after which the OS
+    /// will start sending keepalive messages on an idle connection.
+    ///
+    /// [keepalive time]: TcpKeepalive::with_time
+    ///
+    /// # Notes
+    ///
+    /// * This will enable `SO_KEEPALIVE` on this socket, if it is not already
+    ///   enabled.
+    /// * On some platforms, such as Windows, any keepalive parameters *not*
+    ///   configured by the `TcpKeepalive` struct passed to this function may be
+    ///   overwritten with their default values. Therefore, this function should
+    ///   either only be called once per socket, or the same parameters should
+    ///   be passed every time it is called.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::time::Duration;
+    ///
+    /// use socket2::{Socket, TcpKeepalive, Domain, Type};
+    ///
+    /// # fn main() -> std::io::Result<()> {
+    /// let socket = Socket::new(Domain::IPV4, Type::STREAM, None)?;
+    /// let keepalive = TcpKeepalive::new()
+    ///     .with_time(Duration::from_secs(4));
+    ///     // Depending on the target operating system, we may also be able to
+    ///     // configure the keepalive probe interval and/or the number of
+    ///     // retries here as well.
+    ///
+    /// socket.set_tcp_keepalive(&keepalive)?;
+    /// # Ok(()) }
+    /// ```
+    ///
+    pub fn set_tcp_keepalive(&self, params: &TcpKeepalive) -> io::Result<()> {
+        self.set_keepalive(true)?;
+        sys::set_tcp_keepalive(self.as_raw(), params)
     }
-}
 
-#[cfg(all(unix, feature = "unix"))]
-impl From<UnixStream> for Socket {
-    fn from(socket: UnixStream) -> Socket {
-        Socket {
-            inner: socket.into(),
+    /// Get the value of the `TCP_NODELAY` option on this socket.
+    ///
+    /// For more information about this option, see [`set_nodelay`].
+    ///
+    /// [`set_nodelay`]: Socket::set_nodelay
+    pub fn nodelay(&self) -> io::Result<bool> {
+        unsafe {
+            getsockopt::<Bool>(self.as_raw(), sys::IPPROTO_TCP, sys::TCP_NODELAY)
+                .map(|nodelay| nodelay != 0)
         }
     }
-}
 
-#[cfg(all(unix, feature = "unix"))]
-impl From<UnixListener> for Socket {
-    fn from(socket: UnixListener) -> Socket {
-        Socket {
-            inner: socket.into(),
+    /// Set the value of the `TCP_NODELAY` option on this socket.
+    ///
+    /// If set, this option disables the Nagle algorithm. This means that
+    /// segments are always sent as soon as possible, even if there is only a
+    /// small amount of data. When not set, data is buffered until there is a
+    /// sufficient amount to send out, thereby avoiding the frequent sending of
+    /// small packets.
+    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                sys::IPPROTO_TCP,
+                sys::TCP_NODELAY,
+                nodelay as c_int,
+            )
         }
     }
 }
 
-#[cfg(all(unix, feature = "unix"))]
-impl From<UnixDatagram> for Socket {
-    fn from(socket: UnixDatagram) -> Socket {
-        Socket {
-            inner: socket.into(),
-        }
+impl Read for Socket {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        // Safety: the `recv` implementation promises not to write uninitialised
+        // bytes to the `buf`fer, so this casting is safe.
+        let buf = unsafe { &mut *(buf as *mut [u8] as *mut [MaybeUninit<u8>]) };
+        self.recv(buf)
     }
-}
 
-impl From<Socket> for net::TcpStream {
-    fn from(socket: Socket) -> net::TcpStream {
-        socket.inner.into()
+    #[cfg(not(target_os = "redox"))]
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        // Safety: both `IoSliceMut` and `MaybeUninitSlice` promise to have the
+        // same layout, that of `iovec`/`WSABUF`. Furthermore `recv_vectored`
+        // promises to not write unitialised bytes to the `bufs` and pass it
+        // directly to the `recvmsg` system call, so this is safe.
+        let bufs = unsafe { &mut *(bufs as *mut [IoSliceMut<'_>] as *mut [MaybeUninitSlice<'_>]) };
+        self.recv_vectored(bufs).map(|(n, _)| n)
     }
 }
 
-impl From<Socket> for net::TcpListener {
-    fn from(socket: Socket) -> net::TcpListener {
-        socket.inner.into()
+impl<'a> Read for &'a Socket {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        // Safety: see other `Read::read` impl.
+        let buf = unsafe { &mut *(buf as *mut [u8] as *mut [MaybeUninit<u8>]) };
+        self.recv(buf)
     }
-}
 
-impl From<Socket> for net::UdpSocket {
-    fn from(socket: Socket) -> net::UdpSocket {
-        socket.inner.into()
+    #[cfg(not(target_os = "redox"))]
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        // Safety: see other `Read::read` impl.
+        let bufs = unsafe { &mut *(bufs as *mut [IoSliceMut<'_>] as *mut [MaybeUninitSlice<'_>]) };
+        self.recv_vectored(bufs).map(|(n, _)| n)
     }
 }
 
-#[cfg(all(unix, feature = "unix"))]
-impl From<Socket> for UnixStream {
-    fn from(socket: Socket) -> UnixStream {
-        socket.inner.into()
+impl Write for Socket {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.send(buf)
     }
-}
 
-#[cfg(all(unix, feature = "unix"))]
-impl From<Socket> for UnixListener {
-    fn from(socket: Socket) -> UnixListener {
-        socket.inner.into()
+    #[cfg(not(target_os = "redox"))]
+    fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.send_vectored(bufs)
     }
-}
 
-#[cfg(all(unix, feature = "unix"))]
-impl From<Socket> for UnixDatagram {
-    fn from(socket: Socket) -> UnixDatagram {
-        socket.inner.into()
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
     }
 }
 
-#[cfg(test)]
-mod test {
-    use std::net::SocketAddr;
-
-    use super::*;
-
-    #[test]
-    fn connect_timeout_unrouteable() {
-        // this IP is unroutable, so connections should always time out
-        let addr = "10.255.255.1:80".parse::<SocketAddr>().unwrap().into();
-
-        let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        match socket.connect_timeout(&addr, Duration::from_millis(250)) {
-            Ok(_) => panic!("unexpected success"),
-            Err(ref e) if e.kind() == io::ErrorKind::TimedOut => {}
-            Err(e) => panic!("unexpected error {}", e),
-        }
-    }
-
-    #[test]
-    fn connect_timeout_unbound() {
-        // bind and drop a socket to track down a "probably unassigned" port
-        let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        let addr = "127.0.0.1:0".parse::<SocketAddr>().unwrap().into();
-        socket.bind(&addr).unwrap();
-        let addr = socket.local_addr().unwrap();
-        drop(socket);
-
-        let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        match socket.connect_timeout(&addr, Duration::from_millis(250)) {
-            Ok(_) => panic!("unexpected success"),
-            Err(ref e)
-                if e.kind() == io::ErrorKind::ConnectionRefused
-                    || e.kind() == io::ErrorKind::TimedOut => {}
-            Err(e) => panic!("unexpected error {}", e),
-        }
-    }
-
-    #[test]
-    fn connect_timeout_valid() {
-        let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        socket
-            .bind(&"127.0.0.1:0".parse::<SocketAddr>().unwrap().into())
-            .unwrap();
-        socket.listen(128).unwrap();
-
-        let addr = socket.local_addr().unwrap();
-
-        let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        socket
-            .connect_timeout(&addr, Duration::from_millis(250))
-            .unwrap();
-    }
-
-    #[test]
-    #[cfg(all(unix, feature = "pair", feature = "unix"))]
-    fn pair() {
-        let (mut a, mut b) = Socket::pair(Domain::unix(), Type::stream(), None).unwrap();
-        a.write_all(b"hello world").unwrap();
-        let mut buf = [0; 11];
-        b.read_exact(&mut buf).unwrap();
-        assert_eq!(buf, &b"hello world"[..]);
-    }
-
-    #[test]
-    #[cfg(all(unix, feature = "unix"))]
-    fn unix() {
-        use tempdir::TempDir;
-
-        let dir = TempDir::new("unix").unwrap();
-        let addr = SockAddr::unix(dir.path().join("sock")).unwrap();
-
-        let listener = Socket::new(Domain::unix(), Type::stream(), None).unwrap();
-        listener.bind(&addr).unwrap();
-        listener.listen(10).unwrap();
-
-        let mut a = Socket::new(Domain::unix(), Type::stream(), None).unwrap();
-        a.connect(&addr).unwrap();
-
-        let mut b = listener.accept().unwrap().0;
-
-        a.write_all(b"hello world").unwrap();
-        let mut buf = [0; 11];
-        b.read_exact(&mut buf).unwrap();
-        assert_eq!(buf, &b"hello world"[..]);
-    }
-
-    #[test]
-    fn keepalive() {
-        let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        socket.set_keepalive(Some(Duration::from_secs(7))).unwrap();
-        // socket.keepalive() doesn't work on Windows #24
-        #[cfg(unix)]
-        assert_eq!(socket.keepalive().unwrap(), Some(Duration::from_secs(7)));
-        socket.set_keepalive(None).unwrap();
-        #[cfg(unix)]
-        assert_eq!(socket.keepalive().unwrap(), None);
-    }
-
-    #[test]
-    fn nodelay() {
-        let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-
-        assert!(socket.set_nodelay(true).is_ok());
-
-        let result = socket.nodelay();
-
-        assert!(result.is_ok());
-        assert!(result.unwrap());
+impl<'a> Write for &'a Socket {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.send(buf)
     }
 
-    #[test]
-    fn out_of_band_inline() {
-        let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-
-        assert_eq!(socket.out_of_band_inline().unwrap(), false);
-
-        socket.set_out_of_band_inline(true).unwrap();
-        assert_eq!(socket.out_of_band_inline().unwrap(), true);
+    #[cfg(not(target_os = "redox"))]
+    fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
+        self.send_vectored(bufs)
     }
 
-    #[test]
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
-    fn out_of_band_send_recv() {
-        let s1 = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        s1.bind(&"127.0.0.1:0".parse::<SocketAddr>().unwrap().into())
-            .unwrap();
-        let s1_addr = s1.local_addr().unwrap();
-        s1.listen(1).unwrap();
-
-        let s2 = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        s2.connect(&s1_addr).unwrap();
-
-        let (s3, _) = s1.accept().unwrap();
-
-        let mut buf = [0; 10];
-        // send some plain inband data
-        s2.send(&mut buf).unwrap();
-        // send a single out of band byte
-        assert_eq!(s2.send_out_of_band(&mut [b"!"[0]]).unwrap(), 1);
-        // recv the OOB data first
-        assert_eq!(s3.recv_out_of_band(&mut buf).unwrap(), 1);
-        assert_eq!(buf[0], b"!"[0]);
-        assert_eq!(s3.recv(&mut buf).unwrap(), 10);
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
     }
+}
 
-    #[test]
-    fn tcp() {
-        let s1 = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        s1.bind(&"127.0.0.1:0".parse::<SocketAddr>().unwrap().into())
-            .unwrap();
-        let s1_addr = s1.local_addr().unwrap();
-        s1.listen(1).unwrap();
-
-        let s2 = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
-        s2.connect(&s1_addr).unwrap();
-
-        let (s3, _) = s1.accept().unwrap();
-
-        let mut buf = [0; 11];
-        assert_eq!(s2.send(&mut buf).unwrap(), 11);
-        assert_eq!(s3.recv(&mut buf).unwrap(), 11);
+impl fmt::Debug for Socket {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Socket")
+            .field("raw", &self.as_raw())
+            .field("local_addr", &self.local_addr().ok())
+            .field("peer_addr", &self.peer_addr().ok())
+            .finish()
     }
 }
+
+from!(net::TcpStream, Socket);
+from!(net::TcpListener, Socket);
+from!(net::UdpSocket, Socket);
+from!(Socket, net::TcpStream);
+from!(Socket, net::TcpListener);
+from!(Socket, net::UdpSocket);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/sockref.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/sockref.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/sockref.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/sockref.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,147 @@
+use std::fmt;
+use std::marker::PhantomData;
+use std::mem::ManuallyDrop;
+use std::ops::Deref;
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, FromRawFd};
+#[cfg(windows)]
+use std::os::windows::io::{AsRawSocket, FromRawSocket};
+
+use crate::Socket;
+
+/// A reference to a [`Socket`] that can be used to configure socket types other
+/// than the `Socket` type itself.
+///
+/// This allows for example a [`TcpStream`], found in the standard library, to
+/// be configured using all the additional methods found in the [`Socket`] API.
+///
+/// `SockRef` can be created from any socket type that implements [`AsRawFd`]
+/// (Unix) or [`AsRawSocket`] (Windows) using the [`From`] implementation, but
+/// the caller must ensure the file descriptor/socket is a valid.
+///
+/// [`TcpStream`]: std::net::TcpStream
+// Don't use intra-doc links because they won't build on every platform.
+/// [`AsRawFd`]: https://doc.rust-lang.org/stable/std/os/unix/io/trait.AsRawFd.html
+/// [`AsRawSocket`]: https://doc.rust-lang.org/stable/std/os/windows/io/trait.AsRawSocket.html
+///
+/// # Examples
+///
+/// Below is an example of converting a [`TcpStream`] into a [`SockRef`].
+///
+/// ```
+/// use std::net::{TcpStream, SocketAddr};
+///
+/// use socket2::SockRef;
+///
+/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
+/// // Create `TcpStream` from the standard library.
+/// let address: SocketAddr = "127.0.0.1:1234".parse()?;
+/// # let b1 = std::sync::Arc::new(std::sync::Barrier::new(2));
+/// # let b2 = b1.clone();
+/// # let handle = std::thread::spawn(move || {
+/// #    let listener = std::net::TcpListener::bind(address).unwrap();
+/// #    b2.wait();
+/// #    let (stream, _) = listener.accept().unwrap();
+/// #    std::thread::sleep(std::time::Duration::from_millis(10));
+/// #    drop(stream);
+/// # });
+/// # b1.wait();
+/// let stream = TcpStream::connect(address)?;
+///
+/// // Create a `SockRef`erence to the stream.
+/// let socket_ref = SockRef::from(&stream);
+/// // Use `Socket::set_nodelay` on the stream.
+/// socket_ref.set_nodelay(true)?;
+/// drop(socket_ref);
+///
+/// assert_eq!(stream.nodelay()?, true);
+/// # handle.join().unwrap();
+/// # Ok(())
+/// # }
+/// ```
+///
+/// Below is an example of **incorrect usage** of `SockRef::from`, which is
+/// currently possible (but not intended and will be fixed in future versions).
+///
+/// ```compile_fail
+/// use socket2::SockRef;
+///
+/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
+/// /// THIS USAGE IS NOT VALID!
+/// let socket_ref = SockRef::from(&123);
+/// // The above line is overseen possibility when using `SockRef::from`, it
+/// // uses the `RawFd` (on Unix), which is a type alias for `c_int`/`i32`,
+/// // which implements `AsRawFd`. However it may be clear that this usage is
+/// // invalid as it doesn't guarantee that `123` is a valid file descriptor.
+///
+/// // Using `Socket::set_nodelay` now will call it on a file descriptor we
+/// // don't own! We don't even not if the file descriptor is valid or a socket.
+/// socket_ref.set_nodelay(true)?;
+/// drop(socket_ref);
+/// # Ok(())
+/// # }
+/// # DO_NOT_COMPILE
+/// ```
+pub struct SockRef<'s> {
+    /// Because this is a reference we don't own the `Socket`, however `Socket`
+    /// closes itself when dropped, so we use `ManuallyDrop` to prevent it from
+    /// closing itself.
+    socket: ManuallyDrop<Socket>,
+    /// Because we don't own the socket we need to ensure the socket remains
+    /// open while we have a "reference" to it, the lifetime `'s` ensures this.
+    _lifetime: PhantomData<&'s Socket>,
+}
+
+impl<'s> Deref for SockRef<'s> {
+    type Target = Socket;
+
+    fn deref(&self) -> &Self::Target {
+        &self.socket
+    }
+}
+
+/// On Windows, a corresponding `From<&impl AsRawSocket>` implementation exists.
+#[cfg(unix)]
+#[cfg_attr(docsrs, doc(cfg(unix)))]
+impl<'s, S> From<&'s S> for SockRef<'s>
+where
+    S: AsRawFd,
+{
+    /// The caller must ensure `S` is actually a socket.
+    fn from(socket: &'s S) -> Self {
+        let fd = socket.as_raw_fd();
+        assert!(fd >= 0);
+        SockRef {
+            socket: ManuallyDrop::new(unsafe { Socket::from_raw_fd(fd) }),
+            _lifetime: PhantomData,
+        }
+    }
+}
+
+/// On Unix, a corresponding `From<&impl AsRawFd>` implementation exists.
+#[cfg(windows)]
+#[cfg_attr(docsrs, doc(cfg(windows)))]
+impl<'s, S> From<&'s S> for SockRef<'s>
+where
+    S: AsRawSocket,
+{
+    /// See the `From<&impl AsRawFd>` implementation.
+    fn from(socket: &'s S) -> Self {
+        let socket = socket.as_raw_socket();
+        assert!(socket != winapi::um::winsock2::INVALID_SOCKET as _);
+        SockRef {
+            socket: ManuallyDrop::new(unsafe { Socket::from_raw_socket(socket) }),
+            _lifetime: PhantomData,
+        }
+    }
+}
+
+impl fmt::Debug for SockRef<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SockRef")
+            .field("raw", &self.socket.as_raw())
+            .field("local_addr", &self.socket.local_addr().ok())
+            .field("peer_addr", &self.socket.peer_addr().ok())
+            .finish()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/sys/unix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/sys/unix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/sys/unix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/sys/unix.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,4 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
+// Copyright 2015 The Rust Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -8,86 +6,227 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::cmp;
-#[cfg(target_os = "linux")]
-use std::ffi::{CStr, CString};
-use std::fmt;
-use std::io;
-use std::io::{ErrorKind, Read, Write};
-use std::mem;
-#[cfg(target_os = "linux")]
-use std::mem::MaybeUninit;
+use std::cmp::min;
+#[cfg(not(target_os = "redox"))]
+use std::io::IoSlice;
+use std::marker::PhantomData;
+use std::mem::{self, size_of, MaybeUninit};
 use std::net::Shutdown;
-use std::net::{self, Ipv4Addr, Ipv6Addr};
-use std::ops::Neg;
-#[cfg(feature = "unix")]
+use std::net::{Ipv4Addr, Ipv6Addr};
+#[cfg(all(feature = "all", target_vendor = "apple"))]
+use std::num::NonZeroU32;
+#[cfg(all(
+    feature = "all",
+    any(
+        target_os = "android",
+        target_os = "freebsd",
+        target_os = "linux",
+        target_vendor = "apple",
+    )
+))]
+use std::num::NonZeroUsize;
+#[cfg(feature = "all")]
+use std::os::unix::ffi::OsStrExt;
+#[cfg(all(
+    feature = "all",
+    any(
+        target_os = "android",
+        target_os = "freebsd",
+        target_os = "linux",
+        target_vendor = "apple",
+    )
+))]
+use std::os::unix::io::RawFd;
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd};
+#[cfg(feature = "all")]
 use std::os::unix::net::{UnixDatagram, UnixListener, UnixStream};
-use std::os::unix::prelude::*;
-#[cfg(target_os = "linux")]
+#[cfg(feature = "all")]
+use std::path::Path;
+#[cfg(not(all(target_os = "redox", not(feature = "all"))))]
 use std::ptr;
-#[cfg(target_os = "linux")]
-use std::slice;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::{Duration, Instant};
+use std::{io, slice};
 
-use libc::{self, c_void, socklen_t, ssize_t};
+#[cfg(not(target_vendor = "apple"))]
+use libc::ssize_t;
+use libc::{c_void, in6_addr, in_addr};
 
-use crate::{Domain, Type};
+#[cfg(not(target_os = "redox"))]
+use crate::RecvFlags;
+use crate::{Domain, Protocol, SockAddr, TcpKeepalive, Type};
 
-pub use libc::c_int;
+pub(crate) use libc::c_int;
 
 // Used in `Domain`.
 pub(crate) use libc::{AF_INET, AF_INET6};
 // Used in `Type`.
-#[cfg(not(target_os = "redox"))]
+#[cfg(all(feature = "all", not(target_os = "redox")))]
 pub(crate) use libc::SOCK_RAW;
-pub(crate) use libc::{SOCK_DGRAM, SOCK_SEQPACKET, SOCK_STREAM};
+#[cfg(feature = "all")]
+pub(crate) use libc::SOCK_SEQPACKET;
+pub(crate) use libc::{SOCK_DGRAM, SOCK_STREAM};
 // Used in `Protocol`.
 pub(crate) use libc::{IPPROTO_ICMP, IPPROTO_ICMPV6, IPPROTO_TCP, IPPROTO_UDP};
+// Used in `SockAddr`.
+pub(crate) use libc::{
+    sa_family_t, sockaddr, sockaddr_in, sockaddr_in6, sockaddr_storage, socklen_t,
+};
+// Used in `RecvFlags`.
+#[cfg(not(target_os = "redox"))]
+pub(crate) use libc::{MSG_TRUNC, SO_OOBINLINE};
+// Used in `Socket`.
+#[cfg(not(any(
+    target_os = "fuschia",
+    target_os = "redox",
+    target_os = "solaris",
+    target_os = "illumos",
+)))]
+pub(crate) use libc::IP_TOS;
+#[cfg(not(target_vendor = "apple"))]
+pub(crate) use libc::SO_LINGER;
+#[cfg(target_vendor = "apple")]
+pub(crate) use libc::SO_LINGER_SEC as SO_LINGER;
+pub(crate) use libc::{
+    ip_mreq as IpMreq, ipv6_mreq as Ipv6Mreq, linger, IPPROTO_IP, IPPROTO_IPV6,
+    IPV6_MULTICAST_HOPS, IPV6_MULTICAST_IF, IPV6_MULTICAST_LOOP, IPV6_UNICAST_HOPS, IPV6_V6ONLY,
+    IP_ADD_MEMBERSHIP, IP_DROP_MEMBERSHIP, IP_MULTICAST_IF, IP_MULTICAST_LOOP, IP_MULTICAST_TTL,
+    IP_TTL, MSG_OOB, MSG_PEEK, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_KEEPALIVE, SO_RCVBUF,
+    SO_RCVTIMEO, SO_REUSEADDR, SO_SNDBUF, SO_SNDTIMEO, SO_TYPE, TCP_NODELAY,
+};
+#[cfg(not(any(
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "haiku",
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "openbsd",
+    target_os = "solaris",
+    target_vendor = "apple"
+)))]
+pub(crate) use libc::{IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP};
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "haiku",
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "openbsd",
+    target_os = "solaris",
+    target_vendor = "apple",
+))]
+pub(crate) use libc::{
+    IPV6_JOIN_GROUP as IPV6_ADD_MEMBERSHIP, IPV6_LEAVE_GROUP as IPV6_DROP_MEMBERSHIP,
+};
+#[cfg(all(
+    feature = "all",
+    any(
+        target_os = "android",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "fuchsia",
+        target_os = "illumos",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_vendor = "apple",
+    )
+))]
+pub(crate) use libc::{TCP_KEEPCNT, TCP_KEEPINTVL};
 
-cfg_if::cfg_if! {
-    if #[cfg(any(target_os = "dragonfly", target_os = "freebsd",
-                 target_os = "ios", target_os = "macos",
-                 target_os = "openbsd", target_os = "netbsd",
-                 target_os = "solaris", target_os = "illumos",
-                 target_os = "haiku"))] {
-        use libc::IPV6_JOIN_GROUP as IPV6_ADD_MEMBERSHIP;
-        use libc::IPV6_LEAVE_GROUP as IPV6_DROP_MEMBERSHIP;
-    } else {
-        use libc::IPV6_ADD_MEMBERSHIP;
-        use libc::IPV6_DROP_MEMBERSHIP;
-    }
-}
+// See this type in the Windows file.
+pub(crate) type Bool = c_int;
 
-cfg_if::cfg_if! {
-    if #[cfg(any(target_os = "macos", target_os = "ios"))] {
-        use libc::TCP_KEEPALIVE as KEEPALIVE_OPTION;
-    } else if #[cfg(any(target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))] {
-        use libc::SO_KEEPALIVE as KEEPALIVE_OPTION;
-    } else {
-        use libc::TCP_KEEPIDLE as KEEPALIVE_OPTION;
-    }
+#[cfg(target_vendor = "apple")]
+use libc::TCP_KEEPALIVE as KEEPALIVE_TIME;
+#[cfg(not(any(target_vendor = "apple", target_os = "haiku", target_os = "openbsd")))]
+use libc::TCP_KEEPIDLE as KEEPALIVE_TIME;
+
+/// Helper macro to execute a system call that returns an `io::Result`.
+macro_rules! syscall {
+    ($fn: ident ( $($arg: expr),* $(,)* ) ) => {{
+        #[allow(unused_unsafe)]
+        let res = unsafe { libc::$fn($($arg, )*) };
+        if res == -1 {
+            Err(std::io::Error::last_os_error())
+        } else {
+            Ok(res)
+        }
+    }};
 }
 
-use crate::utils::One;
-use crate::SockAddr;
+/// Maximum size of a buffer passed to system call like `recv` and `send`.
+#[cfg(not(target_vendor = "apple"))]
+const MAX_BUF_LEN: usize = <ssize_t>::max_value() as usize;
+
+// The maximum read limit on most posix-like systems is `SSIZE_MAX`, with the
+// man page quoting that if the count of bytes to read is greater than
+// `SSIZE_MAX` the result is "unspecified".
+//
+// On macOS, however, apparently the 64-bit libc is either buggy or
+// intentionally showing odd behavior by rejecting any read with a size larger
+// than or equal to INT_MAX. To handle both of these the read size is capped on
+// both platforms.
+#[cfg(target_vendor = "apple")]
+const MAX_BUF_LEN: usize = <c_int>::max_value() as usize - 1;
+
+#[cfg(any(
+    all(
+        target_os = "linux",
+        any(
+            target_env = "gnu",
+            all(target_env = "uclibc", target_pointer_width = "64")
+        )
+    ),
+    target_os = "android",
+))]
+type IovLen = usize;
+
+#[cfg(any(
+    all(
+        target_os = "linux",
+        any(
+            target_env = "musl",
+            all(target_env = "uclibc", target_pointer_width = "32")
+        )
+    ),
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "fuchsia",
+    target_os = "haiku",
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "openbsd",
+    target_os = "solaris",
+    target_vendor = "apple",
+))]
+type IovLen = c_int;
 
 /// Unix only API.
 impl Domain {
     /// Domain for Unix socket communication, corresponding to `AF_UNIX`.
-    pub fn unix() -> Domain {
-        Domain(libc::AF_UNIX)
-    }
+    #[cfg_attr(docsrs, doc(cfg(unix)))]
+    pub const UNIX: Domain = Domain(libc::AF_UNIX);
 
     /// Domain for low-level packet interface, corresponding to `AF_PACKET`.
-    ///
-    /// # Notes
-    ///
-    /// This function is only available on Linux.
-    #[cfg(target_os = "linux")]
-    pub fn packet() -> Domain {
-        Domain(libc::AF_PACKET)
-    }
+    #[cfg(all(
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub const PACKET: Domain = Domain(libc::AF_PACKET);
+
+    /// Domain for low-level VSOCK interface, corresponding to `AF_VSOCK`.
+    #[cfg(all(feature = "all", any(target_os = "android", target_os = "linux")))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(feature = "all", any(target_os = "android", target_os = "linux"))))
+    )]
+    pub const VSOCK: Domain = Domain(libc::AF_VSOCK);
 }
 
 impl_debug!(
@@ -95,55 +234,110 @@
     libc::AF_INET,
     libc::AF_INET6,
     libc::AF_UNIX,
+    #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux")))
+    )]
+    libc::AF_PACKET,
+    #[cfg(any(target_os = "android", target_os = "linux"))]
+    #[cfg_attr(docsrs, doc(cfg(any(target_os = "android", target_os = "linux"))))]
+    libc::AF_VSOCK,
     libc::AF_UNSPEC, // = 0.
 );
 
 /// Unix only API.
 impl Type {
     /// Set `SOCK_NONBLOCK` on the `Type`.
-    ///
-    /// # Notes
-    ///
-    /// This function is only available on Android, DragonFlyBSD, FreeBSD,
-    /// Linux, NetBSD and OpenBSD.
-    #[cfg(any(
-        target_os = "android",
-        target_os = "dragonfly",
-        target_os = "freebsd",
-        target_os = "linux",
-        target_os = "netbsd",
-        target_os = "openbsd"
+    #[cfg(all(
+        feature = "all",
+        any(
+            target_os = "android",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "illumos",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )
     ))]
-    pub fn non_blocking(self) -> Type {
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "android",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "illumos",
+                target_os = "linux",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            )
+        )))
+    )]
+    pub const fn nonblocking(self) -> Type {
         Type(self.0 | libc::SOCK_NONBLOCK)
     }
 
     /// Set `SOCK_CLOEXEC` on the `Type`.
-    ///
-    /// # Notes
-    ///
-    /// This function is only available on Android, DragonFlyBSD, FreeBSD,
-    /// Linux, NetBSD and OpenBSD.
+    #[cfg(all(
+        feature = "all",
+        any(
+            target_os = "android",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "illumos",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "android",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "illumos",
+                target_os = "linux",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            )
+        )))
+    )]
+    pub const fn cloexec(self) -> Type {
+        self._cloexec()
+    }
+
     #[cfg(any(
         target_os = "android",
         target_os = "dragonfly",
         target_os = "freebsd",
+        target_os = "fuchsia",
+        target_os = "illumos",
         target_os = "linux",
         target_os = "netbsd",
         target_os = "openbsd"
     ))]
-    pub fn cloexec(self) -> Type {
+    pub(crate) const fn _cloexec(self) -> Type {
         Type(self.0 | libc::SOCK_CLOEXEC)
     }
 }
 
 impl_debug!(
-    crate::Type,
+    Type,
     libc::SOCK_STREAM,
     libc::SOCK_DGRAM,
     #[cfg(not(target_os = "redox"))]
     libc::SOCK_RAW,
-    #[cfg(not(any(target_os = "haiku", target_os = "redox")))]
+    #[cfg(not(any(target_os = "redox", target_os = "haiku")))]
     libc::SOCK_RDM,
     libc::SOCK_SEQPACKET,
     /* TODO: add these optional bit OR-ed flags:
@@ -151,6 +345,7 @@
         target_os = "android",
         target_os = "dragonfly",
         target_os = "freebsd",
+        target_os = "fuchsia",
         target_os = "linux",
         target_os = "netbsd",
         target_os = "openbsd"
@@ -160,6 +355,7 @@
         target_os = "android",
         target_os = "dragonfly",
         target_os = "freebsd",
+        target_os = "fuchsia",
         target_os = "linux",
         target_os = "netbsd",
         target_os = "openbsd"
@@ -169,1149 +365,1389 @@
 );
 
 impl_debug!(
-    crate::Protocol,
+    Protocol,
     libc::IPPROTO_ICMP,
     libc::IPPROTO_ICMPV6,
     libc::IPPROTO_TCP,
     libc::IPPROTO_UDP,
 );
 
-pub struct Socket {
-    fd: c_int,
+/// Unix-only API.
+#[cfg(not(target_os = "redox"))]
+impl RecvFlags {
+    /// Check if the message terminates a record.
+    ///
+    /// Not all socket types support the notion of records.
+    /// For socket types that do support it (such as [`SEQPACKET`][Type::SEQPACKET]),
+    /// a record is terminated by sending a message with the end-of-record flag set.
+    ///
+    /// On Unix this corresponds to the MSG_EOR flag.
+    pub const fn is_end_of_record(self) -> bool {
+        self.0 & libc::MSG_EOR != 0
+    }
+
+    /// Check if the message contains out-of-band data.
+    ///
+    /// This is useful for protocols where you receive out-of-band data
+    /// mixed in with the normal data stream.
+    ///
+    /// On Unix this corresponds to the MSG_OOB flag.
+    pub const fn is_out_of_band(self) -> bool {
+        self.0 & libc::MSG_OOB != 0
+    }
+}
+
+#[cfg(not(target_os = "redox"))]
+impl std::fmt::Debug for RecvFlags {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RecvFlags")
+            .field("is_end_of_record", &self.is_end_of_record())
+            .field("is_out_of_band", &self.is_out_of_band())
+            .field("is_truncated", &self.is_truncated())
+            .finish()
+    }
+}
+
+#[repr(transparent)]
+pub struct MaybeUninitSlice<'a> {
+    vec: libc::iovec,
+    _lifetime: PhantomData<&'a mut [MaybeUninit<u8>]>,
+}
+
+impl<'a> MaybeUninitSlice<'a> {
+    pub(crate) fn new(buf: &'a mut [MaybeUninit<u8>]) -> MaybeUninitSlice<'a> {
+        MaybeUninitSlice {
+            vec: libc::iovec {
+                iov_base: buf.as_mut_ptr().cast(),
+                iov_len: buf.len(),
+            },
+            _lifetime: PhantomData,
+        }
+    }
+
+    pub(crate) fn as_slice(&self) -> &[MaybeUninit<u8>] {
+        unsafe { slice::from_raw_parts(self.vec.iov_base.cast(), self.vec.iov_len) }
+    }
+
+    pub(crate) fn as_mut_slice(&mut self) -> &mut [MaybeUninit<u8>] {
+        unsafe { slice::from_raw_parts_mut(self.vec.iov_base.cast(), self.vec.iov_len) }
+    }
 }
 
-impl Socket {
-    pub fn new(family: c_int, ty: c_int, protocol: c_int) -> io::Result<Socket> {
+/// Unix only API.
+impl SockAddr {
+    /// Constructs a `SockAddr` with the family `AF_UNIX` and the provided path.
+    ///
+    /// # Failure
+    ///
+    /// Returns an error if the path is longer than `SUN_LEN`.
+    #[cfg(feature = "all")]
+    #[cfg_attr(docsrs, doc(cfg(all(unix, feature = "all"))))]
+    #[allow(unused_unsafe)] // TODO: replace with `unsafe_op_in_unsafe_fn` once stable.
+    pub fn unix<P>(path: P) -> io::Result<SockAddr>
+    where
+        P: AsRef<Path>,
+    {
         unsafe {
-            // On linux we first attempt to pass the SOCK_CLOEXEC flag to
-            // atomically create the socket and set it as CLOEXEC. Support for
-            // this option, however, was added in 2.6.27, and we still support
-            // 2.6.18 as a kernel, so if the returned error is EINVAL we
-            // fallthrough to the fallback.
-            #[cfg(target_os = "linux")]
-            {
-                match cvt(libc::socket(family, ty | libc::SOCK_CLOEXEC, protocol)) {
-                    Ok(fd) => return Ok(Socket::from_raw_fd(fd)),
-                    Err(ref e) if e.raw_os_error() == Some(libc::EINVAL) => {}
-                    Err(e) => return Err(e),
+            SockAddr::init(|storage, len| {
+                // Safety: `SockAddr::init` zeros the address, which is a valid
+                // representation.
+                let storage: &mut libc::sockaddr_un = unsafe { &mut *storage.cast() };
+                let len: &mut socklen_t = unsafe { &mut *len };
+
+                let bytes = path.as_ref().as_os_str().as_bytes();
+                let too_long = match bytes.first() {
+                    None => false,
+                    // linux abstract namespaces aren't null-terminated
+                    Some(&0) => bytes.len() > storage.sun_path.len(),
+                    Some(_) => bytes.len() >= storage.sun_path.len(),
+                };
+                if too_long {
+                    return Err(io::Error::new(
+                        io::ErrorKind::InvalidInput,
+                        "path must be shorter than SUN_LEN",
+                    ));
                 }
-            }
 
-            let fd = cvt(libc::socket(family, ty, protocol))?;
-            let fd = Socket::from_raw_fd(fd);
-            set_cloexec(fd.as_raw_fd())?;
-            #[cfg(any(target_os = "macos", target_os = "ios"))]
-            {
-                fd.setsockopt(libc::SOL_SOCKET, libc::SO_NOSIGPIPE, 1i32)?;
-            }
-            Ok(fd)
+                storage.sun_family = libc::AF_UNIX as sa_family_t;
+                // Safety: `bytes` and `addr.sun_path` are not overlapping and
+                // both point to valid memory.
+                // `SockAddr::init` zeroes the memory, so the path is already
+                // null terminated.
+                unsafe {
+                    ptr::copy_nonoverlapping(
+                        bytes.as_ptr(),
+                        storage.sun_path.as_mut_ptr() as *mut u8,
+                        bytes.len(),
+                    )
+                };
+
+                let base = storage as *const _ as usize;
+                let path = &storage.sun_path as *const _ as usize;
+                let sun_path_offset = path - base;
+                let length = sun_path_offset
+                    + bytes.len()
+                    + match bytes.first() {
+                        Some(&0) | None => 0,
+                        Some(_) => 1,
+                    };
+                *len = length as socklen_t;
+
+                Ok(())
+            })
         }
+        .map(|(_, addr)| addr)
     }
+}
 
-    pub fn pair(family: c_int, ty: c_int, protocol: c_int) -> io::Result<(Socket, Socket)> {
-        unsafe {
-            let mut fds = [0, 0];
-            cvt(libc::socketpair(family, ty, protocol, fds.as_mut_ptr()))?;
-            let fds = (Socket::from_raw_fd(fds[0]), Socket::from_raw_fd(fds[1]));
-            set_cloexec(fds.0.as_raw_fd())?;
-            set_cloexec(fds.1.as_raw_fd())?;
-            #[cfg(any(target_os = "macos", target_os = "ios"))]
-            {
-                fds.0
-                    .setsockopt(libc::SOL_SOCKET, libc::SO_NOSIGPIPE, 1i32)?;
-                fds.1
-                    .setsockopt(libc::SOL_SOCKET, libc::SO_NOSIGPIPE, 1i32)?;
-            }
-            Ok(fds)
+impl SockAddr {
+    /// Constructs a `SockAddr` with the family `AF_VSOCK` and the provided CID/port.
+    ///
+    /// # Errors
+    ///
+    /// This function can never fail. In a future version of this library it will be made
+    /// infallible.
+    #[allow(unused_unsafe)] // TODO: replace with `unsafe_op_in_unsafe_fn` once stable.
+    #[cfg(all(feature = "all", any(target_os = "android", target_os = "linux")))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(feature = "all", any(target_os = "android", target_os = "linux"))))
+    )]
+    pub fn vsock(cid: u32, port: u32) -> io::Result<SockAddr> {
+        unsafe {
+            SockAddr::init(|storage, len| {
+                // Safety: `SockAddr::init` zeros the address, which is a valid
+                // representation.
+                let storage: &mut libc::sockaddr_vm = unsafe { &mut *storage.cast() };
+                let len: &mut socklen_t = unsafe { &mut *len };
+
+                storage.svm_family = libc::AF_VSOCK as sa_family_t;
+                storage.svm_cid = cid;
+                storage.svm_port = port;
+
+                *len = mem::size_of::<libc::sockaddr_vm>() as socklen_t;
+
+                Ok(())
+            })
+        }
+        .map(|(_, addr)| addr)
+    }
+
+    /// Returns this address VSOCK CID/port if it is in the `AF_VSOCK` family,
+    /// otherwise return `None`.
+    #[cfg(all(feature = "all", any(target_os = "android", target_os = "linux")))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(feature = "all", any(target_os = "android", target_os = "linux"))))
+    )]
+    pub fn vsock_address(&self) -> Option<(u32, u32)> {
+        if self.family() == libc::AF_VSOCK as sa_family_t {
+            // Safety: if the ss_family field is AF_VSOCK then storage must be a sockaddr_vm.
+            let addr = unsafe { &*(self.as_ptr() as *const libc::sockaddr_vm) };
+            Some((addr.svm_cid, addr.svm_port))
+        } else {
+            None
         }
     }
+}
 
-    pub fn bind(&self, addr: &SockAddr) -> io::Result<()> {
-        unsafe { cvt(libc::bind(self.fd, addr.as_ptr(), addr.len() as _)).map(|_| ()) }
-    }
+pub(crate) type Socket = c_int;
 
-    pub fn listen(&self, backlog: i32) -> io::Result<()> {
-        unsafe { cvt(libc::listen(self.fd, backlog)).map(|_| ()) }
-    }
+pub(crate) unsafe fn socket_from_raw(socket: Socket) -> crate::socket::Inner {
+    crate::socket::Inner::from_raw_fd(socket)
+}
 
-    pub fn connect(&self, addr: &SockAddr) -> io::Result<()> {
-        unsafe { cvt(libc::connect(self.fd, addr.as_ptr(), addr.len())).map(|_| ()) }
-    }
+pub(crate) fn socket_as_raw(socket: &crate::socket::Inner) -> Socket {
+    socket.as_raw_fd()
+}
 
-    pub fn connect_timeout(&self, addr: &SockAddr, timeout: Duration) -> io::Result<()> {
-        self.set_nonblocking(true)?;
-        let r = self.connect(addr);
-        self.set_nonblocking(false)?;
+pub(crate) fn socket_into_raw(socket: crate::socket::Inner) -> Socket {
+    socket.into_raw_fd()
+}
 
-        match r {
-            Ok(()) => return Ok(()),
-            // there's no io::ErrorKind conversion registered for EINPROGRESS :(
-            Err(ref e) if e.raw_os_error() == Some(libc::EINPROGRESS) => {}
-            Err(e) => return Err(e),
-        }
+pub(crate) fn socket(family: c_int, ty: c_int, protocol: c_int) -> io::Result<Socket> {
+    syscall!(socket(family, ty, protocol))
+}
 
-        let mut pollfd = libc::pollfd {
-            fd: self.fd,
-            events: libc::POLLOUT,
-            revents: 0,
-        };
+#[cfg(feature = "all")]
+pub(crate) fn socketpair(family: c_int, ty: c_int, protocol: c_int) -> io::Result<[Socket; 2]> {
+    let mut fds = [0, 0];
+    syscall!(socketpair(family, ty, protocol, fds.as_mut_ptr())).map(|_| fds)
+}
 
-        if timeout.as_secs() == 0 && timeout.subsec_nanos() == 0 {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                "cannot set a 0 duration timeout",
-            ));
-        }
-
-        let start = Instant::now();
-
-        loop {
-            let elapsed = start.elapsed();
-            if elapsed >= timeout {
-                return Err(io::Error::new(
-                    io::ErrorKind::TimedOut,
-                    "connection timed out",
-                ));
-            }
+pub(crate) fn bind(fd: Socket, addr: &SockAddr) -> io::Result<()> {
+    syscall!(bind(fd, addr.as_ptr(), addr.len() as _)).map(|_| ())
+}
 
-            let timeout = timeout - elapsed;
-            let mut timeout = timeout
-                .as_secs()
-                .saturating_mul(1_000)
-                .saturating_add(timeout.subsec_nanos() as u64 / 1_000_000);
-            if timeout == 0 {
-                timeout = 1;
-            }
+pub(crate) fn connect(fd: Socket, addr: &SockAddr) -> io::Result<()> {
+    syscall!(connect(fd, addr.as_ptr(), addr.len())).map(|_| ())
+}
 
-            let timeout = cmp::min(timeout, c_int::max_value() as u64) as c_int;
+pub(crate) fn poll_connect(socket: &crate::Socket, timeout: Duration) -> io::Result<()> {
+    let start = Instant::now();
 
-            match unsafe { libc::poll(&mut pollfd, 1, timeout) } {
-                -1 => {
-                    let err = io::Error::last_os_error();
-                    if err.kind() != io::ErrorKind::Interrupted {
-                        return Err(err);
-                    }
-                }
-                0 => {
-                    return Err(io::Error::new(
-                        io::ErrorKind::TimedOut,
-                        "connection timed out",
-                    ))
-                }
-                _ => {
-                    // linux returns POLLOUT|POLLERR|POLLHUP for refused connections (!), so look
-                    // for POLLHUP rather than read readiness
-                    if pollfd.revents & libc::POLLHUP != 0 {
-                        let e = self.take_error()?.unwrap_or_else(|| {
-                            io::Error::new(io::ErrorKind::Other, "no error set after POLLHUP")
-                        });
-                        return Err(e);
+    let mut pollfd = libc::pollfd {
+        fd: socket.as_raw(),
+        events: libc::POLLIN | libc::POLLOUT,
+        revents: 0,
+    };
+
+    loop {
+        let elapsed = start.elapsed();
+        if elapsed >= timeout {
+            return Err(io::ErrorKind::TimedOut.into());
+        }
+
+        let timeout = (timeout - elapsed).as_millis();
+        let timeout = clamp(timeout, 1, c_int::max_value() as u128) as c_int;
+
+        match syscall!(poll(&mut pollfd, 1, timeout)) {
+            Ok(0) => return Err(io::ErrorKind::TimedOut.into()),
+            Ok(_) => {
+                // Error or hang up indicates an error (or failure to connect).
+                if (pollfd.revents & libc::POLLHUP) != 0 || (pollfd.revents & libc::POLLERR) != 0 {
+                    match socket.take_error() {
+                        Ok(Some(err)) => return Err(err),
+                        Ok(None) => {
+                            return Err(io::Error::new(
+                                io::ErrorKind::Other,
+                                "no error set after POLLHUP",
+                            ))
+                        }
+                        Err(err) => return Err(err),
                     }
-                    return Ok(());
                 }
+                return Ok(());
             }
+            // Got interrupted, try again.
+            Err(ref err) if err.kind() == io::ErrorKind::Interrupted => continue,
+            Err(err) => return Err(err),
         }
     }
+}
 
-    pub fn local_addr(&self) -> io::Result<SockAddr> {
-        unsafe {
-            let mut storage: libc::sockaddr_storage = mem::zeroed();
-            let mut len = mem::size_of_val(&storage) as libc::socklen_t;
-            cvt(libc::getsockname(
-                self.fd,
-                &mut storage as *mut _ as *mut _,
-                &mut len,
-            ))?;
-            Ok(SockAddr::from_raw_parts(
-                &storage as *const _ as *const _,
-                len,
-            ))
-        }
+// TODO: use clamp from std lib, stable since 1.50.
+fn clamp<T>(value: T, min: T, max: T) -> T
+where
+    T: Ord,
+{
+    if value <= min {
+        min
+    } else if value >= max {
+        max
+    } else {
+        value
+    }
+}
+
+pub(crate) fn listen(fd: Socket, backlog: c_int) -> io::Result<()> {
+    syscall!(listen(fd, backlog)).map(|_| ())
+}
+
+pub(crate) fn accept(fd: Socket) -> io::Result<(Socket, SockAddr)> {
+    // Safety: `accept` initialises the `SockAddr` for us.
+    unsafe { SockAddr::init(|storage, len| syscall!(accept(fd, storage.cast(), len))) }
+}
+
+pub(crate) fn getsockname(fd: Socket) -> io::Result<SockAddr> {
+    // Safety: `accept` initialises the `SockAddr` for us.
+    unsafe { SockAddr::init(|storage, len| syscall!(getsockname(fd, storage.cast(), len))) }
+        .map(|(_, addr)| addr)
+}
+
+pub(crate) fn getpeername(fd: Socket) -> io::Result<SockAddr> {
+    // Safety: `accept` initialises the `SockAddr` for us.
+    unsafe { SockAddr::init(|storage, len| syscall!(getpeername(fd, storage.cast(), len))) }
+        .map(|(_, addr)| addr)
+}
+
+pub(crate) fn try_clone(fd: Socket) -> io::Result<Socket> {
+    syscall!(fcntl(fd, libc::F_DUPFD_CLOEXEC, 0))
+}
+
+pub(crate) fn set_nonblocking(fd: Socket, nonblocking: bool) -> io::Result<()> {
+    if nonblocking {
+        fcntl_add(fd, libc::F_GETFL, libc::F_SETFL, libc::O_NONBLOCK)
+    } else {
+        fcntl_remove(fd, libc::F_GETFL, libc::F_SETFL, libc::O_NONBLOCK)
     }
+}
 
-    pub fn peer_addr(&self) -> io::Result<SockAddr> {
-        unsafe {
-            let mut storage: libc::sockaddr_storage = mem::zeroed();
-            let mut len = mem::size_of_val(&storage) as libc::socklen_t;
-            cvt(libc::getpeername(
-                self.fd,
-                &mut storage as *mut _ as *mut _,
-                &mut len,
-            ))?;
-            Ok(SockAddr::from_raw_parts(
-                &storage as *const _ as *const _,
-                len,
+pub(crate) fn shutdown(fd: Socket, how: Shutdown) -> io::Result<()> {
+    let how = match how {
+        Shutdown::Write => libc::SHUT_WR,
+        Shutdown::Read => libc::SHUT_RD,
+        Shutdown::Both => libc::SHUT_RDWR,
+    };
+    syscall!(shutdown(fd, how)).map(|_| ())
+}
+
+pub(crate) fn recv(fd: Socket, buf: &mut [MaybeUninit<u8>], flags: c_int) -> io::Result<usize> {
+    syscall!(recv(
+        fd,
+        buf.as_mut_ptr().cast(),
+        min(buf.len(), MAX_BUF_LEN),
+        flags,
+    ))
+    .map(|n| n as usize)
+}
+
+pub(crate) fn recv_from(
+    fd: Socket,
+    buf: &mut [MaybeUninit<u8>],
+    flags: c_int,
+) -> io::Result<(usize, SockAddr)> {
+    // Safety: `recvfrom` initialises the `SockAddr` for us.
+    unsafe {
+        SockAddr::init(|addr, addrlen| {
+            syscall!(recvfrom(
+                fd,
+                buf.as_mut_ptr().cast(),
+                min(buf.len(), MAX_BUF_LEN),
+                flags,
+                addr.cast(),
+                addrlen
             ))
-        }
+            .map(|n| n as usize)
+        })
     }
+}
 
-    pub fn try_clone(&self) -> io::Result<Socket> {
-        // implementation lifted from libstd
-        #[cfg(any(target_os = "android", target_os = "haiku"))]
-        use libc::F_DUPFD as F_DUPFD_CLOEXEC;
-        #[cfg(not(any(target_os = "android", target_os = "haiku")))]
-        use libc::F_DUPFD_CLOEXEC;
+#[cfg(not(target_os = "redox"))]
+pub(crate) fn recv_vectored(
+    fd: Socket,
+    bufs: &mut [crate::MaybeUninitSlice<'_>],
+    flags: c_int,
+) -> io::Result<(usize, RecvFlags)> {
+    recvmsg(fd, ptr::null_mut(), bufs, flags).map(|(n, _, recv_flags)| (n, recv_flags))
+}
 
-        static CLOEXEC_FAILED: AtomicBool = AtomicBool::new(false);
-        unsafe {
-            if !CLOEXEC_FAILED.load(Ordering::Relaxed) {
-                match cvt(libc::fcntl(self.fd, F_DUPFD_CLOEXEC, 0)) {
-                    Ok(fd) => {
-                        let fd = Socket::from_raw_fd(fd);
-                        if cfg!(target_os = "linux") {
-                            set_cloexec(fd.as_raw_fd())?;
-                        }
-                        return Ok(fd);
-                    }
-                    Err(ref e) if e.raw_os_error() == Some(libc::EINVAL) => {
-                        CLOEXEC_FAILED.store(true, Ordering::Relaxed);
-                    }
-                    Err(e) => return Err(e),
-                }
-            }
-            let fd = cvt(libc::fcntl(self.fd, libc::F_DUPFD, 0))?;
-            let fd = Socket::from_raw_fd(fd);
-            set_cloexec(fd.as_raw_fd())?;
-            Ok(fd)
-        }
+#[cfg(not(target_os = "redox"))]
+pub(crate) fn recv_from_vectored(
+    fd: Socket,
+    bufs: &mut [crate::MaybeUninitSlice<'_>],
+    flags: c_int,
+) -> io::Result<(usize, RecvFlags, SockAddr)> {
+    // Safety: `recvmsg` initialises the address storage and we set the length
+    // manually.
+    unsafe {
+        SockAddr::init(|storage, len| {
+            recvmsg(fd, storage, bufs, flags).map(|(n, addrlen, recv_flags)| {
+                // Set the correct address length.
+                *len = addrlen;
+                (n, recv_flags)
+            })
+        })
     }
+    .map(|((n, recv_flags), addr)| (n, recv_flags, addr))
+}
 
-    #[allow(unused_mut)]
-    pub fn accept(&self) -> io::Result<(Socket, SockAddr)> {
-        let mut storage: libc::sockaddr_storage = unsafe { mem::zeroed() };
-        let mut len = mem::size_of_val(&storage) as socklen_t;
-
-        let mut socket = None;
-        #[cfg(target_os = "linux")]
-        {
-            let res = cvt_r(|| unsafe {
-                libc::syscall(
-                    libc::SYS_accept4,
-                    self.fd as libc::c_long,
-                    &mut storage as *mut _ as libc::c_long,
-                    &mut len,
-                    libc::SOCK_CLOEXEC as libc::c_long,
-                ) as libc::c_int
-            });
-            match res {
-                Ok(fd) => socket = Some(Socket { fd: fd }),
-                Err(ref e) if e.raw_os_error() == Some(libc::ENOSYS) => {}
-                Err(e) => return Err(e),
-            }
-        }
+/// Returns the (bytes received, sending address len, `RecvFlags`).
+#[cfg(not(target_os = "redox"))]
+fn recvmsg(
+    fd: Socket,
+    msg_name: *mut sockaddr_storage,
+    bufs: &mut [crate::MaybeUninitSlice<'_>],
+    flags: c_int,
+) -> io::Result<(usize, libc::socklen_t, RecvFlags)> {
+    let msg_namelen = if msg_name.is_null() {
+        0
+    } else {
+        size_of::<sockaddr_storage>() as libc::socklen_t
+    };
+    // libc::msghdr contains unexported padding fields on Fuchsia.
+    let mut msg: libc::msghdr = unsafe { mem::zeroed() };
+    msg.msg_name = msg_name.cast();
+    msg.msg_namelen = msg_namelen;
+    msg.msg_iov = bufs.as_mut_ptr().cast();
+    msg.msg_iovlen = min(bufs.len(), IovLen::MAX as usize) as IovLen;
+    syscall!(recvmsg(fd, &mut msg, flags))
+        .map(|n| (n as usize, msg.msg_namelen, RecvFlags(msg.msg_flags)))
+}
+
+pub(crate) fn send(fd: Socket, buf: &[u8], flags: c_int) -> io::Result<usize> {
+    syscall!(send(
+        fd,
+        buf.as_ptr().cast(),
+        min(buf.len(), MAX_BUF_LEN),
+        flags,
+    ))
+    .map(|n| n as usize)
+}
 
-        let socket = match socket {
-            Some(socket) => socket,
-            None => unsafe {
-                let fd =
-                    cvt_r(|| libc::accept(self.fd, &mut storage as *mut _ as *mut _, &mut len))?;
-                let fd = Socket::from_raw_fd(fd);
-                set_cloexec(fd.as_raw_fd())?;
-                fd
-            },
-        };
-        let addr = unsafe { SockAddr::from_raw_parts(&storage as *const _ as *const _, len) };
-        Ok((socket, addr))
+#[cfg(not(target_os = "redox"))]
+pub(crate) fn send_vectored(fd: Socket, bufs: &[IoSlice<'_>], flags: c_int) -> io::Result<usize> {
+    sendmsg(fd, ptr::null(), 0, bufs, flags)
+}
+
+pub(crate) fn send_to(fd: Socket, buf: &[u8], addr: &SockAddr, flags: c_int) -> io::Result<usize> {
+    syscall!(sendto(
+        fd,
+        buf.as_ptr().cast(),
+        min(buf.len(), MAX_BUF_LEN),
+        flags,
+        addr.as_ptr(),
+        addr.len(),
+    ))
+    .map(|n| n as usize)
+}
+
+#[cfg(not(target_os = "redox"))]
+pub(crate) fn send_to_vectored(
+    fd: Socket,
+    bufs: &[IoSlice<'_>],
+    addr: &SockAddr,
+    flags: c_int,
+) -> io::Result<usize> {
+    sendmsg(fd, addr.as_storage_ptr(), addr.len(), bufs, flags)
+}
+
+/// Returns the (bytes received, sending address len, `RecvFlags`).
+#[cfg(not(target_os = "redox"))]
+fn sendmsg(
+    fd: Socket,
+    msg_name: *const sockaddr_storage,
+    msg_namelen: socklen_t,
+    bufs: &[IoSlice<'_>],
+    flags: c_int,
+) -> io::Result<usize> {
+    // libc::msghdr contains unexported padding fields on Fuchsia.
+    let mut msg: libc::msghdr = unsafe { mem::zeroed() };
+    // Safety: we're creating a `*mut` pointer from a reference, which is UB
+    // once actually used. However the OS should not write to it in the
+    // `sendmsg` system call.
+    msg.msg_name = (msg_name as *mut sockaddr_storage).cast();
+    msg.msg_namelen = msg_namelen;
+    // Safety: Same as above about `*const` -> `*mut`.
+    msg.msg_iov = bufs.as_ptr() as *mut _;
+    msg.msg_iovlen = min(bufs.len(), IovLen::MAX as usize) as IovLen;
+    syscall!(sendmsg(fd, &msg, flags)).map(|n| n as usize)
+}
+
+/// Wrapper around `getsockopt` to deal with platform specific timeouts.
+pub(crate) fn timeout_opt(fd: Socket, opt: c_int, val: c_int) -> io::Result<Option<Duration>> {
+    unsafe { getsockopt(fd, opt, val).map(from_timeval) }
+}
+
+fn from_timeval(duration: libc::timeval) -> Option<Duration> {
+    if duration.tv_sec == 0 && duration.tv_usec == 0 {
+        None
+    } else {
+        let sec = duration.tv_sec as u64;
+        let nsec = (duration.tv_usec as u32) * 1000;
+        Some(Duration::new(sec, nsec))
     }
+}
 
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_ERROR)?;
-            if raw == 0 {
-                Ok(None)
-            } else {
-                Ok(Some(io::Error::from_raw_os_error(raw as i32)))
-            }
-        }
+/// Wrapper around `setsockopt` to deal with platform specific timeouts.
+pub(crate) fn set_timeout_opt(
+    fd: Socket,
+    opt: c_int,
+    val: c_int,
+    duration: Option<Duration>,
+) -> io::Result<()> {
+    let duration = into_timeval(duration);
+    unsafe { setsockopt(fd, opt, val, duration) }
+}
+
+fn into_timeval(duration: Option<Duration>) -> libc::timeval {
+    match duration {
+        // https://github.com/rust-lang/libc/issues/1848
+        #[cfg_attr(target_env = "musl", allow(deprecated))]
+        Some(duration) => libc::timeval {
+            tv_sec: min(duration.as_secs(), libc::time_t::max_value() as u64) as libc::time_t,
+            tv_usec: duration.subsec_micros() as libc::suseconds_t,
+        },
+        None => libc::timeval {
+            tv_sec: 0,
+            tv_usec: 0,
+        },
     }
+}
 
-    pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
-        unsafe {
-            let previous = cvt(libc::fcntl(self.fd, libc::F_GETFL))?;
-            let new = if nonblocking {
-                previous | libc::O_NONBLOCK
-            } else {
-                previous & !libc::O_NONBLOCK
-            };
-            if new != previous {
-                cvt(libc::fcntl(self.fd, libc::F_SETFL, new))?;
-            }
-            Ok(())
-        }
+#[cfg(feature = "all")]
+pub(crate) fn keepalive_time(fd: Socket) -> io::Result<Duration> {
+    unsafe {
+        getsockopt::<c_int>(fd, IPPROTO_TCP, KEEPALIVE_TIME)
+            .map(|secs| Duration::from_secs(secs as u64))
     }
+}
 
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        let how = match how {
-            Shutdown::Write => libc::SHUT_WR,
-            Shutdown::Read => libc::SHUT_RD,
-            Shutdown::Both => libc::SHUT_RDWR,
-        };
-        cvt(unsafe { libc::shutdown(self.fd, how) })?;
-        Ok(())
+#[allow(unused_variables)]
+pub(crate) fn set_tcp_keepalive(fd: Socket, keepalive: &TcpKeepalive) -> io::Result<()> {
+    #[cfg(not(any(target_os = "haiku", target_os = "openbsd")))]
+    if let Some(time) = keepalive.time {
+        let secs = into_secs(time);
+        unsafe { setsockopt(fd, libc::IPPROTO_TCP, KEEPALIVE_TIME, secs)? }
     }
 
-    pub fn recv(&self, buf: &mut [u8], flags: c_int) -> io::Result<usize> {
-        unsafe {
-            let n = cvt({
-                libc::recv(
-                    self.fd,
-                    buf.as_mut_ptr() as *mut c_void,
-                    cmp::min(buf.len(), max_len()),
-                    flags,
-                )
-            })?;
-            Ok(n as usize)
+    #[cfg(any(
+        target_os = "android",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "fuchsia",
+        target_os = "illumos",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_vendor = "apple",
+    ))]
+    {
+        if let Some(interval) = keepalive.interval {
+            let secs = into_secs(interval);
+            unsafe { setsockopt(fd, libc::IPPROTO_TCP, libc::TCP_KEEPINTVL, secs)? }
         }
-    }
 
-    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
-        unsafe {
-            let n = cvt({
-                libc::recv(
-                    self.fd,
-                    buf.as_mut_ptr() as *mut c_void,
-                    cmp::min(buf.len(), max_len()),
-                    libc::MSG_PEEK,
-                )
-            })?;
-            Ok(n as usize)
+        if let Some(retries) = keepalive.retries {
+            unsafe { setsockopt(fd, libc::IPPROTO_TCP, libc::TCP_KEEPCNT, retries as c_int)? }
         }
     }
 
-    pub fn peek_from(&self, buf: &mut [u8]) -> io::Result<(usize, SockAddr)> {
-        self.recv_from(buf, libc::MSG_PEEK)
+    Ok(())
+}
+
+#[cfg(not(any(target_os = "haiku", target_os = "openbsd")))]
+fn into_secs(duration: Duration) -> c_int {
+    min(duration.as_secs(), c_int::max_value() as u64) as c_int
+}
+
+/// Add `flag` to the current set flags of `F_GETFD`.
+fn fcntl_add(fd: Socket, get_cmd: c_int, set_cmd: c_int, flag: c_int) -> io::Result<()> {
+    let previous = syscall!(fcntl(fd, get_cmd))?;
+    let new = previous | flag;
+    if new != previous {
+        syscall!(fcntl(fd, set_cmd, new)).map(|_| ())
+    } else {
+        // Flag was already set.
+        Ok(())
     }
+}
 
-    pub fn recv_from(&self, buf: &mut [u8], flags: c_int) -> io::Result<(usize, SockAddr)> {
-        unsafe {
-            let mut storage: libc::sockaddr_storage = mem::zeroed();
-            let mut addrlen = mem::size_of_val(&storage) as socklen_t;
+/// Remove `flag` to the current set flags of `F_GETFD`.
+fn fcntl_remove(fd: Socket, get_cmd: c_int, set_cmd: c_int, flag: c_int) -> io::Result<()> {
+    let previous = syscall!(fcntl(fd, get_cmd))?;
+    let new = previous & !flag;
+    if new != previous {
+        syscall!(fcntl(fd, set_cmd, new)).map(|_| ())
+    } else {
+        // Flag was already set.
+        Ok(())
+    }
+}
 
-            let n = cvt({
-                libc::recvfrom(
-                    self.fd,
-                    buf.as_mut_ptr() as *mut c_void,
-                    cmp::min(buf.len(), max_len()),
-                    flags,
-                    &mut storage as *mut _ as *mut _,
-                    &mut addrlen,
-                )
-            })?;
-            let addr = SockAddr::from_raw_parts(&storage as *const _ as *const _, addrlen);
-            Ok((n as usize, addr))
-        }
+/// Caller must ensure `T` is the correct type for `opt` and `val`.
+pub(crate) unsafe fn getsockopt<T>(fd: Socket, opt: c_int, val: c_int) -> io::Result<T> {
+    let mut payload: MaybeUninit<T> = MaybeUninit::uninit();
+    let mut len = size_of::<T>() as libc::socklen_t;
+    syscall!(getsockopt(
+        fd,
+        opt,
+        val,
+        payload.as_mut_ptr().cast(),
+        &mut len,
+    ))
+    .map(|_| {
+        debug_assert_eq!(len as usize, size_of::<T>());
+        // Safety: `getsockopt` initialised `payload` for us.
+        payload.assume_init()
+    })
+}
+
+/// Caller must ensure `T` is the correct type for `opt` and `val`.
+pub(crate) unsafe fn setsockopt<T>(
+    fd: Socket,
+    opt: c_int,
+    val: c_int,
+    payload: T,
+) -> io::Result<()> {
+    let payload = &payload as *const T as *const c_void;
+    syscall!(setsockopt(
+        fd,
+        opt,
+        val,
+        payload,
+        mem::size_of::<T>() as libc::socklen_t,
+    ))
+    .map(|_| ())
+}
+
+pub(crate) fn to_in_addr(addr: &Ipv4Addr) -> in_addr {
+    // `s_addr` is stored as BE on all machines, and the array is in BE order.
+    // So the native endian conversion method is used so that it's never
+    // swapped.
+    in_addr {
+        s_addr: u32::from_ne_bytes(addr.octets()),
     }
+}
 
-    pub fn send(&self, buf: &[u8], flags: c_int) -> io::Result<usize> {
-        unsafe {
-            let n = cvt({
-                libc::send(
-                    self.fd,
-                    buf.as_ptr() as *const c_void,
-                    cmp::min(buf.len(), max_len()),
-                    flags,
-                )
-            })?;
-            Ok(n as usize)
-        }
+pub(crate) fn from_in_addr(in_addr: in_addr) -> Ipv4Addr {
+    Ipv4Addr::from(in_addr.s_addr.to_ne_bytes())
+}
+
+pub(crate) fn to_in6_addr(addr: &Ipv6Addr) -> in6_addr {
+    in6_addr {
+        s6_addr: addr.octets(),
+    }
+}
+
+pub(crate) fn from_in6_addr(addr: in6_addr) -> Ipv6Addr {
+    Ipv6Addr::from(addr.s6_addr)
+}
+
+/// Unix only API.
+impl crate::Socket {
+    /// Accept a new incoming connection from this listener.
+    ///
+    /// This function directly corresponds to the `accept4(2)` function.
+    ///
+    /// This function will block the calling thread until a new connection is
+    /// established. When established, the corresponding `Socket` and the remote
+    /// peer's address will be returned.
+    #[cfg(all(
+        feature = "all",
+        any(
+            target_os = "android",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "illumos",
+            target_os = "linux",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "android",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "illumos",
+                target_os = "linux",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            )
+        )))
+    )]
+    pub fn accept4(&self, flags: c_int) -> io::Result<(crate::Socket, SockAddr)> {
+        self._accept4(flags)
     }
 
-    pub fn send_to(&self, buf: &[u8], flags: c_int, addr: &SockAddr) -> io::Result<usize> {
+    #[cfg(any(
+        target_os = "android",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "fuchsia",
+        target_os = "illumos",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    pub(crate) fn _accept4(&self, flags: c_int) -> io::Result<(crate::Socket, SockAddr)> {
+        // Safety: `accept4` initialises the `SockAddr` for us.
         unsafe {
-            let n = cvt({
-                libc::sendto(
-                    self.fd,
-                    buf.as_ptr() as *const c_void,
-                    cmp::min(buf.len(), max_len()),
-                    flags,
-                    addr.as_ptr(),
-                    addr.len(),
-                )
-            })?;
-            Ok(n as usize)
+            SockAddr::init(|storage, len| {
+                syscall!(accept4(self.as_raw(), storage.cast(), len, flags))
+                    .map(crate::Socket::from_raw)
+            })
         }
     }
 
-    // ================================================
+    /// Sets `CLOEXEC` on the socket.
+    ///
+    /// # Notes
+    ///
+    /// On supported platforms you can use [`Type::cloexec`].
+    #[cfg(feature = "all")]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", unix))))]
+    pub fn set_cloexec(&self, close_on_exec: bool) -> io::Result<()> {
+        self._set_cloexec(close_on_exec)
+    }
 
-    pub fn ttl(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_IP, libc::IP_TTL)?;
-            Ok(raw as u32)
+    pub(crate) fn _set_cloexec(&self, close_on_exec: bool) -> io::Result<()> {
+        if close_on_exec {
+            fcntl_add(
+                self.as_raw(),
+                libc::F_GETFD,
+                libc::F_SETFD,
+                libc::FD_CLOEXEC,
+            )
+        } else {
+            fcntl_remove(
+                self.as_raw(),
+                libc::F_GETFD,
+                libc::F_SETFD,
+                libc::FD_CLOEXEC,
+            )
         }
     }
 
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::IPPROTO_IP, libc::IP_TTL, ttl as c_int) }
+    /// Sets `SO_NOSIGPIPE` on the socket.
+    #[cfg(all(feature = "all", any(doc, target_vendor = "apple")))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", target_vendor = "apple"))))]
+    pub fn set_nosigpipe(&self, nosigpipe: bool) -> io::Result<()> {
+        self._set_nosigpipe(nosigpipe)
     }
 
-    #[cfg(not(target_os = "redox"))]
-    pub fn mss(&self) -> io::Result<u32> {
+    #[cfg(target_vendor = "apple")]
+    pub(crate) fn _set_nosigpipe(&self, nosigpipe: bool) -> io::Result<()> {
         unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_TCP, libc::TCP_MAXSEG)?;
-            Ok(raw as u32)
+            setsockopt(
+                self.as_raw(),
+                libc::SOL_SOCKET,
+                libc::SO_NOSIGPIPE,
+                nosigpipe as c_int,
+            )
         }
     }
 
-    #[cfg(not(target_os = "redox"))]
-    pub fn set_mss(&self, mss: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::IPPROTO_TCP, libc::TCP_MAXSEG, mss as c_int) }
-    }
-
-    #[cfg(target_os = "linux")]
-    pub fn mark(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_MARK)?;
-            Ok(raw as u32)
-        }
-    }
-
-    #[cfg(target_os = "linux")]
-    pub fn set_mark(&self, mark: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::SOL_SOCKET, libc::SO_MARK, mark as c_int) }
-    }
-
-    #[cfg(target_os = "linux")]
-    pub fn device(&self) -> io::Result<Option<CString>> {
-        // TODO: replace with `MaybeUninit::uninit_array` once stable.
-        let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
-            unsafe { MaybeUninit::<[MaybeUninit<u8>; libc::IFNAMSIZ]>::uninit().assume_init() };
-        let mut len = buf.len() as libc::socklen_t;
-        let len = unsafe {
-            cvt(libc::getsockopt(
-                self.fd,
-                libc::SOL_SOCKET,
-                libc::SO_BINDTODEVICE,
-                buf.as_mut_ptr().cast(),
-                &mut len,
-            ))?
-        };
-        if len == 0 {
-            Ok(None)
-        } else {
-            // Allocate a buffer for `CString` with the length including the
-            // null terminator.
-            let len = len as usize;
-            let mut name = Vec::with_capacity(len);
-
-            // TODO: use `MaybeUninit::slice_assume_init_ref` once stable.
-            // Safety: `len` bytes are writen by the OS, this includes a null
-            // terminator. However we don't copy the null terminator because
-            // `CString::from_vec_unchecked` adds its own null terminator.
-            let buf = unsafe { slice::from_raw_parts(buf.as_ptr().cast(), len - 1) };
-            name.extend_from_slice(buf);
-
-            // Safety: the OS initialised the string for us, which shouldn't
-            // include any null bytes.
-            Ok(Some(unsafe { CString::from_vec_unchecked(name) }))
-        }
-    }
-
-    #[cfg(target_os = "linux")]
-    pub fn bind_device(&self, interface: Option<&CStr>) -> io::Result<()> {
-        let (value, len) = if let Some(interface) = interface {
-            (interface.as_ptr(), interface.to_bytes_with_nul().len())
-        } else {
-            (ptr::null(), 0)
-        };
-
-        unsafe {
-            cvt(libc::setsockopt(
-                self.fd,
-                libc::SOL_SOCKET,
-                libc::SO_BINDTODEVICE,
-                value.cast(),
-                len as libc::socklen_t,
-            ))
-            .map(|_| ())
-        }
-    }
-
-    pub fn unicast_hops_v6(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_IPV6, libc::IPV6_UNICAST_HOPS)?;
-            Ok(raw as u32)
-        }
-    }
-
-    pub fn set_unicast_hops_v6(&self, hops: u32) -> io::Result<()> {
-        unsafe {
-            self.setsockopt(
-                libc::IPPROTO_IPV6 as c_int,
-                libc::IPV6_UNICAST_HOPS,
-                hops as c_int,
-            )
-        }
-    }
-
-    pub fn only_v6(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_IPV6, libc::IPV6_V6ONLY)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::IPPROTO_IPV6, libc::IPV6_V6ONLY, only_v6 as c_int) }
-    }
-
-    pub fn read_timeout(&self) -> io::Result<Option<Duration>> {
-        unsafe {
-            Ok(timeval2dur(
-                self.getsockopt(libc::SOL_SOCKET, libc::SO_RCVTIMEO)?,
-            ))
-        }
-    }
-
-    pub fn set_read_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::SOL_SOCKET, libc::SO_RCVTIMEO, dur2timeval(dur)?) }
-    }
-
-    pub fn write_timeout(&self) -> io::Result<Option<Duration>> {
-        unsafe {
-            Ok(timeval2dur(
-                self.getsockopt(libc::SOL_SOCKET, libc::SO_SNDTIMEO)?,
-            ))
-        }
-    }
-
-    pub fn set_write_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::SOL_SOCKET, libc::SO_SNDTIMEO, dur2timeval(dur)?) }
-    }
-
-    pub fn nodelay(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_TCP, libc::TCP_NODELAY)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::IPPROTO_TCP, libc::TCP_NODELAY, nodelay as c_int) }
-    }
-
-    pub fn broadcast(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_BROADCAST)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn set_broadcast(&self, broadcast: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::SOL_SOCKET, libc::SO_BROADCAST, broadcast as c_int) }
-    }
-
-    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
+    /// Gets the value of the `TCP_MAXSEG` option on this socket.
+    ///
+    /// For more information about this option, see [`set_mss`].
+    ///
+    /// [`set_mss`]: crate::Socket::set_mss
+    #[cfg(all(feature = "all", not(target_os = "redox")))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", unix, not(target_os = "redox")))))]
+    pub fn mss(&self) -> io::Result<u32> {
         unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_IP, libc::IP_MULTICAST_LOOP)?;
-            Ok(raw != 0)
+            getsockopt::<c_int>(self.as_raw(), libc::IPPROTO_TCP, libc::TCP_MAXSEG)
+                .map(|mss| mss as u32)
         }
     }
 
-    pub fn set_multicast_loop_v4(&self, multicast_loop_v4: bool) -> io::Result<()> {
+    /// Sets the value of the `TCP_MAXSEG` option on this socket.
+    ///
+    /// The `TCP_MAXSEG` option denotes the TCP Maximum Segment Size and is only
+    /// available on TCP sockets.
+    #[cfg(all(feature = "all", not(target_os = "redox")))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", unix, not(target_os = "redox")))))]
+    pub fn set_mss(&self, mss: u32) -> io::Result<()> {
         unsafe {
-            self.setsockopt(
-                libc::IPPROTO_IP,
-                libc::IP_MULTICAST_LOOP,
-                multicast_loop_v4 as c_int,
+            setsockopt(
+                self.as_raw(),
+                libc::IPPROTO_TCP,
+                libc::TCP_MAXSEG,
+                mss as c_int,
             )
         }
     }
 
-    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_IP, libc::IP_MULTICAST_TTL)?;
-            Ok(raw as u32)
-        }
-    }
-
-    pub fn set_multicast_ttl_v4(&self, multicast_ttl_v4: u32) -> io::Result<()> {
-        unsafe {
-            self.setsockopt(
-                libc::IPPROTO_IP,
-                libc::IP_MULTICAST_TTL,
-                multicast_ttl_v4 as c_int,
+    /// Returns `true` if `listen(2)` was called on this socket by checking the
+    /// `SO_ACCEPTCONN` option on this socket.
+    #[cfg(all(
+        feature = "all",
+        any(
+            target_os = "android",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "linux",
+        )
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "android",
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "linux",
             )
-        }
-    }
-
-    pub fn multicast_hops_v6(&self) -> io::Result<u32> {
+        )))
+    )]
+    pub fn is_listener(&self) -> io::Result<bool> {
         unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_IPV6, libc::IPV6_MULTICAST_HOPS)?;
-            Ok(raw as u32)
+            getsockopt::<c_int>(self.as_raw(), libc::SOL_SOCKET, libc::SO_ACCEPTCONN)
+                .map(|v| v != 0)
         }
     }
 
-    pub fn set_multicast_hops_v6(&self, hops: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::IPPROTO_IPV6, libc::IPV6_MULTICAST_HOPS, hops as c_int) }
+    /// Returns the [`Domain`] of this socket by checking the `SO_DOMAIN` option
+    /// on this socket.
+    #[cfg(all(
+        feature = "all",
+        any(
+            target_os = "android",
+            // TODO: add FreeBSD.
+            // target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "linux",
+        )
+    ))]
+    #[cfg_attr(docsrs, doc(cfg(all(
+        feature = "all",
+        any(
+            target_os = "android",
+            // TODO: add FreeBSD.
+            // target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "linux",
+        )
+    ))))]
+    pub fn domain(&self) -> io::Result<Domain> {
+        unsafe { getsockopt::<c_int>(self.as_raw(), libc::SOL_SOCKET, libc::SO_DOMAIN).map(Domain) }
     }
 
-    pub fn multicast_if_v4(&self) -> io::Result<Ipv4Addr> {
+    /// Returns the [`Protocol`] of this socket by checking the `SO_PROTOCOL`
+    /// option on this socket.
+    #[cfg(all(
+        feature = "all",
+        any(
+            target_os = "android",
+            target_os = "freebsd",
+            target_os = "fuchsia",
+            target_os = "linux",
+        )
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "android",
+                target_os = "freebsd",
+                target_os = "fuchsia",
+                target_os = "linux",
+            )
+        )))
+    )]
+    pub fn protocol(&self) -> io::Result<Option<Protocol>> {
         unsafe {
-            let imr_interface: libc::in_addr =
-                self.getsockopt(libc::IPPROTO_IP, libc::IP_MULTICAST_IF)?;
-            Ok(from_s_addr(imr_interface.s_addr))
+            getsockopt::<c_int>(self.as_raw(), libc::SOL_SOCKET, libc::SO_PROTOCOL).map(|v| match v
+            {
+                0 => None,
+                p => Some(Protocol(p)),
+            })
         }
     }
 
-    pub fn set_multicast_if_v4(&self, interface: &Ipv4Addr) -> io::Result<()> {
-        let interface = to_s_addr(interface);
-        let imr_interface = libc::in_addr { s_addr: interface };
-
-        unsafe { self.setsockopt(libc::IPPROTO_IP, libc::IP_MULTICAST_IF, imr_interface) }
-    }
-
-    pub fn multicast_if_v6(&self) -> io::Result<u32> {
+    /// Gets the value for the `SO_MARK` option on this socket.
+    ///
+    /// This value gets the socket mark field for each packet sent through
+    /// this socket.
+    ///
+    /// On Linux this function requires the `CAP_NET_ADMIN` capability.
+    #[cfg(all(
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub fn mark(&self) -> io::Result<u32> {
         unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_IPV6, libc::IPV6_MULTICAST_IF)?;
-            Ok(raw as u32)
+            getsockopt::<c_int>(self.as_raw(), libc::SOL_SOCKET, libc::SO_MARK)
+                .map(|mark| mark as u32)
         }
     }
 
-    pub fn set_multicast_if_v6(&self, interface: u32) -> io::Result<()> {
+    /// Sets the value for the `SO_MARK` option on this socket.
+    ///
+    /// This value sets the socket mark field for each packet sent through
+    /// this socket. Changing the mark can be used for mark-based routing
+    /// without netfilter or for packet filtering.
+    ///
+    /// On Linux this function requires the `CAP_NET_ADMIN` capability.
+    #[cfg(all(
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub fn set_mark(&self, mark: u32) -> io::Result<()> {
         unsafe {
-            self.setsockopt(
-                libc::IPPROTO_IPV6,
-                libc::IPV6_MULTICAST_IF,
-                interface as c_int,
+            setsockopt::<c_int>(
+                self.as_raw(),
+                libc::SOL_SOCKET,
+                libc::SO_MARK,
+                mark as c_int,
             )
         }
     }
 
-    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
+    /// Gets the value for the `SO_BINDTODEVICE` option on this socket.
+    ///
+    /// This value gets the socket binded device's interface name.
+    #[cfg(all(
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub fn device(&self) -> io::Result<Option<Vec<u8>>> {
+        // TODO: replace with `MaybeUninit::uninit_array` once stable.
+        let mut buf: [MaybeUninit<u8>; libc::IFNAMSIZ] =
+            unsafe { MaybeUninit::uninit().assume_init() };
+        let mut len = buf.len() as libc::socklen_t;
         unsafe {
-            let raw: c_int = self.getsockopt(libc::IPPROTO_IPV6, libc::IPV6_MULTICAST_LOOP)?;
-            Ok(raw != 0)
+            syscall!(getsockopt(
+                self.as_raw(),
+                libc::SOL_SOCKET,
+                libc::SO_BINDTODEVICE,
+                buf.as_mut_ptr().cast(),
+                &mut len,
+            ))?;
         }
-    }
-
-    pub fn set_multicast_loop_v6(&self, multicast_loop_v6: bool) -> io::Result<()> {
-        unsafe {
-            self.setsockopt(
-                libc::IPPROTO_IPV6,
-                libc::IPV6_MULTICAST_LOOP,
-                multicast_loop_v6 as c_int,
-            )
+        if len == 0 {
+            Ok(None)
+        } else {
+            let buf = &buf[..len as usize - 1];
+            // TODO: use `MaybeUninit::slice_assume_init_ref` once stable.
+            Ok(Some(unsafe { &*(buf as *const [_] as *const [u8]) }.into()))
         }
     }
 
-    pub fn join_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
-        let multiaddr = to_s_addr(multiaddr);
-        let interface = to_s_addr(interface);
-        let mreq = libc::ip_mreq {
-            imr_multiaddr: libc::in_addr { s_addr: multiaddr },
-            imr_interface: libc::in_addr { s_addr: interface },
-        };
-        unsafe { self.setsockopt(libc::IPPROTO_IP, libc::IP_ADD_MEMBERSHIP, mreq) }
-    }
-
-    pub fn join_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
-        let multiaddr = to_in6_addr(multiaddr);
-        let mreq = libc::ipv6_mreq {
-            ipv6mr_multiaddr: multiaddr,
-            ipv6mr_interface: to_ipv6mr_interface(interface),
-        };
-        unsafe { self.setsockopt(libc::IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, mreq) }
-    }
-
-    pub fn leave_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
-        let multiaddr = to_s_addr(multiaddr);
-        let interface = to_s_addr(interface);
-        let mreq = libc::ip_mreq {
-            imr_multiaddr: libc::in_addr { s_addr: multiaddr },
-            imr_interface: libc::in_addr { s_addr: interface },
-        };
-        unsafe { self.setsockopt(libc::IPPROTO_IP, libc::IP_DROP_MEMBERSHIP, mreq) }
-    }
-
-    pub fn leave_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
-        let multiaddr = to_in6_addr(multiaddr);
-        let mreq = libc::ipv6_mreq {
-            ipv6mr_multiaddr: multiaddr,
-            ipv6mr_interface: to_ipv6mr_interface(interface),
+    /// Sets the value for the `SO_BINDTODEVICE` option on this socket.
+    ///
+    /// If a socket is bound to an interface, only packets received from that
+    /// particular interface are processed by the socket. Note that this only
+    /// works for some socket types, particularly `AF_INET` sockets.
+    ///
+    /// If `interface` is `None` or an empty string it removes the binding.
+    #[cfg(all(
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub fn bind_device(&self, interface: Option<&[u8]>) -> io::Result<()> {
+        let (value, len) = if let Some(interface) = interface {
+            (interface.as_ptr(), interface.len())
+        } else {
+            (ptr::null(), 0)
         };
-        unsafe { self.setsockopt(libc::IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, mreq) }
+        syscall!(setsockopt(
+            self.as_raw(),
+            libc::SOL_SOCKET,
+            libc::SO_BINDTODEVICE,
+            value.cast(),
+            len as libc::socklen_t,
+        ))
+        .map(|_| ())
     }
 
-    pub fn linger(&self) -> io::Result<Option<Duration>> {
-        unsafe {
-            Ok(linger2dur(
-                self.getsockopt(libc::SOL_SOCKET, libc::SO_LINGER)?,
-            ))
-        }
-    }
-
-    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::SOL_SOCKET, libc::SO_LINGER, dur2linger(dur)) }
-    }
-
-    pub fn set_reuse_address(&self, reuse: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::SOL_SOCKET, libc::SO_REUSEADDR, reuse as c_int) }
-    }
-
-    pub fn reuse_address(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_REUSEADDR)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn recv_buffer_size(&self) -> io::Result<usize> {
-        unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_RCVBUF)?;
-            Ok(raw as usize)
-        }
+    /// Sets the value for `IP_BOUND_IF` option on this socket.
+    ///
+    /// If a socket is bound to an interface, only packets received from that
+    /// particular interface are processed by the socket.
+    ///
+    /// If `interface` is `None`, the binding is removed. If the `interface`
+    /// index is not valid, an error is returned.
+    ///
+    /// One can use `libc::if_nametoindex` to convert an interface alias to an
+    /// index.
+    #[cfg(all(feature = "all", target_vendor = "apple"))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", target_vendor = "apple"))))]
+    pub fn bind_device_by_index(&self, interface: Option<NonZeroU32>) -> io::Result<()> {
+        let index = interface.map(NonZeroU32::get).unwrap_or(0);
+        unsafe { setsockopt(self.as_raw(), IPPROTO_IP, libc::IP_BOUND_IF, index) }
     }
 
-    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        unsafe {
-            // TODO: casting usize to a c_int should be a checked cast
-            self.setsockopt(libc::SOL_SOCKET, libc::SO_RCVBUF, size as c_int)
-        }
+    /// Gets the value for `IP_BOUND_IF` option on this socket, i.e. the index
+    /// for the interface to which the socket is bound.
+    ///
+    /// Returns `None` if the socket is not bound to any interface, otherwise
+    /// returns an interface index.
+    #[cfg(all(feature = "all", target_vendor = "apple"))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", target_vendor = "apple"))))]
+    pub fn device_index(&self) -> io::Result<Option<NonZeroU32>> {
+        let index =
+            unsafe { getsockopt::<libc::c_uint>(self.as_raw(), IPPROTO_IP, libc::IP_BOUND_IF)? };
+        Ok(NonZeroU32::new(index))
     }
 
-    pub fn send_buffer_size(&self) -> io::Result<usize> {
+    /// Get the value of the `SO_INCOMING_CPU` option on this socket.
+    ///
+    /// For more information about this option, see [`set_cpu_affinity`].
+    ///
+    /// [`set_cpu_affinity`]: crate::Socket::set_cpu_affinity
+    #[cfg(all(feature = "all", target_os = "linux"))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", target_os = "linux"))))]
+    pub fn cpu_affinity(&self) -> io::Result<usize> {
         unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_SNDBUF)?;
-            Ok(raw as usize)
+            getsockopt::<c_int>(self.as_raw(), libc::SOL_SOCKET, libc::SO_INCOMING_CPU)
+                .map(|cpu| cpu as usize)
         }
     }
 
-    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
+    /// Set value for the `SO_INCOMING_CPU` option on this socket.
+    ///
+    /// Sets the CPU affinity of the socket.
+    #[cfg(all(feature = "all", target_os = "linux"))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "all", target_os = "linux"))))]
+    pub fn set_cpu_affinity(&self, cpu: usize) -> io::Result<()> {
         unsafe {
-            // TODO: casting usize to a c_int should be a checked cast
-            self.setsockopt(libc::SOL_SOCKET, libc::SO_SNDBUF, size as c_int)
+            setsockopt(
+                self.as_raw(),
+                libc::SOL_SOCKET,
+                libc::SO_INCOMING_CPU,
+                cpu as c_int,
+            )
         }
     }
 
-    pub fn keepalive(&self) -> io::Result<Option<Duration>> {
+    /// Get the value of the `SO_REUSEPORT` option on this socket.
+    ///
+    /// For more information about this option, see [`set_reuse_port`].
+    ///
+    /// [`set_reuse_port`]: crate::Socket::set_reuse_port
+    #[cfg(all(
+        feature = "all",
+        not(any(target_os = "solaris", target_os = "illumos"))
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            unix,
+            not(any(target_os = "solaris", target_os = "illumos"))
+        )))
+    )]
+    pub fn reuse_port(&self) -> io::Result<bool> {
         unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_KEEPALIVE)?;
-            if raw == 0 {
-                return Ok(None);
-            }
-            let secs: c_int = self.getsockopt(libc::IPPROTO_TCP, KEEPALIVE_OPTION)?;
-            Ok(Some(Duration::new(secs as u64, 0)))
+            getsockopt::<c_int>(self.as_raw(), libc::SOL_SOCKET, libc::SO_REUSEPORT)
+                .map(|reuse| reuse != 0)
         }
     }
 
-    pub fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
+    /// Set value for the `SO_REUSEPORT` option on this socket.
+    ///
+    /// This indicates that further calls to `bind` may allow reuse of local
+    /// addresses. For IPv4 sockets this means that a socket may bind even when
+    /// there's a socket already listening on this port.
+    #[cfg(all(
+        feature = "all",
+        not(any(target_os = "solaris", target_os = "illumos"))
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            unix,
+            not(any(target_os = "solaris", target_os = "illumos"))
+        )))
+    )]
+    pub fn set_reuse_port(&self, reuse: bool) -> io::Result<()> {
         unsafe {
-            self.setsockopt(
+            setsockopt(
+                self.as_raw(),
                 libc::SOL_SOCKET,
-                libc::SO_KEEPALIVE,
-                keepalive.is_some() as c_int,
-            )?;
-            if let Some(dur) = keepalive {
-                // TODO: checked cast here
-                self.setsockopt(libc::IPPROTO_TCP, KEEPALIVE_OPTION, dur.as_secs() as c_int)?;
-            }
-            Ok(())
+                libc::SO_REUSEPORT,
+                reuse as c_int,
+            )
         }
     }
 
+    /// Get the value of the `IP_FREEBIND` option on this socket.
+    ///
+    /// For more information about this option, see [`set_freebind`].
+    ///
+    /// [`set_freebind`]: crate::Socket::set_freebind
     #[cfg(all(
-        unix,
-        not(any(target_os = "solaris", target_os = "illumos")),
-        feature = "reuseport"
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
     ))]
-    pub fn reuse_port(&self) -> io::Result<bool> {
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub fn freebind(&self) -> io::Result<bool> {
         unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_REUSEPORT)?;
-            Ok(raw != 0)
+            getsockopt::<c_int>(self.as_raw(), libc::SOL_SOCKET, libc::IP_FREEBIND)
+                .map(|reuse| reuse != 0)
         }
     }
 
+    /// Set value for the `IP_FREEBIND` option on this socket.
+    ///
+    /// If enabled, this boolean option allows binding to an IP address that is
+    /// nonlocal or does not (yet) exist.  This permits listening on a socket,
+    /// without requiring the underlying network interface or the specified
+    /// dynamic IP address to be up at the time that the application is trying
+    /// to bind to it.
     #[cfg(all(
-        unix,
-        not(any(target_os = "solaris", target_os = "illumos")),
-        feature = "reuseport"
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
     ))]
-    pub fn set_reuse_port(&self, reuse: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::SOL_SOCKET, libc::SO_REUSEPORT, reuse as c_int) }
-    }
-
-    pub fn out_of_band_inline(&self) -> io::Result<bool> {
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub fn set_freebind(&self, reuse: bool) -> io::Result<()> {
         unsafe {
-            let raw: c_int = self.getsockopt(libc::SOL_SOCKET, libc::SO_OOBINLINE)?;
-            Ok(raw != 0)
+            setsockopt(
+                self.as_raw(),
+                libc::SOL_SOCKET,
+                libc::IP_FREEBIND,
+                reuse as c_int,
+            )
         }
     }
 
-    pub fn set_out_of_band_inline(&self, oob_inline: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(libc::SOL_SOCKET, libc::SO_OOBINLINE, oob_inline as c_int) }
-    }
-
-    unsafe fn setsockopt<T>(&self, opt: c_int, val: c_int, payload: T) -> io::Result<()>
+    /// Copies data between a `file` and this socket using the `sendfile(2)`
+    /// system call. Because this copying is done within the kernel,
+    /// `sendfile()` is more efficient than the combination of `read(2)` and
+    /// `write(2)`, which would require transferring data to and from user
+    /// space.
+    ///
+    /// Different OSs support different kinds of `file`s, see the OS
+    /// documentation for what kind of files are supported. Generally *regular*
+    /// files are supported by all OSs.
+    ///
+    /// The `offset` is the absolute offset into the `file` to use as starting
+    /// point.
+    ///
+    /// Depending on the OS this function *may* change the offset of `file`. For
+    /// the best results reset the offset of the file before using it again.
+    ///
+    /// The `length` determines how many bytes to send, where a length of `None`
+    /// means it will try to send all bytes.
+    #[cfg(all(
+        feature = "all",
+        any(
+            target_os = "android",
+            target_os = "freebsd",
+            target_os = "linux",
+            target_vendor = "apple",
+        )
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(
+                target_os = "android",
+                target_os = "freebsd",
+                target_os = "linux",
+                target_vendor = "apple",
+            )
+        )))
+    )]
+    pub fn sendfile<F>(
+        &self,
+        file: &F,
+        offset: usize,
+        length: Option<NonZeroUsize>,
+    ) -> io::Result<usize>
     where
-        T: Copy,
+        F: AsRawFd,
     {
-        let payload = &payload as *const T as *const c_void;
-        cvt(libc::setsockopt(
-            self.fd,
-            opt,
-            val,
-            payload,
-            mem::size_of::<T>() as libc::socklen_t,
-        ))?;
-        Ok(())
+        self._sendfile(file.as_raw_fd(), offset as _, length)
     }
 
-    unsafe fn getsockopt<T: Copy>(&self, opt: c_int, val: c_int) -> io::Result<T> {
-        let mut slot: T = mem::zeroed();
-        let mut len = mem::size_of::<T>() as libc::socklen_t;
-        cvt(libc::getsockopt(
-            self.fd,
-            opt,
-            val,
-            &mut slot as *mut _ as *mut _,
-            &mut len,
-        ))?;
-        assert_eq!(len as usize, mem::size_of::<T>());
-        Ok(slot)
+    #[cfg(all(feature = "all", target_vendor = "apple"))]
+    fn _sendfile(
+        &self,
+        file: RawFd,
+        offset: libc::off_t,
+        length: Option<NonZeroUsize>,
+    ) -> io::Result<usize> {
+        // On macOS `length` is value-result parameter. It determines the number
+        // of bytes to write and returns the number of bytes written.
+        let mut length = match length {
+            Some(n) => n.get() as libc::off_t,
+            // A value of `0` means send all bytes.
+            None => 0,
+        };
+        syscall!(sendfile(
+            file,
+            self.as_raw(),
+            offset,
+            &mut length,
+            ptr::null_mut(),
+            0,
+        ))
+        .map(|_| length as usize)
+    }
+
+    #[cfg(all(feature = "all", any(target_os = "android", target_os = "linux")))]
+    fn _sendfile(
+        &self,
+        file: RawFd,
+        offset: libc::off_t,
+        length: Option<NonZeroUsize>,
+    ) -> io::Result<usize> {
+        let count = match length {
+            Some(n) => n.get() as libc::size_t,
+            // The maximum the Linux kernel will write in a single call.
+            None => 0x7ffff000, // 2,147,479,552 bytes.
+        };
+        let mut offset = offset;
+        syscall!(sendfile(self.as_raw(), file, &mut offset, count)).map(|n| n as usize)
     }
-}
 
-impl Read for Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        <&Socket>::read(&mut &*self, buf)
+    #[cfg(all(feature = "all", target_os = "freebsd"))]
+    fn _sendfile(
+        &self,
+        file: RawFd,
+        offset: libc::off_t,
+        length: Option<NonZeroUsize>,
+    ) -> io::Result<usize> {
+        let nbytes = match length {
+            Some(n) => n.get() as libc::size_t,
+            // A value of `0` means send all bytes.
+            None => 0,
+        };
+        let mut sbytes: libc::off_t = 0;
+        syscall!(sendfile(
+            file,
+            self.as_raw(),
+            offset,
+            nbytes,
+            ptr::null_mut(),
+            &mut sbytes,
+            0,
+        ))
+        .map(|_| sbytes as usize)
     }
-}
 
-impl<'a> Read for &'a Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        unsafe {
-            let n = cvt({
-                libc::read(
-                    self.fd,
-                    buf.as_mut_ptr() as *mut c_void,
-                    cmp::min(buf.len(), max_len()),
-                )
-            })?;
-            Ok(n as usize)
+    /// Set the value of the `TCP_USER_TIMEOUT` option on this socket.
+    ///
+    /// If set, this specifies the maximum amount of time that transmitted data may remain
+    /// unacknowledged or buffered data may remain untransmitted before TCP will forcibly close the
+    /// corresponding connection.
+    ///
+    /// Setting `timeout` to `None` or a zero duration causes the system default timeouts to
+    /// be used. If `timeout` in milliseconds is larger than `c_uint::MAX`, the timeout is clamped
+    /// to `c_uint::MAX`. For example, when `c_uint` is a 32-bit value, this limits the timeout to
+    /// approximately 49.71 days.
+    #[cfg(all(
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub fn set_tcp_user_timeout(&self, timeout: Option<Duration>) -> io::Result<()> {
+        let timeout = timeout
+            .map(|to| min(to.as_millis(), libc::c_uint::MAX as u128) as libc::c_uint)
+            .unwrap_or(0);
+        unsafe {
+            setsockopt(
+                self.as_raw(),
+                libc::IPPROTO_TCP,
+                libc::TCP_USER_TIMEOUT,
+                timeout,
+            )
         }
     }
-}
-
-impl Write for Socket {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        <&Socket>::write(&mut &*self, buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        <&Socket>::flush(&mut &*self)
-    }
-}
-
-impl<'a> Write for &'a Socket {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.send(buf, 0)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
 
-impl fmt::Debug for Socket {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut f = f.debug_struct("Socket");
-        f.field("fd", &self.fd);
-        if let Ok(addr) = self.local_addr() {
-            f.field("local_addr", &addr);
-        }
-        if let Ok(addr) = self.peer_addr() {
-            f.field("peer_addr", &addr);
+    /// Get the value of the `TCP_USER_TIMEOUT` option on this socket.
+    ///
+    /// For more information about this option, see [`set_tcp_user_timeout`].
+    ///
+    /// [`set_tcp_user_timeout`]: Socket::set_tcp_user_timeout
+    #[cfg(all(
+        feature = "all",
+        any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+    ))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(
+            feature = "all",
+            any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+        )))
+    )]
+    pub fn tcp_user_timeout(&self) -> io::Result<Option<Duration>> {
+        unsafe {
+            getsockopt::<libc::c_uint>(self.as_raw(), libc::IPPROTO_TCP, libc::TCP_USER_TIMEOUT)
+                .map(|millis| {
+                    if millis == 0 {
+                        None
+                    } else {
+                        Some(Duration::from_millis(millis as u64))
+                    }
+                })
         }
-        f.finish()
-    }
-}
-
-impl AsRawFd for Socket {
-    fn as_raw_fd(&self) -> c_int {
-        self.fd
-    }
-}
-
-impl IntoRawFd for Socket {
-    fn into_raw_fd(self) -> c_int {
-        let fd = self.fd;
-        mem::forget(self);
-        return fd;
-    }
-}
-
-impl FromRawFd for Socket {
-    unsafe fn from_raw_fd(fd: c_int) -> Socket {
-        Socket { fd: fd }
     }
 }
 
+#[cfg_attr(docsrs, doc(cfg(unix)))]
 impl AsRawFd for crate::Socket {
     fn as_raw_fd(&self) -> c_int {
-        self.inner.as_raw_fd()
+        self.as_raw()
     }
 }
 
+#[cfg_attr(docsrs, doc(cfg(unix)))]
 impl IntoRawFd for crate::Socket {
     fn into_raw_fd(self) -> c_int {
-        self.inner.into_raw_fd()
+        self.into_raw()
     }
 }
 
+#[cfg_attr(docsrs, doc(cfg(unix)))]
 impl FromRawFd for crate::Socket {
     unsafe fn from_raw_fd(fd: c_int) -> crate::Socket {
-        crate::Socket {
-            inner: Socket::from_raw_fd(fd),
-        }
-    }
-}
-
-impl Drop for Socket {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libc::close(self.fd);
-        }
-    }
-}
-
-impl From<Socket> for net::TcpStream {
-    fn from(socket: Socket) -> net::TcpStream {
-        unsafe { net::TcpStream::from_raw_fd(socket.into_raw_fd()) }
+        crate::Socket::from_raw(fd)
     }
 }
 
-impl From<Socket> for net::TcpListener {
-    fn from(socket: Socket) -> net::TcpListener {
-        unsafe { net::TcpListener::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-impl From<Socket> for net::UdpSocket {
-    fn from(socket: Socket) -> net::UdpSocket {
-        unsafe { net::UdpSocket::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-#[cfg(all(unix, feature = "unix"))]
-impl From<Socket> for UnixStream {
-    fn from(socket: Socket) -> UnixStream {
-        unsafe { UnixStream::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-#[cfg(all(unix, feature = "unix"))]
-impl From<Socket> for UnixListener {
-    fn from(socket: Socket) -> UnixListener {
-        unsafe { UnixListener::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-#[cfg(all(unix, feature = "unix"))]
-impl From<Socket> for UnixDatagram {
-    fn from(socket: Socket) -> UnixDatagram {
-        unsafe { UnixDatagram::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-impl From<net::TcpStream> for Socket {
-    fn from(socket: net::TcpStream) -> Socket {
-        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-impl From<net::TcpListener> for Socket {
-    fn from(socket: net::TcpListener) -> Socket {
-        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-impl From<net::UdpSocket> for Socket {
-    fn from(socket: net::UdpSocket) -> Socket {
-        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-#[cfg(all(unix, feature = "unix"))]
-impl From<UnixStream> for Socket {
-    fn from(socket: UnixStream) -> Socket {
-        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-#[cfg(all(unix, feature = "unix"))]
-impl From<UnixListener> for Socket {
-    fn from(socket: UnixListener) -> Socket {
-        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-#[cfg(all(unix, feature = "unix"))]
-impl From<UnixDatagram> for Socket {
-    fn from(socket: UnixDatagram) -> Socket {
-        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
-fn max_len() -> usize {
-    // The maximum read limit on most posix-like systems is `SSIZE_MAX`,
-    // with the man page quoting that if the count of bytes to read is
-    // greater than `SSIZE_MAX` the result is "unspecified".
-    //
-    // On macOS, however, apparently the 64-bit libc is either buggy or
-    // intentionally showing odd behavior by rejecting any read with a size
-    // larger than or equal to INT_MAX. To handle both of these the read
-    // size is capped on both platforms.
-    if cfg!(target_os = "macos") {
-        <c_int>::max_value() as usize - 1
-    } else {
-        <ssize_t>::max_value() as usize
-    }
-}
-
-fn cvt<T: One + PartialEq + Neg<Output = T>>(t: T) -> io::Result<T> {
-    let one: T = T::one();
-    if t == -one {
-        Err(io::Error::last_os_error())
-    } else {
-        Ok(t)
-    }
-}
-
-fn cvt_r<F, T>(mut f: F) -> io::Result<T>
-where
-    F: FnMut() -> T,
-    T: One + PartialEq + Neg<Output = T>,
-{
-    loop {
-        match cvt(f()) {
-            Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
-            other => return other,
-        }
-    }
-}
-
-fn set_cloexec(fd: c_int) -> io::Result<()> {
-    unsafe {
-        let previous = cvt(libc::fcntl(fd, libc::F_GETFD))?;
-        let new = previous | libc::FD_CLOEXEC;
-        if new != previous {
-            cvt(libc::fcntl(fd, libc::F_SETFD, new))?;
-        }
-        Ok(())
-    }
-}
-
-fn dur2timeval(dur: Option<Duration>) -> io::Result<libc::timeval> {
-    match dur {
-        Some(dur) => {
-            if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
-                return Err(io::Error::new(
-                    io::ErrorKind::InvalidInput,
-                    "cannot set a 0 duration timeout",
-                ));
-            }
-
-            let secs = if dur.as_secs() > libc::time_t::max_value() as u64 {
-                libc::time_t::max_value()
-            } else {
-                dur.as_secs() as libc::time_t
-            };
-            let mut timeout = libc::timeval {
-                tv_sec: secs,
-                tv_usec: (dur.subsec_nanos() / 1000) as libc::suseconds_t,
-            };
-            if timeout.tv_sec == 0 && timeout.tv_usec == 0 {
-                timeout.tv_usec = 1;
-            }
-            Ok(timeout)
-        }
-        None => Ok(libc::timeval {
-            tv_sec: 0,
-            tv_usec: 0,
-        }),
-    }
-}
-
-fn timeval2dur(raw: libc::timeval) -> Option<Duration> {
-    if raw.tv_sec == 0 && raw.tv_usec == 0 {
-        None
-    } else {
-        let sec = raw.tv_sec as u64;
-        let nsec = (raw.tv_usec as u32) * 1000;
-        Some(Duration::new(sec, nsec))
-    }
-}
-
-fn to_s_addr(addr: &Ipv4Addr) -> libc::in_addr_t {
-    let octets = addr.octets();
-    crate::hton(
-        ((octets[0] as libc::in_addr_t) << 24)
-            | ((octets[1] as libc::in_addr_t) << 16)
-            | ((octets[2] as libc::in_addr_t) << 8)
-            | ((octets[3] as libc::in_addr_t) << 0),
-    )
-}
-
-fn from_s_addr(in_addr: libc::in_addr_t) -> Ipv4Addr {
-    let h_addr = crate::ntoh(in_addr);
-
-    let a: u8 = (h_addr >> 24) as u8;
-    let b: u8 = (h_addr >> 16) as u8;
-    let c: u8 = (h_addr >> 8) as u8;
-    let d: u8 = (h_addr >> 0) as u8;
-
-    Ipv4Addr::new(a, b, c, d)
-}
-
-fn to_in6_addr(addr: &Ipv6Addr) -> libc::in6_addr {
-    let mut ret: libc::in6_addr = unsafe { mem::zeroed() };
-    ret.s6_addr = addr.octets();
-    return ret;
-}
-
-#[cfg(target_os = "android")]
-fn to_ipv6mr_interface(value: u32) -> c_int {
-    value as c_int
-}
-
-#[cfg(not(target_os = "android"))]
-fn to_ipv6mr_interface(value: u32) -> libc::c_uint {
-    value as libc::c_uint
-}
-
-fn linger2dur(linger_opt: libc::linger) -> Option<Duration> {
-    if linger_opt.l_onoff == 0 {
-        None
-    } else {
-        Some(Duration::from_secs(linger_opt.l_linger as u64))
-    }
-}
-
-fn dur2linger(dur: Option<Duration>) -> libc::linger {
-    match dur {
-        Some(d) => libc::linger {
-            l_onoff: 1,
-            l_linger: d.as_secs() as c_int,
-        },
-        None => libc::linger {
-            l_onoff: 0,
-            l_linger: 0,
-        },
-    }
-}
+#[cfg(feature = "all")]
+from!(UnixStream, crate::Socket);
+#[cfg(feature = "all")]
+from!(UnixListener, crate::Socket);
+#[cfg(feature = "all")]
+from!(UnixDatagram, crate::Socket);
+#[cfg(feature = "all")]
+from!(crate::Socket, UnixStream);
+#[cfg(feature = "all")]
+from!(crate::Socket, UnixListener);
+#[cfg(feature = "all")]
+from!(crate::Socket, UnixDatagram);
 
 #[test]
-fn test_ip() {
+fn in_addr_convertion() {
     let ip = Ipv4Addr::new(127, 0, 0, 1);
-    assert_eq!(ip, from_s_addr(to_s_addr(&ip)));
+    let raw = to_in_addr(&ip);
+    // NOTE: `in_addr` is packed on NetBSD and it's unsafe to borrow.
+    let a = raw.s_addr;
+    assert_eq!(a, u32::from_ne_bytes([127, 0, 0, 1]));
+    assert_eq!(from_in_addr(raw), ip);
+
+    let ip = Ipv4Addr::new(127, 34, 4, 12);
+    let raw = to_in_addr(&ip);
+    let a = raw.s_addr;
+    assert_eq!(a, u32::from_ne_bytes([127, 34, 4, 12]));
+    assert_eq!(from_in_addr(raw), ip);
 }
 
 #[test]
-fn test_out_of_band_inline() {
-    let tcp = Socket::new(libc::AF_INET, libc::SOCK_STREAM, 0).unwrap();
-    assert_eq!(tcp.out_of_band_inline().unwrap(), false);
-
-    tcp.set_out_of_band_inline(true).unwrap();
-    assert_eq!(tcp.out_of_band_inline().unwrap(), true);
+fn in6_addr_convertion() {
+    let ip = Ipv6Addr::new(0x2000, 1, 2, 3, 4, 5, 6, 7);
+    let raw = to_in6_addr(&ip);
+    let want = [32, 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7];
+    assert_eq!(raw.s6_addr, want);
+    assert_eq!(from_in6_addr(raw), ip);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/sys/windows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/sys/windows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/sys/windows.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/sys/windows.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,4 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
+// Copyright 2015 The Rust Project Developers.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -8,51 +6,99 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::cmp;
-use std::fmt;
-use std::io;
-use std::io::{Read, Write};
-use std::mem;
-use std::net::Shutdown;
-use std::net::{self, Ipv4Addr, Ipv6Addr};
+use std::cmp::min;
+use std::io::{self, IoSlice};
+use std::marker::PhantomData;
+use std::mem::{self, size_of, MaybeUninit};
+use std::net::{self, Ipv4Addr, Ipv6Addr, Shutdown};
 use std::os::windows::prelude::*;
-use std::ptr;
 use std::sync::Once;
-use std::time::Duration;
+use std::time::{Duration, Instant};
+use std::{ptr, slice};
 
-use winapi::ctypes::{c_char, c_long, c_ulong};
+use winapi::ctypes::c_long;
 use winapi::shared::in6addr::*;
 use winapi::shared::inaddr::*;
 use winapi::shared::minwindef::DWORD;
-use winapi::shared::ntdef::{HANDLE, ULONG};
-use winapi::shared::ws2def::{self, *};
-use winapi::shared::ws2ipdef::*;
+use winapi::shared::minwindef::ULONG;
+use winapi::shared::mstcpip::{tcp_keepalive, SIO_KEEPALIVE_VALS};
+use winapi::shared::ntdef::HANDLE;
+use winapi::shared::ws2def;
+use winapi::shared::ws2def::WSABUF;
 use winapi::um::handleapi::SetHandleInformation;
 use winapi::um::processthreadsapi::GetCurrentProcessId;
-use winapi::um::winbase::INFINITE;
-use winapi::um::winsock2 as sock;
-
-use crate::SockAddr;
-
-const HANDLE_FLAG_INHERIT: DWORD = 0x00000001;
-const MSG_PEEK: c_int = 0x2;
-const SD_BOTH: c_int = 2;
-const SD_RECEIVE: c_int = 0;
-const SD_SEND: c_int = 1;
-const SIO_KEEPALIVE_VALS: DWORD = 0x98000004;
-const WSA_FLAG_OVERLAPPED: DWORD = 0x01;
-
-pub use winapi::ctypes::c_int;
+use winapi::um::winbase::{self, INFINITE};
+use winapi::um::winsock2::{
+    self as sock, u_long, POLLERR, POLLHUP, POLLRDNORM, POLLWRNORM, SD_BOTH, SD_RECEIVE, SD_SEND,
+    WSAPOLLFD,
+};
+
+use crate::{RecvFlags, SockAddr, TcpKeepalive, Type};
+
+pub(crate) use winapi::ctypes::c_int;
+
+/// Fake MSG_TRUNC flag for the [`RecvFlags`] struct.
+///
+/// The flag is enabled when a `WSARecv[From]` call returns `WSAEMSGSIZE`. The
+/// value of the flag is defined by us.
+pub(crate) const MSG_TRUNC: c_int = 0x01;
 
 // Used in `Domain`.
 pub(crate) use winapi::shared::ws2def::{AF_INET, AF_INET6};
 // Used in `Type`.
-pub(crate) use winapi::shared::ws2def::{SOCK_DGRAM, SOCK_RAW, SOCK_SEQPACKET, SOCK_STREAM};
+pub(crate) use winapi::shared::ws2def::{SOCK_DGRAM, SOCK_STREAM};
+#[cfg(feature = "all")]
+pub(crate) use winapi::shared::ws2def::{SOCK_RAW, SOCK_SEQPACKET};
 // Used in `Protocol`.
 pub(crate) const IPPROTO_ICMP: c_int = winapi::shared::ws2def::IPPROTO_ICMP as c_int;
 pub(crate) const IPPROTO_ICMPV6: c_int = winapi::shared::ws2def::IPPROTO_ICMPV6 as c_int;
 pub(crate) const IPPROTO_TCP: c_int = winapi::shared::ws2def::IPPROTO_TCP as c_int;
 pub(crate) const IPPROTO_UDP: c_int = winapi::shared::ws2def::IPPROTO_UDP as c_int;
+// Used in `SockAddr`.
+pub(crate) use winapi::shared::ws2def::{
+    ADDRESS_FAMILY as sa_family_t, SOCKADDR as sockaddr, SOCKADDR_IN as sockaddr_in,
+    SOCKADDR_STORAGE as sockaddr_storage,
+};
+pub(crate) use winapi::shared::ws2ipdef::SOCKADDR_IN6_LH as sockaddr_in6;
+pub(crate) use winapi::um::ws2tcpip::socklen_t;
+// Used in `Socket`.
+pub(crate) use winapi::shared::ws2def::{
+    IPPROTO_IP, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_KEEPALIVE, SO_LINGER, SO_OOBINLINE,
+    SO_RCVBUF, SO_RCVTIMEO, SO_REUSEADDR, SO_SNDBUF, SO_SNDTIMEO, SO_TYPE, TCP_NODELAY,
+};
+pub(crate) use winapi::shared::ws2ipdef::{
+    IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP, IPV6_MREQ as Ipv6Mreq, IPV6_MULTICAST_HOPS,
+    IPV6_MULTICAST_IF, IPV6_MULTICAST_LOOP, IPV6_UNICAST_HOPS, IPV6_V6ONLY, IP_ADD_MEMBERSHIP,
+    IP_DROP_MEMBERSHIP, IP_MREQ as IpMreq, IP_MULTICAST_IF, IP_MULTICAST_LOOP, IP_MULTICAST_TTL,
+    IP_TOS, IP_TTL,
+};
+pub(crate) use winapi::um::winsock2::{linger, MSG_OOB, MSG_PEEK};
+pub(crate) const IPPROTO_IPV6: c_int = winapi::shared::ws2def::IPPROTO_IPV6 as c_int;
+
+/// Type used in set/getsockopt to retrieve the `TCP_NODELAY` option.
+///
+/// NOTE: <https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-getsockopt>
+/// documents that options such as `TCP_NODELAY` and `SO_KEEPALIVE` expect a
+/// `BOOL` (alias for `c_int`, 4 bytes), however in practice this turns out to
+/// be false (or misleading) as a `BOOLEAN` (`c_uchar`, 1 byte) is returned by
+/// `getsockopt`.
+pub(crate) type Bool = winapi::shared::ntdef::BOOLEAN;
+
+/// Maximum size of a buffer passed to system call like `recv` and `send`.
+const MAX_BUF_LEN: usize = <c_int>::max_value() as usize;
+
+/// Helper macro to execute a system call that returns an `io::Result`.
+macro_rules! syscall {
+    ($fn: ident ( $($arg: expr),* $(,)* ), $err_test: path, $err_value: expr) => {{
+        #[allow(unused_unsafe)]
+        let res = unsafe { sock::$fn($($arg, )*) };
+        if $err_test(&res, &$err_value) {
+            Err(io::Error::last_os_error())
+        } else {
+            Ok(res)
+        }
+    }};
+}
 
 impl_debug!(
     crate::Domain,
@@ -62,6 +108,24 @@
     ws2def::AF_UNSPEC, // = 0.
 );
 
+/// Windows only API.
+impl Type {
+    /// Our custom flag to set `WSA_FLAG_NO_HANDLE_INHERIT` on socket creation.
+    /// Trying to mimic `Type::cloexec` on windows.
+    const NO_INHERIT: c_int = 1 << ((size_of::<c_int>() * 8) - 1); // Last bit.
+
+    /// Set `WSA_FLAG_NO_HANDLE_INHERIT` on the socket.
+    #[cfg(feature = "all")]
+    #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "all"))))]
+    pub const fn no_inherit(self) -> Type {
+        self._no_inherit()
+    }
+
+    pub(crate) const fn _no_inherit(self) -> Type {
+        Type(self.0 | Type::NO_INHERIT)
+    }
+}
+
 impl_debug!(
     crate::Type,
     ws2def::SOCK_STREAM,
@@ -79,905 +143,587 @@
     self::IPPROTO_UDP,
 );
 
-#[repr(C)]
-struct tcp_keepalive {
-    onoff: c_ulong,
-    keepalivetime: c_ulong,
-    keepaliveinterval: c_ulong,
-}
-
-fn init() {
-    static INIT: Once = Once::new();
-
-    INIT.call_once(|| {
-        // Initialize winsock through the standard library by just creating a
-        // dummy socket. Whether this is successful or not we drop the result as
-        // libstd will be sure to have initialized winsock.
-        let _ = net::UdpSocket::bind("127.0.0.1:34254");
-    });
-}
-
-fn last_error() -> io::Error {
-    io::Error::from_raw_os_error(unsafe { sock::WSAGetLastError() })
+impl std::fmt::Debug for RecvFlags {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RecvFlags")
+            .field("is_truncated", &self.is_truncated())
+            .finish()
+    }
 }
 
-pub struct Socket {
-    socket: sock::SOCKET,
+#[repr(transparent)]
+pub struct MaybeUninitSlice<'a> {
+    vec: WSABUF,
+    _lifetime: PhantomData<&'a mut [MaybeUninit<u8>]>,
 }
 
-impl Socket {
-    pub fn new(family: c_int, ty: c_int, protocol: c_int) -> io::Result<Socket> {
-        init();
-        unsafe {
-            let socket = match sock::WSASocketW(
-                family,
-                ty,
-                protocol,
-                ptr::null_mut(),
-                0,
-                WSA_FLAG_OVERLAPPED,
-            ) {
-                sock::INVALID_SOCKET => return Err(last_error()),
-                socket => socket,
-            };
-            let socket = Socket::from_raw_socket(socket as RawSocket);
-            socket.set_no_inherit()?;
-            Ok(socket)
-        }
-    }
-
-    pub fn bind(&self, addr: &SockAddr) -> io::Result<()> {
-        unsafe {
-            if sock::bind(self.socket, addr.as_ptr(), addr.len()) == 0 {
-                Ok(())
-            } else {
-                Err(last_error())
-            }
-        }
-    }
-
-    pub fn listen(&self, backlog: i32) -> io::Result<()> {
-        unsafe {
-            if sock::listen(self.socket, backlog) == 0 {
-                Ok(())
-            } else {
-                Err(last_error())
-            }
-        }
-    }
-
-    pub fn connect(&self, addr: &SockAddr) -> io::Result<()> {
-        unsafe {
-            if sock::connect(self.socket, addr.as_ptr(), addr.len()) == 0 {
-                Ok(())
-            } else {
-                Err(last_error())
-            }
-        }
-    }
-
-    pub fn connect_timeout(&self, addr: &SockAddr, timeout: Duration) -> io::Result<()> {
-        self.set_nonblocking(true)?;
-        let r = self.connect(addr);
-        self.set_nonblocking(false)?;
-
-        match r {
-            Ok(()) => return Ok(()),
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {}
-            Err(e) => return Err(e),
-        }
-
-        if timeout.as_secs() == 0 && timeout.subsec_nanos() == 0 {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                "cannot set a 0 duration timeout",
-            ));
-        }
-
-        let mut timeout = sock::timeval {
-            tv_sec: timeout.as_secs() as c_long,
-            tv_usec: (timeout.subsec_nanos() / 1000) as c_long,
-        };
-        if timeout.tv_sec == 0 && timeout.tv_usec == 0 {
-            timeout.tv_usec = 1;
-        }
-
-        let fds = unsafe {
-            let mut fds = mem::zeroed::<sock::fd_set>();
-            fds.fd_count = 1;
-            fds.fd_array[0] = self.socket;
-            fds
-        };
-
-        let mut writefds = fds;
-        let mut errorfds = fds;
-
-        match unsafe { sock::select(1, ptr::null_mut(), &mut writefds, &mut errorfds, &timeout) } {
-            sock::SOCKET_ERROR => return Err(io::Error::last_os_error()),
-            0 => {
-                return Err(io::Error::new(
-                    io::ErrorKind::TimedOut,
-                    "connection timed out",
-                ))
-            }
-            _ => {
-                if writefds.fd_count != 1 {
-                    if let Some(e) = self.take_error()? {
-                        return Err(e);
-                    }
-                }
-                Ok(())
-            }
-        }
-    }
-
-    pub fn local_addr(&self) -> io::Result<SockAddr> {
-        unsafe {
-            let mut storage: SOCKADDR_STORAGE = mem::zeroed();
-            let mut len = mem::size_of_val(&storage) as c_int;
-            if sock::getsockname(self.socket, &mut storage as *mut _ as *mut _, &mut len) != 0 {
-                return Err(last_error());
-            }
-            Ok(SockAddr::from_raw_parts(
-                &storage as *const _ as *const _,
-                len,
-            ))
-        }
-    }
-
-    pub fn peer_addr(&self) -> io::Result<SockAddr> {
-        unsafe {
-            let mut storage: SOCKADDR_STORAGE = mem::zeroed();
-            let mut len = mem::size_of_val(&storage) as c_int;
-            if sock::getpeername(self.socket, &mut storage as *mut _ as *mut _, &mut len) != 0 {
-                return Err(last_error());
-            }
-            Ok(SockAddr::from_raw_parts(
-                &storage as *const _ as *const _,
-                len,
-            ))
-        }
-    }
-
-    pub fn try_clone(&self) -> io::Result<Socket> {
-        unsafe {
-            let mut info: sock::WSAPROTOCOL_INFOW = mem::zeroed();
-            let r = sock::WSADuplicateSocketW(self.socket, GetCurrentProcessId(), &mut info);
-            if r != 0 {
-                return Err(io::Error::last_os_error());
-            }
-            let socket = sock::WSASocketW(
-                info.iAddressFamily,
-                info.iSocketType,
-                info.iProtocol,
-                &mut info,
-                0,
-                WSA_FLAG_OVERLAPPED,
-            );
-            let socket = match socket {
-                sock::INVALID_SOCKET => return Err(last_error()),
-                n => Socket::from_raw_socket(n as RawSocket),
-            };
-            socket.set_no_inherit()?;
-            Ok(socket)
-        }
-    }
-
-    pub fn accept(&self) -> io::Result<(Socket, SockAddr)> {
-        unsafe {
-            let mut storage: SOCKADDR_STORAGE = mem::zeroed();
-            let mut len = mem::size_of_val(&storage) as c_int;
-            let socket = { sock::accept(self.socket, &mut storage as *mut _ as *mut _, &mut len) };
-            let socket = match socket {
-                sock::INVALID_SOCKET => return Err(last_error()),
-                socket => Socket::from_raw_socket(socket as RawSocket),
-            };
-            socket.set_no_inherit()?;
-            let addr = SockAddr::from_raw_parts(&storage as *const _ as *const _, len);
-            Ok((socket, addr))
-        }
-    }
-
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        unsafe {
-            let raw: c_int = self.getsockopt(SOL_SOCKET, SO_ERROR)?;
-            if raw == 0 {
-                Ok(None)
-            } else {
-                Ok(Some(io::Error::from_raw_os_error(raw as i32)))
-            }
-        }
-    }
-
-    pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
-        unsafe {
-            let mut nonblocking = nonblocking as c_ulong;
-            let r = sock::ioctlsocket(self.socket, sock::FIONBIO as c_int, &mut nonblocking);
-            if r == 0 {
-                Ok(())
-            } else {
-                Err(io::Error::last_os_error())
-            }
-        }
-    }
-
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        let how = match how {
-            Shutdown::Write => SD_SEND,
-            Shutdown::Read => SD_RECEIVE,
-            Shutdown::Both => SD_BOTH,
-        };
-        if unsafe { sock::shutdown(self.socket, how) == 0 } {
-            Ok(())
-        } else {
-            Err(last_error())
-        }
-    }
-
-    pub fn recv(&self, buf: &mut [u8], flags: c_int) -> io::Result<usize> {
-        unsafe {
-            let n = {
-                sock::recv(
-                    self.socket,
-                    buf.as_mut_ptr() as *mut c_char,
-                    clamp(buf.len()),
-                    flags,
-                )
-            };
-            match n {
-                sock::SOCKET_ERROR if sock::WSAGetLastError() == sock::WSAESHUTDOWN as i32 => Ok(0),
-                sock::SOCKET_ERROR => Err(last_error()),
-                n => Ok(n as usize),
-            }
-        }
-    }
-
-    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
-        unsafe {
-            let n = {
-                sock::recv(
-                    self.socket,
-                    buf.as_mut_ptr() as *mut c_char,
-                    clamp(buf.len()),
-                    MSG_PEEK,
-                )
-            };
-            match n {
-                sock::SOCKET_ERROR if sock::WSAGetLastError() == sock::WSAESHUTDOWN as i32 => Ok(0),
-                sock::SOCKET_ERROR => Err(last_error()),
-                n => Ok(n as usize),
-            }
-        }
-    }
-
-    pub fn peek_from(&self, buf: &mut [u8]) -> io::Result<(usize, SockAddr)> {
-        self.recv_from(buf, MSG_PEEK)
-    }
-
-    pub fn recv_from(&self, buf: &mut [u8], flags: c_int) -> io::Result<(usize, SockAddr)> {
-        unsafe {
-            let mut storage: SOCKADDR_STORAGE = mem::zeroed();
-            let mut addrlen = mem::size_of_val(&storage) as c_int;
-
-            let n = {
-                sock::recvfrom(
-                    self.socket,
-                    buf.as_mut_ptr() as *mut c_char,
-                    clamp(buf.len()),
-                    flags,
-                    &mut storage as *mut _ as *mut _,
-                    &mut addrlen,
-                )
-            };
-            let n = match n {
-                sock::SOCKET_ERROR if sock::WSAGetLastError() == sock::WSAESHUTDOWN as i32 => 0,
-                sock::SOCKET_ERROR => return Err(last_error()),
-                n => n as usize,
-            };
-            let addr = SockAddr::from_raw_parts(&storage as *const _ as *const _, addrlen);
-            Ok((n, addr))
-        }
-    }
-
-    pub fn send(&self, buf: &[u8], flags: c_int) -> io::Result<usize> {
-        unsafe {
-            let n = {
-                sock::send(
-                    self.socket,
-                    buf.as_ptr() as *const c_char,
-                    clamp(buf.len()),
-                    flags,
-                )
-            };
-            if n == sock::SOCKET_ERROR {
-                Err(last_error())
-            } else {
-                Ok(n as usize)
-            }
-        }
-    }
-
-    pub fn send_to(&self, buf: &[u8], flags: c_int, addr: &SockAddr) -> io::Result<usize> {
-        unsafe {
-            let n = {
-                sock::sendto(
-                    self.socket,
-                    buf.as_ptr() as *const c_char,
-                    clamp(buf.len()),
-                    flags,
-                    addr.as_ptr(),
-                    addr.len(),
-                )
-            };
-            if n == sock::SOCKET_ERROR {
-                Err(last_error())
-            } else {
-                Ok(n as usize)
-            }
-        }
-    }
-
-    // ================================================
-
-    pub fn ttl(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(IPPROTO_IP, IP_TTL)?;
-            Ok(raw as u32)
-        }
-    }
-
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(IPPROTO_IP, IP_TTL, ttl as c_int) }
-    }
-
-    pub fn unicast_hops_v6(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(IPPROTO_IPV6 as c_int, IPV6_UNICAST_HOPS)?;
-            Ok(raw as u32)
-        }
-    }
-
-    pub fn set_unicast_hops_v6(&self, hops: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(IPPROTO_IPV6 as c_int, IPV6_UNICAST_HOPS, hops as c_int) }
-    }
-
-    pub fn only_v6(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(IPPROTO_IPV6 as c_int, IPV6_V6ONLY)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(IPPROTO_IPV6 as c_int, IPV6_V6ONLY, only_v6 as c_int) }
-    }
-
-    pub fn read_timeout(&self) -> io::Result<Option<Duration>> {
-        unsafe { Ok(ms2dur(self.getsockopt(SOL_SOCKET, SO_RCVTIMEO)?)) }
-    }
-
-    pub fn set_read_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        unsafe { self.setsockopt(SOL_SOCKET, SO_RCVTIMEO, dur2ms(dur)?) }
-    }
-
-    pub fn write_timeout(&self) -> io::Result<Option<Duration>> {
-        unsafe { Ok(ms2dur(self.getsockopt(SOL_SOCKET, SO_SNDTIMEO)?)) }
-    }
-
-    pub fn set_write_timeout(&self, dur: Option<Duration>) -> io::Result<()> {
-        unsafe { self.setsockopt(SOL_SOCKET, SO_SNDTIMEO, dur2ms(dur)?) }
-    }
-
-    pub fn nodelay(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_char = self.getsockopt(IPPROTO_TCP, TCP_NODELAY)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(IPPROTO_TCP, TCP_NODELAY, nodelay as c_char) }
-    }
-
-    pub fn broadcast(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(SOL_SOCKET, SO_BROADCAST)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn set_broadcast(&self, broadcast: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(SOL_SOCKET, SO_BROADCAST, broadcast as c_int) }
-    }
-
-    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(IPPROTO_IP, IP_MULTICAST_LOOP)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn set_multicast_loop_v4(&self, multicast_loop_v4: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(IPPROTO_IP, IP_MULTICAST_LOOP, multicast_loop_v4 as c_int) }
-    }
-
-    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(IPPROTO_IP, IP_MULTICAST_TTL)?;
-            Ok(raw as u32)
-        }
-    }
-
-    pub fn set_multicast_ttl_v4(&self, multicast_ttl_v4: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(IPPROTO_IP, IP_MULTICAST_TTL, multicast_ttl_v4 as c_int) }
-    }
-
-    pub fn multicast_hops_v6(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(IPPROTO_IPV6 as c_int, IPV6_MULTICAST_HOPS)?;
-            Ok(raw as u32)
-        }
-    }
-
-    pub fn set_multicast_hops_v6(&self, hops: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(IPPROTO_IPV6 as c_int, IPV6_MULTICAST_HOPS, hops as c_int) }
-    }
-
-    pub fn multicast_if_v4(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let imr_interface: IN_ADDR = self.getsockopt(IPPROTO_IP, IP_MULTICAST_IF)?;
-            Ok(from_s_addr(imr_interface.S_un))
-        }
-    }
-
-    pub fn set_multicast_if_v4(&self, interface: &Ipv4Addr) -> io::Result<()> {
-        let interface = to_s_addr(interface);
-        let imr_interface = IN_ADDR { S_un: interface };
-
-        unsafe { self.setsockopt(IPPROTO_IP, IP_MULTICAST_IF, imr_interface) }
-    }
-
-    pub fn multicast_if_v6(&self) -> io::Result<u32> {
-        unsafe {
-            let raw: c_int = self.getsockopt(IPPROTO_IPV6 as c_int, IPV6_MULTICAST_IF)?;
-            Ok(raw as u32)
-        }
-    }
-
-    pub fn set_multicast_if_v6(&self, interface: u32) -> io::Result<()> {
-        unsafe { self.setsockopt(IPPROTO_IPV6 as c_int, IPV6_MULTICAST_IF, interface as c_int) }
-    }
-
-    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(IPPROTO_IPV6 as c_int, IPV6_MULTICAST_LOOP)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn set_multicast_loop_v6(&self, multicast_loop_v6: bool) -> io::Result<()> {
-        unsafe {
-            self.setsockopt(
-                IPPROTO_IPV6 as c_int,
-                IPV6_MULTICAST_LOOP,
-                multicast_loop_v6 as c_int,
-            )
-        }
-    }
-
-    pub fn join_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
-        let multiaddr = to_s_addr(multiaddr);
-        let interface = to_s_addr(interface);
-        let mreq = IP_MREQ {
-            imr_multiaddr: IN_ADDR { S_un: multiaddr },
-            imr_interface: IN_ADDR { S_un: interface },
-        };
-        unsafe { self.setsockopt(IPPROTO_IP, IP_ADD_MEMBERSHIP, mreq) }
-    }
-
-    pub fn join_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
-        let multiaddr = to_in6_addr(multiaddr);
-        let mreq = IPV6_MREQ {
-            ipv6mr_multiaddr: multiaddr,
-            ipv6mr_interface: interface,
-        };
-        unsafe { self.setsockopt(IPPROTO_IP, IPV6_ADD_MEMBERSHIP, mreq) }
-    }
-
-    pub fn leave_multicast_v4(&self, multiaddr: &Ipv4Addr, interface: &Ipv4Addr) -> io::Result<()> {
-        let multiaddr = to_s_addr(multiaddr);
-        let interface = to_s_addr(interface);
-        let mreq = IP_MREQ {
-            imr_multiaddr: IN_ADDR { S_un: multiaddr },
-            imr_interface: IN_ADDR { S_un: interface },
-        };
-        unsafe { self.setsockopt(IPPROTO_IP, IP_DROP_MEMBERSHIP, mreq) }
-    }
-
-    pub fn leave_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
-        let multiaddr = to_in6_addr(multiaddr);
-        let mreq = IPV6_MREQ {
-            ipv6mr_multiaddr: multiaddr,
-            ipv6mr_interface: interface,
-        };
-        unsafe { self.setsockopt(IPPROTO_IP, IPV6_DROP_MEMBERSHIP, mreq) }
-    }
-
-    pub fn linger(&self) -> io::Result<Option<Duration>> {
-        unsafe { Ok(linger2dur(self.getsockopt(SOL_SOCKET, SO_LINGER)?)) }
-    }
-
-    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        unsafe { self.setsockopt(SOL_SOCKET, SO_LINGER, dur2linger(dur)) }
-    }
-
-    pub fn set_reuse_address(&self, reuse: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(SOL_SOCKET, SO_REUSEADDR, reuse as c_int) }
-    }
-
-    pub fn reuse_address(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(SOL_SOCKET, SO_REUSEADDR)?;
-            Ok(raw != 0)
-        }
-    }
-
-    pub fn recv_buffer_size(&self) -> io::Result<usize> {
-        unsafe {
-            let raw: c_int = self.getsockopt(SOL_SOCKET, SO_RCVBUF)?;
-            Ok(raw as usize)
-        }
-    }
-
-    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        unsafe {
-            // TODO: casting usize to a c_int should be a checked cast
-            self.setsockopt(SOL_SOCKET, SO_RCVBUF, size as c_int)
-        }
-    }
-
-    pub fn send_buffer_size(&self) -> io::Result<usize> {
-        unsafe {
-            let raw: c_int = self.getsockopt(SOL_SOCKET, SO_SNDBUF)?;
-            Ok(raw as usize)
-        }
-    }
-
-    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        unsafe {
-            // TODO: casting usize to a c_int should be a checked cast
-            self.setsockopt(SOL_SOCKET, SO_SNDBUF, size as c_int)
+impl<'a> MaybeUninitSlice<'a> {
+    pub fn new(buf: &'a mut [MaybeUninit<u8>]) -> MaybeUninitSlice<'a> {
+        assert!(buf.len() <= ULONG::MAX as usize);
+        MaybeUninitSlice {
+            vec: WSABUF {
+                len: buf.len() as ULONG,
+                buf: buf.as_mut_ptr().cast(),
+            },
+            _lifetime: PhantomData,
         }
     }
 
-    pub fn keepalive(&self) -> io::Result<Option<Duration>> {
-        let mut ka = tcp_keepalive {
-            onoff: 0,
-            keepalivetime: 0,
-            keepaliveinterval: 0,
-        };
-        let n = unsafe {
-            sock::WSAIoctl(
-                self.socket,
-                SIO_KEEPALIVE_VALS,
-                0 as *mut _,
-                0,
-                &mut ka as *mut _ as *mut _,
-                mem::size_of_val(&ka) as DWORD,
-                0 as *mut _,
-                0 as *mut _,
-                None,
-            )
-        };
-        if n == 0 {
-            Ok(if ka.onoff == 0 {
-                None
-            } else if ka.keepaliveinterval == 0 {
-                None
-            } else {
-                let seconds = ka.keepaliveinterval / 1000;
-                let nanos = (ka.keepaliveinterval % 1000) * 1_000_000;
-                Some(Duration::new(seconds as u64, nanos as u32))
-            })
-        } else {
-            Err(last_error())
-        }
-    }
-
-    pub fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
-        let ms = dur2ms(keepalive)?;
-        // TODO: checked casts here
-        let ka = tcp_keepalive {
-            onoff: keepalive.is_some() as c_ulong,
-            keepalivetime: ms as c_ulong,
-            keepaliveinterval: ms as c_ulong,
-        };
-        let mut out = 0;
-        let n = unsafe {
-            sock::WSAIoctl(
-                self.socket,
-                SIO_KEEPALIVE_VALS,
-                &ka as *const _ as *mut _,
-                mem::size_of_val(&ka) as DWORD,
-                0 as *mut _,
-                0,
-                &mut out,
-                0 as *mut _,
-                None,
-            )
-        };
-        if n == 0 {
-            Ok(())
-        } else {
-            Err(last_error())
-        }
-    }
-
-    pub fn out_of_band_inline(&self) -> io::Result<bool> {
-        unsafe {
-            let raw: c_int = self.getsockopt(SOL_SOCKET, SO_OOBINLINE)?;
-            Ok(raw != 0)
-        }
+    pub fn as_slice(&self) -> &[MaybeUninit<u8>] {
+        unsafe { slice::from_raw_parts(self.vec.buf.cast(), self.vec.len as usize) }
     }
 
-    pub fn set_out_of_band_inline(&self, oob_inline: bool) -> io::Result<()> {
-        unsafe { self.setsockopt(SOL_SOCKET, SO_OOBINLINE, oob_inline as c_int) }
-    }
-
-    unsafe fn setsockopt<T>(&self, opt: c_int, val: c_int, payload: T) -> io::Result<()>
-    where
-        T: Copy,
-    {
-        let payload = &payload as *const T as *const c_char;
-        if sock::setsockopt(self.socket, opt, val, payload, mem::size_of::<T>() as c_int) == 0 {
-            Ok(())
-        } else {
-            Err(last_error())
-        }
-    }
-
-    unsafe fn getsockopt<T: Copy>(&self, opt: c_int, val: c_int) -> io::Result<T> {
-        let mut slot: T = mem::zeroed();
-        let mut len = mem::size_of::<T>() as c_int;
-        if sock::getsockopt(
-            self.socket,
-            opt,
-            val,
-            &mut slot as *mut _ as *mut _,
-            &mut len,
-        ) == 0
-        {
-            assert_eq!(len as usize, mem::size_of::<T>());
-            Ok(slot)
-        } else {
-            Err(last_error())
-        }
-    }
-
-    fn set_no_inherit(&self) -> io::Result<()> {
-        unsafe {
-            let r = SetHandleInformation(self.socket as HANDLE, HANDLE_FLAG_INHERIT, 0);
-            if r == 0 {
-                Err(io::Error::last_os_error())
-            } else {
-                Ok(())
-            }
-        }
+    pub fn as_mut_slice(&mut self) -> &mut [MaybeUninit<u8>] {
+        unsafe { slice::from_raw_parts_mut(self.vec.buf.cast(), self.vec.len as usize) }
     }
 }
 
-impl Read for Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        <&Socket>::read(&mut &*self, buf)
-    }
-}
+fn init() {
+    static INIT: Once = Once::new();
 
-impl<'a> Read for &'a Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.recv(buf, 0)
-    }
+    INIT.call_once(|| {
+        // Initialize winsock through the standard library by just creating a
+        // dummy socket. Whether this is successful or not we drop the result as
+        // libstd will be sure to have initialized winsock.
+        let _ = net::UdpSocket::bind("127.0.0.1:34254");
+    });
 }
 
-impl Write for Socket {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        <&Socket>::write(&mut &*self, buf)
-    }
+pub(crate) type Socket = sock::SOCKET;
 
-    fn flush(&mut self) -> io::Result<()> {
-        <&Socket>::flush(&mut &*self)
-    }
+pub(crate) unsafe fn socket_from_raw(socket: Socket) -> crate::socket::Inner {
+    crate::socket::Inner::from_raw_socket(socket as RawSocket)
 }
 
-impl<'a> Write for &'a Socket {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.send(buf, 0)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
+pub(crate) fn socket_as_raw(socket: &crate::socket::Inner) -> Socket {
+    socket.as_raw_socket() as Socket
 }
 
-impl fmt::Debug for Socket {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut f = f.debug_struct("Socket");
-        f.field("socket", &self.socket);
-        if let Ok(addr) = self.local_addr() {
-            f.field("local_addr", &addr);
-        }
-        if let Ok(addr) = self.peer_addr() {
-            f.field("peer_addr", &addr);
-        }
-        f.finish()
-    }
+pub(crate) fn socket_into_raw(socket: crate::socket::Inner) -> Socket {
+    socket.into_raw_socket() as Socket
 }
 
-impl AsRawSocket for Socket {
-    fn as_raw_socket(&self) -> RawSocket {
-        self.socket as RawSocket
-    }
-}
+pub(crate) fn socket(family: c_int, mut ty: c_int, protocol: c_int) -> io::Result<Socket> {
+    init();
 
-impl IntoRawSocket for Socket {
-    fn into_raw_socket(self) -> RawSocket {
-        let socket = self.socket;
-        mem::forget(self);
-        socket as RawSocket
-    }
-}
+    // Check if we set our custom flag.
+    let flags = if ty & Type::NO_INHERIT != 0 {
+        ty = ty & !Type::NO_INHERIT;
+        sock::WSA_FLAG_NO_HANDLE_INHERIT
+    } else {
+        0
+    };
 
-impl FromRawSocket for Socket {
-    unsafe fn from_raw_socket(socket: RawSocket) -> Socket {
-        Socket {
-            socket: socket as sock::SOCKET,
+    syscall!(
+        WSASocketW(
+            family,
+            ty,
+            protocol,
+            ptr::null_mut(),
+            0,
+            sock::WSA_FLAG_OVERLAPPED | flags,
+        ),
+        PartialEq::eq,
+        sock::INVALID_SOCKET
+    )
+}
+
+pub(crate) fn bind(socket: Socket, addr: &SockAddr) -> io::Result<()> {
+    syscall!(bind(socket, addr.as_ptr(), addr.len()), PartialEq::ne, 0).map(|_| ())
+}
+
+pub(crate) fn connect(socket: Socket, addr: &SockAddr) -> io::Result<()> {
+    syscall!(connect(socket, addr.as_ptr(), addr.len()), PartialEq::ne, 0).map(|_| ())
+}
+
+pub(crate) fn poll_connect(socket: &crate::Socket, timeout: Duration) -> io::Result<()> {
+    let start = Instant::now();
+
+    let mut fd_array = WSAPOLLFD {
+        fd: socket.as_raw(),
+        events: POLLRDNORM | POLLWRNORM,
+        revents: 0,
+    };
+
+    loop {
+        let elapsed = start.elapsed();
+        if elapsed >= timeout {
+            return Err(io::ErrorKind::TimedOut.into());
+        }
+
+        let timeout = (timeout - elapsed).as_millis();
+        let timeout = clamp(timeout, 1, c_int::max_value() as u128) as c_int;
+
+        match syscall!(
+            WSAPoll(&mut fd_array, 1, timeout),
+            PartialEq::eq,
+            sock::SOCKET_ERROR
+        ) {
+            Ok(0) => return Err(io::ErrorKind::TimedOut.into()),
+            Ok(_) => {
+                // Error or hang up indicates an error (or failure to connect).
+                if (fd_array.revents & POLLERR) != 0 || (fd_array.revents & POLLHUP) != 0 {
+                    match socket.take_error() {
+                        Ok(Some(err)) => return Err(err),
+                        Ok(None) => {
+                            return Err(io::Error::new(
+                                io::ErrorKind::Other,
+                                "no error set after POLLHUP",
+                            ))
+                        }
+                        Err(err) => return Err(err),
+                    }
+                }
+                return Ok(());
+            }
+            // Got interrupted, try again.
+            Err(ref err) if err.kind() == io::ErrorKind::Interrupted => continue,
+            Err(err) => return Err(err),
         }
     }
 }
 
-impl AsRawSocket for crate::Socket {
-    fn as_raw_socket(&self) -> RawSocket {
-        self.inner.as_raw_socket()
-    }
-}
-
-impl IntoRawSocket for crate::Socket {
-    fn into_raw_socket(self) -> RawSocket {
-        self.inner.into_raw_socket()
+// TODO: use clamp from std lib, stable since 1.50.
+fn clamp<T>(value: T, min: T, max: T) -> T
+where
+    T: Ord,
+{
+    if value <= min {
+        min
+    } else if value >= max {
+        max
+    } else {
+        value
     }
 }
 
-impl FromRawSocket for crate::Socket {
-    unsafe fn from_raw_socket(socket: RawSocket) -> crate::Socket {
-        crate::Socket {
-            inner: Socket::from_raw_socket(socket),
-        }
-    }
+pub(crate) fn listen(socket: Socket, backlog: c_int) -> io::Result<()> {
+    syscall!(listen(socket, backlog), PartialEq::ne, 0).map(|_| ())
 }
 
-impl Drop for Socket {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = sock::closesocket(self.socket);
-        }
+pub(crate) fn accept(socket: Socket) -> io::Result<(Socket, SockAddr)> {
+    // Safety: `accept` initialises the `SockAddr` for us.
+    unsafe {
+        SockAddr::init(|storage, len| {
+            syscall!(
+                accept(socket, storage.cast(), len),
+                PartialEq::eq,
+                sock::INVALID_SOCKET
+            )
+        })
     }
 }
 
-impl From<Socket> for net::TcpStream {
-    fn from(socket: Socket) -> net::TcpStream {
-        unsafe { net::TcpStream::from_raw_socket(socket.into_raw_socket()) }
+pub(crate) fn getsockname(socket: Socket) -> io::Result<SockAddr> {
+    // Safety: `getsockname` initialises the `SockAddr` for us.
+    unsafe {
+        SockAddr::init(|storage, len| {
+            syscall!(
+                getsockname(socket, storage.cast(), len),
+                PartialEq::eq,
+                sock::SOCKET_ERROR
+            )
+        })
     }
+    .map(|(_, addr)| addr)
 }
 
-impl From<Socket> for net::TcpListener {
-    fn from(socket: Socket) -> net::TcpListener {
-        unsafe { net::TcpListener::from_raw_socket(socket.into_raw_socket()) }
+pub(crate) fn getpeername(socket: Socket) -> io::Result<SockAddr> {
+    // Safety: `getpeername` initialises the `SockAddr` for us.
+    unsafe {
+        SockAddr::init(|storage, len| {
+            syscall!(
+                getpeername(socket, storage.cast(), len),
+                PartialEq::eq,
+                sock::SOCKET_ERROR
+            )
+        })
     }
+    .map(|(_, addr)| addr)
 }
 
-impl From<Socket> for net::UdpSocket {
-    fn from(socket: Socket) -> net::UdpSocket {
-        unsafe { net::UdpSocket::from_raw_socket(socket.into_raw_socket()) }
+pub(crate) fn try_clone(socket: Socket) -> io::Result<Socket> {
+    let mut info: MaybeUninit<sock::WSAPROTOCOL_INFOW> = MaybeUninit::uninit();
+    syscall!(
+        WSADuplicateSocketW(socket, GetCurrentProcessId(), info.as_mut_ptr()),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )?;
+    // Safety: `WSADuplicateSocketW` intialised `info` for us.
+    let mut info = unsafe { info.assume_init() };
+
+    syscall!(
+        WSASocketW(
+            info.iAddressFamily,
+            info.iSocketType,
+            info.iProtocol,
+            &mut info,
+            0,
+            sock::WSA_FLAG_OVERLAPPED | sock::WSA_FLAG_NO_HANDLE_INHERIT,
+        ),
+        PartialEq::eq,
+        sock::INVALID_SOCKET
+    )
+}
+
+pub(crate) fn set_nonblocking(socket: Socket, nonblocking: bool) -> io::Result<()> {
+    let mut nonblocking = nonblocking as u_long;
+    ioctlsocket(socket, sock::FIONBIO, &mut nonblocking)
+}
+
+pub(crate) fn shutdown(socket: Socket, how: Shutdown) -> io::Result<()> {
+    let how = match how {
+        Shutdown::Write => SD_SEND,
+        Shutdown::Read => SD_RECEIVE,
+        Shutdown::Both => SD_BOTH,
+    };
+    syscall!(shutdown(socket, how), PartialEq::eq, sock::SOCKET_ERROR).map(|_| ())
+}
+
+pub(crate) fn recv(socket: Socket, buf: &mut [MaybeUninit<u8>], flags: c_int) -> io::Result<usize> {
+    let res = syscall!(
+        recv(
+            socket,
+            buf.as_mut_ptr().cast(),
+            min(buf.len(), MAX_BUF_LEN) as c_int,
+            flags,
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    );
+    match res {
+        Ok(n) => Ok(n as usize),
+        Err(ref err) if err.raw_os_error() == Some(sock::WSAESHUTDOWN as i32) => Ok(0),
+        Err(err) => Err(err),
     }
 }
 
-impl From<net::TcpStream> for Socket {
-    fn from(socket: net::TcpStream) -> Socket {
-        unsafe { Socket::from_raw_socket(socket.into_raw_socket()) }
+pub(crate) fn recv_vectored(
+    socket: Socket,
+    bufs: &mut [crate::MaybeUninitSlice<'_>],
+    flags: c_int,
+) -> io::Result<(usize, RecvFlags)> {
+    let mut nread = 0;
+    let mut flags = flags as DWORD;
+    let res = syscall!(
+        WSARecv(
+            socket,
+            bufs.as_mut_ptr().cast(),
+            min(bufs.len(), DWORD::max_value() as usize) as DWORD,
+            &mut nread,
+            &mut flags,
+            ptr::null_mut(),
+            None,
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    );
+    match res {
+        Ok(_) => Ok((nread as usize, RecvFlags(0))),
+        Err(ref err) if err.raw_os_error() == Some(sock::WSAESHUTDOWN as i32) => {
+            Ok((0, RecvFlags(0)))
+        }
+        Err(ref err) if err.raw_os_error() == Some(sock::WSAEMSGSIZE as i32) => {
+            Ok((nread as usize, RecvFlags(MSG_TRUNC)))
+        }
+        Err(err) => Err(err),
     }
 }
 
-impl From<net::TcpListener> for Socket {
-    fn from(socket: net::TcpListener) -> Socket {
-        unsafe { Socket::from_raw_socket(socket.into_raw_socket()) }
+pub(crate) fn recv_from(
+    socket: Socket,
+    buf: &mut [MaybeUninit<u8>],
+    flags: c_int,
+) -> io::Result<(usize, SockAddr)> {
+    // Safety: `recvfrom` initialises the `SockAddr` for us.
+    unsafe {
+        SockAddr::init(|storage, addrlen| {
+            let res = syscall!(
+                recvfrom(
+                    socket,
+                    buf.as_mut_ptr().cast(),
+                    min(buf.len(), MAX_BUF_LEN) as c_int,
+                    flags,
+                    storage.cast(),
+                    addrlen,
+                ),
+                PartialEq::eq,
+                sock::SOCKET_ERROR
+            );
+            match res {
+                Ok(n) => Ok(n as usize),
+                Err(ref err) if err.raw_os_error() == Some(sock::WSAESHUTDOWN as i32) => Ok(0),
+                Err(err) => Err(err),
+            }
+        })
     }
 }
 
-impl From<net::UdpSocket> for Socket {
-    fn from(socket: net::UdpSocket) -> Socket {
-        unsafe { Socket::from_raw_socket(socket.into_raw_socket()) }
+pub(crate) fn recv_from_vectored(
+    socket: Socket,
+    bufs: &mut [crate::MaybeUninitSlice<'_>],
+    flags: c_int,
+) -> io::Result<(usize, RecvFlags, SockAddr)> {
+    // Safety: `recvfrom` initialises the `SockAddr` for us.
+    unsafe {
+        SockAddr::init(|storage, addrlen| {
+            let mut nread = 0;
+            let mut flags = flags as DWORD;
+            let res = syscall!(
+                WSARecvFrom(
+                    socket,
+                    bufs.as_mut_ptr().cast(),
+                    min(bufs.len(), DWORD::max_value() as usize) as DWORD,
+                    &mut nread,
+                    &mut flags,
+                    storage.cast(),
+                    addrlen,
+                    ptr::null_mut(),
+                    None,
+                ),
+                PartialEq::eq,
+                sock::SOCKET_ERROR
+            );
+            match res {
+                Ok(_) => Ok((nread as usize, RecvFlags(0))),
+                Err(ref err) if err.raw_os_error() == Some(sock::WSAESHUTDOWN as i32) => {
+                    Ok((nread as usize, RecvFlags(0)))
+                }
+                Err(ref err) if err.raw_os_error() == Some(sock::WSAEMSGSIZE as i32) => {
+                    Ok((nread as usize, RecvFlags(MSG_TRUNC)))
+                }
+                Err(err) => Err(err),
+            }
+        })
     }
+    .map(|((n, recv_flags), addr)| (n, recv_flags, addr))
 }
 
-fn clamp(input: usize) -> c_int {
-    cmp::min(input, <c_int>::max_value() as usize) as c_int
-}
-
-fn dur2ms(dur: Option<Duration>) -> io::Result<DWORD> {
-    match dur {
-        Some(dur) => {
-            // Note that a duration is a (u64, u32) (seconds, nanoseconds)
-            // pair, and the timeouts in windows APIs are typically u32
-            // milliseconds. To translate, we have two pieces to take care of:
+pub(crate) fn send(socket: Socket, buf: &[u8], flags: c_int) -> io::Result<usize> {
+    syscall!(
+        send(
+            socket,
+            buf.as_ptr().cast(),
+            min(buf.len(), MAX_BUF_LEN) as c_int,
+            flags,
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|n| n as usize)
+}
+
+pub(crate) fn send_vectored(
+    socket: Socket,
+    bufs: &[IoSlice<'_>],
+    flags: c_int,
+) -> io::Result<usize> {
+    let mut nsent = 0;
+    syscall!(
+        WSASend(
+            socket,
+            // FIXME: From the `WSASend` docs [1]:
+            // > For a Winsock application, once the WSASend function is called,
+            // > the system owns these buffers and the application may not
+            // > access them.
             //
-            // * Nanosecond precision is rounded up
-            // * Greater than u32::MAX milliseconds (50 days) is rounded up to
-            //   INFINITE (never time out).
-            let ms = dur
-                .as_secs()
-                .checked_mul(1000)
-                .and_then(|ms| ms.checked_add((dur.subsec_nanos() as u64) / 1_000_000))
-                .and_then(|ms| {
-                    ms.checked_add(if dur.subsec_nanos() % 1_000_000 > 0 {
-                        1
-                    } else {
-                        0
-                    })
-                })
-                .map(|ms| {
-                    if ms > <DWORD>::max_value() as u64 {
-                        INFINITE
-                    } else {
-                        ms as DWORD
-                    }
-                })
-                .unwrap_or(INFINITE);
-            if ms == 0 {
-                return Err(io::Error::new(
-                    io::ErrorKind::InvalidInput,
-                    "cannot set a 0 duration timeout",
-                ));
-            }
-            Ok(ms)
-        }
-        None => Ok(0),
-    }
+            // So what we're doing is actually UB as `bufs` needs to be `&mut
+            // [IoSlice<'_>]`.
+            //
+            // Tracking issue: https://github.com/rust-lang/socket2-rs/issues/129.
+            //
+            // NOTE: `send_to_vectored` has the same problem.
+            //
+            // [1] https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasend
+            bufs.as_ptr() as *mut _,
+            min(bufs.len(), DWORD::max_value() as usize) as DWORD,
+            &mut nsent,
+            flags as DWORD,
+            std::ptr::null_mut(),
+            None,
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|_| nsent as usize)
+}
+
+pub(crate) fn send_to(
+    socket: Socket,
+    buf: &[u8],
+    addr: &SockAddr,
+    flags: c_int,
+) -> io::Result<usize> {
+    syscall!(
+        sendto(
+            socket,
+            buf.as_ptr().cast(),
+            min(buf.len(), MAX_BUF_LEN) as c_int,
+            flags,
+            addr.as_ptr(),
+            addr.len(),
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|n| n as usize)
+}
+
+pub(crate) fn send_to_vectored(
+    socket: Socket,
+    bufs: &[IoSlice<'_>],
+    addr: &SockAddr,
+    flags: c_int,
+) -> io::Result<usize> {
+    let mut nsent = 0;
+    syscall!(
+        WSASendTo(
+            socket,
+            // FIXME: Same problem as in `send_vectored`.
+            bufs.as_ptr() as *mut _,
+            bufs.len().min(DWORD::MAX as usize) as DWORD,
+            &mut nsent,
+            flags as DWORD,
+            addr.as_ptr(),
+            addr.len(),
+            ptr::null_mut(),
+            None,
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|_| nsent as usize)
+}
+
+/// Wrapper around `getsockopt` to deal with platform specific timeouts.
+pub(crate) fn timeout_opt(fd: Socket, lvl: c_int, name: c_int) -> io::Result<Option<Duration>> {
+    unsafe { getsockopt(fd, lvl, name).map(from_ms) }
 }
 
-fn ms2dur(raw: DWORD) -> Option<Duration> {
-    if raw == 0 {
+fn from_ms(duration: DWORD) -> Option<Duration> {
+    if duration == 0 {
         None
     } else {
-        let secs = raw / 1000;
-        let nsec = (raw % 1000) * 1000000;
+        let secs = duration / 1000;
+        let nsec = (duration % 1000) * 1000000;
         Some(Duration::new(secs as u64, nsec as u32))
     }
 }
 
-fn to_s_addr(addr: &Ipv4Addr) -> in_addr_S_un {
-    let octets = addr.octets();
-    let res = crate::hton(
-        ((octets[0] as ULONG) << 24)
-            | ((octets[1] as ULONG) << 16)
-            | ((octets[2] as ULONG) << 8)
-            | ((octets[3] as ULONG) << 0),
-    );
-    let mut new_addr: in_addr_S_un = unsafe { mem::zeroed() };
-    unsafe { *(new_addr.S_addr_mut()) = res };
-    new_addr
+/// Wrapper around `setsockopt` to deal with platform specific timeouts.
+pub(crate) fn set_timeout_opt(
+    fd: Socket,
+    level: c_int,
+    optname: c_int,
+    duration: Option<Duration>,
+) -> io::Result<()> {
+    let duration = into_ms(duration);
+    unsafe { setsockopt(fd, level, optname, duration) }
+}
+
+fn into_ms(duration: Option<Duration>) -> DWORD {
+    // Note that a duration is a (u64, u32) (seconds, nanoseconds) pair, and the
+    // timeouts in windows APIs are typically u32 milliseconds. To translate, we
+    // have two pieces to take care of:
+    //
+    // * Nanosecond precision is rounded up
+    // * Greater than u32::MAX milliseconds (50 days) is rounded up to
+    //   INFINITE (never time out).
+    duration
+        .map(|duration| min(duration.as_millis(), INFINITE as u128) as DWORD)
+        .unwrap_or(0)
+}
+
+pub(crate) fn set_tcp_keepalive(socket: Socket, keepalive: &TcpKeepalive) -> io::Result<()> {
+    let mut keepalive = tcp_keepalive {
+        onoff: 1,
+        keepalivetime: into_ms(keepalive.time),
+        keepaliveinterval: into_ms(keepalive.interval),
+    };
+    let mut out = 0;
+    syscall!(
+        WSAIoctl(
+            socket,
+            SIO_KEEPALIVE_VALS,
+            &mut keepalive as *mut _ as *mut _,
+            size_of::<tcp_keepalive>() as _,
+            ptr::null_mut(),
+            0,
+            &mut out,
+            ptr::null_mut(),
+            None,
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|_| ())
+}
+
+/// Caller must ensure `T` is the correct type for `level` and `optname`.
+pub(crate) unsafe fn getsockopt<T>(socket: Socket, level: c_int, optname: c_int) -> io::Result<T> {
+    let mut optval: MaybeUninit<T> = MaybeUninit::uninit();
+    let mut optlen = mem::size_of::<T>() as c_int;
+    syscall!(
+        getsockopt(
+            socket,
+            level,
+            optname,
+            optval.as_mut_ptr().cast(),
+            &mut optlen,
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|_| {
+        debug_assert_eq!(optlen as usize, mem::size_of::<T>());
+        // Safety: `getsockopt` initialised `optval` for us.
+        optval.assume_init()
+    })
+}
+
+/// Caller must ensure `T` is the correct type for `level` and `optname`.
+pub(crate) unsafe fn setsockopt<T>(
+    socket: Socket,
+    level: c_int,
+    optname: c_int,
+    optval: T,
+) -> io::Result<()> {
+    syscall!(
+        setsockopt(
+            socket,
+            level,
+            optname,
+            (&optval as *const T).cast(),
+            mem::size_of::<T>() as c_int,
+        ),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|_| ())
+}
+
+fn ioctlsocket(socket: Socket, cmd: c_long, payload: &mut u_long) -> io::Result<()> {
+    syscall!(
+        ioctlsocket(socket, cmd, payload),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|_| ())
+}
+
+pub(crate) fn to_in_addr(addr: &Ipv4Addr) -> IN_ADDR {
+    let mut s_un: in_addr_S_un = unsafe { mem::zeroed() };
+    // `S_un` is stored as BE on all machines, and the array is in BE order. So
+    // the native endian conversion method is used so that it's never swapped.
+    unsafe { *(s_un.S_addr_mut()) = u32::from_ne_bytes(addr.octets()) };
+    IN_ADDR { S_un: s_un }
 }
 
-fn from_s_addr(in_addr: in_addr_S_un) -> Ipv4Addr {
-    let h_addr = crate::ntoh(unsafe { *in_addr.S_addr() });
-
-    let a: u8 = (h_addr >> 24) as u8;
-    let b: u8 = (h_addr >> 16) as u8;
-    let c: u8 = (h_addr >> 8) as u8;
-    let d: u8 = (h_addr >> 0) as u8;
-
-    Ipv4Addr::new(a, b, c, d)
+pub(crate) fn from_in_addr(in_addr: IN_ADDR) -> Ipv4Addr {
+    Ipv4Addr::from(unsafe { *in_addr.S_un.S_addr() }.to_ne_bytes())
 }
 
-fn to_in6_addr(addr: &Ipv6Addr) -> in6_addr {
+pub(crate) fn to_in6_addr(addr: &Ipv6Addr) -> in6_addr {
     let mut ret_addr: in6_addr_u = unsafe { mem::zeroed() };
     unsafe { *(ret_addr.Byte_mut()) = addr.octets() };
     let mut ret: in6_addr = unsafe { mem::zeroed() };
@@ -985,38 +731,86 @@
     ret
 }
 
-fn linger2dur(linger_opt: sock::linger) -> Option<Duration> {
-    if linger_opt.l_onoff == 0 {
-        None
-    } else {
-        Some(Duration::from_secs(linger_opt.l_linger as u64))
+pub(crate) fn from_in6_addr(addr: in6_addr) -> Ipv6Addr {
+    Ipv6Addr::from(*unsafe { addr.u.Byte() })
+}
+
+/// Windows only API.
+impl crate::Socket {
+    /// Sets `HANDLE_FLAG_INHERIT` using `SetHandleInformation`.
+    #[cfg(feature = "all")]
+    #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "all"))))]
+    pub fn set_no_inherit(&self, no_inherit: bool) -> io::Result<()> {
+        self._set_no_inherit(no_inherit)
+    }
+
+    pub(crate) fn _set_no_inherit(&self, no_inherit: bool) -> io::Result<()> {
+        // NOTE: can't use `syscall!` because it expects the function in the
+        // `sock::` path.
+        let res = unsafe {
+            SetHandleInformation(
+                self.as_raw() as HANDLE,
+                winbase::HANDLE_FLAG_INHERIT,
+                !no_inherit as _,
+            )
+        };
+        if res == 0 {
+            // Zero means error.
+            Err(io::Error::last_os_error())
+        } else {
+            Ok(())
+        }
+    }
+}
+
+impl AsRawSocket for crate::Socket {
+    fn as_raw_socket(&self) -> RawSocket {
+        self.as_raw() as RawSocket
+    }
+}
+
+impl IntoRawSocket for crate::Socket {
+    fn into_raw_socket(self) -> RawSocket {
+        self.into_raw() as RawSocket
     }
 }
 
-fn dur2linger(dur: Option<Duration>) -> sock::linger {
-    match dur {
-        Some(d) => sock::linger {
-            l_onoff: 1,
-            l_linger: d.as_secs() as u16,
-        },
-        None => sock::linger {
-            l_onoff: 0,
-            l_linger: 0,
-        },
+impl FromRawSocket for crate::Socket {
+    unsafe fn from_raw_socket(socket: RawSocket) -> crate::Socket {
+        crate::Socket::from_raw(socket as Socket)
     }
 }
 
 #[test]
-fn test_ip() {
+fn in_addr_convertion() {
     let ip = Ipv4Addr::new(127, 0, 0, 1);
-    assert_eq!(ip, from_s_addr(to_s_addr(&ip)));
+    let raw = to_in_addr(&ip);
+    assert_eq!(unsafe { *raw.S_un.S_addr() }, 127 << 0 | 1 << 24);
+    assert_eq!(from_in_addr(raw), ip);
+
+    let ip = Ipv4Addr::new(127, 34, 4, 12);
+    let raw = to_in_addr(&ip);
+    assert_eq!(
+        unsafe { *raw.S_un.S_addr() },
+        127 << 0 | 34 << 8 | 4 << 16 | 12 << 24
+    );
+    assert_eq!(from_in_addr(raw), ip);
 }
 
 #[test]
-fn test_out_of_band_inline() {
-    let tcp = Socket::new(AF_INET, SOCK_STREAM, 0).unwrap();
-    assert_eq!(tcp.out_of_band_inline().unwrap(), false);
-
-    tcp.set_out_of_band_inline(true).unwrap();
-    assert_eq!(tcp.out_of_band_inline().unwrap(), true);
+fn in6_addr_convertion() {
+    let ip = Ipv6Addr::new(0x2000, 1, 2, 3, 4, 5, 6, 7);
+    let raw = to_in6_addr(&ip);
+    let want = [
+        0x2000u16.to_be(),
+        1u16.to_be(),
+        2u16.to_be(),
+        3u16.to_be(),
+        4u16.to_be(),
+        5u16.to_be(),
+        6u16.to_be(),
+        7u16.to_be(),
+    ];
+    assert_eq!(unsafe { *raw.u.Word() }, want);
+    assert_eq!(from_in6_addr(raw), ip);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/tests.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-use std::io::Write;
-use std::str;
-
-use crate::{Domain, Protocol, Type};
-
-#[test]
-fn domain_fmt_debug() {
-    let tests = &[
-        (Domain::ipv4(), "AF_INET"),
-        (Domain::ipv6(), "AF_INET6"),
-        #[cfg(unix)]
-        (Domain::unix(), "AF_UNIX"),
-        (0.into(), "AF_UNSPEC"),
-        (500.into(), "500"),
-    ];
-
-    let mut buf = Vec::new();
-    for (input, want) in tests {
-        buf.clear();
-        write!(buf, "{:?}", input).unwrap();
-        let got = str::from_utf8(&buf).unwrap();
-        assert_eq!(got, *want);
-    }
-}
-
-#[test]
-fn type_fmt_debug() {
-    let tests = &[
-        (Type::stream(), "SOCK_STREAM"),
-        (Type::dgram(), "SOCK_DGRAM"),
-        (Type::seqpacket(), "SOCK_SEQPACKET"),
-        (Type::raw(), "SOCK_RAW"),
-        (500.into(), "500"),
-    ];
-
-    let mut buf = Vec::new();
-    for (input, want) in tests {
-        buf.clear();
-        write!(buf, "{:?}", input).unwrap();
-        let got = str::from_utf8(&buf).unwrap();
-        assert_eq!(got, *want);
-    }
-}
-
-#[test]
-fn protocol_fmt_debug() {
-    let tests = &[
-        (Protocol::icmpv4(), "IPPROTO_ICMP"),
-        (Protocol::icmpv6(), "IPPROTO_ICMPV6"),
-        (Protocol::tcp(), "IPPROTO_TCP"),
-        (Protocol::udp(), "IPPROTO_UDP"),
-        (500.into(), "500"),
-    ];
-
-    let mut buf = Vec::new();
-    for (input, want) in tests {
-        buf.clear();
-        write!(buf, "{:?}", input).unwrap();
-        let got = str::from_utf8(&buf).unwrap();
-        assert_eq!(got, *want);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/utils.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/utils.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/src/utils.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/src/utils.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[doc(hidden)]
-pub trait NetInt {
-    fn from_be(i: Self) -> Self;
-    fn to_be(&self) -> Self;
-}
-macro_rules! doit {
-    ($($t:ident)*) => ($(impl NetInt for $t {
-        fn from_be(i: Self) -> Self { <$t>::from_be(i) }
-        fn to_be(&self) -> Self { <$t>::to_be(*self) }
-    })*)
-}
-doit! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
-
-#[doc(hidden)]
-pub trait One {
-    fn one() -> Self;
-}
-
-macro_rules! one {
-    ($($t:ident)*) => ($(
-        impl One for $t { fn one() -> $t { 1 } }
-    )*)
-}
-
-one! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
-
-#[doc(hidden)]
-pub trait Zero {
-    fn zero() -> Self;
-}
-
-macro_rules! zero {
-    ($($t:ident)*) => ($(
-        impl Zero for $t { fn zero() -> $t { 0 } }
-    )*)
-}
-
-zero! { i8 i16 i32 i64 isize u8 u16 u32 u64 usize }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/TODO thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/TODO
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/socket2/TODO	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/socket2/TODO	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# Refactor
-
-* [ ] CONTRIBUTING.md
-* [ ] Move tests from src/*.rs to tests dir.
-* [ ] Tracking issue for tests. Check all functions/coverage (with `rustcov`).
-* [ ] Look at `SockAddr`.
-  * [ ] Add docs about its size.
-
-## Maybe add socket options
-
-# SOL_SOCKET
-SO_ACCEPTCONN
-SO_DOMAIN
-SO_TYPE
-SO_INCOMING_CPU // Linux only?
-SO_INCOMING_NAPI_ID // Linux only?
-
-# No-op/error returned on Windows:
-SO_RCVLOWAT
-SO_SNDLOWAT
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"750f74f3b520672a81dd2ede5c097cfe972c0da181dd8fd010e7131a3526d4fd","Cargo.toml":"6531dbe3d557e427f9e3510e50cdf3de751a319eece11c9a937b35cfab8744c4","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"ea084a2373ebc1f0902c09266e7bf25a05ab3814c1805bb017ffa7308f90c061","README.md":"88cc779ada8c6e1362c2d095c179284ec2755797729946ebccfe8264fcff0f8e","src/assert_cfg.rs":"ce9230bcc055d8df21ceefbed4233df5e73ecb832829ba23ac8d7f54ec457522","src/assert_eq_align.rs":"f09c4ec30e476446ab337a4a9ed950edf21c780a42ece7613f0ffc20225331ae","src/assert_eq_size.rs":"c06d2ff44e1f7af8a57b7c2fe5a9c69aa2a90d12cd41614c9d4f3ae551cdb64c","src/assert_fields.rs":"9c5baeac0215be557213eec9e80fc00de10a721d9b2c369fece743fcc6ccdc8e","src/assert_impl.rs":"fe5a2fffcbb78f60991bbc590481e74fd0d5f7ed8fa75718644599e1fae117ce","src/assert_obj_safe.rs":"88584809f3aa2dfce966b0adbeb6128191229465d653e57b68f968be001eff03","src/assert_trait.rs":"87b2d4dbd4334d9ace9880b81f3a1fbf91725c5e152b34a74c86457ca40ece30","src/assert_type.rs":"7cd942341efa7ed0b89b5e4fe1faa62bafb537ec6cf72ee6866115daee931885","src/const_assert.rs":"e0dcfe9016e34455f5efcb23500f716386d42b9fb09c6d08566d03dce8249e51","src/lib.rs":"4cbaaff38a6ac16631e774ab5a349056cbd2335ac570aeb46c5616eaf9700c3b"},"package":"a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,39 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "static_assertions"
+version = "1.1.0"
+authors = ["Nikolai Vazquez"]
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "CHANGELOG.md", "LICENSE*"]
+description = "Compile-time assertions to ensure that invariants are met."
+homepage = "https://github.com/nvzqz/static-assertions-rs"
+documentation = "https://docs.rs/static_assertions/"
+readme = "README.md"
+keywords = ["assert", "static", "testing"]
+categories = ["no-std", "rust-patterns", "development-tools::testing"]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/nvzqz/static-assertions-rs"
+
+[features]
+nightly = []
+[badges.is-it-maintained-issue-resolution]
+repository = "nvzqz/static-assertions-rs"
+
+[badges.is-it-maintained-open-issues]
+repository = "nvzqz/static-assertions-rs"
+
+[badges.maintenance]
+status = "passively-maintained"
+
+[badges.travis-ci]
+repository = "nvzqz/static-assertions-rs"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,181 @@
+# Changelog [![Crates.io][crate-badge]][crate]
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog] and this project adheres to
+[Semantic Versioning].
+
+## [Unreleased]
+
+## [1.1.0] - 2019-11-03
+### Added
+- `assert_impl_any!` macro
+- `assert_impl_one!` macro
+- `assert_trait_sub_all!` macro
+- `assert_trait_super_all!` macro
+- Frequently asked questions to `README.md`
+
+### Fixed
+- `assert_eq_size_val!`, `const_assert_eq!`, and `const_assert_ne!` to export
+  their local inner macros. Not having this prevented them from working when
+  `use`d or called directly via `static_assertions::macro!(...)`
+
+### Removed
+- Unused `_assert_obj_safe!` from pre-1.0
+
+## [1.0.0] - 2019-10-02
+### Added
+- `assert_eq_align!` macro
+
+### Removed
+- **[breaking]** Labels from macros that needed them 🎉
+  - Made possible by [`const _`] in Rust 1.37
+- **[breaking]** `assert_impl!` macro
+
+### Fixed
+- `assert_fields!` now works for `enum` types with multiple variants
+
+### Changed
+- **[breaking]** `const_assert!` macro to only take one expression
+  - Reasoning: when custom error messages are added in the future (via
+    [`assert!`]), having the macro allow for multiple comma-separated
+    expressions may lead to ambiguity
+- **[breaking]** Trait assertions to use `Type: Trait` syntax
+- **[breaking]** Field assertions to use `Type: field1, field2` syntax
+- **[breaking]** Renamed `assert_{ne,eq}_type!` to `assert_type_{ne,eq}_all!`
+
+## [0.3.4] - 2019-06-12
+### Changed
+- Aliased `assert_impl!` to `assert_impl_all!` and deprecated `assert_impl!`
+
+### Added
+- `assert_impl_all!` as replacement to `assert_impl!`
+- `assert_not_impl_all!` and `assert_not_impl_any!` macro counterparts to
+  `assert_impl_all!`
+
+### Fixed
+- `assert_eq_type!` now works with types involving lifetimes
+
+## [0.3.3] - 2019-06-12
+### Added
+- `const_assert_ne!` macro counterpart to `const_assert_eq!`
+
+### Fixed
+- `assert_eq_type!` would pass when types can coerce via `Deref`, such as with
+  `str` and `String`
+
+## [0.3.2] - 2019-05-15
+### Added
+- A `assert_eq_type!` macro that allows for checking whether inputs are the same
+  concrete type
+- A `assert_ne_type!` macro for checking whether inputs all refer to different
+  types
+
+### Fixed
+- `const_assert!` now only takes `bool` values whereas integer (or other type)
+  values could previously be passed
+
+## [0.3.1] - 2018-11-15
+### Fixed
+- Macros that refer to other internal macros can now be imported when compiling
+  for Rust 2018 ([issue
+  #10](https://github.com/nvzqz/static-assertions-rs/issues/10))
+
+## [0.3.0] - 2018-11-14
+### Changed
+- Bumped minimum supported (automatically tested) Rust version to 1.24.0
+- Moved message parameter for `assert_cfg!()` to last argument position, making
+  it consistent with other macros
+
+### Removed
+- No need to use `macro!(label; ...)` syntax when compiling on nightly Rust and
+  enabling the `nightly` feature flag
+
+## [0.2.5] - 2017-12-12
+### Changed
+- `assert_eq_size_ptr` wraps its code inside of a closure, ensuring that the
+  unsafe code inside never runs
+- Clippy no longer warns about `unneeded_field_pattern` within `assert_fields`
+
+### Added
+- Much better documentation with test examples that are guaranteed to fail at
+  compile-time
+
+### Removed
+- Removed testing features; compile failure tests are now done via doc tests
+
+## [0.2.4] - 2017-12-11
+### Removed
+- Removed the actual call to `mem::transmute` while still utilizing it for size
+  verification ([Simon Sapin], [#5])
+
+### Added
+- `assert_cfg` macro that asserts that the given configuration is set
+- `assert_fields` macro to assert that a struct type or enum variant has a given
+  field
+
+### Fixed
+- Allow more generics flexibility in `assert_impl`
+
+## [0.2.3] - 2017-08-24
+### Fixed
+- Trailing commas are now allowed
+
+### Removed
+- Removed clippy warnings
+
+## [0.2.2] - 2017-08-13
+### Added
+- Added `assert_impl` macro to ensure a type implements a given set of traits
+
+## [0.2.1] - 2017-08-13
+### Added
+- Added `assert_obj_safe` macro for ensuring that a trait is object-safe
+
+## [0.2.0] - 2017-08-12
+### Added
+- Added `assert_eq_size_ptr` macro
+
+### Fixed
+- Allow `assert_eq_size`, `const_assert`, and `const_assert_eq` in non-function
+  contexts via providing a unique label [#1]
+
+### Removed
+- **[Breaking]** Semicolon-separated `assert_eq_size` is no longer allowed
+
+## [0.1.1] - 2017-08-12
+### Added
+- Added `const_assert_eq` macro
+
+## 0.1.0 - 2017-08-12
+
+Initial release
+
+[Simon Sapin]: https://github.com/SimonSapin
+
+[`assert!`]: https://doc.rust-lang.org/stable/std/macro.assert.html
+[`const _`]: https://github.com/rust-lang/rfcs/blob/master/text/2526-const-wildcard.md
+
+[#1]: https://github.com/nvzqz/static-assertions-rs/issues/1
+[#5]: https://github.com/nvzqz/static-assertions-rs/pull/5
+
+[crate]:       https://crates.io/crates/static_assertions
+[crate-badge]: https://img.shields.io/crates/v/static_assertions.svg
+
+[Keep a Changelog]:    http://keepachangelog.com/en/1.0.0/
+[Semantic Versioning]: http://semver.org/spec/v2.0.0.html
+
+[Unreleased]: https://github.com/nvzqz/static-assertions-rs/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/nvzqz/static-assertions-rs/compare/v1.0.0...v1.1.0
+[1.0.0]: https://github.com/nvzqz/static-assertions-rs/compare/v0.3.4...v1.0.0
+[0.3.4]: https://github.com/nvzqz/static-assertions-rs/compare/v0.3.3...v0.3.4
+[0.3.3]: https://github.com/nvzqz/static-assertions-rs/compare/v0.3.2...v0.3.3
+[0.3.2]: https://github.com/nvzqz/static-assertions-rs/compare/v0.3.1...v0.3.2
+[0.3.1]: https://github.com/nvzqz/static-assertions-rs/compare/v0.3.0...v0.3.1
+[0.3.0]: https://github.com/nvzqz/static-assertions-rs/compare/v0.2.5...v0.3.0
+[0.2.5]: https://github.com/nvzqz/static-assertions-rs/compare/v0.2.4...v0.2.5
+[0.2.4]: https://github.com/nvzqz/static-assertions-rs/compare/v0.2.3...v0.2.4
+[0.2.3]: https://github.com/nvzqz/static-assertions-rs/compare/v0.2.2...v0.2.3
+[0.2.2]: https://github.com/nvzqz/static-assertions-rs/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/nvzqz/static-assertions-rs/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/nvzqz/static-assertions-rs/compare/v0.1.1...v0.2.0
+[0.1.1]: https://github.com/nvzqz/static-assertions-rs/compare/v0.1.0...v0.1.1
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Nikolai Vazquez
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,188 @@
+[![Banner](https://raw.githubusercontent.com/nvzqz/static-assertions-rs/assets/Banner.png)](https://github.com/nvzqz/static-assertions-rs)
+
+<div align="center">
+    <a href="https://crates.io/crates/static_assertions">
+        <img src="https://img.shields.io/crates/v/static_assertions.svg" alt="Crates.io">
+        <img src="https://img.shields.io/crates/d/static_assertions.svg" alt="Downloads">
+    </a>
+    <a href="https://travis-ci.org/nvzqz/static-assertions-rs">
+        <img src="https://travis-ci.org/nvzqz/static-assertions-rs.svg?branch=master" alt="Build Status">
+    </a>
+    <img src="https://img.shields.io/badge/rustc-^1.37.0-blue.svg" alt="rustc ^1.37.0">
+    <br>
+    <a href="https://www.patreon.com/nvzqz">
+        <img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Become a Patron!" height="35">
+    </a>
+    <a href="https://www.paypal.me/nvzqz">
+        <img src="https://buymecoffee.intm.org/img/button-paypal-white.png" alt="Buy me a coffee" height="35">
+    </a>
+</div>
+
+Compile-time assertions for Rust, brought to you by
+[Nikolai Vazquez](https://twitter.com/NikolaiVazquez).
+
+This library lets you ensure correct assumptions about constants, types, and
+more. See the [docs] and [FAQ](#faq) for more info!
+
+## Installation
+
+This crate is available
+[on crates.io](https://crates.io/crates/static_assertions) and can be used by
+adding the following to your project's
+[`Cargo.toml`](https://doc.rust-lang.org/cargo/reference/manifest.html):
+
+```toml
+[dependencies]
+static_assertions = "1.1.0"
+```
+
+and this to your crate root (`main.rs` or `lib.rs`):
+
+```rust
+#[macro_use]
+extern crate static_assertions;
+```
+
+## Usage
+
+This crate exposes the following macros:
+- [`assert_cfg!`]
+- [`assert_eq_align!`]
+- [`assert_eq_size!`]
+- [`assert_eq_size_ptr!`]
+- [`assert_eq_size_val!`]
+- [`assert_fields!`]
+- [`assert_impl_all!`]
+- [`assert_impl_any!`]
+- [`assert_impl_one!`]
+- [`assert_not_impl_all!`]
+- [`assert_not_impl_any!`]
+- [`assert_obj_safe!`]
+- [`assert_trait_sub_all!`]
+- [`assert_trait_super_all!`]
+- [`assert_type_eq_all!`]
+- [`assert_type_ne_all!`]
+- [`const_assert!`]
+- [`const_assert_eq!`]
+- [`const_assert_ne!`]
+
+## FAQ
+
+- **Q:** When would I want to use this?
+
+  **A:** This library is useful for when wanting to ensure properties of
+  constants, types, and traits.
+
+  Basic examples:
+
+  - With the release of 1.39, `str::len` can be called in a `const`
+    context. Using [`const_assert!`], one can check that a string generated from
+    elsewhere is of a given size:
+
+    ```rust
+    const DATA: &str = include_str!("path/to/string.txt");
+
+    const_assert!(DATA.len() < 512);
+    ```
+
+  - Have a type that absolutely must implement certain traits? With
+    [`assert_impl_all!`], one can ensure this:
+
+    ```rust
+    struct Foo {
+        value: // ...
+    }
+
+    assert_impl_all!(Foo: Send, Sync);
+    ```
+
+- **Q:** How can I contribute?
+
+  **A:** A couple of ways! You can:
+
+  - Attempt coming up with some form of static analysis that you'd like to see
+    implemented. Create a [new issue] and describe how you'd imagine your
+    assertion to work, with example code to demonstrate.
+
+  - Implement your own static assertion and create a [pull request].
+
+  - Give feedback. What are some pain points? Where is it unpleasant?
+
+  - Write docs. If you're familiar with how this library works, sharing your
+    knowledge with the rest its users would be great!
+
+- **Q:** Will this affect my compiled binary?
+
+  **A:** Nope! There is zero runtime cost to using this because all checks are
+  at compile-time, and so no code is emitted to run.
+
+- **Q:** Will this affect my compile times?
+
+  **A:** Likely not by anything perceivable. If this is a concern, this library
+  can be put in `dev-dependencies`:
+
+  ```toml
+  [dev-dependencies]
+  static_assertions = "1.1.0"
+  ```
+
+  and then assertions can be conditionally run behind `#[cfg(test)]`:
+
+  ```rust
+  #[cfg(test)]
+  const_assert_eq!(MEANING_OF_LIFE, 42);
+  ```
+
+  However, the assertions will only be checked when running `cargo test`. This
+  somewhat defeats the purpose of catching false static conditions up-front with
+  a compilation failure.
+
+- **Q:** What is `const _`?
+
+  **A:** It's a way of creating an unnamed constant. This is used so that macros
+  can be called from a global scope without requiring a scope-unique label. This
+  library makes use of the side effects of evaluating the `const` expression.
+  See the feature's
+  [tracking issue](https://github.com/rust-lang/rust/issues/54912)
+  and
+  [issue #1](https://github.com/nvzqz/static-assertions-rs/issues/1)
+  for more info.
+
+## Changes
+
+See [`CHANGELOG.md`](https://github.com/nvzqz/static-assertions-rs/blob/master/CHANGELOG.md)
+for a complete list of what has changed from one version to another.
+
+## License
+
+This project is released under either:
+
+- [MIT License](https://github.com/nvzqz/static-assertions-rs/blob/master/LICENSE-MIT)
+
+- [Apache License (Version 2.0)](https://github.com/nvzqz/static-assertions-rs/blob/master/LICENSE-APACHE)
+
+at your choosing.
+
+[new issue]:    https://github.com/nvzqz/static-assertions-rs/issues/new
+[pull request]: https://github.com/nvzqz/static-assertions-rs/pulls
+[docs]:         https://docs.rs/static_assertions
+
+[`assert_cfg!`]:             https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_cfg.html
+[`assert_eq_align!`]:        https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_eq_align.html
+[`assert_eq_size!`]:         https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_eq_size.html
+[`assert_eq_size_ptr!`]:     https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_eq_size_ptr.html
+[`assert_eq_size_val!`]:     https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_eq_size_val.html
+[`assert_fields!`]:          https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_fields.html
+[`assert_impl_all!`]:        https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_impl_all.html
+[`assert_impl_any!`]:        https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_impl_any.html
+[`assert_impl_one!`]:        https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_impl_one.html
+[`assert_not_impl_all!`]:    https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_not_impl_all.html
+[`assert_not_impl_any!`]:    https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_not_impl_any.html
+[`assert_obj_safe!`]:        https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_obj_safe.html
+[`assert_trait_sub_all!`]:   https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_trait_sub_all.html
+[`assert_trait_super_all!`]: https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_trait_super_all.html
+[`assert_type_eq_all!`]:     https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_type_eq_all.html
+[`assert_type_ne_all!`]:     https://docs.rs/static_assertions/1.1.0/static_assertions/macro.assert_type_ne_all.html
+[`const_assert!`]:           https://docs.rs/static_assertions/1.1.0/static_assertions/macro.const_assert.html
+[`const_assert_eq!`]:        https://docs.rs/static_assertions/1.1.0/static_assertions/macro.const_assert_eq.html
+[`const_assert_ne!`]:        https://docs.rs/static_assertions/1.1.0/static_assertions/macro.const_assert_ne.html
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_cfg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_cfg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_cfg.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_cfg.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,49 @@
+/// Asserts that a given configuration is set.
+///
+/// # Examples
+///
+/// A project will simply fail to compile if the given configuration is not set.
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// // We're not masochists
+/// # #[cfg(not(target_pointer_width = "16"))] // Just in case
+/// assert_cfg!(not(target_pointer_width = "16"));
+/// ```
+///
+/// If a project does not support a set of configurations, you may want to
+/// report why. There is the option of providing a compile error message string:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// # #[cfg(any(unix, windows))]
+/// assert_cfg!(any(unix, windows), "There is only support for Unix or Windows");
+///
+/// // User needs to specify a database back-end
+/// # #[cfg(target_pointer_width = "0")] // Impossible
+/// assert_cfg!(all(not(all(feature = "mysql", feature = "mongodb")),
+///                 any(    feature = "mysql", feature = "mongodb")),
+///             "Must exclusively use MySQL or MongoDB as database back-end");
+/// ```
+///
+/// Some configurations are impossible. For example, we can't be compiling for
+/// both macOS _and_ Windows simultaneously:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_cfg!(all(target_os = "macos",
+///                 target_os = "windows"),
+///             "No, that's not how it works! ಠ_ಠ");
+/// ```
+#[macro_export]
+macro_rules! assert_cfg {
+    () => {};
+    ($($cfg:meta)+, $msg:expr $(,)?) => {
+        #[cfg(not($($cfg)+))]
+        compile_error!($msg);
+    };
+    ($($cfg:tt)*) => {
+        #[cfg(not($($cfg)*))]
+        compile_error!(concat!("Cfg does not pass: ", stringify!($($cfg)*)));
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_eq_align.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_eq_align.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_eq_align.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_eq_align.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+/// Asserts that types are equal in alignment.
+///
+/// This is useful when ensuring that pointer arithmetic is done correctly, or
+/// when [FFI] requires a type to have the same alignment as some foreign type.
+///
+/// # Examples
+///
+/// A `usize` has the same alignment as any pointer type:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_eq_align!(usize, *const u8, *mut u8);
+/// ```
+///
+/// The following passes because `[i32; 4]` has the same alignment as `i32`:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_eq_align!([i32; 4], i32);
+/// ```
+///
+/// The following example fails to compile because `i32x4` explicitly has 4
+/// times the alignment as `[i32; 4]`:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// # #[allow(non_camel_case_types)]
+/// #[repr(align(16))]
+/// struct i32x4([i32; 4]);
+///
+/// assert_eq_align!(i32x4, [i32; 4]);
+/// ```
+///
+/// [FFI]: https://en.wikipedia.org/wiki/Foreign_function_interface
+#[macro_export]
+macro_rules! assert_eq_align {
+    ($x:ty, $($xs:ty),+ $(,)?) => {
+        const _: fn() = || {
+            // Assigned instance must match the annotated type or else it will
+            // fail to compile
+            use $crate::_core::mem::align_of;
+            $(let _: [(); align_of::<$x>()] = [(); align_of::<$xs>()];)+
+        };
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_eq_size.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_eq_size.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_eq_size.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_eq_size.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,123 @@
+/// Asserts that types are equal in size.
+///
+/// When performing operations such as pointer casts or dealing with [`usize`]
+/// versus [`u64`] versus [`u32`], the size of your types matter. That is where
+/// this macro comes into play.
+///
+/// # Alternatives
+///
+/// There also exists [`assert_eq_size_val`](macro.assert_eq_size_val.html) and
+/// [`assert_eq_size_ptr`](macro.assert_eq_size_ptr.html). Instead of specifying
+/// types to compare, values' sizes can be directly compared against each other.
+///
+/// # Examples
+///
+/// These three types, despite being very different, all have the same size:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_eq_size!([u8; 4], (u16, u16), u32);
+/// ```
+///
+/// The following example fails to compile because `u32` has 4 times the size of
+/// `u8`:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_eq_size!(u32, u8);
+/// ```
+///
+/// [`usize`]: https://doc.rust-lang.org/std/primitive.usize.html
+/// [`u64`]: https://doc.rust-lang.org/std/primitive.u64.html
+/// [`u32`]: https://doc.rust-lang.org/std/primitive.u32.html
+#[macro_export]
+macro_rules! assert_eq_size {
+    ($x:ty, $($xs:ty),+ $(,)?) => {
+        const _: fn() = || {
+            $(let _ = $crate::_core::mem::transmute::<$x, $xs>;)+
+        };
+    };
+}
+
+/// Asserts that values pointed to are equal in size.
+///
+/// # Examples
+///
+/// This especially is useful for when coercing pointers between different types
+/// and ensuring the underlying values are the same size.
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// fn operation(x: &(u32, u32), y: &[u16; 4]) {
+///     assert_eq_size_ptr!(x, y);
+///     // ...
+/// }
+/// ```
+///
+/// The following example fails to compile because byte arrays of different
+/// lengths have different sizes:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions;
+/// # fn main() {
+/// static BYTES: &[u8; 4] = &[
+///     /* ... */
+///     # 0; 4
+/// ];
+///
+/// static TABLE: &[u8; 16] = &[
+///     /* ... */
+///     # 0; 16
+/// ];
+///
+/// assert_eq_size_ptr!(BYTES, TABLE);
+/// ```
+#[macro_export]
+macro_rules! assert_eq_size_ptr {
+    ($x:expr, $($xs:expr),+ $(,)?) => {
+        #[allow(unknown_lints, unsafe_code, forget_copy, useless_transmute)]
+        let _ = || unsafe {
+            use $crate::_core::{mem, ptr};
+            let mut copy = ptr::read($x);
+            $(ptr::write(&mut copy, mem::transmute(ptr::read($xs)));)+
+            mem::forget(copy);
+        };
+    }
+}
+
+/// Asserts that values are equal in size.
+///
+/// This macro doesn't consume its arguments and thus works for
+/// non-[`Clone`]able values.
+///
+/// # Examples
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions;
+/// # fn main() {
+/// struct Byte(u8);
+///
+/// let x = 10u8;
+/// let y = Byte(42); // Works for non-cloneable types
+///
+/// assert_eq_size_val!(x, y);
+/// assert_eq_size_val!(x, y, 0u8);
+/// # }
+/// ```
+///
+/// Even though both values are 0, they are of types with different sizes:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions;
+/// # fn main() {
+/// assert_eq_size_val!(0u8, 0u32);
+/// # }
+/// ```
+///
+/// [`Clone`]: https://doc.rust-lang.org/std/clone/trait.Clone.html
+#[macro_export(local_inner_macros)]
+macro_rules! assert_eq_size_val {
+    ($x:expr, $($xs:expr),+ $(,)?) => {
+        assert_eq_size_ptr!(&$x, $(&$xs),+);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_fields.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_fields.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_fields.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_fields.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,72 @@
+/// Asserts that the type has the given fields.
+///
+/// # Examples
+///
+/// One common use case is when types have fields defined multiple times as a
+/// result of `#[cfg]`. This can be an issue when exposing a public API.
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions;
+/// pub struct Ty {
+///     #[cfg(windows)]
+///     pub val1: u8,
+///     #[cfg(not(windows))]
+///     pub val1: usize,
+///
+///     #[cfg(unix)]
+///     pub val2: u32,
+///     #[cfg(not(unix))]
+///     pub val2: usize,
+/// }
+///
+/// // Always have `val2` regardless of OS
+/// assert_fields!(Ty: val2);
+/// ```
+///
+/// This macro even works with `enum` variants:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// enum Data {
+///     Val {
+///         id: i32,
+///         name: String,
+///         bytes: [u8; 128],
+///     },
+///     Ptr(*const u8),
+/// }
+///
+/// assert_fields!(Data::Val: id, bytes);
+/// ```
+///
+/// The following example fails to compile because [`Range`] does not have a field named `middle`:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// use std::ops::Range;
+///
+/// assert_fields!(Range<u32>: middle);
+/// ```
+///
+/// [`Range`]: https://doc.rust-lang.org/std/ops/struct.Range.html
+#[macro_export]
+macro_rules! assert_fields {
+    ($t:ident::$v:ident: $($f:ident),+) => {
+        #[allow(unknown_lints, unneeded_field_pattern)]
+        const _: fn() = || {
+            #[allow(dead_code, unreachable_patterns)]
+            fn assert(value: $t) {
+                match value {
+                    $($t::$v { $f: _, .. } => {},)+
+                    _ => {}
+                }
+            }
+        };
+    };
+    ($t:path: $($f:ident),+) => {
+        #[allow(unknown_lints, unneeded_field_pattern)]
+        const _: fn() = || {
+            $(let $t { $f: _, .. };)+
+        };
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_impl.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_impl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,356 @@
+/// Asserts that the type implements exactly one in a set of traits.
+///
+/// Related:
+/// - [`assert_impl_any!`]
+/// - [`assert_impl_all!`]
+/// - [`assert_not_impl_all!`]
+/// - [`assert_not_impl_any!`]
+///
+/// # Examples
+///
+/// Given some type `Foo`, it is expected to implement either `Snap`, `Crackle`,
+/// or `Pop`:
+///
+/// ```compile_fail
+/// # use static_assertions::assert_impl_one; fn main() {}
+/// struct Foo;
+///
+/// trait Snap {}
+/// trait Crackle {}
+/// trait Pop {}
+///
+/// assert_impl_one!(Foo: Snap, Crackle, Pop);
+/// ```
+///
+/// If _only_ `Crackle` is implemented, the assertion passes:
+///
+/// ```
+/// # use static_assertions::assert_impl_one; fn main() {}
+/// # struct Foo;
+/// # trait Snap {}
+/// # trait Crackle {}
+/// # trait Pop {}
+/// impl Crackle for Foo {}
+///
+/// assert_impl_one!(Foo: Snap, Crackle, Pop);
+/// ```
+///
+/// If `Snap` or `Pop` is _also_ implemented, the assertion fails:
+///
+/// ```compile_fail
+/// # use static_assertions::assert_impl_one; fn main() {}
+/// # struct Foo;
+/// # trait Snap {}
+/// # trait Crackle {}
+/// # trait Pop {}
+/// # impl Crackle for Foo {}
+/// impl Pop for Foo {}
+///
+/// assert_impl_one!(Foo: Snap, Crackle, Pop);
+/// ```
+///
+/// [`assert_impl_any!`]:     macro.assert_impl_any.html
+/// [`assert_impl_all!`]:     macro.assert_impl_all.html
+/// [`assert_not_impl_all!`]: macro.assert_not_impl_all.html
+/// [`assert_not_impl_any!`]: macro.assert_not_impl_any.html
+#[macro_export]
+macro_rules! assert_impl_one {
+    ($x:ty: $($t:path),+ $(,)?) => {
+        const _: fn() = || {
+            // Generic trait that must be implemented for `$x` exactly once.
+            trait AmbiguousIfMoreThanOne<A> {
+                // Required for actually being able to reference the trait.
+                fn some_item() {}
+            }
+
+            // Creates multiple scoped `Token` types for each trait `$t`, over
+            // which a specialized `AmbiguousIfMoreThanOne<Token>` is
+            // implemented for every type that implements `$t`.
+            $({
+                #[allow(dead_code)]
+                struct Token;
+
+                impl<T: ?Sized + $t> AmbiguousIfMoreThanOne<Token> for T {}
+            })+
+
+            // If there is only one specialized trait impl, type inference with
+            // `_` can be resolved and this can compile. Fails to compile if
+            // `$x` implements more than one `AmbiguousIfMoreThanOne<Token>` or
+            // does not implement any at all.
+            let _ = <$x as AmbiguousIfMoreThanOne<_>>::some_item;
+        };
+    };
+}
+
+/// Asserts that the type implements _all_ of the given traits.
+///
+/// See [`assert_not_impl_all!`] for achieving the opposite effect.
+///
+/// # Examples
+///
+/// This can be used to ensure types implement auto traits such as [`Send`] and
+/// [`Sync`], as well as traits with [blanket `impl`s][blanket].
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_impl_all!(u32: Copy, Send);
+/// assert_impl_all!(&str: Into<String>);
+/// ```
+///
+/// The following example fails to compile because raw pointers do not implement
+/// [`Send`] since they cannot be moved between threads safely:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_impl_all!(*const u8: Send);
+/// ```
+///
+/// [`assert_not_impl_all!`]: macro.assert_not_impl_all.html
+/// [`Send`]: https://doc.rust-lang.org/std/marker/trait.Send.html
+/// [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
+/// [blanket]: https://doc.rust-lang.org/book/ch10-02-traits.html#using-trait-bounds-to-conditionally-implement-methods
+#[macro_export]
+macro_rules! assert_impl_all {
+    ($type:ty: $($trait:path),+ $(,)?) => {
+        const _: fn() = || {
+            // Only callable when `$type` implements all traits in `$($trait)+`.
+            fn assert_impl_all<T: ?Sized $(+ $trait)+>() {}
+            assert_impl_all::<$type>();
+        };
+    };
+}
+
+/// Asserts that the type implements _any_ of the given traits.
+///
+/// See [`assert_not_impl_any!`] for achieving the opposite effect.
+///
+/// # Examples
+///
+/// `u8` cannot be converted from `u16`, but it can be converted into `u16`:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_impl_any!(u8: From<u16>, Into<u16>);
+/// ```
+///
+/// The unit type cannot be converted from `u8` or `u16`, but it does implement
+/// [`Send`]:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_impl_any!((): From<u8>, From<u16>, Send);
+/// ```
+///
+/// The following example fails to compile because raw pointers do not implement
+/// [`Send`] or [`Sync`] since they cannot be moved or shared between threads
+/// safely:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_impl_any!(*const u8: Send, Sync);
+/// ```
+///
+/// [`assert_not_impl_any!`]: macro.assert_not_impl_any.html
+/// [`Send`]: https://doc.rust-lang.org/std/marker/trait.Send.html
+/// [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
+#[macro_export]
+macro_rules! assert_impl_any {
+    ($x:ty: $($t:path),+ $(,)?) => {
+        const _: fn() = || {
+            use $crate::_core::marker::PhantomData;
+            use $crate::_core::ops::Deref;
+
+            // Fallback to use as the first iterative assignment to `previous`.
+            let previous = AssertImplAnyFallback;
+            struct AssertImplAnyFallback;
+
+            // Ensures that blanket traits can't impersonate the method. This
+            // prevents a false positive attack where---if a blanket trait is in
+            // scope that has `_static_assertions_impl_any`---the macro will
+            // compile when it shouldn't.
+            //
+            // See https://github.com/nvzqz/static-assertions-rs/issues/19 for
+            // more info.
+            struct ActualAssertImplAnyToken;
+            trait AssertImplAnyToken {}
+            impl AssertImplAnyToken for ActualAssertImplAnyToken {}
+            fn assert_impl_any_token<T: AssertImplAnyToken>(_: T) {}
+
+            $(let previous = {
+                struct Wrapper<T, N>(PhantomData<T>, N);
+
+                // If the method for this wrapper can't be called then the
+                // compiler will insert a deref and try again. This forwards the
+                // compiler's next attempt to the previous wrapper.
+                impl<T, N> Deref for Wrapper<T, N> {
+                    type Target = N;
+
+                    fn deref(&self) -> &Self::Target {
+                        &self.1
+                    }
+                }
+
+                // This impl is bounded on the `$t` trait, so the method can
+                // only be called if `$x` implements `$t`. This is why a new
+                // `Wrapper` is defined for each `previous`.
+                impl<T: $t, N> Wrapper<T, N> {
+                    fn _static_assertions_impl_any(&self) -> ActualAssertImplAnyToken {
+                        ActualAssertImplAnyToken
+                    }
+                }
+
+                Wrapper::<$x, _>(PhantomData, previous)
+            };)+
+
+            // Attempt to find the method that can actually be called. The found
+            // method must return a type that implements the sealed `Token`
+            // trait, this ensures that blanket trait methods can't cause this
+            // macro to compile.
+            assert_impl_any_token(previous._static_assertions_impl_any());
+        };
+    };
+}
+
+/// Asserts that the type does **not** implement _all_ of the given traits.
+///
+/// This can be used to ensure types do not implement auto traits such as
+/// [`Send`] and [`Sync`], as well as traits with [blanket `impl`s][blanket].
+///
+/// Note that the combination of all provided traits is required to not be
+/// implemented. If you want to check that none of multiple traits are
+/// implemented you should invoke [`assert_not_impl_any!`] instead.
+///
+/// # Examples
+///
+/// Although `u32` implements `From<u16>`, it does not implement `Into<usize>`:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_not_impl_all!(u32: From<u16>, Into<usize>);
+/// ```
+///
+/// The following example fails to compile since `u32` can be converted into
+/// `u64`.
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_not_impl_all!(u32: Into<u64>);
+/// ```
+///
+/// The following compiles because [`Cell`] is not both [`Sync`] _and_ [`Send`]:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// use std::cell::Cell;
+///
+/// assert_not_impl_all!(Cell<u32>: Sync, Send);
+/// ```
+///
+/// But it is [`Send`], so this fails to compile:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// # std::cell::Cell;
+/// assert_not_impl_all!(Cell<u32>: Send);
+/// ```
+///
+/// [`Send`]: https://doc.rust-lang.org/std/marker/trait.Send.html
+/// [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
+/// [`assert_not_impl_any!`]: macro.assert_not_impl_any.html
+/// [`Cell`]: https://doc.rust-lang.org/std/cell/struct.Cell.html
+/// [blanket]: https://doc.rust-lang.org/book/ch10-02-traits.html#using-trait-bounds-to-conditionally-implement-methods
+#[macro_export]
+macro_rules! assert_not_impl_all {
+    ($x:ty: $($t:path),+ $(,)?) => {
+        const _: fn() = || {
+            // Generic trait with a blanket impl over `()` for all types.
+            trait AmbiguousIfImpl<A> {
+                // Required for actually being able to reference the trait.
+                fn some_item() {}
+            }
+
+            impl<T: ?Sized> AmbiguousIfImpl<()> for T {}
+
+            // Used for the specialized impl when *all* traits in
+            // `$($t)+` are implemented.
+            #[allow(dead_code)]
+            struct Invalid;
+
+            impl<T: ?Sized $(+ $t)+> AmbiguousIfImpl<Invalid> for T {}
+
+            // If there is only one specialized trait impl, type inference with
+            // `_` can be resolved and this can compile. Fails to compile if
+            // `$x` implements `AmbiguousIfImpl<Invalid>`.
+            let _ = <$x as AmbiguousIfImpl<_>>::some_item;
+        };
+    };
+}
+
+/// Asserts that the type does **not** implement _any_ of the given traits.
+///
+/// This can be used to ensure types do not implement auto traits such as
+/// [`Send`] and [`Sync`], as well as traits with [blanket `impl`s][blanket].
+///
+/// This macro causes a compilation failure if any of the provided individual
+/// traits are implemented for the type. If you want to check that a combination
+/// of traits is not implemented you should invoke [`assert_not_impl_all!`]
+/// instead. For single traits both macros behave the same.
+///
+/// # Examples
+///
+/// If `u32` were to implement `Into` conversions for `usize` _and_ for `u8`,
+/// the following would fail to compile:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_not_impl_any!(u32: Into<usize>, Into<u8>);
+/// ```
+///
+/// This is also good for simple one-off cases:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_not_impl_any!(&'static mut u8: Copy);
+/// ```
+///
+/// The following example fails to compile since `u32` can be converted into
+/// `u64` even though it can not be converted into a `u16`:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_not_impl_any!(u32: Into<u64>, Into<u16>);
+/// ```
+///
+/// [`Send`]: https://doc.rust-lang.org/std/marker/trait.Send.html
+/// [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
+/// [`assert_not_impl_all!`]: macro.assert_not_impl_all.html
+/// [blanket]: https://doc.rust-lang.org/book/ch10-02-traits.html#using-trait-bounds-to-conditionally-implement-methods
+#[macro_export]
+macro_rules! assert_not_impl_any {
+    ($x:ty: $($t:path),+ $(,)?) => {
+        const _: fn() = || {
+            // Generic trait with a blanket impl over `()` for all types.
+            trait AmbiguousIfImpl<A> {
+                // Required for actually being able to reference the trait.
+                fn some_item() {}
+            }
+
+            impl<T: ?Sized> AmbiguousIfImpl<()> for T {}
+
+            // Creates multiple scoped `Invalid` types for each trait `$t`, over
+            // which a specialized `AmbiguousIfImpl<Invalid>` is implemented for
+            // every type that implements `$t`.
+            $({
+                #[allow(dead_code)]
+                struct Invalid;
+
+                impl<T: ?Sized + $t> AmbiguousIfImpl<Invalid> for T {}
+            })+
+
+            // If there is only one specialized trait impl, type inference with
+            // `_` can be resolved and this can compile. Fails to compile if
+            // `$x` implements any `AmbiguousIfImpl<Invalid>`.
+            let _ = <$x as AmbiguousIfImpl<_>>::some_item;
+        };
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_obj_safe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_obj_safe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_obj_safe.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_obj_safe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,76 @@
+// FIXME: Link below is required to render in index
+/// Asserts that the traits support dynamic dispatch
+/// ([object-safety](https://doc.rust-lang.org/book/ch17-02-trait-objects.html#object-safety-is-required-for-trait-objects)).
+///
+/// This is useful for when changes are made to a trait that accidentally
+/// prevent it from being used as an [object]. Such a case would be adding a
+/// generic method and forgetting to add `where Self: Sized` after it. If left
+/// unnoticed, that mistake will affect crate users and break both forward and
+/// backward compatibility.
+///
+/// # Examples
+///
+/// When exposing a public API, it's important that traits that could previously
+/// use dynamic dispatch can still do so in future compatible crate versions.
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// trait MySafeTrait {
+///     fn foo(&self) -> u32;
+/// }
+///
+/// assert_obj_safe!(std::fmt::Write, MySafeTrait);
+/// ```
+///
+/// Works with traits that are not in the calling module:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// mod inner {
+///     pub trait BasicTrait {
+///         fn bar(&self);
+///     }
+///     assert_obj_safe!(BasicTrait);
+/// }
+///
+/// assert_obj_safe!(inner::BasicTrait);
+/// ```
+///
+/// The following example fails to compile because raw pointers cannot be sent
+///  between threads safely:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_impl!(*const u8, Send);
+/// ```
+///
+/// The following example fails to compile because generics without
+/// `where Self: Sized` are not allowed in [object-safe][object] trait methods:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// trait MyUnsafeTrait {
+///     fn baz<T>(&self) -> T;
+/// }
+///
+/// assert_obj_safe!(MyUnsafeTrait);
+/// ```
+///
+/// When we fix that, the previous code will compile:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// trait MyUnsafeTrait {
+///     fn baz<T>(&self) -> T where Self: Sized;
+/// }
+///
+/// assert_obj_safe!(MyUnsafeTrait);
+/// ```
+///
+/// [object]: https://doc.rust-lang.org/book/ch17-02-trait-objects.html#object-safety-is-required-for-trait-objects
+#[macro_export]
+macro_rules! assert_obj_safe {
+    ($($xs:path),+ $(,)?) => {
+        $(const _: Option<&$xs> = None;)+
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_trait.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_trait.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_trait.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_trait.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,105 @@
+/// Asserts that the trait is a child of all of the other traits.
+///
+/// Related:
+/// - [`assert_trait_super_all!`]
+///
+/// # Examples
+///
+/// All types that implement [`Copy`] must implement [`Clone`]:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_trait_sub_all!(Copy: Clone);
+/// ```
+///
+/// All types that implement [`Ord`] must implement [`PartialEq`], [`Eq`], and
+/// [`PartialOrd`]:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_trait_sub_all!(Ord: PartialEq, Eq, PartialOrd);
+/// ```
+///
+/// The following example fails to compile because [`Eq`] is not required for
+/// [`PartialOrd`]:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_trait_sub_all!(PartialOrd: Eq);
+/// ```
+///
+/// [`assert_trait_super_all!`]: macro.assert_trait_super_all.html
+///
+/// [`Copy`]:       https://doc.rust-lang.org/std/marker/trait.Copy.html
+/// [`Clone`]:      https://doc.rust-lang.org/std/clone/trait.Clone.html
+/// [`Ord`]:        https://doc.rust-lang.org/std/cmp/trait.Ord.html
+/// [`PartialOrd`]: https://doc.rust-lang.org/std/cmp/trait.PartialOrd.html
+/// [`Eq`]:         https://doc.rust-lang.org/std/cmp/trait.Eq.html
+/// [`PartialEq`]:  https://doc.rust-lang.org/std/cmp/trait.PartialEq.html
+#[macro_export]
+macro_rules! assert_trait_sub_all {
+    ($sub:path: $($super:path),+ $(,)?) => {
+        const _: () = {
+            // One scope per super-trait.
+            $({
+                #[allow(non_camel_case_types)]
+                trait __Impl_Implication: $super {}
+
+                // Can only be implemented for `$sub` types if `$super` is
+                // also implemented.
+                impl<T: $sub> __Impl_Implication for T {}
+            })+
+        };
+    };
+}
+
+/// Asserts that the trait is a parent of all of the other traits.
+///
+/// Related:
+/// - [`assert_trait_sub_all!`]
+///
+/// # Examples
+///
+/// With this, traits `A` and `B` can both be tested to require [`Copy`] on a
+/// single line:
+///
+/// ```
+/// # use static_assertions::assert_trait_super_all;
+/// trait A: Copy {}
+/// trait B: Copy {}
+///
+/// assert_trait_super_all!(Copy: A, B);
+/// ```
+///
+/// Otherwise, each sub-trait would require its own call to
+/// [`assert_trait_sub_all!`]:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// # trait A: Copy {}
+/// # trait B: Copy {}
+/// assert_trait_sub_all!(A: Copy);
+/// assert_trait_sub_all!(B: Copy);
+/// ```
+///
+/// The following example fails to compile because trait `C` does not require
+/// [`Copy`]:
+///
+/// ```compile_fail
+/// # use static_assertions::assert_trait_super_all;
+/// # trait A: Copy {}
+/// # trait B: Copy {}
+/// trait C {}
+///
+/// assert_trait_super_all!(Copy: A, B, C);
+/// ```
+///
+/// [`assert_trait_sub_all!`]: macro.assert_trait_sub_all.html
+///
+/// [`Copy`]: https://doc.rust-lang.org/std/marker/trait.Copy.html
+#[macro_export(local_inner_macros)]
+macro_rules! assert_trait_super_all {
+    ($super:path: $($sub:path),+ $(,)?) => {
+        $(assert_trait_sub_all!($sub: $super);)+
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_type.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_type.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/assert_type.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/assert_type.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,101 @@
+/// Asserts that _all_ types in a list are equal to each other.
+///
+/// # Examples
+///
+/// Often times, type aliases are used to express usage semantics via naming. In
+/// some cases, the underlying type may differ based on platform. However, other
+/// types like [`c_float`] will always alias the same type.
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// use std::os::raw::c_float;
+///
+/// assert_type_eq_all!(c_float, f32);
+/// ```
+///
+/// This macro can also be used to compare types that involve lifetimes! Just
+/// use `'static` in that case:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions;
+/// # fn main() {
+/// type Buf<'a> = &'a [u8];
+///
+/// assert_type_eq_all!(Buf<'static>, &'static [u8]);
+/// # }
+/// ```
+///
+/// The following example fails to compile because `String` and `str` do not
+/// refer to the same type:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_type_eq_all!(String, str);
+/// ```
+///
+/// This should also work the other way around, regardless of [`Deref`]
+/// implementations.
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_type_eq_all!(str, String);
+/// ```
+///
+/// [`c_float`]: https://doc.rust-lang.org/std/os/raw/type.c_float.html
+/// [`Deref`]: https://doc.rust-lang.org/std/ops/trait.Deref.html
+#[macro_export]
+macro_rules! assert_type_eq_all {
+    ($x:ty, $($xs:ty),+ $(,)*) => {
+        const _: fn() = || { $({
+            trait TypeEq {
+                type This: ?Sized;
+            }
+
+            impl<T: ?Sized> TypeEq for T {
+                type This = Self;
+            }
+
+            fn assert_type_eq_all<T, U>()
+            where
+                T: ?Sized + TypeEq<This = U>,
+                U: ?Sized,
+            {}
+
+            assert_type_eq_all::<$x, $xs>();
+        })+ };
+    };
+}
+
+/// Asserts that _all_ types are **not** equal to each other.
+///
+/// # Examples
+///
+/// Rust has all sorts of slices, but they represent different types of data:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// assert_type_ne_all!([u8], [u16], str);
+/// ```
+///
+/// The following example fails to compile because [`c_uchar`] is a type alias
+/// for [`u8`]:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// use std::os::raw::c_uchar;
+///
+/// assert_type_ne_all!(c_uchar, u8, u32);
+/// ```
+///
+/// [`c_uchar`]: https://doc.rust-lang.org/std/os/raw/type.c_uchar.html
+/// [`u8`]: https://doc.rust-lang.org/std/primitive.u8.html
+#[macro_export]
+macro_rules! assert_type_ne_all {
+    ($x:ty, $($y:ty),+ $(,)?) => {
+        const _: fn() = || {
+            trait MutuallyExclusive {}
+            impl MutuallyExclusive for $x {}
+            $(impl MutuallyExclusive for $y {})+
+        };
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/const_assert.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/const_assert.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/const_assert.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/const_assert.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,109 @@
+/// Asserts that constant expressions evaluate to `true`.
+///
+/// Constant expressions can be ensured to have certain properties via this
+/// macro If the expression evaluates to `false`, the file will fail to compile.
+/// This is synonymous to [`static_assert` in C++][static_assert].
+///
+/// # Alternatives
+///
+/// There also exists [`const_assert_eq`](macro.const_assert_eq.html) for
+/// validating whether a sequence of expressions are equal to one another.
+///
+/// # Examples
+///
+/// A common use case is to guarantee properties about a constant value that's
+/// generated via meta-programming.
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// const VALUE: i32 = // ...
+/// # 3;
+///
+/// const_assert!(VALUE >= 2);
+/// ```
+///
+/// Inputs are type-checked as booleans:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// const_assert!(!0);
+/// ```
+///
+/// Despite this being a macro, we see this produces a type error:
+///
+/// ```txt
+///   | const_assert!(!0);
+///   |               ^^ expected bool, found integral variable
+///   |
+///   = note: expected type `bool`
+///              found type `{integer}`
+/// ```
+///
+/// The following fails to compile because multiplying by 5 does not have an
+/// identity property:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// const_assert!(5 * 5 == 5);
+/// ```
+///
+/// [static_assert]: http://en.cppreference.com/w/cpp/language/static_assert
+#[macro_export]
+macro_rules! const_assert {
+    ($x:expr $(,)?) => {
+        #[allow(unknown_lints, eq_op)]
+        const _: [(); 0 - !{ const ASSERT: bool = $x; ASSERT } as usize] = [];
+    };
+}
+
+/// Asserts that constants are equal in value.
+///
+/// # Examples
+///
+/// This works as a shorthand for `const_assert!(a == b)`:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// const TWO: usize = 2;
+///
+/// const_assert_eq!(TWO * TWO, TWO + TWO);
+/// ```
+///
+/// Just because 2 × 2 = 2 + 2 doesn't mean it holds true for other numbers:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// const_assert_eq!(4 + 4, 4 * 4);
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! const_assert_eq {
+    ($x:expr, $y:expr $(,)?) => {
+        const_assert!($x == $y);
+    };
+}
+
+/// Asserts that constants are **not** equal in value.
+///
+/// # Examples
+///
+/// This works as a shorthand for `const_assert!(a != b)`:
+///
+/// ```
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// const NUM: usize = 32;
+///
+/// const_assert_ne!(NUM * NUM, 64);
+/// ```
+///
+/// The following example fails to compile because 2 is magic and 2 × 2 = 2 + 2:
+///
+/// ```compile_fail
+/// # #[macro_use] extern crate static_assertions; fn main() {}
+/// const_assert_ne!(2 + 2, 2 * 2);
+/// ```
+#[macro_export(local_inner_macros)]
+macro_rules! const_assert_ne {
+    ($x:expr, $y:expr $(,)?) => {
+        const_assert!($x != $y);
+    };
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/static_assertions/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/static_assertions/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,97 @@
+//! [![Banner](https://raw.githubusercontent.com/nvzqz/static-assertions-rs/assets/Banner.png)](https://github.com/nvzqz/static-assertions-rs)
+//!
+//! <div align="center">
+//!     <a href="https://crates.io/crates/static_assertions">
+//!         <img src="https://img.shields.io/crates/d/static_assertions.svg" alt="Downloads">
+//!     </a>
+//!     <a href="https://travis-ci.org/nvzqz/static-assertions-rs">
+//!         <img src="https://travis-ci.org/nvzqz/static-assertions-rs.svg?branch=master" alt="Build Status">
+//!     </a>
+//!     <img src="https://img.shields.io/badge/rustc-^1.37.0-blue.svg" alt="rustc ^1.37.0">
+//!     <br><br>
+//! </div>
+//!
+//! Assertions to ensure correct assumptions about constants, types, and more.
+//!
+//! _All_ checks provided by this crate are performed at [compile-time]. This
+//! allows for finding errors quickly and early when it comes to ensuring
+//! certain features or aspects of a codebase. These macros are especially
+//! important when exposing a public API that requires types to be the same size
+//! or implement certain traits.
+//!
+//! # Usage
+//!
+//! This crate is available [on crates.io][crate] and can be used by adding the
+//! following to your project's [`Cargo.toml`]:
+//!
+//! ```toml
+//! [dependencies]
+//! static_assertions = "1.1.0"
+//! ```
+//!
+//! and this to your crate root (`main.rs` or `lib.rs`):
+//!
+//! ```
+//! #[macro_use]
+//! extern crate static_assertions;
+//! # fn main() {}
+//! ```
+//!
+//! When using [Rust 2018 edition][2018], the following shorthand can help if
+//! having `#[macro_use]` is undesirable.
+//!
+//! ```edition2018
+//! extern crate static_assertions as sa;
+//!
+//! sa::const_assert!(true);
+//! ```
+//!
+//! # Examples
+//!
+//! Very thorough examples are provided in the docs for
+//! [each individual macro](#macros). Failure case examples are also documented.
+//!
+//! # Changes
+//!
+//! See [`CHANGELOG.md`](https://github.com/nvzqz/static-assertions-rs/blob/master/CHANGELOG.md)
+//! for an exhaustive list of what has changed from one version to another.
+//!
+//! # Donate
+//!
+//! This project is made freely available (as in free beer), but unfortunately
+//! not all beer is free! So, if you would like to buy me a beer (or coffee or
+//! *more*), then consider supporting my work that's benefited your project
+//! and thousands of others.
+//!
+//! <a href="https://www.patreon.com/nvzqz">
+//!     <img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Become a Patron!" height="35">
+//! </a>
+//! <a href="https://www.paypal.me/nvzqz">
+//!     <img src="https://buymecoffee.intm.org/img/button-paypal-white.png" alt="Buy me a coffee" height="35">
+//! </a>
+//!
+//! [Rust 1.37]: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
+//! [2018]: https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html#rust-2018
+//! [crate]: https://crates.io/crates/static_assertions
+//! [compile-time]: https://en.wikipedia.org/wiki/Compile_time
+//! [`Cargo.toml`]: https://doc.rust-lang.org/cargo/reference/manifest.html
+
+#![doc(html_root_url = "https://docs.rs/static_assertions/1.1.0")]
+#![doc(html_logo_url = "https://raw.githubusercontent.com/nvzqz/static-assertions-rs/assets/Icon.png")]
+
+#![no_std]
+
+#![deny(unused_macros)]
+
+#[doc(hidden)]
+pub extern crate core as _core;
+
+mod assert_cfg;
+mod assert_eq_align;
+mod assert_eq_size;
+mod assert_fields;
+mod assert_impl;
+mod assert_obj_safe;
+mod assert_trait;
+mod assert_type;
+mod const_assert;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.lock":"4946c8a227bba5e419fdfefe6ecd98cbafbe92538a168c16c6de00c08464a941","Cargo.toml":"f3d4f7889b77c5dcb945b96c8df92065db7b94b0b15dd8c33b0e123115465339","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"00e7521d4db2fc729636af47b6deed09af032fa8dfd76669a0e9bbfb6962cc12","examples/simple.rs":"227cbe14cdb0cb710a259707144b259684e9576615247628b8d57c895dd8c538","src/atom.rs":"9e80dcfd9dfebe316cc699d5c73a1b4e5dd03b95bca1dfd47dea499207f7c525","src/dynamic_set.rs":"cf3963daa9b1867eee45ee0ab8abf6354a06b79bf9d386010fdb608d7dfca36f","src/lib.rs":"4f9edaf9fa436b605f225925f0093ba8de05176ac63fca16078db06ab14bff74","src/static_sets.rs":"0d91d476b5277cf3cbbcd0c9f18cc5286086fecf59654115efab5090862ec8e8","src/trivial_impls.rs":"8872a0a43435f5b107ffbeeeb533db52dd6af31f3231783b1387c302f9637e28","tests/small-stack.rs":"a883ded4d1be983594f4bc0d563b295b33ee1aee76aeccb020e24491fd7747e2"},"package":"8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "lazy_static"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30"
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "serde"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113"
+
+[[package]]
+name = "siphasher"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83da420ee8d1a89e640d0948c646c1c088758d3a3c538f943bfa97bdac17929d"
+
+[[package]]
+name = "string_cache"
+version = "0.8.1"
+dependencies = [
+ "lazy_static",
+ "new_debug_unreachable",
+ "phf_shared",
+ "precomputed-hash",
+ "serde",
+]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "string_cache"
+version = "0.8.1"
+authors = ["The Servo Project Developers"]
+description = "A string interning library for Rust, developed as part of the Servo project."
+documentation = "https://docs.rs/string_cache/"
+license = "MIT / Apache-2.0"
+repository = "https://github.com/servo/string-cache"
+
+[lib]
+name = "string_cache"
+
+[[test]]
+name = "small-stack"
+harness = false
+[dependencies.lazy_static]
+version = "1"
+
+[dependencies.new_debug_unreachable]
+version = "1.0"
+
+[dependencies.phf_shared]
+version = "0.8"
+
+[dependencies.precomputed-hash]
+version = "0.1"
+
+[dependencies.serde]
+version = "1"
+optional = true
+
+[features]
+default = ["serde_support"]
+serde_support = ["serde"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/examples/simple.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/examples/simple.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/examples/simple.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/examples/simple.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+
+
+use string_cache::DefaultAtom;
+
+fn main() {
+    let mut interned_stuff = Vec::new();
+    let text = "here is a sentence of text that will be tokenised and interned and some repeated \
+                tokens is of text and";
+    for word in text.split_whitespace() {
+        let seen_before = interned_stuff
+            .iter()
+            // We can use impl PartialEq<T> where T is anything string-like to compare to
+            // interned strings to either other interned strings, or actual strings  Comparing two
+            // interned strings is very fast (normally a single cpu operation).
+            .filter(|interned_word| interned_word == &word)
+            .count();
+        if seen_before > 0 {
+            println!(r#"Seen the word "{}" {} times"#, word, seen_before);
+        } else {
+            println!(r#"Not seen the word "{}" before"#, word);
+        }
+        // We use the impl From<(Cow<'a, str>, or &'a str, or String) for Atom<Static> to intern a
+        // new string
+        interned_stuff.push(DefaultAtom::from(word));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2012-2013 Mozilla Foundation
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,78 @@
+# string-cache
+
+[![Build Status](https://travis-ci.com/servo/string-cache.svg?branch=master)](https://travis-ci.com/servo/string-cache)
+
+[Documentation](https://docs.rs/string_cache/)
+
+A string interning library for Rust, developed as part of the [Servo](https://github.com/servo/servo) project.
+
+## Simple usage
+
+In `Cargo.toml`:
+
+```toml
+[dependencies]
+string_cache = "0.8"
+```
+
+In `lib.rs`:
+
+```rust
+extern crate string_cache;
+use string_cache::DefaultAtom as Atom;
+```
+
+## With static atoms
+
+In `Cargo.toml`:
+
+```toml
+[package]
+build = "build.rs"
+
+[dependencies]
+string_cache = "0.8"
+
+[build-dependencies]
+string_cache_codegen = "0.5"
+```
+
+In `build.rs`:
+
+```rust
+extern crate string_cache_codegen;
+
+use std::env;
+use std::path::Path;
+
+fn main() {
+    string_cache_codegen::AtomType::new("foo::FooAtom", "foo_atom!")
+        .atoms(&["foo", "bar"])
+        .write_to_file(&Path::new(&env::var("OUT_DIR").unwrap()).join("foo_atom.rs"))
+        .unwrap()
+}
+```
+
+In `lib.rs`:
+
+```rust
+extern crate string_cache;
+
+mod foo {
+    include!(concat!(env!("OUT_DIR"), "/foo_atom.rs"));
+}
+```
+
+The generated code will define a `FooAtom` type and a `foo_atom!` macro.
+The macro can be used in expression or patterns, with strings listed in `build.rs`.
+For example:
+
+```rust
+fn compute_something(input: &foo::FooAtom) -> u32 {
+    match *input {
+        foo_atom!("foo") => 1,
+        foo_atom!("bar") => 2,
+        _ => 3,
+    }
+}
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/atom.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/atom.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/atom.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/atom.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,382 @@
+// Copyright 2014 The Servo Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::dynamic_set::{Entry, DYNAMIC_SET};
+use crate::static_sets::StaticAtomSet;
+use debug_unreachable::debug_unreachable;
+use phf_shared;
+use std::borrow::Cow;
+use std::cmp::Ordering::{self, Equal};
+use std::fmt;
+use std::hash::{Hash, Hasher};
+use std::marker::PhantomData;
+use std::mem;
+use std::num::NonZeroU64;
+use std::ops;
+use std::slice;
+use std::str;
+use std::sync::atomic::Ordering::SeqCst;
+
+const DYNAMIC_TAG: u8 = 0b_00;
+const INLINE_TAG: u8 = 0b_01; // len in upper nybble
+const STATIC_TAG: u8 = 0b_10;
+const TAG_MASK: u64 = 0b_11;
+const LEN_OFFSET: u64 = 4;
+const LEN_MASK: u64 = 0xF0;
+
+const MAX_INLINE_LEN: usize = 7;
+const STATIC_SHIFT_BITS: usize = 32;
+
+/// Represents a string that has been interned.
+///
+/// While the type definition for `Atom` indicates that it generic on a particular
+/// implementation of an atom set, you don't need to worry about this.  Atoms can be static
+/// and come from a `StaticAtomSet` generated by the `string_cache_codegen` crate, or they
+/// can be dynamic and created by you on an `EmptyStaticAtomSet`.
+///
+/// `Atom` implements `Clone` but not `Copy`, since internally atoms are reference-counted;
+/// this means that you may need to `.clone()` an atom to keep copies to it in different
+/// places, or when passing it to a function that takes an `Atom` rather than an `&Atom`.
+///
+/// ## Creating an atom at runtime
+///
+/// If you use `string_cache_codegen` to generate a precomputed list of atoms, your code
+/// may then do something like read data from somewhere and extract tokens that need to be
+/// compared to the atoms.  In this case, you can use `Atom::from(&str)` or
+/// `Atom::from(String)`.  These create a reference-counted atom which will be
+/// automatically freed when all references to it are dropped.
+///
+/// This means that your application can safely have a loop which tokenizes data, creates
+/// atoms from the tokens, and compares the atoms to a predefined set of keywords, without
+/// running the risk of arbitrary memory consumption from creating large numbers of atoms —
+/// as long as your application does not store clones of the atoms it creates along the
+/// way.
+///
+/// For example, the following is safe and will not consume arbitrary amounts of memory:
+///
+/// ```ignore
+/// let untrusted_data = "large amounts of text ...";
+///
+/// for token in untrusted_data.split_whitespace() {
+///     let atom = Atom::from(token); // interns the string
+///
+///     if atom == Atom::from("keyword") {
+///         // handle that keyword
+///     } else if atom == Atom::from("another_keyword") {
+///         // handle that keyword
+///     } else {
+///         println!("unknown keyword");
+///     }
+/// } // atom is dropped here, so it is not kept around in memory
+/// ```
+#[derive(PartialEq, Eq)]
+// NOTE: Deriving PartialEq requires that a given string must always be interned the same way.
+pub struct Atom<Static> {
+    unsafe_data: NonZeroU64,
+    phantom: PhantomData<Static>,
+}
+
+// FIXME: bound removed from the struct definition before of this error for pack_static:
+// "error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable"
+// https://github.com/rust-lang/rust/issues/57563
+impl<Static> Atom<Static> {
+    /// For the atom!() macros
+    #[inline(always)]
+    #[doc(hidden)]
+    pub const fn pack_static(n: u32) -> Self {
+        Self {
+            unsafe_data: unsafe {
+                // STATIC_TAG ensures this is non-zero
+                NonZeroU64::new_unchecked((STATIC_TAG as u64) | ((n as u64) << STATIC_SHIFT_BITS))
+            },
+            phantom: PhantomData,
+        }
+    }
+
+    fn tag(&self) -> u8 {
+        (self.unsafe_data.get() & TAG_MASK) as u8
+    }
+}
+
+impl<Static: StaticAtomSet> Atom<Static> {
+    /// Return the internal repersentation. For testing.
+    #[doc(hidden)]
+    pub fn unsafe_data(&self) -> u64 {
+        self.unsafe_data.get()
+    }
+
+    /// Return true if this is a static Atom. For testing.
+    #[doc(hidden)]
+    pub fn is_static(&self) -> bool {
+        self.tag() == STATIC_TAG
+    }
+
+    /// Return true if this is a dynamic Atom. For testing.
+    #[doc(hidden)]
+    pub fn is_dynamic(&self) -> bool {
+        self.tag() == DYNAMIC_TAG
+    }
+
+    /// Return true if this is an inline Atom. For testing.
+    #[doc(hidden)]
+    pub fn is_inline(&self) -> bool {
+        self.tag() == INLINE_TAG
+    }
+
+    fn static_index(&self) -> u64 {
+        self.unsafe_data.get() >> STATIC_SHIFT_BITS
+    }
+
+    /// Get the hash of the string as it is stored in the set.
+    pub fn get_hash(&self) -> u32 {
+        match self.tag() {
+            DYNAMIC_TAG => {
+                let entry = self.unsafe_data.get() as *const Entry;
+                unsafe { (*entry).hash }
+            }
+            STATIC_TAG => Static::get().hashes[self.static_index() as usize],
+            INLINE_TAG => {
+                let data = self.unsafe_data.get();
+                // This may or may not be great...
+                ((data >> 32) ^ data) as u32
+            }
+            _ => unsafe { debug_unreachable!() },
+        }
+    }
+}
+
+impl<Static: StaticAtomSet> Default for Atom<Static> {
+    #[inline]
+    fn default() -> Self {
+        Atom::pack_static(Static::empty_string_index())
+    }
+}
+
+impl<Static: StaticAtomSet> Hash for Atom<Static> {
+    #[inline]
+    fn hash<H>(&self, state: &mut H)
+    where
+        H: Hasher,
+    {
+        state.write_u32(self.get_hash())
+    }
+}
+
+impl<'a, Static: StaticAtomSet> From<Cow<'a, str>> for Atom<Static> {
+    fn from(string_to_add: Cow<'a, str>) -> Self {
+        let static_set = Static::get();
+        let hash = phf_shared::hash(&*string_to_add, &static_set.key);
+        let index = phf_shared::get_index(&hash, static_set.disps, static_set.atoms.len());
+
+        if static_set.atoms[index as usize] == string_to_add {
+            Self::pack_static(index)
+        } else {
+            let len = string_to_add.len();
+            if len <= MAX_INLINE_LEN {
+                let mut data: u64 = (INLINE_TAG as u64) | ((len as u64) << LEN_OFFSET);
+                {
+                    let dest = inline_atom_slice_mut(&mut data);
+                    dest[..len].copy_from_slice(string_to_add.as_bytes())
+                }
+                Atom {
+                    // INLINE_TAG ensures this is never zero
+                    unsafe_data: unsafe { NonZeroU64::new_unchecked(data) },
+                    phantom: PhantomData,
+                }
+            } else {
+                let ptr: std::ptr::NonNull<Entry> =
+                    DYNAMIC_SET.lock().unwrap().insert(string_to_add, hash.g);
+                let data = ptr.as_ptr() as u64;
+                debug_assert!(0 == data & TAG_MASK);
+                Atom {
+                    // The address of a ptr::NonNull is non-zero
+                    unsafe_data: unsafe { NonZeroU64::new_unchecked(data) },
+                    phantom: PhantomData,
+                }
+            }
+        }
+    }
+}
+
+impl<Static: StaticAtomSet> Clone for Atom<Static> {
+    #[inline(always)]
+    fn clone(&self) -> Self {
+        if self.tag() == DYNAMIC_TAG {
+            let entry = self.unsafe_data.get() as *const Entry;
+            unsafe { &*entry }.ref_count.fetch_add(1, SeqCst);
+        }
+        Atom { ..*self }
+    }
+}
+
+impl<Static> Drop for Atom<Static> {
+    #[inline]
+    fn drop(&mut self) {
+        if self.tag() == DYNAMIC_TAG {
+            let entry = self.unsafe_data.get() as *const Entry;
+            if unsafe { &*entry }.ref_count.fetch_sub(1, SeqCst) == 1 {
+                drop_slow(self)
+            }
+        }
+
+        // Out of line to guide inlining.
+        fn drop_slow<Static>(this: &mut Atom<Static>) {
+            DYNAMIC_SET
+                .lock()
+                .unwrap()
+                .remove(this.unsafe_data.get() as *mut Entry);
+        }
+    }
+}
+
+impl<Static: StaticAtomSet> ops::Deref for Atom<Static> {
+    type Target = str;
+
+    #[inline]
+    fn deref(&self) -> &str {
+        unsafe {
+            match self.tag() {
+                DYNAMIC_TAG => {
+                    let entry = self.unsafe_data.get() as *const Entry;
+                    &(*entry).string
+                }
+                INLINE_TAG => {
+                    let len = (self.unsafe_data() & LEN_MASK) >> LEN_OFFSET;
+                    let src = inline_atom_slice(&self.unsafe_data);
+                    str::from_utf8_unchecked(&src[..(len as usize)])
+                }
+                STATIC_TAG => Static::get().atoms[self.static_index() as usize],
+                _ => debug_unreachable!(),
+            }
+        }
+    }
+}
+
+impl<Static: StaticAtomSet> fmt::Debug for Atom<Static> {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let ty_str = unsafe {
+            match self.tag() {
+                DYNAMIC_TAG => "dynamic",
+                INLINE_TAG => "inline",
+                STATIC_TAG => "static",
+                _ => debug_unreachable!(),
+            }
+        };
+
+        write!(f, "Atom('{}' type={})", &*self, ty_str)
+    }
+}
+
+impl<Static: StaticAtomSet> PartialOrd for Atom<Static> {
+    #[inline]
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        if self.unsafe_data == other.unsafe_data {
+            return Some(Equal);
+        }
+        self.as_ref().partial_cmp(other.as_ref())
+    }
+}
+
+impl<Static: StaticAtomSet> Ord for Atom<Static> {
+    #[inline]
+    fn cmp(&self, other: &Self) -> Ordering {
+        if self.unsafe_data == other.unsafe_data {
+            return Equal;
+        }
+        self.as_ref().cmp(other.as_ref())
+    }
+}
+
+// AsciiExt requires mutating methods, so we just implement the non-mutating ones.
+// We don't need to implement is_ascii because there's no performance improvement
+// over the one from &str.
+impl<Static: StaticAtomSet> Atom<Static> {
+    fn from_mutated_str<F: FnOnce(&mut str)>(s: &str, f: F) -> Self {
+        let mut buffer = mem::MaybeUninit::<[u8; 64]>::uninit();
+        let buffer = unsafe { &mut *buffer.as_mut_ptr() };
+
+        if let Some(buffer_prefix) = buffer.get_mut(..s.len()) {
+            buffer_prefix.copy_from_slice(s.as_bytes());
+            let as_str = unsafe { ::std::str::from_utf8_unchecked_mut(buffer_prefix) };
+            f(as_str);
+            Atom::from(&*as_str)
+        } else {
+            let mut string = s.to_owned();
+            f(&mut string);
+            Atom::from(string)
+        }
+    }
+
+    /// Like [`to_ascii_uppercase`].
+    ///
+    /// [`to_ascii_uppercase`]: https://doc.rust-lang.org/std/ascii/trait.AsciiExt.html#tymethod.to_ascii_uppercase
+    pub fn to_ascii_uppercase(&self) -> Self {
+        for (i, b) in self.bytes().enumerate() {
+            if let b'a'..=b'z' = b {
+                return Atom::from_mutated_str(self, |s| s[i..].make_ascii_uppercase());
+            }
+        }
+        self.clone()
+    }
+
+    /// Like [`to_ascii_lowercase`].
+    ///
+    /// [`to_ascii_lowercase`]: https://doc.rust-lang.org/std/ascii/trait.AsciiExt.html#tymethod.to_ascii_lowercase
+    pub fn to_ascii_lowercase(&self) -> Self {
+        for (i, b) in self.bytes().enumerate() {
+            if let b'A'..=b'Z' = b {
+                return Atom::from_mutated_str(self, |s| s[i..].make_ascii_lowercase());
+            }
+        }
+        self.clone()
+    }
+
+    /// Like [`eq_ignore_ascii_case`].
+    ///
+    /// [`eq_ignore_ascii_case`]: https://doc.rust-lang.org/std/ascii/trait.AsciiExt.html#tymethod.eq_ignore_ascii_case
+    pub fn eq_ignore_ascii_case(&self, other: &Self) -> bool {
+        (self == other) || self.eq_str_ignore_ascii_case(&**other)
+    }
+
+    /// Like [`eq_ignore_ascii_case`], but takes an unhashed string as `other`.
+    ///
+    /// [`eq_ignore_ascii_case`]: https://doc.rust-lang.org/std/ascii/trait.AsciiExt.html#tymethod.eq_ignore_ascii_case
+    pub fn eq_str_ignore_ascii_case(&self, other: &str) -> bool {
+        (&**self).eq_ignore_ascii_case(other)
+    }
+}
+
+#[inline(always)]
+fn inline_atom_slice(x: &NonZeroU64) -> &[u8] {
+    unsafe {
+        let x: *const NonZeroU64 = x;
+        let mut data = x as *const u8;
+        // All except the lowest byte, which is first in little-endian, last in big-endian.
+        if cfg!(target_endian = "little") {
+            data = data.offset(1);
+        }
+        let len = 7;
+        slice::from_raw_parts(data, len)
+    }
+}
+
+#[inline(always)]
+fn inline_atom_slice_mut(x: &mut u64) -> &mut [u8] {
+    unsafe {
+        let x: *mut u64 = x;
+        let mut data = x as *mut u8;
+        // All except the lowest byte, which is first in little-endian, last in big-endian.
+        if cfg!(target_endian = "little") {
+            data = data.offset(1);
+        }
+        let len = 7;
+        slice::from_raw_parts_mut(data, len)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/dynamic_set.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/dynamic_set.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/dynamic_set.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/dynamic_set.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,111 @@
+// Copyright 2014 The Servo Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use lazy_static::lazy_static;
+use std::borrow::Cow;
+use std::mem;
+use std::ptr::NonNull;
+use std::sync::atomic::AtomicIsize;
+use std::sync::atomic::Ordering::SeqCst;
+use std::sync::Mutex;
+
+const NB_BUCKETS: usize = 1 << 12; // 4096
+const BUCKET_MASK: u32 = (1 << 12) - 1;
+
+pub(crate) struct Set {
+    buckets: Box<[Option<Box<Entry>>; NB_BUCKETS]>,
+}
+
+pub(crate) struct Entry {
+    pub(crate) string: Box<str>,
+    pub(crate) hash: u32,
+    pub(crate) ref_count: AtomicIsize,
+    next_in_bucket: Option<Box<Entry>>,
+}
+
+// Addresses are a multiples of this,
+// and therefore have have TAG_MASK bits unset, available for tagging.
+pub(crate) const ENTRY_ALIGNMENT: usize = 4;
+
+#[test]
+fn entry_alignment_is_sufficient() {
+    assert!(mem::align_of::<Entry>() >= ENTRY_ALIGNMENT);
+}
+
+lazy_static! {
+    pub(crate) static ref DYNAMIC_SET: Mutex<Set> = Mutex::new({
+        type T = Option<Box<Entry>>;
+        let _static_assert_size_eq = std::mem::transmute::<T, usize>;
+        let vec = std::mem::ManuallyDrop::new(vec![0_usize; NB_BUCKETS]);
+        Set {
+            buckets: unsafe { Box::from_raw(vec.as_ptr() as *mut [T; NB_BUCKETS]) },
+        }
+    });
+}
+
+impl Set {
+    pub(crate) fn insert(&mut self, string: Cow<str>, hash: u32) -> NonNull<Entry> {
+        let bucket_index = (hash & BUCKET_MASK) as usize;
+        {
+            let mut ptr: Option<&mut Box<Entry>> = self.buckets[bucket_index].as_mut();
+
+            while let Some(entry) = ptr.take() {
+                if entry.hash == hash && &*entry.string == &*string {
+                    if entry.ref_count.fetch_add(1, SeqCst) > 0 {
+                        return NonNull::from(&mut **entry);
+                    }
+                    // Uh-oh. The pointer's reference count was zero, which means someone may try
+                    // to free it. (Naive attempts to defend against this, for example having the
+                    // destructor check to see whether the reference count is indeed zero, don't
+                    // work due to ABA.) Thus we need to temporarily add a duplicate string to the
+                    // list.
+                    entry.ref_count.fetch_sub(1, SeqCst);
+                    break;
+                }
+                ptr = entry.next_in_bucket.as_mut();
+            }
+        }
+        debug_assert!(mem::align_of::<Entry>() >= ENTRY_ALIGNMENT);
+        let string = string.into_owned();
+        let mut entry = Box::new(Entry {
+            next_in_bucket: self.buckets[bucket_index].take(),
+            hash,
+            ref_count: AtomicIsize::new(1),
+            string: string.into_boxed_str(),
+        });
+        let ptr = NonNull::from(&mut *entry);
+        self.buckets[bucket_index] = Some(entry);
+
+        ptr
+    }
+
+    pub(crate) fn remove(&mut self, ptr: *mut Entry) {
+        let bucket_index = {
+            let value: &Entry = unsafe { &*ptr };
+            debug_assert!(value.ref_count.load(SeqCst) == 0);
+            (value.hash & BUCKET_MASK) as usize
+        };
+
+        let mut current: &mut Option<Box<Entry>> = &mut self.buckets[bucket_index];
+
+        loop {
+            let entry_ptr: *mut Entry = match current.as_mut() {
+                Some(entry) => &mut **entry,
+                None => break,
+            };
+            if entry_ptr == ptr {
+                mem::drop(mem::replace(current, unsafe {
+                    (*entry_ptr).next_in_bucket.take()
+                }));
+                break;
+            }
+            current = unsafe { &mut (*entry_ptr).next_in_bucket };
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,126 @@
+// Copyright 2014 The Servo Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//!
+//! A library for interning things that are `AsRef<str>`.
+//!
+//! Some strings may be interned at compile time using the `string-cache-codegen` crate, or the
+//! `EmptyStaticAtomSet` may be used that has no compile-time interned strings. An `Atom` is an
+//! interned string for a given set (either `EmptyStaticAtomSet` or a generated `StaticAtomSet`).
+//!
+//! Generated `Atom`s will have assocated macros to intern static strings at compile-time.
+//!
+//! # Examples
+//!
+//! Here are two examples, one with compile-time `Atom`s, and one without.
+//!
+//! ## With compile-time atoms
+//!
+//! In `Cargo.toml`:
+//! ```toml
+//! [dependencies]
+//! string_cache = "0.8"
+//!
+//! [dev-dependencies]
+//! string_cache_codegen = "0.5"
+//! ```
+//!
+//! In `build.rs`:
+//!
+//! ```ignore
+//! extern crate string_cache_codegen;
+//!
+//! use std::env;
+//! use std::path::Path;
+//!
+//! fn main() {
+//!     string_cache_codegen::AtomType::new("foo::FooAtom", "foo_atom!")
+//!         .atoms(&["foo", "bar"])
+//!         .write_to_file(&Path::new(&env::var("OUT_DIR").unwrap()).join("foo_atom.rs"))
+//!         .unwrap()
+//! }
+//! ```
+//!
+//! In `lib.rs`:
+//!
+//! ```ignore
+//! extern crate string_cache;
+//!
+//! mod foo {
+//!     include!(concat!(env!("OUT_DIR"), "/foo_atom.rs"));
+//! }
+//!
+//! fn use_the_atom(t: &str) {
+//!     match *t {
+//!         foo_atom!("foo") => println!("Found foo!"),
+//!         foo_atom!("bar") => println!("Found bar!"),
+//!         // foo_atom!("baz") => println!("Found baz!"), - would be a compile time error
+//!         _ => {
+//!             println!("String not interned");
+//!             // We can intern strings at runtime as well
+//!             foo::FooAtom::from(t)
+//!         }
+//!     }
+//! }
+//! ```
+//!
+//! ## No compile-time atoms
+//!
+//! ```
+//! # extern crate string_cache;
+//! use string_cache::DefaultAtom;
+//!
+//! # fn main() {
+//! let mut interned_stuff = Vec::new();
+//! let text = "here is a sentence of text that will be tokenised and
+//!             interned and some repeated tokens is of text and";
+//! for word in text.split_whitespace() {
+//!     let seen_before = interned_stuff.iter()
+//!         // We can use impl PartialEq<T> where T is anything string-like
+//!         // to compare to interned strings to either other interned strings,
+//!         // or actual strings  Comparing two interned strings is very fast
+//!         // (normally a single cpu operation).
+//!         .filter(|interned_word| interned_word == &word)
+//!         .count();
+//!     if seen_before > 0 {
+//!         println!(r#"Seen the word "{}" {} times"#, word, seen_before);
+//!     } else {
+//!         println!(r#"Not seen the word "{}" before"#, word);
+//!     }
+//!     // We use the impl From<(Cow<'a, str>, or &'a str, or String)> for
+//!     // Atom<Static> to intern a new string.
+//!     interned_stuff.push(DefaultAtom::from(word));
+//! }
+//! # }
+//! ```
+//!
+
+#![cfg_attr(test, deny(warnings))]
+
+mod atom;
+mod dynamic_set;
+mod static_sets;
+mod trivial_impls;
+
+pub use atom::Atom;
+pub use static_sets::{EmptyStaticAtomSet, PhfStrSet, StaticAtomSet};
+
+/// Use this if you don’t care about static atoms.
+pub type DefaultAtom = Atom<EmptyStaticAtomSet>;
+
+// Some minor tests of internal layout here.
+// See ../integration-tests for much more.
+
+/// Guard against accidental changes to the sizes of things.
+#[test]
+fn assert_sizes() {
+    use std::mem::size_of;
+    assert_eq!(size_of::<DefaultAtom>(), 8);
+    assert_eq!(size_of::<Option<DefaultAtom>>(), size_of::<DefaultAtom>(),);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/static_sets.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/static_sets.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/static_sets.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/static_sets.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,64 @@
+// Copyright 2014 The Servo Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+/// A static `PhfStrSet`
+///
+/// This trait is implemented by static sets of interned strings generated using
+/// `string_cache_codegen`, and `EmptyStaticAtomSet` for when strings will be added dynamically.
+///
+/// It is used by the methods of [`Atom`] to check if a string is present in the static set.
+///
+/// [`Atom`]: struct.Atom.html
+pub trait StaticAtomSet: Ord {
+    /// Get the location of the static string set in the binary.
+    fn get() -> &'static PhfStrSet;
+    /// Get the index of the empty string, which is in every set and is used for `Atom::default`.
+    fn empty_string_index() -> u32;
+}
+
+/// A string set created using a [perfect hash function], specifically
+/// [Hash, Displace and Compress].
+///
+/// See the CHD document for the meaning of the struct fields.
+///
+/// [perfect hash function]: https://en.wikipedia.org/wiki/Perfect_hash_function
+/// [Hash, Displace and Compress]: http://cmph.sourceforge.net/papers/esa09.pdf
+pub struct PhfStrSet {
+    #[doc(hidden)]
+    pub key: u64,
+    #[doc(hidden)]
+    pub disps: &'static [(u32, u32)],
+    #[doc(hidden)]
+    pub atoms: &'static [&'static str],
+    #[doc(hidden)]
+    pub hashes: &'static [u32],
+}
+
+/// An empty static atom set for when only dynamic strings will be added
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+pub struct EmptyStaticAtomSet;
+
+impl StaticAtomSet for EmptyStaticAtomSet {
+    fn get() -> &'static PhfStrSet {
+        // The name is a lie: this set is not empty (it contains the empty string)
+        // but that’s only to avoid divisions by zero in rust-phf.
+        static SET: PhfStrSet = PhfStrSet {
+            key: 0,
+            disps: &[(0, 0)],
+            atoms: &[""],
+            // "" SipHash'd, and xored with u64_hash_to_u32.
+            hashes: &[0x3ddddef3],
+        };
+        &SET
+    }
+
+    fn empty_string_index() -> u32 {
+        0
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/trivial_impls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/trivial_impls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/src/trivial_impls.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/src/trivial_impls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+// Copyright 2014 The Servo Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::{Atom, StaticAtomSet};
+#[cfg(feature = "serde_support")]
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::borrow::Cow;
+use std::fmt;
+
+impl<Static: StaticAtomSet> ::precomputed_hash::PrecomputedHash for Atom<Static> {
+    fn precomputed_hash(&self) -> u32 {
+        self.get_hash()
+    }
+}
+
+impl<'a, Static: StaticAtomSet> From<&'a Atom<Static>> for Atom<Static> {
+    fn from(atom: &'a Self) -> Self {
+        atom.clone()
+    }
+}
+
+impl<Static: StaticAtomSet> PartialEq<str> for Atom<Static> {
+    fn eq(&self, other: &str) -> bool {
+        &self[..] == other
+    }
+}
+
+impl<Static: StaticAtomSet> PartialEq<Atom<Static>> for str {
+    fn eq(&self, other: &Atom<Static>) -> bool {
+        self == &other[..]
+    }
+}
+
+impl<Static: StaticAtomSet> PartialEq<String> for Atom<Static> {
+    fn eq(&self, other: &String) -> bool {
+        &self[..] == &other[..]
+    }
+}
+
+impl<'a, Static: StaticAtomSet> From<&'a str> for Atom<Static> {
+    #[inline]
+    fn from(string_to_add: &str) -> Self {
+        Atom::from(Cow::Borrowed(string_to_add))
+    }
+}
+
+impl<Static: StaticAtomSet> From<String> for Atom<Static> {
+    #[inline]
+    fn from(string_to_add: String) -> Self {
+        Atom::from(Cow::Owned(string_to_add))
+    }
+}
+
+impl<Static: StaticAtomSet> fmt::Display for Atom<Static> {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <str as fmt::Display>::fmt(self, f)
+    }
+}
+
+impl<Static: StaticAtomSet> AsRef<str> for Atom<Static> {
+    fn as_ref(&self) -> &str {
+        &self
+    }
+}
+
+#[cfg(feature = "serde_support")]
+impl<Static: StaticAtomSet> Serialize for Atom<Static> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let string: &str = self.as_ref();
+        string.serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde_support")]
+impl<'a, Static: StaticAtomSet> Deserialize<'a> for Atom<Static> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'a>,
+    {
+        let string: String = Deserialize::deserialize(deserializer)?;
+        Ok(Atom::from(string))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/tests/small-stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/tests/small-stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/string_cache/tests/small-stack.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/string_cache/tests/small-stack.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+// Regression test for https://github.com/servo/html5ever/issues/393
+//
+// Create a dynamic atom − causing initialization of the golbal hash map −
+// in a thread that has a small stack.
+//
+// This is a separate test program rather than a `#[test] fn` among others
+// to make sure that nothing else has already initialized the map in this process.
+fn main() {
+    std::thread::Builder::new()
+        .stack_size(50_000)
+        .spawn(|| {
+            string_cache::DefaultAtom::from("12345678");
+        })
+        .unwrap()
+        .join()
+        .unwrap()
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"0eaf83089bd1c46e765559fd1dbfa2d5e22c96b6f53c114e7f93b96477b99f03","README.md":"e0b987dba64af51cbc161594da4d82c58abc922eeeb42ecf15b3c716e80035f4","src/lib.rs":"212faf625a8f200d0d7091336b48dc8f37915de4bbd6a379a5911473e475a2b2"},"package":"ed99d2d834d525df5ba47628e09a8e600bec7c4fe44a725accc7e492977cd87e"}
\ No newline at end of file
+{"files":{"Cargo.toml":"773ab63dc3254773bb9936c1d05654a14fa584defe01237048ed70dfceaad3a9","README.md":"5f8d91f04af10fe502282d63f7467d41fd17ee871baab308134fbda353213db9","src/lib.rs":"9714a365911ceb5a2184c529ddae2a4a037a9e5956ad9ca34dd8043785dbc201"},"package":"15a8386ee899fa8c8e372d886e937444d2bd72123ef4a3f234e4ac10f65aa2b5"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "symbolic"
-version = "8.0.0"
+version = "8.3.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>", "Jan Michael Auer <mail@jauer.org>"]
 description = "A library to symbolicate and process stack traces from native applications,\nminidumps, Unreal Engine 4, minified JavaScripts or ProGuard optimized Android apps.\n"
 homepage = "https://github.com/getsentry/symbolic"
@@ -24,30 +24,30 @@
 [package.metadata.docs.rs]
 all-features = true
 [dependencies.symbolic-common]
-version = "8.0.0"
+version = "8.3.0"
 
 [dependencies.symbolic-debuginfo]
-version = "8.0.0"
+version = "8.3.0"
 optional = true
 
 [dependencies.symbolic-demangle]
-version = "8.0.0"
+version = "8.3.0"
 optional = true
 
 [dependencies.symbolic-minidump]
-version = "8.0.0"
+version = "8.3.0"
 optional = true
 
 [dependencies.symbolic-sourcemap]
-version = "8.0.0"
+version = "8.3.0"
 optional = true
 
 [dependencies.symbolic-symcache]
-version = "8.0.0"
+version = "8.3.0"
 optional = true
 
 [dependencies.symbolic-unreal]
-version = "8.0.0"
+version = "8.3.0"
 optional = true
 
 [features]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -64,4 +64,8 @@
 - **`minidump-serde`**
 - **`unreal-serde`**
 
+## Minimal Rust Version
+
+This crate is known to require at least Rust 1.41.
+
 License: MIT
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -58,6 +58,10 @@
 //! - **`debuginfo-serde`**
 //! - **`minidump-serde`**
 //! - **`unreal-serde`**
+//!
+//! ## Minimal Rust Version
+//!
+//! This crate is known to require at least Rust 1.41.
 
 #![warn(missing_docs)]
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"31a2af82fbab3d295533cfaa8a5aaf411540c0b6934d689b212d445723874ca1","README.md":"40c3bd6593e1e16f2bde8f76d7e3609b938daac2b6e798e946272d998bbc4f92","src/byteview.rs":"9a621c83caa0abff76e4dfbe33e6350ac6f5d186ee0c7e20098185c71224b89e","src/cell.rs":"6e5689df5f2ff82f790f6ec9ce2f028596188c3fa6c450a14cf4e0f09c3692d8","src/heuristics.rs":"3aaf65577024cf5d4a9c333b7042e572113cb9e4cff94878094551138e6097f7","src/lib.rs":"3651adbe6bd540b4ff0cb6a5762257b58e06c9ab78f22bb63ba16a0270fee12c","src/path.rs":"50b2dc750e6d1c90c9631b8ccc43907a4bd145e1efa5738d4a52424028935da3","src/types.rs":"65acdcbe1822332d71fef7078dd85791ef1289ce4faa901c8138912953edd746"},"package":"0caab39ce6f074031b8fd3dd297bfda70a2d1f33c6e7cc1b737ac401f856448d"}
\ No newline at end of file
+{"files":{"Cargo.toml":"76ced823ffdee55ad9180f45343d009ffbecc89a83691b1c2d2d35c3bd082b1b","README.md":"40c3bd6593e1e16f2bde8f76d7e3609b938daac2b6e798e946272d998bbc4f92","src/byteview.rs":"d2f458278597a024b4eb5341f2652ca83b55140d5cf7731df614c84dd85973b4","src/cell.rs":"840f7dfbccde01af39dab9cbb75b9d3443986be0cd5e0ee9cf6b24c5c730335b","src/heuristics.rs":"3aaf65577024cf5d4a9c333b7042e572113cb9e4cff94878094551138e6097f7","src/lib.rs":"3651adbe6bd540b4ff0cb6a5762257b58e06c9ab78f22bb63ba16a0270fee12c","src/path.rs":"f78948cf1c2298f96c99fa4a681fee535c3a8dffe7d07017a6ab438717cd8334","src/types.rs":"1ad9f66de094bb6b810e94860679f637e84d77aac2378a3b0117729dfdfc3f48"},"package":"348885c332e7d0784d661844b13b198464144a5ebcd3bfc047a6c441867ea467"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "symbolic-common"
-version = "8.0.0"
+version = "8.3.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>", "Jan Michael Auer <mail@jauer.org>"]
 description = "Common types and utilities for symbolic, a library to symbolicate and process\nstack traces from native applications, minidumps, minified JavaScripts or\nProGuard optimized Android apps.\n"
 homepage = "https://github.com/getsentry/symbolic"
@@ -40,6 +40,9 @@
 
 [dependencies.uuid]
 version = "0.8.1"
+[dev-dependencies.similar-asserts]
+version = "1.0.0"
+
 [dev-dependencies.tempfile]
 version = "3.1.0"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/src/byteview.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/src/byteview.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/src/byteview.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/src/byteview.rs	2021-12-09 12:01:26.000000000 +0000
@@ -236,6 +236,7 @@
 
     use std::io::Write;
 
+    use similar_asserts::assert_eq;
     use tempfile::NamedTempFile;
 
     #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/src/cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/src/cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/src/cell.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/src/cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -350,6 +350,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
+    use similar_asserts::assert_eq;
 
     #[derive(Debug, PartialEq)]
     struct Foo<'a>(&'a str);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/src/path.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/src/path.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/src/path.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/src/path.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,44 +1,44 @@
 use std::borrow::Cow;
 use std::path::{Path, PathBuf};
 
-trait ToChar {
-    fn to_char(self) -> char;
+trait IntoChar {
+    fn into_char(self) -> char;
 }
 
-impl ToChar for char {
-    fn to_char(self) -> char {
+impl IntoChar for char {
+    fn into_char(self) -> char {
         self
     }
 }
 
-impl ToChar for u8 {
-    fn to_char(self) -> char {
+impl IntoChar for u8 {
+    fn into_char(self) -> char {
         char::from(self)
     }
 }
 
-impl<T: ToChar + Copy> ToChar for &'_ T {
-    fn to_char(self) -> char {
-        (*self).to_char()
+impl<T: IntoChar + Copy> IntoChar for &'_ T {
+    fn into_char(self) -> char {
+        (*self).into_char()
     }
 }
 
 /// Returns `true` if the given character is any valid directory separator.
 #[inline]
-fn is_path_separator<C: ToChar>(c: C) -> bool {
-    matches!(c.to_char(), '\\' | '/')
+fn is_path_separator<C: IntoChar>(c: C) -> bool {
+    matches!(c.into_char(), '\\' | '/')
 }
 
 /// Returns `true` if the given character is a valid Windows directory separator.
 #[inline]
-fn is_windows_separator<C: ToChar>(c: C) -> bool {
+fn is_windows_separator<C: IntoChar>(c: C) -> bool {
     is_path_separator(c)
 }
 
 /// Returns `true` if the given character is a valid UNIX directory separator.
 #[inline]
-fn is_unix_separator<C: ToChar>(c: C) -> bool {
-    c.to_char() == '/'
+fn is_unix_separator<C: IntoChar>(c: C) -> bool {
+    c.into_char() == '/'
 }
 
 /// Returns `true` if this is a Windows Universal Naming Convention path (UNC).
@@ -197,7 +197,6 @@
                 if rv.is_empty() {
                     needs_separator = false;
                 }
-                continue;
             } else {
                 if !is_past_root {
                     needs_separator = false;
@@ -208,8 +207,8 @@
                 }
                 rv.push_str("..");
                 needs_separator = true;
-                continue;
             }
+            continue;
         }
         if needs_separator {
             rv.push(main_separator);
@@ -350,7 +349,7 @@
     let max_len = length - 4;
 
     // make sure we get two segments at the start.
-    while let Some((idx, sep)) = piece_iter.next() {
+    for (idx, sep) in &mut piece_iter {
         let slice = &path[last_idx..idx + sep.len()];
         rv.push_str(slice);
         let done = last_idx > 0;
@@ -395,7 +394,7 @@
     rv.push_str("...");
     rv.push_str(final_sep);
     for item in rest {
-        rv.push_str(&item);
+        rv.push_str(item);
     }
 
     Cow::Owned(rv)
@@ -521,6 +520,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
+    use similar_asserts::assert_eq;
     use symbolic_testutils::fixture;
 
     #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/src/types.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/src/types.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-common/src/types.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-common/src/types.rs	2021-12-09 12:01:26.000000000 +0000
@@ -850,9 +850,9 @@
     }
 }
 
-impl Into<String> for Name<'_> {
-    fn into(self) -> String {
-        self.string.into()
+impl From<Name<'_>> for String {
+    fn from(name: Name) -> Self {
+        name.string.into()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/benches/breakpad_parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/benches/breakpad_parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/benches/breakpad_parser.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/benches/breakpad_parser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,91 @@
+use std::fs::File;
+use std::io::{BufReader, Read};
+
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+
+use symbolic_common::ByteView;
+use symbolic_debuginfo::breakpad::{BreakpadObject, BreakpadStackRecord};
+use symbolic_testutils::fixture;
+
+pub fn breakpad_parser(c: &mut Criterion) {
+    let mut group = c.benchmark_group("Breakpad parser benchmarks");
+
+    for file in ["linux/crash.sym", "macos/crash.sym", "windows/crash.sym"].iter() {
+        let mut buf_reader = BufReader::new(File::open(fixture(file)).unwrap());
+        let mut buffer = String::new();
+        buf_reader.read_to_string(&mut buffer).unwrap();
+        let view = ByteView::from_slice(&buffer.as_bytes());
+        let object: BreakpadObject = BreakpadObject::parse(&view).unwrap();
+
+        group.bench_with_input(
+            BenchmarkId::new("info records", file),
+            &object,
+            |b, object| {
+                b.iter(|| {
+                    for record in object.info_records() {
+                        record.unwrap();
+                    }
+                })
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("func and line records", file),
+            &object,
+            |b, object| {
+                b.iter(|| {
+                    for record in object.func_records() {
+                        for line in record.unwrap().lines() {
+                            line.unwrap();
+                        }
+                    }
+                })
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("public records", file),
+            &object,
+            |b, object| {
+                b.iter(|| {
+                    for record in object.public_records() {
+                        record.unwrap();
+                    }
+                })
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("file records", file),
+            &object,
+            |b, object| {
+                b.iter(|| {
+                    for record in object.file_records() {
+                        record.unwrap();
+                    }
+                })
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("stack records", file),
+            &object,
+            |b, object| {
+                b.iter(|| {
+                    for record in object.stack_records() {
+                        if let BreakpadStackRecord::Cfi(cfi_record) = record.unwrap() {
+                            for delta in cfi_record.deltas() {
+                                delta.unwrap();
+                            }
+                        }
+                    }
+                })
+            },
+        );
+    }
+
+    group.finish();
+}
+
+criterion_group!(benches, breakpad_parser);
+criterion_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"c371b0428b59a58b44e41e8f03852af5d88be6bcd78936b597a42e7ddb702bd6","src/base.rs":"ff4000aeb7247c6d4e679e8c2fd2e69c54c846f924498956bcdc540c308a9f48","src/breakpad.pest":"183b466ff21505b37b4d67addb3b2150f79506d53d22803248192704308acc8d","src/breakpad.rs":"aa8d25cf55892e4cadfebc864255e6963805d5ca70a83577dcba24be003edad8","src/dwarf.rs":"61f55bfca27027ab9b4fafccd131cef81eafac693635bd717153ed7ff13e273f","src/elf.rs":"21d4cd8733180d7bbb5ac97c0a4bfa97ba5dbf93fb2734b32303cd439384fadf","src/lib.rs":"c5a29615897b0ccec5b500607586990c05c645cc5b2e0b94786242b290e62064","src/macho.rs":"738e109a5292262075857485177f83bcdb21765ab8dd6e88e108cde9099b8ff1","src/object.rs":"276e10f4612c7fc3b21a613b62d81f0ec6f8f8bf1a3b09049644c76feb66462a","src/pdb.rs":"977f40893ff4253ead801063d04a6a1d530ebf26b926b985a5c4b96f33c43394","src/pe.rs":"4d4a39ad7ba7cbe31744dd88b34bc557b11e916db78efb3f43e116bb044781b7","src/private.rs":"9879c008b9d79d66a9ba413fecd8564dc13bfff1f0f2a0a636a2888ffd7c875a","src/sourcebundle.rs":"8ffeef27f6649e4928bd9ddfb7dac2c7516f9a5d32a96cd88a7b925c0bd0cc9d","src/wasm.rs":"95f9037f969e66171e5c83279e09e0aa08634f2b078eb2522d0af3bf1ad08b04"},"package":"0d988bcd67d7a630e1308292c719c62fb5d17669e86a26d411613dd09a161361"}
\ No newline at end of file
+{"files":{"Cargo.toml":"6f7ef2028d3d23919a18405e0b44a93e3a316883c14260fb47506cc1afbaa7dc","benches/breakpad_parser.rs":"0d74960c651dfecae387fce6f88fe41cec784b1bb8b49f5afb2b1419b16dba85","src/base.rs":"a8884b6580c138243cf54b039b963871f294c39e3544842a0314330dc651599a","src/breakpad.rs":"26a5fb035da2fe9f11612ac9ebe6114681825ad5878753385931b9058ce8aee6","src/dwarf.rs":"b5c23f9ab12e06a87f0868074fa7adb410a7c22405eb41ea09406ad48479cfe3","src/elf.rs":"644d023b76e36ad5e103234577ddd00b8533101e09badc3f79f02385d993917e","src/lib.rs":"c5a29615897b0ccec5b500607586990c05c645cc5b2e0b94786242b290e62064","src/macho/bcsymbolmap.rs":"528ae0ec38d8dfc98f21d4769c6d97cdd789a670c3505a99289d32077b86cd06","src/macho/compact.rs":"4ac88afb544b5439db595c9260b0c33c3530337f592d36c30ba359d0e40435f9","src/macho/mod.rs":"1a6b83b293b664a12d1baaf6e225502642358f5d7b3e5f045a0d8067fa4f5ed6","src/object.rs":"493110405e3b06f90fff1f6dacdae9361087c70753fd02a58cf7dcae411caf29","src/pdb.rs":"35b3587c04577ce3e6c4e352b2f75f07e278e5cef68a6d7df33a3b5737636092","src/pe.rs":"296d1c29069d7fcdbce8a8efe285f1658e9f03e019d52a44fe7395ff68e44430","src/private.rs":"794d316ce39ca946b541b976cd93b667072d816be186bc512ed4747445b18447","src/sourcebundle.rs":"fe2327d8a9472c21ebc4cdf4bf92ae3d3759251eab81cee4f70922f8713d0ffd","src/wasm.rs":"4f5b54fc44240889237e9cb55dd0b3f929afbc1bd32d47e30fd958b8dc228781"},"package":"35bab4753ee9fcc994192a13fb17519397b283106424e33787265220472816ee"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "symbolic-debuginfo"
-version = "8.0.0"
+version = "8.3.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>", "Jan Michael Auer <mail@jauer.org>"]
 exclude = ["tests/**/*"]
 description = "A library to inspect and load DWARF debugging information from binaries, such\nas Mach-O or ELF.\n"
@@ -23,9 +23,16 @@
 repository = "https://github.com/getsentry/symbolic"
 [package.metadata.docs.rs]
 all-features = true
+
+[[bench]]
+name = "breakpad_parser"
+harness = false
 [dependencies.dmsort]
 version = "1.0.1"
 
+[dependencies.elementtree]
+version = "0.5.0"
+
 [dependencies.fallible-iterator]
 version = "0.2.0"
 
@@ -35,12 +42,12 @@
 default-features = false
 
 [dependencies.gimli]
-version = "0.22.0"
+version = "0.24.0"
 features = ["read", "std"]
 default-features = false
 
 [dependencies.goblin]
-version = "0.2.3"
+version = "0.4.2"
 
 [dependencies.lazy_static]
 version = "1.4.0"
@@ -48,21 +55,24 @@
 [dependencies.lazycell]
 version = "1.2.1"
 
+[dependencies.nom]
+version = "6.1.2"
+
+[dependencies.nom-supreme]
+version = "0.4.2"
+
 [dependencies.parking_lot]
 version = "0.11.0"
 
 [dependencies.pdb]
-version = "0.6.0"
-
-[dependencies.pest]
-version = "2.1.1"
-
-[dependencies.pest_derive]
-version = "2.1.0"
+version = "0.7.0"
 
 [dependencies.regex]
 version = "1.3.5"
 
+[dependencies.scroll]
+version = "0.10"
+
 [dependencies.serde]
 version = "1.0.94"
 features = ["derive"]
@@ -74,18 +84,25 @@
 version = "1.2.0"
 
 [dependencies.symbolic-common]
-version = "8.0.0"
+version = "8.3.0"
 
 [dependencies.thiserror]
 version = "1.0.20"
 
 [dependencies.walrus]
-version = "0.18.0"
+version = "0.19.0"
 
 [dependencies.wasmparser]
-version = "0.68.0"
+version = "0.77.0"
 
 [dependencies.zip]
 version = "0.5.2"
+[dev-dependencies.criterion]
+version = "0.3.4"
+features = ["html_reports"]
+
 [dev-dependencies.insta]
 version = "1.3.0"
+
+[dev-dependencies.similar-asserts]
+version = "1.0.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/base.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/base.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/base.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/base.rs	2021-12-09 12:01:26.000000000 +0000
@@ -733,6 +733,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
+    use similar_asserts::assert_eq;
 
     fn file_info<'a>(dir: &'a str, name: &'a str) -> FileInfo<'a> {
         FileInfo {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/breakpad.pest thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/breakpad.pest
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/breakpad.pest	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/breakpad.pest	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-breakpad = { SOI ~ module ~ (NEWLINE ~ record)* ~ NEWLINE* ~ EOI }
-record = { module | info | file | func_lines | public | stack }
-func_lines = { func ~ (NEWLINE ~ !record ~ line)* }
-stack = { stack_cfi | stack_win }
-
-// MODULE record
-// Example: "MODULE Linux x86 D3096ED481217FD4C16B29CD9BC208BA0 firefox-bin"
-// see <https://github.com/google/breakpad/blob/master/docs/symbol_files.md#module-records>
-module = { "MODULE" ~ os ~ arch ~ debug_id ~ name }
-os = @{ ident }
-arch = @{ ident }
-debug_id = @{ ASCII_HEX_DIGIT{32,40} }
-
-// INFO record
-// Example: "INFO CODE_ID C22813AC7D101E2FF2598697023E1F28"
-// no documentation available
-info = { "INFO" ~ (info_code_id | info_other) }
-info_code_id = { "CODE_ID" ~ code_id ~ name? }
-info_other = { ident ~ text }
-code_id = @{ hex }
-
-// FILE record
-// Example: "FILE 2 /home/jimb/mc/in/browser/app/nsBrowserApp.cpp"
-// see <https://github.com/google/breakpad/blob/master/docs/symbol_files.md#file-records>
-file = { "FILE" ~ file_id ~ name }
-file_id = @{ dec }
-
-// FUNC record
-// Example: "FUNC m c184 30 0 nsQueryInterfaceWithError::operator()(nsID const&, void**) const"
-// see <https://github.com/google/breakpad/blob/master/docs/symbol_files.md#func-records>
-func = { "FUNC" ~ multiple? ~ addr ~ size ~ param_size ~ name? }
-param_size = @{ hex }
-
-// LINE record (part of functions)
-// Example: "c184 7 59 4"
-// see <https://github.com/google/breakpad/blob/master/docs/symbol_files.md#line-records>
-line = { addr ~ size ~ line_num ~ file_id }
-line_num = @{ "-"? ~ dec }
-
-// PUBLIC record
-// Example: "PUBLIC m 2160 0 Public2_1"
-// see <https://github.com/google/breakpad/blob/master/docs/symbol_files.md#public-records>
-public = { "PUBLIC" ~ multiple? ~ addr ~ param_size ~ name? }
-
-// STACK WIN record
-// Example: "STACK WIN 4 2170 14 1 0 0 0 0 0 1 $eip 4 + ^ = $esp $ebp 8 + = $ebp $ebp ^ ="
-// see <https://github.com/google/breakpad/blob/master/docs/symbol_files.md#stack-win-records>
-stack_win = { "STACK WIN" ~ text }
-
-// STACK CFI record
-// Example: "STACK CFI INIT 804c4b0 40 .cfa: $esp 4 + $eip: .cfa 4 - ^"
-// see <https://github.com/google/breakpad/blob/master/docs/symbol_files.md#stack-cfi-records>
-stack_cfi = { "STACK CFI" ~ text }
-
-// helpers
-ident = @{ XID_START ~ XID_CONTINUE{,31} }
-name = @{ text }
-text = @{ char+ }
-addr = @{ hex }
-size = @{ hex }
-dec = @{ ASCII_DIGIT+ }
-hex = @{ ASCII_HEX_DIGIT+ }
-char = @{ !NEWLINE ~ ANY }
-multiple = { "m" }
-
-// parser config
-WHITESPACE = _{ " " | "\t" }
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/breakpad.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/breakpad.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/breakpad.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/breakpad.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,9 +4,9 @@
 use std::collections::BTreeMap;
 use std::error::Error;
 use std::fmt;
+use std::ops::Range;
 use std::str;
 
-use pest::Parser;
 use thiserror::Error;
 
 use symbolic_common::{Arch, AsSelf, CodeId, DebugId, Language, Name, NameMangling};
@@ -14,16 +14,6 @@
 use crate::base::*;
 use crate::private::{Lines, Parse};
 
-mod parser {
-    use pest_derive::Parser;
-
-    #[derive(Debug, Parser)]
-    #[grammar = "breakpad.pest"]
-    pub struct BreakpadParser;
-}
-
-use self::parser::{BreakpadParser, Rule};
-
 /// Length at which the breakpad header will be capped.
 ///
 /// This is a protection against reading an entire breakpad file at once if the first characters do
@@ -35,7 +25,7 @@
 
 /// The error type for [`BreakpadError`].
 #[non_exhaustive]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum BreakpadErrorKind {
     /// The symbol header (`MODULE` record) is missing.
     InvalidMagic,
@@ -44,10 +34,19 @@
     BadEncoding,
 
     /// A record violates the Breakpad symbol syntax.
+    #[deprecated(note = "This is now covered by the Parse variant")]
     BadSyntax,
 
     /// Parsing of a record failed.
+    ///
+    /// The field exists only for API compatibility reasons.
     Parse(&'static str),
+
+    /// The module ID is invalid.
+    InvalidModuleId,
+
+    /// The architecture is invalid.
+    InvalidArchitecture,
 }
 
 impl fmt::Display for BreakpadErrorKind {
@@ -55,8 +54,10 @@
         match self {
             Self::InvalidMagic => write!(f, "missing breakpad symbol header"),
             Self::BadEncoding => write!(f, "bad utf-8 sequence"),
-            Self::BadSyntax => write!(f, "invalid syntax"),
-            Self::Parse(field) => write!(f, "{}", field),
+            Self::Parse(_) => write!(f, "parsing error"),
+            Self::InvalidModuleId => write!(f, "invalid module id"),
+            Self::InvalidArchitecture => write!(f, "invalid architecture"),
+            _ => Ok(()),
         }
     }
 }
@@ -99,9 +100,9 @@
     }
 }
 
-impl From<pest::error::Error<Rule>> for BreakpadError {
-    fn from(e: pest::error::Error<Rule>) -> Self {
-        Self::new(BreakpadErrorKind::BadSyntax, e)
+impl From<parsing::ParseBreakpadError> for BreakpadError {
+    fn from(e: parsing::ParseBreakpadError) -> Self {
+        Self::new(BreakpadErrorKind::Parse(""), e)
     }
 }
 
@@ -132,20 +133,7 @@
     /// Parses a module record from a single line.
     pub fn parse(data: &'d [u8]) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::module, string)?.next().unwrap();
-        let mut record = BreakpadModuleRecord::default();
-
-        for pair in parsed.into_inner() {
-            match pair.as_rule() {
-                Rule::os => record.os = pair.as_str(),
-                Rule::arch => record.arch = pair.as_str(),
-                Rule::debug_id => record.id = pair.as_str(),
-                Rule::name => record.name = pair.as_str(),
-                _ => unreachable!(),
-            }
-        }
-
-        Ok(record)
+        Ok(parsing::module_record_final(string.trim())?)
     }
 }
 
@@ -176,47 +164,7 @@
     /// Parses an info record from a single line.
     pub fn parse(data: &'d [u8]) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::info, string)?.next().unwrap();
-
-        for pair in parsed.into_inner() {
-            match pair.as_rule() {
-                Rule::info_code_id => return Self::code_info_from_pair(pair),
-                Rule::info_other => return Self::other_from_pair(pair),
-                _ => unreachable!(),
-            }
-        }
-
-        Err(BreakpadErrorKind::Parse("unknown INFO record").into())
-    }
-
-    fn code_info_from_pair(pair: pest::iterators::Pair<'d, Rule>) -> Result<Self, BreakpadError> {
-        let mut code_id = "";
-        let mut code_file = "";
-
-        for pair in pair.into_inner() {
-            match pair.as_rule() {
-                Rule::code_id => code_id = pair.as_str(),
-                Rule::name => code_file = pair.as_str(),
-                _ => unreachable!(),
-            }
-        }
-
-        Ok(BreakpadInfoRecord::CodeId { code_id, code_file })
-    }
-
-    fn other_from_pair(pair: pest::iterators::Pair<'d, Rule>) -> Result<Self, BreakpadError> {
-        let mut scope = "";
-        let mut info = "";
-
-        for pair in pair.into_inner() {
-            match pair.as_rule() {
-                Rule::ident => scope = pair.as_str(),
-                Rule::text => info = pair.as_str(),
-                _ => unreachable!(),
-            }
-        }
-
-        Ok(BreakpadInfoRecord::Other { scope, info })
+        Ok(parsing::info_record_final(string.trim())?)
     }
 }
 
@@ -235,7 +183,7 @@
             return None;
         }
 
-        while let Some(line) = self.lines.next() {
+        for line in &mut self.lines {
             if line.starts_with(b"MODULE ") {
                 continue;
             }
@@ -275,21 +223,7 @@
     /// Parses a file record from a single line.
     pub fn parse(data: &'d [u8]) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::file, string)?.next().unwrap();
-        let mut record = BreakpadFileRecord::default();
-
-        for pair in parsed.into_inner() {
-            match pair.as_rule() {
-                Rule::file_id => {
-                    record.id = u64::from_str_radix(pair.as_str(), 10)
-                        .map_err(|_| BreakpadErrorKind::Parse("file identifier"))?;
-                }
-                Rule::name => record.name = pair.as_str(),
-                _ => unreachable!(),
-            }
-        }
-
-        Ok(record)
+        Ok(parsing::file_record_final(string.trim())?)
     }
 }
 
@@ -308,7 +242,7 @@
             return None;
         }
 
-        while let Some(line) = self.lines.next() {
+        for line in &mut self.lines {
             if line.starts_with(b"MODULE ") || line.starts_with(b"INFO ") {
                 continue;
             }
@@ -350,30 +284,7 @@
     /// Parses a public record from a single line.
     pub fn parse(data: &'d [u8]) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::public, string)?.next().unwrap();
-        let mut record = BreakpadPublicRecord::default();
-
-        for pair in parsed.into_inner() {
-            match pair.as_rule() {
-                Rule::multiple => record.multiple = true,
-                Rule::addr => {
-                    record.address = u64::from_str_radix(pair.as_str(), 16)
-                        .map_err(|_| BreakpadErrorKind::Parse("symbol address"))?;
-                }
-                Rule::param_size => {
-                    record.parameter_size = u64::from_str_radix(pair.as_str(), 16)
-                        .map_err(|_| BreakpadErrorKind::Parse("symbol parameter size"))?;
-                }
-                Rule::name => record.name = pair.as_str(),
-                _ => unreachable!(),
-            }
-        }
-
-        if record.name.is_empty() {
-            record.name = UNKNOWN_NAME;
-        }
-
-        Ok(record)
+        Ok(parsing::public_record_final(string.trim())?)
     }
 }
 
@@ -392,7 +303,7 @@
             return None;
         }
 
-        while let Some(line) = self.lines.next() {
+        for line in &mut self.lines {
             // Fast path: PUBLIC records are always before stack records. Once we encounter the
             // first stack record, we can therefore exit.
             if line.starts_with(b"STACK ") {
@@ -439,32 +350,7 @@
     /// ends.
     pub fn parse(data: &'d [u8], lines: Lines<'d>) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::func, string)?.next().unwrap();
-        let mut record = BreakpadFuncRecord::default();
-
-        for pair in parsed.into_inner() {
-            match pair.as_rule() {
-                Rule::multiple => record.multiple = true,
-                Rule::addr => {
-                    record.address = u64::from_str_radix(pair.as_str(), 16)
-                        .map_err(|_| BreakpadErrorKind::Parse("function address"))?;
-                }
-                Rule::size => {
-                    record.size = u64::from_str_radix(pair.as_str(), 16)
-                        .map_err(|_| BreakpadErrorKind::Parse("function size"))?;
-                }
-                Rule::param_size => {
-                    record.parameter_size = u64::from_str_radix(pair.as_str(), 16)
-                        .map_err(|_| BreakpadErrorKind::Parse("function parameter size"))?;
-                }
-                Rule::name => record.name = pair.as_str(),
-                _ => unreachable!(),
-            }
-        }
-
-        if record.name.is_empty() {
-            record.name = UNKNOWN_NAME;
-        }
+        let mut record = parsing::func_record_final(string.trim())?;
 
         record.lines = lines;
         Ok(record)
@@ -477,6 +363,11 @@
             finished: false,
         }
     }
+
+    /// Returns the range of addresses covered by this record.
+    pub fn range(&self) -> Range<u64> {
+        self.address..self.address + self.size
+    }
 }
 
 impl PartialEq for BreakpadFuncRecord<'_> {
@@ -518,7 +409,7 @@
             return None;
         }
 
-        while let Some(line) = self.lines.next() {
+        for line in &mut self.lines {
             // Fast path: FUNC records are always before stack records. Once we encounter the
             // first stack record, we can therefore exit.
             if line.starts_with(b"STACK ") {
@@ -563,42 +454,18 @@
     /// Parses a line record from a single line.
     pub fn parse(data: &[u8]) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::line, string)?.next().unwrap();
-        let mut record = BreakpadLineRecord::default();
-
-        for pair in parsed.into_inner() {
-            match pair.as_rule() {
-                Rule::addr => {
-                    record.address = u64::from_str_radix(pair.as_str(), 16)
-                        .map_err(|_| BreakpadErrorKind::Parse("line address"))?;
-                }
-                Rule::size => {
-                    record.size = u64::from_str_radix(pair.as_str(), 16)
-                        .map_err(|_| BreakpadErrorKind::Parse("line size"))?;
-                }
-                Rule::line_num => {
-                    // NB: Breakpad does not allow negative line numbers and even tests that the
-                    // symbol parser rejects such line records. However, negative line numbers have
-                    // been observed at least for ELF files, so handle them gracefully.
-                    record.line = i32::from_str_radix(pair.as_str(), 10)
-                        .map(|line| u64::from(line as u32))
-                        .map_err(|_| BreakpadErrorKind::Parse("line number"))?;
-                }
-                Rule::file_id => {
-                    record.file_id = u64::from_str_radix(pair.as_str(), 10)
-                        .map_err(|_| BreakpadErrorKind::Parse("file number"))?;
-                }
-                _ => unreachable!(),
-            }
-        }
-
-        Ok(record)
+        Ok(parsing::line_record_final(string.trim())?)
     }
 
     /// Resolves the filename for this record in the file map.
     pub fn filename<'d>(&self, file_map: &BreakpadFileMap<'d>) -> Option<&'d str> {
         file_map.get(&self.file_id).cloned()
     }
+
+    /// Returns the range of addresses covered by this record.
+    pub fn range(&self) -> Range<u64> {
+        self.address..self.address + self.size
+    }
 }
 
 /// An iterator over line records in a `BreakpadFunctionRecord`.
@@ -616,7 +483,7 @@
             return None;
         }
 
-        while let Some(line) = self.lines.next() {
+        for line in &mut self.lines {
             // Stop parsing LINE records once other expected records are encountered.
             if line.starts_with(b"FUNC ")
                 || line.starts_with(b"PUBLIC ")
@@ -648,77 +515,173 @@
     }
 }
 
-/// A [call frame information record] for platforms other than Windows x86.
-///
-/// Example: `STACK CFI INIT 804c4b0 40 .cfa: $esp 4 + $eip: .cfa 4 - ^`
+/// A `STACK CFI` record. Usually associated with a [BreakpadStackCfiRecord].
+#[derive(Clone, Debug, Eq, PartialEq, Default)]
+pub struct BreakpadStackCfiDeltaRecord<'d> {
+    /// The address covered by the record.
+    pub address: u64,
+
+    /// The unwind program rules.
+    pub rules: &'d str,
+}
+
+impl<'d> BreakpadStackCfiDeltaRecord<'d> {
+    /// Parses a single `STACK CFI` record.
+    pub fn parse(data: &'d [u8]) -> Result<Self, BreakpadError> {
+        let string = str::from_utf8(data)?;
+        Ok(parsing::stack_cfi_delta_record_final(string.trim())?)
+    }
+}
+
+/// A [call frame information record](https://github.com/google/breakpad/blob/master/docs/symbol_files.md#stack-cfi-records)
+/// for platforms other than Windows x86.
 ///
-/// [call frame information record]: https://github.com/google/breakpad/blob/master/docs/symbol_files.md#stack-cfi-records
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
+/// This bundles together a `STACK CFI INIT` record and its associated `STACK CFI` records.
+#[derive(Clone, Debug, Default)]
 pub struct BreakpadStackCfiRecord<'d> {
-    /// The unwind program rules.
-    pub text: &'d str,
+    /// The starting address covered by this record.
+    pub start: u64,
+
+    /// The number of bytes covered by this record.
+    pub size: u64,
+
+    /// The unwind program rules in the `STACK CFI INIT` record.
+    pub init_rules: &'d str,
+
+    /// The `STACK CFI` records belonging to a single `STACK CFI INIT record.
+    deltas: Lines<'d>,
 }
 
 impl<'d> BreakpadStackCfiRecord<'d> {
-    /// Parses a CFI stack record from a single line.
+    /// Parses a `STACK CFI INIT` record from a single line.
     pub fn parse(data: &'d [u8]) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::stack_cfi, string)?
-            .next()
-            .unwrap();
+        Ok(parsing::stack_cfi_record_final(string.trim())?)
+    }
 
-        Self::from_pair(parsed)
+    /// Returns an iterator over this record's delta records.
+    pub fn deltas(&self) -> BreakpadStackCfiDeltaRecords<'d> {
+        BreakpadStackCfiDeltaRecords {
+            lines: self.deltas.clone(),
+        }
     }
 
-    /// Constructs a stack record directly from a Pest parser pair.
-    fn from_pair(pair: pest::iterators::Pair<'d, Rule>) -> Result<Self, BreakpadError> {
-        let mut record = BreakpadStackCfiRecord::default();
+    /// Returns the range of addresses covered by this record.
+    pub fn range(&self) -> Range<u64> {
+        self.start..self.start + self.size
+    }
+}
+
+impl<'d> PartialEq for BreakpadStackCfiRecord<'d> {
+    fn eq(&self, other: &Self) -> bool {
+        self.start == other.start && self.size == other.size && self.init_rules == other.init_rules
+    }
+}
+
+impl<'d> Eq for BreakpadStackCfiRecord<'d> {}
+
+/// An iterator over stack cfi delta records associated with a particular
+/// [`BreakpadStackCfiRecord`].
+#[derive(Clone, Debug, Default)]
+pub struct BreakpadStackCfiDeltaRecords<'d> {
+    lines: Lines<'d>,
+}
+
+impl<'d> Iterator for BreakpadStackCfiDeltaRecords<'d> {
+    type Item = Result<BreakpadStackCfiDeltaRecord<'d>, BreakpadError>;
 
-        for pair in pair.into_inner() {
-            match pair.as_rule() {
-                Rule::text => record.text = pair.as_str(),
-                _ => unreachable!(),
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(line) = self.lines.next() {
+            if line.starts_with(b"STACK CFI INIT") || !line.starts_with(b"STACK CFI") {
+                self.lines = Lines::default();
+            } else {
+                return Some(BreakpadStackCfiDeltaRecord::parse(line));
             }
         }
 
-        Ok(record)
+        None
     }
 }
 
+/// Possible types of data held by a [`BreakpadStackWinRecord`], as listed in
+/// <http://msdn.microsoft.com/en-us/library/bc5207xw%28VS.100%29.aspx>. Breakpad only deals with
+/// types 0 (`FPO`) and 4 (`FrameData`).
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum BreakpadStackWinRecordType {
+    /// Frame pointer omitted; FPO info available.
+    Fpo = 0,
+
+    /// Kernel Trap frame.
+    Trap = 1,
+
+    /// Kernel Trap frame.
+    Tss = 2,
+
+    /// Standard EBP stack frame.
+    Standard = 3,
+
+    /// Frame pointer omitted; Frame data info available.
+    FrameData = 4,
+
+    /// Frame that does not have any debug info.
+    Unknown = -1,
+}
+
 /// A [Windows stack frame record], used on x86.
 ///
 /// Example: `STACK WIN 4 2170 14 1 0 0 0 0 0 1 $eip 4 + ^ = $esp $ebp 8 + = $ebp $ebp ^ =`
 ///
 /// [Windows stack frame record]: https://github.com/google/breakpad/blob/master/docs/symbol_files.md#stack-win-records
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct BreakpadStackWinRecord<'d> {
-    /// Variables and the program string.
-    pub text: &'d str,
+    /// The type of frame data this record holds.
+    pub ty: BreakpadStackWinRecordType,
+
+    /// The starting address covered by this record, relative to the module's load address.
+    pub code_start: u32,
+
+    /// The number of bytes covered by this record.
+    pub code_size: u32,
+
+    /// The size of the prologue machine code within the record's range in bytes.
+    pub prolog_size: u16,
+
+    /// The size of the epilogue machine code within the record's range in bytes.
+    pub epilog_size: u16,
+
+    /// The number of bytes this function expects to be passed as arguments.
+    pub params_size: u32,
+
+    /// The number of bytes used by this function to save callee-saves registers.
+    pub saved_regs_size: u16,
+
+    /// The number of bytes used to save this function's local variables.
+    pub locals_size: u32,
+
+    /// The maximum number of bytes pushed on the stack in the frame.
+    pub max_stack_size: u32,
+
+    /// Whether this function uses the base pointer register as a general-purpose register.
+    ///
+    /// This is only relevant for records of type 0 (`FPO`).
+    pub uses_base_pointer: bool,
+
+    /// A string describing a program for recovering the caller's register values.
+    ///
+    /// This is only expected to be present for records of type 4 (`FrameData`).
+    pub program_string: Option<&'d str>,
 }
 
 impl<'d> BreakpadStackWinRecord<'d> {
     /// Parses a Windows stack record from a single line.
     pub fn parse(data: &'d [u8]) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::stack_win, string)?
-            .next()
-            .unwrap();
-
-        Self::from_pair(parsed)
+        Ok(parsing::stack_win_record_final(string.trim())?)
     }
 
-    // Constructs a stack record directly from a Pest parser pair.
-    fn from_pair(pair: pest::iterators::Pair<'d, Rule>) -> Result<Self, BreakpadError> {
-        let mut record = BreakpadStackWinRecord::default();
-
-        for pair in pair.into_inner() {
-            match pair.as_rule() {
-                Rule::text => record.text = pair.as_str(),
-                _ => unreachable!(),
-            }
-        }
-
-        Ok(record)
+    /// Returns the range of addresses covered by this record.
+    pub fn code_range(&self) -> Range<u32> {
+        self.code_start..self.code_start + self.code_size
     }
 }
 
@@ -735,14 +698,7 @@
     /// Parses a stack frame information record from a single line.
     pub fn parse(data: &'d [u8]) -> Result<Self, BreakpadError> {
         let string = str::from_utf8(data)?;
-        let parsed = BreakpadParser::parse(Rule::stack, string)?.next().unwrap();
-        let pair = parsed.into_inner().next().unwrap();
-
-        Ok(match pair.as_rule() {
-            Rule::stack_cfi => BreakpadStackRecord::Cfi(BreakpadStackCfiRecord::from_pair(pair)?),
-            Rule::stack_win => BreakpadStackRecord::Win(BreakpadStackWinRecord::from_pair(pair)?),
-            _ => unreachable!(),
-        })
+        Ok(parsing::stack_record_final(string.trim())?)
     }
 }
 
@@ -753,6 +709,16 @@
     finished: bool,
 }
 
+impl<'d> BreakpadStackRecords<'d> {
+    /// Creates an iterator over [`BreakpadStackRecord`]s contained in a slice of data.
+    pub fn new(data: &'d [u8]) -> Self {
+        Self {
+            lines: Lines::new(data),
+            finished: false,
+        }
+    }
+}
+
 impl<'d> Iterator for BreakpadStackRecords<'d> {
     type Item = Result<BreakpadStackRecord<'d>, BreakpadError>;
 
@@ -762,9 +728,16 @@
         }
 
         while let Some(line) = self.lines.next() {
-            if line.starts_with(b"STACK ") {
+            if line.starts_with(b"STACK WIN") {
                 return Some(BreakpadStackRecord::parse(line));
             }
+
+            if line.starts_with(b"STACK CFI INIT") {
+                return Some(BreakpadStackCfiRecord::parse(line).map(|mut r| {
+                    r.deltas = self.lines.clone();
+                    BreakpadStackRecord::Cfi(r)
+                }));
+            }
         }
 
         self.finished = true;
@@ -814,17 +787,18 @@
             data
         };
 
-        let module = BreakpadModuleRecord::parse(header)?;
+        let first_line = header.split(|b| *b == b'\n').next().unwrap_or_default();
+        let module = BreakpadModuleRecord::parse(first_line)?;
 
         Ok(BreakpadObject {
             id: module
                 .id
                 .parse()
-                .map_err(|_| BreakpadErrorKind::Parse("module id"))?,
+                .map_err(|_| BreakpadErrorKind::InvalidModuleId)?,
             arch: module
                 .arch
                 .parse()
-                .map_err(|_| BreakpadErrorKind::Parse("module architecture"))?,
+                .map_err(|_| BreakpadErrorKind::InvalidArchitecture)?,
             module,
             data,
         })
@@ -837,12 +811,10 @@
 
     /// The code identifier of this object.
     pub fn code_id(&self) -> Option<CodeId> {
-        for result in self.info_records() {
-            if let Ok(record) = result {
-                if let BreakpadInfoRecord::CodeId { code_id, .. } = record {
-                    if !code_id.is_empty() {
-                        return Some(CodeId::new(code_id.into()));
-                    }
+        for result in self.info_records().flatten() {
+            if let BreakpadInfoRecord::CodeId { code_id, .. } = result {
+                if !code_id.is_empty() {
+                    return Some(CodeId::new(code_id.into()));
                 }
             }
         }
@@ -1087,17 +1059,11 @@
     type Item = Symbol<'data>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        while let Some(result) = self.records.next() {
-            if let Ok(record) = result {
-                return Some(Symbol {
-                    name: Some(Cow::Borrowed(record.name)),
-                    address: record.address,
-                    size: 0,
-                });
-            }
-        }
-
-        None
+        self.records.find_map(Result::ok).map(|record| Symbol {
+            name: Some(Cow::Borrowed(record.name)),
+            address: record.address,
+            size: 0,
+        })
     }
 }
 
@@ -1177,7 +1143,7 @@
         let mut lines = Vec::new();
         for line in record.lines() {
             let line = line?;
-            let filename = line.filename(&self.file_map).unwrap_or_default();
+            let filename = line.filename(self.file_map).unwrap_or_default();
 
             lines.push(LineInfo {
                 address: line.address,
@@ -1213,6 +1179,544 @@
 
 impl std::iter::FusedIterator for BreakpadFunctionIterator<'_> {}
 
+mod parsing {
+    use nom::branch::alt;
+    use nom::bytes::complete::take_while;
+    use nom::character::complete::{char, hex_digit1, multispace1};
+    use nom::combinator::{cond, eof, rest};
+    use nom::sequence::{pair, tuple};
+    use nom::{IResult, Parser};
+    use nom_supreme::error::ErrorTree;
+    use nom_supreme::final_parser::{Location, RecreateContext};
+    use nom_supreme::parser_ext::ParserExt;
+    use nom_supreme::tag::complete::tag;
+
+    use super::*;
+
+    type ParseResult<'a, T> = IResult<&'a str, T, ErrorTree<&'a str>>;
+    pub type ParseBreakpadError = ErrorTree<ErrorLine>;
+
+    /// A line with a 1-based column position, used for displaying errors.
+    ///
+    /// With the default formatter, this prints the line followed by the column number.
+    /// With the alternate formatter (using `:#`), it prints the line and a caret
+    /// pointing at the column position.
+    ///
+    /// # Example
+    /// ```ignore
+    /// use symbolic_debuginfo::breakpad::parsing::ErrorLine;
+    ///
+    /// let error_line = ErrorLine {
+    ///     line: "This line cnotains a typo.".to_string(),
+    ///     column: 12,
+    /// };
+    ///
+    /// // "This line cnotains a typo.", column 12
+    /// println!("{}", error_line);
+    ///
+    /// // "This line cnotains a typo."
+    /// //             ^
+    /// println!("{:#}", error_line);
+    /// ```
+    #[derive(Clone, Debug, PartialEq, Eq)]
+    pub struct ErrorLine {
+        /// A line of text containing an error.
+        pub line: String,
+
+        /// The position of the error, 1-based.
+        pub column: usize,
+    }
+
+    impl<'a> RecreateContext<&'a str> for ErrorLine {
+        fn recreate_context(original_input: &'a str, tail: &'a str) -> Self {
+            let Location { column, .. } = Location::recreate_context(original_input, tail);
+            Self {
+                line: original_input.to_string(),
+                column,
+            }
+        }
+    }
+
+    impl fmt::Display for ErrorLine {
+        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            if f.alternate() {
+                writeln!(f)?;
+            }
+
+            write!(f, "\"{}\"", self.line)?;
+
+            if f.alternate() {
+                writeln!(f, "\n{:>width$}", "^", width = self.column + 1)?;
+            } else {
+                write!(f, ", column {}", self.column)?;
+            }
+
+            Ok(())
+        }
+    }
+
+    /// Parse a sequence of decimal digits as a number of the given type.
+    macro_rules! num_dec {
+        ($ty:ty) => {
+            nom::character::complete::digit1.map_res(|s: &str| s.parse::<$ty>())
+        };
+    }
+
+    /// Parse a sequence of hexadecimal digits as a number of the given type.
+    macro_rules! num_hex {
+        ($ty:ty) => {
+            nom::character::complete::hex_digit1.map_res(|n| <$ty>::from_str_radix(n, 16))
+        };
+    }
+
+    /// Parse a sequence of non-whitespace characters.
+    fn non_whitespace(input: &str) -> ParseResult<&str> {
+        take_while(|c: char| !c.is_whitespace())(input)
+    }
+
+    /// Parse to the end of input and return the resulting string.
+    ///
+    /// If there is no input, return [`UNKNOWN_NAME`] instead.
+    fn name(input: &str) -> ParseResult<&str> {
+        rest.map(|name: &str| if name.is_empty() { UNKNOWN_NAME } else { name })
+            .parse(input)
+    }
+
+    /// Attempt to parse the character `m` followed by one or more spaces.
+    ///
+    /// Returns true if the parse was successful.
+    fn multiple(input: &str) -> ParseResult<bool> {
+        let (mut input, multiple) = char('m').opt().parse(input)?;
+        let multiple = multiple.is_some();
+        if multiple {
+            input = multispace1(input)?.0;
+        }
+        Ok((input, multiple))
+    }
+
+    /// Parse a line number as a signed decimal number and return `max(0, n)`.
+    fn line_num(input: &str) -> ParseResult<u64> {
+        pair(char('-').opt(), num_dec!(u64))
+            .map(|(sign, num)| if sign.is_some() { 0 } else { num })
+            .parse(input)
+    }
+
+    /// Parse a [`BreakpadStackWinRecordType`].
+    fn stack_win_record_type(input: &str) -> ParseResult<BreakpadStackWinRecordType> {
+        alt((
+            char('0').value(BreakpadStackWinRecordType::Fpo),
+            char('1').value(BreakpadStackWinRecordType::Trap),
+            char('2').value(BreakpadStackWinRecordType::Tss),
+            char('3').value(BreakpadStackWinRecordType::Standard),
+            char('4').value(BreakpadStackWinRecordType::FrameData),
+            non_whitespace.value(BreakpadStackWinRecordType::Unknown),
+        ))(input)
+    }
+
+    /// Parse a [`BreakpadModuleRecord`].
+    ///
+    /// A module record has the form `MODULE <os> <arch> <id>( <name>)?`.
+    fn module_record(input: &str) -> ParseResult<BreakpadModuleRecord> {
+        let (input, _) = tag("MODULE")
+            .terminated(multispace1)
+            .context("module record prefix")
+            .parse(input)?;
+        let (input, (os, arch, id, name)) = tuple((
+            non_whitespace.terminated(multispace1).context("os"),
+            non_whitespace.terminated(multispace1).context("arch"),
+            hex_digit1
+                .terminated(multispace1.or(eof))
+                .context("module id"),
+            name.context("module name"),
+        ))
+        .cut()
+        .context("module record body")
+        .parse(input)?;
+
+        Ok((input, BreakpadModuleRecord { os, arch, id, name }))
+    }
+
+    /// Parse a [`BreakpadModuleRecord`].
+    ///
+    /// A module record has the form `MODULE <os> <arch> <id>( <name>)?`.
+    /// This will fail if there is any input left over after the record.
+    pub fn module_record_final(input: &str) -> Result<BreakpadModuleRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(module_record)(input)
+    }
+
+    /// Parse the `CodeId` variant of a [`BreakpadInfoRecord`].
+    ///
+    /// A `CodeId` record has the form `CODE_ID <code_id>( <code_file>)?`.
+    fn info_code_id_record(input: &str) -> ParseResult<BreakpadInfoRecord> {
+        let (input, _) = tag("CODE_ID")
+            .terminated(multispace1)
+            .context("info code_id record prefix")
+            .parse(input)?;
+
+        let (input, (code_id, code_file)) = pair(
+            hex_digit1
+                .terminated(multispace1.or(eof))
+                .context("code id"),
+            name.context("file name"),
+        )
+        .cut()
+        .context("info code_id record body")
+        .parse(input)?;
+
+        Ok((input, BreakpadInfoRecord::CodeId { code_id, code_file }))
+    }
+
+    /// Parse the `Other` variant of a [`BreakpadInfoRecord`].
+    ///
+    /// An `Other` record has the form `<scope>( <info>)?`.
+    fn info_other_record(input: &str) -> ParseResult<BreakpadInfoRecord> {
+        let (input, (scope, info)) = pair(
+            non_whitespace
+                .terminated(multispace1.or(eof))
+                .context("info scope"),
+            rest,
+        )
+        .cut()
+        .context("info other record body")
+        .parse(input)?;
+
+        Ok((input, BreakpadInfoRecord::Other { scope, info }))
+    }
+
+    /// Parse a [`BreakpadInfoRecord`].
+    ///
+    /// An INFO record has the form `INFO (<code_id_record> | <other_record>)`.
+    fn info_record(input: &str) -> ParseResult<BreakpadInfoRecord> {
+        let (input, _) = tag("INFO")
+            .terminated(multispace1)
+            .context("info record prefix")
+            .parse(input)?;
+
+        info_code_id_record
+            .or(info_other_record)
+            .cut()
+            .context("info record body")
+            .parse(input)
+    }
+
+    /// Parse a [`BreakpadInfoRecord`].
+    ///
+    /// An INFO record has the form `INFO (<code_id_record> | <other_record>)`.
+    /// This will fail if there is any input left over after the record.
+    pub fn info_record_final(input: &str) -> Result<BreakpadInfoRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(info_record)(input)
+    }
+
+    /// Parse a [`BreakpadFileRecord`].
+    ///
+    /// A FILE record has the form `FILE <id>( <name>)?`.
+    fn file_record(input: &str) -> ParseResult<BreakpadFileRecord> {
+        let (input, _) = tag("FILE")
+            .terminated(multispace1)
+            .context("file record prefix")
+            .parse(input)?;
+
+        let (input, (id, name)) = pair(
+            num_dec!(u64)
+                .terminated(multispace1.or(eof))
+                .context("file id"),
+            rest.context("file name"),
+        )
+        .cut()
+        .context("file record body")
+        .parse(input)?;
+
+        Ok((input, BreakpadFileRecord { id, name }))
+    }
+
+    /// Parse a [`BreakpadFileRecord`].
+    ///
+    /// A FILE record has the form `FILE <id>( <name>)?`.
+    /// This will fail if there is any input left over after the record.
+    pub fn file_record_final(input: &str) -> Result<BreakpadFileRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(file_record)(input)
+    }
+
+    /// Parse a [`BreakpadPublicRecord`].
+    ///
+    /// A PUBLIC record has the form `PUBLIC (m )? <address> <parameter_size> ( <name>)?`.
+    fn public_record(input: &str) -> ParseResult<BreakpadPublicRecord> {
+        let (input, _) = tag("PUBLIC")
+            .terminated(multispace1)
+            .context("public record prefix")
+            .parse(input)?;
+
+        let (input, (multiple, address, parameter_size, name)) = tuple((
+            multiple.context("multiple flag"),
+            num_hex!(u64).terminated(multispace1).context("address"),
+            num_hex!(u64)
+                .terminated(multispace1.or(eof))
+                .context("param size"),
+            name.context("symbol name"),
+        ))
+        .cut()
+        .context("public record body")
+        .parse(input)?;
+
+        Ok((
+            input,
+            BreakpadPublicRecord {
+                multiple,
+                address,
+                parameter_size,
+                name,
+            },
+        ))
+    }
+
+    /// Parse a [`BreakpadPublicRecord`].
+    ///
+    /// A PUBLIC record has the form `PUBLIC (m )? <address> <parameter_size> ( <name>)?`.
+    /// This will fail if there is any input left over after the record.
+    pub fn public_record_final(input: &str) -> Result<BreakpadPublicRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(public_record)(input)
+    }
+
+    /// Parse a [`BreakpadFuncRecord`].
+    ///
+    /// A FUNC record has the form `FUNC (m )? <address> <size> <parameter_size> ( <name>)?`.
+    fn func_record(input: &str) -> ParseResult<BreakpadFuncRecord> {
+        let (input, _) = tag("FUNC")
+            .terminated(multispace1)
+            .context("func record prefix")
+            .parse(input)?;
+
+        let (input, (multiple, address, size, parameter_size, name)) = tuple((
+            multiple.context("multiple flag"),
+            num_hex!(u64).terminated(multispace1).context("address"),
+            num_hex!(u64).terminated(multispace1).context("size"),
+            num_hex!(u64)
+                .terminated(multispace1.or(eof))
+                .context("param size"),
+            name.context("symbol name"),
+        ))
+        .cut()
+        .context("func record body")
+        .parse(input)?;
+
+        Ok((
+            input,
+            BreakpadFuncRecord {
+                multiple,
+                address,
+                size,
+                parameter_size,
+                name,
+                lines: Lines::default(),
+            },
+        ))
+    }
+
+    /// Parse a [`BreakpadFuncRecord`].
+    ///
+    /// A FUNC record has the form `FUNC (m )? <address> <size> <parameter_size> ( <name>)?`.
+    /// This will fail if there is any input left over after the record.
+    pub fn func_record_final(input: &str) -> Result<BreakpadFuncRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(func_record)(input)
+    }
+
+    /// Parse a [`BreakpadLineRecord`].
+    ///
+    /// A LINE record has the form `<address> <size> <line> <file_id>`.
+    fn line_record(input: &str) -> ParseResult<BreakpadLineRecord> {
+        let (input, (address, size, line, file_id)) = tuple((
+            num_hex!(u64).terminated(multispace1).context("address"),
+            num_hex!(u64).terminated(multispace1).context("size"),
+            line_num.terminated(multispace1).context("line number"),
+            num_dec!(u64).context("file id"),
+        ))
+        .context("line record")
+        .parse(input)?;
+
+        Ok((
+            input,
+            BreakpadLineRecord {
+                address,
+                size,
+                line,
+                file_id,
+            },
+        ))
+    }
+
+    /// Parse a [`BreakpadLineRecord`].
+    ///
+    /// A LINE record has the form `<address> <size> <line> <file_id>`.
+    /// This will fail if there is any input left over after the record.
+    pub fn line_record_final(input: &str) -> Result<BreakpadLineRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(line_record)(input)
+    }
+
+    /// Parse a [`BreakpadStackCfiDeltaRecord`].
+    ///
+    /// A STACK CFI Delta record has the form `STACK CFI <address> <rules>`.
+    fn stack_cfi_delta_record(input: &str) -> ParseResult<BreakpadStackCfiDeltaRecord> {
+        let (input, _) = tag("STACK CFI")
+            .terminated(multispace1)
+            .context("stack cfi prefix")
+            .parse(input)?;
+
+        let (input, (address, rules)) = pair(
+            num_hex!(u64).terminated(multispace1).context("address"),
+            rest.context("rules"),
+        )
+        .cut()
+        .context("stack cfi delta record body")
+        .parse(input)?;
+
+        Ok((input, BreakpadStackCfiDeltaRecord { address, rules }))
+    }
+
+    /// Parse a [`BreakpadStackCfiDeltaRecord`].
+    ///
+    /// A STACK CFI Delta record has the form `STACK CFI <address> <rules>`.
+    /// This will fail if there is any input left over after the record.
+    pub fn stack_cfi_delta_record_final(
+        input: &str,
+    ) -> Result<BreakpadStackCfiDeltaRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(stack_cfi_delta_record)(input)
+    }
+
+    /// Parse a [`BreakpadStackCfiRecord`].
+    ///
+    /// A STACK CFI INIT record has the form `STACK CFI INIT <address> <size> <init_rules>`.
+    fn stack_cfi_record(input: &str) -> ParseResult<BreakpadStackCfiRecord> {
+        let (input, _) = tag("STACK CFI INIT")
+            .terminated(multispace1)
+            .context("stack cfi init  prefix")
+            .parse(input)?;
+
+        let (input, (start, size, init_rules)) = tuple((
+            num_hex!(u64).terminated(multispace1).context("start"),
+            num_hex!(u64).terminated(multispace1).context("size"),
+            rest.context("rules"),
+        ))
+        .cut()
+        .context("stack cfi record body")
+        .parse(input)?;
+
+        Ok((
+            input,
+            BreakpadStackCfiRecord {
+                start,
+                size,
+                init_rules,
+                deltas: Lines::default(),
+            },
+        ))
+    }
+
+    /// Parse a [`BreakpadStackCfiRecord`].
+    ///
+    /// A STACK CFI INIT record has the form `STACK CFI INIT <address> <size> <init_rules>`.
+    /// This will fail if there is any input left over after the record.
+    pub fn stack_cfi_record_final(
+        input: &str,
+    ) -> Result<BreakpadStackCfiRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(stack_cfi_record)(input)
+    }
+
+    /// Parse a [`BreakpadStackWinRecord`].
+    ///
+    /// A STACK WIN record has the form
+    /// `STACK WIN <ty> <code_start> <code_size> <prolog_size> <epilog_size> <params_size> <saved_regs_size> <locals_size> <max_stack_size> <has_program_string> (<program_string> | <uses_base_pointer>)`.
+    fn stack_win_record(input: &str) -> ParseResult<BreakpadStackWinRecord> {
+        let (input, _) = tag("STACK WIN")
+            .terminated(multispace1)
+            .context("stack win prefix")
+            .parse(input)?;
+
+        let (
+            input,
+            (
+                ty,
+                code_start,
+                code_size,
+                prolog_size,
+                epilog_size,
+                params_size,
+                saved_regs_size,
+                locals_size,
+                max_stack_size,
+                has_program_string,
+            ),
+        ) = tuple((
+            stack_win_record_type
+                .terminated(multispace1)
+                .context("record type"),
+            num_hex!(u32).terminated(multispace1).context("code start"),
+            num_hex!(u32).terminated(multispace1).context("code size"),
+            num_hex!(u16).terminated(multispace1).context("prolog size"),
+            num_hex!(u16).terminated(multispace1).context("epilog size"),
+            num_hex!(u32).terminated(multispace1).context("params size"),
+            num_hex!(u16)
+                .terminated(multispace1)
+                .context("saved regs size"),
+            num_hex!(u32).terminated(multispace1).context("locals size"),
+            num_hex!(u32)
+                .terminated(multispace1)
+                .context("max stack size"),
+            non_whitespace
+                .map(|s| s != "0")
+                .terminated(multispace1)
+                .context("has_program_string"),
+        ))
+        .cut()
+        .context("stack win record body")
+        .parse(input)?;
+
+        let (input, program_string) =
+            cond(has_program_string, rest.context("program string"))(input)?;
+        let (input, uses_base_pointer) =
+            cond(!has_program_string, non_whitespace.map(|s| s != "0"))
+                .map(|o| o.unwrap_or(false))
+                .parse(input)?;
+
+        Ok((
+            input,
+            BreakpadStackWinRecord {
+                ty,
+                code_start,
+                code_size,
+                prolog_size,
+                epilog_size,
+                params_size,
+                saved_regs_size,
+                locals_size,
+                max_stack_size,
+                uses_base_pointer,
+                program_string,
+            },
+        ))
+    }
+
+    /// Parse a [`BreakpadStackWinRecord`].
+    ///
+    /// A STACK WIN record has the form
+    /// `STACK WIN <ty> <code_start> <code_size> <prolog_size> <epilog_size> <params_size> <saved_regs_size> <locals_size> <max_stack_size> <has_program_string> (<program_string> | <uses_base_pointer>)`.
+    /// This will fail if there is any input left over after the record.
+    pub fn stack_win_record_final(
+        input: &str,
+    ) -> Result<BreakpadStackWinRecord, ErrorTree<ErrorLine>> {
+        nom_supreme::final_parser::final_parser(stack_win_record)(input)
+    }
+
+    /// Parse a [`BreakpadStackRecord`], containing either a [`BreakpadStackCfiRecord`] or a
+    /// [`BreakpadStackWinRecord`].
+    ///
+    /// This will fail if there is any input left over after the record.
+    pub fn stack_record_final(input: &str) -> Result<BreakpadStackRecord, ParseBreakpadError> {
+        nom_supreme::final_parser::final_parser(alt((
+            stack_cfi_record.map(BreakpadStackRecord::Cfi),
+            stack_win_record.map(BreakpadStackRecord::Win),
+        )))(input)
+    }
+}
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1360,12 +1864,31 @@
         let record = BreakpadLineRecord::parse(string)?;
 
         insta::assert_debug_snapshot!(record, @r###"
-       â‹®BreakpadLineRecord {
-       â‹®    address: 14744848,
-       â‹®    size: 5,
-       â‹®    line: 4294966920,
-       â‹®    file_id: 2225,
-       â‹®}
+        BreakpadLineRecord {
+            address: 14744848,
+            size: 5,
+            line: 0,
+            file_id: 2225,
+        }
+        "###);
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_parse_line_record_whitespace() -> Result<(), BreakpadError> {
+        let string = b"    1000 1c 2972 2
+";
+        let record = BreakpadLineRecord::parse(string)?;
+
+        insta::assert_debug_snapshot!(
+            record, @r###"
+        BreakpadLineRecord {
+            address: 4096,
+            size: 28,
+            line: 2972,
+            file_id: 2,
+        }
         "###);
 
         Ok(())
@@ -1423,16 +1946,25 @@
     }
 
     #[test]
-    fn test_parse_stack_cfi_record() -> Result<(), BreakpadError> {
+    fn test_parse_stack_cfi_init_record() -> Result<(), BreakpadError> {
         let string = b"STACK CFI INIT 1880 2d .cfa: $rsp 8 + .ra: .cfa -8 + ^";
         let record = BreakpadStackRecord::parse(string)?;
 
         insta::assert_debug_snapshot!(record, @r###"
-       â‹®Cfi(
-       â‹®    BreakpadStackCfiRecord {
-       â‹®        text: "INIT 1880 2d .cfa: $rsp 8 + .ra: .cfa -8 + ^",
-       â‹®    },
-       â‹®)
+        Cfi(
+            BreakpadStackCfiRecord {
+                start: 6272,
+                size: 45,
+                init_rules: ".cfa: $rsp 8 + .ra: .cfa -8 + ^",
+                deltas: Lines(
+                    LineOffsets {
+                        data: [],
+                        finished: true,
+                        index: 0,
+                    },
+                ),
+            },
+        )
         "###);
 
         Ok(())
@@ -1445,13 +1977,78 @@
         let record = BreakpadStackRecord::parse(string)?;
 
         insta::assert_debug_snapshot!(record, @r###"
-       â‹®Win(
-       â‹®    BreakpadStackWinRecord {
-       â‹®        text: "4 371a c 0 0 0 0 0 0 1 $T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + =",
-       â‹®    },
-       â‹®)
+        Win(
+            BreakpadStackWinRecord {
+                ty: FrameData,
+                code_start: 14106,
+                code_size: 12,
+                prolog_size: 0,
+                epilog_size: 0,
+                params_size: 0,
+                saved_regs_size: 0,
+                locals_size: 0,
+                max_stack_size: 0,
+                uses_base_pointer: false,
+                program_string: Some(
+                    "$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + =",
+                ),
+            },
+        )
+        "###);
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_parse_stack_win_record_type_3() -> Result<(), BreakpadError> {
+        let string = b"STACK WIN 3 8a10b ec b 0 c c 4 0 0 1";
+        let record = BreakpadStackWinRecord::parse(string)?;
+
+        insta::assert_debug_snapshot!(record, @r###"
+        BreakpadStackWinRecord {
+            ty: Standard,
+            code_start: 565515,
+            code_size: 236,
+            prolog_size: 11,
+            epilog_size: 0,
+            params_size: 12,
+            saved_regs_size: 12,
+            locals_size: 4,
+            max_stack_size: 0,
+            uses_base_pointer: true,
+            program_string: None,
+        }
         "###);
 
         Ok(())
     }
+
+    #[test]
+    fn test_parse_stack_win_whitespace() -> Result<(), BreakpadError> {
+        let string =
+            b"     STACK WIN 4 371a c 0 0 0 0 0 0 1 $T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + =
+                ";
+        let record = BreakpadStackRecord::parse(string)?;
+
+        insta::assert_debug_snapshot!(record, @r###"
+        Win(
+            BreakpadStackWinRecord {
+                ty: FrameData,
+                code_start: 14106,
+                code_size: 12,
+                prolog_size: 0,
+                epilog_size: 0,
+                params_size: 0,
+                saved_regs_size: 0,
+                locals_size: 0,
+                max_stack_size: 0,
+                uses_base_pointer: false,
+                program_string: Some(
+                    "$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + =",
+                ),
+            },
+        )
+        "###);
+        Ok(())
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/dwarf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/dwarf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/dwarf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/dwarf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,20 +8,23 @@
 //! [`MachObject`]: ../macho/struct.MachObject.html
 
 use std::borrow::Cow;
+use std::collections::BTreeSet;
 use std::error::Error;
 use std::fmt;
 use std::marker::PhantomData;
 use std::ops::{Deref, RangeBounds};
+use std::sync::Arc;
 
 use fallible_iterator::FallibleIterator;
 use gimli::read::{AttributeValue, Error as GimliError, Range};
-use gimli::{constants, UnitSectionOffset};
+use gimli::{constants, DwarfFileType, UnitSectionOffset};
 use lazycell::LazyCell;
 use thiserror::Error;
 
 use symbolic_common::{AsSelf, Language, Name, NameMangling, SelfCell};
 
 use crate::base::*;
+use crate::macho::BcSymbolMap;
 use crate::private::FunctionStack;
 
 #[doc(hidden)]
@@ -38,7 +41,7 @@
 type UnitOffset = gimli::read::UnitOffset<usize>;
 type DebugInfoOffset = gimli::DebugInfoOffset<usize>;
 
-type CompilationUnitHeader<'a> = gimli::read::CompilationUnitHeader<Slice<'a>>;
+type UnitHeader<'a> = gimli::read::UnitHeader<Slice<'a>>;
 type IncompleteLineNumberProgram<'a> = gimli::read::IncompleteLineProgram<Slice<'a>>;
 type LineNumberProgramHeader<'a> = gimli::read::LineProgramHeader<Slice<'a>>;
 type LineProgramFileEntry<'a> = gimli::read::FileEntry<Slice<'a>>;
@@ -223,7 +226,7 @@
 }
 
 impl<'d, 'a> DwarfLineProgram<'d> {
-    fn prepare(program: IncompleteLineNumberProgram<'d>) -> Result<Self, DwarfError> {
+    fn prepare(program: IncompleteLineNumberProgram<'d>) -> Self {
         let mut sequences = Vec::new();
         let mut sequence_rows = Vec::<DwarfRow>::new();
         let mut prev_address = 0;
@@ -271,7 +274,7 @@
                 // here, but let's wait until that is needed.
             } else {
                 let file_index = program_row.file_index();
-                let line = program_row.line();
+                let line = program_row.line().map(|v| v.get());
                 let mut duplicate = false;
                 if let Some(last_row) = sequence_rows.last_mut() {
                     if last_row.address == address {
@@ -307,10 +310,10 @@
         // Sequences are not guaranteed to be in order.
         dmsort::sort_by_key(&mut sequences, |x| x.start);
 
-        Ok(DwarfLineProgram {
+        DwarfLineProgram {
             header: state_machine.header().clone(),
             sequences,
-        })
+        }
     }
 
     pub fn get_rows(&self, range: &Range) -> &[DwarfRow] {
@@ -383,11 +386,17 @@
         }
     }
 
+    /// Returns the offset of this unit within its section.
+    fn offset(&self) -> UnitSectionOffset {
+        self.unit.header.offset()
+    }
+
     /// Resolves the function name of a debug entry.
     fn resolve_function_name(
         &self,
         entry: &Die<'d, '_>,
         language: Language,
+        bcsymbolmap: Option<&'d BcSymbolMap<'d>>,
     ) -> Result<Option<Name<'d>>, DwarfError> {
         let mut attrs = entry.attrs();
         let mut fallback_name = None;
@@ -399,6 +408,7 @@
                 constants::DW_AT_linkage_name | constants::DW_AT_MIPS_linkage_name => {
                     return Ok(self
                         .string_value(attr.value())
+                        .map(|n| resolve_cow_name(bcsymbolmap, n))
                         .map(|n| Name::new(n, NameMangling::Mangled, language)));
                 }
                 constants::DW_AT_name => {
@@ -414,14 +424,14 @@
         if let Some(attr) = fallback_name {
             return Ok(self
                 .string_value(attr.value())
+                .map(|n| resolve_cow_name(bcsymbolmap, n))
                 .map(|n| Name::new(n, NameMangling::Unmangled, language)));
         }
 
         if let Some(attr) = reference_target {
             return self.resolve_reference(attr, |ref_unit, ref_entry| {
-                if self.unit.offset != ref_unit.unit.offset || entry.offset() != ref_entry.offset()
-                {
-                    ref_unit.resolve_function_name(ref_entry, language)
+                if self.offset() != ref_unit.offset() || entry.offset() != ref_entry.offset() {
+                    ref_unit.resolve_function_name(ref_entry, language, bcsymbolmap)
                 } else {
                     Ok(None)
                 }
@@ -436,6 +446,7 @@
 #[derive(Debug)]
 struct DwarfUnit<'d, 'a> {
     inner: UnitRef<'d, 'a>,
+    bcsymbolmap: Option<&'d BcSymbolMap<'d>>,
     language: Language,
     line_program: Option<DwarfLineProgram<'d>>,
     prefer_dwarf_names: bool,
@@ -443,7 +454,11 @@
 
 impl<'d, 'a> DwarfUnit<'d, 'a> {
     /// Creates a DWARF unit from the gimli `Unit` type.
-    fn from_unit(unit: &'a Unit<'d>, info: &'a DwarfInfo<'d>) -> Result<Option<Self>, DwarfError> {
+    fn from_unit(
+        unit: &'a Unit<'d>,
+        info: &'a DwarfInfo<'d>,
+        bcsymbolmap: Option<&'d BcSymbolMap<'d>>,
+    ) -> Result<Option<Self>, DwarfError> {
         let mut entries = unit.entries();
         let entry = match entries.next_dfs()? {
             Some((_, entry)) => entry,
@@ -466,10 +481,10 @@
             _ => Language::Unknown,
         };
 
-        let line_program = match unit.line_program {
-            Some(ref program) => Some(DwarfLineProgram::prepare(program.clone())?),
-            None => None,
-        };
+        let line_program = unit
+            .line_program
+            .as_ref()
+            .map(|program| DwarfLineProgram::prepare(program.clone()));
 
         let producer = match entry.attr_value(constants::DW_AT_producer)? {
             Some(AttributeValue::String(string)) => Some(string),
@@ -482,6 +497,7 @@
 
         Ok(Some(DwarfUnit {
             inner: UnitRef { info, unit },
+            bcsymbolmap,
             language,
             line_program,
             prefer_dwarf_names,
@@ -491,7 +507,7 @@
     /// The path of the compilation directory. File names are usually relative to this path.
     fn compilation_dir(&self) -> &'d [u8] {
         match self.inner.unit.comp_dir {
-            Some(ref dir) => dir.slice(),
+            Some(ref dir) => resolve_byte_name(self.bcsymbolmap, dir.slice()),
             None => &[],
         }
     }
@@ -512,20 +528,26 @@
             match attr.name() {
                 constants::DW_AT_low_pc => match attr.value() {
                     AttributeValue::Addr(addr) => low_pc = Some(addr),
-                    _ => unreachable!(),
+                    AttributeValue::DebugAddrIndex(index) => {
+                        low_pc = Some(self.inner.info.address(self.inner.unit, index)?)
+                    }
+                    _ => return Err(GimliError::UnsupportedAttributeForm.into()),
                 },
                 constants::DW_AT_high_pc => match attr.value() {
                     AttributeValue::Addr(addr) => high_pc = Some(addr),
+                    AttributeValue::DebugAddrIndex(index) => {
+                        low_pc = Some(self.inner.info.address(self.inner.unit, index)?)
+                    }
                     AttributeValue::Udata(size) => high_pc_rel = Some(size),
-                    _ => unreachable!(),
+                    _ => return Err(GimliError::UnsupportedAttributeForm.into()),
                 },
                 constants::DW_AT_call_line => match attr.value() {
                     AttributeValue::Udata(line) => tuple.0 = Some(line),
-                    _ => unreachable!(),
+                    _ => return Err(GimliError::UnsupportedAttributeForm.into()),
                 },
                 constants::DW_AT_call_file => match attr.value() {
                     AttributeValue::FileIndex(file) => tuple.1 = Some(file),
-                    _ => unreachable!(),
+                    _ => return Err(GimliError::UnsupportedAttributeForm.into()),
                 },
                 constants::DW_AT_ranges
                 | constants::DW_AT_rnglists_base
@@ -663,11 +685,16 @@
         file: &LineProgramFileEntry<'d>,
     ) -> FileInfo<'d> {
         FileInfo {
-            dir: file
-                .directory(line_program)
-                .and_then(|attr| self.inner.slice_value(attr))
-                .unwrap_or_default(),
-            name: self.inner.slice_value(file.path_name()).unwrap_or_default(),
+            dir: resolve_byte_name(
+                self.bcsymbolmap,
+                file.directory(line_program)
+                    .and_then(|attr| self.inner.slice_value(attr))
+                    .unwrap_or_default(),
+            ),
+            name: resolve_byte_name(
+                self.bcsymbolmap,
+                self.inner.slice_value(file.path_name()).unwrap_or_default(),
+            ),
         }
     }
 
@@ -689,20 +716,24 @@
         R: RangeBounds<u64>,
     {
         let symbol = self.inner.info.symbol_map.lookup_range(range)?;
-        let name = symbol.name.clone()?;
+        let name = resolve_cow_name(self.bcsymbolmap, symbol.name.clone()?);
         Some(Name::new(name, NameMangling::Mangled, self.language))
     }
 
     /// Resolves the name of a function from DWARF debug information.
     fn resolve_dwarf_name(&self, entry: &Die<'d, '_>) -> Option<Name<'d>> {
         self.inner
-            .resolve_function_name(entry, self.language)
+            .resolve_function_name(entry, self.language, self.bcsymbolmap)
             .ok()
             .flatten()
     }
 
     /// Collects all functions within this compilation unit.
-    fn functions(&self, range_buf: &mut Vec<Range>) -> Result<Vec<Function<'d>>, DwarfError> {
+    fn functions(
+        &self,
+        range_buf: &mut Vec<Range>,
+        seen_ranges: &mut BTreeSet<(u64, u64)>,
+    ) -> Result<Vec<Function<'d>>, DwarfError> {
         let mut depth = 0;
         let mut skipped_depth = None;
         let mut functions = Vec::new();
@@ -758,6 +789,19 @@
             let function_size = range_buf[range_buf.len() - 1].end - range_buf[0].begin;
             let function_end = function_address + function_size;
 
+            // We have seen duplicate top-level function entries being yielded from the
+            // [`DwarfFunctionIterator`], which combined with recursively walking its inlinees can
+            // blow past symcache limits.
+            // We suspect the reason is that the the same top-level functions might be defined in
+            // different compile units. We suspect this might be caused by link-time deduplication
+            // which merges templated code that is being generated multiple times in each
+            // compilation unit. We make sure to detect this here, so we can avoid creating these
+            // duplicates as early as possible.
+            if !inline && !seen_ranges.insert((function_address, function_size)) {
+                skipped_depth = Some(depth);
+                continue;
+            }
+
             // Resolve functions in the symbol table first. Only if there is no entry, fall back
             // to debug information only if there is no match. Sometimes, debug info contains a
             // lesser quality of symbol names.
@@ -777,7 +821,7 @@
             // Avoid constant allocations by collecting repeatedly into the same buffer and
             // draining the results out of it. This keeps the original buffer allocated and
             // allows for a single allocation per call to `resolve_lines`.
-            let lines = self.resolve_lines(&range_buf);
+            let lines = self.resolve_lines(range_buf);
 
             if inline {
                 // An inlined function must always have a parent. An empty list of funcs
@@ -1015,11 +1059,11 @@
 
 impl<'data> DwarfSections<'data> {
     /// Loads all sections from a DWARF object.
-    fn from_dwarf<D>(dwarf: &D) -> Result<Self, DwarfError>
+    fn from_dwarf<D>(dwarf: &D) -> Self
     where
         D: Dwarf<'data>,
     {
-        Ok(DwarfSections {
+        DwarfSections {
             debug_abbrev: DwarfSectionData::load(dwarf),
             debug_info: DwarfSectionData::load(dwarf),
             debug_line: DwarfSectionData::load(dwarf),
@@ -1028,13 +1072,13 @@
             debug_str_offsets: DwarfSectionData::load(dwarf),
             debug_ranges: DwarfSectionData::load(dwarf),
             debug_rnglists: DwarfSectionData::load(dwarf),
-        })
+        }
     }
 }
 
 struct DwarfInfo<'data> {
     inner: DwarfInner<'data>,
-    headers: Vec<CompilationUnitHeader<'data>>,
+    headers: Vec<UnitHeader<'data>>,
     units: Vec<LazyCell<Option<Unit<'data>>>>,
     symbol_map: SymbolMap<'data>,
     address_offset: i64,
@@ -1060,18 +1104,20 @@
         let inner = gimli::read::Dwarf {
             debug_abbrev: sections.debug_abbrev.to_gimli(),
             debug_addr: Default::default(),
+            debug_aranges: Default::default(),
             debug_info: sections.debug_info.to_gimli(),
             debug_line: sections.debug_line.to_gimli(),
             debug_line_str: sections.debug_line_str.to_gimli(),
             debug_str: sections.debug_str.to_gimli(),
             debug_str_offsets: sections.debug_str_offsets.to_gimli(),
-            debug_str_sup: Default::default(),
             debug_types: Default::default(),
             locations: Default::default(),
             ranges: RangeLists::new(
                 sections.debug_ranges.to_gimli(),
                 sections.debug_rnglists.to_gimli(),
             ),
+            file_type: DwarfFileType::Main,
+            sup: Default::default(),
         };
 
         // Prepare random access to unit headers.
@@ -1117,9 +1163,10 @@
         &self,
         offset: DebugInfoOffset,
     ) -> Result<(UnitRef<'d, '_>, UnitOffset), DwarfError> {
+        let section_offset = UnitSectionOffset::DebugInfoOffset(offset);
         let search_result = self
             .headers
-            .binary_search_by_key(&offset, CompilationUnitHeader::offset);
+            .binary_search_by_key(&section_offset, UnitHeader::offset);
 
         let index = match search_result {
             Ok(index) => index,
@@ -1128,8 +1175,7 @@
         };
 
         if let Some(unit) = self.get_unit(index)? {
-            let offset = UnitSectionOffset::DebugInfoOffset(offset);
-            if let Some(unit_offset) = offset.to_unit_offset(unit) {
+            if let Some(unit_offset) = section_offset.to_unit_offset(unit) {
                 return Ok((UnitRef { unit, info: self }, unit_offset));
             }
         }
@@ -1138,9 +1184,10 @@
     }
 
     /// Returns an iterator over all compilation units.
-    fn units(&'d self) -> DwarfUnitIterator<'_> {
+    fn units(&'d self, bcsymbolmap: Option<&'d BcSymbolMap<'d>>) -> DwarfUnitIterator<'_> {
         DwarfUnitIterator {
             info: self,
+            bcsymbolmap,
             index: 0,
         }
     }
@@ -1167,6 +1214,7 @@
 /// An iterator over compilation units in a DWARF object.
 struct DwarfUnitIterator<'s> {
     info: &'s DwarfInfo<'s>,
+    bcsymbolmap: Option<&'s BcSymbolMap<'s>>,
     index: usize,
 }
 
@@ -1184,7 +1232,7 @@
                 Err(error) => return Some(Err(error)),
             };
 
-            match DwarfUnit::from_unit(unit, self.info) {
+            match DwarfUnit::from_unit(unit, self.info, self.bcsymbolmap) {
                 Ok(Some(unit)) => return Some(Ok(unit)),
                 Ok(None) => continue,
                 Err(error) => return Some(Err(error)),
@@ -1200,6 +1248,7 @@
 /// A debugging session for DWARF debugging information.
 pub struct DwarfDebugSession<'data> {
     cell: SelfCell<Box<DwarfSections<'data>>, DwarfInfo<'data>>,
+    bcsymbolmap: Option<Arc<BcSymbolMap<'data>>>,
 }
 
 impl<'data> DwarfDebugSession<'data> {
@@ -1213,18 +1262,29 @@
     where
         D: Dwarf<'data>,
     {
-        let sections = DwarfSections::from_dwarf(dwarf)?;
+        let sections = DwarfSections::from_dwarf(dwarf);
         let cell = SelfCell::try_new(Box::new(sections), |sections| {
             DwarfInfo::parse(unsafe { &*sections }, symbol_map, address_offset, kind)
         })?;
 
-        Ok(DwarfDebugSession { cell })
+        Ok(DwarfDebugSession {
+            cell,
+            bcsymbolmap: None,
+        })
+    }
+
+    /// Loads the [`BcSymbolMap`] into this debug session.
+    ///
+    /// All the file and function names yielded by this debug session will be resolved using
+    /// the provided symbol map.
+    pub(crate) fn load_symbolmap(&mut self, symbolmap: Option<Arc<BcSymbolMap<'data>>>) {
+        self.bcsymbolmap = symbolmap;
     }
 
     /// Returns an iterator over all source files in this debug file.
     pub fn files(&self) -> DwarfFileIterator<'_> {
         DwarfFileIterator {
-            units: self.cell.get().units(),
+            units: self.cell.get().units(self.bcsymbolmap.as_deref()),
             files: DwarfUnitFileIterator::default(),
             finished: false,
         }
@@ -1233,9 +1293,10 @@
     /// Returns an iterator over all functions in this debug file.
     pub fn functions(&self) -> DwarfFunctionIterator<'_> {
         DwarfFunctionIterator {
-            units: self.cell.get().units(),
+            units: self.cell.get().units(self.bcsymbolmap.as_deref()),
             functions: Vec::new().into_iter(),
             range_buf: Vec::new(),
+            seen_ranges: BTreeSet::new(),
             finished: false,
         }
     }
@@ -1289,6 +1350,20 @@
     }
 }
 
+fn resolve_byte_name<'s>(bcsymbolmap: Option<&'s BcSymbolMap<'s>>, s: &'s [u8]) -> &'s [u8] {
+    bcsymbolmap
+        .and_then(|b| b.resolve_opt(s))
+        .map(AsRef::as_ref)
+        .unwrap_or(s)
+}
+
+fn resolve_cow_name<'s>(bcsymbolmap: Option<&'s BcSymbolMap<'s>>, s: Cow<'s, str>) -> Cow<'s, str> {
+    bcsymbolmap
+        .and_then(|b| b.resolve_opt(s.as_bytes()))
+        .map(Cow::Borrowed)
+        .unwrap_or(s)
+}
+
 /// An iterator over source files in a DWARF file.
 pub struct DwarfFileIterator<'s> {
     units: DwarfUnitIterator<'s>,
@@ -1331,6 +1406,7 @@
     units: DwarfUnitIterator<'s>,
     functions: std::vec::IntoIter<Function<'s>>,
     range_buf: Vec<Range>,
+    seen_ranges: BTreeSet<(u64, u64)>,
     finished: bool,
 }
 
@@ -1353,7 +1429,7 @@
                 None => break,
             };
 
-            self.functions = match unit.functions(&mut self.range_buf) {
+            self.functions = match unit.functions(&mut self.range_buf, &mut self.seen_ranges) {
                 Ok(functions) => functions.into_iter(),
                 Err(error) => return Some(Err(error)),
             };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/elf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/elf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/elf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/elf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -287,7 +287,7 @@
             let endianness = self.elf.header.endianness().ok()?;
             let context = Ctx::new(container, endianness);
 
-            let compression = CompressionHeader::parse(&section_data, 0, context).ok()?;
+            let compression = CompressionHeader::parse(section_data, 0, context).ok()?;
             if compression.ch_type != ELFCOMPRESS_ZLIB {
                 return None;
             }
@@ -307,13 +307,13 @@
     /// Locates and reads a section in an ELF binary.
     fn find_section(&self, name: &str) -> Option<(bool, DwarfSection<'data>)> {
         for header in &self.elf.section_headers {
-            // NB: Symbolic does not support MIPS, but if it did we would also need to check
-            // SHT_MIPS_DWARF sections.
-            if header.sh_type != elf::section_header::SHT_PROGBITS {
+            const SHT_MIPS_DWARF: u32 = 0x7000_001e;
+            const SHT_PROGBITS: u32 = elf::section_header::SHT_PROGBITS;
+            if !matches!(header.sh_type, SHT_PROGBITS | SHT_MIPS_DWARF) {
                 continue;
             }
 
-            if let Some(Ok(section_name)) = self.elf.shdr_strtab.get(header.sh_name) {
+            if let Some(section_name) = self.elf.shdr_strtab.get_at(header.sh_name) {
                 let offset = header.sh_offset as usize;
                 if offset == 0 {
                     // We're defensive here. On darwin, dsymutil leaves phantom section headers
@@ -398,7 +398,7 @@
     /// The `DebugId::appendix` field is always `0` for ELF.
     fn compute_debug_id(&self, identifier: &[u8]) -> DebugId {
         // Make sure that we have exactly UUID_SIZE bytes available
-        let mut data = [0 as u8; UUID_SIZE];
+        let mut data = [0; UUID_SIZE];
         let len = std::cmp::min(identifier.len(), UUID_SIZE);
         data[0..len].copy_from_slice(&identifier[0..len]);
 
@@ -550,7 +550,7 @@
     type Item = Symbol<'data>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        while let Some(symbol) = self.symbols.next() {
+        for symbol in &mut self.symbols {
             // Only check for function symbols.
             if symbol.st_type() != elf::sym::STT_FUNC {
                 continue;
@@ -572,11 +572,7 @@
                 continue;
             }
 
-            let name = self
-                .strtab
-                .get(symbol.st_name)
-                .and_then(Result::ok)
-                .map(Cow::Borrowed);
+            let name = self.strtab.get_at(symbol.st_name).map(Cow::Borrowed);
 
             return Some(Symbol {
                 name,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/bcsymbolmap.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/bcsymbolmap.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/bcsymbolmap.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/bcsymbolmap.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,503 @@
+//! The Apple [`BcSymbolMap`] file format.
+
+use std::error::Error;
+use std::fmt;
+use std::io::Cursor;
+use std::iter::FusedIterator;
+use std::path::Path;
+
+use elementtree::Element;
+use symbolic_common::{AsSelf, DebugId, ParseDebugIdError};
+use thiserror::Error;
+
+use super::SWIFT_HIDDEN_PREFIX;
+
+const BC_SYMBOL_MAP_HEADER: &str = "BCSymbolMap Version: 2.0";
+
+/// The error type for handling a [`BcSymbolMap`].
+#[derive(Debug, Error)]
+#[error("{kind}")]
+pub struct BcSymbolMapError {
+    kind: BcSymbolMapErrorKind,
+    #[source]
+    source: Option<Box<dyn Error + Send + Sync + 'static>>,
+}
+
+/// Error kind for [`BcSymbolMapError`].
+#[non_exhaustive]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum BcSymbolMapErrorKind {
+    /// The BCSymbolMap header does not match a supported version.
+    ///
+    /// It could be entirely missing, or only be an unknown version or otherwise corrupted.
+    InvalidHeader,
+    /// The bitcode symbol map did contain invalid UTF-8.
+    InvalidUtf8,
+}
+
+impl fmt::Display for BcSymbolMapErrorKind {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::InvalidHeader => write!(f, "no valid BCSymbolMap header was found"),
+            Self::InvalidUtf8 => write!(f, "BCSymbolmap is not valid UTF-8"),
+        }
+    }
+}
+
+/// An in-memory representation of the Apple bitcode symbol map.
+///
+/// This is an auxiliary file, not an object file.  It can be used to provide de-obfuscated
+/// symbol names to a [`MachObject`] object using its
+/// [`load_symbolmap`](crate::macho::MachObject::load_symbolmap) method.
+///
+/// It is common for bitcode builds to obfuscate the names in the object file's symbol table
+/// so that even the DWARF files do not have the actual symbol names.  In this case the
+/// build process will create a `.bcsymbolmap` file which maps the obfuscated symbol names
+/// back to the original ones.  This structure can parse these files and allows providing
+/// this information to the [`MachObject`] so that it has the original symbol names instead
+/// of `__hidden#NNN_` ones.
+///
+/// See [`MachObject::load_symbolmap`](crate::macho::MachObject::load_symbolmap) for an
+/// example of how to use this.
+///
+/// [`MachObject`]: crate::macho::MachObject
+#[derive(Clone, Debug)]
+pub struct BcSymbolMap<'d> {
+    names: Vec<&'d str>,
+}
+
+impl From<BcSymbolMapErrorKind> for BcSymbolMapError {
+    fn from(source: BcSymbolMapErrorKind) -> Self {
+        Self {
+            kind: source,
+            source: None,
+        }
+    }
+}
+
+impl<'slf> AsSelf<'slf> for BcSymbolMap<'_> {
+    type Ref = BcSymbolMap<'slf>;
+
+    fn as_self(&'slf self) -> &Self::Ref {
+        self
+    }
+}
+
+impl<'d> BcSymbolMap<'d> {
+    /// Tests whether the buffer could contain a [`BcSymbolMap`].
+    pub fn test(bytes: &[u8]) -> bool {
+        let mut pattern = BC_SYMBOL_MAP_HEADER.as_bytes();
+        if pattern.len() > bytes.len() {
+            pattern = &pattern[..bytes.len()];
+        }
+        bytes.starts_with(pattern)
+    }
+
+    /// Parses the BCSymbolMap.
+    ///
+    /// A symbol map does not contain the UUID of its symbols, instead this is normally
+    /// encoded in the filename.
+    pub fn parse(data: &'d [u8]) -> Result<Self, BcSymbolMapError> {
+        let content = std::str::from_utf8(data).map_err(|err| BcSymbolMapError {
+            kind: BcSymbolMapErrorKind::InvalidUtf8,
+            source: Some(Box::new(err)),
+        })?;
+
+        let mut lines_iter = content.lines();
+
+        let header = lines_iter
+            .next()
+            .ok_or(BcSymbolMapErrorKind::InvalidHeader)?;
+        if header != BC_SYMBOL_MAP_HEADER {
+            return Err(BcSymbolMapErrorKind::InvalidHeader.into());
+        }
+
+        let names = lines_iter.collect();
+
+        Ok(Self { names })
+    }
+
+    /// Returns the name of a symbol if it exists in this mapping.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use symbolic_debuginfo::macho::BcSymbolMap;
+    ///
+    /// // let data = std::fs::read("c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap").unwrap();
+    /// # let data =
+    /// #     std::fs::read("tests/fixtures/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap")
+    /// #         .unwrap();
+    /// let map = BcSymbolMap::parse(&data).unwrap();
+    ///
+    /// assert_eq!(map.get(43), Some("Sources/Sentry/Public/SentryMessage.h"));
+    /// assert_eq!(map.get(usize::MAX), None);  // We do not have this many entries
+    /// ```
+    pub fn get(&self, index: usize) -> Option<&'d str> {
+        self.names.get(index).copied()
+    }
+
+    /// Resolves a name using this mapping.
+    ///
+    /// If the name matches the `__hidden#NNN_` pattern that indicates a [`BcSymbolMap`]
+    /// lookup it will be looked up the resolved name will be returned.  Otherwise the name
+    /// is returned unchanged.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use symbolic_debuginfo::macho::BcSymbolMap;
+    ///
+    /// // let data = std::fs::read("c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap").unwrap();
+    /// # let data =
+    /// #     std::fs::read("tests/fixtures/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap")
+    /// #         .unwrap();
+    /// let map = BcSymbolMap::parse(&data).unwrap();
+    ///
+    /// assert_eq!(map.resolve("__hidden#43_"), "Sources/Sentry/Public/SentryMessage.h");
+    /// assert_eq!(map.resolve("_addJSONData"), "_addJSONData");  // #64
+    /// ```
+    pub fn resolve(&self, mut name: &'d str) -> &'d str {
+        if let Some(tail) = name.strip_prefix(SWIFT_HIDDEN_PREFIX) {
+            if let Some(index_as_string) = tail.strip_suffix('_') {
+                name = index_as_string
+                    .parse::<usize>()
+                    .ok()
+                    .and_then(|index| self.get(index))
+                    .unwrap_or(name);
+            }
+        }
+        name
+    }
+
+    /// Resolves a name given in raw bytes using this mapping.
+    ///
+    /// Contrary to [`BcSymbolMap::resolve`], this works with any byte-like type, and returns an
+    /// [`Option`].
+    pub(crate) fn resolve_opt(&self, name: impl AsRef<[u8]>) -> Option<&str> {
+        let name = std::str::from_utf8(name.as_ref()).ok()?;
+        let tail = name.strip_prefix(SWIFT_HIDDEN_PREFIX)?;
+        let index_as_string = tail.strip_suffix('_')?;
+        let index = index_as_string.parse::<usize>().ok()?;
+        self.get(index)
+    }
+
+    /// Returns an iterator over all the names in this bitcode symbol map.
+    pub fn iter(&self) -> BcSymbolMapIterator<'_, 'd> {
+        BcSymbolMapIterator {
+            iter: self.names.iter(),
+        }
+    }
+}
+
+/// Iterator over the names in a [`BcSymbolMap`].
+///
+/// This struct is created by [`BcSymbolMap::iter`].
+pub struct BcSymbolMapIterator<'a, 'd> {
+    iter: std::slice::Iter<'a, &'d str>,
+}
+
+impl<'a, 'd> Iterator for BcSymbolMapIterator<'a, 'd> {
+    type Item = &'d str;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next().copied()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+impl FusedIterator for BcSymbolMapIterator<'_, '_> {}
+
+/// Error for handling or creating a [`UuidMapping`].
+#[derive(Debug, Error)]
+#[error("{kind}")]
+pub struct UuidMappingError {
+    kind: UuidMappingErrorKind,
+    #[source]
+    source: Option<Box<dyn Error + Send + Sync + 'static>>,
+}
+
+impl From<elementtree::Error> for UuidMappingError {
+    fn from(source: elementtree::Error) -> Self {
+        Self {
+            kind: UuidMappingErrorKind::PListParse,
+            source: Some(Box::new(source)),
+        }
+    }
+}
+
+impl From<UuidMappingErrorKind> for UuidMappingError {
+    fn from(kind: UuidMappingErrorKind) -> Self {
+        Self { kind, source: None }
+    }
+}
+
+impl From<ParseDebugIdError> for UuidMappingError {
+    fn from(source: ParseDebugIdError) -> Self {
+        Self {
+            kind: UuidMappingErrorKind::PListParseValue,
+            source: Some(Box::new(source)),
+        }
+    }
+}
+
+/// Error kind for [`UuidMappingError`].
+#[non_exhaustive]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum UuidMappingErrorKind {
+    /// The plist did not have the expected (XML) schema.
+    PListSchema,
+    /// There was an (XML) parsing error parsing the plist.
+    PListParse,
+    /// Failed to parse a required PList value.
+    PListParseValue,
+    /// Failed to parse UUID from filename.
+    ParseFilename,
+}
+
+impl fmt::Display for UuidMappingErrorKind {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::PListSchema => write!(f, "XML structure did not match expected schema"),
+            Self::PListParse => write!(f, "Invalid XML"),
+            Self::PListParseValue => write!(f, "Failed to parse a value into the right type"),
+            Self::ParseFilename => write!(f, "Failed to parse UUID from filename"),
+        }
+    }
+}
+
+/// A mapping from the `dSYM` UUID to an original UUID.
+///
+/// This is used e.g. when dealing with bitcode builds, when Apple compiles objects from
+/// bitcode these objects will have new UUIDs as debug identifiers.  This mapping can be
+/// found in the `dSYMs/<object-id>/Contents/Resources/<object-id>.plist` file of downloaded
+/// debugging symbols.
+///
+/// This struct allows you to keep track of such a mapping and provides support for parsing
+/// it from the ProperyList file format.
+#[derive(Clone, Copy, Debug)]
+pub struct UuidMapping {
+    dsym_uuid: DebugId,
+    original_uuid: DebugId,
+}
+
+impl UuidMapping {
+    /// Creates a new UUID mapping from two [`DebugId`]s.
+    pub fn new(dsym_uuid: DebugId, original_uuid: DebugId) -> Self {
+        Self {
+            dsym_uuid,
+            original_uuid,
+        }
+    }
+
+    /// Parses a PropertyList containing a `DBGOriginalUUID` mapping.
+    ///
+    /// The `filename` may contain multiple path segments, the stem of the filename segment
+    /// should contain the UUID of the `dSYM`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::path::Path;
+    /// use symbolic_common::DebugId;
+    /// use symbolic_debuginfo::macho::UuidMapping;
+    ///
+    /// let filename = Path::new("2d10c42f-591d-3265-b147-78ba0868073f.plist");
+    /// # let filename = Path::new("tests/fixtures/2d10c42f-591d-3265-b147-78ba0868073f.plist");
+    /// let dsym_uuid: DebugId = filename
+    ///     .file_stem().unwrap()
+    ///     .to_str().unwrap()
+    ///     .parse().unwrap();
+    /// let data = std::fs::read(filename).unwrap();
+    ///
+    /// let uuid_map = UuidMapping::parse_plist(dsym_uuid, &data).unwrap();
+    ///
+    /// assert_eq!(uuid_map.dsym_uuid(), dsym_uuid);
+    /// assert_eq!(
+    ///     uuid_map.original_uuid(),
+    ///     "c8374b6d-6e96-34d8-ae38-efaa5fec424f".parse().unwrap(),
+    /// )
+    /// ```
+    pub fn parse_plist(dsym_uuid: DebugId, data: &[u8]) -> Result<Self, UuidMappingError> {
+        Ok(Self {
+            dsym_uuid,
+            original_uuid: uuid_from_plist(data)?,
+        })
+    }
+
+    /// Parses a PropertyList containing a `DBGOriginalUUID` mapping.
+    ///
+    /// This is a convenience version of [`UuidMapping::parse_plist`] which extracts
+    /// the UUID from the `filename`.
+    ///
+    /// The `filename` may contain multiple path segments, the stem of the filename segment
+    /// should contain the UUID of the `dSYM`.  This is the format the PList is normally
+    /// found in a `dSYM` directory structure.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::path::Path;
+    /// use symbolic_common::DebugId;
+    /// use symbolic_debuginfo::macho::UuidMapping;
+    ///
+    /// let filename = Path::new("Contents/Resources/2D10C42F-591D-3265-B147-78BA0868073F.plist");
+    /// # let filename = Path::new("tests/fixtures/2d10c42f-591d-3265-b147-78ba0868073f.plist");
+    /// let data = std::fs::read(filename).unwrap();
+    ///
+    /// let uuid_map = UuidMapping::parse_plist_with_filename(filename, &data).unwrap();
+    ///
+    /// assert_eq!(
+    ///     uuid_map.dsym_uuid(),
+    ///     "2d10c42f-591d-3265-b147-78ba0868073f".parse().unwrap(),
+    /// );
+    /// assert_eq!(
+    ///     uuid_map.original_uuid(),
+    ///     "c8374b6d-6e96-34d8-ae38-efaa5fec424f".parse().unwrap(),
+    /// )
+    /// ```
+    pub fn parse_plist_with_filename(
+        filename: &Path,
+        data: &[u8],
+    ) -> Result<Self, UuidMappingError> {
+        let dsym_uuid = filename
+            .file_stem()
+            .ok_or_else(|| UuidMappingError::from(UuidMappingErrorKind::ParseFilename))?
+            .to_str()
+            .ok_or_else(|| UuidMappingError::from(UuidMappingErrorKind::ParseFilename))?
+            .parse()?;
+        Self::parse_plist(dsym_uuid, data)
+    }
+
+    /// Returns the UUID of the original object file.
+    pub fn original_uuid(&self) -> DebugId {
+        self.original_uuid
+    }
+
+    /// Returns the UUID of the compiled binary and associated `dSYM`.
+    pub fn dsym_uuid(&self) -> DebugId {
+        self.dsym_uuid
+    }
+}
+
+fn uuid_from_plist(data: &[u8]) -> Result<DebugId, UuidMappingError> {
+    let plist = Element::from_reader(Cursor::new(data))?;
+
+    let raw = uuid_from_xml_plist(plist)
+        .ok_or_else(|| UuidMappingError::from(UuidMappingErrorKind::PListSchema))?;
+
+    raw.parse().map_err(Into::into)
+}
+
+fn uuid_from_xml_plist(plist: Element) -> Option<String> {
+    let version = plist.get_attr("version")?;
+    if version != "1.0" {
+        return None;
+    }
+    let dict = plist.find("dict")?;
+
+    let mut found_key = false;
+    let mut raw_original = None;
+    for element in dict.children() {
+        if element.tag().name() == "key" && element.text() == "DBGOriginalUUID" {
+            found_key = true;
+        } else if found_key {
+            raw_original = Some(element.text().to_string());
+            break;
+        }
+    }
+
+    raw_original
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_bcsymbolmap_test() {
+        let buf = b"BCSymbolMap Vers";
+        assert!(BcSymbolMap::test(&buf[..]));
+
+        let buf = b"oops";
+        assert!(!BcSymbolMap::test(&buf[..]));
+    }
+
+    #[test]
+    fn test_basic() {
+        let data = std::fs::read_to_string(
+            "tests/fixtures/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap",
+        )
+        .unwrap();
+
+        assert!(BcSymbolMap::test(&data.as_bytes()[..20]));
+
+        let map = BcSymbolMap::parse(data.as_bytes()).unwrap();
+        assert_eq!(map.get(2), Some("-[SentryMessage serialize]"))
+    }
+
+    #[test]
+    fn test_iter() {
+        let data = std::fs::read_to_string(
+            "tests/fixtures/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap",
+        )
+        .unwrap();
+        let map = BcSymbolMap::parse(data.as_bytes()).unwrap();
+
+        let mut map_iter = map.iter();
+
+        let (lower_bound, upper_bound) = map_iter.size_hint();
+        assert!(lower_bound > 0);
+        assert!(upper_bound.is_some());
+
+        let name = map_iter.next();
+        assert_eq!(name.unwrap(), "-[SentryMessage initWithFormatted:]");
+
+        let name = map_iter.next();
+        assert_eq!(name.unwrap(), "-[SentryMessage setMessage:]");
+    }
+
+    #[test]
+    fn test_data_lifetime() {
+        let data = std::fs::read_to_string(
+            "tests/fixtures/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap",
+        )
+        .unwrap();
+
+        let name = {
+            let map = BcSymbolMap::parse(data.as_bytes()).unwrap();
+            map.get(0).unwrap()
+        };
+
+        assert_eq!(name, "-[SentryMessage initWithFormatted:]");
+    }
+
+    #[test]
+    fn test_resolve() {
+        let data = std::fs::read_to_string(
+            "tests/fixtures/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap",
+        )
+        .unwrap();
+        let map = BcSymbolMap::parse(data.as_bytes()).unwrap();
+
+        assert_eq!(map.resolve("normal_name"), "normal_name");
+        assert_eq!(map.resolve("__hidden#2_"), "-[SentryMessage serialize]");
+    }
+
+    #[test]
+    fn test_plist() {
+        let uuid: DebugId = "2d10c42f-591d-3265-b147-78ba0868073f".parse().unwrap();
+        let data =
+            std::fs::read("tests/fixtures/2d10c42f-591d-3265-b147-78ba0868073f.plist").unwrap();
+        let map = UuidMapping::parse_plist(uuid, &data).unwrap();
+
+        assert_eq!(map.dsym_uuid(), uuid);
+        assert_eq!(
+            map.original_uuid(),
+            "c8374b6d-6e96-34d8-ae38-efaa5fec424f".parse().unwrap()
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/compact.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/compact.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/compact.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/compact.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3617 @@
+//! Support for the "compact unwinding format" used by Apple platforms,
+//! which can be found in __unwind_info sections of binaries.
+//!
+//! The primary type of interest is [`CompactUnwindInfoIter`], which can be
+//! constructed directly from a section of memory.
+//!
+//! The [`CompactUnwindInfoIter]` lets you iterate through all of the mappings
+//! from instruction addresses to unwinding instructions, or lookup a specific
+//! mapping by instruction address (unimplemented).
+//!
+//!
+//!
+//! # Examples
+//!
+//! If you want to process all the Compact Unwind Info at once, do something like this:
+//!
+//! ```
+//! use symbolic_debuginfo::macho::{
+//!     CompactCfiOp, CompactCfiRegister, CompactUnwindOp,
+//!     CompactUnwindInfoIter, MachError, MachObject,
+//! };
+//!
+//! fn read_compact_unwind_info<'d>(mut iter: CompactUnwindInfoIter<'d>)
+//!     -> Result<(), MachError>
+//! {
+//!     // Iterate through the entries
+//!     while let Some(entry) = iter.next()? {
+//!         match entry.instructions(&iter) {
+//!             CompactUnwindOp::None => {
+//!                 // No instructions for this region, will need to use
+//!                 // stack scanning or frame-pointer techniques to unwind.
+//!             }
+//!             CompactUnwindOp::UseDwarfFde { offset_in_eh_frame } => {
+//!                 // Need to grab the CFI info from the eh_frame section
+//!
+//!                 // process_eh_frame_fde_at(offset_in_eh_frame)
+//!             }
+//!             CompactUnwindOp::CfiOps(ops) => {
+//!                 // Emit a new entry with the following operations
+//!                 let start_addr = entry.instruction_address;
+//!                 let length = entry.len;
+//!
+//!                 for instruction in ops {
+//!                     match instruction {
+//!                         CompactCfiOp::RegisterAt {
+//!                             dest_reg,
+//!                             src_reg,
+//!                             offset_from_src,
+//!                         } => {
+//!                             let dest_reg_name = dest_reg.name(&iter);
+//!                             let src_reg_name = src_reg.name(&iter);
+//!
+//!                             // Emit something to the effect of
+//!                             // $dest_reg_name = *($src_reg_name + offset_from_src);
+//!                         }
+//!                         CompactCfiOp::RegisterIs {
+//!                             dest_reg,
+//!                             src_reg,
+//!                             offset_from_src,
+//!                         } => {
+//!                             let dest_reg_name = dest_reg.name(&iter);
+//!                             let src_reg_name = src_reg.name(&iter);
+//!
+//!                             // Emit something to the effect of
+//!                             // $dest_reg_name = $src_reg_name + offset_from_src;
+//!                         }
+//!                     };
+//!                 }
+//!             }
+//!         }
+//!     }
+//!     Ok(())
+//! }
+//! ```
+//!
+//! If you want to unwind from a specific location, do something like this
+//! (API not yet implemented!):
+//!
+//! ```rust,ignore
+//! use symbolic_debuginfo::macho::{
+//!     CompactCfiOp, CompactCfiRegister, CompactUnwindOp,
+//!     CompactUnwindInfoIter, MachError, MachObject,
+//! };
+//!
+//! fn unwind_one_frame<'d>(mut iter: CompactUnwindInfoIter<'d>, current_address_in_module: u32)
+//!     -> Result<(), MachError>
+//! {
+//!     if let Some(entry) = iter.entry_for_address(current_address_in_module)? {
+//!         match entry.instructions(&iter) {
+//!             CompactUnwindOp::None => {
+//!                 // No instructions for this region, will need to use
+//!                 // stack scanning or frame-pointer techniques to unwind.
+//!             }
+//!             CompactUnwindOp::UseDwarfFde { offset_in_eh_frame } => {
+//!                 // Need to grab the CFI info from the eh_frame section
+//!
+//!                 // process_eh_frame_fde_at(offset_in_eh_frame)
+//!             }
+//!             CompactUnwindOp::CfiOps(ops) => {
+//!                 // Emit a new entry with the following operations
+//!                 let start_addr = entry.instruction_address;
+//!                 let length = entry.len;
+//!
+//!                 for instruction in ops {
+//!                     match instruction {
+//!                         CompactCfiOp::RegisterAt {
+//!                             dest_reg,
+//!                             src_reg,
+//!                             offset_from_src,
+//!                         } => {
+//!                             let dest_reg_name = dest_reg.name(&iter);
+//!                             let src_reg_name = src_reg.name(&iter);
+//!
+//!                             // Emit something to the effect of
+//!                             // $dest_reg_name = *($src_reg_name + offset_from_src);
+//!                         }
+//!                         CompactCfiOp::RegisterIs {
+//!                             dest_reg,
+//!                             src_reg,
+//!                             offset_from_src,
+//!                         } => {
+//!                             let dest_reg_name = dest_reg.name(&iter);
+//!                             let src_reg_name = src_reg.name(&iter);
+//!
+//!                             // Emit something to the effect of
+//!                             // $dest_reg_name = $src_reg_name + offset_from_src;
+//!                         }
+//!                     };
+//!                 }
+//!             }
+//!         }
+//!     }
+//!     Ok(())
+//! }
+//! ```
+//!
+//!
+//! # Unimplemented Features (TODO)
+//!
+//! * Personality/LSDA lookup (for runtime unwinders)
+//! * Entry lookup by address (for runtime unwinders)
+//! * x86/x64 Stackless-Indirect mode decoding (for stack frames > 2KB)
+//!
+//!
+//! # The Compact Unwinding Format
+//!
+//! This format is defined only by its implementation in llvm. Notably these two
+//! files include lots of useful comments and definitions:
+//!
+//! * [Header describing layout of the format](https://github.com/llvm/llvm-project/blob/main/libunwind/include/mach-o/compact_unwind_encoding.h)
+//! * [Implementation that outputs the format](https://github.com/llvm/llvm-project/blob/main/lld/MachO/UnwindInfoSection.cpp)
+//! * [Implementation of lldb interpreting that format (CreateUnwindPlan_x86_64 especially useful)](https://github.com/llvm/llvm-project/blob/main/lldb/source/Symbol/CompactUnwindInfo.cpp)
+//!
+//! This implementation is based on those files at commit `d480f968ad8b56d3ee4a6b6df5532d485b0ad01e`.
+//!
+//! Unfortunately the description of the format in those files elides some important
+//! details, and it uses some naming conventions that are confusing, so this document
+//! will attempt to define this format more completely, and with more clear terms.
+//!
+//! Some notable terminology changes from llvm:
+//!
+//! * "encoding" or "encoding type" => opcode
+//! * "function offset" => instruction address
+//!
+//! Like all unwinding info formats, the goal of the compact unwinding format
+//! is to create a mapping from addresses in the binary to opcodes describing
+//! how to unwind from that location.
+//!
+//! These opcodes describe:
+//!
+//! * How to recover the return pointer for the current frame
+//! * How to recover some of the registers for the current frame
+//! * How to run destructors / catch the unwind at runtime (personality/LSDA)
+//!
+//! A user of the compact unwinding format would:
+//!
+//! 1. Get the current instruction pointer (e.g. `%rip`).
+//! 2. Lookup the corresponding opcode in the compact unwinding structure.
+//! 3. Follow the instructions of that opcode to recover the current frame.
+//! 4. Optionally perform runtime unwinding tasks for the current frame (destructors).
+//! 5. Use that information to recover the instruction pointer of the previous frame.
+//! 6. Repeat until unwinding is complete.
+//!
+//! The compact unwinding format can be understood as two separate pieces:
+//!
+//! * An architecture-agnostic "page-table" structure for finding opcode entries
+//! * Architecture-specific opcode formats (x86, x64, and ARM64)
+//!
+//! Unlike DWARF CFI, compact unwinding doesn't have facilities for incrementally
+//! updating how to recover certain registers as the function progresses.
+//!
+//! Empirical analysis suggests that there tends to only be one opcode for
+//! an entire function (which explains why llvm refers to instruction addresses
+//! as "function offsets"), although nothing in the format seems to *require*
+//! this to be the case.
+//!
+//! One consequence of only having one opcode for a whole function is that
+//! functions will generally have incorrect instructions for the function's
+//! prologue (where callee-saved registers are individually PUSHed onto the
+//! stack before the rest of the stack space is allocated), and epilogue
+//! (where callee-saved registers are individually POPed back into registers).
+//!
+//! Presumably this isn't a very big deal, since there's very few situations
+//! where unwinding would involve a function still executing its prologue/epilogue.
+//! This might matter when handling a stack overflow that occurred while
+//! saving the registers, or when processing a non-crashing thread in a minidump
+//! that happened to be in its prologue/epilogue.
+//!
+//! Similarly, the way ranges of instructions are mapped means that Compact
+//! Unwinding will generally incorrectly map the padding bytes between functions
+//! (attributing them to the previous function), while DWARF CFI tends to
+//! more carefully exclude those addresses. Presumably also not a big deal.
+//!
+//! Both of these things mean that if DWARF CFI and Compact Unwinding are
+//! available for a function, the DWARF CFI is expected to be more precise.
+//!
+//! It's possible that LSDA entries have addresses decoupled from the primary
+//! opcode so that instructions on how to run destructors can vary more
+//! granularly, but LSDA support is still TODO as it's not needed for
+//! backtraces.
+//!
+//!
+//! # Page Tables
+//!
+//! This section describes the architecture-agnostic layout of the compact
+//! unwinding format. The layout of the format is a two-level page-table
+//! with one root first-level node pointing to arbitrarily many second-level
+//! nodes, which in turn can hold several hundred opcode entries.
+//!
+//! There are two high-level concepts in this format that enable significant
+//! compression of the tables:
+//!
+//! 1. Eliding duplicate instruction addresses
+//! 2. Palettizing the opcodes
+//!
+//!
+//!
+//! Trick 1 is standard for unwinders: the table of mappings is sorted by
+//! address, and any entries that would have the same opcode as the
+//! previous one are elided. So for instance the following:
+//!
+//! ```text
+//! address: 1, opcode: 1
+//! address: 2, opcode: 1
+//! address: 3, opcode: 2
+//! ```
+//!
+//! Is just encoded like this:
+//!
+//! ```text
+//! address: 1, opcode: 1
+//! address: 3, opcode: 2
+//! ```
+//!
+//! We have found a few places with "zero-length" entries, where the same
+//! address gets repeated, such as the following in `libsystem_kernel.dylib`:
+//!
+//! ```text
+//! address: 0x000121c3, opcode: 0x00000000
+//! address: 0x000121c3, opcode: 0x04000680
+//! ```
+//!
+//! In this case you can just discard the zero-length one (the first one).
+//!
+//!
+//!
+//! Trick 2 is more novel: At the first level a global palette of up to 127 opcodes
+//! is defined. Each second-level "compressed" (leaf) page can also define up to 128 local
+//! opcodes. Then the entries mapping instruction addresses to opcodes can use 8-bit
+//! indices into those palettes instead of entire 32-bit opcodes. If an index is
+//! smaller than the number of global opcodes, it's global, otherwise it's local
+//! (subtract the global count to get the local index).
+//!
+//! > Unclear detail: If the global palette is smaller than 127, can the local
+//!   palette be larger than 128?
+//!
+//! To compress these entries into a single 32-bit value, the address is truncated
+//! to 24 bits and packed with the index. The addresses stored in these entries
+//! are also relative to a base address that each second-level page defines.
+//! (This will be made more clear below).
+//!
+//! There are also non-palletized "regular" second-level pages with absolute
+//! 32-bit addresses, but those are fairly rare. llvm seems to only want to emit
+//! them in the final page.
+//!
+//! The root page also stores the first address mapped by each second-level
+//! page, allowing for more efficient binary search for a particular function
+//! offset entry. (This is the base address the compressed pages use.)
+//!
+//! The root page always has a final sentinel entry which has a null pointer
+//! to its second-level page while still specifying a first address. This
+//! makes it easy to lookup the maximum mapped address (the sentinel will store
+//! that value +1), and just generally makes everything Work Nicer.
+//!
+//!
+//!
+//! ## Layout of the Page Table
+//!
+//! The page table starts at the very beginning of the `__unwind_info` section
+//! with the root page:
+//!
+//! ```rust,ignore
+//! struct RootPage {
+//!   /// Only version 1 is currently defined
+//!   version: u32 = 1,
+//!
+//!   /// The array of u32 global opcodes (offset relative to start of root page).
+//!   ///
+//!   /// These may be indexed by "compressed" second-level pages.
+//!   global_opcodes_offset: u32,
+//!   global_opcodes_len: u32,
+//!
+//!   /// The array of u32 global personality codes
+//!   /// (offset relative to start of root page).
+//!   ///
+//!   /// Personalities define the style of unwinding that an unwinder should
+//!   /// use, and how to interpret the LSDA entries for a function (see below).
+//!   personalities_offset: u32,
+//!   personalities_len: u32,
+//!
+//!   /// The array of FirstLevelPageEntry's describing the second-level pages
+//!   /// (offset relative to start of root page).
+//!   pages_offset: u32,
+//!   pages_len: u32,
+//!
+//!   // After this point there are several dynamically-sized arrays whose
+//!   // precise order and positioning don't matter, because they are all
+//!   // accessed using offsets like the ones above. The arrays are:
+//!
+//!   global_opcodes: [u32; global_opcodes_len],
+//!   personalities: [u32; personalities_len],
+//!   pages: [FirstLevelPageEntry; pages_len],
+//!
+//!   /// An array of LSDA pointers (Language Specific Data Areas).
+//!   ///
+//!   /// LSDAs are tables that an unwinder's personality function will use to
+//!   /// find what destructors should be run and whether unwinding should
+//!   /// be caught and normal execution resumed. We can treat them opaquely.
+//!   ///
+//!   /// Second-level pages have addresses into this array so that it can
+//!   /// can be indexed, the root page doesn't need to know about them.
+//!   lsdas: [LsdaEntry; unknown_len],
+//! }
+//!
+//!
+//! struct FirstLevelPageEntry {
+//!   /// The first address mapped by this page.
+//!   ///
+//!   /// This is useful for binary-searching for the page that can map
+//!   /// a specific address in the binary (the primary kind of lookup
+//!   /// performed by an unwinder).
+//!   first_address: u32,
+//!
+//!   /// Offset to the second-level page (offset relative to start of root page).
+//!   ///
+//!   /// This may point to a RegularSecondLevelPage or a CompressedSecondLevelPage.
+//!   /// Which it is can be determined by the 32-bit "kind" value that is at
+//!   /// the start of both layouts.
+//!   second_level_page_offset: u32,
+//!
+//!   /// Base offset into the lsdas array that entries in this page will be
+//!   /// relative to (offset relative to start of root page).
+//!   lsda_index_offset: u32,
+//! }
+//!
+//!
+//! struct RegularSecondLevelPage {
+//!   /// Always 2 (use to distinguish from CompressedSecondLevelPage).
+//!   kind: u32 = 2,
+//!
+//!   /// The Array of RegularEntry's (offset relative to **start of this page**).
+//!   entries_offset: u16,
+//!   entries_len: u16,
+//! }
+//!
+//!
+//! struct RegularEntry {
+//!   /// The address in the binary for this entry (absolute).
+//!   instruction_address: u32,
+//!   /// The opcode for this address.
+//!   opcode: u32,
+//! }
+//!
+//!
+//! struct CompressedSecondLevelPage {
+//!   /// Always 3 (use to distinguish from RegularSecondLevelPage).
+//!   kind: u32 = 3,
+//!
+//!   /// The array of compressed u32 entries
+//!   /// (offset relative to **start of this page**).
+//!   ///
+//!   /// Entries are a u32 that contains two packed values (from high to low):
+//!   /// * 8 bits: opcode index
+//!   ///   * 0..global_opcodes_len => index into global palette
+//!   ///   * global_opcodes_len..255 => index into local palette
+//!   ///     (subtract global_opcodes_len to get the real local index)
+//!   /// * 24 bits: instruction address
+//!   ///   * address is relative to this page's first_address!
+//!   entries_offset: u16,
+//!   entries_len: u16,
+//!
+//!   /// The array of u32 local opcodes for this page
+//!   /// (offset relative to **start of this page**).
+//!   local_opcodes_offset: u16,
+//!   local_opcodes_len: u16,
+//! }
+//!
+//!
+//! // TODO: why do these have instruction_addresses? Are they not in sync
+//! // with the second-level entries?
+//! struct LsdaEntry {
+//!   instruction_address: u32,
+//!   lsda_address: u32,
+//! }
+//! ```
+//!
+//!
+//!
+//! # Opcode Format
+//!
+//! There are 3 architecture-specific opcode formats: x86, x64, and ARM64.
+//!
+//! All 3 formats have a "null opcode" (`0x0000_0000`) which indicates that
+//! there is no unwinding information for this range of addresses. This happens
+//! with things like hand-written assembly subroutines. This implementation
+//! will yield it as a valid opcode that converts into [`CompactUnwindOp::None`].
+//!
+//! All 3 formats share a common header in the top 8 bits (from high to low):
+//!
+//! ```rust,ignore
+//! /// Whether this instruction is the start of a function.
+//! is_start: u1,
+//!
+//! /// Whether there is an lsda entry for this instruction.
+//! has_lsda: u1,
+//!
+//! /// An index into the global personalities array
+//! /// (TODO: ignore if has_lsda == false?)
+//! personality_index: u2,
+//!
+//! /// The architecture-specific kind of opcode this is, specifying how to
+//! /// interpret the remaining 24 bits of the opcode.
+//! opcode_kind: u4,
+//! ```
+//!
+//!
+//!
+//! ## x86 and x64 Opcodes
+//!
+//! x86 and x64 use the same opcode layout, differing only in the registers
+//! being restored. Registers are numbered 0-6, with the following mappings:
+//!
+//! x86:
+//! * 0 => no register (like `Option::None`)
+//! * 1 => `ebx`
+//! * 2 => `ecx`
+//! * 3 => `edx`
+//! * 4 => `edi`
+//! * 5 => `esi`
+//! * 6 => `ebp`
+//!
+//! x64:
+//! * 0 => no register (like `Option::None`)
+//! * 1 => `rbx`
+//! * 2 => `r12`
+//! * 3 => `r13`
+//! * 4 => `r14`
+//! * 5 => `r15`
+//! * 6 => `rbp`
+//!
+//! Note also that encoded sizes/offsets are generally divided by the pointer size
+//! (since all values we are interested in are pointer-aligned), which of course differs
+//! between x86 and x64.
+//!
+//! There are 4 kinds of x86/x64 opcodes (specified by opcode_kind):
+//!
+//! (One of the llvm headers refers to a 5th "0=old" opcode. Apparently this
+//! was used for initial development of the format, and is basically just
+//! reserved to prevent the testing data from ever getting mixed with real
+//! data. Nothing should produce or handle it. It does incidentally match
+//! the "null opcode", but it's fine to regard that as an unknown opcode
+//! and do nothing.)
+//!
+//!
+//! ### x86/x64 Opcode 1: Frame-Based
+//!
+//! The function has the standard frame pointer (`bp`) prelude which:
+//!
+//! * Pushes the caller's `bp` to the stack
+//! * Sets `bp := sp` (new frame pointer is the current top of the stack)
+//!
+//! `bp` has been preserved, and any callee-saved registers that need to be restored
+//! are saved on the stack at a known offset from `bp`. The return address is
+//! stored just before the caller's `bp`. The caller's stack pointer should
+//! point before where the return address is saved.
+//!
+//! So to unwind you just need to do:
+//!
+//! ```text
+//! %sp := %bp + 2*POINTER_SIZE
+//! %ip := *(%bp + POINTER_SIZE)
+//! %bp := *(%bp)
+//!
+//! (and restore all the other callee-saved registers as described below)
+//! ```
+//!
+//! Registers are stored in increasing order (so `reg1` comes before `reg2`).
+//! If a register has the "no register" value, continue iterating the offset
+//! forward. This lets the registers be stored slightly-non-contiguously on the
+//! stack.
+//!
+//! The remaining 24 bits of the opcode are interpreted as follows (from high to low):
+//!
+//! ```rust,ignore
+//! /// The offset from bp that the registers to restore are saved at,
+//! /// divided by pointer size.
+//! stack_offset: u8,
+//!
+//! _unused: u1,
+//!
+//! /// Registers to restore (see register mapping in previous section)
+//! reg1: u3,
+//! reg2: u3,
+//! reg3: u3,
+//! reg4: u3,
+//! reg5: u3,
+//! ```
+//!
+//!
+//!
+//! ### x86/x64 Opcode 2: Frameless (Stack-Immediate)
+//!
+//!
+//! The callee's stack frame has a known size, so we can find the start
+//! of the frame by offsetting from sp (the stack pointer). The return
+//! address is saved immediately after that location. Any callee-saved
+//! registers that need to be restored are saved immediately after that.
+//!
+//! So to unwind you just need to do:
+//!
+//! ```text
+//! %sp := %sp + stack_size * POINTER_SIZE
+//! %ip := *(%sp - 8)
+//!
+//! (and restore all the other callee-saved registers as described below)
+//! ```
+//!
+//! Registers are stored in *reverse* order on the stack from the order the
+//! decoding algorithm outputs (so `reg[1]` comes before `reg[0]`).
+//!
+//! If a register has the "no register" value, *do not* continue iterating the
+//! offset forward -- registers are strictly contiguous (it's possible
+//! "no register" can only be trailing due to the encoding, but I haven't
+//! verified this).
+//!
+//! The remaining 24 bits of the opcode are interpreted as follows (from high to low):
+//!
+//! ```rust,ignore
+//! /// How big the stack frame is, divided by pointer size.
+//! stack_size: u8,
+//!
+//! _unused: u3,
+//!
+//! /// The number of registers that are saved on the stack.
+//! register_count: u3,
+//!
+//! /// The permutation encoding of the registers that are saved
+//! /// on the stack (see below).
+//! register_permutations: u10,
+//! ```
+//!
+//! The register permutation encoding is a Lehmer code sequence encoded into a
+//! single variable-base number so we can encode the ordering of up to
+//! six registers in a 10-bit space.
+//!
+//! This can't really be described well with anything but code, so
+//! just read this implementation or llvm's implementation for how to
+//! encode/decode this.
+//!
+//!
+//!
+//! ### x86/x64 Opcode 3: Frameless (Stack-Indirect)
+//!
+//! (Currently Unimplemented)
+//!
+//! Stack-Indirect is exactly the same situation as Stack-Immediate, but
+//! the stack-frame size is too large for Stack-Immediate to encode. However,
+//! the function prereserved the size of the frame in its prologue, so we can
+//! extract the the size of the frame from a `sub` instruction at a known
+//! offset from the start of the function (`subl $nnnnnnnn,ESP` in x86,
+//! `subq $nnnnnnnn,RSP` in x64).
+//!
+//! This requires being able to find the first instruction of the function
+//! (TODO: presumably the first is_start entry <= this one?).
+//!
+//! TODO: describe how to extract the value from the `sub` instruction.
+//!
+//!
+//! ```rust,ignore
+//! /// Offset from the start of the function where the `sub` instruction
+//! /// we need is stored. (NOTE: not divided by anything!)
+//! instruction_offset: u8,
+//!
+//! /// An offset to add to the loaded stack size, divided by pointer size.
+//! /// This allows the stack size to differ slightly from the `sub`, to
+//! /// compensate for any function prologue that pushes a bunch of
+//! /// pointer-sized registers.
+//! stack_adjust: u3,
+//!
+//! /// The number of registers that are saved on the stack.
+//! register_count: u3,
+//!
+//! /// The permutation encoding of the registers that are saved on the stack
+//! /// (see Stack-Immediate for a description of this format).
+//! register_permutations: u10,
+//! ```
+//!
+//! **Note**: apparently binaries generated by the clang in Xcode 6 generated
+//! corrupted versions of this opcode, but this was fixed in Xcode 7
+//! (released in September 2015), so *presumably* this isn't something we're
+//! likely to encounter. But if you encounter messed up opcodes this might be why.
+//!
+//!
+//!
+//! ### x86/x64 Opcode 4: Dwarf
+//!
+//! There is no compact unwind info here, and you should instead use the
+//! DWARF CFI in `.eh_frame` for this line. The remaining 24 bits of the opcode
+//! are an offset into the `.eh_frame` section that should hold the DWARF FDE
+//! for this instruction address.
+//!
+//!
+//!
+//! ## ARM64 Opcodes
+//!
+//! ARM64 (AKA AArch64) is a lot more strict about the ABI of functions, and
+//! as such it has fairly simple opcodes. There are 3 kinds of ARM64 opcode:
+//!
+//! (Yes there's no Opcode 1, I don't know why.)
+//!
+//!
+//! ### ARM64 Opcode 2: Frameless
+//!
+//! This is a "frameless" leaf function. The caller is responsible for
+//! saving/restoring all of its general purpose registers. The frame pointer
+//! is still the caller's frame pointer and doesn't need to be touched. The
+//! return address is stored in the link register (`x30`).
+//!
+//! So to unwind you just need to do:
+//!
+//! ```text
+//! %sp := %sp + stack_size * 16
+//! %pc := %x30
+//!
+//! (no other registers to restore)
+//! ```
+//!
+//! The remaining 24 bits of the opcode are interpreted as follows (from high to low):
+//!
+//! ```rust,ignore
+//! /// How big the stack frame is, divided by 16.
+//! stack_size: u12,
+//!
+//! _unused: u12,
+//! ```
+//!
+//!
+//!
+//! ### ARM64 Opcode 3: Dwarf
+//!
+//! There is no compact unwind info here, and you should instead use the
+//! DWARF CFI in `.eh_frame` for this line. The remaining 24 bits of the opcode
+//! are an offset into the `.eh_frame` section that should hold the DWARF FDE
+//! for this instruction address.
+//!
+//!
+//!
+//! ### ARM64 Opcode 4: Frame-Based
+//!
+//! This is a function with the standard prologue. The return address (`pc`) and the
+//! frame pointer (`x29`) were pushed onto the stack in a pair and in that order
+//! (ARM64 registers are saved/restored in pairs), and then the frame pointer was updated
+//! to the current stack pointer.
+//!
+//! So to unwind you just need to do:
+//!
+//! ```text
+//! %sp := %x29 + 16
+//! %pc := *(%x29 + 8)
+//! %x29 := *(%x29)
+//!
+//! (and restore all the other callee-saved registers as described below)
+//! ```
+//!
+//! Any callee-saved registers that need to be restored were then pushed
+//! onto the stack in pairs in the following order (if they were pushed at
+//! all, see below):
+//!
+//! 1. `x19`, `x20`
+//! 2. `x21`, `x22`
+//! 3. `x23`, `x24`
+//! 4. `x25`, `x26`
+//! 5. `x27`, `x28`
+//! 6. `d8`, `d9`
+//! 7. `d10`, `d11`
+//! 8. `d12`, `d13`
+//! 9. `d14`, `d15`
+//!
+//! The remaining 24 bits of the opcode are interpreted as follows (from high to low):
+//!
+//! ```rust,ignore
+//! _unused: u15,
+//!
+//! // Whether each register pair was pushed
+//! d14_and_d15_saved: u1,
+//! d12_and_d13_saved: u1,
+//! d10_and_d11_saved: u1,
+//! d8_and_d9_saved: u1,
+//!
+//! x27_and_x28_saved: u1,
+//! x25_and_x26_saved: u1,
+//! x23_and_x24_saved: u1,
+//! x21_and_x22_saved: u1,
+//! x19_and_x20_saved: u1,
+//! ```
+//!
+//!
+//!
+//! # Notable Corners
+//!
+//! Here's some notable corner cases and esoterica of the format. Behaviour in
+//! these situations is not strictly guaranteed (as in we may decide to
+//! make the implemenation more strict or liberal if it is deemed necessary
+//! or desirable). But current behaviour *is* documented here for the sake of
+//! maintenance/debugging. Hopefully it also helps highlight all the ways things
+//! can go wrong for anyone using this documentation to write their own tooling.
+//!
+//! For all these cases, if an Error is reported during iteration/search, the
+//! [`CompactUnwindInfoIter`] will be in an unspecified state for future queries.
+//! It will never violate memory safety but it may start yielding chaotic
+//! values.
+//!
+//! If this implementation ever panics, that should be regarded as an
+//! implementation bug.
+//!
+//!
+//! Things we allow:
+//!
+//! * The personalities array has a 32-bit length, but all indices into
+//!   it are only 2 bits. As such, it is theoretically possible for there
+//!   to be unindexable personalities. In practice that Shouldn't Happen,
+//!   and this implementation won't report an error if it does, because it
+//!   can be benign (although we have no way to tell if indices were truncated).
+//!
+//! * The llvm headers say that at most there should be 127 global opcodes
+//!   and 128 local opcodes, but since local index translation is based on
+//!   the actual number of global opcodes and *not* 127/128, there's no
+//!   reason why each palette should be individually limited like this.
+//!   This implementation doesn't report an error if this happens, and should
+//!   work fine if it does.
+//!
+//! * The llvm headers say that second-level pages are *actual* pages at
+//!   a fixed size of 4096 bytes. It's unclear what advantage this provides,
+//!   perhaps there's a situation where you're mapping in the pages on demand?
+//!   This puts a practical limit on the number of entries each second-level
+//!   page can hold -- regular pages can fit 511 entries, while compressed
+//!   pages can hold 1021 entries+local_opcodes (they have to share). This
+//!   implementation does not report an error if a second-level page has more
+//!   values than that, and should work fine if it does.
+//!
+//! * If a [`CompactUnwindInfoIter`] is created for an architecture it wasn't
+//!   designed for, it is assumed that the layout of the page tables will
+//!   remain the same, and entry iteration/lookup should still work and
+//!   produce results. However [`CompactUnwindInfoEntry::instructions`]
+//!   will always return [`CompactUnwindOp::None`].
+//!
+//! * If an opcode kind is encountered that this implementation wasn't
+//!   designed for, `Opcode::instructions` will return [`CompactUnwindOp::None`].
+//!
+//! * If two entries have the same address (making the first have zero-length),
+//!   we silently discard the first one in favour of the second.
+//!
+//! * Only 7 register mappings are provided for x86/x64 opcodes, but the
+//!   3-bit encoding allows for 8. This implementation will just map the
+//!   8th encoding to "no register" as well.
+//!
+//! * Only 6 registers can be restored by the x86/x64 stackless modes, but
+//!   the 3-bit encoding of the register count allows for 7. This implementation
+//!   clamps the value to 6.
+//!
+//!
+//! Things we produce errors for:
+//!
+//! * If the root page has a version this implementation wasn't designed for,
+//!   [`CompactUnwindInfoIter::new`] will return an Error.
+//!
+//! * A corrupt unwind_info section may have its entries out of order. Since
+//!   the next entry's instruction_address is always needed to compute the
+//!   number of bytes the current entry covers, the implementation will report
+//!   an error if it encounters this. However it does not attempt to fully
+//!   validate the ordering during an `entry_for_address` query, as this would
+//!   significantly slow down the binary search. In this situation
+//!   you may get chaotic results (same guarantees as `BTreeMap` with an
+//!   inconsistent `Ord` implementation).
+//!
+//! * A corrupt unwind_info section may attempt to index out of bounds either
+//!   with out-of-bounds offset values (e.g. personalities_offset) or with out
+//!   of bounds indices (e.g. a local opcode index). When an array length is
+//!   provided, this implementation will return an error if an index is out
+//!   out of bounds. Offsets are only restricted to the unwind_info
+//!   section itself, as this implementation does not assume arrays are
+//!   placed in any particular place, and does not try to prevent aliasing.
+//!   Trying to access outside the `.unwind_info` section will return an error.
+//!
+//! * If an unknown second-level page type is encountered, iteration/lookup will
+//!   return an error.
+//!
+//!
+//! Things that cause chaos:
+//!
+//! * If the null page was missing, there would be no way to identify the
+//!   number of instruction bytes the last entry in the table covers. As such,
+//!   this implementation assumes that it exists, and currently does not validate
+//!   it ahead of time. If the null page *is* missing, the last entry or page
+//!   may be treated as the null page, and won't be emitted. (Perhaps we should
+//!   provide more reliable behaviour here?)
+//!
+//! * If there are multiple null pages, or if there is a page with a defined
+//!   second-level page but no entries of its own, behaviour is unspecified.
+//!
+
+use crate::macho::MachError;
+use goblin::error::Error;
+use goblin::mach::segment::SectionData;
+use scroll::{Endian, Pread};
+use std::mem;
+
+// Hacky glue types to keep exposure of the containing library minimal.
+// This will help with transplanting this code into goblin.
+type Result<T> = std::result::Result<T, MachError>;
+
+#[derive(Debug, Clone)]
+enum Arch {
+    X86,
+    X64,
+    Arm64,
+    Other,
+}
+
+// Types marked with repr(C) indicate their layout precisely matches the
+// layout of the format. In theory we could point directly into the binary
+// of the unwind_info section with these types, but we avoid doing so for
+// endianness/safety.
+
+#[repr(C)]
+#[derive(Debug, Clone, Pread)]
+struct FirstLevelPage {
+    // Only version 1 is currently defined
+    // version: u32 = 1,
+    /// The array of u32 global opcodes (offset relative to start of root page).
+    ///
+    /// These may be indexed by "compressed" second-level pages.
+    global_opcodes_offset: u32,
+    global_opcodes_len: u32,
+
+    /// The array of u32 global personality codes (offset relative to start of root page).
+    ///
+    /// Personalities define the style of unwinding that an unwinder should use,
+    /// and how to interpret the LSDA entries for a function (see below).
+    personalities_offset: u32,
+    personalities_len: u32,
+
+    /// The array of [`FirstLevelPageEntry`]'s describing the second-level pages
+    /// (offset relative to start of root page).
+    pages_offset: u32,
+    pages_len: u32,
+    // After this point there are several dynamically-sized arrays whose precise
+    // order and positioning don't matter, because they are all accessed using
+    // offsets like the ones above. The arrays are:
+
+    // global_opcodes: [u32; global_opcodes_len],
+    // personalities: [u32; personalities_len],
+    // pages: [FirstLevelPageEntry; pages_len],
+    // lsdas: [LsdaEntry; unknown_len],
+}
+
+#[repr(C)]
+#[derive(Debug, Clone, Pread)]
+struct FirstLevelPageEntry {
+    /// The first address mapped by this page.
+    ///
+    /// This is useful for binary-searching for the page that can map
+    /// a specific address in the binary (the primary kind of lookup
+    /// performed by an unwinder).
+    first_address: u32,
+
+    /// Offset to the second-level page (offset relative to start of root page).
+    ///
+    /// This may point to either a [`RegularSecondLevelPage`] or a [`CompressedSecondLevelPage`].
+    /// Which it is can be determined by the 32-bit "kind" value that is at
+    /// the start of both layouts.
+    second_level_page_offset: u32,
+
+    /// Base offset into the lsdas array that entries in this page will be relative
+    /// to (offset relative to start of root page).
+    lsda_index_offset: u32,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone, Pread)]
+struct RegularSecondLevelPage {
+    // Always 2 (use to distinguish from CompressedSecondLevelPage).
+    // kind: u32 = 2,
+    /// The Array of [`RegularEntry`]'s (offset relative to **start of this page**).
+    entries_offset: u16,
+    entries_len: u16,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone, Pread)]
+struct CompressedSecondLevelPage {
+    // Always 3 (use to distinguish from RegularSecondLevelPage).
+    // kind: u32 = 3,
+    /// The array of compressed u32 entries (offset relative to **start of this page**).
+    ///
+    /// Entries are a u32 that contains two packed values (from highest to lowest bits):
+    /// * 8 bits: opcode index
+    ///   * 0..global_opcodes_len => index into global palette
+    ///   * global_opcodes_len..255 => index into local palette (subtract global_opcodes_len)
+    /// * 24 bits: instruction address
+    ///   * address is relative to this page's first_address!
+    entries_offset: u16,
+    entries_len: u16,
+
+    /// The array of u32 local opcodes for this page (offset relative to **start of this page**).
+    local_opcodes_offset: u16,
+    local_opcodes_len: u16,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone, Pread)]
+struct RegularEntry {
+    /// The address in the binary for this entry (absolute).
+    instruction_address: u32,
+    /// The opcode for this address.
+    opcode: u32,
+}
+
+#[derive(Debug, Clone)]
+#[repr(C)]
+struct LsdaEntry {
+    instruction_address: u32,
+    lsda_address: u32,
+}
+
+#[derive(Debug, Clone)]
+enum OpcodeOrIndex {
+    Opcode(u32),
+    Index(u32),
+}
+
+#[derive(Debug, Clone)]
+struct RawCompactUnwindInfoEntry {
+    /// The address of the first instruction this entry applies to
+    /// (may apply to later instructions as well).
+    instruction_address: u32,
+    /// Either an opcode or the index into an opcode palette
+    opcode_or_index: OpcodeOrIndex,
+}
+
+/// An iterator over the [`CompactUnwindInfoEntry`]'s of a `.unwind_info` section.
+#[derive(Debug, Clone)]
+pub struct CompactUnwindInfoIter<'a> {
+    /// Parent .unwind_info metadata.
+    arch: Arch,
+    endian: Endian,
+    section: SectionData<'a>,
+    /// Parsed root page.
+    root: FirstLevelPage,
+
+    // Iterator state
+    /// Current index in the root node.
+    first_idx: u32,
+    /// Current index in the second-level node.
+    second_idx: u32,
+    /// Parsed version of the current pages.
+    page_of_next_entry: Option<(FirstLevelPageEntry, SecondLevelPage)>,
+    /// Minimally parsed version of the next entry, which we need to have
+    /// already loaded to know how many instructions the previous entry covered.
+    next_entry: Option<RawCompactUnwindInfoEntry>,
+    done_page: bool,
+}
+
+impl<'a> CompactUnwindInfoIter<'a> {
+    /// Creates a new [`CompactUnwindInfoIter`] for the given section.
+    pub fn new(
+        section: SectionData<'a>,
+        little_endian: bool,
+        arch: symbolic_common::Arch,
+    ) -> Result<Self> {
+        const UNWIND_SECTION_VERSION: u32 = 1;
+
+        use symbolic_common::CpuFamily;
+        let arch = match arch.cpu_family() {
+            CpuFamily::Intel32 => Arch::X86,
+            CpuFamily::Amd64 => Arch::X64,
+            CpuFamily::Arm64 => Arch::Arm64,
+            _ => Arch::Other,
+        };
+
+        let endian = if little_endian {
+            Endian::Little
+        } else {
+            Endian::Big
+        };
+
+        let offset = &mut 0;
+
+        // Grab all the fields from the header
+        let version: u32 = section.gread_with(offset, endian)?;
+        if version != UNWIND_SECTION_VERSION {
+            return Err(MachError::from(Error::Malformed(format!(
+                "Unknown Compact Unwinding Info version {}",
+                version
+            ))));
+        }
+
+        let root = section.gread_with(offset, endian)?;
+
+        let iter = CompactUnwindInfoIter {
+            arch,
+            endian,
+            section,
+            root,
+
+            first_idx: 0,
+            second_idx: 0,
+            page_of_next_entry: None,
+            next_entry: None,
+            done_page: true,
+        };
+
+        Ok(iter)
+    }
+    /// Gets the next entry in the iterator.
+    #[allow(clippy::should_implement_trait)]
+    pub fn next(&mut self) -> Result<Option<CompactUnwindInfoEntry>> {
+        // Iteration is slightly more complex here because we want to be able to
+        // report how many instructions an entry covers, and knowing this requires us
+        // to parse the *next* entry's instruction_address value. Also, there's
+        // a sentinel page at the end of the listing with a null second_level_page_offset
+        // which requires some special handling.
+        //
+        // To handle this, we split iteration into two phases:
+        //
+        // * next_raw minimally parses the next entry so we can extract the opcode,
+        //   while also ensuring page_of_next_entry is set to match it.
+        //
+        // * next uses next_raw to "peek" the instruction_address of the next entry,
+        //   and then saves the result as `next_entry`, to avoid doing a bunch of
+        //   repeated work.
+
+        // If this is our first iteration next_entry will be empty, try to get it.
+        if self.next_entry.is_none() {
+            self.next_entry = self.next_raw()?;
+        }
+
+        if let Some(cur_entry) = self.next_entry.take() {
+            // Copy the first and second page data, as it may get overwritten
+            // by next_raw, then peek the next entry.
+            let (first_page, second_page) = self.page_of_next_entry.clone().unwrap();
+            self.next_entry = self.next_raw()?;
+            if let Some(next_entry) = self.next_entry.as_ref() {
+                let result = self.complete_entry(
+                    &cur_entry,
+                    next_entry.instruction_address,
+                    &first_page,
+                    &second_page,
+                )?;
+                Ok(Some(result))
+            } else {
+                // If there's no next_entry, then cur_entry is the sentinel, which
+                // we shouldn't yield.
+                Ok(None)
+            }
+        } else {
+            // next_raw still yielded nothing, we're done.
+            Ok(None)
+        }
+    }
+
+    // Yields a minimally parsed version of the next entry, and sets
+    // page_of_next_entry to the page matching it (so it can be further
+    // parsed when needed.
+    fn next_raw(&mut self) -> Result<Option<RawCompactUnwindInfoEntry>> {
+        // First, load up the page for this value if needed
+        if self.done_page {
+            // Only advance the indices if we've already loaded up a page
+            // (so it's not the first iteration) and we have pages left.
+            if self.page_of_next_entry.is_some() && self.first_idx != self.root.pages_len {
+                self.first_idx += 1;
+                self.second_idx = 0;
+            }
+            if let Some(entry) = self.first_level_entry(self.first_idx)? {
+                if entry.second_level_page_offset == 0 {
+                    // sentinel page at the end of the list, create a dummy entry
+                    // and advance past this page (don't reset done_page).
+                    return Ok(Some(RawCompactUnwindInfoEntry {
+                        instruction_address: entry.first_address,
+                        opcode_or_index: OpcodeOrIndex::Opcode(0),
+                    }));
+                }
+                let second_level_page = self.second_level_page(entry.second_level_page_offset)?;
+                self.page_of_next_entry = Some((entry, second_level_page));
+                self.done_page = false;
+            } else {
+                // Couldn't load a page, so we're at the end of our iteration.
+                return Ok(None);
+            }
+        }
+
+        // If we get here, we must have loaded a page
+        let (first_level_entry, second_level_page) = self.page_of_next_entry.as_ref().unwrap();
+        let entry =
+            self.second_level_entry(first_level_entry, second_level_page, self.second_idx)?;
+
+        // Advance to the next entry
+        self.second_idx += 1;
+
+        // If we reach the end of the page, setup for the next page
+        if self.second_idx == second_level_page.len() {
+            self.done_page = true;
+        }
+
+        Ok(Some(entry))
+    }
+
+    /*
+    /// Gets the entry associated with a particular address.
+    pub fn entry_for_address(&mut self, _address: u32) -> Result<Option<CompactUnwindInfoEntry>> {
+        // TODO: this would be nice for an actual unwinding implementation, but
+        // dumping all of the entries doesn't need this.
+    }
+    */
+
+    fn first_level_entry(&self, idx: u32) -> Result<Option<FirstLevelPageEntry>> {
+        if idx < self.root.pages_len {
+            let idx_offset = mem::size_of::<FirstLevelPageEntry>() * idx as usize;
+            let offset = self.root.pages_offset as usize + idx_offset;
+
+            Ok(Some(self.section.pread_with(offset, self.endian)?))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn second_level_page(&self, offset: u32) -> Result<SecondLevelPage> {
+        const SECOND_LEVEL_REGULAR: u32 = 2;
+        const SECOND_LEVEL_COMPRESSED: u32 = 3;
+
+        let mut offset = offset as usize;
+
+        let kind: u32 = self.section.gread_with(&mut offset, self.endian)?;
+        if kind == SECOND_LEVEL_REGULAR {
+            Ok(SecondLevelPage::Regular(
+                self.section.gread_with(&mut offset, self.endian)?,
+            ))
+        } else if kind == SECOND_LEVEL_COMPRESSED {
+            Ok(SecondLevelPage::Compressed(
+                self.section.gread_with(&mut offset, self.endian)?,
+            ))
+        } else {
+            Err(MachError::from(Error::Malformed(format!(
+                "Unknown second-level page kind: {}",
+                kind
+            ))))
+        }
+    }
+
+    fn second_level_entry(
+        &self,
+        first_level_entry: &FirstLevelPageEntry,
+        second_level_page: &SecondLevelPage,
+        second_level_idx: u32,
+    ) -> Result<RawCompactUnwindInfoEntry> {
+        match *second_level_page {
+            SecondLevelPage::Compressed(ref page) => {
+                let offset = first_level_entry.second_level_page_offset as usize
+                    + page.entries_offset as usize
+                    + second_level_idx as usize * 4;
+                let compressed_entry: u32 = self.section.pread_with(offset, self.endian)?;
+
+                let instruction_address =
+                    (compressed_entry & 0x00FFFFFF) + first_level_entry.first_address;
+                let opcode_idx = (compressed_entry >> 24) & 0xFF;
+                Ok(RawCompactUnwindInfoEntry {
+                    instruction_address,
+                    opcode_or_index: OpcodeOrIndex::Index(opcode_idx),
+                })
+            }
+            SecondLevelPage::Regular(ref page) => {
+                let offset = first_level_entry.second_level_page_offset as usize
+                    + page.entries_offset as usize
+                    + second_level_idx as usize * 8;
+
+                let entry: RegularEntry = self.section.pread_with(offset, self.endian)?;
+
+                Ok(RawCompactUnwindInfoEntry {
+                    instruction_address: entry.instruction_address,
+                    opcode_or_index: OpcodeOrIndex::Opcode(entry.opcode),
+                })
+            }
+        }
+    }
+
+    fn complete_entry(
+        &self,
+        entry: &RawCompactUnwindInfoEntry,
+        next_entry_instruction_address: u32,
+        first_level_entry: &FirstLevelPageEntry,
+        second_level_page: &SecondLevelPage,
+    ) -> Result<CompactUnwindInfoEntry> {
+        if entry.instruction_address > next_entry_instruction_address {
+            return Err(MachError::from(Error::Malformed(format!(
+                "Entry addresses are not monotonic! ({} > {})",
+                entry.instruction_address, next_entry_instruction_address
+            ))));
+        }
+        let opcode = match entry.opcode_or_index {
+            OpcodeOrIndex::Opcode(opcode) => opcode,
+            OpcodeOrIndex::Index(opcode_idx) => {
+                if let SecondLevelPage::Compressed(ref page) = second_level_page {
+                    if opcode_idx < self.root.global_opcodes_len {
+                        self.global_opcode(opcode_idx)?
+                    } else {
+                        let opcode_idx = opcode_idx - self.root.global_opcodes_len;
+                        if opcode_idx >= page.local_opcodes_len as u32 {
+                            return Err(MachError::from(Error::Malformed(format!(
+                                "Local opcode index too large ({} >= {})",
+                                opcode_idx, page.local_opcodes_len
+                            ))));
+                        }
+                        let offset = first_level_entry.second_level_page_offset as usize
+                            + page.local_opcodes_offset as usize
+                            + opcode_idx as usize * 4;
+                        let opcode: u32 = self.section.pread_with(offset, self.endian)?;
+                        opcode
+                    }
+                } else {
+                    unreachable!()
+                }
+            }
+        };
+        let opcode = Opcode(opcode);
+
+        Ok(CompactUnwindInfoEntry {
+            instruction_address: entry.instruction_address,
+            len: next_entry_instruction_address - entry.instruction_address,
+            opcode,
+        })
+    }
+
+    fn global_opcode(&self, opcode_idx: u32) -> Result<u32> {
+        if opcode_idx >= self.root.global_opcodes_len {
+            return Err(MachError::from(Error::Malformed(format!(
+                "Global opcode index too large ({} >= {})",
+                opcode_idx, self.root.global_opcodes_len
+            ))));
+        }
+        let offset = self.root.global_opcodes_offset as usize + opcode_idx as usize * 4;
+        let opcode: u32 = self.section.pread_with(offset, self.endian)?;
+        Ok(opcode)
+    }
+
+    fn personality(&self, personality_idx: u32) -> Result<u32> {
+        if personality_idx >= self.root.personalities_len {
+            return Err(MachError::from(Error::Malformed(format!(
+                "Personality index too large ({} >= {})",
+                personality_idx, self.root.personalities_len
+            ))));
+        }
+        let offset = self.root.personalities_offset as usize + personality_idx as usize * 4;
+        let personality: u32 = self.section.pread_with(offset, self.endian)?;
+        Ok(personality)
+    }
+
+    /// Dumps similar output to `llvm-objdump --unwind-info`, for debugging.
+    pub fn dump(&self) -> Result<()> {
+        println!("Contents of __unwind_info section:");
+        println!("  Version:                                   0x1");
+        println!(
+            "  Common encodings array section offset:     0x{:x}",
+            self.root.global_opcodes_offset
+        );
+        println!(
+            "  Number of common encodings in array:       0x{:x}",
+            self.root.global_opcodes_len
+        );
+        println!(
+            "  Personality function array section offset: 0x{:x}",
+            self.root.personalities_offset
+        );
+        println!(
+            "  Number of personality functions in array:  0x{:x}",
+            self.root.personalities_len
+        );
+        println!(
+            "  Index array section offset:                0x{:x}",
+            self.root.pages_offset
+        );
+        println!(
+            "  Number of indices in array:                0x{:x}",
+            self.root.pages_len
+        );
+
+        println!(
+            "  Common encodings: (count = {})",
+            self.root.global_opcodes_len
+        );
+        for i in 0..self.root.global_opcodes_len {
+            let opcode = self.global_opcode(i)?;
+            println!("    encoding[{}]: 0x{:08x}", i, opcode);
+        }
+
+        println!(
+            "  Personality functions: (count = {})",
+            self.root.personalities_len
+        );
+        for i in 0..self.root.personalities_len {
+            let personality = self.personality(i)?;
+            println!("    personality[{}]: 0x{:08x}", i, personality);
+        }
+
+        println!("  Top level indices: (count = {})", self.root.pages_len);
+        for i in 0..self.root.pages_len {
+            let entry = self.first_level_entry(i)?.unwrap();
+            println!("    [{}]: function offset=0x{:08x}, 2nd level page offset=0x{:08x}, LSDA offset=0x{:08x}",
+                    i,
+                    entry.first_address,
+                    entry.second_level_page_offset,
+                    entry.lsda_index_offset);
+        }
+
+        // TODO: print LSDA info
+        println!("  LSDA descriptors:");
+        println!("  Second level indices:");
+
+        let mut iter = (*self).clone();
+        while let Some(raw_entry) = iter.next_raw()? {
+            let (first, second) = iter.page_of_next_entry.clone().unwrap();
+            // Always observing the index after the step, so subtract 1
+            let second_idx = iter.second_idx - 1;
+
+            // If this is the first entry of this page, dump the page
+            if second_idx == 0 {
+                println!("    Second level index[{}]: offset in section=0x{:08x}, base function=0x{:08x}",
+                iter.first_idx,
+                first.second_level_page_offset,
+                first.first_address);
+            }
+
+            // Dump the entry
+
+            // Feed in own instruction_address as a dummy value (we don't need it for this format)
+            let entry =
+                iter.complete_entry(&raw_entry, raw_entry.instruction_address, &first, &second)?;
+            if let OpcodeOrIndex::Index(opcode_idx) = raw_entry.opcode_or_index {
+                println!(
+                    "      [{}]: function offset=0x{:08x}, encoding[{}]=0x{:08x}",
+                    second_idx, entry.instruction_address, opcode_idx, entry.opcode.0
+                );
+            } else {
+                println!(
+                    "      [{}]: function offset=0x{:08x}, encoding=0x{:08x}",
+                    second_idx, entry.instruction_address, entry.opcode.0
+                );
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[derive(Debug, Clone)]
+enum SecondLevelPage {
+    Compressed(CompressedSecondLevelPage),
+    Regular(RegularSecondLevelPage),
+}
+
+impl SecondLevelPage {
+    fn len(&self) -> u32 {
+        match *self {
+            SecondLevelPage::Regular(ref page) => page.entries_len as u32,
+            SecondLevelPage::Compressed(ref page) => page.entries_len as u32,
+        }
+    }
+}
+
+/// A Compact Unwind Info entry.
+#[derive(Debug, Clone)]
+pub struct CompactUnwindInfoEntry {
+    /// The first instruction this entry covers.
+    pub instruction_address: u32,
+    /// How many addresses this entry covers.
+    pub len: u32,
+    /// The opcode for this entry.
+    opcode: Opcode,
+}
+
+impl CompactUnwindInfoEntry {
+    /// Gets cfi instructions associated with this entry.
+    pub fn instructions(&self, iter: &CompactUnwindInfoIter) -> CompactUnwindOp {
+        self.opcode.instructions(iter)
+    }
+}
+
+/// A Compact Unwinding Operation
+#[derive(Debug)]
+pub enum CompactUnwindOp {
+    /// The instructions can be described with simple CFI operations.
+    CfiOps(CompactCfiOpIter),
+    /// Instructions can't be encoded by Compact Unwinding, but an FDE
+    /// with real DWARF CFI instructions is stored in the eh_frame section.
+    UseDwarfFde {
+        /// The offset in the eh_frame section where the FDE is.
+        offset_in_eh_frame: u32,
+    },
+    /// Nothing to do (may be unimplemented features or an unknown encoding)
+    None,
+}
+
+/// Minimal set of CFI ops needed to express Compact Unwinding semantics:
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum CompactCfiOp {
+    /// The value of `dest_reg` is *stored at* `src_reg + offset_from_src`.
+    RegisterAt {
+        /// Destination
+        dest_reg: CompactCfiRegister,
+        /// Source
+        src_reg: CompactCfiRegister,
+        /// Offset
+        offset_from_src: i32,
+    },
+    /// The value of `dest_reg` *is* `src_reg + offset_from_src`.
+    RegisterIs {
+        /// Destination
+        dest_reg: CompactCfiRegister,
+        /// Source
+        src_reg: CompactCfiRegister,
+        /// Offset
+        offset_from_src: i32,
+    },
+}
+
+#[derive(Debug, Clone)]
+enum X86UnwindingMode {
+    RbpFrame,
+    StackImmediate,
+    StackIndirect,
+    Dwarf,
+}
+
+#[derive(Debug, Clone)]
+enum Arm64UnwindingMode {
+    Frameless,
+    Dwarf,
+    Frame,
+}
+
+#[derive(Debug, Clone)]
+struct Opcode(u32);
+
+// Arch-generic stuff
+impl Opcode {
+    fn instructions(&self, iter: &CompactUnwindInfoIter) -> CompactUnwindOp {
+        match iter.arch {
+            Arch::X86 | Arch::X64 => self.x86_instructions(iter),
+            Arch::Arm64 => self.arm64_instructions(iter),
+            _ => CompactUnwindOp::None,
+        }
+    }
+
+    fn pointer_size(&self, iter: &CompactUnwindInfoIter) -> u32 {
+        match iter.arch {
+            Arch::X86 => 4,
+            Arch::X64 => 8,
+            Arch::Arm64 => 8,
+            _ => unimplemented!(),
+        }
+    }
+
+    /*
+    // potentially needed for future work:
+
+    fn is_start(&self) -> bool {
+        let offset = 32 - 1;
+        (self.0 & (1 << offset)) != 0
+    }
+    fn has_lsda(&self) -> bool{
+        let offset = 32 - 2;
+        (self.0 & (1 << offset)) != 0
+    }
+    fn personality_index(&self) -> u32 {
+        let offset = 32 - 4;
+        (self.0 >> offset) & 0b11
+    }
+    */
+}
+
+// x86/x64 implementation
+impl Opcode {
+    fn x86_instructions(&self, iter: &CompactUnwindInfoIter) -> CompactUnwindOp {
+        let pointer_size = self.pointer_size(iter) as i32;
+        match self.x86_mode() {
+            Some(X86UnwindingMode::RbpFrame) => {
+                // This function has the standard function prelude and rbp
+                // has been preserved. Additionally, any callee-saved registers
+                // that haven't been preserved (x86_rbp_registers) are saved on
+                // the stack at x86_rbp_stack_offset.
+                let mut ops = CompactCfiOpIter::new();
+
+                ops.push(CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                });
+                ops.push(CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                });
+                ops.push(CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                });
+
+                // This implementation here is in line with whatever llvm does here:
+                // https://github.com/llvm/llvm-project/blob/d21a35ac0a958fd4cff0b8f424a2706b8785b89d/lldb/source/Symbol/CompactUnwindInfo.cpp#L766-L788
+
+                // These offsets are relative to the frame pointer, but
+                // cfi prefers things to be relative to the cfa, so apply
+                // the same offset here too.
+                let offset = self.x86_rbp_stack_offset() as i32 + 2;
+                // Offset advances even if there's no register here
+                for (i, reg) in self.x86_rbp_registers().iter().enumerate() {
+                    if let Some(reg) = *reg {
+                        ops.push(CompactCfiOp::RegisterAt {
+                            dest_reg: reg,
+                            src_reg: CompactCfiRegister::Cfa,
+                            offset_from_src: -(offset - i as i32) * pointer_size,
+                        });
+                    }
+                }
+                CompactUnwindOp::CfiOps(ops.into_iter())
+            }
+            Some(X86UnwindingMode::StackImmediate) => {
+                // This function doesn't have the standard rbp-based prelude,
+                // but we know how large its stack frame is (x86_frameless_stack_size),
+                // and any callee-saved registers that haven't been preserved are
+                // saved *immediately* after the location at rip.
+
+                let mut ops = CompactCfiOpIter::new();
+
+                let stack_size = self.x86_frameless_stack_size();
+                ops.push(CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size as i32 * pointer_size,
+                });
+                ops.push(CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                });
+
+                let mut offset = 2;
+                // offset only advances if there's a register here.
+                // also note registers are in reverse order.
+                for reg in self.x86_frameless_registers().iter().rev() {
+                    if let Some(reg) = *reg {
+                        ops.push(CompactCfiOp::RegisterAt {
+                            dest_reg: reg,
+                            src_reg: CompactCfiRegister::Cfa,
+                            offset_from_src: -offset * pointer_size,
+                        });
+                        offset += 1;
+                    }
+                }
+                CompactUnwindOp::CfiOps(ops.into_iter())
+            }
+            Some(X86UnwindingMode::StackIndirect) => {
+                // TODO: implement this? Perhaps there is no reasonable implementation
+                // since this involves parsing a value out of a machine instruction
+                // in the binary? Or can we just do that work here and it just
+                // becomes a constant in the CFI output?
+                //
+                // Either way it's not urgent, since this mode is only needed for
+                // stack frames that are bigger than ~2KB.
+                CompactUnwindOp::None
+            }
+            Some(X86UnwindingMode::Dwarf) => {
+                // Oops! It was in the eh_frame all along.
+
+                let offset_in_eh_frame = self.x86_dwarf_fde();
+                CompactUnwindOp::UseDwarfFde { offset_in_eh_frame }
+            }
+            None => CompactUnwindOp::None,
+        }
+    }
+
+    fn x86_mode(&self) -> Option<X86UnwindingMode> {
+        const X86_MODE_MASK: u32 = 0x0F00_0000;
+        const X86_MODE_RBP_FRAME: u32 = 0x0100_0000;
+        const X86_MODE_STACK_IMMD: u32 = 0x0200_0000;
+        const X86_MODE_STACK_IND: u32 = 0x0300_0000;
+        const X86_MODE_DWARF: u32 = 0x0400_0000;
+
+        let masked = self.0 & X86_MODE_MASK;
+
+        match masked {
+            X86_MODE_RBP_FRAME => Some(X86UnwindingMode::RbpFrame),
+            X86_MODE_STACK_IMMD => Some(X86UnwindingMode::StackImmediate),
+            X86_MODE_STACK_IND => Some(X86UnwindingMode::StackIndirect),
+            X86_MODE_DWARF => Some(X86UnwindingMode::Dwarf),
+            _ => None,
+        }
+    }
+
+    fn x86_rbp_registers(&self) -> [Option<CompactCfiRegister>; 5] {
+        let mask = 0b111;
+        [
+            CompactCfiRegister::from_x86_encoded(self.0 & mask),
+            CompactCfiRegister::from_x86_encoded((self.0 >> 3) & mask),
+            CompactCfiRegister::from_x86_encoded((self.0 >> 6) & mask),
+            CompactCfiRegister::from_x86_encoded((self.0 >> 9) & mask),
+            CompactCfiRegister::from_x86_encoded((self.0 >> 12) & mask),
+        ]
+    }
+
+    fn x86_rbp_stack_offset(&self) -> u32 {
+        let offset = 32 - 8 - 8;
+        (self.0 >> offset) & 0b1111_1111
+    }
+
+    fn x86_frameless_stack_size(&self) -> u32 {
+        let offset = 32 - 8 - 8;
+        (self.0 >> offset) & 0b1111_1111
+    }
+
+    fn x86_frameless_register_count(&self) -> u32 {
+        let offset = 32 - 8 - 8 - 3 - 3;
+        let register_count = (self.0 >> offset) & 0b111;
+        if register_count > 6 {
+            6
+        } else {
+            register_count
+        }
+    }
+
+    fn x86_frameless_registers(&self) -> [Option<CompactCfiRegister>; 6] {
+        let mut permutation = self.0 & 0b11_1111_1111;
+        let mut permunreg = [0; 6];
+        let register_count = self.x86_frameless_register_count();
+
+        // I honestly haven't looked into what the heck this is doing, I
+        // just copied this implementation from llvm since it honestly doesn't
+        // matter much. Magically unpack 6 values from 10 bits!
+        match register_count {
+            6 => {
+                permunreg[0] = permutation / 120; // 120 == 5!
+                permutation -= permunreg[0] * 120;
+                permunreg[1] = permutation / 24; // 24 == 4!
+                permutation -= permunreg[1] * 24;
+                permunreg[2] = permutation / 6; // 6 == 3!
+                permutation -= permunreg[2] * 6;
+                permunreg[3] = permutation / 2; // 2 == 2!
+                permutation -= permunreg[3] * 2;
+                permunreg[4] = permutation; // 1 == 1!
+                permunreg[5] = 0;
+            }
+            5 => {
+                permunreg[0] = permutation / 120;
+                permutation -= permunreg[0] * 120;
+                permunreg[1] = permutation / 24;
+                permutation -= permunreg[1] * 24;
+                permunreg[2] = permutation / 6;
+                permutation -= permunreg[2] * 6;
+                permunreg[3] = permutation / 2;
+                permutation -= permunreg[3] * 2;
+                permunreg[4] = permutation;
+            }
+            4 => {
+                permunreg[0] = permutation / 60;
+                permutation -= permunreg[0] * 60;
+                permunreg[1] = permutation / 12;
+                permutation -= permunreg[1] * 12;
+                permunreg[2] = permutation / 3;
+                permutation -= permunreg[2] * 3;
+                permunreg[3] = permutation;
+            }
+            3 => {
+                permunreg[0] = permutation / 20;
+                permutation -= permunreg[0] * 20;
+                permunreg[1] = permutation / 4;
+                permutation -= permunreg[1] * 4;
+                permunreg[2] = permutation;
+            }
+            2 => {
+                permunreg[0] = permutation / 5;
+                permutation -= permunreg[0] * 5;
+                permunreg[1] = permutation;
+            }
+            1 => {
+                permunreg[0] = permutation;
+            }
+            _ => {
+                // Do nothing
+            }
+        }
+
+        let mut registers = [0u32; 6];
+        let mut used = [false; 7];
+        for i in 0..register_count {
+            let mut renum = 0;
+            for j in 1u32..7 {
+                if !used[j as usize] {
+                    if renum == permunreg[i as usize] {
+                        registers[i as usize] = j;
+                        used[j as usize] = true;
+                        break;
+                    }
+                    renum += 1;
+                }
+            }
+        }
+        [
+            CompactCfiRegister::from_x86_encoded(registers[0]),
+            CompactCfiRegister::from_x86_encoded(registers[1]),
+            CompactCfiRegister::from_x86_encoded(registers[2]),
+            CompactCfiRegister::from_x86_encoded(registers[3]),
+            CompactCfiRegister::from_x86_encoded(registers[4]),
+            CompactCfiRegister::from_x86_encoded(registers[5]),
+        ]
+    }
+
+    fn x86_dwarf_fde(&self) -> u32 {
+        self.0 & 0x00FF_FFFF
+    }
+    /*
+    // potentially needed for future work:
+
+    fn x86_frameless_stack_adjust(&self) -> u32 {
+        let offset = 32 - 8 - 8 - 3;
+        (self.0 >> offset) & 0b111
+    }
+    */
+}
+
+// ARM64 implementation
+impl Opcode {
+    fn arm64_mode(&self) -> Option<Arm64UnwindingMode> {
+        const ARM64_MODE_MASK: u32 = 0x0F000000;
+        const ARM64_MODE_FRAMELESS: u32 = 0x02000000;
+        const ARM64_MODE_DWARF: u32 = 0x03000000;
+        const ARM64_MODE_FRAME: u32 = 0x04000000;
+
+        let masked = self.0 & ARM64_MODE_MASK;
+
+        match masked {
+            ARM64_MODE_FRAMELESS => Some(Arm64UnwindingMode::Frameless),
+            ARM64_MODE_DWARF => Some(Arm64UnwindingMode::Dwarf),
+            ARM64_MODE_FRAME => Some(Arm64UnwindingMode::Frame),
+            _ => None,
+        }
+    }
+
+    fn arm64_instructions(&self, iter: &CompactUnwindInfoIter) -> CompactUnwindOp {
+        let pointer_size = self.pointer_size(iter) as i32;
+        match self.arm64_mode() {
+            Some(Arm64UnwindingMode::Frameless) => {
+                // This is a "frameless" leaf function. All there is to
+                // do is pop the stack and move the return address from
+                // the link register to the instruction pointer.
+
+                // Stack size is divided by 16.
+                let stack_size = self.arm64_frameless_stack_size() * 16;
+                let mut ops = CompactCfiOpIter::new();
+
+                ops.push(CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size as i32,
+                });
+                ops.push(CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::link_register(),
+                    offset_from_src: 0,
+                });
+
+                CompactUnwindOp::CfiOps(ops.into_iter())
+            }
+            Some(Arm64UnwindingMode::Dwarf) => {
+                let offset_in_eh_frame = self.arm64_dwarf_fde();
+                CompactUnwindOp::UseDwarfFde { offset_in_eh_frame }
+            }
+            Some(Arm64UnwindingMode::Frame) => {
+                let mut ops = CompactCfiOpIter::new();
+
+                // This function has the standard ARM64 prologue, where
+                // the frame pointer and instruction pointer are immediately
+                // pushed as a pair onto the stack, and then the frame
+                // pointer is updated to be the current stack pointer.
+                ops.push(CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                });
+                ops.push(CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                });
+                ops.push(CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                });
+
+                // Then the X19-X28 registers that need to be restored
+                // are pushed onto the stack in pairs in ascending order.
+                // This is followed by the D8-D15 registers that need
+                // to be restored.
+
+                // The registers that were pushed are just represented
+                // by a simple bit set covering bits 0-9 (**low-to-high**):
+                let num_reg_pairs = 9;
+                let mut pairs_saved = 0;
+                for pair_num in 0..num_reg_pairs {
+                    let has_pair = (self.0 & (1 << pair_num)) != 0;
+                    if has_pair {
+                        // Although ARM64 wants to restore these registers in pairs,
+                        // we specify them individually since CFI likes it that way.
+                        let first_reg = ARM64_REG_BASE + pair_num * 2;
+                        let second_reg = ARM64_REG_BASE + pair_num * 2 + 1;
+
+                        ops.push(CompactCfiOp::RegisterAt {
+                            dest_reg: CompactCfiRegister::from_arm64_encoded(first_reg),
+                            src_reg: CompactCfiRegister::Cfa,
+                            offset_from_src: (-2 * pairs_saved - 3) * pointer_size,
+                        });
+                        ops.push(CompactCfiOp::RegisterAt {
+                            dest_reg: CompactCfiRegister::from_arm64_encoded(second_reg),
+                            src_reg: CompactCfiRegister::Cfa,
+                            offset_from_src: (-2 * pairs_saved - 4) * pointer_size,
+                        });
+                        pairs_saved += 1;
+                    }
+                }
+
+                CompactUnwindOp::CfiOps(ops.into_iter())
+            }
+            None => CompactUnwindOp::None,
+        }
+    }
+
+    fn arm64_frameless_stack_size(&self) -> u32 {
+        let offset = 32 - 8 - 12;
+        (self.0 >> offset) & 0xFFF
+    }
+
+    fn arm64_dwarf_fde(&self) -> u32 {
+        self.0 & 0x00FF_FFFF
+    }
+}
+
+// The x86 encoding includes the frame pointer as value 6, while
+// the ARM64 encoding doesn't encode it (but needs it for output).
+// To avoid the register number of the frame pointer being dependent
+// on the target architecture, we start ARM64 register numbers
+// *after* 6, so that value can still be used. This is potentially
+// needlessly cute, but it makes usage a bit cleaner.
+const REG_FRAME: u8 = 6;
+const ARM64_REG_BASE: u32 = REG_FRAME as u32 + 1;
+// These registers aren't ever encoded explicitly, so we make
+// up some arbitrary values for reporting them in our outputs.
+const REG_LINK: u8 = 253;
+const REG_INSTRUCTION: u8 = 254;
+const REG_STACK: u8 = 255;
+
+/// A register for a [`CompactCfiOp`], as used by Compact Unwinding.
+///
+/// You should just treat this opaquely and use its methods to make sense of it.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum CompactCfiRegister {
+    /// The CFA register (Canonical Frame Address) -- the frame pointer (e.g. rbp)
+    Cfa,
+    /// Any other register, restricted to those referenced by Compact Unwinding.
+    Other(u8),
+}
+
+impl CompactCfiRegister {
+    fn from_x86_encoded(val: u32) -> Option<Self> {
+        if (1..=6).contains(&val) {
+            Some(CompactCfiRegister::Other(val as u8))
+        } else {
+            None
+        }
+    }
+
+    fn from_arm64_encoded(val: u32) -> Self {
+        // Assert shouldn't happen as we're processing trusted input here, but
+        // good to validate this in tests.
+        debug_assert!((ARM64_REG_BASE..ARM64_REG_BASE + 18).contains(&val));
+        CompactCfiRegister::Other(val as u8)
+    }
+
+    /// Whether this register is the cfa register.
+    pub fn is_cfa(&self) -> bool {
+        matches!(*self, CompactCfiRegister::Cfa)
+    }
+
+    /// The name of this register that cfi wants.
+    pub fn name(&self, iter: &CompactUnwindInfoIter) -> Option<&'static str> {
+        match self {
+            CompactCfiRegister::Cfa => Some("cfa"),
+            CompactCfiRegister::Other(other) => name_of_other_reg(*other, iter),
+        }
+    }
+
+    /// Gets the register for the frame pointer (e.g. rbp).
+    pub fn frame_pointer() -> Self {
+        CompactCfiRegister::Other(REG_FRAME)
+    }
+
+    /// Gets the register for the instruction pointer (e.g. rip).
+    pub fn instruction_pointer() -> Self {
+        CompactCfiRegister::Other(REG_INSTRUCTION)
+    }
+
+    /// Gets the register for the stack pointer (e.g. rsp).
+    pub fn stack_pointer() -> Self {
+        CompactCfiRegister::Other(REG_STACK)
+    }
+
+    /// Get the ARM64 link register (x30).
+    pub fn link_register() -> Self {
+        CompactCfiRegister::Other(REG_LINK)
+    }
+}
+
+fn name_of_other_reg(reg: u8, iter: &CompactUnwindInfoIter) -> Option<&'static str> {
+    match iter.arch {
+        Arch::X86 => match reg {
+            0 => None,
+            1 => Some("ebx"),
+            2 => Some("ecx"),
+            3 => Some("edx"),
+            4 => Some("edi"),
+            5 => Some("esi"),
+            6 => Some("ebp"),
+
+            // Not part of the compact format, but needed to describe opcode behaviours
+            REG_INSTRUCTION => Some("eip"),
+            REG_STACK => Some("esp"),
+
+            _ => None,
+        },
+        Arch::X64 => match reg {
+            0 => None,
+            1 => Some("rbx"),
+            2 => Some("r12"),
+            3 => Some("r13"),
+            4 => Some("r14"),
+            5 => Some("r15"),
+            6 => Some("rbp"),
+
+            // Not part of the compact format, but needed to describe opcode behaviours
+            REG_INSTRUCTION => Some("rip"),
+            REG_STACK => Some("rsp"),
+            _ => None,
+        },
+        Arch::Arm64 => {
+            match reg {
+                7 => Some("x19"),
+                8 => Some("x20"),
+                9 => Some("x21"),
+                10 => Some("x22"),
+                11 => Some("x23"),
+                12 => Some("x24"),
+                13 => Some("x25"),
+                14 => Some("x26"),
+                15 => Some("x27"),
+                16 => Some("x28"),
+
+                17 => Some("d8"),
+                18 => Some("d9"),
+                19 => Some("d10"),
+                20 => Some("d11"),
+                21 => Some("d12"),
+                22 => Some("d13"),
+                23 => Some("d14"),
+                24 => Some("d15"),
+
+                // Not part of the compact format, but needed to describe opcode behaviours
+                REG_FRAME => Some("x29"),
+                REG_LINK => Some("x30"),
+                REG_INSTRUCTION => Some("pc"),
+                REG_STACK => Some("sp"),
+                _ => None,
+            }
+        }
+        _ => None,
+    }
+}
+
+/// An iterator over the [`CompactCfiOp`]s yielded by [`CompactUnwindOp::CfiOps`].
+#[derive(Debug, Clone)]
+pub struct CompactCfiOpIter {
+    // This is just a hacky impl of an ArrayVec to avoid depending on it, and
+    // avoid allocating. This ends up storing 20 u64's if enum optimizations
+    // work the way I expect.
+    items: [Option<CompactCfiOp>; 21],
+    cur_idx: usize,
+}
+
+impl CompactCfiOpIter {
+    fn new() -> Self {
+        Self {
+            items: [
+                None, None, None, None, None, None, None, None, None, None, None, None, None, None,
+                None, None, None, None, None, None, None,
+            ],
+            cur_idx: 0,
+        }
+    }
+
+    fn push(&mut self, item: CompactCfiOp) {
+        // Will panic if we overflow, but that's fine, the buffer should be
+        // sized to fit any payload we need, since that's bounded.
+        self.items[self.cur_idx] = Some(item);
+        self.cur_idx += 1;
+    }
+
+    /// Resets cur_idx for this to be used as an iterator,
+    /// because I'm too lazy to make *another* type for this.
+    fn into_iter(mut self) -> Self {
+        self.cur_idx = 0;
+        self
+    }
+}
+
+impl Iterator for CompactCfiOpIter {
+    type Item = CompactCfiOp;
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.cur_idx < self.items.len() {
+            let old_idx = self.cur_idx;
+            self.cur_idx += 1;
+            self.items[old_idx].take()
+        } else {
+            None
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+
+    use super::{
+        CompactCfiOp, CompactCfiRegister, CompactUnwindInfoIter, CompactUnwindOp, Opcode,
+        ARM64_REG_BASE,
+    };
+    use crate::macho::MachError;
+    use scroll::Pwrite;
+    use symbolic_common::Arch;
+
+    // All Second-level pages have this much memory to work with, let's stick to that
+    const PAGE_SIZE: usize = 4096;
+    const REGULAR_PAGE_HEADER_LEN: usize = 8;
+    const COMPRESSED_PAGE_HEADER_LEN: usize = 12;
+    const MAX_REGULAR_SECOND_LEVEL_ENTRIES: usize = (PAGE_SIZE - REGULAR_PAGE_HEADER_LEN) / 8;
+    const MAX_COMPRESSED_SECOND_LEVEL_ENTRIES: usize = (PAGE_SIZE - COMPRESSED_PAGE_HEADER_LEN) / 4;
+    const MAX_COMPRESSED_SECOND_LEVEL_ENTRIES_WITH_MAX_LOCALS: usize =
+        (PAGE_SIZE - COMPRESSED_PAGE_HEADER_LEN - MAX_LOCAL_OPCODES_LEN as usize * 4) / 4;
+
+    // Mentioned by headers, but seems to have no real significance
+    const MAX_GLOBAL_OPCODES_LEN: u32 = 127;
+    const MAX_LOCAL_OPCODES_LEN: u32 = 128;
+
+    // Only 2 bits are allocated to this index
+    const MAX_PERSONALITIES_LEN: u32 = 4;
+
+    const X86_MODE_RBP_FRAME: u32 = 0x0100_0000;
+    const X86_MODE_STACK_IMMD: u32 = 0x0200_0000;
+    const X86_MODE_STACK_IND: u32 = 0x0300_0000;
+    const X86_MODE_DWARF: u32 = 0x0400_0000;
+
+    const ARM64_MODE_FRAMELESS: u32 = 0x02000000;
+    const ARM64_MODE_DWARF: u32 = 0x03000000;
+    const ARM64_MODE_FRAME: u32 = 0x04000000;
+
+    const REGULAR_PAGE_KIND: u32 = 2;
+    const COMPRESSED_PAGE_KIND: u32 = 3;
+
+    fn align(offset: u32, align: u32) -> u32 {
+        // Adding `align - 1` to a value push unaligned values to the next multiple,
+        // and integer division + multiplication can then remove the remainder.
+        ((offset + align - 1) / align) * align
+    }
+    fn pack_x86_rbp_registers(regs: [u8; 5]) -> u32 {
+        let mut result: u32 = 0;
+        let base_offset = 0;
+        for (idx, &reg) in regs.iter().enumerate() {
+            assert!(reg <= 6);
+            result |= (reg as u32 & 0b111) << (base_offset + idx * 3);
+        }
+
+        result
+    }
+    fn pack_x86_stackless_registers(num_regs: u32, registers: [u8; 6]) -> u32 {
+        for &reg in &registers {
+            assert!(reg <= 6);
+        }
+
+        // Also copied from llvm implementation
+        let mut renumregs = [0u32; 6];
+        for i in 6 - num_regs..6 {
+            let mut countless = 0;
+            for j in 6 - num_regs..i {
+                if registers[j as usize] < registers[i as usize] {
+                    countless += 1;
+                }
+            }
+            renumregs[i as usize] = registers[i as usize] as u32 - countless - 1;
+        }
+        let mut permutation_encoding: u32 = 0;
+        match num_regs {
+            6 => {
+                permutation_encoding |= 120 * renumregs[0]
+                    + 24 * renumregs[1]
+                    + 6 * renumregs[2]
+                    + 2 * renumregs[3]
+                    + renumregs[4];
+            }
+            5 => {
+                permutation_encoding |= 120 * renumregs[1]
+                    + 24 * renumregs[2]
+                    + 6 * renumregs[3]
+                    + 2 * renumregs[4]
+                    + renumregs[5];
+            }
+            4 => {
+                permutation_encoding |=
+                    60 * renumregs[2] + 12 * renumregs[3] + 3 * renumregs[4] + renumregs[5];
+            }
+            3 => {
+                permutation_encoding |= 20 * renumregs[3] + 4 * renumregs[4] + renumregs[5];
+            }
+            2 => {
+                permutation_encoding |= 5 * renumregs[4] + renumregs[5];
+            }
+            1 => {
+                permutation_encoding |= renumregs[5];
+            }
+            0 => {
+                // do nothing
+            }
+            _ => unreachable!(),
+        }
+        permutation_encoding
+    }
+    fn assert_opcodes_match<A, B>(mut a: A, mut b: B)
+    where
+        A: Iterator<Item = CompactCfiOp>,
+        B: Iterator<Item = CompactCfiOp>,
+    {
+        while let (Some(a_op), Some(b_op)) = (a.next(), b.next()) {
+            assert_eq!(a_op, b_op);
+        }
+        assert!(b.next().is_none());
+        assert!(a.next().is_none());
+    }
+
+    #[test]
+    // Make sure we error out for an unknown version of this section
+    fn test_compact_unknown_version() -> Result<(), MachError> {
+        {
+            let offset = &mut 0;
+            let mut section = vec![0u8; 1024];
+
+            // Version 0 doesn't exist
+            section.gwrite(0u32, offset)?;
+
+            assert!(CompactUnwindInfoIter::new(&section, true, Arch::Amd64).is_err());
+        }
+
+        {
+            let offset = &mut 0;
+            let mut section = vec![0; 1024];
+
+            // Version 2 doesn't exist
+            section.gwrite(2u32, offset)?;
+            assert!(CompactUnwindInfoIter::new(&section, true, Arch::X86).is_err());
+        }
+        Ok(())
+    }
+
+    #[test]
+    // Make sure we handle a section with no entries reasonably
+    fn test_compact_empty() -> Result<(), MachError> {
+        let offset = &mut 0;
+        let mut section = vec![0u8; 1024];
+
+        // Just set the version, everything else is 0
+        section.gwrite(1u32, offset)?;
+
+        let mut iter = CompactUnwindInfoIter::new(&section, true, Arch::Amd64)?;
+        assert!(iter.next()?.is_none());
+        assert!(iter.next()?.is_none());
+
+        Ok(())
+    }
+
+    #[test]
+    // Create a reasonable structure that has both kinds of second-level pages
+    // and poke at some corner cases. opcode values are handled opaquely, just
+    // checking that they roundtrip correctly.
+    fn test_compact_structure() -> Result<(), MachError> {
+        let global_opcodes: Vec<u32> = vec![0, 2, 4, 7];
+        assert!(global_opcodes.len() <= MAX_GLOBAL_OPCODES_LEN as usize);
+        let personalities: Vec<u32> = vec![7, 12, 3];
+        assert!(personalities.len() <= MAX_PERSONALITIES_LEN as usize);
+
+        // instruction_address, lsda_address
+        let lsdas: Vec<(u32, u32)> = vec![(0, 1), (7, 3), (18, 5)];
+
+        // first_instruction_address, second_page_offset, lsda_offset
+        let mut first_entries: Vec<(u32, u32, u32)> = vec![];
+
+        /////////////////////////////////////////////////
+        //          Values we will be testing          //
+        /////////////////////////////////////////////////
+
+        // page entries are instruction_address, opcode
+        let mut regular_entries: Vec<Vec<(u32, u32)>> = vec![
+            // Some data
+            vec![(1, 7), (3, 8), (6, 10), (10, 4)],
+            vec![(20, 5), (21, 2), (24, 7), (25, 0)],
+            // Page len 1
+            vec![(29, 8)],
+        ];
+        let mut compressed_entries: Vec<Vec<(u32, u32)>> = vec![
+            // Some data
+            vec![(10001, 7), (10003, 8), (10006, 10), (10010, 4)],
+            vec![(10020, 5), (10021, 2), (10024, 7), (10025, 0)],
+            // Page len 1
+            vec![(10029, 8)],
+        ];
+
+        // max-len regular page
+        let mut temp = vec![];
+        let base_instruction = 100;
+        for i in 0..MAX_REGULAR_SECOND_LEVEL_ENTRIES {
+            temp.push((base_instruction + i as u32, i as u32))
+        }
+        regular_entries.push(temp);
+
+        // max-len compact page (only global entries)
+        let mut temp = vec![];
+        let base_instruction = 10100;
+        for i in 0..MAX_COMPRESSED_SECOND_LEVEL_ENTRIES {
+            temp.push((base_instruction + i as u32, 2))
+        }
+        compressed_entries.push(temp);
+
+        // max-len compact page (max local entries)
+        let mut temp = vec![];
+        let base_instruction = 14100;
+        for i in 0..MAX_COMPRESSED_SECOND_LEVEL_ENTRIES_WITH_MAX_LOCALS {
+            temp.push((
+                base_instruction + i as u32,
+                100 + (i as u32 % MAX_LOCAL_OPCODES_LEN),
+            ))
+        }
+        compressed_entries.push(temp);
+
+        ///////////////////////////////////////////////////////
+        //               Compute the format                  //
+        ///////////////////////////////////////////////////////
+
+        // First temporarily write the second level pages into other buffers
+        let mut second_level_pages: Vec<[u8; PAGE_SIZE]> = vec![];
+        for page in &regular_entries {
+            second_level_pages.push([0; PAGE_SIZE]);
+            let buf = second_level_pages.last_mut().unwrap();
+            let buf_offset = &mut 0;
+
+            // kind
+            buf.gwrite(REGULAR_PAGE_KIND, buf_offset)?;
+
+            // entry array offset + len
+            buf.gwrite(REGULAR_PAGE_HEADER_LEN as u16, buf_offset)?;
+            buf.gwrite(page.len() as u16, buf_offset)?;
+
+            for &(insruction_address, opcode) in page {
+                buf.gwrite(insruction_address, buf_offset)?;
+                buf.gwrite(opcode, buf_offset)?;
+            }
+        }
+
+        for page in &compressed_entries {
+            second_level_pages.push([0; PAGE_SIZE]);
+            let buf = second_level_pages.last_mut().unwrap();
+            let buf_offset = &mut 0;
+
+            // Compute a palete for local opcodes
+            // (this is semi-quadratic in that it can do 255 * 1000 iterations, it's fine)
+            let mut local_opcodes = vec![];
+            let mut indices = vec![];
+            for &(_, opcode) in page {
+                if let Some((idx, _)) = global_opcodes
+                    .iter()
+                    .enumerate()
+                    .find(|&(_, &global_opcode)| global_opcode == opcode)
+                {
+                    indices.push(idx);
+                } else if let Some((idx, _)) = local_opcodes
+                    .iter()
+                    .enumerate()
+                    .find(|&(_, &global_opcode)| global_opcode == opcode)
+                {
+                    indices.push(global_opcodes.len() + idx);
+                } else {
+                    local_opcodes.push(opcode);
+                    indices.push(global_opcodes.len() + local_opcodes.len() - 1);
+                }
+            }
+            assert!(local_opcodes.len() <= MAX_LOCAL_OPCODES_LEN as usize);
+
+            let entries_offset = COMPRESSED_PAGE_HEADER_LEN + local_opcodes.len() * 4;
+            let first_address = page.first().unwrap().0;
+            // kind
+            buf.gwrite(COMPRESSED_PAGE_KIND, buf_offset)?;
+
+            // entry array offset + len
+            buf.gwrite(entries_offset as u16, buf_offset)?;
+            buf.gwrite(page.len() as u16, buf_offset)?;
+
+            // local opcodes array + len
+            buf.gwrite(COMPRESSED_PAGE_HEADER_LEN as u16, buf_offset)?;
+            buf.gwrite(local_opcodes.len() as u16, buf_offset)?;
+
+            for opcode in local_opcodes {
+                buf.gwrite(opcode, buf_offset)?;
+            }
+            for (&(instruction_address, _opcode), idx) in page.iter().zip(indices) {
+                let compressed_address = (instruction_address - first_address) & 0x00FF_FFFF;
+                let compressed_idx = (idx as u32) << 24;
+                assert_eq!(compressed_address + first_address, instruction_address);
+                assert_eq!(idx & 0xFFFF_FF00, 0);
+
+                let compressed_opcode: u32 = compressed_address | compressed_idx;
+                buf.gwrite(compressed_opcode, buf_offset)?;
+            }
+        }
+
+        let header_size: u32 = 4 * 7;
+        let global_opcodes_offset: u32 = header_size;
+        let personalities_offset: u32 = global_opcodes_offset + global_opcodes.len() as u32 * 4;
+        let first_entries_offset: u32 = personalities_offset + personalities.len() as u32 * 4;
+        let lsdas_offset: u32 = first_entries_offset + (second_level_pages.len() + 1) as u32 * 12;
+        let second_level_pages_offset: u32 =
+            align(lsdas_offset + lsdas.len() as u32 * 8, PAGE_SIZE as u32);
+        let final_size: u32 =
+            second_level_pages_offset + second_level_pages.len() as u32 * PAGE_SIZE as u32;
+
+        // Validate that we have strictly monotonically increasing addresses,
+        // and build the first-level entries.
+        let mut cur_address = 0;
+        for (idx, page) in regular_entries
+            .iter()
+            .chain(compressed_entries.iter())
+            .enumerate()
+        {
+            let first_address = page.first().unwrap().0;
+            let page_offset = second_level_pages_offset + PAGE_SIZE as u32 * idx as u32;
+            first_entries.push((first_address, page_offset, lsdas_offset));
+
+            for &(address, _) in page {
+                assert!(address > cur_address);
+                cur_address = address;
+            }
+        }
+        assert_eq!(second_level_pages.len(), first_entries.len());
+        // Push the null page into our first_entries
+        first_entries.push((cur_address + 1, 0, 0));
+
+        ///////////////////////////////////////////////////////
+        //                  Emit the binary                  //
+        ///////////////////////////////////////////////////////
+
+        let offset = &mut 0;
+        let mut section = vec![0u8; final_size as usize];
+
+        // Write the header
+        section.gwrite(1u32, offset)?;
+
+        section.gwrite(global_opcodes_offset, offset)?;
+        section.gwrite(global_opcodes.len() as u32, offset)?;
+
+        section.gwrite(personalities_offset, offset)?;
+        section.gwrite(personalities.len() as u32, offset)?;
+
+        section.gwrite(first_entries_offset, offset)?;
+        section.gwrite(first_entries.len() as u32, offset)?;
+
+        // Write the arrays
+        assert_eq!(*offset as u32, global_opcodes_offset);
+        for &opcode in &global_opcodes {
+            section.gwrite(opcode, offset)?;
+        }
+        assert_eq!(*offset as u32, personalities_offset);
+        for &personality in &personalities {
+            section.gwrite(personality, offset)?;
+        }
+        assert_eq!(*offset as u32, first_entries_offset);
+        for &entry in &first_entries {
+            section.gwrite(entry.0, offset)?;
+            section.gwrite(entry.1, offset)?;
+            section.gwrite(entry.2, offset)?;
+        }
+        assert_eq!(*offset as u32, lsdas_offset);
+        for &lsda in &lsdas {
+            section.gwrite(lsda.0, offset)?;
+            section.gwrite(lsda.1, offset)?;
+        }
+
+        // Write the pages
+        *offset = second_level_pages_offset as usize;
+        for second_level_page in &second_level_pages {
+            for byte in second_level_page {
+                section.gwrite(byte, offset)?;
+            }
+        }
+
+        ///////////////////////////////////////////////////////
+        //         Test that everything roundtrips           //
+        ///////////////////////////////////////////////////////
+
+        let mut iter = CompactUnwindInfoIter::new(&section, true, Arch::Amd64)?;
+        let mut orig_entries = regular_entries
+            .iter()
+            .chain(compressed_entries.iter())
+            .flatten();
+
+        while let (Some(entry), Some((orig_address, orig_opcode))) =
+            (iter.next()?, orig_entries.next())
+        {
+            assert_eq!(entry.instruction_address, *orig_address);
+            assert_eq!(entry.opcode.0, *orig_opcode);
+        }
+
+        // Confirm both were completely exhausted at the same time
+        assert!(iter.next()?.is_none());
+        assert_eq!(orig_entries.next(), None);
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_compact_opcodes_x86() -> Result<(), MachError> {
+        // Make an empty but valid section to initialize the CompactUnwindInfoIter
+        let pointer_size = 4;
+        let frameless_reg_count_offset = 32 - 8 - 8 - 3 - 3;
+        let stack_size_offset = 32 - 8 - 8;
+        let offset = &mut 0;
+        let mut section = vec![0u8; 1024];
+        // Just set the version, everything else is 0
+        section.gwrite(1u32, offset)?;
+
+        let iter = CompactUnwindInfoIter::new(&section, true, Arch::X86)?;
+
+        // Check that the null opcode is handled reasonably
+        {
+            let opcode = Opcode(0);
+            assert!(matches!(opcode.instructions(&iter), CompactUnwindOp::None));
+        }
+
+        // Check that dwarf opcodes work
+        {
+            let opcode = Opcode(X86_MODE_DWARF | 0x00123456);
+            assert!(matches!(
+                opcode.instructions(&iter),
+                CompactUnwindOp::UseDwarfFde {
+                    offset_in_eh_frame: 0x00123456
+                }
+            ));
+        }
+
+        // Check that rbp opcodes work
+        {
+            // Simple, no general registers to restore
+            let stack_size: i32 = 0xa1;
+            let registers = [0, 0, 0, 0, 0];
+            let opcode = Opcode(
+                X86_MODE_RBP_FRAME
+                    | pack_x86_rbp_registers(registers)
+                    | (stack_size as u32) << stack_size_offset,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // One general register to restore
+            let stack_size: i32 = 0x13;
+            let registers = [1, 0, 0, 0, 0];
+            let opcode = Opcode(
+                X86_MODE_RBP_FRAME
+                    | pack_x86_rbp_registers(registers)
+                    | (stack_size as u32) << stack_size_offset,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(1).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2) * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // All general register slots used
+            let stack_size: i32 = 0xc2;
+            let registers = [2, 3, 4, 5, 6];
+            let opcode = Opcode(
+                X86_MODE_RBP_FRAME
+                    | pack_x86_rbp_registers(registers)
+                    | (stack_size as u32) << stack_size_offset,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(2).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(3).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 1) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(4).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 2) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(5).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 3) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(6).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 4) * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // Holes in the general registers
+            let stack_size: i32 = 0xa7;
+            let registers = [2, 0, 4, 0, 6];
+            let opcode = Opcode(
+                X86_MODE_RBP_FRAME
+                    | pack_x86_rbp_registers(registers)
+                    | (stack_size as u32) << stack_size_offset,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(2).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(4).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 2) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(6).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 4) * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+
+        // Check that stack-immediate opcodes work
+        {
+            // Simple, no general registers to restore
+            let stack_size: i32 = 0xa1;
+            let packed_stack_size = (stack_size as u32) << stack_size_offset;
+            let num_regs = 0;
+            let packed_num_regs = num_regs << frameless_reg_count_offset;
+            let registers = [0, 0, 0, 0, 0, 0];
+            let opcode = Opcode(
+                X86_MODE_STACK_IMMD
+                    | pack_x86_stackless_registers(num_regs, registers)
+                    | packed_num_regs
+                    | packed_stack_size,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // One general register to restore
+            let stack_size: i32 = 0x13;
+            let packed_stack_size = (stack_size as u32) << stack_size_offset;
+            let num_regs = 1;
+            let packed_num_regs = num_regs << frameless_reg_count_offset;
+            let registers = [0, 0, 0, 0, 0, 1];
+            let opcode = Opcode(
+                X86_MODE_STACK_IMMD
+                    | pack_x86_stackless_registers(num_regs, registers)
+                    | packed_num_regs
+                    | packed_stack_size,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(1).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // All general register slots used
+            let stack_size: i32 = 0xc1;
+            let packed_stack_size = (stack_size as u32) << stack_size_offset;
+            let num_regs = 6;
+            let packed_num_regs = num_regs << frameless_reg_count_offset;
+            let registers = [1, 2, 3, 4, 5, 6];
+            let opcode = Opcode(
+                X86_MODE_STACK_IMMD
+                    | pack_x86_stackless_registers(num_regs, registers)
+                    | packed_num_regs
+                    | packed_stack_size,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(6).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(5).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -3 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(4).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -4 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(3).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -5 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(2).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -6 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(1).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -7 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // Some general registers
+            let stack_size: i32 = 0xf1;
+            let packed_stack_size = (stack_size as u32) << stack_size_offset;
+            let num_regs = 3;
+            let packed_num_regs = num_regs << frameless_reg_count_offset;
+            let registers = [0, 0, 0, 2, 4, 6];
+            let opcode = Opcode(
+                X86_MODE_STACK_IMMD
+                    | pack_x86_stackless_registers(num_regs, registers)
+                    | packed_num_regs
+                    | packed_stack_size,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(6).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(4).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -3 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(2).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -4 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+
+        // Check that stack-indirect opcodes work (feature unimplemented)
+        {
+            let _opcode = Opcode(X86_MODE_STACK_IND);
+            // ... tests
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_compact_opcodes_x64() -> Result<(), MachError> {
+        // Make an empty but valid section to initialize the CompactUnwindInfoIter
+        let pointer_size = 8;
+        let frameless_reg_count_offset = 32 - 8 - 8 - 3 - 3;
+        let stack_size_offset = 32 - 8 - 8;
+        let offset = &mut 0;
+        let mut section = vec![0u8; 1024];
+        // Just set the version, everything else is 0
+        section.gwrite(1u32, offset)?;
+
+        let iter = CompactUnwindInfoIter::new(&section, true, Arch::Amd64)?;
+
+        // Check that the null opcode is handled reasonably
+        {
+            let opcode = Opcode(0);
+            assert!(matches!(opcode.instructions(&iter), CompactUnwindOp::None));
+        }
+
+        // Check that dwarf opcodes work
+        {
+            let opcode = Opcode(X86_MODE_DWARF | 0x00123456);
+            assert!(matches!(
+                opcode.instructions(&iter),
+                CompactUnwindOp::UseDwarfFde {
+                    offset_in_eh_frame: 0x00123456
+                }
+            ));
+        }
+
+        // Check that rbp opcodes work
+        {
+            // Simple, no general registers to restore
+            let stack_size: i32 = 0xa1;
+            let registers = [0, 0, 0, 0, 0];
+            let opcode = Opcode(
+                X86_MODE_RBP_FRAME
+                    | pack_x86_rbp_registers(registers)
+                    | (stack_size as u32) << stack_size_offset,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // One general register to restore
+            let stack_size: i32 = 0x13;
+            let registers = [1, 0, 0, 0, 0];
+            let opcode = Opcode(
+                X86_MODE_RBP_FRAME
+                    | pack_x86_rbp_registers(registers)
+                    | (stack_size as u32) << stack_size_offset,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(1).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2) * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // All general register slots used
+            let stack_size: i32 = 0xc2;
+            let registers = [2, 3, 4, 5, 6];
+            let opcode = Opcode(
+                X86_MODE_RBP_FRAME
+                    | pack_x86_rbp_registers(registers)
+                    | (stack_size as u32) << stack_size_offset,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(2).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(3).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 1) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(4).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 2) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(5).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 3) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(6).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 4) * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // Holes in the general registers
+            let stack_size: i32 = 0xa7;
+            let registers = [2, 0, 4, 0, 6];
+            let opcode = Opcode(
+                X86_MODE_RBP_FRAME
+                    | pack_x86_rbp_registers(registers)
+                    | (stack_size as u32) << stack_size_offset,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(2).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(4).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 2) * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(6).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -(stack_size + 2 - 4) * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+
+        // Check that stack-immediate opcodes work
+        {
+            // Simple, no general registers to restore
+            let stack_size: i32 = 0xa1;
+            let packed_stack_size = (stack_size as u32) << stack_size_offset;
+            let num_regs = 0;
+            let packed_num_regs = num_regs << frameless_reg_count_offset;
+            let registers = [0, 0, 0, 0, 0, 0];
+            let opcode = Opcode(
+                X86_MODE_STACK_IMMD
+                    | pack_x86_stackless_registers(num_regs, registers)
+                    | packed_num_regs
+                    | packed_stack_size,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // One general register to restore
+            let stack_size: i32 = 0x13;
+            let packed_stack_size = (stack_size as u32) << stack_size_offset;
+            let num_regs = 1;
+            let packed_num_regs = num_regs << frameless_reg_count_offset;
+            let registers = [0, 0, 0, 0, 0, 1];
+            let opcode = Opcode(
+                X86_MODE_STACK_IMMD
+                    | pack_x86_stackless_registers(num_regs, registers)
+                    | packed_num_regs
+                    | packed_stack_size,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(1).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // All general register slots used
+            let stack_size: i32 = 0xc1;
+            let packed_stack_size = (stack_size as u32) << stack_size_offset;
+            let num_regs = 6;
+            let packed_num_regs = num_regs << frameless_reg_count_offset;
+            let registers = [1, 2, 3, 4, 5, 6];
+            let opcode = Opcode(
+                X86_MODE_STACK_IMMD
+                    | pack_x86_stackless_registers(num_regs, registers)
+                    | packed_num_regs
+                    | packed_stack_size,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(6).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(5).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -3 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(4).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -4 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(3).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -5 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(2).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -6 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(1).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -7 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // Some general registers
+            let stack_size: i32 = 0xf1;
+            let packed_stack_size = (stack_size as u32) << stack_size_offset;
+            let num_regs = 3;
+            let packed_num_regs = num_regs << frameless_reg_count_offset;
+            let registers = [0, 0, 0, 2, 4, 6];
+            let opcode = Opcode(
+                X86_MODE_STACK_IMMD
+                    | pack_x86_stackless_registers(num_regs, registers)
+                    | packed_num_regs
+                    | packed_stack_size,
+            );
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(6).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(4).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -3 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_x86_encoded(2).unwrap(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -4 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+
+        // Check that stack-indirect opcodes work (feature unimplemented)
+        {
+            let _opcode = Opcode(X86_MODE_STACK_IND);
+            // ... tests
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_compact_opcodes_arm64() -> Result<(), MachError> {
+        // Make an empty but valid section to initialize the CompactUnwindInfoIter
+        let pointer_size = 8;
+        let frameless_stack_size_offset = 32 - 8 - 12;
+        let offset = &mut 0;
+        let mut section = vec![0u8; 1024];
+        // Just set the version, everything else is 0
+        section.gwrite(1u32, offset)?;
+
+        let iter = CompactUnwindInfoIter::new(&section, true, Arch::Arm64)?;
+
+        // Check that the null opcode is handled reasonably
+        {
+            let opcode = Opcode(0);
+            assert!(matches!(opcode.instructions(&iter), CompactUnwindOp::None));
+        }
+
+        // Check that dwarf opcodes work
+        {
+            let opcode = Opcode(ARM64_MODE_DWARF | 0x00123456);
+            assert!(matches!(
+                opcode.instructions(&iter),
+                CompactUnwindOp::UseDwarfFde {
+                    offset_in_eh_frame: 0x00123456
+                }
+            ));
+        }
+
+        // Check that frame opcodes work
+        {
+            // Simple, no general registers to restore
+            let registers = 0b0_0000_0000;
+            let opcode = Opcode(ARM64_MODE_FRAME | registers);
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // One general register pair to restore
+            let registers = 0b0_0100_0000;
+            let opcode = Opcode(ARM64_MODE_FRAME | registers);
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 12),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -3 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 13),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -4 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // All general purpose registers restored
+            let registers = 0b1_1111_1111;
+            let opcode = Opcode(ARM64_MODE_FRAME | registers);
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -3 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 1),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -4 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 2),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -5 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 3),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -6 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 4),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -7 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 5),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -8 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 6),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -9 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 7),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -10 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 8),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -11 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 9),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -12 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 10),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -13 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 11),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -14 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 12),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -15 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 13),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -16 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 14),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -17 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 15),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -18 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 16),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -19 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 17),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -20 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+        {
+            // Holes between the registers
+            let registers = 0b1_0101_0101;
+            let opcode = Opcode(ARM64_MODE_FRAME | registers);
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::frame_pointer(),
+                    offset_from_src: 2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::frame_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -2 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -3 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 1),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -4 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 4),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -5 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 5),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -6 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 8),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -7 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 9),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -8 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 12),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -9 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 13),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -10 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 16),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -11 * pointer_size,
+                },
+                CompactCfiOp::RegisterAt {
+                    dest_reg: CompactCfiRegister::from_arm64_encoded(ARM64_REG_BASE + 17),
+                    src_reg: CompactCfiRegister::Cfa,
+                    offset_from_src: -12 * pointer_size,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+
+        // Check that the frameless opcode works
+        {
+            let stack_size = 0xae1;
+            let packed_stack_size = stack_size << frameless_stack_size_offset;
+            let opcode = Opcode(ARM64_MODE_FRAMELESS | packed_stack_size);
+            let expected = vec![
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::Cfa,
+                    src_reg: CompactCfiRegister::stack_pointer(),
+                    offset_from_src: stack_size as i32 * 16,
+                },
+                CompactCfiOp::RegisterIs {
+                    dest_reg: CompactCfiRegister::instruction_pointer(),
+                    src_reg: CompactCfiRegister::link_register(),
+                    offset_from_src: 0,
+                },
+            ];
+
+            match opcode.instructions(&iter) {
+                CompactUnwindOp::CfiOps(ops) => assert_opcodes_match(ops, expected.into_iter()),
+                _ => unreachable!(),
+            }
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_compact_register_naming() -> Result<(), MachError> {
+        // Just guarding against special register names breaking
+
+        let offset = &mut 0;
+        let mut section = vec![0u8; 1024];
+        // Just set the version, everything else is 0
+        section.gwrite(1u32, offset)?;
+
+        {
+            // ARM64 register names
+            let iter = CompactUnwindInfoIter::new(&section, true, Arch::Arm64)?;
+
+            assert_eq!(CompactCfiRegister::Cfa.name(&iter), Some("cfa"));
+            assert_eq!(CompactCfiRegister::stack_pointer().name(&iter), Some("sp"));
+            assert_eq!(
+                CompactCfiRegister::instruction_pointer().name(&iter),
+                Some("pc")
+            );
+            assert_eq!(CompactCfiRegister::frame_pointer().name(&iter), Some("x29"));
+            assert_eq!(CompactCfiRegister::link_register().name(&iter), Some("x30"));
+        }
+
+        {
+            // x86 register names
+            let iter = CompactUnwindInfoIter::new(&section, true, Arch::X86)?;
+
+            assert_eq!(CompactCfiRegister::Cfa.name(&iter), Some("cfa"));
+            assert_eq!(CompactCfiRegister::stack_pointer().name(&iter), Some("esp"));
+            assert_eq!(
+                CompactCfiRegister::instruction_pointer().name(&iter),
+                Some("eip")
+            );
+            assert_eq!(CompactCfiRegister::frame_pointer().name(&iter), Some("ebp"));
+        }
+
+        {
+            // x64 register names
+            let iter = CompactUnwindInfoIter::new(&section, true, Arch::Amd64)?;
+
+            assert_eq!(CompactCfiRegister::Cfa.name(&iter), Some("cfa"));
+            assert_eq!(CompactCfiRegister::stack_pointer().name(&iter), Some("rsp"));
+            assert_eq!(
+                CompactCfiRegister::instruction_pointer().name(&iter),
+                Some("rip")
+            );
+            assert_eq!(CompactCfiRegister::frame_pointer().name(&iter), Some("rbp"));
+        }
+
+        Ok(())
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,873 @@
+//! Support for Mach Objects, used on macOS and iOS.
+
+use std::borrow::Cow;
+use std::error::Error;
+use std::fmt;
+use std::io::Cursor;
+use std::sync::Arc;
+
+use goblin::mach;
+use smallvec::SmallVec;
+use thiserror::Error;
+
+use symbolic_common::{Arch, AsSelf, CodeId, DebugId, Uuid};
+
+use crate::base::*;
+use crate::dwarf::{Dwarf, DwarfDebugSession, DwarfError, DwarfSection, Endian};
+use crate::private::{MonoArchive, MonoArchiveObjects, Parse};
+
+mod bcsymbolmap;
+pub mod compact;
+
+pub use bcsymbolmap::*;
+pub use compact::*;
+
+/// Prefix for hidden symbols from Apple BCSymbolMap builds.
+const SWIFT_HIDDEN_PREFIX: &str = "__hidden#";
+
+/// An error when dealing with [`MachObject`](struct.MachObject.html).
+#[derive(Debug, Error)]
+#[error("invalid MachO file")]
+pub struct MachError {
+    #[source]
+    source: Option<Box<dyn Error + Send + Sync + 'static>>,
+}
+
+impl MachError {
+    /// Creates a new MachO error from an arbitrary error payload.
+    fn new<E>(source: E) -> Self
+    where
+        E: Into<Box<dyn Error + Send + Sync>>,
+    {
+        let source = Some(source.into());
+        Self { source }
+    }
+}
+
+impl From<goblin::error::Error> for MachError {
+    fn from(e: goblin::error::Error) -> Self {
+        Self::new(e)
+    }
+}
+
+impl From<scroll::Error> for MachError {
+    fn from(e: scroll::Error) -> Self {
+        Self::new(e)
+    }
+}
+
+/// Mach Object containers, used for executables and debug companions on macOS and iOS.
+pub struct MachObject<'d> {
+    macho: mach::MachO<'d>,
+    data: &'d [u8],
+    bcsymbolmap: Option<Arc<BcSymbolMap<'d>>>,
+}
+
+impl<'d> MachObject<'d> {
+    /// Tests whether the buffer could contain a MachO object.
+    pub fn test(data: &[u8]) -> bool {
+        matches!(
+            goblin::peek(&mut Cursor::new(data)),
+            Ok(goblin::Hint::Mach(_))
+        )
+    }
+
+    /// Tries to parse a MachO from the given slice.
+    pub fn parse(data: &'d [u8]) -> Result<Self, MachError> {
+        mach::MachO::parse(data, 0)
+            .map(|macho| MachObject {
+                macho,
+                data,
+                bcsymbolmap: None,
+            })
+            .map_err(MachError::new)
+    }
+
+    /// Parses and loads the [`BcSymbolMap`] into the object.
+    ///
+    /// The bitcode symbol map must match the object, there is nothing in the symbol map
+    /// which allows this call to verify this.
+    ///
+    /// Once the symbolmap is loaded this object will transparently resolve any hidden
+    /// symbols using the provided symbolmap.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use symbolic_debuginfo::macho::{BcSymbolMap, MachObject};
+    ///
+    /// // let object_data = std::fs::read("dSYMs/.../Resources/DWARF/object").unwrap();
+    /// # let object_data =
+    /// #     std::fs::read("tests/fixtures/2d10c42f-591d-3265-b147-78ba0868073f.dwarf-hidden")
+    /// #         .unwrap();
+    /// let mut object = MachObject::parse(&object_data).unwrap();
+    ///
+    /// let map = object.symbol_map();
+    /// let symbol = map.lookup(0x5a74).unwrap();
+    /// assert_eq!(symbol.name.as_ref().map(|n| n.to_owned()).unwrap(), "__hidden#0_");
+    ///
+    /// // let bc_symbol_map_data =
+    /// //     std::fs::read("BCSymbolMaps/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap")
+    /// //     .unwrap();
+    /// # let bc_symbol_map_data =
+    /// #     std::fs::read("tests/fixtures/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap")
+    /// #         .unwrap();
+    /// let bc_symbol_map = BcSymbolMap::parse(&bc_symbol_map_data).unwrap();
+    /// object.load_symbolmap(bc_symbol_map);
+    ///
+    ///
+    /// let map = object.symbol_map();
+    /// let symbol = map.lookup(0x5a74).unwrap();
+    /// assert_eq!(
+    ///     symbol.name.as_ref().map(|n| n.to_owned()).unwrap(),
+    ///     "-[SentryMessage initWithFormatted:]",
+    /// );
+    /// ```
+    pub fn load_symbolmap(&mut self, symbolmap: BcSymbolMap<'d>) {
+        self.bcsymbolmap = Some(Arc::new(symbolmap));
+    }
+
+    /// Gets the Compact Unwind Info of this object, if any exists.
+    pub fn compact_unwind_info(&self) -> Result<Option<CompactUnwindInfoIter<'d>>, MachError> {
+        if let Some(section) = self.section("unwind_info") {
+            if let Cow::Borrowed(section) = section.data {
+                let arch = self.arch();
+                let is_little_endian = self.endianity() == Endian::Little;
+                return Ok(Some(CompactUnwindInfoIter::new(
+                    section,
+                    is_little_endian,
+                    arch,
+                )?));
+            }
+        }
+        Ok(None)
+    }
+
+    /// The container file format, which is always `FileFormat::MachO`.
+    pub fn file_format(&self) -> FileFormat {
+        FileFormat::MachO
+    }
+
+    fn find_uuid(&self) -> Option<Uuid> {
+        for cmd in &self.macho.load_commands {
+            if let mach::load_command::CommandVariant::Uuid(ref uuid_cmd) = cmd.command {
+                return Uuid::from_slice(&uuid_cmd.uuid).ok();
+            }
+        }
+
+        None
+    }
+
+    /// The name of the dylib if any.
+    pub fn name(&self) -> Option<&'d str> {
+        self.macho.name
+    }
+
+    /// The code identifier of this object.
+    ///
+    /// Mach objects use a UUID which is specified in the load commands that are part of the Mach
+    /// header. This UUID is generated at compile / link time and is usually unique per compilation.
+    pub fn code_id(&self) -> Option<CodeId> {
+        let uuid = self.find_uuid()?;
+        Some(CodeId::from_binary(&uuid.as_bytes()[..]))
+    }
+
+    /// The debug information identifier of a MachO file.
+    ///
+    /// This uses the same UUID as `code_id`.
+    pub fn debug_id(&self) -> DebugId {
+        self.find_uuid().map(DebugId::from_uuid).unwrap_or_default()
+    }
+
+    /// The CPU architecture of this object, as specified in the Mach header.
+    pub fn arch(&self) -> Arch {
+        use goblin::mach::constants::cputype;
+
+        match (self.macho.header.cputype(), self.macho.header.cpusubtype()) {
+            (cputype::CPU_TYPE_I386, cputype::CPU_SUBTYPE_I386_ALL) => Arch::X86,
+            (cputype::CPU_TYPE_I386, _) => Arch::X86Unknown,
+            (cputype::CPU_TYPE_X86_64, cputype::CPU_SUBTYPE_X86_64_ALL) => Arch::Amd64,
+            (cputype::CPU_TYPE_X86_64, cputype::CPU_SUBTYPE_X86_64_H) => Arch::Amd64h,
+            (cputype::CPU_TYPE_X86_64, _) => Arch::Amd64Unknown,
+            (cputype::CPU_TYPE_ARM64, cputype::CPU_SUBTYPE_ARM64_ALL) => Arch::Arm64,
+            (cputype::CPU_TYPE_ARM64, cputype::CPU_SUBTYPE_ARM64_V8) => Arch::Arm64V8,
+            (cputype::CPU_TYPE_ARM64, cputype::CPU_SUBTYPE_ARM64_E) => Arch::Arm64e,
+            (cputype::CPU_TYPE_ARM64, _) => Arch::Arm64Unknown,
+            (cputype::CPU_TYPE_ARM64_32, cputype::CPU_SUBTYPE_ARM64_32_ALL) => Arch::Arm64_32,
+            (cputype::CPU_TYPE_ARM64_32, cputype::CPU_SUBTYPE_ARM64_32_V8) => Arch::Arm64_32V8,
+            (cputype::CPU_TYPE_ARM64_32, _) => Arch::Arm64_32Unknown,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_ALL) => Arch::Arm,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V5TEJ) => Arch::ArmV5,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V6) => Arch::ArmV6,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V6M) => Arch::ArmV6m,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7) => Arch::ArmV7,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7F) => Arch::ArmV7f,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7S) => Arch::ArmV7s,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7K) => Arch::ArmV7k,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7M) => Arch::ArmV7m,
+            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7EM) => Arch::ArmV7em,
+            (cputype::CPU_TYPE_ARM, _) => Arch::ArmUnknown,
+            (cputype::CPU_TYPE_POWERPC, cputype::CPU_SUBTYPE_POWERPC_ALL) => Arch::Ppc,
+            (cputype::CPU_TYPE_POWERPC64, cputype::CPU_SUBTYPE_POWERPC_ALL) => Arch::Ppc64,
+            (_, _) => Arch::Unknown,
+        }
+    }
+
+    /// The kind of this object, as specified in the Mach header.
+    pub fn kind(&self) -> ObjectKind {
+        match self.macho.header.filetype {
+            goblin::mach::header::MH_OBJECT => ObjectKind::Relocatable,
+            goblin::mach::header::MH_EXECUTE => ObjectKind::Executable,
+            goblin::mach::header::MH_FVMLIB => ObjectKind::Library,
+            goblin::mach::header::MH_CORE => ObjectKind::Dump,
+            goblin::mach::header::MH_PRELOAD => ObjectKind::Executable,
+            goblin::mach::header::MH_DYLIB => ObjectKind::Library,
+            goblin::mach::header::MH_DYLINKER => ObjectKind::Executable,
+            goblin::mach::header::MH_BUNDLE => ObjectKind::Library,
+            goblin::mach::header::MH_DSYM => ObjectKind::Debug,
+            goblin::mach::header::MH_KEXT_BUNDLE => ObjectKind::Library,
+            _ => ObjectKind::Other,
+        }
+    }
+
+    /// The address at which the image prefers to be loaded into memory.
+    ///
+    /// MachO files store all internal addresses as if it was loaded at that address. When the image
+    /// is actually loaded, that spot might already be taken by other images and so it must be
+    /// relocated to a new address. At runtime, a relocation table manages the arithmetics behind
+    /// this.
+    ///
+    /// Addresses used in `symbols` or `debug_session` have already been rebased relative to that
+    /// load address, so that the caller only has to deal with addresses relative to the actual
+    /// start of the image.
+    pub fn load_address(&self) -> u64 {
+        for seg in &self.macho.segments {
+            if seg.name().map(|name| name == "__TEXT").unwrap_or(false) {
+                return seg.vmaddr;
+            }
+        }
+
+        0
+    }
+
+    /// Determines whether this object exposes a public symbol table.
+    pub fn has_symbols(&self) -> bool {
+        self.macho.symbols.is_some()
+    }
+
+    /// Returns an iterator over symbols in the public symbol table.
+    pub fn symbols(&self) -> MachOSymbolIterator<'d> {
+        // Cache indices of code sections. These are either "__text" or "__stubs", always located in
+        // the "__TEXT" segment. It looks like each of those sections only occurs once, but to be
+        // safe they are collected into a vector.
+        let mut sections = SmallVec::new();
+        let mut section_index = 0;
+
+        'outer: for segment in &self.macho.segments {
+            if segment.name().ok() != Some("__TEXT") {
+                section_index += segment.nsects as usize;
+                continue;
+            }
+
+            for result in segment {
+                // Do not continue to iterate potentially broken section headers. This could lead to
+                // invalid section indices.
+                let section = match result {
+                    Ok((section, _data)) => section,
+                    Err(_) => break 'outer,
+                };
+
+                match section.name() {
+                    Ok("__text") | Ok("__stubs") => sections.push(section_index),
+                    _ => (),
+                }
+
+                section_index += 1;
+            }
+        }
+
+        MachOSymbolIterator {
+            symbols: self.macho.symbols(),
+            sections,
+            vmaddr: self.load_address(),
+            symbolmap: self.bcsymbolmap.clone(),
+        }
+    }
+
+    /// Returns an ordered map of symbols in the symbol table.
+    pub fn symbol_map(&self) -> SymbolMap<'d> {
+        self.symbols().collect()
+    }
+
+    /// Determines whether this object contains debug information.
+    pub fn has_debug_info(&self) -> bool {
+        self.has_section("debug_info")
+    }
+
+    /// Constructs a debugging session.
+    ///
+    /// A debugging session loads certain information from the object file and creates caches for
+    /// efficient access to various records in the debug information. Since this can be quite a
+    /// costly process, try to reuse the debugging session as long as possible.
+    ///
+    /// MachO files generally use DWARF debugging information, which is also used by ELF containers
+    /// on Linux.
+    ///
+    /// Constructing this session will also work if the object does not contain debugging
+    /// information, in which case the session will be a no-op. This can be checked via
+    /// [`has_debug_info`](struct.MachObject.html#method.has_debug_info).
+    pub fn debug_session(&self) -> Result<DwarfDebugSession<'d>, DwarfError> {
+        let symbols = self.symbol_map();
+        let mut session =
+            DwarfDebugSession::parse(self, symbols, self.load_address() as i64, self.kind())?;
+        session.load_symbolmap(self.bcsymbolmap.clone());
+        Ok(session)
+    }
+
+    /// Determines whether this object contains stack unwinding information.
+    pub fn has_unwind_info(&self) -> bool {
+        self.has_section("eh_frame")
+            || self.has_section("debug_frame")
+            || self.has_section("unwind_info")
+    }
+
+    /// Determines whether this object contains embedded source.
+    pub fn has_sources(&self) -> bool {
+        false
+    }
+
+    /// Returns the raw data of the ELF file.
+    pub fn data(&self) -> &'d [u8] {
+        self.data
+    }
+
+    /// Checks whether this mach object contains hidden symbols.
+    ///
+    /// This is an indication that BCSymbolMaps are needed to symbolicate crash reports correctly.
+    pub fn requires_symbolmap(&self) -> bool {
+        self.symbols().any(|s| {
+            s.name()
+                .map_or(false, |n| n.starts_with(SWIFT_HIDDEN_PREFIX))
+        })
+    }
+}
+
+impl fmt::Debug for MachObject<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("MachObject")
+            .field("code_id", &self.code_id())
+            .field("debug_id", &self.debug_id())
+            .field("arch", &self.arch())
+            .field("kind", &self.kind())
+            .field("load_address", &format_args!("{:#x}", self.load_address()))
+            .field("has_symbols", &self.has_symbols())
+            .field("has_debug_info", &self.has_debug_info())
+            .field("has_unwind_info", &self.has_unwind_info())
+            .finish()
+    }
+}
+
+impl<'slf, 'd: 'slf> AsSelf<'slf> for MachObject<'d> {
+    type Ref = MachObject<'slf>;
+
+    fn as_self(&'slf self) -> &Self::Ref {
+        self
+    }
+}
+
+impl<'d> Parse<'d> for MachObject<'d> {
+    type Error = MachError;
+
+    fn test(data: &[u8]) -> bool {
+        Self::test(data)
+    }
+
+    fn parse(data: &'d [u8]) -> Result<Self, MachError> {
+        Self::parse(data)
+    }
+}
+
+impl<'data: 'object, 'object> ObjectLike<'data, 'object> for MachObject<'data> {
+    type Error = DwarfError;
+    type Session = DwarfDebugSession<'data>;
+    type SymbolIterator = MachOSymbolIterator<'data>;
+
+    fn file_format(&self) -> FileFormat {
+        self.file_format()
+    }
+
+    fn code_id(&self) -> Option<CodeId> {
+        self.code_id()
+    }
+
+    fn debug_id(&self) -> DebugId {
+        self.debug_id()
+    }
+
+    fn arch(&self) -> Arch {
+        self.arch()
+    }
+
+    fn kind(&self) -> ObjectKind {
+        self.kind()
+    }
+
+    fn load_address(&self) -> u64 {
+        self.load_address()
+    }
+
+    fn has_symbols(&self) -> bool {
+        self.has_symbols()
+    }
+
+    fn symbols(&self) -> Self::SymbolIterator {
+        self.symbols()
+    }
+
+    fn symbol_map(&self) -> SymbolMap<'data> {
+        self.symbol_map()
+    }
+
+    fn has_debug_info(&self) -> bool {
+        self.has_debug_info()
+    }
+
+    fn debug_session(&self) -> Result<Self::Session, Self::Error> {
+        self.debug_session()
+    }
+
+    fn has_unwind_info(&self) -> bool {
+        self.has_unwind_info()
+    }
+
+    fn has_sources(&self) -> bool {
+        self.has_sources()
+    }
+}
+
+impl<'data> Dwarf<'data> for MachObject<'data> {
+    fn endianity(&self) -> Endian {
+        if self.macho.little_endian {
+            Endian::Little
+        } else {
+            Endian::Big
+        }
+    }
+
+    fn raw_section(&self, section_name: &str) -> Option<DwarfSection<'data>> {
+        for segment in &self.macho.segments {
+            for (header, data) in segment.into_iter().flatten() {
+                if let Ok(sec) = header.name() {
+                    if sec.len() >= 2 && &sec[2..] == section_name {
+                        // In some cases, dsymutil leaves sections headers but removes their
+                        // data from the file. While the addr and size parameters are still
+                        // set, `header.offset` is 0 in that case. We skip them just like the
+                        // section was missing to avoid loading invalid data.
+                        if header.offset == 0 {
+                            return None;
+                        }
+
+                        return Some(DwarfSection {
+                            data: Cow::Borrowed(data),
+                            address: header.addr,
+                            offset: u64::from(header.offset),
+                            align: u64::from(header.align),
+                        });
+                    }
+                }
+            }
+        }
+
+        None
+    }
+}
+
+/// An iterator over symbols in the MachO file.
+///
+/// Returned by [`MachObject::symbols`](struct.MachObject.html#method.symbols).
+pub struct MachOSymbolIterator<'data> {
+    symbols: mach::symbols::SymbolIterator<'data>,
+    sections: SmallVec<[usize; 2]>,
+    vmaddr: u64,
+    symbolmap: Option<Arc<BcSymbolMap<'data>>>,
+}
+
+impl<'data> Iterator for MachOSymbolIterator<'data> {
+    type Item = Symbol<'data>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        for next in &mut self.symbols {
+            // Gracefully recover from corrupt nlists
+            let (mut name, nlist) = match next {
+                Ok(pair) => pair,
+                Err(_) => continue,
+            };
+
+            // Sanity check of the symbol address. Since we only intend to iterate over function
+            // symbols, they need to be mapped after the image's vmaddr.
+            if nlist.n_value < self.vmaddr {
+                continue;
+            }
+
+            // We are only interested in symbols pointing to a code section (type `N_SECT`). The
+            // section index is incremented by one to leave room for `NO_SECT` (0). Section indexes
+            // of the code sections have been passed in via `self.sections`.
+            let in_valid_section = !nlist.is_stab()
+                && nlist.get_type() == mach::symbols::N_SECT
+                && nlist.n_sect != (mach::symbols::NO_SECT as usize)
+                && self.sections.contains(&(nlist.n_sect - 1));
+
+            if !in_valid_section {
+                continue;
+            }
+
+            if let Some(symbolmap) = self.symbolmap.as_ref() {
+                name = symbolmap.resolve(name);
+            }
+
+            // Trim leading underscores from mangled C++ names.
+            if let Some(tail) = name.strip_prefix('_') {
+                if !name.starts_with(SWIFT_HIDDEN_PREFIX) {
+                    name = tail;
+                }
+            }
+
+            return Some(Symbol {
+                name: Some(Cow::Borrowed(name)),
+                address: nlist.n_value - self.vmaddr,
+                size: 0, // Computed in `SymbolMap`
+            });
+        }
+
+        None
+    }
+}
+
+/// An iterator over objects in a [`FatMachO`](struct.FatMachO.html).
+///
+/// Objects are parsed just-in-time while iterating, which may result in errors. The iterator is
+/// still valid afterwards, however, and can be used to resolve the next object.
+pub struct FatMachObjectIterator<'d, 'a> {
+    iter: mach::FatArchIterator<'a>,
+    remaining: usize,
+    data: &'d [u8],
+}
+
+impl<'d, 'a> Iterator for FatMachObjectIterator<'d, 'a> {
+    type Item = Result<MachObject<'d>, MachError>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.remaining == 0 {
+            return None;
+        }
+
+        self.remaining -= 1;
+        match self.iter.next() {
+            Some(Ok(arch)) => {
+                let start = (arch.offset as usize).min(self.data.len());
+                let end = ((arch.offset + arch.size) as usize).min(self.data.len());
+                Some(MachObject::parse(&self.data[start..end]))
+            }
+            Some(Err(error)) => Some(Err(MachError::new(error))),
+            None => None,
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.remaining, Some(self.remaining))
+    }
+}
+
+impl std::iter::FusedIterator for FatMachObjectIterator<'_, '_> {}
+impl ExactSizeIterator for FatMachObjectIterator<'_, '_> {}
+
+/// A fat MachO container that hosts one or more [`MachObject`]s.
+///
+/// [`MachObject`]: struct.MachObject.html
+pub struct FatMachO<'d> {
+    fat: mach::MultiArch<'d>,
+    data: &'d [u8],
+}
+
+impl<'d> FatMachO<'d> {
+    /// Tests whether the buffer could contain an ELF object.
+    pub fn test(data: &[u8]) -> bool {
+        matches!(
+            goblin::peek(&mut Cursor::new(data)),
+            Ok(goblin::Hint::MachFat(_))
+        )
+    }
+
+    /// Tries to parse a fat MachO container from the given slice.
+    pub fn parse(data: &'d [u8]) -> Result<Self, MachError> {
+        mach::MultiArch::new(data)
+            .map(|fat| FatMachO { fat, data })
+            .map_err(MachError::new)
+    }
+
+    /// Returns an iterator over objects in this container.
+    pub fn objects(&self) -> FatMachObjectIterator<'d, '_> {
+        FatMachObjectIterator {
+            iter: self.fat.iter_arches(),
+            remaining: self.fat.narches,
+            data: self.data,
+        }
+    }
+
+    /// Returns the number of objects in this archive.
+    pub fn object_count(&self) -> usize {
+        self.fat.narches
+    }
+
+    /// Resolves the object at the given index.
+    ///
+    /// Returns `Ok(None)` if the index is out of bounds, or `Err` if the object exists but cannot
+    /// be parsed.
+    pub fn object_by_index(&self, index: usize) -> Result<Option<MachObject<'d>>, MachError> {
+        let arch = match self.fat.iter_arches().nth(index) {
+            Some(arch) => arch.map_err(MachError::new)?,
+            None => return Ok(None),
+        };
+
+        let start = (arch.offset as usize).min(self.data.len());
+        let end = ((arch.offset + arch.size) as usize).min(self.data.len());
+        MachObject::parse(&self.data[start..end]).map(Some)
+    }
+}
+
+impl fmt::Debug for FatMachO<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("FatMachO").field("fat", &self.fat).finish()
+    }
+}
+
+impl<'slf, 'd: 'slf> AsSelf<'slf> for FatMachO<'d> {
+    type Ref = FatMachO<'slf>;
+
+    fn as_self(&'slf self) -> &Self::Ref {
+        self
+    }
+}
+
+enum MachObjectIteratorInner<'d, 'a> {
+    Single(MonoArchiveObjects<'d, MachObject<'d>>),
+    Archive(FatMachObjectIterator<'d, 'a>),
+}
+
+/// An iterator over objects in a [`MachArchive`](struct.MachArchive.html).
+pub struct MachObjectIterator<'d, 'a>(MachObjectIteratorInner<'d, 'a>);
+
+impl<'d, 'a> Iterator for MachObjectIterator<'d, 'a> {
+    type Item = Result<MachObject<'d>, MachError>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.0 {
+            MachObjectIteratorInner::Single(ref mut iter) => iter.next(),
+            MachObjectIteratorInner::Archive(ref mut iter) => iter.next(),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        match self.0 {
+            MachObjectIteratorInner::Single(ref iter) => iter.size_hint(),
+            MachObjectIteratorInner::Archive(ref iter) => iter.size_hint(),
+        }
+    }
+}
+
+impl std::iter::FusedIterator for MachObjectIterator<'_, '_> {}
+impl ExactSizeIterator for MachObjectIterator<'_, '_> {}
+
+#[derive(Debug)]
+enum MachArchiveInner<'d> {
+    Single(MonoArchive<'d, MachObject<'d>>),
+    Archive(FatMachO<'d>),
+}
+
+/// An archive that can consist of a single [`MachObject`] or a [`FatMachO`] container.
+///
+/// Executables and dSYM files on macOS can be a so-called _Fat Mach Object_: It contains multiple
+/// objects for several architectures. When loading this object, the operating system determines the
+/// object corresponding to the host's architecture. This allows to distribute a single binary with
+/// optimizations for specific CPUs, which is frequently done on iOS.
+///
+/// To abstract over the differences, `MachArchive` simulates the archive interface also for single
+/// Mach objects. This allows uniform access to both file types.
+///
+/// [`MachObject`]: struct.MachObject.html
+/// [`FatMachO`]: struct.FatMachO.html
+#[derive(Debug)]
+pub struct MachArchive<'d>(MachArchiveInner<'d>);
+
+impl<'d> MachArchive<'d> {
+    /// Tests whether the buffer contains either a Mach Object or a Fat Mach Object.
+    pub fn test(data: &[u8]) -> bool {
+        match goblin::peek(&mut Cursor::new(data)) {
+            Ok(goblin::Hint::Mach(_)) => true,
+            Ok(goblin::Hint::MachFat(narchs)) => {
+                // so this is kind of stupid but java class files share the same cutsey magic
+                // as a macho fat file (CAFEBABE).  This means that we often claim that a java
+                // class file is actually a macho binary but it's not.  The next 32 bytes encode
+                // the number of embedded architectures in a fat mach.  In case of a JAR file
+                // we have 2 bytes for minor version and 2 bytes for major version of the class
+                // file format.
+                //
+                // The internet suggests the first public version of Java had the class version
+                // 45.  Thus the logic applied here is that if the number is >= 45 we're more
+                // likely to have a java class file than a macho file with 45 architectures
+                // which should be very rare.
+                //
+                // https://docs.oracle.com/javase/specs/jvms/se6/html/ClassFile.doc.html
+                narchs < 45
+            }
+            _ => false,
+        }
+    }
+
+    /// Tries to parse a Mach archive from the given slice.
+    pub fn parse(data: &'d [u8]) -> Result<Self, MachError> {
+        Ok(MachArchive(match goblin::peek(&mut Cursor::new(data)) {
+            Ok(goblin::Hint::MachFat(_)) => MachArchiveInner::Archive(FatMachO::parse(data)?),
+            // Fall back to mach parsing to receive a meaningful error message from goblin
+            _ => MachArchiveInner::Single(MonoArchive::new(data)),
+        }))
+    }
+
+    /// Returns an iterator over all objects contained in this archive.
+    pub fn objects(&self) -> MachObjectIterator<'d, '_> {
+        MachObjectIterator(match self.0 {
+            MachArchiveInner::Single(ref inner) => MachObjectIteratorInner::Single(inner.objects()),
+            MachArchiveInner::Archive(ref inner) => {
+                MachObjectIteratorInner::Archive(inner.objects())
+            }
+        })
+    }
+
+    /// Returns the number of objects in this archive.
+    pub fn object_count(&self) -> usize {
+        match self.0 {
+            MachArchiveInner::Single(ref inner) => inner.object_count(),
+            MachArchiveInner::Archive(ref inner) => inner.object_count(),
+        }
+    }
+
+    /// Resolves the object at the given index.
+    ///
+    /// Returns `Ok(None)` if the index is out of bounds, or `Err` if the object exists but cannot
+    /// be parsed.
+    pub fn object_by_index(&self, index: usize) -> Result<Option<MachObject<'d>>, MachError> {
+        match self.0 {
+            MachArchiveInner::Single(ref inner) => inner.object_by_index(index),
+            MachArchiveInner::Archive(ref inner) => inner.object_by_index(index),
+        }
+    }
+
+    /// Returns whether this is a multi-object archive.
+    ///
+    /// This may also return true if there is only a single object inside the archive.
+    pub fn is_multi(&self) -> bool {
+        match self.0 {
+            MachArchiveInner::Archive(_) => true,
+            MachArchiveInner::Single(_) => false,
+        }
+    }
+}
+
+impl<'slf, 'd: 'slf> AsSelf<'slf> for MachArchive<'d> {
+    type Ref = MachArchive<'slf>;
+
+    fn as_self(&'slf self) -> &Self::Ref {
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_bcsymbolmap() {
+        let object_data =
+            std::fs::read("tests/fixtures/2d10c42f-591d-3265-b147-78ba0868073f.dwarf-hidden")
+                .unwrap();
+        let mut object = MachObject::parse(&object_data).unwrap();
+
+        // make sure that we get hidden symbols/filenames before loading the symbolmap
+        let mut symbols = object.symbols();
+        let symbol = symbols.next().unwrap();
+        assert_eq!(symbol.name.unwrap(), "__hidden#0_");
+
+        let session = object.debug_session().unwrap();
+        let mut files = session.files();
+        let file = files.next().unwrap().unwrap();
+        assert_eq!(&file.path_str(), "__hidden#41_/__hidden#42_");
+        assert_eq!(
+            &file.abs_path_str(),
+            // XXX: the path joining logic usually detects absolute paths (see below), but that does
+            // not work for these hidden paths.
+            "__hidden#41_/__hidden#41_/__hidden#42_"
+        );
+
+        let mut functions = session.functions();
+        let function = functions.next().unwrap().unwrap();
+        assert_eq!(&function.name, "__hidden#0_");
+        assert_eq!(&function.compilation_dir, b"__hidden#41_");
+        assert_eq!(
+            &function.lines[0].file.path_str(),
+            "__hidden#41_/__hidden#42_"
+        );
+
+        let fn_with_inlinees = functions
+            .filter_map(|f| f.ok())
+            .find(|f| !f.inlinees.is_empty())
+            .unwrap();
+        let inlinee = fn_with_inlinees.inlinees.first().unwrap();
+        assert_eq!(&inlinee.name, "__hidden#146_");
+
+        // loads the symbolmap
+        let bc_symbol_map_data =
+            std::fs::read("tests/fixtures/c8374b6d-6e96-34d8-ae38-efaa5fec424f.bcsymbolmap")
+                .unwrap();
+        let bc_symbol_map = BcSymbolMap::parse(&bc_symbol_map_data).unwrap();
+        object.load_symbolmap(bc_symbol_map);
+
+        // make sure we get resolved symbols/filenames now
+        let mut symbols = object.symbols();
+        let symbol = symbols.next().unwrap();
+        assert_eq!(symbol.name.unwrap(), "-[SentryMessage initWithFormatted:]");
+
+        let symbol = symbols.next().unwrap();
+        assert_eq!(symbol.name.unwrap(), "-[SentryMessage setMessage:]");
+
+        let session = object.debug_session().unwrap();
+        let mut files = session.files();
+        let file = files.next().unwrap().unwrap();
+        assert_eq!(
+            &file.path_str(),
+            "/Users/philipphofmann/git-repos/sentry-cocoa/Sources/Sentry/SentryMessage.m"
+        );
+        assert_eq!(
+            &file.abs_path_str(),
+            "/Users/philipphofmann/git-repos/sentry-cocoa/Sources/Sentry/SentryMessage.m"
+        );
+
+        let mut functions = session.functions();
+        let function = functions.next().unwrap().unwrap();
+        assert_eq!(&function.name, "-[SentryMessage initWithFormatted:]");
+        assert_eq!(
+            &function.compilation_dir,
+            b"/Users/philipphofmann/git-repos/sentry-cocoa"
+        );
+        assert_eq!(
+            &function.lines[0].file.path_str(),
+            "/Users/philipphofmann/git-repos/sentry-cocoa/Sources/Sentry/SentryMessage.m"
+        );
+
+        let fn_with_inlinees = functions
+            .filter_map(|f| f.ok())
+            .find(|f| !f.inlinees.is_empty())
+            .unwrap();
+        let inlinee = fn_with_inlinees.inlinees.first().unwrap();
+        assert_eq!(&inlinee.name, "prepareReportWriter");
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/macho.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,683 +0,0 @@
-//! Support for Mach Objects, used on macOS and iOS.
-
-use std::borrow::Cow;
-use std::error::Error;
-use std::fmt;
-use std::io::Cursor;
-
-use goblin::mach;
-use smallvec::SmallVec;
-use thiserror::Error;
-
-use symbolic_common::{Arch, AsSelf, CodeId, DebugId, Uuid};
-
-use crate::base::*;
-use crate::dwarf::{Dwarf, DwarfDebugSession, DwarfError, DwarfSection, Endian};
-use crate::private::{MonoArchive, MonoArchiveObjects, Parse};
-
-/// An error when dealing with [`MachObject`](struct.MachObject.html).
-#[derive(Debug, Error)]
-#[error("invalid MachO file")]
-pub struct MachError {
-    #[source]
-    source: Option<Box<dyn Error + Send + Sync + 'static>>,
-}
-
-impl MachError {
-    /// Creates a new MachO error from an arbitrary error payload.
-    fn new<E>(source: E) -> Self
-    where
-        E: Into<Box<dyn Error + Send + Sync>>,
-    {
-        let source = Some(source.into());
-        Self { source }
-    }
-}
-
-/// Mach Object containers, used for executables and debug companions on macOS and iOS.
-pub struct MachObject<'d> {
-    macho: mach::MachO<'d>,
-    data: &'d [u8],
-}
-
-impl<'d> MachObject<'d> {
-    /// Tests whether the buffer could contain a MachO object.
-    pub fn test(data: &[u8]) -> bool {
-        matches!(
-            goblin::peek(&mut Cursor::new(data)),
-            Ok(goblin::Hint::Mach(_))
-        )
-    }
-
-    /// Tries to parse a MachO from the given slice.
-    pub fn parse(data: &'d [u8]) -> Result<Self, MachError> {
-        mach::MachO::parse(data, 0)
-            .map(|macho| MachObject { macho, data })
-            .map_err(MachError::new)
-    }
-
-    /// The container file format, which is always `FileFormat::MachO`.
-    pub fn file_format(&self) -> FileFormat {
-        FileFormat::MachO
-    }
-
-    fn find_uuid(&self) -> Option<Uuid> {
-        for cmd in &self.macho.load_commands {
-            if let mach::load_command::CommandVariant::Uuid(ref uuid_cmd) = cmd.command {
-                return Uuid::from_slice(&uuid_cmd.uuid).ok();
-            }
-        }
-
-        None
-    }
-
-    /// The name of the dylib if any.
-    pub fn name(&self) -> Option<&'d str> {
-        self.macho.name
-    }
-
-    /// The code identifier of this object.
-    ///
-    /// Mach objects use a UUID which is specified in the load commands that are part of the Mach
-    /// header. This UUID is generated at compile / link time and is usually unique per compilation.
-    pub fn code_id(&self) -> Option<CodeId> {
-        let uuid = self.find_uuid()?;
-        Some(CodeId::from_binary(&uuid.as_bytes()[..]))
-    }
-
-    /// The debug information identifier of a MachO file.
-    ///
-    /// This uses the same UUID as `code_id`.
-    pub fn debug_id(&self) -> DebugId {
-        self.find_uuid().map(DebugId::from_uuid).unwrap_or_default()
-    }
-
-    /// The CPU architecture of this object, as specified in the Mach header.
-    pub fn arch(&self) -> Arch {
-        use goblin::mach::constants::cputype;
-
-        match (self.macho.header.cputype(), self.macho.header.cpusubtype()) {
-            (cputype::CPU_TYPE_I386, cputype::CPU_SUBTYPE_I386_ALL) => Arch::X86,
-            (cputype::CPU_TYPE_I386, _) => Arch::X86Unknown,
-            (cputype::CPU_TYPE_X86_64, cputype::CPU_SUBTYPE_X86_64_ALL) => Arch::Amd64,
-            (cputype::CPU_TYPE_X86_64, cputype::CPU_SUBTYPE_X86_64_H) => Arch::Amd64h,
-            (cputype::CPU_TYPE_X86_64, _) => Arch::Amd64Unknown,
-            (cputype::CPU_TYPE_ARM64, cputype::CPU_SUBTYPE_ARM64_ALL) => Arch::Arm64,
-            (cputype::CPU_TYPE_ARM64, cputype::CPU_SUBTYPE_ARM64_V8) => Arch::Arm64V8,
-            (cputype::CPU_TYPE_ARM64, cputype::CPU_SUBTYPE_ARM64_E) => Arch::Arm64e,
-            (cputype::CPU_TYPE_ARM64, _) => Arch::Arm64Unknown,
-            (cputype::CPU_TYPE_ARM64_32, cputype::CPU_SUBTYPE_ARM64_32_ALL) => Arch::Arm64_32,
-            (cputype::CPU_TYPE_ARM64_32, cputype::CPU_SUBTYPE_ARM64_32_V8) => Arch::Arm64_32V8,
-            (cputype::CPU_TYPE_ARM64_32, _) => Arch::Arm64_32Unknown,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_ALL) => Arch::Arm,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V5TEJ) => Arch::ArmV5,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V6) => Arch::ArmV6,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V6M) => Arch::ArmV6m,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7) => Arch::ArmV7,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7F) => Arch::ArmV7f,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7S) => Arch::ArmV7s,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7K) => Arch::ArmV7k,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7M) => Arch::ArmV7m,
-            (cputype::CPU_TYPE_ARM, cputype::CPU_SUBTYPE_ARM_V7EM) => Arch::ArmV7em,
-            (cputype::CPU_TYPE_ARM, _) => Arch::ArmUnknown,
-            (cputype::CPU_TYPE_POWERPC, cputype::CPU_SUBTYPE_POWERPC_ALL) => Arch::Ppc,
-            (cputype::CPU_TYPE_POWERPC64, cputype::CPU_SUBTYPE_POWERPC_ALL) => Arch::Ppc64,
-            (_, _) => Arch::Unknown,
-        }
-    }
-
-    /// The kind of this object, as specified in the Mach header.
-    pub fn kind(&self) -> ObjectKind {
-        match self.macho.header.filetype {
-            goblin::mach::header::MH_OBJECT => ObjectKind::Relocatable,
-            goblin::mach::header::MH_EXECUTE => ObjectKind::Executable,
-            goblin::mach::header::MH_FVMLIB => ObjectKind::Library,
-            goblin::mach::header::MH_CORE => ObjectKind::Dump,
-            goblin::mach::header::MH_PRELOAD => ObjectKind::Executable,
-            goblin::mach::header::MH_DYLIB => ObjectKind::Library,
-            goblin::mach::header::MH_DYLINKER => ObjectKind::Executable,
-            goblin::mach::header::MH_BUNDLE => ObjectKind::Library,
-            goblin::mach::header::MH_DSYM => ObjectKind::Debug,
-            goblin::mach::header::MH_KEXT_BUNDLE => ObjectKind::Library,
-            _ => ObjectKind::Other,
-        }
-    }
-
-    /// The address at which the image prefers to be loaded into memory.
-    ///
-    /// MachO files store all internal addresses as if it was loaded at that address. When the image
-    /// is actually loaded, that spot might already be taken by other images and so it must be
-    /// relocated to a new address. At runtime, a relocation table manages the arithmetics behind
-    /// this.
-    ///
-    /// Addresses used in `symbols` or `debug_session` have already been rebased relative to that
-    /// load address, so that the caller only has to deal with addresses relative to the actual
-    /// start of the image.
-    pub fn load_address(&self) -> u64 {
-        for seg in &self.macho.segments {
-            if seg.name().map(|name| name == "__TEXT").unwrap_or(false) {
-                return seg.vmaddr;
-            }
-        }
-
-        0
-    }
-
-    /// Determines whether this object exposes a public symbol table.
-    pub fn has_symbols(&self) -> bool {
-        self.macho.symbols.is_some()
-    }
-
-    /// Returns an iterator over symbols in the public symbol table.
-    pub fn symbols(&self) -> MachOSymbolIterator<'d> {
-        // Cache indices of code sections. These are either "__text" or "__stubs", always located in
-        // the "__TEXT" segment. It looks like each of those sections only occurs once, but to be
-        // safe they are collected into a vector.
-        let mut sections = SmallVec::new();
-        let mut section_index = 0;
-
-        'outer: for segment in &self.macho.segments {
-            if segment.name().ok() != Some("__TEXT") {
-                section_index += segment.nsects as usize;
-                continue;
-            }
-
-            for result in segment {
-                // Do not continue to iterate potentially broken section headers. This could lead to
-                // invalid section indices.
-                let section = match result {
-                    Ok((section, _data)) => section,
-                    Err(_) => break 'outer,
-                };
-
-                match section.name() {
-                    Ok("__text") | Ok("__stubs") => sections.push(section_index),
-                    _ => (),
-                }
-
-                section_index += 1;
-            }
-        }
-
-        MachOSymbolIterator {
-            symbols: self.macho.symbols(),
-            sections,
-            vmaddr: self.load_address(),
-        }
-    }
-
-    /// Returns an ordered map of symbols in the symbol table.
-    pub fn symbol_map(&self) -> SymbolMap<'d> {
-        self.symbols().collect()
-    }
-
-    /// Determines whether this object contains debug information.
-    pub fn has_debug_info(&self) -> bool {
-        self.has_section("debug_info")
-    }
-
-    /// Constructs a debugging session.
-    ///
-    /// A debugging session loads certain information from the object file and creates caches for
-    /// efficient access to various records in the debug information. Since this can be quite a
-    /// costly process, try to reuse the debugging session as long as possible.
-    ///
-    /// MachO files generally use DWARF debugging information, which is also used by ELF containers
-    /// on Linux.
-    ///
-    /// Constructing this session will also work if the object does not contain debugging
-    /// information, in which case the session will be a no-op. This can be checked via
-    /// [`has_debug_info`](struct.MachObject.html#method.has_debug_info).
-    pub fn debug_session(&self) -> Result<DwarfDebugSession<'d>, DwarfError> {
-        let symbols = self.symbol_map();
-        DwarfDebugSession::parse(self, symbols, self.load_address() as i64, self.kind())
-    }
-
-    /// Determines whether this object contains stack unwinding information.
-    pub fn has_unwind_info(&self) -> bool {
-        self.has_section("eh_frame") || self.has_section("debug_frame")
-    }
-
-    /// Determines whether this object contains embedded source.
-    pub fn has_sources(&self) -> bool {
-        false
-    }
-
-    /// Returns the raw data of the ELF file.
-    pub fn data(&self) -> &'d [u8] {
-        self.data
-    }
-
-    /// Checks whether this mach object contains hidden symbols.
-    ///
-    /// This is an indication that BCSymbolMaps are needed to symbolicate crash reports correctly.
-    pub fn requires_symbolmap(&self) -> bool {
-        self.symbols()
-            .any(|s| s.name().map_or(false, |n| n.starts_with("__?hidden#")))
-    }
-}
-
-impl fmt::Debug for MachObject<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("MachObject")
-            .field("code_id", &self.code_id())
-            .field("debug_id", &self.debug_id())
-            .field("arch", &self.arch())
-            .field("kind", &self.kind())
-            .field("load_address", &format_args!("{:#x}", self.load_address()))
-            .field("has_symbols", &self.has_symbols())
-            .field("has_debug_info", &self.has_debug_info())
-            .field("has_unwind_info", &self.has_unwind_info())
-            .finish()
-    }
-}
-
-impl<'slf, 'd: 'slf> AsSelf<'slf> for MachObject<'d> {
-    type Ref = MachObject<'slf>;
-
-    fn as_self(&'slf self) -> &Self::Ref {
-        self
-    }
-}
-
-impl<'d> Parse<'d> for MachObject<'d> {
-    type Error = MachError;
-
-    fn test(data: &[u8]) -> bool {
-        Self::test(data)
-    }
-
-    fn parse(data: &'d [u8]) -> Result<Self, MachError> {
-        Self::parse(data)
-    }
-}
-
-impl<'data: 'object, 'object> ObjectLike<'data, 'object> for MachObject<'data> {
-    type Error = DwarfError;
-    type Session = DwarfDebugSession<'data>;
-    type SymbolIterator = MachOSymbolIterator<'data>;
-
-    fn file_format(&self) -> FileFormat {
-        self.file_format()
-    }
-
-    fn code_id(&self) -> Option<CodeId> {
-        self.code_id()
-    }
-
-    fn debug_id(&self) -> DebugId {
-        self.debug_id()
-    }
-
-    fn arch(&self) -> Arch {
-        self.arch()
-    }
-
-    fn kind(&self) -> ObjectKind {
-        self.kind()
-    }
-
-    fn load_address(&self) -> u64 {
-        self.load_address()
-    }
-
-    fn has_symbols(&self) -> bool {
-        self.has_symbols()
-    }
-
-    fn symbols(&self) -> Self::SymbolIterator {
-        self.symbols()
-    }
-
-    fn symbol_map(&self) -> SymbolMap<'data> {
-        self.symbol_map()
-    }
-
-    fn has_debug_info(&self) -> bool {
-        self.has_debug_info()
-    }
-
-    fn debug_session(&self) -> Result<Self::Session, Self::Error> {
-        self.debug_session()
-    }
-
-    fn has_unwind_info(&self) -> bool {
-        self.has_unwind_info()
-    }
-
-    fn has_sources(&self) -> bool {
-        self.has_sources()
-    }
-}
-
-impl<'data> Dwarf<'data> for MachObject<'data> {
-    fn endianity(&self) -> Endian {
-        if self.macho.little_endian {
-            Endian::Little
-        } else {
-            Endian::Big
-        }
-    }
-
-    fn raw_section(&self, section_name: &str) -> Option<DwarfSection<'data>> {
-        for segment in &self.macho.segments {
-            for section in segment {
-                if let Ok((header, data)) = section {
-                    if let Ok(sec) = header.name() {
-                        if sec.len() >= 2 && &sec[2..] == section_name {
-                            // In some cases, dsymutil leaves sections headers but removes their
-                            // data from the file. While the addr and size parameters are still
-                            // set, `header.offset` is 0 in that case. We skip them just like the
-                            // section was missing to avoid loading invalid data.
-                            if header.offset == 0 {
-                                return None;
-                            }
-
-                            return Some(DwarfSection {
-                                data: Cow::Borrowed(data),
-                                address: header.addr,
-                                offset: u64::from(header.offset),
-                                align: u64::from(header.align),
-                            });
-                        }
-                    }
-                }
-            }
-        }
-
-        None
-    }
-}
-
-/// An iterator over symbols in the MachO file.
-///
-/// Returned by [`MachObject::symbols`](struct.MachObject.html#method.symbols).
-pub struct MachOSymbolIterator<'data> {
-    symbols: mach::symbols::SymbolIterator<'data>,
-    sections: SmallVec<[usize; 2]>,
-    vmaddr: u64,
-}
-
-impl<'data> Iterator for MachOSymbolIterator<'data> {
-    type Item = Symbol<'data>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        while let Some(next) = self.symbols.next() {
-            // Gracefully recover from corrupt nlists
-            let (mut name, nlist) = match next {
-                Ok(pair) => pair,
-                Err(_) => continue,
-            };
-
-            // Sanity check of the symbol address. Since we only intend to iterate over function
-            // symbols, they need to be mapped after the image's vmaddr.
-            if nlist.n_value < self.vmaddr {
-                continue;
-            }
-
-            // We are only interested in symbols pointing to a code section (type `N_SECT`). The
-            // section index is incremented by one to leave room for `NO_SECT` (0). Section indexes
-            // of the code sections have been passed in via `self.sections`.
-            let in_valid_section = !nlist.is_stab()
-                && nlist.get_type() == mach::symbols::N_SECT
-                && nlist.n_sect != (mach::symbols::NO_SECT as usize)
-                && self.sections.contains(&(nlist.n_sect - 1));
-
-            if !in_valid_section {
-                continue;
-            }
-
-            // Trim leading underscores from mangled C++ names.
-            if name.starts_with('_') {
-                name = &name[1..];
-            }
-
-            return Some(Symbol {
-                name: Some(Cow::Borrowed(name)),
-                address: nlist.n_value - self.vmaddr,
-                size: 0, // Computed in `SymbolMap`
-            });
-        }
-
-        None
-    }
-}
-
-/// An iterator over objects in a [`FatMachO`](struct.FatMachO.html).
-///
-/// Objects are parsed just-in-time while iterating, which may result in errors. The iterator is
-/// still valid afterwards, however, and can be used to resolve the next object.
-pub struct FatMachObjectIterator<'d, 'a> {
-    iter: mach::FatArchIterator<'a>,
-    remaining: usize,
-    data: &'d [u8],
-}
-
-impl<'d, 'a> Iterator for FatMachObjectIterator<'d, 'a> {
-    type Item = Result<MachObject<'d>, MachError>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.remaining == 0 {
-            return None;
-        }
-
-        self.remaining -= 1;
-        match self.iter.next() {
-            Some(Ok(arch)) => {
-                let start = (arch.offset as usize).min(self.data.len());
-                let end = ((arch.offset + arch.size) as usize).min(self.data.len());
-                Some(MachObject::parse(&self.data[start..end]))
-            }
-            Some(Err(error)) => Some(Err(MachError::new(error))),
-            None => None,
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.remaining, Some(self.remaining))
-    }
-}
-
-impl std::iter::FusedIterator for FatMachObjectIterator<'_, '_> {}
-impl ExactSizeIterator for FatMachObjectIterator<'_, '_> {}
-
-/// A fat MachO container that hosts one or more [`MachObject`]s.
-///
-/// [`MachObject`]: struct.MachObject.html
-pub struct FatMachO<'d> {
-    fat: mach::MultiArch<'d>,
-    data: &'d [u8],
-}
-
-impl<'d> FatMachO<'d> {
-    /// Tests whether the buffer could contain an ELF object.
-    pub fn test(data: &[u8]) -> bool {
-        matches!(
-            goblin::peek(&mut Cursor::new(data)),
-            Ok(goblin::Hint::MachFat(_))
-        )
-    }
-
-    /// Tries to parse a fat MachO container from the given slice.
-    pub fn parse(data: &'d [u8]) -> Result<Self, MachError> {
-        mach::MultiArch::new(data)
-            .map(|fat| FatMachO { fat, data })
-            .map_err(MachError::new)
-    }
-
-    /// Returns an iterator over objects in this container.
-    pub fn objects(&self) -> FatMachObjectIterator<'d, '_> {
-        FatMachObjectIterator {
-            iter: self.fat.iter_arches(),
-            remaining: self.fat.narches,
-            data: self.data,
-        }
-    }
-
-    /// Returns the number of objects in this archive.
-    pub fn object_count(&self) -> usize {
-        self.fat.narches
-    }
-
-    /// Resolves the object at the given index.
-    ///
-    /// Returns `Ok(None)` if the index is out of bounds, or `Err` if the object exists but cannot
-    /// be parsed.
-    pub fn object_by_index(&self, index: usize) -> Result<Option<MachObject<'d>>, MachError> {
-        let arch = match self.fat.iter_arches().nth(index) {
-            Some(arch) => arch.map_err(MachError::new)?,
-            None => return Ok(None),
-        };
-
-        let start = (arch.offset as usize).min(self.data.len());
-        let end = ((arch.offset + arch.size) as usize).min(self.data.len());
-        MachObject::parse(&self.data[start..end]).map(Some)
-    }
-}
-
-impl fmt::Debug for FatMachO<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("FatMachO").field("fat", &self.fat).finish()
-    }
-}
-
-impl<'slf, 'd: 'slf> AsSelf<'slf> for FatMachO<'d> {
-    type Ref = FatMachO<'slf>;
-
-    fn as_self(&'slf self) -> &Self::Ref {
-        self
-    }
-}
-
-#[allow(clippy::large_enum_variant)]
-enum MachObjectIteratorInner<'d, 'a> {
-    Single(MonoArchiveObjects<'d, MachObject<'d>>),
-    Archive(FatMachObjectIterator<'d, 'a>),
-}
-
-/// An iterator over objects in a [`MachArchive`](struct.MachArchive.html).
-pub struct MachObjectIterator<'d, 'a>(MachObjectIteratorInner<'d, 'a>);
-
-impl<'d, 'a> Iterator for MachObjectIterator<'d, 'a> {
-    type Item = Result<MachObject<'d>, MachError>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self.0 {
-            MachObjectIteratorInner::Single(ref mut iter) => iter.next(),
-            MachObjectIteratorInner::Archive(ref mut iter) => iter.next(),
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        match self.0 {
-            MachObjectIteratorInner::Single(ref iter) => iter.size_hint(),
-            MachObjectIteratorInner::Archive(ref iter) => iter.size_hint(),
-        }
-    }
-}
-
-impl std::iter::FusedIterator for MachObjectIterator<'_, '_> {}
-impl ExactSizeIterator for MachObjectIterator<'_, '_> {}
-
-#[derive(Debug)]
-enum MachArchiveInner<'d> {
-    Single(MonoArchive<'d, MachObject<'d>>),
-    Archive(FatMachO<'d>),
-}
-
-/// An archive that can consist of a single [`MachObject`] or a [`FatMachO`] container.
-///
-/// Executables and dSYM files on macOS can be a so-called _Fat Mach Object_: It contains multiple
-/// objects for several architectures. When loading this object, the operating system determines the
-/// object corresponding to the host's architecture. This allows to distribute a single binary with
-/// optimizations for specific CPUs, which is frequently done on iOS.
-///
-/// To abstract over the differences, `MachArchive` simulates the archive interface also for single
-/// Mach objects. This allows uniform access to both file types.
-///
-/// [`MachObject`]: struct.MachObject.html
-/// [`FatMachO`]: struct.FatMachO.html
-#[derive(Debug)]
-pub struct MachArchive<'d>(MachArchiveInner<'d>);
-
-impl<'d> MachArchive<'d> {
-    /// Tests whether the buffer contains either a Mach Object or a Fat Mach Object.
-    pub fn test(data: &[u8]) -> bool {
-        match goblin::peek(&mut Cursor::new(data)) {
-            Ok(goblin::Hint::Mach(_)) => true,
-            Ok(goblin::Hint::MachFat(narchs)) => {
-                // so this is kind of stupid but java class files share the same cutsey magic
-                // as a macho fat file (CAFEBABE).  This means that we often claim that a java
-                // class file is actually a macho binary but it's not.  The next 32 bytes encode
-                // the number of embedded architectures in a fat mach.  In case of a JAR file
-                // we have 2 bytes for minor version and 2 bytes for major version of the class
-                // file format.
-                //
-                // The internet suggests the first public version of Java had the class version
-                // 45.  Thus the logic applied here is that if the number is >= 45 we're more
-                // likely to have a java class file than a macho file with 45 architectures
-                // which should be very rare.
-                //
-                // https://docs.oracle.com/javase/specs/jvms/se6/html/ClassFile.doc.html
-                narchs < 45
-            }
-            _ => false,
-        }
-    }
-
-    /// Tries to parse a Mach archive from the given slice.
-    pub fn parse(data: &'d [u8]) -> Result<Self, MachError> {
-        Ok(MachArchive(match goblin::peek(&mut Cursor::new(data)) {
-            Ok(goblin::Hint::MachFat(_)) => MachArchiveInner::Archive(FatMachO::parse(data)?),
-            // Fall back to mach parsing to receive a meaningful error message from goblin
-            _ => MachArchiveInner::Single(MonoArchive::new(data)),
-        }))
-    }
-
-    /// Returns an iterator over all objects contained in this archive.
-    pub fn objects(&self) -> MachObjectIterator<'d, '_> {
-        MachObjectIterator(match self.0 {
-            MachArchiveInner::Single(ref inner) => MachObjectIteratorInner::Single(inner.objects()),
-            MachArchiveInner::Archive(ref inner) => {
-                MachObjectIteratorInner::Archive(inner.objects())
-            }
-        })
-    }
-
-    /// Returns the number of objects in this archive.
-    pub fn object_count(&self) -> usize {
-        match self.0 {
-            MachArchiveInner::Single(ref inner) => inner.object_count(),
-            MachArchiveInner::Archive(ref inner) => inner.object_count(),
-        }
-    }
-
-    /// Resolves the object at the given index.
-    ///
-    /// Returns `Ok(None)` if the index is out of bounds, or `Err` if the object exists but cannot
-    /// be parsed.
-    pub fn object_by_index(&self, index: usize) -> Result<Option<MachObject<'d>>, MachError> {
-        match self.0 {
-            MachArchiveInner::Single(ref inner) => inner.object_by_index(index),
-            MachArchiveInner::Archive(ref inner) => inner.object_by_index(index),
-        }
-    }
-
-    /// Returns whether this is a multi-object archive.
-    ///
-    /// This may also return true if there is only a single object inside the archive.
-    pub fn is_multi(&self) -> bool {
-        match self.0 {
-            MachArchiveInner::Archive(_) => true,
-            MachArchiveInner::Single(_) => false,
-        }
-    }
-}
-
-impl<'slf, 'd: 'slf> AsSelf<'slf> for MachArchive<'d> {
-    type Ref = MachArchive<'slf>;
-
-    fn as_self(&'slf self) -> &Self::Ref {
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/object.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/object.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/object.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/object.rs	2021-12-09 12:01:26.000000000 +0000
@@ -193,7 +193,7 @@
             ($kind:ident, $file:ident, $data:expr) => {
                 Object::$kind($file::parse(data).map_err(ObjectError::transparent)?)
             };
-        };
+        }
 
         let object = match Self::peek(data) {
             FileFormat::Breakpad => parse_object!(Breakpad, BreakpadObject, data),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/pdb.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/pdb.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/pdb.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/pdb.rs	2021-12-09 12:01:26.000000000 +0000
@@ -749,6 +749,9 @@
             Ok(pdb::IdData::UserDefinedTypeSource(_)) => {
                 // nothing to do.
             }
+            Ok(_) => {
+                // non_exhaustive match
+            }
             Err(pdb::Error::UnimplementedTypeKind(_)) => {
                 write!(target, "<unknown>")?;
             }
@@ -889,6 +892,9 @@
             Ok(pdb::TypeData::MethodList(_)) => {
                 // nothing to do
             }
+            Ok(_) => {
+                // non_exhaustive match
+            }
             Err(pdb::Error::UnimplementedTypeKind(_)) => {
                 write!(target, "<unknown>")?;
             }
@@ -951,7 +957,7 @@
 
         let mut lines = Vec::new();
         while let Some(line_info) = line_iter.next()? {
-            let rva = match line_info.offset.to_rva(&address_map) {
+            let rva = match line_info.offset.to_rva(address_map) {
                 Some(rva) => u64::from(rva.0),
                 None => continue,
             };
@@ -978,7 +984,7 @@
 
         // Translate the function's address to the PE's address space. If this fails, we're
         // likely dealing with an invalid function and can skip it.
-        let address = match proc.offset.to_rva(&address_map) {
+        let address = match proc.offset.to_rva(address_map) {
             Some(addr) => u64::from(addr.0),
             None => return Ok(None),
         };
@@ -1116,7 +1122,17 @@
                     // skip silently instead of erroring out. Missing a single inline function is
                     // more acceptable in such a case than halting iteration completely.
                     if let Some(inlinee) = inlinees.get(&site.inlinee) {
-                        self.handle_inlinee(site, parent_offset, inlinee, &program)?
+                        // We have seen that the MSVC Compiler `19.16` (VS 2017) can output
+                        // `ChangeFile` annotations which are not properly aligned to the beginning
+                        // of a file checksum, leading to `UnimplementedFileChecksumKind` errors.
+                        // Investigation showed that this can happen for inlined `{ctor}` functions,
+                        // but there are no clear leads to why that might have happened, and how to
+                        // recover from these broken annotations.
+                        // For that reason, we skip these inlinees completely so we do not fail
+                        // processing the complete pdb file.
+                        self.handle_inlinee(site, parent_offset, inlinee, &program)
+                            .ok()
+                            .flatten()
                     } else {
                         None
                     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/pe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/pe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/pe.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/pe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -104,9 +104,10 @@
 
     /// The debug information identifier of this PE.
     ///
-    /// Since debug information is stored in an external [`PdbObject`], this identifier actually
-    /// refers to the PDB. While strictly the filename of the PDB would also be necessary fully
-    /// resolve it, in most instances the GUID and age contained in this identifier are sufficient.
+    /// Since debug information is stored in an external
+    /// [`PdbObject`](crate::pdb::PdbObject), this identifier actually refers to the
+    /// PDB. While strictly the filename of the PDB would also be necessary fully resolve
+    /// it, in most instances the GUID and age contained in this identifier are sufficient.
     pub fn debug_id(&self) -> DebugId {
         self.pe
             .debug_data
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/private.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/private.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/private.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/private.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,9 @@
 use std::iter::FusedIterator;
 use std::marker::PhantomData;
 
+#[cfg(test)]
+use similar_asserts::assert_eq;
+
 use crate::base::Function;
 
 #[derive(Clone, Debug)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/sourcebundle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/sourcebundle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/sourcebundle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/sourcebundle.rs	2021-12-09 12:01:26.000000000 +0000
@@ -115,7 +115,7 @@
     ///
     /// This function is used to generically create source bundle errors which do not originate from
     /// `symbolic` itself. The `source` argument is an arbitrary payload which will be contained in
-    /// this [`CfiError`].
+    /// this [`SourceBundleError`].
     pub fn new<E>(kind: SourceBundleErrorKind, source: E) -> Self
     where
         E: Into<Box<dyn Error + Send + Sync>>,
@@ -747,7 +747,6 @@
 {
     manifest: SourceBundleManifest,
     writer: ZipWriter<W>,
-    finished: bool,
 }
 
 impl<W> SourceBundleWriter<W>
@@ -764,7 +763,6 @@
         Ok(SourceBundleWriter {
             manifest: SourceBundleManifest::new(),
             writer: ZipWriter::new(writer),
-            finished: false,
         })
     }
 
@@ -954,7 +952,6 @@
         self.writer
             .finish()
             .map_err(|e| SourceBundleError::new(SourceBundleErrorKind::WriteFailed, e))?;
-        self.finished = true;
         Ok(())
     }
 
@@ -1025,6 +1022,8 @@
 
     use std::io::Cursor;
 
+    use similar_asserts::assert_eq;
+
     #[test]
     fn test_has_file() -> Result<(), SourceBundleError> {
         let writer = Cursor::new(Vec::new());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/wasm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/wasm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-debuginfo/src/wasm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-debuginfo/src/wasm.rs	2021-12-09 12:01:26.000000000 +0000
@@ -53,8 +53,8 @@
         // we need to parse the file a second time to get the offset to the
         // code section as walrus does not expose that yet.
         let mut code_offset = 0;
-        for payload in wasmparser::Parser::new(0).parse_all(data) {
-            if let Ok(wasmparser::Payload::CodeSectionStart { range, .. }) = payload {
+        for payload in wasmparser::Parser::new(0).parse_all(data).flatten() {
+            if let wasmparser::Payload::CodeSectionStart { range, .. } = payload {
                 code_offset = range.start as u64;
                 break;
             }
@@ -62,8 +62,8 @@
 
         Ok(WasmObject {
             wasm_module,
-            data,
             code_offset,
+            data,
         })
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-demangle/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-demangle/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-demangle/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-demangle/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"0ddbadc13bac84bac7dcffa79a27e90996cf16c012ce2eae9bb63dfefeb26935","README.md":"41cbe636663c4255998cef91c3a52b3aaad1dd60fef44a922d0e07d8d8d9d45e","build.rs":"185258325e863cc1a3f5aa5abef2bb0f3bebb3bed9d955cf76dd3d1e390c3613","src/lib.rs":"a291b70774a91b252d05bd7976f1febd779e9d60a30f19512710b9cf60115f21","src/swiftdemangle.cpp":"d342d06df5ffa544267f4af7e14fed8fc3edd23887dfb9e2f683e8ec8ba3a22a","vendor/swift/1-arguments.patch":"99ada554f6e35aa730920a0f307509a990d3739063b84d640489b5b0d1da130f","vendor/swift/LICENSE.txt":"770af8291f708538d8ff885a0bbc4e045cd700531741c4f99528d435c14d7f55","vendor/swift/LICENSE_LLVM.txt":"abd4d8794808bacb1eb6924d49efafd9ab6eef88faaaeb5d3cfa13ee3670d672","vendor/swift/README.md":"f47317225d80d056da20ed65eaacc8c14146e7af5c469df4481c7ddf19155968","vendor/swift/include/llvm/ADT/None.h":"ede09c2c802cda6654bba2ddd338ef57d69dc82e32f65121c54e949f3a980ae6","vendor/swift/include/llvm/ADT/Optional.h":"27d92d5589e5d63645d946f13356948fa5f89ebc8723551103152571544e6146","vendor/swift/include/llvm/ADT/STLExtras.h":"1225d5f0a2dd10984d9f264172382ea1f548a67c4eeb97b211c55d06e91e8d51","vendor/swift/include/llvm/ADT/SmallVector.h":"94371e5f917bea29d8e17450c3094585625516b415afbeadc0175d51e6a4edaa","vendor/swift/include/llvm/ADT/StringRef.h":"d75dd9b6229d2d39814667a06ef9a5c5d530efedcfa34954212a455afd460f8c","vendor/swift/include/llvm/ADT/StringSwitch.h":"a079384918bce0f0e1fe6219bec4f468329060b8c13071de3f89a20e6d1ac491","vendor/swift/include/llvm/ADT/iterator.h":"777bfd1c37b6a5445649fdf257437560c5ffcc5e24714ea944bc5930705282a7","vendor/swift/include/llvm/ADT/iterator_range.h":"28b76377cebcca43768d7dc10aa0a03348ce8bae73f7bad5403a475aca1129d4","vendor/swift/include/llvm/Config/abi-breaking.h":"2370a02b867acd62c1473b40d9dda1a4a6f76e2a4a73144f939ca940da3b26fb","vendor/swift/include/llvm/Config/llvm-config.h":"611b53fe8627979fb576964021f6fce0cdb858c51f8ec76ba635587a61a902f0","vendor/swift/include/llvm/Support/AlignOf.h":"6307024a93ad2146d9141f072c0eadd4528094f9bb440cb79a8bc1fbba64b46b","vendor/swift/include/llvm/Support/Casting.h":"13ade54f069788f242368739eeb2d6bbf59a8f18520cc5da9b499f5aba24b502","vendor/swift/include/llvm/Support/Compiler.h":"cd28f772e10eb798436134d7494869eadf65ff54dba8fa4ab1b99c73706319f8","vendor/swift/include/llvm/Support/ErrorHandling.h":"4cf6743c65ed11087995d151a8efff45a12a3213b1a179af12417032d38a9a1b","vendor/swift/include/llvm/Support/MathExtras.h":"bf33f750fab61bac0be6d67d2bc58f6261a37b39a97e38e5148d45137a5a0d17","vendor/swift/include/llvm/Support/MemAlloc.h":"2d414d36888c0cd88dc4111ad7a2086bfa2b6a308ef0b1184fe60a4dc5baabc8","vendor/swift/include/llvm/Support/raw_ostream.h":"66e8ee9900058bc4eeded997908ea78df2467b9719545b1ceb373caf3f334d24","vendor/swift/include/llvm/Support/type_traits.h":"b7503ec7ae345c2ec2c2cb159215687e3094d41e626ed6f29d07b061b3bfd80f","vendor/swift/include/swift/AST/Ownership.h":"d2aef1b78723bdbfc92a05b35ea9767b3642be0d163d1655d1b95f0989c5776e","vendor/swift/include/swift/AST/ReferenceStorage.def":"364eed86a0c7b6d1f988bcfd1daf0ff126aad3b4fcf396eebc236e86b48759cf","vendor/swift/include/swift/Basic/InlineBitfield.h":"1c41d19237dc92f192e05a77e0945ffa235125a7b1144169731861eab5c9e58b","vendor/swift/include/swift/Basic/LLVM.h":"4fd9698534f7fdc7a514c90797daa89f21e4c7c14ed0ce3d3e282583053e6675","vendor/swift/include/swift/Basic/STLExtras.h":"9d007c94a4f3b8434e06a0a20203ea849b0dfed3ef34af38727757fdbfb3d8aa","vendor/swift/include/swift/Demangling/Demangle.h":"88f1e3d9cfae0992b8d9271acd6ee62e2338e7064df792ce797cc863aafe678d","vendor/swift/include/swift/Demangling/DemangleNodes.def":"82ffa3e84fb3448e199d0b609b66997f04226fc4093830680a30b85c7c7e20c1","vendor/swift/include/swift/Demangling/Demangler.h":"9ac69e792d101ff211dafc8f1cc184e0e89fa1d39d3cfe20bdb192073f8155ea","vendor/swift/include/swift/Demangling/ManglingMacros.h":"b3df2fe16929c9be364e779443a917f4c02233f328c0e57fac63d95c793888c7","vendor/swift/include/swift/Demangling/ManglingUtils.h":"0da6fdcfce446381b4a7897099431947aa28604d260edee24acad39fdcb57c3d","vendor/swift/include/swift/Demangling/Punycode.h":"1401213d42f82600ac70d02756301481ec4c692a1e235936242da387532fd6eb","vendor/swift/include/swift/Demangling/StandardTypesMangling.def":"62f3469385ee299762f8f99a7240887eb0cf564a63ba5f9f33b86432e565666e","vendor/swift/include/swift/Demangling/ValueWitnessMangling.def":"7395a5bf5fd045c254b9c14d9528a0adda90fd03496e37b0f72a091ce0e5f2d3","vendor/swift/include/swift/Runtime/BackDeployment.h":"a489c98763b29fc12be72e25e309fd3a9b75b2f205400a1a04c90493c2b24749","vendor/swift/include/swift/Runtime/CMakeConfig.h":"43bfc3d05c741940b5f7385dd20ca6b0615a69f9b857151568b0214832af976a","vendor/swift/include/swift/Runtime/Config.h":"996e907dd67e17f66946a15fff9f77c5bf658368eef08b2ab805d63409641b2e","vendor/swift/include/swift/Strings.h":"6c8bd6388e6da294e21b005ea6479c9297f5d34570a12622a2d2262f23f00f14","vendor/swift/lib/Demangling/CMakeLists.txt":"1bdb5a37adeac014dc7b7ad859fe7b403950e0c91cd58490f165bd2d55d333ea","vendor/swift/lib/Demangling/Context.cpp":"99b566a915a82571670e03e7eb2c53f45ef8f38bc179eae75071ea85c80f6425","vendor/swift/lib/Demangling/Demangler.cpp":"44c5fb478a89fcaeec7ba20c437a626913b2b4cfd116fc0b93bcab3ffb41f85f","vendor/swift/lib/Demangling/ManglingUtils.cpp":"ee92aa301e072e7e8ded61f9e77695f0cd8c27ce1185aa71bed7fa11c6bd5b4e","vendor/swift/lib/Demangling/NodeDumper.cpp":"8676b6d39b8505d2747e9be2206ecaa335f2048b3c58529b77b59f859fadaea7","vendor/swift/lib/Demangling/NodePrinter.cpp":"79dfc363879affb72f44df8e6d9af5257763f7ccc940595c3a5b46d99cf52e6d","vendor/swift/lib/Demangling/OldDemangler.cpp":"eee7df3c8616f561915332b3efbd2d85608cb0bc7ade5ba8c272346f3bd600c0","vendor/swift/lib/Demangling/OldRemangler.cpp":"b514f055071b4c84b66f51db40eaf87f3af866f4c88a4e5c78697c0f2e228041","vendor/swift/lib/Demangling/Punycode.cpp":"dff51fa33dd1411f5a9ccb08b37860b1ab566972a6371727024a8f6bdc21f115","vendor/swift/lib/Demangling/Remangler.cpp":"28c7523894e992b747ed58b7c014907ba220a74cc681ff568d9a5dfe6663fbd1","vendor/swift/lib/Demangling/RemanglerBase.h":"d7cb69150f907775fed6612d54a10d5611767baf15f1a1beab83bfdf4d05c34d","vendor/swift/stdlib/public/SwiftShims/Visibility.h":"f79f72370176bccf00a38236d55fe9ea83061a213bdba520d1633a2469d1c9eb","vendor/swift/update.py":"d2a848244220eff05c0dce2fc0bdbd8a0f7821d254a41ea9226c6b0523b4bc28"},"package":"b77ecb5460a87faa37ed53521eed8f073c8339b7a5788c1f93efc09ce74e1b68"}
\ No newline at end of file
+{"files":{"Cargo.toml":"38d90b35b1bba8eed683662367ec40cac71ac530331888689b27d2ff1822b7f3","README.md":"41cbe636663c4255998cef91c3a52b3aaad1dd60fef44a922d0e07d8d8d9d45e","build.rs":"185258325e863cc1a3f5aa5abef2bb0f3bebb3bed9d955cf76dd3d1e390c3613","src/lib.rs":"f99caccaea8f092ac950e9fbbae550bc2c2f339ecdecaa7659e75e98c2b196b7","src/swiftdemangle.cpp":"d342d06df5ffa544267f4af7e14fed8fc3edd23887dfb9e2f683e8ec8ba3a22a","vendor/swift/1-arguments.patch":"99ada554f6e35aa730920a0f307509a990d3739063b84d640489b5b0d1da130f","vendor/swift/LICENSE.txt":"770af8291f708538d8ff885a0bbc4e045cd700531741c4f99528d435c14d7f55","vendor/swift/LICENSE_LLVM.txt":"abd4d8794808bacb1eb6924d49efafd9ab6eef88faaaeb5d3cfa13ee3670d672","vendor/swift/README.md":"f47317225d80d056da20ed65eaacc8c14146e7af5c469df4481c7ddf19155968","vendor/swift/include/llvm/ADT/None.h":"ede09c2c802cda6654bba2ddd338ef57d69dc82e32f65121c54e949f3a980ae6","vendor/swift/include/llvm/ADT/Optional.h":"27d92d5589e5d63645d946f13356948fa5f89ebc8723551103152571544e6146","vendor/swift/include/llvm/ADT/STLExtras.h":"1225d5f0a2dd10984d9f264172382ea1f548a67c4eeb97b211c55d06e91e8d51","vendor/swift/include/llvm/ADT/SmallVector.h":"94371e5f917bea29d8e17450c3094585625516b415afbeadc0175d51e6a4edaa","vendor/swift/include/llvm/ADT/StringRef.h":"d75dd9b6229d2d39814667a06ef9a5c5d530efedcfa34954212a455afd460f8c","vendor/swift/include/llvm/ADT/StringSwitch.h":"a079384918bce0f0e1fe6219bec4f468329060b8c13071de3f89a20e6d1ac491","vendor/swift/include/llvm/ADT/iterator.h":"777bfd1c37b6a5445649fdf257437560c5ffcc5e24714ea944bc5930705282a7","vendor/swift/include/llvm/ADT/iterator_range.h":"28b76377cebcca43768d7dc10aa0a03348ce8bae73f7bad5403a475aca1129d4","vendor/swift/include/llvm/Config/abi-breaking.h":"2370a02b867acd62c1473b40d9dda1a4a6f76e2a4a73144f939ca940da3b26fb","vendor/swift/include/llvm/Config/llvm-config.h":"611b53fe8627979fb576964021f6fce0cdb858c51f8ec76ba635587a61a902f0","vendor/swift/include/llvm/Support/AlignOf.h":"6307024a93ad2146d9141f072c0eadd4528094f9bb440cb79a8bc1fbba64b46b","vendor/swift/include/llvm/Support/Casting.h":"13ade54f069788f242368739eeb2d6bbf59a8f18520cc5da9b499f5aba24b502","vendor/swift/include/llvm/Support/Compiler.h":"cd28f772e10eb798436134d7494869eadf65ff54dba8fa4ab1b99c73706319f8","vendor/swift/include/llvm/Support/ErrorHandling.h":"4cf6743c65ed11087995d151a8efff45a12a3213b1a179af12417032d38a9a1b","vendor/swift/include/llvm/Support/MathExtras.h":"bf33f750fab61bac0be6d67d2bc58f6261a37b39a97e38e5148d45137a5a0d17","vendor/swift/include/llvm/Support/MemAlloc.h":"2d414d36888c0cd88dc4111ad7a2086bfa2b6a308ef0b1184fe60a4dc5baabc8","vendor/swift/include/llvm/Support/raw_ostream.h":"66e8ee9900058bc4eeded997908ea78df2467b9719545b1ceb373caf3f334d24","vendor/swift/include/llvm/Support/type_traits.h":"b7503ec7ae345c2ec2c2cb159215687e3094d41e626ed6f29d07b061b3bfd80f","vendor/swift/include/swift/AST/Ownership.h":"d2aef1b78723bdbfc92a05b35ea9767b3642be0d163d1655d1b95f0989c5776e","vendor/swift/include/swift/AST/ReferenceStorage.def":"364eed86a0c7b6d1f988bcfd1daf0ff126aad3b4fcf396eebc236e86b48759cf","vendor/swift/include/swift/Basic/InlineBitfield.h":"1c41d19237dc92f192e05a77e0945ffa235125a7b1144169731861eab5c9e58b","vendor/swift/include/swift/Basic/LLVM.h":"4fd9698534f7fdc7a514c90797daa89f21e4c7c14ed0ce3d3e282583053e6675","vendor/swift/include/swift/Basic/STLExtras.h":"9d007c94a4f3b8434e06a0a20203ea849b0dfed3ef34af38727757fdbfb3d8aa","vendor/swift/include/swift/Demangling/Demangle.h":"88f1e3d9cfae0992b8d9271acd6ee62e2338e7064df792ce797cc863aafe678d","vendor/swift/include/swift/Demangling/DemangleNodes.def":"82ffa3e84fb3448e199d0b609b66997f04226fc4093830680a30b85c7c7e20c1","vendor/swift/include/swift/Demangling/Demangler.h":"9ac69e792d101ff211dafc8f1cc184e0e89fa1d39d3cfe20bdb192073f8155ea","vendor/swift/include/swift/Demangling/ManglingMacros.h":"b3df2fe16929c9be364e779443a917f4c02233f328c0e57fac63d95c793888c7","vendor/swift/include/swift/Demangling/ManglingUtils.h":"0da6fdcfce446381b4a7897099431947aa28604d260edee24acad39fdcb57c3d","vendor/swift/include/swift/Demangling/Punycode.h":"1401213d42f82600ac70d02756301481ec4c692a1e235936242da387532fd6eb","vendor/swift/include/swift/Demangling/StandardTypesMangling.def":"62f3469385ee299762f8f99a7240887eb0cf564a63ba5f9f33b86432e565666e","vendor/swift/include/swift/Demangling/ValueWitnessMangling.def":"7395a5bf5fd045c254b9c14d9528a0adda90fd03496e37b0f72a091ce0e5f2d3","vendor/swift/include/swift/Runtime/BackDeployment.h":"a489c98763b29fc12be72e25e309fd3a9b75b2f205400a1a04c90493c2b24749","vendor/swift/include/swift/Runtime/CMakeConfig.h":"43bfc3d05c741940b5f7385dd20ca6b0615a69f9b857151568b0214832af976a","vendor/swift/include/swift/Runtime/Config.h":"996e907dd67e17f66946a15fff9f77c5bf658368eef08b2ab805d63409641b2e","vendor/swift/include/swift/Strings.h":"6c8bd6388e6da294e21b005ea6479c9297f5d34570a12622a2d2262f23f00f14","vendor/swift/lib/Demangling/CMakeLists.txt":"1bdb5a37adeac014dc7b7ad859fe7b403950e0c91cd58490f165bd2d55d333ea","vendor/swift/lib/Demangling/Context.cpp":"99b566a915a82571670e03e7eb2c53f45ef8f38bc179eae75071ea85c80f6425","vendor/swift/lib/Demangling/Demangler.cpp":"44c5fb478a89fcaeec7ba20c437a626913b2b4cfd116fc0b93bcab3ffb41f85f","vendor/swift/lib/Demangling/ManglingUtils.cpp":"ee92aa301e072e7e8ded61f9e77695f0cd8c27ce1185aa71bed7fa11c6bd5b4e","vendor/swift/lib/Demangling/NodeDumper.cpp":"8676b6d39b8505d2747e9be2206ecaa335f2048b3c58529b77b59f859fadaea7","vendor/swift/lib/Demangling/NodePrinter.cpp":"79dfc363879affb72f44df8e6d9af5257763f7ccc940595c3a5b46d99cf52e6d","vendor/swift/lib/Demangling/OldDemangler.cpp":"eee7df3c8616f561915332b3efbd2d85608cb0bc7ade5ba8c272346f3bd600c0","vendor/swift/lib/Demangling/OldRemangler.cpp":"b514f055071b4c84b66f51db40eaf87f3af866f4c88a4e5c78697c0f2e228041","vendor/swift/lib/Demangling/Punycode.cpp":"dff51fa33dd1411f5a9ccb08b37860b1ab566972a6371727024a8f6bdc21f115","vendor/swift/lib/Demangling/Remangler.cpp":"28c7523894e992b747ed58b7c014907ba220a74cc681ff568d9a5dfe6663fbd1","vendor/swift/lib/Demangling/RemanglerBase.h":"d7cb69150f907775fed6612d54a10d5611767baf15f1a1beab83bfdf4d05c34d","vendor/swift/stdlib/public/SwiftShims/Visibility.h":"f79f72370176bccf00a38236d55fe9ea83061a213bdba520d1633a2469d1c9eb","vendor/swift/update.py":"d2a848244220eff05c0dce2fc0bdbd8a0f7821d254a41ea9226c6b0523b4bc28"},"package":"6780c62bfbd609bffaa13d6959715850578aa43caaae7aee14f1f24ceb64f433"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-demangle/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-demangle/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-demangle/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-demangle/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "symbolic-demangle"
-version = "8.0.0"
+version = "8.3.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>", "Jan Michael Auer <mail@jauer.org>"]
 build = "build.rs"
 exclude = ["tests/**/*"]
@@ -26,11 +26,11 @@
 [package.metadata.docs.rs]
 all-features = true
 [dependencies.cpp_demangle]
-version = "0.3.0"
+version = "0.3.2"
 optional = true
 
 [dependencies.msvc-demangler]
-version = "0.8.0"
+version = "0.9.0"
 optional = true
 
 [dependencies.rustc-demangle]
@@ -38,7 +38,9 @@
 optional = true
 
 [dependencies.symbolic-common]
-version = "8.0.0"
+version = "8.3.0"
+[dev-dependencies.similar-asserts]
+version = "1.0.0"
 [build-dependencies.cc]
 version = "1.0.50"
 optional = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-demangle/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-demangle/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-demangle/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-demangle/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,7 +24,10 @@
 //!
 //! let name = Name::from("__ZN3std2io4Read11read_to_end17hb85a0f6802e14499E");
 //! assert_eq!(name.detect_language(), Language::Rust);
-//! assert_eq!(name.try_demangle(DemangleOptions::complete()), "std::io::Read::read_to_end");
+//! assert_eq!(
+//!     name.try_demangle(DemangleOptions::complete()),
+//!     "std::io::Read::read_to_end"
+//! );
 //! # }
 //! ```
 
@@ -133,6 +136,18 @@
     ident.starts_with('?') || ident.starts_with("@?")
 }
 
+/// An MD5 mangled name consists of the prefix "??@", 32 hex digits,
+/// and the suffix "@".
+fn is_maybe_md5(ident: &str) -> bool {
+    if ident.len() != 36 {
+        return false;
+    }
+
+    ident.starts_with("??@")
+        && ident.ends_with('@')
+        && ident[3..35].chars().all(|c| c.is_ascii_hexdigit())
+}
+
 #[cfg(feature = "swift")]
 fn is_maybe_swift(ident: &str) -> bool {
     CString::new(ident)
@@ -167,6 +182,22 @@
     None
 }
 
+/// Removes a suffix consisting of $ followed by 32 hex digits, if there is one,
+/// otherwise returns its input.
+fn strip_hash_suffix(ident: &str) -> &str {
+    let len = ident.len();
+    if len < 33 {
+        ident
+    } else {
+        let (front, back) = ident.split_at(len - 33);
+        if back.starts_with('$') && back[1..].chars().all(|c| c.is_ascii_hexdigit()) {
+            front
+        } else {
+            ident
+        }
+    }
+}
+
 fn try_demangle_cpp(ident: &str, opts: DemangleOptions) -> Option<String> {
     if is_maybe_msvc(ident) {
         return try_demangle_msvc(ident, opts);
@@ -174,14 +205,19 @@
 
     #[cfg(feature = "cpp")]
     {
-        use cpp_demangle::{DemangleOptions as CppOptions, Symbol as CppSymbol};
+        use cpp_demangle::{DemangleOptions as CppOptions, ParseOptions, Symbol as CppSymbol};
+
+        let stripped = strip_hash_suffix(ident);
 
-        let symbol = match CppSymbol::new(ident) {
+        let symbol = match CppSymbol::new_with_options(
+            stripped,
+            &ParseOptions::default().recursion_limit(192), // default is 96
+        ) {
             Ok(symbol) => symbol,
             Err(_) => return None,
         };
 
-        let mut cpp_options = CppOptions::new();
+        let mut cpp_options = CppOptions::new().recursion_limit(192); // default is 128
         if !opts.parameters {
             cpp_options = cpp_options.no_params();
         }
@@ -215,7 +251,7 @@
 
 #[cfg(feature = "swift")]
 fn try_demangle_swift(ident: &str, opts: DemangleOptions) -> Option<String> {
-    let mut buf = vec![0 as c_char; 4096];
+    let mut buf = vec![0; 4096];
     let sym = match CString::new(ident) {
         Ok(sym) => sym,
         Err(_) => return None,
@@ -242,13 +278,13 @@
     None
 }
 
-fn try_demangle_objc(ident: &str, _opts: DemangleOptions) -> Option<String> {
-    Some(ident.to_string())
+fn demangle_objc(ident: &str, _opts: DemangleOptions) -> String {
+    ident.to_string()
 }
 
 fn try_demangle_objcpp(ident: &str, opts: DemangleOptions) -> Option<String> {
     if is_maybe_objc(ident) {
-        try_demangle_objc(ident, opts)
+        Some(demangle_objc(ident, opts))
     } else if is_maybe_cpp(ident) {
         try_demangle_cpp(ident, opts)
     } else {
@@ -271,7 +307,7 @@
     /// # Examples
     ///
     /// ```
-    /// use symbolic_common::{Name, Language};
+    /// use symbolic_common::{Language, Name};
     /// use symbolic_demangle::{Demangle, DemangleOptions};
     ///
     /// assert_eq!(Name::from("_ZN3foo3barEv").detect_language(), Language::Cpp);
@@ -295,8 +331,14 @@
     /// use symbolic_common::Name;
     /// use symbolic_demangle::{Demangle, DemangleOptions};
     ///
-    /// assert_eq!(Name::from("_ZN3foo3barEv").demangle(DemangleOptions::name_only()), Some("foo::bar".to_string()));
-    /// assert_eq!(Name::from("unknown").demangle(DemangleOptions::name_only()), None);
+    /// assert_eq!(
+    ///     Name::from("_ZN3foo3barEv").demangle(DemangleOptions::name_only()),
+    ///     Some("foo::bar".to_string())
+    /// );
+    /// assert_eq!(
+    ///     Name::from("unknown").demangle(DemangleOptions::name_only()),
+    ///     None
+    /// );
     /// # }
     /// ```
     fn demangle(&self, opts: DemangleOptions) -> Option<String>;
@@ -313,8 +355,14 @@
     /// use symbolic_common::Name;
     /// use symbolic_demangle::{Demangle, DemangleOptions};
     ///
-    /// assert_eq!(Name::from("_ZN3foo3barEv").try_demangle(DemangleOptions::name_only()), "foo::bar");
-    /// assert_eq!(Name::from("unknown").try_demangle(DemangleOptions::name_only()), "unknown");
+    /// assert_eq!(
+    ///     Name::from("_ZN3foo3barEv").try_demangle(DemangleOptions::name_only()),
+    ///     "foo::bar"
+    /// );
+    /// assert_eq!(
+    ///     Name::from("unknown").try_demangle(DemangleOptions::name_only()),
+    ///     "unknown"
+    /// );
     /// # }
     /// ```
     ///
@@ -351,11 +399,12 @@
     }
 
     fn demangle(&self, opts: DemangleOptions) -> Option<String> {
-        if matches!(self.mangling(), NameMangling::Unmangled) {
+        if matches!(self.mangling(), NameMangling::Unmangled) || is_maybe_md5(self.as_str()) {
             return Some(self.to_string());
         }
+
         match self.detect_language() {
-            Language::ObjC => try_demangle_objc(self.as_str(), opts),
+            Language::ObjC => Some(demangle_objc(self.as_str(), opts)),
             Language::ObjCpp => try_demangle_objcpp(self.as_str(), opts),
             Language::Rust => try_demangle_rust(self.as_str(), opts),
             Language::Cpp => try_demangle_cpp(self.as_str(), opts),
@@ -394,3 +443,20 @@
         None => Cow::Borrowed(ident),
     }
 }
+
+#[cfg(test)]
+mod test {
+    use crate::{Demangle, DemangleOptions};
+    use symbolic_common::Name;
+
+    #[test]
+    fn simple_md5() {
+        let md5_mangled = "??@8ba8d245c9eca390356129098dbe9f73@";
+        assert_eq!(
+            Name::from(md5_mangled)
+                .demangle(DemangleOptions::name_only())
+                .unwrap(),
+            md5_mangled
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"7c57a031a7376d14b4d052d605bb77189be44497d6584aff47956288012e6ed7","build.rs":"11daa890ad5da877957e82fbc3e6c394b16565bddbd19431ab7e8ca0719c9bf8","cpp/c_mapping.h":"5a35f390bd4b92cc67a62b794d9789ec33e5146d8bc8add349958986955c21a4","cpp/c_string.cpp":"12fc6965e9f945378f6211c5d58c350331f2871f7ed11aa61c448e2dc6a00bed","cpp/c_string.h":"0df3f6241acb061d29e2458e745ff32d801b3fd3a0f825d43704cbf0f27ec5fa","cpp/data_definitions.h":"5b17eb3ac2008b576e385bdd3fb3be825ebffc6ca266afbacedd849dfd5a191d","cpp/data_structures.cpp":"e6392a9398d60a8363564072e76cd2de50bec817005e4978e2647346e6d41035","cpp/data_structures.h":"8363dd2f96abfcc03fc9dd1b4777580421bfc822180f534f69232b5ca82022b3","cpp/memstream.h":"81c65ce7a049afee0fb16b1de4b2b70c463a873a6336ee8710a4299579cf32d9","cpp/mmap_symbol_supplier.cpp":"c1bbdd995b1068acce38cbf3fdaab051454bc86a77bdf7f2a36c30084af273c9","cpp/mmap_symbol_supplier.h":"b0a11137eaa61cea1937f192a3fe0595c475e0e65e48e080dbb62759751be2be","cpp/processor.cpp":"9a89b37b7b4c74b5c70e93ca20aaec79155ac2d8c2c6c7a72b765fa730cd453e","cpp/processor.h":"0944819a88e5ae05f368bf6432b2378844bee43041eac804389561d040b79d8f","src/cfi.rs":"164375820d1a243ffed91d01f92af4787d267b891e306d209e1555f577f08add","src/lib.rs":"5876126ef2ab31dcb0218ac6fd20a94bea0e789510c1092505dbfce0359a6731","src/processor.rs":"ec8472952fc1ed1d516aa9ea26eccb6f98f4597ddb47a918e5ef0989fb36c8dd","src/utils.rs":"7c0630e72e8a34b4cf029e7096ebba93f25a03eb80cb0819f0cda10336a07a78","third_party/breakpad/src/breakpad_googletest_includes.h":"9b29f1b035d04abe698293c35c2b07a8f9fbc13d950b39d3de8ddc20fbd64f4e","third_party/breakpad/src/client/apple/Framework/BreakpadDefines.h":"24d08d9b5c9dc0fd1430b5f5118dde299df3626265d3d47d30c8863d4ed1e4d4","third_party/breakpad/src/client/ios/Breakpad.h":"bb0e8a002cabecf7fa39ba636672b816840c3de0ae6236153997e2d0699873e8","third_party/breakpad/src/client/ios/BreakpadController.h":"0d125d34cd2e1102ba3296783afcbb379c3f6eea01b19787b31212ec222093ef","third_party/breakpad/src/client/ios/exception_handler_no_mach.cc":"3236b3ae237833dcb2a2972c73a5153229a656e0258dc15863eda2d16299559a","third_party/breakpad/src/client/ios/exception_handler_no_mach.h":"644fbf55946378257051719921bd4710b8efa99d7c57654ac3f7ef2f1d75360e","third_party/breakpad/src/client/ios/handler/ios_exception_minidump_generator.h":"1b3766b037643e1d18b6f0a951e56eb73e2d0ded022efbcaa01d4572727d033b","third_party/breakpad/src/client/linux/crash_generation/client_info.h":"cf8403d32f9c6a9429cdf5c17dffc25178e6e340f8d241220e60ec109746a0b8","third_party/breakpad/src/client/linux/crash_generation/crash_generation_client.cc":"3001d5948bacab01944a9af6ad18bd4165b2e39668cdf212217931411624769b","third_party/breakpad/src/client/linux/crash_generation/crash_generation_client.h":"2049acf32cd817a74fc6dad066c2300b01673de9eec4cb782ce578a3cba8f106","third_party/breakpad/src/client/linux/crash_generation/crash_generation_server.cc":"91beaaf81855fbd5c438ef307bb3be8e8b172ce037a65b68d8f923d5571ce677","third_party/breakpad/src/client/linux/crash_generation/crash_generation_server.h":"c365289edf4036bfa8e37749ba33ca871004c97804b7dafc5d6f45eec252198e","third_party/breakpad/src/client/linux/dump_writer_common/mapping_info.h":"9bfb26f14920e5e7c6ab56d51fe11aa32c04825d7fbc062845978c728e7f4239","third_party/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h":"ed5bda7965d352f8ba177f844a2848c870e8ab0ad5f515eec7fb1e7145d4ab20","third_party/breakpad/src/client/linux/dump_writer_common/thread_info.cc":"09954b881441cbf954b501f068027f6912126c8936d32e7b279bdc3638333897","third_party/breakpad/src/client/linux/dump_writer_common/thread_info.h":"da7e9871a4cb7a04eaaead5c9520b38417ca2734854cf3517a34fbb2a6c57b93","third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc":"6b10fec69afc79e23b363815f5c6c0f8ab76239fda4a38c17e5dab81b416fafa","third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h":"d0cae7f5e2200e15a52601c69511c993f5a651158af0b7a94af7dfe0544cdaf1","third_party/breakpad/src/client/linux/handler/exception_handler.cc":"e77d88d97534f4ed218354c8b59934d54dc1b2f84529f2939f1c449afa908546","third_party/breakpad/src/client/linux/handler/exception_handler.h":"e5cce1bbb90595ffe1667b74c087f983160027c4cc4cd0c75992d7396bfa3a2a","third_party/breakpad/src/client/linux/handler/exception_handler_unittest.cc":"5752a03bec397978e8b2c6dfe8e6da1d3dd4e2a667e16cd8e3c4f0d4fa133bd4","third_party/breakpad/src/client/linux/handler/microdump_extra_info.h":"08cf5abb91678af4264e389e43f92bba5c5b70ef2627f1cb455b8fbf45f94139","third_party/breakpad/src/client/linux/handler/minidump_descriptor.cc":"cb7d9f301b4ffa89257732ba0d748ebdaa299da5379501648fa378d4015a7b99","third_party/breakpad/src/client/linux/handler/minidump_descriptor.h":"38582140e5ae0f3253a2939b37864585a4babc107a2638f0f21237033669836d","third_party/breakpad/src/client/linux/log/log.cc":"b1ae71dd1cee4216977ee2d5a37bde013d80eb1255f6714811911526e359c31d","third_party/breakpad/src/client/linux/log/log.h":"1b01b7be8810d670b32ca1020d62713f864e449aa32cec741b8033ca3cfa3871","third_party/breakpad/src/client/linux/microdump_writer/microdump_writer.cc":"f5c0888ae054ca0a900e78de03b2de37fd333a46903d546a405c43fc42de442b","third_party/breakpad/src/client/linux/microdump_writer/microdump_writer.h":"938a666a05550486c3a794990f966aac88a22cf5f8e2870c58368ff373429ecb","third_party/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc":"baebcd263219586c44d968a3323b21332d04730d02bfc7fede690533752239b0","third_party/breakpad/src/client/linux/minidump_writer/cpu_set.h":"19ae72ba137e7d00e775b3cb622a8b23db7fec9ce7b01fddd34a5b59fbbb81ee","third_party/breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc":"8426562ef5c7da358b077e976eb569b4632ffdb3951b1f74aed5dd1909a98bda","third_party/breakpad/src/client/linux/minidump_writer/directory_reader.h":"bfdcda29d7e248bbc3649189775e94f9bd2e0e234e39b14f7880cb6f3eb14276","third_party/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc":"9dcc5a40f6e53729f2209fe7b4db8355e2458f57b9c7ff57314f668346ee1523","third_party/breakpad/src/client/linux/minidump_writer/line_reader.h":"58c0f9ca20721a1cd7bbd7bf257b70d120bd1a26673612f2ff6db45cf3d1cdda","third_party/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc":"0fa6cf15227c85648b08d7236139cfcf454697ad7966170991c2d83840a93e03","third_party/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc":"9a42e5fb7968fef00097256d47009b9cd53b8e3dd19bf068b51b653d6bc9b8fd","third_party/breakpad/src/client/linux/minidump_writer/linux_core_dumper.h":"0f13984a36a87221217ee4cc207bbeb0d7e7e2d3dc161a0ce0e8f51b0a71304e","third_party/breakpad/src/client/linux/minidump_writer/linux_core_dumper_unittest.cc":"f66a4ee4b20451bbc5e5c7201812beb5e6c23093e4684a16161231e3b5cfbefd","third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.cc":"d09f41e86ee55b1232299862e30865441a6cebb330ab2a8830c50a7c55f86aac","third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.h":"95c00f451e543e9d2c2198e5c22ef611d43029dc69ae7efcefbd380bc9f3f5a0","third_party/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc":"09d8befa32f271c62a672f0153d7c6156873e792713bb2dc69bdafa8cbcafc78","third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc":"64fd32bf470928141a26077cebfa10fca7c4a2f7327dcb7e490762ad4e29afbf","third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.h":"e2a390a3c1a78f1a05ba8ea69b50e358a6bd3a8cf9dc1bb3f3d798de24d0cdb5","third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc":"765c2b8371175f16ae61d0d56faa5190b226fcf9c512c81c75f3dd41929239be","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.cc":"88015ae1e3856a61cd26a92486fe8212928d1a3c5fb9c23677fae51be08b964d","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.h":"51cbb09493109916fd5ad7b4c2981f3b586de12ec5b68acf3d75e5a7e0f6678e","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc":"97b20b42b79c0fdf9e3711695e3aecb1b91e86c40527ce64d108ec3e07f7485e","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc":"9b14d85313712ef3b0a4571ff640e6c384aedd9c4ed9fedc7e203885662b0a12","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.h":"8e3948be9341e0b3a8ae8a0770eadf5070425d1ffcf06e18bf4cf85cf71c05b9","third_party/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader.h":"8ea362fcf7ea3d54343d10ea13f8ec4c0dd87fe22e04a077dc56018bf0e42892","third_party/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc":"f61e1889f05e5a21e2f4a6bdce7d5d6f5850eaef044d375a3ef321f2a2b5b7ac","third_party/breakpad/src/client/linux/sender/google_crash_report_sender.cc":"654c3cdb6d09d0870be1d1a51eb4a4fa591703e5591e9d2ed4b8e80f9047fcb1","third_party/breakpad/src/client/mac/Framework/Breakpad.h":"9288834695109973315d1c4fbdbcdd4bb3d87f97a097ba5c603ad8fbb7e8d3d0","third_party/breakpad/src/client/mac/Framework/OnDemandServer.h":"ef611776ff9a2e820ef2c0b9979537f505ba5e821018dba4712ee15033a96628","third_party/breakpad/src/client/mac/crash_generation/ConfigFile.h":"a5914b7da60c2acc8d8b252bf06e8a0be4922a7aa73c65124b78e18702279647","third_party/breakpad/src/client/mac/crash_generation/Inspector.h":"6539026ae3daf26754aa18729cc918e13944622bf74a51d62e5638e8c0c83f73","third_party/breakpad/src/client/mac/crash_generation/client_info.h":"52fea2144722f985aa802817843d863f894daf578b0a5ef49832a1cfa370d323","third_party/breakpad/src/client/mac/crash_generation/crash_generation_client.cc":"479d761e4a021b59102702f6cca3117eee2a85f0cc9cadae5d2b0913c1654be9","third_party/breakpad/src/client/mac/crash_generation/crash_generation_client.h":"4614dfe2b2cad777ce42ab35d5b4ac188f45633b83f9108c36e5e1b94361feaa","third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.cc":"5e1319f28adcfd2144fe402b7e15e879e3c772711ebe9a478b31aa533b993a5e","third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.h":"790fae54f25ae40b5f5c48a490149597faa1b95a9bc5c3487495c3b18c190d8a","third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.cc":"0d7ee8b05e119e89a48c22a2a8cdb886ab8169cd27d07d017645c1b1e77c7dca","third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.h":"7634a1104e262c0b644918bda2946fd15e721db1c4ab45b129c2004c44e926e3","third_party/breakpad/src/client/mac/handler/dynamic_images.cc":"3c06ca6723a97b40c1f9993bbb30651643f6bfd78e75d20a2ee0047b25ee0b3e","third_party/breakpad/src/client/mac/handler/dynamic_images.h":"c076bbdda7499ea236cbc80f44c5d8be8d3d34f614540bb2b7338436860b7718","third_party/breakpad/src/client/mac/handler/exception_handler.cc":"01a70fad7d6ba1fc798df4b0639743f13d48a1ca865860bd2eea5a5b98ce7f86","third_party/breakpad/src/client/mac/handler/exception_handler.h":"e34eba3e6323ea57b3a9c027c7d894ba2a188a533d5f9e6566e85037608a869a","third_party/breakpad/src/client/mac/handler/mach_vm_compat.h":"bc655687db47ce7b16a56b3da4b4ca50bc6c75363b4f09ce7012c49da614774f","third_party/breakpad/src/client/mac/handler/minidump_generator.cc":"87dcac379087324daba0a2136b7dfe186acf42a81de2c48c69466bea05abac84","third_party/breakpad/src/client/mac/handler/minidump_generator.h":"18f03bcbd96010b7ed9bd1420feb1d83a8d22040433b5f9ce36214be875f98ff","third_party/breakpad/src/client/mac/handler/protected_memory_allocator.cc":"90e97ba00760914db57e32f9be6734afa47ecb42d6f7837c02539d76f99e6f07","third_party/breakpad/src/client/mac/handler/protected_memory_allocator.h":"b504b794ccb2fb944230ab4c80fcafe2137c720d876ce11d08b4999851c133a9","third_party/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc":"a3aaa55835b26d6b51aa9b3bc2bedcd5fba5b8a46da088a2e5531f54289352e2","third_party/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.h":"4b8b37c6131fe862bd10efa2b562d48d4212662f53374c9a0deed63d1d21ca37","third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc":"2cbcf25282f35bd24d0b30d98c5d5a2bef5023eb49bcf7284bfd7dfeb3e9c555","third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.h":"d81d7e4fa940a066725f29cf3b3085580562f8de3177656536d389d05a89a59e","third_party/breakpad/src/client/mac/handler/testcases/dwarftests.h":"da45b459088430a7576ae00c23425f39cd975b501d38d41e968e9f7259fa6d94","third_party/breakpad/src/client/mac/handler/ucontext_compat.h":"ac0f2e843db2c3167e77684fe9a44333a3e0a0fd42ea348d5280d4b35dc3186f","third_party/breakpad/src/client/mac/sender/crash_report_sender.h":"445ca9eb8d56de1efac6b7f289b3fb9eeb4a8ac436b1d57c4ac58a89ded5bc6e","third_party/breakpad/src/client/mac/sender/uploader.h":"48eeec3e6a46d05a253fe06b1e979b9e3c49a01f52e44dd1edd50d7b16ef22ee","third_party/breakpad/src/client/mac/testapp/Controller.h":"ee4c7fbd19523875536729aefe96a4f5967f1770f0ef4e5ba093151e710ea039","third_party/breakpad/src/client/mac/testapp/TestClass.h":"80cf7137fe63ea1239f6501284e1b6441425fd8420da7b0b8bd662f717b25dd3","third_party/breakpad/src/client/mac/tests/crash_generation_server_test.cc":"af4f83f4f29a8e43fa4c6440c80bd94b49c1d68523e24082bad6835dbb73c6bc","third_party/breakpad/src/client/mac/tests/exception_handler_test.cc":"a97e5d1801bf5f8efcc96c8c84112e07d59bd0c033461c780bbf364e3f963095","third_party/breakpad/src/client/mac/tests/minidump_generator_test.cc":"9f94bfe3024e6d2ae149f6320f6537109605d45504a63dfc83194479bbbffcc2","third_party/breakpad/src/client/mac/tests/minidump_generator_test_helper.cc":"1ce8d67117f964c1706f8d52d9318197ec31399435a1d406133019b867f4ddcd","third_party/breakpad/src/client/mac/tests/spawn_child_process.h":"342d5c40ffbe1d4c99866a5ab1ce6a82920b629b71b84e0f874ee0d3624062be","third_party/breakpad/src/client/mac/tests/testlogging.h":"ca8bbde92d0ef9755ced6cce1694c25a702532bf04997be4226aff041c648683","third_party/breakpad/src/client/minidump_file_writer-inl.h":"f685e1fbaee3ca6119831e06d1dc2f12180c5ee80996f53277a3b7f9456eaa7b","third_party/breakpad/src/client/minidump_file_writer.cc":"f736515942c65396684a2a147c10b0c654955441739fcd241d24729346ef049a","third_party/breakpad/src/client/minidump_file_writer.h":"9a442462b2f13b943fe909d09773a800a5ab671459e6ef9a45c4c5959dba134b","third_party/breakpad/src/client/minidump_file_writer_unittest.cc":"f2e7b78546604cbd32999f9801d5558199a670f41f9dbc0826b3c6eb98dbb2ef","third_party/breakpad/src/client/solaris/handler/exception_handler.cc":"d5db92a35b0dd50546a9a149cee4594d6545f5f9365fd65a322bb989e87bda10","third_party/breakpad/src/client/solaris/handler/exception_handler.h":"ea30c3f09e16f26666e062d668e474f4c86a34cfc345e84d993a31c9781c905f","third_party/breakpad/src/client/solaris/handler/exception_handler_test.cc":"94529b6c8bef1c713d5789584ef99174e09db3204a4c6c3e9d3d8047cf441b28","third_party/breakpad/src/client/solaris/handler/minidump_generator.cc":"a6c46776b777adfbc169c933f5cc6a3dedf8e40084dd3057a0d2e316801e3c88","third_party/breakpad/src/client/solaris/handler/minidump_generator.h":"593d282102b5fb48f0fc7c4142f5621227779b2ffab1dc1ddb9817605d996d7a","third_party/breakpad/src/client/solaris/handler/minidump_test.cc":"0082ba7ef830d3f1e214832b3f962131c408c705ea1f48b8d0669dbcefbe0355","third_party/breakpad/src/client/solaris/handler/solaris_lwp.cc":"38419696ff59bb34d64080cc8a4dd12379cd471c89d34005c5bbe6b1eba642e9","third_party/breakpad/src/client/solaris/handler/solaris_lwp.h":"9e18e7a0894426154a7235a7994ae7868c17a859df3d0f690f2516509bab736b","third_party/breakpad/src/client/windows/common/auto_critical_section.h":"aaafe9c1d646782e67b804b8b5ecd91e473ba5003aaf4436b3be149c40e0b73a","third_party/breakpad/src/client/windows/common/ipc_protocol.h":"b20eafa68fd258df1cdb3cb42ad8c34a1d40e780bc925be5a442e305330d9afa","third_party/breakpad/src/client/windows/crash_generation/client_info.cc":"96db47f9d29fd5ea8dd099b19368cf642fc019bd25846718296b22341c540380","third_party/breakpad/src/client/windows/crash_generation/client_info.h":"46c0f38beab043b6b2975bfb75198c7280d3f31b8db058a8f6e5b5665da304d9","third_party/breakpad/src/client/windows/crash_generation/crash_generation_client.cc":"4fb62a5c77fd2766d40cb7983466bf0aebbd4f0d52e4cbb04ccfd72d04226d57","third_party/breakpad/src/client/windows/crash_generation/crash_generation_client.h":"9aa7f1a8894a75eac6b00f0defc81f27d5ca24cd7942490eced6d202762001c6","third_party/breakpad/src/client/windows/crash_generation/crash_generation_server.cc":"bdd9209cce9a284492e76cc75ebeeece7e61dbfa9ebafd26847bc74ef8c71851","third_party/breakpad/src/client/windows/crash_generation/crash_generation_server.h":"2adfbd87d8d0eb34b295deda08bf32595cc5641f1a867d1fac708aeeabd494ac","third_party/breakpad/src/client/windows/crash_generation/minidump_generator.cc":"e85ef30b259073695fa17ecfae2e2382872955f1d4528c5bcf98e192713c96eb","third_party/breakpad/src/client/windows/crash_generation/minidump_generator.h":"f11046a8f392dfc374212a795a5e79b3a6f0f0d7c712de8f5daebf5f6d8a38ea","third_party/breakpad/src/client/windows/handler/exception_handler.cc":"52a2264b4e7e5b7ee405723bb1bf8e4b22c2d5bd7689b147bd1b1dd07cab9c3e","third_party/breakpad/src/client/windows/handler/exception_handler.h":"c7cffffbb76b910840cda1ba852df939ead2aa86174bb01d16c5eb2b406c33f5","third_party/breakpad/src/client/windows/sender/crash_report_sender.cc":"7e3f07b7b3f1710a7a53c0e15127b056716977973e8bbfbcf5d08ae1cfaf9b81","third_party/breakpad/src/client/windows/sender/crash_report_sender.h":"036ebb425dfcf4b9974d92ecdc83645167e5fff76d31bade1c1d797ea6ffeca9","third_party/breakpad/src/client/windows/tests/crash_generation_app/abstract_class.cc":"914b6ec851ecbe03e8b63f3554ebfae376fda614a7a4a6d9e8dc04dd94642cc5","third_party/breakpad/src/client/windows/tests/crash_generation_app/abstract_class.h":"714d2b61da194c5462b7b6e343c45a10030a07535582d8c1eeb5584a8a04b00a","third_party/breakpad/src/client/windows/tests/crash_generation_app/crash_generation_app.cc":"4b303b9f78f2365d071639ea7d4b36056388ab7f67d90b2a3b7317d5313da64e","third_party/breakpad/src/client/windows/tests/crash_generation_app/crash_generation_app.h":"04bce5afc6f432fffb80bd3c082dd8d5ec364338d07f30770ea6627fadb96e91","third_party/breakpad/src/client/windows/tests/crash_generation_app/resource.h":"7c6c7bd3f622fb871f69b994aee3d63410a51f6543d56f0faf9f83f682eb8fb6","third_party/breakpad/src/client/windows/unittests/crash_generation_server_test.cc":"a69ea399a3ce396275660cc30d1a025dd3e6587df2bbb0262f9d192ff724af6b","third_party/breakpad/src/client/windows/unittests/dump_analysis.cc":"4e27af756c65495b26ef1dafc607b25a2c824058eef62fee197d2a2d3638b7bf","third_party/breakpad/src/client/windows/unittests/dump_analysis.h":"9fa250ed4ee9f2fe4cd2ba93ccc00da2d7343375f8598ee209b1ef79ae297702","third_party/breakpad/src/client/windows/unittests/exception_handler_death_test.cc":"f0ff1c7772c2d40e09da68cdd735404ababc819f98a646ad1950da6b22a34713","third_party/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc":"6a50934df698ba5a4c5f571ff49696f8ad33f42171fd0147642346934017429e","third_party/breakpad/src/client/windows/unittests/exception_handler_test.cc":"1f462d3cb5ae48c6be5ea917ef98cc1769cb97c7c735762efb88da899e28b11a","third_party/breakpad/src/client/windows/unittests/exception_handler_test.h":"6bff440651958d4284c134ec98b2afcd4b873aec549d4f6f4814ef6cdd6812f6","third_party/breakpad/src/client/windows/unittests/minidump_test.cc":"809c2c8497cd1f15c8d490e7b8fef6e4c3213f3ee3bbe42a7320bae44dd9e495","third_party/breakpad/src/common/android/breakpad_getcontext_unittest.cc":"d86bdd3e727fe60a5a23e7373506b5ae08dc19998ebadc513307dac35795b9ef","third_party/breakpad/src/common/android/include/asm-mips/asm.h":"10c1e820464c51c8fa93eadf7c7bb55c436e18b5f66fca876c73cc7636c2d78c","third_party/breakpad/src/common/android/include/asm-mips/fpregdef.h":"a0a889ab6a2f065ca02be2273b06f607bf29b31e31b3a006f64e85209ee149a7","third_party/breakpad/src/common/android/include/asm-mips/regdef.h":"f395f33fbb4bd09bd7b8f6e93ab2cc24c48d4cfdd1bd5abc95aa661d4286a843","third_party/breakpad/src/common/android/include/elf.h":"ff040a544416a95a1073ee59dd3f14a1d34bc925ae0652606cbdbcfc2ca7047c","third_party/breakpad/src/common/android/include/link.h":"d555eeff531cb8b5522554a6580831906aa94de1493d54bf7cf5bed55cc36e6d","third_party/breakpad/src/common/android/include/stab.h":"f55465314e50e7fed9cb1b76a8216e1548268455c72799ae38b8a23572bce545","third_party/breakpad/src/common/android/include/sys/procfs.h":"5af6467dbd9f581dc84b59105fc7bde3fd68f77e14a2b139d4f3b9834dec7fdf","third_party/breakpad/src/common/android/include/sys/signal.h":"e57cfc05fbf51be84e3c402875478c4d940f6b080df9158e2a99966893aa940f","third_party/breakpad/src/common/android/include/sys/user.h":"8c7c56cc44ff56be17f0e41eb7cd8c5dc6779698d1d91a8236b87e35f7fd45e0","third_party/breakpad/src/common/android/include/ucontext.h":"42988f5502bf0a53ed0ce38bd9794e46bfa7e53e3f1f86d9d5a7251a2815ded6","third_party/breakpad/src/common/android/testing/include/wchar.h":"25a5574240efa7a29044ef8f7b59cbe50742b421373a7ed33d8b8fa54ff7cc82","third_party/breakpad/src/common/android/testing/mkdtemp.h":"6682aae6cf21fd14ec7d71807b8e8cbe0d00cd87292c27e3cfc9a68ae28c331c","third_party/breakpad/src/common/android/testing/pthread_fixes.h":"338fdca8418dc972760deb4a173773f9b5b17b8273cd73551f632e96fcde6de7","third_party/breakpad/src/common/android/ucontext_constants.h":"675726a5073717f73b5e5b5e54f28463775b6482944e6ff9e19ed806f360c179","third_party/breakpad/src/common/basictypes.h":"4b4155b8f03c30daf982001c156b2de1a8dcdea7051b606f01ef72750a3e32b6","third_party/breakpad/src/common/byte_cursor.h":"6d0cde3065f2a2b65df0615f434a6c0f0ca6798a4ae3af92773980ee8444811c","third_party/breakpad/src/common/byte_cursor_unittest.cc":"14b21c4cee9afb83b2b86e771ef87c06a18a3c26e057e99e2598140cb8aee58a","third_party/breakpad/src/common/convert_UTF.c":"f88a16213852d0863470e1e20b2b3adbd3bf2d7e2d2d8aea339e411d43a4b58d","third_party/breakpad/src/common/convert_UTF.h":"ada86c977e14c0cf8a1a8b03ca82249e7153b7eb756ed0dcb06db69d08661029","third_party/breakpad/src/common/dwarf/bytereader-inl.h":"3a2d23c142ee153e62010969eb7ccde4b98b85037176641ff9db5c7c12bd92d5","third_party/breakpad/src/common/dwarf/bytereader.cc":"31bb0cb85ead7588b82210c9af1234d789c0a4e77ac2641a4163563d25ec8999","third_party/breakpad/src/common/dwarf/bytereader.h":"1f4b90e0b19a66b65acb4a0e89c791d8d337d223607cf7ebd5ec30accb27de28","third_party/breakpad/src/common/dwarf/bytereader_unittest.cc":"49be9cd0e04f40d02e4dbc36446a3461ef5ba298c6ccde3ea07d2f8b630eebc4","third_party/breakpad/src/common/dwarf/cfi_assembler.cc":"32ecd339a2a2551d85df7bcbd86206768b8ef6cfb5e0658261a457b2c623e80f","third_party/breakpad/src/common/dwarf/cfi_assembler.h":"da7728a85486b08bf3a0d57e3be3fde0003e44695cfdeec6a2524e6f633635f9","third_party/breakpad/src/common/dwarf/dwarf2diehandler.cc":"137eaf38d66a17c47af3169294864fd60cb0857a71e685f725670b92abffee03","third_party/breakpad/src/common/dwarf/dwarf2diehandler.h":"9d903dfa4c2c8db1aa55513f8d1eb1ea5935c43e837eb2c1e00a826449f18449","third_party/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc":"f1fc268222f91d3843a962e293d344e3f20a5233ba8ed93d813ee2bdfad6882a","third_party/breakpad/src/common/dwarf/dwarf2enums.h":"489152a913bce09b9ed2413ffa36884ee3054321f6735c0a0682afc37d03c324","third_party/breakpad/src/common/dwarf/dwarf2reader.cc":"a40445ef0fbb2eef5686109797a11e0ea1ac8894aa7888581afbf39fefab345d","third_party/breakpad/src/common/dwarf/dwarf2reader.h":"366da71f2cefc16738d4b94b066283dab0aac61efca9c220d19004448d7b6b42","third_party/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc":"95d7987ee1423f66930ba14c1663b67f1777c8d3b6e2aa1659037479c2a0b429","third_party/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc":"406881e15f324dac3d6ff327cb0b4cc582e2fc2d542aea74bc2a24655b64f42f","third_party/breakpad/src/common/dwarf/dwarf2reader_test_common.h":"a47bc04bf995c3419d5532c5ed39307d7354bd95e308b0f4ad6b9ea72aecdf96","third_party/breakpad/src/common/dwarf/elf_reader.cc":"71d6127a8699a1c7396acc5af76dfba1659338857cd7f58d76bf6fd2bde7c47d","third_party/breakpad/src/common/dwarf/elf_reader.h":"b044f9a2afe81e0d3428cbb8c5b68ba957b3e67304e7273bb0518693dcdf6ae4","third_party/breakpad/src/common/dwarf/functioninfo.cc":"6e1d5b160837b8c60726d969351cd382ad526047eddc293d65152b96812e9500","third_party/breakpad/src/common/dwarf/functioninfo.h":"9a6d631b342f73812a7f69f701d5d49b27eaf75a01cfef9ef7a0fe05d438a418","third_party/breakpad/src/common/dwarf/line_state_machine.h":"e3be893ec95bb02ce4dc38e70df2639d667e0294a304cd27cf0bc3d9c328c7a5","third_party/breakpad/src/common/dwarf/types.h":"4ee96f1df051a81e19be07cf6df1797ce822b2e5d0489f94c55376e6e4f03f12","third_party/breakpad/src/common/dwarf_cfi_to_module.cc":"08079cbb62ff0ce1e3dd3ee3a4d9511f22e5c9698bd822e5c82e0957729e4ab4","third_party/breakpad/src/common/dwarf_cfi_to_module.h":"f5b63b0a7cba9eec083bee02580b9f85d175eb1c20e1d72f8978b804893a77d0","third_party/breakpad/src/common/dwarf_cfi_to_module_unittest.cc":"fef90275a8f205050e3976a1a91317888e0be86484405c19391eacc560832cff","third_party/breakpad/src/common/dwarf_cu_to_module.cc":"3825c50827f2e80d1406d76561561e577ebd86eed01ca3e295d23aa7efeb42de","third_party/breakpad/src/common/dwarf_cu_to_module.h":"646bbc68b54406031f080c337d7c13d863a6e9e1039d0e19ad4948c916f04044","third_party/breakpad/src/common/dwarf_cu_to_module_unittest.cc":"d0829c504b7d3d7bc1edbc3b97c314612d391be085a607102616ea2bb382d383","third_party/breakpad/src/common/dwarf_line_to_module.cc":"77c775adf536c58500ef68d8ba1fb32f67a0905e1c4b2fb4e011197904f31def","third_party/breakpad/src/common/dwarf_line_to_module.h":"d092158bf296e639ac5684dbe8128f72e6ebe794469705cd958b1ab01f09e823","third_party/breakpad/src/common/dwarf_line_to_module_unittest.cc":"4268800e557cb0d0cc2cbaeb21f231eb3f44bf4043414a8e9d607ad25f97268d","third_party/breakpad/src/common/dwarf_range_list_handler.cc":"adae8a00b5a6f0730c0566e86243638b1b4e4fb3db1e42dc4374483d6a7fe10c","third_party/breakpad/src/common/dwarf_range_list_handler.h":"896f9bf06614632d26f4447c87411256a32e8d69b8b7c2b6e35ecb2815a3268d","third_party/breakpad/src/common/language.cc":"0a5c51eff24e640589dd15c00a8b082694d26ce7c214ef142484a2868a1d63a5","third_party/breakpad/src/common/language.h":"19c9c55cc66c8d2b31301066d29114558f47f150e9113e66315fbe2c2e89bab8","third_party/breakpad/src/common/linux/crc32.cc":"4c66f33ede03ad80318e15a69104bcf4a753f741a57b3d0734db081c74954488","third_party/breakpad/src/common/linux/crc32.h":"4723d1c58d7574b39fc93152187b2ed14278399a053cdf241cfde154dfd7c194","third_party/breakpad/src/common/linux/dump_symbols.cc":"5cb30752479762b7bd1d1cb66a27c376968203573e24ca69363bec67c1b2eb58","third_party/breakpad/src/common/linux/dump_symbols.h":"e3ea5e6be2b8f8da021fe23c8a25fc4442f67a553803a74027dfcc5bd79562b0","third_party/breakpad/src/common/linux/dump_symbols_unittest.cc":"5b0cd04320c2a115420fa80d7c8dd9e3981fabf33d910b9059b4075cb1ee7121","third_party/breakpad/src/common/linux/eintr_wrapper.h":"f075892d9c95c329ec3ced7d0ff19b11379ae941e3b40f209cc67f2e0af9a0ec","third_party/breakpad/src/common/linux/elf_core_dump.cc":"ae7e9b10c41aba281d22eadb064e191754a28e5e2850d4e69f13018aec8aaeac","third_party/breakpad/src/common/linux/elf_core_dump.h":"7a658f21c13ee09f20300720857128115f0da5930ce4c023b77cab1f1d2ac1f8","third_party/breakpad/src/common/linux/elf_core_dump_unittest.cc":"6eec8b91a738cc3a22ed931c3ac1a3352889896b9edc9d856202d3dc07f3b457","third_party/breakpad/src/common/linux/elf_gnu_compat.h":"e23e9a4296cb3c0b50505b70bd31ec5aac513642014283e355a61f32caba5342","third_party/breakpad/src/common/linux/elf_symbols_to_module.cc":"bce6c1da2f4b362645338ad1f3361c504b2a4ae2102b0dabad9ec0462de13167","third_party/breakpad/src/common/linux/elf_symbols_to_module.h":"8f470f3e7987e73e6c702f8f3f439ce4721d5a5f6ba423ade6bd17459b819250","third_party/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc":"f6cd71d9e8c91b940b398ca8936cfdd40734054461b1b86a4590654956a16718","third_party/breakpad/src/common/linux/elfutils-inl.h":"bf97f1d1cb1e220eb693664ebcba020a8bb3de065fb36832ab68cfa1a1b19589","third_party/breakpad/src/common/linux/elfutils.cc":"b4ec6b6a93d63ce4d30a09687bd5cfbc099a717cd4a72c2de36f82ffc02066dc","third_party/breakpad/src/common/linux/elfutils.h":"45fa3f075184ef9338f2bf479798e23806bc0ccc35b2b26e2f2db23d5d58ec51","third_party/breakpad/src/common/linux/file_id.cc":"e91529f30647bd88172642c022e2e8d414de78266314a40cd807672d2403535e","third_party/breakpad/src/common/linux/file_id.h":"ce870bdc2bfa367bc3e1069337894a2fc0b0e2d418102c4abde8d18f97248ecf","third_party/breakpad/src/common/linux/file_id_unittest.cc":"b7399b260e68a3214b8f3e81504216c7fd57252e45b7782a1dd09d5eaf6a8fb4","third_party/breakpad/src/common/linux/google_crashdump_uploader.cc":"e228cdddacab8faca78601e560d68685ccaee8fcea8fdd9548b90066e3ef9752","third_party/breakpad/src/common/linux/google_crashdump_uploader.h":"364a672f44db9b90fff92dab5f48d73bfd910167c2ca76fd2f0e3523a9ca3dc4","third_party/breakpad/src/common/linux/google_crashdump_uploader_test.cc":"8adfb6457f087117d6209da65daa9d3426378f85bfb9bf16ed6454f8cf78c813","third_party/breakpad/src/common/linux/guid_creator.cc":"bf705bf09d18e7a027d2e2f8b688a8a02832fa2bcb6fa08d3e6f6b60e64eec51","third_party/breakpad/src/common/linux/guid_creator.h":"a43a3849eb2dc213a2aa4b96730e796951cfcfaf3d0be64ec8de1a054f4349de","third_party/breakpad/src/common/linux/http_upload.cc":"6e497af8d1addd806f6cab6670871445b18029e03d6eeb7f5ded3db04e706ff5","third_party/breakpad/src/common/linux/http_upload.h":"d37601bbe6cfc911c0d71428151dea285b197902bc9bc837c8598187e53db14a","third_party/breakpad/src/common/linux/ignore_ret.h":"72ecb012266bb23926df186596b670955ff30b72dcfeabc9c9780ed6034ec85a","third_party/breakpad/src/common/linux/libcurl_wrapper.cc":"55947e657c06b1957e57c5bc2b3a63b0b94ac0eea9bc27dfd2198aee95b734d9","third_party/breakpad/src/common/linux/libcurl_wrapper.h":"c7c45b5067f5dffc9b66578d4dfbedb208dda7879ef599b188ea3c04cef1a09b","third_party/breakpad/src/common/linux/linux_libc_support.cc":"2f65adf76f359e64f6562f5d529a169234ae12ebf5ecb540e5dbbe871061532e","third_party/breakpad/src/common/linux/linux_libc_support.h":"21deb261c8c4a7f92726a3fc7354339f4a4d0504f26e85ca1855341e69eb62e0","third_party/breakpad/src/common/linux/linux_libc_support_unittest.cc":"594fe9ab3fe15c7a39be595efd89e5be70a1af140b2848af3363509cb4043e10","third_party/breakpad/src/common/linux/memory_mapped_file.cc":"e78b2a0b029295d97ac10e427171be94f4752c01339a0cd8b9d3172872e82435","third_party/breakpad/src/common/linux/memory_mapped_file.h":"59c53b3183e2d79964eb6165e0fe4fe24712a2847669bd84fc886c63809a3db1","third_party/breakpad/src/common/linux/memory_mapped_file_unittest.cc":"36339389c8cfd66f23339c864ba76d45140c0534502d8136e6d7ef9f3466e199","third_party/breakpad/src/common/linux/safe_readlink.cc":"706648c80c8f63912546b544faeecc2ce48700b6cd151a2c69d194e81aaf55c1","third_party/breakpad/src/common/linux/safe_readlink.h":"c1e08abb35b04a2ea42b5b6431460c889ee9592521ea7f979412565dee93e169","third_party/breakpad/src/common/linux/safe_readlink_unittest.cc":"7d29d93667433ac8d080517478ca13ccd1db40ed04aed6a3daa977f36ff3b990","third_party/breakpad/src/common/linux/symbol_upload.cc":"f4307d1346b725c50611eb4129703a34c4154d7af3a11967c80ab4450bc01738","third_party/breakpad/src/common/linux/symbol_upload.h":"a045e471dc4b82e5edb29c0b622a5d8ec861087e53251a30c898864dfb642378","third_party/breakpad/src/common/linux/synth_elf.cc":"9c86bc230811458853d606da9465553d20f565c1801db7fe658ff76b8f3ed899","third_party/breakpad/src/common/linux/synth_elf.h":"306eedf98fd288f7fbd3b559dacc4b8754b10c8a4aa15be1910bf1e4623d9bf5","third_party/breakpad/src/common/linux/synth_elf_unittest.cc":"c50371fa7cedf12ba03b84745456a489a9dd36edf72537d094a10a6bef97f312","third_party/breakpad/src/common/linux/tests/auto_testfile.h":"4fb710afb70e2b11612d6fd32162f737ca6b3038a65d53f9deda1fcb2f6d1a48","third_party/breakpad/src/common/linux/tests/crash_generator.cc":"8fc249ba2e6b0e9ef0062786f2cca0b4d3be4aa4857976a55c287379182b845c","third_party/breakpad/src/common/linux/tests/crash_generator.h":"7216cb63e55de1a428658ac786e0567874bd680746683aa34857a8307ea8daa9","third_party/breakpad/src/common/long_string_dictionary.cc":"d4cc1ac05358a87e2cb832dca6996af2bc036216beeea276f91c7b8c0a187886","third_party/breakpad/src/common/long_string_dictionary.h":"670df27dab9929662e8fc485761519eb042fae90ca100141c2e601b76a2238bc","third_party/breakpad/src/common/long_string_dictionary_unittest.cc":"2cbccecfd4553e8b5b239c5f2f6d77bced1f641bab61470835002dc57ab8794b","third_party/breakpad/src/common/mac/GTMDefines.h":"e31f6382ae4c7f976a6c259097bb47ce2cc760538f1950f691694770c81b08d9","third_party/breakpad/src/common/mac/GTMLogger.h":"57c460f0e81b8d1602fb4a56bcbfc8d3b75ca9008ad216c126b72b29fe57b10d","third_party/breakpad/src/common/mac/HTTPMultipartUpload.h":"3008aec91f0cb69e260d039cb6022952e9bac6c18cc35103d146c106f70ac2c1","third_party/breakpad/src/common/mac/MachIPC.h":"27c6f8866e77b80c2cfabf0f144d524000e7a1b6c76b9ec12d2ade6179ad73fa","third_party/breakpad/src/common/mac/arch_utilities.cc":"5926fe6b0ccfc55b7ecc9ad2a54f3178bff066869c41d14a49d3293bc7c3ed1e","third_party/breakpad/src/common/mac/arch_utilities.h":"f5ef770fcc58992da6b427bb4a5efd3c4a3a7a468f6b672a62a1f96918377f80","third_party/breakpad/src/common/mac/bootstrap_compat.cc":"853ee61aec1b35ae54bf055a4e65546318c068546dcbe3e3d5c9e4ccc772d16e","third_party/breakpad/src/common/mac/bootstrap_compat.h":"657ad2e87f59dac32807ed584745df438ea228b671b158c7e00858ef375501a1","third_party/breakpad/src/common/mac/byteswap.h":"810a960ab49e97ff4ea531899eccb6b6cb4c5b43a11e43cb3f51510c9b7cd07d","third_party/breakpad/src/common/mac/dump_syms.cc":"b05ec9745b86dc37ee755e3be4343f357979944d28aed671c5924c8a84923aba","third_party/breakpad/src/common/mac/dump_syms.h":"b4248dffcbd253a42f9eb5511f495a8c2a0950603e3ee8102a511fba4801d2da","third_party/breakpad/src/common/mac/file_id.cc":"e325d429cef8e21fdda28d8a5d9d4f041a3ebdad9b03caba739c930b5bfc3556","third_party/breakpad/src/common/mac/file_id.h":"2bfaa01ad3c41b368df746069c0d74efeb4d877e8c472e54443091b469c395ac","third_party/breakpad/src/common/mac/launch_reporter.cc":"6f398e815968b78531f83f6abcb333b86ddd55b9bba00b3bb7bbecb0e75c0dd5","third_party/breakpad/src/common/mac/launch_reporter.h":"0964f4a89453b402099ac2c4efcac2a959f56b70afdc3ba597325b0aa48fb1ed","third_party/breakpad/src/common/mac/macho_id.cc":"38a238a9509b33aee46ea0de322ac65f09af3546ab541bca605966b01d3668f6","third_party/breakpad/src/common/mac/macho_id.h":"72ae3b770168afb26ff9e373d34a8a6df3ae852ebc6682bdc2b5914fa40df538","third_party/breakpad/src/common/mac/macho_reader.cc":"388b1daa925a4ae2bd4acc7ee1cd5ac6ab45f3b602ea4730d246d91fa77bda14","third_party/breakpad/src/common/mac/macho_reader.h":"9d5f3f403f8de48b85652b10584f3272e6603afb6e2a999e91f7f4e3ec4bddcc","third_party/breakpad/src/common/mac/macho_reader_unittest.cc":"7a04753cec5042acceea3448b9117b76d37cb3a3188a898ba76a7140c8f7fa2e","third_party/breakpad/src/common/mac/macho_utilities.cc":"7174f69c04c56b43d669798b629c17136c1aacd9782b2fa04dfe9e0fd77aea14","third_party/breakpad/src/common/mac/macho_utilities.h":"143f6d9eb59e6aeac5f0bd84cbebd8699a3e0a93f8601702cff16fc5bf12ceb8","third_party/breakpad/src/common/mac/macho_walker.cc":"87561828e9e53c6f36c431769337e2ebcbc72ad6422a2ed9cab24276417c97cc","third_party/breakpad/src/common/mac/macho_walker.h":"50931fbd0fcc518f146c2e660c2cabc72acb646c4a5684014c8a5152547103d9","third_party/breakpad/src/common/mac/scoped_task_suspend-inl.h":"3e05a3854e76a35a62cc2a039a17af7fdaa9a95f561f101b3b5c587f9aded69b","third_party/breakpad/src/common/mac/string_utilities.cc":"bc23574036745ec3ca58fa49672374927b0c6425967a8c8646730db06c4826da","third_party/breakpad/src/common/mac/string_utilities.h":"3215abbd2bb2cafe9483b9dbd3a651803d0cb4b091a32474d207af5cdb1418c0","third_party/breakpad/src/common/mac/super_fat_arch.h":"c4c39fb2f8005e8c141c3a311f699a435d8794518ea6800d788d9d697b09449f","third_party/breakpad/src/common/mac/testing/GTMSenTestCase.h":"bf71712b0cb9ab89781514d09cc38ab0e8fd9d11d1a4935f282ad1ffe2561d07","third_party/breakpad/src/common/md5.cc":"0e7db8af3569ccd1964cda190d8f64203fbc2d47a481fac377236852563fd4c0","third_party/breakpad/src/common/md5.h":"e21dcf10e1cbab87c9d7a59e07e91b059d9b6f01ec0832534c26d5e9ed575b93","third_party/breakpad/src/common/memory_allocator.h":"c28a80ce121691a11774753dbd7f91f0bb9342d4960af2f70357493bc04c8173","third_party/breakpad/src/common/memory_allocator_unittest.cc":"f2bd7c411d5e86726345c94d8b455464109a68818ed1520eef23c0ce94127b69","third_party/breakpad/src/common/memory_range.h":"e0cc51e6edff3b165fb7e849707e49f2c3ae912c90a3757dea55cf5cd8e005ba","third_party/breakpad/src/common/memory_range_unittest.cc":"29f1e4fa30ef0e15fb8d6baa53695f242eea0cf5a428aeade59f50e22a2a37fe","third_party/breakpad/src/common/minidump_type_helper.h":"cded538c669e99029bb1ffe431c29ed089bfb922258b327d52e2472ab53a597c","third_party/breakpad/src/common/module.cc":"f909791a4e46f6fac1c7d4de5053fede457dfde039a5c32ac9352b16621a9a49","third_party/breakpad/src/common/module.h":"623766bec31eabdc09a5692befc91413ee4f67266c52fb17d1965eec71a964c6","third_party/breakpad/src/common/module_unittest.cc":"c4185d14fc4a20d61d14f6c7930580d3fe6a31dc1bbdb402221499e9fe699d0d","third_party/breakpad/src/common/path_helper.cc":"2771d703e5958deb2538bfd1242e8901e2b924d13ab6473ea069cd4f33b5c22a","third_party/breakpad/src/common/path_helper.h":"38a294b79a49d748bf9d9ca911bbca70974806b92fb883619bd069ba89942ed4","third_party/breakpad/src/common/scoped_ptr.h":"2f4122f64900678324377df8928f87ed59d51c5a55e0886055e3092921998dbe","third_party/breakpad/src/common/simple_string_dictionary.cc":"2cc4efa4a4880614a76663ceb4fa6f2b9df37adefe9ae2e66c0048ff09852e15","third_party/breakpad/src/common/simple_string_dictionary.h":"ed2b961fb861751de8702e0732008a34e9bf0dd200395872f2e29fdcd8cd0409","third_party/breakpad/src/common/simple_string_dictionary_unittest.cc":"630ef460f411530ccc4f19f25788343d1f9b7dcdb153b66d54bca1dada7032e2","third_party/breakpad/src/common/solaris/dump_symbols.cc":"7a90288f8a28b7d69d072082b02ffe5a8359ae9bccd8fff91f851e0d53051b15","third_party/breakpad/src/common/solaris/dump_symbols.h":"3c36e6abe71cc25dbf7912102277dd02091ad040527dc35a089e0f49a282ef79","third_party/breakpad/src/common/solaris/file_id.cc":"2c384df42a15486dba2faaa7609aa217df991b98da279529f8d962111dbe972c","third_party/breakpad/src/common/solaris/file_id.h":"e171237d3257d58164383629b2b223ba34464e89bc20c9e154fb069311799603","third_party/breakpad/src/common/solaris/guid_creator.cc":"13270f810d4869eba2cf097e5a13b3f09859dcd9823c4659aadd03d85d5dc0ba","third_party/breakpad/src/common/solaris/guid_creator.h":"8ad042988baedb07f0b8a5e8c2d03de85809667e1fb28436320632cc5a2e2936","third_party/breakpad/src/common/solaris/message_output.h":"f244d283ef434ba759446986871f56e730fcf9d27d0e11dce305ea8098947d96","third_party/breakpad/src/common/stabs_reader.cc":"2383ca0bab92f77ba46d9713f63221dbcbf96d07a67d58f11820042bbb681eb2","third_party/breakpad/src/common/stabs_reader.h":"b4822de3972a03686ff0d613df08a7f3153ebf2b27200458834ab1a1db857a82","third_party/breakpad/src/common/stabs_reader_unittest.cc":"492044e4ca06cd3b99a6779b488f1d58a4ad67e81ff2c6aef9e2299c8fdad317","third_party/breakpad/src/common/stabs_to_module.cc":"1c698d4ac3cfec3b4234566599babe9a8a700ac297bddbae73d52f84c1596378","third_party/breakpad/src/common/stabs_to_module.h":"d69d8aff3eed29d3ee352fceb1051226cebd7b96330e584886cae5ceea434bfd","third_party/breakpad/src/common/stabs_to_module_unittest.cc":"653ef0715aa6797f9fa0c534491b716256c6bde2722ac43d45fb47ad19c0acce","third_party/breakpad/src/common/stdio_wrapper.h":"e926270d63a363573464777070a66f090f8b51586890b9275aa9f532b907d54f","third_party/breakpad/src/common/string_conversion.cc":"b7f87ebe7601ddc98c8ac75e3759578ef3679c44b106a6ffc17b5eff0debb3f6","third_party/breakpad/src/common/string_conversion.h":"72c84431ffdb6dd5ffa8d698fd57f79e44cb39886af14d1f520202dc3b690311","third_party/breakpad/src/common/symbol_data.h":"71802a7a8c2b98b9f1ca3c77aba56c3817650647996310bcce22c8cf8eb4b666","third_party/breakpad/src/common/test_assembler.cc":"897be51e19c4bc0fd45a7fc3408762e77b3c628668ad9193137bee38bbeca7ec","third_party/breakpad/src/common/test_assembler.h":"4e67330b2971076b7e5242c58dbeb687fbe040eebe803d8208fd9604fcb54ce5","third_party/breakpad/src/common/test_assembler_unittest.cc":"d36e44af0ba3b9954e96bd55b9948e97c1426cd1998fd3e78334f847ca340976","third_party/breakpad/src/common/testdata/func-line-pairing.h":"416057383eba057eeaf7d4b72c3c83dda013ab1fb75620b999cc7eeeb89018b0","third_party/breakpad/src/common/tests/auto_tempdir.h":"c5ade8d8ef61956a378bb4668bb83a57d5a0ae80cb46a60fd0bb7f850d0f9949","third_party/breakpad/src/common/tests/file_utils.cc":"0c9a4eae8bfbe3af38917e34bc33d921fcc67667d5f9bda4a335ffb3c1408b08","third_party/breakpad/src/common/tests/file_utils.h":"7c89e0227e695af2d4e579e0a2e08ca27ae2da6fc4b749d3c7064d6963bb971e","third_party/breakpad/src/common/unordered.h":"ce8180ccc583dd73430ed178ae61035b33b014d23e58f238e2773ed225006c8b","third_party/breakpad/src/common/using_std_string.h":"170064c76403e55d6773f686b8a6eeb5cecde452b786a5334f7285865c6db554","third_party/breakpad/src/common/windows/dia_util.cc":"f35b567f0a62bf3b812a60ccddcc17b28426c6defd8b961f2bc170d855300ccf","third_party/breakpad/src/common/windows/dia_util.h":"4e7641795f3cab4ad518ea07758a0e2cc11fa7488966ed62ca2e17d034aab65b","third_party/breakpad/src/common/windows/guid_string.cc":"c4f1063cacce0cc70296121845c0e7adc00c8ab066852c271bc4d17233327311","third_party/breakpad/src/common/windows/guid_string.h":"4e722631ecc7d45996f82ceb0255e5a29dc46ae07ffcb57b9943c54e77d5acdc","third_party/breakpad/src/common/windows/http_upload.cc":"f731a348fa2a2794d63b2c0ad58b61feb192cafb30c66028618a49cfdc19d6c4","third_party/breakpad/src/common/windows/http_upload.h":"b204466163f3700a1777cfe282acea9197921f5ebb85354dfc82a0d2067f6fd4","third_party/breakpad/src/common/windows/omap.cc":"0859be652f6be788be4ded7d80cf1d70a3d52243b448a24e2ad8ae59afb90b2b","third_party/breakpad/src/common/windows/omap.h":"1b444519ed9965d7a05e1242c817048f524c04e86492d054a72cf9621db36ee0","third_party/breakpad/src/common/windows/omap_internal.h":"2e28ad4bc37db4f9ee50036888371920255e0d6feea837b03619b5e9de5d847a","third_party/breakpad/src/common/windows/omap_unittest.cc":"b989a27beee82e84f72cb2c23f1e9d0be2c39dcc8907379f6c0d6c35fca54b0a","third_party/breakpad/src/common/windows/pdb_source_line_writer.cc":"f74a04d99658d6ee22901ea106ffc35fa67e806ce03ad817199f95c3fb883dab","third_party/breakpad/src/common/windows/pdb_source_line_writer.h":"dc0dfee57f6c35216a4c7da4668ba985fe2fd9abff8c5c5282153ad43a91b7e0","third_party/breakpad/src/common/windows/string_utils-inl.h":"54b6a18181a916dada2efe5aa768095646484239aff70075bb98a24287fbba42","third_party/breakpad/src/common/windows/string_utils.cc":"528cb554f8f9e68a57215acef793e5018a113344157147991cca31c1d6e637d2","third_party/breakpad/src/google_breakpad/common/breakpad_types.h":"411a65854a8dd1a0960ff0e3a7d47b5fa41bbcf5bbe874cf728d14bbf466be89","third_party/breakpad/src/google_breakpad/common/minidump_cpu_amd64.h":"3abebfcf069496fd2701e30da57b5059c4addb9959c6b594f8f520cee1584f11","third_party/breakpad/src/google_breakpad/common/minidump_cpu_arm.h":"35f855b237c728a83688fe7d5b4efb05481de815be867d005a4555fcf9c4606e","third_party/breakpad/src/google_breakpad/common/minidump_cpu_arm64.h":"20d9c1a007812291624fe009590530c581b713655a0080665ad06d736eded1c6","third_party/breakpad/src/google_breakpad/common/minidump_cpu_mips.h":"606a26e5b1734a9d0a8ed9bbf2c5f339d82d4e1a08fdade79aa6a3d0901fe15e","third_party/breakpad/src/google_breakpad/common/minidump_cpu_ppc.h":"d1fed2bb8a55f4bd0494013626d05134c66d4762c7201965996a63a921b48d29","third_party/breakpad/src/google_breakpad/common/minidump_cpu_ppc64.h":"c163eb6fc31de69e2725e03fa9c7f3036b7910e40430570a4468d5bdc7a8337a","third_party/breakpad/src/google_breakpad/common/minidump_cpu_sparc.h":"979882ea6360ae3eaa170ddc54d480b0af7f4d54dc2d1388e2dfef1899c5667f","third_party/breakpad/src/google_breakpad/common/minidump_cpu_x86.h":"8edcde736918f7c46bfb8335c2c0ca58e25cbfa8caacb030b92b1f21fc12bb04","third_party/breakpad/src/google_breakpad/common/minidump_exception_linux.h":"7142fb4198f2d0398ddf5296c6c5a1c1d963c9a6e45e156ea67f947c34d636de","third_party/breakpad/src/google_breakpad/common/minidump_exception_mac.h":"757dbb76aeae68a4ec4b1e2c43efcf285322e00f6ae2ea589f10812ac13f43b9","third_party/breakpad/src/google_breakpad/common/minidump_exception_ps3.h":"ed68cf2b61a0d69c2515fd47d43aa0179993aaf90dcfce8dfe0b745b7155bb9a","third_party/breakpad/src/google_breakpad/common/minidump_exception_solaris.h":"97318a36356f71d01301e71e5b34211cba7a16255306a2030fa0afedde9dee38","third_party/breakpad/src/google_breakpad/common/minidump_exception_win32.h":"85e7e33f6cb5d8de4487368c005d4f4d5e3641cebe261773a7cc1fbaa5c4269f","third_party/breakpad/src/google_breakpad/common/minidump_format.h":"1a265d4acb0707dd1f8f6170e31821fe234e26bfd0395fe93a22c682bdad166a","third_party/breakpad/src/google_breakpad/common/minidump_size.h":"d1aaebacf891ed812139c60bad73733f939be073a0256d01f8255d5785cd9fa8","third_party/breakpad/src/google_breakpad/processor/basic_source_line_resolver.h":"b9f5c164746d69c75ba776f8f7c2551fb0ef7740ee1b63a8ef9e043917825a75","third_party/breakpad/src/google_breakpad/processor/call_stack.h":"ddd0e689ecdaaa750bcb7eb71331fe4e124e1e64f5d2c8de8d0472a887c6340b","third_party/breakpad/src/google_breakpad/processor/code_module.h":"c575ab8e3f6ce3a6f207c1457f5753d6cd45c516fc0cf790e16852831a871168","third_party/breakpad/src/google_breakpad/processor/code_modules.h":"4fbe5422f36dfefb759ccf30cfc5ce46f0476761baeb1822b9f9f906d6e93728","third_party/breakpad/src/google_breakpad/processor/dump_context.h":"69934fd511c7f5f4ce1a541494a96d74d2953bc5c8e8d80047944b3ca3b49ea6","third_party/breakpad/src/google_breakpad/processor/dump_object.h":"6a8d9b43cd7e9526a603b44650b61f291146f175019c176b7ac058e5374297b7","third_party/breakpad/src/google_breakpad/processor/exploitability.h":"9d385ae4a0c1d77db9e2f7d4cdb768abcb66eb70f33320e1247fba8695dbbe29","third_party/breakpad/src/google_breakpad/processor/fast_source_line_resolver.h":"a7ad90bc403094a37605da21c3e86b317daf5790f66cd8f6a2889322264eb982","third_party/breakpad/src/google_breakpad/processor/memory_region.h":"27014402fee60106284894e4afddf1975e1a403270cc280d41b42e48435af867","third_party/breakpad/src/google_breakpad/processor/microdump.h":"1406af8bfa23c9873569d9dec30d3524db3bbddda60af7e8a34bbe98e8d33c2b","third_party/breakpad/src/google_breakpad/processor/microdump_processor.h":"79ffb244493d160e04b4feaadfb95aaee051e52c739f8daf682d8e17d26b71f6","third_party/breakpad/src/google_breakpad/processor/minidump.h":"0af039e4162d2044b7f1589f4a383412126dfa0e367f9b5d2902525777e9049a","third_party/breakpad/src/google_breakpad/processor/minidump_processor.h":"0a406cefc29b5dd20a195cad3dfced5bf3ff1fe588ab089547f8484f6df151e2","third_party/breakpad/src/google_breakpad/processor/proc_maps_linux.h":"6dd41a3cb695a32d29be459baa0dd7501fe80cc5e795c1491526020e3cf66660","third_party/breakpad/src/google_breakpad/processor/process_result.h":"23e412e78937b3531ad5f87823c492f7f8a7b9746c2255fa136b1468743efb8f","third_party/breakpad/src/google_breakpad/processor/process_state.h":"980ed6cded2d2195d5e19891a397d35469e4303efed688225fe5ec8e56a7c348","third_party/breakpad/src/google_breakpad/processor/source_line_resolver_base.h":"44cf66e782b70503042315836b28c9ffa554c4e0d554650f6424ada709518ff3","third_party/breakpad/src/google_breakpad/processor/source_line_resolver_interface.h":"130ac4f72dca12f757d4e8540f07cb186a26be5995639f82bd5fe125ebc5b655","third_party/breakpad/src/google_breakpad/processor/stack_frame.h":"b978e84d242761ba2ccf92ecd1fc5dc63b4b656f42a9268c35220c085d63846e","third_party/breakpad/src/google_breakpad/processor/stack_frame_cpu.h":"e7c50fc9ff297954c4d190177e0f3a6d29598860195c262348bf9f4aade27cdf","third_party/breakpad/src/google_breakpad/processor/stack_frame_symbolizer.h":"c8775eaa032273afcc2aa7d689c7464000451035486c5cc84e7a602a96c4ad17","third_party/breakpad/src/google_breakpad/processor/stackwalker.h":"1a78e2dd05fb9ec20e10bd8697a8282834ba0a9be53cd8bfd758104b5402c875","third_party/breakpad/src/google_breakpad/processor/symbol_supplier.h":"243934de65c31cd0ba6649e7d95e408d50e5f6b58b5bfea1e8cec0d64b1b5b0b","third_party/breakpad/src/google_breakpad/processor/system_info.h":"679949dd81147a27efb09a0eeceb815b8399eb1b0ad29e003d22d73adefa4427","third_party/breakpad/src/processor/address_map-inl.h":"d67668c70ec29830d745eecab91e9871f4d8e700f3d9201feb39885700c12f14","third_party/breakpad/src/processor/address_map.h":"100433241cec65b422f87f74ba962b63c5cc68c1753d7abe1f0c755e5e77ccc0","third_party/breakpad/src/processor/address_map_unittest.cc":"4045b250e2dfafc2683a9c90cee8bcc57598c0e320b66efaaf0addcfef272f52","third_party/breakpad/src/processor/basic_code_module.h":"169e80c372644299969b2d6cfafdcbb1dfb8385c19a440b45d89d6bae87efc4a","third_party/breakpad/src/processor/basic_code_modules.cc":"f6460d158380ae8d8a9e114a19f5c6de7895c3404b12954c4652ba87e0695d3d","third_party/breakpad/src/processor/basic_code_modules.h":"33a33d5aa253603bd00b0303602b521f997d1723f6a208ce766b2aeb1d7cfd11","third_party/breakpad/src/processor/basic_source_line_resolver.cc":"7d445206a575190ca1c212657723d793794b73c1422b64c0aa49ac1f682f885a","third_party/breakpad/src/processor/basic_source_line_resolver_types.h":"8071893cfaefb951b675040f0bcc391e98c6b1f66ba490a2f0b22edc67264cd6","third_party/breakpad/src/processor/basic_source_line_resolver_unittest.cc":"5f0cf93838ae797c9284e304cb7eb6faa4db68923c15535e272abffda3c1075c","third_party/breakpad/src/processor/call_stack.cc":"a6c948b3ceb935320d5dedf0d24f3866e82bc856e0960b98765c20150a7f80b5","third_party/breakpad/src/processor/cfi_frame_info-inl.h":"edebc6236632ece039855b8f5d344fed3ed6ab4dbafb40f1922573ede4a5c425","third_party/breakpad/src/processor/cfi_frame_info.cc":"709cca5575e09f75dd2d9286352bb5c0248c37a2203d2525ecf27ad9f214ebc4","third_party/breakpad/src/processor/cfi_frame_info.h":"733a5d721d8c9e8f64cd9414ef941d74116e3a52c0c13ee260d88d862a10c97f","third_party/breakpad/src/processor/cfi_frame_info_unittest.cc":"baadff7ac3c82ae8a28277ddf98a66916cbb5e0201f89fae940e6262c924574c","third_party/breakpad/src/processor/contained_range_map-inl.h":"213593c4954c6dfa5cfdd831fc895d0af9ed481ddf8a5041603702ce5c54d63e","third_party/breakpad/src/processor/contained_range_map.h":"dac70ebd32521f749d9f659d13e38bbb8c808a2da44b3b956c89af7f337e088b","third_party/breakpad/src/processor/contained_range_map_unittest.cc":"326f9d0a55738c1bdebdfdcf1481e919b4fbed78eb3daeaf55492d20fd00a885","third_party/breakpad/src/processor/convert_old_arm64_context.cc":"a4793abb3e66f62d7d2e27ace011ed7899412cc4cb03f392fdd9d124936ed5b9","third_party/breakpad/src/processor/convert_old_arm64_context.h":"b1d9c55d3be50e1a7f7199a996d586a91e766020970d055cac9231e87e10ad9e","third_party/breakpad/src/processor/disassembler_x86.cc":"4b69f3b4d271bd24431b92ccb58a41e0e18cff851e8bb52607d30f000a63dc2b","third_party/breakpad/src/processor/disassembler_x86.h":"4bf07fac246da0a75330cd2738037570d608be62559c1d4ebfd1db1f4a539125","third_party/breakpad/src/processor/disassembler_x86_unittest.cc":"c2aea2c8a9b147cf7da8e89f3dde255e4abfa29bd8014283d12a30cfb4b6aa76","third_party/breakpad/src/processor/dump_context.cc":"969a866e11bacfe1c5a0df13c013005db238e16e731452c7ed59e2d1e1eabc65","third_party/breakpad/src/processor/dump_object.cc":"a60961e3ab6fd931e488ba9e8582ea5b6e938bf8a7c55ab6dd4a07d9d190f675","third_party/breakpad/src/processor/exploitability.cc":"4bca300a781200056d99358bfeeee944e3b8ccdb098462615495458dbc62d98d","third_party/breakpad/src/processor/exploitability_linux.cc":"ae461af0070477c5634781655c3c65beeb3e2d7d25ef8346553b8ada0da62153","third_party/breakpad/src/processor/exploitability_linux.h":"7f5d3f88441ddfc54a19bbd179fb43b55f9d550b51f1499c92bacb7b6ae2d0f3","third_party/breakpad/src/processor/exploitability_unittest.cc":"2a2a2d76a55204879bd7f9d521cbdaf0a49c15a34bbd1fb4fa5d604be804645a","third_party/breakpad/src/processor/exploitability_win.cc":"bcd4f2603a4aacabbd4ab33aed564ff910262f0da82b61f910001efba9a5ba6b","third_party/breakpad/src/processor/exploitability_win.h":"60db51c8eba57fb9346fe1c7e4a16332d87da429613b3a75b0ca717f998d50d6","third_party/breakpad/src/processor/fast_source_line_resolver.cc":"4d5f84b5b2cd403f2e25ff1a18a80eccde1e40cd800cb7a8cc7f016e82a3c915","third_party/breakpad/src/processor/fast_source_line_resolver_types.h":"b61aa023246159c8cf101745aafaaf341b7f8e135dbf0e8030ed7fd4d4dcf789","third_party/breakpad/src/processor/fast_source_line_resolver_unittest.cc":"5cf541d7344cc99668365eb93209d7a4081384ab65216a14b1a806598d66a2f4","third_party/breakpad/src/processor/linked_ptr.h":"e9d530b062b7b4c9a2b4be9112cd529d4584d6cc5b1e1a401f52d68e1c8609e4","third_party/breakpad/src/processor/logging.cc":"238195fa6ea32f4fe893675859bb2885bfb659749cd00f3784cf03772f9c7048","third_party/breakpad/src/processor/logging.h":"e9162fabf6e9abaec173b555e29482217937dddea1f1b6ca0a0e7656f9971347","third_party/breakpad/src/processor/map_serializers-inl.h":"f142c6863b879c39f4382898a2bcc87f8646ca9c66031a7577c11a4b0154d37e","third_party/breakpad/src/processor/map_serializers.h":"868cf1f8de07d041d9e5706def346a5e7e6f9c2feee6fa71cd0b15972907b694","third_party/breakpad/src/processor/map_serializers_unittest.cc":"4ffe53312e99f3051c89a5151ac166f8a7f02883a8fc853254a33456c94c4464","third_party/breakpad/src/processor/microdump.cc":"b869d1308080a2bf2ea9d3e3abc262c6999f4a26221eb9a3fee8b24b2115ea1f","third_party/breakpad/src/processor/microdump_processor.cc":"5571dc8e6a09c71be17bc220d31caf6bfd1a23afc46eac7d865362cda91cbe7d","third_party/breakpad/src/processor/microdump_processor_unittest.cc":"15cc21c48855de2726d315df40a02f9e5269f0eba26efeb67d2efc435a627705","third_party/breakpad/src/processor/microdump_stackwalk.cc":"1f13fd53e465c837a97b3a7ea8dc47ee0098a66570855130f258d14318421051","third_party/breakpad/src/processor/minidump.cc":"e6d0400ca466a26de6a86ce0ea87993f05cad4605be9cd148941d38409e35228","third_party/breakpad/src/processor/minidump_dump.cc":"4fb7898db476ed7eba85587fd06b6c526eaba67976ec6ab509e2392ce44a82a0","third_party/breakpad/src/processor/minidump_processor.cc":"e2dcf4f6611f57cef2127f5f42c618db9a83d78c91bf9c525f11be7cb001c25c","third_party/breakpad/src/processor/minidump_processor_unittest.cc":"783412c2053b08e73eff929a6a855c83853e8951605c61ce6f27c63681761ff1","third_party/breakpad/src/processor/minidump_stackwalk.cc":"d1dbf68ecfb77e3373699698ec5cea737bd6e5247a7b046d9523d551c8635b2c","third_party/breakpad/src/processor/minidump_unittest.cc":"db9270801bca919d1dc34bb12cf77e61d403d986fc51b33053f12eb50031230c","third_party/breakpad/src/processor/module_comparer.cc":"cf511264fed5bc9eb6f1f284bd7aa5370727abb61dc5ceeaee533be45993f8d6","third_party/breakpad/src/processor/module_comparer.h":"2c2b0927d7a684a1c74d2518bcf7d168b27389d3af72fdcdd6f9e13ffb5c3b54","third_party/breakpad/src/processor/module_factory.h":"b24f11d2259663c5f5219a187df04c19cfcd530ef854a84f3fa5ad9e15bfe990","third_party/breakpad/src/processor/module_serializer.cc":"6d7a14755e5684155935ef90c27fa9d7ca8548430150867f5d78e9ab02e65183","third_party/breakpad/src/processor/module_serializer.h":"518b35664eea8be959141b94837d264c3e8dc86e2e2ffa27b87d0b5d49455ca2","third_party/breakpad/src/processor/pathname_stripper.cc":"6a26adfbca6f57d7da0e6100be46d80cf0d808da30ce371b5de8e3ad5c9d8cd0","third_party/breakpad/src/processor/pathname_stripper.h":"d2613fcfeca4c886af95edaba507c607cf4ce833e56ace3ed133a77f2440fc39","third_party/breakpad/src/processor/pathname_stripper_unittest.cc":"bb9fff7e76b44ce5ef86ac0915e00913025dddf9515af9f5b124727eea56782f","third_party/breakpad/src/processor/postfix_evaluator-inl.h":"2f8b59d94b53e3c5d17449b1cda6b03cd21217d54233b69afda8df568c049cb5","third_party/breakpad/src/processor/postfix_evaluator.h":"2fd25aa44717f5d7439cba9b2ced6fea567bc1014e93db0781fcbbd61286af6b","third_party/breakpad/src/processor/postfix_evaluator_unittest.cc":"2878f882a47eb9538aa291e9a6da1a78d4f2e27099bb4b422522d9767362aee5","third_party/breakpad/src/processor/proc_maps_linux.cc":"06b8da6a0926fe30aa098192eb45906c1f1f524d3280da993eef0d6138dd543a","third_party/breakpad/src/processor/proc_maps_linux_unittest.cc":"30d01141d77c31cc1fff4792c9a40220ef9bdb23fea49dfd56adcc11dd9d788b","third_party/breakpad/src/processor/process_state.cc":"91af4041b4a3d53530ba0391312bc8b2a6317b9dde5ff01309e4e2d064375c04","third_party/breakpad/src/processor/range_map-inl.h":"eea5100ee17087befad936ab08f886b907d01497b6d421f61a79cac80aebd3de","third_party/breakpad/src/processor/range_map.h":"e69dc24536c676c874f6702048ba2af3e09a4979c640b99dafccc8760c74ae59","third_party/breakpad/src/processor/range_map_shrink_down_unittest.cc":"9fdcf5a8909fd371f0fd3a07a00ff5f76c481e52814dc8748fb10b08d1c00e88","third_party/breakpad/src/processor/range_map_unittest.cc":"578a46f7c36d94c2d9729ee65c9c81be45b9cf5e71196869f399f74a44e609a6","third_party/breakpad/src/processor/simple_serializer-inl.h":"eceb7beb11b2e0fa345b7cc24c8665fe7dff154a90d88ffb65ed0b4ba4e1f39b","third_party/breakpad/src/processor/simple_serializer.h":"c63535e4af57b5a1471cd7d3d190c612040582b222c8285ad855847d3121c5ad","third_party/breakpad/src/processor/simple_symbol_supplier.cc":"a257df5a334977231f4c36651e7ff1439a4f38bc004fe2b767f0b50a4e683079","third_party/breakpad/src/processor/simple_symbol_supplier.h":"2a1160a76fae1633a197f7bfdaf4357aae6b04f58b0df2cde2f937072f257c36","third_party/breakpad/src/processor/source_line_resolver_base.cc":"1331c26518c288890a9817e7fdc639180630455bb56e89ae16081993ad8f3373","third_party/breakpad/src/processor/source_line_resolver_base_types.h":"c0caf72dd30513bc43cea48a27c388c7565d202787929775ec6bbfff60da153e","third_party/breakpad/src/processor/stack_frame_cpu.cc":"d0db1b9ddf2c695c716358e8710dc1b33a3a6f6e2bb9113b01e5d617a4d54a56","third_party/breakpad/src/processor/stack_frame_symbolizer.cc":"217215cd397b2c915a6adf9b7ac43734d1c2bb3ff1604f914c518813b6e543e4","third_party/breakpad/src/processor/stackwalk_common.cc":"92d57c17dfa7f580f92843890ffef72ac22283c696be07a6c6d90ca94ba4975a","third_party/breakpad/src/processor/stackwalk_common.h":"02b38a0a31c3b1f76e159c2ae2b86af78f2e223c9547726a84d49ef3a926a4b1","third_party/breakpad/src/processor/stackwalker.cc":"4acc0394b9043bfb223a26b3481cebcabcc356c61e764c0f041a3872460b40fe","third_party/breakpad/src/processor/stackwalker_address_list.cc":"d2d47a3b673503c5bd594e6ce56c49e78d50f198bc5fa765c76355c871475e3e","third_party/breakpad/src/processor/stackwalker_address_list.h":"9f2fa8ffce2f4dccb243d660c57ce790f9dfae6429edcd2052cec488acd8d44a","third_party/breakpad/src/processor/stackwalker_address_list_unittest.cc":"f4d214f211ae1fd043ef3498234c396ae128426b6839d3eeb20abf7d71d77957","third_party/breakpad/src/processor/stackwalker_amd64.cc":"a643426bc8db763c1c8ce783f8578739649ab34f196ae88e96b83624a7bc14da","third_party/breakpad/src/processor/stackwalker_amd64.h":"f910f08495259aed2b59490e2424ce0d90af7e228eaab82aaac53f947a499171","third_party/breakpad/src/processor/stackwalker_amd64_unittest.cc":"b55000a674ff8ff1a50c5f599da2a65ea875409ba20db1b0871e47fbf4c94a39","third_party/breakpad/src/processor/stackwalker_arm.cc":"f9324e7738bd0258ca58eeaa291e64343a6f3d7d93b3f1c5c888b2f100acb407","third_party/breakpad/src/processor/stackwalker_arm.h":"8ebf274567c0dfaef2ba834e0ce1af4b2486770206472baecde167bc3be48e1e","third_party/breakpad/src/processor/stackwalker_arm64.cc":"a6063de5da88d6a3f64faecf86ff3b82ba46dfbdf6ae18e563d549b45afc9e31","third_party/breakpad/src/processor/stackwalker_arm64.h":"5a87cfaafaecfd2b4fc87011554cdc7c5191e66ea3d30e0711a228e8e01d15a8","third_party/breakpad/src/processor/stackwalker_arm64_unittest.cc":"35a4f0d071a7527c5bbd6009ddbdbfb8dc75b2dc7a0e210697ffe55be011d824","third_party/breakpad/src/processor/stackwalker_arm_unittest.cc":"41df35f308dff99ac17481f42321047b2edc6f00c60ac54b6ff60aa3a62f1346","third_party/breakpad/src/processor/stackwalker_mips.cc":"84ef0b1d97221453945a6fca19d14678358a5585e10c7548f456816e26b06570","third_party/breakpad/src/processor/stackwalker_mips.h":"524f9b754bede75dde1754c7887ff9d12a786b3481eddd8aa878287ee844d836","third_party/breakpad/src/processor/stackwalker_mips64_unittest.cc":"8ccdb89f9971e6e10c3320293cf1b8af4e6d46a7c24661bc6c13a3360ae3f865","third_party/breakpad/src/processor/stackwalker_mips_unittest.cc":"452c2c82a163766922b26683d58aed8baf63e8b5753652e13e02ead31ffb4613","third_party/breakpad/src/processor/stackwalker_ppc.cc":"fc7feb68f7f6902d3e4fa3f1a39a247decf370d25fdb6ec04decb9f047f58a48","third_party/breakpad/src/processor/stackwalker_ppc.h":"f2a493111ec9a06eeb9860f85ac22d194030b42b926d1c7b80a80da993232966","third_party/breakpad/src/processor/stackwalker_ppc64.cc":"953591320fbb038097723ce88799cf241f441249f7f23618c98f4841ed1fc7c3","third_party/breakpad/src/processor/stackwalker_ppc64.h":"17fa46e53a36aadebbbbee107f92f74acfc764e0ef1501b3a02ae29a34c0525e","third_party/breakpad/src/processor/stackwalker_selftest.cc":"5c7d83255a7a6018beefd198a336f4ca2bb05c0f0d64b6657801e225b40f9d58","third_party/breakpad/src/processor/stackwalker_sparc.cc":"03e9da7505f9d3880184af9d7d8bee3079529b40f8463e5237ae82245d644a00","third_party/breakpad/src/processor/stackwalker_sparc.h":"911a95de682b6148bdaa67d007cb736a8306754ffbf8b691af04d13b055fff3f","third_party/breakpad/src/processor/stackwalker_unittest_utils.h":"fd9665c264f0933827b0c1dc3f227dec68074ec9668ee3a5c52823802e52b005","third_party/breakpad/src/processor/stackwalker_x86.cc":"78c38fcc426abf1398ffe02492637db31a7c55ce0c9477478947c53582f5fbca","third_party/breakpad/src/processor/stackwalker_x86.h":"7f8714421e6d4862dbda3f05b17006efec9b486e4a0212cdfddf8d7819733eaa","third_party/breakpad/src/processor/stackwalker_x86_unittest.cc":"2541999d7bbc2289f94ec5ae96080bbdd2f2610cf644c698dbfb105807c447ed","third_party/breakpad/src/processor/static_address_map-inl.h":"6489eb883708e6835b0ef455ec02028a41f2bbfc4656f3324540a71836d0415c","third_party/breakpad/src/processor/static_address_map.h":"0dbb8117d1ecc62b57df53ef2fccefdeedb07d4028d9be750cd6485f41e71e8c","third_party/breakpad/src/processor/static_address_map_unittest.cc":"e3f727a6b43b85d9991c2cd66bf282020e42254537552fe88f884559044190e6","third_party/breakpad/src/processor/static_contained_range_map-inl.h":"d37ed066ce3c0dfccdd7205da5637c2fa4ae0bd775e48e26420fedbe853ac316","third_party/breakpad/src/processor/static_contained_range_map.h":"1bdc6f4b8797aa43f8848ab90caad4c7b43e71db5bd2121ed90351867c1db046","third_party/breakpad/src/processor/static_contained_range_map_unittest.cc":"eddda66993953fa6d1a5fd71e7842f39735d905ea3e169f156cf3199f76c8aa7","third_party/breakpad/src/processor/static_map-inl.h":"1930aff817f289e29a1a5bb7127758b5f6283978c3d8cb2094d8268b1273e0a9","third_party/breakpad/src/processor/static_map.h":"2791c92666d1a3baab7c0837c2fd2e8ef83251c51db12f8f0daf0fc117e948df","third_party/breakpad/src/processor/static_map_iterator-inl.h":"50e50f630e1536ef0803b918c86bfb795a04386064cabecf8713cae481115c96","third_party/breakpad/src/processor/static_map_iterator.h":"497517953cf625e9ad92011b294880968825532fec0611ca979ae11031f7b9cb","third_party/breakpad/src/processor/static_map_unittest.cc":"6a45e4e15a676e92e32d71fcb364559007fac070746b5643877ad878a1c3bccf","third_party/breakpad/src/processor/static_range_map-inl.h":"28a79f99d284563fdd470ac87e787d6da6fb4bf986ff8514d7087f02a14c9451","third_party/breakpad/src/processor/static_range_map.h":"914b1093ab22dd32b03075e54ccca4d20e67b6df4cdd62107ccf099c1769c7aa","third_party/breakpad/src/processor/static_range_map_unittest.cc":"14a825482f85197b6f02b87d61ef6d36b1393e9a120e7db4e138958c9aa35e62","third_party/breakpad/src/processor/symbolic_constants_win.cc":"393083424e56b978ceadd1fd8e0b850a7c242be7cede3577d634e741d713d225","third_party/breakpad/src/processor/symbolic_constants_win.h":"fbb8d530efe1401fb03060c9da0993f2a6e2ade36526d4a1be02a216ac94eb38","third_party/breakpad/src/processor/synth_minidump.cc":"c3b6f4f850805c236e32770c6b57774cfed4def4f30a289a5bd45d5f48bddb57","third_party/breakpad/src/processor/synth_minidump.h":"5c9a5c1c09a8fb97b0ca7734137a4160bf914c3d090741df4c214ed5c184a6fa","third_party/breakpad/src/processor/synth_minidump_unittest.cc":"d3b577c7769c7742ae55293394fa286cacdb0e8930d6b79b54c18091e824d8df","third_party/breakpad/src/processor/synth_minidump_unittest_data.h":"c6393d736331d20322de11a4f7cf726279b033000202a71b7ab398e8dc1011cf","third_party/breakpad/src/processor/testdata/linux_test_app.cc":"ec7ab9151b3ffb451c818cc747937ef3de8efe0c887250f77e1e72eebf3ac22d","third_party/breakpad/src/processor/testdata/test_app.cc":"9dc4626fe4223101a9f5adf57fb55a69f8dd5fbbeebeb14e04590bbb8d35eba9","third_party/breakpad/src/processor/tokenize.cc":"4affa2dffa73cf3d666a0e798f3383dd4b6a8608f19a8450fe77d4771eab9d9a","third_party/breakpad/src/processor/tokenize.h":"fffbe8d02526788f0a6a65baf05e7cf2c8c822a58d0228bfbde82ca7f60e863d","third_party/breakpad/src/processor/windows_frame_info.h":"20e3878a323c3ea97060e2d75e0611945e8c6897c3654c53c841a13c9580e04e","third_party/breakpad/src/third_party/curl/curl.h":"53a106ebc1dfcad15f35a3649659e7efeb6197a28240e0575f69b1d400425072","third_party/breakpad/src/third_party/curl/curlbuild.h":"c16db33438ce8838b72ea4b13953dcab0f826f6dbceaaf303f7f37c91b841d25","third_party/breakpad/src/third_party/curl/curlrules.h":"7ac29c3e959ecff7e236e9fd7703c18eb8702b2086c49de81fba91487409aa93","third_party/breakpad/src/third_party/curl/curlver.h":"57f03235adfc526a2b9c9b46031fd46f6e0b9c684515e6c9abfd472a76ebaee8","third_party/breakpad/src/third_party/curl/easy.h":"765cf290fc168d65be0baae6c380a30516eeed94014e804de1b1b6e3884ffc9a","third_party/breakpad/src/third_party/curl/mprintf.h":"570f692f2967f1dfc8238fe94bb25b87b3d2af8951bcc8a7ddbaf2105295fb09","third_party/breakpad/src/third_party/curl/multi.h":"7211dc714191c562254b8eaf4a6d0ab0221ced9024b6adc62eb43a9ba88f9e97","third_party/breakpad/src/third_party/curl/stdcheaders.h":"65e24cce8e2b01d64adcf92987c591ca475a4a2e5e8aa7da3a1abf7adc83c587","third_party/breakpad/src/third_party/curl/typecheck-gcc.h":"146e37a1f4bb7c88e58d7854226a3b76465efe6b36a4da535958618a25aaa22e","third_party/breakpad/src/third_party/curl/types.h":"b5f437d012505d55e4bd08c6570952d86e79b43def7f9ede8989ce5de652cac7","third_party/breakpad/src/third_party/libdisasm/ia32_implicit.c":"b2dec053fa59fe5e639025145b2e2612fc0139671decf2f0b22e96af5d601847","third_party/breakpad/src/third_party/libdisasm/ia32_implicit.h":"3894d8d338d3557745a8bcf0b776b2b0b387518014ad7457d87d3a36a7076e33","third_party/breakpad/src/third_party/libdisasm/ia32_insn.c":"567ee4c1b3fabd3b72da2611a8195ca76e560d6708c6cbae56a0b9f34650e217","third_party/breakpad/src/third_party/libdisasm/ia32_insn.h":"775fda0a6ba4c26710912ce583e76182ea059e4d0034ad931951382392434c63","third_party/breakpad/src/third_party/libdisasm/ia32_invariant.c":"fcfb7701cf56e1b7b20b703fa6d4ab554c40b1f4d7cbee4778bb7381351b80b7","third_party/breakpad/src/third_party/libdisasm/ia32_invariant.h":"937fe7cae76d15144d2af011a31ba146999959a681f1133d93eadec331e8bdf0","third_party/breakpad/src/third_party/libdisasm/ia32_modrm.c":"f84df147f41d16554a46e827619d9ed5540362377da7defe18c0e060f6474f36","third_party/breakpad/src/third_party/libdisasm/ia32_modrm.h":"42b3cd60b1657c076fbb85793d9bd6e6df71f45486970c76aff7def7c045219c","third_party/breakpad/src/third_party/libdisasm/ia32_opcode_tables.c":"a3d45b4a832a020c66713ede2b0c2d48afe03ed7117f87aad1637b2999c71028","third_party/breakpad/src/third_party/libdisasm/ia32_opcode_tables.h":"d0fb4ec036af15737916cca35df066dbfcba26e9e390323d930b788d75cacf4e","third_party/breakpad/src/third_party/libdisasm/ia32_operand.c":"a18c7391f4588de392c24f681ade59c00678fae3f62e33228243b9eea839fb24","third_party/breakpad/src/third_party/libdisasm/ia32_operand.h":"2e420bc3feead1935403973f1dbc340962025f6648eb109c6c57fe87300b8b43","third_party/breakpad/src/third_party/libdisasm/ia32_reg.c":"1ce2bff71d4568e1e97e0aeca27f474d8d6de4450423c2901fd4223fb6ed833c","third_party/breakpad/src/third_party/libdisasm/ia32_reg.h":"0752959efd00ef9068c56a5ddf15bffd0d03b93ff78b2c61325df38722f6a561","third_party/breakpad/src/third_party/libdisasm/ia32_settings.c":"979ce9bf7e7cd68c16d8cc3277794193e0111683a7af85e5fe50944eae605e18","third_party/breakpad/src/third_party/libdisasm/ia32_settings.h":"e47d81835ac2df4cd0c26f6e8cbd7bdfb3c5442f372c9650aa3d369c7b8b8622","third_party/breakpad/src/third_party/libdisasm/libdis.h":"2e56c95c7aff02285c9f087c72394780b395ead420f87cb74dd3bd4bce76af04","third_party/breakpad/src/third_party/libdisasm/qword.h":"42e7c70bc0da5f4fea0c4fcc825deadb9cabb18da9d8b76c96de7bdba27c5526","third_party/breakpad/src/third_party/libdisasm/x86_disasm.c":"df6561a4d5d938039ceb50d85c4226425e9b75ffa57c4a5b66bb29ba12c08a6a","third_party/breakpad/src/third_party/libdisasm/x86_format.c":"cd743ae41c3b06ed6db3780aa838433778ee2c44a78d55077253ba3a57fde7dc","third_party/breakpad/src/third_party/libdisasm/x86_imm.c":"8f87088130c9f03d5df4e98a13ce0054cc07b3084eeddc6636d2fe65b3c8b78c","third_party/breakpad/src/third_party/libdisasm/x86_imm.h":"9038d732536478bcc9228c8a90f36501103b9b93cc9c3b90425ec12c935fce63","third_party/breakpad/src/third_party/libdisasm/x86_insn.c":"918998dbd995d85a6a62ae4d7e5d6e5c924238ecd7ecce7384368e8eed50b207","third_party/breakpad/src/third_party/libdisasm/x86_misc.c":"b065daecd972303185c6efd71bb130d37dd318c1126c27560870594bd14abcd0","third_party/breakpad/src/third_party/libdisasm/x86_operand_list.c":"80023add8c2e98a897c252abf721d18ea1e0c2aba9b0fa7cbb915c106b65d413","third_party/breakpad/src/third_party/libdisasm/x86_operand_list.h":"27f505b949963e38fa1e401ac8e1037639df27d37dc12f46f15eae7f52cc5dc0","third_party/breakpad/src/third_party/linux/include/gflags/gflags_completions.h":"132240699e9c69a4a28d631917de4f630c7137db613479872a8f7da48686beee","third_party/breakpad/src/third_party/mac_headers/architecture/byte_order.h":"ee77544c1facd0553c8c292e07894b8603cd0bbfbf352971c1b6cce9a24596d5","third_party/breakpad/src/third_party/mac_headers/i386/_types.h":"3fc513abaeb935ee1eea600902b806e9ad7825e7200cef6493b2181dabad2f2a","third_party/breakpad/src/third_party/mac_headers/mach-o/arch.h":"45d2cb589fb714f2d6060593d3d9f6ca650c63e8581013f7377fd3a4de221490","third_party/breakpad/src/third_party/mac_headers/mach-o/fat.h":"c113bfb188e1309a138a90e4dd711339d84612742ded1dc52d9e137c8e942db5","third_party/breakpad/src/third_party/mac_headers/mach-o/loader.h":"c9093a78f58d15feac1b2ee362c3e13ea50d13640aff66e2025d62192f6f2816","third_party/breakpad/src/third_party/mac_headers/mach-o/nlist.h":"a8a71623bb861ad056c1696c9ac235420cb72747832902bde04bfc47b398d54f","third_party/breakpad/src/third_party/mac_headers/mach/boolean.h":"97bc5ca6793ed2b32f9da976760d5afe479b261cac635cea8fd9828c072edb31","third_party/breakpad/src/third_party/mac_headers/mach/i386/boolean.h":"e9b0ebe5e1c39fd911b7a1ba3f5c94822e1f754872957855077c90402ef6094f","third_party/breakpad/src/third_party/mac_headers/mach/i386/vm_param.h":"87c3ad0acbc46ba7bd317f7cccbb0905e2ba516503c275a209eee90b026650a3","third_party/breakpad/src/third_party/mac_headers/mach/i386/vm_types.h":"b18c0e719fd2b501204fb6073bdf33a77cc78aee6a26f32c6783d427a540a9c6","third_party/breakpad/src/third_party/mac_headers/mach/machine.h":"b24722e1455b1e664d4ab97ea8a930e62a3b7f5e63622b058383502e980c9952","third_party/breakpad/src/third_party/mac_headers/mach/machine/boolean.h":"d76306f15931d064cc05ed08c9648c1a143e40050f7ae8c847010a42edc3d9a6","third_party/breakpad/src/third_party/mac_headers/mach/machine/thread_state.h":"17a0167a74f30541307ae120c61b1355a4fc4a673c950756714e5211fa2991f6","third_party/breakpad/src/third_party/mac_headers/mach/machine/thread_status.h":"f31b2bf2d153c04ebade1c5cccde054c4db6d2376b201bf6e31fe301c477f5e8","third_party/breakpad/src/third_party/mac_headers/mach/machine/vm_types.h":"258b3a7306331854f194fca93b222e7d18ecfa4789e05ed8d87b534d3ea2fb05","third_party/breakpad/src/third_party/mac_headers/mach/thread_status.h":"1bb5236de4d3fdea185519f4ca3a812d033b5b3d9b7452d3dbf60d9a0810c182","third_party/breakpad/src/third_party/mac_headers/mach/vm_prot.h":"6277c315ebc5df7d169715c201ad99df17860198248858dc0ecc21b3e316b641","third_party/breakpad/src/third_party/musl/include/elf.h":"dc0da522cec7d0b1387af8921ee2c2236a63b13a60be5cb026dfedef3e5d75bc","third_party/breakpad/src/tools/linux/core2md/core2md.cc":"007563ad4b8b6335e4bae6be6c7a6941a6c74a4ba411ddcc78050baab94d9384","third_party/breakpad/src/tools/linux/dump_syms/dump_syms.cc":"28ee3d96f7e7a47f81caaa80c875bfee59e992216e16e769e5a0d07cc1035a4f","third_party/breakpad/src/tools/linux/md2core/minidump-2-core.cc":"04b0c840ced6b5ec653102d3073de754e04cdef40bf98d6413c837b7d4669f36","third_party/breakpad/src/tools/linux/md2core/minidump_memory_range.h":"f0450b28f24cef13ef02067d123b1af33dfc76f2ee16b5fc3f717d1090cdbd26","third_party/breakpad/src/tools/linux/md2core/minidump_memory_range_unittest.cc":"aa316cf39303a6e6c6c635f77ea6dee1717a916806829e8958c7bdf860614a64","third_party/breakpad/src/tools/linux/symupload/minidump_upload.cc":"6148eb6972971b02f179f03ae329422f11becfd6fbd7a35a2e946eb7449053c7","third_party/breakpad/src/tools/linux/symupload/sym_upload.cc":"ca573cff567cd417e3d95b195053c642bbdb8d166ca487f5330da9d465334cc0","third_party/breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h":"220ae2dc76448aa05702351d1c5e4d5f82b2c2d753ff78a4d84375a724286d09","third_party/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc":"7368cd99c8a5efa209ebd4a0f5aeea47d5e38af6fa6e5c5c0da4af16aeae1008","third_party/breakpad/src/tools/mac/dump_syms/macho_dump.cc":"30c28f16a2ace167bb0c29682840668565fe31d6ed3478119f88e17d0abb2de2","third_party/breakpad/src/tools/mac/upload_system_symbols/arch_constants.h":"95c95e77ddde1ae6522c71aada7a49ef7603f1f19f7847cb36b4d9222c3fd28b","third_party/breakpad/src/tools/solaris/dump_syms/dump_syms.cc":"59e3533ee9969039c8d8a16a43aa026381dce0541be84e02444cd1218a2d30f3","third_party/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc":"4b035bcdaccf6b7890470d40b69de27cd476793b67890d6529d7236b3ba45a73","third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc":"bf8888c1bb4fcefbc30eeee5d962331c61e0204281a25798c33d807e7f6640c8","third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.h":"7e5de3d1ac6bc00212e45f372f19eab8fb07e9e99940ecda60e9f9fa6607e9c2","third_party/breakpad/src/tools/windows/dump_syms/dump_syms.cc":"55c265cbfacab55e88c768ec08681dd3656937128a1570bbcfb9320d0f70311c","third_party/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc":"04a309c140d9b7744255604c78b19888c050ee229c24f7aabed068efb2d02fc1","third_party/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc":"ab359a5ecd5e55386bac2ef30545c66399ef5627eea7454f21e264c3eec99c7b","third_party/breakpad/src/tools/windows/symupload/symupload.cc":"dc393e414a81a96c3fd33bd96259b2201cf725634a397f722e372e9abd564fa2","third_party/lss/.git":"0c291d2bd5767886ee20009b33332fcc62220c001e7e4a9ba138c8f6fc5fe21e","third_party/lss/.gitignore":"cc5be066431e8e73214688c1eee2c0198f1358616673c2ffc687a8d9e8975f6b","third_party/lss/README.md":"5e0490057d150e50b9a74d357fbcc4671dd681ac11845b01c944476b6471d690","third_party/lss/codereview.settings":"743a2480b0774fc6d6811dddc1c750dc33e1debbcc6f6af147c4efacb9d10ed5","third_party/lss/linux_syscall_support.h":"696c14c3da8412c5882be0e6ec591956b160ab8c421caaf53650c2687bb49873","third_party/lss/tests/.gitignore":"45b506fd60e79981a90741445c1ea9853c15d296c50d6a7ebbef5a84bdec8bf7","third_party/lss/tests/Makefile":"511a628a9bd0037cbd189b065237863a3b01d1c4bd68dcd167f17b3de2f4db53","third_party/lss/tests/README.md":"e90ad6584b6d634d2b47f9e7c9b17bd07e2f4568a426fe7698471fa8bc091643","third_party/lss/tests/fallocate.c":"59ec13654c32ee1dbc298475bc13809645e863ff88e17888bbeb00d271b40215","third_party/lss/tests/sigaction.c":"d42da309988670b66e143fc983cb6516ce29704e4e6471c1812d9203a2a9b497","third_party/lss/tests/sigtimedwait.c":"277867372d38d2fd727564142c050f42da01d8c24537b6bbc4919ec7655d08c0","third_party/lss/tests/test_skel.h":"548f5213b13447353cbde4a85382298f62feff85ef64c8b19dc7168fcb1ca6d6","third_party/lss/tests/unlink.c":"3df0c91de657a036fe5a4d1fd972126dc0f7182c2003d6e2fde5cb510c3db314"},"package":"a2d923398ae807fc354c0249b286ad0a7c618a5a518ba66cf95d095cc563d941"}
\ No newline at end of file
+{"files":{"Cargo.toml":"0ffeda8ff8c2e5f3a8bb2ce043a4be9d675ce86835c4c4ff2be295cdc6fe41ca","build.rs":"11daa890ad5da877957e82fbc3e6c394b16565bddbd19431ab7e8ca0719c9bf8","cpp/c_mapping.h":"5a35f390bd4b92cc67a62b794d9789ec33e5146d8bc8add349958986955c21a4","cpp/c_string.cpp":"12fc6965e9f945378f6211c5d58c350331f2871f7ed11aa61c448e2dc6a00bed","cpp/c_string.h":"0df3f6241acb061d29e2458e745ff32d801b3fd3a0f825d43704cbf0f27ec5fa","cpp/data_definitions.h":"5b17eb3ac2008b576e385bdd3fb3be825ebffc6ca266afbacedd849dfd5a191d","cpp/data_structures.cpp":"e6392a9398d60a8363564072e76cd2de50bec817005e4978e2647346e6d41035","cpp/data_structures.h":"8363dd2f96abfcc03fc9dd1b4777580421bfc822180f534f69232b5ca82022b3","cpp/memstream.h":"81c65ce7a049afee0fb16b1de4b2b70c463a873a6336ee8710a4299579cf32d9","cpp/mmap_symbol_supplier.cpp":"c1bbdd995b1068acce38cbf3fdaab051454bc86a77bdf7f2a36c30084af273c9","cpp/mmap_symbol_supplier.h":"b0a11137eaa61cea1937f192a3fe0595c475e0e65e48e080dbb62759751be2be","cpp/processor.cpp":"9a89b37b7b4c74b5c70e93ca20aaec79155ac2d8c2c6c7a72b765fa730cd453e","cpp/processor.h":"0944819a88e5ae05f368bf6432b2378844bee43041eac804389561d040b79d8f","src/cfi.rs":"077a64e41dbc6a3109ce7e5f9e9efb09dbcb0173a9331e742e646413efface2d","src/lib.rs":"5876126ef2ab31dcb0218ac6fd20a94bea0e789510c1092505dbfce0359a6731","src/processor.rs":"65303274c09717f0f851a3d3104ec451827d12ba046ced797f2f60553a5011de","src/utils.rs":"7c0630e72e8a34b4cf029e7096ebba93f25a03eb80cb0819f0cda10336a07a78","third_party/breakpad/src/breakpad_googletest_includes.h":"9b29f1b035d04abe698293c35c2b07a8f9fbc13d950b39d3de8ddc20fbd64f4e","third_party/breakpad/src/client/apple/Framework/BreakpadDefines.h":"24d08d9b5c9dc0fd1430b5f5118dde299df3626265d3d47d30c8863d4ed1e4d4","third_party/breakpad/src/client/ios/Breakpad.h":"30fda0fe63ff2ba43550b68e8afa2229a96ceac8901c4021d64e6462c3e47600","third_party/breakpad/src/client/ios/BreakpadController.h":"0d125d34cd2e1102ba3296783afcbb379c3f6eea01b19787b31212ec222093ef","third_party/breakpad/src/client/ios/exception_handler_no_mach.cc":"fedbd7544f01e5f5aa8ee38e16b38c36a2ce51c8ef46a5286e1aab9b924e966f","third_party/breakpad/src/client/ios/exception_handler_no_mach.h":"4b791e9d8aed0653de96b8079b4ec825317e68dd1de1f0903513557f7e0abe1c","third_party/breakpad/src/client/ios/handler/ios_exception_minidump_generator.h":"299d13b744605f39f0c5a92e2f7736cd63dfc14e852efccd872f624b25de0924","third_party/breakpad/src/client/linux/crash_generation/client_info.h":"cf8403d32f9c6a9429cdf5c17dffc25178e6e340f8d241220e60ec109746a0b8","third_party/breakpad/src/client/linux/crash_generation/crash_generation_client.cc":"3001d5948bacab01944a9af6ad18bd4165b2e39668cdf212217931411624769b","third_party/breakpad/src/client/linux/crash_generation/crash_generation_client.h":"2049acf32cd817a74fc6dad066c2300b01673de9eec4cb782ce578a3cba8f106","third_party/breakpad/src/client/linux/crash_generation/crash_generation_server.cc":"e6bbda49c00e10afb452a1ec491be16771e497f175ad89db6b288760523c853c","third_party/breakpad/src/client/linux/crash_generation/crash_generation_server.h":"c365289edf4036bfa8e37749ba33ca871004c97804b7dafc5d6f45eec252198e","third_party/breakpad/src/client/linux/dump_writer_common/mapping_info.h":"9bfb26f14920e5e7c6ab56d51fe11aa32c04825d7fbc062845978c728e7f4239","third_party/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h":"ed5bda7965d352f8ba177f844a2848c870e8ab0ad5f515eec7fb1e7145d4ab20","third_party/breakpad/src/client/linux/dump_writer_common/thread_info.cc":"09954b881441cbf954b501f068027f6912126c8936d32e7b279bdc3638333897","third_party/breakpad/src/client/linux/dump_writer_common/thread_info.h":"da7e9871a4cb7a04eaaead5c9520b38417ca2734854cf3517a34fbb2a6c57b93","third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc":"a173dfc2a5a93231dd38e5cd99e7d6c2169e130b68941cc417f0f9bd51bd454c","third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h":"81389e3873ab37ab74650edf0671ad386433701e32ae9283a7190b25c0ec99fa","third_party/breakpad/src/client/linux/handler/exception_handler.cc":"358ba932d7cb8ff7cafc2787d17918ff341fca9111d535a54d8719729bd13d79","third_party/breakpad/src/client/linux/handler/exception_handler.h":"f602067051aee059a1b8f2c18a1b5d3dc5c8162eea3d1c193cf36ef89180907d","third_party/breakpad/src/client/linux/handler/exception_handler_unittest.cc":"b7f9fb99aecf69750150f0ec6f6574fd932dddf318ffb91d635dd577d6e67830","third_party/breakpad/src/client/linux/handler/microdump_extra_info.h":"08cf5abb91678af4264e389e43f92bba5c5b70ef2627f1cb455b8fbf45f94139","third_party/breakpad/src/client/linux/handler/minidump_descriptor.cc":"cb7d9f301b4ffa89257732ba0d748ebdaa299da5379501648fa378d4015a7b99","third_party/breakpad/src/client/linux/handler/minidump_descriptor.h":"38582140e5ae0f3253a2939b37864585a4babc107a2638f0f21237033669836d","third_party/breakpad/src/client/linux/log/log.cc":"6049d3ff0a2c5c912863c58b2498423d7440e91cdcc1284c6ba3509e7ce58e52","third_party/breakpad/src/client/linux/log/log.h":"1b01b7be8810d670b32ca1020d62713f864e449aa32cec741b8033ca3cfa3871","third_party/breakpad/src/client/linux/microdump_writer/microdump_writer.cc":"f5c0888ae054ca0a900e78de03b2de37fd333a46903d546a405c43fc42de442b","third_party/breakpad/src/client/linux/microdump_writer/microdump_writer.h":"938a666a05550486c3a794990f966aac88a22cf5f8e2870c58368ff373429ecb","third_party/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc":"3d18219bdfeea0dfbd16db95d782dc9bb63718531f170b79c0a88d0154837bd9","third_party/breakpad/src/client/linux/minidump_writer/cpu_set.h":"19ae72ba137e7d00e775b3cb622a8b23db7fec9ce7b01fddd34a5b59fbbb81ee","third_party/breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc":"8426562ef5c7da358b077e976eb569b4632ffdb3951b1f74aed5dd1909a98bda","third_party/breakpad/src/client/linux/minidump_writer/directory_reader.h":"bfdcda29d7e248bbc3649189775e94f9bd2e0e234e39b14f7880cb6f3eb14276","third_party/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc":"caf86225db8cb3bb99cb50331fca94bb23b36629b398688d043979b215f280d9","third_party/breakpad/src/client/linux/minidump_writer/line_reader.h":"7564a8e02dc7c2c8d4755e3ebe5d7cac57f423b4015796010969d913c323df9c","third_party/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc":"b613c80ca9c216bf0031db095061a241c83997abdfd5dadbb9f8f54ca93847a8","third_party/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc":"9a42e5fb7968fef00097256d47009b9cd53b8e3dd19bf068b51b653d6bc9b8fd","third_party/breakpad/src/client/linux/minidump_writer/linux_core_dumper.h":"0f13984a36a87221217ee4cc207bbeb0d7e7e2d3dc161a0ce0e8f51b0a71304e","third_party/breakpad/src/client/linux/minidump_writer/linux_core_dumper_unittest.cc":"f66a4ee4b20451bbc5e5c7201812beb5e6c23093e4684a16161231e3b5cfbefd","third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.cc":"b1bda98d457f6986a54644f777fa913076f487e389754ee4ab16bf4bff5a0318","third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.h":"7eb69546c7873e3a6b1473cdec6e6f8f3f322421bf135e649e74dbf04f1a99cd","third_party/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc":"515791978e7697ed9ff23a18b9980c519a87c37d5d4db3e1c66861ff4d1009bc","third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc":"64fd32bf470928141a26077cebfa10fca7c4a2f7327dcb7e490762ad4e29afbf","third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.h":"e2a390a3c1a78f1a05ba8ea69b50e358a6bd3a8cf9dc1bb3f3d798de24d0cdb5","third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc":"461aab54bc1a8bc205dd817d5716805a29388b1fc4f97b04dc127cba6f2e69a5","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.cc":"924a2e62d46a4727f83d2a20b82f8c95000c2c9657f1d6d1f1df86a93868a1b6","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.h":"7d9a34ce02aa76f9e91490e2ef634a4133497f02a132de45be65ac7c42824224","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc":"bf30ee45a70d7331e85f378ea25b5286d9a381daf391c833bf3cd3901a54f600","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc":"44966aa2ae18961eb60d8f406ecb4f9fe5cdf0b0c8f29a6d7f4108233815c77a","third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.h":"8e3948be9341e0b3a8ae8a0770eadf5070425d1ffcf06e18bf4cf85cf71c05b9","third_party/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader.h":"8ea362fcf7ea3d54343d10ea13f8ec4c0dd87fe22e04a077dc56018bf0e42892","third_party/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc":"3805daabe507a020d66d60eb363e791986cd48de6ec59d5fc225ad2e25e47f3d","third_party/breakpad/src/client/linux/sender/google_crash_report_sender.cc":"3dfd64853d59a4a600248dc4820a899167437a428f83a334974b9cda0747f0cc","third_party/breakpad/src/client/mac/Framework/Breakpad.h":"33dce0ad1fbe3a89e9cd530b9bd3e3b3b5e0185fba1716932493391d7c106ec9","third_party/breakpad/src/client/mac/Framework/OnDemandServer.h":"505ee2a6c12bb74d4e7e6bed8ab0a413cdfa1faf60e3c1a5913d66f627e0f0b0","third_party/breakpad/src/client/mac/crash_generation/ConfigFile.h":"83bd0b623e251edf4ea033f337ff2d05b2c3f05d3dbe4156afbd7525012596b3","third_party/breakpad/src/client/mac/crash_generation/Inspector.h":"e76ea14c90b418ed2e5edf9208afaeb51bbf4951736767dce4a3a8779170f860","third_party/breakpad/src/client/mac/crash_generation/client_info.h":"52fea2144722f985aa802817843d863f894daf578b0a5ef49832a1cfa370d323","third_party/breakpad/src/client/mac/crash_generation/crash_generation_client.cc":"479d761e4a021b59102702f6cca3117eee2a85f0cc9cadae5d2b0913c1654be9","third_party/breakpad/src/client/mac/crash_generation/crash_generation_client.h":"4614dfe2b2cad777ce42ab35d5b4ac188f45633b83f9108c36e5e1b94361feaa","third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.cc":"db57584e1d8c51cf55d1729cf4a6f3bb8b1575b28fd8a257fb23b0525d3defa7","third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.h":"bfaba2c6193b24ec539e05e11ac65fd16f6b0e94dc98ac48e3003ff9b687d993","third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.cc":"ca4eaf0efb43ff4a483ea958d0011505c8e5e253c5f49a327a931bc60177bdaf","third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.h":"1fd8e3afaa6ff3d79e2d98b07a4a4896864d2a0e84b377fbebe8705c66a90988","third_party/breakpad/src/client/mac/handler/dynamic_images.cc":"dd38bde90793bdf8857801f07e676f16ac90b6d7df30e6553d12ef2f1d86d9e0","third_party/breakpad/src/client/mac/handler/dynamic_images.h":"3bec1b62b5db02ea0ba3d1a751843688029671c22d30e47902be47cfde05244d","third_party/breakpad/src/client/mac/handler/exception_handler.cc":"13e15cb17820aa052cd37add5ffb61c2c69940e61812cfea4fbc5348eb08b7aa","third_party/breakpad/src/client/mac/handler/exception_handler.h":"ccfedd5fd208a9dff0d85360d401a103fd03fba49136135b7c6f1035c25491b7","third_party/breakpad/src/client/mac/handler/mach_vm_compat.h":"bc655687db47ce7b16a56b3da4b4ca50bc6c75363b4f09ce7012c49da614774f","third_party/breakpad/src/client/mac/handler/minidump_generator.cc":"b848d39de998e28164657a61ea5291b2afcd87afabb6ef9972ceaa8f2997defe","third_party/breakpad/src/client/mac/handler/minidump_generator.h":"48e042538f306d0bf96493e00a948530d9a9355cdb27b2e2411d9487548d8c6d","third_party/breakpad/src/client/mac/handler/protected_memory_allocator.cc":"90e97ba00760914db57e32f9be6734afa47ecb42d6f7837c02539d76f99e6f07","third_party/breakpad/src/client/mac/handler/protected_memory_allocator.h":"b504b794ccb2fb944230ab4c80fcafe2137c720d876ce11d08b4999851c133a9","third_party/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc":"f1feac79c8ec3e2d17f9b4f90e3289cdb0dee886978c9594df715ee174a6c553","third_party/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.h":"4b8b37c6131fe862bd10efa2b562d48d4212662f53374c9a0deed63d1d21ca37","third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc":"0171156ab057e7451c8b10a004ac6e3532e5e6ad2f54044529021c417b3774ba","third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.h":"dfa823f57407a2e33a526a52f793abce0a6f09ab188403a802ca3433008ff258","third_party/breakpad/src/client/mac/handler/testcases/dwarftests.h":"da45b459088430a7576ae00c23425f39cd975b501d38d41e968e9f7259fa6d94","third_party/breakpad/src/client/mac/handler/ucontext_compat.h":"ac0f2e843db2c3167e77684fe9a44333a3e0a0fd42ea348d5280d4b35dc3186f","third_party/breakpad/src/client/mac/sender/crash_report_sender.h":"445ca9eb8d56de1efac6b7f289b3fb9eeb4a8ac436b1d57c4ac58a89ded5bc6e","third_party/breakpad/src/client/mac/sender/uploader.h":"48eeec3e6a46d05a253fe06b1e979b9e3c49a01f52e44dd1edd50d7b16ef22ee","third_party/breakpad/src/client/mac/testapp/Controller.h":"ee4c7fbd19523875536729aefe96a4f5967f1770f0ef4e5ba093151e710ea039","third_party/breakpad/src/client/mac/testapp/TestClass.h":"80cf7137fe63ea1239f6501284e1b6441425fd8420da7b0b8bd662f717b25dd3","third_party/breakpad/src/client/mac/tests/crash_generation_server_test.cc":"0055675ad9142a33d8d2c2b249c0222e7d6866ffbb22cebfa6d5b99e62df64c8","third_party/breakpad/src/client/mac/tests/exception_handler_test.cc":"98492bc54443ab7cdf72054e1bd58f45446f2baabfd72270b893b5291b65bd4c","third_party/breakpad/src/client/mac/tests/minidump_generator_test.cc":"a6fdecaf790099e162bb59fc37c0fd48eb3d28e17886a02c707df1cb09c5942b","third_party/breakpad/src/client/mac/tests/minidump_generator_test_helper.cc":"1ce8d67117f964c1706f8d52d9318197ec31399435a1d406133019b867f4ddcd","third_party/breakpad/src/client/mac/tests/spawn_child_process.h":"342d5c40ffbe1d4c99866a5ab1ce6a82920b629b71b84e0f874ee0d3624062be","third_party/breakpad/src/client/mac/tests/testlogging.h":"ca8bbde92d0ef9755ced6cce1694c25a702532bf04997be4226aff041c648683","third_party/breakpad/src/client/minidump_file_writer-inl.h":"818297d08babef835702eaf37f15d58dec6d7961b321661821c5ad8abc9a6120","third_party/breakpad/src/client/minidump_file_writer.cc":"a88d4a3c4425b6e7207a54662fc9063cb22b56ae343aaf1e0d96488cbf04291b","third_party/breakpad/src/client/minidump_file_writer.h":"69ab88f15905ccd2e7b837cb1898682f04832bc00b696bc127c4fdbb039189b0","third_party/breakpad/src/client/minidump_file_writer_unittest.cc":"3de9bb71e0eb845f103484b062473a2e3daf56665b1c368b5cd0bdd7cd2ce3d2","third_party/breakpad/src/client/solaris/handler/exception_handler.cc":"d8d3f414b201df05a4f322d6190c7c90c77cdb6992955b505da90538118dd064","third_party/breakpad/src/client/solaris/handler/exception_handler.h":"beb2215f81a78a1f4e66f66d37fbd678350499cc2ec0159af783e6a5540e7c87","third_party/breakpad/src/client/solaris/handler/exception_handler_test.cc":"6f54ada291f22e81e8f18b26bf9df54d5a302983558f840b209e5d910fdca5d4","third_party/breakpad/src/client/solaris/handler/minidump_generator.cc":"44cdc5be549f838759a0a10b79167e53820ea0527eccf0f1f5e191b860299c2b","third_party/breakpad/src/client/solaris/handler/minidump_generator.h":"77db082363108914e1f73e8683bbb6427811646a7047c583def2e1ca87f29d69","third_party/breakpad/src/client/solaris/handler/minidump_test.cc":"8f4bf9530322af771949b1b5b77e300198489820495dc6629264a44dd706263c","third_party/breakpad/src/client/solaris/handler/solaris_lwp.cc":"3fe6648821b958c7b70bd165adb6e9497e7a5a56c8034506f80eef69caa8446e","third_party/breakpad/src/client/solaris/handler/solaris_lwp.h":"b730e791b7ae8e2b42e4b67262b3ed52a2fa1faf5bf71ad9489a3c05e1d90cf8","third_party/breakpad/src/client/windows/common/auto_critical_section.h":"aaafe9c1d646782e67b804b8b5ecd91e473ba5003aaf4436b3be149c40e0b73a","third_party/breakpad/src/client/windows/common/ipc_protocol.h":"b20eafa68fd258df1cdb3cb42ad8c34a1d40e780bc925be5a442e305330d9afa","third_party/breakpad/src/client/windows/crash_generation/client_info.cc":"96db47f9d29fd5ea8dd099b19368cf642fc019bd25846718296b22341c540380","third_party/breakpad/src/client/windows/crash_generation/client_info.h":"46c0f38beab043b6b2975bfb75198c7280d3f31b8db058a8f6e5b5665da304d9","third_party/breakpad/src/client/windows/crash_generation/crash_generation_client.cc":"4fb62a5c77fd2766d40cb7983466bf0aebbd4f0d52e4cbb04ccfd72d04226d57","third_party/breakpad/src/client/windows/crash_generation/crash_generation_client.h":"9aa7f1a8894a75eac6b00f0defc81f27d5ca24cd7942490eced6d202762001c6","third_party/breakpad/src/client/windows/crash_generation/crash_generation_server.cc":"bdd9209cce9a284492e76cc75ebeeece7e61dbfa9ebafd26847bc74ef8c71851","third_party/breakpad/src/client/windows/crash_generation/crash_generation_server.h":"2adfbd87d8d0eb34b295deda08bf32595cc5641f1a867d1fac708aeeabd494ac","third_party/breakpad/src/client/windows/crash_generation/minidump_generator.cc":"e85ef30b259073695fa17ecfae2e2382872955f1d4528c5bcf98e192713c96eb","third_party/breakpad/src/client/windows/crash_generation/minidump_generator.h":"f11046a8f392dfc374212a795a5e79b3a6f0f0d7c712de8f5daebf5f6d8a38ea","third_party/breakpad/src/client/windows/handler/exception_handler.cc":"f4abd1d286bd5ca87cd646e23198ff8534876e2064066200b79a52ee5e819487","third_party/breakpad/src/client/windows/handler/exception_handler.h":"f58b21aed618a708c18ba873eeda988579e35f5b90daa16539370c40a3c72efd","third_party/breakpad/src/client/windows/sender/crash_report_sender.cc":"d09fe1b7b2f0675c9921e004e069891ad5350468364042ae62d2436c04975a57","third_party/breakpad/src/client/windows/sender/crash_report_sender.h":"2b55b8ea99913a5a43e02823f0f4b2db71c1f61cc877d70971932f68bf673485","third_party/breakpad/src/client/windows/tests/crash_generation_app/abstract_class.cc":"914b6ec851ecbe03e8b63f3554ebfae376fda614a7a4a6d9e8dc04dd94642cc5","third_party/breakpad/src/client/windows/tests/crash_generation_app/abstract_class.h":"714d2b61da194c5462b7b6e343c45a10030a07535582d8c1eeb5584a8a04b00a","third_party/breakpad/src/client/windows/tests/crash_generation_app/crash_generation_app.cc":"4b303b9f78f2365d071639ea7d4b36056388ab7f67d90b2a3b7317d5313da64e","third_party/breakpad/src/client/windows/tests/crash_generation_app/crash_generation_app.h":"04bce5afc6f432fffb80bd3c082dd8d5ec364338d07f30770ea6627fadb96e91","third_party/breakpad/src/client/windows/tests/crash_generation_app/resource.h":"7c6c7bd3f622fb871f69b994aee3d63410a51f6543d56f0faf9f83f682eb8fb6","third_party/breakpad/src/client/windows/unittests/crash_generation_server_test.cc":"a69ea399a3ce396275660cc30d1a025dd3e6587df2bbb0262f9d192ff724af6b","third_party/breakpad/src/client/windows/unittests/dump_analysis.cc":"c056a00a6113ea567157148fd9b7c496c6f6ba0127dcfe5456083d06368e7ec8","third_party/breakpad/src/client/windows/unittests/dump_analysis.h":"9fa250ed4ee9f2fe4cd2ba93ccc00da2d7343375f8598ee209b1ef79ae297702","third_party/breakpad/src/client/windows/unittests/exception_handler_death_test.cc":"48d3eab8f9ed27973781acb573ef05c37f7a823a3ff2d16ce0ba425842b8b8a9","third_party/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc":"3311ee91a5fb8a41a2980a199190a450d0b0cd301b2629fe848001cac163e03c","third_party/breakpad/src/client/windows/unittests/exception_handler_test.cc":"8d7c210a0f388039e89d94aa0af8aef9da49e90e871b743b50a85e873bb64fc0","third_party/breakpad/src/client/windows/unittests/exception_handler_test.h":"6bff440651958d4284c134ec98b2afcd4b873aec549d4f6f4814ef6cdd6812f6","third_party/breakpad/src/client/windows/unittests/minidump_test.cc":"809c2c8497cd1f15c8d490e7b8fef6e4c3213f3ee3bbe42a7320bae44dd9e495","third_party/breakpad/src/common/android/include/asm-mips/asm.h":"10c1e820464c51c8fa93eadf7c7bb55c436e18b5f66fca876c73cc7636c2d78c","third_party/breakpad/src/common/android/include/asm-mips/fpregdef.h":"a0a889ab6a2f065ca02be2273b06f607bf29b31e31b3a006f64e85209ee149a7","third_party/breakpad/src/common/android/include/asm-mips/regdef.h":"f395f33fbb4bd09bd7b8f6e93ab2cc24c48d4cfdd1bd5abc95aa661d4286a843","third_party/breakpad/src/common/android/include/elf.h":"7fd24b881580fd00ab3a4e4a2db8558f47fc84f845327ca69730337649f21486","third_party/breakpad/src/common/android/include/link.h":"d555eeff531cb8b5522554a6580831906aa94de1493d54bf7cf5bed55cc36e6d","third_party/breakpad/src/common/android/include/stab.h":"f55465314e50e7fed9cb1b76a8216e1548268455c72799ae38b8a23572bce545","third_party/breakpad/src/common/android/include/sys/procfs.h":"5af6467dbd9f581dc84b59105fc7bde3fd68f77e14a2b139d4f3b9834dec7fdf","third_party/breakpad/src/common/android/include/sys/user.h":"8c7c56cc44ff56be17f0e41eb7cd8c5dc6779698d1d91a8236b87e35f7fd45e0","third_party/breakpad/src/common/android/testing/include/wchar.h":"25a5574240efa7a29044ef8f7b59cbe50742b421373a7ed33d8b8fa54ff7cc82","third_party/breakpad/src/common/android/testing/mkdtemp.h":"6682aae6cf21fd14ec7d71807b8e8cbe0d00cd87292c27e3cfc9a68ae28c331c","third_party/breakpad/src/common/android/testing/pthread_fixes.h":"7630896d5ea3c0aba5f2c24c30e2cf25a707af167524b4f17d109ec7ac6aad40","third_party/breakpad/src/common/basictypes.h":"4b4155b8f03c30daf982001c156b2de1a8dcdea7051b606f01ef72750a3e32b6","third_party/breakpad/src/common/byte_cursor.h":"194145c4e0bf73d70936abd6ea8ede40c6ec5dccdc301d2296ce88de1da4e47e","third_party/breakpad/src/common/byte_cursor_unittest.cc":"f6434c4317b50890bd0a9653496541aa0f8dbd7ca25006c68bb17ced74a45890","third_party/breakpad/src/common/convert_UTF.cc":"ee5134db0c582549b65a7444faf43174918544feb961d496fd0756a667d819bd","third_party/breakpad/src/common/convert_UTF.h":"76ddcf20e358307469a57d2c4c0856d7f42367d1fadac5e9761a052463dead3b","third_party/breakpad/src/common/dwarf/bytereader-inl.h":"d4f909161ce07c12cba39357d01275f2250ab0245fb7a90a592edc5932ed7f2e","third_party/breakpad/src/common/dwarf/bytereader.cc":"85aca9451a2787d538c9a6ee1184747b2a67cf51bfeb1c32b5e27357e7aae3ba","third_party/breakpad/src/common/dwarf/bytereader.h":"428c50034c4c9983e9500767e7ba12c7a07983fb27e42e0f97bf51c63688ca61","third_party/breakpad/src/common/dwarf/bytereader_unittest.cc":"53c12ddfcef144c389c775a99b1815806a8e94693c119239305c9f0c8c697c35","third_party/breakpad/src/common/dwarf/cfi_assembler.cc":"ff4c1ce01456a32f5229cc69c28e2e87b92685fa2c5d3ea2f42eefaee8f10f40","third_party/breakpad/src/common/dwarf/cfi_assembler.h":"170ada28c7feac247e1cfafa78ea160236965de5a48ae750d359f55f8ae21eb8","third_party/breakpad/src/common/dwarf/dwarf2diehandler.cc":"48d677edd91286c36ccba6326c8186724ba767b7ec2c95632c447848ac2c3e99","third_party/breakpad/src/common/dwarf/dwarf2diehandler.h":"f87c2d4257bfd0e7cd555625b007283fe1c700c41cf5c94598ae036ae53da386","third_party/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc":"cae02e0cc37ceb25319671384037d722027e0ac06ac33bafed4e411b2f6fd882","third_party/breakpad/src/common/dwarf/dwarf2enums.h":"4b49123babc998a0f38608127d42f5c8d1a3f24bcee1bc28f1f55fc0b4f14f9c","third_party/breakpad/src/common/dwarf/dwarf2reader.cc":"18d40c27c99ebf9bba63cc73de906bae61bddda38a48091525ed05eac9d7ad1d","third_party/breakpad/src/common/dwarf/dwarf2reader.h":"335046efabba3b51a7c8e7360d93ee489cec8a1fe0fc2b8fe33db79509073b23","third_party/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc":"e8a1ee8f6dd1b5e292e7fcc7bc5a19363814a3826f6fe0c627149004c26e2216","third_party/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc":"0e2d9a5f736c368041a17f142bc0c6e757b9f8077131f6278b255fea90f2b4a9","third_party/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc":"96160bf2771854e380dfbf93c69a1412fb12c6371ff83a714b6fabbf67127c1d","third_party/breakpad/src/common/dwarf/dwarf2reader_test_common.h":"e51e287afe69adb69dfc5279612cf294558b58162de22800ae5b394331653e85","third_party/breakpad/src/common/dwarf/elf_reader.cc":"dab861b15f222cf1e5a3d45b3b4b872cb7fe172c87b0f3ffc04ac481b23980e4","third_party/breakpad/src/common/dwarf/elf_reader.h":"96010ef3ee21b4fe8f2fb4f2106303bf65d24ee51457211a3ae319354672ae32","third_party/breakpad/src/common/dwarf/functioninfo.cc":"8f648f0a62e0e44fb95c4e285ab00d1da5b0bc1547a93e8ebe5c6881370a233b","third_party/breakpad/src/common/dwarf/functioninfo.h":"8795d9fde7afc06d1962e67defb3a4cf8c10c96d2be128fc3d654336d7de876a","third_party/breakpad/src/common/dwarf/line_state_machine.h":"2c220c5d82bc4ec47649c7a8e2a8f10dcbdaf5a1eaff58b523eca662816af52b","third_party/breakpad/src/common/dwarf/types.h":"13ecd8bfb51aa4a994c5ac9fec791429df94e30ebda48628ccedee0e7437d4d0","third_party/breakpad/src/common/dwarf_cfi_to_module.cc":"3c74447bdfc22e52e8d948350bf9fc13cce59996af9ffbb9216d771866cea91a","third_party/breakpad/src/common/dwarf_cfi_to_module.h":"d7e58fc5862e51e5ba2f2409df9bae46c4bfe4347156b802c9f43d36f6bd55d1","third_party/breakpad/src/common/dwarf_cfi_to_module_unittest.cc":"5e6288bfabe034bede187006942cd0f525fae9dae34bb364ac5b6d4c45499267","third_party/breakpad/src/common/dwarf_cu_to_module.cc":"448ece9538cbb2342e25dd6fcebc8640047a3caf05e5083b6749528e4c548851","third_party/breakpad/src/common/dwarf_cu_to_module.h":"76d58eea9efaf56772c47fdf1be29a73b1df824b0906ac4fb4dd9acb7d71c37d","third_party/breakpad/src/common/dwarf_cu_to_module_unittest.cc":"e555e257e765befb04943f845ce959383be14a477ff89fcb5d4ec37794a0dc30","third_party/breakpad/src/common/dwarf_line_to_module.cc":"07e8a176b6e0fc41556298f8dae59b05aad4c786f78f1b840eb049cb083848e5","third_party/breakpad/src/common/dwarf_line_to_module.h":"69069e300257f6b1d548f6786fc32b8df0433013fccd13dc91081b0ae9be4aca","third_party/breakpad/src/common/dwarf_line_to_module_unittest.cc":"2e154de3655d28ee5f8947a1b0e6a02fc3d4b117b0267c3b3ffca461f60fadb0","third_party/breakpad/src/common/dwarf_range_list_handler.cc":"6a6726a9e75dcb8f156403e906b2811a7498a15053d63f789570ebce548df2a0","third_party/breakpad/src/common/dwarf_range_list_handler.h":"cd24edfea71ed3c9383553af0510038b14c9e66f8ac512b3c98d5749226cb9b3","third_party/breakpad/src/common/language.cc":"cb921fd03cf094d9b0c5d33ea9ef1649058b3f9bc294dc97d23140a56ce0b9b9","third_party/breakpad/src/common/language.h":"bb32aabe3836e534e07a3d1c3053b4e9c57b5f20d3a771be66709704b6bf7126","third_party/breakpad/src/common/linux/breakpad_getcontext.h":"9871912ecc9d2df20d84c6ef5bd44d45ec63d4a57fa8880fdb4563a7789dd23f","third_party/breakpad/src/common/linux/breakpad_getcontext_unittest.cc":"dc7d980166a28db613783e72476730b44578fad282aee5130e63439184d7d4fc","third_party/breakpad/src/common/linux/crc32.cc":"4c66f33ede03ad80318e15a69104bcf4a753f741a57b3d0734db081c74954488","third_party/breakpad/src/common/linux/crc32.h":"4723d1c58d7574b39fc93152187b2ed14278399a053cdf241cfde154dfd7c194","third_party/breakpad/src/common/linux/dump_symbols.cc":"8685b9a7fad2f93a0197e73f3448a303e7dc3c6b9eeff3b7b4edefc4cff8cbe2","third_party/breakpad/src/common/linux/dump_symbols.h":"712f469251647cd0cedb5257314fed9233f2adc48df5cddd96f640a25679aa7b","third_party/breakpad/src/common/linux/dump_symbols_unittest.cc":"dbddd893207b930c2126b5a988dfaa5d613b41cd64e6303abe4ac0406da3d338","third_party/breakpad/src/common/linux/eintr_wrapper.h":"f075892d9c95c329ec3ced7d0ff19b11379ae941e3b40f209cc67f2e0af9a0ec","third_party/breakpad/src/common/linux/elf_core_dump.cc":"ae7e9b10c41aba281d22eadb064e191754a28e5e2850d4e69f13018aec8aaeac","third_party/breakpad/src/common/linux/elf_core_dump.h":"6a4c70f140fdb29fe65dbea34c243bd16bb395c033026af8f1975f484bae5cb8","third_party/breakpad/src/common/linux/elf_core_dump_unittest.cc":"6eec8b91a738cc3a22ed931c3ac1a3352889896b9edc9d856202d3dc07f3b457","third_party/breakpad/src/common/linux/elf_gnu_compat.h":"e23e9a4296cb3c0b50505b70bd31ec5aac513642014283e355a61f32caba5342","third_party/breakpad/src/common/linux/elf_symbols_to_module.cc":"f164a9b836f642dd3af6a3bcfec2019b47ea6f6096fe7254f7748199415081a2","third_party/breakpad/src/common/linux/elf_symbols_to_module.h":"6fb508b44c23156d2e68224da85e3c032aac439b259650346b703db7a004fe6d","third_party/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc":"1746a3ccbabe3aba22c922859af34726a63881f1b5b336aa1275dc32ef6f18cd","third_party/breakpad/src/common/linux/elfutils-inl.h":"bf97f1d1cb1e220eb693664ebcba020a8bb3de065fb36832ab68cfa1a1b19589","third_party/breakpad/src/common/linux/elfutils.cc":"41de1e34a91c2bf3c9424425c82d4f8991403bf329449b90a3aeee78837b20f2","third_party/breakpad/src/common/linux/elfutils.h":"655bead8d7eda6ef4ab045c7c4ebcd698d5b8112a3912f267c93e188dba5ccf0","third_party/breakpad/src/common/linux/file_id.cc":"66ed19915ac78eff24798f176b9755c7e400e903839acd15cb0c6ceae5759c41","third_party/breakpad/src/common/linux/file_id.h":"ce870bdc2bfa367bc3e1069337894a2fc0b0e2d418102c4abde8d18f97248ecf","third_party/breakpad/src/common/linux/file_id_unittest.cc":"55cf508dfde08c8c83b310456c4b67b5a5b572c9e9a67d71dc3c63bac05cc4d3","third_party/breakpad/src/common/linux/google_crashdump_uploader.cc":"492a73261ace4c7fc042b3f6dd9cfc164a6e12d8b3aa8a5121ce38aecb375030","third_party/breakpad/src/common/linux/google_crashdump_uploader.h":"364a672f44db9b90fff92dab5f48d73bfd910167c2ca76fd2f0e3523a9ca3dc4","third_party/breakpad/src/common/linux/google_crashdump_uploader_test.cc":"9103449fc982f640eb17febf45b7db0080723140d1ca72f40b90a2613ff8d48e","third_party/breakpad/src/common/linux/guid_creator.cc":"42bca91bc41245897beeb615137db59b186914b25f2b9d812f4e44519614ee69","third_party/breakpad/src/common/linux/guid_creator.h":"a43a3849eb2dc213a2aa4b96730e796951cfcfaf3d0be64ec8de1a054f4349de","third_party/breakpad/src/common/linux/http_upload.cc":"553762acb66e167ce2612ad17e72eac4a0482c59c2a922c241ccbb6b36d0e1fe","third_party/breakpad/src/common/linux/http_upload.h":"55ffe2658278a4777fbf88c2403e23869c724868bb741d782b797c3f9cf7a78c","third_party/breakpad/src/common/linux/ignore_ret.h":"72ecb012266bb23926df186596b670955ff30b72dcfeabc9c9780ed6034ec85a","third_party/breakpad/src/common/linux/libcurl_wrapper.cc":"edf56cbbc94177acdec8fc8d9d16ab509a86d47b36085550058fd06c44556831","third_party/breakpad/src/common/linux/libcurl_wrapper.h":"99c41aef7a2c9950dc828ea4d3d596216fff10f0eca60bd7f051695601ac1c67","third_party/breakpad/src/common/linux/linux_libc_support.cc":"d44b8980eb8dcb3c95f21aa8e660680e864c2feb1134a290c92f0c22645f9868","third_party/breakpad/src/common/linux/linux_libc_support.h":"21deb261c8c4a7f92726a3fc7354339f4a4d0504f26e85ca1855341e69eb62e0","third_party/breakpad/src/common/linux/linux_libc_support_unittest.cc":"594fe9ab3fe15c7a39be595efd89e5be70a1af140b2848af3363509cb4043e10","third_party/breakpad/src/common/linux/memory_mapped_file.cc":"bea735722e21b090b498e665804c417fdd68354747a2ad354d025ae0bfc055e5","third_party/breakpad/src/common/linux/memory_mapped_file.h":"59c53b3183e2d79964eb6165e0fe4fe24712a2847669bd84fc886c63809a3db1","third_party/breakpad/src/common/linux/memory_mapped_file_unittest.cc":"36339389c8cfd66f23339c864ba76d45140c0534502d8136e6d7ef9f3466e199","third_party/breakpad/src/common/linux/safe_readlink.cc":"706648c80c8f63912546b544faeecc2ce48700b6cd151a2c69d194e81aaf55c1","third_party/breakpad/src/common/linux/safe_readlink.h":"c1e08abb35b04a2ea42b5b6431460c889ee9592521ea7f979412565dee93e169","third_party/breakpad/src/common/linux/safe_readlink_unittest.cc":"7d29d93667433ac8d080517478ca13ccd1db40ed04aed6a3daa977f36ff3b990","third_party/breakpad/src/common/linux/symbol_collector_client.cc":"7d3e2b00d2c8bb12b7722916839234cab8a9aa8158de637a1e8833069441261c","third_party/breakpad/src/common/linux/symbol_collector_client.h":"79e8cd4cf418162354c55af07feff74f54f61bcff1824dabaaa771c387b9aa87","third_party/breakpad/src/common/linux/symbol_upload.cc":"e5455c2ea72a0b0983a033407979434a234003bff71b6a85fb955a7732b98fe2","third_party/breakpad/src/common/linux/symbol_upload.h":"a6372f81a1b232a49cd3f17e6cb7a2a94e49d6148c29c347f1a264a198cd8937","third_party/breakpad/src/common/linux/synth_elf.cc":"48447cabc2592326243b06e62112dcb9c0ab4ee5ab564b74fd3d76cbd03d5ecc","third_party/breakpad/src/common/linux/synth_elf.h":"380e222abbc3732b4702bbdec18381a68b3d8adc35993ed9701826c0fb8c82f2","third_party/breakpad/src/common/linux/synth_elf_unittest.cc":"968a35590568dbab13153e02af55d9ff20ce94cd8964f3e6511850efdd10b677","third_party/breakpad/src/common/linux/tests/auto_testfile.h":"4fb710afb70e2b11612d6fd32162f737ca6b3038a65d53f9deda1fcb2f6d1a48","third_party/breakpad/src/common/linux/tests/crash_generator.cc":"7bd2c48a61f4c64883488acb764afbb7784665ca5360802a59694b654ad979a2","third_party/breakpad/src/common/linux/tests/crash_generator.h":"7216cb63e55de1a428658ac786e0567874bd680746683aa34857a8307ea8daa9","third_party/breakpad/src/common/linux/ucontext_constants.h":"e6ebc8e2b03125b1ddb1919d7dc05d80658c54e00d491d39247e973f23660a5b","third_party/breakpad/src/common/long_string_dictionary.cc":"d4cc1ac05358a87e2cb832dca6996af2bc036216beeea276f91c7b8c0a187886","third_party/breakpad/src/common/long_string_dictionary.h":"670df27dab9929662e8fc485761519eb042fae90ca100141c2e601b76a2238bc","third_party/breakpad/src/common/long_string_dictionary_unittest.cc":"2cbccecfd4553e8b5b239c5f2f6d77bced1f641bab61470835002dc57ab8794b","third_party/breakpad/src/common/mac/GTMDefines.h":"e31f6382ae4c7f976a6c259097bb47ce2cc760538f1950f691694770c81b08d9","third_party/breakpad/src/common/mac/GTMLogger.h":"57c460f0e81b8d1602fb4a56bcbfc8d3b75ca9008ad216c126b72b29fe57b10d","third_party/breakpad/src/common/mac/HTTPGetRequest.h":"565808fff5b3bdedd5017d9745d7217218be24f4af10f667b98150448d5c83b1","third_party/breakpad/src/common/mac/HTTPMultipartUpload.h":"332eb2941050df1090fd058cdc125c9322a7f62b24933564426ce30bdb638f44","third_party/breakpad/src/common/mac/HTTPPutRequest.h":"1e2894910bcee07a67ced4579bf9fbdde5502539011c77de18efd6f85d502d87","third_party/breakpad/src/common/mac/HTTPRequest.h":"477af7f2023f1eb760d07d9988b14370cbe492da62ac8390521e8a0b60ddf645","third_party/breakpad/src/common/mac/HTTPSimplePostRequest.h":"79668dd1aa948485a00b9f7f124677f42b94f5f0259fb89cca04322f129cafce","third_party/breakpad/src/common/mac/MachIPC.h":"8260e404164ffd05e914f001eba39ef1f85e5c72cbd843a442dbab9c721d1236","third_party/breakpad/src/common/mac/SymbolCollectorClient.h":"11b72da645a1a26edf908333db39f891a793b3664804e41f35263f36f29aa354","third_party/breakpad/src/common/mac/arch_utilities.cc":"5926fe6b0ccfc55b7ecc9ad2a54f3178bff066869c41d14a49d3293bc7c3ed1e","third_party/breakpad/src/common/mac/arch_utilities.h":"f5ef770fcc58992da6b427bb4a5efd3c4a3a7a468f6b672a62a1f96918377f80","third_party/breakpad/src/common/mac/bootstrap_compat.cc":"853ee61aec1b35ae54bf055a4e65546318c068546dcbe3e3d5c9e4ccc772d16e","third_party/breakpad/src/common/mac/bootstrap_compat.h":"657ad2e87f59dac32807ed584745df438ea228b671b158c7e00858ef375501a1","third_party/breakpad/src/common/mac/byteswap.h":"810a960ab49e97ff4ea531899eccb6b6cb4c5b43a11e43cb3f51510c9b7cd07d","third_party/breakpad/src/common/mac/dump_syms.cc":"d812a1aba10da7759200f36174f9e199ce9c71bed8fc5f4f3266812612b53068","third_party/breakpad/src/common/mac/dump_syms.h":"1a3f21015c42605f7f7d3a279aabef6adb49705fc69404ae876982b876a46368","third_party/breakpad/src/common/mac/encoding_util.h":"a909e7008cb65fbeee473902e4c7376e77c650d3d7e9927aa6d8757ad8ecf864","third_party/breakpad/src/common/mac/file_id.cc":"e325d429cef8e21fdda28d8a5d9d4f041a3ebdad9b03caba739c930b5bfc3556","third_party/breakpad/src/common/mac/file_id.h":"2bfaa01ad3c41b368df746069c0d74efeb4d877e8c472e54443091b469c395ac","third_party/breakpad/src/common/mac/launch_reporter.cc":"6f398e815968b78531f83f6abcb333b86ddd55b9bba00b3bb7bbecb0e75c0dd5","third_party/breakpad/src/common/mac/launch_reporter.h":"0964f4a89453b402099ac2c4efcac2a959f56b70afdc3ba597325b0aa48fb1ed","third_party/breakpad/src/common/mac/macho_id.cc":"9bf976cd5e08969e9e04249674246d8b878d68698f7e6be887d1903e78f7c51d","third_party/breakpad/src/common/mac/macho_id.h":"792b8e191bfc3c310612c5efce6f97b485a2e46cc0562fb314d24ba582521976","third_party/breakpad/src/common/mac/macho_reader.cc":"56070fc2cf1e2003a972669cfd8c817b3f06cb2347272d98ef75fe4feb9a5bfe","third_party/breakpad/src/common/mac/macho_reader.h":"9fa2abade35f9b2422861efa6a28e09bb65f34034b47c19af25ff5463a08b65d","third_party/breakpad/src/common/mac/macho_reader_unittest.cc":"15e5e4db7060feddf82bac1c8dc611fd97b4dd3f7460ffbbd069c7eadba5c5e8","third_party/breakpad/src/common/mac/macho_utilities.cc":"7174f69c04c56b43d669798b629c17136c1aacd9782b2fa04dfe9e0fd77aea14","third_party/breakpad/src/common/mac/macho_utilities.h":"143f6d9eb59e6aeac5f0bd84cbebd8699a3e0a93f8601702cff16fc5bf12ceb8","third_party/breakpad/src/common/mac/macho_walker.cc":"8fed5c2778cce6a9a3d18cd0792ec518fe6b2ed007694e3e5c9c246175aabebe","third_party/breakpad/src/common/mac/macho_walker.h":"7c54a16b6af4fc7f31ad508c3d65741a967ef530ee613cca6c3a7583454a1368","third_party/breakpad/src/common/mac/scoped_task_suspend-inl.h":"3e05a3854e76a35a62cc2a039a17af7fdaa9a95f561f101b3b5c587f9aded69b","third_party/breakpad/src/common/mac/string_utilities.cc":"7d21f3e5f3649ea323c9472045198b920ca572479fa8077fcce041127374d30c","third_party/breakpad/src/common/mac/string_utilities.h":"194e7e99af023baab13c9110ece112646cc8381e142b6e77f350b9a931c9ef34","third_party/breakpad/src/common/mac/super_fat_arch.h":"61a8b85ee57c3e8b10612bcb82069b5e0822427c1dc003a81cf02852577d2d29","third_party/breakpad/src/common/mac/testing/GTMSenTestCase.h":"bf71712b0cb9ab89781514d09cc38ab0e8fd9d11d1a4935f282ad1ffe2561d07","third_party/breakpad/src/common/macros.h":"0a8fea36d2061edc0672c985e538ddcc938c7c483e2a5942c6e57e85cb065291","third_party/breakpad/src/common/md5.cc":"b2b6e1dfdd1e80134c93e2ea4bc52bf272ca747bdedc0e9d5f0a0f3e890965aa","third_party/breakpad/src/common/md5.h":"e21dcf10e1cbab87c9d7a59e07e91b059d9b6f01ec0832534c26d5e9ed575b93","third_party/breakpad/src/common/memory_allocator.h":"f42fed13cc9d737650e2f53ae3e39839fe6af3e36c0113347e470ca264135e80","third_party/breakpad/src/common/memory_allocator_unittest.cc":"9466ef8e7f5043db3b76422d58c42514f3339ad414076d28cd091454a891fc45","third_party/breakpad/src/common/memory_range.h":"e0cc51e6edff3b165fb7e849707e49f2c3ae912c90a3757dea55cf5cd8e005ba","third_party/breakpad/src/common/memory_range_unittest.cc":"29f1e4fa30ef0e15fb8d6baa53695f242eea0cf5a428aeade59f50e22a2a37fe","third_party/breakpad/src/common/minidump_type_helper.h":"cded538c669e99029bb1ffe431c29ed089bfb922258b327d52e2472ab53a597c","third_party/breakpad/src/common/module.cc":"29e9b76aeb70a9cbe75f900f996edb2aa41ddf093f762246ae9d13923a7c9bdf","third_party/breakpad/src/common/module.h":"322765fcbe671108bfa8d7490b9f95c0a8aa83e68ccef934a6b11164a040f730","third_party/breakpad/src/common/module_unittest.cc":"33689950770d84742e8b47dbc61200ad291d8dd7fbf46da986dd97f25cd8b350","third_party/breakpad/src/common/path_helper.cc":"2771d703e5958deb2538bfd1242e8901e2b924d13ab6473ea069cd4f33b5c22a","third_party/breakpad/src/common/path_helper.h":"38a294b79a49d748bf9d9ca911bbca70974806b92fb883619bd069ba89942ed4","third_party/breakpad/src/common/scoped_ptr.h":"2f4122f64900678324377df8928f87ed59d51c5a55e0886055e3092921998dbe","third_party/breakpad/src/common/simple_string_dictionary.cc":"2cc4efa4a4880614a76663ceb4fa6f2b9df37adefe9ae2e66c0048ff09852e15","third_party/breakpad/src/common/simple_string_dictionary.h":"ed2b961fb861751de8702e0732008a34e9bf0dd200395872f2e29fdcd8cd0409","third_party/breakpad/src/common/simple_string_dictionary_unittest.cc":"630ef460f411530ccc4f19f25788343d1f9b7dcdb153b66d54bca1dada7032e2","third_party/breakpad/src/common/solaris/dump_symbols.cc":"5ca1344c91367c636244e36641a2aff773ad2054225eedfc1da51a2f9c4fd794","third_party/breakpad/src/common/solaris/dump_symbols.h":"0037427cbf8f3b5fbab2fe44bafa2819eb4ce208b49f3e7be84a7accb1c41836","third_party/breakpad/src/common/solaris/file_id.cc":"105516ee004581a65e549db6e3aef9d08d8f44183586ac68f5e449556ed1d4c1","third_party/breakpad/src/common/solaris/file_id.h":"e171237d3257d58164383629b2b223ba34464e89bc20c9e154fb069311799603","third_party/breakpad/src/common/solaris/guid_creator.cc":"340de387de0949fba5c34a4105bff0934f33305143f7d4d335609e8a8c51930c","third_party/breakpad/src/common/solaris/guid_creator.h":"8ad042988baedb07f0b8a5e8c2d03de85809667e1fb28436320632cc5a2e2936","third_party/breakpad/src/common/solaris/message_output.h":"f244d283ef434ba759446986871f56e730fcf9d27d0e11dce305ea8098947d96","third_party/breakpad/src/common/stabs_reader.cc":"71d4f417c165ced221269844989c73351c6041817333f1ff8a9ec0e902114eaf","third_party/breakpad/src/common/stabs_reader.h":"1f6be288c64e1e1be5d9f283f9546c4645079fd58272da092f3c154018bfe96c","third_party/breakpad/src/common/stabs_reader_unittest.cc":"96294a1f8a8a0dd552eb0b16ec5ed35a858b18bc5c3426ca359634fa1079abce","third_party/breakpad/src/common/stabs_to_module.cc":"a2a02f114b081e1d56d75abe23b436ac333c53de04248178954afa2fa15066b9","third_party/breakpad/src/common/stabs_to_module.h":"0634f5da97fee06ac9a7f7d01f3204ad9c2dddbe366d3e2b1e38b3659b72bb94","third_party/breakpad/src/common/stabs_to_module_unittest.cc":"8b2ff72bf722135e812343096d7dd21d9763f445d2a68a2e56c1c02f75e52c0e","third_party/breakpad/src/common/stdio_wrapper.h":"e926270d63a363573464777070a66f090f8b51586890b9275aa9f532b907d54f","third_party/breakpad/src/common/string_conversion.cc":"a2c10965b9bb48842f4de6ada5a81a0f0c5d62767f0b959323b2a440c3f2d2ea","third_party/breakpad/src/common/string_conversion.h":"7c334411bd5f76b1cae293d0b4491b2506c3a59a26fb7cc3c6bd0c653a24e5f6","third_party/breakpad/src/common/string_conversion_unittest.cc":"fb2502b5b9ec7383d1ad6b7cc1aaa4bd364474bde113964adc8c3cf2406ee6d1","third_party/breakpad/src/common/symbol_data.h":"71802a7a8c2b98b9f1ca3c77aba56c3817650647996310bcce22c8cf8eb4b666","third_party/breakpad/src/common/test_assembler.cc":"dfa02980ad999eadb3bfd0f4dcf405a8209d6e5dc1b1063b64d99da3fa6d9fc7","third_party/breakpad/src/common/test_assembler.h":"f5614c1114c48b0b52f0f3c6288554a873e50e19054bf03da14210b1365639aa","third_party/breakpad/src/common/test_assembler_unittest.cc":"06b47c6362090c9a5c212d191a38f937dc9252ca5510a393d4bfe8c1c68ebdf3","third_party/breakpad/src/common/testdata/func-line-pairing.h":"416057383eba057eeaf7d4b72c3c83dda013ab1fb75620b999cc7eeeb89018b0","third_party/breakpad/src/common/tests/auto_tempdir.h":"c5ade8d8ef61956a378bb4668bb83a57d5a0ae80cb46a60fd0bb7f850d0f9949","third_party/breakpad/src/common/tests/file_utils.cc":"f4964d3af1c55df29e43b8494d415d76a3bc4ba1fb024ce9f68d3a727b8620c0","third_party/breakpad/src/common/tests/file_utils.h":"59ef1f3bb85bed7d0ea994d970174a07194eac9aac2b3cf2c815f3ef56159222","third_party/breakpad/src/common/unordered.h":"ce8180ccc583dd73430ed178ae61035b33b014d23e58f238e2773ed225006c8b","third_party/breakpad/src/common/using_std_string.h":"170064c76403e55d6773f686b8a6eeb5cecde452b786a5334f7285865c6db554","third_party/breakpad/src/common/windows/dia_util.cc":"f35b567f0a62bf3b812a60ccddcc17b28426c6defd8b961f2bc170d855300ccf","third_party/breakpad/src/common/windows/dia_util.h":"4e7641795f3cab4ad518ea07758a0e2cc11fa7488966ed62ca2e17d034aab65b","third_party/breakpad/src/common/windows/guid_string.cc":"c4f1063cacce0cc70296121845c0e7adc00c8ab066852c271bc4d17233327311","third_party/breakpad/src/common/windows/guid_string.h":"4e722631ecc7d45996f82ceb0255e5a29dc46ae07ffcb57b9943c54e77d5acdc","third_party/breakpad/src/common/windows/http_upload.cc":"647d43de0ea635384ac4d8c9595c72436edaf12f946810059b52a00a3abc28bc","third_party/breakpad/src/common/windows/http_upload.h":"966854ec67b571516324ebf65da7c7a3efcc8c0c1bfa8b43ed4570b87fadee8b","third_party/breakpad/src/common/windows/module_info.h":"655d1748e7ca2185bf1f147dc6e8350d3b602bdd6e372fd6cebb89afac187fbe","third_party/breakpad/src/common/windows/omap.cc":"68d99fd1325755dc1335aec3b5b4265badf96f7ab0a158ef6378c7c944e284c9","third_party/breakpad/src/common/windows/omap.h":"1b444519ed9965d7a05e1242c817048f524c04e86492d054a72cf9621db36ee0","third_party/breakpad/src/common/windows/omap_internal.h":"2e28ad4bc37db4f9ee50036888371920255e0d6feea837b03619b5e9de5d847a","third_party/breakpad/src/common/windows/omap_unittest.cc":"b989a27beee82e84f72cb2c23f1e9d0be2c39dcc8907379f6c0d6c35fca54b0a","third_party/breakpad/src/common/windows/pdb_source_line_writer.cc":"52ab748bdf8046b9d28e0afc55b59c659178bdeac3614cb2d378fdf47c09c277","third_party/breakpad/src/common/windows/pdb_source_line_writer.h":"e00156c40ad77571e98b8a8556585666828d6383010f6aa3f982699c289f7a37","third_party/breakpad/src/common/windows/pe_source_line_writer.cc":"0e89066757fe954c30dd8c3473a861cc518c172b3f1dfb1b1d65b468b859bdb7","third_party/breakpad/src/common/windows/pe_source_line_writer.h":"5dc26589740217f9b7f53b70aece80c106a773c3517d25d81fb3cc814cb2e167","third_party/breakpad/src/common/windows/pe_util.cc":"39e2ff4c57d06770e070a3ffa42da047444a8e4221cd6751513ef1cf675cf65d","third_party/breakpad/src/common/windows/pe_util.h":"63c2602fb08f91183b1d0b373a2af5eb6bc1ae5ce3fbf567be5e45f3a44019c8","third_party/breakpad/src/common/windows/string_utils-inl.h":"e09e3eaa4893d547a112694fabc531675dcc45e95298bef2e54fed3816fd8541","third_party/breakpad/src/common/windows/string_utils.cc":"4c269388cbd4f747069708a7a866a2817875669eb688d2dc34b6c85c9a757238","third_party/breakpad/src/common/windows/symbol_collector_client.cc":"74cdc2c73f082a8b2c4f2d163e0a9b8d9b36be7257cfa203f99eb37a4c6f0923","third_party/breakpad/src/common/windows/symbol_collector_client.h":"0824d57f8c3802fde6e34a4c42b35025d8963c728a15c85b55edb68506c102fa","third_party/breakpad/src/google_breakpad/common/breakpad_types.h":"411a65854a8dd1a0960ff0e3a7d47b5fa41bbcf5bbe874cf728d14bbf466be89","third_party/breakpad/src/google_breakpad/common/minidump_cpu_amd64.h":"3abebfcf069496fd2701e30da57b5059c4addb9959c6b594f8f520cee1584f11","third_party/breakpad/src/google_breakpad/common/minidump_cpu_arm.h":"35f855b237c728a83688fe7d5b4efb05481de815be867d005a4555fcf9c4606e","third_party/breakpad/src/google_breakpad/common/minidump_cpu_arm64.h":"20d9c1a007812291624fe009590530c581b713655a0080665ad06d736eded1c6","third_party/breakpad/src/google_breakpad/common/minidump_cpu_mips.h":"606a26e5b1734a9d0a8ed9bbf2c5f339d82d4e1a08fdade79aa6a3d0901fe15e","third_party/breakpad/src/google_breakpad/common/minidump_cpu_ppc.h":"d1fed2bb8a55f4bd0494013626d05134c66d4762c7201965996a63a921b48d29","third_party/breakpad/src/google_breakpad/common/minidump_cpu_ppc64.h":"c163eb6fc31de69e2725e03fa9c7f3036b7910e40430570a4468d5bdc7a8337a","third_party/breakpad/src/google_breakpad/common/minidump_cpu_sparc.h":"979882ea6360ae3eaa170ddc54d480b0af7f4d54dc2d1388e2dfef1899c5667f","third_party/breakpad/src/google_breakpad/common/minidump_cpu_x86.h":"8edcde736918f7c46bfb8335c2c0ca58e25cbfa8caacb030b92b1f21fc12bb04","third_party/breakpad/src/google_breakpad/common/minidump_exception_fuchsia.h":"ea13a27e562c7cd2a0c4e1724f26659ef1c7393d5564266fd76e65317b7af9eb","third_party/breakpad/src/google_breakpad/common/minidump_exception_linux.h":"7142fb4198f2d0398ddf5296c6c5a1c1d963c9a6e45e156ea67f947c34d636de","third_party/breakpad/src/google_breakpad/common/minidump_exception_mac.h":"4e71f36534cb2f9872e0e3f22fb3175a953935cf55fefd2560d42d845b2f6962","third_party/breakpad/src/google_breakpad/common/minidump_exception_ps3.h":"ed68cf2b61a0d69c2515fd47d43aa0179993aaf90dcfce8dfe0b745b7155bb9a","third_party/breakpad/src/google_breakpad/common/minidump_exception_solaris.h":"97318a36356f71d01301e71e5b34211cba7a16255306a2030fa0afedde9dee38","third_party/breakpad/src/google_breakpad/common/minidump_exception_win32.h":"85e7e33f6cb5d8de4487368c005d4f4d5e3641cebe261773a7cc1fbaa5c4269f","third_party/breakpad/src/google_breakpad/common/minidump_format.h":"18c0ab57f51d9329d27404170664e66fb63429d275ad828c9fda098b3fb21ed3","third_party/breakpad/src/google_breakpad/common/minidump_size.h":"d1aaebacf891ed812139c60bad73733f939be073a0256d01f8255d5785cd9fa8","third_party/breakpad/src/google_breakpad/processor/basic_source_line_resolver.h":"535eb1f9e6bf4c52403dec6ee991c4b673a90b6d7f88c7950cdee15ec394280b","third_party/breakpad/src/google_breakpad/processor/call_stack.h":"ddd0e689ecdaaa750bcb7eb71331fe4e124e1e64f5d2c8de8d0472a887c6340b","third_party/breakpad/src/google_breakpad/processor/code_module.h":"c575ab8e3f6ce3a6f207c1457f5753d6cd45c516fc0cf790e16852831a871168","third_party/breakpad/src/google_breakpad/processor/code_modules.h":"06a4c7bdbdca4f688c7fe15f5937d57102acd2ba13510d7bd765002467ef9a29","third_party/breakpad/src/google_breakpad/processor/dump_context.h":"69934fd511c7f5f4ce1a541494a96d74d2953bc5c8e8d80047944b3ca3b49ea6","third_party/breakpad/src/google_breakpad/processor/dump_object.h":"6a8d9b43cd7e9526a603b44650b61f291146f175019c176b7ac058e5374297b7","third_party/breakpad/src/google_breakpad/processor/exception_record.h":"1fcc6f90b86668b0c736dc3b523928e1b7ebd0892768c3e76ef600d571d7df28","third_party/breakpad/src/google_breakpad/processor/exploitability.h":"9d385ae4a0c1d77db9e2f7d4cdb768abcb66eb70f33320e1247fba8695dbbe29","third_party/breakpad/src/google_breakpad/processor/fast_source_line_resolver.h":"a7ad90bc403094a37605da21c3e86b317daf5790f66cd8f6a2889322264eb982","third_party/breakpad/src/google_breakpad/processor/memory_region.h":"27014402fee60106284894e4afddf1975e1a403270cc280d41b42e48435af867","third_party/breakpad/src/google_breakpad/processor/microdump.h":"1406af8bfa23c9873569d9dec30d3524db3bbddda60af7e8a34bbe98e8d33c2b","third_party/breakpad/src/google_breakpad/processor/microdump_processor.h":"79ffb244493d160e04b4feaadfb95aaee051e52c739f8daf682d8e17d26b71f6","third_party/breakpad/src/google_breakpad/processor/minidump.h":"d5e250a61c461d1cea6ef1c1fd7caf181950778ce1945380f4950756e69f503c","third_party/breakpad/src/google_breakpad/processor/minidump_processor.h":"645a171373a4b305339596859d023ccb4d0236c532d1ffdfd491398d025b2366","third_party/breakpad/src/google_breakpad/processor/proc_maps_linux.h":"6dd41a3cb695a32d29be459baa0dd7501fe80cc5e795c1491526020e3cf66660","third_party/breakpad/src/google_breakpad/processor/process_result.h":"23e412e78937b3531ad5f87823c492f7f8a7b9746c2255fa136b1468743efb8f","third_party/breakpad/src/google_breakpad/processor/process_state.h":"25f417b2cd189d59c6744476ba3b215a138216cf98d0d044ff4a32fd56c13a52","third_party/breakpad/src/google_breakpad/processor/source_line_resolver_base.h":"8f884186f7ac6061f989a7683189cea8a61816d20a6bd1275b05febee07ef0a6","third_party/breakpad/src/google_breakpad/processor/source_line_resolver_interface.h":"13ff836fe8e35d9213d0607019e16128d0fd202b5b17abdae5c724b7ba988e6f","third_party/breakpad/src/google_breakpad/processor/stack_frame.h":"b978e84d242761ba2ccf92ecd1fc5dc63b4b656f42a9268c35220c085d63846e","third_party/breakpad/src/google_breakpad/processor/stack_frame_cpu.h":"e7c50fc9ff297954c4d190177e0f3a6d29598860195c262348bf9f4aade27cdf","third_party/breakpad/src/google_breakpad/processor/stack_frame_symbolizer.h":"c8775eaa032273afcc2aa7d689c7464000451035486c5cc84e7a602a96c4ad17","third_party/breakpad/src/google_breakpad/processor/stackwalker.h":"58fdab91deb00c19e037ab9057108c486fb525c1565dc4e917ed8abf16576fca","third_party/breakpad/src/google_breakpad/processor/symbol_supplier.h":"60658dd90a8f8f7c01f652f2bbc3b8e56dd7914fd33fda171ed283c192297253","third_party/breakpad/src/google_breakpad/processor/system_info.h":"679949dd81147a27efb09a0eeceb815b8399eb1b0ad29e003d22d73adefa4427","third_party/breakpad/src/processor/address_map-inl.h":"3cfe027e767ba94d13210e125dc4c6461be3e83e6be7b609346d8e2251b536fd","third_party/breakpad/src/processor/address_map.h":"1e90552e5b55ad3ef17f15db06186fc9709bd94747adb6374410458f160f1bbc","third_party/breakpad/src/processor/address_map_unittest.cc":"e51399ebbc77b40700d77124a814bc1dee6ff9a9da4debbb58945d3cf731ffda","third_party/breakpad/src/processor/basic_code_module.h":"436e375a2b6bc0549eaeb3a565d7a9292de11039ceca53f1b86246aab8f4d631","third_party/breakpad/src/processor/basic_code_modules.cc":"c2bcfc90a28fc08f4373c2524e46f6b8c019c4a7d73dbacfed768715b5f147b5","third_party/breakpad/src/processor/basic_code_modules.h":"60a153f968bbad287577e886256e39e901dd86403edae75637d9915ec95221e4","third_party/breakpad/src/processor/basic_source_line_resolver.cc":"6a07ca6326611a684a83f7b8795647a297a51d8dd5b12e680d7f2861acf0da58","third_party/breakpad/src/processor/basic_source_line_resolver_types.h":"83e64eab8c2d70cc61c3042c482d0af2b5b34566129717710a254e53cfec58db","third_party/breakpad/src/processor/basic_source_line_resolver_unittest.cc":"403b5bd5f2b2ef17e591e77f4642745bc864de9ed7191c02668b201c3f121f82","third_party/breakpad/src/processor/call_stack.cc":"8344c30641916df46029b4eaa08bf2e59fc74977378a575d0a0820429db2c569","third_party/breakpad/src/processor/cfi_frame_info-inl.h":"093711042423bb6f616895e7b027d449d1d4d0146f460674afb1989b2f4bbbc2","third_party/breakpad/src/processor/cfi_frame_info.cc":"270fba448dfb405c0ffb0de5c4ba3765c8484b4147e04bba237828badb86745c","third_party/breakpad/src/processor/cfi_frame_info.h":"aae8995c53d9bb5fdf187f1356e6ee2eae45232fc4947501775088ba00ae9720","third_party/breakpad/src/processor/cfi_frame_info_unittest.cc":"195facf21078962307b290ed2a63484f76b2011815d6a0bf783abee9f7ac7ac3","third_party/breakpad/src/processor/contained_range_map-inl.h":"0a3b5ca6fb2256f267d52886b4278286fa37fd60ffc0f4d0290f5d119ec7367a","third_party/breakpad/src/processor/contained_range_map.h":"a60cda1e12aba3dacecbb08fdae3fd82dd5569cb640871d4da61b6dccbd14f02","third_party/breakpad/src/processor/contained_range_map_unittest.cc":"b4361f876dc42fbbd6c5387cd169b14d528d1f1a74bd2b04713ddab6c5ffa2f1","third_party/breakpad/src/processor/convert_old_arm64_context.cc":"a4793abb3e66f62d7d2e27ace011ed7899412cc4cb03f392fdd9d124936ed5b9","third_party/breakpad/src/processor/convert_old_arm64_context.h":"b1d9c55d3be50e1a7f7199a996d586a91e766020970d055cac9231e87e10ad9e","third_party/breakpad/src/processor/disassembler_x86.cc":"60a00705d98433acb9c1ddf2cb9ca95cd21887752d97fdb6e689036a17e4b442","third_party/breakpad/src/processor/disassembler_x86.h":"6a3d00135cd39a05b13b73b05bfec6930172053d2d0ac01e61c6ce8052262638","third_party/breakpad/src/processor/disassembler_x86_unittest.cc":"c2aea2c8a9b147cf7da8e89f3dde255e4abfa29bd8014283d12a30cfb4b6aa76","third_party/breakpad/src/processor/dump_context.cc":"969a866e11bacfe1c5a0df13c013005db238e16e731452c7ed59e2d1e1eabc65","third_party/breakpad/src/processor/dump_object.cc":"a60961e3ab6fd931e488ba9e8582ea5b6e938bf8a7c55ab6dd4a07d9d190f675","third_party/breakpad/src/processor/exploitability.cc":"3928a40855eb2f0c6229b452b9c494ccf5a8a347ed54e4a85e82dcbf7271164a","third_party/breakpad/src/processor/exploitability_linux.cc":"20c0b2df9f577d67dfa75c6f306f5d2c95db37860d917dc78c40fa7f66b6d36e","third_party/breakpad/src/processor/exploitability_linux.h":"f5160e6114ef03dee9225e904a36e223bf9caf68f900aad3dc1ce351e43a6315","third_party/breakpad/src/processor/exploitability_unittest.cc":"2a2a2d76a55204879bd7f9d521cbdaf0a49c15a34bbd1fb4fa5d604be804645a","third_party/breakpad/src/processor/exploitability_win.cc":"791baa80e46c0d3adea4c2c07f80db714838cecbea84157777104b4d0ddefb1d","third_party/breakpad/src/processor/exploitability_win.h":"60db51c8eba57fb9346fe1c7e4a16332d87da429613b3a75b0ca717f998d50d6","third_party/breakpad/src/processor/fast_source_line_resolver.cc":"afd6973dcb36c2290634c4b9eac368ba936a21c660a056917eff4cd7b6f4c44f","third_party/breakpad/src/processor/fast_source_line_resolver_types.h":"9e9cfa144e93011e55ffda4ee5f402b6735f41f8691d11dc50faf6db9708a28e","third_party/breakpad/src/processor/fast_source_line_resolver_unittest.cc":"ba2b3d04cc385b5886c5970fb35e117e86e55ef2377f432239f8cd09b5d83d73","third_party/breakpad/src/processor/linked_ptr.h":"e9d530b062b7b4c9a2b4be9112cd529d4584d6cc5b1e1a401f52d68e1c8609e4","third_party/breakpad/src/processor/logging.cc":"68e2bc97014467a8ddfee16a0980bc4e5cf5e134295a036b4586006377c9e72a","third_party/breakpad/src/processor/logging.h":"3a95097da0aaf7cf44b967f907ffc7fae9ef941867438e492e83d15d0696ef66","third_party/breakpad/src/processor/map_serializers-inl.h":"d73077808a70ec1e1ce24b866fcb6f96230c8b42233a10d1e7392a27acc2d511","third_party/breakpad/src/processor/map_serializers.h":"eeed4a573011fc1b7333ed3aa5e16320a8d66aebb6f4172fc069f48d02efcf59","third_party/breakpad/src/processor/map_serializers_unittest.cc":"25354690956e6b9557d84d6dfd484c6a58b282199c6eaaba640d92239050ef5b","third_party/breakpad/src/processor/microdump.cc":"602114cac6809ad8460fe719c3a981bf0ac887afca745428b2c623358fa4d028","third_party/breakpad/src/processor/microdump_processor.cc":"5571dc8e6a09c71be17bc220d31caf6bfd1a23afc46eac7d865362cda91cbe7d","third_party/breakpad/src/processor/microdump_processor_unittest.cc":"15cc21c48855de2726d315df40a02f9e5269f0eba26efeb67d2efc435a627705","third_party/breakpad/src/processor/microdump_stackwalk.cc":"a068bb54509af303ac0e2931086d58266c783b1fe0cb4070750ee9f185953c7d","third_party/breakpad/src/processor/minidump.cc":"11e46b8641b4d36f9f87002900f880c26d8a5531c5d23f9b5047276dab50b567","third_party/breakpad/src/processor/minidump_dump.cc":"70388d839562d5de0ad4bbc62fd5b10bb5bf167a54677930503c88c002b5d731","third_party/breakpad/src/processor/minidump_processor.cc":"8136f202082d4e70399f690056f31c73318fe5a4c522c6c532ff56997991fbf0","third_party/breakpad/src/processor/minidump_processor_unittest.cc":"ab73408a5b3bae58d62364531bc1345d15d231de5745bd654b9db526db597873","third_party/breakpad/src/processor/minidump_stackwalk.cc":"c3ca9511d6e484b910777e6178308532b2030266bbb614a8835738d1255a62cf","third_party/breakpad/src/processor/minidump_unittest.cc":"f51126f8331c75f99e62727a0c39a3e370afa1a2f0ed4755553f2f81d12137ff","third_party/breakpad/src/processor/module_comparer.cc":"454f7a22a5c40eb293a03714db2e43c6b0ee527bf892a9b45d738098dc47e967","third_party/breakpad/src/processor/module_comparer.h":"dac4d7fb501f379f1f9f40b37a4ce33ad70b2f08e2de0b660765021dbc149136","third_party/breakpad/src/processor/module_factory.h":"f944c4fbb9b87180fc6a72445cb079ed31085cc93cc4ee65d5c22551d6a2a446","third_party/breakpad/src/processor/module_serializer.cc":"08e27fd278625d3013034fde63f20996279dbb1c7f625d42909b7e975bba67e2","third_party/breakpad/src/processor/module_serializer.h":"740604df66fb5df4b263cf72d140e5debb92c4b3e8cb17c8b12d9d3f479bb43b","third_party/breakpad/src/processor/pathname_stripper.cc":"4ca1cb6b4319dbe02d5b69c31060416d0201c61c397cd9854b6f114f29e63062","third_party/breakpad/src/processor/pathname_stripper.h":"8d9341c8e43dbcc9f2da4cdcab3f2f706648369f454b8409478da0828c23f0f5","third_party/breakpad/src/processor/pathname_stripper_unittest.cc":"5a69d18b19a3d7cf6fdd7e76f2878d33b2b2bf17cdf66a391be3eb28627a7faa","third_party/breakpad/src/processor/postfix_evaluator-inl.h":"dabd1663fc6f951b2af11d9a56f8975e518cddf0225a090a2609d4577fe1873c","third_party/breakpad/src/processor/postfix_evaluator.h":"c6524901b30c84daff1a71cdfb83046254bd9dea5a567158cb74591ded75b84d","third_party/breakpad/src/processor/postfix_evaluator_unittest.cc":"57e3313bf18e4fecb28442a2f19c7303df140c8fe8057423b5a842c10d906ee8","third_party/breakpad/src/processor/proc_maps_linux.cc":"06b8da6a0926fe30aa098192eb45906c1f1f524d3280da993eef0d6138dd543a","third_party/breakpad/src/processor/proc_maps_linux_unittest.cc":"30d01141d77c31cc1fff4792c9a40220ef9bdb23fea49dfd56adcc11dd9d788b","third_party/breakpad/src/processor/process_state.cc":"ad57d8546cb95145241ef1a24205ff90e09b2e1c0e5ad12c871be75a7dddfd72","third_party/breakpad/src/processor/range_map-inl.h":"083eeb367197c210d525cbbcc6f8f4f906bd3f8c03803ef3fa458b02066ce156","third_party/breakpad/src/processor/range_map.h":"cf31698fc1d0888186f6dedff86540d83e3640dc71ed0a6948cc855cd9136c05","third_party/breakpad/src/processor/range_map_truncate_lower_unittest.cc":"62a5f8075cea7165d3a8614125280b3671b4a270325fcdbba8f973eeabf176b1","third_party/breakpad/src/processor/range_map_truncate_upper_unittest.cc":"ce96497d0a2f214e0046bc808b4e8db5eb8211160f2a4f3b97cf611e48a29cd7","third_party/breakpad/src/processor/range_map_unittest.cc":"a7154e403178356ac5a9453264ab3cec2ff242e767d59c084a542b31a6a98423","third_party/breakpad/src/processor/simple_serializer-inl.h":"0cc31be6fdc954f78f8b07173e3e8bb0cd0a65b8b8435cbc9e8c09606a059684","third_party/breakpad/src/processor/simple_serializer.h":"0a9777e375241a97c1155f15c220975cdf934786552c88346793974d21d18716","third_party/breakpad/src/processor/simple_symbol_supplier.cc":"ea765bc863e98d0d789682663150ea4d5d1e7758fd6eb9575cd6f45e544cc14b","third_party/breakpad/src/processor/simple_symbol_supplier.h":"bfab84bd8c08870420810be4bec707f26f900aceb7981fa2b4bdbde974b9c5eb","third_party/breakpad/src/processor/source_line_resolver_base.cc":"057bcf79e5d5169cb67396c90e1814c154cd61d17b8d5c70fdfb465046437014","third_party/breakpad/src/processor/source_line_resolver_base_types.h":"881ac5ebe504b93f42aad7abcef7760da8450d6f21967aa3948ba7a2030c36db","third_party/breakpad/src/processor/stack_frame_cpu.cc":"d0db1b9ddf2c695c716358e8710dc1b33a3a6f6e2bb9113b01e5d617a4d54a56","third_party/breakpad/src/processor/stack_frame_symbolizer.cc":"217215cd397b2c915a6adf9b7ac43734d1c2bb3ff1604f914c518813b6e543e4","third_party/breakpad/src/processor/stackwalk_common.cc":"5f78f33ce803c6040496951c9de36623e29aab5f612f14f38c67e0e20fdc1eb2","third_party/breakpad/src/processor/stackwalk_common.h":"02b38a0a31c3b1f76e159c2ae2b86af78f2e223c9547726a84d49ef3a926a4b1","third_party/breakpad/src/processor/stackwalker.cc":"4acc0394b9043bfb223a26b3481cebcabcc356c61e764c0f041a3872460b40fe","third_party/breakpad/src/processor/stackwalker_address_list.cc":"d2d47a3b673503c5bd594e6ce56c49e78d50f198bc5fa765c76355c871475e3e","third_party/breakpad/src/processor/stackwalker_address_list.h":"9f2fa8ffce2f4dccb243d660c57ce790f9dfae6429edcd2052cec488acd8d44a","third_party/breakpad/src/processor/stackwalker_address_list_unittest.cc":"f2f099e0e41cb935b194cb3b3722b2f210d9e335c9e2ae5de489d6153c459ebd","third_party/breakpad/src/processor/stackwalker_amd64.cc":"cb39c1d91d73bdaa9937cb1392d1bcd6c83e7e3bfb4ded6463cf5cd23ff326b8","third_party/breakpad/src/processor/stackwalker_amd64.h":"800b53dcc958e2d05be4bf2550b4ebaf9ebbe32fa0843bc433f1d4c1397201d9","third_party/breakpad/src/processor/stackwalker_amd64_unittest.cc":"55c7d27274bf6fd55f3ca52bf217291ca00ce8923437708cf535c394f89517f6","third_party/breakpad/src/processor/stackwalker_arm.cc":"dca344dc5d272a9f6a1e17584b550ffc83006f0d881a006bab26914cb22bb685","third_party/breakpad/src/processor/stackwalker_arm.h":"1f87b0ab404c576d9b9a5f8e3efae79964ea3c8120b031246a121faa62cd35fd","third_party/breakpad/src/processor/stackwalker_arm64.cc":"6b7f891f9915f6e395552e709412420e3a10d3b96cb44bc22687696f92824597","third_party/breakpad/src/processor/stackwalker_arm64.h":"28bcb95ca558f0d861303d4aa8ff39042b9696eea00edfebc6ddecb31c299c77","third_party/breakpad/src/processor/stackwalker_arm64_unittest.cc":"68419c9540623ef8f2f2448841d5b35c1a835aeb6724b91d1e7853c126087b4b","third_party/breakpad/src/processor/stackwalker_arm_unittest.cc":"c90f601c9175371f8044eac8b3e22301083006c4a17ab46005210f5c00e5d9db","third_party/breakpad/src/processor/stackwalker_mips.cc":"84ef0b1d97221453945a6fca19d14678358a5585e10c7548f456816e26b06570","third_party/breakpad/src/processor/stackwalker_mips.h":"524f9b754bede75dde1754c7887ff9d12a786b3481eddd8aa878287ee844d836","third_party/breakpad/src/processor/stackwalker_mips64_unittest.cc":"8ccdb89f9971e6e10c3320293cf1b8af4e6d46a7c24661bc6c13a3360ae3f865","third_party/breakpad/src/processor/stackwalker_mips_unittest.cc":"452c2c82a163766922b26683d58aed8baf63e8b5753652e13e02ead31ffb4613","third_party/breakpad/src/processor/stackwalker_ppc.cc":"fc7feb68f7f6902d3e4fa3f1a39a247decf370d25fdb6ec04decb9f047f58a48","third_party/breakpad/src/processor/stackwalker_ppc.h":"f2a493111ec9a06eeb9860f85ac22d194030b42b926d1c7b80a80da993232966","third_party/breakpad/src/processor/stackwalker_ppc64.cc":"953591320fbb038097723ce88799cf241f441249f7f23618c98f4841ed1fc7c3","third_party/breakpad/src/processor/stackwalker_ppc64.h":"17fa46e53a36aadebbbbee107f92f74acfc764e0ef1501b3a02ae29a34c0525e","third_party/breakpad/src/processor/stackwalker_selftest.cc":"5ca75e7bcef6cc422143614107af6d5152b0b61b1523c77be77db66ce9d9ade9","third_party/breakpad/src/processor/stackwalker_sparc.cc":"03e9da7505f9d3880184af9d7d8bee3079529b40f8463e5237ae82245d644a00","third_party/breakpad/src/processor/stackwalker_sparc.h":"911a95de682b6148bdaa67d007cb736a8306754ffbf8b691af04d13b055fff3f","third_party/breakpad/src/processor/stackwalker_unittest_utils.h":"bcd46e9b41a21ef59f1ddcf5b33f3efc49522f0608537c7cfac9248b63997f63","third_party/breakpad/src/processor/stackwalker_x86.cc":"e7b3a5bda5d73739a658a00b7c3ca79c1f07252182c5d397e558fbd41f932c30","third_party/breakpad/src/processor/stackwalker_x86.h":"12469425b2e654a872ba401fccd9ff3c98a05607d582768c8972474600b3f62a","third_party/breakpad/src/processor/stackwalker_x86_unittest.cc":"6b51d4efd107d135cb1d7da767ffe2ce5a9d75a6189e0bfb573cae02f67bfde6","third_party/breakpad/src/processor/static_address_map-inl.h":"4b0803d6791fe20d0770bd13b40ef5b8f2676b599f9295cf61f1912ee3a8aec0","third_party/breakpad/src/processor/static_address_map.h":"cc0ce5352d2fc6b0294ae69dd70ddff5ed5a44aa7e5d37b335e29287448a6163","third_party/breakpad/src/processor/static_address_map_unittest.cc":"b10664669a3b6b514c4201a05d9c19310193c0f67750ea0994a0320c2bcfc98b","third_party/breakpad/src/processor/static_contained_range_map-inl.h":"3dfd4a8a0c23656834d427a30ff4c600e8ebef77825729010475b9ca9478ea0f","third_party/breakpad/src/processor/static_contained_range_map.h":"f44440409ae712e86aa17c0e4cfd4f0afbf47da6a5993e3dbb12e8712ebfb4f9","third_party/breakpad/src/processor/static_contained_range_map_unittest.cc":"eddda66993953fa6d1a5fd71e7842f39735d905ea3e169f156cf3199f76c8aa7","third_party/breakpad/src/processor/static_map-inl.h":"ee808c62ae52f26fb0b99af3295027e1a7ca8f2ebeea0177c44260b4a133d550","third_party/breakpad/src/processor/static_map.h":"973ebe49c2112f2a2e7c36ff9b0892cffdc55f7240de123a60d8beb75c731418","third_party/breakpad/src/processor/static_map_iterator-inl.h":"0c818364f525ee58284c4b33615a1494fe37965ffc207f5bef77995a7e3ea967","third_party/breakpad/src/processor/static_map_iterator.h":"8f62e357423384f6d398a54dd9d2a4800ce357f57d897c49987f2fa53e10c565","third_party/breakpad/src/processor/static_map_unittest.cc":"a8220f5207d233ec2ede5e43264f0e79478315f8fc017332ea3514d8a2799598","third_party/breakpad/src/processor/static_range_map-inl.h":"7073fa7f02bc5fcf684a4a00940cfc7ee372c91ec5f01b562916c37e5733b1de","third_party/breakpad/src/processor/static_range_map.h":"79cce076f613571d564c855b250da79469589e98076dd48e0e076ef5e4fa4e98","third_party/breakpad/src/processor/static_range_map_unittest.cc":"e5e10e28c3ef5271cb8f8fb9dd8db5d48b6097dd6ecfc1b531300faa587d3161","third_party/breakpad/src/processor/symbolic_constants_win.cc":"393083424e56b978ceadd1fd8e0b850a7c242be7cede3577d634e741d713d225","third_party/breakpad/src/processor/symbolic_constants_win.h":"fbb8d530efe1401fb03060c9da0993f2a6e2ade36526d4a1be02a216ac94eb38","third_party/breakpad/src/processor/synth_minidump.cc":"4ee3f3fe4f9da4007d7443bc6c2267c191fdc68348b95dccff4db18eb4645079","third_party/breakpad/src/processor/synth_minidump.h":"bbcf357fddcaccf97c2ae05bc7bfc93dc506e1fc89299281a4d0ec01a2be6d9e","third_party/breakpad/src/processor/synth_minidump_unittest.cc":"d3b577c7769c7742ae55293394fa286cacdb0e8930d6b79b54c18091e824d8df","third_party/breakpad/src/processor/synth_minidump_unittest_data.h":"c6393d736331d20322de11a4f7cf726279b033000202a71b7ab398e8dc1011cf","third_party/breakpad/src/processor/testdata/linux_test_app.cc":"33307f743b59803257450a66c4774ef443076b2facfb674d37f687111d9a7d2c","third_party/breakpad/src/processor/testdata/test_app.cc":"a62615880a993eeedb49b4ee0cf830f9e165fb8ed53a68000b60a0c48b5ad60f","third_party/breakpad/src/processor/tokenize.cc":"4efb2c39f1febc2fe4bde6a8d2301e513bdeb14d9f97514878f1a3ff9880d84d","third_party/breakpad/src/processor/tokenize.h":"1f2b956d6872c521b34f677db030a3d89a105d4104c49d4d465697189baadb12","third_party/breakpad/src/processor/windows_frame_info.h":"3e32345599950424c0b5cd8ab0575c8926ffb4b0bf3160464dbebae6eac0535c","third_party/breakpad/src/third_party/curl/curl.h":"53a106ebc1dfcad15f35a3649659e7efeb6197a28240e0575f69b1d400425072","third_party/breakpad/src/third_party/curl/curlbuild.h":"c16db33438ce8838b72ea4b13953dcab0f826f6dbceaaf303f7f37c91b841d25","third_party/breakpad/src/third_party/curl/curlrules.h":"7ac29c3e959ecff7e236e9fd7703c18eb8702b2086c49de81fba91487409aa93","third_party/breakpad/src/third_party/curl/curlver.h":"57f03235adfc526a2b9c9b46031fd46f6e0b9c684515e6c9abfd472a76ebaee8","third_party/breakpad/src/third_party/curl/easy.h":"765cf290fc168d65be0baae6c380a30516eeed94014e804de1b1b6e3884ffc9a","third_party/breakpad/src/third_party/curl/mprintf.h":"570f692f2967f1dfc8238fe94bb25b87b3d2af8951bcc8a7ddbaf2105295fb09","third_party/breakpad/src/third_party/curl/multi.h":"7211dc714191c562254b8eaf4a6d0ab0221ced9024b6adc62eb43a9ba88f9e97","third_party/breakpad/src/third_party/curl/stdcheaders.h":"65e24cce8e2b01d64adcf92987c591ca475a4a2e5e8aa7da3a1abf7adc83c587","third_party/breakpad/src/third_party/curl/typecheck-gcc.h":"146e37a1f4bb7c88e58d7854226a3b76465efe6b36a4da535958618a25aaa22e","third_party/breakpad/src/third_party/curl/types.h":"b5f437d012505d55e4bd08c6570952d86e79b43def7f9ede8989ce5de652cac7","third_party/breakpad/src/third_party/libdisasm/ia32_implicit.c":"b2dec053fa59fe5e639025145b2e2612fc0139671decf2f0b22e96af5d601847","third_party/breakpad/src/third_party/libdisasm/ia32_implicit.h":"3894d8d338d3557745a8bcf0b776b2b0b387518014ad7457d87d3a36a7076e33","third_party/breakpad/src/third_party/libdisasm/ia32_insn.c":"567ee4c1b3fabd3b72da2611a8195ca76e560d6708c6cbae56a0b9f34650e217","third_party/breakpad/src/third_party/libdisasm/ia32_insn.h":"775fda0a6ba4c26710912ce583e76182ea059e4d0034ad931951382392434c63","third_party/breakpad/src/third_party/libdisasm/ia32_invariant.c":"fcfb7701cf56e1b7b20b703fa6d4ab554c40b1f4d7cbee4778bb7381351b80b7","third_party/breakpad/src/third_party/libdisasm/ia32_invariant.h":"937fe7cae76d15144d2af011a31ba146999959a681f1133d93eadec331e8bdf0","third_party/breakpad/src/third_party/libdisasm/ia32_modrm.c":"f84df147f41d16554a46e827619d9ed5540362377da7defe18c0e060f6474f36","third_party/breakpad/src/third_party/libdisasm/ia32_modrm.h":"42b3cd60b1657c076fbb85793d9bd6e6df71f45486970c76aff7def7c045219c","third_party/breakpad/src/third_party/libdisasm/ia32_opcode_tables.c":"a3d45b4a832a020c66713ede2b0c2d48afe03ed7117f87aad1637b2999c71028","third_party/breakpad/src/third_party/libdisasm/ia32_opcode_tables.h":"d0fb4ec036af15737916cca35df066dbfcba26e9e390323d930b788d75cacf4e","third_party/breakpad/src/third_party/libdisasm/ia32_operand.c":"a18c7391f4588de392c24f681ade59c00678fae3f62e33228243b9eea839fb24","third_party/breakpad/src/third_party/libdisasm/ia32_operand.h":"2e420bc3feead1935403973f1dbc340962025f6648eb109c6c57fe87300b8b43","third_party/breakpad/src/third_party/libdisasm/ia32_reg.c":"1ce2bff71d4568e1e97e0aeca27f474d8d6de4450423c2901fd4223fb6ed833c","third_party/breakpad/src/third_party/libdisasm/ia32_reg.h":"0752959efd00ef9068c56a5ddf15bffd0d03b93ff78b2c61325df38722f6a561","third_party/breakpad/src/third_party/libdisasm/ia32_settings.c":"979ce9bf7e7cd68c16d8cc3277794193e0111683a7af85e5fe50944eae605e18","third_party/breakpad/src/third_party/libdisasm/ia32_settings.h":"e47d81835ac2df4cd0c26f6e8cbd7bdfb3c5442f372c9650aa3d369c7b8b8622","third_party/breakpad/src/third_party/libdisasm/libdis.h":"2e56c95c7aff02285c9f087c72394780b395ead420f87cb74dd3bd4bce76af04","third_party/breakpad/src/third_party/libdisasm/qword.h":"42e7c70bc0da5f4fea0c4fcc825deadb9cabb18da9d8b76c96de7bdba27c5526","third_party/breakpad/src/third_party/libdisasm/x86_disasm.c":"df6561a4d5d938039ceb50d85c4226425e9b75ffa57c4a5b66bb29ba12c08a6a","third_party/breakpad/src/third_party/libdisasm/x86_format.c":"cd743ae41c3b06ed6db3780aa838433778ee2c44a78d55077253ba3a57fde7dc","third_party/breakpad/src/third_party/libdisasm/x86_imm.c":"8f87088130c9f03d5df4e98a13ce0054cc07b3084eeddc6636d2fe65b3c8b78c","third_party/breakpad/src/third_party/libdisasm/x86_imm.h":"9038d732536478bcc9228c8a90f36501103b9b93cc9c3b90425ec12c935fce63","third_party/breakpad/src/third_party/libdisasm/x86_insn.c":"918998dbd995d85a6a62ae4d7e5d6e5c924238ecd7ecce7384368e8eed50b207","third_party/breakpad/src/third_party/libdisasm/x86_misc.c":"b065daecd972303185c6efd71bb130d37dd318c1126c27560870594bd14abcd0","third_party/breakpad/src/third_party/libdisasm/x86_operand_list.c":"80023add8c2e98a897c252abf721d18ea1e0c2aba9b0fa7cbb915c106b65d413","third_party/breakpad/src/third_party/libdisasm/x86_operand_list.h":"27f505b949963e38fa1e401ac8e1037639df27d37dc12f46f15eae7f52cc5dc0","third_party/breakpad/src/third_party/linux/include/gflags/gflags_completions.h":"132240699e9c69a4a28d631917de4f630c7137db613479872a8f7da48686beee","third_party/breakpad/src/third_party/mac_headers/architecture/byte_order.h":"ee77544c1facd0553c8c292e07894b8603cd0bbfbf352971c1b6cce9a24596d5","third_party/breakpad/src/third_party/mac_headers/i386/_types.h":"3fc513abaeb935ee1eea600902b806e9ad7825e7200cef6493b2181dabad2f2a","third_party/breakpad/src/third_party/mac_headers/mach-o/arch.h":"45d2cb589fb714f2d6060593d3d9f6ca650c63e8581013f7377fd3a4de221490","third_party/breakpad/src/third_party/mac_headers/mach-o/fat.h":"c113bfb188e1309a138a90e4dd711339d84612742ded1dc52d9e137c8e942db5","third_party/breakpad/src/third_party/mac_headers/mach-o/loader.h":"c9093a78f58d15feac1b2ee362c3e13ea50d13640aff66e2025d62192f6f2816","third_party/breakpad/src/third_party/mac_headers/mach-o/nlist.h":"a8a71623bb861ad056c1696c9ac235420cb72747832902bde04bfc47b398d54f","third_party/breakpad/src/third_party/mac_headers/mach/boolean.h":"97bc5ca6793ed2b32f9da976760d5afe479b261cac635cea8fd9828c072edb31","third_party/breakpad/src/third_party/mac_headers/mach/i386/boolean.h":"e9b0ebe5e1c39fd911b7a1ba3f5c94822e1f754872957855077c90402ef6094f","third_party/breakpad/src/third_party/mac_headers/mach/i386/vm_param.h":"87c3ad0acbc46ba7bd317f7cccbb0905e2ba516503c275a209eee90b026650a3","third_party/breakpad/src/third_party/mac_headers/mach/i386/vm_types.h":"b18c0e719fd2b501204fb6073bdf33a77cc78aee6a26f32c6783d427a540a9c6","third_party/breakpad/src/third_party/mac_headers/mach/machine.h":"b24722e1455b1e664d4ab97ea8a930e62a3b7f5e63622b058383502e980c9952","third_party/breakpad/src/third_party/mac_headers/mach/machine/boolean.h":"d76306f15931d064cc05ed08c9648c1a143e40050f7ae8c847010a42edc3d9a6","third_party/breakpad/src/third_party/mac_headers/mach/machine/thread_state.h":"17a0167a74f30541307ae120c61b1355a4fc4a673c950756714e5211fa2991f6","third_party/breakpad/src/third_party/mac_headers/mach/machine/thread_status.h":"f31b2bf2d153c04ebade1c5cccde054c4db6d2376b201bf6e31fe301c477f5e8","third_party/breakpad/src/third_party/mac_headers/mach/machine/vm_types.h":"258b3a7306331854f194fca93b222e7d18ecfa4789e05ed8d87b534d3ea2fb05","third_party/breakpad/src/third_party/mac_headers/mach/thread_status.h":"1bb5236de4d3fdea185519f4ca3a812d033b5b3d9b7452d3dbf60d9a0810c182","third_party/breakpad/src/third_party/mac_headers/mach/vm_prot.h":"6277c315ebc5df7d169715c201ad99df17860198248858dc0ecc21b3e316b641","third_party/breakpad/src/third_party/musl/include/elf.h":"dc0da522cec7d0b1387af8921ee2c2236a63b13a60be5cb026dfedef3e5d75bc","third_party/breakpad/src/tools/linux/core2md/core2md.cc":"007563ad4b8b6335e4bae6be6c7a6941a6c74a4ba411ddcc78050baab94d9384","third_party/breakpad/src/tools/linux/dump_syms/dump_syms.cc":"2b03e8dae9d98c7df0dec9b7c24c64982a0c4a9dbffedc2778ba0e8a27015716","third_party/breakpad/src/tools/linux/md2core/minidump-2-core.cc":"ab3db082962dc4b9dfb6eda756db82dcd223f651cb81a41a3344a6ca5846cc9f","third_party/breakpad/src/tools/linux/md2core/minidump_memory_range.h":"f0450b28f24cef13ef02067d123b1af33dfc76f2ee16b5fc3f717d1090cdbd26","third_party/breakpad/src/tools/linux/md2core/minidump_memory_range_unittest.cc":"aa316cf39303a6e6c6c635f77ea6dee1717a916806829e8958c7bdf860614a64","third_party/breakpad/src/tools/linux/symupload/minidump_upload.cc":"a08de9796574925331bb04095c2d6fde62a86fd3487b8d57b7fcfc9e4c6f53fe","third_party/breakpad/src/tools/linux/symupload/sym_upload.cc":"a163d2e97477c0bfc2c68e1e5766930ef0b1ec6c8c91f141455cfef25b81a846","third_party/breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h":"1a2b4c4fefe712bc564cebd17ae98ad26c1f8a3301b47dc7bc1845f8cab68db5","third_party/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc":"4638a8f6fe62c512b9066ed9feb92fec2018f9ba891423a0b1f5cbab8cc734d6","third_party/breakpad/src/tools/mac/dump_syms/macho_dump.cc":"54dc6521151b60cee819862e05240ba735ae31d2bef8c1a2d1de48fb64f7dd33","third_party/breakpad/src/tools/mac/upload_system_symbols/arch_constants.h":"95c95e77ddde1ae6522c71aada7a49ef7603f1f19f7847cb36b4d9222c3fd28b","third_party/breakpad/src/tools/solaris/dump_syms/dump_syms.cc":"af9b1bd0b53570b2e8a7a01f877ee9f33fb4571bf2b92df3a0b9ceb57396cc6c","third_party/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc":"42fb5b91aa383e61f4c6163eb900810f7c671a693c588db822fe281bafff8f31","third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc":"472dd6997d010b2bc1406f8f48c82f15ad0bff6544a7a6eaf9b9dfa92330f7c7","third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.h":"eba19d8adb90e3fcc815ff23feda043ec684f58f18d66f97a29733a03c491f5f","third_party/breakpad/src/tools/windows/converter_exe/converter.cc":"82c82f8ef547f67f3f449a0b240e2df4ed538d976a379b07e53d5ce7cde2438c","third_party/breakpad/src/tools/windows/converter_exe/escaping.cc":"ffdb9f29ac3f30e47a94bd6d886b12dbd40dbe7314f004bc01a696d6ee0908ec","third_party/breakpad/src/tools/windows/converter_exe/escaping.h":"7c37775df8a80163bcf3fa2c7ec4ad95d16fda590f74724ad851658ae2f2d099","third_party/breakpad/src/tools/windows/converter_exe/http_client.h":"c3f6296b8171fc7612aee7303c40bee21cb6bd0ad70fa6d7568673a6ef90e8de","third_party/breakpad/src/tools/windows/converter_exe/http_download.cc":"587080bc8d5098742c977a01d10c352ce35cc3caac25fcf910e4594bd962aee5","third_party/breakpad/src/tools/windows/converter_exe/http_download.h":"6837922c59ccb5dcb732251c8d1bd97c1f5cd5f5dc45d228ea174f8912796b52","third_party/breakpad/src/tools/windows/converter_exe/tokenizer.cc":"7b927130b1b9476865d4ee15e177678be06468a6b051568fcc002ea5ba867424","third_party/breakpad/src/tools/windows/converter_exe/tokenizer.h":"b28798b0c471febddb7ac8f6e42d57bedbc3c71060b9b6218208c2842a425eb4","third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.cc":"ad522f6028cc51f179920ebc54aad7fe30739ee64752ca8f7a66be410551ed4c","third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.h":"c515f497c3cf860b1175d6d7b0f3f4f16e6b7e0a68d609f8aac4ee8f81017b22","third_party/breakpad/src/tools/windows/converter_exe/wininet_client.cc":"028b65736acc486ce16b7595e54111fdd8aa55f7cb19a787dc7c3a971262d18a","third_party/breakpad/src/tools/windows/converter_exe/wininet_client.h":"b5d24aeb0b450676f78999a160fa1f65f792856ee1959c7139a3ad2fc3f5c61c","third_party/breakpad/src/tools/windows/dump_syms/dump_syms.cc":"93871f6eef31bac365a2bc9df8d778c23dccdeeacc3d3446bd257ee0930ccb18","third_party/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc":"41ea1d39023727bf5d132f8b4f38c5d96ecdc87093d07d6b7ff68c66f27bdd07","third_party/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc":"47d42bfb4c348a521f6fb0c30fb515f29d2b5f3a3711f022c598684793da5f9f","third_party/breakpad/src/tools/windows/symupload/symupload.cc":"62ca3399dae7c75aa4a91b7443116b21b72c33492da3214fadbcc659827fce26","third_party/lss/.git":"0c291d2bd5767886ee20009b33332fcc62220c001e7e4a9ba138c8f6fc5fe21e","third_party/lss/.gitignore":"cc5be066431e8e73214688c1eee2c0198f1358616673c2ffc687a8d9e8975f6b","third_party/lss/README.md":"5e0490057d150e50b9a74d357fbcc4671dd681ac11845b01c944476b6471d690","third_party/lss/codereview.settings":"743a2480b0774fc6d6811dddc1c750dc33e1debbcc6f6af147c4efacb9d10ed5","third_party/lss/linux_syscall_support.h":"696c14c3da8412c5882be0e6ec591956b160ab8c421caaf53650c2687bb49873","third_party/lss/tests/.gitignore":"45b506fd60e79981a90741445c1ea9853c15d296c50d6a7ebbef5a84bdec8bf7","third_party/lss/tests/Makefile":"511a628a9bd0037cbd189b065237863a3b01d1c4bd68dcd167f17b3de2f4db53","third_party/lss/tests/README.md":"e90ad6584b6d634d2b47f9e7c9b17bd07e2f4568a426fe7698471fa8bc091643","third_party/lss/tests/fallocate.c":"59ec13654c32ee1dbc298475bc13809645e863ff88e17888bbeb00d271b40215","third_party/lss/tests/sigaction.c":"d42da309988670b66e143fc983cb6516ce29704e4e6471c1812d9203a2a9b497","third_party/lss/tests/sigtimedwait.c":"277867372d38d2fd727564142c050f42da01d8c24537b6bbc4919ec7655d08c0","third_party/lss/tests/test_skel.h":"548f5213b13447353cbde4a85382298f62feff85ef64c8b19dc7168fcb1ca6d6","third_party/lss/tests/unlink.c":"3df0c91de657a036fe5a4d1fd972126dc0f7182c2003d6e2fde5cb510c3db314"},"package":"8507efc38cf694055f3a70ba4ca51b39ef258d5e661772cc29c97bc08f6069e7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "symbolic-minidump"
-version = "8.0.0"
+version = "8.3.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>", "Jan Michael Auer <mail@jauer.org>"]
 build = "build.rs"
 include = ["/cpp/**/*", "/src/**/*", "/third_party/breakpad/src/**/*.h", "/third_party/breakpad/src/**/*.c", "/third_party/breakpad/src/**/*.cc", "/third_party/lss/**/*", "/build.rs", "/Cargo.toml"]
@@ -24,6 +24,18 @@
 repository = "https://github.com/getsentry/symbolic"
 [package.metadata.docs.rs]
 all-features = true
+
+[[bench]]
+name = "nested_range_map"
+harness = false
+
+[[bench]]
+name = "from_minidump"
+harness = false
+
+[[bench]]
+name = "from_minidump_external"
+harness = false
 [dependencies.lazy_static]
 version = "1.4.0"
 
@@ -35,15 +47,32 @@
 optional = true
 
 [dependencies.symbolic-common]
-version = "8.0.0"
+version = "8.3.0"
 
 [dependencies.symbolic-debuginfo]
-version = "8.0.0"
+version = "8.3.0"
 
 [dependencies.thiserror]
 version = "1.0.20"
+[dev-dependencies.criterion]
+version = "0.3.4"
+features = ["html_reports"]
+
 [dev-dependencies.insta]
 version = "1.3.0"
+
+[dev-dependencies.proptest]
+version = "1.0.0"
+
+[dev-dependencies.rand]
+version = "0.8.3"
+features = ["small_rng"]
+
+[dev-dependencies.similar-asserts]
+version = "1.0.0"
+
+[dev-dependencies.walkdir]
+version = "2.3.1"
 [build-dependencies.cc]
 version = "1.0.50"
 features = ["parallel"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/src/cfi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/src/cfi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/src/cfi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/src/cfi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,6 +18,7 @@
 //! [`CfiCache`]: struct.CfiCache.html
 
 use std::collections::HashMap;
+use std::convert::TryInto;
 use std::error::Error;
 use std::fmt;
 use std::io::{self, Write};
@@ -29,17 +30,37 @@
 use symbolic_debuginfo::breakpad::{BreakpadError, BreakpadObject, BreakpadStackRecord};
 use symbolic_debuginfo::dwarf::gimli::{
     BaseAddresses, CfaRule, CieOrFde, DebugFrame, EhFrame, Error as GimliError,
-    FrameDescriptionEntry, Reader, Register, RegisterRule, UninitializedUnwindContext,
-    UnwindSection,
+    FrameDescriptionEntry, Reader, ReaderOffset, Register, RegisterRule,
+    UninitializedUnwindContext, UnwindSection,
 };
 use symbolic_debuginfo::dwarf::Dwarf;
+use symbolic_debuginfo::macho::{
+    CompactCfiOp, CompactCfiRegister, CompactUnwindInfoIter, CompactUnwindOp, MachError, MachObject,
+};
 use symbolic_debuginfo::pdb::pdb::{self, FallibleIterator, FrameData, Rva, StringTable};
 use symbolic_debuginfo::pdb::PdbObject;
 use symbolic_debuginfo::pe::{PeObject, RuntimeFunction, UnwindOperation};
 use symbolic_debuginfo::{Object, ObjectError, ObjectLike};
 
+/// The magic file preamble to identify cficache files.
+///
+/// Files with version < 2 do not have the full preamble with magic+version, but rather start
+/// straight away with a `STACK` record.
+/// The magic here is a `u32` corresponding to the big-endian `CFIC`.
+/// It will be written and read using native endianness, so mismatches between writer/reader will
+/// result in a [`CfiErrorKind::BadFileMagic`] error.
+pub const CFICACHE_MAGIC: u32 = u32::from_be_bytes(*b"CFIC");
+
 /// The latest version of the file format.
-pub const CFICACHE_LATEST_VERSION: u32 = 1;
+pub const CFICACHE_LATEST_VERSION: u32 = 2;
+
+// The preamble are 8 bytes, a 4-byte magic and 4 bytes for the version.
+// The 4-byte magic should be read as little endian to check for endian mismatch.
+
+// Version history:
+//
+// 1: Initial ASCII-only implementation
+// 2: Implementation with a versioned preamble
 
 /// Used to detect empty runtime function entries in PEs.
 const EMPTY_FUNCTION: RuntimeFunction = RuntimeFunction {
@@ -157,6 +178,12 @@
     }
 }
 
+impl From<MachError> for CfiError {
+    fn from(e: MachError) -> Self {
+        Self::new(CfiErrorKind::BadDebugInfo, e)
+    }
+}
+
 /// Temporary helper trait to set the address size on any unwind section.
 trait UnwindSectionExt<R>: UnwindSection<R>
 where
@@ -267,11 +294,11 @@
     pub fn process(&mut self, object: &Object<'_>) -> Result<(), CfiError> {
         match object {
             Object::Breakpad(o) => self.process_breakpad(o),
-            Object::MachO(o) => self.process_dwarf(o),
-            Object::Elf(o) => self.process_dwarf(o),
+            Object::MachO(o) => self.process_macho(o),
+            Object::Elf(o) => self.process_dwarf(o, false),
             Object::Pdb(o) => self.process_pdb(o),
             Object::Pe(o) => self.process_pe(o),
-            Object::Wasm(o) => self.process_dwarf(o),
+            Object::Wasm(o) => self.process_dwarf(o, false),
             Object::SourceBundle(_) => Ok(()),
         }
     }
@@ -284,15 +311,72 @@
     fn process_breakpad(&mut self, object: &BreakpadObject<'_>) -> Result<(), CfiError> {
         for record in object.stack_records() {
             match record? {
-                BreakpadStackRecord::Cfi(r) => writeln!(self.inner, "STACK CFI {}", r.text),
-                BreakpadStackRecord::Win(r) => writeln!(self.inner, "STACK WIN {}", r.text),
+                BreakpadStackRecord::Cfi(r) => {
+                    writeln!(
+                        self.inner,
+                        "STACK CFI INIT {:x} {:x} {}",
+                        r.start, r.size, r.init_rules
+                    )?;
+
+                    for d in r.deltas().flatten() {
+                        writeln!(self.inner, "STACK CFI {:x} {}", d.address, d.rules)?;
+                    }
+
+                    Ok(())
+                }
+                BreakpadStackRecord::Win(r) => writeln!(
+                    self.inner,
+                    "STACK WIN {} {:x} {:x} {:x} {:x} {:x} {:x} {:x} {:x} {} {}",
+                    r.ty as usize,
+                    r.code_start,
+                    r.code_size,
+                    r.prolog_size,
+                    r.epilog_size,
+                    r.params_size,
+                    r.saved_regs_size,
+                    r.locals_size,
+                    r.max_stack_size,
+                    if r.program_string.is_some() { "1" } else { "0" },
+                    if let Some(ps) = r.program_string {
+                        ps
+                    } else if r.uses_base_pointer {
+                        "1"
+                    } else {
+                        "0"
+                    }
+                ),
             }?
         }
 
         Ok(())
     }
 
-    fn process_dwarf<'d: 'o, 'o, O>(&mut self, object: &O) -> Result<(), CfiError>
+    fn process_macho<'d>(&mut self, object: &MachObject<'d>) -> Result<(), CfiError> {
+        let compact_unwind_info = object.compact_unwind_info()?;
+
+        // If we have compact_unwind_info, then any important entries in
+        // the eh_frame section will be explicitly requested by the
+        // Compact Unwinding Info. So skip processing that section for now.
+        let should_skip_eh_frame = compact_unwind_info.is_some();
+        let result = self.process_dwarf(object, should_skip_eh_frame);
+
+        if let Some(compact_unwind_info) = compact_unwind_info {
+            let eh_section = object.section("eh_frame");
+            let eh_frame_info = eh_section.as_ref().map(|section| {
+                let endian = object.endianity();
+                let frame = EhFrame::new(&section.data, endian);
+                UnwindInfo::new(object, section.address, frame)
+            });
+            self.read_compact_unwind_info(compact_unwind_info, eh_frame_info.as_ref(), object)?;
+        }
+        result
+    }
+
+    fn process_dwarf<'d: 'o, 'o, O>(
+        &mut self,
+        object: &O,
+        skip_eh_frame: bool,
+    ) -> Result<(), CfiError>
     where
         O: ObjectLike<'d, 'o> + Dwarf<'o>,
     {
@@ -309,16 +393,174 @@
             Ok(())
         };
 
-        // Indepdendently, Linux C++ exception handling information can also provide unwind info.
-        if let Some(section) = object.section("eh_frame") {
-            let frame = EhFrame::new(&section.data, endian);
-            let info = UnwindInfo::new(object, section.address, frame);
-            self.read_cfi(&info)?;
+        if !skip_eh_frame {
+            if let Some(section) = object.section("eh_frame") {
+                // Independently, Linux C++ exception handling information can also provide unwind info.
+                let frame = EhFrame::new(&section.data, endian);
+                let info = UnwindInfo::new(object, section.address, frame);
+                self.read_cfi(&info)?;
+            }
         }
 
         debug_frame_result
     }
 
+    fn read_compact_unwind_info<'d, U, R>(
+        &mut self,
+        mut iter: CompactUnwindInfoIter<'d>,
+        eh_frame_info: Option<&UnwindInfo<U>>,
+        object: &MachObject<'d>,
+    ) -> Result<(), CfiError>
+    where
+        R: Reader + Eq,
+        U: UnwindSection<R>,
+    {
+        fn write_reg_name<W: Write>(
+            writer: &mut W,
+            register: CompactCfiRegister,
+            iter: &CompactUnwindInfoIter,
+        ) -> Result<(), CfiError> {
+            if register.is_cfa() {
+                write!(writer, ".cfa")?;
+            } else if register == CompactCfiRegister::instruction_pointer() {
+                write!(writer, ".ra")?;
+            } else {
+                write!(writer, "${}", register.name(iter).unwrap())?;
+            }
+            Ok(())
+        }
+        // Preload the symbols as this is expensive to do in the loop.
+        let symbols = object.symbol_map();
+
+        // Initialize an unwind context once and reuse it for the entire section.
+        let mut ctx = UninitializedUnwindContext::new();
+
+        while let Some(entry) = iter.next()? {
+            if entry.len == 0 {
+                // We saw some duplicate entries (which yield entries with `len == 0`) for example
+                // in `libsystem_kernel.dylib`. In this case just skip the zero-length entry.
+                continue;
+            }
+            match entry.instructions(&iter) {
+                CompactUnwindOp::None => {
+                    // We have seen some of these `CompactUnwindOp::None` correspond to some tiny
+                    // stackless functions, such as `__kill` from `libsystem_kernel.dylib` or similar.
+                    //
+                    // Because they don't have a normal CFI record, we would fall back to frame pointers
+                    // or stack scanning when unwinding, which will cause us to skip the caller
+                    // frame, or fail unwinding completely.
+                    //
+                    // To overcome this problem we will emit a CFI record that basically says that
+                    // the function has no stack space of its own. Since these compact unwind records
+                    // can be the result of merging multiple of these adjacent functions, they can
+                    // span more instructions/bytes than one single symbol.
+                    //
+                    // This can potentially lead to false positives. However in that case, the unwinding
+                    // code will detect the bogus return address and fall back to frame pointers or
+                    // scanning either way.
+
+                    let start_addr = entry.instruction_address;
+                    if let Some(ptr_size) = object.arch().cpu_family().pointer_size() {
+                        writeln!(
+                            self.inner,
+                            "STACK CFI INIT {:x} {:x} .cfa: $rsp {} + .ra: .cfa -{} + ^",
+                            start_addr, entry.len, ptr_size, ptr_size
+                        )?;
+                    }
+                }
+                CompactUnwindOp::UseDwarfFde { offset_in_eh_frame } => {
+                    // We need to grab the CFI info from the eh_frame section
+                    if let Some(info) = eh_frame_info {
+                        let offset = U::Offset::from(R::Offset::from_u32(offset_in_eh_frame));
+                        if let Ok(fde) =
+                            info.section
+                                .fde_from_offset(&info.bases, offset, U::cie_from_offset)
+                        {
+                            let start_addr = entry.instruction_address.into();
+                            let sym_name = symbols.lookup(start_addr).and_then(|sym| sym.name());
+                            let ptr_size = object.arch().cpu_family().pointer_size();
+
+                            if sym_name == Some("_sigtramp") && ptr_size == Some(8) {
+                                // This specific function has some hand crafted dwarf expressions
+                                // that we currently can't process. They encode how to restore the
+                                // registers from a machine context accessible via `$rbx`
+                                // See: https://github.com/apple/darwin-libplatform/blob/215b09856ab5765b7462a91be7076183076600df/src/setjmp/x86_64/_sigtramp.s#L198-L258
+
+                                let mc_offset = 48;
+                                let rbp_offset = 64;
+                                let rsp_offset = 72;
+                                let rip_offset = 144;
+
+                                write!(
+                                    self.inner,
+                                    "STACK CFI INIT {:x} {:x} ",
+                                    start_addr, entry.len
+                                )?;
+                                write!(
+                                    self.inner,
+                                    "$rbp: $rbx {} + ^ {} + ^ ",
+                                    mc_offset, rbp_offset
+                                )?;
+                                write!(
+                                    self.inner,
+                                    ".cfa: $rbx {} + ^ {} + ^ ",
+                                    mc_offset, rsp_offset,
+                                )?;
+                                writeln!(
+                                    self.inner,
+                                    ".ra: $rbx {} + ^ {} + ^",
+                                    mc_offset, rip_offset
+                                )?;
+                            } else {
+                                self.process_fde(info, &mut ctx, &fde)?;
+                            }
+                        }
+                    }
+                }
+                CompactUnwindOp::CfiOps(ops) => {
+                    // We just need to output a bunch of CFI expressions in a single CFI INIT
+                    let mut line = Vec::new();
+                    let start_addr = entry.instruction_address;
+                    let length = entry.len;
+                    write!(line, "STACK CFI INIT {:x} {:x} ", start_addr, length)?;
+
+                    for instruction in ops {
+                        // These two operations differ only in whether there should
+                        // be a deref (^) at the end, so we can flatten away their
+                        // differences and merge paths.
+                        let (dest_reg, src_reg, offset, should_deref) = match instruction {
+                            CompactCfiOp::RegisterAt {
+                                dest_reg,
+                                src_reg,
+                                offset_from_src,
+                            } => (dest_reg, src_reg, offset_from_src, true),
+                            CompactCfiOp::RegisterIs {
+                                dest_reg,
+                                src_reg,
+                                offset_from_src,
+                            } => (dest_reg, src_reg, offset_from_src, false),
+                        };
+
+                        write_reg_name(&mut line, dest_reg, &iter)?;
+                        write!(line, ": ")?;
+                        write_reg_name(&mut line, src_reg, &iter)?;
+                        write!(line, " {} + ", offset)?;
+                        if should_deref {
+                            write!(line, "^ ")?;
+                        }
+                    }
+
+                    let line = line.strip_suffix(b" ").unwrap_or(&line);
+
+                    self.inner
+                        .write_all(line)
+                        .and_then(|_| writeln!(self.inner))?;
+                }
+            }
+        }
+        Ok(())
+    }
+
     fn read_cfi<U, R>(&mut self, info: &UnwindInfo<U>) -> Result<(), CfiError>
     where
         R: Reader + Eq,
@@ -629,7 +871,7 @@
                     None => return Ok(writeln!(self.inner)?),
                 };
 
-                let program_string = prog_ref.to_string_lossy(&string_table)?;
+                let program_string = prog_ref.to_string_lossy(string_table)?;
 
                 writeln!(self.inner, "{}", program_string.trim())?;
             }
@@ -751,7 +993,8 @@
 }
 
 enum CfiCacheInner<'a> {
-    V1(CfiCacheV1<'a>),
+    Unversioned(CfiCacheV1<'a>),
+    Versioned(u32, CfiCacheV1<'a>),
 }
 
 /// A cache file for call frame information (CFI).
@@ -784,7 +1027,6 @@
 /// # Ok(())
 /// # }
 /// ```
-///
 pub struct CfiCache<'a> {
     inner: CfiCacheInner<'a>,
 }
@@ -792,28 +1034,46 @@
 impl CfiCache<'static> {
     /// Construct a CFI cache from an `Object`.
     pub fn from_object(object: &Object<'_>) -> Result<Self, CfiError> {
-        let buffer = AsciiCfiWriter::transform(object)?;
+        let mut buffer = vec![];
+        write_preamble(&mut buffer, CFICACHE_LATEST_VERSION)?;
+        AsciiCfiWriter::new(&mut buffer).process(object)?;
+
         let byteview = ByteView::from_vec(buffer);
-        let inner = CfiCacheInner::V1(CfiCacheV1 { byteview });
+        let inner = CfiCacheInner::Versioned(CFICACHE_LATEST_VERSION, CfiCacheV1 { byteview });
         Ok(CfiCache { inner })
     }
 }
 
+fn write_preamble<W: Write>(mut writer: W, version: u32) -> Result<(), io::Error> {
+    writer.write_all(&CFICACHE_MAGIC.to_ne_bytes())?;
+    writer.write_all(&version.to_ne_bytes())
+}
+
 impl<'a> CfiCache<'a> {
     /// Load a symcache from a `ByteView`.
     pub fn from_bytes(byteview: ByteView<'a>) -> Result<Self, CfiError> {
         if byteview.len() == 0 || byteview.starts_with(b"STACK") {
-            let inner = CfiCacheInner::V1(CfiCacheV1 { byteview });
+            let inner = CfiCacheInner::Unversioned(CfiCacheV1 { byteview });
             return Ok(CfiCache { inner });
         }
 
+        if let Some(preamble) = byteview.get(0..8) {
+            let magic = u32::from_ne_bytes(preamble[0..4].try_into().unwrap());
+            if magic == CFICACHE_MAGIC {
+                let version = u32::from_ne_bytes(preamble[4..8].try_into().unwrap());
+                let inner = CfiCacheInner::Versioned(version, CfiCacheV1 { byteview });
+                return Ok(CfiCache { inner });
+            }
+        }
+
         Err(CfiErrorKind::BadFileMagic.into())
     }
 
     /// Returns the cache file format version.
     pub fn version(&self) -> u32 {
         match self.inner {
-            CfiCacheInner::V1(_) => 1,
+            CfiCacheInner::Unversioned(_) => 1,
+            CfiCacheInner::Versioned(version, _) => version,
         }
     }
 
@@ -825,12 +1085,16 @@
     /// Returns the raw buffer of the cache file.
     pub fn as_slice(&self) -> &[u8] {
         match self.inner {
-            CfiCacheInner::V1(ref v1) => v1.raw(),
+            CfiCacheInner::Unversioned(ref v1) => v1.raw(),
+            CfiCacheInner::Versioned(_, ref v1) => &v1.raw()[8..],
         }
     }
 
     /// Writes the cache to the given writer.
     pub fn write_to<W: Write>(&self, mut writer: W) -> Result<(), io::Error> {
+        if let CfiCacheInner::Versioned(version, _) = self.inner {
+            write_preamble(&mut writer, version)?;
+        }
         io::copy(&mut self.as_slice(), &mut writer)?;
         Ok(())
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/src/processor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/src/processor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/src/processor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/src/processor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,6 +14,7 @@
 use std::ffi::{CStr, CString};
 use std::hash::{Hash, Hasher};
 use std::marker::PhantomData;
+use std::ops::{Bound, Range, RangeBounds};
 use std::os::raw::{c_char, c_void};
 use std::str::FromStr;
 use std::{fmt, ptr, slice, str};
@@ -86,6 +87,241 @@
     ) -> *mut *const CodeModule;
 }
 
+/// A structure containing a set of disjoint ranges with attached contents.
+#[derive(Clone, Debug)]
+pub struct RangeMap<A, E> {
+    inner: BTreeMap<A, (A, E)>,
+}
+
+impl<A: Ord + Copy, E> RangeMap<A, E> {
+    /// Insert a range into the map.
+    ///
+    /// The range must be disjoint from all ranges that are already present.
+    /// Returns true if the insertion was successful.
+    pub fn insert(&mut self, range: Range<A>, contents: E) -> bool {
+        let low = self
+            .inner
+            .range(greater_than(range.start))
+            .next()
+            .map(|(key, _)| *key);
+        let high = self.inner.range(range.end..).next().map(|(key, _)| *key);
+
+        match (low, high) {
+            (None, _) => {
+                // all existing ranges end before the start of `range` => just insert range
+                self.inner.insert(range.end, (range.start, contents));
+                true
+            }
+
+            (Some(low_end), Some(high_end)) if low_end == high_end => {
+                let low_start = self.inner[&low_end].0;
+                if range.end <= low_start {
+                    self.inner.insert(range.end, (range.start, contents));
+                    true
+                } else {
+                    false
+                }
+            }
+
+            _ => false,
+        }
+    }
+
+    /// Retrieves the contents associated with the given address.
+    pub fn get_contents(&self, address: A) -> Option<&E> {
+        let (_, (lower_bound, entry)) = self.inner.range(greater_than(address)).next()?;
+
+        (*lower_bound <= address).then(move || entry)
+    }
+
+    /// Retrieves the contents associated with the given address, allowing mutation.
+    pub fn get_contents_mut(&mut self, address: A) -> Option<&mut E> {
+        let (_, (lower_bound, entry)) = self.inner.range_mut(greater_than(address)).next()?;
+
+        (*lower_bound <= address).then(move || entry)
+    }
+
+    /// Returns true if the given address is covered by some range in the map.
+    pub fn contains(&self, address: A) -> bool {
+        self.get_contents(address).is_some()
+    }
+}
+
+impl<A: Ord, E> Default for RangeMap<A, E> {
+    fn default() -> Self {
+        Self {
+            inner: BTreeMap::new(),
+        }
+    }
+}
+
+/// A structure representing a tree of disjoint ranges with associated contents.
+#[derive(Debug, Clone)]
+pub struct NestedRangeMap<A, E> {
+    lower_bound: Option<A>,
+    contents: Option<E>,
+    sub_ranges: BTreeMap<A, Box<NestedRangeMap<A, E>>>,
+}
+
+impl<A, E> NestedRangeMap<A, E>
+where
+    A: Ord + Copy + fmt::Debug,
+    E: Clone + fmt::Debug,
+{
+    /// Insert a range into the map.
+    ///
+    /// The insertion is valid if the new range does not
+    /// overlap nontrivially with any existing ranges
+    /// and is not equal to an existing range.
+    /// Returns true if the insertion was successful.
+    pub fn insert(&mut self, range: Range<A>, contents: E) -> bool {
+        let low = self
+            .sub_ranges
+            .range(greater_than(range.start))
+            .next()
+            .map(|(key, _)| *key);
+        let high = self
+            .sub_ranges
+            .range(range.end..)
+            .next()
+            .map(|(key, _)| *key);
+
+        match (low, high) {
+            (None, _) => {
+                // all existing ranges end before the start of `range` => just insert range
+                self.sub_ranges.insert(
+                    range.end,
+                    Box::new(NestedRangeMap::leaf(range.start, contents)),
+                );
+                true
+            }
+
+            (Some(low_end), None) => {
+                let low_start = self.sub_ranges[&low_end].lower_bound.unwrap();
+                if low_start < range.start {
+                    return false;
+                }
+                Self::insert_branch(&mut self.sub_ranges, range, contents, low_end..);
+                true
+            }
+            (Some(low_end), Some(high_end)) if low_end == high_end => {
+                let low_start = self.sub_ranges[&low_end].lower_bound.unwrap();
+                if range.start == low_start && range.end == low_end {
+                    return false;
+                }
+
+                if range.start >= low_start {
+                    self.sub_ranges
+                        .get_mut(&low_end)
+                        .unwrap()
+                        .insert(range, contents)
+                } else if range.end <= low_start {
+                    self.sub_ranges.insert(
+                        range.end,
+                        Box::new(NestedRangeMap::leaf(range.start, contents)),
+                    );
+                    true
+                } else if range.start < low_start && range.end == low_end {
+                    Self::insert_branch(&mut self.sub_ranges, range, contents, low_end..=low_end);
+                    true
+                } else {
+                    false
+                }
+            }
+
+            (Some(low_end), Some(high_end)) => {
+                let low_start = self.sub_ranges[&low_end].lower_bound.unwrap();
+                let high_start = self.sub_ranges[&high_end].lower_bound.unwrap();
+
+                if range.start > low_start {
+                    return false;
+                }
+
+                if range.end <= high_start {
+                    Self::insert_branch(&mut self.sub_ranges, range, contents, low_end..high_end);
+                    true
+                } else if range.end >= high_end {
+                    Self::insert_branch(&mut self.sub_ranges, range, contents, low_end..=high_end);
+                    true
+                } else {
+                    false
+                }
+            }
+        }
+    }
+
+    /// Retrieves the *most specific* contents associated with the given address, that is,
+    /// those associated with the smallest range that covers the address.
+    pub fn get_contents(&self, address: A) -> Option<&E> {
+        // Find the first subrange whose end is greater than `address. If `address` is in the map,
+        // it must be in this range.
+        let (_, sub_range) = self.sub_ranges.range(greater_than(address)).next()?;
+        let lb = sub_range.lower_bound.unwrap();
+        if lb <= address {
+            let contents = sub_range.contents.as_ref().unwrap();
+            let sub_contents = sub_range.get_contents(address);
+            Some(sub_contents.unwrap_or(contents))
+        } else {
+            None
+        }
+    }
+
+    /// Returns true if the given address is covered by some range in the map.
+    pub fn contains(&self, address: A) -> bool {
+        self.get_contents(address).is_some()
+    }
+
+    fn leaf(lower_bound: A, contents: E) -> Self {
+        Self {
+            lower_bound: Some(lower_bound),
+            contents: Some(contents),
+            sub_ranges: BTreeMap::default(),
+        }
+    }
+
+    /// Inserts the new entry(`range`, `contents`) into the map and moves
+    /// all entries with keys in `children` into the new entry.
+    fn insert_branch<R: RangeBounds<A>>(
+        sub_ranges: &mut BTreeMap<A, Box<NestedRangeMap<A, E>>>,
+        range: Range<A>,
+        contents: E,
+        children: R,
+    ) {
+        let mut sub_ranges_new = BTreeMap::new();
+        for (key, val) in sub_ranges.range(children) {
+            sub_ranges_new.insert(*key, val.clone());
+        }
+
+        for key in sub_ranges_new.keys() {
+            sub_ranges.remove(key);
+        }
+
+        sub_ranges.insert(
+            range.end,
+            Box::new(NestedRangeMap {
+                lower_bound: Some(range.start),
+                contents: Some(contents),
+                sub_ranges: sub_ranges_new,
+            }),
+        );
+    }
+}
+
+impl<A: Ord + Copy, E> Default for NestedRangeMap<A, E> {
+    fn default() -> Self {
+        Self {
+            lower_bound: None,
+            contents: None,
+            sub_ranges: BTreeMap::default(),
+        }
+    }
+}
+
+/// Creates the range (`lower_bound`, ∞).
+fn greater_than<A>(lower_bound: A) -> (Bound<A>, Bound<A>) {
+    (Bound::Excluded(lower_bound), Bound::Unbounded)
+}
+
 /// An error returned when parsing an invalid [`CodeModuleId`](struct.CodeModuleId.html).
 pub type ParseCodeModuleIdError = ParseDebugIdError;
 
@@ -142,9 +378,9 @@
     }
 }
 
-impl Into<DebugId> for CodeModuleId {
-    fn into(self) -> DebugId {
-        self.inner
+impl From<CodeModuleId> for DebugId {
+    fn from(source: CodeModuleId) -> Self {
+        source.inner
     }
 }
 
@@ -323,6 +559,7 @@
 /// stack scanning, it can wind up with dubious frames.
 ///
 /// In rough order of "trust metric".
+#[allow(clippy::upper_case_acronyms)]
 #[repr(u32)]
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum FrameTrust {
@@ -522,7 +759,7 @@
     /// Returns a mapping of registers to their known values, if any.
     pub fn registers(&self, arch: Arch) -> BTreeMap<&'static str, RegVal> {
         unsafe {
-            let mut size = 0 as usize;
+            let mut size = 0;
             let values = stack_frame_registers(self, arch.cpu_family() as u32, &mut size);
             let map = slice::from_raw_parts(values, size)
                 .iter()
@@ -570,7 +807,7 @@
     /// Returns the list of `StackFrame`s in the call stack.
     pub fn frames(&self) -> &[&StackFrame] {
         unsafe {
-            let mut size = 0 as usize;
+            let mut size = 0;
             let data = call_stack_frames(self, &mut size);
             slice::from_raw_parts(data as *const &StackFrame, size)
         }
@@ -620,7 +857,7 @@
             // Try to parse the Linux build string. Breakpad and Crashpad run
             // `uname -srvmo` to generate it. This roughtly resembles:
             // "Linux [version] [build...] [arch] Linux/GNU"
-            if let Some(captures) = LINUX_BUILD_RE.captures(&build) {
+            if let Some(captures) = LINUX_BUILD_RE.captures(build) {
                 let version = captures.get(1).unwrap(); // uname -r portion
                 let build = captures.get(2).unwrap(); // uname -v portion
                 return (version.as_str().into(), build.as_str().into());
@@ -921,7 +1158,7 @@
     /// Returns a list of `CallStack`s in the minidump.
     pub fn threads(&self) -> &[&CallStack] {
         unsafe {
-            let mut size = 0 as usize;
+            let mut size = 0;
             let data = process_state_threads(self.internal, &mut size);
             slice::from_raw_parts(data as *const &CallStack, size)
         }
@@ -930,7 +1167,7 @@
     /// Returns the full list of loaded `CodeModule`s.
     pub fn modules(&self) -> Vec<&CodeModule> {
         unsafe {
-            let mut size = 0 as usize;
+            let mut size = 0;
             let data = process_state_modules(self.internal, &mut size);
             let vec = slice::from_raw_parts(data as *mut &CodeModule, size).to_vec();
             code_modules_delete(data);
@@ -968,3 +1205,146 @@
             .finish()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use proptest::prelude::*;
+
+    fn arb_disjoint_ranges(range: Range<u64>) -> impl Strategy<Value = Vec<Range<u64>>> {
+        fn go(range: Range<u64>, acc: &mut Vec<Range<u64>>) {
+            let mid = (range.end + range.start) / 2;
+            if range.start < mid && mid < range.end {
+                go(range.start..mid, acc);
+                go(mid..range.end, acc);
+            } else {
+                acc.push(range);
+            }
+        }
+
+        let mut ranges = Vec::new();
+        go(range, &mut ranges);
+
+        Just(ranges).prop_shuffle()
+    }
+
+    /// Creates a vector of nested subranges of `range` by recursively halving `range`
+    /// and shuffling the end result.
+    fn arb_nested_ranges(range: Range<u32>) -> impl Strategy<Value = Vec<Range<u32>>> {
+        fn go(range: Range<u32>, acc: &mut Vec<Range<u32>>) {
+            let mid = (range.end + range.start) / 2;
+            if range.start < mid && mid < range.end {
+                go(range.start..mid, acc);
+                go(mid..range.end, acc);
+            }
+
+            acc.push(range);
+        }
+
+        let mut ranges = Vec::new();
+        go(range, &mut ranges);
+
+        Just(ranges).prop_shuffle()
+    }
+
+    /// Checks that a `NestedRangeMap` is actually properly nested.
+    fn check<A: Ord + Copy + fmt::Debug, E>(map: NestedRangeMap<A, E>, range: Option<Range<A>>) {
+        for (upper, sub_map) in map.sub_ranges {
+            let lower = sub_map.lower_bound.unwrap();
+            if let Some(ref range) = range {
+                assert!(lower >= range.start, "{:?}, {:?}", range, lower..upper);
+                assert!(upper <= range.end, "{:?}, {:?}", range, lower..upper);
+            }
+            check(*sub_map, Some(lower..upper));
+        }
+    }
+
+    #[test]
+    fn nested_range_map_simple() {
+        let mut map = NestedRangeMap::default();
+
+        assert!(map.insert(0u8..10, "Outer"));
+        assert!(!map.insert(5..15, "Overlapping"));
+        assert!(map.insert(1..5, "Middle 1"));
+        assert!(map.insert(2..4, "Inner 1"));
+        assert!(map.insert(5..8, "Middle 2"));
+        assert!(!map.insert(3..8, "Overlapping"));
+        assert!(map.insert(6..8, "Inner 2"));
+        assert!(map.insert(0..9, "Middle 3"));
+
+        //  0    1    2    3    4    5    6    7    8    9    10
+        //          [Inner 1 ]          [Inner 2 ]
+        //     [   Middle 1       ][   Middle 2  ]
+        // [                  Middle 3                ]
+        // [                    Outer                      ]
+        assert_eq!(map.get_contents(0).unwrap(), &"Middle 3");
+        assert_eq!(map.get_contents(1).unwrap(), &"Middle 1");
+        assert_eq!(map.get_contents(2).unwrap(), &"Inner 1");
+        assert_eq!(map.get_contents(3).unwrap(), &"Inner 1");
+        assert_eq!(map.get_contents(4).unwrap(), &"Middle 1");
+        assert_eq!(map.get_contents(5).unwrap(), &"Middle 2");
+        assert_eq!(map.get_contents(6).unwrap(), &"Inner 2");
+        assert_eq!(map.get_contents(7).unwrap(), &"Inner 2");
+        assert_eq!(map.get_contents(8).unwrap(), &"Middle 3");
+        assert_eq!(map.get_contents(9).unwrap(), &"Outer");
+        assert_eq!(map.get_contents(10), None);
+    }
+
+    #[test]
+    fn nested_range_map_complex() {
+        let ranges = vec![
+            0..1,
+            1..2,
+            5..6,
+            3..4,
+            6..7,
+            3..5,
+            0..3,
+            5..7,
+            1..3,
+            4..5,
+            3..7,
+            0..7,
+            2..3,
+        ];
+
+        let mut map = NestedRangeMap::default();
+        for range in ranges {
+            assert!(map.insert(range, ()));
+        }
+
+        check(map, None);
+    }
+
+    proptest! {
+        #[test]
+        fn proptest_range_map(ranges in arb_disjoint_ranges(0..2^20)) {
+            let mut map = RangeMap::default();
+
+            for range in ranges.into_iter() {
+                assert!(
+                    map.insert(range, ()));
+            }
+
+            for i in 0..2^20 {
+                assert!(map.contains(i))
+            }
+        }
+
+        #[test]
+        fn proptest_nested_range_map(ranges in arb_nested_ranges(0..2^20)) {
+            let mut map = NestedRangeMap::default();
+
+            for range in ranges.into_iter() {
+                assert!(map.insert(range, ()));
+            }
+
+            for i in 0..2^20 {
+                assert!(map.contains(i))
+            }
+
+            check(map, None);
+
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/Breakpad.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/Breakpad.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/Breakpad.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/Breakpad.h	2021-12-09 12:01:26.000000000 +0000
@@ -37,7 +37,7 @@
 //
 // These files can then be uploaded to a server.
 
-typedef void *BreakpadRef;
+typedef void* BreakpadRef;
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,15 +60,15 @@
 typedef bool (*BreakpadFilterCallback)(int exception_type,
                                        int exception_code,
                                        mach_port_t crashing_thread,
-                                       void *context);
+                                       void* context);
 
 // Optional user-defined function that will be called after a network upload
 // of a crash report.
 // |report_id| will be the id returned by the server, or "ERR" if an error
 // occurred.
 // |error| will contain the error, or nil if no error occured.
-typedef void (*BreakpadUploadCompletionCallback)(NSString *report_id,
-                                                 NSError *error);
+typedef void (*BreakpadUploadCompletionCallback)(NSString* report_id,
+                                                 NSError* error);
 
 // Create a new BreakpadRef object and install it as an exception
 // handler.  The |parameters| will typically be the contents of your
@@ -163,7 +163,7 @@
 //                                   internal values.
 
 // Returns a new BreakpadRef object on success, NULL otherwise.
-BreakpadRef BreakpadCreate(NSDictionary *parameters);
+BreakpadRef BreakpadCreate(NSDictionary* parameters);
 
 // Uninstall and release the data associated with |ref|.
 void BreakpadRelease(BreakpadRef ref);
@@ -187,20 +187,20 @@
 // TODO (nealsid): separate server parameter dictionary from the
 // dictionary used to configure Breakpad, and document limits for each
 // independently.
-void BreakpadSetKeyValue(BreakpadRef ref, NSString *key, NSString *value);
-NSString *BreakpadKeyValue(BreakpadRef ref, NSString *key);
-void BreakpadRemoveKeyValue(BreakpadRef ref, NSString *key);
+void BreakpadSetKeyValue(BreakpadRef ref, NSString* key, NSString* value);
+NSString* BreakpadKeyValue(BreakpadRef ref, NSString* key);
+void BreakpadRemoveKeyValue(BreakpadRef ref, NSString* key);
 
 // You can use this method to specify parameters that will be uploaded
 // to the crash server.  They will be automatically encoded as
 // necessary.  Note that as mentioned above there are limits on both
 // the number of keys and their length.
-void BreakpadAddUploadParameter(BreakpadRef ref, NSString *key,
-                                NSString *value);
+void BreakpadAddUploadParameter(BreakpadRef ref, NSString* key,
+                                NSString* value);
 
 // This method will remove a previously-added parameter from the
 // upload parameter set.
-void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key);
+void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString* key);
 
 // Method to handle uploading data to the server
 
@@ -208,10 +208,10 @@
 int BreakpadGetCrashReportCount(BreakpadRef ref);
 
 // Returns the next upload configuration. The report file is deleted.
-NSDictionary *BreakpadGetNextReportConfiguration(BreakpadRef ref);
+NSDictionary* BreakpadGetNextReportConfiguration(BreakpadRef ref);
 
 // Returns the date of the most recent crash report.
-NSDate *BreakpadGetDateOfMostRecentCrashReport(BreakpadRef ref);
+NSDate* BreakpadGetDateOfMostRecentCrashReport(BreakpadRef ref);
 
 // Upload next report to the server.
 void BreakpadUploadNextReport(BreakpadRef ref);
@@ -220,7 +220,7 @@
 // |server_parameters| is additional server parameters to send.
 void BreakpadUploadNextReportWithParameters(
     BreakpadRef ref,
-    NSDictionary *server_parameters,
+    NSDictionary* server_parameters,
     BreakpadUploadCompletionCallback callback);
 
 // Upload a report to the server.
@@ -228,8 +228,8 @@
 // |configuration| is the configuration of the breakpad report to send.
 void BreakpadUploadReportWithParametersAndConfiguration(
     BreakpadRef ref,
-    NSDictionary *server_parameters,
-    NSDictionary *configuration,
+    NSDictionary* server_parameters,
+    NSDictionary* configuration,
     BreakpadUploadCompletionCallback callback);
 
 // Handles the network response of a breakpad upload. This function is needed if
@@ -239,21 +239,21 @@
 // BreakpadUploadReportWithParametersAndConfiguration.
 // |data| and |error| contain the network response.
 void BreakpadHandleNetworkResponse(BreakpadRef ref,
-                                   NSDictionary *configuration,
-                                   NSData *data,
-                                   NSError *error);
+                                   NSDictionary* configuration,
+                                   NSData* data,
+                                   NSError* error);
 
 // Upload a file to the server. |data| is the content of the file to sent.
 // |server_parameters| is additional server parameters to send.
-void BreakpadUploadData(BreakpadRef ref, NSData *data, NSString *name,
-                        NSDictionary *server_parameters);
+void BreakpadUploadData(BreakpadRef ref, NSData* data, NSString* name,
+                        NSDictionary* server_parameters);
 
 // Generate a breakpad minidump and configuration file in the dump directory.
 // The report will be available for uploading. The paths of the created files
 // are returned in the dictionary. |server_parameters| is additional server
 // parameters to add in the config file.
-NSDictionary *BreakpadGenerateReport(BreakpadRef ref,
-                                     NSDictionary *server_parameters);
+NSDictionary* BreakpadGenerateReport(BreakpadRef ref,
+                                     NSDictionary* server_parameters);
 
 #ifdef __cplusplus
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/exception_handler_no_mach.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/exception_handler_no_mach.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/exception_handler_no_mach.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/exception_handler_no_mach.cc	2021-12-09 12:01:26.000000000 +0000
@@ -47,7 +47,7 @@
 // for more details.
 #if USE_PROTECTED_ALLOCATIONS
   #include "client/mac/handler/protected_memory_allocator.h"
-  extern ProtectedMemoryAllocator *gBreakpadAllocator;
+  extern ProtectedMemoryAllocator* gBreakpadAllocator;
 #endif
 
 namespace google_breakpad {
@@ -72,10 +72,10 @@
   char protected_buffer[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE)));
 #endif  // defined PAGE_MAX_SIZE
 #endif  // USE_PROTECTED_ALLOCATIONS
-  google_breakpad::ExceptionHandler *handler;
+  google_breakpad::ExceptionHandler* handler;
 } gProtectedData;
 
-ExceptionHandler::ExceptionHandler(const string &dump_path,
+ExceptionHandler::ExceptionHandler(const string& dump_path,
                                    FilterCallback filter,
                                    MinidumpCallback callback,
                                    void* callback_context,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/exception_handler_no_mach.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/exception_handler_no_mach.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/exception_handler_no_mach.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/exception_handler_no_mach.h	2021-12-09 12:01:26.000000000 +0000
@@ -53,7 +53,7 @@
   // attempting to write a minidump.  If a FilterCallback returns false, Breakpad
   // will immediately report the exception as unhandled without writing a
   // minidump, allowing another handler the opportunity to handle it.
-  typedef bool (*FilterCallback)(void *context);
+  typedef bool (*FilterCallback)(void* context);
 
   // A callback function to run after the minidump has been written.
   // |minidump_id| is a unique id for the dump, so the minidump
@@ -63,18 +63,18 @@
   // Return true if the exception was fully handled and breakpad should exit.
   // Return false to allow any other exception handlers to process the
   // exception.
-  typedef bool (*MinidumpCallback)(const char *dump_dir,
-                                   const char *minidump_id,
-                                   void *context, bool succeeded);
+  typedef bool (*MinidumpCallback)(const char* dump_dir,
+                                   const char* minidump_id,
+                                   void* context, bool succeeded);
 
   // A callback function which will be called directly if an exception occurs.
   // This bypasses the minidump file writing and simply gives the client
   // the exception information.
-  typedef bool (*DirectCallback)( void *context,
-                                  int exception_type,
-                                  int exception_code,
-                                  int exception_subcode,
-                                  mach_port_t thread_name);
+  typedef bool (*DirectCallback)(void* context,
+                                 int exception_type,
+                                 int exception_code,
+                                 int exception_subcode,
+                                 mach_port_t thread_name);
 
   // Creates a new ExceptionHandler instance to handle writing minidumps.
   // Minidump files will be written to dump_path, and the optional callback
@@ -84,22 +84,22 @@
   // be written when WriteMinidump is called.
   // If port_name is non-NULL, attempt to perform out-of-process dump generation
   // If port_name is NULL, in-process dump generation will be used.
-  ExceptionHandler(const string &dump_path,
+  ExceptionHandler(const string& dump_path,
                    FilterCallback filter, MinidumpCallback callback,
-                   void *callback_context, bool install_handler,
-                   const char *port_name);
+                   void* callback_context, bool install_handler,
+                   const char* port_name);
 
   // A special constructor if we want to bypass minidump writing and
   // simply get a callback with the exception information.
   ExceptionHandler(DirectCallback callback,
-                   void *callback_context,
+                   void* callback_context,
                    bool install_handler);
 
   ~ExceptionHandler();
 
   // Get and set the minidump path.
   string dump_path() const { return dump_path_; }
-  void set_dump_path(const string &dump_path) {
+  void set_dump_path(const string& dump_path) {
     dump_path_ = dump_path;
     dump_path_c_ = dump_path_.c_str();
     UpdateNextID();  // Necessary to put dump_path_ in next_minidump_path_.
@@ -126,7 +126,7 @@
   bool WriteMinidumpWithException(int exception_type,
                                   int exception_code,
                                   int exception_subcode,
-                                  breakpad_ucontext_t *task_context,
+                                  breakpad_ucontext_t* task_context,
                                   mach_port_t thread_name,
                                   bool exit_after_write,
                                   bool report_current_thread);
@@ -135,8 +135,8 @@
   static void SignalHandler(int sig, siginfo_t* info, void* uc);
 
   // disallow copy ctor and operator=
-  explicit ExceptionHandler(const ExceptionHandler &);
-  void operator=(const ExceptionHandler &);
+  explicit ExceptionHandler(const ExceptionHandler&);
+  void operator=(const ExceptionHandler&);
 
   // Generates a new ID and stores it in next_minidump_id_, and stores the
   // path of the next minidump to be written in next_minidump_path_.
@@ -152,15 +152,15 @@
   string next_minidump_path_;
 
   // Pointers to the UTF-8 versions of above
-  const char *dump_path_c_;
-  const char *next_minidump_id_c_;
-  const char *next_minidump_path_c_;
+  const char* dump_path_c_;
+  const char* next_minidump_id_c_;
+  const char* next_minidump_path_c_;
 
   // The callback function and pointer to be passed back after the minidump
   // has been written
   FilterCallback filter_;
   MinidumpCallback callback_;
-  void *callback_context_;
+  void* callback_context_;
 
   // The callback function to be passed back when we don't want a minidump
   // file to be written
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/handler/ios_exception_minidump_generator.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/handler/ios_exception_minidump_generator.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/handler/ios_exception_minidump_generator.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/ios/handler/ios_exception_minidump_generator.h	2021-12-09 12:01:26.000000000 +0000
@@ -41,12 +41,12 @@
 
 class IosExceptionMinidumpGenerator : public MinidumpGenerator {
  public:
-  explicit IosExceptionMinidumpGenerator(NSException *exception);
+  explicit IosExceptionMinidumpGenerator(NSException* exception);
   virtual ~IosExceptionMinidumpGenerator();
 
  protected:
-  virtual bool WriteExceptionStream(MDRawDirectory *exception_stream);
-  virtual bool WriteThreadStream(mach_port_t thread_id, MDRawThread *thread);
+  virtual bool WriteExceptionStream(MDRawDirectory* exception_stream);
+  virtual bool WriteThreadStream(mach_port_t thread_id, MDRawThread* thread);
 
  private:
 
@@ -57,16 +57,16 @@
   uintptr_t GetLRFromException();
 
   // Write a virtual thread context for the crashing site.
-  bool WriteCrashingContext(MDLocationDescriptor *register_location);
+  bool WriteCrashingContext(MDLocationDescriptor* register_location);
   // Per-CPU implementations of the above method.
 #ifdef HAS_ARM_SUPPORT
-  bool WriteCrashingContextARM(MDLocationDescriptor *register_location);
+  bool WriteCrashingContextARM(MDLocationDescriptor* register_location);
 #endif
 #ifdef HAS_ARM64_SUPPORT
-  bool WriteCrashingContextARM64(MDLocationDescriptor *register_location);
+  bool WriteCrashingContextARM64(MDLocationDescriptor* register_location);
 #endif
 
-  NSArray *return_addresses_;
+  NSArray* return_addresses_;
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/crash_generation/crash_generation_server.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/crash_generation/crash_generation_server.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/crash_generation/crash_generation_server.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/crash_generation/crash_generation_server.cc	2021-12-09 12:01:26.000000000 +0000
@@ -229,7 +229,7 @@
   // Walk the control payload and extract the file descriptor and validated pid.
   pid_t crashing_pid = -1;
   int signal_fd = -1;
-  for (struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); hdr;
+  for (struct cmsghdr* hdr = CMSG_FIRSTHDR(&msg); hdr;
        hdr = CMSG_NXTHDR(&msg, hdr)) {
     if (hdr->cmsg_level != SOL_SOCKET)
       continue;
@@ -248,7 +248,7 @@
         signal_fd = reinterpret_cast<int*>(CMSG_DATA(hdr))[0];
       }
     } else if (hdr->cmsg_type == SCM_CREDENTIALS) {
-      const struct ucred *cred =
+      const struct ucred* cred =
           reinterpret_cast<struct ucred*>(CMSG_DATA(hdr));
       crashing_pid = cred->pid;
     }
@@ -324,7 +324,7 @@
 
 // static
 void*
-CrashGenerationServer::ThreadMain(void *arg)
+CrashGenerationServer::ThreadMain(void* arg)
 {
   reinterpret_cast<CrashGenerationServer*>(arg)->Run();
   return NULL;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2021-12-09 12:01:26.000000000 +0000
@@ -48,8 +48,8 @@
   return uc->uc_mcontext.gregs[REG_EIP];
 }
 
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                                    const struct _libc_fpstate* fp) {
+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                                    const fpstate_t* fp) {
   const greg_t* regs = uc->uc_mcontext.gregs;
 
   out->context_flags = MD_CONTEXT_X86_FULL |
@@ -96,8 +96,8 @@
   return uc->uc_mcontext.gregs[REG_RIP];
 }
 
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                                    const struct _libc_fpstate* fpregs) {
+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                                    const fpstate_t* fpregs) {
   const greg_t* regs = uc->uc_mcontext.gregs;
 
   out->context_flags = MD_CONTEXT_AMD64_FULL;
@@ -153,7 +153,7 @@
   return uc->uc_mcontext.arm_pc;
 }
 
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc) {
   out->context_flags = MD_CONTEXT_ARM_FULL;
 
   out->iregs[0] = uc->uc_mcontext.arm_r0;
@@ -192,7 +192,7 @@
   return uc->uc_mcontext.pc;
 }
 
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
                                     const struct fpsimd_context* fpregs) {
   out->context_flags = MD_CONTEXT_ARM64_FULL_OLD;
 
@@ -218,7 +218,7 @@
   return uc->uc_mcontext.pc;
 }
 
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc) {
 #if _MIPS_SIM == _ABI64
   out->context_flags = MD_CONTEXT_MIPS64_FULL;
 #elif _MIPS_SIM == _ABIO32
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2021-12-09 12:01:26.000000000 +0000
@@ -34,6 +34,7 @@
 #include <sys/user.h>
 
 #include "client/linux/dump_writer_common/raw_context_cpu.h"
+#include "client/linux/minidump_writer/minidump_writer.h"
 #include "common/memory_allocator.h"
 #include "google_breakpad/common/minidump_format.h"
 
@@ -49,13 +50,13 @@
   //   out: the minidump structure
   //   info: the collection of register structures.
 #if defined(__i386__) || defined(__x86_64)
-  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                             const struct _libc_fpstate* fp);
+  static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                             const fpstate_t* fp);
 #elif defined(__aarch64__)
-  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+  static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
                              const struct fpsimd_context* fpregs);
 #else
-  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
+  static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
 #endif
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler.cc	2021-12-09 12:01:26.000000000 +0000
@@ -78,7 +78,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <sys/signal.h>
 #include <sys/ucontext.h>
 #include <sys/user.h>
 #include <ucontext.h>
@@ -88,6 +87,7 @@
 #include <vector>
 
 #include "common/basictypes.h"
+#include "common/linux/breakpad_getcontext.h"
 #include "common/linux/linux_libc_support.h"
 #include "common/memory_allocator.h"
 #include "client/linux/log/log.h"
@@ -419,8 +419,8 @@
 // This is the entry function for the cloned process. We are in a compromised
 // context here: see the top of the file.
 // static
-int ExceptionHandler::ThreadEntry(void *arg) {
-  const ThreadArgument *thread_arg = reinterpret_cast<ThreadArgument*>(arg);
+int ExceptionHandler::ThreadEntry(void* arg) {
+  const ThreadArgument* thread_arg = reinterpret_cast<ThreadArgument*>(arg);
 
   // Close the write end of the pipe. This allows us to fail if the parent dies
   // while waiting for the continue signal.
@@ -495,7 +495,7 @@
 }
 
 // This function may run in a compromised context: see the top of the file.
-bool ExceptionHandler::GenerateDump(CrashContext *context) {
+bool ExceptionHandler::GenerateDump(CrashContext* context) {
   if (IsOutOfProcess())
     return crash_generation_client_->RequestDump(context, sizeof(*context));
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler.h	2021-12-09 12:01:26.000000000 +0000
@@ -82,7 +82,7 @@
   // attempting to write a minidump.  If a FilterCallback returns false,
   // Breakpad  will immediately report the exception as unhandled without
   // writing a minidump, allowing another handler the opportunity to handle it.
-  typedef bool (*FilterCallback)(void *context);
+  typedef bool (*FilterCallback)(void* context);
 
   // A callback function to run after the minidump has been written.
   // |descriptor| contains the file descriptor or file path containing the
@@ -234,7 +234,7 @@
   static void RestoreHandlersLocked();
 
   void PreresolveSymbols();
-  bool GenerateDump(CrashContext *context);
+  bool GenerateDump(CrashContext* context);
   void SendContinueSignalToChild();
   void WaitForContinueSignal();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/handler/exception_handler_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -27,12 +27,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <poll.h>
 #include <pthread.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/mman.h>
-#include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
@@ -201,7 +201,7 @@
 // optimize them out. In the case of ExceptionHandlerTest::ExternalDumper,
 // GCC-4.9 optimized out the entire set up of ExceptionHandler, causing
 // test failure.
-volatile int *p_null;  // external linkage, so GCC can't tell that it
+volatile int* p_null;  // external linkage, so GCC can't tell that it
                        // remains NULL. Volatile just for a good measure.
 static void DoNullPointerDereference() {
   *p_null = 1;
@@ -887,13 +887,13 @@
 
   uint64_t instruction_pointer;
   ASSERT_TRUE(exception_context->GetInstructionPointer(&instruction_pointer));
-  EXPECT_EQ(instruction_pointer, 0);
+  EXPECT_EQ(instruction_pointer, 0u);
 
   MinidumpMemoryList* memory_list = minidump.GetMemoryList();
   ASSERT_TRUE(memory_list);
 
   unsigned int region_count = memory_list->region_count();
-  ASSERT_GE(region_count, 1);
+  ASSERT_GE(region_count, 1u);
 
   for (unsigned int region_index = 0;
        region_index < region_count;
@@ -994,7 +994,7 @@
   msg.msg_control = cmsg;
   msg.msg_controllen = sizeof(cmsg);
 
-  struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg);
+  struct cmsghdr* hdr = CMSG_FIRSTHDR(&msg);
   hdr->cmsg_level = SOL_SOCKET;
   hdr->cmsg_type = SCM_RIGHTS;
   hdr->cmsg_len = CMSG_LEN(sizeof(int));
@@ -1003,7 +1003,7 @@
   hdr->cmsg_level = SOL_SOCKET;
   hdr->cmsg_type = SCM_CREDENTIALS;
   hdr->cmsg_len = CMSG_LEN(sizeof(struct ucred));
-  struct ucred *cred = reinterpret_cast<struct ucred*>(CMSG_DATA(hdr));
+  struct ucred* cred = reinterpret_cast<struct ucred*>(CMSG_DATA(hdr));
   cred->uid = getuid();
   cred->gid = getgid();
   cred->pid = getpid();
@@ -1056,7 +1056,7 @@
 
   pid_t crashing_pid = -1;
   int signal_fd = -1;
-  for (struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); hdr;
+  for (struct cmsghdr* hdr = CMSG_FIRSTHDR(&msg); hdr;
        hdr = CMSG_NXTHDR(&msg, hdr)) {
     if (hdr->cmsg_level != SOL_SOCKET)
       continue;
@@ -1066,7 +1066,7 @@
       ASSERT_EQ(sizeof(int), len);
       signal_fd = *(reinterpret_cast<int*>(CMSG_DATA(hdr)));
     } else if (hdr->cmsg_type == SCM_CREDENTIALS) {
-      const struct ucred *cred =
+      const struct ucred* cred =
           reinterpret_cast<struct ucred*>(CMSG_DATA(hdr));
       crashing_pid = cred->pid;
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/log/log.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/log/log.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/log/log.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/log/log.cc	2021-12-09 12:01:26.000000000 +0000
@@ -44,8 +44,8 @@
 // __android_log_buf_write() is not exported in the NDK and is being used by
 // dynamic runtime linking. Its declaration is taken from Android's
 // system/core/include/log/log.h.
-using AndroidLogBufferWriteFunc = int (*)(int bufID, int prio, const char *tag,
-                                          const char *text);
+using AndroidLogBufferWriteFunc = int (*)(int bufID, int prio, const char* tag,
+                                          const char* text);
 const int kAndroidCrashLogId = 4;  // From LOG_ID_CRASH in log.h.
 const char kAndroidLogTag[] = "google-breakpad";
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -40,6 +40,7 @@
 #include "client/linux/handler/exception_handler.h"
 #include "client/linux/handler/microdump_extra_info.h"
 #include "client/linux/microdump_writer/microdump_writer.h"
+#include "common/linux/breakpad_getcontext.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/ignore_ret.h"
 #include "common/scoped_ptr.h"
@@ -209,14 +210,14 @@
       string token;
       unsigned crash_reason;
       string crash_reason_str;
-      intptr_t crash_address;
+      uintptr_t crash_address;
       crash_reason_tokens.ignore(2); // Ignore the "R " preamble.
       crash_reason_tokens >> std::hex >> crash_reason >> crash_reason_str >>
           crash_address;
       ASSERT_FALSE(crash_reason_tokens.fail());
       ASSERT_EQ(MD_EXCEPTION_CODE_LIN_DUMP_REQUESTED, crash_reason);
       ASSERT_EQ("DUMP_REQUESTED", crash_reason_str);
-      ASSERT_EQ(0xDEADDEADu, kCrashAddress);
+      ASSERT_EQ(kCrashAddress, crash_address);
       did_find_crash_reason = true;
     } else if (line.find("V ") == 0) {
       if (expected_info.product_info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -47,7 +47,7 @@
 TEST(DirectoryReaderTest, CompareResults) {
   std::set<string> dent_set;
 
-  DIR *const dir = opendir("/proc/self");
+  DIR* const dir = opendir("/proc/self");
   ASSERT_TRUE(dir != NULL);
 
   struct dirent* dent;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/line_reader.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/line_reader.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/line_reader.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/line_reader.h	2021-12-09 12:01:26.000000000 +0000
@@ -61,7 +61,7 @@
   //
   // One must call |PopLine| after this function, otherwise you'll continue to
   // get the same line over and over.
-  bool GetNextLine(const char **line, unsigned *len) {
+  bool GetNextLine(const char** line, unsigned* len) {
     for (;;) {
       if (buf_used_ == 0 && hit_eof_)
         return false;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -59,7 +59,7 @@
   ASSERT_TRUE(file.IsOk());
   LineReader reader(file.GetFd());
 
-  const char *line;
+  const char* line;
   unsigned len;
   ASSERT_FALSE(reader.GetNextLine(&line, &len));
 }
@@ -69,7 +69,7 @@
   ASSERT_TRUE(file.IsOk());
   LineReader reader(file.GetFd());
 
-  const char *line;
+  const char* line;
   unsigned int len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
   ASSERT_EQ((unsigned int)1, len);
@@ -85,7 +85,7 @@
   ASSERT_TRUE(file.IsOk());
   LineReader reader(file.GetFd());
 
-  const char *line;
+  const char* line;
   unsigned len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
   ASSERT_EQ((unsigned)1, len);
@@ -101,7 +101,7 @@
   ASSERT_TRUE(file.IsOk());
   LineReader reader(file.GetFd());
 
-  const char *line;
+  const char* line;
   unsigned len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
   ASSERT_EQ((unsigned)1, len);
@@ -123,7 +123,7 @@
   ASSERT_TRUE(file.IsOk());
   LineReader reader(file.GetFd());
 
-  const char *line;
+  const char* line;
   unsigned len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
   ASSERT_EQ((unsigned)1, len);
@@ -147,7 +147,7 @@
   ASSERT_TRUE(file.IsOk());
   LineReader reader(file.GetFd());
 
-  const char *line;
+  const char* line;
   unsigned len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
   ASSERT_EQ(sizeof(l), len);
@@ -163,7 +163,7 @@
   ASSERT_TRUE(file.IsOk());
   LineReader reader(file.GetFd());
 
-  const char *line;
+  const char* line;
   unsigned len;
   ASSERT_FALSE(reader.GetNextLine(&line, &len));
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.cc	2021-12-09 12:01:26.000000000 +0000
@@ -135,7 +135,7 @@
 //   next is backed by some file.
 //   curr and next are contiguous.
 //   offset(next) == sizeof(curr)
-void TryRecoverMappings(MappingInfo *curr, MappingInfo *next) {
+void TryRecoverMappings(MappingInfo* curr, MappingInfo* next) {
   // Merged segments are marked with size = 0.
   if (curr->size == 0 || next->size == 0)
     return;
@@ -167,8 +167,8 @@
 //   next and prev are backed by the same file.
 //   prev, curr and next are contiguous.
 //   offset(next) == offset(prev) + sizeof(prev) + sizeof(curr)
-void TryRecoverMappings(MappingInfo *prev, MappingInfo *curr,
-    MappingInfo *next) {
+void TryRecoverMappings(MappingInfo* prev, MappingInfo* curr,
+                        MappingInfo* next) {
   // Merged segments are marked with size = 0.
   if (prev->size == 0 || curr->size == 0 || next->size == 0)
     return;
@@ -439,49 +439,6 @@
 }
 
 namespace {
-bool ElfFileSoNameFromMappedFile(
-    const void* elf_base, char* soname, size_t soname_size) {
-  if (!IsValidElf(elf_base)) {
-    // Not ELF
-    return false;
-  }
-
-  const void* segment_start;
-  size_t segment_size;
-  if (!FindElfSection(elf_base, ".dynamic", SHT_DYNAMIC, &segment_start,
-                      &segment_size)) {
-    // No dynamic section
-    return false;
-  }
-
-  const void* dynstr_start;
-  size_t dynstr_size;
-  if (!FindElfSection(elf_base, ".dynstr", SHT_STRTAB, &dynstr_start,
-                      &dynstr_size)) {
-    // No dynstr section
-    return false;
-  }
-
-  const ElfW(Dyn)* dynamic = static_cast<const ElfW(Dyn)*>(segment_start);
-  size_t dcount = segment_size / sizeof(ElfW(Dyn));
-  for (const ElfW(Dyn)* dyn = dynamic; dyn < dynamic + dcount; ++dyn) {
-    if (dyn->d_tag == DT_SONAME) {
-      const char* dynstr = static_cast<const char*>(dynstr_start);
-      if (dyn->d_un.d_val >= dynstr_size) {
-        // Beyond the end of the dynstr section
-        return false;
-      }
-      const char* str = dynstr + dyn->d_un.d_val;
-      const size_t maxsize = dynstr_size - dyn->d_un.d_val;
-      my_strlcpy(soname, str, maxsize < soname_size ? maxsize : soname_size);
-      return true;
-    }
-  }
-
-  // Did not find SONAME
-  return false;
-}
-
 // Find the shared object name (SONAME) by examining the ELF information
 // for |mapping|. If the SONAME is found copy it into the passed buffer
 // |soname| and return true. The size of the buffer is |soname_size|.
@@ -516,19 +473,26 @@
                                                  size_t file_name_size) {
   my_strlcpy(file_path, mapping.name, file_path_size);
 
-  // If an executable is mapped from a non-zero offset, this is likely because
-  // the executable was loaded directly from inside an archive file (e.g., an
-  // apk on Android). We try to find the name of the shared object (SONAME) by
-  // looking in the file for ELF sections.
-  bool mapped_from_archive = false;
-  if (mapping.exec && mapping.offset != 0) {
-    mapped_from_archive =
-        ElfFileSoName(*this, mapping, file_name, file_name_size);
+  // Tools such as minidump_stackwalk use the name of the module to look up
+  // symbols produced by dump_syms. dump_syms will prefer to use a module's
+  // DT_SONAME as the module name, if one exists, and will fall back to the
+  // filesystem name of the module.
+
+  // Just use the filesystem name if no SONAME is present.
+  if (!ElfFileSoName(*this, mapping, file_name, file_name_size)) {
+    //   file_path := /path/to/libname.so
+    //   file_name := libname.so
+    const char* basename = my_strrchr(file_path, '/');
+    basename = basename == NULL ? file_path : (basename + 1);
+    my_strlcpy(file_name, basename, file_name_size);
+    return;
   }
 
-  if (mapped_from_archive) {
-    // Some tools (e.g., stackwalk) extract the basename from the pathname. In
-    // this case, we append the file_name to the mapped archive path as follows:
+  if (mapping.exec && mapping.offset != 0) {
+    // If an executable is mapped from a non-zero offset, this is likely because
+    // the executable was loaded directly from inside an archive file (e.g., an
+    // apk on Android).
+    // In this case, we append the file_name to the mapped archive path:
     //   file_name := libname.so
     //   file_path := /path/to/ARCHIVE.APK/libname.so
     if (my_strlen(file_path) + 1 + my_strlen(file_name) < file_path_size) {
@@ -536,12 +500,15 @@
       my_strlcat(file_path, file_name, file_path_size);
     }
   } else {
-    // Common case:
-    //   file_path := /path/to/libname.so
-    //   file_name := libname.so
-    const char* basename = my_strrchr(file_path, '/');
-    basename = basename == NULL ? file_path : (basename + 1);
-    my_strlcpy(file_name, basename, file_name_size);
+    // Otherwise, replace the basename with the SONAME.
+    char* basename = const_cast<char*>(my_strrchr(file_path, '/'));
+    if (basename) {
+      my_strlcpy(basename + 1, file_name,
+                 file_path_size - my_strlen(file_path) +
+                     my_strlen(basename + 1));
+    } else {
+      my_strlcpy(file_path, file_name, file_path_size);
+    }
   }
 }
 
@@ -584,11 +551,11 @@
   // See http://www.trilithium.com/johan/2005/08/linux-gate/ for more
   // information.
   const void* linux_gate_loc =
-      reinterpret_cast<void *>(auxv_[AT_SYSINFO_EHDR]);
+      reinterpret_cast<void*>(auxv_[AT_SYSINFO_EHDR]);
   // Although the initial executable is usually the first mapping, it's not
   // guaranteed (see http://crosbug.com/25355); therefore, try to use the
   // actual entry point to find the mapping.
-  const void* entry_point_loc = reinterpret_cast<void *>(auxv_[AT_ENTRY]);
+  const void* entry_point_loc = reinterpret_cast<void*>(auxv_[AT_ENTRY]);
 
   const int fd = sys_open(maps_path, O_RDONLY, 0);
   if (fd < 0)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper.h	2021-12-09 12:01:26.000000000 +0000
@@ -110,8 +110,8 @@
   }
 
   // These are only valid after a call to |Init|.
-  const wasteful_vector<pid_t> &threads() { return threads_; }
-  const wasteful_vector<MappingInfo*> &mappings() { return mappings_; }
+  const wasteful_vector<pid_t>& threads() { return threads_; }
+  const wasteful_vector<MappingInfo*>& mappings() { return mappings_; }
   const MappingInfo* FindMapping(const void* address) const;
   // Find the mapping which the given memory address falls in. Unlike
   // FindMapping, this method uses the unadjusted mapping address
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc	2021-12-09 12:01:26.000000000 +0000
@@ -55,8 +55,8 @@
 #error This test has not been ported to this platform.
 #endif
 
-void *thread_function(void *data) {
-  int pipefd = *static_cast<int *>(data);
+void* thread_function(void* data) {
+  int pipefd = *static_cast<int*>(data);
   volatile pid_t* thread_id = new pid_t;
   *thread_id = syscall(__NR_gettid);
   // Signal parent that a thread has started.
@@ -65,13 +65,13 @@
     perror("ERROR: parent notification failed");
     return NULL;
   }
-  register volatile pid_t *thread_id_ptr asm(TID_PTR_REGISTER) = thread_id;
+  register volatile pid_t* thread_id_ptr asm(TID_PTR_REGISTER) = thread_id;
   while (true)
     asm volatile ("" : : "r" (thread_id_ptr));
   return NULL;
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   if (argc < 3) {
     fprintf(stderr,
             "usage: linux_dumper_unittest_helper <pipe fd> <# of threads>\n");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -36,13 +36,13 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <poll.h>
 #include <unistd.h>
 #include <signal.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
-#include <sys/poll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -337,7 +337,7 @@
   ASSERT_TRUE(dumper.Init());
 
   void* linux_gate_loc =
-    reinterpret_cast<void *>(dumper.auxv()[AT_SYSINFO_EHDR]);
+    reinterpret_cast<void*>(dumper.auxv()[AT_SYSINFO_EHDR]);
   ASSERT_TRUE(linux_gate_loc);
   bool found_linux_gate = false;
 
@@ -426,7 +426,7 @@
 #undef TestBody
 
 TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
-  static const int kNumberOfThreadsInHelperProgram = 5;
+  static const size_t kNumberOfThreadsInHelperProgram = 5;
 
   pid_t child_pid = SetupChildProcess(kNumberOfThreadsInHelperProgram);
   ASSERT_NE(child_pid, -1);
@@ -484,7 +484,7 @@
 }
 
 TEST_F(LinuxPtraceDumperTest, SanitizeStackCopy) {
-  static const int kNumberOfThreadsInHelperProgram = 1;
+  static const size_t kNumberOfThreadsInHelperProgram = 1;
 
   pid_t child_pid = SetupChildProcess(kNumberOfThreadsInHelperProgram);
   ASSERT_NE(child_pid, -1);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.cc	2021-12-09 12:01:26.000000000 +0000
@@ -740,14 +740,14 @@
   }
 
   bool WriteDSODebugStream(MDRawDirectory* dirent) {
-    ElfW(Phdr)* phdr = reinterpret_cast<ElfW(Phdr) *>(dumper_->auxv()[AT_PHDR]);
+    ElfW(Phdr)* phdr = reinterpret_cast<ElfW(Phdr)*>(dumper_->auxv()[AT_PHDR]);
     char* base;
     int phnum = dumper_->auxv()[AT_PHNUM];
     if (!phnum || !phdr)
       return false;
 
     // Assume the program base is at the beginning of the same page as the PHDR
-    base = reinterpret_cast<char *>(reinterpret_cast<uintptr_t>(phdr) & ~0xfff);
+    base = reinterpret_cast<char*>(reinterpret_cast<uintptr_t>(phdr) & ~0xfff);
 
     // Search for the program PT_DYNAMIC segment
     ElfW(Addr) dyn_addr = 0;
@@ -768,7 +768,7 @@
     if (!dyn_addr)
       return false;
 
-    ElfW(Dyn) *dynamic = reinterpret_cast<ElfW(Dyn) *>(dyn_addr + base);
+    ElfW(Dyn)* dynamic = reinterpret_cast<ElfW(Dyn)*>(dyn_addr + base);
 
     // The dynamic linker makes information available that helps gdb find all
     // DSOs loaded into the program. If this information is indeed available,
@@ -1222,7 +1222,7 @@
       Buffers* next;
       size_t len;
       uint8_t data[kBufSize];
-    } *buffers = reinterpret_cast<Buffers*>(Alloc(sizeof(Buffers)));
+    }* buffers = reinterpret_cast<Buffers*>(Alloc(sizeof(Buffers)));
     buffers->next = NULL;
     buffers->len = 0;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer.h	2021-12-09 12:01:26.000000000 +0000
@@ -36,6 +36,7 @@
 #include <unistd.h>
 
 #include <list>
+#include <type_traits>
 #include <utility>
 
 #include "client/linux/minidump_writer/linux_dumper.h"
@@ -48,7 +49,7 @@
 #if defined(__aarch64__)
 typedef struct fpsimd_context fpstate_t;
 #elif !defined(__ARM_EABI__) && !defined(__mips__)
-typedef struct _libc_fpstate fpstate_t;
+typedef std::remove_pointer<fpregset_t>::type fpstate_t;
 #endif
 
 // These entries store a list of memory regions that the client wants included
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -28,7 +28,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <fcntl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
@@ -42,6 +42,7 @@
 #include "client/linux/minidump_writer/linux_dumper.h"
 #include "client/linux/minidump_writer/minidump_writer.h"
 #include "client/linux/minidump_writer/minidump_writer_unittest_utils.h"
+#include "common/linux/breakpad_getcontext.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/file_id.h"
 #include "common/linux/ignore_ret.h"
@@ -298,10 +299,10 @@
   Minidump minidump(templ);
   ASSERT_TRUE(minidump.Read());
 
-  MinidumpThreadList *threads = minidump.GetThreadList();
+  MinidumpThreadList* threads = minidump.GetThreadList();
   int threads_with_stacks = 0;
   for (unsigned int i = 0; i < threads->thread_count(); ++i) {
-    MinidumpThread *thread = threads->GetThreadAtIndex(i);
+    MinidumpThread* thread = threads->GetThreadAtIndex(i);
     if (thread->GetMemory()) {
       ++threads_with_stacks;
     }
@@ -352,13 +353,13 @@
 #else
       0x0defaced;
 #endif
-  MinidumpThreadList *threads = minidump.GetThreadList();
+  MinidumpThreadList* threads = minidump.GetThreadList();
   for (unsigned int i = 0; i < threads->thread_count(); ++i) {
-    MinidumpThread *thread = threads->GetThreadAtIndex(i);
-    MinidumpMemoryRegion *mem = thread->GetMemory();
+    MinidumpThread* thread = threads->GetThreadAtIndex(i);
+    MinidumpMemoryRegion* mem = thread->GetMemory();
     ASSERT_TRUE(mem != nullptr);
     uint32_t sz = mem->GetSize();
-    const uint8_t *data = mem->GetMemory();
+    const uint8_t* data = mem->GetMemory();
     ASSERT_TRUE(memmem(data, sz, &defaced, sizeof(defaced)) != nullptr);
   }
   close(fds[1]);
@@ -520,7 +521,7 @@
   // Copy binary to a temp file.
   AutoTempDir temp_dir;
   string binpath = temp_dir.path() + "/linux-dumper-unittest-helper";
-  ASSERT_TRUE(CopyFile(helper_path.c_str(), binpath.c_str()))
+  ASSERT_TRUE(CopyFile(helper_path, binpath))
       << "Failed to copy " << helper_path << " to " << binpath;
   ASSERT_EQ(0, chmod(binpath.c_str(), 0755));
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc	2021-12-09 12:01:26.000000000 +0000
@@ -41,7 +41,7 @@
 
 string GetHelperBinary() {
   string helper_path;
-  char *bindir = getenv("bindir");
+  char* bindir = getenv("bindir");
   if (bindir) {
     helper_path = string(bindir) + "/";
   } else {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -65,7 +65,7 @@
   ASSERT_TRUE(file.IsOk());
   ProcCpuInfoReader reader(file.GetFd());
 
-  const char *field;
+  const char* field;
   ASSERT_FALSE(reader.GetNextField(&field));
 }
 
@@ -74,7 +74,7 @@
   ASSERT_TRUE(file.IsOk());
   ProcCpuInfoReader reader(file.GetFd());
 
-  const char *field;
+  const char* field;
   ASSERT_TRUE(reader.GetNextField(&field));
   ASSERT_STREQ("foo", field);
   ASSERT_STREQ("bar", reader.GetValue());
@@ -87,7 +87,7 @@
   ASSERT_TRUE(file.IsOk());
   ProcCpuInfoReader reader(file.GetFd());
 
-  const char *field;
+  const char* field;
   size_t value_len;
   ASSERT_TRUE(reader.GetNextField(&field));
   ASSERT_STREQ("foo", field);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/sender/google_crash_report_sender.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/sender/google_crash_report_sender.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/sender/google_crash_report_sender.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/linux/sender/google_crash_report_sender.cc	2021-12-09 12:01:26.000000000 +0000
@@ -84,7 +84,7 @@
   return true;
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   google::InitGoogleLogging(argv[0]);
   google::ParseCommandLineFlags(&argc, &argv, true);
   if (!CheckForRequiredFlagsOrDie()) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/ConfigFile.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/ConfigFile.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/ConfigFile.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/ConfigFile.h	2021-12-09 12:01:26.000000000 +0000
@@ -35,7 +35,7 @@
 
 namespace google_breakpad {
 
-BOOL EnsureDirectoryPathExists(NSString *dirPath);
+BOOL EnsureDirectoryPathExists(NSString* dirPath);
 
 //=============================================================================
 class ConfigFile {
@@ -50,11 +50,11 @@
   }
 
   void WriteFile(const char* directory,
-                 const SimpleStringDictionary *configurationParameters,
-                 const char *dump_dir,
-                 const char *minidump_id);
+                 const SimpleStringDictionary* configurationParameters,
+                 const char* dump_dir,
+                 const char* minidump_id);
 
-  const char *GetFilePath() { return config_file_path_; }
+  const char* GetFilePath() { return config_file_path_; }
 
   void Unlink() {
     if (config_file_ != -1)
@@ -64,16 +64,16 @@
   }
 
  private:
-  BOOL WriteData(const void *data, size_t length);
+  BOOL WriteData(const void* data, size_t length);
 
-  BOOL AppendConfigData(const char *key,
-                        const void *data,
+  BOOL AppendConfigData(const char* key,
+                        const void* data,
                         size_t length);
 
-  BOOL AppendConfigString(const char *key,
-                          const char *value);
+  BOOL AppendConfigString(const char* key,
+                          const char* value);
 
-  BOOL AppendCrashTimeParameters(const char *processStartTimeString);
+  BOOL AppendCrashTimeParameters(const char* processStartTimeString);
 
   int   config_file_;                    // descriptor for config file
   char  config_file_path_[PATH_MAX];     // Path to configuration file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.cc	2021-12-09 12:01:26.000000000 +0000
@@ -38,15 +38,15 @@
 namespace google_breakpad {
 
 CrashGenerationServer::CrashGenerationServer(
-    const char *mach_port_name,
+    const char* mach_port_name,
     FilterCallback filter,
-    void *filter_context,
+    void* filter_context,
     OnClientDumpRequestCallback dump_callback,
-    void *dump_context,
+    void* dump_context,
     OnClientExitingCallback exit_callback,
-    void *exit_context,
+    void* exit_context,
     bool generate_dumps,
-    const std::string &dump_path)
+    const std::string& dump_path)
     : filter_(filter),
       filter_context_(filter_context),
       dump_callback_(dump_callback),
@@ -90,8 +90,8 @@
 }
 
 // static
-void *CrashGenerationServer::WaitForMessages(void *server) {
-  CrashGenerationServer *self =
+void* CrashGenerationServer::WaitForMessages(void* server) {
+  CrashGenerationServer* self =
       reinterpret_cast<CrashGenerationServer*>(server);
   while (self->WaitForOneMessage()) {}
   return NULL;
@@ -104,7 +104,7 @@
   if (result == KERN_SUCCESS) {
     switch (message.GetMessageID()) {
       case kDumpRequestMessage: {
-        ExceptionInfo &info = (ExceptionInfo &)*message.GetData();
+        ExceptionInfo& info = (ExceptionInfo&)*message.GetData();
       
         mach_port_t remote_task = message.GetTranslatedPort(0);
         mach_port_t crashing_thread = message.GetTranslatedPort(1);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/crash_generation_server.h	2021-12-09 12:01:26.000000000 +0000
@@ -59,14 +59,14 @@
   // WARNING: callbacks may be invoked on a different thread
   // than that which creates the CrashGenerationServer.  They must
   // be thread safe.
-  typedef void (*OnClientDumpRequestCallback)(void *context,
-                                              const ClientInfo &client_info,
-                                              const std::string &file_path);
+  typedef void (*OnClientDumpRequestCallback)(void* context,
+                                              const ClientInfo& client_info,
+                                              const std::string& file_path);
 
-  typedef void (*OnClientExitingCallback)(void *context,
-                                          const ClientInfo &client_info);
+  typedef void (*OnClientExitingCallback)(void* context,
+                                          const ClientInfo& client_info);
   // If a FilterCallback returns false, the dump will not be written.
-  typedef bool (*FilterCallback)(void *context);
+  typedef bool (*FilterCallback)(void* context);
 
   // Create an instance with the given parameters.
   //
@@ -83,15 +83,15 @@
   //     passed for this parameter.
   // dump_path: Path for generating dumps; required only if true is
   //     passed for generateDumps parameter; NULL can be passed otherwise.
-  CrashGenerationServer(const char *mach_port_name,
+  CrashGenerationServer(const char* mach_port_name,
                         FilterCallback filter,
-                        void *filter_context,
+                        void* filter_context,
                         OnClientDumpRequestCallback dump_callback,
-                        void *dump_context,
+                        void* dump_context,
                         OnClientExitingCallback exit_callback,
-                        void *exit_context,
+                        void* exit_context,
                         bool generate_dumps,
-                        const std::string &dump_path);
+                        const std::string& dump_path);
 
   ~CrashGenerationServer();
 
@@ -105,24 +105,24 @@
 
  private:
   // Return a unique filename at which a minidump can be written.
-  bool MakeMinidumpFilename(std::string &outFilename);
+  bool MakeMinidumpFilename(std::string& outFilename);
 
   // Loop reading client messages and responding to them until
   // a quit message is received.
-  static void *WaitForMessages(void *server);
+  static void* WaitForMessages(void* server);
 
   // Wait for a single client message and respond to it. Returns false
   // if a quit message was received or if an error occurred.
   bool WaitForOneMessage();
 
   FilterCallback filter_;
-  void *filter_context_;
+  void* filter_context_;
 
   OnClientDumpRequestCallback dump_callback_;
-  void *dump_context_;
+  void* dump_context_;
 
   OnClientExitingCallback exit_callback_;
-  void *exit_context_;
+  void* exit_context_;
 
   bool generate_dumps_;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/Inspector.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/Inspector.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/Inspector.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/crash_generation/Inspector.h	2021-12-09 12:01:26.000000000 +0000
@@ -63,7 +63,7 @@
  public:
   KeyValueMessageData() {}
   explicit KeyValueMessageData(
-      const google_breakpad::SimpleStringDictionary::Entry &inEntry) {
+      const google_breakpad::SimpleStringDictionary::Entry& inEntry) {
     strlcpy(key, inEntry.key, sizeof(key) );
     strlcpy(value, inEntry.value, sizeof(value) );
   }
@@ -80,7 +80,7 @@
 //=============================================================================
 class MinidumpLocation {
  public:
-  MinidumpLocation(NSString *minidumpDir) {
+  MinidumpLocation(NSString* minidumpDir) {
     // Ensure that the path exists.  Fallback to /tmp if unable to locate path.
     assert(minidumpDir);
     if (!EnsureDirectoryPathExists(minidumpDir)) {
@@ -100,8 +100,8 @@
     strlcpy(minidump_id_, next_minidump_id.c_str(), sizeof(minidump_id_));
   }
 
-  const char *GetPath() { return minidump_dir_path_; }
-  const char *GetID() { return minidump_id_; }
+  const char* GetPath() { return minidump_dir_path_; }
+  const char* GetID() { return minidump_id_; }
 
  private:
   char minidump_dir_path_[PATH_MAX];             // Path to minidump directory
@@ -116,7 +116,7 @@
   // given a bootstrap service name, receives mach messages
   // from a crashed process, then inspects it, creates a minidump file
   // and asks the user if he wants to upload it to a server.
-  void            Inspect(const char *receive_port_name);
+  void            Inspect(const char* receive_port_name);
 
  private:
   // The Inspector is invoked with its bootstrap port set to the bootstrap
@@ -131,8 +131,8 @@
   // ServiceCheckOut.
   kern_return_t   ResetBootstrapPort();
 
-  kern_return_t   ServiceCheckIn(const char *receive_port_name);
-  kern_return_t   ServiceCheckOut(const char *receive_port_name);
+  kern_return_t   ServiceCheckIn(const char* receive_port_name);
+  kern_return_t   ServiceCheckOut(const char* receive_port_name);
 
   kern_return_t   ReadMessages();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/Framework/Breakpad.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/Framework/Breakpad.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/Framework/Breakpad.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/Framework/Breakpad.h	2021-12-09 12:01:26.000000000 +0000
@@ -45,7 +45,7 @@
 // OnDemandServer and restored in Inspector.
 #define BREAKPAD_BOOTSTRAP_PARENT_PORT    "com.Breakpad.BootstrapParent"
 
-typedef void *BreakpadRef;
+typedef void* BreakpadRef;
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,7 +65,7 @@
 typedef bool (*BreakpadFilterCallback)(int exception_type,
                                        int exception_code,
                                        mach_port_t crashing_thread,
-                                       void *context);
+                                       void* context);
 
 // Create a new BreakpadRef object and install it as an exception
 // handler.  The |parameters| will typically be the contents of your
@@ -226,7 +226,7 @@
 //                                   Only used in crash_report_sender.
 
 // Returns a new BreakpadRef object on success, NULL otherwise.
-BreakpadRef BreakpadCreate(NSDictionary *parameters);
+BreakpadRef BreakpadCreate(NSDictionary* parameters);
 
 // Uninstall and release the data associated with |ref|.
 void BreakpadRelease(BreakpadRef ref);
@@ -238,7 +238,7 @@
 // Context is a pointer to arbitrary data to make the callback with.
 void BreakpadSetFilterCallback(BreakpadRef ref,
                                BreakpadFilterCallback callback,
-                               void *context);
+                               void* context);
 
 // User defined key and value string storage.  Generally this is used
 // to configure Breakpad's internal operation, such as whether the
@@ -259,23 +259,23 @@
 // TODO (nealsid): separate server parameter dictionary from the
 // dictionary used to configure Breakpad, and document limits for each
 // independently.
-void BreakpadSetKeyValue(BreakpadRef ref, NSString *key, NSString *value);
-NSString *BreakpadKeyValue(BreakpadRef ref, NSString *key);
-void BreakpadRemoveKeyValue(BreakpadRef ref, NSString *key);
+void BreakpadSetKeyValue(BreakpadRef ref, NSString* key, NSString* value);
+NSString* BreakpadKeyValue(BreakpadRef ref, NSString* key);
+void BreakpadRemoveKeyValue(BreakpadRef ref, NSString* key);
 
 // You can use this method to specify parameters that will be uploaded
 // to the crash server.  They will be automatically encoded as
 // necessary.  Note that as mentioned above there are limits on both
 // the number of keys and their length.
-void BreakpadAddUploadParameter(BreakpadRef ref, NSString *key,
-                                NSString *value);
+void BreakpadAddUploadParameter(BreakpadRef ref, NSString* key,
+                                NSString* value);
 
 // This method will remove a previously-added parameter from the
 // upload parameter set.
-void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key);
+void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString* key);
 
 // Add a log file for Breakpad to read and send upon crash dump
-void BreakpadAddLogFile(BreakpadRef ref, NSString *logPathname);
+void BreakpadAddLogFile(BreakpadRef ref, NSString* logPathname);
 
 // Generate a minidump and send
 void BreakpadGenerateAndSendReport(BreakpadRef ref);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/Framework/OnDemandServer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/Framework/OnDemandServer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/Framework/OnDemandServer.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/Framework/OnDemandServer.h	2021-12-09 12:01:26.000000000 +0000
@@ -41,7 +41,7 @@
 // Example Usage :
 //
 //  kern_return_t result;
-//  OnDemandServer *server = OnDemandServer::Create("/tmp/myserver",
+//  OnDemandServer* server = OnDemandServer::Create("/tmp/myserver",
 //                                                  "com.MyCompany.MyServiceName",
 //                                                  true,
 //                                                  &result);
@@ -88,8 +88,8 @@
   }
 
   // Creates the bootstrap server and service
-  kern_return_t Initialize(const char *server_command,
-                           const char *service_name,
+  kern_return_t Initialize(const char* server_command,
+                           const char* service_name,
                            bool unregister_on_cleanup);
 
   // Returns an OnDemandServer object if successful, or NULL if there's
@@ -110,10 +110,10 @@
   //    out_result : if non-NULL, returns the result
   //      this value will be KERN_SUCCESS if Create() returns non-NULL
   //
-  static OnDemandServer *Create(const char *server_command,
-                                const char *service_name,
+  static OnDemandServer* Create(const char *server_command,
+                                const char* service_name,
                                 bool unregister_on_cleanup,
-                                kern_return_t *out_result);
+                                kern_return_t* out_result);
 
   // Cleans up and if LaunchOnDemand() has not yet been called then
   // the bootstrap service will be unregistered.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.cc	2021-12-09 12:01:26.000000000 +0000
@@ -131,7 +131,7 @@
 
 template<typename nlist_type>
 int
-__breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames,
+__breakpad_fdnlist(int fd, nlist_type* list, const char** symbolNames,
                    cpu_type_t cpu_type);
 
 /*
@@ -139,9 +139,9 @@
  */
 
 template <typename nlist_type>
-int breakpad_nlist_common(const char *name,
-                          nlist_type *list,
-                          const char **symbolNames,
+int breakpad_nlist_common(const char* name,
+                          nlist_type* list,
+                          const char** symbolNames,
                           cpu_type_t cpu_type) {
   int fd = open(name, O_RDONLY, 0);
   if (fd < 0)
@@ -151,16 +151,16 @@
   return n;
 }
 
-int breakpad_nlist(const char *name,
-                   struct nlist *list,
-                   const char **symbolNames,
+int breakpad_nlist(const char* name,
+                   struct nlist* list,
+                   const char** symbolNames,
                    cpu_type_t cpu_type) {
   return breakpad_nlist_common(name, list, symbolNames, cpu_type);
 }
 
-int breakpad_nlist(const char *name,
-                   struct nlist_64 *list,
-                   const char **symbolNames,
+int breakpad_nlist(const char* name,
+                   struct nlist_64* list,
+                   const char** symbolNames,
                    cpu_type_t cpu_type) {
   return breakpad_nlist_common(name, list, symbolNames, cpu_type);
 }
@@ -168,7 +168,7 @@
 /* Note: __fdnlist() is called from kvm_nlist in libkvm's kvm.c */
 
 template<typename nlist_type>
-int __breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames,
+int __breakpad_fdnlist(int fd, nlist_type* list, const char** symbolNames,
                        cpu_type_t cpu_type) {
   typedef typename MachBits<nlist_type>::mach_header_type mach_header_type;
   typedef typename MachBits<nlist_type>::word_type word_type;
@@ -189,9 +189,9 @@
   }
 
   struct exec buf;
-  if (read(fd, (char *)&buf, sizeof(buf)) != sizeof(buf) ||
-      (N_BADMAG(buf) && *((uint32_t *)&buf) != magic &&
-        CFSwapInt32BigToHost(*((uint32_t *)&buf)) != FAT_MAGIC &&
+  if (read(fd, (char*)&buf, sizeof(buf)) != sizeof(buf) ||
+      (N_BADMAG(buf) && *((uint32_t*)&buf) != magic &&
+        CFSwapInt32BigToHost(*((uint32_t*)&buf)) != FAT_MAGIC &&
        /* The following is the big-endian ppc64 check */
        (*((uint32_t*)&buf)) != FAT_MAGIC)) {
     return -1;
@@ -199,15 +199,15 @@
 
   /* Deal with fat file if necessary */
   unsigned arch_offset = 0;
-  if (CFSwapInt32BigToHost(*((uint32_t *)&buf)) == FAT_MAGIC ||
+  if (CFSwapInt32BigToHost(*((uint32_t*)&buf)) == FAT_MAGIC ||
       /* The following is the big-endian ppc64 check */
-      *((unsigned int *)&buf) == FAT_MAGIC) {
+      *((unsigned int*)&buf) == FAT_MAGIC) {
     /* Read in the fat header */
     struct fat_header fh;
     if (lseek(fd, 0, SEEK_SET) == -1) {
       return -1;
     }
-    if (read(fd, (char *)&fh, sizeof(fh)) != sizeof(fh)) {
+    if (read(fd, (char*)&fh, sizeof(fh)) != sizeof(fh)) {
       return -1;
     }
 
@@ -215,12 +215,12 @@
     fh.nfat_arch = CFSwapInt32BigToHost(fh.nfat_arch);
 
     /* Read in the fat archs */
-    struct fat_arch *fat_archs =
-        (struct fat_arch *)malloc(fh.nfat_arch * sizeof(struct fat_arch));
+    struct fat_arch* fat_archs =
+        (struct fat_arch*)malloc(fh.nfat_arch * sizeof(struct fat_arch));
     if (fat_archs == NULL) {
       return -1;
     }
-    if (read(fd, (char *)fat_archs,
+    if (read(fd, (char*)fat_archs,
              sizeof(struct fat_arch) * fh.nfat_arch) !=
         (ssize_t)(sizeof(struct fat_arch) * fh.nfat_arch)) {
       free(fat_archs);
@@ -244,7 +244,7 @@
         CFSwapInt32BigToHost(fat_archs[i].align);
     }
 
-    struct fat_arch *fap = NULL;
+    struct fat_arch* fap = NULL;
     for (unsigned i = 0; i < fh.nfat_arch; i++) {
       if (fat_archs[i].cputype == cpu_type) {
         fap = &fat_archs[i];
@@ -263,7 +263,7 @@
     if (lseek(fd, arch_offset, SEEK_SET) == -1) {
       return -1;
     }
-    if (read(fd, (char *)&buf, sizeof(buf)) != sizeof(buf)) {
+    if (read(fd, (char*)&buf, sizeof(buf)) != sizeof(buf)) {
       return -1;
     }
   }
@@ -271,48 +271,45 @@
   off_t sa;  /* symbol address */
   off_t ss;  /* start of strings */
   register_t n;
-  if (*((unsigned int *)&buf) == magic) {
+  if (*((unsigned int*)&buf) == magic) {
     if (lseek(fd, arch_offset, SEEK_SET) == -1) {
       return -1;
     }
     mach_header_type mh;
-    if (read(fd, (char *)&mh, sizeof(mh)) != sizeof(mh)) {
+    if (read(fd, (char*)&mh, sizeof(mh)) != sizeof(mh)) {
       return -1;
     }
 
-    struct load_command *load_commands =
-        (struct load_command *)malloc(mh.sizeofcmds);
+    struct load_command* load_commands =
+        (struct load_command*)malloc(mh.sizeofcmds);
     if (load_commands == NULL) {
       return -1;
     }
-    if (read(fd, (char *)load_commands, mh.sizeofcmds) !=
+    if (read(fd, (char*)load_commands, mh.sizeofcmds) !=
         (ssize_t)mh.sizeofcmds) {
       free(load_commands);
       return -1;
     }
-    struct symtab_command *stp = NULL;
-    struct load_command *lcp = load_commands;
+    struct symtab_command* stp = NULL;
+    struct load_command* lcp = load_commands;
     // iterate through all load commands, looking for
     // LC_SYMTAB load command
     for (uint32_t i = 0; i < mh.ncmds; i++) {
       if (lcp->cmdsize % sizeof(word_type) != 0 ||
           lcp->cmdsize <= 0 ||
-          (char *)lcp + lcp->cmdsize >
-          (char *)load_commands + mh.sizeofcmds) {
+          (char*)lcp + lcp->cmdsize > (char*)load_commands + mh.sizeofcmds) {
         free(load_commands);
         return -1;
       }
       if (lcp->cmd == LC_SYMTAB) {
-        if (lcp->cmdsize !=
-            sizeof(struct symtab_command)) {
+        if (lcp->cmdsize != sizeof(struct symtab_command)) {
           free(load_commands);
           return -1;
         }
-        stp = (struct symtab_command *)lcp;
+        stp = (struct symtab_command*)lcp;
         break;
       }
-      lcp = (struct load_command *)
-        ((char *)lcp + lcp->cmdsize);
+      lcp = (struct load_command*)((char*)lcp + lcp->cmdsize);
     }
     if (stp == NULL) {
       free(load_commands);
@@ -347,7 +344,7 @@
 
     if (n < m)
       m = n;
-    if (read(fd, (char *)space, m) != m)
+    if (read(fd, (char*)space, m) != m)
       break;
     n -= m;
     off_t savpos = lseek(fd, 0, SEEK_CUR);
@@ -368,13 +365,13 @@
       if (read(fd, nambuf, maxlen+1) == -1) {
         return -1;
       }
-      const char *s2 = nambuf;
-      for (nlist_type *p = list; 
+      const char* s2 = nambuf;
+      for (nlist_type* p = list; 
            symbolNames[p-list] && symbolNames[p-list][0];
            p++) {
         // get the symbol name the user has passed in that 
         // corresponds to the nlist entry that we're looking at
-        const char *s1 = symbolNames[p - list];
+        const char* s1 = symbolNames[p - list];
         while (*s1) {
           if (*s1++ != *s2++)
             goto cont;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/breakpad_nlist_64.h	2021-12-09 12:01:26.000000000 +0000
@@ -36,13 +36,13 @@
 
 #include <mach/machine.h>
 
-int breakpad_nlist(const char *name,
-                   struct nlist *list,
-                   const char **symbolNames,
+int breakpad_nlist(const char* name,
+                   struct nlist* list,
+                   const char** symbolNames,
                    cpu_type_t cpu_type);
-int breakpad_nlist(const char *name,
-                   struct nlist_64 *list,
-                   const char **symbolNames,
+int breakpad_nlist(const char* name,
+                   struct nlist_64* list,
+                   const char** symbolNames,
                    cpu_type_t cpu_type);
 
 #endif  /* CLIENT_MAC_HANDLER_BREAKPAD_NLIST_H__ */
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/dynamic_images.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/dynamic_images.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/dynamic_images.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/dynamic_images.cc	2021-12-09 12:01:26.000000000 +0000
@@ -66,7 +66,7 @@
   mach_vm_size_t all_image_info_size;
 };
 typedef struct task_dyld_info task_dyld_info_data_t;
-typedef struct task_dyld_info *task_dyld_info_t;
+typedef struct task_dyld_info* task_dyld_info_t;
 #define TASK_DYLD_INFO_COUNT (sizeof(task_dyld_info_data_t) / sizeof(natural_t))
 
 #endif
@@ -88,7 +88,7 @@
 //
 static mach_vm_size_t GetMemoryRegionSize(task_port_t target_task,
                                           const uint64_t address,
-                                          mach_vm_size_t *size_to_end) {
+                                          mach_vm_size_t* size_to_end) {
   mach_vm_address_t region_base = (mach_vm_address_t)address;
   mach_vm_size_t region_size;
   natural_t nesting_level = 0;
@@ -182,7 +182,7 @@
 kern_return_t ReadTaskMemory(task_port_t target_task,
                              const uint64_t address,
                              size_t length,
-                             vector<uint8_t> &bytes) {
+                             vector<uint8_t>& bytes) {
   int systemPageSize = getpagesize();
 
   // use the negative of the page size for the mask to find the page address
@@ -250,16 +250,16 @@
     return false;
   }
 
-  const struct load_command *cmd =
-      reinterpret_cast<const struct load_command *>(header + 1);
+  const struct load_command* cmd =
+      reinterpret_cast<const struct load_command*>(header + 1);
 
   bool found_text_section = false;
   bool found_dylib_id_command = false;
   for (unsigned int i = 0; cmd && (i < header->ncmds); ++i) {
     if (!found_text_section) {
       if (cmd->cmd == MachBits::segment_load_command) {
-        const mach_segment_command_type *seg =
-            reinterpret_cast<const mach_segment_command_type *>(cmd);
+        const mach_segment_command_type* seg =
+            reinterpret_cast<const mach_segment_command_type*>(cmd);
 
         if (!strcmp(seg->segname, "__TEXT")) {
           image.vmaddr_ = static_cast<mach_vm_address_t>(seg->vmaddr);
@@ -277,8 +277,8 @@
 
     if (!found_dylib_id_command) {
       if (cmd->cmd == LC_ID_DYLIB) {
-        const struct dylib_command *dc =
-            reinterpret_cast<const struct dylib_command *>(cmd);
+        const struct dylib_command* dc =
+            reinterpret_cast<const struct dylib_command*>(cmd);
 
         image.version_ = dc->dylib.current_version;
         found_dylib_id_command = true;
@@ -289,8 +289,8 @@
       return true;
     }
 
-    cmd = reinterpret_cast<const struct load_command *>
-        (reinterpret_cast<const char *>(cmd) + cmd->cmdsize);
+    cmd = reinterpret_cast<const struct load_command*>
+        (reinterpret_cast<const char*>(cmd) + cmd->cmdsize);
   }
 
   return false;
@@ -349,8 +349,8 @@
   typedef typename MachBits::nlist_type nlist_type;
 
   nlist_type symbol_info[8] = {};
-  const char *symbolNames[2] = { symbol_name, "\0" };
-  nlist_type &list = symbol_info[0];
+  const char* symbolNames[2] = { symbol_name, "\0" };
+  nlist_type& list = symbol_info[0];
   int invalidEntriesCount = breakpad_nlist(filename,
                                            &list,
                                            symbolNames,
@@ -396,8 +396,8 @@
 
     return (uint64_t)task_dyld_info.all_image_info_addr;
   } else {
-    const char *imageSymbolName = "_dyld_all_image_infos";
-    const char *dyldPath = "/usr/lib/dyld";
+    const char* imageSymbolName = "_dyld_all_image_infos";
+    const char* dyldPath = "/usr/lib/dyld";
 
     if (Is64Bit())
       return LookupSymbol<MachO64>(imageSymbolName, dyldPath, cpu_type_);
@@ -428,7 +428,7 @@
                      dyld_all_info_bytes) != KERN_SUCCESS)
     return;
 
-  dyld_all_image_infos *dyldInfo =
+  dyld_all_image_infos* dyldInfo =
     reinterpret_cast<dyld_all_image_infos*>(&dyld_all_info_bytes[0]);
 
   // number of loaded images
@@ -443,12 +443,12 @@
                        dyld_info_array_bytes) != KERN_SUCCESS)
       return;
 
-    dyld_image_info *infoArray =
+    dyld_image_info* infoArray =
         reinterpret_cast<dyld_image_info*>(&dyld_info_array_bytes[0]);
     images.image_list_.reserve(count);
 
     for (int i = 0; i < count; ++i) {
-      dyld_image_info &info = infoArray[i];
+      dyld_image_info& info = infoArray[i];
 
       // First read just the mach_header from the image in the task.
       vector<uint8_t> mach_header_bytes;
@@ -458,7 +458,7 @@
                          mach_header_bytes) != KERN_SUCCESS)
         continue;  // bail on this dynamic image
 
-      mach_header_type *header =
+      mach_header_type* header =
           reinterpret_cast<mach_header_type*>(&mach_header_bytes[0]);
 
       // Now determine the total amount necessary to read the header
@@ -482,7 +482,7 @@
       }
 
       // Create an object representing this image and add it to our list.
-      DynamicImage *new_image;
+      DynamicImage* new_image;
       new_image = new DynamicImage(&mach_header_bytes[0],
                                    header_size,
                                    info.load_address_,
@@ -522,7 +522,7 @@
 }
 
 //==============================================================================
-DynamicImage  *DynamicImages::GetExecutableImage() {
+DynamicImage* DynamicImages::GetExecutableImage() {
   int executable_index = GetExecutableImageIndex();
 
   if (executable_index >= 0) {
@@ -538,7 +538,7 @@
   int image_count = GetImageCount();
 
   for (int i = 0; i < image_count; ++i) {
-    DynamicImage  *image = GetImage(i);
+    DynamicImage* image = GetImage(i);
     if (image->GetFileType() == MH_EXECUTE) {
       return i;
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/dynamic_images.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/dynamic_images.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/dynamic_images.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/dynamic_images.h	2021-12-09 12:01:26.000000000 +0000
@@ -108,7 +108,7 @@
 // Represents a single dynamically loaded mach-o image
 class DynamicImage {
  public:
-  DynamicImage(uint8_t *header,     // data is copied
+  DynamicImage(uint8_t* header,     // data is copied
                size_t header_size,  // includes load commands
                uint64_t load_address,
                string file_path,
@@ -163,7 +163,7 @@
 
   uint32_t GetVersion() {return version_;}
   // For sorting
-  bool operator<(const DynamicImage &inInfo) {
+  bool operator<(const DynamicImage& inInfo) {
     return GetLoadAddress() < inInfo.GetLoadAddress();
   }
 
@@ -171,8 +171,8 @@
   bool IsValid() {return GetVMSize() != 0;}
 
  private:
-  DynamicImage(const DynamicImage &);
-  DynamicImage &operator=(const DynamicImage &);
+  DynamicImage(const DynamicImage&);
+  DynamicImage& operator=(const DynamicImage&);
 
   friend class DynamicImages;
   template<typename MachBits>
@@ -205,26 +205,26 @@
 //
 class DynamicImageRef {
  public:
-  explicit DynamicImageRef(DynamicImage *inP) : p(inP) {}
+  explicit DynamicImageRef(DynamicImage* inP) : p(inP) {}
   // The copy constructor is required by STL
-  DynamicImageRef(const DynamicImageRef &inRef) : p(inRef.p) {}
+  DynamicImageRef(const DynamicImageRef& inRef) : p(inRef.p) {}
 
-  bool operator<(const DynamicImageRef &inRef) const {
+  bool operator<(const DynamicImageRef& inRef) const {
     return (*const_cast<DynamicImageRef*>(this)->p)
       < (*const_cast<DynamicImageRef&>(inRef).p);
   }
 
-  bool operator==(const DynamicImageRef &inInfo) const {
+  bool operator==(const DynamicImageRef& inInfo) const {
     return (*const_cast<DynamicImageRef*>(this)->p).GetLoadAddress() ==
         (*const_cast<DynamicImageRef&>(inInfo)).GetLoadAddress();
   }
 
   // Be just like DynamicImage*
-  DynamicImage  *operator->() {return p;}
+  DynamicImage* operator->() {return p;}
   operator DynamicImage*() {return p;}
 
  private:
-  DynamicImage  *p;
+  DynamicImage* p;
 };
 
 // Helper function to deal with 32-bit/64-bit Mach-O differences.
@@ -250,7 +250,7 @@
   int GetImageCount() const {return static_cast<int>(image_list_.size());}
 
   // Returns an individual image.
-  DynamicImage *GetImage(int i) {
+  DynamicImage* GetImage(int i) {
     if (i < (int)image_list_.size()) {
       return image_list_[i];
     }
@@ -258,7 +258,7 @@
   }
 
   // Returns the image corresponding to the main executable.
-  DynamicImage *GetExecutableImage();
+  DynamicImage* GetExecutableImage();
   int GetExecutableImageIndex();
 
   // Returns the task which we're looking at.
@@ -312,7 +312,7 @@
 kern_return_t ReadTaskMemory(task_port_t target_task,
                              const uint64_t address,
                              size_t length,
-                             vector<uint8_t> &bytes);
+                             vector<uint8_t>& bytes);
 
 }   // namespace google_breakpad
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/exception_handler.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/exception_handler.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/exception_handler.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/exception_handler.cc	2021-12-09 12:01:26.000000000 +0000
@@ -220,7 +220,7 @@
 }
 #endif
 
-ExceptionHandler::ExceptionHandler(const string &dump_path,
+ExceptionHandler::ExceptionHandler(const string& dump_path,
                                    FilterCallback filter,
                                    MinidumpCallback callback,
                                    void* callback_context,
@@ -304,7 +304,7 @@
 }
 
 // static
-bool ExceptionHandler::WriteMinidump(const string &dump_path,
+bool ExceptionHandler::WriteMinidump(const string& dump_path,
                                      bool write_exception_stream,
                                      MinidumpCallback callback,
                                      void* callback_context) {
@@ -316,7 +316,7 @@
 // static
 bool ExceptionHandler::WriteMinidumpForChild(mach_port_t child,
                                              mach_port_t child_blamed_thread,
-                                             const string &dump_path,
+                                             const string& dump_path,
                                              MinidumpCallback callback,
                                              void* callback_context) {
   ScopedTaskSuspend suspend(child);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/exception_handler.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/exception_handler.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/exception_handler.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/exception_handler.h	2021-12-09 12:01:26.000000000 +0000
@@ -75,7 +75,7 @@
   // attempting to write a minidump.  If a FilterCallback returns false, Breakpad
   // will immediately report the exception as unhandled without writing a
   // minidump, allowing another handler the opportunity to handle it.
-  typedef bool (*FilterCallback)(void *context);
+  typedef bool (*FilterCallback)(void* context);
 
   // A callback function to run after the minidump has been written.
   // |minidump_id| is a unique id for the dump, so the minidump
@@ -85,18 +85,18 @@
   // Return true if the exception was fully handled and breakpad should exit.
   // Return false to allow any other exception handlers to process the
   // exception.
-  typedef bool (*MinidumpCallback)(const char *dump_dir,
-                                   const char *minidump_id,
-                                   void *context, bool succeeded);
+  typedef bool (*MinidumpCallback)(const char* dump_dir,
+                                   const char* minidump_id,
+                                   void* context, bool succeeded);
 
   // A callback function which will be called directly if an exception occurs.
   // This bypasses the minidump file writing and simply gives the client
   // the exception information.
-  typedef bool (*DirectCallback)( void *context,
-                                  int exception_type,
-                                  int exception_code,
-                                  int exception_subcode,
-                                  mach_port_t thread_name);
+  typedef bool (*DirectCallback)(void* context,
+                                 int exception_type,
+                                 int exception_code,
+                                 int exception_subcode,
+                                 mach_port_t thread_name);
 
   // Creates a new ExceptionHandler instance to handle writing minidumps.
   // Minidump files will be written to dump_path, and the optional callback
@@ -106,22 +106,22 @@
   // be written when WriteMinidump is called.
   // If port_name is non-NULL, attempt to perform out-of-process dump generation
   // If port_name is NULL, in-process dump generation will be used.
-  ExceptionHandler(const string &dump_path,
+  ExceptionHandler(const string& dump_path,
                    FilterCallback filter, MinidumpCallback callback,
-                   void *callback_context, bool install_handler,
-		   const char *port_name);
+                   void* callback_context, bool install_handler,
+                   const char* port_name);
 
   // A special constructor if we want to bypass minidump writing and
   // simply get a callback with the exception information.
   ExceptionHandler(DirectCallback callback,
-                   void *callback_context,
+                   void* callback_context,
                    bool install_handler);
 
   ~ExceptionHandler();
 
   // Get and set the minidump path.
   string dump_path() const { return dump_path_; }
-  void set_dump_path(const string &dump_path) {
+  void set_dump_path(const string& dump_path) {
     dump_path_ = dump_path;
     dump_path_c_ = dump_path_.c_str();
     UpdateNextID();  // Necessary to put dump_path_ in next_minidump_path_.
@@ -137,23 +137,23 @@
 
   // Convenience form of WriteMinidump which does not require an
   // ExceptionHandler instance.
-  static bool WriteMinidump(const string &dump_path, MinidumpCallback callback,
-                            void *callback_context) {
+  static bool WriteMinidump(const string& dump_path, MinidumpCallback callback,
+                            void* callback_context) {
     return WriteMinidump(dump_path, false, callback, callback_context);
   }
 
-  static bool WriteMinidump(const string &dump_path,
+  static bool WriteMinidump(const string& dump_path,
                             bool write_exception_stream,
                             MinidumpCallback callback,
-                            void *callback_context);
+                            void* callback_context);
 
   // Write a minidump of child immediately. This can be used to capture
   // the execution state of a child process independently of a crash.
   static bool WriteMinidumpForChild(mach_port_t child,
-				    mach_port_t child_blamed_thread,
-				    const std::string &dump_path,
-				    MinidumpCallback callback,
-				    void *callback_context);
+                                    mach_port_t child_blamed_thread,
+                                    const std::string& dump_path,
+                                    MinidumpCallback callback,
+                                    void* callback_context);
 
   // Returns whether out-of-process dump generation is used or not.
   bool IsOutOfProcess() const {
@@ -189,21 +189,21 @@
   bool WriteMinidumpWithException(int exception_type,
                                   int exception_code,
                                   int exception_subcode,
-                                  breakpad_ucontext_t *task_context,
+                                  breakpad_ucontext_t* task_context,
                                   mach_port_t thread_name,
                                   bool exit_after_write,
                                   bool report_current_thread);
 
   // When installed, this static function will be call from a newly created
   // pthread with |this| as the argument
-  static void *WaitForMessage(void *exception_handler_class);
+  static void* WaitForMessage(void* exception_handler_class);
 
   // Signal handler for SIGABRT.
   static void SignalHandler(int sig, siginfo_t* info, void* uc);
 
   // disallow copy ctor and operator=
-  explicit ExceptionHandler(const ExceptionHandler &);
-  void operator=(const ExceptionHandler &);
+  explicit ExceptionHandler(const ExceptionHandler&);
+  void operator=(const ExceptionHandler&);
 
   // Generates a new ID and stores it in next_minidump_id_, and stores the
   // path of the next minidump to be written in next_minidump_path_.
@@ -224,15 +224,15 @@
   string next_minidump_path_;
 
   // Pointers to the UTF-8 versions of above
-  const char *dump_path_c_;
-  const char *next_minidump_id_c_;
-  const char *next_minidump_path_c_;
+  const char* dump_path_c_;
+  const char* next_minidump_id_c_;
+  const char* next_minidump_path_c_;
 
   // The callback function and pointer to be passed back after the minidump
   // has been written
   FilterCallback filter_;
   MinidumpCallback callback_;
-  void *callback_context_;
+  void* callback_context_;
 
   // The callback function to be passed back when we don't want a minidump
   // file to be written
@@ -247,7 +247,7 @@
 
   // These variables save the previous exception handler's data so that it
   // can be re-installed when this handler is uninstalled
-  ExceptionParameters *previous_;
+  ExceptionParameters* previous_;
 
   // True, if we've installed the exception handler
   bool installed_exception_handler_;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/minidump_generator.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/minidump_generator.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/minidump_generator.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/minidump_generator.cc	2021-12-09 12:01:26.000000000 +0000
@@ -191,12 +191,12 @@
   os_build_number_ = IntegerValueAtIndex(product_str, 2);
 }
 
-void MinidumpGenerator::SetTaskContext(breakpad_ucontext_t *task_context) {
+void MinidumpGenerator::SetTaskContext(breakpad_ucontext_t* task_context) {
   task_context_ = task_context;
 }
 
-string MinidumpGenerator::UniqueNameInDirectory(const string &dir,
-                                                string *unique_name) {
+string MinidumpGenerator::UniqueNameInDirectory(const string& dir,
+                                                string* unique_name) {
   CFUUIDRef uuid = CFUUIDCreate(NULL);
   CFStringRef uuid_cfstr = CFUUIDCreateString(NULL, uuid);
   CFRelease(uuid);
@@ -220,7 +220,7 @@
   return path;
 }
 
-bool MinidumpGenerator::Write(const char *path) {
+bool MinidumpGenerator::Write(const char* path) {
   WriteStreamFN writers[] = {
     &MinidumpGenerator::WriteThreadListStream,
     &MinidumpGenerator::WriteMemoryListStream,
@@ -256,10 +256,10 @@
     if (!dir.AllocateArray(writer_count))
       return false;
 
-    MDRawHeader *header_ptr = header.get();
+    MDRawHeader* header_ptr = header.get();
     header_ptr->signature = MD_HEADER_SIGNATURE;
     header_ptr->version = MD_HEADER_VERSION;
-    time(reinterpret_cast<time_t *>(&(header_ptr->time_date_stamp)));
+    time(reinterpret_cast<time_t*>(&(header_ptr->time_date_stamp)));
     header_ptr->stream_count = writer_count;
     header_ptr->stream_directory_rva = dir.position();
 
@@ -335,7 +335,7 @@
 
 bool MinidumpGenerator::WriteStackFromStartAddress(
     mach_vm_address_t start_addr,
-    MDMemoryDescriptor *stack_location) {
+    MDMemoryDescriptor* stack_location) {
   UntypedMDRVA memory(&writer_);
 
   bool result = false;
@@ -372,7 +372,7 @@
 
       result = memory.Copy(&stack_memory[0], size);
     } else {
-      result = memory.Copy(reinterpret_cast<const void *>(start_addr), size);
+      result = memory.Copy(reinterpret_cast<const void*>(start_addr), size);
     }
   }
 
@@ -383,7 +383,7 @@
 }
 
 bool MinidumpGenerator::WriteStack(breakpad_thread_state_data_t state,
-                                   MDMemoryDescriptor *stack_location) {
+                                   MDMemoryDescriptor* stack_location) {
   switch (cpu_type_) {
 #ifdef HAS_ARM_SUPPORT
     case CPU_TYPE_ARM:
@@ -411,7 +411,7 @@
 }
 
 bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state,
-                                     MDLocationDescriptor *register_location) {
+                                     MDLocationDescriptor* register_location) {
   switch (cpu_type_) {
 #ifdef HAS_ARM_SUPPORT
     case CPU_TYPE_ARM:
@@ -469,33 +469,33 @@
 
 #ifdef HAS_ARM_SUPPORT
 bool MinidumpGenerator::WriteStackARM(breakpad_thread_state_data_t state,
-                                      MDMemoryDescriptor *stack_location) {
-  arm_thread_state_t *machine_state =
-      reinterpret_cast<arm_thread_state_t *>(state);
+                                      MDMemoryDescriptor* stack_location) {
+  arm_thread_state_t* machine_state =
+      reinterpret_cast<arm_thread_state_t*>(state);
   mach_vm_address_t start_addr = REGISTER_FROM_THREADSTATE(machine_state, sp);
   return WriteStackFromStartAddress(start_addr, stack_location);
 }
 
 uint64_t
 MinidumpGenerator::CurrentPCForStackARM(breakpad_thread_state_data_t state) {
-  arm_thread_state_t *machine_state =
-      reinterpret_cast<arm_thread_state_t *>(state);
+  arm_thread_state_t* machine_state =
+      reinterpret_cast<arm_thread_state_t*>(state);
 
   return REGISTER_FROM_THREADSTATE(machine_state, pc);
 }
 
 bool MinidumpGenerator::WriteContextARM(breakpad_thread_state_data_t state,
-                                        MDLocationDescriptor *register_location)
+                                        MDLocationDescriptor* register_location)
 {
   TypedMDRVA<MDRawContextARM> context(&writer_);
-  arm_thread_state_t *machine_state =
-      reinterpret_cast<arm_thread_state_t *>(state);
+  arm_thread_state_t* machine_state =
+      reinterpret_cast<arm_thread_state_t*>(state);
 
   if (!context.Allocate())
     return false;
 
   *register_location = context.location();
-  MDRawContextARM *context_ptr = context.get();
+  MDRawContextARM* context_ptr = context.get();
   context_ptr->context_flags = MD_CONTEXT_ARM_FULL;
 
 #define AddGPR(a) context_ptr->iregs[a] = REGISTER_FROM_THREADSTATE(machine_state, r[a])
@@ -526,38 +526,38 @@
 
 #ifdef HAS_ARM64_SUPPORT
 bool MinidumpGenerator::WriteStackARM64(breakpad_thread_state_data_t state,
-                                        MDMemoryDescriptor *stack_location) {
-  arm_thread_state64_t *machine_state =
-      reinterpret_cast<arm_thread_state64_t *>(state);
+                                        MDMemoryDescriptor* stack_location) {
+  arm_thread_state64_t* machine_state =
+      reinterpret_cast<arm_thread_state64_t*>(state);
   mach_vm_address_t start_addr = REGISTER_FROM_THREADSTATE(machine_state, sp);
   return WriteStackFromStartAddress(start_addr, stack_location);
 }
 
 uint64_t
 MinidumpGenerator::CurrentPCForStackARM64(breakpad_thread_state_data_t state) {
-  arm_thread_state64_t *machine_state =
-      reinterpret_cast<arm_thread_state64_t *>(state);
+  arm_thread_state64_t* machine_state =
+      reinterpret_cast<arm_thread_state64_t*>(state);
 
   return REGISTER_FROM_THREADSTATE(machine_state, pc);
 }
 
 bool
 MinidumpGenerator::WriteContextARM64(breakpad_thread_state_data_t state,
-                                     MDLocationDescriptor *register_location)
+                                     MDLocationDescriptor* register_location)
 {
   TypedMDRVA<MDRawContextARM64_Old> context(&writer_);
-  arm_thread_state64_t *machine_state =
-      reinterpret_cast<arm_thread_state64_t *>(state);
+  arm_thread_state64_t* machine_state =
+      reinterpret_cast<arm_thread_state64_t*>(state);
 
   if (!context.Allocate())
     return false;
 
   *register_location = context.location();
-  MDRawContextARM64_Old *context_ptr = context.get();
+  MDRawContextARM64_Old* context_ptr = context.get();
   context_ptr->context_flags = MD_CONTEXT_ARM64_FULL_OLD;
 
-#define AddGPR(a) context_ptr->iregs[a] = \
-    REGISTER_FROM_THREADSTATE(machine_state, x[a])
+#define AddGPR(a)                                                              \
+  context_ptr->iregs[a] = ARRAY_REGISTER_FROM_THREADSTATE(machine_state, x, a)
 
   context_ptr->iregs[29] = REGISTER_FROM_THREADSTATE(machine_state, fp);
   context_ptr->iregs[30] = REGISTER_FROM_THREADSTATE(machine_state, lr);
@@ -602,49 +602,49 @@
 
 #ifdef HAS_PCC_SUPPORT
 bool MinidumpGenerator::WriteStackPPC(breakpad_thread_state_data_t state,
-                                      MDMemoryDescriptor *stack_location) {
-  ppc_thread_state_t *machine_state =
-      reinterpret_cast<ppc_thread_state_t *>(state);
+                                      MDMemoryDescriptor* stack_location) {
+  ppc_thread_state_t* machine_state =
+      reinterpret_cast<ppc_thread_state_t*>(state);
   mach_vm_address_t start_addr = REGISTER_FROM_THREADSTATE(machine_state, r1);
   return WriteStackFromStartAddress(start_addr, stack_location);
 }
 
 bool MinidumpGenerator::WriteStackPPC64(breakpad_thread_state_data_t state,
-                                        MDMemoryDescriptor *stack_location) {
-  ppc_thread_state64_t *machine_state =
-      reinterpret_cast<ppc_thread_state64_t *>(state);
+                                        MDMemoryDescriptor* stack_location) {
+  ppc_thread_state64_t* machine_state =
+      reinterpret_cast<ppc_thread_state64_t*>(state);
   mach_vm_address_t start_addr = REGISTER_FROM_THREADSTATE(machine_state, r1);
   return WriteStackFromStartAddress(start_addr, stack_location);
 }
 
 uint64_t
 MinidumpGenerator::CurrentPCForStackPPC(breakpad_thread_state_data_t state) {
-  ppc_thread_state_t *machine_state =
-      reinterpret_cast<ppc_thread_state_t *>(state);
+  ppc_thread_state_t* machine_state =
+      reinterpret_cast<ppc_thread_state_t*>(state);
 
   return REGISTER_FROM_THREADSTATE(machine_state, srr0);
 }
 
 uint64_t
 MinidumpGenerator::CurrentPCForStackPPC64(breakpad_thread_state_data_t state) {
-  ppc_thread_state64_t *machine_state =
-      reinterpret_cast<ppc_thread_state64_t *>(state);
+  ppc_thread_state64_t* machine_state =
+      reinterpret_cast<ppc_thread_state64_t*>(state);
 
   return REGISTER_FROM_THREADSTATE(machine_state, srr0);
 }
 
 bool MinidumpGenerator::WriteContextPPC(breakpad_thread_state_data_t state,
-                                        MDLocationDescriptor *register_location)
+                                        MDLocationDescriptor* register_location)
 {
   TypedMDRVA<MDRawContextPPC> context(&writer_);
-  ppc_thread_state_t *machine_state =
-      reinterpret_cast<ppc_thread_state_t *>(state);
+  ppc_thread_state_t* machine_state =
+      reinterpret_cast<ppc_thread_state_t*>(state);
 
   if (!context.Allocate())
     return false;
 
   *register_location = context.location();
-  MDRawContextPPC *context_ptr = context.get();
+  MDRawContextPPC* context_ptr = context.get();
   context_ptr->context_flags = MD_CONTEXT_PPC_BASE;
 
 #define AddReg(a) context_ptr->a = static_cast<__typeof__(context_ptr->a)>( \
@@ -701,16 +701,16 @@
 
 bool MinidumpGenerator::WriteContextPPC64(
     breakpad_thread_state_data_t state,
-    MDLocationDescriptor *register_location) {
+    MDLocationDescriptor* register_location) {
   TypedMDRVA<MDRawContextPPC64> context(&writer_);
-  ppc_thread_state64_t *machine_state =
-      reinterpret_cast<ppc_thread_state64_t *>(state);
+  ppc_thread_state64_t* machine_state =
+      reinterpret_cast<ppc_thread_state64_t*>(state);
 
   if (!context.Allocate())
     return false;
 
   *register_location = context.location();
-  MDRawContextPPC64 *context_ptr = context.get();
+  MDRawContextPPC64* context_ptr = context.get();
   context_ptr->context_flags = MD_CONTEXT_PPC_BASE;
 
 #define AddReg(a) context_ptr->a = static_cast<__typeof__(context_ptr->a)>( \
@@ -768,18 +768,18 @@
 
 #ifdef HAS_X86_SUPPORT
 bool MinidumpGenerator::WriteStackX86(breakpad_thread_state_data_t state,
-                                   MDMemoryDescriptor *stack_location) {
-  i386_thread_state_t *machine_state =
-      reinterpret_cast<i386_thread_state_t *>(state);
+                                   MDMemoryDescriptor* stack_location) {
+  i386_thread_state_t* machine_state =
+      reinterpret_cast<i386_thread_state_t*>(state);
 
   mach_vm_address_t start_addr = REGISTER_FROM_THREADSTATE(machine_state, esp);
   return WriteStackFromStartAddress(start_addr, stack_location);
 }
 
 bool MinidumpGenerator::WriteStackX86_64(breakpad_thread_state_data_t state,
-                                         MDMemoryDescriptor *stack_location) {
-  x86_thread_state64_t *machine_state =
-      reinterpret_cast<x86_thread_state64_t *>(state);
+                                         MDMemoryDescriptor* stack_location) {
+  x86_thread_state64_t* machine_state =
+      reinterpret_cast<x86_thread_state64_t*>(state);
 
   mach_vm_address_t start_addr = static_cast<mach_vm_address_t>(
       REGISTER_FROM_THREADSTATE(machine_state, rsp));
@@ -788,32 +788,32 @@
 
 uint64_t
 MinidumpGenerator::CurrentPCForStackX86(breakpad_thread_state_data_t state) {
-  i386_thread_state_t *machine_state =
-      reinterpret_cast<i386_thread_state_t *>(state);
+  i386_thread_state_t* machine_state =
+      reinterpret_cast<i386_thread_state_t*>(state);
 
   return REGISTER_FROM_THREADSTATE(machine_state, eip);
 }
 
 uint64_t
 MinidumpGenerator::CurrentPCForStackX86_64(breakpad_thread_state_data_t state) {
-  x86_thread_state64_t *machine_state =
-      reinterpret_cast<x86_thread_state64_t *>(state);
+  x86_thread_state64_t* machine_state =
+      reinterpret_cast<x86_thread_state64_t*>(state);
 
   return REGISTER_FROM_THREADSTATE(machine_state, rip);
 }
 
 bool MinidumpGenerator::WriteContextX86(breakpad_thread_state_data_t state,
-                                        MDLocationDescriptor *register_location)
+                                        MDLocationDescriptor* register_location)
 {
   TypedMDRVA<MDRawContextX86> context(&writer_);
-  i386_thread_state_t *machine_state =
-      reinterpret_cast<i386_thread_state_t *>(state);
+  i386_thread_state_t* machine_state =
+      reinterpret_cast<i386_thread_state_t*>(state);
 
   if (!context.Allocate())
     return false;
 
   *register_location = context.location();
-  MDRawContextX86 *context_ptr = context.get();
+  MDRawContextX86* context_ptr = context.get();
 
 #define AddReg(a) context_ptr->a = static_cast<__typeof__(context_ptr->a)>( \
     REGISTER_FROM_THREADSTATE(machine_state, a))
@@ -844,16 +844,16 @@
 
 bool MinidumpGenerator::WriteContextX86_64(
     breakpad_thread_state_data_t state,
-    MDLocationDescriptor *register_location) {
+    MDLocationDescriptor* register_location) {
   TypedMDRVA<MDRawContextAMD64> context(&writer_);
-  x86_thread_state64_t *machine_state =
-      reinterpret_cast<x86_thread_state64_t *>(state);
+  x86_thread_state64_t* machine_state =
+      reinterpret_cast<x86_thread_state64_t*>(state);
 
   if (!context.Allocate())
     return false;
 
   *register_location = context.location();
-  MDRawContextAMD64 *context_ptr = context.get();
+  MDRawContextAMD64* context_ptr = context.get();
 
 #define AddReg(a) context_ptr->a = static_cast<__typeof__(context_ptr->a)>( \
     REGISTER_FROM_THREADSTATE(machine_state, a))
@@ -892,7 +892,7 @@
 
 bool MinidumpGenerator::GetThreadState(thread_act_t target_thread,
                                        thread_state_t state,
-                                       mach_msg_type_number_t *count) {
+                                       mach_msg_type_number_t* count) {
   if (task_context_ && target_thread == mach_thread_self()) {
     switch (cpu_type_) {
 #ifdef HAS_ARM_SUPPORT
@@ -963,7 +963,7 @@
 }
 
 bool MinidumpGenerator::WriteThreadStream(mach_port_t thread_id,
-                                          MDRawThread *thread) {
+                                          MDRawThread* thread) {
   breakpad_thread_state_data_t state;
   mach_msg_type_number_t state_count
       = static_cast<mach_msg_type_number_t>(sizeof(state));
@@ -986,7 +986,7 @@
 }
 
 bool MinidumpGenerator::WriteThreadListStream(
-    MDRawDirectory *thread_list_stream) {
+    MDRawDirectory* thread_list_stream) {
   TypedMDRVA<MDRawThreadList> list(&writer_);
   thread_act_port_array_t threads_for_task;
   mach_msg_type_number_t thread_count;
@@ -1027,7 +1027,7 @@
 }
 
 bool MinidumpGenerator::WriteMemoryListStream(
-    MDRawDirectory *memory_list_stream) {
+    MDRawDirectory* memory_list_stream) {
   TypedMDRVA<MDRawMemoryList> list(&writer_);
 
   // If the dump has an exception, include some memory around the
@@ -1119,7 +1119,7 @@
     } else {
       // In-process, just copy from local memory.
       ip_memory.Copy(
-        reinterpret_cast<const void *>(ip_memory_d.start_of_memory_range),
+        reinterpret_cast<const void*>(ip_memory_d.start_of_memory_range),
         ip_memory_d.memory.data_size);
     }
 
@@ -1133,7 +1133,7 @@
 }
 
 bool
-MinidumpGenerator::WriteExceptionStream(MDRawDirectory *exception_stream) {
+MinidumpGenerator::WriteExceptionStream(MDRawDirectory* exception_stream) {
   TypedMDRVA<MDRawExceptionStream> exception(&writer_);
 
   if (!exception.Allocate())
@@ -1141,7 +1141,7 @@
 
   exception_stream->stream_type = MD_EXCEPTION_STREAM;
   exception_stream->location = exception.location();
-  MDRawExceptionStream *exception_ptr = exception.get();
+  MDRawExceptionStream* exception_ptr = exception.get();
   exception_ptr->thread_id = exception_thread_;
 
   // This naming is confusing, but it is the proper translation from
@@ -1168,7 +1168,7 @@
 }
 
 bool MinidumpGenerator::WriteSystemInfoStream(
-    MDRawDirectory *system_info_stream) {
+    MDRawDirectory* system_info_stream) {
   TypedMDRVA<MDRawSystemInfo> info(&writer_);
 
   if (!info.Allocate())
@@ -1181,7 +1181,7 @@
   uint32_t number_of_processors;
   size_t len = sizeof(number_of_processors);
   sysctlbyname("hw.ncpu", &number_of_processors, &len, NULL, 0);
-  MDRawSystemInfo *info_ptr = info.get();
+  MDRawSystemInfo* info_ptr = info.get();
 
   switch (cpu_type_) {
 #ifdef HAS_ARM_SUPPORT
@@ -1292,10 +1292,10 @@
 }
 
 bool MinidumpGenerator::WriteModuleStream(unsigned int index,
-                                          MDRawModule *module) {
+                                          MDRawModule* module) {
   if (dynamic_images_) {
     // we're in a different process than the crashed process
-    DynamicImage *image = dynamic_images_->GetImage(index);
+    DynamicImage* image = dynamic_images_->GetImage(index);
 
     if (!image)
       return false;
@@ -1337,7 +1337,7 @@
     }
   } else {
     // Getting module info in the crashed process
-    const breakpad_mach_header *header;
+    const breakpad_mach_header* header;
     header = (breakpad_mach_header*)_dyld_get_image_header(index);
     if (!header)
       return false;
@@ -1357,16 +1357,16 @@
     int cpu_type = header->cputype;
     unsigned long slide = _dyld_get_image_vmaddr_slide(index);
     const char* name = _dyld_get_image_name(index);
-    const struct load_command *cmd =
-        reinterpret_cast<const struct load_command *>(header + 1);
+    const struct load_command* cmd =
+        reinterpret_cast<const struct load_command*>(header + 1);
 
     memset(module, 0, sizeof(MDRawModule));
 
     for (unsigned int i = 0; cmd && (i < header->ncmds); i++) {
       if (cmd->cmd == LC_SEGMENT_ARCH) {
 
-        const breakpad_mach_segment_command *seg =
-            reinterpret_cast<const breakpad_mach_segment_command *>(cmd);
+        const breakpad_mach_segment_command* seg =
+            reinterpret_cast<const breakpad_mach_segment_command*>(cmd);
 
         if (!strcmp(seg->segname, "__TEXT")) {
           MDLocationDescriptor string_location;
@@ -1389,7 +1389,7 @@
         }
       }
 
-      cmd = reinterpret_cast<struct load_command*>((char *)cmd + cmd->cmdsize);
+      cmd = reinterpret_cast<struct load_command*>((char*)cmd + cmd->cmdsize);
     }
   }
 
@@ -1405,7 +1405,7 @@
     }
   } else {
     int image_count = _dyld_image_count();
-    const struct mach_header *header;
+    const struct mach_header* header;
 
     for (int index = 0; index < image_count; ++index) {
       header = _dyld_get_image_header(index);
@@ -1419,12 +1419,12 @@
   return 0;
 }
 
-bool MinidumpGenerator::WriteCVRecord(MDRawModule *module, int cpu_type,
-                                      const char *module_path, bool in_memory) {
+bool MinidumpGenerator::WriteCVRecord(MDRawModule* module, int cpu_type,
+                                      const char* module_path, bool in_memory) {
   TypedMDRVA<MDCVInfoPDB70> cv(&writer_);
 
   // Only return the last path component of the full module path
-  const char *module_name = strrchr(module_path, '/');
+  const char* module_name = strrchr(module_path, '/');
 
   // Increment past the slash
   if (module_name)
@@ -1441,7 +1441,7 @@
     return false;
 
   module->cv_record = cv.location();
-  MDCVInfoPDB70 *cv_ptr = cv.get();
+  MDCVInfoPDB70* cv_ptr = cv.get();
   cv_ptr->cv_signature = MD_CVINFOPDB70_SIGNATURE;
   cv_ptr->age = 0;
 
@@ -1450,7 +1450,7 @@
   bool result = false;
   if (in_memory) {
     MacFileUtilities::MachoID macho(module_path,
-        reinterpret_cast<void *>(module->base_of_image),
+        reinterpret_cast<void*>(module->base_of_image),
         static_cast<size_t>(module->size_of_image));
     result = macho.UUIDCommand(cpu_type, CPU_SUBTYPE_MULTIPLE, identifier);
     if (!result)
@@ -1487,7 +1487,7 @@
 }
 
 bool MinidumpGenerator::WriteModuleListStream(
-    MDRawDirectory *module_list_stream) {
+    MDRawDirectory* module_list_stream) {
   TypedMDRVA<MDRawModuleList> list(&writer_);
 
   uint32_t image_count = dynamic_images_ ?
@@ -1525,7 +1525,7 @@
   return true;
 }
 
-bool MinidumpGenerator::WriteMiscInfoStream(MDRawDirectory *misc_info_stream) {
+bool MinidumpGenerator::WriteMiscInfoStream(MDRawDirectory* misc_info_stream) {
   TypedMDRVA<MDRawMiscInfo> info(&writer_);
 
   if (!info.Allocate())
@@ -1534,7 +1534,7 @@
   misc_info_stream->stream_type = MD_MISC_INFO_STREAM;
   misc_info_stream->location = info.location();
 
-  MDRawMiscInfo *info_ptr = info.get();
+  MDRawMiscInfo* info_ptr = info.get();
   info_ptr->size_of_info = static_cast<uint32_t>(sizeof(MDRawMiscInfo));
   info_ptr->flags1 = MD_MISCINFO_FLAGS1_PROCESS_ID |
     MD_MISCINFO_FLAGS1_PROCESS_TIMES |
@@ -1577,7 +1577,7 @@
 }
 
 bool MinidumpGenerator::WriteBreakpadInfoStream(
-    MDRawDirectory *breakpad_info_stream) {
+    MDRawDirectory* breakpad_info_stream) {
   TypedMDRVA<MDRawBreakpadInfo> info(&writer_);
 
   if (!info.Allocate())
@@ -1585,7 +1585,7 @@
 
   breakpad_info_stream->stream_type = MD_BREAKPAD_INFO_STREAM;
   breakpad_info_stream->location = info.location();
-  MDRawBreakpadInfo *info_ptr = info.get();
+  MDRawBreakpadInfo* info_ptr = info.get();
 
   if (exception_thread_ && exception_type_) {
     info_ptr->validity = MD_BREAKPAD_INFO_VALID_DUMP_THREAD_ID |
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/minidump_generator.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/minidump_generator.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/minidump_generator.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/minidump_generator.h	2021-12-09 12:01:26.000000000 +0000
@@ -63,14 +63,31 @@
 
 // Use the REGISTER_FROM_THREADSTATE to access a register name from the
 // breakpad_thread_state_t structure.
-#if __DARWIN_UNIX03 || TARGET_CPU_X86_64 || TARGET_CPU_PPC64 || TARGET_CPU_ARM
+#if __DARWIN_OPAQUE_ARM_THREAD_STATE64
+#define ARRAY_REGISTER_FROM_THREADSTATE(a, b, i) ((a)->__##b[i])
+#define GET_REGISTER_FROM_THREADSTATE_fp(a)                                    \
+  (reinterpret_cast<uintptr_t>((a)->__opaque_fp))
+#define GET_REGISTER_FROM_THREADSTATE_lr(a)                                    \
+  (reinterpret_cast<uintptr_t>((a)->__opaque_lr))
+#define GET_REGISTER_FROM_THREADSTATE_sp(a)                                    \
+  (reinterpret_cast<uintptr_t>((a)->__opaque_sp))
+#define GET_REGISTER_FROM_THREADSTATE_pc(a)                                    \
+  (reinterpret_cast<uintptr_t>((a)->__opaque_pc))
+#define GET_REGISTER_FROM_THREADSTATE_cpsr(a) ((a)->__cpsr)
+#define GET_REGISTER_FROM_THREADSTATE_flags(a) ((a)->__opaque_flags)
+#define REGISTER_FROM_THREADSTATE(a, b) (GET_REGISTER_FROM_THREADSTATE_##b(a))
+#elif __DARWIN_UNIX03 || TARGET_CPU_X86_64 || TARGET_CPU_PPC64 || TARGET_CPU_ARM
 // In The 10.5 SDK Headers Apple prepended __ to the variable names in the
 // i386_thread_state_t structure.  There's no good way to tell what version of
 // the SDK we're compiling against so we just toggle on the same preprocessor
 // symbol Apple's headers use.
 #define REGISTER_FROM_THREADSTATE(a, b) ((a)->__ ## b)
+#define ARRAY_REGISTER_FROM_THREADSTATE(a, b, i)                               \
+  REGISTER_FROM_THREADSTATE(a, b[i])
 #else
 #define REGISTER_FROM_THREADSTATE(a, b) (a->b)
+#define ARRAY_REGISTER_FROM_THREADSTATE(a, b, i)                               \
+  REGISTER_FROM_THREADSTATE(a, b[i])
 #endif
 
 // Creates a minidump file of the current process.  If there is exception data,
@@ -89,12 +106,12 @@
 
   // Return <dir>/<unique_name>.dmp
   // Sets |unique_name| (if requested) to the unique name for the minidump
-  static string UniqueNameInDirectory(const string &dir, string *unique_name);
+  static string UniqueNameInDirectory(const string& dir, string* unique_name);
 
   // Write out the minidump into |path|
   // All of the components of |path| must exist and be writable
   // Return true if successful, false otherwise
-  bool Write(const char *path);
+  bool Write(const char* path);
 
   // Specify some exception information, if applicable
   void SetExceptionInformation(int type, int code, int subcode,
@@ -108,7 +125,7 @@
   // Specify the task context. If |task_context| is not NULL, it will be used
   // to retrieve the context of the current thread, instead of using
   // |thread_get_state|.
-  void SetTaskContext(breakpad_ucontext_t *task_context);
+  void SetTaskContext(breakpad_ucontext_t* task_context);
 
   // Gather system information.  This should be call at least once before using
   // the MinidumpGenerator class.
@@ -116,81 +133,81 @@
 
  protected:
   // Overridable Stream writers
-  virtual bool WriteExceptionStream(MDRawDirectory *exception_stream);
+  virtual bool WriteExceptionStream(MDRawDirectory* exception_stream);
 
   // Overridable Helper
-  virtual bool WriteThreadStream(mach_port_t thread_id, MDRawThread *thread);
+  virtual bool WriteThreadStream(mach_port_t thread_id, MDRawThread* thread);
 
  private:
-  typedef bool (MinidumpGenerator::*WriteStreamFN)(MDRawDirectory *);
+  typedef bool (MinidumpGenerator::*WriteStreamFN)(MDRawDirectory*);
 
   // Stream writers
-  bool WriteThreadListStream(MDRawDirectory *thread_list_stream);
-  bool WriteMemoryListStream(MDRawDirectory *memory_list_stream);
-  bool WriteSystemInfoStream(MDRawDirectory *system_info_stream);
-  bool WriteModuleListStream(MDRawDirectory *module_list_stream);
-  bool WriteMiscInfoStream(MDRawDirectory *misc_info_stream);
-  bool WriteBreakpadInfoStream(MDRawDirectory *breakpad_info_stream);
+  bool WriteThreadListStream(MDRawDirectory* thread_list_stream);
+  bool WriteMemoryListStream(MDRawDirectory* memory_list_stream);
+  bool WriteSystemInfoStream(MDRawDirectory* system_info_stream);
+  bool WriteModuleListStream(MDRawDirectory* module_list_stream);
+  bool WriteMiscInfoStream(MDRawDirectory* misc_info_stream);
+  bool WriteBreakpadInfoStream(MDRawDirectory* breakpad_info_stream);
 
   // Helpers
   uint64_t CurrentPCForStack(breakpad_thread_state_data_t state);
   bool GetThreadState(thread_act_t target_thread, thread_state_t state,
-                      mach_msg_type_number_t *count);
+                      mach_msg_type_number_t* count);
   bool WriteStackFromStartAddress(mach_vm_address_t start_addr,
-                                  MDMemoryDescriptor *stack_location);
+                                  MDMemoryDescriptor* stack_location);
   bool WriteStack(breakpad_thread_state_data_t state,
-                  MDMemoryDescriptor *stack_location);
+                  MDMemoryDescriptor* stack_location);
   bool WriteContext(breakpad_thread_state_data_t state,
-                    MDLocationDescriptor *register_location);
-  bool WriteCVRecord(MDRawModule *module, int cpu_type,
-                     const char *module_path, bool in_memory);
-  bool WriteModuleStream(unsigned int index, MDRawModule *module);
+                    MDLocationDescriptor* register_location);
+  bool WriteCVRecord(MDRawModule* module, int cpu_type,
+                     const char* module_path, bool in_memory);
+  bool WriteModuleStream(unsigned int index, MDRawModule* module);
   size_t CalculateStackSize(mach_vm_address_t start_addr);
   int  FindExecutableModule();
 
   // Per-CPU implementations of these methods
 #ifdef HAS_ARM_SUPPORT
   bool WriteStackARM(breakpad_thread_state_data_t state,
-                     MDMemoryDescriptor *stack_location);
+                     MDMemoryDescriptor* stack_location);
   bool WriteContextARM(breakpad_thread_state_data_t state,
-                       MDLocationDescriptor *register_location);
+                       MDLocationDescriptor* register_location);
   uint64_t CurrentPCForStackARM(breakpad_thread_state_data_t state);
 #endif
 #ifdef HAS_ARM64_SUPPORT
   bool WriteStackARM64(breakpad_thread_state_data_t state,
-                       MDMemoryDescriptor *stack_location);
+                       MDMemoryDescriptor* stack_location);
   bool WriteContextARM64(breakpad_thread_state_data_t state,
-                         MDLocationDescriptor *register_location);
+                         MDLocationDescriptor* register_location);
   uint64_t CurrentPCForStackARM64(breakpad_thread_state_data_t state);
 #endif
 #ifdef HAS_PPC_SUPPORT
   bool WriteStackPPC(breakpad_thread_state_data_t state,
-                     MDMemoryDescriptor *stack_location);
+                     MDMemoryDescriptor* stack_location);
   bool WriteContextPPC(breakpad_thread_state_data_t state,
-                       MDLocationDescriptor *register_location);
+                       MDLocationDescriptor* register_location);
   uint64_t CurrentPCForStackPPC(breakpad_thread_state_data_t state);
   bool WriteStackPPC64(breakpad_thread_state_data_t state,
-                       MDMemoryDescriptor *stack_location);
+                       MDMemoryDescriptor* stack_location);
   bool WriteContextPPC64(breakpad_thread_state_data_t state,
-                       MDLocationDescriptor *register_location);
+                       MDLocationDescriptor* register_location);
   uint64_t CurrentPCForStackPPC64(breakpad_thread_state_data_t state);
 #endif
 #ifdef HAS_X86_SUPPORT
   bool WriteStackX86(breakpad_thread_state_data_t state,
-                       MDMemoryDescriptor *stack_location);
+                       MDMemoryDescriptor* stack_location);
   bool WriteContextX86(breakpad_thread_state_data_t state,
-                       MDLocationDescriptor *register_location);
+                       MDLocationDescriptor* register_location);
   uint64_t CurrentPCForStackX86(breakpad_thread_state_data_t state);
   bool WriteStackX86_64(breakpad_thread_state_data_t state,
-                        MDMemoryDescriptor *stack_location);
+                        MDMemoryDescriptor* stack_location);
   bool WriteContextX86_64(breakpad_thread_state_data_t state,
-                          MDLocationDescriptor *register_location);
+                          MDLocationDescriptor* register_location);
   uint64_t CurrentPCForStackX86_64(breakpad_thread_state_data_t state);
 #endif
 
   // disallow copy ctor and operator=
-  explicit MinidumpGenerator(const MinidumpGenerator &);
-  void operator=(const MinidumpGenerator &);
+  explicit MinidumpGenerator(const MinidumpGenerator&);
+  void operator=(const MinidumpGenerator&);
 
  protected:
   // Use this writer to put the data to disk
@@ -215,10 +232,10 @@
   static int os_build_number_;
 
   // Context of the task to dump.
-  breakpad_ucontext_t *task_context_;
+  breakpad_ucontext_t* task_context_;
 
   // Information about dynamically loaded code
-  DynamicImages *dynamic_images_;
+  DynamicImages* dynamic_images_;
 
   // PageAllocator makes it possible to allocate memory
   // directly from the system, even while handling an exception.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -40,7 +40,7 @@
 
 BreakpadNlistTest test1(TEST_INVOCATION(BreakpadNlistTest, CompareToNM));
 
-BreakpadNlistTest::BreakpadNlistTest(TestInvocation *invocation)
+BreakpadNlistTest::BreakpadNlistTest(TestInvocation* invocation)
     : TestCase(invocation) {
 }
 
@@ -55,7 +55,7 @@
   system("/usr/bin/nm -arch ppc64 /usr/lib/dyld > /tmp/dyld-namelist.txt");
 #endif
 
-  FILE *fd = fopen("/tmp/dyld-namelist.txt", "rt");
+  FILE* fd = fopen("/tmp/dyld-namelist.txt", "rt");
 
   char oneNMAddr[30];
   char symbolType;
@@ -63,10 +63,10 @@
   while (!feof(fd)) {
     fscanf(fd, "%s %c %s", oneNMAddr, &symbolType, symbolName);
     breakpad_nlist symbolList[2];
-    breakpad_nlist &list = symbolList[0];
+    breakpad_nlist& list = symbolList[0];
 
     memset(symbolList, 0, sizeof(breakpad_nlist)*2);
-    const char *symbolNames[2];
+    const char* symbolNames[2];
     symbolNames[0] = (const char*)symbolName;
     symbolNames[1] = "\0";
     breakpad_nlist_64("/usr/lib/dyld", &list, symbolNames);
@@ -79,12 +79,12 @@
   fclose(fd);
 }
 
-bool BreakpadNlistTest::IsSymbolMoreThanOnceInDyld(const char *symbolName) {
+bool BreakpadNlistTest::IsSymbolMoreThanOnceInDyld(const char* symbolName) {
   // These are the symbols that occur more than once when nm dumps
   // the symbol table of /usr/lib/dyld.  Our nlist program returns
   // the first address because it's doing a search so we need to exclude
   // these from causing the test to fail
-  const char *multipleSymbols[] = {
+  const char* multipleSymbols[] = {
     "__Z41__static_initialization_and_destruction_0ii",
     "___tcf_0",
     "___tcf_1",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.h	2021-12-09 12:01:26.000000000 +0000
@@ -47,7 +47,7 @@
   // /usr/lib/dyld. So we track those so we don't report failures
   // in mismatches between what our nlist returns and what nm has
   // for the duplicate symbols.
-  bool IsSymbolMoreThanOnceInDyld(const char *symbolName);
+  bool IsSymbolMoreThanOnceInDyld(const char* symbolName);
 
  public:
   explicit BreakpadNlistTest(TestInvocation* invocation);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc	2021-12-09 12:01:26.000000000 +0000
@@ -42,7 +42,7 @@
 DynamicImagesTests test3(TEST_INVOCATION(DynamicImagesTests,
                                          ReadLibrariesFromLocalTaskTest));
 
-DynamicImagesTests::DynamicImagesTests(TestInvocation *invocation)
+DynamicImagesTests::DynamicImagesTests(TestInvocation* invocation)
     : TestCase(invocation) {
 }
 
@@ -54,7 +54,7 @@
 
   // pick test2 as a symbol we know to be valid to read
   // anything will work, really
-  void *addr = reinterpret_cast<void*>(&test2);
+  void* addr = reinterpret_cast<void*>(&test2);
   std::vector<uint8_t> buf(getpagesize());
 
   fprintf(stderr, "reading 0x%p\n", addr);
@@ -71,7 +71,7 @@
 void DynamicImagesTests::ReadLibrariesFromLocalTaskTest() {
 
   mach_port_t me = mach_task_self();
-  google_breakpad::DynamicImages *d = new google_breakpad::DynamicImages(me);
+  google_breakpad::DynamicImages* d = new google_breakpad::DynamicImages(me);
 
   fprintf(stderr,"Local task image count: %d\n", d->GetImageCount());
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/crash_generation_server_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/crash_generation_server_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/crash_generation_server_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/crash_generation_server_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -147,8 +147,8 @@
     globfree(&dirContents);
 }
 
-void dumpCallback(void *context, const ClientInfo &client_info,
-                  const std::string &file_path) {
+void dumpCallback(void* context, const ClientInfo& client_info,
+                  const std::string& file_path) {
   if (context) {
     CrashGenerationServerTest* self =
         reinterpret_cast<CrashGenerationServerTest*>(context);
@@ -158,7 +158,7 @@
   }
 }
 
-void *RequestDump(void *context) {
+void* RequestDump(void* context) {
   CrashGenerationClient client((const char*)context);
   bool result = client.RequestDump();
   return (void*)(result ? 0 : 1);
@@ -206,7 +206,7 @@
 }
 
 static void Crasher() {
-  int *a = (int*)0x42;
+  int* a = (int*)0x42;
 
   fprintf(stdout, "Going to crash...\n");
   fprintf(stdout, "A = %d", *a);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/exception_handler_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/exception_handler_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/exception_handler_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/exception_handler_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -71,7 +71,7 @@
 };
 
 static void Crasher() {
-  int *a = (int*)0x42;
+  int* a = (int*)0x42;
 
   fprintf(stdout, "Going to crash...\n");
   fprintf(stdout, "A = %d", *a);
@@ -86,8 +86,8 @@
   crasher();
 }
 
-static bool MDCallback(const char *dump_dir, const char *file_name,
-                       void *context, bool success) {
+static bool MDCallback(const char* dump_dir, const char* file_name,
+                       void* context, bool success) {
   string path(dump_dir);
   path.append("/");
   path.append(file_name);
@@ -179,9 +179,9 @@
   InProcessCrash(true);
 }
 
-static bool DumpNameMDCallback(const char *dump_dir, const char *file_name,
-                               void *context, bool success) {
-  ExceptionHandlerTest *self = reinterpret_cast<ExceptionHandlerTest*>(context);
+static bool DumpNameMDCallback(const char* dump_dir, const char* file_name,
+                               void* context, bool success) {
+  ExceptionHandlerTest* self = reinterpret_cast<ExceptionHandlerTest*>(context);
   if (dump_dir && file_name) {
     self->lastDumpName = dump_dir;
     self->lastDumpName += "/";
@@ -652,7 +652,7 @@
   ASSERT_EQ((unsigned int)1, memory_list->region_count());
 }
 
-static void *Junk(void *) {
+static void* Junk(void*) {
   sleep(1000000);
   return NULL;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/minidump_generator_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/minidump_generator_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/minidump_generator_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/mac/tests/minidump_generator_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -79,7 +79,7 @@
   AutoTempDir tempDir;
 };
 
-static void *Junk(void* data) {
+static void* Junk(void* data) {
   bool* wait = reinterpret_cast<bool*>(data);
   while (!*wait) {
     usleep(10000);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer.cc	2021-12-09 12:01:26.000000000 +0000
@@ -101,7 +101,7 @@
     Close();
 }
 
-bool MinidumpFileWriter::Open(const char *path) {
+bool MinidumpFileWriter::Open(const char* path) {
   assert(file_ == -1);
 #if defined(__linux__) && __linux__
   file_ = sys_open(path, O_WRONLY | O_CREAT | O_EXCL, 0600);
@@ -145,9 +145,9 @@
   return result;
 }
 
-bool MinidumpFileWriter::CopyStringToMDString(const wchar_t *str,
+bool MinidumpFileWriter::CopyStringToMDString(const wchar_t* str,
                                               unsigned int length,
-                                              TypedMDRVA<MDString> *mdstring) {
+                                              TypedMDRVA<MDString>* mdstring) {
   bool result = true;
   if (sizeof(wchar_t) == sizeof(uint16_t)) {
     // Shortcut if wchar_t is the same size as MDString's buffer
@@ -178,9 +178,9 @@
   return result;
 }
 
-bool MinidumpFileWriter::CopyStringToMDString(const char *str,
+bool MinidumpFileWriter::CopyStringToMDString(const char* str,
                                               unsigned int length,
-                                              TypedMDRVA<MDString> *mdstring) {
+                                              TypedMDRVA<MDString>* mdstring) {
   bool result = true;
   uint16_t out[2];
   int out_idx = 0;
@@ -205,9 +205,9 @@
 }
 
 template <typename CharType>
-bool MinidumpFileWriter::WriteStringCore(const CharType *str,
+bool MinidumpFileWriter::WriteStringCore(const CharType* str,
                                          unsigned int length,
-                                         MDLocationDescriptor *location) {
+                                         MDLocationDescriptor* location) {
   assert(str);
   assert(location);
   // Calculate the mdstring length by either limiting to |length| as passed in
@@ -240,18 +240,18 @@
   return result;
 }
 
-bool MinidumpFileWriter::WriteString(const wchar_t *str, unsigned int length,
-                 MDLocationDescriptor *location) {
+bool MinidumpFileWriter::WriteString(const wchar_t* str, unsigned int length,
+                                     MDLocationDescriptor* location) {
   return WriteStringCore(str, length, location);
 }
 
-bool MinidumpFileWriter::WriteString(const char *str, unsigned int length,
-                 MDLocationDescriptor *location) {
+bool MinidumpFileWriter::WriteString(const char* str, unsigned int length,
+                                     MDLocationDescriptor* location) {
   return WriteStringCore(str, length, location);
 }
 
-bool MinidumpFileWriter::WriteMemory(const void *src, size_t size,
-                                     MDMemoryDescriptor *output) {
+bool MinidumpFileWriter::WriteMemory(const void* src, size_t size,
+                                     MDMemoryDescriptor* output) {
   assert(src);
   assert(output);
   UntypedMDRVA mem(this);
@@ -307,7 +307,7 @@
   return current_position;
 }
 
-bool MinidumpFileWriter::Copy(MDRVA position, const void *src, ssize_t size) {
+bool MinidumpFileWriter::Copy(MDRVA position, const void* src, ssize_t size) {
   assert(src);
   assert(size);
   assert(file_ != -1);
@@ -340,7 +340,7 @@
   return position_ != MinidumpFileWriter::kInvalidMDRVA;
 }
 
-bool UntypedMDRVA::Copy(MDRVA pos, const void *src, size_t size) {
+bool UntypedMDRVA::Copy(MDRVA pos, const void* src, size_t size) {
   assert(src);
   assert(size);
   assert(pos + size <= position_ + size_);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer.h	2021-12-09 12:01:26.000000000 +0000
@@ -77,7 +77,7 @@
   // Open |path| as the destination of the minidump data. If |path| already
   // exists, then Open() will fail.
   // Return true on success, or false on failure.
-  bool Open(const char *path);
+  bool Open(const char* path);
 
   // Sets the file descriptor |file| as the destination of the minidump data.
   // Can be used as an alternative to Open() when a file descriptor is
@@ -98,20 +98,20 @@
   // entire NULL terminated string.  Copying will stop at the first NULL.
   // |location| the allocated location
   // Return true on success, or false on failure
-  bool WriteString(const wchar_t *str, unsigned int length,
-                   MDLocationDescriptor *location);
+  bool WriteString(const wchar_t* str, unsigned int length,
+                   MDLocationDescriptor* location);
 
   // Same as above, except with |str| as a UTF-8 string
-  bool WriteString(const char *str, unsigned int length,
-                   MDLocationDescriptor *location);
+  bool WriteString(const char* str, unsigned int length,
+                   MDLocationDescriptor* location);
 
   // Write |size| bytes starting at |src| into the current position.
   // Return true on success and set |output| to position, or false on failure
-  bool WriteMemory(const void *src, size_t size, MDMemoryDescriptor *output);
+  bool WriteMemory(const void* src, size_t size, MDMemoryDescriptor* output);
 
   // Copies |size| bytes from |src| to |position|
   // Return true on success, or false on failure
-  bool Copy(MDRVA position, const void *src, ssize_t size);
+  bool Copy(MDRVA position, const void* src, ssize_t size);
 
   // Return the current position for writing to the minidump
   inline MDRVA position() const { return position_; }
@@ -141,21 +141,21 @@
   // variant may need to create a MDString that has more characters than the
   // source |str|, whereas the UTF-8 variant may coalesce characters to form
   // a single UTF-16 character.
-  bool CopyStringToMDString(const wchar_t *str, unsigned int length,
-                            TypedMDRVA<MDString> *mdstring);
-  bool CopyStringToMDString(const char *str, unsigned int length,
-                            TypedMDRVA<MDString> *mdstring);
+  bool CopyStringToMDString(const wchar_t* str, unsigned int length,
+                            TypedMDRVA<MDString>* mdstring);
+  bool CopyStringToMDString(const char* str, unsigned int length,
+                            TypedMDRVA<MDString>* mdstring);
 
   // The common templated code for writing a string
   template <typename CharType>
-  bool WriteStringCore(const CharType *str, unsigned int length,
-                       MDLocationDescriptor *location);
+  bool WriteStringCore(const CharType* str, unsigned int length,
+                       MDLocationDescriptor* location);
 };
 
 // Represents an untyped allocated chunk
 class UntypedMDRVA {
  public:
-  explicit UntypedMDRVA(MinidumpFileWriter *writer)
+  explicit UntypedMDRVA(MinidumpFileWriter* writer)
       : writer_(writer),
         position_(writer->position()),
         size_(0) {}
@@ -179,16 +179,16 @@
 
   // Copy |size| bytes starting at |src| into the minidump at |position|
   // Return true on success, or false on failure
-  bool Copy(MDRVA position, const void *src, size_t size);
+  bool Copy(MDRVA position, const void* src, size_t size);
 
   // Copy |size| bytes from |src| to the current position
-  inline bool Copy(const void *src, size_t size) {
+  inline bool Copy(const void* src, size_t size) {
     return Copy(position_, src, size);
   }
 
  protected:
   // Writer we associate with
-  MinidumpFileWriter *writer_;
+  MinidumpFileWriter* writer_;
 
   // Position of the start of the data
   MDRVA position_;
@@ -206,7 +206,7 @@
 class TypedMDRVA : public UntypedMDRVA {
  public:
   // Constructs an unallocated MDRVA
-  explicit TypedMDRVA(MinidumpFileWriter *writer)
+  explicit TypedMDRVA(MinidumpFileWriter* writer)
       : UntypedMDRVA(writer),
         data_(),
         allocation_state_(UNALLOCATED) {}
@@ -220,7 +220,7 @@
   // Address of object data_ of MDType.  This is not declared const as the
   // typical usage will be to access the underlying |data_| object as to
   // alter its contents.
-  MDType *get() { return &data_; }
+  MDType* get() { return &data_; }
 
   // Allocates minidump_size<MDType>::size() bytes.
   // Must not call more than once.
@@ -245,12 +245,12 @@
   // Copy |item| to |index|
   // Must have been allocated using AllocateArray().
   // Return true on success, or false on failure
-  bool CopyIndex(unsigned int index, MDType *item);
+  bool CopyIndex(unsigned int index, MDType* item);
 
   // Copy |size| bytes starting at |str| to |index|
   // Must have been allocated using AllocateObjectAndArray().
   // Return true on success, or false on failure
-  bool CopyIndexAfterObject(unsigned int index, const void *src, size_t size);
+  bool CopyIndexAfterObject(unsigned int index, const void* src, size_t size);
 
   // Write data_
   bool Flush();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -69,7 +69,7 @@
 }
 
 template<typename MDType>
-inline bool TypedMDRVA<MDType>::CopyIndex(unsigned int index, MDType *item) {
+inline bool TypedMDRVA<MDType>::CopyIndex(unsigned int index, MDType* item) {
   assert(allocation_state_ == ARRAY);
   return writer_->Copy(
       static_cast<MDRVA>(position_ + index * minidump_size<MDType>::size()), 
@@ -78,7 +78,7 @@
 
 template<typename MDType>
 inline bool TypedMDRVA<MDType>::CopyIndexAfterObject(unsigned int index,
-                                                     const void *src, 
+                                                     const void* src,
                                                      size_t length) {
   assert(allocation_state_ == SINGLE_OBJECT_WITH_ARRAY);
   return writer_->Copy(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/minidump_file_writer_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,7 @@
 // Author: waylonis@google.com (Dan Waylonis)
 
 /*
- g++ -I../ ../common/convert_UTF.c \
+ g++ -I../ ../common/convert_UTF.cc \
  ../common/string_conversion.cc \
  minidump_file_writer.cc \
  minidump_file_writer_unittest.cc \
@@ -70,16 +70,16 @@
   ArrayStructure array[0];
 } ObjectAndArrayStructure;
 
-static bool WriteFile(const char *path) {
+static bool WriteFile(const char* path) {
   MinidumpFileWriter writer;
   if (writer.Open(path)) {
     // Test a single structure
     google_breakpad::TypedMDRVA<StringStructure> strings(&writer);
     ASSERT_TRUE(strings.Allocate());
     strings.get()->integer_value = 0xBEEF;
-    const char *first = "First String";
+    const char* first = "First String";
     ASSERT_TRUE(writer.WriteString(first, 0, &strings.get()->first_string));
-    const wchar_t *second = L"Second String";
+    const wchar_t* second = L"Second String";
     ASSERT_TRUE(writer.WriteString(second, 0, &strings.get()->second_string));
 
     // Test an array structure
@@ -111,7 +111,7 @@
   return writer.Close();
 }
 
-static bool CompareFile(const char *path) {
+static bool CompareFile(const char* path) {
   unsigned long expected[] = {
 #if defined(__BIG_ENDIAN__)
     0x0000beef, 0x0000001e, 0x00000018, 0x00000020, 0x00000038, 0x00000000, 
@@ -146,13 +146,14 @@
   };
   size_t expected_byte_count = sizeof(expected);
   int fd = open(path, O_RDONLY, 0600);
-  void *buffer = malloc(expected_byte_count);
+  void* buffer = malloc(expected_byte_count);
   ASSERT_NE(fd, -1);
   ASSERT_TRUE(buffer);
   ASSERT_EQ(read(fd, buffer, expected_byte_count), 
             static_cast<ssize_t>(expected_byte_count));
 
-  char *b1, *b2;
+  char* b1;
+  char* b2;
   b1 = reinterpret_cast<char*>(buffer);
   b2 = reinterpret_cast<char*>(expected);
   while (*b1 == *b2) {
@@ -167,13 +168,13 @@
 }
 
 static bool RunTests() {
-  const char *path = "/tmp/minidump_file_writer_unittest.dmp";
+  const char* path = "/tmp/minidump_file_writer_unittest.dmp";
   ASSERT_TRUE(WriteFile(path));
   ASSERT_TRUE(CompareFile(path));
   unlink(path);
   return true;
 }
 
-extern "C" int main(int argc, const char *argv[]) {
+extern "C" int main(int argc, const char* argv[]) {
   return RunTests() ? 0 : 1;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler.cc	2021-12-09 12:01:26.000000000 +0000
@@ -54,15 +54,15 @@
   SIGBUS
 };
 
-std::vector<ExceptionHandler*> *ExceptionHandler::handler_stack_ = NULL;
+std::vector<ExceptionHandler*>* ExceptionHandler::handler_stack_ = NULL;
 int ExceptionHandler::handler_stack_index_ = 0;
 pthread_mutex_t ExceptionHandler::handler_stack_mutex_ =
   PTHREAD_MUTEX_INITIALIZER;
 
-ExceptionHandler::ExceptionHandler(const string &dump_path,
+ExceptionHandler::ExceptionHandler(const string& dump_path,
                                    FilterCallback filter,
                                    MinidumpCallback callback,
-                                   void *callback_context,
+                                   void* callback_context,
                                    bool install_handler)
     : filter_(filter),
       callback_(callback),
@@ -79,7 +79,7 @@
     pthread_mutex_lock(&handler_stack_mutex_);
 
     if (handler_stack_ == NULL)
-      handler_stack_ = new std::vector<ExceptionHandler *>;
+      handler_stack_ = new std::vector<ExceptionHandler*>;
     handler_stack_->push_back(this);
     pthread_mutex_unlock(&handler_stack_mutex_);
   }
@@ -92,7 +92,7 @@
     handler_stack_->pop_back();
   } else {
     print_message1(2, "warning: removing Breakpad handler out of order\n");
-    for (std::vector<ExceptionHandler *>::iterator iterator =
+    for (std::vector<ExceptionHandler*>::iterator iterator =
          handler_stack_->begin();
          iterator != handler_stack_->end();
          ++iterator) {
@@ -116,9 +116,9 @@
 }
 
 // static
-bool ExceptionHandler::WriteMinidump(const string &dump_path,
+bool ExceptionHandler::WriteMinidump(const string& dump_path,
                                      MinidumpCallback callback,
-                                     void *callback_context) {
+                                     void* callback_context) {
   ExceptionHandler handler(dump_path, NULL, callback,
                            callback_context, false);
   return handler.InternalWriteMinidump(0, 0, NULL);
@@ -166,7 +166,7 @@
 
 // static
 void ExceptionHandler::HandleException(int signo) {
-//void ExceptionHandler::HandleException(int signo, siginfo_t *sip, ucontext_t *sig_ctx) {
+//void ExceptionHandler::HandleException(int signo, siginfo_t* sip, ucontext_t* sig_ctx) {
   // The context information about the signal is put on the stack of
   // the signal handler frame as value parameter. For some reasons, the
   // prototype of the handler doesn't declare this information as parameter, we
@@ -181,14 +181,14 @@
   uintptr_t current_ebp = (uintptr_t)_getfp();
 
   pthread_mutex_lock(&handler_stack_mutex_);
-  ExceptionHandler *current_handler =
+  ExceptionHandler* current_handler =
     handler_stack_->at(handler_stack_->size() - ++handler_stack_index_);
   pthread_mutex_unlock(&handler_stack_mutex_);
 
   // Restore original handler.
   current_handler->TeardownHandler(signo);
 
-  ucontext_t *sig_ctx = NULL;
+  ucontext_t* sig_ctx = NULL;
   if (current_handler->InternalWriteMinidump(signo, current_ebp, &sig_ctx)) {
 //  if (current_handler->InternalWriteMinidump(signo, &sig_ctx)) {
     // Fully handled this exception, safe to exit.
@@ -218,7 +218,7 @@
 
 bool ExceptionHandler::InternalWriteMinidump(int signo,
                                              uintptr_t sighandler_ebp,
-                                             ucontext_t **sig_ctx) {
+                                             ucontext_t** sig_ctx) {
   if (filter_ && !filter_(callback_context_))
     return false;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler.h	2021-12-09 12:01:26.000000000 +0000
@@ -79,7 +79,7 @@
   // attempting to write a minidump.  If a FilterCallback returns false,
   // Breakpad  will immediately report the exception as unhandled without
   // writing a minidump, allowing another handler the opportunity to handle it.
-  typedef bool (*FilterCallback)(void *context);
+  typedef bool (*FilterCallback)(void* context);
 
   // A callback function to run after the minidump has been written.
   // minidump_id is a unique id for the dump, so the minidump
@@ -97,9 +97,9 @@
   // should normally return the value of |succeeded|, or when they wish to
   // not report an exception of handled, false.  Callbacks will rarely want to
   // return true directly (unless |succeeded| is true).
-  typedef bool (*MinidumpCallback)(const char *dump_path,
-                                   const char *minidump_id,
-                                   void *context,
+  typedef bool (*MinidumpCallback)(const char* dump_path,
+                                   const char* minidump_id,
+                                   void* context,
                                    bool succeeded);
 
   // Creates a new ExceptionHandler instance to handle writing minidumps.
@@ -110,15 +110,15 @@
   // If install_handler is true, then a minidump will be written whenever
   // an unhandled exception occurs.  If it is false, minidumps will only
   // be written when WriteMinidump is called.
-  ExceptionHandler(const string &dump_path,
+  ExceptionHandler(const string& dump_path,
                    FilterCallback filter, MinidumpCallback callback,
-                   void *callback_context,
+                   void* callback_context,
                    bool install_handler);
   ~ExceptionHandler();
 
   // Get and Set the minidump path.
   string dump_path() const { return dump_path_; }
-  void set_dump_path(const string &dump_path) {
+  void set_dump_path(const string& dump_path) {
     dump_path_ = dump_path;
     dump_path_c_ = dump_path_.c_str();
   }
@@ -129,9 +129,9 @@
 
   // Convenience form of WriteMinidump which does not require an
   // ExceptionHandler instance.
-  static bool WriteMinidump(const string &dump_path,
+  static bool WriteMinidump(const string& dump_path,
                             MinidumpCallback callback,
-                            void *callback_context);
+                            void* callback_context);
 
  private:
   // Setup crash handler.
@@ -144,7 +144,7 @@
   void TeardownAllHandlers();
 
   // Runs the main loop for the exception handler thread.
-  static void* ExceptionHandlerThreadMain(void *lpParameter);
+  static void* ExceptionHandlerThreadMain(void* lpParameter);
 
   // Signal handler.
   static void HandleException(int signo);
@@ -157,20 +157,20 @@
   // for the second and third parameters if you are not calling
   // this from a signal handler.
   bool InternalWriteMinidump(int signo, uintptr_t sighandler_ebp,
-                             ucontext_t **sig_ctx);
+                             ucontext_t** sig_ctx);
 
  private:
   // The callbacks before and after writing the dump file.
   FilterCallback filter_;
   MinidumpCallback callback_;
-  void *callback_context_;
+  void* callback_context_;
 
   // The directory in which a minidump will be written, set by the dump_path
   // argument to the constructor, or set_dump_path.
   string dump_path_;
   // C style dump path. Keep this when setting dump path, since calling
   // c_str() of std::string when crashing may not be safe.
-  const char *dump_path_c_;
+  const char* dump_path_c_;
 
   // True if the ExceptionHandler installed an unhandled exception filter
   // when created (with an install_handler parameter set to true).
@@ -183,7 +183,7 @@
   // The global exception handler stack. This is need becuase there may exist
   // multiple ExceptionHandler instances in a process. Each will have itself
   // registered in this stack.
-  static std::vector<ExceptionHandler *> *handler_stack_;
+  static std::vector<ExceptionHandler*>* handler_stack_;
   // The index of the handler that should handle the next exception.
   static int handler_stack_index_;
   static pthread_mutex_t handler_stack_mutex_;
@@ -192,8 +192,8 @@
   MinidumpGenerator minidump_generator_;
 
   // disallow copy ctor and operator=
-  explicit ExceptionHandler(const ExceptionHandler &);
-  void operator=(const ExceptionHandler &);
+  explicit ExceptionHandler(const ExceptionHandler&);
+  void operator=(const ExceptionHandler&);
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/exception_handler_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -49,7 +49,7 @@
   // Stack variable, used for debugging stack dumps.
   int c = 0xcccccccc;
   fprintf(stderr, "Thread trying to crash: %x\n", getpid());
-  c = *reinterpret_cast<int *>(0x5);
+  c = *reinterpret_cast<int*>(0x5);
   return c;
 }
 
@@ -60,7 +60,7 @@
   return b;
 }
 
-static void *thread_crash(void *) {
+static void* thread_crash(void*) {
   // Stack variable, used for debugging stack dumps.
   int a = 0xaaaaaaaa;
   sleep(3);
@@ -69,7 +69,7 @@
   return NULL;
 }
 
-static void *thread_main(void *) {
+static void* thread_main(void*) {
   while (!should_exit)
     sleep(1);
   return NULL;
@@ -91,9 +91,9 @@
 }
 
 // Callback when minidump written.
-static bool MinidumpCallback(const char *dump_path,
-                             const char *minidump_id,
-                             void *context,
+static bool MinidumpCallback(const char* dump_path,
+                             const char* minidump_id,
+                             void* context,
                              bool succeeded) {
   int index = reinterpret_cast<int>(context);
   if (index == 0) {
@@ -104,7 +104,7 @@
   return false;
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   int handler_index = 1;
   ExceptionHandler handler_ignore(".", NULL, MinidumpCallback,
                                   (void*)handler_index, true);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_generator.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_generator.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_generator.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_generator.cc	2021-12-09 12:01:26.000000000 +0000
@@ -50,7 +50,7 @@
 
 // Argument for the writer function.
 struct WriterArgument {
-  MinidumpFileWriter *minidump_writer;
+  MinidumpFileWriter* minidump_writer;
 
   // Pid of the lwp who called WriteMinidumpToFile
   int requester_pid;
@@ -73,15 +73,15 @@
   // User context when crash happens. Can be NULL if this is a requested dump.
   // This is actually an out parameter, but it will be filled in at the start
   // of the writer LWP.
-  ucontext_t *sig_ctx;
+  ucontext_t* sig_ctx;
 
   // Used to get information about the lwps.
-  SolarisLwp *lwp_lister;
+  SolarisLwp* lwp_lister;
 };
 
 // Holding context information for the callback of finding the crashing lwp.
 struct FindCrashLwpContext {
-  const SolarisLwp *lwp_lister;
+  const SolarisLwp* lwp_lister;
   uintptr_t crashing_stack_bottom;
   int crashing_lwpid;
 
@@ -96,11 +96,11 @@
 // It will compare the stack bottom of the provided lwp with the stack
 // bottom of the crashed lwp, it they are eqaul, this lwp is the one
 // who crashed.
-bool IsLwpCrashedCallback(lwpstatus_t *lsp, void *context) {
-  FindCrashLwpContext *crashing_context =
-    static_cast<FindCrashLwpContext *>(context);
-  const SolarisLwp *lwp_lister = crashing_context->lwp_lister;
-  const prgregset_t *gregs = &(lsp->pr_reg);
+bool IsLwpCrashedCallback(lwpstatus_t* lsp, void* context) {
+  FindCrashLwpContext* crashing_context =
+    static_cast<FindCrashLwpContext*>(context);
+  const SolarisLwp* lwp_lister = crashing_context->lwp_lister;
+  const prgregset_t* gregs = &(lsp->pr_reg);
 #if TARGET_CPU_SPARC
   uintptr_t last_ebp = (*gregs)[R_FP];
 #elif TARGET_CPU_X86
@@ -121,7 +121,7 @@
 // This is done based on stack bottom comparing.
 int FindCrashingLwp(uintptr_t crashing_stack_bottom,
                     int requester_pid,
-                    const SolarisLwp *lwp_lister) {
+                    const SolarisLwp* lwp_lister) {
   FindCrashLwpContext context;
   context.lwp_lister = lwp_lister;
   context.crashing_stack_bottom = crashing_stack_bottom;
@@ -131,17 +131,17 @@
   return context.crashing_lwpid;
 }
 
-bool WriteLwpStack(const SolarisLwp *lwp_lister,
+bool WriteLwpStack(const SolarisLwp* lwp_lister,
                    uintptr_t last_esp,
-                   UntypedMDRVA *memory,
-                   MDMemoryDescriptor *loc) {
+                   UntypedMDRVA* memory,
+                   MDMemoryDescriptor* loc) {
   uintptr_t stack_bottom = lwp_lister->GetLwpStackBottom(last_esp);
   if (stack_bottom >= last_esp) {
     int size = stack_bottom - last_esp;
     if (size > 0) {
       if (!memory->Allocate(size))
         return false;
-      memory->Copy(reinterpret_cast<void *>(last_esp), size);
+      memory->Copy(reinterpret_cast<void*>(last_esp), size);
       loc->start_of_memory_range = last_esp;
       loc->memory = memory->location();
     }
@@ -151,7 +151,7 @@
 }
 
 #if TARGET_CPU_SPARC
-bool WriteContext(MDRawContextSPARC *context, ucontext_t *sig_ctx) {
+bool WriteContext(MDRawContextSPARC* context, ucontext_t* sig_ctx) {
   assert(sig_ctx != NULL);
   int* regs = sig_ctx->uc_mcontext.gregs;
   context->context_flags = MD_CONTEXT_SPARC_FULL;
@@ -170,13 +170,13 @@
   for ( int i = 1 ; i < 16; ++i ) {
     context->g_r[i] = (uintptr_t)(sig_ctx->uc_mcontext.gregs[i + 3]);
   }
-  context->g_r[30] = (uintptr_t)(((struct frame *)context->g_r[14])->fr_savfp);
+  context->g_r[30] = (uintptr_t)(((struct frame*)context->g_r[14])->fr_savfp);
 
   return true;
 }
 
-bool WriteContext(MDRawContextSPARC *context, prgregset_t regs,
-                  prfpregset_t *fp_regs) {
+bool WriteContext(MDRawContextSPARC* context, prgregset_t regs,
+                  prfpregset_t* fp_regs) {
   if (!context || !regs)
     return false;
 
@@ -195,8 +195,8 @@
   return true;
 }
 #elif TARGET_CPU_X86
-bool WriteContext(MDRawContextX86 *context, prgregset_t regs,
-                  prfpregset_t *fp_regs) {
+bool WriteContext(MDRawContextX86* context, prgregset_t regs,
+                  prfpregset_t* fp_regs) {
   if (!context || !regs)
     return false;
 
@@ -228,10 +228,10 @@
 // signal. This makes the current stack not reliable, and our stack walker
 // won't figure out the whole call stack for this. So we write the stack at the
 // time of the crash into the minidump file, not the current stack.
-bool WriteCrashedLwpStream(MinidumpFileWriter *minidump_writer,
-                           const WriterArgument *writer_args,
-                           const lwpstatus_t *lsp,
-                           MDRawThread *lwp) {
+bool WriteCrashedLwpStream(MinidumpFileWriter* minidump_writer,
+                           const WriterArgument* writer_args,
+                           const lwpstatus_t* lsp,
+                           MDRawThread* lwp) {
   assert(writer_args->sig_ctx != NULL);
 
   lwp->thread_id = lsp->pr_lwpid;
@@ -264,16 +264,16 @@
   lwp->thread_context = context.location();
   memset(context.get(), 0, sizeof(MDRawContextX86));
   return WriteContext(context.get(),
-                      (int *)&writer_args->sig_ctx->uc_mcontext.gregs,
+                      (int*)&writer_args->sig_ctx->uc_mcontext.gregs,
                       &writer_args->sig_ctx->uc_mcontext.fpregs);
 #endif
 }
 
-bool WriteLwpStream(MinidumpFileWriter *minidump_writer,
-                    const SolarisLwp *lwp_lister,
-                    const lwpstatus_t *lsp, MDRawThread *lwp) {
+bool WriteLwpStream(MinidumpFileWriter* minidump_writer,
+                    const SolarisLwp* lwp_lister,
+                    const lwpstatus_t* lsp, MDRawThread* lwp) {
   prfpregset_t fp_regs = lsp->pr_fpreg;
-  const prgregset_t *gregs = &(lsp->pr_reg);
+  const prgregset_t* gregs = &(lsp->pr_reg);
   UntypedMDRVA memory(minidump_writer);
 #if TARGET_CPU_SPARC
   if (!WriteLwpStack(lwp_lister,
@@ -306,10 +306,10 @@
   lwp->thread_context = context.location();
   memset(context.get(), 0, sizeof(MDRawContextX86));
 #endif /* TARGET_CPU_XXX */
-  return WriteContext(context.get(), (int *)gregs, &fp_regs);
+  return WriteContext(context.get(), (int*)gregs, &fp_regs);
 }
 
-bool WriteCPUInformation(MDRawSystemInfo *sys_info) {
+bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
   struct utsname uts;
   char *major, *minor, *build;
 
@@ -337,8 +337,8 @@
   return true;
 }
 
-bool WriteOSInformation(MinidumpFileWriter *minidump_writer,
-                        MDRawSystemInfo *sys_info) {
+bool WriteOSInformation(MinidumpFileWriter* minidump_writer,
+                        MDRawSystemInfo* sys_info) {
   sys_info->platform_id = MD_OS_SOLARIS;
 
   struct utsname uts;
@@ -346,7 +346,7 @@
     char os_version[512];
     size_t space_left = sizeof(os_version);
     memset(os_version, 0, space_left);
-    const char *os_info_table[] = {
+    const char* os_info_table[] = {
       uts.sysname,
       uts.release,
       uts.version,
@@ -354,7 +354,7 @@
       "OpenSolaris",
       NULL
     };
-    for (const char **cur_os_info = os_info_table;
+    for (const char** cur_os_info = os_info_table;
          *cur_os_info != NULL;
          ++cur_os_info) {
       if (cur_os_info != os_info_table && space_left > 1) {
@@ -379,21 +379,21 @@
 
 // Callback context for get writting lwp information.
 struct LwpInfoCallbackCtx {
-  MinidumpFileWriter *minidump_writer;
-  const WriterArgument *writer_args;
-  TypedMDRVA<MDRawThreadList> *list;
+  MinidumpFileWriter* minidump_writer;
+  const WriterArgument* writer_args;
+  TypedMDRVA<MDRawThreadList>* list;
   int lwp_index;
 };
 
-bool LwpInformationCallback(lwpstatus_t *lsp, void *context) {
+bool LwpInformationCallback(lwpstatus_t* lsp, void* context) {
   bool success = true;
-  LwpInfoCallbackCtx *callback_context =
-    static_cast<LwpInfoCallbackCtx *>(context);
+  LwpInfoCallbackCtx* callback_context =
+    static_cast<LwpInfoCallbackCtx*>(context);
 
   // The current lwp is the one to handle the crash. Ignore it.
   if (lsp->pr_lwpid != pthread_self()) {
-    LwpInfoCallbackCtx *callback_context =
-      static_cast<LwpInfoCallbackCtx *>(context);
+    LwpInfoCallbackCtx* callback_context =
+      static_cast<LwpInfoCallbackCtx*>(context);
     MDRawThread lwp;
     memset(&lwp, 0, sizeof(MDRawThread));
 
@@ -417,11 +417,11 @@
   return success;
 }
 
-bool WriteLwpListStream(MinidumpFileWriter *minidump_writer,
-                        const WriterArgument *writer_args,
-                        MDRawDirectory *dir) {
+bool WriteLwpListStream(MinidumpFileWriter* minidump_writer,
+                        const WriterArgument* writer_args,
+                        MDRawDirectory* dir) {
   // Get the lwp information.
-  const SolarisLwp *lwp_lister = writer_args->lwp_lister;
+  const SolarisLwp* lwp_lister = writer_args->lwp_lister;
   int lwp_count = lwp_lister->GetLwpCount();
   if (lwp_count < 0)
     return false;
@@ -444,14 +444,14 @@
   return written == lwp_count;
 }
 
-bool WriteCVRecord(MinidumpFileWriter *minidump_writer,
-                   MDRawModule *module,
-                   const char *module_path,
-                   char *realname) {
+bool WriteCVRecord(MinidumpFileWriter* minidump_writer,
+                   MDRawModule* module,
+                   const char* module_path,
+                   char* realname) {
   TypedMDRVA<MDCVInfoPDB70> cv(minidump_writer);
 
   char path[PATH_MAX];
-  const char *module_name = module_path ? module_path : "<Unknown>";
+  const char* module_name = module_path ? module_path : "<Unknown>";
   snprintf(path, sizeof(path), "/proc/self/object/%s", module_name);
 
   size_t module_name_length = strlen(realname);
@@ -461,7 +461,7 @@
     return false;
 
   module->cv_record = cv.location();
-  MDCVInfoPDB70 *cv_ptr = cv.get();
+  MDCVInfoPDB70* cv_ptr = cv.get();
   memset(cv_ptr, 0, sizeof(MDCVInfoPDB70));
   cv_ptr->cv_signature = MD_CVINFOPDB70_SIGNATURE;
   cv_ptr->age = 0;
@@ -489,15 +489,15 @@
 }
 
 struct ModuleInfoCallbackCtx {
-  MinidumpFileWriter *minidump_writer;
-  const WriterArgument *writer_args;
-  TypedMDRVA<MDRawModuleList> *list;
+  MinidumpFileWriter* minidump_writer;
+  const WriterArgument* writer_args;
+  TypedMDRVA<MDRawModuleList>* list;
   int module_index;
 };
 
-bool ModuleInfoCallback(const ModuleInfo &module_info, void *context) {
-  ModuleInfoCallbackCtx *callback_context =
-    static_cast<ModuleInfoCallbackCtx *>(context);
+bool ModuleInfoCallback(const ModuleInfo& module_info, void* context) {
+  ModuleInfoCallbackCtx* callback_context =
+    static_cast<ModuleInfoCallbackCtx*>(context);
   // Skip those modules without name, or those that are not modules.
   if (strlen(module_info.name) == 0)
     return true;
@@ -507,7 +507,7 @@
   MDLocationDescriptor loc;
   char path[PATH_MAX];
   char buf[PATH_MAX];
-  char *realname;
+  char* realname;
   int count;
 
   snprintf(path, sizeof (path), "/proc/self/path/%s", module_info.name);
@@ -535,9 +535,9 @@
   return true;
 }
 
-bool WriteModuleListStream(MinidumpFileWriter *minidump_writer,
-                           const WriterArgument *writer_args,
-                           MDRawDirectory *dir) {
+bool WriteModuleListStream(MinidumpFileWriter* minidump_writer,
+                           const WriterArgument* writer_args,
+                           MDRawDirectory* dir) {
   TypedMDRVA<MDRawModuleList> list(minidump_writer);
   int module_count = writer_args->lwp_lister->GetModuleCount();
 
@@ -558,9 +558,9 @@
   return writer_args->lwp_lister->ListModules(&callback) == module_count;
 }
 
-bool WriteSystemInfoStream(MinidumpFileWriter *minidump_writer,
-                           const WriterArgument *writer_args,
-                           MDRawDirectory *dir) {
+bool WriteSystemInfoStream(MinidumpFileWriter* minidump_writer,
+                           const WriterArgument* writer_args,
+                           MDRawDirectory* dir) {
   TypedMDRVA<MDRawSystemInfo> sys_info(minidump_writer);
 
   if (!sys_info.Allocate())
@@ -573,9 +573,9 @@
          WriteOSInformation(minidump_writer, sys_info.get());
 }
 
-bool WriteExceptionStream(MinidumpFileWriter *minidump_writer,
-                          const WriterArgument *writer_args,
-                          MDRawDirectory *dir) {
+bool WriteExceptionStream(MinidumpFileWriter* minidump_writer,
+                          const WriterArgument* writer_args,
+                          MDRawDirectory* dir) {
   // This happenes when this is not a crash, but a requested dump.
   if (writer_args->sig_ctx == NULL)
     return false;
@@ -620,14 +620,14 @@
   exception.get()->thread_context = context.location();
   memset(context.get(), 0, sizeof(MDRawContextX86));
   return WriteContext(context.get(),
-                      (int *)&writer_args->sig_ctx->uc_mcontext.gregs,
+                      (int*)&writer_args->sig_ctx->uc_mcontext.gregs,
                       NULL);
 #endif
 }
 
-bool WriteMiscInfoStream(MinidumpFileWriter *minidump_writer,
-                         const WriterArgument *writer_args,
-                         MDRawDirectory *dir) {
+bool WriteMiscInfoStream(MinidumpFileWriter* minidump_writer,
+                         const WriterArgument* writer_args,
+                         MDRawDirectory* dir) {
   TypedMDRVA<MDRawMiscInfo> info(minidump_writer);
 
   if (!info.Allocate())
@@ -642,9 +642,9 @@
   return true;
 }
 
-bool WriteBreakpadInfoStream(MinidumpFileWriter *minidump_writer,
-                             const WriterArgument *writer_args,
-                             MDRawDirectory *dir) {
+bool WriteBreakpadInfoStream(MinidumpFileWriter* minidump_writer,
+                             const WriterArgument* writer_args,
+                             MDRawDirectory* dir) {
   TypedMDRVA<MDRawBreakpadInfo> info(minidump_writer);
 
   if (!info.Allocate())
@@ -662,16 +662,16 @@
 
 class AutoLwpResumer {
  public:
-  AutoLwpResumer(SolarisLwp *lwp) : lwp_(lwp) {}
+  AutoLwpResumer(SolarisLwp* lwp) : lwp_(lwp) {}
   ~AutoLwpResumer() { lwp_->ControlAllLwps(false); }
  private:
-  SolarisLwp *lwp_;
+  SolarisLwp* lwp_;
 };
 
 // Prototype of writer functions.
-typedef bool (*WriteStreamFN)(MinidumpFileWriter *,
-                              const WriterArgument *,
-                              MDRawDirectory *);
+typedef bool (*WriteStreamFN)(MinidumpFileWriter*,
+                              const WriterArgument*,
+                              MDRawDirectory*);
 
 // Function table to writer a full minidump.
 const WriteStreamFN writers[] = {
@@ -684,9 +684,9 @@
 };
 
 // Will call each writer function in the writers table.
-//void* MinidumpGenerator::Write(void *argument) {
-void* Write(void *argument) {
-  WriterArgument *writer_args = static_cast<WriterArgument *>(argument);
+//void* MinidumpGenerator::Write(void* argument) {
+void* Write(void* argument) {
+  WriterArgument* writer_args = static_cast<WriterArgument*>(argument);
 
   if (!writer_args->lwp_lister->ControlAllLwps(true))
     return NULL;
@@ -712,7 +712,7 @@
       writer_args->crashed_lwpid = crashed_lwpid;
   }
 
-  MinidumpFileWriter *minidump_writer = writer_args->minidump_writer;
+  MinidumpFileWriter* minidump_writer = writer_args->minidump_writer;
   TypedMDRVA<MDRawHeader> header(minidump_writer);
   TypedMDRVA<MDRawDirectory> dir(minidump_writer);
   if (!header.Allocate())
@@ -750,10 +750,10 @@
 
 // Write minidump into file.
 // It runs in a different thread from the crashing thread.
-bool MinidumpGenerator::WriteMinidumpToFile(const char *file_pathname,
+bool MinidumpGenerator::WriteMinidumpToFile(const char* file_pathname,
                                             int signo,
                                             uintptr_t sighandler_ebp,
-                                            ucontext_t **sig_ctx) const {
+                                            ucontext_t** sig_ctx) const {
   // The exception handler thread.
   pthread_t handler_thread;
 
@@ -775,7 +775,7 @@
     argument.sighandler_ebp = sighandler_ebp;
     argument.sig_ctx = NULL;
 
-    pthread_create(&handler_thread, NULL, Write, (void *)&argument);
+    pthread_create(&handler_thread, NULL, Write, (void*)&argument);
     pthread_join(handler_thread, NULL);
     return true;
   }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_generator.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_generator.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_generator.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_generator.h	2021-12-09 12:01:26.000000000 +0000
@@ -48,10 +48,10 @@
 //
 class MinidumpGenerator {
   // Callback run for writing lwp information in the process.
-  friend bool LwpInformationCallback(lwpstatus_t *lsp, void *context);
+  friend bool LwpInformationCallback(lwpstatus_t* lsp, void* context);
 
   // Callback run for writing module information in the process.
-  friend bool ModuleInfoCallback(const ModuleInfo &module_info, void *context);
+  friend bool ModuleInfoCallback(const ModuleInfo& module_info, void* context);
 
  public:
   MinidumpGenerator();
@@ -59,10 +59,10 @@
   ~MinidumpGenerator();
 
   // Write minidump.
-  bool WriteMinidumpToFile(const char *file_pathname,
+  bool WriteMinidumpToFile(const char* file_pathname,
                            int signo,
                            uintptr_t sighandler_ebp,
-                           ucontext_t **sig_ctx) const;
+                           ucontext_t** sig_ctx) const;
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/minidump_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -40,7 +40,7 @@
 
 static bool doneWritingReport = false;
 
-static void *Reporter(void *) {
+static void* Reporter(void*) {
   char buffer[PATH_MAX];
   MinidumpGenerator md;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/solaris_lwp.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/solaris_lwp.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/solaris_lwp.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/solaris_lwp.cc	2021-12-09 12:01:26.000000000 +0000
@@ -69,10 +69,10 @@
 };
 
 // Convert from string to int.
-static bool LocalAtoi(char *s, int *r) {
+static bool LocalAtoi(char* s, int* r) {
   assert(s != NULL);
   assert(r != NULL);
-  char *endptr = NULL;
+  char* endptr = NULL;
   int ret = strtol(s, &endptr, 10);
   if (endptr == s)
     return false;
@@ -82,10 +82,10 @@
 
 // Callback invoked for each mapped module.
 // It uses the module's adderss range to validate the address.
-static bool AddressNotInModuleCallback(const ModuleInfo &module_info,
-                                       void *context) {
-  AddressValidatingContext *addr =
-    reinterpret_cast<AddressValidatingContext *>(context);
+static bool AddressNotInModuleCallback(const ModuleInfo& module_info,
+                                       void* context) {
+  AddressValidatingContext* addr =
+    reinterpret_cast<AddressValidatingContext*>(context);
   if (addr->is_mapped = ((module_info.start_addr > 0) &&
                          (addr->address >= module_info.start_addr) &&
                          (addr->address <= module_info.start_addr +
@@ -97,16 +97,16 @@
 }
 
 static int IterateLwpAll(int pid,
-                         CallbackParam<LwpidCallback> *callback_param) {
+                         CallbackParam<LwpidCallback>* callback_param) {
   char lwp_path[40];
-  DIR *dir;
+  DIR* dir;
   int count = 0;
 
   snprintf(lwp_path, sizeof (lwp_path), "/proc/%d/lwp", (int)pid);
   if ((dir = opendir(lwp_path)) == NULL)
     return -1;
 
-  struct dirent *entry = NULL;
+  struct dirent* entry = NULL;
   while ((entry = readdir(dir)) != NULL) {
     if ((strcmp(entry->d_name, ".") != 0) &&
         (strcmp(entry->d_name, "..") != 0)) {
@@ -128,22 +128,22 @@
 }
 
 #if defined(__i386) && !defined(NO_FRAME_POINTER)
-void *GetNextFrame(void **last_ebp) {
-  void *sp = *last_ebp;
+void* GetNextFrame(void** last_ebp) {
+  void* sp = *last_ebp;
   if ((unsigned long)sp == (unsigned long)last_ebp)
     return NULL;
-  if ((unsigned long)sp & (sizeof(void *) - 1))
+  if ((unsigned long)sp & (sizeof(void*) - 1))
     return NULL;
   if ((unsigned long)sp - (unsigned long)last_ebp > 100000)
     return NULL;
   return sp;
 }
 #elif defined(__sparc)
-void *GetNextFrame(void *last_ebp) {
-  return reinterpret_cast<struct frame *>(last_ebp)->fr_savfp;
+void* GetNextFrame(void* last_ebp) {
+  return reinterpret_cast<struct frame*>(last_ebp)->fr_savfp;
 }
 #else
-void *GetNextFrame(void **last_ebp) {
+void* GetNextFrame(void** last_ebp) {
   return reinterpret_cast<void*>(last_ebp);
 }
 #endif
@@ -159,12 +159,12 @@
 
 // Control the execution of the lwp.
 // Suspend/Resume lwp based on the value of context.
-static bool ControlLwp(int lwpid, void *context) {
+static bool ControlLwp(int lwpid, void* context) {
   // The current thread is the one to handle the crash. Ignore it.
   if (lwpid != pthread_self()) {
     int ctlfd;
     char procname[PATH_MAX];
-    bool suspend = *(bool *)context;
+    bool suspend = *(bool*)context;
 
     // Open the /proc/$pid/lwp/$lwpid/lwpctl files
     snprintf(procname, sizeof (procname), "/proc/self/lwp/%d/lwpctl", lwpid);
@@ -193,7 +193,7 @@
  * prheader_t at the start (/proc/$pid/lstatus or /proc/$pid/lpsinfo).
  * Return true on success.
  */
-static bool read_lfile(int pid, const char *lname, prheader_t *lhp) {
+static bool read_lfile(int pid, const char* lname, prheader_t* lhp) {
   char lpath[PATH_MAX];
   struct stat statb;
   int fd;
@@ -242,14 +242,14 @@
 }
 
 int SolarisLwp::Lwp_iter_all(int pid,
-                             CallbackParam<LwpCallback> *callback_param) const {
-  lwpstatus_t *Lsp;
-  lwpstatus_t *sp;
+                             CallbackParam<LwpCallback>* callback_param) const {
+  lwpstatus_t* Lsp;
+  lwpstatus_t* sp;
   prheader_t lphp[HEADER_MAX];
   prheader_t lhp[HEADER_MAX];
-  prheader_t *Lphp = lphp;
-  prheader_t *Lhp = lhp;
-  lwpsinfo_t *Lpsp;
+  prheader_t* Lphp = lphp;
+  prheader_t* Lhp = lhp;
+  lwpsinfo_t* Lpsp;
   long nstat;
   long ninfo;
   int rv = 0;
@@ -264,13 +264,13 @@
     return -1;
   }
 
-  Lsp = (lwpstatus_t *)(uintptr_t)(Lhp + 1);
-  Lpsp = (lwpsinfo_t *)(uintptr_t)(Lphp + 1);
+  Lsp = (lwpstatus_t*)(uintptr_t)(Lhp + 1);
+  Lpsp = (lwpsinfo_t*)(uintptr_t)(Lphp + 1);
 
   for (ninfo = Lphp->pr_nent; ninfo != 0; --ninfo) {
     if (Lpsp->pr_sname != 'Z') {
       sp = Lsp;
-      Lsp = (lwpstatus_t *)((uintptr_t)Lsp + Lhp->pr_entsize);
+      Lsp = (lwpstatus_t*)((uintptr_t)Lsp + Lhp->pr_entsize);
     } else {
       sp = NULL;
     }
@@ -278,7 +278,7 @@
         !(callback_param->call_back)(sp, callback_param->context))
       break;
     ++rv;
-    Lpsp = (lwpsinfo_t *)((uintptr_t)Lpsp + Lphp->pr_entsize);
+    Lpsp = (lwpsinfo_t*)((uintptr_t)Lpsp + Lphp->pr_entsize);
   }
 
   return rv;
@@ -298,12 +298,12 @@
 }
 
 int SolarisLwp::ListModules(
-    CallbackParam<ModuleCallback> *callback_param) const {
-  const char *maps_path = "/proc/self/map";
+    CallbackParam<ModuleCallback>* callback_param) const {
+  const char* maps_path = "/proc/self/map";
   struct stat status;
   int fd = 0, num;
   prmap_t map_array[MAP_MAX];
-  prmap_t *maps = map_array;
+  prmap_t* maps = map_array;
   size_t size;
 
   if ((fd = open(maps_path, O_RDONLY)) == -1) {
@@ -326,12 +326,12 @@
     return -1;
   }
 
-  if (read(fd, (void *)maps, size) < 0) {
+  if (read(fd, (void*)maps, size) < 0) {
     print_message2(2, "failed to read %d\n", fd);
     return -1;
   }
 
-  prmap_t *_maps;
+  prmap_t* _maps;
   int _num;
   int module_count = 0;
   
@@ -345,7 +345,7 @@
    */
   for (_num = 0, _maps = maps; _num < num; ++_num, ++_maps) {
     ModuleInfo module;
-    char *name = _maps->pr_mapname;
+    char* name = _maps->pr_mapname;
 
     memset(&module, 0, sizeof (module));
     module.start_addr = _maps->pr_vaddr;
@@ -403,7 +403,7 @@
 // The Solaris stack looks like this:
 // http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libproc/common/Pstack.c#81
 bool SolarisLwp::FindSigContext(uintptr_t sighandler_ebp,
-                                ucontext_t **sig_ctx) {
+                                ucontext_t** sig_ctx) {
   uintptr_t previous_ebp;
   uintptr_t sig_ebp;
   const int MAX_STACK_DEPTH = 50;
@@ -416,7 +416,7 @@
     *sig_ctx = reinterpret_cast<ucontext_t*>(sighandler_ebp + sizeof (struct frame));
     uintptr_t sig_esp = (*sig_ctx)->uc_mcontext.gregs[REG_O6];
     if (sig_esp < previous_ebp && sig_esp > sighandler_ebp)
-      sig_ebp = (uintptr_t)(((struct frame *)sig_esp)->fr_savfp);
+      sig_ebp = (uintptr_t)(((struct frame*)sig_esp)->fr_savfp);
 
 #elif TARGET_CPU_X86
     previous_ebp = reinterpret_cast<uintptr_t>(GetNextFrame(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/solaris_lwp.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/solaris_lwp.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/solaris_lwp.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/solaris/handler/solaris_lwp.h	2021-12-09 12:01:26.000000000 +0000
@@ -70,17 +70,17 @@
 // A callback to run when getting a lwp in the process.
 // Return true will go on to the next lwp while return false will stop the
 // iteration.
-typedef bool (*LwpCallback)(lwpstatus_t* lsp, void *context); 
+typedef bool (*LwpCallback)(lwpstatus_t* lsp, void* context);
 
 // A callback to run when a new module is found in the process.
 // Return true will go on to the next module while return false will stop the
 // iteration.
-typedef bool (*ModuleCallback)(const ModuleInfo &module_info, void *context);
+typedef bool (*ModuleCallback)(const ModuleInfo& module_info, void* context);
 
 // A callback to run when getting a lwpid in the process.
 // Return true will go on to the next lwp while return false will stop the
 // iteration.
-typedef bool (*LwpidCallback)(int lwpid, void *context);
+typedef bool (*LwpidCallback)(int lwpid, void* context);
 
 // Holding the callback information.
 template<class CallbackFunc>
@@ -88,12 +88,12 @@
   // Callback function address.
   CallbackFunc call_back;
   // Callback context;
-  void *context;
+  void* context;
 
   CallbackParam() : call_back(NULL), context(NULL) {
   }
 
-  CallbackParam(CallbackFunc func, void *func_context) :
+  CallbackParam(CallbackFunc func, void* func_context) :
     call_back(func), context(func_context) {
   }
 };
@@ -129,7 +129,7 @@
   // Whenever there is a lwp found, the callback will be invoked to process
   // the information.
   // Return the callback return value or -1 on error.
-  int Lwp_iter_all(int pid, CallbackParam<LwpCallback> *callback_param) const;
+  int Lwp_iter_all(int pid, CallbackParam<LwpCallback>* callback_param) const;
 
   // Get the module count of the current process.
   int GetModuleCount() const;
@@ -138,13 +138,13 @@
   // Whenever a module is found, the callback will be invoked to process the
   // information.
   // Return how may modules are found.
-  int ListModules(CallbackParam<ModuleCallback> *callback_param) const;
+  int ListModules(CallbackParam<ModuleCallback>* callback_param) const;
 
   // Get the bottom of the stack from esp.
   uintptr_t GetLwpStackBottom(uintptr_t current_esp) const;
 
   // Finds a signal context on the stack given the ebp of our signal handler.
-  bool FindSigContext(uintptr_t sighandler_ebp, ucontext_t **sig_ctx);
+  bool FindSigContext(uintptr_t sighandler_ebp, ucontext_t** sig_ctx);
 
  private:
   // Check if the address is a valid virtual address.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/handler/exception_handler.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/handler/exception_handler.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/handler/exception_handler.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/handler/exception_handler.cc	2021-12-09 12:01:26.000000000 +0000
@@ -118,7 +118,7 @@
              NULL);                    // custom_info - not used
 }
 
-ExceptionHandler::ExceptionHandler(const wstring &dump_path,
+ExceptionHandler::ExceptionHandler(const wstring& dump_path,
                                    FilterCallback filter,
                                    MinidumpCallback callback,
                                    void* callback_context,
@@ -383,7 +383,7 @@
 
 // static
 DWORD ExceptionHandler::ExceptionHandlerThreadMain(void* lpParameter) {
-  ExceptionHandler* self = reinterpret_cast<ExceptionHandler *>(lpParameter);
+  ExceptionHandler* self = reinterpret_cast<ExceptionHandler*>(lpParameter);
   assert(self);
   assert(self->handler_start_semaphore_ != NULL);
   assert(self->handler_finish_semaphore_ != NULL);
@@ -765,7 +765,7 @@
 }
 
 // static
-bool ExceptionHandler::WriteMinidump(const wstring &dump_path,
+bool ExceptionHandler::WriteMinidump(const wstring& dump_path,
                                      MinidumpCallback callback,
                                      void* callback_context,
                                      MINIDUMP_TYPE dump_type) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/handler/exception_handler.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/handler/exception_handler.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/handler/exception_handler.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/handler/exception_handler.h	2021-12-09 12:01:26.000000000 +0000
@@ -218,7 +218,7 @@
 
   // Get and set the minidump path.
   wstring dump_path() const { return dump_path_; }
-  void set_dump_path(const wstring &dump_path) {
+  void set_dump_path(const wstring& dump_path) {
     dump_path_ = dump_path;
     dump_path_c_ = dump_path_.c_str();
     UpdateNextID();  // Necessary to put dump_path_ in next_minidump_path_.
@@ -237,7 +237,7 @@
 
   // Convenience form of WriteMinidump which does not require an
   // ExceptionHandler instance.
-  static bool WriteMinidump(const wstring &dump_path,
+  static bool WriteMinidump(const wstring& dump_path,
                             MinidumpCallback callback, void* callback_context,
                             MINIDUMP_TYPE dump_type = MiniDumpNormal);
 
@@ -513,8 +513,8 @@
   static volatile LONG instance_count_;
 
   // disallow copy ctor and operator=
-  explicit ExceptionHandler(const ExceptionHandler &);
-  void operator=(const ExceptionHandler &);
+  explicit ExceptionHandler(const ExceptionHandler&);
+  void operator=(const ExceptionHandler&);
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/sender/crash_report_sender.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/sender/crash_report_sender.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/sender/crash_report_sender.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/sender/crash_report_sender.cc	2021-12-09 12:01:26.000000000 +0000
@@ -45,12 +45,12 @@
 
 static const char kCheckpointSignature[] = "GBP1\n";
 
-CrashReportSender::CrashReportSender(const wstring &checkpoint_file)
+CrashReportSender::CrashReportSender(const wstring& checkpoint_file)
     : checkpoint_file_(checkpoint_file),
       max_reports_per_day_(-1),
       last_sent_date_(-1),
       reports_sent_(0) {
-  FILE *fd;
+  FILE* fd;
   if (OpenCheckpointFile(L"r", &fd) == 0) {
     ReadCheckpoint(fd);
     fclose(fd);
@@ -58,8 +58,8 @@
 }
 
 ReportResult CrashReportSender::SendCrashReport(
-    const wstring &url, const map<wstring, wstring> &parameters,
-    const map<wstring, wstring> &files, wstring *report_code) {
+    const wstring& url, const map<wstring, wstring>& parameters,
+    const map<wstring, wstring>& files, wstring* report_code) {
   int today = GetCurrentDate();
   if (today == last_sent_date_ &&
       max_reports_per_day_ != -1 &&
@@ -68,7 +68,7 @@
   }
 
   int http_response = 0;
-  bool result = HTTPUpload::SendRequest(
+  bool result = HTTPUpload::SendMultipartPostRequest(
     url, parameters, files, NULL, report_code,
     &http_response);
 
@@ -82,7 +82,7 @@
   }
 }
 
-void CrashReportSender::ReadCheckpoint(FILE *fd) {
+void CrashReportSender::ReadCheckpoint(FILE* fd) {
   char buf[128];
   if (!fgets(buf, sizeof(buf), fd) ||
       strcmp(buf, kCheckpointSignature) != 0) {
@@ -108,7 +108,7 @@
   ++reports_sent_;
 
   // Update the checkpoint file
-  FILE *fd;
+  FILE* fd;
   if (OpenCheckpointFile(L"w", &fd) == 0) {
     fputs(kCheckpointSignature, fd);
     fprintf(fd, "%d\n", last_sent_date_);
@@ -124,7 +124,7 @@
       system_time.wDay;
 }
 
-int CrashReportSender::OpenCheckpointFile(const wchar_t *mode, FILE **fd) {
+int CrashReportSender::OpenCheckpointFile(const wchar_t* mode, FILE** fd) {
   if (checkpoint_file_.empty()) {
     return ENOENT;
   }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/sender/crash_report_sender.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/sender/crash_report_sender.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/sender/crash_report_sender.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/sender/crash_report_sender.h	2021-12-09 12:01:26.000000000 +0000
@@ -65,7 +65,7 @@
   // If checkpoint_file is non-empty, breakpad will persist crash report
   // state to this file.  A checkpoint file is required for
   // set_max_reports_per_day() to function properly.
-  explicit CrashReportSender(const wstring &checkpoint_file);
+  explicit CrashReportSender(const wstring& checkpoint_file);
   ~CrashReportSender() {}
 
   // Sets the maximum number of crash reports that will be sent in a 24-hour
@@ -87,14 +87,14 @@
   // the return value is RESULT_SUCCEEDED), a code uniquely identifying the
   // report will be returned in report_code.
   // (Otherwise, report_code will be unchanged.)
-  ReportResult SendCrashReport(const wstring &url,
-                               const map<wstring, wstring> &parameters,
-                               const map<wstring, wstring> &files,
-                               wstring *report_code);
+  ReportResult SendCrashReport(const wstring& url,
+                               const map<wstring, wstring>& parameters,
+                               const map<wstring, wstring>& files,
+                               wstring* report_code);
 
  private:
   // Reads persistent state from a checkpoint file.
-  void ReadCheckpoint(FILE *fd);
+  void ReadCheckpoint(FILE* fd);
 
   // Called when a new report has been sent, to update the checkpoint state.
   void ReportSent(int today);
@@ -104,7 +104,7 @@
 
   // Opens the checkpoint file with the specified mode.
   // Returns zero on success, or an error code on failure.
-  int OpenCheckpointFile(const wchar_t *mode, FILE **fd);
+  int OpenCheckpointFile(const wchar_t* mode, FILE** fd);
 
   wstring checkpoint_file_;
   int max_reports_per_day_;
@@ -114,8 +114,8 @@
   int reports_sent_;
 
   // Disallow copy constructor and operator=
-  explicit CrashReportSender(const CrashReportSender &);
-  void operator=(const CrashReportSender &);
+  explicit CrashReportSender(const CrashReportSender&);
+  void operator=(const CrashReportSender&);
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/dump_analysis.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/dump_analysis.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/dump_analysis.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/dump_analysis.cc	2021-12-09 12:01:26.000000000 +0000
@@ -127,8 +127,8 @@
   return ret ? memory_list_size : 0;
 }
 
-bool DumpAnalysis::HasMemoryImpl(const void *addr_in, size_t structuresize,
-                                 void **structure) const {
+bool DumpAnalysis::HasMemoryImpl(const void* addr_in, size_t structuresize,
+                                 void** structure) const {
   uintptr_t address = reinterpret_cast<uintptr_t>(addr_in);
   MINIDUMP_MEMORY_LIST* memory_list = NULL;
   size_t memory_list_size = GetStream(MemoryListStream, &memory_list);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_death_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_death_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_death_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_death_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -52,7 +52,7 @@
 const char kFailureIndicator[] = "failure";
 
 // Utility function to test for a path's existence.
-BOOL DoesPathExist(const TCHAR *path_name);
+BOOL DoesPathExist(const TCHAR* path_name);
 
 enum OutOfProcGuarantee {
   OUT_OF_PROC_GUARANTEED,
@@ -92,7 +92,7 @@
   CreateDirectory(temp_path_, NULL);
 }
 
-BOOL DoesPathExist(const TCHAR *path_name) {
+BOOL DoesPathExist(const TCHAR* path_name) {
   DWORD flags = GetFileAttributes(path_name);
   if (flags == INVALID_FILE_ATTRIBUTES) {
     return FALSE;
@@ -135,15 +135,15 @@
   // Disable GTest SEH handler
   testing::DisableExceptionHandlerInScope disable_exception_handler;
 
-  int *i = NULL;
+  int* i = NULL;
   ASSERT_DEATH((*i)++, kSuccessIndicator);
 }
 
 static bool gDumpCallbackCalled = false;
 
-void clientDumpCallback(void *dump_context,
-                        const google_breakpad::ClientInfo *client_info,
-                        const std::wstring *dump_path) {
+void clientDumpCallback(void* dump_context,
+                        const google_breakpad::ClientInfo* client_info,
+                        const std::wstring* dump_path) {
   gDumpCallbackCalled = true;
 }
 
@@ -152,7 +152,7 @@
   scoped_ptr<google_breakpad::ExceptionHandler> exc;
 
   if (out_of_proc_guarantee == OUT_OF_PROC_GUARANTEED) {
-    google_breakpad::CrashGenerationClient *client =
+    google_breakpad::CrashGenerationClient* client =
         new google_breakpad::CrashGenerationClient(kPipeName,
                                                    MiniDumpNormal,
                                                    NULL);  // custom_info
@@ -184,7 +184,7 @@
   // if it's not true we'll still get an error rather than the crash
   // being expected.
   ASSERT_TRUE(exc->IsOutOfProcess());
-  int *i = NULL;
+  int* i = NULL;
   printf("%d\n", (*i)++);
 }
 
@@ -283,7 +283,7 @@
   EXPECT_EXIT(DoCrashPureVirtualCall(), ::testing::ExitedWithCode(0), "");
 }
 
-wstring find_minidump_in_directory(const wstring &directory) {
+wstring find_minidump_in_directory(const wstring& directory) {
   wstring search_path = directory + L"\\*";
   WIN32_FIND_DATA find_data;
   HANDLE find_handle = FindFirstFileW(search_path.c_str(), &find_data);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -49,7 +49,7 @@
 const char kCallbackReturnsTrue[] = "callback_returns_true";
 const char kCallbackReturnsFalse[] = "callback_returns_false";
 
-bool DoesPathExist(const wchar_t *path_name) {
+bool DoesPathExist(const wchar_t* path_name) {
   DWORD flags = GetFileAttributes(path_name);
   if (flags == INVALID_FILE_ATTRIBUTES) {
     return false;
@@ -128,12 +128,12 @@
 }
 
 
-void DoCrash(const char *message) {
+void DoCrash(const char* message) {
   if (message) {
     fprintf(stderr, "%s", message);
     fflush(stderr);
   }
-  int *i = NULL;
+  int* i = NULL;
   (*i)++;
 
   ASSERT_TRUE(false);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/client/windows/unittests/exception_handler_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -87,13 +87,13 @@
   void DoCrashPureVirtualCall();
 
   // Utility function to test for a path's existence.
-  static BOOL DoesPathExist(const TCHAR *path_name);
+  static BOOL DoesPathExist(const TCHAR* path_name);
 
   // Client callback.
   static void ClientDumpCallback(
-      void *dump_context,
-      const google_breakpad::ClientInfo *client_info,
-      const std::wstring *dump_path);
+      void* dump_context,
+      const google_breakpad::ClientInfo* client_info,
+      const std::wstring* dump_path);
 
   static bool DumpCallback(const wchar_t* dump_path,
                            const wchar_t* minidump_id,
@@ -141,7 +141,7 @@
   }
 }
 
-BOOL ExceptionHandlerTest::DoesPathExist(const TCHAR *path_name) {
+BOOL ExceptionHandlerTest::DoesPathExist(const TCHAR* path_name) {
   DWORD flags = GetFileAttributes(path_name);
   if (flags == INVALID_FILE_ATTRIBUTES) {
     return FALSE;
@@ -151,9 +151,9 @@
 
 // static
 void ExceptionHandlerTest::ClientDumpCallback(
-    void *dump_context,
-    const google_breakpad::ClientInfo *client_info,
-    const wstring *dump_path) {
+    void* dump_context,
+    const google_breakpad::ClientInfo* client_info,
+    const wstring* dump_path) {
   dump_file = *dump_path;
   // Create the full dump file name from the dump path.
   full_dump_file = dump_file.substr(0, dump_file.length() - 4) + L"-full.dmp";
@@ -174,7 +174,7 @@
 }
 
 void ExceptionHandlerTest::DoCrashInvalidParameter() {
-  google_breakpad::ExceptionHandler *exc =
+  google_breakpad::ExceptionHandler* exc =
       new google_breakpad::ExceptionHandler(
           temp_path_, NULL, NULL, NULL,
           google_breakpad::ExceptionHandler::HANDLER_INVALID_PARAMETER,
@@ -206,7 +206,7 @@
 };
 
 void ExceptionHandlerTest::DoCrashPureVirtualCall() {
-  google_breakpad::ExceptionHandler *exc =
+  google_breakpad::ExceptionHandler* exc =
       new google_breakpad::ExceptionHandler(
           temp_path_, NULL, NULL, NULL,
           google_breakpad::ExceptionHandler::HANDLER_PURECALL,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/breakpad_getcontext_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/breakpad_getcontext_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/breakpad_getcontext_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/breakpad_getcontext_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#if defined(__x86_64__)
-#include <asm/sigcontext.h>
-#endif
-
-#include <sys/ucontext.h>
-
-#include "breakpad_googletest_includes.h"
-#include "common/android/ucontext_constants.h"
-
-template <int left, int right>
-struct CompileAssertEquals {
-  // a compilation error here indicates left and right are not equal.
-  char left_too_large[right - left];
-  // a compilation error here indicates left and right are not equal.
-  char right_too_large[left - right];
-};
-
-#define COMPILE_ASSERT_EQ(left, right, tag) \
-  CompileAssertEquals<left, right> tag;
-
-TEST(AndroidUContext, GRegsOffset) {
-#if defined(__arm__)
-  // There is no gregs[] array on ARM, so compare to the offset of
-  // first register fields, since they're stored in order.
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.arm_r0));
-#elif defined(__aarch64__)
-  // There is no gregs[] array on ARM, so compare to the offset of
-  // first register fields, since they're stored in order.
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.regs[0]));
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_SP_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.sp));
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_PC_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.pc));
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_PSTATE_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.pstate));
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_EXTENSION_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.__reserved));
-#elif defined(__i386__)
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.gregs));
-#define CHECK_REG(x) \
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_##x##_OFFSET),         \
-            offsetof(ucontext_t,uc_mcontext.gregs[REG_##x]))
-  CHECK_REG(GS);
-  CHECK_REG(FS);
-  CHECK_REG(ES);
-  CHECK_REG(DS);
-  CHECK_REG(EDI);
-  CHECK_REG(ESI);
-  CHECK_REG(EBP);
-  CHECK_REG(ESP);
-  CHECK_REG(EBX);
-  CHECK_REG(EDX);
-  CHECK_REG(ECX);
-  CHECK_REG(EAX);
-  CHECK_REG(TRAPNO);
-  CHECK_REG(ERR);
-  CHECK_REG(EIP);
-  CHECK_REG(CS);
-  CHECK_REG(EFL);
-  CHECK_REG(UESP);
-  CHECK_REG(SS);
-
-  ASSERT_EQ(static_cast<size_t>(UCONTEXT_FPREGS_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.fpregs));
-
-  ASSERT_EQ(static_cast<size_t>(UCONTEXT_FPREGS_MEM_OFFSET),
-            offsetof(ucontext_t,__fpregs_mem));
-#elif defined(__mips__)
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.gregs));
-
-  // PC for mips is not part of gregs.
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_PC_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.pc));
-
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_FPREGS_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.fpregs));
-
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_FPC_CSR),
-            offsetof(ucontext_t,uc_mcontext.fpc_csr));
-#elif defined(__x86_64__)
-
-  COMPILE_ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
-                    offsetof(ucontext_t,uc_mcontext.gregs),
-                    mcontext_gregs_offset);
-#define CHECK_REG(x) \
-  COMPILE_ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_##x), \
-                    offsetof(ucontext_t,uc_mcontext.gregs[REG_##x]), reg_##x)
-  CHECK_REG(R8);
-  CHECK_REG(R9);
-  CHECK_REG(R10);
-  CHECK_REG(R11);
-  CHECK_REG(R12);
-  CHECK_REG(R13);
-  CHECK_REG(R14);
-  CHECK_REG(R15);
-  CHECK_REG(RDI);
-  CHECK_REG(RSI);
-  CHECK_REG(RBP);
-  CHECK_REG(RBX);
-  CHECK_REG(RDX);
-  CHECK_REG(RAX);
-  CHECK_REG(RCX);
-  CHECK_REG(RSP);
-  CHECK_REG(RIP);
-
-  // sigcontext is an analog to mcontext_t. The layout should be the same.
-  COMPILE_ASSERT_EQ(offsetof(mcontext_t,fpregs),
-                    offsetof(sigcontext,fpstate), sigcontext_fpstate);
-  // Check that _fpstate from asm/sigcontext.h is essentially the same
-  // as _libc_fpstate.
-  COMPILE_ASSERT_EQ(sizeof(_libc_fpstate), sizeof(_fpstate),
-                    sigcontext_fpstate_size);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,cwd),offsetof(_fpstate,cwd),
-                    sigcontext_fpstate_cwd);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,swd),offsetof(_fpstate,swd),
-                    sigcontext_fpstate_swd);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,ftw),offsetof(_fpstate,twd),
-                    sigcontext_fpstate_twd);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,fop),offsetof(_fpstate,fop),
-                    sigcontext_fpstate_fop);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,rip),offsetof(_fpstate,rip),
-                    sigcontext_fpstate_rip);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,rdp),offsetof(_fpstate,rdp),
-                    sigcontext_fpstate_rdp);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,mxcsr),offsetof(_fpstate,mxcsr),
-                    sigcontext_fpstate_mxcsr);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,mxcr_mask),
-                    offsetof(_fpstate,mxcsr_mask),
-                    sigcontext_fpstate_mxcsr_mask);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,_st), offsetof(_fpstate,st_space),
-                    sigcontext_fpstate_stspace);
-  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,_xmm), offsetof(_fpstate,xmm_space),
-                    sigcontext_fpstate_xmm_space);
-
-  COMPILE_ASSERT_EQ(MCONTEXT_FPREGS_PTR,
-                    offsetof(ucontext_t,uc_mcontext.fpregs),
-                    mcontext_fpregs_ptr);
-  COMPILE_ASSERT_EQ(MCONTEXT_FPREGS_MEM, offsetof(ucontext_t,__fpregs_mem),
-                    mcontext_fpregs_mem);
-  COMPILE_ASSERT_EQ(FPREGS_OFFSET_MXCSR, offsetof(_libc_fpstate,mxcsr),
-                    fpregs_offset_mxcsr);
-  COMPILE_ASSERT_EQ(UCONTEXT_SIGMASK_OFFSET, offsetof(ucontext_t, uc_sigmask),
-                    ucontext_sigmask);
-#else
-  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
-            offsetof(ucontext_t,uc_mcontext.gregs));
-#endif
-}
-
-TEST(AndroidUContext, SigmakOffset) {
-  ASSERT_EQ(static_cast<size_t>(UCONTEXT_SIGMASK_OFFSET),
-            offsetof(ucontext_t,uc_sigmask));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/elf.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/elf.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/elf.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/elf.h	2021-12-09 12:01:26.000000000 +0000
@@ -109,17 +109,6 @@
 } Elf64_Dyn;
 
 
-// __WORDSIZE is GLibc-specific and used by Google Breakpad on Linux.
-#ifndef __WORDSIZE
-#if defined(__i386__) ||  defined(__ARM_EABI__) || defined(__mips__)
-#define __WORDSIZE 32
-#elif defined(__x86_64__) || defined(__aarch64__)
-#define __WORDSIZE 64
-#else
-#error "Unsupported Android CPU ABI"
-#endif
-#endif
-
 // The Android headers don't always define this constant.
 #ifndef EM_X86_64
 #define EM_X86_64  62
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/sys/signal.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/sys/signal.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/sys/signal.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/sys/signal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_SIGNAL_H
-#define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_SIGNAL_H
-
-#include <signal.h>
-
-#endif  // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_SIGNAL_H
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/ucontext.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/ucontext.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/ucontext.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/include/ucontext.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_UCONTEXT_H
-#define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_UCONTEXT_H
-
-#include <sys/cdefs.h>
-
-#ifdef __BIONIC_UCONTEXT_H
-#include <ucontext.h>
-#else
-
-#include <sys/ucontext.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif  // __cplusplus
-
-// Provided by src/android/common/breakpad_getcontext.S
-int breakpad_getcontext(ucontext_t* ucp);
-
-#define getcontext(x)   breakpad_getcontext(x)
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif  // __cplusplus
-
-#endif  // __BIONIC_UCONTEXT_H
-
-#endif  // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_UCONTEXT_H
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/testing/pthread_fixes.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/testing/pthread_fixes.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/testing/pthread_fixes.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/testing/pthread_fixes.h	2021-12-09 12:01:26.000000000 +0000
@@ -80,7 +80,7 @@
   return 0;
 }
 
-int pthread_barrier_destroy(pthread_barrier_t *barrier) {
+int pthread_barrier_destroy(pthread_barrier_t* barrier) {
   barrier->count = 0;
   pthread_cond_destroy(&barrier->cond);
   pthread_mutex_destroy(&barrier->mutex);
@@ -89,11 +89,6 @@
 
 #endif  // defined(PTHREAD_BARRIER_SERIAL_THREAD)
 
-int pthread_yield(void) {
-  sched_yield();
-  return 0;
-}
-
 }  // namespace
 
 #endif  // GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_PTHREAD_FIXES_H
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/ucontext_constants.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/ucontext_constants.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/ucontext_constants.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/android/ucontext_constants.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header can be included either from a C, C++ or Assembly file.
-// Its purpose is to contain constants that must match the offsets of
-// various fields in ucontext_t.
-//
-// They should match the definitions from
-// src/common/android/include/sys/ucontext.h
-//
-// Used by src/common/android/breakpad_getcontext.S
-// Tested by src/common/android/testing/breakpad_getcontext_unittest.cc
-
-#ifndef GOOGLEBREAKPAD_COMMON_ANDROID_UCONTEXT_CONSTANTS_H
-#define GOOGLEBREAKPAD_COMMON_ANDROID_UCONTEXT_CONSTANTS_H
-
-#if defined(__arm__)
-
-#define  MCONTEXT_GREGS_OFFSET     32
-#define  UCONTEXT_SIGMASK_OFFSET   104
-
-#elif defined(__aarch64__)
-
-#define  UCONTEXT_SIGMASK_OFFSET     40
-
-#define  MCONTEXT_GREGS_OFFSET       184
-#define  MCONTEXT_SP_OFFSET          432
-#define  MCONTEXT_PC_OFFSET          440
-#define  MCONTEXT_PSTATE_OFFSET      448
-#define  MCONTEXT_EXTENSION_OFFSET   464
-
-#define  FPSIMD_MAGIC                0x46508001
-
-#define  FPSIMD_CONTEXT_MAGIC_OFFSET 0
-#define  FPSIMD_CONTEXT_SIZE_OFFSET  4
-#define  FPSIMD_CONTEXT_FPSR_OFFSET  8
-#define  FPSIMD_CONTEXT_FPCR_OFFSET  12
-#define  FPSIMD_CONTEXT_VREGS_OFFSET 16
-#define  FPSIMD_CONTEXT_SIZE         528
-
-#define  REGISTER_SIZE               8
-#define  SIMD_REGISTER_SIZE          16
-
-#elif defined(__i386__)
-
-#define  MCONTEXT_GREGS_OFFSET     20
-#define  MCONTEXT_GS_OFFSET        (MCONTEXT_GREGS_OFFSET + 0*4)
-#define  MCONTEXT_FS_OFFSET        (MCONTEXT_GREGS_OFFSET + 1*4)
-#define  MCONTEXT_ES_OFFSET        (MCONTEXT_GREGS_OFFSET + 2*4)
-#define  MCONTEXT_DS_OFFSET        (MCONTEXT_GREGS_OFFSET + 3*4)
-#define  MCONTEXT_EDI_OFFSET       (MCONTEXT_GREGS_OFFSET + 4*4)
-#define  MCONTEXT_ESI_OFFSET       (MCONTEXT_GREGS_OFFSET + 5*4)
-#define  MCONTEXT_EBP_OFFSET       (MCONTEXT_GREGS_OFFSET + 6*4)
-#define  MCONTEXT_ESP_OFFSET       (MCONTEXT_GREGS_OFFSET + 7*4)
-#define  MCONTEXT_EBX_OFFSET       (MCONTEXT_GREGS_OFFSET + 8*4)
-#define  MCONTEXT_EDX_OFFSET       (MCONTEXT_GREGS_OFFSET + 9*4)
-#define  MCONTEXT_ECX_OFFSET       (MCONTEXT_GREGS_OFFSET + 10*4)
-#define  MCONTEXT_EAX_OFFSET       (MCONTEXT_GREGS_OFFSET + 11*4)
-#define  MCONTEXT_TRAPNO_OFFSET    (MCONTEXT_GREGS_OFFSET + 12*4)
-#define  MCONTEXT_ERR_OFFSET       (MCONTEXT_GREGS_OFFSET + 13*4)
-#define  MCONTEXT_EIP_OFFSET       (MCONTEXT_GREGS_OFFSET + 14*4)
-#define  MCONTEXT_CS_OFFSET        (MCONTEXT_GREGS_OFFSET + 15*4)
-#define  MCONTEXT_EFL_OFFSET       (MCONTEXT_GREGS_OFFSET + 16*4)
-#define  MCONTEXT_UESP_OFFSET      (MCONTEXT_GREGS_OFFSET + 17*4)
-#define  MCONTEXT_SS_OFFSET        (MCONTEXT_GREGS_OFFSET + 18*4)
-
-#define  UCONTEXT_SIGMASK_OFFSET   108
-
-#define  UCONTEXT_FPREGS_OFFSET       96
-#define  UCONTEXT_FPREGS_MEM_OFFSET   116
-
-#elif defined(__mips__)
-
-#if _MIPS_SIM == _ABIO32
-#define  MCONTEXT_PC_OFFSET        32
-#define  MCONTEXT_GREGS_OFFSET     40
-#define  MCONTEXT_FPREGS_OFFSET    296
-#define  MCONTEXT_FPC_CSR          556
-#define  UCONTEXT_SIGMASK_OFFSET   616
-#else
-#define  MCONTEXT_GREGS_OFFSET     40
-#define  MCONTEXT_FPREGS_OFFSET    296
-#define  MCONTEXT_PC_OFFSET        616
-#define  MCONTEXT_FPC_CSR          624
-#define  UCONTEXT_SIGMASK_OFFSET   640
-#endif
-
-#elif defined(__x86_64__)
-
-#define MCONTEXT_GREGS_OFFSET     40
-#define UCONTEXT_SIGMASK_OFFSET   296
-
-#define MCONTEXT_GREGS_R8    40
-#define MCONTEXT_GREGS_R9    48
-#define MCONTEXT_GREGS_R10   56
-#define MCONTEXT_GREGS_R11   64
-#define MCONTEXT_GREGS_R12   72
-#define MCONTEXT_GREGS_R13   80
-#define MCONTEXT_GREGS_R14   88
-#define MCONTEXT_GREGS_R15   96
-#define MCONTEXT_GREGS_RDI   104
-#define MCONTEXT_GREGS_RSI   112
-#define MCONTEXT_GREGS_RBP   120
-#define MCONTEXT_GREGS_RBX   128
-#define MCONTEXT_GREGS_RDX   136
-#define MCONTEXT_GREGS_RAX   144
-#define MCONTEXT_GREGS_RCX   152
-#define MCONTEXT_GREGS_RSP   160
-#define MCONTEXT_GREGS_RIP   168
-#define MCONTEXT_FPREGS_PTR  224
-#define MCONTEXT_FPREGS_MEM  304
-#define FPREGS_OFFSET_MXCSR  24
-
-#else
-#error "This header has not been ported for your CPU"
-#endif
-
-#endif  // GOOGLEBREAKPAD_COMMON_ANDROID_UCONTEXT_CONSTANTS_H
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/byte_cursor.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/byte_cursor.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/byte_cursor.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/byte_cursor.h	2021-12-09 12:01:26.000000000 +0000
@@ -52,16 +52,16 @@
 // A buffer holding a series of bytes.
 struct ByteBuffer {
   ByteBuffer() : start(0), end(0) { }
-  ByteBuffer(const uint8_t *set_start, size_t set_size)
+  ByteBuffer(const uint8_t* set_start, size_t set_size)
       : start(set_start), end(set_start + set_size) { }
   ~ByteBuffer() { };
 
   // Equality operators. Useful in unit tests, and when we're using
   // ByteBuffers to refer to regions of a larger buffer.
-  bool operator==(const ByteBuffer &that) const {
+  bool operator==(const ByteBuffer& that) const {
     return start == that.start && end == that.end;
   }
-  bool operator!=(const ByteBuffer &that) const {
+  bool operator!=(const ByteBuffer& that) const {
     return start != that.start || end != that.end;
   }
 
@@ -71,7 +71,8 @@
     return end - start;
   }
 
-  const uint8_t *start, *end;
+  const uint8_t* start;
+  const uint8_t* end;
 };
 
 // A cursor pointing into a ByteBuffer that can parse numbers of various
@@ -82,8 +83,8 @@
  public:
   // Create a cursor reading bytes from the start of BUFFER. By default, the
   // cursor reads multi-byte values in little-endian form.
-  ByteCursor(const ByteBuffer *buffer, bool big_endian = false)
-      : buffer_(buffer), here_(buffer->start), 
+  ByteCursor(const ByteBuffer* buffer, bool big_endian = false)
+      : buffer_(buffer), here_(buffer->start),
         big_endian_(big_endian), complete_(true) { }
 
   // Accessor and setter for this cursor's endianness flag.
@@ -92,8 +93,8 @@
 
   // Accessor and setter for this cursor's current position. The setter
   // returns a reference to this cursor.
-  const uint8_t *here() const { return here_; }
-  ByteCursor &set_here(const uint8_t *here) {
+  const uint8_t* here() const { return here_; }
+  ByteCursor& set_here(const uint8_t* here) {
     assert(buffer_->start <= here && here <= buffer_->end);
     here_ = here;
     return *this;
@@ -116,7 +117,7 @@
   // this cursor's complete_ flag, and store a dummy value in *RESULT.
   // Return a reference to this cursor.
   template<typename T>
-  ByteCursor &Read(size_t size, bool is_signed, T *result) {
+  ByteCursor& Read(size_t size, bool is_signed, T* result) {
     if (CheckAvailable(size)) {
       T v = 0;
       if (big_endian_) {
@@ -145,7 +146,7 @@
   // read off the end of our buffer, clear this cursor's complete_ flag.
   // Return a reference to this cursor.
   template<typename T>
-  ByteCursor &operator>>(T &result) {
+  ByteCursor& operator>>(T& result) {
     bool T_is_signed = (T)-1 < 0;
     return Read(sizeof(T), T_is_signed, &result); 
   }
@@ -154,7 +155,7 @@
   // cursor to the end of them. If we read off the end of our buffer,
   // clear this cursor's complete_ flag, and set *POINTER to NULL.
   // Return a reference to this cursor.
-  ByteCursor &Read(uint8_t *buffer, size_t size) {
+  ByteCursor& Read(uint8_t* buffer, size_t size) {
     if (CheckAvailable(size)) {
       memcpy(buffer, here_, size);
       here_ += size;
@@ -166,11 +167,11 @@
   // byte buffer does not contain a terminating zero, clear this cursor's
   // complete_ flag, and set STR to the empty string. Return a reference to
   // this cursor.
-  ByteCursor &CString(string *str) {
-    const uint8_t *end
-      = static_cast<const uint8_t *>(memchr(here_, '\0', Available()));
+  ByteCursor& CString(string* str) {
+    const uint8_t* end
+      = static_cast<const uint8_t*>(memchr(here_, '\0', Available()));
     if (end) {
-      str->assign(reinterpret_cast<const char *>(here_), end - here_);
+      str->assign(reinterpret_cast<const char*>(here_), end - here_);
       here_ = end + 1;
     } else {
       str->clear();
@@ -193,14 +194,14 @@
   //   
   // - Otherwise, set *STR to a copy of those LIMIT bytes, and advance the
   //   cursor by LIMIT bytes.
-  ByteCursor &CString(string *str, size_t limit) {
+  ByteCursor& CString(string* str, size_t limit) {
     if (CheckAvailable(limit)) {
-      const uint8_t *end
-        = static_cast<const uint8_t *>(memchr(here_, '\0', limit));
+      const uint8_t* end
+        = static_cast<const uint8_t*>(memchr(here_, '\0', limit));
       if (end)
-        str->assign(reinterpret_cast<const char *>(here_), end - here_);
+        str->assign(reinterpret_cast<const char*>(here_), end - here_);
       else
-        str->assign(reinterpret_cast<const char *>(here_), limit);
+        str->assign(reinterpret_cast<const char*>(here_), limit);
       here_ += limit;
     } else {
       str->clear();
@@ -213,7 +214,7 @@
   // cursor. If we read off the end of our buffer, clear this cursor's
   // complete_ flag, and set *POINTER to NULL. Return a reference to this
   // cursor.
-  ByteCursor &PointTo(const uint8_t **pointer, size_t size = 0) {
+  ByteCursor& PointTo(const uint8_t** pointer, size_t size = 0) {
     if (CheckAvailable(size)) {
       *pointer = here_;
       here_ += size;
@@ -226,7 +227,7 @@
   // Skip SIZE bytes at the cursor. If doing so would advance us off
   // the end of our buffer, clear this cursor's complete_ flag, and
   // set *POINTER to NULL. Return a reference to this cursor.
-  ByteCursor &Skip(size_t size) {
+  ByteCursor& Skip(size_t size) {
     if (CheckAvailable(size))
       here_ += size;
     return *this;
@@ -247,10 +248,10 @@
   }
 
   // The buffer we're reading bytes from.
-  const ByteBuffer *buffer_;
+  const ByteBuffer* buffer_;
 
   // The next byte within buffer_ that we'll read.
-  const uint8_t *here_;
+  const uint8_t* here_;
 
   // True if we should read numbers in big-endian form; false if we
   // should read in little-endian form.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/byte_cursor_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/byte_cursor_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/byte_cursor_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/byte_cursor_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -593,7 +593,7 @@
   int32_t a;
   // For some reason, G++ 4.4.1 complains:
   //   warning: array subscript is above array bounds
-  // in ByteCursor::Read(size_t, bool, T *) as it inlines this call, but
+  // in ByteCursor::Read(size_t, bool, T*) as it inlines this call, but
   // I'm not able to see how such a reference would occur.
   EXPECT_TRUE(cursor >> a);
   EXPECT_EQ(-380377902, a);
@@ -627,7 +627,7 @@
   uint32_t a;
   // For some reason, G++ 4.4.1 complains:
   //   warning: array subscript is above array bounds
-  // in ByteCursor::Read(size_t, bool, T *) as it inlines this call, but
+  // in ByteCursor::Read(size_t, bool, T*) as it inlines this call, but
   // I'm not able to see how such a reference would occur.
   EXPECT_TRUE(cursor >> a);
   EXPECT_EQ(0xe953e4d2, a);
@@ -718,10 +718,10 @@
   ByteBuffer buffer(data, sizeof(data));
   ByteCursor cursor(&buffer);
 
-  const uint8_t *received1;
-  const uint8_t *received2;
-  const uint8_t *received3;
-  const uint8_t *received4;
+  const uint8_t* received1;
+  const uint8_t* received2;
+  const uint8_t* received3;
+  const uint8_t* received4;
   EXPECT_FALSE(cursor
                .PointTo(&received1, 3)
                .PointTo(&received2, 3)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.c thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.c
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.c	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,554 +0,0 @@
-/*
- * Copyright © 1991-2015 Unicode, Inc. All rights reserved.
- * Distributed under the Terms of Use in 
- * http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of the Unicode data files and any associated documentation
- * (the "Data Files") or Unicode software and any associated documentation
- * (the "Software") to deal in the Data Files or Software
- * without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, and/or sell copies of
- * the Data Files or Software, and to permit persons to whom the Data Files
- * or Software are furnished to do so, provided that
- * (a) this copyright and permission notice appear with all copies 
- * of the Data Files or Software,
- * (b) this copyright and permission notice appear in associated 
- * documentation, and
- * (c) there is clear notice in each modified Data File or in the Software
- * as well as in the documentation associated with the Data File(s) or
- * Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
- * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
- * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in these Data Files or Software without prior
- * written authorization of the copyright holder.
- */
-
-/* ---------------------------------------------------------------------
-
-Conversions between UTF32, UTF-16, and UTF-8. Source code file.
-Author: Mark E. Davis, 1994.
-Rev History: Rick McGowan, fixes & updates May 2001.
-Sept 2001: fixed const & error conditions per
-mods suggested by S. Parent & A. Lillich.
-June 2002: Tim Dodd added detection and handling of incomplete
-source sequences, enhanced error detection, added casts
-to eliminate compiler warnings.
-July 2003: slight mods to back out aggressive FFFE detection.
-Jan 2004: updated switches in from-UTF8 conversions.
-Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
-
-See the header file "ConvertUTF.h" for complete documentation.
-
------------------------------------------------------------------------- */
-
-
-#include "convert_UTF.h"
-#ifdef CVTUTF_DEBUG
-#include <stdio.h>
-#endif
-
-static const int halfShift  = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-#define UNI_SUR_HIGH_START  (UTF32)0xD800
-#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
-#define UNI_SUR_LOW_START   (UTF32)0xDC00
-#define UNI_SUR_LOW_END     (UTF32)0xDFFF
-
-#ifndef false
-#define false	   0
-#endif
-#ifndef true
-#define true	    1
-#endif
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF32toUTF16 (const UTF32** sourceStart, const UTF32* sourceEnd,
-                                      UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
-  ConversionResult result = conversionOK;
-  const UTF32* source = *sourceStart;
-  UTF16* target = *targetStart;
-  while (source < sourceEnd) {
-    UTF32 ch;
-    if (target >= targetEnd) {
-	    result = targetExhausted; break;
-    }
-    ch = *source++;
-    if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
-	    /* UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values */
-	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-        if (flags == strictConversion) {
-          --source; /* return to the illegal value itself */
-          result = sourceIllegal;
-          break;
-        } else {
-          *target++ = UNI_REPLACEMENT_CHAR;
-        }
-	    } else {
-        *target++ = (UTF16)ch; /* normal case */
-	    }
-    } else if (ch > UNI_MAX_LEGAL_UTF32) {
-	    if (flags == strictConversion) {
-        result = sourceIllegal;
-	    } else {
-        *target++ = UNI_REPLACEMENT_CHAR;
-	    }
-    } else {
-	    /* target is a character in range 0xFFFF - 0x10FFFF. */
-	    if (target + 1 >= targetEnd) {
-        --source; /* Back up source pointer! */
-        result = targetExhausted; break;
-	    }
-	    ch -= halfBase;
-	    *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
-	    *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
-    }
-  }
-*sourceStart = source;
-*targetStart = target;
-return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF16toUTF32 (const UTF16** sourceStart, const UTF16* sourceEnd,
-                                      UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
-  ConversionResult result = conversionOK;
-  const UTF16* source = *sourceStart;
-  UTF32* target = *targetStart;
-  UTF32 ch, ch2;
-  while (source < sourceEnd) {
-    const UTF16* oldSource = source; /*  In case we have to back up because of target overflow. */
-    ch = *source++;
-    /* If we have a surrogate pair, convert to UTF32 first. */
-    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
-	    /* If the 16 bits following the high surrogate are in the source buffer... */
-	    if (source < sourceEnd) {
-        ch2 = *source;
-        /* If it's a low surrogate, convert to UTF32. */
-        if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
-          ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
-          + (ch2 - UNI_SUR_LOW_START) + halfBase;
-          ++source;
-        } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
-          --source; /* return to the illegal value itself */
-          result = sourceIllegal;
-          break;
-        }
-	    } else { /* We don't have the 16 bits following the high surrogate. */
-        --source; /* return to the high surrogate */
-        result = sourceExhausted;
-        break;
-	    }
-    } else if (flags == strictConversion) {
-	    /* UTF-16 surrogate values are illegal in UTF-32 */
-	    if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
-        --source; /* return to the illegal value itself */
-        result = sourceIllegal;
-        break;
-	    }
-    }
-    if (target >= targetEnd) {
-	    source = oldSource; /* Back up source pointer! */
-	    result = targetExhausted; break;
-    }
-    *target++ = ch;
-  }
-  *sourceStart = source;
-  *targetStart = target;
-#ifdef CVTUTF_DEBUG
-  if (result == sourceIllegal) {
-    fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2);
-    fflush(stderr);
-  }
-#endif
-  return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
-  0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-/*
- * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow.  There are
- * as many entries in this table as there are UTF-8 sequence types.
- * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
- * for *legal* UTF-8 will be 4 or fewer bytes total.
- */
-static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-/* --------------------------------------------------------------------- */
-
-/* The interface converts a whole buffer to avoid function-call overhead.
-* Constants have been gathered. Loops & conditionals have been removed as
-* much as possible for efficiency, in favor of drop-through switches.
-* (See "Note A" at the bottom of the file for equivalent code.)
-* If your compiler supports it, the "isLegalUTF8" call can be turned
-* into an inline function.
-*/
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF16toUTF8 (const UTF16** sourceStart, const UTF16* sourceEnd,
-                                     UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
-  ConversionResult result = conversionOK;
-  const UTF16* source = *sourceStart;
-  UTF8* target = *targetStart;
-  while (source < sourceEnd) {
-    UTF32 ch;
-    unsigned short bytesToWrite = 0;
-    const UTF32 byteMask = 0xBF;
-    const UTF32 byteMark = 0x80;
-    const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
-    ch = *source++;
-    /* If we have a surrogate pair, convert to UTF32 first. */
-    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
-	    /* If the 16 bits following the high surrogate are in the source buffer... */
-	    if (source < sourceEnd) {
-        UTF32 ch2 = *source;
-        /* If it's a low surrogate, convert to UTF32. */
-        if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
-          ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
-          + (ch2 - UNI_SUR_LOW_START) + halfBase;
-          ++source;
-        } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
-          --source; /* return to the illegal value itself */
-          result = sourceIllegal;
-          break;
-        }
-	    } else { /* We don't have the 16 bits following the high surrogate. */
-        --source; /* return to the high surrogate */
-        result = sourceExhausted;
-        break;
-	    }
-    } else if (flags == strictConversion) {
-	    /* UTF-16 surrogate values are illegal in UTF-32 */
-	    if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
-        --source; /* return to the illegal value itself */
-        result = sourceIllegal;
-        break;
-	    }
-    }
-    /* Figure out how many bytes the result will require */
-    if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
-    } else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
-    } else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
-    } else if (ch < (UTF32)0x110000) {  bytesToWrite = 4;
-    } else {			    bytesToWrite = 3;
-      ch = UNI_REPLACEMENT_CHAR;
-    }
-
-    target += bytesToWrite;
-    if (target > targetEnd) {
-	    source = oldSource; /* Back up source pointer! */
-	    target -= bytesToWrite; result = targetExhausted; break;
-    }
-    switch (bytesToWrite) { /* note: everything falls through. */
-	    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 1: *--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);
-    }
-    target += bytesToWrite;
-  }
-*sourceStart = source;
-*targetStart = target;
-return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Utility routine to tell whether a sequence of bytes is legal UTF-8.
- * This must be called with the length pre-determined by the first byte.
- * If not calling this from ConvertUTF8to*, then the length can be set by:
- *  length = trailingBytesForUTF8[*source]+1;
- * and the sequence is illegal right away if there aren't that many bytes
- * available.
- * If presented with a length > 4, this returns false.  The Unicode
- * definition of UTF-8 goes up to 4-byte sequences.
- */
-
-static Boolean isLegalUTF8(const UTF8 *source, int length) {
-  UTF8 a;
-  const UTF8 *srcptr = source+length;
-  switch (length) {
-    default: return false;
-      /* Everything else falls through when "true"... */
-    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 2: if ((a = (*--srcptr)) > 0xBF) return false;
-
-      switch (*source) {
-        /* no fall-through in this inner switch */
-        case 0xE0: if (a < 0xA0) return false; break;
-        case 0xED: if (a > 0x9F) return false; break;
-        case 0xF0: if (a < 0x90) return false; break;
-        case 0xF4: if (a > 0x8F) return false; break;
-        default:   if (a < 0x80) return false;
-      }
-
-      case 1: if (*source >= 0x80 && *source < 0xC2) return false;
-  }
-  if (*source > 0xF4) return false;
-  return true;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Exported function to return whether a UTF-8 sequence is legal or not.
- * This is not used here; it's just exported.
- */
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
-  int length = trailingBytesForUTF8[*source]+1;
-  if (source+length > sourceEnd) {
-    return false;
-  }
-  return isLegalUTF8(source, length);
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF8toUTF16 (const UTF8** sourceStart, const UTF8* sourceEnd,
-                                     UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
-  ConversionResult result = conversionOK;
-  const UTF8* source = *sourceStart;
-  UTF16* target = *targetStart;
-  while (source < sourceEnd) {
-    UTF32 ch = 0;
-    unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
-    if (source + extraBytesToRead >= sourceEnd) {
-	    result = sourceExhausted; break;
-    }
-    /* Do this check whether lenient or strict */
-    if (! isLegalUTF8(source, extraBytesToRead+1)) {
-	    result = sourceIllegal;
-	    break;
-    }
-    /*
-     * The cases all fall through. See "Note A" below.
-     */
-    switch (extraBytesToRead) {
-	    case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-	    case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-	    case 3: ch += *source++; ch <<= 6;
-	    case 2: ch += *source++; ch <<= 6;
-	    case 1: ch += *source++; ch <<= 6;
-	    case 0: ch += *source++;
-    }
-    ch -= offsetsFromUTF8[extraBytesToRead];
-
-    if (target >= targetEnd) {
-	    source -= (extraBytesToRead+1); /* Back up source pointer! */
-	    result = targetExhausted; break;
-    }
-    if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
-	    /* UTF-16 surrogate values are illegal in UTF-32 */
-	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-        if (flags == strictConversion) {
-          source -= (extraBytesToRead+1); /* return to the illegal value itself */
-          result = sourceIllegal;
-          break;
-        } else {
-          *target++ = UNI_REPLACEMENT_CHAR;
-        }
-	    } else {
-        *target++ = (UTF16)ch; /* normal case */
-	    }
-    } else if (ch > UNI_MAX_UTF16) {
-	    if (flags == strictConversion) {
-        result = sourceIllegal;
-        source -= (extraBytesToRead+1); /* return to the start */
-        break; /* Bail out; shouldn't continue */
-	    } else {
-        *target++ = UNI_REPLACEMENT_CHAR;
-	    }
-    } else {
-	    /* target is a character in range 0xFFFF - 0x10FFFF. */
-	    if (target + 1 >= targetEnd) {
-        source -= (extraBytesToRead+1); /* Back up source pointer! */
-        result = targetExhausted; break;
-	    }
-	    ch -= halfBase;
-	    *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
-	    *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
-    }
-  }
-*sourceStart = source;
-*targetStart = target;
-return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF32toUTF8 (const UTF32** sourceStart, const UTF32* sourceEnd,
-                                     UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
-  ConversionResult result = conversionOK;
-  const UTF32* source = *sourceStart;
-  UTF8* target = *targetStart;
-  while (source < sourceEnd) {
-    UTF32 ch;
-    unsigned short bytesToWrite = 0;
-    const UTF32 byteMask = 0xBF;
-    const UTF32 byteMark = 0x80;
-    ch = *source++;
-    if (flags == strictConversion ) {
-	    /* UTF-16 surrogate values are illegal in UTF-32 */
-	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-        --source; /* return to the illegal value itself */
-        result = sourceIllegal;
-        break;
-	    }
-    }
-    /*
-     * Figure out how many bytes the result will require. Turn any
-     * illegally large UTF32 things (> Plane 17) into replacement chars.
-     */
-    if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
-    } else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
-    } else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
-    } else if (ch <= UNI_MAX_LEGAL_UTF32) {  bytesToWrite = 4;
-    } else {			    bytesToWrite = 3;
-      ch = UNI_REPLACEMENT_CHAR;
-      result = sourceIllegal;
-    }
-
-    target += bytesToWrite;
-    if (target > targetEnd) {
-	    --source; /* Back up source pointer! */
-	    target -= bytesToWrite; result = targetExhausted; break;
-    }
-    switch (bytesToWrite) { /* note: everything falls through. */
-	    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
-    }
-    target += bytesToWrite;
-  }
-*sourceStart = source;
-*targetStart = target;
-return result;
-}
-
-/* --------------------------------------------------------------------- */
-
-ConversionResult ConvertUTF8toUTF32 (const UTF8** sourceStart, const UTF8* sourceEnd,
-                                     UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
-  ConversionResult result = conversionOK;
-  const UTF8* source = *sourceStart;
-  UTF32* target = *targetStart;
-  while (source < sourceEnd) {
-    UTF32 ch = 0;
-    unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
-    if (source + extraBytesToRead >= sourceEnd) {
-	    result = sourceExhausted; break;
-    }
-    /* Do this check whether lenient or strict */
-    if (! isLegalUTF8(source, extraBytesToRead+1)) {
-	    result = sourceIllegal;
-	    break;
-    }
-    /*
-     * The cases all fall through. See "Note A" below.
-     */
-    switch (extraBytesToRead) {
-	    case 5: ch += *source++; ch <<= 6;
-	    case 4: ch += *source++; ch <<= 6;
-	    case 3: ch += *source++; ch <<= 6;
-	    case 2: ch += *source++; ch <<= 6;
-	    case 1: ch += *source++; ch <<= 6;
-	    case 0: ch += *source++;
-    }
-    ch -= offsetsFromUTF8[extraBytesToRead];
-
-    if (target >= targetEnd) {
-	    source -= (extraBytesToRead+1); /* Back up the source pointer! */
-	    result = targetExhausted; break;
-    }
-    if (ch <= UNI_MAX_LEGAL_UTF32) {
-	    /*
-	     * UTF-16 surrogate values are illegal in UTF-32, and anything
-	     * over Plane 17 (> 0x10FFFF) is illegal.
-	     */
-	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-        if (flags == strictConversion) {
-          source -= (extraBytesToRead+1); /* return to the illegal value itself */
-          result = sourceIllegal;
-          break;
-        } else {
-          *target++ = UNI_REPLACEMENT_CHAR;
-        }
-	    } else {
-        *target++ = ch;
-	    }
-    } else { /* i.e., ch > UNI_MAX_LEGAL_UTF32 */
-	    result = sourceIllegal;
-	    *target++ = UNI_REPLACEMENT_CHAR;
-    }
-  }
-  *sourceStart = source;
-  *targetStart = target;
-  return result;
-}
-
-/* ---------------------------------------------------------------------
-
-Note A.
-The fall-through switches in UTF-8 reading code save a
-temp variable, some decrements & conditionals.  The switches
-are equivalent to the following loop:
-{
-  int tmpBytesToRead = extraBytesToRead+1;
-  do {
-		ch += *source++;
-		--tmpBytesToRead;
-		if (tmpBytesToRead) ch <<= 6;
-  } while (tmpBytesToRead > 0);
-}
-In UTF-8 writing code, the switches on "bytesToWrite" are
-similarly unrolled loops.
-
---------------------------------------------------------------------- */
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,591 @@
+/*
+ * Copyright © 1991-2015 Unicode, Inc. All rights reserved.
+ * Distributed under the Terms of Use in 
+ * http://www.unicode.org/copyright.html.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of the Unicode data files and any associated documentation
+ * (the "Data Files") or Unicode software and any associated documentation
+ * (the "Software") to deal in the Data Files or Software
+ * without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, and/or sell copies of
+ * the Data Files or Software, and to permit persons to whom the Data Files
+ * or Software are furnished to do so, provided that
+ * (a) this copyright and permission notice appear with all copies 
+ * of the Data Files or Software,
+ * (b) this copyright and permission notice appear in associated 
+ * documentation, and
+ * (c) there is clear notice in each modified Data File or in the Software
+ * as well as in the documentation associated with the Data File(s) or
+ * Software that the data or software has been modified.
+ *
+ * THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+ * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+ * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in these Data Files or Software without prior
+ * written authorization of the copyright holder.
+ */
+
+/* ---------------------------------------------------------------------
+
+Conversions between UTF32, UTF-16, and UTF-8. Source code file.
+Author: Mark E. Davis, 1994.
+Rev History: Rick McGowan, fixes & updates May 2001.
+Sept 2001: fixed const & error conditions per
+mods suggested by S. Parent & A. Lillich.
+June 2002: Tim Dodd added detection and handling of incomplete
+source sequences, enhanced error detection, added casts
+to eliminate compiler warnings.
+July 2003: slight mods to back out aggressive FFFE detection.
+Jan 2004: updated switches in from-UTF8 conversions.
+Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
+
+See the header file "ConvertUTF.h" for complete documentation.
+
+------------------------------------------------------------------------ */
+
+
+#include "convert_UTF.h"
+#ifdef CVTUTF_DEBUG
+#include <stdio.h>
+#endif
+
+#include "common/macros.h"
+
+namespace google_breakpad {
+
+namespace {
+
+const int halfShift  = 10; /* used for shifting by 10 bits */
+
+const UTF32 halfBase = 0x0010000UL;
+const UTF32 halfMask = 0x3FFUL;
+
+}  // namespace
+
+#define UNI_SUR_HIGH_START  (UTF32)0xD800
+#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
+#define UNI_SUR_LOW_START   (UTF32)0xDC00
+#define UNI_SUR_LOW_END     (UTF32)0xDFFF
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF32toUTF16 (const UTF32** sourceStart, const UTF32* sourceEnd,
+                                      UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+  ConversionResult result = conversionOK;
+  const UTF32* source = *sourceStart;
+  UTF16* target = *targetStart;
+  while (source < sourceEnd) {
+    UTF32 ch;
+    if (target >= targetEnd) {
+	    result = targetExhausted; break;
+    }
+    ch = *source++;
+    if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+	    /* UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+        if (flags == strictConversion) {
+          --source; /* return to the illegal value itself */
+          result = sourceIllegal;
+          break;
+        } else {
+          *target++ = UNI_REPLACEMENT_CHAR;
+        }
+	    } else {
+        *target++ = (UTF16)ch; /* normal case */
+	    }
+    } else if (ch > UNI_MAX_LEGAL_UTF32) {
+	    if (flags == strictConversion) {
+        result = sourceIllegal;
+	    } else {
+        *target++ = UNI_REPLACEMENT_CHAR;
+	    }
+    } else {
+	    /* target is a character in range 0xFFFF - 0x10FFFF. */
+	    if (target + 1 >= targetEnd) {
+        --source; /* Back up source pointer! */
+        result = targetExhausted; break;
+	    }
+	    ch -= halfBase;
+	    *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
+	    *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
+    }
+  }
+*sourceStart = source;
+*targetStart = target;
+return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF16toUTF32 (const UTF16** sourceStart, const UTF16* sourceEnd,
+                                      UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
+  ConversionResult result = conversionOK;
+  const UTF16* source = *sourceStart;
+  UTF32* target = *targetStart;
+  UTF32 ch, ch2;
+  while (source < sourceEnd) {
+    const UTF16* oldSource = source; /*  In case we have to back up because of target overflow. */
+    ch = *source++;
+    /* If we have a surrogate pair, convert to UTF32 first. */
+    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
+	    /* If the 16 bits following the high surrogate are in the source buffer... */
+	    if (source < sourceEnd) {
+        ch2 = *source;
+        /* If it's a low surrogate, convert to UTF32. */
+        if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
+          ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+          + (ch2 - UNI_SUR_LOW_START) + halfBase;
+          ++source;
+        } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
+          --source; /* return to the illegal value itself */
+          result = sourceIllegal;
+          break;
+        }
+	    } else { /* We don't have the 16 bits following the high surrogate. */
+        --source; /* return to the high surrogate */
+        result = sourceExhausted;
+        break;
+	    }
+    } else if (flags == strictConversion) {
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
+        --source; /* return to the illegal value itself */
+        result = sourceIllegal;
+        break;
+	    }
+    }
+    if (target >= targetEnd) {
+	    source = oldSource; /* Back up source pointer! */
+	    result = targetExhausted; break;
+    }
+    *target++ = ch;
+  }
+  *sourceStart = source;
+  *targetStart = target;
+#ifdef CVTUTF_DEBUG
+  if (result == sourceIllegal) {
+    fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2);
+    fflush(stderr);
+  }
+#endif
+  return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+namespace {
+
+/*
+ * Index into the table below with the first byte of a UTF-8 sequence to
+ * get the number of trailing bytes that are supposed to follow it.
+ * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
+ * left as-is for anyone who may want to do such conversion, which was
+ * allowed in earlier algorithms.
+ */
+const char trailingBytesForUTF8[256] = {
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/*
+ * Magic values subtracted from a buffer value during UTF8 conversion.
+ * This table contains as many values as there might be trailing bytes
+ * in a UTF-8 sequence.
+ */
+const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
+  0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+
+/*
+ * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
+ * into the first byte, depending on how many bytes follow.  There are
+ * as many entries in this table as there are UTF-8 sequence types.
+ * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
+ * for *legal* UTF-8 will be 4 or fewer bytes total.
+ */
+const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+/* --------------------------------------------------------------------- */
+
+/* The interface converts a whole buffer to avoid function-call overhead.
+* Constants have been gathered. Loops & conditionals have been removed as
+* much as possible for efficiency, in favor of drop-through switches.
+* (See "Note A" at the bottom of the file for equivalent code.)
+* If your compiler supports it, the "isLegalUTF8" call can be turned
+* into an inline function.
+*/
+
+}  // namespace
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF16toUTF8 (const UTF16** sourceStart, const UTF16* sourceEnd,
+                                     UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+  ConversionResult result = conversionOK;
+  const UTF16* source = *sourceStart;
+  UTF8* target = *targetStart;
+  while (source < sourceEnd) {
+    UTF32 ch;
+    unsigned short bytesToWrite = 0;
+    const UTF32 byteMask = 0xBF;
+    const UTF32 byteMark = 0x80;
+    const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
+    ch = *source++;
+    /* If we have a surrogate pair, convert to UTF32 first. */
+    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
+	    /* If the 16 bits following the high surrogate are in the source buffer... */
+	    if (source < sourceEnd) {
+        UTF32 ch2 = *source;
+        /* If it's a low surrogate, convert to UTF32. */
+        if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
+          ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+          + (ch2 - UNI_SUR_LOW_START) + halfBase;
+          ++source;
+        } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
+          --source; /* return to the illegal value itself */
+          result = sourceIllegal;
+          break;
+        }
+	    } else { /* We don't have the 16 bits following the high surrogate. */
+        --source; /* return to the high surrogate */
+        result = sourceExhausted;
+        break;
+	    }
+    } else if (flags == strictConversion) {
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
+        --source; /* return to the illegal value itself */
+        result = sourceIllegal;
+        break;
+	    }
+    }
+    /* Figure out how many bytes the result will require */
+    if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
+    } else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
+    } else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
+    } else if (ch < (UTF32)0x110000) {  bytesToWrite = 4;
+    } else {			    bytesToWrite = 3;
+      ch = UNI_REPLACEMENT_CHAR;
+    }
+
+    target += bytesToWrite;
+    if (target > targetEnd) {
+	    source = oldSource; /* Back up source pointer! */
+	    target -= bytesToWrite; result = targetExhausted; break;
+    }
+    switch (bytesToWrite) { /* note: everything falls through. */
+      case 4:
+        *--target = (UTF8)((ch | byteMark) & byteMask);
+        ch >>= 6;
+        BP_FALLTHROUGH;
+      case 3:
+        *--target = (UTF8)((ch | byteMark) & byteMask);
+        ch >>= 6;
+        BP_FALLTHROUGH;
+      case 2:
+        *--target = (UTF8)((ch | byteMark) & byteMask);
+        ch >>= 6;
+        BP_FALLTHROUGH;
+      case 1:
+        *--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);
+    }
+    target += bytesToWrite;
+  }
+*sourceStart = source;
+*targetStart = target;
+return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+namespace {
+
+/*
+ * Utility routine to tell whether a sequence of bytes is legal UTF-8.
+ * This must be called with the length pre-determined by the first byte.
+ * If not calling this from ConvertUTF8to*, then the length can be set by:
+ *  length = trailingBytesForUTF8[*source]+1;
+ * and the sequence is illegal right away if there aren't that many bytes
+ * available.
+ * If presented with a length > 4, this returns false.  The Unicode
+ * definition of UTF-8 goes up to 4-byte sequences.
+ */
+Boolean isLegalUTF8(const UTF8 *source, int length) {
+  UTF8 a;
+  const UTF8 *srcptr = source+length;
+  switch (length) {
+    default: return false;
+      /* Everything else falls through when "true"... */
+    case 4:
+      if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+      BP_FALLTHROUGH;
+    case 3:
+      if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+      BP_FALLTHROUGH;
+    case 2:
+      if ((a = (*--srcptr)) > 0xBF) return false;
+
+      switch (*source) {
+        /* no fall-through in this inner switch */
+        case 0xE0: if (a < 0xA0) return false; break;
+        case 0xED: if (a > 0x9F) return false; break;
+        case 0xF0: if (a < 0x90) return false; break;
+        case 0xF4: if (a > 0x8F) return false; break;
+        default:   if (a < 0x80) return false;
+      }
+      BP_FALLTHROUGH;
+    case 1: if (*source >= 0x80 && *source < 0xC2) return false;
+  }
+  if (*source > 0xF4) return false;
+  return true;
+}
+
+}  // namespace
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Exported function to return whether a UTF-8 sequence is legal or not.
+ * This is not used here; it's just exported.
+ */
+Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
+  int length = trailingBytesForUTF8[*source]+1;
+  if (source+length > sourceEnd) {
+    return false;
+  }
+  return isLegalUTF8(source, length);
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF8toUTF16 (const UTF8** sourceStart, const UTF8* sourceEnd,
+                                     UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+  ConversionResult result = conversionOK;
+  const UTF8* source = *sourceStart;
+  UTF16* target = *targetStart;
+  while (source < sourceEnd) {
+    UTF32 ch = 0;
+    unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+    if (source + extraBytesToRead >= sourceEnd) {
+	    result = sourceExhausted; break;
+    }
+    /* Do this check whether lenient or strict */
+    if (! isLegalUTF8(source, extraBytesToRead+1)) {
+	    result = sourceIllegal;
+	    break;
+    }
+    /*
+     * The cases all fall through. See "Note A" below.
+     */
+    switch (extraBytesToRead) {
+      /* remember, illegal UTF-8 */
+      case 5: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      /* remember, illegal UTF-8 */
+      case 4: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 3: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 2: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 1: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 0: ch += *source++;
+    }
+    ch -= offsetsFromUTF8[extraBytesToRead];
+
+    if (target >= targetEnd) {
+	    source -= (extraBytesToRead+1); /* Back up source pointer! */
+	    result = targetExhausted; break;
+    }
+    if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+        if (flags == strictConversion) {
+          source -= (extraBytesToRead+1); /* return to the illegal value itself */
+          result = sourceIllegal;
+          break;
+        } else {
+          *target++ = UNI_REPLACEMENT_CHAR;
+        }
+	    } else {
+        *target++ = (UTF16)ch; /* normal case */
+	    }
+    } else if (ch > UNI_MAX_UTF16) {
+	    if (flags == strictConversion) {
+        result = sourceIllegal;
+        source -= (extraBytesToRead+1); /* return to the start */
+        break; /* Bail out; shouldn't continue */
+	    } else {
+        *target++ = UNI_REPLACEMENT_CHAR;
+	    }
+    } else {
+	    /* target is a character in range 0xFFFF - 0x10FFFF. */
+	    if (target + 1 >= targetEnd) {
+        source -= (extraBytesToRead+1); /* Back up source pointer! */
+        result = targetExhausted; break;
+	    }
+	    ch -= halfBase;
+	    *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
+	    *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
+    }
+  }
+*sourceStart = source;
+*targetStart = target;
+return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF32toUTF8 (const UTF32** sourceStart, const UTF32* sourceEnd,
+                                     UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+  ConversionResult result = conversionOK;
+  const UTF32* source = *sourceStart;
+  UTF8* target = *targetStart;
+  while (source < sourceEnd) {
+    UTF32 ch;
+    unsigned short bytesToWrite = 0;
+    const UTF32 byteMask = 0xBF;
+    const UTF32 byteMark = 0x80;
+    ch = *source++;
+    if (flags == strictConversion ) {
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+        --source; /* return to the illegal value itself */
+        result = sourceIllegal;
+        break;
+	    }
+    }
+    /*
+     * Figure out how many bytes the result will require. Turn any
+     * illegally large UTF32 things (> Plane 17) into replacement chars.
+     */
+    if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
+    } else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
+    } else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
+    } else if (ch <= UNI_MAX_LEGAL_UTF32) {  bytesToWrite = 4;
+    } else {			    bytesToWrite = 3;
+      ch = UNI_REPLACEMENT_CHAR;
+      result = sourceIllegal;
+    }
+
+    target += bytesToWrite;
+    if (target > targetEnd) {
+	    --source; /* Back up source pointer! */
+	    target -= bytesToWrite; result = targetExhausted; break;
+    }
+    switch (bytesToWrite) { /* note: everything falls through. */
+      case 4:
+        *--target = (UTF8)((ch | byteMark) & byteMask);
+        ch >>= 6;
+        BP_FALLTHROUGH;
+      case 3:
+        *--target = (UTF8)((ch | byteMark) & byteMask);
+        ch >>= 6;
+        BP_FALLTHROUGH;
+      case 2:
+        *--target = (UTF8)((ch | byteMark) & byteMask);
+        ch >>= 6;
+        BP_FALLTHROUGH;
+      case 1:
+        *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
+    }
+    target += bytesToWrite;
+  }
+*sourceStart = source;
+*targetStart = target;
+return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF8toUTF32 (const UTF8** sourceStart, const UTF8* sourceEnd,
+                                     UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
+  ConversionResult result = conversionOK;
+  const UTF8* source = *sourceStart;
+  UTF32* target = *targetStart;
+  while (source < sourceEnd) {
+    UTF32 ch = 0;
+    unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+    if (source + extraBytesToRead >= sourceEnd) {
+	    result = sourceExhausted; break;
+    }
+    /* Do this check whether lenient or strict */
+    if (! isLegalUTF8(source, extraBytesToRead+1)) {
+	    result = sourceIllegal;
+	    break;
+    }
+    /*
+     * The cases all fall through. See "Note A" below.
+     */
+    switch (extraBytesToRead) {
+      case 5: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 4: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 3: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 2: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 1: ch += *source++; ch <<= 6; BP_FALLTHROUGH;
+      case 0: ch += *source++;
+    }
+    ch -= offsetsFromUTF8[extraBytesToRead];
+
+    if (target >= targetEnd) {
+	    source -= (extraBytesToRead+1); /* Back up the source pointer! */
+	    result = targetExhausted; break;
+    }
+    if (ch <= UNI_MAX_LEGAL_UTF32) {
+	    /*
+	     * UTF-16 surrogate values are illegal in UTF-32, and anything
+	     * over Plane 17 (> 0x10FFFF) is illegal.
+	     */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+        if (flags == strictConversion) {
+          source -= (extraBytesToRead+1); /* return to the illegal value itself */
+          result = sourceIllegal;
+          break;
+        } else {
+          *target++ = UNI_REPLACEMENT_CHAR;
+        }
+	    } else {
+        *target++ = ch;
+	    }
+    } else { /* i.e., ch > UNI_MAX_LEGAL_UTF32 */
+	    result = sourceIllegal;
+	    *target++ = UNI_REPLACEMENT_CHAR;
+    }
+  }
+  *sourceStart = source;
+  *targetStart = target;
+  return result;
+}
+
+/* ---------------------------------------------------------------------
+
+Note A.
+The fall-through switches in UTF-8 reading code save a
+temp variable, some decrements & conditionals.  The switches
+are equivalent to the following loop:
+{
+  int tmpBytesToRead = extraBytesToRead+1;
+  do {
+		ch += *source++;
+		--tmpBytesToRead;
+		if (tmpBytesToRead) ch <<= 6;
+  } while (tmpBytesToRead > 0);
+}
+In UTF-8 writing code, the switches on "bytesToWrite" are
+similarly unrolled loops.
+
+--------------------------------------------------------------------- */
+
+}  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/convert_UTF.h	2021-12-09 12:01:26.000000000 +0000
@@ -106,6 +106,8 @@
 bit mask & shift operations.
 ------------------------------------------------------------------------ */
 
+namespace google_breakpad {
+
 typedef unsigned long	UTF32;	/* at least 32 bits */
 typedef unsigned short	UTF16;	/* at least 16 bits */
 typedef unsigned char	UTF8;	/* typically 8 bits */
@@ -130,11 +132,6 @@
 	lenientConversion
 } ConversionFlags;
 
-/* This is for C++ and does no harm in C */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 ConversionResult ConvertUTF8toUTF16 (const UTF8** sourceStart, const UTF8* sourceEnd,
                                      UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
 
@@ -155,9 +152,7 @@
 
 Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
 
-#ifdef __cplusplus
-}
-#endif
+}  // namespace google_breakpad
 
 /* --------------------------------------------------------------------- */
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader.cc	2021-12-09 12:01:26.000000000 +0000
@@ -43,7 +43,7 @@
 
 ByteReader::~ByteReader() { }
 
-void ByteReader::SetOffsetSize(uint8 size) {
+void ByteReader::SetOffsetSize(uint8_t size) {
   offset_size_ = size;
   assert(size == 4 || size == 8);
   if (size == 4) {
@@ -53,7 +53,7 @@
   }
 }
 
-void ByteReader::SetAddressSize(uint8 size) {
+void ByteReader::SetAddressSize(uint8_t size) {
   address_size_ = size;
   assert(size == 4 || size == 8);
   if (size == 4) {
@@ -63,8 +63,8 @@
   }
 }
 
-uint64 ByteReader::ReadInitialLength(const uint8_t *start, size_t* len) {
-  const uint64 initial_length = ReadFourBytes(start);
+uint64_t ByteReader::ReadInitialLength(const uint8_t* start, size_t* len) {
+  const uint64_t initial_length = ReadFourBytes(start);
   start += 4;
 
   // In DWARF2/3, if the initial length is all 1 bits, then the offset
@@ -101,9 +101,9 @@
   }
 }
 
-uint64 ByteReader::ReadEncodedPointer(const uint8_t *buffer,
+uint64_t ByteReader::ReadEncodedPointer(const uint8_t* buffer,
                                       DwarfPointerEncoding encoding,
-                                      size_t *len) const {
+                                      size_t* len) const {
   // UsableEncoding doesn't approve of DW_EH_PE_omit, so we shouldn't
   // see it here.
   assert(encoding != DW_EH_PE_omit);
@@ -124,13 +124,13 @@
 
     // First, find the offset to START from the closest prior aligned
     // address.
-    uint64 skew = section_base_ & (AddressSize() - 1);
+    uint64_t skew = section_base_ & (AddressSize() - 1);
     // Now find the offset from that aligned address to buffer.
-    uint64 offset = skew + (buffer - buffer_base_);
+    uint64_t offset = skew + (buffer - buffer_base_);
     // Round up to the next boundary.
-    uint64 aligned = (offset + AddressSize() - 1) & -AddressSize();
+    uint64_t aligned = (offset + AddressSize() - 1) & -AddressSize();
     // Convert back to a pointer.
-    const uint8_t *aligned_buffer = buffer_base_ + (aligned - skew);
+    const uint8_t* aligned_buffer = buffer_base_ + (aligned - skew);
     // Finally, store the length and actually fetch the pointer.
     *len = aligned_buffer - buffer + AddressSize();
     return ReadAddress(aligned_buffer);
@@ -138,7 +138,7 @@
 
   // Extract the value first, ignoring whether it's a pointer or an
   // offset relative to some base.
-  uint64 offset;
+  uint64_t offset;
   switch (encoding & 0x0f) {
     case DW_EH_PE_absptr:
       // DW_EH_PE_absptr is weird, as it is used as a meaningful value for
@@ -202,7 +202,7 @@
   }
 
   // Find the appropriate base address.
-  uint64 base;
+  uint64_t base;
   switch (encoding & 0x70) {
     case DW_EH_PE_absptr:
       base = 0;
@@ -232,13 +232,13 @@
       abort();
   }
 
-  uint64 pointer = base + offset;
+  uint64_t pointer = base + offset;
 
   // Remove inappropriate upper bits.
   if (AddressSize() == 4)
     pointer = pointer & 0xffffffff;
   else
-    assert(AddressSize() == sizeof(uint64));
+    assert(AddressSize() == sizeof(uint64_t));
 
   return pointer;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader.h	2021-12-09 12:01:26.000000000 +0000
@@ -62,22 +62,27 @@
 
   // Read a single byte from BUFFER and return it as an unsigned 8 bit
   // number.
-  uint8 ReadOneByte(const uint8_t *buffer) const;
+  uint8_t ReadOneByte(const uint8_t* buffer) const;
 
   // Read two bytes from BUFFER and return them as an unsigned 16 bit
   // number, using this ByteReader's endianness.
-  uint16 ReadTwoBytes(const uint8_t *buffer) const;
+  uint16_t ReadTwoBytes(const uint8_t* buffer) const;
+
+  // Read three bytes from BUFFER and return them as an unsigned 64 bit
+  // number, using this ByteReader's endianness. DWARF 5 uses this encoding
+  // for various index-related DW_FORMs.
+  uint64_t ReadThreeBytes(const uint8_t* buffer) const;
 
   // Read four bytes from BUFFER and return them as an unsigned 32 bit
   // number, using this ByteReader's endianness. This function returns
-  // a uint64 so that it is compatible with ReadAddress and
+  // a uint64_t so that it is compatible with ReadAddress and
   // ReadOffset. The number it returns will never be outside the range
   // of an unsigned 32 bit integer.
-  uint64 ReadFourBytes(const uint8_t *buffer) const;
+  uint64_t ReadFourBytes(const uint8_t* buffer) const;
 
   // Read eight bytes from BUFFER and return them as an unsigned 64
   // bit number, using this ByteReader's endianness.
-  uint64 ReadEightBytes(const uint8_t *buffer) const;
+  uint64_t ReadEightBytes(const uint8_t* buffer) const;
 
   // Read an unsigned LEB128 (Little Endian Base 128) number from
   // BUFFER and return it as an unsigned 64 bit integer. Set LEN to
@@ -96,7 +101,7 @@
   // In other words, we break VALUE into groups of seven bits, put
   // them in little-endian order, and then write them as eight-bit
   // bytes with the high bit on all but the last.
-  uint64 ReadUnsignedLEB128(const uint8_t *buffer, size_t *len) const;
+  uint64_t ReadUnsignedLEB128(const uint8_t* buffer, size_t* len) const;
 
   // Read a signed LEB128 number from BUFFER and return it as an
   // signed 64 bit integer. Set LEN to the number of bytes read.
@@ -115,7 +120,7 @@
   // In other words, we break VALUE into groups of seven bits, put
   // them in little-endian order, and then write them as eight-bit
   // bytes with the high bit on all but the last.
-  int64 ReadSignedLEB128(const uint8_t *buffer, size_t *len) const;
+  int64_t ReadSignedLEB128(const uint8_t* buffer, size_t* len) const;
 
   // Indicate that addresses on this architecture are SIZE bytes long. SIZE
   // must be either 4 or 8. (DWARF allows addresses to be any number of
@@ -129,16 +134,16 @@
   // frame information doesn't indicate its address size (a shortcoming of
   // the spec); you must supply the appropriate size based on the
   // architecture of the target machine.
-  void SetAddressSize(uint8 size);
+  void SetAddressSize(uint8_t size);
 
   // Return the current address size, in bytes. This is either 4,
   // indicating 32-bit addresses, or 8, indicating 64-bit addresses.
-  uint8 AddressSize() const { return address_size_; }
+  uint8_t AddressSize() const { return address_size_; }
 
   // Read an address from BUFFER and return it as an unsigned 64 bit
   // integer, respecting this ByteReader's endianness and address size. You
   // must call SetAddressSize before calling this function.
-  uint64 ReadAddress(const uint8_t *buffer) const;
+  uint64_t ReadAddress(const uint8_t* buffer) const;
 
   // DWARF actually defines two slightly different formats: 32-bit DWARF
   // and 64-bit DWARF. This is *not* related to the size of registers or
@@ -175,26 +180,26 @@
   // - The 32-bit value 0xffffffff, followed by a 64-bit byte count,
   //   indicating that the data whose length is being measured uses
   //   the 64-bit DWARF format.
-  uint64 ReadInitialLength(const uint8_t *start, size_t *len);
+  uint64_t ReadInitialLength(const uint8_t* start, size_t* len);
 
   // Read an offset from BUFFER and return it as an unsigned 64 bit
   // integer, respecting the ByteReader's endianness. In 32-bit DWARF, the
   // offset is 4 bytes long; in 64-bit DWARF, the offset is eight bytes
   // long. You must call ReadInitialLength or SetOffsetSize before calling
   // this function; see the comments above for details.
-  uint64 ReadOffset(const uint8_t *buffer) const;
+  uint64_t ReadOffset(const uint8_t* buffer) const;
 
   // Return the current offset size, in bytes.
   // A return value of 4 indicates that we are reading 32-bit DWARF.
   // A return value of 8 indicates that we are reading 64-bit DWARF.
-  uint8 OffsetSize() const { return offset_size_; }
+  uint8_t OffsetSize() const { return offset_size_; }
 
   // Indicate that section offsets and lengths are SIZE bytes long. SIZE
   // must be either 4 (meaning 32-bit DWARF) or 8 (meaning 64-bit DWARF).
   // Usually, you should not call this function yourself; instead, let a
   // call to ReadInitialLength establish the data's offset size
   // automatically.
-  void SetOffsetSize(uint8 size);
+  void SetOffsetSize(uint8_t size);
 
   // The Linux C++ ABI uses a variant of DWARF call frame information
   // for exception handling. This data is included in the program's
@@ -237,24 +242,24 @@
   // is BUFFER_BASE. This allows us to find the address that a given
   // byte in our buffer would have when loaded into the program the
   // data describes. We need this to resolve DW_EH_PE_pcrel pointers.
-  void SetCFIDataBase(uint64 section_base, const uint8_t *buffer_base);
+  void SetCFIDataBase(uint64_t section_base, const uint8_t* buffer_base);
 
   // Indicate that the base address of the program's ".text" section
   // is TEXT_BASE. We need this to resolve DW_EH_PE_textrel pointers.
-  void SetTextBase(uint64 text_base);
+  void SetTextBase(uint64_t text_base);
 
   // Indicate that the base address for DW_EH_PE_datarel pointers is
   // DATA_BASE. The proper value depends on the ABI; it is usually the
   // address of the global offset table, held in a designated register in
   // position-independent code. You will need to look at the startup code
   // for the target system to be sure. I tried; my eyes bled.
-  void SetDataBase(uint64 data_base);
+  void SetDataBase(uint64_t data_base);
 
   // Indicate that the base address for the FDE we are processing is
   // FUNCTION_BASE. This is the start address of DW_EH_PE_funcrel
   // pointers. (This encoding does not seem to be used by the GNU
   // toolchain.)
-  void SetFunctionBase(uint64 function_base);
+  void SetFunctionBase(uint64_t function_base);
 
   // Indicate that we are no longer processing any FDE, so any use of
   // a DW_EH_PE_funcrel encoding is an error.
@@ -276,15 +281,15 @@
   // base address this reader hasn't been given, so you should check
   // with ValidEncoding and UsableEncoding first if you would rather
   // die in a more helpful way.
-  uint64 ReadEncodedPointer(const uint8_t *buffer,
+  uint64_t ReadEncodedPointer(const uint8_t* buffer,
                             DwarfPointerEncoding encoding,
-                            size_t *len) const;
+                            size_t* len) const;
 
   Endianness GetEndianness() const;
  private:
 
   // Function pointer type for our address and offset readers.
-  typedef uint64 (ByteReader::*AddressReader)(const uint8_t *) const;
+  typedef uint64_t (ByteReader::*AddressReader)(const uint8_t*) const;
 
   // Read an offset from BUFFER and return it as an unsigned 64 bit
   // integer.  DWARF2/3 define offsets as either 4 or 8 bytes,
@@ -300,14 +305,14 @@
   AddressReader address_reader_;
 
   Endianness endian_;
-  uint8 address_size_;
-  uint8 offset_size_;
+  uint8_t address_size_;
+  uint8_t offset_size_;
 
   // Base addresses for Linux C++ exception handling data's encoded pointers.
   bool have_section_base_, have_text_base_, have_data_base_;
   bool have_function_base_;
-  uint64 section_base_, text_base_, data_base_, function_base_;
-  const uint8_t *buffer_base_;
+  uint64_t section_base_, text_base_, data_base_, function_base_;
+  const uint8_t* buffer_base_;
 };
 
 }  // namespace dwarf2reader
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -36,13 +36,13 @@
 
 namespace dwarf2reader {
 
-inline uint8 ByteReader::ReadOneByte(const uint8_t *buffer) const {
+inline uint8_t ByteReader::ReadOneByte(const uint8_t* buffer) const {
   return buffer[0];
 }
 
-inline uint16 ByteReader::ReadTwoBytes(const uint8_t *buffer) const {
-  const uint16 buffer0 = buffer[0];
-  const uint16 buffer1 = buffer[1];
+inline uint16_t ByteReader::ReadTwoBytes(const uint8_t* buffer) const {
+  const uint16_t buffer0 = buffer[0];
+  const uint16_t buffer1 = buffer[1];
   if (endian_ == ENDIANNESS_LITTLE) {
     return buffer0 | buffer1 << 8;
   } else {
@@ -50,11 +50,22 @@
   }
 }
 
-inline uint64 ByteReader::ReadFourBytes(const uint8_t *buffer) const {
-  const uint32 buffer0 = buffer[0];
-  const uint32 buffer1 = buffer[1];
-  const uint32 buffer2 = buffer[2];
-  const uint32 buffer3 = buffer[3];
+inline uint64_t ByteReader::ReadThreeBytes(const uint8_t* buffer) const {
+  const uint32_t buffer0 = buffer[0];
+  const uint32_t buffer1 = buffer[1];
+  const uint32_t buffer2 = buffer[2];
+  if (endian_ == ENDIANNESS_LITTLE) {
+    return buffer0 | buffer1 << 8 | buffer2 << 16;
+  } else {
+    return buffer2 | buffer1 << 8 | buffer0 << 16;
+  }
+}
+
+inline uint64_t ByteReader::ReadFourBytes(const uint8_t* buffer) const {
+  const uint32_t buffer0 = buffer[0];
+  const uint32_t buffer1 = buffer[1];
+  const uint32_t buffer2 = buffer[2];
+  const uint32_t buffer3 = buffer[3];
   if (endian_ == ENDIANNESS_LITTLE) {
     return buffer0 | buffer1 << 8 | buffer2 << 16 | buffer3 << 24;
   } else {
@@ -62,15 +73,15 @@
   }
 }
 
-inline uint64 ByteReader::ReadEightBytes(const uint8_t *buffer) const {
-  const uint64 buffer0 = buffer[0];
-  const uint64 buffer1 = buffer[1];
-  const uint64 buffer2 = buffer[2];
-  const uint64 buffer3 = buffer[3];
-  const uint64 buffer4 = buffer[4];
-  const uint64 buffer5 = buffer[5];
-  const uint64 buffer6 = buffer[6];
-  const uint64 buffer7 = buffer[7];
+inline uint64_t ByteReader::ReadEightBytes(const uint8_t* buffer) const {
+  const uint64_t buffer0 = buffer[0];
+  const uint64_t buffer1 = buffer[1];
+  const uint64_t buffer2 = buffer[2];
+  const uint64_t buffer3 = buffer[3];
+  const uint64_t buffer4 = buffer[4];
+  const uint64_t buffer5 = buffer[5];
+  const uint64_t buffer6 = buffer[6];
+  const uint64_t buffer7 = buffer[7];
   if (endian_ == ENDIANNESS_LITTLE) {
     return buffer0 | buffer1 << 8 | buffer2 << 16 | buffer3 << 24 |
       buffer4 << 32 | buffer5 << 40 | buffer6 << 48 | buffer7 << 56;
@@ -84,9 +95,9 @@
 // information, plus one bit saying whether the number continues or
 // not.
 
-inline uint64 ByteReader::ReadUnsignedLEB128(const uint8_t *buffer,
+inline uint64_t ByteReader::ReadUnsignedLEB128(const uint8_t* buffer,
                                              size_t* len) const {
-  uint64 result = 0;
+  uint64_t result = 0;
   size_t num_read = 0;
   unsigned int shift = 0;
   uint8_t byte;
@@ -95,7 +106,7 @@
     byte = *buffer++;
     num_read++;
 
-    result |= (static_cast<uint64>(byte & 0x7f)) << shift;
+    result |= (static_cast<uint64_t>(byte & 0x7f)) << shift;
 
     shift += 7;
 
@@ -109,9 +120,9 @@
 // Read a signed LEB128 number.  These are like regular LEB128
 // numbers, except the last byte may have a sign bit set.
 
-inline int64 ByteReader::ReadSignedLEB128(const uint8_t *buffer,
+inline int64_t ByteReader::ReadSignedLEB128(const uint8_t* buffer,
                                           size_t* len) const {
-  int64 result = 0;
+  int64_t result = 0;
   unsigned int shift = 0;
   size_t num_read = 0;
   uint8_t byte;
@@ -119,44 +130,44 @@
   do {
       byte = *buffer++;
       num_read++;
-      result |= (static_cast<uint64>(byte & 0x7f) << shift);
+      result |= (static_cast<uint64_t>(byte & 0x7f) << shift);
       shift += 7;
   } while (byte & 0x80);
 
   if ((shift < 8 * sizeof (result)) && (byte & 0x40))
-    result |= -((static_cast<int64>(1)) << shift);
+    result |= -((static_cast<int64_t>(1)) << shift);
   *len = num_read;
   return result;
 }
 
-inline uint64 ByteReader::ReadOffset(const uint8_t *buffer) const {
+inline uint64_t ByteReader::ReadOffset(const uint8_t* buffer) const {
   assert(this->offset_reader_);
   return (this->*offset_reader_)(buffer);
 }
 
-inline uint64 ByteReader::ReadAddress(const uint8_t *buffer) const {
+inline uint64_t ByteReader::ReadAddress(const uint8_t* buffer) const {
   assert(this->address_reader_);
   return (this->*address_reader_)(buffer);
 }
 
-inline void ByteReader::SetCFIDataBase(uint64 section_base,
-                                       const uint8_t *buffer_base) {
+inline void ByteReader::SetCFIDataBase(uint64_t section_base,
+                                       const uint8_t* buffer_base) {
   section_base_ = section_base;
   buffer_base_ = buffer_base;
   have_section_base_ = true;
 }
 
-inline void ByteReader::SetTextBase(uint64 text_base) {
+inline void ByteReader::SetTextBase(uint64_t text_base) {
   text_base_ = text_base;
   have_text_base_ = true;
 }
 
-inline void ByteReader::SetDataBase(uint64 data_base) {
+inline void ByteReader::SetDataBase(uint64_t data_base) {
   data_base_ = data_base;
   have_data_base_ = true;
 }
 
-inline void ByteReader::SetFunctionBase(uint64 function_base) {
+inline void ByteReader::SetFunctionBase(uint64_t function_base) {
   function_base_ = function_base;
   have_function_base_ = true;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/bytereader_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -73,7 +73,7 @@
     .LEB128(-0x4f337badf4483f83LL)
     .D32(0xfec319c9);
   ASSERT_TRUE(section.GetContents(&contents));
-  const uint8_t *data = reinterpret_cast<const uint8_t *>(contents.data());
+  const uint8_t* data = reinterpret_cast<const uint8_t*>(contents.data());
   EXPECT_EQ(0xc0U, reader.ReadOneByte(data));
   EXPECT_EQ(0xcf0dU, reader.ReadTwoBytes(data + 1));
   EXPECT_EQ(0x96fdd219U, reader.ReadFourBytes(data + 3));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/cfi_assembler.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/cfi_assembler.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/cfi_assembler.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/cfi_assembler.cc	2021-12-09 12:01:26.000000000 +0000
@@ -41,11 +41,11 @@
 
 using dwarf2reader::DwarfPointerEncoding;
   
-CFISection &CFISection::CIEHeader(uint64_t code_alignment_factor,
+CFISection& CFISection::CIEHeader(uint64_t code_alignment_factor,
                                   int data_alignment_factor,
                                   unsigned return_address_register,
                                   uint8_t version,
-                                  const string &augmentation,
+                                  const string& augmentation,
                                   bool dwarf64,
                                   uint8_t address_size,
                                   uint8_t segment_size) {
@@ -78,7 +78,7 @@
   return *this;
 }
 
-CFISection &CFISection::FDEHeader(Label cie_pointer,
+CFISection& CFISection::FDEHeader(Label cie_pointer,
                                   uint64_t initial_location,
                                   uint64_t address_range,
                                   bool dwarf64) {
@@ -113,7 +113,7 @@
   return *this;
 }
 
-CFISection &CFISection::FinishEntry() {
+CFISection& CFISection::FinishEntry() {
   assert(entry_length_);
   Align(address_size_, dwarf2reader::DW_CFA_nop);
   entry_length_->length = Here() - entry_length_->start;
@@ -123,9 +123,9 @@
   return *this;
 }
 
-CFISection &CFISection::EncodedPointer(uint64_t address,
+CFISection& CFISection::EncodedPointer(uint64_t address,
                                        DwarfPointerEncoding encoding,
-                                       const EncodedPointerBases &bases) {
+                                       const EncodedPointerBases& bases) {
   // Omitted data is extremely easy to emit.
   if (encoding == dwarf2reader::DW_EH_PE_omit)
     return *this;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/cfi_assembler.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/cfi_assembler.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/cfi_assembler.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/cfi_assembler.h	2021-12-09 12:01:26.000000000 +0000
@@ -120,7 +120,7 @@
   // Use the addresses in BASES as the base addresses for encoded
   // pointers in subsequent calls to FDEHeader or EncodedPointer.
   // This function makes a copy of BASES.
-  void SetEncodedPointerBases(const EncodedPointerBases &bases) {
+  void SetEncodedPointerBases(const EncodedPointerBases& bases) {
     encoded_pointer_bases_ = bases;
   }
 
@@ -133,11 +133,11 @@
   // Before calling this function, you will typically want to use Mark
   // or Here to make a label to pass to FDEHeader that refers to this
   // CIE's position in the section.
-  CFISection &CIEHeader(uint64_t code_alignment_factor,
+  CFISection& CIEHeader(uint64_t code_alignment_factor,
                         int data_alignment_factor,
                         unsigned return_address_register,
                         uint8_t version = 3,
-                        const string &augmentation = "",
+                        const string& augmentation = "",
                         bool dwarf64 = false,
                         uint8_t address_size = 8,
                         uint8_t segment_size = 0);
@@ -152,7 +152,7 @@
   // 0xffffff00 bytes. (The "initial length" is always a 32-bit
   // value.) Nor does it support .debug_frame sections longer than
   // 0xffffff00 bytes.
-  CFISection &FDEHeader(Label cie_pointer,
+  CFISection& FDEHeader(Label cie_pointer,
                         uint64_t initial_location,
                         uint64_t address_range,
                         bool dwarf64 = false);
@@ -161,11 +161,11 @@
   // started, after padding with DW_CFA_nops for alignment. This
   // defines the label representing the entry's length, cited in the
   // entry's header. Return a reference to this section.
-  CFISection &FinishEntry();
+  CFISection& FinishEntry();
 
   // Append the contents of BLOCK as a DW_FORM_block value: an
   // unsigned LEB128 length, followed by that many bytes of data.
-  CFISection &Block(const string &block) {
+  CFISection& Block(const string& block) {
     ULEB128(block.size());
     Append(block);
     return *this;
@@ -173,11 +173,11 @@
 
   // Append ADDRESS to this section, in the appropriate size and
   // endianness. Return a reference to this section.
-  CFISection &Address(uint64_t address) {
+  CFISection& Address(uint64_t address) {
     Section::Append(endianness(), address_size_, address);
     return *this;
   }
-  CFISection &Address(Label address) {
+  CFISection& Address(Label address) {
     Section::Append(endianness(), address_size_, address);
     return *this;
   }
@@ -191,26 +191,26 @@
   // 
   // (C++ doesn't let me use default arguments here, because I want to
   // refer to members of *this in the default argument expression.)
-  CFISection &EncodedPointer(uint64_t address) {
+  CFISection& EncodedPointer(uint64_t address) {
     return EncodedPointer(address, pointer_encoding_, encoded_pointer_bases_);
   }
-  CFISection &EncodedPointer(uint64_t address, DwarfPointerEncoding encoding) {
+  CFISection& EncodedPointer(uint64_t address, DwarfPointerEncoding encoding) {
     return EncodedPointer(address, encoding, encoded_pointer_bases_);
   }
-  CFISection &EncodedPointer(uint64_t address, DwarfPointerEncoding encoding,
-                             const EncodedPointerBases &bases);
+  CFISection& EncodedPointer(uint64_t address, DwarfPointerEncoding encoding,
+                             const EncodedPointerBases& bases);
 
   // Restate some member functions, to keep chaining working nicely.
-  CFISection &Mark(Label *label)   { Section::Mark(label); return *this; }
-  CFISection &D8(uint8_t v)       { Section::D8(v);       return *this; }
-  CFISection &D16(uint16_t v)     { Section::D16(v);      return *this; }
-  CFISection &D16(Label v)         { Section::D16(v);      return *this; }
-  CFISection &D32(uint32_t v)     { Section::D32(v);      return *this; }
-  CFISection &D32(const Label &v)  { Section::D32(v);      return *this; }
-  CFISection &D64(uint64_t v)     { Section::D64(v);      return *this; }
-  CFISection &D64(const Label &v)  { Section::D64(v);      return *this; }
-  CFISection &LEB128(long long v)  { Section::LEB128(v);   return *this; }
-  CFISection &ULEB128(uint64_t v) { Section::ULEB128(v);  return *this; }
+  CFISection& Mark(Label* label)  { Section::Mark(label); return *this; }
+  CFISection& D8(uint8_t v)       { Section::D8(v);       return *this; }
+  CFISection& D16(uint16_t v)     { Section::D16(v);      return *this; }
+  CFISection& D16(Label v)        { Section::D16(v);      return *this; }
+  CFISection& D32(uint32_t v)     { Section::D32(v);      return *this; }
+  CFISection& D32(const Label& v) { Section::D32(v);      return *this; }
+  CFISection& D64(uint64_t v)     { Section::D64(v);      return *this; }
+  CFISection& D64(const Label& v) { Section::D64(v);      return *this; }
+  CFISection& LEB128(long long v) { Section::LEB128(v);   return *this; }
+  CFISection& ULEB128(uint64_t v) { Section::ULEB128(v);  return *this; }
 
  private:
   // A length value that we've appended to the section, but is not yet
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler.cc	2021-12-09 12:01:26.000000000 +0000
@@ -43,24 +43,24 @@
 
 DIEDispatcher::~DIEDispatcher() {
   while (!die_handlers_.empty()) {
-    HandlerStack &entry = die_handlers_.top();
+    HandlerStack& entry = die_handlers_.top();
     if (entry.handler_ != root_handler_)
       delete entry.handler_;
     die_handlers_.pop();
   }
 }
 
-bool DIEDispatcher::StartCompilationUnit(uint64 offset, uint8 address_size,
-                                         uint8 offset_size, uint64 cu_length,
-                                         uint8 dwarf_version) {
+bool DIEDispatcher::StartCompilationUnit(uint64_t offset, uint8_t address_size,
+                                         uint8_t offset_size, uint64_t cu_length,
+                                         uint8_t dwarf_version) {
   return root_handler_->StartCompilationUnit(offset, address_size,
                                              offset_size, cu_length,
                                              dwarf_version);
 }
 
-bool DIEDispatcher::StartDIE(uint64 offset, enum DwarfTag tag) {
+bool DIEDispatcher::StartDIE(uint64_t offset, enum DwarfTag tag) {
   // The stack entry for the parent of this DIE, if there is one.
-  HandlerStack *parent = die_handlers_.empty() ? NULL : &die_handlers_.top();
+  HandlerStack* parent = die_handlers_.empty() ? NULL : &die_handlers_.top();
 
   // Does this call indicate that we're done receiving the parent's
   // attributes' values?  If so, call its EndAttributes member function.
@@ -78,7 +78,7 @@
   }
 
   // Find a handler for this DIE.
-  DIEHandler *handler;
+  DIEHandler* handler;
   if (parent) {
     if (parent->handler_)
       // Ask the parent to find a handler.
@@ -113,9 +113,9 @@
   return handler != NULL;
 }
 
-void DIEDispatcher::EndDIE(uint64 offset) {
+void DIEDispatcher::EndDIE(uint64_t offset) {
   assert(!die_handlers_.empty());
-  HandlerStack *entry = &die_handlers_.top();
+  HandlerStack* entry = &die_handlers_.top();
   if (entry->handler_) {
     // This entry had better be the handler for this DIE.
     assert(entry->offset_ == offset);
@@ -135,62 +135,62 @@
   die_handlers_.pop();
 }
 
-void DIEDispatcher::ProcessAttributeUnsigned(uint64 offset,
+void DIEDispatcher::ProcessAttributeUnsigned(uint64_t offset,
                                              enum DwarfAttribute attr,
                                              enum DwarfForm form,
-                                             uint64 data) {
-  HandlerStack &current = die_handlers_.top();
+                                             uint64_t data) {
+  HandlerStack& current = die_handlers_.top();
   // This had better be an attribute of the DIE we were meant to handle.
   assert(offset == current.offset_);
   current.handler_->ProcessAttributeUnsigned(attr, form, data);
 }
 
-void DIEDispatcher::ProcessAttributeSigned(uint64 offset,
+void DIEDispatcher::ProcessAttributeSigned(uint64_t offset,
                                            enum DwarfAttribute attr,
                                            enum DwarfForm form,
-                                           int64 data) {
-  HandlerStack &current = die_handlers_.top();
+                                           int64_t data) {
+  HandlerStack& current = die_handlers_.top();
   // This had better be an attribute of the DIE we were meant to handle.
   assert(offset == current.offset_);
   current.handler_->ProcessAttributeSigned(attr, form, data);
 }
 
-void DIEDispatcher::ProcessAttributeReference(uint64 offset,
+void DIEDispatcher::ProcessAttributeReference(uint64_t offset,
                                               enum DwarfAttribute attr,
                                               enum DwarfForm form,
-                                              uint64 data) {
-  HandlerStack &current = die_handlers_.top();
+                                              uint64_t data) {
+  HandlerStack& current = die_handlers_.top();
   // This had better be an attribute of the DIE we were meant to handle.
   assert(offset == current.offset_);
   current.handler_->ProcessAttributeReference(attr, form, data);
 }
 
-void DIEDispatcher::ProcessAttributeBuffer(uint64 offset,
+void DIEDispatcher::ProcessAttributeBuffer(uint64_t offset,
                                            enum DwarfAttribute attr,
                                            enum DwarfForm form,
-                                           const uint8_t *data,
-                                           uint64 len) {
-  HandlerStack &current = die_handlers_.top();
+                                           const uint8_t* data,
+                                           uint64_t len) {
+  HandlerStack& current = die_handlers_.top();
   // This had better be an attribute of the DIE we were meant to handle.
   assert(offset == current.offset_);
   current.handler_->ProcessAttributeBuffer(attr, form, data, len);
 }
 
-void DIEDispatcher::ProcessAttributeString(uint64 offset,
+void DIEDispatcher::ProcessAttributeString(uint64_t offset,
                                            enum DwarfAttribute attr,
                                            enum DwarfForm form,
                                            const string& data) {
-  HandlerStack &current = die_handlers_.top();
+  HandlerStack& current = die_handlers_.top();
   // This had better be an attribute of the DIE we were meant to handle.
   assert(offset == current.offset_);
   current.handler_->ProcessAttributeString(attr, form, data);
 }
 
-void DIEDispatcher::ProcessAttributeSignature(uint64 offset,
+void DIEDispatcher::ProcessAttributeSignature(uint64_t offset,
                                               enum DwarfAttribute attr,
                                               enum DwarfForm form,
-                                              uint64 signature) {
-  HandlerStack &current = die_handlers_.top();
+                                              uint64_t signature) {
+  HandlerStack& current = die_handlers_.top();
   // This had better be an attribute of the DIE we were meant to handle.
   assert(offset == current.offset_);
   current.handler_->ProcessAttributeSignature(attr, form, signature);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler.h	2021-12-09 12:01:26.000000000 +0000
@@ -199,23 +199,23 @@
   // The default definitions ignore the values they are passed.
   virtual void ProcessAttributeUnsigned(enum DwarfAttribute attr,
                                         enum DwarfForm form,
-                                        uint64 data) { }
+                                        uint64_t data) { }
   virtual void ProcessAttributeSigned(enum DwarfAttribute attr,
                                       enum DwarfForm form,
-                                      int64 data) { }
+                                      int64_t data) { }
   virtual void ProcessAttributeReference(enum DwarfAttribute attr,
                                          enum DwarfForm form,
-                                         uint64 data) { }
+                                         uint64_t data) { }
   virtual void ProcessAttributeBuffer(enum DwarfAttribute attr,
                                       enum DwarfForm form,
-                                      const uint8_t *data,
-                                      uint64 len) { }
+                                      const uint8_t* data,
+                                      uint64_t len) { }
   virtual void ProcessAttributeString(enum DwarfAttribute attr,
                                       enum DwarfForm form,
                                       const string& data) { }
   virtual void ProcessAttributeSignature(enum DwarfAttribute attr,
                                          enum DwarfForm form,
-                                         uint64 signture) { }
+                                         uint64_t signture) { }
 
   // Once we have reported all the DIE's attributes' values, we call
   // this member function.  If it returns false, we skip all the DIE's
@@ -244,7 +244,7 @@
   // it is.
   //
   // The default definition skips all children.
-  virtual DIEHandler *FindChildHandler(uint64 offset, enum DwarfTag tag) {
+  virtual DIEHandler* FindChildHandler(uint64_t offset, enum DwarfTag tag) {
     return NULL;
   }
 
@@ -268,9 +268,9 @@
   // returns false.  So the root DIE handler is actually also
   // responsible for handling the compilation unit metadata.
   // The default definition always visits the compilation unit.
-  virtual bool StartCompilationUnit(uint64 offset, uint8 address_size,
-                                    uint8 offset_size, uint64 cu_length,
-                                    uint8 dwarf_version) { return true; }
+  virtual bool StartCompilationUnit(uint64_t offset, uint8_t address_size,
+                                    uint8_t offset_size, uint64_t cu_length,
+                                    uint8_t dwarf_version) { return true; }
 
   // For the root DIE handler only, we pass the offset, tag and
   // attributes of the compilation unit's root DIE.  This is the only
@@ -280,7 +280,7 @@
   // unit.
   //
   // The default definition elects to visit the root DIE.
-  virtual bool StartRootDIE(uint64 offset, enum DwarfTag tag) { return true; }
+  virtual bool StartRootDIE(uint64_t offset, enum DwarfTag tag) { return true; }
 };
 
 class DIEDispatcher: public Dwarf2Handler {
@@ -288,40 +288,40 @@
   // Create a Dwarf2Handler which uses ROOT_HANDLER as the handler for
   // the compilation unit's root die, as described for the DIEHandler
   // class.
-  DIEDispatcher(RootDIEHandler *root_handler) : root_handler_(root_handler) { }
+  DIEDispatcher(RootDIEHandler* root_handler) : root_handler_(root_handler) { }
   // Destroying a DIEDispatcher destroys all active handler objects
   // except the root handler.
   ~DIEDispatcher();
-  bool StartCompilationUnit(uint64 offset, uint8 address_size,
-                            uint8 offset_size, uint64 cu_length,
-                            uint8 dwarf_version);
-  bool StartDIE(uint64 offset, enum DwarfTag tag);
-  void ProcessAttributeUnsigned(uint64 offset,
+  bool StartCompilationUnit(uint64_t offset, uint8_t address_size,
+                            uint8_t offset_size, uint64_t cu_length,
+                            uint8_t dwarf_version);
+  bool StartDIE(uint64_t offset, enum DwarfTag tag);
+  void ProcessAttributeUnsigned(uint64_t offset,
                                 enum DwarfAttribute attr,
                                 enum DwarfForm form,
-                                uint64 data);
-  void ProcessAttributeSigned(uint64 offset,
+                                uint64_t data);
+  void ProcessAttributeSigned(uint64_t offset,
                               enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              int64 data);
-  void ProcessAttributeReference(uint64 offset,
+                              int64_t data);
+  void ProcessAttributeReference(uint64_t offset,
                                  enum DwarfAttribute attr,
                                  enum DwarfForm form,
-                                 uint64 data);
-  void ProcessAttributeBuffer(uint64 offset,
+                                 uint64_t data);
+  void ProcessAttributeBuffer(uint64_t offset,
                               enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              const uint8_t *data,
-                              uint64 len);
-  void ProcessAttributeString(uint64 offset,
+                              const uint8_t* data,
+                              uint64_t len);
+  void ProcessAttributeString(uint64_t offset,
                               enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              const string &data);
-  void ProcessAttributeSignature(uint64 offset,
+                              const string& data);
+  void ProcessAttributeSignature(uint64_t offset,
                                  enum DwarfAttribute attr,
                                  enum DwarfForm form,
-                                 uint64 signature);
-  void EndDIE(uint64 offset);
+                                 uint64_t signature);
+  void EndDIE(uint64_t offset);
 
  private:
 
@@ -331,11 +331,11 @@
   // makes it easier to see that the code is correct.
   struct HandlerStack {
     // The offset of the DIE for this handler stack entry.
-    uint64 offset_;
+    uint64_t offset_;
 
     // The handler object interested in this DIE's attributes and
     // children.  If NULL, we're not interested in either.
-    DIEHandler *handler_;
+    DIEHandler* handler_;
 
     // Have we reported the end of this DIE's attributes to the handler?
     bool reported_attributes_end_;
@@ -358,7 +358,7 @@
 
   // The root handler.  We don't push it on die_handlers_ until we
   // actually get the StartDIE call for the root.
-  RootDIEHandler *root_handler_;
+  RootDIEHandler* root_handler_;
 };
 
 } // namespace dwarf2reader
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -63,41 +63,42 @@
 class MockDIEHandler: public DIEHandler {
  public:
   MOCK_METHOD3(ProcessAttributeUnsigned,
-               void(DwarfAttribute, DwarfForm, uint64));
+               void(DwarfAttribute, DwarfForm, uint64_t));
   MOCK_METHOD3(ProcessAttributeSigned,
-               void(DwarfAttribute, DwarfForm, int64));
+               void(DwarfAttribute, DwarfForm, int64_t));
   MOCK_METHOD3(ProcessAttributeReference,
-               void(DwarfAttribute, DwarfForm, uint64));
+               void(DwarfAttribute, DwarfForm, uint64_t));
   MOCK_METHOD4(ProcessAttributeBuffer,
-               void(DwarfAttribute, DwarfForm, const uint8_t *, uint64));
+               void(DwarfAttribute, DwarfForm, const uint8_t*, uint64_t));
   MOCK_METHOD3(ProcessAttributeString,
-               void(DwarfAttribute, DwarfForm, const string &));
+               void(DwarfAttribute, DwarfForm, const string&));
   MOCK_METHOD3(ProcessAttributeSignature,
-               void(DwarfAttribute, DwarfForm, uint64));
+               void(DwarfAttribute, DwarfForm, uint64_t));
   MOCK_METHOD0(EndAttributes, bool());
-  MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64, DwarfTag));
+  MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64_t, DwarfTag));
   MOCK_METHOD0(Finish, void());
 };
 
 class MockRootDIEHandler: public RootDIEHandler {
  public:
   MOCK_METHOD3(ProcessAttributeUnsigned,
-               void(DwarfAttribute, DwarfForm, uint64));
+               void(DwarfAttribute, DwarfForm, uint64_t));
   MOCK_METHOD3(ProcessAttributeSigned,
-               void(DwarfAttribute, DwarfForm, int64));
+               void(DwarfAttribute, DwarfForm, int64_t));
   MOCK_METHOD3(ProcessAttributeReference,
-               void(DwarfAttribute, DwarfForm, uint64));
+               void(DwarfAttribute, DwarfForm, uint64_t));
   MOCK_METHOD4(ProcessAttributeBuffer,
-               void(DwarfAttribute, DwarfForm, const uint8_t *, uint64));
+               void(DwarfAttribute, DwarfForm, const uint8_t*, uint64_t));
   MOCK_METHOD3(ProcessAttributeString,
-               void(DwarfAttribute, DwarfForm, const string &));
+               void(DwarfAttribute, DwarfForm, const string&));
   MOCK_METHOD3(ProcessAttributeSignature,
-               void(DwarfAttribute, DwarfForm, uint64));
+               void(DwarfAttribute, DwarfForm, uint64_t));
   MOCK_METHOD0(EndAttributes, bool());
-  MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64, DwarfTag));
+  MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64_t, DwarfTag));
   MOCK_METHOD0(Finish, void());
-  MOCK_METHOD5(StartCompilationUnit, bool(uint64, uint8, uint8, uint64, uint8));
-  MOCK_METHOD2(StartRootDIE, bool(uint64, DwarfTag));
+  MOCK_METHOD5(StartCompilationUnit, bool(uint64_t, uint8_t, uint8_t, uint64_t,
+                                          uint8_t));
+  MOCK_METHOD2(StartRootDIE, bool(uint64_t, DwarfTag));
 };
 
 // If the handler elects to skip the compilation unit, the dispatcher
@@ -338,7 +339,7 @@
       EXPECT_CALL(mock_root_handler,
                   FindChildHandler(0x97412be24875de9dLL,
                                    (DwarfTag) 0x505a068b))
-        .WillOnce(Return((DIEHandler *) NULL));
+        .WillOnce(Return((DIEHandler*) NULL));
 
       // Third child DIE.
       EXPECT_CALL(mock_root_handler,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2enums.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2enums.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2enums.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2enums.h	2021-12-09 12:01:26.000000000 +0000
@@ -115,6 +115,16 @@
   DW_TAG_PGI_interface_block = 0xA020
 };
 
+enum DwarfUnitHeader {
+  DW_UT_compile = 0x01,
+  DW_UT_type = 0x02,
+  DW_UT_partial = 0x03,
+  DW_UT_skeleton = 0x04,
+  DW_UT_split_compile = 0x05,
+  DW_UT_split_type = 0x06,
+  DW_UT_lo_user = 0x80,
+  DW_UT_hi_user = 0xFF
+};
 
 enum DwarfHasChild {
   DW_children_no = 0,
@@ -149,7 +159,33 @@
   DW_FORM_sec_offset = 0x17,
   DW_FORM_exprloc = 0x18,
   DW_FORM_flag_present = 0x19,
+
+  // Added in DWARF 5:
+  DW_FORM_strx = 0x1a,
+  DW_FORM_addrx = 0x1b,
+  DW_FORM_ref_sup4 = 0x1c,
+  DW_FORM_strp_sup = 0x1d,
+  DW_FORM_data16 = 0x1e,
+  DW_FORM_line_strp = 0x1f,
+
+  // DWARF 4, but value out of order.
   DW_FORM_ref_sig8 = 0x20,
+
+  // Added in DWARF 5:
+  DW_FORM_implicit_const = 0x21,
+  DW_FORM_loclistx = 0x22,
+  DW_FORM_rnglistx = 0x23,
+  DW_FORM_ref_sup8 = 0x24,
+  DW_FORM_strx1 = 0x25,
+  DW_FORM_strx2 = 0x26,
+  DW_FORM_strx3 = 0x27,
+  DW_FORM_strx4 = 0x28,
+
+  DW_FORM_addrx1 = 0x29,
+  DW_FORM_addrx2 = 0x2a,
+  DW_FORM_addrx3 = 0x2b,
+  DW_FORM_addrx4 = 0x2c,
+
   // Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.
   DW_FORM_GNU_addr_index = 0x1f01,
   DW_FORM_GNU_str_index = 0x1f02
@@ -234,6 +270,9 @@
   DW_AT_call_line     = 0x59,
   // DWARF 4
   DW_AT_linkage_name  = 0x6e,
+  // DWARF 5
+  DW_AT_addr_base = 0x73,
+  DW_AT_rnglists_base = 0x74,
   // SGI/MIPS extensions.
   DW_AT_MIPS_fde = 0x2001,
   DW_AT_MIPS_loop_begin = 0x2002,
@@ -286,6 +325,26 @@
   DW_AT_PGI_lstride  = 0x3a02
 };
 
+// .debug_rngslist entry types
+enum DwarfRngListEntry {
+  DW_RLE_end_of_list = 0,
+  DW_RLE_base_addressx = 1,
+  DW_RLE_startx_endx = 2,
+  DW_RLE_startx_length = 3,
+  DW_RLE_offset_pair = 4,
+  DW_RLE_base_address = 5,
+  DW_RLE_start_end = 6,
+  DW_RLE_start_length = 7,
+};
+
+// Line number content type codes (DWARF 5).
+enum DwarfLineNumberContentType {
+  DW_LNCT_path = 1,
+  DW_LNCT_directory_index = 2,
+  DW_LNCT_timestamp = 3,
+  DW_LNCT_size = 4,
+  DW_LNCT_MD5 = 5,
+};
 
 // Line number opcodes.
 enum DwarfLineNumberOps {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader.cc	2021-12-09 12:01:26.000000000 +0000
@@ -33,7 +33,6 @@
 
 #include "common/dwarf/dwarf2reader.h"
 
-#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -50,15 +49,29 @@
 #include "common/dwarf/bytereader.h"
 #include "common/dwarf/line_state_machine.h"
 #include "common/using_std_string.h"
+#include "google_breakpad/common/breakpad_types.h"
 
 namespace dwarf2reader {
 
+const SectionMap::const_iterator GetSectionByName(const SectionMap&
+                                                  sections, const char *name) {
+  assert(name[0] == '.');
+  auto iter = sections.find(name);
+  if (iter != sections.end())
+    return iter;
+  std::string macho_name("__");
+  macho_name += name + 1;
+  iter = sections.find(macho_name);
+  return iter;
+}
+
 CompilationUnit::CompilationUnit(const string& path,
-                                 const SectionMap& sections, uint64 offset,
+                                 const SectionMap& sections, uint64_t offset,
                                  ByteReader* reader, Dwarf2Handler* handler)
     : path_(path), offset_from_section_start_(offset), reader_(reader),
       sections_(sections), handler_(handler), abbrevs_(),
       string_buffer_(NULL), string_buffer_length_(0),
+      line_string_buffer_(NULL), line_string_buffer_length_(0),
       str_offsets_buffer_(NULL), str_offsets_buffer_length_(0),
       addr_buffer_(NULL), addr_buffer_length_(0),
       is_split_dwarf_(false), dwo_id_(0), dwo_name_(),
@@ -74,10 +87,10 @@
 // processing the original compilation unit.
 
 void CompilationUnit::SetSplitDwarf(const uint8_t* addr_buffer,
-                                    uint64 addr_buffer_length,
-                                    uint64 addr_base,
-                                    uint64 ranges_base,
-                                    uint64 dwo_id) {
+                                    uint64_t addr_buffer_length,
+                                    uint64_t addr_base,
+                                    uint64_t ranges_base,
+                                    uint64_t dwo_id) {
   is_split_dwarf_ = true;
   addr_buffer_ = addr_buffer;
   addr_buffer_length_ = addr_buffer_length;
@@ -98,12 +111,9 @@
   if (abbrevs_)
     return;
 
-  // First get the debug_abbrev section.  ".debug_abbrev" is the name
-  // recommended in the DWARF spec, and used on Linux;
-  // "__debug_abbrev" is the name used in Mac OS X Mach-O files.
-  SectionMap::const_iterator iter = sections_.find(".debug_abbrev");
-  if (iter == sections_.end())
-    iter = sections_.find("__debug_abbrev");
+  // First get the debug_abbrev section.
+  SectionMap::const_iterator iter =
+      GetSectionByName(sections_, ".debug_abbrev");
   assert(iter != sections_.end());
 
   abbrevs_ = new std::vector<Abbrev>;
@@ -112,17 +122,17 @@
   // The only way to check whether we are reading over the end of the
   // buffer would be to first compute the size of the leb128 data by
   // reading it, then go back and read it again.
-  const uint8_t *abbrev_start = iter->second.first +
+  const uint8_t* abbrev_start = iter->second.first +
                                       header_.abbrev_offset;
-  const uint8_t *abbrevptr = abbrev_start;
+  const uint8_t* abbrevptr = abbrev_start;
 #ifndef NDEBUG
-  const uint64 abbrev_length = iter->second.second - header_.abbrev_offset;
+  const uint64_t abbrev_length = iter->second.second - header_.abbrev_offset;
 #endif
 
   while (1) {
     CompilationUnit::Abbrev abbrev;
     size_t len;
-    const uint64 number = reader_->ReadUnsignedLEB128(abbrevptr, &len);
+    const uint64_t number = reader_->ReadUnsignedLEB128(abbrevptr, &len);
 
     if (number == 0)
       break;
@@ -130,7 +140,7 @@
     abbrevptr += len;
 
     assert(abbrevptr < abbrev_start + abbrev_length);
-    const uint64 tag = reader_->ReadUnsignedLEB128(abbrevptr, &len);
+    const uint64_t tag = reader_->ReadUnsignedLEB128(abbrevptr, &len);
     abbrevptr += len;
     abbrev.tag = static_cast<enum DwarfTag>(tag);
 
@@ -141,19 +151,24 @@
     assert(abbrevptr < abbrev_start + abbrev_length);
 
     while (1) {
-      const uint64 nametemp = reader_->ReadUnsignedLEB128(abbrevptr, &len);
+      const uint64_t nametemp = reader_->ReadUnsignedLEB128(abbrevptr, &len);
       abbrevptr += len;
 
       assert(abbrevptr < abbrev_start + abbrev_length);
-      const uint64 formtemp = reader_->ReadUnsignedLEB128(abbrevptr, &len);
+      const uint64_t formtemp = reader_->ReadUnsignedLEB128(abbrevptr, &len);
       abbrevptr += len;
       if (nametemp == 0 && formtemp == 0)
         break;
 
-      const enum DwarfAttribute name =
-        static_cast<enum DwarfAttribute>(nametemp);
-      const enum DwarfForm form = static_cast<enum DwarfForm>(formtemp);
-      abbrev.attributes.push_back(std::make_pair(name, form));
+      uint64_t value = 0;
+      if (formtemp == DW_FORM_implicit_const) {
+        value = reader_->ReadUnsignedLEB128(abbrevptr, &len);
+        abbrevptr += len;
+      }
+      AttrForm abbrev_attr(static_cast<enum DwarfAttribute>(nametemp),
+                           static_cast<enum DwarfForm>(formtemp),
+                           value);
+      abbrev.attributes.push_back(abbrev_attr);
     }
     assert(abbrev.number == abbrevs_->size());
     abbrevs_->push_back(abbrev);
@@ -161,18 +176,18 @@
 }
 
 // Skips a single DIE's attributes.
-const uint8_t *CompilationUnit::SkipDIE(const uint8_t* start,
+const uint8_t* CompilationUnit::SkipDIE(const uint8_t* start,
                                         const Abbrev& abbrev) {
   for (AttributeList::const_iterator i = abbrev.attributes.begin();
        i != abbrev.attributes.end();
        i++)  {
-    start = SkipAttribute(start, i->second);
+    start = SkipAttribute(start, i->form_);
   }
   return start;
 }
 
 // Skips a single attribute form's data.
-const uint8_t *CompilationUnit::SkipAttribute(const uint8_t *start,
+const uint8_t* CompilationUnit::SkipAttribute(const uint8_t* start,
                                               enum DwarfForm form) {
   size_t len;
 
@@ -184,27 +199,45 @@
       return SkipAttribute(start, form);
 
     case DW_FORM_flag_present:
+    case DW_FORM_implicit_const:
       return start;
+    case DW_FORM_addrx1:
     case DW_FORM_data1:
     case DW_FORM_flag:
     case DW_FORM_ref1:
+    case DW_FORM_strx1:
       return start + 1;
+    case DW_FORM_addrx2:
     case DW_FORM_ref2:
     case DW_FORM_data2:
+    case DW_FORM_strx2:
       return start + 2;
+    case DW_FORM_addrx3:
+    case DW_FORM_strx3:
+      return start + 3;
+    case DW_FORM_addrx4:
     case DW_FORM_ref4:
     case DW_FORM_data4:
+    case DW_FORM_strx4:
+    case DW_FORM_ref_sup4:
       return start + 4;
     case DW_FORM_ref8:
     case DW_FORM_data8:
     case DW_FORM_ref_sig8:
+    case DW_FORM_ref_sup8:
       return start + 8;
+    case DW_FORM_data16:
+      return start + 16;
     case DW_FORM_string:
-      return start + strlen(reinterpret_cast<const char *>(start)) + 1;
+      return start + strlen(reinterpret_cast<const char*>(start)) + 1;
     case DW_FORM_udata:
     case DW_FORM_ref_udata:
+    case DW_FORM_strx:
     case DW_FORM_GNU_str_index:
     case DW_FORM_GNU_addr_index:
+    case DW_FORM_addrx:
+    case DW_FORM_rnglistx:
+    case DW_FORM_loclistx:
       reader_->ReadUnsignedLEB128(start, &len);
       return start + len;
 
@@ -232,10 +265,12 @@
       return start + 4 + reader_->ReadFourBytes(start);
     case DW_FORM_block:
     case DW_FORM_exprloc: {
-      uint64 size = reader_->ReadUnsignedLEB128(start, &len);
+      uint64_t size = reader_->ReadUnsignedLEB128(start, &len);
       return start + size + len;
     }
     case DW_FORM_strp:
+    case DW_FORM_line_strp:
+    case DW_FORM_strp_sup:
     case DW_FORM_sec_offset:
       return start + reader_->OffsetSize();
   }
@@ -243,17 +278,56 @@
   return NULL;
 }
 
-// Read a DWARF2/3 header.
-// The header is variable length in DWARF3 (and DWARF2 as extended by
-// most compilers), and consists of an length field, a version number,
-// the offset in the .debug_abbrev section for our abbrevs, and an
-// address size.
+// Read the abbreviation offset from a compilation unit header.
+size_t CompilationUnit::ReadAbbrevOffset(const uint8_t* headerptr) {
+  assert(headerptr + reader_->OffsetSize() < buffer_ + buffer_length_);
+  header_.abbrev_offset = reader_->ReadOffset(headerptr);
+  return reader_->OffsetSize();
+}
+
+// Read the address size from a compilation unit header.
+size_t CompilationUnit::ReadAddressSize(const uint8_t* headerptr) {
+  // Compare against less than or equal because this may be the last
+  // section in the file.
+  assert(headerptr + 1 <= buffer_ + buffer_length_);
+  header_.address_size = reader_->ReadOneByte(headerptr);
+  reader_->SetAddressSize(header_.address_size);
+  return 1;
+}
+
+// Read the DWO id from a split or skeleton compilation unit header.
+size_t CompilationUnit::ReadDwoId(const uint8_t* headerptr) {
+  assert(headerptr + 8 <= buffer_ + buffer_length_);
+  dwo_id_ = reader_->ReadEightBytes(headerptr);
+  return 8;
+}
+
+// Read the type signature from a type or split type compilation unit header.
+size_t CompilationUnit::ReadTypeSignature(const uint8_t* headerptr) {
+  assert(headerptr + 8 <= buffer_ + buffer_length_);
+  type_signature_ = reader_->ReadEightBytes(headerptr);
+  return 8;
+}
+
+// Read the DWO id from a split or skeleton compilation unit header.
+size_t CompilationUnit::ReadTypeOffset(const uint8_t* headerptr) {
+  assert(headerptr + reader_->OffsetSize() < buffer_ + buffer_length_);
+  type_offset_ = reader_->ReadOffset(headerptr);
+  return reader_->OffsetSize();
+}
+
+
+// Read a DWARF header.  The header is variable length in DWARF3 and DWARF4
+// (and DWARF2 as extended by most compilers), and consists of an length
+// field, a version number, the offset in the .debug_abbrev section for our
+// abbrevs, and an address size. DWARF5 adds a unit_type to distinguish
+// between partial-, full-, skeleton-, split-, and type- compilation units.
 void CompilationUnit::ReadHeader() {
-  const uint8_t *headerptr = buffer_;
+  const uint8_t* headerptr = buffer_;
   size_t initial_length_size;
 
   assert(headerptr + 4 < buffer_ + buffer_length_);
-  const uint64 initial_length
+  const uint64_t initial_length
     = reader_->ReadInitialLength(headerptr, &initial_length_size);
   headerptr += initial_length_size;
   header_.length = initial_length;
@@ -262,17 +336,36 @@
   header_.version = reader_->ReadTwoBytes(headerptr);
   headerptr += 2;
 
-  assert(headerptr + reader_->OffsetSize() < buffer_ + buffer_length_);
-  header_.abbrev_offset = reader_->ReadOffset(headerptr);
-  headerptr += reader_->OffsetSize();
-
-  // Compare against less than or equal because this may be the last
-  // section in the file.
-  assert(headerptr + 1 <= buffer_ + buffer_length_);
-  header_.address_size = reader_->ReadOneByte(headerptr);
-  reader_->SetAddressSize(header_.address_size);
-  headerptr += 1;
-
+  if (header_.version <= 4) {
+    // Older versions of dwarf have a relatively simple structure.
+    headerptr += ReadAbbrevOffset(headerptr);
+    headerptr += ReadAddressSize(headerptr);
+  } else {
+    // DWARF5 adds a unit_type field, and various fields based on unit_type.
+    assert(headerptr + 1 < buffer_ + buffer_length_);
+    uint8_t unit_type = reader_->ReadOneByte(headerptr);
+    headerptr += 1;
+    headerptr += ReadAddressSize(headerptr);
+    headerptr += ReadAbbrevOffset(headerptr);
+    switch (unit_type) {
+      case DW_UT_compile:
+      case DW_UT_partial:
+        // nothing else to read
+        break;
+      case DW_UT_skeleton:
+      case DW_UT_split_compile:
+        headerptr += ReadDwoId(headerptr);
+        break;
+      case DW_UT_type:
+      case DW_UT_split_type:
+        headerptr += ReadTypeSignature(headerptr);
+        headerptr += ReadTypeOffset(headerptr);
+        break;
+      default:
+        fprintf(stderr, "Unhandled compilation unit type 0x%x", unit_type);
+        break;
+    }
+  }
   after_header_ = headerptr;
 
   // This check ensures that we don't have to do checking during the
@@ -282,13 +375,10 @@
         buffer_ + buffer_length_);
 }
 
-uint64 CompilationUnit::Start() {
-  // First get the debug_info section.  ".debug_info" is the name
-  // recommended in the DWARF spec, and used on Linux; "__debug_info"
-  // is the name used in Mac OS X Mach-O files.
-  SectionMap::const_iterator iter = sections_.find(".debug_info");
-  if (iter == sections_.end())
-    iter = sections_.find("__debug_info");
+uint64_t CompilationUnit::Start() {
+  // First get the debug_info section.
+  SectionMap::const_iterator iter =
+      GetSectionByName(sections_, ".debug_info");
   assert(iter != sections_.end());
 
   // Set up our buffer
@@ -301,7 +391,7 @@
   // Figure out the real length from the end of the initial length to
   // the end of the compilation unit, since that is the value we
   // return.
-  uint64 ourlength = header_.length;
+  uint64_t ourlength = header_.length;
   if (reader_->OffsetSize() == 8)
     ourlength += 12;
   else
@@ -318,26 +408,29 @@
   // Otherwise, continue by reading our abbreviation entries.
   ReadAbbrevs();
 
-  // Set the string section if we have one.  ".debug_str" is the name
-  // recommended in the DWARF spec, and used on Linux; "__debug_str"
-  // is the name used in Mac OS X Mach-O files.
-  iter = sections_.find(".debug_str");
-  if (iter == sections_.end())
-    iter = sections_.find("__debug_str");
+  // Set the string section if we have one.
+  iter = GetSectionByName(sections_, ".debug_str");
   if (iter != sections_.end()) {
     string_buffer_ = iter->second.first;
     string_buffer_length_ = iter->second.second;
   }
 
+  // Set the line string section if we have one.
+  iter = GetSectionByName(sections_, ".debug_line_str");
+  if (iter != sections_.end()) {
+    line_string_buffer_ = iter->second.first;
+    line_string_buffer_length_ = iter->second.second;
+  }
+
   // Set the string offsets section if we have one.
-  iter = sections_.find(".debug_str_offsets");
+  iter = GetSectionByName(sections_, ".debug_str_offsets");
   if (iter != sections_.end()) {
     str_offsets_buffer_ = iter->second.first;
     str_offsets_buffer_length_ = iter->second.second;
   }
 
   // Set the address section if we have one.
-  iter = sections_.find(".debug_addr");
+  iter = GetSectionByName(sections_, ".debug_addr");
   if (iter != sections_.end()) {
     addr_buffer_ = iter->second.first;
     addr_buffer_length_ = iter->second.second;
@@ -357,12 +450,26 @@
   return ourlength;
 }
 
+void CompilationUnit::ProcessFormStringIndex(
+    uint64_t dieoffset, enum DwarfAttribute attr, enum DwarfForm form,
+    uint64_t str_index) {
+  const uint8_t* offset_ptr =
+      str_offsets_buffer_ + str_index * reader_->OffsetSize();
+  const uint64_t offset = reader_->ReadOffset(offset_ptr);
+  if (offset >= string_buffer_length_) {
+    return;
+  }
+
+  const char* str = reinterpret_cast<const char*>(string_buffer_) + offset;
+  ProcessAttributeString(dieoffset, attr, form, str);
+}
+
 // If one really wanted, you could merge SkipAttribute and
 // ProcessAttribute
 // This is all boring data manipulation and calling of the handler.
-const uint8_t *CompilationUnit::ProcessAttribute(
-    uint64 dieoffset, const uint8_t *start, enum DwarfAttribute attr,
-    enum DwarfForm form) {
+const uint8_t* CompilationUnit::ProcessAttribute(
+    uint64_t dieoffset, const uint8_t* start, enum DwarfAttribute attr,
+    enum DwarfForm form, uint64_t implicit_const) {
   size_t len;
 
   switch (form) {
@@ -372,7 +479,7 @@
       form = static_cast<enum DwarfForm>(reader_->ReadUnsignedLEB128(start,
                                                                      &len));
       start += len;
-      return ProcessAttribute(dieoffset, start, attr, form);
+      return ProcessAttribute(dieoffset, start, attr, form, implicit_const);
 
     case DW_FORM_flag_present:
       ProcessAttributeUnsigned(dieoffset, attr, form, 1);
@@ -394,8 +501,12 @@
       ProcessAttributeUnsigned(dieoffset, attr, form,
                                reader_->ReadEightBytes(start));
       return start + 8;
+    case DW_FORM_data16:
+      // This form is designed for an md5 checksum inside line tables.
+      fprintf(stderr, "Unhandled form type: DW_FORM_data16\n");
+      return start + 16;
     case DW_FORM_string: {
-      const char *str = reinterpret_cast<const char *>(start);
+      const char* str = reinterpret_cast<const char*>(start);
       ProcessAttributeString(dieoffset, attr, form, str);
       return start + strlen(str) + 1;
     }
@@ -461,28 +572,31 @@
       handler_->ProcessAttributeSignature(dieoffset, attr, form,
                                           reader_->ReadEightBytes(start));
       return start + 8;
-
+    case DW_FORM_implicit_const:
+      handler_->ProcessAttributeUnsigned(dieoffset, attr, form,
+                                         implicit_const);
+      return start;
     case DW_FORM_block1: {
-      uint64 datalen = reader_->ReadOneByte(start);
+      uint64_t datalen = reader_->ReadOneByte(start);
       handler_->ProcessAttributeBuffer(dieoffset, attr, form, start + 1,
                                        datalen);
       return start + 1 + datalen;
     }
     case DW_FORM_block2: {
-      uint64 datalen = reader_->ReadTwoBytes(start);
+      uint64_t datalen = reader_->ReadTwoBytes(start);
       handler_->ProcessAttributeBuffer(dieoffset, attr, form, start + 2,
                                        datalen);
       return start + 2 + datalen;
     }
     case DW_FORM_block4: {
-      uint64 datalen = reader_->ReadFourBytes(start);
+      uint64_t datalen = reader_->ReadFourBytes(start);
       handler_->ProcessAttributeBuffer(dieoffset, attr, form, start + 4,
                                        datalen);
       return start + 4 + datalen;
     }
     case DW_FORM_block:
     case DW_FORM_exprloc: {
-      uint64 datalen = reader_->ReadUnsignedLEB128(start, &len);
+      uint64_t datalen = reader_->ReadUnsignedLEB128(start, &len);
       handler_->ProcessAttributeBuffer(dieoffset, attr, form, start + len,
                                        datalen);
       return start + datalen + len;
@@ -490,48 +604,105 @@
     case DW_FORM_strp: {
       assert(string_buffer_ != NULL);
 
-      const uint64 offset = reader_->ReadOffset(start);
+      const uint64_t offset = reader_->ReadOffset(start);
       assert(string_buffer_ + offset < string_buffer_ + string_buffer_length_);
 
-      const char *str = reinterpret_cast<const char *>(string_buffer_ + offset);
+      const char* str = reinterpret_cast<const char*>(string_buffer_ + offset);
       ProcessAttributeString(dieoffset, attr, form, str);
       return start + reader_->OffsetSize();
     }
+    case DW_FORM_line_strp: {
+      assert(line_string_buffer_ != NULL);
 
-    case DW_FORM_GNU_str_index: {
-      uint64 str_index = reader_->ReadUnsignedLEB128(start, &len);
-      const uint8_t* offset_ptr =
-          str_offsets_buffer_ + str_index * reader_->OffsetSize();
-      const uint64 offset = reader_->ReadOffset(offset_ptr);
-      if (offset >= string_buffer_length_) {
-        return NULL;
-      }
+      const uint64_t offset = reader_->ReadOffset(start);
+      assert(line_string_buffer_ + offset <
+             line_string_buffer_ + line_string_buffer_length_);
 
-      const char* str = reinterpret_cast<const char *>(string_buffer_) + offset;
+      const char* str =
+          reinterpret_cast<const char*>(line_string_buffer_ + offset);
       ProcessAttributeString(dieoffset, attr, form, str);
-      return start + len;
-      break;
+      return start + reader_->OffsetSize();
     }
-    case DW_FORM_GNU_addr_index: {
-      uint64 addr_index = reader_->ReadUnsignedLEB128(start, &len);
-      const uint8_t* addr_ptr =
-          addr_buffer_ + addr_base_ + addr_index * reader_->AddressSize();
+    case DW_FORM_strp_sup:
+      // No support currently for suplementary object files.
+      fprintf(stderr, "Unhandled form type: DW_FORM_strp_sup\n");
+      return start + 4;
+    case DW_FORM_ref_sup4:
+      // No support currently for suplementary object files.
+      fprintf(stderr, "Unhandled form type: DW_FORM_ref_sup4\n");
+      return start + 4;
+    case DW_FORM_ref_sup8:
+      // No support currently for suplementary object files.
+      fprintf(stderr, "Unhandled form type: DW_FORM_ref_sup8\n");
+      return start + 8;
+    case DW_FORM_loclistx:
       ProcessAttributeUnsigned(dieoffset, attr, form,
-                               reader_->ReadAddress(addr_ptr));
+                               reader_->ReadUnsignedLEB128(start, &len));
+      return start + len;
+    case DW_FORM_strx:
+    case DW_FORM_GNU_str_index: {
+      uint64_t str_index = reader_->ReadUnsignedLEB128(start, &len);
+      ProcessFormStringIndex(dieoffset, attr, form, str_index);
       return start + len;
     }
+    case DW_FORM_strx1: {
+      uint64_t str_index = reader_->ReadOneByte(start);
+      ProcessFormStringIndex(dieoffset, attr, form, str_index);
+      return start + 1;
+    }
+    case DW_FORM_strx2: {
+      uint64_t str_index = reader_->ReadTwoBytes(start);
+      ProcessFormStringIndex(dieoffset, attr, form, str_index);
+      return start + 2;
+    }
+    case DW_FORM_strx3: {
+      uint64_t str_index = reader_->ReadThreeBytes(start);
+      ProcessFormStringIndex(dieoffset, attr, form, str_index);
+      return start + 3;
+    }
+    case DW_FORM_strx4: {
+      uint64_t str_index = reader_->ReadFourBytes(start);
+      ProcessFormStringIndex(dieoffset, attr, form, str_index);
+      return start + 4;
+    }
+
+    case DW_FORM_addrx:
+    case DW_FORM_GNU_addr_index:
+      ProcessAttributeAddrIndex(
+          dieoffset, attr, form, reader_->ReadUnsignedLEB128(start, &len));
+      return start + len;
+    case DW_FORM_addrx1:
+      ProcessAttributeAddrIndex(
+          dieoffset, attr, form, reader_->ReadOneByte(start));
+      return start + 1;
+    case DW_FORM_addrx2:
+      ProcessAttributeAddrIndex(
+          dieoffset, attr, form, reader_->ReadTwoBytes(start));
+      return start + 2;
+    case DW_FORM_addrx3:
+      ProcessAttributeAddrIndex(
+          dieoffset, attr, form, reader_->ReadThreeBytes(start));
+      return start + 3;
+    case DW_FORM_addrx4:
+      ProcessAttributeAddrIndex(
+          dieoffset, attr, form, reader_->ReadFourBytes(start));
+      return start + 4;
+    case DW_FORM_rnglistx:
+      ProcessAttributeUnsigned(
+          dieoffset, attr, form, reader_->ReadUnsignedLEB128(start, &len));
+      return start + len;
   }
   fprintf(stderr, "Unhandled form type\n");
   return NULL;
 }
 
-const uint8_t *CompilationUnit::ProcessDIE(uint64 dieoffset,
-                                           const uint8_t *start,
+const uint8_t* CompilationUnit::ProcessDIE(uint64_t dieoffset,
+                                           const uint8_t* start,
                                            const Abbrev& abbrev) {
   for (AttributeList::const_iterator i = abbrev.attributes.begin();
        i != abbrev.attributes.end();
        i++)  {
-    start = ProcessAttribute(dieoffset, start, i->first, i->second);
+    start = ProcessAttribute(dieoffset, start, i->attr_, i->form_, i->value_);
   }
 
   // If this is a compilation unit in a split DWARF object, verify that
@@ -547,12 +718,12 @@
 }
 
 void CompilationUnit::ProcessDIEs() {
-  const uint8_t *dieptr = after_header_;
+  const uint8_t* dieptr = after_header_;
   size_t len;
 
   // lengthstart is the place the length field is based on.
   // It is the point in the header after the initial length field
-  const uint8_t *lengthstart = buffer_;
+  const uint8_t* lengthstart = buffer_;
 
   // In 64 bit dwarf, the initial length is 12 bytes, because of the
   // 0xffffffff at the start.
@@ -561,14 +732,14 @@
   else
     lengthstart += 4;
 
-  std::stack<uint64> die_stack;
+  std::stack<uint64_t> die_stack;
   
   while (dieptr < (lengthstart + header_.length)) {
     // We give the user the absolute offset from the beginning of
     // debug_info, since they need it to deal with ref_addr forms.
-    uint64 absolute_offset = (dieptr - buffer_) + offset_from_section_start_;
+    uint64_t absolute_offset = (dieptr - buffer_) + offset_from_section_start_;
 
-    uint64 abbrev_num = reader_->ReadUnsignedLEB128(dieptr, &len);
+    uint64_t abbrev_num = reader_->ReadUnsignedLEB128(dieptr, &len);
 
     dieptr += len;
 
@@ -578,7 +749,7 @@
       if (die_stack.size() == 0)
         // If it is padding, then we are done with the compilation unit's DIEs.
         return;
-      const uint64 offset = die_stack.top();
+      const uint64_t offset = die_stack.top();
       die_stack.pop();
       handler_->EndDIE(offset);
       continue;
@@ -690,7 +861,7 @@
     if (section_data != NULL)
       sections->insert(std::make_pair(
           base_name, std::make_pair(
-             reinterpret_cast<const uint8_t *>(section_data),
+             reinterpret_cast<const uint8_t*>(section_data),
              section_size)));
   }
 }
@@ -719,29 +890,29 @@
                                                  &string_buffer_size_);
 
   version_ = byte_reader_.ReadFourBytes(
-      reinterpret_cast<const uint8_t *>(cu_index_));
+      reinterpret_cast<const uint8_t*>(cu_index_));
 
   if (version_ == 1) {
     nslots_ = byte_reader_.ReadFourBytes(
-        reinterpret_cast<const uint8_t *>(cu_index_)
-        + 3 * sizeof(uint32));
-    phash_ = cu_index_ + 4 * sizeof(uint32);
-    pindex_ = phash_ + nslots_ * sizeof(uint64);
-    shndx_pool_ = pindex_ + nslots_ * sizeof(uint32);
+        reinterpret_cast<const uint8_t*>(cu_index_)
+        + 3 * sizeof(uint32_t));
+    phash_ = cu_index_ + 4 * sizeof(uint32_t);
+    pindex_ = phash_ + nslots_ * sizeof(uint64_t);
+    shndx_pool_ = pindex_ + nslots_ * sizeof(uint32_t);
     if (shndx_pool_ >= cu_index_ + cu_index_size_) {
       version_ = 0;
     }
   } else if (version_ == 2) {
     ncolumns_ = byte_reader_.ReadFourBytes(
-        reinterpret_cast<const uint8_t *>(cu_index_) + sizeof(uint32));
+        reinterpret_cast<const uint8_t*>(cu_index_) + sizeof(uint32_t));
     nunits_ = byte_reader_.ReadFourBytes(
-        reinterpret_cast<const uint8_t *>(cu_index_) + 2 * sizeof(uint32));
+        reinterpret_cast<const uint8_t*>(cu_index_) + 2 * sizeof(uint32_t));
     nslots_ = byte_reader_.ReadFourBytes(
-        reinterpret_cast<const uint8_t *>(cu_index_) + 3 * sizeof(uint32));
-    phash_ = cu_index_ + 4 * sizeof(uint32);
-    pindex_ = phash_ + nslots_ * sizeof(uint64);
-    offset_table_ = pindex_ + nslots_ * sizeof(uint32);
-    size_table_ = offset_table_ + ncolumns_ * (nunits_ + 1) * sizeof(uint32);
+        reinterpret_cast<const uint8_t*>(cu_index_) + 3 * sizeof(uint32_t));
+    phash_ = cu_index_ + 4 * sizeof(uint32_t);
+    pindex_ = phash_ + nslots_ * sizeof(uint64_t);
+    offset_table_ = pindex_ + nslots_ * sizeof(uint32_t);
+    size_table_ = offset_table_ + ncolumns_ * (nunits_ + 1) * sizeof(uint32_t);
     abbrev_data_ = elf_reader_->GetSectionByName(".debug_abbrev.dwo",
                                                  &abbrev_size_);
     info_data_ = elf_reader_->GetSectionByName(".debug_info.dwo", &info_size_);
@@ -753,7 +924,7 @@
   }
 }
 
-void DwpReader::ReadDebugSectionsForCU(uint64 dwo_id,
+void DwpReader::ReadDebugSectionsForCU(uint64_t dwo_id,
                                        SectionMap* sections) {
   if (version_ == 1) {
     int slot = LookupCU(dwo_id);
@@ -765,17 +936,17 @@
     // can read a list of section indexes for the debug sections
     // for the CU whose dwo_id we are looking for.
     int index = byte_reader_.ReadFourBytes(
-        reinterpret_cast<const uint8_t *>(pindex_)
-        + slot * sizeof(uint32));
-    const char* shndx_list = shndx_pool_ + index * sizeof(uint32);
+        reinterpret_cast<const uint8_t*>(pindex_)
+        + slot * sizeof(uint32_t));
+    const char* shndx_list = shndx_pool_ + index * sizeof(uint32_t);
     for (;;) {
       if (shndx_list >= cu_index_ + cu_index_size_) {
         version_ = 0;
         return;
       }
       unsigned int shndx = byte_reader_.ReadFourBytes(
-          reinterpret_cast<const uint8_t *>(shndx_list));
-      shndx_list += sizeof(uint32);
+          reinterpret_cast<const uint8_t*>(shndx_list));
+      shndx_list += sizeof(uint32_t);
       if (shndx == 0)
         break;
       const char* section_name = elf_reader_->GetSectionName(shndx);
@@ -788,29 +959,29 @@
         section_data = elf_reader_->GetSectionByIndex(shndx, &section_size);
         sections->insert(std::make_pair(
             ".debug_abbrev",
-            std::make_pair(reinterpret_cast<const uint8_t *> (section_data),
+            std::make_pair(reinterpret_cast<const uint8_t*> (section_data),
                                                               section_size)));
       } else if (!strncmp(section_name, ".debug_info", strlen(".debug_info"))) {
         section_data = elf_reader_->GetSectionByIndex(shndx, &section_size);
         sections->insert(std::make_pair(
             ".debug_info",
-            std::make_pair(reinterpret_cast<const uint8_t *> (section_data),
+            std::make_pair(reinterpret_cast<const uint8_t*> (section_data),
                            section_size)));
       } else if (!strncmp(section_name, ".debug_str_offsets",
                           strlen(".debug_str_offsets"))) {
         section_data = elf_reader_->GetSectionByIndex(shndx, &section_size);
         sections->insert(std::make_pair(
             ".debug_str_offsets",
-            std::make_pair(reinterpret_cast<const uint8_t *> (section_data),
+            std::make_pair(reinterpret_cast<const uint8_t*> (section_data),
                            section_size)));
       }
     }
     sections->insert(std::make_pair(
         ".debug_str",
-        std::make_pair(reinterpret_cast<const uint8_t *> (string_buffer_),
+        std::make_pair(reinterpret_cast<const uint8_t*> (string_buffer_),
                        string_buffer_size_)));
   } else if (version_ == 2) {
-    uint32 index = LookupCUv2(dwo_id);
+    uint32_t index = LookupCUv2(dwo_id);
     if (index == 0) {
       return;
     }
@@ -823,57 +994,57 @@
     // with row 1.
     const char* id_row = offset_table_;
     const char* offset_row = offset_table_
-                             + index * ncolumns_ * sizeof(uint32);
+                             + index * ncolumns_ * sizeof(uint32_t);
     const char* size_row =
-        size_table_ + (index - 1) * ncolumns_ * sizeof(uint32);
-    if (size_row + ncolumns_ * sizeof(uint32) > cu_index_ + cu_index_size_) {
+        size_table_ + (index - 1) * ncolumns_ * sizeof(uint32_t);
+    if (size_row + ncolumns_ * sizeof(uint32_t) > cu_index_ + cu_index_size_) {
       version_ = 0;
       return;
     }
     for (unsigned int col = 0u; col < ncolumns_; ++col) {
-      uint32 section_id =
-          byte_reader_.ReadFourBytes(reinterpret_cast<const uint8_t *>(id_row)
-                                     + col * sizeof(uint32));
-      uint32 offset = byte_reader_.ReadFourBytes(
-          reinterpret_cast<const uint8_t *>(offset_row)
-          + col * sizeof(uint32));
-      uint32 size = byte_reader_.ReadFourBytes(
-          reinterpret_cast<const uint8_t *>(size_row) + col * sizeof(uint32));
+      uint32_t section_id =
+          byte_reader_.ReadFourBytes(reinterpret_cast<const uint8_t*>(id_row)
+                                     + col * sizeof(uint32_t));
+      uint32_t offset = byte_reader_.ReadFourBytes(
+          reinterpret_cast<const uint8_t*>(offset_row)
+          + col * sizeof(uint32_t));
+      uint32_t size = byte_reader_.ReadFourBytes(
+          reinterpret_cast<const uint8_t*>(size_row) + col * sizeof(uint32_t));
       if (section_id == DW_SECT_ABBREV) {
         sections->insert(std::make_pair(
             ".debug_abbrev",
-            std::make_pair(reinterpret_cast<const uint8_t *> (abbrev_data_)
+            std::make_pair(reinterpret_cast<const uint8_t*> (abbrev_data_)
                            + offset, size)));
       } else if (section_id == DW_SECT_INFO) {
         sections->insert(std::make_pair(
             ".debug_info",
-            std::make_pair(reinterpret_cast<const uint8_t *> (info_data_)
+            std::make_pair(reinterpret_cast<const uint8_t*> (info_data_)
                            + offset, size)));
       } else if (section_id == DW_SECT_STR_OFFSETS) {
         sections->insert(std::make_pair(
             ".debug_str_offsets",
-            std::make_pair(reinterpret_cast<const uint8_t *> (str_offsets_data_)
+            std::make_pair(reinterpret_cast<const uint8_t*> (str_offsets_data_)
                            + offset, size)));
       }
     }
     sections->insert(std::make_pair(
         ".debug_str",
-        std::make_pair(reinterpret_cast<const uint8_t *> (string_buffer_),
+        std::make_pair(reinterpret_cast<const uint8_t*> (string_buffer_),
                        string_buffer_size_)));
   }
 }
 
-int DwpReader::LookupCU(uint64 dwo_id) {
-  uint32 slot = static_cast<uint32>(dwo_id) & (nslots_ - 1);
-  uint64 probe = byte_reader_.ReadEightBytes(
-      reinterpret_cast<const uint8_t *>(phash_) + slot * sizeof(uint64));
+int DwpReader::LookupCU(uint64_t dwo_id) {
+  uint32_t slot = static_cast<uint32_t>(dwo_id) & (nslots_ - 1);
+  uint64_t probe = byte_reader_.ReadEightBytes(
+      reinterpret_cast<const uint8_t*>(phash_) + slot * sizeof(uint64_t));
   if (probe != 0 && probe != dwo_id) {
-    uint32 secondary_hash =
-        (static_cast<uint32>(dwo_id >> 32) & (nslots_ - 1)) | 1;
+    uint32_t secondary_hash =
+        (static_cast<uint32_t>(dwo_id >> 32) & (nslots_ - 1)) | 1;
     do {
       slot = (slot + secondary_hash) & (nslots_ - 1);
       probe = byte_reader_.ReadEightBytes(
-          reinterpret_cast<const uint8_t *>(phash_) + slot * sizeof(uint64));
+          reinterpret_cast<const uint8_t*>(phash_) + slot * sizeof(uint64_t));
     } while (probe != 0 && probe != dwo_id);
   }
   if (probe == 0)
@@ -881,48 +1052,177 @@
   return slot;
 }
 
-uint32 DwpReader::LookupCUv2(uint64 dwo_id) {
-  uint32 slot = static_cast<uint32>(dwo_id) & (nslots_ - 1);
-  uint64 probe = byte_reader_.ReadEightBytes(
-      reinterpret_cast<const uint8_t *>(phash_) + slot * sizeof(uint64));
-  uint32 index = byte_reader_.ReadFourBytes(
-      reinterpret_cast<const uint8_t *>(pindex_) + slot * sizeof(uint32));
+uint32_t DwpReader::LookupCUv2(uint64_t dwo_id) {
+  uint32_t slot = static_cast<uint32_t>(dwo_id) & (nslots_ - 1);
+  uint64_t probe = byte_reader_.ReadEightBytes(
+      reinterpret_cast<const uint8_t*>(phash_) + slot * sizeof(uint64_t));
+  uint32_t index = byte_reader_.ReadFourBytes(
+      reinterpret_cast<const uint8_t*>(pindex_) + slot * sizeof(uint32_t));
   if (index != 0 && probe != dwo_id) {
-    uint32 secondary_hash =
-        (static_cast<uint32>(dwo_id >> 32) & (nslots_ - 1)) | 1;
+    uint32_t secondary_hash =
+        (static_cast<uint32_t>(dwo_id >> 32) & (nslots_ - 1)) | 1;
     do {
       slot = (slot + secondary_hash) & (nslots_ - 1);
       probe = byte_reader_.ReadEightBytes(
-          reinterpret_cast<const uint8_t *>(phash_) + slot * sizeof(uint64));
+          reinterpret_cast<const uint8_t*>(phash_) + slot * sizeof(uint64_t));
       index = byte_reader_.ReadFourBytes(
-          reinterpret_cast<const uint8_t *>(pindex_) + slot * sizeof(uint32));
+          reinterpret_cast<const uint8_t*>(pindex_) + slot * sizeof(uint32_t));
     } while (index != 0 && probe != dwo_id);
   }
   return index;
 }
 
-LineInfo::LineInfo(const uint8_t *buffer, uint64 buffer_length,
-                   ByteReader* reader, LineInfoHandler* handler):
-    handler_(handler), reader_(reader), buffer_(buffer) {
+LineInfo::LineInfo(const uint8_t* buffer, uint64_t buffer_length,
+                   ByteReader* reader, const uint8_t* string_buffer,
+                   size_t string_buffer_length,
+                   const uint8_t* line_string_buffer,
+                   size_t line_string_buffer_length, LineInfoHandler* handler):
+    handler_(handler), reader_(reader), buffer_(buffer),
+    string_buffer_(string_buffer),
+    line_string_buffer_(line_string_buffer) {
 #ifndef NDEBUG
   buffer_length_ = buffer_length;
+  string_buffer_length_ = string_buffer_length;
+  line_string_buffer_length_ = line_string_buffer_length;
 #endif
   header_.std_opcode_lengths = NULL;
 }
 
-uint64 LineInfo::Start() {
+uint64_t LineInfo::Start() {
   ReadHeader();
   ReadLines();
   return after_header_ - buffer_;
 }
 
+void LineInfo::ReadTypesAndForms(const uint8_t** lineptr,
+                                 uint32_t* content_types,
+                                 uint32_t* content_forms,
+                                 uint32_t max_types,
+                                 uint32_t* format_count) {
+  size_t len;
+
+  uint32_t count = reader_->ReadUnsignedLEB128(*lineptr, &len);
+  *lineptr += len;
+  if (count < 1 || count > max_types) {
+    return;
+  }
+  for (uint32_t col = 0; col < count; ++col) {
+    content_types[col] = reader_->ReadUnsignedLEB128(*lineptr, &len);
+    *lineptr += len;
+    content_forms[col] = reader_->ReadUnsignedLEB128(*lineptr, &len);
+    *lineptr += len;
+  }
+  *format_count = count;
+}
+
+const char* LineInfo::ReadStringForm(uint32_t form, const uint8_t** lineptr) {
+  const char* name = nullptr;
+  if (form == DW_FORM_string) {
+    name = reinterpret_cast<const char*>(*lineptr);
+    *lineptr += strlen(name) + 1;
+    return name;
+  } else if (form == DW_FORM_strp) {
+    uint64_t offset = reader_->ReadOffset(*lineptr);
+    assert(offset < string_buffer_length_);
+    *lineptr += reader_->OffsetSize();
+    if (string_buffer_ != nullptr) {
+      name = reinterpret_cast<const char*>(string_buffer_) + offset;
+      return name;
+    }
+  } else if (form == DW_FORM_line_strp) {
+    uint64_t offset = reader_->ReadOffset(*lineptr);
+    assert(offset < line_string_buffer_length_);
+    *lineptr += reader_->OffsetSize();
+    if (line_string_buffer_ != nullptr) {
+      name = reinterpret_cast<const char*>(line_string_buffer_) + offset;
+      return name;
+    }
+  }
+  // Shouldn't be called with a non-string-form, and
+  // if there is a string form but no string buffer,
+  // that is a problem too.
+  assert(0);
+  return nullptr;
+}
+
+uint64_t LineInfo::ReadUnsignedData(uint32_t form, const uint8_t** lineptr) {
+  size_t len;
+  uint64_t value;
+
+  switch (form) {
+    case DW_FORM_data1:
+      value = reader_->ReadOneByte(*lineptr);
+      *lineptr += 1;
+      return value;
+    case DW_FORM_data2:
+      value = reader_->ReadTwoBytes(*lineptr);
+      *lineptr += 2;
+      return value;
+    case DW_FORM_data4:
+      value = reader_->ReadFourBytes(*lineptr);
+      *lineptr += 4;
+      return value;
+    case DW_FORM_data8:
+      value = reader_->ReadEightBytes(*lineptr);
+      *lineptr += 8;
+      return value;
+    case DW_FORM_udata:
+      value = reader_->ReadUnsignedLEB128(*lineptr, &len);
+      *lineptr += len;
+      return value;
+    default:
+      fprintf(stderr, "Unrecognized data form.");
+      return 0;
+  }
+}
+
+void LineInfo::ReadFileRow(const uint8_t** lineptr,
+                           const uint32_t* content_types,
+                           const uint32_t* content_forms, uint32_t row,
+                           uint32_t format_count) {
+  const char* filename = nullptr;
+  uint64_t dirindex = 0;
+  uint64_t mod_time = 0;
+  uint64_t filelength = 0;
+
+  for (uint32_t col = 0; col < format_count; ++col) {
+    switch (content_types[col]) {
+      case DW_LNCT_path:
+        filename = ReadStringForm(content_forms[col], lineptr);
+        break;
+      case DW_LNCT_directory_index:
+        dirindex = ReadUnsignedData(content_forms[col], lineptr);
+        break;
+      case DW_LNCT_timestamp:
+        mod_time = ReadUnsignedData(content_forms[col], lineptr);
+        break;
+      case DW_LNCT_size:
+        filelength = ReadUnsignedData(content_forms[col], lineptr);
+        break;
+      case DW_LNCT_MD5:
+        // MD5 entries help a debugger sort different versions of files with
+        // the same name.  It is always paired with a DW_FORM_data16 and is
+        // unused in this case.
+        lineptr += 16;
+        break;
+      default:
+        fprintf(stderr, "Unrecognized form in line table header. %d\n",
+                content_types[col]);
+        assert(false);
+        break;
+    }
+  }
+  assert(filename != nullptr);
+  handler_->DefineFile(filename, row, dirindex, mod_time, filelength);
+}
+
 // The header for a debug_line section is mildly complicated, because
 // the line info is very tightly encoded.
 void LineInfo::ReadHeader() {
-  const uint8_t *lineptr = buffer_;
+  const uint8_t* lineptr = buffer_;
   size_t initial_length_size;
 
-  const uint64 initial_length
+  const uint64_t initial_length
     = reader_->ReadInitialLength(lineptr, &initial_length_size);
 
   lineptr += initial_length_size;
@@ -930,12 +1230,24 @@
   assert(buffer_ + initial_length_size + header_.total_length <=
         buffer_ + buffer_length_);
 
-  // Address size *must* be set by CU ahead of time.
-  assert(reader_->AddressSize() != 0);
 
   header_.version = reader_->ReadTwoBytes(lineptr);
   lineptr += 2;
 
+  if (header_.version >= 5) {
+    uint8_t address_size = reader_->ReadOneByte(lineptr);
+    reader_->SetAddressSize(address_size);
+    lineptr += 1;
+    uint8_t segment_selector_size = reader_->ReadOneByte(lineptr);
+    if (segment_selector_size != 0) {
+      fprintf(stderr,"No support for segmented memory.");
+    }
+    lineptr += 1;
+  } else {
+    // Address size *must* be set by CU ahead of time.
+    assert(reader_->AddressSize() != 0);
+  }
+
   header_.prologue_length = reader_->ReadOffset(lineptr);
   lineptr += reader_->OffsetSize();
 
@@ -943,7 +1255,7 @@
   lineptr += 1;
 
   if (header_.version >= 4) {
-    __attribute__((unused)) uint8 max_ops_per_insn =
+    __attribute__((unused)) uint8_t max_ops_per_insn =
         reader_->ReadOneByte(lineptr);
     ++lineptr;
     assert(max_ops_per_insn == 1);
@@ -952,7 +1264,7 @@
   header_.default_is_stmt = reader_->ReadOneByte(lineptr);
   lineptr += 1;
 
-  header_.line_base = *reinterpret_cast<const int8*>(lineptr);
+  header_.line_base = *reinterpret_cast<const int8_t*>(lineptr);
   lineptr += 1;
 
   header_.line_range = reader_->ReadOneByte(lineptr);
@@ -969,56 +1281,99 @@
     lineptr += 1;
   }
 
-  // It is legal for the directory entry table to be empty.
-  if (*lineptr) {
-    uint32 dirindex = 1;
-    while (*lineptr) {
-      const char *dirname = reinterpret_cast<const char *>(lineptr);
-      handler_->DefineDir(dirname, dirindex);
-      lineptr += strlen(dirname) + 1;
-      dirindex++;
+  if (header_.version <= 4) {
+    // Directory zero is assumed to be the compilation directory and special
+    // cased where used. It is not actually stored in the dwarf data. But an
+    // empty entry here avoids off-by-one errors elsewhere in the code.
+    handler_->DefineDir("", 0);
+    // It is legal for the directory entry table to be empty.
+    if (*lineptr) {
+      uint32_t dirindex = 1;
+      while (*lineptr) {
+        const char* dirname = reinterpret_cast<const char*>(lineptr);
+        handler_->DefineDir(dirname, dirindex);
+        lineptr += strlen(dirname) + 1;
+        dirindex++;
+      }
+    }
+    lineptr++;
+    // It is also legal for the file entry table to be empty.
+
+    // Similarly for file zero.
+    handler_->DefineFile("", 0, 0, 0, 0);
+    if (*lineptr) {
+      uint32_t fileindex = 1;
+      size_t len;
+      while (*lineptr) {
+        const char* filename = ReadStringForm(DW_FORM_string, &lineptr);
+
+        uint64_t dirindex = reader_->ReadUnsignedLEB128(lineptr, &len);
+        lineptr += len;
+
+        uint64_t mod_time = reader_->ReadUnsignedLEB128(lineptr, &len);
+        lineptr += len;
+
+        uint64_t filelength = reader_->ReadUnsignedLEB128(lineptr, &len);
+        lineptr += len;
+        handler_->DefineFile(filename, fileindex,
+                             static_cast<uint32_t>(dirindex), mod_time,
+                             filelength);
+        fileindex++;
+      }
     }
-  }
-  lineptr++;
-
-  // It is also legal for the file entry table to be empty.
-  if (*lineptr) {
-    uint32 fileindex = 1;
+    lineptr++;
+  } else {
+    // Read the DWARF-5 directory table.
+
+    // Dwarf5 supports five different types and forms per directory- and
+    // file-table entry. Theoretically, there could be duplicate entries
+    // in this table, but that would be quite unusual.
+    static const uint32_t kMaxTypesAndForms = 5;
+    uint32_t content_types[kMaxTypesAndForms];
+    uint32_t content_forms[kMaxTypesAndForms];
+    uint32_t format_count;
     size_t len;
-    while (*lineptr) {
-      const char *filename = reinterpret_cast<const char *>(lineptr);
-      lineptr += strlen(filename) + 1;
 
-      uint64 dirindex = reader_->ReadUnsignedLEB128(lineptr, &len);
-      lineptr += len;
+    ReadTypesAndForms(&lineptr, content_types, content_forms, kMaxTypesAndForms,
+                      &format_count);
+    uint32_t entry_count = reader_->ReadUnsignedLEB128(lineptr, &len);
+    lineptr += len;
+    for (uint32_t row = 0; row < entry_count; ++row) {
+      const char* dirname = nullptr;
+      for (uint32_t col = 0; col < format_count; ++col) {
+        // The path is the only relevant content type for this implementation.
+        if (content_types[col] == DW_LNCT_path) {
+          dirname = ReadStringForm(content_forms[col], &lineptr);
+        }
+      }
+      handler_->DefineDir(dirname, row);
+    }
 
-      uint64 mod_time = reader_->ReadUnsignedLEB128(lineptr, &len);
-      lineptr += len;
+    // Read the DWARF-5 filename table.
+    ReadTypesAndForms(&lineptr, content_types, content_forms, kMaxTypesAndForms,
+                      &format_count);
+    entry_count = reader_->ReadUnsignedLEB128(lineptr, &len);
+    lineptr += len;
 
-      uint64 filelength = reader_->ReadUnsignedLEB128(lineptr, &len);
-      lineptr += len;
-      handler_->DefineFile(filename, fileindex, static_cast<uint32>(dirindex), 
-                           mod_time, filelength);
-      fileindex++;
+    for (uint32_t row = 0; row < entry_count; ++row) {
+      ReadFileRow(&lineptr, content_types, content_forms, row, format_count);
     }
   }
-  lineptr++;
-
   after_header_ = lineptr;
 }
 
 /* static */
 bool LineInfo::ProcessOneOpcode(ByteReader* reader,
                                 LineInfoHandler* handler,
-                                const struct LineInfoHeader &header,
-                                const uint8_t *start,
+                                const struct LineInfoHeader& header,
+                                const uint8_t* start,
                                 struct LineStateMachine* lsm,
                                 size_t* len,
                                 uintptr pc,
-                                bool *lsm_passes_pc) {
+                                bool* lsm_passes_pc) {
   size_t oplen = 0;
   size_t templen;
-  uint8 opcode = reader->ReadOneByte(start);
+  uint8_t opcode = reader->ReadOneByte(start);
   oplen++;
   start++;
 
@@ -1026,9 +1381,9 @@
   // opcode. Most line programs consist mainly of special opcodes.
   if (opcode >= header.opcode_base) {
     opcode -= header.opcode_base;
-    const int64 advance_address = (opcode / header.line_range)
+    const int64_t advance_address = (opcode / header.line_range)
                                   * header.min_insn_length;
-    const int32 advance_line = (opcode % header.line_range)
+    const int32_t advance_line = (opcode % header.line_range)
                                + header.line_base;
 
     // Check if the lsm passes "pc". If so, mark it as passed.
@@ -1053,7 +1408,7 @@
     }
 
     case DW_LNS_advance_pc: {
-      uint64 advance_address = reader->ReadUnsignedLEB128(start, &templen);
+      uint64_t advance_address = reader->ReadUnsignedLEB128(start, &templen);
       oplen += templen;
 
       // Check if the lsm passes "pc". If so, mark it as passed.
@@ -1066,9 +1421,9 @@
     }
       break;
     case DW_LNS_advance_line: {
-      const int64 advance_line = reader->ReadSignedLEB128(start, &templen);
+      const int64_t advance_line = reader->ReadSignedLEB128(start, &templen);
       oplen += templen;
-      lsm->line_num += static_cast<int32>(advance_line);
+      lsm->line_num += static_cast<int32_t>(advance_line);
 
       // With gcc 4.2.1, we can get the line_no here for the first time
       // since DW_LNS_advance_line is called after DW_LNE_set_address is
@@ -1080,15 +1435,15 @@
     }
       break;
     case DW_LNS_set_file: {
-      const uint64 fileno = reader->ReadUnsignedLEB128(start, &templen);
+      const uint64_t fileno = reader->ReadUnsignedLEB128(start, &templen);
       oplen += templen;
-      lsm->file_num = static_cast<uint32>(fileno);
+      lsm->file_num = static_cast<uint32_t>(fileno);
     }
       break;
     case DW_LNS_set_column: {
-      const uint64 colno = reader->ReadUnsignedLEB128(start, &templen);
+      const uint64_t colno = reader->ReadUnsignedLEB128(start, &templen);
       oplen += templen;
-      lsm->column_num = static_cast<uint32>(colno);
+      lsm->column_num = static_cast<uint32_t>(colno);
     }
       break;
     case DW_LNS_negate_stmt: {
@@ -1100,7 +1455,7 @@
     }
       break;
     case DW_LNS_fixed_advance_pc: {
-      const uint16 advance_address = reader->ReadTwoBytes(start);
+      const uint16_t advance_address = reader->ReadTwoBytes(start);
       oplen += 2;
 
       // Check if the lsm passes "pc". If so, mark it as passed.
@@ -1113,7 +1468,7 @@
     }
       break;
     case DW_LNS_const_add_pc: {
-      const int64 advance_address = header.min_insn_length
+      const int64_t advance_address = header.min_insn_length
                                     * ((255 - header.opcode_base)
                                        / header.line_range);
 
@@ -1127,12 +1482,12 @@
     }
       break;
     case DW_LNS_extended_op: {
-      const uint64 extended_op_len = reader->ReadUnsignedLEB128(start,
+      const uint64_t extended_op_len = reader->ReadUnsignedLEB128(start,
                                                                 &templen);
       start += templen;
       oplen += templen + extended_op_len;
 
-      const uint64 extended_op = reader->ReadOneByte(start);
+      const uint64_t extended_op = reader->ReadOneByte(start);
       start++;
 
       switch (extended_op) {
@@ -1147,29 +1502,29 @@
           // DW_LNE_set_address is called before DW_LNS_advance_line is
           // called.  So we do not check if the lsm passes "pc" here.  See
           // also the comment in DW_LNS_advance_line.
-          uint64 address = reader->ReadAddress(start);
+          uint64_t address = reader->ReadAddress(start);
           lsm->address = address;
         }
           break;
         case DW_LNE_define_file: {
-          const char *filename = reinterpret_cast<const char *>(start);
+          const char* filename = reinterpret_cast<const char*>(start);
 
           templen = strlen(filename) + 1;
           start += templen;
 
-          uint64 dirindex = reader->ReadUnsignedLEB128(start, &templen);
+          uint64_t dirindex = reader->ReadUnsignedLEB128(start, &templen);
           oplen += templen;
 
-          const uint64 mod_time = reader->ReadUnsignedLEB128(start,
+          const uint64_t mod_time = reader->ReadUnsignedLEB128(start,
                                                              &templen);
           oplen += templen;
 
-          const uint64 filelength = reader->ReadUnsignedLEB128(start,
+          const uint64_t filelength = reader->ReadUnsignedLEB128(start,
                                                                &templen);
           oplen += templen;
 
           if (handler) {
-            handler->DefineFile(filename, -1, static_cast<uint32>(dirindex), 
+            handler->DefineFile(filename, -1, static_cast<uint32_t>(dirindex), 
                                 mod_time, filelength);
           }
         }
@@ -1199,7 +1554,7 @@
 
   // lengthstart is the place the length field is based on.
   // It is the point in the header after the initial length field
-  const uint8_t *lengthstart = buffer_;
+  const uint8_t* lengthstart = buffer_;
 
   // In 64 bit dwarf, the initial length is 12 bytes, because of the
   // 0xffffffff at the start.
@@ -1208,7 +1563,7 @@
   else
     lengthstart += 4;
 
-  const uint8_t *lineptr = after_header_;
+  const uint8_t* lineptr = after_header_;
   lsm.Reset(header_.default_is_stmt);
 
   // The LineInfoHandler interface expects each line's length along
@@ -1217,8 +1572,8 @@
   // from the next address. So we report a line only when we get the
   // next line's address, or the end-of-sequence address.
   bool have_pending_line = false;
-  uint64 pending_address = 0;
-  uint32 pending_file_num = 0, pending_line_num = 0, pending_column_num = 0;
+  uint64_t pending_address = 0;
+  uint32_t pending_file_num = 0, pending_line_num = 0, pending_column_num = 0;
 
   while (lineptr < lengthstart + header_.total_length) {
     size_t oplength;
@@ -1247,33 +1602,99 @@
   after_header_ = lengthstart + header_.total_length;
 }
 
-RangeListReader::RangeListReader(const uint8_t *buffer, uint64 size,
-                                 ByteReader *reader, RangeListHandler *handler)
-    : buffer_(buffer), size_(size), reader_(reader), handler_(handler) { }
+bool RangeListReader::SetRangesBase(uint64_t offset) {
+  // Versions less than 5 don't use ranges base.
+  if (cu_info_->version_ < 5) {
+    return true;
+  }
+  // Length may not be 12 bytes, but if 12 bytes aren't available
+  // at this point, then the header is too short.
+  if (offset + 12 >= cu_info_->size_) {
+    return false;
+  }
+  // The length of this CU's contribution.
+  uint64_t cu_length = reader_->ReadFourBytes(cu_info_->buffer_ + offset);
+  offset += 4;
+  if (cu_length == 0xffffffffUL) {
+    cu_length = reader_->ReadEightBytes(cu_info_->buffer_ + offset);
+    offset += 8;
+  }
+
+  // Truncating size here results in correctly ignoring everything not from
+  // this cu from here on out.
+  cu_info_->size_ = offset + cu_length;
+
+  // Check for the rest of the header in advance.
+  if (offset + 8 >= cu_info_->size_) {
+    return false;
+  }
+  // Version. Can only read version 5.
+  if (reader_->ReadTwoBytes(cu_info_->buffer_ + offset) != 5) {
+    return false;
+  }
+  offset += 2;
+  // Address size
+  if (reader_->ReadOneByte(cu_info_->buffer_ + offset) !=
+      reader_->AddressSize()) {
+    return false;
+  }
+  offset += 1;
+  // Segment selectors are unsupported
+  if (reader_->ReadOneByte(cu_info_->buffer_ + offset) != 0) {
+    return false;
+  }
+  offset += 1;
+  offset_entry_count_ = reader_->ReadFourBytes(cu_info_->buffer_ + offset);
+  offset += 4;
+  offset_array_ = offset;
+  return true;
+}
+
+bool RangeListReader::ReadRanges(enum DwarfForm form, uint64_t data) {
+  if (form == DW_FORM_sec_offset) {
+    if (cu_info_->version_ <= 4) {
+      return ReadDebugRanges(data);
+    } else {
+      return ReadDebugRngList(data);
+    }
+  } else if (form == DW_FORM_rnglistx) {
+    SetRangesBase(cu_info_->ranges_base_);
+    if (data >= offset_entry_count_) {
+      return false;
+    }
+    uint64_t index_offset = reader_->AddressSize() * data;
+    uint64_t range_list_offset =
+        reader_->ReadAddress(cu_info_->buffer_ + offset_array_ + index_offset);
+
+    return ReadDebugRngList(range_list_offset);
+  }
+  return false;
+}
 
-bool RangeListReader::ReadRangeList(uint64 offset) {
-  const uint64 max_address =
+bool RangeListReader::ReadDebugRanges(uint64_t offset) {
+  const uint64_t max_address =
     (reader_->AddressSize() == 4) ? 0xffffffffUL
                                   : 0xffffffffffffffffULL;
-  const uint64 entry_size = reader_->AddressSize() * 2;
+  const uint64_t entry_size = reader_->AddressSize() * 2;
   bool list_end = false;
 
   do {
-    if (offset > size_ - entry_size) {
+    if (offset > cu_info_->size_ - entry_size) {
       return false; // Invalid range detected
     }
 
-    uint64 start_address = reader_->ReadAddress(buffer_ + offset);
-    uint64 end_address =
-      reader_->ReadAddress(buffer_ + offset + reader_->AddressSize());
+    uint64_t start_address = reader_->ReadAddress(cu_info_->buffer_ + offset);
+    uint64_t end_address = reader_->ReadAddress(
+        cu_info_->buffer_ + offset + reader_->AddressSize());
 
     if (start_address == max_address) { // Base address selection
-      handler_->SetBaseAddress(end_address);
+      cu_info_->base_address_ = end_address;
     } else if (start_address == 0 && end_address == 0) { // End-of-list
       handler_->Finish();
       list_end = true;
     } else { // Add a range entry
-      handler_->AddRange(start_address, end_address);
+      handler_->AddRange(start_address + cu_info_->base_address_,
+                         end_address + cu_info_->base_address_);
     }
 
     offset += entry_size;
@@ -1282,6 +1703,62 @@
   return true;
 }
 
+bool RangeListReader::ReadDebugRngList(uint64_t offset) {
+  uint64_t start = 0;
+  uint64_t end = 0;
+  uint64_t range_len = 0;
+  uint64_t index = 0;
+  // A uleb128's length isn't known until after it has been read, so overruns
+  // are only caught after an entire entry.
+  while (offset < cu_info_->size_) {
+    uint8_t entry_type = reader_->ReadOneByte(cu_info_->buffer_ + offset);
+    offset += 1;
+    // Handle each entry type per Dwarf 5 Standard, section 2.17.3.
+    switch (entry_type) {
+      case DW_RLE_end_of_list:
+        handler_->Finish();
+        return true;
+      case DW_RLE_base_addressx:
+        offset += ReadULEB(offset, &index);
+        cu_info_->base_address_ = GetAddressAtIndex(index);
+        break;
+      case DW_RLE_startx_endx:
+        offset += ReadULEB(offset, &index);
+        start = GetAddressAtIndex(index);
+        offset += ReadULEB(offset, &index);
+        end = GetAddressAtIndex(index);
+        handler_->AddRange(start, end);
+        break;
+      case DW_RLE_startx_length:
+        offset += ReadULEB(offset, &index);
+        start = GetAddressAtIndex(index);
+        offset += ReadULEB(offset, &range_len);
+        handler_->AddRange(start, start + range_len);
+        break;
+      case DW_RLE_offset_pair:
+        offset += ReadULEB(offset, &start);
+        offset += ReadULEB(offset, &end);
+        handler_->AddRange(start + cu_info_->base_address_,
+                           end + cu_info_->base_address_);
+        break;
+      case DW_RLE_base_address:
+        offset += ReadAddress(offset, &cu_info_->base_address_);
+        break;
+      case DW_RLE_start_end:
+        offset += ReadAddress(offset, &start);
+        offset += ReadAddress(offset, &end);
+        handler_->AddRange(start, end);
+        break;
+      case DW_RLE_start_length:
+        offset += ReadAddress(offset, &start);
+        offset += ReadULEB(offset, &end);
+        handler_->AddRange(start, start + end);
+        break;
+    }
+  }
+  return false;
+}
+
 // A DWARF rule for recovering the address or value of a register, or
 // computing the canonical frame address. There is one subclass of this for
 // each '*Rule' member function in CallFrameInfo::Handler.
@@ -1304,17 +1781,17 @@
   // this rule. If REG is kCFARegister, then this rule describes how to compute
   // the canonical frame address. Return what the HANDLER member function
   // returned.
-  virtual bool Handle(Handler *handler,
-                      uint64 address, int reg) const = 0;
+  virtual bool Handle(Handler* handler,
+                      uint64_t address, int reg) const = 0;
 
   // Equality on rules. We use these to decide which rules we need
   // to report after a DW_CFA_restore_state instruction.
-  virtual bool operator==(const Rule &rhs) const = 0;
+  virtual bool operator==(const Rule& rhs) const = 0;
 
-  bool operator!=(const Rule &rhs) const { return ! (*this == rhs); }
+  bool operator!=(const Rule& rhs) const { return ! (*this == rhs); }
 
   // Return a pointer to a copy of this rule.
-  virtual Rule *Copy() const = 0;
+  virtual Rule* Copy() const = 0;
 
   // If this is a base+offset rule, change its base register to REG.
   // Otherwise, do nothing. (Ugly, but required for DW_CFA_def_cfa_register.)
@@ -1330,16 +1807,16 @@
  public:
   UndefinedRule() { }
   ~UndefinedRule() { }
-  bool Handle(Handler *handler, uint64 address, int reg) const {
+  bool Handle(Handler* handler, uint64_t address, int reg) const {
     return handler->UndefinedRule(address, reg);
   }
-  bool operator==(const Rule &rhs) const {
+  bool operator==(const Rule& rhs) const {
     // dynamic_cast is allowed by the Google C++ Style Guide, if the use has
     // been carefully considered; cheap RTTI-like workarounds are forbidden.
-    const UndefinedRule *our_rhs = dynamic_cast<const UndefinedRule *>(&rhs);
+    const UndefinedRule* our_rhs = dynamic_cast<const UndefinedRule*>(&rhs);
     return (our_rhs != NULL);
   }
-  Rule *Copy() const { return new UndefinedRule(*this); }
+  Rule* Copy() const { return new UndefinedRule(*this); }
 };
 
 // Rule: the register's value is the same as that it had in the caller.
@@ -1347,16 +1824,16 @@
  public:
   SameValueRule() { }
   ~SameValueRule() { }
-  bool Handle(Handler *handler, uint64 address, int reg) const {
+  bool Handle(Handler* handler, uint64_t address, int reg) const {
     return handler->SameValueRule(address, reg);
   }
-  bool operator==(const Rule &rhs) const {
+  bool operator==(const Rule& rhs) const {
     // dynamic_cast is allowed by the Google C++ Style Guide, if the use has
     // been carefully considered; cheap RTTI-like workarounds are forbidden.
-    const SameValueRule *our_rhs = dynamic_cast<const SameValueRule *>(&rhs);
+    const SameValueRule* our_rhs = dynamic_cast<const SameValueRule*>(&rhs);
     return (our_rhs != NULL);
   }
-  Rule *Copy() const { return new SameValueRule(*this); }
+  Rule* Copy() const { return new SameValueRule(*this); }
 };
 
 // Rule: the register is saved at OFFSET from BASE_REGISTER.  BASE_REGISTER
@@ -1366,18 +1843,18 @@
   OffsetRule(int base_register, long offset)
       : base_register_(base_register), offset_(offset) { }
   ~OffsetRule() { }
-  bool Handle(Handler *handler, uint64 address, int reg) const {
+  bool Handle(Handler* handler, uint64_t address, int reg) const {
     return handler->OffsetRule(address, reg, base_register_, offset_);
   }
-  bool operator==(const Rule &rhs) const {
+  bool operator==(const Rule& rhs) const {
     // dynamic_cast is allowed by the Google C++ Style Guide, if the use has
     // been carefully considered; cheap RTTI-like workarounds are forbidden.
-    const OffsetRule *our_rhs = dynamic_cast<const OffsetRule *>(&rhs);
+    const OffsetRule* our_rhs = dynamic_cast<const OffsetRule*>(&rhs);
     return (our_rhs &&
             base_register_ == our_rhs->base_register_ &&
             offset_ == our_rhs->offset_);
   }
-  Rule *Copy() const { return new OffsetRule(*this); }
+  Rule* Copy() const { return new OffsetRule(*this); }
   // We don't actually need SetBaseRegister or SetOffset here, since they
   // are only ever applied to CFA rules, for DW_CFA_def_cfa_offset, and it
   // doesn't make sense to use OffsetRule for computing the CFA: it
@@ -1395,18 +1872,18 @@
   ValOffsetRule(int base_register, long offset)
       : base_register_(base_register), offset_(offset) { }
   ~ValOffsetRule() { }
-  bool Handle(Handler *handler, uint64 address, int reg) const {
+  bool Handle(Handler* handler, uint64_t address, int reg) const {
     return handler->ValOffsetRule(address, reg, base_register_, offset_);
   }
-  bool operator==(const Rule &rhs) const {
+  bool operator==(const Rule& rhs) const {
     // dynamic_cast is allowed by the Google C++ Style Guide, if the use has
     // been carefully considered; cheap RTTI-like workarounds are forbidden.
-    const ValOffsetRule *our_rhs = dynamic_cast<const ValOffsetRule *>(&rhs);
+    const ValOffsetRule* our_rhs = dynamic_cast<const ValOffsetRule*>(&rhs);
     return (our_rhs &&
             base_register_ == our_rhs->base_register_ &&
             offset_ == our_rhs->offset_);
   }
-  Rule *Copy() const { return new ValOffsetRule(*this); }
+  Rule* Copy() const { return new ValOffsetRule(*this); }
   void SetBaseRegister(unsigned reg) { base_register_ = reg; }
   void SetOffset(long long offset) { offset_ = offset; }
  private:
@@ -1420,16 +1897,16 @@
   explicit RegisterRule(int register_number)
       : register_number_(register_number) { }
   ~RegisterRule() { }
-  bool Handle(Handler *handler, uint64 address, int reg) const {
+  bool Handle(Handler* handler, uint64_t address, int reg) const {
     return handler->RegisterRule(address, reg, register_number_);
   }
-  bool operator==(const Rule &rhs) const {
+  bool operator==(const Rule& rhs) const {
     // dynamic_cast is allowed by the Google C++ Style Guide, if the use has
     // been carefully considered; cheap RTTI-like workarounds are forbidden.
-    const RegisterRule *our_rhs = dynamic_cast<const RegisterRule *>(&rhs);
+    const RegisterRule* our_rhs = dynamic_cast<const RegisterRule*>(&rhs);
     return (our_rhs && register_number_ == our_rhs->register_number_);
   }
-  Rule *Copy() const { return new RegisterRule(*this); }
+  Rule* Copy() const { return new RegisterRule(*this); }
  private:
   int register_number_;
 };
@@ -1437,19 +1914,19 @@
 // Rule: EXPRESSION evaluates to the address at which the register is saved.
 class CallFrameInfo::ExpressionRule: public CallFrameInfo::Rule {
  public:
-  explicit ExpressionRule(const string &expression)
+  explicit ExpressionRule(const string& expression)
       : expression_(expression) { }
   ~ExpressionRule() { }
-  bool Handle(Handler *handler, uint64 address, int reg) const {
+  bool Handle(Handler* handler, uint64_t address, int reg) const {
     return handler->ExpressionRule(address, reg, expression_);
   }
-  bool operator==(const Rule &rhs) const {
+  bool operator==(const Rule& rhs) const {
     // dynamic_cast is allowed by the Google C++ Style Guide, if the use has
     // been carefully considered; cheap RTTI-like workarounds are forbidden.
-    const ExpressionRule *our_rhs = dynamic_cast<const ExpressionRule *>(&rhs);
+    const ExpressionRule* our_rhs = dynamic_cast<const ExpressionRule*>(&rhs);
     return (our_rhs && expression_ == our_rhs->expression_);
   }
-  Rule *Copy() const { return new ExpressionRule(*this); }
+  Rule* Copy() const { return new ExpressionRule(*this); }
  private:
   string expression_;
 };
@@ -1457,20 +1934,20 @@
 // Rule: EXPRESSION evaluates to the address at which the register is saved.
 class CallFrameInfo::ValExpressionRule: public CallFrameInfo::Rule {
  public:
-  explicit ValExpressionRule(const string &expression)
+  explicit ValExpressionRule(const string& expression)
       : expression_(expression) { }
   ~ValExpressionRule() { }
-  bool Handle(Handler *handler, uint64 address, int reg) const {
+  bool Handle(Handler* handler, uint64_t address, int reg) const {
     return handler->ValExpressionRule(address, reg, expression_);
   }
-  bool operator==(const Rule &rhs) const {
+  bool operator==(const Rule& rhs) const {
     // dynamic_cast is allowed by the Google C++ Style Guide, if the use has
     // been carefully considered; cheap RTTI-like workarounds are forbidden.
-    const ValExpressionRule *our_rhs =
-        dynamic_cast<const ValExpressionRule *>(&rhs);
+    const ValExpressionRule* our_rhs =
+        dynamic_cast<const ValExpressionRule*>(&rhs);
     return (our_rhs && expression_ == our_rhs->expression_);
   }
-  Rule *Copy() const { return new ValExpressionRule(*this); }
+  Rule* Copy() const { return new ValExpressionRule(*this); }
  private:
   string expression_;
 };
@@ -1479,51 +1956,51 @@
 class CallFrameInfo::RuleMap {
  public:
   RuleMap() : cfa_rule_(NULL) { }
-  RuleMap(const RuleMap &rhs) : cfa_rule_(NULL) { *this = rhs; }
+  RuleMap(const RuleMap& rhs) : cfa_rule_(NULL) { *this = rhs; }
   ~RuleMap() { Clear(); }
 
-  RuleMap &operator=(const RuleMap &rhs);
+  RuleMap& operator=(const RuleMap& rhs);
 
   // Set the rule for computing the CFA to RULE. Take ownership of RULE.
-  void SetCFARule(Rule *rule) { delete cfa_rule_; cfa_rule_ = rule; }
+  void SetCFARule(Rule* rule) { delete cfa_rule_; cfa_rule_ = rule; }
 
   // Return the current CFA rule. Unlike RegisterRule, this RuleMap retains
   // ownership of the rule. We use this for DW_CFA_def_cfa_offset and
   // DW_CFA_def_cfa_register, and for detecting references to the CFA before
   // a rule for it has been established.
-  Rule *CFARule() const { return cfa_rule_; }
+  Rule* CFARule() const { return cfa_rule_; }
 
   // Return the rule for REG, or NULL if there is none. The caller takes
   // ownership of the result.
-  Rule *RegisterRule(int reg) const;
+  Rule* RegisterRule(int reg) const;
 
   // Set the rule for computing REG to RULE. Take ownership of RULE.
-  void SetRegisterRule(int reg, Rule *rule);
+  void SetRegisterRule(int reg, Rule* rule);
 
   // Make all the appropriate calls to HANDLER as if we were changing from
   // this RuleMap to NEW_RULES at ADDRESS. We use this to implement
   // DW_CFA_restore_state, where lots of rules can change simultaneously.
   // Return true if all handlers returned true; otherwise, return false.
-  bool HandleTransitionTo(Handler *handler, uint64 address,
-                          const RuleMap &new_rules) const;
+  bool HandleTransitionTo(Handler* handler, uint64_t address,
+                          const RuleMap& new_rules) const;
 
  private:
   // A map from register numbers to Rules.
-  typedef std::map<int, Rule *> RuleByNumber;
+  typedef std::map<int, Rule*> RuleByNumber;
 
   // Remove all register rules and clear cfa_rule_.
   void Clear();
 
   // The rule for computing the canonical frame address. This RuleMap owns
   // this rule.
-  Rule *cfa_rule_;
+  Rule* cfa_rule_;
 
   // A map from register numbers to postfix expressions to recover
   // their values. This RuleMap owns the Rules the map refers to.
   RuleByNumber registers_;
 };
 
-CallFrameInfo::RuleMap &CallFrameInfo::RuleMap::operator=(const RuleMap &rhs) {
+CallFrameInfo::RuleMap& CallFrameInfo::RuleMap::operator=(const RuleMap& rhs) {
   Clear();
   // Since each map owns the rules it refers to, assignment must copy them.
   if (rhs.cfa_rule_) cfa_rule_ = rhs.cfa_rule_->Copy();
@@ -1533,7 +2010,7 @@
   return *this;
 }
 
-CallFrameInfo::Rule *CallFrameInfo::RuleMap::RegisterRule(int reg) const {
+CallFrameInfo::Rule* CallFrameInfo::RuleMap::RegisterRule(int reg) const {
   assert(reg != Handler::kCFARegister);
   RuleByNumber::const_iterator it = registers_.find(reg);
   if (it != registers_.end())
@@ -1542,18 +2019,18 @@
     return NULL;
 }
 
-void CallFrameInfo::RuleMap::SetRegisterRule(int reg, Rule *rule) {
+void CallFrameInfo::RuleMap::SetRegisterRule(int reg, Rule* rule) {
   assert(reg != Handler::kCFARegister);
   assert(rule);
-  Rule **slot = &registers_[reg];
+  Rule** slot = &registers_[reg];
   delete *slot;
   *slot = rule;
 }
 
 bool CallFrameInfo::RuleMap::HandleTransitionTo(
-    Handler *handler,
-    uint64 address,
-    const RuleMap &new_rules) const {
+    Handler* handler,
+    uint64_t address,
+    const RuleMap& new_rules) const {
   // Transition from cfa_rule_ to new_rules.cfa_rule_.
   if (cfa_rule_ && new_rules.cfa_rule_) {
     if (*cfa_rule_ != *new_rules.cfa_rule_ &&
@@ -1633,25 +2110,25 @@
  public:
   // Create a call frame information interpreter state with the given
   // reporter, reader, handler, and initial call frame info address.
-  State(ByteReader *reader, Handler *handler, Reporter *reporter,
-        uint64 address)
+  State(ByteReader* reader, Handler* handler, Reporter* reporter,
+        uint64_t address)
       : reader_(reader), handler_(handler), reporter_(reporter),
         address_(address), entry_(NULL), cursor_(NULL) { }
 
   // Interpret instructions from CIE, save the resulting rule set for
   // DW_CFA_restore instructions, and return true. On error, report
   // the problem to reporter_ and return false.
-  bool InterpretCIE(const CIE &cie);
+  bool InterpretCIE(const CIE& cie);
 
   // Interpret instructions from FDE, and return true. On error,
   // report the problem to reporter_ and return false.
-  bool InterpretFDE(const FDE &fde);
+  bool InterpretFDE(const FDE& fde);
 
  private:  
   // The operands of a CFI instruction, for ParseOperands.
   struct Operands {
     unsigned register_number;  // A register number.
-    uint64 offset;             // An offset or address.
+    uint64_t offset;             // An offset or address.
     long signed_offset;        // A signed offset.
     string expression;         // A DWARF expression.
   };
@@ -1675,7 +2152,7 @@
   //   '8'  an eight-byte offset            (OPERANDS->offset)
   //   'e'  a DW_FORM_block holding a       (OPERANDS->expression)
   //        DWARF expression
-  bool ParseOperands(const char *format, Operands *operands);
+  bool ParseOperands(const char* format, Operands* operands);
 
   // Interpret one CFI instruction from STATE's instruction stream, update
   // STATE, report any rule changes to handler_, and return true. On
@@ -1698,7 +2175,7 @@
 
   // Specify that REG can be recovered using RULE, and return true. On
   // failure, report and return false.
-  bool DoRule(unsigned reg, Rule *rule);
+  bool DoRule(unsigned reg, Rule* rule);
 
   // Specify that REG can be found at OFFSET from the CFA, and return true.
   // On failure, report and return false. (Subroutine for DW_CFA_offset,
@@ -1717,7 +2194,7 @@
 
   // Return the section offset of the instruction at cursor. For use
   // in error messages.
-  uint64 CursorOffset() { return entry_->offset + (cursor_ - entry_->start); }
+  uint64_t CursorOffset() { return entry_->offset + (cursor_ - entry_->start); }
 
   // Report that entry_ is incomplete, and return false. For brevity.
   bool ReportIncomplete() {
@@ -1726,23 +2203,23 @@
   }
 
   // For reading multi-byte values with the appropriate endianness.
-  ByteReader *reader_;
+  ByteReader* reader_;
 
   // The handler to which we should report the data we find.
-  Handler *handler_;
+  Handler* handler_;
 
   // For reporting problems in the info we're parsing.
-  Reporter *reporter_;
+  Reporter* reporter_;
 
   // The code address to which the next instruction in the stream applies.
-  uint64 address_;
+  uint64_t address_;
 
   // The entry whose instructions we are currently processing. This is
   // first a CIE, and then an FDE.
-  const Entry *entry_;
+  const Entry* entry_;
 
   // The next instruction to process.
-  const uint8_t *cursor_;
+  const uint8_t* cursor_;
 
   // The current set of rules.
   RuleMap rules_;
@@ -1757,7 +2234,7 @@
   std::stack<RuleMap> saved_rules_;
 };
 
-bool CallFrameInfo::State::InterpretCIE(const CIE &cie) {
+bool CallFrameInfo::State::InterpretCIE(const CIE& cie) {
   entry_ = &cie;
   cursor_ = entry_->instructions;
   while (cursor_ < entry_->end)
@@ -1769,7 +2246,7 @@
   return true;
 }
 
-bool CallFrameInfo::State::InterpretFDE(const FDE &fde) {
+bool CallFrameInfo::State::InterpretFDE(const FDE& fde) {
   entry_ = &fde;
   cursor_ = entry_->instructions;
   while (cursor_ < entry_->end)
@@ -1778,10 +2255,10 @@
   return true;
 }
 
-bool CallFrameInfo::State::ParseOperands(const char *format,
-                                         Operands *operands) {
+bool CallFrameInfo::State::ParseOperands(const char* format,
+                                         Operands* operands) {
   size_t len;
-  const char *operand;
+  const char* operand;
 
   for (operand = format; *operand; operand++) {
     size_t bytes_left = entry_->end - cursor_;
@@ -1840,7 +2317,7 @@
         if (len > bytes_left || expression_length > bytes_left - len)
           return ReportIncomplete();
         cursor_ += len;
-        operands->expression = string(reinterpret_cast<const char *>(cursor_),
+        operands->expression = string(reinterpret_cast<const char*>(cursor_),
                                       expression_length);
         cursor_ += expression_length;
         break;
@@ -1855,7 +2332,7 @@
 }
 
 bool CallFrameInfo::State::DoInstruction() {
-  CIE *cie = entry_->cie;
+  CIE* cie = entry_->cie;
   Operands ops;
 
   // Our entry's kind should have been set by now.
@@ -1945,7 +2422,7 @@
     // Change the base register used to compute the CFA.
     case DW_CFA_def_cfa_register: {
       if (!ParseOperands("r", &ops)) return false;
-      Rule *cfa_rule = rules_.CFARule();
+      Rule* cfa_rule = rules_.CFARule();
       if (!cfa_rule) {
         if (!DoDefCFA(ops.register_number, ops.offset)) {
           reporter_->NoCFARule(entry_->offset, entry_->kind, CursorOffset());
@@ -1978,7 +2455,7 @@
     case DW_CFA_def_cfa_expression: {
       if (!ParseOperands("e", &ops))
         return false;
-      Rule *rule = new ValExpressionRule(ops.expression);
+      Rule* rule = new ValExpressionRule(ops.expression);
       rules_.SetCFARule(rule);
       if (!rule->Handle(handler_, address_,
                         Handler::kCFARegister))
@@ -2085,7 +2562,7 @@
                                    CursorOffset());
         return false;
       }
-      const RuleMap &new_rules = saved_rules_.top();
+      const RuleMap& new_rules = saved_rules_.top();
       if (rules_.CFARule() && !new_rules.CFARule()) {
         reporter_->ClearingCFARule(entry_->offset, entry_->kind,
                                    CursorOffset());
@@ -2137,14 +2614,14 @@
 }
 
 bool CallFrameInfo::State::DoDefCFA(unsigned base_register, long offset) {
-  Rule *rule = new ValOffsetRule(base_register, offset);
+  Rule* rule = new ValOffsetRule(base_register, offset);
   rules_.SetCFARule(rule);
   return rule->Handle(handler_, address_,
                       Handler::kCFARegister);
 }
 
 bool CallFrameInfo::State::DoDefCFAOffset(long offset) {
-  Rule *cfa_rule = rules_.CFARule();
+  Rule* cfa_rule = rules_.CFARule();
   if (!cfa_rule) {
     reporter_->NoCFARule(entry_->offset, entry_->kind, CursorOffset());
     return false;
@@ -2154,7 +2631,7 @@
                           Handler::kCFARegister);
 }
 
-bool CallFrameInfo::State::DoRule(unsigned reg, Rule *rule) {
+bool CallFrameInfo::State::DoRule(unsigned reg, Rule* rule) {
   rules_.SetRegisterRule(reg, rule);
   return rule->Handle(handler_, address_, reg);
 }
@@ -2183,7 +2660,7 @@
     reporter_->RestoreInCIE(entry_->offset, CursorOffset());
     return false;
   }
-  Rule *rule = cie_rules_.RegisterRule(reg);
+  Rule* rule = cie_rules_.RegisterRule(reg);
   if (!rule) {
     // This isn't really the right thing to do, but since CFI generally
     // only mentions callee-saves registers, and GCC's convention for
@@ -2194,8 +2671,8 @@
   return DoRule(reg, rule);
 }
 
-bool CallFrameInfo::ReadEntryPrologue(const uint8_t *cursor, Entry *entry) {
-  const uint8_t *buffer_end = buffer_ + buffer_length_;
+bool CallFrameInfo::ReadEntryPrologue(const uint8_t* cursor, Entry* entry) {
+  const uint8_t* buffer_end = buffer_ + buffer_length_;
 
   // Initialize enough of ENTRY for use in error reporting.
   entry->offset = cursor - buffer_;
@@ -2205,7 +2682,7 @@
 
   // Read the initial length. This sets reader_'s offset size.
   size_t length_size;
-  uint64 length = reader_->ReadInitialLength(cursor, &length_size);
+  uint64_t length = reader_->ReadInitialLength(cursor, &length_size);
   if (length_size > size_t(buffer_end - cursor))
     return ReportIncomplete(entry);
   cursor += length_size;
@@ -2272,8 +2749,8 @@
   return true;
 }
 
-bool CallFrameInfo::ReadCIEFields(CIE *cie) {
-  const uint8_t *cursor = cie->fields;
+bool CallFrameInfo::ReadCIEFields(CIE* cie) {
+  const uint8_t* cursor = cie->fields;
   size_t len;
 
   assert(cie->kind == kCIE);
@@ -2304,13 +2781,13 @@
     return false;
   }
 
-  const uint8_t *augmentation_start = cursor;
-  const uint8_t *augmentation_end =
-      reinterpret_cast<const uint8_t *>(memchr(augmentation_start, '\0',
+  const uint8_t* augmentation_start = cursor;
+  const uint8_t* augmentation_end =
+      reinterpret_cast<const uint8_t*>(memchr(augmentation_start, '\0',
                                                cie->end - augmentation_start));
   if (! augmentation_end) return ReportIncomplete(cie);
   cursor = augmentation_end;
-  cie->augmentation = string(reinterpret_cast<const char *>(augmentation_start),
+  cie->augmentation = string(reinterpret_cast<const char*>(augmentation_start),
                              cursor - augmentation_start);
   // Skip the terminating '\0'.
   cursor++;
@@ -2330,21 +2807,15 @@
   }
 
   if (cie->version >= 4) {
-    uint8_t address_size = *cursor++;
-    if (address_size != 8) {
-      // TODO(scottmg): Only supporting x64 for now.
-      reporter_->UnexpectedAddressSize(cie->offset, address_size);
+    cie->address_size = *cursor++;
+    if (cie->address_size != 8 && cie->address_size != 4) {
+      reporter_->UnexpectedAddressSize(cie->offset, cie->address_size);
       return false;
     }
 
-    uint8_t segment_size = *cursor++;
-    if (segment_size != 0) {
-      // TODO(scottmg): Only supporting x64 for now.
-      // I would have perhaps expected 4 here, but LLVM emits a 0, near
-      // http://llvm.org/docs/doxygen/html/MCDwarf_8cpp_source.html#l00606. As
-      // we are not using the value, only succeed for now if it's the expected
-      // 0.
-      reporter_->UnexpectedSegmentSize(cie->offset, segment_size);
+    cie->segment_size = *cursor++;
+    if (cie->segment_size != 0) {
+      reporter_->UnexpectedSegmentSize(cie->offset, cie->segment_size);
       return false;
     }
   }
@@ -2363,7 +2834,7 @@
   // a ULEB128 in version 3.
   if (cie->version == 1) {
     if (cursor >= cie->end) return ReportIncomplete(cie);
-    cie->return_address_register = uint8(*cursor++);
+    cie->return_address_register = uint8_t(*cursor++);
   } else {
     cie->return_address_register = reader_->ReadUnsignedLEB128(cursor, &len);
     if (size_t(cie->end - cursor) < len) return ReportIncomplete(cie);
@@ -2377,9 +2848,9 @@
     if (size_t(cie->end - cursor) < len + data_size)
       return ReportIncomplete(cie);
     cursor += len;
-    const uint8_t *data = cursor;
+    const uint8_t* data = cursor;
     cursor += data_size;
-    const uint8_t *data_end = cursor;
+    const uint8_t* data_end = cursor;
 
     cie->has_z_lsda = false;
     cie->has_z_personality = false;
@@ -2470,8 +2941,8 @@
   return true;
 }
 
-bool CallFrameInfo::ReadFDEFields(FDE *fde) {
-  const uint8_t *cursor = fde->fields;
+bool CallFrameInfo::ReadFDEFields(FDE* fde) {
+  const uint8_t* cursor = fde->fields;
   size_t size;
 
   fde->address = reader_->ReadEncodedPointer(cursor, fde->cie->pointer_encoding,
@@ -2537,10 +3008,10 @@
 }
   
 bool CallFrameInfo::Start() {
-  const uint8_t *buffer_end = buffer_ + buffer_length_;
-  const uint8_t *cursor;
+  const uint8_t* buffer_end = buffer_ + buffer_length_;
+  const uint8_t* cursor;
   bool all_ok = true;
-  const uint8_t *entry_end;
+  const uint8_t* entry_end;
   bool ok;
 
   // Traverse all the entries in buffer_, skipping CIEs and offering
@@ -2606,6 +3077,15 @@
     if (!ReadCIEFields(&cie))
       continue;
 
+    // TODO(nbilling): This could lead to strange behavior if a single buffer
+    // contained a mixture of DWARF versions as well as address sizes. Not
+    // sure if it's worth handling such a case.
+
+    // DWARF4 CIE specifies address_size, so use it for this call frame.
+    if (cie.version >= 4) {
+      reader_->SetAddressSize(cie.address_size);
+    }
+
     // We now have the values that govern both the CIE and the FDE.
     cie.cie = &cie;
     fde.cie = &cie;
@@ -2662,7 +3142,7 @@
   return all_ok;
 }
 
-const char *CallFrameInfo::KindName(EntryKind kind) {
+const char* CallFrameInfo::KindName(EntryKind kind) {
   if (kind == CallFrameInfo::kUnknown)
     return "entry";
   else if (kind == CallFrameInfo::kCIE)
@@ -2675,135 +3155,135 @@
   }
 }
 
-bool CallFrameInfo::ReportIncomplete(Entry *entry) {
+bool CallFrameInfo::ReportIncomplete(Entry* entry) {
   reporter_->Incomplete(entry->offset, entry->kind);
   return false;
 }
 
-void CallFrameInfo::Reporter::Incomplete(uint64 offset,
+void CallFrameInfo::Reporter::Incomplete(uint64_t offset,
                                          CallFrameInfo::EntryKind kind) {
   fprintf(stderr,
-          "%s: CFI %s at offset 0x%llx in '%s': entry ends early\n",
+          "%s: CFI %s at offset 0x%" PRIx64 " in '%s': entry ends early\n",
           filename_.c_str(), CallFrameInfo::KindName(kind), offset,
           section_.c_str());
 }
 
-void CallFrameInfo::Reporter::EarlyEHTerminator(uint64 offset) {
+void CallFrameInfo::Reporter::EarlyEHTerminator(uint64_t offset) {
   fprintf(stderr,
-          "%s: CFI at offset 0x%llx in '%s': saw end-of-data marker"
+          "%s: CFI at offset 0x%" PRIx64 " in '%s': saw end-of-data marker"
           " before end of section contents\n",
           filename_.c_str(), offset, section_.c_str());
 }
 
-void CallFrameInfo::Reporter::CIEPointerOutOfRange(uint64 offset,
-                                                   uint64 cie_offset) {
+void CallFrameInfo::Reporter::CIEPointerOutOfRange(uint64_t offset,
+                                                   uint64_t cie_offset) {
   fprintf(stderr,
-          "%s: CFI frame description entry at offset 0x%llx in '%s':"
-          " CIE pointer is out of range: 0x%llx\n",
+          "%s: CFI frame description entry at offset 0x%" PRIx64 " in '%s':"
+          " CIE pointer is out of range: 0x%" PRIx64 "\n",
           filename_.c_str(), offset, section_.c_str(), cie_offset);
 }
 
-void CallFrameInfo::Reporter::BadCIEId(uint64 offset, uint64 cie_offset) {
+void CallFrameInfo::Reporter::BadCIEId(uint64_t offset, uint64_t cie_offset) {
   fprintf(stderr,
-          "%s: CFI frame description entry at offset 0x%llx in '%s':"
-          " CIE pointer does not point to a CIE: 0x%llx\n",
+          "%s: CFI frame description entry at offset 0x%" PRIx64 " in '%s':"
+          " CIE pointer does not point to a CIE: 0x%" PRIx64 "\n",
           filename_.c_str(), offset, section_.c_str(), cie_offset);
 }
 
-void CallFrameInfo::Reporter::UnexpectedAddressSize(uint64 offset,
+void CallFrameInfo::Reporter::UnexpectedAddressSize(uint64_t offset,
                                                     uint8_t address_size) {
   fprintf(stderr,
-          "%s: CFI frame description entry at offset 0x%llx in '%s':"
+          "%s: CFI frame description entry at offset 0x%" PRIx64 " in '%s':"
           " CIE specifies unexpected address size: %d\n",
           filename_.c_str(), offset, section_.c_str(), address_size);
 }
 
-void CallFrameInfo::Reporter::UnexpectedSegmentSize(uint64 offset,
+void CallFrameInfo::Reporter::UnexpectedSegmentSize(uint64_t offset,
                                                     uint8_t segment_size) {
   fprintf(stderr,
-          "%s: CFI frame description entry at offset 0x%llx in '%s':"
+          "%s: CFI frame description entry at offset 0x%" PRIx64 " in '%s':"
           " CIE specifies unexpected segment size: %d\n",
           filename_.c_str(), offset, section_.c_str(), segment_size);
 }
 
-void CallFrameInfo::Reporter::UnrecognizedVersion(uint64 offset, int version) {
+void CallFrameInfo::Reporter::UnrecognizedVersion(uint64_t offset, int version) {
   fprintf(stderr,
-          "%s: CFI frame description entry at offset 0x%llx in '%s':"
+          "%s: CFI frame description entry at offset 0x%" PRIx64 " in '%s':"
           " CIE specifies unrecognized version: %d\n",
           filename_.c_str(), offset, section_.c_str(), version);
 }
 
-void CallFrameInfo::Reporter::UnrecognizedAugmentation(uint64 offset,
-                                                       const string &aug) {
+void CallFrameInfo::Reporter::UnrecognizedAugmentation(uint64_t offset,
+                                                       const string& aug) {
   fprintf(stderr,
-          "%s: CFI frame description entry at offset 0x%llx in '%s':"
+          "%s: CFI frame description entry at offset 0x%" PRIx64 " in '%s':"
           " CIE specifies unrecognized augmentation: '%s'\n",
           filename_.c_str(), offset, section_.c_str(), aug.c_str());
 }
 
-void CallFrameInfo::Reporter::InvalidPointerEncoding(uint64 offset,
-                                                     uint8 encoding) {
+void CallFrameInfo::Reporter::InvalidPointerEncoding(uint64_t offset,
+                                                     uint8_t encoding) {
   fprintf(stderr,
-          "%s: CFI common information entry at offset 0x%llx in '%s':"
+          "%s: CFI common information entry at offset 0x%" PRIx64 " in '%s':"
           " 'z' augmentation specifies invalid pointer encoding: 0x%02x\n",
           filename_.c_str(), offset, section_.c_str(), encoding);
 }
 
-void CallFrameInfo::Reporter::UnusablePointerEncoding(uint64 offset,
-                                                      uint8 encoding) {
+void CallFrameInfo::Reporter::UnusablePointerEncoding(uint64_t offset,
+                                                      uint8_t encoding) {
   fprintf(stderr,
-          "%s: CFI common information entry at offset 0x%llx in '%s':"
+          "%s: CFI common information entry at offset 0x%" PRIx64 " in '%s':"
           " 'z' augmentation specifies a pointer encoding for which"
           " we have no base address: 0x%02x\n",
           filename_.c_str(), offset, section_.c_str(), encoding);
 }
 
-void CallFrameInfo::Reporter::RestoreInCIE(uint64 offset, uint64 insn_offset) {
+void CallFrameInfo::Reporter::RestoreInCIE(uint64_t offset, uint64_t insn_offset) {
   fprintf(stderr,
-          "%s: CFI common information entry at offset 0x%llx in '%s':"
-          " the DW_CFA_restore instruction at offset 0x%llx"
+          "%s: CFI common information entry at offset 0x%" PRIx64 " in '%s':"
+          " the DW_CFA_restore instruction at offset 0x%" PRIx64
           " cannot be used in a common information entry\n",
           filename_.c_str(), offset, section_.c_str(), insn_offset);
 }
 
-void CallFrameInfo::Reporter::BadInstruction(uint64 offset,
+void CallFrameInfo::Reporter::BadInstruction(uint64_t offset,
                                              CallFrameInfo::EntryKind kind,
-                                             uint64 insn_offset) {
+                                             uint64_t insn_offset) {
   fprintf(stderr,
-          "%s: CFI %s at offset 0x%llx in section '%s':"
-          " the instruction at offset 0x%llx is unrecognized\n",
+          "%s: CFI %s at offset 0x%" PRIx64 " in section '%s':"
+          " the instruction at offset 0x%" PRIx64 " is unrecognized\n",
           filename_.c_str(), CallFrameInfo::KindName(kind),
           offset, section_.c_str(), insn_offset);
 }
 
-void CallFrameInfo::Reporter::NoCFARule(uint64 offset,
+void CallFrameInfo::Reporter::NoCFARule(uint64_t offset,
                                         CallFrameInfo::EntryKind kind,
-                                        uint64 insn_offset) {
+                                        uint64_t insn_offset) {
   fprintf(stderr,
-          "%s: CFI %s at offset 0x%llx in section '%s':"
-          " the instruction at offset 0x%llx assumes that a CFA rule has"
+          "%s: CFI %s at offset 0x%" PRIx64 " in section '%s':"
+          " the instruction at offset 0x%" PRIx64 " assumes that a CFA rule has"
           " been set, but none has been set\n",
           filename_.c_str(), CallFrameInfo::KindName(kind), offset,
           section_.c_str(), insn_offset);
 }
 
-void CallFrameInfo::Reporter::EmptyStateStack(uint64 offset,
+void CallFrameInfo::Reporter::EmptyStateStack(uint64_t offset,
                                               CallFrameInfo::EntryKind kind,
-                                              uint64 insn_offset) {
+                                              uint64_t insn_offset) {
   fprintf(stderr,
-          "%s: CFI %s at offset 0x%llx in section '%s':"
-          " the DW_CFA_restore_state instruction at offset 0x%llx"
+          "%s: CFI %s at offset 0x%" PRIx64 " in section '%s':"
+          " the DW_CFA_restore_state instruction at offset 0x%" PRIx64
           " should pop a saved state from the stack, but the stack is empty\n",
           filename_.c_str(), CallFrameInfo::KindName(kind), offset,
           section_.c_str(), insn_offset);
 }
 
-void CallFrameInfo::Reporter::ClearingCFARule(uint64 offset,
+void CallFrameInfo::Reporter::ClearingCFARule(uint64_t offset,
                                               CallFrameInfo::EntryKind kind,
-                                              uint64 insn_offset) {
+                                              uint64_t insn_offset) {
   fprintf(stderr,
-          "%s: CFI %s at offset 0x%llx in section '%s':"
-          " the DW_CFA_restore_state instruction at offset 0x%llx"
+          "%s: CFI %s at offset 0x%" PRIx64 " in section '%s':"
+          " the DW_CFA_restore_state instruction at offset 0x%" PRIx64
           " would clear the CFA rule in effect\n",
           filename_.c_str(), CallFrameInfo::KindName(kind), offset,
           section_.c_str(), insn_offset);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -87,7 +87,7 @@
 
 #ifdef WRITE_ELF
 void WriteELFFrameSection(const char *filename, const char *section_name,
-                          const CFISection &section);
+                          const CFISection& section);
 #define PERHAPS_WRITE_DEBUG_FRAME_FILE(name, section)                   \
     WriteELFFrameSection("cfitest-" name, ".debug_frame", section);
 #define PERHAPS_WRITE_EH_FRAME_FILE(name, section)                      \
@@ -99,43 +99,45 @@
 
 class MockCallFrameInfoHandler: public CallFrameInfo::Handler {
  public:
-  MOCK_METHOD6(Entry, bool(size_t offset, uint64 address, uint64 length,
-                           uint8 version, const string &augmentation,
+  MOCK_METHOD6(Entry, bool(size_t offset, uint64_t address, uint64_t length,
+                           uint8_t version, const string& augmentation,
                            unsigned return_address));
-  MOCK_METHOD2(UndefinedRule, bool(uint64 address, int reg));
-  MOCK_METHOD2(SameValueRule, bool(uint64 address, int reg));
-  MOCK_METHOD4(OffsetRule, bool(uint64 address, int reg, int base_register,
+  MOCK_METHOD2(UndefinedRule, bool(uint64_t address, int reg));
+  MOCK_METHOD2(SameValueRule, bool(uint64_t address, int reg));
+  MOCK_METHOD4(OffsetRule, bool(uint64_t address, int reg, int base_register,
                                 long offset));
-  MOCK_METHOD4(ValOffsetRule, bool(uint64 address, int reg, int base_register,
+  MOCK_METHOD4(ValOffsetRule, bool(uint64_t address, int reg, int base_register,
                                    long offset));
-  MOCK_METHOD3(RegisterRule, bool(uint64 address, int reg, int base_register));
-  MOCK_METHOD3(ExpressionRule, bool(uint64 address, int reg,
-                                    const string &expression));
-  MOCK_METHOD3(ValExpressionRule, bool(uint64 address, int reg,
-                                       const string &expression));
+  MOCK_METHOD3(RegisterRule, bool(uint64_t address, int reg, int base_register));
+  MOCK_METHOD3(ExpressionRule, bool(uint64_t address, int reg,
+                                    const string& expression));
+  MOCK_METHOD3(ValExpressionRule, bool(uint64_t address, int reg,
+                                       const string& expression));
   MOCK_METHOD0(End, bool());
-  MOCK_METHOD2(PersonalityRoutine, bool(uint64 address, bool indirect));
-  MOCK_METHOD2(LanguageSpecificDataArea, bool(uint64 address, bool indirect));
+  MOCK_METHOD2(PersonalityRoutine, bool(uint64_t address, bool indirect));
+  MOCK_METHOD2(LanguageSpecificDataArea, bool(uint64_t address, bool indirect));
   MOCK_METHOD0(SignalHandler, bool());
 };
 
 class MockCallFrameErrorReporter: public CallFrameInfo::Reporter {
  public:
   MockCallFrameErrorReporter() : Reporter("mock filename", "mock section") { }
-  MOCK_METHOD2(Incomplete, void(uint64, CallFrameInfo::EntryKind));
-  MOCK_METHOD1(EarlyEHTerminator, void(uint64));
-  MOCK_METHOD2(CIEPointerOutOfRange, void(uint64, uint64));
-  MOCK_METHOD2(BadCIEId, void(uint64, uint64));
-  MOCK_METHOD2(UnexpectedAddressSize, void(uint64, uint8_t));
-  MOCK_METHOD2(UnexpectedSegmentSize, void(uint64, uint8_t));
-  MOCK_METHOD2(UnrecognizedVersion, void(uint64, int version));
-  MOCK_METHOD2(UnrecognizedAugmentation, void(uint64, const string &));
-  MOCK_METHOD2(InvalidPointerEncoding, void(uint64, uint8));
-  MOCK_METHOD2(UnusablePointerEncoding, void(uint64, uint8));
-  MOCK_METHOD2(RestoreInCIE, void(uint64, uint64));
-  MOCK_METHOD3(BadInstruction, void(uint64, CallFrameInfo::EntryKind, uint64));
-  MOCK_METHOD3(NoCFARule, void(uint64, CallFrameInfo::EntryKind, uint64));
-  MOCK_METHOD3(EmptyStateStack, void(uint64, CallFrameInfo::EntryKind, uint64));
+  MOCK_METHOD2(Incomplete, void(uint64_t, CallFrameInfo::EntryKind));
+  MOCK_METHOD1(EarlyEHTerminator, void(uint64_t));
+  MOCK_METHOD2(CIEPointerOutOfRange, void(uint64_t, uint64_t));
+  MOCK_METHOD2(BadCIEId, void(uint64_t, uint64_t));
+  MOCK_METHOD2(UnexpectedAddressSize, void(uint64_t, uint8_t));
+  MOCK_METHOD2(UnexpectedSegmentSize, void(uint64_t, uint8_t));
+  MOCK_METHOD2(UnrecognizedVersion, void(uint64_t, int version));
+  MOCK_METHOD2(UnrecognizedAugmentation, void(uint64_t, const string&));
+  MOCK_METHOD2(InvalidPointerEncoding, void(uint64_t, uint8_t));
+  MOCK_METHOD2(UnusablePointerEncoding, void(uint64_t, uint8_t));
+  MOCK_METHOD2(RestoreInCIE, void(uint64_t, uint64_t));
+  MOCK_METHOD3(BadInstruction, void(uint64_t, CallFrameInfo::EntryKind,
+                                    uint64_t));
+  MOCK_METHOD3(NoCFARule, void(uint64_t, CallFrameInfo::EntryKind, uint64_t));
+  MOCK_METHOD3(EmptyStateStack, void(uint64_t, CallFrameInfo::EntryKind,
+                                     uint64_t));
 };
 
 struct CFIFixture {
@@ -216,7 +218,7 @@
 
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(8);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size() - 2,
                        &byte_reader, &handler, &reporter);
   EXPECT_FALSE(parser.Start());
@@ -242,7 +244,7 @@
 
   ByteReader byte_reader(ENDIANNESS_LITTLE);
   byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size() - 4,
                        &byte_reader, &handler, &reporter);
   EXPECT_FALSE(parser.Start());
@@ -267,7 +269,7 @@
 
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(8);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_FALSE(parser.Start());
@@ -294,7 +296,7 @@
 
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(8);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_FALSE(parser.Start());
@@ -316,7 +318,7 @@
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_LITTLE);
   byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_TRUE(parser.Start());
@@ -347,7 +349,7 @@
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_TRUE(parser.Start());
@@ -391,7 +393,7 @@
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_TRUE(parser.Start());
@@ -441,7 +443,7 @@
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_LITTLE);
   byte_reader.SetAddressSize(8);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_TRUE(parser.Start());
@@ -486,7 +488,7 @@
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_FALSE(parser.Start());
@@ -531,7 +533,7 @@
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_FALSE(parser.Start());
@@ -566,7 +568,7 @@
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_TRUE(parser.Start());
@@ -601,18 +603,18 @@
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
   byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_TRUE(parser.Start());
 }
 
 TEST_F(CFI, CIEVersion4AdditionalFields) {
-  CFISection section(kBigEndian, 4);
+  CFISection section(kBigEndian, 8);
   Label cie;
   section
       .Mark(&cie)
-      // CIE version 4 with expected address and segment size.
+      // CIE version 4 with expected address (64bit) and segment size.
       .CIEHeader(0x0ab4758d, 0xc010fdf7, 0x89, 4, "", true, 8, 0)
       .FinishEntry()
       // FDE, citing that CIE.
@@ -631,8 +633,37 @@
   string contents;
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
-  byte_reader.SetAddressSize(4);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
+                       contents.size(),
+                       &byte_reader, &handler, &reporter);
+  EXPECT_TRUE(parser.Start());
+}
+
+TEST_F(CFI, CIEVersion4AdditionalFields32BitAddress) {
+  CFISection section(kBigEndian, 4);
+  Label cie;
+  section
+      .Mark(&cie)
+      // CIE version 4 with expected address (32bit) and segment size.
+      .CIEHeader(0x0ab4758d, 0xc010fdf7, 0x89, 4, "", true, 4, 0)
+      .FinishEntry()
+      // FDE, citing that CIE.
+      .FDEHeader(cie, 0x86763f2b, 0x2a66dc23)
+      .FinishEntry();
+
+  PERHAPS_WRITE_DEBUG_FRAME_FILE("CIEVersion3ReturnColumn", section);
+
+  {
+    InSequence s;
+    EXPECT_CALL(handler, Entry(_, 0x86763f2b, 0x2a66dc23, 4, "", 0x89))
+        .WillOnce(Return(true));
+    EXPECT_CALL(handler, End()).WillOnce(Return(true));
+  }
+
+  string contents;
+  EXPECT_TRUE(section.GetContents(&contents));
+  ByteReader byte_reader(ENDIANNESS_BIG);
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_TRUE(parser.Start());
@@ -659,15 +690,14 @@
   string contents;
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
-  byte_reader.SetAddressSize(8);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_FALSE(parser.Start());
 }
 
 TEST_F(CFI, CIEVersion4AdditionalFieldsUnexpectedSegmentSize) {
-  CFISection section(kBigEndian, 4);
+  CFISection section(kBigEndian, 8);
   Label cie;
 
   section
@@ -685,8 +715,7 @@
   string contents;
   EXPECT_TRUE(section.GetContents(&contents));
   ByteReader byte_reader(ENDIANNESS_BIG);
-  byte_reader.SetAddressSize(8);
-  CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+  CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                        contents.size(),
                        &byte_reader, &handler, &reporter);
   EXPECT_FALSE(parser.Start());
@@ -768,7 +797,7 @@
     }
     ByteReader byte_reader(endianness);
     byte_reader.SetAddressSize(section->AddressSize());
-    CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+    CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                          contents.size(),
                          &byte_reader, &handler, &reporter);
     if (succeeds)
@@ -779,13 +808,13 @@
 
   Label cie_label;
   Sequence s;
-  uint64 code_factor;
+  uint64_t code_factor;
   int data_factor;
   unsigned return_register;
   unsigned version;
   unsigned cfa_base_register;
   int cfa_offset;
-  uint64 fde_start, fde_size;
+  uint64_t fde_start, fde_size;
 };
 
 class CFIInsn: public CFIInsnFixture, public Test { };
@@ -1421,7 +1450,7 @@
       .D8(dwarf2reader::DW_CFA_restore_state)
       .FinishEntry();
 
-  uint64 addr = fde_start;
+  uint64_t addr = fde_start;
 
   // Expect the incoming rules to be reported.
   EXPECT_CALL(handler, OffsetRule(addr, 2, kCFARegister, 0x9806 * data_factor))
@@ -2091,10 +2120,10 @@
     ByteReader byte_reader(endianness);
     byte_reader.SetAddressSize(section->AddressSize());
     byte_reader.SetCFIDataBase(encoded_pointer_bases.cfi,
-                               reinterpret_cast<const uint8_t *>(contents.data()));
+                               reinterpret_cast<const uint8_t*>(contents.data()));
     byte_reader.SetTextBase(encoded_pointer_bases.text);
     byte_reader.SetDataBase(encoded_pointer_bases.data);
-    CallFrameInfo parser(reinterpret_cast<const uint8_t *>(contents.data()),
+    CallFrameInfo parser(reinterpret_cast<const uint8_t*>(contents.data()),
                          contents.size(),
                          &byte_reader, &handler, &reporter, true);
     if (succeeds)
@@ -2439,7 +2468,7 @@
   uint64_t entry_size;
 };
 
-void AppendSectionHeader(CFISection *table, const ELFSectionHeader &header) {
+void AppendSectionHeader(CFISection* table, const ELFSectionHeader& header) {
   (*table)
       .D32(header.name)                   // name, index in string tbl
       .D32(header.type)                   // type
@@ -2454,7 +2483,7 @@
 }
 
 void WriteELFFrameSection(const char *filename, const char *cfi_name,
-                          const CFISection &cfi) {
+                          const CFISection& cfi) {
   int elf_class = cfi.AddressSize() == 4 ? ELFCLASS32 : ELFCLASS64;
   int elf_data = (cfi.endianness() == kBigEndian
                   ? ELFDATA2MSB : ELFDATA2LSB);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -73,36 +73,37 @@
 
 class MockDwarf2Handler: public Dwarf2Handler {
  public:
-  MOCK_METHOD5(StartCompilationUnit, bool(uint64 offset, uint8 address_size,
-                                          uint8 offset_size, uint64 cu_length,
-                                          uint8 dwarf_version));
-  MOCK_METHOD2(StartDIE, bool(uint64 offset, enum DwarfTag tag));
-  MOCK_METHOD4(ProcessAttributeUnsigned, void(uint64 offset,
+  MOCK_METHOD5(StartCompilationUnit, bool(uint64_t offset, uint8_t address_size,
+                                          uint8_t offset_size,
+                                          uint64_t cu_length,
+                                          uint8_t dwarf_version));
+  MOCK_METHOD2(StartDIE, bool(uint64_t offset, enum DwarfTag tag));
+  MOCK_METHOD4(ProcessAttributeUnsigned, void(uint64_t offset,
                                               DwarfAttribute attr,
                                               enum DwarfForm form,
-                                              uint64 data));
-  MOCK_METHOD4(ProcessAttributeSigned, void(uint64 offset,
+                                              uint64_t data));
+  MOCK_METHOD4(ProcessAttributeSigned, void(uint64_t offset,
                                             enum DwarfAttribute attr,
                                             enum DwarfForm form,
-                                            int64 data));
-  MOCK_METHOD4(ProcessAttributeReference, void(uint64 offset,
+                                            int64_t data));
+  MOCK_METHOD4(ProcessAttributeReference, void(uint64_t offset,
                                                enum DwarfAttribute attr,
                                                enum DwarfForm form,
-                                               uint64 data));
-  MOCK_METHOD5(ProcessAttributeBuffer, void(uint64 offset,
+                                               uint64_t data));
+  MOCK_METHOD5(ProcessAttributeBuffer, void(uint64_t offset,
                                             enum DwarfAttribute attr,
                                             enum DwarfForm form,
-                                            const uint8_t *data,
-                                            uint64 len));
-  MOCK_METHOD4(ProcessAttributeString, void(uint64 offset,
+                                            const uint8_t* data,
+                                            uint64_t len));
+  MOCK_METHOD4(ProcessAttributeString, void(uint64_t offset,
                                             enum DwarfAttribute attr,
                                             enum DwarfForm form,
                                             const string& data));
-  MOCK_METHOD4(ProcessAttributeSignature, void(uint64 offset,
+  MOCK_METHOD4(ProcessAttributeSignature, void(uint64_t offset,
                                                DwarfAttribute attr,
                                                enum DwarfForm form,
-                                               uint64 signature));
-  MOCK_METHOD1(EndDIE, void(uint64 offset));
+                                               uint64_t signature));
+  MOCK_METHOD1(EndDIE, void(uint64_t offset));
 };
 
 struct DIEFixture {
@@ -127,17 +128,17 @@
   // to |info|, and whose .debug_abbrev section refers to |abbrevs|. This
   // function returns a reference to the same SectionMap each time; new
   // calls wipe out maps established by earlier calls.
-  const SectionMap &MakeSectionMap() {
+  const SectionMap& MakeSectionMap() {
     // Copy the sections' contents into strings that will live as long as
     // the map itself.
     assert(info.GetContents(&info_contents));
     assert(abbrevs.GetContents(&abbrevs_contents));
     section_map.clear();
     section_map[".debug_info"].first
-      = reinterpret_cast<const uint8_t *>(info_contents.data());
+      = reinterpret_cast<const uint8_t*>(info_contents.data());
     section_map[".debug_info"].second = info_contents.size();
     section_map[".debug_abbrev"].first
-      = reinterpret_cast<const uint8_t *>(abbrevs_contents.data());
+      = reinterpret_cast<const uint8_t*>(abbrevs_contents.data());
     section_map[".debug_abbrev"].second = abbrevs_contents.size();
     return section_map;
   }
@@ -217,6 +218,8 @@
                       DwarfHeaderParams(kLittleEndian, 8, 3, 8),
                       DwarfHeaderParams(kLittleEndian, 8, 4, 4),
                       DwarfHeaderParams(kLittleEndian, 8, 4, 8),
+                      DwarfHeaderParams(kLittleEndian, 8, 5, 4),
+                      DwarfHeaderParams(kLittleEndian, 8, 5, 8),
                       DwarfHeaderParams(kBigEndian,    4, 2, 4),
                       DwarfHeaderParams(kBigEndian,    4, 2, 8),
                       DwarfHeaderParams(kBigEndian,    4, 3, 4),
@@ -228,14 +231,16 @@
                       DwarfHeaderParams(kBigEndian,    8, 3, 4),
                       DwarfHeaderParams(kBigEndian,    8, 3, 8),
                       DwarfHeaderParams(kBigEndian,    8, 4, 4),
-                      DwarfHeaderParams(kBigEndian,    8, 4, 8)));
+                      DwarfHeaderParams(kBigEndian,    8, 4, 8),
+                      DwarfHeaderParams(kBigEndian,    8, 5, 4),
+                      DwarfHeaderParams(kBigEndian,    8, 5, 8)));
 
 struct DwarfFormsFixture: public DIEFixture {
   // Start a compilation unit, as directed by |params|, containing one
   // childless DIE of the given tag, with one attribute of the given name
   // and form. The 'info' fixture member is left just after the abbrev
   // code, waiting for the attribute value to be appended.
-  void StartSingleAttributeDIE(const DwarfHeaderParams &params,
+  void StartSingleAttributeDIE(const DwarfHeaderParams& params,
                                DwarfTag tag, DwarfAttribute name,
                                DwarfForm form) {
     // Create the abbreviation table.
@@ -255,8 +260,8 @@
   // Set up handler to expect a compilation unit matching |params|,
   // containing one childless DIE of the given tag, in the sequence s. Stop
   // just before the expectations.
-  void ExpectBeginCompilationUnit(const DwarfHeaderParams &params,
-                                  DwarfTag tag, uint64 offset=0) {
+  void ExpectBeginCompilationUnit(const DwarfHeaderParams& params,
+                                  DwarfTag tag, uint64_t offset=0) {
     EXPECT_CALL(handler,
                 StartCompilationUnit(offset, params.address_size,
                                      params.format_size, _,
@@ -274,7 +279,8 @@
         .WillOnce(Return());
   }
 
-  void ParseCompilationUnit(const DwarfHeaderParams &params, uint64 offset=0) {
+  void ParseCompilationUnit(const DwarfHeaderParams& params,
+                            uint64_t offset=0) {
     ByteReader byte_reader(params.endianness == kLittleEndian ?
                            ENDIANNESS_LITTLE : ENDIANNESS_BIG);
     CompilationUnit parser("", MakeSectionMap(), offset, &byte_reader, &handler);
@@ -457,6 +463,35 @@
   ParseCompilationUnit(GetParam(), 98);
 }
 
+TEST_P(DwarfForms, implicit_const) {
+  const DwarfHeaderParams& params = GetParam();
+  const uint64_t implicit_constant_value = 0x1234;
+  // Create the abbreviation table.
+  Label abbrev_table = abbrevs.Here();
+  abbrevs.Abbrev(1, (DwarfTag) 0x253e7b2b, dwarf2reader::DW_children_no)
+      .Attribute((DwarfAttribute) 0xd708d908,
+                 dwarf2reader::DW_FORM_implicit_const)
+      .ULEB128(implicit_constant_value);
+  abbrevs.EndAbbrev().EndTable();
+
+  info.set_format_size(params.format_size);
+  info.set_endianness(params.endianness);
+  info.Header(params.version, abbrev_table, params.address_size)
+          .ULEB128(1);                    // abbrev code
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), (DwarfTag) 0x253e7b2b);
+  EXPECT_CALL(handler,
+              ProcessAttributeUnsigned(_, (DwarfAttribute) 0xd708d908,
+                                       dwarf2reader::DW_FORM_implicit_const,
+                                       implicit_constant_value))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam());
+}
+
 // Tests for the other attribute forms could go here.
 
 INSTANTIATE_TEST_CASE_P(
@@ -485,3 +520,142 @@
                       DwarfHeaderParams(kBigEndian,    8, 3, 8),
                       DwarfHeaderParams(kBigEndian,    8, 4, 4),
                       DwarfHeaderParams(kBigEndian,    8, 4, 8)));
+
+class MockRangeListHandler: public dwarf2reader::RangeListHandler {
+ public:
+  MOCK_METHOD(void, AddRange, (uint64_t begin, uint64_t end));
+  MOCK_METHOD(void, Finish, ());
+};
+
+TEST(RangeList, Dwarf4ReadRangeList) {
+  using dwarf2reader::RangeListReader;
+  using dwarf2reader::DW_FORM_sec_offset;
+
+  // Create a dwarf4 .debug_ranges section.
+  google_breakpad::test_assembler::Section ranges(kBigEndian);
+  std::string padding_offset = "padding offset";
+  ranges.Append(padding_offset);
+  const uint64_t section_offset = ranges.Size();
+  ranges.D32(1).D32(2);          // (2, 3)
+  ranges.D32(0xFFFFFFFF).D32(3); // base_address = 3.
+  ranges.D32(1).D32(2);          // (4, 5)
+  ranges.D32(0).D32(1);          // (3, 4) An out of order entry is legal.
+  ranges.D32(0).D32(0);          // End of range.
+
+  std::string section_contents;
+  ranges.GetContents(&section_contents);
+
+  ByteReader byte_reader(ENDIANNESS_BIG);
+  byte_reader.SetAddressSize(4);
+
+  RangeListReader::CURangesInfo cu_info;
+  // Only set the fields that matter for dwarf 4.
+  cu_info.version_ = 4;
+  cu_info.base_address_ = 1;
+  cu_info.buffer_ = reinterpret_cast<const uint8_t*>(section_contents.data());
+  cu_info.size_ = section_contents.size();
+
+  MockRangeListHandler handler;
+  dwarf2reader::RangeListReader range_list_reader(&byte_reader, &cu_info,
+                                                  &handler);
+  EXPECT_CALL(handler, AddRange(2, 3));
+  EXPECT_CALL(handler, AddRange(4, 5));
+  EXPECT_CALL(handler, AddRange(3, 4));
+  EXPECT_CALL(handler, Finish());
+  EXPECT_TRUE(range_list_reader.ReadRanges(DW_FORM_sec_offset,
+                                           section_offset));
+}
+
+TEST(RangeList, Dwarf5ReadRangeList) {
+  using dwarf2reader::RangeListReader;
+  using dwarf2reader::DW_RLE_base_addressx;
+  using dwarf2reader::DW_RLE_startx_endx;
+  using dwarf2reader::DW_RLE_startx_length;
+  using dwarf2reader::DW_RLE_offset_pair;
+  using dwarf2reader::DW_RLE_end_of_list;
+  using dwarf2reader::DW_RLE_base_address;
+  using dwarf2reader::DW_RLE_offset_pair;
+  using dwarf2reader::DW_RLE_start_end;
+  using dwarf2reader::DW_RLE_start_length;
+  using dwarf2reader::DW_RLE_end_of_list;
+  using dwarf2reader::DW_FORM_sec_offset;
+  using dwarf2reader::DW_FORM_rnglistx;
+
+  // .debug_addr for the indexed entries like startx.
+  Section addr;
+  addr.set_endianness(kBigEndian);
+  // Test addr_base handling with a padding address at 0.
+  addr.D32(0).D32(1).D32(2).D32(3).D32(4);
+  std::string addr_contents;
+  assert(addr.GetContents(&addr_contents));
+
+  // .debug_rnglists is the dwarf 5 section.
+  Section rnglists;
+  rnglists.set_endianness(kBigEndian);
+  std::string padding_offset = "padding offset";
+  rnglists.Append(padding_offset);
+  const uint64_t ranges_base = rnglists.Size();
+
+  // Header
+  Label section_size;
+  rnglists.Append(kBigEndian, 4, section_size);
+  rnglists.D16(5); // Version
+  rnglists.D8(4);  // Address size
+  rnglists.D8(0);  // Segment selector size
+  rnglists.D32(2); // Offset entry count
+  // Offset entries.
+  Label range0;
+  rnglists.Append(kBigEndian, 4, range0);
+  Label range1;
+  rnglists.Append(kBigEndian, 4, range1);
+
+  // Range 0 (will be read via DW_AT_ranges, DW_FORM_sec_offset).
+  range0 = rnglists.Size();
+  rnglists.D8(DW_RLE_base_addressx).ULEB128(0); // base_addr = 1
+  rnglists.D8(DW_RLE_startx_endx).ULEB128(1).ULEB128(2); // (2, 3)
+  rnglists.D8(DW_RLE_startx_length).ULEB128(3).ULEB128(1); // (4, 5)
+  rnglists.D8(DW_RLE_offset_pair).ULEB128(5).ULEB128(6); // (6, 7)
+  rnglists.D8(DW_RLE_end_of_list);
+
+  // Range 1 (will be read via DW_AT_ranges, DW_FORM_rnglistx).
+  range1 = rnglists.Size();
+  rnglists.D8(DW_RLE_base_address).D32(8); // base_addr = 8
+  rnglists.D8(DW_RLE_offset_pair).ULEB128(1).ULEB128(2); // (9, 10)
+  rnglists.D8(DW_RLE_start_end).D32(10).D32(11); // (10, 11)
+  rnglists.D8(DW_RLE_start_length).D32(12).ULEB128(1); // (12, 13)
+  rnglists.D8(DW_RLE_end_of_list);
+  section_size = rnglists.Size();
+  std::string rnglists_contents;
+  assert(rnglists.GetContents(&rnglists_contents));
+
+  RangeListReader::CURangesInfo cu_info;
+  // Only set the fields that matter for dwarf 4.
+  cu_info.version_ = 5;
+  cu_info.base_address_ = 1;
+  cu_info.ranges_base_ = ranges_base;
+  cu_info.buffer_ =
+      reinterpret_cast<const uint8_t*>(rnglists_contents.data());
+  cu_info.size_ = rnglists_contents.size();
+  cu_info.addr_buffer_ =
+      reinterpret_cast<const uint8_t*>(addr_contents.data());
+  cu_info.addr_buffer_size_ = addr_contents.size();
+  cu_info.addr_base_ = 4;
+
+  ByteReader byte_reader(ENDIANNESS_BIG);
+  byte_reader.SetAddressSize(4);
+  MockRangeListHandler handler;
+  dwarf2reader::RangeListReader range_list_reader(&byte_reader, &cu_info,
+                                                  &handler);
+  EXPECT_CALL(handler, AddRange(2, 3));
+  EXPECT_CALL(handler, AddRange(4, 5));
+  EXPECT_CALL(handler, AddRange(6, 7));
+  EXPECT_CALL(handler, AddRange(9, 10));
+  EXPECT_CALL(handler, AddRange(10, 11));
+  EXPECT_CALL(handler, AddRange(12, 13));
+  EXPECT_CALL(handler, Finish()).Times(2);
+  EXPECT_TRUE(range_list_reader.ReadRanges(DW_FORM_rnglistx, 1));
+  EXPECT_TRUE(range_list_reader.ReadRanges(DW_FORM_sec_offset,
+                                           range0.Value()));
+  // Out of range index, should result in no calls.
+  EXPECT_FALSE(range_list_reader.ReadRanges(DW_FORM_rnglistx, 2));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader.h	2021-12-09 12:01:26.000000000 +0000
@@ -40,6 +40,7 @@
 #ifndef COMMON_DWARF_DWARF2READER_H__
 #define COMMON_DWARF_DWARF2READER_H__
 
+#include <assert.h>
 #include <stdint.h>
 
 #include <list>
@@ -63,24 +64,42 @@
 
 // This maps from a string naming a section to a pair containing a
 // the data for the section, and the size of the section.
-typedef std::map<string, std::pair<const uint8_t *, uint64> > SectionMap;
-typedef std::list<std::pair<enum DwarfAttribute, enum DwarfForm> >
-    AttributeList;
+typedef std::map<string, std::pair<const uint8_t*, uint64_t> > SectionMap;
+
+// Abstract away the difference between elf and mach-o section names.
+// Elf-names use ".section_name, mach-o uses "__section_name".  Pass "name" in
+// the elf form, ".section_name".
+const SectionMap::const_iterator GetSectionByName(const SectionMap&
+                                                  sections, const char* name);
+
+// Most of the time, this struct functions as a simple attribute and form pair.
+// However, Dwarf5 DW_FORM_implicit_const means that a form may have its value
+// in line in the abbrev table, and that value must be associated with the
+// pair until the attr's value is needed.
+struct AttrForm {
+  AttrForm(enum DwarfAttribute attr, enum DwarfForm form, uint64_t value) :
+      attr_(attr), form_(form), value_(value) { }
+
+  enum DwarfAttribute attr_;
+  enum DwarfForm form_;
+  uint64_t value_;
+};
+typedef std::list<AttrForm> AttributeList;
 typedef AttributeList::iterator AttributeIterator;
 typedef AttributeList::const_iterator ConstAttributeIterator;
 
 struct LineInfoHeader {
-  uint64 total_length;
-  uint16 version;
-  uint64 prologue_length;
-  uint8 min_insn_length; // insn stands for instructin
+  uint64_t total_length;
+  uint16_t version;
+  uint64_t prologue_length;
+  uint8_t min_insn_length; // insn stands for instructin
   bool default_is_stmt; // stmt stands for statement
-  int8 line_base;
-  uint8 line_range;
-  uint8 opcode_base;
+  int8_t line_base;
+  uint8_t line_range;
+  uint8_t opcode_base;
   // Use a pointer so that signalsafe_addr2line is able to use this structure
   // without heap allocation problem.
-  std::vector<unsigned char> *std_opcode_lengths;
+  std::vector<unsigned char>* std_opcode_lengths;
 };
 
 class LineInfo {
@@ -90,8 +109,10 @@
   // to the beginning and length of the line information to read.
   // Reader is a ByteReader class that has the endianness set
   // properly.
-  LineInfo(const uint8_t *buffer_, uint64 buffer_length,
-           ByteReader* reader, LineInfoHandler* handler);
+  LineInfo(const uint8_t* buffer, uint64_t buffer_length,
+           ByteReader* reader, const uint8_t* string_buffer,
+           size_t string_buffer_length, const uint8_t* line_string_buffer,
+           size_t line_string_buffer_length, LineInfoHandler* handler);
 
   virtual ~LineInfo() {
     if (header_.std_opcode_lengths) {
@@ -102,7 +123,7 @@
   // Start processing line info, and calling callbacks in the handler.
   // Consumes the line number information for a single compilation unit.
   // Returns the number of bytes processed.
-  uint64 Start();
+  uint64_t Start();
 
   // Process a single line info opcode at START using the state
   // machine at LSM.  Return true if we should define a line using the
@@ -115,12 +136,12 @@
   // lsm's old address < PC <= lsm's new address
   static bool ProcessOneOpcode(ByteReader* reader,
                                LineInfoHandler* handler,
-                               const struct LineInfoHeader &header,
-                               const uint8_t *start,
+                               const struct LineInfoHeader& header,
+                               const uint8_t* start,
                                struct LineStateMachine* lsm,
                                size_t* len,
                                uintptr pc,
-                               bool *lsm_passes_pc);
+                               bool* lsm_passes_pc);
 
  private:
   // Reads the DWARF2/3 header for this line info.
@@ -129,26 +150,54 @@
   // Reads the DWARF2/3 line information
   void ReadLines();
 
+  // Read the DWARF5 types and forms for the file and directory tables.
+  void ReadTypesAndForms(const uint8_t** lineptr, uint32_t* content_types,
+                         uint32_t* content_forms, uint32_t max_types,
+                         uint32_t* format_count);
+
+  // Read a row from the dwarf5 LineInfo file table.
+  void ReadFileRow(const uint8_t** lineptr, const uint32_t* content_types,
+                   const uint32_t* content_forms, uint32_t row,
+                   uint32_t format_count);
+
+  // Read and return the data at *lineptr according to form. Advance
+  // *lineptr appropriately.
+  uint64_t ReadUnsignedData(uint32_t form, const uint8_t** lineptr);
+
+  // Read and return the data at *lineptr according to form. Advance
+  // *lineptr appropriately.
+  const char* ReadStringForm(uint32_t form, const uint8_t** lineptr);
+
   // The associated handler to call processing functions in
   LineInfoHandler* handler_;
 
   // The associated ByteReader that handles endianness issues for us
   ByteReader* reader_;
 
-  // A DWARF2/3 line info header.  This is not the same size as
-  // in the actual file, as the one in the file may have a 32 bit or
-  // 64 bit lengths
+  // A DWARF line info header.  This is not the same size as in the actual file,
+  // as the one in the file may have a 32 bit or 64 bit lengths
 
   struct LineInfoHeader header_;
 
   // buffer is the buffer for our line info, starting at exactly where
   // the line info to read is.  after_header is the place right after
   // the end of the line information header.
-  const uint8_t *buffer_;
+  const uint8_t* buffer_;
 #ifndef NDEBUG
-  uint64 buffer_length_;
+  uint64_t buffer_length_;
 #endif
-  const uint8_t *after_header_;
+  // Convenience pointers into .debug_str and .debug_line_str. These exactly
+  // correspond to those in the compilation unit.
+  const uint8_t* string_buffer_;
+#ifndef NDEBUG
+  uint64_t string_buffer_length_;
+#endif
+  const uint8_t* line_string_buffer_;
+#ifndef NDEBUG
+  uint64_t line_string_buffer_length_;
+#endif
+
+  const uint8_t* after_header_;
 };
 
 // This class is the main interface between the line info reader and
@@ -164,7 +213,7 @@
 
   // Called when we define a directory.  NAME is the directory name,
   // DIR_NUM is the directory number
-  virtual void DefineDir(const string& name, uint32 dir_num) { }
+  virtual void DefineDir(const string& name, uint32_t dir_num) { }
 
   // Called when we define a filename. NAME is the filename, FILE_NUM
   // is the file number which is -1 if the file index is the next
@@ -173,9 +222,9 @@
   // directory index for the directory name of this file, MOD_TIME is
   // the modification time of the file, and LENGTH is the length of
   // the file
-  virtual void DefineFile(const string& name, int32 file_num,
-                          uint32 dir_num, uint64 mod_time,
-                          uint64 length) { }
+  virtual void DefineFile(const string& name, int32_t file_num,
+                          uint32_t dir_num, uint64_t mod_time,
+                          uint64_t length) { }
 
   // Called when the line info reader has a new line, address pair
   // ready for us. ADDRESS is the address of the code, LENGTH is the
@@ -183,8 +232,8 @@
   // containing the code, LINE_NUM is the line number in that file for
   // the code, and COLUMN_NUM is the column number the code starts at,
   // if we know it (0 otherwise).
-  virtual void AddLine(uint64 address, uint64 length,
-                       uint32 file_num, uint32 line_num, uint32 column_num) { }
+  virtual void AddLine(uint64_t address, uint64_t length,
+                       uint32_t file_num, uint32_t line_num, uint32_t column_num) { }
 };
 
 class RangeListHandler {
@@ -194,10 +243,7 @@
   virtual ~RangeListHandler() { }
 
   // Add a range.
-  virtual void AddRange(uint64 begin, uint64 end) { };
-
-  // A new base address must be set for computing the ranges' addresses.
-  virtual void SetBaseAddress(uint64 base_address) { };
+  virtual void AddRange(uint64_t begin, uint64_t end) { };
 
   // Finish processing the range list.
   virtual void Finish() { };
@@ -205,16 +251,72 @@
 
 class RangeListReader {
  public:
-  RangeListReader(const uint8_t *buffer, uint64 size, ByteReader *reader,
-                  RangeListHandler *handler);
+  // Reading a range list requires quite a bit of information
+  // from the compilation unit. Package it conveniently.
+  struct CURangesInfo {
+    CURangesInfo() :
+        version_(0), base_address_(0), ranges_base_(0),
+        buffer_(nullptr), size_(0), addr_buffer_(nullptr),
+        addr_buffer_size_(0), addr_base_(0) { }
+
+    uint16_t version_;
+    // Ranges base address. Ordinarily the CU's low_pc.
+    uint64_t base_address_;
+    // Offset into .debug_rnglists for this CU's rangelists.
+    uint64_t ranges_base_;
+    // Contents of either .debug_ranges or .debug_rnglists.
+    const uint8_t* buffer_;
+    uint64_t size_;
+    // Contents of .debug_addr. This cu's contribution starts at
+    // addr_base_
+    const uint8_t* addr_buffer_;
+    uint64_t addr_buffer_size_;
+    uint64_t addr_base_;
+  };
 
-  bool ReadRangeList(uint64 offset);
+  RangeListReader(ByteReader* reader, CURangesInfo* cu_info,
+                  RangeListHandler* handler) :
+      reader_(reader), cu_info_(cu_info), handler_(handler),
+      offset_array_(0), offset_entry_count_(0) { }
+
+  // Read ranges from cu_info as specified by form and data.
+  bool ReadRanges(enum DwarfForm form, uint64_t data);
 
  private:
-  const uint8_t *buffer_;
-  uint64 size_;
+  bool SetRangesBase(uint64_t base);
+
+  // Read dwarf4 .debug_ranges at offset.
+  bool ReadDebugRanges(uint64_t offset);
+  // Read dwarf5 .debug_rngslist at offset.
+  bool ReadDebugRngList(uint64_t offset);
+
+  // Convenience functions to handle the mechanics of reading entries in the
+  // ranges section.
+  uint64_t ReadULEB(uint64_t offset, uint64_t* value) {
+    size_t len;
+    *value = reader_->ReadUnsignedLEB128(cu_info_->buffer_ + offset, &len);
+    return len;
+  }
+
+  uint64_t ReadAddress(uint64_t offset, uint64_t* value) {
+    *value = reader_->ReadAddress(cu_info_->buffer_ + offset);
+    return reader_->AddressSize();
+  }
+
+  // Read the address at this CU's addr_index in the .debug_addr section.
+  uint64_t GetAddressAtIndex(uint64_t addr_index) {
+    assert(cu_info_->addr_buffer_ != nullptr);
+    uint64_t offset =
+        cu_info_->addr_base_ + addr_index * reader_->AddressSize();
+    assert(offset < cu_info_->addr_buffer_size_);
+    return reader_->ReadAddress(cu_info_->addr_buffer_ + offset);
+  }
+
   ByteReader* reader_;
-  RangeListHandler *handler_;
+  CURangesInfo* cu_info_;
+  RangeListHandler* handler_;
+  uint64_t offset_array_;
+  uint64_t offset_entry_count_;
 };
 
 // This class is the main interface between the reader and the
@@ -230,9 +332,9 @@
   // Start to process a compilation unit at OFFSET from the beginning of the
   // .debug_info section. Return false if you would like to skip this
   // compilation unit.
-  virtual bool StartCompilationUnit(uint64 offset, uint8 address_size,
-                                    uint8 offset_size, uint64 cu_length,
-                                    uint8 dwarf_version) { return false; }
+  virtual bool StartCompilationUnit(uint64_t offset, uint8_t address_size,
+                                    uint8_t offset_size, uint64_t cu_length,
+                                    uint8_t dwarf_version) { return false; }
 
   // When processing a skeleton compilation unit, resulting from a split
   // DWARF compilation, once the skeleton debug info has been read,
@@ -244,40 +346,40 @@
   // Start to process a split compilation unit at OFFSET from the beginning of
   // the debug_info section in the .dwp/.dwo file.  Return false if you would
   // like to skip this compilation unit.
-  virtual bool StartSplitCompilationUnit(uint64 offset,
-                                         uint64 cu_length) { return false; }
+  virtual bool StartSplitCompilationUnit(uint64_t offset,
+                                         uint64_t cu_length) { return false; }
 
   // Start to process a DIE at OFFSET from the beginning of the .debug_info
   // section. Return false if you would like to skip this DIE.
-  virtual bool StartDIE(uint64 offset, enum DwarfTag tag) { return false; }
+  virtual bool StartDIE(uint64_t offset, enum DwarfTag tag) { return false; }
 
   // Called when we have an attribute with unsigned data to give to our
   // handler. The attribute is for the DIE at OFFSET from the beginning of the
   // .debug_info section. Its name is ATTR, its form is FORM, and its value is
   // DATA.
-  virtual void ProcessAttributeUnsigned(uint64 offset,
+  virtual void ProcessAttributeUnsigned(uint64_t offset,
                                         enum DwarfAttribute attr,
                                         enum DwarfForm form,
-                                        uint64 data) { }
+                                        uint64_t data) { }
 
   // Called when we have an attribute with signed data to give to our handler.
   // The attribute is for the DIE at OFFSET from the beginning of the
   // .debug_info section. Its name is ATTR, its form is FORM, and its value is
   // DATA.
-  virtual void ProcessAttributeSigned(uint64 offset,
+  virtual void ProcessAttributeSigned(uint64_t offset,
                                       enum DwarfAttribute attr,
                                       enum DwarfForm form,
-                                      int64 data) { }
+                                      int64_t data) { }
 
   // Called when we have an attribute whose value is a reference to
   // another DIE. The attribute belongs to the DIE at OFFSET from the
   // beginning of the .debug_info section. Its name is ATTR, its form
   // is FORM, and the offset of the DIE being referred to from the
   // beginning of the .debug_info section is DATA.
-  virtual void ProcessAttributeReference(uint64 offset,
+  virtual void ProcessAttributeReference(uint64_t offset,
                                          enum DwarfAttribute attr,
                                          enum DwarfForm form,
-                                         uint64 data) { }
+                                         uint64_t data) { }
 
   // Called when we have an attribute with a buffer of data to give to our
   // handler. The attribute is for the DIE at OFFSET from the beginning of the
@@ -285,17 +387,17 @@
   // the buffer's contents, and its length in bytes is LENGTH. The buffer is
   // owned by the caller, not the callee, and may not persist for very long.
   // If you want the data to be available later, it needs to be copied.
-  virtual void ProcessAttributeBuffer(uint64 offset,
+  virtual void ProcessAttributeBuffer(uint64_t offset,
                                       enum DwarfAttribute attr,
                                       enum DwarfForm form,
-                                      const uint8_t *data,
-                                      uint64 len) { }
+                                      const uint8_t* data,
+                                      uint64_t len) { }
 
   // Called when we have an attribute with string data to give to our handler.
   // The attribute is for the DIE at OFFSET from the beginning of the
   // .debug_info section. Its name is ATTR, its form is FORM, and its value is
   // DATA.
-  virtual void ProcessAttributeString(uint64 offset,
+  virtual void ProcessAttributeString(uint64_t offset,
                                       enum DwarfAttribute attr,
                                       enum DwarfForm form,
                                       const string& data) { }
@@ -304,16 +406,16 @@
   // of a type unit in the .debug_types section. OFFSET is the offset of
   // the DIE whose attribute we're reporting. ATTR and FORM are the
   // attribute's name and form. SIGNATURE is the type unit's signature.
-  virtual void ProcessAttributeSignature(uint64 offset,
+  virtual void ProcessAttributeSignature(uint64_t offset,
                                          enum DwarfAttribute attr,
                                          enum DwarfForm form,
-                                         uint64 signature) { }
+                                         uint64_t signature) { }
 
   // Called when finished processing the DIE at OFFSET.
   // Because DWARF2/3 specifies a tree of DIEs, you may get starts
   // before ends of the previous DIE, as we process children before
   // ending the parent.
-  virtual void EndDIE(uint64 offset) { }
+  virtual void EndDIE(uint64_t offset) { }
 
 };
 
@@ -358,8 +460,8 @@
   // Initialize a compilation unit.  This requires a map of sections,
   // the offset of this compilation unit in the .debug_info section, a
   // ByteReader, and a Dwarf2Handler class to call callbacks in.
-  CompilationUnit(const string& path, const SectionMap& sections, uint64 offset,
-                  ByteReader* reader, Dwarf2Handler* handler);
+  CompilationUnit(const string& path, const SectionMap& sections,
+                  uint64_t offset, ByteReader* reader, Dwarf2Handler* handler);
   virtual ~CompilationUnit() {
     if (abbrevs_) delete abbrevs_;
   }
@@ -370,8 +472,8 @@
   // compilation unit.  We also inherit the Dwarf2Handler from
   // the executable file, and call it as if we were still
   // processing the original compilation unit.
-  void SetSplitDwarf(const uint8_t* addr_buffer, uint64 addr_buffer_length,
-                     uint64 addr_base, uint64 ranges_base, uint64 dwo_id);
+  void SetSplitDwarf(const uint8_t* addr_buffer, uint64_t addr_buffer_length,
+                     uint64_t addr_base, uint64_t ranges_base, uint64_t dwo_id);
 
   // Begin reading a Dwarf2 compilation unit, and calling the
   // callbacks in the Dwarf2Handler
@@ -380,7 +482,7 @@
   // headers. This plus the starting offset passed to the constructor
   // is the offset of the end of the compilation unit --- and the
   // start of the next compilation unit, if there is one.
-  uint64 Start();
+  uint64_t Start();
 
  private:
 
@@ -388,7 +490,7 @@
   // The abbreviation tells how to read a DWARF2/3 DIE, and consist of a
   // tag and a list of attributes, as well as the data form of each attribute.
   struct Abbrev {
-    uint64 number;
+    uint64_t number;
     enum DwarfTag tag;
     bool has_children;
     AttributeList attributes;
@@ -398,10 +500,10 @@
   // in the actual file, as the one in the file may have a 32 bit or
   // 64 bit length.
   struct CompilationUnitHeader {
-    uint64 length;
-    uint16 version;
-    uint64 abbrev_offset;
-    uint8 address_size;
+    uint64_t length;
+    uint16_t version;
+    uint64_t abbrev_offset;
+    uint8_t address_size;
   } header_;
 
   // Reads the DWARF2/3 header for this compilation unit.
@@ -410,18 +512,34 @@
   // Reads the DWARF2/3 abbreviations for this compilation unit
   void ReadAbbrevs();
 
+  // Read the abbreviation offset for this compilation unit
+  size_t ReadAbbrevOffset(const uint8_t* headerptr);
+
+  // Read the address size for this compilation unit
+  size_t ReadAddressSize(const uint8_t* headerptr);
+
+  // Read the DWO id from a split or skeleton compilation unit header
+  size_t ReadDwoId(const uint8_t* headerptr);
+
+  // Read the type signature from a type or split type compilation unit header
+  size_t ReadTypeSignature(const uint8_t* headerptr);
+
+  // Read the DWO id from a split or skeleton compilation unit header
+  size_t ReadTypeOffset(const uint8_t* headerptr);
+
   // Processes a single DIE for this compilation unit and return a new
   // pointer just past the end of it
-  const uint8_t *ProcessDIE(uint64 dieoffset,
-                            const uint8_t *start,
+  const uint8_t* ProcessDIE(uint64_t dieoffset,
+                            const uint8_t* start,
                             const Abbrev& abbrev);
 
   // Processes a single attribute and return a new pointer just past the
   // end of it
-  const uint8_t *ProcessAttribute(uint64 dieoffset,
-                                  const uint8_t *start,
+  const uint8_t* ProcessAttribute(uint64_t dieoffset,
+                                  const uint8_t* start,
                                   enum DwarfAttribute attr,
-                                  enum DwarfForm form);
+                                  enum DwarfForm form,
+                                  uint64_t implicit_const);
 
   // Called when we have an attribute with unsigned data to give to
   // our handler.  The attribute is for the DIE at OFFSET from the
@@ -429,17 +547,17 @@
   // FORM, and the actual data of the attribute is in DATA.
   // If we see a DW_AT_GNU_dwo_id attribute, save the value so that
   // we can find the debug info in a .dwo or .dwp file.
-  void ProcessAttributeUnsigned(uint64 offset,
+  void ProcessAttributeUnsigned(uint64_t offset,
                                 enum DwarfAttribute attr,
                                 enum DwarfForm form,
-                                uint64 data) {
+                                uint64_t data) {
     if (attr == DW_AT_GNU_dwo_id) {
       dwo_id_ = data;
     }
     else if (attr == DW_AT_GNU_addr_base) {
       addr_base_ = data;
     }
-    else if (attr == DW_AT_GNU_ranges_base) {
+    else if (attr == DW_AT_GNU_ranges_base || attr == DW_AT_rnglists_base) {
       ranges_base_ = data;
     }
     // TODO(yunlian): When we add DW_AT_ranges_base from DWARF-5,
@@ -455,10 +573,10 @@
   // our handler.  The attribute is for the DIE at OFFSET from the
   // beginning of compilation unit, has a name of ATTR, a form of
   // FORM, and the actual data of the attribute is in DATA.
-  void ProcessAttributeSigned(uint64 offset,
+  void ProcessAttributeSigned(uint64_t offset,
                               enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              int64 data) {
+                              int64_t data) {
     handler_->ProcessAttributeSigned(offset, attr, form, data);
   }
 
@@ -467,21 +585,29 @@
   // beginning of compilation unit, has a name of ATTR, a form of
   // FORM, and the actual data of the attribute is in DATA, and the
   // length of the buffer is LENGTH.
-  void ProcessAttributeBuffer(uint64 offset,
+  void ProcessAttributeBuffer(uint64_t offset,
                               enum DwarfAttribute attr,
                               enum DwarfForm form,
                               const uint8_t* data,
-                              uint64 len) {
+                              uint64_t len) {
     handler_->ProcessAttributeBuffer(offset, attr, form, data, len);
   }
 
+  // Handles the common parts of DW_FORM_GNU_str_index, DW_FORM_strx,
+  // DW_FORM_strx1, DW_FORM_strx2, DW_FORM_strx3, and DW_FORM_strx4.
+  // Retrieves the data and calls through to ProcessAttributeString.
+  void ProcessFormStringIndex(uint64_t offset,
+                              enum DwarfAttribute attr,
+                              enum DwarfForm form,
+                              uint64_t str_index);
+
   // Called when we have an attribute with string data to give to
   // our handler.  The attribute is for the DIE at OFFSET from the
   // beginning of compilation unit, has a name of ATTR, a form of
   // FORM, and the actual data of the attribute is in DATA.
   // If we see a DW_AT_GNU_dwo_name attribute, save the value so
   // that we can find the debug info in a .dwo or .dwp file.
-  void ProcessAttributeString(uint64 offset,
+  void ProcessAttributeString(uint64_t offset,
                               enum DwarfAttribute attr,
                               enum DwarfForm form,
                               const char* data) {
@@ -490,16 +616,28 @@
     handler_->ProcessAttributeString(offset, attr, form, data);
   }
 
+  // Called to handle common portions of DW_FORM_addrx and variations, as well
+  // as DW_FORM_GNU_addr_index.
+  void ProcessAttributeAddrIndex(uint64_t offset,
+                                 enum DwarfAttribute attr,
+                                 enum DwarfForm form,
+                                 uint64_t addr_index) {
+    const uint8_t* addr_ptr =
+        addr_buffer_ + addr_base_ + addr_index * reader_->AddressSize();
+    ProcessAttributeUnsigned(
+        offset, attr, form, reader_->ReadAddress(addr_ptr));
+  }
+
   // Processes all DIEs for this compilation unit
   void ProcessDIEs();
 
   // Skips the die with attributes specified in ABBREV starting at
   // START, and return the new place to position the stream to.
-  const uint8_t *SkipDIE(const uint8_t *start, const Abbrev& abbrev);
+  const uint8_t* SkipDIE(const uint8_t* start, const Abbrev& abbrev);
 
   // Skips the attribute starting at START, with FORM, and return the
   // new place to position the stream to.
-  const uint8_t *SkipAttribute(const uint8_t *start, enum DwarfForm form);
+  const uint8_t* SkipAttribute(const uint8_t* start, enum DwarfForm form);
 
   // Process the actual debug information in a split DWARF file.
   void ProcessSplitDwarf();
@@ -513,14 +651,14 @@
 
   // Offset from section start is the offset of this compilation unit
   // from the beginning of the .debug_info section.
-  uint64 offset_from_section_start_;
+  uint64_t offset_from_section_start_;
 
   // buffer is the buffer for our CU, starting at .debug_info + offset
   // passed in from constructor.
   // after_header points to right after the compilation unit header.
-  const uint8_t *buffer_;
-  uint64 buffer_length_;
-  const uint8_t *after_header_;
+  const uint8_t* buffer_;
+  uint64_t buffer_length_;
+  const uint8_t* after_header_;
 
   // The associated ByteReader that handles endianness issues for us
   ByteReader* reader_;
@@ -539,18 +677,22 @@
   // String section buffer and length, if we have a string section.
   // This is here to avoid doing a section lookup for strings in
   // ProcessAttribute, which is in the hot path for DWARF2 reading.
-  const uint8_t *string_buffer_;
-  uint64 string_buffer_length_;
+  const uint8_t* string_buffer_;
+  uint64_t string_buffer_length_;
+
+  // Similarly for .debug_line_string.
+  const uint8_t* line_string_buffer_;
+  uint64_t line_string_buffer_length_;
 
   // String offsets section buffer and length, if we have a string offsets
   // section (.debug_str_offsets or .debug_str_offsets.dwo).
   const uint8_t* str_offsets_buffer_;
-  uint64 str_offsets_buffer_length_;
+  uint64_t str_offsets_buffer_length_;
 
   // Address section buffer and length, if we have an address section
   // (.debug_addr).
   const uint8_t* addr_buffer_;
-  uint64 addr_buffer_length_;
+  uint64_t addr_buffer_length_;
 
   // Flag indicating whether this compilation unit is part of a .dwo
   // or .dwp file.  If true, we are reading this unit because a
@@ -562,20 +704,27 @@
   bool is_split_dwarf_;
 
   // The value of the DW_AT_GNU_dwo_id attribute, if any.
-  uint64 dwo_id_;
+  uint64_t dwo_id_;
+
+  // The value of the DW_AT_GNU_type_signature attribute, if any.
+  uint64_t type_signature_;
+
+  // The value of the DW_AT_GNU_type_offset attribute, if any.
+  size_t type_offset_;
 
   // The value of the DW_AT_GNU_dwo_name attribute, if any.
   const char* dwo_name_;
 
   // If this is a split DWARF CU, the value of the DW_AT_GNU_dwo_id attribute
   // from the skeleton CU.
-  uint64 skeleton_dwo_id_;
+  uint64_t skeleton_dwo_id_;
 
-  // The value of the DW_AT_GNU_ranges_base attribute, if any.
-  uint64 ranges_base_;
+  // The value of the DW_AT_GNU_ranges_base or DW_AT_rnglists_base attribute,
+  // if any.
+  uint64_t ranges_base_;
 
   // The value of the DW_AT_GNU_addr_base attribute, if any.
-  uint64 addr_base_;
+  uint64_t addr_base_;
 
   // True if we have already looked for a .dwp file.
   bool have_checked_for_dwp_;
@@ -613,16 +762,16 @@
   void Initialize();
 
   // Read the debug sections for the given dwo_id.
-  void ReadDebugSectionsForCU(uint64 dwo_id, SectionMap* sections);
+  void ReadDebugSectionsForCU(uint64_t dwo_id, SectionMap* sections);
 
  private:
   // Search a v1 hash table for "dwo_id".  Returns the slot index
   // where the dwo_id was found, or -1 if it was not found.
-  int LookupCU(uint64 dwo_id);
+  int LookupCU(uint64_t dwo_id);
 
   // Search a v2 hash table for "dwo_id".  Returns the row index
   // in the offsets and sizes tables, or 0 if it was not found.
-  uint32 LookupCUv2(uint64 dwo_id);
+  uint32_t LookupCUv2(uint64_t dwo_id);
 
   // The ELF reader for the .dwp file.
   ElfReader* elf_reader_;
@@ -905,8 +1054,8 @@
   // The mechanics of C++ exception handling, personality routines,
   // and language-specific data areas are described here, rather nicely:
   // http://www.codesourcery.com/public/cxx-abi/abi-eh.html
-  CallFrameInfo(const uint8_t *buffer, size_t buffer_length,
-                ByteReader *reader, Handler *handler, Reporter *reporter,
+  CallFrameInfo(const uint8_t* buffer, size_t buffer_length,
+                ByteReader* reader, Handler* handler, Reporter* reporter,
                 bool eh_frame = false)
       : buffer_(buffer), buffer_length_(buffer_length),
         reader_(reader), handler_(handler), reporter_(reporter),
@@ -920,7 +1069,7 @@
   bool Start();
 
   // Return the textual name of KIND. For error reporting.
-  static const char *KindName(EntryKind kind);
+  static const char* KindName(EntryKind kind);
 
  private:
 
@@ -933,7 +1082,7 @@
     size_t offset;
 
     // The start of this entry in the buffer.
-    const uint8_t *start;
+    const uint8_t* start;
     
     // Which kind of entry this is.
     //
@@ -944,31 +1093,31 @@
 
     // The end of this entry's common prologue (initial length and id), and
     // the start of this entry's kind-specific fields.
-    const uint8_t *fields;
+    const uint8_t* fields;
 
     // The start of this entry's instructions.
-    const uint8_t *instructions;
+    const uint8_t* instructions;
 
     // The address past the entry's last byte in the buffer. (Note that
     // since offset points to the entry's initial length field, and the
     // length field is the number of bytes after that field, this is not
     // simply buffer_ + offset + length.)
-    const uint8_t *end;
+    const uint8_t* end;
 
     // For both DWARF CFI and .eh_frame sections, this is the CIE id in a
     // CIE, and the offset of the associated CIE in an FDE.
-    uint64 id;
+    uint64_t id;
 
     // The CIE that applies to this entry, if we've parsed it. If this is a
     // CIE, then this field points to this structure.
-    CIE *cie;
+    CIE* cie;
   };
 
   // A common information entry (CIE).
   struct CIE: public Entry {
-    uint8 version;                      // CFI data version number
+    uint8_t version;                      // CFI data version number
     string augmentation;                // vendor format extension markers
-    uint64 code_alignment_factor;       // scale for code address adjustments 
+    uint64_t code_alignment_factor;       // scale for code address adjustments 
     int data_alignment_factor;          // scale for stack pointer adjustments
     unsigned return_address_register;   // which register holds the return addr
 
@@ -992,24 +1141,29 @@
     // If has_z_personality is true, this is the address of the personality
     // routine --- or, if personality_encoding & DW_EH_PE_indirect, the
     // address where the personality routine's address is stored.
-    uint64 personality_address;
+    uint64_t personality_address;
 
     // This is the encoding used for addresses in the FDE header and
     // in DW_CFA_set_loc instructions. This is always valid, whether
     // or not we saw a 'z' augmentation string; its default value is
     // DW_EH_PE_absptr, which is what normal DWARF CFI uses.
     DwarfPointerEncoding pointer_encoding;
+
+    // These were only introduced in DWARF4, so will not be set in older
+    // versions.
+    uint8_t address_size;
+    uint8_t segment_size;
   };
 
   // A frame description entry (FDE).
   struct FDE: public Entry {
-    uint64 address;                     // start address of described code
-    uint64 size;                        // size of described code, in bytes
+    uint64_t address;                     // start address of described code
+    uint64_t size;                        // size of described code, in bytes
 
     // If cie->has_z_lsda is true, then this is the language-specific data
     // area's address --- or its address's address, if cie->lsda_encoding
     // has the DW_EH_PE_indirect bit set.
-    uint64 lsda_address;
+    uint64_t lsda_address;
   };
 
   // Internal use.
@@ -1030,14 +1184,14 @@
   // true. On failure, report the problem, and return false. Even if we
   // return false, set ENTRY->end to the first byte after the entry if we
   // were able to figure that out, or NULL if we weren't.
-  bool ReadEntryPrologue(const uint8_t *cursor, Entry *entry);
+  bool ReadEntryPrologue(const uint8_t* cursor, Entry* entry);
 
   // Parse the fields of a CIE after the entry prologue, including any 'z'
   // augmentation data. Assume that the 'Entry' fields of CIE are
   // populated; use CIE->fields and CIE->end as the start and limit for
   // parsing. On success, populate the rest of *CIE, and return true; on
   // failure, report the problem and return false.
-  bool ReadCIEFields(CIE *cie);
+  bool ReadCIEFields(CIE* cie);
 
   // Parse the fields of an FDE after the entry prologue, including any 'z'
   // augmentation data. Assume that the 'Entry' fields of *FDE are
@@ -1045,12 +1199,12 @@
   // parsing. Assume that FDE->cie is fully initialized. On success,
   // populate the rest of *FDE, and return true; on failure, report the
   // problem and return false.
-  bool ReadFDEFields(FDE *fde);
+  bool ReadFDEFields(FDE* fde);
 
   // Report that ENTRY is incomplete, and return false. This is just a
   // trivial wrapper for invoking reporter_->Incomplete; it provides a
   // little brevity.
-  bool ReportIncomplete(Entry *entry);
+  bool ReportIncomplete(Entry* entry);
 
   // Return true if ENCODING has the DW_EH_PE_indirect bit set.
   static bool IsIndirectEncoding(DwarfPointerEncoding encoding) {
@@ -1058,17 +1212,17 @@
   }
 
   // The contents of the DWARF .debug_info section we're parsing.
-  const uint8_t *buffer_;
+  const uint8_t* buffer_;
   size_t buffer_length_;
 
   // For reading multi-byte values with the appropriate endianness.
-  ByteReader *reader_;
+  ByteReader* reader_;
 
   // The handler to which we should report the data we find.
-  Handler *handler_;
+  Handler* handler_;
 
   // For reporting problems in the info we're parsing.
-  Reporter *reporter_;
+  Reporter* reporter_;
 
   // True if we are processing .eh_frame-format data.
   bool eh_frame_;
@@ -1100,8 +1254,8 @@
   // to the handler explicitly; instead, if the handler elects to
   // process a given FDE, the parser reiterates the appropriate CIE's
   // contents at the beginning of the FDE's rules.
-  virtual bool Entry(size_t offset, uint64 address, uint64 length,
-                     uint8 version, const string &augmentation,
+  virtual bool Entry(size_t offset, uint64_t address, uint64_t length,
+                     uint8_t version, const string& augmentation,
                      unsigned return_address) = 0;
 
   // When the Entry function returns true, the parser calls these
@@ -1123,21 +1277,21 @@
   // computation. All other REG values will be positive.
 
   // At ADDRESS, register REG's value is not recoverable.
-  virtual bool UndefinedRule(uint64 address, int reg) = 0;
+  virtual bool UndefinedRule(uint64_t address, int reg) = 0;
 
   // At ADDRESS, register REG's value is the same as that it had in
   // the caller.
-  virtual bool SameValueRule(uint64 address, int reg) = 0;
+  virtual bool SameValueRule(uint64_t address, int reg) = 0;
 
   // At ADDRESS, register REG has been saved at offset OFFSET from
   // BASE_REGISTER.
-  virtual bool OffsetRule(uint64 address, int reg,
+  virtual bool OffsetRule(uint64_t address, int reg,
                           int base_register, long offset) = 0;
 
   // At ADDRESS, the caller's value of register REG is the current
   // value of BASE_REGISTER plus OFFSET. (This rule doesn't provide an
   // address at which the register's value is saved.)
-  virtual bool ValOffsetRule(uint64 address, int reg,
+  virtual bool ValOffsetRule(uint64_t address, int reg,
                              int base_register, long offset) = 0;
 
   // At ADDRESS, register REG has been saved in BASE_REGISTER. This differs
@@ -1145,18 +1299,18 @@
   // BASE_REGISTER is the "home" for REG's saved value: if you want to
   // assign to a variable whose home is REG in the calling frame, you
   // should put the value in BASE_REGISTER.
-  virtual bool RegisterRule(uint64 address, int reg, int base_register) = 0;
+  virtual bool RegisterRule(uint64_t address, int reg, int base_register) = 0;
 
   // At ADDRESS, the DWARF expression EXPRESSION yields the address at
   // which REG was saved.
-  virtual bool ExpressionRule(uint64 address, int reg,
-                              const string &expression) = 0;
+  virtual bool ExpressionRule(uint64_t address, int reg,
+                              const string& expression) = 0;
 
   // At ADDRESS, the DWARF expression EXPRESSION yields the caller's
   // value for REG. (This rule doesn't provide an address at which the
   // register's value is saved.)
-  virtual bool ValExpressionRule(uint64 address, int reg,
-                                 const string &expression) = 0;
+  virtual bool ValExpressionRule(uint64_t address, int reg,
+                                 const string& expression) = 0;
 
   // Indicate that the rules for the address range reported by the
   // last call to Entry are complete.  End should return true if
@@ -1196,7 +1350,7 @@
   // which the routine's address is stored. The default definition for
   // this handler function simply returns true, allowing parsing of
   // the entry to continue.
-  virtual bool PersonalityRoutine(uint64 address, bool indirect) {
+  virtual bool PersonalityRoutine(uint64_t address, bool indirect) {
     return true;
   }
 
@@ -1205,7 +1359,7 @@
   // which the area's address is stored. The default definition for
   // this handler function simply returns true, allowing parsing of
   // the entry to continue.
-  virtual bool LanguageSpecificDataArea(uint64 address, bool indirect) {
+  virtual bool LanguageSpecificDataArea(uint64_t address, bool indirect) {
     return true;
   }
 
@@ -1233,85 +1387,85 @@
   // in a Mach-O section named __debug_frame. If we support
   // Linux-style exception handling data, we could be reading an
   // .eh_frame section.
-  Reporter(const string &filename,
-           const string &section = ".debug_frame")
+  Reporter(const string& filename,
+           const string& section = ".debug_frame")
       : filename_(filename), section_(section) { }
   virtual ~Reporter() { }
 
   // The CFI entry at OFFSET ends too early to be well-formed. KIND
   // indicates what kind of entry it is; KIND can be kUnknown if we
   // haven't parsed enough of the entry to tell yet.
-  virtual void Incomplete(uint64 offset, CallFrameInfo::EntryKind kind);
+  virtual void Incomplete(uint64_t offset, CallFrameInfo::EntryKind kind);
 
   // The .eh_frame data has a four-byte zero at OFFSET where the next
   // entry's length would be; this is a terminator. However, the buffer
   // length as given to the CallFrameInfo constructor says there should be
   // more data.
-  virtual void EarlyEHTerminator(uint64 offset);
+  virtual void EarlyEHTerminator(uint64_t offset);
 
   // The FDE at OFFSET refers to the CIE at CIE_OFFSET, but the
   // section is not that large.
-  virtual void CIEPointerOutOfRange(uint64 offset, uint64 cie_offset);
+  virtual void CIEPointerOutOfRange(uint64_t offset, uint64_t cie_offset);
 
   // The FDE at OFFSET refers to the CIE at CIE_OFFSET, but the entry
   // there is not a CIE.
-  virtual void BadCIEId(uint64 offset, uint64 cie_offset);
+  virtual void BadCIEId(uint64_t offset, uint64_t cie_offset);
 
   // The FDE at OFFSET refers to a CIE with an address size we don't know how
   // to handle.
-  virtual void UnexpectedAddressSize(uint64 offset, uint8_t address_size);
+  virtual void UnexpectedAddressSize(uint64_t offset, uint8_t address_size);
 
   // The FDE at OFFSET refers to a CIE with an segment descriptor size we
   // don't know how to handle.
-  virtual void UnexpectedSegmentSize(uint64 offset, uint8_t segment_size);
+  virtual void UnexpectedSegmentSize(uint64_t offset, uint8_t segment_size);
 
   // The FDE at OFFSET refers to a CIE with version number VERSION,
   // which we don't recognize. We cannot parse DWARF CFI if it uses
   // a version number we don't recognize.
-  virtual void UnrecognizedVersion(uint64 offset, int version);
+  virtual void UnrecognizedVersion(uint64_t offset, int version);
 
   // The FDE at OFFSET refers to a CIE with augmentation AUGMENTATION,
   // which we don't recognize. We cannot parse DWARF CFI if it uses
   // augmentations we don't recognize.
-  virtual void UnrecognizedAugmentation(uint64 offset,
-                                        const string &augmentation);
+  virtual void UnrecognizedAugmentation(uint64_t offset,
+                                        const string& augmentation);
 
   // The pointer encoding ENCODING, specified by the CIE at OFFSET, is not
   // a valid encoding.
-  virtual void InvalidPointerEncoding(uint64 offset, uint8 encoding);
+  virtual void InvalidPointerEncoding(uint64_t offset, uint8_t encoding);
 
   // The pointer encoding ENCODING, specified by the CIE at OFFSET, depends
   // on a base address which has not been supplied.
-  virtual void UnusablePointerEncoding(uint64 offset, uint8 encoding);
+  virtual void UnusablePointerEncoding(uint64_t offset, uint8_t encoding);
 
   // The CIE at OFFSET contains a DW_CFA_restore instruction at
   // INSN_OFFSET, which may not appear in a CIE.
-  virtual void RestoreInCIE(uint64 offset, uint64 insn_offset);
+  virtual void RestoreInCIE(uint64_t offset, uint64_t insn_offset);
 
   // The entry at OFFSET, of kind KIND, has an unrecognized
   // instruction at INSN_OFFSET.
-  virtual void BadInstruction(uint64 offset, CallFrameInfo::EntryKind kind,
-                              uint64 insn_offset);
+  virtual void BadInstruction(uint64_t offset, CallFrameInfo::EntryKind kind,
+                              uint64_t insn_offset);
 
   // The instruction at INSN_OFFSET in the entry at OFFSET, of kind
   // KIND, establishes a rule that cites the CFA, but we have not
   // established a CFA rule yet.
-  virtual void NoCFARule(uint64 offset, CallFrameInfo::EntryKind kind, 
-                         uint64 insn_offset);
+  virtual void NoCFARule(uint64_t offset, CallFrameInfo::EntryKind kind, 
+                         uint64_t insn_offset);
 
   // The instruction at INSN_OFFSET in the entry at OFFSET, of kind
   // KIND, is a DW_CFA_restore_state instruction, but the stack of
   // saved states is empty.
-  virtual void EmptyStateStack(uint64 offset, CallFrameInfo::EntryKind kind, 
-                               uint64 insn_offset);
+  virtual void EmptyStateStack(uint64_t offset, CallFrameInfo::EntryKind kind, 
+                               uint64_t insn_offset);
 
   // The DW_CFA_remember_state instruction at INSN_OFFSET in the entry
   // at OFFSET, of kind KIND, would restore a state that has no CFA
   // rule, whereas the current state does have a CFA rule. This is
   // bogus input, which the CallFrameInfo::Handler interface doesn't
   // (and shouldn't) have any way to report.
-  virtual void ClearingCFARule(uint64 offset, CallFrameInfo::EntryKind kind, 
-                               uint64 insn_offset);
+  virtual void ClearingCFARule(uint64_t offset, CallFrameInfo::EntryKind kind, 
+                               uint64_t insn_offset);
 
  protected:
   // The name of the file whose CFI we're reading.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,187 @@
+// Copyright (c) 2020, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Original author: Sterling Augustine <saugustine@google.com>
+
+// dwarf2reader_lineinfo_unittest.cc: Unit tests for dwarf2reader::LineInfo
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <string>
+#include <vector>
+
+#include "breakpad_googletest_includes.h"
+#include "common/dwarf/bytereader.h"
+#include "common/dwarf/dwarf2reader.h"
+#include "google_breakpad/common/breakpad_types.h"
+
+using std::vector;
+using testing::InSequence;
+using testing::Return;
+using testing::Sequence;
+using testing::Test;
+using testing::_;
+
+using namespace dwarf2reader;
+
+namespace {
+
+const uint8_t dwarf5_line_program[] = {
+  0x40, 0x0, 0x0, 0x0,  // unit_length (end - begin)
+  // begin
+  0x05, 0x0,  // version
+  0x8,  // address_size
+  0x0,  // segment_selector_size
+  0x26, 0x0, 0x0, 0x0, // header_length (end_header_end - begin_header)
+  // begin_header:
+  0x1,  // minimum_instruction_length
+  0x1,  // maximum_operations_per_instruction
+  0x1,  // default_is_stmt
+  0xfb, // line_base
+  0xe,  // line_range
+  0xd,  // opcode_base and lengths
+  0x0, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x1,
+  0x1,  // directory entry format count
+  DW_LNCT_path, DW_FORM_strp,
+  0x1,  // directories count
+  0x1, 0x0, 0x0, 0x0, // offset into .debug_line_str
+  0x2,  // file_name_entry_format_count
+  DW_LNCT_directory_index, DW_FORM_data1,
+  DW_LNCT_path, DW_FORM_line_strp,
+  0x1,  // filename count
+  0x0,  // directory index
+  0x1, 0x0, 0x0, 0x0, // offset into .debug_str
+  // end_header
+  DW_LNS_set_file, 0x0,
+  //  set address to 0x0
+  0x0, 0x9, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+  // Advance Address by 0 and line by 3
+  0x15,
+  // Advance PC by 1
+  0x2, 0x1,
+  0x0,
+  DW_LNE_end_sequence,
+  DW_LNE_end_sequence,
+  // end
+};
+
+const uint8_t dwarf4_line_program[] = {
+  0x37, 0x0, 0x0, 0x0,  // unit_length (end - begin)
+  // begin
+  0x04, 0x0,  // version
+  0x1d, 0x0, 0x0, 0x0, // header_length (end_header - begin_header)
+  // begin_header:
+  0x1,  // minimum_instruction_length
+  0x1,  // maximum_operations_per_instruction
+  0x1,  // default_is_stmt
+  0xfb, // line_base
+  0xe,  // line_range
+  0xd,  // opcode_base and lengths
+  0x0, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x1,
+  '/', 'a', '\0',  // directory entry 1 (zeroth entry implied)
+  '\0', // end of directory table
+  'b', '/', 'c', '\0',  // file entry 1 (zeroth entry implied)
+  0, // file 1 directory
+  0, // file 1 modification time
+  0, // file 1 length
+  '\0', // end of file table
+  // end_header
+  DW_LNS_set_file, 0x0,
+  //  set address to 0x0
+  0x0, 0x9, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+  // Advance Address by 0 and line by 3
+  0x15,
+  // Advance PC by 1
+  0x2, 0x1,
+  0x0,
+  DW_LNE_end_sequence,
+  DW_LNE_end_sequence,
+  // end
+};
+
+class MockLineInfoHandler: public LineInfoHandler {
+ public:
+  MOCK_METHOD(void, DefineDir, (const string&, uint32_t dir_num), (override));
+  MOCK_METHOD(void, DefineFile, (const string& name, int32_t file_num,
+                                 uint32_t dir_num, uint64_t mod_time,
+                                 uint64_t length), (override));
+  MOCK_METHOD(void, AddLine, (uint64_t address, uint64_t length,
+                              uint32_t file_num, uint32_t line_num,
+                              uint32_t column_num), (override));
+};
+
+const uint8_t string_section[] = {'x', '/', 'a', '\0'};
+const uint8_t line_string_section[] = {'x', 'b', '/', 'c', '\0' };
+
+struct LineProgram: public Test {
+  MockLineInfoHandler handler_;
+};
+
+TEST_F(LineProgram, ReadLinesDwarf5) {
+  ByteReader byte_reader(ENDIANNESS_LITTLE);
+  // LineTables don't specify the offset size like Compilation Units do.
+  byte_reader.SetOffsetSize(4);
+  LineInfo line_reader(dwarf5_line_program,
+                       sizeof(dwarf5_line_program),
+                       &byte_reader,
+                       string_section,
+                       sizeof(string_section),
+                       line_string_section,
+                       sizeof(line_string_section),
+                       &handler_);
+  EXPECT_CALL(handler_, DefineDir("/a", 0)).Times(1);
+  EXPECT_CALL(handler_, DefineFile("b/c", 0, 0, 0, 0)).Times(1);
+  EXPECT_CALL(handler_, AddLine(0, 1, 0, 4, 0)).Times(1);
+  EXPECT_EQ(line_reader.Start(), sizeof(dwarf5_line_program));
+}
+
+TEST_F(LineProgram, ReadLinesDwarf4) {
+  ByteReader byte_reader(ENDIANNESS_LITTLE);
+  // LineTables don't specify the offset size like Compilation Units do.
+  byte_reader.SetOffsetSize(4);
+  // dwarf4 line info headers don't encode the address size.
+  byte_reader.SetAddressSize(8);
+  LineInfo line_reader(dwarf4_line_program,
+                       sizeof(dwarf5_line_program),
+                       &byte_reader,
+                       // dwarf4 line tables can't access the string sections
+                       // so pass values likely to make assertions fail if
+                       // the code uses them improperly.
+                       nullptr, 0, nullptr, 0,
+                       &handler_);
+  EXPECT_CALL(handler_, DefineDir("", 0)).Times(1);
+  EXPECT_CALL(handler_, DefineDir("/a", 1)).Times(1);
+  EXPECT_CALL(handler_, DefineFile("", 0, 0, 0, 0)).Times(1);
+  EXPECT_CALL(handler_, DefineFile("b/c", 1, 0, 0, 0)).Times(1);
+  EXPECT_CALL(handler_, AddLine(0, 1, 0, 4, 0)).Times(1);
+  EXPECT_EQ(line_reader.Start(), sizeof(dwarf4_line_program));
+}
+
+}  // anonymous namespace
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_test_common.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_test_common.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_test_common.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/dwarf2reader_test_common.h	2021-12-09 12:01:26.000000000 +0000
@@ -57,7 +57,7 @@
     assert(format_size == 4 || format_size == 8);
     format_size_ = format_size;
   }
-    
+
   // Append a DWARF section offset value, of the appropriate size for this
   // compilation unit.
   template<typename T>
@@ -70,7 +70,7 @@
 
   // Append a DWARF compilation unit header to the section, with the given
   // DWARF version, abbrev table offset, and address size.
-  TestCompilationUnit &Header(int version, const Label &abbrev_offset,
+  TestCompilationUnit& Header(int version, const Label& abbrev_offset,
                               size_t address_size) {
     if (format_size_ == 4) {
       D32(length_);
@@ -80,13 +80,19 @@
     }
     post_length_offset_ = Size();
     D16(version);
-    SectionOffset(abbrev_offset);
-    D8(address_size);
+    if (version <= 4) {
+      SectionOffset(abbrev_offset);
+      D8(address_size);
+    } else {
+      D8(0x01);  // DW_UT_compile
+      D8(address_size);
+      SectionOffset(abbrev_offset);
+    }
     return *this;
   }
 
   // Mark the end of this header's DIEs.
-  TestCompilationUnit &Finish() {
+  TestCompilationUnit& Finish() {
     length_ = Size() - post_length_offset_;
     return *this;
   }
@@ -116,7 +122,7 @@
   // Start a new abbreviation table entry for abbreviation code |code|,
   // encoding a DIE whose tag is |tag|, and which has children if and only
   // if |has_children| is true.
-  TestAbbrevTable &Abbrev(int code, DwarfTag tag, DwarfHasChild has_children) {
+  TestAbbrevTable& Abbrev(int code, DwarfTag tag, DwarfHasChild has_children) {
     assert(code != 0);
     ULEB128(code);
     ULEB128(static_cast<unsigned>(tag));
@@ -126,21 +132,21 @@
 
   // Add an attribute to the current abbreviation code whose name is |name|
   // and whose form is |form|.
-  TestAbbrevTable &Attribute(DwarfAttribute name, DwarfForm form) {
+  TestAbbrevTable& Attribute(DwarfAttribute name, DwarfForm form) {
     ULEB128(static_cast<unsigned>(name));
     ULEB128(static_cast<unsigned>(form));
     return *this;
   }
 
   // Finish the current abbreviation code.
-  TestAbbrevTable &EndAbbrev() {
+  TestAbbrevTable& EndAbbrev() {
     ULEB128(0);
     ULEB128(0);
     return *this;
   }
 
   // Finish the current abbreviation table.
-  TestAbbrevTable &EndTable() {
+  TestAbbrevTable& EndTable() {
     ULEB128(0);
     return *this;
   }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/elf_reader.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/elf_reader.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/elf_reader.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/elf_reader.cc	2021-12-09 12:01:26.000000000 +0000
@@ -20,8 +20,8 @@
 // Although most of this code can deal with arbitrary ELF files of
 // either word size, the public ElfReader interface only examines
 // files loaded into the current address space, which must all match
-// __WORDSIZE. This code cannot handle ELF files with a non-native
-// byte ordering.
+// the machine's native word size. This code cannot handle ELF files
+// with a non-native byte ordering.
 //
 // TODO(chatham): It would be nice if we could accomplish this task
 // without using malloc(), so we could use it as the process is dying.
@@ -30,12 +30,13 @@
 #define _GNU_SOURCE  // needed for pread()
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <algorithm>
 #include <map>
@@ -129,11 +130,11 @@
   static const int kElfClass = ELFCLASS32;
 
   // Given a symbol pointer, return the binding type (eg STB_WEAK).
-  static char Bind(const Elf32_Sym *sym) {
+  static char Bind(const Elf32_Sym* sym) {
     return ELF32_ST_BIND(sym->st_info);
   }
   // Given a symbol pointer, return the symbol type (eg STT_FUNC).
-  static char Type(const Elf32_Sym *sym) {
+  static char Type(const Elf32_Sym* sym) {
     return ELF32_ST_TYPE(sym->st_info);
   }
 
@@ -157,10 +158,10 @@
   // What should be in the EI_CLASS header.
   static const int kElfClass = ELFCLASS64;
 
-  static char Bind(const Elf64_Sym *sym) {
+  static char Bind(const Elf64_Sym* sym) {
     return ELF64_ST_BIND(sym->st_info);
   }
-  static char Type(const Elf64_Sym *sym) {
+  static char Type(const Elf64_Sym* sym) {
     return ELF64_ST_TYPE(sym->st_info);
   }
   static int r_sym(const Elf64_Xword r_info) {
@@ -181,8 +182,8 @@
 template<class ElfArch>
 class ElfSectionReader {
  public:
-  ElfSectionReader(const char *name, const string &path, int fd,
-                   const typename ElfArch::Shdr &section_header)
+  ElfSectionReader(const char* name, const string& path, int fd,
+                   const typename ElfArch::Shdr& section_header)
       : contents_aligned_(NULL),
         contents_(NULL),
         header_(section_header) {
@@ -198,7 +199,7 @@
     contents_aligned_ = mmap(NULL, size_aligned_, PROT_READ, MAP_SHARED,
                              fd, offset_aligned);
     // Set where the offset really should begin.
-    contents_ = reinterpret_cast<char *>(contents_aligned_) +
+    contents_ = reinterpret_cast<char*>(contents_aligned_) +
                 (header_.sh_offset - offset_aligned);
 
     // Check for and handle any compressed contents.
@@ -216,24 +217,24 @@
   }
 
   // Return the section header for this section.
-  typename ElfArch::Shdr const &header() const { return header_; }
+  typename ElfArch::Shdr const& header() const { return header_; }
 
   // Return memory at the given offset within this section.
-  const char *GetOffset(typename ElfArch::Word bytes) const {
+  const char* GetOffset(typename ElfArch::Word bytes) const {
     return contents_ + bytes;
   }
 
-  const char *contents() const { return contents_; }
+  const char* contents() const { return contents_; }
   size_t section_size() const { return section_size_; }
 
  private:
   // page-aligned file contents
-  void *contents_aligned_;
+  void* contents_aligned_;
   // contents as usable by the client. For non-compressed sections,
   // pointer within contents_aligned_ to where the section data
   // begins; for compressed sections, pointer to the decompressed
   // data.
-  char *contents_;
+  char* contents_;
   // size of contents_aligned_
   size_t size_aligned_;
   // size of contents.
@@ -248,7 +249,7 @@
 template<class ElfArch>
 class SymbolIterator {
  public:
-  SymbolIterator(ElfReaderImpl<ElfArch> *reader,
+  SymbolIterator(ElfReaderImpl<ElfArch>* reader,
                  typename ElfArch::Word section_type)
       : symbol_section_(reader->GetSectionByType(section_type)),
         string_section_(NULL),
@@ -279,7 +280,7 @@
 
   // Return a pointer to the current symbol.
   // REQUIRES: !done()
-  const typename ElfArch::Sym *GetSymbol() const {
+  const typename ElfArch::Sym* GetSymbol() const {
     return reinterpret_cast<const typename ElfArch::Sym*>(
         symbol_section_->GetOffset(symbol_within_section_ *
                                    symbol_section_->header().sh_entsize));
@@ -287,7 +288,7 @@
 
   // Return the name of the current symbol, NULL if it has none.
   // REQUIRES: !done()
-  const char *GetSymbolName() const {
+  const char* GetSymbolName() const {
     int name_offset = GetSymbol()->st_name;
     if (name_offset == 0)
       return NULL;
@@ -299,8 +300,8 @@
   }
 
  private:
-  const ElfSectionReader<ElfArch> *const symbol_section_;
-  const ElfSectionReader<ElfArch> *string_section_;
+  const ElfSectionReader<ElfArch>* const symbol_section_;
+  const ElfSectionReader<ElfArch>* string_section_;
   int num_symbols_in_section_;
   int symbol_within_section_;
 };
@@ -325,7 +326,7 @@
 template<class ElfArch>
 class ElfReaderImpl {
  public:
-  explicit ElfReaderImpl(const string &path, int fd)
+  explicit ElfReaderImpl(const string& path, int fd)
       : path_(path),
         fd_(fd),
         section_headers_(NULL),
@@ -346,7 +347,7 @@
       // "opd_section_" must always be checked for NULL before use.
       opd_section_ = GetSectionInfoByName(".opd", &opd_info_);
       for (unsigned int k = 0u; k < GetNumSections(); ++k) {
-        const char *name = GetSectionName(section_headers_[k].sh_name);
+        const char* name = GetSectionName(section_headers_[k].sh_name);
         if (strncmp(name, ".text", strlen(".text")) == 0) {
           base_for_text_ =
               section_headers_[k].sh_addr - section_headers_[k].sh_offset;
@@ -383,7 +384,7 @@
   // to see if the ELF file appears to match the current
   // architecture. If error is non-NULL, it will be set with a reason
   // in case of failure.
-  static bool IsArchElfFile(int fd, string *error) {
+  static bool IsArchElfFile(int fd, string* error) {
     unsigned char header[EI_NIDENT];
     if (pread(fd, header, sizeof(header), 0) != sizeof(header)) {
       if (error != NULL) *error = "Could not read header";
@@ -414,7 +415,7 @@
   }
 
   // Return true if we can use this symbol in Address-to-Symbol map.
-  bool CanUseSymbol(const char *name, const typename ElfArch::Sym *sym) {
+  bool CanUseSymbol(const char* name, const typename ElfArch::Sym* sym) {
     // For now we only save FUNC and NOTYPE symbols. For now we just
     // care about functions, but some functions written in assembler
     // don't have a proper ELF type attached to them, so we store
@@ -443,19 +444,19 @@
   // Iterate over the symbols in a section, either SHT_DYNSYM or
   // SHT_SYMTAB. Add all symbols to the given SymbolMap.
   /*
-  void GetSymbolPositions(SymbolMap *symbols,
+  void GetSymbolPositions(SymbolMap* symbols,
                           typename ElfArch::Word section_type,
-                          uint64 mem_offset,
-                          uint64 file_offset) {
+                          uint64_t mem_offset,
+                          uint64_t file_offset) {
     // This map is used to filter out "nested" functions.
     // See comment below.
     AddrToSymMap addr_to_sym_map;
     for (SymbolIterator<ElfArch> it(this, section_type);
          !it.done(); it.Next()) {
-      const char *name = it.GetSymbolName();
+      const char* name = it.GetSymbolName();
       if (name == NULL)
         continue;
-      const typename ElfArch::Sym *sym = it.GetSymbol();
+      const typename ElfArch::Sym* sym = it.GetSymbol();
       if (CanUseSymbol(name, sym)) {
         const int sec = sym->st_shndx;
 
@@ -471,20 +472,20 @@
 
         // Adjust for difference between where we expected to mmap
         // this section, and where it was actually mmapped.
-        const int64 expected_base = hdr.sh_addr - hdr.sh_offset;
-        const int64 real_base = mem_offset - file_offset;
-        const int64 adjust = real_base - expected_base;
+        const int64_t expected_base = hdr.sh_addr - hdr.sh_offset;
+        const int64_t real_base = mem_offset - file_offset;
+        const int64_t adjust = real_base - expected_base;
 
-        uint64 start = sym->st_value + adjust;
+        uint64_t start = sym->st_value + adjust;
 
         // Adjust function symbols for PowerPC64 by dereferencing and adjusting
         // the function descriptor to get the function address.
         if (header_.e_machine == EM_PPC64 && ElfArch::Type(sym) == STT_FUNC) {
-          const uint64 opd_addr =
+          const uint64_t opd_addr =
               AdjustPPC64FunctionDescriptorSymbolValue(sym->st_value);
           // Only adjust the returned value if the function address was found.
           if (opd_addr != sym->st_value) {
-            const int64 adjust_function_symbols =
+            const int64_t adjust_function_symbols =
                 real_base - base_for_text_;
             start = opd_addr + adjust_function_symbols;
           }
@@ -518,9 +519,9 @@
     if (addr_to_sym_map.empty()) {
       return;
     }
-    const ElfSectionReader<ElfArch> *const symbol_section =
+    const ElfSectionReader<ElfArch>* const symbol_section =
         this->GetSectionByType(section_type);
-    const ElfSectionReader<ElfArch> *const string_section =
+    const ElfSectionReader<ElfArch>* const string_section =
         this->GetSection(symbol_section->header().sh_link);
 
     typename AddrToSymMap::iterator curr = addr_to_sym_map.begin();
@@ -529,10 +530,10 @@
                        curr->first, curr->second->st_size);
     typename AddrToSymMap::iterator prev = curr++;
     for (; curr != addr_to_sym_map.end(); ++curr) {
-      const uint64 prev_addr = prev->first;
-      const uint64 curr_addr = curr->first;
-      const typename ElfArch::Sym *const prev_sym = prev->second;
-      const typename ElfArch::Sym *const curr_sym = curr->second;
+      const uint64_t prev_addr = prev->first;
+      const uint64_t curr_addr = curr->first;
+      const typename ElfArch::Sym* const prev_sym = prev->second;
+      const typename ElfArch::Sym* const curr_sym = curr->second;
       if (prev_addr + prev_sym->st_size <= curr_addr ||
           // The next condition is true if two symbols overlap like this:
           //
@@ -551,7 +552,7 @@
           // (e.g. 0619e071) will produce the current symbol,
           // which is the desired outcome.
           prev_addr + prev_sym->st_size < curr_addr + curr_sym->st_size) {
-        const char *name = string_section->GetOffset(curr_sym->st_name);
+        const char* name = string_section->GetOffset(curr_sym->st_name);
         symbols->AddSymbol(name, curr_addr, curr_sym->st_size);
         prev = curr;
       } else {
@@ -571,20 +572,20 @@
 */
 
   void VisitSymbols(typename ElfArch::Word section_type,
-                    ElfReader::SymbolSink *sink) {
+                    ElfReader::SymbolSink* sink) {
     VisitSymbols(section_type, sink, -1, -1, false);
   }
 
   void VisitSymbols(typename ElfArch::Word section_type,
-                    ElfReader::SymbolSink *sink,
+                    ElfReader::SymbolSink* sink,
                     int symbol_binding,
                     int symbol_type,
                     bool get_raw_symbol_values) {
     for (SymbolIterator<ElfArch> it(this, section_type);
          !it.done(); it.Next()) {
-      const char *name = it.GetSymbolName();
+      const char* name = it.GetSymbolName();
       if (!name) continue;
-      const typename ElfArch::Sym *sym = it.GetSymbol();
+      const typename ElfArch::Sym* sym = it.GetSymbol();
       if ((symbol_binding < 0 || ElfArch::Bind(sym) == symbol_binding) &&
           (symbol_type < 0 || ElfArch::Type(sym) == symbol_type)) {
         typename ElfArch::Sym symbol = *sym;
@@ -690,7 +691,7 @@
   // Return an ElfSectionReader for the first section of the given
   // type by iterating through all section headers. Returns NULL if
   // the section type is not found.
-  const ElfSectionReader<ElfArch> *GetSectionByType(
+  const ElfSectionReader<ElfArch>* GetSectionByType(
       typename ElfArch::Word section_type) {
     for (unsigned int k = 0u; k < GetNumSections(); ++k) {
       if (section_headers_[k].sh_type == section_type) {
@@ -702,14 +703,14 @@
 
   // Return the name of section "shndx".  Returns NULL if the section
   // is not found.
-  const char *GetSectionNameByIndex(int shndx) {
+  const char* GetSectionNameByIndex(int shndx) {
     return GetSectionName(section_headers_[shndx].sh_name);
   }
 
   // Return a pointer to section "shndx", and store the size in
   // "size".  Returns NULL if the section is not found.
-  const char *GetSectionContentsByIndex(int shndx, size_t *size) {
-    const ElfSectionReader<ElfArch> *section = GetSection(shndx);
+  const char* GetSectionContentsByIndex(int shndx, size_t* size) {
+    const ElfSectionReader<ElfArch>* section = GetSection(shndx);
     if (section != NULL) {
       *size = section->section_size();
       return section->contents();
@@ -720,16 +721,16 @@
   // Return a pointer to the first section of the given name by
   // iterating through all section headers, and store the size in
   // "size".  Returns NULL if the section name is not found.
-  const char *GetSectionContentsByName(const string &section_name,
-                                       size_t *size) {
+  const char* GetSectionContentsByName(const string& section_name,
+                                       size_t* size) {
     for (unsigned int k = 0u; k < GetNumSections(); ++k) {
       // When searching for sections in a .dwp file, the sections
       // we're looking for will always be at the end of the section
       // table, so reverse the direction of iteration.
       int shndx = is_dwp_ ? GetNumSections() - k - 1 : k;
-      const char *name = GetSectionName(section_headers_[shndx].sh_name);
+      const char* name = GetSectionName(section_headers_[shndx].sh_name);
       if (name != NULL && ElfReader::SectionNamesMatch(section_name, name)) {
-        const ElfSectionReader<ElfArch> *section = GetSection(shndx);
+        const ElfSectionReader<ElfArch>* section = GetSection(shndx);
         if (section == NULL) {
           return NULL;
         } else {
@@ -743,16 +744,16 @@
 
   // This is like GetSectionContentsByName() but it returns a lot of extra
   // information about the section.
-  const char *GetSectionInfoByName(const string &section_name,
-                                   ElfReader::SectionInfo *info) {
+  const char* GetSectionInfoByName(const string& section_name,
+                                   ElfReader::SectionInfo* info) {
     for (unsigned int k = 0u; k < GetNumSections(); ++k) {
       // When searching for sections in a .dwp file, the sections
       // we're looking for will always be at the end of the section
       // table, so reverse the direction of iteration.
       int shndx = is_dwp_ ? GetNumSections() - k - 1 : k;
-      const char *name = GetSectionName(section_headers_[shndx].sh_name);
+      const char* name = GetSectionName(section_headers_[shndx].sh_name);
       if (name != NULL && ElfReader::SectionNamesMatch(section_name, name)) {
-        const ElfSectionReader<ElfArch> *section = GetSection(shndx);
+        const ElfSectionReader<ElfArch>* section = GetSection(shndx);
         if (section == NULL) {
           return NULL;
         } else {
@@ -776,7 +777,7 @@
   // segments are present. This is the address an ELF image was linked
   // (by static linker) to be loaded at. Usually (but not always) 0 for
   // shared libraries and position-independent executables.
-  uint64 VaddrOfFirstLoadSegment() const {
+  uint64_t VaddrOfFirstLoadSegment() const {
     // Relocatable objects (of type ET_REL) do not have LOAD segments.
     if (header_.e_type == ET_REL) {
       return 0;
@@ -796,7 +797,7 @@
     // Debug sections are likely to be near the end, so reverse the
     // direction of iteration.
     for (int k = GetNumSections() - 1; k >= 0; --k) {
-      const char *name = GetSectionName(section_headers_[k].sh_name);
+      const char* name = GetSectionName(section_headers_[k].sh_name);
       if (strncmp(name, ".debug", strlen(".debug")) == 0) return true;
       if (strncmp(name, ".zdebug", strlen(".zdebug")) == 0) return true;
     }
@@ -815,7 +816,7 @@
   }
 
  private:
-  typedef vector<pair<uint64, const typename ElfArch::Sym *> > AddrToSymMap;
+  typedef vector<pair<uint64_t, const typename ElfArch::Sym*> > AddrToSymMap;
 
   static bool AddrToSymSorter(const typename AddrToSymMap::value_type& lhs,
                               const typename AddrToSymMap::value_type& rhs) {
@@ -853,8 +854,8 @@
 
   // Given an offset into the section header string table, return the
   // section name.
-  const char *GetSectionName(typename ElfArch::Word sh_name) {
-    const ElfSectionReader<ElfArch> *shstrtab =
+  const char* GetSectionName(typename ElfArch::Word sh_name) {
+    const ElfSectionReader<ElfArch>* shstrtab =
         GetSection(GetStringTableIndex());
     if (shstrtab != NULL) {
       return shstrtab->GetOffset(sh_name);
@@ -864,15 +865,15 @@
 
   // Return an ElfSectionReader for the given section. The reader will
   // be freed when this object is destroyed.
-  const ElfSectionReader<ElfArch> *GetSection(int num) {
-    const char *name;
+  const ElfSectionReader<ElfArch>* GetSection(int num) {
+    const char* name;
     // Hard-coding the name for the section-name string table prevents
     // infinite recursion.
     if (num == GetStringTableIndex())
       name = ".shstrtab";
     else
       name = GetSectionNameByIndex(num);
-    ElfSectionReader<ElfArch> *& reader = sections_[num];
+    ElfSectionReader<ElfArch>*& reader = sections_[num];
     if (reader == NULL)
       reader = new ElfSectionReader<ElfArch>(name, path_, fd_,
                                              section_headers_[num]);
@@ -882,7 +883,7 @@
   // Parse out the overall header information from the file and assert
   // that it looks sane. This contains information like the magic
   // number and target architecture.
-  bool ParseHeaders(int fd, const string &path) {
+  bool ParseHeaders(int fd, const string& path) {
     // Read in the global ELF header.
     if (pread(fd, &header_, sizeof(header_), 0) != sizeof(header_)) {
       return false;
@@ -934,12 +935,12 @@
 
   // Given the "value" of a function descriptor return the address of the
   // function (i.e. the dereferenced value). Otherwise return "value".
-  uint64 AdjustPPC64FunctionDescriptorSymbolValue(uint64 value) {
+  uint64_t AdjustPPC64FunctionDescriptorSymbolValue(uint64_t value) {
     if (opd_section_ != NULL &&
         opd_info_.addr <= value &&
         value < opd_info_.addr + opd_info_.size) {
-      uint64 offset = value - opd_info_.addr;
-      return (*reinterpret_cast<const uint64*>(opd_section_ + offset));
+      uint64_t offset = value - opd_info_.addr;
+      return (*reinterpret_cast<const uint64_t*>(opd_section_ + offset));
     }
     return value;
   }
@@ -984,11 +985,11 @@
 
   // Array of GetNumSections() section headers, allocated when we read
   // in the global header.
-  typename ElfArch::Shdr *section_headers_;
+  typename ElfArch::Shdr* section_headers_;
 
   // Array of GetNumProgramHeaders() program headers, allocated when we read
   // in the global header.
-  typename ElfArch::Phdr *program_headers_;
+  typename ElfArch::Phdr* program_headers_;
 
   // An array of pointers to ElfSectionReaders. Sections are
   // mmaped as they're needed and not released until this object is
@@ -999,8 +1000,8 @@
   // values for funtion symbols values. Function descriptors are kept in the
   // .opd section and are dereferenced to find the function address.
   ElfReader::SectionInfo opd_info_;
-  const char *opd_section_;  // Must be checked for NULL before use.
-  int64 base_for_text_;
+  const char* opd_section_;  // Must be checked for NULL before use.
+  int64_t base_for_text_;
 
   // Read PLT-related sections for the current architecture.
   bool plts_supported_;
@@ -1013,7 +1014,7 @@
 
   // Maps a dynamic symbol index to a PLT offset.
   // The vector entry index is the dynamic symbol index.
-  std::vector<uint64> symbols_plt_offsets_;
+  std::vector<uint64_t> symbols_plt_offsets_;
 
   // Container for PLT function name strings. These strings are passed by
   // reference to SymbolSink::AddSymbol() so they need to be stored somewhere.
@@ -1025,7 +1026,7 @@
   bool is_dwp_;
 };
 
-ElfReader::ElfReader(const string &path)
+ElfReader::ElfReader(const string& path)
     : path_(path), fd_(-1), impl32_(NULL), impl64_(NULL) {
   // linux 2.6.XX kernel can show deleted files like this:
   //   /var/run/nscd/dbYLJYaE (deleted)
@@ -1053,16 +1054,16 @@
 
 
 // The only word-size specific part of this file is IsNativeElfFile().
-#if __WORDSIZE == 32
+#if ULONG_MAX == 0xffffffff
 #define NATIVE_ELF_ARCH Elf32
-#elif __WORDSIZE == 64
+#elif ULONG_MAX == 0xffffffffffffffff
 #define NATIVE_ELF_ARCH Elf64
 #else
 #error "Invalid word size"
 #endif
 
 template <typename ElfArch>
-static bool IsElfFile(const int fd, const string &path) {
+static bool IsElfFile(const int fd, const string& path) {
   if (fd < 0)
     return false;
   if (!ElfReaderImpl<ElfArch>::IsArchElfFile(fd, NULL)) {
@@ -1085,9 +1086,9 @@
 }
 
 /*
-void ElfReader::AddSymbols(SymbolMap *symbols,
-                           uint64 mem_offset, uint64 file_offset,
-                           uint64 length) {
+void ElfReader::AddSymbols(SymbolMap* symbols,
+                           uint64_t mem_offset, uint64_t file_offset,
+                           uint64_t length) {
   if (fd_ < 0)
     return;
   // TODO(chatham): Actually use the information about file offset and
@@ -1108,17 +1109,17 @@
 }
 */
 
-void ElfReader::VisitSymbols(ElfReader::SymbolSink *sink) {
+void ElfReader::VisitSymbols(ElfReader::SymbolSink* sink) {
   VisitSymbols(sink, -1, -1);
 }
 
-void ElfReader::VisitSymbols(ElfReader::SymbolSink *sink,
+void ElfReader::VisitSymbols(ElfReader::SymbolSink* sink,
                              int symbol_binding,
                              int symbol_type) {
   VisitSymbols(sink, symbol_binding, symbol_type, false);
 }
 
-void ElfReader::VisitSymbols(ElfReader::SymbolSink *sink,
+void ElfReader::VisitSymbols(ElfReader::SymbolSink* sink,
                              int symbol_binding,
                              int symbol_type,
                              bool get_raw_symbol_values) {
@@ -1137,7 +1138,7 @@
   }
 }
 
-uint64 ElfReader::VaddrOfFirstLoadSegment() {
+uint64_t ElfReader::VaddrOfFirstLoadSegment() {
   if (IsElf32File()) {
     return GetImpl32()->VaddrOfFirstLoadSegment();
   } else if (IsElf64File()) {
@@ -1147,7 +1148,7 @@
   }
 }
 
-const char *ElfReader::GetSectionName(int shndx) {
+const char* ElfReader::GetSectionName(int shndx) {
   if (shndx < 0 || static_cast<unsigned int>(shndx) >= GetNumSections()) return NULL;
   if (IsElf32File()) {
     return GetImpl32()->GetSectionNameByIndex(shndx);
@@ -1158,7 +1159,7 @@
   }
 }
 
-uint64 ElfReader::GetNumSections() {
+uint64_t ElfReader::GetNumSections() {
   if (IsElf32File()) {
     return GetImpl32()->GetNumSections();
   } else if (IsElf64File()) {
@@ -1168,7 +1169,7 @@
   }
 }
 
-const char *ElfReader::GetSectionByIndex(int shndx, size_t *size) {
+const char* ElfReader::GetSectionByIndex(int shndx, size_t* size) {
   if (IsElf32File()) {
     return GetImpl32()->GetSectionContentsByIndex(shndx, size);
   } else if (IsElf64File()) {
@@ -1178,8 +1179,8 @@
   }
 }
 
-const char *ElfReader::GetSectionByName(const string &section_name,
-                                        size_t *size) {
+const char* ElfReader::GetSectionByName(const string& section_name,
+                                        size_t* size) {
   if (IsElf32File()) {
     return GetImpl32()->GetSectionContentsByName(section_name, size);
   } else if (IsElf64File()) {
@@ -1189,8 +1190,8 @@
   }
 }
 
-const char *ElfReader::GetSectionInfoByName(const string &section_name,
-                                            SectionInfo *info) {
+const char* ElfReader::GetSectionInfoByName(const string& section_name,
+                                            SectionInfo* info) {
   if (IsElf32File()) {
     return GetImpl32()->GetSectionInfoByName(section_name, info);
   } else if (IsElf64File()) {
@@ -1200,7 +1201,7 @@
   }
 }
 
-bool ElfReader::SectionNamesMatch(const string &name, const string &sh_name) {
+bool ElfReader::SectionNamesMatch(const string& name, const string& sh_name) {
   if ((name.find(".debug_", 0) == 0) && (sh_name.find(".zdebug_", 0) == 0)) {
     const string name_suffix(name, strlen(".debug_"));
     const string sh_name_suffix(sh_name, strlen(".zdebug_"));
@@ -1219,14 +1220,14 @@
   }
 }
 
-ElfReaderImpl<Elf32> *ElfReader::GetImpl32() {
+ElfReaderImpl<Elf32>* ElfReader::GetImpl32() {
   if (impl32_ == NULL) {
     impl32_ = new ElfReaderImpl<Elf32>(path_, fd_);
   }
   return impl32_;
 }
 
-ElfReaderImpl<Elf64> *ElfReader::GetImpl64() {
+ElfReaderImpl<Elf64>* ElfReader::GetImpl64() {
   if (impl64_ == NULL) {
     impl64_ = new ElfReaderImpl<Elf64>(path_, fd_);
   }
@@ -1237,7 +1238,7 @@
 // debug info (debug_only=true) or symbol table (debug_only=false).
 // Otherwise, return false.
 template <typename ElfArch>
-static bool IsNonStrippedELFBinaryImpl(const string &path, const int fd,
+static bool IsNonStrippedELFBinaryImpl(const string& path, const int fd,
                                        bool debug_only) {
   if (!ElfReaderImpl<ElfArch>::IsArchElfFile(fd, NULL)) return false;
   ElfReaderImpl<ElfArch> elf_reader(path, fd);
@@ -1247,7 +1248,7 @@
 }
 
 // Helper for the IsNon[Debug]StrippedELFBinary functions.
-static bool IsNonStrippedELFBinaryHelper(const string &path,
+static bool IsNonStrippedELFBinaryHelper(const string& path,
                                          bool debug_only) {
   const int fd = open(path.c_str(), O_RDONLY);
   if (fd == -1) {
@@ -1263,11 +1264,11 @@
   return false;
 }
 
-bool ElfReader::IsNonStrippedELFBinary(const string &path) {
+bool ElfReader::IsNonStrippedELFBinary(const string& path) {
   return IsNonStrippedELFBinaryHelper(path, false);
 }
 
-bool ElfReader::IsNonDebugStrippedELFBinary(const string &path) {
+bool ElfReader::IsNonDebugStrippedELFBinary(const string& path) {
   return IsNonStrippedELFBinaryHelper(path, true);
 }
 }  // namespace dwarf2reader
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/elf_reader.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/elf_reader.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/elf_reader.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/elf_reader.h	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
 
 class ElfReader {
  public:
-  explicit ElfReader(const string &path);
+  explicit ElfReader(const string& path);
   ~ElfReader();
 
   // Parse the ELF prologue of this file and return whether it was
@@ -62,55 +62,56 @@
   // mem_offset - position at which the segment is mapped into memory
   // file_offset - offset in the file where the mapping begins
   // length - length of the mapped segment
-  void AddSymbols(SymbolMap *symbols,
-                  uint64 mem_offset, uint64 file_offset,
-                  uint64 length);
+  void AddSymbols(SymbolMap* symbols,
+                  uint64_t mem_offset, uint64_t file_offset,
+                  uint64_t length);
 
   class SymbolSink {
    public:
     virtual ~SymbolSink() {}
-    virtual void AddSymbol(const char *name, uint64 address, uint64 size) = 0;
+    virtual void AddSymbol(const char* name, uint64_t address,
+                           uint64_t size) = 0;
   };
 
   // Like AddSymbols above, but with no address correction.
   // Processes any SHT_SYMTAB section, followed by any SHT_DYNSYM section.
-  void VisitSymbols(SymbolSink *sink);
+  void VisitSymbols(SymbolSink* sink);
 
   // Like VisitSymbols above, but for a specific symbol binding/type.
   // A negative value for the binding and type parameters means any
   // binding or type.
-  void VisitSymbols(SymbolSink *sink, int symbol_binding, int symbol_type);
+  void VisitSymbols(SymbolSink* sink, int symbol_binding, int symbol_type);
 
   // Like VisitSymbols above but can optionally export raw symbol values instead
   // of adjusted ones.
-  void VisitSymbols(SymbolSink *sink, int symbol_binding, int symbol_type,
+  void VisitSymbols(SymbolSink* sink, int symbol_binding, int symbol_type,
                     bool get_raw_symbol_values);
 
   // p_vaddr of the first PT_LOAD segment (if any), or 0 if no PT_LOAD
   // segments are present. This is the address an ELF image was linked
   // (by static linker) to be loaded at. Usually (but not always) 0 for
   // shared libraries and position-independent executables.
-  uint64 VaddrOfFirstLoadSegment();
+  uint64_t VaddrOfFirstLoadSegment();
 
   // Return the name of section "shndx".  Returns NULL if the section
   // is not found.
-  const char *GetSectionName(int shndx);
+  const char* GetSectionName(int shndx);
 
   // Return the number of sections in the given ELF file.
-  uint64 GetNumSections();
+  uint64_t GetNumSections();
 
   // Get section "shndx" from the given ELF file.  On success, return
   // the pointer to the section and store the size in "size".
   // On error, return NULL.  The returned section data is only valid
   // until the ElfReader gets destroyed.
-  const char *GetSectionByIndex(int shndx, size_t *size);
+  const char* GetSectionByIndex(int shndx, size_t* size);
 
   // Get section with "section_name" (ex. ".text", ".symtab") in the
   // given ELF file.  On success, return the pointer to the section
   // and store the size in "size".  On error, return NULL.  The
   // returned section data is only valid until the ElfReader gets
   // destroyed.
-  const char *GetSectionByName(const string &section_name, size_t *size);
+  const char* GetSectionByName(const string& section_name, size_t* size);
 
   // This is like GetSectionByName() but it returns a lot of extra information
   // about the section. The SectionInfo structure is almost identical to
@@ -118,47 +119,47 @@
   // here so that the many short macro names in <elf.h> don't have to be
   // added to our already cluttered namespace.
   struct SectionInfo {
-    uint32 type;                // Section type (SHT_xxx constant from elf.h).
-    uint64 flags;               // Section flags (SHF_xxx constants from elf.h).
-    uint64 addr;                // Section virtual address at execution.
-    uint64 offset;              // Section file offset.
-    uint64 size;                // Section size in bytes.
-    uint32 link;                // Link to another section.
-    uint32 info;                // Additional section information.
-    uint64 addralign;           // Section alignment.
-    uint64 entsize;             // Entry size if section holds a table.
+    uint32_t type;              // Section type (SHT_xxx constant from elf.h).
+    uint64_t flags;             // Section flags (SHF_xxx constants from elf.h).
+    uint64_t addr;              // Section virtual address at execution.
+    uint64_t offset;            // Section file offset.
+    uint64_t size;              // Section size in bytes.
+    uint32_t link;              // Link to another section.
+    uint32_t info;              // Additional section information.
+    uint64_t addralign;         // Section alignment.
+    uint64_t entsize;           // Entry size if section holds a table.
   };
-  const char *GetSectionInfoByName(const string &section_name,
-                                   SectionInfo *info);
+  const char* GetSectionInfoByName(const string& section_name,
+                                   SectionInfo* info);
 
   // Check if "path" is an ELF binary that has not been stripped of symbol
   // tables.  This function supports both 32-bit and 64-bit ELF binaries.
-  static bool IsNonStrippedELFBinary(const string &path);
+  static bool IsNonStrippedELFBinary(const string& path);
 
   // Check if "path" is an ELF binary that has not been stripped of debug
   // info. Unlike IsNonStrippedELFBinary, this function will return
   // false for binaries passed through "strip -S".
-  static bool IsNonDebugStrippedELFBinary(const string &path);
+  static bool IsNonDebugStrippedELFBinary(const string& path);
 
   // Match a requested section name with the section name as it
   // appears in the elf-file, adjusting for compressed debug section
   // names.  For example, returns true if name == ".debug_abbrev" and
   // sh_name == ".zdebug_abbrev"
-  static bool SectionNamesMatch(const string &name, const string &sh_name);
+  static bool SectionNamesMatch(const string& name, const string& sh_name);
 
  private:
   // Lazily initialize impl32_ and return it.
-  ElfReaderImpl<Elf32> *GetImpl32();
+  ElfReaderImpl<Elf32>* GetImpl32();
   // Ditto for impl64_.
-  ElfReaderImpl<Elf64> *GetImpl64();
+  ElfReaderImpl<Elf64>* GetImpl64();
 
   // Path of the file we're reading.
   const string path_;
   // Read-only file descriptor for the file. May be -1 if there was an
   // error during open.
   int fd_;
-  ElfReaderImpl<Elf32> *impl32_;
-  ElfReaderImpl<Elf64> *impl64_;
+  ElfReaderImpl<Elf32>* impl32_;
+  ElfReaderImpl<Elf64>* impl64_;
 };
 
 }  // namespace dwarf2reader
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/functioninfo.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/functioninfo.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/functioninfo.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/functioninfo.cc	2021-12-09 12:01:26.000000000 +0000
@@ -51,26 +51,20 @@
                                      LineMap* linemap):linemap_(linemap),
                                                        files_(files),
                                                        dirs_(dirs) {
-  // The dirs and files are 1 indexed, so just make sure we put
-  // nothing in the 0 vector.
-  assert(dirs->size() == 0);
-  assert(files->size() == 0);
-  dirs->push_back("");
-  SourceFileInfo s;
-  s.name = "";
-  s.lowpc = ULLONG_MAX;
-  files->push_back(s);
+  // In dwarf4, the dirs and files are 1 indexed, and in dwarf5 they are zero
+  // indexed. This is handled in the LineInfo reader, so empty files are not
+  // needed here.
 }
 
-void CULineInfoHandler::DefineDir(const string& name, uint32 dir_num) {
+void CULineInfoHandler::DefineDir(const string& name, uint32_t dir_num) {
   // These should never come out of order, actually
   assert(dir_num == dirs_->size());
   dirs_->push_back(name);
 }
 
 void CULineInfoHandler::DefineFile(const string& name,
-                                   int32 file_num, uint32 dir_num,
-                                   uint64 mod_time, uint64 length) {
+                                   int32 file_num, uint32_t dir_num,
+                                   uint64_t mod_time, uint64_t length) {
   assert(dir_num >= 0);
   assert(dir_num < dirs_->size());
 
@@ -93,8 +87,9 @@
   }
 }
 
-void CULineInfoHandler::AddLine(uint64 address, uint64 length, uint32 file_num,
-                                uint32 line_num, uint32 column_num) {
+void CULineInfoHandler::AddLine(uint64_t address, uint64_t length,
+                                uint32_t file_num, uint32_t line_num,
+                                uint32_t column_num) {
   if (file_num < files_->size()) {
     linemap_->insert(
         std::make_pair(address,
@@ -109,11 +104,11 @@
   }
 }
 
-bool CUFunctionInfoHandler::StartCompilationUnit(uint64 offset,
-                                                 uint8 address_size,
-                                                 uint8 offset_size,
-                                                 uint64 cu_length,
-                                                 uint8 dwarf_version) {
+bool CUFunctionInfoHandler::StartCompilationUnit(uint64_t offset,
+                                                 uint8_t address_size,
+                                                 uint8_t offset_size,
+                                                 uint64_t cu_length,
+                                                 uint8_t dwarf_version) {
   current_compilation_unit_offset_ = offset;
   return true;
 }
@@ -123,7 +118,7 @@
 // subroutines. For line info, the DW_AT_stmt_list lives in the
 // compile unit tag.
 
-bool CUFunctionInfoHandler::StartDIE(uint64 offset, enum DwarfTag tag) {
+bool CUFunctionInfoHandler::StartDIE(uint64_t offset, enum DwarfTag tag) {
   switch (tag) {
     case DW_TAG_subprogram:
     case DW_TAG_inlined_subroutine: {
@@ -146,10 +141,10 @@
 
 // Only care about the name attribute for functions
 
-void CUFunctionInfoHandler::ProcessAttributeString(uint64 offset,
+void CUFunctionInfoHandler::ProcessAttributeString(uint64_t offset,
                                                    enum DwarfAttribute attr,
                                                    enum DwarfForm form,
-                                                   const string &data) {
+                                                   const string& data) {
   if (current_function_info_) {
     if (attr == DW_AT_name)
       current_function_info_->name = data;
@@ -158,12 +153,13 @@
   }
 }
 
-void CUFunctionInfoHandler::ProcessAttributeUnsigned(uint64 offset,
+void CUFunctionInfoHandler::ProcessAttributeUnsigned(uint64_t offset,
                                                      enum DwarfAttribute attr,
                                                      enum DwarfForm form,
-                                                     uint64 data) {
+                                                     uint64_t data) {
   if (attr == DW_AT_stmt_list) {
-    SectionMap::const_iterator iter = sections_.find("__debug_line");
+    SectionMap::const_iterator iter =
+        GetSectionByName(sections_, ".debug_line");
     assert(iter != sections_.end());
 
     scoped_ptr<LineInfo> lireader(new LineInfo(iter->second.first + data,
@@ -193,10 +189,10 @@
   }
 }
 
-void CUFunctionInfoHandler::ProcessAttributeReference(uint64 offset,
+void CUFunctionInfoHandler::ProcessAttributeReference(uint64_t offset,
                                                       enum DwarfAttribute attr,
                                                       enum DwarfForm form,
-                                                      uint64 data) {
+                                                      uint64_t data) {
   if (current_function_info_) {
     switch (attr) {
       case DW_AT_specification: {
@@ -225,7 +221,7 @@
   }
 }
 
-void CUFunctionInfoHandler::EndDIE(uint64 offset) {
+void CUFunctionInfoHandler::EndDIE(uint64_t offset) {
   if (current_function_info_ && current_function_info_->lowpc)
     address_to_funcinfo_->insert(std::make_pair(current_function_info_->lowpc,
                                                 current_function_info_));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/functioninfo.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/functioninfo.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/functioninfo.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/functioninfo.h	2021-12-09 12:01:26.000000000 +0000
@@ -53,20 +53,20 @@
   // File containing this function
   string file;
   // Line number for start of function.
-  uint32 line;
+  uint32_t line;
   // Beginning address for this function
-  uint64 lowpc;
+  uint64_t lowpc;
   // End address for this function.
-  uint64 highpc;
+  uint64_t highpc;
   // Ranges offset
-  uint64 ranges;
+  uint64_t ranges;
 };
 
 struct SourceFileInfo {
   // Name of the source file name
   string name;
   // Low address of source file name
-  uint64 lowpc;
+  uint64_t lowpc;
 };
 
 typedef std::map<uint64, FunctionInfo*> FunctionMap;
@@ -86,12 +86,12 @@
 
   // Called when we define a directory.  We just place NAME into dirs_
   // at position DIR_NUM.
-  virtual void DefineDir(const string& name, uint32 dir_num);
+  virtual void DefineDir(const string& name, uint32_t dir_num);
 
   // Called when we define a filename.  We just place
   // concat(dirs_[DIR_NUM], NAME) into files_ at position FILE_NUM.
   virtual void DefineFile(const string& name, int32 file_num,
-                          uint32 dir_num, uint64 mod_time, uint64 length);
+                          uint32_t dir_num, uint64_t mod_time, uint64_t length);
 
 
   // Called when the line info reader has a new line, address pair
@@ -100,8 +100,9 @@
   // containing the code, LINE_NUM is the line number in that file for
   // the code, and COLUMN_NUM is the column number the code starts at,
   // if we know it (0 otherwise).
-  virtual void AddLine(uint64 address, uint64 length,
-                       uint32 file_num, uint32 line_num, uint32 column_num);
+  virtual void AddLine(uint64_t address, uint64_t length,
+                       uint32_t file_num, uint32_t line_num,
+                       uint32_t column_num);
 
  private:
   LineMap* linemap_;
@@ -131,38 +132,38 @@
   // .debug_info section.  We want to see all compilation units, so we
   // always return true.
 
-  virtual bool StartCompilationUnit(uint64 offset, uint8 address_size,
-                                    uint8 offset_size, uint64 cu_length,
-                                    uint8 dwarf_version);
+  virtual bool StartCompilationUnit(uint64_t offset, uint8_t address_size,
+                                    uint8_t offset_size, uint64_t cu_length,
+                                    uint8_t dwarf_version);
 
   // Start to process a DIE at OFFSET from the beginning of the
   // .debug_info section.  We only care about function related DIE's.
-  virtual bool StartDIE(uint64 offset, enum DwarfTag tag);
+  virtual bool StartDIE(uint64_t offset, enum DwarfTag tag);
 
   // Called when we have an attribute with unsigned data to give to
   // our handler.  The attribute is for the DIE at OFFSET from the
   // beginning of the .debug_info section, has a name of ATTR, a form of
   // FORM, and the actual data of the attribute is in DATA.
-  virtual void ProcessAttributeUnsigned(uint64 offset,
+  virtual void ProcessAttributeUnsigned(uint64_t offset,
                                         enum DwarfAttribute attr,
                                         enum DwarfForm form,
-                                        uint64 data);
+                                        uint64_t data);
 
   // Called when we have an attribute with a DIE reference to give to
   // our handler.  The attribute is for the DIE at OFFSET from the
   // beginning of the .debug_info section, has a name of ATTR, a form of
   // FORM, and the offset of the referenced DIE from the start of the
   // .debug_info section is in DATA.
-  virtual void ProcessAttributeReference(uint64 offset,
+  virtual void ProcessAttributeReference(uint64_t offset,
                                          enum DwarfAttribute attr,
                                          enum DwarfForm form,
-                                         uint64 data);
+                                         uint64_t data);
 
   // Called when we have an attribute with string data to give to
   // our handler.  The attribute is for the DIE at OFFSET from the
   // beginning of the .debug_info section, has a name of ATTR, a form of
   // FORM, and the actual data of the attribute is in DATA.
-  virtual void ProcessAttributeString(uint64 offset,
+  virtual void ProcessAttributeString(uint64_t offset,
                                       enum DwarfAttribute attr,
                                       enum DwarfForm form,
                                       const string& data);
@@ -171,7 +172,7 @@
   // Because DWARF2/3 specifies a tree of DIEs, you may get starts
   // before ends of the previous DIE, as we process children before
   // ending the parent.
-  virtual void EndDIE(uint64 offset);
+  virtual void EndDIE(uint64_t offset);
 
  private:
   std::vector<SourceFileInfo>* files_;
@@ -183,7 +184,7 @@
   const SectionMap& sections_;
   ByteReader* reader_;
   FunctionInfo* current_function_info_;
-  uint64 current_compilation_unit_offset_;
+  uint64_t current_compilation_unit_offset_;
 };
 
 }  // namespace dwarf2reader
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/line_state_machine.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/line_state_machine.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/line_state_machine.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/line_state_machine.h	2021-12-09 12:01:26.000000000 +0000
@@ -46,10 +46,10 @@
     end_sequence = false;
   }
 
-  uint32 file_num;
-  uint64 address;
-  uint32 line_num;
-  uint32 column_num;
+  uint32_t file_num;
+  uint64_t address;
+  uint32_t line_num;
+  uint32_t column_num;
   bool is_stmt;  // stmt means statement.
   bool basic_block;
   bool end_sequence;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/types.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/types.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/types.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf/types.h	2021-12-09 12:01:26.000000000 +0000
@@ -35,16 +35,6 @@
 
 #include <stdint.h>
 
-typedef signed char         int8;
-typedef short               int16;
-typedef int                 int32;
-typedef long long           int64;
-
-typedef unsigned char      uint8;
-typedef unsigned short     uint16;
-typedef unsigned int       uint32;
-typedef unsigned long long uint64;
-
 typedef intptr_t           intptr;
 typedef uintptr_t          uintptr;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module.cc	2021-12-09 12:01:26.000000000 +0000
@@ -142,8 +142,8 @@
                     sizeof(kRegisterNames) / sizeof(kRegisterNames[0]));
 }
 
-bool DwarfCFIToModule::Entry(size_t offset, uint64 address, uint64 length,
-                             uint8 version, const string &augmentation,
+bool DwarfCFIToModule::Entry(size_t offset, uint64_t address, uint64_t length,
+                             uint8_t version, const string& augmentation,
                              unsigned return_address) {
   assert(!entry_);
 
@@ -190,7 +190,7 @@
 }
 
 void DwarfCFIToModule::Record(Module::Address address, int reg,
-                              const string &rule) {
+                              const string& rule) {
   assert(entry_);
 
   // Place the name in our global set of strings, and then use the string
@@ -209,20 +209,20 @@
     entry_->rule_changes[address][RegisterName(reg)] = shared_rule;
 }
 
-bool DwarfCFIToModule::UndefinedRule(uint64 address, int reg) {
+bool DwarfCFIToModule::UndefinedRule(uint64_t address, int reg) {
   reporter_->UndefinedNotSupported(entry_offset_, RegisterName(reg));
   // Treat this as a non-fatal error.
   return true;
 }
 
-bool DwarfCFIToModule::SameValueRule(uint64 address, int reg) {
+bool DwarfCFIToModule::SameValueRule(uint64_t address, int reg) {
   ostringstream s;
   s << RegisterName(reg);
   Record(address, reg, s.str());
   return true;
 }
 
-bool DwarfCFIToModule::OffsetRule(uint64 address, int reg,
+bool DwarfCFIToModule::OffsetRule(uint64_t address, int reg,
                                   int base_register, long offset) {
   ostringstream s;
   s << RegisterName(base_register) << " " << offset << " + ^";
@@ -230,7 +230,7 @@
   return true;
 }
 
-bool DwarfCFIToModule::ValOffsetRule(uint64 address, int reg,
+bool DwarfCFIToModule::ValOffsetRule(uint64_t address, int reg,
                                      int base_register, long offset) {
   ostringstream s;
   s << RegisterName(base_register) << " " << offset << " +";
@@ -238,7 +238,7 @@
   return true;
 }
 
-bool DwarfCFIToModule::RegisterRule(uint64 address, int reg,
+bool DwarfCFIToModule::RegisterRule(uint64_t address, int reg,
                                     int base_register) {
   ostringstream s;
   s << RegisterName(base_register);
@@ -246,15 +246,15 @@
   return true;
 }
 
-bool DwarfCFIToModule::ExpressionRule(uint64 address, int reg,
-                                      const string &expression) {
+bool DwarfCFIToModule::ExpressionRule(uint64_t address, int reg,
+                                      const string& expression) {
   reporter_->ExpressionsNotSupported(entry_offset_, RegisterName(reg));
   // Treat this as a non-fatal error.
   return true;
 }
 
-bool DwarfCFIToModule::ValExpressionRule(uint64 address, int reg,
-                                         const string &expression) {
+bool DwarfCFIToModule::ValExpressionRule(uint64_t address, int reg,
+                                         const string& expression) {
   reporter_->ExpressionsNotSupported(entry_offset_, RegisterName(reg));
   // Treat this as a non-fatal error.
   return true;
@@ -274,7 +274,7 @@
 }
 
 void DwarfCFIToModule::Reporter::UndefinedNotSupported(size_t offset,
-                                                       const string &reg) {
+                                                       const string& reg) {
   fprintf(stderr, "%s, section '%s': "
           "the call frame entry at offset 0x%zx sets the rule for "
           "register '%s' to 'undefined', but the Breakpad symbol file format"
@@ -283,7 +283,7 @@
 }
 
 void DwarfCFIToModule::Reporter::ExpressionsNotSupported(size_t offset,
-                                                         const string &reg) {
+                                                         const string& reg) {
   fprintf(stderr, "%s, section '%s': "
           "the call frame entry at offset 0x%zx uses a DWARF expression to"
           " describe how to recover register '%s', "
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module.h	2021-12-09 12:01:26.000000000 +0000
@@ -71,7 +71,7 @@
     // stream. FILE is the name of the file we're processing, and
     // SECTION is the name of the section within that file that we're
     // looking at (.debug_frame, .eh_frame, etc.).
-    Reporter(const string &file, const string &section)
+    Reporter(const string& file, const string& section)
       : file_(file), section_(section) { }
     virtual ~Reporter() { }
 
@@ -83,13 +83,13 @@
 
     // The DWARF CFI entry at OFFSET says that REG is undefined, but the
     // Breakpad symbol file format cannot express this.
-    virtual void UndefinedNotSupported(size_t offset, const string &reg);
+    virtual void UndefinedNotSupported(size_t offset, const string& reg);
 
     // The DWARF CFI entry at OFFSET says that REG uses a DWARF
     // expression to find its value, but DwarfCFIToModule is not
     // capable of translating DWARF expressions to Breakpad postfix
     // expressions.
-    virtual void ExpressionsNotSupported(size_t offset, const string &reg);
+    virtual void ExpressionsNotSupported(size_t offset, const string& reg);
 
   protected:
     string file_, section_;
@@ -118,7 +118,7 @@
    private:
     // Given STRINGS, an array of C strings with SIZE elements, return an
     // equivalent vector<string>.
-    static vector<string> MakeVector(const char * const *strings, size_t size);
+    static vector<string> MakeVector(const char* const* strings, size_t size);
   };
 
   // Create a handler for the dwarf2reader::CallFrameInfo parser that
@@ -130,27 +130,27 @@
   //
   // Use REPORTER for reporting problems encountered in the conversion
   // process.
-  DwarfCFIToModule(Module *module, const vector<string> &register_names,
-                   Reporter *reporter)
+  DwarfCFIToModule(Module* module, const vector<string>& register_names,
+                   Reporter* reporter)
       : module_(module), register_names_(register_names), reporter_(reporter),
         entry_(NULL), return_address_(-1), cfa_name_(".cfa"), ra_name_(".ra") {
   }
   virtual ~DwarfCFIToModule() { delete entry_; }
 
-  virtual bool Entry(size_t offset, uint64 address, uint64 length,
-                     uint8 version, const string &augmentation,
+  virtual bool Entry(size_t offset, uint64_t address, uint64_t length,
+                     uint8_t version, const string& augmentation,
                      unsigned return_address);
-  virtual bool UndefinedRule(uint64 address, int reg);
-  virtual bool SameValueRule(uint64 address, int reg);
-  virtual bool OffsetRule(uint64 address, int reg,
+  virtual bool UndefinedRule(uint64_t address, int reg);
+  virtual bool SameValueRule(uint64_t address, int reg);
+  virtual bool OffsetRule(uint64_t address, int reg,
                           int base_register, long offset);
-  virtual bool ValOffsetRule(uint64 address, int reg,
+  virtual bool ValOffsetRule(uint64_t address, int reg,
                              int base_register, long offset);
-  virtual bool RegisterRule(uint64 address, int reg, int base_register);
-  virtual bool ExpressionRule(uint64 address, int reg,
-                              const string &expression);
-  virtual bool ValExpressionRule(uint64 address, int reg,
-                                 const string &expression);
+  virtual bool RegisterRule(uint64_t address, int reg, int base_register);
+  virtual bool ExpressionRule(uint64_t address, int reg,
+                              const string& expression);
+  virtual bool ValExpressionRule(uint64_t address, int reg,
+                                 const string& expression);
   virtual bool End();
 
  private:
@@ -158,19 +158,19 @@
   string RegisterName(int i);
 
   // Record RULE for register REG at ADDRESS.
-  void Record(Module::Address address, int reg, const string &rule);
+  void Record(Module::Address address, int reg, const string& rule);
 
   // The module to which we should add entries.
-  Module *module_;
+  Module* module_;
 
   // Map from register numbers to register names.
-  const vector<string> &register_names_;
+  const vector<string>& register_names_;
 
   // The reporter to use to report problems.
-  Reporter *reporter_;
+  Reporter* reporter_;
 
   // The current entry we're constructing.
-  Module::StackFrameEntry *entry_;
+  Module::StackFrameEntry* entry_;
 
   // The section offset of the current frame description entry, for
   // use in error messages.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cfi_to_module_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -47,11 +47,11 @@
 using testing::_;
 
 struct MockCFIReporter: public DwarfCFIToModule::Reporter {
-  MockCFIReporter(const string &file, const string &section)
+  MockCFIReporter(const string& file, const string& section)
       : Reporter(file, section) { }
   MOCK_METHOD2(UnnamedRegister, void(size_t offset, int reg));
-  MOCK_METHOD2(UndefinedNotSupported, void(size_t offset, const string &reg));
-  MOCK_METHOD2(ExpressionsNotSupported, void(size_t offset, const string &reg));
+  MOCK_METHOD2(UndefinedNotSupported, void(size_t offset, const string& reg));
+  MOCK_METHOD2(ExpressionsNotSupported, void(size_t offset, const string& reg));
 };
 
 struct DwarfCFIToModuleFixture {
@@ -80,7 +80,7 @@
   vector<string> register_names;
   MockCFIReporter reporter;
   DwarfCFIToModule handler;
-  vector<Module::StackFrameEntry *> entries;
+  vector<Module::StackFrameEntry*> entries;
 };
 
 class Entry: public DwarfCFIToModuleFixture, public Test { };
@@ -125,7 +125,7 @@
     EXPECT_EQ(entry_address, entries[0]->address);
     EXPECT_EQ(entry_size, entries[0]->size);
   }
-  uint64 entry_address, entry_size;
+  uint64_t entry_address, entry_size;
   unsigned return_reg;
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module.cc	2021-12-09 12:01:26.000000000 +0000
@@ -49,6 +49,7 @@
 
 #include "common/dwarf_line_to_module.h"
 #include "common/unordered.h"
+#include "google_breakpad/common/breakpad_types.h"
 
 namespace google_breakpad {
 
@@ -95,7 +96,7 @@
   string name;
 };
 
-typedef map<uint64, AbstractOrigin> AbstractOriginByOffset;
+typedef map<uint64_t, AbstractOrigin> AbstractOriginByOffset;
 
 // Data global to the DWARF-bearing file that is private to the
 // DWARF-to-Module process.
@@ -127,8 +128,8 @@
   AbstractOriginByOffset origins;
 };
 
-DwarfCUToModule::FileContext::FileContext(const string &filename,
-                                          Module *module,
+DwarfCUToModule::FileContext::FileContext(const string& filename,
+                                          Module* module,
                                           bool handle_inter_cu_refs)
     : filename_(filename),
       module_(module),
@@ -140,7 +141,7 @@
 }
 
 void DwarfCUToModule::FileContext::AddSectionToSectionMap(
-    const string& name, const uint8_t *contents, uint64 length) {
+    const string& name, const uint8_t* contents, uint64_t length) {
   section_map_[name] = std::make_pair(contents, length);
 }
 
@@ -159,7 +160,7 @@
 }
 
 bool DwarfCUToModule::FileContext::IsUnhandledInterCUReference(
-    uint64 offset, uint64 compilation_unit_start) const {
+    uint64_t offset, uint64_t compilation_unit_start) const {
   if (handle_inter_cu_refs_)
     return false;
   return offset < compilation_unit_start;
@@ -169,48 +170,101 @@
 // parsing. This is for data shared across the CU's entire DIE tree,
 // and parameters from the code invoking the CU parser.
 struct DwarfCUToModule::CUContext {
-  CUContext(FileContext *file_context_arg, WarningReporter *reporter_arg,
-            RangesHandler *ranges_handler_arg)
-      : file_context(file_context_arg),
+  CUContext(FileContext* file_context_arg, WarningReporter* reporter_arg,
+            RangesHandler* ranges_handler_arg)
+      : version(0),
+        file_context(file_context_arg),
         reporter(reporter_arg),
         ranges_handler(ranges_handler_arg),
         language(Language::CPlusPlus),
         low_pc(0),
         high_pc(0),
-        ranges(0) {}
+        ranges_form(dwarf2reader::DW_FORM_sec_offset),
+        ranges_data(0),
+        ranges_base(0) { }
 
   ~CUContext() {
-    for (vector<Module::Function *>::iterator it = functions.begin();
+    for (vector<Module::Function*>::iterator it = functions.begin();
          it != functions.end(); ++it) {
       delete *it;
     }
   };
 
+  // Dwarf version of the source CU.
+  uint8_t version;
+
   // The DWARF-bearing file into which this CU was incorporated.
-  FileContext *file_context;
+  FileContext* file_context;
 
   // For printing error messages.
-  WarningReporter *reporter;
+  WarningReporter* reporter;
 
   // For reading ranges from the .debug_ranges section
-  RangesHandler *ranges_handler;
+  RangesHandler* ranges_handler;
 
   // The source language of this compilation unit.
-  const Language *language;
+  const Language* language;
 
   // Addresses covered by this CU. If high_pc_ is non-zero then the CU covers
-  // low_pc to high_pc, otherwise ranges is non-zero and low_pc represents
-  // the base address of the ranges covered by the CU.
-  uint64 low_pc;
-  uint64 high_pc;
-  uint64 ranges;
+  // low_pc to high_pc, otherwise ranges_data is non-zero and low_pc represents
+  // the base address of the ranges covered by the CU. ranges_data will define
+  // the CU's actual ranges.
+  uint64_t low_pc;
+  uint64_t high_pc;
+
+  // Ranges for this CU are read according to this form.
+  enum dwarf2reader::DwarfForm ranges_form;
+  uint64_t ranges_data;
+
+  // Offset into .debug_rngslists where this CU's ranges are stored.
+  // Data in DW_FORM_rnglistx is relative to this offset.
+  uint64_t ranges_base;
+
+  // Offset into .debug_addr where this CU's addresses are stored. Data in
+  // form DW_FORM_addrxX is relative to this offset.
+  uint64_t addr_base;
+
+  // Collect all the data from the CU that a RangeListReader needs to read a
+  // range.
+  bool AssembleRangeListInfo(
+      dwarf2reader::RangeListReader::CURangesInfo* info) {
+    const dwarf2reader::SectionMap& section_map
+        = file_context->section_map();
+    info->version_ = version;
+    info->base_address_ = low_pc;
+    info->ranges_base_ = ranges_base;
+    const char* section_name = (version <= 4 ?
+                                ".debug_ranges" : ".debug_rnglists");
+    dwarf2reader::SectionMap::const_iterator map_entry
+        = dwarf2reader::GetSectionByName(section_map, section_name);
+    if (map_entry == section_map.end()) {
+      return false;
+    }
+    info->buffer_ = map_entry->second.first;
+    info->size_ = map_entry->second.second;
+    if (version > 4) {
+      dwarf2reader::SectionMap::const_iterator map_entry
+          = dwarf2reader::GetSectionByName(section_map, ".debug_addr");
+      if (map_entry == section_map.end()) {
+        return false;
+      }
+      info->addr_buffer_ = map_entry->second.first;
+      info->addr_buffer_size_ = map_entry->second.second;
+      info->addr_base_ = addr_base;
+    }
+    return true;
+  }
 
   // The functions defined in this compilation unit. We accumulate
   // them here during parsing. Then, in DwarfCUToModule::Finish, we
   // assign them lines and add them to file_context->module.
   //
   // Destroying this destroys all the functions this vector points to.
-  vector<Module::Function *> functions;
+  vector<Module::Function*> functions;
+
+  // Keep a list of forward references from DW_AT_abstract_origin and
+  // DW_AT_specification attributes so names can be fixed up.
+  std::map<uint64_t, Module::Function*> forward_ref_die_to_func;
 };
 
 // Information about the context of a particular DIE. This is for
@@ -236,31 +290,32 @@
   // Create a handler for the DIE at OFFSET whose compilation unit is
   // described by CU_CONTEXT, and whose immediate context is described
   // by PARENT_CONTEXT.
-  GenericDIEHandler(CUContext *cu_context, DIEContext *parent_context,
-                    uint64 offset)
+  GenericDIEHandler(CUContext* cu_context, DIEContext* parent_context,
+                    uint64_t offset)
       : cu_context_(cu_context),
         parent_context_(parent_context),
         offset_(offset),
         declaration_(false),
-        specification_(NULL) { }
+        specification_(NULL),
+        forward_ref_die_offset_(0) { }
 
   // Derived classes' ProcessAttributeUnsigned can defer to this to
   // handle DW_AT_declaration, or simply not override it.
   void ProcessAttributeUnsigned(enum DwarfAttribute attr,
                                 enum DwarfForm form,
-                                uint64 data);
+                                uint64_t data);
 
   // Derived classes' ProcessAttributeReference can defer to this to
   // handle DW_AT_specification, or simply not override it.
   void ProcessAttributeReference(enum DwarfAttribute attr,
                                  enum DwarfForm form,
-                                 uint64 data);
+                                 uint64_t data);
 
   // Derived classes' ProcessAttributeReference can defer to this to
   // handle DW_AT_specification, or simply not override it.
   void ProcessAttributeString(enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              const string &data);
+                              const string& data);
 
  protected:
   // Compute and return the fully-qualified name of the DIE. If this
@@ -273,9 +328,9 @@
   // have been seen.
   string ComputeQualifiedName();
 
-  CUContext *cu_context_;
-  DIEContext *parent_context_;
-  uint64 offset_;
+  CUContext* cu_context_;
+  DIEContext* parent_context_;
+  uint64_t offset_;
 
   // Place the name in the global set of strings. Even though this looks
   // like a copy, all the major string implementations use reference
@@ -283,7 +338,7 @@
   // share copies of strings whenever possible.
   // FIXME: Should this return something like a string_ref to avoid the
   // assumption about how strings are implemented?
-  string AddStringToPool(const string &str);
+  string AddStringToPool(const string& str);
 
   // If this DIE has a DW_AT_declaration attribute, this is its value.
   // It is false on DIEs with no DW_AT_declaration attribute.
@@ -292,7 +347,12 @@
   // If this DIE has a DW_AT_specification attribute, this is the
   // Specification structure for the DIE the attribute refers to.
   // Otherwise, this is NULL.
-  Specification *specification_;
+  Specification* specification_;
+
+  // If this DIE has a DW_AT_specification or DW_AT_abstract_origin and it is a
+  // forward reference, no Specification will be available. Track the reference
+  // to be fixed up when the DIE is parsed.
+  uint64_t forward_ref_die_offset_;
 
   // The value of the DW_AT_name attribute, or the empty string if the
   // DIE has no such attribute.
@@ -311,7 +371,7 @@
 void DwarfCUToModule::GenericDIEHandler::ProcessAttributeUnsigned(
     enum DwarfAttribute attr,
     enum DwarfForm form,
-    uint64 data) {
+    uint64_t data) {
   switch (attr) {
     case dwarf2reader::DW_AT_declaration: declaration_ = (data != 0); break;
     default: break;
@@ -321,10 +381,10 @@
 void DwarfCUToModule::GenericDIEHandler::ProcessAttributeReference(
     enum DwarfAttribute attr,
     enum DwarfForm form,
-    uint64 data) {
+    uint64_t data) {
   switch (attr) {
     case dwarf2reader::DW_AT_specification: {
-      FileContext *file_context = cu_context_->file_context;
+      FileContext* file_context = cu_context_->file_context;
       if (file_context->IsUnhandledInterCUReference(
               data, cu_context_->reporter->cu_offset())) {
         cu_context_->reporter->UnhandledInterCUReference(offset_, data);
@@ -335,17 +395,14 @@
       // here, but it's better to leave the real work to our
       // EndAttribute member function, at which point we know we have
       // seen all the DIE's attributes.
-      SpecificationByOffset *specifications =
+      SpecificationByOffset* specifications =
           &file_context->file_private_->specifications;
       SpecificationByOffset::iterator spec = specifications->find(data);
       if (spec != specifications->end()) {
         specification_ = &spec->second;
+      } else if (data > offset_) {
+        forward_ref_die_offset_ = data;
       } else {
-        // Technically, there's no reason a DW_AT_specification
-        // couldn't be a forward reference, but supporting that would
-        // be a lot of work (changing to a two-pass structure), and I
-        // don't think any producers we care about ever emit such
-        // things.
         cu_context_->reporter->UnknownSpecification(offset_, data);
       }
       break;
@@ -354,7 +411,7 @@
   }
 }
 
-string DwarfCUToModule::GenericDIEHandler::AddStringToPool(const string &str) {
+string DwarfCUToModule::GenericDIEHandler::AddStringToPool(const string& str) {
   pair<unordered_set<string>::iterator, bool> result =
     cu_context_->file_context->file_private_->common_strings.insert(str);
   return *result.first;
@@ -363,7 +420,7 @@
 void DwarfCUToModule::GenericDIEHandler::ProcessAttributeString(
     enum DwarfAttribute attr,
     enum DwarfForm form,
-    const string &data) {
+    const string& data) {
   switch (attr) {
     case dwarf2reader::DW_AT_name:
       name_attribute_ = AddStringToPool(data);
@@ -396,7 +453,7 @@
   // Use the demangled name, if one is available. Demangled names are
   // preferable to those inferred from the DWARF structure because they
   // include argument types.
-  const string *qualified_name = NULL;
+  const string* qualified_name = NULL;
   if (!demangled_name_.empty()) {
     // Found it is this DIE.
     qualified_name = &demangled_name_;
@@ -405,8 +462,8 @@
     qualified_name = &specification_->qualified_name;
   }
 
-  const string *unqualified_name = NULL;
-  const string *enclosing_name;
+  const string* unqualified_name = NULL;
+  const string* enclosing_name;
   if (!qualified_name) {
     // Find the unqualified name. If the DIE has its own DW_AT_name
     // attribute, then use that; otherwise, check the specification.
@@ -458,20 +515,22 @@
 // A handler class for DW_TAG_subprogram DIEs.
 class DwarfCUToModule::FuncHandler: public GenericDIEHandler {
  public:
-  FuncHandler(CUContext *cu_context, DIEContext *parent_context,
-              uint64 offset)
+  FuncHandler(CUContext* cu_context, DIEContext* parent_context,
+              uint64_t offset)
       : GenericDIEHandler(cu_context, parent_context, offset),
         low_pc_(0), high_pc_(0), high_pc_form_(dwarf2reader::DW_FORM_addr),
-        ranges_(0), abstract_origin_(NULL), inline_(false) { }
+        ranges_form_(dwarf2reader::DW_FORM_sec_offset), ranges_data_(0),
+        abstract_origin_(NULL), inline_(false) { }
+
   void ProcessAttributeUnsigned(enum DwarfAttribute attr,
                                 enum DwarfForm form,
-                                uint64 data);
+                                uint64_t data);
   void ProcessAttributeSigned(enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              int64 data);
+                              int64_t data);
   void ProcessAttributeReference(enum DwarfAttribute attr,
                                  enum DwarfForm form,
-                                 uint64 data);
+                                 uint64_t data);
 
   bool EndAttributes();
   void Finish();
@@ -480,9 +539,10 @@
   // The fully-qualified name, as derived from name_attribute_,
   // specification_, parent_context_.  Computed in EndAttributes.
   string name_;
-  uint64 low_pc_, high_pc_; // DW_AT_low_pc, DW_AT_high_pc
+  uint64_t low_pc_, high_pc_; // DW_AT_low_pc, DW_AT_high_pc
   DwarfForm high_pc_form_; // DW_AT_high_pc can be length or address.
-  uint64 ranges_; // DW_AT_ranges
+  DwarfForm ranges_form_; // DW_FORM_sec_offset or DW_FORM_rnglistx
+  uint64_t ranges_data_; // DW_AT_ranges
   const AbstractOrigin* abstract_origin_;
   bool inline_;
 };
@@ -490,7 +550,7 @@
 void DwarfCUToModule::FuncHandler::ProcessAttributeUnsigned(
     enum DwarfAttribute attr,
     enum DwarfForm form,
-    uint64 data) {
+    uint64_t data) {
   switch (attr) {
     // If this attribute is present at all --- even if its value is
     // DW_INL_not_inlined --- then GCC may cite it as someone else's
@@ -503,7 +563,8 @@
       high_pc_ = data;
       break;
     case dwarf2reader::DW_AT_ranges:
-      ranges_ = data;
+      ranges_data_ = data;
+      ranges_form_ = form;
       break;
 
     default:
@@ -515,7 +576,7 @@
 void DwarfCUToModule::FuncHandler::ProcessAttributeSigned(
     enum DwarfAttribute attr,
     enum DwarfForm form,
-    int64 data) {
+    int64_t data) {
   switch (attr) {
     // If this attribute is present at all --- even if its value is
     // DW_INL_not_inlined --- then GCC may cite it as someone else's
@@ -530,7 +591,7 @@
 void DwarfCUToModule::FuncHandler::ProcessAttributeReference(
     enum DwarfAttribute attr,
     enum DwarfForm form,
-    uint64 data) {
+    uint64_t data) {
   switch (attr) {
     case dwarf2reader::DW_AT_abstract_origin: {
       const AbstractOriginByOffset& origins =
@@ -538,6 +599,8 @@
       AbstractOriginByOffset::const_iterator origin = origins.find(data);
       if (origin != origins.end()) {
         abstract_origin_ = &(origin->second);
+      } else if (data > offset_) {
+        forward_ref_die_offset_ = data;
       } else {
         cu_context_->reporter->UnknownAbstractOrigin(offset_, data);
       }
@@ -559,8 +622,8 @@
 }
 
 static bool IsEmptyRange(const vector<Module::Range>& ranges) {
-  uint64 size = accumulate(ranges.cbegin(), ranges.cend(), 0,
-    [](uint64 total, Module::Range entry) {
+  uint64_t size = accumulate(ranges.cbegin(), ranges.cend(), 0,
+    [](uint64_t total, Module::Range entry) {
       return total + entry.size;
     }
   );
@@ -571,25 +634,42 @@
 void DwarfCUToModule::FuncHandler::Finish() {
   vector<Module::Range> ranges;
 
-  if (!ranges_) {
+  // Check if this DIE was one of the forward references that was not able
+  // to be processed, and fix up the name of the appropriate Module::Function.
+  // "name_" will have already been fixed up in EndAttributes().
+  if (!name_.empty()) {
+    auto iter = cu_context_->forward_ref_die_to_func.find(offset_);
+    if (iter != cu_context_->forward_ref_die_to_func.end())
+      iter->second->name = name_;
+  }
+
+  if (!ranges_data_) {
     // Make high_pc_ an address, if it isn't already.
     if (high_pc_form_ != dwarf2reader::DW_FORM_addr &&
-        high_pc_form_ != dwarf2reader::DW_FORM_GNU_addr_index) {
+        high_pc_form_ != dwarf2reader::DW_FORM_GNU_addr_index &&
+        high_pc_form_ != dwarf2reader::DW_FORM_addrx &&
+        high_pc_form_ != dwarf2reader::DW_FORM_addrx1 &&
+        high_pc_form_ != dwarf2reader::DW_FORM_addrx2 &&
+        high_pc_form_ != dwarf2reader::DW_FORM_addrx3 &&
+        high_pc_form_ != dwarf2reader::DW_FORM_addrx4) {
       high_pc_ += low_pc_;
     }
 
     Module::Range range(low_pc_, high_pc_ - low_pc_);
     ranges.push_back(range);
   } else {
-    RangesHandler *ranges_handler = cu_context_->ranges_handler;
-
+    RangesHandler* ranges_handler = cu_context_->ranges_handler;
     if (ranges_handler) {
-      if (!ranges_handler->ReadRanges(ranges_, cu_context_->low_pc, &ranges)) {
-        ranges.clear();
-        cu_context_->reporter->MalformedRangeList(ranges_);
+      dwarf2reader::RangeListReader::CURangesInfo cu_info;
+      if (cu_context_->AssembleRangeListInfo(&cu_info)) {
+        if (!ranges_handler->ReadRanges(ranges_form_, ranges_data_,
+                                        &cu_info, &ranges)) {
+          ranges.clear();
+          cu_context_->reporter->MalformedRangeList(ranges_data_);
+        }
+      } else {
+        cu_context_->reporter->MissingRanges();
       }
-    } else {
-      cu_context_->reporter->MissingRanges();
     }
   }
 
@@ -606,7 +686,11 @@
     if (!name_.empty()) {
       name = name_;
     } else {
-      cu_context_->reporter->UnnamedFunction(offset_);
+      // If we have a forward reference to a DW_AT_specification or
+      // DW_AT_abstract_origin, then don't warn, the name will be fixed up
+      // later
+      if (forward_ref_die_offset_ == 0)
+        cu_context_->reporter->UnnamedFunction(offset_);
       name = "<name omitted>";
     }
 
@@ -616,10 +700,20 @@
     func->ranges = ranges;
     func->parameter_size = 0;
     if (func->address) {
-       // If the function address is zero this is a sign that this function
-       // description is just empty debug data and should just be discarded.
-       cu_context_->functions.push_back(func.release());
-     }
+      // If the function address is zero this is a sign that this function
+      // description is just empty debug data and should just be discarded.
+      cu_context_->functions.push_back(func.release());
+      if (forward_ref_die_offset_ != 0) {
+        auto iter =
+            cu_context_->forward_ref_die_to_func.find(forward_ref_die_offset_);
+        if (iter == cu_context_->forward_ref_die_to_func.end()) {
+          cu_context_->reporter->UnknownSpecification(offset_,
+                                                      forward_ref_die_offset_);
+        } else {
+          iter->second = cu_context_->functions.back();
+        }
+      }
+    }
   } else if (inline_) {
     AbstractOrigin origin(name_);
     cu_context_->file_context->file_private_->origins[offset_] = origin;
@@ -630,11 +724,11 @@
 // component to their names: namespaces, classes, etc.
 class DwarfCUToModule::NamedScopeHandler: public GenericDIEHandler {
  public:
-  NamedScopeHandler(CUContext *cu_context, DIEContext *parent_context,
-                    uint64 offset)
+  NamedScopeHandler(CUContext* cu_context, DIEContext* parent_context,
+                    uint64_t offset)
       : GenericDIEHandler(cu_context, parent_context, offset) { }
   bool EndAttributes();
-  DIEHandler *FindChildHandler(uint64 offset, enum DwarfTag tag);
+  DIEHandler* FindChildHandler(uint64_t offset, enum DwarfTag tag);
 
  private:
   DIEContext child_context_; // A context for our children.
@@ -645,8 +739,8 @@
   return true;
 }
 
-dwarf2reader::DIEHandler *DwarfCUToModule::NamedScopeHandler::FindChildHandler(
-    uint64 offset,
+dwarf2reader::DIEHandler* DwarfCUToModule::NamedScopeHandler::FindChildHandler(
+    uint64_t offset,
     enum DwarfTag tag) {
   switch (tag) {
     case dwarf2reader::DW_TAG_subprogram:
@@ -664,36 +758,36 @@
 void DwarfCUToModule::WarningReporter::CUHeading() {
   if (printed_cu_header_)
     return;
-  fprintf(stderr, "%s: in compilation unit '%s' (offset 0x%llx):\n",
+  fprintf(stderr, "%s: in compilation unit '%s' (offset 0x%" PRIx64 "):\n",
           filename_.c_str(), cu_name_.c_str(), cu_offset_);
   printed_cu_header_ = true;
 }
 
-void DwarfCUToModule::WarningReporter::UnknownSpecification(uint64 offset,
-                                                            uint64 target) {
+void DwarfCUToModule::WarningReporter::UnknownSpecification(uint64_t offset,
+                                                            uint64_t target) {
   CUHeading();
-  fprintf(stderr, "%s: the DIE at offset 0x%llx has a DW_AT_specification"
-          " attribute referring to the die at offset 0x%llx, which either"
-          " was not marked as a declaration, or comes later in the file\n",
+  fprintf(stderr, "%s: the DIE at offset 0x%" PRIx64 " has a "
+          "DW_AT_specification attribute referring to the DIE at offset 0x%"
+          PRIx64 ", which was not marked as a declaration\n",
           filename_.c_str(), offset, target);
 }
 
-void DwarfCUToModule::WarningReporter::UnknownAbstractOrigin(uint64 offset,
-                                                             uint64 target) {
+void DwarfCUToModule::WarningReporter::UnknownAbstractOrigin(uint64_t offset,
+                                                             uint64_t target) {
   CUHeading();
-  fprintf(stderr, "%s: the DIE at offset 0x%llx has a DW_AT_abstract_origin"
-          " attribute referring to the die at offset 0x%llx, which either"
-          " was not marked as an inline, or comes later in the file\n",
+  fprintf(stderr, "%s: the DIE at offset 0x%" PRIx64 " has a "
+          "DW_AT_abstract_origin attribute referring to the DIE at offset 0x%"
+          PRIx64 ", which was not marked as an inline\n",
           filename_.c_str(), offset, target);
 }
 
-void DwarfCUToModule::WarningReporter::MissingSection(const string &name) {
+void DwarfCUToModule::WarningReporter::MissingSection(const string& name) {
   CUHeading();
   fprintf(stderr, "%s: warning: couldn't find DWARF '%s' section\n",
           filename_.c_str(), name.c_str());
 }
 
-void DwarfCUToModule::WarningReporter::BadLineInfoOffset(uint64 offset) {
+void DwarfCUToModule::WarningReporter::BadLineInfoOffset(uint64_t offset) {
   CUHeading();
   fprintf(stderr, "%s: warning: line number data offset beyond end"
           " of '.debug_line' section\n",
@@ -710,7 +804,7 @@
 }
 
 void DwarfCUToModule::WarningReporter::UncoveredFunction(
-    const Module::Function &function) {
+    const Module::Function& function) {
   if (!uncovered_warnings_enabled_)
     return;
   UncoveredHeading();
@@ -719,7 +813,7 @@
           function.name.c_str());
 }
 
-void DwarfCUToModule::WarningReporter::UncoveredLine(const Module::Line &line) {
+void DwarfCUToModule::WarningReporter::UncoveredLine(const Module::Line& line) {
   if (!uncovered_warnings_enabled_)
     return;
   UncoveredHeading();
@@ -728,31 +822,31 @@
           line.file->name.c_str(), line.number, line.address);
 }
 
-void DwarfCUToModule::WarningReporter::UnnamedFunction(uint64 offset) {
+void DwarfCUToModule::WarningReporter::UnnamedFunction(uint64_t offset) {
   CUHeading();
-  fprintf(stderr, "%s: warning: function at offset 0x%llx has no name\n",
+  fprintf(stderr, "%s: warning: function at offset 0x%" PRIx64 " has no name\n",
           filename_.c_str(), offset);
 }
 
-void DwarfCUToModule::WarningReporter::DemangleError(const string &input) {
+void DwarfCUToModule::WarningReporter::DemangleError(const string& input) {
   CUHeading();
   fprintf(stderr, "%s: warning: failed to demangle %s\n",
           filename_.c_str(), input.c_str());
 }
 
 void DwarfCUToModule::WarningReporter::UnhandledInterCUReference(
-    uint64 offset, uint64 target) {
+    uint64_t offset, uint64_t target) {
   CUHeading();
-  fprintf(stderr, "%s: warning: the DIE at offset 0x%llx has a "
+  fprintf(stderr, "%s: warning: the DIE at offset 0x%" PRIx64 " has a "
                   "DW_FORM_ref_addr attribute with an inter-CU reference to "
-                  "0x%llx, but inter-CU reference handling is turned off.\n",
-                  filename_.c_str(), offset, target);
+                  "0x%" PRIx64 ", but inter-CU reference handling is turned "
+                  " off.\n", filename_.c_str(), offset, target);
 }
 
-void DwarfCUToModule::WarningReporter::MalformedRangeList(uint64 offset) {
+void DwarfCUToModule::WarningReporter::MalformedRangeList(uint64_t offset) {
   CUHeading();
-  fprintf(stderr, "%s: warning: the range list at offset 0x%llx falls out of "
-                  "the .debug_ranges section.\n",
+  fprintf(stderr, "%s: warning: the range list at offset 0x%" PRIx64 " falls "
+                  " out of the .debug_ranges section.\n",
                   filename_.c_str(), offset);
 }
 
@@ -762,10 +856,10 @@
                   "the .debug_ranges section is missing.\n", filename_.c_str());
 }
 
-DwarfCUToModule::DwarfCUToModule(FileContext *file_context,
-                                 LineToModuleHandler *line_reader,
-                                 RangesHandler *ranges_handler,
-                                 WarningReporter *reporter)
+DwarfCUToModule::DwarfCUToModule(FileContext* file_context,
+                                 LineToModuleHandler* line_reader,
+                                 RangesHandler* ranges_handler,
+                                 WarningReporter* reporter)
     : line_reader_(line_reader),
       cu_context_(new CUContext(file_context, reporter, ranges_handler)),
       child_context_(new DIEContext()),
@@ -777,7 +871,7 @@
 
 void DwarfCUToModule::ProcessAttributeSigned(enum DwarfAttribute attr,
                                              enum DwarfForm form,
-                                             int64 data) {
+                                             int64_t data) {
   switch (attr) {
     case dwarf2reader::DW_AT_language: // source language of this CU
       SetLanguage(static_cast<DwarfLanguage>(data));
@@ -789,7 +883,7 @@
 
 void DwarfCUToModule::ProcessAttributeUnsigned(enum DwarfAttribute attr,
                                                enum DwarfForm form,
-                                               uint64 data) {
+                                               uint64_t data) {
   switch (attr) {
     case dwarf2reader::DW_AT_stmt_list: // Line number information.
       has_source_line_info_ = true;
@@ -805,7 +899,15 @@
       cu_context_->high_pc  = data;
       break;
     case dwarf2reader::DW_AT_ranges:
-      cu_context_->ranges = data;
+      cu_context_->ranges_data = data;
+      cu_context_->ranges_form = form;
+      break;
+    case dwarf2reader::DW_AT_rnglists_base:
+      cu_context_->ranges_base = data;
+      break;
+    case dwarf2reader::DW_AT_addr_base:
+    case dwarf2reader::DW_AT_GNU_addr_base:
+      cu_context_->addr_base = data;
       break;
 
     default:
@@ -815,7 +917,7 @@
 
 void DwarfCUToModule::ProcessAttributeString(enum DwarfAttribute attr,
                                              enum DwarfForm form,
-                                             const string &data) {
+                                             const string& data) {
   switch (attr) {
     case dwarf2reader::DW_AT_name:
       cu_context_->reporter->SetCUName(data);
@@ -832,8 +934,8 @@
   return true;
 }
 
-dwarf2reader::DIEHandler *DwarfCUToModule::FindChildHandler(
-    uint64 offset,
+dwarf2reader::DIEHandler* DwarfCUToModule::FindChildHandler(
+    uint64_t offset,
     enum DwarfTag tag) {
   switch (tag) {
     case dwarf2reader::DW_TAG_subprogram:
@@ -893,56 +995,73 @@
   }
 }
 
-void DwarfCUToModule::ReadSourceLines(uint64 offset) {
-  const dwarf2reader::SectionMap &section_map
+void DwarfCUToModule::ReadSourceLines(uint64_t offset) {
+  const dwarf2reader::SectionMap& section_map
       = cu_context_->file_context->section_map();
   dwarf2reader::SectionMap::const_iterator map_entry
-      = section_map.find(".debug_line");
-  // Mac OS X puts DWARF data in sections whose names begin with "__"
-  // instead of ".".
-  if (map_entry == section_map.end())
-    map_entry = section_map.find("__debug_line");
+      = dwarf2reader::GetSectionByName(section_map, ".debug_line");
   if (map_entry == section_map.end()) {
     cu_context_->reporter->MissingSection(".debug_line");
     return;
   }
-  const uint8_t *section_start = map_entry->second.first;
-  uint64 section_length = map_entry->second.second;
-  if (offset >= section_length) {
+  const uint8_t* line_section_start = map_entry->second.first + offset;
+  uint64_t line_section_length = map_entry->second.second;
+  if (offset >= line_section_length) {
     cu_context_->reporter->BadLineInfoOffset(offset);
     return;
   }
-  line_reader_->ReadProgram(section_start + offset, section_length - offset,
-                            cu_context_->file_context->module_, &lines_);
+  line_section_length -= offset;
+  // When reading line tables, string sections are never needed for dwarf4, and
+  // may or may not be needed by dwarf5, so no error if they are missing.
+  const uint8_t* string_section_start = nullptr;
+  uint64_t string_section_length = 0;
+  map_entry = dwarf2reader::GetSectionByName(section_map, ".debug_str");
+  if (map_entry != section_map.end()) {
+    string_section_start = map_entry->second.first + offset;
+    string_section_length = map_entry->second.second - offset;
+  }
+  const uint8_t* line_string_section_start = nullptr;
+  uint64_t line_string_section_length = 0;
+  map_entry = dwarf2reader::GetSectionByName(section_map, ".debug_line_str");
+  if (map_entry != section_map.end()) {
+    line_string_section_start = map_entry->second.first + offset;
+    line_string_section_length = map_entry->second.second - offset;
+    return;
+  }
+  line_reader_->ReadProgram(
+      line_section_start, line_section_length,
+      string_section_start, string_section_length,
+      line_string_section_start, line_string_section_length,
+      cu_context_->file_context->module_, &lines_);
 }
 
 namespace {
 class FunctionRange {
  public:
-  FunctionRange(const Module::Range &range, Module::Function *function) :
+  FunctionRange(const Module::Range& range, Module::Function* function) :
       address(range.address), size(range.size), function(function) { }
 
-  void AddLine(Module::Line &line) {
+  void AddLine(Module::Line& line) {
     function->lines.push_back(line);
   }
 
   Module::Address address;
   Module::Address size;
-  Module::Function *function;
+  Module::Function* function;
 };
 
 // Fills an array of ranges with pointers to the functions which owns
 // them. The array is sorted in ascending order and the ranges are non
 // empty and non-overlapping.
 
-static void FillSortedFunctionRanges(vector<FunctionRange> &dest_ranges,
-                                     vector<Module::Function *> *functions) {
-  for (vector<Module::Function *>::const_iterator func_it = functions->cbegin();
+static void FillSortedFunctionRanges(vector<FunctionRange>& dest_ranges,
+                                     vector<Module::Function*>* functions) {
+  for (vector<Module::Function*>::const_iterator func_it = functions->cbegin();
        func_it != functions->cend();
        func_it++)
   {
-    Module::Function *func = *func_it;
-    vector<Module::Range> &ranges = func->ranges;
+    Module::Function* func = *func_it;
+    vector<Module::Range>& ranges = func->ranges;
     for (vector<Module::Range>::const_iterator ranges_it = ranges.cbegin();
          ranges_it != ranges.cend();
          ++ranges_it) {
@@ -954,7 +1073,7 @@
   }
 
   sort(dest_ranges.begin(), dest_ranges.end(),
-    [](const FunctionRange &fr1, const FunctionRange &fr2) {
+    [](const FunctionRange& fr1, const FunctionRange& fr2) {
       return fr1.address < fr2.address;
     }
   );
@@ -962,7 +1081,7 @@
 
 // Return true if ADDRESS falls within the range of ITEM.
 template <class T>
-inline bool within(const T &item, Module::Address address) {
+inline bool within(const T& item, Module::Address address) {
   // Because Module::Address is unsigned, and unsigned arithmetic
   // wraps around, this will be false if ADDRESS falls before the
   // start of ITEM, or if it falls after ITEM's end.
@@ -971,8 +1090,8 @@
 }
 
 void DwarfCUToModule::AssignLinesToFunctions() {
-  vector<Module::Function *> *functions = &cu_context_->functions;
-  WarningReporter *reporter = cu_context_->reporter;
+  vector<Module::Function*>* functions = &cu_context_->functions;
+  WarningReporter* reporter = cu_context_->reporter;
 
   // This would be simpler if we assumed that source line entries
   // don't cross function boundaries.  However, there's no real reason
@@ -992,12 +1111,12 @@
 
   // The last line that we used any piece of.  We use this only for
   // generating warnings.
-  const Module::Line *last_line_used = NULL;
+  const Module::Line* last_line_used = NULL;
 
   // The last function and line we warned about --- so we can avoid
   // doing so more than once.
-  const Module::Function *last_function_cited = NULL;
-  const Module::Line *last_line_cited = NULL;
+  const Module::Function* last_function_cited = NULL;
+  const Module::Line* last_line_cited = NULL;
 
   // Prepare a sorted list of ranges with range-to-function mapping
   vector<FunctionRange> sorted_ranges;
@@ -1013,8 +1132,8 @@
 
   // Pointers to the referents of func_it and line_it, or NULL if the
   // iterator is at the end of the sequence.
-  FunctionRange *range;
-  const Module::Line *line;
+  FunctionRange* range;
+  const Module::Line* line;
 
   // Start current at the beginning of the first line or function,
   // whichever is earlier.
@@ -1034,6 +1153,11 @@
     return;
   }
 
+  // Some dwarf producers handle linker-removed functions by using -1 as a
+  // tombstone in the line table. So the end marker can be -1.
+  if (current == Module::kMaxAddress)
+    return;
+
   while (range || line) {
     // This loop has two invariants that hold at the top.
     //
@@ -1140,7 +1264,10 @@
     // next_transition may end up being zero, in which case we've completed
     // our pass. Handle that here, instead of trying to deal with it in
     // each place we compute next_transition.
-    if (!next_transition)
+
+    // Some dwarf producers handle linker-removed functions by using -1 as a
+    // tombstone in the line table. So the end marker can be -1.
+    if (!next_transition || next_transition == Module::kMaxAddress)
       break;
 
     // Advance iterators as needed. If lines overlap or functions overlap,
@@ -1177,7 +1304,7 @@
   if (has_source_line_info_)
     ReadSourceLines(source_line_offset_);
 
-  vector<Module::Function *> *functions = &cu_context_->functions;
+  vector<Module::Function*>* functions = &cu_context_->functions;
 
   // Dole out lines to the appropriate functions.
   AssignLinesToFunctions();
@@ -1194,15 +1321,16 @@
   cu_context_->file_context->ClearSpecifications();
 }
 
-bool DwarfCUToModule::StartCompilationUnit(uint64 offset,
-                                           uint8 address_size,
-                                           uint8 offset_size,
-                                           uint64 cu_length,
-                                           uint8 dwarf_version) {
+bool DwarfCUToModule::StartCompilationUnit(uint64_t offset,
+                                           uint8_t address_size,
+                                           uint8_t offset_size,
+                                           uint64_t cu_length,
+                                           uint8_t dwarf_version) {
+  cu_context_->version = dwarf_version;
   return dwarf_version >= 2;
 }
 
-bool DwarfCUToModule::StartRootDIE(uint64 offset, enum DwarfTag tag) {
+bool DwarfCUToModule::StartRootDIE(uint64_t offset, enum DwarfTag tag) {
   // We don't deal with partial compilation units (the only other tag
   // likely to be used for root DIE).
   return tag == dwarf2reader::DW_TAG_compile_unit;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module.h	2021-12-09 12:01:26.000000000 +0000
@@ -45,7 +45,6 @@
 
 #include "common/language.h"
 #include "common/module.h"
-#include "common/dwarf/bytereader.h"
 #include "common/dwarf/dwarf2diehandler.h"
 #include "common/dwarf/dwarf2reader.h"
 #include "common/scoped_ptr.h"
@@ -79,15 +78,15 @@
   // to true to handle debugging symbols with DW_FORM_ref_addr entries.
   class FileContext {
    public:
-    FileContext(const string &filename,
-                Module *module,
+    FileContext(const string& filename,
+                Module* module,
                 bool handle_inter_cu_refs);
     ~FileContext();
 
     // Add CONTENTS of size LENGTH to the section map as NAME.
     void AddSectionToSectionMap(const string& name,
-                                const uint8_t *contents,
-                                uint64 length);
+                                const uint8_t* contents,
+                                uint64_t length);
 
     // Clear the section map for testing.
     void ClearSectionMapForTest();
@@ -103,8 +102,8 @@
     // Given an OFFSET and a CU that starts at COMPILATION_UNIT_START, returns
     // true if this is an inter-compilation unit reference that is not being
     // handled.
-    bool IsUnhandledInterCUReference(uint64 offset,
-                                     uint64 compilation_unit_start) const;
+    bool IsUnhandledInterCUReference(uint64_t offset,
+                                     uint64_t compilation_unit_start) const;
 
     // The name of this file, for use in error messages.
     const string filename_;
@@ -114,7 +113,7 @@
     dwarf2reader::SectionMap section_map_;
 
     // The Module to which we're contributing definitions.
-    Module *module_;
+    Module* module_;
 
     // True if we are handling references between compilation units.
     const bool handle_inter_cu_refs_;
@@ -131,12 +130,11 @@
     virtual ~RangesHandler() { }
 
     // Called when finishing a function to populate the function's ranges.
-    // The ranges' entries are read starting from offset in the .debug_ranges
-    // section, base_address holds the base PC the range list values are
-    // offsets off. Return false if the rangelist falls out of the
-    // .debug_ranges section.
-    virtual bool ReadRanges(uint64 offset, Module::Address base_address,
-                            vector<Module::Range>* ranges) = 0;
+    // The entries are read according to the form and data.
+    virtual bool ReadRanges(
+        enum dwarf2reader::DwarfForm form, uint64_t data,
+        dwarf2reader::RangeListReader::CURangesInfo* cu_info,
+        vector<Module::Range>* ranges) = 0;
   };
 
   // An abstract base class for handlers that handle DWARF line data
@@ -158,8 +156,12 @@
     // mappings, given a pointer to some DWARF line number data
     // PROGRAM, and an overestimate of its size. Add no zero-length
     // lines to LINES.
-    virtual void ReadProgram(const uint8_t *program, uint64 length,
-                             Module *module, vector<Module::Line> *lines) = 0;
+    virtual void ReadProgram(const uint8_t* program, uint64_t length,
+                             const uint8_t* string_section,
+                             uint64_t string_section_length,
+                             const uint8_t* line_string_section,
+                             uint64_t line_string_length,
+                             Module* module, vector<Module::Line>* lines) = 0;
   };
 
   // The interface DwarfCUToModule uses to report warnings. The member
@@ -170,14 +172,14 @@
    public:
     // Warn about problems in the DWARF file FILENAME, in the
     // compilation unit at OFFSET.
-    WarningReporter(const string &filename, uint64 cu_offset)
+    WarningReporter(const string& filename, uint64_t cu_offset)
         : filename_(filename), cu_offset_(cu_offset), printed_cu_header_(false),
           printed_unpaired_header_(false),
           uncovered_warnings_enabled_(false) { }
     virtual ~WarningReporter() { }
 
     // Set the name of the compilation unit we're processing to NAME.
-    virtual void SetCUName(const string &name) { cu_name_ = name; }
+    virtual void SetCUName(const string& name) { cu_name_ = name; }
 
     // Accessor and setter for uncovered_warnings_enabled_.
     // UncoveredFunction and UncoveredLine only report a problem if that is
@@ -193,52 +195,52 @@
     // A DW_AT_specification in the DIE at OFFSET refers to a DIE we
     // haven't processed yet, or that wasn't marked as a declaration,
     // at TARGET.
-    virtual void UnknownSpecification(uint64 offset, uint64 target);
+    virtual void UnknownSpecification(uint64_t offset, uint64_t target);
 
     // A DW_AT_abstract_origin in the DIE at OFFSET refers to a DIE we
     // haven't processed yet, or that wasn't marked as inline, at TARGET.
-    virtual void UnknownAbstractOrigin(uint64 offset, uint64 target);
+    virtual void UnknownAbstractOrigin(uint64_t offset, uint64_t target);
 
     // We were unable to find the DWARF section named SECTION_NAME.
-    virtual void MissingSection(const string &section_name);
+    virtual void MissingSection(const string& section_name);
 
     // The CU's DW_AT_stmt_list offset OFFSET is bogus.
-    virtual void BadLineInfoOffset(uint64 offset);
+    virtual void BadLineInfoOffset(uint64_t offset);
 
     // FUNCTION includes code covered by no line number data.
-    virtual void UncoveredFunction(const Module::Function &function);
+    virtual void UncoveredFunction(const Module::Function& function);
 
     // Line number NUMBER in LINE_FILE, of length LENGTH, includes code
     // covered by no function.
-    virtual void UncoveredLine(const Module::Line &line);
+    virtual void UncoveredLine(const Module::Line& line);
 
     // The DW_TAG_subprogram DIE at OFFSET has no name specified directly
     // in the DIE, nor via a DW_AT_specification or DW_AT_abstract_origin
     // link.
-    virtual void UnnamedFunction(uint64 offset);
+    virtual void UnnamedFunction(uint64_t offset);
 
     // __cxa_demangle() failed to demangle INPUT.
-    virtual void DemangleError(const string &input);
+    virtual void DemangleError(const string& input);
 
     // The DW_FORM_ref_addr at OFFSET to TARGET was not handled because
     // FilePrivate did not retain the inter-CU specification data.
-    virtual void UnhandledInterCUReference(uint64 offset, uint64 target);
+    virtual void UnhandledInterCUReference(uint64_t offset, uint64_t target);
 
     // The DW_AT_ranges at offset is malformed (truncated or outside of the
     // .debug_ranges section's bound).
-    virtual void MalformedRangeList(uint64 offset);
+    virtual void MalformedRangeList(uint64_t offset);
 
     // A DW_AT_ranges attribute was encountered but the no .debug_ranges
     // section was found.
     virtual void MissingRanges();
 
-    uint64 cu_offset() const {
+    uint64_t cu_offset() const {
       return cu_offset_;
     }
 
    protected:
     const string filename_;
-    const uint64 cu_offset_;
+    const uint64_t cu_offset_;
     string cu_name_;
     bool printed_cu_header_;
     bool printed_unpaired_header_;
@@ -257,32 +259,32 @@
   // FILE_CONTEXT->module. Use LINE_READER to handle the compilation
   // unit's line number data. Use REPORTER to report problems with the
   // data we find.
-  DwarfCUToModule(FileContext *file_context,
-                  LineToModuleHandler *line_reader,
-                  RangesHandler *ranges_handler,
-                  WarningReporter *reporter);
+  DwarfCUToModule(FileContext* file_context,
+                  LineToModuleHandler* line_reader,
+                  RangesHandler* ranges_handler,
+                  WarningReporter* reporter);
   ~DwarfCUToModule();
 
   void ProcessAttributeSigned(enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              int64 data);
+                              int64_t data);
   void ProcessAttributeUnsigned(enum DwarfAttribute attr,
                                 enum DwarfForm form,
-                                uint64 data);
+                                uint64_t data);
   void ProcessAttributeString(enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              const string &data);
+                              const string& data);
   bool EndAttributes();
-  DIEHandler *FindChildHandler(uint64 offset, enum DwarfTag tag);
+  DIEHandler* FindChildHandler(uint64_t offset, enum DwarfTag tag);
 
   // Assign all our source Lines to the Functions that cover their
   // addresses, and then add them to module_.
   void Finish();
 
-  bool StartCompilationUnit(uint64 offset, uint8 address_size,
-                            uint8 offset_size, uint64 cu_length,
-                            uint8 dwarf_version);
-  bool StartRootDIE(uint64 offset, enum DwarfTag tag);
+  bool StartCompilationUnit(uint64_t offset, uint8_t address_size,
+                            uint8_t offset_size, uint64_t cu_length,
+                            uint8_t dwarf_version);
+  bool StartRootDIE(uint64_t offset, enum DwarfTag tag);
 
  private:
   // Used internally by the handler. Full definitions are in
@@ -295,7 +297,7 @@
   class NamedScopeHandler;
 
   // A map from section offsets to specifications.
-  typedef map<uint64, Specification> SpecificationByOffset;
+  typedef map<uint64_t, Specification> SpecificationByOffset;
 
   // Set this compilation unit's source language to LANGUAGE.
   void SetLanguage(DwarfLanguage language);
@@ -304,7 +306,7 @@
   // section.  Record source files in module_, but record source lines
   // in lines_; we apportion them to functions in
   // AssignLinesToFunctions.
-  void ReadSourceLines(uint64 offset);
+  void ReadSourceLines(uint64_t offset);
 
   // Assign the lines in lines_ to the individual line lists of the
   // functions in functions_.  (DWARF line information maps an entire
@@ -319,7 +321,7 @@
   // destructor deletes them.
 
   // The handler to use to handle line number data.
-  LineToModuleHandler *line_reader_;
+  LineToModuleHandler* line_reader_;
 
   // This compilation unit's context.
   scoped_ptr<CUContext> cu_context_;
@@ -332,7 +334,7 @@
 
   // The offset of this compilation unit's line number information in
   // the .debug_line section.
-  uint64 source_line_offset_;
+  uint64_t source_line_offset_;
 
   // The line numbers we have seen thus far.  We accumulate these here
   // during parsing.  Then, in Finish, we call AssignLinesToFunctions
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_cu_to_module_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -67,24 +67,28 @@
 class MockLineToModuleHandler: public DwarfCUToModule::LineToModuleHandler {
  public:
   MOCK_METHOD1(StartCompilationUnit, void(const string& compilation_dir));
-  MOCK_METHOD4(ReadProgram, void(const uint8_t *program, uint64 length,
-                                 Module *module, vector<Module::Line> *lines));
+  MOCK_METHOD8(ReadProgram, void(const uint8_t* program, uint64_t length,
+                                 const uint8_t* string_section,
+                                 uint64_t string_section_length,
+                                 const uint8_t* line_string_section,
+                                 uint64_t line_string_section_length,
+                                 Module* module, vector<Module::Line>* lines));
 };
 
 class MockWarningReporter: public DwarfCUToModule::WarningReporter {
  public:
-  MockWarningReporter(const string &filename, uint64 cu_offset)
+  MockWarningReporter(const string& filename, uint64_t cu_offset)
       : DwarfCUToModule::WarningReporter(filename, cu_offset) { }
-  MOCK_METHOD1(SetCUName, void(const string &name));
-  MOCK_METHOD2(UnknownSpecification, void(uint64 offset, uint64 target));
-  MOCK_METHOD2(UnknownAbstractOrigin, void(uint64 offset, uint64 target));
-  MOCK_METHOD1(MissingSection, void(const string &section_name));
-  MOCK_METHOD1(BadLineInfoOffset, void(uint64 offset));
-  MOCK_METHOD1(UncoveredFunction, void(const Module::Function &function));
-  MOCK_METHOD1(UncoveredLine, void(const Module::Line &line));
-  MOCK_METHOD1(UnnamedFunction, void(uint64 offset));
-  MOCK_METHOD1(DemangleError, void(const string &input));
-  MOCK_METHOD2(UnhandledInterCUReference, void(uint64 offset, uint64 target));
+  MOCK_METHOD1(SetCUName, void(const string& name));
+  MOCK_METHOD2(UnknownSpecification, void(uint64_t offset, uint64_t target));
+  MOCK_METHOD2(UnknownAbstractOrigin, void(uint64_t offset, uint64_t target));
+  MOCK_METHOD1(MissingSection, void(const string& section_name));
+  MOCK_METHOD1(BadLineInfoOffset, void(uint64_t offset));
+  MOCK_METHOD1(UncoveredFunction, void(const Module::Function& function));
+  MOCK_METHOD1(UncoveredLine, void(const Module::Line& line));
+  MOCK_METHOD1(UnnamedFunction, void(uint64_t offset));
+  MOCK_METHOD1(DemangleError, void(const string& input));
+  MOCK_METHOD2(UnhandledInterCUReference, void(uint64_t offset, uint64_t target));
 };
 
 // A fixture class including all the objects needed to handle a
@@ -112,13 +116,17 @@
   class AppendLinesFunctor {
    public:
     explicit AppendLinesFunctor(
-        const vector<Module::Line> *lines) : lines_(lines) { }
-    void operator()(const uint8_t *program, uint64 length,
-                    Module *module, vector<Module::Line> *lines) {
+        const vector<Module::Line>* lines) : lines_(lines) { }
+    void operator()(const uint8_t* program, uint64_t length,
+                    const uint8_t* string_section,
+                    uint64_t string_section_length,
+                    const uint8_t* line_string_section,
+                    uint64_t line_string_section_length,
+                    Module *module, vector<Module::Line>* lines) {
       lines->insert(lines->end(), lines_->begin(), lines_->end());
     }
    private:
-    const vector<Module::Line> *lines_;
+    const vector<Module::Line>* lines_;
   };
 
   CUFixtureBase()
@@ -147,7 +155,7 @@
     // By default, expect the line program reader not to be invoked. We
     // may override this in StartCU.
     EXPECT_CALL(line_reader_, StartCompilationUnit(_)).Times(0);
-    EXPECT_CALL(line_reader_, ReadProgram(_,_,_,_)).Times(0);
+    EXPECT_CALL(line_reader_, ReadProgram(_,_,_,_,_,_,_,_)).Times(0);
 
     // The handler will consult this section map to decide what to
     // pass to our line reader.
@@ -161,7 +169,7 @@
   // when it invokes its LineToModuleHandler. Call this before calling
   // StartCU.
   void PushLine(Module::Address address, Module::Address size,
-                const string &filename, int line_number);
+                const string& filename, int line_number);
 
   // Use LANGUAGE for the compilation unit. More precisely, arrange
   // for StartCU to pass the compilation unit's root DIE a
@@ -182,28 +190,28 @@
   void StartCU();
 
   // Have HANDLER process some strange attribute/form/value triples.
-  void ProcessStrangeAttributes(dwarf2reader::DIEHandler *handler);
+  void ProcessStrangeAttributes(dwarf2reader::DIEHandler* handler);
 
   // Start a child DIE of PARENT with the given tag and name. Leave
   // the handler ready to hear about children: call EndAttributes, but
   // not Finish.
-  DIEHandler *StartNamedDIE(DIEHandler *parent, DwarfTag tag,
-                            const string &name);
+  DIEHandler* StartNamedDIE(DIEHandler* parent, DwarfTag tag,
+                            const string& name);
 
   // Start a child DIE of PARENT with the given tag and a
   // DW_AT_specification attribute whose value is SPECIFICATION. Leave
   // the handler ready to hear about children: call EndAttributes, but
   // not Finish. If NAME is non-zero, use it as the DW_AT_name
   // attribute.
-  DIEHandler *StartSpecifiedDIE(DIEHandler *parent, DwarfTag tag,
-                                uint64 specification, const char *name = NULL);
+  DIEHandler* StartSpecifiedDIE(DIEHandler* parent, DwarfTag tag,
+                                uint64_t specification, const char* name = NULL);
 
   // Define a function as a child of PARENT with the given name, address, and
   // size. If high_pc_form is DW_FORM_addr then the DW_AT_high_pc attribute
   // will be written as an address; otherwise it will be written as the
   // function's size. Call EndAttributes and Finish; one cannot define
   // children of the defined function's DIE.
-  void DefineFunction(DIEHandler *parent, const string &name,
+  void DefineFunction(DIEHandler* parent, const string& name,
                       Module::Address address, Module::Address size,
                       const char* mangled_name,
                       DwarfForm high_pc_form = dwarf2reader::DW_FORM_addr);
@@ -211,33 +219,33 @@
   // Create a declaration DIE as a child of PARENT with the given
   // offset, tag and name. If NAME is the empty string, don't provide
   // a DW_AT_name attribute. Call EndAttributes and Finish.
-  void DeclarationDIE(DIEHandler *parent, uint64 offset,
-                      DwarfTag tag, const string &name,
-                      const string &mangled_name);
+  void DeclarationDIE(DIEHandler* parent, uint64_t offset,
+                      DwarfTag tag, const string& name,
+                      const string& mangled_name);
 
   // Create a definition DIE as a child of PARENT with the given tag
   // that refers to the declaration DIE at offset SPECIFICATION as its
   // specification. If NAME is non-empty, pass it as the DW_AT_name
   // attribute. If SIZE is non-zero, record ADDRESS and SIZE as
   // low_pc/high_pc attributes.
-  void DefinitionDIE(DIEHandler *parent, DwarfTag tag,
-                     uint64 specification, const string &name,
+  void DefinitionDIE(DIEHandler* parent, DwarfTag tag,
+                     uint64_t specification, const string& name,
                      Module::Address address = 0, Module::Address size = 0);
 
   // Create an inline DW_TAG_subprogram DIE as a child of PARENT.  If
   // SPECIFICATION is non-zero, then the DIE refers to the declaration DIE at
   // offset SPECIFICATION as its specification.  If Name is non-empty, pass it
   // as the DW_AT_name attribute.
-  void AbstractInstanceDIE(DIEHandler *parent, uint64 offset,
-                           DwarfInline type, uint64 specification,
-                           const string &name,
+  void AbstractInstanceDIE(DIEHandler* parent, uint64_t offset,
+                           DwarfInline type, uint64_t specification,
+                           const string& name,
                            DwarfForm form = dwarf2reader::DW_FORM_data1);
 
   // Create a DW_TAG_subprogram DIE as a child of PARENT that refers to
   // ORIGIN in its DW_AT_abstract_origin attribute.  If NAME is the empty
   // string, don't provide a DW_AT_name attribute.
-  void DefineInlineInstanceDIE(DIEHandler *parent, const string &name,
-                               uint64 origin, Module::Address address,
+  void DefineInlineInstanceDIE(DIEHandler* parent, const string& name,
+                               uint64_t origin, Module::Address address,
                                Module::Address size);
 
   // The following Test* functions should be called after calling
@@ -251,7 +259,7 @@
   // Test that the I'th function (ordered by address) in the module
   // this.module_ has the given name, address, and size, and that its
   // parameter size is zero.
-  void TestFunction(int i, const string &name,
+  void TestFunction(int i, const string& name,
                     Module::Address address, Module::Address size);
 
   // Test that the number of source lines owned by the I'th function
@@ -262,7 +270,7 @@
   // (again, by address) has the given address, size, filename, and
   // line number.
   void TestLine(int i, int j, Module::Address address, Module::Address size,
-                const string &filename, int number);
+                const string& filename, int number);
 
   // Actual objects under test.
   Module module_;
@@ -300,7 +308,7 @@
 
   // If functions_filled_ is true, this is a table of functions we've
   // extracted from module_, sorted by address.
-  vector<Module::Function *> functions_;
+  vector<Module::Function*> functions_;
   // True if we have filled the above vector with this.module_'s function list.
   bool functions_filled_;
 };
@@ -310,7 +318,7 @@
     sizeof(CUFixtureBase::dummy_line_program_);
 
 void CUFixtureBase::PushLine(Module::Address address, Module::Address size,
-                             const string &filename, int line_number) {
+                             const string& filename, int line_number) {
   Module::Line l;
   l.address = address;
   l.size = size;
@@ -332,10 +340,10 @@
   if (!lines_.empty())
     EXPECT_CALL(line_reader_,
                 ReadProgram(&dummy_line_program_[0], dummy_line_size_,
+                            _,_,_,_,
                             &module_, _))
         .Times(AtMost(1))
         .WillOnce(DoAll(Invoke(appender_), Return()));
-
   ASSERT_TRUE(root_handler_
               .StartCompilationUnit(0x51182ec307610b51ULL, 0x81, 0x44,
                                     0x4241b4f33720dd5cULL, 3));
@@ -368,7 +376,7 @@
 }
 
 void CUFixtureBase::ProcessStrangeAttributes(
-    dwarf2reader::DIEHandler *handler) {
+    dwarf2reader::DIEHandler* handler) {
   handler->ProcessAttributeUnsigned((DwarfAttribute) 0xf560dead,
                                     (DwarfForm) 0x4106e4db,
                                     0xa592571997facda1ULL);
@@ -387,10 +395,10 @@
                                   "strange string");
 }
 
-DIEHandler *CUFixtureBase::StartNamedDIE(DIEHandler *parent,
+DIEHandler* CUFixtureBase::StartNamedDIE(DIEHandler* parent,
                                          DwarfTag tag,
-                                         const string &name) {
-  dwarf2reader::DIEHandler *handler
+                                         const string& name) {
+  dwarf2reader::DIEHandler* handler
     = parent->FindChildHandler(0x8f4c783c0467c989ULL, tag);
   if (!handler)
     return NULL;
@@ -407,11 +415,11 @@
   return handler;
 }
 
-DIEHandler *CUFixtureBase::StartSpecifiedDIE(DIEHandler *parent,
+DIEHandler* CUFixtureBase::StartSpecifiedDIE(DIEHandler* parent,
                                              DwarfTag tag,
-                                             uint64 specification,
-                                             const char *name) {
-  dwarf2reader::DIEHandler *handler
+                                             uint64_t specification,
+                                             const char* name) {
+  dwarf2reader::DIEHandler* handler
     = parent->FindChildHandler(0x8f4c783c0467c989ULL, tag);
   if (!handler)
     return NULL;
@@ -431,12 +439,12 @@
   return handler;
 }
 
-void CUFixtureBase::DefineFunction(dwarf2reader::DIEHandler *parent,
-                                   const string &name, Module::Address address,
+void CUFixtureBase::DefineFunction(dwarf2reader::DIEHandler* parent,
+                                   const string& name, Module::Address address,
                                    Module::Address size,
                                    const char* mangled_name,
                                    DwarfForm high_pc_form) {
-  dwarf2reader::DIEHandler *func
+  dwarf2reader::DIEHandler* func
       = parent->FindChildHandler(0xe34797c7e68590a8LL,
                                  dwarf2reader::DW_TAG_subprogram);
   ASSERT_TRUE(func != NULL);
@@ -466,11 +474,11 @@
   delete func;
 }
 
-void CUFixtureBase::DeclarationDIE(DIEHandler *parent, uint64 offset,
+void CUFixtureBase::DeclarationDIE(DIEHandler* parent, uint64_t offset,
                                    DwarfTag tag,
-                                   const string &name,
-                                   const string &mangled_name) {
-  dwarf2reader::DIEHandler *die = parent->FindChildHandler(offset, tag);
+                                   const string& name,
+                                   const string& mangled_name) {
+  dwarf2reader::DIEHandler* die = parent->FindChildHandler(offset, tag);
   ASSERT_TRUE(die != NULL);
   if (!name.empty())
     die->ProcessAttributeString(dwarf2reader::DW_AT_name,
@@ -489,13 +497,13 @@
   delete die;
 }
 
-void CUFixtureBase::DefinitionDIE(DIEHandler *parent,
+void CUFixtureBase::DefinitionDIE(DIEHandler* parent,
                                   DwarfTag tag,
-                                  uint64 specification,
-                                  const string &name,
+                                  uint64_t specification,
+                                  const string& name,
                                   Module::Address address,
                                   Module::Address size) {
-  dwarf2reader::DIEHandler *die
+  dwarf2reader::DIEHandler* die
     = parent->FindChildHandler(0x6ccfea031a9e6cc9ULL, tag);
   ASSERT_TRUE(die != NULL);
   die->ProcessAttributeReference(dwarf2reader::DW_AT_specification,
@@ -518,13 +526,13 @@
   delete die;
 }
 
-void CUFixtureBase::AbstractInstanceDIE(DIEHandler *parent,
-                                        uint64 offset,
+void CUFixtureBase::AbstractInstanceDIE(DIEHandler* parent,
+                                        uint64_t offset,
                                         DwarfInline type,
-                                        uint64 specification,
-                                        const string &name,
+                                        uint64_t specification,
+                                        const string& name,
                                         DwarfForm form) {
-  dwarf2reader::DIEHandler *die
+  dwarf2reader::DIEHandler* die
     = parent->FindChildHandler(offset, dwarf2reader::DW_TAG_subprogram);
   ASSERT_TRUE(die != NULL);
   if (specification != 0ULL)
@@ -546,12 +554,12 @@
   delete die;
 }
 
-void CUFixtureBase::DefineInlineInstanceDIE(DIEHandler *parent,
-                                            const string &name,
-                                            uint64 origin,
+void CUFixtureBase::DefineInlineInstanceDIE(DIEHandler* parent,
+                                            const string& name,
+                                            uint64_t origin,
                                             Module::Address address,
                                             Module::Address size) {
-  dwarf2reader::DIEHandler *func
+  dwarf2reader::DIEHandler* func
       = parent->FindChildHandler(0x11c70f94c6e87ccdLL,
                                  dwarf2reader::DW_TAG_subprogram);
   ASSERT_TRUE(func != NULL);
@@ -589,13 +597,13 @@
   ASSERT_EQ(expected, functions_.size());
 }
 
-void CUFixtureBase::TestFunction(int i, const string &name,
+void CUFixtureBase::TestFunction(int i, const string& name,
                                  Module::Address address,
                                  Module::Address size) {
   FillFunctions();
   ASSERT_LT((size_t) i, functions_.size());
 
-  Module::Function *function = functions_[i];
+  Module::Function* function = functions_[i];
   EXPECT_EQ(name,    function->name);
   EXPECT_EQ(address, function->address);
   EXPECT_EQ(size,    function->ranges[0].size);
@@ -611,12 +619,12 @@
 
 void CUFixtureBase::TestLine(int i, int j,
                              Module::Address address, Module::Address size,
-                             const string &filename, int number) {
+                             const string& filename, int number) {
   FillFunctions();
   ASSERT_LT((size_t) i, functions_.size());
   ASSERT_LT((size_t) j, functions_[i]->lines.size());
 
-  Module::Line *line = &functions_[i]->lines[j];
+  Module::Line* line = &functions_[i]->lines[j];
   EXPECT_EQ(address,  line->address);
   EXPECT_EQ(size,     line->size);
   EXPECT_EQ(filename, line->file->name.c_str());
@@ -703,7 +711,7 @@
 
 TEST_F(SimpleCU, IrrelevantNamedScopeChildren) {
   StartCU();
-  DIEHandler *class_A_handler
+  DIEHandler* class_A_handler
     = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type, "class_A");
   EXPECT_TRUE(class_A_handler != NULL);
   EXPECT_FALSE(class_A_handler
@@ -853,7 +861,7 @@
                         ValuesIn(situations));
 
 TEST_P(FuncLinePairing, Pairing) {
-  const Situation &s = GetParam();
+  const Situation& s = GetParam();
   PushLine(s.lines[0].start,
            s.lines[0].end - s.lines[0].start,
            "line-file", 67636963);
@@ -1049,7 +1057,7 @@
   PushLine(20, 1, "filename2", 95115701);
 
   StartCU();
-  DIEHandler *enclosure_handler = StartNamedDIE(&root_handler_, tag,
+  DIEHandler* enclosure_handler = StartNamedDIE(&root_handler_, tag,
                                                 "Enclosure");
   EXPECT_TRUE(enclosure_handler != NULL);
   DefineFunction(enclosure_handler, "func_B", 10, 1, NULL);
@@ -1070,11 +1078,11 @@
   PushLine(10, 1, "line-file", 69819327);
 
   StartCU();
-  DIEHandler *namespace_handler
+  DIEHandler* namespace_handler
       = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_namespace,
                       "Namespace");
   EXPECT_TRUE(namespace_handler != NULL);
-  DIEHandler *enclosure_handler = StartNamedDIE(namespace_handler, tag,
+  DIEHandler* enclosure_handler = StartNamedDIE(namespace_handler, tag,
                                                 "Enclosure");
   EXPECT_TRUE(enclosure_handler != NULL);
   DefineFunction(enclosure_handler, "function", 10, 1, NULL);
@@ -1093,15 +1101,15 @@
   PushLine(10, 1, "filename1", 69819327);
 
   StartCU();
-  DIEHandler *namespace_handler
+  DIEHandler* namespace_handler
       = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_namespace,
                       "namespace_A");
   EXPECT_TRUE(namespace_handler != NULL);
-  DIEHandler *struct_handler
+  DIEHandler* struct_handler
       = StartNamedDIE(namespace_handler, dwarf2reader::DW_TAG_structure_type,
                       "struct_B");
   EXPECT_TRUE(struct_handler != NULL);
-  DIEHandler *class_handler
+  DIEHandler* class_handler
       = StartNamedDIE(struct_handler, dwarf2reader::DW_TAG_class_type,
                       "class_C");
   DefineFunction(class_handler, "function_D", 10, 1, NULL);
@@ -1119,7 +1127,7 @@
 
 struct LanguageAndQualifiedName {
   dwarf2reader::DwarfLanguage language;
-  const char *name;
+  const char* name;
 };
 
 const LanguageAndQualifiedName LanguageAndQualifiedNameCases[] = {
@@ -1141,13 +1149,13 @@
                         ValuesIn(LanguageAndQualifiedNameCases));
 
 TEST_P(QualifiedForLanguage, MemberFunction) {
-  const LanguageAndQualifiedName &param = GetParam();
+  const LanguageAndQualifiedName& param = GetParam();
 
   PushLine(10, 1, "line-file", 212966758);
   SetLanguage(param.language);
 
   StartCU();
-  DIEHandler *class_handler
+  DIEHandler* class_handler
       = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type,
                       "class_A");
   DefineFunction(class_handler, "function_B", 10, 1, NULL);
@@ -1164,14 +1172,14 @@
 }
 
 TEST_P(QualifiedForLanguage, MemberFunctionSignedLanguage) {
-  const LanguageAndQualifiedName &param = GetParam();
+  const LanguageAndQualifiedName& param = GetParam();
 
   PushLine(10, 1, "line-file", 212966758);
   SetLanguage(param.language);
   SetLanguageSigned(true);
 
   StartCU();
-  DIEHandler *class_handler
+  DIEHandler* class_handler
       = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type,
                       "class_A");
   DefineFunction(class_handler, "function_B", 10, 1, NULL);
@@ -1274,7 +1282,7 @@
   PushLine(0x3341a248634e7170ULL, 0x5f6938ee5553b953ULL, "line-file", 18116691);
 
   StartCU();
-  DIEHandler *class_handler
+  DIEHandler* class_handler
     = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type, "class_A");
   DeclarationDIE(class_handler, 0x7d83028c431406e8ULL,
                  dwarf2reader::DW_TAG_subprogram, "declaration-name", "");
@@ -1297,7 +1305,7 @@
 
   StartCU();
   {
-    DIEHandler *class_handler
+    DIEHandler* class_handler
       = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type,
                       "class_A");
     ASSERT_TRUE(class_handler != NULL);
@@ -1325,7 +1333,7 @@
 
   StartCU();
   {
-    DIEHandler *space_handler
+    DIEHandler* space_handler
       = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_namespace,
                       "space_A");
     ASSERT_TRUE(space_handler != NULL);
@@ -1337,7 +1345,7 @@
   }
 
   {
-    DIEHandler *class_handler
+    DIEHandler* class_handler
       = StartSpecifiedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type,
                           0x419bb1d12f9a73a2ULL, "class-definition-name");
     ASSERT_TRUE(class_handler != NULL);
@@ -1429,7 +1437,7 @@
   // space_A::space_B::struct_C::struct_D::union_E::union_F::
   //   class_G::class_H::func_I
   {
-    DIEHandler *space_A_handler
+    DIEHandler* space_A_handler
       = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_namespace,
                       "space_A");
     DeclarationDIE(space_A_handler, 0x2e111126496596e2ULL,
@@ -1439,10 +1447,10 @@
   }
 
   {
-    DIEHandler *space_B_handler
+    DIEHandler* space_B_handler
       = StartSpecifiedDIE(&root_handler_, dwarf2reader::DW_TAG_namespace,
                           0x2e111126496596e2ULL);
-    DIEHandler *struct_C_handler
+    DIEHandler* struct_C_handler
       = StartNamedDIE(space_B_handler, dwarf2reader::DW_TAG_structure_type,
                       "struct_C");
     DeclarationDIE(struct_C_handler, 0x20cd423bf2a25a4cULL,
@@ -1454,10 +1462,10 @@
   }
 
   {
-    DIEHandler *struct_D_handler
+    DIEHandler* struct_D_handler
       = StartSpecifiedDIE(&root_handler_, dwarf2reader::DW_TAG_structure_type,
                           0x20cd423bf2a25a4cULL);
-    DIEHandler *union_E_handler
+    DIEHandler* union_E_handler
       = StartNamedDIE(struct_D_handler, dwarf2reader::DW_TAG_union_type,
                       "union_E");
     DeclarationDIE(union_E_handler, 0xe25c84805aa58c32ULL,
@@ -1469,10 +1477,10 @@
   }
 
   {
-    DIEHandler *union_F_handler
+    DIEHandler* union_F_handler
       = StartSpecifiedDIE(&root_handler_, dwarf2reader::DW_TAG_union_type,
                           0xe25c84805aa58c32ULL);
-    DIEHandler *class_G_handler
+    DIEHandler* class_G_handler
       = StartNamedDIE(union_F_handler, dwarf2reader::DW_TAG_class_type,
                       "class_G");
     DeclarationDIE(class_G_handler, 0xb70d960dcc173b6eULL,
@@ -1484,7 +1492,7 @@
   }
 
   {
-    DIEHandler *class_H_handler
+    DIEHandler* class_H_handler
       = StartSpecifiedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type,
                           0xb70d960dcc173b6eULL);
     DeclarationDIE(class_H_handler, 0x27ff829e3bf69f37ULL,
@@ -1509,7 +1517,7 @@
   DwarfCUToModule::FileContext fc("dwarf-filename", &m, true);
   EXPECT_CALL(reporter_, UncoveredFunction(_)).WillOnce(Return());
   MockLineToModuleHandler lr;
-  EXPECT_CALL(lr, ReadProgram(_,_,_,_)).Times(0);
+  EXPECT_CALL(lr, ReadProgram(_,_,_,_,_,_,_,_)).Times(0);
 
   // Kludge: satisfy reporter_'s expectation.
   reporter_.SetCUName("compilation-unit-name");
@@ -1534,7 +1542,7 @@
     ASSERT_TRUE(root2_handler.StartRootDIE(1,
                                            dwarf2reader::DW_TAG_compile_unit));
     ASSERT_TRUE(root2_handler.EndAttributes());
-    DIEHandler *class_A_handler
+    DIEHandler* class_A_handler
       = StartSpecifiedDIE(&root2_handler, dwarf2reader::DW_TAG_class_type,
                           0xb8fbfdd5f0b26fceULL);
     DeclarationDIE(class_A_handler, 0xb01fef8b380bd1a2ULL,
@@ -1557,7 +1565,7 @@
     root3_handler.Finish();
   }
 
-  vector<Module::Function *> functions;
+  vector<Module::Function*> functions;
   m.GetFunctions(&functions, functions.end());
   EXPECT_EQ(1U, functions.size());
   EXPECT_STREQ("class_A::member_func_B", functions[0]->name.c_str());
@@ -1568,7 +1576,7 @@
   DwarfCUToModule::FileContext fc("dwarf-filename", &m, false);
   EXPECT_CALL(reporter_, UncoveredFunction(_)).WillOnce(Return());
   MockLineToModuleHandler lr;
-  EXPECT_CALL(lr, ReadProgram(_,_,_,_)).Times(0);
+  EXPECT_CALL(lr, ReadProgram(_,_,_,_,_,_,_,_)).Times(0);
 
   // Kludge: satisfy reporter_'s expectation.
   reporter_.SetCUName("compilation-unit-name");
@@ -1594,7 +1602,7 @@
                                            dwarf2reader::DW_TAG_compile_unit));
     ASSERT_TRUE(root2_handler.EndAttributes());
     EXPECT_CALL(reporter_, UnhandledInterCUReference(_, _)).Times(1);
-    DIEHandler *class_A_handler
+    DIEHandler* class_A_handler
       = StartSpecifiedDIE(&root2_handler, dwarf2reader::DW_TAG_class_type,
                           0xb8fbfdd5f0b26fceULL);
     DeclarationDIE(class_A_handler, 0xb01fef8b380bd1a2ULL,
@@ -1657,7 +1665,7 @@
   DeclarationDIE(&root_handler_, 0xd0fe467ec2f1a58cULL,
                  dwarf2reader::DW_TAG_class_type, "class-declaration-name", "");
 
-  dwarf2reader::DIEHandler *class_definition
+  dwarf2reader::DIEHandler* class_definition
     = StartSpecifiedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type,
                         0xd0fe467ec2f1a58cULL, "class-definition-name");
   ASSERT_TRUE(class_definition);
@@ -1688,7 +1696,7 @@
 
   StartCU();
   {
-    dwarf2reader::DIEHandler *declaration_class_handler =
+    dwarf2reader::DIEHandler* declaration_class_handler =
       StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type,
                     "declaration-class");
     DeclarationDIE(declaration_class_handler, 0x9ddb35517455ef7aULL,
@@ -1698,7 +1706,7 @@
     delete declaration_class_handler;
   }
   {
-    dwarf2reader::DIEHandler *definition_class_handler
+    dwarf2reader::DIEHandler* definition_class_handler
       = StartNamedDIE(&root_handler_, dwarf2reader::DW_TAG_class_type,
                       "definition-class");
     DefinitionDIE(definition_class_handler, dwarf2reader::DW_TAG_subprogram,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module.cc	2021-12-09 12:01:26.000000000 +0000
@@ -44,18 +44,18 @@
 // it until we actually have to deal with DWARF on Windows.
 
 // Return true if PATH is an absolute path, false if it is relative.
-static bool PathIsAbsolute(const string &path) {
+static bool PathIsAbsolute(const string& path) {
   return (path.size() >= 1 && path[0] == '/');
 }
 
-static bool HasTrailingSlash(const string &path) {
+static bool HasTrailingSlash(const string& path) {
   return (path.size() >= 1 && path[path.size() - 1] == '/');
 }
 
 // If PATH is an absolute path, return PATH.  If PATH is a relative path,
 // treat it as relative to BASE and return the combined path.
-static string ExpandPath(const string &path,
-                         const string &base) {
+static string ExpandPath(const string& path,
+                         const string& base) {
   if (PathIsAbsolute(path) || base.empty())
     return path;
   return base + (HasTrailingSlash(base) ? "" : "/") + path;
@@ -63,16 +63,16 @@
 
 namespace google_breakpad {
 
-void DwarfLineToModule::DefineDir(const string &name, uint32 dir_num) {
+void DwarfLineToModule::DefineDir(const string& name, uint32_t dir_num) {
   // Directory number zero is reserved to mean the compilation
   // directory. Silently ignore attempts to redefine it.
   if (dir_num != 0)
     directories_[dir_num] = ExpandPath(name, compilation_dir_);
 }
 
-void DwarfLineToModule::DefineFile(const string &name, int32 file_num,
-                                   uint32 dir_num, uint64 mod_time,
-                                   uint64 length) {
+void DwarfLineToModule::DefineFile(const string& name, int32_t file_num,
+                                   uint32_t dir_num, uint64_t mod_time,
+                                   uint64_t length) {
   if (file_num == -1)
     file_num = ++highest_file_number_;
   else if (file_num > highest_file_number_)
@@ -103,9 +103,9 @@
   files_[file_num] = module_->FindFile(full_name);
 }
 
-void DwarfLineToModule::AddLine(uint64 address, uint64 length,
-                                uint32 file_num, uint32 line_num,
-                                uint32 column_num) {
+void DwarfLineToModule::AddLine(uint64_t address, uint64_t length,
+                                uint32_t file_num, uint32_t line_num,
+                                uint32_t column_num) {
   if (length == 0)
     return;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module.h	2021-12-09 12:01:26.000000000 +0000
@@ -121,7 +121,7 @@
   // sort out which lines belong to which functions; we don't add them
   // to any particular function in MODULE ourselves.
   DwarfLineToModule(Module *module, const string& compilation_dir,
-                    vector<Module::Line> *lines)
+                    vector<Module::Line>* lines)
       : module_(module),
         compilation_dir_(compilation_dir),
         lines_(lines),
@@ -132,17 +132,17 @@
   
   ~DwarfLineToModule() { }
 
-  void DefineDir(const string &name, uint32 dir_num);
-  void DefineFile(const string &name, int32 file_num,
-                  uint32 dir_num, uint64 mod_time,
-                  uint64 length);
-  void AddLine(uint64 address, uint64 length,
-               uint32 file_num, uint32 line_num, uint32 column_num);
+  void DefineDir(const string& name, uint32_t dir_num);
+  void DefineFile(const string& name, int32_t file_num,
+                  uint32_t dir_num, uint64_t mod_time,
+                  uint64_t length);
+  void AddLine(uint64_t address, uint64_t length,
+               uint32_t file_num, uint32_t line_num, uint32_t column_num);
 
  private:
 
-  typedef std::map<uint32, string> DirectoryTable;
-  typedef std::map<uint32, Module::File *> FileTable;
+  typedef std::map<uint32_t, string> DirectoryTable;
+  typedef std::map<uint32_t, Module::File*> FileTable;
 
   // The module we're contributing debugging info to. Owned by our
   // client.
@@ -161,7 +161,7 @@
   // to the appropriate function from module_ until we've read the
   // function info as well. Instead, we accumulate lines here, and let
   // whoever constructed this sort it all out.
-  vector<Module::Line> *lines_;
+  vector<Module::Line>* lines_;
 
   // A table mapping directory numbers to paths.
   DirectoryTable directories_;
@@ -171,12 +171,12 @@
 
   // The highest file number we've seen so far, or -1 if we've seen
   // none.  Used for dynamically defined file numbers.
-  int32 highest_file_number_;
+  int32_t highest_file_number_;
   
   // This is the ending address of the last line we omitted, or zero if we
   // didn't omit the previous line. It is zero before we have received any
   // AddLine calls.
-  uint64 omitted_line_end_;
+  uint64_t omitted_line_end_;
 
   // True if we've warned about:
   bool warned_bad_file_number_; // bad file numbers
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_line_to_module_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -51,7 +51,7 @@
   h.AddLine(0x6fd126fbf74f2680LL, 0x63c9a14cf556712bLL, 0x30bf0f27,
             0x4c090cbf, 0x1cf9fe0d);
 
-  vector<Module::File *> files;
+  vector<Module::File*> files;
   m.GetFiles(&files);
   EXPECT_EQ(1U, files.size());
   EXPECT_STREQ("/file1", files[0]->name.c_str());
@@ -86,7 +86,7 @@
   h.AddLine(0xe2d72a37f8d9403aULL, 0x034dfab5b0d4d236ULL, 0x63beb4a5,
             0x75047044U, 0xb6a0016cU);
 
-  vector<Module::File *> files;
+  vector<Module::File*> files;
   m.GetFiles(&files);
   ASSERT_EQ(5U, files.size());
   EXPECT_STREQ("/directory1/file1", files[0]->name.c_str());
@@ -133,7 +133,7 @@
 
   h.AddLine(1, 1, 1, 0, 0);
 
-  vector<Module::File *> files;
+  vector<Module::File*> files;
   m.GetFiles(&files);
   ASSERT_EQ(1U, files.size());
   EXPECT_STREQ("/absolute", files[0]->name.c_str());
@@ -151,7 +151,7 @@
 
   h.AddLine(1, 1, 1, 0, 0);
 
-  vector<Module::File *> files;
+  vector<Module::File*> files;
   m.GetFiles(&files);
   ASSERT_EQ(1U, files.size());
   EXPECT_STREQ("/directory1/relative", files[0]->name.c_str());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_range_list_handler.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_range_list_handler.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_range_list_handler.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_range_list_handler.cc	2021-12-09 12:01:26.000000000 +0000
@@ -39,19 +39,15 @@
 
 namespace google_breakpad {
 
-void DwarfRangeListHandler::AddRange(uint64 begin, uint64 end) {
-  Module::Range r(begin + base_address_, end - begin);
+void DwarfRangeListHandler::AddRange(uint64_t begin, uint64_t end) {
+  Module::Range r(begin, end - begin);
 
   ranges_->push_back(r);
 }
 
-void DwarfRangeListHandler::SetBaseAddress(uint64 base_address) {
-  base_address_ = base_address;
-}
-
 void DwarfRangeListHandler::Finish() {
   std::sort(ranges_->begin(), ranges_->end(),
-    [](const Module::Range &a, const Module::Range &b) {
+    [](const Module::Range& a, const Module::Range& b) {
       return a.address < b.address;
     }
   );
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_range_list_handler.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_range_list_handler.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_range_list_handler.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/dwarf_range_list_handler.h	2021-12-09 12:01:26.000000000 +0000
@@ -51,27 +51,20 @@
 
 class DwarfRangeListHandler: public dwarf2reader::RangeListHandler {
  public:
-  DwarfRangeListHandler(uint64 base_address, vector<Module::Range> *ranges)
-      : base_address_(base_address), ranges_(ranges) { }
+  DwarfRangeListHandler(vector<Module::Range>* ranges)
+      : ranges_(ranges) { }
 
   ~DwarfRangeListHandler() { }
 
   // Add a range to the list
-  void AddRange(uint64 begin, uint64 end);
-
-  // Record the new base address and use it for the following entries
-  void SetBaseAddress(uint64 base_address);
+  void AddRange(uint64_t begin, uint64_t end);
 
   // Sort the ranges so that they are in ascending order of starting address
   void Finish();
 
  private:
-  // The current PC to add to every entry, this can be overridden by a special
-  // list entry
-  uint64 base_address_;
-
   // The list of ranges to be populated
-  vector<Module::Range> *ranges_;
+  vector<Module::Range>* ranges_;
 };
 
 } // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/language.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/language.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/language.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/language.cc	2021-12-09 12:01:26.000000000 +0000
@@ -67,8 +67,8 @@
  public:
   CPPLanguage() {}
 
-  string MakeQualifiedName(const string &parent_name,
-                           const string &name) const {
+  string MakeQualifiedName(const string& parent_name,
+                           const string& name) const {
     return MakeQualifiedNameWithSeparator(parent_name, "::", name);
   }
 
@@ -79,6 +79,13 @@
     demangled->clear();
     return kDontDemangle;
 #else
+    // Attempting to demangle non-C++ symbols with the C++ demangler would print
+    // warnings and fail, so return kDontDemangle for these.
+    if (!IsMangledName(mangled)) {
+      demangled->clear();
+      return kDontDemangle;
+    }
+
     int status;
     char* demangled_c =
         abi::__cxa_demangle(mangled.c_str(), NULL, NULL, &status);
@@ -99,6 +106,21 @@
     return result;
 #endif
   }
+
+ private:
+  static bool IsMangledName(const string& name) {
+    // NOTE: For proper cross-compilation support, this should depend on target
+    // binary's platform, not current build platform.
+#if defined(__APPLE__)
+    // Mac C++ symbols can have up to 4 underscores, followed by a "Z".
+    // Non-C++ symbols are not coded that way, but may have leading underscores.
+    size_t i = name.find_first_not_of('_');
+    return i > 0 && i != string::npos && i <= 4 && name[i] == 'Z';
+#else
+    // Linux C++ symbols always start with "_Z".
+    return name.size() > 2 && name[0] == '_' && name[1] == 'Z';
+#endif
+  }
 };
 
 CPPLanguage CPPLanguageSingleton;
@@ -108,8 +130,8 @@
  public:
   JavaLanguage() {}
 
-  string MakeQualifiedName(const string &parent_name,
-                           const string &name) const {
+  string MakeQualifiedName(const string& parent_name,
+                           const string& name) const {
     return MakeQualifiedNameWithSeparator(parent_name, ".", name);
   }
 };
@@ -121,8 +143,8 @@
  public:
   SwiftLanguage() {}
 
-  string MakeQualifiedName(const string &parent_name,
-                           const string &name) const {
+  string MakeQualifiedName(const string& parent_name,
+                           const string& name) const {
     return MakeQualifiedNameWithSeparator(parent_name, ".", name);
   }
 
@@ -145,8 +167,8 @@
  public:
   RustLanguage() {}
 
-  string MakeQualifiedName(const string &parent_name,
-                           const string &name) const {
+  string MakeQualifiedName(const string& parent_name,
+                           const string& name) const {
     return MakeQualifiedNameWithSeparator(parent_name, ".", name);
   }
 
@@ -180,8 +202,8 @@
   AssemblerLanguage() {}
 
   bool HasFunctions() const { return false; }
-  string MakeQualifiedName(const string &parent_name,
-                           const string &name) const {
+  string MakeQualifiedName(const string& parent_name,
+                           const string& name) const {
     return name;
   }
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/language.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/language.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/language.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/language.h	2021-12-09 12:01:26.000000000 +0000
@@ -74,8 +74,8 @@
   // take into account the parent and child DIE types, allow languages
   // to use their own data type for complex parent names, etc. But if
   // C++ doesn't need all that, who would?
-  virtual string MakeQualifiedName (const string &parent_name,
-                                    const string &name) const = 0;
+  virtual string MakeQualifiedName (const string& parent_name,
+                                    const string& name) const = 0;
 
   enum DemangleResult {
     // Demangling was not performed because it’s not appropriate to attempt.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/breakpad_getcontext.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/breakpad_getcontext.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/breakpad_getcontext.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/breakpad_getcontext.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,56 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef GOOGLE_BREAKPAD_COMMON_LINUX_INCLUDE_UCONTEXT_H
+#define GOOGLE_BREAKPAD_COMMON_LINUX_INCLUDE_UCONTEXT_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifndef HAVE_GETCONTEXT
+
+#include <signal.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif  // __cplusplus
+
+// Provided by src/common/linux/breakpad_getcontext.S
+int breakpad_getcontext(ucontext_t* ucp);
+
+#define getcontext(x)   breakpad_getcontext(x)
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
+
+#endif  // HAVE_GETCONTEXT
+
+#endif  // GOOGLE_BREAKPAD_COMMON_LINUX_INCLUDE_UCONTEXT_H
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/breakpad_getcontext_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/breakpad_getcontext_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/breakpad_getcontext_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/breakpad_getcontext_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,194 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// asm/sigcontext.h can't be included with signal.h on glibc or
+// musl, so only compare _libc_fpstate and _fpstate on Android.
+#if defined(__ANDROID__) && defined(__x86_64__)
+#include <asm/sigcontext.h>
+#endif
+
+#include <sys/ucontext.h>
+
+#include <type_traits>
+
+#include "breakpad_googletest_includes.h"
+#include "common/linux/ucontext_constants.h"
+
+template <int left, int right>
+struct CompileAssertEquals {
+  // a compilation error here indicates left and right are not equal.
+  char left_too_large[right - left];
+  // a compilation error here indicates left and right are not equal.
+  char right_too_large[left - right];
+};
+
+#define COMPILE_ASSERT_EQ(left, right, tag) \
+  CompileAssertEquals<left, right> tag;
+
+TEST(AndroidUContext, GRegsOffset) {
+#if defined(__arm__)
+  // There is no gregs[] array on ARM, so compare to the offset of
+  // first register fields, since they're stored in order.
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.arm_r0));
+#elif defined(__aarch64__)
+  // There is no gregs[] array on ARM, so compare to the offset of
+  // first register fields, since they're stored in order.
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.regs[0]));
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_SP_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.sp));
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_PC_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.pc));
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_PSTATE_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.pstate));
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_EXTENSION_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.__reserved));
+#elif defined(__i386__)
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.gregs));
+#define CHECK_REG(x) \
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_##x##_OFFSET),         \
+            offsetof(ucontext_t,uc_mcontext.gregs[REG_##x]))
+  CHECK_REG(GS);
+  CHECK_REG(FS);
+  CHECK_REG(ES);
+  CHECK_REG(DS);
+  CHECK_REG(EDI);
+  CHECK_REG(ESI);
+  CHECK_REG(EBP);
+  CHECK_REG(ESP);
+  CHECK_REG(EBX);
+  CHECK_REG(EDX);
+  CHECK_REG(ECX);
+  CHECK_REG(EAX);
+  CHECK_REG(TRAPNO);
+  CHECK_REG(ERR);
+  CHECK_REG(EIP);
+  CHECK_REG(CS);
+  CHECK_REG(EFL);
+  CHECK_REG(UESP);
+  CHECK_REG(SS);
+
+  ASSERT_EQ(static_cast<size_t>(UCONTEXT_FPREGS_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.fpregs));
+
+  ASSERT_EQ(static_cast<size_t>(UCONTEXT_FPREGS_MEM_OFFSET),
+            offsetof(ucontext_t,__fpregs_mem));
+#elif defined(__mips__)
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.gregs));
+
+  // PC for mips is not part of gregs.
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_PC_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.pc));
+
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_FPREGS_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.fpregs));
+
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_FPC_CSR),
+            offsetof(ucontext_t,uc_mcontext.fpc_csr));
+#elif defined(__x86_64__)
+
+  COMPILE_ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
+                    offsetof(ucontext_t,uc_mcontext.gregs),
+                    mcontext_gregs_offset);
+#define CHECK_REG(x) \
+  COMPILE_ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_##x), \
+                    offsetof(ucontext_t,uc_mcontext.gregs[REG_##x]), reg_##x)
+  CHECK_REG(R8);
+  CHECK_REG(R9);
+  CHECK_REG(R10);
+  CHECK_REG(R11);
+  CHECK_REG(R12);
+  CHECK_REG(R13);
+  CHECK_REG(R14);
+  CHECK_REG(R15);
+  CHECK_REG(RDI);
+  CHECK_REG(RSI);
+  CHECK_REG(RBP);
+  CHECK_REG(RBX);
+  CHECK_REG(RDX);
+  CHECK_REG(RAX);
+  CHECK_REG(RCX);
+  CHECK_REG(RSP);
+  CHECK_REG(RIP);
+
+  // sigcontext is an analog to mcontext_t. The layout should be the same.
+  COMPILE_ASSERT_EQ(offsetof(mcontext_t,fpregs),
+                    offsetof(sigcontext,fpstate), sigcontext_fpstate);
+
+#if defined(__ANDROID__)
+  // Check that _fpstate from asm/sigcontext.h is essentially the same
+  // as _libc_fpstate.
+  COMPILE_ASSERT_EQ(sizeof(_libc_fpstate), sizeof(_fpstate),
+                    sigcontext_fpstate_size);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,cwd),offsetof(_fpstate,cwd),
+                    sigcontext_fpstate_cwd);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,swd),offsetof(_fpstate,swd),
+                    sigcontext_fpstate_swd);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,ftw),offsetof(_fpstate,twd),
+                    sigcontext_fpstate_twd);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,fop),offsetof(_fpstate,fop),
+                    sigcontext_fpstate_fop);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,rip),offsetof(_fpstate,rip),
+                    sigcontext_fpstate_rip);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,rdp),offsetof(_fpstate,rdp),
+                    sigcontext_fpstate_rdp);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,mxcsr),offsetof(_fpstate,mxcsr),
+                    sigcontext_fpstate_mxcsr);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,mxcr_mask),
+                    offsetof(_fpstate,mxcsr_mask),
+                    sigcontext_fpstate_mxcsr_mask);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,_st), offsetof(_fpstate,st_space),
+                    sigcontext_fpstate_stspace);
+  COMPILE_ASSERT_EQ(offsetof(_libc_fpstate,_xmm), offsetof(_fpstate,xmm_space),
+                    sigcontext_fpstate_xmm_space);
+#endif
+
+  COMPILE_ASSERT_EQ(MCONTEXT_FPREGS_PTR,
+                    offsetof(ucontext_t,uc_mcontext.fpregs),
+                    mcontext_fpregs_ptr);
+  COMPILE_ASSERT_EQ(MCONTEXT_FPREGS_MEM, offsetof(ucontext_t,__fpregs_mem),
+                    mcontext_fpregs_mem);
+  COMPILE_ASSERT_EQ(FPREGS_OFFSET_MXCSR,
+                    offsetof(std::remove_pointer<fpregset_t>::type,mxcsr),
+                    fpregs_offset_mxcsr);
+  COMPILE_ASSERT_EQ(UCONTEXT_SIGMASK_OFFSET, offsetof(ucontext_t, uc_sigmask),
+                    ucontext_sigmask);
+#else
+  ASSERT_EQ(static_cast<size_t>(MCONTEXT_GREGS_OFFSET),
+            offsetof(ucontext_t,uc_mcontext.gregs));
+#endif
+}
+
+TEST(AndroidUContext, SigmakOffset) {
+  ASSERT_EQ(static_cast<size_t>(UCONTEXT_SIGMASK_OFFSET),
+            offsetof(ucontext_t,uc_sigmask));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols.cc	2021-12-09 12:01:26.000000000 +0000
@@ -38,6 +38,7 @@
 #include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <link.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -143,7 +144,7 @@
       munmap(base_, size_);
     }
   }
-  void set(void *mapped_address, size_t mapped_size) {
+  void set(void* mapped_address, size_t mapped_size) {
     is_set_ = true;
     base_ = mapped_address;
     size_ = mapped_size;
@@ -181,6 +182,23 @@
   return 0;
 }
 
+// Find the set of address ranges for all PT_LOAD segments.
+template <typename ElfClass>
+vector<Module::Range> GetPtLoadSegmentRanges(
+    const typename ElfClass::Phdr* program_headers,
+    int nheader) {
+  typedef typename ElfClass::Phdr Phdr;
+  vector<Module::Range> ranges;
+
+  for (int i = 0; i < nheader; ++i) {
+    const Phdr& header = program_headers[i];
+    if (header.p_type == PT_LOAD) {
+      ranges.push_back(Module::Range(header.p_vaddr, header.p_memsz));
+    }
+  }
+  return ranges;
+}
+
 #ifndef NO_STABS_SUPPORT
 template<typename ElfClass>
 bool LoadStabs(const typename ElfClass::Ehdr* elf_header,
@@ -214,22 +232,20 @@
 // owned by a function) with the results.
 class DumperRangesHandler : public DwarfCUToModule::RangesHandler {
  public:
-  DumperRangesHandler(const uint8_t *buffer, uint64 size,
-                      dwarf2reader::ByteReader* reader)
-      : buffer_(buffer), size_(size), reader_(reader) { }
-
-  bool ReadRanges(uint64 offset, Module::Address base_address,
-                  vector<Module::Range>* ranges) {
-    DwarfRangeListHandler handler(base_address, ranges);
-    dwarf2reader::RangeListReader rangelist_reader(buffer_, size_, reader_,
-                                                   &handler);
+  DumperRangesHandler(dwarf2reader::ByteReader* reader) :
+      reader_(reader) { }
 
-    return rangelist_reader.ReadRangeList(offset);
+  bool ReadRanges(
+      enum dwarf2reader::DwarfForm form, uint64_t data,
+      dwarf2reader::RangeListReader::CURangesInfo* cu_info,
+      vector<Module::Range>* ranges) {
+    DwarfRangeListHandler handler(ranges);
+    dwarf2reader::RangeListReader range_list_reader(reader_, cu_info,
+                                                    &handler);
+    return range_list_reader.ReadRanges(form, data);
   }
 
  private:
-  const uint8_t *buffer_;
-  uint64 size_;
   dwarf2reader::ByteReader* reader_;
 };
 
@@ -239,20 +255,28 @@
 class DumperLineToModule: public DwarfCUToModule::LineToModuleHandler {
  public:
   // Create a line-to-module converter using BYTE_READER.
-  explicit DumperLineToModule(dwarf2reader::ByteReader *byte_reader)
+  explicit DumperLineToModule(dwarf2reader::ByteReader* byte_reader)
       : byte_reader_(byte_reader) { }
   void StartCompilationUnit(const string& compilation_dir) {
     compilation_dir_ = compilation_dir;
   }
-  void ReadProgram(const uint8_t *program, uint64 length,
+  void ReadProgram(const uint8_t* program, uint64_t length,
+                   const uint8_t* string_section,
+                   uint64_t string_section_length,
+                   const uint8_t* line_string_section,
+                   uint64_t line_string_section_length,
                    Module* module, std::vector<Module::Line>* lines) {
     DwarfLineToModule handler(module, compilation_dir_, lines);
-    dwarf2reader::LineInfo parser(program, length, byte_reader_, &handler);
+    dwarf2reader::LineInfo parser(program, length, byte_reader_,
+                                  string_section, string_section_length,
+                                  line_string_section,
+                                  line_string_section_length,
+                                  &handler);
     parser.Start();
   }
  private:
   string compilation_dir_;
-  dwarf2reader::ByteReader *byte_reader_;
+  dwarf2reader::ByteReader* byte_reader_;
 };
 
 template<typename ElfClass>
@@ -282,40 +306,31 @@
     string name = GetOffset<ElfClass, char>(elf_header,
                                             section_names->sh_offset) +
                   section->sh_name;
-    const uint8_t *contents = GetOffset<ElfClass, uint8_t>(elf_header,
+    const uint8_t* contents = GetOffset<ElfClass, uint8_t>(elf_header,
                                                            section->sh_offset);
     file_context.AddSectionToSectionMap(name, contents, section->sh_size);
   }
 
-  // Optional .debug_ranges reader
-  scoped_ptr<DumperRangesHandler> ranges_handler;
-  dwarf2reader::SectionMap::const_iterator ranges_entry =
-      file_context.section_map().find(".debug_ranges");
-  if (ranges_entry != file_context.section_map().end()) {
-    const std::pair<const uint8_t *, uint64>& ranges_section =
-      ranges_entry->second;
-    ranges_handler.reset(
-      new DumperRangesHandler(ranges_section.first, ranges_section.second,
-                              &byte_reader));
-  }
+  // .debug_ranges and .debug_rnglists reader
+  DumperRangesHandler ranges_handler(&byte_reader);
 
   // Parse all the compilation units in the .debug_info section.
   DumperLineToModule line_to_module(&byte_reader);
   dwarf2reader::SectionMap::const_iterator debug_info_entry =
       file_context.section_map().find(".debug_info");
   assert(debug_info_entry != file_context.section_map().end());
-  const std::pair<const uint8_t *, uint64>& debug_info_section =
+  const std::pair<const uint8_t*, uint64_t>& debug_info_section =
       debug_info_entry->second;
   // This should never have been called if the file doesn't have a
   // .debug_info section.
   assert(debug_info_section.first);
-  uint64 debug_info_length = debug_info_section.second;
-  for (uint64 offset = 0; offset < debug_info_length;) {
+  uint64_t debug_info_length = debug_info_section.second;
+  for (uint64_t offset = 0; offset < debug_info_length;) {
     // Make a handler for the root DIE that populates MODULE with the
     // data that was found.
     DwarfCUToModule::WarningReporter reporter(dwarf_filename, offset);
     DwarfCUToModule root_handler(&file_context, &line_to_module,
-                                 ranges_handler.get(), &reporter);
+                                 &ranges_handler, &reporter);
     // Make a Dwarf2Handler that drives the DIEHandler.
     dwarf2reader::DIEDispatcher die_dispatcher(&root_handler);
     // Make a DWARF parser for the compilation unit at OFFSET.
@@ -383,7 +398,7 @@
       dwarf2reader::ENDIANNESS_BIG : dwarf2reader::ENDIANNESS_LITTLE;
 
   // Find the call frame information and its size.
-  const uint8_t *cfi =
+  const uint8_t* cfi =
       GetOffset<ElfClass, uint8_t>(elf_header, section->sh_offset);
   size_t cfi_size = section->sh_size;
 
@@ -471,13 +486,13 @@
 
 // Read the .gnu_debuglink and get the debug file name. If anything goes
 // wrong, return an empty string.
-string ReadDebugLink(const uint8_t *debuglink,
+string ReadDebugLink(const uint8_t* debuglink,
                      const size_t debuglink_size,
                      const bool big_endian,
                      const string& obj_file,
                      const std::vector<string>& debug_dirs) {
   // Include '\0' + CRC32 (4 bytes).
-  size_t debuglink_len = strlen(reinterpret_cast<const char *>(debuglink)) + 5;
+  size_t debuglink_len = strlen(reinterpret_cast<const char*>(debuglink)) + 5;
   debuglink_len = 4 * ((debuglink_len + 3) / 4);  // Round up to 4 bytes.
 
   // Sanity check.
@@ -499,7 +514,7 @@
   for (it = debug_dirs.begin(); it < debug_dirs.end(); ++it) {
     const string& debug_dir = *it;
     debuglink_path = debug_dir + "/" +
-                     reinterpret_cast<const char *>(debuglink);
+                     reinterpret_cast<const char*>(debuglink);
 
     // There is the annoying case of /path/to/foo.so having foo.so as the
     // debug link file name. Thus this may end up opening /path/to/foo.so again,
@@ -573,7 +588,7 @@
 
   // Keeps track of which sections have been loaded so sections don't
   // accidentally get loaded twice from two different files.
-  void LoadedSection(const string &section) {
+  void LoadedSection(const string& section) {
     if (loaded_sections_.count(section) == 0) {
       loaded_sections_.insert(section);
     } else {
@@ -584,7 +599,7 @@
 
   // The ELF file and linked debug file are expected to have the same preferred
   // loading address.
-  void set_loading_addr(Addr addr, const string &filename) {
+  void set_loading_addr(Addr addr, const string& filename) {
     if (!has_loading_addr_) {
       loading_addr_ = addr;
       loaded_file_ = filename;
@@ -648,12 +663,20 @@
   module->SetLoadAddress(loading_addr);
   info->set_loading_addr(loading_addr, obj_file);
 
+  // Allow filtering of extraneous debug information in partitioned libraries.
+  // Such libraries contain debug information for all libraries extracted from
+  // the same combined library, implying extensive duplication.
+  vector<Module::Range> address_ranges = GetPtLoadSegmentRanges<ElfClass>(
+      GetOffset<ElfClass, Phdr>(elf_header, elf_header->e_phoff),
+      elf_header->e_phnum);
+  module->SetAddressRanges(address_ranges);
+
   const Shdr* sections =
       GetOffset<ElfClass, Shdr>(elf_header, elf_header->e_shoff);
   const Shdr* section_names = sections + elf_header->e_shstrndx;
   const char* names =
       GetOffset<ElfClass, char>(elf_header, section_names->sh_offset);
-  const char *names_end = names + section_names->sh_size;
+  const char* names_end = names + section_names->sh_size;
   bool found_debug_info_section = false;
   bool found_usable_info = false;
 
@@ -833,7 +856,7 @@
                                            names_end, elf_header->e_shnum);
       if (gnu_debuglink_section) {
         if (!info->debug_dirs().empty()) {
-          const uint8_t *debuglink_contents =
+          const uint8_t* debuglink_contents =
               GetOffset<ElfClass, uint8_t>(elf_header,
                                            gnu_debuglink_section->sh_offset);
           string debuglink_file =
@@ -920,6 +943,7 @@
 template<typename ElfClass>
 bool InitModuleForElfClass(const typename ElfClass::Ehdr* elf_header,
                            const string& obj_filename,
+                           const string& obj_os,
                            scoped_ptr<Module>& module) {
   PageAllocator allocator;
   wasteful_vector<uint8_t> identifier(&allocator, kDefaultBuildIdSize);
@@ -929,15 +953,19 @@
     return false;
   }
 
-  const char *architecture = ElfArchitecture<ElfClass>(elf_header);
+  const char* architecture = ElfArchitecture<ElfClass>(elf_header);
   if (!architecture) {
     fprintf(stderr, "%s: unrecognized ELF machine architecture: %d\n",
             obj_filename.c_str(), elf_header->e_machine);
     return false;
   }
 
-  string name = google_breakpad::BaseName(obj_filename);
-  string os = "Linux";
+  char name_buf[NAME_MAX] = {};
+  std::string name = google_breakpad::ElfFileSoNameFromMappedFile(
+                         elf_header, name_buf, sizeof(name_buf))
+                         ? name_buf
+                         : google_breakpad::BaseName(obj_filename);
+
   // Add an extra "0" at the end.  PDB files on Windows have an 'age'
   // number appended to the end of the file identifier; this isn't
   // really used or necessary on other platforms, but be consistent.
@@ -945,7 +973,7 @@
   // This is just the raw Build ID in hex.
   string code_id = FileID::ConvertIdentifierToString(identifier);
 
-  module.reset(new Module(name, os, architecture, id, code_id));
+  module.reset(new Module(name, obj_os, architecture, id, code_id));
 
   return true;
 }
@@ -953,6 +981,7 @@
 template<typename ElfClass>
 bool ReadSymbolDataElfClass(const typename ElfClass::Ehdr* elf_header,
                             const string& obj_filename,
+                            const string& obj_os,
                             const std::vector<string>& debug_dirs,
                             const DumpOptions& options,
                             Module** out_module) {
@@ -961,7 +990,8 @@
   *out_module = NULL;
 
   scoped_ptr<Module> module;
-  if (!InitModuleForElfClass<ElfClass>(elf_header, obj_filename, module)) {
+  if (!InitModuleForElfClass<ElfClass>(elf_header, obj_filename, obj_os,
+                                       module)) {
     return false;
   }
 
@@ -1009,6 +1039,7 @@
 // Not explicitly exported, but not static so it can be used in unit tests.
 bool ReadSymbolDataInternal(const uint8_t* obj_file,
                             const string& obj_filename,
+                            const string& obj_os,
                             const std::vector<string>& debug_dirs,
                             const DumpOptions& options,
                             Module** module) {
@@ -1020,24 +1051,27 @@
   int elfclass = ElfClass(obj_file);
   if (elfclass == ELFCLASS32) {
     return ReadSymbolDataElfClass<ElfClass32>(
-        reinterpret_cast<const Elf32_Ehdr*>(obj_file), obj_filename, debug_dirs,
-        options, module);
+        reinterpret_cast<const Elf32_Ehdr*>(obj_file), obj_filename, obj_os,
+        debug_dirs, options, module);
   }
   if (elfclass == ELFCLASS64) {
     return ReadSymbolDataElfClass<ElfClass64>(
-        reinterpret_cast<const Elf64_Ehdr*>(obj_file), obj_filename, debug_dirs,
-        options, module);
+        reinterpret_cast<const Elf64_Ehdr*>(obj_file), obj_filename, obj_os,
+        debug_dirs, options, module);
   }
 
   return false;
 }
 
-bool WriteSymbolFile(const string &obj_file,
+bool WriteSymbolFile(const string& load_path,
+                     const string& obj_file,
+                     const string& obj_os,
                      const std::vector<string>& debug_dirs,
                      const DumpOptions& options,
-                     std::ostream &sym_stream) {
+                     std::ostream& sym_stream) {
   Module* module;
-  if (!ReadSymbolData(obj_file, debug_dirs, options, &module))
+  if (!ReadSymbolData(load_path, obj_file, obj_os, debug_dirs, options,
+                      &module))
     return false;
 
   bool result = module->Write(sym_stream, options.symbol_data);
@@ -1048,11 +1082,13 @@
 // Read the selected object file's debugging information, and write out the
 // header only to |stream|. Return true on success; if an error occurs, report
 // it and return false.
-bool WriteSymbolFileHeader(const string& obj_file,
-                           std::ostream &sym_stream) {
+bool WriteSymbolFileHeader(const string& load_path,
+                           const string& obj_file,
+                           const string& obj_os,
+                           std::ostream& sym_stream) {
   MmapWrapper map_wrapper;
   void* elf_header = NULL;
-  if (!LoadELF(obj_file, &map_wrapper, &elf_header)) {
+  if (!LoadELF(load_path, &map_wrapper, &elf_header)) {
     fprintf(stderr, "Could not load ELF file: %s\n", obj_file.c_str());
     return false;
   }
@@ -1066,13 +1102,15 @@
   scoped_ptr<Module> module;
   if (elfclass == ELFCLASS32) {
     if (!InitModuleForElfClass<ElfClass32>(
-        reinterpret_cast<const Elf32_Ehdr*>(elf_header), obj_file, module)) {
+        reinterpret_cast<const Elf32_Ehdr*>(elf_header), obj_file, obj_os,
+        module)) {
       fprintf(stderr, "Failed to load ELF module: %s\n", obj_file.c_str());
       return false;
     }
   } else if (elfclass == ELFCLASS64) {
     if (!InitModuleForElfClass<ElfClass64>(
-        reinterpret_cast<const Elf64_Ehdr*>(elf_header), obj_file, module)) {
+        reinterpret_cast<const Elf64_Ehdr*>(elf_header), obj_file, obj_os,
+        module)) {
       fprintf(stderr, "Failed to load ELF module: %s\n", obj_file.c_str());
       return false;
     }
@@ -1084,17 +1122,19 @@
   return module->Write(sym_stream, ALL_SYMBOL_DATA);
 }
 
-bool ReadSymbolData(const string& obj_file,
+bool ReadSymbolData(const string& load_path,
+                    const string& obj_file,
+                    const string& obj_os,
                     const std::vector<string>& debug_dirs,
                     const DumpOptions& options,
                     Module** module) {
   MmapWrapper map_wrapper;
   void* elf_header = NULL;
-  if (!LoadELF(obj_file, &map_wrapper, &elf_header))
+  if (!LoadELF(load_path, &map_wrapper, &elf_header))
     return false;
 
   return ReadSymbolDataInternal(reinterpret_cast<uint8_t*>(elf_header),
-                                obj_file, debug_dirs, options, module);
+                                obj_file, obj_os, debug_dirs, options, module);
 }
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols.h	2021-12-09 12:01:26.000000000 +0000
@@ -62,21 +62,28 @@
 // If OBJ_FILE has been stripped but contains a .gnu_debuglink section,
 // then look for the debug file in DEBUG_DIRS.
 // SYMBOL_DATA allows limiting the type of symbol data written.
-bool WriteSymbolFile(const string &obj_file,
+bool WriteSymbolFile(const string& load_path,
+                     const string& obj_file,
+                     const string& obj_os,
                      const std::vector<string>& debug_dirs,
                      const DumpOptions& options,
-                     std::ostream &sym_stream);
+                     std::ostream& sym_stream);
 
 // Read the selected object file's debugging information, and write out the
 // header only to |stream|. Return true on success; if an error occurs, report
-// it and return false.
-bool WriteSymbolFileHeader(const string& obj_file,
-                           std::ostream &sym_stream);
+// it and return false. |obj_file| becomes the MODULE file name and |obj_os|
+// becomes the MODULE operating system.
+bool WriteSymbolFileHeader(const string& load_path,
+                           const string& obj_file,
+                           const string& obj_os,
+                           std::ostream& sym_stream);
 
 // As above, but simply return the debugging information in MODULE
 // instead of writing it to a stream. The caller owns the resulting
 // Module object and must delete it when finished.
-bool ReadSymbolData(const string& obj_file,
+bool ReadSymbolData(const string& load_path,
+                    const string& obj_file,
+                    const string& obj_os,
                     const std::vector<string>& debug_dirs,
                     const DumpOptions& options,
                     Module** module);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/dump_symbols_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -51,6 +51,7 @@
 
 bool ReadSymbolDataInternal(const uint8_t* obj_file,
                             const string& obj_filename,
+                            const string& obj_os,
                             const std::vector<string>& debug_dir,
                             const DumpOptions& options,
                             Module** module);
@@ -94,6 +95,7 @@
   DumpOptions options(ALL_SYMBOL_DATA, true);
   EXPECT_FALSE(ReadSymbolDataInternal(reinterpret_cast<uint8_t*>(&header),
                                       "foo",
+                                      "Linux",
                                       vector<string>(),
                                       options,
                                       &module));
@@ -130,6 +132,7 @@
   DumpOptions options(ALL_SYMBOL_DATA, true);
   EXPECT_TRUE(ReadSymbolDataInternal(this->elfdata,
                                      "foo",
+                                     "Linux",
                                      vector<string>(),
                                      options,
                                      &module));
@@ -186,6 +189,7 @@
   DumpOptions options(ALL_SYMBOL_DATA, true);
   EXPECT_TRUE(ReadSymbolDataInternal(this->elfdata,
                                      "foo",
+                                     "Linux",
                                      vector<string>(),
                                      options,
                                      &module));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_core_dump.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_core_dump.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_core_dump.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_core_dump.h	2021-12-09 12:01:26.000000000 +0000
@@ -34,6 +34,7 @@
 #define COMMON_LINUX_ELF_CORE_DUMP_H_
 
 #include <elf.h>
+#include <limits.h>
 #include <link.h>
 #include <stddef.h>
 
@@ -45,18 +46,18 @@
 // provides methods for accessing program headers and the note section.
 class ElfCoreDump {
  public:
-  // ELF types based on the value of __WORDSIZE.
+  // ELF types based on the native word size.
   typedef ElfW(Ehdr) Ehdr;
   typedef ElfW(Nhdr) Nhdr;
   typedef ElfW(Phdr) Phdr;
   typedef ElfW(Word) Word;
   typedef ElfW(Addr) Addr;
-#if __WORDSIZE == 32
+#if ULONG_MAX == 0xffffffff
   static const int kClass = ELFCLASS32;
-#elif __WORDSIZE == 64
+#elif ULONG_MAX == 0xffffffffffffffff
   static const int kClass = ELFCLASS64;
 #else
-#error "Unsupported __WORDSIZE for ElfCoreDump."
+#error "Unsupported word size for ElfCoreDump."
 #endif
 
   // A class encapsulating the note content in a core dump, which provides
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module.cc	2021-12-09 12:01:26.000000000 +0000
@@ -69,7 +69,7 @@
   // otherwise. Assume each symbol has a 'value' field whose size is
   // VALUE_SIZE.
   //
-  ELFSymbolIterator(const ByteBuffer *buffer, bool big_endian,
+  ELFSymbolIterator(const ByteBuffer* buffer, bool big_endian,
                     size_t value_size)
     : value_size_(value_size), cursor_(buffer, big_endian) {
     // Actually, weird sizes could be handled just fine, but they're
@@ -81,13 +81,13 @@
 
   // Move to the next symbol. This function's behavior is undefined if
   // at_end() is true when it is called.
-  ELFSymbolIterator &operator++() { Fetch(); symbol_.index++; return *this; }
+  ELFSymbolIterator& operator++() { Fetch(); symbol_.index++; return *this; }
 
   // Dereferencing this iterator produces a reference to an Symbol structure
   // that holds the current symbol's values. The symbol is owned by this
   // SymbolIterator, and will be invalidated at the next call to operator++.
-  const Symbol &operator*() const { return symbol_; }
-  const Symbol *operator->() const { return &symbol_; }
+  const Symbol& operator*() const { return symbol_; }
+  const Symbol* operator->() const { return &symbol_; }
 
 private:
   // Read the symbol at cursor_, and set symbol_ appropriately.
@@ -126,21 +126,21 @@
   Symbol symbol_;
 };
 
-const char *SymbolString(ptrdiff_t offset, ByteBuffer& strings) {
+const char* SymbolString(ptrdiff_t offset, ByteBuffer& strings) {
   if (offset < 0 || (size_t) offset >= strings.Size()) {
     // Return the null string.
     offset = 0;
   }
-  return reinterpret_cast<const char *>(strings.start + offset);
+  return reinterpret_cast<const char*>(strings.start + offset);
 }
 
-bool ELFSymbolsToModule(const uint8_t *symtab_section,
+bool ELFSymbolsToModule(const uint8_t* symtab_section,
                         size_t symtab_size,
-                        const uint8_t *string_section,
+                        const uint8_t* string_section,
                         size_t string_size,
                         const bool big_endian,
                         size_t value_size,
-                        Module *module) {
+                        Module* module) {
   ByteBuffer symbols(symtab_section, symtab_size);
   // Ensure that the string section is null-terminated.
   if (string_section[string_size - 1] != '\0') {
@@ -156,7 +156,7 @@
   while(!iterator->at_end) {
     if (ELF32_ST_TYPE(iterator->info) == STT_FUNC &&
         iterator->shndx != SHN_UNDEF) {
-      Module::Extern *ext = new Module::Extern(iterator->value);
+      Module::Extern* ext = new Module::Extern(iterator->value);
       ext->name = SymbolString(iterator->name_offset, strings);
 #if !defined(__ANDROID__)  // Android NDK doesn't provide abi::__cxa_demangle.
       int status = 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module.h	2021-12-09 12:01:26.000000000 +0000
@@ -44,13 +44,13 @@
 
 class Module;
 
-bool ELFSymbolsToModule(const uint8_t *symtab_section,
+bool ELFSymbolsToModule(const uint8_t* symtab_section,
                         size_t symtab_size,
-                        const uint8_t *string_section,
+                        const uint8_t* string_section,
                         size_t string_size,
                         const bool big_endian,
                         size_t value_size,
-                        Module *module);
+                        Module* module);
 
 }  // namespace google_breakpad
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -86,7 +86,7 @@
   // 4 or 8 (bytes)
   size_t value_size;
 
-  vector<Module::Extern *> externs;
+  vector<Module::Extern*> externs;
 };
 
 class ELFSymbolsToModuleTest32 : public ELFSymbolsToModuleTestFixture,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elfutils.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elfutils.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elfutils.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elfutils.cc	2021-12-09 12:01:26.000000000 +0000
@@ -40,11 +40,11 @@
 namespace {
 
 template<typename ElfClass>
-void FindElfClassSection(const char *elf_base,
-                         const char *section_name,
+void FindElfClassSection(const char* elf_base,
+                         const char* section_name,
                          typename ElfClass::Word section_type,
-                         const void **section_start,
-                         size_t *section_size) {
+                         const void** section_start,
+                         size_t* section_size) {
   typedef typename ElfClass::Ehdr Ehdr;
   typedef typename ElfClass::Shdr Shdr;
 
@@ -57,12 +57,18 @@
   const Ehdr* elf_header = reinterpret_cast<const Ehdr*>(elf_base);
   assert(elf_header->e_ident[EI_CLASS] == ElfClass::kClass);
 
+  if (elf_header->e_shoff == 0) {
+    *section_start = NULL;
+    *section_size = 0;
+    return;
+  }
+
   const Shdr* sections =
     GetOffset<ElfClass, Shdr>(elf_header, elf_header->e_shoff);
   const Shdr* section_names = sections + elf_header->e_shstrndx;
   const char* names =
     GetOffset<ElfClass, char>(elf_header, section_names->sh_offset);
-  const char *names_end = names + section_names->sh_size;
+  const char* names_end = names + section_names->sh_size;
 
   const Shdr* section =
     FindElfSectionByName<ElfClass>(section_name, section_type,
@@ -76,9 +82,9 @@
 }
 
 template<typename ElfClass>
-void FindElfClassSegment(const char *elf_base,
+void FindElfClassSegment(const char* elf_base,
                          typename ElfClass::Word segment_type,
-                         wasteful_vector<ElfSegment> *segments) {
+                         wasteful_vector<ElfSegment>* segments) {
   typedef typename ElfClass::Ehdr Ehdr;
   typedef typename ElfClass::Phdr Phdr;
 
@@ -117,11 +123,11 @@
   return elf_header->e_ident[EI_CLASS];
 }
 
-bool FindElfSection(const void *elf_mapped_base,
-                    const char *section_name,
+bool FindElfSection(const void* elf_mapped_base,
+                    const char* section_name,
                     uint32_t section_type,
-                    const void **section_start,
-                    size_t *section_size) {
+                    const void** section_start,
+                    size_t* section_size) {
   assert(elf_mapped_base);
   assert(section_start);
   assert(section_size);
@@ -173,4 +179,65 @@
   return false;
 }
 
+template <typename ElfClass>
+bool FindElfSoNameFromDynamicSection(const void* section_start,
+                                     size_t section_size,
+                                     const void* dynstr_start,
+                                     size_t dynstr_size,
+                                     char* soname,
+                                     size_t soname_size) {
+  typedef typename ElfClass::Dyn Dyn;
+
+  auto* dynamic = static_cast<const Dyn*>(section_start);
+  size_t dcount = section_size / sizeof(Dyn);
+  for (const Dyn* dyn = dynamic; dyn < dynamic + dcount; ++dyn) {
+    if (dyn->d_tag == DT_SONAME) {
+      const char* dynstr = static_cast<const char*>(dynstr_start);
+      if (dyn->d_un.d_val >= dynstr_size) {
+        // Beyond the end of the dynstr section
+        return false;
+      }
+      const char* str = dynstr + dyn->d_un.d_val;
+      const size_t maxsize = dynstr_size - dyn->d_un.d_val;
+      my_strlcpy(soname, str, maxsize < soname_size ? maxsize : soname_size);
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool ElfFileSoNameFromMappedFile(const void* elf_base,
+                                 char* soname,
+                                 size_t soname_size) {
+  if (!IsValidElf(elf_base)) {
+    // Not ELF
+    return false;
+  }
+
+  const void* segment_start;
+  size_t segment_size;
+  if (!FindElfSection(elf_base, ".dynamic", SHT_DYNAMIC, &segment_start,
+                      &segment_size)) {
+    // No dynamic section
+    return false;
+  }
+
+  const void* dynstr_start;
+  size_t dynstr_size;
+  if (!FindElfSection(elf_base, ".dynstr", SHT_STRTAB, &dynstr_start,
+                      &dynstr_size)) {
+    // No dynstr section
+    return false;
+  }
+
+  int cls = ElfClass(elf_base);
+  return cls == ELFCLASS32 ? FindElfSoNameFromDynamicSection<ElfClass32>(
+                                 segment_start, segment_size, dynstr_start,
+                                 dynstr_size, soname, soname_size)
+                           : FindElfSoNameFromDynamicSection<ElfClass64>(
+                                 segment_start, segment_size, dynstr_start,
+                                 dynstr_size, soname, soname_size);
+}
+
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elfutils.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elfutils.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elfutils.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/elfutils.h	2021-12-09 12:01:26.000000000 +0000
@@ -45,6 +45,7 @@
 // with specific ELF bits.
 struct ElfClass32 {
   typedef Elf32_Addr Addr;
+  typedef Elf32_Dyn Dyn;
   typedef Elf32_Ehdr Ehdr;
   typedef Elf32_Nhdr Nhdr;
   typedef Elf32_Phdr Phdr;
@@ -62,6 +63,7 @@
 
 struct ElfClass64 {
   typedef Elf64_Addr Addr;
+  typedef Elf64_Dyn Dyn;
   typedef Elf64_Ehdr Ehdr;
   typedef Elf64_Nhdr Nhdr;
   typedef Elf64_Phdr Phdr;
@@ -84,11 +86,11 @@
 // in the ELF binary data at |elf_mapped_base|. On success, returns true
 // and sets |*section_start| to point to the start of the section data,
 // and |*section_size| to the size of the section's data.
-bool FindElfSection(const void *elf_mapped_base,
-                    const char *section_name,
+bool FindElfSection(const void* elf_mapped_base,
+                    const char* section_name,
                     uint32_t section_type,
-                    const void **section_start,
-                    size_t *section_size);
+                    const void** section_start,
+                    size_t* section_size);
 
 // Internal helper method, exposed for convenience for callers
 // that already have more info.
@@ -122,6 +124,12 @@
 GetOffset(const typename ElfClass::Ehdr* elf_header,
           typename ElfClass::Off offset);
 
+// Read the value of DT_SONAME from the elf file mapped at |elf_base|. Returns
+// true and fills |soname| with the result if found.
+bool ElfFileSoNameFromMappedFile(const void* elf_base,
+                                 char* soname,
+                                 size_t soname_size);
+
 }  // namespace google_breakpad
 
 #endif  // COMMON_LINUX_ELFUTILS_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/file_id.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/file_id.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/file_id.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/file_id.cc	2021-12-09 12:01:26.000000000 +0000
@@ -61,7 +61,7 @@
 // These functions are also used inside the crashed process, so be safe
 // and use the syscall/libc wrappers instead of direct syscalls or libc.
 
-static bool ElfClassBuildIDNoteIdentifier(const void *section, size_t length,
+static bool ElfClassBuildIDNoteIdentifier(const void* section, size_t length,
                                           wasteful_vector<uint8_t>& identifier) {
   static_assert(sizeof(ElfClass32::Nhdr) == sizeof(ElfClass64::Nhdr),
                 "Elf32_Nhdr and Elf64_Nhdr should be the same");
@@ -69,7 +69,7 @@
 
   const void* section_end = reinterpret_cast<const char*>(section) + length;
   const Nhdr* note_header = reinterpret_cast<const Nhdr*>(section);
-  while (reinterpret_cast<const void *>(note_header) < section_end) {
+  while (reinterpret_cast<const void*>(note_header) < section_end) {
     if (note_header->n_type == NT_GNU_BUILD_ID)
       break;
     note_header = reinterpret_cast<const Nhdr*>(
@@ -77,7 +77,7 @@
                   NOTE_PADDING(note_header->n_namesz) +
                   NOTE_PADDING(note_header->n_descsz));
   }
-  if (reinterpret_cast<const void *>(note_header) >= section_end ||
+  if (reinterpret_cast<const void*>(note_header) >= section_end ||
       note_header->n_descsz == 0) {
     return false;
   }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/file_id_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/file_id_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/file_id_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/file_id_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,10 @@
 // Unit tests for FileID
 
 #include <elf.h>
+#include <spawn.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <string>
 #include <vector>
@@ -42,6 +45,7 @@
 #include "common/linux/synth_elf.h"
 #include "common/test_assembler.h"
 #include "common/tests/auto_tempdir.h"
+#include "common/tests/file_utils.h"
 #include "common/using_std_string.h"
 #include "breakpad_googletest_includes.h"
 
@@ -80,13 +84,18 @@
   // copy our binary to a temp file, and strip it
   AutoTempDir temp_dir;
   string templ = temp_dir.path() + "/file-id-unittest";
-  char cmdline[4096];
-  sprintf(cmdline, "cp \"%s\" \"%s\"", exe_name, templ.c_str());
-  ASSERT_EQ(0, system(cmdline)) << "Failed to execute: " << cmdline;
-  sprintf(cmdline, "chmod u+w \"%s\"", templ.c_str());
-  ASSERT_EQ(0, system(cmdline)) << "Failed to execute: " << cmdline;
-  sprintf(cmdline, "strip \"%s\"", templ.c_str());
-  ASSERT_EQ(0, system(cmdline)) << "Failed to execute: " << cmdline;
+  ASSERT_TRUE(CopyFile(exe_name, templ));
+  pid_t pid;
+  char* argv[] = {
+      const_cast<char*>("strip"),
+      const_cast<char*>(templ.c_str()),
+      nullptr,
+  };
+  ASSERT_EQ(0, posix_spawnp(&pid, argv[0], nullptr, nullptr, argv, nullptr));
+  int status;
+  ASSERT_EQ(pid, waitpid(pid, &status, 0));
+  ASSERT_TRUE(WIFEXITED(status));
+  ASSERT_EQ(0, WEXITSTATUS(status));
 
   PageAllocator allocator;
   id_vector identifier1(&allocator, kDefaultBuildIdSize);
@@ -261,7 +270,7 @@
   elf.AddSection(".text", text, SHT_PROGBITS);
   Notes notes(kLittleEndian);
   notes.AddNote(0, "Linux",
-                reinterpret_cast<const uint8_t *>("\0x42\0x02\0\0"), 4);
+                reinterpret_cast<const uint8_t*>("\0x42\0x02\0\0"), 4);
   notes.AddNote(NT_GNU_BUILD_ID, "GNU", kExpectedIdentifierBytes,
                 sizeof(kExpectedIdentifierBytes));
   int note_idx = elf.AddSection(".note", notes, SHT_NOTE);
@@ -292,7 +301,7 @@
   elf.AddSection(".text", text, SHT_PROGBITS);
   Notes notes1(kLittleEndian);
   notes1.AddNote(0, "Linux",
-                reinterpret_cast<const uint8_t *>("\0x42\0x02\0\0"), 4);
+                reinterpret_cast<const uint8_t*>("\0x42\0x02\0\0"), 4);
   Notes notes2(kLittleEndian);
   notes2.AddNote(NT_GNU_BUILD_ID, "GNU", kExpectedIdentifierBytes,
                  sizeof(kExpectedIdentifierBytes));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/google_crashdump_uploader.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/google_crashdump_uploader.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/google_crashdump_uploader.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/google_crashdump_uploader.cc	2021-12-09 12:01:26.000000000 +0000
@@ -193,10 +193,15 @@
     return false;
   }
   std::cout << "Sending request to " << crash_server_;
-  return http_layer_->SendRequest(crash_server_,
-                                  parameters_,
-                                  http_status_code,
-                                  http_response_header,
-                                  http_response_body);
+  long status_code;
+  bool success = http_layer_->SendRequest(crash_server_,
+                                          parameters_,
+                                          &status_code,
+                                          http_response_header,
+                                          http_response_body);
+  if (http_status_code) {
+    *http_status_code = status_code;
+  }
+  return success;
 }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/google_crashdump_uploader_test.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/google_crashdump_uploader_test.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/google_crashdump_uploader_test.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/google_crashdump_uploader_test.cc	2021-12-09 12:01:26.000000000 +0000
@@ -50,7 +50,7 @@
   MOCK_METHOD5(SendRequest,
                bool(const string& url,
                     const std::map<string, string>& parameters,
-                    int* http_status_code,
+                    long* http_status_code,
                     string* http_header_data,
                     string* http_response_data));
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/guid_creator.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/guid_creator.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/guid_creator.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/guid_creator.cc	2021-12-09 12:01:26.000000000 +0000
@@ -39,6 +39,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
@@ -104,7 +105,7 @@
  private:
 #ifdef HAVE_ARC4RANDOM
   static void CreateGuidFromArc4Random(GUID *guid) {
-    char *buf = reinterpret_cast<char *>(guid);
+    char *buf = reinterpret_cast<char*>(guid);
 
     for (size_t i = 0; i < sizeof(GUID); i += sizeof(uint32_t)) {
       uint32_t random_data = arc4random();
@@ -128,7 +129,7 @@
 
 #if defined(HAVE_SYS_RANDOM_H) && defined(HAVE_GETRANDOM)
   static bool CreateGUIDFromGetrandom(GUID *guid) {
-    char *buf = reinterpret_cast<char *>(guid);
+    char *buf = reinterpret_cast<char*>(guid);
     int read_bytes = getrandom(buf, sizeof(GUID), GRND_NONBLOCK);
 
     return (read_bytes == static_cast<int>(sizeof(GUID)));
@@ -138,7 +139,7 @@
   // Populate the GUID using random bytes read from /dev/urandom, returns false
   // if the GUID wasn't fully populated with random data.
   static bool CreateGUIDFromDevUrandom(GUID *guid) {
-    char *buf = reinterpret_cast<char *>(guid);
+    char *buf = reinterpret_cast<char*>(guid);
     int fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
 
     if (fd == -1) {
@@ -153,7 +154,7 @@
 
   // Populate the GUID using a stream of random bytes obtained from rand().
   static void CreateGUIDFromRand(GUID *guid) {
-    char *buf = reinterpret_cast<char *>(guid);
+    char *buf = reinterpret_cast<char*>(guid);
 
     InitOnce();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/http_upload.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/http_upload.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/http_upload.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/http_upload.cc	2021-12-09 12:01:26.000000000 +0000
@@ -36,14 +36,14 @@
 namespace {
 
 // Callback to get the response data from server.
-static size_t WriteCallback(void *ptr, size_t size,
-                            size_t nmemb, void *userp) {
+static size_t WriteCallback(void* ptr, size_t size,
+                            size_t nmemb, void* userp) {
   if (!userp)
     return 0;
 
-  string *response = reinterpret_cast<string *>(userp);
+  string* response = reinterpret_cast<string*>(userp);
   size_t real_size = size * nmemb;
-  response->append(reinterpret_cast<char *>(ptr), real_size);
+  response->append(reinterpret_cast<char*>(ptr), real_size);
   return real_size;
 }
 
@@ -54,15 +54,15 @@
 static const char kUserAgent[] = "Breakpad/1.0 (Linux)";
 
 // static
-bool HTTPUpload::SendRequest(const string &url,
-                             const map<string, string> &parameters,
-                             const map<string, string> &files,
-                             const string &proxy,
-                             const string &proxy_user_pwd,
-                             const string &ca_certificate_file,
-                             string *response_body,
-                             long *response_code,
-                             string *error_description) {
+bool HTTPUpload::SendRequest(const string& url,
+                             const map<string, string>& parameters,
+                             const map<string, string>& files,
+                             const string& proxy,
+                             const string& proxy_user_pwd,
+                             const string& ca_certificate_file,
+                             string* response_body,
+                             long* response_code,
+                             string* error_description) {
   if (response_code != NULL)
     *response_code = 0;
 
@@ -101,7 +101,7 @@
 
   CURL* (*curl_easy_init)(void);
   *(void**) (&curl_easy_init) = dlsym(curl_lib, "curl_easy_init");
-  CURL *curl = (*curl_easy_init)();
+  CURL* curl = (*curl_easy_init)();
   if (error_description != NULL)
     *error_description = "No Error";
 
@@ -111,7 +111,7 @@
   }
 
   CURLcode err_code = CURLE_OK;
-  CURLcode (*curl_easy_setopt)(CURL *, CURLoption, ...);
+  CURLcode (*curl_easy_setopt)(CURL*, CURLoption, ...);
   *(void**) (&curl_easy_setopt) = dlsym(curl_lib, "curl_easy_setopt");
   (*curl_easy_setopt)(curl, CURLOPT_URL, url.c_str());
   (*curl_easy_setopt)(curl, CURLOPT_USERAGENT, kUserAgent);
@@ -128,10 +128,10 @@
   if (!ca_certificate_file.empty())
     (*curl_easy_setopt)(curl, CURLOPT_CAINFO, ca_certificate_file.c_str());
 
-  struct curl_httppost *formpost = NULL;
-  struct curl_httppost *lastptr = NULL;
+  struct curl_httppost* formpost = NULL;
+  struct curl_httppost* lastptr = NULL;
   // Add form data.
-  CURLFORMcode (*curl_formadd)(struct curl_httppost **, struct curl_httppost **, ...);
+  CURLFORMcode (*curl_formadd)(struct curl_httppost**, struct curl_httppost**, ...);
   *(void**) (&curl_formadd) = dlsym(curl_lib, "curl_formadd");
   map<string, string>::const_iterator iter = parameters.begin();
   for (; iter != parameters.end(); ++iter)
@@ -151,9 +151,9 @@
   (*curl_easy_setopt)(curl, CURLOPT_HTTPPOST, formpost);
 
   // Disable 100-continue header.
-  struct curl_slist *headerlist = NULL;
+  struct curl_slist* headerlist = NULL;
   char buf[] = "Expect:";
-  struct curl_slist* (*curl_slist_append)(struct curl_slist *, const char *);
+  struct curl_slist* (*curl_slist_append)(struct curl_slist*, const char*);
   *(void**) (&curl_slist_append) = dlsym(curl_lib, "curl_slist_append");
   headerlist = (*curl_slist_append)(headerlist, buf);
   (*curl_easy_setopt)(curl, CURLOPT_HTTPHEADER, headerlist);
@@ -161,17 +161,17 @@
   if (response_body != NULL) {
     (*curl_easy_setopt)(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
     (*curl_easy_setopt)(curl, CURLOPT_WRITEDATA,
-                     reinterpret_cast<void *>(response_body));
+                     reinterpret_cast<void*>(response_body));
   }
 
   // Fail if 400+ is returned from the web server.
   (*curl_easy_setopt)(curl, CURLOPT_FAILONERROR, 1);
 
-  CURLcode (*curl_easy_perform)(CURL *);
+  CURLcode (*curl_easy_perform)(CURL*);
   *(void**) (&curl_easy_perform) = dlsym(curl_lib, "curl_easy_perform");
   err_code = (*curl_easy_perform)(curl);
   if (response_code != NULL) {
-    CURLcode (*curl_easy_getinfo)(CURL *, CURLINFO, ...);
+    CURLcode (*curl_easy_getinfo)(CURL*, CURLINFO, ...);
     *(void**) (&curl_easy_getinfo) = dlsym(curl_lib, "curl_easy_getinfo");
     (*curl_easy_getinfo)(curl, CURLINFO_RESPONSE_CODE, response_code);
   }
@@ -186,16 +186,16 @@
   if (error_description != NULL)
     *error_description = (*curl_easy_strerror)(err_code);
 
-  void (*curl_easy_cleanup)(CURL *);
+  void (*curl_easy_cleanup)(CURL*);
   *(void**) (&curl_easy_cleanup) = dlsym(curl_lib, "curl_easy_cleanup");
   (*curl_easy_cleanup)(curl);
   if (formpost != NULL) {
-    void (*curl_formfree)(struct curl_httppost *);
+    void (*curl_formfree)(struct curl_httppost*);
     *(void**) (&curl_formfree) = dlsym(curl_lib, "curl_formfree");
     (*curl_formfree)(formpost);
   }
   if (headerlist != NULL) {
-    void (*curl_slist_free_all)(struct curl_slist *);
+    void (*curl_slist_free_all)(struct curl_slist*);
     *(void**) (&curl_slist_free_all) = dlsym(curl_lib, "curl_slist_free_all");
     (*curl_slist_free_all)(headerlist);
   }
@@ -211,10 +211,10 @@
 }
 
 // static
-bool HTTPUpload::CheckParameters(const map<string, string> &parameters) {
+bool HTTPUpload::CheckParameters(const map<string, string>& parameters) {
   for (map<string, string>::const_iterator pos = parameters.begin();
        pos != parameters.end(); ++pos) {
-    const string &str = pos->first;
+    const string& str = pos->first;
     if (str.size() == 0)
       return false;  // disallow empty parameter names
     for (unsigned int i = 0; i < str.size(); ++i) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/http_upload.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/http_upload.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/http_upload.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/http_upload.h	2021-12-09 12:01:26.000000000 +0000
@@ -58,21 +58,21 @@
   // received (or 0 if the request failed before getting an HTTP response).
   // If the send fails, a description of the error will be
   // returned in error_description.
-  static bool SendRequest(const string &url,
-                          const map<string, string> &parameters,
-                          const map<string, string> &files,
-                          const string &proxy,
-                          const string &proxy_user_pwd,
-                          const string &ca_certificate_file,
-                          string *response_body,
-                          long *response_code,
-                          string *error_description);
+  static bool SendRequest(const string& url,
+                          const map<string, string>& parameters,
+                          const map<string, string>& files,
+                          const string& proxy,
+                          const string& proxy_user_pwd,
+                          const string& ca_certificate_file,
+                          string* response_body,
+                          long* response_code,
+                          string* error_description);
 
  private:
   // Checks that the given list of parameters has only printable
   // ASCII characters in the parameter name, and does not contain
   // any quote (") characters.  Returns true if so.
-  static bool CheckParameters(const map<string, string> &parameters);
+  static bool CheckParameters(const map<string, string>& parameters);
 
   // Checks the curl_lib parameter points to a valid curl lib.
   static bool CheckCurlLib(void* curl_lib);
@@ -80,8 +80,8 @@
   // No instances of this class should be created.
   // Disallow all constructors, destructors, and operator=.
   HTTPUpload();
-  explicit HTTPUpload(const HTTPUpload &);
-  void operator=(const HTTPUpload &);
+  explicit HTTPUpload(const HTTPUpload&);
+  void operator=(const HTTPUpload&);
   ~HTTPUpload();
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/libcurl_wrapper.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/libcurl_wrapper.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/libcurl_wrapper.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/libcurl_wrapper.cc	2021-12-09 12:01:26.000000000 +0000
@@ -38,32 +38,24 @@
 namespace google_breakpad {
 LibcurlWrapper::LibcurlWrapper()
     : init_ok_(false),
-      formpost_(NULL),
-      lastptr_(NULL),
-      headerlist_(NULL) {
-  curl_lib_ = dlopen("libcurl.so", RTLD_NOW);
-  if (!curl_lib_) {
-    curl_lib_ = dlopen("libcurl.so.4", RTLD_NOW);
-  }
-  if (!curl_lib_) {
-    curl_lib_ = dlopen("libcurl.so.3", RTLD_NOW);
-  }
-  if (!curl_lib_) {
-    std::cout << "Could not find libcurl via dlopen";
-    return;
+      curl_lib_(nullptr),
+      last_curl_error_(""),
+      curl_(nullptr),
+      formpost_(nullptr),
+      lastptr_(nullptr),
+      headerlist_(nullptr) {}
+
+LibcurlWrapper::~LibcurlWrapper() {
+  if (init_ok_) {
+    (*easy_cleanup_)(curl_);
+    dlclose(curl_lib_);
   }
-  std::cout << "LibcurlWrapper init succeeded";
-  init_ok_ = true;
-  return;
 }
 
-LibcurlWrapper::~LibcurlWrapper() {}
-
 bool LibcurlWrapper::SetProxy(const string& proxy_host,
                               const string& proxy_userpwd) {
-  if (!init_ok_) {
-    return false;
-  }
+  if (!CheckInit()) return false;
+
   // Set proxy information if necessary.
   if (!proxy_host.empty()) {
     (*easy_setopt_)(curl_, CURLOPT_PROXY, proxy_host.c_str());
@@ -83,9 +75,8 @@
 
 bool LibcurlWrapper::AddFile(const string& upload_file_path,
                              const string& basename) {
-  if (!init_ok_) {
-    return false;
-  }
+  if (!CheckInit()) return false;
+
   std::cout << "Adding " << upload_file_path << " to form upload.";
   // Add form file.
   (*formadd_)(&formpost_, &lastptr_,
@@ -97,23 +88,24 @@
 }
 
 // Callback to get the response data from server.
-static size_t WriteCallback(void *ptr, size_t size,
-                            size_t nmemb, void *userp) {
+static size_t WriteCallback(void* ptr, size_t size,
+                            size_t nmemb, void* userp) {
   if (!userp)
     return 0;
 
-  string *response = reinterpret_cast<string *>(userp);
+  string* response = reinterpret_cast<string*>(userp);
   size_t real_size = size * nmemb;
-  response->append(reinterpret_cast<char *>(ptr), real_size);
+  response->append(reinterpret_cast<char*>(ptr), real_size);
   return real_size;
 }
 
 bool LibcurlWrapper::SendRequest(const string& url,
                                  const std::map<string, string>& parameters,
-                                 int* http_status_code,
+                                 long* http_status_code,
                                  string* http_header_data,
                                  string* http_response_data) {
-  (*easy_setopt_)(curl_, CURLOPT_URL, url.c_str());
+  if (!CheckInit()) return false;
+
   std::map<string, string>::const_iterator iter = parameters.begin();
   for (; iter != parameters.end(); ++iter)
     (*formadd_)(&formpost_, &lastptr_,
@@ -122,55 +114,91 @@
                 CURLFORM_END);
 
   (*easy_setopt_)(curl_, CURLOPT_HTTPPOST, formpost_);
-  if (http_response_data != NULL) {
-    http_response_data->clear();
-    (*easy_setopt_)(curl_, CURLOPT_WRITEFUNCTION, WriteCallback);
-    (*easy_setopt_)(curl_, CURLOPT_WRITEDATA,
-                     reinterpret_cast<void *>(http_response_data));
-  }
-  if (http_header_data != NULL) {
-    http_header_data->clear();
-    (*easy_setopt_)(curl_, CURLOPT_HEADERFUNCTION, WriteCallback);
-    (*easy_setopt_)(curl_, CURLOPT_HEADERDATA,
-                     reinterpret_cast<void *>(http_header_data));
-  }
 
-  CURLcode err_code = CURLE_OK;
-  err_code = (*easy_perform_)(curl_);
-  easy_strerror_ = reinterpret_cast<const char* (*)(CURLcode)>
-                       (dlsym(curl_lib_, "curl_easy_strerror"));
+  return SendRequestInner(url, http_status_code, http_header_data,
+                          http_response_data);
+}
 
-  if (http_status_code != NULL) {
-    (*easy_getinfo_)(curl_, CURLINFO_RESPONSE_CODE, http_status_code);
-  }
+bool LibcurlWrapper::SendGetRequest(const string& url,
+                                    long* http_status_code,
+                                    string* http_header_data,
+                                    string* http_response_data) {
+  if (!CheckInit()) return false;
 
-#ifndef NDEBUG
-  if (err_code != CURLE_OK)
-    fprintf(stderr, "Failed to send http request to %s, error: %s\n",
-            url.c_str(),
-            (*easy_strerror_)(err_code));
-#endif
-  if (headerlist_ != NULL) {
-    (*slist_free_all_)(headerlist_);
-  }
+  (*easy_setopt_)(curl_, CURLOPT_HTTPGET, 1L);
 
-  (*easy_cleanup_)(curl_);
-  if (formpost_ != NULL) {
-    (*formfree_)(formpost_);
+  return SendRequestInner(url, http_status_code, http_header_data,
+                          http_response_data);
+}
+
+bool LibcurlWrapper::SendPutRequest(const string& url,
+                                    const string& path,
+                                    long* http_status_code,
+                                    string* http_header_data,
+                                    string* http_response_data) {
+  if (!CheckInit()) return false;
+
+  FILE* file = fopen(path.c_str(), "rb");
+  (*easy_setopt_)(curl_, CURLOPT_UPLOAD, 1L);
+  (*easy_setopt_)(curl_, CURLOPT_PUT, 1L);
+  (*easy_setopt_)(curl_, CURLOPT_READDATA, file);
+
+  bool success = SendRequestInner(url, http_status_code, http_header_data,
+                                  http_response_data);
+
+  fclose(file);
+  return success;
+}
+
+bool LibcurlWrapper::SendSimplePostRequest(const string& url,
+                                           const string& body,
+                                           const string& content_type,
+                                           long* http_status_code,
+                                           string* http_header_data,
+                                           string* http_response_data) {
+  if (!CheckInit()) return false;
+
+  (*easy_setopt_)(curl_, CURLOPT_POSTFIELDSIZE, body.size());
+  (*easy_setopt_)(curl_, CURLOPT_COPYPOSTFIELDS, body.c_str());
+
+  if (!content_type.empty()) {
+    string content_type_header = "Content-Type: " + content_type;
+    headerlist_ = (*slist_append_)(
+        headerlist_,
+        content_type_header.c_str());
   }
 
-  return err_code == CURLE_OK;
+  return SendRequestInner(url, http_status_code, http_header_data,
+                          http_response_data);
 }
 
 bool LibcurlWrapper::Init() {
-  if (!init_ok_) {
-    std::cout << "Init_OK was not true in LibcurlWrapper::Init(), check earlier log messages";
+  // First check to see if libcurl was statically linked:
+  curl_lib_ = dlopen(nullptr, RTLD_NOW);
+  if (curl_lib_ &&
+      (!dlsym(curl_lib_, "curl_easy_init") ||
+      !dlsym(curl_lib_, "curl_easy_setopt"))) {
+    // Not statically linked, try again below.
+    dlerror();  // Clear dlerror before attempting to open libraries.
+    dlclose(curl_lib_);
+    curl_lib_ = nullptr;
+  }
+  if (!curl_lib_) {
+    curl_lib_ = dlopen("libcurl.so", RTLD_NOW);
+  }
+  if (!curl_lib_) {
+    curl_lib_ = dlopen("libcurl.so.4", RTLD_NOW);
+  }
+  if (!curl_lib_) {
+    curl_lib_ = dlopen("libcurl.so.3", RTLD_NOW);
+  }
+  if (!curl_lib_) {
+    std::cout << "Could not find libcurl via dlopen";
     return false;
   }
 
   if (!SetFunctionPointers()) {
     std::cout << "Could not find function pointers";
-    init_ok_ = false;
     return false;
   }
 
@@ -184,11 +212,7 @@
     return false;
   }
 
-  // Disable 100-continue header.
-  char buf[] = "Expect:";
-
-  headerlist_ = (*slist_append_)(headerlist_, buf);
-  (*easy_setopt_)(curl_, CURLOPT_HTTPHEADER, headerlist_);
+  init_ok_ = true;
   return true;
 }
 
@@ -226,7 +250,11 @@
 
   SET_AND_CHECK_FUNCTION_POINTER(easy_getinfo_,
                                  "curl_easy_getinfo",
-                                 CURLcode(*)(CURL *, CURLINFO info, ...));
+                                 CURLcode(*)(CURL*, CURLINFO info, ...));
+
+  SET_AND_CHECK_FUNCTION_POINTER(easy_reset_,
+                                 "curl_easy_reset",
+                                 void(*)(CURL*));
 
   SET_AND_CHECK_FUNCTION_POINTER(slist_free_all_,
                                  "curl_slist_free_all",
@@ -238,4 +266,73 @@
   return true;
 }
 
+bool LibcurlWrapper::SendRequestInner(const string& url,
+                                      long* http_status_code,
+                                      string* http_header_data,
+                                      string* http_response_data) {
+  string url_copy(url);
+  (*easy_setopt_)(curl_, CURLOPT_URL, url_copy.c_str());
+
+  // Disable 100-continue header.
+  char buf[] = "Expect:";
+  headerlist_ = (*slist_append_)(headerlist_, buf);
+  (*easy_setopt_)(curl_, CURLOPT_HTTPHEADER, headerlist_);
+
+  if (http_response_data != nullptr) {
+    http_response_data->clear();
+    (*easy_setopt_)(curl_, CURLOPT_WRITEFUNCTION, WriteCallback);
+    (*easy_setopt_)(curl_, CURLOPT_WRITEDATA,
+                    reinterpret_cast<void*>(http_response_data));
+  }
+  if (http_header_data != nullptr) {
+    http_header_data->clear();
+    (*easy_setopt_)(curl_, CURLOPT_HEADERFUNCTION, WriteCallback);
+    (*easy_setopt_)(curl_, CURLOPT_HEADERDATA,
+                    reinterpret_cast<void*>(http_header_data));
+  }
+  CURLcode err_code = CURLE_OK;
+  err_code = (*easy_perform_)(curl_);
+  easy_strerror_ = reinterpret_cast<const char* (*)(CURLcode)>
+      (dlsym(curl_lib_, "curl_easy_strerror"));
+
+  if (http_status_code != nullptr) {
+    (*easy_getinfo_)(curl_, CURLINFO_RESPONSE_CODE, http_status_code);
+  }
+
+#ifndef NDEBUG
+  if (err_code != CURLE_OK)
+    fprintf(stderr, "Failed to send http request to %s, error: %s\n",
+            url.c_str(),
+            (*easy_strerror_)(err_code));
+#endif
+
+  Reset();
+
+  return err_code == CURLE_OK;
+}
+
+void LibcurlWrapper::Reset() {
+  if (headerlist_ != nullptr) {
+    (*slist_free_all_)(headerlist_);
+    headerlist_ = nullptr;
+  }
+
+  if (formpost_ != nullptr) {
+    (*formfree_)(formpost_);
+    formpost_ = nullptr;
+  }
+
+  (*easy_reset_)(curl_);
+}
+
+bool LibcurlWrapper::CheckInit() {
+  if (!init_ok_) {
+    std::cout << "LibcurlWrapper: You must call Init(), and have it return "
+                 "'true' before invoking any other methods.\n";
+    return false;
+  }
+
+  return true;
 }
+
+}  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/libcurl_wrapper.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/libcurl_wrapper.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/libcurl_wrapper.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/libcurl_wrapper.h	2021-12-09 12:01:26.000000000 +0000
@@ -51,14 +51,39 @@
                        const string& basename);
   virtual bool SendRequest(const string& url,
                            const std::map<string, string>& parameters,
-                           int* http_status_code,
+                           long* http_status_code,
                            string* http_header_data,
                            string* http_response_data);
+  bool SendGetRequest(const string& url,
+                      long* http_status_code,
+                      string* http_header_data,
+                      string* http_response_data);
+  bool SendPutRequest(const string& url,
+                      const string& path,
+                      long* http_status_code,
+                      string* http_header_data,
+                      string* http_response_data);
+  bool SendSimplePostRequest(const string& url,
+                             const string& body,
+                             const string& content_type,
+                             long* http_status_code,
+                             string* http_header_data,
+                             string* http_response_data);
+
  private:
   // This function initializes class state corresponding to function
   // pointers into the CURL library.
   bool SetFunctionPointers();
 
+  bool SendRequestInner(const string& url,
+                        long* http_status_code,
+                        string* http_header_data,
+                        string* http_response_data);
+
+  void Reset();
+
+  bool CheckInit();
+
   bool init_ok_;                 // Whether init succeeded
   void* curl_lib_;               // Pointer to result of dlopen() on
                                  // curl library
@@ -66,26 +91,27 @@
                                  // dealing
   // with CURL.
 
-  CURL *curl_;                   // Pointer for handle for CURL calls.
+  CURL* curl_;                   // Pointer for handle for CURL calls.
 
   CURL* (*easy_init_)(void);
 
   // Stateful pointers for calling into curl_formadd()
-  struct curl_httppost *formpost_;
-  struct curl_httppost *lastptr_;
-  struct curl_slist *headerlist_;
+  struct curl_httppost* formpost_;
+  struct curl_httppost* lastptr_;
+  struct curl_slist* headerlist_;
 
   // Function pointers into CURL library
-  CURLcode (*easy_setopt_)(CURL *, CURLoption, ...);
-  CURLFORMcode (*formadd_)(struct curl_httppost **,
-                           struct curl_httppost **, ...);
-  struct curl_slist* (*slist_append_)(struct curl_slist *, const char *);
-  void (*slist_free_all_)(struct curl_slist *);
-  CURLcode (*easy_perform_)(CURL *);
+  CURLcode (*easy_setopt_)(CURL*, CURLoption, ...);
+  CURLFORMcode (*formadd_)(struct curl_httppost**,
+                           struct curl_httppost**, ...);
+  struct curl_slist* (*slist_append_)(struct curl_slist*, const char*);
+  void (*slist_free_all_)(struct curl_slist*);
+  CURLcode (*easy_perform_)(CURL*);
   const char* (*easy_strerror_)(CURLcode);
-  void (*easy_cleanup_)(CURL *);
-  CURLcode (*easy_getinfo_)(CURL *, CURLINFO info, ...);
-  void (*formfree_)(struct curl_httppost *);
+  void (*easy_cleanup_)(CURL*);
+  CURLcode (*easy_getinfo_)(CURL*, CURLINFO info, ...);
+  void (*easy_reset_)(CURL*);
+  void (*formfree_)(struct curl_httppost*);
 
 };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/linux_libc_support.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/linux_libc_support.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/linux_libc_support.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/linux_libc_support.cc	2021-12-09 12:01:26.000000000 +0000
@@ -190,7 +190,7 @@
 }
 
 void my_memset(void* ip, char c, size_t len) {
-  char* p = (char *) ip;
+  char* p = (char*) ip;
   while (len--)
     *p++ = c;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/memory_mapped_file.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/memory_mapped_file.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/memory_mapped_file.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/memory_mapped_file.cc	2021-12-09 12:01:26.000000000 +0000
@@ -87,13 +87,14 @@
     return true;
   }
 
-  void* data = sys_mmap(NULL, file_len, PROT_READ, MAP_PRIVATE, fd, offset);
+  size_t content_len = file_len - offset;
+  void* data = sys_mmap(NULL, content_len, PROT_READ, MAP_PRIVATE, fd, offset);
   sys_close(fd);
   if (data == MAP_FAILED) {
     return false;
   }
 
-  content_.Set(data, file_len - offset);
+  content_.Set(data, content_len);
   return true;
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_collector_client.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_collector_client.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_collector_client.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_collector_client.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,195 @@
+// Copyright (c) 2019 Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "common/linux/symbol_collector_client.h"
+
+#include <stdio.h>
+
+#include <iostream>
+#include <regex>
+
+#include "common/linux/libcurl_wrapper.h"
+
+namespace google_breakpad {
+namespace sym_upload {
+
+// static
+bool SymbolCollectorClient::CreateUploadUrl(
+    LibcurlWrapper* libcurl_wrapper,
+    const string& api_url,
+    const string& api_key,
+    UploadUrlResponse* uploadUrlResponse) {
+  string header, response;
+  long response_code;
+
+  string url = api_url + "/v1/uploads:create";
+  if (!api_key.empty()) {
+    url += "?key=" + api_key;
+  }
+
+  if (!libcurl_wrapper->SendSimplePostRequest(url,
+                                              /*body=*/"",
+                                              /*content_type=*/"",
+                                              &response_code,
+                                              &header,
+                                              &response)) {
+    printf("Failed to create upload url.\n");
+    printf("Response code: %ld\n", response_code);
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return false;
+  }
+
+  // Note camel-case rather than underscores.
+  std::regex upload_url_regex("\"uploadUrl\": \"([^\"]+)\"");
+  std::regex upload_key_regex("\"uploadKey\": \"([^\"]+)\"");
+
+  std::smatch upload_url_match;
+  if (!std::regex_search(response, upload_url_match, upload_url_regex) ||
+      upload_url_match.size() != 2) {
+    printf("Failed to parse create url response.");
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return false;
+  }
+  string upload_url = upload_url_match[1].str();
+
+  std::smatch upload_key_match;
+  if (!std::regex_search(response, upload_key_match, upload_key_regex) ||
+      upload_key_match.size() != 2) {
+    printf("Failed to parse create url response.");
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return false;
+  }
+  string upload_key = upload_key_match[1].str();
+
+  uploadUrlResponse->upload_url = upload_url;
+  uploadUrlResponse->upload_key = upload_key;
+  return true;
+}
+
+// static
+CompleteUploadResult SymbolCollectorClient::CompleteUpload(
+    LibcurlWrapper* libcurl_wrapper,
+    const string& api_url,
+    const string& api_key,
+    const string& upload_key,
+    const string& debug_file,
+    const string& debug_id,
+    const string& type) {
+  string header, response;
+  long response_code;
+
+  string url = api_url + "/v1/uploads/" + upload_key + ":complete";
+  if (!api_key.empty()) {
+    url += "?key=" + api_key;
+  }
+  string body =
+      "{ symbol_id: {"
+      "debug_file: \"" + debug_file + "\", "
+      "debug_id: \"" + debug_id + "\" }, "
+      "symbol_upload_type: \"" + type + "\" }";
+
+  if (!libcurl_wrapper->SendSimplePostRequest(url,
+                                              body,
+                                              "application/son",
+                                              &response_code,
+                                              &header,
+                                              &response)) {
+    printf("Failed to complete upload.\n");
+    printf("Response code: %ld\n", response_code);
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return CompleteUploadResult::Error;
+  }
+
+  std::regex result_regex("\"result\": \"([^\"]+)\"");
+  std::smatch result_match;
+  if (!std::regex_search(response, result_match, result_regex) ||
+      result_match.size() != 2) {
+    printf("Failed to parse complete upload response.");
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return CompleteUploadResult::Error;
+  }
+  string result = result_match[1].str();
+
+  if (result.compare("DUPLICATE_DATA") == 0) {
+    return CompleteUploadResult::DuplicateData;
+  }
+
+  return CompleteUploadResult::Ok;
+}
+
+// static
+SymbolStatus SymbolCollectorClient::CheckSymbolStatus(
+    LibcurlWrapper* libcurl_wrapper,
+    const string& api_url,
+    const string& api_key,
+    const string& debug_file,
+    const string& debug_id) {
+  string header, response;
+  long response_code;
+  string url = api_url +
+               "/v1/symbols/" + debug_file + "/" + debug_id + ":checkStatus";
+  if (!api_key.empty()) {
+    url += "?key=" + api_key;
+  }
+
+  if (!libcurl_wrapper->SendGetRequest(
+      url,
+      &response_code,
+      &header,
+      &response)) {
+    printf("Failed to check symbol status, error message.\n");
+    printf("Response code: %ld\n", response_code);
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return SymbolStatus::Unknown;
+  }
+
+  std::regex status_regex("\"status\": \"([^\"]+)\"");
+  std::smatch status_match;
+  if (!std::regex_search(response, status_match, status_regex) ||
+      status_match.size() != 2) {
+    printf("Failed to parse check symbol status response.");
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return SymbolStatus::Unknown;
+  }
+  string status = status_match[1].str();
+
+  return (status.compare("FOUND") == 0) ?
+      SymbolStatus::Found :
+      SymbolStatus::Missing;
+}
+
+}  // namespace sym_upload
+}  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_collector_client.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_collector_client.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_collector_client.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_collector_client.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,88 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef COMMON_LINUX_SYMBOL_COLLECTOR_CLIENT_H_
+#define COMMON_LINUX_SYMBOL_COLLECTOR_CLIENT_H_
+
+#include <string>
+
+#include "common/linux/libcurl_wrapper.h"
+#include "common/using_std_string.h"
+
+namespace google_breakpad {
+namespace sym_upload {
+
+struct UploadUrlResponse {
+  string upload_url;
+  string upload_key;
+};
+
+enum SymbolStatus {
+  Found,
+  Missing,
+  Unknown
+};
+
+enum CompleteUploadResult {
+  Ok,
+  DuplicateData,
+  Error
+};
+
+// Helper class to communicate with a sym-upload-v2 service over HTTP/REST,
+// via libcurl.
+class SymbolCollectorClient {
+ public:
+  static bool CreateUploadUrl(
+      LibcurlWrapper* libcurl_wrapper,
+      const string& api_url,
+      const string& api_key,
+      UploadUrlResponse* uploadUrlResponse);
+
+  static CompleteUploadResult CompleteUpload(
+      LibcurlWrapper* libcurl_wrapper,
+      const string& api_url,
+      const string& api_key,
+      const string& upload_key,
+      const string& debug_file,
+      const string& debug_id,
+      const string& type);
+
+  static SymbolStatus CheckSymbolStatus(
+      LibcurlWrapper* libcurl_wrapper,
+      const string& api_url,
+      const string& api_key,
+      const string& debug_file,
+      const string& debug_id);
+};
+
+}  // namespace sym_upload
+}  // namespace google_breakpad
+
+#endif  // COMMON_LINUX_SYMBOL_COLLECTOR_CLIENT_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_upload.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_upload.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_upload.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_upload.cc	2021-12-09 12:01:26.000000000 +0000
@@ -30,20 +30,24 @@
 // symbol_upload.cc: implemented google_breakpad::sym_upload::Start, a helper
 // function for linux symbol upload tool.
 
-#include "common/linux/http_upload.h"
 #include "common/linux/symbol_upload.h"
 
 #include <assert.h>
 #include <stdio.h>
 
 #include <functional>
+#include <iostream>
 #include <vector>
 
+#include "common/linux/http_upload.h"
+#include "common/linux/libcurl_wrapper.h"
+#include "common/linux/symbol_collector_client.h"
+
 namespace google_breakpad {
 namespace sym_upload {
 
-void TokenizeByChar(const string &source_string, int c,
-                    std::vector<string> *results) {
+void TokenizeByChar(const string& source_string, int c,
+                    std::vector<string>* results) {
   assert(results);
   string::size_type cur_pos = 0, next_pos = 0;
   while ((next_pos = source_string.find(c, cur_pos)) != string::npos) {
@@ -58,8 +62,8 @@
 //=============================================================================
 // Parse out the module line which have 5 parts.
 // MODULE <os> <cpu> <uuid> <module-name>
-bool ModuleDataForSymbolFile(const string &file,
-                             std::vector<string> *module_parts) {
+bool ModuleDataForSymbolFile(const string& file,
+                             std::vector<string>* module_parts) {
   assert(module_parts);
   const size_t kModulePartNumber = 5;
   FILE* fp = fopen(file.c_str(), "r");
@@ -86,7 +90,7 @@
 }
 
 //=============================================================================
-string CompactIdentifier(const string &uuid) {
+string CompactIdentifier(const string& uuid) {
   std::vector<string> components;
   TokenizeByChar(uuid, '-', &components);
   string result;
@@ -95,21 +99,19 @@
   return result;
 }
 
-//=============================================================================
-void Start(Options *options) {
+// |options| describes the current sym_upload options.
+// |module_parts| contains the strings parsed from the MODULE entry of the
+// Breakpad symbol file being uploaded.
+// |compacted_id| is the debug_id from the MODULE entry of the Breakpad symbol
+// file being uploaded, with all hyphens removed.
+bool SymUploadV1Start(
+    const Options& options,
+    std::vector<string> module_parts,
+    const string& compacted_id) {
   std::map<string, string> parameters;
-  options->success = false;
-  std::vector<string> module_parts;
-  if (!ModuleDataForSymbolFile(options->symbolsPath, &module_parts)) {
-    fprintf(stderr, "Failed to parse symbol file!\n");
-    return;
-  }
-
-  string compacted_id = CompactIdentifier(module_parts[3]);
-
   // Add parameters
-  if (!options->version.empty())
-    parameters["version"] = options->version;
+  if (!options.version.empty())
+    parameters["version"] = options.version;
 
   // MODULE <os> <cpu> <uuid> <module-name>
   // 0      1    2     3      4
@@ -120,16 +122,16 @@
   parameters["debug_identifier"] = compacted_id;
 
   std::map<string, string> files;
-  files["symbol_file"] = options->symbolsPath;
+  files["symbol_file"] = options.symbolsPath;
 
   string response, error;
   long response_code;
-  bool success = HTTPUpload::SendRequest(options->uploadURLStr,
+  bool success = HTTPUpload::SendRequest(options.uploadURLStr,
                                          parameters,
                                          files,
-                                         options->proxy,
-                                         options->proxy_user_pwd,
-                                         "",
+                                         options.proxy,
+                                         options.proxy_user_pwd,
+                                         /*ca_certificate_file=*/"",
                                          &response,
                                          &response_code,
                                          &error);
@@ -148,7 +150,134 @@
   } else {
     printf("Successfully sent the symbol file.\n");
   }
-  options->success = success;
+
+  return success;
+}
+
+// |options| describes the current sym_upload options.
+// |code_id| is the basename of the module for which symbols are being
+// uploaded.
+// |debug_id| is the debug_id of the module for which symbols are being
+// uploaded.
+bool SymUploadV2Start(
+    const Options& options,
+    const string& code_file,
+    const string& debug_id,
+    const string& type) {
+  google_breakpad::LibcurlWrapper libcurl_wrapper;
+  if (!libcurl_wrapper.Init()) {
+    printf("Failed to init google_breakpad::LibcurlWrapper.\n");
+    return false;
+  }
+
+  if (!options.force) {
+    SymbolStatus symbolStatus = SymbolCollectorClient::CheckSymbolStatus(
+        &libcurl_wrapper,
+        options.uploadURLStr,
+        options.api_key,
+        code_file,
+        debug_id);
+    if (symbolStatus == SymbolStatus::Found) {
+      printf("Symbol file already exists, upload aborted."
+          " Use \"-f\" to overwrite.\n");
+      return true;
+    } else if (symbolStatus == SymbolStatus::Unknown) {
+      printf("Failed to check for existing symbol.\n");
+      return false;
+    }
+  }
+
+  UploadUrlResponse uploadUrlResponse;
+  if (!SymbolCollectorClient::CreateUploadUrl(
+      &libcurl_wrapper,
+      options.uploadURLStr,
+      options.api_key,
+      &uploadUrlResponse)) {
+    printf("Failed to create upload URL.\n");
+    return false;
+  }
+
+  string signed_url = uploadUrlResponse.upload_url;
+  string upload_key = uploadUrlResponse.upload_key;
+  string header;
+  string response;
+  long response_code;
+
+  if (!libcurl_wrapper.SendPutRequest(signed_url,
+                                      options.symbolsPath,
+                                      &response_code,
+                                      &header,
+                                      &response)) {
+    printf("Failed to send symbol file.\n");
+    printf("Response code: %ld\n", response_code);
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return false;
+  } else if (response_code == 0) {
+    printf("Failed to send symbol file: No response code\n");
+    return false;
+  } else if (response_code != 200) {
+    printf("Failed to send symbol file: Response code %ld\n", response_code);
+    printf("Response:\n");
+    printf("%s\n", response.c_str());
+    return false;
+  }
+
+  CompleteUploadResult completeUploadResult =
+      SymbolCollectorClient::CompleteUpload(&libcurl_wrapper,
+                                            options.uploadURLStr,
+                                            options.api_key,
+                                            upload_key,
+                                            code_file,
+                                            debug_id,
+                                            type);
+  if (completeUploadResult == CompleteUploadResult::Error) {
+    printf("Failed to complete upload.\n");
+    return false;
+  } else if (completeUploadResult == CompleteUploadResult::DuplicateData) {
+    printf("Uploaded file checksum matched existing file checksum,"
+      " no change necessary.\n");
+  } else {
+    printf("Successfully sent the symbol file.\n");
+  }
+
+  return true;
+}
+
+//=============================================================================
+void Start(Options* options) {
+  if (options->upload_protocol == UploadProtocol::SYM_UPLOAD_V2) {
+    string code_file;
+    string debug_id;
+    string type;
+
+    if (options->type.empty() || options->type == kBreakpadSymbolType) {
+      // Breakpad upload so read these from input file.
+      std::vector<string> module_parts;
+      if (!ModuleDataForSymbolFile(options->symbolsPath, &module_parts)) {
+        fprintf(stderr, "Failed to parse symbol file!\n");
+        return;
+      }
+      code_file = module_parts[4];
+      debug_id = CompactIdentifier(module_parts[3]);
+      type = kBreakpadSymbolType;
+    } else {
+      // Native upload so these must be explicitly set.
+      code_file = options->code_file;
+      debug_id = options->debug_id;
+      type = options->type;
+    }
+
+    options->success = SymUploadV2Start(*options, code_file, debug_id, type);
+  } else {
+    std::vector<string> module_parts;
+    if (!ModuleDataForSymbolFile(options->symbolsPath, &module_parts)) {
+      fprintf(stderr, "Failed to parse symbol file!\n");
+      return;
+    }
+    const string compacted_id = CompactIdentifier(module_parts[3]);
+    options->success = SymUploadV1Start(*options, module_parts, compacted_id);
+  }
 }
 
 }  // namespace sym_upload
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_upload.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_upload.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_upload.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/symbol_upload.h	2021-12-09 12:01:26.000000000 +0000
@@ -41,14 +41,31 @@
 namespace google_breakpad {
 namespace sym_upload {
 
-typedef struct {
+enum class UploadProtocol {
+  SYM_UPLOAD_V1,
+  SYM_UPLOAD_V2,
+};
+
+constexpr char kBreakpadSymbolType[] = "BREAKPAD";
+
+struct Options {
+  Options() : upload_protocol(UploadProtocol::SYM_UPLOAD_V1), force(false) {}
+
   string symbolsPath;
   string uploadURLStr;
   string proxy;
   string proxy_user_pwd;
   string version;
   bool success;
-} Options;
+  UploadProtocol upload_protocol;
+  bool force;
+  string api_key;
+
+  // These only need to be set for native symbol uploads.
+  string code_file;
+  string debug_id;
+  string type;
+};
 
 // Starts upload to symbol server with options.
 void Start(Options* options);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf.cc	2021-12-09 12:01:26.000000000 +0000
@@ -118,7 +118,7 @@
   return index;
 }
 
-void ELF::AppendSection(ElfSection &section) {
+void ELF::AppendSection(ElfSection& section) {
   // NULL and NOBITS sections have no content, so they
   // don't need to be written to the file.
   if (section.type_ == SHT_NULL) {
@@ -242,7 +242,7 @@
   D64(size);
 }
 
-void Notes::AddNote(int type, const string &name, const uint8_t* desc_bytes,
+void Notes::AddNote(int type, const string& name, const uint8_t* desc_bytes,
                     size_t desc_size) {
   // Elf32_Nhdr and Elf64_Nhdr are exactly the same.
   Elf32_Nhdr note_header;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf.h	2021-12-09 12:01:26.000000000 +0000
@@ -154,7 +154,7 @@
 
   vector<ElfSection> sections_;
 
-  void AppendSection(ElfSection &section);
+  void AppendSection(ElfSection& section);
 };
 
 // A class to build .symtab or .dynsym sections.
@@ -187,7 +187,7 @@
   }
 
   // Add a note.
-  void AddNote(int type, const string &name, const uint8_t* desc_bytes,
+  void AddNote(int type, const string& name, const uint8_t* desc_bytes,
                size_t desc_size);
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/synth_elf_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -381,9 +381,9 @@
 
 TEST_F(ElfNotesTest, Notes) {
   Notes notes(kLittleEndian);
-  notes.AddNote(1, "Linux", reinterpret_cast<const uint8_t *>("\x42\x02\0\0"),
+  notes.AddNote(1, "Linux", reinterpret_cast<const uint8_t*>("\x42\x02\0\0"),
                 4);
-  notes.AddNote(2, "a", reinterpret_cast<const uint8_t *>("foobar"),
+  notes.AddNote(2, "a", reinterpret_cast<const uint8_t*>("foobar"),
                 sizeof("foobar") - 1);
 
   const uint8_t kExpectedNotesContents[] = {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/tests/crash_generator.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/tests/crash_generator.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/tests/crash_generator.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/tests/crash_generator.cc	2021-12-09 12:01:26.000000000 +0000
@@ -33,6 +33,7 @@
 #include "common/linux/tests/crash_generator.h"
 
 #include <pthread.h>
+#include <sched.h>
 #include <signal.h>
 #include <stdio.h>
 #include <sys/mman.h>
@@ -78,7 +79,7 @@
 // Core file size limit set to 1 MB, which is big enough for test purposes.
 const rlim_t kCoreSizeLimit = 1024 * 1024;
 
-void *thread_function(void *data) {
+void* thread_function(void* data) {
   ThreadData* thread_data = reinterpret_cast<ThreadData*>(data);
   volatile pid_t thread_id = gettid();
   *(thread_data->thread_id_ptr) = thread_id;
@@ -88,7 +89,7 @@
     exit(1);
   }
   while (true) {
-    pthread_yield();
+    sched_yield();
   }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/ucontext_constants.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/ucontext_constants.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/ucontext_constants.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/linux/ucontext_constants.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,153 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This header can be included either from a C, C++ or Assembly file.
+// Its purpose is to contain constants that must match the offsets of
+// various fields in ucontext_t.
+//
+// They should match the definitions from signal.h.
+//
+// Used by src/common/linux/breakpad_getcontext.S
+// Tested by src/common/linux/breakpad_getcontext_unittest.cc
+//
+// This header should not be used by anything else.
+
+#ifndef GOOGLEBREAKPAD_COMMON_LINUX_UCONTEXT_CONSTANTS_H
+#define GOOGLEBREAKPAD_COMMON_LINUX_UCONTEXT_CONSTANTS_H
+
+#if defined(__arm__)
+
+#define  MCONTEXT_GREGS_OFFSET     32
+#define  UCONTEXT_SIGMASK_OFFSET   104
+
+#elif defined(__aarch64__)
+
+#define  UCONTEXT_SIGMASK_OFFSET     40
+
+#define  MCONTEXT_GREGS_OFFSET       184
+#define  MCONTEXT_SP_OFFSET          432
+#define  MCONTEXT_PC_OFFSET          440
+#define  MCONTEXT_PSTATE_OFFSET      448
+#define  MCONTEXT_EXTENSION_OFFSET   464
+
+#define  FPSIMD_MAGIC                0x46508001
+
+#define  FPSIMD_CONTEXT_MAGIC_OFFSET 0
+#define  FPSIMD_CONTEXT_SIZE_OFFSET  4
+#define  FPSIMD_CONTEXT_FPSR_OFFSET  8
+#define  FPSIMD_CONTEXT_FPCR_OFFSET  12
+#define  FPSIMD_CONTEXT_VREGS_OFFSET 16
+#define  FPSIMD_CONTEXT_SIZE         528
+
+#define  REGISTER_SIZE               8
+#define  SIMD_REGISTER_SIZE          16
+
+#elif defined(__i386__)
+
+#define  MCONTEXT_GREGS_OFFSET     20
+#define  MCONTEXT_GS_OFFSET        (MCONTEXT_GREGS_OFFSET + 0*4)
+#define  MCONTEXT_FS_OFFSET        (MCONTEXT_GREGS_OFFSET + 1*4)
+#define  MCONTEXT_ES_OFFSET        (MCONTEXT_GREGS_OFFSET + 2*4)
+#define  MCONTEXT_DS_OFFSET        (MCONTEXT_GREGS_OFFSET + 3*4)
+#define  MCONTEXT_EDI_OFFSET       (MCONTEXT_GREGS_OFFSET + 4*4)
+#define  MCONTEXT_ESI_OFFSET       (MCONTEXT_GREGS_OFFSET + 5*4)
+#define  MCONTEXT_EBP_OFFSET       (MCONTEXT_GREGS_OFFSET + 6*4)
+#define  MCONTEXT_ESP_OFFSET       (MCONTEXT_GREGS_OFFSET + 7*4)
+#define  MCONTEXT_EBX_OFFSET       (MCONTEXT_GREGS_OFFSET + 8*4)
+#define  MCONTEXT_EDX_OFFSET       (MCONTEXT_GREGS_OFFSET + 9*4)
+#define  MCONTEXT_ECX_OFFSET       (MCONTEXT_GREGS_OFFSET + 10*4)
+#define  MCONTEXT_EAX_OFFSET       (MCONTEXT_GREGS_OFFSET + 11*4)
+#define  MCONTEXT_TRAPNO_OFFSET    (MCONTEXT_GREGS_OFFSET + 12*4)
+#define  MCONTEXT_ERR_OFFSET       (MCONTEXT_GREGS_OFFSET + 13*4)
+#define  MCONTEXT_EIP_OFFSET       (MCONTEXT_GREGS_OFFSET + 14*4)
+#define  MCONTEXT_CS_OFFSET        (MCONTEXT_GREGS_OFFSET + 15*4)
+#define  MCONTEXT_EFL_OFFSET       (MCONTEXT_GREGS_OFFSET + 16*4)
+#define  MCONTEXT_UESP_OFFSET      (MCONTEXT_GREGS_OFFSET + 17*4)
+#define  MCONTEXT_SS_OFFSET        (MCONTEXT_GREGS_OFFSET + 18*4)
+
+#define  UCONTEXT_SIGMASK_OFFSET   108
+
+#define  UCONTEXT_FPREGS_OFFSET       96
+#if defined(__BIONIC__)
+#define  UCONTEXT_FPREGS_MEM_OFFSET   116
+#else
+#define  UCONTEXT_FPREGS_MEM_OFFSET   236
+#endif
+
+#elif defined(__mips__)
+
+#if _MIPS_SIM == _ABIO32
+#define  MCONTEXT_PC_OFFSET        32
+#define  MCONTEXT_GREGS_OFFSET     40
+#define  MCONTEXT_FPREGS_OFFSET    296
+#define  MCONTEXT_FPC_CSR          556
+#define  UCONTEXT_SIGMASK_OFFSET   616
+#else
+#define  MCONTEXT_GREGS_OFFSET     40
+#define  MCONTEXT_FPREGS_OFFSET    296
+#define  MCONTEXT_PC_OFFSET        616
+#define  MCONTEXT_FPC_CSR          624
+#define  UCONTEXT_SIGMASK_OFFSET   640
+#endif
+
+#elif defined(__x86_64__)
+
+#define MCONTEXT_GREGS_OFFSET     40
+#define UCONTEXT_SIGMASK_OFFSET   296
+
+#define MCONTEXT_GREGS_R8    40
+#define MCONTEXT_GREGS_R9    48
+#define MCONTEXT_GREGS_R10   56
+#define MCONTEXT_GREGS_R11   64
+#define MCONTEXT_GREGS_R12   72
+#define MCONTEXT_GREGS_R13   80
+#define MCONTEXT_GREGS_R14   88
+#define MCONTEXT_GREGS_R15   96
+#define MCONTEXT_GREGS_RDI   104
+#define MCONTEXT_GREGS_RSI   112
+#define MCONTEXT_GREGS_RBP   120
+#define MCONTEXT_GREGS_RBX   128
+#define MCONTEXT_GREGS_RDX   136
+#define MCONTEXT_GREGS_RAX   144
+#define MCONTEXT_GREGS_RCX   152
+#define MCONTEXT_GREGS_RSP   160
+#define MCONTEXT_GREGS_RIP   168
+#define MCONTEXT_FPREGS_PTR  224
+#if defined(__BIONIC__)
+#define MCONTEXT_FPREGS_MEM  304
+#else
+#define MCONTEXT_FPREGS_MEM  424
+#endif
+#define FPREGS_OFFSET_MXCSR  24
+
+#else
+#error "This header has not been ported for your CPU"
+#endif
+
+#endif  // GOOGLEBREAKPAD_COMMON_ANDROID_UCONTEXT_CONSTANTS_H
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/dump_syms.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/dump_syms.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/dump_syms.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/dump_syms.cc	2021-12-09 12:01:26.000000000 +0000
@@ -120,7 +120,7 @@
 
 namespace google_breakpad {
 
-bool DumpSymbols::Read(const string &filename) {
+bool DumpSymbols::Read(const string& filename) {
   struct stat st;
   if (stat(filename.c_str(), &st) == -1) {
     fprintf(stderr, "Could not access object file %s: %s\n",
@@ -195,7 +195,7 @@
 
   // Get our own copy of fat_reader's object file list.
   size_t object_files_count;
-  const SuperFatArch *object_files =
+  const SuperFatArch* object_files =
     fat_reader.object_files(&object_files_count);
   if (object_files_count == 0) {
     fprintf(stderr, "Fat binary file contains *no* architectures: %s\n",
@@ -212,7 +212,7 @@
 bool DumpSymbols::SetArchitecture(cpu_type_t cpu_type,
                                   cpu_subtype_t cpu_subtype) {
   // Find the best match for the architecture the user requested.
-  const SuperFatArch *best_match = FindBestMatchForArchitecture(
+  const SuperFatArch* best_match = FindBestMatchForArchitecture(
       cpu_type, cpu_subtype);
   if (!best_match) return false;
 
@@ -221,9 +221,9 @@
   return true;
 }
 
-bool DumpSymbols::SetArchitecture(const std::string &arch_name) {
+bool DumpSymbols::SetArchitecture(const std::string& arch_name) {
   bool arch_set = false;
-  const NXArchInfo *arch_info =
+  const NXArchInfo* arch_info =
       google_breakpad::BreakpadGetArchInfoFromName(arch_name.c_str());
   if (arch_info) {
     arch_set = SetArchitecture(arch_info->cputype, arch_info->cpusubtype);
@@ -251,7 +251,7 @@
   // If all the object files can be converted to struct fat_arch, use
   // NXFindBestFatArch.
   if (can_convert_to_fat_arch) {
-    const struct fat_arch *best_match
+    const struct fat_arch* best_match
       = NXFindBestFatArch(cpu_type, cpu_subtype, &fat_arch_vector[0],
                           static_cast<uint32_t>(fat_arch_vector.size()));
 
@@ -311,22 +311,20 @@
 class DumpSymbols::DumperRangesHandler:
       public DwarfCUToModule::RangesHandler {
  public:
-  DumperRangesHandler(const uint8_t *buffer, uint64 size,
-                      dwarf2reader::ByteReader* reader)
-      : buffer_(buffer), size_(size), reader_(reader) { }
-
-  bool ReadRanges(uint64 offset, Module::Address base_address,
-                  vector<Module::Range>* ranges) {
-    DwarfRangeListHandler handler(base_address, ranges);
-    dwarf2reader::RangeListReader rangelist_reader(buffer_, size_, reader_,
-                                                   &handler);
+  DumperRangesHandler(dwarf2reader::ByteReader* reader) :
+      reader_(reader) { }
 
-    return rangelist_reader.ReadRangeList(offset);
+  bool ReadRanges(
+      enum dwarf2reader::DwarfForm form, uint64_t data,
+      dwarf2reader::RangeListReader::CURangesInfo* cu_info,
+      vector<Module::Range>* ranges) {
+    DwarfRangeListHandler handler(ranges);
+    dwarf2reader::RangeListReader range_list_reader(reader_, cu_info,
+                                                    &handler);
+    return range_list_reader.ReadRanges(form, data);
   }
 
  private:
-  const uint8_t *buffer_;
-  uint64 size_;
   dwarf2reader::ByteReader* reader_;
 };
 
@@ -337,22 +335,27 @@
       public DwarfCUToModule::LineToModuleHandler {
  public:
   // Create a line-to-module converter using BYTE_READER.
-  DumperLineToModule(dwarf2reader::ByteReader *byte_reader)
+  DumperLineToModule(dwarf2reader::ByteReader* byte_reader)
       : byte_reader_(byte_reader) { }
 
   void StartCompilationUnit(const string& compilation_dir) {
     compilation_dir_ = compilation_dir;
   }
 
-  void ReadProgram(const uint8_t *program, uint64 length,
-                   Module *module, vector<Module::Line> *lines) {
+  void ReadProgram(const uint8_t* program, uint64_t length,
+                   const uint8_t* string_section,
+                   uint64_t string_section_length,
+                   const uint8_t* line_string_section,
+                   uint64_t line_string_section_length,
+                   Module* module, vector<Module::Line>* lines) {
     DwarfLineToModule handler(module, compilation_dir_, lines);
-    dwarf2reader::LineInfo parser(program, length, byte_reader_, &handler);
+    dwarf2reader::LineInfo parser(program, length, byte_reader_,
+                                  nullptr, 0, nullptr, 0, &handler);
     parser.Start();
   }
  private:
   string compilation_dir_;
-  dwarf2reader::ByteReader *byte_reader_;  // WEAK
+  dwarf2reader::ByteReader* byte_reader_;  // WEAK
 };
 
 bool DumpSymbols::CreateEmptyModule(scoped_ptr<Module>& module) {
@@ -364,7 +367,7 @@
       selected_object_file_ = &object_files_[0];
     else {
       // Look for an object file whose architecture matches our own.
-      const NXArchInfo *local_arch = NXGetLocalArchInfo();
+      const NXArchInfo* local_arch = NXGetLocalArchInfo();
       if (!SetArchitecture(local_arch->cputype, local_arch->cpusubtype)) {
         fprintf(stderr, "%s: object file contains more than one"
                 " architecture, none of which match the current"
@@ -380,11 +383,11 @@
 
   // Find the name of the selected file's architecture, to appear in
   // the MODULE record and in error messages.
-  const NXArchInfo *selected_arch_info =
+  const NXArchInfo* selected_arch_info =
       google_breakpad::BreakpadGetArchInfoFromCpuType(
           selected_object_file_->cputype, selected_object_file_->cpusubtype);
 
-  const char *selected_arch_name = selected_arch_info->name;
+  const char* selected_arch_name = selected_arch_info->name;
   if (strcmp(selected_arch_name, "i386") == 0)
     selected_arch_name = "x86";
 
@@ -413,9 +416,9 @@
   return true;
 }
 
-bool DumpSymbols::ReadDwarf(google_breakpad::Module *module,
-                            const mach_o::Reader &macho_reader,
-                            const mach_o::SectionMap &dwarf_sections,
+void DumpSymbols::ReadDwarf(google_breakpad::Module* module,
+                            const mach_o::Reader& macho_reader,
+                            const mach_o::SectionMap& dwarf_sections,
                             bool handle_inter_cu_refs) const {
   // Build a byte reader of the appropriate endianness.
   ByteReader byte_reader(macho_reader.big_endian()
@@ -439,40 +442,30 @@
   // Find the __debug_info section.
   dwarf2reader::SectionMap::const_iterator debug_info_entry =
       file_context.section_map().find("__debug_info");
-  assert(debug_info_entry != file_context.section_map().end());
-  const std::pair<const uint8_t *, uint64>& debug_info_section =
-      debug_info_entry->second;
   // There had better be a __debug_info section!
-  if (!debug_info_section.first) {
+  if (debug_info_entry == file_context.section_map().end()) {
     fprintf(stderr, "%s: __DWARF segment of file has no __debug_info section\n",
             selected_object_name_.c_str());
-    return false;
+    return;
   }
+  const std::pair<const uint8_t*, uint64_t>& debug_info_section =
+      debug_info_entry->second;
 
   // Build a line-to-module loader for the root handler to use.
   DumperLineToModule line_to_module(&byte_reader);
 
-  // Optional .debug_ranges reader
-  scoped_ptr<DumperRangesHandler> ranges_handler;
-  dwarf2reader::SectionMap::const_iterator ranges_entry =
-      file_context.section_map().find("__debug_ranges");
-  if (ranges_entry != file_context.section_map().end()) {
-    const std::pair<const uint8_t *, uint64>& ranges_section =
-      ranges_entry->second;
-    ranges_handler.reset(
-      new DumperRangesHandler(ranges_section.first, ranges_section.second,
-                              &byte_reader));
-  }
+  // .debug_ranges and .debug_rngslists reader
+  DumperRangesHandler ranges_handler(&byte_reader);
 
   // Walk the __debug_info section, one compilation unit at a time.
-  uint64 debug_info_length = debug_info_section.second;
-  for (uint64 offset = 0; offset < debug_info_length;) {
+  uint64_t debug_info_length = debug_info_section.second;
+  for (uint64_t offset = 0; offset < debug_info_length;) {
     // Make a handler for the root DIE that populates MODULE with the
     // debug info.
     DwarfCUToModule::WarningReporter reporter(selected_object_name_,
                                               offset);
     DwarfCUToModule root_handler(&file_context, &line_to_module,
-                                 ranges_handler.get(), &reporter);
+                                 &ranges_handler, &reporter);
     // Make a Dwarf2Handler that drives our DIEHandler.
     dwarf2reader::DIEDispatcher die_dispatcher(&root_handler);
     // Make a DWARF parser for the compilation unit at OFFSET.
@@ -484,13 +477,11 @@
     // Process the entire compilation unit; get the offset of the next.
     offset += dwarf_reader.Start();
   }
-
-  return true;
 }
 
-bool DumpSymbols::ReadCFI(google_breakpad::Module *module,
-                          const mach_o::Reader &macho_reader,
-                          const mach_o::Section &section,
+bool DumpSymbols::ReadCFI(google_breakpad::Module* module,
+                          const mach_o::Reader& macho_reader,
+                          const mach_o::Section& section,
                           bool eh_frame) const {
   // Find the appropriate set of register names for this file's
   // architecture.
@@ -509,7 +500,7 @@
       register_names = DwarfCFIToModule::RegisterNames::ARM64();
       break;
     default: {
-      const NXArchInfo *arch = google_breakpad::BreakpadGetArchInfoFromCpuType(
+      const NXArchInfo* arch = google_breakpad::BreakpadGetArchInfoFromCpuType(
           macho_reader.cpu_type(), macho_reader.cpu_subtype());
       fprintf(stderr, "%s: cannot convert DWARF call frame information for ",
               selected_object_name_.c_str());
@@ -524,7 +515,7 @@
   }
 
   // Find the call frame information and its size.
-  const uint8_t *cfi = section.contents.start;
+  const uint8_t* cfi = section.contents.start;
   size_t cfi_size = section.contents.Size();
 
   // Plug together the parser, handler, and their entourages.
@@ -556,9 +547,9 @@
  public:
   // Create a load command dumper handling load commands from READER's
   // file, and adding data to MODULE.
-  LoadCommandDumper(const DumpSymbols &dumper,
-                    google_breakpad::Module *module,
-                    const mach_o::Reader &reader,
+  LoadCommandDumper(const DumpSymbols& dumper,
+                    google_breakpad::Module* module,
+                    const mach_o::Reader& reader,
                     SymbolData symbol_data,
                     bool handle_inter_cu_refs)
       : dumper_(dumper),
@@ -567,18 +558,18 @@
         symbol_data_(symbol_data),
         handle_inter_cu_refs_(handle_inter_cu_refs) { }
 
-  bool SegmentCommand(const mach_o::Segment &segment);
-  bool SymtabCommand(const ByteBuffer &entries, const ByteBuffer &strings);
+  bool SegmentCommand(const mach_o::Segment& segment);
+  bool SymtabCommand(const ByteBuffer& entries, const ByteBuffer& strings);
 
  private:
-  const DumpSymbols &dumper_;
-  google_breakpad::Module *module_;  // WEAK
-  const mach_o::Reader &reader_;
+  const DumpSymbols& dumper_;
+  google_breakpad::Module* module_;  // WEAK
+  const mach_o::Reader& reader_;
   const SymbolData symbol_data_;
   const bool handle_inter_cu_refs_;
 };
 
-bool DumpSymbols::LoadCommandDumper::SegmentCommand(const Segment &segment) {
+bool DumpSymbols::LoadCommandDumper::SegmentCommand(const Segment& segment) {
   mach_o::SectionMap section_map;
   if (!reader_.MapSegmentSections(segment, &section_map))
     return false;
@@ -598,10 +589,7 @@
 
   if (segment.name == "__DWARF") {
     if (symbol_data_ != ONLY_CFI) {
-      if (!dumper_.ReadDwarf(module_, reader_, section_map,
-                             handle_inter_cu_refs_)) {
-        return false;
-      }
+      dumper_.ReadDwarf(module_, reader_, section_map, handle_inter_cu_refs_);
     }
     if (symbol_data_ != NO_CFI) {
       mach_o::SectionMap::const_iterator debug_frame
@@ -616,8 +604,8 @@
   return true;
 }
 
-bool DumpSymbols::LoadCommandDumper::SymtabCommand(const ByteBuffer &entries,
-                                                   const ByteBuffer &strings) {
+bool DumpSymbols::LoadCommandDumper::SymtabCommand(const ByteBuffer& entries,
+                                                   const ByteBuffer& strings) {
   StabsToModule stabs_to_module(module_);
   // Mac OS X STABS are never "unitized", and the size of the 'value' field
   // matches the address size of the executable.
@@ -659,7 +647,7 @@
   return true;
 }
 
-bool DumpSymbols::WriteSymbolFile(std::ostream &stream) {
+bool DumpSymbols::WriteSymbolFile(std::ostream& stream) {
   Module* module = NULL;
 
   if (ReadSymbolData(&module) && module) {
@@ -674,7 +662,7 @@
 // Read the selected object file's debugging information, and write out the
 // header only to |stream|. Return true on success; if an error occurs, report
 // it and return false.
-bool DumpSymbols::WriteSymbolFileHeader(std::ostream &stream) {
+bool DumpSymbols::WriteSymbolFileHeader(std::ostream& stream) {
   scoped_ptr<Module> module;
   if (!CreateEmptyModule(module))
     return false;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/dump_syms.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/dump_syms.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/dump_syms.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/dump_syms.h	2021-12-09 12:01:26.000000000 +0000
@@ -70,7 +70,7 @@
   // the name of a universal binary, a Mach-O file, or a dSYM bundle
   // containing either of the above. On success, return true; if there is a
   // problem reading |filename|, report it and return false.
-  bool Read(const std::string &filename);
+  bool Read(const std::string& filename);
 
   // If this dumper's file includes an object file for |cpu_type| and
   // |cpu_subtype|, then select that object file for dumping, and return
@@ -91,7 +91,7 @@
   // the dumper will dump those symbols; and if it contains more than one
   // object file, then the dumper will dump the object file whose
   // architecture matches that of this dumper program.
-  bool SetArchitecture(const std::string &arch_name);
+  bool SetArchitecture(const std::string& arch_name);
 
   // Return a pointer to an array of SuperFatArch structures describing the
   // object files contained in this dumper's file. Set *|count| to the number
@@ -100,7 +100,7 @@
   //
   // If there are no available architectures, this function
   // may return NULL.
-  const SuperFatArch* AvailableArchitectures(size_t *count) {
+  const SuperFatArch* AvailableArchitectures(size_t* count) {
     *count = object_files_.size();
     if (object_files_.size() > 0)
       return &object_files_[0];
@@ -110,12 +110,12 @@
   // Read the selected object file's debugging information, and write it out to
   // |stream|. Return true on success; if an error occurs, report it and
   // return false.
-  bool WriteSymbolFile(std::ostream &stream);
+  bool WriteSymbolFile(std::ostream& stream);
 
   // Read the selected object file's debugging information, and write out the
   // header only to |stream|. Return true on success; if an error occurs, report
   // it and return false.
-  bool WriteSymbolFileHeader(std::ostream &stream);
+  bool WriteSymbolFileHeader(std::ostream& stream);
 
   // As above, but simply return the debugging information in module
   // instead of writing it to a stream. The caller owns the resulting
@@ -141,11 +141,10 @@
   bool CreateEmptyModule(scoped_ptr<Module>& module);
 
   // Read debugging information from |dwarf_sections|, which was taken from
-  // |macho_reader|, and add it to |module|. On success, return true;
-  // on failure, report the problem and return false.
-  bool ReadDwarf(google_breakpad::Module *module,
-                 const mach_o::Reader &macho_reader,
-                 const mach_o::SectionMap &dwarf_sections,
+  // |macho_reader|, and add it to |module|.
+  void ReadDwarf(google_breakpad::Module* module,
+                 const mach_o::Reader& macho_reader,
+                 const mach_o::SectionMap& dwarf_sections,
                  bool handle_inter_cu_refs) const;
 
   // Read DWARF CFI or .eh_frame data from |section|, belonging to
@@ -153,9 +152,9 @@
   // then the data is .eh_frame-format data; otherwise, it is standard DWARF
   // .debug_frame data. On success, return true; on failure, report
   // the problem and return false.
-  bool ReadCFI(google_breakpad::Module *module,
-               const mach_o::Reader &macho_reader,
-               const mach_o::Section &section,
+  bool ReadCFI(google_breakpad::Module* module,
+               const mach_o::Reader& macho_reader,
+               const mach_o::Section& section,
                bool eh_frame) const;
 
   // The selection of what type of symbol data to read/write.
@@ -185,7 +184,7 @@
 
   // The object file in object_files_ selected to dump, or NULL if
   // SetArchitecture hasn't been called yet.
-  const SuperFatArch *selected_object_file_;
+  const SuperFatArch* selected_object_file_;
 
   // A string that identifies the selected object file, for use in error
   // messages.  This is usually object_filename_, but if that refers to a
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/encoding_util.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/encoding_util.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/encoding_util.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/encoding_util.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+// Copyright (c) 2020, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef GOOGLE_BREAKPAD_COMMON_MAC_ENCODING_UTIL_H
+#define GOOGLE_BREAKPAD_COMMON_MAC_ENCODING_UTIL_H
+
+#import <Foundation/Foundation.h>
+
+// As -[NSString stringByAddingPercentEscapesUsingEncoding:] has been
+// deprecated with iOS 9.0 / OS X 10.11 SDKs, this function re-implements it
+// using -[NSString stringByAddingPercentEncodingWithAllowedCharacters:] when
+// using those SDKs.
+NSString* PercentEncodeNSString(NSString* key);
+
+#endif  // GOOGLE_BREAKPAD_COMMON_MAC_ENCODING_UTIL_H
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPGetRequest.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPGetRequest.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPGetRequest.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPGetRequest.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+// Copyright (c) 2020, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#import <Foundation/Foundation.h>
+
+#import "HTTPRequest.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Represents a HTTP GET request
+ */
+@interface HTTPGetRequest : HTTPRequest
+@end
+
+NS_ASSUME_NONNULL_END
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPMultipartUpload.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPMultipartUpload.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPMultipartUpload.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPMultipartUpload.h	2021-12-09 12:01:26.000000000 +0000
@@ -27,35 +27,37 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// HTTPMultipartUpload: A multipart/form-data HTTP uploader.
-// Each parameter pair is sent as a boundary
-// Each file is sent with a name field in addition to the filename and data
-// The data will be sent synchronously.
-
 #import <Foundation/Foundation.h>
 
-@interface HTTPMultipartUpload : NSObject {
+#import "HTTPRequest.h"
+/**
+ Represents a multipart/form-data HTTP upload (POST request).
+ Each parameter pair is sent as a boundary.
+ Each file is sent with a name field in addition to the filename and data.
+ */
+@interface HTTPMultipartUpload : HTTPRequest {
  @protected
-  NSURL *url_;                  // The destination URL (STRONG)
-  NSDictionary *parameters_;    // The key/value pairs for sending data (STRONG)
-  NSMutableDictionary *files_;  // Dictionary of name/file-path (STRONG)
-  NSString *boundary_;          // The boundary string (STRONG)
-  NSHTTPURLResponse *response_; // The response from the send (STRONG)
+  NSDictionary* parameters_;    // The key/value pairs for sending data (STRONG)
+  NSMutableDictionary* files_;  // Dictionary of name/file-path (STRONG)
+  NSString* boundary_;          // The boundary string (STRONG)
 }
 
-- (id)initWithURL:(NSURL *)url;
-
-- (NSURL *)URL;
-
-- (void)setParameters:(NSDictionary *)parameters;
-- (NSDictionary *)parameters;
-
-- (void)addFileAtPath:(NSString *)path name:(NSString *)name;
-- (void)addFileContents:(NSData *)data name:(NSString *)name;
-- (NSDictionary *)files;
-
-// Set the data and return the response
-- (NSData *)send:(NSError **)error;
-- (NSHTTPURLResponse *)response;
+/**
+ Sets the parameters that will be sent in the multipart POST request.
+ */
+- (void)setParameters:(NSDictionary*)parameters;
+- (NSDictionary*)parameters;
+
+/**
+ Adds a file to be uploaded in the multipart POST request, by its file path.
+ */
+- (void)addFileAtPath:(NSString*)path name:(NSString*)name;
+
+/**
+ Adds a file to be uploaded in the multipart POST request, by its name and
+ contents.
+ */
+- (void)addFileContents:(NSData*)data name:(NSString*)name;
+- (NSDictionary*)files;
 
 @end
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPPutRequest.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPPutRequest.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPPutRequest.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPPutRequest.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+// Copyright (c) 2020, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#import <Foundation/Foundation.h>
+
+#import "HTTPRequest.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Represents an HTTP PUT request.
+ */
+@interface HTTPPutRequest : HTTPRequest {
+ @protected
+  NSString* file_;
+}
+
+/**
+ Sets the path of the file that will be sent in the PUT request.
+ */
+- (void)setFile:(NSString*)file;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPRequest.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPRequest.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPRequest.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPRequest.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,73 @@
+// Copyright (c) 2020, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+/**
+ Represents a single HTTP request. Sending the request is synchronous.
+ Once the send is complete, the response will be set.
+
+ This is a base interface that specific HTTP requests derive from.
+ It is not intended to be instantiated directly.
+ */
+@interface HTTPRequest : NSObject {
+ @protected
+  NSURL* URL_;                   // The destination URL (STRONG)
+  NSHTTPURLResponse* response_;  // The response from the send (STRONG)
+}
+
+/**
+ Initializes the HTTPRequest and sets its URL.
+ */
+- (id)initWithURL:(NSURL*)URL;
+
+- (NSURL*)URL;
+
+- (NSHTTPURLResponse*)response;
+
+- (NSString*)HTTPMethod;  // Internal, don't call outside class hierarchy.
+
+- (NSString*)contentType;  // Internal, don't call outside class hierarchy.
+
+- (NSData*)bodyData;  // Internal, don't call outside class hierarchy.
+
+- (NSData*)send:(NSError**)error;
+
+/**
+ Appends a file to the HTTP request, either by filename or by file content
+ (in the form of NSData).
+ */
++ (void)appendFileToBodyData:(NSMutableData*)data
+                    withName:(NSString*)name
+              withFileOrData:(id)fileOrData;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPSimplePostRequest.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPSimplePostRequest.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPSimplePostRequest.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/HTTPSimplePostRequest.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,57 @@
+// Copyright (c) 2020, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#import <Foundation/Foundation.h>
+
+#import "HTTPRequest.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Represents a simple (non-multipart) HTTP POST request.
+ */
+@interface HTTPSimplePostRequest : HTTPRequest {
+ @protected
+  NSString* contentType_;
+  NSString* body_;
+}
+
+/**
+ Sets the content type of the POST request.
+ */
+- (void)setContentType:(NSString*)contentType;
+
+/**
+ Sets the contents of the POST request's body.
+ */
+- (void)setBody:(NSString*)body;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/MachIPC.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/MachIPC.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/MachIPC.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/MachIPC.h	2021-12-09 12:01:26.000000000 +0000
@@ -73,7 +73,7 @@
 //          mach_port_t task = message.GetTranslatedPort(0);
 //          mach_port_t thread = message.GetTranslatedPort(1);
 //
-//          char *messageString = message.GetData();
+//          char* messageString = message.GetData();
 //
 //          printf("message string = %s\n", messageString);
 //        }
@@ -164,7 +164,7 @@
  public:
 
   // The receiver of the message can retrieve the raw data this way
-  uint8_t *GetData() {
+  uint8_t* GetData() {
     return GetDataLength() > 0 ? GetDataPacket()->data : NULL;
   }
 
@@ -181,10 +181,10 @@
 
   // Adds a descriptor (typically a mach port) to be translated
   // returns true if successful, otherwise not enough space
-  bool AddDescriptor(const MachMsgPortDescriptor &desc);
+  bool AddDescriptor(const MachMsgPortDescriptor& desc);
 
   int GetDescriptorCount() const { return body.msgh_descriptor_count; }
-  MachMsgPortDescriptor *GetDescriptor(int n);
+  MachMsgPortDescriptor* GetDescriptor(int n);
 
   // Convenience method which gets the mach port described by the descriptor
   mach_port_t GetTranslatedPort(int n);
@@ -193,7 +193,7 @@
   bool IsSimpleMessage() const { return GetDescriptorCount() == 0; }
 
   // Sets raw data for the message (returns false if not enough space)
-  bool SetData(void *data, int32_t data_length);
+  bool SetData(void* data, int32_t data_length);
 
  protected:
   // Consider this an abstract base class - must create an actual instance
@@ -216,7 +216,7 @@
   MessageDataPacket* GetDataPacket();
 
   void SetDescriptorCount(int n);
-  void SetDescriptor(int n, const MachMsgPortDescriptor &desc);
+  void SetDescriptor(int n, const MachMsgPortDescriptor& desc);
 
   // Returns total message size setting msgh_size in the header to this value
   mach_msg_size_t CalculateSize();
@@ -250,7 +250,7 @@
 class ReceivePort {
  public:
   // Creates a new mach port for receiving messages and registers a name for it
-  explicit ReceivePort(const char *receive_port_name);
+  explicit ReceivePort(const char* receive_port_name);
 
   // Given an already existing mach port, use it.  We take ownership of the
   // port and deallocate it in our destructor.
@@ -262,7 +262,7 @@
   ~ReceivePort();
 
   // Waits on the mach port until message received or timeout
-  kern_return_t WaitForMessage(MachReceiveMessage *out_message,
+  kern_return_t WaitForMessage(MachReceiveMessage* out_message,
                                mach_msg_timeout_t timeout);
 
   // The underlying mach port that we wrap
@@ -280,13 +280,13 @@
 class MachPortSender {
  public:
   // get a port with send rights corresponding to a named registered service
-  explicit MachPortSender(const char *receive_port_name);
+  explicit MachPortSender(const char* receive_port_name);
 
 
   // Given an already existing mach port, use it.
   explicit MachPortSender(mach_port_t send_port);
 
-  kern_return_t SendMessage(MachSendMessage &message,
+  kern_return_t SendMessage(MachSendMessage& message,
                             mach_msg_timeout_t timeout);
 
  private:
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_id.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_id.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_id.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_id.cc	2021-12-09 12:01:26.000000000 +0000
@@ -53,7 +53,7 @@
 using google_breakpad::MD5Update;
 using google_breakpad::MD5Final;
 
-MachoID::MachoID(const char *path)
+MachoID::MachoID(const char* path)
    : memory_(0),
      memory_size_(0),
      crc_(0), 
@@ -62,7 +62,7 @@
   snprintf(path_, sizeof(path_), "%s", path);
 }
 
-MachoID::MachoID(const char *path, void *memory, size_t size)
+MachoID::MachoID(const char* path, void* memory, size_t size)
    : memory_(memory),
      memory_size_(size),
      crc_(0), 
@@ -82,7 +82,7 @@
 // MAX_BLOCK is the largest n such that 255n(n+1)/2 + (n+1)(MAX_BLOCK-1) <= 2^32-1
 #define MAX_BLOCK 5552
 
-void MachoID::UpdateCRC(unsigned char *bytes, size_t size) {
+void MachoID::UpdateCRC(unsigned char* bytes, size_t size) {
 // Unrolled loops for summing
 #define DO1(buf,i)  {sum1 += (buf)[i]; sum2 += sum1;}
 #define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
@@ -122,11 +122,11 @@
   }
 }
 
-void MachoID::UpdateMD5(unsigned char *bytes, size_t size) {
+void MachoID::UpdateMD5(unsigned char* bytes, size_t size) {
   MD5Update(&md5_context_, bytes, static_cast<unsigned>(size));
 }
 
-void MachoID::Update(MachoWalker *walker, off_t offset, size_t size) {
+void MachoID::Update(MachoWalker* walker, off_t offset, size_t size) {
   if (!update_function_ || !size)
     return;
 
@@ -237,7 +237,7 @@
 bool MachoID::WalkHeader(cpu_type_t cpu_type,
                          cpu_subtype_t cpu_subtype,
                          MachoWalker::LoadCommandCallback callback,
-                         void *context) {
+                         void* context) {
   if (memory_) {
     MachoWalker walker(memory_, memory_size_, callback, context);
     return walker.WalkHeader(cpu_type, cpu_subtype);
@@ -248,9 +248,9 @@
 }
 
 // static
-bool MachoID::WalkerCB(MachoWalker *walker, load_command *cmd, off_t offset,
-                       bool swap, void *context) {
-  MachoID *macho_id = (MachoID *)context;
+bool MachoID::WalkerCB(MachoWalker* walker, load_command* cmd, off_t offset,
+                       bool swap, void* context) {
+  MachoID* macho_id = (MachoID*)context;
 
   if (cmd->cmd == LC_SEGMENT) {
     struct segment_command seg;
@@ -327,11 +327,11 @@
 }
 
 // static
-bool MachoID::UUIDWalkerCB(MachoWalker *walker, load_command *cmd, off_t offset,
-                           bool swap, void *context) {
+bool MachoID::UUIDWalkerCB(MachoWalker* walker, load_command* cmd, off_t offset,
+                           bool swap, void* context) {
   if (cmd->cmd == LC_UUID) {
-    struct breakpad_uuid_command *uuid_cmd =
-      (struct breakpad_uuid_command *)context;
+    struct breakpad_uuid_command* uuid_cmd =
+      (struct breakpad_uuid_command*)context;
 
     if (!walker->ReadBytes(uuid_cmd, sizeof(struct breakpad_uuid_command),
                            offset))
@@ -348,10 +348,10 @@
 }
 
 // static
-bool MachoID::IDWalkerCB(MachoWalker *walker, load_command *cmd, off_t offset,
-                         bool swap, void *context) {
+bool MachoID::IDWalkerCB(MachoWalker* walker, load_command* cmd, off_t offset,
+                         bool swap, void* context) {
   if (cmd->cmd == LC_ID_DYLIB) {
-    struct dylib_command *dylib_cmd = (struct dylib_command *)context;
+    struct dylib_command* dylib_cmd = (struct dylib_command*)context;
 
     if (!walker->ReadBytes(dylib_cmd, sizeof(struct dylib_command), offset))
       return false;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_id.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_id.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_id.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_id.h	2021-12-09 12:01:26.000000000 +0000
@@ -45,8 +45,8 @@
 
 class MachoID {
  public:
-  MachoID(const char *path);
-  MachoID(const char *path, void *memory, size_t size);
+  MachoID(const char* path);
+  MachoID(const char* path, void* memory, size_t size);
   ~MachoID();
 
   // For the given |cpu_type| and |cpu_subtype|, return a UUID from the LC_UUID
@@ -78,40 +78,40 @@
 
  private:
   // Signature of class member function to be called with data read from file
-  typedef void (MachoID::*UpdateFunction)(unsigned char *bytes, size_t size);
+  typedef void (MachoID::*UpdateFunction)(unsigned char* bytes, size_t size);
 
   // Update the CRC value by examining |size| |bytes| and applying the algorithm
   // to each byte.
-  void UpdateCRC(unsigned char *bytes, size_t size);
+  void UpdateCRC(unsigned char* bytes, size_t size);
 
   // Update the MD5 value by examining |size| |bytes| and applying the algorithm
   // to each byte.
-  void UpdateMD5(unsigned char *bytes, size_t size);
+  void UpdateMD5(unsigned char* bytes, size_t size);
 
   // Bottleneck for update routines
-  void Update(MachoWalker *walker, off_t offset, size_t size);
+  void Update(MachoWalker* walker, off_t offset, size_t size);
 
   // Factory for the MachoWalker
   bool WalkHeader(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype,
-                  MachoWalker::LoadCommandCallback callback, void *context);
+                  MachoWalker::LoadCommandCallback callback, void* context);
 
   // The callback from the MachoWalker for CRC and MD5
-  static bool WalkerCB(MachoWalker *walker, load_command *cmd, off_t offset,
-                       bool swap, void *context);
+  static bool WalkerCB(MachoWalker* walker, load_command* cmd, off_t offset,
+                       bool swap, void* context);
 
   // The callback from the MachoWalker for LC_UUID
-  static bool UUIDWalkerCB(MachoWalker *walker, load_command *cmd, off_t offset,
-                           bool swap, void *context);
+  static bool UUIDWalkerCB(MachoWalker* walker, load_command* cmd, off_t offset,
+                           bool swap, void* context);
 
   // The callback from the MachoWalker for LC_ID_DYLIB
-  static bool IDWalkerCB(MachoWalker *walker, load_command *cmd, off_t offset,
-                         bool swap, void *context);
+  static bool IDWalkerCB(MachoWalker* walker, load_command* cmd, off_t offset,
+                         bool swap, void* context);
 
   // File path
   char path_[PATH_MAX];
 
   // Memory region to read from
-  void *memory_;
+  void* memory_;
 
   // Size of the memory region
   size_t memory_size_;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader.cc	2021-12-09 12:01:26.000000000 +0000
@@ -81,7 +81,7 @@
           " to contain\n", filename_.c_str());
 }
 
-bool FatReader::Read(const uint8_t *buffer, size_t size) {
+bool FatReader::Read(const uint8_t* buffer, size_t size) {
   buffer_.start = buffer;
   buffer_.end = buffer + size;
   ByteCursor cursor(&buffer_);
@@ -196,19 +196,19 @@
           filename_.c_str(), i, type);
 }
 
-void Reader::Reporter::SectionsMissing(const string &name) {
+void Reader::Reporter::SectionsMissing(const string& name) {
   fprintf(stderr, "%s: the load command for segment '%s'"
           " is too short to hold the section headers it claims to have\n",
           filename_.c_str(), name.c_str());
 }
 
-void Reader::Reporter::MisplacedSegmentData(const string &name) {
+void Reader::Reporter::MisplacedSegmentData(const string& name) {
   fprintf(stderr, "%s: the segment '%s' claims its contents lie beyond"
           " the end of the file\n", filename_.c_str(), name.c_str());
 }
 
-void Reader::Reporter::MisplacedSectionData(const string &section,
-                                            const string &segment) {
+void Reader::Reporter::MisplacedSectionData(const string& section,
+                                            const string& segment) {
   fprintf(stderr, "%s: the section '%s' in segment '%s'"
           " claims its contents lie outside the segment's contents\n",
           filename_.c_str(), section.c_str(), segment.c_str());
@@ -225,7 +225,7 @@
           filename_.c_str(), cpu_type);
 }
 
-bool Reader::Read(const uint8_t *buffer,
+bool Reader::Read(const uint8_t* buffer,
                   size_t size,
                   cpu_type_t expected_cpu_type,
                   cpu_subtype_t expected_cpu_subtype) {
@@ -309,7 +309,7 @@
   return true;
 }
 
-bool Reader::WalkLoadCommands(Reader::LoadCommandHandler *handler) const {
+bool Reader::WalkLoadCommands(Reader::LoadCommandHandler* handler) const {
   ByteCursor list_cursor(&load_commands_, big_endian_);
 
   for (size_t index = 0; index < load_command_count_; ++index) {
@@ -422,13 +422,13 @@
  public:
   // Create a load command handler that looks for a segment named NAME,
   // and sets SEGMENT to describe it if found.
-  SegmentFinder(const string &name, Segment *segment)
+  SegmentFinder(const string& name, Segment* segment)
       : name_(name), segment_(segment), found_() { }
 
   // Return true if the traversal found the segment, false otherwise.
   bool found() const { return found_; }
 
-  bool SegmentCommand(const Segment &segment) {
+  bool SegmentCommand(const Segment& segment) {
     if (segment.name == name_) {
       *segment_ = segment;
       found_ = true;
@@ -439,23 +439,23 @@
 
  private:
   // The name of the segment our creator is looking for.
-  const string &name_;
+  const string& name_;
 
   // Where we should store the segment if found. (WEAK)
-  Segment *segment_;
+  Segment* segment_;
 
   // True if we found the segment.
   bool found_;
 };
 
-bool Reader::FindSegment(const string &name, Segment *segment) const {
+bool Reader::FindSegment(const string& name, Segment* segment) const {
   SegmentFinder finder(name, segment);
   WalkLoadCommands(&finder);
   return finder.found();
 }
 
-bool Reader::WalkSegmentSections(const Segment &segment,
-                                 SectionHandler *handler) const {
+bool Reader::WalkSegmentSections(const Segment& segment,
+                                 SectionHandler* handler) const {
   size_t word_size = segment.bits_64 ? 8 : 4;
   ByteCursor cursor(&segment.section_list, big_endian_);
 
@@ -537,18 +537,18 @@
  public:
   // Create a SectionHandler that populates MAP with an entry for
   // each section it is given.
-  SectionMapper(SectionMap *map) : map_(map) { }
-  bool HandleSection(const Section &section) {
+  SectionMapper(SectionMap* map) : map_(map) { }
+  bool HandleSection(const Section& section) {
     (*map_)[section.section_name] = section;
     return true;
   }
  private:
   // The map under construction. (WEAK)
-  SectionMap *map_;
+  SectionMap* map_;
 };
 
-bool Reader::MapSegmentSections(const Segment &segment,
-                                SectionMap *section_map) const {
+bool Reader::MapSegmentSections(const Segment& segment,
+                                SectionMap* section_map) const {
   section_map->clear();
   SectionMapper mapper(section_map);
   return WalkSegmentSections(segment, &mapper);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader.h	2021-12-09 12:01:26.000000000 +0000
@@ -78,7 +78,7 @@
   class Reporter {
    public:
     // Create a reporter that attributes problems to |filename|.
-    explicit Reporter(const string &filename) : filename_(filename) { }
+    explicit Reporter(const string& filename) : filename_(filename) { }
 
     virtual ~Reporter() { }
 
@@ -101,7 +101,7 @@
   };
 
   // Create a fat binary file reader that uses |reporter| to report problems.
-  explicit FatReader(Reporter *reporter) : reporter_(reporter) { }
+  explicit FatReader(Reporter* reporter) : reporter_(reporter) { }
 
   // Read the |size| bytes at |buffer| as a fat binary file. On success,
   // return true; on failure, report the problem to reporter_ and return
@@ -110,7 +110,7 @@
   // If the data is a plain Mach-O file, rather than a fat binary file,
   // then the reader behaves as if it had found a fat binary file whose
   // single object file is the Mach-O file.
-  bool Read(const uint8_t *buffer, size_t size);
+  bool Read(const uint8_t* buffer, size_t size);
 
   // Return an array of 'SuperFatArch' structures describing the
   // object files present in this fat binary file. Set |size| to the
@@ -130,7 +130,7 @@
   // possible to use the result with OS X functions like NXFindBestFatArch,
   // so that the symbol dumper will behave consistently with other OS X
   // utilities that work with fat binaries.
-  const SuperFatArch* object_files(size_t *count) const {
+  const SuperFatArch* object_files(size_t* count) const {
     *count = object_files_.size();
     if (object_files_.size() > 0)
       return &object_files_[0];
@@ -139,7 +139,7 @@
 
  private:
   // We use this to report problems parsing the file's contents. (WEAK)
-  Reporter *reporter_;
+  Reporter* reporter_;
 
   // The contents of the fat binary or Mach-O file we're parsing. We do not
   // own the storage it refers to.
@@ -240,7 +240,7 @@
   class Reporter {
    public:
     // Create a reporter that attributes problems to |filename|.
-    explicit Reporter(const string &filename) : filename_(filename) { }
+    explicit Reporter(const string& filename) : filename_(filename) { }
     virtual ~Reporter() { }
 
     // Reporter functions for fatal errors return void; the reader will
@@ -282,16 +282,16 @@
     // The LC_SEGMENT or LC_SEGMENT_64 load command for the segment named
     // |name| is too short to hold the sections that its header says it does.
     // (This more specific than LoadCommandTooShort.)
-    virtual void SectionsMissing(const string &name);
+    virtual void SectionsMissing(const string& name);
 
     // The segment named |name| claims that its contents lie beyond the end
     // of the file.
-    virtual void MisplacedSegmentData(const string &name);
+    virtual void MisplacedSegmentData(const string& name);
 
     // The section named |section| in the segment named |segment| claims that
     // its contents do not lie entirely within the segment.
-    virtual void MisplacedSectionData(const string &section,
-                                      const string &segment);
+    virtual void MisplacedSectionData(const string& section,
+                                      const string& segment);
 
     // The LC_SYMTAB command claims that symbol table contents are located
     // beyond the end of the file.
@@ -315,7 +315,7 @@
     // Called to report that the segment's section list contains |section|.
     // This should return true if the iteration should continue, or false
     // if it should stop.
-    virtual bool HandleSection(const Section &section) = 0;
+    virtual bool HandleSection(const Section& section) = 0;
   };
 
   // A handler for the load commands in a Mach-O file.
@@ -341,20 +341,20 @@
     // cannot parse the command type or its size, we call
     // reporter_->IncompleteLoadCommand instead.)
     virtual bool UnknownCommand(LoadCommandType type,
-                                const ByteBuffer &contents) {
+                                const ByteBuffer& contents) {
       return true;
     }
 
     // The load command is LC_SEGMENT or LC_SEGMENT_64, defining a segment
     // with the properties given in |segment|.
-    virtual bool SegmentCommand(const Segment &segment) {
+    virtual bool SegmentCommand(const Segment& segment) {
       return true;
     }
 
     // The load command is LC_SYMTAB. |entries| holds the array of nlist
     // entries, and |names| holds the strings the entries refer to.
-    virtual bool SymtabCommand(const ByteBuffer &entries,
-                               const ByteBuffer &names) {
+    virtual bool SymtabCommand(const ByteBuffer& entries,
+                               const ByteBuffer& names) {
       return true;
     }
 
@@ -362,7 +362,7 @@
   };
 
   // Create a Mach-O file reader that reports problems to |reporter|.
-  explicit Reader(Reporter *reporter)
+  explicit Reader(Reporter* reporter)
       : reporter_(reporter) { }
 
   // Read the given data as a Mach-O file. The reader retains pointers
@@ -371,11 +371,11 @@
   //
   // At most one of these functions should be invoked once on each Reader
   // instance.
-  bool Read(const uint8_t *buffer,
+  bool Read(const uint8_t* buffer,
             size_t size,
             cpu_type_t expected_cpu_type,
             cpu_subtype_t expected_cpu_subtype);
-  bool Read(const ByteBuffer &buffer,
+  bool Read(const ByteBuffer& buffer,
             cpu_type_t expected_cpu_type,
             cpu_subtype_t expected_cpu_subtype) {
     return Read(buffer.start,
@@ -402,25 +402,25 @@
   // a handler function returns false. If we encounter a malformed load
   // command, report it via reporter_ and return false. Return true if all
   // load commands were parseable and all handlers returned true.
-  bool WalkLoadCommands(LoadCommandHandler *handler) const;
+  bool WalkLoadCommands(LoadCommandHandler* handler) const;
 
   // Set |segment| to describe the segment named |name|, if present. If
   // found, |segment|'s byte buffers refer to a subregion of the bytes
   // passed to Read. If we find the section, return true; otherwise,
   // return false.
-  bool FindSegment(const string &name, Segment *segment) const;
+  bool FindSegment(const string& name, Segment* segment) const;
 
   // Apply |handler| to each section defined in |segment|. If |handler| returns
   // false, stop iterating and return false. If all calls to |handler| return
   // true and we reach the end of the section list, return true.
-  bool WalkSegmentSections(const Segment &segment, SectionHandler *handler)
+  bool WalkSegmentSections(const Segment& segment, SectionHandler* handler)
     const;
 
   // Clear |section_map| and then populate it with a map of the sections
   // in |segment|, from section names to Section structures.
   // Each Section's contents refer to bytes in |segment|'s contents.
   // On success, return true; if a problem occurs, report it and return false.
-  bool MapSegmentSections(const Segment &segment, SectionMap *section_map)
+  bool MapSegmentSections(const Segment& segment, SectionMap* section_map)
     const;
 
  private:
@@ -429,7 +429,7 @@
   class SectionMapper;
 
   // We use this to report problems parsing the file's contents. (WEAK)
-  Reporter *reporter_;
+  Reporter* reporter_;
 
   // The contents of the Mach-O file we're parsing. We do not own the
   // storage it refers to.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_reader_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -75,7 +75,7 @@
 
 class MockFatReaderReporter: public FatReader::Reporter {
  public:
-  MockFatReaderReporter(const string &filename)
+  MockFatReaderReporter(const string& filename)
       : FatReader::Reporter(filename) { }
   MOCK_METHOD0(BadHeader, void());
   MOCK_METHOD0(MisplacedObjectFile, void());
@@ -84,7 +84,7 @@
 
 class MockReaderReporter: public Reader::Reporter {
  public:
-  MockReaderReporter(const string &filename) : Reader::Reporter(filename) { }
+  MockReaderReporter(const string& filename) : Reader::Reporter(filename) { }
   MOCK_METHOD0(BadHeader, void());
   MOCK_METHOD4(CPUTypeMismatch, void(cpu_type_t cpu_type,
                                      cpu_subtype_t cpu_subtype,
@@ -95,24 +95,24 @@
   MOCK_METHOD3(LoadCommandsOverrun, void(size_t claimed, size_t i,
                                          LoadCommandType type));
   MOCK_METHOD2(LoadCommandTooShort, void(size_t i, LoadCommandType type));
-  MOCK_METHOD1(SectionsMissing, void(const string &name));
-  MOCK_METHOD1(MisplacedSegmentData, void(const string &name));
-  MOCK_METHOD2(MisplacedSectionData, void(const string &section,
-                                          const string &segment));
+  MOCK_METHOD1(SectionsMissing, void(const string& name));
+  MOCK_METHOD1(MisplacedSegmentData, void(const string& name));
+  MOCK_METHOD2(MisplacedSectionData, void(const string& section,
+                                          const string& segment));
   MOCK_METHOD0(MisplacedSymbolTable, void());
   MOCK_METHOD1(UnsupportedCPUType, void(cpu_type_t cpu_type));
 };
 
 class MockLoadCommandHandler: public Reader::LoadCommandHandler {
  public:
-  MOCK_METHOD2(UnknownCommand, bool(LoadCommandType, const ByteBuffer &));
-  MOCK_METHOD1(SegmentCommand, bool(const Segment &));
-  MOCK_METHOD2(SymtabCommand,  bool(const ByteBuffer &, const ByteBuffer &));
+  MOCK_METHOD2(UnknownCommand, bool(LoadCommandType, const ByteBuffer&));
+  MOCK_METHOD1(SegmentCommand, bool(const Segment&));
+  MOCK_METHOD2(SymtabCommand,  bool(const ByteBuffer&, const ByteBuffer&));
 };
 
 class MockSectionHandler: public Reader::SectionHandler {
  public:
-  MOCK_METHOD1(HandleSection, bool(const Section &section));
+  MOCK_METHOD1(HandleSection, bool(const Section& section));
 };
 
 
@@ -221,7 +221,7 @@
   }
   void ReadFat(bool expect_parse_success = true) {
     ASSERT_TRUE(fat.GetContents(&contents));
-    fat_bytes = reinterpret_cast<const uint8_t *>(contents.data());
+    fat_bytes = reinterpret_cast<const uint8_t*>(contents.data());
     if (expect_parse_success) {
       EXPECT_TRUE(reader.Read(fat_bytes, contents.size()));
       size_t fat_files_count;
@@ -238,7 +238,7 @@
   MockFatReaderReporter reporter;
   FatReader reader;
   string contents;
-  const uint8_t *fat_bytes;
+  const uint8_t* fat_bytes;
   vector<struct fat_arch> object_files;
 };
 
@@ -487,16 +487,16 @@
  private:
   // The innermost WithConfiguration in whose dynamic scope we are
   // currently executing.
-  static WithConfiguration *current_;
+  static WithConfiguration* current_;
 
   // The innermost WithConfiguration whose dynamic scope encloses this
   // WithConfiguration.
   Endianness endianness_;
   size_t word_size_;
-  WithConfiguration *saved_;
+  WithConfiguration* saved_;
 };
 
-WithConfiguration *WithConfiguration::current_ = NULL;
+WithConfiguration* WithConfiguration::current_ = NULL;
 
 // A test_assembler::Section with a size that we can cite. The start(),
 // Here() and Mark() member functions of a SizedSection always represent
@@ -527,7 +527,7 @@
 
   // Append SECTION to the end of this section, and call its Finish member.
   // Return a reference to this section.
-  SizedSection &Place(SizedSection *section) {
+  SizedSection& Place(SizedSection* section) {
     assert(section->endianness() == endianness());
     section->Finish();
     section->start() = Here();
@@ -563,7 +563,7 @@
 
   // Placing a loaded section within a loaded section sets the relationship
   // between their addresses.
-  LoadedSection &Place(LoadedSection *section) {
+  LoadedSection& Place(LoadedSection* section) {
     section->address() = address() + Size();
     SizedSection::Place(section);
     return *this;
@@ -583,7 +583,7 @@
   // The load command will refer to CONTENTS, which must be Placed in the
   // file separately, at the desired position. Return a reference to this
   // section.
-  SegmentLoadCommand &Header(const string &name, const LoadedSection &contents,
+  SegmentLoadCommand& Header(const string& name, const LoadedSection& contents,
                              uint32_t maxprot, uint32_t initprot,
                              uint32_t flags) {
     assert(contents.word_size() == word_size());
@@ -608,16 +608,16 @@
   // memory. If this label is still undefined by the time we place this
   // segment, it defaults to the final size of the segment's in-file
   // contents. Return a reference to this load command.
-  Label &vmsize() { return vmsize_; }
+  Label& vmsize() { return vmsize_; }
 
   // Add a section entry with the given characteristics to this segment
   // load command. Return a reference to this. The section entry will refer
   // to CONTENTS, which must be Placed in the segment's contents
   // separately, at the desired position.
-  SegmentLoadCommand &AppendSectionEntry(const string &section_name,
-                                         const string &segment_name,
+  SegmentLoadCommand& AppendSectionEntry(const string& section_name,
+                                         const string& segment_name,
                                          uint32_t alignment, uint32_t flags,
-                                         const LoadedSection &contents) {
+                                         const LoadedSection& contents) {
     AppendCString(section_name, 16);
     AppendCString(segment_name, 16);
     Append(endianness(), word_size() / 8, contents.address());
@@ -671,14 +671,14 @@
   Label final_command_count() const { return final_command_count_; }
 
   // Increment the command count; return a reference to this section.
-  LoadCommands &CountCommand() {
+  LoadCommands& CountCommand() {
     command_count_++;
     return *this;
   }
 
   // Place COMMAND, containing a load command, at the end of this section.
   // Return a reference to this section.
-  LoadCommands &Place(SizedSection *section) {
+  LoadCommands& Place(SizedSection* section) {
     SizedSection::Place(section);
     CountCommand();
     return *this;
@@ -710,7 +710,7 @@
   // Create a Mach-O file header using the given characteristics and load
   // command list. This Places COMMANDS immediately after the header.
   // Return a reference to this section.
-  MachOFile &Header(LoadCommands *commands,
+  MachOFile& Header(LoadCommands* commands,
                     cpu_type_t cpu_type = CPU_TYPE_X86,
                     cpu_subtype_t cpu_subtype = CPU_SUBTYPE_I386_ALL,
                     FileType file_type = MH_EXECUTE,
@@ -752,12 +752,12 @@
     EXPECT_CALL(load_command_handler, SegmentCommand(_)).Times(0);
   }
 
-  void ReadFile(MachOFile *file,
+  void ReadFile(MachOFile* file,
                 bool expect_parse_success,
                 cpu_type_t expected_cpu_type,
                 cpu_subtype_t expected_cpu_subtype) {
     ASSERT_TRUE(file->GetContents(&file_contents));
-    file_bytes = reinterpret_cast<const uint8_t *>(file_contents.data());
+    file_bytes = reinterpret_cast<const uint8_t*>(file_contents.data());
     if (expect_parse_success) {
       EXPECT_TRUE(reader.Read(file_bytes,
                               file_contents.size(),
@@ -772,7 +772,7 @@
   }
 
   string file_contents;
-  const uint8_t *file_bytes;
+  const uint8_t* file_bytes;
   MockReaderReporter reporter;
   Reader reader;
   MockLoadCommandHandler load_command_handler;
@@ -1343,14 +1343,14 @@
   EXPECT_TRUE(reader.WalkLoadCommands(&load_command_handler));
 }
 
-static inline Matcher<const Section &> MatchSection(
+static inline Matcher<const Section&> MatchSection(
     Matcher<bool> bits_64,
-    Matcher<const string &> section_name,
-    Matcher<const string &> segment_name,
+    Matcher<const string&> section_name,
+    Matcher<const string&> segment_name,
     Matcher<uint64_t> address,
     Matcher<uint32_t> alignment,
     Matcher<uint32_t> flags,
-    Matcher<const ByteBuffer &> contents) {
+    Matcher<const ByteBuffer&> contents) {
   return AllOf(AllOf(Field(&Section::bits_64, bits_64),
                      Field(&Section::section_name, section_name),
                      Field(&Section::segment_name, segment_name),
@@ -1360,10 +1360,10 @@
                      Field(&Section::contents, contents)));
 }
 
-static inline Matcher<const Section &> MatchSection(
+static inline Matcher<const Section&> MatchSection(
     Matcher<bool> bits_64,
-    Matcher<const string &> section_name,
-    Matcher<const string &> segment_name,
+    Matcher<const string&> section_name,
+    Matcher<const string&> segment_name,
     Matcher<uint64_t> address) {
   return AllOf(Field(&Section::bits_64, bits_64),
                Field(&Section::section_name, section_name),
@@ -1410,7 +1410,7 @@
     contents1.start = file_bytes + section1.start().Value();
     contents1.end = contents1.start + section1.final_size().Value();
     EXPECT_EQ("buddha's hand",
-              string(reinterpret_cast<const char *>(contents1.start),
+              string(reinterpret_cast<const char*>(contents1.start),
                      contents1.Size()));
     EXPECT_CALL(section_handler,
                 HandleSection(MatchSection(true, "mandarin", "kishu",
@@ -1422,7 +1422,7 @@
     contents2.start = file_bytes + section2.start().Value();
     contents2.end = contents2.start + section2.final_size().Value();
     EXPECT_EQ("kumquat",
-              string(reinterpret_cast<const char *>(contents2.start),
+              string(reinterpret_cast<const char*>(contents2.start),
                      contents2.Size()));
     EXPECT_CALL(section_handler,
                 HandleSection(MatchSection(true, "bergamot", "cara cara",
@@ -1716,7 +1716,7 @@
  public:
   // Add the string S to this StringAssembler, and return the string's
   // offset within this compilation unit's strings.
-  size_t Add(const string &s) {
+  size_t Add(const string& s) {
     size_t offset = Size();
     AppendCString(s);
     return offset;
@@ -1728,7 +1728,7 @@
 class SymbolAssembler: public SizedSection {
  public:
   // Create a SymbolAssembler that uses StringAssembler for its strings.
-  explicit SymbolAssembler(StringAssembler *string_assembler) 
+  explicit SymbolAssembler(StringAssembler* string_assembler)
       : string_assembler_(string_assembler),
         entry_count_(0) { }
 
@@ -1737,7 +1737,7 @@
   // its compilation unit's portion of the .stabstr section; this can be a
   // value generated by a StringAssembler. Return a reference to this
   // SymbolAssembler.
-  SymbolAssembler &Symbol(uint8_t type, uint8_t other, Label descriptor,
+  SymbolAssembler& Symbol(uint8_t type, uint8_t other, Label descriptor,
                           Label value, Label name) {
     D32(name);
     D8(type);
@@ -1749,14 +1749,14 @@
   }
 
   // As above, but automatically add NAME to our StringAssembler.
-  SymbolAssembler &Symbol(uint8_t type, uint8_t other, Label descriptor,
-                       Label value, const string &name) {
+  SymbolAssembler& Symbol(uint8_t type, uint8_t other, Label descriptor,
+                          Label value, const string& name) {
     return Symbol(type, other, descriptor, value, string_assembler_->Add(name));
   }
 
  private:
   // The strings for our STABS entries.
-  StringAssembler *string_assembler_;
+  StringAssembler* string_assembler_;
 
   // The number of entries in this compilation unit so far.
   size_t entry_count_;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_walker.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_walker.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_walker.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_walker.cc	2021-12-09 12:01:26.000000000 +0000
@@ -47,8 +47,8 @@
 
 namespace MacFileUtilities {
 
-MachoWalker::MachoWalker(const char *path, LoadCommandCallback callback,
-                         void *context)
+MachoWalker::MachoWalker(const char* path, LoadCommandCallback callback,
+                         void* context)
     : file_(-1),
       memory_(NULL),
       memory_size_(0),
@@ -60,8 +60,8 @@
   file_ = open(path, O_RDONLY);
 }
 
-MachoWalker::MachoWalker(void *memory, size_t size,
-                         LoadCommandCallback callback, void *context)
+MachoWalker::MachoWalker(void* memory, size_t size,
+                         LoadCommandCallback callback, void* context)
     : file_(-1),
       memory_(memory),
       memory_size_(size),
@@ -82,7 +82,7 @@
   cpu_subtype_t valid_cpu_subtype = cpu_subtype;
   // if |cpu_type| is 0, use the native cpu type.
   if (cpu_type == 0) {
-    const NXArchInfo *arch = NXGetLocalArchInfo();
+    const NXArchInfo* arch = NXGetLocalArchInfo();
     assert(arch);
     valid_cpu_type = arch->cputype;
     valid_cpu_subtype = CPU_SUBTYPE_MULTIPLE;
@@ -98,7 +98,7 @@
   return false;
 }
 
-bool MachoWalker::ReadBytes(void *buffer, size_t size, off_t offset) {
+bool MachoWalker::ReadBytes(void* buffer, size_t size, off_t offset) {
   if (memory_) {
     if (offset < 0)
       return false;
@@ -109,14 +109,14 @@
       size = memory_size_ - static_cast<size_t>(offset);
       result = false;
     }
-    memcpy(buffer, static_cast<char *>(memory_) + offset, size);
+    memcpy(buffer, static_cast<char*>(memory_) + offset, size);
     return result;
   } else {
     return pread(file_, buffer, size, offset) == (ssize_t)size;
   }
 }
 
-bool MachoWalker::CurrentHeader(struct mach_header_64 *header, off_t *offset) {
+bool MachoWalker::CurrentHeader(struct mach_header_64* header, off_t* offset) {
   if (current_header_) {
     memcpy(header, current_header_, sizeof(mach_header_64));
     *offset = current_header_offset_;
@@ -128,7 +128,7 @@
 
 bool MachoWalker::FindHeader(cpu_type_t cpu_type,
                              cpu_subtype_t cpu_subtype,
-                             off_t &offset) {
+                             off_t& offset) {
   // Read the magic bytes that's common amongst all mach-o files
   uint32_t magic;
   if (!ReadBytes(&magic, sizeof(magic), 0))
@@ -211,7 +211,7 @@
   // Copy the data into the mach_header_64 structure.  Since the 32-bit and
   // 64-bit only differ in the last field (reserved), this is safe to do.
   struct mach_header_64 header64;
-  memcpy((void *)&header64, (const void *)&header, sizeof(header));
+  memcpy((void*)&header64, (const void*)&header, sizeof(header));
   header64.reserved = 0;
 
   current_header_ = &header64;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_walker.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_walker.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_walker.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/macho_walker.h	2021-12-09 12:01:26.000000000 +0000
@@ -49,12 +49,12 @@
   // beginning of the file (not header) where the command was read.  If |swap|
   // is set, then any command data (other than the returned load_command) should
   // be swapped when read
-  typedef bool (*LoadCommandCallback)(MachoWalker *walker, load_command *cmd,
-                                      off_t offset, bool swap, void *context);
+  typedef bool (*LoadCommandCallback)(MachoWalker* walker, load_command* cmd,
+                                      off_t offset, bool swap, void* context);
 
-  MachoWalker(const char *path, LoadCommandCallback callback, void *context);
-  MachoWalker(void *memory, size_t size, LoadCommandCallback callback,
-              void *context);
+  MachoWalker(const char* path, LoadCommandCallback callback, void* context);
+  MachoWalker(void* memory, size_t size, LoadCommandCallback callback,
+              void* context);
   ~MachoWalker();
 
   // Begin walking the header for |cpu_type| and |cpu_subtype|.  If |cpu_type|
@@ -67,17 +67,17 @@
   bool WalkHeader(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype);
 
   // Read |size| bytes from the opened file at |offset| into |buffer|
-  bool ReadBytes(void *buffer, size_t size, off_t offset);
+  bool ReadBytes(void* buffer, size_t size, off_t offset);
 
   // Return the current header and header offset
-  bool CurrentHeader(struct mach_header_64 *header, off_t *offset);
+  bool CurrentHeader(struct mach_header_64* header, off_t* offset);
 
  private:
   // Locate (if any) the header offset for |cpu_type| and return in |offset|.
   // Return true if found, false otherwise.
   bool FindHeader(cpu_type_t cpu_type,
                   cpu_subtype_t cpu_subtype,
-                  off_t &offset);
+                  off_t& offset);
 
   // Process an individual header starting at |offset| from the start of the
   // file.  Return true if successful, false otherwise.
@@ -91,27 +91,27 @@
   int file_;
 
   // Memory location to read from.
-  void *memory_;
+  void* memory_;
 
   // Size of the memory segment we can read from.
   size_t memory_size_;
 
   // User specified callback & context
   LoadCommandCallback callback_;
-  void *callback_context_;
+  void* callback_context_;
 
   // Current header, size, and offset.  The mach_header_64 is used for both
   // 32-bit and 64-bit headers because they only differ in their last field
   // (reserved).  By adding the |current_header_size_| and the
   // |current_header_offset_|, you can determine the offset in the file just
   // after the header.
-  struct mach_header_64 *current_header_;
+  struct mach_header_64* current_header_;
   unsigned long current_header_size_;
   off_t current_header_offset_;
 
  private:
-  MachoWalker(const MachoWalker &);
-  MachoWalker &operator=(const MachoWalker &);
+  MachoWalker(const MachoWalker&);
+  MachoWalker& operator=(const MachoWalker&);
 };
 
 }  // namespace MacFileUtilities
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/string_utilities.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/string_utilities.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/string_utilities.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/string_utilities.cc	2021-12-09 12:01:26.000000000 +0000
@@ -48,12 +48,12 @@
   CFStringGetBytes(str, CFRangeMake(0, length), kCFStringEncodingUTF8, 0,
                    false, buffer.get(), maxUTF8Length, &actualUTF8Length);
   buffer[actualUTF8Length] = 0;
-  result.assign((const char *)buffer.get());
+  result.assign((const char*)buffer.get());
 
   return result;
 }
 
-unsigned int IntegerValueAtIndex(string &str, unsigned int idx) {
+unsigned int IntegerValueAtIndex(string& str, unsigned int idx) {
   string digits("0123456789"), temp;
   size_t start = 0;
   size_t end;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/string_utilities.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/string_utilities.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/string_utilities.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/string_utilities.h	2021-12-09 12:01:26.000000000 +0000
@@ -45,7 +45,7 @@
 
 // Return the idx'th decimal integer in str, separated by non-decimal-digits
 // E.g., str = 10.4.8, idx = 1 -> 4
-unsigned int IntegerValueAtIndex(string &str, unsigned int idx);
+unsigned int IntegerValueAtIndex(string& str, unsigned int idx);
 
 }  // namespace MacStringUtils
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/super_fat_arch.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/super_fat_arch.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/super_fat_arch.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/super_fat_arch.h	2021-12-09 12:01:26.000000000 +0000
@@ -57,7 +57,7 @@
       align(0) {
   }
 
-  explicit SuperFatArch(const struct fat_arch &arch) :
+  explicit SuperFatArch(const struct fat_arch& arch) :
       cputype(arch.cputype),
       cpusubtype(arch.cpusubtype),
       offset(arch.offset),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/SymbolCollectorClient.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/SymbolCollectorClient.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/SymbolCollectorClient.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/mac/SymbolCollectorClient.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,103 @@
+// Copyright (c) 2020, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Represents a response from a sym-upload-v2 server to a createUploadURLOnServer
+ call.
+ */
+@interface UploadURLResponse : NSObject {
+ @protected
+  NSString* uploadURL_;
+  NSString* uploadKey_;
+}
+
+- (id)initWithUploadURL:(NSString*)uploadURL withUploadKey:(NSString*)uploadKey;
+
+- (NSString*)uploadURL;
+- (NSString*)uploadKey;
+@end
+
+/**
+ Possible return statuses from a sym-upload-v2 server to a
+ completeUploadOnServer call.
+ */
+typedef NS_ENUM(NSInteger, CompleteUploadResult) {
+  CompleteUploadResultOk,
+  CompleteUploadResultDuplicateData,
+  CompleteUploadResultError
+};
+
+/**
+ Possible return statuses from a sym-upload-v2 server to a
+ checkSymbolStatusOnServer call.
+ */
+typedef NS_ENUM(NSInteger, SymbolStatus) {
+  SymbolStatusFound,
+  SymbolStatusMissing,
+  SymbolStatusUnknown
+};
+
+/**
+ Interface to help a client interact with a sym-upload-v2 server, over HTTP.
+ For details of the API and protocol, see :/docs/sym_upload_v2_protocol.md.
+ */
+@interface SymbolCollectorClient : NSObject
+;
+
+/**
+ Calls the /v1/symbols/{debug_file}/{debug_id}:checkStatus API on the server.
+ */
++ (SymbolStatus)checkSymbolStatusOnServer:(NSString*)APIURL
+                               withAPIKey:(NSString*)APIKey
+                            withDebugFile:(NSString*)debugFile
+                              withDebugID:(NSString*)debugID;
+
+/**
+ Calls the /v1/uploads:create API on the server.
+ */
++ (UploadURLResponse*)createUploadURLOnServer:(NSString*)APIURL
+                                   withAPIKey:(NSString*)APIKey;
+
+/**
+ Calls the /v1/uploads/{key}:complete API on the server.
+ */
++ (CompleteUploadResult)completeUploadOnServer:(NSString*)APIURL
+                                    withAPIKey:(NSString*)APIKey
+                                 withUploadKey:(NSString*)uploadKey
+                                 withDebugFile:(NSString*)debugFile
+                                   withDebugID:(NSString*)debugID
+                                      withType:(NSString*)type;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/macros.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/macros.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/macros.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/macros.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef BREAKPAD_COMMON_MACROS_H_
+#define BREAKPAD_COMMON_MACROS_H_
+
+// Ensure that this macro definition stays in a private header file: clang
+// suggests the first macro expanding to [[clang::fallthrough]] in its
+// diagnostics, so if BP_FALLTHROUGH is visible in code depending on breakpad,
+// clang would suggest BP_FALLTHROUGH for code depending on breakpad, instead of
+// the client code's own fallthrough macro.
+// TODO(thakis): Once everyone uses C++17, use its [[fallthrough]] instead.
+#if defined(__clang__)
+#define BP_FALLTHROUGH [[clang::fallthrough]]
+#else
+#define BP_FALLTHROUGH
+#endif
+
+#endif // BREAKPAD_COMMON_MACROS_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/md5.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/md5.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/md5.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/md5.cc	2021-12-09 12:01:26.000000000 +0000
@@ -31,7 +31,7 @@
   do {
     t = (u32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
       ((unsigned) buf[1] << 8 | buf[0]);
-    *(u32 *) buf = t;
+    *(u32*) buf = t;
     buf += 4;
   } while (--longs);
 }
@@ -74,7 +74,7 @@
   /* Handle any leading odd-sized chunks */
 
   if (t) {
-    unsigned char *p = (unsigned char *) ctx->in + t;
+    unsigned char *p = (unsigned char*) ctx->in + t;
 
     t = 64 - t;
     if (len < t) {
@@ -83,7 +83,7 @@
     }
     memcpy(p, buf, t);
     byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (u32 *) ctx->in);
+    MD5Transform(ctx->buf, (u32*) ctx->in);
     buf += t;
     len -= t;
   }
@@ -92,7 +92,7 @@
   while (len >= 64) {
     memcpy(ctx->in, buf, 64);
     byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (u32 *) ctx->in);
+    MD5Transform(ctx->buf, (u32*) ctx->in);
     buf += 64;
     len -= 64;
   }
@@ -127,7 +127,7 @@
     /* Two lots of padding:  Pad the first block to 64 bytes */
     memset(p, 0, count);
     byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (u32 *) ctx->in);
+    MD5Transform(ctx->buf, (u32*) ctx->in);
 
     /* Now fill the next block with 56 bytes */
     memset(ctx->in, 0, 56);
@@ -141,8 +141,8 @@
   memcpy(&ctx->in[14], &ctx->bits[0], sizeof(u32));
   memcpy(&ctx->in[15], &ctx->bits[1], sizeof(u32));
 
-  MD5Transform(ctx->buf, (u32 *) ctx->in);
-  byteReverse((unsigned char *) ctx->buf, 4);
+  MD5Transform(ctx->buf, (u32*) ctx->in);
+  byteReverse((unsigned char*) ctx->buf, 4);
   memcpy(digest, ctx->buf, 16);
   memset(ctx, 0, sizeof(*ctx));        /* In case it's sensitive */
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/memory_allocator.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/memory_allocator.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/memory_allocator.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/memory_allocator.h	2021-12-09 12:01:26.000000000 +0000
@@ -71,12 +71,12 @@
     FreeAll();
   }
 
-  void *Alloc(size_t bytes) {
+  void* Alloc(size_t bytes) {
     if (!bytes)
       return NULL;
 
     if (current_page_ && page_size_ - page_offset_ >= bytes) {
-      uint8_t *const ret = current_page_ + page_offset_;
+      uint8_t* const ret = current_page_ + page_offset_;
       page_offset_ += bytes;
       if (page_offset_ == page_size_) {
         page_offset_ = 0;
@@ -88,7 +88,7 @@
 
     const size_t pages =
         (bytes + sizeof(PageHeader) + page_size_ - 1) / page_size_;
-    uint8_t *const ret = GetNPages(pages);
+    uint8_t* const ret = GetNPages(pages);
     if (!ret)
       return NULL;
 
@@ -115,8 +115,8 @@
   unsigned long pages_allocated() { return pages_allocated_; }
 
  private:
-  uint8_t *GetNPages(size_t num_pages) {
-    void *a = sys_mmap(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE,
+  uint8_t* GetNPages(size_t num_pages) {
+    void* a = sys_mmap(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE,
                        MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
     if (a == MAP_FAILED)
       return NULL;
@@ -127,7 +127,7 @@
     __msan_unpoison(a, page_size_ * num_pages);
 #endif
 
-    struct PageHeader *header = reinterpret_cast<PageHeader*>(a);
+    struct PageHeader* header = reinterpret_cast<PageHeader*>(a);
     header->next = last_;
     header->num_pages = num_pages;
     last_ = header;
@@ -138,22 +138,22 @@
   }
 
   void FreeAll() {
-    PageHeader *next;
+    PageHeader* next;
 
-    for (PageHeader *cur = last_; cur; cur = next) {
+    for (PageHeader* cur = last_; cur; cur = next) {
       next = cur->next;
       sys_munmap(cur, cur->num_pages * page_size_);
     }
   }
 
   struct PageHeader {
-    PageHeader *next;  // pointer to the start of the next set of pages.
+    PageHeader* next;  // pointer to the start of the next set of pages.
     size_t num_pages;  // the number of pages in this set.
   };
 
   const size_t page_size_;
-  PageHeader *last_;
-  uint8_t *current_page_;
+  PageHeader* last_;
+  uint8_t* current_page_;
   size_t page_offset_;
   unsigned long pages_allocated_;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/memory_allocator_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/memory_allocator_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/memory_allocator_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/memory_allocator_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -46,7 +46,7 @@
 
   EXPECT_EQ(0U, allocator.pages_allocated());
   for (unsigned i = 1; i < 1024; ++i) {
-    uint8_t *p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+    uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
     ASSERT_FALSE(p == NULL);
     memset(p, 0, i);
   }
@@ -56,11 +56,11 @@
   PageAllocator allocator;
 
   EXPECT_EQ(0U, allocator.pages_allocated());
-  uint8_t *p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
+  uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
   ASSERT_FALSE(p == NULL);
   EXPECT_EQ(3U, allocator.pages_allocated());
   for (unsigned i = 1; i < 10; ++i) {
-    uint8_t *p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+    uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
     ASSERT_FALSE(p == NULL);
     memset(p, 0, i);
   }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module.cc	2021-12-09 12:01:26.000000000 +0000
@@ -47,9 +47,9 @@
 using std::hex;
 
 
-Module::Module(const string &name, const string &os,
-               const string &architecture, const string &id,
-               const string &code_id /* = "" */) :
+Module::Module(const string& name, const string& os,
+               const string& architecture, const string& id,
+               const string& code_id /* = "" */) :
     name_(name),
     os_(os),
     architecture_(architecture),
@@ -64,7 +64,7 @@
        it != functions_.end(); ++it) {
     delete *it;
   }
-  for (vector<StackFrameEntry *>::iterator it = stack_frame_entries_.begin();
+  for (vector<StackFrameEntry*>::iterator it = stack_frame_entries_.begin();
        it != stack_frame_entries_.end(); ++it) {
     delete *it;
   }
@@ -76,11 +76,19 @@
   load_address_ = address;
 }
 
-void Module::AddFunction(Function *function) {
+void Module::SetAddressRanges(const vector<Range>& ranges) {
+  address_ranges_ = ranges;
+}
+
+void Module::AddFunction(Function* function) {
   // FUNC lines must not hold an empty name, so catch the problem early if
   // callers try to add one.
   assert(!function->name.empty());
 
+  if (!AddressIsInModule(function->address)) {
+    return;
+  }
+
   // FUNCs are better than PUBLICs as they come with sizes, so remove an extern
   // with the same address if present.
   Extern ext(function->address);
@@ -116,17 +124,25 @@
   }
 }
 
-void Module::AddFunctions(vector<Function *>::iterator begin,
-                          vector<Function *>::iterator end) {
-  for (vector<Function *>::iterator it = begin; it != end; ++it)
+void Module::AddFunctions(vector<Function*>::iterator begin,
+                          vector<Function*>::iterator end) {
+  for (vector<Function*>::iterator it = begin; it != end; ++it)
     AddFunction(*it);
 }
 
-void Module::AddStackFrameEntry(StackFrameEntry *stack_frame_entry) {
+void Module::AddStackFrameEntry(StackFrameEntry* stack_frame_entry) {
+  if (!AddressIsInModule(stack_frame_entry->address)) {
+    return;
+  }
+
   stack_frame_entries_.push_back(stack_frame_entry);
 }
 
-void Module::AddExtern(Extern *ext) {
+void Module::AddExtern(Extern* ext) {
+  if (!AddressIsInModule(ext->address)) {
+    return;
+  }
+
   std::pair<ExternSet::iterator,bool> ret = externs_.insert(ext);
   if (!ret.second) {
     // Free the duplicate that was not inserted because this Module
@@ -135,17 +151,17 @@
   }
 }
 
-void Module::GetFunctions(vector<Function *> *vec,
-                          vector<Function *>::iterator i) {
+void Module::GetFunctions(vector<Function*>* vec,
+                          vector<Function*>::iterator i) {
   vec->insert(i, functions_.begin(), functions_.end());
 }
 
-void Module::GetExterns(vector<Extern *> *vec,
-                        vector<Extern *>::iterator i) {
+void Module::GetExterns(vector<Extern*>* vec,
+                        vector<Extern*>::iterator i) {
   vec->insert(i, externs_.begin(), externs_.end());
 }
 
-Module::File *Module::FindFile(const string &name) {
+Module::File* Module::FindFile(const string& name) {
   // A tricky bit here.  The key of each map entry needs to be a
   // pointer to the entry's File's name string.  This means that we
   // can't do the initial lookup with any operation that would create
@@ -159,7 +175,7 @@
   FileByNameMap::iterator destiny = files_.lower_bound(&name);
   if (destiny == files_.end()
       || *destiny->first != name) {  // Repeated string comparison, boo hoo.
-    File *file = new File(name);
+    File* file = new File(name);
     file->source_id = -1;
     destiny = files_.insert(destiny,
                             FileByNameMap::value_type(&file->name, file));
@@ -167,23 +183,23 @@
   return destiny->second;
 }
 
-Module::File *Module::FindFile(const char *name) {
+Module::File* Module::FindFile(const char* name) {
   string name_string = name;
   return FindFile(name_string);
 }
 
-Module::File *Module::FindExistingFile(const string &name) {
+Module::File* Module::FindExistingFile(const string& name) {
   FileByNameMap::iterator it = files_.find(&name);
   return (it == files_.end()) ? NULL : it->second;
 }
 
-void Module::GetFiles(vector<File *> *vec) {
+void Module::GetFiles(vector<File*>* vec) {
   vec->clear();
   for (FileByNameMap::iterator it = files_.begin(); it != files_.end(); ++it)
     vec->push_back(it->second);
 }
 
-void Module::GetStackFrameEntries(vector<StackFrameEntry *> *vec) const {
+void Module::GetStackFrameEntries(vector<StackFrameEntry*>* vec) const {
   *vec = stack_frame_entries_;
 }
 
@@ -198,7 +214,7 @@
   // info, by setting each one's source id to zero.
   for (FunctionSet::const_iterator func_it = functions_.begin();
        func_it != functions_.end(); ++func_it) {
-    Function *func = *func_it;
+    Function* func = *func_it;
     for (vector<Line>::iterator line_it = func->lines.begin();
          line_it != func->lines.end(); ++line_it)
       line_it->file->source_id = 0;
@@ -222,7 +238,7 @@
   return false;
 }
 
-bool Module::WriteRuleMap(const RuleMap &rule_map, std::ostream &stream) {
+bool Module::WriteRuleMap(const RuleMap& rule_map, std::ostream& stream) {
   for (RuleMap::const_iterator it = rule_map.begin();
        it != rule_map.end(); ++it) {
     if (it != rule_map.begin())
@@ -232,7 +248,20 @@
   return stream.good();
 }
 
-bool Module::Write(std::ostream &stream, SymbolData symbol_data) {
+bool Module::AddressIsInModule(Address address) const {
+  if (address_ranges_.empty()) {
+    return true;
+  }
+  for (const auto& segment : address_ranges_) {
+    if (address >= segment.address &&
+        address < segment.address + segment.size) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool Module::Write(std::ostream& stream, SymbolData symbol_data) {
   stream << "MODULE " << os_ << " " << architecture_ << " "
          << id_ << " " << name_ << "\n";
   if (!stream.good())
@@ -248,7 +277,7 @@
     // Write out files.
     for (FileByNameMap::iterator file_it = files_.begin();
          file_it != files_.end(); ++file_it) {
-      File *file = file_it->second;
+      File* file = file_it->second;
       if (file->source_id >= 0) {
         stream << "FILE " << file->source_id << " " <<  file->name << "\n";
         if (!stream.good())
@@ -259,7 +288,7 @@
     // Write out functions and their lines.
     for (FunctionSet::const_iterator func_it = functions_.begin();
          func_it != functions_.end(); ++func_it) {
-      Function *func = *func_it;
+      Function* func = *func_it;
       vector<Line>::iterator line_it = func->lines.begin();
       for (auto range_it = func->ranges.cbegin();
            range_it != func->ranges.cend(); ++range_it) {
@@ -293,7 +322,7 @@
     // Write out 'PUBLIC' records.
     for (ExternSet::const_iterator extern_it = externs_.begin();
          extern_it != externs_.end(); ++extern_it) {
-      Extern *ext = *extern_it;
+      Extern* ext = *extern_it;
       stream << "PUBLIC " << hex
              << (ext->address - load_address_) << " 0 "
              << ext->name << dec << "\n";
@@ -302,10 +331,10 @@
 
   if (symbol_data != NO_CFI) {
     // Write out 'STACK CFI INIT' and 'STACK CFI' records.
-    vector<StackFrameEntry *>::const_iterator frame_it;
+    vector<StackFrameEntry*>::const_iterator frame_it;
     for (frame_it = stack_frame_entries_.begin();
          frame_it != stack_frame_entries_.end(); ++frame_it) {
-      StackFrameEntry *entry = *frame_it;
+      StackFrameEntry* entry = *frame_it;
       stream << "STACK CFI INIT " << hex
              << (entry->address - load_address_) << " "
              << entry->size << " " << dec;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module.h	2021-12-09 12:01:26.000000000 +0000
@@ -39,6 +39,7 @@
 #define COMMON_LINUX_MODULE_H__
 
 #include <iostream>
+#include <limits>
 #include <map>
 #include <set>
 #include <string>
@@ -62,6 +63,7 @@
  public:
   // The type of addresses and sizes in a symbol table.
   typedef uint64_t Address;
+  static constexpr uint64_t kMaxAddress = std::numeric_limits<Address>::max();
   struct File;
   struct Function;
   struct Line;
@@ -74,7 +76,7 @@
 
   // A source file.
   struct File {
-    explicit File(const string &name_input) : name(name_input), source_id(0) {}
+    explicit File(const string& name_input) : name(name_input), source_id(0) {}
 
     // The name of the source file.
     const string name;
@@ -96,17 +98,17 @@
 
   // A function.
   struct Function {
-    Function(const string &name_input, const Address &address_input) :
+    Function(const string& name_input, const Address& address_input) :
         name(name_input), address(address_input), parameter_size(0) {}
 
     // For sorting by address.  (Not style-guide compliant, but it's
     // stupid not to put this in the struct.)
-    static bool CompareByAddress(const Function *x, const Function *y) {
+    static bool CompareByAddress(const Function* x, const Function* y) {
       return x->address < y->address;
     }
 
     // The function's name.
-    const string name;
+    string name;
 
     // The start address and the address ranges covered by the function.
     const Address address;
@@ -124,18 +126,18 @@
   struct Line {
     // For sorting by address.  (Not style-guide compliant, but it's
     // stupid not to put this in the struct.)
-    static bool CompareByAddress(const Module::Line &x, const Module::Line &y) {
+    static bool CompareByAddress(const Module::Line& x, const Module::Line& y) {
       return x.address < y.address;
     }
 
     Address address, size;    // The address and size of the line's code.
-    File *file;                // The source file.
+    File* file;                // The source file.
     int number;                // The source line number.
   };
 
   // An exported symbol.
   struct Extern {
-    explicit Extern(const Address &address_input) : address(address_input) {}
+    explicit Extern(const Address& address_input) : address(address_input) {}
     const Address address;
     string name;
   };
@@ -170,8 +172,7 @@
   };
 
   struct FunctionCompare {
-    bool operator() (const Function *lhs,
-                     const Function *rhs) const {
+    bool operator() (const Function* lhs, const Function* rhs) const {
       if (lhs->address == rhs->address)
         return lhs->name < rhs->name;
       return lhs->address < rhs->address;
@@ -179,16 +180,15 @@
   };
 
   struct ExternCompare {
-    bool operator() (const Extern *lhs,
-                     const Extern *rhs) const {
+    bool operator() (const Extern* lhs, const Extern* rhs) const {
       return lhs->address < rhs->address;
     }
   };
 
   // Create a new module with the given name, operating system,
   // architecture, and ID string.
-  Module(const string &name, const string &os, const string &architecture,
-         const string &id, const string &code_id = "");
+  Module(const string& name, const string& os, const string& architecture,
+         const string& id, const string& code_id = "");
   ~Module();
 
   // Set the module's load address to LOAD_ADDRESS; addresses given
@@ -205,65 +205,73 @@
   // Write is used.
   void SetLoadAddress(Address load_address);
 
+  // Sets address filtering on elements added to the module.  This allows
+  // libraries with extraneous debug symbols to generate symbol files containing
+  // only relevant symbols.  For example, an LLD-generated partition library may
+  // contain debug information pertaining to all partitions derived from a
+  // single "combined" library.  Filtering applies only to elements added after
+  // this method is called.
+  void SetAddressRanges(const vector<Range>& ranges);
+
   // Add FUNCTION to the module. FUNCTION's name must not be empty.
   // This module owns all Function objects added with this function:
   // destroying the module destroys them as well.
-  void AddFunction(Function *function);
+  void AddFunction(Function* function);
 
   // Add all the functions in [BEGIN,END) to the module.
   // This module owns all Function objects added with this function:
   // destroying the module destroys them as well.
-  void AddFunctions(vector<Function *>::iterator begin,
-                    vector<Function *>::iterator end);
+  void AddFunctions(vector<Function*>::iterator begin,
+                    vector<Function*>::iterator end);
 
   // Add STACK_FRAME_ENTRY to the module.
   // This module owns all StackFrameEntry objects added with this
   // function: destroying the module destroys them as well.
-  void AddStackFrameEntry(StackFrameEntry *stack_frame_entry);
+  void AddStackFrameEntry(StackFrameEntry* stack_frame_entry);
 
   // Add PUBLIC to the module.
   // This module owns all Extern objects added with this function:
   // destroying the module destroys them as well.
-  void AddExtern(Extern *ext);
+  void AddExtern(Extern* ext);
 
   // If this module has a file named NAME, return a pointer to it. If
   // it has none, then create one and return a pointer to the new
   // file. This module owns all File objects created using these
   // functions; destroying the module destroys them as well.
-  File *FindFile(const string &name);
-  File *FindFile(const char *name);
+  File* FindFile(const string& name);
+  File* FindFile(const char* name);
 
   // If this module has a file named NAME, return a pointer to it.
   // Otherwise, return NULL.
-  File *FindExistingFile(const string &name);
+  File* FindExistingFile(const string& name);
 
   // Insert pointers to the functions added to this module at I in
   // VEC. The pointed-to Functions are still owned by this module.
   // (Since this is effectively a copy of the function list, this is
   // mostly useful for testing; other uses should probably get a more
   // appropriate interface.)
-  void GetFunctions(vector<Function *> *vec, vector<Function *>::iterator i);
+  void GetFunctions(vector<Function*>* vec, vector<Function*>::iterator i);
 
   // Insert pointers to the externs added to this module at I in
   // VEC. The pointed-to Externs are still owned by this module.
   // (Since this is effectively a copy of the extern list, this is
   // mostly useful for testing; other uses should probably get a more
   // appropriate interface.)
-  void GetExterns(vector<Extern *> *vec, vector<Extern *>::iterator i);
+  void GetExterns(vector<Extern*>* vec, vector<Extern*>::iterator i);
 
   // Clear VEC and fill it with pointers to the Files added to this
   // module, sorted by name. The pointed-to Files are still owned by
   // this module. (Since this is effectively a copy of the file list,
   // this is mostly useful for testing; other uses should probably get
   // a more appropriate interface.)
-  void GetFiles(vector<File *> *vec);
+  void GetFiles(vector<File*>* vec);
 
   // Clear VEC and fill it with pointers to the StackFrameEntry
   // objects that have been added to this module. (Since this is
   // effectively a copy of the stack frame entry list, this is mostly
   // useful for testing; other uses should probably get
   // a more appropriate interface.)
-  void GetStackFrameEntries(vector<StackFrameEntry *> *vec) const;
+  void GetStackFrameEntries(vector<StackFrameEntry*>* vec) const;
 
   // Find those files in this module that are actually referred to by
   // functions' line number data, and assign them source id numbers.
@@ -284,7 +292,7 @@
   // - all CFI records.
   // Addresses in the output are all relative to the load address
   // established by SetLoadAddress.
-  bool Write(std::ostream &stream, SymbolData symbol_data);
+  bool Write(std::ostream& stream, SymbolData symbol_data);
 
   string name() const { return name_; }
   string os() const { return os_; }
@@ -300,7 +308,11 @@
   // Write RULE_MAP to STREAM, in the form appropriate for 'STACK CFI'
   // records, without a final newline. Return true if all goes well;
   // if an error occurs, return false, and leave errno set.
-  static bool WriteRuleMap(const RuleMap &rule_map, std::ostream &stream);
+  static bool WriteRuleMap(const RuleMap& rule_map, std::ostream& stream);
+
+  // Returns true of the specified address resides with an specified address
+  // range, or if no ranges have been specified.
+  bool AddressIsInModule(Address address) const;
 
   // Module header entries.
   string name_, os_, architecture_, id_, code_id_;
@@ -310,21 +322,25 @@
   // address.
   Address load_address_;
 
+  // The set of valid address ranges of the module.  If specified, attempts to
+  // add elements residing outside these ranges will be silently filtered.
+  vector<Range> address_ranges_;
+
   // Relation for maps whose keys are strings shared with some other
   // structure.
   struct CompareStringPtrs {
-    bool operator()(const string *x, const string *y) const { return *x < *y; }
+    bool operator()(const string* x, const string* y) const { return *x < *y; }
   };
 
   // A map from filenames to File structures.  The map's keys are
   // pointers to the Files' names.
-  typedef map<const string *, File *, CompareStringPtrs> FileByNameMap;
+  typedef map<const string*, File*, CompareStringPtrs> FileByNameMap;
 
   // A set containing Function structures, sorted by address.
-  typedef set<Function *, FunctionCompare> FunctionSet;
+  typedef set<Function*, FunctionCompare> FunctionSet;
 
   // A set containing Extern structures, sorted by address.
-  typedef set<Extern *, ExternCompare> ExternSet;
+  typedef set<Extern*, ExternCompare> ExternSet;
 
   // The module owns all the files and functions that have been added
   // to it; destroying the module frees the Files and Functions these
@@ -334,7 +350,7 @@
 
   // The module owns all the call frame info entries that have been
   // added to it.
-  vector<StackFrameEntry *> stack_frame_entries_;
+  vector<StackFrameEntry*> stack_frame_entries_;
 
   // The module owns all the externs that have been added to it;
   // destroying the module frees the Externs these point to.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/module_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -49,12 +49,12 @@
 using std::vector;
 using testing::ContainerEq;
 
-static Module::Function *generate_duplicate_function(const string &name) {
-  const Module::Address DUP_ADDRESS = 0xd35402aac7a7ad5cLL;
-  const Module::Address DUP_SIZE = 0x200b26e605f99071LL;
-  const Module::Address DUP_PARAMETER_SIZE = 0xf14ac4fed48c4a99LL;
+static Module::Function* generate_duplicate_function(const string& name) {
+  const Module::Address DUP_ADDRESS = 0xd35402aac7a7ad5cULL;
+  const Module::Address DUP_SIZE = 0x200b26e605f99071ULL;
+  const Module::Address DUP_PARAMETER_SIZE = 0xf14ac4fed48c4a99ULL;
 
-  Module::Function *function = new Module::Function(name, DUP_ADDRESS);
+  Module::Function* function = new Module::Function(name, DUP_ADDRESS);
   Module::Range range(DUP_ADDRESS, DUP_SIZE);
   function->ranges.push_back(range);
   function->parameter_size = DUP_PARAMETER_SIZE;
@@ -90,13 +90,13 @@
   stringstream s;
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
-  Module::File *file = m.FindFile("file_name.cc");
-  Module::Function *function = new Module::Function(
-      "function_name", 0xe165bf8023b9d9abLL);
-  Module::Range range(0xe165bf8023b9d9abLL, 0x1e4bb0eb1cbf5b09LL);
+  Module::File* file = m.FindFile("file_name.cc");
+  Module::Function* function = new Module::Function(
+      "function_name", 0xe165bf8023b9d9abULL);
+  Module::Range range(0xe165bf8023b9d9abULL, 0x1e4bb0eb1cbf5b09ULL);
   function->ranges.push_back(range);
-  function->parameter_size = 0x772beee89114358aLL;
-  Module::Line line = { 0xe165bf8023b9d9abLL, 0x1e4bb0eb1cbf5b09LL,
+  function->parameter_size = 0x772beee89114358aULL;
+  Module::Line line = { 0xe165bf8023b9d9abULL, 0x1e4bb0eb1cbf5b09ULL,
                         file, 67519080 };
   function->lines.push_back(line);
   m.AddFunction(function);
@@ -116,20 +116,20 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // Some source files.  We will expect to see them in lexicographic order.
-  Module::File *file1 = m.FindFile("filename-b.cc");
-  Module::File *file2 = m.FindFile("filename-a.cc");
+  Module::File* file1 = m.FindFile("filename-b.cc");
+  Module::File* file2 = m.FindFile("filename-a.cc");
 
   // A function.
-  Module::Function *function = new Module::Function(
-      "A_FLIBBERTIJIBBET::a_will_o_the_wisp(a clown)", 0xbec774ea5dd935f3LL);
-  Module::Range range(0xbec774ea5dd935f3LL, 0x2922088f98d3f6fcLL);
+  Module::Function* function = new Module::Function(
+      "A_FLIBBERTIJIBBET::a_will_o_the_wisp(a clown)", 0xbec774ea5dd935f3ULL);
+  Module::Range range(0xbec774ea5dd935f3ULL, 0x2922088f98d3f6fcULL);
   function->ranges.push_back(range);
-  function->parameter_size = 0xe5e9aa008bd5f0d0LL;
+  function->parameter_size = 0xe5e9aa008bd5f0d0ULL;
 
   // Some source lines.  The module should not sort these.
-  Module::Line line1 = { 0xbec774ea5dd935f3LL, 0x1c2be6d6c5af2611LL,
+  Module::Line line1 = { 0xbec774ea5dd935f3ULL, 0x1c2be6d6c5af2611ULL,
                          file1, 41676901 };
-  Module::Line line2 = { 0xdaf35bc123885c04LL, 0xcf621b8d324d0ebLL,
+  Module::Line line2 = { 0xdaf35bc123885c04ULL, 0xcf621b8d324d0ebULL,
                          file2, 67519080 };
   function->lines.push_back(line2);
   function->lines.push_back(line1);
@@ -137,7 +137,7 @@
   m.AddFunction(function);
 
   // Some stack information.
-  Module::StackFrameEntry *entry = new Module::StackFrameEntry();
+  Module::StackFrameEntry* entry = new Module::StackFrameEntry();
   entry->address = 0x30f9e5c83323973dULL;
   entry->size = 0x49fc9ca7c7c13dc2ULL;
   entry->initial_rules[".cfa"] = "he was a handsome man";
@@ -149,7 +149,7 @@
 
   // Set the load address.  Doing this after adding all the data to
   // the module must work fine.
-  m.SetLoadAddress(0x2ab698b0b6407073LL);
+  m.SetLoadAddress(0x2ab698b0b6407073ULL);
 
   m.Write(s, ALL_SYMBOL_DATA);
   string contents = s.str();
@@ -173,21 +173,21 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // Create some source files.
-  Module::File *file1 = m.FindFile("filename1");
+  Module::File* file1 = m.FindFile("filename1");
   m.FindFile("filename2");  // not used by any line
-  Module::File *file3 = m.FindFile("filename3");
+  Module::File* file3 = m.FindFile("filename3");
 
   // Create a function.
-  Module::Function *function = new Module::Function(
-      "function_name", 0x9b926d464f0b9384LL);
-  Module::Range range(0x9b926d464f0b9384LL, 0x4f524a4ba795e6a6LL);
+  Module::Function* function = new Module::Function(
+      "function_name", 0x9b926d464f0b9384ULL);
+  Module::Range range(0x9b926d464f0b9384ULL, 0x4f524a4ba795e6a6ULL);
   function->ranges.push_back(range);
-  function->parameter_size = 0xbbe8133a6641c9b7LL;
+  function->parameter_size = 0xbbe8133a6641c9b7ULL;
 
   // Source files that refer to some files, but not others.
-  Module::Line line1 = { 0xab415089485e1a20LL, 0x126e3124979291f2LL,
+  Module::Line line1 = { 0xab415089485e1a20ULL, 0x126e3124979291f2ULL,
                          file1, 137850127 };
-  Module::Line line2 = { 0xb2675b5c3c2ed33fLL, 0x1df77f5551dbd68cLL,
+  Module::Line line2 = { 0xb2675b5c3c2ed33fULL, 0x1df77f5551dbd68cULL,
                          file3, 28113549 };
   function->lines.push_back(line1);
   function->lines.push_back(line2);
@@ -195,7 +195,7 @@
 
   m.AssignSourceIds();
 
-  vector<Module::File *> vec;
+  vector<Module::File*> vec;
   m.GetFiles(&vec);
   EXPECT_EQ((size_t) 3, vec.size());
   EXPECT_STREQ("filename1", vec[0]->name.c_str());
@@ -224,24 +224,24 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // Some source files.  We will expect to see them in lexicographic order.
-  Module::File *file1 = m.FindFile("filename.cc");
+  Module::File* file1 = m.FindFile("filename.cc");
 
   // A function.
-  Module::Function *function = new Module::Function(
-      "A_FLIBBERTIJIBBET::a_will_o_the_wisp(a clown)", 0xbec774ea5dd935f3LL);
-  Module::Range range(0xbec774ea5dd935f3LL, 0x2922088f98d3f6fcLL);
+  Module::Function* function = new Module::Function(
+      "A_FLIBBERTIJIBBET::a_will_o_the_wisp(a clown)", 0xbec774ea5dd935f3ULL);
+  Module::Range range(0xbec774ea5dd935f3ULL, 0x2922088f98d3f6fcULL);
   function->ranges.push_back(range);
-  function->parameter_size = 0xe5e9aa008bd5f0d0LL;
+  function->parameter_size = 0xe5e9aa008bd5f0d0ULL;
 
   // Some source lines.  The module should not sort these.
-  Module::Line line1 = { 0xbec774ea5dd935f3LL, 0x1c2be6d6c5af2611LL,
+  Module::Line line1 = { 0xbec774ea5dd935f3ULL, 0x1c2be6d6c5af2611ULL,
                          file1, 41676901 };
   function->lines.push_back(line1);
 
   m.AddFunction(function);
 
   // Some stack information.
-  Module::StackFrameEntry *entry = new Module::StackFrameEntry();
+  Module::StackFrameEntry* entry = new Module::StackFrameEntry();
   entry->address = 0x30f9e5c83323973dULL;
   entry->size = 0x49fc9ca7c7c13dc2ULL;
   entry->initial_rules[".cfa"] = "he was a handsome man";
@@ -253,7 +253,7 @@
 
   // Set the load address.  Doing this after adding all the data to
   // the module must work fine.
-  m.SetLoadAddress(0x2ab698b0b6407073LL);
+  m.SetLoadAddress(0x2ab698b0b6407073ULL);
 
   m.Write(s, NO_CFI);
   string contents = s.str();
@@ -270,20 +270,20 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // Two functions.
-  Module::Function *function1 = new Module::Function(
-      "_without_form", 0xd35024aa7ca7da5cLL);
-  Module::Range r1(0xd35024aa7ca7da5cLL, 0x200b26e605f99071LL);
+  Module::Function* function1 = new Module::Function(
+      "_without_form", 0xd35024aa7ca7da5cULL);
+  Module::Range r1(0xd35024aa7ca7da5cULL, 0x200b26e605f99071ULL);
   function1->ranges.push_back(r1);
-  function1->parameter_size = 0xf14ac4fed48c4a99LL;
+  function1->parameter_size = 0xf14ac4fed48c4a99ULL;
 
-  Module::Function *function2 = new Module::Function(
-      "_and_void", 0x2987743d0b35b13fLL);
-  Module::Range r2(0x2987743d0b35b13fLL, 0xb369db048deb3010LL);
+  Module::Function* function2 = new Module::Function(
+      "_and_void", 0x2987743d0b35b13fULL);
+  Module::Range r2(0x2987743d0b35b13fULL, 0xb369db048deb3010ULL);
   function2->ranges.push_back(r2);
-  function2->parameter_size = 0x938e556cb5a79988LL;
+  function2->parameter_size = 0x938e556cb5a79988ULL;
 
   // Put them in a vector.
-  vector<Module::Function *> vec;
+  vector<Module::Function*> vec;
   vec.push_back(function1);
   vec.push_back(function2);
 
@@ -311,13 +311,13 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // First STACK CFI entry, with no initial rules or deltas.
-  Module::StackFrameEntry *entry1 = new Module::StackFrameEntry();
+  Module::StackFrameEntry* entry1 = new Module::StackFrameEntry();
   entry1->address = 0xddb5f41285aa7757ULL;
   entry1->size = 0x1486493370dc5073ULL;
   m.AddStackFrameEntry(entry1);
 
   // Second STACK CFI entry, with initial rules but no deltas.
-  Module::StackFrameEntry *entry2 = new Module::StackFrameEntry();
+  Module::StackFrameEntry* entry2 = new Module::StackFrameEntry();
   entry2->address = 0x8064f3af5e067e38ULL;
   entry2->size = 0x0de2a5ee55509407ULL;
   entry2->initial_rules[".cfa"] = "I think that I shall never see";
@@ -326,7 +326,7 @@
   m.AddStackFrameEntry(entry2);
 
   // Third STACK CFI entry, with initial rules and deltas.
-  Module::StackFrameEntry *entry3 = new Module::StackFrameEntry();
+  Module::StackFrameEntry* entry3 = new Module::StackFrameEntry();
   entry3->address = 0x5e8d0db0a7075c6cULL;
   entry3->size = 0x1c7edb12a7aea229ULL;
   entry3->initial_rules[".cfa"] = "Whose woods are these";
@@ -360,7 +360,7 @@
                contents.c_str());
 
   // Check that GetStackFrameEntries works.
-  vector<Module::StackFrameEntry *> entries;
+  vector<Module::StackFrameEntry*> entries;
   m.GetStackFrameEntries(&entries);
   ASSERT_EQ(3U, entries.size());
   // Check first entry.
@@ -395,10 +395,10 @@
 
 TEST(Construct, UniqueFiles) {
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
-  Module::File *file1 = m.FindFile("foo");
-  Module::File *file2 = m.FindFile(string("bar"));
-  Module::File *file3 = m.FindFile(string("foo"));
-  Module::File *file4 = m.FindFile("bar");
+  Module::File* file1 = m.FindFile("foo");
+  Module::File* file2 = m.FindFile(string("bar"));
+  Module::File* file3 = m.FindFile(string("foo"));
+  Module::File* file4 = m.FindFile("bar");
   EXPECT_NE(file1, file2);
   EXPECT_EQ(file1, file3);
   EXPECT_EQ(file2, file4);
@@ -411,8 +411,8 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // Two functions.
-  Module::Function *function1 = generate_duplicate_function("_without_form");
-  Module::Function *function2 = generate_duplicate_function("_without_form");
+  Module::Function* function1 = generate_duplicate_function("_without_form");
+  Module::Function* function2 = generate_duplicate_function("_without_form");
 
   m.AddFunction(function1);
   m.AddFunction(function2);
@@ -430,8 +430,8 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // Two functions.
-  Module::Function *function1 = generate_duplicate_function("_without_form");
-  Module::Function *function2 = generate_duplicate_function("_and_void");
+  Module::Function* function1 = generate_duplicate_function("_without_form");
+  Module::Function* function2 = generate_duplicate_function("_and_void");
 
   m.AddFunction(function1);
   m.AddFunction(function2);
@@ -453,9 +453,9 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // Two externs.
-  Module::Extern *extern1 = new Module::Extern(0xffff);
+  Module::Extern* extern1 = new Module::Extern(0xffff);
   extern1->name = "_abc";
-  Module::Extern *extern2 = new Module::Extern(0xaaaa);
+  Module::Extern* extern2 = new Module::Extern(0xaaaa);
   extern2->name = "_xyz";
 
   m.AddExtern(extern1);
@@ -478,9 +478,9 @@
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
 
   // Two externs.
-  Module::Extern *extern1 = new Module::Extern(0xffff);
+  Module::Extern* extern1 = new Module::Extern(0xffff);
   extern1->name = "_xyz";
-  Module::Extern *extern2 = new Module::Extern(0xffff);
+  Module::Extern* extern2 = new Module::Extern(0xffff);
   extern2->name = "_abc";
 
   m.AddExtern(extern1);
@@ -564,3 +564,53 @@
                "PUBLIC cc00 0 arm_func\n",
                contents.c_str());
 }
+
+TEST(Write, OutOfRangeAddresses) {
+  stringstream s;
+  Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
+
+  // Specify an allowed address range, representing a PT_LOAD segment in a
+  // module.
+  vector<Module::Range> address_ranges = {
+    Module::Range(0x2000ULL, 0x1000ULL),
+  };
+  m.SetAddressRanges(address_ranges);
+
+  // Add three stack frames (one lower, one in, and one higher than the allowed
+  // address range).  Only the middle frame should be captured.
+  Module::StackFrameEntry* entry1 = new Module::StackFrameEntry();
+  entry1->address = 0x1000ULL;
+  entry1->size = 0x100ULL;
+  m.AddStackFrameEntry(entry1);
+  Module::StackFrameEntry* entry2 = new Module::StackFrameEntry();
+  entry2->address = 0x2000ULL;
+  entry2->size = 0x100ULL;
+  m.AddStackFrameEntry(entry2);
+  Module::StackFrameEntry* entry3 = new Module::StackFrameEntry();
+  entry3->address = 0x3000ULL;
+  entry3->size = 0x100ULL;
+  m.AddStackFrameEntry(entry3);
+
+  // Add a function outside the allowed range.
+  Module::File* file = m.FindFile("file_name.cc");
+  Module::Function* function = new Module::Function(
+      "function_name", 0x4000ULL);
+  Module::Range range(0x4000ULL, 0x1000ULL);
+  function->ranges.push_back(range);
+  function->parameter_size = 0x100ULL;
+  Module::Line line = { 0x4000ULL, 0x100ULL, file, 67519080 };
+  function->lines.push_back(line);
+  m.AddFunction(function);
+
+  // Add an extern outside the allowed range.
+  Module::Extern* extern1 = new Module::Extern(0x5000ULL);
+  extern1->name = "_xyz";
+  m.AddExtern(extern1);
+
+  m.Write(s, ALL_SYMBOL_DATA);
+
+  EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
+               "STACK CFI INIT 2000 100 \n",
+               s.str().c_str());
+
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/dump_symbols.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/dump_symbols.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/dump_symbols.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/dump_symbols.cc	2021-12-09 12:01:26.000000000 +0000
@@ -97,7 +97,7 @@
 // Information of a function.
 struct FuncInfo {
   // Name of the function.
-  const char *name;
+  const char* name;
   // Offset from the base of the loading address.
   GElf_Off rva_to_base;
   // Virtual address of the function.
@@ -115,7 +115,7 @@
 // Information of a source file.
 struct SourceFileInfo {
   // Name of the source file.
-  const char *name;
+  const char* name;
   // Starting address of the source file.
   GElf_Addr addr;
   // Id of the source file.
@@ -125,12 +125,12 @@
 };
 
 struct CompareString {
-  bool operator()(const char *s1, const char *s2) const {
+  bool operator()(const char* s1, const char* s2) const {
     return strcmp(s1, s2) < 0;
   }
 };
 
-typedef std::map<const char *, struct SymbolEntry *, CompareString> SymbolMap;
+typedef std::map<const char*, struct SymbolEntry*, CompareString> SymbolMap;
 
 // Information of a symbol table.
 // This is the root of all types of symbol.
@@ -141,16 +141,16 @@
 };
 
 // Stab section name.
-const char *kStabName = ".stab";
+const char* kStabName = ".stab";
 
 // Stab str section name.
-const char *kStabStrName = ".stabstr";
+const char* kStabStrName = ".stabstr";
 
 // Symtab section name.
-const char *kSymtabName = ".symtab";
+const char* kSymtabName = ".symtab";
 
 // Strtab section name.
-const char *kStrtabName = ".strtab";
+const char* kStrtabName = ".strtab";
 
 // Default buffer lenght for demangle.
 const int demangleLen = 20000;
@@ -160,11 +160,11 @@
 
 // Update the offset to the start of the string index of the next
 // object module for every N_ENDM stabs.
-inline void RecalculateOffset(struct slist* cur_list, char *stabstr) {
+inline void RecalculateOffset(struct slist* cur_list, char* stabstr) {
   while ((--cur_list)->n_strx == 0) ;
   stringOffset += cur_list->n_strx;
 
-  char *temp = stabstr + stringOffset;
+  char* temp = stabstr + stringOffset;
   while (*temp != '\0') {
     ++stringOffset;
     ++temp;
@@ -174,10 +174,10 @@
 }
 
 // Demangle using demangle library on Solaris.
-std::string Demangle(const char *mangled) {
+std::string Demangle(const char* mangled) {
   int status = 0;
   std::string str(mangled);
-  char *demangled = (char *)malloc(demangleLen);
+  char* demangled = (char*)malloc(demangleLen);
 
   if (!demangled) {
     fprintf(stderr, "no enough memory.\n");
@@ -197,7 +197,7 @@
   return str; 
 }
 
-bool WriteFormat(int fd, const char *fmt, ...) {
+bool WriteFormat(int fd, const char* fmt, ...) {
   va_list list;
   char buffer[4096];
   ssize_t expected, written;
@@ -209,27 +209,27 @@
   return expected == written;
 }
 
-bool IsValidElf(const GElf_Ehdr *elf_header) {
+bool IsValidElf(const GElf_Ehdr* elf_header) {
   return memcmp(elf_header, ELFMAG, SELFMAG) == 0;
 }
 
-static bool FindSectionByName(Elf *elf, const char *name,
+static bool FindSectionByName(Elf* elf, const char* name,
                               int shstrndx,
-                              GElf_Shdr *shdr) {
+                              GElf_Shdr* shdr) {
   assert(name != NULL);
 
   if (strlen(name) == 0)
     return false;
 
-  Elf_Scn *scn = NULL;
+  Elf_Scn* scn = NULL;
 
   while ((scn = elf_nextscn(elf, scn)) != NULL) {
-    if (gelf_getshdr(scn, shdr) == (GElf_Shdr *)0) {
+    if (gelf_getshdr(scn, shdr) == (GElf_Shdr*)0) {
       fprintf(stderr, "failed to read section header: %s\n", elf_errmsg(0));
       return false;
     }
 
-    const char *section_name = elf_strptr(elf, shstrndx, shdr->sh_name);
+    const char* section_name = elf_strptr(elf, shstrndx, shdr->sh_name);
     if (!section_name) {
       fprintf(stderr, "Section name error: %s\n", elf_errmsg(-1));
       continue;
@@ -245,10 +245,10 @@
 // The parameter size is used for FPO-optimized code, and
 // this is all tied up with the debugging data for Windows x86.
 // Set it to 0 on Solaris.
-int LoadStackParamSize(struct slist *list,
-                       struct slist *list_end,
-                       struct FuncInfo *func_info) {
-  struct slist *cur_list = list;
+int LoadStackParamSize(struct slist* list,
+                       struct slist* list_end,
+                       struct FuncInfo* func_info) {
+  struct slist* cur_list = list;
   int step = 1;
   while (cur_list < list_end && cur_list->n_type == N_PSYM) {
     ++cur_list;
@@ -259,10 +259,10 @@
   return step;
 }
 
-int LoadLineInfo(struct slist *list,
-                 struct slist *list_end,
-                 struct FuncInfo *func_info) {
-  struct slist *cur_list = list;
+int LoadLineInfo(struct slist* list,
+                 struct slist* list_end,
+                 struct FuncInfo* func_info) {
+  struct slist* cur_list = list;
   do {
     // Skip non line information.
     while (cur_list < list_end && cur_list->n_type != N_SLINE) {
@@ -288,12 +288,12 @@
   return cur_list - list;
 }
 
-int LoadFuncSymbols(struct slist *list,
-                    struct slist *list_end,
-                    char *stabstr,
+int LoadFuncSymbols(struct slist* list,
+                    struct slist* list_end,
+                    char* stabstr,
                     GElf_Word base,
-                    struct SourceFileInfo *source_file_info) {
-  struct slist *cur_list = list;
+                    struct SourceFileInfo* source_file_info) {
+  struct slist* cur_list = list;
   assert(cur_list->n_type == N_SO);
   ++cur_list;
 
@@ -342,17 +342,17 @@
 }
 
 // Compute size and rva information based on symbols loaded from stab section.
-bool ComputeSizeAndRVA(struct SymbolInfo *symbols) {
-  std::vector<struct SourceFileInfo> *sorted_files =
+bool ComputeSizeAndRVA(struct SymbolInfo* symbols) {
+  std::vector<struct SourceFileInfo>* sorted_files =
     &(symbols->source_file_info);
-  SymbolMap *symbol_entries = &(symbols->symbol_entries);
+  SymbolMap* symbol_entries = &(symbols->symbol_entries);
   for (size_t i = 0; i < sorted_files->size(); ++i) {
-    struct SourceFileInfo &source_file = (*sorted_files)[i];
-    std::vector<struct FuncInfo> *sorted_functions = &(source_file.func_info);
+    struct SourceFileInfo& source_file = (*sorted_files)[i];
+    std::vector<struct FuncInfo>* sorted_functions = &(source_file.func_info);
     int func_size = sorted_functions->size();
 
     for (size_t j = 0; j < func_size; ++j) {
-      struct FuncInfo &func_info = (*sorted_functions)[j];
+      struct FuncInfo& func_info = (*sorted_functions)[j];
       int line_count = func_info.line_info.size();
 
       // Discard the ending part of the name.
@@ -373,13 +373,13 @@
 
       // Compute function and line size.
       for (size_t k = 0; k < line_count; ++k) {
-        struct LineInfo &line_info = func_info.line_info[k];
+        struct LineInfo& line_info = func_info.line_info[k];
 
         line_info.rva_to_base = line_info.rva_to_func + func_info.rva_to_base;
         if (k == line_count - 1) {
           line_info.size = func_info.size - line_info.rva_to_func;
         } else {
-          struct LineInfo &next_line = func_info.line_info[k + 1];
+          struct LineInfo& next_line = func_info.line_info[k + 1];
           line_info.size = next_line.rva_to_func - line_info.rva_to_func;
         }
       }  // for each line.
@@ -392,24 +392,23 @@
   return true;
 }
 
-bool LoadAllSymbols(const GElf_Shdr *stab_section,
-                    const GElf_Shdr *stabstr_section,
+bool LoadAllSymbols(const GElf_Shdr* stab_section,
+                    const GElf_Shdr* stabstr_section,
                     GElf_Word base,
-                    struct SymbolInfo *symbols) {
+                    struct SymbolInfo* symbols) {
   if (stab_section == NULL || stabstr_section == NULL)
     return false;
 
-  char *stabstr = 
-    reinterpret_cast<char *>(stabstr_section->sh_offset + base);
-  struct slist *lists =
-    reinterpret_cast<struct slist *>(stab_section->sh_offset + base);
+  char* stabstr = reinterpret_cast<char*>(stabstr_section->sh_offset + base);
+  struct slist* lists =
+    reinterpret_cast<struct slist*>(stab_section->sh_offset + base);
   int nstab = stab_section->sh_size / sizeof(struct slist);
   int source_id = 0;
 
   // First pass, load all symbols from the object file.
   for (int i = 0; i < nstab; ) {
     int step = 1;
-    struct slist *cur_list = lists + i;
+    struct slist* cur_list = lists + i;
     if (cur_list->n_type == N_SO) {
       // FUNC <address> <size> <param_stack_size> <function>
       struct SourceFileInfo source_file_info;
@@ -431,12 +430,12 @@
   return ComputeSizeAndRVA(symbols);
 }
 
-bool LoadSymbols(Elf *elf, GElf_Ehdr *elf_header, struct SymbolInfo *symbols,
-                 void *obj_base) {
+bool LoadSymbols(Elf* elf, GElf_Ehdr* elf_header, struct SymbolInfo* symbols,
+                 void* obj_base) {
   GElf_Word base = reinterpret_cast<GElf_Word>(obj_base);
 
-  const GElf_Shdr *sections =
-    reinterpret_cast<GElf_Shdr *>(elf_header->e_shoff + base);
+  const GElf_Shdr* sections =
+    reinterpret_cast<GElf_Shdr*>(elf_header->e_shoff + base);
   GElf_Shdr stab_section;
   if (!FindSectionByName(elf, kStabName, elf_header->e_shstrndx,
                          &stab_section)) {
@@ -462,11 +461,11 @@
     return false;
   }
 
-  Elf_Sym *symbol = (Elf_Sym *)((char *)base + symtab_section.sh_offset);
+  Elf_Sym* symbol = (Elf_Sym*)((char*)base + symtab_section.sh_offset);
   for (int i = 0; i < symtab_section.sh_size/symtab_section.sh_entsize; ++i) {
-    struct SymbolEntry *symbol_entry =
-        (struct SymbolEntry *)malloc(sizeof(struct SymbolEntry));
-    const char *name = reinterpret_cast<char *>(
+    struct SymbolEntry* symbol_entry =
+        (struct SymbolEntry*)malloc(sizeof(struct SymbolEntry));
+    const char* name = reinterpret_cast<char*>(
         strtab_section.sh_offset + (GElf_Word)base + symbol->st_name);
     symbol_entry->offset = symbol->st_value;
     symbol_entry->size = symbol->st_size;
@@ -479,8 +478,8 @@
   return LoadAllSymbols(&stab_section, &stabstr_section, base, symbols);
 }
 
-bool WriteModuleInfo(int fd, GElf_Half arch, const std::string &obj_file) {
-  const char *arch_name = NULL;
+bool WriteModuleInfo(int fd, GElf_Half arch, const std::string& obj_file) {
+  const char* arch_name = NULL;
   if (arch == EM_386)
     arch_name = "x86";
   else if (arch == EM_X86_64)
@@ -508,10 +507,10 @@
   return false;
 }
 
-bool WriteSourceFileInfo(int fd, const struct SymbolInfo &symbols) {
+bool WriteSourceFileInfo(int fd, const struct SymbolInfo& symbols) {
   for (size_t i = 0; i < symbols.source_file_info.size(); ++i) {
     if (symbols.source_file_info[i].source_id != -1) {
-      const char *name = symbols.source_file_info[i].name;
+      const char* name = symbols.source_file_info[i].name;
       if (!WriteFormat(fd, "FILE %d %s\n",
                        symbols.source_file_info[i].source_id, name))
         return false;
@@ -521,7 +520,7 @@
 }
 
 bool WriteOneFunction(int fd, int source_id,
-                      const struct FuncInfo &func_info){
+                      const struct FuncInfo& func_info){
   // Discard the ending part of the name.
   std::string func_name(func_info.name);
   std::string::size_type last_colon = func_name.find_last_of(':');
@@ -539,7 +538,7 @@
                   func_info.stack_param_size,
                   func_name.c_str())) {
     for (size_t i = 0; i < func_info.line_info.size(); ++i) {
-      const struct LineInfo &line_info = func_info.line_info[i];
+      const struct LineInfo& line_info = func_info.line_info[i];
       if (line_info.line_num == 0)
         return true;
       if (!WriteFormat(fd, "%llx %x %d %d\n",
@@ -554,11 +553,11 @@
   return false;
 }
 
-bool WriteFunctionInfo(int fd, const struct SymbolInfo &symbols) {
+bool WriteFunctionInfo(int fd, const struct SymbolInfo& symbols) {
   for (size_t i = 0; i < symbols.source_file_info.size(); ++i) {
-    const struct SourceFileInfo &file_info = symbols.source_file_info[i];
+    const struct SourceFileInfo& file_info = symbols.source_file_info[i];
     for (size_t j = 0; j < file_info.func_info.size(); ++j) {
-      const struct FuncInfo &func_info = file_info.func_info[j];
+      const struct FuncInfo& func_info = file_info.func_info[j];
       if (!WriteOneFunction(fd, file_info.source_id, func_info))
         return false;
     }
@@ -566,7 +565,7 @@
   return true;
 }
 
-bool DumpStabSymbols(int fd, const struct SymbolInfo &symbols) {
+bool DumpStabSymbols(int fd, const struct SymbolInfo& symbols) {
   return WriteSourceFileInfo(fd, symbols) &&
     WriteFunctionInfo(fd, symbols);
 }
@@ -604,13 +603,13 @@
 //
 class MmapWrapper {
  public:
-  MmapWrapper(void *mapped_address, size_t mapped_size) :
+  MmapWrapper(void* mapped_address, size_t mapped_size) :
     base_(mapped_address), size_(mapped_size) {
   }
   ~MmapWrapper() {
     if (base_ != NULL) {
       assert(size_ > 0);
-      munmap((char *)base_, size_);
+      munmap((char*)base_, size_);
     }
   }
   void release() {
@@ -619,7 +618,7 @@
   }
 
  private:
-  void *base_;
+  void* base_;
   size_t size_;
 };
 
@@ -629,14 +628,14 @@
 
 class AutoElfEnder {
  public:
-  AutoElfEnder(Elf *elf) : elf_(elf) {}
+  AutoElfEnder(Elf* elf) : elf_(elf) {}
   ~AutoElfEnder() { if (elf_) elf_end(elf_); }
  private:
-  Elf *elf_;
+  Elf* elf_;
 };
 
 
-bool DumpSymbols::WriteSymbolFile(const std::string &obj_file, int sym_fd) {
+bool DumpSymbols::WriteSymbolFile(const std::string& obj_file, int sym_fd) {
   if (elf_version(EV_CURRENT) == EV_NONE) {
     fprintf(stderr, "elf_version() failed: %s\n", elf_errmsg(0));
     return false;
@@ -649,16 +648,16 @@
   struct stat st;
   if (fstat(obj_fd, &st) != 0 && st.st_size <= 0)
     return false;
-  void *obj_base = mmap(NULL, st.st_size,
+  void* obj_base = mmap(NULL, st.st_size,
                         PROT_READ, MAP_PRIVATE, obj_fd, 0);
   if (obj_base == MAP_FAILED)
     return false;
   MmapWrapper map_wrapper(obj_base, st.st_size);
   GElf_Ehdr elf_header;
-  Elf *elf = elf_begin(obj_fd, ELF_C_READ, NULL);
+  Elf* elf = elf_begin(obj_fd, ELF_C_READ, NULL);
   AutoElfEnder elfEnder(elf);
 
-  if (gelf_getehdr(elf, &elf_header) == (GElf_Ehdr *)NULL) {
+  if (gelf_getehdr(elf, &elf_header) == (GElf_Ehdr*)NULL) {
     fprintf(stderr, "failed to read elf header: %s\n", elf_errmsg(-1));
     return false;
   }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/dump_symbols.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/dump_symbols.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/dump_symbols.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/dump_symbols.h	2021-12-09 12:01:26.000000000 +0000
@@ -40,7 +40,7 @@
 
 class DumpSymbols {
  public:
-  bool WriteSymbolFile(const std::string &obj_file,
+  bool WriteSymbolFile(const std::string& obj_file,
                        int sym_fd);
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/file_id.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/file_id.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/file_id.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/file_id.cc	2021-12-09 12:01:26.000000000 +0000
@@ -54,17 +54,17 @@
 
 class AutoElfEnder {
  public:
-  AutoElfEnder(Elf *elf) : elf_(elf) {}
+  AutoElfEnder(Elf* elf) : elf_(elf) {}
   ~AutoElfEnder() { if (elf_) elf_end(elf_); }
  private:
-  Elf *elf_;
+  Elf* elf_;
 };
 
 // Find the text section in elf object file.
 // Return the section start address and the size.
-static bool FindElfTextSection(int fd, const void *elf_base,
-                               const void **text_start,
-                               int *text_size) {
+static bool FindElfTextSection(int fd, const void* elf_base,
+                               const void** text_start,
+                               int* text_size) {
   assert(text_start);
   assert(text_size);
 
@@ -78,10 +78,10 @@
 
   GElf_Ehdr elf_header;
   lseek(fd, 0L, 0);
-  Elf *elf = elf_begin(fd, ELF_C_READ, NULL);
+  Elf* elf = elf_begin(fd, ELF_C_READ, NULL);
   AutoElfEnder elfEnder(elf);
 
-  if (gelf_getehdr(elf, &elf_header) == (GElf_Ehdr *)NULL) {
+  if (gelf_getehdr(elf, &elf_header) == (GElf_Ehdr*)NULL) {
     print_message2(2, "failed to read elf header: %s\n", elf_errmsg(-1));
     return false;
   }
@@ -95,18 +95,18 @@
   }
 
   static const char kTextSectionName[] = ".text";
-  const GElf_Shdr *text_section = NULL;
-  Elf_Scn *scn = NULL;
+  const GElf_Shdr* text_section = NULL;
+  Elf_Scn* scn = NULL;
   GElf_Shdr shdr;
 
   while ((scn = elf_nextscn(elf, scn)) != NULL) {
-    if (gelf_getshdr(scn, &shdr) == (GElf_Shdr *)0) {
+    if (gelf_getshdr(scn, &shdr) == (GElf_Shdr*)0) {
       print_message2(2, "failed to read section header: %s\n", elf_errmsg(0));
       return false;
     }
 
     if (shdr.sh_type == SHT_PROGBITS) {
-      const char *section_name = elf_strptr(elf, elf_header.e_shstrndx,
+      const char* section_name = elf_strptr(elf, elf_header.e_shstrndx,
                                             shdr.sh_name);
       if (!section_name) {
         print_message2(2, "Section name error: %s\n", elf_errmsg(-1));
@@ -120,7 +120,7 @@
     }
   }
   if (text_section != NULL && text_section->sh_size > 0) {
-    *text_start = (char *)elf_base + text_section->sh_offset;
+    *text_start = (char*)elf_base + text_section->sh_offset;
     *text_size = text_section->sh_size;
     return true;
   }
@@ -128,7 +128,7 @@
   return false;
 }
 
-FileID::FileID(const char *path) {
+FileID::FileID(const char* path) {
   strcpy(path_, path);
 }
 
@@ -150,29 +150,29 @@
   if (fstat(fd, &st) != 0 || st.st_size <= 0)
     return false;
 
-  void *base = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+  void* base = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
   if (base == MAP_FAILED)
     return false;
 
   bool success = false;
-  const void *text_section = NULL;
+  const void* text_section = NULL;
   int text_size = 0;
 
   if (FindElfTextSection(fd, base, &text_section, &text_size)) {
     MD5Context md5;
     MD5Init(&md5);
-    MD5Update(&md5, (const unsigned char *)text_section, text_size);
+    MD5Update(&md5, (const unsigned char*)text_section, text_size);
     MD5Final(identifier, &md5);
     success = true;
   }
 
-  munmap((char *)base, st.st_size);
+  munmap((char*)base, st.st_size);
   return success;
 }
 
 // static
 bool FileID::ConvertIdentifierToString(const unsigned char identifier[16],
-                                       char *buffer, int buffer_length) {
+                                       char* buffer, int buffer_length) {
   if (buffer_length < 34)
     return false;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/guid_creator.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/guid_creator.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/guid_creator.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/solaris/guid_creator.cc	2021-12-09 12:01:26.000000000 +0000
@@ -74,8 +74,8 @@
   assert(buf_len > kGUIDStringLength);
   int num = snprintf(buf, buf_len, kGUIDFormatString,
                      guid->data1, guid->data2, guid->data3,
-                     *reinterpret_cast<const uint32_t *>(&(guid->data4[0])),
-                     *reinterpret_cast<const uint32_t *>(&(guid->data4[4])));
+                     *reinterpret_cast<const uint32_t*>(&(guid->data4[0])),
+                     *reinterpret_cast<const uint32_t*>(&(guid->data4[4])));
   if (num != kGUIDStringLength)
     return false;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader.cc	2021-12-09 12:01:26.000000000 +0000
@@ -45,7 +45,7 @@
 
 namespace google_breakpad {
 
-StabsReader::EntryIterator::EntryIterator(const ByteBuffer *buffer,
+StabsReader::EntryIterator::EntryIterator(const ByteBuffer* buffer,
                                           bool big_endian, size_t value_size)
     : value_size_(value_size), cursor_(buffer, big_endian) {
   // Actually, we could handle weird sizes just fine, but they're
@@ -65,10 +65,10 @@
   entry_.at_end = !cursor_;
 }
 
-StabsReader::StabsReader(const uint8_t *stab,    size_t stab_size,
-                         const uint8_t *stabstr, size_t stabstr_size,
+StabsReader::StabsReader(const uint8_t* stab,    size_t stab_size,
+                         const uint8_t* stabstr, size_t stabstr_size,
                          bool big_endian, size_t value_size, bool unitized,
-                         StabsHandler *handler)
+                         StabsHandler* handler)
     : entries_(stab, stab_size),
       strings_(stabstr, stabstr_size),
       iterator_(&entries_, big_endian, value_size),
@@ -78,7 +78,7 @@
       next_cu_string_offset_(0),
       current_source_file_(NULL) { }
 
-const char *StabsReader::SymbolString() {
+const char* StabsReader::SymbolString() {
   ptrdiff_t offset = string_offset_ + iterator_->name_offset;
   if (offset < 0 || (size_t) offset >= strings_.Size()) {
     handler_->Warning("symbol %d: name offset outside the string section\n",
@@ -87,7 +87,7 @@
     // taken from the string section.
     offset = 0;
   }
-  return reinterpret_cast<const char *>(strings_.start + offset);
+  return reinterpret_cast<const char*>(strings_.start + offset);
 }
 
 bool StabsReader::Process() {
@@ -134,9 +134,9 @@
   // There may be an N_SO entry whose name ends with a slash,
   // indicating the directory in which the compilation occurred.
   // The build directory defaults to NULL.
-  const char *build_directory = NULL;
+  const char* build_directory = NULL;
   {
-    const char *name = SymbolString();
+    const char* name = SymbolString();
     if (name[0] && name[strlen(name) - 1] == '/') {
       build_directory = name;
       ++iterator_;
@@ -148,7 +148,7 @@
   {
     if (iterator_->at_end || iterator_->type != N_SO)
       return true;
-    const char *name = SymbolString();
+    const char* name = SymbolString();
     if (name[0] == '\0') {
       // This seems to be a stray end-of-compilation-unit marker;
       // consume it, but don't report the end, since we didn't see a
@@ -203,7 +203,7 @@
   uint64_t ending_address = 0;
   if (!iterator_->at_end) {
     assert(iterator_->type == N_SO);
-    const char *name = SymbolString();
+    const char* name = SymbolString();
     if (name[0] == '\0') {
       ending_address = iterator_->value;
       ++iterator_;
@@ -225,8 +225,8 @@
   // The STABS string for an N_FUN entry is the name of the function,
   // followed by a colon, followed by type information for the
   // function.  We want to pass the name alone to StartFunction.
-  const char *stab_string = SymbolString();
-  const char *name_end = strchr(stab_string, ':');
+  const char* stab_string = SymbolString();
+  const char* name_end = strchr(stab_string, ':');
   if (! name_end)
     name_end = stab_string + strlen(stab_string);
   string name(stab_string, name_end - stab_string);
@@ -270,7 +270,7 @@
   if (!iterator_->at_end) {
     assert(iterator_->type == N_SO || iterator_->type == N_FUN);
     if (iterator_->type == N_FUN) {
-      const char *symbol_name = SymbolString();
+      const char* symbol_name = SymbolString();
       if (symbol_name[0] == '\0') {
         // An N_FUN entry with no name is a terminator for this function;
         // its value is the function's size.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader.h	2021-12-09 12:01:26.000000000 +0000
@@ -92,10 +92,10 @@
   // 
   // Note that, in ELF, the .stabstr section should be found using the
   // 'sh_link' field of the .stab section header, not by name.
-  StabsReader(const uint8_t *stab,    size_t stab_size,
-              const uint8_t *stabstr, size_t stabstr_size,
+  StabsReader(const uint8_t* stab,    size_t stab_size,
+              const uint8_t* stabstr, size_t stabstr_size,
               bool big_endian, size_t value_size, bool unitized,
-              StabsHandler *handler);
+              StabsHandler* handler);
 
   // Process the STABS data, calling the handler's member functions to
   // report what we find.  While the handler functions return true,
@@ -149,17 +149,17 @@
     // Mac, they are 32 or 64 bits long. Oddly, the section header's entry
     // size for a Linux ELF .stab section varies according to the ELF class
     // from 12 to 20 even as the actual entries remain unchanged.
-    EntryIterator(const ByteBuffer *buffer, bool big_endian, size_t value_size);
+    EntryIterator(const ByteBuffer* buffer, bool big_endian, size_t value_size);
 
     // Move to the next entry. This function's behavior is undefined if
     // at_end() is true when it is called.
-    EntryIterator &operator++() { Fetch(); entry_.index++; return *this; }
+    EntryIterator& operator++() { Fetch(); entry_.index++; return *this; }
 
     // Dereferencing this iterator produces a reference to an Entry structure
     // that holds the current entry's values. The entry is owned by this
     // EntryIterator, and will be invalidated at the next call to operator++.
-    const Entry &operator*() const { return entry_; }
-    const Entry *operator->() const { return &entry_; }
+    const Entry& operator*() const { return entry_; }
+    const Entry* operator->() const { return &entry_; }
 
    private:
     // Read the STABS entry at cursor_, and set entry_ appropriately.
@@ -178,12 +178,12 @@
   // A source line, saved to be reported later.
   struct Line {
     uint64_t address;
-    const char *filename;
+    const char* filename;
     int number;
   };
 
   // Return the name of the current symbol.
-  const char *SymbolString();
+  const char* SymbolString();
 
   // Process a compilation unit starting at symbol_.  Return true
   // to continue processing, or false to abort.
@@ -210,7 +210,7 @@
   // StabsReader::StabsReader.
   bool unitized_;
 
-  StabsHandler *handler_;
+  StabsHandler* handler_;
 
   // The offset of the current compilation unit's strings within stabstr_.
   size_t string_offset_;
@@ -220,7 +220,7 @@
   size_t next_cu_string_offset_;
 
   // The current source file name.
-  const char *current_source_file_;
+  const char* current_source_file_;
 
   // Mac OS X STABS place SLINE records before functions; we accumulate a
   // vector of these until we see the FUN record, and then report them
@@ -261,7 +261,7 @@
   // FILENAME values are different addresses, they represent different
   // file names.
   //
-  // Thus, it's safe to use (say) std::map<char *, ...>, which does
+  // Thus, it's safe to use (say) std::map<char*, ...>, which does
   // string address comparisons, not string content comparisons.
   // Since all the strings are in same array of characters --- the
   // .stabstr section --- comparing their addresses produces
@@ -271,8 +271,8 @@
   // named FILENAME, and whose base address is ADDRESS.  If
   // BUILD_DIRECTORY is non-NULL, it is the name of the build
   // directory in which the compilation occurred.
-  virtual bool StartCompilationUnit(const char *filename, uint64_t address,
-                                    const char *build_directory) {
+  virtual bool StartCompilationUnit(const char* filename, uint64_t address,
+                                    const char* build_directory) {
     return true;
   }
 
@@ -292,7 +292,7 @@
   // StartFunction is the function name alone.
   //
   // In languages that use name mangling, like C++, NAME is mangled.
-  virtual bool StartFunction(const string &name, uint64_t address) {
+  virtual bool StartFunction(const string& name, uint64_t address) {
     return true;
   }
 
@@ -305,19 +305,19 @@
   // Report that the code at ADDRESS is attributable to line NUMBER of
   // the source file named FILENAME.  The caller must infer the ending
   // address of the line.
-  virtual bool Line(uint64_t address, const char *filename, int number) {
+  virtual bool Line(uint64_t address, const char* filename, int number) {
     return true;
   }
 
   // Report that an exported function NAME is present at ADDRESS.
   // The size of the function is unknown.
-  virtual bool Extern(const string &name, uint64_t address) {
+  virtual bool Extern(const string& name, uint64_t address) {
     return true;
   }
 
   // Report a warning.  FORMAT is a printf-like format string,
   // specifying how to format the subsequent arguments.
-  virtual void Warning(const char *format, ...) = 0;
+  virtual void Warning(const char* format, ...) = 0;
 };
 
 } // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_reader_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -75,7 +75,7 @@
   // Add the string S to this StringAssembler, and return the string's
   // offset within this compilation unit's strings. If S has been added
   // already, this returns the offset of its first instance.
-  size_t Add(const string &s) {
+  size_t Add(const string& s) {
     map<string, size_t>::iterator it = added_.find(s);
     if (it != added_.end())
       return it->second;
@@ -127,7 +127,7 @@
 class StabsAssembler: public Section {
  public:
   // Create a StabsAssembler that uses StringAssembler for its strings.
-  StabsAssembler(StringAssembler *string_assembler)
+  StabsAssembler(StringAssembler* string_assembler)
       : Section(string_assembler->endianness()),
         string_assembler_(string_assembler),
         value_size_(0),
@@ -137,7 +137,7 @@
 
   // Accessor and setter for value_size_.
   size_t value_size() const { return value_size_; }
-  StabsAssembler &set_value_size(size_t value_size) {
+  StabsAssembler& set_value_size(size_t value_size) {
     value_size_ = value_size;
     return *this;
   }
@@ -147,7 +147,7 @@
   // its compilation unit's portion of the .stabstr section; this can be a
   // value generated by a StringAssembler. Return a reference to this
   // StabsAssembler.
-  StabsAssembler &Stab(uint8_t type, uint8_t other, Label descriptor,
+  StabsAssembler& Stab(uint8_t type, uint8_t other, Label descriptor,
                        Label value, Label name) {
     D32(name);
     D8(type);
@@ -159,15 +159,15 @@
   }
 
   // As above, but automatically add NAME to our StringAssembler.
-  StabsAssembler &Stab(uint8_t type, uint8_t other, Label descriptor,
-                       Label value, const string &name) {
+  StabsAssembler& Stab(uint8_t type, uint8_t other, Label descriptor,
+                       Label value, const string& name) {
     return Stab(type, other, descriptor, value, string_assembler_->Add(name));
   }
 
   // Start a compilation unit named NAME, with an N_UNDF symbol to start
   // it, and its own portion of the string section. Return a reference to
   // this StabsAssembler.
-  StabsAssembler &StartCU(const string &name) {
+  StabsAssembler& StartCU(const string& name) {
     assert(!cu_header_);
     cu_header_ = new CUHeader;
     string_assembler_->StartCU();
@@ -180,7 +180,7 @@
 
   // Close off the current compilation unit. Return a reference to this
   // StabsAssembler.
-  StabsAssembler &EndCU() {
+  StabsAssembler& EndCU() {
     assert(cu_header_);
     cu_header_->final_entry_count = entry_count_;
     cu_header_->final_string_size = string_assembler_->EndCU();
@@ -201,7 +201,7 @@
   };
 
   // The strings for our STABS entries.
-  StringAssembler *string_assembler_;
+  StringAssembler* string_assembler_;
 
   // The size of the 'value' field of stabs entries in this section.
   size_t value_size_;
@@ -211,20 +211,20 @@
 
   // Header labels for this compilation unit, if we've started one but not
   // finished it.
-  CUHeader *cu_header_;
+  CUHeader* cu_header_;
 };
 
 class MockStabsReaderHandler: public StabsHandler {
  public:
   MOCK_METHOD3(StartCompilationUnit,
-               bool(const char *, uint64_t, const char *));
+               bool(const char*, uint64_t, const char*));
   MOCK_METHOD1(EndCompilationUnit, bool(uint64_t));
-  MOCK_METHOD2(StartFunction, bool(const string &, uint64_t));
+  MOCK_METHOD2(StartFunction, bool(const string&, uint64_t));
   MOCK_METHOD1(EndFunction, bool(uint64_t));
-  MOCK_METHOD3(Line, bool(uint64_t, const char *, int));
-  MOCK_METHOD2(Extern, bool(const string &, uint64_t));
-  void Warning(const char *format, ...) { MockWarning(format); }
-  MOCK_METHOD1(MockWarning, void(const char *));
+  MOCK_METHOD3(Line, bool(uint64_t, const char*, int));
+  MOCK_METHOD2(Extern, bool(const string&, uint64_t));
+  void Warning(const char* format, ...) { MockWarning(format); }
+  MOCK_METHOD1(MockWarning, void(const char*));
 };
 
 struct StabsFixture {
@@ -243,9 +243,9 @@
 
     // Run the parser on the test input, passing whatever we find to HANDLER.
     StabsReader reader(
-        reinterpret_cast<const uint8_t *>(stabs_contents.data()),
+        reinterpret_cast<const uint8_t*>(stabs_contents.data()),
         stabs_contents.size(),
-        reinterpret_cast<const uint8_t *>(stabstr_contents.data()),
+        reinterpret_cast<const uint8_t*>(stabstr_contents.data()),
         stabstr_contents.size(),
         stabs.endianness() == kBigEndian, stabs.value_size(), unitized,
         &mock_handler);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module.cc	2021-12-09 12:01:26.000000000 +0000
@@ -45,7 +45,7 @@
 
 // Demangle using abi call.
 // Older GCC may not support it.
-static string Demangle(const string &mangled) {
+static string Demangle(const string& mangled) {
   int status = 0;
   char *demangled = abi::__cxa_demangle(mangled.c_str(), NULL, NULL, &status);
   if (status == 0 && demangled != NULL) {
@@ -58,7 +58,7 @@
 
 StabsToModule::~StabsToModule() {
   // Free any functions we've accumulated but not added to the module.
-  for (vector<Module::Function *>::const_iterator func_it = functions_.begin();
+  for (vector<Module::Function*>::const_iterator func_it = functions_.begin();
        func_it != functions_.end(); func_it++)
     delete *func_it;
   // Free any function that we're currently within.
@@ -87,7 +87,7 @@
   return true;
 }
 
-bool StabsToModule::StartFunction(const string &name,
+bool StabsToModule::StartFunction(const string& name,
                                   uint64_t address) {
   assert(!current_function_);
   Module::Function *f = new Module::Function(Demangle(name), address);
@@ -131,7 +131,7 @@
   return true;
 }
 
-bool StabsToModule::Extern(const string &name, uint64_t address) {
+bool StabsToModule::Extern(const string& name, uint64_t address) {
   Module::Extern *ext = new Module::Extern(address);
   // Older libstdc++ demangle implementations can crash on unexpected
   // input, so be careful about what gets passed in.
@@ -160,7 +160,7 @@
   sort(functions_.begin(), functions_.end(),
        Module::Function::CompareByAddress);
 
-  for (vector<Module::Function *>::const_iterator func_it = functions_.begin();
+  for (vector<Module::Function*>::const_iterator func_it = functions_.begin();
        func_it != functions_.end();
        func_it++) {
     Module::Function *f = *func_it;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module.h	2021-12-09 12:01:26.000000000 +0000
@@ -76,10 +76,10 @@
   bool StartCompilationUnit(const char *name, uint64_t address,
                             const char *build_directory);
   bool EndCompilationUnit(uint64_t address);
-  bool StartFunction(const string &name, uint64_t address);
+  bool StartFunction(const string& name, uint64_t address);
   bool EndFunction(uint64_t address);
   bool Line(uint64_t address, const char *name, int number);
-  bool Extern(const string &name, uint64_t address);
+  bool Extern(const string& name, uint64_t address);
   void Warning(const char *format, ...);
 
   // Do any final processing necessary to make module_ contain all the
@@ -107,7 +107,7 @@
   // We could just stick them in module_ from the outset, but if
   // module_ already contains data gathered from other debugging
   // formats, that would complicate the size computation.
-  vector<Module::Function *> functions_;
+  vector<Module::Function*> functions_;
 
   // Boundary addresses.  STABS doesn't necessarily supply sizes for
   // functions and lines, so we need to compute them ourselves by
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/stabs_to_module_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -58,7 +58,7 @@
   Module::File *file = m.FindExistingFile("source-file-name");
   ASSERT_TRUE(file != NULL);
 
-  vector<Module::Function *> functions;
+  vector<Module::Function*> functions;
   m.GetFunctions(&functions, functions.end());
   ASSERT_EQ((size_t) 1, functions.size());
   Module::Function *function = functions[0];
@@ -88,7 +88,7 @@
   h.Finalize();
 
   // Now check to see what has been added to the Module.
-  vector<Module::Extern *> externs;
+  vector<Module::Extern*> externs;
   m.GetExterns(&externs, externs.end());
   ASSERT_EQ((size_t) 3, externs.size());
   Module::Extern *extern1 = externs[0];
@@ -124,7 +124,7 @@
   Module::File *file = m.FindExistingFile("compilation-unit");
   ASSERT_TRUE(file != NULL);
 
-  vector<Module::Function *> functions;
+  vector<Module::Function*> functions;
   m.GetFunctions(&functions, functions.end());
   ASSERT_EQ(1U, functions.size());
 
@@ -159,7 +159,7 @@
   Module::File *file2 = m.FindExistingFile("source-file-name-2");
   ASSERT_TRUE(file2 != NULL);
 
-  vector<Module::Function *> functions;
+  vector<Module::Function*> functions;
   m.GetFunctions(&functions, functions.end());
   ASSERT_EQ((size_t) 1, functions.size());
 
@@ -204,7 +204,7 @@
   Module::File *file = m.FindExistingFile("compilation-unit");
   ASSERT_TRUE(file != NULL);
 
-  vector<Module::Function *> functions;
+  vector<Module::Function*> functions;
   m.GetFunctions(&functions, functions.end());
   ASSERT_EQ(1U, functions.size());
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion.cc	2021-12-09 12:01:26.000000000 +0000
@@ -38,15 +38,15 @@
 
 using std::vector;
 
-void UTF8ToUTF16(const char *in, vector<uint16_t> *out) {
+void UTF8ToUTF16(const char* in, vector<uint16_t>* out) {
   size_t source_length = strlen(in);
-  const UTF8 *source_ptr = reinterpret_cast<const UTF8 *>(in);
-  const UTF8 *source_end_ptr = source_ptr + source_length;
+  const UTF8* source_ptr = reinterpret_cast<const UTF8*>(in);
+  const UTF8* source_end_ptr = source_ptr + source_length;
   // Erase the contents and zero fill to the expected size
   out->clear();
   out->insert(out->begin(), source_length, 0);
-  uint16_t *target_ptr = &(*out)[0];
-  uint16_t *target_end_ptr = target_ptr + out->capacity() * sizeof(uint16_t);
+  uint16_t* target_ptr = &(*out)[0];
+  uint16_t* target_end_ptr = target_ptr + out->capacity();
   ConversionResult result = ConvertUTF8toUTF16(&source_ptr, source_end_ptr,
                                                &target_ptr, target_end_ptr,
                                                strictConversion);
@@ -55,11 +55,11 @@
   out->resize(result == conversionOK ? target_ptr - &(*out)[0] + 1: 0);
 }
 
-int UTF8ToUTF16Char(const char *in, int in_length, uint16_t out[2]) {
-  const UTF8 *source_ptr = reinterpret_cast<const UTF8 *>(in);
-  const UTF8 *source_end_ptr = source_ptr + 1;
-  uint16_t *target_ptr = out;
-  uint16_t *target_end_ptr = target_ptr + 2;
+int UTF8ToUTF16Char(const char* in, int in_length, uint16_t out[2]) {
+  const UTF8* source_ptr = reinterpret_cast<const UTF8*>(in);
+  const UTF8* source_end_ptr = source_ptr + 1;
+  uint16_t* target_ptr = out;
+  uint16_t* target_end_ptr = target_ptr + 2;
   out[0] = out[1] = 0;
 
   // Process one character at a time
@@ -69,28 +69,28 @@
                                                  strictConversion);
 
     if (result == conversionOK)
-      return static_cast<int>(source_ptr - reinterpret_cast<const UTF8 *>(in));
+      return static_cast<int>(source_ptr - reinterpret_cast<const UTF8*>(in));
 
     // Add another character to the input stream and try again
-    source_ptr = reinterpret_cast<const UTF8 *>(in);
+    source_ptr = reinterpret_cast<const UTF8*>(in);
     ++source_end_ptr;
 
-    if (source_end_ptr > reinterpret_cast<const UTF8 *>(in) + in_length)
+    if (source_end_ptr > reinterpret_cast<const UTF8*>(in) + in_length)
       break;
   }
 
   return 0;
 }
 
-void UTF32ToUTF16(const wchar_t *in, vector<uint16_t> *out) {
+void UTF32ToUTF16(const wchar_t* in, vector<uint16_t>* out) {
   size_t source_length = wcslen(in);
-  const UTF32 *source_ptr = reinterpret_cast<const UTF32 *>(in);
-  const UTF32 *source_end_ptr = source_ptr + source_length;
+  const UTF32* source_ptr = reinterpret_cast<const UTF32*>(in);
+  const UTF32* source_end_ptr = source_ptr + source_length;
   // Erase the contents and zero fill to the expected size
   out->clear();
   out->insert(out->begin(), source_length, 0);
-  uint16_t *target_ptr = &(*out)[0];
-  uint16_t *target_end_ptr = target_ptr + out->capacity() * sizeof(uint16_t);
+  uint16_t* target_ptr = &(*out)[0];
+  uint16_t* target_end_ptr = target_ptr + out->capacity();
   ConversionResult result = ConvertUTF32toUTF16(&source_ptr, source_end_ptr,
                                                 &target_ptr, target_end_ptr,
                                                 strictConversion);
@@ -100,10 +100,10 @@
 }
 
 void UTF32ToUTF16Char(wchar_t in, uint16_t out[2]) {
-  const UTF32 *source_ptr = reinterpret_cast<const UTF32 *>(&in);
-  const UTF32 *source_end_ptr = source_ptr + 1;
-  uint16_t *target_ptr = out;
-  uint16_t *target_end_ptr = target_ptr + 2;
+  const UTF32* source_ptr = reinterpret_cast<const UTF32*>(&in);
+  const UTF32* source_end_ptr = source_ptr + 1;
+  uint16_t* target_ptr = out;
+  uint16_t* target_end_ptr = target_ptr + 2;
   out[0] = out[1] = 0;
   ConversionResult result = ConvertUTF32toUTF16(&source_ptr, source_end_ptr,
                                                 &target_ptr, target_end_ptr,
@@ -118,15 +118,15 @@
   return (value >> 8) | static_cast<uint16_t>(value << 8);
 }
 
-string UTF16ToUTF8(const vector<uint16_t> &in, bool swap) {
-  const UTF16 *source_ptr = &in[0];
+string UTF16ToUTF8(const vector<uint16_t>& in, bool swap) {
+  const UTF16* source_ptr = &in[0];
   scoped_array<uint16_t> source_buffer;
 
   // If we're to swap, we need to make a local copy and swap each byte pair
   if (swap) {
     int idx = 0;
     source_buffer.reset(new uint16_t[in.size()]);
-    UTF16 *source_buffer_ptr = source_buffer.get();
+    UTF16* source_buffer_ptr = source_buffer.get();
     for (vector<uint16_t>::const_iterator it = in.begin();
          it != in.end(); ++it, ++idx)
       source_buffer_ptr[idx] = Swap(*it);
@@ -135,17 +135,17 @@
   }
 
   // The maximum expansion would be 4x the size of the input string.
-  const UTF16 *source_end_ptr = source_ptr + in.size();
+  const UTF16* source_end_ptr = source_ptr + in.size();
   size_t target_capacity = in.size() * 4;
   scoped_array<UTF8> target_buffer(new UTF8[target_capacity]);
-  UTF8 *target_ptr = target_buffer.get();
-  UTF8 *target_end_ptr = target_ptr + target_capacity;
+  UTF8* target_ptr = target_buffer.get();
+  UTF8* target_end_ptr = target_ptr + target_capacity;
   ConversionResult result = ConvertUTF16toUTF8(&source_ptr, source_end_ptr,
                                                &target_ptr, target_end_ptr,
                                                strictConversion);
 
   if (result == conversionOK) {
-    const char *targetPtr = reinterpret_cast<const char *>(target_buffer.get());
+    const char* targetPtr = reinterpret_cast<const char*>(target_buffer.get());
     return targetPtr;
   }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion.h	2021-12-09 12:01:26.000000000 +0000
@@ -44,24 +44,24 @@
 
 // Convert |in| to UTF-16 into |out|.  Use platform byte ordering.  If the
 // conversion failed, |out| will be zero length.
-void UTF8ToUTF16(const char *in, vector<uint16_t> *out);
+void UTF8ToUTF16(const char* in, vector<uint16_t>* out);
 
 // Convert at least one character (up to a maximum of |in_length|) from |in|
 // to UTF-16 into |out|.  Return the number of characters consumed from |in|.
 // Any unused characters in |out| will be initialized to 0.  No memory will
 // be allocated by this routine.
-int UTF8ToUTF16Char(const char *in, int in_length, uint16_t out[2]);
+int UTF8ToUTF16Char(const char* in, int in_length, uint16_t out[2]);
 
 // Convert |in| to UTF-16 into |out|.  Use platform byte ordering.  If the
 // conversion failed, |out| will be zero length.
-void UTF32ToUTF16(const wchar_t *in, vector<uint16_t> *out);
+void UTF32ToUTF16(const wchar_t* in, vector<uint16_t>* out);
 
 // Convert |in| to UTF-16 into |out|.  Any unused characters in |out| will be
 // initialized to 0.  No memory will be allocated by this routine.
 void UTF32ToUTF16Char(wchar_t in, uint16_t out[2]);
 
 // Convert |in| to UTF-8.  If |swap| is true, swap bytes before converting.
-string UTF16ToUTF8(const vector<uint16_t> &in, bool swap);
+string UTF16ToUTF8(const vector<uint16_t>& in, bool swap);
 
 }  // namespace google_breakpad
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/string_conversion_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,64 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// string_conversion_unittest.cc: Unit tests for google_breakpad::UTF* helpers.
+
+#include <string>
+#include <vector>
+
+#include "breakpad_googletest_includes.h"
+#include "common/string_conversion.h"
+
+using google_breakpad::UTF8ToUTF16;
+using google_breakpad::UTF8ToUTF16Char;
+using google_breakpad::UTF16ToUTF8;
+using std::vector;
+
+TEST(StringConversionTest, UTF8ToUTF16) {
+  const char in[] = "aßc";
+  vector<uint16_t> out;
+  vector<uint16_t> exp{'a', 0xdf, 'c', 0};
+  UTF8ToUTF16(in, &out);
+  EXPECT_EQ(4u, out.size());
+  EXPECT_EQ(exp, out);
+}
+
+TEST(StringConversionTest, UTF8ToUTF16Char) {
+  const char in[] = "a";
+  uint16_t out[3] = {0xff, 0xff, 0xff};
+  EXPECT_EQ(1, UTF8ToUTF16Char(in, 1, out));
+  EXPECT_EQ('a', out[0]);
+  EXPECT_EQ(0, out[1]);
+  EXPECT_EQ(0xff, out[2]);
+}
+
+TEST(StringConversionTest, UTF16ToUTF8) {
+  vector<uint16_t> in{'a', 0xdf, 'c', 0};
+  EXPECT_EQ("aßc", UTF16ToUTF8(in, false));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler.cc	2021-12-09 12:01:26.000000000 +0000
@@ -46,7 +46,7 @@
 
 Label::Label() : value_(new Binding()) { }
 Label::Label(uint64_t value) : value_(new Binding(value)) { }
-Label::Label(const Label &label) {
+Label::Label(const Label& label) {
   value_ = label.value_;
   value_->Acquire();
 }
@@ -54,12 +54,12 @@
   if (value_->Release()) delete value_;
 }
 
-Label &Label::operator=(uint64_t value) {
+Label& Label::operator=(uint64_t value) {
   value_->Set(NULL, value);
   return *this;
 }
 
-Label &Label::operator=(const Label &label) {
+Label& Label::operator=(const Label& label) {
   value_->Set(label.value_, 0);
   return *this;
 }
@@ -89,7 +89,7 @@
 #define ALWAYS_EVALUATE_AND_ASSERT(x) assert(x)
 #endif
 
-uint64_t Label::operator-(const Label &label) const {
+uint64_t Label::operator-(const Label& label) const {
   uint64_t offset;
   ALWAYS_EVALUATE_AND_ASSERT(IsKnownOffsetFrom(label, &offset));
   return offset;
@@ -101,8 +101,8 @@
   return v;
 };
 
-bool Label::IsKnownConstant(uint64_t *value_p) const {
-  Binding *base;
+bool Label::IsKnownConstant(uint64_t* value_p) const {
+  Binding* base;
   uint64_t addend;
   value_->Get(&base, &addend);
   if (base != NULL) return false;
@@ -110,9 +110,9 @@
   return true;
 }
 
-bool Label::IsKnownOffsetFrom(const Label &label, uint64_t *offset_p) const
+bool Label::IsKnownOffsetFrom(const Label& label, uint64_t* offset_p) const
 {
-  Binding *label_base, *this_base;
+  Binding* label_base, *this_base;
   uint64_t label_addend, this_addend;
   label.value_->Get(&label_base, &label_addend);
   value_->Get(&this_base, &this_addend);
@@ -135,7 +135,7 @@
     delete base_;
 }
 
-void Label::Binding::Set(Binding *binding, uint64_t addend) {
+void Label::Binding::Set(Binding* binding, uint64_t addend) {
   if (!base_ && !binding) {
     // We're equating two constants. This could be okay.
     assert(addend_ == addend);
@@ -183,13 +183,13 @@
   }
 }
 
-void Label::Binding::Get(Binding **base, uint64_t *addend) {
+void Label::Binding::Get(Binding** base, uint64_t* addend) {
   if (base_ && base_ != this) {
     // Recurse to find the end of our reference chain (the root of our
     // tree), and then rewrite every binding along the chain to refer
     // to it directly, adjusting addends appropriately. (This is why
     // this member function isn't this-const.)
-    Binding *final_base;
+    Binding* final_base;
     uint64_t final_addend;
     base_->Get(&final_base, &final_addend);
     if (final_base) final_base->Acquire();
@@ -218,14 +218,14 @@
   }
 }
 
-Section &Section::Append(Endianness endianness, size_t size, uint64_t number) {
+Section& Section::Append(Endianness endianness, size_t size, uint64_t number) {
   InsertEndian(endianness, size, number,
                back_insert_iterator<string>(contents_));
   return *this;
 }
 
-Section &Section::Append(Endianness endianness, size_t size,
-                         const Label &label) {
+Section& Section::Append(Endianness endianness, size_t size,
+                         const Label& label) {
   // If this label's value is known, there's no reason to waste an
   // entry in references_ on it.
   uint64_t value;
@@ -246,14 +246,14 @@
 #define ENDIANNESS(e) ENDIANNESS_ ## e
 
 #define DEFINE_SHORT_APPEND_NUMBER_ENDIAN(e, bits)                      \
-  Section &Section::e ## bits(uint ## bits ## _t v) {                  \
+  Section& Section::e ## bits(uint ## bits ## _t v) {                   \
     InsertEndian(ENDIANNESS(e), bits / 8, v,                            \
                  back_insert_iterator<string>(contents_));              \
     return *this;                                                       \
   }
 
 #define DEFINE_SHORT_APPEND_LABEL_ENDIAN(e, bits)                       \
-  Section &Section::e ## bits(const Label &v) {                         \
+  Section& Section::e ## bits(const Label& v) {                         \
     return Append(ENDIANNESS(e), bits / 8, v);                          \
   }
 
@@ -272,13 +272,13 @@
 DEFINE_SHORT_APPEND_ENDIAN(B, 64);
 
 #define DEFINE_SHORT_APPEND_NUMBER_DEFAULT(bits)                        \
-  Section &Section::D ## bits(uint ## bits ## _t v) {                  \
+  Section& Section::D ## bits(uint ## bits ## _t v) {                   \
     InsertEndian(endianness_, bits / 8, v,                              \
                  back_insert_iterator<string>(contents_));              \
     return *this;                                                       \
   }
 #define DEFINE_SHORT_APPEND_LABEL_DEFAULT(bits)                         \
-  Section &Section::D ## bits(const Label &v) {                         \
+  Section& Section::D ## bits(const Label& v) {                         \
     return Append(endianness_, bits / 8, v);                            \
   }
 #define DEFINE_SHORT_APPEND_DEFAULT(bits)                               \
@@ -290,7 +290,7 @@
 DEFINE_SHORT_APPEND_DEFAULT(32);
 DEFINE_SHORT_APPEND_DEFAULT(64);
 
-Section &Section::Append(const Section &section) {
+Section& Section::Append(const Section& section) {
   size_t base = contents_.size();
   contents_.append(section.contents_);
   for (vector<Reference>::const_iterator it = section.references_.begin();
@@ -300,7 +300,7 @@
   return *this;
 }
 
-Section &Section::LEB128(long long value) {
+Section& Section::LEB128(long long value) {
   while (value < -0x40 || 0x3f < value) {
     contents_ += (value & 0x7f) | 0x80;
     if (value < 0)
@@ -312,7 +312,7 @@
   return *this;
 }
 
-Section &Section::ULEB128(uint64_t value) {
+Section& Section::ULEB128(uint64_t value) {
   while (value > 0x7f) {
     contents_ += (value & 0x7f) | 0x80;
     value = (value >> 7);
@@ -321,7 +321,7 @@
   return *this;
 }
 
-Section &Section::Align(size_t alignment, uint8_t pad_byte) {
+Section& Section::Align(size_t alignment, uint8_t pad_byte) {
   // ALIGNMENT must be a power of two.
   assert(((alignment - 1) & alignment) == 0);
   size_t new_size = (contents_.size() + alignment - 1) & ~(alignment - 1);
@@ -335,11 +335,11 @@
   references_.clear();
 }
 
-bool Section::GetContents(string *contents) {
+bool Section::GetContents(string* contents) {
   // For each label reference, find the label's value, and patch it into
   // the section's contents.
   for (size_t i = 0; i < references_.size(); i++) {
-    Reference &r = references_[i];
+    Reference& r = references_[i];
     uint64_t value;
     if (!r.label.IsKnownConstant(&value)) {
       fprintf(stderr, "Undefined label #%zu at offset 0x%zx\n", i, r.offset);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler.h	2021-12-09 12:01:26.000000000 +0000
@@ -111,7 +111,7 @@
  public:
   Label();                      // An undefined label.
   Label(uint64_t value);       // A label with a fixed value
-  Label(const Label &value);    // A label equal to another.
+  Label(const Label& value);    // A label equal to another.
   ~Label();
 
   // Return this label's value; it must be known.
@@ -124,18 +124,18 @@
   // former could fail if the label is not yet defined and the latter won't.
   uint64_t Value() const;
 
-  Label &operator=(uint64_t value);
-  Label &operator=(const Label &value);
+  Label& operator=(uint64_t value);
+  Label& operator=(const Label& value);
   Label operator+(uint64_t addend) const;
   Label operator-(uint64_t subtrahend) const;
-  uint64_t operator-(const Label &subtrahend) const;
+  uint64_t operator-(const Label& subtrahend) const;
 
   // We could also provide == and != that work on undefined, but
   // related, labels.
 
   // Return true if this label's value is known. If VALUE_P is given,
   // set *VALUE_P to the known value if returning true.
-  bool IsKnownConstant(uint64_t *value_p = NULL) const;
+  bool IsKnownConstant(uint64_t* value_p = NULL) const;
 
   // Return true if the offset from LABEL to this label is known. If
   // OFFSET_P is given, set *OFFSET_P to the offset when returning true.
@@ -155,7 +155,7 @@
   //   l-m                              // -10
   //   m-l                              // 10
   //   m.Value()                        // error: m's value is not known
-  bool IsKnownOffsetFrom(const Label &label, uint64_t *offset_p = NULL) const;
+  bool IsKnownOffsetFrom(const Label& label, uint64_t* offset_p = NULL) const;
 
  private:
   // A label's value, or if that is not yet known, how the value is
@@ -186,7 +186,7 @@
     // Update every binding on this binding's chain to point directly
     // to BINDING, or to be a constant, with addends adjusted
     // appropriately.
-    void Set(Binding *binding, uint64_t value);
+    void Set(Binding* binding, uint64_t value);
 
     // Return what we know about the value of this binding.
     // - If this binding's value is a known constant, set BASE to
@@ -198,7 +198,7 @@
     //   value.
     // - If this binding is unconstrained, set BASE to this, and leave
     //   ADDEND unchanged.
-    void Get(Binding **base, uint64_t *addend);
+    void Get(Binding** base, uint64_t* addend);
 
    private:
     // There are three cases:
@@ -220,7 +220,7 @@
     // operations on bindings do path compression: they change every
     // binding on the chain to point directly to the final value,
     // adjusting addends as appropriate.
-    Binding *base_;
+    Binding* base_;
     uint64_t addend_;
 
     // The number of Labels and Bindings pointing to this binding.
@@ -230,10 +230,10 @@
   };
 
   // This label's value.
-  Binding *value_;
+  Binding* value_;
 };
 
-inline Label operator+(uint64_t a, const Label &l) { return l + a; }
+inline Label operator+(uint64_t a, const Label& l) { return l + a; }
 // Note that int-Label isn't defined, as negating a Label is not an
 // operation we support.
 
@@ -288,18 +288,18 @@
 
   // Append the SIZE bytes at DATA or the contents of STRING to the
   // end of this section. Return a reference to this section.
-  Section &Append(const uint8_t *data, size_t size) {
-    contents_.append(reinterpret_cast<const char *>(data), size);
+  Section& Append(const uint8_t* data, size_t size) {
+    contents_.append(reinterpret_cast<const char*>(data), size);
     return *this;
   };
-  Section &Append(const string &data) {
+  Section& Append(const string& data) {
     contents_.append(data);
     return *this;
   };
 
   // Append SIZE copies of BYTE to the end of this section. Return a
   // reference to this section.
-  Section &Append(size_t size, uint8_t byte) {
+  Section& Append(size_t size, uint8_t byte) {
     contents_.append(size, (char) byte);
     return *this;
   }
@@ -307,8 +307,8 @@
   // Append NUMBER to this section. ENDIANNESS is the endianness to
   // use to write the number. SIZE is the length of the number in
   // bytes. Return a reference to this section.
-  Section &Append(Endianness endianness, size_t size, uint64_t number);
-  Section &Append(Endianness endianness, size_t size, const Label &label);
+  Section& Append(Endianness endianness, size_t size, uint64_t number);
+  Section& Append(Endianness endianness, size_t size, const Label& label);
 
   // Append SECTION to the end of this section. The labels SECTION
   // refers to need not be defined yet.
@@ -317,11 +317,11 @@
   // SECTION. If placing SECTION within 'this' provides new
   // constraints on existing labels' values, then it's up to the
   // caller to fiddle with those labels as needed.
-  Section &Append(const Section &section);
+  Section& Append(const Section& section);
 
   // Append the contents of DATA as a series of bytes terminated by
   // a NULL character.
-  Section &AppendCString(const string &data) {
+  Section& AppendCString(const string& data) {
     Append(data);
     contents_ += '\0';
     return *this;
@@ -329,7 +329,7 @@
 
   // Append at most SIZE bytes from DATA; if DATA is less than SIZE bytes
   // long, pad with '\0' characters.
-  Section &AppendCString(const string &data, size_t size) {
+  Section& AppendCString(const string& data, size_t size) {
     contents_.append(data, 0, size);
     if (data.size() < size)
       Append(size - data.size(), 0);
@@ -352,18 +352,18 @@
   // the compiler will properly sign-extend a signed value before
   // passing it to the function, at which point the function's
   // behavior is the same either way.
-  Section &L8(uint8_t value) { contents_ += value; return *this; }
-  Section &B8(uint8_t value) { contents_ += value; return *this; }
-  Section &D8(uint8_t value) { contents_ += value; return *this; }
+  Section& L8(uint8_t value) { contents_ += value; return *this; }
+  Section& B8(uint8_t value) { contents_ += value; return *this; }
+  Section& D8(uint8_t value) { contents_ += value; return *this; }
   Section &L16(uint16_t), &L32(uint32_t), &L64(uint64_t),
           &B16(uint16_t), &B32(uint32_t), &B64(uint64_t),
           &D16(uint16_t), &D32(uint32_t), &D64(uint64_t);
-  Section &L8(const Label &label),  &L16(const Label &label),
-          &L32(const Label &label), &L64(const Label &label),
-          &B8(const Label &label),  &B16(const Label &label),
-          &B32(const Label &label), &B64(const Label &label),
-          &D8(const Label &label),  &D16(const Label &label),
-          &D32(const Label &label), &D64(const Label &label);
+  Section &L8(const Label& label),  &L16(const Label& label),
+          &L32(const Label& label), &L64(const Label& label),
+          &B8(const Label& label),  &B16(const Label& label),
+          &B32(const Label& label), &B64(const Label& label),
+          &D8(const Label& label),  &D16(const Label& label),
+          &D32(const Label& label), &D64(const Label& label);
 
   // Append VALUE in a signed LEB128 (Little-Endian Base 128) form.
   // 
@@ -383,7 +383,7 @@
   //
   // Note that VALUE cannot be a Label (we would have to implement
   // relaxation).
-  Section &LEB128(long long value);
+  Section& LEB128(long long value);
 
   // Append VALUE in unsigned LEB128 (Little-Endian Base 128) form.
   // 
@@ -399,13 +399,13 @@
   //
   // Note that VALUE cannot be a Label (we would have to implement
   // relaxation).
-  Section &ULEB128(uint64_t value);
+  Section& ULEB128(uint64_t value);
 
   // Jump to the next location aligned on an ALIGNMENT-byte boundary,
   // relative to the start of the section. Fill the gap with PAD_BYTE.
   // ALIGNMENT must be a power of two. Return a reference to this
   // section.
-  Section &Align(size_t alignment, uint8_t pad_byte = 0);
+  Section& Align(size_t alignment, uint8_t pad_byte = 0);
 
   // Clear the contents of this section.
   void Clear();
@@ -436,19 +436,19 @@
   Label Here() const { return start_ + Size(); }
 
   // Set *LABEL to Here, and return a reference to this section.
-  Section &Mark(Label *label) { *label = Here(); return *this; }
+  Section& Mark(Label* label) { *label = Here(); return *this; }
 
   // If there are no undefined label references left in this
   // section, set CONTENTS to the contents of this section, as a
   // string, and clear this section. Return true on success, or false
   // if there were still undefined labels.
-  bool GetContents(string *contents);
+  bool GetContents(string* contents);
 
  private:
   // Used internally. A reference to a label's value.
   struct Reference {
     Reference(size_t set_offset, Endianness set_endianness,  size_t set_size,
-              const Label &set_label)
+              const Label& set_label)
         : offset(set_offset), endianness(set_endianness), size(set_size),
           label(set_label) { }
       
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/test_assembler_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -755,7 +755,7 @@
     {                                                                   \
       static const uint8_t expected_bytes[] = b;                       \
       ASSERT_EQ(sizeof(expected_bytes), s.size());                      \
-      ASSERT_TRUE(memcmp(s.data(), (const char *) expected_bytes,       \
+      ASSERT_TRUE(memcmp(s.data(), (const char*) expected_bytes,       \
                          sizeof(expected_bytes)) == 0);                 \
     }                                                                   \
   while(0)
@@ -766,7 +766,7 @@
   section.Append(data, sizeof(data));
   ASSERT_TRUE(section.GetContents(&contents));
   ASSERT_EQ(sizeof(data), contents.size());
-  EXPECT_TRUE(0 == memcmp(contents.data(), (const char *) data, sizeof(data)));
+  EXPECT_TRUE(0 == memcmp(contents.data(), (const char*) data, sizeof(data)));
 }
 
 TEST_F(Append, BytesTwice) {
@@ -774,9 +774,9 @@
   section.Append(data, sizeof(data));
   ASSERT_TRUE(section.GetContents(&contents));
   ASSERT_EQ(2 * sizeof(data), contents.size());
-  ASSERT_TRUE(0 == memcmp(contents.data(), (const char *) data, sizeof(data)));
+  ASSERT_TRUE(0 == memcmp(contents.data(), (const char*) data, sizeof(data)));
   ASSERT_TRUE(0 == memcmp(contents.data() + sizeof(data),
-                          (const char *) data, sizeof(data)));
+                          (const char*) data, sizeof(data)));
 }
 
 TEST_F(Append, String) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/tests/file_utils.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/tests/file_utils.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/tests/file_utils.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/tests/file_utils.cc	2021-12-09 12:01:26.000000000 +0000
@@ -96,6 +96,10 @@
   return result;
 }
 
+bool CopyFile(const std::string& from_path, const std::string& to_path) {
+  return CopyFile(from_path.c_str(), to_path.c_str());
+}
+
 bool ReadFile(const char* path, void* buffer, ssize_t* buffer_size) {
   int fd = HANDLE_EINTR(open(path, O_RDONLY));
   if (fd == -1) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/tests/file_utils.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/tests/file_utils.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/tests/file_utils.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/tests/file_utils.h	2021-12-09 12:01:26.000000000 +0000
@@ -33,9 +33,12 @@
 #ifndef COMMON_TESTS_FILE_UTILS_H_
 #define COMMON_TESTS_FILE_UTILS_H_
 
+#include <string>
+
 namespace google_breakpad {
 
 // Copies a file from |from_path| to |to_path|. Returns true on success.
+bool CopyFile(const std::string& from_path, const std::string& to_path);
 bool CopyFile(const char* from_path, const char* to_path);
 
 // Reads the content of a file at |path| into |buffer|. |buffer_size| specifies
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/http_upload.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/http_upload.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/http_upload.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/http_upload.cc	2021-12-09 12:01:26.000000000 +0000
@@ -33,388 +33,478 @@
 #pragma warning(disable:4530)
 
 #include <fstream>
+#include <vector>
 
 #include "common/windows/string_utils-inl.h"
 
 #include "common/windows/http_upload.h"
 
-namespace google_breakpad {
+namespace {
+  using std::string;
+  using std::wstring;
+  using std::map;
+  using std::vector;
+  using std::ifstream;
+  using std::ios;
+
+  const wchar_t kUserAgent[] = L"Breakpad/1.0 (Windows)";
+
+  // Helper class which closes an internet handle when it goes away
+  class AutoInternetHandle {
+  public:
+    explicit AutoInternetHandle(HINTERNET handle) : handle_(handle) {}
+    ~AutoInternetHandle() {
+      if (handle_) {
+        InternetCloseHandle(handle_);
+      }
+    }
 
-using std::ifstream;
-using std::ios;
+    HINTERNET get() { return handle_; }
 
-static const wchar_t kUserAgent[] = L"Breakpad/1.0 (Windows)";
+  private:
+    HINTERNET handle_;
+  };
 
-// Helper class which closes an internet handle when it goes away
-class HTTPUpload::AutoInternetHandle {
- public:
-  explicit AutoInternetHandle(HINTERNET handle) : handle_(handle) {}
-  ~AutoInternetHandle() {
-    if (handle_) {
-      InternetCloseHandle(handle_);
-    }
-  }
-
-  HINTERNET get() { return handle_; }
-
- private:
-  HINTERNET handle_;
-};
-
-// static
-bool HTTPUpload::SendRequest(const wstring &url,
-                             const map<wstring, wstring> &parameters,
-                             const map<wstring, wstring> &files,
-                             int *timeout,
-                             wstring *response_body,
-                             int *response_code) {
-  if (response_code) {
-    *response_code = 0;
-  }
-
-  // TODO(bryner): support non-ASCII parameter names
-  if (!CheckParameters(parameters)) {
-    return false;
-  }
-
-  // Break up the URL and make sure we can handle it
-  wchar_t scheme[16], host[256], path[256];
-  URL_COMPONENTS components;
-  memset(&components, 0, sizeof(components));
-  components.dwStructSize = sizeof(components);
-  components.lpszScheme = scheme;
-  components.dwSchemeLength = sizeof(scheme) / sizeof(scheme[0]);
-  components.lpszHostName = host;
-  components.dwHostNameLength = sizeof(host) / sizeof(host[0]);
-  components.lpszUrlPath = path;
-  components.dwUrlPathLength = sizeof(path) / sizeof(path[0]);
-  if (!InternetCrackUrl(url.c_str(), static_cast<DWORD>(url.size()),
-                        0, &components)) {
-    return false;
-  }
-  bool secure = false;
-  if (wcscmp(scheme, L"https") == 0) {
-    secure = true;
-  } else if (wcscmp(scheme, L"http") != 0) {
-    return false;
-  }
-
-  AutoInternetHandle internet(InternetOpen(kUserAgent,
-                                           INTERNET_OPEN_TYPE_PRECONFIG,
-                                           NULL,  // proxy name
-                                           NULL,  // proxy bypass
-                                           0));   // flags
-  if (!internet.get()) {
-    return false;
-  }
-
-  AutoInternetHandle connection(InternetConnect(internet.get(),
-                                                host,
-                                                components.nPort,
-                                                NULL,    // user name
-                                                NULL,    // password
-                                                INTERNET_SERVICE_HTTP,
-                                                0,       // flags
-                                                NULL));  // context
-  if (!connection.get()) {
-    return false;
-  }
-
-  DWORD http_open_flags = secure ? INTERNET_FLAG_SECURE : 0;
-  http_open_flags |= INTERNET_FLAG_NO_COOKIES;
-  AutoInternetHandle request(HttpOpenRequest(connection.get(),
-                                             L"POST",
-                                             path,
-                                             NULL,    // version
-                                             NULL,    // referer
-                                             NULL,    // agent type
-                                             http_open_flags,
-                                             NULL));  // context
-  if (!request.get()) {
-    return false;
-  }
-
-  wstring boundary = GenerateMultipartBoundary();
-  wstring content_type_header = GenerateRequestHeader(boundary);
-  HttpAddRequestHeaders(request.get(),
-                        content_type_header.c_str(),
-                        static_cast<DWORD>(-1),
-                        HTTP_ADDREQ_FLAG_ADD);
-
-  string request_body;
-  if (!GenerateRequestBody(parameters, files, boundary, &request_body)) {
-    return false;
-  }
-
-  if (timeout) {
-    if (!InternetSetOption(request.get(),
-                           INTERNET_OPTION_SEND_TIMEOUT,
-                           timeout,
-                           sizeof(*timeout))) {
-      fwprintf(stderr, L"Could not unset send timeout, continuing...\n");
-    }
-
-    if (!InternetSetOption(request.get(),
-                           INTERNET_OPTION_RECEIVE_TIMEOUT,
-                           timeout,
-                           sizeof(*timeout))) {
-      fwprintf(stderr, L"Could not unset receive timeout, continuing...\n");
-    }
-  }
-
-  if (!HttpSendRequest(request.get(), NULL, 0,
-                       const_cast<char *>(request_body.data()),
-                       static_cast<DWORD>(request_body.size()))) {
-    return false;
-  }
-
-  // The server indicates a successful upload with HTTP status 200.
-  wchar_t http_status[4];
-  DWORD http_status_size = sizeof(http_status);
-  if (!HttpQueryInfo(request.get(), HTTP_QUERY_STATUS_CODE,
-                     static_cast<LPVOID>(&http_status), &http_status_size,
-                     0)) {
-    return false;
-  }
-
-  int http_response = wcstol(http_status, NULL, 10);
-  if (response_code) {
-    *response_code = http_response;
-  }
+  wstring UTF8ToWide(const string& utf8) {
+    if (utf8.length() == 0) {
+      return wstring();
+    }
+
+    // compute the length of the buffer we'll need
+    int charcount = MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), -1, NULL, 0);
 
-  bool result = (http_response == 200);
+    if (charcount == 0) {
+      return wstring();
+    }
 
-  if (result) {
-    result = ReadResponse(request.get(), response_body);
+    // convert
+    wchar_t* buf = new wchar_t[charcount];
+    MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), -1, buf, charcount);
+    wstring result(buf);
+    delete[] buf;
+    return result;
   }
 
-  return result;
-}
+  string WideToMBCP(const wstring& wide, unsigned int cp) {
+    if (wide.length() == 0) {
+      return string();
+    }
+
+    // compute the length of the buffer we'll need
+    int charcount = WideCharToMultiByte(cp, 0, wide.c_str(), -1,
+        NULL, 0, NULL, NULL);
+    if (charcount == 0) {
+      return string();
+    }
 
-// static
-bool HTTPUpload::ReadResponse(HINTERNET request, wstring *response) {
-  bool has_content_length_header = false;
-  wchar_t content_length[32];
-  DWORD content_length_size = sizeof(content_length);
-  DWORD claimed_size = 0;
-  string response_body;
+    // convert
+    char *buf = new char[charcount];
+    WideCharToMultiByte(cp, 0, wide.c_str(), -1, buf, charcount,
+        NULL, NULL);
 
-  if (HttpQueryInfo(request, HTTP_QUERY_CONTENT_LENGTH,
-                    static_cast<LPVOID>(&content_length),
-                    &content_length_size, 0)) {
-    has_content_length_header = true;
-    claimed_size = wcstol(content_length, NULL, 10);
-    response_body.reserve(claimed_size);
+    string result(buf);
+    delete[] buf;
+    return result;
   }
 
+  bool GetFileContents(const wstring& filename, vector<char>* contents) {
+    bool rv = false;
+    // The "open" method on pre-MSVC8 ifstream implementations doesn't accept a
+    // wchar_t* filename, so use _wfopen directly in that case.  For VC8 and
+    // later, _wfopen has been deprecated in favor of _wfopen_s, which does
+    // not exist in earlier versions, so let the ifstream open the file itself.
+    // GCC doesn't support wide file name and opening on FILE* requires ugly
+    // hacks, so fallback to multi byte file.
+#ifdef _MSC_VER
+    ifstream file;
+    file.open(filename.c_str(), ios::binary);
+#else // GCC
+    ifstream file(WideToMBCP(filename, CP_ACP).c_str(), ios::binary);
+#endif  // _MSC_VER >= 1400
+    if (file.is_open()) {
+      file.seekg(0, ios::end);
+      std::streamoff length = file.tellg();
+      // Check for loss of data when converting lenght from std::streamoff into
+      // std::vector<char>::size_type
+      std::vector<char>::size_type vector_size =
+        static_cast<std::vector<char>::size_type>(length);
+      if (static_cast<std::streamoff>(vector_size) == length) {
+        contents->resize(vector_size);
+        if (length != 0) {
+          file.seekg(0, ios::beg);
+          file.read(&((*contents)[0]), length);
+        }
+        rv = true;
+      }
+      file.close();
+    }
+    return rv;
+  }
 
-  DWORD bytes_available;
-  DWORD total_read = 0;
-  BOOL return_code;
+  bool CheckParameters(const map<wstring, wstring>& parameters) {
+    for (map<wstring, wstring>::const_iterator pos = parameters.begin();
+          pos != parameters.end(); ++pos) {
+      const wstring& str = pos->first;
+      if (str.size() == 0) {
+        return false;  // disallow empty parameter names
+      }
+      for (unsigned int i = 0; i < str.size(); ++i) {
+        wchar_t c = str[i];
+        if (c < 32 || c == '"' || c > 127) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
 
-  while (((return_code = InternetQueryDataAvailable(request, &bytes_available,
-      0, 0)) != 0) && bytes_available > 0) {
-    vector<char> response_buffer(bytes_available);
-    DWORD size_read;
+  // Converts a UTF16 string to UTF8.
+  string WideToUTF8(const wstring& wide) {
+    return WideToMBCP(wide, CP_UTF8);
+  }
 
-    return_code = InternetReadFile(request,
-                                   &response_buffer[0],
-                                   bytes_available, &size_read);
+  bool ReadResponse(HINTERNET request, wstring *response) {
+    bool has_content_length_header = false;
+    wchar_t content_length[32];
+    DWORD content_length_size = sizeof(content_length);
+    DWORD claimed_size = 0;
+    string response_body;
 
-    if (return_code && size_read > 0) {
-      total_read += size_read;
-      response_body.append(&response_buffer[0], size_read);
-    } else {
-      break;
+    if (HttpQueryInfo(request, HTTP_QUERY_CONTENT_LENGTH,
+        static_cast<LPVOID>(&content_length),
+        &content_length_size, 0)) {
+      has_content_length_header = true;
+      claimed_size = wcstol(content_length, NULL, 10);
+      response_body.reserve(claimed_size);
     }
-  }
 
-  bool succeeded = return_code && (!has_content_length_header ||
-                                   (total_read == claimed_size));
-  if (succeeded && response) {
-    *response = UTF8ToWide(response_body);
-  }
+    DWORD bytes_available;
+    DWORD total_read = 0;
+    BOOL return_code;
 
-  return succeeded;
-}
+    while (((return_code = InternetQueryDataAvailable(request, &bytes_available,
+        0, 0)) != 0) && bytes_available > 0) {
+      vector<char> response_buffer(bytes_available);
+      DWORD size_read;
 
-// static
-wstring HTTPUpload::GenerateMultipartBoundary() {
-  // The boundary has 27 '-' characters followed by 16 hex digits
-  static const wchar_t kBoundaryPrefix[] = L"---------------------------";
-  static const int kBoundaryLength = 27 + 16 + 1;
-
-  // Generate some random numbers to fill out the boundary
-  int r0 = rand();
-  int r1 = rand();
+      return_code = InternetReadFile(request,
+          &response_buffer[0],
+          bytes_available, &size_read);
 
-  wchar_t temp[kBoundaryLength];
-  swprintf(temp, kBoundaryLength, L"%s%08X%08X", kBoundaryPrefix, r0, r1);
+      if (return_code && size_read > 0) {
+        total_read += size_read;
+        response_body.append(&response_buffer[0], size_read);
+      }
+      else {
+        break;
+      }
+    }
 
-  // remove when VC++7.1 is no longer supported
-  temp[kBoundaryLength - 1] = L'\0';
+    bool succeeded = return_code && (!has_content_length_header ||
+        (total_read == claimed_size));
+    if (succeeded && response) {
+      *response = UTF8ToWide(response_body);
+    }
+
+    return succeeded;
+  }
+
+  bool SendRequestInner(
+      const wstring& url,
+      const wstring& http_method,
+      const wstring& content_type_header,
+      const string& request_body,
+      int* timeout_ms,
+      wstring* response_body,
+      int* response_code) {
+    if (response_code) {
+      *response_code = 0;
+    }
+
+    // Break up the URL and make sure we can handle it
+    wchar_t scheme[16], host[256], path[1024];
+    URL_COMPONENTS components;
+    memset(&components, 0, sizeof(components));
+    components.dwStructSize = sizeof(components);
+    components.lpszScheme = scheme;
+    components.dwSchemeLength = sizeof(scheme) / sizeof(scheme[0]);
+    components.lpszHostName = host;
+    components.dwHostNameLength = sizeof(host) / sizeof(host[0]);
+    components.lpszUrlPath = path;
+    components.dwUrlPathLength = sizeof(path) / sizeof(path[0]);
+    if (!InternetCrackUrl(url.c_str(), static_cast<DWORD>(url.size()),
+        0, &components)) {
+      DWORD err = GetLastError();
+      wprintf(L"%d\n", err);
+      return false;
+    }
+    bool secure = false;
+    if (wcscmp(scheme, L"https") == 0) {
+      secure = true;
+    }
+    else if (wcscmp(scheme, L"http") != 0) {
+      return false;
+    }
 
-  return wstring(temp);
-}
+    AutoInternetHandle internet(InternetOpen(kUserAgent,
+        INTERNET_OPEN_TYPE_PRECONFIG,
+        NULL,  // proxy name
+        NULL,  // proxy bypass
+        0));   // flags
+    if (!internet.get()) {
+      return false;
+    }
 
-// static
-wstring HTTPUpload::GenerateRequestHeader(const wstring &boundary) {
-  wstring header = L"Content-Type: multipart/form-data; boundary=";
-  header += boundary;
-  return header;
-}
+    AutoInternetHandle connection(InternetConnect(internet.get(),
+        host,
+        components.nPort,
+        NULL,    // user name
+        NULL,    // password
+        INTERNET_SERVICE_HTTP,
+        0,       // flags
+        NULL));  // context
+    if (!connection.get()) {
+      return false;
+    }
 
-// static
-bool HTTPUpload::GenerateRequestBody(const map<wstring, wstring> &parameters,
-                                     const map<wstring, wstring> &files,
-                                     const wstring &boundary,
-                                     string *request_body) {
-  string boundary_str = WideToUTF8(boundary);
-  if (boundary_str.empty()) {
-    return false;
-  }
-
-  request_body->clear();
-
-  // Append each of the parameter pairs as a form-data part
-  for (map<wstring, wstring>::const_iterator pos = parameters.begin();
-       pos != parameters.end(); ++pos) {
-    request_body->append("--" + boundary_str + "\r\n");
-    request_body->append("Content-Disposition: form-data; name=\"" +
-                         WideToUTF8(pos->first) + "\"\r\n\r\n" +
-                         WideToUTF8(pos->second) + "\r\n");
-  }
+    DWORD http_open_flags = secure ? INTERNET_FLAG_SECURE : 0;
+    http_open_flags |= INTERNET_FLAG_NO_COOKIES;
+    AutoInternetHandle request(HttpOpenRequest(connection.get(),
+        http_method.c_str(),
+        path,
+        NULL,    // version
+        NULL,    // referer
+        NULL,    // agent type
+        http_open_flags,
+        NULL));  // context
+    if (!request.get()) {
+      return false;
+    }
 
-  for (map<wstring, wstring>::const_iterator pos = files.begin();
-       pos != files.end(); ++pos) {
-    vector<char> contents;
-    if (!GetFileContents(pos->second, &contents)) {
+    if (!content_type_header.empty()) {
+      HttpAddRequestHeaders(request.get(),
+          content_type_header.c_str(),
+          static_cast<DWORD>(-1),
+          HTTP_ADDREQ_FLAG_ADD);
+    }
+
+    if (timeout_ms) {
+      if (!InternetSetOption(request.get(),
+          INTERNET_OPTION_SEND_TIMEOUT,
+          timeout_ms,
+          sizeof(*timeout_ms))) {
+        fwprintf(stderr, L"Could not unset send timeout, continuing...\n");
+      }
+
+      if (!InternetSetOption(request.get(),
+          INTERNET_OPTION_RECEIVE_TIMEOUT,
+          timeout_ms,
+          sizeof(*timeout_ms))) {
+        fwprintf(stderr, L"Could not unset receive timeout, continuing...\n");
+      }
+    }
+
+    if (!HttpSendRequest(request.get(), NULL, 0,
+        const_cast<char*>(request_body.data()),
+        static_cast<DWORD>(request_body.size()))) {
       return false;
     }
 
-    // Now append the upload files as a binary (octet-stream) part
-    string filename_utf8 = WideToUTF8(pos->second);
-    if (filename_utf8.empty()) {
+    // The server indicates a successful upload with HTTP status 200.
+    wchar_t http_status[4];
+    DWORD http_status_size = sizeof(http_status);
+    if (!HttpQueryInfo(request.get(), HTTP_QUERY_STATUS_CODE,
+        static_cast<LPVOID>(&http_status), &http_status_size,
+        0)) {
       return false;
     }
 
-    string file_part_name_utf8 = WideToUTF8(pos->first);
+    int http_response = wcstol(http_status, NULL, 10);
+    if (response_code) {
+      *response_code = http_response;
+    }
+
+    bool result = (http_response == 200);
+
+    if (result) {
+      result = ReadResponse(request.get(), response_body);
+    }
+
+    return result;
+  }
+
+  wstring GenerateMultipartBoundary() {
+    // The boundary has 27 '-' characters followed by 16 hex digits
+    static const wchar_t kBoundaryPrefix[] = L"---------------------------";
+    static const int kBoundaryLength = 27 + 16 + 1;
+
+    // Generate some random numbers to fill out the boundary
+    int r0 = rand();
+    int r1 = rand();
+
+    wchar_t temp[kBoundaryLength];
+    swprintf(temp, kBoundaryLength, L"%s%08X%08X", kBoundaryPrefix, r0, r1);
+
+    // remove when VC++7.1 is no longer supported
+    temp[kBoundaryLength - 1] = L'\0';
+
+    return wstring(temp);
+  }
+
+  wstring GenerateMultipartPostRequestHeader(const wstring& boundary) {
+    wstring header = L"Content-Type: multipart/form-data; boundary=";
+    header += boundary;
+    return header;
+  }
+
+  bool AppendFileToRequestBody(
+      const wstring& file_part_name,
+      const wstring& filename,
+      string* request_body) {
+    string file_part_name_utf8 = WideToUTF8(file_part_name);
     if (file_part_name_utf8.empty()) {
       return false;
     }
 
-    request_body->append("--" + boundary_str + "\r\n");
+    string filename_utf8 = WideToUTF8(filename);
+    if (filename_utf8.empty()) {
+      return false;
+    }
+
     request_body->append("Content-Disposition: form-data; "
-      "name=\"" + file_part_name_utf8 + "\"; "
-      "filename=\"" + filename_utf8 + "\"\r\n");
+        "name=\"" + file_part_name_utf8 + "\"; "
+        "filename=\"" + filename_utf8 + "\"\r\n");
     request_body->append("Content-Type: application/octet-stream\r\n");
     request_body->append("\r\n");
 
+    vector<char> contents;
+    if (!GetFileContents(filename, &contents)) {
+      return false;
+    }
+
     if (!contents.empty()) {
       request_body->append(&(contents[0]), contents.size());
     }
     request_body->append("\r\n");
-  }
-  request_body->append("--" + boundary_str + "--\r\n");
-  return true;
-}
-
-// static
-bool HTTPUpload::GetFileContents(const wstring &filename,
-                                 vector<char> *contents) {
-  bool rv = false;
-  // The "open" method on pre-MSVC8 ifstream implementations doesn't accept a
-  // wchar_t* filename, so use _wfopen directly in that case.  For VC8 and
-  // later, _wfopen has been deprecated in favor of _wfopen_s, which does
-  // not exist in earlier versions, so let the ifstream open the file itself.
-  // GCC doesn't support wide file name and opening on FILE* requires ugly
-  // hacks, so fallback to multi byte file.
-#ifdef _MSC_VER
-  ifstream file;
-  file.open(filename.c_str(), ios::binary);
-#else // GCC
-  ifstream file(WideToMBCP(filename, CP_ACP).c_str(), ios::binary);
-#endif  // _MSC_VER >= 1400
-  if (file.is_open()) {
-    file.seekg(0, ios::end);
-    std::streamoff length = file.tellg();
-    // Check for loss of data when converting lenght from std::streamoff into
-    // std::vector<char>::size_type
-    std::vector<char>::size_type vector_size =
-        static_cast<std::vector<char>::size_type>(length);
-    if (static_cast<std::streamoff>(vector_size) == length) {
-      contents->resize(vector_size);
-      if (length != 0) {
-        file.seekg(0, ios::beg);
-        file.read(&((*contents)[0]), length);
-      }
-      rv = true;
-    }
-    file.close();
-  }
-  return rv;
-}
 
-// static
-wstring HTTPUpload::UTF8ToWide(const string &utf8) {
-  if (utf8.length() == 0) {
-    return wstring();
+    return true;
   }
 
-  // compute the length of the buffer we'll need
-  int charcount = MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), -1, NULL, 0);
-
-  if (charcount == 0) {
-    return wstring();
-  }
+  bool GenerateRequestBody(const map<wstring, wstring>& parameters,
+      const map<wstring, wstring>& files,
+      const wstring& boundary,
+      string *request_body) {
+    string boundary_str = WideToUTF8(boundary);
+    if (boundary_str.empty()) {
+      return false;
+    }
 
-  // convert
-  wchar_t* buf = new wchar_t[charcount];
-  MultiByteToWideChar(CP_UTF8, 0, utf8.c_str(), -1, buf, charcount);
-  wstring result(buf);
-  delete[] buf;
-  return result;
-}
+    request_body->clear();
 
-// static
-string HTTPUpload::WideToMBCP(const wstring &wide, unsigned int cp) {
-  if (wide.length() == 0) {
-    return string();
-  }
-
-  // compute the length of the buffer we'll need
-  int charcount = WideCharToMultiByte(cp, 0, wide.c_str(), -1,
-                                      NULL, 0, NULL, NULL);
-  if (charcount == 0) {
-    return string();
-  }
-
-  // convert
-  char *buf = new char[charcount];
-  WideCharToMultiByte(cp, 0, wide.c_str(), -1, buf, charcount,
-                      NULL, NULL);
-
-  string result(buf);
-  delete[] buf;
-  return result;
-}
+    // Append each of the parameter pairs as a form-data part
+    for (map<wstring, wstring>::const_iterator pos = parameters.begin();
+        pos != parameters.end(); ++pos) {
+      request_body->append("--" + boundary_str + "\r\n");
+      request_body->append("Content-Disposition: form-data; name=\"" +
+          WideToUTF8(pos->first) + "\"\r\n\r\n" +
+          WideToUTF8(pos->second) + "\r\n");
+    }
+
+    // Now append each upload file as a binary (octet-stream) part
+    for (map<wstring, wstring>::const_iterator pos = files.begin();
+        pos != files.end(); ++pos) {
+      request_body->append("--" + boundary_str + "\r\n");
 
-// static
-bool HTTPUpload::CheckParameters(const map<wstring, wstring> &parameters) {
-  for (map<wstring, wstring>::const_iterator pos = parameters.begin();
-       pos != parameters.end(); ++pos) {
-    const wstring &str = pos->first;
-    if (str.size() == 0) {
-      return false;  // disallow empty parameter names
-    }
-    for (unsigned int i = 0; i < str.size(); ++i) {
-      wchar_t c = str[i];
-      if (c < 32 || c == '"' || c > 127) {
+      if (!AppendFileToRequestBody(pos->first, pos->second, request_body)) {
         return false;
       }
     }
+    request_body->append("--" + boundary_str + "--\r\n");
+    return true;
   }
-  return true;
 }
 
+namespace google_breakpad {
+  bool HTTPUpload::SendPutRequest(
+      const wstring& url,
+      const wstring& path,
+      int* timeout_ms,
+      wstring* response_body,
+      int* response_code) {
+    string request_body;
+    if (!AppendFileToRequestBody(L"symbol_file", path, &request_body)) {
+      return false;
+    }
+
+    return SendRequestInner(
+        url,
+        L"PUT",
+        L"",
+        request_body,
+        timeout_ms,
+        response_body,
+        response_code);
+  }
+
+  bool HTTPUpload::SendGetRequest(
+      const wstring& url,
+      int* timeout_ms,
+      wstring* response_body,
+      int* response_code) {
+    return SendRequestInner(
+        url,
+        L"GET",
+        L"",
+        "",
+        timeout_ms,
+        response_body,
+        response_code);
+  }
+
+  bool HTTPUpload::SendMultipartPostRequest(
+      const wstring& url,
+      const map<wstring, wstring>& parameters,
+      const map<wstring, wstring>& files,
+      int* timeout_ms,
+      wstring* response_body,
+      int* response_code) {
+    // TODO(bryner): support non-ASCII parameter names
+    if (!CheckParameters(parameters)) {
+      return false;
+    }
+
+    wstring boundary = GenerateMultipartBoundary();
+    wstring content_type_header = GenerateMultipartPostRequestHeader(boundary);
+
+    string request_body;
+    if (!GenerateRequestBody(parameters, files, boundary, &request_body)) {
+      return false;
+    }
+
+    return SendRequestInner(
+        url,
+        L"POST",
+        content_type_header,
+        request_body,
+        timeout_ms,
+        response_body,
+        response_code);
+  }
+
+  bool HTTPUpload::SendSimplePostRequest(
+      const wstring& url,
+      const wstring& body,
+      const wstring& content_type,
+      int *timeout_ms,
+      wstring *response_body,
+      int *response_code) {
+    return SendRequestInner(
+        url,
+        L"POST",
+        content_type,
+        WideToUTF8(body),
+        timeout_ms,
+        response_body,
+        response_code);
+  }
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/http_upload.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/http_upload.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/http_upload.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/http_upload.h	2021-12-09 12:01:26.000000000 +0000
@@ -42,18 +42,41 @@
 #include <wininet.h>
 
 #include <map>
-#include <string>
-#include <vector>
 
 namespace google_breakpad {
 
 using std::string;
 using std::wstring;
 using std::map;
-using std::vector;
 
 class HTTPUpload {
  public:
+  // Sends a PUT request containing the data in |path| to the given
+  // URL.
+  // Only HTTP(S) URLs are currently supported.  Returns true on success.
+  // If the request is successful and response_body is non-NULL,
+  // the response body will be returned in response_body.
+  // If response_code is non-NULL, it will be set to the HTTP response code
+  // received (or 0 if the request failed before getting an HTTP response).
+  static bool SendPutRequest(
+      const wstring& url,
+      const wstring& path,
+      int* timeout_ms,
+      wstring* response_body,
+      int* response_code);
+
+  // Sends a GET request to the given URL.
+  // Only HTTP(S) URLs are currently supported.  Returns true on success.
+  // If the request is successful and response_body is non-NULL,
+  // the response body will be returned in response_body.
+  // If response_code is non-NULL, it will be set to the HTTP response code
+  // received (or 0 if the request failed before getting an HTTP response).
+  static bool SendGetRequest(
+      const wstring& url,
+      int* timeout_ms,
+      wstring* response_body,
+      int* response_code);
+
   // Sends the given sets of parameters and files as a multipart POST
   // request to the given URL.
   // Each key in |files| is the name of the file part of the request
@@ -65,60 +88,34 @@
   // the response body will be returned in response_body.
   // If response_code is non-NULL, it will be set to the HTTP response code
   // received (or 0 if the request failed before getting an HTTP response).
-  static bool SendRequest(const wstring &url,
-                          const map<wstring, wstring> &parameters,
-                          const map<wstring, wstring> &files,
-                          int *timeout,
-                          wstring *response_body,
-                          int *response_code);
+  static bool SendMultipartPostRequest(
+      const wstring& url,
+      const map<wstring, wstring>& parameters,
+      const map<wstring, wstring>& files,
+      int *timeout_ms,
+      wstring *response_body,
+      int *response_code);
 
- private:
-  class AutoInternetHandle;
-
-  // Retrieves the HTTP response.  If NULL is passed in for response,
-  // this merely checks (via the return value) that we were successfully
-  // able to retrieve exactly as many bytes of content in the response as
-  // were specified in the Content-Length header.
-  static bool ReadResponse(HINTERNET request, wstring* response);
-
-  // Generates a new multipart boundary for a POST request
-  static wstring GenerateMultipartBoundary();
-
-  // Generates a HTTP request header for a multipart form submit.
-  static wstring GenerateRequestHeader(const wstring &boundary);
-
-  // Given a set of parameters, a set of upload files, and a file part name,
-  // generates a multipart request body string with these parameters
-  // and minidump contents.  Returns true on success.
-  static bool GenerateRequestBody(const map<wstring, wstring> &parameters,
-                                  const map<wstring, wstring> &files,
-                                  const wstring &boundary,
-                                  string *request_body);
-
-  // Fills the supplied vector with the contents of filename.
-  static bool GetFileContents(const wstring &filename, vector<char> *contents);
-
-  // Converts a UTF8 string to UTF16.
-  static wstring UTF8ToWide(const string &utf8);
-
-  // Converts a UTF16 string to UTF8.
-  static string WideToUTF8(const wstring &wide) {
-      return WideToMBCP(wide, CP_UTF8);
-  }
-
-  // Converts a UTF16 string to specified code page.
-  static string WideToMBCP(const wstring &wide, unsigned int cp);
-
-  // Checks that the given list of parameters has only printable
-  // ASCII characters in the parameter name, and does not contain
-  // any quote (") characters.  Returns true if so.
-  static bool CheckParameters(const map<wstring, wstring> &parameters);
+  // Sends a POST request, with the body set to |body|, to the given URL.
+  // Only HTTP(S) URLs are currently supported.  Returns true on success.
+  // If the request is successful and response_body is non-NULL,
+  // the response body will be returned in response_body.
+  // If response_code is non-NULL, it will be set to the HTTP response code
+  // received (or 0 if the request failed before getting an HTTP response).
+  static bool SendSimplePostRequest(
+      const wstring& url,
+      const wstring& body,
+      const wstring& content_type,
+      int *timeout_ms,
+      wstring *response_body,
+      int *response_code);
 
+ private:
   // No instances of this class should be created.
   // Disallow all constructors, destructors, and operator=.
   HTTPUpload();
-  explicit HTTPUpload(const HTTPUpload &);
-  void operator=(const HTTPUpload &);
+  explicit HTTPUpload(const HTTPUpload&);
+  void operator=(const HTTPUpload&);
   ~HTTPUpload();
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/module_info.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/module_info.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/module_info.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/module_info.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,75 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef COMMON_WINDOWS_MODULE_INFO_H_
+#define COMMON_WINDOWS_MODULE_INFO_H_
+
+#include <string>
+
+namespace google_breakpad {
+
+using std::wstring;
+// A structure that carries information that identifies a module.
+struct PDBModuleInfo {
+public:
+  // The basename of the pe/pdb file from which information was loaded.
+  wstring debug_file;
+
+  // The module's identifier.  For recent pe/pdb files, the identifier consists
+  // of the pe/pdb's guid, in uppercase hexadecimal form without any dashes
+  // or separators, followed immediately by the pe/pdb's age, also in
+  // uppercase hexadecimal form.  For older pe/pdb files which have no guid,
+  // the identifier is the pe/pdb's 32-bit signature value, in zero-padded
+  // hexadecimal form, followed immediately by the pe/pdb's age, in lowercase
+  // hexadecimal form.
+  wstring debug_identifier;
+
+  // A string identifying the cpu that the pe/pdb is associated with.
+  // Currently, this may be "x86" or "unknown".
+  wstring cpu;
+};
+
+// A structure that carries information that identifies a PE file,
+// either an EXE or a DLL.
+struct PEModuleInfo {
+  // The basename of the PE file.
+  wstring code_file;
+
+  // The PE file's code identifier, which consists of its timestamp
+  // and file size concatenated together into a single hex string.
+  // (The fields IMAGE_OPTIONAL_HEADER::SizeOfImage and
+  // IMAGE_FILE_HEADER::TimeDateStamp, as defined in the ImageHlp
+  // documentation.) This is not well documented, if it's documented
+  // at all, but it's what symstore does and what DbgHelp supports.
+  wstring code_identifier;
+};
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_WINDOWS_MODULE_INFO_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/omap.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/omap.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/omap.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/omap.cc	2021-12-09 12:01:26.000000000 +0000
@@ -449,11 +449,11 @@
   }
 }
 
-void BuildSubsequentRVAMap(const OmapData &omap_data,
-                           std::map<DWORD, DWORD> *subsequent) {
+void BuildSubsequentRVAMap(const OmapData& omap_data,
+                           std::map<DWORD, DWORD>* subsequent) {
   assert(subsequent->empty());
-  const OmapFromTable &orig2tran =
-      reinterpret_cast<const OmapFromTable &>(omap_data.omap_from);
+  const OmapFromTable& orig2tran =
+      reinterpret_cast<const OmapFromTable&>(omap_data.omap_from);
 
   if (orig2tran.empty())
     return;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pdb_source_line_writer.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pdb_source_line_writer.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pdb_source_line_writer.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pdb_source_line_writer.cc	2021-12-09 12:01:26.000000000 +0000
@@ -45,6 +45,7 @@
 
 #include "common/windows/dia_util.h"
 #include "common/windows/guid_string.h"
+#include "common/windows/pe_util.h"
 #include "common/windows/string_utils-inl.h"
 
 // This constant may be missing from DbgHelp.h.  See the documentation for
@@ -53,56 +54,6 @@
 #define UNDNAME_NO_ECSU 0x8000  // Suppresses enum/class/struct/union.
 #endif  // UNDNAME_NO_ECSU
 
-/*
- * Not defined in WinNT.h for some reason. Definitions taken from:
- * http://uninformed.org/index.cgi?v=4&a=1&p=13
- *
- */
-typedef unsigned char UBYTE;
-
-#if !defined(_WIN64)
-#define UNW_FLAG_EHANDLER  0x01
-#define UNW_FLAG_UHANDLER  0x02
-#define UNW_FLAG_CHAININFO 0x04
-#endif
-
-union UnwindCode {
-  struct {
-    UBYTE offset_in_prolog;
-    UBYTE unwind_operation_code : 4;
-    UBYTE operation_info        : 4;
-  };
-  USHORT frame_offset;
-};
-
-enum UnwindOperationCodes {
-  UWOP_PUSH_NONVOL = 0, /* info == register number */
-  UWOP_ALLOC_LARGE,     /* no info, alloc size in next 2 slots */
-  UWOP_ALLOC_SMALL,     /* info == size of allocation / 8 - 1 */
-  UWOP_SET_FPREG,       /* no info, FP = RSP + UNWIND_INFO.FPRegOffset*16 */
-  UWOP_SAVE_NONVOL,     /* info == register number, offset in next slot */
-  UWOP_SAVE_NONVOL_FAR, /* info == register number, offset in next 2 slots */
-  // XXX: these are missing from MSDN!
-  // See: http://www.osronline.com/ddkx/kmarch/64bitamd_4rs7.htm
-  UWOP_SAVE_XMM,
-  UWOP_SAVE_XMM_FAR,
-  UWOP_SAVE_XMM128,     /* info == XMM reg number, offset in next slot */
-  UWOP_SAVE_XMM128_FAR, /* info == XMM reg number, offset in next 2 slots */
-  UWOP_PUSH_MACHFRAME   /* info == 0: no error-code, 1: error-code */
-};
-
-// See: http://msdn.microsoft.com/en-us/library/ddssxxy8.aspx
-// Note: some fields removed as we don't use them.
-struct UnwindInfo {
-  UBYTE version       : 3;
-  UBYTE flags         : 5;
-  UBYTE size_of_prolog;
-  UBYTE count_of_codes;
-  UBYTE frame_register : 4;
-  UBYTE frame_offset   : 4;
-  UnwindCode unwind_code[1];
-};
-
 namespace google_breakpad {
 
 namespace {
@@ -157,21 +108,7 @@
   }
 }
 
-// A helper class to scope a PLOADED_IMAGE.
-class AutoImage {
- public:
-  explicit AutoImage(PLOADED_IMAGE img) : img_(img) {}
-  ~AutoImage() {
-    if (img_)
-      ImageUnload(img_);
-  }
-
-  operator PLOADED_IMAGE() { return img_; }
-  PLOADED_IMAGE operator->() { return img_; }
 
- private:
-  PLOADED_IMAGE img_;
-};
 
 bool SymbolsMatch(IDiaSymbol* a, IDiaSymbol* b) {
   DWORD a_section, a_offset, b_section, b_offset;
@@ -183,7 +120,7 @@
   return a_section == b_section && a_offset == b_offset;
 }
 
-bool CreateDiaDataSourceInstance(CComPtr<IDiaDataSource> &data_source) {
+bool CreateDiaDataSourceInstance(CComPtr<IDiaDataSource>& data_source) {
   if (SUCCEEDED(data_source.CoCreateInstance(CLSID_DiaSource))) {
     return true;
   }
@@ -197,7 +134,7 @@
   // We can try loading the DLL corresponding to the #included DIA SDK, but
   // the DIA headers don't provide a version. Lets try to figure out which DIA
   // version we're compiling against by comparing CLSIDs.
-  const wchar_t *msdia_dll = nullptr;
+  const wchar_t* msdia_dll = nullptr;
   if (CLSID_DiaSource == _uuidof(DiaSource100)) {
     msdia_dll = L"msdia100.dll";
   } else if (CLSID_DiaSource == _uuidof(DiaSource110)) {
@@ -210,7 +147,7 @@
 
   if (msdia_dll &&
       SUCCEEDED(NoRegCoCreate(msdia_dll, CLSID_DiaSource, IID_IDiaDataSource,
-                              reinterpret_cast<void **>(&data_source)))) {
+                              reinterpret_cast<void**>(&data_source)))) {
     return true;
   }
 
@@ -223,9 +160,10 @@
 }
 
 PDBSourceLineWriter::~PDBSourceLineWriter() {
+  Close();
 }
 
-bool PDBSourceLineWriter::SetCodeFile(const wstring &exe_file) {
+bool PDBSourceLineWriter::SetCodeFile(const wstring& exe_file) {
   if (code_file_.empty()) {
     code_file_ = exe_file;
     return true;
@@ -235,7 +173,7 @@
   return exe_file == code_file_;
 }
 
-bool PDBSourceLineWriter::Open(const wstring &file, FileFormat format) {
+bool PDBSourceLineWriter::Open(const wstring& file, FileFormat format) {
   Close();
   code_file_.clear();
 
@@ -290,7 +228,7 @@
   return true;
 }
 
-bool PDBSourceLineWriter::PrintLines(IDiaEnumLineNumbers *lines) {
+bool PDBSourceLineWriter::PrintLines(IDiaEnumLineNumbers* lines) {
   // The line number format is:
   // <rva> <line number> <source file id>
   CComPtr<IDiaLineNumber> line;
@@ -334,8 +272,8 @@
   return true;
 }
 
-bool PDBSourceLineWriter::PrintFunction(IDiaSymbol *function,
-                                        IDiaSymbol *block,
+bool PDBSourceLineWriter::PrintFunction(IDiaSymbol* function,
+                                        IDiaSymbol* block,
                                         bool has_multiple_symbols) {
   // The function format is:
   // FUNC <address> <length> <param_stack_size> <function>
@@ -728,131 +666,7 @@
     return false;
   }
 
-  // Convert wchar to native charset because ImageLoad only takes
-  // a PSTR as input.
-  string code_file;
-  if (!WindowsStringUtils::safe_wcstombs(code_file_, &code_file)) {
-    return false;
-  }
-
-  AutoImage img(ImageLoad((PSTR)code_file.c_str(), NULL));
-  if (!img) {
-    fprintf(stderr, "Failed to load %s\n", code_file.c_str());
-    return false;
-  }
-  PIMAGE_OPTIONAL_HEADER64 optional_header =
-    &(reinterpret_cast<PIMAGE_NT_HEADERS64>(img->FileHeader))->OptionalHeader;
-  if (optional_header->Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
-    fprintf(stderr, "Not a PE32+ image\n");
-    return false;
-  }
-
-  // Read Exception Directory
-  DWORD exception_rva = optional_header->
-    DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress;
-  DWORD exception_size = optional_header->
-    DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size;
-  PIMAGE_RUNTIME_FUNCTION_ENTRY funcs =
-    static_cast<PIMAGE_RUNTIME_FUNCTION_ENTRY>(
-        ImageRvaToVa(img->FileHeader,
-                     img->MappedAddress,
-                     exception_rva,
-                     &img->LastRvaSection));
-  for (DWORD i = 0; i < exception_size / sizeof(*funcs); i++) {
-    DWORD unwind_rva = funcs[i].UnwindInfoAddress;
-    // handle chaining
-    while (unwind_rva & 0x1) {
-      unwind_rva ^= 0x1;
-      PIMAGE_RUNTIME_FUNCTION_ENTRY chained_func =
-        static_cast<PIMAGE_RUNTIME_FUNCTION_ENTRY>(
-            ImageRvaToVa(img->FileHeader,
-                         img->MappedAddress,
-                         unwind_rva,
-                         &img->LastRvaSection));
-      unwind_rva = chained_func->UnwindInfoAddress;
-    }
-
-    UnwindInfo *unwind_info = static_cast<UnwindInfo *>(
-        ImageRvaToVa(img->FileHeader,
-                     img->MappedAddress,
-                     unwind_rva,
-                     &img->LastRvaSection));
-
-    DWORD stack_size = 8;  // minimal stack size is 8 for RIP
-    DWORD rip_offset = 8;
-    do {
-      for (UBYTE c = 0; c < unwind_info->count_of_codes; c++) {
-        UnwindCode *unwind_code = &unwind_info->unwind_code[c];
-        switch (unwind_code->unwind_operation_code) {
-          case UWOP_PUSH_NONVOL: {
-            stack_size += 8;
-            break;
-          }
-          case UWOP_ALLOC_LARGE: {
-            if (unwind_code->operation_info == 0) {
-              c++;
-              if (c < unwind_info->count_of_codes)
-                stack_size += (unwind_code + 1)->frame_offset * 8;
-            } else {
-              c += 2;
-              if (c < unwind_info->count_of_codes)
-                stack_size += (unwind_code + 1)->frame_offset |
-                              ((unwind_code + 2)->frame_offset << 16);
-            }
-            break;
-          }
-          case UWOP_ALLOC_SMALL: {
-            stack_size += unwind_code->operation_info * 8 + 8;
-            break;
-          }
-          case UWOP_SET_FPREG:
-          case UWOP_SAVE_XMM:
-          case UWOP_SAVE_XMM_FAR:
-            break;
-          case UWOP_SAVE_NONVOL:
-          case UWOP_SAVE_XMM128: {
-            c++;  // skip slot with offset
-            break;
-          }
-          case UWOP_SAVE_NONVOL_FAR:
-          case UWOP_SAVE_XMM128_FAR: {
-            c += 2;  // skip 2 slots with offset
-            break;
-          }
-          case UWOP_PUSH_MACHFRAME: {
-            if (unwind_code->operation_info) {
-              stack_size += 88;
-            } else {
-              stack_size += 80;
-            }
-            rip_offset += 80;
-            break;
-          }
-        }
-      }
-      if (unwind_info->flags & UNW_FLAG_CHAININFO) {
-        PIMAGE_RUNTIME_FUNCTION_ENTRY chained_func =
-          reinterpret_cast<PIMAGE_RUNTIME_FUNCTION_ENTRY>(
-              (unwind_info->unwind_code +
-              ((unwind_info->count_of_codes + 1) & ~1)));
-
-        unwind_info = static_cast<UnwindInfo *>(
-            ImageRvaToVa(img->FileHeader,
-                         img->MappedAddress,
-                         chained_func->UnwindInfoAddress,
-                         &img->LastRvaSection));
-      } else {
-        unwind_info = NULL;
-      }
-    } while (unwind_info);
-    fprintf(output_, "STACK CFI INIT %lx %lx .cfa: $rsp .ra: .cfa %lu - ^\n",
-            funcs[i].BeginAddress,
-            funcs[i].EndAddress - funcs[i].BeginAddress, rip_offset);
-    fprintf(output_, "STACK CFI %lx .cfa: $rsp %lu +\n",
-            funcs[i].BeginAddress, stack_size);
-  }
-
-  return true;
+  return PrintPEFrameData(code_file_, output_);
 }
 
 bool PDBSourceLineWriter::PrintFrameData() {
@@ -865,7 +679,7 @@
   return false;
 }
 
-bool PDBSourceLineWriter::PrintCodePublicSymbol(IDiaSymbol *symbol,
+bool PDBSourceLineWriter::PrintCodePublicSymbol(IDiaSymbol* symbol,
                                                 bool has_multiple_symbols) {
   BOOL is_code;
   if (FAILED(symbol->get_code(&is_code))) {
@@ -967,9 +781,9 @@
 // and scanf families, which are not as strict about input and in some cases
 // don't provide a good way for the caller to determine if a conversion was
 // successful.
-static bool wcstol_positive_strict(wchar_t *string, int *result) {
+static bool wcstol_positive_strict(wchar_t* string, int* result) {
   int value = 0;
-  for (wchar_t *c = string; *c != '\0'; ++c) {
+  for (wchar_t* c = string; *c != '\0'; ++c) {
     int last_value = value;
     value *= 10;
     // Detect overflow.
@@ -1007,7 +821,7 @@
     wstring file(symbols_file);
 
     // Look for an EXE or DLL file.
-    const wchar_t *extensions[] = { L"exe", L"dll" };
+    const wchar_t* extensions[] = { L"exe", L"dll" };
     for (size_t i = 0; i < sizeof(extensions) / sizeof(extensions[0]); i++) {
       size_t dot_pos = file.find_last_of(L".");
       if (dot_pos != wstring::npos) {
@@ -1025,9 +839,9 @@
 }
 
 // static
-bool PDBSourceLineWriter::GetSymbolFunctionName(IDiaSymbol *function,
-                                                BSTR *name,
-                                                int *stack_param_size) {
+bool PDBSourceLineWriter::GetSymbolFunctionName(IDiaSymbol* function,
+                                                BSTR* name,
+                                                int* stack_param_size) {
   *stack_param_size = -1;
   const DWORD undecorate_options = UNDNAME_NO_MS_KEYWORDS |
                                    UNDNAME_NO_FUNCTION_RETURNS |
@@ -1068,12 +882,12 @@
     // C++ uses a bogus "void" argument for functions and methods that don't
     // take any parameters.  Take it out of the undecorated name because it's
     // ugly and unnecessary.
-    const wchar_t *replace_string = L"(void)";
+    const wchar_t* replace_string = L"(void)";
     const size_t replace_length = wcslen(replace_string);
-    const wchar_t *replacement_string = L"()";
+    const wchar_t* replacement_string = L"()";
     size_t length = wcslen(*name);
     if (length >= replace_length) {
-      wchar_t *name_end = *name + length - replace_length;
+      wchar_t* name_end = *name + length - replace_length;
       if (wcscmp(name_end, replace_string) == 0) {
         WindowsStringUtils::safe_wcscpy(name_end, replace_length,
                                         replacement_string);
@@ -1089,7 +903,7 @@
     // whether the undecorated name contains any ':' or '(' characters.
     if (!wcschr(*name, ':') && !wcschr(*name, '(') &&
         (*name[0] == '_' || *name[0] == '@')) {
-      wchar_t *last_at = wcsrchr(*name + 1, '@');
+      wchar_t* last_at = wcsrchr(*name + 1, '@');
       if (last_at && wcstol_positive_strict(last_at + 1, stack_param_size)) {
         // If this function adheres to the fastcall convention, it accepts up
         // to the first 8 bytes of parameters in registers (%ecx and %edx).
@@ -1121,7 +935,7 @@
 }
 
 // static
-int PDBSourceLineWriter::GetFunctionStackParamSize(IDiaSymbol *function) {
+int PDBSourceLineWriter::GetFunctionStackParamSize(IDiaSymbol* function) {
   // This implementation is highly x86-specific.
 
   // Gather the symbols corresponding to data.
@@ -1236,8 +1050,8 @@
   return param_size;
 }
 
-bool PDBSourceLineWriter::WriteMap(FILE *map_file) {
-  output_ = map_file;
+bool PDBSourceLineWriter::WriteSymbols(FILE* symbol_file) {
+  output_ = symbol_file;
 
   // Load the OMAP information, and disable auto-translation of addresses in
   // preference of doing it ourselves.
@@ -1259,10 +1073,12 @@
 }
 
 void PDBSourceLineWriter::Close() {
-  session_.Release();
+  if (session_ != nullptr) {
+    session_.Release();
+  }
 }
 
-bool PDBSourceLineWriter::GetModuleInfo(PDBModuleInfo *info) {
+bool PDBSourceLineWriter::GetModuleInfo(PDBModuleInfo* info) {
   if (!info) {
     return false;
   }
@@ -1284,17 +1100,7 @@
     // Instead, it returns one of the IMAGE_FILE_MACHINE values as
     // defined here:
     // http://msdn.microsoft.com/en-us/library/ms680313%28VS.85%29.aspx
-    switch (machine_type) {
-      case IMAGE_FILE_MACHINE_I386:
-        info->cpu = L"x86";
-        break;
-      case IMAGE_FILE_MACHINE_AMD64:
-        info->cpu = L"x86_64";
-        break;
-      default:
-        info->cpu = L"unknown";
-        break;
-    }
+    info->cpu = FileHeaderMachineToCpuString(static_cast<WORD>(machine_type));
   } else {
     // Unexpected, but handle gracefully.
     info->cpu = L"unknown";
@@ -1317,35 +1123,14 @@
       return false;
     }
 
-    // Use the same format that the MS symbol server uses in filesystem
-    // hierarchies.
-    wchar_t age_string[9];
-    swprintf(age_string, sizeof(age_string) / sizeof(age_string[0]),
-             L"%x", age);
-
-    // remove when VC++7.1 is no longer supported
-    age_string[sizeof(age_string) / sizeof(age_string[0]) - 1] = L'\0';
-
-    info->debug_identifier = GUIDString::GUIDToSymbolServerWString(&guid);
-    info->debug_identifier.append(age_string);
+    info->debug_identifier = GenerateDebugIdentifier(age, guid);
   } else {
     DWORD signature;
     if (FAILED(global->get_signature(&signature))) {
       return false;
     }
 
-    // Use the same format that the MS symbol server uses in filesystem
-    // hierarchies.
-    wchar_t identifier_string[17];
-    swprintf(identifier_string,
-             sizeof(identifier_string) / sizeof(identifier_string[0]),
-             L"%08X%x", signature, age);
-
-    // remove when VC++7.1 is no longer supported
-    identifier_string[sizeof(identifier_string) /
-                      sizeof(identifier_string[0]) - 1] = L'\0';
-
-    info->debug_identifier = identifier_string;
+    info->debug_identifier = GenerateDebugIdentifier(age, signature);
   }
 
   CComBSTR debug_file_string;
@@ -1358,7 +1143,7 @@
   return true;
 }
 
-bool PDBSourceLineWriter::GetPEInfo(PEModuleInfo *info) {
+bool PDBSourceLineWriter::GetPEInfo(PEModuleInfo* info) {
   if (!info) {
     return false;
   }
@@ -1368,44 +1153,10 @@
     return false;
   }
 
-  // Convert wchar to native charset because ImageLoad only takes
-  // a PSTR as input.
-  string code_file;
-  if (!WindowsStringUtils::safe_wcstombs(code_file_, &code_file)) {
-    return false;
-  }
-
-  AutoImage img(ImageLoad((PSTR)code_file.c_str(), NULL));
-  if (!img) {
-    fprintf(stderr, "Failed to open PE file: %s\n", code_file.c_str());
-    return false;
-  }
-
-  info->code_file = WindowsStringUtils::GetBaseName(code_file_);
-
-  // The date and time that the file was created by the linker.
-  DWORD TimeDateStamp = img->FileHeader->FileHeader.TimeDateStamp;
-  // The size of the file in bytes, including all headers.
-  DWORD SizeOfImage = 0;
-  PIMAGE_OPTIONAL_HEADER64 opt =
-    &((PIMAGE_NT_HEADERS64)img->FileHeader)->OptionalHeader;
-  if (opt->Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
-    // 64-bit PE file.
-    SizeOfImage = opt->SizeOfImage;
-  } else {
-    // 32-bit PE file.
-    SizeOfImage = img->FileHeader->OptionalHeader.SizeOfImage;
-  }
-  wchar_t code_identifier[32];
-  swprintf(code_identifier,
-      sizeof(code_identifier) / sizeof(code_identifier[0]),
-      L"%08X%X", TimeDateStamp, SizeOfImage);
-  info->code_identifier = code_identifier;
-
-  return true;
+  return ReadPEInfo(code_file_, info);
 }
 
-bool PDBSourceLineWriter::UsesGUID(bool *uses_guid) {
+bool PDBSourceLineWriter::UsesGUID(bool* uses_guid) {
   if (!uses_guid)
     return false;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pdb_source_line_writer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pdb_source_line_writer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pdb_source_line_writer.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pdb_source_line_writer.h	2021-12-09 12:01:26.000000000 +0000
@@ -35,9 +35,10 @@
 
 #include <atlcomcli.h>
 
-#include <unordered_map>
 #include <string>
+#include <unordered_map>
 
+#include "common/windows/module_info.h"
 #include "common/windows/omap.h"
 
 struct IDiaEnumLineNumbers;
@@ -49,41 +50,6 @@
 using std::wstring;
 using std::unordered_map;
 
-// A structure that carries information that identifies a pdb file.
-struct PDBModuleInfo {
- public:
-  // The basename of the pdb file from which information was loaded.
-  wstring debug_file;
-
-  // The pdb's identifier.  For recent pdb files, the identifier consists
-  // of the pdb's guid, in uppercase hexadecimal form without any dashes
-  // or separators, followed immediately by the pdb's age, also in
-  // uppercase hexadecimal form.  For older pdb files which have no guid,
-  // the identifier is the pdb's 32-bit signature value, in zero-padded
-  // hexadecimal form, followed immediately by the pdb's age, in lowercase
-  // hexadecimal form.
-  wstring debug_identifier;
-
-  // A string identifying the cpu that the pdb is associated with.
-  // Currently, this may be "x86" or "unknown".
-  wstring cpu;
-};
-
-// A structure that carries information that identifies a PE file,
-// either an EXE or a DLL.
-struct PEModuleInfo {
-  // The basename of the PE file.
-  wstring code_file;
-
-  // The PE file's code identifier, which consists of its timestamp
-  // and file size concatenated together into a single hex string.
-  // (The fields IMAGE_OPTIONAL_HEADER::SizeOfImage and
-  // IMAGE_FILE_HEADER::TimeDateStamp, as defined in the ImageHlp
-  // documentation.) This is not well documented, if it's documented
-  // at all, but it's what symstore does and what DbgHelp supports.
-  wstring code_identifier;
-};
-
 class PDBSourceLineWriter {
  public:
   enum FileFormat {
@@ -99,7 +65,10 @@
   // file must be available; Open will be if it is not.
   // If there is already a pdb file open, it is automatically closed.
   // Returns true on success.
-  bool Open(const wstring &file, FileFormat format);
+  bool Open(const wstring& file, FileFormat format);
+
+  // Closes the current pdb file and its associated resources.
+  void Close();
 
   // Sets the code file full path.  This is optional for 32-bit modules.  It is
   // also optional for 64-bit modules when there is an executable file stored
@@ -108,14 +77,11 @@
   // file and it must be called after Open() and before WriteMap().
   // If Open() was called for an executable file, then it is an error to call
   // SetCodeFile() with a different file path and it will return false.
-  bool SetCodeFile(const wstring &exe_file);
+  bool SetCodeFile(const wstring& exe_file);
 
-  // Writes a map file from the current pdb file to the given file stream.
+  // Writes a Breakpad symbol file from the current pdb file to |symbol_file|.
   // Returns true on success.
-  bool WriteMap(FILE *map_file);
-
-  // Closes the current pdb file and its associated resources.
-  void Close();
+  bool WriteSymbols(FILE *symbol_file);
 
   // Retrieves information about the module's debugging file.  Returns
   // true on success and false on failure.
@@ -184,17 +150,17 @@
 
   // Returns true if this filename has already been seen,
   // and an ID is stored for it, or false if it has not.
-  bool FileIDIsCached(const wstring &file) {
+  bool FileIDIsCached(const wstring& file) {
     return unique_files_.find(file) != unique_files_.end();
   }
 
   // Cache this filename and ID for later reuse.
-  void CacheFileID(const wstring &file, DWORD id) {
+  void CacheFileID(const wstring& file, DWORD id) {
     unique_files_[file] = id;
   }
 
   // Store this ID in the cache as a duplicate for this filename.
-  void StoreDuplicateFileID(const wstring &file, DWORD id) {
+  void StoreDuplicateFileID(const wstring& file, DWORD id) {
     unordered_map<wstring, DWORD>::iterator iter = unique_files_.find(file);
     if (iter != unique_files_.end()) {
       // map this id to the previously seen one
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_source_line_writer.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_source_line_writer.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_source_line_writer.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_source_line_writer.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,77 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "common/windows/pe_source_line_writer.h"
+
+#include "common/windows/pe_util.h"
+
+namespace google_breakpad {
+PESourceLineWriter::PESourceLineWriter(const wstring& pe_file) :
+  pe_file_(pe_file) {
+}
+
+PESourceLineWriter::~PESourceLineWriter() {
+}
+
+bool PESourceLineWriter::WriteSymbols(FILE* symbol_file) {
+  PDBModuleInfo module_info;
+  if (!GetModuleInfo(&module_info)) {
+    return false;
+  }
+  // Hard-code "windows" for the OS because that's the only thing that makes
+  // sense for PDB files.  (This might not be strictly correct for Windows CE
+  // support, but we don't care about that at the moment.)
+  fprintf(symbol_file, "MODULE windows %ws %ws %ws\n",
+    module_info.cpu.c_str(), module_info.debug_identifier.c_str(),
+    module_info.debug_file.c_str());
+
+  PEModuleInfo pe_info;
+  if (!GetPEInfo(&pe_info)) {
+    return false;
+  }
+  fprintf(symbol_file, "INFO CODE_ID %ws %ws\n",
+    pe_info.code_identifier.c_str(),
+    pe_info.code_file.c_str());
+
+  if (!PrintPEFrameData(pe_file_, symbol_file)) {
+    return false;
+  }
+
+  return true;
+}
+
+bool PESourceLineWriter::GetModuleInfo(PDBModuleInfo* info) {
+  return ReadModuleInfo(pe_file_, info);
+}
+
+bool PESourceLineWriter::GetPEInfo(PEModuleInfo* info) {
+  return ReadPEInfo(pe_file_, info);
+}
+
+}  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_source_line_writer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_source_line_writer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_source_line_writer.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_source_line_writer.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,69 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef COMMON_WINDOWS_PE_SOURCE_LINE_WRITER_H_
+#define COMMON_WINDOWS_PE_SOURCE_LINE_WRITER_H_
+
+#include <string>
+
+#include "common/basictypes.h"
+#include "common/windows/module_info.h"
+
+namespace google_breakpad {
+
+using std::wstring;
+
+// PESourceLineWriter uses a pe file produced by Visual C++ to output
+// a line/address map for use with BasicSourceLineResolver.
+// NOTE: Only supports PE32+ format, ie. a 64bit PE file.
+class PESourceLineWriter {
+public:
+  explicit PESourceLineWriter(const wstring& pe_file);
+  ~PESourceLineWriter();
+
+  // Writes Breakpad symbols from the pe file to |symbol_file|.
+  // Returns true on success.
+  bool WriteSymbols(FILE* symbol_file);
+
+  // Retrieves information about the module. Returns true on success.
+  bool GetModuleInfo(PDBModuleInfo* info);
+
+  // Retrieves information about the module's PE file.  Returns
+  // true on success.
+  bool GetPEInfo(PEModuleInfo* info);
+
+private:
+  const wstring pe_file_;
+
+  DISALLOW_COPY_AND_ASSIGN(PESourceLineWriter);
+};
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_WINDOWS_PE_SOURCE_LINE_WRITER_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_util.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_util.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_util.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_util.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,407 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "pe_util.h"
+
+#include <windows.h>
+#include <winnt.h>
+#include <atlbase.h>
+#include <ImageHlp.h>
+
+#include <functional>
+
+#include "common/windows/string_utils-inl.h"
+#include "common/windows/guid_string.h"
+
+namespace {
+
+/*
+ * Not defined in WinNT.h for some reason. Definitions taken from:
+ * http://uninformed.org/index.cgi?v=4&a=1&p=13
+ *
+ */
+typedef unsigned char UBYTE;
+
+#if !defined(_WIN64)
+#define UNW_FLAG_EHANDLER  0x01
+#define UNW_FLAG_UHANDLER  0x02
+#define UNW_FLAG_CHAININFO 0x04
+#endif
+
+union UnwindCode {
+  struct {
+    UBYTE offset_in_prolog;
+    UBYTE unwind_operation_code : 4;
+    UBYTE operation_info : 4;
+  };
+  USHORT frame_offset;
+};
+
+enum UnwindOperationCodes {
+  UWOP_PUSH_NONVOL = 0, /* info == register number */
+  UWOP_ALLOC_LARGE,     /* no info, alloc size in next 2 slots */
+  UWOP_ALLOC_SMALL,     /* info == size of allocation / 8 - 1 */
+  UWOP_SET_FPREG,       /* no info, FP = RSP + UNWIND_INFO.FPRegOffset*16 */
+  UWOP_SAVE_NONVOL,     /* info == register number, offset in next slot */
+  UWOP_SAVE_NONVOL_FAR, /* info == register number, offset in next 2 slots */
+  // XXX: these are missing from MSDN!
+  // See: http://www.osronline.com/ddkx/kmarch/64bitamd_4rs7.htm
+  UWOP_SAVE_XMM,
+  UWOP_SAVE_XMM_FAR,
+  UWOP_SAVE_XMM128,     /* info == XMM reg number, offset in next slot */
+  UWOP_SAVE_XMM128_FAR, /* info == XMM reg number, offset in next 2 slots */
+  UWOP_PUSH_MACHFRAME   /* info == 0: no error-code, 1: error-code */
+};
+
+// See: http://msdn.microsoft.com/en-us/library/ddssxxy8.aspx
+// Note: some fields removed as we don't use them.
+struct UnwindInfo {
+  UBYTE version : 3;
+  UBYTE flags : 5;
+  UBYTE size_of_prolog;
+  UBYTE count_of_codes;
+  UBYTE frame_register : 4;
+  UBYTE frame_offset : 4;
+  UnwindCode unwind_code[1];
+};
+
+struct CV_INFO_PDB70 {
+  ULONG cv_signature;
+  GUID signature;
+  ULONG age;
+  CHAR pdb_filename[ANYSIZE_ARRAY];
+};
+
+#define CV_SIGNATURE_RSDS 'SDSR'
+
+// A helper class to scope a PLOADED_IMAGE.
+class AutoImage {
+public:
+  explicit AutoImage(PLOADED_IMAGE img) : img_(img) {}
+  ~AutoImage() {
+    if (img_)
+      ImageUnload(img_);
+  }
+
+  operator PLOADED_IMAGE() { return img_; }
+  PLOADED_IMAGE operator->() { return img_; }
+
+private:
+  PLOADED_IMAGE img_;
+};
+}  // namespace
+
+namespace google_breakpad {
+
+using std::unique_ptr;
+using google_breakpad::GUIDString;
+
+bool ReadModuleInfo(const wstring & pe_file, PDBModuleInfo * info) {
+  // Convert wchar to native charset because ImageLoad only takes
+  // a PSTR as input.
+  string img_file;
+  if (!WindowsStringUtils::safe_wcstombs(pe_file, &img_file)) {
+    fprintf(stderr, "Image path '%S' contains unrecognized characters.\n",
+        pe_file.c_str());
+    return false;
+  }
+
+  AutoImage img(ImageLoad((PSTR)img_file.c_str(), NULL));
+  if (!img) {
+    fprintf(stderr, "Failed to load %s\n", img_file.c_str());
+    return false;
+  }
+
+  info->cpu = FileHeaderMachineToCpuString(
+      img->FileHeader->FileHeader.Machine);
+
+  PIMAGE_OPTIONAL_HEADER64 optional_header =
+      &(reinterpret_cast<PIMAGE_NT_HEADERS64>(img->FileHeader))->OptionalHeader;
+
+  // Search debug directories for a guid signature & age
+  DWORD debug_rva = optional_header->
+    DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress;
+  DWORD debug_size = optional_header->
+    DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
+  PIMAGE_DEBUG_DIRECTORY debug_directories =
+    static_cast<PIMAGE_DEBUG_DIRECTORY>(
+      ImageRvaToVa(img->FileHeader,
+        img->MappedAddress,
+        debug_rva,
+        &img->LastRvaSection));
+
+  for (DWORD i = 0; i < debug_size / sizeof(*debug_directories); i++) {
+    if (debug_directories[i].Type != IMAGE_DEBUG_TYPE_CODEVIEW ||
+        debug_directories[i].SizeOfData < sizeof(CV_INFO_PDB70)) {
+      continue;
+    }
+
+    struct CV_INFO_PDB70* cv_info = static_cast<CV_INFO_PDB70*>(ImageRvaToVa(
+        img->FileHeader,
+        img->MappedAddress,
+        debug_directories[i].AddressOfRawData,
+        &img->LastRvaSection));
+    if (cv_info->cv_signature != CV_SIGNATURE_RSDS) {
+      continue;
+    }
+
+    info->debug_identifier = GenerateDebugIdentifier(cv_info->age,
+        cv_info->signature);
+
+    // This code assumes that the pdb_filename is stored as ASCII without
+    // multibyte characters, but it's not clear if that's true.
+    size_t debug_file_length = strnlen_s(cv_info->pdb_filename, MAX_PATH);
+    if (debug_file_length < 0 || debug_file_length >= MAX_PATH) {
+      fprintf(stderr, "PE debug directory is corrupt.\n");
+      return false;
+    }
+    std::string debug_file(cv_info->pdb_filename, debug_file_length);
+    if (!WindowsStringUtils::safe_mbstowcs(debug_file, &info->debug_file)) {
+      fprintf(stderr, "PDB filename '%s' contains unrecognized characters.\n",
+          debug_file.c_str());
+      return false;
+    }
+    info->debug_file = WindowsStringUtils::GetBaseName(info->debug_file);
+
+    return true;
+  }
+
+  fprintf(stderr, "Image is missing debug information.\n");
+  return false;
+}
+
+bool ReadPEInfo(const wstring & pe_file, PEModuleInfo * info) {
+  // Convert wchar to native charset because ImageLoad only takes
+  // a PSTR as input.
+  string img_file;
+  if (!WindowsStringUtils::safe_wcstombs(pe_file, &img_file)) {
+    fprintf(stderr, "Image path '%S' contains unrecognized characters.\n",
+        pe_file.c_str());
+    return false;
+  }
+
+  AutoImage img(ImageLoad((PSTR)img_file.c_str(), NULL));
+  if (!img) {
+    fprintf(stderr, "Failed to open PE file: %S\n", pe_file.c_str());
+    return false;
+  }
+
+  info->code_file = WindowsStringUtils::GetBaseName(pe_file);
+
+  // The date and time that the file was created by the linker.
+  DWORD TimeDateStamp = img->FileHeader->FileHeader.TimeDateStamp;
+  // The size of the file in bytes, including all headers.
+  DWORD SizeOfImage = 0;
+  PIMAGE_OPTIONAL_HEADER64 opt =
+    &((PIMAGE_NT_HEADERS64)img->FileHeader)->OptionalHeader;
+  if (opt->Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
+    // 64-bit PE file.
+    SizeOfImage = opt->SizeOfImage;
+  }
+  else {
+    // 32-bit PE file.
+    SizeOfImage = img->FileHeader->OptionalHeader.SizeOfImage;
+  }
+  wchar_t code_identifier[32];
+  swprintf(code_identifier,
+    sizeof(code_identifier) / sizeof(code_identifier[0]),
+    L"%08X%X", TimeDateStamp, SizeOfImage);
+  info->code_identifier = code_identifier;
+
+  return true;
+}
+
+bool PrintPEFrameData(const wstring & pe_file, FILE * out_file)
+{
+  // Convert wchar to native charset because ImageLoad only takes
+  // a PSTR as input.
+  string img_file;
+  if (!WindowsStringUtils::safe_wcstombs(pe_file, &img_file)) {
+    fprintf(stderr, "Image path '%S' contains unrecognized characters.\n",
+        pe_file.c_str());
+    return false;
+  }
+
+  AutoImage img(ImageLoad((PSTR)img_file.c_str(), NULL));
+  if (!img) {
+    fprintf(stderr, "Failed to load %s\n", img_file.c_str());
+    return false;
+  }
+  PIMAGE_OPTIONAL_HEADER64 optional_header =
+    &(reinterpret_cast<PIMAGE_NT_HEADERS64>(img->FileHeader))->OptionalHeader;
+  if (optional_header->Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
+    fprintf(stderr, "Not a PE32+ image\n");
+    return false;
+  }
+
+  // Read Exception Directory
+  DWORD exception_rva = optional_header->
+    DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress;
+  DWORD exception_size = optional_header->
+    DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size;
+  PIMAGE_RUNTIME_FUNCTION_ENTRY funcs =
+    static_cast<PIMAGE_RUNTIME_FUNCTION_ENTRY>(
+      ImageRvaToVa(img->FileHeader,
+        img->MappedAddress,
+        exception_rva,
+        &img->LastRvaSection));
+  for (DWORD i = 0; i < exception_size / sizeof(*funcs); i++) {
+    DWORD unwind_rva = funcs[i].UnwindInfoAddress;
+    // handle chaining
+    while (unwind_rva & 0x1) {
+      unwind_rva ^= 0x1;
+      PIMAGE_RUNTIME_FUNCTION_ENTRY chained_func =
+        static_cast<PIMAGE_RUNTIME_FUNCTION_ENTRY>(
+          ImageRvaToVa(img->FileHeader,
+            img->MappedAddress,
+            unwind_rva,
+            &img->LastRvaSection));
+      unwind_rva = chained_func->UnwindInfoAddress;
+    }
+
+    UnwindInfo *unwind_info = static_cast<UnwindInfo*>(
+      ImageRvaToVa(img->FileHeader,
+        img->MappedAddress,
+        unwind_rva,
+        &img->LastRvaSection));
+
+    DWORD stack_size = 8;  // minimal stack size is 8 for RIP
+    DWORD rip_offset = 8;
+    do {
+      for (UBYTE c = 0; c < unwind_info->count_of_codes; c++) {
+        UnwindCode *unwind_code = &unwind_info->unwind_code[c];
+        switch (unwind_code->unwind_operation_code) {
+        case UWOP_PUSH_NONVOL: {
+          stack_size += 8;
+          break;
+        }
+        case UWOP_ALLOC_LARGE: {
+          if (unwind_code->operation_info == 0) {
+            c++;
+            if (c < unwind_info->count_of_codes)
+              stack_size += (unwind_code + 1)->frame_offset * 8;
+          }
+          else {
+            c += 2;
+            if (c < unwind_info->count_of_codes)
+              stack_size += (unwind_code + 1)->frame_offset |
+              ((unwind_code + 2)->frame_offset << 16);
+          }
+          break;
+        }
+        case UWOP_ALLOC_SMALL: {
+          stack_size += unwind_code->operation_info * 8 + 8;
+          break;
+        }
+        case UWOP_SET_FPREG:
+        case UWOP_SAVE_XMM:
+        case UWOP_SAVE_XMM_FAR:
+          break;
+        case UWOP_SAVE_NONVOL:
+        case UWOP_SAVE_XMM128: {
+          c++;  // skip slot with offset
+          break;
+        }
+        case UWOP_SAVE_NONVOL_FAR:
+        case UWOP_SAVE_XMM128_FAR: {
+          c += 2;  // skip 2 slots with offset
+          break;
+        }
+        case UWOP_PUSH_MACHFRAME: {
+          if (unwind_code->operation_info) {
+            stack_size += 88;
+          }
+          else {
+            stack_size += 80;
+          }
+          rip_offset += 80;
+          break;
+        }
+        }
+      }
+      if (unwind_info->flags & UNW_FLAG_CHAININFO) {
+        PIMAGE_RUNTIME_FUNCTION_ENTRY chained_func =
+          reinterpret_cast<PIMAGE_RUNTIME_FUNCTION_ENTRY>(
+          (unwind_info->unwind_code +
+            ((unwind_info->count_of_codes + 1) & ~1)));
+
+        unwind_info = static_cast<UnwindInfo*>(
+          ImageRvaToVa(img->FileHeader,
+            img->MappedAddress,
+            chained_func->UnwindInfoAddress,
+            &img->LastRvaSection));
+      }
+      else {
+        unwind_info = NULL;
+      }
+    } while (unwind_info);
+    fprintf(out_file, "STACK CFI INIT %lx %lx .cfa: $rsp .ra: .cfa %lu - ^\n",
+      funcs[i].BeginAddress,
+      funcs[i].EndAddress - funcs[i].BeginAddress, rip_offset);
+    fprintf(out_file, "STACK CFI %lx .cfa: $rsp %lu +\n",
+      funcs[i].BeginAddress, stack_size);
+  }
+
+  return true;
+}
+
+wstring GenerateDebugIdentifier(DWORD age, GUID signature)
+{
+  // Use the same format that the MS symbol server uses in filesystem
+  // hierarchies.
+  wchar_t age_string[9];
+  swprintf(age_string, sizeof(age_string) / sizeof(age_string[0]),
+    L"%x", age);
+
+  // remove when VC++7.1 is no longer supported
+  age_string[sizeof(age_string) / sizeof(age_string[0]) - 1] = L'\0';
+
+  wstring debug_identifier = GUIDString::GUIDToSymbolServerWString(&signature);
+  debug_identifier.append(age_string);
+
+  return debug_identifier;
+}
+
+wstring GenerateDebugIdentifier(DWORD age, DWORD signature)
+{
+  // Use the same format that the MS symbol server uses in filesystem
+  // hierarchies.
+  wchar_t identifier_string[17];
+  swprintf(identifier_string,
+    sizeof(identifier_string) / sizeof(identifier_string[0]),
+    L"%08X%x", signature, age);
+
+  // remove when VC++7.1 is no longer supported
+  identifier_string[sizeof(identifier_string) /
+    sizeof(identifier_string[0]) - 1] = L'\0';
+
+  return wstring(identifier_string);
+}
+
+}  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_util.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_util.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_util.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/pe_util.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,78 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef COMMON_WINDOWS_PE_UTIL_H_
+#define COMMON_WINDOWS_PE_UTIL_H_
+
+#include <windows.h>
+
+#include "common/windows/module_info.h"
+
+namespace google_breakpad {
+
+using std::wstring;
+
+// Reads |pe_file| and populates |info|. Returns true on success.
+// Only supports PE32+ format, ie. a 64bit PE file.
+// Will fail if |pe_file| does not contain a valid CodeView record.
+bool ReadModuleInfo(const wstring& pe_file, PDBModuleInfo* info);
+
+// Reads |pe_file| and populates |info|. Returns true on success.
+bool ReadPEInfo(const wstring& pe_file, PEModuleInfo* info);
+
+// Reads |pe_file| and prints frame data (aka. unwind info) to |out_file|.
+// Only supports PE32+ format, ie. a 64bit PE file.
+bool PrintPEFrameData(const wstring& pe_file, FILE* out_file);
+
+// Combines a GUID |signature| and DWORD |age| to create a Breakpad debug
+// identifier.
+wstring GenerateDebugIdentifier(DWORD age, GUID signature);
+
+// Combines a DWORD |signature| and DWORD |age| to create a Breakpad debug
+// identifier.
+wstring GenerateDebugIdentifier(DWORD age, DWORD signature);
+
+// Converts |machine| enum value to the corresponding string used by Breakpad.
+// The enum is IMAGE_FILE_MACHINE_*, contained in winnt.h.
+constexpr const wchar_t* FileHeaderMachineToCpuString(WORD machine) {
+  switch (machine) {
+    case IMAGE_FILE_MACHINE_I386: {
+      return L"x86";
+    }
+    case IMAGE_FILE_MACHINE_IA64:
+    case IMAGE_FILE_MACHINE_AMD64: {
+      return L"x86_64";
+    }
+    default: { return L"unknown"; }
+  }
+}
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_WINDOWS_PE_UTIL_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/string_utils.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/string_utils.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/string_utils.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/string_utils.cc	2021-12-09 12:01:26.000000000 +0000
@@ -35,7 +35,7 @@
 namespace google_breakpad {
 
 // static
-wstring WindowsStringUtils::GetBaseName(const wstring &filename) {
+wstring WindowsStringUtils::GetBaseName(const wstring& filename) {
   wstring base_name(filename);
   size_t slash_pos = base_name.find_last_of(L"/\\");
   if (slash_pos != wstring::npos) {
@@ -45,7 +45,7 @@
 }
 
 // static
-bool WindowsStringUtils::safe_mbstowcs(const string &mbs, wstring *wcs) {
+bool WindowsStringUtils::safe_mbstowcs(const string& mbs, wstring* wcs) {
   assert(wcs);
 
   // First, determine the length of the destination buffer.
@@ -88,7 +88,7 @@
 }
 
 // static
-bool WindowsStringUtils::safe_wcstombs(const wstring &wcs, string *mbs) {
+bool WindowsStringUtils::safe_wcstombs(const wstring& wcs, string* mbs) {
   assert(mbs);
 
   // First, determine the length of the destination buffer.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/string_utils-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/string_utils-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/string_utils-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/string_utils-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -72,26 +72,26 @@
   // Roughly equivalent to MSVC8's wcscpy_s, except pre-MSVC8, this does
   // not fail if source is longer than destination_size.  The destination
   // buffer is always 0-terminated.
-  static void safe_wcscpy(wchar_t *destination, size_t destination_size,
-                          const wchar_t *source);
+  static void safe_wcscpy(wchar_t* destination, size_t destination_size,
+                          const wchar_t* source);
 
   // Roughly equivalent to MSVC8's wcsncpy_s, except that _TRUNCATE cannot
   // be passed directly, and pre-MSVC8, this will not fail if source or count
   // are longer than destination_size.  The destination buffer is always
   // 0-terminated.
-  static void safe_wcsncpy(wchar_t *destination, size_t destination_size,
-                           const wchar_t *source, size_t count);
+  static void safe_wcsncpy(wchar_t* destination, size_t destination_size,
+                           const wchar_t* source, size_t count);
 
   // Performs multi-byte to wide character conversion on C++ strings, using
   // mbstowcs_s (MSVC8) or mbstowcs (pre-MSVC8).  Returns false on failure,
   // without setting wcs.
-  static bool safe_mbstowcs(const string &mbs, wstring *wcs);
+  static bool safe_mbstowcs(const string& mbs, wstring* wcs);
 
   // The inverse of safe_mbstowcs.
-  static bool safe_wcstombs(const wstring &wcs, string *mbs);
+  static bool safe_wcstombs(const wstring& wcs, string* mbs);
 
   // Returns the base name of a file, e.g. strips off the path.
-  static wstring GetBaseName(const wstring &filename);
+  static wstring GetBaseName(const wstring& filename);
 
  private:
   // Disallow instantiation and other object-based operations.
@@ -102,9 +102,9 @@
 };
 
 // static
-inline void WindowsStringUtils::safe_wcscpy(wchar_t *destination,
+inline void WindowsStringUtils::safe_wcscpy(wchar_t* destination,
                                             size_t destination_size,
-                                            const wchar_t *source) {
+                                            const wchar_t* source) {
 #if _MSC_VER >= 1400  // MSVC 2005/8
   wcscpy_s(destination, destination_size, source);
 #else  // _MSC_VER >= 1400
@@ -118,9 +118,9 @@
 }
 
 // static
-inline void WindowsStringUtils::safe_wcsncpy(wchar_t *destination,
+inline void WindowsStringUtils::safe_wcsncpy(wchar_t* destination,
                                              size_t destination_size,
-                                             const wchar_t *source,
+                                             const wchar_t* source,
                                              size_t count) {
 #if _MSC_VER >= 1400  // MSVC 2005/8
   wcsncpy_s(destination, destination_size, source, count);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/symbol_collector_client.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/symbol_collector_client.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/symbol_collector_client.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/symbol_collector_client.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,155 @@
+#include "common/windows/symbol_collector_client.h"
+
+#include <stdio.h>
+
+#include <regex>
+
+#include "common/windows/http_upload.h"
+
+namespace google_breakpad {
+
+  // static
+  bool SymbolCollectorClient::CreateUploadUrl(
+      wstring& api_url,
+      wstring& api_key,
+      UploadUrlResponse *uploadUrlResponse) {
+    wstring url = api_url +
+        L"/v1/uploads:create"
+        L"?key=" + api_key;
+    wstring response;
+    int response_code;
+
+    if (!HTTPUpload::SendSimplePostRequest(
+        url,
+        L"",
+        L"",
+        NULL,
+        &response,
+        &response_code)) {
+      wprintf(L"Failed to create upload url.\n");
+      wprintf(L"Response code: %ld\n", response_code);
+      wprintf(L"Response:\n");
+      wprintf(L"%s\n", response.c_str());
+      return false;
+    }
+
+    // Note camel-case rather than underscores.
+    std::wregex upload_url_regex(L"\"uploadUrl\": \"([^\"]+)\"");
+    std::wregex upload_key_regex(L"\"uploadKey\": \"([^\"]+)\"");
+
+    std::wsmatch upload_url_match;
+    if (!std::regex_search(response, upload_url_match, upload_url_regex) ||
+        upload_url_match.size() != 2) {
+      wprintf(L"Failed to parse create url response.");
+      wprintf(L"Response:\n");
+      wprintf(L"%s\n", response.c_str());
+      return false;
+    }
+    wstring upload_url = upload_url_match[1].str();
+
+    std::wsmatch upload_key_match;
+    if (!std::regex_search(response, upload_key_match, upload_key_regex) ||
+        upload_key_match.size() != 2) {
+      wprintf(L"Failed to parse create url response.");
+      wprintf(L"Response:\n");
+      wprintf(L"%s\n", response.c_str());
+      return false;
+    }
+    wstring upload_key = upload_key_match[1].str();
+
+    uploadUrlResponse->upload_url = upload_url;
+    uploadUrlResponse->upload_key = upload_key;
+    return true;
+  }
+
+  // static
+  CompleteUploadResult SymbolCollectorClient::CompleteUpload(
+      wstring& api_url,
+      wstring& api_key,
+      const wstring& upload_key,
+      const wstring& debug_file,
+      const wstring& debug_id) {
+    wstring url = api_url +
+        L"/v1/uploads/" + upload_key + L":complete"
+        L"?key=" + api_key;
+    wstring body =
+        L"{ symbol_id: {"
+        L"debug_file: \"" + debug_file + L"\", "
+        L"debug_id: \"" + debug_id + L"\" "
+        L"} }";
+    wstring response;
+    int response_code;
+
+    if (!HTTPUpload::SendSimplePostRequest(
+        url,
+        body,
+        L"application/json",
+        NULL,
+        &response,
+        &response_code)) {
+      wprintf(L"Failed to complete upload.\n");
+      wprintf(L"Response code: %ld\n", response_code);
+      wprintf(L"Response:\n");
+      wprintf(L"%s\n", response.c_str());
+      return CompleteUploadResult::Error;
+    }
+
+    std::wregex result_regex(L"\"result\": \"([^\"]+)\"");
+    std::wsmatch result_match;
+    if (!std::regex_search(response, result_match, result_regex) ||
+        result_match.size() != 2) {
+      wprintf(L"Failed to parse complete upload response.");
+      wprintf(L"Response:\n");
+      wprintf(L"%s\n", response.c_str());
+      return CompleteUploadResult::Error;
+    }
+    wstring result = result_match[1].str();
+
+    if (result.compare(L"DUPLICATE_DATA") == 0) {
+      return CompleteUploadResult::DuplicateData;
+    }
+
+    return CompleteUploadResult::Ok;
+  }
+
+  // static
+  SymbolStatus SymbolCollectorClient::CheckSymbolStatus(
+      wstring& api_url,
+      wstring& api_key,
+      const wstring& debug_file,
+      const wstring& debug_id) {
+    wstring response;
+    int response_code;
+    wstring url = api_url +
+        L"/v1/symbols/" + debug_file + L"/" + debug_id + L":checkStatus"
+        L"?key=" + api_key;
+
+    if (!HTTPUpload::SendGetRequest(
+        url,
+        NULL,
+        &response,
+        &response_code)) {
+      wprintf(L"Failed to check symbol status.\n");
+      wprintf(L"Response code: %ld\n", response_code);
+      wprintf(L"Response:\n");
+      wprintf(L"%s\n", response.c_str());
+      return SymbolStatus::Unknown;
+    }
+
+    std::wregex status_regex(L"\"status\": \"([^\"]+)\"");
+    std::wsmatch status_match;
+    if (!std::regex_search(response, status_match, status_regex) ||
+        status_match.size() != 2) {
+      wprintf(L"Failed to parse check symbol status response.");
+      wprintf(L"Response:\n");
+      wprintf(L"%s\n", response.c_str());
+      return SymbolStatus::Unknown;
+    }
+    wstring status = status_match[1].str();
+
+    return (status.compare(L"FOUND") == 0) ?
+      SymbolStatus::Found :
+      SymbolStatus::Missing;
+  }
+
+}  // namespace google_breakpad
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/symbol_collector_client.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/symbol_collector_client.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/symbol_collector_client.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/common/windows/symbol_collector_client.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,89 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef COMMON_WINDOWS_SYMBOL_COLLECTOR_CLIENT_H_
+#define COMMON_WINDOWS_SYMBOL_COLLECTOR_CLIENT_H_
+
+#include <string>
+
+namespace google_breakpad {
+
+  using std::wstring;
+
+  struct UploadUrlResponse {
+    // URL at which to HTTP PUT symbol file.
+    wstring upload_url;
+    // Unique key used to complete upload of symbol file.
+    wstring upload_key;
+  };
+
+  enum SymbolStatus {
+    Found,
+    Missing,
+    Unknown
+  };
+
+  enum CompleteUploadResult {
+    Ok,
+    DuplicateData,
+    Error
+  };
+
+  // Client to interact with sym-upload-v2 API server via HTTP/REST.
+  class SymbolCollectorClient {
+  public:
+    // Returns a URL at which a symbol file can be HTTP PUT without
+    // authentication, along with an upload key that can be used to
+    // complete the upload process with CompleteUpload.
+    static bool CreateUploadUrl(
+        wstring& api_url,
+        wstring& api_key,
+        UploadUrlResponse *uploadUrlResponse);
+
+    // Notify the API that symbol file upload is finished and its contents
+    // are ready to be read and/or used for further processing.
+    static CompleteUploadResult CompleteUpload(
+        wstring& api_url,
+        wstring& api_key,
+        const wstring& upload_key,
+        const wstring& debug_file,
+        const wstring& debug_id);
+
+    // Returns whether or not a symbol file corresponding to the debug_file/
+    // debug_id pair is already present in symbol storage.
+    static SymbolStatus CheckSymbolStatus(
+        wstring& api_url,
+        wstring& api_key,
+        const wstring& debug_file,
+        const wstring& debug_id);
+  };
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_WINDOWS_SYMBOL_COLLECTOR_CLIENT_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_exception_fuchsia.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_exception_fuchsia.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_exception_fuchsia.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_exception_fuchsia.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,58 @@
+/* Copyright (c) 2019, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+/* minidump_exception_fuchsia.h: A definition of exception codes for Fuchsia.
+ *
+ * Author: Ivan Penkov */
+
+#ifndef GOOGLE_BREAKPAD_COMMON_MINIDUMP_EXCEPTION_FUCHSIA_H_
+#define GOOGLE_BREAKPAD_COMMON_MINIDUMP_EXCEPTION_FUCHSIA_H_
+
+#include <stddef.h>
+
+#include "google_breakpad/common/breakpad_types.h"
+
+// Based on zircon/system/public/zircon/syscalls/exception.h
+typedef enum {
+  // Architectural exceptions
+  MD_EXCEPTION_CODE_FUCHSIA_GENERAL = 0x8,
+  MD_EXCEPTION_CODE_FUCHSIA_FATAL_PAGE_FAULT = 0x108,
+  MD_EXCEPTION_CODE_FUCHSIA_UNDEFINED_INSTRUCTION = 0x208,
+  MD_EXCEPTION_CODE_FUCHSIA_SW_BREAKPOINT = 0x308,
+  MD_EXCEPTION_CODE_FUCHSIA_HW_BREAKPOINT = 0x408,
+  MD_EXCEPTION_CODE_FUCHSIA_UNALIGNED_ACCESS = 0x508,
+  //
+  // Synthetic exceptions
+  MD_EXCEPTION_CODE_FUCHSIA_THREAD_STARTING = 0x8008,
+  MD_EXCEPTION_CODE_FUCHSIA_THREAD_EXITING = 0x8108,
+  MD_EXCEPTION_CODE_FUCHSIA_POLICY_ERROR = 0x8208,
+  MD_EXCEPTION_CODE_FUCHSIA_PROCESS_STARTING = 0x8308,
+} MDExceptionCodeFuchsia;
+
+#endif  // GOOGLE_BREAKPAD_COMMON_MINIDUMP_EXCEPTION_FUCHSIA_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_exception_mac.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_exception_mac.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_exception_mac.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_exception_mac.h	2021-12-09 12:01:26.000000000 +0000
@@ -87,6 +87,8 @@
       /* KERN_MEMORY_FAILURE */
   MD_EXCEPTION_CODE_MAC_MEMORY_ERROR       = 10,
       /* KERN_MEMORY_ERROR */
+  MD_EXCEPTION_CODE_MAC_CODESIGN_ERROR     = 50,
+      /* KERN_CODESIGN_ERROR */
 
   /* With MD_EXCEPTION_SOFTWARE */
   MD_EXCEPTION_CODE_MAC_BAD_SYSCALL  = 0x00010000,  /* Mach SIGSYS */
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_format.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_format.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_format.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/common/minidump_format.h	2021-12-09 12:01:26.000000000 +0000
@@ -529,7 +529,7 @@
                                                        memory_ranges[0]);
 
 
-#define MD_EXCEPTION_MAXIMUM_PARAMETERS 15
+#define MD_EXCEPTION_MAXIMUM_PARAMETERS 15u
 
 typedef struct {
   uint32_t  exception_code;     /* Windows: MDExceptionCodeWin,
@@ -549,6 +549,7 @@
   uint64_t  exception_information[MD_EXCEPTION_MAXIMUM_PARAMETERS];
 } MDException;  /* MINIDUMP_EXCEPTION */
 
+#include "minidump_exception_fuchsia.h"
 #include "minidump_exception_linux.h"
 #include "minidump_exception_mac.h"
 #include "minidump_exception_ps3.h"
@@ -678,7 +679,8 @@
   MD_OS_SOLARIS       = 0x8202,  /* Solaris */
   MD_OS_ANDROID       = 0x8203,  /* Android */
   MD_OS_PS3           = 0x8204,  /* PS3 */
-  MD_OS_NACL          = 0x8205   /* Native Client (NaCl) */
+  MD_OS_NACL          = 0x8205,  /* Native Client (NaCl) */
+  MD_OS_FUCHSIA       = 0x8206   /* Fuchsia */
 } MDOSPlatform;
 
 typedef struct {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/basic_source_line_resolver.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/basic_source_line_resolver.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/basic_source_line_resolver.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/basic_source_line_resolver.h	2021-12-09 12:01:26.000000000 +0000
@@ -90,9 +90,9 @@
   // can't be const.  On success, <id>, and <filename> are stored in |*index|,
   // and |*filename|.  No allocation is done, |*filename| simply points inside
   // |file_line|.
-  static bool ParseFile(char *file_line,   // in
-                        long *index,       // out
-                        char **filename);  // out
+  static bool ParseFile(char* file_line,   // in
+                        long* index,       // out
+                        char** filename);  // out
 
   // Parses a |function_line| declaration.  Returns true on success.
   // Format:  FUNC [<multiple>] <address> <size> <stack_param_size> <name>.
@@ -101,12 +101,12 @@
   // <stack_param_size>, and <name> are stored in |*is_multiple|, |*address|,
   // |*size|, |*stack_param_size|, and |*name|.  No allocation is done, |*name|
   // simply points inside |function_line|.
-  static bool ParseFunction(char *function_line,     // in
-                            bool *is_multiple,       // out
-                            uint64_t *address,       // out
-                            uint64_t *size,          // out
-                            long *stack_param_size,  // out
-                            char **name);            // out
+  static bool ParseFunction(char* function_line,     // in
+                            bool* is_multiple,       // out
+                            uint64_t* address,       // out
+                            uint64_t* size,          // out
+                            long* stack_param_size,  // out
+                            char** name);            // out
 
   // Parses a |line| declaration.  Returns true on success.
   // Format:  <address> <size> <line number> <source file id>
@@ -114,11 +114,11 @@
   // it can't be const.  On success, <address>, <size>, <line number>, and
   // <source file id> are stored in |*address|, |*size|, |*line_number|, and
   // |*source_file|.
-  static bool ParseLine(char *line_line,     // in
-                        uint64_t *address,   // out
-                        uint64_t *size,      // out
-                        long *line_number,   // out
-                        long *source_file);  // out
+  static bool ParseLine(char* line_line,     // in
+                        uint64_t* address,   // out
+                        uint64_t* size,      // out
+                        long* line_number,   // out
+                        long* source_file);  // out
 
   // Parses a |public_line| declaration.  Returns true on success.
   // Format:  PUBLIC [<multiple>] <address> <stack_param_size> <name>
@@ -127,15 +127,15 @@
   // <stack_param_size>, <name> are stored in |*is_multiple|, |*address|,
   // |*stack_param_size|, and |*name|.  No allocation is done, |*name| simply
   // points inside |public_line|.
-  static bool ParsePublicSymbol(char *public_line,       // in
-                                bool *is_multiple,       // out
-                                uint64_t *address,       // out
-                                long *stack_param_size,  // out
-                                char **name);            // out
+  static bool ParsePublicSymbol(char* public_line,       // in
+                                bool* is_multiple,       // out
+                                uint64_t* address,       // out
+                                long* stack_param_size,  // out
+                                char** name);            // out
 
  private:
   // Used for success checks after strtoull and strtol.
-  static bool IsValidAfterNumber(char *after_number);
+  static bool IsValidAfterNumber(char* after_number);
 
   // Only allow static methods.
   SymbolParseHelper();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/code_modules.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/code_modules.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/code_modules.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/code_modules.h	2021-12-09 12:01:26.000000000 +0000
@@ -101,9 +101,6 @@
   // down due to address range conflicts with other modules.
   virtual std::vector<linked_ptr<const CodeModule> >
   GetShrunkRangeModules() const = 0;
-
-  // Returns true, if module address range shrink is enabled.
-  virtual bool IsModuleShrinkEnabled() const = 0;
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/exception_record.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/exception_record.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/exception_record.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/exception_record.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,124 @@
+// Copyright (c) 2019 Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// exception_record.h: A snapshot of an exception record.
+//
+// Author: Ivan Penkov
+
+#ifndef THIRD_PARTY_BREAKPAD_SRC_GOOGLE_BREAKPAD_PROCESSOR_EXCEPTION_RECORD_H_
+#define THIRD_PARTY_BREAKPAD_SRC_GOOGLE_BREAKPAD_PROCESSOR_EXCEPTION_RECORD_H_
+
+#include <vector>
+
+namespace google_breakpad {
+
+// Additional argument that describes the exception.
+class ExceptionParameter {
+ public:
+  ExceptionParameter(uint64_t value, const string& description)
+      : value_(value), description_(description) {}
+  // Accessors. See the data declarations below.
+  uint64_t value() const { return value_; }
+  void set_value(uint64_t value) { value_ = value; }
+  const string& description() const { return description_; }
+  void set_description(const string& description) {
+    description_ = description;
+  }
+
+ private:
+  // Parameter value.
+  uint64_t value_;
+  // Human readable description/interpretation of the above value.
+  string description_;
+};
+
+// A snapshot of an exception record. Contains exception record details: code,
+// flags, address, parameters.
+class ExceptionRecord {
+ public:
+  // Accessors. See the data declarations below.
+  uint32_t code() const { return code_; }
+  const string& code_description() const { return code_description_; }
+  void set_code(uint32_t code, const string& description) {
+    code_ = code;
+    code_description_ = description;
+  }
+
+  uint32_t flags() const { return flags_; }
+  const string& flags_description() const { return flags_description_; }
+  void set_flags(uint32_t flags, const string& description) {
+    flags_ = flags;
+    flags_description_ = description;
+  }
+
+  uint64_t nested_exception_record_address() const {
+    return nested_exception_record_address_;
+  }
+  void set_nested_exception_record_address(
+      uint64_t nested_exception_record_address) {
+    nested_exception_record_address_ = nested_exception_record_address;
+  }
+
+  uint64_t address() const { return address_; }
+  void set_address(uint64_t address) { address_ = address; }
+
+  const std::vector<ExceptionParameter>* parameters() const {
+    return &parameters_;
+  }
+  void add_parameter(uint64_t value, const string& description) {
+    parameters_.push_back(ExceptionParameter(value, description));
+  }
+
+ private:
+  // Exception code.
+  uint32_t code_;
+  string code_description_;
+
+  // Exception flags.
+  uint32_t flags_;
+  string flags_description_;
+
+  // The address of an associated MDException structure. Exception records can
+  // be chained together to provide additional information when nested
+  // exceptions occur.
+  uint64_t nested_exception_record_address_;
+
+  // The memory address that caused the exception.  For data access errors,
+  // this will be the data address that caused the fault.  For code errors,
+  // this will be the address of the instruction that caused the fault.
+  uint64_t address_;
+
+  // An array of additional arguments that describe the exception.
+  std::vector<ExceptionParameter> parameters_;
+};
+
+}  // namespace google_breakpad
+
+
+#endif  // THIRD_PARTY_BREAKPAD_SRC_GOOGLE_BREAKPAD_PROCESSOR_EXCEPTION_RECORD_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/minidump.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/minidump.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/minidump.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/minidump.h	2021-12-09 12:01:26.000000000 +0000
@@ -291,7 +291,7 @@
   // so a special getter is provided to retrieve this data from the
   // MDRawThread structure.  Returns false if the thread ID cannot be
   // determined.
-  virtual bool GetThreadID(uint32_t *thread_id) const;
+  virtual bool GetThreadID(uint32_t* thread_id) const;
 
   // Print a human-readable representation of the object to stdout.
   void Print();
@@ -523,9 +523,6 @@
   // down due to address range conflicts with other modules.
   virtual vector<linked_ptr<const CodeModule> > GetShrunkRangeModules() const;
 
-  // Returns true, if module address range shrink is enabled.
-  virtual bool IsModuleShrinkEnabled() const;
-
   // Print a human-readable representation of the object to stdout.
   void Print();
 
@@ -552,9 +549,9 @@
   static uint32_t max_modules_;
 
   // Access to modules using addresses as the key.
-  RangeMap<uint64_t, unsigned int> *range_map_;
+  RangeMap<uint64_t, unsigned int>* range_map_;
 
-  MinidumpModules *modules_;
+  MinidumpModules* modules_;
   uint32_t module_count_;
 
   DISALLOW_COPY_AND_ASSIGN(MinidumpModuleList);
@@ -609,16 +606,16 @@
   static uint32_t max_regions_;
 
   // Access to memory regions using addresses as the key.
-  RangeMap<uint64_t, unsigned int> *range_map_;
+  RangeMap<uint64_t, unsigned int>* range_map_;
 
   // The list of descriptors.  This is maintained separately from the list
   // of regions, because MemoryRegion doesn't own its MemoryDescriptor, it
   // maintains a pointer to it.  descriptors_ provides the storage for this
   // purpose.
-  MemoryDescriptors *descriptors_;
+  MemoryDescriptors* descriptors_;
 
   // The list of regions.
-  MemoryRegions *regions_;
+  MemoryRegions* regions_;
   uint32_t region_count_;
 
   DISALLOW_COPY_AND_ASSIGN(MinidumpMemoryList);
@@ -643,7 +640,7 @@
   // so a special getter is provided to retrieve this data from the
   // MDRawExceptionStream structure.  Returns false if the thread ID cannot
   // be determined.
-  bool GetThreadID(uint32_t *thread_id) const;
+  bool GetThreadID(uint32_t* thread_id) const;
 
   MinidumpContext* GetContext();
 
@@ -847,7 +844,6 @@
       GetModuleAtIndex(unsigned int index) const override;
   const CodeModules* Copy() const override;
   vector<linked_ptr<const CodeModule>> GetShrunkRangeModules() const override;
-  bool IsModuleShrinkEnabled() const override;
 
  protected:
   explicit MinidumpUnloadedModuleList(Minidump* minidump_);
@@ -866,9 +862,9 @@
   static uint32_t max_modules_;
 
   // Access to module indices using addresses as the key.
-  RangeMap<uint64_t, unsigned int> *range_map_;
+  RangeMap<uint64_t, unsigned int>* range_map_;
 
-  MinidumpUnloadedModules *unloaded_modules_;
+  MinidumpUnloadedModules* unloaded_modules_;
   uint32_t module_count_;
 
   DISALLOW_COPY_AND_ASSIGN(MinidumpUnloadedModuleList);
@@ -923,8 +919,8 @@
   // treatment, so special getters are provided to retrieve this data from
   // the MDRawBreakpadInfo structure.  The getters return false if the thread
   // IDs cannot be determined.
-  bool GetDumpThreadID(uint32_t *thread_id) const;
-  bool GetRequestingThreadID(uint32_t *thread_id) const;
+  bool GetDumpThreadID(uint32_t* thread_id) const;
+  bool GetRequestingThreadID(uint32_t* thread_id) const;
 
   // Print a human-readable representation of the object to stdout.
   void Print();
@@ -1007,7 +1003,7 @@
   bool Read(uint32_t expected_size) override;
 
   // Access to memory info using addresses as the key.
-  RangeMap<uint64_t, unsigned int> *range_map_;
+  RangeMap<uint64_t, unsigned int>* range_map_;
 
   MinidumpMemoryInfos* infos_;
   uint32_t info_count_;
@@ -1060,7 +1056,7 @@
   friend class MinidumpLinuxMapsList;
 
   // This caller owns the pointer.
-  explicit MinidumpLinuxMaps(Minidump *minidump);
+  explicit MinidumpLinuxMaps(Minidump* minidump);
 
   // The memory region struct that this class wraps.
   MappedMemoryRegion region_;
@@ -1079,9 +1075,9 @@
   unsigned int get_maps_count() const { return valid_ ? maps_count_ : 0; }
 
   // Get mapping at the given memory address. The caller owns the pointer.
-  const MinidumpLinuxMaps *GetLinuxMapsForAddress(uint64_t address) const;
+  const MinidumpLinuxMaps* GetLinuxMapsForAddress(uint64_t address) const;
   // Get mapping at the given index. The caller owns the pointer.
-  const MinidumpLinuxMaps *GetLinuxMapsAtIndex(unsigned int index) const;
+  const MinidumpLinuxMaps* GetLinuxMapsAtIndex(unsigned int index) const;
 
   // Print the contents of /proc/self/maps to stdout.
   void Print() const;
@@ -1089,12 +1085,12 @@
  private:
   friend class Minidump;
 
-  typedef vector<MinidumpLinuxMaps *> MinidumpLinuxMappings;
+  typedef vector<MinidumpLinuxMaps*> MinidumpLinuxMappings;
 
   static const uint32_t kStreamType = MD_LINUX_MAPS;
 
   // The caller owns the pointer.
-  explicit MinidumpLinuxMapsList(Minidump *minidump);
+  explicit MinidumpLinuxMapsList(Minidump* minidump);
 
   // Read and load the contents of the process mapping data.
   // The stream should have data in the form of /proc/self/maps.
@@ -1102,7 +1098,7 @@
   bool Read(uint32_t expected_size) override;
 
   // The list of individual mappings.
-  MinidumpLinuxMappings *maps_;
+  MinidumpLinuxMappings* maps_;
   // The number of mappings.
   uint32_t maps_count_;
 
@@ -1204,7 +1200,7 @@
   MinidumpCrashpadInfo* GetCrashpadInfo();
 
   // The next method also calls GetStream, but is exclusive for Linux dumps.
-  virtual MinidumpLinuxMapsList *GetLinuxMapsList();
+  virtual MinidumpLinuxMapsList* GetLinuxMapsList();
 
   // The next set of methods are provided for users who wish to access
   // data in minidump files directly, while leveraging the rest of
@@ -1268,6 +1264,10 @@
   // Is the OS Android.
   bool IsAndroid();
 
+  // Determines the platform where the minidump was produced. |platform| is
+  // valid iff this method returns true.
+  bool GetPlatform(MDOSPlatform* platform);
+
   // Get current hexdump display settings.
   unsigned int HexdumpMode() const { return hexdump_ ? hexdump_width_ : 0; }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/minidump_processor.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/minidump_processor.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/minidump_processor.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/minidump_processor.h	2021-12-09 12:01:26.000000000 +0000
@@ -70,7 +70,7 @@
   ~MinidumpProcessor();
 
   // Processes the minidump file and fills process_state with the result.
-  ProcessResult Process(const string &minidump_file,
+  ProcessResult Process(const string& minidump_file,
                         ProcessState* process_state);
 
   // Processes the minidump structure and fills process_state with the
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/process_state.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/process_state.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/process_state.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/process_state.h	2021-12-09 12:01:26.000000000 +0000
@@ -40,6 +40,7 @@
 #include "common/using_std_string.h"
 #include "google_breakpad/common/breakpad_types.h"
 #include "google_breakpad/processor/code_modules.h"
+#include "google_breakpad/processor/exception_record.h"
 #include "google_breakpad/processor/minidump.h"
 #include "google_breakpad/processor/system_info.h"
 #include "processor/linked_ptr.h"
@@ -105,6 +106,7 @@
   uint64_t crash_address() const { return crash_address_; }
   string assertion() const { return assertion_; }
   int requesting_thread() const { return requesting_thread_; }
+  const ExceptionRecord* exception_record() const { return &exception_record_; }
   const vector<CallStack*>* threads() const { return &threads_; }
   const vector<MemoryRegion*>* thread_memory_regions() const {
     return &thread_memory_regions_;
@@ -166,6 +168,9 @@
   // indicating that the dump thread is not available.
   int requesting_thread_;
 
+  // Exception record details: code, flags, address, parameters.
+  ExceptionRecord exception_record_;
+
   // Stacks for each thread (except possibly the exception handler
   // thread) at the time of the crash.
   vector<CallStack*> threads_;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/source_line_resolver_base.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/source_line_resolver_base.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/source_line_resolver_base.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/source_line_resolver_base.h	2021-12-09 12:01:26.000000000 +0000
@@ -64,36 +64,36 @@
   // LoadMap() method.
   // Place dynamically allocated heap buffer in symbol_data. Caller has the
   // ownership of the buffer, and should call delete [] to free the buffer.
-  static bool ReadSymbolFile(const string &file_name,
-                             char **symbol_data,
-                             size_t *symbol_data_size);
+  static bool ReadSymbolFile(const string& file_name,
+                             char** symbol_data,
+                             size_t* symbol_data_size);
 
  protected:
   // Users are not allowed create SourceLineResolverBase instance directly.
-  SourceLineResolverBase(ModuleFactory *module_factory);
+  SourceLineResolverBase(ModuleFactory* module_factory);
   virtual ~SourceLineResolverBase();
 
   // Virtual methods inherited from SourceLineResolverInterface.
-  virtual bool LoadModule(const CodeModule *module, const string &map_file);
-  virtual bool LoadModuleUsingMapBuffer(const CodeModule *module,
-                                        const string &map_buffer);
-  virtual bool LoadModuleUsingMemoryBuffer(const CodeModule *module,
-                                           char *memory_buffer,
+  virtual bool LoadModule(const CodeModule* module, const string& map_file);
+  virtual bool LoadModuleUsingMapBuffer(const CodeModule* module,
+                                        const string& map_buffer);
+  virtual bool LoadModuleUsingMemoryBuffer(const CodeModule* module,
+                                           char* memory_buffer,
                                            size_t memory_buffer_size);
   virtual bool ShouldDeleteMemoryBufferAfterLoadModule();
-  virtual void UnloadModule(const CodeModule *module);
-  virtual bool HasModule(const CodeModule *module);
-  virtual bool IsModuleCorrupt(const CodeModule *module);
-  virtual void FillSourceLineInfo(StackFrame *frame);
-  virtual WindowsFrameInfo *FindWindowsFrameInfo(const StackFrame *frame);
-  virtual CFIFrameInfo *FindCFIFrameInfo(const StackFrame *frame);
+  virtual void UnloadModule(const CodeModule* module);
+  virtual bool HasModule(const CodeModule* module);
+  virtual bool IsModuleCorrupt(const CodeModule* module);
+  virtual void FillSourceLineInfo(StackFrame* frame);
+  virtual WindowsFrameInfo* FindWindowsFrameInfo(const StackFrame* frame);
+  virtual CFIFrameInfo* FindCFIFrameInfo(const StackFrame* frame);
 
   // Nested structs and classes.
   struct Line;
   struct Function;
   struct PublicSymbol;
   struct CompareString {
-    bool operator()(const string &s1, const string &s2) const;
+    bool operator()(const string& s1, const string& s2) const;
   };
   // Module is an interface for an in-memory symbol file.
   class Module;
@@ -101,18 +101,18 @@
 
   // All of the modules that are loaded.
   typedef map<string, Module*, CompareString> ModuleMap;
-  ModuleMap *modules_;
+  ModuleMap* modules_;
 
   // The loaded modules that were detecting to be corrupt during load.
   typedef set<string, CompareString> ModuleSet;
-  ModuleSet *corrupt_modules_;
+  ModuleSet* corrupt_modules_;
 
   // All of heap-allocated buffers that are owned locally by resolver.
   typedef std::map<string, char*, CompareString> MemoryMap;
-  MemoryMap *memory_buffers_;
+  MemoryMap* memory_buffers_;
 
   // Creates a concrete module at run-time.
-  ModuleFactory *module_factory_;
+  ModuleFactory* module_factory_;
 
  private:
   // ModuleFactory needs to have access to protected type Module.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/source_line_resolver_interface.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/source_line_resolver_interface.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/source_line_resolver_interface.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/source_line_resolver_interface.h	2021-12-09 12:01:26.000000000 +0000
@@ -58,11 +58,11 @@
   // and debug_identifier members populated.
   //
   // map_file should contain line/address mappings for this module.
-  virtual bool LoadModule(const CodeModule *module,
-                          const string &map_file) = 0;
+  virtual bool LoadModule(const CodeModule* module,
+                          const string& map_file) = 0;
   // Same as above, but takes the contents of a pre-read map buffer
-  virtual bool LoadModuleUsingMapBuffer(const CodeModule *module,
-                                        const string &map_buffer) = 0;
+  virtual bool LoadModuleUsingMapBuffer(const CodeModule* module,
+                                        const string& map_buffer) = 0;
 
   // Add an interface to load symbol using C-String data instead of string.
   // This is useful in the optimization design for avoiding unnecessary copying
@@ -70,8 +70,8 @@
   // LoadModuleUsingMemoryBuffer() does NOT take ownership of memory_buffer.
   // LoadModuleUsingMemoryBuffer() null terminates the passed in buffer, if
   // the last character is not a null terminator.
-  virtual bool LoadModuleUsingMemoryBuffer(const CodeModule *module,
-                                           char *memory_buffer,
+  virtual bool LoadModuleUsingMemoryBuffer(const CodeModule* module,
+                                           char* memory_buffer,
                                            size_t memory_buffer_size) = 0;
 
   // Return true if the memory buffer should be deleted immediately after
@@ -81,31 +81,31 @@
 
   // Request that the specified module be unloaded from this resolver.
   // A resolver may choose to ignore such a request.
-  virtual void UnloadModule(const CodeModule *module) = 0;
+  virtual void UnloadModule(const CodeModule* module) = 0;
 
   // Returns true if the module has been loaded.
-  virtual bool HasModule(const CodeModule *module) = 0;
+  virtual bool HasModule(const CodeModule* module) = 0;
 
   // Returns true if the module has been loaded and it is corrupt.
-  virtual bool IsModuleCorrupt(const CodeModule *module) = 0;
+  virtual bool IsModuleCorrupt(const CodeModule* module) = 0;
 
   // Fills in the function_base, function_name, source_file_name,
   // and source_line fields of the StackFrame.  The instruction and
   // module_name fields must already be filled in.
-  virtual void FillSourceLineInfo(StackFrame *frame) = 0;
+  virtual void FillSourceLineInfo(StackFrame* frame) = 0;
 
   // If Windows stack walking information is available covering
   // FRAME's instruction address, return a WindowsFrameInfo structure
   // describing it. If the information is not available, returns NULL.
   // A NULL return value does not indicate an error. The caller takes
   // ownership of any returned WindowsFrameInfo object.
-  virtual WindowsFrameInfo *FindWindowsFrameInfo(const StackFrame *frame) = 0;
+  virtual WindowsFrameInfo* FindWindowsFrameInfo(const StackFrame* frame) = 0;
 
   // If CFI stack walking information is available covering ADDRESS,
   // return a CFIFrameInfo structure describing it. If the information
   // is not available, return NULL. The caller takes ownership of any
   // returned CFIFrameInfo object.
-  virtual CFIFrameInfo *FindCFIFrameInfo(const StackFrame *frame) = 0;
+  virtual CFIFrameInfo* FindCFIFrameInfo(const StackFrame* frame) = 0;
 
  protected:
   // SourceLineResolverInterface cannot be instantiated except by subclasses
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/stackwalker.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/stackwalker.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/stackwalker.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/stackwalker.h	2021-12-09 12:01:26.000000000 +0000
@@ -178,8 +178,12 @@
       if (!memory_->GetMemoryAtAddress(location, &ip))
         break;
 
-      if (modules_ && modules_->GetModuleForAddress(ip) &&
-          InstructionAddressSeemsValid(ip)) {
+      // The return address points to the instruction after a call. If the
+      // caller was a no return function, this might point past the end of the
+      // function. Subtract one from the instruction pointer so it points into
+      // the call instruction instead.
+      if (modules_ && modules_->GetModuleForAddress(ip  - 1) &&
+          InstructionAddressSeemsValid(ip - 1)) {
         *ip_found = ip;
         *location_found = location;
         return true;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/symbol_supplier.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/symbol_supplier.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/symbol_supplier.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/google_breakpad/processor/symbol_supplier.h	2021-12-09 12:01:26.000000000 +0000
@@ -63,35 +63,35 @@
   // to help locate the symbol file.  system_info may be NULL or its
   // fields may be empty if these values are unknown.  symbol_file
   // must be a pointer to a valid string
-  virtual SymbolResult GetSymbolFile(const CodeModule *module,
-                                     const SystemInfo *system_info,
-                                     string *symbol_file) = 0;
+  virtual SymbolResult GetSymbolFile(const CodeModule* module,
+                                     const SystemInfo* system_info,
+                                     string* symbol_file) = 0;
   // Same as above, except also places symbol data into symbol_data.
   // If symbol_data is NULL, the data is not returned.
   // TODO(nealsid) Once we have symbol data caching behavior implemented
   // investigate making all symbol suppliers implement all methods,
   // and make this pure virtual
-  virtual SymbolResult GetSymbolFile(const CodeModule *module,
-                                     const SystemInfo *system_info,
-                                     string *symbol_file,
-                                     string *symbol_data) = 0;
+  virtual SymbolResult GetSymbolFile(const CodeModule* module,
+                                     const SystemInfo* system_info,
+                                     string* symbol_file,
+                                     string* symbol_data) = 0;
 
   // Same as above, except allocates data buffer on heap and then places the
   // symbol data into the buffer as C-string.
   // SymbolSupplier is responsible for deleting the data buffer. After the call
   // to GetCStringSymbolData(), the caller should call FreeSymbolData(const
-  // Module *module) once the data buffer is no longer needed.
+  // Module* module) once the data buffer is no longer needed.
   // If symbol_data is not NULL, symbol supplier won't return FOUND unless it
   // returns a valid buffer in symbol_data, e.g., returns INTERRUPT on memory
   // allocation failure.
-  virtual SymbolResult GetCStringSymbolData(const CodeModule *module,
-                                            const SystemInfo *system_info,
-                                            string *symbol_file,
-                                            char **symbol_data,
-                                            size_t *symbol_data_size) = 0;
+  virtual SymbolResult GetCStringSymbolData(const CodeModule* module,
+                                            const SystemInfo* system_info,
+                                            string* symbol_file,
+                                            char** symbol_data,
+                                            size_t* symbol_data_size) = 0;
 
   // Frees the data buffer allocated for the module in GetCStringSymbolData.
-  virtual void FreeSymbolData(const CodeModule *module) = 0;
+  virtual void FreeSymbolData(const CodeModule* module) = 0;
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map.h	2021-12-09 12:01:26.000000000 +0000
@@ -53,15 +53,15 @@
   // Inserts an entry into the map.  Returns false without storing the entry
   // if an entry is already stored in the map at the same address as specified
   // by the address argument.
-  bool Store(const AddressType &address, const EntryType &entry);
+  bool Store(const AddressType& address, const EntryType& entry);
 
   // Locates the entry stored at the highest address less than or equal to
   // the address argument.  If there is no such range, returns false.  The
   // entry is returned in entry, which is a required argument.  If
   // entry_address is not NULL, it will be set to the address that the entry
   // was stored at.
-  bool Retrieve(const AddressType &address,
-                EntryType *entry, AddressType *entry_address) const;
+  bool Retrieve(const AddressType& address,
+                EntryType* entry, AddressType* entry_address) const;
 
   // Empties the address map, restoring it to the same state as when it was
   // initially created.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -45,8 +45,8 @@
 namespace google_breakpad {
 
 template<typename AddressType, typename EntryType>
-bool AddressMap<AddressType, EntryType>::Store(const AddressType &address,
-                                               const EntryType &entry) {
+bool AddressMap<AddressType, EntryType>::Store(const AddressType& address,
+                                               const EntryType& entry) {
   // Ensure that the specified address doesn't conflict with something already
   // in the map.
   if (map_.find(address) != map_.end()) {
@@ -61,8 +61,8 @@
 
 template<typename AddressType, typename EntryType>
 bool AddressMap<AddressType, EntryType>::Retrieve(
-    const AddressType &address,
-    EntryType *entry, AddressType *entry_address) const {
+    const AddressType& address,
+    EntryType* entry, AddressType* entry_address) const {
   BPLOG_IF(ERROR, !entry) << "AddressMap::Retrieve requires |entry|";
   assert(entry);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/address_map_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -189,7 +189,7 @@
 
 }  // namespace
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   BPLOG_INIT(&argc, &argv);
 
   return RunTests() ? 0 : 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_module.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_module.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_module.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_module.h	2021-12-09 12:01:26.000000000 +0000
@@ -66,11 +66,11 @@
         is_unloaded_(that->is_unloaded()) {}
 
   BasicCodeModule(uint64_t base_address, uint64_t size,
-                  const string &code_file,
-                  const string &code_identifier,
-                  const string &debug_file,
-                  const string &debug_identifier,
-                  const string &version,
+                  const string& code_file,
+                  const string& code_identifier,
+                  const string& debug_file,
+                  const string& debug_identifier,
+                  const string& version,
                   const bool is_unloaded = false)
       : base_address_(base_address),
         size_(size),
@@ -112,8 +112,8 @@
   bool is_unloaded_;
 
   // Disallow copy constructor and assignment operator.
-  BasicCodeModule(const BasicCodeModule &that);
-  void operator=(const BasicCodeModule &that);
+  BasicCodeModule(const BasicCodeModule& that);
+  void operator=(const BasicCodeModule& that);
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_modules.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_modules.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_modules.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_modules.cc	2021-12-09 12:01:26.000000000 +0000
@@ -49,13 +49,14 @@
 
 using std::vector;
 
-BasicCodeModules::BasicCodeModules(const CodeModules *that)
+BasicCodeModules::BasicCodeModules(const CodeModules* that,
+                                   MergeRangeStrategy strategy)
     : main_address_(0), map_() {
   BPLOG_IF(ERROR, !that) << "BasicCodeModules::BasicCodeModules requires "
                             "|that|";
   assert(that);
 
-  map_.SetEnableShrinkDown(that->IsModuleShrinkEnabled());
+  map_.SetMergeStrategy(strategy);
 
   const CodeModule *main_module = that->GetMainModule();
   if (main_module)
@@ -140,7 +141,7 @@
 }
 
 const CodeModules* BasicCodeModules::Copy() const {
-  return new BasicCodeModules(this);
+  return new BasicCodeModules(this, map_.GetMergeStrategy());
 }
 
 vector<linked_ptr<const CodeModule> >
@@ -148,8 +149,4 @@
   return shrunk_range_modules_;
 }
 
-bool BasicCodeModules::IsModuleShrinkEnabled() const {
-  return map_.IsShrinkDownEnabled();
-}
-
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_modules.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_modules.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_modules.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_code_modules.h	2021-12-09 12:01:26.000000000 +0000
@@ -58,7 +58,7 @@
   // the CodeModules and CodeModule interfaces without requiring all of the
   // resources that other implementations may require.  A copy will be
   // made of each contained CodeModule using CodeModule::Copy.
-  explicit BasicCodeModules(const CodeModules *that);
+  BasicCodeModules(const CodeModules *that, MergeRangeStrategy strategy);
 
   virtual ~BasicCodeModules();
 
@@ -71,7 +71,6 @@
   virtual const CodeModules* Copy() const;
   virtual std::vector<linked_ptr<const CodeModule> >
   GetShrunkRangeModules() const;
-  virtual bool IsModuleShrinkEnabled() const;
 
  protected:
   BasicCodeModules();
@@ -89,8 +88,8 @@
 
  private:
   // Disallow copy constructor and assignment operator.
-  BasicCodeModules(const BasicCodeModules &that);
-  void operator=(const BasicCodeModules &that);
+  BasicCodeModules(const BasicCodeModules& that);
+  void operator=(const BasicCodeModules& that);
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver.cc	2021-12-09 12:01:26.000000000 +0000
@@ -69,11 +69,11 @@
 // field, and max_tokens is the maximum number of tokens including the optional
 // field. Refer to the documentation for Tokenize for descriptions of the other
 // arguments.
-bool TokenizeWithOptionalField(char *line,
-                               const char *optional_field,
-                               const char *separators,
+bool TokenizeWithOptionalField(char* line,
+                               const char* optional_field,
+                               const char* separators,
                                int max_tokens,
-                               vector<char*> *tokens) {
+                               vector<char*>* tokens) {
   // First tokenize assuming the optional field is not present.  If we then see
   // the optional field, additionally tokenize the last token into two tokens.
   if (!Tokenize(line, separators, max_tokens - 1, tokens)) {
@@ -98,7 +98,7 @@
 
 }  // namespace
 
-static const char *kWhitespace = " \r\n";
+static const char* kWhitespace = " \r\n";
 static const int kMaxErrorsPrinted = 5;
 static const int kMaxErrorsBeforeBailing = 100;
 
@@ -107,9 +107,9 @@
 
 // static
 void BasicSourceLineResolver::Module::LogParseError(
-   const string &message,
+   const string& message,
    int line_number,
-   int *num_errors) {
+   int* num_errors) {
   if (++(*num_errors) <= kMaxErrorsPrinted) {
     if (line_number > 0) {
       BPLOG(ERROR) << "Line " << line_number << ": " << message;
@@ -120,12 +120,12 @@
 }
 
 bool BasicSourceLineResolver::Module::LoadMapFromMemory(
-    char *memory_buffer,
+    char* memory_buffer,
     size_t memory_buffer_size) {
   linked_ptr<Function> cur_func;
   int line_number = 0;
   int num_errors = 0;
-  char *save_ptr;
+  char* save_ptr;
 
   // If the length is 0, we can still pretend we have a symbol file. This is
   // for scenarios that want to test symbol lookup, but don't necessarily care
@@ -160,7 +160,7 @@
        &num_errors);
   }
 
-  char *buffer;
+  char* buffer;
   buffer = strtok_r(memory_buffer, "\r\n", &save_ptr);
 
   while (buffer != NULL) {
@@ -207,7 +207,7 @@
         LogParseError("Found source line data without a function",
                        line_number, &num_errors);
       } else {
-        Line *line = ParseLine(buffer);
+        Line* line = ParseLine(buffer);
         if (!line) {
           LogParseError("ParseLine failed", line_number, &num_errors);
         } else {
@@ -225,7 +225,7 @@
   return true;
 }
 
-void BasicSourceLineResolver::Module::LookupAddress(StackFrame *frame) const {
+void BasicSourceLineResolver::Module::LookupAddress(StackFrame* frame) const {
   MemAddr address = frame->instruction - frame->module->base_address();
 
   // First, look for a FUNC record that covers address. Use
@@ -264,8 +264,8 @@
   }
 }
 
-WindowsFrameInfo *BasicSourceLineResolver::Module::FindWindowsFrameInfo(
-    const StackFrame *frame) const {
+WindowsFrameInfo* BasicSourceLineResolver::Module::FindWindowsFrameInfo(
+    const StackFrame* frame) const {
   MemAddr address = frame->instruction - frame->module->base_address();
   scoped_ptr<WindowsFrameInfo> result(new WindowsFrameInfo());
 
@@ -313,8 +313,8 @@
   return NULL;
 }
 
-CFIFrameInfo *BasicSourceLineResolver::Module::FindCFIFrameInfo(
-    const StackFrame *frame) const {
+CFIFrameInfo* BasicSourceLineResolver::Module::FindCFIFrameInfo(
+    const StackFrame* frame) const {
   MemAddr address = frame->instruction - frame->module->base_address();
   MemAddr initial_base, initial_size;
   string initial_rules;
@@ -347,9 +347,9 @@
   return rules.release();
 }
 
-bool BasicSourceLineResolver::Module::ParseFile(char *file_line) {
+bool BasicSourceLineResolver::Module::ParseFile(char* file_line) {
   long index;
-  char *filename;
+  char* filename;
   if (SymbolParseHelper::ParseFile(file_line, &index, &filename)) {
     files_.insert(make_pair(index, string(filename)));
     return true;
@@ -358,12 +358,12 @@
 }
 
 BasicSourceLineResolver::Function*
-BasicSourceLineResolver::Module::ParseFunction(char *function_line) {
+BasicSourceLineResolver::Module::ParseFunction(char* function_line) {
   bool is_multiple;
   uint64_t address;
   uint64_t size;
   long stack_param_size;
-  char *name;
+  char* name;
   if (SymbolParseHelper::ParseFunction(function_line, &is_multiple, &address,
                                        &size, &stack_param_size, &name)) {
     return new Function(name, address, size, stack_param_size, is_multiple);
@@ -372,7 +372,7 @@
 }
 
 BasicSourceLineResolver::Line* BasicSourceLineResolver::Module::ParseLine(
-    char *line_line) {
+    char* line_line) {
   uint64_t address;
   uint64_t size;
   long line_number;
@@ -385,11 +385,11 @@
   return NULL;
 }
 
-bool BasicSourceLineResolver::Module::ParsePublicSymbol(char *public_line) {
+bool BasicSourceLineResolver::Module::ParsePublicSymbol(char* public_line) {
   bool is_multiple;
   uint64_t address;
   long stack_param_size;
-  char *name;
+  char* name;
 
   if (SymbolParseHelper::ParsePublicSymbol(public_line, &is_multiple, &address,
                                            &stack_param_size, &name)) {
@@ -411,7 +411,7 @@
   return false;
 }
 
-bool BasicSourceLineResolver::Module::ParseStackInfo(char *stack_info_line) {
+bool BasicSourceLineResolver::Module::ParseStackInfo(char* stack_info_line) {
   // Skip "STACK " prefix.
   stack_info_line += 6;
 
@@ -419,7 +419,7 @@
   // information this is.
   while (*stack_info_line == ' ')
     stack_info_line++;
-  const char *platform = stack_info_line;
+  const char* platform = stack_info_line;
   while (!strchr(kWhitespace, *stack_info_line))
     stack_info_line++;
   *stack_info_line++ = '\0';
@@ -468,23 +468,23 @@
 }
 
 bool BasicSourceLineResolver::Module::ParseCFIFrameInfo(
-    char *stack_info_line) {
-  char *cursor;
+    char* stack_info_line) {
+  char* cursor;
 
   // Is this an INIT record or a delta record?
-  char *init_or_address = strtok_r(stack_info_line, " \r\n", &cursor);
+  char* init_or_address = strtok_r(stack_info_line, " \r\n", &cursor);
   if (!init_or_address)
     return false;
 
   if (strcmp(init_or_address, "INIT") == 0) {
     // This record has the form "STACK INIT <address> <size> <rules...>".
-    char *address_field = strtok_r(NULL, " \r\n", &cursor);
+    char* address_field = strtok_r(NULL, " \r\n", &cursor);
     if (!address_field) return false;
 
-    char *size_field = strtok_r(NULL, " \r\n", &cursor);
+    char* size_field = strtok_r(NULL, " \r\n", &cursor);
     if (!size_field) return false;
 
-    char *initial_rules = strtok_r(NULL, "\r\n", &cursor);
+    char* initial_rules = strtok_r(NULL, "\r\n", &cursor);
     if (!initial_rules) return false;
 
     MemAddr address = strtoul(address_field, NULL, 16);
@@ -494,8 +494,8 @@
   }
 
   // This record has the form "STACK <address> <rules...>".
-  char *address_field = init_or_address;
-  char *delta_rules = strtok_r(NULL, "\r\n", &cursor);
+  char* address_field = init_or_address;
+  char* delta_rules = strtok_r(NULL, "\r\n", &cursor);
   if (!delta_rules) return false;
   MemAddr address = strtoul(address_field, NULL, 16);
   cfi_delta_rules_[address] = delta_rules;
@@ -503,8 +503,8 @@
 }
 
 // static
-bool SymbolParseHelper::ParseFile(char *file_line, long *index,
-                                  char **filename) {
+bool SymbolParseHelper::ParseFile(char* file_line, long* index,
+                                  char** filename) {
   // FILE <id> <filename>
   assert(strncmp(file_line, "FILE ", 5) == 0);
   file_line += 5;  // skip prefix
@@ -514,7 +514,7 @@
     return false;
   }
 
-  char *after_number;
+  char* after_number;
   *index = strtol(tokens[0], &after_number, 10);
   if (!IsValidAfterNumber(after_number) || *index < 0 ||
       *index == std::numeric_limits<long>::max()) {
@@ -530,9 +530,9 @@
 }
 
 // static
-bool SymbolParseHelper::ParseFunction(char *function_line, bool *is_multiple,
-                                      uint64_t *address, uint64_t *size,
-                                      long *stack_param_size, char **name) {
+bool SymbolParseHelper::ParseFunction(char* function_line, bool* is_multiple,
+                                      uint64_t* address, uint64_t* size,
+                                      long* stack_param_size, char** name) {
   // FUNC [<multiple>] <address> <size> <stack_param_size> <name>
   assert(strncmp(function_line, "FUNC ", 5) == 0);
   function_line += 5;  // skip prefix
@@ -545,7 +545,7 @@
   *is_multiple = strcmp(tokens[0], "m") == 0;
   int next_token = *is_multiple ? 1 : 0;
 
-  char *after_number;
+  char* after_number;
   *address = strtoull(tokens[next_token++], &after_number, 16);
   if (!IsValidAfterNumber(after_number) ||
       *address == std::numeric_limits<unsigned long long>::max()) {
@@ -568,16 +568,16 @@
 }
 
 // static
-bool SymbolParseHelper::ParseLine(char *line_line, uint64_t *address,
-                                  uint64_t *size, long *line_number,
-                                  long *source_file) {
+bool SymbolParseHelper::ParseLine(char* line_line, uint64_t* address,
+                                  uint64_t* size, long* line_number,
+                                  long* source_file) {
   // <address> <size> <line number> <source file id>
   vector<char*> tokens;
   if (!Tokenize(line_line, kWhitespace, 4, &tokens)) {
     return false;
   }
 
-  char *after_number;
+  char* after_number;
   *address  = strtoull(tokens[0], &after_number, 16);
   if (!IsValidAfterNumber(after_number) ||
       *address == std::numeric_limits<unsigned long long>::max()) {
@@ -613,10 +613,10 @@
 }
 
 // static
-bool SymbolParseHelper::ParsePublicSymbol(char *public_line, bool *is_multiple,
-                                          uint64_t *address,
-                                          long *stack_param_size,
-                                          char **name) {
+bool SymbolParseHelper::ParsePublicSymbol(char* public_line, bool* is_multiple,
+                                          uint64_t* address,
+                                          long* stack_param_size,
+                                          char** name) {
   // PUBLIC [<multiple>] <address> <stack_param_size> <name>
   assert(strncmp(public_line, "PUBLIC ", 7) == 0);
   public_line += 7;  // skip prefix
@@ -629,7 +629,7 @@
   *is_multiple = strcmp(tokens[0], "m") == 0;
   int next_token = *is_multiple ? 1 : 0;
 
-  char *after_number;
+  char* after_number;
   *address = strtoull(tokens[next_token++], &after_number, 16);
   if (!IsValidAfterNumber(after_number) ||
       *address == std::numeric_limits<unsigned long long>::max()) {
@@ -647,7 +647,7 @@
 }
 
 // static
-bool SymbolParseHelper::IsValidAfterNumber(char *after_number) {
+bool SymbolParseHelper::IsValidAfterNumber(char* after_number) {
   if (after_number != NULL && strchr(kWhitespace, *after_number) != NULL) {
     return true;
   }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver_types.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver_types.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver_types.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver_types.h	2021-12-09 12:01:26.000000000 +0000
@@ -57,7 +57,7 @@
 
 struct
 BasicSourceLineResolver::Function : public SourceLineResolverBase::Function {
-  Function(const string &function_name,
+  Function(const string& function_name,
            MemAddr function_address,
            MemAddr code_size,
            int set_parameter_size,
@@ -75,7 +75,7 @@
 
 class BasicSourceLineResolver::Module : public SourceLineResolverBase::Module {
  public:
-  explicit Module(const string &name) : name_(name), is_corrupt_(false) { }
+  explicit Module(const string& name) : name_(name), is_corrupt_(false) { }
   virtual ~Module() { }
 
   // Loads a map from the given buffer in char* type.
@@ -83,7 +83,7 @@
   // The passed in |memory buffer| is of size |memory_buffer_size|.  If it is
   // not null terminated, LoadMapFromMemory() will null terminate it by
   // modifying the passed in buffer.
-  virtual bool LoadMapFromMemory(char *memory_buffer,
+  virtual bool LoadMapFromMemory(char* memory_buffer,
                                  size_t memory_buffer_size);
 
   // Tells whether the loaded symbol data is corrupt.  Return value is
@@ -92,20 +92,20 @@
 
   // Looks up the given relative address, and fills the StackFrame struct
   // with the result.
-  virtual void LookupAddress(StackFrame *frame) const;
+  virtual void LookupAddress(StackFrame* frame) const;
 
   // If Windows stack walking information is available covering ADDRESS,
   // return a WindowsFrameInfo structure describing it. If the information
   // is not available, returns NULL. A NULL return value does not indicate
   // an error. The caller takes ownership of any returned WindowsFrameInfo
   // object.
-  virtual WindowsFrameInfo *FindWindowsFrameInfo(const StackFrame *frame) const;
+  virtual WindowsFrameInfo* FindWindowsFrameInfo(const StackFrame* frame) const;
 
   // If CFI stack walking information is available covering ADDRESS,
   // return a CFIFrameInfo structure describing it. If the information
   // is not available, return NULL. The caller takes ownership of any
   // returned CFIFrameInfo object.
-  virtual CFIFrameInfo *FindCFIFrameInfo(const StackFrame *frame) const;
+  virtual CFIFrameInfo* FindCFIFrameInfo(const StackFrame* frame) const;
 
  private:
   // Friend declarations.
@@ -118,29 +118,29 @@
   // Logs parse errors.  |*num_errors| is increased every time LogParseError is
   // called.
   static void LogParseError(
-      const string &message,
+      const string& message,
       int line_number,
-      int *num_errors);
+      int* num_errors);
 
   // Parses a file declaration
-  bool ParseFile(char *file_line);
+  bool ParseFile(char* file_line);
 
   // Parses a function declaration, returning a new Function object.
-  Function* ParseFunction(char *function_line);
+  Function* ParseFunction(char* function_line);
 
   // Parses a line declaration, returning a new Line object.
-  Line* ParseLine(char *line_line);
+  Line* ParseLine(char* line_line);
 
   // Parses a PUBLIC symbol declaration, storing it in public_symbols_.
   // Returns false if an error occurs.
-  bool ParsePublicSymbol(char *public_line);
+  bool ParsePublicSymbol(char* public_line);
 
   // Parses a STACK WIN or STACK CFI frame info declaration, storing
   // it in the appropriate table.
-  bool ParseStackInfo(char *stack_info_line);
+  bool ParseStackInfo(char* stack_info_line);
 
   // Parses a STACK CFI record, storing it in cfi_frame_info_.
-  bool ParseCFIFrameInfo(char *stack_info_line);
+  bool ParseCFIFrameInfo(char* stack_info_line);
 
   string name_;
   FileMap files_;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/basic_source_line_resolver_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -83,15 +83,15 @@
 class MockMemoryRegion: public MemoryRegion {
   uint64_t GetBase() const { return 0x10000; }
   uint32_t GetSize() const { return 0x01000; }
-  bool GetMemoryAtAddress(uint64_t address, uint8_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint8_t* value) const {
     *value = address & 0xff;
     return true;
   }
-  bool GetMemoryAtAddress(uint64_t address, uint16_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint16_t* value) const {
     *value = address & 0xffff;
     return true;
   }
-  bool GetMemoryAtAddress(uint64_t address, uint32_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint32_t* value) const {
     switch (address) {
       case 0x10008: *value = 0x98ecadc3; break; // saved %ebx
       case 0x1000c: *value = 0x878f7524; break; // saved %esi
@@ -102,7 +102,7 @@
     }
     return true;
   }
-  bool GetMemoryAtAddress(uint64_t address, uint64_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint64_t* value) const {
     *value = address;
     return true;
   }
@@ -116,9 +116,9 @@
 // EXPECTED's.) Also verify that ACTUAL has associations for ".ra" and
 // ".cfa".
 static bool VerifyRegisters(
-    const char *file, int line,
-    const CFIFrameInfo::RegisterValueMap<uint32_t> &expected,
-    const CFIFrameInfo::RegisterValueMap<uint32_t> &actual) {
+    const char* file, int line,
+    const CFIFrameInfo::RegisterValueMap<uint32_t>& expected,
+    const CFIFrameInfo::RegisterValueMap<uint32_t>& actual) {
   CFIFrameInfo::RegisterValueMap<uint32_t>::const_iterator a;
   a = actual.find(".cfa");
   if (a == actual.end())
@@ -148,7 +148,7 @@
 }
 
 
-static bool VerifyEmpty(const StackFrame &frame) {
+static bool VerifyEmpty(const StackFrame& frame) {
   if (frame.function_name.empty() &&
       frame.source_file_name.empty() &&
       frame.source_line == 0)
@@ -156,7 +156,7 @@
   return false;
 }
 
-static void ClearSourceLineInfo(StackFrame *frame) {
+static void ClearSourceLineInfo(StackFrame* frame) {
   frame->function_name.clear();
   frame->module = NULL;
   frame->source_file_name.clear();
@@ -417,7 +417,7 @@
 // FILE <id> <filename>
 TEST(SymbolParseHelper, ParseFileValid) {
   long index;
-  char *filename;
+  char* filename;
 
   char kTestLine[] = "FILE 1 file name";
   ASSERT_TRUE(SymbolParseHelper::ParseFile(kTestLine, &index, &filename));
@@ -435,7 +435,7 @@
 // FILE <id> <filename>
 TEST(SymbolParseHelper, ParseFileInvalid) {
   long index;
-  char *filename;
+  char* filename;
 
   // Test missing file name.
   char kTestLine[] = "FILE 1 ";
@@ -461,7 +461,7 @@
   uint64_t address;
   uint64_t size;
   long stack_param_size;
-  char *name;
+  char* name;
 
   char kTestLine[] = "FUNC 1 2 3 function name";
   ASSERT_TRUE(SymbolParseHelper::ParseFunction(kTestLine, &multiple, &address,
@@ -513,7 +513,7 @@
   uint64_t address;
   uint64_t size;
   long stack_param_size;
-  char *name;
+  char* name;
 
   // Test missing function name.
   char kTestLine[] = "FUNC 1 2 3 ";
@@ -649,7 +649,7 @@
   bool multiple;
   uint64_t address;
   long stack_param_size;
-  char *name;
+  char* name;
 
   char kTestLine[] = "PUBLIC 1 2 3";
   ASSERT_TRUE(SymbolParseHelper::ParsePublicSymbol(kTestLine, &multiple,
@@ -697,7 +697,7 @@
   bool multiple;
   uint64_t address;
   long stack_param_size;
-  char *name;
+  char* name;
 
   // Test missing source function name.
   char kTestLine[] = "PUBLIC 1 2 ";
@@ -738,7 +738,7 @@
 
 }  // namespace
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/call_stack.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/call_stack.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/call_stack.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/call_stack.cc	2021-12-09 12:01:26.000000000 +0000
@@ -43,7 +43,7 @@
 }
 
 void CallStack::Clear() {
-  for (vector<StackFrame *>::const_iterator iterator = frames_.begin();
+  for (vector<StackFrame*>::const_iterator iterator = frames_.begin();
        iterator != frames_.end();
        ++iterator) {
     delete *iterator;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info.cc	2021-12-09 12:01:26.000000000 +0000
@@ -48,9 +48,9 @@
 #endif
 
 template<typename V>
-bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap<V> &registers,
-                                  const MemoryRegion &memory,
-                                  RegisterValueMap<V> *caller_registers) const {
+bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap<V>& registers,
+                                  const MemoryRegion& memory,
+                                  RegisterValueMap<V>* caller_registers) const {
   // If there are not rules for both .ra and .cfa in effect at this address,
   // don't use this CFI data for stack walking.
   if (cfa_rule_.empty() || ra_rule_.empty())
@@ -93,13 +93,13 @@
 
 // Explicit instantiations for 32-bit and 64-bit architectures.
 template bool CFIFrameInfo::FindCallerRegs<uint32_t>(
-    const RegisterValueMap<uint32_t> &registers,
-    const MemoryRegion &memory,
-    RegisterValueMap<uint32_t> *caller_registers) const;
+    const RegisterValueMap<uint32_t>& registers,
+    const MemoryRegion& memory,
+    RegisterValueMap<uint32_t>* caller_registers) const;
 template bool CFIFrameInfo::FindCallerRegs<uint64_t>(
-    const RegisterValueMap<uint64_t> &registers,
-    const MemoryRegion &memory,
-    RegisterValueMap<uint64_t> *caller_registers) const;
+    const RegisterValueMap<uint64_t>& registers,
+    const MemoryRegion& memory,
+    RegisterValueMap<uint64_t>* caller_registers) const;
 
 string CFIFrameInfo::Serialize() const {
   std::ostringstream stream;
@@ -123,7 +123,7 @@
   return stream.str();
 }
 
-bool CFIRuleParser::Parse(const string &rule_set) {
+bool CFIRuleParser::Parse(const string& rule_set) {
   size_t rule_set_len = rule_set.size();
   scoped_array<char> working_copy(new char[rule_set_len + 1]);
   memcpy(working_copy.get(), rule_set.data(), rule_set_len);
@@ -132,9 +132,9 @@
   name_.clear();
   expression_.clear();
 
-  char *cursor;
+  char* cursor;
   static const char token_breaks[] = " \t\r\n";
-  char *token = strtok_r(working_copy.get(), token_breaks, &cursor);
+  char* token = strtok_r(working_copy.get(), token_breaks, &cursor);
 
   for (;;) {
     // End of rule set?
@@ -170,16 +170,16 @@
   return true;
 }
 
-void CFIFrameInfoParseHandler::CFARule(const string &expression) {
+void CFIFrameInfoParseHandler::CFARule(const string& expression) {
   frame_info_->SetCFARule(expression);
 }
 
-void CFIFrameInfoParseHandler::RARule(const string &expression) {
+void CFIFrameInfoParseHandler::RARule(const string& expression) {
   frame_info_->SetRARule(expression);
 }
 
-void CFIFrameInfoParseHandler::RegisterRule(const string &name,
-                                            const string &expression) {
+void CFIFrameInfoParseHandler::RegisterRule(const string& name,
+                                            const string& expression) {
   frame_info_->SetRegisterRule(name, expression);
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info.h	2021-12-09 12:01:26.000000000 +0000
@@ -72,9 +72,9 @@
   // Set the expression for computing a call frame address, return
   // address, or register's value. At least the CFA rule and the RA
   // rule must be set before calling FindCallerRegs.
-  void SetCFARule(const string &expression) { cfa_rule_ = expression; }
-  void SetRARule(const string &expression)  { ra_rule_ = expression; }
-  void SetRegisterRule(const string &register_name, const string &expression) {
+  void SetCFARule(const string& expression) { cfa_rule_ = expression; }
+  void SetRARule(const string& expression)  { ra_rule_ = expression; }
+  void SetRegisterRule(const string& register_name, const string& expression) {
     register_rules_[register_name] = expression;
   }
 
@@ -96,9 +96,9 @@
   // These may be helpful in computing the caller's PC and stack
   // pointer, if their values are not explicitly specified.
   template<typename ValueType>
-  bool FindCallerRegs(const RegisterValueMap<ValueType> &registers,
-                      const MemoryRegion &memory,
-                      RegisterValueMap<ValueType> *caller_registers) const;
+  bool FindCallerRegs(const RegisterValueMap<ValueType>& registers,
+                      const MemoryRegion& memory,
+                      RegisterValueMap<ValueType>* caller_registers) const;
 
   // Serialize the rules in this object into a string in the format
   // of STACK CFI records.
@@ -148,28 +148,28 @@
     virtual ~Handler() { }
 
     // The input specifies EXPRESSION as the CFA/RA computation rule.
-    virtual void CFARule(const string &expression) = 0;
-    virtual void RARule(const string &expression) = 0;
+    virtual void CFARule(const string& expression) = 0;
+    virtual void RARule(const string& expression) = 0;
 
     // The input specifies EXPRESSION as the recovery rule for register NAME.
-    virtual void RegisterRule(const string &name, const string &expression) = 0;
+    virtual void RegisterRule(const string& name, const string& expression) = 0;
   };
     
   // Construct a parser which feeds its results to HANDLER.
-  CFIRuleParser(Handler *handler) : handler_(handler) { }
+  CFIRuleParser(Handler* handler) : handler_(handler) { }
 
   // Parse RULE_SET as a set of CFA computation and RA/register
   // recovery rules, as appearing in STACK CFI records. Report the
   // results of parsing by making the appropriate calls to handler_.
   // Return true if parsing was successful, false otherwise.
-  bool Parse(const string &rule_set);
+  bool Parse(const string& rule_set);
 
  private:
   // Report any accumulated rule to handler_
   bool Report();
 
   // The handler to which the parser reports its findings.
-  Handler *handler_;
+  Handler* handler_;
 
   // Working data.
   string name_, expression_;
@@ -180,15 +180,15 @@
 class CFIFrameInfoParseHandler: public CFIRuleParser::Handler {
  public:
   // Populate FRAME_INFO with the results of parsing.
-  CFIFrameInfoParseHandler(CFIFrameInfo *frame_info)
+  CFIFrameInfoParseHandler(CFIFrameInfo* frame_info)
       : frame_info_(frame_info) { }
 
-  void CFARule(const string &expression);
-  void RARule(const string &expression);
-  void RegisterRule(const string &name, const string &expression);
+  void CFARule(const string& expression);
+  void RARule(const string& expression);
+  void RegisterRule(const string& name, const string& expression);
 
  private:
-  CFIFrameInfo *frame_info_;
+  CFIFrameInfo* frame_info_;
 };
 
 // A utility class template for simple 'STACK CFI'-driven stack walkers.
@@ -212,14 +212,14 @@
   // A structure describing one architecture register.
   struct RegisterSet {
     // The register name, as it appears in STACK CFI rules.
-    const char *name;
+    const char* name;
 
     // An alternate name that the register's value might be found
     // under in a register value dictionary, or NULL. When generating
     // names, prefer NAME to this value. It's common to list ".cfa" as
     // an alternative name for the stack pointer, and ".ra" as an
     // alternative name for the instruction pointer.
-    const char *alternate_name;
+    const char* alternate_name;
 
     // True if the callee is expected to preserve the value of this
     // register. If this flag is true for some register R, and the STACK
@@ -240,7 +240,7 @@
   // architecture's register set. REGISTER_MAP is an array of
   // RegisterSet structures; MAP_SIZE is the number of elements in the
   // array.
-  SimpleCFIWalker(const RegisterSet *register_map, size_t map_size)
+  SimpleCFIWalker(const RegisterSet* register_map, size_t map_size)
       : register_map_(register_map), map_size_(map_size) { }
 
   // Compute the calling frame's raw context given the callee's raw
@@ -256,15 +256,15 @@
   // fill in CALLER_CONTEXT with the caller's register values, and set
   // CALLER_VALIDITY to indicate which registers are valid in
   // CALLER_CONTEXT. Return true on success, or false on failure.
-  bool FindCallerRegisters(const MemoryRegion &memory,
-                           const CFIFrameInfo &cfi_frame_info,
-                           const RawContextType &callee_context,
+  bool FindCallerRegisters(const MemoryRegion& memory,
+                           const CFIFrameInfo& cfi_frame_info,
+                           const RawContextType& callee_context,
                            int callee_validity,
-                           RawContextType *caller_context,
-                           int *caller_validity) const;
+                           RawContextType* caller_context,
+                           int* caller_validity) const;
 
  private:
-  const RegisterSet *register_map_;
+  const RegisterSet* register_map_;
   size_t map_size_;
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -42,12 +42,12 @@
 
 template <typename RegisterType, class RawContextType>
 bool SimpleCFIWalker<RegisterType, RawContextType>::FindCallerRegisters(
-    const MemoryRegion &memory,
-    const CFIFrameInfo &cfi_frame_info,
-    const RawContextType &callee_context,
+    const MemoryRegion& memory,
+    const CFIFrameInfo& cfi_frame_info,
+    const RawContextType& callee_context,
     int callee_validity,
-    RawContextType *caller_context,
-    int *caller_validity) const {
+    RawContextType* caller_context,
+    int* caller_validity) const {
   typedef CFIFrameInfo::RegisterValueMap<RegisterType> ValueMap;
   ValueMap callee_registers;
   ValueMap caller_registers;
@@ -56,7 +56,7 @@
 
   // Populate callee_registers with register values from callee_context.
   for (size_t i = 0; i < map_size_; i++) {
-    const RegisterSet &r = register_map_[i];
+    const RegisterSet& r = register_map_[i];
     if (callee_validity & r.validity_flag)
       callee_registers[r.name] = callee_context.*r.context_member;
   }
@@ -71,7 +71,7 @@
   memset(caller_context, 0xda, sizeof(*caller_context));
   *caller_validity = 0;
   for (size_t i = 0; i < map_size_; i++) {
-    const RegisterSet &r = register_map_[i];
+    const RegisterSet& r = register_map_[i];
     typename ValueMap::const_iterator caller_entry;
 
     // Did the rules provide a value for this register by its name?
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/cfi_frame_info_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -56,10 +56,10 @@
  public:
   MOCK_CONST_METHOD0(GetBase, uint64_t());
   MOCK_CONST_METHOD0(GetSize, uint32_t());
-  MOCK_CONST_METHOD2(GetMemoryAtAddress, bool(uint64_t, uint8_t *));
-  MOCK_CONST_METHOD2(GetMemoryAtAddress, bool(uint64_t, uint16_t *));
-  MOCK_CONST_METHOD2(GetMemoryAtAddress, bool(uint64_t, uint32_t *));
-  MOCK_CONST_METHOD2(GetMemoryAtAddress, bool(uint64_t, uint64_t *));
+  MOCK_CONST_METHOD2(GetMemoryAtAddress, bool(uint64_t, uint8_t*));
+  MOCK_CONST_METHOD2(GetMemoryAtAddress, bool(uint64_t, uint16_t*));
+  MOCK_CONST_METHOD2(GetMemoryAtAddress, bool(uint64_t, uint32_t*));
+  MOCK_CONST_METHOD2(GetMemoryAtAddress, bool(uint64_t, uint64_t*));
   MOCK_CONST_METHOD0(Print, void());
 };
 
@@ -70,10 +70,10 @@
   void ExpectNoMemoryReferences() {
     EXPECT_CALL(memory, GetBase()).Times(0);
     EXPECT_CALL(memory, GetSize()).Times(0);
-    EXPECT_CALL(memory, GetMemoryAtAddress(_, A<uint8_t *>())).Times(0);
-    EXPECT_CALL(memory, GetMemoryAtAddress(_, A<uint16_t *>())).Times(0);
-    EXPECT_CALL(memory, GetMemoryAtAddress(_, A<uint32_t *>())).Times(0);
-    EXPECT_CALL(memory, GetMemoryAtAddress(_, A<uint64_t *>())).Times(0);
+    EXPECT_CALL(memory, GetMemoryAtAddress(_, A<uint8_t*>())).Times(0);
+    EXPECT_CALL(memory, GetMemoryAtAddress(_, A<uint16_t*>())).Times(0);
+    EXPECT_CALL(memory, GetMemoryAtAddress(_, A<uint32_t*>())).Times(0);
+    EXPECT_CALL(memory, GetMemoryAtAddress(_, A<uint64_t*>())).Times(0);
   }
 
   CFIFrameInfo cfi;
@@ -292,9 +292,9 @@
 
 class MockCFIRuleParserHandler: public CFIRuleParser::Handler {
  public:
-  MOCK_METHOD1(CFARule, void(const string &));
-  MOCK_METHOD1(RARule,  void(const string &));
-  MOCK_METHOD2(RegisterRule, void(const string &, const string &));
+  MOCK_METHOD1(CFARule, void(const string&));
+  MOCK_METHOD1(RARule,  void(const string&));
+  MOCK_METHOD2(RegisterRule, void(const string&, const string&));
 };
 
 // A fixture class for testing CFIRuleParser.
@@ -509,12 +509,12 @@
 
   // Saved r0.
   EXPECT_CALL(memory,
-              GetMemoryAtAddress(stack_top, A<uint64_t *>()))
+              GetMemoryAtAddress(stack_top, A<uint64_t*>()))
       .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xdc1975eba8602302ULL),
                             Return(true)));
   // Saved return address.
   EXPECT_CALL(memory,
-              GetMemoryAtAddress(stack_top + 16, A<uint64_t *>()))
+              GetMemoryAtAddress(stack_top + 16, A<uint64_t*>()))
       .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xba5ad6d9acce28deULL),
                             Return(true)));
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map.h	2021-12-09 12:01:26.000000000 +0000
@@ -86,16 +86,16 @@
   // grandchildren of this ContainedRangeMap.  Returns false for a
   // parameter error, or if the ContainedRangeMap hierarchy guarantees
   // would be violated.
-  bool StoreRange(const AddressType &base,
-                  const AddressType &size,
-                  const EntryType &entry);
+  bool StoreRange(const AddressType& base,
+                  const AddressType& size,
+                  const EntryType& entry);
 
   // Retrieves the most specific (smallest) descendant range encompassing
   // the specified address.  This method will only return entries held by
   // child ranges, and not the entry contained by |this|.  This is necessary
   // to support a sparsely-populated root range.  If no descendant range
   // encompasses the address, returns false.
-  bool RetrieveRange(const AddressType &address, EntryType *entry) const;
+  bool RetrieveRange(const AddressType& address, EntryType* entry) const;
 
   // Removes all children.  Note that Clear only removes descendants,
   // leaving the node on which it is called intact.  Because the only
@@ -110,7 +110,7 @@
 
   // AddressToRangeMap stores pointers.  This makes reparenting simpler in
   // StoreRange, because it doesn't need to copy entire objects.
-  typedef std::map<AddressType, ContainedRangeMap *> AddressToRangeMap;
+  typedef std::map<AddressType, ContainedRangeMap*> AddressToRangeMap;
   typedef typename AddressToRangeMap::const_iterator MapConstIterator;
   typedef typename AddressToRangeMap::iterator MapIterator;
   typedef typename AddressToRangeMap::value_type MapValue;
@@ -118,8 +118,8 @@
   // Creates a new ContainedRangeMap with the specified base address, entry,
   // and initial child map, which may be NULL.  This is only used internally
   // by ContainedRangeMap when it creates a new child.
-  ContainedRangeMap(const AddressType &base, const EntryType &entry,
-                    AddressToRangeMap *map)
+  ContainedRangeMap(const AddressType& base, const EntryType& entry,
+                    AddressToRangeMap* map)
       : base_(base), entry_(entry), map_(map) {}
 
   // The base address of this range.  The high address does not need to
@@ -140,7 +140,7 @@
   // The map containing child ranges, keyed by each child range's high
   // address.  This is a pointer to avoid allocating map structures for
   // leaf nodes, where they are not needed.
-  AddressToRangeMap *map_;
+  AddressToRangeMap* map_;
 };
 
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -55,7 +55,7 @@
 
 template<typename AddressType, typename EntryType>
 bool ContainedRangeMap<AddressType, EntryType>::StoreRange(
-    const AddressType &base, const AddressType &size, const EntryType &entry) {
+    const AddressType& base, const AddressType& size, const EntryType& entry) {
   AddressType high = base + size - 1;
 
   // Check for undersize or overflow.
@@ -125,7 +125,7 @@
   // Optimization: if the iterators are equal, no child ranges would be
   // moved.  Create the new child range with a NULL map to conserve space
   // in leaf nodes, of which there will be many.
-  AddressToRangeMap *child_map = NULL;
+  AddressToRangeMap* child_map = NULL;
 
   if (iterator_base != iterator_high) {
     // The children of this range that are contained by the new range must
@@ -149,7 +149,7 @@
 
 template<typename AddressType, typename EntryType>
 bool ContainedRangeMap<AddressType, EntryType>::RetrieveRange(
-    const AddressType &address, EntryType *entry) const {
+    const AddressType& address, EntryType* entry) const {
   BPLOG_IF(ERROR, !entry) << "ContainedRangeMap::RetrieveRange requires "
                              "|entry|";
   assert(entry);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/contained_range_map_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -256,7 +256,7 @@
 }  // namespace
 
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   BPLOG_INIT(&argc, &argv);
 
   return RunTests() ? 0 : 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/disassembler_x86.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/disassembler_x86.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/disassembler_x86.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/disassembler_x86.cc	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,7 @@
 
 namespace google_breakpad {
 
-DisassemblerX86::DisassemblerX86(const uint8_t *bytecode,
+DisassemblerX86::DisassemblerX86(const uint8_t* bytecode,
                                  uint32_t size,
                                  uint32_t virtual_address) :
                                      bytecode_(bytecode),
@@ -62,7 +62,7 @@
     return 0;
   }
   uint32_t instr_size = 0;
-  instr_size = libdis::x86_disasm((unsigned char *)bytecode_, size_,
+  instr_size = libdis::x86_disasm((unsigned char*)bytecode_, size_,
                           virtual_address_, current_byte_offset_,
                           &current_instr_);
   if (instr_size == 0) {
@@ -78,8 +78,8 @@
 
   if (current_instr_.type == libdis::insn_return)
     end_of_block_ = true;
-  libdis::x86_op_t *src = libdis::x86_get_src_operand(&current_instr_);
-  libdis::x86_op_t *dest = libdis::x86_get_dest_operand(&current_instr_);
+  libdis::x86_op_t* src = libdis::x86_get_src_operand(&current_instr_);
+  libdis::x86_op_t* dest = libdis::x86_get_dest_operand(&current_instr_);
 
   if (register_valid_) {
     switch (current_instr_.group) {
@@ -213,7 +213,7 @@
   if (!instr_valid_)
     return false;
 
-  libdis::x86_op_t *operand = libdis::x86_get_src_operand(&current_instr_);
+  libdis::x86_op_t* operand = libdis::x86_get_src_operand(&current_instr_);
   if (!operand || operand->type != libdis::op_expression)
     return false;
 
@@ -227,7 +227,7 @@
   if (!instr_valid_)
     return false;
 
-  libdis::x86_op_t *operand = libdis::x86_get_dest_operand(&current_instr_);
+  libdis::x86_op_t* operand = libdis::x86_get_dest_operand(&current_instr_);
   if (!operand || operand->type != libdis::op_expression)
     return false;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/disassembler_x86.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/disassembler_x86.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/disassembler_x86.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/disassembler_x86.h	2021-12-09 12:01:26.000000000 +0000
@@ -63,7 +63,7 @@
     // TODO(cdn): Modify this class to take a MemoryRegion instead of just
     // a raw buffer. This will make it easier to use this on arbitrary
     // minidumps without first copying out the code segment.
-    DisassemblerX86(const uint8_t *bytecode, uint32_t, uint32_t);
+    DisassemblerX86(const uint8_t* bytecode, uint32_t, uint32_t);
     ~DisassemblerX86();
 
     // This walks to the next instruction in the memory region and
@@ -102,7 +102,7 @@
     bool setBadWrite();
 
   protected:
-    const uint8_t *bytecode_;
+    const uint8_t* bytecode_;
     uint32_t size_;
     uint32_t virtual_address_;
     uint32_t current_byte_offset_;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability.cc	2021-12-09 12:01:26.000000000 +0000
@@ -93,6 +93,7 @@
     case MD_OS_SOLARIS:
     case MD_OS_ANDROID:
     case MD_OS_PS3:
+    case MD_OS_FUCHSIA:
     default: {
       platform_exploitability = NULL;
       break;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_linux.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_linux.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_linux.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_linux.cc	2021-12-09 12:01:26.000000000 +0000
@@ -77,13 +77,13 @@
 
 namespace google_breakpad {
 
-ExploitabilityLinux::ExploitabilityLinux(Minidump *dump,
-                                         ProcessState *process_state)
+ExploitabilityLinux::ExploitabilityLinux(Minidump* dump,
+                                         ProcessState* process_state)
     : Exploitability(dump, process_state),
       enable_objdump_(false) { }
 
-ExploitabilityLinux::ExploitabilityLinux(Minidump *dump,
-                                         ProcessState *process_state,
+ExploitabilityLinux::ExploitabilityLinux(Minidump* dump,
+                                         ProcessState* process_state,
                                          bool enable_objdump)
     : Exploitability(dump, process_state),
       enable_objdump_(enable_objdump) { }
@@ -111,12 +111,12 @@
   }
 
   // Getting exception data. (It should exist for all minidumps.)
-  MinidumpException *exception = dump_->GetException();
+  MinidumpException* exception = dump_->GetException();
   if (exception == NULL) {
     BPLOG(INFO) << "No exception record.";
     return EXPLOITABILITY_ERR_PROCESSING;
   }
-  const MDRawExceptionStream *raw_exception_stream = exception->exception();
+  const MDRawExceptionStream* raw_exception_stream = exception->exception();
   if (raw_exception_stream == NULL) {
     BPLOG(INFO) << "No raw exception stream.";
     return EXPLOITABILITY_ERR_PROCESSING;
@@ -132,7 +132,7 @@
   uint64_t instruction_ptr = 0;
   uint64_t stack_ptr = 0;
 
-  const MinidumpContext *context = exception->GetContext();
+  const MinidumpContext* context = exception->GetContext();
   if (context == NULL) {
     BPLOG(INFO) << "No exception context.";
     return EXPLOITABILITY_ERR_PROCESSING;
@@ -174,8 +174,8 @@
   BPLOG(INFO) << "MinGW does not support fork and exec. Terminating method.";
 #else
   // Get memory region containing instruction pointer.
-  MinidumpMemoryList *memory_list = dump_->GetMemoryList();
-  MinidumpMemoryRegion *memory_region =
+  MinidumpMemoryList* memory_list = dump_->GetMemoryList();
+  MinidumpMemoryRegion* memory_region =
       memory_list ?
       memory_list->GetMemoryRegionForAddress(instruction_ptr) : NULL;
   if (!memory_region) {
@@ -185,15 +185,15 @@
 
   // Get exception data to find architecture.
   string architecture = "";
-  MinidumpException *exception = dump_->GetException();
+  MinidumpException* exception = dump_->GetException();
   // This should never evaluate to true, since this should not be reachable
   // without checking for exception data earlier.
   if (!exception) {
     BPLOG(INFO) << "No exception data.";
     return false;
   }
-  const MDRawExceptionStream *raw_exception_stream = exception->exception();
-  const MinidumpContext *context = exception->GetContext();
+  const MDRawExceptionStream* raw_exception_stream = exception->exception();
+  const MinidumpContext* context = exception->GetContext();
   // This should not evaluate to true, for the same reason mentioned above.
   if (!raw_exception_stream || !context) {
     BPLOG(INFO) << "No exception or architecture data.";
@@ -217,7 +217,7 @@
 
   // Get memory region around instruction pointer and the number of bytes
   // before and after the instruction pointer in the memory region.
-  const uint8_t *raw_memory = memory_region->GetMemory();
+  const uint8_t* raw_memory = memory_region->GetMemory();
   const uint64_t base = memory_region->GetBase();
   if (base > instruction_ptr) {
     BPLOG(ERROR) << "Memory region base value exceeds instruction pointer.";
@@ -275,9 +275,9 @@
 }
 
 #ifndef _WIN32
-bool ExploitabilityLinux::CalculateAddress(const string &address_expression,
-                                           const DumpContext &context,
-                                           uint64_t *write_address) {
+bool ExploitabilityLinux::CalculateAddress(const string& address_expression,
+                                           const DumpContext& context,
+                                           uint64_t* write_address) {
   // The destination should be the format reg+a or reg-a, where reg
   // is a register and a is a hexadecimal constant. Although more complex
   // expressions can make valid instructions, objdump's disassembly outputs
@@ -395,8 +395,8 @@
 
 // static
 bool ExploitabilityLinux::GetObjdumpInstructionLine(
-    const char *objdump_output_buffer,
-    string *instruction_line) {
+    const char* objdump_output_buffer,
+    string* instruction_line) {
   // Put buffer data into stream to output line-by-line.
   std::stringstream objdump_stream;
   objdump_stream.str(string(objdump_output_buffer));
@@ -420,10 +420,10 @@
   return true;
 }
 
-bool ExploitabilityLinux::TokenizeObjdumpInstruction(const string &line,
-                                                     string *operation,
-                                                     string *dest,
-                                                     string *src) {
+bool ExploitabilityLinux::TokenizeObjdumpInstruction(const string& line,
+                                                     string* operation,
+                                                     string* dest,
+                                                     string* src) {
   if (!operation || !dest || !src) {
     BPLOG(ERROR) << "Null parameters passed.";
     return false;
@@ -483,10 +483,10 @@
   return true;
 }
 
-bool ExploitabilityLinux::DisassembleBytes(const string &architecture,
-                                           const uint8_t *raw_bytes,
+bool ExploitabilityLinux::DisassembleBytes(const string& architecture,
+                                           const uint8_t* raw_bytes,
                                            const unsigned int buffer_len,
-                                           char *objdump_output_buffer) {
+                                           char* objdump_output_buffer) {
   if (!raw_bytes || !objdump_output_buffer) {
     BPLOG(ERROR) << "Bad input parameters.";
     return false;
@@ -514,7 +514,7 @@
            "objdump -D -b binary -M intel -m %s %s",
            architecture.c_str(),
            raw_bytes_tmpfile);
-  FILE *objdump_fp = popen(cmd, "r");
+  FILE* objdump_fp = popen(cmd, "r");
   if (!objdump_fp) {
     fclose(objdump_fp);
     unlink(raw_bytes_tmpfile);
@@ -534,12 +534,12 @@
 #endif  // _WIN32
 
 bool ExploitabilityLinux::StackPointerOffStack(uint64_t stack_ptr) {
-  MinidumpLinuxMapsList *linux_maps_list = dump_->GetLinuxMapsList();
+  MinidumpLinuxMapsList* linux_maps_list = dump_->GetLinuxMapsList();
   // Inconclusive if there are no mappings available.
   if (!linux_maps_list) {
     return false;
   }
-  const MinidumpLinuxMaps *linux_maps =
+  const MinidumpLinuxMaps* linux_maps =
       linux_maps_list->GetLinuxMapsForAddress(stack_ptr);
   // Checks if the stack pointer maps to a valid mapping and if the mapping
   // is not the stack. If the mapping has no name, it is inconclusive whether
@@ -550,10 +550,10 @@
 }
 
 bool ExploitabilityLinux::ExecutableStackOrHeap() {
-  MinidumpLinuxMapsList *linux_maps_list = dump_->GetLinuxMapsList();
+  MinidumpLinuxMapsList* linux_maps_list = dump_->GetLinuxMapsList();
   if (linux_maps_list) {
     for (size_t i = 0; i < linux_maps_list->get_maps_count(); i++) {
-      const MinidumpLinuxMaps *linux_maps =
+      const MinidumpLinuxMaps* linux_maps =
           linux_maps_list->GetLinuxMapsAtIndex(i);
       // Check for executable stack or heap for each mapping.
       if (linux_maps && (!linux_maps->GetPathname().compare(
@@ -574,15 +574,15 @@
   // whether it is in a valid code region. If there is no mapping for the
   // instruction pointer, it is indicative that the instruction pointer is
   // not within a module, which implies that it is outside a valid area.
-  MinidumpLinuxMapsList *linux_maps_list = dump_->GetLinuxMapsList();
-  const MinidumpLinuxMaps *linux_maps =
+  MinidumpLinuxMapsList* linux_maps_list = dump_->GetLinuxMapsList();
+  const MinidumpLinuxMaps* linux_maps =
       linux_maps_list ?
       linux_maps_list->GetLinuxMapsForAddress(instruction_ptr) : NULL;
   return linux_maps ? linux_maps->IsExecutable() : false;
 }
 
-bool ExploitabilityLinux::BenignCrashTrigger(const MDRawExceptionStream
-                                                  *raw_exception_stream) {
+bool ExploitabilityLinux::BenignCrashTrigger(
+    const MDRawExceptionStream* raw_exception_stream) {
   // Check the cause of crash.
   // If the exception of the crash is a benign exception,
   // it is probably not exploitable.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_linux.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_linux.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_linux.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_linux.h	2021-12-09 12:01:26.000000000 +0000
@@ -44,8 +44,8 @@
 
 class ExploitabilityLinux : public Exploitability {
  public:
-  ExploitabilityLinux(Minidump *dump,
-                      ProcessState *process_state);
+  ExploitabilityLinux(Minidump* dump,
+                      ProcessState* process_state);
 
   // Parameters are the minidump to analyze, the object representing process
   // state, and whether to enable objdump disassembly.
@@ -53,8 +53,8 @@
   // objdump for diassembly. It is used to check the identity of the
   // instruction that caused the program to crash. If there are any
   // portability concerns, this should not be enabled.
-  ExploitabilityLinux(Minidump *dump,
-                      ProcessState *process_state,
+  ExploitabilityLinux(Minidump* dump,
+                      ProcessState* process_state,
                       bool enable_objdump);
 
   virtual ExploitabilityRating CheckPlatformExploitability();
@@ -68,7 +68,7 @@
 
   // Checks the exception that triggered the creation of the
   // minidump and reports whether the exception suggests no exploitability.
-  bool BenignCrashTrigger(const MDRawExceptionStream *raw_exception_stream);
+  bool BenignCrashTrigger(const MDRawExceptionStream* raw_exception_stream);
 
   // This method checks if the crash occurred during a write to read-only or
   // invalid memory. It does so by checking if the instruction at the
@@ -81,34 +81,34 @@
   // buffer, given the desired architecture, the file from which objdump will
   // read, and the buffer length. The method returns whether the disassembly
   // was a success, and the caller owns all pointers.
-  static bool DisassembleBytes(const string &architecture,
-                               const uint8_t *raw_bytes,
+  static bool DisassembleBytes(const string& architecture,
+                               const uint8_t* raw_bytes,
                                const unsigned int MAX_OBJDUMP_BUFFER_LEN,
-                               char *objdump_output_buffer);
+                               char* objdump_output_buffer);
 
   // Parses the objdump output given in |objdump_output_buffer| and extracts
   // the line of the first instruction into |instruction_line|.  Returns true
   // when the instruction line is successfully extracted.
   static bool GetObjdumpInstructionLine(
-      const char *objdump_output_buffer,
-      string *instruction_line);
+      const char* objdump_output_buffer,
+      string* instruction_line);
 
   // Tokenizes out the operation and operands from a line of instruction
   // disassembled by objdump. This method modifies the pointers to match the
   // tokens of the instruction, and returns if the tokenizing was a success.
   // The caller owns all pointers.
-  static bool TokenizeObjdumpInstruction(const string &line,
-                                         string *operation,
-                                         string *dest,
-                                         string *src);
+  static bool TokenizeObjdumpInstruction(const string& line,
+                                         string* operation,
+                                         string* dest,
+                                         string* src);
 
   // Calculates the effective address of an expression in the form reg+a or
   // reg-a, where 'reg' is a register and 'a' is a constant, and writes the
   // result in the pointer. The method returns whether the calculation was
   // a success. The caller owns the pointer.
-  static bool CalculateAddress(const string &address_expression,
-                               const DumpContext &context,
-                               uint64_t *write_address);
+  static bool CalculateAddress(const string& address_expression,
+                               const DumpContext& context,
+                               uint64_t* write_address);
 #endif  // _WIN32
 
   // Checks if the stack pointer points to a memory mapping that is not
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_win.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_win.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_win.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/exploitability_win.cc	2021-12-09 12:01:26.000000000 +0000
@@ -69,30 +69,30 @@
 // The maximum number of bytes to disassemble past the program counter.
 static const size_t kDisassembleBytesBeyondPC = 2048;
 
-ExploitabilityWin::ExploitabilityWin(Minidump *dump,
-                                     ProcessState *process_state)
+ExploitabilityWin::ExploitabilityWin(Minidump* dump,
+                                     ProcessState* process_state)
     : Exploitability(dump, process_state) { }
 
 ExploitabilityRating ExploitabilityWin::CheckPlatformExploitability() {
-  MinidumpException *exception = dump_->GetException();
+  MinidumpException* exception = dump_->GetException();
   if (!exception) {
     BPLOG(INFO) << "Minidump does not have exception record.";
     return EXPLOITABILITY_ERR_PROCESSING;
   }
 
-  const MDRawExceptionStream *raw_exception = exception->exception();
+  const MDRawExceptionStream* raw_exception = exception->exception();
   if (!raw_exception) {
     BPLOG(INFO) << "Could not obtain raw exception info.";
     return EXPLOITABILITY_ERR_PROCESSING;
   }
 
-  const MinidumpContext *context = exception->GetContext();
+  const MinidumpContext* context = exception->GetContext();
   if (!context) {
     BPLOG(INFO) << "Could not obtain exception context.";
     return EXPLOITABILITY_ERR_PROCESSING;
   }
 
-  MinidumpMemoryList *memory_list = dump_->GetMemoryList();
+  MinidumpMemoryList* memory_list = dump_->GetMemoryList();
   bool memory_available = true;
   if (!memory_list) {
     BPLOG(INFO) << "Minidump memory segments not available.";
@@ -195,7 +195,7 @@
             return EXPLOITABILITY_ERR_PROCESSING;
             break;
         }
-        MinidumpMemoryRegion *instruction_region = 0;
+        MinidumpMemoryRegion* instruction_region = 0;
         if (memory_available) {
           instruction_region =
               memory_list->GetMemoryRegionForAddress(instruction_ptr);
@@ -211,7 +211,7 @@
           available_memory = available_memory > kDisassembleBytesBeyondPC ?
               kDisassembleBytesBeyondPC : available_memory;
           if (available_memory) {
-            const uint8_t *raw_memory =
+            const uint8_t* raw_memory =
                 instruction_region->GetMemory() + memory_offset;
             DisassemblerX86 disassembler(raw_memory,
                                          available_memory,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver.cc	2021-12-09 12:01:26.000000000 +0000
@@ -61,7 +61,7 @@
   return false;
 }
 
-void FastSourceLineResolver::Module::LookupAddress(StackFrame *frame) const {
+void FastSourceLineResolver::Module::LookupAddress(StackFrame* frame) const {
   MemAddr address = frame->instruction - frame->module->base_address();
 
   // First, look for a FUNC record that covers address. Use
@@ -109,7 +109,7 @@
 
 // WFI: WindowsFrameInfo.
 // Returns a WFI object reading from a raw memory chunk of data
-WindowsFrameInfo FastSourceLineResolver::CopyWFI(const char *raw) {
+WindowsFrameInfo FastSourceLineResolver::CopyWFI(const char* raw) {
   const WindowsFrameInfo::StackInfoTypes type =
      static_cast<const WindowsFrameInfo::StackInfoTypes>(
          *reinterpret_cast<const int32_t*>(raw));
@@ -117,7 +117,7 @@
   // The first 8 bytes of int data are unused.
   // They correspond to "StackInfoTypes type_;" and "int valid;"
   // data member of WFI.
-  const uint32_t *para_uint32 = reinterpret_cast<const uint32_t*>(
+  const uint32_t* para_uint32 = reinterpret_cast<const uint32_t*>(
       raw + 2 * sizeof(int32_t));
 
   uint32_t prolog_size = para_uint32[0];;
@@ -126,7 +126,7 @@
   uint32_t saved_register_size = para_uint32[3];
   uint32_t local_size = para_uint32[4];
   uint32_t max_stack_size = para_uint32[5];
-  const char *boolean = reinterpret_cast<const char*>(para_uint32 + 6);
+  const char* boolean = reinterpret_cast<const char*>(para_uint32 + 6);
   bool allocates_base_pointer = (*boolean != 0);
   string program_string = boolean + 1;
 
@@ -145,15 +145,15 @@
 // Does NOT take ownership of mem_buffer.
 // In addition, treat mem_buffer as const char*.
 bool FastSourceLineResolver::Module::LoadMapFromMemory(
-    char *memory_buffer,
+    char* memory_buffer,
     size_t memory_buffer_size) {
   if (!memory_buffer) return false;
 
   // Read the "is_corrupt" flag.
-  const char *mem_buffer = memory_buffer;
+  const char* mem_buffer = memory_buffer;
   mem_buffer = SimpleSerializer<bool>::Read(mem_buffer, &is_corrupt_);
 
-  const uint32_t *map_sizes = reinterpret_cast<const uint32_t*>(mem_buffer);
+  const uint32_t* map_sizes = reinterpret_cast<const uint32_t*>(mem_buffer);
 
   unsigned int header_size = kNumberMaps_ * sizeof(unsigned int);
 
@@ -185,8 +185,8 @@
   return true;
 }
 
-WindowsFrameInfo *FastSourceLineResolver::Module::FindWindowsFrameInfo(
-    const StackFrame *frame) const {
+WindowsFrameInfo* FastSourceLineResolver::Module::FindWindowsFrameInfo(
+    const StackFrame* frame) const {
   MemAddr address = frame->instruction - frame->module->base_address();
   scoped_ptr<WindowsFrameInfo> result(new WindowsFrameInfo());
 
@@ -238,8 +238,8 @@
   return NULL;
 }
 
-CFIFrameInfo *FastSourceLineResolver::Module::FindCFIFrameInfo(
-    const StackFrame *frame) const {
+CFIFrameInfo* FastSourceLineResolver::Module::FindCFIFrameInfo(
+    const StackFrame* frame) const {
   MemAddr address = frame->instruction - frame->module->base_address();
   MemAddr initial_base, initial_size;
   const char* initial_rules = NULL;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver_types.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver_types.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver_types.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver_types.h	2021-12-09 12:01:26.000000000 +0000
@@ -54,16 +54,16 @@
 namespace google_breakpad {
 
 struct FastSourceLineResolver::Line : public SourceLineResolverBase::Line {
-  void CopyFrom(const Line *line_ptr) {
-    const char *raw = reinterpret_cast<const char*>(line_ptr);
+  void CopyFrom(const Line* line_ptr) {
+    const char* raw = reinterpret_cast<const char*>(line_ptr);
     CopyFrom(raw);
   }
 
   // De-serialize the memory data of a Line.
-  void CopyFrom(const char *raw) {
+  void CopyFrom(const char* raw) {
     address = *(reinterpret_cast<const MemAddr*>(raw));
     size = *(reinterpret_cast<const MemAddr*>(raw + sizeof(address)));
-    source_file_id = *(reinterpret_cast<const int32_t *>(
+    source_file_id = *(reinterpret_cast<const int32_t*>(
         raw + 2 * sizeof(address)));
     line = *(reinterpret_cast<const int32_t*>(
         raw + 2 * sizeof(address) + sizeof(source_file_id)));
@@ -72,13 +72,13 @@
 
 struct FastSourceLineResolver::Function :
 public SourceLineResolverBase::Function {
-  void CopyFrom(const Function *func_ptr) {
-    const char *raw = reinterpret_cast<const char*>(func_ptr);
+  void CopyFrom(const Function* func_ptr) {
+    const char* raw = reinterpret_cast<const char*>(func_ptr);
     CopyFrom(raw);
   }
 
   // De-serialize the memory data of a Function.
-  void CopyFrom(const char *raw) {
+  void CopyFrom(const char* raw) {
     size_t name_size = strlen(raw) + 1;
     name = raw;
     address = *(reinterpret_cast<const MemAddr*>(raw + name_size));
@@ -95,13 +95,13 @@
 
 struct FastSourceLineResolver::PublicSymbol :
 public SourceLineResolverBase::PublicSymbol {
-  void CopyFrom(const PublicSymbol *public_symbol_ptr) {
-    const char *raw = reinterpret_cast<const char*>(public_symbol_ptr);
+  void CopyFrom(const PublicSymbol* public_symbol_ptr) {
+    const char* raw = reinterpret_cast<const char*>(public_symbol_ptr);
     CopyFrom(raw);
   }
 
   // De-serialize the memory data of a PublicSymbol.
-  void CopyFrom(const char *raw) {
+  void CopyFrom(const char* raw) {
     size_t name_size = strlen(raw) + 1;
     name = raw;
     address = *(reinterpret_cast<const MemAddr*>(raw + name_size));
@@ -112,15 +112,15 @@
 
 class FastSourceLineResolver::Module: public SourceLineResolverBase::Module {
  public:
-  explicit Module(const string &name) : name_(name), is_corrupt_(false) { }
+  explicit Module(const string& name) : name_(name), is_corrupt_(false) { }
   virtual ~Module() { }
 
   // Looks up the given relative address, and fills the StackFrame struct
   // with the result.
-  virtual void LookupAddress(StackFrame *frame) const;
+  virtual void LookupAddress(StackFrame* frame) const;
 
   // Loads a map from the given buffer in char* type.
-  virtual bool LoadMapFromMemory(char *memory_buffer,
+  virtual bool LoadMapFromMemory(char* memory_buffer,
                                  size_t memory_buffer_size);
 
   // Tells whether the loaded symbol data is corrupt.  Return value is
@@ -132,13 +132,13 @@
   // is not available, returns NULL. A NULL return value does not indicate
   // an error. The caller takes ownership of any returned WindowsFrameInfo
   // object.
-  virtual WindowsFrameInfo *FindWindowsFrameInfo(const StackFrame *frame) const;
+  virtual WindowsFrameInfo* FindWindowsFrameInfo(const StackFrame* frame) const;
 
   // If CFI stack walking information is available covering ADDRESS,
   // return a CFIFrameInfo structure describing it. If the information
   // is not available, return NULL. The caller takes ownership of any
   // returned CFIFrameInfo object.
-  virtual CFIFrameInfo *FindCFIFrameInfo(const StackFrame *frame) const;
+  virtual CFIFrameInfo* FindCFIFrameInfo(const StackFrame* frame) const;
 
   // Number of serialized map components of Module.
   static const int kNumberMaps_ = 5 + WindowsFrameInfo::STACK_INFO_LAST;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/fast_source_line_resolver_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -94,15 +94,15 @@
 class MockMemoryRegion: public MemoryRegion {
   uint64_t GetBase() const { return 0x10000; }
   uint32_t GetSize() const { return 0x01000; }
-  bool GetMemoryAtAddress(uint64_t address, uint8_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint8_t* value) const {
     *value = address & 0xff;
     return true;
   }
-  bool GetMemoryAtAddress(uint64_t address, uint16_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint16_t* value) const {
     *value = address & 0xffff;
     return true;
   }
-  bool GetMemoryAtAddress(uint64_t address, uint32_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint32_t* value) const {
     switch (address) {
       case 0x10008: *value = 0x98ecadc3; break;  // saved %ebx
       case 0x1000c: *value = 0x878f7524; break;  // saved %esi
@@ -113,7 +113,7 @@
     }
     return true;
   }
-  bool GetMemoryAtAddress(uint64_t address, uint64_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint64_t* value) const {
     *value = address;
     return true;
   }
@@ -127,9 +127,9 @@
 // EXPECTED's.) Also verify that ACTUAL has associations for ".ra" and
 // ".cfa".
 static bool VerifyRegisters(
-    const char *file, int line,
-    const CFIFrameInfo::RegisterValueMap<uint32_t> &expected,
-    const CFIFrameInfo::RegisterValueMap<uint32_t> &actual) {
+    const char* file, int line,
+    const CFIFrameInfo::RegisterValueMap<uint32_t>& expected,
+    const CFIFrameInfo::RegisterValueMap<uint32_t>& actual) {
   CFIFrameInfo::RegisterValueMap<uint32_t>::const_iterator a;
   a = actual.find(".cfa");
   if (a == actual.end())
@@ -158,7 +158,7 @@
   return true;
 }
 
-static bool VerifyEmpty(const StackFrame &frame) {
+static bool VerifyEmpty(const StackFrame& frame) {
   if (frame.function_name.empty() &&
       frame.source_file_name.empty() &&
       frame.source_line == 0)
@@ -166,7 +166,7 @@
   return false;
 }
 
-static void ClearSourceLineInfo(StackFrame *frame) {
+static void ClearSourceLineInfo(StackFrame* frame) {
   frame->function_name.clear();
   frame->module = NULL;
   frame->source_file_name.clear();
@@ -467,7 +467,7 @@
 }
 
 TEST_F(TestFastSourceLineResolver, CompareModule) {
-  char *symbol_data;
+  char* symbol_data;
   size_t symbol_data_size;
   string symbol_data_string;
   string filename;
@@ -486,7 +486,7 @@
 
 }  // namespace
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/logging.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/logging.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/logging.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/logging.cc	2021-12-09 12:01:26.000000000 +0000
@@ -47,8 +47,8 @@
 
 namespace google_breakpad {
 
-LogStream::LogStream(std::ostream &stream, Severity severity,
-                     const char *file, int line)
+LogStream::LogStream(std::ostream& stream, Severity severity,
+                     const char* file, int line)
     : stream_(stream) {
   time_t clock;
   time(&clock);
@@ -61,7 +61,7 @@
   char time_string[20];
   strftime(time_string, sizeof(time_string), "%Y-%m-%d %H:%M:%S", &tm_struct);
 
-  const char *severity_string = "UNKNOWN_SEVERITY";
+  const char* severity_string = "UNKNOWN_SEVERITY";
   switch (severity) {
     case SEVERITY_INFO:
       severity_string = "INFO";
@@ -100,7 +100,7 @@
   return string(buffer);
 }
 
-int ErrnoString(string *error_string) {
+int ErrnoString(string* error_string) {
   assert(error_string);
 
   // strerror isn't necessarily thread-safe.  strerror_r would be preferrable,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/logging.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/logging.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/logging.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/logging.h	2021-12-09 12:01:26.000000000 +0000
@@ -67,18 +67,6 @@
 #include BP_LOGGING_INCLUDE
 #endif  // BP_LOGGING_INCLUDE
 
-#ifndef THIRD_PARTY_BREAKPAD_GOOGLE_GLUE_LOGGING_H_
-namespace base_logging {
-
-// The open-source copy of logging.h has diverged from Google's internal copy
-// (temporarily, at least).  To support the transition to structured logging
-// a definition for base_logging::LogMessage is needed, which is a ostream-
-// like object for streaming arguments to construct a log message.
-typedef std::ostream LogMessage;
-
-}  // namespace base_logging
-#endif  // THIRD_PARTY_BREAKPAD_GOOGLE_GLUE_LOGGING_H_
-
 namespace google_breakpad {
 
 // These are defined in Microsoft headers.
@@ -101,22 +89,22 @@
   // Begin logging a message to the stream identified by |stream|, at the
   // indicated severity.  The file and line parameters should be set so as to
   // identify the line of source code that is producing a message.
-  LogStream(std::ostream &stream, Severity severity,
-            const char *file, int line);
+  LogStream(std::ostream& stream, Severity severity,
+            const char* file, int line);
 
   // Finish logging by printing a newline and flushing the output stream.
   ~LogStream();
 
-  template<typename T> std::ostream& operator<<(const T &t) {
+  template<typename T> std::ostream& operator<<(const T& t) {
     return stream_ << t;
   }
 
  private:
-  std::ostream &stream_;
+  std::ostream& stream_;
 
   // Disallow copy constructor and assignment operator
-  explicit LogStream(const LogStream &that);
-  void operator=(const LogStream &that);
+  explicit LogStream(const LogStream& that);
+  void operator=(const LogStream& that);
 };
 
 // This class is used to explicitly ignore values in the conditional logging
@@ -128,7 +116,7 @@
 
   // This has to be an operator with a precedence lower than << but higher
   // than ?:
-  void operator&(base_logging::LogMessage &) {}
+  void operator&(std::ostream&) {}
 };
 
 // Returns number formatted as a hexadecimal string, such as "0x7b".
@@ -139,7 +127,7 @@
 // Returns the error code as set in the global errno variable, and sets
 // error_string, a required argument, to a string describing that error
 // code.
-int ErrnoString(string *error_string);
+int ErrnoString(string* error_string);
 
 }  // namespace google_breakpad
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers.h	2021-12-09 12:01:26.000000000 +0000
@@ -53,20 +53,20 @@
 class StdMapSerializer {
  public:
   // Calculate the memory size of serialized data.
-  size_t SizeOf(const std::map<Key, Value> &m) const;
+  size_t SizeOf(const std::map<Key, Value>& m) const;
 
   // Writes the serialized data to memory with start address = dest,
   // and returns the "end" of data, i.e., return the address follow the final
   // byte of data.
   // NOTE: caller has to allocate enough memory before invoke Write() method.
-  char* Write(const std::map<Key, Value> &m, char* dest) const;
+  char* Write(const std::map<Key, Value>& m, char* dest) const;
 
   // Serializes a std::map object into a chunk of memory data with format
   // described in "StaticMap.h" comment.
   // Returns a pointer to the serialized data.  If size != NULL, *size is set
   // to the size of serialized data, i.e., SizeOf(m).
   // Caller has the ownership of memory allocated as "new char[]".
-  char* Serialize(const std::map<Key, Value> &m, unsigned int *size) const;
+  char* Serialize(const std::map<Key, Value>& m, unsigned int* size) const;
 
  private:
   SimpleSerializer<Key> key_serializer_;
@@ -79,14 +79,14 @@
 class AddressMapSerializer {
  public:
   // Calculate the memory size of serialized data.
-  size_t SizeOf(const AddressMap<Addr, Entry> &m) const {
+  size_t SizeOf(const AddressMap<Addr, Entry>& m) const {
     return std_map_serializer_.SizeOf(m.map_);
   }
 
   // Write the serialized data to specified memory location.  Return the "end"
   // of data, i.e., return the address after the final byte of data.
   // NOTE: caller has to allocate enough memory before invoke Write() method.
-  char* Write(const AddressMap<Addr, Entry> &m, char *dest) const {
+  char* Write(const AddressMap<Addr, Entry>& m, char* dest) const {
     return std_map_serializer_.Write(m.map_, dest);
   }
 
@@ -94,7 +94,7 @@
   // Returns a pointer to the serialized data.  If size != NULL, *size is set
   // to the size of serialized data, i.e., SizeOf(m).
   // Caller has the ownership of memory allocated as "new char[]".
-  char* Serialize(const AddressMap<Addr, Entry> &m, unsigned int *size) const {
+  char* Serialize(const AddressMap<Addr, Entry>& m, unsigned int* size) const {
     return std_map_serializer_.Serialize(m.map_, size);
   }
 
@@ -110,18 +110,18 @@
 class RangeMapSerializer {
  public:
   // Calculate the memory size of serialized data.
-  size_t SizeOf(const RangeMap<Address, Entry> &m) const;
+  size_t SizeOf(const RangeMap<Address, Entry>& m) const;
 
   // Write the serialized data to specified memory location.  Return the "end"
   // of data, i.e., return the address after the final byte of data.
   // NOTE: caller has to allocate enough memory before invoke Write() method.
-  char* Write(const RangeMap<Address, Entry> &m, char* dest) const;
+  char* Write(const RangeMap<Address, Entry>& m, char* dest) const;
 
   // Serializes a RangeMap object into a chunk of memory data.
   // Returns a pointer to the serialized data.  If size != NULL, *size is set
   // to the size of serialized data, i.e., SizeOf(m).
   // Caller has the ownership of memory allocated as "new char[]".
-  char* Serialize(const RangeMap<Address, Entry> &m, unsigned int *size) const;
+  char* Serialize(const RangeMap<Address, Entry>& m, unsigned int* size) const;
 
  private:
   // Convenient type name for Range.
@@ -139,20 +139,20 @@
 class ContainedRangeMapSerializer {
  public:
   // Calculate the memory size of serialized data.
-  size_t SizeOf(const ContainedRangeMap<AddrType, EntryType> *m) const;
+  size_t SizeOf(const ContainedRangeMap<AddrType, EntryType>* m) const;
 
   // Write the serialized data to specified memory location.  Return the "end"
   // of data, i.e., return the address after the final byte of data.
   // NOTE: caller has to allocate enough memory before invoke Write() method.
-  char* Write(const ContainedRangeMap<AddrType, EntryType> *m,
+  char* Write(const ContainedRangeMap<AddrType, EntryType>* m,
               char* dest) const;
 
   // Serializes a ContainedRangeMap object into a chunk of memory data.
   // Returns a pointer to the serialized data.  If size != NULL, *size is set
   // to the size of serialized data, i.e., SizeOf(m).
   // Caller has the ownership of memory allocated as "new char[]".
-  char* Serialize(const ContainedRangeMap<AddrType, EntryType> *m,
-                  unsigned int *size) const;
+  char* Serialize(const ContainedRangeMap<AddrType, EntryType>* m,
+                  unsigned int* size) const;
 
  private:
   // Convenient type name for the underlying map type.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -53,7 +53,7 @@
 
 template<typename Key, typename Value>
 size_t StdMapSerializer<Key, Value>::SizeOf(
-    const std::map<Key, Value> &m) const {
+    const std::map<Key, Value>& m) const {
   size_t size = 0;
   size_t header_size = (1 + m.size()) * sizeof(uint32_t);
   size += header_size;
@@ -67,22 +67,22 @@
 }
 
 template<typename Key, typename Value>
-char *StdMapSerializer<Key, Value>::Write(const std::map<Key, Value> &m,
-                                          char *dest) const {
+char* StdMapSerializer<Key, Value>::Write(const std::map<Key, Value>& m,
+                                          char* dest) const {
   if (!dest) {
     BPLOG(ERROR) << "StdMapSerializer failed: write to NULL address.";
     return NULL;
   }
-  char *start_address = dest;
+  char* start_address = dest;
 
   // Write header:
   // Number of nodes.
   dest = SimpleSerializer<uint32_t>::Write(m.size(), dest);
   // Nodes offsets.
-  uint32_t *offsets = reinterpret_cast<uint32_t*>(dest);
+  uint32_t* offsets = reinterpret_cast<uint32_t*>(dest);
   dest += sizeof(uint32_t) * m.size();
 
-  char *key_address = dest;
+  char* key_address = dest;
   dest += sizeof(Key) * m.size();
 
   // Traverse map.
@@ -97,12 +97,12 @@
 }
 
 template<typename Key, typename Value>
-char *StdMapSerializer<Key, Value>::Serialize(
-    const std::map<Key, Value> &m, unsigned int *size) const {
+char* StdMapSerializer<Key, Value>::Serialize(
+    const std::map<Key, Value>& m, unsigned int* size) const {
   // Compute size of memory to be allocated.
   unsigned int size_to_alloc = SizeOf(m);
   // Allocate memory.
-  char *serialized_data = new char[size_to_alloc];
+  char* serialized_data = new char[size_to_alloc];
   if (!serialized_data) {
     BPLOG(INFO) << "StdMapSerializer memory allocation failed.";
     if (size) *size = 0;
@@ -117,7 +117,7 @@
 
 template<typename Address, typename Entry>
 size_t RangeMapSerializer<Address, Entry>::SizeOf(
-    const RangeMap<Address, Entry> &m) const {
+    const RangeMap<Address, Entry>& m) const {
   size_t size = 0;
   size_t header_size = (1 + m.map_.size()) * sizeof(uint32_t);
   size += header_size;
@@ -135,22 +135,22 @@
 }
 
 template<typename Address, typename Entry>
-char *RangeMapSerializer<Address, Entry>::Write(
-    const RangeMap<Address, Entry> &m, char *dest) const {
+char* RangeMapSerializer<Address, Entry>::Write(
+    const RangeMap<Address, Entry>& m, char* dest) const {
   if (!dest) {
     BPLOG(ERROR) << "RangeMapSerializer failed: write to NULL address.";
     return NULL;
   }
-  char *start_address = dest;
+  char* start_address = dest;
 
   // Write header:
   // Number of nodes.
   dest = SimpleSerializer<uint32_t>::Write(m.map_.size(), dest);
   // Nodes offsets.
-  uint32_t *offsets = reinterpret_cast<uint32_t*>(dest);
+  uint32_t* offsets = reinterpret_cast<uint32_t*>(dest);
   dest += sizeof(uint32_t) * m.map_.size();
 
-  char *key_address = dest;
+  char* key_address = dest;
   dest += sizeof(Address) * m.map_.size();
 
   // Traverse map.
@@ -166,12 +166,12 @@
 }
 
 template<typename Address, typename Entry>
-char *RangeMapSerializer<Address, Entry>::Serialize(
-    const RangeMap<Address, Entry> &m, unsigned int *size) const {
+char* RangeMapSerializer<Address, Entry>::Serialize(
+    const RangeMap<Address, Entry>& m, unsigned int* size) const {
   // Compute size of memory to be allocated.
   unsigned int size_to_alloc = SizeOf(m);
   // Allocate memory.
-  char *serialized_data = new char[size_to_alloc];
+  char* serialized_data = new char[size_to_alloc];
   if (!serialized_data) {
     BPLOG(INFO) << "RangeMapSerializer memory allocation failed.";
     if (size) *size = 0;
@@ -188,7 +188,7 @@
 
 template<class AddrType, class EntryType>
 size_t ContainedRangeMapSerializer<AddrType, EntryType>::SizeOf(
-    const ContainedRangeMap<AddrType, EntryType> *m) const {
+    const ContainedRangeMap<AddrType, EntryType>* m) const {
   size_t size = 0;
   size_t header_size = addr_serializer_.SizeOf(m->base_)
                        + entry_serializer_.SizeOf(m->entry_)
@@ -209,8 +209,8 @@
 }
 
 template<class AddrType, class EntryType>
-char *ContainedRangeMapSerializer<AddrType, EntryType>::Write(
-    const ContainedRangeMap<AddrType, EntryType> *m, char *dest) const {
+char* ContainedRangeMapSerializer<AddrType, EntryType>::Write(
+    const ContainedRangeMap<AddrType, EntryType>* m, char* dest) const {
   if (!dest) {
     BPLOG(ERROR) << "StdMapSerializer failed: write to NULL address.";
     return NULL;
@@ -221,15 +221,15 @@
   dest = entry_serializer_.Write(m->entry_, dest);
 
   // Write map<<AddrType, ContainedRangeMap*>:
-  char *map_address = dest;
+  char* map_address = dest;
   if (m->map_ == NULL) {
     dest = SimpleSerializer<uint32_t>::Write(0, dest);
   } else {
     dest = SimpleSerializer<uint32_t>::Write(m->map_->size(), dest);
-    uint32_t *offsets = reinterpret_cast<uint32_t*>(dest);
+    uint32_t* offsets = reinterpret_cast<uint32_t*>(dest);
     dest += sizeof(uint32_t) * m->map_->size();
 
-    char *key_address = dest;
+    char* key_address = dest;
     dest += sizeof(AddrType) * m->map_->size();
 
     // Traverse map.
@@ -246,11 +246,11 @@
 }
 
 template<class AddrType, class EntryType>
-char *ContainedRangeMapSerializer<AddrType, EntryType>::Serialize(
-    const ContainedRangeMap<AddrType, EntryType> *m, unsigned int *size) const {
+char* ContainedRangeMapSerializer<AddrType, EntryType>::Serialize(
+    const ContainedRangeMap<AddrType, EntryType>* m, unsigned int* size) const {
   unsigned int size_to_alloc = SizeOf(m);
   // Allocating memory.
-  char *serialized_data = new char[size_to_alloc];
+  char* serialized_data = new char[size_to_alloc];
   if (!serialized_data) {
     BPLOG(INFO) << "ContainedRangeMapSerializer memory allocation failed.";
     if (size) *size = 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/map_serializers_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -63,7 +63,7 @@
   std::map<AddrType, EntryType> std_map_;
   google_breakpad::StdMapSerializer<AddrType, EntryType> serializer_;
   uint32_t serialized_size_;
-  char *serialized_data_;
+  char* serialized_data_;
 };
 
 TEST_F(TestStdMapSerializer, EmptyMapTestCase) {
@@ -135,7 +135,7 @@
   google_breakpad::AddressMap<AddrType, EntryType> address_map_;
   google_breakpad::AddressMapSerializer<AddrType, EntryType> serializer_;
   uint32_t serialized_size_;
-  char *serialized_data_;
+  char* serialized_data_;
 };
 
 TEST_F(TestAddressMapSerializer, EmptyMapTestCase) {
@@ -210,7 +210,7 @@
   google_breakpad::RangeMap<AddrType, EntryType> range_map_;
   google_breakpad::RangeMapSerializer<AddrType, EntryType> serializer_;
   uint32_t serialized_size_;
-  char *serialized_data_;
+  char* serialized_data_;
 };
 
 TEST_F(TestRangeMapSerializer, EmptyMapTestCase) {
@@ -283,7 +283,7 @@
   google_breakpad::ContainedRangeMap<AddrType, EntryType> crm_map_;
   google_breakpad::ContainedRangeMapSerializer<AddrType, EntryType> serializer_;
   uint32_t serialized_size_;
-  char *serialized_data_;
+  char* serialized_data_;
 };
 
 TEST_F(TestContainedRangeMapSerializer, EmptyMapTestCase) {
@@ -379,7 +379,7 @@
 }
 
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
 
   return RUN_ALL_TESTS();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/microdump.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/microdump.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/microdump.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/microdump.cc	2021-12-09 12:01:26.000000000 +0000
@@ -113,7 +113,8 @@
 }
 
 void MicrodumpModules::SetEnableModuleShrink(bool is_enabled) {
-  map_.SetEnableShrinkDown(is_enabled);
+  map_.SetMergeStrategy(is_enabled ? MergeRangeStrategy::kTruncateUpper
+                                   : MergeRangeStrategy::kExclusiveRanges);
 }
 
 //
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/microdump_stackwalk.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/microdump_stackwalk.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/microdump_stackwalk.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/microdump_stackwalk.cc	2021-12-09 12:01:26.000000000 +0000
@@ -140,7 +140,7 @@
   options->machine_readable = false;
   options->output_stack_contents = false;
 
-  while ((ch = getopt(argc, (char * const *)argv, "hms")) != -1) {
+  while ((ch = getopt(argc, (char * const*)argv, "hms")) != -1) {
     switch (ch) {
       case 'h':
         Usage(argc, argv, false);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump.cc	2021-12-09 12:01:26.000000000 +0000
@@ -54,6 +54,7 @@
 
 #include "processor/range_map-inl.h"
 
+#include "common/macros.h"
 #include "common/scoped_ptr.h"
 #include "common/stdio_wrapper.h"
 #include "google_breakpad/processor/dump_context.h"
@@ -62,22 +63,6 @@
 #include "processor/convert_old_arm64_context.h"
 #include "processor/logging.h"
 
-// All intentional fallthroughs in breakpad are in this file, so define
-// this macro locally.
-// If you ever move this to a .h file, make sure it's defined in a
-// private header file: clang suggests the first macro expanding to
-// [[clang::fallthrough]] in its diagnostics, so if BP_FALLTHROUGH
-// is visible in code depending on breakpad, clang would suggest
-// BP_FALLTHROUGH for code depending on breakpad, instead of the
-// client code's own fallthrough macro.
-// TODO(thakis): Once everyone uses C++17, use its [[fallthrough]] instead.
-#if defined(__clang__)
-#define BP_FALLTHROUGH [[clang::fallthrough]]
-#else
-#define BP_FALLTHROUGH
-#endif
-
-
 namespace google_breakpad {
 
 using std::istream;
@@ -1626,7 +1611,7 @@
 }
 
 
-bool MinidumpThread::GetThreadID(uint32_t *thread_id) const {
+bool MinidumpThread::GetThreadID(uint32_t* thread_id) const {
   BPLOG_IF(ERROR, !thread_id) << "MinidumpThread::GetThreadID requires "
                                  "|thread_id|";
   assert(thread_id);
@@ -1988,14 +1973,14 @@
   if (!has_debug_info_)
     return "";
 
-  MinidumpSystemInfo *minidump_system_info = minidump_->GetSystemInfo();
+  MinidumpSystemInfo* minidump_system_info = minidump_->GetSystemInfo();
   if (!minidump_system_info) {
     BPLOG(ERROR) << "MinidumpModule code_identifier requires "
                     "MinidumpSystemInfo";
     return "";
   }
 
-  const MDRawSystemInfo *raw_system_info = minidump_system_info->system_info();
+  const MDRawSystemInfo* raw_system_info = minidump_system_info->system_info();
   if (!raw_system_info) {
     BPLOG(ERROR) << "MinidumpModule code_identifier requires MDRawSystemInfo";
     return "";
@@ -2016,6 +2001,7 @@
     }
 
     case MD_OS_ANDROID:
+    case MD_OS_FUCHSIA:
     case MD_OS_LINUX: {
       // If ELF CodeView data is present, return the debug id.
       if (cv_record_ && cv_record_signature_ == MD_CVINFOELF_SIGNATURE) {
@@ -2107,7 +2093,7 @@
     // No usable CodeView record.  Try the miscellaneous debug record.
     if (misc_record_) {
       const MDImageDebugMisc* misc_record =
-          reinterpret_cast<const MDImageDebugMisc *>(&(*misc_record_)[0]);
+          reinterpret_cast<const MDImageDebugMisc*>(&(*misc_record_)[0]);
       if (!misc_record->unicode) {
         // If it's not Unicode, just stuff it into the string.  It's unclear
         // if misc_record->data is 0-terminated, so use an explicit size.
@@ -2220,6 +2206,20 @@
       memcpy(&guid, &cv_record_elf->build_id,
              std::min(cv_record_->size() - MDCVInfoELF_minsize,
                       sizeof(MDGUID)));
+      if (minidump_->swap()) {
+        // The debug_identifier needs to be computed for a big-endian
+        // MDGUID.  However if the host is LE reading into MDGUID
+        // implicitly reversed the order they are printed as
+        // guid_and_age_to_debug prints as hex numbers, not as bytes.
+        // This leads to 4 cases:
+        // BE dump on BE host: nothing swapped, printed in order
+        // BE dump on LE host: swap bytes & swapped back by MDGUID ints
+        // LE dump on BE host: swap bytes & printed in order
+        // LE dump on LE host: swapped by MDGUID ints
+        Swap(&guid.data1);
+        Swap(&guid.data2);
+        Swap(&guid.data3);
+      }
       identifier = guid_and_age_to_debug_id(guid, 0);
     }
   }
@@ -2563,7 +2563,7 @@
          code_identifier().c_str());
 
   uint32_t cv_record_size;
-  const uint8_t *cv_record = GetCVRecord(&cv_record_size);
+  const uint8_t* cv_record = GetCVRecord(&cv_record_size);
   if (cv_record) {
     if (cv_record_signature_ == MD_CVINFOPDB70_SIGNATURE) {
       const MDCVInfoPDB70* cv_record_70 =
@@ -2667,7 +2667,11 @@
       range_map_(new RangeMap<uint64_t, unsigned int>()),
       modules_(NULL),
       module_count_(0) {
-  range_map_->SetEnableShrinkDown(minidump_->IsAndroid());
+  MDOSPlatform platform;
+  if (minidump_->GetPlatform(&platform) &&
+      (platform == MD_OS_ANDROID || platform == MD_OS_LINUX)) {
+    range_map_->SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  }
 }
 
 
@@ -2931,7 +2935,7 @@
 
 
 const CodeModules* MinidumpModuleList::Copy() const {
-  return new BasicCodeModules(this);
+  return new BasicCodeModules(this, range_map_->GetMergeStrategy());
 }
 
 vector<linked_ptr<const CodeModule> >
@@ -2939,10 +2943,6 @@
   return vector<linked_ptr<const CodeModule> >();
 }
 
-bool MinidumpModuleList::IsModuleShrinkEnabled() const {
-  return range_map_->IsShrinkDownEnabled();
-}
-
 void MinidumpModuleList::Print() {
   if (!valid_) {
     BPLOG(ERROR) << "MinidumpModuleList cannot print invalid data";
@@ -3229,7 +3229,7 @@
 }
 
 
-bool MinidumpException::GetThreadID(uint32_t *thread_id) const {
+bool MinidumpException::GetThreadID(uint32_t* thread_id) const {
   BPLOG_IF(ERROR, !thread_id) << "MinidumpException::GetThreadID requires "
                                  "|thread_id|";
   assert(thread_id);
@@ -3499,6 +3499,10 @@
       os = "nacl";
       break;
 
+    case MD_OS_FUCHSIA:
+      os = "fuchsia";
+      break;
+
     default:
       BPLOG(ERROR) << "MinidumpSystemInfo unknown OS for platform " <<
                       HexString(system_info_.platform_id);
@@ -3709,14 +3713,14 @@
     return "";
   }
 
-  MinidumpSystemInfo *minidump_system_info = minidump_->GetSystemInfo();
+  MinidumpSystemInfo* minidump_system_info = minidump_->GetSystemInfo();
   if (!minidump_system_info) {
     BPLOG(ERROR) << "MinidumpUnloadedModule code_identifier requires "
                     "MinidumpSystemInfo";
     return "";
   }
 
-  const MDRawSystemInfo *raw_system_info = minidump_system_info->system_info();
+  const MDRawSystemInfo* raw_system_info = minidump_system_info->system_info();
   if (!raw_system_info) {
     BPLOG(ERROR) << "MinidumpUnloadedModule code_identifier requires "
                  << "MDRawSystemInfo";
@@ -3870,7 +3874,7 @@
     range_map_(new RangeMap<uint64_t, unsigned int>()),
     unloaded_modules_(NULL),
     module_count_(0) {
-  range_map_->SetEnableShrinkDown(true);
+  range_map_->SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
 }
 
 MinidumpUnloadedModuleList::~MinidumpUnloadedModuleList() {
@@ -4048,7 +4052,7 @@
 }
 
 const CodeModules* MinidumpUnloadedModuleList::Copy() const {
-  return new BasicCodeModules(this);
+  return new BasicCodeModules(this, range_map_->GetMergeStrategy());
 }
 
 vector<linked_ptr<const CodeModule>>
@@ -4056,10 +4060,6 @@
   return vector<linked_ptr<const CodeModule> >();
 }
 
-bool MinidumpUnloadedModuleList::IsModuleShrinkEnabled() const {
-  return range_map_->IsShrinkDownEnabled();
-}
-
 
 //
 // MinidumpMiscInfo
@@ -4370,7 +4370,7 @@
 }
 
 
-bool MinidumpBreakpadInfo::GetDumpThreadID(uint32_t *thread_id) const {
+bool MinidumpBreakpadInfo::GetDumpThreadID(uint32_t* thread_id) const {
   BPLOG_IF(ERROR, !thread_id) << "MinidumpBreakpadInfo::GetDumpThreadID "
                                  "requires |thread_id|";
   assert(thread_id);
@@ -4391,7 +4391,7 @@
 }
 
 
-bool MinidumpBreakpadInfo::GetRequestingThreadID(uint32_t *thread_id)
+bool MinidumpBreakpadInfo::GetRequestingThreadID(uint32_t* thread_id)
     const {
   BPLOG_IF(ERROR, !thread_id) << "MinidumpBreakpadInfo::GetRequestingThreadID "
                                  "requires |thread_id|";
@@ -4709,7 +4709,7 @@
 // MinidumpLinuxMaps
 //
 
-MinidumpLinuxMaps::MinidumpLinuxMaps(Minidump *minidump)
+MinidumpLinuxMaps::MinidumpLinuxMaps(Minidump* minidump)
     : MinidumpObject(minidump) {
 }
 
@@ -4725,7 +4725,7 @@
 // MinidumpLinuxMapsList
 //
 
-MinidumpLinuxMapsList::MinidumpLinuxMapsList(Minidump *minidump)
+MinidumpLinuxMapsList::MinidumpLinuxMapsList(Minidump* minidump)
     : MinidumpStream(minidump),
       maps_(NULL),
       maps_count_(0) {
@@ -4740,7 +4740,7 @@
   }
 }
 
-const MinidumpLinuxMaps *MinidumpLinuxMapsList::GetLinuxMapsForAddress(
+const MinidumpLinuxMaps* MinidumpLinuxMapsList::GetLinuxMapsForAddress(
     uint64_t address) const {
   if (!valid_ || (maps_ == NULL)) {
     BPLOG(ERROR) << "Invalid MinidumpLinuxMapsList for GetLinuxMapsForAddress";
@@ -4762,7 +4762,7 @@
   return NULL;
 }
 
-const MinidumpLinuxMaps *MinidumpLinuxMapsList::GetLinuxMapsAtIndex(
+const MinidumpLinuxMaps* MinidumpLinuxMapsList::GetLinuxMapsAtIndex(
     unsigned int index) const {
   if (!valid_ || (maps_ == NULL)) {
     BPLOG(ERROR) << "Invalid MinidumpLinuxMapsList for GetLinuxMapsAtIndex";
@@ -5104,7 +5104,7 @@
   return true;
 }
 
-bool Minidump::GetContextCPUFlagsFromSystemInfo(uint32_t *context_cpu_flags) {
+bool Minidump::GetContextCPUFlagsFromSystemInfo(uint32_t* context_cpu_flags) {
   // Initialize output parameters
   *context_cpu_flags = 0;
 
@@ -5380,12 +5380,17 @@
   return GetStream(&memory_info_list);
 }
 
-MinidumpLinuxMapsList *Minidump::GetLinuxMapsList() {
-  MinidumpLinuxMapsList *linux_maps_list;
+MinidumpLinuxMapsList* Minidump::GetLinuxMapsList() {
+  MinidumpLinuxMapsList* linux_maps_list;
   return GetStream(&linux_maps_list);
 }
 
 bool Minidump::IsAndroid() {
+  MDOSPlatform platform;
+  return GetPlatform(&platform) && platform == MD_OS_ANDROID;
+}
+
+bool Minidump::GetPlatform(MDOSPlatform* platform) {
   // Save the current stream position
   off_t saved_position = Tell();
   if (saved_position == -1) {
@@ -5400,7 +5405,11 @@
     return false;
   }
 
-  return system_info && system_info->platform_id == MD_OS_ANDROID;
+  if (!system_info) {
+    return false;
+  }
+  *platform = static_cast<MDOSPlatform>(system_info->platform_id);
+  return true;
 }
 
 MinidumpCrashpadInfo* Minidump::GetCrashpadInfo() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_dump.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_dump.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_dump.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_dump.cc	2021-12-09 12:01:26.000000000 +0000
@@ -91,7 +91,7 @@
     // in compatibility warnings.
     uint32_t int_remaining = remaining;
     printf("%.*s", int_remaining, &contents[current_offset]);
-    char *next_null = reinterpret_cast<char *>(
+    char *next_null = reinterpret_cast<char*>(
         memchr(&contents[current_offset], 0, remaining));
     if (next_null == NULL)
       break;
@@ -241,7 +241,7 @@
 SetupOptions(int argc, char *argv[], Options *options) {
   int ch;
 
-  while ((ch = getopt(argc, (char * const *)argv, "xh")) != -1) {
+  while ((ch = getopt(argc, (char * const*)argv, "xh")) != -1) {
     switch (ch) {
       case 'x':
         options->hexdump = true;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_processor.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_processor.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_processor.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_processor.cc	2021-12-09 12:01:26.000000000 +0000
@@ -31,6 +31,7 @@
 
 #include <assert.h>
 
+#include <algorithm>
 #include <string>
 
 #include "common/scoped_ptr.h"
@@ -47,16 +48,16 @@
 
 namespace google_breakpad {
 
-MinidumpProcessor::MinidumpProcessor(SymbolSupplier *supplier,
-                                     SourceLineResolverInterface *resolver)
+MinidumpProcessor::MinidumpProcessor(SymbolSupplier* supplier,
+                                     SourceLineResolverInterface* resolver)
     : frame_symbolizer_(new StackFrameSymbolizer(supplier, resolver)),
       own_frame_symbolizer_(true),
       enable_exploitability_(false),
       enable_objdump_(false) {
 }
 
-MinidumpProcessor::MinidumpProcessor(SymbolSupplier *supplier,
-                                     SourceLineResolverInterface *resolver,
+MinidumpProcessor::MinidumpProcessor(SymbolSupplier* supplier,
+                                     SourceLineResolverInterface* resolver,
                                      bool enable_exploitability)
     : frame_symbolizer_(new StackFrameSymbolizer(supplier, resolver)),
       own_frame_symbolizer_(true),
@@ -64,7 +65,7 @@
       enable_objdump_(false) {
 }
 
-MinidumpProcessor::MinidumpProcessor(StackFrameSymbolizer *frame_symbolizer,
+MinidumpProcessor::MinidumpProcessor(StackFrameSymbolizer* frame_symbolizer,
                                      bool enable_exploitability)
     : frame_symbolizer_(frame_symbolizer),
       own_frame_symbolizer_(false),
@@ -78,13 +79,13 @@
 }
 
 ProcessResult MinidumpProcessor::Process(
-    Minidump *dump, ProcessState *process_state) {
+    Minidump* dump, ProcessState* process_state) {
   assert(dump);
   assert(process_state);
 
   process_state->Clear();
 
-  const MDRawHeader *header = dump->header();
+  const MDRawHeader* header = dump->header();
   if (!header) {
     BPLOG(ERROR) << "Minidump " << dump->path() << " has no header";
     return PROCESS_ERROR_NO_MINIDUMP_HEADER;
@@ -102,26 +103,47 @@
   uint32_t requesting_thread_id = 0;
   bool has_requesting_thread = false;
 
-  MinidumpBreakpadInfo *breakpad_info = dump->GetBreakpadInfo();
+  MinidumpBreakpadInfo* breakpad_info = dump->GetBreakpadInfo();
   if (breakpad_info) {
     has_dump_thread = breakpad_info->GetDumpThreadID(&dump_thread_id);
     has_requesting_thread =
         breakpad_info->GetRequestingThreadID(&requesting_thread_id);
   }
 
-  MinidumpException *exception = dump->GetException();
+  MinidumpException* exception = dump->GetException();
   if (exception) {
     process_state->crashed_ = true;
     has_requesting_thread = exception->GetThreadID(&requesting_thread_id);
 
     process_state->crash_reason_ = GetCrashReason(
         dump, &process_state->crash_address_);
+
+    process_state->exception_record_.set_code(
+        exception->exception()->exception_record.exception_code,
+        // TODO(ivanpe): Populate description.
+        /* description = */ "");
+    process_state->exception_record_.set_flags(
+        exception->exception()->exception_record.exception_flags,
+        // TODO(ivanpe): Populate description.
+        /* description = */ "");
+    process_state->exception_record_.set_nested_exception_record_address(
+        exception->exception()->exception_record.exception_record);
+    process_state->exception_record_.set_address(process_state->crash_address_);
+    const uint32_t num_parameters =
+        std::min(exception->exception()->exception_record.number_parameters,
+                 MD_EXCEPTION_MAXIMUM_PARAMETERS);
+    for (uint32_t i = 0; i < num_parameters; ++i) {
+      process_state->exception_record_.add_parameter(
+          exception->exception()->exception_record.exception_information[i],
+          // TODO(ivanpe): Populate description.
+          /* description = */ "");
+    }
   }
 
   // This will just return an empty string if it doesn't exist.
   process_state->assertion_ = GetAssertion(dump);
 
-  MinidumpModuleList *module_list = dump->GetModuleList();
+  MinidumpModuleList* module_list = dump->GetModuleList();
 
   // Put a copy of the module list into ProcessState object.  This is not
   // necessarily a MinidumpModuleList, but it adheres to the CodeModules
@@ -141,19 +163,19 @@
     }
   }
 
-  MinidumpUnloadedModuleList *unloaded_module_list =
+  MinidumpUnloadedModuleList* unloaded_module_list =
       dump->GetUnloadedModuleList();
   if (unloaded_module_list) {
     process_state->unloaded_modules_ = unloaded_module_list->Copy();
   }
 
-  MinidumpMemoryList *memory_list = dump->GetMemoryList();
+  MinidumpMemoryList* memory_list = dump->GetMemoryList();
   if (memory_list) {
     BPLOG(INFO) << "Found " << memory_list->region_count()
                 << " memory regions.";
   }
 
-  MinidumpThreadList *threads = dump->GetThreadList();
+  MinidumpThreadList* threads = dump->GetThreadList();
   if (!threads) {
     BPLOG(ERROR) << "Minidump " << dump->path() << " has no thread list";
     return PROCESS_ERROR_NO_THREAD_LIST;
@@ -185,7 +207,7 @@
              thread_index, thread_count);
     string thread_string = dump->path() + ":" + thread_string_buffer;
 
-    MinidumpThread *thread = threads->GetThreadAtIndex(thread_index);
+    MinidumpThread* thread = threads->GetThreadAtIndex(thread_index);
     if (!thread) {
       BPLOG(ERROR) << "Could not get thread for " << thread_string;
       return PROCESS_ERROR_GETTING_THREAD;
@@ -208,7 +230,7 @@
       continue;
     }
 
-    MinidumpContext *context = thread->GetContext();
+    MinidumpContext* context = thread->GetContext();
 
     if (has_requesting_thread && thread_id == requesting_thread_id) {
       if (found_requesting_thread) {
@@ -235,7 +257,7 @@
         // would not result in the expected stack trace from the time of the
         // crash. If the exception context is invalid, however, we fall back
         // on the thread context.
-        MinidumpContext *ctx = exception->GetContext();
+        MinidumpContext* ctx = exception->GetContext();
         context = ctx ? ctx : thread->GetContext();
       }
     }
@@ -243,7 +265,7 @@
     // If the memory region for the stack cannot be read using the RVA stored
     // in the memory descriptor inside MINIDUMP_THREAD, try to locate and use
     // a memory region (containing the stack) from the minidump memory list.
-    MinidumpMemoryRegion *thread_memory = thread->GetMemory();
+    MinidumpMemoryRegion* thread_memory = thread->GetMemory();
     if (!thread_memory && memory_list) {
       uint64_t start_stack_memory_range = thread->GetStartOfStackMemoryRange();
       if (start_stack_memory_range) {
@@ -329,7 +351,7 @@
 }
 
 ProcessResult MinidumpProcessor::Process(
-    const string &minidump_file, ProcessState *process_state) {
+    const string& minidump_file, ProcessState* process_state) {
   BPLOG(INFO) << "Processing minidump in file " << minidump_file;
 
   Minidump dump(minidump_file);
@@ -344,9 +366,9 @@
 // Returns the MDRawSystemInfo from a minidump, or NULL if system info is
 // not available from the minidump.  If system_info is non-NULL, it is used
 // to pass back the MinidumpSystemInfo object.
-static const MDRawSystemInfo* GetSystemInfo(Minidump *dump,
-                                            MinidumpSystemInfo **system_info) {
-  MinidumpSystemInfo *minidump_system_info = dump->GetSystemInfo();
+static const MDRawSystemInfo* GetSystemInfo(Minidump* dump,
+                                            MinidumpSystemInfo** system_info) {
+  MinidumpSystemInfo* minidump_system_info = dump->GetSystemInfo();
   if (!minidump_system_info)
     return NULL;
 
@@ -499,15 +521,15 @@
 }
 
 // static
-bool MinidumpProcessor::GetCPUInfo(Minidump *dump, SystemInfo *info) {
+bool MinidumpProcessor::GetCPUInfo(Minidump* dump, SystemInfo* info) {
   assert(dump);
   assert(info);
 
   info->cpu.clear();
   info->cpu_info.clear();
 
-  MinidumpSystemInfo *system_info;
-  const MDRawSystemInfo *raw_system_info = GetSystemInfo(dump, &system_info);
+  MinidumpSystemInfo* system_info;
+  const MDRawSystemInfo* raw_system_info = GetSystemInfo(dump, &system_info);
   if (!raw_system_info)
     return false;
 
@@ -520,7 +542,7 @@
       else
         info->cpu = "amd64";
 
-      const string *cpu_vendor = system_info->GetCPUVendor();
+      const string* cpu_vendor = system_info->GetCPUVendor();
       if (cpu_vendor) {
         info->cpu_info = *cpu_vendor;
         info->cpu_info.append(" ");
@@ -587,7 +609,7 @@
 }
 
 // static
-bool MinidumpProcessor::GetOSInfo(Minidump *dump, SystemInfo *info) {
+bool MinidumpProcessor::GetOSInfo(Minidump* dump, SystemInfo* info) {
   assert(dump);
   assert(info);
 
@@ -595,8 +617,8 @@
   info->os_short.clear();
   info->os_version.clear();
 
-  MinidumpSystemInfo *system_info;
-  const MDRawSystemInfo *raw_system_info = GetSystemInfo(dump, &system_info);
+  MinidumpSystemInfo* system_info;
+  const MDRawSystemInfo* raw_system_info = GetSystemInfo(dump, &system_info);
   if (!raw_system_info)
     return false;
 
@@ -648,6 +670,11 @@
       break;
     }
 
+    case MD_OS_FUCHSIA: {
+      info->os = "Fuchsia";
+      break;
+    }
+
     default: {
       // Assign the numeric platform ID into the OS string.
       char os_string[11];
@@ -665,7 +692,7 @@
            raw_system_info->build_number);
   info->os_version = os_version_string;
 
-  const string *csd_version = system_info->GetCSDVersion();
+  const string* csd_version = system_info->GetCSDVersion();
   if (csd_version) {
     info->os_version.append(" ");
     info->os_version.append(*csd_version);
@@ -701,12 +728,12 @@
 }
 
 // static
-string MinidumpProcessor::GetCrashReason(Minidump *dump, uint64_t *address) {
-  MinidumpException *exception = dump->GetException();
+string MinidumpProcessor::GetCrashReason(Minidump* dump, uint64_t* address) {
+  MinidumpException* exception = dump->GetException();
   if (!exception)
     return "";
 
-  const MDRawExceptionStream *raw_exception = exception->exception();
+  const MDRawExceptionStream* raw_exception = exception->exception();
   if (!raw_exception)
     return "";
 
@@ -718,21 +745,69 @@
   // map the codes to a string (because there's no system info, or because
   // it's an unrecognized platform, or because it's an unrecognized code.)
   char reason_string[24];
+  char flags_string[11];
   uint32_t exception_code = raw_exception->exception_record.exception_code;
   uint32_t exception_flags = raw_exception->exception_record.exception_flags;
-  snprintf(reason_string, sizeof(reason_string), "0x%08x / 0x%08x",
-           exception_code, exception_flags);
+  snprintf(flags_string, sizeof(flags_string), "0x%08x", exception_flags);
+  snprintf(reason_string, sizeof(reason_string), "0x%08x / %s", exception_code,
+           flags_string);
   string reason = reason_string;
 
-  const MDRawSystemInfo *raw_system_info = GetSystemInfo(dump, NULL);
+  const MDRawSystemInfo* raw_system_info = GetSystemInfo(dump, NULL);
   if (!raw_system_info)
     return reason;
 
   switch (raw_system_info->platform_id) {
+    case MD_OS_FUCHSIA: {
+      switch (exception_code) {
+        case MD_EXCEPTION_CODE_FUCHSIA_GENERAL:
+          reason = "GENERAL / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_FATAL_PAGE_FAULT:
+          reason = "FATAL_PAGE_FAULT / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_UNDEFINED_INSTRUCTION:
+          reason = "UNDEFINED_INSTRUCTION / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_SW_BREAKPOINT:
+          reason = "SW_BREAKPOINT / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_HW_BREAKPOINT:
+          reason = "HW_BREAKPOINT / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_UNALIGNED_ACCESS:
+          reason = "UNALIGNED_ACCESS / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_THREAD_STARTING:
+          reason = "THREAD_STARTING / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_THREAD_EXITING:
+          reason = "THREAD_EXITING / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_POLICY_ERROR:
+          reason = "POLICY_ERROR / ";
+          reason.append(flags_string);
+          break;
+        case MD_EXCEPTION_CODE_FUCHSIA_PROCESS_STARTING:
+          reason = "PROCESS_STARTING / ";
+          reason.append(flags_string);
+          break;
+        default:
+          BPLOG(INFO) << "Unknown exception reason " << reason;
+      }
+      break;
+    }
+
     case MD_OS_MAC_OS_X:
     case MD_OS_IOS: {
-      char flags_string[11];
-      snprintf(flags_string, sizeof(flags_string), "0x%08x", exception_flags);
       switch (exception_code) {
         case MD_EXCEPTION_MAC_BAD_ACCESS:
           reason = "EXC_BAD_ACCESS / ";
@@ -752,6 +827,9 @@
             case MD_EXCEPTION_CODE_MAC_MEMORY_ERROR:
               reason.append("KERN_MEMORY_ERROR");
               break;
+            case MD_EXCEPTION_CODE_MAC_CODESIGN_ERROR:
+              reason.append("KERN_CODESIGN_ERROR");
+              break;
             default:
               // arm and ppc overlap
               if (raw_system_info->processor_architecture ==
@@ -1240,8 +1318,6 @@
 
     case MD_OS_ANDROID:
     case MD_OS_LINUX: {
-      char flags_string[11];
-      snprintf(flags_string, sizeof(flags_string), "0x%08x", exception_flags);
       switch (exception_code) {
         case MD_EXCEPTION_CODE_LIN_SIGHUP:
           reason = "SIGHUP";
@@ -1295,7 +1371,7 @@
           reason = "SIGBUS / ";
           switch (exception_flags) {
             case MD_EXCEPTION_FLAG_LIN_BUS_ADRALN:
-              reason.append("BUS_ADALN");
+              reason.append("BUS_ADRALN");
               break;
             case MD_EXCEPTION_FLAG_LIN_BUS_ADRERR:
               reason.append("BUS_ADRERR");
@@ -1668,12 +1744,12 @@
 }
 
 // static
-string MinidumpProcessor::GetAssertion(Minidump *dump) {
-  MinidumpAssertion *assertion = dump->GetAssertion();
+string MinidumpProcessor::GetAssertion(Minidump* dump) {
+  MinidumpAssertion* assertion = dump->GetAssertion();
   if (!assertion)
     return "";
 
-  const MDRawAssertionInfo *raw_assertion = assertion->assertion();
+  const MDRawAssertionInfo* raw_assertion = assertion->assertion();
   if (!raw_assertion)
     return "";
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_processor_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_processor_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_processor_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_processor_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -127,16 +127,16 @@
   uint64_t GetBase() const { return region_.GetBase(); }
   uint32_t GetSize() const { return region_.GetSize(); }
 
-  bool GetMemoryAtAddress(uint64_t address, uint8_t  *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint8_t*  value) const {
     return region_.GetMemoryAtAddress(address, value);
   }
-  bool GetMemoryAtAddress(uint64_t address, uint16_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint16_t* value) const {
     return region_.GetMemoryAtAddress(address, value);
   }
-  bool GetMemoryAtAddress(uint64_t address, uint32_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint32_t* value) const {
     return region_.GetMemoryAtAddress(address, value);
   }
-  bool GetMemoryAtAddress(uint64_t address, uint64_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint64_t* value) const {
     return region_.GetMemoryAtAddress(address, value);
   }
 
@@ -188,11 +188,11 @@
 using ::testing::Return;
 using ::testing::SetArgumentPointee;
 
-static const char *kSystemInfoOS = "Windows NT";
-static const char *kSystemInfoOSShort = "windows";
-static const char *kSystemInfoOSVersion = "5.1.2600 Service Pack 2";
-static const char *kSystemInfoCPU = "x86";
-static const char *kSystemInfoCPUInfo =
+static const char* kSystemInfoOS = "Windows NT";
+static const char* kSystemInfoOSShort = "windows";
+static const char* kSystemInfoOSVersion = "5.1.2600 Service Pack 2";
+static const char* kSystemInfoCPU = "x86";
+static const char* kSystemInfoCPUInfo =
     "GenuineIntel family 6 model 13 stepping 8";
 
 #define ASSERT_TRUE_ABORT(cond) \
@@ -204,7 +204,7 @@
 #define ASSERT_EQ_ABORT(e1, e2) ASSERT_TRUE_ABORT((e1) == (e2))
 
 static string GetTestDataPath() {
-  char *srcdir = getenv("srcdir");
+  char* srcdir = getenv("srcdir");
 
   return string(srcdir ? srcdir : ".") + "/src/processor/testdata/";
 }
@@ -213,35 +213,35 @@
  public:
   TestSymbolSupplier() : interrupt_(false) {}
 
-  virtual SymbolResult GetSymbolFile(const CodeModule *module,
-                                     const SystemInfo *system_info,
-                                     string *symbol_file);
-
-  virtual SymbolResult GetSymbolFile(const CodeModule *module,
-                                     const SystemInfo *system_info,
-                                     string *symbol_file,
-                                     string *symbol_data);
-
-  virtual SymbolResult GetCStringSymbolData(const CodeModule *module,
-                                            const SystemInfo *system_info,
-                                            string *symbol_file,
-                                            char **symbol_data,
-                                            size_t *symbol_data_size);
+  virtual SymbolResult GetSymbolFile(const CodeModule* module,
+                                     const SystemInfo* system_info,
+                                     string* symbol_file);
+
+  virtual SymbolResult GetSymbolFile(const CodeModule* module,
+                                     const SystemInfo* system_info,
+                                     string* symbol_file,
+                                     string* symbol_data);
+
+  virtual SymbolResult GetCStringSymbolData(const CodeModule* module,
+                                            const SystemInfo* system_info,
+                                            string* symbol_file,
+                                            char** symbol_data,
+                                            size_t* symbol_data_size);
 
-  virtual void FreeSymbolData(const CodeModule *module);
+  virtual void FreeSymbolData(const CodeModule* module);
 
   // When set to true, causes the SymbolSupplier to return INTERRUPT
   void set_interrupt(bool interrupt) { interrupt_ = interrupt; }
 
  private:
   bool interrupt_;
-  map<string, char *> memory_buffers_;
+  map<string, char*> memory_buffers_;
 };
 
 SymbolSupplier::SymbolResult TestSymbolSupplier::GetSymbolFile(
-    const CodeModule *module,
-    const SystemInfo *system_info,
-    string *symbol_file) {
+    const CodeModule* module,
+    const SystemInfo* system_info,
+    string* symbol_file) {
   ASSERT_TRUE_ABORT(module);
   ASSERT_TRUE_ABORT(system_info);
   ASSERT_EQ_ABORT(system_info->cpu, kSystemInfoCPU);
@@ -264,10 +264,10 @@
 }
 
 SymbolSupplier::SymbolResult TestSymbolSupplier::GetSymbolFile(
-    const CodeModule *module,
-    const SystemInfo *system_info,
-    string *symbol_file,
-    string *symbol_data) {
+    const CodeModule* module,
+    const SystemInfo* system_info,
+    string* symbol_file,
+    string* symbol_data) {
   SymbolSupplier::SymbolResult s = GetSymbolFile(module, system_info,
                                                  symbol_file);
   if (s == FOUND) {
@@ -281,11 +281,11 @@
 }
 
 SymbolSupplier::SymbolResult TestSymbolSupplier::GetCStringSymbolData(
-    const CodeModule *module,
-    const SystemInfo *system_info,
-    string *symbol_file,
-    char **symbol_data,
-    size_t *symbol_data_size) {
+    const CodeModule* module,
+    const SystemInfo* system_info,
+    string* symbol_file,
+    char** symbol_data,
+    size_t* symbol_data_size) {
   string symbol_data_string;
   SymbolSupplier::SymbolResult s = GetSymbolFile(module,
                                                  system_info,
@@ -307,8 +307,8 @@
   return s;
 }
 
-void TestSymbolSupplier::FreeSymbolData(const CodeModule *module) {
-  map<string, char *>::iterator it = memory_buffers_.find(module->code_file());
+void TestSymbolSupplier::FreeSymbolData(const CodeModule* module) {
+  map<string, char*>::iterator it = memory_buffers_.find(module->code_file());
   if (it != memory_buffers_.end()) {
     delete [] it->second;
     memory_buffers_.erase(it);
@@ -523,7 +523,7 @@
   EXPECT_EQ(1171480435U, state.time_date_stamp());
   EXPECT_EQ(1171480435U, state.process_create_time());
 
-  CallStack *stack = state.threads()->at(0);
+  CallStack* stack = state.threads()->at(0);
   ASSERT_TRUE(stack);
   ASSERT_EQ(stack->frames()->size(), 4U);
 
@@ -763,7 +763,7 @@
 
 }  // namespace
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_stackwalk.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_stackwalk.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_stackwalk.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_stackwalk.cc	2021-12-09 12:01:26.000000000 +0000
@@ -138,7 +138,7 @@
   options->machine_readable = false;
   options->output_stack_contents = false;
 
-  while ((ch = getopt(argc, (char * const *)argv, "hms")) != -1) {
+  while ((ch = getopt(argc, (char * const*)argv, "hms")) != -1) {
     switch (ch) {
       case 'h':
         Usage(argc, argv, false);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/minidump_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -95,9 +95,9 @@
   ASSERT_NE(header, (MDRawHeader*)NULL);
   ASSERT_EQ(header->signature, uint32_t(MD_HEADER_SIGNATURE));
 
-  MinidumpModuleList *md_module_list = minidump.GetModuleList();
+  MinidumpModuleList* md_module_list = minidump.GetModuleList();
   ASSERT_TRUE(md_module_list != NULL);
-  const MinidumpModule *md_module = md_module_list->GetModuleAtIndex(0);
+  const MinidumpModule* md_module = md_module_list->GetModuleAtIndex(0);
   ASSERT_TRUE(md_module != NULL);
   ASSERT_EQ("c:\\test_app.exe", md_module->code_file());
   ASSERT_EQ("c:\\test_app.pdb", md_module->debug_file());
@@ -167,7 +167,7 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  const MDRawDirectory *dir = minidump.GetDirectoryEntryAtIndex(0);
+  const MDRawDirectory* dir = minidump.GetDirectoryEntryAtIndex(0);
   ASSERT_TRUE(dir != NULL);
   EXPECT_EQ(0xfbb7fa2bU, dir->stream_type);
 
@@ -203,18 +203,18 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  const MDRawDirectory *dir = minidump.GetDirectoryEntryAtIndex(0);
+  const MDRawDirectory* dir = minidump.GetDirectoryEntryAtIndex(0);
   ASSERT_TRUE(dir != NULL);
   EXPECT_EQ((uint32_t) MD_MEMORY_LIST_STREAM, dir->stream_type);
 
-  MinidumpMemoryList *memory_list = minidump.GetMemoryList();
+  MinidumpMemoryList* memory_list = minidump.GetMemoryList();
   ASSERT_TRUE(memory_list != NULL);
   ASSERT_EQ(1U, memory_list->region_count());
 
-  MinidumpMemoryRegion *region1 = memory_list->GetMemoryRegionAtIndex(0);
+  MinidumpMemoryRegion* region1 = memory_list->GetMemoryRegionAtIndex(0);
   ASSERT_EQ(0x309d68010bd21b2cULL, region1->GetBase());
   ASSERT_EQ(15U, region1->GetSize());
-  const uint8_t *region1_bytes = region1->GetMemory();
+  const uint8_t* region1_bytes = region1->GetMemory();
   ASSERT_TRUE(memcmp("memory contents", region1_bytes, 15) == 0);
 }
 
@@ -257,33 +257,33 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(2U, minidump.GetDirectoryEntryCount());
 
-  MinidumpMemoryList *md_memory_list = minidump.GetMemoryList();
+  MinidumpMemoryList* md_memory_list = minidump.GetMemoryList();
   ASSERT_TRUE(md_memory_list != NULL);
   ASSERT_EQ(1U, md_memory_list->region_count());
 
-  MinidumpMemoryRegion *md_region = md_memory_list->GetMemoryRegionAtIndex(0);
+  MinidumpMemoryRegion* md_region = md_memory_list->GetMemoryRegionAtIndex(0);
   ASSERT_EQ(0x2326a0faU, md_region->GetBase());
   ASSERT_EQ(16U, md_region->GetSize());
-  const uint8_t *region_bytes = md_region->GetMemory();
+  const uint8_t* region_bytes = md_region->GetMemory();
   ASSERT_TRUE(memcmp("stack for thread", region_bytes, 16) == 0);
 
-  MinidumpThreadList *thread_list = minidump.GetThreadList();
+  MinidumpThreadList* thread_list = minidump.GetThreadList();
   ASSERT_TRUE(thread_list != NULL);
   ASSERT_EQ(1U, thread_list->thread_count());
 
-  MinidumpThread *md_thread = thread_list->GetThreadAtIndex(0);
+  MinidumpThread* md_thread = thread_list->GetThreadAtIndex(0);
   ASSERT_TRUE(md_thread != NULL);
   uint32_t thread_id;
   ASSERT_TRUE(md_thread->GetThreadID(&thread_id));
   ASSERT_EQ(0xa898f11bU, thread_id);
-  MinidumpMemoryRegion *md_stack = md_thread->GetMemory();
+  MinidumpMemoryRegion* md_stack = md_thread->GetMemory();
   ASSERT_TRUE(md_stack != NULL);
   ASSERT_EQ(0x2326a0faU, md_stack->GetBase());
   ASSERT_EQ(16U, md_stack->GetSize());
-  const uint8_t *md_stack_bytes = md_stack->GetMemory();
+  const uint8_t* md_stack_bytes = md_stack->GetMemory();
   ASSERT_TRUE(memcmp("stack for thread", md_stack_bytes, 16) == 0);
 
-  MinidumpContext *md_context = md_thread->GetContext();
+  MinidumpContext* md_context = md_thread->GetContext();
   ASSERT_TRUE(md_context != NULL);
   ASSERT_EQ((uint32_t) MD_CONTEXT_X86, md_context->GetContextCPU());
 
@@ -291,7 +291,7 @@
   ASSERT_TRUE(md_context->GetInstructionPointer(&eip));
   EXPECT_EQ(kExpectedEIP, eip);
 
-  const MDRawContextX86 *md_raw_context = md_context->GetContextX86();
+  const MDRawContextX86* md_raw_context = md_context->GetContextX86();
   ASSERT_TRUE(md_raw_context != NULL);
   ASSERT_EQ((uint32_t) (MD_CONTEXT_X86_INTEGER | MD_CONTEXT_X86_CONTROL),
             (md_raw_context->context_flags
@@ -425,16 +425,16 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(2U, minidump.GetDirectoryEntryCount());
 
-  const MDRawDirectory *dir = minidump.GetDirectoryEntryAtIndex(1);
+  const MDRawDirectory* dir = minidump.GetDirectoryEntryAtIndex(1);
   ASSERT_TRUE(dir != NULL);
   EXPECT_EQ((uint32_t) MD_UNLOADED_MODULE_LIST_STREAM, dir->stream_type);
 
-  MinidumpUnloadedModuleList *md_unloaded_module_list =
+  MinidumpUnloadedModuleList* md_unloaded_module_list =
       minidump.GetUnloadedModuleList();
   ASSERT_TRUE(md_unloaded_module_list != NULL);
   ASSERT_EQ(1U, md_unloaded_module_list->module_count());
 
-  const MinidumpUnloadedModule *md_unloaded_module =
+  const MinidumpUnloadedModule* md_unloaded_module =
       md_unloaded_module_list->GetModuleAtIndex(0);
   ASSERT_TRUE(md_unloaded_module != NULL);
   ASSERT_EQ(0xa90206ca83eb2852ULL, md_unloaded_module->base_address());
@@ -445,7 +445,7 @@
   ASSERT_EQ("B1054D2Aada542bd", md_unloaded_module->code_identifier());
   ASSERT_EQ("", md_unloaded_module->debug_identifier());
 
-  const MDRawUnloadedModule *md_raw_unloaded_module =
+  const MDRawUnloadedModule* md_raw_unloaded_module =
       md_unloaded_module->module();
   ASSERT_TRUE(md_raw_unloaded_module != NULL);
   ASSERT_EQ(0xb1054d2aU, md_raw_unloaded_module->time_date_stamp);
@@ -506,15 +506,15 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(2U, minidump.GetDirectoryEntryCount());
 
-  const MDRawDirectory *dir = minidump.GetDirectoryEntryAtIndex(1);
+  const MDRawDirectory* dir = minidump.GetDirectoryEntryAtIndex(1);
   ASSERT_TRUE(dir != NULL);
   EXPECT_EQ((uint32_t) MD_MODULE_LIST_STREAM, dir->stream_type);
 
-  MinidumpModuleList *md_module_list = minidump.GetModuleList();
+  MinidumpModuleList* md_module_list = minidump.GetModuleList();
   ASSERT_TRUE(md_module_list != NULL);
   ASSERT_EQ(1U, md_module_list->module_count());
 
-  const MinidumpModule *md_module = md_module_list->GetModuleAtIndex(0);
+  const MinidumpModule* md_module = md_module_list->GetModuleAtIndex(0);
   ASSERT_TRUE(md_module != NULL);
   ASSERT_EQ(0xa90206ca83eb2852ULL, md_module->base_address());
   ASSERT_EQ(0xada542bd, md_module->size());
@@ -524,7 +524,7 @@
   ASSERT_EQ("B1054D2Aada542bd", md_module->code_identifier());
   ASSERT_EQ("ABCD1234F00DBEEF01020304050607081", md_module->debug_identifier());
 
-  const MDRawModule *md_raw_module = md_module->module();
+  const MDRawModule* md_raw_module = md_module->module();
   ASSERT_TRUE(md_raw_module != NULL);
   ASSERT_EQ(0xb1054d2aU, md_raw_module->time_date_stamp);
   ASSERT_EQ(0x34571371U, md_raw_module->checksum);
@@ -588,11 +588,11 @@
   Minidump minidump(minidump_stream);
   ASSERT_TRUE(minidump.Read());
 
-  MinidumpModuleList *md_module_list = minidump.GetModuleList();
+  MinidumpModuleList* md_module_list = minidump.GetModuleList();
   ASSERT_TRUE(md_module_list != NULL);
   ASSERT_EQ(1U, md_module_list->module_count());
 
-  const MinidumpModule *md_module = md_module_list->GetModuleAtIndex(0);
+  const MinidumpModule* md_module = md_module_list->GetModuleAtIndex(0);
   ASSERT_TRUE(md_module != NULL);
   ASSERT_EQ(0xa90206ca83eb2852ULL, md_module->base_address());
   ASSERT_EQ(0xada542bd, md_module->size());
@@ -606,7 +606,7 @@
   // age appended
   ASSERT_EQ("B4CDA95F53101BDF86FAB733B4DF37380", md_module->debug_identifier());
 
-  const MDRawModule *md_raw_module = md_module->module();
+  const MDRawModule* md_raw_module = md_module->module();
   ASSERT_TRUE(md_raw_module != NULL);
   ASSERT_EQ(0xb1054d2aU, md_raw_module->time_date_stamp);
   ASSERT_EQ(0x34571371U, md_raw_module->checksum);
@@ -670,11 +670,11 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(2U, minidump.GetDirectoryEntryCount());
 
-  MinidumpModuleList *md_module_list = minidump.GetModuleList();
+  MinidumpModuleList* md_module_list = minidump.GetModuleList();
   ASSERT_TRUE(md_module_list != NULL);
   ASSERT_EQ(1U, md_module_list->module_count());
 
-  const MinidumpModule *md_module = md_module_list->GetModuleAtIndex(0);
+  const MinidumpModule* md_module = md_module_list->GetModuleAtIndex(0);
   ASSERT_TRUE(md_module != NULL);
   // just the build_id, directly
   ASSERT_EQ("5fa9cdb4", md_module->code_identifier());
@@ -742,11 +742,11 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(2U, minidump.GetDirectoryEntryCount());
 
-  MinidumpModuleList *md_module_list = minidump.GetModuleList();
+  MinidumpModuleList* md_module_list = minidump.GetModuleList();
   ASSERT_TRUE(md_module_list != NULL);
   ASSERT_EQ(1U, md_module_list->module_count());
 
-  const MinidumpModule *md_module = md_module_list->GetModuleAtIndex(0);
+  const MinidumpModule* md_module = md_module_list->GetModuleAtIndex(0);
   ASSERT_TRUE(md_module != NULL);
   // just the build_id, directly
   ASSERT_EQ(
@@ -773,11 +773,11 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  const MDRawDirectory *dir = minidump.GetDirectoryEntryAtIndex(0);
+  const MDRawDirectory* dir = minidump.GetDirectoryEntryAtIndex(0);
   ASSERT_TRUE(dir != NULL);
   EXPECT_EQ((uint32_t) MD_SYSTEM_INFO_STREAM, dir->stream_type);
 
-  MinidumpSystemInfo *md_system_info = minidump.GetSystemInfo();
+  MinidumpSystemInfo* md_system_info = minidump.GetSystemInfo();
   ASSERT_TRUE(md_system_info != NULL);
   ASSERT_EQ("windows", md_system_info->GetOS());
   ASSERT_EQ("x86", md_system_info->GetCPU());
@@ -912,7 +912,7 @@
   ASSERT_EQ(5U, minidump.GetDirectoryEntryCount());
 
   // Check the threads.
-  MinidumpThreadList *thread_list = minidump.GetThreadList();
+  MinidumpThreadList* thread_list = minidump.GetThreadList();
   ASSERT_TRUE(thread_list != NULL);
   ASSERT_EQ(5U, thread_list->thread_count());
   uint32_t thread_id;
@@ -957,7 +957,7 @@
             ->eip);
 
   // Check the modules.
-  MinidumpModuleList *md_module_list = minidump.GetModuleList();
+  MinidumpModuleList* md_module_list = minidump.GetModuleList();
   ASSERT_TRUE(md_module_list != NULL);
   ASSERT_EQ(3U, md_module_list->module_count());
   EXPECT_EQ(0xeb77da57b5d4cbdaULL,
@@ -968,7 +968,7 @@
             md_module_list->GetModuleAtIndex(2)->base_address());
 
   // Check unloaded modules
-  MinidumpUnloadedModuleList *md_unloaded_module_list =
+  MinidumpUnloadedModuleList* md_unloaded_module_list =
       minidump.GetUnloadedModuleList();
   ASSERT_TRUE(md_unloaded_module_list != NULL);
   ASSERT_EQ(3U, md_unloaded_module_list->module_count());
@@ -979,7 +979,7 @@
   EXPECT_EQ(umodule3_base,
             md_unloaded_module_list->GetModuleAtIndex(2)->base_address());
 
-  const MinidumpUnloadedModule *umodule =
+  const MinidumpUnloadedModule* umodule =
       md_unloaded_module_list->GetModuleForAddress(
           umodule1_base + umodule1_size / 2);
   EXPECT_EQ(umodule1_base, umodule->base_address());
@@ -1025,22 +1025,22 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  const MDRawDirectory *dir = minidump.GetDirectoryEntryAtIndex(0);
+  const MDRawDirectory* dir = minidump.GetDirectoryEntryAtIndex(0);
   ASSERT_TRUE(dir != NULL);
   EXPECT_EQ((uint32_t) MD_MEMORY_INFO_LIST_STREAM, dir->stream_type);
 
-  MinidumpMemoryInfoList *info_list = minidump.GetMemoryInfoList();
+  MinidumpMemoryInfoList* info_list = minidump.GetMemoryInfoList();
   ASSERT_TRUE(info_list != NULL);
   ASSERT_EQ(1U, info_list->info_count());
 
-  const MinidumpMemoryInfo *info1 = info_list->GetMemoryInfoAtIndex(0);
+  const MinidumpMemoryInfo* info1 = info_list->GetMemoryInfoAtIndex(0);
   ASSERT_EQ(kBaseAddress, info1->GetBase());
   ASSERT_EQ(kRegionSize, info1->GetSize());
   ASSERT_TRUE(info1->IsExecutable());
   ASSERT_TRUE(info1->IsWritable());
 
   // Should get back the same memory region here.
-  const MinidumpMemoryInfo *info2 =
+  const MinidumpMemoryInfo* info2 =
       info_list->GetMemoryInfoForAddress(kBaseAddress + kRegionSize / 2);
   ASSERT_EQ(kBaseAddress, info2->GetBase());
   ASSERT_EQ(kRegionSize, info2->GetSize());
@@ -1083,7 +1083,7 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  MinidumpException *md_exception = minidump.GetException();
+  MinidumpException* md_exception = minidump.GetException();
   ASSERT_TRUE(md_exception != NULL);
 
   uint32_t thread_id;
@@ -1097,10 +1097,10 @@
   EXPECT_EQ(0x0919a9b9c9d9e9f9ULL,
             raw_exception->exception_record.exception_address);
 
-  MinidumpContext *md_context = md_exception->GetContext();
+  MinidumpContext* md_context = md_exception->GetContext();
   ASSERT_TRUE(md_context != NULL);
   ASSERT_EQ((uint32_t) MD_CONTEXT_X86, md_context->GetContextCPU());
-  const MDRawContextX86 *md_raw_context = md_context->GetContextX86();
+  const MDRawContextX86* md_raw_context = md_context->GetContextX86();
   ASSERT_TRUE(md_raw_context != NULL);
   ASSERT_EQ((uint32_t) (MD_CONTEXT_X86_INTEGER | MD_CONTEXT_X86_CONTROL),
             (md_raw_context->context_flags
@@ -1157,7 +1157,7 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  MinidumpException *md_exception = minidump.GetException();
+  MinidumpException* md_exception = minidump.GetException();
   ASSERT_TRUE(md_exception != NULL);
 
   uint32_t thread_id;
@@ -1171,10 +1171,10 @@
   EXPECT_EQ(0x0919a9b9c9d9e9f9ULL,
             raw_exception->exception_record.exception_address);
 
-  MinidumpContext *md_context = md_exception->GetContext();
+  MinidumpContext* md_context = md_exception->GetContext();
   ASSERT_TRUE(md_context != NULL);
   ASSERT_EQ((uint32_t) MD_CONTEXT_X86, md_context->GetContextCPU());
-  const MDRawContextX86 *md_raw_context = md_context->GetContextX86();
+  const MDRawContextX86* md_raw_context = md_context->GetContextX86();
   ASSERT_TRUE(md_raw_context != NULL);
   ASSERT_EQ((uint32_t) (MD_CONTEXT_X86_INTEGER | MD_CONTEXT_X86_CONTROL),
             (md_raw_context->context_flags
@@ -1242,7 +1242,7 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(2U, minidump.GetDirectoryEntryCount());
 
-  MinidumpException *md_exception = minidump.GetException();
+  MinidumpException* md_exception = minidump.GetException();
   ASSERT_TRUE(md_exception != NULL);
 
   uint32_t thread_id;
@@ -1256,11 +1256,11 @@
   EXPECT_EQ(0x0919a9b9c9d9e9f9ULL,
             raw_exception->exception_record.exception_address);
 
-  MinidumpContext *md_context = md_exception->GetContext();
+  MinidumpContext* md_context = md_exception->GetContext();
   ASSERT_TRUE(md_context != NULL);
 
   ASSERT_EQ((uint32_t) MD_CONTEXT_X86, md_context->GetContextCPU());
-  const MDRawContextX86 *md_raw_context = md_context->GetContextX86();
+  const MDRawContextX86* md_raw_context = md_context->GetContextX86();
   ASSERT_TRUE(md_raw_context != NULL);
 
   // Even though the CPU flags were missing from the context_flags, the
@@ -1324,7 +1324,7 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  MinidumpException *md_exception = minidump.GetException();
+  MinidumpException* md_exception = minidump.GetException();
   ASSERT_TRUE(md_exception != NULL);
 
   uint32_t thread_id;
@@ -1341,7 +1341,7 @@
   // The context record of the exception is unusable because the context_flags
   // don't have CPU type information and at the same time the minidump lacks
   // system info stream so it is impossible to deduce the CPU type.
-  MinidumpContext *md_context = md_exception->GetContext();
+  MinidumpContext* md_context = md_exception->GetContext();
   ASSERT_EQ(NULL, md_context);
 }
 
@@ -1387,7 +1387,7 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  MinidumpException *md_exception = minidump.GetException();
+  MinidumpException* md_exception = minidump.GetException();
   ASSERT_TRUE(md_exception != NULL);
 
   uint32_t thread_id;
@@ -1401,10 +1401,10 @@
   EXPECT_EQ(0x0919a9b9c9d9e9f9ULL,
             raw_exception->exception_record.exception_address);
 
-  MinidumpContext *md_context = md_exception->GetContext();
+  MinidumpContext* md_context = md_exception->GetContext();
   ASSERT_TRUE(md_context != NULL);
   ASSERT_EQ((uint32_t) MD_CONTEXT_ARM, md_context->GetContextCPU());
-  const MDRawContextARM *md_raw_context = md_context->GetContextARM();
+  const MDRawContextARM* md_raw_context = md_context->GetContextARM();
   ASSERT_TRUE(md_raw_context != NULL);
   ASSERT_EQ((uint32_t) MD_CONTEXT_ARM_INTEGER,
             (md_raw_context->context_flags
@@ -1471,7 +1471,7 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  MinidumpException *md_exception = minidump.GetException();
+  MinidumpException* md_exception = minidump.GetException();
   ASSERT_TRUE(md_exception != NULL);
 
   uint32_t thread_id;
@@ -1485,10 +1485,10 @@
   EXPECT_EQ(0x0919a9b9c9d9e9f9ULL,
             raw_exception->exception_record.exception_address);
 
-  MinidumpContext *md_context = md_exception->GetContext();
+  MinidumpContext* md_context = md_exception->GetContext();
   ASSERT_TRUE(md_context != NULL);
   ASSERT_EQ((uint32_t) MD_CONTEXT_ARM, md_context->GetContextCPU());
-  const MDRawContextARM *md_raw_context = md_context->GetContextARM();
+  const MDRawContextARM* md_raw_context = md_context->GetContextARM();
   ASSERT_TRUE(md_raw_context != NULL);
   ASSERT_EQ((uint32_t) MD_CONTEXT_ARM_INTEGER,
             (md_raw_context->context_flags
@@ -1570,7 +1570,7 @@
   ASSERT_TRUE(minidump.Read());
   ASSERT_EQ(1U, minidump.GetDirectoryEntryCount());
 
-  MinidumpException *md_exception = minidump.GetException();
+  MinidumpException* md_exception = minidump.GetException();
   ASSERT_TRUE(md_exception != NULL);
 
   uint32_t thread_id;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_comparer.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_comparer.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_comparer.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_comparer.cc	2021-12-09 12:01:26.000000000 +0000
@@ -52,7 +52,7 @@
 
 namespace google_breakpad {
 
-bool ModuleComparer::Compare(const string &symbol_data) {
+bool ModuleComparer::Compare(const string& symbol_data) {
   scoped_ptr<BasicModule> basic_module(new BasicModule("test_module"));
   scoped_ptr<FastModule> fast_module(new FastModule("test_module"));
 
@@ -284,7 +284,7 @@
     while (iter1 != basic_crm->map_->end()
         && iter2 != fast_crm->map_.end()) {
       ASSERT_TRUE(iter1->first == iter2.GetKey());
-      StaticContainedRangeMap<MemAddr, char> *child =
+      StaticContainedRangeMap<MemAddr, char>* child =
           new StaticContainedRangeMap<MemAddr, char>(
               reinterpret_cast<const char*>(iter2.GetValuePtr()));
       ASSERT_TRUE(CompareCRM(iter1->second, child));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_comparer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_comparer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_comparer.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_comparer.h	2021-12-09 12:01:26.000000000 +0000
@@ -64,7 +64,7 @@
   // FastSourceLineResolver loads its module using the serialized memory chunk,
   // Then, traverse both modules together and compare underlying data
   // return true if both modules contain exactly same data.
-  bool Compare(const string &symbol_data);
+  bool Compare(const string& symbol_data);
 
  private:
   typedef BasicSourceLineResolver::Module BasicModule;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_factory.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_factory.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_factory.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_factory.h	2021-12-09 12:01:26.000000000 +0000
@@ -46,14 +46,14 @@
  public:
   virtual ~ModuleFactory() { };
   virtual SourceLineResolverBase::Module* CreateModule(
-      const string &name) const = 0;
+      const string& name) const = 0;
 };
 
 class BasicModuleFactory : public ModuleFactory {
  public:
   virtual ~BasicModuleFactory() { }
   virtual BasicSourceLineResolver::Module* CreateModule(
-      const string &name) const {
+      const string& name) const {
     return new BasicSourceLineResolver::Module(name);
   }
 };
@@ -62,7 +62,7 @@
  public:
   virtual ~FastModuleFactory() { }
   virtual FastSourceLineResolver::Module* CreateModule(
-      const string &name) const {
+      const string& name) const {
     return new FastSourceLineResolver::Module(name);
   }
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_serializer.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_serializer.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_serializer.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_serializer.cc	2021-12-09 12:01:26.000000000 +0000
@@ -48,7 +48,7 @@
 RangeMapSerializer< MemAddr, linked_ptr<BasicSourceLineResolver::Line> >
 SimpleSerializer<BasicSourceLineResolver::Function>::range_map_serializer_;
 
-size_t ModuleSerializer::SizeOf(const BasicSourceLineResolver::Module &module) {
+size_t ModuleSerializer::SizeOf(const BasicSourceLineResolver::Module& module) {
   size_t total_size_alloc_ = 0;
 
   // Size of the "is_corrupt" flag.
@@ -80,8 +80,8 @@
   return total_size_alloc_;
 }
 
-char *ModuleSerializer::Write(const BasicSourceLineResolver::Module &module,
-                              char *dest) {
+char* ModuleSerializer::Write(const BasicSourceLineResolver::Module& module,
+                              char* dest) {
   // Write the is_corrupt flag.
   dest = SimpleSerializer<bool>::Write(module.is_corrupt_, dest);
   // Write header.
@@ -101,12 +101,12 @@
 }
 
 char* ModuleSerializer::Serialize(
-    const BasicSourceLineResolver::Module &module, unsigned int *size) {
+    const BasicSourceLineResolver::Module& module, unsigned int* size) {
   // Compute size of memory to allocate.
   unsigned int size_to_alloc = SizeOf(module);
 
   // Allocate memory for serialized data.
-  char *serialized_data = new char[size_to_alloc];
+  char* serialized_data = new char[size_to_alloc];
   if (!serialized_data) {
     BPLOG(ERROR) << "ModuleSerializer: memory allocation failed, "
                  << "size to alloc: " << size_to_alloc;
@@ -115,7 +115,7 @@
   }
 
   // Write serialized data to allocated memory chunk.
-  char *end_address = Write(module, serialized_data);
+  char* end_address = Write(module, serialized_data);
   // Verify the allocated memory size is equal to the size of data been written.
   unsigned int size_written =
       static_cast<unsigned int>(end_address - serialized_data);
@@ -131,8 +131,8 @@
 }
 
 bool ModuleSerializer::SerializeModuleAndLoadIntoFastResolver(
-    const BasicSourceLineResolver::ModuleMap::const_iterator &iter,
-    FastSourceLineResolver *fast_resolver) {
+    const BasicSourceLineResolver::ModuleMap::const_iterator& iter,
+    FastSourceLineResolver* fast_resolver) {
   BPLOG(INFO) << "Converting symbol " << iter->first.c_str();
 
   // Cast SourceLineResolverBase::Module* to BasicSourceLineResolver::Module*.
@@ -161,8 +161,8 @@
 }
 
 void ModuleSerializer::ConvertAllModules(
-    const BasicSourceLineResolver *basic_resolver,
-    FastSourceLineResolver *fast_resolver) {
+    const BasicSourceLineResolver* basic_resolver,
+    FastSourceLineResolver* fast_resolver) {
   // Check for NULL pointer.
   if (!basic_resolver || !fast_resolver)
     return;
@@ -175,9 +175,9 @@
 }
 
 bool ModuleSerializer::ConvertOneModule(
-    const string &moduleid,
-    const BasicSourceLineResolver *basic_resolver,
-    FastSourceLineResolver *fast_resolver) {
+    const string& moduleid,
+    const BasicSourceLineResolver* basic_resolver,
+    FastSourceLineResolver* fast_resolver) {
   // Check for NULL pointer.
   if (!basic_resolver || !fast_resolver)
     return false;
@@ -191,7 +191,7 @@
 }
 
 char* ModuleSerializer::SerializeSymbolFileData(
-    const string &symbol_data, unsigned int *size) {
+    const string& symbol_data, unsigned int* size) {
   scoped_ptr<BasicSourceLineResolver::Module> module(
       new BasicSourceLineResolver::Module("no name"));
   scoped_array<char> buffer(new char[symbol_data.size() + 1]);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_serializer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_serializer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_serializer.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/module_serializer.h	2021-12-09 12:01:26.000000000 +0000
@@ -61,38 +61,38 @@
  public:
   // Compute the size of memory required to serialize a module.  Return the
   // total size needed for serialization.
-  size_t SizeOf(const BasicSourceLineResolver::Module &module);
+  size_t SizeOf(const BasicSourceLineResolver::Module& module);
 
   // Write a module into an allocated memory chunk with required size.
   // Return the "end" of data, i.e., the address after the final byte of data.
-  char* Write(const BasicSourceLineResolver::Module &module, char *dest);
+  char* Write(const BasicSourceLineResolver::Module& module, char* dest);
 
   // Serializes a loaded Module object into a chunk of memory data and returns
   // the address of memory chunk.  If size != NULL, *size is set to the memory
   // size allocated for the serialized data.
   // Caller takes the ownership of the memory chunk (allocated on heap), and
   // owner should call delete [] to free the memory after use.
-  char* Serialize(const BasicSourceLineResolver::Module &module,
-                  unsigned int *size = NULL);
+  char* Serialize(const BasicSourceLineResolver::Module& module,
+                  unsigned int* size = NULL);
 
   // Given the string format symbol_data, produces a chunk of serialized data.
   // Caller takes ownership of the serialized data (on heap), and owner should
   // call delete [] to free the memory after use.
-  char* SerializeSymbolFileData(const string &symbol_data,
-                                unsigned int *size = NULL);
+  char* SerializeSymbolFileData(const string& symbol_data,
+                                unsigned int* size = NULL);
 
   // Serializes one loaded module with given moduleid in the basic source line
   // resolver, and loads the serialized data into the fast source line resolver.
   // Return false if the basic source line doesn't have a module with the given
   // moduleid.
-  bool ConvertOneModule(const string &moduleid,
-                        const BasicSourceLineResolver *basic_resolver,
-                        FastSourceLineResolver *fast_resolver);
+  bool ConvertOneModule(const string& moduleid,
+                        const BasicSourceLineResolver* basic_resolver,
+                        FastSourceLineResolver* fast_resolver);
 
   // Serializes all the loaded modules in a basic source line resolver, and
   // loads the serialized data into a fast source line resolver.
-  void ConvertAllModules(const BasicSourceLineResolver *basic_resolver,
-                         FastSourceLineResolver *fast_resolver);
+  void ConvertAllModules(const BasicSourceLineResolver* basic_resolver,
+                         FastSourceLineResolver* fast_resolver);
 
  private:
   // Convenient type names.
@@ -102,8 +102,8 @@
 
   // Internal implementation for ConvertOneModule and ConvertAllModules methods.
   bool SerializeModuleAndLoadIntoFastResolver(
-      const BasicSourceLineResolver::ModuleMap::const_iterator &iter,
-      FastSourceLineResolver *fast_resolver);
+      const BasicSourceLineResolver::ModuleMap::const_iterator& iter,
+      FastSourceLineResolver* fast_resolver);
 
   // Number of Maps that Module class contains.
   static const int32_t kNumberMaps_ =
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper.cc	2021-12-09 12:01:26.000000000 +0000
@@ -38,7 +38,7 @@
 namespace google_breakpad {
 
 // static
-string PathnameStripper::File(const string &path) {
+string PathnameStripper::File(const string& path) {
   string::size_type slash = path.rfind('/');
   string::size_type backslash = path.rfind('\\');
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper.h	2021-12-09 12:01:26.000000000 +0000
@@ -45,7 +45,7 @@
   // Given path, a pathname with components separated by slashes (/) or
   // backslashes (\), returns the trailing component, without any separator.
   // If path ends in a separator character, returns an empty string.
-  static string File(const string &path);
+  static string File(const string& path);
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/pathname_stripper_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -80,7 +80,7 @@
 
 }  // namespace
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   BPLOG_INIT(&argc, &argv);
 
   return RunTests() ? 0 : 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator.h	2021-12-09 12:01:26.000000000 +0000
@@ -95,7 +95,7 @@
   // (^) will not be supported.  |dictionary| may be NULL, but evaluation
   // will fail in that case unless set_dictionary is used before calling
   // Evaluate.
-  PostfixEvaluator(DictionaryType *dictionary, const MemoryRegion *memory)
+  PostfixEvaluator(DictionaryType* dictionary, const MemoryRegion* memory)
       : dictionary_(dictionary), memory_(memory), stack_() {}
 
   // Evaluate the expression, starting with an empty stack. The results of
@@ -105,18 +105,18 @@
   // non-NULL, any keys set in the dictionary as a result of evaluation
   // will also be set to true in assigned, providing a way to determine if
   // an expression modifies any of its input variables.
-  bool Evaluate(const string &expression, DictionaryValidityType *assigned);
+  bool Evaluate(const string& expression, DictionaryValidityType* assigned);
 
   // Like Evaluate, but provides the value left on the stack to the
   // caller. If evaluation succeeds and leaves exactly one value on
   // the stack, pop that value, store it in *result, and return true.
   // Otherwise, return false.
-  bool EvaluateForValue(const string &expression, ValueType *result);
+  bool EvaluateForValue(const string& expression, ValueType* result);
 
   DictionaryType* dictionary() const { return dictionary_; }
 
   // Reset the dictionary.  PostfixEvaluator does not take ownership.
-  void set_dictionary(DictionaryType *dictionary) {dictionary_ = dictionary; }
+  void set_dictionary(DictionaryType* dictionary) {dictionary_ = dictionary; }
 
  private:
   // Return values for PopValueOrIdentifier
@@ -132,40 +132,40 @@
   // if the topmost entry is a constant or variable identifier, and sets
   // |identifier| accordingly.  Returns POP_RESULT_FAIL on failure, such
   // as when the stack is empty.
-  PopResult PopValueOrIdentifier(ValueType *value, string *identifier);
+  PopResult PopValueOrIdentifier(ValueType* value, string* identifier);
 
   // Retrieves the topmost value on the stack.  If the topmost entry is
   // an identifier, the dictionary is queried for the identifier's value.
   // Returns false on failure, such as when the stack is empty or when
   // a nonexistent identifier is named.
-  bool PopValue(ValueType *value);
+  bool PopValue(ValueType* value);
 
   // Retrieves the top two values on the stack, in the style of PopValue.
   // value2 is popped before value1, so that value1 corresponds to the
   // entry that was pushed prior to value2.  Returns false on failure.
-  bool PopValues(ValueType *value1, ValueType *value2);
+  bool PopValues(ValueType* value1, ValueType* value2);
 
   // Pushes a new value onto the stack.
-  void PushValue(const ValueType &value);
+  void PushValue(const ValueType& value);
 
   // Evaluate expression, updating *assigned if it is non-zero. Return
   // true if evaluation completes successfully. Do not clear the stack
   // upon successful evaluation.
-  bool EvaluateInternal(const string &expression,
-                        DictionaryValidityType *assigned);
+  bool EvaluateInternal(const string& expression,
+                        DictionaryValidityType* assigned);
 
-  bool EvaluateToken(const string &token,
-                     const string &expression,
-                     DictionaryValidityType *assigned);
+  bool EvaluateToken(const string& token,
+                     const string& expression,
+                     DictionaryValidityType* assigned);
 
   // The dictionary mapping constant and variable identifiers (strings) to
   // values.  Keys beginning with '$' are treated as variable names, and
   // PostfixEvaluator is free to create and modify these keys.  Weak pointer.
-  DictionaryType *dictionary_;
+  DictionaryType* dictionary_;
 
   // If non-NULL, the MemoryRegion used for dereference (^) operations.
   // If NULL, dereferencing is unsupported and will fail.  Weak pointer.
-  const MemoryRegion *memory_;
+  const MemoryRegion* memory_;
 
   // The stack contains state information as execution progresses.  Values
   // are pushed on to it as the expression string is read and as operations
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -58,19 +58,19 @@
 // before returning failure.
 class AutoStackClearer {
  public:
-  explicit AutoStackClearer(vector<string> *stack) : stack_(stack) {}
+  explicit AutoStackClearer(vector<string>* stack) : stack_(stack) {}
   ~AutoStackClearer() { stack_->clear(); }
 
  private:
-  vector<string> *stack_;
+  vector<string>* stack_;
 };
 
 
 template<typename ValueType>
 bool PostfixEvaluator<ValueType>::EvaluateToken(
-    const string &token,
-    const string &expression,
-    DictionaryValidityType *assigned) {
+    const string& token,
+    const string& expression,
+    DictionaryValidityType* assigned) {
   // There are enough binary operations that do exactly the same thing
   // (other than the specific operation, of course) that it makes sense
   // to share as much code as possible.
@@ -203,8 +203,8 @@
 
 template<typename ValueType>
 bool PostfixEvaluator<ValueType>::EvaluateInternal(
-    const string &expression,
-    DictionaryValidityType *assigned) {
+    const string& expression,
+    DictionaryValidityType* assigned) {
   // Tokenize, splitting on whitespace.
   istringstream stream(expression);
   string token;
@@ -231,8 +231,8 @@
 }
 
 template<typename ValueType>
-bool PostfixEvaluator<ValueType>::Evaluate(const string &expression,
-                                           DictionaryValidityType *assigned) {
+bool PostfixEvaluator<ValueType>::Evaluate(const string& expression,
+                                           DictionaryValidityType* assigned) {
   // Ensure that the stack is cleared before returning.
   AutoStackClearer clearer(&stack_);
 
@@ -250,8 +250,8 @@
 }
 
 template<typename ValueType>
-bool PostfixEvaluator<ValueType>::EvaluateForValue(const string &expression,
-                                                   ValueType *result) {
+bool PostfixEvaluator<ValueType>::EvaluateForValue(const string& expression,
+                                                   ValueType* result) {
   // Ensure that the stack is cleared before returning.
   AutoStackClearer clearer(&stack_);
 
@@ -271,7 +271,7 @@
 template<typename ValueType>
 typename PostfixEvaluator<ValueType>::PopResult
 PostfixEvaluator<ValueType>::PopValueOrIdentifier(
-    ValueType *value, string *identifier) {
+    ValueType* value, string* identifier) {
   // There needs to be at least one element on the stack to pop.
   if (!stack_.size())
     return POP_RESULT_FAIL;
@@ -314,7 +314,7 @@
 
 
 template<typename ValueType>
-bool PostfixEvaluator<ValueType>::PopValue(ValueType *value) {
+bool PostfixEvaluator<ValueType>::PopValue(ValueType* value) {
   ValueType literal = ValueType();
   string token;
   PopResult result;
@@ -343,14 +343,14 @@
 
 
 template<typename ValueType>
-bool PostfixEvaluator<ValueType>::PopValues(ValueType *value1,
-                                            ValueType *value2) {
+bool PostfixEvaluator<ValueType>::PopValues(ValueType* value1,
+                                            ValueType* value2) {
   return PopValue(value2) && PopValue(value1);
 }
 
 
 template<typename ValueType>
-void PostfixEvaluator<ValueType>::PushValue(const ValueType &value) {
+void PostfixEvaluator<ValueType>::PushValue(const ValueType& value) {
   ostringstream token_stream;
   token_stream << value;
   stack_.push_back(token_stream.str());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/postfix_evaluator_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -60,19 +60,19 @@
  public:
   virtual uint64_t GetBase() const { return 0; }
   virtual uint32_t GetSize() const { return 0; }
-  virtual bool GetMemoryAtAddress(uint64_t address, uint8_t  *value) const {
+  virtual bool GetMemoryAtAddress(uint64_t address, uint8_t*  value) const {
     *value = address + 1;
     return true;
   }
-  virtual bool GetMemoryAtAddress(uint64_t address, uint16_t *value) const {
+  virtual bool GetMemoryAtAddress(uint64_t address, uint16_t* value) const {
     *value = address + 1;
     return true;
   }
-  virtual bool GetMemoryAtAddress(uint64_t address, uint32_t *value) const {
+  virtual bool GetMemoryAtAddress(uint64_t address, uint32_t* value) const {
     *value = address + 1;
     return true;
   }
-  virtual bool GetMemoryAtAddress(uint64_t address, uint64_t *value) const {
+  virtual bool GetMemoryAtAddress(uint64_t address, uint64_t* value) const {
     *value = address + 1;
     return true;
   }
@@ -94,17 +94,17 @@
 
 struct EvaluateTestSet {
   // The dictionary used for all tests in the set.
-  PostfixEvaluator<unsigned int>::DictionaryType *dictionary;
+  PostfixEvaluator<unsigned int>::DictionaryType* dictionary;
 
   // The list of tests.
-  const EvaluateTest *evaluate_tests;
+  const EvaluateTest* evaluate_tests;
 
   // The number of tests.
   unsigned int evaluate_test_count;
 
   // Identifiers and their expected values upon completion of the Evaluate
   // tests in the set.
-  map<string, unsigned int> *validate_data;
+  map<string, unsigned int>* validate_data;
 };
 
 
@@ -227,9 +227,9 @@
   for (unsigned int evaluate_test_set_index = 0;
        evaluate_test_set_index < evaluate_test_set_count;
        ++evaluate_test_set_index) {
-    EvaluateTestSet *evaluate_test_set =
+    EvaluateTestSet* evaluate_test_set =
         &evaluate_test_sets[evaluate_test_set_index];
-    const EvaluateTest *evaluate_tests = evaluate_test_set->evaluate_tests;
+    const EvaluateTest* evaluate_tests = evaluate_test_set->evaluate_tests;
     unsigned int evaluate_test_count = evaluate_test_set->evaluate_test_count;
 
     // The same dictionary will be used for each test in the set.  Earlier
@@ -242,7 +242,7 @@
     for (unsigned int evaluate_test_index = 0;
          evaluate_test_index < evaluate_test_count;
          ++evaluate_test_index) {
-      const EvaluateTest *evaluate_test = &evaluate_tests[evaluate_test_index];
+      const EvaluateTest* evaluate_test = &evaluate_tests[evaluate_test_index];
 
       // Do the test.
       bool result = postfix_evaluator.Evaluate(evaluate_test->expression,
@@ -344,7 +344,7 @@
 
   postfix_evaluator.set_dictionary(&dictionary_2);
   for (int i = 0; i < evaluate_for_value_tests_2_size; i++) {
-    const EvaluateForValueTest *test = &evaluate_for_value_tests_2[i];
+    const EvaluateForValueTest* test = &evaluate_for_value_tests_2[i];
     unsigned int result;
     if (postfix_evaluator.EvaluateForValue(test->expression, &result)
         != test->evaluable) {
@@ -396,7 +396,7 @@
 }  // namespace
 
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   BPLOG_INIT(&argc, &argv);
 
   return RunTests() ? 0 : 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/process_state.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/process_state.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/process_state.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/process_state.cc	2021-12-09 12:01:26.000000000 +0000
@@ -51,7 +51,7 @@
   crash_address_ = 0;
   assertion_.clear();
   requesting_thread_ = -1;
-  for (vector<CallStack *>::const_iterator iterator = threads_.begin();
+  for (vector<CallStack*>::const_iterator iterator = threads_.begin();
        iterator != threads_.end();
        ++iterator) {
     delete *iterator;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map.h	2021-12-09 12:01:26.000000000 +0000
@@ -49,35 +49,46 @@
 // Forward declarations (for later friend declarations of specialized template).
 template<class, class> class RangeMapSerializer;
 
+// Determines what happens when two ranges overlap.
+enum class MergeRangeStrategy {
+  // When two ranges overlap, the new range fails to be inserted. The default
+  // strategy.
+  kExclusiveRanges,
+
+  // The range with the lower base address will be truncated such that it's
+  // high address is one less than the range above it.
+  kTruncateLower,
+
+  // The range with the greater high address has its range truncated such that
+  // its base address is one higher than the range below it.
+  kTruncateUpper
+};
+
 template<typename AddressType, typename EntryType>
 class RangeMap {
  public:
-  RangeMap() : enable_shrink_down_(false), map_() {}
+  RangeMap() : merge_strategy_(MergeRangeStrategy::kExclusiveRanges), map_() {}
+
+  void SetMergeStrategy(MergeRangeStrategy strat) { merge_strategy_ = strat; }
 
-  // |enable_shrink_down| tells whether overlapping ranges can be shrunk down.
-  // If true, then adding a new range that overlaps with an existing one can
-  // be a successful operation.  The range which ends at the higher address
-  // will be shrunk down by moving its start position to a higher address so
-  // that it does not overlap anymore.
-  void SetEnableShrinkDown(bool enable_shrink_down);
-  bool IsShrinkDownEnabled() const;
+  MergeRangeStrategy GetMergeStrategy() const { return merge_strategy_; }
 
   // Inserts a range into the map.  Returns false for a parameter error,
   // or if the location of the range would conflict with a range already
   // stored in the map.  If enable_shrink_down is true and there is an overlap
   // between the current range and some other range (already in the map),
   // shrink down the range which ends at a higher address.
-  bool StoreRange(const AddressType &base, const AddressType &size,
-                  const EntryType &entry);
+  bool StoreRange(const AddressType& base, const AddressType& size,
+                  const EntryType& entry);
 
   // Locates the range encompassing the supplied address.  If there is no such
   // range, returns false.  entry_base, entry_delta, and entry_size, if
   // non-NULL, are set to the base, delta, and size of the entry's range.
   // A positive entry delta (> 0) indicates that there was an overlap and the
   // entry was shrunk down (original start address was increased by delta).
-  bool RetrieveRange(const AddressType &address, EntryType *entry,
-                     AddressType *entry_base, AddressType *entry_delta,
-                     AddressType *entry_size) const;
+  bool RetrieveRange(const AddressType& address, EntryType* entry,
+                     AddressType* entry_base, AddressType* entry_delta,
+                     AddressType* entry_size) const;
 
   // Locates the range encompassing the supplied address, if one exists.
   // If no range encompasses the supplied address, locates the nearest range
@@ -86,9 +97,9 @@
   // if non-NULL, are set to the base, delta, and size of the entry's range.
   // A positive entry delta (> 0) indicates that there was an overlap and the
   // entry was shrunk down (original start address was increased by delta).
-  bool RetrieveNearestRange(const AddressType &address, EntryType *entry,
-                            AddressType *entry_base, AddressType *entry_delta,
-                            AddressType *entry_size) const;
+  bool RetrieveNearestRange(const AddressType& address, EntryType* entry,
+                            AddressType* entry_base, AddressType* entry_delta,
+                            AddressType* entry_size) const;
 
   // Treating all ranges as a list ordered by the address spaces that they
   // occupy, locates the range at the index specified by index.  Returns
@@ -99,9 +110,9 @@
   // entry was shrunk down (original start address was increased by delta).
   //
   // RetrieveRangeAtIndex is not optimized for speedy operation.
-  bool RetrieveRangeAtIndex(int index, EntryType *entry,
-                            AddressType *entry_base, AddressType *entry_delta,
-                            AddressType *entry_size) const;
+  bool RetrieveRangeAtIndex(int index, EntryType* entry,
+                            AddressType* entry_base, AddressType* entry_delta,
+                            AddressType* entry_size) const;
 
   // Returns the number of ranges stored in the RangeMap.
   int GetCount() const;
@@ -117,13 +128,13 @@
 
   // Same a StoreRange() with the only exception that the |delta| can be
   // passed in.
-  bool StoreRangeInternal(const AddressType &base, const AddressType &delta,
-                          const AddressType &size, const EntryType &entry);
+  bool StoreRangeInternal(const AddressType& base, const AddressType& delta,
+                          const AddressType& size, const EntryType& entry);
 
   class Range {
    public:
-    Range(const AddressType &base, const AddressType &delta,
-          const EntryType &entry)
+    Range(const AddressType& base, const AddressType& delta,
+          const EntryType& entry)
         : base_(base), delta_(delta), entry_(entry) {}
 
     AddressType base() const { return base_; }
@@ -147,8 +158,7 @@
   typedef typename AddressToRangeMap::const_iterator MapConstIterator;
   typedef typename AddressToRangeMap::value_type MapValue;
 
-  // Whether overlapping ranges can be shrunk down.
-  bool enable_shrink_down_;
+  MergeRangeStrategy merge_strategy_;
 
   // Maps the high address of each range to a EntryType.
   AddressToRangeMap map_;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -47,27 +47,16 @@
 namespace google_breakpad {
 
 template<typename AddressType, typename EntryType>
-void RangeMap<AddressType, EntryType>::SetEnableShrinkDown(
-    bool enable_shrink_down) {
-  enable_shrink_down_ = enable_shrink_down;
-}
-
-template<typename AddressType, typename EntryType>
-bool RangeMap<AddressType, EntryType>::IsShrinkDownEnabled() const {
-  return enable_shrink_down_;
-}
-
-template<typename AddressType, typename EntryType>
-bool RangeMap<AddressType, EntryType>::StoreRange(const AddressType &base,
-                                                  const AddressType &size,
-                                                  const EntryType &entry) {
+bool RangeMap<AddressType, EntryType>::StoreRange(const AddressType& base,
+                                                  const AddressType& size,
+                                                  const EntryType& entry) {
   return StoreRangeInternal(base, 0 /* delta */, size, entry);
 }
 
 template<typename AddressType, typename EntryType>
 bool RangeMap<AddressType, EntryType>::StoreRangeInternal(
-    const AddressType &base, const AddressType &delta,
-    const AddressType &size, const EntryType &entry) {
+    const AddressType& base, const AddressType& delta,
+    const AddressType& size, const EntryType& entry) {
   AddressType high = base + (size - 1);
 
   // Check for undersize or overflow.
@@ -88,11 +77,28 @@
   MapConstIterator iterator_high = map_.lower_bound(high);
 
   if (iterator_base != iterator_high) {
-    // Some other range begins in the space used by this range.  It may be
+    // Some other range ends in the space used by this range.  It may be
     // contained within the space used by this range, or it may extend lower.
-    // If enable_shrink_down_ is true, shrink the current range down, otherwise
-    // this is an error.
-    if (enable_shrink_down_) {
+    if (merge_strategy_ == MergeRangeStrategy::kTruncateLower) {
+      // kTruncate the range with the lower base address.
+      AddressType other_base = iterator_base->second.base();
+      if (base < other_base) {
+        return StoreRangeInternal(base, delta, other_base - base, entry);
+      } else if (other_base < base) {
+        EntryType other_entry;
+        AddressType other_high, other_size, other_delta;
+        other_high = iterator_base->first;
+        RetrieveRange(other_high, &other_entry, &other_base, &other_delta,
+                      &other_size);
+        map_.erase(iterator_base);
+        map_.insert(
+            MapValue(base - 1, Range(other_base, other_delta, other_entry)));
+        return StoreRangeInternal(base, delta, size, entry);
+      } else {
+        return false;
+      }
+    } else if (merge_strategy_ == MergeRangeStrategy::kTruncateUpper) {
+      // Truncate the lower portion of this range.
       AddressType additional_delta = iterator_base->first - base + 1;
       return StoreRangeInternal(base + additional_delta,
                                 delta + additional_delta,
@@ -112,44 +118,57 @@
     }
   }
 
-  if (iterator_high != map_.end()) {
-    if (iterator_high->second.base() <= high) {
-      // The range above this one overlaps with this one.  It may fully
-      // contain this range, or it may begin within this range and extend
-      // higher.  If enable_shrink_down_ is true, shrink the other range down,
-      // otherwise this is an error.
-      if (enable_shrink_down_ && iterator_high->first > high) {
-        // Shrink the other range down.
-        AddressType other_high = iterator_high->first;
-        AddressType additional_delta =
-            high - iterator_high->second.base() + 1;
+  if (iterator_high != map_.end() && iterator_high->second.base() <= high) {
+    // The range above this one overlaps with this one.  It may fully
+    // contain this range, or it may begin within this range and extend
+    // higher.
+    if (merge_strategy_ == MergeRangeStrategy::kTruncateLower) {
+      AddressType other_base = iterator_high->second.base();
+      if (base < other_base) {
+        return StoreRangeInternal(base, delta, other_base - base, entry);
+      } else if (other_base < base) {
         EntryType other_entry;
-        AddressType other_base = AddressType();
-        AddressType other_size = AddressType();
-        AddressType other_delta = AddressType();
+        AddressType other_high, other_size, other_delta;
+        other_high = iterator_high->first;
         RetrieveRange(other_high, &other_entry, &other_base, &other_delta,
                       &other_size);
         map_.erase(iterator_high);
-        map_.insert(MapValue(other_high,
-                             Range(other_base + additional_delta,
-                                   other_delta + additional_delta,
-                                   other_entry)));
-        // Retry to store this range.
+        map_.insert(
+            MapValue(base - 1, Range(other_base, other_delta, other_entry)));
         return StoreRangeInternal(base, delta, size, entry);
       } else {
-        // The processor hits this case too frequently with common symbol files.
-        // This is most appropriate for a DEBUG channel, but since none exists
-        // now simply comment out this logging.
-        //
-        // AddressType other_base = iterator_high->second.base();
-        // AddressType other_size = iterator_high->first - other_base + 1;
-        // BPLOG(INFO) << "StoreRangeInternal failed, an existing range "
-        //             << "contains or extends higher than the new range: new "
-        //             << HexString(base) << "+" << HexString(size)
-        //             << ", existing " << HexString(other_base) << "+"
-        //             << HexString(other_size);
         return false;
       }
+    } else if (merge_strategy_ == MergeRangeStrategy::kTruncateUpper &&
+               iterator_high->first > high) {
+      // Shrink the other range down.
+      AddressType other_high = iterator_high->first;
+      AddressType additional_delta = high - iterator_high->second.base() + 1;
+      EntryType other_entry;
+      AddressType other_base = AddressType();
+      AddressType other_size = AddressType();
+      AddressType other_delta = AddressType();
+      RetrieveRange(other_high, &other_entry, &other_base, &other_delta,
+                    &other_size);
+      map_.erase(iterator_high);
+      map_.insert(MapValue(other_high,
+                           Range(other_base + additional_delta,
+                                 other_delta + additional_delta, other_entry)));
+      // Retry to store this range.
+      return StoreRangeInternal(base, delta, size, entry);
+    } else {
+      // The processor hits this case too frequently with common symbol files.
+      // This is most appropriate for a DEBUG channel, but since none exists
+      // now simply comment out this logging.
+      //
+      // AddressType other_base = iterator_high->second.base();
+      // AddressType other_size = iterator_high->first - other_base + 1;
+      // BPLOG(INFO) << "StoreRangeInternal failed, an existing range "
+      //             << "contains or extends higher than the new range: new "
+      //             << HexString(base) << "+" << HexString(size)
+      //             << ", existing " << HexString(other_base) << "+"
+      //             << HexString(other_size);
+      return false;
     }
   }
 
@@ -162,8 +181,8 @@
 
 template<typename AddressType, typename EntryType>
 bool RangeMap<AddressType, EntryType>::RetrieveRange(
-    const AddressType &address, EntryType *entry, AddressType *entry_base,
-    AddressType *entry_delta, AddressType *entry_size) const {
+    const AddressType& address, EntryType* entry, AddressType* entry_base,
+    AddressType* entry_delta, AddressType* entry_size) const {
   BPLOG_IF(ERROR, !entry) << "RangeMap::RetrieveRange requires |entry|";
   assert(entry);
 
@@ -193,8 +212,8 @@
 
 template<typename AddressType, typename EntryType>
 bool RangeMap<AddressType, EntryType>::RetrieveNearestRange(
-    const AddressType &address, EntryType *entry, AddressType *entry_base,
-    AddressType *entry_delta, AddressType *entry_size) const {
+    const AddressType& address, EntryType* entry, AddressType* entry_base,
+    AddressType* entry_delta, AddressType* entry_size) const {
   BPLOG_IF(ERROR, !entry) << "RangeMap::RetrieveNearestRange requires |entry|";
   assert(entry);
 
@@ -226,8 +245,8 @@
 
 template<typename AddressType, typename EntryType>
 bool RangeMap<AddressType, EntryType>::RetrieveRangeAtIndex(
-    int index, EntryType *entry, AddressType *entry_base,
-    AddressType *entry_delta, AddressType *entry_size) const {
+    int index, EntryType* entry, AddressType* entry_base,
+    AddressType* entry_delta, AddressType* entry_size) const {
   BPLOG_IF(ERROR, !entry) << "RangeMap::RetrieveRangeAtIndex requires |entry|";
   assert(entry);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_shrink_down_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_shrink_down_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_shrink_down_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_shrink_down_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,355 +0,0 @@
-// Copyright (c) 2016, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
-
-// range_map_shrink_down_unittest.cc: Unit tests for RangeMap that specifically
-// test shrink down when ranges overlap.
-//
-// Author: Ivan Penkov
-
-#include <limits.h>
-#include <stdio.h>
-
-#include "processor/range_map-inl.h"
-
-#include "breakpad_googletest_includes.h"
-#include "common/scoped_ptr.h"
-#include "processor/linked_ptr.h"
-#include "processor/logging.h"
-
-namespace {
-
-using google_breakpad::linked_ptr;
-using google_breakpad::scoped_ptr;
-using google_breakpad::RangeMap;
-
-// A CountedObject holds an int.  A global (not thread safe!) count of
-// allocated CountedObjects is maintained to help test memory management.
-class CountedObject {
- public:
-  explicit CountedObject(int id) : id_(id) { ++count_; }
-  ~CountedObject() { --count_; }
-
-  static int count() { return count_; }
-  int id() const { return id_; }
-
- private:
-  static int count_;
-  int id_;
-};
-
-int CountedObject::count_;
-
-typedef int AddressType;
-typedef RangeMap<AddressType, linked_ptr<CountedObject>> TestMap;
-
-// Same range cannot be stored wice.
-TEST(RangeMap, TestShinkDown_SameRange) {
-  TestMap range_map;
-  range_map.SetEnableShrinkDown(true);
-  linked_ptr<CountedObject> object_1(new CountedObject(1));
-  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
-                                   object_1));
-
-  // Same range cannot be stored wice.
-  linked_ptr<CountedObject> object_2(new CountedObject(2));
-  EXPECT_FALSE(range_map.StoreRange(0 /* base address */, 100 /* size */,
-                                    object_2));
-}
-
-// If a range is completely contained by another range, then the larger range
-// should be shrinked down.
-TEST(RangeMap, TestShinkDown_CompletelyContained) {
-  TestMap range_map;
-  range_map.SetEnableShrinkDown(true);
-  // Larger range is added first.
-  linked_ptr<CountedObject> object_1(new CountedObject(1));
-  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
-                                   object_1));
-  // Smaller (contained) range is added second.
-  linked_ptr<CountedObject> object_2(new CountedObject(2));
-  EXPECT_TRUE(range_map.StoreRange(10 /* base address */, 80 /* size */,
-                                   object_2));
-  linked_ptr<CountedObject> object;
-  AddressType retrieved_base = AddressType();
-  AddressType retrieved_delta = AddressType();
-  AddressType retrieved_size = AddressType();
-  // The first range contains the second, so the first range should have been
-  // shrunk to [90, 99].  Range [0, 9] should be free.
-  EXPECT_FALSE(range_map.RetrieveRange(0, &object, &retrieved_base,
-                                       &retrieved_delta, &retrieved_size));
-  EXPECT_FALSE(range_map.RetrieveRange(9, &object, &retrieved_base,
-                                       &retrieved_delta, &retrieved_size));
-  EXPECT_TRUE(range_map.RetrieveRange(90, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(1, object->id());
-  EXPECT_EQ(90, retrieved_base);
-  EXPECT_EQ(90, retrieved_delta);
-  EXPECT_EQ(10, retrieved_size);
-  // Validate the properties of the smaller range (should be untouched).
-  EXPECT_TRUE(range_map.RetrieveRange(10, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(2, object->id());
-  EXPECT_EQ(10, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(80, retrieved_size);
-}
-
-// Same as the previous test, however the larger range is added second.
-TEST(RangeMap, TestShinkDown_CompletelyContained_LargerAddedSecond) {
-  TestMap range_map;
-  range_map.SetEnableShrinkDown(true);
-  // Smaller (contained) range is added first.
-  linked_ptr<CountedObject> object_1(new CountedObject(1));
-  EXPECT_TRUE(range_map.StoreRange(10 /* base address */, 80 /* size */,
-                                   object_1));
-  // Larger range is added second.
-  linked_ptr<CountedObject> object_2(new CountedObject(2));
-  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
-                                   object_2));
-  linked_ptr<CountedObject> object;
-  AddressType retrieved_base = AddressType();
-  AddressType retrieved_delta = AddressType();
-  AddressType retrieved_size = AddressType();
-  // The second range contains the first, so the second range should have been
-  // shrunk to [90, 99].  Range [0, 9] should be free.
-  EXPECT_FALSE(range_map.RetrieveRange(0, &object, &retrieved_base,
-                                       &retrieved_delta, &retrieved_size));
-  EXPECT_FALSE(range_map.RetrieveRange(9, &object, &retrieved_base,
-                                       &retrieved_delta, &retrieved_size));
-  EXPECT_TRUE(range_map.RetrieveRange(90, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(2, object->id());
-  EXPECT_EQ(90, retrieved_base);
-  EXPECT_EQ(90, retrieved_delta);
-  EXPECT_EQ(10, retrieved_size);
-  // Validate the properties of the smaller range (should be untouched).
-  EXPECT_TRUE(range_map.RetrieveRange(10, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(1, object->id());
-  EXPECT_EQ(10, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(80, retrieved_size);
-}
-
-TEST(RangeMap, TestShinkDown_PartialOverlap_AtBeginning) {
-  TestMap range_map;
-  range_map.SetEnableShrinkDown(true);
-  linked_ptr<CountedObject> object_1(new CountedObject(1));
-  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
-                                   object_1));
-
-  // Partial overlap at the beginning of the new range.
-  linked_ptr<CountedObject> object_2(new CountedObject(2));
-  EXPECT_TRUE(range_map.StoreRange(90 /* base address */, 110 /* size */,
-                                   object_2));
-
-  linked_ptr<CountedObject> object;
-  AddressType retrieved_base = AddressType();
-  AddressType retrieved_delta = AddressType();
-  AddressType retrieved_size = AddressType();
-  // The second range is supposed to be shrunk down so the following address
-  // should resize in the first range.
-  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(1, object->id());
-  EXPECT_EQ(0, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(100, retrieved_size);
-  // Validate the properties of the shrunk down range.
-  EXPECT_TRUE(range_map.RetrieveRange(100, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(2, object->id());
-  EXPECT_EQ(100, retrieved_base);
-  EXPECT_EQ(10, retrieved_delta);
-  EXPECT_EQ(100, retrieved_size);
-}
-
-TEST(RangeMap, TestShinkDown_PartialOverlap_AtEnd) {
-  TestMap range_map;
-  range_map.SetEnableShrinkDown(true);
-  linked_ptr<CountedObject> object_1(new CountedObject(1));
-  EXPECT_TRUE(range_map.StoreRange(50 /* base address */, 50 /* size */,
-                                   object_1));
-
-  // Partial overlap at the end of the new range.
-  linked_ptr<CountedObject> object_2(new CountedObject(2));
-  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 70 /* size */,
-                                   object_2));
-
-  linked_ptr<CountedObject> object;
-  AddressType retrieved_base = AddressType();
-  AddressType retrieved_delta = AddressType();
-  AddressType retrieved_size = AddressType();
-  // The first range is supposed to be shrunk down so the following address
-  // should resize in the first range.
-  EXPECT_TRUE(range_map.RetrieveRange(69, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(2, object->id());
-  EXPECT_EQ(0, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(70, retrieved_size);
-  // Validate the properties of the shrunk down range.
-  EXPECT_TRUE(range_map.RetrieveRange(70, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(1, object->id());
-  EXPECT_EQ(70, retrieved_base);
-  EXPECT_EQ(20, retrieved_delta);
-  EXPECT_EQ(30, retrieved_size);
-}
-
-// A new range is overlapped at both ends.  The new range and the range
-// that overlaps at the end should be shrink.  The range that overlaps at the
-// beginning should be left untouched.
-TEST(RangeMap, TestShinkDown_OverlapAtBothEnds) {
-  TestMap range_map;
-  range_map.SetEnableShrinkDown(true);
-  // This should overlap object_3 at the beginning.
-  linked_ptr<CountedObject> object_1(new CountedObject(1));
-  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
-                                   object_1));
-
-  // This should overlap object_3 at the end.
-  linked_ptr<CountedObject> object_2(new CountedObject(2));
-  EXPECT_TRUE(range_map.StoreRange(100 /* base address */, 100 /* size */,
-                                   object_2));
-
-  // This should be overlapped on both ends by object_1 and object_2.
-  linked_ptr<CountedObject> object_3(new CountedObject(3));
-  EXPECT_TRUE(range_map.StoreRange(50 /* base address */, 100 /* size */,
-                                   object_3));
-
-  linked_ptr<CountedObject> object;
-  AddressType retrieved_base = AddressType();
-  AddressType retrieved_delta = AddressType();
-  AddressType retrieved_size = AddressType();
-  // The first range should be intact.
-  EXPECT_TRUE(range_map.RetrieveRange(0, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(1, object->id());
-  EXPECT_EQ(0, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(100, retrieved_size);
-  // The second range should be shrunk down by 50.
-  EXPECT_TRUE(range_map.RetrieveRange(150, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(2, object->id());
-  EXPECT_EQ(150, retrieved_base);
-  EXPECT_EQ(50, retrieved_delta);
-  EXPECT_EQ(50, retrieved_size);
-  // The third range (in the middle) should be shrunk down by 50.
-  EXPECT_TRUE(range_map.RetrieveRange(100, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(3, object->id());
-  EXPECT_EQ(100, retrieved_base);
-  EXPECT_EQ(50, retrieved_delta);
-  EXPECT_EQ(50, retrieved_size);
-}
-
-TEST(RangeMap, TestShinkDown_MultipleConflicts) {
-  TestMap range_map;
-  range_map.SetEnableShrinkDown(true);
-  // This should overlap with object_3.
-  linked_ptr<CountedObject> object_1(new CountedObject(1));
-  EXPECT_TRUE(range_map.StoreRange(10 /* base address */, 90 /* size */,
-                                   object_1));
-
-  // This should also overlap with object_3 but after object_1.
-  linked_ptr<CountedObject> object_2(new CountedObject(2));
-  EXPECT_TRUE(range_map.StoreRange(100 /* base address */, 100 /* size */,
-                                   object_2));
-
-  // This should be overlapped on both object_1 and object_2.  Since
-  // object_3 ends with the higher address it must be shrunk.
-  linked_ptr<CountedObject> object_3(new CountedObject(3));
-  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 300 /* size */,
-                                   object_3));
-
-  linked_ptr<CountedObject> object;
-  AddressType retrieved_base = AddressType();
-  AddressType retrieved_delta = AddressType();
-  AddressType retrieved_size = AddressType();
-  // The first range should be intact.
-  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(1, object->id());
-  EXPECT_EQ(10, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(90, retrieved_size);
-  // The second range should be intact.
-  EXPECT_TRUE(range_map.RetrieveRange(199, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(2, object->id());
-  EXPECT_EQ(100, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(100, retrieved_size);
-  // The third range should be shrunk down by 200.
-  EXPECT_TRUE(range_map.RetrieveRange(299, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(3, object->id());
-  EXPECT_EQ(200, retrieved_base);
-  EXPECT_EQ(200, retrieved_delta);
-  EXPECT_EQ(100, retrieved_size);
-}
-
-// Adding two ranges without overlap should succeed and the ranges should
-// be left intact.
-TEST(RangeMap, TestShinkDown_NoConflicts) {
-  TestMap range_map;
-  range_map.SetEnableShrinkDown(true);
-  // Adding range 1.
-  linked_ptr<CountedObject> object_1(new CountedObject(1));
-  EXPECT_TRUE(range_map.StoreRange(10 /* base address */, 90 /* size */,
-                                   object_1));
-
-  // Adding range 2 - no overlap with range 1.
-  linked_ptr<CountedObject> object_2(new CountedObject(2));
-  EXPECT_TRUE(range_map.StoreRange(110 /* base address */, 90 /* size */,
-                                   object_2));
-
-  linked_ptr<CountedObject> object;
-  AddressType retrieved_base = AddressType();
-  AddressType retrieved_delta = AddressType();
-  AddressType retrieved_size = AddressType();
-  // The first range should be intact.
-  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(1, object->id());
-  EXPECT_EQ(10, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(90, retrieved_size);
-  // The second range should be intact.
-  EXPECT_TRUE(range_map.RetrieveRange(199, &object, &retrieved_base,
-                                      &retrieved_delta, &retrieved_size));
-  EXPECT_EQ(2, object->id());
-  EXPECT_EQ(110, retrieved_base);
-  EXPECT_EQ(0, retrieved_delta);
-  EXPECT_EQ(90, retrieved_size);
-}
-
-}  // namespace
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_truncate_lower_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_truncate_lower_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_truncate_lower_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_truncate_lower_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,346 @@
+// Copyright (c) 2019, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
+
+#include <limits.h>
+#include <stdio.h>
+
+#include "processor/range_map-inl.h"
+
+#include "breakpad_googletest_includes.h"
+#include "processor/linked_ptr.h"
+#include "processor/logging.h"
+
+namespace {
+
+using google_breakpad::linked_ptr;
+using google_breakpad::MergeRangeStrategy;
+using google_breakpad::RangeMap;
+
+// A CountedObject holds an int.  A global (not thread safe!) count of
+// allocated CountedObjects is maintained to help test memory management.
+class CountedObject {
+ public:
+  explicit CountedObject(int id) : id_(id) { ++count_; }
+  ~CountedObject() { --count_; }
+
+  static int count() { return count_; }
+  int id() const { return id_; }
+
+ private:
+  static int count_;
+  int id_;
+};
+
+int CountedObject::count_;
+
+typedef int AddressType;
+typedef RangeMap<AddressType, linked_ptr<CountedObject>> TestMap;
+
+// Same range cannot be stored wice.
+TEST(RangeMapTruncateLower, SameRange) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(
+      range_map.StoreRange(0 /* base address */, 100 /* size */, object_1));
+
+  // Same range cannot be stored wice.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_FALSE(
+      range_map.StoreRange(0 /* base address */, 100 /* size */, object_2));
+}
+
+// If a range is completely contained by another range, then the larger range
+// should be truncated.
+TEST(RangeMapTruncateLower, CompletelyContained) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  // Larger range is added first.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(
+      range_map.StoreRange(0 /* base address */, 100 /* size */, object_1));
+  // Smaller (contained) range is added second.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(
+      range_map.StoreRange(10 /* base address */, 80 /* size */, object_2));
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range contains the second, so the first range should have been
+  // shrunk to [0, 10].  Range [90, 99] should be free.
+  EXPECT_FALSE(range_map.RetrieveRange(90, &object, &retrieved_base,
+                                       &retrieved_delta, &retrieved_size));
+  EXPECT_FALSE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                       &retrieved_delta, &retrieved_size));
+  EXPECT_TRUE(range_map.RetrieveRange(9, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(10, retrieved_size);
+  // Validate the properties of the smaller range (should be untouched).
+  EXPECT_TRUE(range_map.RetrieveRange(10, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(10, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(80, retrieved_size);
+}
+
+// Same as the previous test, however the larger range is added second.
+TEST(RangeMapTruncateLower, CompletelyContained_LargerAddedSecond) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  // Smaller (contained) range is added first.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(
+      range_map.StoreRange(10 /* base address */, 80 /* size */, object_1));
+  // Larger range is added second.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(
+      range_map.StoreRange(0 /* base address */, 100 /* size */, object_2));
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The second range contains the first, so the second range should have been
+  // truncated to [0, 9].  Range [90, 99] should be free.
+  EXPECT_FALSE(range_map.RetrieveRange(90, &object, &retrieved_base,
+                                       &retrieved_delta, &retrieved_size));
+  EXPECT_FALSE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                       &retrieved_delta, &retrieved_size));
+  EXPECT_TRUE(range_map.RetrieveRange(9, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(10, retrieved_size);
+  // Validate the properties of the smaller range (should be untouched).
+  EXPECT_TRUE(range_map.RetrieveRange(10, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(10, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(80, retrieved_size);
+}
+
+TEST(RangeMapTruncateLower, PartialOverlap_AtBeginning) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(
+      range_map.StoreRange(0 /* base address */, 100 /* size */, object_1));
+
+  // Partial overlap at the beginning of the new range.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(
+      range_map.StoreRange(90 /* base address */, 110 /* size */, object_2));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range should be truncated, so 99 should address the second range.
+  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(90, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(110, retrieved_size);
+  // Validate the properties of the truncated range.
+  EXPECT_TRUE(range_map.RetrieveRange(89, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(90, retrieved_size);
+}
+
+TEST(RangeMapTruncateLower, PartialOverlap_AtEnd) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(
+      range_map.StoreRange(50 /* base address */, 50 /* size */, object_1));
+
+  // Partial overlap at the end of the new range.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(
+      range_map.StoreRange(0 /* base address */, 70 /* size */, object_2));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The second range should be truncated so 69 addresses the first range.
+  EXPECT_TRUE(range_map.RetrieveRange(69, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(50, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(50, retrieved_size);
+  // Validate the properties of the truncated range.
+  EXPECT_TRUE(range_map.RetrieveRange(49, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(50, retrieved_size);
+}
+
+// A new range is overlapped at both ends.  The new range and the range
+// that overlaps at the beginning should be truncated.  The range that overlaps
+// at the end should be left untouched.
+TEST(RangeMapTruncateLower, OverlapAtBothEnds) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  // This should overlap object_3 at the beginning.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(
+      range_map.StoreRange(0 /* base address */, 100 /* size */, object_1));
+
+  // This should overlap object_3 at the end.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(
+      range_map.StoreRange(100 /* base address */, 100 /* size */, object_2));
+
+  // This should be overlapped on both ends by object_1 and object_2.
+  linked_ptr<CountedObject> object_3(new CountedObject(3));
+  EXPECT_TRUE(
+      range_map.StoreRange(50 /* base address */, 100 /* size */, object_3));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range should be truncated.
+  EXPECT_TRUE(range_map.RetrieveRange(0, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(50, retrieved_size);
+  // The second range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(150, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(100, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(100, retrieved_size);
+  // The third range (in the middle) should be truncated.
+  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(3, object->id());
+  EXPECT_EQ(50, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(50, retrieved_size);
+}
+
+TEST(RangeMapTruncateLower, MultipleConflicts) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  // This should overlap with object_3.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(
+      range_map.StoreRange(10 /* base address */, 90 /* size */, object_1));
+
+  // This should also overlap with object_3 but after object_1.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(
+      range_map.StoreRange(100 /* base address */, 100 /* size */, object_2));
+
+  // This should be overlapped on both object_1 and object_2.
+  linked_ptr<CountedObject> object_3(new CountedObject(3));
+  EXPECT_TRUE(
+      range_map.StoreRange(0 /* base address */, 300 /* size */, object_3));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(10, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(90, retrieved_size);
+  // The second range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(199, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(100, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(100, retrieved_size);
+  // The third range should be truncated.
+  EXPECT_TRUE(range_map.RetrieveRange(9, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(3, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(10, retrieved_size);
+}
+
+// Adding two ranges without overlap should succeed and the ranges should
+// be left intact.
+TEST(RangeMapTruncateLower, NoConflicts) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateLower);
+  // Adding range 1.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(
+      range_map.StoreRange(10 /* base address */, 90 /* size */, object_1));
+
+  // Adding range 2 - no overlap with range 1.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(
+      range_map.StoreRange(110 /* base address */, 90 /* size */, object_2));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(10, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(90, retrieved_size);
+  // The second range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(199, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(110, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(90, retrieved_size);
+}
+
+}  // namespace
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_truncate_upper_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_truncate_upper_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_truncate_upper_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_truncate_upper_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,354 @@
+// Copyright (c) 2016, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
+
+// range_map_shrink_down_unittest.cc: Unit tests for RangeMap that specifically
+// test shrink down when ranges overlap.
+//
+// Author: Ivan Penkov
+
+#include <limits.h>
+#include <stdio.h>
+
+#include "processor/range_map-inl.h"
+
+#include "breakpad_googletest_includes.h"
+#include "processor/linked_ptr.h"
+#include "processor/logging.h"
+
+namespace {
+
+using google_breakpad::linked_ptr;
+using google_breakpad::MergeRangeStrategy;
+using google_breakpad::RangeMap;
+
+// A CountedObject holds an int.  A global (not thread safe!) count of
+// allocated CountedObjects is maintained to help test memory management.
+class CountedObject {
+ public:
+  explicit CountedObject(int id) : id_(id) { ++count_; }
+  ~CountedObject() { --count_; }
+
+  static int count() { return count_; }
+  int id() const { return id_; }
+
+ private:
+  static int count_;
+  int id_;
+};
+
+int CountedObject::count_;
+
+typedef int AddressType;
+typedef RangeMap<AddressType, linked_ptr<CountedObject>> TestMap;
+
+// Same range cannot be stored wice.
+TEST(RangeMapTruncateUpper, SameRange) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateUpper);
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
+                                   object_1));
+
+  // Same range cannot be stored wice.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_FALSE(range_map.StoreRange(0 /* base address */, 100 /* size */,
+                                    object_2));
+}
+
+// If a range is completely contained by another range, then the larger range
+// should be shrinked down.
+TEST(RangeMapTruncateUpper, CompletelyContained) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateUpper);
+  // Larger range is added first.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
+                                   object_1));
+  // Smaller (contained) range is added second.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(range_map.StoreRange(10 /* base address */, 80 /* size */,
+                                   object_2));
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range contains the second, so the first range should have been
+  // shrunk to [90, 99].  Range [0, 9] should be free.
+  EXPECT_FALSE(range_map.RetrieveRange(0, &object, &retrieved_base,
+                                       &retrieved_delta, &retrieved_size));
+  EXPECT_FALSE(range_map.RetrieveRange(9, &object, &retrieved_base,
+                                       &retrieved_delta, &retrieved_size));
+  EXPECT_TRUE(range_map.RetrieveRange(90, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(90, retrieved_base);
+  EXPECT_EQ(90, retrieved_delta);
+  EXPECT_EQ(10, retrieved_size);
+  // Validate the properties of the smaller range (should be untouched).
+  EXPECT_TRUE(range_map.RetrieveRange(10, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(10, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(80, retrieved_size);
+}
+
+// Same as the previous test, however the larger range is added second.
+TEST(RangeMapTruncateUpper, CompletelyContained_LargerAddedSecond) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateUpper);
+  // Smaller (contained) range is added first.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(range_map.StoreRange(10 /* base address */, 80 /* size */,
+                                   object_1));
+  // Larger range is added second.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
+                                   object_2));
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The second range contains the first, so the second range should have been
+  // shrunk to [90, 99].  Range [0, 9] should be free.
+  EXPECT_FALSE(range_map.RetrieveRange(0, &object, &retrieved_base,
+                                       &retrieved_delta, &retrieved_size));
+  EXPECT_FALSE(range_map.RetrieveRange(9, &object, &retrieved_base,
+                                       &retrieved_delta, &retrieved_size));
+  EXPECT_TRUE(range_map.RetrieveRange(90, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(90, retrieved_base);
+  EXPECT_EQ(90, retrieved_delta);
+  EXPECT_EQ(10, retrieved_size);
+  // Validate the properties of the smaller range (should be untouched).
+  EXPECT_TRUE(range_map.RetrieveRange(10, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(10, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(80, retrieved_size);
+}
+
+TEST(RangeMapTruncateUpper, PartialOverlap_AtBeginning) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateUpper);
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
+                                   object_1));
+
+  // Partial overlap at the beginning of the new range.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(range_map.StoreRange(90 /* base address */, 110 /* size */,
+                                   object_2));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The second range is supposed to be shrunk down so the following address
+  // should resize in the first range.
+  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(100, retrieved_size);
+  // Validate the properties of the shrunk down range.
+  EXPECT_TRUE(range_map.RetrieveRange(100, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(100, retrieved_base);
+  EXPECT_EQ(10, retrieved_delta);
+  EXPECT_EQ(100, retrieved_size);
+}
+
+TEST(RangeMapTruncateUpper, PartialOverlap_AtEnd) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateUpper);
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(range_map.StoreRange(50 /* base address */, 50 /* size */,
+                                   object_1));
+
+  // Partial overlap at the end of the new range.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 70 /* size */,
+                                   object_2));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range is supposed to be shrunk down so the following address
+  // should resize in the first range.
+  EXPECT_TRUE(range_map.RetrieveRange(69, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(70, retrieved_size);
+  // Validate the properties of the shrunk down range.
+  EXPECT_TRUE(range_map.RetrieveRange(70, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(70, retrieved_base);
+  EXPECT_EQ(20, retrieved_delta);
+  EXPECT_EQ(30, retrieved_size);
+}
+
+// A new range is overlapped at both ends.  The new range and the range
+// that overlaps at the end should be shrink.  The range that overlaps at the
+// beginning should be left untouched.
+TEST(RangeMapTruncateUpper, OverlapAtBothEnds) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateUpper);
+  // This should overlap object_3 at the beginning.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 100 /* size */,
+                                   object_1));
+
+  // This should overlap object_3 at the end.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(range_map.StoreRange(100 /* base address */, 100 /* size */,
+                                   object_2));
+
+  // This should be overlapped on both ends by object_1 and object_2.
+  linked_ptr<CountedObject> object_3(new CountedObject(3));
+  EXPECT_TRUE(range_map.StoreRange(50 /* base address */, 100 /* size */,
+                                   object_3));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(0, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(0, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(100, retrieved_size);
+  // The second range should be shrunk down by 50.
+  EXPECT_TRUE(range_map.RetrieveRange(150, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(150, retrieved_base);
+  EXPECT_EQ(50, retrieved_delta);
+  EXPECT_EQ(50, retrieved_size);
+  // The third range (in the middle) should be shrunk down by 50.
+  EXPECT_TRUE(range_map.RetrieveRange(100, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(3, object->id());
+  EXPECT_EQ(100, retrieved_base);
+  EXPECT_EQ(50, retrieved_delta);
+  EXPECT_EQ(50, retrieved_size);
+}
+
+TEST(RangeMapTruncateUpper, MultipleConflicts) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateUpper);
+  // This should overlap with object_3.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(range_map.StoreRange(10 /* base address */, 90 /* size */,
+                                   object_1));
+
+  // This should also overlap with object_3 but after object_1.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(range_map.StoreRange(100 /* base address */, 100 /* size */,
+                                   object_2));
+
+  // This should be overlapped on both object_1 and object_2.  Since
+  // object_3 ends with the higher address it must be shrunk.
+  linked_ptr<CountedObject> object_3(new CountedObject(3));
+  EXPECT_TRUE(range_map.StoreRange(0 /* base address */, 300 /* size */,
+                                   object_3));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(10, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(90, retrieved_size);
+  // The second range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(199, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(100, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(100, retrieved_size);
+  // The third range should be shrunk down by 200.
+  EXPECT_TRUE(range_map.RetrieveRange(299, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(3, object->id());
+  EXPECT_EQ(200, retrieved_base);
+  EXPECT_EQ(200, retrieved_delta);
+  EXPECT_EQ(100, retrieved_size);
+}
+
+// Adding two ranges without overlap should succeed and the ranges should
+// be left intact.
+TEST(RangeMapTruncateUpper, NoConflicts) {
+  TestMap range_map;
+  range_map.SetMergeStrategy(MergeRangeStrategy::kTruncateUpper);
+  // Adding range 1.
+  linked_ptr<CountedObject> object_1(new CountedObject(1));
+  EXPECT_TRUE(range_map.StoreRange(10 /* base address */, 90 /* size */,
+                                   object_1));
+
+  // Adding range 2 - no overlap with range 1.
+  linked_ptr<CountedObject> object_2(new CountedObject(2));
+  EXPECT_TRUE(range_map.StoreRange(110 /* base address */, 90 /* size */,
+                                   object_2));
+
+  linked_ptr<CountedObject> object;
+  AddressType retrieved_base = AddressType();
+  AddressType retrieved_delta = AddressType();
+  AddressType retrieved_size = AddressType();
+  // The first range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(99, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(1, object->id());
+  EXPECT_EQ(10, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(90, retrieved_size);
+  // The second range should be intact.
+  EXPECT_TRUE(range_map.RetrieveRange(199, &object, &retrieved_base,
+                                      &retrieved_delta, &retrieved_size));
+  EXPECT_EQ(2, object->id());
+  EXPECT_EQ(110, retrieved_base);
+  EXPECT_EQ(0, retrieved_delta);
+  EXPECT_EQ(90, retrieved_size);
+}
+
+}  // namespace
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/range_map_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -92,7 +92,7 @@
 // sequence on the same RangeMap.
 struct RangeTestSet {
   // An array of RangeTests
-  const RangeTest *range_tests;
+  const RangeTest* range_tests;
 
   // The number of tests in the set
   unsigned int range_test_count;
@@ -102,7 +102,7 @@
 // StoreTest uses the data in a RangeTest and calls StoreRange on the
 // test RangeMap.  It returns true if the expected result occurred, and
 // false if something else happened.
-static bool StoreTest(TestMap *range_map, const RangeTest *range_test) {
+static bool StoreTest(TestMap* range_map, const RangeTest* range_test) {
   linked_ptr<CountedObject> object(new CountedObject(range_test->id));
   bool stored = range_map->StoreRange(range_test->address,
                                       range_test->size,
@@ -126,7 +126,7 @@
 // map entry at the specified range,) it returns true, otherwise, it returns
 // false.  RetrieveTest will check the values around the base address and
 // the high address of a range to guard against off-by-one errors.
-static bool RetrieveTest(TestMap *range_map, const RangeTest *range_test) {
+static bool RetrieveTest(TestMap* range_map, const RangeTest* range_test) {
   for (unsigned int side = 0; side <= 1; ++side) {
     // When side == 0, check the low side (base address) of each range.
     // When side == 1, check the high side (base + size) of each range.
@@ -270,9 +270,9 @@
 // and verifying that each call returns a different object than the previous
 // call, and that ranges are returned with increasing base addresses.  Returns
 // false if the test fails.
-static bool RetrieveIndexTest(TestMap *range_map, int set) {
+static bool RetrieveIndexTest(TestMap* range_map, int set) {
   linked_ptr<CountedObject> object;
-  CountedObject *last_object = NULL;
+  CountedObject* last_object = NULL;
   AddressType last_base = 0;
 
   int object_count = range_map->GetCount();
@@ -469,7 +469,7 @@
   for (unsigned int range_test_set_index = 0;
        range_test_set_index < range_test_set_count;
        ++range_test_set_index) {
-    const RangeTest *range_tests =
+    const RangeTest* range_tests =
         range_test_sets[range_test_set_index].range_tests;
     unsigned int range_test_count =
         range_test_sets[range_test_set_index].range_test_count;
@@ -480,7 +480,7 @@
     for (unsigned int range_test_index = 0;
          range_test_index < range_test_count;
          ++range_test_index) {
-      const RangeTest *range_test = &range_tests[range_test_index];
+      const RangeTest* range_test = &range_tests[range_test_index];
       if (!StoreTest(range_map.get(), range_test))
         return false;
 
@@ -512,7 +512,7 @@
     for (unsigned int range_test_index = 0;
          range_test_index < range_test_count;
          ++range_test_index) {
-      const RangeTest *range_test = &range_tests[range_test_index];
+      const RangeTest* range_test = &range_tests[range_test_index];
       if (!RetrieveTest(range_map.get(), range_test))
         return false;
     }
@@ -552,7 +552,7 @@
 }  // namespace
 
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   BPLOG_INIT(&argc, &argv);
 
   return RunTests() ? 0 : 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_serializer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_serializer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_serializer.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_serializer.h	2021-12-09 12:01:26.000000000 +0000
@@ -49,10 +49,10 @@
 template<class Type> class SimpleSerializer {
  public:
   // Calculate and return the size of the 'item'.
-  static size_t SizeOf(const Type &item) { return sizeof(item); }
+  static size_t SizeOf(const Type& item) { return sizeof(item); }
   // Write 'item' to memory location 'dest', and return to the "end" address of
   // data written, i.e., the address after the final byte written.
-  static char *Write(const Type &item, char *dest) {
+  static char* Write(const Type& item, char* dest) {
     new (dest) Type(item);
     return dest + SizeOf(item);
   }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_serializer-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_serializer-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_serializer-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_serializer-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -56,12 +56,12 @@
  public:
   static size_t SizeOf(bool boolean) { return 1; }
 
-  static char *Write(bool boolean, char *dest) {
+  static char* Write(bool boolean, char* dest) {
     *dest = static_cast<char>(boolean? 255 : 0);
     return ++dest;
   }
 
-  static const char *Read(const char *source, bool *value) {
+  static const char* Read(const char* source, bool* value) {
     *value = ((*source) == 0 ? false : true);
     return ++source;
   }
@@ -71,9 +71,9 @@
 template<>
 class SimpleSerializer<string> {
  public:
-  static size_t SizeOf(const string &str) { return str.size() + 1; }
+  static size_t SizeOf(const string& str) { return str.size() + 1; }
 
-  static char *Write(const string &str, char *dest) {
+  static char* Write(const string& str, char* dest) {
     strcpy(dest, str.c_str());
     return dest + SizeOf(str);
   }
@@ -83,11 +83,11 @@
 template<>
 class SimpleSerializer<const char*> {
  public:
-  static size_t SizeOf(const char *cstring) {
+  static size_t SizeOf(const char* cstring) {
     return strlen(cstring) + 1;
   }
 
-  static char *Write(const char *cstring, char *dest) {
+  static char* Write(const char* cstring, char* dest) {
     strcpy(dest, cstring);
     return dest + SizeOf(cstring);
   }
@@ -98,13 +98,13 @@
 class SimpleSerializer<BasicSourceLineResolver::Line> {
   typedef BasicSourceLineResolver::Line Line;
  public:
-  static size_t SizeOf(const Line &line) {
+  static size_t SizeOf(const Line& line) {
     return SimpleSerializer<MemAddr>::SizeOf(line.address)
          + SimpleSerializer<MemAddr>::SizeOf(line.size)
          + SimpleSerializer<int32_t>::SizeOf(line.source_file_id)
          + SimpleSerializer<int32_t>::SizeOf(line.line);
   }
-  static char *Write(const Line &line, char *dest) {
+  static char* Write(const Line& line, char* dest) {
     dest = SimpleSerializer<MemAddr>::Write(line.address, dest);
     dest = SimpleSerializer<MemAddr>::Write(line.size, dest);
     dest = SimpleSerializer<int32_t>::Write(line.source_file_id, dest);
@@ -118,12 +118,12 @@
 class SimpleSerializer<BasicSourceLineResolver::PublicSymbol> {
   typedef BasicSourceLineResolver::PublicSymbol PublicSymbol;
  public:
-  static size_t SizeOf(const PublicSymbol &pubsymbol) {
+  static size_t SizeOf(const PublicSymbol& pubsymbol) {
     return SimpleSerializer<string>::SizeOf(pubsymbol.name)
          + SimpleSerializer<MemAddr>::SizeOf(pubsymbol.address)
          + SimpleSerializer<int32_t>::SizeOf(pubsymbol.parameter_size);
   }
-  static char *Write(const PublicSymbol &pubsymbol, char *dest) {
+  static char* Write(const PublicSymbol& pubsymbol, char* dest) {
     dest = SimpleSerializer<string>::Write(pubsymbol.name, dest);
     dest = SimpleSerializer<MemAddr>::Write(pubsymbol.address, dest);
     dest = SimpleSerializer<int32_t>::Write(pubsymbol.parameter_size, dest);
@@ -135,7 +135,7 @@
 template<>
 class SimpleSerializer<WindowsFrameInfo> {
  public:
-  static size_t SizeOf(const WindowsFrameInfo &wfi) {
+  static size_t SizeOf(const WindowsFrameInfo& wfi) {
     unsigned int size = 0;
     size += sizeof(int32_t);  // wfi.type_
     size += SimpleSerializer<int32_t>::SizeOf(wfi.valid);
@@ -149,7 +149,7 @@
     size += SimpleSerializer<string>::SizeOf(wfi.program_string);
     return size;
   }
-  static char *Write(const WindowsFrameInfo &wfi, char *dest) {
+  static char* Write(const WindowsFrameInfo& wfi, char* dest) {
     dest = SimpleSerializer<int32_t>::Write(
         static_cast<const int32_t>(wfi.type_), dest);
     dest = SimpleSerializer<int32_t>::Write(wfi.valid, dest);
@@ -170,11 +170,11 @@
 class SimpleSerializer< linked_ptr<BasicSourceLineResolver::Line> > {
   typedef BasicSourceLineResolver::Line Line;
  public:
-  static size_t SizeOf(const linked_ptr<Line> &lineptr) {
+  static size_t SizeOf(const linked_ptr<Line>& lineptr) {
     if (lineptr.get() == NULL) return 0;
     return SimpleSerializer<Line>::SizeOf(*(lineptr.get()));
   }
-  static char *Write(const linked_ptr<Line> &lineptr, char *dest) {
+  static char* Write(const linked_ptr<Line>& lineptr, char* dest) {
     if (lineptr.get())
       dest = SimpleSerializer<Line>::Write(*(lineptr.get()), dest);
     return dest;
@@ -187,7 +187,7 @@
   typedef BasicSourceLineResolver::Function Function;
   typedef BasicSourceLineResolver::Line Line;
  public:
-  static size_t SizeOf(const Function &func) {
+  static size_t SizeOf(const Function& func) {
     unsigned int size = 0;
     size += SimpleSerializer<string>::SizeOf(func.name);
     size += SimpleSerializer<MemAddr>::SizeOf(func.address);
@@ -197,7 +197,7 @@
     return size;
   }
 
-  static char *Write(const Function &func, char *dest) {
+  static char* Write(const Function& func, char* dest) {
     dest = SimpleSerializer<string>::Write(func.name, dest);
     dest = SimpleSerializer<MemAddr>::Write(func.address, dest);
     dest = SimpleSerializer<MemAddr>::Write(func.size, dest);
@@ -214,12 +214,12 @@
 class SimpleSerializer< linked_ptr<BasicSourceLineResolver::Function> > {
   typedef BasicSourceLineResolver::Function Function;
  public:
-  static size_t SizeOf(const linked_ptr<Function> &func) {
+  static size_t SizeOf(const linked_ptr<Function>& func) {
     if (!func.get()) return 0;
     return SimpleSerializer<Function>::SizeOf(*(func.get()));
   }
 
-  static char *Write(const linked_ptr<Function> &func, char *dest) {
+  static char* Write(const linked_ptr<Function>& func, char* dest) {
     if (func.get())
       dest = SimpleSerializer<Function>::Write(*(func.get()), dest);
     return dest;
@@ -230,11 +230,11 @@
 class SimpleSerializer< linked_ptr<BasicSourceLineResolver::PublicSymbol> > {
   typedef BasicSourceLineResolver::PublicSymbol PublicSymbol;
  public:
-  static size_t SizeOf(const linked_ptr<PublicSymbol> &pubsymbol) {
+  static size_t SizeOf(const linked_ptr<PublicSymbol>& pubsymbol) {
     if (pubsymbol.get() == NULL) return 0;
     return SimpleSerializer<PublicSymbol>::SizeOf(*(pubsymbol.get()));
   }
-  static char *Write(const linked_ptr<PublicSymbol> &pubsymbol, char *dest) {
+  static char* Write(const linked_ptr<PublicSymbol>& pubsymbol, char* dest) {
     if (pubsymbol.get())
       dest = SimpleSerializer<PublicSymbol>::Write(*(pubsymbol.get()), dest);
     return dest;
@@ -244,11 +244,11 @@
 template<>
 class SimpleSerializer< linked_ptr<WindowsFrameInfo> > {
  public:
-  static size_t SizeOf(const linked_ptr<WindowsFrameInfo> &wfi) {
+  static size_t SizeOf(const linked_ptr<WindowsFrameInfo>& wfi) {
     if (wfi.get() == NULL) return 0;
     return SimpleSerializer<WindowsFrameInfo>::SizeOf(*(wfi.get()));
   }
-  static char *Write(const linked_ptr<WindowsFrameInfo> &wfi, char *dest) {
+  static char* Write(const linked_ptr<WindowsFrameInfo>& wfi, char* dest) {
     if (wfi.get())
       dest = SimpleSerializer<WindowsFrameInfo>::Write(*(wfi.get()), dest);
     return dest;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_symbol_supplier.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_symbol_supplier.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_symbol_supplier.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_symbol_supplier.cc	2021-12-09 12:01:26.000000000 +0000
@@ -52,14 +52,14 @@
 
 namespace google_breakpad {
 
-static bool file_exists(const string &file_name) {
+static bool file_exists(const string& file_name) {
   struct stat sb;
   return stat(file_name.c_str(), &sb) == 0;
 }
 
 SymbolSupplier::SymbolResult SimpleSymbolSupplier::GetSymbolFile(
-    const CodeModule *module, const SystemInfo *system_info,
-    string *symbol_file) {
+    const CodeModule* module, const SystemInfo* system_info,
+    string* symbol_file) {
   BPLOG_IF(ERROR, !symbol_file) << "SimpleSymbolSupplier::GetSymbolFile "
                                    "requires |symbol_file|";
   assert(symbol_file);
@@ -77,10 +77,10 @@
 }
 
 SymbolSupplier::SymbolResult SimpleSymbolSupplier::GetSymbolFile(
-    const CodeModule *module,
-    const SystemInfo *system_info,
-    string *symbol_file,
-    string *symbol_data) {
+    const CodeModule* module,
+    const SystemInfo* system_info,
+    string* symbol_file,
+    string* symbol_data) {
   assert(symbol_data);
   symbol_data->clear();
 
@@ -96,11 +96,11 @@
 }
 
 SymbolSupplier::SymbolResult SimpleSymbolSupplier::GetCStringSymbolData(
-    const CodeModule *module,
-    const SystemInfo *system_info,
-    string *symbol_file,
-    char **symbol_data,
-    size_t *symbol_data_size) {
+    const CodeModule* module,
+    const SystemInfo* system_info,
+    string* symbol_file,
+    char** symbol_data,
+    size_t* symbol_data_size) {
   assert(symbol_data);
   assert(symbol_data_size);
 
@@ -123,13 +123,13 @@
   return s;
 }
 
-void SimpleSymbolSupplier::FreeSymbolData(const CodeModule *module) {
+void SimpleSymbolSupplier::FreeSymbolData(const CodeModule* module) {
   if (!module) {
     BPLOG(INFO) << "Cannot free symbol data buffer for NULL module";
     return;
   }
 
-  map<string, char *>::iterator it = memory_buffers_.find(module->code_file());
+  map<string, char*>::iterator it = memory_buffers_.find(module->code_file());
   if (it == memory_buffers_.end()) {
     BPLOG(INFO) << "Cannot find symbol data buffer for module "
                 << module->code_file();
@@ -140,8 +140,8 @@
 }
 
 SymbolSupplier::SymbolResult SimpleSymbolSupplier::GetSymbolFileAtPathFromRoot(
-    const CodeModule *module, const SystemInfo *system_info,
-    const string &root_path, string *symbol_file) {
+    const CodeModule* module, const SystemInfo* system_info,
+    const string& root_path, string* symbol_file) {
   BPLOG_IF(ERROR, !symbol_file) << "SimpleSymbolSupplier::GetSymbolFileAtPath "
                                    "requires |symbol_file|";
   assert(symbol_file);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_symbol_supplier.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_symbol_supplier.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_symbol_supplier.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/simple_symbol_supplier.h	2021-12-09 12:01:26.000000000 +0000
@@ -94,44 +94,44 @@
  public:
   // Creates a new SimpleSymbolSupplier, using path as the root path where
   // symbols are stored.
-  explicit SimpleSymbolSupplier(const string &path) : paths_(1, path) {}
+  explicit SimpleSymbolSupplier(const string& path) : paths_(1, path) {}
 
   // Creates a new SimpleSymbolSupplier, using paths as a list of root
   // paths where symbols may be stored.
-  explicit SimpleSymbolSupplier(const vector<string> &paths) : paths_(paths) {}
+  explicit SimpleSymbolSupplier(const vector<string>& paths) : paths_(paths) {}
 
   virtual ~SimpleSymbolSupplier() {}
 
   // Returns the path to the symbol file for the given module.  See the
   // description above.
-  virtual SymbolResult GetSymbolFile(const CodeModule *module,
-                                     const SystemInfo *system_info,
-                                     string *symbol_file);
-
-  virtual SymbolResult GetSymbolFile(const CodeModule *module,
-                                     const SystemInfo *system_info,
-                                     string *symbol_file,
-                                     string *symbol_data);
+  virtual SymbolResult GetSymbolFile(const CodeModule* module,
+                                     const SystemInfo* system_info,
+                                     string* symbol_file);
+
+  virtual SymbolResult GetSymbolFile(const CodeModule* module,
+                                     const SystemInfo* system_info,
+                                     string* symbol_file,
+                                     string* symbol_data);
 
   // Allocates data buffer on heap and writes symbol data into buffer.
   // Symbol supplier ALWAYS takes ownership of the data buffer.
-  virtual SymbolResult GetCStringSymbolData(const CodeModule *module,
-                                            const SystemInfo *system_info,
-                                            string *symbol_file,
-                                            char **symbol_data,
-                                            size_t *symbol_data_size);
+  virtual SymbolResult GetCStringSymbolData(const CodeModule* module,
+                                            const SystemInfo* system_info,
+                                            string* symbol_file,
+                                            char** symbol_data,
+                                            size_t* symbol_data_size);
 
   // Free the data buffer allocated in the above GetCStringSymbolData();
-  virtual void FreeSymbolData(const CodeModule *module);
+  virtual void FreeSymbolData(const CodeModule* module);
 
  protected:
-  SymbolResult GetSymbolFileAtPathFromRoot(const CodeModule *module,
-                                           const SystemInfo *system_info,
-                                           const string &root_path,
-                                           string *symbol_file);
+  SymbolResult GetSymbolFileAtPathFromRoot(const CodeModule* module,
+                                           const SystemInfo* system_info,
+                                           const string& root_path,
+                                           string* symbol_file);
 
  private:
-  map<string, char *> memory_buffers_;
+  map<string, char*> memory_buffers_;
   vector<string> paths_;
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/source_line_resolver_base.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/source_line_resolver_base.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/source_line_resolver_base.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/source_line_resolver_base.cc	2021-12-09 12:01:26.000000000 +0000
@@ -51,7 +51,7 @@
 namespace google_breakpad {
 
 SourceLineResolverBase::SourceLineResolverBase(
-    ModuleFactory *module_factory)
+    ModuleFactory* module_factory)
   : modules_(new ModuleMap),
     corrupt_modules_(new ModuleSet),
     memory_buffers_(new MemoryMap),
@@ -85,9 +85,9 @@
   module_factory_ = NULL;
 }
 
-bool SourceLineResolverBase::ReadSymbolFile(const string &map_file,
-                                            char **symbol_data,
-                                            size_t *symbol_data_size) {
+bool SourceLineResolverBase::ReadSymbolFile(const string& map_file,
+                                            char** symbol_data,
+                                            size_t* symbol_data_size) {
   if (symbol_data == NULL || symbol_data_size == NULL) {
     BPLOG(ERROR) << "Could not Read file into Null memory pointer";
     return false;
@@ -117,7 +117,7 @@
 
   BPLOG(INFO) << "Opening " << map_file;
 
-  FILE *f = fopen(map_file.c_str(), "rt");
+  FILE* f = fopen(map_file.c_str(), "rt");
   if (!f) {
     string error_string;
     error_code = ErrnoString(&error_string);
@@ -148,8 +148,8 @@
   return true;
 }
 
-bool SourceLineResolverBase::LoadModule(const CodeModule *module,
-                                        const string &map_file) {
+bool SourceLineResolverBase::LoadModule(const CodeModule* module,
+                                        const string& map_file) {
   if (module == NULL)
     return false;
 
@@ -163,7 +163,7 @@
   BPLOG(INFO) << "Loading symbols for module " << module->code_file()
               << " from " << map_file;
 
-  char *memory_buffer;
+  char* memory_buffer;
   size_t memory_buffer_size;
   if (!ReadSymbolFile(map_file, &memory_buffer, &memory_buffer_size))
     return false;
@@ -184,7 +184,7 @@
 }
 
 bool SourceLineResolverBase::LoadModuleUsingMapBuffer(
-    const CodeModule *module, const string &map_buffer) {
+    const CodeModule* module, const string& map_buffer) {
   if (module == NULL)
     return false;
 
@@ -196,7 +196,7 @@
   }
 
   size_t memory_buffer_size = map_buffer.size() + 1;
-  char *memory_buffer = new char[memory_buffer_size];
+  char* memory_buffer = new char[memory_buffer_size];
   if (memory_buffer == NULL) {
     BPLOG(ERROR) << "Could not allocate memory for " << module->code_file();
     return false;
@@ -220,8 +220,8 @@
 }
 
 bool SourceLineResolverBase::LoadModuleUsingMemoryBuffer(
-    const CodeModule *module,
-    char *memory_buffer,
+    const CodeModule* module,
+    char* memory_buffer,
     size_t memory_buffer_size) {
   if (!module)
     return false;
@@ -236,7 +236,7 @@
   BPLOG(INFO) << "Loading symbols for module " << module->code_file()
              << " from memory buffer";
 
-  Module *basic_module = module_factory_->CreateModule(module->code_file());
+  Module* basic_module = module_factory_->CreateModule(module->code_file());
 
   // Ownership of memory is NOT transfered to Module::LoadMapFromMemory().
   if (!basic_module->LoadMapFromMemory(memory_buffer, memory_buffer_size)) {
@@ -259,13 +259,13 @@
   return true;
 }
 
-void SourceLineResolverBase::UnloadModule(const CodeModule *code_module) {
+void SourceLineResolverBase::UnloadModule(const CodeModule* code_module) {
   if (!code_module)
     return;
 
   ModuleMap::iterator mod_iter = modules_->find(code_module->code_file());
   if (mod_iter != modules_->end()) {
-    Module *symbol_module = mod_iter->second;
+    Module* symbol_module = mod_iter->second;
     delete symbol_module;
     corrupt_modules_->erase(mod_iter->first);
     modules_->erase(mod_iter);
@@ -283,19 +283,19 @@
   }
 }
 
-bool SourceLineResolverBase::HasModule(const CodeModule *module) {
+bool SourceLineResolverBase::HasModule(const CodeModule* module) {
   if (!module)
     return false;
   return modules_->find(module->code_file()) != modules_->end();
 }
 
-bool SourceLineResolverBase::IsModuleCorrupt(const CodeModule *module) {
+bool SourceLineResolverBase::IsModuleCorrupt(const CodeModule* module) {
   if (!module)
     return false;
   return corrupt_modules_->find(module->code_file()) != corrupt_modules_->end();
 }
 
-void SourceLineResolverBase::FillSourceLineInfo(StackFrame *frame) {
+void SourceLineResolverBase::FillSourceLineInfo(StackFrame* frame) {
   if (frame->module) {
     ModuleMap::const_iterator it = modules_->find(frame->module->code_file());
     if (it != modules_->end()) {
@@ -304,8 +304,8 @@
   }
 }
 
-WindowsFrameInfo *SourceLineResolverBase::FindWindowsFrameInfo(
-    const StackFrame *frame) {
+WindowsFrameInfo* SourceLineResolverBase::FindWindowsFrameInfo(
+    const StackFrame* frame) {
   if (frame->module) {
     ModuleMap::const_iterator it = modules_->find(frame->module->code_file());
     if (it != modules_->end()) {
@@ -315,8 +315,8 @@
   return NULL;
 }
 
-CFIFrameInfo *SourceLineResolverBase::FindCFIFrameInfo(
-    const StackFrame *frame) {
+CFIFrameInfo* SourceLineResolverBase::FindCFIFrameInfo(
+    const StackFrame* frame) {
   if (frame->module) {
     ModuleMap::const_iterator it = modules_->find(frame->module->code_file());
     if (it != modules_->end()) {
@@ -327,12 +327,12 @@
 }
 
 bool SourceLineResolverBase::CompareString::operator()(
-    const string &s1, const string &s2) const {
+    const string& s1, const string& s2) const {
   return strcmp(s1.c_str(), s2.c_str()) < 0;
 }
 
 bool SourceLineResolverBase::Module::ParseCFIRuleSet(
-    const string &rule_set, CFIFrameInfo *frame_info) const {
+    const string& rule_set, CFIFrameInfo* frame_info) const {
   CFIFrameInfoParseHandler handler(frame_info);
   CFIRuleParser parser(&handler);
   return parser.Parse(rule_set);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/source_line_resolver_base_types.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/source_line_resolver_base_types.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/source_line_resolver_base_types.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/source_line_resolver_base_types.h	2021-12-09 12:01:26.000000000 +0000
@@ -56,14 +56,14 @@
 
 class SourceLineResolverBase::AutoFileCloser {
  public:
-  explicit AutoFileCloser(FILE *file) : file_(file) {}
+  explicit AutoFileCloser(FILE* file) : file_(file) {}
   ~AutoFileCloser() {
     if (file_)
       fclose(file_);
   }
 
  private:
-  FILE *file_;
+  FILE* file_;
 };
 
 struct SourceLineResolverBase::Line {
@@ -82,7 +82,7 @@
 
 struct SourceLineResolverBase::Function {
   Function() { }
-  Function(const string &function_name,
+  Function(const string& function_name,
            MemAddr function_address,
            MemAddr code_size,
            int set_parameter_size,
@@ -133,7 +133,7 @@
   // The passed in |memory buffer| is of size |memory_buffer_size|.  If it is
   // not null terminated, LoadMapFromMemory will null terminate it by modifying
   // the passed in buffer.
-  virtual bool LoadMapFromMemory(char *memory_buffer,
+  virtual bool LoadMapFromMemory(char* memory_buffer,
                                  size_t memory_buffer_size) = 0;
 
   // Tells whether the loaded symbol data is corrupt.  Return value is
@@ -142,24 +142,24 @@
 
   // Looks up the given relative address, and fills the StackFrame struct
   // with the result.
-  virtual void LookupAddress(StackFrame *frame) const = 0;
+  virtual void LookupAddress(StackFrame* frame) const = 0;
 
   // If Windows stack walking information is available covering ADDRESS,
   // return a WindowsFrameInfo structure describing it. If the information
   // is not available, returns NULL. A NULL return value does not indicate
   // an error. The caller takes ownership of any returned WindowsFrameInfo
   // object.
-  virtual WindowsFrameInfo *
-  FindWindowsFrameInfo(const StackFrame *frame) const = 0;
+  virtual WindowsFrameInfo*
+      FindWindowsFrameInfo(const StackFrame* frame) const = 0;
 
   // If CFI stack walking information is available covering ADDRESS,
   // return a CFIFrameInfo structure describing it. If the information
   // is not available, return NULL. The caller takes ownership of any
   // returned CFIFrameInfo object.
-  virtual CFIFrameInfo *FindCFIFrameInfo(const StackFrame *frame) const = 0;
+  virtual CFIFrameInfo* FindCFIFrameInfo(const StackFrame* frame) const = 0;
  protected:
-  virtual bool ParseCFIRuleSet(const string &rule_set,
-                               CFIFrameInfo *frame_info) const;
+  virtual bool ParseCFIRuleSet(const string& rule_set,
+                               CFIFrameInfo* frame_info) const;
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalk_common.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalk_common.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalk_common.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalk_common.cc	2021-12-09 12:01:26.000000000 +0000
@@ -69,7 +69,7 @@
 // of registers is completely printed, regardless of the number of calls
 // to PrintRegister.
 static const int kMaxWidth = 80;  // optimize for an 80-column terminal
-static int PrintRegister(const char *name, uint32_t value, int start_col) {
+static int PrintRegister(const char* name, uint32_t value, int start_col) {
   char buffer[64];
   snprintf(buffer, sizeof(buffer), " %5s = 0x%08x", name, value);
 
@@ -83,7 +83,7 @@
 }
 
 // PrintRegister64 does the same thing, but for 64-bit registers.
-static int PrintRegister64(const char *name, uint64_t value, int start_col) {
+static int PrintRegister64(const char* name, uint64_t value, int start_col) {
   char buffer[64];
   snprintf(buffer, sizeof(buffer), " %5s = 0x%016" PRIx64 , name, value);
 
@@ -98,7 +98,7 @@
 
 // StripSeparator takes a string |original| and returns a copy
 // of the string with all occurences of |kOutputSeparator| removed.
-static string StripSeparator(const string &original) {
+static string StripSeparator(const string& original) {
   string result = original;
   string::size_type position = 0;
   while ((position = result.find(kOutputSeparator, position)) != string::npos) {
@@ -112,20 +112,20 @@
 }
 
 // PrintStackContents prints the stack contents of the current frame to stdout.
-static void PrintStackContents(const string &indent,
-                               const StackFrame *frame,
-                               const StackFrame *prev_frame,
-                               const string &cpu,
-                               const MemoryRegion *memory,
+static void PrintStackContents(const string& indent,
+                               const StackFrame* frame,
+                               const StackFrame* prev_frame,
+                               const string& cpu,
+                               const MemoryRegion* memory,
                                const CodeModules* modules,
-                               SourceLineResolverInterface *resolver) {
+                               SourceLineResolverInterface* resolver) {
   // Find stack range.
   int word_length = 0;
   uint64_t stack_begin = 0, stack_end = 0;
   if (cpu == "x86") {
     word_length = 4;
-    const StackFrameX86 *frame_x86 = static_cast<const StackFrameX86*>(frame);
-    const StackFrameX86 *prev_frame_x86 =
+    const StackFrameX86* frame_x86 = static_cast<const StackFrameX86*>(frame);
+    const StackFrameX86* prev_frame_x86 =
         static_cast<const StackFrameX86*>(prev_frame);
     if ((frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_ESP) &&
         (prev_frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_ESP)) {
@@ -134,9 +134,9 @@
     }
   } else if (cpu == "amd64") {
     word_length = 8;
-    const StackFrameAMD64 *frame_amd64 =
+    const StackFrameAMD64* frame_amd64 =
         static_cast<const StackFrameAMD64*>(frame);
-    const StackFrameAMD64 *prev_frame_amd64 =
+    const StackFrameAMD64* prev_frame_amd64 =
         static_cast<const StackFrameAMD64*>(prev_frame);
     if ((frame_amd64->context_validity & StackFrameAMD64::CONTEXT_VALID_RSP) &&
         (prev_frame_amd64->context_validity &
@@ -146,8 +146,8 @@
     }
   } else if (cpu == "arm") {
     word_length = 4;
-    const StackFrameARM *frame_arm = static_cast<const StackFrameARM*>(frame);
-    const StackFrameARM *prev_frame_arm =
+    const StackFrameARM* frame_arm = static_cast<const StackFrameARM*>(frame);
+    const StackFrameARM* prev_frame_arm =
         static_cast<const StackFrameARM*>(prev_frame);
     if ((frame_arm->context_validity & StackFrameARM::CONTEXT_VALID_SP) &&
         (prev_frame_arm->context_validity & StackFrameARM::CONTEXT_VALID_SP)) {
@@ -156,9 +156,9 @@
     }
   } else if (cpu == "arm64") {
     word_length = 8;
-    const StackFrameARM64 *frame_arm64 =
+    const StackFrameARM64* frame_arm64 =
         static_cast<const StackFrameARM64*>(frame);
-    const StackFrameARM64 *prev_frame_arm64 =
+    const StackFrameARM64* prev_frame_arm64 =
         static_cast<const StackFrameARM64*>(prev_frame);
     if ((frame_arm64->context_validity & StackFrameARM64::CONTEXT_VALID_SP) &&
         (prev_frame_arm64->context_validity &
@@ -249,8 +249,8 @@
 //
 // If |cpu| is a recognized CPU name, relevant register state for each stack
 // frame printed is also output, if available.
-static void PrintStack(const CallStack *stack,
-                       const string &cpu,
+static void PrintStack(const CallStack* stack,
+                       const string& cpu,
                        bool output_stack_contents,
                        const MemoryRegion* memory,
                        const CodeModules* modules,
@@ -260,7 +260,7 @@
     printf(" <no frames>\n");
   }
   for (int frame_index = 0; frame_index < frame_count; ++frame_index) {
-    const StackFrame *frame = stack->frames()->at(frame_index);
+    const StackFrame* frame = stack->frames()->at(frame_index);
     printf("%2d  ", frame_index);
 
     uint64_t instruction_address = frame->ReturnAddress();
@@ -289,7 +289,7 @@
 
     int sequence = 0;
     if (cpu == "x86") {
-      const StackFrameX86 *frame_x86 =
+      const StackFrameX86* frame_x86 =
         reinterpret_cast<const StackFrameX86*>(frame);
 
       if (frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_EIP)
@@ -311,7 +311,7 @@
         sequence = PrintRegister("efl", frame_x86->context.eflags, sequence);
       }
     } else if (cpu == "ppc") {
-      const StackFramePPC *frame_ppc =
+      const StackFramePPC* frame_ppc =
         reinterpret_cast<const StackFramePPC*>(frame);
 
       if (frame_ppc->context_validity & StackFramePPC::CONTEXT_VALID_SRR0)
@@ -319,7 +319,7 @@
       if (frame_ppc->context_validity & StackFramePPC::CONTEXT_VALID_GPR1)
         sequence = PrintRegister("r1", frame_ppc->context.gpr[1], sequence);
     } else if (cpu == "amd64") {
-      const StackFrameAMD64 *frame_amd64 =
+      const StackFrameAMD64* frame_amd64 =
         reinterpret_cast<const StackFrameAMD64*>(frame);
 
       if (frame_amd64->context_validity & StackFrameAMD64::CONTEXT_VALID_RAX)
@@ -357,7 +357,7 @@
       if (frame_amd64->context_validity & StackFrameAMD64::CONTEXT_VALID_RIP)
         sequence = PrintRegister64("rip", frame_amd64->context.rip, sequence);
     } else if (cpu == "sparc") {
-      const StackFrameSPARC *frame_sparc =
+      const StackFrameSPARC* frame_sparc =
         reinterpret_cast<const StackFrameSPARC*>(frame);
 
       if (frame_sparc->context_validity & StackFrameSPARC::CONTEXT_VALID_SP)
@@ -367,7 +367,7 @@
       if (frame_sparc->context_validity & StackFrameSPARC::CONTEXT_VALID_PC)
         sequence = PrintRegister("pc", frame_sparc->context.pc, sequence);
     } else if (cpu == "arm") {
-      const StackFrameARM *frame_arm =
+      const StackFrameARM* frame_arm =
         reinterpret_cast<const StackFrameARM*>(frame);
 
       // Argument registers (caller-saves), which will likely only be valid
@@ -409,7 +409,7 @@
       if (frame_arm->context_validity & StackFrameARM::CONTEXT_VALID_PC)
         sequence = PrintRegister("pc", frame_arm->context.iregs[15], sequence);
     } else if (cpu == "arm64") {
-      const StackFrameARM64 *frame_arm64 =
+      const StackFrameARM64* frame_arm64 =
         reinterpret_cast<const StackFrameARM64*>(frame);
 
       if (frame_arm64->context_validity & StackFrameARM64::CONTEXT_VALID_X0) {
@@ -621,10 +621,10 @@
 // Module, function, source file, and source line may all be empty
 // depending on availability.  The code offset follows the same rules as
 // PrintStack above.
-static void PrintStackMachineReadable(int thread_num, const CallStack *stack) {
+static void PrintStackMachineReadable(int thread_num, const CallStack* stack) {
   int frame_count = stack->frames()->size();
   for (int frame_index = 0; frame_index < frame_count; ++frame_index) {
-    const StackFrame *frame = stack->frames()->at(frame_index);
+    const StackFrame* frame = stack->frames()->at(frame_index);
     printf("%d%c%d%c", thread_num, kOutputSeparator, frame_index,
            kOutputSeparator);
 
@@ -676,8 +676,8 @@
 // ContainsModule checks whether a given |module| is in the vector
 // |modules_without_symbols|.
 static bool ContainsModule(
-    const vector<const CodeModule*> *modules,
-    const CodeModule *module) {
+    const vector<const CodeModule*>* modules,
+    const CodeModule* module) {
   assert(modules);
   assert(module);
   vector<const CodeModule*>::const_iterator iter;
@@ -694,9 +694,9 @@
 // |modules_without_symbols| should contain the list of modules that were
 // confirmed to be missing their symbols during the stack walk.
 static void PrintModule(
-    const CodeModule *module,
-    const vector<const CodeModule*> *modules_without_symbols,
-    const vector<const CodeModule*> *modules_with_corrupt_symbols,
+    const CodeModule* module,
+    const vector<const CodeModule*>* modules_without_symbols,
+    const vector<const CodeModule*>* modules_with_corrupt_symbols,
     uint64_t main_address) {
   string symbol_issues;
   if (ContainsModule(modules_without_symbols, module)) {
@@ -721,9 +721,9 @@
 // |modules_without_symbols| should contain the list of modules that were
 // confirmed to be missing their symbols during the stack walk.
 static void PrintModules(
-    const CodeModules *modules,
-    const vector<const CodeModule*> *modules_without_symbols,
-    const vector<const CodeModule*> *modules_with_corrupt_symbols) {
+    const CodeModules* modules,
+    const vector<const CodeModule*>* modules_without_symbols,
+    const vector<const CodeModule*>* modules_with_corrupt_symbols) {
   if (!modules)
     return;
 
@@ -731,7 +731,7 @@
   printf("Loaded modules:\n");
 
   uint64_t main_address = 0;
-  const CodeModule *main_module = modules->GetMainModule();
+  const CodeModule* main_module = modules->GetMainModule();
   if (main_module) {
     main_address = main_module->base_address();
   }
@@ -740,7 +740,7 @@
   for (unsigned int module_sequence = 0;
        module_sequence < module_count;
        ++module_sequence) {
-    const CodeModule *module = modules->GetModuleAtSequence(module_sequence);
+    const CodeModule* module = modules->GetModuleAtSequence(module_sequence);
     PrintModule(module, modules_without_symbols, modules_with_corrupt_symbols,
                 main_address);
   }
@@ -751,12 +751,12 @@
 // text format:
 // Module|{Module Filename}|{Version}|{Debug Filename}|{Debug Identifier}|
 // {Base Address}|{Max Address}|{Main}
-static void PrintModulesMachineReadable(const CodeModules *modules) {
+static void PrintModulesMachineReadable(const CodeModules* modules) {
   if (!modules)
     return;
 
   uint64_t main_address = 0;
-  const CodeModule *main_module = modules->GetMainModule();
+  const CodeModule* main_module = modules->GetMainModule();
   if (main_module) {
     main_address = main_module->base_address();
   }
@@ -765,7 +765,7 @@
   for (unsigned int module_sequence = 0;
        module_sequence < module_count;
        ++module_sequence) {
-    const CodeModule *module = modules->GetModuleAtSequence(module_sequence);
+    const CodeModule* module = modules->GetModuleAtSequence(module_sequence);
     uint64_t base_address = module->base_address();
     printf("Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d\n",
            kOutputSeparator,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_address_list_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_address_list_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_address_list_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_address_list_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -94,9 +94,9 @@
 
   // Set the Breakpad symbol information that supplier should return for
   // MODULE to INFO.
-  void SetModuleSymbols(MockCodeModule *module, const string &info) {
+  void SetModuleSymbols(MockCodeModule* module, const string& info) {
     size_t buffer_size;
-    char *buffer = supplier.CopySymbolDataAndOwnTheCopy(info, &buffer_size);
+    char* buffer = supplier.CopySymbolDataAndOwnTheCopy(info, &buffer_size);
     EXPECT_CALL(supplier, GetCStringSymbolData(module, NULL, _, _, _))
       .WillRepeatedly(DoAll(SetArgumentPointee<3>(buffer),
                             SetArgumentPointee<4>(buffer_size),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64.cc	2021-12-09 12:01:26.000000000 +0000
@@ -126,7 +126,7 @@
 }
 
 StackFrameAMD64* StackwalkerAMD64::GetCallerByCFIFrameInfo(
-    const vector<StackFrame*> &frames,
+    const vector<StackFrame*>& frames,
     CFIFrameInfo* cfi_frame_info) {
   StackFrameAMD64* last_frame = static_cast<StackFrameAMD64*>(frames.back());
 
@@ -217,7 +217,7 @@
 }
 
 StackFrameAMD64* StackwalkerAMD64::GetCallerByStackScan(
-    const vector<StackFrame*> &frames) {
+    const vector<StackFrame*>& frames) {
   StackFrameAMD64* last_frame = static_cast<StackFrameAMD64*>(frames.back());
   uint64_t last_rsp = last_frame->context.rsp;
   uint64_t caller_rip_address, caller_rip;
@@ -273,7 +273,7 @@
     return NULL;
   }
 
-  const vector<StackFrame*> &frames = *stack->frames();
+  const vector<StackFrame*>& frames = *stack->frames();
   StackFrameAMD64* last_frame = static_cast<StackFrameAMD64*>(frames.back());
   scoped_ptr<StackFrameAMD64> new_frame;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64.h	2021-12-09 12:01:26.000000000 +0000
@@ -75,7 +75,7 @@
   // Use cfi_frame_info (derived from STACK CFI records) to construct
   // the frame that called frames.back(). The caller takes ownership
   // of the returned frame. Return NULL on failure.
-  StackFrameAMD64* GetCallerByCFIFrameInfo(const vector<StackFrame*> &frames,
+  StackFrameAMD64* GetCallerByCFIFrameInfo(const vector<StackFrame*>& frames,
                                            CFIFrameInfo* cfi_frame_info);
 
   // Assumes a traditional frame layout where the frame pointer has not been
@@ -88,7 +88,7 @@
 
   // Scan the stack for plausible return addresses. The caller takes ownership
   // of the returned frame. Return NULL on failure.
-  StackFrameAMD64* GetCallerByStackScan(const vector<StackFrame*> &frames);
+  StackFrameAMD64* GetCallerByStackScan(const vector<StackFrame*>& frames);
 
   // Stores the CPU context corresponding to the innermost stack frame to
   // be returned by GetContextFrame.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_amd64_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -62,6 +62,7 @@
 using std::vector;
 using testing::_;
 using testing::AnyNumber;
+using testing::DoAll;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::Test;
@@ -103,7 +104,7 @@
 
   // Set the Breakpad symbol information that supplier should return for
   // MODULE to INFO.
-  void SetModuleSymbols(MockCodeModule *module, const string &info) {
+  void SetModuleSymbols(MockCodeModule* module, const string& info) {
     size_t buffer_size;
     char *buffer = supplier.CopySymbolDataAndOwnTheCopy(info, &buffer_size);
     EXPECT_CALL(supplier, GetCStringSymbolData(module, &system_info, _, _, _))
@@ -124,7 +125,7 @@
   void BrandContext(MDRawContextAMD64 *raw_context) {
     uint8_t x = 173;
     for (size_t i = 0; i < sizeof(*raw_context); i++)
-      reinterpret_cast<uint8_t *>(raw_context)[i] = (x += 17);
+      reinterpret_cast<uint8_t*>(raw_context)[i] = (x += 17);
   }
 
   SystemInfo system_info;
@@ -137,7 +138,7 @@
   MockSymbolSupplier supplier;
   BasicSourceLineResolver resolver;
   CallStack call_stack;
-  const vector<StackFrame *> *frames;
+  const vector<StackFrame*>* frames;
 };
 
 class GetContextFrame: public StackwalkerAMD64Fixture, public Test { };
@@ -165,7 +166,7 @@
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
   ASSERT_GE(1U, frames->size());
-  StackFrameAMD64 *frame = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame = static_cast<StackFrameAMD64*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -191,7 +192,7 @@
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
   ASSERT_GE(1U, frames->size());
-  StackFrameAMD64 *frame = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame = static_cast<StackFrameAMD64*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -215,7 +216,7 @@
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
   ASSERT_GE(1U, frames->size());
-  StackFrameAMD64 *frame = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame = static_cast<StackFrameAMD64*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -278,12 +279,12 @@
   frames = call_stack.frames();
   ASSERT_EQ(3U, frames->size());
 
-  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
+  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
              StackFrameAMD64::CONTEXT_VALID_RSP |
@@ -293,7 +294,7 @@
   EXPECT_EQ(frame1_sp.Value(), frame1->context.rsp);
   EXPECT_EQ(frame1_rbp.Value(), frame1->context.rbp);
 
-  StackFrameAMD64 *frame2 = static_cast<StackFrameAMD64 *>(frames->at(2));
+  StackFrameAMD64 *frame2 = static_cast<StackFrameAMD64*>(frames->at(2));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame2->trust);
   ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
              StackFrameAMD64::CONTEXT_VALID_RSP),
@@ -351,13 +352,13 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ("platypus", frame0->function_name);
   EXPECT_EQ(0x00007400c0000100ULL, frame0->function_base);
 
-  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
+  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
              StackFrameAMD64::CONTEXT_VALID_RSP |
@@ -463,7 +464,7 @@
   ASSERT_EQ(3U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameAMD64 *frame = static_cast<StackFrameAMD64 *>(frames->at(0));
+    StackFrameAMD64 *frame = static_cast<StackFrameAMD64*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame->trust);
     ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame->context_validity);
     EXPECT_EQ("", frame->function_name);
@@ -474,7 +475,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameAMD64 *frame = static_cast<StackFrameAMD64 *>(frames->at(1));
+    StackFrameAMD64 *frame = static_cast<StackFrameAMD64*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame->trust);
     ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
                StackFrameAMD64::CONTEXT_VALID_RSP |
@@ -488,7 +489,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameAMD64 *frame = static_cast<StackFrameAMD64 *>(frames->at(2));
+    StackFrameAMD64 *frame = static_cast<StackFrameAMD64*>(frames->at(2));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame->trust);
     ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
                StackFrameAMD64::CONTEXT_VALID_RSP |
@@ -539,12 +540,12 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
+  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
              StackFrameAMD64::CONTEXT_VALID_RSP),
@@ -589,12 +590,12 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
+  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
              StackFrameAMD64::CONTEXT_VALID_RSP),
@@ -659,7 +660,7 @@
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
 
-  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
@@ -717,14 +718,14 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64 *>(frames->at(0));
+  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(frame0_rbp.Value(), frame0->context.rbp);
   EXPECT_EQ("sasquatch", frame0->function_name);
   EXPECT_EQ(0x00007400c0000100ULL, frame0->function_base);
 
-  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
+  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
   ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
              StackFrameAMD64::CONTEXT_VALID_RSP |
@@ -798,13 +799,13 @@
     frames = call_stack.frames();
     ASSERT_EQ(2U, frames->size());
 
-    StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64 *>(frames->at(0));
+    StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ("enchiridion", frame0->function_name);
     EXPECT_EQ(0x00007400c0004000ULL, frame0->function_base);
 
-    StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
+    StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
     ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
                StackFrameAMD64::CONTEXT_VALID_RSP |
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64.cc	2021-12-09 12:01:26.000000000 +0000
@@ -54,8 +54,29 @@
                                    StackFrameSymbolizer* resolver_helper)
     : Stackwalker(system_info, memory, modules, resolver_helper),
       context_(context),
-      context_frame_validity_(StackFrameARM64::CONTEXT_VALID_ALL) { }
+      context_frame_validity_(StackFrameARM64::CONTEXT_VALID_ALL),
+      address_range_mask_(0xffffffffffffffff) {
+  if (modules && modules->module_count() > 0) {
+    // ARM64 supports storing pointer authentication codes in the upper bits of
+    // a pointer. Make a best guess at the range of valid addresses based on the
+    // range of loaded modules.
+    const CodeModule *high_module =
+        modules->GetModuleAtSequence(modules->module_count() - 1);
+    uint64_t mask = high_module->base_address() + high_module->size();
+    mask |= mask >> 1;
+    mask |= mask >> 2;
+    mask |= mask >> 4;
+    mask |= mask >> 8;
+    mask |= mask >> 16;
+    mask |= mask >> 32;
+    address_range_mask_ = mask;
+  }
+}
 
+uint64_t StackwalkerARM64::PtrauthStrip(uint64_t ptr) {
+  uint64_t stripped = ptr & address_range_mask_;
+  return modules_ && modules_->GetModuleForAddress(stripped) ? stripped : ptr;
+}
 
 StackFrame* StackwalkerARM64::GetContextFrame() {
   if (!context_) {
@@ -71,12 +92,14 @@
   frame->context_validity = context_frame_validity_;
   frame->trust = StackFrame::FRAME_TRUST_CONTEXT;
   frame->instruction = frame->context.iregs[MD_CONTEXT_ARM64_REG_PC];
+  frame->context.iregs[MD_CONTEXT_ARM64_REG_LR] =
+      PtrauthStrip(frame->context.iregs[MD_CONTEXT_ARM64_REG_LR]);
 
   return frame;
 }
 
 StackFrameARM64* StackwalkerARM64::GetCallerByCFIFrameInfo(
-    const vector<StackFrame*> &frames,
+    const vector<StackFrame*>& frames,
     CFIFrameInfo* cfi_frame_info) {
   StackFrameARM64* last_frame = static_cast<StackFrameARM64*>(frames.back());
 
@@ -152,7 +175,7 @@
 }
 
 StackFrameARM64* StackwalkerARM64::GetCallerByStackScan(
-    const vector<StackFrame*> &frames) {
+    const vector<StackFrame*>& frames) {
   StackFrameARM64* last_frame = static_cast<StackFrameARM64*>(frames.back());
   uint64_t last_sp = last_frame->context.iregs[MD_CONTEXT_ARM64_REG_SP];
   uint64_t caller_sp, caller_pc;
@@ -183,8 +206,11 @@
 }
 
 StackFrameARM64* StackwalkerARM64::GetCallerByFramePointer(
-    const vector<StackFrame*> &frames) {
+    const vector<StackFrame*>& frames) {
   StackFrameARM64* last_frame = static_cast<StackFrameARM64*>(frames.back());
+  if (!(last_frame->context_validity & StackFrameARM64::CONTEXT_VALID_LR)) {
+    CorrectRegLRByFramePointer(frames, last_frame);
+  }
 
   uint64_t last_fp = last_frame->context.iregs[MD_CONTEXT_ARM64_REG_FP];
 
@@ -202,6 +228,8 @@
     return NULL;
   }
 
+  caller_lr = PtrauthStrip(caller_lr);
+
   uint64_t caller_sp = last_fp ? last_fp + 16 :
       last_frame->context.iregs[MD_CONTEXT_ARM64_REG_SP];
 
@@ -223,6 +251,42 @@
   return frame;
 }
 
+void StackwalkerARM64::CorrectRegLRByFramePointer(
+    const vector<StackFrame*>& frames,
+    StackFrameARM64* last_frame) {
+  // Need at least two frames to correct and
+  // register $FP should always be greater than register $SP.
+  if (frames.size() < 2 || !last_frame ||
+      last_frame->context.iregs[MD_CONTEXT_ARM64_REG_FP] <=
+          last_frame->context.iregs[MD_CONTEXT_ARM64_REG_SP])
+    return;
+
+  StackFrameARM64* last_last_frame =
+      static_cast<StackFrameARM64*>(*(frames.end() - 2));
+  uint64_t last_last_fp =
+      last_last_frame->context.iregs[MD_CONTEXT_ARM64_REG_FP];
+
+  uint64_t last_fp = 0;
+  if (last_last_fp && !memory_->GetMemoryAtAddress(last_last_fp, &last_fp)) {
+    BPLOG(ERROR) << "Unable to read last_fp from last_last_fp: 0x"
+                 << std::hex << last_last_fp;
+    return;
+  }
+  // Give up if STACK CFI doesn't agree with frame pointer.
+  if (last_frame->context.iregs[MD_CONTEXT_ARM64_REG_FP] != last_fp)
+    return;
+
+  uint64_t last_lr = 0;
+  if (last_last_fp && !memory_->GetMemoryAtAddress(last_last_fp + 8, &last_lr)) {
+    BPLOG(ERROR) << "Unable to read last_lr from (last_last_fp + 8): 0x"
+                 << std::hex << (last_last_fp + 8);
+    return;
+  }
+  last_lr = PtrauthStrip(last_lr);
+
+  last_frame->context.iregs[MD_CONTEXT_ARM64_REG_LR] = last_lr;
+}
+
 StackFrame* StackwalkerARM64::GetCallerFrame(const CallStack* stack,
                                              bool stack_scan_allowed) {
   if (!memory_ || !stack) {
@@ -230,7 +294,7 @@
     return NULL;
   }
 
-  const vector<StackFrame*> &frames = *stack->frames();
+  const vector<StackFrame*>& frames = *stack->frames();
   StackFrameARM64* last_frame = static_cast<StackFrameARM64*>(frames.back());
   scoped_ptr<StackFrameARM64> frame;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64.h	2021-12-09 12:01:26.000000000 +0000
@@ -68,6 +68,9 @@
   }
 
  private:
+  // Strip pointer authentication codes from an address.
+  uint64_t PtrauthStrip(uint64_t ptr);
+
   // Implementation of Stackwalker, using arm64 context and stack conventions.
   virtual StackFrame* GetContextFrame();
   virtual StackFrame* GetCallerFrame(const CallStack* stack,
@@ -76,16 +79,23 @@
   // Use cfi_frame_info (derived from STACK CFI records) to construct
   // the frame that called frames.back(). The caller takes ownership
   // of the returned frame. Return NULL on failure.
-  StackFrameARM64* GetCallerByCFIFrameInfo(const vector<StackFrame*> &frames,
+  StackFrameARM64* GetCallerByCFIFrameInfo(const vector<StackFrame*>& frames,
                                            CFIFrameInfo* cfi_frame_info);
 
   // Use the frame pointer. The caller takes ownership of the returned frame.
   // Return NULL on failure.
-  StackFrameARM64* GetCallerByFramePointer(const vector<StackFrame*> &frames);
+  StackFrameARM64* GetCallerByFramePointer(const vector<StackFrame*>& frames);
 
   // Scan the stack for plausible return addresses. The caller takes ownership
   // of the returned frame. Return NULL on failure.
-  StackFrameARM64* GetCallerByStackScan(const vector<StackFrame*> &frames);
+  StackFrameARM64* GetCallerByStackScan(const vector<StackFrame*>& frames);
+
+  // GetCallerByFramePointer() depends on the previous frame having recovered
+  // x30($LR) which may not have been done when using CFI.
+  // This function recovers $LR in the previous frame by using the frame-pointer
+  // two frames back to read it from the stack.
+  void CorrectRegLRByFramePointer(const vector<StackFrame*>& frames,
+                                  StackFrameARM64* last_frame);
 
   // Stores the CPU context corresponding to the youngest stack frame, to
   // be returned by GetContextFrame.
@@ -95,6 +105,10 @@
   // CONTEXT_VALID_ALL in real use; it is only changeable for the sake of
   // unit tests.
   uint64_t context_frame_validity_;
+
+  // A mask of the valid address bits, determined from the address range of
+  // modules_.
+  uint64_t address_range_mask_;
 };
 
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm64_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -64,6 +64,7 @@
 using std::vector;
 using testing::_;
 using testing::AnyNumber;
+using testing::DoAll;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::Test;
@@ -104,7 +105,7 @@
 
   // Set the Breakpad symbol information that supplier should return for
   // MODULE to INFO.
-  void SetModuleSymbols(MockCodeModule *module, const string &info) {
+  void SetModuleSymbols(MockCodeModule* module, const string& info) {
     size_t buffer_size;
     char *buffer = supplier.CopySymbolDataAndOwnTheCopy(info, &buffer_size);
     EXPECT_CALL(supplier, GetCStringSymbolData(module, &system_info, _, _, _))
@@ -125,7 +126,7 @@
   void BrandContext(MDRawContextARM64 *raw_context) {
     uint8_t x = 173;
     for (size_t i = 0; i < sizeof(*raw_context); i++)
-      reinterpret_cast<uint8_t *>(raw_context)[i] = (x += 17);
+      reinterpret_cast<uint8_t*>(raw_context)[i] = (x += 17);
   }
 
   SystemInfo system_info;
@@ -138,7 +139,7 @@
   MockSymbolSupplier supplier;
   BasicSourceLineResolver resolver;
   CallStack call_stack;
-  const vector<StackFrame *> *frames;
+  const vector<StackFrame*>* frames;
 };
 
 class SanityCheck: public StackwalkerARM64Fixture, public Test { };
@@ -158,7 +159,7 @@
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
-  StackFrameARM64 *frame = static_cast<StackFrameARM64 *>(frames->at(0));
+  StackFrameARM64 *frame = static_cast<StackFrameARM64*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -180,7 +181,7 @@
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
-  StackFrameARM64 *frame = static_cast<StackFrameARM64 *>(frames->at(0));
+  StackFrameARM64 *frame = static_cast<StackFrameARM64*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -236,13 +237,13 @@
   frames = call_stack.frames();
   ASSERT_EQ(3U, frames->size());
 
-  StackFrameARM64 *frame0 = static_cast<StackFrameARM64 *>(frames->at(0));
+  StackFrameARM64 *frame0 = static_cast<StackFrameARM64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM64::CONTEXT_VALID_ALL,
             frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameARM64 *frame1 = static_cast<StackFrameARM64 *>(frames->at(1));
+  StackFrameARM64 *frame1 = static_cast<StackFrameARM64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameARM64::CONTEXT_VALID_PC |
              StackFrameARM64::CONTEXT_VALID_SP),
@@ -250,7 +251,7 @@
   EXPECT_EQ(return_address1, frame1->context.iregs[MD_CONTEXT_ARM64_REG_PC]);
   EXPECT_EQ(frame1_sp.Value(), frame1->context.iregs[MD_CONTEXT_ARM64_REG_SP]);
 
-  StackFrameARM64 *frame2 = static_cast<StackFrameARM64 *>(frames->at(2));
+  StackFrameARM64 *frame2 = static_cast<StackFrameARM64*>(frames->at(2));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame2->trust);
   ASSERT_EQ((StackFrameARM64::CONTEXT_VALID_PC |
              StackFrameARM64::CONTEXT_VALID_SP),
@@ -306,7 +307,7 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameARM64 *frame0 = static_cast<StackFrameARM64 *>(frames->at(0));
+  StackFrameARM64 *frame0 = static_cast<StackFrameARM64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM64::CONTEXT_VALID_ALL,
             frame0->context_validity);
@@ -314,7 +315,7 @@
   EXPECT_EQ("monotreme", frame0->function_name);
   EXPECT_EQ(0x40000100ULL, frame0->function_base);
 
-  StackFrameARM64 *frame1 = static_cast<StackFrameARM64 *>(frames->at(1));
+  StackFrameARM64 *frame1 = static_cast<StackFrameARM64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameARM64::CONTEXT_VALID_PC |
              StackFrameARM64::CONTEXT_VALID_SP),
@@ -375,13 +376,13 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameARM64 *frame0 = static_cast<StackFrameARM64 *>(frames->at(0));
+  StackFrameARM64 *frame0 = static_cast<StackFrameARM64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM64::CONTEXT_VALID_ALL,
             frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameARM64 *frame1 = static_cast<StackFrameARM64 *>(frames->at(1));
+  StackFrameARM64 *frame1 = static_cast<StackFrameARM64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameARM64::CONTEXT_VALID_PC |
              StackFrameARM64::CONTEXT_VALID_SP),
@@ -439,7 +440,7 @@
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
 
-  StackFrameARM64 *frame0 = static_cast<StackFrameARM64 *>(frames->at(0));
+  StackFrameARM64 *frame0 = static_cast<StackFrameARM64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM64::CONTEXT_VALID_ALL,
             frame0->context_validity);
@@ -502,13 +503,13 @@
   frames = call_stack.frames();
   ASSERT_EQ(3U, frames->size());
 
-  StackFrameARM64 *frame0 = static_cast<StackFrameARM64 *>(frames->at(0));
+  StackFrameARM64 *frame0 = static_cast<StackFrameARM64*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM64::CONTEXT_VALID_ALL,
             frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameARM64 *frame1 = static_cast<StackFrameARM64 *>(frames->at(1));
+  StackFrameARM64 *frame1 = static_cast<StackFrameARM64*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
   ASSERT_EQ((StackFrameARM64::CONTEXT_VALID_PC |
              StackFrameARM64::CONTEXT_VALID_LR |
@@ -521,7 +522,7 @@
   EXPECT_EQ(frame2_fp.Value(),
             frame1->context.iregs[MD_CONTEXT_ARM64_REG_FP]);
 
-  StackFrameARM64 *frame2 = static_cast<StackFrameARM64 *>(frames->at(2));
+  StackFrameARM64 *frame2 = static_cast<StackFrameARM64*>(frames->at(2));
   EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame2->trust);
   ASSERT_EQ((StackFrameARM64::CONTEXT_VALID_PC |
              StackFrameARM64::CONTEXT_VALID_LR |
@@ -641,13 +642,13 @@
     frames = call_stack.frames();
     ASSERT_EQ(2U, frames->size());
 
-    StackFrameARM64 *frame0 = static_cast<StackFrameARM64 *>(frames->at(0));
+    StackFrameARM64 *frame0 = static_cast<StackFrameARM64*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(context_frame_validity, frame0->context_validity);
     EXPECT_EQ("enchiridion", frame0->function_name);
     EXPECT_EQ(0x0000000040004000UL, frame0->function_base);
 
-    StackFrameARM64 *frame1 = static_cast<StackFrameARM64 *>(frames->at(1));
+    StackFrameARM64 *frame1 = static_cast<StackFrameARM64*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
     ASSERT_EQ(expected_validity, frame1->context_validity);
     if (expected_validity & StackFrameARM64::CONTEXT_VALID_X1)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm.cc	2021-12-09 12:01:26.000000000 +0000
@@ -78,7 +78,7 @@
 }
 
 StackFrameARM* StackwalkerARM::GetCallerByCFIFrameInfo(
-    const vector<StackFrame*> &frames,
+    const vector<StackFrame*>& frames,
     CFIFrameInfo* cfi_frame_info) {
   StackFrameARM* last_frame = static_cast<StackFrameARM*>(frames.back());
 
@@ -162,7 +162,7 @@
 }
 
 StackFrameARM* StackwalkerARM::GetCallerByStackScan(
-    const vector<StackFrame*> &frames) {
+    const vector<StackFrame*>& frames) {
   StackFrameARM* last_frame = static_cast<StackFrameARM*>(frames.back());
   uint32_t last_sp = last_frame->context.iregs[MD_CONTEXT_ARM_REG_SP];
   uint32_t caller_sp, caller_pc;
@@ -193,7 +193,7 @@
 }
 
 StackFrameARM* StackwalkerARM::GetCallerByFramePointer(
-    const vector<StackFrame*> &frames) {
+    const vector<StackFrame*>& frames) {
   StackFrameARM* last_frame = static_cast<StackFrameARM*>(frames.back());
 
   if (!(last_frame->context_validity &
@@ -245,7 +245,7 @@
     return NULL;
   }
 
-  const vector<StackFrame*> &frames = *stack->frames();
+  const vector<StackFrame*>& frames = *stack->frames();
   StackFrameARM* last_frame = static_cast<StackFrameARM*>(frames.back());
   scoped_ptr<StackFrameARM> frame;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm.h	2021-12-09 12:01:26.000000000 +0000
@@ -75,16 +75,16 @@
   // Use cfi_frame_info (derived from STACK CFI records) to construct
   // the frame that called frames.back(). The caller takes ownership
   // of the returned frame. Return NULL on failure.
-  StackFrameARM* GetCallerByCFIFrameInfo(const vector<StackFrame*> &frames,
+  StackFrameARM* GetCallerByCFIFrameInfo(const vector<StackFrame*>& frames,
                                          CFIFrameInfo* cfi_frame_info);
 
   // Use the frame pointer. The caller takes ownership of the returned frame.
   // Return NULL on failure.
-  StackFrameARM* GetCallerByFramePointer(const vector<StackFrame*> &frames);
+  StackFrameARM* GetCallerByFramePointer(const vector<StackFrame*>& frames);
 
   // Scan the stack for plausible return addresses. The caller takes ownership
   // of the returned frame. Return NULL on failure.
-  StackFrameARM* GetCallerByStackScan(const vector<StackFrame*> &frames);
+  StackFrameARM* GetCallerByStackScan(const vector<StackFrame*>& frames);
 
   // Stores the CPU context corresponding to the youngest stack frame, to
   // be returned by GetContextFrame.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_arm_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -64,6 +64,7 @@
 using std::vector;
 using testing::_;
 using testing::AnyNumber;
+using testing::DoAll;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::Test;
@@ -105,7 +106,7 @@
 
   // Set the Breakpad symbol information that supplier should return for
   // MODULE to INFO.
-  void SetModuleSymbols(MockCodeModule *module, const string &info) {
+  void SetModuleSymbols(MockCodeModule* module, const string& info) {
     size_t buffer_size;
     char *buffer = supplier.CopySymbolDataAndOwnTheCopy(info, &buffer_size);
     EXPECT_CALL(supplier, GetCStringSymbolData(module, &system_info, _, _, _))
@@ -126,7 +127,7 @@
   void BrandContext(MDRawContextARM *raw_context) {
     uint8_t x = 173;
     for (size_t i = 0; i < sizeof(*raw_context); i++)
-      reinterpret_cast<uint8_t *>(raw_context)[i] = (x += 17);
+      reinterpret_cast<uint8_t*>(raw_context)[i] = (x += 17);
   }
 
   SystemInfo system_info;
@@ -139,7 +140,7 @@
   MockSymbolSupplier supplier;
   BasicSourceLineResolver resolver;
   CallStack call_stack;
-  const vector<StackFrame *> *frames;
+  const vector<StackFrame*>* frames;
 };
 
 class SanityCheck: public StackwalkerARMFixture, public Test { };
@@ -160,7 +161,7 @@
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
-  StackFrameARM *frame = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame = static_cast<StackFrameARM*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -183,7 +184,7 @@
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
-  StackFrameARM *frame = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame = static_cast<StackFrameARM*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -203,7 +204,7 @@
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
-  StackFrameARM *frame = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame = static_cast<StackFrameARM*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -259,12 +260,12 @@
   frames = call_stack.frames();
   ASSERT_EQ(3U, frames->size());
 
-  StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame0 = static_cast<StackFrameARM*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameARM *frame1 = static_cast<StackFrameARM *>(frames->at(1));
+  StackFrameARM *frame1 = static_cast<StackFrameARM*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
              StackFrameARM::CONTEXT_VALID_SP),
@@ -272,7 +273,7 @@
   EXPECT_EQ(return_address1, frame1->context.iregs[MD_CONTEXT_ARM_REG_PC]);
   EXPECT_EQ(frame1_sp.Value(), frame1->context.iregs[MD_CONTEXT_ARM_REG_SP]);
 
-  StackFrameARM *frame2 = static_cast<StackFrameARM *>(frames->at(2));
+  StackFrameARM *frame2 = static_cast<StackFrameARM*>(frames->at(2));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame2->trust);
   ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
              StackFrameARM::CONTEXT_VALID_SP),
@@ -328,14 +329,14 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame0 = static_cast<StackFrameARM*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
   EXPECT_EQ("monotreme", frame0->function_name);
   EXPECT_EQ(0x40000100U, frame0->function_base);
 
-  StackFrameARM *frame1 = static_cast<StackFrameARM *>(frames->at(1));
+  StackFrameARM *frame1 = static_cast<StackFrameARM*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
              StackFrameARM::CONTEXT_VALID_SP),
@@ -396,12 +397,12 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame0 = static_cast<StackFrameARM*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameARM *frame1 = static_cast<StackFrameARM *>(frames->at(1));
+  StackFrameARM *frame1 = static_cast<StackFrameARM*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
              StackFrameARM::CONTEXT_VALID_SP),
@@ -459,7 +460,7 @@
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
 
-  StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame0 = static_cast<StackFrameARM*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
@@ -564,13 +565,13 @@
     frames = call_stack.frames();
     ASSERT_EQ(2U, frames->size());
 
-    StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+    StackFrameARM *frame0 = static_cast<StackFrameARM*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(context_frame_validity, frame0->context_validity);
     EXPECT_EQ("enchiridion", frame0->function_name);
     EXPECT_EQ(0x40004000U, frame0->function_base);
 
-    StackFrameARM *frame1 = static_cast<StackFrameARM *>(frames->at(1));
+    StackFrameARM *frame1 = static_cast<StackFrameARM*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
     ASSERT_EQ(expected_validity, frame1->context_validity);
     if (expected_validity & StackFrameARM::CONTEXT_VALID_R1)
@@ -847,12 +848,12 @@
   frames = call_stack.frames();
   ASSERT_EQ(3U, frames->size());
 
-  StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame0 = static_cast<StackFrameARM*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameARM *frame1 = static_cast<StackFrameARM *>(frames->at(1));
+  StackFrameARM *frame1 = static_cast<StackFrameARM*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
   ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
              StackFrameARM::CONTEXT_VALID_LR |
@@ -865,7 +866,7 @@
   EXPECT_EQ(frame2_fp.Value(),
             frame1->context.iregs[MD_CONTEXT_ARM_REG_IOS_FP]);
 
-  StackFrameARM *frame2 = static_cast<StackFrameARM *>(frames->at(2));
+  StackFrameARM *frame2 = static_cast<StackFrameARM*>(frames->at(2));
   EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame2->trust);
   ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
              StackFrameARM::CONTEXT_VALID_LR |
@@ -943,12 +944,12 @@
   frames = call_stack.frames();
   ASSERT_EQ(3U, frames->size());
 
-  StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+  StackFrameARM *frame0 = static_cast<StackFrameARM*>(frames->at(0));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
   ASSERT_EQ(StackFrameARM::CONTEXT_VALID_ALL, frame0->context_validity);
   EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
 
-  StackFrameARM *frame1 = static_cast<StackFrameARM *>(frames->at(1));
+  StackFrameARM *frame1 = static_cast<StackFrameARM*>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
   ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
              StackFrameARM::CONTEXT_VALID_LR |
@@ -964,7 +965,7 @@
   EXPECT_EQ(0x40004000U, frame1->function_base);
 
 
-  StackFrameARM *frame2 = static_cast<StackFrameARM *>(frames->at(2));
+  StackFrameARM *frame2 = static_cast<StackFrameARM*>(frames->at(2));
   EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame2->trust);
   ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
              StackFrameARM::CONTEXT_VALID_LR |
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_selftest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_selftest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_selftest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_selftest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -420,7 +420,7 @@
 // Not i386 or ppc or sparc?  We can only test stacks we know how to walk.
 
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   BPLOG_INIT(&argc, &argv);
 
   // "make check" interprets an exit status of 77 to mean that the test is
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_unittest_utils.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_unittest_utils.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_unittest_utils.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_unittest_utils.h	2021-12-09 12:01:26.000000000 +0000
@@ -57,7 +57,7 @@
   // Set this region's address and contents. If we have placed an
   // instance of this class in a test fixture class, individual tests
   // can use this to provide the region's contents.
-  void Init(uint64_t base_address, const string &contents) {
+  void Init(uint64_t base_address, const string& contents) {
     base_address_ = base_address;
     contents_ = contents;
   }
@@ -65,16 +65,16 @@
   uint64_t GetBase() const { return base_address_; }
   uint32_t GetSize() const { return contents_.size(); }
 
-  bool GetMemoryAtAddress(uint64_t address, uint8_t  *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint8_t*  value) const {
     return GetMemoryLittleEndian(address, value);
   }
-  bool GetMemoryAtAddress(uint64_t address, uint16_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint16_t* value) const {
     return GetMemoryLittleEndian(address, value);
   }
-  bool GetMemoryAtAddress(uint64_t address, uint32_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint32_t* value) const {
     return GetMemoryLittleEndian(address, value);
   }
-  bool GetMemoryAtAddress(uint64_t address, uint64_t *value) const {
+  bool GetMemoryAtAddress(uint64_t address, uint64_t* value) const {
     return GetMemoryLittleEndian(address, value);
   }
   void Print() const {
@@ -85,7 +85,7 @@
   // Fetch a little-endian value from ADDRESS in contents_ whose size
   // is BYTES, and store it in *VALUE. Return true on success.
   template<typename ValueType>
-  bool GetMemoryLittleEndian(uint64_t address, ValueType *value) const {
+  bool GetMemoryLittleEndian(uint64_t address, ValueType* value) const {
     if (address < base_address_ ||
         address - base_address_ + sizeof(ValueType) > contents_.size())
       return false;
@@ -105,7 +105,7 @@
 class MockCodeModule: public google_breakpad::CodeModule {
  public:
   MockCodeModule(uint64_t base_address, uint64_t size,
-                 const string &code_file, const string &version)
+                 const string& code_file, const string& version)
       : base_address_(base_address), size_(size), code_file_(code_file) { }
 
   uint64_t base_address()       const { return base_address_; }
@@ -115,7 +115,7 @@
   string debug_file()       const { return code_file_; }
   string debug_identifier() const { return code_file_; }
   string version()          const { return version_; }
-  google_breakpad::CodeModule *Copy() const {
+  google_breakpad::CodeModule* Copy() const {
     abort(); // Tests won't use this.
   }
   virtual bool is_unloaded() const { return false; }
@@ -134,16 +134,16 @@
   typedef google_breakpad::CodeModule CodeModule;
   typedef google_breakpad::CodeModules CodeModules;
 
-  void Add(const MockCodeModule *module) {
+  void Add(const MockCodeModule* module) {
     modules_.push_back(module);
   }
 
   unsigned int module_count() const { return modules_.size(); }
 
-  const CodeModule *GetModuleForAddress(uint64_t address) const {
+  const CodeModule* GetModuleForAddress(uint64_t address) const {
     for (ModuleVector::const_iterator i = modules_.begin();
          i != modules_.end(); i++) {
-      const MockCodeModule *module = *i;
+      const MockCodeModule* module = *i;
       if (module->base_address() <= address &&
           address - module->base_address() < module->size())
         return module;
@@ -151,30 +151,25 @@
     return NULL;
   };
 
-  const CodeModule *GetMainModule() const { return modules_[0]; }
+  const CodeModule* GetMainModule() const { return modules_[0]; }
 
-  const CodeModule *GetModuleAtSequence(unsigned int sequence) const {
+  const CodeModule* GetModuleAtSequence(unsigned int sequence) const {
     return modules_.at(sequence);
   }
 
-  const CodeModule *GetModuleAtIndex(unsigned int index) const {
+  const CodeModule* GetModuleAtIndex(unsigned int index) const {
     return modules_.at(index);
   }
 
-  CodeModules *Copy() const { abort(); }  // Tests won't use this
+  CodeModules* Copy() const { abort(); }  // Tests won't use this
 
   virtual std::vector<google_breakpad::linked_ptr<const CodeModule> >
   GetShrunkRangeModules() const {
     return std::vector<google_breakpad::linked_ptr<const CodeModule> >();
   }
 
-  // Returns true, if module address range shrink is enabled.
-  bool IsModuleShrinkEnabled() const {
-    return false;
-  }
-
  private:
-  typedef std::vector<const MockCodeModule *> ModuleVector;
+  typedef std::vector<const MockCodeModule*> ModuleVector;
   ModuleVector modules_;
 };
 
@@ -182,26 +177,26 @@
  public:
   typedef google_breakpad::CodeModule CodeModule;
   typedef google_breakpad::SystemInfo SystemInfo;
-  MOCK_METHOD3(GetSymbolFile, SymbolResult(const CodeModule *module,
-                                           const SystemInfo *system_info,
-                                           string *symbol_file));
-  MOCK_METHOD4(GetSymbolFile, SymbolResult(const CodeModule *module,
-                                           const SystemInfo *system_info,
-                                           string *symbol_file,
-                                           string *symbol_data));
-  MOCK_METHOD5(GetCStringSymbolData, SymbolResult(const CodeModule *module,
-                                                  const SystemInfo *system_info,
-                                                  string *symbol_file,
-                                                  char **symbol_data,
-                                                  size_t *symbol_data_size));
-  MOCK_METHOD1(FreeSymbolData, void(const CodeModule *module));
+  MOCK_METHOD3(GetSymbolFile, SymbolResult(const CodeModule* module,
+                                           const SystemInfo* system_info,
+                                           string* symbol_file));
+  MOCK_METHOD4(GetSymbolFile, SymbolResult(const CodeModule* module,
+                                           const SystemInfo* system_info,
+                                           string* symbol_file,
+                                           string* symbol_data));
+  MOCK_METHOD5(GetCStringSymbolData, SymbolResult(const CodeModule* module,
+                                                  const SystemInfo* system_info,
+                                                  string* symbol_file,
+                                                  char** symbol_data,
+                                                  size_t* symbol_data_size));
+  MOCK_METHOD1(FreeSymbolData, void(const CodeModule* module));
 
   // Copies the passed string contents into a newly allocated buffer.
   // The newly allocated buffer will be freed during destruction.
-  char* CopySymbolDataAndOwnTheCopy(const string &info,
-                                    size_t *symbol_data_size) {
+  char* CopySymbolDataAndOwnTheCopy(const string& info,
+                                    size_t* symbol_data_size) {
     *symbol_data_size = info.size() + 1;
-    char *symbol_data = new char[*symbol_data_size];
+    char* symbol_data = new char[*symbol_data_size];
     memcpy(symbol_data, info.c_str(), info.size());
     symbol_data[info.size()] = '\0';
     symbol_data_to_free_.push_back(symbol_data);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86.cc	2021-12-09 12:01:26.000000000 +0000
@@ -136,7 +136,7 @@
 }
 
 StackFrameX86* StackwalkerX86::GetCallerByWindowsFrameInfo(
-    const vector<StackFrame*> &frames,
+    const vector<StackFrame*>& frames,
     WindowsFrameInfo* last_frame_info,
     bool stack_scan_allowed) {
   StackFrame::FrameTrust trust = StackFrame::FRAME_TRUST_NONE;
@@ -514,7 +514,7 @@
 }
 
 StackFrameX86* StackwalkerX86::GetCallerByCFIFrameInfo(
-    const vector<StackFrame*> &frames,
+    const vector<StackFrame*>& frames,
     CFIFrameInfo* cfi_frame_info) {
   StackFrameX86* last_frame = static_cast<StackFrameX86*>(frames.back());
   last_frame->cfi_frame_info = cfi_frame_info;
@@ -539,7 +539,7 @@
 }
 
 StackFrameX86* StackwalkerX86::GetCallerByEBPAtBase(
-    const vector<StackFrame*> &frames,
+    const vector<StackFrame*>& frames,
     bool stack_scan_allowed) {
   StackFrame::FrameTrust trust;
   StackFrameX86* last_frame = static_cast<StackFrameX86*>(frames.back());
@@ -632,7 +632,7 @@
     return NULL;
   }
 
-  const vector<StackFrame*> &frames = *stack->frames();
+  const vector<StackFrame*>& frames = *stack->frames();
   StackFrameX86* last_frame = static_cast<StackFrameX86*>(frames.back());
   scoped_ptr<StackFrameX86> new_frame;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86.h	2021-12-09 12:01:26.000000000 +0000
@@ -81,14 +81,14 @@
   // to construct the frame that called frames.back(). The caller
   // takes ownership of the returned frame. Return NULL on failure.
   StackFrameX86* GetCallerByWindowsFrameInfo(
-      const vector<StackFrame*> &frames,
+      const vector<StackFrame*>& frames,
       WindowsFrameInfo* windows_frame_info,
       bool stack_scan_allowed);
 
   // Use cfi_frame_info (derived from STACK CFI records) to construct
   // the frame that called frames.back(). The caller takes ownership
   // of the returned frame. Return NULL on failure.
-  StackFrameX86* GetCallerByCFIFrameInfo(const vector<StackFrame*> &frames,
+  StackFrameX86* GetCallerByCFIFrameInfo(const vector<StackFrame*>& frames,
                                          CFIFrameInfo* cfi_frame_info);
 
   // Assuming a traditional frame layout --- where the caller's %ebp
@@ -96,7 +96,7 @@
   // %ebp points to the saved %ebp --- construct the frame that called
   // frames.back(). The caller takes ownership of the returned frame.
   // Return NULL on failure.
-  StackFrameX86* GetCallerByEBPAtBase(const vector<StackFrame*> &frames,
+  StackFrameX86* GetCallerByEBPAtBase(const vector<StackFrame*>& frames,
                                       bool stack_scan_allowed);
 
   // Stores the CPU context corresponding to the innermost stack frame to
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/stackwalker_x86_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -63,6 +63,7 @@
 using std::vector;
 using testing::_;
 using testing::AnyNumber;
+using testing::DoAll;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::Test;
@@ -112,7 +113,7 @@
 
   // Set the Breakpad symbol information that supplier should return for
   // MODULE to INFO.
-  void SetModuleSymbols(MockCodeModule *module, const string &info) {
+  void SetModuleSymbols(MockCodeModule* module, const string& info) {
     size_t buffer_size;
     char *buffer = supplier.CopySymbolDataAndOwnTheCopy(info, &buffer_size);
     EXPECT_CALL(supplier, GetCStringSymbolData(module, &system_info, _, _, _))
@@ -133,7 +134,7 @@
   void BrandContext(MDRawContextX86 *raw_context) {
     uint8_t x = 173;
     for (size_t i = 0; i < sizeof(*raw_context); i++)
-      reinterpret_cast<uint8_t *>(raw_context)[i] = (x += 17);
+      reinterpret_cast<uint8_t*>(raw_context)[i] = (x += 17);
   }
 
   SystemInfo system_info;
@@ -150,7 +151,7 @@
   MockSymbolSupplier supplier;
   BasicSourceLineResolver resolver;
   CallStack call_stack;
-  const vector<StackFrame *> *frames;
+  const vector<StackFrame*>* frames;
 };
 
 class SanityCheck: public StackwalkerX86Fixture, public Test { };
@@ -174,7 +175,7 @@
   ASSERT_EQ("module1", modules_without_symbols[0]->debug_file());
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
-  StackFrameX86 *frame = static_cast<StackFrameX86 *>(frames->at(0));
+  StackFrameX86 *frame = static_cast<StackFrameX86*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -200,7 +201,7 @@
   ASSERT_EQ("module1", modules_without_symbols[0]->debug_file());
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
-  StackFrameX86 *frame = static_cast<StackFrameX86 *>(frames->at(0));
+  StackFrameX86 *frame = static_cast<StackFrameX86*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -223,7 +224,7 @@
   ASSERT_EQ("module1", modules_without_symbols[0]->debug_file());
   ASSERT_EQ(0U, modules_with_corrupt_symbols.size());
   frames = call_stack.frames();
-  StackFrameX86 *frame = static_cast<StackFrameX86 *>(frames->at(0));
+  StackFrameX86 *frame = static_cast<StackFrameX86*>(frames->at(0));
   // Check that the values from the original raw context made it
   // through to the context in the stack frame.
   EXPECT_EQ(0, memcmp(&raw_context, &frame->context, sizeof(raw_context)));
@@ -268,7 +269,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     EXPECT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x4000c7a5U, frame0->instruction);
@@ -278,7 +279,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -332,7 +333,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x4000f49dU, frame0->instruction);
@@ -343,7 +344,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -398,7 +399,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x4000f49dU, frame0->instruction);
@@ -409,7 +410,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -464,7 +465,7 @@
   ASSERT_EQ(1U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x4000f49dU, frame0->instruction);
@@ -523,7 +524,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x4000aa85U, frame0->instruction);
@@ -534,7 +535,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -604,7 +605,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x4000aa85U, frame0->instruction);
@@ -615,7 +616,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -692,7 +693,7 @@
   ASSERT_EQ(3U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x40001004U, frame0->instruction);
@@ -713,7 +714,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -736,7 +737,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame2 = static_cast<StackFrameX86 *>(frames->at(2));
+    StackFrameX86 *frame2 = static_cast<StackFrameX86*>(frames->at(2));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame2->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -792,7 +793,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x40000c9cU, frame0->instruction);
@@ -803,7 +804,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
     // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the walker
     // does not actually fetch the EBP after a scan (forcing the next frame
@@ -881,7 +882,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x40000700U, frame0->instruction);
@@ -892,7 +893,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI_SCAN, frame1->trust);
     // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the
     // walker does not actually fetch the EBP after a scan (forcing the
@@ -954,7 +955,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x4000e8b8U, frame0->instruction);
@@ -975,7 +976,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -1038,7 +1039,7 @@
   ASSERT_EQ(2U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x40009ab8U, frame0->instruction);
@@ -1059,7 +1060,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -1169,8 +1170,8 @@
   StackFrameSymbolizer frame_symbolizer(&supplier, &resolver);
   StackwalkerX86 walker(&system_info, &raw_context, &stack_region, &modules,
                         &frame_symbolizer);
-  vector<const CodeModule *> modules_without_symbols;
-  vector<const CodeModule *> modules_with_corrupt_symbols;
+  vector<const CodeModule*> modules_without_symbols;
+  vector<const CodeModule*> modules_with_corrupt_symbols;
   ASSERT_TRUE(walker.Walk(&call_stack, &modules_without_symbols,
                           &modules_with_corrupt_symbols));
   ASSERT_EQ(0U, modules_without_symbols.size());
@@ -1179,31 +1180,31 @@
 
   ASSERT_EQ(5U, frames->size());
   {
-    const StackFrameX86 &frame = *static_cast<StackFrameX86 *>(frames->at(0));
+    const StackFrameX86& frame = *static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame.trust);
     EXPECT_EQ(0x77726bf4U, frame.context.eip);
     EXPECT_EQ("KiFastSystemCallRet", frame.function_name);
   }
   {
-    const StackFrameX86 &frame = *static_cast<StackFrameX86 *>(frames->at(1));
+    const StackFrameX86& frame = *static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame.trust);
     EXPECT_EQ(0x7772655cU, frame.context.eip);
     EXPECT_EQ("NtWaitForKeyedEvent", frame.function_name);
   }
   {
-    const StackFrameX86 &frame = *static_cast<StackFrameX86 *>(frames->at(2));
+    const StackFrameX86& frame = *static_cast<StackFrameX86*>(frames->at(2));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame.trust);
     EXPECT_EQ(0x776e4a3fU, frame.context.eip);
     EXPECT_EQ("RtlSleepConditionVariableSRW", frame.function_name);
   }
   {
-    const StackFrameX86 &frame = *static_cast<StackFrameX86 *>(frames->at(3));
+    const StackFrameX86& frame = *static_cast<StackFrameX86*>(frames->at(3));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame.trust);
     EXPECT_EQ(0x7728219eU, frame.context.eip);
     EXPECT_EQ("SleepConditionVariableSRW", frame.function_name);
   }
   {
-    const StackFrameX86 &frame = *static_cast<StackFrameX86 *>(frames->at(4));
+    const StackFrameX86& frame = *static_cast<StackFrameX86*>(frames->at(4));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame.trust);
     EXPECT_EQ(0x5ac0486cU, frame.context.eip);
     EXPECT_EQ("base::ConditionVariable::TimedWait", frame.function_name);
@@ -1317,7 +1318,7 @@
   ASSERT_EQ(4U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x771ef8c1U, frame0->instruction);
@@ -1337,7 +1338,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
                | StackFrameX86::CONTEXT_VALID_ESP
@@ -1531,7 +1532,7 @@
   ASSERT_EQ(3U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(0x77c181cdU, frame0->instruction);
@@ -1553,7 +1554,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI_SCAN, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
                StackFrameX86::CONTEXT_VALID_ESP |
@@ -1577,7 +1578,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame2 = static_cast<StackFrameX86 *>(frames->at(2));
+    StackFrameX86 *frame2 = static_cast<StackFrameX86*>(frames->at(2));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame2->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
                StackFrameX86::CONTEXT_VALID_ESP |
@@ -1609,7 +1610,7 @@
   MockCodeModule chrome_dll(0x59630000, 0x19e3000, "chrome.dll", "version1");
   SetModuleSymbols(&chrome_dll,  // chrome.dll
                    "FUNC 56422 50c 8 base::MessageLoop::RunTask"
-                   "(base::PendingTask const &)\n"
+                   "(base::PendingTask const&)\n"
                    "56422 e 458 4589\n"
                    "STACK WIN 4 56422 50c 11 0 8 c ac 0 1 $T1 .raSearch = $T0 "
                    "$T1 4 - 8 @ = $ebp $T1 4 - ^ = $eip $T1 ^ = $esp $T1 4 + = "
@@ -1626,7 +1627,7 @@
                    "$T1 4 - 64 @ = $ebp $T1 4 - ^ = $eip $T1 ^ = $esp $T1 4 + "
                    "= $20 $T0 56 - ^ =  $23 $T0 60 - ^ =  $24 $T0 64 - ^ =\n"
                    "FUNC 55bf0 49 4 base::MessagePumpWin::Run(base::"
-                   "MessagePump::Delegate *)\n"
+                   "MessagePump::Delegate*)\n"
                    "55bf0 49 48 4724\n"
                    "STACK WIN 4 55bf0 49 c 0 4 0 10 0 1 $T0 $ebp = $eip $T0 4 "
                    "+ ^ = $ebp $T0 ^ = $esp $T0 8 + =\n"
@@ -1734,7 +1735,7 @@
   ASSERT_EQ(3U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame->context_validity);
     EXPECT_EQ("base::MessagePumpForIO::DoRunLoop()", frame->function_name);
@@ -1755,13 +1756,13 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
                StackFrameX86::CONTEXT_VALID_ESP |
                StackFrameX86::CONTEXT_VALID_EBP),
               frame->context_validity);
-    EXPECT_EQ("base::MessagePumpWin::Run(base::MessagePump::Delegate *)",
+    EXPECT_EQ("base::MessagePumpWin::Run(base::MessagePump::Delegate*)",
               frame->function_name);
     EXPECT_EQ(1500011566U, frame->instruction + 1);
     EXPECT_EQ(1500011566U, frame->context.eip);
@@ -1778,7 +1779,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame = static_cast<StackFrameX86 *>(frames->at(2));
+    StackFrameX86 *frame = static_cast<StackFrameX86*>(frames->at(2));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
                StackFrameX86::CONTEXT_VALID_ESP |
@@ -1983,7 +1984,7 @@
   ASSERT_EQ(4U, frames->size());
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
     ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
     EXPECT_EQ(raw_context.eip, frame0->context.eip);
@@ -1995,7 +1996,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
     EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
                StackFrameX86::CONTEXT_VALID_ESP |
@@ -2015,7 +2016,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame2 = static_cast<StackFrameX86 *>(frames->at(2));
+    StackFrameX86 *frame2 = static_cast<StackFrameX86*>(frames->at(2));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame2->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
                StackFrameX86::CONTEXT_VALID_ESP |
@@ -2035,7 +2036,7 @@
   }
 
   {  // To avoid reusing locals by mistake
-    StackFrameX86 *frame3 = static_cast<StackFrameX86 *>(frames->at(3));
+    StackFrameX86 *frame3 = static_cast<StackFrameX86*>(frames->at(3));
     EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame3->trust);
     ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
                StackFrameX86::CONTEXT_VALID_ESP |
@@ -2125,7 +2126,7 @@
     ASSERT_EQ(2U, frames->size());
 
     {  // To avoid reusing locals by mistake
-      StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+      StackFrameX86 *frame0 = static_cast<StackFrameX86*>(frames->at(0));
       EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
       ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
       EXPECT_EQ("enchiridion", frame0->function_name);
@@ -2137,7 +2138,7 @@
     }
 
     {  // To avoid reusing locals by mistake
-      StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+      StackFrameX86 *frame1 = static_cast<StackFrameX86*>(frames->at(1));
       EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
       ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
                  StackFrameX86::CONTEXT_VALID_ESP |
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map.h	2021-12-09 12:01:26.000000000 +0000
@@ -52,15 +52,15 @@
 class StaticAddressMap {
  public:
   StaticAddressMap(): map_() { }
-  explicit StaticAddressMap(const char *map_data): map_(map_data) { }
+  explicit StaticAddressMap(const char* map_data): map_(map_data) { }
 
   // Locates the entry stored at the highest address less than or equal to
   // the address argument.  If there is no such range, returns false.  The
   // entry is returned in entry, which is a required argument.  If
   // entry_address is not NULL, it will be set to the address that the entry
   // was stored at.
-  bool Retrieve(const AddressType &address,
-                const EntryType *&entry, AddressType *entry_address) const;
+  bool Retrieve(const AddressType& address,
+                const EntryType*& entry, AddressType* entry_address) const;
 
  private:
   friend class ModuleComparer;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -44,8 +44,8 @@
 
 template<typename AddressType, typename EntryType>
 bool StaticAddressMap<AddressType, EntryType>::Retrieve(
-    const AddressType &address,
-    const EntryType *&entry, AddressType *entry_address) const {
+    const AddressType& address,
+    const EntryType*& entry, AddressType* entry_address) const {
 
   // upper_bound gives the first element whose key is greater than address,
   // but we want the first element whose key is less than or equal to address.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_address_map_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -95,7 +95,7 @@
     int address_test;
     string entry;
     string entry_test;
-    const char *entry_cstring = NULL;
+    const char* entry_cstring = NULL;
     bool found;
     bool found_test;
 
@@ -143,11 +143,11 @@
   // Test data sets:
   static const int kNumberTestCases = 4;
   static const int testsize[];
-  int *testdata[kNumberTestCases];
+  int* testdata[kNumberTestCases];
 
   AddrMap addr_map[kNumberTestCases];
   TestMap test_map[kNumberTestCases];
-  char *map_data[kNumberTestCases];
+  char* map_data[kNumberTestCases];
   google_breakpad::AddressMapSerializer<int, string> serializer;
 };
 
@@ -229,7 +229,7 @@
   }
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
 
   return RUN_ALL_TESTS();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_contained_range_map.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_contained_range_map.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_contained_range_map.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_contained_range_map.h	2021-12-09 12:01:26.000000000 +0000
@@ -57,7 +57,7 @@
   // child ranges, and not the entry contained by |this|.  This is necessary
   // to support a sparsely-populated root range.  If no descendant range
   // encompasses the address, returns false.
-  bool RetrieveRange(const AddressType &address, const EntryType *&entry) const;
+  bool RetrieveRange(const AddressType& address, const EntryType*& entry) const;
 
  private:
   friend class ModuleComparer;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_contained_range_map-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_contained_range_map-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_contained_range_map-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_contained_range_map-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -47,7 +47,7 @@
     const char *base)
     : base_(*(reinterpret_cast<const AddressType*>(base))),
       entry_size_(*(reinterpret_cast<const uint32_t*>(base + sizeof(base_)))),
-      entry_ptr_(reinterpret_cast<const EntryType *>(
+      entry_ptr_(reinterpret_cast<const EntryType*>(
           base + sizeof(base_) + sizeof(entry_size_))),
       map_(base + sizeof(base_) + sizeof(entry_size_) + entry_size_) {
   if (entry_size_ == 0)
@@ -57,7 +57,7 @@
 
 template<typename AddressType, typename EntryType>
 bool StaticContainedRangeMap<AddressType, EntryType>::RetrieveRange(
-    const AddressType &address, const EntryType *&entry) const {
+    const AddressType& address, const EntryType*& entry) const {
 
   // Get an iterator to the child range whose high address is equal to or
   // greater than the supplied address.  If the supplied address is higher
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map.h	2021-12-09 12:01:26.000000000 +0000
@@ -72,7 +72,7 @@
 template<typename Key>
 class DefaultCompare {
  public:
-  int operator()(const Key &k1, const Key &k2) const {
+  int operator()(const Key& k1, const Key& k2) const {
     if (k1 < k2) return -1;
     if (k1 == k2) return 0;
     return 1;
@@ -104,15 +104,15 @@
   }
 
   // Lookup operations.
-  iterator find(const Key &k) const;
+  iterator find(const Key& k) const;
 
   // lower_bound(k) searches in a sorted range for the first element that has a
   // key not less than the argument k.
-  iterator lower_bound(const Key &k) const;
+  iterator lower_bound(const Key& k) const;
 
   // upper_bound(k) searches in a sorted range for the first element that has a
   // key greater than the argument k.
-  iterator upper_bound(const Key &k) const;
+  iterator upper_bound(const Key& k) const;
 
   // Checks if the underlying memory data conforms to the predefined pattern:
   // first check the number of nodes is non-negative,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -59,7 +59,7 @@
 // find(), lower_bound() and upper_bound() implement binary search algorithm.
 template<typename Key, typename Value, typename Compare>
 StaticMapIterator<Key, Value, Compare>
-StaticMap<Key, Value, Compare>::find(const Key &key) const {
+StaticMap<Key, Value, Compare>::find(const Key& key) const {
   int begin = 0;
   int end = num_nodes_;
   int middle;
@@ -80,7 +80,7 @@
 
 template<typename Key, typename Value, typename Compare>
 StaticMapIterator<Key, Value, Compare>
-StaticMap<Key, Value, Compare>::lower_bound(const Key &key) const {
+StaticMap<Key, Value, Compare>::lower_bound(const Key& key) const {
   int begin = 0;
   int end = num_nodes_;
   int middle;
@@ -101,7 +101,7 @@
 
 template<typename Key, typename Value, typename Compare>
 StaticMapIterator<Key, Value, Compare>
-StaticMap<Key, Value, Compare>::upper_bound(const Key &key) const {
+StaticMap<Key, Value, Compare>::upper_bound(const Key& key) const {
   int begin = 0;
   int end = num_nodes_;
   int middle;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_iterator.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_iterator.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_iterator.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_iterator.h	2021-12-09 12:01:26.000000000 +0000
@@ -87,7 +87,7 @@
   friend class StaticMap<Key, Value, Compare>;
 
   // Only StaticMap can call this constructor.
-  explicit StaticMapIterator(const char* base, const int32_t &index);
+  explicit StaticMapIterator(const char* base, const int32_t& index);
 
   // Index of node that the iterator is pointing to.
   int32_t index_;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_iterator-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_iterator-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_iterator-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_iterator-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -43,7 +43,7 @@
 
 template<typename Key, typename Value, typename Compare>
 StaticMapIterator<Key, Value, Compare>::StaticMapIterator(const char* base,
-                                                            const int &index):
+                                                            const int& index):
       index_(index), base_(base) {
   // See static_map.h for documentation on
   // bytes format of serialized StaticMap data.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_map_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -46,7 +46,7 @@
 template<typename Key, typename Value>
 class SimpleMapSerializer {
  public:
-  static char* Serialize(const std::map<Key, Value> &stdmap,
+  static char* Serialize(const std::map<Key, Value>& stdmap,
                    unsigned int* size = NULL) {
     unsigned int size_per_node =
         sizeof(uint32_t) + sizeof(Key) + sizeof(Value);
@@ -237,19 +237,19 @@
     }
   }
 
-  void FindTester(int test_case, const KeyType &key) {
+  void FindTester(int test_case, const KeyType& key) {
     iter_test = test_map[test_case].find(key);
     iter_std = std_map[test_case].find(key);
     CompareLookupResult(test_case);
   }
 
-  void LowerBoundTester(int test_case, const KeyType &key) {
+  void LowerBoundTester(int test_case, const KeyType& key) {
     iter_test = test_map[test_case].lower_bound(key);
     iter_std = std_map[test_case].lower_bound(key);
     CompareLookupResult(test_case);
   }
 
-  void UpperBoundTester(int test_case, const KeyType &key) {
+  void UpperBoundTester(int test_case, const KeyType& key) {
     iter_test = test_map[test_case].upper_bound(key);
     iter_std = std_map[test_case].upper_bound(key);
     CompareLookupResult(test_case);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map.h	2021-12-09 12:01:26.000000000 +0000
@@ -50,21 +50,21 @@
 class StaticRangeMap {
  public:
   StaticRangeMap(): map_() { }
-  explicit StaticRangeMap(const char *memory): map_(memory) { }
+  explicit StaticRangeMap(const char* memory): map_(memory) { }
 
   // Locates the range encompassing the supplied address.  If there is
   // no such range, returns false.  entry_base and entry_size, if non-NULL,
   // are set to the base and size of the entry's range.
-  bool RetrieveRange(const AddressType &address, const EntryType *&entry,
-                     AddressType *entry_base, AddressType *entry_size) const;
+  bool RetrieveRange(const AddressType& address, const EntryType*& entry,
+                     AddressType* entry_base, AddressType* entry_size) const;
 
   // Locates the range encompassing the supplied address, if one exists.
   // If no range encompasses the supplied address, locates the nearest range
   // to the supplied address that is lower than the address.  Returns false
   // if no range meets these criteria.  entry_base and entry_size, if
   // non-NULL, are set to the base and size of the entry's range.
-  bool RetrieveNearestRange(const AddressType &address, const EntryType *&entry,
-                            AddressType *entry_base, AddressType *entry_size)
+  bool RetrieveNearestRange(const AddressType& address, const EntryType*& entry,
+                            AddressType* entry_base, AddressType* entry_size)
                             const;
 
   // Treating all ranges as a list ordered by the address spaces that they
@@ -74,8 +74,8 @@
   // range.
   //
   // RetrieveRangeAtIndex is not optimized for speedy operation.
-  bool RetrieveRangeAtIndex(int index, const EntryType *&entry,
-                            AddressType *entry_base, AddressType *entry_size)
+  bool RetrieveRangeAtIndex(int index, const EntryType*& entry,
+                            AddressType* entry_base, AddressType* entry_size)
                             const;
 
   // Returns the number of ranges stored in the RangeMap.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map-inl.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map-inl.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map-inl.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map-inl.h	2021-12-09 12:01:26.000000000 +0000
@@ -43,8 +43,8 @@
 
 template<typename AddressType, typename EntryType>
 bool StaticRangeMap<AddressType, EntryType>::RetrieveRange(
-    const AddressType &address, const EntryType *&entry,
-    AddressType *entry_base, AddressType *entry_size) const {
+    const AddressType& address, const EntryType*& entry,
+    AddressType* entry_base, AddressType* entry_size) const {
   MapConstIterator iterator = map_.lower_bound(address);
   if (iterator == map_.end())
     return false;
@@ -55,7 +55,7 @@
   // be below the range's low address, though.  When that happens, address
   // references something not within any range, so return false.
 
-  const Range *range = iterator.GetValuePtr();
+  const Range* range = iterator.GetValuePtr();
 
   // Make sure AddressType and EntryType are copyable basic types
   // e.g.: integer types, pointers etc
@@ -74,8 +74,8 @@
 
 template<typename AddressType, typename EntryType>
 bool StaticRangeMap<AddressType, EntryType>::RetrieveNearestRange(
-    const AddressType &address, const EntryType *&entry,
-    AddressType *entry_base, AddressType *entry_size) const {
+    const AddressType& address, const EntryType*& entry,
+    AddressType* entry_base, AddressType* entry_size) const {
   // If address is within a range, RetrieveRange can handle it.
   if (RetrieveRange(address, entry, entry_base, entry_size))
     return true;
@@ -91,7 +91,7 @@
     return false;
   --iterator;
 
-  const Range *range = iterator.GetValuePtr();
+  const Range* range = iterator.GetValuePtr();
   entry = range->entryptr();
   if (entry_base)
     *entry_base = range->base();
@@ -103,8 +103,8 @@
 
 template<typename AddressType, typename EntryType>
 bool StaticRangeMap<AddressType, EntryType>::RetrieveRangeAtIndex(
-    int index, const EntryType *&entry,
-    AddressType *entry_base, AddressType *entry_size) const {
+    int index, const EntryType*& entry,
+    AddressType* entry_base, AddressType* entry_size) const {
 
   if (index >= GetCount()) {
     BPLOG(ERROR) << "Index out of range: " << index << "/" << GetCount();
@@ -113,7 +113,7 @@
 
   MapConstIterator iterator = map_.IteratorAtIndex(index);
 
-  const Range *range = iterator.GetValuePtr();
+  const Range* range = iterator.GetValuePtr();
 
   entry = range->entryptr();
   if (entry_base)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/static_range_map_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -414,7 +414,7 @@
 
 }  // namespace google_breakpad
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
 
   return RUN_ALL_TESTS();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/synth_minidump.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/synth_minidump.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/synth_minidump.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/synth_minidump.cc	2021-12-09 12:01:26.000000000 +0000
@@ -37,7 +37,7 @@
 
 namespace SynthMinidump {
 
-Section::Section(const Dump &dump)
+Section::Section(const Dump& dump)
   : test_assembler::Section(dump.endianness()) { }
 
 void Section::CiteLocationIn(test_assembler::Section *section) const {
@@ -49,9 +49,9 @@
   CiteLocationIn(section);
 }
 
-SystemInfo::SystemInfo(const Dump &dump,
-                       const MDRawSystemInfo &system_info,
-                       const String &csd_version)
+SystemInfo::SystemInfo(const Dump& dump,
+                       const MDRawSystemInfo& system_info,
+                       const String& csd_version)
     : Stream(dump, MD_SYSTEM_INFO_STREAM) {
   D16(system_info.processor_architecture);
   D16(system_info.processor_level);
@@ -108,7 +108,7 @@
 
 const string SystemInfo::windows_x86_csd_version = "Service Pack 2";
 
-String::String(const Dump &dump, const string &contents) : Section(dump) {
+String::String(const Dump& dump, const string& contents) : Section(dump) {
   D32(contents.size() * 2);
   for (string::const_iterator i = contents.begin(); i != contents.end(); i++)
     D16(*i);
@@ -123,7 +123,7 @@
   CiteLocationIn(section);
 }
 
-Context::Context(const Dump &dump, const MDRawContextX86 &context)
+Context::Context(const Dump& dump, const MDRawContextX86& context)
   : Section(dump) {
   // The caller should have properly set the CPU type flag.
   // The high 24 bits identify the CPU.  Note that context records with no CPU
@@ -173,7 +173,7 @@
   assert(Size() == sizeof(MDRawContextX86));
 }
 
-Context::Context(const Dump &dump, const MDRawContextARM &context)
+Context::Context(const Dump& dump, const MDRawContextARM& context)
   : Section(dump) {
   // The caller should have properly set the CPU type flag.
   assert((context.context_flags & MD_CONTEXT_ARM) ||
@@ -192,7 +192,7 @@
   assert(Size() == sizeof(MDRawContextARM));
 }
 
-Context::Context(const Dump &dump, const MDRawContextMIPS &context)
+Context::Context(const Dump& dump, const MDRawContextMIPS& context)
     : Section(dump) {
   // The caller should have properly set the CPU type flag.
   assert(context.context_flags & MD_CONTEXT_MIPS);
@@ -228,8 +228,8 @@
   assert(Size() == sizeof(MDRawContextMIPS));
 }
 
-Thread::Thread(const Dump &dump,
-               uint32_t thread_id, const Memory &stack, const Context &context,
+Thread::Thread(const Dump& dump,
+               uint32_t thread_id, const Memory& stack, const Context& context,
                uint32_t suspend_count, uint32_t priority_class,
                uint32_t priority, uint64_t teb) : Section(dump) {
   D32(thread_id);
@@ -242,13 +242,13 @@
   assert(Size() == sizeof(MDRawThread));
 }
 
-Module::Module(const Dump &dump,
+Module::Module(const Dump& dump,
                uint64_t base_of_image,
                uint32_t size_of_image,
-               const String &name,
+               const String& name,
                uint32_t time_date_stamp,
                uint32_t checksum,
-               const MDVSFixedFileInfo &version_info,
+               const MDVSFixedFileInfo& version_info,
                const Section *cv_record,
                const Section *misc_record) : Section(dump) {
   D64(base_of_image);
@@ -297,10 +297,10 @@
   0                                     // file_date_lo
 };
 
-UnloadedModule::UnloadedModule(const Dump &dump,
+UnloadedModule::UnloadedModule(const Dump& dump,
                                uint64_t base_of_image,
                                uint32_t size_of_image,
-                               const String &name,
+                               const String& name,
                                uint32_t checksum,
                                uint32_t time_date_stamp) : Section(dump) {
   D64(base_of_image);
@@ -310,15 +310,15 @@
   name.CiteStringIn(this);
 }
 
-UnloadedModuleList::UnloadedModuleList(const Dump &dump, uint32_t type)
+UnloadedModuleList::UnloadedModuleList(const Dump& dump, uint32_t type)
   : List<UnloadedModule>(dump, type, false) {
   D32(sizeof(MDRawUnloadedModuleList));
   D32(sizeof(MDRawUnloadedModule));
   D32(count_label_);
 }
 
-Exception::Exception(const Dump &dump,
-                     const Context &context,
+Exception::Exception(const Dump& dump,
+                     const Context& context,
                      uint32_t thread_id,
                      uint32_t exception_code,
                      uint32_t exception_flags,
@@ -332,7 +332,7 @@
   D64(exception_address);
   D32(0);  // number_parameters
   D32(0);  // __align
-  for (int i = 0; i < MD_EXCEPTION_MAXIMUM_PARAMETERS; ++i)
+  for (size_t i = 0; i < MD_EXCEPTION_MAXIMUM_PARAMETERS; ++i)
     D64(0);  // exception_information
   context.CiteLocationIn(this);
   assert(Size() == sizeof(MDRawExceptionStream));
@@ -361,22 +361,22 @@
   assert(Size() == sizeof(MDRawHeader));
 }
 
-Dump &Dump::Add(SynthMinidump::Section *section) {
+Dump& Dump::Add(SynthMinidump::Section *section) {
   section->Finish(file_start_ + Size());
   Append(*section);
   return *this;
 }
 
-Dump &Dump::Add(Stream *stream) {
-  Add(static_cast<SynthMinidump::Section *>(stream));
+Dump& Dump::Add(Stream *stream) {
+  Add(static_cast<SynthMinidump::Section*>(stream));
   stream->CiteStreamIn(&stream_directory_);
   stream_count_++;
   return *this;
 }
 
-Dump &Dump::Add(Memory *memory) {
+Dump& Dump::Add(Memory *memory) {
   // Add the memory contents themselves to the file.
-  Add(static_cast<SynthMinidump::Section *>(memory));
+  Add(static_cast<SynthMinidump::Section*>(memory));
 
   // The memory list is a list of MDMemoryDescriptors, not of actual
   // memory elements. Produce a descriptor, and add that to the list.
@@ -386,17 +386,17 @@
   return *this;
 }
 
-Dump &Dump::Add(Thread *thread) {
+Dump& Dump::Add(Thread *thread) {
   thread_list_.Add(thread);
   return *this;
 }
 
-Dump &Dump::Add(Module *module) {
+Dump& Dump::Add(Module *module) {
   module_list_.Add(module);
   return *this;
 }
 
-Dump &Dump::Add(UnloadedModule *unloaded_module) {
+Dump& Dump::Add(UnloadedModule *unloaded_module) {
   unloaded_module_list_.Add(unloaded_module);
   return *this;
 }
@@ -413,7 +413,7 @@
   // has the stream count and MDRVA.
   stream_count_label_ = stream_count_;
   stream_directory_rva_ = file_start_ + Size();
-  Append(static_cast<test_assembler::Section &>(stream_directory_));
+  Append(static_cast<test_assembler::Section& >(stream_directory_));
 }
 
 } // namespace SynthMinidump
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/synth_minidump.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/synth_minidump.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/synth_minidump.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/synth_minidump.h	2021-12-09 12:01:26.000000000 +0000
@@ -135,7 +135,7 @@
 // A test_assembler::Section which will be appended to a minidump.
 class Section: public test_assembler::Section {
  public:
-  explicit Section(const Dump &dump);
+  explicit Section(const Dump& dump);
 
   // Append an MDLocationDescriptor referring to this section to SECTION.
   // If 'this' is NULL, append a descriptor with a zero length and MDRVA.
@@ -145,13 +145,13 @@
   // bad, if such language exists. Having this function handle NULL
   // 'this' is convenient, but if it causes trouble, it's not hard to
   // do differently.)
-  void CiteLocationIn(test_assembler::Section *section) const;
+  void CiteLocationIn(test_assembler::Section* section) const;
 
   // Note that this section's contents are complete, and that it has
   // been placed in the minidump file at OFFSET. The 'Add' member
   // functions call the Finish member function of the object being
   // added for you; if you are 'Add'ing this section, you needn't Finish it.
-  virtual void Finish(const Label &offset) { 
+  virtual void Finish(const Label& offset) { 
     file_offset_ = offset; size_ = Size();
   }
 
@@ -166,10 +166,10 @@
  public:
   // Create a stream of type TYPE.  You can append whatever contents
   // you like to this stream using the test_assembler::Section methods.
-  Stream(const Dump &dump, uint32_t type) : Section(dump), type_(type) { }
+  Stream(const Dump& dump, uint32_t type) : Section(dump), type_(type) { }
 
   // Append an MDRawDirectory referring to this stream to SECTION.
-  void CiteStreamIn(test_assembler::Section *section) const;
+  void CiteStreamIn(test_assembler::Section* section) const;
 
  private:
   // The type of this stream.
@@ -186,9 +186,9 @@
   // 
   // Remember that you are still responsible for 'Add'ing CSD_VERSION
   // to the dump yourself.
-  SystemInfo(const Dump &dump,
-             const MDRawSystemInfo &system_info,
-             const String &csd_version);
+  SystemInfo(const Dump& dump,
+             const MDRawSystemInfo& system_info,
+             const String& csd_version);
 
   // Stock MDRawSystemInfo information and associated strings, for
   // writing tests.
@@ -199,10 +199,10 @@
 // An MDString: a string preceded by a 32-bit length.
 class String: public Section {
  public:
-  String(const Dump &dump, const string &value);
+  String(const Dump& dump, const string& value);
 
   // Append an MDRVA referring to this string to SECTION.
-  void CiteStringIn(test_assembler::Section *section) const;
+  void CiteStringIn(test_assembler::Section* section) const;
 };
 
 // A range of memory contents. 'Add'ing a memory range to a minidump
@@ -211,11 +211,11 @@
 // to memory addresses.
 class Memory: public Section {
  public:
-  Memory(const Dump &dump, uint64_t address)
+  Memory(const Dump& dump, uint64_t address)
       : Section(dump), address_(address) { start() = address; }
 
   // Append an MDMemoryDescriptor referring to this memory range to SECTION.
-  void CiteMemoryIn(test_assembler::Section *section) const;
+  void CiteMemoryIn(test_assembler::Section* section) const;
 
  private:
   // The process address from which these memory contents were taken.
@@ -226,11 +226,11 @@
 class Context: public Section {
  public:
   // Create a context belonging to DUMP whose contents are a copy of CONTEXT.
-  Context(const Dump &dump, const MDRawContextX86 &context);
-  Context(const Dump &dump, const MDRawContextARM &context);
-  Context(const Dump &dump, const MDRawContextMIPS &context);
+  Context(const Dump& dump, const MDRawContextX86& context);
+  Context(const Dump& dump, const MDRawContextARM& context);
+  Context(const Dump& dump, const MDRawContextMIPS& context);
   // Add an empty context to the dump.
-  Context(const Dump &dump) : Section(dump) {}
+  Context(const Dump& dump) : Section(dump) {}
   // Add constructors for other architectures here. Remember to byteswap.
 };
 
@@ -238,10 +238,10 @@
  public:
   // Create a thread belonging to DUMP with the given values, citing
   // STACK and CONTEXT (which you must Add to the dump separately).
-  Thread(const Dump &dump,
+  Thread(const Dump& dump,
          uint32_t thread_id,
-         const Memory &stack,
-         const Context &context,
+         const Memory& stack,
+         const Context& context,
          uint32_t suspend_count = 0,
          uint32_t priority_class = 0,
          uint32_t priority = 0,
@@ -253,15 +253,15 @@
   // Create a module with the given values. Note that CV_RECORD and
   // MISC_RECORD can be NULL, in which case the corresponding location
   // descriptior in the minidump will have a length of zero.
-  Module(const Dump &dump,
+  Module(const Dump& dump,
          uint64_t base_of_image,
          uint32_t size_of_image,
-         const String &name,
+         const String& name,
          uint32_t time_date_stamp = 1262805309,
          uint32_t checksum = 0,
-         const MDVSFixedFileInfo &version_info = Module::stock_version_info,
-         const Section *cv_record = NULL,
-         const Section *misc_record = NULL);
+         const MDVSFixedFileInfo& version_info = Module::stock_version_info,
+         const Section* cv_record = NULL,
+         const Section* misc_record = NULL);
 
  private:
   // A standard MDVSFixedFileInfo structure to use as a default for
@@ -272,18 +272,18 @@
 
 class UnloadedModule: public Section {
  public:
-  UnloadedModule(const Dump &dump,
+  UnloadedModule(const Dump& dump,
                  uint64_t base_of_image,
                  uint32_t size_of_image,
-                 const String &name,
+                 const String& name,
                  uint32_t checksum = 0,
                  uint32_t time_date_stamp = 1262805309);
 };
 
 class Exception : public Stream {
 public:
-  Exception(const Dump &dump,
-            const Context &context,
+  Exception(const Dump& dump,
+            const Context& context,
             uint32_t thread_id = 0,
             uint32_t exception_code = 0,
             uint32_t exception_flags = 0,
@@ -295,12 +295,12 @@
 template<typename Element>
 class List: public Stream {
  public:
-  List(const Dump &dump, uint32_t type) : Stream(dump, type), count_(0) {
+  List(const Dump& dump, uint32_t type) : Stream(dump, type), count_(0) {
     D32(count_label_);
   }
 
   // Add ELEMENT to this list.
-  void Add(Element *element) {
+  void Add(Element* element) {
     element->Finish(file_offset_ + Size());
     Append(*element);
     count_++;
@@ -311,7 +311,7 @@
 
   // Finish up the contents of this section, mark it as having been
   // placed at OFFSET.
-  virtual void Finish(const Label &offset) {
+  virtual void Finish(const Label& offset) {
     Stream::Finish(offset);
     count_label_ = count_;
   }
@@ -322,14 +322,14 @@
  protected:
   // This constructor allows derived lists to specify their own layout
   // rather than starting with count as specified in the public constructor.
-  List(const Dump &dump, uint32_t type, bool) : Stream(dump, type), count_(0) {}
+  List(const Dump& dump, uint32_t type, bool) : Stream(dump, type), count_(0) {}
 
   Label count_label_;
 };
 
 class UnloadedModuleList : public List<UnloadedModule> {
  public:
-  UnloadedModuleList(const Dump &dump, uint32_t type);
+  UnloadedModuleList(const Dump& dump, uint32_t type);
 };
 
 class Dump: public test_assembler::Section {
@@ -349,12 +349,12 @@
   // whatever directory or list is appropriate for its type. The
   // stream directory, memory list, thread list, and module list are
   // accumulated this way.
-  Dump &Add(SynthMinidump::Section *object); // simply append data
-  Dump &Add(Stream *object); // append, record in stream directory
-  Dump &Add(Memory *object); // append, record in memory list
-  Dump &Add(Thread *object); // append, record in thread list
-  Dump &Add(Module *object); // append, record in module list
-  Dump &Add(UnloadedModule *object); // append, record in unloaded module list
+  Dump& Add(SynthMinidump::Section* object); // simply append data
+  Dump& Add(Stream* object); // append, record in stream directory
+  Dump& Add(Memory* object); // append, record in memory list
+  Dump& Add(Thread* object); // append, record in thread list
+  Dump& Add(Module* object); // append, record in module list
+  Dump& Add(UnloadedModule* object); // append, record in unloaded module list
 
   // Complete the construction of the minidump, given the Add calls
   // we've seen up to this point. After this call, this Dump's
@@ -367,26 +367,26 @@
   Label file_start_;
 
   // The stream directory.  We construct this incrementally from
-  // Add(Stream *) calls.
+  // Add(Stream*) calls.
   SynthMinidump::Section stream_directory_; // The directory's contents.
   size_t stream_count_;                 // The number of streams so far.
   Label stream_count_label_;            // Cited in file header.
   Label stream_directory_rva_;          // The directory's file offset.
 
   // This minidump's thread list. We construct this incrementally from
-  // Add(Thread *) calls.
+  // Add(Thread*) calls.
   List<Thread> thread_list_;
 
   // This minidump's module list. We construct this incrementally from
-  // Add(Module *) calls.
+  // Add(Module*) calls.
   List<Module> module_list_;
 
   // This minidump's unloaded module list. We construct this incrementally from
-  // Add(UnloadedModule *) calls.
+  // Add(UnloadedModule*) calls.
   UnloadedModuleList unloaded_module_list_;
 
   // This minidump's memory list. We construct this incrementally from
-  // Add(Memory *) calls. This is actually a list of MDMemoryDescriptors,
+  // Add(Memory*) calls. This is actually a list of MDMemoryDescriptors,
   // not memory ranges --- thus the odd type.
   List<SynthMinidump::Section> memory_list_;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/testdata/linux_test_app.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/testdata/linux_test_app.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/testdata/linux_test_app.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/testdata/linux_test_app.cc	2021-12-09 12:01:26.000000000 +0000
@@ -51,8 +51,8 @@
 namespace {
 
 // google_breakpad::MinidumpCallback to invoke after minidump generation.
-static bool callback(const char *dump_path, const char *id,
-                     void *context,
+static bool callback(const char* dump_path, const char* id,
+                     void* context,
                      bool succeeded) {
   if (succeeded) {
     printf("dump guid is %s\n", id);
@@ -65,13 +65,13 @@
 }
 
 static void CrashFunction() {
-  int *i = reinterpret_cast<int*>(0x45);
+  int* i = reinterpret_cast<int*>(0x45);
   *i = 5;  // crash!
 }
 
 }  // namespace
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   google_breakpad::ExceptionHandler eh(".", NULL, callback, NULL, true);
   if (!eh.WriteMinidump()) {
     printf("Failed to generate on-demand minidump\n");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/testdata/test_app.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/testdata/test_app.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/testdata/test_app.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/testdata/test_app.cc	2021-12-09 12:01:26.000000000 +0000
@@ -38,9 +38,9 @@
 
 namespace {
 
-static bool callback(const wchar_t *dump_path, const wchar_t *id,
-                     void *context, EXCEPTION_POINTERS *exinfo,
-                     MDRawAssertionInfo *assertion,
+static bool callback(const wchar_t* dump_path, const wchar_t* id,
+                     void* context, EXCEPTION_POINTERS* exinfo,
+                     MDRawAssertionInfo* assertion,
                      bool succeeded) {
   if (succeeded) {
     printf("dump guid is %ws\n", id);
@@ -53,13 +53,13 @@
 }
 
 static void CrashFunction() {
-  int *i = reinterpret_cast<int*>(0x45);
+  int* i = reinterpret_cast<int*>(0x45);
   *i = 5;  // crash!
 }
 
 }  // namespace
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   google_breakpad::ExceptionHandler eh(
       L".", NULL, callback, NULL,
       google_breakpad::ExceptionHandler::HANDLER_ALL);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/tokenize.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/tokenize.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/tokenize.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/tokenize.cc	2021-12-09 12:01:26.000000000 +0000
@@ -42,10 +42,10 @@
 
 using std::vector;
 
-bool Tokenize(char *line,
-	      const char *separators,
-	      int max_tokens,
-	      vector<char*> *tokens) {
+bool Tokenize(char* line,
+              const char* separators,
+              int max_tokens,
+              vector<char*>* tokens) {
   tokens->clear();
   tokens->reserve(max_tokens);
 
@@ -53,8 +53,8 @@
 
   // Split tokens on the separator character.
   // strip them out before exhausting max_tokens.
-  char *save_ptr;
-  char *token = strtok_r(line, separators, &save_ptr);
+  char* save_ptr;
+  char* token = strtok_r(line, separators, &save_ptr);
   while (token && --remaining > 0) {
     tokens->push_back(token);
     if (remaining > 1)
@@ -69,10 +69,9 @@
   return tokens->size() == static_cast<unsigned int>(max_tokens);
 }
 
-void StringToVector(const string &str, vector<char> &vec) {
+void StringToVector(const string& str, vector<char>& vec) {
   vec.resize(str.length() + 1);
-  std::copy(str.begin(), str.end(),
-	    vec.begin());
+  std::copy(str.begin(), str.end(), vec.begin());
   vec[str.length()] = '\0';
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/tokenize.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/tokenize.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/tokenize.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/tokenize.h	2021-12-09 12:01:26.000000000 +0000
@@ -50,13 +50,13 @@
 // Tokenize, but may be treated as a failure if the caller expects an
 // exact, as opposed to maximum, number of tokens.
 
-bool Tokenize(char *line,
-              const char *separators,
+bool Tokenize(char* line,
+              const char* separators,
               int max_tokens,
-              std::vector<char*> *tokens);
+              std::vector<char*>* tokens);
 // For convenience, since you need a char* to pass to Tokenize.
 // You can call StringToVector on a string, and use &vec[0].
-void StringToVector(const string &str, std::vector<char> &vec);
+void StringToVector(const string& str, std::vector<char>& vec);
 
 }  // namespace google_breakpad
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/windows_frame_info.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/windows_frame_info.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/windows_frame_info.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/processor/windows_frame_info.h	2021-12-09 12:01:26.000000000 +0000
@@ -113,9 +113,9 @@
   // otherwise. type, rva and code_size are present in the STACK line,
   // but not the StackFrameInfo structure, so return them as outparams.
   static WindowsFrameInfo *ParseFromString(const string string,
-                                           int &type,
-                                           uint64_t &rva,
-                                           uint64_t &code_size) {
+                                           int& type,
+                                           uint64_t& rva,
+                                           uint64_t& code_size) {
     // The format of a STACK WIN record is documented at:
     //
     // https://chromium.googlesource.com/breakpad/breakpad/+/master/docs/symbol_files.md
@@ -160,7 +160,7 @@
   }
 
   // CopyFrom makes "this" WindowsFrameInfo object identical to "that".
-  void CopyFrom(const WindowsFrameInfo &that) {
+  void CopyFrom(const WindowsFrameInfo& that) {
     type_ = that.type_;
     valid = that.valid;
     prolog_size = that.prolog_size;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/dump_syms/dump_syms.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/dump_syms/dump_syms.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/dump_syms/dump_syms.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/dump_syms/dump_syms.cc	2021-12-09 12:01:26.000000000 +0000
@@ -45,20 +45,26 @@
   fprintf(stderr, "Usage: %s [OPTION] <binary-with-debugging-info> "
           "[directories-for-debug-file]\n\n", self);
   fprintf(stderr, "Options:\n");
-  fprintf(stderr, "  -i:   Output module header information only.\n");
-  fprintf(stderr, "  -c    Do not generate CFI section\n");
-  fprintf(stderr, "  -r    Do not handle inter-compilation unit references\n");
-  fprintf(stderr, "  -v    Print all warnings to stderr\n");
+  fprintf(stderr, "  -i:         Output module header information only.\n");
+  fprintf(stderr, "  -c          Do not generate CFI section\n");
+  fprintf(stderr, "  -r          Do not handle inter-compilation "
+                                 "unit references\n");
+  fprintf(stderr, "  -v          Print all warnings to stderr\n");
+  fprintf(stderr, "  -n <name>   Use specified name for name of the object\n");
+  fprintf(stderr, "  -o <os>     Use specified name for the "
+                                 "operating system\n");
   return 1;
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   if (argc < 2)
     return usage(argv[0]);
   bool header_only = false;
   bool cfi = true;
   bool handle_inter_cu_refs = true;
   bool log_to_stderr = false;
+  std::string obj_name;
+  const char* obj_os = "Linux";
   int arg_index = 1;
   while (arg_index < argc && strlen(argv[arg_index]) > 0 &&
          argv[arg_index][0] == '-') {
@@ -70,6 +76,20 @@
       handle_inter_cu_refs = false;
     } else if (strcmp("-v", argv[arg_index]) == 0) {
       log_to_stderr = true;
+    } else if (strcmp("-n", argv[arg_index]) == 0) {
+      if (arg_index + 1 >= argc) {
+        fprintf(stderr, "Missing argument to -n\n");
+        return usage(argv[0]);
+      }
+      obj_name = argv[arg_index + 1];
+      ++arg_index;
+    } else if (strcmp("-o", argv[arg_index]) == 0) {
+      if (arg_index + 1 >= argc) {
+        fprintf(stderr, "Missing argument to -o\n");
+        return usage(argv[0]);
+      }
+      obj_os = argv[arg_index + 1];
+      ++arg_index;
     } else {
       printf("2.4 %s\n", argv[arg_index]);
       return usage(argv[0]);
@@ -95,15 +115,19 @@
     debug_dirs.push_back(argv[debug_dir_index]);
   }
 
+  if (obj_name.empty())
+    obj_name = binary;
+
   if (header_only) {
-    if (!WriteSymbolFileHeader(binary, std::cout)) {
+    if (!WriteSymbolFileHeader(binary, obj_name, obj_os, std::cout)) {
       fprintf(saved_stderr, "Failed to process file.\n");
       return 1;
     }
   } else {
     SymbolData symbol_data = cfi ? ALL_SYMBOL_DATA : NO_CFI;
     google_breakpad::DumpOptions options(symbol_data, handle_inter_cu_refs);
-    if (!WriteSymbolFile(binary, debug_dirs, options, std::cout)) {
+    if (!WriteSymbolFile(binary, obj_name, obj_os, debug_dirs, options,
+                         std::cout)) {
       fprintf(saved_stderr, "Failed to write symbol file.\n");
       return 1;
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/md2core/minidump-2-core.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/md2core/minidump-2-core.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/md2core/minidump-2-core.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/md2core/minidump-2-core.cc	2021-12-09 12:01:26.000000000 +0000
@@ -33,6 +33,7 @@
 
 #include <elf.h>
 #include <errno.h>
+#include <limits.h>
 #include <link.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -54,7 +55,7 @@
 #include "third_party/lss/linux_syscall_support.h"
 #include "tools/linux/md2core/minidump_memory_range.h"
 
-#if __WORDSIZE == 64
+#if ULONG_MAX == 0xffffffffffffffff
   #define ELF_CLASS ELFCLASS64
 #else
   #define ELF_CLASS ELFCLASS32
@@ -148,7 +149,7 @@
   options->use_filename = false;
   options->inc_guid = false;
 
-  while ((ch = getopt(argc, (char * const *)argv, "fhio:S:v")) != -1) {
+  while ((ch = getopt(argc, (char * const*)argv, "fhio:S:v")) != -1) {
     switch (ch) {
       case 'h':
         Usage(argc, argv);
@@ -223,7 +224,7 @@
  */
 static inline int sex() {
   int probe = 1;
-  return !*(char *)&probe;
+  return !*(char*)&probe;
 }
 
 typedef struct elf_timeval {    /* Time value with microsecond resolution    */
@@ -659,10 +660,10 @@
         sysinfo->processor_architecture == MD_CPU_ARCHITECTURE_AMD64) {
       fputs("Vendor id: ", stderr);
       const char *nul =
-        (const char *)memchr(sysinfo->cpu.x86_cpu_info.vendor_id, 0,
+        (const char*)memchr(sysinfo->cpu.x86_cpu_info.vendor_id, 0,
                              sizeof(sysinfo->cpu.x86_cpu_info.vendor_id));
       fwrite(sysinfo->cpu.x86_cpu_info.vendor_id,
-             nul ? nul - (const char *)&sysinfo->cpu.x86_cpu_info.vendor_id[0]
+             nul ? nul - (const char*)&sysinfo->cpu.x86_cpu_info.vendor_id[0]
              : sizeof(sysinfo->cpu.x86_cpu_info.vendor_id), 1, stderr);
       fputs("\n", stderr);
     }
@@ -758,7 +759,7 @@
     memcpy(env, range.data(), range.length());
     int nul_count = 0;
     for (char *ptr = env;;) {
-      ptr = (char *)memchr(ptr, '\000', range.length() - (ptr - env));
+      ptr = (char*)memchr(ptr, '\000', range.length() - (ptr - env));
       if (!ptr) {
         break;
       }
@@ -1075,7 +1076,7 @@
   for (unsigned i = 0; i < crashinfo->threads.size(); ++i) {
     const CrashedProcess::Thread& thread = crashinfo->threads[i];
     AddDataToMapping(crashinfo,
-                     string((char *)thread.stack, thread.stack_length),
+                     string((char*)thread.stack, thread.stack_length),
                      thread.stack_addr);
   }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/symupload/minidump_upload.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/symupload/minidump_upload.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/symupload/minidump_upload.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/symupload/minidump_upload.cc	2021-12-09 12:01:26.000000000 +0000
@@ -111,7 +111,7 @@
   extern int optind;
   int ch;
 
-  while ((ch = getopt(argc, (char * const *)argv, "p:u:v:x:h?")) != -1) {
+  while ((ch = getopt(argc, (char * const*)argv, "p:u:v:x:h?")) != -1) {
     switch (ch) {
       case 'p':
         options->product = optarg;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/symupload/sym_upload.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/symupload/sym_upload.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/symupload/sym_upload.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/linux/symupload/sym_upload.cc	2021-12-09 12:01:26.000000000 +0000
@@ -41,39 +41,90 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
+#include <locale>
+
 #include "common/linux/symbol_upload.h"
 
+using google_breakpad::sym_upload::UploadProtocol;
 using google_breakpad::sym_upload::Options;
 
+static void StrToUpper(std::string* str) {
+  if (str == nullptr) {
+    fprintf(stderr, "nullptr passed to StrToUpper.\n");
+    exit(1);
+  }
+  for (size_t i = 0; i < str->length(); i++) {
+    (*str)[i] = std::toupper((*str)[i], std::locale::classic());
+  }
+}
+
 //=============================================================================
 static void
 Usage(int argc, const char *argv[]) {
   fprintf(stderr, "Submit symbol information.\n");
-  fprintf(stderr, "Usage: %s [options...] <symbols> <upload-URL>\n", argv[0]);
+  fprintf(stderr, "Usage: %s [options...] <symbol-file> <upload-URL>\n",
+      argv[0]);
   fprintf(stderr, "Options:\n");
-  fprintf(stderr, "<symbols> should be created by using the dump_syms tool.\n");
+  fprintf(stderr, "<symbol-file> should be created by using the dump_syms"
+      "tool.\n");
   fprintf(stderr, "<upload-URL> is the destination for the upload\n");
+  fprintf(stderr, "-p:\t <protocol> One of ['sym-upload-v1',"
+    " 'sym-upload-v2'], defaults to 'sym-upload-v1'.\n");
   fprintf(stderr, "-v:\t Version information (e.g., 1.2.3.4)\n");
   fprintf(stderr, "-x:\t <host[:port]> Use HTTP proxy on given port\n");
   fprintf(stderr, "-u:\t <user[:password]> Set proxy user and password\n");
   fprintf(stderr, "-h:\t Usage\n");
   fprintf(stderr, "-?:\t Usage\n");
+  fprintf(stderr, "\n");
+  fprintf(stderr, "These options only work with 'sym-upload-v2' protocol:\n");
+  fprintf(stderr, "-k:\t <API-key> A secret used to authenticate with the"
+      " API.\n");
+  fprintf(stderr, "-f:\t Force symbol upload if already exists.\n");
+  fprintf(stderr, "-t:\t <symbol-type> Explicitly set symbol upload type ("
+      "default is 'breakpad').\n"
+      "\t One of ['breakpad', 'elf', 'pe', 'macho', 'debug_only', 'dwp', "
+      "'dsym', 'pdb'].\n"
+      "\t Note: When this flag is set to anything other than 'breakpad', then "
+      "the '-c' and '-i' flags must also be set.\n");
+  fprintf(stderr, "-c:\t <code-file> Explicitly set 'code_file' for symbol "
+      "upload (basename of executable).\n");
+  fprintf(stderr, "-i:\t <debug-id> Explicitly set 'debug_id' for symbol "
+      "upload (typically build ID of executable).\n");
+  fprintf(stderr, "\n");
+  fprintf(stderr, "Examples:\n");
+  fprintf(stderr, "  With 'sym-upload-v1':\n");
+  fprintf(stderr, "    %s path/to/symbol_file http://myuploadserver\n",
+      argv[0]);
+  fprintf(stderr, "  With 'sym-upload-v2':\n");
+  fprintf(stderr, "    [Defaulting to symbol type 'BREAKPAD']\n");
+  fprintf(stderr, "    %s -p sym-upload-v2 -k mysecret123! "
+      "path/to/symbol_file http://myuploadserver\n", argv[0]);
+  fprintf(stderr, "    [Explicitly set symbol type to 'elf']\n");
+  fprintf(stderr, "    %s -p sym-upload-v2 -k mysecret123! -t elf "
+      "-c app -i 11111111BBBB3333DDDD555555555555F "
+      "path/to/symbol_file http://myuploadserver\n", argv[0]);
 }
 
 //=============================================================================
 static void
 SetupOptions(int argc, const char *argv[], Options *options) {
-  extern int optind;
+  extern int optind, optopt;
   int ch;
+  constexpr char flag_pattern[] = "u:v:x:p:k:t:c:i:hf?";
 
-  while ((ch = getopt(argc, (char * const *)argv, "u:v:x:h?")) != -1) {
+  while ((ch = getopt(argc, (char * const*)argv, flag_pattern)) != -1) {
     switch (ch) {
       case 'h':
       case '?':
         Usage(argc, argv);
-        exit(0);
+        // ch might be '?' because getopt found an error while parsing args (as
+        // opposed to finding "-?" as an arg), in which case optopt is set to
+        // the bad arg value, so return an error code if optopt is set,
+        // otherwise exit cleanly.
+        exit(optopt == 0 ? 0 : 1);
         break;
       case 'u':
         options->proxy_user_pwd = optarg;
@@ -84,6 +135,36 @@
       case 'x':
         options->proxy = optarg;
         break;
+      case 'p':
+        if (strcmp(optarg, "sym-upload-v2") == 0) {
+          options->upload_protocol = UploadProtocol::SYM_UPLOAD_V2;
+        } else if (strcmp(optarg, "sym-upload-v1") == 0) {
+          options->upload_protocol = UploadProtocol::SYM_UPLOAD_V1;
+        } else {
+          fprintf(stderr, "Invalid protocol '%s'\n", optarg);
+          Usage(argc, argv);
+          exit(1);
+        }
+        break;
+      case 'k':
+        options->api_key = optarg;
+        break;
+      case 't': {
+        // This is really an enum, so treat as upper-case for consistency with
+        // enum naming convention on server-side.
+        options->type = optarg;
+        StrToUpper(&(options->type));
+        break;
+      }
+      case 'c':
+        options->code_file = optarg;
+        break;
+      case 'i':
+        options->debug_id = optarg;
+        break;
+      case 'f':
+        options->force = true;
+        break;
 
       default:
         fprintf(stderr, "Invalid option '%c'\n", ch);
@@ -98,6 +179,27 @@
     Usage(argc, argv);
     exit(1);
   }
+
+  bool is_breakpad_upload = options->type.empty() ||
+      options->type == google_breakpad::sym_upload::kBreakpadSymbolType;
+  bool has_code_file = !options->code_file.empty();
+  bool has_debug_id = !options->debug_id.empty();
+  if (is_breakpad_upload && (has_code_file || has_debug_id)) {
+    fprintf(stderr, "\n");
+    fprintf(stderr, "%s: -c and -i should only be specified for non-breakpad "
+        "symbol upload types.\n", argv[0]);
+    fprintf(stderr, "\n");
+    Usage(argc, argv);
+    exit(1);
+  }
+  if (!is_breakpad_upload && (!has_code_file || !has_debug_id)) {
+    fprintf(stderr, "\n");
+    fprintf(stderr, "%s: -c and -i must be specified for non-breakpad "
+        "symbol upload types.\n", argv[0]);
+    fprintf(stderr, "\n");
+    Usage(argc, argv);
+    exit(1);
+  }
 
   options->symbolsPath = argv[optind];
   options->uploadURLStr = argv[optind + 1];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.h	2021-12-09 12:01:26.000000000 +0000
@@ -47,30 +47,30 @@
  public:
   // |search_dir| is the directory to search for alternative symbols with
   // the same name as the module in the minidump
-  OnDemandSymbolSupplier(const string &search_dir,
-                         const string &symbol_search_dir);
+  OnDemandSymbolSupplier(const string& search_dir,
+                         const string& symbol_search_dir);
   virtual ~OnDemandSymbolSupplier() {}
 
   // Returns the path to the symbol file for the given module.
-  virtual SymbolResult GetSymbolFile(const CodeModule *module,
-                                     const SystemInfo *system_info,
-                                     string *symbol_file);
+  virtual SymbolResult GetSymbolFile(const CodeModule* module,
+                                     const SystemInfo* system_info,
+                                     string* symbol_file);
 
   // Returns the path to the symbol file for the given module.
-  virtual SymbolResult GetSymbolFile(const CodeModule *module,
-                                     const SystemInfo *system_info,
-                                     string *symbol_file,
-                                     string *symbol_data);
+  virtual SymbolResult GetSymbolFile(const CodeModule* module,
+                                     const SystemInfo* system_info,
+                                     string* symbol_file,
+                                     string* symbol_data);
   // Allocates data buffer on heap, and takes the ownership of
   // the data buffer.
-  virtual SymbolResult GetCStringSymbolData(const CodeModule *module,
-                                            const SystemInfo *system_info,
-                                            string *symbol_file,
-                                            char **symbol_data,
-                                            size_t *symbol_data_size);
+  virtual SymbolResult GetCStringSymbolData(const CodeModule* module,
+                                            const SystemInfo* system_info,
+                                            string* symbol_file,
+                                            char** symbol_data,
+                                            size_t* symbol_data_size);
 
   // Delete the data buffer allocated for module in GetCStringSymbolData().
-  virtual void FreeSymbolData(const CodeModule *module);
+  virtual void FreeSymbolData(const CodeModule* module);
 
  protected:
   // Search directory
@@ -82,28 +82,28 @@
   map<string, string> module_file_map_;
 
   // Map of allocated data buffers, keyed by module->code_file().
-  map<string, char *> memory_buffers_;
+  map<string, char*> memory_buffers_;
 
   // Return the name for |module|  This will be the value used as the key
   // to the |module_file_map_|.
-  string GetNameForModule(const CodeModule *module);
+  string GetNameForModule(const CodeModule* module);
 
   // Find the module on local system.  If the module resides in a different
   // location than the full path in the minidump, this will be the location
   // used.
-  string GetLocalModulePath(const CodeModule *module);
+  string GetLocalModulePath(const CodeModule* module);
 
   // Return the full path for |module|.
-  string GetModulePath(const CodeModule *module);
+  string GetModulePath(const CodeModule* module);
 
   // Return the path to the symbol file for |module|.  If an empty string is
   // returned, then |module| doesn't have a symbol file.
-  string GetModuleSymbolFile(const CodeModule *module);
+  string GetModuleSymbolFile(const CodeModule* module);
 
   // Generate the breakpad symbol file for |module|.  Return true if successful.
   // File is generated in /tmp.
-  bool GenerateSymbolFile(const CodeModule *module,
-                          const SystemInfo *system_info);
+  bool GenerateSymbolFile(const CodeModule* module,
+                          const SystemInfo* system_info);
 };
 
 }  // namespace google_breakpad
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc	2021-12-09 12:01:26.000000000 +0000
@@ -106,7 +106,7 @@
   }
 }
 
-static bool Start(const Options &options) {
+static bool Start(const Options& options) {
   SymbolData symbol_data = options.cfi ? ALL_SYMBOL_DATA : NO_CFI;
   DumpSymbols dump_symbols(symbol_data, options.handle_inter_cu_refs);
 
@@ -210,7 +210,7 @@
   extern int optind;
   signed char ch;
 
-  while ((ch = getopt(argc, (char * const *)argv, "ia:g:chr?")) != -1) {
+  while ((ch = getopt(argc, (char * const*)argv, "ia:g:chr?")) != -1) {
     switch (ch) {
       case 'i':
         options->header_only = true;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/dump_syms/macho_dump.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/dump_syms/macho_dump.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/dump_syms/macho_dump.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/mac/dump_syms/macho_dump.cc	2021-12-09 12:01:26.000000000 +0000
@@ -60,7 +60,7 @@
 
 string program_name;
 
-int check_syscall(int result, const char *operation, const char *filename) {
+int check_syscall(int result, const char* operation, const char* filename) {
   if (result < 0) {
     fprintf(stderr, "%s: %s '%s': %s\n",
             program_name.c_str(), operation,
@@ -73,7 +73,7 @@
 class DumpSection: public mach_o::Reader::SectionHandler {
  public:
   DumpSection() : index_(0) { }
-  bool HandleSection(const mach_o::Section &section) {
+  bool HandleSection(const mach_o::Section& section) {
     printf("        section %d '%s' in segment '%s'\n"
            "          address: 0x%llx\n"
            "          alignment: 1 << %d B\n"
@@ -92,13 +92,13 @@
 
 class DumpCommand: public mach_o::Reader::LoadCommandHandler {
  public:
-  DumpCommand(mach_o::Reader *reader) : reader_(reader), index_(0) { }
+  DumpCommand(mach_o::Reader* reader) : reader_(reader), index_(0) { }
   bool UnknownCommand(mach_o::LoadCommandType type,
-                      const ByteBuffer &contents) {
+                      const ByteBuffer& contents) {
     printf("      load command %d: %d", index_++, type);
     return true;
   }
-  bool SegmentCommand(const mach_o::Segment &segment) {
+  bool SegmentCommand(const mach_o::Segment& segment) {
     printf("      load command %d: %s-bit segment '%s'\n"
            "        address: 0x%llx\n"
            "        memory size: 0x%llx\n"
@@ -115,24 +115,24 @@
     return reader_->WalkSegmentSections(segment, &dump_section);
   }
  private:
-  mach_o::Reader *reader_;
+  mach_o::Reader* reader_;
   int index_;
 };
 
-void DumpFile(const char *filename) {
+void DumpFile(const char* filename) {
   int fd = check_syscall(open(filename, O_RDONLY), "opening", filename);
   struct stat attributes;
   check_syscall(fstat(fd, &attributes),
                 "getting file attributes for", filename);
-  void *mapping = mmap(NULL, attributes.st_size, PROT_READ,
+  void* mapping = mmap(NULL, attributes.st_size, PROT_READ,
                        MAP_PRIVATE, fd, 0);
   close(fd);
-  check_syscall(mapping == (void *)-1 ? -1 : 0,
+  check_syscall(mapping == (void*)-1 ? -1 : 0,
                 "mapping contents of", filename);
 
   mach_o::FatReader::Reporter fat_reporter(filename);
   mach_o::FatReader fat_reader(&fat_reporter);
-  if (!fat_reader.Read(reinterpret_cast<uint8_t *>(mapping),
+  if (!fat_reader.Read(reinterpret_cast<uint8_t*>(mapping),
                        attributes.st_size)) {
     exit(1);
   }
@@ -140,14 +140,14 @@
   size_t object_files_size;
   const SuperFatArch* super_fat_object_files =
       fat_reader.object_files(&object_files_size);
-  struct fat_arch *object_files;
+  struct fat_arch* object_files;
   if (!super_fat_object_files->ConvertToFatArch(object_files)) {
     exit(1);
   }
   printf("  object file count: %ld\n", object_files_size);
   for (size_t i = 0; i < object_files_size; i++) {
-    const struct fat_arch &file = object_files[i];
-    const NXArchInfo *fat_arch_info =
+    const struct fat_arch& file = object_files[i];
+    const NXArchInfo* fat_arch_info =
         google_breakpad::BreakpadGetArchInfoFromCpuType(
             file.cputype, file.cpusubtype);
     printf("\n  object file %ld:\n"
@@ -162,7 +162,7 @@
     name << filename;
     if (object_files_size > 1)
       name << ", object file #" << i;
-    ByteBuffer file_contents(reinterpret_cast<uint8_t *>(mapping)
+    ByteBuffer file_contents(reinterpret_cast<uint8_t*>(mapping)
                              + file.offset, file.size);
     mach_o::Reader::Reporter reporter(name.str());
     mach_o::Reader reader(&reporter);
@@ -170,7 +170,7 @@
       exit(1);
     }
 
-    const NXArchInfo *macho_arch_info =
+    const NXArchInfo* macho_arch_info =
       NXGetArchInfoFromCpuType(reader.cpu_type(),
                                reader.cpu_subtype());
     printf("    Mach-O header:\n"
@@ -190,7 +190,7 @@
 
 }  // namespace
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   program_name = google_breakpad::BaseName(argv[0]);
   if (argc == 1) {
     fprintf(stderr, "Usage: %s FILE ...\n"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/solaris/dump_syms/dump_syms.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/solaris/dump_syms/dump_syms.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/solaris/dump_syms/dump_syms.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/solaris/dump_syms/dump_syms.cc	2021-12-09 12:01:26.000000000 +0000
@@ -36,13 +36,13 @@
 
 using namespace google_breakpad;
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   if (argc != 2) {
     fprintf(stderr, "Usage: %s <binary-with-stab-symbol>\n", argv[0]);
     return 1;
   }
 
-  const char *binary = argv[1];
+  const char* binary = argv[1];
 
   DumpSymbols dumper;
   if (!dumper.WriteSymbolFile(binary, fileno(stdout))) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -41,7 +41,7 @@
 
   void f() { member_ = g(); }
   virtual int g() { return 2; }
-  static char* h(const C &that) { return 0; }
+  static char* h(const C& that) { return 0; }
 
  private:
   int member_;
@@ -53,12 +53,12 @@
 
 }  // namespace google_breakpad
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   google_breakpad::C object;
   object.set_member(google_breakpad::i());
   object.f();
   int value = object.g();
-  char *nothing = object.h(object);
+  char* nothing = object.h(object);
 
   return 0;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc	2021-12-09 12:01:26.000000000 +0000
@@ -36,12 +36,14 @@
 
 #include <windows.h>
 #include <dbghelp.h>
+#include <pathcch.h>
 
 #include <cassert>
 #include <cstdio>
 
 #include "tools/windows/converter/ms_symbol_server_converter.h"
 #include "common/windows/pdb_source_line_writer.h"
+#include "common/windows/pe_source_line_writer.h"
 #include "common/windows/string_utils-inl.h"
 
 // SYMOPT_NO_PROMPTS is not defined in earlier platform SDKs.  Define it
@@ -52,6 +54,31 @@
 #define SYMOPT_NO_PROMPTS 0x00080000
 #endif  // SYMOPT_NO_PROMPTS
 
+namespace {
+
+std::wstring GetExeDirectory() {
+  wchar_t directory[MAX_PATH];
+
+  // Get path to this process exe.
+  DWORD result = GetModuleFileName(/*hModule=*/nullptr, directory, MAX_PATH);
+  if (result <= 0 || result == MAX_PATH) {
+    fprintf(stderr,
+        "GetExeDirectory: failed to get path to process exe.\n");
+    return L"";
+  }
+  HRESULT hr = PathCchRemoveFileSpec(directory, result + 1);
+  if (hr != S_OK) {
+    fprintf(stderr,
+        "GetExeDirectory: failed to remove basename from path '%ls'.\n",
+        directory);
+    return L"";
+  }
+
+  return std::wstring(directory);
+}
+
+}  // namespace
+
 namespace google_breakpad {
 
 // Use sscanf_s if it is available, to quench the warning about scanf being
@@ -65,7 +92,7 @@
 #endif  // _MSC_VER >= 1400
 
 bool GUIDOrSignatureIdentifier::InitializeFromString(
-    const string &identifier) {
+    const string& identifier) {
   type_ = TYPE_NONE;
 
   size_t length = identifier.length();
@@ -101,7 +128,7 @@
 #undef SSCANF
 
 MSSymbolServerConverter::MSSymbolServerConverter(
-    const string &local_cache, const vector<string> &symbol_servers)
+    const string& local_cache, const vector<string>& symbol_servers)
     : symbol_path_(),
       fail_dns_(false),
       fail_timeout_(false),
@@ -153,12 +180,40 @@
     if (!Cleanup()) {
       // Print the error message here, because destructors have no return
       // value.
-      fprintf(stderr, "~AutoSymSrv: SymCleanup: error %d\n", GetLastError());
+      fprintf(stderr, "~AutoSymSrv: SymCleanup: error %lu\n", GetLastError());
     }
   }
 
-  bool Initialize(HANDLE process, char *path, bool invade_process) {
+  bool Initialize(HANDLE process, char* path, bool invade_process) {
     process_ = process;
+
+    // TODO(nbilling): Figure out why dbghelp.dll is being loaded from
+    // system32/SysWOW64 before exe folder.
+
+    // Attempt to locate and load dbghelp.dll beside the process exe. This is
+    // somewhat of a workaround to loader delay load behavior that is occurring
+    // when we call into symsrv APIs. dbghelp.dll must be loaded from beside
+    // the process exe so that we are guaranteed to find symsrv.dll alongside
+    // dbghelp.dll (a security requirement of dbghelp.dll) and so that the
+    // symsrv.dll file that is loaded has a symsrv.yes file alongside it (a
+    // requirement of symsrv.dll when accessing Microsoft-owned symbol
+    // servers).
+    // 'static local' because we don't care about the value but we need the
+    // initialization to happen exactly once.
+    static HMODULE dbghelp_module = [] () -> HMODULE {
+      std::wstring exe_directory = GetExeDirectory();
+      if (exe_directory.empty()) {
+        return nullptr;
+      }
+      std::wstring dbghelp_path = exe_directory + L"\\dbghelp.dll";
+      return LoadLibrary(dbghelp_path.c_str());
+    }();
+    if (dbghelp_module == nullptr) {
+      fprintf(stderr,
+          "AutoSymSrv::Initialize: failed to load dbghelp.dll beside exe.");
+      return false;
+    }
+
     initialized_ = SymInitialize(process, path, invade_process) == TRUE;
     return initialized_;
   }
@@ -185,7 +240,7 @@
 // are supported by calling Delete().
 class AutoDeleter {
  public:
-  explicit AutoDeleter(const string &path) : path_(path) {}
+  explicit AutoDeleter(const string& path) : path_(path) {}
 
   ~AutoDeleter() {
     int error;
@@ -215,10 +270,10 @@
 };
 
 MSSymbolServerConverter::LocateResult
-MSSymbolServerConverter::LocateFile(const string &debug_or_code_file,
-                                    const string &debug_or_code_id,
-                                    const string &version,
-                                    string *file_name) {
+MSSymbolServerConverter::LocateFile(const string& debug_or_code_file,
+                                    const string& debug_or_code_id,
+                                    const string& version,
+                                    string* file_name) {
   assert(file_name);
   file_name->clear();
 
@@ -235,9 +290,9 @@
   HANDLE process = GetCurrentProcess();  // CloseHandle is not needed.
   AutoSymSrv symsrv;
   if (!symsrv.Initialize(process,
-                         const_cast<char *>(symbol_path_.c_str()),
+                         const_cast<char*>(symbol_path_.c_str()),
                          false)) {
-    fprintf(stderr, "LocateFile: SymInitialize: error %d for %s %s %s\n",
+    fprintf(stderr, "LocateFile: SymInitialize: error %lu for %s %s %s\n",
             GetLastError(),
             debug_or_code_file.c_str(),
             debug_or_code_id.c_str(),
@@ -248,7 +303,7 @@
   if (!SymRegisterCallback64(process, SymCallback,
                              reinterpret_cast<ULONG64>(this))) {
     fprintf(stderr,
-            "LocateFile: SymRegisterCallback64: error %d for %s %s %s\n",
+            "LocateFile: SymRegisterCallback64: error %lu for %s %s %s\n",
             GetLastError(),
             debug_or_code_file.c_str(),
             debug_or_code_id.c_str(),
@@ -271,8 +326,8 @@
   char path[MAX_PATH];
   if (!SymFindFileInPath(
           process, NULL,
-          const_cast<char *>(debug_or_code_file.c_str()),
-          const_cast<void *>(identifier.guid_or_signature_pointer()),
+          const_cast<char*>(debug_or_code_file.c_str()),
+          const_cast<void*>(identifier.guid_or_signature_pointer()),
           identifier.age(), 0,
           identifier.type() == GUIDOrSignatureIdentifier::TYPE_GUID ?
               SSRVOPT_GUIDPTR : SSRVOPT_DWORDPTR,
@@ -303,7 +358,7 @@
     }
 
     fprintf(stderr,
-            "LocateFile: SymFindFileInPath: error %d for %s %s %s\n",
+            "LocateFile: SymFindFileInPath: error %lu for %s %s %s\n",
             error,
             debug_or_code_file.c_str(),
             debug_or_code_id.c_str(),
@@ -321,7 +376,7 @@
   // Do the cleanup here even though it will happen when symsrv goes out of
   // scope, to allow it to influence the return value.
   if (!symsrv.Cleanup()) {
-    fprintf(stderr, "LocateFile: SymCleanup: error %d for %s %s %s\n",
+    fprintf(stderr, "LocateFile: SymCleanup: error %lu for %s %s %s\n",
             GetLastError(),
             debug_or_code_file.c_str(),
             debug_or_code_id.c_str(),
@@ -338,15 +393,15 @@
 
 
 MSSymbolServerConverter::LocateResult
-MSSymbolServerConverter::LocatePEFile(const MissingSymbolInfo &missing,
-                                      string *pe_file) {
+MSSymbolServerConverter::LocatePEFile(const MissingSymbolInfo& missing,
+                                      string* pe_file) {
   return LocateFile(missing.code_file, missing.code_identifier,
                     missing.version, pe_file);
 }
 
 MSSymbolServerConverter::LocateResult
-MSSymbolServerConverter::LocateSymbolFile(const MissingSymbolInfo &missing,
-                                          string *symbol_file) {
+MSSymbolServerConverter::LocateSymbolFile(const MissingSymbolInfo& missing,
+                                          string* symbol_file) {
   return LocateFile(missing.debug_file, missing.debug_identifier,
                     missing.version, symbol_file);
 }
@@ -357,13 +412,13 @@
                                                    ULONG action,
                                                    ULONG64 data,
                                                    ULONG64 context) {
-  MSSymbolServerConverter *self =
-      reinterpret_cast<MSSymbolServerConverter *>(context);
+  MSSymbolServerConverter* self =
+      reinterpret_cast<MSSymbolServerConverter*>(context);
 
   switch (action) {
     case CBA_EVENT: {
-      IMAGEHLP_CBA_EVENT *cba_event =
-          reinterpret_cast<IMAGEHLP_CBA_EVENT *>(data);
+      IMAGEHLP_CBA_EVENT* cba_event =
+          reinterpret_cast<IMAGEHLP_CBA_EVENT*>(data);
 
       // Put the string into a string object to be able to use string::find
       // for substring matching.  This is important because the not-found
@@ -374,8 +429,8 @@
       // desc_action maps strings (in desc) to boolean pointers that are to
       // be set to true if the string matches.
       struct desc_action {
-        const char *desc;  // The substring to match.
-        bool *action;      // On match, this pointer will be set to true.
+        const char* desc;  // The substring to match.
+        bool* action;      // On match, this pointer will be set to true.
       };
 
       static const desc_action desc_actions[] = {
@@ -404,7 +459,8 @@
       };
 
       for (int desc_action_index = 0;
-           desc_action_index < sizeof(desc_actions) / sizeof(desc_action);
+           desc_action_index <
+           static_cast<int>(sizeof(desc_actions) / sizeof(desc_action));
            ++desc_action_index) {
         if (desc.find(desc_actions[desc_action_index].desc) != string::npos) {
           *(desc_actions[desc_action_index].action) = true;
@@ -422,7 +478,7 @@
 
 // static
 BOOL CALLBACK MSSymbolServerConverter::SymFindFileInPathCallback(
-    const char *filename, void *context) {
+    const char* filename, void* context) {
   // FALSE ends the search, indicating that the located symbol file is
   // satisfactory.
   return FALSE;
@@ -430,12 +486,12 @@
 
 MSSymbolServerConverter::LocateResult
 MSSymbolServerConverter::LocateAndConvertSymbolFile(
-    const MissingSymbolInfo &missing,
+    const MissingSymbolInfo& missing,
     bool keep_symbol_file,
     bool keep_pe_file,
-    string *converted_symbol_file,
-    string *symbol_file,
-    string *out_pe_file) {
+    string* converted_symbol_file,
+    string* symbol_file,
+    string* out_pe_file) {
   assert(converted_symbol_file);
   converted_symbol_file->clear();
   if (symbol_file) {
@@ -445,7 +501,10 @@
   string pdb_file;
   LocateResult result = LocateSymbolFile(missing, &pdb_file);
   if (result != LOCATE_SUCCESS) {
-    return result;
+    fprintf(stderr, "Fallback to PE-only symbol generation for: %s\n",
+        missing.debug_file.c_str());
+    return LocateAndConvertPEFile(missing, keep_pe_file, converted_symbol_file,
+        out_pe_file);
   }
 
   if (symbol_file && keep_symbol_file) {
@@ -521,11 +580,11 @@
 
   *converted_symbol_file = pdb_file.substr(0, pdb_file.length() - 4) + ".sym";
 
-  FILE *converted_output = NULL;
+  FILE* converted_output = NULL;
 #if _MSC_VER >= 1400  // MSVC 2005/8
   errno_t err;
   if ((err = fopen_s(&converted_output, converted_symbol_file->c_str(), "w"))
-      != 0) {
+    != 0) {
 #else  // _MSC_VER >= 1400
   // fopen_s and errno_t were introduced in MSVC8.  Use fopen for earlier
   // environments.  Don't use fopen with MSVC8 and later, because it's
@@ -536,18 +595,18 @@
     err = -1;
 #endif  // _MSC_VER >= 1400
     fprintf(stderr, "LocateAndConvertSymbolFile: "
-            "fopen_s: error %d for %s %s %s %s\n",
-            err,
-            missing.debug_file.c_str(),
-            missing.debug_identifier.c_str(),
-            missing.version.c_str(),
-            converted_symbol_file->c_str());
+        "fopen_s: error %d for %s %s %s %s\n",
+        err,
+        missing.debug_file.c_str(),
+        missing.debug_identifier.c_str(),
+        missing.version.c_str(),
+        converted_symbol_file->c_str());
     return LOCATE_FAILURE;
   }
 
   AutoDeleter sym_deleter(*converted_symbol_file);
 
-  bool success = writer.WriteMap(converted_output);
+  bool success = writer.WriteSymbols(converted_output);
   fclose(converted_output);
 
   if (!success) {
@@ -565,6 +624,123 @@
   }
 
   if (keep_pe_file) {
+    pe_deleter.Release();
+  }
+
+  sym_deleter.Release();
+
+  return LOCATE_SUCCESS;
+}
+
+MSSymbolServerConverter::LocateResult
+MSSymbolServerConverter::LocateAndConvertPEFile(
+    const MissingSymbolInfo& missing,
+    bool keep_pe_file,
+    string* converted_symbol_file,
+    string* out_pe_file) {
+  assert(converted_symbol_file);
+  converted_symbol_file->clear();
+
+  string pe_file;
+  MSSymbolServerConverter::LocateResult result = LocatePEFile(missing,
+      &pe_file);
+  if (result != LOCATE_SUCCESS) {
+    fprintf(stderr, "WARNING: Could not download: %s\n", pe_file.c_str());
+    return result;
+  }
+
+  if (out_pe_file && keep_pe_file) {
+    *out_pe_file = pe_file;
+  }
+
+  // Conversion may fail because the file is corrupt.  If a broken file is
+  // kept in the local cache, LocatePEFile will not hit the network again
+  // to attempt to locate it.  To guard against problems like this, the
+  // PE file in the local cache will be removed if conversion fails.
+  AutoDeleter pe_deleter(pe_file);
+
+  // Be sure that it's a .exe or .dll file, since we'll be replacing extension
+  // with .sym for the converted file's name.
+  string pe_extension = pe_file.substr(pe_file.length() - 4);
+  // strcasecmp is called _stricmp here.
+  if (_stricmp(pe_extension.c_str(), ".exe") != 0 &&
+    _stricmp(pe_extension.c_str(), ".dll") != 0) {
+    fprintf(stderr, "LocateAndConvertPEFile: "
+        "no .dll/.exe extension for %s %s %s %s\n",
+        missing.debug_file.c_str(),
+        missing.debug_identifier.c_str(),
+        missing.version.c_str(),
+        pe_file.c_str());
+    return LOCATE_FAILURE;
+  }
+
+  *converted_symbol_file = pe_file.substr(0, pe_file.length() - 4) + ".sym";
+
+  FILE* converted_output = NULL;
+#if _MSC_VER >= 1400  // MSVC 2005/8
+  errno_t err;
+  if ((err = fopen_s(&converted_output, converted_symbol_file->c_str(), "w"))
+      != 0) {
+#else  // _MSC_VER >= 1400
+  // fopen_s and errno_t were introduced in MSVC8.  Use fopen for earlier
+  // environments.  Don't use fopen with MSVC8 and later, because it's
+  // deprecated.  fopen does not provide reliable error codes, so just use
+  // -1 in the event of a failure.
+  int err;
+  if (!(converted_output = fopen(converted_symbol_file->c_str(), "w"))) {
+    err = -1;
+#endif  // _MSC_VER >= 1400
+    fprintf(stderr, "LocateAndConvertPEFile: "
+        "fopen_s: error %d for %s %s %s %s\n",
+        err,
+        missing.debug_file.c_str(),
+        missing.debug_identifier.c_str(),
+        missing.version.c_str(),
+        converted_symbol_file->c_str());
+    return LOCATE_FAILURE;
+  }
+  AutoDeleter sym_deleter(*converted_symbol_file);
+
+  wstring pe_file_w;
+  if (!WindowsStringUtils::safe_mbstowcs(pe_file, &pe_file_w)) {
+    fprintf(stderr,
+        "LocateAndConvertPEFile: "
+        "WindowsStringUtils::safe_mbstowcs failed for %s\n",
+        pe_file.c_str());
+    return LOCATE_FAILURE;
+  }
+  PESourceLineWriter writer(pe_file_w);
+  PDBModuleInfo module_info;
+  if (!writer.GetModuleInfo(&module_info)) {
+    fprintf(stderr, "LocateAndConvertPEFile: "
+        "PESourceLineWriter::GetModuleInfo failed for %s %s %s %s\n",
+        missing.debug_file.c_str(),
+        missing.debug_identifier.c_str(),
+        missing.version.c_str(),
+        pe_file.c_str());
+    return LOCATE_FAILURE;
+  }
+  if (module_info.cpu.compare(L"x86_64") != 0) {
+    // This module is not x64 so we cannot generate Breakpad symbols from the
+    // PE alone. Don't delete PE-- no need to retry download.
+    pe_deleter.Release();
+    return LOCATE_FAILURE;
+  }
+
+  bool success = writer.WriteSymbols(converted_output);
+  fclose(converted_output);
+
+  if (!success) {
+    fprintf(stderr, "LocateAndConvertPEFile: "
+        "PESourceLineWriter::WriteMap failed for %s %s %s %s\n",
+        missing.debug_file.c_str(),
+        missing.debug_identifier.c_str(),
+        missing.version.c_str(),
+        pe_file.c_str());
+    return LOCATE_FAILURE;
+  }
+
+  if (keep_pe_file) {
     pe_deleter.Release();
   }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.h	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter/ms_symbol_server_converter.h	2021-12-09 12:01:26.000000000 +0000
@@ -101,13 +101,13 @@
   // component fields: either a GUID and age, or signature and age.  If
   // successful, sets the relevant fields in the object, including the type
   // field, and returns true.  On error, returns false.
-  bool InitializeFromString(const string &identifier);
+  bool InitializeFromString(const string& identifier);
 
   GUIDOrSignatureType type() const { return type_; }
   GUID guid() const { return guid_; }
   DWORD signature() const { return signature_; }
   int age() const { return age_; }
-  const void *guid_or_signature_pointer() const { return &guid_; }
+  const void* guid_or_signature_pointer() const { return &guid_; }
 
  private:
   GUIDOrSignatureType type_;
@@ -141,23 +141,23 @@
   // store to try.  The vector must contain at least one string.  None of the
   // strings passed to this constructor may contain asterisk ('*') or semicolon
   // (';') characters, as the symbol engine uses these characters as separators.
-  MSSymbolServerConverter(const string &local_cache,
-                          const vector<string> &symbol_servers);
+  MSSymbolServerConverter(const string& local_cache,
+                          const vector<string>& symbol_servers);
 
   // Locates the PE file (DLL or EXE) specified by the identifying information
   // in |missing|, by checking the symbol stores identified when the object
   // was created.  When returning LOCATE_SUCCESS, pe_file is set to
   // the pathname of the decompressed PE file as it is stored in the
   // local cache.
-  LocateResult LocatePEFile(const MissingSymbolInfo &missing, string *pe_file);
+  LocateResult LocatePEFile(const MissingSymbolInfo& missing, string* pe_file);
 
   // Locates the symbol file specified by the identifying information in
   // |missing|, by checking the symbol stores identified when the object
   // was created.  When returning LOCATE_SUCCESS, symbol_file is set to
   // the pathname of the decompressed symbol file as it is stored in the
   // local cache.
-  LocateResult LocateSymbolFile(const MissingSymbolInfo &missing,
-                                string *symbol_file);
+  LocateResult LocateSymbolFile(const MissingSymbolInfo& missing,
+                                string* symbol_file);
 
   // Calls LocateSymbolFile and converts the returned symbol file to the
   // dumped-symbol format, storing it adjacent to the symbol file.  The
@@ -170,12 +170,28 @@
   // is desired, set |keep_symbol_file| and |keep_pe_file| to false to indicate
   // that the original symbol file (pdb) and executable file (exe, dll) should
   // be deleted after conversion.
-  LocateResult LocateAndConvertSymbolFile(const MissingSymbolInfo &missing,
+  LocateResult LocateAndConvertSymbolFile(const MissingSymbolInfo& missing,
                                           bool keep_symbol_file,
                                           bool keep_pe_file,
-                                          string *converted_symbol_file,
-                                          string *symbol_file,
-                                          string *pe_file);
+                                          string* converted_symbol_file,
+                                          string* symbol_file,
+                                          string* pe_file);
+
+  // Calls LocatePEFile and converts the returned PE file to the
+  // dumped-symbol format, storing it adjacent to the PE file. The
+  // only conversion supported is from PE files. Returns the return
+  // value of LocatePEFile, or if LocatePEFile succeeds but
+  // conversion fails, returns LOCATE_FAILURE. The pathname to the
+  // PE file and to the converted symbol file are returned in
+  // |converted_symbol_file| and |pe_file|. |pe_file| is optional and may be
+  // NULL.  If only the converted symbol file is desired, set |keep_pe_file|
+  // to false to indicate that the executable file (exe, dll) should be deleted
+  // after conversion.
+  // NOTE: Currrently only supports x64 PEs.
+  LocateResult LocateAndConvertPEFile(const MissingSymbolInfo& missing,
+                                      bool keep_pe_file,
+                                      string* converted_symbol_file,
+                                      string* pe_file);
 
  private:
   // Locates the PDB or PE file (DLL or EXE) specified by the identifying
@@ -183,9 +199,9 @@
   // the symbol stores identified when the object was created.  When
   // returning LOCATE_SUCCESS, file_name is set to the pathname of the
   // decompressed PDB or PE file file as it is stored in the local cache.
-  LocateResult LocateFile(const string &debug_or_code_file,
-                          const string &debug_or_code_id,
-                          const string &version, string *file_name);
+  LocateResult LocateFile(const string& debug_or_code_file,
+                          const string& debug_or_code_id,
+                          const string& version, string* file_name);
 
   // Called by various SymSrv functions to report status as progress is made
   // and to allow the callback to influence processing.  Messages sent to this
@@ -199,8 +215,8 @@
   // SymFindFileInPath actually seems to accept NULL for a callback function
   // and behave properly for our needs in that case, but the documentation
   // doesn't mention it, so this little callback is provided.
-  static BOOL CALLBACK SymFindFileInPathCallback(const char *filename,
-                                                 void *context);
+  static BOOL CALLBACK SymFindFileInPathCallback(const char* filename,
+                                                 void* context);
 
   // The search path used by SymSrv, built based on the arguments to the
   // constructor.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/converter.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/converter.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/converter.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/converter.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,807 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma comment(lib, "winhttp.lib")
+#pragma comment(lib, "wininet.lib")
+#pragma comment(lib, "diaguids.lib")
+#pragma comment(lib, "imagehlp.lib")
+
+#include <cassert>
+#include <cstdio>
+#include <ctime>
+#include <map>
+#include <regex>
+#include <string>
+#include <vector>
+
+#include "tools/windows/converter_exe/escaping.h"
+#include "tools/windows/converter_exe/http_download.h"
+#include "tools/windows/converter_exe/tokenizer.h"
+#include "common/windows/http_upload.h"
+#include "common/windows/string_utils-inl.h"
+#include "tools/windows/converter/ms_symbol_server_converter.h"
+
+using strings::WebSafeBase64Unescape;
+using strings::WebSafeBase64Escape;
+
+namespace {
+
+using std::map;
+using std::string;
+using std::vector;
+using std::wstring;
+using crash::HTTPDownload;
+using crash::Tokenizer;
+using google_breakpad::HTTPUpload;
+using google_breakpad::MissingSymbolInfo;
+using google_breakpad::MSSymbolServerConverter;
+using google_breakpad::WindowsStringUtils;
+
+const char* kMissingStringDelimiters = "|";
+const char* kLocalCachePath = "c:\\symbols";
+const char* kNoExeMSSSServer = "http://msdl.microsoft.com/download/symbols/";
+
+// Windows stdio doesn't do line buffering.  Use this function to flush after
+// writing to stdout and stderr so that a log will be available if the
+// converter crashes.
+static int FprintfFlush(FILE* file, const char* format, ...) {
+  va_list arguments;
+  va_start(arguments, format);
+  int retval = vfprintf(file, format, arguments);
+  va_end(arguments);
+  fflush(file);
+  return retval;
+}
+
+static string CurrentDateAndTime() {
+  const string kUnknownDateAndTime = R"(????-??-?? ??:??:??)";
+
+  time_t current_time;
+  time(&current_time);
+
+  // localtime_s is safer but is only available in MSVC8.  Use localtime
+  // in earlier environments.
+  struct tm* time_pointer;
+#if _MSC_VER >= 1400  // MSVC 2005/8
+  struct tm time_struct;
+  time_pointer =& time_struct;
+  if (localtime_s(time_pointer,& current_time) != 0) {
+    return kUnknownDateAndTime;
+  }
+#else  // _MSC_VER >= 1400
+  time_pointer = localtime(&current_time);
+  if (!time_pointer) {
+    return kUnknownDateAndTime;
+  }
+#endif  // _MSC_VER >= 1400
+
+  char buffer[256];
+  if (!strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", time_pointer)) {
+    return kUnknownDateAndTime;
+  }
+
+  return string(buffer);
+}
+
+// ParseMissingString turns |missing_string| into a MissingSymbolInfo
+// structure.  It returns true on success, and false if no such conversion
+// is possible.
+static bool ParseMissingString(const string& missing_string,
+                               MissingSymbolInfo* missing_info) {
+  assert(missing_info);
+
+  vector<string> tokens;
+  Tokenizer::Tokenize(kMissingStringDelimiters, missing_string,& tokens);
+  if (tokens.size() != 5) {
+    return false;
+  }
+
+  missing_info->debug_file = tokens[0];
+  missing_info->debug_identifier = tokens[1];
+  missing_info->version = tokens[2];
+  missing_info->code_file = tokens[3];
+  missing_info->code_identifier = tokens[4];
+
+  return true;
+}
+
+// StringMapToWStringMap takes each element in a map that associates
+// (narrow) strings to strings and converts the keys and values to wstrings.
+// Returns true on success and false on failure, printing an error message.
+static bool StringMapToWStringMap(const map<string, string>& smap,
+                                  map<wstring, wstring>* wsmap) {
+  assert(wsmap);
+  wsmap->clear();
+
+  for (map<string, string>::const_iterator iterator = smap.begin();
+       iterator != smap.end();
+       ++iterator) {
+    wstring key;
+    if (!WindowsStringUtils::safe_mbstowcs(iterator->first,& key)) {
+      FprintfFlush(stderr,
+                   "StringMapToWStringMap: safe_mbstowcs failed for key %s\n",
+                   iterator->first.c_str());
+      return false;
+    }
+
+    wstring value;
+    if (!WindowsStringUtils::safe_mbstowcs(iterator->second,& value)) {
+      FprintfFlush(stderr, "StringMapToWStringMap: safe_mbstowcs failed "
+                           "for value %s\n",
+                   iterator->second.c_str());
+      return false;
+    }
+
+    wsmap->insert(make_pair(key, value));
+  }
+
+  return true;
+}
+
+// MissingSymbolInfoToParameters turns a MissingSymbolInfo structure into a
+// map of parameters suitable for passing to HTTPDownload or HTTPUpload.
+// Returns true on success and false on failure, printing an error message.
+static bool MissingSymbolInfoToParameters(const MissingSymbolInfo& missing_info,
+                                          map<wstring, wstring>* wparameters) {
+  assert(wparameters);
+
+  map<string, string> parameters;
+  string encoded_param;
+  // Indicate the params are encoded.
+  parameters["encoded"] = "true";  // The string value here does not matter.
+
+  WebSafeBase64Escape(missing_info.code_file,& encoded_param);
+  parameters["code_file"] = encoded_param;
+
+  WebSafeBase64Escape(missing_info.code_identifier,& encoded_param);
+  parameters["code_identifier"] = encoded_param;
+
+  WebSafeBase64Escape(missing_info.debug_file,& encoded_param);
+  parameters["debug_file"] = encoded_param;
+
+  WebSafeBase64Escape(missing_info.debug_identifier,& encoded_param);
+  parameters["debug_identifier"] = encoded_param;
+
+  if (!missing_info.version.empty()) {
+    // The version is optional.
+    WebSafeBase64Escape(missing_info.version,& encoded_param);
+    parameters["version"] = encoded_param;
+  }
+
+  WebSafeBase64Escape("WinSymConv",& encoded_param);
+  parameters["product"] = encoded_param;
+
+  if (!StringMapToWStringMap(parameters, wparameters)) {
+    // StringMapToWStringMap will have printed an error.
+    return false;
+  }
+
+  return true;
+}
+
+// UploadSymbolFile sends |converted_file| as identified by |missing_info|
+// to the symbol server rooted at |upload_symbol_url|.  Returns true on
+// success and false on failure, printing an error message.
+static bool UploadSymbolFile(const wstring& upload_symbol_url,
+                             const MissingSymbolInfo& missing_info,
+                             const string& converted_file) {
+  map<wstring, wstring> parameters;
+  if (!MissingSymbolInfoToParameters(missing_info,& parameters)) {
+    // MissingSymbolInfoToParameters or a callee will have printed an error.
+    return false;
+  }
+
+  wstring converted_file_w;
+
+  if (!WindowsStringUtils::safe_mbstowcs(converted_file,& converted_file_w)) {
+    FprintfFlush(stderr, "UploadSymbolFile: safe_mbstowcs failed for %s\n",
+                 converted_file.c_str());
+    return false;
+  }
+  map<wstring, wstring> files;
+  files[L"symbol_file"] = converted_file_w;
+
+  FprintfFlush(stderr, "Uploading %s\n", converted_file.c_str());
+  if (!HTTPUpload::SendMultipartPostRequest(
+      upload_symbol_url, parameters,
+      files, NULL, NULL, NULL)) {
+    FprintfFlush(stderr, "UploadSymbolFile: HTTPUpload::SendRequest failed "
+                         "for %s %s %s\n",
+                 missing_info.debug_file.c_str(),
+                 missing_info.debug_identifier.c_str(),
+                 missing_info.version.c_str());
+    return false;
+  }
+
+  return true;
+}
+
+// SendFetchFailedPing informs the symbol server based at
+// |fetch_symbol_failure_url| that the symbol file identified by
+// |missing_info| could authoritatively not be located.  Returns
+// true on success and false on failure.
+static bool SendFetchFailedPing(const wstring& fetch_symbol_failure_url,
+                                const MissingSymbolInfo& missing_info) {
+  map<wstring, wstring> parameters;
+  if (!MissingSymbolInfoToParameters(missing_info,& parameters)) {
+    // MissingSymbolInfoToParameters or a callee will have printed an error.
+    return false;
+  }
+
+  string content;
+  if (!HTTPDownload::Download(fetch_symbol_failure_url,
+                             & parameters,
+                             & content,
+                              NULL)) {
+    FprintfFlush(stderr, "SendFetchFailedPing: HTTPDownload::Download failed "
+                         "for %s %s %s\n",
+                 missing_info.debug_file.c_str(),
+                 missing_info.debug_identifier.c_str(),
+                 missing_info.version.c_str());
+    return false;
+  }
+
+  return true;
+}
+
+// Returns true if it's safe to make an external request for the symbol
+// file described in missing_info. It's considered safe to make an
+// external request unless the symbol file's debug_file string matches
+// the given blacklist regular expression.
+// The debug_file name is used from the MissingSymbolInfo struct,
+// matched against the blacklist_regex.
+static bool SafeToMakeExternalRequest(const MissingSymbolInfo& missing_info,
+                                      std::regex blacklist_regex) {
+  string file_name = missing_info.debug_file;
+  // Use regex_search because we want to match substrings.
+  if (std::regex_search(file_name, blacklist_regex)) {
+    FprintfFlush(stderr, "Not safe to make external request for file %s\n",
+                 file_name.c_str());
+    return false;
+  }
+
+  return true;
+}
+
+// Converter options derived from command line parameters.
+struct ConverterOptions {
+  ConverterOptions()
+      : report_fetch_failures(true) {
+  }
+
+  ~ConverterOptions() {
+  }
+
+  // Names of MS Symbol Supplier Servers that are internal to Google, and may
+  // have symbols for any request.
+  vector<string> full_internal_msss_servers;
+
+  // Names of MS Symbol Supplier Servers that are internal to Google, and
+  // shouldn't be checked for symbols for any .exe files.
+  vector<string> full_external_msss_servers;
+
+  // Names of MS Symbol Supplier Servers that are external to Google, and may
+  // have symbols for any request.
+  vector<string> no_exe_internal_msss_servers;
+
+  // Names of MS Symbol Supplier Servers that are external to Google, and
+  // shouldn't be checked for symbols for any .exe files.
+  vector<string> no_exe_external_msss_servers;
+
+  // Temporary local storage for symbols.
+  string local_cache_path;
+
+  // URL for uploading symbols.
+  wstring upload_symbols_url;
+
+  // URL to fetch list of missing symbols.
+  wstring missing_symbols_url;
+
+  // URL to report symbol fetch failure.
+  wstring fetch_symbol_failure_url;
+
+  // Are symbol fetch failures reported.
+  bool report_fetch_failures;
+
+  // File containing the list of missing symbols.  Fetch failures are not
+  // reported if such file is provided.
+  string missing_symbols_file;
+
+  // Regex used to blacklist files to prevent external symbol requests.
+  // Owned and cleaned up by this struct.
+  std::regex blacklist_regex;
+
+ private:
+  // DISABLE_COPY_AND_ASSIGN
+  ConverterOptions(const ConverterOptions&);
+  ConverterOptions& operator=(const ConverterOptions&);
+};
+
+// ConverMissingSymbolFile takes a single MissingSymbolInfo structure and
+// attempts to locate it from the symbol servers provided in the
+// |options.*_msss_servers| arguments.  "Full" servers are those that will be
+// queried for all symbol files; "No-EXE" servers will only be queried for
+// modules whose missing symbol data indicates are not main program executables.
+// Results will be sent to the |options.upload_symbols_url| on success or
+// |options.fetch_symbol_failure_url| on failure, and the local cache will be
+// stored at |options.local_cache_path|.  Because nothing can be done even in
+// the event of a failure, this function returns no value, although it
+// may result in error messages being printed.
+static void ConvertMissingSymbolFile(const MissingSymbolInfo& missing_info,
+                                     const ConverterOptions& options) {
+  string time_string = CurrentDateAndTime();
+  FprintfFlush(stdout, "converter: %s: attempting %s %s %s\n",
+               time_string.c_str(),
+               missing_info.debug_file.c_str(),
+               missing_info.debug_identifier.c_str(),
+               missing_info.version.c_str());
+
+  // The first lookup is always to internal symbol servers.
+  // Always ask the symbol servers identified as "full."
+  vector<string> msss_servers = options.full_internal_msss_servers;
+
+  // If the file is not an .exe file, also ask an additional set of symbol
+  // servers, such as Microsoft's public symbol server.
+  bool is_exe = false;
+
+  if (missing_info.code_file.length() >= 4) {
+    string code_extension =
+        missing_info.code_file.substr(missing_info.code_file.size() - 4);
+
+    // Firefox is a special case: .dll-only servers should be consulted for
+    // its symbols.  This enables us to get its symbols from Mozilla's
+    // symbol server when crashes occur in Google extension code hosted by a
+    // Firefox process.
+    if (_stricmp(code_extension.c_str(), ".exe") == 0 &&
+        _stricmp(missing_info.code_file.c_str(), "firefox.exe") != 0) {
+      is_exe = true;
+    }
+  }
+
+  if (!is_exe) {
+    msss_servers.insert(msss_servers.end(),
+                        options.no_exe_internal_msss_servers.begin(),
+                        options.no_exe_internal_msss_servers.end());
+  }
+
+  // If there are any suitable internal symbol servers, make a request.
+  MSSymbolServerConverter::LocateResult located =
+      MSSymbolServerConverter::LOCATE_FAILURE;
+  string converted_file;
+  if (msss_servers.size() > 0) {
+    // Attempt to fetch the symbol file and convert it.
+    FprintfFlush(stderr, "Making internal request for %s (%s)\n",
+                   missing_info.debug_file.c_str(),
+                   missing_info.debug_identifier.c_str());
+    MSSymbolServerConverter converter(options.local_cache_path, msss_servers);
+    located = converter.LocateAndConvertSymbolFile(missing_info,
+                                                   false,  // keep_symbol_file
+                                                   false,  // keep_pe_file
+                                                  & converted_file,
+                                                   NULL,   // symbol_file
+                                                   NULL);  // pe_file
+    switch (located) {
+      case MSSymbolServerConverter::LOCATE_SUCCESS:
+        FprintfFlush(stderr, "LocateResult = LOCATE_SUCCESS\n");
+        // Upload it.  Don't bother checking the return value.  If this
+        // succeeds, it should disappear from the missing symbol list.
+        // If it fails, something will print an error message indicating
+        // the cause of the failure, and the item will remain on the
+        // missing symbol list.
+        UploadSymbolFile(options.upload_symbols_url, missing_info,
+                         converted_file);
+        remove(converted_file.c_str());
+
+        // Note: this does leave some directories behind that could be
+        // cleaned up.  The directories inside options.local_cache_path for
+        // debug_file/debug_identifier can be removed at this point.
+        break;
+
+      case MSSymbolServerConverter::LOCATE_NOT_FOUND:
+        FprintfFlush(stderr, "LocateResult = LOCATE_NOT_FOUND\n");
+        // The symbol file definitively did not exist. Fall through,
+        // so we can attempt an external query if it's safe to do so.
+        break;
+
+      case MSSymbolServerConverter::LOCATE_RETRY:
+        FprintfFlush(stderr, "LocateResult = LOCATE_RETRY\n");
+        // Fall through in case we should make an external request.
+        // If not, or if an external request fails in the same way,
+        // we'll leave the entry in the symbol file list and
+        // try again on a future pass.  Print a message so that there's
+        // a record.
+        break;
+
+      case MSSymbolServerConverter::LOCATE_FAILURE:
+        FprintfFlush(stderr, "LocateResult = LOCATE_FAILURE\n");
+        // LocateAndConvertSymbolFile printed an error message.
+        break;
+
+      default:
+        FprintfFlush(
+            stderr,
+            "FATAL: Unexpected return value '%d' from "
+            "LocateAndConvertSymbolFile()\n",
+            located);
+        assert(0);
+        break;
+    }
+  } else {
+    // No suitable internal symbol servers.  This is fine because the converter
+    // is mainly used for downloading and converting of external symbols.
+  }
+
+  // Make a request to an external server if the internal request didn't
+  // succeed, and it's safe to do so.
+  if (located != MSSymbolServerConverter::LOCATE_SUCCESS &&
+      SafeToMakeExternalRequest(missing_info, options.blacklist_regex)) {
+    msss_servers = options.full_external_msss_servers;
+    if (!is_exe) {
+      msss_servers.insert(msss_servers.end(),
+                          options.no_exe_external_msss_servers.begin(),
+                          options.no_exe_external_msss_servers.end());
+    }
+    if (msss_servers.size() > 0) {
+      FprintfFlush(stderr, "Making external request for %s (%s)\n",
+                   missing_info.debug_file.c_str(),
+                   missing_info.debug_identifier.c_str());
+      MSSymbolServerConverter external_converter(options.local_cache_path,
+                                                 msss_servers);
+      located = external_converter.LocateAndConvertSymbolFile(
+          missing_info,
+          false,  // keep_symbol_file
+          false,  // keep_pe_file
+         & converted_file,
+          NULL,   // symbol_file
+          NULL);  // pe_file
+    } else {
+      FprintfFlush(stderr, "ERROR: No suitable external symbol servers.\n");
+    }
+  }
+
+  // Final handling for this symbol file is based on the result from the
+  // external request (if performed above), or on the result from the
+  // previous internal lookup.
+  switch (located) {
+    case MSSymbolServerConverter::LOCATE_SUCCESS:
+      FprintfFlush(stderr, "LocateResult = LOCATE_SUCCESS\n");
+      // Upload it.  Don't bother checking the return value.  If this
+      // succeeds, it should disappear from the missing symbol list.
+      // If it fails, something will print an error message indicating
+      // the cause of the failure, and the item will remain on the
+      // missing symbol list.
+      UploadSymbolFile(options.upload_symbols_url, missing_info,
+                       converted_file);
+      remove(converted_file.c_str());
+
+      // Note: this does leave some directories behind that could be
+      // cleaned up.  The directories inside options.local_cache_path for
+      // debug_file/debug_identifier can be removed at this point.
+      break;
+
+    case MSSymbolServerConverter::LOCATE_NOT_FOUND:
+      // The symbol file definitively didn't exist.  Inform the server.
+      // If this fails, something will print an error message indicating
+      // the cause of the failure, but there's really nothing more to
+      // do.  If this succeeds, the entry should be removed from the
+      // missing symbols list.
+      if (!options.report_fetch_failures) {
+        FprintfFlush(stderr, "SendFetchFailedPing skipped\n");
+      } else if (SendFetchFailedPing(options.fetch_symbol_failure_url,
+                                     missing_info)) {
+        FprintfFlush(stderr, "SendFetchFailedPing succeeded\n");
+      } else {
+        FprintfFlush(stderr, "SendFetchFailedPing failed\n");
+      }
+      break;
+
+    case MSSymbolServerConverter::LOCATE_RETRY:
+      FprintfFlush(stderr, "LocateResult = LOCATE_RETRY\n");
+      // Nothing to do but leave the entry in the symbol file list and
+      // try again on a future pass.  Print a message so that there's
+      // a record.
+      FprintfFlush(stderr, "ConvertMissingSymbolFile: deferring retry "
+                           "for %s %s %s\n",
+                   missing_info.debug_file.c_str(),
+                   missing_info.debug_identifier.c_str(),
+                   missing_info.version.c_str());
+      break;
+
+    case MSSymbolServerConverter::LOCATE_FAILURE:
+      FprintfFlush(stderr, "LocateResult = LOCATE_FAILURE\n");
+      // LocateAndConvertSymbolFile printed an error message.
+
+      // This is due to a bad debug file name, so fetch failed.
+      if (!options.report_fetch_failures) {
+        FprintfFlush(stderr, "SendFetchFailedPing skipped\n");
+      } else if (SendFetchFailedPing(options.fetch_symbol_failure_url,
+                                     missing_info)) {
+        FprintfFlush(stderr, "SendFetchFailedPing succeeded\n");
+      } else {
+        FprintfFlush(stderr, "SendFetchFailedPing failed\n");
+      }
+      break;
+
+    default:
+      FprintfFlush(
+          stderr,
+          "FATAL: Unexpected return value '%d' from "
+          "LocateAndConvertSymbolFile()\n",
+          located);
+      assert(0);
+      break;
+  }
+}
+
+
+// Reads the contents of file |file_name| and populates |contents|.
+// Returns true on success.
+static bool ReadFile(string file_name, string* contents) {
+  char buffer[1024 * 8];
+  FILE* fp = fopen(file_name.c_str(), "rt");
+  if (!fp) {
+    return false;
+  }
+  contents->clear();
+  while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+    contents->append(buffer);
+  }
+  fclose(fp);
+  return true;
+}
+
+// ConvertMissingSymbolsList obtains a missing symbol list from
+// |options.missing_symbols_url| or |options.missing_symbols_file| and calls
+// ConvertMissingSymbolFile for each missing symbol file in the list.
+static bool ConvertMissingSymbolsList(const ConverterOptions& options) {
+  // Set param to indicate requesting for encoded response.
+  map<wstring, wstring> parameters;
+  parameters[L"product"] = L"WinSymConv";
+  parameters[L"encoded"] = L"true";
+  // Get the missing symbol list.
+  string missing_symbol_list;
+  if (!options.missing_symbols_file.empty()) {
+    if (!ReadFile(options.missing_symbols_file,& missing_symbol_list)) {
+      return false;
+    }
+  } else if (!HTTPDownload::Download(options.missing_symbols_url,& parameters,
+                                    & missing_symbol_list, NULL)) {
+    return false;
+  }
+
+  // Tokenize the content into a vector.
+  vector<string> missing_symbol_lines;
+  Tokenizer::Tokenize("\n", missing_symbol_list,& missing_symbol_lines);
+
+  FprintfFlush(stderr, "Found %d missing symbol files in list.\n",
+               missing_symbol_lines.size() - 1);  // last line is empty.
+  int convert_attempts = 0;
+  for (vector<string>::const_iterator iterator = missing_symbol_lines.begin();
+       iterator != missing_symbol_lines.end();
+       ++iterator) {
+    // Decode symbol line.
+    const string& encoded_line = *iterator;
+    // Skip lines that are blank.
+    if (encoded_line.empty()) {
+      continue;
+    }
+
+    string line;
+    if (!WebSafeBase64Unescape(encoded_line,& line)) {
+      // If decoding fails, assume the line is not encoded.
+      // This is helpful when the program connects to a debug server without
+      // encoding.
+      line = encoded_line;
+    }
+
+    FprintfFlush(stderr, "\nLine: %s\n", line.c_str());
+
+    // Turn each element into a MissingSymbolInfo structure.
+    MissingSymbolInfo missing_info;
+    if (!ParseMissingString(line,& missing_info)) {
+      FprintfFlush(stderr, "ConvertMissingSymbols: ParseMissingString failed "
+                           "for %s from %ws\n",
+                   line.c_str(), options.missing_symbols_url.c_str());
+      continue;
+    }
+
+    ++convert_attempts;
+    ConvertMissingSymbolFile(missing_info, options);
+  }
+
+  // Say something reassuring, since ConvertMissingSymbolFile was never called
+  // and therefore never reported any progress.
+  if (convert_attempts == 0) {
+    string current_time = CurrentDateAndTime();
+    FprintfFlush(stdout, "converter: %s: nothing to convert\n",
+                 current_time.c_str());
+  }
+
+  return true;
+}
+
+// usage prints the usage message.  It returns 1 as a convenience, to be used
+// as a return value from main.
+static int usage(const char* program_name) {
+  FprintfFlush(stderr,
+      "usage: %s [options]\n"
+      "    -f  <full_msss_server>     MS servers to ask for all symbols\n"
+      "    -n  <no_exe_msss_server>   same, but prevent asking for EXEs\n"
+      "    -l  <local_cache_path>     Temporary local storage for symbols\n"
+      "    -s  <upload_url>           URL for uploading symbols\n"
+      "    -m  <missing_symbols_url>  URL to fetch list of missing symbols\n"
+      "    -mf <missing_symbols_file> File containing the list of missing\n"
+      "                               symbols.  Fetch failures are not\n"
+      "                               reported if such file is provided.\n"
+      "    -t  <fetch_failure_url>    URL to report symbol fetch failure\n"
+      "    -b  <regex>                Regex used to blacklist files to\n"
+      "                               prevent external symbol requests\n"
+      " Note that any server specified by -f or -n that starts with \\filer\n"
+      " will be treated as internal, and all others as external.\n",
+      program_name);
+
+  return 1;
+}
+
+// "Internal" servers consist only of those whose names start with
+// the literal string "\\filer\".
+static bool IsInternalServer(const string& server_name) {
+  if (server_name.find("\\\\filer\\") == 0) {
+    return true;
+  }
+  return false;
+}
+
+// Adds a server with the given name to the list of internal or external
+// servers, as appropriate.
+static void AddServer(const string& server_name,
+                      vector<string>* internal_servers,
+                      vector<string>* external_servers) {
+  if (IsInternalServer(server_name)) {
+    internal_servers->push_back(server_name);
+  } else {
+    external_servers->push_back(server_name);
+  }
+}
+
+}  // namespace
+
+int main(int argc, char** argv) {
+  string time_string = CurrentDateAndTime();
+  FprintfFlush(stdout, "converter: %s: starting\n", time_string.c_str());
+
+  ConverterOptions options;
+  options.report_fetch_failures = true;
+
+  // All arguments are paired.
+  if (argc % 2 != 1) {
+    return usage(argv[0]);
+  }
+
+  string blacklist_regex_str;
+  bool have_any_msss_servers = false;
+  for (int argi = 1; argi < argc; argi += 2) {
+    string option = argv[argi];
+    string value = argv[argi + 1];
+
+    if (option == "-f") {
+      AddServer(value,& options.full_internal_msss_servers,
+               & options.full_external_msss_servers);
+      have_any_msss_servers = true;
+    } else if (option == "-n") {
+      AddServer(value,& options.no_exe_internal_msss_servers,
+               & options.no_exe_external_msss_servers);
+      have_any_msss_servers = true;
+    } else if (option == "-l") {
+      if (!options.local_cache_path.empty()) {
+        return usage(argv[0]);
+      }
+      options.local_cache_path = value;
+    } else if (option == "-s") {
+      if (!WindowsStringUtils::safe_mbstowcs(value,
+                                            & options.upload_symbols_url)) {
+        FprintfFlush(stderr, "main: safe_mbstowcs failed for %s\n",
+                     value.c_str());
+        return 1;
+      }
+    } else if (option == "-m") {
+      if (!WindowsStringUtils::safe_mbstowcs(value,
+                                            & options.missing_symbols_url)) {
+        FprintfFlush(stderr, "main: safe_mbstowcs failed for %s\n",
+                     value.c_str());
+        return 1;
+      }
+    } else if (option == "-mf") {
+      options.missing_symbols_file = value;
+      printf("Getting the list of missing symbols from a file.  Fetch failures"
+             " will not be reported.\n");
+      options.report_fetch_failures = false;
+    } else if (option == "-t") {
+      if (!WindowsStringUtils::safe_mbstowcs(
+          value,
+         & options.fetch_symbol_failure_url)) {
+        FprintfFlush(stderr, "main: safe_mbstowcs failed for %s\n",
+                     value.c_str());
+        return 1;
+      }
+    } else if (option == "-b") {
+      blacklist_regex_str = value;
+    } else {
+      return usage(argv[0]);
+    }
+  }
+
+  if (blacklist_regex_str.empty()) {
+    FprintfFlush(stderr, "No blacklist specified.\n");
+    return usage(argv[0]);
+  }
+
+  // Compile the blacklist regular expression for later use.
+  options.blacklist_regex = std::regex(blacklist_regex_str.c_str(),
+      std::regex_constants::icase);
+
+  // Set the defaults.  If the user specified any MSSS servers, don't use
+  // any default.
+  if (!have_any_msss_servers) {
+    AddServer(kNoExeMSSSServer,& options.no_exe_internal_msss_servers,
+       & options.no_exe_external_msss_servers);
+  }
+
+  if (options.local_cache_path.empty()) {
+    options.local_cache_path = kLocalCachePath;
+  }
+
+  if (options.upload_symbols_url.empty()) {
+    FprintfFlush(stderr, "No upload symbols URL specified.\n");
+    return usage(argv[0]);
+  }
+  if (options.missing_symbols_url.empty() &&
+      options.missing_symbols_file.empty()) {
+    FprintfFlush(stderr, "No missing symbols URL or file specified.\n");
+    return usage(argv[0]);
+  }
+  if (options.fetch_symbol_failure_url.empty()) {
+    FprintfFlush(stderr, "No fetch symbol failure URL specified.\n");
+    return usage(argv[0]);
+  }
+
+  FprintfFlush(stdout,
+               "# of Symbol Servers (int/ext): %d/%d full, %d/%d no_exe\n",
+               options.full_internal_msss_servers.size(),
+               options.full_external_msss_servers.size(),
+               options.no_exe_internal_msss_servers.size(),
+               options.no_exe_external_msss_servers.size());
+
+  if (!ConvertMissingSymbolsList(options)) {
+    return 1;
+  }
+
+  time_string = CurrentDateAndTime();
+  FprintfFlush(stdout, "converter: %s: finished\n", time_string.c_str());
+  return 0;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/escaping.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/escaping.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/escaping.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/escaping.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,757 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "tools/windows/converter_exe/escaping.h"
+
+#include <assert.h>
+
+#define kApb kAsciiPropertyBits
+
+const unsigned char kAsciiPropertyBits[256] = {
+  0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x00
+  0x40, 0x68, 0x48, 0x48, 0x48, 0x48, 0x40, 0x40,
+  0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x10
+  0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+  0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,  // 0x20
+  0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+  0x84, 0x84, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+  0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05,  // 0x40
+  0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+  0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,  // 0x50
+  0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x10,
+  0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05,  // 0x60
+  0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+  0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,  // 0x70
+  0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x40,
+};
+
+// Use !! to suppress the warning C4800 of forcing 'int' to 'bool'.
+static inline bool ascii_isspace(unsigned char c) { return !!(kApb[c] & 0x08); }
+
+///////////////////////////////////
+// scoped_array
+///////////////////////////////////
+// scoped_array<C> is like scoped_ptr<C>, except that the caller must allocate
+// with new [] and the destructor deletes objects with delete [].
+//
+// As with scoped_ptr<C>, a scoped_array<C> either points to an object
+// or is NULL.  A scoped_array<C> owns the object that it points to.
+// scoped_array<T> is thread-compatible, and once you index into it,
+// the returned objects have only the threadsafety guarantees of T.
+//
+// Size: sizeof(scoped_array<C>) == sizeof(C*)
+template <class C>
+class scoped_array {
+ public:
+
+  // The element type
+  typedef C element_type;
+
+  // Constructor.  Defaults to intializing with NULL.
+  // There is no way to create an uninitialized scoped_array.
+  // The input parameter must be allocated with new [].
+  explicit scoped_array(C* p = NULL) : array_(p) { }
+
+  // Destructor.  If there is a C object, delete it.
+  // We don't need to test ptr_ == NULL because C++ does that for us.
+  ~scoped_array() {
+    enum { type_must_be_complete = sizeof(C) };
+    delete[] array_;
+  }
+
+  // Reset.  Deletes the current owned object, if any.
+  // Then takes ownership of a new object, if given.
+  // this->reset(this->get()) works.
+  void reset(C* p = NULL) {
+    if (p != array_) {
+      enum { type_must_be_complete = sizeof(C) };
+      delete[] array_;
+      array_ = p;
+    }
+  }
+
+  // Get one element of the current object.
+  // Will assert() if there is no current object, or index i is negative.
+  C& operator[](std::ptrdiff_t i) const {
+    assert(i >= 0);
+    assert(array_ != NULL);
+    return array_[i];
+  }
+
+  // Get a pointer to the zeroth element of the current object.
+  // If there is no current object, return NULL.
+  C* get() const {
+    return array_;
+  }
+
+  // Comparison operators.
+  // These return whether a scoped_array and a raw pointer refer to
+  // the same array, not just to two different but equal arrays.
+  bool operator==(const C* p) const { return array_ == p; }
+  bool operator!=(const C* p) const { return array_ != p; }
+
+  // Swap two scoped arrays.
+  void swap(scoped_array& p2) {
+    C* tmp = array_;
+    array_ = p2.array_;
+    p2.array_ = tmp;
+  }
+
+  // Release an array.
+  // The return value is the current pointer held by this object.
+  // If this object holds a NULL pointer, the return value is NULL.
+  // After this operation, this object will hold a NULL pointer,
+  // and will not own the object any more.
+  C* release() {
+    C* retVal = array_;
+    array_ = NULL;
+    return retVal;
+  }
+
+ private:
+  C* array_;
+
+  // Forbid comparison of different scoped_array types.
+  template <class C2> bool operator==(scoped_array<C2> const& p2) const;
+  template <class C2> bool operator!=(scoped_array<C2> const& p2) const;
+
+  // Disallow evil constructors
+  scoped_array(const scoped_array&);
+  void operator=(const scoped_array&);
+};
+
+
+///////////////////////////////////
+// Escape methods
+///////////////////////////////////
+
+namespace strings {
+
+// Return a mutable char* pointing to a string's internal buffer,
+// which may not be null-terminated. Writing through this pointer will
+// modify the string.
+//
+// string_as_array(&str)[i] is valid for 0 <= i < str.size() until the
+// next call to a string method that invalidates iterators.
+//
+// As of 2006-04, there is no standard-blessed way of getting a
+// mutable reference to a string's internal buffer. However, issue 530
+// (http://www.open-std.org/JTC1/SC22/WG21/docs/lwg-active.html#530)
+// proposes this as the method. According to Matt Austern, this should
+// already work on all current implementations.
+inline char* string_as_array(string* str) {
+  // DO NOT USE const_cast<char*>(str->data())! See the unittest for why.
+  return str->empty() ? NULL : &*str->begin();
+}
+
+int CalculateBase64EscapedLen(int input_len, bool do_padding) {
+  // these formulae were copied from comments that used to go with the base64
+  // encoding functions
+  int intermediate_result = 8 * input_len + 5;
+  assert(intermediate_result > 0);     // make sure we didn't overflow
+  int len = intermediate_result / 6;
+  if (do_padding) len = ((len + 3) / 4) * 4;
+  return len;
+}
+
+// Base64Escape does padding, so this calculation includes padding.
+int CalculateBase64EscapedLen(int input_len) {
+  return CalculateBase64EscapedLen(input_len, true);
+}
+
+// ----------------------------------------------------------------------
+// int Base64Unescape() - base64 decoder
+// int Base64Escape() - base64 encoder
+// int WebSafeBase64Unescape() - Google's variation of base64 decoder
+// int WebSafeBase64Escape() - Google's variation of base64 encoder
+//
+// Check out
+// http://www.cis.ohio-state.edu/htbin/rfc/rfc2045.html for formal
+// description, but what we care about is that...
+//   Take the encoded stuff in groups of 4 characters and turn each
+//   character into a code 0 to 63 thus:
+//           A-Z map to 0 to 25
+//           a-z map to 26 to 51
+//           0-9 map to 52 to 61
+//           +(- for WebSafe) maps to 62
+//           /(_ for WebSafe) maps to 63
+//   There will be four numbers, all less than 64 which can be represented
+//   by a 6 digit binary number (aaaaaa, bbbbbb, cccccc, dddddd respectively).
+//   Arrange the 6 digit binary numbers into three bytes as such:
+//   aaaaaabb bbbbcccc ccdddddd
+//   Equals signs (one or two) are used at the end of the encoded block to
+//   indicate that the text was not an integer multiple of three bytes long.
+// ----------------------------------------------------------------------
+
+int Base64UnescapeInternal(const char *src, int szsrc,
+                           char *dest, int szdest,
+                           const signed char* unbase64) {
+  static const char kPad64 = '=';
+
+  int decode = 0;
+  int destidx = 0;
+  int state = 0;
+  unsigned int ch = 0;
+  unsigned int temp = 0;
+
+  // The GET_INPUT macro gets the next input character, skipping
+  // over any whitespace, and stopping when we reach the end of the
+  // string or when we read any non-data character.  The arguments are
+  // an arbitrary identifier (used as a label for goto) and the number
+  // of data bytes that must remain in the input to avoid aborting the
+  // loop.
+#define GET_INPUT(label, remain)                 \
+  label:                                         \
+    --szsrc;                                     \
+    ch = *src++;                                 \
+    decode = unbase64[ch];                       \
+    if (decode < 0) {                            \
+      if (ascii_isspace((char)ch) && szsrc >= remain)  \
+        goto label;                              \
+      state = 4 - remain;                        \
+      break;                                     \
+    }
+
+  // if dest is null, we're just checking to see if it's legal input
+  // rather than producing output.  (I suspect this could just be done
+  // with a regexp...).  We duplicate the loop so this test can be
+  // outside it instead of in every iteration.
+
+  if (dest) {
+    // This loop consumes 4 input bytes and produces 3 output bytes
+    // per iteration.  We can't know at the start that there is enough
+    // data left in the string for a full iteration, so the loop may
+    // break out in the middle; if so 'state' will be set to the
+    // number of input bytes read.
+
+    while (szsrc >= 4)  {
+      // We'll start by optimistically assuming that the next four
+      // bytes of the string (src[0..3]) are four good data bytes
+      // (that is, no nulls, whitespace, padding chars, or illegal
+      // chars).  We need to test src[0..2] for nulls individually
+      // before constructing temp to preserve the property that we
+      // never read past a null in the string (no matter how long
+      // szsrc claims the string is).
+
+      if (!src[0] || !src[1] || !src[2] ||
+          (temp = ((unbase64[static_cast<int>(src[0])] << 18) |
+                   (unbase64[static_cast<int>(src[1])] << 12) |
+                   (unbase64[static_cast<int>(src[2])] << 6) |
+                   (unbase64[static_cast<int>(src[3])]))) & 0x80000000) {
+        // Iff any of those four characters was bad (null, illegal,
+        // whitespace, padding), then temp's high bit will be set
+        // (because unbase64[] is -1 for all bad characters).
+        //
+        // We'll back up and resort to the slower decoder, which knows
+        // how to handle those cases.
+
+        GET_INPUT(first, 4);
+        temp = decode;
+        GET_INPUT(second, 3);
+        temp = (temp << 6) | decode;
+        GET_INPUT(third, 2);
+        temp = (temp << 6) | decode;
+        GET_INPUT(fourth, 1);
+        temp = (temp << 6) | decode;
+      } else {
+        // We really did have four good data bytes, so advance four
+        // characters in the string.
+
+        szsrc -= 4;
+        src += 4;
+        decode = -1;
+        ch = '\0';
+      }
+
+      // temp has 24 bits of input, so write that out as three bytes.
+
+      if (destidx+3 > szdest) return -1;
+      dest[destidx+2] = (char)temp;
+      temp >>= 8;
+      dest[destidx+1] = (char)temp;
+      temp >>= 8;
+      dest[destidx] = (char)temp;
+      destidx += 3;
+    }
+  } else {
+    while (szsrc >= 4)  {
+      if (!src[0] || !src[1] || !src[2] ||
+          (temp = ((unbase64[static_cast<int>(src[0])] << 18) |
+                   (unbase64[static_cast<int>(src[1])] << 12) |
+                   (unbase64[static_cast<int>(src[2])] << 6) |
+                   (unbase64[static_cast<int>(src[3])]))) & 0x80000000) {
+        GET_INPUT(first_no_dest, 4);
+        GET_INPUT(second_no_dest, 3);
+        GET_INPUT(third_no_dest, 2);
+        GET_INPUT(fourth_no_dest, 1);
+      } else {
+        szsrc -= 4;
+        src += 4;
+        decode = -1;
+        ch = '\0';
+      }
+      destidx += 3;
+    }
+  }
+
+#undef GET_INPUT
+
+  // if the loop terminated because we read a bad character, return
+  // now.
+  if (decode < 0 && ch != '\0' && ch != kPad64 && !ascii_isspace((char)ch))
+    return -1;
+
+  if (ch == kPad64) {
+    // if we stopped by hitting an '=', un-read that character -- we'll
+    // look at it again when we count to check for the proper number of
+    // equals signs at the end.
+    ++szsrc;
+    --src;
+  } else {
+    // This loop consumes 1 input byte per iteration.  It's used to
+    // clean up the 0-3 input bytes remaining when the first, faster
+    // loop finishes.  'temp' contains the data from 'state' input
+    // characters read by the first loop.
+    while (szsrc > 0)  {
+      --szsrc;
+      ch = *src++;
+      decode = unbase64[ch];
+      if (decode < 0) {
+        if (ascii_isspace((char)ch)) {
+          continue;
+        } else if (ch == '\0') {
+          break;
+        } else if (ch == kPad64) {
+          // back up one character; we'll read it again when we check
+          // for the correct number of equals signs at the end.
+          ++szsrc;
+          --src;
+          break;
+        } else {
+          return -1;
+        }
+      }
+
+      // Each input character gives us six bits of output.
+      temp = (temp << 6) | decode;
+      ++state;
+      if (state == 4) {
+        // If we've accumulated 24 bits of output, write that out as
+        // three bytes.
+        if (dest) {
+          if (destidx+3 > szdest) return -1;
+          dest[destidx+2] = (char)temp;
+          temp >>= 8;
+          dest[destidx+1] = (char)temp;
+          temp >>= 8;
+          dest[destidx] = (char)temp;
+        }
+        destidx += 3;
+        state = 0;
+        temp = 0;
+      }
+    }
+  }
+
+  // Process the leftover data contained in 'temp' at the end of the input.
+  int expected_equals = 0;
+  switch (state) {
+    case 0:
+      // Nothing left over; output is a multiple of 3 bytes.
+      break;
+
+    case 1:
+      // Bad input; we have 6 bits left over.
+      return -1;
+
+    case 2:
+      // Produce one more output byte from the 12 input bits we have left.
+      if (dest) {
+        if (destidx+1 > szdest) return -1;
+        temp >>= 4;
+        dest[destidx] = (char)temp;
+      }
+      ++destidx;
+      expected_equals = 2;
+      break;
+
+    case 3:
+      // Produce two more output bytes from the 18 input bits we have left.
+      if (dest) {
+        if (destidx+2 > szdest) return -1;
+        temp >>= 2;
+        dest[destidx+1] = (char)temp;
+        temp >>= 8;
+        dest[destidx] = (char)temp;
+      }
+      destidx += 2;
+      expected_equals = 1;
+      break;
+
+    default:
+      // state should have no other values at this point.
+      fprintf(stdout, "This can't happen; base64 decoder state = %d", state);
+  }
+
+  // The remainder of the string should be all whitespace, mixed with
+  // exactly 0 equals signs, or exactly 'expected_equals' equals
+  // signs.  (Always accepting 0 equals signs is a google extension
+  // not covered in the RFC.)
+
+  int equals = 0;
+  while (szsrc > 0 && *src) {
+    if (*src == kPad64)
+      ++equals;
+    else if (!ascii_isspace(*src))
+      return -1;
+    --szsrc;
+    ++src;
+  }
+
+  return (equals == 0 || equals == expected_equals) ? destidx : -1;
+}
+
+int Base64Unescape(const char *src, int szsrc, char *dest, int szdest) {
+  static const signed char UnBase64[] = {
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      62/*+*/, -1,      -1,      -1,      63/*/ */,
+     52/*0*/, 53/*1*/, 54/*2*/, 55/*3*/, 56/*4*/, 57/*5*/, 58/*6*/, 59/*7*/,
+     60/*8*/, 61/*9*/, -1,      -1,      -1,      -1,      -1,      -1,
+     -1,       0/*A*/,  1/*B*/,  2/*C*/,  3/*D*/,  4/*E*/,  5/*F*/,  6/*G*/,
+      7/*H*/,  8/*I*/,  9/*J*/, 10/*K*/, 11/*L*/, 12/*M*/, 13/*N*/, 14/*O*/,
+     15/*P*/, 16/*Q*/, 17/*R*/, 18/*S*/, 19/*T*/, 20/*U*/, 21/*V*/, 22/*W*/,
+     23/*X*/, 24/*Y*/, 25/*Z*/, -1,      -1,      -1,      -1,      -1,
+     -1,      26/*a*/, 27/*b*/, 28/*c*/, 29/*d*/, 30/*e*/, 31/*f*/, 32/*g*/,
+     33/*h*/, 34/*i*/, 35/*j*/, 36/*k*/, 37/*l*/, 38/*m*/, 39/*n*/, 40/*o*/,
+     41/*p*/, 42/*q*/, 43/*r*/, 44/*s*/, 45/*t*/, 46/*u*/, 47/*v*/, 48/*w*/,
+     49/*x*/, 50/*y*/, 51/*z*/, -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1
+  };
+  // The above array was generated by the following code
+  // #include <sys/time.h>
+  // #include <stdlib.h>
+  // #include <string.h>
+  // main()
+  // {
+  //   static const char Base64[] =
+  //     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  //   char *pos;
+  //   int idx, i, j;
+  //   printf("    ");
+  //   for (i = 0; i < 255; i += 8) {
+  //     for (j = i; j < i + 8; j++) {
+  //       pos = strchr(Base64, j);
+  //       if ((pos == NULL) || (j == 0))
+  //         idx = -1;
+  //       else
+  //         idx = pos - Base64;
+  //       if (idx == -1)
+  //         printf(" %2d,     ", idx);
+  //       else
+  //         printf(" %2d/*%c*/,", idx, j);
+  //     }
+  //     printf("\n    ");
+  //   }
+  // }
+
+  return Base64UnescapeInternal(src, szsrc, dest, szdest, UnBase64);
+}
+
+bool Base64Unescape(const char *src, int slen, string* dest) {
+  // Determine the size of the output string.  Base64 encodes every 3 bytes into
+  // 4 characters.  any leftover chars are added directly for good measure.
+  // This is documented in the base64 RFC: http://www.ietf.org/rfc/rfc3548.txt
+  const int dest_len = 3 * (slen / 4) + (slen % 4);
+
+  dest->resize(dest_len);
+
+  // We are getting the destination buffer by getting the beginning of the
+  // string and converting it into a char *.
+  const int len = Base64Unescape(src, slen,
+                                 string_as_array(dest), dest->size());
+  if (len < 0) {
+    return false;
+  }
+
+  // could be shorter if there was padding
+  assert(len <= dest_len);
+  dest->resize(len);
+
+  return true;
+}
+
+// Base64Escape
+//
+// NOTE: We have to use an unsigned type for src because code built
+// in the the /google tree treats characters as signed unless
+// otherwised specified.
+//
+// TODO(who?): Move this function to use the char* type for "src"
+int Base64EscapeInternal(const unsigned char *src, int szsrc,
+                         char *dest, int szdest, const char *base64,
+                         bool do_padding) {
+  static const char kPad64 = '=';
+
+  if (szsrc <= 0) return 0;
+
+  char *cur_dest = dest;
+  const unsigned char *cur_src = src;
+
+  // Three bytes of data encodes to four characters of cyphertext.
+  // So we can pump through three-byte chunks atomically.
+  while (szsrc > 2) { /* keep going until we have less than 24 bits */
+    if ((szdest -= 4) < 0) return 0;
+    cur_dest[0] = base64[cur_src[0] >> 2];
+    cur_dest[1] = base64[((cur_src[0] & 0x03) << 4) + (cur_src[1] >> 4)];
+    cur_dest[2] = base64[((cur_src[1] & 0x0f) << 2) + (cur_src[2] >> 6)];
+    cur_dest[3] = base64[cur_src[2] & 0x3f];
+
+    cur_dest += 4;
+    cur_src += 3;
+    szsrc -= 3;
+  }
+
+  /* now deal with the tail (<=2 bytes) */
+  switch (szsrc) {
+    case 0:
+      // Nothing left; nothing more to do.
+      break;
+    case 1:
+      // One byte left: this encodes to two characters, and (optionally)
+      // two pad characters to round out the four-character cypherblock.
+      if ((szdest -= 2) < 0) return 0;
+      cur_dest[0] = base64[cur_src[0] >> 2];
+      cur_dest[1] = base64[(cur_src[0] & 0x03) << 4];
+      cur_dest += 2;
+      if (do_padding) {
+        if ((szdest -= 2) < 0) return 0;
+        cur_dest[0] = kPad64;
+        cur_dest[1] = kPad64;
+        cur_dest += 2;
+      }
+      break;
+    case 2:
+      // Two bytes left: this encodes to three characters, and (optionally)
+      // one pad character to round out the four-character cypherblock.
+      if ((szdest -= 3) < 0) return 0;
+      cur_dest[0] = base64[cur_src[0] >> 2];
+      cur_dest[1] = base64[((cur_src[0] & 0x03) << 4) + (cur_src[1] >> 4)];
+      cur_dest[2] = base64[(cur_src[1] & 0x0f) << 2];
+      cur_dest += 3;
+      if (do_padding) {
+        if ((szdest -= 1) < 0) return 0;
+        cur_dest[0] = kPad64;
+        cur_dest += 1;
+      }
+      break;
+    default:
+      // Should not be reached: blocks of 3 bytes are handled
+      // in the while loop before this switch statement.
+      fprintf(stderr, "Logic problem? szsrc = %d",  szsrc);
+      assert(false);
+      break;
+  }
+  return (cur_dest - dest);
+}
+
+static const char kBase64Chars[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+static const char kWebSafeBase64Chars[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+
+int Base64Escape(const unsigned char *src, int szsrc, char *dest, int szdest) {
+  return Base64EscapeInternal(src, szsrc, dest, szdest, kBase64Chars, true);
+}
+
+void Base64Escape(const unsigned char *src, int szsrc,
+                  string* dest, bool do_padding) {
+  const int max_escaped_size =
+    CalculateBase64EscapedLen(szsrc, do_padding);
+  dest->clear();
+  dest->resize(max_escaped_size + 1, '\0');
+  const int escaped_len = Base64EscapeInternal(src, szsrc,
+                                               &*dest->begin(), dest->size(),
+                                               kBase64Chars,
+                                               do_padding);
+  assert(max_escaped_size <= escaped_len);
+  dest->resize(escaped_len);
+}
+
+void Base64Escape(const string& src, string* dest) {
+  Base64Escape(reinterpret_cast<const unsigned char*>(src.c_str()),
+               src.size(), dest, true);
+}
+
+////////////////////////////////////////////////////
+// WebSafe methods
+////////////////////////////////////////////////////
+
+int WebSafeBase64Unescape(const char *src, int szsrc, char *dest, int szdest) {
+  static const signed char UnBase64[] = {
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      62/*-*/, -1,      -1,
+     52/*0*/, 53/*1*/, 54/*2*/, 55/*3*/, 56/*4*/, 57/*5*/, 58/*6*/, 59/*7*/,
+     60/*8*/, 61/*9*/, -1,      -1,      -1,      -1,      -1,      -1,
+     -1,       0/*A*/,  1/*B*/,  2/*C*/,  3/*D*/,  4/*E*/,  5/*F*/,  6/*G*/,
+      7/*H*/,  8/*I*/,  9/*J*/, 10/*K*/, 11/*L*/, 12/*M*/, 13/*N*/, 14/*O*/,
+     15/*P*/, 16/*Q*/, 17/*R*/, 18/*S*/, 19/*T*/, 20/*U*/, 21/*V*/, 22/*W*/,
+     23/*X*/, 24/*Y*/, 25/*Z*/, -1,      -1,      -1,      -1,      63/*_*/,
+     -1,      26/*a*/, 27/*b*/, 28/*c*/, 29/*d*/, 30/*e*/, 31/*f*/, 32/*g*/,
+     33/*h*/, 34/*i*/, 35/*j*/, 36/*k*/, 37/*l*/, 38/*m*/, 39/*n*/, 40/*o*/,
+     41/*p*/, 42/*q*/, 43/*r*/, 44/*s*/, 45/*t*/, 46/*u*/, 47/*v*/, 48/*w*/,
+     49/*x*/, 50/*y*/, 51/*z*/, -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
+     -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1
+  };
+  // The above array was generated by the following code
+  // #include <sys/time.h>
+  // #include <stdlib.h>
+  // #include <string.h>
+  // main()
+  // {
+  //   static const char Base64[] =
+  //     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+  //   char *pos;
+  //   int idx, i, j;
+  //   printf("    ");
+  //   for (i = 0; i < 255; i += 8) {
+  //     for (j = i; j < i + 8; j++) {
+  //       pos = strchr(Base64, j);
+  //       if ((pos == NULL) || (j == 0))
+  //         idx = -1;
+  //       else
+  //         idx = pos - Base64;
+  //       if (idx == -1)
+  //         printf(" %2d,     ", idx);
+  //       else
+  //         printf(" %2d/*%c*/,", idx, j);
+  //     }
+  //     printf("\n    ");
+  //   }
+  // }
+
+  return Base64UnescapeInternal(src, szsrc, dest, szdest, UnBase64);
+}
+
+bool WebSafeBase64Unescape(const char *src, int slen, string* dest) {
+  int dest_len = 3 * (slen / 4) + (slen % 4);
+  dest->clear();
+  dest->resize(dest_len);
+  int len = WebSafeBase64Unescape(src, slen, &*dest->begin(), dest->size());
+  if (len < 0) {
+    dest->clear();
+    return false;
+  }
+  // could be shorter if there was padding
+  assert(len <= dest_len);
+  dest->resize(len);
+  return true;
+}
+
+bool WebSafeBase64Unescape(const string& src, string* dest) {
+  return WebSafeBase64Unescape(src.data(), src.size(), dest);
+}
+
+int WebSafeBase64Escape(const unsigned char *src, int szsrc, char *dest,
+                        int szdest, bool do_padding) {
+  return Base64EscapeInternal(src, szsrc, dest, szdest,
+                              kWebSafeBase64Chars, do_padding);
+}
+
+void WebSafeBase64Escape(const unsigned char *src, int szsrc,
+                         string *dest, bool do_padding) {
+  const int max_escaped_size =
+    CalculateBase64EscapedLen(szsrc, do_padding);
+  dest->clear();
+  dest->resize(max_escaped_size + 1, '\0');
+  const int escaped_len = Base64EscapeInternal(src, szsrc,
+                                               &*dest->begin(), dest->size(),
+                                               kWebSafeBase64Chars,
+                                               do_padding);
+  assert(max_escaped_size <= escaped_len);
+  dest->resize(escaped_len);
+}
+
+void WebSafeBase64EscapeInternal(const string& src,
+                                 string* dest,
+                                 bool do_padding) {
+  int encoded_len = CalculateBase64EscapedLen(src.size());
+  scoped_array<char> buf(new char[encoded_len]);
+  int len = WebSafeBase64Escape(reinterpret_cast<const unsigned char*>(src.c_str()),
+                                src.size(), buf.get(),
+                                encoded_len, do_padding);
+  dest->assign(buf.get(), len);
+}
+
+void WebSafeBase64Escape(const string& src, string* dest) {
+  WebSafeBase64EscapeInternal(src, dest, false);
+}
+
+void WebSafeBase64EscapeWithPadding(const string& src, string* dest) {
+  WebSafeBase64EscapeInternal(src, dest, true);
+}
+
+}  // namespace strings
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/escaping.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/escaping.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/escaping.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/escaping.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,99 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Base64 escaping methods to encode/decode strings.
+
+#ifndef TOOLS_WINDOWS_CONVERTER_EXE_ESCAPING_H_
+#define TOOLS_WINDOWS_CONVERTER_EXE_ESCAPING_H_
+
+#include <string>
+
+namespace strings {
+
+using std::string;
+
+// ----------------------------------------------------------------------
+// Base64Escape()
+// WebSafeBase64Escape()
+//    Encode "src" to "dest" using base64 encoding.
+//    src is not null terminated, instead specify len.
+//    'dest' should have at least CalculateBase64EscapedLen() length.
+//    RETURNS the length of dest.
+//    The WebSafe variation use '-' instead of '+' and '_' instead of '/'
+//    so that we can place the out in the URL or cookies without having
+//    to escape them.  It also has an extra parameter "do_padding",
+//    which when set to false will prevent padding with "=".
+// ----------------------------------------------------------------------
+void Base64Escape(const string& src, string* dest);
+int Base64Escape(const unsigned char* src, int slen, char* dest, int szdest);
+// Encode src into dest with padding.
+void Base64Escape(const unsigned char* src, int szsrc,
+                  string* dest, bool do_padding);
+
+int WebSafeBase64Escape(const unsigned char* src, int slen, char* dest,
+                        int szdest, bool do_padding);
+// Encode src into dest web-safely without padding.
+void WebSafeBase64Escape(const string& src, string* dest);
+// Encode src into dest web-safely with padding.
+void WebSafeBase64EscapeWithPadding(const string& src, string* dest);
+void WebSafeBase64Escape(const unsigned char* src, int szsrc,
+                         string* dest, bool do_padding);
+
+// ----------------------------------------------------------------------
+// Base64Unescape()
+// WebSafeBase64Unescape()
+//    Copies "src" to "dest", where src is in base64 and is written to its
+//    ASCII equivalents. src is not null terminated, instead specify len.
+//    I recommend that slen<szdest, but we honor szdest anyway.
+//    RETURNS the length of dest, or -1 if src contains invalid chars.
+//    The WebSafe variation use '-' instead of '+' and '_' instead of '/'.
+//    The variations that store into a string clear the string first, and
+//    return false (with dest empty) if src contains invalid chars; for
+//    these versions src and dest must be different strings.
+// ----------------------------------------------------------------------
+int Base64Unescape(const char* src, int slen, char* dest, int szdest);
+bool Base64Unescape(const char* src, int slen, string* dest);
+inline bool Base64Unescape(const string& src, string* dest) {
+  return Base64Unescape(src.data(), src.size(), dest);
+}
+
+
+int WebSafeBase64Unescape(const char* src, int slen, char* dest, int szdest);
+bool WebSafeBase64Unescape(const char* src, int slen, string* dest);
+bool WebSafeBase64Unescape(const string& src, string* dest);
+
+// Return the length to use for the output buffer given to the base64 escape
+// routines. Make sure to use the same value for do_padding in both.
+// This function may return incorrect results if given input_len values that
+// are extremely high, which should happen rarely.
+int CalculateBase64EscapedLen(int input_len, bool do_padding);
+// Use this version when calling Base64Escape without a do_padding arg.
+int CalculateBase64EscapedLen(int input_len);
+}  // namespace strings
+
+#endif  // TOOLS_WINDOWS_CONVERTER_EXE_ESCAPING_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_client.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_client.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_client.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_client.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef TOOLS_CRASH_CONVERTER_WINDOWS_HTTP_CLIENT_H_
+#define TOOLS_CRASH_CONVERTER_WINDOWS_HTTP_CLIENT_H_
+
+#include <tchar.h>
+#include <windows.h>
+#include <vector>
+
+typedef void* HttpHandle;
+
+namespace crash {
+
+// HttpClient provides an abstract layer for HTTP APIs. The actual
+// implementation can be based on either WinHttp or WinInet.
+class HttpClient {
+ public:
+  enum AccessType {
+    ACCESS_TYPE_PRECONFIG,
+    ACCESS_TYPE_DIRECT,
+    ACCESS_TYPE_PROXY,
+  };
+
+  virtual ~HttpClient() {}
+
+  virtual bool CrackUrl(const TCHAR* url,
+                        DWORD flags,
+                        TCHAR* scheme,
+                        size_t scheme_buffer_length,
+                        TCHAR* host,
+                        size_t host_buffer_length,
+                        TCHAR* uri,
+                        size_t uri_buffer_length,
+                        int* port) const = 0;
+  virtual bool Open(const TCHAR* user_agent,
+                    DWORD access_type,
+                    const TCHAR* proxy_name,
+                    const TCHAR* proxy_bypass,
+                    HttpHandle* session_handle) const = 0;
+  virtual bool Connect(HttpHandle session_handle,
+                       const TCHAR* server,
+                       int port,
+                       HttpHandle* connection_handle) const = 0;
+  virtual bool OpenRequest(HttpHandle connection_handle,
+                           const TCHAR* verb,
+                           const TCHAR* uri,
+                           const TCHAR* version,
+                           const TCHAR* referrer,
+                           bool is_secure,
+                           HttpHandle* request_handle) const = 0;
+  virtual bool SendRequest(HttpHandle request_handle,
+                           const TCHAR* headers,
+                           DWORD headers_length) const = 0;
+  virtual bool ReceiveResponse(HttpHandle request_handle) const = 0;
+  virtual bool GetHttpStatusCode(HttpHandle request_handle,
+                                 int* status_code) const = 0;
+  virtual bool GetContentLength(HttpHandle request_handle,
+                                DWORD* content_length) const = 0;
+  virtual bool ReadData(HttpHandle request_handle,
+                        void* buffer,
+                        DWORD buffer_length,
+                        DWORD* bytes_read) const = 0;
+  virtual bool Close(HttpHandle handle) const = 0;
+
+  static const DWORD kUnknownContentLength = (DWORD)-1;
+};
+
+}  // namespace crash
+
+#endif  // TOOLS_CRASH_CONVERTER_WINDOWS_HTTP_CLIENT_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_download.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_download.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_download.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_download.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,326 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <assert.h>
+#include <stdio.h>
+#include <Windows.h>
+#include <WinInet.h>
+
+#include <vector>
+
+#include "tools/windows/converter_exe/http_download.h"
+#include "tools/windows/converter_exe/winhttp_client.h"
+#include "tools/windows/converter_exe/wininet_client.h"
+
+namespace crash {
+static const std::vector<char>::size_type kVectorChunkSize = 4096;  // 4 KB
+
+using std::vector;
+
+// Class that atuo closes the contained HttpHandle when the object
+// goes out of scope.
+class AutoHttpHandle {
+ public:
+  AutoHttpHandle() : handle_(NULL) {}
+  explicit AutoHttpHandle(HttpHandle handle) : handle_(handle) {}
+  ~AutoHttpHandle() {
+    if (handle_) {
+      InternetCloseHandle(handle_);
+    }
+  }
+
+  HttpHandle get() { return handle_; }
+  HttpHandle* get_handle_addr () { return &handle_; }
+
+ private:
+  HttpHandle handle_;
+};
+
+// Template class for auto releasing the contained pointer when
+// the object goes out of scope.
+template<typename T>
+class AutoPtr {
+ public:
+  explicit AutoPtr(T* ptr) : ptr_(ptr) {}
+  ~AutoPtr() {
+    if (ptr_) {
+      delete ptr_;
+    }
+  }
+
+  T* get() { return ptr_; }
+  T* operator -> () { return ptr_; }
+
+ private:
+  T* ptr_;
+};
+
+// CheckParameters ensures that the parameters in |parameters| are safe for
+// use in an HTTP URL.  Returns true if they are, false if unsafe characters
+// are present.
+static bool CheckParameters(const map<wstring, wstring>* parameters) {
+  for (map<wstring, wstring>::const_iterator iterator = parameters->begin();
+       iterator != parameters->end();
+       ++iterator) {
+    const wstring& key = iterator->first;
+    if (key.empty()) {
+      // Disallow empty parameter names.
+      return false;
+    }
+    for (unsigned int i = 0; i < key.size(); ++i) {
+      wchar_t c = key[i];
+      if (c < 32 || c == '"' || c == '?' || c == '&' || c > 127) {
+        return false;
+      }
+    }
+
+    const wstring& value = iterator->second;
+    for (unsigned int i = 0; i < value.size(); ++i) {
+      wchar_t c = value[i];
+      if (c < 32 || c == '"' || c == '?' || c == '&' || c > 127) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+HttpClient* HTTPDownload::CreateHttpClient(const wchar_t* url) {
+  const TCHAR* kHttpApiPolicyEnvironmentVariable = TEXT("USE_WINHTTP");
+  TCHAR buffer[2] = {0};
+  HttpClient* http_client = NULL;
+
+  if (::GetEnvironmentVariable(kHttpApiPolicyEnvironmentVariable,
+                               buffer,
+                               sizeof(buffer)/sizeof(buffer[0])) > 0) {
+    fprintf(stdout,
+            "Environment variable [%ws] is set, use WinHttp\n",
+            kHttpApiPolicyEnvironmentVariable);
+    http_client = CreateWinHttpClient(url);
+    if (http_client == NULL) {
+      fprintf(stderr, "WinHttpClient not created, Is the protocol HTTPS? "
+                      "Fall back to WinInet API.\n");
+    }
+  } else {
+    fprintf(stderr,
+            "Environment variable [%ws] is NOT set, use WinInet API\n",
+            kHttpApiPolicyEnvironmentVariable);
+  }
+
+  if (http_client == NULL) {
+    return CreateWinInetClient(url);
+  }
+
+  return http_client;
+}
+
+// static
+bool HTTPDownload::Download(const wstring& url,
+                            const map<wstring, wstring>* parameters,
+                            string *content, int *status_code) {
+  assert(content);
+  AutoPtr<HttpClient> http_client(CreateHttpClient(url.c_str()));
+
+  if (!http_client.get()) {
+    fprintf(stderr, "Failed to create any http client.\n");
+    return false;
+  }
+
+  if (status_code) {
+    *status_code = 0;
+  }
+
+  wchar_t scheme[16] = {0};
+  wchar_t host[256] = {0};
+  wchar_t path[256] = {0};
+  int port = 0;
+  if (!http_client->CrackUrl(url.c_str(),
+                             0,
+                             scheme,
+                             sizeof(scheme)/sizeof(scheme[0]),
+                             host,
+                             sizeof(host)/sizeof(host[0]),
+                             path,
+                             sizeof(path)/sizeof(path[0]),
+                             &port)) {
+    fprintf(stderr,
+            "HTTPDownload::Download: InternetCrackUrl: error %lu for %ws\n",
+            GetLastError(), url.c_str());
+    return false;
+  }
+
+  bool secure = false;
+  if (_wcsicmp(scheme, L"https") == 0) {
+    secure = true;
+  } else if (wcscmp(scheme, L"http") != 0) {
+    fprintf(stderr,
+            "HTTPDownload::Download: scheme must be http or https for %ws\n",
+            url.c_str());
+    return false;
+  }
+
+  AutoHttpHandle internet;
+  if (!http_client->Open(NULL,  // user agent
+                         HttpClient::ACCESS_TYPE_PRECONFIG,
+                         NULL,  // proxy name
+                         NULL,  // proxy bypass
+                         internet.get_handle_addr())) {
+    fprintf(stderr,
+            "HTTPDownload::Download: Open: error %lu for %ws\n",
+            GetLastError(), url.c_str());
+    return false;
+  }
+
+  AutoHttpHandle connection;
+  if (!http_client->Connect(internet.get(),
+                            host,
+                            port,
+                            connection.get_handle_addr())) {
+    fprintf(stderr,
+            "HTTPDownload::Download: InternetConnect: error %lu for %ws\n",
+            GetLastError(), url.c_str());
+    return false;
+  }
+
+  wstring request_string = path;
+  if (parameters) {
+    // TODO(mmentovai): escape bad characters in parameters instead of
+    // forbidding them.
+    if (!CheckParameters(parameters)) {
+      fprintf(stderr,
+              "HTTPDownload::Download: invalid characters in parameters\n");
+      return false;
+    }
+
+    bool added_parameter = false;
+    for (map<wstring, wstring>::const_iterator iterator = parameters->begin();
+         iterator != parameters->end();
+         ++iterator) {
+      request_string.append(added_parameter ? L"&" : L"?");
+      request_string.append(iterator->first);
+      request_string.append(L"=");
+      request_string.append(iterator->second);
+      added_parameter = true;
+    }
+  }
+
+  AutoHttpHandle request;
+  if (!http_client->OpenRequest(connection.get(),
+                                L"GET",
+                                request_string.c_str(),
+                                NULL,    // version
+                                NULL,    // referer
+                                secure,
+                                request.get_handle_addr())) {
+    fprintf(stderr,
+            "HttpClient::OpenRequest: error %lu for %ws, request: %ws\n",
+            GetLastError(), url.c_str(), request_string.c_str());
+    return false;
+  }
+
+  if (!http_client->SendRequest(request.get(), NULL, 0)) {
+    fprintf(stderr,
+            "HttpClient::SendRequest: error %lu for %ws\n",
+            GetLastError(), url.c_str());
+    return false;
+  }
+
+  if (!http_client->ReceiveResponse(request.get())) {
+    fprintf(stderr,
+            "HttpClient::ReceiveResponse: error %lu for %ws\n",
+            GetLastError(), url.c_str());
+    return false;
+  }
+
+  int http_status = 0;
+  if (!http_client->GetHttpStatusCode(request.get(), &http_status)) {
+    fprintf(stderr,
+            "HttpClient::GetHttpStatusCode: error %lu for %ws\n",
+            GetLastError(), url.c_str());
+    return false;
+  }
+  if (http_status != 200) {
+    fprintf(stderr,
+            "HTTPDownload::Download: HTTP status code %d for %ws\n",
+            http_status, url.c_str());
+    return false;
+  }
+
+  DWORD content_length = 0;
+  vector<char>::size_type buffer_size = 0;
+  http_client->GetContentLength(request.get(), &content_length);
+  if (content_length == HttpClient::kUnknownContentLength) {
+    buffer_size = kVectorChunkSize;
+  } else {
+    buffer_size = content_length;
+  }
+
+  if (content_length != 0) {
+    vector<char> response_buffer = vector<char>(buffer_size+1);
+    DWORD size_read;
+    DWORD total_read = 0;
+    bool read_result;
+    do {
+      if (content_length == HttpClient::kUnknownContentLength
+          && buffer_size == total_read) {
+        // The content length wasn't specified in the response header, so we
+        // have to keep growing the buffer until we're done reading.
+        buffer_size += kVectorChunkSize;
+        response_buffer.resize(buffer_size);
+      }
+      read_result = !!http_client->ReadData(
+          request.get(),
+          &response_buffer[total_read],
+          static_cast<DWORD>(buffer_size) - total_read,
+          &size_read);
+      total_read += size_read;
+    } while (read_result && (size_read != 0));
+
+    if (!read_result) {
+      fprintf(stderr,
+              "HttpClient::ReadData: error %lu for %ws\n",
+              GetLastError(),
+              url.c_str());
+      return false;
+    } else if (size_read != 0) {
+      fprintf(stderr,
+              "HttpClient::ReadData: error %lu/%lu for %ws\n",
+              total_read,
+              content_length,
+              url.c_str());
+      return false;
+    }
+    content->assign(&response_buffer[0], total_read);
+  } else {
+    content->clear();
+  }
+  return true;
+}
+
+}  // namespace crash
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_download.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_download.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_download.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/http_download.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,62 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef TOOLS_WINDOWS_CONVERTER_EXE_HTTP_DOWNLOAD_H_
+#define TOOLS_WINDOWS_CONVERTER_EXE_HTTP_DOWNLOAD_H_
+
+#include <map>
+#include <string>
+#include "tools/windows/converter_exe/winhttp_client.h"
+
+namespace crash {
+
+using std::map;
+using std::string;
+using std::wstring;
+
+class HTTPDownload {
+ public:
+  // Retrieves the resource located at |url|, a http or https URL, via WinInet.
+  // The request is fetched with GET request; the optional |parameters| are
+  // appended to the URL.  Returns true on success, placing the content of the
+  // retrieved resource in |content|.  Returns false on failure.  HTTP status
+  // codes other than 200 cause Download to return false.  If |status_code| is
+  // supplied, it will be set to the value of the HTTP status code, if an HTTP
+  // transaction occurs.  If Download fails before a transaction can occur,
+  // |status_code| will be set to 0.  Any failures will result in messages
+  // being printed to stderr.
+  static bool Download(const wstring& url,
+                       const map<wstring, wstring>* parameters,
+                       string *content, int *status_code);
+ private:
+  static HttpClient* CreateHttpClient(const wchar_t*);
+};
+
+}  // namespace crash
+
+#endif  // TOOLS_WINDOWS_CONVERTER_EXE_HTTP_DOWNLOAD_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/tokenizer.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/tokenizer.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/tokenizer.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/tokenizer.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,61 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <assert.h>
+
+#include "tools/windows/converter_exe/tokenizer.h"
+
+namespace crash {
+
+// static
+void Tokenizer::Tokenize(const string& delimiters, const string& input,
+                        vector<string>* output) {
+  assert(output);
+  output->clear();
+
+  string::size_type position = 0;  // Where to begin looking for a delimiter
+  string::size_type new_position;  // Position of found delimiter
+  string token;
+
+  while ((new_position = input.find_first_of(delimiters, position)) !=
+         string::npos) {
+    token = input.substr(position, new_position - position);
+    output->push_back(token);
+
+    // Next time, begin looking right after this delimiter.
+    position = new_position + 1;
+  }
+
+  // There are no more delimiters in the string.  Take everything from the
+  // final delimiter up to the end of the string as a token.  This may be
+  // an empty string.
+  token = input.substr(position);
+  output->push_back(token);
+}
+
+}  // namespace crash
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/tokenizer.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/tokenizer.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/tokenizer.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/tokenizer.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef TOOLS_WINDOWS_CONVERTER_EXE_TOKENIZER_H_
+#define TOOLS_WINDOWS_CONVERTER_EXE_TOKENIZER_H_
+
+#include <string>
+#include <vector>
+
+namespace crash {
+
+using std::string;
+using std::vector;
+
+class Tokenizer {
+ public:
+  // Splits |input| into a series of tokens delimited in the input string by
+  // any of the characters in |delimiters|.  The tokens are passed back in the
+  // |output| vector.
+  static void Tokenize(const string& delimiters, const string& input,
+                       vector<string>* output);
+};
+
+}  // namespace crash
+
+#endif  // TOOLS_WINDOWS_CONVERTER_EXE_TOKENIZER_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,307 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "tools/windows/converter_exe/winhttp_client.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <windows.h>
+#include <winhttp.h>
+#include <vector>
+
+namespace crash {
+
+namespace internal {
+
+// This class implements HttpClient based on WinInet APIs.
+class WinHttpClient : public HttpClient {
+ public:
+  virtual ~WinHttpClient() {}
+  virtual bool CrackUrl(const TCHAR* url,
+                        DWORD flags,
+                        TCHAR* scheme,
+                        size_t scheme_buffer_length,
+                        TCHAR* host,
+                        size_t host_buffer_length,
+                        TCHAR* uri,
+                        size_t uri_buffer_length,
+                        int* port) const;
+  virtual bool Open(const TCHAR* user_agent,
+                    DWORD access_type,
+                    const TCHAR* proxy_name,
+                    const TCHAR* proxy_bypass,
+                    HttpHandle* session_handle) const;
+  virtual bool Connect(HttpHandle session_handle,
+                       const TCHAR* server,
+                       int port,
+                       HttpHandle* connection_handle) const;
+  virtual bool OpenRequest(HttpHandle connection_handle,
+                           const TCHAR* verb,
+                           const TCHAR* uri,
+                           const TCHAR* version,
+                           const TCHAR* referrer,
+                           bool is_secure,
+                           HttpHandle* request_handle) const;
+  virtual bool SendRequest(HttpHandle request_handle,
+                           const TCHAR* headers,
+                           DWORD headers_length) const;
+  virtual bool ReceiveResponse(HttpHandle request_handle) const;
+  virtual bool GetHttpStatusCode(HttpHandle request_handle,
+                                 int* status_code) const;
+  virtual bool GetContentLength(HttpHandle request_handle,
+                                DWORD* content_length) const;
+  virtual bool ReadData(HttpHandle request_handle,
+                        void* buffer,
+                        DWORD buffer_length,
+                        DWORD* bytes_read) const;
+  virtual bool Close(HttpHandle handle) const;
+
+ private:
+  static DWORD MapAccessType(DWORD access_type);
+  static HINTERNET ToHINTERNET(HttpHandle handle);
+  static HttpHandle FromHINTERNET(HINTERNET handle);
+};
+
+bool WinHttpClient::CrackUrl(const TCHAR* url,
+                             DWORD flags,
+                             TCHAR* scheme,
+                             size_t scheme_buffer_length,
+                             TCHAR* host,
+                             size_t host_buffer_length,
+                             TCHAR* uri,
+                             size_t uri_buffer_length,
+                             int* port) const {
+  assert(url);
+  assert(scheme);
+  assert(host);
+  assert(uri);
+  assert(port);
+
+  URL_COMPONENTS url_comp = {0};
+  url_comp.dwStructSize = sizeof(url_comp);
+  url_comp.lpszScheme = scheme;
+  url_comp.dwSchemeLength = static_cast<DWORD>(scheme_buffer_length);
+  url_comp.lpszHostName = host;
+  url_comp.dwHostNameLength = static_cast<DWORD>(host_buffer_length);
+  url_comp.lpszUrlPath = uri;
+  url_comp.dwUrlPathLength = static_cast<DWORD>(uri_buffer_length);
+
+  bool result = !!::WinHttpCrackUrl(url, 0, flags, &url_comp);
+  if (result) {
+    *port = static_cast<int>(url_comp.nPort);
+  }
+  return result;
+}
+
+bool WinHttpClient::Open(const TCHAR* user_agent,
+                         DWORD access_type,
+                         const TCHAR* proxy_name,
+                         const TCHAR* proxy_bypass,
+                         HttpHandle* session_handle)  const {
+  *session_handle = FromHINTERNET(::WinHttpOpen(user_agent,
+                                                MapAccessType(access_type),
+                                                proxy_name,
+                                                proxy_bypass,
+                                                0));
+
+  return !!(*session_handle);
+}
+
+bool WinHttpClient::Connect(HttpHandle session_handle,
+                            const TCHAR* server,
+                            int port,
+                            HttpHandle* connection_handle) const {
+  assert(server);
+
+  // Uses NULL user name and password to connect.
+  *connection_handle = FromHINTERNET(::WinHttpConnect(
+                                         ToHINTERNET(session_handle),
+                                         server,
+                                         static_cast<INTERNET_PORT>(port),
+                                         NULL));
+  return !!(*connection_handle);
+}
+
+bool WinHttpClient::OpenRequest(HttpHandle connection_handle,
+                                const TCHAR* verb,
+                                const TCHAR* uri,
+                                const TCHAR* version,
+                                const TCHAR* referrer,
+                                bool is_secure,
+                                HttpHandle* request_handle) const {
+  assert(connection_handle);
+  assert(verb);
+  assert(uri);
+  assert(request_handle);
+
+  *request_handle = FromHINTERNET(::WinHttpOpenRequest(
+                                      ToHINTERNET(connection_handle),
+                                      verb,
+                                      uri,
+                                      version,
+                                      referrer,
+                                      WINHTTP_DEFAULT_ACCEPT_TYPES,
+                                      is_secure ? WINHTTP_FLAG_SECURE : 0));
+  return !!(*request_handle);
+}
+
+bool WinHttpClient::SendRequest(HttpHandle request_handle,
+                                const TCHAR* headers,
+                                DWORD headers_length) const {
+  assert(request_handle);
+
+  return !!::WinHttpSendRequest(ToHINTERNET(request_handle),
+                                headers,
+                                headers_length,
+                                NULL,
+                                0,
+                                WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH,
+                                NULL);
+}
+
+bool WinHttpClient::ReceiveResponse(HttpHandle request_handle) const {
+  assert(request_handle);
+
+  return !!::WinHttpReceiveResponse(ToHINTERNET(request_handle), NULL);
+}
+
+bool WinHttpClient::GetHttpStatusCode(HttpHandle request_handle,
+                                      int* status_code) const {
+  TCHAR http_status_string[4] = {0};
+  DWORD http_status_string_size = sizeof(http_status_string);
+  if (!::WinHttpQueryHeaders(ToHINTERNET(request_handle),
+                             WINHTTP_QUERY_STATUS_CODE,
+                             WINHTTP_HEADER_NAME_BY_INDEX,
+                             static_cast<void*>(&http_status_string),
+                             &http_status_string_size, 0)) {
+    return false;
+  }
+
+  *status_code = static_cast<DWORD>(_tcstol(http_status_string, NULL, 10));
+  return true;
+}
+
+bool WinHttpClient::GetContentLength(HttpHandle request_handle,
+                                     DWORD* content_length) const {
+  assert(request_handle);
+  assert(content_length);
+
+  TCHAR content_length_string[11] = {0};
+  DWORD content_length_string_size = sizeof(content_length_string);
+  if (!::WinHttpQueryHeaders(ToHINTERNET(request_handle),
+                             WINHTTP_QUERY_CONTENT_LENGTH,
+                             WINHTTP_HEADER_NAME_BY_INDEX,
+                             static_cast<void*>(&content_length_string),
+                             &content_length_string_size, 0)) {
+    *content_length = kUnknownContentLength;
+  } else {
+    *content_length =
+        static_cast<DWORD>(wcstol(content_length_string, NULL, 10));
+  }
+  return true;
+}
+
+bool WinHttpClient::ReadData(HttpHandle request_handle,
+                             void* buffer,
+                             DWORD buffer_length,
+                             DWORD* bytes_read) const {
+  assert(request_handle);
+  assert(buffer);
+  assert(bytes_read);
+
+  DWORD bytes_read_local = 0;
+  if (!::WinHttpReadData(ToHINTERNET(request_handle),
+                         buffer,
+                         buffer_length,
+                         &bytes_read_local)) {
+    return false;
+  }
+  *bytes_read = bytes_read_local;
+  return true;
+}
+
+bool WinHttpClient::Close(HttpHandle handle) const {
+  assert(handle);
+  return !!::WinHttpCloseHandle(ToHINTERNET(handle));
+}
+
+DWORD WinHttpClient::MapAccessType(DWORD access_type) {
+  switch (static_cast<AccessType>(access_type)) {
+    case ACCESS_TYPE_PRECONFIG:
+    default:
+      return WINHTTP_ACCESS_TYPE_DEFAULT_PROXY;
+    case ACCESS_TYPE_DIRECT:
+      return WINHTTP_ACCESS_TYPE_NO_PROXY;
+    case ACCESS_TYPE_PROXY:
+      return WINHTTP_ACCESS_TYPE_NAMED_PROXY;
+  }
+}
+
+
+HINTERNET WinHttpClient::ToHINTERNET(HttpHandle handle) {
+  return static_cast<HINTERNET>(handle);
+}
+
+HttpHandle WinHttpClient::FromHINTERNET(HINTERNET handle) {
+  return static_cast<HttpHandle>(handle);
+}
+
+}  // namespace internal
+
+HttpClient* CreateWinHttpClient(const TCHAR* url) {
+  assert(url);
+
+  internal::WinHttpClient winhttp;
+  wchar_t scheme[16] = {0};
+  wchar_t host[256] = {0};
+  wchar_t path[256] = {0};
+  int port = 0;
+
+  if (!winhttp.CrackUrl(url,
+                        0,
+                        scheme,
+                        sizeof(scheme)/sizeof(scheme[0]),
+                        host,
+                        sizeof(host)/sizeof(host[0]),
+                        path,
+                        sizeof(path)/sizeof(path[0]),
+                        &port)) {
+    return NULL;
+  }
+
+  if (_wcsicmp(scheme, L"https") == 0) {
+    // Winhttp under WINE doesn't support wildcard certificates, so avoid 
+    // to use it if the scheme is https. The caller should fall back to
+    // use wininet if NULL is returned.
+    return NULL;
+  }
+
+  return new internal::WinHttpClient();
+}
+
+}  // namespace crash
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/winhttp_client.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef TOOLS_WINDOWS_CONVERTER_EXE_WINHTTP_CLIENT_H_
+#define TOOLS_WINDOWS_CONVERTER_EXE_WINHTTP_CLIENT_H_
+
+#include "tools/windows/converter_exe/http_client.h"
+
+namespace crash {
+
+HttpClient* CreateWinHttpClient(const TCHAR* url);
+
+}  // namespace crash
+
+#endif  // TOOLS_WINDOWS_CONVERTER_EXE_WINHTTP_CLIENT_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/wininet_client.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/wininet_client.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/wininet_client.cc	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/wininet_client.cc	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,278 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "tools/windows/converter_exe/wininet_client.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <windows.h>
+#include <wininet.h>
+
+namespace crash {
+
+namespace internal {
+
+// This class implements HttpClient based on WinInet APIs.
+class WinInetClient : public HttpClient {
+ public:
+  virtual ~WinInetClient() {}
+  virtual bool CrackUrl(const TCHAR* url,
+                        DWORD flags,
+                        TCHAR* scheme,
+                        size_t scheme_buffer_length,
+                        TCHAR* host,
+                        size_t host_buffer_length,
+                        TCHAR* uri,
+                        size_t uri_buffer_length,
+                        int* port) const;
+  virtual bool Open(const TCHAR* user_agent,
+                    DWORD access_type,
+                    const TCHAR* proxy_name,
+                    const TCHAR* proxy_bypass,
+                    HttpHandle* session_handle) const;
+  virtual bool Connect(HttpHandle session_handle,
+                       const TCHAR* server,
+                       int port,
+                       HttpHandle* connection_handle) const;
+  virtual bool OpenRequest(HttpHandle connection_handle,
+                           const TCHAR* verb,
+                           const TCHAR* uri,
+                           const TCHAR* version,
+                           const TCHAR* referrer,
+                           bool is_secure,
+                           HttpHandle* request_handle) const;
+  virtual bool SendRequest(HttpHandle request_handle,
+                           const TCHAR* headers,
+                           DWORD headers_length) const;
+  virtual bool ReceiveResponse(HttpHandle request_handle) const;
+  virtual bool GetHttpStatusCode(HttpHandle request_handle,
+                                 int* status_code) const;
+  virtual bool GetContentLength(HttpHandle request_handle,
+                                DWORD* content_length) const;
+  virtual bool ReadData(HttpHandle request_handle,
+                        void* buffer,
+                        DWORD buffer_length,
+                        DWORD* bytes_read) const;
+  virtual bool Close(HttpHandle handle) const;
+
+ private:
+  static DWORD MapAccessType(DWORD access_type);
+  static HINTERNET ToHINTERNET(HttpHandle handle);
+  static HttpHandle FromHINTERNET(HINTERNET handle);
+};
+
+bool WinInetClient::CrackUrl(const TCHAR* url,
+                             DWORD flags,
+                             TCHAR* scheme,
+                             size_t scheme_buffer_length,
+                             TCHAR* host,
+                             size_t host_buffer_length,
+                             TCHAR* uri,
+                             size_t uri_buffer_length,
+                             int* port) const {
+  assert(url);
+  assert(scheme);
+  assert(host);
+  assert(uri);
+  assert(port);
+
+  URL_COMPONENTS url_comp = {0};
+  url_comp.dwStructSize = sizeof(url_comp);
+  url_comp.lpszScheme = scheme;
+  url_comp.dwSchemeLength = static_cast<DWORD>(scheme_buffer_length);
+  url_comp.lpszHostName = host;
+  url_comp.dwHostNameLength = static_cast<DWORD>(host_buffer_length);
+  url_comp.lpszUrlPath = uri;
+  url_comp.dwUrlPathLength = static_cast<DWORD>(uri_buffer_length);
+
+  bool result = !!::InternetCrackUrl(url, 0, flags, &url_comp);
+  if (result) {
+    *port = static_cast<int>(url_comp.nPort);
+  }
+  return result;
+}
+
+bool WinInetClient::Open(const TCHAR* user_agent,
+                         DWORD access_type,
+                         const TCHAR* proxy_name,
+                         const TCHAR* proxy_bypass,
+                         HttpHandle* session_handle)  const {
+  *session_handle = FromHINTERNET(::InternetOpen(user_agent,
+                                                 MapAccessType(access_type),
+                                                 proxy_name,
+                                                 proxy_bypass,
+                                                 0));
+  return !!(*session_handle);
+}
+
+bool WinInetClient::Connect(HttpHandle session_handle,
+                            const TCHAR* server,
+                            int port,
+                            HttpHandle* connection_handle) const {
+  assert(server);
+
+  // Uses NULL user name and password to connect. Always uses http service.
+  *connection_handle = FromHINTERNET(::InternetConnect(
+                                         ToHINTERNET(session_handle),
+                                         server,
+                                         static_cast<INTERNET_PORT>(port),
+                                         NULL,
+                                         NULL,
+                                         INTERNET_SERVICE_HTTP,
+                                         0,
+                                         0));
+  return !!(*connection_handle);
+}
+
+bool WinInetClient::OpenRequest(HttpHandle connection_handle,
+                                const TCHAR* verb,
+                                const TCHAR* uri,
+                                const TCHAR* version,
+                                const TCHAR* referrer,
+                                bool is_secure,
+                                HttpHandle* request_handle) const {
+  assert(connection_handle);
+  assert(verb);
+  assert(uri);
+
+  *request_handle = FromHINTERNET(::HttpOpenRequest(
+                                      ToHINTERNET(connection_handle),
+                                      verb,
+                                      uri,
+                                      version,
+                                      referrer,
+                                      NULL,
+                                      is_secure ? INTERNET_FLAG_SECURE : 0,
+                                      NULL));
+  return !!(*request_handle);
+}
+
+bool WinInetClient::SendRequest(HttpHandle request_handle,
+                                const TCHAR* headers,
+                                DWORD headers_length) const {
+  assert(request_handle);
+
+  return !!::HttpSendRequest(ToHINTERNET(request_handle),
+                             headers,
+                             headers_length,
+                             NULL,
+                             0);
+}
+
+bool WinInetClient::ReceiveResponse(HttpHandle) const {
+  return true;
+}
+
+bool WinInetClient::GetHttpStatusCode(HttpHandle request_handle,
+                                      int* status_code) const {
+  assert(request_handle);
+
+  TCHAR http_status_string[4] = {0};
+  DWORD http_status_string_size = sizeof(http_status_string);
+  if (!::HttpQueryInfo(ToHINTERNET(request_handle),
+                       HTTP_QUERY_STATUS_CODE,
+                       static_cast<void*>(&http_status_string),
+                       &http_status_string_size,
+                       0)) {
+    return false;
+  }
+
+  *status_code = _tcstol(http_status_string, NULL, 10);
+  return true;
+}
+
+bool WinInetClient::GetContentLength(HttpHandle request_handle,
+                                     DWORD* content_length) const {
+  assert(request_handle);
+  assert(content_length);
+
+  TCHAR content_length_string[11];
+  DWORD content_length_string_size = sizeof(content_length_string);
+  if (!::HttpQueryInfo(ToHINTERNET(request_handle),
+                       HTTP_QUERY_CONTENT_LENGTH,
+                       static_cast<void*>(&content_length_string),
+                       &content_length_string_size,
+                       0)) {
+    *content_length = kUnknownContentLength;
+  } else {
+    *content_length = wcstol(content_length_string, NULL, 10);
+  }
+  return true;
+}
+
+bool WinInetClient::ReadData(HttpHandle request_handle,
+                             void* buffer,
+                             DWORD buffer_length,
+                             DWORD* bytes_read) const {
+  assert(request_handle);
+  assert(buffer);
+  assert(bytes_read);
+
+  DWORD bytes_read_local = 0;
+  if (!::InternetReadFile(ToHINTERNET(request_handle),
+                          buffer,
+                          buffer_length,
+                          &bytes_read_local)) {
+    return false;
+  }
+  *bytes_read = bytes_read_local;
+  return true;
+}
+
+bool WinInetClient::Close(HttpHandle handle) const {
+  assert(handle);
+  return !!::InternetCloseHandle(ToHINTERNET(handle));
+}
+
+DWORD WinInetClient::MapAccessType(DWORD access_type) {
+  switch (static_cast<AccessType>(access_type)) {
+    case ACCESS_TYPE_PRECONFIG:
+    default:
+      return INTERNET_OPEN_TYPE_PRECONFIG;
+    case ACCESS_TYPE_DIRECT:
+      return INTERNET_OPEN_TYPE_DIRECT;
+    case ACCESS_TYPE_PROXY:
+      return INTERNET_OPEN_TYPE_PROXY;
+  }
+}
+
+HINTERNET WinInetClient::ToHINTERNET(HttpHandle handle) {
+  return static_cast<HINTERNET>(handle);
+}
+
+HttpHandle WinInetClient::FromHINTERNET(HINTERNET handle) {
+  return static_cast<HttpHandle>(handle);
+}
+
+}  // namespace internal
+
+HttpClient* CreateWinInetClient(const TCHAR*) {
+  return new internal::WinInetClient();
+}
+
+}  // namespace crash
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/wininet_client.h thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/wininet_client.h
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/wininet_client.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/converter_exe/wininet_client.h	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef TOOLS_WINDOWS_CONVERTER_EXE_WININET_CLIENT_H_
+#define TOOLS_WINDOWS_CONVERTER_EXE_WININET_CLIENT_H_
+
+#include "tools/windows/converter_exe/http_client.h"
+
+namespace crash {
+
+HttpClient* CreateWinInetClient(const TCHAR* url);
+
+}  // namespace crash
+
+#endif  // TOOLS_WINDOWS_CONVERTER_EXE_WININET_CLIENT_H_
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/dump_syms.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/dump_syms.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/dump_syms.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/dump_syms.cc	2021-12-09 12:01:26.000000000 +0000
@@ -36,27 +36,38 @@
 #include <string>
 
 #include "common/windows/pdb_source_line_writer.h"
+#include "common/windows/pe_source_line_writer.h"
 
 using std::wstring;
 using google_breakpad::PDBSourceLineWriter;
+using google_breakpad::PESourceLineWriter;
+using std::unique_ptr;
 
-int wmain(int argc, wchar_t **argv) {
-  if (argc < 2) {
-    fprintf(stderr, "Usage: %ws <file.[pdb|exe|dll]>\n", argv[0]);
+int wmain(int argc, wchar_t** argv) {
+  bool success;
+  if (argc == 2) {
+    PDBSourceLineWriter pdb_writer;
+    if (!pdb_writer.Open(wstring(argv[1]), PDBSourceLineWriter::ANY_FILE)) {
+      fprintf(stderr, "Open failed.\n");
+      return 1;
+    }
+    success = pdb_writer.WriteSymbols(stdout);
+  } else if (argc == 3 && wcscmp(argv[1], L"--pe") == 0) {
+    PESourceLineWriter pe_writer(argv[2]);
+    success = pe_writer.WriteSymbols(stdout);
+  } else {
+    fprintf(stderr, "Usage: %ws [--pe] <file.[pdb|exe|dll]>\n", argv[0]);
+    fprintf(stderr, "Options:\n");
+    fprintf(stderr, "--pe:\tRead debugging information from PE file and do "
+      "not attempt to locate matching PDB file.\n"
+      "\tThis is only supported for PE32+ (64 bit) PE files.\n");
     return 1;
   }
 
-  PDBSourceLineWriter writer;
-  if (!writer.Open(wstring(argv[1]), PDBSourceLineWriter::ANY_FILE)) {
-    fprintf(stderr, "Open failed\n");
+  if (!success) {
+    fprintf(stderr, "WriteSymbols failed.\n");
     return 1;
   }
 
-  if (!writer.WriteMap(stdout)) {
-    fprintf(stderr, "WriteMap failed\n");
-    return 1;
-  }
-
-  writer.Close();
   return 0;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -55,11 +55,15 @@
   // without source data.
   L"omap_stretched",
   // A PDB file with OMAP data for an image that has been basic block reordered.
-  L"omap_reorder_bbs",  
+  L"omap_reorder_bbs",
   // A 64bit PDB file with no OMAP data.
   L"dump_syms_regtest64",
 };
 
+const wchar_t* kPEOnlyRootNames[] = {
+  L"pe_only_symbol_test",
+};
+
 void TrimLastComponent(const std::wstring& path,
                        std::wstring* trimmed,
                        std::wstring* component) {
@@ -162,7 +166,7 @@
   }
 }
 
-class DumpSymsRegressionTest : public testing::TestWithParam<const wchar_t *> {
+class DumpSymsRegressionTest : public testing::TestWithParam<const wchar_t*> {
  public:
   virtual void SetUp() {
     std::wstring self_dir;
@@ -177,29 +181,64 @@
   std::wstring testdata_dir;
 };
 
+class DumpSymsPEOnlyRegressionTest : public testing::TestWithParam<const wchar_t*> {
+public:
+  virtual void SetUp() {
+    std::wstring self_dir;
+    ASSERT_TRUE(GetSelfDirectory(&self_dir));
+    dump_syms_exe = self_dir + L"\\dump_syms.exe";
+
+    TrimLastComponent(self_dir, &testdata_dir, NULL);
+    testdata_dir += L"\\testdata";
+  }
+
+  std::wstring dump_syms_exe;
+  std::wstring testdata_dir;
+};
+
 }  //namespace
 
 TEST_P(DumpSymsRegressionTest, EnsureDumpedSymbolsMatch) {
-    const wchar_t* root_name = GetParam();
-    std::wstring root_path = testdata_dir + L"\\" + root_name;
+  const wchar_t* root_name = GetParam();
+  std::wstring root_path = testdata_dir + L"\\" + root_name;
 
-    std::wstring sym_path = root_path + L".sym";
-    std::string expected_symbols;
-    ASSERT_NO_FATAL_FAILURE(GetFileContents(sym_path, &expected_symbols));
-
-    std::wstring pdb_path = root_path + L".pdb";
-    std::wstring command_line = L"\"" + dump_syms_exe + L"\" \"" +
-        pdb_path + L"\"";
-    std::string symbols;
-    ASSERT_NO_FATAL_FAILURE(RunCommand(command_line, &symbols));
+  std::wstring sym_path = root_path + L".sym";
+  std::string expected_symbols;
+  ASSERT_NO_FATAL_FAILURE(GetFileContents(sym_path, &expected_symbols));
+
+  std::wstring pdb_path = root_path + L".pdb";
+  std::wstring command_line = L"\"" + dump_syms_exe + L"\" \"" +
+    pdb_path + L"\"";
+  std::string symbols;
+  ASSERT_NO_FATAL_FAILURE(RunCommand(command_line, &symbols));
 
-    EXPECT_EQ(expected_symbols, symbols);
+  EXPECT_EQ(expected_symbols, symbols);
 }
 
 INSTANTIATE_TEST_CASE_P(DumpSyms, DumpSymsRegressionTest,
-                        testing::ValuesIn(kRootNames));
+  testing::ValuesIn(kRootNames));
+
+TEST_P(DumpSymsPEOnlyRegressionTest, EnsurePEOnlyDumpedSymbolsMatch) {
+  const wchar_t* root_name = GetParam();
+  std::wstring root_path = testdata_dir + L"\\" + root_name;
+
+  std::wstring sym_path = root_path + L".sym";
+  std::string expected_symbols;
+  ASSERT_NO_FATAL_FAILURE(GetFileContents(sym_path, &expected_symbols));
+
+  std::wstring dll_path = root_path + L".dll";
+  std::wstring command_line = L"\"" + dump_syms_exe + L"\" --pe \"" +
+    dll_path + L"\"";
+  std::string symbols;
+  ASSERT_NO_FATAL_FAILURE(RunCommand(command_line, &symbols));
+
+  EXPECT_EQ(expected_symbols, symbols);
+}
+
+INSTANTIATE_TEST_CASE_P(PEOnlyDumpSyms, DumpSymsPEOnlyRegressionTest,
+  testing::ValuesIn(kPEOnlyRootNames));
 
 
 }  // namespace dump_syms
 }  // namespace windows
-}  // namespace tools
+}  // namespace tools
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc	2021-12-09 12:01:26.000000000 +0000
@@ -48,7 +48,7 @@
 
   void f() { member_ = g(); }
   virtual int g() { return 2; }
-  static char* h(const C &that) { return 0; }
+  static char* h(const C& that) { return 0; }
 
  private:
   int member_;
@@ -60,12 +60,12 @@
 
 }  // namespace google_breakpad
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   google_breakpad::C object;
   object.set_member(google_breakpad::i());
   object.f();
   int value = object.g();
-  char *nothing = object.h(object);
+  char* nothing = object.h(object);
 
   return 0;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/symupload/symupload.cc thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/symupload/symupload.cc
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/symupload/symupload.cc	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/symbolic-minidump/third_party/breakpad/src/tools/windows/symupload/symupload.cc	2021-12-09 12:01:26.000000000 +0000
@@ -56,19 +56,24 @@
 
 #include "common/windows/http_upload.h"
 #include "common/windows/pdb_source_line_writer.h"
+#include "common/windows/symbol_collector_client.h"
 
 using std::string;
 using std::wstring;
 using std::vector;
 using std::map;
 using google_breakpad::HTTPUpload;
+using google_breakpad::SymbolCollectorClient;
+using google_breakpad::SymbolStatus;
+using google_breakpad::UploadUrlResponse;
+using google_breakpad::CompleteUploadResult;
 using google_breakpad::PDBModuleInfo;
 using google_breakpad::PDBSourceLineWriter;
 using google_breakpad::WindowsStringUtils;
 
 // Extracts the file version information for the given filename,
 // as a string, for example, "1.2.3.4".  Returns true on success.
-static bool GetFileVersionString(const wchar_t *filename, wstring *version) {
+static bool GetFileVersionString(const wchar_t* filename, wstring* version) {
   DWORD handle;
   DWORD version_size = GetFileVersionInfoSize(filename, &handle);
   if (version_size < sizeof(VS_FIXEDFILEINFO)) {
@@ -80,7 +85,7 @@
     return false;
   }
 
-  void *file_info_buffer = NULL;
+  void* file_info_buffer = NULL;
   unsigned int file_info_length;
   if (!VerQueryValue(&version_info[0], L"\\",
                      &file_info_buffer, &file_info_length)) {
@@ -90,7 +95,7 @@
   // The maximum value of each version component is 65535 (0xffff),
   // so the max length is 24, including the terminating null.
   wchar_t ver_string[24];
-  VS_FIXEDFILEINFO *file_info =
+  VS_FIXEDFILEINFO* file_info =
     reinterpret_cast<VS_FIXEDFILEINFO*>(file_info_buffer);
   swprintf(ver_string, sizeof(ver_string) / sizeof(ver_string[0]),
            L"%d.%d.%d.%d",
@@ -109,9 +114,9 @@
 // Creates a new temporary file and writes the symbol data from the given
 // exe/dll file to it.  Returns the path to the temp file in temp_file_path
 // and information about the pdb in pdb_info.
-static bool DumpSymbolsToTempFile(const wchar_t *file,
-                                  wstring *temp_file_path,
-                                  PDBModuleInfo *pdb_info) {
+static bool DumpSymbolsToTempFile(const wchar_t* file,
+                                  wstring* temp_file_path,
+                                  PDBModuleInfo* pdb_info) {
   google_breakpad::PDBSourceLineWriter writer;
   // Use EXE_FILE to get information out of the exe/dll in addition to the
   // pdb.  The name and version number of the exe/dll are of value, and
@@ -130,7 +135,7 @@
     return false;
   }
 
-  FILE *temp_file = NULL;
+  FILE* temp_file = NULL;
 #if _MSC_VER >= 1400  // MSVC 2005/8
   if (_wfopen_s(&temp_file, temp_filename, L"w") != 0)
 #else  // _MSC_VER >= 1400
@@ -142,7 +147,7 @@
     return false;
   }
 
-  bool success = writer.WriteMap(temp_file);
+  bool success = writer.WriteSymbols(temp_file);
   fclose(temp_file);
   if (!success) {
     _wunlink(temp_filename);
@@ -154,6 +159,92 @@
   return writer.GetModuleInfo(pdb_info);
 }
 
+static bool DoSymUploadV2(
+    const wchar_t* api_url,
+    const wchar_t* api_key,
+    const wstring& debug_file,
+    const wstring& debug_id,
+    const wstring& symbol_file,
+    bool force) {
+  wstring url(api_url);
+  wstring key(api_key);
+
+  if (!force) {
+    SymbolStatus symbolStatus = SymbolCollectorClient::CheckSymbolStatus(
+      url,
+      key,
+      debug_file,
+      debug_id);
+    if (symbolStatus == SymbolStatus::Found) {
+      wprintf(L"Symbol file already exists, upload aborted."
+        L" Use \"-f\" to overwrite.\n");
+      return true;
+    }
+    else if (symbolStatus == SymbolStatus::Unknown) {
+      wprintf(L"Failed to get check for existing symbol.\n");
+      return false;
+    }
+  }
+
+  UploadUrlResponse uploadUrlResponse;
+  if (!SymbolCollectorClient::CreateUploadUrl(
+      url,
+      key,
+      &uploadUrlResponse)) {
+    wprintf(L"Failed to create upload URL.\n");
+    return false;
+  }
+
+  wstring signed_url = uploadUrlResponse.upload_url;
+  wstring upload_key = uploadUrlResponse.upload_key;
+  wstring response;
+  int response_code;
+  bool success = HTTPUpload::SendPutRequest(
+    signed_url,
+    symbol_file,
+    /* timeout = */ NULL,
+    &response,
+    &response_code);
+  if (!success) {
+    wprintf(L"Failed to send symbol file.\n");
+    wprintf(L"Response code: %ld\n", response_code);
+    wprintf(L"Response:\n");
+    wprintf(L"%s\n", response.c_str());
+    return false;
+  }
+  else if (response_code == 0) {
+    wprintf(L"Failed to send symbol file: No response code\n");
+    return false;
+  }
+  else if (response_code != 200) {
+    wprintf(L"Failed to send symbol file: Response code %ld\n", response_code);
+    wprintf(L"Response:\n");
+    wprintf(L"%s\n", response.c_str());
+    return false;
+  }
+
+  CompleteUploadResult completeUploadResult =
+    SymbolCollectorClient::CompleteUpload(
+      url,
+      key,
+      upload_key,
+      debug_file,
+      debug_id);
+  if (completeUploadResult == CompleteUploadResult::Error) {
+    wprintf(L"Failed to complete upload.\n");
+    return false;
+  }
+  else if (completeUploadResult == CompleteUploadResult::DuplicateData) {
+    wprintf(L"Uploaded file checksum matched existing file checksum,"
+      L" no change necessary.\n");
+  }
+  else {
+    wprintf(L"Successfully sent the symbol file.\n");
+  }
+
+  return true;
+}
+
 __declspec(noreturn) void printUsageAndExit() {
   wprintf(L"Usage:\n\n"
           L"    symupload [--timeout NN] [--product product_name] ^\n"
@@ -166,13 +257,28 @@
   wprintf(L"Example:\n\n"
           L"    symupload.exe --timeout 0 --product Chrome ^\n"
           L"        chrome.dll http://no.free.symbol.server.for.you\n");
+  wprintf(L"\n");
+  wprintf(L"sym-upload-v2 usage:\n"
+          L"    symupload -p [-f] <file.exe|file.dll> <API-URL> <API-key>\n");
+  wprintf(L"\n");
+  wprintf(L"sym_upload_v2 Options:\n");
+  wprintf(L"    <API-URL> is the sym_upload_v2 API URL.\n");
+  wprintf(L"    <API-key> is a secret used to authenticate with the API.\n");
+  wprintf(L"    -p:\t Use sym_upload_v2 protocol.\n");
+  wprintf(L"    -f:\t Force symbol upload if already exists.\n");
+
   exit(0);
 }
-int wmain(int argc, wchar_t *argv[]) {
-  const wchar_t *module;
-  const wchar_t *product = nullptr;
+
+int wmain(int argc, wchar_t* argv[]) {
+  const wchar_t* module;
+  const wchar_t* product = nullptr;
   int timeout = -1;
   int currentarg = 1;
+  bool use_sym_upload_v2 = false;
+  bool force = false;
+  const wchar_t* api_url = nullptr;
+  const wchar_t* api_key = nullptr;
   while (argc > currentarg + 1) {
     if (!wcscmp(L"--timeout", argv[currentarg])) {
       timeout = _wtoi(argv[currentarg + 1]);
@@ -184,6 +290,16 @@
       currentarg += 2;
       continue;
     }
+    if (!wcscmp(L"-p", argv[currentarg])) {
+      use_sym_upload_v2 = true;
+      ++currentarg;
+      continue;
+    }
+    if (!wcscmp(L"-f", argv[currentarg])) {
+      force = true;
+      ++currentarg;
+      continue;
+    }
     break;
   }
 
@@ -200,50 +316,69 @@
   }
 
   wstring code_file = WindowsStringUtils::GetBaseName(wstring(module));
-
-  map<wstring, wstring> parameters;
-  parameters[L"code_file"] = code_file;
-  parameters[L"debug_file"] = pdb_info.debug_file;
-  parameters[L"debug_identifier"] = pdb_info.debug_identifier;
-  parameters[L"os"] = L"windows";  // This version of symupload is Windows-only
-  parameters[L"cpu"] = pdb_info.cpu;
-  
-  // Don't make a missing product name a hard error.  Issue a warning and let
-  // the server decide whether to reject files without product name.
-  if (product) {
-    parameters[L"product"] = product;
-  } else {
-    fwprintf(
-        stderr,
-        L"Warning: No product name (flag --product) was specified for %s\n",
-        module);
-  }
-
+  wstring file_version;
   // Don't make a missing version a hard error.  Issue a warning, and let the
   // server decide whether to reject files without versions.
-  wstring file_version;
-  if (GetFileVersionString(module, &file_version)) {
-    parameters[L"version"] = file_version;
-  } else {
+  if (!GetFileVersionString(module, &file_version)) {
     fwprintf(stderr, L"Warning: Could not get file version for %s\n", module);
   }
 
-  map<wstring, wstring> files;
-  files[L"symbol_file"] = symbol_file;
-
   bool success = true;
 
-  while (currentarg < argc) {
-    int response_code;
-    if (!HTTPUpload::SendRequest(argv[currentarg], parameters, files,
-                                 timeout == -1 ? NULL : &timeout,
-                                 nullptr, &response_code)) {
-      success = false;
-      fwprintf(stderr,
-               L"Symbol file upload to %s failed. Response code = %ld\n",
-               argv[currentarg], response_code);
+  if (use_sym_upload_v2) {
+    if (argc >= currentarg + 2) {
+      api_url = argv[currentarg++];
+      api_key = argv[currentarg++];
+
+      success = DoSymUploadV2(
+        api_url,
+        api_key,
+        pdb_info.debug_file,
+        pdb_info.debug_identifier,
+        symbol_file,
+        force);
+    } else {
+      printUsageAndExit();
+    }
+  } else {
+    map<wstring, wstring> parameters;
+    parameters[L"code_file"] = code_file;
+    parameters[L"debug_file"] = pdb_info.debug_file;
+    parameters[L"debug_identifier"] = pdb_info.debug_identifier;
+    parameters[L"os"] = L"windows";  // This version of symupload is Windows-only
+    parameters[L"cpu"] = pdb_info.cpu;
+
+    map<wstring, wstring> files;
+    files[L"symbol_file"] = symbol_file;
+
+    if (!file_version.empty()) {
+      parameters[L"version"] = file_version;
+    }
+
+    // Don't make a missing product name a hard error.  Issue a warning and let
+    // the server decide whether to reject files without product name.
+    if (product) {
+      parameters[L"product"] = product;
+    }
+    else {
+      fwprintf(
+        stderr,
+        L"Warning: No product name (flag --product) was specified for %s\n",
+        module);
+    }
+
+    while (currentarg < argc) {
+      int response_code;
+      if (!HTTPUpload::SendMultipartPostRequest(argv[currentarg], parameters, files,
+          timeout == -1 ? NULL : &timeout,
+          nullptr, &response_code)) {
+        success = false;
+        fwprintf(stderr,
+          L"Symbol file upload to %s failed. Response code = %ld\n",
+          argv[currentarg], response_code);
+      }
+      currentarg++;
     }
-    currentarg++;
   }
 
   _wunlink(symbol_file.c_str());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/benches/file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/benches/file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/benches/file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/benches/file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
 use std::str::FromStr;
 use test::Bencher;
 
-const FILE: &str = "tests/rust/src/libcore/str/mod.rs";
+const FILE: &str = "tests/rust/library/core/src/str/mod.rs";
 
 #[bench]
 fn parse_file(b: &mut Bencher) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/benches/rust.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/benches/rust.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/benches/rust.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/benches/rust.rs	2021-12-09 12:01:26.000000000 +0000
@@ -58,7 +58,7 @@
             }
         }
 
-        rustc_span::with_session_globals(Edition::Edition2018, || {
+        rustc_span::create_session_if_not_set_then(Edition::Edition2018, |_| {
             let cm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
             let emitter = Box::new(SilentEmitter);
             let handler = Handler::with_emitter(false, None, emitter);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15,6 +15,10 @@
         println!("cargo:rustc-cfg=syn_omit_await_from_token_macro");
     }
 
+    if compiler.minor < 39 {
+        println!("cargo:rustc-cfg=syn_no_const_vec_new");
+    }
+
     if !compiler.nightly {
         println!("cargo:rustc-cfg=syn_disable_nightly_tests");
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"8882b09eea3008f9eec14a3d0557b3edf4037e2c09a829c332eba0c12a557c10","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"03f3b53cf858536a0883aa5b5882ee61dcd0f1e71c0930c9106fcfa1d6aad2df","benches/file.rs":"b4724fc7c0f48b8f488e2632a1064f6c0bf16ded3969680fc3f4a2369536269b","benches/rust.rs":"ea6291ef2d2a83d94a3312fe179d48259f8ec0b04c961993ddd181d0a4ab740e","build.rs":"aeca2312f05aec658eaa66980a0ef3d578837db107a55702b39419ea0422eb4a","src/attr.rs":"24739d1093fd1714e3f132b1b74e84bf4cb9fd798e11486091aaf666419fff8e","src/await.rs":"8aa22e3c201cb2bdb6b4817fa00901f308ab06817607aa7b884c58c957705969","src/bigint.rs":"efc7f64959980653d73fe4f8bc2a3a2904dc05f45b02c6dc15cd316fa3d7c338","src/buffer.rs":"a5d6692938c2ec6ec140f70ec89fa93659fa227b52e8d381e9da7dd440f0249e","src/custom_keyword.rs":"8f711cf1ed6963f7dd398b746dbd9033e3181a24a738f29ac57fe65e92fce9b6","src/custom_punctuation.rs":"cdf0a3b8dbab85c9b5185694cf2a189f71c7f351f68251aae3b3226324bc88dc","src/data.rs":"767f2964b8f12d87b0f218aa43ffbdec411e26a702e61e93dda4f131277c8adb","src/derive.rs":"ee24a202be2d36ccdff576dd9cd765e94b33ef2286946e6725d75b08e777d462","src/discouraged.rs":"a1f3d85e20dedf50b1b7b4571d970a3a6e9b2de4afde7dd0c986fe240df2ba46","src/error.rs":"c1e5aa4ff628e83b492d40f0b8c00394d0f56797d6601d70b993fb297d164d7a","src/export.rs":"dcae67456278c0339acfbcbb4737b8d37cfba5a150ae789f31f4be79abf7e726","src/expr.rs":"53c674a0c21e7f4b428282beebdd79f3dd9dcfbd02bc824ed92010a1df74d488","src/ext.rs":"1f648cff1d705a1cea64b32b77482b97a82d2fe0aaf63b40cade91e5c02dc969","src/file.rs":"f86697655222ae294215114f4eae8e6b0b5e2a935d6c479ff8f8f889c4efd2e2","src/gen/clone.rs":"8db60fc2bf515f9a65f4e98669427ce02ed0ccc9ffdad25d8fb39b38768ecaf1","src/gen/debug.rs":"facf4fb5c7e017dd890c4a9531f337659d7b55475aa44124abf48e088ad56fc5","src/gen/eq.rs":"576a4f1e4030434b0f0170f4d681d2c46292fda64ad5f3913623e1c6e858c24f","src/gen/fold.rs":"3f59e59ed8ad2ab5dd347bfbe41bbc785c2aabd8ae902087a584a6daed597182","src/gen/hash.rs":"458052bb0d64b2a722eaeef4461af80bce109cd97d19bd44dbd608e4c53a6520","src/gen/visit.rs":"23008c170d4dd3975232876a0a654921d9b6af57372cb9fcc133ca740588d666","src/gen/visit_mut.rs":"42886c3ee02ded72d9c3eec006e20431eaee0c6b90ddefc1a36ec7bf50c6a24a","src/gen_helper.rs":"ea6c66388365971db6a2fc86cbb208f7eacde77e245bc8623f27a3642a3d7741","src/generics.rs":"e96cdc4e4d85cd686fa4eaadf3a7f845a11f8316a82de066814cc7dc5f3a56c6","src/group.rs":"7c6e4d0bcd4f0a3119ecf09227d0d4e335ca23bf1798a4acb095c081feb6924b","src/ident.rs":"d67975d3dd89becde96579c0454a1357aa7c62da11bdf94f29ccf63514ffbc9d","src/item.rs":"9e485f03eacadec069595ef0af6744ccbbe4a08d52ffe72d0e387e8bec53c766","src/lib.rs":"b1ab13d72ef099c36421d302e7d397a66a030bd4d9c5a445c79d2d710694dc7b","src/lifetime.rs":"957fcf3923f6cb27d9d6f7caf920fdf0882a131fe5ac3806eab68d934051c2a3","src/lit.rs":"28eb28df4312070dc39e60906cf7abdf7becf18dce5c4654123dfbec61f15e95","src/lookahead.rs":"92ee63b48de02d3f6f1b09121f0fbac41d55cebc5771c8320e27df8482906152","src/mac.rs":"004cb89f9697564f6c9ee837e08ead68463ef946fb4c13c6c105adf2ba364b2b","src/macros.rs":"eeea315e5e8564254ff4ba7f1b2783b8254fce02bdb703ad77d125df8d526cc8","src/op.rs":"9d499022902743a6a0a19223b356449a979b90e60552d0446497d72750e646a4","src/parse.rs":"8b4aa518660dfd6310a5455b5624de01ad7ba42d11527b217f811b687b26e1fc","src/parse_macro_input.rs":"5c0de7a01793cab7de80af17d9f8e46cefc0e5723ec1918ebfaebbc92a688ab6","src/parse_quote.rs":"a213db24f687e8a025be5c9525b98623ea64a303f85d260b12c69748d57b72c1","src/pat.rs":"3bd1f8fc40e55473253747d10df42c38405014110f4ac7d42e10943293b23630","src/path.rs":"54e72c01086a478e7b0bb5c86320501139b9ffef67f7b3a57f6259804f62f758","src/print.rs":"da6529c1d9d21aaf6c835f66b4e67eacb7cf91a10eb5e9a2143b49bf99b3b5e1","src/punctuated.rs":"d8071625e653ba1792e51a4f9aa6735f0576900c7ad75863f48574812577959e","src/reserved.rs":"e70e028bd55cfa43e23cab4ba29e4dc53a3d91eff685ef2b6e57efc2b87a3428","src/sealed.rs":"896a495a5340eec898527f18bd4ddca408ea03ea0ee3af30074ff48deace778d","src/span.rs":"748c51c6feb223c26d3b1701f5bb98aee823666c775c98106cfa24fe29d8cec1","src/spanned.rs":"3ca016a943637653ab98e373dfb826a120f3c159867346fa38a844439944eb39","src/stmt.rs":"e68f76530606aab24e3587aa697fcd862c176e1cca0a50ab883c76bb91464f3d","src/thread.rs":"815eca6bd64f4eef7c447f0809e84108f5428ff50225224b373efd8fbb696874","src/token.rs":"5e423a696f80e281c322f37c87577f9fdc28607e9c007e24896a2b12da62d5ad","src/tt.rs":"32402645b6e82ef1e882945721b59b5fb7b0ee337d1972876362ecacef643d0f","src/ty.rs":"c8db70afe97a28d9b9f84bacca7edd8ba6e82c63764eb814fe6735be5ae897e0","src/verbatim.rs":"802a97df997432f18cac6e6200ff6ea29fb2474986005e0fcdbc2b65197f87f7","src/whitespace.rs":"e63dd0aa3d34029f17766a8b09c1a6e4479e36c552c8b7023d710a399333aace","tests/.gitignore":"22e782449a3c216db3f7215d5fb8882e316768e40beeec3833aae419ad8941db","tests/common/eq.rs":"02358e6a6a7c2529847f3cdc13977550c2097d5db86b8e6c8b5e9a106ce7971f","tests/common/mod.rs":"25ef6d7daa09bad3198a0e9e91b2812425f92db7c585c1e34a03a84d7362ccd8","tests/common/parse.rs":"81580f23583723f7a2a337c4d13ebc021057cd825562fb4e474caa7cc641fed9","tests/debug/gen.rs":"d6e2abf2a7bb58a7895a60c2f094a98a4f85c9189d02011d0dcef6ef053f26e3","tests/debug/mod.rs":"868763d0ef1609a3ad5e05e9f1bfa0f813e91e7e9a36653414a188bb2fdaa425","tests/macros/mod.rs":"a93136b172377ffebe8b68fd596a86d6625f64ed6c3d5e7f5d6ad859e25d5623","tests/repo/mod.rs":"10fa8a5b8d7838c4c6313a7d6e0aa1e14831cdd41328ae91e0fdffb509f76efe","tests/repo/progress.rs":"c08d0314a7f3ecf760d471f27da3cd2a500aeb9f1c8331bffb2aa648f9fabf3f","tests/test_asyncness.rs":"cff01db49d28ab23b0b258bc6c0a5cc4071be4fe7248eef344a5d79d2fb649b7","tests/test_attribute.rs":"0ffd99384e1a52ae17d9fed5c4053e411e8f9018decef07ffa621d1faa7329d8","tests/test_derive_input.rs":"610444351e3bf99366976bbf1da109c334a70ac9500caef366bcf9b68819829f","tests/test_expr.rs":"0ee83f6f6de950018c043efcc3e85776b4227dae3068309998a8d9709f2fc66c","tests/test_generics.rs":"9d713f90a79d6145efc89fb6f946029ca03486c632219950889da39940152ba0","tests/test_grouping.rs":"6276c3c73bba649dec5c97904ad2492879f918bc887a2c425d095c654ca0d925","tests/test_ident.rs":"9eb53d1e21edf23e7c9e14dc74dcc2b2538e9221e19dbcc0a44e3acc2e90f3f6","tests/test_item.rs":"8b20cae55d6455473632579f541ea7b840102a6a82e5e4f71a2b8aa1ed6f8b69","tests/test_iterators.rs":"53ed6078d37550bd6765d2411e3660be401aef8a31a407350cc064a7d08c7c33","tests/test_lit.rs":"ef3f39da6ed67ba73b05eab3dda299887a455bac8e97701a90a94b636681588f","tests/test_meta.rs":"bd6910ec0eba05e814dad27dda0ea65e1f8b483e64d943213066ffd114a82b45","tests/test_parse_buffer.rs":"8bbe2d24ca8a3788f72c6908fc96c26d546f11c69687bf8d72727f851d5e2d27","tests/test_parse_stream.rs":"2f449a2c41a3dee6fd14bee24e1666a453cb808eda17332fd91afd127fcdd2a6","tests/test_pat.rs":"134091ba20e86c982dadbae668aebe66b1edd9619a01dedee989d1c7efde6b80","tests/test_path.rs":"13ae78e958f0d7334d11f32519f593968e5503d46e29ec345feede025f16113d","tests/test_precedence.rs":"1b7f0c14f4992b60d1dfcaa672baf4d57d18bedb86bbf89d8fe36c71e7026fed","tests/test_receiver.rs":"084eca59984b9a18651da52f2c4407355da3de1335916a12477652999e2d01cc","tests/test_round_trip.rs":"e5a9e8c546f43fba741028716f1f34596822accdbc52d0eccb92f98d98bad804","tests/test_shebang.rs":"f5772cadad5b56e3112cb16308b779f92bce1c3a48091fc9933deb2276a69331","tests/test_should_parse.rs":"1d3535698a446e2755bfc360676bdb161841a1f454cdef6e7556c6d06a95c89d","tests/test_size.rs":"5fae772bab66809d6708232f35cfb4a287882486763b0f763feec2ad79fbb68b","tests/test_stmt.rs":"ff6f6f447f46a52fb544353b7dcd2cd9e60781b297dcc86551bee613beaf2280","tests/test_token_trees.rs":"43e56a701817e3c3bfd0cae54a457dd7a38ccb3ca19da41e2b995fdf20e6ed18","tests/test_ty.rs":"01d33c67a72d0e030736b1be22cea916fde14681ee0253b8183905bccfcc5798","tests/test_visibility.rs":"3f958e2b3b5908005e756a80eea326a91eac97cc4ab60599bebde8d4b942d65c","tests/zzz_stable.rs":"2a862e59cb446235ed99aec0e6ada8e16d3ecc30229b29d825b7c0bbc2602989"},"package":"a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a"}
\ No newline at end of file
+{"files":{"Cargo.toml":"7fb282af447a34bee9f5fa216d1d99e93abcdfb63f5f0fa255c7b2b895156109","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"417bb33dc685fb0036f91229dd0d828b104a4c35010d362f2a6e5d8b4cf1e36d","benches/file.rs":"b5f458687896253823b642778ee091e42b0d423282e5c177a66d74d429cc39e6","benches/rust.rs":"9c41ecf8cff9ea278befa2f0336dea392c4e85041909ea9eff3402f15b2312c1","build.rs":"241f9e3af93b32d2d928ef9251d8ed2e67c6c64acc4aacce81f3aca58778e655","src/attr.rs":"bab811535308771df407b36c9c9d442c413cfc40cce557e7505c85a2875bf41d","src/await.rs":"8aa22e3c201cb2bdb6b4817fa00901f308ab06817607aa7b884c58c957705969","src/bigint.rs":"efc7f64959980653d73fe4f8bc2a3a2904dc05f45b02c6dc15cd316fa3d7c338","src/buffer.rs":"a5d6692938c2ec6ec140f70ec89fa93659fa227b52e8d381e9da7dd440f0249e","src/custom_keyword.rs":"a834c617b4a0aa87c21275ded72a4e04d7fac2d2255cfc037c0690d21488fc31","src/custom_punctuation.rs":"8a666298e774b0d326642f0f73284f6677d0d0a7c9e4a712c9c98d010b4d8a2c","src/data.rs":"6774795445345360208e2ddc932acd33bbf96e9ac8407e1e4d7e45d44f174ebf","src/derive.rs":"d4205fb2b699e784c0889bcde7e80b77ab222ee74ec3c349b5b1fa63a5f3b0b0","src/discouraged.rs":"6c6a9298f8d24f578da119557bc588f3bd928f7b79fca27d6bdfe3e786dd005f","src/error.rs":"30ed3ab35ba852ac2cfc1f5f388845bf0d0576aa485f045c7da3af0fb24b9f84","src/export.rs":"d18438464c7ee1de7092c7c5d48dd9d114bdf184c1ea452c4fa709265cd19469","src/expr.rs":"29ab61a3ef4f50b7ae5b6c7efe16d3a5ad4bc45b3ff18f8a67f20c1953cd6901","src/ext.rs":"1f648cff1d705a1cea64b32b77482b97a82d2fe0aaf63b40cade91e5c02dc969","src/file.rs":"f86697655222ae294215114f4eae8e6b0b5e2a935d6c479ff8f8f889c4efd2e2","src/gen/clone.rs":"8db60fc2bf515f9a65f4e98669427ce02ed0ccc9ffdad25d8fb39b38768ecaf1","src/gen/debug.rs":"facf4fb5c7e017dd890c4a9531f337659d7b55475aa44124abf48e088ad56fc5","src/gen/eq.rs":"576a4f1e4030434b0f0170f4d681d2c46292fda64ad5f3913623e1c6e858c24f","src/gen/fold.rs":"3f59e59ed8ad2ab5dd347bfbe41bbc785c2aabd8ae902087a584a6daed597182","src/gen/hash.rs":"458052bb0d64b2a722eaeef4461af80bce109cd97d19bd44dbd608e4c53a6520","src/gen/visit.rs":"94f2c6bed4ef1cd0e83d91dddaa95730619fa48fdd4a0be2fd8740e730ff744d","src/gen/visit_mut.rs":"abc8cb67ad3300d0667761daf1e057b80b4d3f3980d94e8d6f3ed68bdcda3776","src/gen_helper.rs":"ea6c66388365971db6a2fc86cbb208f7eacde77e245bc8623f27a3642a3d7741","src/generics.rs":"c8272a8010b378c09eac33e9904299797aee3a879832e6a37a580b518f2a641a","src/group.rs":"d9cd30ea5bd4d453293e8e8debbe388a0360c3c766f67c8499fec453a9a43cdc","src/ident.rs":"d67975d3dd89becde96579c0454a1357aa7c62da11bdf94f29ccf63514ffbc9d","src/item.rs":"4a9e16aafef74f22d5c399735a55af741ec907f587f20845c9ac8c815027f65a","src/lib.rs":"6fc78c9af85f369210fcf7b9cdee7b75e4baf072cb885c8ff03ded0692337ece","src/lifetime.rs":"b18862ef1e690037a4f308ea897debad7bc5038584e3b26c6d8809752ea0e3c2","src/lit.rs":"1cf2700ff9b992bfbe660654abb2af4c816765f901451a359ce450c3dd5f2651","src/lookahead.rs":"92ee63b48de02d3f6f1b09121f0fbac41d55cebc5771c8320e27df8482906152","src/mac.rs":"004cb89f9697564f6c9ee837e08ead68463ef946fb4c13c6c105adf2ba364b2b","src/macros.rs":"266590fd63a4a9d8637c6f8d36702acaace4ba59ab74c0883859efd1e260bae5","src/op.rs":"9d499022902743a6a0a19223b356449a979b90e60552d0446497d72750e646a4","src/parse.rs":"8b4aa518660dfd6310a5455b5624de01ad7ba42d11527b217f811b687b26e1fc","src/parse_macro_input.rs":"88929a1a7e5e72aa2d0b3459e52d8975afea856d159047ba4ab02ecbc5878a9c","src/parse_quote.rs":"80db945403d9731c5f3299a5819a5e2bb726c19fd9f256d50240bc32703c96b1","src/pat.rs":"397b02e0a6f6af8e87c2b3d70cc5b65f5428f9154f09b1006a51b31aaea65038","src/path.rs":"6e890d2d1ceb3d70ede5825d1d74eb98f8c716f444c7eb6ef5026dd610baa202","src/print.rs":"da6529c1d9d21aaf6c835f66b4e67eacb7cf91a10eb5e9a2143b49bf99b3b5e1","src/punctuated.rs":"f389f99adafde96e6d9cc5a00fe95acbaf1ea556191dde2cce98bbd8155aed23","src/reserved.rs":"e70e028bd55cfa43e23cab4ba29e4dc53a3d91eff685ef2b6e57efc2b87a3428","src/sealed.rs":"896a495a5340eec898527f18bd4ddca408ea03ea0ee3af30074ff48deace778d","src/span.rs":"748c51c6feb223c26d3b1701f5bb98aee823666c775c98106cfa24fe29d8cec1","src/spanned.rs":"3ca016a943637653ab98e373dfb826a120f3c159867346fa38a844439944eb39","src/stmt.rs":"e68f76530606aab24e3587aa697fcd862c176e1cca0a50ab883c76bb91464f3d","src/thread.rs":"815eca6bd64f4eef7c447f0809e84108f5428ff50225224b373efd8fbb696874","src/token.rs":"5e423a696f80e281c322f37c87577f9fdc28607e9c007e24896a2b12da62d5ad","src/tt.rs":"32402645b6e82ef1e882945721b59b5fb7b0ee337d1972876362ecacef643d0f","src/ty.rs":"e4f5a4bab6ed7bdd4878e3450a9b36e5c4d9c14de342a99c105e3e93095de86a","src/verbatim.rs":"802a97df997432f18cac6e6200ff6ea29fb2474986005e0fcdbc2b65197f87f7","src/whitespace.rs":"e63dd0aa3d34029f17766a8b09c1a6e4479e36c552c8b7023d710a399333aace","tests/.gitignore":"22e782449a3c216db3f7215d5fb8882e316768e40beeec3833aae419ad8941db","tests/common/eq.rs":"202b65faf5681088ba86bd6dcfe97bf66ab3845b3cece2287e43ef3b513dba36","tests/common/mod.rs":"25ef6d7daa09bad3198a0e9e91b2812425f92db7c585c1e34a03a84d7362ccd8","tests/common/parse.rs":"81580f23583723f7a2a337c4d13ebc021057cd825562fb4e474caa7cc641fed9","tests/debug/gen.rs":"e30e2b6c61feb15abe11cee86c4edff9f7e7c9c79080447d44be97869c9a3adb","tests/debug/mod.rs":"868763d0ef1609a3ad5e05e9f1bfa0f813e91e7e9a36653414a188bb2fdaa425","tests/macros/mod.rs":"a93136b172377ffebe8b68fd596a86d6625f64ed6c3d5e7f5d6ad859e25d5623","tests/repo/mod.rs":"fee2c7aa1547ec84913d49432028e8e32001c1d298c57e2b60ecf52ae39e1a82","tests/repo/progress.rs":"c08d0314a7f3ecf760d471f27da3cd2a500aeb9f1c8331bffb2aa648f9fabf3f","tests/test_asyncness.rs":"cff01db49d28ab23b0b258bc6c0a5cc4071be4fe7248eef344a5d79d2fb649b7","tests/test_attribute.rs":"0ffd99384e1a52ae17d9fed5c4053e411e8f9018decef07ffa621d1faa7329d8","tests/test_derive_input.rs":"610444351e3bf99366976bbf1da109c334a70ac9500caef366bcf9b68819829f","tests/test_expr.rs":"e68b5827415471ccfb7efd91bbfba2f025f1cb8f993c417e7b3c0c3bec6a1fa6","tests/test_generics.rs":"9d713f90a79d6145efc89fb6f946029ca03486c632219950889da39940152ba0","tests/test_grouping.rs":"6276c3c73bba649dec5c97904ad2492879f918bc887a2c425d095c654ca0d925","tests/test_ident.rs":"9eb53d1e21edf23e7c9e14dc74dcc2b2538e9221e19dbcc0a44e3acc2e90f3f6","tests/test_item.rs":"2a8ba326963d758b5a3395bfa07375844f8e043885bb752b69be84a2fe6b4e17","tests/test_iterators.rs":"53ed6078d37550bd6765d2411e3660be401aef8a31a407350cc064a7d08c7c33","tests/test_lit.rs":"ef3f39da6ed67ba73b05eab3dda299887a455bac8e97701a90a94b636681588f","tests/test_meta.rs":"bd6910ec0eba05e814dad27dda0ea65e1f8b483e64d943213066ffd114a82b45","tests/test_parse_buffer.rs":"8bbe2d24ca8a3788f72c6908fc96c26d546f11c69687bf8d72727f851d5e2d27","tests/test_parse_stream.rs":"2f449a2c41a3dee6fd14bee24e1666a453cb808eda17332fd91afd127fcdd2a6","tests/test_pat.rs":"d4465f4fc3fd5d6e534ba8efabe1e0ed6da89de4ac7c96effa6bfb880c4287cf","tests/test_path.rs":"13ae78e958f0d7334d11f32519f593968e5503d46e29ec345feede025f16113d","tests/test_precedence.rs":"6040a565757541f73cac22900d70469dfcd960c5f72e43966ce1383fb46f4c62","tests/test_receiver.rs":"084eca59984b9a18651da52f2c4407355da3de1335916a12477652999e2d01cc","tests/test_round_trip.rs":"b05d8f1fdaa35dd4c1baa76c25ba6e46664643b45ee2ab40b9cf206935e95471","tests/test_shebang.rs":"f5772cadad5b56e3112cb16308b779f92bce1c3a48091fc9933deb2276a69331","tests/test_should_parse.rs":"1d3535698a446e2755bfc360676bdb161841a1f454cdef6e7556c6d06a95c89d","tests/test_size.rs":"5fae772bab66809d6708232f35cfb4a287882486763b0f763feec2ad79fbb68b","tests/test_stmt.rs":"ff6f6f447f46a52fb544353b7dcd2cd9e60781b297dcc86551bee613beaf2280","tests/test_token_trees.rs":"43e56a701817e3c3bfd0cae54a457dd7a38ccb3ca19da41e2b995fdf20e6ed18","tests/test_ty.rs":"c59dfc8952f35befa52cf97af99098b9a042499601c78fa2ea3e169359a3ee5f","tests/test_visibility.rs":"7456fcb3a6634db509748aededff9c2d8b242d511a3e5ee3022e40b232892704","tests/zzz_stable.rs":"2a862e59cb446235ed99aec0e6ada8e16d3ecc30229b29d825b7c0bbc2602989"},"package":"b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "syn"
-version = "1.0.55"
+version = "1.0.75"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 include = ["/benches/**", "/build.rs", "/Cargo.toml", "/LICENSE-APACHE", "/LICENSE-MIT", "/README.md", "/src/**", "/tests/**"]
 description = "Parser for Rust source code"
@@ -39,7 +38,7 @@
 name = "file"
 required-features = ["full", "parsing"]
 [dependencies.proc-macro2]
-version = "1.0.23"
+version = "1.0.26"
 default-features = false
 
 [dependencies.quote]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -150,7 +150,7 @@
 macro as shown in the `heapsize` example, token-based macros in Syn are able to
 trigger errors that directly pinpoint the source of the problem.
 
-```
+```console
 error[E0277]: the trait bound `std::thread::Thread: HeapSize` is not satisfied
  --> src/main.rs:7:5
   |
@@ -171,7 +171,7 @@
 The example reimplements the popular `lazy_static` crate from crates.io as a
 procedural macro.
 
-```
+```rust
 lazy_static! {
     static ref USERNAME: Regex = Regex::new("^[a-z0-9_-]{3,16}$").unwrap();
 }
@@ -180,7 +180,7 @@
 The implementation shows how to trigger custom warnings and error messages on
 the macro input.
 
-```
+```console
 warning: come on, pick a more creative name
   --> src/main.rs:10:16
    |
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/attr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/attr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/attr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/attr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -250,9 +250,7 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     pub fn parse_inner(input: ParseStream) -> Result<Vec<Self>> {
         let mut attrs = Vec::new();
-        while input.peek(Token![#]) && input.peek2(Token![!]) {
-            attrs.push(input.call(parsing::single_parse_inner)?);
-        }
+        parsing::parse_inner(input, &mut attrs)?;
         Ok(attrs)
     }
 }
@@ -503,8 +501,13 @@
     use super::*;
     use crate::ext::IdentExt;
     use crate::parse::{Parse, ParseStream, Result};
-    #[cfg(feature = "full")]
-    use crate::private;
+
+    pub fn parse_inner(input: ParseStream, attrs: &mut Vec<Attribute>) -> Result<()> {
+        while input.peek(Token![#]) && input.peek2(Token![!]) {
+            attrs.push(input.call(parsing::single_parse_inner)?);
+        }
+        Ok(())
+    }
 
     pub fn single_parse_inner(input: ParseStream) -> Result<Attribute> {
         let content;
@@ -528,15 +531,6 @@
         })
     }
 
-    #[cfg(feature = "full")]
-    impl private {
-        pub fn attrs(outer: Vec<Attribute>, inner: Vec<Attribute>) -> Vec<Attribute> {
-            let mut attrs = outer;
-            attrs.extend(inner);
-            attrs
-        }
-    }
-
     // Like Path::parse_mod_style but accepts keywords in the path.
     fn parse_meta_path(input: ParseStream) -> Result<Path> {
         Ok(Path {
@@ -655,7 +649,7 @@
             self.path.to_tokens(tokens);
             self.paren_token.surround(tokens, |tokens| {
                 self.nested.to_tokens(tokens);
-            })
+            });
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/custom_keyword.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/custom_keyword.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/custom_keyword.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/custom_keyword.rs	2021-12-09 12:01:26.000000000 +0000
@@ -91,23 +91,23 @@
     ($ident:ident) => {
         #[allow(non_camel_case_types)]
         pub struct $ident {
-            pub span: $crate::export::Span,
+            pub span: $crate::__private::Span,
         }
 
         #[doc(hidden)]
         #[allow(dead_code, non_snake_case)]
-        pub fn $ident<__S: $crate::export::IntoSpans<[$crate::export::Span; 1]>>(
+        pub fn $ident<__S: $crate::__private::IntoSpans<[$crate::__private::Span; 1]>>(
             span: __S,
         ) -> $ident {
             $ident {
-                span: $crate::export::IntoSpans::into_spans(span)[0],
+                span: $crate::__private::IntoSpans::into_spans(span)[0],
             }
         }
 
-        impl $crate::export::Default for $ident {
+        impl $crate::__private::Default for $ident {
             fn default() -> Self {
                 $ident {
-                    span: $crate::export::Span::call_site(),
+                    span: $crate::__private::Span::call_site(),
                 }
             }
         }
@@ -127,7 +127,7 @@
     ($ident:ident) => {
         // For peek.
         impl $crate::token::CustomToken for $ident {
-            fn peek(cursor: $crate::buffer::Cursor) -> $crate::export::bool {
+            fn peek(cursor: $crate::buffer::Cursor) -> $crate::__private::bool {
                 if let Some((ident, _rest)) = cursor.ident() {
                     ident == stringify!($ident)
                 } else {
@@ -135,7 +135,7 @@
                 }
             }
 
-            fn display() -> &'static $crate::export::str {
+            fn display() -> &'static $crate::__private::str {
                 concat!("`", stringify!($ident), "`")
             }
         }
@@ -143,12 +143,12 @@
         impl $crate::parse::Parse for $ident {
             fn parse(input: $crate::parse::ParseStream) -> $crate::parse::Result<$ident> {
                 input.step(|cursor| {
-                    if let $crate::export::Some((ident, rest)) = cursor.ident() {
+                    if let $crate::__private::Some((ident, rest)) = cursor.ident() {
                         if ident == stringify!($ident) {
-                            return $crate::export::Ok(($ident { span: ident.span() }, rest));
+                            return $crate::__private::Ok(($ident { span: ident.span() }, rest));
                         }
                     }
-                    $crate::export::Err(cursor.error(concat!(
+                    $crate::__private::Err(cursor.error(concat!(
                         "expected `",
                         stringify!($ident),
                         "`"
@@ -173,10 +173,10 @@
 #[macro_export]
 macro_rules! impl_to_tokens_for_custom_keyword {
     ($ident:ident) => {
-        impl $crate::export::ToTokens for $ident {
-            fn to_tokens(&self, tokens: &mut $crate::export::TokenStream2) {
+        impl $crate::__private::ToTokens for $ident {
+            fn to_tokens(&self, tokens: &mut $crate::__private::TokenStream2) {
                 let ident = $crate::Ident::new(stringify!($ident), self.span);
-                $crate::export::TokenStreamExt::append(tokens, ident);
+                $crate::__private::TokenStreamExt::append(tokens, ident);
             }
         }
     };
@@ -196,9 +196,10 @@
 #[macro_export]
 macro_rules! impl_clone_for_custom_keyword {
     ($ident:ident) => {
-        impl $crate::export::Copy for $ident {}
+        impl $crate::__private::Copy for $ident {}
 
-        impl $crate::export::Clone for $ident {
+        #[allow(clippy::expl_impl_clone_on_copy)]
+        impl $crate::__private::Clone for $ident {
             fn clone(&self) -> Self {
                 *self
             }
@@ -220,25 +221,25 @@
 #[macro_export]
 macro_rules! impl_extra_traits_for_custom_keyword {
     ($ident:ident) => {
-        impl $crate::export::Debug for $ident {
-            fn fmt(&self, f: &mut $crate::export::Formatter) -> $crate::export::fmt::Result {
-                $crate::export::Formatter::write_str(
+        impl $crate::__private::Debug for $ident {
+            fn fmt(&self, f: &mut $crate::__private::Formatter) -> $crate::__private::fmt::Result {
+                $crate::__private::Formatter::write_str(
                     f,
                     concat!("Keyword [", stringify!($ident), "]"),
                 )
             }
         }
 
-        impl $crate::export::Eq for $ident {}
+        impl $crate::__private::Eq for $ident {}
 
-        impl $crate::export::PartialEq for $ident {
-            fn eq(&self, _other: &Self) -> $crate::export::bool {
+        impl $crate::__private::PartialEq for $ident {
+            fn eq(&self, _other: &Self) -> $crate::__private::bool {
                 true
             }
         }
 
-        impl $crate::export::Hash for $ident {
-            fn hash<__H: $crate::export::Hasher>(&self, _state: &mut __H) {}
+        impl $crate::__private::Hash for $ident {
+            fn hash<__H: $crate::__private::Hasher>(&self, _state: &mut __H) {}
         }
     };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/custom_punctuation.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/custom_punctuation.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/custom_punctuation.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/custom_punctuation.rs	2021-12-09 12:01:26.000000000 +0000
@@ -83,18 +83,18 @@
 
         #[doc(hidden)]
         #[allow(dead_code, non_snake_case)]
-        pub fn $ident<__S: $crate::export::IntoSpans<$crate::custom_punctuation_repr!($($tt)+)>>(
+        pub fn $ident<__S: $crate::__private::IntoSpans<$crate::custom_punctuation_repr!($($tt)+)>>(
             spans: __S,
         ) -> $ident {
             let _validate_len = 0 $(+ $crate::custom_punctuation_len!(strict, $tt))*;
             $ident {
-                spans: $crate::export::IntoSpans::into_spans(spans)
+                spans: $crate::__private::IntoSpans::into_spans(spans)
             }
         }
 
-        impl $crate::export::Default for $ident {
+        impl $crate::__private::Default for $ident {
             fn default() -> Self {
-                $ident($crate::export::Span::call_site())
+                $ident($crate::__private::Span::call_site())
             }
         }
 
@@ -116,7 +116,7 @@
                 $crate::token::parsing::peek_punct(cursor, $crate::stringify_punct!($($tt)+))
             }
 
-            fn display() -> &'static $crate::export::str {
+            fn display() -> &'static $crate::__private::str {
                 concat!("`", $crate::stringify_punct!($($tt)+), "`")
             }
         }
@@ -145,8 +145,8 @@
 #[macro_export]
 macro_rules! impl_to_tokens_for_custom_punctuation {
     ($ident:ident, $($tt:tt)+) => {
-        impl $crate::export::ToTokens for $ident {
-            fn to_tokens(&self, tokens: &mut $crate::export::TokenStream2) {
+        impl $crate::__private::ToTokens for $ident {
+            fn to_tokens(&self, tokens: &mut $crate::__private::TokenStream2) {
                 $crate::token::printing::punct($crate::stringify_punct!($($tt)+), &self.spans, tokens)
             }
         }
@@ -167,9 +167,10 @@
 #[macro_export]
 macro_rules! impl_clone_for_custom_punctuation {
     ($ident:ident, $($tt:tt)+) => {
-        impl $crate::export::Copy for $ident {}
+        impl $crate::__private::Copy for $ident {}
 
-        impl $crate::export::Clone for $ident {
+        #[allow(clippy::expl_impl_clone_on_copy)]
+        impl $crate::__private::Clone for $ident {
             fn clone(&self) -> Self {
                 *self
             }
@@ -191,22 +192,22 @@
 #[macro_export]
 macro_rules! impl_extra_traits_for_custom_punctuation {
     ($ident:ident, $($tt:tt)+) => {
-        impl $crate::export::Debug for $ident {
-            fn fmt(&self, f: &mut $crate::export::Formatter) -> $crate::export::fmt::Result {
-                $crate::export::Formatter::write_str(f, stringify!($ident))
+        impl $crate::__private::Debug for $ident {
+            fn fmt(&self, f: &mut $crate::__private::Formatter) -> $crate::__private::fmt::Result {
+                $crate::__private::Formatter::write_str(f, stringify!($ident))
             }
         }
 
-        impl $crate::export::Eq for $ident {}
+        impl $crate::__private::Eq for $ident {}
 
-        impl $crate::export::PartialEq for $ident {
-            fn eq(&self, _other: &Self) -> $crate::export::bool {
+        impl $crate::__private::PartialEq for $ident {
+            fn eq(&self, _other: &Self) -> $crate::__private::bool {
                 true
             }
         }
 
-        impl $crate::export::Hash for $ident {
-            fn hash<__H: $crate::export::Hasher>(&self, _state: &mut __H) {}
+        impl $crate::__private::Hash for $ident {
+            fn hash<__H: $crate::__private::Hasher>(&self, _state: &mut __H) {}
         }
     };
 }
@@ -224,7 +225,7 @@
 #[macro_export]
 macro_rules! custom_punctuation_repr {
     ($($tt:tt)+) => {
-        [$crate::export::Span; 0 $(+ $crate::custom_punctuation_len!(lenient, $tt))+]
+        [$crate::__private::Span; 0 $(+ $crate::custom_punctuation_len!(lenient, $tt))+]
     };
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/data.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/data.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/data.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/data.rs	2021-12-09 12:01:26.000000000 +0000
@@ -246,29 +246,29 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for Variant {
         fn parse(input: ParseStream) -> Result<Self> {
-            let attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let _visibility: Visibility = input.parse()?;
+            let ident: Ident = input.parse()?;
+            let fields = if input.peek(token::Brace) {
+                let fields = parse_braced(input, &mut attrs)?;
+                Fields::Named(fields)
+            } else if input.peek(token::Paren) {
+                Fields::Unnamed(input.parse()?)
+            } else {
+                Fields::Unit
+            };
+            let discriminant = if input.peek(Token![=]) {
+                let eq_token: Token![=] = input.parse()?;
+                let discriminant: Expr = input.parse()?;
+                Some((eq_token, discriminant))
+            } else {
+                None
+            };
             Ok(Variant {
                 attrs,
-                ident: input.parse()?,
-                fields: {
-                    if input.peek(token::Brace) {
-                        Fields::Named(input.parse()?)
-                    } else if input.peek(token::Paren) {
-                        Fields::Unnamed(input.parse()?)
-                    } else {
-                        Fields::Unit
-                    }
-                },
-                discriminant: {
-                    if input.peek(Token![=]) {
-                        let eq_token: Token![=] = input.parse()?;
-                        let discriminant: Expr = input.parse()?;
-                        Some((eq_token, discriminant))
-                    } else {
-                        None
-                    }
-                },
+                ident,
+                fields,
+                discriminant,
             })
         }
     }
@@ -295,6 +295,17 @@
         }
     }
 
+    pub(crate) fn parse_braced(
+        input: ParseStream,
+        attrs: &mut Vec<Attribute>,
+    ) -> Result<FieldsNamed> {
+        let content;
+        let brace_token = braced!(content in input);
+        attr::parsing::parse_inner(&content, attrs)?;
+        let named = content.parse_terminated(Field::parse_named)?;
+        Ok(FieldsNamed { brace_token, named })
+    }
+
     impl Field {
         /// Parses a named (braced struct) field.
         #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
@@ -464,7 +475,7 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "printing")))]
     impl ToTokens for VisPublic {
         fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.pub_token.to_tokens(tokens)
+            self.pub_token.to_tokens(tokens);
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/derive.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/derive.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/derive.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/derive.rs	2021-12-09 12:01:26.000000000 +0000
@@ -95,7 +95,7 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for DeriveInput {
         fn parse(input: ParseStream) -> Result<Self> {
-            let attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let vis = input.parse::<Visibility>()?;
 
             let lookahead = input.lookahead1();
@@ -103,7 +103,7 @@
                 let struct_token = input.parse::<Token![struct]>()?;
                 let ident = input.parse::<Ident>()?;
                 let generics = input.parse::<Generics>()?;
-                let (where_clause, fields, semi) = data_struct(input)?;
+                let (where_clause, fields, semi) = data_struct(input, &mut attrs)?;
                 Ok(DeriveInput {
                     attrs,
                     vis,
@@ -122,7 +122,7 @@
                 let enum_token = input.parse::<Token![enum]>()?;
                 let ident = input.parse::<Ident>()?;
                 let generics = input.parse::<Generics>()?;
-                let (where_clause, brace, variants) = data_enum(input)?;
+                let (where_clause, brace, variants) = data_enum(input, &mut attrs)?;
                 Ok(DeriveInput {
                     attrs,
                     vis,
@@ -141,7 +141,7 @@
                 let union_token = input.parse::<Token![union]>()?;
                 let ident = input.parse::<Ident>()?;
                 let generics = input.parse::<Generics>()?;
-                let (where_clause, fields) = data_union(input)?;
+                let (where_clause, fields) = data_union(input, &mut attrs)?;
                 Ok(DeriveInput {
                     attrs,
                     vis,
@@ -163,6 +163,7 @@
 
     pub fn data_struct(
         input: ParseStream,
+        attrs: &mut Vec<Attribute>,
     ) -> Result<(Option<WhereClause>, Fields, Option<Token![;]>)> {
         let mut lookahead = input.lookahead1();
         let mut where_clause = None;
@@ -187,7 +188,7 @@
                 Err(lookahead.error())
             }
         } else if lookahead.peek(token::Brace) {
-            let fields = input.parse()?;
+            let fields = data::parsing::parse_braced(input, attrs)?;
             Ok((where_clause, Fields::Named(fields), None))
         } else if lookahead.peek(Token![;]) {
             let semi = input.parse()?;
@@ -199,6 +200,7 @@
 
     pub fn data_enum(
         input: ParseStream,
+        attrs: &mut Vec<Attribute>,
     ) -> Result<(
         Option<WhereClause>,
         token::Brace,
@@ -208,14 +210,18 @@
 
         let content;
         let brace = braced!(content in input);
+        attr::parsing::parse_inner(&content, attrs)?;
         let variants = content.parse_terminated(Variant::parse)?;
 
         Ok((where_clause, brace, variants))
     }
 
-    pub fn data_union(input: ParseStream) -> Result<(Option<WhereClause>, FieldsNamed)> {
+    pub fn data_union(
+        input: ParseStream,
+        attrs: &mut Vec<Attribute>,
+    ) -> Result<(Option<WhereClause>, FieldsNamed)> {
         let where_clause = input.parse()?;
-        let fields = input.parse()?;
+        let fields = data::parsing::parse_braced(input, attrs)?;
         Ok((where_clause, fields))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/discouraged.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/discouraged.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/discouraged.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/discouraged.rs	2021-12-09 12:01:26.000000000 +0000
@@ -189,6 +189,6 @@
 
         // See comment on `cell` in the struct definition.
         self.cell
-            .set(unsafe { mem::transmute::<Cursor, Cursor<'static>>(fork.cursor()) })
+            .set(unsafe { mem::transmute::<Cursor, Cursor<'static>>(fork.cursor()) });
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -197,10 +197,46 @@
             .collect()
     }
 
+    /// Render the error as an invocation of [`compile_error!`].
+    ///
+    /// [`compile_error!`]: std::compile_error!
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # extern crate proc_macro;
+    /// #
+    /// use proc_macro::TokenStream;
+    /// use syn::{parse_macro_input, DeriveInput, Error};
+    ///
+    /// # const _: &str = stringify! {
+    /// #[proc_macro_derive(MyTrait)]
+    /// # };
+    /// pub fn derive_my_trait(input: TokenStream) -> TokenStream {
+    ///     let input = parse_macro_input!(input as DeriveInput);
+    ///     my_trait::expand(input)
+    ///         .unwrap_or_else(Error::into_compile_error)
+    ///         .into()
+    /// }
+    ///
+    /// mod my_trait {
+    ///     use proc_macro2::TokenStream;
+    ///     use syn::{DeriveInput, Result};
+    ///
+    ///     pub(crate) fn expand(input: DeriveInput) -> Result<TokenStream> {
+    ///         /* ... */
+    ///         # unimplemented!()
+    ///     }
+    /// }
+    /// ```
+    pub fn into_compile_error(self) -> TokenStream {
+        self.to_compile_error()
+    }
+
     /// Add another error message to self such that when `to_compile_error()` is
     /// called, both errors will be emitted together.
     pub fn combine(&mut self, another: Error) {
-        self.messages.extend(another.messages)
+        self.messages.extend(another.messages);
     }
 }
 
@@ -313,7 +349,7 @@
 
 impl From<LexError> for Error {
     fn from(err: LexError) -> Self {
-        Error::new(Span::call_site(), format!("{:?}", err))
+        Error::new(err.span(), "lex error")
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/export.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/export.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/export.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/export.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,5 @@
     pub type Bool = bool;
     pub type Str = str;
 }
+
+pub struct private(pub(crate) ());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/expr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/expr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/expr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/expr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -224,8 +224,31 @@
         /// A yield expression: `yield expr`.
         Yield(ExprYield),
 
+        // The following is the only supported idiom for exhaustive matching of
+        // this enum.
+        //
+        //     match expr {
+        //         Expr::Array(e) => {...}
+        //         Expr::Assign(e) => {...}
+        //         ...
+        //         Expr::Yield(e) => {...}
+        //
+        //         #[cfg(test)]
+        //         Expr::__TestExhaustive(_) => unimplemented!(),
+        //         #[cfg(not(test))]
+        //         _ => { /* some sane fallback */ }
+        //     }
+        //
+        // This way we fail your tests but don't break your library when adding
+        // a variant. You will be notified by a test failure when a variant is
+        // added, so that you can add code to handle it, but your library will
+        // continue to compile and work for downstream users in the interim.
+        //
+        // Once `deny(reachable)` is available in rustc, Expr will be
+        // reimplemented as a non_exhaustive enum.
+        // https://github.com/rust-lang/rust/issues/44109#issuecomment-521781237
         #[doc(hidden)]
-        __Nonexhaustive,
+        __TestExhaustive(crate::private),
     }
 }
 
@@ -804,7 +827,11 @@
             | Expr::TryBlock(ExprTryBlock { attrs, .. })
             | Expr::Yield(ExprYield { attrs, .. }) => mem::replace(attrs, new),
             Expr::Verbatim(_) => Vec::new(),
-            Expr::__Nonexhaustive => unreachable!(),
+
+            #[cfg(test)]
+            Expr::__TestExhaustive(_) => unimplemented!(),
+            #[cfg(not(test))]
+            _ => unreachable!(),
         }
     }
 }
@@ -824,6 +851,24 @@
     }
 }
 
+impl From<Ident> for Member {
+    fn from(ident: Ident) -> Member {
+        Member::Named(ident)
+    }
+}
+
+impl From<Index> for Member {
+    fn from(index: Index) -> Member {
+        Member::Unnamed(index)
+    }
+}
+
+impl From<usize> for Member {
+    fn from(index: usize) -> Member {
+        Member::Unnamed(Index::from(index))
+    }
+}
+
 impl Eq for Member {}
 
 impl PartialEq for Member {
@@ -1295,6 +1340,7 @@
                 let rhs = if input.is_empty()
                     || input.peek(Token![,])
                     || input.peek(Token![;])
+                    || input.peek(Token![.]) && !input.peek(Token![..])
                     || !allow_struct.0 && input.peek(token::Brace)
                 {
                     None
@@ -1395,7 +1441,9 @@
             Precedence::Assign
         } else if input.peek(Token![..]) {
             Precedence::Range
-        } else if input.peek(Token![as]) || input.peek(Token![:]) && !input.peek(Token![::]) {
+        } else if input.peek(Token![as])
+            || cfg!(feature = "full") && input.peek(Token![:]) && !input.peek(Token![::])
+        {
             Precedence::Cast
         } else {
             Precedence::Any
@@ -1465,17 +1513,9 @@
                 }))
             }
         } else if input.peek(Token![box]) {
-            Ok(Expr::Box(ExprBox {
-                attrs,
-                box_token: input.parse()?,
-                expr: Box::new(unary_expr(input, allow_struct)?),
-            }))
+            expr_box(input, attrs, allow_struct).map(Expr::Box)
         } else if input.peek(Token![*]) || input.peek(Token![!]) || input.peek(Token![-]) {
-            Ok(Expr::Unary(ExprUnary {
-                attrs,
-                op: input.parse()?,
-                expr: Box::new(unary_expr(input, allow_struct)?),
-            }))
+            expr_unary(input, attrs, allow_struct).map(Expr::Unary)
         } else {
             trailer_expr(attrs, input, allow_struct)
         }
@@ -1502,7 +1542,7 @@
     // <atom> ? ...
     #[cfg(feature = "full")]
     fn trailer_expr(
-        outer_attrs: Vec<Attribute>,
+        mut attrs: Vec<Attribute>,
         input: ParseStream,
         allow_struct: AllowStruct,
     ) -> Result<Expr> {
@@ -1510,7 +1550,7 @@
         let mut e = trailer_helper(input, atom)?;
 
         let inner_attrs = e.replace_attrs(Vec::new());
-        let attrs = private::attrs(outer_attrs, inner_attrs);
+        attrs.extend(inner_attrs);
         e.replace_attrs(attrs);
         Ok(e)
     }
@@ -1526,7 +1566,13 @@
                     paren_token: parenthesized!(content in input),
                     args: content.parse_terminated(Expr::parse)?,
                 });
-            } else if input.peek(Token![.]) && !input.peek(Token![..]) {
+            } else if input.peek(Token![.])
+                && !input.peek(Token![..])
+                && match e {
+                    Expr::Range(_) => false,
+                    _ => true,
+                }
+            {
                 let mut dot_token: Token![.] = input.parse()?;
 
                 let await_token: Option<token::Await> = input.parse()?;
@@ -1676,9 +1722,9 @@
         } else if input.peek(Token![async])
             && (input.peek2(token::Brace) || input.peek2(Token![move]) && input.peek3(token::Brace))
         {
-            input.call(expr_async).map(Expr::Async)
+            input.parse().map(Expr::Async)
         } else if input.peek(Token![try]) && input.peek2(token::Brace) {
-            input.call(expr_try_block).map(Expr::TryBlock)
+            input.parse().map(Expr::TryBlock)
         } else if input.peek(Token![|])
             || input.peek(Token![async]) && (input.peek2(Token![|]) || input.peek2(Token![move]))
             || input.peek(Token![static])
@@ -1699,13 +1745,13 @@
         } else if input.peek(Token![break]) {
             expr_break(input, allow_struct).map(Expr::Break)
         } else if input.peek(Token![continue]) {
-            input.call(expr_continue).map(Expr::Continue)
+            input.parse().map(Expr::Continue)
         } else if input.peek(Token![return]) {
             expr_ret(input, allow_struct).map(Expr::Return)
         } else if input.peek(token::Bracket) {
             array_or_repeat(input)
         } else if input.peek(Token![let]) {
-            input.call(expr_let).map(Expr::Let)
+            input.parse().map(Expr::Let)
         } else if input.peek(Token![if]) {
             input.parse().map(Expr::If)
         } else if input.peek(Token![while]) {
@@ -1717,13 +1763,13 @@
         } else if input.peek(Token![match]) {
             input.parse().map(Expr::Match)
         } else if input.peek(Token![yield]) {
-            input.call(expr_yield).map(Expr::Yield)
+            input.parse().map(Expr::Yield)
         } else if input.peek(Token![unsafe]) {
-            input.call(expr_unsafe).map(Expr::Unsafe)
+            input.parse().map(Expr::Unsafe)
         } else if input.peek(Token![const]) {
             input.call(expr_const).map(Expr::Verbatim)
         } else if input.peek(token::Brace) {
-            input.call(expr_block).map(Expr::Block)
+            input.parse().map(Expr::Block)
         } else if input.peek(Token![..]) {
             expr_range(input, allow_struct).map(Expr::Range)
         } else if input.peek(Token![_]) {
@@ -1739,7 +1785,7 @@
             } else if input.peek(Token![loop]) {
                 Expr::Loop(input.parse()?)
             } else if input.peek(token::Brace) {
-                Expr::Block(input.call(expr_block)?)
+                Expr::Block(input.parse()?)
             } else {
                 return Err(input.error("expected loop or block expression"));
             };
@@ -1818,6 +1864,17 @@
     }
 
     #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprMacro {
+        fn parse(input: ParseStream) -> Result<Self> {
+            Ok(ExprMacro {
+                attrs: Vec::new(),
+                mac: input.parse()?,
+            })
+        }
+    }
+
+    #[cfg(feature = "full")]
     fn paren_or_tuple(input: ParseStream) -> Result<Expr> {
         let content;
         let paren_token = parenthesized!(content in input);
@@ -1904,6 +1961,48 @@
     }
 
     #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprArray {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let content;
+            let bracket_token = bracketed!(content in input);
+            let inner_attrs = content.call(Attribute::parse_inner)?;
+            let mut elems = Punctuated::new();
+
+            while !content.is_empty() {
+                let first: Expr = content.parse()?;
+                elems.push_value(first);
+                if content.is_empty() {
+                    break;
+                }
+                let punct = content.parse()?;
+                elems.push_punct(punct);
+            }
+
+            Ok(ExprArray {
+                attrs: inner_attrs,
+                bracket_token,
+                elems,
+            })
+        }
+    }
+
+    #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprRepeat {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let content;
+            Ok(ExprRepeat {
+                bracket_token: bracketed!(content in input),
+                attrs: content.call(Attribute::parse_inner)?,
+                expr: content.parse()?,
+                semi_token: content.parse()?,
+                len: content.parse()?,
+            })
+        }
+    }
+
+    #[cfg(feature = "full")]
     pub(crate) fn expr_early(input: ParseStream) -> Result<Expr> {
         let mut attrs = input.call(expr_attrs)?;
         let mut expr = if input.peek(Token![if]) {
@@ -1917,13 +2016,13 @@
         } else if input.peek(Token![match]) {
             Expr::Match(input.parse()?)
         } else if input.peek(Token![try]) && input.peek2(token::Brace) {
-            Expr::TryBlock(input.call(expr_try_block)?)
+            Expr::TryBlock(input.parse()?)
         } else if input.peek(Token![unsafe]) {
-            Expr::Unsafe(input.call(expr_unsafe)?)
+            Expr::Unsafe(input.parse()?)
         } else if input.peek(Token![const]) {
             Expr::Verbatim(input.call(expr_const)?)
         } else if input.peek(token::Brace) {
-            Expr::Block(input.call(expr_block)?)
+            Expr::Block(input.parse()?)
         } else {
             let allow_struct = AllowStruct(true);
             let mut expr = unary_expr(input, allow_struct)?;
@@ -1969,7 +2068,14 @@
         })
     }
 
-    #[cfg(not(feature = "full"))]
+    #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprParen {
+        fn parse(input: ParseStream) -> Result<Self> {
+            expr_paren(input)
+        }
+    }
+
     fn expr_paren(input: ParseStream) -> Result<ExprParen> {
         let content;
         Ok(ExprParen {
@@ -1987,7 +2093,7 @@
         }
 
         if input.peek(token::Brace) {
-            let block = input.call(expr::parsing::expr_block)?;
+            let block: ExprBlock = input.parse()?;
             return Ok(GenericMethodArgument::Const(Expr::Block(block)));
         }
 
@@ -1995,14 +2101,17 @@
     }
 
     #[cfg(feature = "full")]
-    fn expr_let(input: ParseStream) -> Result<ExprLet> {
-        Ok(ExprLet {
-            attrs: Vec::new(),
-            let_token: input.parse()?,
-            pat: pat::parsing::multi_pat_with_leading_vert(input)?,
-            eq_token: input.parse()?,
-            expr: Box::new(input.call(Expr::parse_without_eager_brace)?),
-        })
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprLet {
+        fn parse(input: ParseStream) -> Result<Self> {
+            Ok(ExprLet {
+                attrs: Vec::new(),
+                let_token: input.parse()?,
+                pat: pat::parsing::multi_pat_with_leading_vert(input)?,
+                eq_token: input.parse()?,
+                expr: Box::new(input.call(Expr::parse_without_eager_brace)?),
+            })
+        }
     }
 
     #[cfg(feature = "full")]
@@ -2050,7 +2159,7 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ExprForLoop {
         fn parse(input: ParseStream) -> Result<Self> {
-            let outer_attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let label: Option<Label> = input.parse()?;
             let for_token: Token![for] = input.parse()?;
 
@@ -2061,11 +2170,11 @@
 
             let content;
             let brace_token = braced!(content in input);
-            let inner_attrs = content.call(Attribute::parse_inner)?;
+            attr::parsing::parse_inner(&content, &mut attrs)?;
             let stmts = content.call(Block::parse_within)?;
 
             Ok(ExprForLoop {
-                attrs: private::attrs(outer_attrs, inner_attrs),
+                attrs,
                 label,
                 for_token,
                 pat,
@@ -2080,17 +2189,17 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ExprLoop {
         fn parse(input: ParseStream) -> Result<Self> {
-            let outer_attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let label: Option<Label> = input.parse()?;
             let loop_token: Token![loop] = input.parse()?;
 
             let content;
             let brace_token = braced!(content in input);
-            let inner_attrs = content.call(Attribute::parse_inner)?;
+            attr::parsing::parse_inner(&content, &mut attrs)?;
             let stmts = content.call(Block::parse_within)?;
 
             Ok(ExprLoop {
-                attrs: private::attrs(outer_attrs, inner_attrs),
+                attrs,
                 label,
                 loop_token,
                 body: Block { brace_token, stmts },
@@ -2102,13 +2211,13 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ExprMatch {
         fn parse(input: ParseStream) -> Result<Self> {
-            let outer_attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let match_token: Token![match] = input.parse()?;
             let expr = Expr::parse_without_eager_brace(input)?;
 
             let content;
             let brace_token = braced!(content in input);
-            let inner_attrs = content.call(Attribute::parse_inner)?;
+            attr::parsing::parse_inner(&content, &mut attrs)?;
 
             let mut arms = Vec::new();
             while !content.is_empty() {
@@ -2116,7 +2225,7 @@
             }
 
             Ok(ExprMatch {
-                attrs: private::attrs(outer_attrs, inner_attrs),
+                attrs,
                 match_token,
                 expr: Box::new(expr),
                 brace_token,
@@ -2151,63 +2260,139 @@
     }
 
     impl_by_parsing_expr! {
-        ExprBox, Box, "expected box expression",
-        ExprArray, Array, "expected slice literal expression",
         ExprCall, Call, "expected function call expression",
         ExprMethodCall, MethodCall, "expected method call expression",
         ExprTuple, Tuple, "expected tuple expression",
         ExprBinary, Binary, "expected binary operation",
-        ExprUnary, Unary, "expected unary operation",
         ExprCast, Cast, "expected cast expression",
         ExprType, Type, "expected type ascription expression",
-        ExprLet, Let, "expected let guard",
-        ExprClosure, Closure, "expected closure expression",
-        ExprUnsafe, Unsafe, "expected unsafe block",
-        ExprBlock, Block, "expected blocked scope",
         ExprAssign, Assign, "expected assignment expression",
         ExprAssignOp, AssignOp, "expected compound assignment expression",
         ExprField, Field, "expected struct field access",
         ExprIndex, Index, "expected indexing expression",
         ExprRange, Range, "expected range expression",
-        ExprReference, Reference, "expected referencing operation",
-        ExprBreak, Break, "expected break expression",
-        ExprContinue, Continue, "expected continue expression",
-        ExprReturn, Return, "expected return expression",
-        ExprMacro, Macro, "expected macro invocation expression",
-        ExprStruct, Struct, "expected struct literal expression",
-        ExprRepeat, Repeat, "expected array literal constructed from one repeated element",
-        ExprParen, Paren, "expected parenthesized expression",
         ExprTry, Try, "expected try expression",
-        ExprAsync, Async, "expected async block",
-        ExprTryBlock, TryBlock, "expected try block",
-        ExprYield, Yield, "expected yield expression",
     }
 
     #[cfg(feature = "full")]
-    fn expr_try_block(input: ParseStream) -> Result<ExprTryBlock> {
-        Ok(ExprTryBlock {
-            attrs: Vec::new(),
-            try_token: input.parse()?,
-            block: input.parse()?,
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprBox {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let attrs = Vec::new();
+            let allow_struct = AllowStruct(true);
+            expr_box(input, attrs, allow_struct)
+        }
+    }
+
+    #[cfg(feature = "full")]
+    fn expr_box(
+        input: ParseStream,
+        attrs: Vec<Attribute>,
+        allow_struct: AllowStruct,
+    ) -> Result<ExprBox> {
+        Ok(ExprBox {
+            attrs,
+            box_token: input.parse()?,
+            expr: Box::new(unary_expr(input, allow_struct)?),
         })
     }
 
     #[cfg(feature = "full")]
-    fn expr_yield(input: ParseStream) -> Result<ExprYield> {
-        Ok(ExprYield {
-            attrs: Vec::new(),
-            yield_token: input.parse()?,
-            expr: {
-                if !input.is_empty() && !input.peek(Token![,]) && !input.peek(Token![;]) {
-                    Some(input.parse()?)
-                } else {
-                    None
-                }
-            },
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprUnary {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let attrs = Vec::new();
+            let allow_struct = AllowStruct(true);
+            expr_unary(input, attrs, allow_struct)
+        }
+    }
+
+    #[cfg(feature = "full")]
+    fn expr_unary(
+        input: ParseStream,
+        attrs: Vec<Attribute>,
+        allow_struct: AllowStruct,
+    ) -> Result<ExprUnary> {
+        Ok(ExprUnary {
+            attrs,
+            op: input.parse()?,
+            expr: Box::new(unary_expr(input, allow_struct)?),
         })
     }
 
     #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprClosure {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let allow_struct = AllowStruct(true);
+            expr_closure(input, allow_struct)
+        }
+    }
+
+    #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprReference {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let allow_struct = AllowStruct(true);
+            Ok(ExprReference {
+                attrs: Vec::new(),
+                and_token: input.parse()?,
+                raw: Reserved::default(),
+                mutability: input.parse()?,
+                expr: Box::new(unary_expr(input, allow_struct)?),
+            })
+        }
+    }
+
+    #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprBreak {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let allow_struct = AllowStruct(true);
+            expr_break(input, allow_struct)
+        }
+    }
+
+    #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprReturn {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let allow_struct = AllowStruct(true);
+            expr_ret(input, allow_struct)
+        }
+    }
+
+    #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprTryBlock {
+        fn parse(input: ParseStream) -> Result<Self> {
+            Ok(ExprTryBlock {
+                attrs: Vec::new(),
+                try_token: input.parse()?,
+                block: input.parse()?,
+            })
+        }
+    }
+
+    #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprYield {
+        fn parse(input: ParseStream) -> Result<Self> {
+            Ok(ExprYield {
+                attrs: Vec::new(),
+                yield_token: input.parse()?,
+                expr: {
+                    if !input.is_empty() && !input.peek(Token![,]) && !input.peek(Token![;]) {
+                        Some(input.parse()?)
+                    } else {
+                        None
+                    }
+                },
+            })
+        }
+    }
+
+    #[cfg(feature = "full")]
     fn expr_closure(input: ParseStream, allow_struct: AllowStruct) -> Result<ExprClosure> {
         let asyncness: Option<Token![async]> = input.parse()?;
         let movability: Option<Token![static]> = if asyncness.is_none() {
@@ -2264,13 +2449,16 @@
     }
 
     #[cfg(feature = "full")]
-    fn expr_async(input: ParseStream) -> Result<ExprAsync> {
-        Ok(ExprAsync {
-            attrs: Vec::new(),
-            async_token: input.parse()?,
-            capture: input.parse()?,
-            block: input.parse()?,
-        })
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprAsync {
+        fn parse(input: ParseStream) -> Result<Self> {
+            Ok(ExprAsync {
+                attrs: Vec::new(),
+                async_token: input.parse()?,
+                capture: input.parse()?,
+                block: input.parse()?,
+            })
+        }
     }
 
     #[cfg(feature = "full")]
@@ -2303,7 +2491,11 @@
                 Pat::Type(_) => unreachable!(),
                 Pat::Verbatim(_) => {}
                 Pat::Wild(pat) => pat.attrs = attrs,
-                Pat::__Nonexhaustive => unreachable!(),
+
+                #[cfg(test)]
+                Pat::__TestExhaustive(_) => unimplemented!(),
+                #[cfg(not(test))]
+                _ => unreachable!(),
             }
             Ok(pat)
         }
@@ -2313,18 +2505,18 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ExprWhile {
         fn parse(input: ParseStream) -> Result<Self> {
-            let outer_attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let label: Option<Label> = input.parse()?;
             let while_token: Token![while] = input.parse()?;
             let cond = Expr::parse_without_eager_brace(input)?;
 
             let content;
             let brace_token = braced!(content in input);
-            let inner_attrs = content.call(Attribute::parse_inner)?;
+            attr::parsing::parse_inner(&content, &mut attrs)?;
             let stmts = content.call(Block::parse_within)?;
 
             Ok(ExprWhile {
-                attrs: private::attrs(outer_attrs, inner_attrs),
+                attrs,
                 label,
                 while_token,
                 cond: Box::new(cond),
@@ -2357,12 +2549,15 @@
     }
 
     #[cfg(feature = "full")]
-    fn expr_continue(input: ParseStream) -> Result<ExprContinue> {
-        Ok(ExprContinue {
-            attrs: Vec::new(),
-            continue_token: input.parse()?,
-            label: input.parse()?,
-        })
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprContinue {
+        fn parse(input: ParseStream) -> Result<Self> {
+            Ok(ExprContinue {
+                attrs: Vec::new(),
+                continue_token: input.parse()?,
+                label: input.parse()?,
+            })
+        }
     }
 
     #[cfg(feature = "full")]
@@ -2438,15 +2633,24 @@
     }
 
     #[cfg(feature = "full")]
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprStruct {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let attrs = Vec::new();
+            let path: Path = input.parse()?;
+            expr_struct_helper(input, attrs, path)
+        }
+    }
+
+    #[cfg(feature = "full")]
     fn expr_struct_helper(
         input: ParseStream,
-        outer_attrs: Vec<Attribute>,
+        mut attrs: Vec<Attribute>,
         path: Path,
     ) -> Result<ExprStruct> {
         let content;
         let brace_token = braced!(content in input);
-        let inner_attrs = content.call(Attribute::parse_inner)?;
-        let attrs = private::attrs(outer_attrs, inner_attrs);
+        attr::parsing::parse_inner(&content, &mut attrs)?;
 
         let mut fields = Punctuated::new();
         while !content.is_empty() {
@@ -2484,19 +2688,22 @@
     }
 
     #[cfg(feature = "full")]
-    fn expr_unsafe(input: ParseStream) -> Result<ExprUnsafe> {
-        let unsafe_token: Token![unsafe] = input.parse()?;
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprUnsafe {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let unsafe_token: Token![unsafe] = input.parse()?;
 
-        let content;
-        let brace_token = braced!(content in input);
-        let inner_attrs = content.call(Attribute::parse_inner)?;
-        let stmts = content.call(Block::parse_within)?;
+            let content;
+            let brace_token = braced!(content in input);
+            let inner_attrs = content.call(Attribute::parse_inner)?;
+            let stmts = content.call(Block::parse_within)?;
 
-        Ok(ExprUnsafe {
-            attrs: inner_attrs,
-            unsafe_token,
-            block: Block { brace_token, stmts },
-        })
+            Ok(ExprUnsafe {
+                attrs: inner_attrs,
+                unsafe_token,
+                block: Block { brace_token, stmts },
+            })
+        }
     }
 
     #[cfg(feature = "full")]
@@ -2513,19 +2720,23 @@
     }
 
     #[cfg(feature = "full")]
-    pub fn expr_block(input: ParseStream) -> Result<ExprBlock> {
-        let label: Option<Label> = input.parse()?;
+    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
+    impl Parse for ExprBlock {
+        fn parse(input: ParseStream) -> Result<Self> {
+            let mut attrs = input.call(Attribute::parse_outer)?;
+            let label: Option<Label> = input.parse()?;
 
-        let content;
-        let brace_token = braced!(content in input);
-        let inner_attrs = content.call(Attribute::parse_inner)?;
-        let stmts = content.call(Block::parse_within)?;
+            let content;
+            let brace_token = braced!(content in input);
+            attr::parsing::parse_inner(&content, &mut attrs)?;
+            let stmts = content.call(Block::parse_within)?;
 
-        Ok(ExprBlock {
-            attrs: inner_attrs,
-            label,
-            block: Block { brace_token, stmts },
-        })
+            Ok(ExprBlock {
+                attrs,
+                label,
+                block: Block { brace_token, stmts },
+            })
+        }
     }
 
     #[cfg(feature = "full")]
@@ -2538,6 +2749,7 @@
                 if input.is_empty()
                     || input.peek(Token![,])
                     || input.peek(Token![;])
+                    || input.peek(Token![.]) && !input.peek(Token![..])
                     || !allow_struct.0 && input.peek(token::Brace)
                 {
                     None
@@ -2654,7 +2866,7 @@
         }
         for part in float_repr.split('.') {
             let index = crate::parse_str(part).map_err(|err| Error::new(float.span(), err))?;
-            let base = mem::replace(e, Expr::__Nonexhaustive);
+            let base = mem::replace(e, Expr::__TestExhaustive(crate::private(())));
             *e = Expr::Field(ExprField {
                 attrs: Vec::new(),
                 base: Box::new(base),
@@ -2732,7 +2944,7 @@
             self.bracket_token.surround(tokens, |tokens| {
                 inner_attrs_to_tokens(&self.attrs, tokens);
                 self.elems.to_tokens(tokens);
-            })
+            });
         }
     }
 
@@ -2743,7 +2955,7 @@
             self.func.to_tokens(tokens);
             self.paren_token.surround(tokens, |tokens| {
                 self.args.to_tokens(tokens);
-            })
+            });
         }
     }
 
@@ -2797,7 +3009,7 @@
                 if self.elems.len() == 1 && !self.elems.trailing_punct() {
                     <Token![,]>::default().to_tokens(tokens);
                 }
-            })
+            });
         }
     }
 
@@ -3195,7 +3407,7 @@
                     Token![..](Span::call_site()).to_tokens(tokens);
                 }
                 self.rest.to_tokens(tokens);
-            })
+            });
         }
     }
 
@@ -3209,7 +3421,7 @@
                 self.expr.to_tokens(tokens);
                 self.semi_token.to_tokens(tokens);
                 self.len.to_tokens(tokens);
-            })
+            });
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/gen/visit_mut.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/gen/visit_mut.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/gen/visit_mut.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/gen/visit_mut.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,743 +34,743 @@
 pub trait VisitMut {
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_abi_mut(&mut self, i: &mut Abi) {
-        visit_abi_mut(self, i)
+        visit_abi_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_angle_bracketed_generic_arguments_mut(
         &mut self,
         i: &mut AngleBracketedGenericArguments,
     ) {
-        visit_angle_bracketed_generic_arguments_mut(self, i)
+        visit_angle_bracketed_generic_arguments_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_arm_mut(&mut self, i: &mut Arm) {
-        visit_arm_mut(self, i)
+        visit_arm_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_attr_style_mut(&mut self, i: &mut AttrStyle) {
-        visit_attr_style_mut(self, i)
+        visit_attr_style_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_attribute_mut(&mut self, i: &mut Attribute) {
-        visit_attribute_mut(self, i)
+        visit_attribute_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_bare_fn_arg_mut(&mut self, i: &mut BareFnArg) {
-        visit_bare_fn_arg_mut(self, i)
+        visit_bare_fn_arg_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_bin_op_mut(&mut self, i: &mut BinOp) {
-        visit_bin_op_mut(self, i)
+        visit_bin_op_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_binding_mut(&mut self, i: &mut Binding) {
-        visit_binding_mut(self, i)
+        visit_binding_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_block_mut(&mut self, i: &mut Block) {
-        visit_block_mut(self, i)
+        visit_block_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_bound_lifetimes_mut(&mut self, i: &mut BoundLifetimes) {
-        visit_bound_lifetimes_mut(self, i)
+        visit_bound_lifetimes_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_const_param_mut(&mut self, i: &mut ConstParam) {
-        visit_const_param_mut(self, i)
+        visit_const_param_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_constraint_mut(&mut self, i: &mut Constraint) {
-        visit_constraint_mut(self, i)
+        visit_constraint_mut(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_data_mut(&mut self, i: &mut Data) {
-        visit_data_mut(self, i)
+        visit_data_mut(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_data_enum_mut(&mut self, i: &mut DataEnum) {
-        visit_data_enum_mut(self, i)
+        visit_data_enum_mut(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_data_struct_mut(&mut self, i: &mut DataStruct) {
-        visit_data_struct_mut(self, i)
+        visit_data_struct_mut(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_data_union_mut(&mut self, i: &mut DataUnion) {
-        visit_data_union_mut(self, i)
+        visit_data_union_mut(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_derive_input_mut(&mut self, i: &mut DeriveInput) {
-        visit_derive_input_mut(self, i)
+        visit_derive_input_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_mut(&mut self, i: &mut Expr) {
-        visit_expr_mut(self, i)
+        visit_expr_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_array_mut(&mut self, i: &mut ExprArray) {
-        visit_expr_array_mut(self, i)
+        visit_expr_array_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_assign_mut(&mut self, i: &mut ExprAssign) {
-        visit_expr_assign_mut(self, i)
+        visit_expr_assign_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_assign_op_mut(&mut self, i: &mut ExprAssignOp) {
-        visit_expr_assign_op_mut(self, i)
+        visit_expr_assign_op_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_async_mut(&mut self, i: &mut ExprAsync) {
-        visit_expr_async_mut(self, i)
+        visit_expr_async_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_await_mut(&mut self, i: &mut ExprAwait) {
-        visit_expr_await_mut(self, i)
+        visit_expr_await_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_binary_mut(&mut self, i: &mut ExprBinary) {
-        visit_expr_binary_mut(self, i)
+        visit_expr_binary_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_block_mut(&mut self, i: &mut ExprBlock) {
-        visit_expr_block_mut(self, i)
+        visit_expr_block_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_box_mut(&mut self, i: &mut ExprBox) {
-        visit_expr_box_mut(self, i)
+        visit_expr_box_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_break_mut(&mut self, i: &mut ExprBreak) {
-        visit_expr_break_mut(self, i)
+        visit_expr_break_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_call_mut(&mut self, i: &mut ExprCall) {
-        visit_expr_call_mut(self, i)
+        visit_expr_call_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_cast_mut(&mut self, i: &mut ExprCast) {
-        visit_expr_cast_mut(self, i)
+        visit_expr_cast_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_closure_mut(&mut self, i: &mut ExprClosure) {
-        visit_expr_closure_mut(self, i)
+        visit_expr_closure_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_continue_mut(&mut self, i: &mut ExprContinue) {
-        visit_expr_continue_mut(self, i)
+        visit_expr_continue_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_field_mut(&mut self, i: &mut ExprField) {
-        visit_expr_field_mut(self, i)
+        visit_expr_field_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_for_loop_mut(&mut self, i: &mut ExprForLoop) {
-        visit_expr_for_loop_mut(self, i)
+        visit_expr_for_loop_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_group_mut(&mut self, i: &mut ExprGroup) {
-        visit_expr_group_mut(self, i)
+        visit_expr_group_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_if_mut(&mut self, i: &mut ExprIf) {
-        visit_expr_if_mut(self, i)
+        visit_expr_if_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_index_mut(&mut self, i: &mut ExprIndex) {
-        visit_expr_index_mut(self, i)
+        visit_expr_index_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_let_mut(&mut self, i: &mut ExprLet) {
-        visit_expr_let_mut(self, i)
+        visit_expr_let_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_lit_mut(&mut self, i: &mut ExprLit) {
-        visit_expr_lit_mut(self, i)
+        visit_expr_lit_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_loop_mut(&mut self, i: &mut ExprLoop) {
-        visit_expr_loop_mut(self, i)
+        visit_expr_loop_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_macro_mut(&mut self, i: &mut ExprMacro) {
-        visit_expr_macro_mut(self, i)
+        visit_expr_macro_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_match_mut(&mut self, i: &mut ExprMatch) {
-        visit_expr_match_mut(self, i)
+        visit_expr_match_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_method_call_mut(&mut self, i: &mut ExprMethodCall) {
-        visit_expr_method_call_mut(self, i)
+        visit_expr_method_call_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_paren_mut(&mut self, i: &mut ExprParen) {
-        visit_expr_paren_mut(self, i)
+        visit_expr_paren_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_path_mut(&mut self, i: &mut ExprPath) {
-        visit_expr_path_mut(self, i)
+        visit_expr_path_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_range_mut(&mut self, i: &mut ExprRange) {
-        visit_expr_range_mut(self, i)
+        visit_expr_range_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_reference_mut(&mut self, i: &mut ExprReference) {
-        visit_expr_reference_mut(self, i)
+        visit_expr_reference_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_repeat_mut(&mut self, i: &mut ExprRepeat) {
-        visit_expr_repeat_mut(self, i)
+        visit_expr_repeat_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_return_mut(&mut self, i: &mut ExprReturn) {
-        visit_expr_return_mut(self, i)
+        visit_expr_return_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_struct_mut(&mut self, i: &mut ExprStruct) {
-        visit_expr_struct_mut(self, i)
+        visit_expr_struct_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_try_mut(&mut self, i: &mut ExprTry) {
-        visit_expr_try_mut(self, i)
+        visit_expr_try_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_try_block_mut(&mut self, i: &mut ExprTryBlock) {
-        visit_expr_try_block_mut(self, i)
+        visit_expr_try_block_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_tuple_mut(&mut self, i: &mut ExprTuple) {
-        visit_expr_tuple_mut(self, i)
+        visit_expr_tuple_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_type_mut(&mut self, i: &mut ExprType) {
-        visit_expr_type_mut(self, i)
+        visit_expr_type_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_unary_mut(&mut self, i: &mut ExprUnary) {
-        visit_expr_unary_mut(self, i)
+        visit_expr_unary_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_unsafe_mut(&mut self, i: &mut ExprUnsafe) {
-        visit_expr_unsafe_mut(self, i)
+        visit_expr_unsafe_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_while_mut(&mut self, i: &mut ExprWhile) {
-        visit_expr_while_mut(self, i)
+        visit_expr_while_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_yield_mut(&mut self, i: &mut ExprYield) {
-        visit_expr_yield_mut(self, i)
+        visit_expr_yield_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_field_mut(&mut self, i: &mut Field) {
-        visit_field_mut(self, i)
+        visit_field_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_field_pat_mut(&mut self, i: &mut FieldPat) {
-        visit_field_pat_mut(self, i)
+        visit_field_pat_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_field_value_mut(&mut self, i: &mut FieldValue) {
-        visit_field_value_mut(self, i)
+        visit_field_value_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_fields_mut(&mut self, i: &mut Fields) {
-        visit_fields_mut(self, i)
+        visit_fields_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_fields_named_mut(&mut self, i: &mut FieldsNamed) {
-        visit_fields_named_mut(self, i)
+        visit_fields_named_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_fields_unnamed_mut(&mut self, i: &mut FieldsUnnamed) {
-        visit_fields_unnamed_mut(self, i)
+        visit_fields_unnamed_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_file_mut(&mut self, i: &mut File) {
-        visit_file_mut(self, i)
+        visit_file_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_fn_arg_mut(&mut self, i: &mut FnArg) {
-        visit_fn_arg_mut(self, i)
+        visit_fn_arg_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_mut(&mut self, i: &mut ForeignItem) {
-        visit_foreign_item_mut(self, i)
+        visit_foreign_item_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_fn_mut(&mut self, i: &mut ForeignItemFn) {
-        visit_foreign_item_fn_mut(self, i)
+        visit_foreign_item_fn_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_macro_mut(&mut self, i: &mut ForeignItemMacro) {
-        visit_foreign_item_macro_mut(self, i)
+        visit_foreign_item_macro_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_static_mut(&mut self, i: &mut ForeignItemStatic) {
-        visit_foreign_item_static_mut(self, i)
+        visit_foreign_item_static_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_type_mut(&mut self, i: &mut ForeignItemType) {
-        visit_foreign_item_type_mut(self, i)
+        visit_foreign_item_type_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_generic_argument_mut(&mut self, i: &mut GenericArgument) {
-        visit_generic_argument_mut(self, i)
+        visit_generic_argument_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_generic_method_argument_mut(&mut self, i: &mut GenericMethodArgument) {
-        visit_generic_method_argument_mut(self, i)
+        visit_generic_method_argument_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_generic_param_mut(&mut self, i: &mut GenericParam) {
-        visit_generic_param_mut(self, i)
+        visit_generic_param_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_generics_mut(&mut self, i: &mut Generics) {
-        visit_generics_mut(self, i)
+        visit_generics_mut(self, i);
     }
     fn visit_ident_mut(&mut self, i: &mut Ident) {
-        visit_ident_mut(self, i)
+        visit_ident_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_mut(&mut self, i: &mut ImplItem) {
-        visit_impl_item_mut(self, i)
+        visit_impl_item_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_const_mut(&mut self, i: &mut ImplItemConst) {
-        visit_impl_item_const_mut(self, i)
+        visit_impl_item_const_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_macro_mut(&mut self, i: &mut ImplItemMacro) {
-        visit_impl_item_macro_mut(self, i)
+        visit_impl_item_macro_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_method_mut(&mut self, i: &mut ImplItemMethod) {
-        visit_impl_item_method_mut(self, i)
+        visit_impl_item_method_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_type_mut(&mut self, i: &mut ImplItemType) {
-        visit_impl_item_type_mut(self, i)
+        visit_impl_item_type_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_index_mut(&mut self, i: &mut Index) {
-        visit_index_mut(self, i)
+        visit_index_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_mut(&mut self, i: &mut Item) {
-        visit_item_mut(self, i)
+        visit_item_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_const_mut(&mut self, i: &mut ItemConst) {
-        visit_item_const_mut(self, i)
+        visit_item_const_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_enum_mut(&mut self, i: &mut ItemEnum) {
-        visit_item_enum_mut(self, i)
+        visit_item_enum_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_extern_crate_mut(&mut self, i: &mut ItemExternCrate) {
-        visit_item_extern_crate_mut(self, i)
+        visit_item_extern_crate_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_fn_mut(&mut self, i: &mut ItemFn) {
-        visit_item_fn_mut(self, i)
+        visit_item_fn_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_foreign_mod_mut(&mut self, i: &mut ItemForeignMod) {
-        visit_item_foreign_mod_mut(self, i)
+        visit_item_foreign_mod_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_impl_mut(&mut self, i: &mut ItemImpl) {
-        visit_item_impl_mut(self, i)
+        visit_item_impl_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_macro_mut(&mut self, i: &mut ItemMacro) {
-        visit_item_macro_mut(self, i)
+        visit_item_macro_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_macro2_mut(&mut self, i: &mut ItemMacro2) {
-        visit_item_macro2_mut(self, i)
+        visit_item_macro2_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_mod_mut(&mut self, i: &mut ItemMod) {
-        visit_item_mod_mut(self, i)
+        visit_item_mod_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_static_mut(&mut self, i: &mut ItemStatic) {
-        visit_item_static_mut(self, i)
+        visit_item_static_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_struct_mut(&mut self, i: &mut ItemStruct) {
-        visit_item_struct_mut(self, i)
+        visit_item_struct_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_trait_mut(&mut self, i: &mut ItemTrait) {
-        visit_item_trait_mut(self, i)
+        visit_item_trait_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_trait_alias_mut(&mut self, i: &mut ItemTraitAlias) {
-        visit_item_trait_alias_mut(self, i)
+        visit_item_trait_alias_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_type_mut(&mut self, i: &mut ItemType) {
-        visit_item_type_mut(self, i)
+        visit_item_type_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_union_mut(&mut self, i: &mut ItemUnion) {
-        visit_item_union_mut(self, i)
+        visit_item_union_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_use_mut(&mut self, i: &mut ItemUse) {
-        visit_item_use_mut(self, i)
+        visit_item_use_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_label_mut(&mut self, i: &mut Label) {
-        visit_label_mut(self, i)
+        visit_label_mut(self, i);
     }
     fn visit_lifetime_mut(&mut self, i: &mut Lifetime) {
-        visit_lifetime_mut(self, i)
+        visit_lifetime_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_lifetime_def_mut(&mut self, i: &mut LifetimeDef) {
-        visit_lifetime_def_mut(self, i)
+        visit_lifetime_def_mut(self, i);
     }
     fn visit_lit_mut(&mut self, i: &mut Lit) {
-        visit_lit_mut(self, i)
+        visit_lit_mut(self, i);
     }
     fn visit_lit_bool_mut(&mut self, i: &mut LitBool) {
-        visit_lit_bool_mut(self, i)
+        visit_lit_bool_mut(self, i);
     }
     fn visit_lit_byte_mut(&mut self, i: &mut LitByte) {
-        visit_lit_byte_mut(self, i)
+        visit_lit_byte_mut(self, i);
     }
     fn visit_lit_byte_str_mut(&mut self, i: &mut LitByteStr) {
-        visit_lit_byte_str_mut(self, i)
+        visit_lit_byte_str_mut(self, i);
     }
     fn visit_lit_char_mut(&mut self, i: &mut LitChar) {
-        visit_lit_char_mut(self, i)
+        visit_lit_char_mut(self, i);
     }
     fn visit_lit_float_mut(&mut self, i: &mut LitFloat) {
-        visit_lit_float_mut(self, i)
+        visit_lit_float_mut(self, i);
     }
     fn visit_lit_int_mut(&mut self, i: &mut LitInt) {
-        visit_lit_int_mut(self, i)
+        visit_lit_int_mut(self, i);
     }
     fn visit_lit_str_mut(&mut self, i: &mut LitStr) {
-        visit_lit_str_mut(self, i)
+        visit_lit_str_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_local_mut(&mut self, i: &mut Local) {
-        visit_local_mut(self, i)
+        visit_local_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_macro_mut(&mut self, i: &mut Macro) {
-        visit_macro_mut(self, i)
+        visit_macro_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_macro_delimiter_mut(&mut self, i: &mut MacroDelimiter) {
-        visit_macro_delimiter_mut(self, i)
+        visit_macro_delimiter_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_member_mut(&mut self, i: &mut Member) {
-        visit_member_mut(self, i)
+        visit_member_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_meta_mut(&mut self, i: &mut Meta) {
-        visit_meta_mut(self, i)
+        visit_meta_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_meta_list_mut(&mut self, i: &mut MetaList) {
-        visit_meta_list_mut(self, i)
+        visit_meta_list_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_meta_name_value_mut(&mut self, i: &mut MetaNameValue) {
-        visit_meta_name_value_mut(self, i)
+        visit_meta_name_value_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_method_turbofish_mut(&mut self, i: &mut MethodTurbofish) {
-        visit_method_turbofish_mut(self, i)
+        visit_method_turbofish_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_nested_meta_mut(&mut self, i: &mut NestedMeta) {
-        visit_nested_meta_mut(self, i)
+        visit_nested_meta_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_parenthesized_generic_arguments_mut(&mut self, i: &mut ParenthesizedGenericArguments) {
-        visit_parenthesized_generic_arguments_mut(self, i)
+        visit_parenthesized_generic_arguments_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_mut(&mut self, i: &mut Pat) {
-        visit_pat_mut(self, i)
+        visit_pat_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_box_mut(&mut self, i: &mut PatBox) {
-        visit_pat_box_mut(self, i)
+        visit_pat_box_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_ident_mut(&mut self, i: &mut PatIdent) {
-        visit_pat_ident_mut(self, i)
+        visit_pat_ident_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_lit_mut(&mut self, i: &mut PatLit) {
-        visit_pat_lit_mut(self, i)
+        visit_pat_lit_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_macro_mut(&mut self, i: &mut PatMacro) {
-        visit_pat_macro_mut(self, i)
+        visit_pat_macro_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_or_mut(&mut self, i: &mut PatOr) {
-        visit_pat_or_mut(self, i)
+        visit_pat_or_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_path_mut(&mut self, i: &mut PatPath) {
-        visit_pat_path_mut(self, i)
+        visit_pat_path_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_range_mut(&mut self, i: &mut PatRange) {
-        visit_pat_range_mut(self, i)
+        visit_pat_range_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_reference_mut(&mut self, i: &mut PatReference) {
-        visit_pat_reference_mut(self, i)
+        visit_pat_reference_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_rest_mut(&mut self, i: &mut PatRest) {
-        visit_pat_rest_mut(self, i)
+        visit_pat_rest_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_slice_mut(&mut self, i: &mut PatSlice) {
-        visit_pat_slice_mut(self, i)
+        visit_pat_slice_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_struct_mut(&mut self, i: &mut PatStruct) {
-        visit_pat_struct_mut(self, i)
+        visit_pat_struct_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_tuple_mut(&mut self, i: &mut PatTuple) {
-        visit_pat_tuple_mut(self, i)
+        visit_pat_tuple_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_tuple_struct_mut(&mut self, i: &mut PatTupleStruct) {
-        visit_pat_tuple_struct_mut(self, i)
+        visit_pat_tuple_struct_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_type_mut(&mut self, i: &mut PatType) {
-        visit_pat_type_mut(self, i)
+        visit_pat_type_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_wild_mut(&mut self, i: &mut PatWild) {
-        visit_pat_wild_mut(self, i)
+        visit_pat_wild_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_path_mut(&mut self, i: &mut Path) {
-        visit_path_mut(self, i)
+        visit_path_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_path_arguments_mut(&mut self, i: &mut PathArguments) {
-        visit_path_arguments_mut(self, i)
+        visit_path_arguments_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_path_segment_mut(&mut self, i: &mut PathSegment) {
-        visit_path_segment_mut(self, i)
+        visit_path_segment_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_predicate_eq_mut(&mut self, i: &mut PredicateEq) {
-        visit_predicate_eq_mut(self, i)
+        visit_predicate_eq_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_predicate_lifetime_mut(&mut self, i: &mut PredicateLifetime) {
-        visit_predicate_lifetime_mut(self, i)
+        visit_predicate_lifetime_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_predicate_type_mut(&mut self, i: &mut PredicateType) {
-        visit_predicate_type_mut(self, i)
+        visit_predicate_type_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_qself_mut(&mut self, i: &mut QSelf) {
-        visit_qself_mut(self, i)
+        visit_qself_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_range_limits_mut(&mut self, i: &mut RangeLimits) {
-        visit_range_limits_mut(self, i)
+        visit_range_limits_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_receiver_mut(&mut self, i: &mut Receiver) {
-        visit_receiver_mut(self, i)
+        visit_receiver_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_return_type_mut(&mut self, i: &mut ReturnType) {
-        visit_return_type_mut(self, i)
+        visit_return_type_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_signature_mut(&mut self, i: &mut Signature) {
-        visit_signature_mut(self, i)
+        visit_signature_mut(self, i);
     }
     fn visit_span_mut(&mut self, i: &mut Span) {
-        visit_span_mut(self, i)
+        visit_span_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_stmt_mut(&mut self, i: &mut Stmt) {
-        visit_stmt_mut(self, i)
+        visit_stmt_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_trait_bound_mut(&mut self, i: &mut TraitBound) {
-        visit_trait_bound_mut(self, i)
+        visit_trait_bound_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_trait_bound_modifier_mut(&mut self, i: &mut TraitBoundModifier) {
-        visit_trait_bound_modifier_mut(self, i)
+        visit_trait_bound_modifier_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_mut(&mut self, i: &mut TraitItem) {
-        visit_trait_item_mut(self, i)
+        visit_trait_item_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_const_mut(&mut self, i: &mut TraitItemConst) {
-        visit_trait_item_const_mut(self, i)
+        visit_trait_item_const_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_macro_mut(&mut self, i: &mut TraitItemMacro) {
-        visit_trait_item_macro_mut(self, i)
+        visit_trait_item_macro_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_method_mut(&mut self, i: &mut TraitItemMethod) {
-        visit_trait_item_method_mut(self, i)
+        visit_trait_item_method_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_type_mut(&mut self, i: &mut TraitItemType) {
-        visit_trait_item_type_mut(self, i)
+        visit_trait_item_type_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_mut(&mut self, i: &mut Type) {
-        visit_type_mut(self, i)
+        visit_type_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_array_mut(&mut self, i: &mut TypeArray) {
-        visit_type_array_mut(self, i)
+        visit_type_array_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_bare_fn_mut(&mut self, i: &mut TypeBareFn) {
-        visit_type_bare_fn_mut(self, i)
+        visit_type_bare_fn_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_group_mut(&mut self, i: &mut TypeGroup) {
-        visit_type_group_mut(self, i)
+        visit_type_group_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_impl_trait_mut(&mut self, i: &mut TypeImplTrait) {
-        visit_type_impl_trait_mut(self, i)
+        visit_type_impl_trait_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_infer_mut(&mut self, i: &mut TypeInfer) {
-        visit_type_infer_mut(self, i)
+        visit_type_infer_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_macro_mut(&mut self, i: &mut TypeMacro) {
-        visit_type_macro_mut(self, i)
+        visit_type_macro_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_never_mut(&mut self, i: &mut TypeNever) {
-        visit_type_never_mut(self, i)
+        visit_type_never_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_param_mut(&mut self, i: &mut TypeParam) {
-        visit_type_param_mut(self, i)
+        visit_type_param_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_param_bound_mut(&mut self, i: &mut TypeParamBound) {
-        visit_type_param_bound_mut(self, i)
+        visit_type_param_bound_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_paren_mut(&mut self, i: &mut TypeParen) {
-        visit_type_paren_mut(self, i)
+        visit_type_paren_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_path_mut(&mut self, i: &mut TypePath) {
-        visit_type_path_mut(self, i)
+        visit_type_path_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_ptr_mut(&mut self, i: &mut TypePtr) {
-        visit_type_ptr_mut(self, i)
+        visit_type_ptr_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_reference_mut(&mut self, i: &mut TypeReference) {
-        visit_type_reference_mut(self, i)
+        visit_type_reference_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_slice_mut(&mut self, i: &mut TypeSlice) {
-        visit_type_slice_mut(self, i)
+        visit_type_slice_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_trait_object_mut(&mut self, i: &mut TypeTraitObject) {
-        visit_type_trait_object_mut(self, i)
+        visit_type_trait_object_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_tuple_mut(&mut self, i: &mut TypeTuple) {
-        visit_type_tuple_mut(self, i)
+        visit_type_tuple_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_un_op_mut(&mut self, i: &mut UnOp) {
-        visit_un_op_mut(self, i)
+        visit_un_op_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_glob_mut(&mut self, i: &mut UseGlob) {
-        visit_use_glob_mut(self, i)
+        visit_use_glob_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_group_mut(&mut self, i: &mut UseGroup) {
-        visit_use_group_mut(self, i)
+        visit_use_group_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_name_mut(&mut self, i: &mut UseName) {
-        visit_use_name_mut(self, i)
+        visit_use_name_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_path_mut(&mut self, i: &mut UsePath) {
-        visit_use_path_mut(self, i)
+        visit_use_path_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_rename_mut(&mut self, i: &mut UseRename) {
-        visit_use_rename_mut(self, i)
+        visit_use_rename_mut(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_tree_mut(&mut self, i: &mut UseTree) {
-        visit_use_tree_mut(self, i)
+        visit_use_tree_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_variadic_mut(&mut self, i: &mut Variadic) {
-        visit_variadic_mut(self, i)
+        visit_variadic_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_variant_mut(&mut self, i: &mut Variant) {
-        visit_variant_mut(self, i)
+        visit_variant_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_vis_crate_mut(&mut self, i: &mut VisCrate) {
-        visit_vis_crate_mut(self, i)
+        visit_vis_crate_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_vis_public_mut(&mut self, i: &mut VisPublic) {
-        visit_vis_public_mut(self, i)
+        visit_vis_public_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_vis_restricted_mut(&mut self, i: &mut VisRestricted) {
-        visit_vis_restricted_mut(self, i)
+        visit_vis_restricted_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_visibility_mut(&mut self, i: &mut Visibility) {
-        visit_visibility_mut(self, i)
+        visit_visibility_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_where_clause_mut(&mut self, i: &mut WhereClause) {
-        visit_where_clause_mut(self, i)
+        visit_where_clause_mut(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_where_predicate_mut(&mut self, i: &mut WherePredicate) {
-        visit_where_predicate_mut(self, i)
+        visit_where_predicate_mut(self, i);
     }
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -780,7 +780,7 @@
 {
     tokens_helper(v, &mut node.extern_token.span);
     if let Some(it) = &mut node.name {
-        v.visit_lit_str_mut(it)
+        v.visit_lit_str_mut(it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -791,7 +791,7 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.colon2_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     tokens_helper(v, &mut node.lt_token.spans);
     for el in Punctuated::pairs_mut(&mut node.args) {
@@ -809,7 +809,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_pat_mut(&mut node.pat);
     if let Some(it) = &mut node.guard {
@@ -819,7 +819,7 @@
     tokens_helper(v, &mut node.fat_arrow_token.spans);
     v.visit_expr_mut(&mut *node.body);
     if let Some(it) = &mut node.comma {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -851,7 +851,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.name {
         v.visit_ident_mut(&mut (it).0);
@@ -967,7 +967,7 @@
 {
     tokens_helper(v, &mut node.brace_token.span);
     for it in &mut node.stmts {
-        v.visit_stmt_mut(it)
+        v.visit_stmt_mut(it);
     }
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -992,17 +992,17 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.const_token.span);
     v.visit_ident_mut(&mut node.ident);
     tokens_helper(v, &mut node.colon_token.spans);
     v.visit_type_mut(&mut node.ty);
     if let Some(it) = &mut node.eq_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     if let Some(it) = &mut node.default {
-        v.visit_expr_mut(it)
+        v.visit_expr_mut(it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -1060,7 +1060,7 @@
     tokens_helper(v, &mut node.struct_token.span);
     v.visit_fields_mut(&mut node.fields);
     if let Some(it) = &mut node.semi_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "derive")]
@@ -1077,7 +1077,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     v.visit_ident_mut(&mut node.ident);
@@ -1219,7 +1219,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.bracket_token.span);
     for el in Punctuated::pairs_mut(&mut node.elems) {
@@ -1236,7 +1236,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.left);
     tokens_helper(v, &mut node.eq_token.spans);
@@ -1248,7 +1248,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.left);
     v.visit_bin_op_mut(&mut node.op);
@@ -1260,11 +1260,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.async_token.span);
     if let Some(it) = &mut node.capture {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_block_mut(&mut node.block);
 }
@@ -1274,7 +1274,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.base);
     tokens_helper(v, &mut node.dot_token.spans);
@@ -1286,7 +1286,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.left);
     v.visit_bin_op_mut(&mut node.op);
@@ -1298,10 +1298,10 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.label {
-        v.visit_label_mut(it)
+        v.visit_label_mut(it);
     };
     v.visit_block_mut(&mut node.block);
 }
@@ -1311,7 +1311,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.box_token.span);
     v.visit_expr_mut(&mut *node.expr);
@@ -1322,14 +1322,14 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.break_token.span);
     if let Some(it) = &mut node.label {
-        v.visit_lifetime_mut(it)
+        v.visit_lifetime_mut(it);
     };
     if let Some(it) = &mut node.expr {
-        v.visit_expr_mut(&mut **it)
+        v.visit_expr_mut(&mut **it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -1338,7 +1338,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.func);
     tokens_helper(v, &mut node.paren_token.span);
@@ -1356,7 +1356,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.expr);
     tokens_helper(v, &mut node.as_token.span);
@@ -1368,16 +1368,16 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.asyncness {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.movability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.capture {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     tokens_helper(v, &mut node.or1_token.spans);
     for el in Punctuated::pairs_mut(&mut node.inputs) {
@@ -1397,11 +1397,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.continue_token.span);
     if let Some(it) = &mut node.label {
-        v.visit_lifetime_mut(it)
+        v.visit_lifetime_mut(it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -1410,7 +1410,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.base);
     tokens_helper(v, &mut node.dot_token.spans);
@@ -1422,10 +1422,10 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.label {
-        v.visit_label_mut(it)
+        v.visit_label_mut(it);
     };
     tokens_helper(v, &mut node.for_token.span);
     v.visit_pat_mut(&mut node.pat);
@@ -1439,7 +1439,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.group_token.span);
     v.visit_expr_mut(&mut *node.expr);
@@ -1450,7 +1450,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.if_token.span);
     v.visit_expr_mut(&mut *node.cond);
@@ -1466,7 +1466,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.expr);
     tokens_helper(v, &mut node.bracket_token.span);
@@ -1478,7 +1478,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.let_token.span);
     v.visit_pat_mut(&mut node.pat);
@@ -1491,7 +1491,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_lit_mut(&mut node.lit);
 }
@@ -1501,10 +1501,10 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.label {
-        v.visit_label_mut(it)
+        v.visit_label_mut(it);
     };
     tokens_helper(v, &mut node.loop_token.span);
     v.visit_block_mut(&mut node.body);
@@ -1515,7 +1515,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_macro_mut(&mut node.mac);
 }
@@ -1525,13 +1525,13 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.match_token.span);
     v.visit_expr_mut(&mut *node.expr);
     tokens_helper(v, &mut node.brace_token.span);
     for it in &mut node.arms {
-        v.visit_arm_mut(it)
+        v.visit_arm_mut(it);
     }
 }
 #[cfg(feature = "full")]
@@ -1540,13 +1540,13 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.receiver);
     tokens_helper(v, &mut node.dot_token.spans);
     v.visit_ident_mut(&mut node.method);
     if let Some(it) = &mut node.turbofish {
-        v.visit_method_turbofish_mut(it)
+        v.visit_method_turbofish_mut(it);
     };
     tokens_helper(v, &mut node.paren_token.span);
     for el in Punctuated::pairs_mut(&mut node.args) {
@@ -1563,7 +1563,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.paren_token.span);
     v.visit_expr_mut(&mut *node.expr);
@@ -1574,10 +1574,10 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.qself {
-        v.visit_qself_mut(it)
+        v.visit_qself_mut(it);
     };
     v.visit_path_mut(&mut node.path);
 }
@@ -1587,14 +1587,14 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.from {
-        v.visit_expr_mut(&mut **it)
+        v.visit_expr_mut(&mut **it);
     };
     v.visit_range_limits_mut(&mut node.limits);
     if let Some(it) = &mut node.to {
-        v.visit_expr_mut(&mut **it)
+        v.visit_expr_mut(&mut **it);
     };
 }
 #[cfg(feature = "full")]
@@ -1603,11 +1603,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.and_token.spans);
     if let Some(it) = &mut node.mutability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_expr_mut(&mut *node.expr);
 }
@@ -1617,7 +1617,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.bracket_token.span);
     v.visit_expr_mut(&mut *node.expr);
@@ -1630,11 +1630,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.return_token.span);
     if let Some(it) = &mut node.expr {
-        v.visit_expr_mut(&mut **it)
+        v.visit_expr_mut(&mut **it);
     };
 }
 #[cfg(feature = "full")]
@@ -1643,7 +1643,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_path_mut(&mut node.path);
     tokens_helper(v, &mut node.brace_token.span);
@@ -1655,10 +1655,10 @@
         }
     }
     if let Some(it) = &mut node.dot2_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     if let Some(it) = &mut node.rest {
-        v.visit_expr_mut(&mut **it)
+        v.visit_expr_mut(&mut **it);
     };
 }
 #[cfg(feature = "full")]
@@ -1667,7 +1667,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.expr);
     tokens_helper(v, &mut node.question_token.spans);
@@ -1678,7 +1678,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.try_token.span);
     v.visit_block_mut(&mut node.block);
@@ -1689,7 +1689,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.paren_token.span);
     for el in Punctuated::pairs_mut(&mut node.elems) {
@@ -1706,7 +1706,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.expr);
     tokens_helper(v, &mut node.colon_token.spans);
@@ -1718,7 +1718,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_un_op_mut(&mut node.op);
     v.visit_expr_mut(&mut *node.expr);
@@ -1729,7 +1729,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.unsafe_token.span);
     v.visit_block_mut(&mut node.block);
@@ -1740,10 +1740,10 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.label {
-        v.visit_label_mut(it)
+        v.visit_label_mut(it);
     };
     tokens_helper(v, &mut node.while_token.span);
     v.visit_expr_mut(&mut *node.cond);
@@ -1755,11 +1755,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.yield_token.span);
     if let Some(it) = &mut node.expr {
-        v.visit_expr_mut(&mut **it)
+        v.visit_expr_mut(&mut **it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -1768,14 +1768,14 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     if let Some(it) = &mut node.ident {
-        v.visit_ident_mut(it)
+        v.visit_ident_mut(it);
     };
     if let Some(it) = &mut node.colon_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     v.visit_type_mut(&mut node.ty);
 }
@@ -1785,11 +1785,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_member_mut(&mut node.member);
     if let Some(it) = &mut node.colon_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     v.visit_pat_mut(&mut *node.pat);
 }
@@ -1799,11 +1799,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_member_mut(&mut node.member);
     if let Some(it) = &mut node.colon_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     v.visit_expr_mut(&mut node.expr);
 }
@@ -1857,10 +1857,10 @@
 {
     skip!(node.shebang);
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     for it in &mut node.items {
-        v.visit_item_mut(it)
+        v.visit_item_mut(it);
     }
 }
 #[cfg(feature = "full")]
@@ -1907,7 +1907,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     v.visit_signature_mut(&mut node.sig);
@@ -1919,11 +1919,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_macro_mut(&mut node.mac);
     if let Some(it) = &mut node.semi_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -1932,12 +1932,12 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.static_token.span);
     if let Some(it) = &mut node.mutability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_ident_mut(&mut node.ident);
     tokens_helper(v, &mut node.colon_token.spans);
@@ -1950,7 +1950,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.type_token.span);
@@ -2017,7 +2017,7 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.lt_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     for el in Punctuated::pairs_mut(&mut node.params) {
         let (it, p) = el.into_tuple();
@@ -2027,10 +2027,10 @@
         }
     }
     if let Some(it) = &mut node.gt_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     if let Some(it) = &mut node.where_clause {
-        v.visit_where_clause_mut(it)
+        v.visit_where_clause_mut(it);
     };
 }
 pub fn visit_ident_mut<V>(v: &mut V, node: &mut Ident)
@@ -2071,11 +2071,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     if let Some(it) = &mut node.defaultness {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     tokens_helper(v, &mut node.const_token.span);
     v.visit_ident_mut(&mut node.ident);
@@ -2091,11 +2091,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_macro_mut(&mut node.mac);
     if let Some(it) = &mut node.semi_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2104,11 +2104,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     if let Some(it) = &mut node.defaultness {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_signature_mut(&mut node.sig);
     v.visit_block_mut(&mut node.block);
@@ -2119,11 +2119,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     if let Some(it) = &mut node.defaultness {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     tokens_helper(v, &mut node.type_token.span);
     v.visit_ident_mut(&mut node.ident);
@@ -2206,7 +2206,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.const_token.span);
@@ -2223,7 +2223,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.enum_token.span);
@@ -2244,7 +2244,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.extern_token.span);
@@ -2262,7 +2262,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     v.visit_signature_mut(&mut node.sig);
@@ -2274,12 +2274,12 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_abi_mut(&mut node.abi);
     tokens_helper(v, &mut node.brace_token.span);
     for it in &mut node.items {
-        v.visit_foreign_item_mut(it)
+        v.visit_foreign_item_mut(it);
     }
 }
 #[cfg(feature = "full")]
@@ -2288,19 +2288,19 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.defaultness {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.unsafety {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     tokens_helper(v, &mut node.impl_token.span);
     v.visit_generics_mut(&mut node.generics);
     if let Some(it) = &mut node.trait_ {
         if let Some(it) = &mut (it).0 {
-            tokens_helper(v, &mut it.spans)
+            tokens_helper(v, &mut it.spans);
         };
         v.visit_path_mut(&mut (it).1);
         tokens_helper(v, &mut (it).2.span);
@@ -2308,7 +2308,7 @@
     v.visit_type_mut(&mut *node.self_ty);
     tokens_helper(v, &mut node.brace_token.span);
     for it in &mut node.items {
-        v.visit_impl_item_mut(it)
+        v.visit_impl_item_mut(it);
     }
 }
 #[cfg(feature = "full")]
@@ -2317,14 +2317,14 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.ident {
-        v.visit_ident_mut(it)
+        v.visit_ident_mut(it);
     };
     v.visit_macro_mut(&mut node.mac);
     if let Some(it) = &mut node.semi_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2333,7 +2333,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.macro_token.span);
@@ -2346,7 +2346,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.mod_token.span);
@@ -2354,11 +2354,11 @@
     if let Some(it) = &mut node.content {
         tokens_helper(v, &mut (it).0.span);
         for it in &mut (it).1 {
-            v.visit_item_mut(it)
+            v.visit_item_mut(it);
         }
     };
     if let Some(it) = &mut node.semi {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2367,12 +2367,12 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.static_token.span);
     if let Some(it) = &mut node.mutability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_ident_mut(&mut node.ident);
     tokens_helper(v, &mut node.colon_token.spans);
@@ -2387,7 +2387,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.struct_token.span);
@@ -2395,7 +2395,7 @@
     v.visit_generics_mut(&mut node.generics);
     v.visit_fields_mut(&mut node.fields);
     if let Some(it) = &mut node.semi_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2404,20 +2404,20 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     if let Some(it) = &mut node.unsafety {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.auto_token {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     tokens_helper(v, &mut node.trait_token.span);
     v.visit_ident_mut(&mut node.ident);
     v.visit_generics_mut(&mut node.generics);
     if let Some(it) = &mut node.colon_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     for el in Punctuated::pairs_mut(&mut node.supertraits) {
         let (it, p) = el.into_tuple();
@@ -2428,7 +2428,7 @@
     }
     tokens_helper(v, &mut node.brace_token.span);
     for it in &mut node.items {
-        v.visit_trait_item_mut(it)
+        v.visit_trait_item_mut(it);
     }
 }
 #[cfg(feature = "full")]
@@ -2437,7 +2437,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.trait_token.span);
@@ -2459,7 +2459,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.type_token.span);
@@ -2475,7 +2475,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.union_token.span);
@@ -2489,12 +2489,12 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_visibility_mut(&mut node.vis);
     tokens_helper(v, &mut node.use_token.span);
     if let Some(it) = &mut node.leading_colon {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     v.visit_use_tree_mut(&mut node.tree);
     tokens_helper(v, &mut node.semi_token.spans);
@@ -2520,11 +2520,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_lifetime_mut(&mut node.lifetime);
     if let Some(it) = &mut node.colon_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     for el in Punctuated::pairs_mut(&mut node.bounds) {
         let (it, p) = el.into_tuple();
@@ -2608,7 +2608,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.let_token.span);
     v.visit_pat_mut(&mut node.pat);
@@ -2810,7 +2810,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.box_token.span);
     v.visit_pat_mut(&mut *node.pat);
@@ -2821,13 +2821,13 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.by_ref {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.mutability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_ident_mut(&mut node.ident);
     if let Some(it) = &mut node.subpat {
@@ -2841,7 +2841,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.expr);
 }
@@ -2851,7 +2851,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_macro_mut(&mut node.mac);
 }
@@ -2861,10 +2861,10 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.leading_vert {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     for el in Punctuated::pairs_mut(&mut node.cases) {
         let (it, p) = el.into_tuple();
@@ -2880,10 +2880,10 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.qself {
-        v.visit_qself_mut(it)
+        v.visit_qself_mut(it);
     };
     v.visit_path_mut(&mut node.path);
 }
@@ -2893,7 +2893,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_expr_mut(&mut *node.lo);
     v.visit_range_limits_mut(&mut node.limits);
@@ -2905,11 +2905,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.and_token.spans);
     if let Some(it) = &mut node.mutability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_pat_mut(&mut *node.pat);
 }
@@ -2919,7 +2919,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.dot2_token.spans);
 }
@@ -2929,7 +2929,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.bracket_token.span);
     for el in Punctuated::pairs_mut(&mut node.elems) {
@@ -2946,7 +2946,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_path_mut(&mut node.path);
     tokens_helper(v, &mut node.brace_token.span);
@@ -2958,7 +2958,7 @@
         }
     }
     if let Some(it) = &mut node.dot2_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2967,7 +2967,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.paren_token.span);
     for el in Punctuated::pairs_mut(&mut node.elems) {
@@ -2984,7 +2984,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_path_mut(&mut node.path);
     v.visit_pat_tuple_mut(&mut node.pat);
@@ -2995,7 +2995,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_pat_mut(&mut *node.pat);
     tokens_helper(v, &mut node.colon_token.spans);
@@ -3007,7 +3007,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.underscore_token.spans);
 }
@@ -3017,7 +3017,7 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.leading_colon {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     for el in Punctuated::pairs_mut(&mut node.segments) {
         let (it, p) = el.into_tuple();
@@ -3080,7 +3080,7 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.lifetimes {
-        v.visit_bound_lifetimes_mut(it)
+        v.visit_bound_lifetimes_mut(it);
     };
     v.visit_type_mut(&mut node.bounded_ty);
     tokens_helper(v, &mut node.colon_token.spans);
@@ -3101,7 +3101,7 @@
     v.visit_type_mut(&mut *node.ty);
     skip!(node.position);
     if let Some(it) = &mut node.as_token {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     tokens_helper(v, &mut node.gt_token.spans);
 }
@@ -3125,16 +3125,16 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     if let Some(it) = &mut node.reference {
         tokens_helper(v, &mut (it).0.spans);
         if let Some(it) = &mut (it).1 {
-            v.visit_lifetime_mut(it)
+            v.visit_lifetime_mut(it);
         };
     };
     if let Some(it) = &mut node.mutability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     tokens_helper(v, &mut node.self_token.span);
 }
@@ -3157,16 +3157,16 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.constness {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.asyncness {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.unsafety {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.abi {
-        v.visit_abi_mut(it)
+        v.visit_abi_mut(it);
     };
     tokens_helper(v, &mut node.fn_token.span);
     v.visit_ident_mut(&mut node.ident);
@@ -3180,7 +3180,7 @@
         }
     }
     if let Some(it) = &mut node.variadic {
-        v.visit_variadic_mut(it)
+        v.visit_variadic_mut(it);
     };
     v.visit_return_type_mut(&mut node.output);
 }
@@ -3216,11 +3216,11 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.paren_token {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_trait_bound_modifier_mut(&mut node.modifier);
     if let Some(it) = &mut node.lifetimes {
-        v.visit_bound_lifetimes_mut(it)
+        v.visit_bound_lifetimes_mut(it);
     };
     v.visit_path_mut(&mut node.path);
 }
@@ -3266,7 +3266,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.const_token.span);
     v.visit_ident_mut(&mut node.ident);
@@ -3284,11 +3284,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_macro_mut(&mut node.mac);
     if let Some(it) = &mut node.semi_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -3297,14 +3297,14 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_signature_mut(&mut node.sig);
     if let Some(it) = &mut node.default {
-        v.visit_block_mut(it)
+        v.visit_block_mut(it);
     };
     if let Some(it) = &mut node.semi_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -3313,13 +3313,13 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.type_token.span);
     v.visit_ident_mut(&mut node.ident);
     v.visit_generics_mut(&mut node.generics);
     if let Some(it) = &mut node.colon_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     for el in Punctuated::pairs_mut(&mut node.bounds) {
         let (it, p) = el.into_tuple();
@@ -3404,13 +3404,13 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.lifetimes {
-        v.visit_bound_lifetimes_mut(it)
+        v.visit_bound_lifetimes_mut(it);
     };
     if let Some(it) = &mut node.unsafety {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.abi {
-        v.visit_abi_mut(it)
+        v.visit_abi_mut(it);
     };
     tokens_helper(v, &mut node.fn_token.span);
     tokens_helper(v, &mut node.paren_token.span);
@@ -3422,7 +3422,7 @@
         }
     }
     if let Some(it) = &mut node.variadic {
-        v.visit_variadic_mut(it)
+        v.visit_variadic_mut(it);
     };
     v.visit_return_type_mut(&mut node.output);
 }
@@ -3475,11 +3475,11 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_ident_mut(&mut node.ident);
     if let Some(it) = &mut node.colon_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     for el in Punctuated::pairs_mut(&mut node.bounds) {
         let (it, p) = el.into_tuple();
@@ -3489,10 +3489,10 @@
         }
     }
     if let Some(it) = &mut node.eq_token {
-        tokens_helper(v, &mut it.spans)
+        tokens_helper(v, &mut it.spans);
     };
     if let Some(it) = &mut node.default {
-        v.visit_type_mut(it)
+        v.visit_type_mut(it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -3523,7 +3523,7 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.qself {
-        v.visit_qself_mut(it)
+        v.visit_qself_mut(it);
     };
     v.visit_path_mut(&mut node.path);
 }
@@ -3534,10 +3534,10 @@
 {
     tokens_helper(v, &mut node.star_token.spans);
     if let Some(it) = &mut node.const_token {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     if let Some(it) = &mut node.mutability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_type_mut(&mut *node.elem);
 }
@@ -3548,10 +3548,10 @@
 {
     tokens_helper(v, &mut node.and_token.spans);
     if let Some(it) = &mut node.lifetime {
-        v.visit_lifetime_mut(it)
+        v.visit_lifetime_mut(it);
     };
     if let Some(it) = &mut node.mutability {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_type_mut(&mut *node.elem);
 }
@@ -3569,7 +3569,7 @@
     V: VisitMut + ?Sized,
 {
     if let Some(it) = &mut node.dyn_token {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     for el in Punctuated::pairs_mut(&mut node.bounds) {
         let (it, p) = el.into_tuple();
@@ -3685,7 +3685,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     tokens_helper(v, &mut node.dots.spans);
 }
@@ -3695,7 +3695,7 @@
     V: VisitMut + ?Sized,
 {
     for it in &mut node.attrs {
-        v.visit_attribute_mut(it)
+        v.visit_attribute_mut(it);
     }
     v.visit_ident_mut(&mut node.ident);
     v.visit_fields_mut(&mut node.fields);
@@ -3726,7 +3726,7 @@
     tokens_helper(v, &mut node.pub_token.span);
     tokens_helper(v, &mut node.paren_token.span);
     if let Some(it) = &mut node.in_token {
-        tokens_helper(v, &mut it.span)
+        tokens_helper(v, &mut it.span);
     };
     v.visit_path_mut(&mut *node.path);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/gen/visit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/gen/visit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/gen/visit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/gen/visit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,740 +33,740 @@
 pub trait Visit<'ast> {
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_abi(&mut self, i: &'ast Abi) {
-        visit_abi(self, i)
+        visit_abi(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_angle_bracketed_generic_arguments(&mut self, i: &'ast AngleBracketedGenericArguments) {
-        visit_angle_bracketed_generic_arguments(self, i)
+        visit_angle_bracketed_generic_arguments(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_arm(&mut self, i: &'ast Arm) {
-        visit_arm(self, i)
+        visit_arm(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_attr_style(&mut self, i: &'ast AttrStyle) {
-        visit_attr_style(self, i)
+        visit_attr_style(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_attribute(&mut self, i: &'ast Attribute) {
-        visit_attribute(self, i)
+        visit_attribute(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_bare_fn_arg(&mut self, i: &'ast BareFnArg) {
-        visit_bare_fn_arg(self, i)
+        visit_bare_fn_arg(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_bin_op(&mut self, i: &'ast BinOp) {
-        visit_bin_op(self, i)
+        visit_bin_op(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_binding(&mut self, i: &'ast Binding) {
-        visit_binding(self, i)
+        visit_binding(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_block(&mut self, i: &'ast Block) {
-        visit_block(self, i)
+        visit_block(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_bound_lifetimes(&mut self, i: &'ast BoundLifetimes) {
-        visit_bound_lifetimes(self, i)
+        visit_bound_lifetimes(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_const_param(&mut self, i: &'ast ConstParam) {
-        visit_const_param(self, i)
+        visit_const_param(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_constraint(&mut self, i: &'ast Constraint) {
-        visit_constraint(self, i)
+        visit_constraint(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_data(&mut self, i: &'ast Data) {
-        visit_data(self, i)
+        visit_data(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_data_enum(&mut self, i: &'ast DataEnum) {
-        visit_data_enum(self, i)
+        visit_data_enum(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_data_struct(&mut self, i: &'ast DataStruct) {
-        visit_data_struct(self, i)
+        visit_data_struct(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_data_union(&mut self, i: &'ast DataUnion) {
-        visit_data_union(self, i)
+        visit_data_union(self, i);
     }
     #[cfg(feature = "derive")]
     fn visit_derive_input(&mut self, i: &'ast DeriveInput) {
-        visit_derive_input(self, i)
+        visit_derive_input(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr(&mut self, i: &'ast Expr) {
-        visit_expr(self, i)
+        visit_expr(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_array(&mut self, i: &'ast ExprArray) {
-        visit_expr_array(self, i)
+        visit_expr_array(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_assign(&mut self, i: &'ast ExprAssign) {
-        visit_expr_assign(self, i)
+        visit_expr_assign(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_assign_op(&mut self, i: &'ast ExprAssignOp) {
-        visit_expr_assign_op(self, i)
+        visit_expr_assign_op(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_async(&mut self, i: &'ast ExprAsync) {
-        visit_expr_async(self, i)
+        visit_expr_async(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_await(&mut self, i: &'ast ExprAwait) {
-        visit_expr_await(self, i)
+        visit_expr_await(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_binary(&mut self, i: &'ast ExprBinary) {
-        visit_expr_binary(self, i)
+        visit_expr_binary(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_block(&mut self, i: &'ast ExprBlock) {
-        visit_expr_block(self, i)
+        visit_expr_block(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_box(&mut self, i: &'ast ExprBox) {
-        visit_expr_box(self, i)
+        visit_expr_box(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_break(&mut self, i: &'ast ExprBreak) {
-        visit_expr_break(self, i)
+        visit_expr_break(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_call(&mut self, i: &'ast ExprCall) {
-        visit_expr_call(self, i)
+        visit_expr_call(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_cast(&mut self, i: &'ast ExprCast) {
-        visit_expr_cast(self, i)
+        visit_expr_cast(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_closure(&mut self, i: &'ast ExprClosure) {
-        visit_expr_closure(self, i)
+        visit_expr_closure(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_continue(&mut self, i: &'ast ExprContinue) {
-        visit_expr_continue(self, i)
+        visit_expr_continue(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_field(&mut self, i: &'ast ExprField) {
-        visit_expr_field(self, i)
+        visit_expr_field(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_for_loop(&mut self, i: &'ast ExprForLoop) {
-        visit_expr_for_loop(self, i)
+        visit_expr_for_loop(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_group(&mut self, i: &'ast ExprGroup) {
-        visit_expr_group(self, i)
+        visit_expr_group(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_if(&mut self, i: &'ast ExprIf) {
-        visit_expr_if(self, i)
+        visit_expr_if(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_index(&mut self, i: &'ast ExprIndex) {
-        visit_expr_index(self, i)
+        visit_expr_index(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_let(&mut self, i: &'ast ExprLet) {
-        visit_expr_let(self, i)
+        visit_expr_let(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_lit(&mut self, i: &'ast ExprLit) {
-        visit_expr_lit(self, i)
+        visit_expr_lit(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_loop(&mut self, i: &'ast ExprLoop) {
-        visit_expr_loop(self, i)
+        visit_expr_loop(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_macro(&mut self, i: &'ast ExprMacro) {
-        visit_expr_macro(self, i)
+        visit_expr_macro(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_match(&mut self, i: &'ast ExprMatch) {
-        visit_expr_match(self, i)
+        visit_expr_match(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_method_call(&mut self, i: &'ast ExprMethodCall) {
-        visit_expr_method_call(self, i)
+        visit_expr_method_call(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_paren(&mut self, i: &'ast ExprParen) {
-        visit_expr_paren(self, i)
+        visit_expr_paren(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_path(&mut self, i: &'ast ExprPath) {
-        visit_expr_path(self, i)
+        visit_expr_path(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_range(&mut self, i: &'ast ExprRange) {
-        visit_expr_range(self, i)
+        visit_expr_range(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_reference(&mut self, i: &'ast ExprReference) {
-        visit_expr_reference(self, i)
+        visit_expr_reference(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_repeat(&mut self, i: &'ast ExprRepeat) {
-        visit_expr_repeat(self, i)
+        visit_expr_repeat(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_return(&mut self, i: &'ast ExprReturn) {
-        visit_expr_return(self, i)
+        visit_expr_return(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_struct(&mut self, i: &'ast ExprStruct) {
-        visit_expr_struct(self, i)
+        visit_expr_struct(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_try(&mut self, i: &'ast ExprTry) {
-        visit_expr_try(self, i)
+        visit_expr_try(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_try_block(&mut self, i: &'ast ExprTryBlock) {
-        visit_expr_try_block(self, i)
+        visit_expr_try_block(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_tuple(&mut self, i: &'ast ExprTuple) {
-        visit_expr_tuple(self, i)
+        visit_expr_tuple(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_type(&mut self, i: &'ast ExprType) {
-        visit_expr_type(self, i)
+        visit_expr_type(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_expr_unary(&mut self, i: &'ast ExprUnary) {
-        visit_expr_unary(self, i)
+        visit_expr_unary(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_unsafe(&mut self, i: &'ast ExprUnsafe) {
-        visit_expr_unsafe(self, i)
+        visit_expr_unsafe(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_while(&mut self, i: &'ast ExprWhile) {
-        visit_expr_while(self, i)
+        visit_expr_while(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_expr_yield(&mut self, i: &'ast ExprYield) {
-        visit_expr_yield(self, i)
+        visit_expr_yield(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_field(&mut self, i: &'ast Field) {
-        visit_field(self, i)
+        visit_field(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_field_pat(&mut self, i: &'ast FieldPat) {
-        visit_field_pat(self, i)
+        visit_field_pat(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_field_value(&mut self, i: &'ast FieldValue) {
-        visit_field_value(self, i)
+        visit_field_value(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_fields(&mut self, i: &'ast Fields) {
-        visit_fields(self, i)
+        visit_fields(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_fields_named(&mut self, i: &'ast FieldsNamed) {
-        visit_fields_named(self, i)
+        visit_fields_named(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_fields_unnamed(&mut self, i: &'ast FieldsUnnamed) {
-        visit_fields_unnamed(self, i)
+        visit_fields_unnamed(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_file(&mut self, i: &'ast File) {
-        visit_file(self, i)
+        visit_file(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_fn_arg(&mut self, i: &'ast FnArg) {
-        visit_fn_arg(self, i)
+        visit_fn_arg(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item(&mut self, i: &'ast ForeignItem) {
-        visit_foreign_item(self, i)
+        visit_foreign_item(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_fn(&mut self, i: &'ast ForeignItemFn) {
-        visit_foreign_item_fn(self, i)
+        visit_foreign_item_fn(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_macro(&mut self, i: &'ast ForeignItemMacro) {
-        visit_foreign_item_macro(self, i)
+        visit_foreign_item_macro(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_static(&mut self, i: &'ast ForeignItemStatic) {
-        visit_foreign_item_static(self, i)
+        visit_foreign_item_static(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_foreign_item_type(&mut self, i: &'ast ForeignItemType) {
-        visit_foreign_item_type(self, i)
+        visit_foreign_item_type(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_generic_argument(&mut self, i: &'ast GenericArgument) {
-        visit_generic_argument(self, i)
+        visit_generic_argument(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_generic_method_argument(&mut self, i: &'ast GenericMethodArgument) {
-        visit_generic_method_argument(self, i)
+        visit_generic_method_argument(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_generic_param(&mut self, i: &'ast GenericParam) {
-        visit_generic_param(self, i)
+        visit_generic_param(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_generics(&mut self, i: &'ast Generics) {
-        visit_generics(self, i)
+        visit_generics(self, i);
     }
     fn visit_ident(&mut self, i: &'ast Ident) {
-        visit_ident(self, i)
+        visit_ident(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item(&mut self, i: &'ast ImplItem) {
-        visit_impl_item(self, i)
+        visit_impl_item(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_const(&mut self, i: &'ast ImplItemConst) {
-        visit_impl_item_const(self, i)
+        visit_impl_item_const(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_macro(&mut self, i: &'ast ImplItemMacro) {
-        visit_impl_item_macro(self, i)
+        visit_impl_item_macro(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_method(&mut self, i: &'ast ImplItemMethod) {
-        visit_impl_item_method(self, i)
+        visit_impl_item_method(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_impl_item_type(&mut self, i: &'ast ImplItemType) {
-        visit_impl_item_type(self, i)
+        visit_impl_item_type(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_index(&mut self, i: &'ast Index) {
-        visit_index(self, i)
+        visit_index(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item(&mut self, i: &'ast Item) {
-        visit_item(self, i)
+        visit_item(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_const(&mut self, i: &'ast ItemConst) {
-        visit_item_const(self, i)
+        visit_item_const(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_enum(&mut self, i: &'ast ItemEnum) {
-        visit_item_enum(self, i)
+        visit_item_enum(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_extern_crate(&mut self, i: &'ast ItemExternCrate) {
-        visit_item_extern_crate(self, i)
+        visit_item_extern_crate(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_fn(&mut self, i: &'ast ItemFn) {
-        visit_item_fn(self, i)
+        visit_item_fn(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_foreign_mod(&mut self, i: &'ast ItemForeignMod) {
-        visit_item_foreign_mod(self, i)
+        visit_item_foreign_mod(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_impl(&mut self, i: &'ast ItemImpl) {
-        visit_item_impl(self, i)
+        visit_item_impl(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_macro(&mut self, i: &'ast ItemMacro) {
-        visit_item_macro(self, i)
+        visit_item_macro(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_macro2(&mut self, i: &'ast ItemMacro2) {
-        visit_item_macro2(self, i)
+        visit_item_macro2(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_mod(&mut self, i: &'ast ItemMod) {
-        visit_item_mod(self, i)
+        visit_item_mod(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_static(&mut self, i: &'ast ItemStatic) {
-        visit_item_static(self, i)
+        visit_item_static(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_struct(&mut self, i: &'ast ItemStruct) {
-        visit_item_struct(self, i)
+        visit_item_struct(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_trait(&mut self, i: &'ast ItemTrait) {
-        visit_item_trait(self, i)
+        visit_item_trait(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_trait_alias(&mut self, i: &'ast ItemTraitAlias) {
-        visit_item_trait_alias(self, i)
+        visit_item_trait_alias(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_type(&mut self, i: &'ast ItemType) {
-        visit_item_type(self, i)
+        visit_item_type(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_union(&mut self, i: &'ast ItemUnion) {
-        visit_item_union(self, i)
+        visit_item_union(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_item_use(&mut self, i: &'ast ItemUse) {
-        visit_item_use(self, i)
+        visit_item_use(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_label(&mut self, i: &'ast Label) {
-        visit_label(self, i)
+        visit_label(self, i);
     }
     fn visit_lifetime(&mut self, i: &'ast Lifetime) {
-        visit_lifetime(self, i)
+        visit_lifetime(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_lifetime_def(&mut self, i: &'ast LifetimeDef) {
-        visit_lifetime_def(self, i)
+        visit_lifetime_def(self, i);
     }
     fn visit_lit(&mut self, i: &'ast Lit) {
-        visit_lit(self, i)
+        visit_lit(self, i);
     }
     fn visit_lit_bool(&mut self, i: &'ast LitBool) {
-        visit_lit_bool(self, i)
+        visit_lit_bool(self, i);
     }
     fn visit_lit_byte(&mut self, i: &'ast LitByte) {
-        visit_lit_byte(self, i)
+        visit_lit_byte(self, i);
     }
     fn visit_lit_byte_str(&mut self, i: &'ast LitByteStr) {
-        visit_lit_byte_str(self, i)
+        visit_lit_byte_str(self, i);
     }
     fn visit_lit_char(&mut self, i: &'ast LitChar) {
-        visit_lit_char(self, i)
+        visit_lit_char(self, i);
     }
     fn visit_lit_float(&mut self, i: &'ast LitFloat) {
-        visit_lit_float(self, i)
+        visit_lit_float(self, i);
     }
     fn visit_lit_int(&mut self, i: &'ast LitInt) {
-        visit_lit_int(self, i)
+        visit_lit_int(self, i);
     }
     fn visit_lit_str(&mut self, i: &'ast LitStr) {
-        visit_lit_str(self, i)
+        visit_lit_str(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_local(&mut self, i: &'ast Local) {
-        visit_local(self, i)
+        visit_local(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_macro(&mut self, i: &'ast Macro) {
-        visit_macro(self, i)
+        visit_macro(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_macro_delimiter(&mut self, i: &'ast MacroDelimiter) {
-        visit_macro_delimiter(self, i)
+        visit_macro_delimiter(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_member(&mut self, i: &'ast Member) {
-        visit_member(self, i)
+        visit_member(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_meta(&mut self, i: &'ast Meta) {
-        visit_meta(self, i)
+        visit_meta(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_meta_list(&mut self, i: &'ast MetaList) {
-        visit_meta_list(self, i)
+        visit_meta_list(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_meta_name_value(&mut self, i: &'ast MetaNameValue) {
-        visit_meta_name_value(self, i)
+        visit_meta_name_value(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_method_turbofish(&mut self, i: &'ast MethodTurbofish) {
-        visit_method_turbofish(self, i)
+        visit_method_turbofish(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_nested_meta(&mut self, i: &'ast NestedMeta) {
-        visit_nested_meta(self, i)
+        visit_nested_meta(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_parenthesized_generic_arguments(&mut self, i: &'ast ParenthesizedGenericArguments) {
-        visit_parenthesized_generic_arguments(self, i)
+        visit_parenthesized_generic_arguments(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat(&mut self, i: &'ast Pat) {
-        visit_pat(self, i)
+        visit_pat(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_box(&mut self, i: &'ast PatBox) {
-        visit_pat_box(self, i)
+        visit_pat_box(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_ident(&mut self, i: &'ast PatIdent) {
-        visit_pat_ident(self, i)
+        visit_pat_ident(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_lit(&mut self, i: &'ast PatLit) {
-        visit_pat_lit(self, i)
+        visit_pat_lit(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_macro(&mut self, i: &'ast PatMacro) {
-        visit_pat_macro(self, i)
+        visit_pat_macro(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_or(&mut self, i: &'ast PatOr) {
-        visit_pat_or(self, i)
+        visit_pat_or(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_path(&mut self, i: &'ast PatPath) {
-        visit_pat_path(self, i)
+        visit_pat_path(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_range(&mut self, i: &'ast PatRange) {
-        visit_pat_range(self, i)
+        visit_pat_range(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_reference(&mut self, i: &'ast PatReference) {
-        visit_pat_reference(self, i)
+        visit_pat_reference(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_rest(&mut self, i: &'ast PatRest) {
-        visit_pat_rest(self, i)
+        visit_pat_rest(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_slice(&mut self, i: &'ast PatSlice) {
-        visit_pat_slice(self, i)
+        visit_pat_slice(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_struct(&mut self, i: &'ast PatStruct) {
-        visit_pat_struct(self, i)
+        visit_pat_struct(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_tuple(&mut self, i: &'ast PatTuple) {
-        visit_pat_tuple(self, i)
+        visit_pat_tuple(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_tuple_struct(&mut self, i: &'ast PatTupleStruct) {
-        visit_pat_tuple_struct(self, i)
+        visit_pat_tuple_struct(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_type(&mut self, i: &'ast PatType) {
-        visit_pat_type(self, i)
+        visit_pat_type(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_pat_wild(&mut self, i: &'ast PatWild) {
-        visit_pat_wild(self, i)
+        visit_pat_wild(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_path(&mut self, i: &'ast Path) {
-        visit_path(self, i)
+        visit_path(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_path_arguments(&mut self, i: &'ast PathArguments) {
-        visit_path_arguments(self, i)
+        visit_path_arguments(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_path_segment(&mut self, i: &'ast PathSegment) {
-        visit_path_segment(self, i)
+        visit_path_segment(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_predicate_eq(&mut self, i: &'ast PredicateEq) {
-        visit_predicate_eq(self, i)
+        visit_predicate_eq(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_predicate_lifetime(&mut self, i: &'ast PredicateLifetime) {
-        visit_predicate_lifetime(self, i)
+        visit_predicate_lifetime(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_predicate_type(&mut self, i: &'ast PredicateType) {
-        visit_predicate_type(self, i)
+        visit_predicate_type(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_qself(&mut self, i: &'ast QSelf) {
-        visit_qself(self, i)
+        visit_qself(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_range_limits(&mut self, i: &'ast RangeLimits) {
-        visit_range_limits(self, i)
+        visit_range_limits(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_receiver(&mut self, i: &'ast Receiver) {
-        visit_receiver(self, i)
+        visit_receiver(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_return_type(&mut self, i: &'ast ReturnType) {
-        visit_return_type(self, i)
+        visit_return_type(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_signature(&mut self, i: &'ast Signature) {
-        visit_signature(self, i)
+        visit_signature(self, i);
     }
     fn visit_span(&mut self, i: &Span) {
-        visit_span(self, i)
+        visit_span(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_stmt(&mut self, i: &'ast Stmt) {
-        visit_stmt(self, i)
+        visit_stmt(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_trait_bound(&mut self, i: &'ast TraitBound) {
-        visit_trait_bound(self, i)
+        visit_trait_bound(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_trait_bound_modifier(&mut self, i: &'ast TraitBoundModifier) {
-        visit_trait_bound_modifier(self, i)
+        visit_trait_bound_modifier(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item(&mut self, i: &'ast TraitItem) {
-        visit_trait_item(self, i)
+        visit_trait_item(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_const(&mut self, i: &'ast TraitItemConst) {
-        visit_trait_item_const(self, i)
+        visit_trait_item_const(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_macro(&mut self, i: &'ast TraitItemMacro) {
-        visit_trait_item_macro(self, i)
+        visit_trait_item_macro(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_method(&mut self, i: &'ast TraitItemMethod) {
-        visit_trait_item_method(self, i)
+        visit_trait_item_method(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_trait_item_type(&mut self, i: &'ast TraitItemType) {
-        visit_trait_item_type(self, i)
+        visit_trait_item_type(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type(&mut self, i: &'ast Type) {
-        visit_type(self, i)
+        visit_type(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_array(&mut self, i: &'ast TypeArray) {
-        visit_type_array(self, i)
+        visit_type_array(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_bare_fn(&mut self, i: &'ast TypeBareFn) {
-        visit_type_bare_fn(self, i)
+        visit_type_bare_fn(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_group(&mut self, i: &'ast TypeGroup) {
-        visit_type_group(self, i)
+        visit_type_group(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_impl_trait(&mut self, i: &'ast TypeImplTrait) {
-        visit_type_impl_trait(self, i)
+        visit_type_impl_trait(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_infer(&mut self, i: &'ast TypeInfer) {
-        visit_type_infer(self, i)
+        visit_type_infer(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_macro(&mut self, i: &'ast TypeMacro) {
-        visit_type_macro(self, i)
+        visit_type_macro(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_never(&mut self, i: &'ast TypeNever) {
-        visit_type_never(self, i)
+        visit_type_never(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_param(&mut self, i: &'ast TypeParam) {
-        visit_type_param(self, i)
+        visit_type_param(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_param_bound(&mut self, i: &'ast TypeParamBound) {
-        visit_type_param_bound(self, i)
+        visit_type_param_bound(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_paren(&mut self, i: &'ast TypeParen) {
-        visit_type_paren(self, i)
+        visit_type_paren(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_path(&mut self, i: &'ast TypePath) {
-        visit_type_path(self, i)
+        visit_type_path(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_ptr(&mut self, i: &'ast TypePtr) {
-        visit_type_ptr(self, i)
+        visit_type_ptr(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_reference(&mut self, i: &'ast TypeReference) {
-        visit_type_reference(self, i)
+        visit_type_reference(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_slice(&mut self, i: &'ast TypeSlice) {
-        visit_type_slice(self, i)
+        visit_type_slice(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_trait_object(&mut self, i: &'ast TypeTraitObject) {
-        visit_type_trait_object(self, i)
+        visit_type_trait_object(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_type_tuple(&mut self, i: &'ast TypeTuple) {
-        visit_type_tuple(self, i)
+        visit_type_tuple(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_un_op(&mut self, i: &'ast UnOp) {
-        visit_un_op(self, i)
+        visit_un_op(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_glob(&mut self, i: &'ast UseGlob) {
-        visit_use_glob(self, i)
+        visit_use_glob(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_group(&mut self, i: &'ast UseGroup) {
-        visit_use_group(self, i)
+        visit_use_group(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_name(&mut self, i: &'ast UseName) {
-        visit_use_name(self, i)
+        visit_use_name(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_path(&mut self, i: &'ast UsePath) {
-        visit_use_path(self, i)
+        visit_use_path(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_rename(&mut self, i: &'ast UseRename) {
-        visit_use_rename(self, i)
+        visit_use_rename(self, i);
     }
     #[cfg(feature = "full")]
     fn visit_use_tree(&mut self, i: &'ast UseTree) {
-        visit_use_tree(self, i)
+        visit_use_tree(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_variadic(&mut self, i: &'ast Variadic) {
-        visit_variadic(self, i)
+        visit_variadic(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_variant(&mut self, i: &'ast Variant) {
-        visit_variant(self, i)
+        visit_variant(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_vis_crate(&mut self, i: &'ast VisCrate) {
-        visit_vis_crate(self, i)
+        visit_vis_crate(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_vis_public(&mut self, i: &'ast VisPublic) {
-        visit_vis_public(self, i)
+        visit_vis_public(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_vis_restricted(&mut self, i: &'ast VisRestricted) {
-        visit_vis_restricted(self, i)
+        visit_vis_restricted(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_visibility(&mut self, i: &'ast Visibility) {
-        visit_visibility(self, i)
+        visit_visibility(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_where_clause(&mut self, i: &'ast WhereClause) {
-        visit_where_clause(self, i)
+        visit_where_clause(self, i);
     }
     #[cfg(any(feature = "derive", feature = "full"))]
     fn visit_where_predicate(&mut self, i: &'ast WherePredicate) {
-        visit_where_predicate(self, i)
+        visit_where_predicate(self, i);
     }
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -776,7 +776,7 @@
 {
     tokens_helper(v, &node.extern_token.span);
     if let Some(it) = &node.name {
-        v.visit_lit_str(it)
+        v.visit_lit_str(it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -787,7 +787,7 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.colon2_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     tokens_helper(v, &node.lt_token.spans);
     for el in Punctuated::pairs(&node.args) {
@@ -805,7 +805,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_pat(&node.pat);
     if let Some(it) = &node.guard {
@@ -815,7 +815,7 @@
     tokens_helper(v, &node.fat_arrow_token.spans);
     v.visit_expr(&*node.body);
     if let Some(it) = &node.comma {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -847,7 +847,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.name {
         v.visit_ident(&(it).0);
@@ -963,7 +963,7 @@
 {
     tokens_helper(v, &node.brace_token.span);
     for it in &node.stmts {
-        v.visit_stmt(it)
+        v.visit_stmt(it);
     }
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -988,17 +988,17 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.const_token.span);
     v.visit_ident(&node.ident);
     tokens_helper(v, &node.colon_token.spans);
     v.visit_type(&node.ty);
     if let Some(it) = &node.eq_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     if let Some(it) = &node.default {
-        v.visit_expr(it)
+        v.visit_expr(it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -1056,7 +1056,7 @@
     tokens_helper(v, &node.struct_token.span);
     v.visit_fields(&node.fields);
     if let Some(it) = &node.semi_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "derive")]
@@ -1073,7 +1073,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     v.visit_ident(&node.ident);
@@ -1215,7 +1215,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.bracket_token.span);
     for el in Punctuated::pairs(&node.elems) {
@@ -1232,7 +1232,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.left);
     tokens_helper(v, &node.eq_token.spans);
@@ -1244,7 +1244,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.left);
     v.visit_bin_op(&node.op);
@@ -1256,11 +1256,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.async_token.span);
     if let Some(it) = &node.capture {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_block(&node.block);
 }
@@ -1270,7 +1270,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.base);
     tokens_helper(v, &node.dot_token.spans);
@@ -1282,7 +1282,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.left);
     v.visit_bin_op(&node.op);
@@ -1294,10 +1294,10 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.label {
-        v.visit_label(it)
+        v.visit_label(it);
     };
     v.visit_block(&node.block);
 }
@@ -1307,7 +1307,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.box_token.span);
     v.visit_expr(&*node.expr);
@@ -1318,14 +1318,14 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.break_token.span);
     if let Some(it) = &node.label {
-        v.visit_lifetime(it)
+        v.visit_lifetime(it);
     };
     if let Some(it) = &node.expr {
-        v.visit_expr(&**it)
+        v.visit_expr(&**it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -1334,7 +1334,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.func);
     tokens_helper(v, &node.paren_token.span);
@@ -1352,7 +1352,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.expr);
     tokens_helper(v, &node.as_token.span);
@@ -1364,16 +1364,16 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.asyncness {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.movability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.capture {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     tokens_helper(v, &node.or1_token.spans);
     for el in Punctuated::pairs(&node.inputs) {
@@ -1393,11 +1393,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.continue_token.span);
     if let Some(it) = &node.label {
-        v.visit_lifetime(it)
+        v.visit_lifetime(it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -1406,7 +1406,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.base);
     tokens_helper(v, &node.dot_token.spans);
@@ -1418,10 +1418,10 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.label {
-        v.visit_label(it)
+        v.visit_label(it);
     };
     tokens_helper(v, &node.for_token.span);
     v.visit_pat(&node.pat);
@@ -1435,7 +1435,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.group_token.span);
     v.visit_expr(&*node.expr);
@@ -1446,7 +1446,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.if_token.span);
     v.visit_expr(&*node.cond);
@@ -1462,7 +1462,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.expr);
     tokens_helper(v, &node.bracket_token.span);
@@ -1474,7 +1474,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.let_token.span);
     v.visit_pat(&node.pat);
@@ -1487,7 +1487,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_lit(&node.lit);
 }
@@ -1497,10 +1497,10 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.label {
-        v.visit_label(it)
+        v.visit_label(it);
     };
     tokens_helper(v, &node.loop_token.span);
     v.visit_block(&node.body);
@@ -1511,7 +1511,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_macro(&node.mac);
 }
@@ -1521,13 +1521,13 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.match_token.span);
     v.visit_expr(&*node.expr);
     tokens_helper(v, &node.brace_token.span);
     for it in &node.arms {
-        v.visit_arm(it)
+        v.visit_arm(it);
     }
 }
 #[cfg(feature = "full")]
@@ -1536,13 +1536,13 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.receiver);
     tokens_helper(v, &node.dot_token.spans);
     v.visit_ident(&node.method);
     if let Some(it) = &node.turbofish {
-        v.visit_method_turbofish(it)
+        v.visit_method_turbofish(it);
     };
     tokens_helper(v, &node.paren_token.span);
     for el in Punctuated::pairs(&node.args) {
@@ -1559,7 +1559,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.paren_token.span);
     v.visit_expr(&*node.expr);
@@ -1570,10 +1570,10 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.qself {
-        v.visit_qself(it)
+        v.visit_qself(it);
     };
     v.visit_path(&node.path);
 }
@@ -1583,14 +1583,14 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.from {
-        v.visit_expr(&**it)
+        v.visit_expr(&**it);
     };
     v.visit_range_limits(&node.limits);
     if let Some(it) = &node.to {
-        v.visit_expr(&**it)
+        v.visit_expr(&**it);
     };
 }
 #[cfg(feature = "full")]
@@ -1599,11 +1599,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.and_token.spans);
     if let Some(it) = &node.mutability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_expr(&*node.expr);
 }
@@ -1613,7 +1613,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.bracket_token.span);
     v.visit_expr(&*node.expr);
@@ -1626,11 +1626,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.return_token.span);
     if let Some(it) = &node.expr {
-        v.visit_expr(&**it)
+        v.visit_expr(&**it);
     };
 }
 #[cfg(feature = "full")]
@@ -1639,7 +1639,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_path(&node.path);
     tokens_helper(v, &node.brace_token.span);
@@ -1651,10 +1651,10 @@
         }
     }
     if let Some(it) = &node.dot2_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     if let Some(it) = &node.rest {
-        v.visit_expr(&**it)
+        v.visit_expr(&**it);
     };
 }
 #[cfg(feature = "full")]
@@ -1663,7 +1663,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.expr);
     tokens_helper(v, &node.question_token.spans);
@@ -1674,7 +1674,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.try_token.span);
     v.visit_block(&node.block);
@@ -1685,7 +1685,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.paren_token.span);
     for el in Punctuated::pairs(&node.elems) {
@@ -1702,7 +1702,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.expr);
     tokens_helper(v, &node.colon_token.spans);
@@ -1714,7 +1714,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_un_op(&node.op);
     v.visit_expr(&*node.expr);
@@ -1725,7 +1725,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.unsafe_token.span);
     v.visit_block(&node.block);
@@ -1736,10 +1736,10 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.label {
-        v.visit_label(it)
+        v.visit_label(it);
     };
     tokens_helper(v, &node.while_token.span);
     v.visit_expr(&*node.cond);
@@ -1751,11 +1751,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.yield_token.span);
     if let Some(it) = &node.expr {
-        v.visit_expr(&**it)
+        v.visit_expr(&**it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -1764,14 +1764,14 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     if let Some(it) = &node.ident {
-        v.visit_ident(it)
+        v.visit_ident(it);
     };
     if let Some(it) = &node.colon_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     v.visit_type(&node.ty);
 }
@@ -1781,11 +1781,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_member(&node.member);
     if let Some(it) = &node.colon_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     v.visit_pat(&*node.pat);
 }
@@ -1795,11 +1795,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_member(&node.member);
     if let Some(it) = &node.colon_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     v.visit_expr(&node.expr);
 }
@@ -1853,10 +1853,10 @@
 {
     skip!(node.shebang);
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     for it in &node.items {
-        v.visit_item(it)
+        v.visit_item(it);
     }
 }
 #[cfg(feature = "full")]
@@ -1903,7 +1903,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     v.visit_signature(&node.sig);
@@ -1915,11 +1915,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_macro(&node.mac);
     if let Some(it) = &node.semi_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -1928,12 +1928,12 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.static_token.span);
     if let Some(it) = &node.mutability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_ident(&node.ident);
     tokens_helper(v, &node.colon_token.spans);
@@ -1946,7 +1946,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.type_token.span);
@@ -2013,7 +2013,7 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.lt_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     for el in Punctuated::pairs(&node.params) {
         let (it, p) = el.into_tuple();
@@ -2023,10 +2023,10 @@
         }
     }
     if let Some(it) = &node.gt_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     if let Some(it) = &node.where_clause {
-        v.visit_where_clause(it)
+        v.visit_where_clause(it);
     };
 }
 pub fn visit_ident<'ast, V>(v: &mut V, node: &'ast Ident)
@@ -2065,11 +2065,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     if let Some(it) = &node.defaultness {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     tokens_helper(v, &node.const_token.span);
     v.visit_ident(&node.ident);
@@ -2085,11 +2085,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_macro(&node.mac);
     if let Some(it) = &node.semi_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2098,11 +2098,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     if let Some(it) = &node.defaultness {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_signature(&node.sig);
     v.visit_block(&node.block);
@@ -2113,11 +2113,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     if let Some(it) = &node.defaultness {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     tokens_helper(v, &node.type_token.span);
     v.visit_ident(&node.ident);
@@ -2200,7 +2200,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.const_token.span);
@@ -2217,7 +2217,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.enum_token.span);
@@ -2238,7 +2238,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.extern_token.span);
@@ -2256,7 +2256,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     v.visit_signature(&node.sig);
@@ -2268,12 +2268,12 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_abi(&node.abi);
     tokens_helper(v, &node.brace_token.span);
     for it in &node.items {
-        v.visit_foreign_item(it)
+        v.visit_foreign_item(it);
     }
 }
 #[cfg(feature = "full")]
@@ -2282,19 +2282,19 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.defaultness {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.unsafety {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     tokens_helper(v, &node.impl_token.span);
     v.visit_generics(&node.generics);
     if let Some(it) = &node.trait_ {
         if let Some(it) = &(it).0 {
-            tokens_helper(v, &it.spans)
+            tokens_helper(v, &it.spans);
         };
         v.visit_path(&(it).1);
         tokens_helper(v, &(it).2.span);
@@ -2302,7 +2302,7 @@
     v.visit_type(&*node.self_ty);
     tokens_helper(v, &node.brace_token.span);
     for it in &node.items {
-        v.visit_impl_item(it)
+        v.visit_impl_item(it);
     }
 }
 #[cfg(feature = "full")]
@@ -2311,14 +2311,14 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.ident {
-        v.visit_ident(it)
+        v.visit_ident(it);
     };
     v.visit_macro(&node.mac);
     if let Some(it) = &node.semi_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2327,7 +2327,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.macro_token.span);
@@ -2340,7 +2340,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.mod_token.span);
@@ -2348,11 +2348,11 @@
     if let Some(it) = &node.content {
         tokens_helper(v, &(it).0.span);
         for it in &(it).1 {
-            v.visit_item(it)
+            v.visit_item(it);
         }
     };
     if let Some(it) = &node.semi {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2361,12 +2361,12 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.static_token.span);
     if let Some(it) = &node.mutability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_ident(&node.ident);
     tokens_helper(v, &node.colon_token.spans);
@@ -2381,7 +2381,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.struct_token.span);
@@ -2389,7 +2389,7 @@
     v.visit_generics(&node.generics);
     v.visit_fields(&node.fields);
     if let Some(it) = &node.semi_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2398,20 +2398,20 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     if let Some(it) = &node.unsafety {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.auto_token {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     tokens_helper(v, &node.trait_token.span);
     v.visit_ident(&node.ident);
     v.visit_generics(&node.generics);
     if let Some(it) = &node.colon_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     for el in Punctuated::pairs(&node.supertraits) {
         let (it, p) = el.into_tuple();
@@ -2422,7 +2422,7 @@
     }
     tokens_helper(v, &node.brace_token.span);
     for it in &node.items {
-        v.visit_trait_item(it)
+        v.visit_trait_item(it);
     }
 }
 #[cfg(feature = "full")]
@@ -2431,7 +2431,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.trait_token.span);
@@ -2453,7 +2453,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.type_token.span);
@@ -2469,7 +2469,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.union_token.span);
@@ -2483,12 +2483,12 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_visibility(&node.vis);
     tokens_helper(v, &node.use_token.span);
     if let Some(it) = &node.leading_colon {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     v.visit_use_tree(&node.tree);
     tokens_helper(v, &node.semi_token.spans);
@@ -2514,11 +2514,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_lifetime(&node.lifetime);
     if let Some(it) = &node.colon_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     for el in Punctuated::pairs(&node.bounds) {
         let (it, p) = el.into_tuple();
@@ -2602,7 +2602,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.let_token.span);
     v.visit_pat(&node.pat);
@@ -2804,7 +2804,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.box_token.span);
     v.visit_pat(&*node.pat);
@@ -2815,13 +2815,13 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.by_ref {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.mutability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_ident(&node.ident);
     if let Some(it) = &node.subpat {
@@ -2835,7 +2835,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.expr);
 }
@@ -2845,7 +2845,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_macro(&node.mac);
 }
@@ -2855,10 +2855,10 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.leading_vert {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     for el in Punctuated::pairs(&node.cases) {
         let (it, p) = el.into_tuple();
@@ -2874,10 +2874,10 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.qself {
-        v.visit_qself(it)
+        v.visit_qself(it);
     };
     v.visit_path(&node.path);
 }
@@ -2887,7 +2887,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_expr(&*node.lo);
     v.visit_range_limits(&node.limits);
@@ -2899,11 +2899,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.and_token.spans);
     if let Some(it) = &node.mutability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_pat(&*node.pat);
 }
@@ -2913,7 +2913,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.dot2_token.spans);
 }
@@ -2923,7 +2923,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.bracket_token.span);
     for el in Punctuated::pairs(&node.elems) {
@@ -2940,7 +2940,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_path(&node.path);
     tokens_helper(v, &node.brace_token.span);
@@ -2952,7 +2952,7 @@
         }
     }
     if let Some(it) = &node.dot2_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -2961,7 +2961,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.paren_token.span);
     for el in Punctuated::pairs(&node.elems) {
@@ -2978,7 +2978,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_path(&node.path);
     v.visit_pat_tuple(&node.pat);
@@ -2989,7 +2989,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_pat(&*node.pat);
     tokens_helper(v, &node.colon_token.spans);
@@ -3001,7 +3001,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.underscore_token.spans);
 }
@@ -3011,7 +3011,7 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.leading_colon {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     for el in Punctuated::pairs(&node.segments) {
         let (it, p) = el.into_tuple();
@@ -3074,7 +3074,7 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.lifetimes {
-        v.visit_bound_lifetimes(it)
+        v.visit_bound_lifetimes(it);
     };
     v.visit_type(&node.bounded_ty);
     tokens_helper(v, &node.colon_token.spans);
@@ -3095,7 +3095,7 @@
     v.visit_type(&*node.ty);
     skip!(node.position);
     if let Some(it) = &node.as_token {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     tokens_helper(v, &node.gt_token.spans);
 }
@@ -3119,16 +3119,16 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     if let Some(it) = &node.reference {
         tokens_helper(v, &(it).0.spans);
         if let Some(it) = &(it).1 {
-            v.visit_lifetime(it)
+            v.visit_lifetime(it);
         };
     };
     if let Some(it) = &node.mutability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     tokens_helper(v, &node.self_token.span);
 }
@@ -3151,16 +3151,16 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.constness {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.asyncness {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.unsafety {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.abi {
-        v.visit_abi(it)
+        v.visit_abi(it);
     };
     tokens_helper(v, &node.fn_token.span);
     v.visit_ident(&node.ident);
@@ -3174,7 +3174,7 @@
         }
     }
     if let Some(it) = &node.variadic {
-        v.visit_variadic(it)
+        v.visit_variadic(it);
     };
     v.visit_return_type(&node.output);
 }
@@ -3210,11 +3210,11 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.paren_token {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_trait_bound_modifier(&node.modifier);
     if let Some(it) = &node.lifetimes {
-        v.visit_bound_lifetimes(it)
+        v.visit_bound_lifetimes(it);
     };
     v.visit_path(&node.path);
 }
@@ -3260,7 +3260,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.const_token.span);
     v.visit_ident(&node.ident);
@@ -3278,11 +3278,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_macro(&node.mac);
     if let Some(it) = &node.semi_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -3291,14 +3291,14 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_signature(&node.sig);
     if let Some(it) = &node.default {
-        v.visit_block(it)
+        v.visit_block(it);
     };
     if let Some(it) = &node.semi_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
 }
 #[cfg(feature = "full")]
@@ -3307,13 +3307,13 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.type_token.span);
     v.visit_ident(&node.ident);
     v.visit_generics(&node.generics);
     if let Some(it) = &node.colon_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     for el in Punctuated::pairs(&node.bounds) {
         let (it, p) = el.into_tuple();
@@ -3398,13 +3398,13 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.lifetimes {
-        v.visit_bound_lifetimes(it)
+        v.visit_bound_lifetimes(it);
     };
     if let Some(it) = &node.unsafety {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.abi {
-        v.visit_abi(it)
+        v.visit_abi(it);
     };
     tokens_helper(v, &node.fn_token.span);
     tokens_helper(v, &node.paren_token.span);
@@ -3416,7 +3416,7 @@
         }
     }
     if let Some(it) = &node.variadic {
-        v.visit_variadic(it)
+        v.visit_variadic(it);
     };
     v.visit_return_type(&node.output);
 }
@@ -3469,11 +3469,11 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_ident(&node.ident);
     if let Some(it) = &node.colon_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     for el in Punctuated::pairs(&node.bounds) {
         let (it, p) = el.into_tuple();
@@ -3483,10 +3483,10 @@
         }
     }
     if let Some(it) = &node.eq_token {
-        tokens_helper(v, &it.spans)
+        tokens_helper(v, &it.spans);
     };
     if let Some(it) = &node.default {
-        v.visit_type(it)
+        v.visit_type(it);
     };
 }
 #[cfg(any(feature = "derive", feature = "full"))]
@@ -3517,7 +3517,7 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.qself {
-        v.visit_qself(it)
+        v.visit_qself(it);
     };
     v.visit_path(&node.path);
 }
@@ -3528,10 +3528,10 @@
 {
     tokens_helper(v, &node.star_token.spans);
     if let Some(it) = &node.const_token {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     if let Some(it) = &node.mutability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_type(&*node.elem);
 }
@@ -3542,10 +3542,10 @@
 {
     tokens_helper(v, &node.and_token.spans);
     if let Some(it) = &node.lifetime {
-        v.visit_lifetime(it)
+        v.visit_lifetime(it);
     };
     if let Some(it) = &node.mutability {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_type(&*node.elem);
 }
@@ -3563,7 +3563,7 @@
     V: Visit<'ast> + ?Sized,
 {
     if let Some(it) = &node.dyn_token {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     for el in Punctuated::pairs(&node.bounds) {
         let (it, p) = el.into_tuple();
@@ -3679,7 +3679,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     tokens_helper(v, &node.dots.spans);
 }
@@ -3689,7 +3689,7 @@
     V: Visit<'ast> + ?Sized,
 {
     for it in &node.attrs {
-        v.visit_attribute(it)
+        v.visit_attribute(it);
     }
     v.visit_ident(&node.ident);
     v.visit_fields(&node.fields);
@@ -3720,7 +3720,7 @@
     tokens_helper(v, &node.pub_token.span);
     tokens_helper(v, &node.paren_token.span);
     if let Some(it) = &node.in_token {
-        tokens_helper(v, &it.span)
+        tokens_helper(v, &it.span);
     };
     v.visit_path(&*node.path);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/generics.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/generics.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/generics.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/generics.rs	2021-12-09 12:01:26.000000000 +0000
@@ -172,17 +172,10 @@
 
     /// Initializes an empty `where`-clause if there is not one present already.
     pub fn make_where_clause(&mut self) -> &mut WhereClause {
-        // This is Option::get_or_insert_with in Rust 1.20.
-        if self.where_clause.is_none() {
-            self.where_clause = Some(WhereClause {
-                where_token: <Token![where]>::default(),
-                predicates: Punctuated::new(),
-            });
-        }
-        match &mut self.where_clause {
-            Some(where_clause) => where_clause,
-            None => unreachable!(),
-        }
+        self.where_clause.get_or_insert_with(|| WhereClause {
+            where_token: <Token![where]>::default(),
+            predicates: Punctuated::new(),
+        })
     }
 }
 
@@ -598,6 +591,7 @@
 #[cfg(feature = "parsing")]
 pub mod parsing {
     use super::*;
+    use crate::ext::IdentExt;
     use crate::parse::{Parse, ParseStream, Result};
 
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
@@ -632,6 +626,15 @@
                         attrs,
                         ..input.parse()?
                     }));
+                } else if input.peek(Token![_]) {
+                    params.push_value(GenericParam::Type(TypeParam {
+                        attrs,
+                        ident: input.call(Ident::parse_any)?,
+                        colon_token: None,
+                        bounds: Punctuated::new(),
+                        eq_token: None,
+                        default: None,
+                    }));
                 } else {
                     return Err(lookahead.error());
                 }
@@ -870,7 +873,7 @@
                 eq_token: {
                     if input.peek(Token![=]) {
                         let eq_token = input.parse()?;
-                        default = Some(input.parse::<Expr>()?);
+                        default = Some(path::parsing::const_argument(input)?);
                         Some(eq_token)
                     } else {
                         None
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/group.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/group.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/group.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/group.rs	2021-12-09 12:01:26.000000000 +0000
@@ -137,12 +137,12 @@
 macro_rules! parenthesized {
     ($content:ident in $cursor:expr) => {
         match $crate::group::parse_parens(&$cursor) {
-            $crate::export::Ok(parens) => {
+            $crate::__private::Ok(parens) => {
                 $content = parens.content;
                 parens.token
             }
-            $crate::export::Err(error) => {
-                return $crate::export::Err(error);
+            $crate::__private::Err(error) => {
+                return $crate::__private::Err(error);
             }
         }
     };
@@ -215,12 +215,12 @@
 macro_rules! braced {
     ($content:ident in $cursor:expr) => {
         match $crate::group::parse_braces(&$cursor) {
-            $crate::export::Ok(braces) => {
+            $crate::__private::Ok(braces) => {
                 $content = braces.content;
                 braces.token
             }
-            $crate::export::Err(error) => {
-                return $crate::export::Err(error);
+            $crate::__private::Err(error) => {
+                return $crate::__private::Err(error);
             }
         }
     };
@@ -270,12 +270,12 @@
 macro_rules! bracketed {
     ($content:ident in $cursor:expr) => {
         match $crate::group::parse_brackets(&$cursor) {
-            $crate::export::Ok(brackets) => {
+            $crate::__private::Ok(brackets) => {
                 $content = brackets.content;
                 brackets.token
             }
-            $crate::export::Err(error) => {
-                return $crate::export::Err(error);
+            $crate::__private::Err(error) => {
+                return $crate::__private::Err(error);
             }
         }
     };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/item.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/item.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/item.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/item.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,8 +71,31 @@
         /// Tokens forming an item not interpreted by Syn.
         Verbatim(TokenStream),
 
+        // The following is the only supported idiom for exhaustive matching of
+        // this enum.
+        //
+        //     match expr {
+        //         Item::Const(e) => {...}
+        //         Item::Enum(e) => {...}
+        //         ...
+        //         Item::Verbatim(e) => {...}
+        //
+        //         #[cfg(test)]
+        //         Item::__TestExhaustive(_) => unimplemented!(),
+        //         #[cfg(not(test))]
+        //         _ => { /* some sane fallback */ }
+        //     }
+        //
+        // This way we fail your tests but don't break your library when adding
+        // a variant. You will be notified by a test failure when a variant is
+        // added, so that you can add code to handle it, but your library will
+        // continue to compile and work for downstream users in the interim.
+        //
+        // Once `deny(reachable)` is available in rustc, Item will be
+        // reimplemented as a non_exhaustive enum.
+        // https://github.com/rust-lang/rust/issues/44109#issuecomment-521781237
         #[doc(hidden)]
-        __Nonexhaustive,
+        __TestExhaustive(crate::private),
     }
 }
 
@@ -357,7 +380,11 @@
             | Item::Macro(ItemMacro { attrs, .. })
             | Item::Macro2(ItemMacro2 { attrs, .. }) => mem::replace(attrs, new),
             Item::Verbatim(_) => Vec::new(),
-            Item::__Nonexhaustive => unreachable!(),
+
+            #[cfg(test)]
+            Item::__TestExhaustive(_) => unimplemented!(),
+            #[cfg(not(test))]
+            _ => unreachable!(),
         }
     }
 }
@@ -553,8 +580,31 @@
         /// Tokens in an `extern` block not interpreted by Syn.
         Verbatim(TokenStream),
 
+        // The following is the only supported idiom for exhaustive matching of
+        // this enum.
+        //
+        //     match expr {
+        //         ForeignItem::Fn(e) => {...}
+        //         ForeignItem::Static(e) => {...}
+        //         ...
+        //         ForeignItem::Verbatim(e) => {...}
+        //
+        //         #[cfg(test)]
+        //         ForeignItem::__TestExhaustive(_) => unimplemented!(),
+        //         #[cfg(not(test))]
+        //         _ => { /* some sane fallback */ }
+        //     }
+        //
+        // This way we fail your tests but don't break your library when adding
+        // a variant. You will be notified by a test failure when a variant is
+        // added, so that you can add code to handle it, but your library will
+        // continue to compile and work for downstream users in the interim.
+        //
+        // Once `deny(reachable)` is available in rustc, ForeignItem will be
+        // reimplemented as a non_exhaustive enum.
+        // https://github.com/rust-lang/rust/issues/44109#issuecomment-521781237
         #[doc(hidden)]
-        __Nonexhaustive,
+        __TestExhaustive(crate::private),
     }
 }
 
@@ -641,8 +691,31 @@
         /// Tokens within the definition of a trait not interpreted by Syn.
         Verbatim(TokenStream),
 
+        // The following is the only supported idiom for exhaustive matching of
+        // this enum.
+        //
+        //     match expr {
+        //         TraitItem::Const(e) => {...}
+        //         TraitItem::Method(e) => {...}
+        //         ...
+        //         TraitItem::Verbatim(e) => {...}
+        //
+        //         #[cfg(test)]
+        //         TraitItem::__TestExhaustive(_) => unimplemented!(),
+        //         #[cfg(not(test))]
+        //         _ => { /* some sane fallback */ }
+        //     }
+        //
+        // This way we fail your tests but don't break your library when adding
+        // a variant. You will be notified by a test failure when a variant is
+        // added, so that you can add code to handle it, but your library will
+        // continue to compile and work for downstream users in the interim.
+        //
+        // Once `deny(reachable)` is available in rustc, TraitItem will be
+        // reimplemented as a non_exhaustive enum.
+        // https://github.com/rust-lang/rust/issues/44109#issuecomment-521781237
         #[doc(hidden)]
-        __Nonexhaustive,
+        __TestExhaustive(crate::private),
     }
 }
 
@@ -731,8 +804,31 @@
         /// Tokens within an impl block not interpreted by Syn.
         Verbatim(TokenStream),
 
+        // The following is the only supported idiom for exhaustive matching of
+        // this enum.
+        //
+        //     match expr {
+        //         ImplItem::Const(e) => {...}
+        //         ImplItem::Method(e) => {...}
+        //         ...
+        //         ImplItem::Verbatim(e) => {...}
+        //
+        //         #[cfg(test)]
+        //         ImplItem::__TestExhaustive(_) => unimplemented!(),
+        //         #[cfg(not(test))]
+        //         _ => { /* some sane fallback */ }
+        //     }
+        //
+        // This way we fail your tests but don't break your library when adding
+        // a variant. You will be notified by a test failure when a variant is
+        // added, so that you can add code to handle it, but your library will
+        // continue to compile and work for downstream users in the interim.
+        //
+        // Once `deny(reachable)` is available in rustc, ImplItem will be
+        // reimplemented as a non_exhaustive enum.
+        // https://github.com/rust-lang/rust/issues/44109#issuecomment-521781237
         #[doc(hidden)]
-        __Nonexhaustive,
+        __TestExhaustive(crate::private),
     }
 }
 
@@ -890,6 +986,7 @@
     use std::iter::{self, FromIterator};
 
     crate::custom_keyword!(existential);
+    crate::custom_keyword!(macro_rules);
 
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for Item {
@@ -934,24 +1031,31 @@
                 let static_token = input.parse()?;
                 let mutability = input.parse()?;
                 let ident = input.parse()?;
-                let colon_token = input.parse()?;
-                let ty = input.parse()?;
-                if input.peek(Token![;]) {
+                if input.peek(Token![=]) {
+                    input.parse::<Token![=]>()?;
+                    input.parse::<Expr>()?;
                     input.parse::<Token![;]>()?;
                     Ok(Item::Verbatim(verbatim::between(begin, input)))
                 } else {
-                    Ok(Item::Static(ItemStatic {
-                        attrs: Vec::new(),
-                        vis,
-                        static_token,
-                        mutability,
-                        ident,
-                        colon_token,
-                        ty,
-                        eq_token: input.parse()?,
-                        expr: input.parse()?,
-                        semi_token: input.parse()?,
-                    }))
+                    let colon_token = input.parse()?;
+                    let ty = input.parse()?;
+                    if input.peek(Token![;]) {
+                        input.parse::<Token![;]>()?;
+                        Ok(Item::Verbatim(verbatim::between(begin, input)))
+                    } else {
+                        Ok(Item::Static(ItemStatic {
+                            attrs: Vec::new(),
+                            vis,
+                            static_token,
+                            mutability,
+                            ident,
+                            colon_token,
+                            ty,
+                            eq_token: input.parse()?,
+                            expr: input.parse()?,
+                            semi_token: input.parse()?,
+                        }))
+                    }
                 }
             } else if lookahead.peek(Token![const]) {
                 ahead.parse::<Token![const]>()?;
@@ -996,8 +1100,8 @@
                 {
                     input.parse().map(Item::Trait)
                 } else if lookahead.peek(Token![impl]) {
-                    let allow_const_impl = true;
-                    if let Some(item) = parse_impl(input, allow_const_impl)? {
+                    let allow_verbatim_impl = true;
+                    if let Some(item) = parse_impl(input, allow_verbatim_impl)? {
                         Ok(Item::Impl(item))
                     } else {
                         Ok(Item::Verbatim(verbatim::between(begin, input)))
@@ -1034,8 +1138,8 @@
             } else if lookahead.peek(Token![impl])
                 || lookahead.peek(Token![default]) && !ahead.peek2(Token![!])
             {
-                let allow_const_impl = true;
-                if let Some(item) = parse_impl(input, allow_const_impl)? {
+                let allow_verbatim_impl = true;
+                if let Some(item) = parse_impl(input, allow_verbatim_impl)? {
                     Ok(Item::Impl(item))
                 } else {
                     Ok(Item::Verbatim(verbatim::between(begin, input)))
@@ -1050,6 +1154,10 @@
                     || lookahead.peek(Token![::]))
             {
                 input.parse().map(Item::Macro)
+            } else if ahead.peek(macro_rules) {
+                input.advance_to(&ahead);
+                input.parse::<ItemMacro>()?;
+                Ok(Item::Verbatim(verbatim::between(begin, input)))
             } else {
                 Err(lookahead.error())
             }?;
@@ -1072,7 +1180,6 @@
         semi_token: Token![;],
     }
 
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for FlexibleItemType {
         fn parse(input: ParseStream) -> Result<Self> {
             let vis: Visibility = input.parse()?;
@@ -1084,14 +1191,14 @@
             let mut bounds = Punctuated::new();
             if colon_token.is_some() {
                 loop {
-                    bounds.push_value(input.parse::<TypeParamBound>()?);
                     if input.peek(Token![where]) || input.peek(Token![=]) || input.peek(Token![;]) {
                         break;
                     }
-                    bounds.push_punct(input.parse::<Token![+]>()?);
+                    bounds.push_value(input.parse::<TypeParamBound>()?);
                     if input.peek(Token![where]) || input.peek(Token![=]) || input.peek(Token![;]) {
                         break;
                     }
+                    bounds.push_punct(input.parse::<Token![+]>()?);
                 }
             }
             generics.where_clause = input.parse()?;
@@ -1405,11 +1512,11 @@
                 abi,
                 fn_token,
                 ident,
+                generics,
                 paren_token,
                 inputs,
-                output,
                 variadic,
-                generics,
+                output,
             })
         }
     }
@@ -1426,17 +1533,17 @@
 
     fn parse_rest_of_fn(
         input: ParseStream,
-        outer_attrs: Vec<Attribute>,
+        mut attrs: Vec<Attribute>,
         vis: Visibility,
         sig: Signature,
     ) -> Result<ItemFn> {
         let content;
         let brace_token = braced!(content in input);
-        let inner_attrs = content.call(Attribute::parse_inner)?;
+        attr::parsing::parse_inner(&content, &mut attrs)?;
         let stmts = content.call(Block::parse_within)?;
 
         Ok(ItemFn {
-            attrs: private::attrs(outer_attrs, inner_attrs),
+            attrs,
             vis,
             sig,
             block: Box::new(Block { brace_token, stmts }),
@@ -1562,7 +1669,7 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ItemMod {
         fn parse(input: ParseStream) -> Result<Self> {
-            let outer_attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let vis: Visibility = input.parse()?;
             let mod_token: Token![mod] = input.parse()?;
             let ident: Ident = input.parse()?;
@@ -1570,7 +1677,7 @@
             let lookahead = input.lookahead1();
             if lookahead.peek(Token![;]) {
                 Ok(ItemMod {
-                    attrs: outer_attrs,
+                    attrs,
                     vis,
                     mod_token,
                     ident,
@@ -1580,7 +1687,7 @@
             } else if lookahead.peek(token::Brace) {
                 let content;
                 let brace_token = braced!(content in input);
-                let inner_attrs = content.call(Attribute::parse_inner)?;
+                attr::parsing::parse_inner(&content, &mut attrs)?;
 
                 let mut items = Vec::new();
                 while !content.is_empty() {
@@ -1588,7 +1695,7 @@
                 }
 
                 Ok(ItemMod {
-                    attrs: private::attrs(outer_attrs, inner_attrs),
+                    attrs,
                     vis,
                     mod_token,
                     ident,
@@ -1604,19 +1711,19 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ItemForeignMod {
         fn parse(input: ParseStream) -> Result<Self> {
-            let outer_attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let abi: Abi = input.parse()?;
 
             let content;
             let brace_token = braced!(content in input);
-            let inner_attrs = content.call(Attribute::parse_inner)?;
+            attr::parsing::parse_inner(&content, &mut attrs)?;
             let mut items = Vec::new();
             while !content.is_empty() {
                 items.push(content.parse()?);
             }
 
             Ok(ItemForeignMod {
-                attrs: private::attrs(outer_attrs, inner_attrs),
+                attrs,
                 abi,
                 brace_token,
                 items,
@@ -1695,9 +1802,13 @@
                 ForeignItem::Type(item) => &mut item.attrs,
                 ForeignItem::Macro(item) => &mut item.attrs,
                 ForeignItem::Verbatim(_) => return Ok(item),
-                ForeignItem::__Nonexhaustive => unreachable!(),
+
+                #[cfg(test)]
+                ForeignItem::__TestExhaustive(_) => unimplemented!(),
+                #[cfg(not(test))]
+                _ => unreachable!(),
             };
-            attrs.extend(item_attrs.drain(..));
+            attrs.append(item_attrs);
             *item_attrs = attrs;
 
             Ok(item)
@@ -1898,12 +2009,13 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ItemStruct {
         fn parse(input: ParseStream) -> Result<Self> {
-            let attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let vis = input.parse::<Visibility>()?;
             let struct_token = input.parse::<Token![struct]>()?;
             let ident = input.parse::<Ident>()?;
             let generics = input.parse::<Generics>()?;
-            let (where_clause, fields, semi_token) = derive::parsing::data_struct(input)?;
+            let (where_clause, fields, semi_token) =
+                derive::parsing::data_struct(input, &mut attrs)?;
             Ok(ItemStruct {
                 attrs,
                 vis,
@@ -1922,12 +2034,13 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ItemEnum {
         fn parse(input: ParseStream) -> Result<Self> {
-            let attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let vis = input.parse::<Visibility>()?;
             let enum_token = input.parse::<Token![enum]>()?;
             let ident = input.parse::<Ident>()?;
             let generics = input.parse::<Generics>()?;
-            let (where_clause, brace_token, variants) = derive::parsing::data_enum(input)?;
+            let (where_clause, brace_token, variants) =
+                derive::parsing::data_enum(input, &mut attrs)?;
             Ok(ItemEnum {
                 attrs,
                 vis,
@@ -1946,12 +2059,12 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ItemUnion {
         fn parse(input: ParseStream) -> Result<Self> {
-            let attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let vis = input.parse::<Visibility>()?;
             let union_token = input.parse::<Token![union]>()?;
             let ident = input.parse::<Ident>()?;
             let generics = input.parse::<Generics>()?;
-            let (where_clause, fields) = derive::parsing::data_union(input)?;
+            let (where_clause, fields) = derive::parsing::data_union(input, &mut attrs)?;
             Ok(ItemUnion {
                 attrs,
                 vis,
@@ -2019,7 +2132,7 @@
 
     fn parse_rest_of_trait(
         input: ParseStream,
-        outer_attrs: Vec<Attribute>,
+        mut attrs: Vec<Attribute>,
         vis: Visibility,
         unsafety: Option<Token![unsafe]>,
         auto_token: Option<Token![auto]>,
@@ -2032,14 +2145,14 @@
         let mut supertraits = Punctuated::new();
         if colon_token.is_some() {
             loop {
-                supertraits.push_value(input.parse()?);
                 if input.peek(Token![where]) || input.peek(token::Brace) {
                     break;
                 }
-                supertraits.push_punct(input.parse()?);
+                supertraits.push_value(input.parse()?);
                 if input.peek(Token![where]) || input.peek(token::Brace) {
                     break;
                 }
+                supertraits.push_punct(input.parse()?);
             }
         }
 
@@ -2047,14 +2160,14 @@
 
         let content;
         let brace_token = braced!(content in input);
-        let inner_attrs = content.call(Attribute::parse_inner)?;
+        attr::parsing::parse_inner(&content, &mut attrs)?;
         let mut items = Vec::new();
         while !content.is_empty() {
             items.push(content.parse()?);
         }
 
         Ok(ItemTrait {
-            attrs: private::attrs(outer_attrs, inner_attrs),
+            attrs,
             vis,
             unsafety,
             auto_token,
@@ -2173,9 +2286,14 @@
                 TraitItem::Method(item) => &mut item.attrs,
                 TraitItem::Type(item) => &mut item.attrs,
                 TraitItem::Macro(item) => &mut item.attrs,
-                TraitItem::Verbatim(_) | TraitItem::__Nonexhaustive => unreachable!(),
+                TraitItem::Verbatim(_) => unreachable!(),
+
+                #[cfg(test)]
+                TraitItem::__TestExhaustive(_) => unimplemented!(),
+                #[cfg(not(test))]
+                _ => unreachable!(),
             };
-            attrs.extend(item_attrs.drain(..));
+            attrs.append(item_attrs);
             *item_attrs = attrs;
             Ok(item)
         }
@@ -2214,25 +2332,25 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for TraitItemMethod {
         fn parse(input: ParseStream) -> Result<Self> {
-            let outer_attrs = input.call(Attribute::parse_outer)?;
+            let mut attrs = input.call(Attribute::parse_outer)?;
             let sig: Signature = input.parse()?;
 
             let lookahead = input.lookahead1();
-            let (brace_token, inner_attrs, stmts, semi_token) = if lookahead.peek(token::Brace) {
+            let (brace_token, stmts, semi_token) = if lookahead.peek(token::Brace) {
                 let content;
                 let brace_token = braced!(content in input);
-                let inner_attrs = content.call(Attribute::parse_inner)?;
+                attr::parsing::parse_inner(&content, &mut attrs)?;
                 let stmts = content.call(Block::parse_within)?;
-                (Some(brace_token), inner_attrs, stmts, None)
+                (Some(brace_token), stmts, None)
             } else if lookahead.peek(Token![;]) {
                 let semi_token: Token![;] = input.parse()?;
-                (None, Vec::new(), Vec::new(), Some(semi_token))
+                (None, Vec::new(), Some(semi_token))
             } else {
                 return Err(lookahead.error());
             };
 
             Ok(TraitItemMethod {
-                attrs: private::attrs(outer_attrs, inner_attrs),
+                attrs,
                 sig,
                 default: brace_token.map(|brace_token| Block { brace_token, stmts }),
                 semi_token,
@@ -2333,13 +2451,14 @@
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for ItemImpl {
         fn parse(input: ParseStream) -> Result<Self> {
-            let allow_const_impl = false;
-            parse_impl(input, allow_const_impl).map(Option::unwrap)
+            let allow_verbatim_impl = false;
+            parse_impl(input, allow_verbatim_impl).map(Option::unwrap)
         }
     }
 
-    fn parse_impl(input: ParseStream, allow_const_impl: bool) -> Result<Option<ItemImpl>> {
-        let outer_attrs = input.call(Attribute::parse_outer)?;
+    fn parse_impl(input: ParseStream, allow_verbatim_impl: bool) -> Result<Option<ItemImpl>> {
+        let mut attrs = input.call(Attribute::parse_outer)?;
+        let has_visibility = allow_verbatim_impl && input.parse::<Visibility>()?.is_some();
         let defaultness: Option<Token![default]> = input.parse()?;
         let unsafety: Option<Token![unsafe]> = input.parse()?;
         let impl_token: Token![impl] = input.parse()?;
@@ -2350,7 +2469,8 @@
                 || (input.peek2(Ident) || input.peek2(Lifetime))
                     && (input.peek3(Token![:])
                         || input.peek3(Token![,])
-                        || input.peek3(Token![>]))
+                        || input.peek3(Token![>])
+                        || input.peek3(Token![=]))
                 || input.peek2(Token![const]));
         let mut generics: Generics = if has_generics {
             input.parse()?
@@ -2358,7 +2478,7 @@
             Generics::default()
         };
 
-        let is_const_impl = allow_const_impl
+        let is_const_impl = allow_verbatim_impl
             && (input.peek(Token![const]) || input.peek(Token![?]) && input.peek2(Token![const]));
         if is_const_impl {
             input.parse::<Option<Token![?]>>()?;
@@ -2372,6 +2492,8 @@
             None
         };
 
+        #[cfg(not(feature = "printing"))]
+        let first_ty_span = input.span();
         let mut first_ty: Type = input.parse()?;
         let self_ty: Type;
         let trait_;
@@ -2390,8 +2512,13 @@
                 if let Type::Path(TypePath { qself: None, path }) = first_ty {
                     trait_ = Some((polarity, path, for_token));
                 } else {
-                    unreachable!()
+                    unreachable!();
                 }
+            } else if !allow_verbatim_impl {
+                #[cfg(feature = "printing")]
+                return Err(Error::new_spanned(first_ty_ref, "expected trait path"));
+                #[cfg(not(feature = "printing"))]
+                return Err(Error::new(first_ty_span, "expected trait path"));
             } else {
                 trait_ = None;
             }
@@ -2409,18 +2536,18 @@
 
         let content;
         let brace_token = braced!(content in input);
-        let inner_attrs = content.call(Attribute::parse_inner)?;
+        attr::parsing::parse_inner(&content, &mut attrs)?;
 
         let mut items = Vec::new();
         while !content.is_empty() {
             items.push(content.parse()?);
         }
 
-        if is_const_impl || is_impl_for && trait_.is_none() {
+        if has_visibility || is_const_impl || is_impl_for && trait_.is_none() {
             Ok(None)
         } else {
             Ok(Some(ItemImpl {
-                attrs: private::attrs(outer_attrs, inner_attrs),
+                attrs,
                 defaultness,
                 unsafety,
                 impl_token,
@@ -2504,9 +2631,13 @@
                     ImplItem::Type(item) => &mut item.attrs,
                     ImplItem::Macro(item) => &mut item.attrs,
                     ImplItem::Verbatim(_) => return Ok(item),
-                    ImplItem::__Nonexhaustive => unreachable!(),
+
+                    #[cfg(test)]
+                    ImplItem::__TestExhaustive(_) => unimplemented!(),
+                    #[cfg(not(test))]
+                    _ => unreachable!(),
                 };
-                attrs.extend(item_attrs.drain(..));
+                attrs.append(item_attrs);
                 *item_attrs = attrs;
             }
 
@@ -2556,7 +2687,7 @@
                 punct.set_span(semi.span);
                 let tokens = TokenStream::from_iter(vec![TokenTree::Punct(punct)]);
                 Block {
-                    brace_token: Brace::default(),
+                    brace_token: Brace { span: semi.span },
                     stmts: vec![Stmt::Item(Item::Verbatim(tokens))],
                 }
             } else {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -250,48 +250,50 @@
 //!   dynamic library libproc_macro from rustc toolchain.
 
 // Syn types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/syn/1.0.55")]
+#![doc(html_root_url = "https://docs.rs/syn/1.0.75")]
 #![cfg_attr(doc_cfg, feature(doc_cfg))]
-#![deny(clippy::all, clippy::pedantic)]
+#![allow(non_camel_case_types)]
 // Ignored clippy lints.
 #![allow(
-    clippy::blocks_in_if_conditions,
-    clippy::cognitive_complexity,
+    clippy::collapsible_match, // https://github.com/rust-lang/rust-clippy/issues/7575
     clippy::doc_markdown,
     clippy::eval_order_dependence,
     clippy::inherent_to_string,
     clippy::large_enum_variant,
-    clippy::manual_non_exhaustive,
-    clippy::manual_strip,
-    clippy::match_like_matches_macro,
+    clippy::manual_map, // https://github.com/rust-lang/rust-clippy/issues/6795
     clippy::match_on_vec_items,
+    clippy::missing_panics_doc,
     clippy::needless_doctest_main,
     clippy::needless_pass_by_value,
     clippy::never_loop,
-    clippy::suspicious_op_assign_impl,
     clippy::too_many_arguments,
     clippy::trivially_copy_pass_by_ref,
-    clippy::unnecessary_unwrap
+    clippy::unnecessary_unwrap,
+    // clippy bug: https://github.com/rust-lang/rust-clippy/issues/6983
+    clippy::wrong_self_convention
 )]
 // Ignored clippy_pedantic lints.
 #![allow(
     clippy::cast_possible_truncation,
+    // clippy bug: https://github.com/rust-lang/rust-clippy/issues/7127
+    clippy::cloned_instead_of_copied,
     clippy::default_trait_access,
     clippy::empty_enum,
     clippy::expl_impl_clone_on_copy,
     clippy::if_not_else,
-    clippy::items_after_statements,
     clippy::match_same_arms,
+    // clippy bug: https://github.com/rust-lang/rust-clippy/issues/6984
+    clippy::match_wildcard_for_single_variants,
     clippy::missing_errors_doc,
     clippy::module_name_repetitions,
     clippy::must_use_candidate,
     clippy::option_if_let_else,
+    clippy::redundant_else,
     clippy::shadow_unrelated,
     clippy::similar_names,
     clippy::single_match_else,
     clippy::too_many_lines,
     clippy::unseparated_literal_suffix,
-    clippy::use_self,
     clippy::used_underscore_binding,
     clippy::wildcard_imports
 )]
@@ -796,7 +798,8 @@
 
 // Not public API.
 #[doc(hidden)]
-pub mod export;
+#[path = "export.rs"]
+pub mod __private;
 
 mod custom_keyword;
 mod custom_punctuation;
@@ -820,10 +823,9 @@
 #[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
 mod print;
 
-////////////////////////////////////////////////////////////////////////////////
+use crate::__private::private;
 
-#[allow(dead_code, non_camel_case_types)]
-struct private;
+////////////////////////////////////////////////////////////////////////////////
 
 // https://github.com/rust-lang/rust/issues/62830
 #[cfg(feature = "parsing")]
@@ -889,6 +891,9 @@
 
 /// Parse a proc-macro2 token stream into the chosen syntax tree node.
 ///
+/// This function will check that the input is fully parsed. If there are
+/// any unparsed tokens at the end of the stream, an error is returned.
+///
 /// This function parses a `proc_macro2::TokenStream` which is commonly useful
 /// when the input comes from a node of the Syn syntax tree, for example the
 /// body tokens of a [`Macro`] node. When in a procedural macro parsing the
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/lifetime.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/lifetime.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/lifetime.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/lifetime.rs	2021-12-09 12:01:26.000000000 +0000
@@ -57,6 +57,17 @@
             ident: Ident::new(&symbol[1..], span),
         }
     }
+
+    pub fn span(&self) -> Span {
+        self.apostrophe
+            .join(self.ident.span())
+            .unwrap_or(self.apostrophe)
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        self.apostrophe = span;
+        self.ident.set_span(span);
+    }
 }
 
 impl Display for Lifetime {
@@ -97,7 +108,7 @@
 
 impl Hash for Lifetime {
     fn hash<H: Hasher>(&self, h: &mut H) {
-        self.ident.hash(h)
+        self.ident.hash(h);
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/lit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/lit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/lit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/lit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -40,7 +40,7 @@
 
         /// A floating point literal: `1f64` or `1.0e10f64`.
         ///
-        /// Must be finite. May not be infinte or NaN.
+        /// Must be finite. May not be infinite or NaN.
         Float(LitFloat),
 
         /// A boolean literal: `true` or `false`.
@@ -238,7 +238,7 @@
     }
 
     pub fn set_span(&mut self, span: Span) {
-        self.repr.token.set_span(span)
+        self.repr.token.set_span(span);
     }
 
     pub fn suffix(&self) -> &str {
@@ -269,7 +269,7 @@
     }
 
     pub fn set_span(&mut self, span: Span) {
-        self.repr.token.set_span(span)
+        self.repr.token.set_span(span);
     }
 
     pub fn suffix(&self) -> &str {
@@ -300,7 +300,7 @@
     }
 
     pub fn set_span(&mut self, span: Span) {
-        self.repr.token.set_span(span)
+        self.repr.token.set_span(span);
     }
 
     pub fn suffix(&self) -> &str {
@@ -331,7 +331,7 @@
     }
 
     pub fn set_span(&mut self, span: Span) {
-        self.repr.token.set_span(span)
+        self.repr.token.set_span(span);
     }
 
     pub fn suffix(&self) -> &str {
@@ -406,7 +406,7 @@
     }
 
     pub fn set_span(&mut self, span: Span) {
-        self.repr.token.set_span(span)
+        self.repr.token.set_span(span);
     }
 }
 
@@ -478,7 +478,7 @@
     }
 
     pub fn set_span(&mut self, span: Span) {
-        self.repr.token.set_span(span)
+        self.repr.token.set_span(span);
     }
 }
 
@@ -505,6 +505,24 @@
     }
 }
 
+impl LitBool {
+    pub fn new(value: bool, span: Span) -> Self {
+        LitBool { value, span }
+    }
+
+    pub fn value(&self) -> bool {
+        self.value
+    }
+
+    pub fn span(&self) -> Span {
+        self.span
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        self.span = span;
+    }
+}
+
 #[cfg(feature = "extra-traits")]
 mod debug_impls {
     use super::*;
@@ -1419,7 +1437,7 @@
         }
 
         let suffix = s;
-        if suffix.is_empty() || crate::ident::xid_ok(&suffix) {
+        if suffix.is_empty() || crate::ident::xid_ok(suffix) {
             let mut repr = value.to_string();
             if negative {
                 repr.insert(0, '-');
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -77,7 +77,7 @@
         $pub:ident $enum:ident $name:ident {
             $(
                 $(#[$variant_attr:meta])*
-                $variant:ident $( ($member:ident) )*,
+                $variant:ident $( ($($member:ident)::+) )*,
             )*
         }
 
@@ -87,7 +87,7 @@
         check_keyword_matches!(enum $enum);
 
         $($(
-            ast_enum_from_struct!($name::$variant, $member);
+            ast_enum_from_struct!($name::$variant, $($member)::+);
         )*)*
 
         #[cfg(feature = "printing")]
@@ -95,7 +95,7 @@
             $($remaining)*
             ()
             tokens
-            $name { $($variant $($member)*,)* }
+            $name { $($variant $($($member)::+)*,)* }
         }
     };
 }
@@ -104,6 +104,9 @@
     // No From<TokenStream> for verbatim variants.
     ($name:ident::Verbatim, $member:ident) => {};
 
+    // No From<TokenStream> for private variants.
+    ($name:ident::$variant:ident, crate::private) => {};
+
     ($name:ident::$variant:ident, $member:ident) => {
         impl From<$member> for $name {
             fn from(e: $member) -> $name {
@@ -130,6 +133,13 @@
             $tokens $name { $($next)* }
         );
     };
+
+    (($($arms:tt)*) $tokens:ident $name:ident { $variant:ident crate::private, $($next:tt)*}) => {
+        generate_to_tokens!(
+            ($($arms)* $name::$variant(_) => unreachable!(),)
+            $tokens $name { $($next)* }
+        );
+    };
 
     (($($arms:tt)*) $tokens:ident $name:ident {}) => {
         #[cfg_attr(doc_cfg, doc(cfg(feature = "printing")))]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/parse_macro_input.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/parse_macro_input.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/parse_macro_input.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/parse_macro_input.rs	2021-12-09 12:01:26.000000000 +0000
@@ -108,17 +108,17 @@
 macro_rules! parse_macro_input {
     ($tokenstream:ident as $ty:ty) => {
         match $crate::parse_macro_input::parse::<$ty>($tokenstream) {
-            $crate::export::Ok(data) => data,
-            $crate::export::Err(err) => {
-                return $crate::export::TokenStream::from(err.to_compile_error());
+            $crate::__private::Ok(data) => data,
+            $crate::__private::Err(err) => {
+                return $crate::__private::TokenStream::from(err.to_compile_error());
             }
         }
     };
     ($tokenstream:ident with $parser:path) => {
         match $crate::parse::Parser::parse($parser, $tokenstream) {
-            $crate::export::Ok(data) => data,
-            $crate::export::Err(err) => {
-                return $crate::export::TokenStream::from(err.to_compile_error());
+            $crate::__private::Ok(data) => data,
+            $crate::__private::Err(err) => {
+                return $crate::__private::TokenStream::from(err.to_compile_error());
             }
         }
     };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/parse_quote.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/parse_quote.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/parse_quote.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/parse_quote.rs	2021-12-09 12:01:26.000000000 +0000
@@ -74,8 +74,8 @@
 macro_rules! parse_quote {
     ($($tt:tt)*) => {
         $crate::parse_quote::parse(
-            $crate::export::From::from(
-                $crate::export::quote::quote!($($tt)*)
+            $crate::__private::From::from(
+                $crate::__private::quote::quote!($($tt)*)
             )
         )
     };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/path.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/path.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/path.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/path.rs	2021-12-09 12:01:26.000000000 +0000
@@ -213,8 +213,6 @@
 pub mod parsing {
     use super::*;
 
-    #[cfg(feature = "full")]
-    use crate::expr;
     use crate::ext::IdentExt;
     use crate::parse::{Parse, ParseStream, Result};
 
@@ -241,20 +239,90 @@
                 if input.peek(Ident) && input.peek2(Token![:]) && !input.peek2(Token![::]) {
                     return Ok(GenericArgument::Constraint(input.parse()?));
                 }
+            }
 
-                if input.peek(Lit) {
-                    let lit = input.parse()?;
-                    return Ok(GenericArgument::Const(Expr::Lit(lit)));
-                }
+            if input.peek(Lit) || input.peek(token::Brace) {
+                return const_argument(input).map(GenericArgument::Const);
+            }
+
+            #[cfg(feature = "full")]
+            let begin = input.fork();
 
-                if input.peek(token::Brace) {
-                    let block = input.call(expr::parsing::expr_block)?;
-                    return Ok(GenericArgument::Const(Expr::Block(block)));
+            let argument: Type = input.parse()?;
+
+            #[cfg(feature = "full")]
+            {
+                if match &argument {
+                    Type::Path(argument)
+                        if argument.qself.is_none()
+                            && argument.path.leading_colon.is_none()
+                            && argument.path.segments.len() == 1 =>
+                    {
+                        match argument.path.segments[0].arguments {
+                            PathArguments::AngleBracketed(_) => true,
+                            _ => false,
+                        }
+                    }
+                    _ => false,
+                } && if input.peek(Token![=]) {
+                    input.parse::<Token![=]>()?;
+                    input.parse::<Type>()?;
+                    true
+                } else if input.peek(Token![:]) {
+                    input.parse::<Token![:]>()?;
+                    input.call(constraint_bounds)?;
+                    true
+                } else {
+                    false
+                } {
+                    let verbatim = verbatim::between(begin, input);
+                    return Ok(GenericArgument::Type(Type::Verbatim(verbatim)));
                 }
             }
 
-            input.parse().map(GenericArgument::Type)
+            Ok(GenericArgument::Type(argument))
+        }
+    }
+
+    pub fn const_argument(input: ParseStream) -> Result<Expr> {
+        let lookahead = input.lookahead1();
+
+        if input.peek(Lit) {
+            let lit = input.parse()?;
+            return Ok(Expr::Lit(lit));
+        }
+
+        #[cfg(feature = "full")]
+        {
+            if input.peek(Ident) {
+                let ident: Ident = input.parse()?;
+                return Ok(Expr::Path(ExprPath {
+                    attrs: Vec::new(),
+                    qself: None,
+                    path: Path::from(ident),
+                }));
+            }
+        }
+
+        if input.peek(token::Brace) {
+            #[cfg(feature = "full")]
+            {
+                let block: ExprBlock = input.parse()?;
+                return Ok(Expr::Block(block));
+            }
+
+            #[cfg(not(feature = "full"))]
+            {
+                let begin = input.fork();
+                let content;
+                braced!(content in input);
+                content.parse::<Expr>()?;
+                let verbatim = verbatim::between(begin, input);
+                return Ok(Expr::Verbatim(verbatim));
+            }
         }
+
+        Err(lookahead.error())
     }
 
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
@@ -347,26 +415,29 @@
             Ok(Constraint {
                 ident: input.parse()?,
                 colon_token: input.parse()?,
-                bounds: {
-                    let mut bounds = Punctuated::new();
-                    loop {
-                        if input.peek(Token![,]) || input.peek(Token![>]) {
-                            break;
-                        }
-                        let value = input.parse()?;
-                        bounds.push_value(value);
-                        if !input.peek(Token![+]) {
-                            break;
-                        }
-                        let punct = input.parse()?;
-                        bounds.push_punct(punct);
-                    }
-                    bounds
-                },
+                bounds: constraint_bounds(input)?,
             })
         }
     }
 
+    #[cfg(feature = "full")]
+    fn constraint_bounds(input: ParseStream) -> Result<Punctuated<TypeParamBound, Token![+]>> {
+        let mut bounds = Punctuated::new();
+        loop {
+            if input.peek(Token![,]) || input.peek(Token![>]) {
+                break;
+            }
+            let value = input.parse()?;
+            bounds.push_value(value);
+            if !input.peek(Token![+]) {
+                break;
+            }
+            let punct = input.parse()?;
+            bounds.push_punct(punct);
+        }
+        Ok(bounds)
+    }
+
     impl Path {
         /// Parse a `Path` containing no path arguments on any of its segments.
         ///
@@ -734,7 +805,7 @@
     }
 
     impl private {
-        pub fn print_path(tokens: &mut TokenStream, qself: &Option<QSelf>, path: &Path) {
+        pub(crate) fn print_path(tokens: &mut TokenStream, qself: &Option<QSelf>, path: &Path) {
             let qself = match qself {
                 Some(qself) => qself,
                 None => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/pat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/pat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/pat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/pat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -72,8 +72,31 @@
         /// A pattern that matches any value: `_`.
         Wild(PatWild),
 
+        // The following is the only supported idiom for exhaustive matching of
+        // this enum.
+        //
+        //     match expr {
+        //         Pat::Box(e) => {...}
+        //         Pat::Ident(e) => {...}
+        //         ...
+        //         Pat::Wild(e) => {...}
+        //
+        //         #[cfg(test)]
+        //         Pat::__TestExhaustive(_) => unimplemented!(),
+        //         #[cfg(not(test))]
+        //         _ => { /* some sane fallback */ }
+        //     }
+        //
+        // This way we fail your tests but don't break your library when adding
+        // a variant. You will be notified by a test failure when a variant is
+        // added, so that you can add code to handle it, but your library will
+        // continue to compile and work for downstream users in the interim.
+        //
+        // Once `deny(reachable)` is available in rustc, Pat will be
+        // reimplemented as a non_exhaustive enum.
+        // https://github.com/rust-lang/rust/issues/44109#issuecomment-521781237
         #[doc(hidden)]
-        __Nonexhaustive,
+        __TestExhaustive(crate::private),
     }
 }
 
@@ -500,7 +523,7 @@
                 attrs,
                 member,
                 colon_token: input.parse()?,
-                pat: Box::new(multi_pat(input)?),
+                pat: Box::new(multi_pat_with_leading_vert(input)?),
             });
         }
 
@@ -579,7 +602,7 @@
 
         let mut elems = Punctuated::new();
         while !content.is_empty() {
-            let value = multi_pat(&content)?;
+            let value = multi_pat_with_leading_vert(&content)?;
             elems.push_value(value);
             if content.is_empty() {
                 break;
@@ -678,7 +701,7 @@
 
         let mut elems = Punctuated::new();
         while !content.is_empty() {
-            let value = multi_pat(&content)?;
+            let value = multi_pat_with_leading_vert(&content)?;
             elems.push_value(value);
             if content.is_empty() {
                 break;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/punctuated.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/punctuated.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/punctuated.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/punctuated.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,7 +50,17 @@
 
 impl<T, P> Punctuated<T, P> {
     /// Creates an empty punctuated sequence.
-    pub fn new() -> Punctuated<T, P> {
+    #[cfg(not(syn_no_const_vec_new))]
+    pub const fn new() -> Self {
+        Punctuated {
+            inner: Vec::new(),
+            last: None,
+        }
+    }
+
+    /// Creates an empty punctuated sequence.
+    #[cfg(syn_no_const_vec_new)]
+    pub fn new() -> Self {
         Punctuated {
             inner: Vec::new(),
             last: None,
@@ -152,7 +162,11 @@
     /// Panics if the sequence does not already have a trailing punctuation when
     /// this method is called.
     pub fn push_value(&mut self, value: T) {
-        assert!(self.empty_or_trailing());
+        assert!(
+            self.empty_or_trailing(),
+            "Punctuated::push_value: cannot push value if Punctuated is missing trailing punctuation",
+        );
+
         self.last = Some(Box::new(value));
     }
 
@@ -164,7 +178,11 @@
     ///
     /// Panics if the sequence is empty or already has a trailing punctuation.
     pub fn push_punct(&mut self, punctuation: P) {
-        assert!(self.last.is_some());
+        assert!(
+            self.last.is_some(),
+            "Punctuated::push_punct: cannot push punctuation if Punctuated is empty or already has trailing punctuation",
+        );
+
         let last = self.last.take().unwrap();
         self.inner.push((*last, punctuation));
     }
@@ -218,7 +236,10 @@
     where
         P: Default,
     {
-        assert!(index <= self.len());
+        assert!(
+            index <= self.len(),
+            "Punctuated::insert: index out of range",
+        );
 
         if index == self.len() {
             self.push(value);
@@ -444,7 +465,11 @@
 
 impl<T, P> Extend<Pair<T, P>> for Punctuated<T, P> {
     fn extend<I: IntoIterator<Item = Pair<T, P>>>(&mut self, i: I) {
-        assert!(self.empty_or_trailing());
+        assert!(
+            self.empty_or_trailing(),
+            "Punctuated::extend: Punctuated is not empty or does not have a trailing punctuation",
+        );
+
         let mut nomore = false;
         for pair in i {
             if nomore {
@@ -992,7 +1017,7 @@
         P: ToTokens,
     {
         fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.pairs())
+            tokens.append_all(self.pairs());
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/ty.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/ty.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/src/ty.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/src/ty.rs	2021-12-09 12:01:26.000000000 +0000
@@ -63,8 +63,31 @@
         /// Tokens in type position not interpreted by Syn.
         Verbatim(TokenStream),
 
+        // The following is the only supported idiom for exhaustive matching of
+        // this enum.
+        //
+        //     match expr {
+        //         Type::Array(e) => {...}
+        //         Type::BareFn(e) => {...}
+        //         ...
+        //         Type::Verbatim(e) => {...}
+        //
+        //         #[cfg(test)]
+        //         Type::__TestExhaustive(_) => unimplemented!(),
+        //         #[cfg(not(test))]
+        //         _ => { /* some sane fallback */ }
+        //     }
+        //
+        // This way we fail your tests but don't break your library when adding
+        // a variant. You will be notified by a test failure when a variant is
+        // added, so that you can add code to handle it, but your library will
+        // continue to compile and work for downstream users in the interim.
+        //
+        // Once `deny(reachable)` is available in rustc, Type will be
+        // reimplemented as a non_exhaustive enum.
+        // https://github.com/rust-lang/rust/issues/44109#issuecomment-521781237
         #[doc(hidden)]
-        __Nonexhaustive,
+        __TestExhaustive(crate::private),
     }
 }
 
@@ -318,7 +341,6 @@
     use crate::parse::{Parse, ParseStream, Result};
     use crate::path;
     use proc_macro2::{Punct, Spacing, TokenTree};
-    use std::iter::FromIterator;
 
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     impl Parse for Type {
@@ -390,6 +412,7 @@
                 && !lookahead.peek(Token![self])
                 && !lookahead.peek(Token![Self])
                 && !lookahead.peek(Token![crate])
+                || input.peek(Token![dyn])
             {
                 return Err(lookahead.error());
             }
@@ -435,9 +458,13 @@
                         let mut elems = Punctuated::new();
                         elems.push_value(first);
                         elems.push_punct(content.parse()?);
-                        let rest: Punctuated<Type, Token![,]> =
-                            content.parse_terminated(Parse::parse)?;
-                        elems.extend(rest);
+                        while !content.is_empty() {
+                            elems.push_value(content.parse()?);
+                            if content.is_empty() {
+                                break;
+                            }
+                            elems.push_punct(content.parse()?);
+                        }
                         elems
                     },
                 }));
@@ -514,15 +541,7 @@
             || lookahead.peek(Token![<])
         {
             if input.peek(Token![dyn]) {
-                let mut trait_object: TypeTraitObject = input.parse()?;
-                if lifetimes.is_some() {
-                    match trait_object.bounds.iter_mut().next().unwrap() {
-                        TypeParamBound::Trait(trait_bound) => {
-                            trait_bound.lifetimes = lifetimes;
-                        }
-                        TypeParamBound::Lifetime(_) => unreachable!(),
-                    }
-                }
+                let trait_object: TypeTraitObject = input.parse()?;
                 return Ok(Type::TraitObject(trait_object));
             }
 
@@ -770,9 +789,13 @@
                     let mut elems = Punctuated::new();
                     elems.push_value(first);
                     elems.push_punct(content.parse()?);
-                    let rest: Punctuated<Type, Token![,]> =
-                        content.parse_terminated(Parse::parse)?;
-                    elems.extend(rest);
+                    while !content.is_empty() {
+                        elems.push_value(content.parse()?);
+                        if content.is_empty() {
+                            break;
+                        }
+                        elems.push_punct(content.parse()?);
+                    }
                     elems
                 },
             })
@@ -978,12 +1001,14 @@
                     TokenTree::Punct(Punct::new('.', Spacing::Joint)),
                     TokenTree::Punct(Punct::new('.', Spacing::Alone)),
                 ];
-                let tokens = TokenStream::from_iter(args.into_iter().zip(&dot3.spans).map(
-                    |(mut arg, span)| {
+                let tokens: TokenStream = args
+                    .into_iter()
+                    .zip(&dot3.spans)
+                    .map(|(mut arg, span)| {
                         arg.set_span(*span);
                         arg
-                    },
-                ));
+                    })
+                    .collect();
                 Type::Verbatim(tokens)
             } else if allow_mut_self && input.peek(Token![mut]) && input.peek2(Token![self]) {
                 has_mut_self = true;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/common/eq.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/common/eq.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/common/eq.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/common/eq.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,22 +6,26 @@
     AngleBracketedArg, AngleBracketedArgs, AnonConst, Arm, AssocItemKind, AssocTyConstraint,
     AssocTyConstraintKind, Async, AttrId, AttrItem, AttrKind, AttrStyle, Attribute, BareFnTy,
     BinOpKind, BindingMode, Block, BlockCheckMode, BorrowKind, CaptureBy, Const, Crate, CrateSugar,
-    Defaultness, EnumDef, Expr, ExprKind, Extern, Field, FieldPat, FloatTy, FnDecl, FnHeader,
-    FnRetTy, FnSig, ForeignItemKind, ForeignMod, GenericArg, GenericArgs, GenericBound,
-    GenericParam, GenericParamKind, Generics, GlobalAsm, ImplPolarity, InlineAsm, InlineAsmOperand,
-    InlineAsmOptions, InlineAsmRegOrRegClass, InlineAsmTemplatePiece, IntTy, IsAuto, Item,
-    ItemKind, Label, Lifetime, Lit, LitFloatType, LitIntType, LitKind, LlvmAsmDialect,
-    LlvmInlineAsm, LlvmInlineAsmOutput, Local, MacArgs, MacCall, MacCallStmt, MacDelimiter,
-    MacStmtStyle, MacroDef, Mod, Movability, MutTy, Mutability, NodeId, Param, ParenthesizedArgs,
-    Pat, PatKind, Path, PathSegment, PolyTraitRef, QSelf, RangeEnd, RangeLimits, RangeSyntax, Stmt,
-    StmtKind, StrLit, StrStyle, StructField, StructRest, TraitBoundModifier, TraitObjectSyntax,
-    TraitRef, Ty, TyKind, UintTy, UnOp, Unsafe, UnsafeSource, UseTree, UseTreeKind, Variant,
-    VariantData, Visibility, VisibilityKind, WhereBoundPredicate, WhereClause, WhereEqPredicate,
-    WherePredicate, WhereRegionPredicate,
+    Defaultness, EnumDef, Expr, ExprField, ExprKind, Extern, FieldDef, FloatTy, FnDecl, FnHeader,
+    FnKind, FnRetTy, FnSig, ForeignItemKind, ForeignMod, GenericArg, GenericArgs, GenericBound,
+    GenericParam, GenericParamKind, Generics, ImplKind, ImplPolarity, Inline, InlineAsm,
+    InlineAsmOperand, InlineAsmOptions, InlineAsmRegOrRegClass, InlineAsmTemplatePiece, IntTy,
+    IsAuto, Item, ItemKind, Label, Lifetime, Lit, LitFloatType, LitIntType, LitKind,
+    LlvmAsmDialect, LlvmInlineAsm, LlvmInlineAsmOutput, Local, MacArgs, MacCall, MacCallStmt,
+    MacDelimiter, MacStmtStyle, MacroDef, ModKind, Movability, MutTy, Mutability, NodeId, Param,
+    ParenthesizedArgs, Pat, PatField, PatKind, Path, PathSegment, PolyTraitRef, QSelf, RangeEnd,
+    RangeLimits, RangeSyntax, Stmt, StmtKind, StrLit, StrStyle, StructExpr, StructRest,
+    TraitBoundModifier, TraitKind, TraitObjectSyntax, TraitRef, Ty, TyAliasKind, TyKind, UintTy,
+    UnOp, Unsafe, UnsafeSource, UseTree, UseTreeKind, Variant, VariantData, Visibility,
+    VisibilityKind, WhereBoundPredicate, WhereClause, WhereEqPredicate, WherePredicate,
+    WhereRegionPredicate,
 };
 use rustc_ast::ptr::P;
 use rustc_ast::token::{self, CommentKind, DelimToken, Nonterminal, Token, TokenKind};
-use rustc_ast::tokenstream::{self, DelimSpan, LazyTokenStream, TokenStream, TokenTree};
+use rustc_ast::tokenstream::{
+    AttrAnnotatedTokenStream, AttrAnnotatedTokenTree, AttributesData, DelimSpan, LazyTokenStream,
+    Spacing, TokenStream, TokenTree,
+};
 use rustc_data_structures::sync::Lrc;
 use rustc_data_structures::thin_vec::ThinVec;
 use rustc_span::source_map::Spanned;
@@ -32,6 +36,12 @@
     fn eq(&self, other: &Self) -> bool;
 }
 
+impl<T: SpanlessEq> SpanlessEq for Box<T> {
+    fn eq(&self, other: &Self) -> bool {
+        SpanlessEq::eq(&**self, &**other)
+    }
+}
+
 impl<T: SpanlessEq> SpanlessEq for P<T> {
     fn eq(&self, other: &Self) -> bool {
         SpanlessEq::eq(&**self, &**other)
@@ -103,6 +113,7 @@
 spanless_eq_true!(AttrId);
 spanless_eq_true!(NodeId);
 spanless_eq_true!(SyntaxContext);
+spanless_eq_true!(Spacing);
 
 macro_rules! spanless_eq_partial_eq {
     ($name:ty) => {
@@ -129,47 +140,47 @@
 
 macro_rules! spanless_eq_struct {
     {
-        $($name:ident)::+ $(<$param:ident>)?;
-        $([$field:ident $other:ident])*
-        $(![$ignore:ident])*
+        $($name:ident)::+ $(<$param:ident>)?
+        $([$field:tt $this:ident $other:ident])*
+        $(![$ignore:tt])*;
     } => {
         impl $(<$param: SpanlessEq>)* SpanlessEq for $($name)::+ $(<$param>)* {
             fn eq(&self, other: &Self) -> bool {
-                let $($name)::+ { $($field,)* $($ignore: _,)* } = self;
+                let $($name)::+ { $($field: $this,)* $($ignore: _,)* } = self;
                 let $($name)::+ { $($field: $other,)* $($ignore: _,)* } = other;
-                true $(&& SpanlessEq::eq($field, $other))*
+                true $(&& SpanlessEq::eq($this, $other))*
             }
         }
     };
 
     {
-        $($name:ident)::+ $(<$param:ident>)?;
-        $([$field:ident $other:ident])*
-        $(![$ignore:ident])*
-        $next:ident
+        $($name:ident)::+ $(<$param:ident>)?
+        $([$field:tt $this:ident $other:ident])*
+        $(![$ignore:tt])*;
+        !$next:tt
         $($rest:tt)*
     } => {
         spanless_eq_struct! {
-            $($name)::+ $(<$param>)*;
-            $([$field $other])*
-            [$next other]
+            $($name)::+ $(<$param>)*
+            $([$field $this $other])*
             $(![$ignore])*
+            ![$next];
             $($rest)*
         }
     };
 
     {
-        $($name:ident)::+ $(<$param:ident>)?;
-        $([$field:ident $other:ident])*
-        $(![$ignore:ident])*
-        !$next:ident
+        $($name:ident)::+ $(<$param:ident>)?
+        $([$field:tt $this:ident $other:ident])*
+        $(![$ignore:tt])*;
+        $next:tt
         $($rest:tt)*
     } => {
         spanless_eq_struct! {
-            $($name)::+ $(<$param>)*;
-            $([$field $other])*
-            $(![$ignore])*
-            ![$next]
+            $($name)::+ $(<$param>)*
+            $([$field $this $other])*
+            [$next this other]
+            $(![$ignore])*;
             $($rest)*
         }
     };
@@ -278,23 +289,26 @@
 spanless_eq_struct!(AnonConst; id value);
 spanless_eq_struct!(Arm; attrs pat guard body span id is_placeholder);
 spanless_eq_struct!(AssocTyConstraint; id ident gen_args kind span);
+spanless_eq_struct!(AttrAnnotatedTokenStream; 0);
 spanless_eq_struct!(AttrItem; path args tokens);
 spanless_eq_struct!(Attribute; kind id style span);
+spanless_eq_struct!(AttributesData; attrs tokens);
 spanless_eq_struct!(BareFnTy; unsafety ext generic_params decl);
 spanless_eq_struct!(Block; stmts id rules span tokens);
-spanless_eq_struct!(Crate; module attrs span proc_macros);
+spanless_eq_struct!(Crate; attrs items span proc_macros);
 spanless_eq_struct!(EnumDef; variants);
 spanless_eq_struct!(Expr; id kind span attrs !tokens);
-spanless_eq_struct!(Field; attrs id span ident expr is_shorthand is_placeholder);
-spanless_eq_struct!(FieldPat; ident pat is_shorthand attrs id span is_placeholder);
+spanless_eq_struct!(ExprField; attrs id span ident expr is_shorthand is_placeholder);
+spanless_eq_struct!(FieldDef; attrs id span vis ident ty is_placeholder);
 spanless_eq_struct!(FnDecl; inputs output);
 spanless_eq_struct!(FnHeader; constness asyncness unsafety ext);
+spanless_eq_struct!(FnKind; 0 1 2 3);
 spanless_eq_struct!(FnSig; header decl span);
 spanless_eq_struct!(ForeignMod; unsafety abi items);
 spanless_eq_struct!(GenericParam; id ident attrs bounds is_placeholder kind);
 spanless_eq_struct!(Generics; params where_clause span);
-spanless_eq_struct!(GlobalAsm; asm);
-spanless_eq_struct!(InlineAsm; template operands options line_spans);
+spanless_eq_struct!(ImplKind; unsafety polarity defaultness constness generics of_trait self_ty items);
+spanless_eq_struct!(InlineAsm; template operands clobber_abi options line_spans);
 spanless_eq_struct!(Item<K>; attrs id span vis ident kind !tokens);
 spanless_eq_struct!(Label; ident);
 spanless_eq_struct!(Lifetime; id ident);
@@ -305,20 +319,22 @@
 spanless_eq_struct!(MacCall; path args prior_type_ascription);
 spanless_eq_struct!(MacCallStmt; mac style attrs tokens);
 spanless_eq_struct!(MacroDef; body macro_rules);
-spanless_eq_struct!(Mod; inner unsafety items inline);
 spanless_eq_struct!(MutTy; ty mutbl);
-spanless_eq_struct!(ParenthesizedArgs; span inputs output);
+spanless_eq_struct!(ParenthesizedArgs; span inputs inputs_span output);
 spanless_eq_struct!(Pat; id kind span tokens);
+spanless_eq_struct!(PatField; ident pat is_shorthand attrs id span is_placeholder);
 spanless_eq_struct!(Path; span segments tokens);
 spanless_eq_struct!(PathSegment; ident id args);
 spanless_eq_struct!(PolyTraitRef; bound_generic_params trait_ref span);
 spanless_eq_struct!(QSelf; ty path_span position);
 spanless_eq_struct!(Stmt; id kind span);
 spanless_eq_struct!(StrLit; style symbol suffix span symbol_unescaped);
-spanless_eq_struct!(StructField; attrs id span vis ident ty is_placeholder);
+spanless_eq_struct!(StructExpr; qself path fields rest);
 spanless_eq_struct!(Token; kind span);
+spanless_eq_struct!(TraitKind; 0 1 2 3 4);
 spanless_eq_struct!(TraitRef; path ref_id);
 spanless_eq_struct!(Ty; id kind span tokens);
+spanless_eq_struct!(TyAliasKind; 0 1 2 3);
 spanless_eq_struct!(UseTree; prefix kind span);
 spanless_eq_struct!(Variant; attrs id span !vis ident data disr_expr is_placeholder);
 spanless_eq_struct!(Visibility; kind span tokens);
@@ -328,9 +344,10 @@
 spanless_eq_struct!(WhereRegionPredicate; span lifetime bounds);
 spanless_eq_struct!(token::Lit; kind symbol suffix);
 spanless_eq_enum!(AngleBracketedArg; Arg(0) Constraint(0));
-spanless_eq_enum!(AssocItemKind; Const(0 1 2) Fn(0 1 2 3) TyAlias(0 1 2 3) MacCall(0));
+spanless_eq_enum!(AssocItemKind; Const(0 1 2) Fn(0) TyAlias(0) MacCall(0));
 spanless_eq_enum!(AssocTyConstraintKind; Equality(ty) Bound(bounds));
 spanless_eq_enum!(Async; Yes(span closure_id return_impl_trait_id) No);
+spanless_eq_enum!(AttrAnnotatedTokenTree; Token(0) Delimited(0 1 2) Attributes(0));
 spanless_eq_enum!(AttrStyle; Outer Inner);
 spanless_eq_enum!(BinOpKind; Add Sub Mul Div Rem And Or BitXor BitAnd BitOr Shl Shr Eq Lt Le Ne Ge Gt);
 spanless_eq_enum!(BindingMode; ByRef(0) ByValue(0));
@@ -343,12 +360,13 @@
 spanless_eq_enum!(Extern; None Implicit Explicit(0));
 spanless_eq_enum!(FloatTy; F32 F64);
 spanless_eq_enum!(FnRetTy; Default(0) Ty(0));
-spanless_eq_enum!(ForeignItemKind; Static(0 1 2) Fn(0 1 2 3) TyAlias(0 1 2 3) MacCall(0));
+spanless_eq_enum!(ForeignItemKind; Static(0 1 2) Fn(0) TyAlias(0) MacCall(0));
 spanless_eq_enum!(GenericArg; Lifetime(0) Type(0) Const(0));
 spanless_eq_enum!(GenericArgs; AngleBracketed(0) Parenthesized(0));
 spanless_eq_enum!(GenericBound; Trait(0 1) Outlives(0));
-spanless_eq_enum!(GenericParamKind; Lifetime Type(default) Const(ty kw_span));
+spanless_eq_enum!(GenericParamKind; Lifetime Type(default) Const(ty kw_span default));
 spanless_eq_enum!(ImplPolarity; Positive Negative(0));
+spanless_eq_enum!(Inline; Yes No);
 spanless_eq_enum!(InlineAsmRegOrRegClass; Reg(0) RegClass(0));
 spanless_eq_enum!(InlineAsmTemplatePiece; String(0) Placeholder(operand_idx modifier span));
 spanless_eq_enum!(IntTy; Isize I8 I16 I32 I64 I128);
@@ -359,6 +377,7 @@
 spanless_eq_enum!(MacArgs; Empty Delimited(0 1 2) Eq(0 1));
 spanless_eq_enum!(MacDelimiter; Parenthesis Bracket Brace);
 spanless_eq_enum!(MacStmtStyle; Semicolon Braces NoBraces);
+spanless_eq_enum!(ModKind; Loaded(0 1 2) Unloaded);
 spanless_eq_enum!(Movability; Static Movable);
 spanless_eq_enum!(Mutability; Mut Not);
 spanless_eq_enum!(RangeEnd; Included(0) Excluded);
@@ -379,28 +398,27 @@
 spanless_eq_enum!(WherePredicate; BoundPredicate(0) RegionPredicate(0) EqPredicate(0));
 spanless_eq_enum!(ExprKind; Box(0) Array(0) ConstBlock(0) Call(0 1)
     MethodCall(0 1 2) Tup(0) Binary(0 1 2) Unary(0 1) Lit(0) Cast(0 1) Type(0 1)
-    Let(0 1) If(0 1 2) While(0 1 2) ForLoop(0 1 2 3) Loop(0 1) Match(0 1)
+    Let(0 1 2) If(0 1 2) While(0 1 2) ForLoop(0 1 2 3) Loop(0 1) Match(0 1)
     Closure(0 1 2 3 4 5) Block(0 1) Async(0 1 2) Await(0) TryBlock(0)
     Assign(0 1 2) AssignOp(0 1 2) Field(0 1) Index(0 1) Underscore Range(0 1 2)
     Path(0 1) AddrOf(0 1 2) Break(0 1) Continue(0) Ret(0) InlineAsm(0)
-    LlvmInlineAsm(0) MacCall(0) Struct(0 1 2) Repeat(0 1) Paren(0) Try(0)
-    Yield(0) Err);
+    LlvmInlineAsm(0) MacCall(0) Struct(0) Repeat(0 1) Paren(0) Try(0) Yield(0)
+    Err);
 spanless_eq_enum!(InlineAsmOperand; In(reg expr) Out(reg late expr)
-    InOut(reg late expr) SplitInOut(reg late in_expr out_expr) Const(expr)
+    InOut(reg late expr) SplitInOut(reg late in_expr out_expr) Const(anon_const)
     Sym(expr));
 spanless_eq_enum!(ItemKind; ExternCrate(0) Use(0) Static(0 1 2) Const(0 1 2)
-    Fn(0 1 2 3) Mod(0) ForeignMod(0) GlobalAsm(0) TyAlias(0 1 2 3) Enum(0 1)
-    Struct(0 1) Union(0 1) Trait(0 1 2 3 4) TraitAlias(0 1)
-    Impl(unsafety polarity defaultness constness generics of_trait self_ty items)
-    MacCall(0) MacroDef(0));
+    Fn(0) Mod(0 1) ForeignMod(0) GlobalAsm(0) TyAlias(0) Enum(0 1) Struct(0 1)
+    Union(0 1) Trait(0) TraitAlias(0 1) Impl(0) MacCall(0) MacroDef(0));
 spanless_eq_enum!(LitKind; Str(0 1) ByteStr(0) Byte(0) Char(0) Int(0 1)
     Float(0 1) Bool(0) Err(0));
-spanless_eq_enum!(PatKind; Wild Ident(0 1 2) Struct(0 1 2) TupleStruct(0 1)
+spanless_eq_enum!(PatKind; Wild Ident(0 1 2) Struct(0 1 2 3) TupleStruct(0 1 2)
     Or(0) Path(0 1) Tuple(0) Box(0) Ref(0 1) Lit(0) Range(0 1 2) Slice(0) Rest
     Paren(0) MacCall(0));
 spanless_eq_enum!(TyKind; Slice(0) Array(0 1) Ptr(0) Rptr(0 1) BareFn(0) Never
-    Tup(0) Path(0 1) TraitObject(0 1) ImplTrait(0 1) Paren(0) Typeof(0) Infer
-    ImplicitSelf MacCall(0) Err CVarArgs);
+    Tup(0) AnonymousStruct(0 1) AnonymousUnion(0 1) Path(0 1) TraitObject(0 1)
+    ImplTrait(0 1) Paren(0) Typeof(0) Infer ImplicitSelf MacCall(0) Err
+    CVarArgs);
 
 impl SpanlessEq for Ident {
     fn eq(&self, other: &Self) -> bool {
@@ -467,8 +485,8 @@
 
 impl SpanlessEq for TokenStream {
     fn eq(&self, other: &Self) -> bool {
-        let mut this_trees = self.trees_ref();
-        let mut other_trees = other.trees_ref();
+        let mut this_trees = self.trees();
+        let mut other_trees = other.trees();
         loop {
             let this = match this_trees.next() {
                 None => return other_trees.next().is_none(),
@@ -478,7 +496,7 @@
                 None => return false,
                 Some(tree) => tree,
             };
-            if SpanlessEq::eq(this, other) {
+            if SpanlessEq::eq(&this, &other) {
                 continue;
             }
             if let (TokenTree::Token(this), TokenTree::Token(other)) = (this, other) {
@@ -505,7 +523,7 @@
 fn doc_comment<'a>(
     style: AttrStyle,
     unescaped: Symbol,
-    trees: &mut impl Iterator<Item = &'a TokenTree>,
+    trees: &mut impl Iterator<Item = TokenTree>,
 ) -> bool {
     if match style {
         AttrStyle::Outer => false,
@@ -523,12 +541,12 @@
         Some(TokenTree::Delimited(_span, DelimToken::Bracket, stream)) => stream,
         _ => return false,
     };
-    let mut trees = stream.trees_ref();
+    let mut trees = stream.trees();
     match trees.next() {
         Some(TokenTree::Token(Token {
             kind: TokenKind::Ident(symbol, false),
             span: _,
-        })) if *symbol == sym::doc => {}
+        })) if symbol == sym::doc => {}
         _ => return false,
     }
     match trees.next() {
@@ -538,19 +556,24 @@
         })) => {}
         _ => return false,
     }
-    is_escaped_literal(trees, unescaped)
+    match trees.next() {
+        Some(TokenTree::Token(token)) => {
+            is_escaped_literal(&token, unescaped) && trees.next().is_none()
+        }
+        _ => false,
+    }
 }
 
-fn is_escaped_literal(mut trees: tokenstream::CursorRef, unescaped: Symbol) -> bool {
-    match match trees.next() {
-        Some(TokenTree::Token(Token {
+fn is_escaped_literal(token: &Token, unescaped: Symbol) -> bool {
+    match match token {
+        Token {
             kind: TokenKind::Literal(lit),
             span: _,
-        })) => Lit::from_lit_token(*lit, DUMMY_SP),
-        Some(TokenTree::Token(Token {
+        } => Lit::from_lit_token(*lit, DUMMY_SP),
+        Token {
             kind: TokenKind::Interpolated(nonterminal),
             span: _,
-        })) => match nonterminal.as_ref() {
+        } => match nonterminal.as_ref() {
             Nonterminal::NtExpr(expr) => match &expr.kind {
                 ExprKind::Lit(lit) => Ok(lit.clone()),
                 _ => return false,
@@ -568,10 +591,7 @@
                 },
             kind: LitKind::Str(symbol, StrStyle::Cooked),
             span: _,
-        }) => {
-            symbol.as_str().replace('\r', "") == unescaped.as_str().replace('\r', "")
-                && trees.next().is_none()
-        }
+        }) => symbol.as_str().replace('\r', "") == unescaped.as_str().replace('\r', ""),
         _ => false,
     }
 }
@@ -601,9 +621,7 @@
                 SpanlessEq::eq(&path, &item2.path)
                     && match &item2.args {
                         MacArgs::Empty | MacArgs::Delimited(..) => false,
-                        MacArgs::Eq(_span, tokens) => {
-                            is_escaped_literal(tokens.trees_ref(), *unescaped)
-                        }
+                        MacArgs::Eq(_span, token) => is_escaped_literal(token, *unescaped),
                     }
             }
             (AttrKind::Normal(..), AttrKind::DocComment(..)) => SpanlessEq::eq(other, self),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/debug/gen.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/debug/gen.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/debug/gen.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/debug/gen.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3424,12 +3424,24 @@
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         let _val = &self.value;
         match _val {
-            syn::Lit::Str(_val) => write!(formatter, "{:?}", _val.value()),
-            syn::Lit::ByteStr(_val) => write!(formatter, "{:?}", _val.value()),
-            syn::Lit::Byte(_val) => write!(formatter, "{:?}", _val.value()),
-            syn::Lit::Char(_val) => write!(formatter, "{:?}", _val.value()),
-            syn::Lit::Int(_val) => write!(formatter, "{}", _val),
-            syn::Lit::Float(_val) => write!(formatter, "{}", _val),
+            syn::Lit::Str(_val) => {
+                write!(formatter, "{:?}", _val.value())
+            }
+            syn::Lit::ByteStr(_val) => {
+                write!(formatter, "{:?}", _val.value())
+            }
+            syn::Lit::Byte(_val) => {
+                write!(formatter, "{:?}", _val.value())
+            }
+            syn::Lit::Char(_val) => {
+                write!(formatter, "{:?}", _val.value())
+            }
+            syn::Lit::Int(_val) => {
+                write!(formatter, "{}", _val)
+            }
+            syn::Lit::Float(_val) => {
+                write!(formatter, "{}", _val)
+            }
             syn::Lit::Bool(_val) => {
                 let mut formatter = formatter.debug_struct("Lit::Bool");
                 formatter.field("value", Lite(&_val.value));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/repo/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/repo/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/repo/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/repo/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,10 +8,14 @@
 use tar::Archive;
 use walkdir::DirEntry;
 
-const REVISION: &str = "72da5a9d85a522b11e80d0fdd1fd95247d442604";
+const REVISION: &str = "716394d6581b60c75cfdd88b8e5b876f2db88b62";
 
 #[rustfmt::skip]
 static EXCLUDE: &[&str] = &[
+    // Rustc loses some attributes
+    // https://github.com/rust-lang/rust/issues/84879
+    "src/test/ui/proc-macro/issue-81555.rs",
+
     // Compile-fail expr parameter in const generic position: f::<1 + 2>()
     "src/test/ui/const-generics/closing-args-token.rs",
     "src/test/ui/const-generics/const-expression-parameter.rs",
@@ -22,16 +26,19 @@
     "src/test/ui/issues/issue-34074.rs",
     "src/test/ui/proc-macro/trait-fn-args-2015.rs",
 
+    // Excessive nesting
+    "src/test/ui/issues/issue-74564-if-expr-stack-overflow.rs",
+
     // Not actually test cases
     "src/test/rustdoc-ui/test-compile-fail2.rs",
     "src/test/rustdoc-ui/test-compile-fail3.rs",
     "src/test/ui/include-single-expr-helper.rs",
     "src/test/ui/include-single-expr-helper-1.rs",
-    "src/test/ui/issues/auxiliary/issue-21146-inc.rs",
     "src/test/ui/json-bom-plus-crlf-multifile-aux.rs",
     "src/test/ui/lint/expansion-time-include.rs",
     "src/test/ui/macros/auxiliary/macro-comma-support.rs",
     "src/test/ui/macros/auxiliary/macro-include-items-expr.rs",
+    "src/test/ui/parser/auxiliary/issue-21146-inc.rs",
 ];
 
 pub fn base_dir_filter(entry: &DirEntry) -> bool {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_expr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_expr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_expr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_expr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -300,3 +300,21 @@
     }
     "###);
 }
+
+// https://github.com/dtolnay/syn/issues/1019
+#[test]
+fn test_closure_vs_rangefull() {
+    #[rustfmt::skip] // rustfmt bug: https://github.com/rust-lang/rustfmt/issues/4808
+    let tokens = quote!(|| .. .method());
+    snapshot!(tokens as Expr, @r###"
+    Expr::MethodCall {
+        receiver: Expr::Closure {
+            output: Default,
+            body: Expr::Range {
+                limits: HalfOpen,
+            },
+        },
+        method: "method",
+    }
+    "###);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_item.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_item.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_item.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_item.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 use proc_macro2::{Delimiter, Group, Ident, Span, TokenStream, TokenTree};
 use quote::quote;
 use std::iter::FromIterator;
-use syn::Item;
+use syn::{Item, ItemTrait};
 
 #[test]
 fn test_macro_variable_attr() {
@@ -159,3 +159,143 @@
     }
     "###);
 }
+
+#[test]
+fn test_supertraits() {
+    // Rustc parses all of the following.
+
+    #[rustfmt::skip]
+    let tokens = quote!(trait Trait where {});
+    snapshot!(tokens as ItemTrait, @r###"
+    ItemTrait {
+        vis: Inherited,
+        ident: "Trait",
+        generics: Generics {
+            where_clause: Some(WhereClause),
+        },
+    }
+    "###);
+
+    #[rustfmt::skip]
+    let tokens = quote!(trait Trait: where {});
+    snapshot!(tokens as ItemTrait, @r###"
+    ItemTrait {
+        vis: Inherited,
+        ident: "Trait",
+        generics: Generics {
+            where_clause: Some(WhereClause),
+        },
+        colon_token: Some,
+    }
+    "###);
+
+    #[rustfmt::skip]
+    let tokens = quote!(trait Trait: Sized where {});
+    snapshot!(tokens as ItemTrait, @r###"
+    ItemTrait {
+        vis: Inherited,
+        ident: "Trait",
+        generics: Generics {
+            where_clause: Some(WhereClause),
+        },
+        colon_token: Some,
+        supertraits: [
+            Trait(TraitBound {
+                modifier: None,
+                path: Path {
+                    segments: [
+                        PathSegment {
+                            ident: "Sized",
+                            arguments: None,
+                        },
+                    ],
+                },
+            }),
+        ],
+    }
+    "###);
+
+    #[rustfmt::skip]
+    let tokens = quote!(trait Trait: Sized + where {});
+    snapshot!(tokens as ItemTrait, @r###"
+    ItemTrait {
+        vis: Inherited,
+        ident: "Trait",
+        generics: Generics {
+            where_clause: Some(WhereClause),
+        },
+        colon_token: Some,
+        supertraits: [
+            Trait(TraitBound {
+                modifier: None,
+                path: Path {
+                    segments: [
+                        PathSegment {
+                            ident: "Sized",
+                            arguments: None,
+                        },
+                    ],
+                },
+            }),
+        ],
+    }
+    "###);
+}
+
+#[test]
+fn test_type_empty_bounds() {
+    #[rustfmt::skip]
+    let tokens = quote! {
+        trait Foo {
+            type Bar: ;
+        }
+    };
+
+    snapshot!(tokens as ItemTrait, @r###"
+    ItemTrait {
+        vis: Inherited,
+        ident: "Foo",
+        generics: Generics,
+        items: [
+            TraitItem::Type {
+                ident: "Bar",
+                generics: Generics,
+                colon_token: Some,
+            },
+        ],
+    }
+    "###);
+}
+
+#[test]
+fn test_impl_visibility() {
+    let tokens = quote! {
+        pub default unsafe impl union {}
+    };
+
+    snapshot!(tokens as Item, @"Verbatim(`pub default unsafe impl union { }`)");
+}
+
+#[test]
+fn test_impl_type_parameter_defaults() {
+    #[cfg(any())]
+    impl<T = ()> () {}
+    let tokens = quote! {
+        impl<T = ()> () {}
+    };
+    snapshot!(tokens as Item, @r###"
+    Item::Impl {
+        generics: Generics {
+            lt_token: Some,
+            params: [
+                Type(TypeParam {
+                    ident: "T",
+                    eq_token: Some,
+                    default: Some(Type::Tuple),
+                }),
+            ],
+            gt_token: Some,
+        },
+        self_ty: Type::Tuple,
+    }"###);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_pat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_pat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_pat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_pat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -31,14 +31,14 @@
     syn::parse_str::<Item>("fn fun2(|| A: E) {}").unwrap_err();
 
     syn::parse_str::<Stmt>("let | () = ();").unwrap();
-    syn::parse_str::<Stmt>("let (| A): E;").unwrap_err();
+    syn::parse_str::<Stmt>("let (| A): E;").unwrap();
     syn::parse_str::<Stmt>("let (|| A): (E);").unwrap_err();
-    syn::parse_str::<Stmt>("let (| A,): (E,);").unwrap_err();
-    syn::parse_str::<Stmt>("let [| A]: [E; 1];").unwrap_err();
+    syn::parse_str::<Stmt>("let (| A,): (E,);").unwrap();
+    syn::parse_str::<Stmt>("let [| A]: [E; 1];").unwrap();
     syn::parse_str::<Stmt>("let [|| A]: [E; 1];").unwrap_err();
-    syn::parse_str::<Stmt>("let TS(| A): TS;").unwrap_err();
+    syn::parse_str::<Stmt>("let TS(| A): TS;").unwrap();
     syn::parse_str::<Stmt>("let TS(|| A): TS;").unwrap_err();
-    syn::parse_str::<Stmt>("let NS { f: | A }: NS;").unwrap_err();
+    syn::parse_str::<Stmt>("let NS { f: | A }: NS;").unwrap();
     syn::parse_str::<Stmt>("let NS { f: || A }: NS;").unwrap_err();
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_precedence.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_precedence.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_precedence.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_precedence.rs	2021-12-09 12:01:26.000000000 +0000
@@ -151,7 +151,7 @@
     let mut passed = 0;
     let mut failed = 0;
 
-    rustc_span::with_session_globals(edition, || {
+    rustc_span::create_session_if_not_set_then(edition, |_| {
         for expr in exprs {
             let raw = quote!(#expr).to_string();
 
@@ -195,19 +195,21 @@
 /// This method operates on librustc objects.
 fn librustc_brackets(mut librustc_expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
     use rustc_ast::ast::{
-        Block, BorrowKind, Expr, ExprKind, Field, GenericArg, Pat, Stmt, StmtKind, StructRest, Ty,
+        Block, BorrowKind, Expr, ExprField, ExprKind, GenericArg, Pat, Stmt, StmtKind, StructExpr,
+        StructRest, Ty,
     };
     use rustc_ast::mut_visit::{noop_visit_generic_arg, MutVisitor};
     use rustc_data_structures::map_in_place::MapInPlace;
     use rustc_data_structures::thin_vec::ThinVec;
     use rustc_span::DUMMY_SP;
     use std::mem;
+    use std::ops::DerefMut;
 
     struct BracketsVisitor {
         failed: bool,
-    };
+    }
 
-    fn flat_map_field<T: MutVisitor>(mut f: Field, vis: &mut T) -> Vec<Field> {
+    fn flat_map_field<T: MutVisitor>(mut f: ExprField, vis: &mut T) -> Vec<ExprField> {
         if f.is_shorthand {
             noop_visit_expr(&mut f.expr, vis);
         } else {
@@ -237,11 +239,18 @@
         use rustc_ast::mut_visit::{noop_visit_expr, visit_thin_attrs};
         match &mut e.kind {
             ExprKind::AddrOf(BorrowKind::Raw, ..) => {}
-            ExprKind::Struct(path, fields, expr) => {
+            ExprKind::Struct(expr) => {
+                let StructExpr {
+                    qself,
+                    path,
+                    fields,
+                    rest,
+                } = expr.deref_mut();
+                vis.visit_qself(qself);
                 vis.visit_path(path);
                 fields.flat_map_in_place(|field| flat_map_field(field, vis));
-                if let StructRest::Base(expr) = expr {
-                    vis.visit_expr(expr);
+                if let StructRest::Base(rest) = rest {
+                    vis.visit_expr(rest);
                 }
                 vis.visit_id(&mut e.id);
                 vis.visit_span(&mut e.span);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_round_trip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_round_trip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_round_trip.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_round_trip.rs	2021-12-09 12:01:26.000000000 +0000
@@ -85,7 +85,7 @@
     let back = quote!(#krate).to_string();
     let edition = repo::edition(path).parse().unwrap();
 
-    rustc_span::with_session_globals(edition, || {
+    rustc_span::create_session_if_not_set_then(edition, |_| {
         let equal = match panic::catch_unwind(|| {
             let sess = ParseSess::new(FilePathMapping::empty());
             let before = match librustc_parse(content, &sess) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_ty.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_ty.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_ty.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_ty.rs	2021-12-09 12:01:26.000000000 +0000
@@ -217,3 +217,71 @@
     }
     "###);
 }
+
+#[test]
+fn test_trait_object() {
+    let tokens = quote!(dyn for<'a> Trait<'a> + 'static);
+    snapshot!(tokens as Type, @r###"
+    Type::TraitObject {
+        dyn_token: Some,
+        bounds: [
+            Trait(TraitBound {
+                modifier: None,
+                lifetimes: Some(BoundLifetimes {
+                    lifetimes: [
+                        LifetimeDef {
+                            lifetime: Lifetime {
+                                ident: "a",
+                            },
+                        },
+                    ],
+                }),
+                path: Path {
+                    segments: [
+                        PathSegment {
+                            ident: "Trait",
+                            arguments: PathArguments::AngleBracketed {
+                                args: [
+                                    Lifetime(Lifetime {
+                                        ident: "a",
+                                    }),
+                                ],
+                            },
+                        },
+                    ],
+                },
+            }),
+            Lifetime(Lifetime {
+                ident: "static",
+            }),
+        ],
+    }
+    "###);
+
+    let tokens = quote!(dyn 'a + Trait);
+    snapshot!(tokens as Type, @r###"
+    Type::TraitObject {
+        dyn_token: Some,
+        bounds: [
+            Lifetime(Lifetime {
+                ident: "a",
+            }),
+            Trait(TraitBound {
+                modifier: None,
+                path: Path {
+                    segments: [
+                        PathSegment {
+                            ident: "Trait",
+                            arguments: None,
+                        },
+                    ],
+                },
+            }),
+        ],
+    }
+    "###);
+
+    // None of the following are valid Rust types.
+    syn::parse_str::<Type>("for<'a> dyn Trait<'a>").unwrap_err();
+    syn::parse_str::<Type>("dyn for<'a> 'a + Trait").unwrap_err();
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_visibility.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_visibility.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/syn/tests/test_visibility.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/syn/tests/test_visibility.rs	2021-12-09 12:01:26.000000000 +0000
@@ -92,7 +92,10 @@
 
 #[test]
 fn test_crate_path() {
-    assert_vis_parse!("pub(crate::A, crate::B)", Ok(Visibility::Public(_)) + "(crate::A, crate::B)");
+    assert_vis_parse!(
+        "pub(crate::A, crate::B)",
+        Ok(Visibility::Public(_)) + "(crate::A, crate::B)"
+    );
 }
 
 #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/synstructure/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/synstructure/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/synstructure/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/synstructure/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"f825dd88591190495cb96b89efc49b85a554b8e160416120b5c4ab43f5b340d4","LICENSE":"219920e865eee70b7dcfc948a86b099e7f4fe2de01bcca2ca9a20c0a033f2b59","README.md":"a528e7356db49ea813c3290dd4f6b15d8e6c0a870cfc07a2df0f3d1381c575bf","src/lib.rs":"625d4362db5fba46b47e2a71dc0d7d0440b1617021c8d4704e14b9ea3236070f","src/macros.rs":"e7cf1808faf5dac5ca25bd40ad99e95c2aab4f9899bd9327898761ea86271f7c"},"package":"b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"}
\ No newline at end of file
+{"files":{"Cargo.toml":"abc84d445b8b2b61cbb4698a2a9de7e37e53171cd5c2a0ff69f3aca7d3e17c6b","LICENSE":"219920e865eee70b7dcfc948a86b099e7f4fe2de01bcca2ca9a20c0a033f2b59","README.md":"a528e7356db49ea813c3290dd4f6b15d8e6c0a870cfc07a2df0f3d1381c575bf","src/lib.rs":"93474f72c378ee177cf6563f507095884c854eed02124ad475c402b9a6db3729","src/macros.rs":"e7cf1808faf5dac5ca25bd40ad99e95c2aab4f9899bd9327898761ea86271f7c"},"package":"474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/synstructure/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/synstructure/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/synstructure/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/synstructure/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "synstructure"
-version = "0.12.4"
+version = "0.12.5"
 authors = ["Nika Layzell <nika@thelayzells.com>"]
 include = ["src/**/*", "Cargo.toml", "README.md", "LICENSE"]
 description = "Helper methods and macros for custom derives"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/synstructure/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/synstructure/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/synstructure/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/synstructure/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1961,7 +1961,7 @@
 
         if self.underscore_const {
             quote! {
-                const _: () = { #generated }
+                const _: () = { #generated };
             }
         } else {
             let dummy_const: Ident = sanitize_ident(&format!(
@@ -2335,7 +2335,7 @@
 ///     }),
 ///     "# [
 ///     allow (
-///         non_upper_case_globals )
+///         non_upper_case_globals)
 ///     ]
 /// const _DERIVE_krate_Trait_FOR_A : (
 ///     )
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"e1411b0ffb2a7d409e1706baf31dd4536fdf8834bcc62ca6d4bb1105733fe7cd","LICENSE.txt":"8b4e95f5cf0dc40269c99f7b787203ffe04ded245ca2427422c196efa2b2f42a","README.md":"3a5f65cba4a285afee207a17ef158bd1348345e990ce02b14973774f5119c66f","src/conv.rs":"9c975b0607d3b81cec7c7c6a9b6b732f8a4dd1beb303a07ab165471b5e0dc37c","src/lib.rs":"402e6c0456861a2632c93f062b8af47fa0d701241a39d70cd0fe6732504f76b3","src/pipe.rs":"d969c608ef598742b34fb4b84b79085bb7f28d551f596dcdc14f8d5fab110261","src/tap.rs":"a69cc67fbf2607385948b2a7e465431bc0dd0d967841c433d89c9a5082ce262c"},"package":"55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "tap"
+version = "1.0.1"
+authors = ["Elliott Linder <elliott.darfink@gmail.com>", "myrrlyn <self@myrrlyn.dev>"]
+include = ["Cargo.toml", "README.md", "LICENSE.txt", "src/**/*.rs"]
+description = "Generic extensions for tapping values in Rust"
+homepage = "https://github.com/myrrlyn/tap"
+documentation = "https://docs.rs/tap"
+readme = "README.md"
+keywords = ["tap", "pipe", "functional", "tap_ok", "tap_some"]
+categories = ["no-std", "rust-patterns"]
+license = "MIT"
+repository = "https://github.com/myrrlyn/tap"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/LICENSE.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/LICENSE.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/LICENSE.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/LICENSE.txt	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Elliot Linder <darfink@gmail.com>
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,203 @@
+<div class="title-block" style="text-align: center;" align="center">
+
+# `tap` <!-- omit in toc -->
+
+## Suffix-Position Pipeline Behavior <!-- omit in toc -->
+
+[![Crate][crate_img]][crate]
+[![Documentation][docs_img]][docs]
+[![License][license_img]][license_file]
+
+[![Crate Downloads][downloads_img]][crate]
+[![Crate Size][loc_img]][loc]
+
+</div>
+
+This crate provides extension methods on all types that allow transparent,
+temporary, inspection/mutation (tapping), transformation (piping), or type
+conversion. These methods make it convenient for you to insert debugging or
+modification points into an expression without requiring you to change any other
+portions of your code.
+
+## Example Use
+
+### Tapping
+
+You can tap inside a method-chain expression for logging without requiring a
+rebind. For instance, you may write a complex expression without any
+intermediate debugging steps, and only later decide that you want them.
+Ordinarily, this transform would look like this:
+
+```rust
+extern crate reqwest;
+extern crate tracing;
+
+// old
+let body = reqwest::blocking::get("https://example.com")?
+  .text()?;
+tracing::debug!("Response contents: {}", body);
+
+// new, with debugging
+let resp = reqwest::blocking::get("https://example.com")?;
+tracing::debug!("Response status: {}", resp.status());
+let body = resp.text()?;
+tracing::debug!("Response contents: {}", body);
+```
+
+while with tapping, you can plug the logging statement directly into the overall
+expression, without making any other changes:
+
+```rust
+extern crate reqwest;
+extern crate tracing;
+
+let body = reqwest::blocking::get("https://example.com")?
+  // The only change is the insertion of this line
+  .tap(|resp| tracing::debug!("Response status: {}", resp.status()))
+  .text()?;
+tracing::debug!("Response contents: {}", body);
+```
+
+### Mutable Tapping
+
+Some APIs are written to require mutable borrows, rather than value-to-value
+transformations, which can require temporary rebinding in order to create
+mutability in an otherwise-immutable context. For example, collecting data into
+a vector, sorting the vector, and then freezing it, might look like this:
+
+```rust
+let mut collection = stream().collect::<Vec<_>>();
+collection.sort();
+// potential error site: inserting other mutations here
+let collection = collection; // now immutable
+```
+
+But with a mutable tap, you can avoid the duplicate binding *and* guard against
+future errors due to the presence of a mutable binding:
+
+```rust
+let collection = stream.collect::<Vec<_>>()
+  .tap_mut(|v| v.sort());
+```
+
+The `.tap_mut()` and related methods provide a mutable borrow to their argument,
+and allow the final binding site to choose their own level of mutability without
+exposing the intermediate permission.
+
+### Piping
+
+In addition to transparent inspection or modification points, you may also wish
+to use suffix calls for subsequent operations. For example, the standard library
+offers the free function `fs::read` to convert `Path`-like objects into
+`Vec<u8>` of their filesystem contents. Ordinarily, free functions require use
+as:
+
+```rust
+use std::fs;
+
+let mut path = get_base_path();
+path.push("logs");
+path.push(&format!("{}.log", today()));
+let contents = fs::read(path)?;
+```
+
+whereäs use of tapping (for path modification) and piping (for `fs::read`) could
+be expressed like this:
+
+```rust
+use std::fs;
+
+let contents = get_base_path()
+  .tap_mut(|p| p.push("logs"))
+  .tap_mut(|p| p.push(&format!("{}.log", today())))
+  .pipe(fs::read)?;
+```
+
+As a clearer example, consider the syntax required to apply multiple free
+funtions without `let`-bindings looks like this:
+
+```rust
+let val = last(
+  third(
+    second(
+      first(original_value),
+      another_arg,
+    )
+  ),
+  another_arg,
+);
+```
+
+which requires reading the expression in alternating, inside-out, order, to
+understand the full sequence of evaluation. With suffix calls, even free
+functions can be written in a point-free style that maintains a clear temporal
+and syntactic order:
+
+```rust
+let val = original_value
+  .pipe(first)
+  .pipe(|v| second(v, another_arg))
+  .pipe(third)
+  .pipe(|v| last(v, another_arg));
+```
+
+As piping is an ordinary method, not a syntax transformation, it still requires
+that you write function-call expressions when using a function with multiple
+arguments in the pipeline.
+
+### Conversion
+
+The `conv` module is the simplest: it provides two traits, `Conv` and `TryConv`,
+which are sibling traits to `Into<T>` and `TryInto<T>`. Their methods,
+`Conv::conv::<T>` and `TryConv::try_conv::<T>`, call the corresponding
+trait implementation, and allow you to use `.into()`/`.try_into()` in
+non-terminal method calls of an expression.
+
+```rust
+let bytes = "hello".into().into_bytes();
+```
+
+does not compile, because Rust cannot decide the type of `"hello".into()`.
+Instead of rewriting the expression to use an intermediate `let` binding, you
+can write it as
+
+```rust
+let bytes = "hello".conv::<String>().into_bytes();
+```
+
+## Full Functionality
+
+The `Tap` and `Pipe` traits both provide a large number of methods, which use
+different parts of the Rust language’s facilities for well-typed value access.
+Rather than repeat the API documentation here, you should view the module items
+in the [documentation][docs].
+
+As a summary, these traits provide methods that, upon receipt of a value,
+
+- apply no transformation
+- apply an `AsRef` or `AsMut` implementation
+- apply a `Borrow` or `BorrowMut` implementation
+- apply the `Deref` or `DerefMut` implementation
+
+before executing their effect argument.
+
+In addition, each `Tap` method `.tap_x` has a sibling method `.tap_x_dbg` that
+performs the same work, but only in debug builds; in release builds, the method
+call is stripped. This allows you to leave debugging taps in your source code,
+without affecting your project’s performance in true usage.
+
+Lastly, the `tap` module also has traits `TapOptional` and `TapFallible` which
+run taps on the variants of `Option` and `Result` enums, respectively, and do
+nothing when the variant does not match the method name. `TapOptional::tap_some`
+has no effect when called on a `None`, etc.
+
+<!-- Badges -->
+[crate]: https://crates.io/crates/tap "Crate Link"
+[crate_img]: https://img.shields.io/crates/v/tap.svg?logo=rust "Crate Page"
+[docs]: https://docs.rs/tap "Documentation"
+[docs_img]: https://docs.rs/tap/badge.svg "Documentation Display"
+[downloads_img]: https://img.shields.io/crates/dv/tap.svg?logo=rust "Crate Downloads"
+[license_file]: https://github.com/myrrlyn/tap/blob/master/LICENSE.txt "License File"
+[license_img]: https://img.shields.io/crates/l/tap.svg "License Display"
+[loc]: https://github.com/myrrlyn/tap "Repository"
+[loc_img]: https://tokei.rs/b1/github/myrrlyn/tap?category=code "Repository Size"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/src/conv.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/src/conv.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/src/conv.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/src/conv.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,87 @@
+/*! # Method-Directed Type Conversion
+
+The `std::convert` module provides traits for converting values from one type to
+another. The first of these, [`From<T>`], provides an associated function
+[`from(orig: T) -> Self`]. This function can only be called in prefix-position,
+as it does not have a `self` receiver. The second, [`Into<T>`], provides a
+method [`into(self) -> T`] which *can* be called in suffix-position; due to
+intractable problems in the type solver, this method cannot have any *further*
+method calls attached to it. It must be bound directly into a `let` or function
+call.
+
+The [`TryFrom<T>`] and [`TryInto<T>`] traits have the same properties, but
+permit failure.
+
+This module provides traits that place the conversion type parameter in the
+method, rather than in the trait, so that users can write `.conv::<T>()` to
+convert the preceding expression into `T`, without causing any failures in the
+type solver. These traits are blanket-implemented on all types that have an
+`Into<T>` implementation, which covers both the blanket implementation of `Into`
+for types with `From`, and manual implementations of `Into`.
+
+[`From<T>`]: https://doc.rust-lang.org/std/convert/trait.From.html
+[`Into<T>`]: https://doc.rust-lang.org/std/convert/trait.Into.html
+[`TryFrom<T>`]: https://doc.rust-lang.org/std/convert/trait.TryFrom.html
+[`TryInto<T>`]: https://doc.rust-lang.org/std/convert/trait.TryInto.html
+[`from(orig: T) -> Self`]: https://doc.rust-lang.org/std/convert/trait.From.html#tymethod.from
+[`into(self) -> T`]: https://doc.rust-lang.org/std/convert/trait.Into.html#tymethod.into
+!*/
+
+use core::convert::TryInto;
+
+/// Wraps `Into::<T>::into` as a method that can be placed in pipelines.
+pub trait Conv
+where
+	Self: Sized,
+{
+	/// Converts `self` into `T` using `Into<T>`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use tap::conv::Conv;
+	///
+	/// let len = "Saluton, mondo!"
+	///   .conv::<String>()
+	///   .len();
+	/// ```
+	#[inline(always)]
+	fn conv<T>(self) -> T
+	where
+		Self: Into<T>,
+		T: Sized,
+	{
+		Into::<T>::into(self)
+	}
+}
+
+impl<T> Conv for T {}
+
+/// Wraps `TryInto::<T>::try_into` as a method that can be placed in pipelines.
+pub trait TryConv
+where
+	Self: Sized,
+{
+	/// Attempts to convert `self` into `T` using `TryInto<T>`.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use tap::conv::TryConv;
+	///
+	/// let len = "Saluton, mondo!"
+	///   .try_conv::<String>()
+	///   .unwrap()
+	///   .len();
+	/// ```
+	#[inline(always)]
+	fn try_conv<T>(self) -> Result<T, Self::Error>
+	where
+		Self: TryInto<T>,
+		T: Sized,
+	{
+		TryInto::<T>::try_into(self)
+	}
+}
+
+impl<T> TryConv for T {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,147 @@
+/*! # `tap` – Syntactical Plumb-Lines
+
+Rust permits functions that take a `self` receiver to be written in “dot-call�
+suffix position, rather than the more traditional prefix-position function call
+syntax. These functions are restricted to `impl [Trait for] Type` blocks, and
+functions anywhere else cannot take advantage of this syntax.
+
+This crate provides universally-implemented extension traits that permit smooth
+suffix-position calls for a handful of common operations: transparent inspection
+or modification (tapping), transformation (piping), and type conversion.
+
+## Tapping
+
+The [`tap`] module provides the [`Tap`], [`TapOptional`], and [`TapFallible`]
+traits. Each of these traits provides methods that take and return a value, and
+expose it as a borrow to an effect function. They look like this:
+
+```rust
+use tap::prelude::*;
+# struct Tmp;
+# fn make_value() -> Tmp { Tmp }
+# impl Tmp { fn process_value(self) {} }
+# macro_rules! log { ($msg:literal, $val:ident) => {{}}; }
+
+let end = make_value()
+  .tap(|v| log!("Produced value: {:?}", v))
+  .process_value();
+```
+
+These methods are `self -> Self`, and return the value they received without
+any transformation. This enables them to be placed anywhere in a larger
+expression witohut changing its shape, or causing any semantic changes to the
+code. The effect function receives a borrow of the tapped value, optionally run
+through the `Borrow`, `AsRef`, or `Deref` view conversions, for the duration of
+its execution.
+
+The effect function cannot return a value, as the tap is incapable of handling
+it.
+
+## Piping
+
+The [`pipe`] module provides the [`Pipe`] trait. This trait provides methods
+that take and transform a value, returning the result of the transformation.
+They look like this:
+
+```rust
+use tap::prelude::*;
+
+struct One;
+fn start() -> One { One }
+struct Two;
+fn end(_: One) -> Two { Two }
+
+let val: Two = start().pipe(end);
+
+// without pipes, this would be written as
+let _: Two = end(start());
+```
+
+These methods are `self -> Other`, and return the value produced by the effect
+function. As the methods are always available in suffix position, they can take
+as arguments methods that are *not* eligible for dot-call syntax and still place
+them as expression suffices. The effect function receives the piped value,
+optionally run through the `Borrow`, `AsRef`, or `Deref` view conversions, as
+its input, and its output is returned from the pipe.
+
+For `.pipe()`, the input value is *moved* into the pipe and the effect function,
+so the effect function *cannot* return a value whose lifetime depends on the
+input value. The other pipe methods all borrow the input value, and may return a
+value whose lifetime is tied to it.
+
+## Converting
+
+The [`conv`] module provides the [`Conv`] and [`TryConv`] traits. These provide
+methods that accept a type parameter on the method name, and forward to the
+appropriate `Into` or `TryInto` trait implementation when called. The difference
+between `Conv` and `Into` is that `Conv` is declared as `Conv::conv::<T>`, while
+`Into` is declared as `Into::<T>::into`. The location of the destination type
+parameter makes `.into()` unusable as a non-terminal method call of an
+expression, while `.conv::<T>()` can be used as a method call anywhere.
+
+```rust,compile_fail
+let upper = "hello, world"
+  .into()
+  .tap_mut(|s| s.make_ascii_uppercase());
+```
+
+The above snippet is illegal, because the Rust type solver cannot determine the
+type of the sub-expression `"hello, world".into()`, and it will not attempt to
+search all available `impl Into<X> for str` implementations to find an `X` which
+has a
+`fn tap_mut({self, &self, &mut self, Box<Self>, Rc<Self>, Arc<Self>}, _) -> Y`
+declared, either as an inherent method or in a trait implemented by `X`, to
+resolve the expression.
+
+Instead, you can write it as
+
+```rust
+use tap::prelude::*;
+
+let upper = "hello, world"
+  .conv::<String>()
+  .tap_mut(|s| s.make_ascii_uppercase());
+```
+
+The trait implementation is
+
+```rust
+pub trait Conv: Sized {
+ fn conv<T: Sized>(self) -> T
+ where Self: Into<T> {
+  self.into()
+ }
+}
+```
+
+Each monomorphization of `.conv::<T>()` expands to the appropriate `Into<T>`
+implementation, and does nothing else.
+
+[`Conv`]: conv/trait.Conv.html
+[`Pipe`]: pipe/trait.Pipe.html
+[`Tap`]: tap/trait.Tap.html
+[`TapFallible`]: tap/trait.TapFallible.html
+[`TapOptional`]: tap/trait.TapOptional.html
+[`TryConv`]: conv/trait.TryConv.html
+[`conv`]: conv/index.html
+[`pipe`]: pipe/index.html
+[`tap`]: tap/index.html
+!*/
+
+#![no_std]
+#![cfg_attr(debug_assertions, warn(missing_docs))]
+#![cfg_attr(not(debug_assertions), deny(missing_docs))]
+
+pub mod conv;
+pub mod pipe;
+pub mod tap;
+
+/// Reëxports all traits in one place, for easy import.
+pub mod prelude {
+	#[doc(inline)]
+	pub use crate::{conv::*, pipe::*, tap::*};
+}
+
+// also make traits available at crate root
+#[doc(inline)]
+pub use prelude::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/src/pipe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/src/pipe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/src/pipe.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/src/pipe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,234 @@
+/*! # Universal Suffix Calls
+
+This module provides a single trait, `Pipe`, which provides a number of methods
+useful for placing functions in suffix position. The most common method, `pipe`,
+forwards a value `T` into any function `T -> R`, returning `R`. The other
+methods all apply some form of borrowing to the value before passing the borrow
+into the piped function. These are of less value, but provided to maintain a
+similar API to the `tap` module’s methods, and for convenience in the event that
+you do have a use for them.
+
+This module is as much of a [UFCS] method syntax that can be provided as a
+library, rather than in the language grammar.
+
+[UFCS]: https://en.wikipedia.org/wiki/Uniform_Function_Call_Syntax
+!*/
+
+use core::{
+	borrow::{Borrow, BorrowMut},
+	ops::{Deref, DerefMut},
+};
+
+/** Provides universal suffix-position call syntax for any function.
+
+This trait provides methods that allow any closure or free function to be placed
+as a suffix-position call, by writing them as
+
+```rust
+# use tap::pipe::Pipe;
+# let receiver = 5;
+fn not_a_method(x: i32) -> u8 { x as u8 }
+receiver.pipe(not_a_method);
+```
+
+Piping into functions that take more than one argument still requires writing a
+closure with ordinary function-call syntax. This is after all only a library,
+not a syntax transformation:
+
+```rust
+use tap::pipe::Pipe;
+fn add(x: i32, y: i32) -> i32 { x + y }
+
+let out = 5.pipe(|x| add(x, 10));
+assert_eq!(out, 15);
+```
+
+Like tapping, piping is useful for cases where you want to write a sequence of
+processing steps without introducing many intermediate bindings, and your steps
+contain functions which are not eligible for dot-call syntax.
+
+The main difference between piping and tapping is that tapping always returns
+the value that was passed into the tap, while piping forwards the value into the
+effect function, and returns the output of evaluating the effect function with
+the value. Piping is a transformation, not merely an inspection or modification.
+**/
+pub trait Pipe {
+	/// Pipes by value. This is generally the method you want to use.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use tap::pipe::Pipe;
+	///
+	/// fn triple(x: i32) -> i64 {
+	///   x as i64 * 3
+	/// }
+	///
+	/// assert_eq!(
+	///   10.pipe(triple),
+	///   30,
+	/// );
+	/// ```
+	#[inline(always)]
+	fn pipe<R>(self, func: impl FnOnce(Self) -> R) -> R
+	where
+		Self: Sized,
+		R: Sized,
+	{
+		func(self)
+	}
+
+	/// Borrows `self` and passes that borrow into the pipe function.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use tap::pipe::Pipe;
+	///
+	/// fn fold(v: &Vec<i32>) -> i32 {
+	///   v.iter().copied().sum()
+	/// }
+	/// let vec = vec![1, 2, 3, 4, 5];
+	/// let sum = vec.pipe_ref(fold);
+	/// assert_eq!(sum, 15);
+	/// assert_eq!(vec.len(), 5);
+	/// ```
+	#[inline(always)]
+	fn pipe_ref<'a, R>(&'a self, func: impl FnOnce(&'a Self) -> R) -> R
+	where
+		R: 'a + Sized,
+	{
+		func(self)
+	}
+
+	/// Mutably borrows `self` and passes that borrow into the pipe function.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use tap::pipe::Pipe;
+	///
+	/// let mut vec = vec![false, true];
+	/// let last = vec
+	///   .pipe_ref_mut(Vec::pop)
+	///   .pipe(Option::unwrap);
+	/// assert!(last);
+	/// ```
+	///
+	/// Both of these functions are eligible for method-call syntax, and should
+	/// not be piped. Writing out non-trivial examples for these is a lot of
+	/// boilerplate.
+	#[inline(always)]
+	fn pipe_ref_mut<'a, R>(
+		&'a mut self,
+		func: impl FnOnce(&'a mut Self) -> R,
+	) -> R
+	where
+		R: 'a + Sized,
+	{
+		func(self)
+	}
+
+	/// Borrows `self`, then passes `self.borrow()` into the pipe function.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use std::borrow::Cow;
+	/// use tap::pipe::Pipe;
+	///
+	/// let len = Cow::<'static, str>::from("hello, world")
+	///   .pipe_borrow(str::len);
+	/// assert_eq!(len, 12);
+	/// ```
+	#[inline(always)]
+	fn pipe_borrow<'a, B, R>(&'a self, func: impl FnOnce(&'a B) -> R) -> R
+	where
+		Self: Borrow<B>,
+		B: 'a + ?Sized,
+		R: 'a + Sized,
+	{
+		func(Borrow::<B>::borrow(self))
+	}
+
+	/// Mutably borrows `self`, then passes `self.borrow_mut()` into the pipe
+	/// function.
+	///
+	/// ```rust
+	/// use tap::pipe::Pipe;
+	///
+	/// let mut txt = "hello, world".to_string();
+	/// let ptr = txt
+	///   .pipe_borrow_mut(str::as_mut_ptr);
+	/// ```
+	///
+	/// This is a very contrived example, but the `BorrowMut` trait has almost
+	/// no implementors in the standard library, and of the implementations
+	/// available, there are almost no methods that fit this API.
+	#[inline(always)]
+	fn pipe_borrow_mut<'a, B, R>(
+		&'a mut self,
+		func: impl FnOnce(&'a mut B) -> R,
+	) -> R
+	where
+		Self: BorrowMut<B>,
+		B: 'a + ?Sized,
+		R: 'a + Sized,
+	{
+		func(BorrowMut::<B>::borrow_mut(self))
+	}
+
+	/// Borrows `self`, then passes `self.as_ref()` into the pipe function.
+	#[inline(always)]
+	fn pipe_as_ref<'a, U, R>(&'a self, func: impl FnOnce(&'a U) -> R) -> R
+	where
+		Self: AsRef<U>,
+		U: 'a + ?Sized,
+		R: 'a + Sized,
+	{
+		func(AsRef::<U>::as_ref(self))
+	}
+
+	/// Mutably borrows `self`, then passes `self.as_mut()` into the pipe
+	/// function.
+	#[inline(always)]
+	fn pipe_as_mut<'a, U, R>(
+		&'a mut self,
+		func: impl FnOnce(&'a mut U) -> R,
+	) -> R
+	where
+		Self: AsMut<U>,
+		U: 'a + ?Sized,
+		R: 'a + Sized,
+	{
+		func(AsMut::<U>::as_mut(self))
+	}
+
+	/// Borrows `self`, then passes `self.deref()` into the pipe function.
+	#[inline(always)]
+	fn pipe_deref<'a, T, R>(&'a self, func: impl FnOnce(&'a T) -> R) -> R
+	where
+		Self: Deref<Target = T>,
+		T: 'a + ?Sized,
+		R: 'a + Sized,
+	{
+		func(Deref::deref(self))
+	}
+
+	/// Mutably borrows `self`, then passes `self.deref_mut()` into the pipe
+	/// function.
+	#[inline(always)]
+	fn pipe_deref_mut<'a, T, R>(
+		&'a mut self,
+		func: impl FnOnce(&'a mut T) -> R,
+	) -> R
+	where
+		Self: DerefMut + Deref<Target = T>,
+		T: 'a + ?Sized,
+		R: 'a + Sized,
+	{
+		func(DerefMut::deref_mut(self))
+	}
+}
+
+impl<T> Pipe for T where T: ?Sized {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/src/tap.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/src/tap.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tap/src/tap.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tap/src/tap.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,587 @@
+/*! # Point-Free Inspection
+
+The standard library does not provide a way to view or modify an expression
+without binding it to a name. This module provides extension methods that take
+and return a value, allowing it to be temporarily bound without creating a new
+`let`-statement in the enclosing scope.
+
+The two main uses of these methods are to temporarily attach debugging
+tracepoints to an expression without modifying its surrounding code, or to
+temporarily mutate an otherwise-immutable object.
+
+For convenience, methods are available that will modify the *view* of the tapped
+object that is passed to the effect function, by using the value’s
+`Borrow`/`BorrowMut`, `AsRef`/`AsMut`, or `Index`/`IndexMut` trait
+implementations. For example, the `Vec` collection has no `fn sort` method: this
+is actually implemented on slices, to which `Vec` dereferences.
+
+```rust
+use tap::tap::*;
+# fn make_vec() -> Vec<i32> { vec![] }
+
+// taps take ordinary closures, which can use deref coercion
+make_vec().tap_mut(|v| v.sort());
+// `Vec<T>` implements `BorrowMut<[T]>`,
+make_vec().tap_borrow_mut(<[_]>::sort);
+// and `AsMut<[T]>`,
+make_vec().tap_ref_mut(<[_]>::sort);
+// and `DerefMut<Target = [T]>,
+make_vec().tap_deref_mut(<[_]>::sort);
+// but has no inherent method `sort`.
+// make_vec().tap_mut(Vec::sort);
+```
+!*/
+
+use core::{
+	borrow::{Borrow, BorrowMut},
+	ops::{Deref, DerefMut},
+};
+
+/** Point-free value inspection and modification.
+
+This trait provides methods that permit viewing the value of an expression
+without requiring a new `let` binding or any other alterations to the original
+code other than insertion of the `.tap()` call.
+
+The methods in this trait do not perform any view conversions on the value they
+receive; it is borrowed and passed directly to the effect argument.
+**/
+pub trait Tap
+where
+	Self: Sized,
+{
+	/// Immutable access to a value.
+	///
+	/// This function permits a value to be viewed by some inspecting function
+	/// without affecting the overall shape of the expression that contains this
+	/// method call. It is useful for attaching assertions or logging points
+	/// into a multi-part expression.
+	///
+	/// # Examples
+	///
+	/// Here we use `.tap()` to attach logging tracepoints to each stage of a
+	/// value-processing pipeline.
+	///
+	/// ```rust
+	/// use tap::tap::Tap;
+	/// # struct Tmp;
+	/// # impl Tmp { fn process_value(self) -> Self { self } }
+	/// # fn make_value() -> Tmp { Tmp }
+	/// # macro_rules! log { ($msg:literal, $x:ident) => {{}}; }
+	///
+	/// let end = make_value()
+	///   // this line has no effect on the rest of the code
+	///   .tap(|v| log!("The produced value was: {}", v))
+	///   .process_value();
+	/// ```
+	#[inline(always)]
+	fn tap(self, func: impl FnOnce(&Self)) -> Self {
+		func(&self);
+		self
+	}
+
+	/// Mutable access to a value.
+	///
+	/// This function permits a value to be modified by some function without
+	/// affecting the overall shape of the expression that contains this method
+	/// call. It is useful for attaching modifier functions that have an
+	/// `&mut Self -> ()` signature to an expression, without requiring an
+	/// explicit `let mut` binding.
+	///
+	/// # Examples
+	///
+	/// Here we use `.tap_mut()` to sort an array without requring multiple
+	/// bindings.
+	///
+	/// ```rust
+	/// use tap::tap::Tap;
+	///
+	/// let sorted = [1i32, 5, 2, 4, 3]
+	///   .tap_mut(|arr| arr.sort());
+	/// assert_eq!(sorted, [1, 2, 3, 4, 5]);
+	/// ```
+	///
+	/// Without tapping, this would be written as
+	///
+	/// ```rust
+	/// let mut received = [1, 5, 2, 4, 3];
+	/// received.sort();
+	/// let sorted = received;
+	/// ```
+	///
+	/// The mutable tap is a convenient alternative when the expression to
+	/// produce the collection is more complex, for example, an iterator
+	/// pipeline collected into a vector.
+	#[inline(always)]
+	fn tap_mut(mut self, func: impl FnOnce(&mut Self)) -> Self {
+		func(&mut self);
+		self
+	}
+
+	/// Immutable access to the `Borrow<B>` of a value.
+	///
+	/// This function is identcal to [`Tap::tap`], except that the effect
+	/// function recevies an `&B` produced by `Borrow::<B>::borrow`, rather than
+	/// an `&Self`.
+	///
+	/// [`Tap::tap`]: trait.Tap.html#method.tap
+	#[inline(always)]
+	fn tap_borrow<B>(self, func: impl FnOnce(&B)) -> Self
+	where
+		Self: Borrow<B>,
+		B: ?Sized,
+	{
+		func(Borrow::<B>::borrow(&self));
+		self
+	}
+
+	/// Mutable access to the `BorrowMut<B>` of a value.
+	///
+	/// This function is identical to [`Tap::tap_mut`], except that the effect
+	/// function receives an `&mut B` produced by `BorrowMut::<B>::borrow_mut`,
+	/// rather than an `&mut Self`.
+	///
+	/// [`Tap::tap_mut`]: trait.Tap.html#method.tap_mut
+	#[inline(always)]
+	fn tap_borrow_mut<B>(mut self, func: impl FnOnce(&mut B)) -> Self
+	where
+		Self: BorrowMut<B>,
+		B: ?Sized,
+	{
+		func(BorrowMut::<B>::borrow_mut(&mut self));
+		self
+	}
+
+	/// Immutable access to the `AsRef<R>` view of a value.
+	///
+	/// This function is identical to [`Tap::tap`], except that the effect
+	/// function receives an `&R` produced by `AsRef::<R>::as_ref`, rather than
+	/// an `&Self`.
+	///
+	/// [`Tap::tap`]: trait.Tap.html#method.tap
+	#[inline(always)]
+	fn tap_ref<R>(self, func: impl FnOnce(&R)) -> Self
+	where
+		Self: AsRef<R>,
+		R: ?Sized,
+	{
+		func(AsRef::<R>::as_ref(&self));
+		self
+	}
+
+	/// Mutable access to the `AsMut<R>` view of a value.
+	///
+	/// This function is identical to [`Tap::tap_mut`], except that the effect
+	/// function receives an `&mut R` produced by `AsMut::<R>::as_mut`, rather
+	/// than an `&mut Self`.
+	///
+	/// [`Tap::tap_mut`]: trait.Tap.html#method.tap_mut
+	#[inline(always)]
+	fn tap_ref_mut<R>(mut self, func: impl FnOnce(&mut R)) -> Self
+	where
+		Self: AsMut<R>,
+		R: ?Sized,
+	{
+		func(AsMut::<R>::as_mut(&mut self));
+		self
+	}
+
+	/// Immutable access to the `Deref::Target` of a value.
+	///
+	/// This function is identical to [`Tap::tap`], except that the effect
+	/// function receives an `&Self::Target` produced by `Deref::deref`, rather
+	/// than an `&Self`.
+	///
+	/// [`Tap::tap`]: trait.Tap.html#method.tap
+	#[inline(always)]
+	fn tap_deref<T>(self, func: impl FnOnce(&T)) -> Self
+	where
+		Self: Deref<Target = T>,
+		T: ?Sized,
+	{
+		func(Deref::deref(&self));
+		self
+	}
+
+	/// Mutable access to the `Deref::Target` of a value.
+	///
+	/// This function is identical to [`Tap::tap_mut`], except that the effect
+	/// function receives an `&mut Self::Target` produced by
+	/// `DerefMut::deref_mut`, rather than an `&mut Self`.
+	///
+	/// [`Tap::tap_mut`]: trait.Tap.html#method.tap_mut
+	#[inline(always)]
+	fn tap_deref_mut<T>(mut self, func: impl FnOnce(&mut T)) -> Self
+	where
+		Self: DerefMut + Deref<Target = T>,
+		T: ?Sized,
+	{
+		func(DerefMut::deref_mut(&mut self));
+		self
+	}
+
+	//  debug-build-only copies of the above methods
+
+	/// Calls `.tap()` only in debug builds, and is erased in release builds.
+	#[inline(always)]
+	fn tap_dbg(self, func: impl FnOnce(&Self)) -> Self {
+		if cfg!(debug_assertions) {
+			func(&self);
+		}
+		self
+	}
+
+	/// Calls `.tap_mut()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_mut_dbg(mut self, func: impl FnOnce(&mut Self)) -> Self {
+		if cfg!(debug_assertions) {
+			func(&mut self);
+		}
+		self
+	}
+
+	/// Calls `.tap_borrow()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_borrow_dbg<B>(self, func: impl FnOnce(&B)) -> Self
+	where
+		Self: Borrow<B>,
+		B: ?Sized,
+	{
+		if cfg!(debug_assertions) {
+			func(Borrow::<B>::borrow(&self));
+		}
+		self
+	}
+
+	/// Calls `.tap_borrow_mut()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_borrow_mut_dbg<B>(mut self, func: impl FnOnce(&mut B)) -> Self
+	where
+		Self: BorrowMut<B>,
+		B: ?Sized,
+	{
+		if cfg!(debug_assertions) {
+			func(BorrowMut::<B>::borrow_mut(&mut self));
+		}
+		self
+	}
+
+	/// Calls `.tap_ref()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_ref_dbg<R>(self, func: impl FnOnce(&R)) -> Self
+	where
+		Self: AsRef<R>,
+		R: ?Sized,
+	{
+		if cfg!(debug_assertions) {
+			func(AsRef::<R>::as_ref(&self));
+		}
+		self
+	}
+
+	/// Calls `.tap_ref_mut()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_ref_mut_dbg<R>(mut self, func: impl FnOnce(&mut R)) -> Self
+	where
+		Self: AsMut<R>,
+		R: ?Sized,
+	{
+		if cfg!(debug_assertions) {
+			func(AsMut::<R>::as_mut(&mut self));
+		}
+		self
+	}
+
+	/// Calls `.tap_deref()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_deref_dbg<T>(self, func: impl FnOnce(&T)) -> Self
+	where
+		Self: Deref<Target = T>,
+		T: ?Sized,
+	{
+		if cfg!(debug_assertions) {
+			func(Deref::deref(&self));
+		}
+		self
+	}
+
+	/// Calls `.tap_deref_mut()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_deref_mut_dbg<T>(mut self, func: impl FnOnce(&mut T)) -> Self
+	where
+		Self: DerefMut + Deref<Target = T>,
+		T: ?Sized,
+	{
+		if cfg!(debug_assertions) {
+			func(DerefMut::deref_mut(&mut self));
+		}
+		self
+	}
+}
+
+impl<T> Tap for T where T: Sized {}
+
+/** Optional tapping, conditional on the optional presence of a value.
+
+This trait is intended for use on types that express the concept of “optional
+presence�, primarily the [`Option`] monad. It provides taps that inspect the
+container to determine if the effect function should execute or not.
+
+> Note: This trait is a specialization of [`TapFallible`], and exists because
+> the [`std::ops::Try`] trait is still unstable. When `Try` stabilizes, this
+> trait can be removed, and `TapFallible` blanket-applied to all `Try`
+> implementors.
+
+[`Option`]: https://doc.rust-lang.org/std/option/enum.Option.html
+[`TapFallible`]: trait.TapFallible.html
+[`std::ops::Try`]: https://doc.rust-lang.org/std/ops/trait.Try.html
+**/
+pub trait TapOptional
+where
+	Self: Sized,
+{
+	/// The interior type that the container may or may not carry.
+	type Val: ?Sized;
+
+	/// Immutabily accesses an interior value only when it is present.
+	///
+	/// This function is identical to [`Tap::tap`], except that it is required
+	/// to check the implementing container for value presence before running.
+	/// Implementors must not run the effect function if the container is marked
+	/// as being empty.
+	///
+	/// [`Tap::tap`]: trait.Tap.html#method.tap
+	fn tap_some(self, func: impl FnOnce(&Self::Val)) -> Self;
+
+	/// Mutably accesses an interor value only when it is present.
+	///
+	/// This function is identical to [`Tap::tap_mut`], except that it is
+	/// required to check the implementing container for value presence before
+	/// running. Implementors must not run the effect function if the container
+	/// is marked as being empty.
+	///
+	/// [`Tap::tap_mut`]: trait.Tap.html#method.tap_mut
+	fn tap_some_mut(self, func: impl FnOnce(&mut Self::Val)) -> Self;
+
+	/// Runs an effect function when the container is empty.
+	///
+	/// This function is identical to [`Tap::tap`], except that it is required
+	/// to check the implementing container for value absence before running.
+	/// Implementors must not run the effect function if the container is marked
+	/// as being non-empty.
+	///
+	/// [`Tap::tap`]: trait.Tap.html#method.tap
+	fn tap_none(self, func: impl FnOnce()) -> Self;
+
+	/// Calls `.tap_some()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_some_dbg(self, func: impl FnOnce(&Self::Val)) -> Self {
+		if cfg!(debug_assertions) {
+			self.tap_some(func)
+		} else {
+			self
+		}
+	}
+
+	/// Calls `.tap_some_mut()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_some_mut_dbg(self, func: impl FnOnce(&mut Self::Val)) -> Self {
+		if cfg!(debug_assertions) {
+			self.tap_some_mut(func)
+		} else {
+			self
+		}
+	}
+
+	/// Calls `.tap_none()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_none_dbg(self, func: impl FnOnce()) -> Self {
+		if cfg!(debug_assertions) {
+			self.tap_none(func)
+		} else {
+			self
+		}
+	}
+}
+
+impl<T> TapOptional for Option<T> {
+	type Val = T;
+
+	#[inline(always)]
+	fn tap_some(self, func: impl FnOnce(&T)) -> Self {
+		if let Some(ref val) = self {
+			func(val);
+		}
+		self
+	}
+
+	#[inline(always)]
+	fn tap_some_mut(mut self, func: impl FnOnce(&mut T)) -> Self {
+		if let Some(ref mut val) = self {
+			func(val);
+		}
+		self
+	}
+
+	#[inline(always)]
+	fn tap_none(self, func: impl FnOnce()) -> Self {
+		if self.is_none() {
+			func();
+		}
+		self
+	}
+}
+
+/** Fallible tapping, conditional on the optional success of an expression.
+
+This trait is intended for use on types that express the concept of “fallible
+presence�, primarily the [`Result`] monad. It provides taps that inspect the
+container to determine if the effect function should execute or not.
+
+> Note: This trait would ideally be implemented as a blanket over all
+> [`std::ops::Try`] implementors. When `Try` stabilizes, this crate can be
+> updated to do so.
+
+[`Result`]: https://doc.rust-lang.org/std/result/enum.Result.html
+[`std::ops::Try`]: https://doc.rust-lang.org/std/ops/trait.Try.html
+**/
+pub trait TapFallible
+where
+	Self: Sized,
+{
+	/// The interior type used to indicate a successful construction.
+	type Ok: ?Sized;
+
+	/// The interior type used to indicate a failed construction.
+	type Err: ?Sized;
+
+	/// Immutably accesses an interior success value.
+	///
+	/// This function is identical to [`Tap::tap`], except that it is required
+	/// to check the implementing container for value success before running.
+	/// Implementors must not run the effect function if the container is marked
+	/// as being a failure.
+	///
+	/// [`Tap::tap`]: trait.Tap.html#method.tap
+	fn tap_ok(self, func: impl FnOnce(&Self::Ok)) -> Self;
+
+	/// Mutably accesses an interior success value.
+	///
+	/// This function is identical to [`Tap::tap_mut`], except that it is
+	/// required to check the implementing container for value success before
+	/// running. Implementors must not run the effect function if the container
+	/// is marked as being a failure.
+	///
+	/// [`Tap::tap_mut`]: trait.Tap.html#method.tap_mut
+	fn tap_ok_mut(self, func: impl FnOnce(&mut Self::Ok)) -> Self;
+
+	/// Immutably accesses an interior failure value.
+	///
+	/// This function is identical to [`Tap::tap`], except that it is required
+	/// to check the implementing container for value failure before running.
+	/// Implementors must not run the effect function if the container is marked
+	/// as being a success.
+	///
+	/// [`Tap::tap`]: trait.Tap.html#method.tap
+	fn tap_err(self, func: impl FnOnce(&Self::Err)) -> Self;
+
+	/// Mutably accesses an interior failure value.
+	///
+	/// This function is identical to [`Tap::tap_mut`], except that it is
+	/// required to check the implementing container for value failure before
+	/// running. Implementors must not run the effect function if the container
+	/// is marked as being a success.
+	///
+	/// [`Tap::tap_mut`]: trait.Tap.html#method.tap_mut
+	fn tap_err_mut(self, func: impl FnOnce(&mut Self::Err)) -> Self;
+
+	/// Calls `.tap_ok()` only in debug builds, and is erased in release builds.
+	#[inline(always)]
+	fn tap_ok_dbg(self, func: impl FnOnce(&Self::Ok)) -> Self {
+		if cfg!(debug_assertions) {
+			self.tap_ok(func)
+		} else {
+			self
+		}
+	}
+
+	/// Calls `.tap_ok_mut()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_ok_mut_dbg(self, func: impl FnOnce(&mut Self::Ok)) -> Self {
+		if cfg!(debug_assertions) {
+			self.tap_ok_mut(func)
+		} else {
+			self
+		}
+	}
+
+	/// Calls `.tap_err()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_err_dbg(self, func: impl FnOnce(&Self::Err)) -> Self {
+		if cfg!(debug_assertions) {
+			self.tap_err(func)
+		} else {
+			self
+		}
+	}
+
+	/// Calls `.tap_err_mut()` only in debug builds, and is erased in release
+	/// builds.
+	#[inline(always)]
+	fn tap_err_mut_dbg(self, func: impl FnOnce(&mut Self::Err)) -> Self {
+		if cfg!(debug_assertions) {
+			self.tap_err_mut(func)
+		} else {
+			self
+		}
+	}
+}
+
+impl<T, E> TapFallible for Result<T, E> {
+	type Ok = T;
+	type Err = E;
+
+	#[inline(always)]
+	fn tap_ok(self, func: impl FnOnce(&T)) -> Self {
+		if let Ok(ref val) = self {
+			func(val);
+		}
+		self
+	}
+
+	#[inline(always)]
+	fn tap_ok_mut(mut self, func: impl FnOnce(&mut T)) -> Self {
+		if let Ok(ref mut val) = self {
+			func(val);
+		}
+		self
+	}
+
+	#[inline(always)]
+	fn tap_err(self, func: impl FnOnce(&E)) -> Self {
+		if let Err(ref val) = self {
+			func(val);
+		}
+		self
+	}
+
+	#[inline(always)]
+	fn tap_err_mut(mut self, func: impl FnOnce(&mut E)) -> Self {
+		if let Err(ref mut val) = self {
+			func(val);
+		}
+		self
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"526cfadda74195985a5d860855ef4d8213661e9fcde075a2c128121aa7848003","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"8b427f5bc501764575e52ba4f9d95673cf8f6d80a86d0d06599852e1a9a20a36","NEWS":"e7da9558db65f61008aa9196066a18bcb16b4c7c4369766a67ea7ec9d52b632d","README.md":"2388f555712995933c80721d9de80fc9fe3428dd61609cc01cd26079bd543468","src/dir.rs":"50501bbbe44046d3f74c2fa1d590405cc898d5d52643f18f28964b7a82eafb80","src/error.rs":"cc7d8eace0fff11cb342158d2885d5637bfb14b24ef30755e808554772039c5f","src/file/imp/mod.rs":"bec50fb99c14cb4a49402bdbb7c5e6b5b8ff785b06b6fcb13267f35df8f3c8c2","src/file/imp/other.rs":"99c8f9f3251199fc31e7b88810134712e5725fb6fa14648696ed5cbea980fc5b","src/file/imp/unix.rs":"afc860978e362b1266b40722181fc3a509af72ce942a1b2dcd38ef1776897af3","src/file/imp/windows.rs":"03d81d71c404f0d448e1162825d6fbd57a78b4af8d4dc5287ec2e7c5a873d7cc","src/file/mod.rs":"ae7246a5c1445afa89765097742c11383ae996ea7046e8903f2dcbdb197bce53","src/lib.rs":"fb0c982c8dd2c6d0211c7d4542fa1c724d9ca45a8828ff5aeae866f4aa9d1507","src/spooled.rs":"34f5305923de710c58228d68c143133a11843e7ad5029ee31448ab4ab6172b74","src/util.rs":"25c62fb5d87411fd9508596db69ea489e9026b9ad0ffc9996db1ac8670b3da02","tests/namedtempfile.rs":"07ad89e54c9ce79d6b85d37d367d9687ec6f2cabc6cc44cdefd42731056afd6a","tests/spooled.rs":"29e797d486d867cb6ac46d4cf126eb5868a069a4070c3f50ffa02fbb0b887934","tests/tempdir.rs":"771d555d4eaa410207d212eb3744e016e0b5a22f1f1b7199636a4fac5daaf952","tests/tempfile.rs":"a1dacfd9b1ee3c40fdde5131b33995f3cfd62a212455c8664a98c735b9954ee6"},"package":"7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"}
\ No newline at end of file
+{"files":{"Cargo.toml":"f6fe37104892c596e599d429d38ed5c59ea4cda7f2ed3ab15e50bd15b85dcc80","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"8b427f5bc501764575e52ba4f9d95673cf8f6d80a86d0d06599852e1a9a20a36","NEWS":"b7f16a3c82513cfe6aca7f22cf3057114e0e4d3c65172dac19b6fd0c7ca5cf58","README.md":"266c55fcd9262b9ade8d8e9b705e8ad40db7df1d422be70f80d1e8ba133f1eab","src/dir.rs":"67f56aac82deefef56e3dc1366d2df1e5c6792103031119655088eb49c38f4c4","src/error.rs":"cc7d8eace0fff11cb342158d2885d5637bfb14b24ef30755e808554772039c5f","src/file/imp/mod.rs":"bec50fb99c14cb4a49402bdbb7c5e6b5b8ff785b06b6fcb13267f35df8f3c8c2","src/file/imp/other.rs":"99c8f9f3251199fc31e7b88810134712e5725fb6fa14648696ed5cbea980fc5b","src/file/imp/unix.rs":"afc860978e362b1266b40722181fc3a509af72ce942a1b2dcd38ef1776897af3","src/file/imp/windows.rs":"03d81d71c404f0d448e1162825d6fbd57a78b4af8d4dc5287ec2e7c5a873d7cc","src/file/mod.rs":"361397d93831d0d9ba9a234781017de77a7b94b88f0cab2439420d2797c9c229","src/lib.rs":"214ccbdd7de0196f2c76daf604ee0cf6b7ddd0478825aab8b4b32c000dcf817a","src/spooled.rs":"34f5305923de710c58228d68c143133a11843e7ad5029ee31448ab4ab6172b74","src/util.rs":"73d971b603f9f997ab62e743c76891a9478bdce6e1898e70185f1fe66ded74ad","tests/namedtempfile.rs":"07ad89e54c9ce79d6b85d37d367d9687ec6f2cabc6cc44cdefd42731056afd6a","tests/spooled.rs":"29e797d486d867cb6ac46d4cf126eb5868a069a4070c3f50ffa02fbb0b887934","tests/tempdir.rs":"771d555d4eaa410207d212eb3744e016e0b5a22f1f1b7199636a4fac5daaf952","tests/tempfile.rs":"a1dacfd9b1ee3c40fdde5131b33995f3cfd62a212455c8664a98c735b9954ee6"},"package":"dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "tempfile"
-version = "3.1.0"
+version = "3.2.0"
 authors = ["Steven Allen <steven@stebalien.com>", "The Rust Project Developers", "Ashley Mannix <ashleymannix@live.com.au>", "Jason White <jasonaw0@gmail.com>"]
 exclude = ["/.travis.yml", "/appveyor.yml"]
 description = "A library for managing temporary files and directories."
@@ -23,15 +23,15 @@
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Stebalien/tempfile"
 [dependencies.cfg-if]
-version = "0.1"
+version = "1"
 
 [dependencies.rand]
-version = "0.7"
+version = "0.8"
 
 [dependencies.remove_dir_all]
 version = "0.5"
 [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
-version = "0.1"
+version = "0.2"
 [target."cfg(unix)".dependencies.libc]
 version = "0.2.27"
 [target."cfg(windows)".dependencies.winapi]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/NEWS thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/NEWS
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/NEWS	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/NEWS	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,15 @@
+3.2.0
+=====
+
+Features:
+
+* Bump rand dependency to `0.8`.
+* Bump cfg-if dependency to `1.0`
+
+Other than that, this release mostly includes small cleanups and simplifications.
+
+Breaking: The minimum rust version is now `1.40.0`.
+
 3.1.0
 =====
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -15,7 +15,7 @@
 Usage
 -----
 
-Minimum required Rust version: 1.32.0
+Minimum required Rust version: 1.40.0
 
 Add this to your `Cargo.toml`:
 ```toml
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/src/dir.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/src/dir.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/src/dir.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/src/dir.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
 /// The `tempdir` function creates a directory in the file system
 /// and returns a [`TempDir`].
 /// The directory will be automatically deleted when the `TempDir`s
-/// desctructor is run.
+/// destructor is run.
 ///
 /// # Resource Leaking
 ///
@@ -69,7 +69,7 @@
 /// The `tempdir` function creates a directory in the file system
 /// and returns a [`TempDir`].
 /// The directory will be automatically deleted when the `TempDir`s
-/// desctructor is run.
+/// destructor is run.
 ///
 /// # Resource Leaking
 ///
@@ -326,7 +326,7 @@
         self.path.take().unwrap()
     }
 
-    /// Closes and removes the temporary directory, returing a `Result`.
+    /// Closes and removes the temporary directory, returning a `Result`.
     ///
     /// Although `TempDir` removes the directory on drop, in the destructor
     /// any errors are ignored. To detect errors cleaning up the temporary
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/src/file/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/src/file/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/src/file/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/src/file/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,3 @@
-use std;
 use std::env;
 use std::error;
 use std::ffi::OsStr;
@@ -178,7 +177,7 @@
     /// ```
     pub fn close(mut self) -> io::Result<()> {
         let result = fs::remove_file(&self.path).with_err_path(|| &self.path);
-        mem::replace(&mut self.path, PathBuf::new());
+        self.path = PathBuf::new();
         mem::forget(self);
         result
     }
@@ -189,7 +188,10 @@
     /// If this method fails, it will return `self` in the resulting
     /// [`PathPersistError`].
     ///
-    /// Note: Temporary files cannot be persisted across filesystems.
+    /// Note: Temporary files cannot be persisted across filesystems. Also
+    /// neither the file contents nor the containing directory are
+    /// synchronized, so the update may not yet have reached the disk when
+    /// `persist` returns.
     ///
     /// # Security
     ///
@@ -229,7 +231,7 @@
                 // Don't drop `self`. We don't want to try deleting the old
                 // temporary file path. (It'll fail, but the failure is never
                 // seen.)
-                mem::replace(&mut self.path, PathBuf::new());
+                self.path = PathBuf::new();
                 mem::forget(self);
                 Ok(())
             }
@@ -240,7 +242,7 @@
         }
     }
 
-    /// Persist the temporary file at the target path iff no file exists there.
+    /// Persist the temporary file at the target path if and only if no file exists there.
     ///
     /// If a file exists at the target path, fail. If this method fails, it will
     /// return `self` in the resulting [`PathPersistError`].
@@ -291,7 +293,7 @@
                 // Don't drop `self`. We don't want to try deleting the old
                 // temporary file path. (It'll fail, but the failure is never
                 // seen.)
-                mem::replace(&mut self.path, PathBuf::new());
+                self.path = PathBuf::new();
                 mem::forget(self);
                 Ok(())
             }
@@ -339,8 +341,7 @@
                 // Don't drop `self`. We don't want to try deleting the old
                 // temporary file path. (It'll fail, but the failure is never
                 // seen.)
-                let mut path = PathBuf::new();
-                mem::swap(&mut self.path, &mut path);
+                let path = mem::replace(&mut self.path, PathBuf::new());
                 mem::forget(self);
                 Ok(path)
             }
@@ -584,7 +585,7 @@
     ///
     /// See [`NamedTempFile::new()`] for details.
     ///
-    /// [`NamedTempFile::new()`]: #method.new_in
+    /// [`NamedTempFile::new()`]: #method.new
     pub fn new_in<P: AsRef<Path>>(dir: P) -> io::Result<NamedTempFile> {
         Builder::new().tempfile_in(dir)
     }
@@ -662,11 +663,14 @@
     /// If this method fails, it will return `self` in the resulting
     /// [`PersistError`].
     ///
-    /// Note: Temporary files cannot be persisted across filesystems.
+    /// Note: Temporary files cannot be persisted across filesystems. Also
+    /// neither the file contents nor the containing directory are
+    /// synchronized, so the update may not yet have reached the disk when
+    /// `persist` returns.
     ///
     /// # Security
     ///
-    /// This method persists the temporary file using it's path and may not be
+    /// This method persists the temporary file using its path and may not be
     /// secure in the in all cases. Please read the security section on the top
     /// level documentation of this type for details.
     ///
@@ -709,7 +713,7 @@
         }
     }
 
-    /// Persist the temporary file at the target path iff no file exists there.
+    /// Persist the temporary file at the target path if and only if no file exists there.
     ///
     /// If a file exists at the target path, fail. If this method fails, it will
     /// return `self` in the resulting PersistError.
@@ -720,7 +724,7 @@
     ///
     /// # Security
     ///
-    /// This method persists the temporary file using it's path and may not be
+    /// This method persists the temporary file using its path and may not be
     /// secure in the in all cases. Please read the security section on the top
     /// level documentation of this type for details.
     ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -124,6 +124,7 @@
 )]
 #![cfg_attr(test, deny(warnings))]
 #![deny(rust_2018_idioms)]
+#![allow(clippy::redundant_field_names)]
 
 #[macro_use]
 extern crate cfg_if;
@@ -143,7 +144,9 @@
 mod util;
 
 pub use crate::dir::{tempdir, tempdir_in, TempDir};
-pub use crate::file::{tempfile, tempfile_in, NamedTempFile, PathPersistError, PersistError, TempPath};
+pub use crate::file::{
+    tempfile, tempfile_in, NamedTempFile, PathPersistError, PersistError, TempPath,
+};
 pub use crate::spooled::{spooled_tempfile, SpooledTempFile};
 
 /// Create a new temporary file or directory with custom parameters.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/src/util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/src/util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tempfile/src/util.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tempfile/src/util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,7 +33,11 @@
 where
     F: Fn(PathBuf) -> io::Result<R>,
 {
-    let num_retries = if random_len != 0 { crate::NUM_RETRIES } else { 1 };
+    let num_retries = if random_len != 0 {
+        crate::NUM_RETRIES
+    } else {
+        1
+    };
 
     for _ in 0..num_retries {
         let path = base.join(tmpname(prefix, suffix, random_len));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"54e8557964e8fd7c085dc7dfc3880e10e359f6aad1893b0c4d10ba784f182757","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3938e3afa0fc92426522b7345cf8a0fd192fa476e1fb189fc8c8a65f5cd56c54","src/aserror.rs":"bd2322f561c944effd12fc889d82109d95225e59f6055e10031c5f4bb97e9e9b","src/display.rs":"63c492bfa8b8e9180ad5abcbe63c1173b4ad490c47ec33cac9a338f96c8f8e42","src/lib.rs":"5dc073efabbdbaa5ed15550e61df3b483ee00e6d3f40a9ec131eabea581dae3e","tests/compiletest.rs":"c61425723ca4eeb4a9079495c0e9640a9d210780b47e183fdb09ee2ad6887ce6","tests/test_backtrace.rs":"a811f816693df42e82c8dc52bff054d5feace8607f1bf6a9675e5ae77d72ca11","tests/test_deprecated.rs":"7b80a10f090a3982da017556d3d71398abcead59afd8278c7b9d9b1f7b66c7b3","tests/test_display.rs":"dde5540dd4b47613ae9e3a1360ced832131a86c83ccc7da2bb89042062aa5d5e","tests/test_error.rs":"994f35bba245cbdc08c094094b9c1440a0a2b48333663c73c6a96e772ae5d3d8","tests/test_expr.rs":"cd42633c0b0a0f595a5c498e576ca50b3a1c555c54b4652bdd296a4073771a61","tests/test_from.rs":"ff809f80ff09c9cba10b53321396d1807873b8d291b544d27560d1ee1743c29c","tests/test_lints.rs":"c17d79d77edfcdd4b8f6dcdcd1c70ad065cfbc747e1a618ac6343315d0b59ea4","tests/test_option.rs":"a3510dc1aef5a2dc995188506a560d7597d38717408606dece0b50a30d39bc26","tests/test_path.rs":"8f25b9be8940b9c41b254ae1bd265851e593734488fb0dbf94444bb583b95944","tests/test_source.rs":"f510713353370b7455da3422903df8e2e716afa3980e7da29db9c928eaf5e78a","tests/test_transparent.rs":"657ad244b50ee4146aeb4500b1f0a4bfc1c51c68f447678dccf152459adf6377","tests/ui/bad-field-attr.rs":"c5b567e3091969a01061843fb2d95c5e1aa3fa81edfeecdf416a84a6fba40aa8","tests/ui/bad-field-attr.stderr":"a43f52be4bc1f9cbdea550ba6a57943d52202c26c214f5fc980c1390fac7a478","tests/ui/concat-display.rs":"3995bd6b3bdd67df7bb16499775d89600c0dd20895633fe807396a64c117078d","tests/ui/concat-display.stderr":"f067c1bd210906cd87fd087a8de3f13440af720824cdd12ba6cdd93794ba480d","tests/ui/duplicate-enum-source.rs":"bfe28ce18042d446a76c7411aa233598211ce1157fdd3cb87bff3b3fa7c33131","tests/ui/duplicate-enum-source.stderr":"c4d2677360e868c0eb53e1a836b51d84c78878b738a6733f1781cf713ce2339b","tests/ui/duplicate-fmt.rs":"af53b66445bcce076a114376747f176b42c060a156563a41ccb638ae14c451fd","tests/ui/duplicate-fmt.stderr":"49ae7b3b0fb9893925b997c9d16da3fdb4cf53e4af028ae9938b372a3f4e570b","tests/ui/duplicate-struct-source.rs":"f3d5f8e3d6fccfcdbb630db291353709583a920c6bf46f9f9de9966b67ea4c0f","tests/ui/duplicate-struct-source.stderr":"c5ace25b856df309f4f8d15e159302e10d127c6c1c13a04144b1fb9f53dd4249","tests/ui/duplicate-transparent.rs":"41a9447e85f1a47027023442acde55c3d8610ec46d91b39bd43a42d7a004d747","tests/ui/duplicate-transparent.stderr":"c879653ffdfce93a13500a7b3e8c41383e8cfe1ad4aeb92ef68860af0ef7fd3e","tests/ui/from-not-source.rs":"744a55aeffe11066830159ac023c33aaa5576e313b341fa24440ee13dfe3ac98","tests/ui/from-not-source.stderr":"02b0337ec8ae65c4d04f0890032db4791c9d63f0d6d6c7bc5d161f5efccd7194","tests/ui/lifetime.rs":"b7381e0587a5094191884125756de88af14e672f2a4e1602e3810339e7c9d4cb","tests/ui/lifetime.stderr":"187eda5a5265e34400adb8d38de9007d98752c09c51fd71fc57591128563c2d3","tests/ui/missing-fmt.rs":"bc9e2830e54c2474ff6c27a766ed3dee88d29e40f93f30e8d64d63233866c17d","tests/ui/missing-fmt.stderr":"fd350d6252ed7ee71f99ded5be05f06be589995e998c1189df8bbbd312787d73","tests/ui/no-display.rs":"962245372272d23e9833311c15e73221b3c7da822a2ff90189613af56ffb5c2e","tests/ui/no-display.stderr":"88710d83f3e0ed7e8fea8dae1bd4f36fb542daa5eb233749a2a9a8e5c45455ab","tests/ui/source-enum-not-error.rs":"7c57c63b3ec37bc456738acea2e1038de5b0f32fe7e83984037d7ad1ed921737","tests/ui/source-enum-not-error.stderr":"6f209c55b70b30aaf3d124a046804f94c7f7b9e12f128d9c636aad755fd27ad1","tests/ui/source-struct-not-error.rs":"09fb7713637242dca9192585a6daeb8d732dc1c1d0fa522b74f1c98618e6d949","tests/ui/source-struct-not-error.stderr":"ebcd69fc2e7a20b26328dd4c923628dd679d33156bf59d22048a6fb2d312c5b6","tests/ui/transparent-display.rs":"b3c59583eb64b0b5a246444456d03cf52d51bcdc08885023600dbb44fd87e5f2","tests/ui/transparent-display.stderr":"8ea7d913aff8c7ff013b79801e190a5194fef49881b8ff682479d0bd7bc5b49f","tests/ui/transparent-enum-many.rs":"2a40a764fb4683bff57973eec61507a6c00f7d4d7a32da6e7bd0190c2e445434","tests/ui/transparent-enum-many.stderr":"1b9bcf7c98eee7cf8a30dc335d0960b9a2f98c8476f0313c9d2b76a173ad8abd","tests/ui/transparent-enum-source.rs":"18f606a98ac0a53f08dc56f5f923b9cbe75d25ed34479c777b48dac305d5968c","tests/ui/transparent-enum-source.stderr":"aa94074efa47d942b4eac43f5913b6d662ff5df48bcee9d1ab2c0942272657ad","tests/ui/transparent-struct-many.rs":"72c6b6c1a44c203d3bc68989b2f1ec092531ef75b745432824c3776c290326f6","tests/ui/transparent-struct-many.stderr":"9ed030f1ddbfcabf0e21a8ca21c58bf58153a81d911c113ec241f9b3b5e8aa71","tests/ui/transparent-struct-source.rs":"863fa691ed7d27e8767da58d9ee11fd40d6642274b36338ca1074c07964ea2b3","tests/ui/transparent-struct-source.stderr":"12ec7d7ce95685253739b1c0eb266a32670f38268583de84ec05955c3992f4b7","tests/ui/unexpected-field-fmt.rs":"29fba7b4d81c642ec8e47cfe053aa515acf9080a86d65e685363a48993becfe3","tests/ui/unexpected-field-fmt.stderr":"6e6bd3fcde43fbfd9036d44ea3c3a28f5fb545816e5287121d906c47447e9b32","tests/ui/unexpected-struct-source.rs":"c6cbe882d622635c216feb8290b1bd536ce0ec4feee16bc087667a21b3641d5c","tests/ui/unexpected-struct-source.stderr":"a7a3a50a790e0658e63783b2530acaaea2269f3ac30d8bca4001ef0a058161f4","tests/ui/union.rs":"331adff27cebd8b95b03b6742cc8247331fda1f961e1590ed39c8d39f50cf1d8","tests/ui/union.stderr":"2430a1e37611963714974664b6279a1ba87b1668381fd8bf93013bc5a5c76eaa"},"package":"0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"}
\ No newline at end of file
+{"files":{"Cargo.toml":"d8c0b8376a51b1fc0996f11c682594ba2406f20fd33ecd1483fd49ff2f6b6517","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"a9f0f8261b1cb4b7a5e6e32242f511339e74452e44a92b6e6158c665108acb9f","src/aserror.rs":"3cce71ec50a67dd21e5a45eabb27d4d8b8b4210e41cd5b0f8fc6bc7e0b843f74","src/display.rs":"63c492bfa8b8e9180ad5abcbe63c1173b4ad490c47ec33cac9a338f96c8f8e42","src/lib.rs":"7e740a989ed7fe4f851a0a3ea3143b655a907a81a755034a84171466ab44f94b","tests/compiletest.rs":"c61425723ca4eeb4a9079495c0e9640a9d210780b47e183fdb09ee2ad6887ce6","tests/test_backtrace.rs":"cc679af7d4caea68a6a8afd2d37d6aad5588677d4d6a51c5f61910f521468f89","tests/test_display.rs":"d0f5e6669c691197327268c198cce3b900536a2a7e9c561b7e98bfe680600482","tests/test_error.rs":"994f35bba245cbdc08c094094b9c1440a0a2b48333663c73c6a96e772ae5d3d8","tests/test_expr.rs":"70a267cc8c8bae29859638fbbcb8f6e8509fb4ea1549cb7b458dd034f3e25bfe","tests/test_from.rs":"58eb0922fea8887714918d3dac243b40d9459f43111c487ff9c4864b3d97b130","tests/test_lints.rs":"808d9289d52b4eb621377a946ebc725c811adf4b296bd061501621724c0c02d0","tests/test_option.rs":"a3510dc1aef5a2dc995188506a560d7597d38717408606dece0b50a30d39bc26","tests/test_path.rs":"f495655becc3e2edd8ac582211b30ba7ea248a49fd5c9ca856391580f2d23489","tests/test_source.rs":"a644d40f4e2334d4f2186894f82943d95a8426de4413048a466f5d6315420d4f","tests/test_transparent.rs":"a5a7d840f9d43e13fa553822bb144c6c0cecbcec13843d5adb97fc705f760b43","tests/ui/bad-field-attr.rs":"c5b567e3091969a01061843fb2d95c5e1aa3fa81edfeecdf416a84a6fba40aa8","tests/ui/bad-field-attr.stderr":"a43f52be4bc1f9cbdea550ba6a57943d52202c26c214f5fc980c1390fac7a478","tests/ui/concat-display.rs":"3995bd6b3bdd67df7bb16499775d89600c0dd20895633fe807396a64c117078d","tests/ui/concat-display.stderr":"33412b60bbca5192c87cc5580507e2f1f5aef1bd14279387eb9793d0b5f818d6","tests/ui/duplicate-enum-source.rs":"bfe28ce18042d446a76c7411aa233598211ce1157fdd3cb87bff3b3fa7c33131","tests/ui/duplicate-enum-source.stderr":"c4d2677360e868c0eb53e1a836b51d84c78878b738a6733f1781cf713ce2339b","tests/ui/duplicate-fmt.rs":"af53b66445bcce076a114376747f176b42c060a156563a41ccb638ae14c451fd","tests/ui/duplicate-fmt.stderr":"49ae7b3b0fb9893925b997c9d16da3fdb4cf53e4af028ae9938b372a3f4e570b","tests/ui/duplicate-struct-source.rs":"f3d5f8e3d6fccfcdbb630db291353709583a920c6bf46f9f9de9966b67ea4c0f","tests/ui/duplicate-struct-source.stderr":"c5ace25b856df309f4f8d15e159302e10d127c6c1c13a04144b1fb9f53dd4249","tests/ui/duplicate-transparent.rs":"41a9447e85f1a47027023442acde55c3d8610ec46d91b39bd43a42d7a004d747","tests/ui/duplicate-transparent.stderr":"c879653ffdfce93a13500a7b3e8c41383e8cfe1ad4aeb92ef68860af0ef7fd3e","tests/ui/from-not-source.rs":"744a55aeffe11066830159ac023c33aaa5576e313b341fa24440ee13dfe3ac98","tests/ui/from-not-source.stderr":"02b0337ec8ae65c4d04f0890032db4791c9d63f0d6d6c7bc5d161f5efccd7194","tests/ui/lifetime.rs":"e72e0391695e47fcd07edbf3819f114e468e2097086ec687781c7c8d6b4b7da7","tests/ui/lifetime.stderr":"9fde8069fd6c36d9f701ba89b710373d4a1059817a409c47213f882329c1ba87","tests/ui/missing-fmt.rs":"bc9e2830e54c2474ff6c27a766ed3dee88d29e40f93f30e8d64d63233866c17d","tests/ui/missing-fmt.stderr":"fd350d6252ed7ee71f99ded5be05f06be589995e998c1189df8bbbd312787d73","tests/ui/no-display.rs":"962245372272d23e9833311c15e73221b3c7da822a2ff90189613af56ffb5c2e","tests/ui/no-display.stderr":"f6be3a83ad23b2f48c085c26c8c5f8ea9d348352f1009cbb5376bfd993d3b180","tests/ui/source-enum-not-error.rs":"7c57c63b3ec37bc456738acea2e1038de5b0f32fe7e83984037d7ad1ed921737","tests/ui/source-enum-not-error.stderr":"4e736c7d6acd9c133315f6f50c78f46727cfd0f8894cb1a68d61ff9b097cbac6","tests/ui/source-struct-not-error.rs":"09fb7713637242dca9192585a6daeb8d732dc1c1d0fa522b74f1c98618e6d949","tests/ui/source-struct-not-error.stderr":"9aa0b567032185513fdb732bbb6887b9a30c7ddf0228ca811a7451c75b257364","tests/ui/transparent-display.rs":"b3c59583eb64b0b5a246444456d03cf52d51bcdc08885023600dbb44fd87e5f2","tests/ui/transparent-display.stderr":"8ea7d913aff8c7ff013b79801e190a5194fef49881b8ff682479d0bd7bc5b49f","tests/ui/transparent-enum-many.rs":"2a40a764fb4683bff57973eec61507a6c00f7d4d7a32da6e7bd0190c2e445434","tests/ui/transparent-enum-many.stderr":"1b9bcf7c98eee7cf8a30dc335d0960b9a2f98c8476f0313c9d2b76a173ad8abd","tests/ui/transparent-enum-source.rs":"18f606a98ac0a53f08dc56f5f923b9cbe75d25ed34479c777b48dac305d5968c","tests/ui/transparent-enum-source.stderr":"aa94074efa47d942b4eac43f5913b6d662ff5df48bcee9d1ab2c0942272657ad","tests/ui/transparent-struct-many.rs":"72c6b6c1a44c203d3bc68989b2f1ec092531ef75b745432824c3776c290326f6","tests/ui/transparent-struct-many.stderr":"9ed030f1ddbfcabf0e21a8ca21c58bf58153a81d911c113ec241f9b3b5e8aa71","tests/ui/transparent-struct-source.rs":"863fa691ed7d27e8767da58d9ee11fd40d6642274b36338ca1074c07964ea2b3","tests/ui/transparent-struct-source.stderr":"12ec7d7ce95685253739b1c0eb266a32670f38268583de84ec05955c3992f4b7","tests/ui/unexpected-field-fmt.rs":"29fba7b4d81c642ec8e47cfe053aa515acf9080a86d65e685363a48993becfe3","tests/ui/unexpected-field-fmt.stderr":"6e6bd3fcde43fbfd9036d44ea3c3a28f5fb545816e5287121d906c47447e9b32","tests/ui/unexpected-struct-source.rs":"c6cbe882d622635c216feb8290b1bd536ce0ec4feee16bc087667a21b3641d5c","tests/ui/unexpected-struct-source.stderr":"a7a3a50a790e0658e63783b2530acaaea2269f3ac30d8bca4001ef0a058161f4","tests/ui/union.rs":"331adff27cebd8b95b03b6742cc8247331fda1f961e1590ed39c8d39f50cf1d8","tests/ui/union.stderr":"2430a1e37611963714974664b6279a1ba87b1668381fd8bf93013bc5a5c76eaa"},"package":"283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "thiserror"
-version = "1.0.22"
+version = "1.0.28"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "derive(Error)"
 documentation = "https://docs.rs/thiserror"
@@ -24,7 +23,7 @@
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 [dependencies.thiserror-impl]
-version = "=1.0.22"
+version = "=1.0.28"
 [dev-dependencies.anyhow]
 version = "1.0"
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -70,7 +70,7 @@
   ```rust
   #[derive(Error, Debug)]
   pub enum Error {
-      #[error("invalid rdo_lookahead_frames {0} (expected < {})", i32::max_value())]
+      #[error("invalid rdo_lookahead_frames {0} (expected < {})", i32::MAX)]
       InvalidLookahead(u32),
   }
   ```
@@ -137,6 +137,20 @@
   }
   ```
 
+- If a field is both a source (named `source`, or has `#[source]` or `#[from]`
+  attribute) *and* is marked `#[backtrace]`, then the Error trait's
+  `backtrace()` method is forwarded to the source's backtrace.
+
+  ```rust
+  #[derive(Error, Debug)]
+  pub enum MyError {
+      Io {
+          #[backtrace]
+          source: io::Error,
+      },
+  }
+  ```
+
 - Errors may use `error(transparent)` to forward the source and Display methods
   straight through to an underlying error without adding an additional message.
   This would be appropriate for enums that need an "anything else" variant.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/src/aserror.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/src/aserror.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/src/aserror.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/src/aserror.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,33 @@
 use std::error::Error;
 
-pub trait AsDynError {
-    fn as_dyn_error(&self) -> &(dyn Error + 'static);
+pub trait AsDynError<'a> {
+    fn as_dyn_error(&self) -> &(dyn Error + 'a);
 }
 
-impl<T: Error + 'static> AsDynError for T {
+impl<'a, T: Error + 'a> AsDynError<'a> for T {
     #[inline]
-    fn as_dyn_error(&self) -> &(dyn Error + 'static) {
+    fn as_dyn_error(&self) -> &(dyn Error + 'a) {
         self
     }
 }
 
-impl AsDynError for dyn Error + 'static {
+impl<'a> AsDynError<'a> for dyn Error + 'a {
     #[inline]
-    fn as_dyn_error(&self) -> &(dyn Error + 'static) {
+    fn as_dyn_error(&self) -> &(dyn Error + 'a) {
         self
     }
 }
 
-impl AsDynError for dyn Error + Send + 'static {
+impl<'a> AsDynError<'a> for dyn Error + Send + 'a {
     #[inline]
-    fn as_dyn_error(&self) -> &(dyn Error + 'static) {
+    fn as_dyn_error(&self) -> &(dyn Error + 'a) {
         self
     }
 }
 
-impl AsDynError for dyn Error + Send + Sync + 'static {
+impl<'a> AsDynError<'a> for dyn Error + Send + Sync + 'a {
     #[inline]
-    fn as_dyn_error(&self) -> &(dyn Error + 'static) {
+    fn as_dyn_error(&self) -> &(dyn Error + 'a) {
         self
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -62,11 +62,12 @@
 //!   which may be arbitrary expressions. For example:
 //!
 //!   ```rust
+//!   # use std::i32;
 //!   # use thiserror::Error;
 //!   #
 //!   #[derive(Error, Debug)]
 //!   pub enum Error {
-//!       #[error("invalid rdo_lookahead_frames {0} (expected < {})", i32::max_value())]
+//!       #[error("invalid rdo_lookahead_frames {0} (expected < {})", i32::MAX)]
 //!       InvalidLookahead(u32),
 //!   }
 //!   ```
@@ -160,6 +161,22 @@
 //!   # };
 //!   ```
 //!
+//! - If a field is both a source (named `source`, or has `#[source]` or
+//!   `#[from]` attribute) *and* is marked `#[backtrace]`, then the Error
+//!   trait's `backtrace()` method is forwarded to the source's backtrace.
+//!
+//!   ```rust
+//!   # const IGNORE: &str = stringify! {
+//!   #[derive(Error, Debug)]
+//!   pub enum MyError {
+//!       Io {
+//!           #[backtrace]
+//!           source: io::Error,
+//!       },
+//!   }
+//!   # };
+//!   ```
+//!
 //! - Errors may use `error(transparent)` to forward the source and Display
 //!   methods straight through to an underlying error without adding an
 //!   additional message. This would be appropriate for enums that need an
@@ -184,6 +201,12 @@
 //!
 //!   [`anyhow`]: https://github.com/dtolnay/anyhow
 
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7421
+    clippy::doc_markdown,
+    clippy::module_name_repetitions,
+)]
+
 mod aserror;
 mod display;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_backtrace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_backtrace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_backtrace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_backtrace.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,8 @@
 #![cfg_attr(thiserror_nightly_testing, feature(backtrace))]
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
 
 use thiserror::Error;
 
@@ -7,8 +11,15 @@
 pub struct Inner;
 
 #[cfg(thiserror_nightly_testing)]
+#[derive(Error, Debug)]
+#[error("...")]
+pub struct InnerBacktrace {
+    backtrace: std::backtrace::Backtrace,
+}
+
+#[cfg(thiserror_nightly_testing)]
 pub mod structs {
-    use super::Inner;
+    use super::{Inner, InnerBacktrace};
     use std::backtrace::Backtrace;
     use std::error::Error;
     use std::sync::Arc;
@@ -52,6 +63,14 @@
 
     #[derive(Error, Debug)]
     #[error("...")]
+    pub struct CombinedBacktraceFrom {
+        #[from]
+        #[backtrace]
+        source: InnerBacktrace,
+    }
+
+    #[derive(Error, Debug)]
+    #[error("...")]
     pub struct OptBacktraceFrom {
         #[from]
         source: Inner,
@@ -93,6 +112,11 @@
         let error = BacktraceFrom::from(Inner);
         assert!(error.backtrace().is_some());
 
+        let error = CombinedBacktraceFrom::from(InnerBacktrace {
+            backtrace: Backtrace::capture(),
+        });
+        assert!(error.backtrace().is_some());
+
         let error = OptBacktraceFrom::from(Inner);
         assert!(error.backtrace().is_some());
 
@@ -103,7 +127,7 @@
 
 #[cfg(thiserror_nightly_testing)]
 pub mod enums {
-    use super::Inner;
+    use super::{Inner, InnerBacktrace};
     use std::backtrace::Backtrace;
     use std::error::Error;
     use std::sync::Arc;
@@ -154,6 +178,16 @@
     }
 
     #[derive(Error, Debug)]
+    pub enum CombinedBacktraceFrom {
+        #[error("...")]
+        Test {
+            #[from]
+            #[backtrace]
+            source: InnerBacktrace,
+        },
+    }
+
+    #[derive(Error, Debug)]
     pub enum OptBacktraceFrom {
         #[error("...")]
         Test {
@@ -200,6 +234,11 @@
         let error = BacktraceFrom::from(Inner);
         assert!(error.backtrace().is_some());
 
+        let error = CombinedBacktraceFrom::from(InnerBacktrace {
+            backtrace: Backtrace::capture(),
+        });
+        assert!(error.backtrace().is_some());
+
         let error = OptBacktraceFrom::from(Inner);
         assert!(error.backtrace().is_some());
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_deprecated.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_deprecated.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_deprecated.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_deprecated.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#![deny(deprecated, clippy::all, clippy::pedantic)]
-
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum Error {
-    #[deprecated]
-    #[error("...")]
-    Deprecated,
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_display.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_display.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_display.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_display.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,8 @@
 #![deny(clippy::all, clippy::pedantic)]
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
 
 use std::fmt::Display;
 use thiserror::Error;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_expr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_expr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_expr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_expr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,9 @@
 #![deny(clippy::all, clippy::pedantic)]
-#![allow(clippy::option_if_let_else)]
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+    clippy::option_if_let_else,
+)]
 
 use std::fmt::Display;
 use thiserror::Error;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_from.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_from.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_from.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_from.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,8 @@
 #![deny(clippy::all, clippy::pedantic)]
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
 
 use std::io;
 use thiserror::Error;
@@ -12,10 +16,21 @@
 
 #[derive(Error, Debug)]
 #[error("...")]
+pub struct ErrorStructOptional {
+    #[from]
+    source: Option<io::Error>,
+}
+
+#[derive(Error, Debug)]
+#[error("...")]
 pub struct ErrorTuple(#[from] io::Error);
 
 #[derive(Error, Debug)]
 #[error("...")]
+pub struct ErrorTupleOptional(#[from] Option<io::Error>);
+
+#[derive(Error, Debug)]
+#[error("...")]
 pub enum ErrorEnum {
     Test {
         #[from]
@@ -25,6 +40,15 @@
 
 #[derive(Error, Debug)]
 #[error("...")]
+pub enum ErrorEnumOptional {
+    Test {
+        #[from]
+        source: Option<io::Error>,
+    },
+}
+
+#[derive(Error, Debug)]
+#[error("...")]
 pub enum Many {
     Any(#[from] anyhow::Error),
     Io(#[from] io::Error),
@@ -35,7 +59,10 @@
 #[test]
 fn test_from() {
     assert_impl::<ErrorStruct>();
+    assert_impl::<ErrorStructOptional>();
     assert_impl::<ErrorTuple>();
+    assert_impl::<ErrorTupleOptional>();
     assert_impl::<ErrorEnum>();
+    assert_impl::<ErrorEnumOptional>();
     assert_impl::<Many>();
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_lints.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_lints.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_lints.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_lints.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,8 @@
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
+
 use thiserror::Error;
 
 pub use std::error::Error;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_path.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_path.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_path.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_path.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,8 @@
 #![deny(clippy::all, clippy::pedantic)]
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
 
 use ref_cast::RefCast;
 use std::fmt::Display;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_source.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_source.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_source.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_source.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,8 @@
 #![deny(clippy::all, clippy::pedantic)]
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
 
 use std::error::Error as StdError;
 use std::io;
@@ -48,3 +52,20 @@
     let error = BoxedSource { source };
     error.source().unwrap().downcast_ref::<io::Error>().unwrap();
 }
+
+macro_rules! error_from_macro {
+    ($($variants:tt)*) => {
+        #[derive(Error)]
+        #[derive(Debug)]
+        pub enum MacroSource {
+            $($variants)*
+        }
+    }
+}
+
+// Test that we generate impls with the proper hygiene
+#[rustfmt::skip]
+error_from_macro! {
+    #[error("Something")]
+    Variant(#[from] io::Error)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_transparent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_transparent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/test_transparent.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/test_transparent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,8 @@
 #![deny(clippy::all, clippy::pedantic)]
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
 
 use anyhow::anyhow;
 use std::error::Error as _;
@@ -57,3 +61,24 @@
     assert_eq!("outer", error.to_string());
     assert_eq!("inner", error.source().unwrap().to_string());
 }
+
+#[test]
+fn test_non_static() {
+    #[derive(Error, Debug)]
+    #[error(transparent)]
+    struct Error<'a> {
+        inner: ErrorKind<'a>,
+    }
+
+    #[derive(Error, Debug)]
+    enum ErrorKind<'a> {
+        #[error("unexpected token: {:?}", token)]
+        Unexpected { token: &'a str },
+    }
+
+    let error = Error {
+        inner: ErrorKind::Unexpected { token: "error" },
+    };
+    assert_eq!("unexpected token: \"error\"", error.to_string());
+    assert!(error.source().is_none());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/concat-display.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/concat-display.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/concat-display.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/concat-display.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -7,4 +7,4 @@
 13 | error_type!(Error, "foo");
    | -------------------------- in this macro invocation
    |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `error_type` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/lifetime.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/lifetime.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/lifetime.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/lifetime.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use std::fmt::Debug;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -8,6 +9,16 @@
 #[error("{0}")]
 struct Inner<'a>(&'a str);
 
+#[derive(Error, Debug)]
+enum Enum<'a> {
+    #[error("error")]
+    Foo(#[from] Generic<&'a str>),
+}
+
+#[derive(Error, Debug)]
+#[error("{0:?}")]
+struct Generic<T: Debug>(T);
+
 fn main() -> Result<(), Error<'static>> {
     Err(Error(Inner("some text")))
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/lifetime.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/lifetime.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/lifetime.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/lifetime.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,11 @@
-error: non-static lifetimes are not allowed in the source of an error
- --> $DIR/lifetime.rs:5:18
+error: non-static lifetimes are not allowed in the source of an error, because std::error::Error requires the source is dyn Error + 'static
+ --> $DIR/lifetime.rs:6:26
   |
-5 | struct Error<'a>(#[from] Inner<'a>);
-  |                  ^^^^^^^^^^^^^^^^^
+6 | struct Error<'a>(#[from] Inner<'a>);
+  |                          ^^^^^^^^^
+
+error: non-static lifetimes are not allowed in the source of an error, because std::error::Error requires the source is dyn Error + 'static
+  --> $DIR/lifetime.rs:15:17
+   |
+15 |     Foo(#[from] Generic<&'a str>),
+   |                 ^^^^^^^^^^^^^^^^
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/no-display.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/no-display.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/no-display.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/no-display.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,12 @@
-error[E0599]: no method named `as_display` found for reference `&NoDisplay` in the current scope
+error[E0599]: the method `as_display` exists for reference `&NoDisplay`, but its trait bounds were not satisfied
  --> $DIR/no-display.rs:7:9
   |
 4 | struct NoDisplay;
   | ----------------- doesn't satisfy `NoDisplay: std::fmt::Display`
 ...
 7 | #[error("thread: {thread}")]
-  |         ^^^^^^^^^^^^^^^^^^ method not found in `&NoDisplay`
+  |         ^^^^^^^^^^^^^^^^^^ method cannot be called on `&NoDisplay` due to unsatisfied trait bounds
   |
-  = note: the method `as_display` exists but the following trait bounds were not satisfied:
+  = note: the following trait bounds were not satisfied:
           `NoDisplay: std::fmt::Display`
           which is required by `&NoDisplay: DisplayAsDisplay`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/source-enum-not-error.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/source-enum-not-error.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/source-enum-not-error.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/source-enum-not-error.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-error[E0599]: no method named `as_dyn_error` found for reference `&NotError` in the current scope
+error[E0599]: the method `as_dyn_error` exists for reference `&NotError`, but its trait bounds were not satisfied
   --> $DIR/source-enum-not-error.rs:10:9
    |
 4  | pub struct NotError;
@@ -8,9 +8,9 @@
    | doesn't satisfy `NotError: std::error::Error`
 ...
 10 |         source: NotError,
-   |         ^^^^^^ method not found in `&NotError`
+   |         ^^^^^^ method cannot be called on `&NotError` due to unsatisfied trait bounds
    |
-   = note: the method `as_dyn_error` exists but the following trait bounds were not satisfied:
+   = note: the following trait bounds were not satisfied:
            `NotError: std::error::Error`
            which is required by `NotError: AsDynError`
            `&NotError: std::error::Error`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/source-struct-not-error.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/source-struct-not-error.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror/tests/ui/source-struct-not-error.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror/tests/ui/source-struct-not-error.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-error[E0599]: no method named `as_dyn_error` found for struct `NotError` in the current scope
+error[E0599]: the method `as_dyn_error` exists for struct `NotError`, but its trait bounds were not satisfied
  --> $DIR/source-struct-not-error.rs:9:5
   |
 4 | struct NotError;
@@ -9,8 +9,8 @@
   | doesn't satisfy `NotError: std::error::Error`
 ...
 9 |     source: NotError,
-  |     ^^^^^^ method not found in `NotError`
+  |     ^^^^^^ method cannot be called on `NotError` due to unsatisfied trait bounds
   |
-  = note: the method `as_dyn_error` exists but the following trait bounds were not satisfied:
+  = note: the following trait bounds were not satisfied:
           `NotError: std::error::Error`
           which is required by `NotError: AsDynError`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"366cefbc446b18334db29657bd358f334b63e4f49ddd48504997caec5e5fba76","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","src/ast.rs":"26e24eddfcaf6c430f6893b22fc2d1288b7c024b5ec956bd139e2c25f647b7a5","src/attr.rs":"9a270a64939274fe4b091e2e56fe375d3b6dc77cbd3c8a33d161dc4426b804b1","src/expand.rs":"d247d94836f55fde56d477a4ff135f64801c63aed9ea3a2a326882791a47e552","src/fmt.rs":"eea3b4f917a2d1c72a6dadcefc0b171f3316f8008ac26f51d58d3414307f4a2d","src/lib.rs":"b42560cf713287c2059b7cd9c42e371967811da200b63f896a080dfd4367a053","src/prop.rs":"00e2d0711f8c82befedd7a970a127c929adcef5e7abbd0dee9c0163cd567a6ad","src/valid.rs":"b594f0a3b8e67f94365b17f6a3f74cfbfe0edd1281f98cdd16e132570d66899d"},"package":"9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"}
\ No newline at end of file
+{"files":{"Cargo.toml":"ab78c039694c0e7074c80da465d3bfc03a5d46883da54943a0a3b3eb35e831f5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","src/ast.rs":"26e24eddfcaf6c430f6893b22fc2d1288b7c024b5ec956bd139e2c25f647b7a5","src/attr.rs":"9a270a64939274fe4b091e2e56fe375d3b6dc77cbd3c8a33d161dc4426b804b1","src/expand.rs":"319ab451567c9d52dbbfbcbc89c6a69631958eecbed873839bd5ee7c4ba2b497","src/fmt.rs":"eea3b4f917a2d1c72a6dadcefc0b171f3316f8008ac26f51d58d3414307f4a2d","src/lib.rs":"a39b07f7bb959a3a4959adcc5a44cfb7896ce752789a3e0740d16f3230e011cf","src/prop.rs":"6709932aee8f9d217f40cd644629c0ecb2f46d333ae8a1398e8d745534f4e028","src/valid.rs":"93317a8342891dc4569cfdd5f64a8c64cdec8fff49911428427b0621974eec32"},"package":"fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# 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"
 name = "thiserror-impl"
-version = "1.0.22"
+version = "1.0.28"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "Implementation detail of the `thiserror` crate"
 license = "MIT OR Apache-2.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/src/expand.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/src/expand.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/src/expand.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/src/expand.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 use proc_macro2::TokenStream;
 use quote::{format_ident, quote, quote_spanned, ToTokens};
 use syn::spanned::Spanned;
-use syn::{Data, DeriveInput, Member, PathArguments, Result, Type, Visibility};
+use syn::{Data, DeriveInput, GenericArgument, Member, PathArguments, Result, Type, Visibility};
 
 pub fn derive(node: &DeriveInput) -> Result<TokenStream> {
     let input = Input::from_syn(node)?;
@@ -58,7 +58,9 @@
                     self.#source.as_dyn_error().backtrace()
                 }
             };
-            let combinator = if type_is_option(backtrace_field.ty) {
+            let combinator = if source == backtrace {
+                source_backtrace
+            } else if type_is_option(backtrace_field.ty) {
                 quote! {
                     #source_backtrace.or(self.#backtrace.as_ref())
                 }
@@ -115,7 +117,11 @@
         quote! {
             #[allow(unused_qualifications)]
             impl #impl_generics std::fmt::Display for #ty #ty_generics #where_clause {
-                #[allow(clippy::used_underscore_binding)]
+                #[allow(
+                    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+                    clippy::nonstandard_macro_braces,
+                    clippy::used_underscore_binding,
+                )]
                 fn fmt(&self, __formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
                     #body
                 }
@@ -124,8 +130,8 @@
     });
 
     let from_impl = input.from_field().map(|from_field| {
-        let backtrace_field = input.backtrace_field();
-        let from = from_field.ty;
+        let backtrace_field = input.distinct_backtrace_field();
+        let from = unoptional_type(from_field.ty);
         let body = from_initializer(from_field, backtrace_field);
         quote! {
             #[allow(unused_qualifications)]
@@ -171,9 +177,10 @@
                 } else {
                     None
                 };
-                let dyn_error = quote_spanned!(source.span()=> source #asref.as_dyn_error());
+                let varsource = quote!(source);
+                let dyn_error = quote_spanned!(source.span()=> #varsource #asref.as_dyn_error());
                 quote! {
-                    #ty::#ident {#source: source, ..} => std::option::Option::Some(#dyn_error),
+                    #ty::#ident {#source: #varsource, ..} => std::option::Option::Some(#dyn_error),
                 }
             } else {
                 quote! {
@@ -203,13 +210,14 @@
                 {
                     let backtrace = &backtrace_field.member;
                     let source = &source_field.member;
+                    let varsource = quote!(source);
                     let source_backtrace = if type_is_option(source_field.ty) {
                         quote_spanned! {source.span()=>
-                            source.as_ref().and_then(|source| source.as_dyn_error().backtrace())
+                            #varsource.as_ref().and_then(|source| source.as_dyn_error().backtrace())
                         }
                     } else {
                         quote_spanned! {source.span()=>
-                            source.as_dyn_error().backtrace()
+                            #varsource.as_dyn_error().backtrace()
                         }
                     };
                     let combinator = if type_is_option(backtrace_field.ty) {
@@ -224,7 +232,7 @@
                     quote! {
                         #ty::#ident {
                             #backtrace: backtrace,
-                            #source: source,
+                            #source: #varsource,
                             ..
                         } => {
                             use thiserror::private::AsDynError;
@@ -232,6 +240,27 @@
                         }
                     }
                 }
+                (Some(backtrace_field), Some(source_field))
+                    if backtrace_field.member == source_field.member =>
+                {
+                    let backtrace = &backtrace_field.member;
+                    let varsource = quote!(source);
+                    let source_backtrace = if type_is_option(source_field.ty) {
+                        quote_spanned! {backtrace.span()=>
+                            #varsource.as_ref().and_then(|source| source.as_dyn_error().backtrace())
+                        }
+                    } else {
+                        quote_spanned! {backtrace.span()=>
+                            #varsource.as_dyn_error().backtrace()
+                        }
+                    };
+                    quote! {
+                        #ty::#ident {#backtrace: #varsource, ..} => {
+                            use thiserror::private::AsDynError;
+                            #source_backtrace
+                        }
+                    }
+                }
                 (Some(backtrace_field), _) => {
                     let backtrace = &backtrace_field.member;
                     let body = if type_is_option(backtrace_field.ty) {
@@ -301,7 +330,13 @@
             impl #impl_generics std::fmt::Display for #ty #ty_generics #where_clause {
                 fn fmt(&self, __formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
                     #use_as_display
-                    #[allow(unused_variables, deprecated, clippy::used_underscore_binding)]
+                    #[allow(
+                        unused_variables,
+                        deprecated,
+                        // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+                        clippy::nonstandard_macro_braces,
+                        clippy::used_underscore_binding,
+                    )]
                     match #void_deref self {
                         #(#arms,)*
                     }
@@ -314,9 +349,9 @@
 
     let from_impls = input.variants.iter().filter_map(|variant| {
         let from_field = variant.from_field()?;
-        let backtrace_field = variant.backtrace_field();
+        let backtrace_field = variant.distinct_backtrace_field();
         let variant = &variant.ident;
-        let from = from_field.ty;
+        let from = unoptional_type(from_field.ty);
         let body = from_initializer(from_field, backtrace_field);
         Some(quote! {
             #[allow(unused_qualifications)]
@@ -359,6 +394,11 @@
 
 fn from_initializer(from_field: &Field, backtrace_field: Option<&Field>) -> TokenStream {
     let from_member = &from_field.member;
+    let some_source = if type_is_option(from_field.ty) {
+        quote!(std::option::Option::Some(source))
+    } else {
+        quote!(source)
+    };
     let backtrace = backtrace_field.map(|backtrace_field| {
         let backtrace_member = &backtrace_field.member;
         if type_is_option(backtrace_field.ty) {
@@ -372,25 +412,43 @@
         }
     });
     quote!({
-        #from_member: source,
+        #from_member: #some_source,
         #backtrace
     })
 }
 
 fn type_is_option(ty: &Type) -> bool {
+    type_parameter_of_option(ty).is_some()
+}
+
+fn unoptional_type(ty: &Type) -> TokenStream {
+    let unoptional = type_parameter_of_option(ty).unwrap_or(ty);
+    quote!(#unoptional)
+}
+
+fn type_parameter_of_option(ty: &Type) -> Option<&Type> {
     let path = match ty {
         Type::Path(ty) => &ty.path,
-        _ => return false,
+        _ => return None,
     };
 
     let last = path.segments.last().unwrap();
     if last.ident != "Option" {
-        return false;
+        return None;
+    }
+
+    let bracketed = match &last.arguments {
+        PathArguments::AngleBracketed(bracketed) => bracketed,
+        _ => return None,
+    };
+
+    if bracketed.args.len() != 1 {
+        return None;
     }
 
-    match &last.arguments {
-        PathArguments::AngleBracketed(bracketed) => bracketed.args.len() == 1,
-        _ => false,
+    match &bracketed.args[0] {
+        GenericArgument::Type(arg) => Some(arg),
+        _ => None,
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,14 @@
-#![allow(clippy::blocks_in_if_conditions, clippy::range_plus_one)]
+#![allow(
+    clippy::blocks_in_if_conditions,
+    clippy::cast_possible_truncation,
+    clippy::manual_map,
+    clippy::map_unwrap_or,
+    clippy::needless_pass_by_value,
+    clippy::option_if_let_else,
+    clippy::range_plus_one,
+    clippy::single_match_else,
+    clippy::too_many_lines
+)]
 
 extern crate proc_macro;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/src/prop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/src/prop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/src/prop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/src/prop.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,6 +13,11 @@
     pub(crate) fn backtrace_field(&self) -> Option<&Field> {
         backtrace_field(&self.fields)
     }
+
+    pub(crate) fn distinct_backtrace_field(&self) -> Option<&Field> {
+        let backtrace_field = self.backtrace_field()?;
+        distinct_backtrace_field(backtrace_field, self.from_field())
+    }
 }
 
 impl Enum<'_> {
@@ -54,6 +59,11 @@
     pub(crate) fn backtrace_field(&self) -> Option<&Field> {
         backtrace_field(&self.fields)
     }
+
+    pub(crate) fn distinct_backtrace_field(&self) -> Option<&Field> {
+        let backtrace_field = self.backtrace_field()?;
+        distinct_backtrace_field(backtrace_field, self.from_field())
+    }
 }
 
 impl Field<'_> {
@@ -65,7 +75,7 @@
 fn from_field<'a, 'b>(fields: &'a [Field<'b>]) -> Option<&'a Field<'b>> {
     for field in fields {
         if field.attrs.from.is_some() {
-            return Some(&field);
+            return Some(field);
         }
     }
     None
@@ -74,12 +84,12 @@
 fn source_field<'a, 'b>(fields: &'a [Field<'b>]) -> Option<&'a Field<'b>> {
     for field in fields {
         if field.attrs.from.is_some() || field.attrs.source.is_some() {
-            return Some(&field);
+            return Some(field);
         }
     }
     for field in fields {
         match &field.member {
-            Member::Named(ident) if ident == "source" => return Some(&field),
+            Member::Named(ident) if ident == "source" => return Some(field),
             _ => {}
         }
     }
@@ -89,17 +99,31 @@
 fn backtrace_field<'a, 'b>(fields: &'a [Field<'b>]) -> Option<&'a Field<'b>> {
     for field in fields {
         if field.attrs.backtrace.is_some() {
-            return Some(&field);
+            return Some(field);
         }
     }
     for field in fields {
         if field.is_backtrace() {
-            return Some(&field);
+            return Some(field);
         }
     }
     None
 }
 
+// The #[backtrace] field, if it is not the same as the #[from] field.
+fn distinct_backtrace_field<'a, 'b>(
+    backtrace_field: &'a Field<'b>,
+    from_field: Option<&Field>,
+) -> Option<&'a Field<'b>> {
+    if from_field.map_or(false, |from_field| {
+        from_field.member == backtrace_field.member
+    }) {
+        None
+    } else {
+        Some(backtrace_field)
+    }
+}
+
 fn type_is_backtrace(ty: &Type) -> bool {
     let path = match ty {
         Type::Path(ty) => &ty.path,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/src/valid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/src/valid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thiserror-impl/src/valid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thiserror-impl/src/valid.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,7 +23,7 @@
                     "#[error(transparent)] requires exactly one field",
                 ));
             }
-            if let Some(source) = self.fields.iter().filter_map(|f| f.attrs.source).next() {
+            if let Some(source) = self.fields.iter().find_map(|f| f.attrs.source) {
                 return Err(Error::new_spanned(
                     source,
                     "transparent error struct can't contain #[source]",
@@ -78,7 +78,7 @@
                     "#[error(transparent)] requires exactly one field",
                 ));
             }
-            if let Some(source) = self.fields.iter().filter_map(|f| f.attrs.source).next() {
+            if let Some(source) = self.fields.iter().find_map(|f| f.attrs.source) {
                 return Err(Error::new_spanned(
                     source,
                     "transparent variant can't contain #[source]",
@@ -188,10 +188,10 @@
         }
     }
     if let Some(source_field) = source_field.or(from_field) {
-        if contains_non_static_lifetime(source_field) {
+        if contains_non_static_lifetime(source_field.ty) {
             return Err(Error::new_spanned(
-                source_field.original,
-                "non-static lifetimes are not allowed in the source of an error",
+                &source_field.original.ty,
+                "non-static lifetimes are not allowed in the source of an error, because std::error::Error requires the source is dyn Error + 'static",
             ));
         }
     }
@@ -206,21 +206,28 @@
     }
 }
 
-fn contains_non_static_lifetime(field: &Field) -> bool {
-    let ty = match field.ty {
-        Type::Path(ty) => ty,
-        _ => return false, // maybe implement later if there are common other cases
-    };
-    let bracketed = match &ty.path.segments.last().unwrap().arguments {
-        PathArguments::AngleBracketed(bracketed) => bracketed,
-        _ => return false,
-    };
-    for arg in &bracketed.args {
-        if let GenericArgument::Lifetime(lifetime) = arg {
-            if lifetime.ident != "static" {
-                return true;
+fn contains_non_static_lifetime(ty: &Type) -> bool {
+    match ty {
+        Type::Path(ty) => {
+            let bracketed = match &ty.path.segments.last().unwrap().arguments {
+                PathArguments::AngleBracketed(bracketed) => bracketed,
+                _ => return false,
+            };
+            for arg in &bracketed.args {
+                match arg {
+                    GenericArgument::Type(ty) if contains_non_static_lifetime(ty) => return true,
+                    GenericArgument::Lifetime(lifetime) if lifetime.ident != "static" => {
+                        return true
+                    }
+                    _ => {}
+                }
             }
+            false
         }
+        Type::Reference(ty) => ty
+            .lifetime
+            .as_ref()
+            .map_or(false, |lifetime| lifetime.ident != "static"),
+        _ => false, // maybe implement later if there are common other cases
     }
-    false
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/benches/thread_local.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/benches/thread_local.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/benches/thread_local.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/benches/thread_local.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#![feature(test)]
-
-extern crate thread_local;
-extern crate test;
-
-use thread_local::{ThreadLocal, CachedThreadLocal};
-
-#[bench]
-fn thread_local(b: &mut test::Bencher) {
-    let local = ThreadLocal::new();
-    b.iter(|| { let _: &i32 = local.get_or(|| Box::new(0)); });
-}
-
-#[bench]
-fn cached_thread_local(b: &mut test::Bencher) {
-    let local = CachedThreadLocal::new();
-    b.iter(|| { let _: &i32 = local.get_or(|| Box::new(0)); });
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"a08d3007cec7ad1a83afad57980965ece5457089404f6f5d41eacc8143386d69","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"ab6f09e96c06e37ee3df492562a07c1c3548dd5abf73301f8215a5dcedcccc84","benches/thread_local.rs":"cc8bde81ed6206525feff209598caf1e01e89a83bf21d8b7ccc0dadc8b89d815","src/cached.rs":"089286aa7bcde7c92b1ee7381b74f8c30049c0d80a85c1babdbac69b2e210396","src/lib.rs":"a67d7bf8c7c3bd869ea297cf1d158db8c9c4bbf7ae1e23d9028cfc3a7554e235","src/thread_id.rs":"0962c130061939557aa272115e4420fbbc63b6bd306783a456a8ffcbf304a447","src/unreachable.rs":"830d44988f86f4fc6c3c4dd7e9e4e7d0f2cb9c5b024c360b5f7ceae365983367"},"package":"d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "thread_local"
-version = "1.0.1"
-authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
-description = "Per-object thread-local storage"
-documentation = "https://amanieu.github.io/thread_local-rs/thread_local/index.html"
-readme = "README.md"
-keywords = ["thread_local", "concurrent", "thread"]
-license = "Apache-2.0/MIT"
-repository = "https://github.com/Amanieu/thread_local-rs"
-[dependencies.lazy_static]
-version = "1.0"
-[badges.travis-ci]
-repository = "Amanieu/thread_local-rs"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2016 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-thread_local
-============
-
-[![Build Status](https://travis-ci.org/Amanieu/thread_local-rs.svg?branch=master)](https://travis-ci.org/Amanieu/thread_local-rs) [![Crates.io](https://img.shields.io/crates/v/thread_local.svg)](https://crates.io/crates/thread_local)
-
-This library provides the `ThreadLocal` and `CachedThreadLocal` types which
-allow a separate copy of an object to be used for each thread. This allows for
-per-object thread-local storage, unlike the standard library's `thread_local!`
-macro which only allows static thread-local storage.
-
-[Documentation](https://amanieu.github.io/thread_local-rs/thread_local/index.html)
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-thread_local = "1.0"
-```
-
-and this to your crate root:
-
-```rust
-extern crate thread_local;
-```
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/src/cached.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/src/cached.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/src/cached.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/src/cached.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-use super::{IntoIter, IterMut, ThreadLocal};
-use std::cell::UnsafeCell;
-use std::fmt;
-use std::panic::UnwindSafe;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use thread_id;
-use unreachable::{UncheckedOptionExt, UncheckedResultExt};
-
-/// Wrapper around `ThreadLocal` which adds a fast path for a single thread.
-///
-/// This has the same API as `ThreadLocal`, but will register the first thread
-/// that sets a value as its owner. All accesses by the owner will go through
-/// a special fast path which is much faster than the normal `ThreadLocal` path.
-pub struct CachedThreadLocal<T: Send> {
-    owner: AtomicUsize,
-    local: UnsafeCell<Option<Box<T>>>,
-    global: ThreadLocal<T>,
-}
-
-// CachedThreadLocal is always Sync, even if T isn't
-unsafe impl<T: Send> Sync for CachedThreadLocal<T> {}
-
-impl<T: Send> Default for CachedThreadLocal<T> {
-    fn default() -> CachedThreadLocal<T> {
-        CachedThreadLocal::new()
-    }
-}
-
-impl<T: Send> CachedThreadLocal<T> {
-    /// Creates a new empty `CachedThreadLocal`.
-    pub fn new() -> CachedThreadLocal<T> {
-        CachedThreadLocal {
-            owner: AtomicUsize::new(0),
-            local: UnsafeCell::new(None),
-            global: ThreadLocal::new(),
-        }
-    }
-
-    /// Returns the element for the current thread, if it exists.
-    pub fn get(&self) -> Option<&T> {
-        let id = thread_id::get();
-        let owner = self.owner.load(Ordering::Relaxed);
-        if owner == id {
-            return unsafe { Some((*self.local.get()).as_ref().unchecked_unwrap()) };
-        }
-        if owner == 0 {
-            return None;
-        }
-        self.global.get_fast(id)
-    }
-
-    /// Returns the element for the current thread, or creates it if it doesn't
-    /// exist.
-    #[inline(always)]
-    pub fn get_or<F>(&self, create: F) -> &T
-    where
-        F: FnOnce() -> T,
-    {
-        unsafe {
-            self.get_or_try(|| Ok::<T, ()>(create()))
-                .unchecked_unwrap_ok()
-        }
-    }
-
-    /// Returns the element for the current thread, or creates it if it doesn't
-    /// exist. If `create` fails, that error is returned and no element is
-    /// added.
-    pub fn get_or_try<F, E>(&self, create: F) -> Result<&T, E>
-    where
-        F: FnOnce() -> Result<T, E>,
-    {
-        let id = thread_id::get();
-        let owner = self.owner.load(Ordering::Relaxed);
-        if owner == id {
-            return Ok(unsafe { (*self.local.get()).as_ref().unchecked_unwrap() });
-        }
-        self.get_or_try_slow(id, owner, create)
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn get_or_try_slow<F, E>(&self, id: usize, owner: usize, create: F) -> Result<&T, E>
-    where
-        F: FnOnce() -> Result<T, E>,
-    {
-        if owner == 0 && self.owner.compare_and_swap(0, id, Ordering::Relaxed) == 0 {
-            unsafe {
-                (*self.local.get()) = Some(Box::new(create()?));
-                return Ok((*self.local.get()).as_ref().unchecked_unwrap());
-            }
-        }
-        match self.global.get_fast(id) {
-            Some(x) => Ok(x),
-            None => Ok(self.global.insert(id, Box::new(create()?), true)),
-        }
-    }
-
-    /// Returns a mutable iterator over the local values of all threads.
-    ///
-    /// Since this call borrows the `ThreadLocal` mutably, this operation can
-    /// be done safely---the mutable borrow statically guarantees no other
-    /// threads are currently accessing their associated values.
-    pub fn iter_mut(&mut self) -> CachedIterMut<T> {
-        CachedIterMut {
-            local: unsafe { (*self.local.get()).as_mut().map(|x| &mut **x) },
-            global: self.global.iter_mut(),
-        }
-    }
-
-    /// Removes all thread-specific values from the `ThreadLocal`, effectively
-    /// reseting it to its original state.
-    ///
-    /// Since this call borrows the `ThreadLocal` mutably, this operation can
-    /// be done safely---the mutable borrow statically guarantees no other
-    /// threads are currently accessing their associated values.
-    pub fn clear(&mut self) {
-        *self = CachedThreadLocal::new();
-    }
-}
-
-impl<T: Send> IntoIterator for CachedThreadLocal<T> {
-    type Item = T;
-    type IntoIter = CachedIntoIter<T>;
-
-    fn into_iter(self) -> CachedIntoIter<T> {
-        CachedIntoIter {
-            local: unsafe { (*self.local.get()).take().map(|x| *x) },
-            global: self.global.into_iter(),
-        }
-    }
-}
-
-impl<'a, T: Send + 'a> IntoIterator for &'a mut CachedThreadLocal<T> {
-    type Item = &'a mut T;
-    type IntoIter = CachedIterMut<'a, T>;
-
-    fn into_iter(self) -> CachedIterMut<'a, T> {
-        self.iter_mut()
-    }
-}
-
-impl<T: Send + Default> CachedThreadLocal<T> {
-    /// Returns the element for the current thread, or creates a default one if
-    /// it doesn't exist.
-    pub fn get_or_default(&self) -> &T {
-        self.get_or(T::default)
-    }
-}
-
-impl<T: Send + fmt::Debug> fmt::Debug for CachedThreadLocal<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "ThreadLocal {{ local_data: {:?} }}", self.get())
-    }
-}
-
-impl<T: Send + UnwindSafe> UnwindSafe for CachedThreadLocal<T> {}
-
-/// Mutable iterator over the contents of a `CachedThreadLocal`.
-pub struct CachedIterMut<'a, T: Send + 'a> {
-    local: Option<&'a mut T>,
-    global: IterMut<'a, T>,
-}
-
-impl<'a, T: Send + 'a> Iterator for CachedIterMut<'a, T> {
-    type Item = &'a mut T;
-
-    fn next(&mut self) -> Option<&'a mut T> {
-        self.local.take().or_else(|| self.global.next())
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = self.global.size_hint().0 + self.local.is_some() as usize;
-        (len, Some(len))
-    }
-}
-
-impl<'a, T: Send + 'a> ExactSizeIterator for CachedIterMut<'a, T> {}
-
-/// An iterator that moves out of a `CachedThreadLocal`.
-pub struct CachedIntoIter<T: Send> {
-    local: Option<T>,
-    global: IntoIter<T>,
-}
-
-impl<T: Send> Iterator for CachedIntoIter<T> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<T> {
-        self.local.take().or_else(|| self.global.next())
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = self.global.size_hint().0 + self.local.is_some() as usize;
-        (len, Some(len))
-    }
-}
-
-impl<T: Send> ExactSizeIterator for CachedIntoIter<T> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,607 +0,0 @@
-// Copyright 2017 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-//! Per-object thread-local storage
-//!
-//! This library provides the `ThreadLocal` type which allows a separate copy of
-//! an object to be used for each thread. This allows for per-object
-//! thread-local storage, unlike the standard library's `thread_local!` macro
-//! which only allows static thread-local storage.
-//!
-//! Per-thread objects are not destroyed when a thread exits. Instead, objects
-//! are only destroyed when the `ThreadLocal` containing them is destroyed.
-//!
-//! You can also iterate over the thread-local values of all thread in a
-//! `ThreadLocal` object using the `iter_mut` and `into_iter` methods. This can
-//! only be done if you have mutable access to the `ThreadLocal` object, which
-//! guarantees that you are the only thread currently accessing it.
-//!
-//! A `CachedThreadLocal` type is also provided which wraps a `ThreadLocal` but
-//! also uses a special fast path for the first thread that writes into it. The
-//! fast path has very low overhead (<1ns per access) while keeping the same
-//! performance as `ThreadLocal` for other threads.
-//!
-//! Note that since thread IDs are recycled when a thread exits, it is possible
-//! for one thread to retrieve the object of another thread. Since this can only
-//! occur after a thread has exited this does not lead to any race conditions.
-//!
-//! # Examples
-//!
-//! Basic usage of `ThreadLocal`:
-//!
-//! ```rust
-//! use thread_local::ThreadLocal;
-//! let tls: ThreadLocal<u32> = ThreadLocal::new();
-//! assert_eq!(tls.get(), None);
-//! assert_eq!(tls.get_or(|| 5), &5);
-//! assert_eq!(tls.get(), Some(&5));
-//! ```
-//!
-//! Combining thread-local values into a single result:
-//!
-//! ```rust
-//! use thread_local::ThreadLocal;
-//! use std::sync::Arc;
-//! use std::cell::Cell;
-//! use std::thread;
-//!
-//! let tls = Arc::new(ThreadLocal::new());
-//!
-//! // Create a bunch of threads to do stuff
-//! for _ in 0..5 {
-//!     let tls2 = tls.clone();
-//!     thread::spawn(move || {
-//!         // Increment a counter to count some event...
-//!         let cell = tls2.get_or(|| Cell::new(0));
-//!         cell.set(cell.get() + 1);
-//!     }).join().unwrap();
-//! }
-//!
-//! // Once all threads are done, collect the counter values and return the
-//! // sum of all thread-local counter values.
-//! let tls = Arc::try_unwrap(tls).unwrap();
-//! let total = tls.into_iter().fold(0, |x, y| x + y.get());
-//! assert_eq!(total, 5);
-//! ```
-
-#![warn(missing_docs)]
-
-#[macro_use]
-extern crate lazy_static;
-
-mod thread_id;
-mod unreachable;
-mod cached;
-
-pub use cached::{CachedIntoIter, CachedIterMut, CachedThreadLocal};
-
-use std::cell::UnsafeCell;
-use std::fmt;
-use std::marker::PhantomData;
-use std::panic::UnwindSafe;
-use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
-use std::sync::Mutex;
-use unreachable::{UncheckedOptionExt, UncheckedResultExt};
-
-/// Thread-local variable wrapper
-///
-/// See the [module-level documentation](index.html) for more.
-pub struct ThreadLocal<T: Send> {
-    // Pointer to the current top-level hash table
-    table: AtomicPtr<Table<T>>,
-
-    // Lock used to guard against concurrent modifications. This is only taken
-    // while writing to the table, not when reading from it. This also guards
-    // the counter for the total number of values in the hash table.
-    lock: Mutex<usize>,
-}
-
-struct Table<T: Send> {
-    // Hash entries for the table
-    entries: Box<[TableEntry<T>]>,
-
-    // Number of bits used for the hash function
-    hash_bits: usize,
-
-    // Previous table, half the size of the current one
-    prev: Option<Box<Table<T>>>,
-}
-
-struct TableEntry<T: Send> {
-    // Current owner of this entry, or 0 if this is an empty entry
-    owner: AtomicUsize,
-
-    // The object associated with this entry. This is only ever accessed by the
-    // owner of the entry.
-    data: UnsafeCell<Option<Box<T>>>,
-}
-
-// ThreadLocal is always Sync, even if T isn't
-unsafe impl<T: Send> Sync for ThreadLocal<T> {}
-
-impl<T: Send> Default for ThreadLocal<T> {
-    fn default() -> ThreadLocal<T> {
-        ThreadLocal::new()
-    }
-}
-
-impl<T: Send> Drop for ThreadLocal<T> {
-    fn drop(&mut self) {
-        unsafe {
-            Box::from_raw(self.table.load(Ordering::Relaxed));
-        }
-    }
-}
-
-// Implementation of Clone for TableEntry, needed to make vec![] work
-impl<T: Send> Clone for TableEntry<T> {
-    fn clone(&self) -> TableEntry<T> {
-        TableEntry {
-            owner: AtomicUsize::new(0),
-            data: UnsafeCell::new(None),
-        }
-    }
-}
-
-// Hash function for the thread id
-#[cfg(target_pointer_width = "32")]
-#[inline]
-fn hash(id: usize, bits: usize) -> usize {
-    id.wrapping_mul(0x9E3779B9) >> (32 - bits)
-}
-#[cfg(target_pointer_width = "64")]
-#[inline]
-fn hash(id: usize, bits: usize) -> usize {
-    id.wrapping_mul(0x9E37_79B9_7F4A_7C15) >> (64 - bits)
-}
-
-impl<T: Send> ThreadLocal<T> {
-    /// Creates a new empty `ThreadLocal`.
-    pub fn new() -> ThreadLocal<T> {
-        let entry = TableEntry {
-            owner: AtomicUsize::new(0),
-            data: UnsafeCell::new(None),
-        };
-        let table = Table {
-            entries: vec![entry; 2].into_boxed_slice(),
-            hash_bits: 1,
-            prev: None,
-        };
-        ThreadLocal {
-            table: AtomicPtr::new(Box::into_raw(Box::new(table))),
-            lock: Mutex::new(0),
-        }
-    }
-
-    /// Returns the element for the current thread, if it exists.
-    pub fn get(&self) -> Option<&T> {
-        let id = thread_id::get();
-        self.get_fast(id)
-    }
-
-    /// Returns the element for the current thread, or creates it if it doesn't
-    /// exist.
-    pub fn get_or<F>(&self, create: F) -> &T
-    where
-        F: FnOnce() -> T,
-    {
-        unsafe {
-            self.get_or_try(|| Ok::<T, ()>(create()))
-                .unchecked_unwrap_ok()
-        }
-    }
-
-    /// Returns the element for the current thread, or creates it if it doesn't
-    /// exist. If `create` fails, that error is returned and no element is
-    /// added.
-    pub fn get_or_try<F, E>(&self, create: F) -> Result<&T, E>
-    where
-        F: FnOnce() -> Result<T, E>,
-    {
-        let id = thread_id::get();
-        match self.get_fast(id) {
-            Some(x) => Ok(x),
-            None => Ok(self.insert(id, Box::new(create()?), true)),
-        }
-    }
-
-    // Simple hash table lookup function
-    fn lookup(id: usize, table: &Table<T>) -> Option<&UnsafeCell<Option<Box<T>>>> {
-        // Because we use a Mutex to prevent concurrent modifications (but not
-        // reads) of the hash table, we can avoid any memory barriers here. No
-        // elements between our hash bucket and our value can have been modified
-        // since we inserted our thread-local value into the table.
-        for entry in table.entries.iter().cycle().skip(hash(id, table.hash_bits)) {
-            let owner = entry.owner.load(Ordering::Relaxed);
-            if owner == id {
-                return Some(&entry.data);
-            }
-            if owner == 0 {
-                return None;
-            }
-        }
-        unreachable!();
-    }
-
-    // Fast path: try to find our thread in the top-level hash table
-    fn get_fast(&self, id: usize) -> Option<&T> {
-        let table = unsafe { &*self.table.load(Ordering::Acquire) };
-        match Self::lookup(id, table) {
-            Some(x) => unsafe { Some((*x.get()).as_ref().unchecked_unwrap()) },
-            None => self.get_slow(id, table),
-        }
-    }
-
-    // Slow path: try to find our thread in the other hash tables, and then
-    // move it to the top-level hash table.
-    #[cold]
-    fn get_slow(&self, id: usize, table_top: &Table<T>) -> Option<&T> {
-        let mut current = &table_top.prev;
-        while let Some(ref table) = *current {
-            if let Some(x) = Self::lookup(id, table) {
-                let data = unsafe { (*x.get()).take().unchecked_unwrap() };
-                return Some(self.insert(id, data, false));
-            }
-            current = &table.prev;
-        }
-        None
-    }
-
-    #[cold]
-    fn insert(&self, id: usize, data: Box<T>, new: bool) -> &T {
-        // Lock the Mutex to ensure only a single thread is modify the hash
-        // table at once.
-        let mut count = self.lock.lock().unwrap();
-        if new {
-            *count += 1;
-        }
-        let table_raw = self.table.load(Ordering::Relaxed);
-        let table = unsafe { &*table_raw };
-
-        // If the current top-level hash table is more than 75% full, add a new
-        // level with 2x the capacity. Elements will be moved up to the new top
-        // level table as they are accessed.
-        let table = if *count > table.entries.len() * 3 / 4 {
-            let entry = TableEntry {
-                owner: AtomicUsize::new(0),
-                data: UnsafeCell::new(None),
-            };
-            let new_table = Box::into_raw(Box::new(Table {
-                entries: vec![entry; table.entries.len() * 2].into_boxed_slice(),
-                hash_bits: table.hash_bits + 1,
-                prev: unsafe { Some(Box::from_raw(table_raw)) },
-            }));
-            self.table.store(new_table, Ordering::Release);
-            unsafe { &*new_table }
-        } else {
-            table
-        };
-
-        // Insert the new element into the top-level hash table
-        for entry in table.entries.iter().cycle().skip(hash(id, table.hash_bits)) {
-            let owner = entry.owner.load(Ordering::Relaxed);
-            if owner == 0 {
-                unsafe {
-                    entry.owner.store(id, Ordering::Relaxed);
-                    *entry.data.get() = Some(data);
-                    return (*entry.data.get()).as_ref().unchecked_unwrap();
-                }
-            }
-            if owner == id {
-                // This can happen if create() inserted a value into this
-                // ThreadLocal between our calls to get_fast() and insert(). We
-                // just return the existing value and drop the newly-allocated
-                // Box.
-                unsafe {
-                    return (*entry.data.get()).as_ref().unchecked_unwrap();
-                }
-            }
-        }
-        unreachable!();
-    }
-
-    fn raw_iter(&mut self) -> RawIter<T> {
-        RawIter {
-            remaining: *self.lock.get_mut().unwrap(),
-            index: 0,
-            table: self.table.load(Ordering::Relaxed),
-        }
-    }
-
-    /// Returns a mutable iterator over the local values of all threads.
-    ///
-    /// Since this call borrows the `ThreadLocal` mutably, this operation can
-    /// be done safely---the mutable borrow statically guarantees no other
-    /// threads are currently accessing their associated values.
-    pub fn iter_mut(&mut self) -> IterMut<T> {
-        IterMut {
-            raw: self.raw_iter(),
-            marker: PhantomData,
-        }
-    }
-
-    /// Removes all thread-specific values from the `ThreadLocal`, effectively
-    /// reseting it to its original state.
-    ///
-    /// Since this call borrows the `ThreadLocal` mutably, this operation can
-    /// be done safely---the mutable borrow statically guarantees no other
-    /// threads are currently accessing their associated values.
-    pub fn clear(&mut self) {
-        *self = ThreadLocal::new();
-    }
-}
-
-impl<T: Send> IntoIterator for ThreadLocal<T> {
-    type Item = T;
-    type IntoIter = IntoIter<T>;
-
-    fn into_iter(mut self) -> IntoIter<T> {
-        IntoIter {
-            raw: self.raw_iter(),
-            _thread_local: self,
-        }
-    }
-}
-
-impl<'a, T: Send + 'a> IntoIterator for &'a mut ThreadLocal<T> {
-    type Item = &'a mut T;
-    type IntoIter = IterMut<'a, T>;
-
-    fn into_iter(self) -> IterMut<'a, T> {
-        self.iter_mut()
-    }
-}
-
-impl<T: Send + Default> ThreadLocal<T> {
-    /// Returns the element for the current thread, or creates a default one if
-    /// it doesn't exist.
-    pub fn get_or_default(&self) -> &T {
-        self.get_or(Default::default)
-    }
-}
-
-impl<T: Send + fmt::Debug> fmt::Debug for ThreadLocal<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "ThreadLocal {{ local_data: {:?} }}", self.get())
-    }
-}
-
-impl<T: Send + UnwindSafe> UnwindSafe for ThreadLocal<T> {}
-
-struct RawIter<T: Send> {
-    remaining: usize,
-    index: usize,
-    table: *const Table<T>,
-}
-
-impl<T: Send> Iterator for RawIter<T> {
-    type Item = *mut Option<Box<T>>;
-
-    fn next(&mut self) -> Option<*mut Option<Box<T>>> {
-        if self.remaining == 0 {
-            return None;
-        }
-
-        loop {
-            let entries = unsafe { &(*self.table).entries[..] };
-            while self.index < entries.len() {
-                let val = entries[self.index].data.get();
-                self.index += 1;
-                if unsafe { (*val).is_some() } {
-                    self.remaining -= 1;
-                    return Some(val);
-                }
-            }
-            self.index = 0;
-            self.table = unsafe { &**(*self.table).prev.as_ref().unchecked_unwrap() };
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.remaining, Some(self.remaining))
-    }
-}
-
-/// Mutable iterator over the contents of a `ThreadLocal`.
-pub struct IterMut<'a, T: Send + 'a> {
-    raw: RawIter<T>,
-    marker: PhantomData<&'a mut ThreadLocal<T>>,
-}
-
-impl<'a, T: Send + 'a> Iterator for IterMut<'a, T> {
-    type Item = &'a mut T;
-
-    fn next(&mut self) -> Option<&'a mut T> {
-        self.raw
-            .next()
-            .map(|x| unsafe { &mut **(*x).as_mut().unchecked_unwrap() })
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.raw.size_hint()
-    }
-}
-
-impl<'a, T: Send + 'a> ExactSizeIterator for IterMut<'a, T> {}
-
-/// An iterator that moves out of a `ThreadLocal`.
-pub struct IntoIter<T: Send> {
-    raw: RawIter<T>,
-    _thread_local: ThreadLocal<T>,
-}
-
-impl<T: Send> Iterator for IntoIter<T> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<T> {
-        self.raw
-            .next()
-            .map(|x| unsafe { *(*x).take().unchecked_unwrap() })
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.raw.size_hint()
-    }
-}
-
-impl<T: Send> ExactSizeIterator for IntoIter<T> {}
-
-#[cfg(test)]
-mod tests {
-    use super::{CachedThreadLocal, ThreadLocal};
-    use std::cell::RefCell;
-    use std::sync::atomic::AtomicUsize;
-    use std::sync::atomic::Ordering::Relaxed;
-    use std::sync::Arc;
-    use std::thread;
-
-    fn make_create() -> Arc<dyn Fn() -> usize + Send + Sync> {
-        let count = AtomicUsize::new(0);
-        Arc::new(move || count.fetch_add(1, Relaxed))
-    }
-
-    #[test]
-    fn same_thread() {
-        let create = make_create();
-        let mut tls = ThreadLocal::new();
-        assert_eq!(None, tls.get());
-        assert_eq!("ThreadLocal { local_data: None }", format!("{:?}", &tls));
-        assert_eq!(0, *tls.get_or(|| create()));
-        assert_eq!(Some(&0), tls.get());
-        assert_eq!(0, *tls.get_or(|| create()));
-        assert_eq!(Some(&0), tls.get());
-        assert_eq!(0, *tls.get_or(|| create()));
-        assert_eq!(Some(&0), tls.get());
-        assert_eq!("ThreadLocal { local_data: Some(0) }", format!("{:?}", &tls));
-        tls.clear();
-        assert_eq!(None, tls.get());
-    }
-
-    #[test]
-    fn same_thread_cached() {
-        let create = make_create();
-        let mut tls = CachedThreadLocal::new();
-        assert_eq!(None, tls.get());
-        assert_eq!("ThreadLocal { local_data: None }", format!("{:?}", &tls));
-        assert_eq!(0, *tls.get_or(|| create()));
-        assert_eq!(Some(&0), tls.get());
-        assert_eq!(0, *tls.get_or(|| create()));
-        assert_eq!(Some(&0), tls.get());
-        assert_eq!(0, *tls.get_or(|| create()));
-        assert_eq!(Some(&0), tls.get());
-        assert_eq!("ThreadLocal { local_data: Some(0) }", format!("{:?}", &tls));
-        tls.clear();
-        assert_eq!(None, tls.get());
-    }
-
-    #[test]
-    fn different_thread() {
-        let create = make_create();
-        let tls = Arc::new(ThreadLocal::new());
-        assert_eq!(None, tls.get());
-        assert_eq!(0, *tls.get_or(|| create()));
-        assert_eq!(Some(&0), tls.get());
-
-        let tls2 = tls.clone();
-        let create2 = create.clone();
-        thread::spawn(move || {
-            assert_eq!(None, tls2.get());
-            assert_eq!(1, *tls2.get_or(|| create2()));
-            assert_eq!(Some(&1), tls2.get());
-        })
-        .join()
-        .unwrap();
-
-        assert_eq!(Some(&0), tls.get());
-        assert_eq!(0, *tls.get_or(|| create()));
-    }
-
-    #[test]
-    fn different_thread_cached() {
-        let create = make_create();
-        let tls = Arc::new(CachedThreadLocal::new());
-        assert_eq!(None, tls.get());
-        assert_eq!(0, *tls.get_or(|| create()));
-        assert_eq!(Some(&0), tls.get());
-
-        let tls2 = tls.clone();
-        let create2 = create.clone();
-        thread::spawn(move || {
-            assert_eq!(None, tls2.get());
-            assert_eq!(1, *tls2.get_or(|| create2()));
-            assert_eq!(Some(&1), tls2.get());
-        })
-        .join()
-        .unwrap();
-
-        assert_eq!(Some(&0), tls.get());
-        assert_eq!(0, *tls.get_or(|| create()));
-    }
-
-    #[test]
-    fn iter() {
-        let tls = Arc::new(ThreadLocal::new());
-        tls.get_or(|| Box::new(1));
-
-        let tls2 = tls.clone();
-        thread::spawn(move || {
-            tls2.get_or(|| Box::new(2));
-            let tls3 = tls2.clone();
-            thread::spawn(move || {
-                tls3.get_or(|| Box::new(3));
-            })
-            .join()
-            .unwrap();
-        })
-        .join()
-        .unwrap();
-
-        let mut tls = Arc::try_unwrap(tls).unwrap();
-        let mut v = tls.iter_mut().map(|x| **x).collect::<Vec<i32>>();
-        v.sort();
-        assert_eq!(vec![1, 2, 3], v);
-        let mut v = tls.into_iter().map(|x| *x).collect::<Vec<i32>>();
-        v.sort();
-        assert_eq!(vec![1, 2, 3], v);
-    }
-
-    #[test]
-    fn iter_cached() {
-        let tls = Arc::new(CachedThreadLocal::new());
-        tls.get_or(|| Box::new(1));
-
-        let tls2 = tls.clone();
-        thread::spawn(move || {
-            tls2.get_or(|| Box::new(2));
-            let tls3 = tls2.clone();
-            thread::spawn(move || {
-                tls3.get_or(|| Box::new(3));
-            })
-            .join()
-            .unwrap();
-        })
-        .join()
-        .unwrap();
-
-        let mut tls = Arc::try_unwrap(tls).unwrap();
-        let mut v = tls.iter_mut().map(|x| **x).collect::<Vec<i32>>();
-        v.sort();
-        assert_eq!(vec![1, 2, 3], v);
-        let mut v = tls.into_iter().map(|x| *x).collect::<Vec<i32>>();
-        v.sort();
-        assert_eq!(vec![1, 2, 3], v);
-    }
-
-    #[test]
-    fn is_sync() {
-        fn foo<T: Sync>() {}
-        foo::<ThreadLocal<String>>();
-        foo::<ThreadLocal<RefCell<String>>>();
-        foo::<CachedThreadLocal<String>>();
-        foo::<CachedThreadLocal<RefCell<String>>>();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/src/thread_id.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/src/thread_id.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/src/thread_id.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/src/thread_id.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-// Copyright 2017 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use std::collections::BinaryHeap;
-use std::sync::Mutex;
-use std::usize;
-
-// Thread ID manager which allocates thread IDs. It attempts to aggressively
-// reuse thread IDs where possible to avoid cases where a ThreadLocal grows
-// indefinitely when it is used by many short-lived threads.
-struct ThreadIdManager {
-    limit: usize,
-    free_list: BinaryHeap<usize>,
-}
-impl ThreadIdManager {
-    fn new() -> ThreadIdManager {
-        ThreadIdManager {
-            limit: usize::MAX,
-            free_list: BinaryHeap::new(),
-        }
-    }
-    fn alloc(&mut self) -> usize {
-        if let Some(id) = self.free_list.pop() {
-            id
-        } else {
-            let id = self.limit;
-            self.limit = self.limit.checked_sub(1).expect("Ran out of thread IDs");
-            id
-        }
-    }
-    fn free(&mut self, id: usize) {
-        self.free_list.push(id);
-    }
-}
-lazy_static! {
-    static ref THREAD_ID_MANAGER: Mutex<ThreadIdManager> = Mutex::new(ThreadIdManager::new());
-}
-
-// Non-zero integer which is unique to the current thread while it is running.
-// A thread ID may be reused after a thread exits.
-struct ThreadId(usize);
-impl ThreadId {
-    fn new() -> ThreadId {
-        ThreadId(THREAD_ID_MANAGER.lock().unwrap().alloc())
-    }
-}
-impl Drop for ThreadId {
-    fn drop(&mut self) {
-        THREAD_ID_MANAGER.lock().unwrap().free(self.0);
-    }
-}
-thread_local!(static THREAD_ID: ThreadId = ThreadId::new());
-
-/// Returns a non-zero ID for the current thread
-pub fn get() -> usize {
-    THREAD_ID.with(|x| x.0)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/src/unreachable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/src/unreachable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/thread_local/src/unreachable.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/thread_local/src/unreachable.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-// Copyright 2017 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-//! # unreachable
-//! inlined from https://github.com/reem/rust-unreachable/
-//!
-//! An unreachable code optimization hint in stable rust, and some useful
-//! extension traits for `Option` and `Result`.
-//!
-
-/// Hint to the optimizer that any code path which calls this function is
-/// statically unreachable and can be removed.
-///
-/// Calling this function in reachable code invokes undefined behavior. Be
-/// very, very sure this is what you want; often, a simple `panic!` is more
-/// suitable.
-#[inline]
-pub unsafe fn unreachable() -> ! {
-    /// The empty type for cases which can't occur.
-    enum Void { }
-    let x: &Void = ::std::mem::transmute(1usize);
-    match *x {}
-}
-
-/// An extension trait for `Option<T>` providing unchecked unwrapping methods.
-pub trait UncheckedOptionExt<T> {
-    /// Get the value out of this Option without checking for None.
-    unsafe fn unchecked_unwrap(self) -> T;
-
-    /// Assert that this Option is a None to the optimizer.
-    unsafe fn unchecked_unwrap_none(self);
-}
-
-/// An extension trait for `Result<T, E>` providing unchecked unwrapping methods.
-pub trait UncheckedResultExt<T, E> {
-    /// Get the value out of this Result without checking for Err.
-    unsafe fn unchecked_unwrap_ok(self) -> T;
-
-    /// Get the error out of this Result without checking for Ok.
-    unsafe fn unchecked_unwrap_err(self) -> E;
-}
-
-impl<T> UncheckedOptionExt<T> for Option<T> {
-    unsafe fn unchecked_unwrap(self) -> T {
-        match self {
-            Some(x) => x,
-            None => unreachable()
-        }
-    }
-
-    unsafe fn unchecked_unwrap_none(self) {
-        if self.is_some() { unreachable() }
-    }
-}
-
-impl<T, E> UncheckedResultExt<T, E> for Result<T, E> {
-    unsafe fn unchecked_unwrap_ok(self) -> T {
-        match self {
-            Ok(x) => x,
-            Err(_) => unreachable()
-        }
-    }
-
-    unsafe fn unchecked_unwrap_err(self) -> E {
-        match self {
-            Ok(_) => unreachable(),
-            Err(e) => e
-        }
-    }
-}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/time/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/time/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/time/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/time/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"37a749b23d43c8ad48eecfa03b7483b76dded90290150fab232c014a59350e00","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"35b591c7481ec3ae59210fa4f9b7cecb1b16e632bfd6193b032239e74f9bfdb8","src/display.rs":"52d16abaa37b3ab577747c7d9d2ed6ded1b126458e980dc3e1a571fa6e1f9fda","src/duration.rs":"c706d392bdb7f65b23fcc20189a9a77c50b765b9c548e247238424ed6fb56a46","src/lib.rs":"fcd2f8739dab93a8e39aed1464b48f0f11d7bb0a3e2516b683af41dc8920d298","src/parse.rs":"65bd9142d8c15eb54a8d4db6e2c48bf1adbcc875953141c17e07ba58f356a027","src/sys.rs":"cb604129e4b83ad701234562e62a137cde2ba52c9eb1b1f17d4f308e182cabaa"},"package":"6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"}
\ No newline at end of file
+{"files":{"Cargo.toml":"ddebccd9128093c3fdf84b4f6a131fe634c85e8fc2059afed9ea30e02fe22c58","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"35b591c7481ec3ae59210fa4f9b7cecb1b16e632bfd6193b032239e74f9bfdb8","src/display.rs":"52d16abaa37b3ab577747c7d9d2ed6ded1b126458e980dc3e1a571fa6e1f9fda","src/duration.rs":"c706d392bdb7f65b23fcc20189a9a77c50b765b9c548e247238424ed6fb56a46","src/lib.rs":"720e380829cda276466bce34d6a29a2f7aec1f750e4b4522b217c57930380545","src/parse.rs":"65bd9142d8c15eb54a8d4db6e2c48bf1adbcc875953141c17e07ba58f356a027","src/sys.rs":"851994516ff29dd9f5749fa19b1db13b7afe484e4bd1d279b420fda7ed8404ab"},"package":"ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/time/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/time/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/time/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/time/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "time"
-version = "0.1.44"
+version = "0.1.43"
 authors = ["The Rust Project Developers"]
 exclude = [".github", "benches"]
 description = "Utilities for working with time-related functions in Rust.\n"
@@ -33,8 +33,6 @@
 [dev-dependencies.winapi]
 version = "0.3.0"
 features = ["std", "processthreadsapi", "winbase"]
-[target."cfg(target_os = \"wasi\")".dependencies.wasi]
-version = "=0.10.0"
 [target."cfg(windows)".dependencies.winapi]
 version = "0.3.0"
 features = ["std", "minwinbase", "minwindef", "ntdef", "profileapi", "sysinfoapi", "timezoneapi"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/time/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/time/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/time/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/time/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -42,8 +42,6 @@
 #[cfg(windows)] extern crate winapi;
 #[cfg(feature = "rustc-serialize")] extern crate rustc_serialize;
 
-#[cfg(target_os = "wasi")] extern crate wasi;
-
 #[cfg(test)] #[macro_use] extern crate log;
 
 use std::cmp::Ordering;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/time/src/sys.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/time/src/sys.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/time/src/sys.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/time/src/sys.rs	2021-12-09 12:01:26.000000000 +0000
@@ -69,7 +69,7 @@
     }
 }
 
-#[cfg(all(target_arch = "wasm32", not(any(target_os = "emscripten", target_os = "wasi"))))]
+#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
 mod inner {
     use std::ops::{Add, Sub};
     use Tm;
@@ -121,7 +121,7 @@
     impl Sub<Duration> for SteadyTime {
         type Output = SteadyTime;
         fn sub(self, _other: Duration) -> SteadyTime {
-          unimplemented!()
+            unimplemented!()
         }
     }
 
@@ -132,84 +132,6 @@
         }
     }
 }
-
-#[cfg(target_os = "wasi")]
-mod inner {
-    use std::ops::{Add, Sub};
-    use Tm;
-    use Duration;
-    use super::common::{time_to_tm, tm_to_time};
-    use wasi::{clock_time_get, CLOCKID_MONOTONIC, CLOCKID_REALTIME};
-
-    #[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq)]
-    pub struct SteadyTime {
-        t: u64
-    }
-
-    pub fn time_to_utc_tm(sec: i64, tm: &mut Tm) {
-        time_to_tm(sec, tm);
-    }
-
-    pub fn time_to_local_tm(sec: i64, tm: &mut Tm) {
-        // FIXME: Add timezone logic
-        time_to_tm(sec, tm);
-    }
-
-    pub fn utc_tm_to_time(tm: &Tm) -> i64 {
-        tm_to_time(tm)
-    }
-
-    pub fn local_tm_to_time(tm: &Tm) -> i64 {
-        // FIXME: Add timezone logic
-        tm_to_time(tm)
-    }
-
-    pub fn get_time() -> (i64, i32) {
-        let ts = get_precise_ns();
-        (
-            ts as i64 / 1_000_000_000,
-            (ts as i64 % 1_000_000_000) as i32,
-        )
-    }
-
-    pub fn get_precise_ns() -> u64 {
-        unsafe { clock_time_get(CLOCKID_REALTIME, 1_000_000_000) }
-            .expect("Host doesn't implement a real-time clock")
-    }
-
-    impl SteadyTime {
-        pub fn now() -> SteadyTime {
-            SteadyTime {
-                t: unsafe { clock_time_get(CLOCKID_MONOTONIC, 1_000_000_000) }
-                    .expect("Host doesn't implement a monotonic clock"),
-            }
-        }
-    }
-
-    impl Sub for SteadyTime {
-        type Output = Duration;
-        fn sub(self, other: SteadyTime) -> Duration {
-            Duration::nanoseconds(self.t as i64 - other.t as i64)
-        }
-    }
-
-    impl Sub<Duration> for SteadyTime {
-        type Output = SteadyTime;
-        fn sub(self, other: Duration) -> SteadyTime {
-            self + -other
-        }
-    }
-
-    impl Add<Duration> for SteadyTime {
-        type Output = SteadyTime;
-        fn add(self, other: Duration) -> SteadyTime {
-            let delta = other.num_nanoseconds().unwrap();
-            SteadyTime {
-                t: (self.t as i64 + delta) as u64,
-            }
-        }
-    }
-}
 
 #[cfg(target_env = "sgx")]
 mod inner {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"59da87c11de53b239c942e8252f51f63aac20d8b8aedc1544c57b2c78da8f819","Cargo.toml":"ab358c045d42b7e7c37b5eca904674a5ddb14defd0c60c2b0a14c82434a29fbb","LICENSE-APACHE.md":"056703c9641afd0f51a9048dcc60b3bf9e5df178069dabaaf336ec1070ece710","LICENSE-MIT.md":"4736b5d379253afa45744afc79ddb475912b213e939bdf7cb97d9a8b6f700e5f","LICENSE-ZLIB.md":"682b4c81b85e83ce6cc6e1ace38fdd97aeb4de0e972bd2b44aa0916c54af8c96","README.md":"f2a59c75ef204e21173b2be150d183a946d0f10ad3a42d3e677d6f5507589aa4","benches/macros.rs":"b92679a63e1d39fd949c061fa97dfba933f3e1a6e6722e710cfe4fbfd6315ba9","gen-array-impls.sh":"6bb75d48b820112b7d0a67e09fb3c2386b2961de42f482635007435956f74b12","rustfmt.toml":"917eca93a0f65d5a2e76cde5813a76c088012fdebb41ac331a96181c82cdf6d5","src-backup/arrayset.rs":"d7d524c9c0a20443f6f028ff0e37d246cd445a0660df496625d647ea302a5094","src/array.rs":"6edd6de3c50956b392cc23eba9edf08888cb1598d27c0630681698558f6bc344","src/array/const_generic_impl.rs":"d0f8ae529b5c9f92da0aa67d5ae24a6e7fc3287ce6d3e576794455de44502a4c","src/array/generated_impl.rs":"8c94c274aae0909b7de75beff4215af8dfc8635cce0c09d75eb57e577c3cca68","src/arrayvec.rs":"542012667b1c6f4a1d412ae3b07ea846bb263227e72bf606cec41fa8cd4cf2fb","src/arrayvec_drain.rs":"d2df895c7438bbf3bcf2f68ab5e76ca2209f399ef8dde5d62532c9e176c620b5","src/lib.rs":"d3bebbcd7e9a9ed921d4b094bd939670fb58bd53f85d57e302f9ebc628053157","src/slicevec.rs":"d17aa744ab2c856930ac89f1bdb4394ba4fabf94c10dcdb90fcf77725cc4599f","src/tinyvec.rs":"d8df2a4853e30defbb6932168279128f53be9b4f0d67dd4045f2425d134b0056","tests/arrayvec.rs":"a56f27074f6ce3163287cb77c42f95b9b7ceb889c82534e6faf1082108f1480d","tests/tinyvec.rs":"cc6f87330cfb9868aca503466cd23d63dd081607dfcf58951c373dd132e33692"},"package":"ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"d705017af6f62017ad9d2341cd2b48662720dfbac5af98e7672cbcf71f10e1be","Cargo.toml":"5280c48ad33d0da32bf030f0d78a4ab44ed2e33caee823a251a2409541a91aca","LICENSE-APACHE.md":"3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5","LICENSE-MIT.md":"4736b5d379253afa45744afc79ddb475912b213e939bdf7cb97d9a8b6f700e5f","LICENSE-ZLIB.md":"682b4c81b85e83ce6cc6e1ace38fdd97aeb4de0e972bd2b44aa0916c54af8c96","README.md":"f2a59c75ef204e21173b2be150d183a946d0f10ad3a42d3e677d6f5507589aa4","benches/macros.rs":"b92679a63e1d39fd949c061fa97dfba933f3e1a6e6722e710cfe4fbfd6315ba9","gen-array-impls.sh":"6bb75d48b820112b7d0a67e09fb3c2386b2961de42f482635007435956f74b12","rustfmt.toml":"ebb19c2c422dcc6c0fe960e5a869b5a562739e40f248e28c43d48d9a63cebe7b","src-backup/arrayset.rs":"d7d524c9c0a20443f6f028ff0e37d246cd445a0660df496625d647ea302a5094","src/array.rs":"6edd6de3c50956b392cc23eba9edf08888cb1598d27c0630681698558f6bc344","src/array/const_generic_impl.rs":"d0f8ae529b5c9f92da0aa67d5ae24a6e7fc3287ce6d3e576794455de44502a4c","src/array/generated_impl.rs":"8c94c274aae0909b7de75beff4215af8dfc8635cce0c09d75eb57e577c3cca68","src/arrayvec.rs":"26673de84768fbe71b9de55f961b97f01bf543b1885af49cab39d7417472d749","src/arrayvec_drain.rs":"d2df895c7438bbf3bcf2f68ab5e76ca2209f399ef8dde5d62532c9e176c620b5","src/lib.rs":"d3bebbcd7e9a9ed921d4b094bd939670fb58bd53f85d57e302f9ebc628053157","src/slicevec.rs":"e43991aff8197095fda62a1e6d3657fcb08e27e386e67f0496ac8228a56bd271","src/tinyvec.rs":"fce33bd656b27bf8c29995ffe718729fbc19a8dc95f75f7164f1925aa9a84e80","tests/arrayvec.rs":"e7c22cbcf8df2c0a5ae20a35c1a1327e86230db0ee6fbc25d3ff5000b0044ccc","tests/tinyvec.rs":"bb1e2dd10ab507ef6d0e34df6a8dd86c65d23bde59a351a68c4e415eed00f8e0"},"package":"848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "tinyvec"
-version = "1.1.0"
+version = "1.3.1"
 authors = ["Lokathor <zefria@gmail.com>"]
 description = "`tinyvec` provides 100% safe vec-like data structures."
 keywords = ["vec", "no_std", "no-std"]
@@ -37,6 +37,10 @@
 name = "macros"
 harness = false
 required-features = ["alloc"]
+[dependencies.arbitrary]
+version = "1"
+optional = true
+
 [dependencies.serde]
 version = "1.0"
 optional = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,30 @@
 # Changelog
 
+## 1.3.1
+
+* Improved the performance of the `clone_from` method [pr 144](https://github.com/Lokathor/tinyvec/pull/144)
+
+## 1.3.0
+
+* [jeffa5](https://github.com/jeffa5) added arbitrary implementations for `TinyVec` and `ArrayVec` [pr 146](https://github.com/Lokathor/tinyvec/pull/146).
+* [elomatreb](https://github.com/elomatreb) implemented `DoubleEndedIterator` for `TinyVecIterator` [pr 145](https://github.com/Lokathor/tinyvec/pull/145).
+
+## 1.2.0
+
+* [Cryptjar](https://github.com/Cryptjar) removed the `A:Array` bound on the struct of `ArrayVec<A:Array>`,
+  and added the `from_array_empty` method, which is a `const fn` constructor
+  [pr 141](https://github.com/Lokathor/tinyvec/pull/141).
+
+## 1.1.1
+
+* [saethlin](https://github.com/saethlin) contributed many PRs (
+  [127](https://github.com/Lokathor/tinyvec/pull/127),
+  [128](https://github.com/Lokathor/tinyvec/pull/128),
+  [129](https://github.com/Lokathor/tinyvec/pull/129),
+  [131](https://github.com/Lokathor/tinyvec/pull/131),
+  [132](https://github.com/Lokathor/tinyvec/pull/132)
+  ) to help in several benchmarks.
+
 ## 1.1.0
 
 * [slightlyoutofphase](https://github.com/slightlyoutofphase)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/LICENSE-APACHE.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/LICENSE-APACHE.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/LICENSE-APACHE.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/LICENSE-APACHE.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,67 +1,202 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/rustfmt.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/rustfmt.toml	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,3 @@
-# Based on
-# https://github.com/rust-lang/rustfmt/blob/rustfmt-1.4.19/Configurations.md
 
 # Stable
 edition = "2018"
@@ -12,5 +10,5 @@
 
 # Unstable
 format_code_in_doc_comments = true
-merge_imports = true
 wrap_comments = true
+imports_granularity="Crate"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/src/arrayvec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/src/arrayvec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/src/arrayvec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/src/arrayvec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 use super::*;
-use core::convert::TryInto;
+use core::convert::{TryFrom, TryInto};
 
 #[cfg(feature = "serde")]
 use core::marker::PhantomData;
@@ -96,14 +96,53 @@
 ///
 /// let more_ints = ArrayVec::from_array_len([5, 6, 7, 8], 2);
 /// assert_eq!(more_ints.len(), 2);
+///
+/// let no_ints: ArrayVec<[u8; 5]> = ArrayVec::from_array_empty([1, 2, 3, 4, 5]);
+/// assert_eq!(no_ints.len(), 0);
 /// ```
 #[repr(C)]
-#[derive(Clone, Copy)]
-pub struct ArrayVec<A: Array> {
+pub struct ArrayVec<A> {
   len: u16,
   pub(crate) data: A,
 }
 
+impl<A> Clone for ArrayVec<A>
+where
+  A: Array + Clone,
+  A::Item: Clone,
+{
+  #[inline]
+  fn clone(&self) -> Self {
+    Self { data: self.data.clone(), len: self.len }
+  }
+
+  #[inline]
+  fn clone_from(&mut self, o: &Self) {
+    let iter = self
+      .data
+      .as_slice_mut()
+      .iter_mut()
+      .zip(o.data.as_slice())
+      .take(self.len.max(o.len) as usize);
+    for (dst, src) in iter {
+      dst.clone_from(src)
+    }
+    if let Some(to_drop) =
+      self.data.as_slice_mut().get_mut((o.len as usize)..(self.len as usize))
+    {
+      to_drop.iter_mut().for_each(|x| drop(take(x)));
+    }
+    self.len = o.len;
+  }
+}
+
+impl<A> Copy for ArrayVec<A>
+where
+  A: Array + Copy,
+  A::Item: Copy,
+{
+}
+
 impl<A: Array> Default for ArrayVec<A> {
   fn default() -> Self {
     Self { len: 0, data: A::default() }
@@ -177,6 +216,22 @@
   }
 }
 
+#[cfg(all(feature = "arbitrary", feature = "nightly_const_generics"))]
+#[cfg_attr(
+  docs_rs,
+  doc(cfg(all(feature = "arbitrary", feature = "nightly_const_generics")))
+)]
+impl<'a, T, const N: usize> arbitrary::Arbitrary<'a> for ArrayVec<[T; N]>
+where
+  T: arbitrary::Arbitrary<'a> + Default,
+{
+  fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
+    let v = <[T; N]>::arbitrary(u)?;
+    let av = ArrayVec::from(v);
+    Ok(av)
+  }
+}
+
 impl<A: Array> ArrayVec<A> {
   /// Move all values from `other` into this vec.
   ///
@@ -403,10 +458,19 @@
   pub fn fill<I: IntoIterator<Item = A::Item>>(
     &mut self, iter: I,
   ) -> I::IntoIter {
+    // If this is written as a call to push for each element in iter, the
+    // compiler emits code that updates the length for every element. The
+    // additional complexity from that length update is worth nearly 2x in
+    // the runtime of this function.
     let mut iter = iter.into_iter();
-    for element in iter.by_ref().take(self.capacity() - self.len()) {
-      self.push(element);
+    let mut pushed = 0;
+    let to_take = self.capacity() - self.len();
+    let target = &mut self.data.as_slice_mut()[self.len as usize..];
+    for element in iter.by_ref().take(to_take) {
+      target[pushed] = element;
+      pushed += 1;
     }
+    self.len += pushed as u16;
     iter
   }
 
@@ -471,7 +535,9 @@
   /// assert_eq!(av.try_insert(4, "five"), Some("five"));
   /// ```
   #[inline]
-  pub fn try_insert(&mut self, index: usize, item: A::Item) -> Option<A::Item> {
+  pub fn try_insert(
+    &mut self, index: usize, mut item: A::Item,
+  ) -> Option<A::Item> {
     assert!(
       index <= self.len as usize,
       "ArrayVec::try_insert> index {} is out of bounds {}",
@@ -479,11 +545,23 @@
       self.len
     );
 
-    if let Some(x) = self.try_push(item) {
-      return Some(x);
+    // A previous implementation used self.try_push and slice::rotate_right
+    // rotate_right and rotate_left generate a huge amount of code and fail to
+    // inline; calling them here incurs the cost of all the cases they
+    // handle even though we're rotating a usually-small array by a constant
+    // 1 offset. This swap-based implementation benchmarks much better for
+    // small array lengths in particular.
+
+    if (self.len as usize) < A::CAPACITY {
+      self.len += 1;
+    } else {
+      return Some(item);
     }
 
-    self.as_mut_slice()[index..].rotate_right(1);
+    let target = &mut self.as_mut_slice()[index..];
+    for i in 0..target.len() {
+      core::mem::swap(&mut item, &mut target[i]);
+    }
     return None;
   }
 
@@ -601,7 +679,17 @@
   pub fn remove(&mut self, index: usize) -> A::Item {
     let targets: &mut [A::Item] = &mut self.deref_mut()[index..];
     let item = take(&mut targets[0]);
-    targets.rotate_left(1);
+
+    // A previous implementation used rotate_left
+    // rotate_right and rotate_left generate a huge amount of code and fail to
+    // inline; calling them here incurs the cost of all the cases they
+    // handle even though we're rotating a usually-small array by a constant
+    // 1 offset. This swap-based implementation benchmarks much better for
+    // small array lengths in particular.
+
+    for i in 0..targets.len() - 1 {
+      targets.swap(i, i + 1);
+    }
     self.len -= 1;
     item
   }
@@ -921,6 +1009,37 @@
   }
 }
 
+impl<A> ArrayVec<A> {
+  /// Wraps up an array as a new empty `ArrayVec`.
+  ///
+  /// If you want to simply use the full array, use `from` instead.
+  ///
+  /// ## Examples
+  ///
+  /// This method in particular allows to create values for statics:
+  ///
+  /// ```rust
+  /// # use tinyvec::ArrayVec;
+  /// static DATA: ArrayVec<[u8; 5]> = ArrayVec::from_array_empty([0; 5]);
+  /// assert_eq!(DATA.len(), 0);
+  /// ```
+  ///
+  /// But of course it is just an normal empty `ArrayVec`:
+  ///
+  /// ```rust
+  /// # use tinyvec::ArrayVec;
+  /// let mut data = ArrayVec::from_array_empty([1, 2, 3, 4]);
+  /// assert_eq!(&data[..], &[]);
+  /// data.push(42);
+  /// assert_eq!(&data[..], &[42]);
+  /// ```
+  #[inline]
+  #[must_use]
+  pub const fn from_array_empty(data: A) -> Self {
+    Self { data, len: 0 }
+  }
+}
+
 #[cfg(feature = "grab_spare_slice")]
 impl<A: Array> ArrayVec<A> {
   /// Obtain the shared slice of the array _after_ the active memory.
@@ -1157,6 +1276,41 @@
   }
 }
 
+/// The error type returned when a conversion from a slice to an [`ArrayVec`]
+/// fails.
+#[derive(Debug, Copy, Clone)]
+pub struct TryFromSliceError(());
+
+impl<T, A> TryFrom<&'_ [T]> for ArrayVec<A>
+where
+  T: Clone + Default,
+  A: Array<Item = T>,
+{
+  type Error = TryFromSliceError;
+
+  #[inline]
+  #[must_use]
+  /// The output has a length equal to that of the slice, with the same capacity
+  /// as `A`.
+  fn try_from(slice: &[T]) -> Result<Self, Self::Error> {
+    if slice.len() > A::CAPACITY {
+      Err(TryFromSliceError(()))
+    } else {
+      let mut arr = ArrayVec::new();
+      // We do not use ArrayVec::extend_from_slice, because it looks like LLVM
+      // fails to deduplicate all the length-checking logic between the
+      // above if and the contents of that method, thus producing much
+      // slower code. Unlike many of the other optimizations in this
+      // crate, this one is worth keeping an eye on. I see no reason, for
+      // any element type, that these should produce different code. But
+      // they do. (rustc 1.51.0)
+      arr.set_len(slice.len());
+      arr.as_mut_slice().clone_from_slice(slice);
+      Ok(arr)
+    }
+  }
+}
+
 impl<A: Array> FromIterator<A::Item> for ArrayVec<A> {
   #[inline]
   #[must_use]
@@ -1387,12 +1541,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Binary::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1404,12 +1564,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Debug::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1421,12 +1587,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Display::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1438,12 +1610,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       LowerExp::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1455,12 +1633,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       LowerHex::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1472,12 +1656,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Octal::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1489,12 +1679,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Pointer::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1506,12 +1702,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       UpperExp::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1523,12 +1725,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       UpperHex::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/src/slicevec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/src/slicevec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/src/slicevec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/src/slicevec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -879,12 +879,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Binary::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -896,12 +902,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Debug::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -913,12 +925,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Display::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -930,12 +948,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       LowerExp::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -947,12 +971,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       LowerHex::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -964,12 +994,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Octal::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -981,12 +1017,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Pointer::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -998,12 +1040,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       UpperExp::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1015,12 +1063,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       UpperHex::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/src/tinyvec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/src/tinyvec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/src/tinyvec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/src/tinyvec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,6 +3,7 @@
 use super::*;
 
 use alloc::vec::{self, Vec};
+use core::convert::TryFrom;
 use tinyvec_macros::impl_mirrored;
 
 #[cfg(feature = "serde")]
@@ -90,7 +91,6 @@
 /// let empty_tv = tiny_vec!([u8; 16]);
 /// let some_ints = tiny_vec!([i32; 4] => 1, 2, 3);
 /// ```
-#[derive(Clone)]
 #[cfg_attr(docs_rs, doc(cfg(feature = "alloc")))]
 pub enum TinyVec<A: Array> {
   #[allow(missing_docs)]
@@ -99,6 +99,34 @@
   Heap(Vec<A::Item>),
 }
 
+impl<A> Clone for TinyVec<A>
+where
+  A: Array + Clone,
+  A::Item: Clone,
+{
+  #[inline]
+  fn clone(&self) -> Self {
+    match self {
+      Self::Heap(v) => Self::Heap(v.clone()),
+      Self::Inline(v) => Self::Inline(v.clone()),
+    }
+  }
+
+  #[inline]
+  fn clone_from(&mut self, o: &Self) {
+    if o.len() > self.len() {
+      self.reserve(o.len() - self.len());
+    } else {
+      self.truncate(o.len());
+    }
+    let (start, end) = o.split_at(self.len());
+    for (dst, src) in self.iter_mut().zip(start) {
+      dst.clone_from(src);
+    }
+    self.extend_from_slice(end);
+  }
+}
+
 impl<A: Array> Default for TinyVec<A> {
   #[inline]
   #[must_use]
@@ -177,6 +205,21 @@
   }
 }
 
+#[cfg(feature = "arbitrary")]
+#[cfg_attr(docs_rs, doc(cfg(feature = "arbitrary")))]
+impl<'a, A> arbitrary::Arbitrary<'a> for TinyVec<A>
+where
+  A: Array,
+  A::Item: arbitrary::Arbitrary<'a>,
+{
+  fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
+    let v = Vec::arbitrary(u)?;
+    let mut tv = TinyVec::Heap(v);
+    tv.shrink_to_fit();
+    Ok(tv)
+  }
+}
+
 impl<A: Array> TinyVec<A> {
   /// Returns whether elements are on heap
   #[inline(always)]
@@ -676,18 +719,34 @@
   /// tv.push(4);
   /// assert_eq!(tv.as_slice(), &[1, 2, 3, 4]);
   /// ```
-  #[inline(always)]
+  #[inline]
   pub fn push(&mut self, val: A::Item) {
-    let arr = match self {
-      TinyVec::Heap(v) => return v.push(val),
-      TinyVec::Inline(a) => a,
-    };
-
-    if let Some(x) = arr.try_push(val) {
+    // The code path for moving the inline contents to the heap produces a lot
+    // of instructions, but we have a strong guarantee that this is a cold
+    // path. LLVM doesn't know this, inlines it, and this tends to cause a
+    // cascade of other bad inlining decisions because the body of push looks
+    // huge even though nearly every call executes the same few instructions.
+    //
+    // Moving the logic out of line with #[cold] causes the hot code to  be
+    // inlined together, and we take the extra cost of a function call only
+    // in rare cases.
+    #[cold]
+    fn drain_to_heap_and_push<A: Array>(
+      arr: &mut ArrayVec<A>, val: A::Item,
+    ) -> TinyVec<A> {
       /* Make the Vec twice the size to amortize the cost of draining */
       let mut v = arr.drain_to_vec_and_reserve(arr.len());
-      v.push(x);
-      *self = TinyVec::Heap(v);
+      v.push(val);
+      TinyVec::Heap(v)
+    }
+
+    match self {
+      TinyVec::Heap(v) => v.push(val),
+      TinyVec::Inline(arr) => {
+        if let Some(x) = arr.try_push(val) {
+          *self = drain_to_heap_and_push(arr, x);
+        }
+      }
     }
   }
 
@@ -1098,13 +1157,10 @@
   #[inline]
   #[must_use]
   fn from(slice: &[T]) -> Self {
-    if slice.len() > A::CAPACITY {
-      TinyVec::Heap(slice.into())
-    } else {
-      let mut arr = ArrayVec::new();
-      arr.extend_from_slice(slice);
-
+    if let Ok(arr) = ArrayVec::try_from(slice) {
       TinyVec::Inline(arr)
+    } else {
+      TinyVec::Heap(slice.into())
     }
   }
 }
@@ -1176,6 +1232,19 @@
   }
 }
 
+impl<A: Array> DoubleEndedIterator for TinyVecIterator<A> {
+  impl_mirrored! {
+    type Mirror = TinyVecIterator;
+
+    #[inline]
+    fn next_back(self: &mut Self) -> Option<Self::Item>;
+
+    #[cfg(feature = "rustc_1_40")]
+    #[inline]
+    fn nth_back(self: &mut Self, n: usize) -> Option<Self::Item>;
+  }
+}
+
 impl<A: Array> Debug for TinyVecIterator<A>
 where
   A::Item: Debug,
@@ -1295,12 +1364,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Binary::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1312,12 +1387,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Debug::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1329,12 +1410,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Display::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1346,12 +1433,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       LowerExp::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1363,12 +1456,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       LowerHex::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1380,12 +1479,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Octal::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1397,12 +1502,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       Pointer::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1414,12 +1525,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       UpperExp::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
@@ -1431,12 +1548,18 @@
   #[allow(clippy::missing_inline_in_public_items)]
   fn fmt(&self, f: &mut Formatter) -> core::fmt::Result {
     write!(f, "[")?;
+    if f.alternate() {
+      write!(f, "\n    ")?;
+    }
     for (i, elem) in self.iter().enumerate() {
       if i > 0 {
-        write!(f, ", ")?;
+        write!(f, ",{}", if f.alternate() { "\n    " } else { " " })?;
       }
       UpperHex::fmt(elem, f)?;
     }
+    if f.alternate() {
+      write!(f, ",\n")?;
+    }
     write!(f, "]")
   }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/tests/arrayvec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/tests/arrayvec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/tests/arrayvec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/tests/arrayvec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -445,3 +445,33 @@
     ],
   );
 }
+
+#[test]
+fn ArrayVec_try_from_slice() {
+  use std::convert::TryFrom;
+
+  let nums = [1, 2, 3, 4];
+
+  let empty: Result<ArrayVec<[i32; 2]>, _> = ArrayVec::try_from(&nums[..0]);
+  assert!(empty.is_ok());
+  assert_eq!(empty.unwrap().as_slice(), &[]);
+
+  let fits: Result<ArrayVec<[i32; 2]>, _> = ArrayVec::try_from(&nums[..2]);
+  assert!(fits.is_ok());
+  assert_eq!(fits.unwrap().as_slice(), &[1, 2]);
+
+  let doesnt_fit: Result<ArrayVec<[i32; 2]>, _> =
+    ArrayVec::try_from(&nums[..4]);
+  assert!(doesnt_fit.is_err());
+}
+
+#[test]
+fn ArrayVec_pretty_debug() {
+  let arr: [i32; 3] = [1, 2, 3];
+  let expect = format!("{:#?}", arr);
+
+  let arr: ArrayVec<[i32; 3]> = array_vec![1, 2, 3];
+  let got = format!("{:#?}", arr);
+
+  assert_eq!(got, expect);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/tests/tinyvec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/tests/tinyvec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tinyvec/tests/tinyvec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tinyvec/tests/tinyvec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -385,3 +385,12 @@
     ],
   );
 }
+
+#[test]
+fn TinyVec_pretty_debug() {
+  let tv: TinyVec<[i32; 6]> = tiny_vec![1, 2, 3];
+  let s = format!("{:#?}", tv);
+  let expected = format!("{:#?}", tv.as_slice());
+
+  assert_eq!(s, expected);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+use autocfg::AutoCfg;
+
+fn main() {
+    match AutoCfg::new() {
+        Ok(ac) => {
+            // The #[track_caller] attribute was stabilized in rustc 1.46.0.
+            if ac.probe_rustc_version(1, 46) {
+                autocfg::emit("tokio_track_caller")
+            }
+        }
+
+        Err(e) => {
+            // If we couldn't detect the compiler version and features, just
+            // print a warning. This isn't a fatal error: we can still build
+            // Tokio, we just can't enable cfgs automatically.
+            println!(
+                "cargo:warning=tokio: failed to detect compiler features: {}",
+                e
+            );
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"cab92d7e5343c42183e9fd424e15c144a05aa1b868e271c82275db3702929c6d","Cargo.toml":"39a4f9effc8803f81c0454b9241b3a5a20887e422144542813e0ff702d08ca0d","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"db560230d144afc32dec5677a43b9722fb5c6573a3705a114145473edcdced09","src/coop.rs":"2884a7593e43bdc309a5d90fcf36bf780c75ef5c8fe4584c1c6646165ef96ded","src/fs/canonicalize.rs":"93c64b72abdca17877d6ab61d50a43765d6aef9e0a9f7aaf41b6b0b7d9a8a380","src/fs/copy.rs":"6c9ba20cba87eea6806cff998a3326f4f505f0f8eddda50363cd005da9e149fa","src/fs/create_dir.rs":"b279bf045c5168eb14ad04c91732f575fecd96190c74706989980e6484ba52e6","src/fs/create_dir_all.rs":"56081d541caadca0fc59e84d55e78e702fe9373679598016224ad0b072b189a7","src/fs/dir_builder.rs":"9a15afdc3ae550428720f6361e9b019e9a2ee45af485ed319ee6e539dbd40744","src/fs/file.rs":"4b44bf50f4c11f66664692b726146d606d8c11eeb81a8f7f59b514bad6bef5ab","src/fs/hard_link.rs":"98cccbbb3719baee11c232e79723ab1cb3d6c8056bddb109c4990fe2c236c1fb","src/fs/metadata.rs":"782a1a5dbc2cd6c40e928579fbfcf39e5f1de28def78781590c0280acdf02960","src/fs/mod.rs":"156696a9ceb12f47f4f1948f074f1c041b6a314fc7fc7cc42698019e3c5c7cf5","src/fs/open_options.rs":"d1e549f4e6ce5e88350714b6eed381e42b454b488f14a087b99d99e8fc66549d","src/fs/os/mod.rs":"65d0bd0e2b2c7e142daf6e0f24f3f7fe964dd0fb222a320dfb54435ef05d70ee","src/fs/os/unix/dir_builder_ext.rs":"65d391f16da23d152957d9a7f4fdf3dce28a52407f2fe25d757763735a3b3fae","src/fs/os/unix/mod.rs":"e16f12a976f45497ea8ecae2608a5fc4dd3f13726b6be5627ded93db73777a13","src/fs/os/unix/open_options_ext.rs":"fbce771fd45adbed2a322013a366d654a06744d124d366a556672b365d0cd8da","src/fs/os/unix/symlink.rs":"32cf3e906531d30ebe6d8be7ee3bfe049949759b566015b56d0851f51abcff50","src/fs/os/windows/mod.rs":"ca6b3a8a287fdeeff2468e29ae38822f3d0ac23e46b88246536dc85a46250335","src/fs/os/windows/symlink_dir.rs":"5fbd05365555ba7942ffc1c2dfddf201ddad2cf9b005be2ea99849a473fe982b","src/fs/os/windows/symlink_file.rs":"a1170fd40a000dc449de972267f579a0d14f50dbb39466f985f183fdcd1d3438","src/fs/read.rs":"d5b9261d4deba4e43fd6002c12eff7ddd813319c23634795f4551e3c3f89756b","src/fs/read_dir.rs":"251be63189e9d287597591fda447a498ffad56e522e1de226167592e84e0d66b","src/fs/read_link.rs":"93c104a21253372fef7056ab82e6065b0a1a8fc9be8b7329dfd5a8dd07c618b0","src/fs/read_to_string.rs":"7b4c1760bda91a294da19f2154c39a866a761a494af411258df5d29e6fe98601","src/fs/remove_dir.rs":"96475771e9c52678768288d8df6814216e0801bebc848481597ad34e829a5854","src/fs/remove_dir_all.rs":"b85abd05c7ab64ee8dc6cf5663a11e713aa51b357759ef660ef3cae3365ccc42","src/fs/remove_file.rs":"1cdf8bf16b3a164c594dac8773b7d1f9ebb28de169343184d34d6aac3b3a7eaa","src/fs/rename.rs":"a97875e92626fa46e23fece7b8698c9c4cea2bae8f1be8726f30ae6fe80ae0c7","src/fs/set_permissions.rs":"8adccafa475dcfc1bc3989af73374d90683c1be4953ef812e5fd606f968d7b7a","src/fs/symlink_metadata.rs":"f5ce1e05f137da995e3e0d9582bae0a5f7ef4251285c64e912b0eedbb068b395","src/fs/write.rs":"062aa6c0c4862ca7071171f505182202b88d5e919806e61ef83b24a4a4bda36c","src/future/maybe_done.rs":"8098e69168044c2bbdba95a3a3da339fbb2d8f95edd9e74db3ae744a4b6c379f","src/future/mod.rs":"f83ace028a163a352e32ab38a8065886421179a9cd5edba0aece889af9a3145f","src/future/pending.rs":"2bfa584d25299f8d610cae8ebd652f1840dace5086b6d50c64400f4d8680ddd6","src/future/poll_fn.rs":"1ace3c3f0f392589d6454b56218c825cdbf11d72d95b170986782a413a929627","src/future/ready.rs":"168e965951c21794b21e0f151b29614c07371caa040271fc51541f97451fe94c","src/future/try_join.rs":"a12b2c22ef92b7887a7e30410a8947fa0f03e3bccf0c754a1f1e4e3c89e23599","src/io/async_buf_read.rs":"b37caa8f6c974b3c97327c635218803e573c531d4197950840549aa794357c99","src/io/async_read.rs":"da37ab8f60acef8864d0ceaad70f666369358c96d7aec2b5678de1a090076ddc","src/io/async_seek.rs":"3c75e1b51c9865bb87557f1616bc97611c32010911a013c4288c7f8221ec86b6","src/io/async_write.rs":"b0a892b9be7bd1ed9812b52e930d8c593a68a4399a0528398b094f28d3b9760f","src/io/blocking.rs":"30378c4d6806047ac0f34cb333f158c3dc147d65757bd4452a5fe580c6d9c3c0","src/io/driver/mod.rs":"f431001d24269320cfc376284d8ffe0f30d0fbb2fff41c31ebe7cebeb61c9fad","src/io/driver/platform.rs":"023acd3f2703d241b3e91ab6e4d4c0bc5ccc3451655fffd9f37938224f915494","src/io/driver/scheduled_io.rs":"f8270a5274314cf131cd2ac07b77cbd0a6f500f07a8de1248dbe7974d1be307b","src/io/mod.rs":"56b6ff59759189d33d47c21a766c2346937081bbfd1c9eef95d908ff86492f32","src/io/poll_evented.rs":"6576918df48177db8b2f38c5781f30c985daa5abd077df663d43bf56ef7febdd","src/io/registration.rs":"3057480839485674046b823c3d84569df4186accd12fc40de7aea9e5ad60d049","src/io/seek.rs":"5a33c2d4ef28fbd8e409603222462da88a2c21c8d1419be3ac16c95aac1b2259","src/io/split.rs":"da44112c70436841d8ce04695ba61aec2c1fe41d449bb6c098f7d40c875bb32b","src/io/stderr.rs":"b9a5a87305740bc2220f2838168dda6ed10390a2f990ddcdc61eb79040547265","src/io/stdin.rs":"35b02f30ecf22c8274fdb674a2c208c5781efe9c1bcb7290e66f077ce061ae74","src/io/stdout.rs":"35e751837fd6311180d360b007e7cb77cf314118441347c1037aeca59bdbf53f","src/io/util/async_buf_read_ext.rs":"9ba5c10964369415cdb58891ee2a883faa31b62a56657c6dfea4226c8e06cbed","src/io/util/async_read_ext.rs":"69d206c24c3e0119d3b9609c492b56654d0db00b180ab1e0246fc030dbb8bb4d","src/io/util/async_seek_ext.rs":"e1703662ddcc3069c594d35e5a60ba4a6bcfff1b4fc83d7a33517894dd8ecd84","src/io/util/async_write_ext.rs":"e976b1f9681f87f1fceec50f4da5df6828fb46c54a242652ef7a795ed4f1a205","src/io/util/buf_reader.rs":"6d739a53160878a70238ff1cd457f4a01f51ffb192ac712726ba25f5d20494c1","src/io/util/buf_stream.rs":"405557d37265e4459fac7d57be9cc634fcf083dba9cc098436f916c750f53661","src/io/util/buf_writer.rs":"d31562223daac0c3992b5e1ee1ab247040410d99c046a83e15d06817b13d08ee","src/io/util/chain.rs":"7c724503f750a793271eae6df1fcaacea30af6ebba4024adf86d013baa437ae2","src/io/util/copy.rs":"ac44563dc13bf8e9b2116a6ceec14e2027dd0a2034ead5d6a937b05dd15ff9c4","src/io/util/empty.rs":"d293f96af822558e7647c0a9433be4a4a7509fe38430cc16d6c72156aed70487","src/io/util/flush.rs":"44f40cce603575dfd938eb9b33be47e54714149e786817bc0b4c163a56ffd00f","src/io/util/lines.rs":"6265bc2ad87ad6b813218ef710515f97dbc6fcf38f061be824868f181f267389","src/io/util/mem.rs":"9b0767ea3964c98f9a017fa474a68fc23e144ab58b2e5405db1e017d38ca7f6a","src/io/util/mod.rs":"f90bd9645f43c34281991eab018a5a4d4982e779bbd4de4c4063ddbb94def9a2","src/io/util/read.rs":"0d79b5939801dd5ed54332432d55a965e5e99f898cb1955d30a36b12bd0cccda","src/io/util/read_buf.rs":"12b5e3cef39415f99b2f1aab187520b7933b5e33c860807eaac8f66cf6d64aed","src/io/util/read_exact.rs":"4d2e31f451169ace9dd438f0d8d31423804c6a0d80ff0baeb741490092e7b2af","src/io/util/read_int.rs":"73fe441637e3988b7d96263fdb24474f99a9b4a226db1690f3ab81d0116b550d","src/io/util/read_line.rs":"d66fea4ca10b33bfbee0fc441a3a5c7b9408ffd4d842bf1299b89d8bf74bccac","src/io/util/read_to_end.rs":"4e2b4b868fccd8b054ecf31c61f958a3c852a57c27f5194883138f0e3b80610a","src/io/util/read_to_string.rs":"828b9d2a46c700fc5896eb6a380f6075b243cdfd40b8ac6a68ff8177bcfff0dd","src/io/util/read_until.rs":"a5450512b5dfdac9e9d908d229fd2dfec7c9342fa8bc34c6529a6a0f114a20a5","src/io/util/reader_stream.rs":"b32393a9b00e24ecf3c8025b5d577439faab8fde9bc337755d0d8fc8a02d035f","src/io/util/repeat.rs":"da881955fb7123fc1d69a081cff2c2dc1909747dbeca51224e97f2321d7a5fb5","src/io/util/shutdown.rs":"bcbe5e38c8fcb392116e7dbba2ae6ae5284c0958d1cc83f89dbc9149a91ab11f","src/io/util/sink.rs":"0dcb794e48ca9b1c28e5f9f2051073ea0951a54c9c7dfc903ce9e5489d3d8cd7","src/io/util/split.rs":"eabcc4a0704a6a38237a2ca54b3401fee3f1810970e18f0ab467dfae27f1ab36","src/io/util/stream_reader.rs":"853bdd3518eae4612231d68301a51f27abd8a23000a05ff0b87e2c087af415b2","src/io/util/take.rs":"836051a1976ef3aea336005b883c3c787059038e82b4291898af93e16de8e6cb","src/io/util/write.rs":"566fa287807cbb760660cb4979d975aa742673bc5a384df0b4420e753093b22c","src/io/util/write_all.rs":"ff9ea6e45ce6ee23507c8d01e746cf304fd6d3c96a9f4329501f7f06c17ce874","src/io/util/write_buf.rs":"e7bbcf17b57c067f7276be6786ac5a8d951149188904a9cb6248d1aae427ac53","src/io/util/write_int.rs":"c537ffbed20443f2eb83c336270223eda5682a0668aef3a74933202155a6794f","src/lib.rs":"045aa3ef045ca3e91dcbf4016110d3625331ceaadded0dad9eaa50e2fb1ce4d1","src/loom/mocked.rs":"7b0cc296fbbc42ffe5fec908cf75ded902dea3be7041f511f15c9a695a4de292","src/loom/mod.rs":"1e4d6445ed9c33495086dbfa640ab8626d86b71927e102c8aa97932c3635eb56","src/loom/std/atomic_ptr.rs":"dcb87a0dddf13fdac9788d99aa07b6e96c2e1b23f468d858f2ad8470bd0d73c0","src/loom/std/atomic_u16.rs":"70a016e77d99248ca7fc2b60352ff13ca9747b88fde15cfc30dcd03074aa7259","src/loom/std/atomic_u32.rs":"9fdc8d389f156510b43274b3230cbc6659aa7497f504cf51190c9400f43d981a","src/loom/std/atomic_u64.rs":"ebcc370af4116e4ad0a3bfb33f693cbc4ce5b254ff270eae26670d971e10cee2","src/loom/std/atomic_u8.rs":"07730a5eeea1034cbba4fcec0a7fcf5a91a40bdc9b5f68e9c12df7867707b564","src/loom/std/atomic_usize.rs":"cdaa249cfb53d42421bbfd3f491e294b24edfe55ee26ddf511935765f2d63c91","src/loom/std/mod.rs":"88d5c281a932ce14d83307492704012b190ae52ee3256db593a061dcab222c24","src/loom/std/parking_lot.rs":"ea7a3004324261e47be741319d7bb99d960a2a7303cd47da5ce045916d5951b2","src/loom/std/unsafe_cell.rs":"5a153493edc71b28a2f6867349e5f9903b198bc2faf7ae61528f08b09bf9fe04","src/macros/cfg.rs":"6421ecc6c9f290a50a76d2e9d5e1b2335fa320d88ab8f65aa7c8812ff587e514","src/macros/join.rs":"ab10af3f968d26ca82257c2cccf8efa9c4ea21077682660a2c49b88d45152580","src/macros/loom.rs":"80d2e4af9fc50d0bda1b20b95f8873b2f59c3c0e70f2e812a6207855df76204e","src/macros/mod.rs":"f46caf9b639449db666d8537932660179269284840214201017e84fce7b4eac2","src/macros/pin.rs":"791dd5c6133eb8070ac86997448c75399f2232636fca6a2a810b0b1e019f351b","src/macros/ready.rs":"6efd4c866c4718c3a9a7b5564b435e2d13e9c1ae91fd98b1313d5e7c182942d6","src/macros/scoped_tls.rs":"9b2f8f73b71048c6a330fb674bbd7d384f6cf6fcf27c57631a4c1f1c35dcf06f","src/macros/select.rs":"4f185b209895124d05a4f02b1df0fd79328f6604f8c4d7b9747387ab1d881ccb","src/macros/support.rs":"b25ae54e6a21180d1c11b19899ad64f51e4f95026df443e1019b52708c4d9762","src/macros/thread_local.rs":"8602495ed102b63e3048a261eda7483dc9a24b15a74d7059c31635e8f45de19a","src/macros/try_join.rs":"8e87155b3ef4717783128b5af1c1d4fb6f883ed70df7adec1dce75f1ad5734b1","src/net/addr.rs":"32e8b56f3150bbb10ff0800e1e3eb2d255f61eb89d7f1831da475584e10b13e1","src/net/lookup_host.rs":"178ec6165315702fce5aad5ef5e715959945cf33ca9d57c1f3fbc454694a8b05","src/net/mod.rs":"fea7fdbae63cac82fea3a7e58729e59f5efe483f795c4c59b55dff3f2aa6c161","src/net/tcp/incoming.rs":"aefda2a41273a833faec35e4e064f21bdf79811d269a5d419ad0d4984827eb7e","src/net/tcp/listener.rs":"ac4412b221665d07d1a237770b3f8676b2c1a3f091c00e559de599ddd0aa7f63","src/net/tcp/mod.rs":"3400e304bf32903deb4f8859fff819d5b2b0c61dff63ec00f0140aebadfe42bc","src/net/tcp/split.rs":"a2e49f715b3394588a5152d6749996303e1b7113277b1f1e54560f8bf60650d8","src/net/tcp/split_owned.rs":"4dcfcc7c19cee713e3c526a724789201bcf95bde898d91c059c74a63e15449bf","src/net/tcp/stream.rs":"863de5f38445d05829d482e2cbc01851927e423185ea9527e93d14f193fe689a","src/net/udp/mod.rs":"eecf3139b6a5f8cd8e02c5db18d4f7ce3cb005448e490b48f88c0e80e19c5ee0","src/net/udp/socket.rs":"52c11314f10a5dbfe92b68c343843a49227c01cadf3b1ffd0b905da519372734","src/net/udp/split.rs":"c01b3193b2832604b87b3fe57404334218d67f52a35744e90c5fd392e85ab6ee","src/net/unix/datagram/mod.rs":"466574c652a83ed8d6bd997a80cf9cbe5bf3b0965a7315ef69c49c4218f48dab","src/net/unix/datagram/socket.rs":"ab705d8a28b412e8ce349abc93f53d42c534969bf91fe988e4865f5b0edcb133","src/net/unix/datagram/split.rs":"741b6bd97ec1b63cc7c4ed023e3595ac79c43514a2aac93c53e89f9a370f19ac","src/net/unix/datagram/split_owned.rs":"211018872b537cfea71a86861c50a4a74aa0ec9696b0e41dbbf21100bf12321f","src/net/unix/incoming.rs":"597cf15c347f4a48285cc20db5c2a82c46fd033e529c30378988ffd27b68616e","src/net/unix/listener.rs":"34a4e403801e24da44055d258034204c0ad8ae5ca5c4e2bd20398b4202c8c910","src/net/unix/mod.rs":"b6d316ee7385d32ed356eb596f4f7fbdb3047907ab020b7acfc02c33d8bdb6de","src/net/unix/split.rs":"55131f0e32db762d462736e956a6f19561b356d9e762546ac09fbb60733e1311","src/net/unix/split_owned.rs":"569ba680c914adc5e69336e3aff836fd8262cf0ce80fc5ab025ba25900993580","src/net/unix/stream.rs":"afc59e3a6deb958aff7aeab9728e04a2e8d5e83b4f8a980dcc979016f4434f03","src/net/unix/ucred.rs":"e56ea09bf2c011f156bbfb886e06a30433fef1adc4d2fffabff30bf8dc6f2a03","src/park/either.rs":"20847f6ac12fdfbcf2881948865b0974846503f1e77407c9ba136eb29604a6b3","src/park/mod.rs":"a3040a37c51c079788cd801032e5470f3732ea5fc0cced2e8d0dfa8a0ce75308","src/park/thread.rs":"0a122331875b3d623d8278921200170bf8d64b58825648152f368b968b25288b","src/prelude.rs":"939b8305ef2c1b74425b1a50c6f25b0a5bed14215fc296385777e60d42d6361d","src/process/kill.rs":"2f98bd1bd28ab37bedc34ab7b737760407ab5315420538acbd18da31d2662d94","src/process/mod.rs":"c1450fcbb1b4e741d4ef96b629427e586fcd5149637e2b7abd55b530a2e0807b","src/process/unix/mod.rs":"1c4e2c8c2bb0a34fb584ca3553f97d25ca3cee25adf7f6239efe38742e2fc22b","src/process/unix/orphan.rs":"54c137c389ec981d59975721d52b7e01cc51100522759fa0fb5bb9c252b937b9","src/process/unix/reap.rs":"9b1c7c5d2f50f7e7d2ce4f4ef9e662a01a577b63c45ba428fc4bd088ec92a75a","src/process/windows.rs":"1ed0999f5e7e3d8c081d55b1f1dd977bca6f20024c1a55de49d374c0dce25605","src/runtime/basic_scheduler.rs":"cc29036ed72f2945aabdd2ce034ce73b26909c8a031c20b04aa6ccf6dda6dc7b","src/runtime/blocking/mod.rs":"9715a6c90fa39d3dbd60fab44e15cf12aa25cf936fc7c6b8a1982e00453a3bc5","src/runtime/blocking/pool.rs":"648aa9e86d696b1e69a47d2d78a7576e50f76543b7366eb975263058349e0ae3","src/runtime/blocking/schedule.rs":"9c00803a2ec9a5e3a749378e17aa7ff8055abb8b357fad5217e7a6863a093ff7","src/runtime/blocking/shutdown.rs":"3a68c0795ab736741e95182bca80701c5fb758a3c64cc56f7976742d1cff32df","src/runtime/blocking/task.rs":"676f154529d26186f8ef9e974e7f21da151e3757fdca39769a44f7afdbb4c32b","src/runtime/builder.rs":"ba02ca365e063189240a85105051853e0360375442b1dbcc06d5712e4a6b1cb3","src/runtime/context.rs":"917597c3a9c5850808b34762e16c310a6eeb09d19383af83de0e0fa0a77f7412","src/runtime/enter.rs":"20c66edb3db9f01b9e29bf7682a95540370fba3434a073566ac4ffd1bb9a9fd6","src/runtime/handle.rs":"808ba66f9b65f8ed24283627bda4c7794ea6146b812df93859dfe7d403e241e3","src/runtime/io.rs":"647031bab22ecc9db5eaacdd77d83748cd34f56f49040fe6280db6d90f6851ca","src/runtime/mod.rs":"1f16d39ebec726bac46920ab95dc5e98fa34dd4d78aa7825dc78b40dc12a19f3","src/runtime/park.rs":"9684177367b919bcc34d8ed560b2aa5b26457e049d8ab5b2987e26741ce76b78","src/runtime/queue.rs":"0fe349c5efaa038064fc65ccc67b376b31f4b6df5dd797cca754d25ad65a0da2","src/runtime/shell.rs":"e0b702170964541b4f829a9dd80a8afa95b7044b114472a3c22f2c48bbb6fbb0","src/runtime/spawner.rs":"7de47d33f4ea7f12e3e5b9fa8d57a47a9b57f89b293d53e8d1fe1bdc719b0aef","src/runtime/task/core.rs":"866a5ae4373276679988b28d7b3b995a61801479fa6ecde08056655e14932f88","src/runtime/task/error.rs":"c50e7e0945ccd046803d745655566c8f5b83438b10168e01e9e972146941214b","src/runtime/task/harness.rs":"be9cece0e218ea461e8b1358a6f661ae67688e4e0438337d7f9c667a0f931ab7","src/runtime/task/join.rs":"07500fe8a10b7f0ce42f537f856bed93413ceabc60db32702496608e2caecec5","src/runtime/task/mod.rs":"b7c258ef949f2146714c20c2df75f90a04de7b82722a98cc7d99b15d917bd738","src/runtime/task/raw.rs":"8ca0d5e199a0c87ad8dbe5fe1ec7dca38ac18f5088f37e99587e752bb2945083","src/runtime/task/stack.rs":"6f1204e3f96f0b9375c53dce0f061dff7a91e9f111e0be24fe07a5490f6f1720","src/runtime/task/state.rs":"e7c9577e66990704e36f8ccad9b3db41a30cf42aaa74611d648541895fac5146","src/runtime/task/waker.rs":"06d937d78301589f7b6baccdb84bce1266edf0e97462719d8816fdcecb0ebb42","src/runtime/tests/loom_blocking.rs":"38ea6c220fab212a3436c682375e19bbbbf2a49bcd9aeb1adfa200fd205f82f3","src/runtime/tests/loom_oneshot.rs":"82e21a3ae98f937e64c5f5c7357537f60ba2738f312feed5e1c9ff727ee3ee39","src/runtime/tests/loom_pool.rs":"a42836021d5843be97cbd88bd9a8e561426004b15655391395bc54026f433e54","src/runtime/tests/loom_queue.rs":"022527b961e310b6c624a118b71c1f69b3b3cb7b179005b3ccf55b330b0c0a8e","src/runtime/tests/mod.rs":"8d73d4e756ee657bc0ee0f123a9ea0c007a42b9f1a96a521528ab14d51a8c1f1","src/runtime/tests/queue.rs":"4ebc75356991564bc083fbd7b6e823bcce2c9c6ba30bff13eeb1b8afd718de77","src/runtime/tests/task.rs":"a013950824ed3ad940d9a8929b3cf3f914115ed21393e16cc366a7fdd87ee907","src/runtime/thread_pool/atomic_cell.rs":"caa3b2262f68a46a8d9be7f3a2e52025b2595767fa6f8ff2b511504ac32cb246","src/runtime/thread_pool/idle.rs":"c8a7864b00c75baada20a8b57df732f23337428d958da8837951d76af577bb98","src/runtime/thread_pool/mod.rs":"1307ca5a1625fe1098e605b879d32af8849f063c31718dbf2b7aa29483bd13d7","src/runtime/thread_pool/worker.rs":"09d61686b7da5ed5ed8e7f4125f54e0294c270b46c93727e13c83bf2d988aef0","src/runtime/time.rs":"ef51c298a438fadead903a97b9e508ea3013af8ca8198db95922ed787a19b5cc","src/signal/ctrl_c.rs":"d58397d8057c86408156a5f2e7322de2d99995aba54cdc185bcfff1a702f84e9","src/signal/mod.rs":"d2094a189aa9c7a4b450adaa78b5b6df5f73fb8f474fc3aec04b9338fcc60133","src/signal/registry.rs":"24ce538cf5393cfe34aaba46ab9c081f01803dc7431b9b5da0acab89fa7fb991","src/signal/unix.rs":"a1291e4e2e8582422f09052fad66540f6f1a2804fa80f1c56bbbecf717a88b89","src/signal/windows.rs":"7cdebd8924aaa81ba98e047db08a1bca29f844974f2a1feb59a1ebaf3cbd0434","src/stream/all.rs":"124d4f3846e9a79dbc128c37f2180ea72e6d48ca760e22eb42bf835e31638fa8","src/stream/any.rs":"cc6638cc89c20969ff8df7cde21d5158c1d4f64135cddd56dcc178f7d56ccc8a","src/stream/chain.rs":"4f7bd88e3adeba8b29ae4b4d96e64600d3a24bbfffcb942b3cc1110aec64ed4c","src/stream/collect.rs":"bec115678f3975fa8a1e8fd088a39cd55c384edc7158cf33a4b225c60ba1756f","src/stream/empty.rs":"e91a2217b2a7ca2d2e5ee9fe5e8642bafde5343d107f69630695ce2c75ff68b3","src/stream/filter.rs":"2191e2c734ec97c9b70da380c808483d62e1099d7feccdb8449192a09dc72ac4","src/stream/filter_map.rs":"70934237d4acc3b21393ff73876dd6c28fb17d9a350c9827fe19261438970a7f","src/stream/fold.rs":"f81518d6f7058f249889fe107f7bf322436f28ff99317682f093ccb41094affe","src/stream/fuse.rs":"a374a9c268cea72a787dde18193f3420133a2acc80e9a242f766430ac72d06cc","src/stream/iter.rs":"b370acfc6ce108da97f6ff486710a795fb228745294c9c4616172c92408edf62","src/stream/map.rs":"c8c84658bd00f1e5a32d2d7b2066f7b9c0f3a5ef76cfccc0a40afde3732b139c","src/stream/merge.rs":"daac1e1429dd7aac4b2673032ce6e0d592c547ff51790ed9697b66c3e65b81c8","src/stream/mod.rs":"e0b9c66d7fdeb3f4bb7de98bc7e6b1e04635b71385f530bd8cdd5f25bdaa241d","src/stream/next.rs":"b2cadcfd467a8673e6de5023b56131ff23ee5508847c806b778cf48123664407","src/stream/once.rs":"5d99a3b9a397c519a5d7d8cb4aabef0a0c3a927b828dcfb5c469c63f92174bfd","src/stream/pending.rs":"551f30ae19fcde725671cc4329fb1104fe0959085c14b79d21b870a054b214ec","src/stream/skip.rs":"f3f54b1afc5d353f9480f3e0ad0272f82da458610f772c4becead03983d34b87","src/stream/skip_while.rs":"1a6d9332ff7e5d530e442a2661bd0a30a75674b7bb2c16fb5fdfdb671f42a1de","src/stream/stream_map.rs":"4fa77eebcb58cc79976dd9d04bd497f733b526736bd1e19d4a8a6130d3ee0291","src/stream/take.rs":"4bfbb36f50cc1b90ecc49494e063e113a366468e7daa7643781821668a8fb2ec","src/stream/take_while.rs":"35523b54651a31de22cabdffe09a4ce1cbb548ea121f76625744dad3c0366d97","src/stream/timeout.rs":"28e4d7a18cbf6291f9dedaeac47439db0d0756c3295307a145f494561ab53697","src/stream/try_next.rs":"2a26cd73d624bc936840f8cb2c894ac69dd47ae612f45bfcd47c36447aa1318f","src/sync/barrier.rs":"f5953c6117ec0b0813639d636e4a8e9ece87854f496711605e8dccc7aa7331b3","src/sync/batch_semaphore.rs":"8b2c906fb283ce33ca09149b99c1f8b2410d2e33b495105720e60e0d14cb3542","src/sync/broadcast.rs":"bea5cb98f99ca502e1a2741c8e352baa9cf84312fc75eb7fc091cd10e099da16","src/sync/cancellation_token.rs":"dfbcfc65f16e3cdb1a8a83616beb8119f2ce1d187243829b72a079e2ffd9c6ce","src/sync/mod.rs":"41a30fff829bc02a855a89575ec683cf2cf579b4d48b59f933c4a30f805a9c35","src/sync/mpsc/block.rs":"afb7210cac1bbdc6940b5f64376692152c769989c40028d7ce5480ffbcda816e","src/sync/mpsc/bounded.rs":"a6abf8814b4bd222c54e29b27d4ed511c9376a416375fd3d652f460d41b471f1","src/sync/mpsc/chan.rs":"7600bae4e8437e8d8cf44a4962737e03673011d8b0e7e3313c67e6c478aeb5e7","src/sync/mpsc/error.rs":"74e5cb0f3d037b3cecd42c59260bca806a2fdee230e5af150e0fee95ead6b6ef","src/sync/mpsc/list.rs":"8a186b3f3cdfd39f4c9af7079104a0daf1bf08eb07dd638ecffc53494cf25db5","src/sync/mpsc/mod.rs":"eaef7d081dbab6e03f05b18d41ea673127afd47ad9fa8c1ff19e9dede5ab49d9","src/sync/mpsc/unbounded.rs":"97dc583a6c97c936ce9c19303f59a5b5d2514eb31a7888636e909c7f5d24bf5a","src/sync/mutex.rs":"7f1708a9d7bc96758504fa182864fc677ac80869cd93372bbae8f871e5675852","src/sync/notify.rs":"6ec7e93d8ce4f1fb413aceb84c22ca1541074fc3e92a24cf69d68bf98a63bc58","src/sync/oneshot.rs":"9be4ecb84136628dc0cb395fbf9fca112b185bac79e878d5d81ba9d976c17df2","src/sync/rwlock.rs":"0cce6e60ad30966e478fbfaf27d039ec3a8718d63b7e74bf7d401968d5a4ccf8","src/sync/semaphore.rs":"e5681d434c4473d78ae5510bfc100fc9b7217e71751a5463e61a0a8f640cf8c9","src/sync/semaphore_ll.rs":"6dfe56703eede7e6fee2612924fc4c643f5aa10897c8d933e0d1613b3c82743d","src/sync/task/atomic_waker.rs":"ee1191ce709e650a7a9ae43cf5e2529e82013460c1a50fb34dd4d1d9522caf5d","src/sync/task/mod.rs":"f5e38105c7f8a942c0e49b973bad0a8c2a1df81deea19f3c5228edc4896c1725","src/sync/tests/atomic_waker.rs":"aa0184eaef7fb5098d9120c941c282e5400dcce8ad0880d3568644eff134ee94","src/sync/tests/loom_atomic_waker.rs":"d6c110bd8cc99989f1f4160cea929ee6faca695d0bac1a71d257898faaad5d27","src/sync/tests/loom_broadcast.rs":"f251c32d8f5c959707c36b29ab4b0bde518b45205d2e02512a3d2963ae452549","src/sync/tests/loom_cancellation_token.rs":"6393c5a12f09abef9300be4b66bb039bf02a63a04d6175fb7cfe68464784bdbd","src/sync/tests/loom_list.rs":"f0ce15a0f965fe558a21bca24863c712156eaeb10feb8ef91031a6d6e3cc5dba","src/sync/tests/loom_mpsc.rs":"94a62f2c727b1dce8cbfbcd65303550fffcb5a302359b6f51cd475ba3f5d97b7","src/sync/tests/loom_notify.rs":"36d918142044b2e617330ab3d156d0c3f8f0398bf5d534683428e30f8115fec7","src/sync/tests/loom_oneshot.rs":"32583f9b711b79a74886a23241773819a473ba7e95abfb7d6531f8ddff18bbec","src/sync/tests/loom_rwlock.rs":"a1aca5bb8bdd073d8f8ae1dd921c95f301e6d4aa26eb31332c3c10a93fe2dbdf","src/sync/tests/loom_semaphore_batch.rs":"c6f69b8d5b2e6842287ed34638a9045095d9f94c86ba6bb84c1224bbe10026ff","src/sync/tests/loom_semaphore_ll.rs":"d56bc913f1bce3ee1254cea943dfb6b202ead552fd6fa69418e78cbcc36cfd9c","src/sync/tests/mod.rs":"26d789e2b0c2f51776e77d8195bb85444324aa6b70225d3de5d882434bb5340d","src/sync/tests/semaphore_batch.rs":"a2eda9631a34c1c12dc39cfb584c4135b7da5b1ce3a00751c6e51ef81ef81e2b","src/sync/tests/semaphore_ll.rs":"9f00c8cc55ab788f63765e11f9d76f10a9a11186d8dd5cf585eaff42415e743c","src/sync/watch.rs":"341e5b48064fad2e529ad4d435de359bb38dec8b615fcedb7fea4182262fba31","src/task/blocking.rs":"34a9cb4667d5dde8f856d1a4ffc742343ec6c093a92ba6e30baa54b3ccc05297","src/task/local.rs":"eea031fea545cf4aa1fa38c44f23e54938c145fe0c5b89e08e8474fbab440525","src/task/mod.rs":"41117cf8803340679aa07ff853c94456e41b2f6f6c373c052463f330e2dfcaaf","src/task/spawn.rs":"e442386d8a8d680b5131074690bebb1297b8675a4a2c34b1d3b21e14b1ef0817","src/task/task_local.rs":"daddc483fcd5ae72666b7eabe83c4480ff30a7b365fd6a099f213ed801bafac3","src/task/yield_now.rs":"d8cb414972c7e867ce44a854dfd799e965868390c63e003616e4b132b38211a9","src/time/clock.rs":"85cb74d5c0fff8cc2d472fd127b27f30d2b364d449594f0064358ceb078aa04f","src/time/delay.rs":"3ca1387b77e835cb509c1ab0457d0f4933acd57415574fa817bf81bad50529ec","src/time/delay_queue.rs":"15cb1de1ad92b6db92b3f2745bb5c61e08b1fda662c109b7a766ff3679e0ac25","src/time/driver/atomic_stack.rs":"16031b8f83df4b48de4954252fc1f6b740dd4795ae92b71a125138ef6d89e309","src/time/driver/entry.rs":"8cf83ffcc5027b2d2cbc2a6fe210328a40297b5af69f8b75542134d443d29f6f","src/time/driver/handle.rs":"eac61ad62c42fe62462cd9876ebcf4c56db80ed451da96e3243946c7e43457e0","src/time/driver/mod.rs":"bf9d73a32e62f471b0b53111a52206ee6326ff90cf99bd2647a36103f18cc2ec","src/time/driver/registration.rs":"c8ca64c50339032764d54d3af650deb0021e9f96b424c2e0d8661519e7b144c1","src/time/driver/stack.rs":"ebfeaa2bc3fbb2ebd0dea0b0e7faccce2786e79a48c81e45809a29142e150260","src/time/driver/tests/mod.rs":"26da5216d385f3d4bedfb0228e698f3a41a92c2f58dec0e371077e6bfc73fd7c","src/time/error.rs":"42d3bc1e88e09ce68283a891eaaf1d27892ee0af3be8c3e932b44dc477341478","src/time/instant.rs":"406116d79117135b9717f71d585e3e92139d615d5cd03071beaa9dc14ac913ea","src/time/interval.rs":"8668bbe57f8c44ca9ac56a58277835b7e95a66c4a7821d5c32a95b06b3a41302","src/time/mod.rs":"b3bb132088e60206169229615c79015d7e874df3af820bfefcefa54c16546255","src/time/tests/mod.rs":"bcbf2373c1b950da5b1418b7e2100f6df492c081cde606e132edae5b22ef37a8","src/time/tests/test_delay.rs":"5f18a883ba8c1174619c0355e856f11fdeab8d9d2c7782521c3448a1e4e789d4","src/time/throttle.rs":"a4fad4be170b445b1cdec8ac1ca5dccf5c96babb15f881114433339436826cc9","src/time/timeout.rs":"557bae886ffbc18c5071ede6f5703d2192fbefc72a9e7b5b7b91b782f175b46d","src/time/wheel/level.rs":"bfa1096cc91b9fa7c58328179194d606c1cc850f953a3ea344f8517c4cb25d72","src/time/wheel/mod.rs":"e49465f9ffbfa61283ce6eb766cf70edc62721cb033d8b98915e61d3814dd316","src/time/wheel/stack.rs":"ac5fd0f6cac1bfdd9497b6eaa4f64beb816bc5605ecae463bd10a5e4c48e78c0","src/util/bit.rs":"df2987358940db917437ac5269d38dce75837cdaae3b5f124cb7cf5fbd806fa8","src/util/intrusive_double_linked_list.rs":"58d5bfb2ce1a2ddb9eeced387c6ca244e820f72c145d857c838ec6d81c3ca4c9","src/util/linked_list.rs":"5d4023dfbe9410190c7176b66883550813bcf299d146c51646631f4c5974233b","src/util/mod.rs":"b02c93d9678c14292823fca80f66a501b87fda96241905c2eded742d9a28fb56","src/util/pad.rs":"5dc99dbb3d3d16fecd6228fd2e2f67e5301b2d426e6149f79f93c1af1b4d1d90","src/util/rand.rs":"df99cdedfdc191b9b138c0b8f2bf7b200da09e646f7977706b918593d7f08335","src/util/slab/addr.rs":"1df854b698a1124cad1111113900755ebd8ccdfc282558ff85dec66403cb69d4","src/util/slab/entry.rs":"718e2a7e19c78fe5693376d9152bb16435e5cb898e5191aa7265646e2f19a1d6","src/util/slab/generation.rs":"4cbe46a38c41a3c670ebef7d18862ab00a03b36a2c2597467e68cfa7af5a2374","src/util/slab/mod.rs":"27f921fc35aab54fc9affe7093a0bcace4763c907d105a0d3cfad3961f8aa6ff","src/util/slab/page.rs":"13ca549b1ee909d0dd575fbd3981b1a639663f2f43b3867fd790cdc0b57c459c","src/util/slab/shard.rs":"491db737b4033ae21a3f44d2ed437f4a2aa9f1fd52df3999acb0d27a6b06cba8","src/util/slab/slot.rs":"49e83978919c7fdb9a6fe3cdcd03e83114de6e926c409046b279a2ee95fa3d11","src/util/slab/stack.rs":"82e3c8bd907ae25d05a51a638c48cb2a0cf39312198c5c32498fbcb325654e06","src/util/slab/tests/loom_slab.rs":"f8c787e4ea2976889a355b91c9e594dbacbcecc26dfdda94767e927dfefed6c7","src/util/slab/tests/loom_stack.rs":"d29db751ba9c48908ded814ef957456a054988136b07cd26c97f62d3ba5745e6","src/util/slab/tests/mod.rs":"0423b219f919b8ad7f0c9b6978aaebd7d01139063d68445c8383ddca011cec3f","src/util/trace.rs":"ad5f971888933eac34e5ce7285a0be2355712e5498aad70db60bdc182ad03d9f","src/util/try_lock.rs":"c4ee49e1751ee0a7df1a8cbd4f8d36ea1d7355e3ac584fdb8697a94cd7a7a8f8","src/util/wake.rs":"3bdc5724211c852ed19a9ac1676ac8e12dd46381fa5bcc899cd5ecdc33528a79","tests/_require_full.rs":"a7d828d85aee8507a0292fe74ced5f4e75b0aaf3a2789cf0bddd276e9fa12dca","tests/async_send_sync.rs":"1417a9496ad9778302daf4ad9d197cfe7ec09fe925861f8f8f63f42882ff8a60","tests/buffered.rs":"001ffebf7a37cfc718a6e73838e6199000ff710ce387def7f4407b733998bf4e","tests/fs.rs":"b4902aaff2c28ef4d2676462381b04559fb4f7cdc0ecf46c46bccbb6276feb5d","tests/fs_copy.rs":"83448b19bdc332ec315024d4903b0a2ae81221895725a8b750025b47a43b0e79","tests/fs_dir.rs":"5cd196805dfa07fedc0acda1ddcf129f839ec9dc0f87c21c0c6ae17d2391d45c","tests/fs_file.rs":"9804b09f7c824f58ad3f06db7c769e8f0808d297ac8d78f68b32503eb40b3036","tests/fs_file_mocked.rs":"644ef206cf8a2e4e103c1e4fae10af9a26dc66ae27451faa7d4799bc61c6c518","tests/fs_link.rs":"f4cc85530965d97916073fbcaa81c65832b9a29ac4261e086546a11a89364052","tests/io_async_read.rs":"5dfbbb40cd9fb20a8b7af60a62126d34a218062f8f6117b2dc1282b6e2fb2538","tests/io_chain.rs":"f5d3ddc9f6e8152ceb08b5dda2ca3168b174f1f67ff28a4c5983bcbad69d8af6","tests/io_copy.rs":"6b94cd77e6034f39865c93611d65870a70dbae9d3b8e33253095b9d5d16410ad","tests/io_driver.rs":"e945fd55ece9fe5d3c2ef695d151e9799fee645f18b8eddde72c2a9d3336eb3c","tests/io_driver_drop.rs":"168417ec9f256d2604eb022a73a64a88ab5b6fe8d0f4be1d3460dc41d5083571","tests/io_lines.rs":"6660dfaf3d789ed383be6b54bd19c7fcc8a6b58cf685ec17a0d9588333a5099a","tests/io_mem_stream.rs":"8b9d775df283fdc7150f5fd12834b1ce78f585b3756444bbccd63d7a147b8453","tests/io_read.rs":"900e56103d816575bf5647188823bf2ca66e7c9cad29154a9f0b3e9c280c611b","tests/io_read_exact.rs":"b6387dbeb0baceb7a1f74a9a3a8b4a654894465368be27c3bbf4352b79fc4314","tests/io_read_line.rs":"8296624b4f5e162c79024f3beab2f561f4195a244cfd4c53e4d06282f56a31bf","tests/io_read_to_end.rs":"7d50b76452c84822650225095d2cc83c8a162973470418819ae89268056c8523","tests/io_read_to_string.rs":"c9ebfee5cb262d822119c2881ea1cc0c73598b13c517c297663e35bb120a089d","tests/io_read_until.rs":"b6c0df9e4852766910ec68affcd92fbfbc280018b7f9c16cf5f4830f9b8389f0","tests/io_reader_stream.rs":"7b510365449fb6b0b01cf37ecf6ad56bfc5b32a032fd756ddfb2192e9c36d50f","tests/io_split.rs":"35b3de189ff171d69715fc929b74be0f181cb6dbe4b2392272ff5172e012548c","tests/io_take.rs":"8f4bfc9182539335704b6370a66998ef2a75f508fcdb73a7f8aa50baf0f4aea6","tests/io_write.rs":"98668a8c8feae0f85714df1dfecfcd94fba4ba347bdc3d8aaa4ea8b175055c69","tests/io_write_all.rs":"e171af1ecab45a439b384c3bae7198959c3f5e2e998967dbd9296760b52951b7","tests/io_write_int.rs":"3f4b50345f7d7d558e71ac7f2a8c1c4b7b771dad09fe2e1fbf9a17d4fb93c001","tests/macros_join.rs":"107e8b96a8654ed1e3ec1d9c7f41f44f2542f802c6324e993f0fbd6679912d87","tests/macros_pin.rs":"572d65b3894858ad8c2491b6a5f8ffdb3b37ec71d2996831b2ad929c4e47d067","tests/macros_select.rs":"f8c8629d5a796af807d30a5fe8d46bc11945f26565cbecb9eafe9313a5ddee43","tests/macros_test.rs":"fda9c1fe4a47f938ec0ee38cd28569d77647d21e702c508f5f4de72f0fd59cfc","tests/macros_try_join.rs":"3b60eacc2afa5d39a2e447e96d5ae2d4bf0ea71e213a249bc0db3b8d234a80a1","tests/net_bind_resource.rs":"3abdf9457ebc9f8262c03fa5834f1ceb6312d4a1573b6bdd4e2f584e3cf76b66","tests/net_lookup_host.rs":"fa43c0127277dd0cf750b17157fdc1d438a8009dd890458f9c566b3a1302a461","tests/no_rt.rs":"3f5be6964c08f850b565e9d14ca698395e72d607da69f34aa1ea1d127f5b5f42","tests/process_issue_2174.rs":"2ca9267533ec563df9b8a9572b21f557d38e1ec95a5c4ab8a0c77269b89a832a","tests/process_issue_42.rs":"b2a491c9093f67df000fcaf550ad06a5b09247a61255c7e708418ad7bb0500fa","tests/process_kill_on_drop.rs":"f3c67649fdf69ed83a81906b93774f5c529f2196b4f8b781870f51d5d9160223","tests/process_smoke.rs":"032ff4ab64ffd36da41a453d1d22ecd5dc9f2294048cdf94c62f015e22ce608e","tests/rt_basic.rs":"0d3320873d292238dd7bed5276539da411bf7e2c73e24035bbf39ab1e1991e7f","tests/rt_common.rs":"0300b79c41132d0342a5c75538d773f1fdc18a127faf3460a0253889d0317517","tests/rt_threaded.rs":"6dd06813d0f231b8dde123e67dccb1362d7aff106b732f7b207f624c2205e093","tests/signal_ctrl_c.rs":"9b53065781b37f3db5f7c67938239b0f3b0ebbc5938c14a5b730ad7ec07415d2","tests/signal_drop_recv.rs":"d1ec97213d9c6fd9fb25ea8c2b015c9e9ee1a62fe0853fc558bc8801e5a3a841","tests/signal_drop_rt.rs":"afd272df50241c16c72d0e3cbd26a6d90e94420ceb90314008ee5fd53d95da2a","tests/signal_drop_signal.rs":"041940550863250f359630dc67ef133874d809ddaf0a6c1238cee1565a19efec","tests/signal_multi_rt.rs":"52a964ebb7963f8b84816c2e8019056901abf7cb42a9f9c612611d8327091f05","tests/signal_no_rt.rs":"99714bf488a26b6b394d93e61639c4b6807f9d756c8d5836f31111a30d42609b","tests/signal_notify_both.rs":"bf0b9def20f530d146ee865305833d8e9bee07a0515e66573d7ff30e2c631123","tests/signal_twice.rs":"bce33093eed151955d13c334d6d8a5bc5ca67cf5b37c246e435a24c15bc166a0","tests/signal_usr1.rs":"86ad07594b09d35e71011d1e12a1fa2c477bfbc4a2a36df1421b6594a0930074","tests/stream_chain.rs":"0277c268b25f2418d8d48c0626d8770cee51e448cfd7f65c37962450b9f9f097","tests/stream_collect.rs":"27edfaea1c757dd29e53c253f639fe6d78244042721e1a571bb4e88c6b35ea28","tests/stream_empty.rs":"71c9e7f6040f128341b49a39c08b9616afc6137e764de2f6ab5b4d8f2c601873","tests/stream_fuse.rs":"13af891fa873ec942d8c87decad9419ed5f22a7903de6af1382e8be1dc1a0df6","tests/stream_iter.rs":"621f6b99e39e1e1c42220b04862b7d24584deb251e4de163d1f429a69873b0b9","tests/stream_merge.rs":"9aa72fbd88efebba1c9637155ad1a6932b22bdc6901332945bd2b858e63b9986","tests/stream_once.rs":"58fcd541bfa4ae6d4df1b83c6aa1f303cf3b7410a5fdc7a7049d4682edb9d7d3","tests/stream_pending.rs":"2c1e798dfd15f69b7fd2518999473f835fab77d36c504fee573f23ca65351522","tests/stream_reader.rs":"2d5a02f00e10804452016455f56e6321bbfe7f0c5ee6179aad592c8e17db6b8a","tests/stream_stream_map.rs":"2aceac06bd22c9d0366faa44ed7b285b89087e883f18073c9d417bce0f581221","tests/stream_timeout.rs":"69d440f463c4031a9447409ba72839f1ff826679696dfbfdd863616020ca0894","tests/support/mock_file.rs":"9373a85e4dee4c5aa380e8a499402db357e92a5783c82a2d3ac348afbdc78abb","tests/support/mock_pool.rs":"1ddbf09d10787c5e413880322b70ec5d01ed4ee4b866c14a888d3cabc0275ea5","tests/support/signal.rs":"83531afa2e8e71cfd90cd4e1fc821490ffa824f0f9f0c9c4a027c08fed6b8712","tests/sync_barrier.rs":"7771f9e75ecf24d1a8ff0a8731a6bfced34cc129aba0e6f7b9b73d6a1d6df999","tests/sync_broadcast.rs":"b1e3c869a347ada7ede16e8efe459c13903fe49f5ec66b610108c87fb1808828","tests/sync_cancellation_token.rs":"dbfc695a24fcf577d7550e314d796d4310249bba9b5a45a753cefa00d125c1a9","tests/sync_errors.rs":"d75d041f946ef8b0a726f4fcb3da29d7248485b5a28f0fd68adcffadd8852549","tests/sync_mpsc.rs":"6232b0763d650191723aec5f74682cb5f9268e04dc90d3b4b1626a01a322576b","tests/sync_mutex.rs":"585c0fd5023f0a10f6c95f53bd5dcb0aa16ee5cd4976296cac28bb476de729b4","tests/sync_mutex_owned.rs":"11c0fb1cf6eeaf07cc9529261e91868476c64d907c62f8e09fbf218bee081bdd","tests/sync_notify.rs":"ea0da778622c8105dbcdefc709984f61fd36e54f39e3c80d9eaedcf036ef3086","tests/sync_oneshot.rs":"da46ed4514aa465e832c12dc00223e2da6a2eec7d0b3bfa7d1186f4d4741b627","tests/sync_rwlock.rs":"1a54885310a87a2f7b2408732530adb0ead97775ebeea336b614ba3960e9e6ed","tests/sync_semaphore.rs":"a86b2839571490b8a83db2fc727ecfe85c8c1a11baee92e7f212ff128f73400c","tests/sync_semaphore_owned.rs":"67cd4b0217295c31b943c9f541b3bf8fd72dac7e202defb4bdea96a4a6543e63","tests/sync_watch.rs":"51a84de8da804e883ddc97ccbea222168be1dcd9e0a54263839a5b7850dfd050","tests/task_blocking.rs":"774c0bd8c9836adf9d489a682c5dbe00083083e958ef1b9716850ba7ac6dbb22","tests/task_local.rs":"09ecfac3dab2d92d443f0267aebbd484c99474617174459621692185ad366d6d","tests/task_local_set.rs":"c15e9029a06e5a408b6ef9e31cb8f20ba9d23b272664a7aa7b13fb6fbf8b67a7","tests/tcp_accept.rs":"f67ce288c5dccfa88489d6af9ed2b2acbbe700f2097d7e3083194a206265d312","tests/tcp_connect.rs":"bcdefff6cec1f8accca910c27af6bf999265c10629287678f8a89ce08f203b05","tests/tcp_echo.rs":"4943257ba23c326a52b4f6f984259b471165d07a302c4dd92ccc90d2694e78a3","tests/tcp_into_split.rs":"4ee1ef03600f9ae47ede2e80810c3a589f026a139b4771503b15b5c8bb8bb486","tests/tcp_peek.rs":"ea904d05f9684e6108a698bdbbd856c9849c1a51eb334cf5bd45ef74c8fe585c","tests/tcp_shutdown.rs":"48c626375cb25c77cda4f0893f066348ee000969f0e5fd4e6adf2b56619c4dea","tests/tcp_split.rs":"e967b01bb90e2081e5e08e8cfd619cbaf0d1dcd08c4e77dbd5bae893698cae85","tests/test_clock.rs":"d5c9bf7bb5d926e2b29b43e47b5bb051b0f761bfe44d5fef349ed442ea7b416f","tests/time_delay.rs":"0ab5f3c25070a5f473cfb98812e77a0d5788207d120233b7ea40f1a80f05ab3e","tests/time_delay_queue.rs":"1c9452e7d6e644bc806272717d0a6d96459c30975ebb234366d63f44eef36c00","tests/time_interval.rs":"71e262819ff32948e7131ae2a945b2dbf053a5a3ae3c7f30a1cf8f2bc4db843a","tests/time_rt.rs":"730728a3206d5f8ed28dd656bd225dcadda478f5ae773e789336814dca638845","tests/time_throttle.rs":"de3e7374076ab3c05d3deb1af10911f236e39537a254f78ccbcb542bd7b998b1","tests/time_timeout.rs":"cb0bc0f4312040fa0d8f10a12bfca081355e22cb6e490577f942a8de4aed43b8","tests/udp.rs":"4b1eb9a9ccf883c300cfaada80cf5b75b579aa1d8962120f8491ee4824b4f6cf","tests/uds_cred.rs":"e57a552dd9e70e9ad71b930f6d130e6df939b48b899384f7434cfb7a2539713f","tests/uds_datagram.rs":"2018b23ba2d7ba494108749a25e539d105fae302a6c9739fe3423021cf8e970f","tests/uds_split.rs":"9b7cb3b0fde549279133367003606485058b9f8505d7f956eb26e7792dc32402","tests/uds_stream.rs":"af789c0198ee71749178c5784cf21762c1324f2b1888449da0d15e846571b8d7"},"package":"099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"373203386c7000ce66390dd4a488f1f3a55b6bf2d7e95b6a060defb2cd3f4fa0","Cargo.toml":"47882b054ed4e428179e48e263c2837a7aa386247d90c6dc5de19cf510782e55","LICENSE":"d4ecf952201c14fd13203c2aa64dee75d81271e3d7e3ca0e8aa0e59b9aeeb9c6","README.md":"dba6a5467520c49a8c455969ca7bc0bf60437ba3a8562fa7fb3c97a5effe9449","build.rs":"fe6db39a280cf0d2b6d3abc365416321f48591a58d7ee39a4ad50f3b1da76beb","docs/reactor-refactor.md":"f7dcc42be8ae33446be399add73f234fc217a5d67478cfcac65601058ab50d47","src/blocking.rs":"5dbfd006f7d1c13c569a4210670a0729226e67ec5414c939ced33e331714b56d","src/coop.rs":"ac55444b406e8e2a6de3b6629e31ca2389e3c56cdac4a677a1fbbb5c6c68d93e","src/doc/mod.rs":"918d5be183bf88f8b41d7701da6df59a4781f072392e62ff6d3c466008085e0d","src/doc/os.rs":"4af4a78a0af962f94e5e8f67858350e4fedb3a5f990db277a0aa8bf4f7b923b1","src/doc/winapi.rs":"f8b16da97e4822116be6a59ef0d9549a857861cecd584353a7fb02df173dde9c","src/fs/canonicalize.rs":"93c64b72abdca17877d6ab61d50a43765d6aef9e0a9f7aaf41b6b0b7d9a8a380","src/fs/copy.rs":"262180fadc66e5ac2bf1e8389628fdd039f14788e66a4f8b10e10633e7310f20","src/fs/create_dir.rs":"b279bf045c5168eb14ad04c91732f575fecd96190c74706989980e6484ba52e6","src/fs/create_dir_all.rs":"56081d541caadca0fc59e84d55e78e702fe9373679598016224ad0b072b189a7","src/fs/dir_builder.rs":"8a53c031caf7c36cae8d6313bd527014fe95b1c1691d0723d1842d2ba5a29e6a","src/fs/file.rs":"d38e364261b15549111747af4c1a0c11596f0b1aa6804cdfeb37a4e7f0330953","src/fs/file/tests.rs":"2c7c1e81d2f960d00753fac1fd35697ff9dbfe4273a09c7820e4004f2ad09bbb","src/fs/hard_link.rs":"98cccbbb3719baee11c232e79723ab1cb3d6c8056bddb109c4990fe2c236c1fb","src/fs/metadata.rs":"782a1a5dbc2cd6c40e928579fbfcf39e5f1de28def78781590c0280acdf02960","src/fs/mocks.rs":"6eede7dba34801f78026da50cc8ed64eea4c3e7ab7aa87d717faac28fdb9182b","src/fs/mod.rs":"eced6fd2a09a6e458556caafbd444753a3577a5dbbe11688f31c0e1e122879c2","src/fs/open_options.rs":"ae96507ae8cd717ee6b3d3c7c07a45f1e0a763f190c9cd4fa4998e90dc4ce4a9","src/fs/open_options/mock_open_options.rs":"f08d384602bbd165eed4cf8811a19512d62c4d9573457f8d22c78c77b1091629","src/fs/read.rs":"055ae8b6ae96ebae2d05f8780e7592bb587a742506c6df8ee8b380fc7d2820ef","src/fs/read_dir.rs":"690c18b2791fa082c17b66d7732531e5d46755499af82baa3052306bda0f9582","src/fs/read_link.rs":"93c104a21253372fef7056ab82e6065b0a1a8fc9be8b7329dfd5a8dd07c618b0","src/fs/read_to_string.rs":"9e5b2d476a6084e32a92c5421a8abc9d4f335f4ec677beec4bf8bfa109d7d106","src/fs/remove_dir.rs":"96475771e9c52678768288d8df6814216e0801bebc848481597ad34e829a5854","src/fs/remove_dir_all.rs":"b85abd05c7ab64ee8dc6cf5663a11e713aa51b357759ef660ef3cae3365ccc42","src/fs/remove_file.rs":"1cdf8bf16b3a164c594dac8773b7d1f9ebb28de169343184d34d6aac3b3a7eaa","src/fs/rename.rs":"a97875e92626fa46e23fece7b8698c9c4cea2bae8f1be8726f30ae6fe80ae0c7","src/fs/set_permissions.rs":"8adccafa475dcfc1bc3989af73374d90683c1be4953ef812e5fd606f968d7b7a","src/fs/symlink.rs":"32cf3e906531d30ebe6d8be7ee3bfe049949759b566015b56d0851f51abcff50","src/fs/symlink_dir.rs":"5fbd05365555ba7942ffc1c2dfddf201ddad2cf9b005be2ea99849a473fe982b","src/fs/symlink_file.rs":"a1170fd40a000dc449de972267f579a0d14f50dbb39466f985f183fdcd1d3438","src/fs/symlink_metadata.rs":"f5ce1e05f137da995e3e0d9582bae0a5f7ef4251285c64e912b0eedbb068b395","src/fs/write.rs":"1ffb734d31748bd879ad398b0fe99bdec569782b42677022957db2cae95c4d2d","src/future/block_on.rs":"ef7fd744d2727f169b6d8997e2202af88a256bf41a894c93a4490ade65fa0e57","src/future/maybe_done.rs":"8098e69168044c2bbdba95a3a3da339fbb2d8f95edd9e74db3ae744a4b6c379f","src/future/mod.rs":"6abc3b25570075121f594a1cc3a7a91425f985dcca85b7b6c5aab92bc8841d11","src/future/poll_fn.rs":"77a9944e20a90f7b98ce7d94927432b7325fc7be72a2a68faa4bcd2deafcf499","src/future/ready.rs":"168e965951c21794b21e0f151b29614c07371caa040271fc51541f97451fe94c","src/future/trace.rs":"c42712a8d372922eba7e05cd21382fe5df5eec02cbcc870062100b59ab99654f","src/future/try_join.rs":"0ea5a069b17a34bbc091acbd74b9d51794a55a85dfa63fe2404d5ee91a4f0038","src/io/async_buf_read.rs":"b37caa8f6c974b3c97327c635218803e573c531d4197950840549aa794357c99","src/io/async_fd.rs":"5e7bd0048f7ecf576cce654c5cd83c9f67626b58ce6f0e45b54b4fe01e7ffb76","src/io/async_read.rs":"f52c8d2f4a283c0dc8d06dc974484749973125b0b691bc0c3d100972ac67cb92","src/io/async_seek.rs":"a9a0df389ff2be3d79208ec475fcfede46a86f6ea0b822b1a4ce8273ec714b0b","src/io/async_write.rs":"198ed6a475b6f093fd2ff15e618d816d7e33cb8bc28d2e2299533e5df0bd78d6","src/io/blocking.rs":"d7d95419c452fe658f3611af1d9c4a52aa68676462299242a9cf2eb20f966736","src/io/driver/interest.rs":"89b9a971c142b70f7629d5d2e80a13dfa472607e8a43b628399412e2866dc97a","src/io/driver/mod.rs":"f7ac9dde79349a47226e48ac0b80210cc91f4467e4b0b21d618bb9951966d415","src/io/driver/platform.rs":"023acd3f2703d241b3e91ab6e4d4c0bc5ccc3451655fffd9f37938224f915494","src/io/driver/ready.rs":"14b17f260a3b068205499f5e68fb2764306102bc57ef78b56e7bd4027fb25ce1","src/io/driver/registration.rs":"b3a62b64014181839c8d13aa5d13da27d8d173c18feb18c3f03246b08404c0d2","src/io/driver/scheduled_io.rs":"5c0cdcfffa34a80adb507850ec4d3e877926aa07ba03ec00f3db80949ccc5cd0","src/io/mod.rs":"be0361bbd0e290363f174669255c5b0937e39e7b4ef2cf5563b89c0520d0df59","src/io/poll_evented.rs":"507681d41bfe08d22bcfcd8b16b56c73d671d257996c7de9885b3d7b6f53eed4","src/io/read_buf.rs":"bce0f5fb30f34702a290342d0474c9eb6756e2dcbacbdbcf2080ff63ce5c7699","src/io/seek.rs":"e9e346fc926c3360601b80a8319a25fd0567dd6f77fab666694e9787deaef633","src/io/split.rs":"8fc0d969b44cf2cd9fa05b61ee65f7f07b9bcc7285afb5da63303718eb85a15c","src/io/stderr.rs":"8f4d9fc5e596180171b68919bde951c49d134446d30af06dbbbe413ff2882ff5","src/io/stdin.rs":"5c15de00a7fe2ffee2f48f2ecb2a4fa765f3de891f8cdbc240e2988db7cc0d13","src/io/stdio_common.rs":"89ea8f95cd22345abd1a08476f70eff3ce9f2b7f2bb98aa2b6594f4a94c320ef","src/io/stdout.rs":"2c1b11ae547b0eec06e2b21039655a2acf34125b789548c7bd362babf5b05cd2","src/io/util/async_buf_read_ext.rs":"7f7fde910ecd9e526bb85882a318f457dedf6ccc2cdbc693112562186dfb78de","src/io/util/async_read_ext.rs":"f70825f0be7ebecce5473c53c716cc57f1123e5818f7b917444c3892639a5e2c","src/io/util/async_seek_ext.rs":"13dd99cdbe27b4bb4fff4a92d003359dc35effe6aef1d78b762443e643132ef5","src/io/util/async_write_ext.rs":"7fa1eddd4a105e2b320197449c2e9841af28b1fa8c2b8aaefe78714a34654f70","src/io/util/buf_reader.rs":"ddd76ffa0af8efd454cc899f2c33b2a02233f37b1a85599e7f56134cd4d484bc","src/io/util/buf_stream.rs":"2246fe71b707c15d7168c5da5ee158cec6e854d4fd11b685531c16a9c3cf2c6a","src/io/util/buf_writer.rs":"f9c3e018c9f9177fb6d910096503caee727bebd3c36f5f67dca2c4c55044408a","src/io/util/chain.rs":"5cd8df2cc7bbcd18ca2336a78507fa8009c0a9e595f81730a8c16cadb8f731a2","src/io/util/copy.rs":"7fb1c5d75462691d0720cfa1b24888c61a04703ed81a91f01465732aa2241975","src/io/util/copy_bidirectional.rs":"0f72d957fa2d1b3517224e34c65f06016f5e04857d45b01c368398fb95e555f5","src/io/util/copy_buf.rs":"b029d0ee8da5301a06722d425828418027234a8b111a209fa49ead161263aa8e","src/io/util/empty.rs":"78cb27e38a9562e90fae41fdc9fe89125f0c930976945162f3eef2427eff860d","src/io/util/fill_buf.rs":"d39dea0831f4ab1c159136b6e8a739f8c445e4235736c8594e323f5858c1cabc","src/io/util/flush.rs":"fe3b4ff226e294843b8cbea9dc4e02d581582b78ddaafce137c96e290699c718","src/io/util/lines.rs":"b3ebfbf72e399cc71f58fd9d02adf721c357ee2d40e69641a25948e5a665dbe3","src/io/util/mem.rs":"b76590bfe286fc69d565ac4cb28a57d6e727810a29bc08ac8fb452f4f3b3b451","src/io/util/mod.rs":"6a9012d78fe2bed8240e7a628e9421cbef45433551522624065fdcbb329f3594","src/io/util/read.rs":"01c1113b6171c83ba2a0ad774703c3139b0ff11f47953f1b50861334d44f86ec","src/io/util/read_buf.rs":"a87be2d115c09a6782ec8cadeafc92fb1fbe534580e71540087c3298a03bfca2","src/io/util/read_exact.rs":"7562ef794d46585c6f3c0a4245618a9c0acf1546d214973a1ab336c4e78351e0","src/io/util/read_int.rs":"49da230796335df584832cd7deb8370b4d1e0350d743046389a9d9ae17dbd94f","src/io/util/read_line.rs":"9cdb2d778b81bc50098a6851981ed9f541bd0c7896c0763b811971b5a598b7e8","src/io/util/read_to_end.rs":"7aca8032ee911467c24ce435b7bcf023c72ca6f19c2663269ff50d31913d6e01","src/io/util/read_to_string.rs":"fafb5463b013cc8f76def3a505dbebd179afc95bde0e2ca9388e428265788924","src/io/util/read_until.rs":"b2a2a7c434439fd2c9269494e59edbe1f75eb45449dd6be384663a6ceaf137ac","src/io/util/repeat.rs":"d4effcd81338831eb373cf2db972a99218b8379b91066940a732edcf4524c7c2","src/io/util/shutdown.rs":"971454342b4636fbd68e123d59d87017d81f72afb410c385846069b11def8efe","src/io/util/sink.rs":"0dcb794e48ca9b1c28e5f9f2051073ea0951a54c9c7dfc903ce9e5489d3d8cd7","src/io/util/split.rs":"03a59adccda29608886e38a1f484fbd4d6a6019180c4cfa851372d250796aa5a","src/io/util/take.rs":"559c062409ffc80202ab792bdae094e691c4910e24aee5cf76ef9c8f26c7be3b","src/io/util/vec_with_initialized.rs":"06f3a452c0158b4b72c6fdbddd6505eec8ce1893abce0420db1e79897d63380b","src/io/util/write.rs":"20d14ee545ab1f67732915522e97808d1ddde13d151505c1289b596be519f7c8","src/io/util/write_all.rs":"a53b89e3a716d53fc6cc50a4068200a92edce585c9fefd3c9c21ab158d53d7dc","src/io/util/write_all_buf.rs":"5911bf673ef89097938f4e2e38d9012865b28a0ce5ebb217ebe0e2507de6c1e3","src/io/util/write_buf.rs":"ab51d6174de24cbb729ce77dbaeea27e16059b8253e4830d8243ec5f08a08a8c","src/io/util/write_int.rs":"f321e69b0c7c01728b079e9fdeedb96c26475667e8b259d0c5f4a83d060990d1","src/io/util/write_vectored.rs":"7a335a9f796daa048fa9708dc44d32d2567b36461a6d88f07893eb31f304b69d","src/lib.rs":"0150e9a13f72270c762314ae7246b1277c66cb7a54e657844e87e23cab1c524a","src/loom/mocked.rs":"6db5ed42cd469ac1f98d04c535e59aea174d6c06aed5f9f0c5b5254dc6e476b9","src/loom/mod.rs":"b14b9333a7a21bd125a4ae82f01e5ea9c9ed2f78d7d1ad49a13d9b176f1fe8ab","src/loom/std/atomic_ptr.rs":"16d7e6f841697020aa315a303f26cca714c35a96c4912ae45b90ad3ab0715e28","src/loom/std/atomic_u16.rs":"8793a4927367270305a6a3a68423ccc838cead0960ab1a7cb345681182916c14","src/loom/std/atomic_u32.rs":"39889c3295f5a201ecbd4ce3f5f942d88931fa9988071f771935dfd0c6c3443c","src/loom/std/atomic_u64.rs":"dbde383b3a2119926583dbada2a55a440c166913527011479d676244e0b9f08f","src/loom/std/atomic_u8.rs":"98f6baee74059eea2fc950dabc273a2fcb3518950015fb3a5acb3dbc58ffac03","src/loom/std/atomic_usize.rs":"ce7e840ac029a91adb90d7834c2bec3a8ef5fcf0b311de0bb6900c0be199301f","src/loom/std/mod.rs":"cfcf83b8ceb0c729a6e910c78a27f54fb30d19482fa173b3e2caa32d9b934d3a","src/loom/std/mutex.rs":"e38189bece9db4601045438e6856e85fcea5c51d29d8f1a58358c35022394271","src/loom/std/parking_lot.rs":"cd835d0693d1e531ad4fd004aab74ae10df8f95968c248ec024eddb8480869d5","src/loom/std/unsafe_cell.rs":"05e2b4d8e78b0435650c6da6239ce8c53b4de2573e64ba098354b049f23429ec","src/macros/cfg.rs":"e214f1ce33b3ee62b911ea57768e8e97c84c20cba901a47a10c3116395e12a2d","src/macros/join.rs":"ab10af3f968d26ca82257c2cccf8efa9c4ea21077682660a2c49b88d45152580","src/macros/loom.rs":"80d2e4af9fc50d0bda1b20b95f8873b2f59c3c0e70f2e812a6207855df76204e","src/macros/mod.rs":"cb0ac2ebe3151af2dabdf900682d534abf5d06ecc41b2d8bba4d72f48203d8a2","src/macros/pin.rs":"294e5644061e41801dcee5494b7334439e09af0b6219ce164090feb624864631","src/macros/ready.rs":"6efd4c866c4718c3a9a7b5564b435e2d13e9c1ae91fd98b1313d5e7c182942d6","src/macros/scoped_tls.rs":"63afe7e1e9c4c876176e8f11ddf4b6789072f533c3b4c8f3ad9db584fe705c4e","src/macros/select.rs":"c783f36f6974a609039bb4ae0a861df4bdd99f6ab8fa8700771b2b38821ae0da","src/macros/support.rs":"0cf0789ba2dc5a196ccbabba9ca9f1861a71284032b98dc7c372078c12c5d5ce","src/macros/thread_local.rs":"8602495ed102b63e3048a261eda7483dc9a24b15a74d7059c31635e8f45de19a","src/macros/try_join.rs":"8e87155b3ef4717783128b5af1c1d4fb6f883ed70df7adec1dce75f1ad5734b1","src/net/addr.rs":"a58fa02863059dc77fb82ac115635d2928ffce4437a37412b732799e6fe7a7eb","src/net/lookup_host.rs":"c7a21d735225e316253d822f6b11a17107e6a8db004f947a54d8bc12ec782baf","src/net/mod.rs":"b75d65aee9871a9b5ead894a01199d0af48f993e12a5e49041a91148739876bc","src/net/tcp/listener.rs":"ae2f8d00b8c6da91bdeaa7823853a1af7ed42e9de038267983a1f4561780e6d1","src/net/tcp/mod.rs":"eadce128cd718c994538040e55aaff1a86d08a73d769f8a9f2e4f3a782eef6e8","src/net/tcp/socket.rs":"dfeb926f853d84deaa3276c95dde5414e5d385011010e5e1b9a5bca6928a1e74","src/net/tcp/split.rs":"f18175dc0f9b5a59fc3382e2655b91f52e2a400334f6ddd6b487bea681425cbc","src/net/tcp/split_owned.rs":"a6ed9dcdc8d841cbb44627e6e09085c68899634428f85092fd8ae5020f6f3c30","src/net/tcp/stream.rs":"a2162e305e0cbe9c0bcda54a7c25f6c31fd4e886eb8f114a946ab18de2893bfe","src/net/udp.rs":"88eb695f719920de92c61bd301f6cd0d7ebf6c126f6812f2937a32614fb9b32e","src/net/unix/datagram/mod.rs":"fc48924e5d1e551405b0708a2d122473cdafeeee802a5722f64b4cf41a1c01da","src/net/unix/datagram/socket.rs":"74ee4c623253bfd19485b4417c4eacca8341d8dc3a43d81e8c3a78da6961d79d","src/net/unix/listener.rs":"02ad1b866e967183189362d0998ef14e947aa96f7d8f47493cefcce7ae5b21a5","src/net/unix/mod.rs":"cd86e2fb6e53ff3203698cb78930e02a31a4f45e7fe071a5d9247f783be95a54","src/net/unix/socketaddr.rs":"66bf18321a81baeb394a7094567632b113e44e12d2643109b6a97c89d919bf3a","src/net/unix/split.rs":"d07368104ba54b81817a6d34ec544e8036dc034691ddc79f4c8c45d219207e48","src/net/unix/split_owned.rs":"0539b27744bfd29e3d2b75784d61e4de7a93508b594232f241c9e961dd9207f1","src/net/unix/stream.rs":"577a8a473a900950443274913dc819c61e82885527f23519dfd5da2beb5c6a73","src/net/unix/ucred.rs":"3fe39da93d4adce789184ea811182adec10ccc5f513a7d045a6777142adfa239","src/net/windows/mod.rs":"a1525f35c1acb92b15bec788a625b76acb42f9424f392074db697102ce79760d","src/net/windows/named_pipe.rs":"d66528afc5c4e9c67a1f933ecb380c68afddbbee4fda9e06ca318776c09eac35","src/park/either.rs":"251c6255768445ca2bcfb037b1fcffa05e9ca0f4f31923ffcf341eb3cd794180","src/park/mod.rs":"e11332069322157f087ea7a25c147d817a3008031a78eb44d77cc2dc86fbbaa5","src/park/thread.rs":"1456b25566e5548a88a4841e99bf662f05b88b6626076cf0e4580b9cf3a1f952","src/process/kill.rs":"2f98bd1bd28ab37bedc34ab7b737760407ab5315420538acbd18da31d2662d94","src/process/mod.rs":"bd42614cd6548f01e0295df6a6e498d9fd644198f733e1a4fe08c346e9939da7","src/process/unix/driver.rs":"08e92a48b03179bc19c0434118d1ca07a33b2ecefe94ab85b03ca29e37fa0008","src/process/unix/mod.rs":"cd80c9cac2003b2e5635af596c28788d9832f5e2c0111a51b44a3f730806d70d","src/process/unix/orphan.rs":"e63952a6469703d4734939b8ceed056489023cbabe3ab80b4d7fabf698c04e6c","src/process/unix/reap.rs":"62868319849b8482d8d927dcd00cc8a74b9af61fd47494b39bd41fe2f4dcf0b6","src/process/windows.rs":"feb605a16ea975886b38a66f30b3aad97f7e9ae73d35eb2ad45ccaae36d0e4e8","src/runtime/basic_scheduler.rs":"c310c14e624f936abb0170384062f5d3ab094308c52d7b85ee96da2909a12470","src/runtime/blocking/mod.rs":"0ad39897f8400a62e18f237a7244a143234b8cf399484924e4a7707bff90b2f1","src/runtime/blocking/pool.rs":"2b9f94bd80bba53536f85e9ec43bca4fc2dc23d97278133307ed5f128c4f1cfe","src/runtime/blocking/schedule.rs":"fef31b442b9e743a4e0f3d490cc320ecab17b475f2be7c995a57fd2af7b34b88","src/runtime/blocking/shutdown.rs":"6c2c2d28208589fcfee42f22a90a065fcf470c5f1ffc1a227070d69a9e5de5ef","src/runtime/blocking/task.rs":"79779e1af6a70f69cf288f4cf1d9e06f174567bb187e63d307101f7d6d813206","src/runtime/builder.rs":"05a6e59dd194d1a302b0abd40da54c8cfd97decd9e2495e0867f08336b84e7f3","src/runtime/context.rs":"56d65e305dc805246dfb4b0577cf53e9197e8e8f13474180df72bad2ee2235aa","src/runtime/driver.rs":"763324ba05d5901acd060532551cc25c539ee9c1c9a5a87b72450fe74f2df394","src/runtime/enter.rs":"6a6e1942f1841cc281c6c92b53d932de03fc851e57e31c22f6cf79234cddf9f1","src/runtime/handle.rs":"eb164f04df8431561fa2513cb15e1a6e4e2c62bfb91c47b0aa26c0cc1784a7fa","src/runtime/mod.rs":"23caffbf93d18a2c94eaea81d0c9ed2c68acc4595d516c749198fce7af973829","src/runtime/park.rs":"e1d66e859e402068e70580277b4b128b48bda145de77ddab90c55b8a19799083","src/runtime/queue.rs":"07620c7a3319da6f927db5dd5561960469fbedf116a098aeb40598a73276946c","src/runtime/spawner.rs":"fafd0c25e17e2dbe8e483e794f5cf33e1f4a460f9e9b24e30f22af6a0ea0a397","src/runtime/stats/mock.rs":"42e3d1ac41d0974c5556551ec266a2d92c5f0ea001ebe4b4d12a8eedc1881884","src/runtime/stats/mod.rs":"13f8c6deb03a9c805f081b334c0729156f4e7015b587e2fdb6b2a1712cb75a05","src/runtime/stats/stats.rs":"b1227c346437c85e7e4d2507333f9ad85a97086fd0825332800ece9047655317","src/runtime/task/core.rs":"d22495d0cb21755373513bdee1420f6d616def202fe700ad8dbb249b3b868638","src/runtime/task/error.rs":"a89e160a2470f176bca7fd13bc410fe9ec5d20edd6fc00acb8bad828d3616cc4","src/runtime/task/harness.rs":"ca2f3aef51e1ac771e77d0023c9970cbdf99f22b6bbfceaff3e7660aeb908d01","src/runtime/task/inject.rs":"2cdd31f95845a43494ef7b9db4f78dfe123601eb50ebf166e09467e85030f863","src/runtime/task/join.rs":"320d3d50465f31375337273a88e10d434f1a7fd1145e3380d9015032d0e5a484","src/runtime/task/list.rs":"9c76059db007accd10411987c9f7973d2aa06c311491c89487bf19c6f40a642c","src/runtime/task/mod.rs":"830630ef9568b130f0f316e403ceff18f65e13230040576bd9b7b21bf2baefe1","src/runtime/task/raw.rs":"5f3ccfec1845a39ad2d5ff4722a28d51a0dc83211427cb5a1af9d703902de035","src/runtime/task/state.rs":"79d6420196933802d1a823181e2ec277ec42939d7836262c9a25f344968d9d9f","src/runtime/task/waker.rs":"7f8a74298464a7eaaec6ac75026382180dcdd29189b4881aed60a3166d8eac2a","src/runtime/tests/loom_basic_scheduler.rs":"350ec6da1f3402b5f00f4c42e7aecb2c29570432435d47c903713eb7bbda9008","src/runtime/tests/loom_blocking.rs":"2435b6e5165d09780156e78a2edcc5d43cd8f8f13136e9957a5d9c60cbf4ddf5","src/runtime/tests/loom_local.rs":"69cf7fa67da9e3efe3eee722791f811efb395dcf821780051e62842654de09e3","src/runtime/tests/loom_oneshot.rs":"cb0cb66e1014708a10a2236c2dbbac9441b6a6e36a49c419fa3a51af62b054ce","src/runtime/tests/loom_pool.rs":"30ea07a942c39bf1eff70cc6d7ae10cc5f0162c0389029ef0bf8b14ebaf4533d","src/runtime/tests/loom_queue.rs":"6231580e1e30ec45e4d4b49fe13ceb42747098ef404dbeb06261bfad305c11b6","src/runtime/tests/loom_shutdown_join.rs":"2f48626eb0a4135d480aa5bf72e514c4abf39aa17711c96d3829f93c03758557","src/runtime/tests/mod.rs":"334e311c0ad080139564aa56b91f227344693985ab25babc45b1d030d7d960e1","src/runtime/tests/queue.rs":"5654b688b80191b93c6e3020fa0eabb3ec22733a676a9eadab0ed4e8fa9c7560","src/runtime/tests/task.rs":"52e9bdd03d931bd24020214ddd2390dcb9ce5aca36c039853f4257b42796ab1d","src/runtime/tests/task_combinations.rs":"9ec3bfdd62aa8beed6738b36870a383be9db452b67dd4a08a6992bb23fba8564","src/runtime/thread_pool/atomic_cell.rs":"c754ad96915210f96c0169d006db224f711df4aece3447fa9f39baeb6259a836","src/runtime/thread_pool/idle.rs":"9a272c0b355d76cbb949a458b6c78f975656145d29ae00f722c7148d142c8720","src/runtime/thread_pool/mod.rs":"3e4f39fb3dee8b59bc923fa23a90eb9fd8415b1cd7bef9bab9619e2b419f901d","src/runtime/thread_pool/worker.rs":"715ab50560543da7a8b1985982c31e84e941db6db463a021a4cac81310e3462f","src/signal/ctrl_c.rs":"d58397d8057c86408156a5f2e7322de2d99995aba54cdc185bcfff1a702f84e9","src/signal/mod.rs":"2840f2b63de5b879a8312d4b56e6cb35421eb7005572d6b6de839bbd21c0da34","src/signal/registry.rs":"2e282b0d929015a12f8264c24880333ad7d9f899cbea0b0501982dab42f1fb05","src/signal/reusable_box.rs":"8ec8b1c17b08be1a11ab01fbf99a3404f2c995582f2dd3b9d25e27ad2d5b7e9a","src/signal/unix.rs":"c88b98373a9eec9f509e45ad94de9e725de3b0d1c1552d3c78ee0aa943ebb4e7","src/signal/unix/driver.rs":"78ead5545500535c20e061b0e5809fcec15369286083ce9208a0a1fad771aa37","src/signal/windows.rs":"18680b96548ce1269615587b803186eda94521f9af8519f5ef6aa04cd706c816","src/signal/windows/stub.rs":"e080a121465461e6de2b7756956975cc755820bb7c54248b903d7d18aa79e255","src/signal/windows/sys.rs":"8a7178e52c33689420e54bbfc2db78f1b15e3c7f16632594d6d668ca1d865fb3","src/sync/barrier.rs":"ca26bd1aec007b508735dd16a43fed5ff07a080f0b7b16b4d3714ea6986ee1fd","src/sync/batch_semaphore.rs":"c081f5032c77509787b646ae46b2438cc8713164040c6e7442ea4bf97bf15c69","src/sync/broadcast.rs":"70a2b45ce4fa19d1c3db3d682ed36c7b05e9a4176ff9b68a90e7528f8f1139c5","src/sync/mod.rs":"339338d51c28f55b70c2050d0dfb527d5111fa321c7b0be065bff41150cda215","src/sync/mpsc/block.rs":"b1b1d6d93728b426434d736adcb1824618a1e13916ff17e65ac6fd8077a608a1","src/sync/mpsc/bounded.rs":"0e969add35bfa65f37b74e6fa5e01527188e8fd2014f94c117a9098d21857da3","src/sync/mpsc/chan.rs":"b565f8cb221f33af7e336b57f83ff0e887ad9613c255d56d3070bd873438bc72","src/sync/mpsc/error.rs":"1e1f669218f58886bcafa61fdaf4a2acd9ba194ba84d97b249d646f446231c0f","src/sync/mpsc/list.rs":"aa38264d2560765ffed895d391f8ee4c09811604a470f9b4c93f6ea467c91349","src/sync/mpsc/mod.rs":"e82e08d2c6ddb4e248c01c1bd1da204a4985cd279750385b41a7918b1567ad82","src/sync/mpsc/unbounded.rs":"6fa1277b27694902733a9f91d17e4c82f1ce00b57698951459b8b4fb785f31ed","src/sync/mutex.rs":"c66b9cb6af8e36ba3c2426b5368e94ed34ad4268d05930cbabc8fc0fc6270a3f","src/sync/notify.rs":"b09b9b467fa062c61bee986c7af48eda3cea3f7a2941d8fa52a82485ec90243a","src/sync/once_cell.rs":"a42c364fa48052ca9289a5515630af639badfbba3db48bf88482fadb51eee4ea","src/sync/oneshot.rs":"3bc0a672c944a398e0811ab9447c7d2a1a022b9a27598efe9857532b97df0f29","src/sync/rwlock.rs":"205900e037c49514da7c819fcf1cf36c9365f91e4ac315b67530ff041a8efc67","src/sync/rwlock/owned_read_guard.rs":"5f6a2c6ab2914c0997ad593c1ca653a0a833af9f23e406a9a961fd45fe1eed20","src/sync/rwlock/owned_write_guard.rs":"9b8115682726d74eb7931948d7b3909ac183b56c6453c5d71de31db71190f10f","src/sync/rwlock/owned_write_guard_mapped.rs":"7df43b96fffd90d26a76417236f25d2bcc1342ce5a8b575a0da0ebf0e7dc7c1f","src/sync/rwlock/read_guard.rs":"362c9571b507bc53fc90590f512a080256d4ac2bce995d09a1a925657d8f1fbc","src/sync/rwlock/write_guard.rs":"63f0b0593ac0f2834bc89f0a6a79a6fb237d0d3d5685077ea95c356470d18c98","src/sync/rwlock/write_guard_mapped.rs":"3111c35beb047744420f4709cc061e9c799bf767f2574214d5b82c75d5b3037e","src/sync/semaphore.rs":"c8636de31ff648e8f7037745c4ff85485852288535f47b825da0e725710dabe3","src/sync/task/atomic_waker.rs":"2886b4316a5a14351643689c413a5ca38c284b0defbaa4c52eed02f58dcf3457","src/sync/task/mod.rs":"f5e38105c7f8a942c0e49b973bad0a8c2a1df81deea19f3c5228edc4896c1725","src/sync/tests/atomic_waker.rs":"aa0184eaef7fb5098d9120c941c282e5400dcce8ad0880d3568644eff134ee94","src/sync/tests/loom_atomic_waker.rs":"d6c110bd8cc99989f1f4160cea929ee6faca695d0bac1a71d257898faaad5d27","src/sync/tests/loom_broadcast.rs":"b2c6f138707fc389ee7d91109bc38093af9060b3465e68d3543cb652e0070406","src/sync/tests/loom_list.rs":"f0ce15a0f965fe558a21bca24863c712156eaeb10feb8ef91031a6d6e3cc5dba","src/sync/tests/loom_mpsc.rs":"6844fab07bffa1f1c9a69471f03e6cd53027542e2034943c73f4766241238325","src/sync/tests/loom_notify.rs":"c571a81799e617222f1d07e2b9b0ae9b21ead982aea90205757b6038859abd04","src/sync/tests/loom_oneshot.rs":"f48f155bc1776edcc662e8983e4725dd4901f11b32886f18227ff63167540de4","src/sync/tests/loom_rwlock.rs":"80ec00bdcac838806d4d9f711cb154e02f22913ba68711855c39ca92028d3e4e","src/sync/tests/loom_semaphore_batch.rs":"c6f69b8d5b2e6842287ed34638a9045095d9f94c86ba6bb84c1224bbe10026ff","src/sync/tests/loom_watch.rs":"558ad9bab3f18b79a0d46548aff24288f1c6c5d0581e51559cc2a82cccd0696c","src/sync/tests/mod.rs":"0f79709a51fe12882563eb0c2a74352bd0ac2fd5189d8558b922ec8bdc8b8209","src/sync/tests/semaphore_batch.rs":"a2eda9631a34c1c12dc39cfb584c4135b7da5b1ce3a00751c6e51ef81ef81e2b","src/sync/watch.rs":"743fa97f61659bb88217973d21e773f229f2ef3764efa20fe864db4c68cd6064","src/task/blocking.rs":"a50190ec1d9db1935c046ab17047c4d3c37e55c782bf8d82c513bcb1948eb0b1","src/task/builder.rs":"5dbb039300c22d0b922b6a6851fc513ce89f521ff049f4d13e44a13c9cd6cf4c","src/task/local.rs":"1d130e57467214b185dd6fb1682b6d0fa0d817596ab4101c9673ac408d659ab3","src/task/mod.rs":"d80b80f4a0d0525f105cd8fd0f36d4c504220eefb5d3b27aa2a40943c87788a0","src/task/spawn.rs":"66956015042a64c671a6e9ff67c0fbfe5cd10889decb681511d3a6df3d27e2bb","src/task/task_local.rs":"9b6b1785410072cfc32ee9546a09109e6c96a31623c926db37e4516fa3b93c53","src/task/unconstrained.rs":"a39131550205cbc0b0ad5e4cdc1f3326ab243774a31fc986cc4ab0f27f356459","src/task/yield_now.rs":"d5ebad066fa056c1b4e0bef558e3d17fb354b9c016aa1168010d3fac992a36c5","src/time/clock.rs":"7b4e7ca3fc8a270e5c377a69ff837de6281af96a67a0571b3677b318852596de","src/time/driver/entry.rs":"68a6c6c72f83a4fc7945737a32f13ad461344130d75107bcae0aa6490b83bce8","src/time/driver/handle.rs":"3b4b7c8ddb6543a176422e374131b39dbc0c33e67608f2b6a557cd8e27d6c4a7","src/time/driver/mod.rs":"f7d8c3f9f3866f1fb56aa4177480bf9eecda0258c88ba2c527275ae038995297","src/time/driver/sleep.rs":"c9c3fedcdd29bf3ec64c90a44136536dfab29fc549ca70620d0d33666905c5d7","src/time/driver/tests/mod.rs":"b56e40615bc2a83c1d313256a2a8007e467256bed242eeeaac54e225df6718c4","src/time/driver/wheel/level.rs":"71e1fd8f6e1a9d06e9f703528ffedc3444d62c40ca021074a77185628c9e938c","src/time/driver/wheel/mod.rs":"32e3d8595ade4c632a76d63b2f9a985ae46ed837ca34034e937518b4446c6a53","src/time/driver/wheel/stack.rs":"fe7a1b02bfd45a45801c4674e0603540dd6ff5fdad0a24373dc0ac86e4ec7abe","src/time/error.rs":"5ee6c6780a2a3d319595d34120c7c4aeb6ffe0afa75b9dac8b7c56fac133475f","src/time/instant.rs":"97e61118c22eebecce9ab493975398d5c239836870f7e6948cb390159a44835e","src/time/interval.rs":"a1ffc2788b86afccb4830ad5e7cbb43c82593aceb465eecdcb7a5dbae6301d52","src/time/mod.rs":"e1602cbfa9a93479b580fb1e205751e0551a0233140390dcfe5177b2cca252ee","src/time/tests/mod.rs":"d5a5971423d84c60593baa494e71bec40655266afcd532545d70a680fc014cbc","src/time/tests/test_sleep.rs":"78c97ec7816ef02b89749b0c0384e2bb2f34a3e5f5daa1480729fee91e69bec7","src/time/timeout.rs":"5c6eaaf183e9e0d0af380baee00626222180ffbbdb7cc5e2b8a149dc481fb9fe","src/util/bit.rs":"2032ec48074012ad01f4e66b54c67fbb536497fa7dd86fd888eed51b2589480a","src/util/error.rs":"c04902dadf328eb67faf6dac69f01978c4577b92be0b84bf30935060740e15d8","src/util/linked_list.rs":"5826e0614386c52a1342f28a6000729f10d0150e3cb472ebeefb904d8c06fd1e","src/util/mod.rs":"1a9a123fa8b5f12f629c465f1b30595ab3717d1b1744e76dc829eb4c89b2d540","src/util/pad.rs":"5dc99dbb3d3d16fecd6228fd2e2f67e5301b2d426e6149f79f93c1af1b4d1d90","src/util/rand.rs":"115845c586f0df16d6c49676655431cea90d64b603d79ae74986f2d9a65fe739","src/util/slab.rs":"81d788b796ea9b25ccd2d22dfe77f8bf86922e1ccf13ce7b67d6efbd2f188e8a","src/util/sync_wrapper.rs":"8f1ab76280171c33c0bafaec9c1cb1d48cfb0d19a1ab2b768cdf7d7e40f07d00","src/util/trace.rs":"aa237568a88689f6d2958913df44d7bb887ceee1421ef79c25e38247d069a763","src/util/try_lock.rs":"c4ee49e1751ee0a7df1a8cbd4f8d36ea1d7355e3ac584fdb8697a94cd7a7a8f8","src/util/vec_deque_cell.rs":"5dd8cd70a3518c6261850652b260fbf21615c7743894df45b0fb53980f836503","src/util/wake.rs":"bfc64364d4ba0d7348897c86ec1b847902ce7969cb7638cd32133a2bc6489bb4","src/util/wake_list.rs":"c3443e695fd0b5c41c06d66cab96549064e9b645043559d01f82f365dcc4ff6a","tests/_require_full.rs":"a7d828d85aee8507a0292fe74ced5f4e75b0aaf3a2789cf0bddd276e9fa12dca","tests/async_send_sync.rs":"01aecf6ddc7d6187e200cb133d49d5fb2e65bc7fd5c4840b57cee1e66d997810","tests/buffered.rs":"3ca857823d8073fecd4175dcb886558a3c6f3aec81803a90c5f786fc3edb4a96","tests/fs.rs":"b4902aaff2c28ef4d2676462381b04559fb4f7cdc0ecf46c46bccbb6276feb5d","tests/fs_copy.rs":"83448b19bdc332ec315024d4903b0a2ae81221895725a8b750025b47a43b0e79","tests/fs_dir.rs":"d9a837aacc072620c621e7e9799261b44873feea51cc6d25770bd3ff93abac00","tests/fs_file.rs":"aa6e863525f754f6598f023cd6bac23c53763c85e137c9a6dd27f5fc2c3bb296","tests/fs_link.rs":"01689c5c69aaa33543399164e2036ed96ae6e09b006c8dbe8af59df8c63df47e","tests/io_async_fd.rs":"ed56435564501e1cadd284f180dddfbd747df72e74c4b7b7a77bc166383bab04","tests/io_async_read.rs":"a590efe9bb01986f067118640a3b55f6760186e554f8e8f2404231d4e96f61b9","tests/io_buf_reader.rs":"f5a322dea6fe9f40c18a085a865919c1bbfe8653203b37d1e18b77d259c6211d","tests/io_buf_writer.rs":"4327940f81c0591e5c7b4a2583af1d42169c9427bcdeb88327d9a351f02d43fb","tests/io_chain.rs":"f5d3ddc9f6e8152ceb08b5dda2ca3168b174f1f67ff28a4c5983bcbad69d8af6","tests/io_copy.rs":"0683dee400710c1696a6634ecee64c39e7027344e66bfdd6b2a78de8ca913555","tests/io_copy_bidirectional.rs":"8ec51c37395f273de8ace88e7203ce78af2c4acf00b33fd968239a644d28a8cc","tests/io_driver.rs":"76db3259c69f66ac07e5b8bcdb1e2e46d42e06e202831d8ccbee835b2dfc9714","tests/io_driver_drop.rs":"31e7002a20ab65b6a91904b4784047bdf17b8cfa134edef04b394430a43573eb","tests/io_fill_buf.rs":"a520725811d266e8833dbfb62999d4a32ad8aefc6403e12a51f8b0fd62530436","tests/io_lines.rs":"f5b1599ffff44819e269519ff0a08635ea1c5d7c541293e63ee33d98f25f0e3b","tests/io_mem_stream.rs":"d1a9397ddecace3172021c212637a3644be6a6ea366fd1fc36dbcf04b485c156","tests/io_read.rs":"528a2146495c53b271af460c0dcba28d54cc71821811002a7f8de213b4cbb385","tests/io_read_buf.rs":"3c1a7820fc5e486fe34c6fb61b3e1bf8d18587790a4897a732f325bdd438721d","tests/io_read_exact.rs":"b6387dbeb0baceb7a1f74a9a3a8b4a654894465368be27c3bbf4352b79fc4314","tests/io_read_line.rs":"8296624b4f5e162c79024f3beab2f561f4195a244cfd4c53e4d06282f56a31bf","tests/io_read_to_end.rs":"b5478431bf61dd66cedeb8e0ef588ed8ecd6d9e0feea3655512019b4abe9d451","tests/io_read_to_string.rs":"c9ebfee5cb262d822119c2881ea1cc0c73598b13c517c297663e35bb120a089d","tests/io_read_until.rs":"b6c0df9e4852766910ec68affcd92fbfbc280018b7f9c16cf5f4830f9b8389f0","tests/io_split.rs":"b1253c9f3e733e6bd1b6e7e4a1515606902992e15e57c8dd2ef28ccfcb7618d5","tests/io_take.rs":"8f4bfc9182539335704b6370a66998ef2a75f508fcdb73a7f8aa50baf0f4aea6","tests/io_write.rs":"98668a8c8feae0f85714df1dfecfcd94fba4ba347bdc3d8aaa4ea8b175055c69","tests/io_write_all.rs":"e171af1ecab45a439b384c3bae7198959c3f5e2e998967dbd9296760b52951b7","tests/io_write_all_buf.rs":"2c037f07ac464eaa4e0b87e4e4968b28a0f2f1b1d1e218546c9d5dac7a75d145","tests/io_write_buf.rs":"331d3b54c7664386bb87585f39910d1fe31bfbdfa012a2dc2120e535dcdac329","tests/io_write_int.rs":"3f4b50345f7d7d558e71ac7f2a8c1c4b7b771dad09fe2e1fbf9a17d4fb93c001","tests/macros_join.rs":"107e8b96a8654ed1e3ec1d9c7f41f44f2542f802c6324e993f0fbd6679912d87","tests/macros_pin.rs":"572d65b3894858ad8c2491b6a5f8ffdb3b37ec71d2996831b2ad929c4e47d067","tests/macros_select.rs":"23f03bc75f6dbb2f6ce0705239dc766020fc5cb2c11bc3eac1281c38df3f9494","tests/macros_test.rs":"48b8fe17512a6a10d5e285c00285370e576919ec5299afb0f3929e6798d10a8d","tests/macros_try_join.rs":"3b60eacc2afa5d39a2e447e96d5ae2d4bf0ea71e213a249bc0db3b8d234a80a1","tests/named_pipe.rs":"fba6c0d454a78ff938056d1573f07ebcf1844de386f7331c6750681ce16feeca","tests/net_bind_resource.rs":"3abdf9457ebc9f8262c03fa5834f1ceb6312d4a1573b6bdd4e2f584e3cf76b66","tests/net_lookup_host.rs":"fa43c0127277dd0cf750b17157fdc1d438a8009dd890458f9c566b3a1302a461","tests/no_rt.rs":"5f8f611b369e016dfdee970fd64462167dfd7c1861ddac9ec00aba665694a872","tests/process_arg0.rs":"785d801cf281230e3208512820e7d71b4d8362b8cf33fc72235da370e10983a8","tests/process_issue_2174.rs":"66c56d8dfda4e1723928da713dddea8d15774d6730398effadf0ec28f4c6f1e1","tests/process_issue_42.rs":"26043f8246b00046137551f7a9f638652c70f527f10b4d91e4286643120ca41d","tests/process_kill_on_drop.rs":"56d908ccead7fd23d1f73976524cbd0b0f05806d342818095f2c6803469cc3ad","tests/process_raw_handle.rs":"54498de544b61e95d75bf6e92779fbd9b805a434ffcd1ea18496a1c5cd7c7522","tests/process_smoke.rs":"3554f4a8c8b76ec0a3b79f4ae0b5900edd34255dd3adc561e8e9a77f217b1956","tests/rt_basic.rs":"5abc8c04e707f7145168cd48cbadb26d174b619d10974302b2865c7e8a7901dd","tests/rt_common.rs":"f09915824604a33c8e21098c84c648ec09cf4e26ccb3a8e43fda7f58df10f31b","tests/rt_handle_block_on.rs":"858d9a6a1eae28ff2d59c5f4c52d1b21eb7e2996b0f909dcaed11e525443d2dc","tests/rt_threaded.rs":"e6eaf2ae368940446b0dfd4ed0c8af524d45722b77a9941f3d120179391c0a84","tests/signal_ctrl_c.rs":"9b53065781b37f3db5f7c67938239b0f3b0ebbc5938c14a5b730ad7ec07415d2","tests/signal_drop_recv.rs":"d1ec97213d9c6fd9fb25ea8c2b015c9e9ee1a62fe0853fc558bc8801e5a3a841","tests/signal_drop_rt.rs":"f968c1154262a4427b5aad2d9fb36d3b7d47084312d0b5527a8eb3d589381d8b","tests/signal_drop_signal.rs":"041940550863250f359630dc67ef133874d809ddaf0a6c1238cee1565a19efec","tests/signal_multi_rt.rs":"a1c50c25f4707fda7665da61b3317dd61fc32c63c61db2bbdb56065bd9c591ce","tests/signal_no_rt.rs":"99714bf488a26b6b394d93e61639c4b6807f9d756c8d5836f31111a30d42609b","tests/signal_notify_both.rs":"bf0b9def20f530d146ee865305833d8e9bee07a0515e66573d7ff30e2c631123","tests/signal_twice.rs":"bce33093eed151955d13c334d6d8a5bc5ca67cf5b37c246e435a24c15bc166a0","tests/signal_usr1.rs":"86ad07594b09d35e71011d1e12a1fa2c477bfbc4a2a36df1421b6594a0930074","tests/support/io_vec.rs":"9b3001e120138ead4a63720019c669ff00f8455a74dea2fb231633b3b58c9b09","tests/support/mpsc_stream.rs":"00d48122fa2ccbf1fe0b110ce3cf22590eda54b3ddec0134b1f9376eb1169645","tests/support/signal.rs":"83531afa2e8e71cfd90cd4e1fc821490ffa824f0f9f0c9c4a027c08fed6b8712","tests/sync_barrier.rs":"7771f9e75ecf24d1a8ff0a8731a6bfced34cc129aba0e6f7b9b73d6a1d6df999","tests/sync_broadcast.rs":"c30999b68cd763592abed2b0a6b25407b3362f5c7b9521d766c5ad8fd1e94f37","tests/sync_errors.rs":"d75d041f946ef8b0a726f4fcb3da29d7248485b5a28f0fd68adcffadd8852549","tests/sync_mpsc.rs":"1aadd1f6fb9cf84c821de9553b5e659cc90033699bb72f7f586e8e091e76fbcb","tests/sync_mutex.rs":"ee69e10e779effd59339f39fe739848c87d6440723ce7e5666df772f9e755970","tests/sync_mutex_owned.rs":"76e339388f5d288fad70f384bc35ea74dea2fa233de39ea164bd4ca3b611d5f4","tests/sync_notify.rs":"022e6ac31214bfbf8cccbd8f9d12811818889dfe9744059346eddc44e8f0691e","tests/sync_once_cell.rs":"639d55248775f2cba0709919a3b2ff4317e70f081e09444d0a67791d65dfb3fa","tests/sync_oneshot.rs":"f6074fe14f6143dc82986847d8886bdc6631c79e532a74aadc6934db25742190","tests/sync_rwlock.rs":"145d5ac0750df83523b252c8f58857a6cc5fc190ad965a2fdf2d52d11ec49fab","tests/sync_semaphore.rs":"f0613025f27c78ec86af1ed86bbd3085423babaf682b8a3f53baded758dcef8e","tests/sync_semaphore_owned.rs":"6d746b7caa4a5894d15c600659f7c10e078c2189e670d00b89474765900c2270","tests/sync_watch.rs":"09216b5e6f101a2a46a9913c3966771191c896c9b89a5f0b532f8da4b9b316d1","tests/task_abort.rs":"a12920188752719d557a77c96586b1ef5917c424eb2b1237f90e017f01d51e25","tests/task_blocking.rs":"241574dfc0793008f80d64c3f6da64842fd1d46cc88964b59380e6796e0b116b","tests/task_builder.rs":"9f0212ae4d7071f2e491effca992ed8884b2ef2e3493a6d7ee3fa659cc926338","tests/task_local.rs":"c42b99a64a3e195bed08c3065f179bf20d9fd15e02c42cb54b9bac7e1e60319e","tests/task_local_set.rs":"dfeb90355de7ffd59aa567bbae5539f859b55d64255e6c71785118364c9da8d3","tests/tcp_accept.rs":"a17b374e8bf590633d5c3ba434ca0a8545ad96d8c01e140bb8418be968bd8cc1","tests/tcp_connect.rs":"3e457719e2ecc877090e039465d492706c9d0318f483c70fc325866ef84108f5","tests/tcp_echo.rs":"68d67368f1d9f9dffbaa9fb1a0ef71e4f3700a76aa5a2c3714c8cf7aedb0f1bc","tests/tcp_into_split.rs":"9636970f8450139462d7b88a4994ffb6c4d77c92f89750ad9a479ee70b0ed5ce","tests/tcp_into_std.rs":"9fab18181788d46e787e87fcdbbb2d1a24c1a60bbe8bcb1bb1e63cf43326c643","tests/tcp_peek.rs":"ea904d05f9684e6108a698bdbbd856c9849c1a51eb334cf5bd45ef74c8fe585c","tests/tcp_shutdown.rs":"68f3a5b9d166064f63819a53bd07bd1c0988c1c84832ac4a35ac9b1ad6f447f4","tests/tcp_socket.rs":"92a1bc2920d678f27ccb796367ec3c2b81494de287a8d5f7a5cc6e967d3dce07","tests/tcp_split.rs":"e967b01bb90e2081e5e08e8cfd619cbaf0d1dcd08c4e77dbd5bae893698cae85","tests/tcp_stream.rs":"0b597cfb53d00e2af278b64d74b7de6a1436b36b3a9a4966de3976c52d6f37e1","tests/test_clock.rs":"d5c9bf7bb5d926e2b29b43e47b5bb051b0f761bfe44d5fef349ed442ea7b416f","tests/time_interval.rs":"ea31a95eb0a422e76ea1c97e58f11ec79c2bf209ecfda78bc9db65f6b2154668","tests/time_pause.rs":"aadbea51adba2f437bffb3a01f444e634f629651b1bdd89134354e5ae4782ba8","tests/time_rt.rs":"2981f4a4c276b306c4d4bf5684bafbaffb0789ce7bf8d2db3556e5208bab52df","tests/time_sleep.rs":"dfbf5f7f53d8f1abadc2b6b15eb2893638a845d491d116251224a738df901540","tests/time_timeout.rs":"60d13e4647254849fb1535b12645b108fefa4248cee3990d871e3776ed1df207","tests/udp.rs":"627f8e4f8fff980e31d3a0e9a6c1917d2bbbd681383a90ba64e28edce5bbf549","tests/uds_cred.rs":"146c6e9bdbb82a268f178b03575f94a40db81ef67a740dd16ead5b9e4a447f1b","tests/uds_datagram.rs":"8a3b3e5d00b69d31f9492dc17598e511c7b00301420d69ad68a1ecdf3d00df4a","tests/uds_split.rs":"79d54d6ce35e5d15138299091871ecbdb6492ae6863fe406021fd7359f1ed7fd","tests/uds_stream.rs":"d672ed046b6e6ad9e2fd118be91c788680972e3f5271e91857f29c2e25d1b9d8"},"package":"b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,11 +13,11 @@
 [package]
 edition = "2018"
 name = "tokio"
-version = "0.2.24"
+version = "1.11.0"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 description = "An event-driven, non-blocking I/O platform for writing asynchronous I/O\nbacked applications.\n"
 homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio/0.2.24/tokio/"
+documentation = "https://docs.rs/tokio/1.11.0/tokio/"
 readme = "README.md"
 keywords = ["io", "async", "non-blocking", "futures"]
 categories = ["asynchronous", "network-programming"]
@@ -28,24 +28,9 @@
 rustdoc-args = ["--cfg", "docsrs"]
 
 [package.metadata.playground]
-features = ["full"]
+features = ["full", "test-util"]
 [dependencies.bytes]
-version = "0.5.0"
-
-[dependencies.fnv]
-version = "1.0.6"
-optional = true
-
-[dependencies.futures-core]
-version = "0.3.0"
-optional = true
-
-[dependencies.iovec]
-version = "0.1.4"
-optional = true
-
-[dependencies.lazy_static]
-version = "1.4.0"
+version = "1.0.0"
 optional = true
 
 [dependencies.memchr]
@@ -53,91 +38,96 @@
 optional = true
 
 [dependencies.mio]
-version = "0.6.20"
+version = "0.7.6"
 optional = true
 
 [dependencies.num_cpus]
 version = "1.8.0"
 optional = true
 
+[dependencies.once_cell]
+version = "1.5.2"
+optional = true
+
 [dependencies.parking_lot]
 version = "0.11.0"
 optional = true
 
 [dependencies.pin-project-lite]
-version = "0.1.1"
-
-[dependencies.slab]
-version = "0.4.2"
-optional = true
+version = "0.2.0"
 
 [dependencies.tokio-macros]
-version = "0.2.6"
+version = "1.1.0"
 optional = true
+[dev-dependencies.async-stream]
+version = "0.3"
 
-[dependencies.tracing]
-version = "0.1.16"
-features = ["std"]
-optional = true
-default-features = false
 [dev-dependencies.futures]
 version = "0.3.0"
 features = ["async-await"]
 
-[dev-dependencies.futures-test]
-version = "0.3.0"
+[dev-dependencies.mockall]
+version = "0.10.2"
 
 [dev-dependencies.proptest]
-version = "0.9.4"
+version = "1"
+
+[dev-dependencies.rand]
+version = "0.8.0"
+
+[dev-dependencies.socket2]
+version = "0.4"
 
 [dev-dependencies.tempfile]
 version = "3.1.0"
 
+[dev-dependencies.tokio-stream]
+version = "0.1"
+
 [dev-dependencies.tokio-test]
-version = "0.2.0"
+version = "0.4.0"
+[build-dependencies.autocfg]
+version = "1"
 
 [features]
-blocking = ["rt-core"]
 default = []
-dns = ["rt-core"]
-fs = ["rt-core", "io-util"]
-full = ["blocking", "dns", "fs", "io-driver", "io-util", "io-std", "macros", "net", "process", "rt-core", "rt-util", "rt-threaded", "signal", "stream", "sync", "time"]
-io-driver = ["mio", "lazy_static"]
-io-std = ["rt-core"]
-io-util = ["memchr"]
+fs = []
+full = ["fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "sync", "time"]
+io-std = []
+io-util = ["memchr", "bytes"]
 macros = ["tokio-macros"]
-net = ["dns", "tcp", "udp", "uds"]
-process = ["io-driver", "libc", "mio-named-pipes", "signal", "winapi/consoleapi", "winapi/minwindef", "winapi/threadpoollegacyapiset", "winapi/winerror"]
-rt-core = ["slab"]
-rt-threaded = ["num_cpus", "rt-core"]
-rt-util = []
-signal = ["io-driver", "lazy_static", "libc", "mio-uds", "signal-hook-registry", "winapi/consoleapi", "winapi/minwindef"]
-stream = ["futures-core"]
-sync = ["fnv"]
-tcp = ["io-driver", "iovec"]
-test-util = []
-time = ["slab"]
-udp = ["io-driver"]
-uds = ["io-driver", "mio-uds", "libc"]
+net = ["libc", "mio/os-poll", "mio/os-util", "mio/tcp", "mio/udp", "mio/uds", "winapi/namedpipeapi"]
+process = ["bytes", "once_cell", "libc", "mio/os-poll", "mio/os-util", "mio/uds", "signal-hook-registry", "winapi/threadpoollegacyapiset"]
+rt = []
+rt-multi-thread = ["num_cpus", "rt"]
+signal = ["once_cell", "libc", "mio/os-poll", "mio/uds", "mio/os-util", "signal-hook-registry", "winapi/consoleapi"]
+stats = []
+sync = []
+test-util = ["rt", "sync", "time"]
+time = []
 [target."cfg(loom)".dev-dependencies.loom]
-version = "0.3.5"
+version = "0.5"
 features = ["futures", "checkpoint"]
+[target."cfg(tokio_unstable)".dependencies.tracing]
+version = "0.1.21"
+features = ["std"]
+optional = true
+default-features = false
 [target."cfg(unix)".dependencies.libc]
 version = "0.2.42"
 optional = true
 
-[target."cfg(unix)".dependencies.mio-uds]
-version = "0.6.5"
-optional = true
-
 [target."cfg(unix)".dependencies.signal-hook-registry]
 version = "1.1.1"
 optional = true
-[target."cfg(windows)".dependencies.mio-named-pipes]
-version = "0.1.6"
-optional = true
+[target."cfg(unix)".dev-dependencies.libc]
+version = "0.2.42"
 
+[target."cfg(unix)".dev-dependencies.nix]
+version = "0.22.0"
 [target."cfg(windows)".dependencies.winapi]
 version = "0.3.8"
 optional = true
 default-features = false
+[target."cfg(windows)".dev-dependencies.ntapi]
+version = "0.3.6"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,122 +1,1047 @@
-# 0.2.24 (December 7, 2020)
+# 1.11.0 (August 31, 2021)
 
-### Fixes
+### Fixed
+
+ - time: don't panic when Instant is not monotonic ([#4044])
+ - io: fix panic in `fill_buf` by not calling `poll_fill_buf` twice ([#4084])
+
+### Added
+
+ - watch: add `watch::Sender::subscribe` ([#3800])
+ - process: add `from_std` to `ChildStd*` ([#4045])
+ - stats: initial work on runtime stats ([#4043])
+
+### Changed
+
+ - tracing: change span naming to new console convention ([#4042])
+ - io: speed-up waking by using uninitialized array ([#4055], [#4071], [#4075])
+
+### Documented
+
+ - time: make Sleep examples easier to find ([#4040])
+
+[#3800]: https://github.com/tokio-rs/tokio/pull/3800
+[#4040]: https://github.com/tokio-rs/tokio/pull/4040
+[#4042]: https://github.com/tokio-rs/tokio/pull/4042
+[#4043]: https://github.com/tokio-rs/tokio/pull/4043
+[#4044]: https://github.com/tokio-rs/tokio/pull/4044
+[#4045]: https://github.com/tokio-rs/tokio/pull/4045
+[#4055]: https://github.com/tokio-rs/tokio/pull/4055
+[#4071]: https://github.com/tokio-rs/tokio/pull/4071
+[#4075]: https://github.com/tokio-rs/tokio/pull/4075
+[#4084]: https://github.com/tokio-rs/tokio/pull/4084
+
+# 1.10.1 (August 24, 2021)
+
+### Fixed
+
+ - runtime: fix leak in UnownedTask ([#4063])
+
+[#4063]: https://github.com/tokio-rs/tokio/pull/4063
+
+# 1.10.0 (August 12, 2021)
+
+### Added
+
+ - io: add `(read|write)_f(32|64)[_le]` methods ([#4022])
+ - io: add `fill_buf` and `consume` to `AsyncBufReadExt` ([#3991])
+ - process: add `Child::raw_handle()` on windows ([#3998])
+
+### Fixed
+
+ - doc: fix non-doc builds with `--cfg docsrs` ([#4020])
+ - io: flush eagerly in `io::copy` ([#4001])
+ - runtime: a debug assert was sometimes triggered during shutdown ([#4005])
+ - sync: use `spin_loop_hint` instead of `yield_now` in mpsc ([#4037])
+ - tokio: the test-util feature depends on rt, sync, and time ([#4036])
+
+### Changes
+
+ - runtime: reorganize parts of the runtime ([#3979], [#4005])
+ - signal: make windows docs for signal module show up on unix builds ([#3770])
+ - task: quickly send task to heap on debug mode ([#4009])
+
+### Documented
+
+ - io: document cancellation safety of `AsyncBufReadExt` ([#3997])
+ - sync: document when `watch::send` fails ([#4021])
+
+[#3770]: https://github.com/tokio-rs/tokio/pull/3770
+[#3979]: https://github.com/tokio-rs/tokio/pull/3979
+[#3991]: https://github.com/tokio-rs/tokio/pull/3991
+[#3997]: https://github.com/tokio-rs/tokio/pull/3997
+[#3998]: https://github.com/tokio-rs/tokio/pull/3998
+[#4001]: https://github.com/tokio-rs/tokio/pull/4001
+[#4005]: https://github.com/tokio-rs/tokio/pull/4005
+[#4009]: https://github.com/tokio-rs/tokio/pull/4009
+[#4020]: https://github.com/tokio-rs/tokio/pull/4020
+[#4021]: https://github.com/tokio-rs/tokio/pull/4021
+[#4022]: https://github.com/tokio-rs/tokio/pull/4022
+[#4036]: https://github.com/tokio-rs/tokio/pull/4036
+[#4037]: https://github.com/tokio-rs/tokio/pull/4037
+
+# 1.9.0 (July 22, 2021)
+
+### Added
+
+ - net: allow customized I/O operations for `TcpStream` ([#3888])
+ - sync: add getter for the mutex from a guard ([#3928])
+ - task: expose nameable future for `TaskLocal::scope` ([#3273])
+
+### Fixed
+
+ - Fix leak if output of future panics on drop ([#3967])
+ - Fix leak in `LocalSet` ([#3978])
+
+### Changes
+
+ - runtime: reorganize parts of the runtime ([#3909], [#3939], [#3950], [#3955], [#3980])
+ - sync: clean up `OnceCell` ([#3945])
+ - task: remove mutex in `JoinError` ([#3959])
+
+[#3273]: https://github.com/tokio-rs/tokio/pull/3273
+[#3888]: https://github.com/tokio-rs/tokio/pull/3888
+[#3909]: https://github.com/tokio-rs/tokio/pull/3909
+[#3928]: https://github.com/tokio-rs/tokio/pull/3928
+[#3934]: https://github.com/tokio-rs/tokio/pull/3934
+[#3939]: https://github.com/tokio-rs/tokio/pull/3939
+[#3945]: https://github.com/tokio-rs/tokio/pull/3945
+[#3950]: https://github.com/tokio-rs/tokio/pull/3950
+[#3955]: https://github.com/tokio-rs/tokio/pull/3955
+[#3959]: https://github.com/tokio-rs/tokio/pull/3959
+[#3967]: https://github.com/tokio-rs/tokio/pull/3967
+[#3978]: https://github.com/tokio-rs/tokio/pull/3978
+[#3980]: https://github.com/tokio-rs/tokio/pull/3980
+
+# 1.8.3 (July 26, 2021)
+
+This release backports two fixes from 1.9.0
+
+### Fixed
+
+ - Fix leak if output of future panics on drop ([#3967])
+ - Fix leak in `LocalSet` ([#3978])
+
+[#3967]: https://github.com/tokio-rs/tokio/pull/3967
+[#3978]: https://github.com/tokio-rs/tokio/pull/3978
+
+# 1.8.2 (July 19, 2021)
+
+Fixes a missed edge case from 1.8.1.
+
+### Fixed
+
+- runtime: drop canceled future on next poll (#3965)
+
+# 1.8.1 (July 6, 2021)
+
+Forward ports 1.5.1 fixes.
+
+### Fixed
+
+- runtime: remotely abort tasks on `JoinHandle::abort` ([#3934])
+
+[#3934]: https://github.com/tokio-rs/tokio/pull/3934
+
+# 1.8.0 (July 2, 2021)
+
+### Added
+
+- io: add `get_{ref,mut}` methods to `AsyncFdReadyGuard` and `AsyncFdReadyMutGuard` ([#3807])
+- io: efficient implementation of vectored writes for `BufWriter` ([#3163])
+- net: add ready/try methods to `NamedPipe{Client,Server}` ([#3866], [#3899])
+- sync: add `watch::Receiver::borrow_and_update` ([#3813])
+- sync: implement `From<T>` for `OnceCell<T>` ([#3877])
+- time: allow users to specify Interval behaviour when delayed ([#3721])
+
+### Added (unstable)
+
+- rt: add `tokio::task::Builder` ([#3881])
+
+### Fixed
+
+- net: handle HUP event with `UnixStream` ([#3898])
+
+### Documented
+
+- doc: document cancellation safety ([#3900])
+- time: add wait alias to sleep ([#3897])
+- time: document auto-advancing behaviour of runtime ([#3763])
+
+[#3163]: https://github.com/tokio-rs/tokio/pull/3163
+[#3721]: https://github.com/tokio-rs/tokio/pull/3721
+[#3763]: https://github.com/tokio-rs/tokio/pull/3763
+[#3807]: https://github.com/tokio-rs/tokio/pull/3807
+[#3813]: https://github.com/tokio-rs/tokio/pull/3813
+[#3866]: https://github.com/tokio-rs/tokio/pull/3866
+[#3877]: https://github.com/tokio-rs/tokio/pull/3877
+[#3881]: https://github.com/tokio-rs/tokio/pull/3881
+[#3897]: https://github.com/tokio-rs/tokio/pull/3897
+[#3898]: https://github.com/tokio-rs/tokio/pull/3898
+[#3899]: https://github.com/tokio-rs/tokio/pull/3899
+[#3900]: https://github.com/tokio-rs/tokio/pull/3900
+
+# 1.7.2 (July 6, 2021)
+
+Forward ports 1.5.1 fixes.
+
+### Fixed
+
+- runtime: remotely abort tasks on `JoinHandle::abort` ([#3934])
+
+[#3934]: https://github.com/tokio-rs/tokio/pull/3934
+
+# 1.7.1 (June 18, 2021)
+
+### Fixed
+
+- runtime: fix early task shutdown during runtime shutdown ([#3870])
+
+[#3870]: https://github.com/tokio-rs/tokio/pull/3870
 
- - sync: fix mpsc bug related to closing the channel (#3215)
+# 1.7.0 (June 15, 2021)
 
-# 0.2.23 (November 12, 2020)
+### Added
+
+- net: add named pipes on windows ([#3760])
+- net: add `TcpSocket` from `std::net::TcpStream` conversion ([#3838])
+- sync: add `receiver_count` to `watch::Sender` ([#3729])
+- sync: export `sync::notify::Notified` future publicly ([#3840])
+- tracing: instrument task wakers ([#3836])
+
+### Fixed
+
+- macros: suppress `clippy::default_numeric_fallback` lint in generated code ([#3831])
+- runtime: immediately drop new tasks when runtime is shut down ([#3752])
+- sync: deprecate unused `mpsc::RecvError` type ([#3833])
+
+### Documented
+
+- io: clarify EOF condition for `AsyncReadExt::read_buf` ([#3850])
+- io: clarify limits on return values of `AsyncWrite::poll_write` ([#3820])
+- sync: add examples to Semaphore ([#3808])
+
+[#3729]: https://github.com/tokio-rs/tokio/pull/3729
+[#3752]: https://github.com/tokio-rs/tokio/pull/3752
+[#3760]: https://github.com/tokio-rs/tokio/pull/3760
+[#3808]: https://github.com/tokio-rs/tokio/pull/3808
+[#3820]: https://github.com/tokio-rs/tokio/pull/3820
+[#3831]: https://github.com/tokio-rs/tokio/pull/3831
+[#3833]: https://github.com/tokio-rs/tokio/pull/3833
+[#3836]: https://github.com/tokio-rs/tokio/pull/3836
+[#3838]: https://github.com/tokio-rs/tokio/pull/3838
+[#3840]: https://github.com/tokio-rs/tokio/pull/3840
+[#3850]: https://github.com/tokio-rs/tokio/pull/3850
+
+# 1.6.3 (July 6, 2021)
+
+Forward ports 1.5.1 fixes.
+
+### Fixed
+
+- runtime: remotely abort tasks on `JoinHandle::abort` ([#3934])
+
+[#3934]: https://github.com/tokio-rs/tokio/pull/3934
+
+# 1.6.2 (June 14, 2021)
 
 ### Fixes
 
- - time: report correct error for timers that exceed max duration (#2023)
- - time: fix resetting expired timers causing panics (#2587)
- - macros: silence `unreachable_code` warning in `select!` (#2678)
- - rt: fix potential leak during runtime shutdown (#2649)
- - sync: fix missing notification during mpsc close (#2854)
+- test: sub-ms `time:advance` regression introduced in 1.6 ([#3852])
+
+[#3852]: https://github.com/tokio-rs/tokio/pull/3852
+
+# 1.6.1 (May 28, 2021)
+
+This release reverts [#3518] because it doesn't work on some kernels due to
+a kernel bug. ([#3803])
+
+[#3518]: https://github.com/tokio-rs/tokio/issues/3518
+[#3803]: https://github.com/tokio-rs/tokio/issues/3803
+
+# 1.6.0 (May 14, 2021)
+
+### Added
+
+- fs: try doing a non-blocking read before punting to the threadpool ([#3518])
+- io: add `write_all_buf` to `AsyncWriteExt` ([#3737])
+- io: implement `AsyncSeek` for `BufReader`, `BufWriter`, and `BufStream` ([#3491])
+- net: support non-blocking vectored I/O ([#3761])
+- sync: add `mpsc::Sender::{reserve_owned, try_reserve_owned}` ([#3704])
+- sync: add a `MutexGuard::map` method that returns a `MappedMutexGuard` ([#2472])
+- time: add getter for Interval's period ([#3705])
+
+### Fixed
+
+- io: wake pending writers on `DuplexStream` close ([#3756])
+- process: avoid redundant effort to reap orphan processes ([#3743])
+- signal: use `std::os::raw::c_int` instead of `libc::c_int` on public API ([#3774])
+- sync: preserve permit state in `notify_waiters` ([#3660])
+- task: update `JoinHandle` panic message ([#3727])
+- time: prevent `time::advance` from going too far ([#3712])
+
+### Documented
+
+- net: hide `net::unix::datagram` module from docs ([#3775])
+- process: updated example ([#3748])
+- sync: `Barrier` doc should use task, not thread ([#3780])
+- task: update documentation on `block_in_place` ([#3753])
+
+[#2472]: https://github.com/tokio-rs/tokio/pull/2472
+[#3491]: https://github.com/tokio-rs/tokio/pull/3491
+[#3518]: https://github.com/tokio-rs/tokio/pull/3518
+[#3660]: https://github.com/tokio-rs/tokio/pull/3660
+[#3704]: https://github.com/tokio-rs/tokio/pull/3704
+[#3705]: https://github.com/tokio-rs/tokio/pull/3705
+[#3712]: https://github.com/tokio-rs/tokio/pull/3712
+[#3727]: https://github.com/tokio-rs/tokio/pull/3727
+[#3737]: https://github.com/tokio-rs/tokio/pull/3737
+[#3743]: https://github.com/tokio-rs/tokio/pull/3743
+[#3748]: https://github.com/tokio-rs/tokio/pull/3748
+[#3753]: https://github.com/tokio-rs/tokio/pull/3753
+[#3756]: https://github.com/tokio-rs/tokio/pull/3756
+[#3761]: https://github.com/tokio-rs/tokio/pull/3761
+[#3774]: https://github.com/tokio-rs/tokio/pull/3774
+[#3775]: https://github.com/tokio-rs/tokio/pull/3775
+[#3780]: https://github.com/tokio-rs/tokio/pull/3780
+
+# 1.5.1 (July 6, 2021)
+
+### Fixed
+
+- runtime: remotely abort tasks on `JoinHandle::abort` ([#3934])
+
+[#3934]: https://github.com/tokio-rs/tokio/pull/3934
+
+# 1.5.0 (April 12, 2021)
+
+### Added
+
+- io: add `AsyncSeekExt::stream_position` ([#3650])
+- io: add `AsyncWriteExt::write_vectored` ([#3678])
+- io: add a `copy_bidirectional` utility ([#3572])
+- net: implement `IntoRawFd` for `TcpSocket` ([#3684])
+- sync: add `OnceCell` ([#3591])
+- sync: add `OwnedRwLockReadGuard` and `OwnedRwLockWriteGuard` ([#3340])
+- sync: add `Semaphore::is_closed` ([#3673])
+- sync: add `mpsc::Sender::capacity` ([#3690])
+- sync: allow configuring `RwLock` max reads ([#3644])
+- task: add `sync_scope` for `LocalKey` ([#3612])
+
+### Fixed
+
+- chore: try to avoid `noalias` attributes on intrusive linked list ([#3654])
+- rt: fix panic in `JoinHandle::abort()` when called from other threads ([#3672])
+- sync: don't panic in `oneshot::try_recv` ([#3674])
+- sync: fix notifications getting dropped on receiver drop ([#3652])
+- sync: fix `Semaphore` permit overflow calculation ([#3644])
+
+### Documented
+
+- io: clarify requirements of `AsyncFd` ([#3635])
+- runtime: fix unclear docs for `{Handle,Runtime}::block_on` ([#3628])
+- sync: document that `Semaphore` is fair ([#3693])
+- sync: improve doc on blocking mutex ([#3645])
+
+[#3340]: https://github.com/tokio-rs/tokio/pull/3340
+[#3572]: https://github.com/tokio-rs/tokio/pull/3572
+[#3591]: https://github.com/tokio-rs/tokio/pull/3591
+[#3612]: https://github.com/tokio-rs/tokio/pull/3612
+[#3628]: https://github.com/tokio-rs/tokio/pull/3628
+[#3635]: https://github.com/tokio-rs/tokio/pull/3635
+[#3644]: https://github.com/tokio-rs/tokio/pull/3644
+[#3645]: https://github.com/tokio-rs/tokio/pull/3645
+[#3650]: https://github.com/tokio-rs/tokio/pull/3650
+[#3652]: https://github.com/tokio-rs/tokio/pull/3652
+[#3654]: https://github.com/tokio-rs/tokio/pull/3654
+[#3672]: https://github.com/tokio-rs/tokio/pull/3672
+[#3673]: https://github.com/tokio-rs/tokio/pull/3673
+[#3674]: https://github.com/tokio-rs/tokio/pull/3674
+[#3678]: https://github.com/tokio-rs/tokio/pull/3678
+[#3684]: https://github.com/tokio-rs/tokio/pull/3684
+[#3690]: https://github.com/tokio-rs/tokio/pull/3690
+[#3693]: https://github.com/tokio-rs/tokio/pull/3693
+
+# 1.4.0 (March 20, 2021)
+
+### Added
+
+- macros: introduce biased argument for `select!` ([#3603])
+- runtime: add `Handle::block_on` ([#3569])
+
+### Fixed
+
+- runtime: avoid unnecessary polling of `block_on` future ([#3582])
+- runtime: fix memory leak/growth when creating many runtimes ([#3564])
+- runtime: mark `EnterGuard` with `must_use` ([#3609])
+
+### Documented
+
+- chore: mention fix for building docs in contributing guide ([#3618])
+- doc: add link to `PollSender` ([#3613])
+- doc: alias sleep to delay ([#3604])
+- sync: improve `Mutex` FIFO explanation ([#3615])
+- timer: fix double newline in module docs ([#3617])
+
+[#3564]: https://github.com/tokio-rs/tokio/pull/3564
+[#3613]: https://github.com/tokio-rs/tokio/pull/3613
+[#3618]: https://github.com/tokio-rs/tokio/pull/3618
+[#3617]: https://github.com/tokio-rs/tokio/pull/3617
+[#3582]: https://github.com/tokio-rs/tokio/pull/3582
+[#3615]: https://github.com/tokio-rs/tokio/pull/3615
+[#3603]: https://github.com/tokio-rs/tokio/pull/3603
+[#3609]: https://github.com/tokio-rs/tokio/pull/3609
+[#3604]: https://github.com/tokio-rs/tokio/pull/3604
+[#3569]: https://github.com/tokio-rs/tokio/pull/3569
+
+# 1.3.0 (March 9, 2021)
+
+### Added
+
+- coop: expose an `unconstrained()` opt-out ([#3547])
+- net: add `into_std` for net types without it ([#3509])
+- sync: add `same_channel` method to `mpsc::Sender` ([#3532])
+- sync: add `{try_,}acquire_many_owned` to `Semaphore` ([#3535])
+- sync: add back `RwLockWriteGuard::map` and `RwLockWriteGuard::try_map` ([#3348])
+
+### Fixed
+
+- sync: allow `oneshot::Receiver::close` after successful `try_recv` ([#3552])
+- time: do not panic on `timeout(Duration::MAX)` ([#3551])
+
+### Documented
+
+- doc: doc aliases for pre-1.0 function names ([#3523])
+- io: fix typos ([#3541])
+- io: note the EOF behaviour of `read_until` ([#3536])
+- io: update `AsyncRead::poll_read` doc ([#3557])
+- net: update `UdpSocket` splitting doc ([#3517])
+- runtime: add link to `LocalSet` on `new_current_thread` ([#3508])
+- runtime: update documentation of thread limits ([#3527])
+- sync: do not recommend `join_all` for `Barrier` ([#3514])
+- sync: documentation for `oneshot` ([#3592])
+- sync: rename `notify` to `notify_one` ([#3526])
+- time: fix typo in `Sleep` doc ([#3515])
+- time: sync `interval.rs` and `time/mod.rs` docs ([#3533])
+
+[#3348]: https://github.com/tokio-rs/tokio/pull/3348
+[#3508]: https://github.com/tokio-rs/tokio/pull/3508
+[#3509]: https://github.com/tokio-rs/tokio/pull/3509
+[#3514]: https://github.com/tokio-rs/tokio/pull/3514
+[#3515]: https://github.com/tokio-rs/tokio/pull/3515
+[#3517]: https://github.com/tokio-rs/tokio/pull/3517
+[#3523]: https://github.com/tokio-rs/tokio/pull/3523
+[#3526]: https://github.com/tokio-rs/tokio/pull/3526
+[#3527]: https://github.com/tokio-rs/tokio/pull/3527
+[#3532]: https://github.com/tokio-rs/tokio/pull/3532
+[#3533]: https://github.com/tokio-rs/tokio/pull/3533
+[#3535]: https://github.com/tokio-rs/tokio/pull/3535
+[#3536]: https://github.com/tokio-rs/tokio/pull/3536
+[#3541]: https://github.com/tokio-rs/tokio/pull/3541
+[#3547]: https://github.com/tokio-rs/tokio/pull/3547
+[#3551]: https://github.com/tokio-rs/tokio/pull/3551
+[#3552]: https://github.com/tokio-rs/tokio/pull/3552
+[#3557]: https://github.com/tokio-rs/tokio/pull/3557
+[#3592]: https://github.com/tokio-rs/tokio/pull/3592
+
+# 1.2.0 (February 5, 2021)
+
+### Added
+
+- signal: make `Signal::poll_recv` method public ([#3383])
+
+### Fixed
+
+- time: make `test-util` paused time fully deterministic ([#3492])
+
+### Documented
+
+- sync: link to new broadcast and watch wrappers ([#3504])
+
+[#3383]: https://github.com/tokio-rs/tokio/pull/3383
+[#3492]: https://github.com/tokio-rs/tokio/pull/3492
+[#3504]: https://github.com/tokio-rs/tokio/pull/3504
+
+# 1.1.1 (January 29, 2021)
+
+Forward ports 1.0.3 fix.
+
+### Fixed
+- io: memory leak during shutdown ([#3477]).
+
+# 1.1.0 (January 22, 2021)
+
+### Added
+
+- net: add `try_read_buf` and `try_recv_buf` ([#3351])
+- mpsc: Add `Sender::try_reserve` function ([#3418])
+- sync: add `RwLock` `try_read` and `try_write` methods ([#3400])
+- io: add `ReadBuf::inner_mut` ([#3443])
+
+### Changed
+
+- macros: improve `select!` error message ([#3352])
+- io: keep track of initialized bytes in `read_to_end` ([#3426])
+- runtime: consolidate errors for context missing ([#3441])
+
+### Fixed
+
+- task: wake `LocalSet` on `spawn_local` ([#3369])
+- sync: fix panic in broadcast::Receiver drop ([#3434])
+
+### Documented
+- stream: link to new `Stream` wrappers in `tokio-stream` ([#3343])
+- docs: mention that `test-util` feature is not enabled with full ([#3397])
+- process: add documentation to process::Child fields ([#3437])
+- io: clarify `AsyncFd` docs about changes of the inner fd ([#3430])
+- net: update datagram docs on splitting ([#3448])
+- time: document that `Sleep` is not `Unpin` ([#3457])
+- sync: add link to `PollSemaphore` ([#3456])
+- task: add `LocalSet` example ([#3438])
+- sync: improve bounded `mpsc` documentation ([#3458])
+
+[#3343]: https://github.com/tokio-rs/tokio/pull/3343
+[#3351]: https://github.com/tokio-rs/tokio/pull/3351
+[#3352]: https://github.com/tokio-rs/tokio/pull/3352
+[#3369]: https://github.com/tokio-rs/tokio/pull/3369
+[#3397]: https://github.com/tokio-rs/tokio/pull/3397
+[#3400]: https://github.com/tokio-rs/tokio/pull/3400
+[#3418]: https://github.com/tokio-rs/tokio/pull/3418
+[#3426]: https://github.com/tokio-rs/tokio/pull/3426
+[#3430]: https://github.com/tokio-rs/tokio/pull/3430
+[#3434]: https://github.com/tokio-rs/tokio/pull/3434
+[#3437]: https://github.com/tokio-rs/tokio/pull/3437
+[#3438]: https://github.com/tokio-rs/tokio/pull/3438
+[#3441]: https://github.com/tokio-rs/tokio/pull/3441
+[#3443]: https://github.com/tokio-rs/tokio/pull/3443
+[#3448]: https://github.com/tokio-rs/tokio/pull/3448
+[#3456]: https://github.com/tokio-rs/tokio/pull/3456
+[#3457]: https://github.com/tokio-rs/tokio/pull/3457
+[#3458]: https://github.com/tokio-rs/tokio/pull/3458
+
+# 1.0.3 (January 28, 2021)
+
+### Fixed
+- io: memory leak during shutdown ([#3477]).
+
+[#3477]: https://github.com/tokio-rs/tokio/pull/3477
+
+# 1.0.2 (January 14, 2021)
+
+### Fixed
+- io: soundness in `read_to_end` ([#3428]).
+
+[#3428]: https://github.com/tokio-rs/tokio/pull/3428
+
+# 1.0.1 (December 25, 2020)
+
+This release fixes a soundness hole caused by the combination of `RwLockWriteGuard::map`
+and `RwLockWriteGuard::downgrade` by removing the `map` function. This is a breaking
+change, but breaking changes are allowed under our semver policy when they are required
+to fix a soundness hole. (See [this RFC][semver] for more.)
+
+Note that we have chosen not to do a deprecation cycle or similar because Tokio 1.0.0 was
+released two days ago, and therefore the impact should be minimal.
+
+Due to the soundness hole, we have also yanked Tokio version 1.0.0.
+
+### Removed
+
+- sync: remove `RwLockWriteGuard::map` and `RwLockWriteGuard::try_map` ([#3345])
+
+### Fixed
+
+- docs: remove stream feature from docs ([#3335])
+
+[semver]: https://github.com/rust-lang/rfcs/blob/master/text/1122-language-semver.md#soundness-changes
+[#3335]: https://github.com/tokio-rs/tokio/pull/3335
+[#3345]: https://github.com/tokio-rs/tokio/pull/3345
+
+# 1.0.0 (December 23, 2020)
+
+Commit to the API and long-term support.
+
+### Fixed
+
+- sync: spurious wakeup in `watch` ([#3234]).
+
+### Changed
+
+- io: rename `AsyncFd::with_io()` to `try_io()` ([#3306])
+- fs: avoid OS specific `*Ext` traits in favor of conditionally defining the fn ([#3264]).
+- fs: `Sleep` is `!Unpin` ([#3278]).
+- net: pass `SocketAddr` by value ([#3125]).
+- net: `TcpStream::poll_peek` takes `ReadBuf` ([#3259]).
+- rt: rename `runtime::Builder::max_threads()` to `max_blocking_threads()` ([#3287]).
+- time: require `current_thread` runtime when calling `time::pause()` ([#3289]).
+
+### Removed
+
+- remove `tokio::prelude` ([#3299]).
+- io: remove `AsyncFd::with_poll()` ([#3306]).
+- net: remove `{Tcp,Unix}Stream::shutdown()` in favor of `AsyncWrite::shutdown()` ([#3298]).
+- stream: move all stream utilities to `tokio-stream` until `Stream` is added to
+  `std` ([#3277]).
+- sync: mpsc `try_recv()` due to unexpected behavior ([#3263]).
+- tracing: make unstable as `tracing-core` is not 1.0 yet ([#3266]).
+
+### Added
+
+- fs: `poll_*` fns to `DirEntry` ([#3308]).
+- io: `poll_*` fns to `io::Lines`, `io::Split` ([#3308]).
+- io: `_mut` method variants to `AsyncFd` ([#3304]).
+- net: `poll_*` fns to `UnixDatagram` ([#3223]).
+- net: `UnixStream` readiness and non-blocking ops ([#3246]).
+- sync: `UnboundedReceiver::blocking_recv()` ([#3262]).
+- sync: `watch::Sender::borrow()` ([#3269]).
+- sync: `Semaphore::close()` ([#3065]).
+- sync: `poll_recv` fns to `mpsc::Receiver`, `mpsc::UnboundedReceiver` ([#3308]).
+- time: `poll_tick` fn to `time::Interval` ([#3316]).
+
+[#3065]: https://github.com/tokio-rs/tokio/pull/3065
+[#3125]: https://github.com/tokio-rs/tokio/pull/3125
+[#3223]: https://github.com/tokio-rs/tokio/pull/3223
+[#3234]: https://github.com/tokio-rs/tokio/pull/3234
+[#3246]: https://github.com/tokio-rs/tokio/pull/3246
+[#3259]: https://github.com/tokio-rs/tokio/pull/3259
+[#3262]: https://github.com/tokio-rs/tokio/pull/3262
+[#3263]: https://github.com/tokio-rs/tokio/pull/3263
+[#3264]: https://github.com/tokio-rs/tokio/pull/3264
+[#3266]: https://github.com/tokio-rs/tokio/pull/3266
+[#3269]: https://github.com/tokio-rs/tokio/pull/3269
+[#3277]: https://github.com/tokio-rs/tokio/pull/3277
+[#3278]: https://github.com/tokio-rs/tokio/pull/3278
+[#3287]: https://github.com/tokio-rs/tokio/pull/3287
+[#3289]: https://github.com/tokio-rs/tokio/pull/3289
+[#3298]: https://github.com/tokio-rs/tokio/pull/3298
+[#3299]: https://github.com/tokio-rs/tokio/pull/3299
+[#3304]: https://github.com/tokio-rs/tokio/pull/3304
+[#3306]: https://github.com/tokio-rs/tokio/pull/3306
+[#3308]: https://github.com/tokio-rs/tokio/pull/3308
+[#3316]: https://github.com/tokio-rs/tokio/pull/3316
+
+# 0.3.6 (December 14, 2020)
+
+### Fixed
+
+- rt: fix deadlock in shutdown ([#3228])
+- rt: fix panic in task abort when off rt ([#3159])
+- sync: make `add_permits` panic with usize::MAX >> 3 permits ([#3188])
+- time: Fix race condition in timer drop ([#3229])
+- watch: fix spurious wakeup ([#3244])
+
+### Added
+
+- example: add back udp-codec example ([#3205])
+- net: add `TcpStream::into_std` ([#3189])
+
+[#3159]: https://github.com/tokio-rs/tokio/pull/3159
+[#3188]: https://github.com/tokio-rs/tokio/pull/3188
+[#3189]: https://github.com/tokio-rs/tokio/pull/3189
+[#3205]: https://github.com/tokio-rs/tokio/pull/3205
+[#3228]: https://github.com/tokio-rs/tokio/pull/3228
+[#3229]: https://github.com/tokio-rs/tokio/pull/3229
+[#3244]: https://github.com/tokio-rs/tokio/pull/3244
+
+# 0.3.5 (November 30, 2020)
+
+### Fixed
+
+- rt: fix `shutdown_timeout(0)` ([#3196]).
+- time: fixed race condition with small sleeps ([#3069]).
+
+### Added
+
+- io: `AsyncFd::with_interest()` ([#3167]).
+- signal: `CtrlC` stream on windows ([#3186]).
+
+[#3069]: https://github.com/tokio-rs/tokio/pull/3069
+[#3167]: https://github.com/tokio-rs/tokio/pull/3167
+[#3186]: https://github.com/tokio-rs/tokio/pull/3186
+[#3196]: https://github.com/tokio-rs/tokio/pull/3196
+
+# 0.3.4 (November 18, 2020)
+
+### Fixed
+
+- stream: `StreamMap` `Default` impl bound ([#3093]).
+- io: `AsyncFd::into_inner()` should deregister the FD ([#3104]).
+
+### Changed
+
+- meta: `parking_lot` feature enabled with `full` ([#3119]).
+
+### Added
+
+- io: `AsyncWrite` vectored writes ([#3149]).
+- net: TCP/UDP readiness and non-blocking ops ([#3130], [#2743], [#3138]).
+- net: TCP socket option (linger, send/recv buf size) ([#3145], [#3143]).
+- net: PID field in `UCred` with solaris/illumos ([#3085]).
+- rt: `runtime::Handle` allows spawning onto a runtime ([#3079]).
+- sync: `Notify::notify_waiters()` ([#3098]).
+- sync: `acquire_many()`, `try_acquire_many()` to `Semaphore` ([#3067]).
+
+[#2743]: https://github.com/tokio-rs/tokio/pull/2743
+[#3067]: https://github.com/tokio-rs/tokio/pull/3067
+[#3079]: https://github.com/tokio-rs/tokio/pull/3079
+[#3085]: https://github.com/tokio-rs/tokio/pull/3085
+[#3093]: https://github.com/tokio-rs/tokio/pull/3093
+[#3098]: https://github.com/tokio-rs/tokio/pull/3098
+[#3104]: https://github.com/tokio-rs/tokio/pull/3104
+[#3119]: https://github.com/tokio-rs/tokio/pull/3119
+[#3130]: https://github.com/tokio-rs/tokio/pull/3130
+[#3138]: https://github.com/tokio-rs/tokio/pull/3138
+[#3143]: https://github.com/tokio-rs/tokio/pull/3143
+[#3145]: https://github.com/tokio-rs/tokio/pull/3145
+[#3149]: https://github.com/tokio-rs/tokio/pull/3149
+
+# 0.3.3 (November 2, 2020)
+
+Fixes a soundness hole by adding a missing `Send` bound to
+`Runtime::spawn_blocking()`.
+
+### Fixed
+
+- rt: include missing `Send`, fixing soundness hole ([#3089]).
+- tracing: avoid huge trace span names ([#3074]).
+
+### Added
+
+- net: `TcpSocket::reuseport()`, `TcpSocket::set_reuseport()` ([#3083]).
+- net: `TcpSocket::reuseaddr()` ([#3093]).
+- net: `TcpSocket::local_addr()` ([#3093]).
+- net: add pid to `UCred` ([#2633]).
+
+[#2633]: https://github.com/tokio-rs/tokio/pull/2633
+[#3074]: https://github.com/tokio-rs/tokio/pull/3074
+[#3083]: https://github.com/tokio-rs/tokio/pull/3083
+[#3089]: https://github.com/tokio-rs/tokio/pull/3089
+[#3093]: https://github.com/tokio-rs/tokio/pull/3093
+
+# 0.3.2 (October 27, 2020)
+
+Adds `AsyncFd` as a replacement for v0.2's `PollEvented`.
+
+### Fixed
+
+- io: fix a potential deadlock when shutting down the I/O driver ([#2903]).
+- sync: `RwLockWriteGuard::downgrade()` bug ([#2957]).
+
+### Added
+
+- io: `AsyncFd` for receiving readiness events on raw FDs ([#2903]).
+- net: `poll_*` function on `UdpSocket` ([#2981]).
+- net: `UdpSocket::take_error()` ([#3051]).
+- sync: `oneshot::Sender::poll_closed()` ([#3032]).
+
+[#2903]: https://github.com/tokio-rs/tokio/pull/2903
+[#2957]: https://github.com/tokio-rs/tokio/pull/2957
+[#2981]: https://github.com/tokio-rs/tokio/pull/2981
+[#3032]: https://github.com/tokio-rs/tokio/pull/3032
+[#3051]: https://github.com/tokio-rs/tokio/pull/3051
+
+# 0.3.1 (October 21, 2020)
+
+This release fixes an use-after-free in the IO driver. Additionally, the `read_buf`
+and `write_buf` methods have been added back to the IO traits, as the bytes crate
+is now on track to reach version 1.0 together with Tokio.
+
+### Fixed
+
+- net: fix use-after-free ([#3019]).
+- fs: ensure buffered data is written on shutdown ([#3009]).
+
+### Added
+
+- io: `copy_buf()` ([#2884]).
+- io: `AsyncReadExt::read_buf()`, `AsyncReadExt::write_buf()` for working with
+  `Buf`/`BufMut` ([#3003]).
+- rt: `Runtime::spawn_blocking()` ([#2980]).
+- sync: `watch::Sender::is_closed()` ([#2991]).
+
+[#2884]: https://github.com/tokio-rs/tokio/pull/2884
+[#2980]: https://github.com/tokio-rs/tokio/pull/2980
+[#2991]: https://github.com/tokio-rs/tokio/pull/2991
+[#3003]: https://github.com/tokio-rs/tokio/pull/3003
+[#3009]: https://github.com/tokio-rs/tokio/pull/3009
+[#3019]: https://github.com/tokio-rs/tokio/pull/3019
+
+# 0.3.0 (October 15, 2020)
+
+This represents a 1.0 beta release. APIs are polished and future-proofed. APIs
+not included for 1.0 stabilization have been removed.
+
+Biggest changes are:
+
+- I/O driver internal rewrite. The windows implementation includes significant
+  changes.
+- Runtime API is polished, especially with how it interacts with feature flag
+  combinations.
+- Feature flags are simplified
+  - `rt-core` and `rt-util` are combined to `rt`
+  - `rt-threaded` is renamed to `rt-multi-thread` to match builder API
+  - `tcp`, `udp`, `uds`, `dns` are combied to `net`.
+  - `parking_lot` is included with `full`
 
 ### Changes
 
- - io: always re-export `std::io` (#2606)
- - dependencies: update `parking_lot` dependency to 0.11.0 (#2676)
- - io: rewrite `read_to_end` and `read_to_string` (#2560)
- - coop: reset coop budget when blocking in `block_on` (#2711)
- - sync: better Debug for Mutex (#2725)
- - net: make `UnixListener::poll_accept` public (#2880)
- - dep: raise `lazy_static` to `1.4.0` (#3132)
- - dep: raise `slab` to `0.4.2` (#3132)
+- meta: Minimum supported Rust version is now 1.45.
+- io: `AsyncRead` trait now takes `ReadBuf` in order to safely handle reading
+  into uninitialized memory ([#2758]).
+- io: Internal I/O driver storage is now able to compact ([#2757]).
+- rt: `Runtime::block_on` now takes `&self` ([#2782]).
+- sync: `watch` reworked to decouple receiving a change notification from
+  receiving the value ([#2814], [#2806]).
+- sync: `Notify::notify` is renamed to `notify_one` ([#2822]).
+- process: `Child::kill` is now an `async fn` that cleans zombies ([#2823]).
+- sync: use `const fn` constructors as possible ([#2833], [#2790])
+- signal: reduce cross-thread notification ([#2835]).
+- net: tcp,udp,uds types support operations with `&self` ([#2828], [#2919], [#2934]).
+- sync: blocking `mpsc` channel supports `send` with `&self` ([#2861]).
+- time: rename `delay_for` and `delay_until` to `sleep` and `sleep_until` ([#2826]).
+- io: upgrade to `mio` 0.7 ([#2893]).
+- io: `AsyncSeek` trait is tweaked ([#2885]).
+- fs: `File` operations take `&self` ([#2930]).
+- rt: runtime API, and `#[tokio::main]` macro polish ([#2876])
+- rt: `Runtime::enter` uses an RAII guard instead of a closure ([#2954]).
+- net: the `from_std` function on all sockets no longer sets socket into non-blocking mode ([#2893])
 
 ### Added
 
- - io: add `io::duplex()` as bidirectional reader/writer (#2661)
- - net: introduce split and `into_split` on `UnixDatagram` (#2557)
- - net: ensure that unix sockets have both `split` and `into_split` (#2687)
- - net: add `try_recv`/`from` & `try_send`/`to` to UnixDatagram (#1677)
- - net: Add `UdpSocket::{try_send,try_send_to}` methods (#1979)
- - net: implement `ToSocketAddrs` for `(String, u16)` (#2724)
- - io: add `ReaderStream` (#2714)
- - sync: implement map methods (#2771)
+- sync: `map` function to lock guards ([#2445]).
+- sync: `blocking_recv` and `blocking_send` fns to `mpsc` for use outside of Tokio ([#2685]).
+- rt: `Builder::thread_name_fn` for configuring thread names ([#1921]).
+- fs: impl `FromRawFd` and `FromRawHandle` for `File` ([#2792]).
+- process: `Child::wait` and `Child::try_wait` ([#2796]).
+- rt: support configuring thread keep-alive duration ([#2809]).
+- rt: `task::JoinHandle::abort` forcibly cancels a spawned task ([#2474]).
+- sync: `RwLock` write guard to read guard downgrading ([#2733]).
+- net: add `poll_*` functions that take `&self` to all net types ([#2845])
+- sync: `get_mut()` for `Mutex`, `RwLock` ([#2856]).
+- sync: `mpsc::Sender::closed()` waits for `Receiver` half to close ([#2840]).
+- sync: `mpsc::Sender::is_closed()` returns true if `Receiver` half is closed ([#2726]).
+- stream: `iter` and `iter_mut` to `StreamMap` ([#2890]).
+- net: implement `AsRawSocket` on windows ([#2911]).
+- net: `TcpSocket` creates a socket without binding or listening ([#2920]).
+
+### Removed
+
+- io: vectored ops are removed from `AsyncRead`, `AsyncWrite` traits ([#2882]).
+- io: `mio` is removed from the public API. `PollEvented` and` Registration` are
+  removed ([#2893]).
+- io: remove `bytes` from public API. `Buf` and `BufMut` implementation are
+  removed ([#2908]).
+- time: `DelayQueue` is moved to `tokio-util` ([#2897]).
+
+### Fixed
+
+- io: `stdout` and `stderr` buffering on windows ([#2734]).
+
+[#1921]: https://github.com/tokio-rs/tokio/pull/1921
+[#2445]: https://github.com/tokio-rs/tokio/pull/2445
+[#2474]: https://github.com/tokio-rs/tokio/pull/2474
+[#2685]: https://github.com/tokio-rs/tokio/pull/2685
+[#2726]: https://github.com/tokio-rs/tokio/pull/2726
+[#2733]: https://github.com/tokio-rs/tokio/pull/2733
+[#2734]: https://github.com/tokio-rs/tokio/pull/2734
+[#2757]: https://github.com/tokio-rs/tokio/pull/2757
+[#2758]: https://github.com/tokio-rs/tokio/pull/2758
+[#2782]: https://github.com/tokio-rs/tokio/pull/2782
+[#2790]: https://github.com/tokio-rs/tokio/pull/2790
+[#2792]: https://github.com/tokio-rs/tokio/pull/2792
+[#2796]: https://github.com/tokio-rs/tokio/pull/2796
+[#2806]: https://github.com/tokio-rs/tokio/pull/2806
+[#2809]: https://github.com/tokio-rs/tokio/pull/2809
+[#2814]: https://github.com/tokio-rs/tokio/pull/2814
+[#2822]: https://github.com/tokio-rs/tokio/pull/2822
+[#2823]: https://github.com/tokio-rs/tokio/pull/2823
+[#2826]: https://github.com/tokio-rs/tokio/pull/2826
+[#2828]: https://github.com/tokio-rs/tokio/pull/2828
+[#2833]: https://github.com/tokio-rs/tokio/pull/2833
+[#2835]: https://github.com/tokio-rs/tokio/pull/2835
+[#2840]: https://github.com/tokio-rs/tokio/pull/2840
+[#2845]: https://github.com/tokio-rs/tokio/pull/2845
+[#2856]: https://github.com/tokio-rs/tokio/pull/2856
+[#2861]: https://github.com/tokio-rs/tokio/pull/2861
+[#2876]: https://github.com/tokio-rs/tokio/pull/2876
+[#2882]: https://github.com/tokio-rs/tokio/pull/2882
+[#2885]: https://github.com/tokio-rs/tokio/pull/2885
+[#2890]: https://github.com/tokio-rs/tokio/pull/2890
+[#2893]: https://github.com/tokio-rs/tokio/pull/2893
+[#2897]: https://github.com/tokio-rs/tokio/pull/2897
+[#2908]: https://github.com/tokio-rs/tokio/pull/2908
+[#2911]: https://github.com/tokio-rs/tokio/pull/2911
+[#2919]: https://github.com/tokio-rs/tokio/pull/2919
+[#2920]: https://github.com/tokio-rs/tokio/pull/2920
+[#2930]: https://github.com/tokio-rs/tokio/pull/2930
+[#2934]: https://github.com/tokio-rs/tokio/pull/2934
+[#2954]: https://github.com/tokio-rs/tokio/pull/2954
 
 # 0.2.22 (July 21, 2020)
 
 ### Fixes
-- docs: misc improvements (#2572, #2658, #2663, #2656, #2647, #2630, #2487, #2621,
-  #2624, #2600, #2623, #2622, #2577, #2569, #2589, #2575, #2540, #2564, #2567,
-  #2520, #2521, #2493)
+
+- docs: misc improvements ([#2572], [#2658], [#2663], [#2656], [#2647], [#2630], [#2487], [#2621],
+  [#2624], [#2600], [#2623], [#2622], [#2577], [#2569], [#2589], [#2575], [#2540], [#2564], [#2567],
+  [#2520], [#2521], [#2493])
 - rt: allow calls to `block_on` inside calls to `block_in_place` that are
-  themselves inside `block_on` (#2645)
-- net: fix non-portable behavior when dropping `TcpStream` `OwnedWriteHalf` (#2597)
+  themselves inside `block_on` ([#2645])
+- net: fix non-portable behavior when dropping `TcpStream` `OwnedWriteHalf` ([#2597])
 - io: improve stack usage by allocating large buffers on directly on the heap
-  (#2634)
+  ([#2634])
 - io: fix unsound pin projection in `AsyncReadExt::read_buf` and
-  `AsyncWriteExt::write_buf` (#2612)
-- io: fix unnecessary zeroing for `AsyncRead` implementors (#2525)
-- io: Fix `BufReader` not correctly forwarding `poll_write_buf` (#2654)
-- io: fix panic in `AsyncReadExt::read_line` (#2541)
+  `AsyncWriteExt::write_buf` ([#2612])
+- io: fix unnecessary zeroing for `AsyncRead` implementors ([#2525])
+- io: Fix `BufReader` not correctly forwarding `poll_write_buf` ([#2654])
+- io: fix panic in `AsyncReadExt::read_line` ([#2541])
 
 ### Changes
-- coop: returning `Poll::Pending` no longer decrements the task budget (#2549)
+
+- coop: returning `Poll::Pending` no longer decrements the task budget ([#2549])
 
 ### Added
+
 - io: little-endian variants of `AsyncReadExt` and `AsyncWriteExt` methods
-  (#1915)
-- task: add [`tracing`] instrumentation to spawned tasks (#2655)
+  ([#1915])
+- task: add [`tracing`] instrumentation to spawned tasks ([#2655])
 - sync: allow unsized types in `Mutex` and `RwLock` (via `default` constructors)
-  (#2615)
-- net: add `ToSocketAddrs` implementation for `&[SocketAddr]` (#2604)
-- fs: add `OpenOptionsExt` for `OpenOptions` (#2515)
-- fs: add `DirBuilder` (#2524)
+  ([#2615])
+- net: add `ToSocketAddrs` implementation for `&[SocketAddr]` ([#2604])
+- fs: add `OpenOptionsExt` for `OpenOptions` ([#2515])
+- fs: add `DirBuilder` ([#2524])
 
 [`tracing`]: https://crates.io/crates/tracing
+[#1915]: https://github.com/tokio-rs/tokio/pull/1915
+[#2487]: https://github.com/tokio-rs/tokio/pull/2487
+[#2493]: https://github.com/tokio-rs/tokio/pull/2493
+[#2515]: https://github.com/tokio-rs/tokio/pull/2515
+[#2520]: https://github.com/tokio-rs/tokio/pull/2520
+[#2521]: https://github.com/tokio-rs/tokio/pull/2521
+[#2524]: https://github.com/tokio-rs/tokio/pull/2524
+[#2525]: https://github.com/tokio-rs/tokio/pull/2525
+[#2540]: https://github.com/tokio-rs/tokio/pull/2540
+[#2541]: https://github.com/tokio-rs/tokio/pull/2541
+[#2549]: https://github.com/tokio-rs/tokio/pull/2549
+[#2564]: https://github.com/tokio-rs/tokio/pull/2564
+[#2567]: https://github.com/tokio-rs/tokio/pull/2567
+[#2569]: https://github.com/tokio-rs/tokio/pull/2569
+[#2572]: https://github.com/tokio-rs/tokio/pull/2572
+[#2575]: https://github.com/tokio-rs/tokio/pull/2575
+[#2577]: https://github.com/tokio-rs/tokio/pull/2577
+[#2589]: https://github.com/tokio-rs/tokio/pull/2589
+[#2597]: https://github.com/tokio-rs/tokio/pull/2597
+[#2600]: https://github.com/tokio-rs/tokio/pull/2600
+[#2604]: https://github.com/tokio-rs/tokio/pull/2604
+[#2612]: https://github.com/tokio-rs/tokio/pull/2612
+[#2615]: https://github.com/tokio-rs/tokio/pull/2615
+[#2621]: https://github.com/tokio-rs/tokio/pull/2621
+[#2622]: https://github.com/tokio-rs/tokio/pull/2622
+[#2623]: https://github.com/tokio-rs/tokio/pull/2623
+[#2624]: https://github.com/tokio-rs/tokio/pull/2624
+[#2630]: https://github.com/tokio-rs/tokio/pull/2630
+[#2634]: https://github.com/tokio-rs/tokio/pull/2634
+[#2645]: https://github.com/tokio-rs/tokio/pull/2645
+[#2647]: https://github.com/tokio-rs/tokio/pull/2647
+[#2654]: https://github.com/tokio-rs/tokio/pull/2654
+[#2655]: https://github.com/tokio-rs/tokio/pull/2655
+[#2656]: https://github.com/tokio-rs/tokio/pull/2656
+[#2658]: https://github.com/tokio-rs/tokio/pull/2658
+[#2663]: https://github.com/tokio-rs/tokio/pull/2663
 
 # 0.2.21 (May 13, 2020)
 
 ### Fixes
 
-- macros: disambiguate built-in `#[test]` attribute in macro expansion (#2503)
-- rt: `LocalSet` and task budgeting (#2462).
-- rt: task budgeting with `block_in_place` (#2502).
-- sync: release `broadcast` channel memory without sending a value (#2509).
-- time: notify when resetting a `Delay` to a time in the past (#2290)
+- macros: disambiguate built-in `#[test]` attribute in macro expansion ([#2503])
+- rt: `LocalSet` and task budgeting ([#2462]).
+- rt: task budgeting with `block_in_place` ([#2502]).
+- sync: release `broadcast` channel memory without sending a value ([#2509]).
+- time: notify when resetting a `Delay` to a time in the past ([#2290])
 
 ### Added
-- io: `get_mut`, `get_ref`, and `into_inner` to `Lines` (#2450).
-- io: `mio::Ready` argument to `PollEvented` (#2419).
-- os: illumos support (#2486).
-- rt: `Handle::spawn_blocking` (#2501).
-- sync: `OwnedMutexGuard` for `Arc<Mutex<T>>` (#2455).
+
+- io: `get_mut`, `get_ref`, and `into_inner` to `Lines` ([#2450]).
+- io: `mio::Ready` argument to `PollEvented` ([#2419]).
+- os: illumos support ([#2486]).
+- rt: `Handle::spawn_blocking` ([#2501]).
+- sync: `OwnedMutexGuard` for `Arc<Mutex<T>>` ([#2455]).
+
+[#2290]: https://github.com/tokio-rs/tokio/pull/2290
+[#2419]: https://github.com/tokio-rs/tokio/pull/2419
+[#2450]: https://github.com/tokio-rs/tokio/pull/2450
+[#2455]: https://github.com/tokio-rs/tokio/pull/2455
+[#2462]: https://github.com/tokio-rs/tokio/pull/2462
+[#2486]: https://github.com/tokio-rs/tokio/pull/2486
+[#2501]: https://github.com/tokio-rs/tokio/pull/2501
+[#2502]: https://github.com/tokio-rs/tokio/pull/2502
+[#2503]: https://github.com/tokio-rs/tokio/pull/2503
+[#2509]: https://github.com/tokio-rs/tokio/pull/2509
 
 # 0.2.20 (April 28, 2020)
 
 ### Fixes
-- sync: `broadcast` closing the channel no longer requires capacity (#2448).
-- rt: regression when configuring runtime with `max_threads` less than number of CPUs (#2457).
+
+- sync: `broadcast` closing the channel no longer requires capacity ([#2448]).
+- rt: regression when configuring runtime with `max_threads` less than number of CPUs ([#2457]).
+
+[#2448]: https://github.com/tokio-rs/tokio/pull/2448
+[#2457]: https://github.com/tokio-rs/tokio/pull/2457
 
 # 0.2.19 (April 24, 2020)
 
 ### Fixes
-- docs: misc improvements (#2400, #2405, #2414, #2420, #2423, #2426, #2427, #2434, #2436, #2440).
-- rt: support `block_in_place` in more contexts (#2409, #2410).
-- stream: no panic in `merge()` and `chain()` when using `size_hint()` (#2430).
-- task: include visibility modifier when defining a task-local (#2416).
+
+- docs: misc improvements ([#2400], [#2405], [#2414], [#2420], [#2423], [#2426], [#2427], [#2434], [#2436], [#2440]).
+- rt: support `block_in_place` in more contexts ([#2409], [#2410]).
+- stream: no panic in `merge()` and `chain()` when using `size_hint()` ([#2430]).
+- task: include visibility modifier when defining a task-local ([#2416]).
 
 ### Added
-- rt: `runtime::Handle::block_on` (#2437).
-- sync: owned `Semaphore` permit (#2421).
-- tcp: owned split (#2270).
+
+- rt: `runtime::Handle::block_on` ([#2437]).
+- sync: owned `Semaphore` permit ([#2421]).
+- tcp: owned split ([#2270]).
+
+[#2270]: https://github.com/tokio-rs/tokio/pull/2270
+[#2400]: https://github.com/tokio-rs/tokio/pull/2400
+[#2405]: https://github.com/tokio-rs/tokio/pull/2405
+[#2409]: https://github.com/tokio-rs/tokio/pull/2409
+[#2410]: https://github.com/tokio-rs/tokio/pull/2410
+[#2414]: https://github.com/tokio-rs/tokio/pull/2414
+[#2416]: https://github.com/tokio-rs/tokio/pull/2416
+[#2420]: https://github.com/tokio-rs/tokio/pull/2420
+[#2421]: https://github.com/tokio-rs/tokio/pull/2421
+[#2423]: https://github.com/tokio-rs/tokio/pull/2423
+[#2426]: https://github.com/tokio-rs/tokio/pull/2426
+[#2427]: https://github.com/tokio-rs/tokio/pull/2427
+[#2430]: https://github.com/tokio-rs/tokio/pull/2430
+[#2434]: https://github.com/tokio-rs/tokio/pull/2434
+[#2436]: https://github.com/tokio-rs/tokio/pull/2436
+[#2437]: https://github.com/tokio-rs/tokio/pull/2437
+[#2440]: https://github.com/tokio-rs/tokio/pull/2440
 
 # 0.2.18 (April 12, 2020)
 
 ### Fixes
-- task: `LocalSet` was incorrectly marked as `Send` (#2398)
-- io: correctly report `WriteZero` failure in `write_int` (#2334)
+
+- task: `LocalSet` was incorrectly marked as `Send` ([#2398])
+- io: correctly report `WriteZero` failure in `write_int` ([#2334])
+
+[#2334]: https://github.com/tokio-rs/tokio/pull/2334
+[#2398]: https://github.com/tokio-rs/tokio/pull/2398
 
 # 0.2.17 (April 9, 2020)
 
 ### Fixes
-- rt: bug in work-stealing queue (#2387)
+
+- rt: bug in work-stealing queue ([#2387])
 
 ### Changes
-- rt: threadpool uses logical CPU count instead of physical by default (#2391)
+
+- rt: threadpool uses logical CPU count instead of physical by default ([#2391])
+
+[#2387]: https://github.com/tokio-rs/tokio/pull/2387
+[#2391]: https://github.com/tokio-rs/tokio/pull/2391
 
 # 0.2.16 (April 3, 2020)
 
@@ -131,6 +1056,11 @@
 - time: added `deadline` method to `delay_queue::Expired` ([#2300])
 - io: added `StreamReader` ([#2052])
 
+[#2052]: https://github.com/tokio-rs/tokio/pull/2052
+[#2300]: https://github.com/tokio-rs/tokio/pull/2300
+[#2354]: https://github.com/tokio-rs/tokio/pull/2354
+[#2375]: https://github.com/tokio-rs/tokio/pull/2375
+
 # 0.2.15 (April 2, 2020)
 
 ### Fixes
@@ -141,30 +1071,51 @@
 
 - sync: Add disarm to `mpsc::Sender` ([#2358]).
 
+[#2358]: https://github.com/tokio-rs/tokio/pull/2358
+[#2362]: https://github.com/tokio-rs/tokio/pull/2362
+
 # 0.2.14 (April 1, 2020)
 
 ### Fixes
+
 - rt: concurrency bug in scheduler ([#2273]).
 - rt: concurrency bug with shell runtime ([#2333]).
 - test-util: correct pause/resume of time ([#2253]).
 - time: `DelayQueue` correct wakeup after `insert` ([#2285]).
 
 ### Added
+
 - io: impl `RawFd`, `AsRawHandle` for std io types ([#2335]).
-- rt: automatic cooperative task yielding (#2160, #2343, #2349).
+- rt: automatic cooperative task yielding ([#2160], [#2343], [#2349]).
 - sync: `RwLock::into_inner` ([#2321]).
 
 ### Changed
+
 - sync: semaphore, mutex internals rewritten to avoid allocations ([#2325]).
 
+[#2160]: https://github.com/tokio-rs/tokio/pull/2160
+[#2253]: https://github.com/tokio-rs/tokio/pull/2253
+[#2273]: https://github.com/tokio-rs/tokio/pull/2273
+[#2285]: https://github.com/tokio-rs/tokio/pull/2285
+[#2321]: https://github.com/tokio-rs/tokio/pull/2321
+[#2325]: https://github.com/tokio-rs/tokio/pull/2325
+[#2333]: https://github.com/tokio-rs/tokio/pull/2333
+[#2335]: https://github.com/tokio-rs/tokio/pull/2335
+[#2343]: https://github.com/tokio-rs/tokio/pull/2343
+[#2349]: https://github.com/tokio-rs/tokio/pull/2349
+
 # 0.2.13 (February 28, 2020)
 
 ### Fixes
+
 - macros: unresolved import in `pin!` ([#2281]).
 
+[#2281]: https://github.com/tokio-rs/tokio/pull/2281
+
 # 0.2.12 (February 27, 2020)
 
 ### Fixes
+
 - net: `UnixStream::poll_shutdown` should call `shutdown(Write)` ([#2245]).
 - process: Wake up read and write on `EPOLLERR` ([#2218]).
 - rt: potential deadlock when using `block_in_place` and shutting down the
@@ -175,6 +1126,7 @@
 - time: avoid having to poll `DelayQueue` after inserting new delay ([#2217]).
 
 ### Added
+
 - macros: `pin!` variant that assigns to identifier and pins ([#2274]).
 - net: impl `Stream` for `Listener` types ([#2275]).
 - rt: `Runtime::shutdown_timeout` waits for runtime to shutdown for specified
@@ -189,15 +1141,35 @@
   for channel capacity ([#2227]).
 - time: impl `Ord` and `Hash` for `Instant` ([#2239]).
 
+[#2119]: https://github.com/tokio-rs/tokio/pull/2119
+[#2184]: https://github.com/tokio-rs/tokio/pull/2184
+[#2185]: https://github.com/tokio-rs/tokio/pull/2185
+[#2186]: https://github.com/tokio-rs/tokio/pull/2186
+[#2191]: https://github.com/tokio-rs/tokio/pull/2191
+[#2204]: https://github.com/tokio-rs/tokio/pull/2204
+[#2205]: https://github.com/tokio-rs/tokio/pull/2205
+[#2210]: https://github.com/tokio-rs/tokio/pull/2210
+[#2217]: https://github.com/tokio-rs/tokio/pull/2217
+[#2218]: https://github.com/tokio-rs/tokio/pull/2218
+[#2227]: https://github.com/tokio-rs/tokio/pull/2227
+[#2238]: https://github.com/tokio-rs/tokio/pull/2238
+[#2239]: https://github.com/tokio-rs/tokio/pull/2239
+[#2245]: https://github.com/tokio-rs/tokio/pull/2245
+[#2250]: https://github.com/tokio-rs/tokio/pull/2250
+[#2274]: https://github.com/tokio-rs/tokio/pull/2274
+[#2275]: https://github.com/tokio-rs/tokio/pull/2275
+
 # 0.2.11 (January 27, 2020)
 
 ### Fixes
-- docs: misc fixes and tweaks (#2155, #2103, #2027, #2167, #2175).
+
+- docs: misc fixes and tweaks ([#2155], [#2103], [#2027], [#2167], [#2175]).
 - macros: handle generics in `#[tokio::main]` method ([#2177]).
 - sync: `broadcast` potential lost notifications ([#2135]).
 - rt: improve "no runtime" panic messages ([#2145]).
 
 ### Added
+
 - optional support for using `parking_lot` internally ([#2164]).
 - fs: `fs::copy`, an async version of `std::fs::copy` ([#2079]).
 - macros: `select!` waits for the first branch to complete ([#2152]).
@@ -210,18 +1182,40 @@
 - sync: impl `Eq`, `PartialEq` for `oneshot::RecvError` ([#2168]).
 - task: methods for inspecting the `JoinError` cause ([#2051]).
 
+[#2027]: https://github.com/tokio-rs/tokio/pull/2027
+[#2051]: https://github.com/tokio-rs/tokio/pull/2051
+[#2079]: https://github.com/tokio-rs/tokio/pull/2079
+[#2103]: https://github.com/tokio-rs/tokio/pull/2103
+[#2122]: https://github.com/tokio-rs/tokio/pull/2122
+[#2135]: https://github.com/tokio-rs/tokio/pull/2135
+[#2145]: https://github.com/tokio-rs/tokio/pull/2145
+[#2149]: https://github.com/tokio-rs/tokio/pull/2149
+[#2151]: https://github.com/tokio-rs/tokio/pull/2151
+[#2152]: https://github.com/tokio-rs/tokio/pull/2152
+[#2155]: https://github.com/tokio-rs/tokio/pull/2155
+[#2158]: https://github.com/tokio-rs/tokio/pull/2158
+[#2163]: https://github.com/tokio-rs/tokio/pull/2163
+[#2164]: https://github.com/tokio-rs/tokio/pull/2164
+[#2167]: https://github.com/tokio-rs/tokio/pull/2167
+[#2168]: https://github.com/tokio-rs/tokio/pull/2168
+[#2169]: https://github.com/tokio-rs/tokio/pull/2169
+[#2175]: https://github.com/tokio-rs/tokio/pull/2175
+[#2177]: https://github.com/tokio-rs/tokio/pull/2177
+
 # 0.2.10 (January 21, 2020)
 
 ### Fixes
+
 - `#[tokio::main]` when `rt-core` feature flag is not enabled ([#2139]).
 - remove `AsyncBufRead` from `BufStream` impl block ([#2108]).
 - potential undefined behavior when implementing `AsyncRead` incorrectly ([#2030]).
 
 ### Added
+
 - `BufStream::with_capacity` ([#2125]).
 - impl `From` and `Default` for `RwLock` ([#2089]).
 - `io::ReadHalf::is_pair_of` checks if provided `WriteHalf` is for the same
-  underlying object (#1762, #2144).
+  underlying object ([#1762], [#2144]).
 - `runtime::Handle::try_current()` returns a handle to the current runtime ([#2118]).
 - `stream::empty()` returns an immediately ready empty stream ([#2092]).
 - `stream::once(val)` returns a stream that yields a single value: `val` ([#2094]).
@@ -232,22 +1226,46 @@
 - `StreamExt::merge` combines two streams, yielding values as they become ready ([#2091]).
 - Task-local storage ([#2126]).
 
+[#1762]: https://github.com/tokio-rs/tokio/pull/1762
+[#2030]: https://github.com/tokio-rs/tokio/pull/2030
+[#2085]: https://github.com/tokio-rs/tokio/pull/2085
+[#2089]: https://github.com/tokio-rs/tokio/pull/2089
+[#2091]: https://github.com/tokio-rs/tokio/pull/2091
+[#2092]: https://github.com/tokio-rs/tokio/pull/2092
+[#2093]: https://github.com/tokio-rs/tokio/pull/2093
+[#2094]: https://github.com/tokio-rs/tokio/pull/2094
+[#2108]: https://github.com/tokio-rs/tokio/pull/2108
+[#2109]: https://github.com/tokio-rs/tokio/pull/2109
+[#2118]: https://github.com/tokio-rs/tokio/pull/2118
+[#2125]: https://github.com/tokio-rs/tokio/pull/2125
+[#2126]: https://github.com/tokio-rs/tokio/pull/2126
+[#2139]: https://github.com/tokio-rs/tokio/pull/2139
+[#2144]: https://github.com/tokio-rs/tokio/pull/2144
+
 # 0.2.9 (January 9, 2020)
 
 ### Fixes
+
 - `AsyncSeek` impl for `File` ([#1986]).
-- rt: shutdown deadlock in `threaded_scheduler` (#2074, #2082).
+- rt: shutdown deadlock in `threaded_scheduler` ([#2074], [#2082]).
 - rt: memory ordering when dropping `JoinHandle` ([#2044]).
 - docs: misc API documentation fixes and improvements.
 
+[#1986]: https://github.com/tokio-rs/tokio/pull/1986
+[#2044]: https://github.com/tokio-rs/tokio/pull/2044
+[#2074]: https://github.com/tokio-rs/tokio/pull/2074
+[#2082]: https://github.com/tokio-rs/tokio/pull/2082
+
 # 0.2.8 (January 7, 2020)
 
 ### Fixes
+
 - depend on new version of `tokio-macros`.
 
 # 0.2.7 (January 7, 2020)
 
 ### Fixes
+
 - potential deadlock when dropping `basic_scheduler` Runtime.
 - calling `spawn_blocking` from within a `spawn_blocking` ([#2006]).
 - storing a `Runtime` instance in a thread-local ([#2011]).
@@ -256,6 +1274,7 @@
 - test-util: `time::advance` runs pending tasks before changing the time ([#2059]).
 
 ### Added
+
 - `net::lookup_host` maps a `T: ToSocketAddrs` to a stream of `SocketAddrs` ([#1870]).
 - `process::Child` fields are made public to match `std` ([#2014]).
 - impl `Stream` for `sync::broadcast::Receiver` ([#2012]).
@@ -272,14 +1291,37 @@
 - `time::DelayQueue::len` returns the number entries in the queue ([#1755]).
 - expose runtime options from the `#[tokio::main]` and `#[tokio::test]` ([#2022]).
 
+[#1699]: https://github.com/tokio-rs/tokio/pull/1699
+[#1755]: https://github.com/tokio-rs/tokio/pull/1755
+[#1870]: https://github.com/tokio-rs/tokio/pull/1870
+[#1971]: https://github.com/tokio-rs/tokio/pull/1971
+[#2001]: https://github.com/tokio-rs/tokio/pull/2001
+[#2005]: https://github.com/tokio-rs/tokio/pull/2005
+[#2006]: https://github.com/tokio-rs/tokio/pull/2006
+[#2011]: https://github.com/tokio-rs/tokio/pull/2011
+[#2012]: https://github.com/tokio-rs/tokio/pull/2012
+[#2014]: https://github.com/tokio-rs/tokio/pull/2014
+[#2022]: https://github.com/tokio-rs/tokio/pull/2022
+[#2025]: https://github.com/tokio-rs/tokio/pull/2025
+[#2029]: https://github.com/tokio-rs/tokio/pull/2029
+[#2034]: https://github.com/tokio-rs/tokio/pull/2034
+[#2035]: https://github.com/tokio-rs/tokio/pull/2035
+[#2040]: https://github.com/tokio-rs/tokio/pull/2040
+[#2045]: https://github.com/tokio-rs/tokio/pull/2045
+[#2059]: https://github.com/tokio-rs/tokio/pull/2059
+
 # 0.2.6 (December 19, 2019)
 
 ### Fixes
+
 - `fs::File::seek` API regression ([#1991]).
 
+[#1991]: https://github.com/tokio-rs/tokio/pull/1991
+
 # 0.2.5 (December 18, 2019)
 
 ### Added
+
 - `io::AsyncSeek` trait ([#1924]).
 - `Mutex::try_lock` ([#1939])
 - `mpsc::Receiver::try_recv` and `mpsc::UnboundedReceiver::try_recv` ([#1939]).
@@ -291,24 +1333,47 @@
 - `stream::StreamExt` provides stream utilities ([#1962]).
 
 ### Fixes
+
 - deadlock risk while shutting down the runtime ([#1972]).
 - panic while shutting down the runtime ([#1978]).
 - `sync::MutexGuard` debug output ([#1961]).
-- misc doc improvements (#1933, #1934, #1940, #1942).
+- misc doc improvements ([#1933], [#1934], [#1940], [#1942]).
 
 ### Changes
+
 - runtime threads are configured with `runtime::Builder::core_threads` and
   `runtime::Builder::max_threads`. `runtime::Builder::num_threads` is
   deprecated ([#1977]).
 
+[#1924]: https://github.com/tokio-rs/tokio/pull/1924
+[#1933]: https://github.com/tokio-rs/tokio/pull/1933
+[#1934]: https://github.com/tokio-rs/tokio/pull/1934
+[#1939]: https://github.com/tokio-rs/tokio/pull/1939
+[#1940]: https://github.com/tokio-rs/tokio/pull/1940
+[#1942]: https://github.com/tokio-rs/tokio/pull/1942
+[#1943]: https://github.com/tokio-rs/tokio/pull/1943
+[#1949]: https://github.com/tokio-rs/tokio/pull/1949
+[#1956]: https://github.com/tokio-rs/tokio/pull/1956
+[#1961]: https://github.com/tokio-rs/tokio/pull/1961
+[#1962]: https://github.com/tokio-rs/tokio/pull/1962
+[#1972]: https://github.com/tokio-rs/tokio/pull/1972
+[#1973]: https://github.com/tokio-rs/tokio/pull/1973
+[#1975]: https://github.com/tokio-rs/tokio/pull/1975
+[#1977]: https://github.com/tokio-rs/tokio/pull/1977
+[#1978]: https://github.com/tokio-rs/tokio/pull/1978
+
 # 0.2.4 (December 6, 2019)
 
 ### Fixes
+
 - `sync::Mutex` deadlock when `lock()` future is dropped early ([#1898]).
 
+[#1898]: https://github.com/tokio-rs/tokio/pull/1898
+
 # 0.2.3 (December 6, 2019)
 
 ### Added
+
 - read / write integers using `AsyncReadExt` and `AsyncWriteExt` ([#1863]).
 - `read_buf` / `write_buf` for reading / writing `Buf` / `BufMut` ([#1881]).
 - `TcpStream::poll_peek` - pollable API for performing TCP peek ([#1864]).
@@ -320,14 +1385,32 @@
   `std::time::Instant` ([#1904]).
 
 ### Fixes
+
 - calling `spawn_blocking` after runtime shutdown ([#1875]).
 - `LocalSet` drop inifinite loop ([#1892]).
 - `LocalSet` hang under load ([#1905]).
-- improved documentation (#1865, #1866, #1868, #1874, #1876, #1911).
+- improved documentation ([#1865], [#1866], [#1868], [#1874], [#1876], [#1911]).
+
+[#1863]: https://github.com/tokio-rs/tokio/pull/1863
+[#1864]: https://github.com/tokio-rs/tokio/pull/1864
+[#1865]: https://github.com/tokio-rs/tokio/pull/1865
+[#1866]: https://github.com/tokio-rs/tokio/pull/1866
+[#1868]: https://github.com/tokio-rs/tokio/pull/1868
+[#1874]: https://github.com/tokio-rs/tokio/pull/1874
+[#1875]: https://github.com/tokio-rs/tokio/pull/1875
+[#1876]: https://github.com/tokio-rs/tokio/pull/1876
+[#1881]: https://github.com/tokio-rs/tokio/pull/1881
+[#1882]: https://github.com/tokio-rs/tokio/pull/1882
+[#1888]: https://github.com/tokio-rs/tokio/pull/1888
+[#1892]: https://github.com/tokio-rs/tokio/pull/1892
+[#1904]: https://github.com/tokio-rs/tokio/pull/1904
+[#1905]: https://github.com/tokio-rs/tokio/pull/1905
+[#1911]: https://github.com/tokio-rs/tokio/pull/1911
 
 # 0.2.2 (November 29, 2019)
 
 ### Fixes
+
 - scheduling with `basic_scheduler` ([#1861]).
 - update `spawn` panic message to specify that a task scheduler is required ([#1839]).
 - API docs example for `runtime::Builder` to include a task scheduler ([#1841]).
@@ -337,27 +1420,47 @@
 - API docs mention the required Cargo features for `Builder::{basic, threaded}_scheduler` ([#1858]).
 
 ### Added
+
 - impl `Stream` for `signal::unix::Signal` ([#1849]).
 - API docs for platform specific behavior of `signal::ctrl_c` and `signal::unix::Signal` ([#1854]).
 - API docs for `signal::unix::Signal::{recv, poll_recv}` and `signal::windows::CtrlBreak::{recv, poll_recv}` ([#1854]).
 - `File::into_std` and `File::try_into_std` methods ([#1856]).
 
+[#1772]: https://github.com/tokio-rs/tokio/pull/1772
+[#1834]: https://github.com/tokio-rs/tokio/pull/1834
+[#1839]: https://github.com/tokio-rs/tokio/pull/1839
+[#1841]: https://github.com/tokio-rs/tokio/pull/1841
+[#1843]: https://github.com/tokio-rs/tokio/pull/1843
+[#1849]: https://github.com/tokio-rs/tokio/pull/1849
+[#1854]: https://github.com/tokio-rs/tokio/pull/1854
+[#1856]: https://github.com/tokio-rs/tokio/pull/1856
+[#1858]: https://github.com/tokio-rs/tokio/pull/1858
+[#1861]: https://github.com/tokio-rs/tokio/pull/1861
+
 # 0.2.1 (November 26, 2019)
 
 ### Fixes
+
 - API docs for `TcpListener::incoming`, `UnixListener::incoming` ([#1831]).
 
 ### Added
+
 - `tokio::task::LocalSet` provides a strategy for spawning `!Send` tasks ([#1733]).
 - export `tokio::time::Elapsed` ([#1826]).
 - impl `AsRawFd`, `AsRawHandle` for `tokio::fs::File` ([#1827]).
 
+[#1733]: https://github.com/tokio-rs/tokio/pull/1733
+[#1826]: https://github.com/tokio-rs/tokio/pull/1826
+[#1827]: https://github.com/tokio-rs/tokio/pull/1827
+[#1831]: https://github.com/tokio-rs/tokio/pull/1831
+
 # 0.2.0 (November 26, 2019)
 
 A major breaking change. Most implementation and APIs have changed one way or
 another. This changelog entry contains a highlight
 
 ### Changed
+
 - APIs are updated to use `async / await`.
 - most `tokio-*` crates are collapsed into this crate.
 - Scheduler is rewritten.
@@ -369,6 +1472,7 @@
 - `tokio::codec` is moved to `tokio-util`.
 
 ### Removed
+
 - Standalone `timer` and `net` drivers are removed, use `Runtime` instead
 - `current_thread` runtime is removed, use `tokio::runtime::Runtime` with
   `basic_scheduler` instead.
@@ -376,311 +1480,221 @@
 # 0.1.21 (May 30, 2019)
 
 ### Changed
+
 - Bump `tokio-trace-core` version to 0.2 ([#1111]).
 
+[#1111]: https://github.com/tokio-rs/tokio/pull/1111
+
 # 0.1.20 (May 14, 2019)
 
 ### Added
+
 - `tokio::runtime::Builder::panic_handler` allows configuring handling
   panics on the runtime ([#1055]).
 
+[#1055]: https://github.com/tokio-rs/tokio/pull/1055
+
 # 0.1.19 (April 22, 2019)
 
 ### Added
+
 - Re-export `tokio::sync::Mutex` primitive ([#964]).
 
+[#964]: https://github.com/tokio-rs/tokio/pull/964
+
 # 0.1.18 (March 22, 2019)
 
 ### Added
+
 - `TypedExecutor` re-export and implementations ([#993]).
 
+[#993]: https://github.com/tokio-rs/tokio/pull/993
+
 # 0.1.17 (March 13, 2019)
 
 ### Added
+
 - Propagate trace subscriber in the runtime ([#966]).
 
+[#966]: https://github.com/tokio-rs/tokio/pull/966
+
 # 0.1.16 (March 1, 2019)
 
 ### Fixed
+
 - async-await: track latest nightly changes ([#940]).
 
 ### Added
+
 - `sync::Watch`, a single value broadcast channel ([#922]).
 - Async equivalent of read / write file helpers being added to `std` ([#896]).
 
+[#896]: https://github.com/tokio-rs/tokio/pull/896
+[#922]: https://github.com/tokio-rs/tokio/pull/922
+[#940]: https://github.com/tokio-rs/tokio/pull/940
+
 # 0.1.15 (January 24, 2019)
 
 ### Added
+
 - Re-export tokio-sync APIs ([#839]).
 - Stream enumerate combinator ([#832]).
 
+[#832]: https://github.com/tokio-rs/tokio/pull/832
+[#839]: https://github.com/tokio-rs/tokio/pull/839
+
 # 0.1.14 (January 6, 2019)
 
-* Use feature flags to break up the crate, allowing users to pick & choose
+- Use feature flags to break up the crate, allowing users to pick & choose
   components ([#808]).
-* Export `UnixDatagram` and `UnixDatagramFramed` ([#772]).
+- Export `UnixDatagram` and `UnixDatagramFramed` ([#772]).
+
+[#772]: https://github.com/tokio-rs/tokio/pull/772
+[#808]: https://github.com/tokio-rs/tokio/pull/808
 
 # 0.1.13 (November 21, 2018)
 
-* Fix `Runtime::reactor()` when no tasks are spawned ([#721]).
-* `runtime::Builder` no longer uses deprecated methods ([#749]).
-* Provide `after_start` and `before_stop` configuration settings for
+- Fix `Runtime::reactor()` when no tasks are spawned ([#721]).
+- `runtime::Builder` no longer uses deprecated methods ([#749]).
+- Provide `after_start` and `before_stop` configuration settings for
   `Runtime` ([#756]).
-* Implement throttle stream combinator ([#736]).
+- Implement throttle stream combinator ([#736]).
+
+[#721]: https://github.com/tokio-rs/tokio/pull/721
+[#736]: https://github.com/tokio-rs/tokio/pull/736
+[#749]: https://github.com/tokio-rs/tokio/pull/749
+[#756]: https://github.com/tokio-rs/tokio/pull/756
 
 # 0.1.12 (October 23, 2018)
 
-* runtime: expose `keep_alive` on runtime builder ([#676]).
-* runtime: create a reactor per worker thread ([#660]).
-* codec: fix panic in `LengthDelimitedCodec` ([#682]).
-* io: re-export `tokio_io::io::read` function ([#689]).
-* runtime: check for executor re-entry in more places ([#708]).
+- runtime: expose `keep_alive` on runtime builder ([#676]).
+- runtime: create a reactor per worker thread ([#660]).
+- codec: fix panic in `LengthDelimitedCodec` ([#682]).
+- io: re-export `tokio_io::io::read` function ([#689]).
+- runtime: check for executor re-entry in more places ([#708]).
+
+[#660]: https://github.com/tokio-rs/tokio/pull/660
+[#676]: https://github.com/tokio-rs/tokio/pull/676
+[#682]: https://github.com/tokio-rs/tokio/pull/682
+[#689]: https://github.com/tokio-rs/tokio/pull/689
+[#708]: https://github.com/tokio-rs/tokio/pull/708
 
 # 0.1.11 (September 28, 2018)
 
-* Fix `tokio-async-await` dependency ([#675]).
+- Fix `tokio-async-await` dependency ([#675]).
+
+[#675]: https://github.com/tokio-rs/tokio/pull/675
 
 # 0.1.10 (September 27, 2018)
 
-* Fix minimal versions
+- Fix minimal versions
 
 # 0.1.9 (September 27, 2018)
 
-* Experimental async/await improvements ([#661]).
-* Re-export `TaskExecutor` from `tokio-current-thread` ([#652]).
-* Improve `Runtime` builder API ([#645]).
-* `tokio::run` panics when called from the context of an executor
+- Experimental async/await improvements ([#661]).
+- Re-export `TaskExecutor` from `tokio-current-thread` ([#652]).
+- Improve `Runtime` builder API ([#645]).
+- `tokio::run` panics when called from the context of an executor
   ([#646]).
-* Introduce `StreamExt` with a `timeout` helper ([#573]).
-* Move `length_delimited` into `tokio` ([#575]).
-* Re-organize `tokio::net` module ([#548]).
-* Re-export `tokio-current-thread::spawn` in current_thread runtime
+- Introduce `StreamExt` with a `timeout` helper ([#573]).
+- Move `length_delimited` into `tokio` ([#575]).
+- Re-organize `tokio::net` module ([#548]).
+- Re-export `tokio-current-thread::spawn` in current_thread runtime
   ([#579]).
 
+[#548]: https://github.com/tokio-rs/tokio/pull/548
+[#573]: https://github.com/tokio-rs/tokio/pull/573
+[#575]: https://github.com/tokio-rs/tokio/pull/575
+[#579]: https://github.com/tokio-rs/tokio/pull/579
+[#645]: https://github.com/tokio-rs/tokio/pull/645
+[#646]: https://github.com/tokio-rs/tokio/pull/646
+[#652]: https://github.com/tokio-rs/tokio/pull/652
+[#661]: https://github.com/tokio-rs/tokio/pull/661
+
 # 0.1.8 (August 23, 2018)
 
-* Extract tokio::executor::current_thread to a sub crate ([#370])
-* Add `Runtime::block_on` ([#398])
-* Add `runtime::current_thread::block_on_all` ([#477])
-* Misc documentation improvements ([#450])
-* Implement `std::error::Error` for error types ([#501])
+- Extract tokio::executor::current_thread to a sub crate ([#370])
+- Add `Runtime::block_on` ([#398])
+- Add `runtime::current_thread::block_on_all` ([#477])
+- Misc documentation improvements ([#450])
+- Implement `std::error::Error` for error types ([#501])
+
+[#370]: https://github.com/tokio-rs/tokio/pull/370
+[#398]: https://github.com/tokio-rs/tokio/pull/398
+[#450]: https://github.com/tokio-rs/tokio/pull/450
+[#477]: https://github.com/tokio-rs/tokio/pull/477
+[#501]: https://github.com/tokio-rs/tokio/pull/501
 
 # 0.1.7 (June 6, 2018)
 
-* Add `Runtime::block_on` for concurrent runtime ([#391]).
-* Provide handle to `current_thread::Runtime` that allows spawning tasks from
+- Add `Runtime::block_on` for concurrent runtime ([#391]).
+- Provide handle to `current_thread::Runtime` that allows spawning tasks from
   other threads ([#340]).
-* Provide `clock::now()`, a configurable source of time ([#381]).
+- Provide `clock::now()`, a configurable source of time ([#381]).
+
+[#340]: https://github.com/tokio-rs/tokio/pull/340
+[#381]: https://github.com/tokio-rs/tokio/pull/381
+[#391]: https://github.com/tokio-rs/tokio/pull/391
 
 # 0.1.6 (May 2, 2018)
 
-* Add asynchronous filesystem APIs ([#323]).
-* Add "current thread" runtime variant ([#308]).
-* `CurrentThread`: Expose inner `Park` instance.
-* Improve fairness of `CurrentThread` executor ([#313]).
+- Add asynchronous filesystem APIs ([#323]).
+- Add "current thread" runtime variant ([#308]).
+- `CurrentThread`: Expose inner `Park` instance.
+- Improve fairness of `CurrentThread` executor ([#313]).
+
+[#308]: https://github.com/tokio-rs/tokio/pull/308
+[#313]: https://github.com/tokio-rs/tokio/pull/313
+[#323]: https://github.com/tokio-rs/tokio/pull/323
 
 # 0.1.5 (March 30, 2018)
 
-* Provide timer API ([#266])
+- Provide timer API ([#266])
+
+[#266]: https://github.com/tokio-rs/tokio/pull/266
 
 # 0.1.4 (March 22, 2018)
 
-* Fix build on FreeBSD ([#218])
-* Shutdown the Runtime when the handle is dropped ([#214])
-* Set Runtime thread name prefix for worker threads ([#232])
-* Add builder for Runtime ([#234])
-* Extract TCP and UDP types into separate crates ([#224])
-* Optionally support futures 0.2.
+- Fix build on FreeBSD ([#218])
+- Shutdown the Runtime when the handle is dropped ([#214])
+- Set Runtime thread name prefix for worker threads ([#232])
+- Add builder for Runtime ([#234])
+- Extract TCP and UDP types into separate crates ([#224])
+- Optionally support futures 0.2.
+
+[#214]: https://github.com/tokio-rs/tokio/pull/214
+[#218]: https://github.com/tokio-rs/tokio/pull/218
+[#224]: https://github.com/tokio-rs/tokio/pull/224
+[#232]: https://github.com/tokio-rs/tokio/pull/232
+[#234]: https://github.com/tokio-rs/tokio/pull/234
 
 # 0.1.3 (March 09, 2018)
 
-* Fix `CurrentThread::turn` to block on idle ([#212]).
+- Fix `CurrentThread::turn` to block on idle ([#212]).
+
+[#212]: https://github.com/tokio-rs/tokio/pull/212
 
 # 0.1.2 (March 09, 2018)
 
-* Introduce Tokio Runtime ([#141])
-* Provide `CurrentThread` for more flexible usage of current thread executor ([#141]).
-* Add Lio for platforms that support it ([#142]).
-* I/O resources now lazily bind to the reactor ([#160]).
-* Extract Reactor to dedicated crate ([#169])
-* Add facade to sub crates and add prelude ([#166]).
-* Switch TCP/UDP fns to poll_ -> Poll<...> style ([#175])
+- Introduce Tokio Runtime ([#141])
+- Provide `CurrentThread` for more flexible usage of current thread executor ([#141]).
+- Add Lio for platforms that support it ([#142]).
+- I/O resources now lazily bind to the reactor ([#160]).
+- Extract Reactor to dedicated crate ([#169])
+- Add facade to sub crates and add prelude ([#166]).
+- Switch TCP/UDP fns to poll\_ -> Poll<...> style ([#175])
+
+[#141]: https://github.com/tokio-rs/tokio/pull/141
+[#142]: https://github.com/tokio-rs/tokio/pull/142
+[#160]: https://github.com/tokio-rs/tokio/pull/160
+[#166]: https://github.com/tokio-rs/tokio/pull/166
+[#169]: https://github.com/tokio-rs/tokio/pull/169
+[#175]: https://github.com/tokio-rs/tokio/pull/175
 
 # 0.1.1 (February 09, 2018)
 
-* Doc fixes
+- Doc fixes
 
 # 0.1.0 (February 07, 2018)
 
-* Initial crate released based on [RFC](https://github.com/tokio-rs/tokio-rfcs/pull/3).
-
-[#2375]: https://github.com/tokio-rs/tokio/pull/2375
-[#2362]: https://github.com/tokio-rs/tokio/pull/2362
-[#2358]: https://github.com/tokio-rs/tokio/pull/2358
-[#2354]: https://github.com/tokio-rs/tokio/pull/2354
-[#2335]: https://github.com/tokio-rs/tokio/pull/2335
-[#2333]: https://github.com/tokio-rs/tokio/pull/2333
-[#2325]: https://github.com/tokio-rs/tokio/pull/2325
-[#2321]: https://github.com/tokio-rs/tokio/pull/2321
-[#2300]: https://github.com/tokio-rs/tokio/pull/2300
-[#2285]: https://github.com/tokio-rs/tokio/pull/2285
-[#2281]: https://github.com/tokio-rs/tokio/pull/2281
-[#2275]: https://github.com/tokio-rs/tokio/pull/2275
-[#2274]: https://github.com/tokio-rs/tokio/pull/2274
-[#2273]: https://github.com/tokio-rs/tokio/pull/2273
-[#2253]: https://github.com/tokio-rs/tokio/pull/2253
-[#2250]: https://github.com/tokio-rs/tokio/pull/2250
-[#2245]: https://github.com/tokio-rs/tokio/pull/2245
-[#2239]: https://github.com/tokio-rs/tokio/pull/2239
-[#2238]: https://github.com/tokio-rs/tokio/pull/2238
-[#2227]: https://github.com/tokio-rs/tokio/pull/2227
-[#2218]: https://github.com/tokio-rs/tokio/pull/2218
-[#2217]: https://github.com/tokio-rs/tokio/pull/2217
-[#2210]: https://github.com/tokio-rs/tokio/pull/2210
-[#2205]: https://github.com/tokio-rs/tokio/pull/2205
-[#2204]: https://github.com/tokio-rs/tokio/pull/2204
-[#2191]: https://github.com/tokio-rs/tokio/pull/2191
-[#2186]: https://github.com/tokio-rs/tokio/pull/2186
-[#2185]: https://github.com/tokio-rs/tokio/pull/2185
-[#2184]: https://github.com/tokio-rs/tokio/pull/2184
-[#2177]: https://github.com/tokio-rs/tokio/pull/2177
-[#2169]: https://github.com/tokio-rs/tokio/pull/2169
-[#2168]: https://github.com/tokio-rs/tokio/pull/2168
-[#2164]: https://github.com/tokio-rs/tokio/pull/2164
-[#2163]: https://github.com/tokio-rs/tokio/pull/2163
-[#2158]: https://github.com/tokio-rs/tokio/pull/2158
-[#2152]: https://github.com/tokio-rs/tokio/pull/2152
-[#2151]: https://github.com/tokio-rs/tokio/pull/2151
-[#2149]: https://github.com/tokio-rs/tokio/pull/2149
-[#2145]: https://github.com/tokio-rs/tokio/pull/2145
-[#2139]: https://github.com/tokio-rs/tokio/pull/2139
-[#2135]: https://github.com/tokio-rs/tokio/pull/2135
-[#2126]: https://github.com/tokio-rs/tokio/pull/2126
-[#2125]: https://github.com/tokio-rs/tokio/pull/2125
-[#2122]: https://github.com/tokio-rs/tokio/pull/2122
-[#2119]: https://github.com/tokio-rs/tokio/pull/2119
-[#2118]: https://github.com/tokio-rs/tokio/pull/2118
-[#2109]: https://github.com/tokio-rs/tokio/pull/2109
-[#2108]: https://github.com/tokio-rs/tokio/pull/2108
-[#2094]: https://github.com/tokio-rs/tokio/pull/2094
-[#2093]: https://github.com/tokio-rs/tokio/pull/2093
-[#2092]: https://github.com/tokio-rs/tokio/pull/2092
-[#2091]: https://github.com/tokio-rs/tokio/pull/2091
-[#2089]: https://github.com/tokio-rs/tokio/pull/2089
-[#2085]: https://github.com/tokio-rs/tokio/pull/2085
-[#2079]: https://github.com/tokio-rs/tokio/pull/2079
-[#2059]: https://github.com/tokio-rs/tokio/pull/2059
-[#2052]: https://github.com/tokio-rs/tokio/pull/2052
-[#2051]: https://github.com/tokio-rs/tokio/pull/2051
-[#2045]: https://github.com/tokio-rs/tokio/pull/2045
-[#2044]: https://github.com/tokio-rs/tokio/pull/2044
-[#2040]: https://github.com/tokio-rs/tokio/pull/2040
-[#2035]: https://github.com/tokio-rs/tokio/pull/2035
-[#2034]: https://github.com/tokio-rs/tokio/pull/2034
-[#2030]: https://github.com/tokio-rs/tokio/pull/2030
-[#2029]: https://github.com/tokio-rs/tokio/pull/2029
-[#2025]: https://github.com/tokio-rs/tokio/pull/2025
-[#2022]: https://github.com/tokio-rs/tokio/pull/2022
-[#2014]: https://github.com/tokio-rs/tokio/pull/2014
-[#2012]: https://github.com/tokio-rs/tokio/pull/2012
-[#2011]: https://github.com/tokio-rs/tokio/pull/2011
-[#2006]: https://github.com/tokio-rs/tokio/pull/2006
-[#2005]: https://github.com/tokio-rs/tokio/pull/2005
-[#2001]: https://github.com/tokio-rs/tokio/pull/2001
-[#1991]: https://github.com/tokio-rs/tokio/pull/1991
-[#1986]: https://github.com/tokio-rs/tokio/pull/1986
-[#1978]: https://github.com/tokio-rs/tokio/pull/1978
-[#1977]: https://github.com/tokio-rs/tokio/pull/1977
-[#1975]: https://github.com/tokio-rs/tokio/pull/1975
-[#1973]: https://github.com/tokio-rs/tokio/pull/1973
-[#1972]: https://github.com/tokio-rs/tokio/pull/1972
-[#1971]: https://github.com/tokio-rs/tokio/pull/1971
-[#1962]: https://github.com/tokio-rs/tokio/pull/1962
-[#1961]: https://github.com/tokio-rs/tokio/pull/1961
-[#1956]: https://github.com/tokio-rs/tokio/pull/1956
-[#1949]: https://github.com/tokio-rs/tokio/pull/1949
-[#1943]: https://github.com/tokio-rs/tokio/pull/1943
-[#1939]: https://github.com/tokio-rs/tokio/pull/1939
-[#1924]: https://github.com/tokio-rs/tokio/pull/1924
-[#1905]: https://github.com/tokio-rs/tokio/pull/1905
-[#1904]: https://github.com/tokio-rs/tokio/pull/1904
-[#1898]: https://github.com/tokio-rs/tokio/pull/1898
-[#1892]: https://github.com/tokio-rs/tokio/pull/1892
-[#1888]: https://github.com/tokio-rs/tokio/pull/1888
-[#1882]: https://github.com/tokio-rs/tokio/pull/1882
-[#1881]: https://github.com/tokio-rs/tokio/pull/1881
-[#1875]: https://github.com/tokio-rs/tokio/pull/1875
-[#1874]: https://github.com/tokio-rs/tokio/pull/1874
-[#1870]: https://github.com/tokio-rs/tokio/pull/1870
-[#1864]: https://github.com/tokio-rs/tokio/pull/1864
-[#1863]: https://github.com/tokio-rs/tokio/pull/1863
-[#1861]: https://github.com/tokio-rs/tokio/pull/1861
-[#1858]: https://github.com/tokio-rs/tokio/pull/1858
-[#1856]: https://github.com/tokio-rs/tokio/pull/1856
-[#1854]: https://github.com/tokio-rs/tokio/pull/1854
-[#1849]: https://github.com/tokio-rs/tokio/pull/1849
-[#1843]: https://github.com/tokio-rs/tokio/pull/1843
-[#1841]: https://github.com/tokio-rs/tokio/pull/1841
-[#1839]: https://github.com/tokio-rs/tokio/pull/1839
-[#1834]: https://github.com/tokio-rs/tokio/pull/1834
-[#1831]: https://github.com/tokio-rs/tokio/pull/1831
-[#1827]: https://github.com/tokio-rs/tokio/pull/1827
-[#1826]: https://github.com/tokio-rs/tokio/pull/1826
-[#1772]: https://github.com/tokio-rs/tokio/pull/1772
-[#1755]: https://github.com/tokio-rs/tokio/pull/1755
-[#1733]: https://github.com/tokio-rs/tokio/pull/1733
-[#1699]: https://github.com/tokio-rs/tokio/pull/1699
-[#1111]: https://github.com/tokio-rs/tokio/pull/1111
-[#1055]: https://github.com/tokio-rs/tokio/pull/1055
-[#993]:  https://github.com/tokio-rs/tokio/pull/993
-[#966]:  https://github.com/tokio-rs/tokio/pull/966
-[#964]:  https://github.com/tokio-rs/tokio/pull/964
-[#940]:  https://github.com/tokio-rs/tokio/pull/940
-[#922]:  https://github.com/tokio-rs/tokio/pull/922
-[#896]:  https://github.com/tokio-rs/tokio/pull/896
-[#839]:  https://github.com/tokio-rs/tokio/pull/839
-[#832]:  https://github.com/tokio-rs/tokio/pull/832
-[#808]:  https://github.com/tokio-rs/tokio/pull/808
-[#772]:  https://github.com/tokio-rs/tokio/pull/772
-[#756]:  https://github.com/tokio-rs/tokio/pull/756
-[#749]:  https://github.com/tokio-rs/tokio/pull/749
-[#736]:  https://github.com/tokio-rs/tokio/pull/736
-[#721]:  https://github.com/tokio-rs/tokio/pull/721
-[#708]:  https://github.com/tokio-rs/tokio/pull/708
-[#689]:  https://github.com/tokio-rs/tokio/pull/689
-[#682]:  https://github.com/tokio-rs/tokio/pull/682
-[#676]:  https://github.com/tokio-rs/tokio/pull/676
-[#675]:  https://github.com/tokio-rs/tokio/pull/675
-[#661]:  https://github.com/tokio-rs/tokio/pull/661
-[#660]:  https://github.com/tokio-rs/tokio/pull/660
-[#652]:  https://github.com/tokio-rs/tokio/pull/652
-[#646]:  https://github.com/tokio-rs/tokio/pull/646
-[#645]:  https://github.com/tokio-rs/tokio/pull/645
-[#579]:  https://github.com/tokio-rs/tokio/pull/579
-[#575]:  https://github.com/tokio-rs/tokio/pull/575
-[#573]:  https://github.com/tokio-rs/tokio/pull/573
-[#548]:  https://github.com/tokio-rs/tokio/pull/548
-[#501]:  https://github.com/tokio-rs/tokio/pull/501
-[#477]:  https://github.com/tokio-rs/tokio/pull/477
-[#450]:  https://github.com/tokio-rs/tokio/pull/450
-[#398]:  https://github.com/tokio-rs/tokio/pull/398
-[#391]:  https://github.com/tokio-rs/tokio/pull/391
-[#381]:  https://github.com/tokio-rs/tokio/pull/381
-[#370]:  https://github.com/tokio-rs/tokio/pull/370
-[#340]:  https://github.com/tokio-rs/tokio/pull/340
-[#323]:  https://github.com/tokio-rs/tokio/pull/323
-[#313]:  https://github.com/tokio-rs/tokio/pull/313
-[#308]:  https://github.com/tokio-rs/tokio/pull/308
-[#266]:  https://github.com/tokio-rs/tokio/pull/266
-[#234]:  https://github.com/tokio-rs/tokio/pull/234
-[#232]:  https://github.com/tokio-rs/tokio/pull/232
-[#224]:  https://github.com/tokio-rs/tokio/pull/224
-[#218]:  https://github.com/tokio-rs/tokio/pull/218
-[#214]:  https://github.com/tokio-rs/tokio/pull/214
-[#212]:  https://github.com/tokio-rs/tokio/pull/212
-[#175]:  https://github.com/tokio-rs/tokio/pull/175
-[#169]:  https://github.com/tokio-rs/tokio/pull/169
-[#166]:  https://github.com/tokio-rs/tokio/pull/166
-[#160]:  https://github.com/tokio-rs/tokio/pull/160
-[#142]:  https://github.com/tokio-rs/tokio/pull/142
-[#141]:  https://github.com/tokio-rs/tokio/pull/141
+- Initial crate released based on [RFC](https://github.com/tokio-rs/tokio-rfcs/pull/3).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/docs/reactor-refactor.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/docs/reactor-refactor.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/docs/reactor-refactor.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/docs/reactor-refactor.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,276 @@
+# Refactor I/O driver
+
+Describes changes to the I/O driver for the Tokio 0.3 release.
+
+## Goals
+
+* Support `async fn` on I/O types with `&self`.
+* Refine the `Registration` API.
+
+### Non-goals
+
+* Implement `AsyncRead` / `AsyncWrite` for `&TcpStream` or other reference type.
+
+## Overview
+
+Currently, I/O types require `&mut self` for `async` functions. The reason for
+this is the task's waker is stored in the I/O resource's internal state
+(`ScheduledIo`) instead of in the future returned by the `async` function.
+Because of this limitation, I/O types limit the number of wakers to one per
+direction (a direction is either read-related events or write-related events).
+
+Moving the waker from the internal I/O resource's state to the operation's
+future enables multiple wakers to be registered per operation. The "intrusive
+wake list" strategy used by `Notify` applies to this case, though there are some
+concerns unique to the I/O driver.
+
+## Reworking the `Registration` type
+
+While `Registration` is made private (per #2728), it remains in Tokio as an
+implementation detail backing I/O resources such as `TcpStream`. The API of
+`Registration` is updated to support waiting for an arbitrary interest set with
+`&self`. This supports concurrent waiters with a different readiness interest.
+
+```rust
+struct Registration { ... }
+
+// TODO: naming
+struct ReadyEvent {
+    tick: u32,
+    ready: mio::Ready,
+}
+
+impl Registration {
+    /// `interest` must be a super set of **all** interest sets specified in
+    /// the other methods. This is the interest set passed to `mio`.
+    pub fn new<T>(io: &T, interest: mio::Ready) -> io::Result<Registration>
+        where T: mio::Evented;
+
+    /// Awaits for any readiness event included in `interest`. Returns a
+    /// `ReadyEvent` representing the received readiness event.
+    async fn readiness(&self, interest: mio::Ready) -> io::Result<ReadyEvent>;
+
+    /// Clears resource level readiness represented by the specified `ReadyEvent`
+    async fn clear_readiness(&self, ready_event: ReadyEvent);
+```
+
+A new registration is created for a `T: mio::Evented` and a `interest`. This
+creates a `ScheduledIo` entry with the I/O driver and registers the resource
+with `mio`.
+
+Because Tokio uses **edge-triggered** notifications, the I/O driver only
+receives readiness from the OS once the ready state **changes**. The I/O driver
+must track each resource's known readiness state. This helps prevent syscalls
+when the process knows the syscall should return with `EWOULDBLOCK`.
+
+A call to `readiness()` checks if the currently known resource readiness
+overlaps with `interest`. If it does, then the `readiness()` immediately
+returns. If it does not, then the task waits until the I/O driver receives a
+readiness event.
+
+The pseudocode to perform a TCP read is as follows.
+
+```rust
+async fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
+    loop {
+        // Await readiness
+        let event = self.readiness(interest).await?;
+
+        match self.mio_socket.read(buf) {
+            Ok(v) => return Ok(v),
+            Err(ref e) if e.kind() == WouldBlock => {
+                self.clear_readiness(event);
+            }
+            Err(e) => return Err(e),
+        }
+    }
+}
+```
+
+## Reworking the `ScheduledIo` type
+
+The `ScheduledIo` type is switched to use an intrusive waker linked list. Each
+entry in the linked list includes the `interest` set passed to `readiness()`.
+
+```rust
+#[derive(Debug)]
+pub(crate) struct ScheduledIo {
+    /// Resource's known state packed with other state that must be
+    /// atomically updated.
+    readiness: AtomicUsize,
+
+    /// Tracks tasks waiting on the resource
+    waiters: Mutex<Waiters>,
+}
+
+#[derive(Debug)]
+struct Waiters {
+    // List of intrusive waiters.
+    list: LinkedList<Waiter>,
+
+    /// Waiter used by `AsyncRead` implementations.
+    reader: Option<Waker>,
+
+    /// Waiter used by `AsyncWrite` implementations.
+    writer: Option<Waker>,
+}
+
+// This struct is contained by the **future** returned by `readiness()`.
+#[derive(Debug)]
+struct Waiter {
+    /// Intrusive linked-list pointers
+    pointers: linked_list::Pointers<Waiter>,
+
+    /// Waker for task waiting on I/O resource
+    waiter: Option<Waker>,
+
+    /// Readiness events being waited on. This is
+    /// the value passed to `readiness()`
+    interest: mio::Ready,
+
+    /// Should not be `Unpin`.
+    _p: PhantomPinned,
+}
+```
+
+When an I/O event is received from `mio`, the associated resources' readiness is
+updated and the waiter list is iterated. All waiters with `interest` that
+overlap the received readiness event are notified. Any waiter with an `interest`
+that does not overlap the readiness event remains in the list.
+
+## Cancel interest on drop
+
+The future returned by `readiness()` uses an intrusive linked list to store the
+waker with `ScheduledIo`. Because `readiness()` can be called concurrently, many
+wakers may be stored simultaneously in the list. If the `readiness()` future is
+dropped early, it is essential that the waker is removed from the list. This
+prevents leaking memory.
+
+## Race condition
+
+Consider how many tasks may concurrently attempt I/O operations. This, combined
+with how Tokio uses edge-triggered events, can result in a race condition. Let's
+revisit the TCP read function:
+
+```rust
+async fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
+    loop {
+        // Await readiness
+        let event = self.readiness(interest).await?;
+
+        match self.mio_socket.read(buf) {
+            Ok(v) => return Ok(v),
+            Err(ref e) if e.kind() == WouldBlock => {
+                self.clear_readiness(event);
+            }
+            Err(e) => return Err(e),
+        }
+    }
+}
+```
+
+If care is not taken, if between `mio_socket.read(buf)` returning and
+`clear_readiness(event)` is called, a readiness event arrives, the `read()`
+function could deadlock. This happens because the readiness event is received,
+`clear_readiness()` unsets the readiness event, and on the next iteration,
+`readiness().await` will block forever as a new readiness event is not received.
+
+The current I/O driver handles this condition by always registering the task's
+waker before performing the operation. This is not ideal as it will result in
+unnecessary task notification.
+
+Instead, we will use a strategy to prevent clearing readiness if an "unseen"
+readiness event has been received. The I/O driver will maintain a "tick" value.
+Every time the `mio` `poll()` function is called, the tick is incremented. Each
+readiness event has an associated tick. When the I/O driver sets the resource's
+readiness, the driver's tick is packed into the atomic `usize`.
+
+The `ScheduledIo` readiness `AtomicUsize` is structured as:
+
+```
+| reserved | generation |  driver tick | readinesss |
+|----------+------------+--------------+------------|
+|   1 bit  |   7 bits   +    8 bits    +   16 bits  |
+```
+
+The `reserved` and `generation` components exist today.
+
+The `readiness()` function returns a `ReadyEvent` value. This value includes the
+`tick` component read with the resource's readiness value. When
+`clear_readiness()` is called, the `ReadyEvent` is provided. Readiness is only
+cleared if the current `tick` matches the `tick` included in the `ReadyEvent`.
+If the tick values do not match, the call to `readiness()` on the next iteration
+will not block and the new `tick` is included in the new `ReadyToken.`
+
+TODO
+
+## Implementing `AsyncRead` / `AsyncWrite`
+
+The `AsyncRead` and `AsyncWrite` traits use a "poll" based API. This means that
+it is not possible to use an intrusive linked list to track the waker.
+Additionally, there is no future associated with the operation which means it is
+not possible to cancel interest in the readiness events.
+
+To implement `AsyncRead` and `AsyncWrite`, `ScheduledIo` includes dedicated
+waker values for the read direction and the write direction. These values are
+used to store the waker. Specific `interest` is not tracked for `AsyncRead` and
+`AsyncWrite` implementations. It is assumed that only events of interest are:
+
+* Read ready
+* Read closed
+* Write ready
+* Write closed
+
+Note that "read closed" and "write closed" are only available with Mio 0.7. With
+Mio 0.6, things were a bit messy.
+
+It is only possible to implement `AsyncRead` and `AsyncWrite` for resource types
+themselves and not for `&Resource`. Implementing the traits for `&Resource`
+would permit concurrent operations to the resource. Because only a single waker
+is stored per direction, any concurrent usage would result in deadlocks. An
+alternate implementation would call for a `Vec<Waker>` but this would result in
+memory leaks.
+
+## Enabling reads and writes for `&TcpStream`
+
+Instead of implementing `AsyncRead` and `AsyncWrite` for `&TcpStream`, a new
+function is added to `TcpStream`.
+
+```rust
+impl TcpStream {
+    /// Naming TBD
+    fn by_ref(&self) -> TcpStreamRef<'_>;
+}
+
+struct TcpStreamRef<'a> {
+    stream: &'a TcpStream,
+
+    // `Waiter` is the node in the intrusive waiter linked-list
+    read_waiter: Waiter,
+    write_waiter: Waiter,
+}
+```
+
+Now, `AsyncRead` and `AsyncWrite` can be implemented on `TcpStreamRef<'a>`. When
+the `TcpStreamRef` is dropped, all associated waker resources are cleaned up.
+
+### Removing all the `split()` functions
+
+With `TcpStream::by_ref()`, `TcpStream::split()` is no longer needed. Instead,
+it is possible to do something as follows.
+
+```rust
+let rd = my_stream.by_ref();
+let wr = my_stream.by_ref();
+
+select! {
+    // use `rd` and `wr` in separate branches.
+}
+```
+
+It is also possible to store a `TcpStream` in an `Arc`.
+
+```rust
+let arc_stream = Arc::new(my_tcp_stream);
+let n = arc_stream.by_ref().read(buf).await?;
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Tokio Contributors
+Copyright (c) 2021 Tokio Contributors
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -14,22 +14,21 @@
 
 [![Crates.io][crates-badge]][crates-url]
 [![MIT licensed][mit-badge]][mit-url]
-[![Build Status][azure-badge]][azure-url]
+[![Build Status][actions-badge]][actions-url]
 [![Discord chat][discord-badge]][discord-url]
 
 [crates-badge]: https://img.shields.io/crates/v/tokio.svg
 [crates-url]: https://crates.io/crates/tokio
 [mit-badge]: https://img.shields.io/badge/license-MIT-blue.svg
 [mit-url]: https://github.com/tokio-rs/tokio/blob/master/LICENSE
-[azure-badge]: https://dev.azure.com/tokio-rs/Tokio/_apis/build/status/tokio-rs.tokio?branchName=master
-[azure-url]: https://dev.azure.com/tokio-rs/Tokio/_build/latest?definitionId=1&branchName=master
+[actions-badge]: https://github.com/tokio-rs/tokio/workflows/CI/badge.svg
+[actions-url]: https://github.com/tokio-rs/tokio/actions?query=workflow%3ACI+branch%3Amaster
 [discord-badge]: https://img.shields.io/discord/500028886025895936.svg?logo=discord&style=flat-square
 [discord-url]: https://discord.gg/tokio
 
 [Website](https://tokio.rs) |
 [Guides](https://tokio.rs/tokio/tutorial) |
 [API Docs](https://docs.rs/tokio/latest/tokio) |
-[Roadmap](https://github.com/tokio-rs/tokio/blob/master/ROADMAP.md) |
 [Chat](https://discord.gg/tokio)
 
 ## Overview
@@ -51,15 +50,23 @@
 
 ## Example
 
-A basic TCP echo server with Tokio:
+A basic TCP echo server with Tokio.
+
+Make sure you activated the full features of the tokio crate on Cargo.toml:
+
+```toml
+[dependencies]
+tokio = { version = "1.11.0", features = ["full"] }
+```
+Then, on your main.rs:
 
 ```rust,no_run
 use tokio::net::TcpListener;
-use tokio::prelude::*;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut listener = TcpListener::bind("127.0.0.1:8080").await?;
+    let listener = TcpListener::bind("127.0.0.1:8080").await?;
 
     loop {
         let (mut socket, _) = listener.accept().await?;
@@ -133,8 +140,7 @@
 
 * [`tower`]: A library of modular and reusable components for building robust networking clients and servers.
 
-* [`tracing`] (formerly `tokio-trace`): A framework for application-level
-  tracing and async-aware diagnostics.
+* [`tracing`] (formerly `tokio-trace`): A framework for application-level tracing and async-aware diagnostics.
 
 * [`rdbc`]: A Rust database connectivity library for MySQL, Postgres and SQLite.
 
@@ -157,9 +163,35 @@
 
 ## Supported Rust Versions
 
-Tokio is built against the latest stable release. The minimum supported version is 1.39.
-The current Tokio version is not guaranteed to build on Rust versions earlier than the
-minimum supported version.
+Tokio is built against the latest stable release. The minimum supported version
+is 1.45.  The current Tokio version is not guaranteed to build on Rust versions
+earlier than the minimum supported version.
+
+## Release schedule
+
+Tokio doesn't follow a fixed release schedule, but we typically make one to two
+new minor releases each month. We make patch releases for bugfixes as necessary.
+
+## Bug patching policy
+
+For the purposes of making patch releases with bugfixes, we have designated
+certain minor releases as LTS (long term support) releases. Whenever a bug
+warrants a patch release with a fix for the bug, it will be backported and
+released as a new patch release for each LTS minor version. Our current LTS
+releases are:
+
+ * `1.8.x` - LTS release until February 2022.
+
+Each LTS release will continue to receive backported fixes for at least half a
+year. If you wish to use a fixed minor release in your project, we recommend
+that you use an LTS release.
+
+To use a fixed minor version, you can specify the version with a tilde. For
+example, to specify that you wish to use the newest `1.8.x` patch release, you
+can use the following dependency specification:
+```text
+tokio = { version = "~1.8", features = [...] }
+```
 
 ## License
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/blocking.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/blocking.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/blocking.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/blocking.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+cfg_rt! {
+    pub(crate) use crate::runtime::spawn_blocking;
+    pub(crate) use crate::task::JoinHandle;
+}
+
+cfg_not_rt! {
+    use std::fmt;
+    use std::future::Future;
+    use std::pin::Pin;
+    use std::task::{Context, Poll};
+
+    pub(crate) fn spawn_blocking<F, R>(_f: F) -> JoinHandle<R>
+    where
+        F: FnOnce() -> R + Send + 'static,
+        R: Send + 'static,
+    {
+        assert_send_sync::<JoinHandle<std::cell::Cell<()>>>();
+        panic!("requires the `rt` Tokio feature flag")
+
+    }
+
+    pub(crate) struct JoinHandle<R> {
+        _p: std::marker::PhantomData<R>,
+    }
+
+    unsafe impl<T: Send> Send for JoinHandle<T> {}
+    unsafe impl<T: Send> Sync for JoinHandle<T> {}
+
+    impl<R> Future for JoinHandle<R> {
+        type Output = Result<R, std::io::Error>;
+
+        fn poll(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Self::Output> {
+            unreachable!()
+        }
+    }
+
+    impl<T> fmt::Debug for JoinHandle<T>
+    where
+        T: fmt::Debug,
+    {
+        fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+            fmt.debug_struct("JoinHandle").finish()
+        }
+    }
+
+    fn assert_send_sync<T: Send + Sync>() {
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/coop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/coop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/coop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/coop.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,53 +1,33 @@
-//! Opt-in yield points for improved cooperative scheduling.
-//!
-//! A single call to [`poll`] on a top-level task may potentially do a lot of
-//! work before it returns `Poll::Pending`. If a task runs for a long period of
-//! time without yielding back to the executor, it can starve other tasks
-//! waiting on that executor to execute them, or drive underlying resources.
-//! Since Rust does not have a runtime, it is difficult to forcibly preempt a
-//! long-running task. Instead, this module provides an opt-in mechanism for
-//! futures to collaborate with the executor to avoid starvation.
-//!
-//! Consider a future like this one:
-//!
-//! ```
-//! # use tokio::stream::{Stream, StreamExt};
-//! async fn drop_all<I: Stream + Unpin>(mut input: I) {
-//!     while let Some(_) = input.next().await {}
-//! }
-//! ```
-//!
-//! It may look harmless, but consider what happens under heavy load if the
-//! input stream is _always_ ready. If we spawn `drop_all`, the task will never
-//! yield, and will starve other tasks and resources on the same executor. With
-//! opt-in yield points, this problem is alleviated:
-//!
-//! ```ignore
-//! # use tokio::stream::{Stream, StreamExt};
-//! async fn drop_all<I: Stream + Unpin>(mut input: I) {
-//!     while let Some(_) = input.next().await {
-//!         tokio::coop::proceed().await;
-//!     }
-//! }
-//! ```
-//!
-//! The `proceed` future will coordinate with the executor to make sure that
-//! every so often control is yielded back to the executor so it can run other
-//! tasks.
-//!
-//! # Placing yield points
+#![cfg_attr(not(feature = "full"), allow(dead_code))]
+
+//! Yield points for improved cooperative scheduling.
 //!
-//! Voluntary yield points should be placed _after_ at least some work has been
-//! done. If they are not, a future sufficiently deep in the task hierarchy may
-//! end up _never_ getting to run because of the number of yield points that
-//! inevitably appear before it is reached. In general, you will want yield
-//! points to only appear in "leaf" futures -- those that do not themselves poll
-//! other futures. By doing this, you avoid double-counting each iteration of
-//! the outer future against the cooperating budget.
+//! Documentation for this can be found in the [`tokio::task`] module.
 //!
-//! [`poll`]: method@std::future::Future::poll
+//! [`tokio::task`]: crate::task.
 
-// NOTE: The doctests in this module are ignored since the whole module is (currently) private.
+// ```ignore
+// # use tokio_stream::{Stream, StreamExt};
+// async fn drop_all<I: Stream + Unpin>(mut input: I) {
+//     while let Some(_) = input.next().await {
+//         tokio::coop::proceed().await;
+//     }
+// }
+// ```
+//
+// The `proceed` future will coordinate with the executor to make sure that
+// every so often control is yielded back to the executor so it can run other
+// tasks.
+//
+// # Placing yield points
+//
+// Voluntary yield points should be placed _after_ at least some work has been
+// done. If they are not, a future sufficiently deep in the task hierarchy may
+// end up _never_ getting to run because of the number of yield points that
+// inevitably appear before it is reached. In general, you will want yield
+// points to only appear in "leaf" futures -- those that do not themselves poll
+// other futures. By doing this, you avoid double-counting each iteration of
+// the outer future against the cooperating budget.
 
 use std::cell::Cell;
 
@@ -81,7 +61,7 @@
     }
 }
 
-cfg_rt_threaded! {
+cfg_rt_multi_thread! {
     impl Budget {
         fn has_remaining(self) -> bool {
             self.0.map(|budget| budget > 0).unwrap_or(true)
@@ -96,12 +76,11 @@
     with_budget(Budget::initial(), f)
 }
 
-cfg_rt_threaded! {
-    /// Set the current task's budget
-    #[cfg(feature = "blocking")]
-    pub(crate) fn set(budget: Budget) {
-        CURRENT.with(|cell| cell.set(budget))
-    }
+/// Run the given closure with an unconstrained task budget. When the function returns, the budget
+/// is reset to the value prior to calling the function.
+#[inline(always)]
+pub(crate) fn with_unconstrained<R>(f: impl FnOnce() -> R) -> R {
+    with_budget(Budget::unconstrained(), f)
 }
 
 #[inline(always)]
@@ -128,14 +107,19 @@
     })
 }
 
-cfg_rt_threaded! {
+cfg_rt_multi_thread! {
+    /// Set the current task's budget
+    pub(crate) fn set(budget: Budget) {
+        CURRENT.with(|cell| cell.set(budget))
+    }
+
     #[inline(always)]
     pub(crate) fn has_budget_remaining() -> bool {
         CURRENT.with(|cell| cell.get().has_remaining())
     }
 }
 
-cfg_blocking_impl! {
+cfg_rt! {
     /// Forcibly remove the budgeting constraints early.
     ///
     /// Returns the remaining budget
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/doc/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/doc/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/doc/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/doc/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+//! Types which are documented locally in the Tokio crate, but does not actually
+//! live here.
+//!
+//! **Note** this module is only visible on docs.rs, you cannot use it directly
+//! in your own code.
+
+/// The name of a type which is not defined here.
+///
+/// This is typically used as an alias for another type, like so:
+///
+/// ```rust,ignore
+/// /// See [some::other::location](https://example.com).
+/// type DEFINED_ELSEWHERE = crate::doc::NotDefinedHere;
+/// ```
+///
+/// This type is uninhabitable like the [`never` type] to ensure that no one
+/// will ever accidentally use it.
+///
+/// [`never` type]: https://doc.rust-lang.org/std/primitive.never.html
+pub enum NotDefinedHere {}
+
+pub mod os;
+pub mod winapi;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/doc/os.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/doc/os.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/doc/os.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/doc/os.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+//! See [std::os](https://doc.rust-lang.org/std/os/index.html).
+
+/// Platform-specific extensions to `std` for Windows.
+///
+/// See [std::os::windows](https://doc.rust-lang.org/std/os/windows/index.html).
+pub mod windows {
+    /// Windows-specific extensions to general I/O primitives.
+    ///
+    /// See [std::os::windows::io](https://doc.rust-lang.org/std/os/windows/io/index.html).
+    pub mod io {
+        /// See [std::os::windows::io::RawHandle](https://doc.rust-lang.org/std/os/windows/io/type.RawHandle.html)
+        pub type RawHandle = crate::doc::NotDefinedHere;
+
+        /// See [std::os::windows::io::AsRawHandle](https://doc.rust-lang.org/std/os/windows/io/trait.AsRawHandle.html)
+        pub trait AsRawHandle {
+            /// See [std::os::windows::io::FromRawHandle::from_raw_handle](https://doc.rust-lang.org/std/os/windows/io/trait.AsRawHandle.html#tymethod.as_raw_handle)
+            fn as_raw_handle(&self) -> RawHandle;
+        }
+
+        /// See [std::os::windows::io::FromRawHandle](https://doc.rust-lang.org/std/os/windows/io/trait.FromRawHandle.html)
+        pub trait FromRawHandle {
+            /// See [std::os::windows::io::FromRawHandle::from_raw_handle](https://doc.rust-lang.org/std/os/windows/io/trait.FromRawHandle.html#tymethod.from_raw_handle)
+            unsafe fn from_raw_handle(handle: RawHandle) -> Self;
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/doc/winapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/doc/winapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/doc/winapi.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/doc/winapi.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,66 @@
+//! See [winapi].
+//!
+//! [winapi]: https://docs.rs/winapi
+
+/// See [winapi::shared](https://docs.rs/winapi/*/winapi/shared/index.html).
+pub mod shared {
+    /// See [winapi::shared::winerror](https://docs.rs/winapi/*/winapi/shared/winerror/index.html).
+    #[allow(non_camel_case_types)]
+    pub mod winerror {
+        /// See [winapi::shared::winerror::ERROR_ACCESS_DENIED][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/shared/winerror/constant.ERROR_ACCESS_DENIED.html
+        pub type ERROR_ACCESS_DENIED = crate::doc::NotDefinedHere;
+
+        /// See [winapi::shared::winerror::ERROR_PIPE_BUSY][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/shared/winerror/constant.ERROR_PIPE_BUSY.html
+        pub type ERROR_PIPE_BUSY = crate::doc::NotDefinedHere;
+
+        /// See [winapi::shared::winerror::ERROR_MORE_DATA][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/shared/winerror/constant.ERROR_MORE_DATA.html
+        pub type ERROR_MORE_DATA = crate::doc::NotDefinedHere;
+    }
+}
+
+/// See [winapi::um](https://docs.rs/winapi/*/winapi/um/index.html).
+pub mod um {
+    /// See [winapi::um::winbase](https://docs.rs/winapi/*/winapi/um/winbase/index.html).
+    #[allow(non_camel_case_types)]
+    pub mod winbase {
+        /// See [winapi::um::winbase::PIPE_TYPE_MESSAGE][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/um/winbase/constant.PIPE_TYPE_MESSAGE.html
+        pub type PIPE_TYPE_MESSAGE = crate::doc::NotDefinedHere;
+
+        /// See [winapi::um::winbase::PIPE_TYPE_BYTE][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/um/winbase/constant.PIPE_TYPE_BYTE.html
+        pub type PIPE_TYPE_BYTE = crate::doc::NotDefinedHere;
+
+        /// See [winapi::um::winbase::PIPE_CLIENT_END][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/um/winbase/constant.PIPE_CLIENT_END.html
+        pub type PIPE_CLIENT_END = crate::doc::NotDefinedHere;
+
+        /// See [winapi::um::winbase::PIPE_SERVER_END][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/um/winbase/constant.PIPE_SERVER_END.html
+        pub type PIPE_SERVER_END = crate::doc::NotDefinedHere;
+
+        /// See [winapi::um::winbase::SECURITY_IDENTIFICATION][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/um/winbase/constant.SECURITY_IDENTIFICATION.html
+        pub type SECURITY_IDENTIFICATION = crate::doc::NotDefinedHere;
+    }
+
+    /// See [winapi::um::minwinbase](https://docs.rs/winapi/*/winapi/um/minwinbase/index.html).
+    #[allow(non_camel_case_types)]
+    pub mod minwinbase {
+        /// See [winapi::um::minwinbase::SECURITY_ATTRIBUTES][winapi]
+        ///
+        /// [winapi]: https://docs.rs/winapi/*/winapi/um/minwinbase/constant.SECURITY_ATTRIBUTES.html
+        pub type SECURITY_ATTRIBUTES = crate::doc::NotDefinedHere;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/copy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/copy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/copy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/copy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,13 @@
 use crate::fs::asyncify;
 use std::path::Path;
 
-/// Copies the contents of one file to another. This function will also copy the permission bits of the original file to the destination file.
+/// Copies the contents of one file to another. This function will also copy the permission bits
+/// of the original file to the destination file.
 /// This function will overwrite the contents of to.
 ///
-/// This is the async equivalent of `std::fs::copy`.
+/// This is the async equivalent of [`std::fs::copy`][std].
+///
+/// [std]: fn@std::fs::copy
 ///
 /// # Examples
 ///
@@ -17,7 +20,7 @@
 /// # }
 /// ```
 
-pub async fn copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> Result<u64, std::io::Error> {
+pub async fn copy(from: impl AsRef<Path>, to: impl AsRef<Path>) -> Result<u64, std::io::Error> {
     let from = from.as_ref().to_owned();
     let to = to.as_ref().to_owned();
     asyncify(|| std::fs::copy(from, to)).await
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/dir_builder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/dir_builder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/dir_builder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/dir_builder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,14 +5,10 @@
 
 /// A builder for creating directories in various manners.
 ///
-/// Additional Unix-specific options are available via importing the
-/// [`DirBuilderExt`] trait.
-///
 /// This is a specialized version of [`std::fs::DirBuilder`] for usage on
 /// the Tokio runtime.
 ///
 /// [std::fs::DirBuilder]: std::fs::DirBuilder
-/// [`DirBuilderExt`]: crate::fs::os::unix::DirBuilderExt
 #[derive(Debug, Default)]
 pub struct DirBuilder {
     /// Indicates whether to create parent directories if they are missing.
@@ -100,7 +96,7 @@
     ///     Ok(())
     /// }
     /// ```
-    pub async fn create<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+    pub async fn create(&self, path: impl AsRef<Path>) -> io::Result<()> {
         let path = path.as_ref().to_owned();
         let mut builder = std::fs::DirBuilder::new();
         builder.recursive(self.recursive);
@@ -115,3 +111,27 @@
         asyncify(move || builder.create(path)).await
     }
 }
+
+feature! {
+    #![unix]
+
+    impl DirBuilder {
+        /// Sets the mode to create new directories with.
+        ///
+        /// This option defaults to 0o777.
+        ///
+        /// # Examples
+        ///
+        ///
+        /// ```no_run
+        /// use tokio::fs::DirBuilder;
+        ///
+        /// let mut builder = DirBuilder::new();
+        /// builder.mode(0o775);
+        /// ```
+        pub fn mode(&mut self, mode: u32) -> &mut Self {
+            self.mode = Some(mode);
+            self
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/file/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/file/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/file/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/file/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,955 @@
+use super::*;
+use crate::{
+    fs::mocks::*,
+    io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt},
+};
+use mockall::{predicate::eq, Sequence};
+use tokio_test::{assert_pending, assert_ready_err, assert_ready_ok, task};
+
+const HELLO: &[u8] = b"hello world...";
+const FOO: &[u8] = b"foo bar baz...";
+
+#[test]
+fn open_read() {
+    let mut file = MockFile::default();
+    file.expect_inner_read().once().returning(|buf| {
+        buf[0..HELLO.len()].copy_from_slice(HELLO);
+        Ok(HELLO.len())
+    });
+    let mut file = File::from_std(file);
+
+    let mut buf = [0; 1024];
+    let mut t = task::spawn(file.read(&mut buf));
+
+    assert_eq!(0, pool::len());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+
+    pool::run_one();
+
+    assert!(t.is_woken());
+
+    let n = assert_ready_ok!(t.poll());
+    assert_eq!(n, HELLO.len());
+    assert_eq!(&buf[..n], HELLO);
+}
+
+#[test]
+fn read_twice_before_dispatch() {
+    let mut file = MockFile::default();
+    file.expect_inner_read().once().returning(|buf| {
+        buf[0..HELLO.len()].copy_from_slice(HELLO);
+        Ok(HELLO.len())
+    });
+    let mut file = File::from_std(file);
+
+    let mut buf = [0; 1024];
+    let mut t = task::spawn(file.read(&mut buf));
+
+    assert_pending!(t.poll());
+    assert_pending!(t.poll());
+
+    assert_eq!(pool::len(), 1);
+    pool::run_one();
+
+    assert!(t.is_woken());
+
+    let n = assert_ready_ok!(t.poll());
+    assert_eq!(&buf[..n], HELLO);
+}
+
+#[test]
+fn read_with_smaller_buf() {
+    let mut file = MockFile::default();
+    file.expect_inner_read().once().returning(|buf| {
+        buf[0..HELLO.len()].copy_from_slice(HELLO);
+        Ok(HELLO.len())
+    });
+
+    let mut file = File::from_std(file);
+
+    {
+        let mut buf = [0; 32];
+        let mut t = task::spawn(file.read(&mut buf));
+        assert_pending!(t.poll());
+    }
+
+    pool::run_one();
+
+    {
+        let mut buf = [0; 4];
+        let mut t = task::spawn(file.read(&mut buf));
+        let n = assert_ready_ok!(t.poll());
+        assert_eq!(n, 4);
+        assert_eq!(&buf[..], &HELLO[..n]);
+    }
+
+    // Calling again immediately succeeds with the rest of the buffer
+    let mut buf = [0; 32];
+    let mut t = task::spawn(file.read(&mut buf));
+    let n = assert_ready_ok!(t.poll());
+    assert_eq!(n, 10);
+    assert_eq!(&buf[..n], &HELLO[4..]);
+
+    assert_eq!(0, pool::len());
+}
+
+#[test]
+fn read_with_bigger_buf() {
+    let mut seq = Sequence::new();
+    let mut file = MockFile::default();
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..4].copy_from_slice(&HELLO[..4]);
+            Ok(4)
+        });
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..HELLO.len() - 4].copy_from_slice(&HELLO[4..]);
+            Ok(HELLO.len() - 4)
+        });
+
+    let mut file = File::from_std(file);
+
+    {
+        let mut buf = [0; 4];
+        let mut t = task::spawn(file.read(&mut buf));
+        assert_pending!(t.poll());
+    }
+
+    pool::run_one();
+
+    {
+        let mut buf = [0; 32];
+        let mut t = task::spawn(file.read(&mut buf));
+        let n = assert_ready_ok!(t.poll());
+        assert_eq!(n, 4);
+        assert_eq!(&buf[..n], &HELLO[..n]);
+    }
+
+    // Calling again immediately succeeds with the rest of the buffer
+    let mut buf = [0; 32];
+    let mut t = task::spawn(file.read(&mut buf));
+
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+
+    let n = assert_ready_ok!(t.poll());
+    assert_eq!(n, 10);
+    assert_eq!(&buf[..n], &HELLO[4..]);
+
+    assert_eq!(0, pool::len());
+}
+
+#[test]
+fn read_err_then_read_success() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|_| Err(io::ErrorKind::Other.into()));
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..HELLO.len()].copy_from_slice(HELLO);
+            Ok(HELLO.len())
+        });
+
+    let mut file = File::from_std(file);
+
+    {
+        let mut buf = [0; 32];
+        let mut t = task::spawn(file.read(&mut buf));
+        assert_pending!(t.poll());
+
+        pool::run_one();
+
+        assert_ready_err!(t.poll());
+    }
+
+    {
+        let mut buf = [0; 32];
+        let mut t = task::spawn(file.read(&mut buf));
+        assert_pending!(t.poll());
+
+        pool::run_one();
+
+        let n = assert_ready_ok!(t.poll());
+
+        assert_eq!(n, HELLO.len());
+        assert_eq!(&buf[..n], HELLO);
+    }
+}
+
+#[test]
+fn open_write() {
+    let mut file = MockFile::default();
+    file.expect_inner_write()
+        .once()
+        .with(eq(HELLO))
+        .returning(|buf| Ok(buf.len()));
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.write(HELLO));
+
+    assert_eq!(0, pool::len());
+    assert_ready_ok!(t.poll());
+
+    assert_eq!(1, pool::len());
+
+    pool::run_one();
+
+    assert!(!t.is_woken());
+
+    let mut t = task::spawn(file.flush());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn flush_while_idle() {
+    let file = MockFile::default();
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.flush());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn read_with_buffer_larger_than_max() {
+    // Chunks
+    let chunk_a = 16 * 1024;
+    let chunk_b = chunk_a * 2;
+    let chunk_c = chunk_a * 3;
+    let chunk_d = chunk_a * 4;
+
+    assert_eq!(chunk_d / 1024, 64);
+
+    let mut data = vec![];
+    for i in 0..(chunk_d - 1) {
+        data.push((i % 151) as u8);
+    }
+    let data = Arc::new(data);
+    let d0 = data.clone();
+    let d1 = data.clone();
+    let d2 = data.clone();
+    let d3 = data.clone();
+
+    let mut seq = Sequence::new();
+    let mut file = MockFile::default();
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(move |buf| {
+            buf[0..chunk_a].copy_from_slice(&d0[0..chunk_a]);
+            Ok(chunk_a)
+        });
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(move |buf| {
+            buf[..chunk_a].copy_from_slice(&d1[chunk_a..chunk_b]);
+            Ok(chunk_b - chunk_a)
+        });
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(move |buf| {
+            buf[..chunk_a].copy_from_slice(&d2[chunk_b..chunk_c]);
+            Ok(chunk_c - chunk_b)
+        });
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(move |buf| {
+            buf[..chunk_a - 1].copy_from_slice(&d3[chunk_c..]);
+            Ok(chunk_a - 1)
+        });
+    let mut file = File::from_std(file);
+
+    let mut actual = vec![0; chunk_d];
+    let mut pos = 0;
+
+    while pos < data.len() {
+        let mut t = task::spawn(file.read(&mut actual[pos..]));
+
+        assert_pending!(t.poll());
+        pool::run_one();
+        assert!(t.is_woken());
+
+        let n = assert_ready_ok!(t.poll());
+        assert!(n <= chunk_a);
+
+        pos += n;
+    }
+
+    assert_eq!(&data[..], &actual[..data.len()]);
+}
+
+#[test]
+fn write_with_buffer_larger_than_max() {
+    // Chunks
+    let chunk_a = 16 * 1024;
+    let chunk_b = chunk_a * 2;
+    let chunk_c = chunk_a * 3;
+    let chunk_d = chunk_a * 4;
+
+    assert_eq!(chunk_d / 1024, 64);
+
+    let mut data = vec![];
+    for i in 0..(chunk_d - 1) {
+        data.push((i % 151) as u8);
+    }
+    let data = Arc::new(data);
+    let d0 = data.clone();
+    let d1 = data.clone();
+    let d2 = data.clone();
+    let d3 = data.clone();
+
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .withf(move |buf| buf == &d0[0..chunk_a])
+        .returning(|buf| Ok(buf.len()));
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .withf(move |buf| buf == &d1[chunk_a..chunk_b])
+        .returning(|buf| Ok(buf.len()));
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .withf(move |buf| buf == &d2[chunk_b..chunk_c])
+        .returning(|buf| Ok(buf.len()));
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .withf(move |buf| buf == &d3[chunk_c..chunk_d - 1])
+        .returning(|buf| Ok(buf.len()));
+
+    let mut file = File::from_std(file);
+
+    let mut rem = &data[..];
+
+    let mut first = true;
+
+    while !rem.is_empty() {
+        let mut task = task::spawn(file.write(rem));
+
+        if !first {
+            assert_pending!(task.poll());
+            pool::run_one();
+            assert!(task.is_woken());
+        }
+
+        first = false;
+
+        let n = assert_ready_ok!(task.poll());
+
+        rem = &rem[n..];
+    }
+
+    pool::run_one();
+}
+
+#[test]
+fn write_twice_before_dispatch() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(HELLO))
+        .returning(|buf| Ok(buf.len()));
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(FOO))
+        .returning(|buf| Ok(buf.len()));
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    let mut t = task::spawn(file.write(FOO));
+    assert_pending!(t.poll());
+
+    assert_eq!(pool::len(), 1);
+    pool::run_one();
+
+    assert!(t.is_woken());
+
+    assert_ready_ok!(t.poll());
+
+    let mut t = task::spawn(file.flush());
+    assert_pending!(t.poll());
+
+    assert_eq!(pool::len(), 1);
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn incomplete_read_followed_by_write() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..HELLO.len()].copy_from_slice(HELLO);
+            Ok(HELLO.len())
+        });
+    file.expect_inner_seek()
+        .once()
+        .with(eq(SeekFrom::Current(-(HELLO.len() as i64))))
+        .in_sequence(&mut seq)
+        .returning(|_| Ok(0));
+    file.expect_inner_write()
+        .once()
+        .with(eq(FOO))
+        .returning(|_| Ok(FOO.len()));
+
+    let mut file = File::from_std(file);
+
+    let mut buf = [0; 32];
+
+    let mut t = task::spawn(file.read(&mut buf));
+    assert_pending!(t.poll());
+
+    pool::run_one();
+
+    let mut t = task::spawn(file.write(FOO));
+    assert_ready_ok!(t.poll());
+
+    assert_eq!(pool::len(), 1);
+    pool::run_one();
+
+    let mut t = task::spawn(file.flush());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn incomplete_partial_read_followed_by_write() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..HELLO.len()].copy_from_slice(HELLO);
+            Ok(HELLO.len())
+        });
+    file.expect_inner_seek()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(SeekFrom::Current(-10)))
+        .returning(|_| Ok(0));
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(FOO))
+        .returning(|_| Ok(FOO.len()));
+
+    let mut file = File::from_std(file);
+
+    let mut buf = [0; 32];
+    let mut t = task::spawn(file.read(&mut buf));
+    assert_pending!(t.poll());
+
+    pool::run_one();
+
+    let mut buf = [0; 4];
+    let mut t = task::spawn(file.read(&mut buf));
+    assert_ready_ok!(t.poll());
+
+    let mut t = task::spawn(file.write(FOO));
+    assert_ready_ok!(t.poll());
+
+    assert_eq!(pool::len(), 1);
+    pool::run_one();
+
+    let mut t = task::spawn(file.flush());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn incomplete_read_followed_by_flush() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..HELLO.len()].copy_from_slice(HELLO);
+            Ok(HELLO.len())
+        });
+    file.expect_inner_seek()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(SeekFrom::Current(-(HELLO.len() as i64))))
+        .returning(|_| Ok(0));
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(FOO))
+        .returning(|_| Ok(FOO.len()));
+
+    let mut file = File::from_std(file);
+
+    let mut buf = [0; 32];
+
+    let mut t = task::spawn(file.read(&mut buf));
+    assert_pending!(t.poll());
+
+    pool::run_one();
+
+    let mut t = task::spawn(file.flush());
+    assert_ready_ok!(t.poll());
+
+    let mut t = task::spawn(file.write(FOO));
+    assert_ready_ok!(t.poll());
+
+    pool::run_one();
+}
+
+#[test]
+fn incomplete_flush_followed_by_write() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(HELLO))
+        .returning(|_| Ok(HELLO.len()));
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(FOO))
+        .returning(|_| Ok(FOO.len()));
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.write(HELLO));
+    let n = assert_ready_ok!(t.poll());
+    assert_eq!(n, HELLO.len());
+
+    let mut t = task::spawn(file.flush());
+    assert_pending!(t.poll());
+
+    // TODO: Move under write
+    pool::run_one();
+
+    let mut t = task::spawn(file.write(FOO));
+    assert_ready_ok!(t.poll());
+
+    pool::run_one();
+
+    let mut t = task::spawn(file.flush());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn read_err() {
+    let mut file = MockFile::default();
+    file.expect_inner_read()
+        .once()
+        .returning(|_| Err(io::ErrorKind::Other.into()));
+
+    let mut file = File::from_std(file);
+
+    let mut buf = [0; 1024];
+    let mut t = task::spawn(file.read(&mut buf));
+
+    assert_pending!(t.poll());
+
+    pool::run_one();
+    assert!(t.is_woken());
+
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn write_write_err() {
+    let mut file = MockFile::default();
+    file.expect_inner_write()
+        .once()
+        .returning(|_| Err(io::ErrorKind::Other.into()));
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    pool::run_one();
+
+    let mut t = task::spawn(file.write(FOO));
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn write_read_write_err() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|_| Err(io::ErrorKind::Other.into()));
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..HELLO.len()].copy_from_slice(HELLO);
+            Ok(HELLO.len())
+        });
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    pool::run_one();
+
+    let mut buf = [0; 1024];
+    let mut t = task::spawn(file.read(&mut buf));
+
+    assert_pending!(t.poll());
+
+    pool::run_one();
+
+    let mut t = task::spawn(file.write(FOO));
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn write_read_flush_err() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|_| Err(io::ErrorKind::Other.into()));
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..HELLO.len()].copy_from_slice(HELLO);
+            Ok(HELLO.len())
+        });
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    pool::run_one();
+
+    let mut buf = [0; 1024];
+    let mut t = task::spawn(file.read(&mut buf));
+
+    assert_pending!(t.poll());
+
+    pool::run_one();
+
+    let mut t = task::spawn(file.flush());
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn write_seek_write_err() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|_| Err(io::ErrorKind::Other.into()));
+    file.expect_inner_seek()
+        .once()
+        .with(eq(SeekFrom::Start(0)))
+        .in_sequence(&mut seq)
+        .returning(|_| Ok(0));
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    pool::run_one();
+
+    {
+        let mut t = task::spawn(file.seek(SeekFrom::Start(0)));
+        assert_pending!(t.poll());
+    }
+
+    pool::run_one();
+
+    let mut t = task::spawn(file.write(FOO));
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn write_seek_flush_err() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|_| Err(io::ErrorKind::Other.into()));
+    file.expect_inner_seek()
+        .once()
+        .with(eq(SeekFrom::Start(0)))
+        .in_sequence(&mut seq)
+        .returning(|_| Ok(0));
+
+    let mut file = File::from_std(file);
+
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    pool::run_one();
+
+    {
+        let mut t = task::spawn(file.seek(SeekFrom::Start(0)));
+        assert_pending!(t.poll());
+    }
+
+    pool::run_one();
+
+    let mut t = task::spawn(file.flush());
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn sync_all_ordered_after_write() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(HELLO))
+        .returning(|_| Ok(HELLO.len()));
+    file.expect_sync_all().once().returning(|| Ok(()));
+
+    let mut file = File::from_std(file);
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    let mut t = task::spawn(file.sync_all());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn sync_all_err_ordered_after_write() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(HELLO))
+        .returning(|_| Ok(HELLO.len()));
+    file.expect_sync_all()
+        .once()
+        .returning(|| Err(io::ErrorKind::Other.into()));
+
+    let mut file = File::from_std(file);
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    let mut t = task::spawn(file.sync_all());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn sync_data_ordered_after_write() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(HELLO))
+        .returning(|_| Ok(HELLO.len()));
+    file.expect_sync_data().once().returning(|| Ok(()));
+
+    let mut file = File::from_std(file);
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    let mut t = task::spawn(file.sync_data());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn sync_data_err_ordered_after_write() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_write()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(HELLO))
+        .returning(|_| Ok(HELLO.len()));
+    file.expect_sync_data()
+        .once()
+        .returning(|| Err(io::ErrorKind::Other.into()));
+
+    let mut file = File::from_std(file);
+    let mut t = task::spawn(file.write(HELLO));
+    assert_ready_ok!(t.poll());
+
+    let mut t = task::spawn(file.sync_data());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_pending!(t.poll());
+
+    assert_eq!(1, pool::len());
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn open_set_len_ok() {
+    let mut file = MockFile::default();
+    file.expect_set_len().with(eq(123)).returning(|_| Ok(()));
+
+    let file = File::from_std(file);
+    let mut t = task::spawn(file.set_len(123));
+
+    assert_pending!(t.poll());
+
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_ready_ok!(t.poll());
+}
+
+#[test]
+fn open_set_len_err() {
+    let mut file = MockFile::default();
+    file.expect_set_len()
+        .with(eq(123))
+        .returning(|_| Err(io::ErrorKind::Other.into()));
+
+    let file = File::from_std(file);
+    let mut t = task::spawn(file.set_len(123));
+
+    assert_pending!(t.poll());
+
+    pool::run_one();
+
+    assert!(t.is_woken());
+    assert_ready_err!(t.poll());
+}
+
+#[test]
+fn partial_read_set_len_ok() {
+    let mut file = MockFile::default();
+    let mut seq = Sequence::new();
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..HELLO.len()].copy_from_slice(HELLO);
+            Ok(HELLO.len())
+        });
+    file.expect_inner_seek()
+        .once()
+        .with(eq(SeekFrom::Current(-(HELLO.len() as i64))))
+        .in_sequence(&mut seq)
+        .returning(|_| Ok(0));
+    file.expect_set_len()
+        .once()
+        .in_sequence(&mut seq)
+        .with(eq(123))
+        .returning(|_| Ok(()));
+    file.expect_inner_read()
+        .once()
+        .in_sequence(&mut seq)
+        .returning(|buf| {
+            buf[0..FOO.len()].copy_from_slice(FOO);
+            Ok(FOO.len())
+        });
+
+    let mut buf = [0; 32];
+    let mut file = File::from_std(file);
+
+    {
+        let mut t = task::spawn(file.read(&mut buf));
+        assert_pending!(t.poll());
+    }
+
+    pool::run_one();
+
+    {
+        let mut t = task::spawn(file.set_len(123));
+
+        assert_pending!(t.poll());
+        pool::run_one();
+        assert_ready_ok!(t.poll());
+    }
+
+    let mut t = task::spawn(file.read(&mut buf));
+    assert_pending!(t.poll());
+    pool::run_one();
+    let n = assert_ready_ok!(t.poll());
+
+    assert_eq!(n, FOO.len());
+    assert_eq!(&buf[..n], FOO);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,9 +3,10 @@
 //! [`File`]: File
 
 use self::State::*;
-use crate::fs::{asyncify, sys};
+use crate::fs::asyncify;
 use crate::io::blocking::Buf;
-use crate::io::{AsyncRead, AsyncSeek, AsyncWrite};
+use crate::io::{AsyncRead, AsyncSeek, AsyncWrite, ReadBuf};
+use crate::sync::Mutex;
 
 use std::fmt;
 use std::fs::{Metadata, Permissions};
@@ -18,6 +19,19 @@
 use std::task::Poll;
 use std::task::Poll::*;
 
+#[cfg(test)]
+use super::mocks::spawn_blocking;
+#[cfg(test)]
+use super::mocks::JoinHandle;
+#[cfg(test)]
+use super::mocks::MockFile as StdFile;
+#[cfg(not(test))]
+use crate::blocking::spawn_blocking;
+#[cfg(not(test))]
+use crate::blocking::JoinHandle;
+#[cfg(not(test))]
+use std::fs::File as StdFile;
+
 /// A reference to an open file on the filesystem.
 ///
 /// This is a specialized version of [`std::fs::File`][std] for usage from the
@@ -36,8 +50,7 @@
 /// the data to disk.
 ///
 /// Reading and writing to a `File` is usually done using the convenience
-/// methods found on the [`AsyncReadExt`] and [`AsyncWriteExt`] traits. Examples
-/// import these traits through [the prelude].
+/// methods found on the [`AsyncReadExt`] and [`AsyncWriteExt`] traits.
 ///
 /// [std]: struct@std::fs::File
 /// [`AsyncSeek`]: trait@crate::io::AsyncSeek
@@ -45,7 +58,6 @@
 /// [`sync_all`]: fn@crate::fs::File::sync_all
 /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
 /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-/// [the prelude]: crate::prelude
 ///
 /// # Examples
 ///
@@ -53,7 +65,7 @@
 ///
 /// ```no_run
 /// use tokio::fs::File;
-/// use tokio::prelude::*; // for write_all()
+/// use tokio::io::AsyncWriteExt; // for write_all()
 ///
 /// # async fn dox() -> std::io::Result<()> {
 /// let mut file = File::create("foo.txt").await?;
@@ -66,7 +78,7 @@
 ///
 /// ```no_run
 /// use tokio::fs::File;
-/// use tokio::prelude::*; // for read_to_end()
+/// use tokio::io::AsyncReadExt; // for read_to_end()
 ///
 /// # async fn dox() -> std::io::Result<()> {
 /// let mut file = File::open("foo.txt").await?;
@@ -79,19 +91,25 @@
 /// # }
 /// ```
 pub struct File {
-    std: Arc<sys::File>,
+    std: Arc<StdFile>,
+    inner: Mutex<Inner>,
+}
+
+struct Inner {
     state: State,
 
     /// Errors from writes/flushes are returned in write/flush calls. If a write
     /// error is observed while performing a read, it is saved until the next
     /// write / flush call.
     last_write_err: Option<io::ErrorKind>,
+
+    pos: u64,
 }
 
 #[derive(Debug)]
 enum State {
     Idle(Option<Buf>),
-    Busy(sys::Blocking<(Operation, Buf)>),
+    Busy(JoinHandle<(Operation, Buf)>),
 }
 
 #[derive(Debug)]
@@ -118,7 +136,7 @@
     ///
     /// ```no_run
     /// use tokio::fs::File;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncReadExt;
     ///
     /// # async fn dox() -> std::io::Result<()> {
     /// let mut file = File::open("foo.txt").await?;
@@ -137,7 +155,7 @@
     /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
     pub async fn open(path: impl AsRef<Path>) -> io::Result<File> {
         let path = path.as_ref().to_owned();
-        let std = asyncify(|| sys::File::open(path)).await?;
+        let std = asyncify(|| StdFile::open(path)).await?;
 
         Ok(File::from_std(std))
     }
@@ -162,7 +180,7 @@
     ///
     /// ```no_run
     /// use tokio::fs::File;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncWriteExt;
     ///
     /// # async fn dox() -> std::io::Result<()> {
     /// let mut file = File::create("foo.txt").await?;
@@ -177,7 +195,7 @@
     /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
     pub async fn create(path: impl AsRef<Path>) -> io::Result<File> {
         let path = path.as_ref().to_owned();
-        let std_file = asyncify(move || sys::File::create(path)).await?;
+        let std_file = asyncify(move || StdFile::create(path)).await?;
         Ok(File::from_std(std_file))
     }
 
@@ -194,73 +212,14 @@
     /// let std_file = std::fs::File::open("foo.txt").unwrap();
     /// let file = tokio::fs::File::from_std(std_file);
     /// ```
-    pub fn from_std(std: sys::File) -> File {
+    pub fn from_std(std: StdFile) -> File {
         File {
             std: Arc::new(std),
-            state: State::Idle(Some(Buf::with_capacity(0))),
-            last_write_err: None,
-        }
-    }
-
-    /// Seeks to an offset, in bytes, in a stream.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use tokio::fs::File;
-    /// use tokio::prelude::*;
-    ///
-    /// use std::io::SeekFrom;
-    ///
-    /// # async fn dox() -> std::io::Result<()> {
-    /// let mut file = File::open("foo.txt").await?;
-    /// file.seek(SeekFrom::Start(6)).await?;
-    ///
-    /// let mut contents = vec![0u8; 10];
-    /// file.read_exact(&mut contents).await?;
-    /// # Ok(())
-    /// # }
-    /// ```
-    ///
-    /// The [`read_exact`] method is defined on the [`AsyncReadExt`] trait.
-    ///
-    /// [`read_exact`]: fn@crate::io::AsyncReadExt::read_exact
-    /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
-    pub async fn seek(&mut self, mut pos: SeekFrom) -> io::Result<u64> {
-        self.complete_inflight().await;
-
-        let mut buf = match self.state {
-            Idle(ref mut buf_cell) => buf_cell.take().unwrap(),
-            _ => unreachable!(),
-        };
-
-        // Factor in any unread data from the buf
-        if !buf.is_empty() {
-            let n = buf.discard_read();
-
-            if let SeekFrom::Current(ref mut offset) = pos {
-                *offset += n;
-            }
-        }
-
-        let std = self.std.clone();
-
-        // Start the operation
-        self.state = Busy(sys::run(move || {
-            let res = (&*std).seek(pos);
-            (Operation::Seek(res), buf)
-        }));
-
-        let (op, buf) = match self.state {
-            Idle(_) => unreachable!(),
-            Busy(ref mut rx) => rx.await.unwrap(),
-        };
-
-        self.state = Idle(Some(buf));
-
-        match op {
-            Operation::Seek(res) => res,
-            _ => unreachable!(),
+            inner: Mutex::new(Inner {
+                state: State::Idle(Some(Buf::with_capacity(0))),
+                last_write_err: None,
+                pos: 0,
+            }),
         }
     }
 
@@ -273,7 +232,7 @@
     ///
     /// ```no_run
     /// use tokio::fs::File;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncWriteExt;
     ///
     /// # async fn dox() -> std::io::Result<()> {
     /// let mut file = File::create("foo.txt").await?;
@@ -287,8 +246,9 @@
     ///
     /// [`write_all`]: fn@crate::io::AsyncWriteExt::write_all
     /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-    pub async fn sync_all(&mut self) -> io::Result<()> {
-        self.complete_inflight().await;
+    pub async fn sync_all(&self) -> io::Result<()> {
+        let mut inner = self.inner.lock().await;
+        inner.complete_inflight().await;
 
         let std = self.std.clone();
         asyncify(move || std.sync_all()).await
@@ -307,7 +267,7 @@
     ///
     /// ```no_run
     /// use tokio::fs::File;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncWriteExt;
     ///
     /// # async fn dox() -> std::io::Result<()> {
     /// let mut file = File::create("foo.txt").await?;
@@ -321,8 +281,9 @@
     ///
     /// [`write_all`]: fn@crate::io::AsyncWriteExt::write_all
     /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-    pub async fn sync_data(&mut self) -> io::Result<()> {
-        self.complete_inflight().await;
+    pub async fn sync_data(&self) -> io::Result<()> {
+        let mut inner = self.inner.lock().await;
+        inner.complete_inflight().await;
 
         let std = self.std.clone();
         asyncify(move || std.sync_data()).await
@@ -344,7 +305,7 @@
     ///
     /// ```no_run
     /// use tokio::fs::File;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncWriteExt;
     ///
     /// # async fn dox() -> std::io::Result<()> {
     /// let mut file = File::create("foo.txt").await?;
@@ -358,10 +319,11 @@
     ///
     /// [`write_all`]: fn@crate::io::AsyncWriteExt::write_all
     /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-    pub async fn set_len(&mut self, size: u64) -> io::Result<()> {
-        self.complete_inflight().await;
+    pub async fn set_len(&self, size: u64) -> io::Result<()> {
+        let mut inner = self.inner.lock().await;
+        inner.complete_inflight().await;
 
-        let mut buf = match self.state {
+        let mut buf = match inner.state {
             Idle(ref mut buf_cell) => buf_cell.take().unwrap(),
             _ => unreachable!(),
         };
@@ -374,7 +336,7 @@
 
         let std = self.std.clone();
 
-        self.state = Busy(sys::run(move || {
+        inner.state = Busy(spawn_blocking(move || {
             let res = if let Some(seek) = seek {
                 (&*std).seek(seek).and_then(|_| std.set_len(size))
             } else {
@@ -386,15 +348,17 @@
             (Operation::Seek(res), buf)
         }));
 
-        let (op, buf) = match self.state {
+        let (op, buf) = match inner.state {
             Idle(_) => unreachable!(),
             Busy(ref mut rx) => rx.await?,
         };
 
-        self.state = Idle(Some(buf));
+        inner.state = Idle(Some(buf));
 
         match op {
-            Operation::Seek(res) => res.map(|_| ()),
+            Operation::Seek(res) => res.map(|pos| {
+                inner.pos = pos;
+            }),
             _ => unreachable!(),
         }
     }
@@ -458,8 +422,8 @@
     /// # Ok(())
     /// # }
     /// ```
-    pub async fn into_std(mut self) -> sys::File {
-        self.complete_inflight().await;
+    pub async fn into_std(mut self) -> StdFile {
+        self.inner.get_mut().complete_inflight().await;
         Arc::try_unwrap(self.std).expect("Arc::try_unwrap failed")
     }
 
@@ -483,7 +447,7 @@
     /// # Ok(())
     /// # }
     /// ```
-    pub fn try_into_std(mut self) -> Result<sys::File, Self> {
+    pub fn try_into_std(mut self) -> Result<StdFile, Self> {
         match Arc::try_unwrap(self.std) {
             Ok(file) => Ok(file),
             Err(std_file_arc) => {
@@ -526,42 +490,32 @@
         let std = self.std.clone();
         asyncify(move || std.set_permissions(perm)).await
     }
-
-    async fn complete_inflight(&mut self) {
-        use crate::future::poll_fn;
-
-        if let Err(e) = poll_fn(|cx| Pin::new(&mut *self).poll_flush(cx)).await {
-            self.last_write_err = Some(e.kind());
-        }
-    }
 }
 
 impl AsyncRead for File {
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        // https://github.com/rust-lang/rust/blob/09c817eeb29e764cfc12d0a8d94841e3ffe34023/src/libstd/fs.rs#L668
-        false
-    }
-
     fn poll_read(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        dst: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        dst: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        let me = self.get_mut();
+        let inner = me.inner.get_mut();
+
         loop {
-            match self.state {
+            match inner.state {
                 Idle(ref mut buf_cell) => {
                     let mut buf = buf_cell.take().unwrap();
 
                     if !buf.is_empty() {
-                        let n = buf.copy_to(dst);
+                        buf.copy_to(dst);
                         *buf_cell = Some(buf);
-                        return Ready(Ok(n));
+                        return Ready(Ok(()));
                     }
 
                     buf.ensure_capacity_for(dst);
-                    let std = self.std.clone();
+                    let std = me.std.clone();
 
-                    self.state = Busy(sys::run(move || {
+                    inner.state = Busy(spawn_blocking(move || {
                         let res = buf.read_from(&mut &*std);
                         (Operation::Read(res), buf)
                     }));
@@ -571,29 +525,32 @@
 
                     match op {
                         Operation::Read(Ok(_)) => {
-                            let n = buf.copy_to(dst);
-                            self.state = Idle(Some(buf));
-                            return Ready(Ok(n));
+                            buf.copy_to(dst);
+                            inner.state = Idle(Some(buf));
+                            return Ready(Ok(()));
                         }
                         Operation::Read(Err(e)) => {
                             assert!(buf.is_empty());
 
-                            self.state = Idle(Some(buf));
+                            inner.state = Idle(Some(buf));
                             return Ready(Err(e));
                         }
                         Operation::Write(Ok(_)) => {
                             assert!(buf.is_empty());
-                            self.state = Idle(Some(buf));
+                            inner.state = Idle(Some(buf));
                             continue;
                         }
                         Operation::Write(Err(e)) => {
-                            assert!(self.last_write_err.is_none());
-                            self.last_write_err = Some(e.kind());
-                            self.state = Idle(Some(buf));
+                            assert!(inner.last_write_err.is_none());
+                            inner.last_write_err = Some(e.kind());
+                            inner.state = Idle(Some(buf));
                         }
-                        Operation::Seek(_) => {
+                        Operation::Seek(result) => {
                             assert!(buf.is_empty());
-                            self.state = Idle(Some(buf));
+                            inner.state = Idle(Some(buf));
+                            if let Ok(pos) = result {
+                                inner.pos = pos;
+                            }
                             continue;
                         }
                     }
@@ -604,13 +561,13 @@
 }
 
 impl AsyncSeek for File {
-    fn start_seek(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        mut pos: SeekFrom,
-    ) -> Poll<io::Result<()>> {
+    fn start_seek(self: Pin<&mut Self>, mut pos: SeekFrom) -> io::Result<()> {
+        let me = self.get_mut();
+        let inner = me.inner.get_mut();
+
         loop {
-            match self.state {
+            match inner.state {
+                Busy(_) => panic!("must wait for poll_complete before calling start_seek"),
                 Idle(ref mut buf_cell) => {
                     let mut buf = buf_cell.take().unwrap();
 
@@ -623,49 +580,41 @@
                         }
                     }
 
-                    let std = self.std.clone();
+                    let std = me.std.clone();
 
-                    self.state = Busy(sys::run(move || {
+                    inner.state = Busy(spawn_blocking(move || {
                         let res = (&*std).seek(pos);
                         (Operation::Seek(res), buf)
                     }));
-
-                    return Ready(Ok(()));
-                }
-                Busy(ref mut rx) => {
-                    let (op, buf) = ready!(Pin::new(rx).poll(cx))?;
-                    self.state = Idle(Some(buf));
-
-                    match op {
-                        Operation::Read(_) => {}
-                        Operation::Write(Err(e)) => {
-                            assert!(self.last_write_err.is_none());
-                            self.last_write_err = Some(e.kind());
-                        }
-                        Operation::Write(_) => {}
-                        Operation::Seek(_) => {}
-                    }
+                    return Ok(());
                 }
             }
         }
     }
 
     fn poll_complete(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
+        let inner = self.inner.get_mut();
+
         loop {
-            match self.state {
-                Idle(_) => panic!("must call start_seek before calling poll_complete"),
+            match inner.state {
+                Idle(_) => return Poll::Ready(Ok(inner.pos)),
                 Busy(ref mut rx) => {
                     let (op, buf) = ready!(Pin::new(rx).poll(cx))?;
-                    self.state = Idle(Some(buf));
+                    inner.state = Idle(Some(buf));
 
                     match op {
                         Operation::Read(_) => {}
                         Operation::Write(Err(e)) => {
-                            assert!(self.last_write_err.is_none());
-                            self.last_write_err = Some(e.kind());
+                            assert!(inner.last_write_err.is_none());
+                            inner.last_write_err = Some(e.kind());
                         }
                         Operation::Write(_) => {}
-                        Operation::Seek(res) => return Ready(res),
+                        Operation::Seek(res) => {
+                            if let Ok(pos) = res {
+                                inner.pos = pos;
+                            }
+                            return Ready(res);
+                        }
                     }
                 }
             }
@@ -675,16 +624,19 @@
 
 impl AsyncWrite for File {
     fn poll_write(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
         src: &[u8],
     ) -> Poll<io::Result<usize>> {
-        if let Some(e) = self.last_write_err.take() {
+        let me = self.get_mut();
+        let inner = me.inner.get_mut();
+
+        if let Some(e) = inner.last_write_err.take() {
             return Ready(Err(e.into()));
         }
 
         loop {
-            match self.state {
+            match inner.state {
                 Idle(ref mut buf_cell) => {
                     let mut buf = buf_cell.take().unwrap();
 
@@ -695,9 +647,9 @@
                     };
 
                     let n = buf.copy_from(src);
-                    let std = self.std.clone();
+                    let std = me.std.clone();
 
-                    self.state = Busy(sys::run(move || {
+                    inner.state = Busy(spawn_blocking(move || {
                         let res = if let Some(seek) = seek {
                             (&*std).seek(seek).and_then(|_| buf.write_to(&mut &*std))
                         } else {
@@ -711,7 +663,7 @@
                 }
                 Busy(ref mut rx) => {
                     let (op, buf) = ready!(Pin::new(rx).poll(cx))?;
-                    self.state = Idle(Some(buf));
+                    inner.state = Idle(Some(buf));
 
                     match op {
                         Operation::Read(_) => {
@@ -737,32 +689,17 @@
     }
 
     fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
-        if let Some(e) = self.last_write_err.take() {
-            return Ready(Err(e.into()));
-        }
-
-        let (op, buf) = match self.state {
-            Idle(_) => return Ready(Ok(())),
-            Busy(ref mut rx) => ready!(Pin::new(rx).poll(cx))?,
-        };
-
-        // The buffer is not used here
-        self.state = Idle(Some(buf));
-
-        match op {
-            Operation::Read(_) => Ready(Ok(())),
-            Operation::Write(res) => Ready(res),
-            Operation::Seek(_) => Ready(Ok(())),
-        }
+        let inner = self.inner.get_mut();
+        inner.poll_flush(cx)
     }
 
-    fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
-        Poll::Ready(Ok(()))
+    fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+        self.poll_flush(cx)
     }
 }
 
-impl From<sys::File> for File {
-    fn from(std: sys::File) -> Self {
+impl From<StdFile> for File {
+    fn from(std: StdFile) -> Self {
         Self::from_std(std)
     }
 }
@@ -782,9 +719,56 @@
     }
 }
 
+#[cfg(unix)]
+impl std::os::unix::io::FromRawFd for File {
+    unsafe fn from_raw_fd(fd: std::os::unix::io::RawFd) -> Self {
+        StdFile::from_raw_fd(fd).into()
+    }
+}
+
 #[cfg(windows)]
 impl std::os::windows::io::AsRawHandle for File {
     fn as_raw_handle(&self) -> std::os::windows::io::RawHandle {
         self.std.as_raw_handle()
     }
 }
+
+#[cfg(windows)]
+impl std::os::windows::io::FromRawHandle for File {
+    unsafe fn from_raw_handle(handle: std::os::windows::io::RawHandle) -> Self {
+        StdFile::from_raw_handle(handle).into()
+    }
+}
+
+impl Inner {
+    async fn complete_inflight(&mut self) {
+        use crate::future::poll_fn;
+
+        if let Err(e) = poll_fn(|cx| Pin::new(&mut *self).poll_flush(cx)).await {
+            self.last_write_err = Some(e.kind());
+        }
+    }
+
+    fn poll_flush(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+        if let Some(e) = self.last_write_err.take() {
+            return Ready(Err(e.into()));
+        }
+
+        let (op, buf) = match self.state {
+            Idle(_) => return Ready(Ok(())),
+            Busy(ref mut rx) => ready!(Pin::new(rx).poll(cx))?,
+        };
+
+        // The buffer is not used here
+        self.state = Idle(Some(buf));
+
+        match op {
+            Operation::Read(_) => Ready(Ok(())),
+            Operation::Write(res) => Ready(res),
+            Operation::Seek(_) => Ready(Ok(())),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/mocks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/mocks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/mocks.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/mocks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,136 @@
+//! Mock version of std::fs::File;
+use mockall::mock;
+
+use crate::sync::oneshot;
+use std::{
+    cell::RefCell,
+    collections::VecDeque,
+    fs::{Metadata, Permissions},
+    future::Future,
+    io::{self, Read, Seek, SeekFrom, Write},
+    path::PathBuf,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+mock! {
+    #[derive(Debug)]
+    pub File {
+        pub fn create(pb: PathBuf) -> io::Result<Self>;
+        // These inner_ methods exist because std::fs::File has two
+        // implementations for each of these methods: one on "&mut self" and
+        // one on "&&self".  Defining both of those in terms of an inner_ method
+        // allows us to specify the expectation the same way, regardless of
+        // which method is used.
+        pub fn inner_flush(&self) -> io::Result<()>;
+        pub fn inner_read(&self, dst: &mut [u8]) -> io::Result<usize>;
+        pub fn inner_seek(&self, pos: SeekFrom) -> io::Result<u64>;
+        pub fn inner_write(&self, src: &[u8]) -> io::Result<usize>;
+        pub fn metadata(&self) -> io::Result<Metadata>;
+        pub fn open(pb: PathBuf) -> io::Result<Self>;
+        pub fn set_len(&self, size: u64) -> io::Result<()>;
+        pub fn set_permissions(&self, _perm: Permissions) -> io::Result<()>;
+        pub fn sync_all(&self) -> io::Result<()>;
+        pub fn sync_data(&self) -> io::Result<()>;
+        pub fn try_clone(&self) -> io::Result<Self>;
+    }
+    #[cfg(windows)]
+    impl std::os::windows::io::AsRawHandle for File {
+        fn as_raw_handle(&self) -> std::os::windows::io::RawHandle;
+    }
+    #[cfg(windows)]
+    impl std::os::windows::io::FromRawHandle for File {
+        unsafe fn from_raw_handle(h: std::os::windows::io::RawHandle) -> Self;
+    }
+    #[cfg(unix)]
+    impl std::os::unix::io::AsRawFd for File {
+        fn as_raw_fd(&self) -> std::os::unix::io::RawFd;
+    }
+
+    #[cfg(unix)]
+    impl std::os::unix::io::FromRawFd for File {
+        unsafe fn from_raw_fd(h: std::os::unix::io::RawFd) -> Self;
+    }
+}
+
+impl Read for MockFile {
+    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
+        self.inner_read(dst)
+    }
+}
+
+impl Read for &'_ MockFile {
+    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
+        self.inner_read(dst)
+    }
+}
+
+impl Seek for &'_ MockFile {
+    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
+        self.inner_seek(pos)
+    }
+}
+
+impl Write for &'_ MockFile {
+    fn write(&mut self, src: &[u8]) -> io::Result<usize> {
+        self.inner_write(src)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner_flush()
+    }
+}
+
+thread_local! {
+    static QUEUE: RefCell<VecDeque<Box<dyn FnOnce() + Send>>> = RefCell::new(VecDeque::new())
+}
+
+#[derive(Debug)]
+pub(super) struct JoinHandle<T> {
+    rx: oneshot::Receiver<T>,
+}
+
+pub(super) fn spawn_blocking<F, R>(f: F) -> JoinHandle<R>
+where
+    F: FnOnce() -> R + Send + 'static,
+    R: Send + 'static,
+{
+    let (tx, rx) = oneshot::channel();
+    let task = Box::new(move || {
+        let _ = tx.send(f());
+    });
+
+    QUEUE.with(|cell| cell.borrow_mut().push_back(task));
+
+    JoinHandle { rx }
+}
+
+impl<T> Future for JoinHandle<T> {
+    type Output = Result<T, io::Error>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        use std::task::Poll::*;
+
+        match Pin::new(&mut self.rx).poll(cx) {
+            Ready(Ok(v)) => Ready(Ok(v)),
+            Ready(Err(e)) => panic!("error = {:?}", e),
+            Pending => Pending,
+        }
+    }
+}
+
+pub(super) mod pool {
+    use super::*;
+
+    pub(in super::super) fn len() -> usize {
+        QUEUE.with(|cell| cell.borrow().len())
+    }
+
+    pub(in super::super) fn run_one() {
+        let task = QUEUE
+            .with(|cell| cell.borrow_mut().pop_front())
+            .expect("expected task to run, but none ready");
+
+        task();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,7 @@
 //! `std::io::ErrorKind::WouldBlock` if a *worker* thread can not be converted
 //! to a *backup* thread immediately.
 //!
-//! [`AsyncRead`]: https://docs.rs/tokio-io/0.1/tokio_io/trait.AsyncRead.html
+//! [`AsyncRead`]: trait@crate::io::AsyncRead
 
 mod canonicalize;
 pub use self::canonicalize::canonicalize;
@@ -48,8 +48,6 @@
 mod open_options;
 pub use self::open_options::OpenOptions;
 
-pub mod os;
-
 mod read;
 pub use self::read::read;
 
@@ -86,14 +84,39 @@
 mod copy;
 pub use self::copy::copy;
 
+#[cfg(test)]
+mod mocks;
+
+feature! {
+    #![unix]
+
+    mod symlink;
+    pub use self::symlink::symlink;
+}
+
+feature! {
+    #![windows]
+
+    mod symlink_dir;
+    pub use self::symlink_dir::symlink_dir;
+
+    mod symlink_file;
+    pub use self::symlink_file::symlink_file;
+}
+
 use std::io;
 
+#[cfg(not(test))]
+use crate::blocking::spawn_blocking;
+#[cfg(test)]
+use mocks::spawn_blocking;
+
 pub(crate) async fn asyncify<F, T>(f: F) -> io::Result<T>
 where
     F: FnOnce() -> io::Result<T> + Send + 'static,
     T: Send + 'static,
 {
-    match sys::run(f).await {
+    match spawn_blocking(f).await {
         Ok(res) => res,
         Err(_) => Err(io::Error::new(
             io::ErrorKind::Other,
@@ -101,12 +124,3 @@
         )),
     }
 }
-
-/// Types in this module can be mocked out in tests.
-mod sys {
-    pub(crate) use std::fs::File;
-
-    // TODO: don't rename
-    pub(crate) use crate::runtime::spawn_blocking as run;
-    pub(crate) use crate::task::JoinHandle as Blocking;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/open_options/mock_open_options.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/open_options/mock_open_options.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/open_options/mock_open_options.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/open_options/mock_open_options.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,38 @@
+//! Mock version of std::fs::OpenOptions;
+use mockall::mock;
+
+use crate::fs::mocks::MockFile;
+#[cfg(unix)]
+use std::os::unix::fs::OpenOptionsExt;
+#[cfg(windows)]
+use std::os::windows::fs::OpenOptionsExt;
+use std::{io, path::Path};
+
+mock! {
+    #[derive(Debug)]
+    pub OpenOptions {
+        pub fn append(&mut self, append: bool) -> &mut Self;
+        pub fn create(&mut self, create: bool) -> &mut Self;
+        pub fn create_new(&mut self, create_new: bool) -> &mut Self;
+        pub fn open<P: AsRef<Path> + 'static>(&self, path: P) -> io::Result<MockFile>;
+        pub fn read(&mut self, read: bool) -> &mut Self;
+        pub fn truncate(&mut self, truncate: bool) -> &mut Self;
+        pub fn write(&mut self, write: bool) -> &mut Self;
+    }
+    impl Clone for OpenOptions {
+        fn clone(&self) -> Self;
+    }
+    #[cfg(unix)]
+    impl OpenOptionsExt for OpenOptions {
+        fn custom_flags(&mut self, flags: i32) -> &mut Self;
+        fn mode(&mut self, mode: u32) -> &mut Self;
+    }
+    #[cfg(windows)]
+    impl OpenOptionsExt for OpenOptions {
+        fn access_mode(&mut self, access: u32) -> &mut Self;
+        fn share_mode(&mut self, val: u32) -> &mut Self;
+        fn custom_flags(&mut self, flags: u32) -> &mut Self;
+        fn attributes(&mut self, val: u32) -> &mut Self;
+        fn security_qos_flags(&mut self, flags: u32) -> &mut Self;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/open_options.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/open_options.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/open_options.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/open_options.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,6 +3,13 @@
 use std::io;
 use std::path::Path;
 
+#[cfg(test)]
+mod mock_open_options;
+#[cfg(test)]
+use mock_open_options::MockOpenOptions as StdOpenOptions;
+#[cfg(not(test))]
+use std::fs::OpenOptions as StdOpenOptions;
+
 /// Options and flags which can be used to configure how a file is opened.
 ///
 /// This builder exposes the ability to configure how a [`File`] is opened and
@@ -69,7 +76,7 @@
 /// }
 /// ```
 #[derive(Clone, Debug)]
-pub struct OpenOptions(std::fs::OpenOptions);
+pub struct OpenOptions(StdOpenOptions);
 
 impl OpenOptions {
     /// Creates a blank new set of options ready for configuration.
@@ -89,7 +96,7 @@
     /// let future = options.read(true).open("foo.txt");
     /// ```
     pub fn new() -> OpenOptions {
-        OpenOptions(std::fs::OpenOptions::new())
+        OpenOptions(StdOpenOptions::new())
     }
 
     /// Sets the option for read access.
@@ -383,15 +390,270 @@
         Ok(File::from_std(std))
     }
 
-    /// Returns a mutable reference to the the underlying std::fs::OpenOptions
-    #[cfg(unix)]
-    pub(super) fn as_inner_mut(&mut self) -> &mut std::fs::OpenOptions {
+    /// Returns a mutable reference to the underlying `std::fs::OpenOptions`
+    pub(super) fn as_inner_mut(&mut self) -> &mut StdOpenOptions {
         &mut self.0
     }
 }
 
-impl From<std::fs::OpenOptions> for OpenOptions {
-    fn from(options: std::fs::OpenOptions) -> OpenOptions {
+feature! {
+    #![unix]
+
+    use std::os::unix::fs::OpenOptionsExt;
+
+    impl OpenOptions {
+        /// Sets the mode bits that a new file will be created with.
+        ///
+        /// If a new file is created as part of an `OpenOptions::open` call then this
+        /// specified `mode` will be used as the permission bits for the new file.
+        /// If no `mode` is set, the default of `0o666` will be used.
+        /// The operating system masks out bits with the system's `umask`, to produce
+        /// the final permissions.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::fs::OpenOptions;
+        /// use std::io;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> io::Result<()> {
+        ///     let mut options = OpenOptions::new();
+        ///     options.mode(0o644); // Give read/write for owner and read for others.
+        ///     let file = options.open("foo.txt").await?;
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        pub fn mode(&mut self, mode: u32) -> &mut OpenOptions {
+            self.as_inner_mut().mode(mode);
+            self
+        }
+
+        /// Pass custom flags to the `flags` argument of `open`.
+        ///
+        /// The bits that define the access mode are masked out with `O_ACCMODE`, to
+        /// ensure they do not interfere with the access mode set by Rusts options.
+        ///
+        /// Custom flags can only set flags, not remove flags set by Rusts options.
+        /// This options overwrites any previously set custom flags.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use libc;
+        /// use tokio::fs::OpenOptions;
+        /// use std::io;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> io::Result<()> {
+        ///     let mut options = OpenOptions::new();
+        ///     options.write(true);
+        ///     if cfg!(unix) {
+        ///         options.custom_flags(libc::O_NOFOLLOW);
+        ///     }
+        ///     let file = options.open("foo.txt").await?;
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        pub fn custom_flags(&mut self, flags: i32) -> &mut OpenOptions {
+            self.as_inner_mut().custom_flags(flags);
+            self
+        }
+    }
+}
+
+feature! {
+    #![windows]
+
+    use std::os::windows::fs::OpenOptionsExt;
+
+    impl OpenOptions {
+        /// Overrides the `dwDesiredAccess` argument to the call to [`CreateFile`]
+        /// with the specified value.
+        ///
+        /// This will override the `read`, `write`, and `append` flags on the
+        /// `OpenOptions` structure. This method provides fine-grained control over
+        /// the permissions to read, write and append data, attributes (like hidden
+        /// and system), and extended attributes.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::fs::OpenOptions;
+        ///
+        /// # #[tokio::main]
+        /// # async fn main() -> std::io::Result<()> {
+        /// // Open without read and write permission, for example if you only need
+        /// // to call `stat` on the file
+        /// let file = OpenOptions::new().access_mode(0).open("foo.txt").await?;
+        /// # Ok(())
+        /// # }
+        /// ```
+        ///
+        /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea
+        pub fn access_mode(&mut self, access: u32) -> &mut OpenOptions {
+            self.as_inner_mut().access_mode(access);
+            self
+        }
+
+        /// Overrides the `dwShareMode` argument to the call to [`CreateFile`] with
+        /// the specified value.
+        ///
+        /// By default `share_mode` is set to
+        /// `FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE`. This allows
+        /// other processes to read, write, and delete/rename the same file
+        /// while it is open. Removing any of the flags will prevent other
+        /// processes from performing the corresponding operation until the file
+        /// handle is closed.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::fs::OpenOptions;
+        ///
+        /// # #[tokio::main]
+        /// # async fn main() -> std::io::Result<()> {
+        /// // Do not allow others to read or modify this file while we have it open
+        /// // for writing.
+        /// let file = OpenOptions::new()
+        ///     .write(true)
+        ///     .share_mode(0)
+        ///     .open("foo.txt").await?;
+        /// # Ok(())
+        /// # }
+        /// ```
+        ///
+        /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea
+        pub fn share_mode(&mut self, share: u32) -> &mut OpenOptions {
+            self.as_inner_mut().share_mode(share);
+            self
+        }
+
+        /// Sets extra flags for the `dwFileFlags` argument to the call to
+        /// [`CreateFile2`] to the specified value (or combines it with
+        /// `attributes` and `security_qos_flags` to set the `dwFlagsAndAttributes`
+        /// for [`CreateFile`]).
+        ///
+        /// Custom flags can only set flags, not remove flags set by Rust's options.
+        /// This option overwrites any previously set custom flags.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use winapi::um::winbase::FILE_FLAG_DELETE_ON_CLOSE;
+        /// use tokio::fs::OpenOptions;
+        ///
+        /// # #[tokio::main]
+        /// # async fn main() -> std::io::Result<()> {
+        /// let file = OpenOptions::new()
+        ///     .create(true)
+        ///     .write(true)
+        ///     .custom_flags(FILE_FLAG_DELETE_ON_CLOSE)
+        ///     .open("foo.txt").await?;
+        /// # Ok(())
+        /// # }
+        /// ```
+        ///
+        /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea
+        /// [`CreateFile2`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfile2
+        pub fn custom_flags(&mut self, flags: u32) -> &mut OpenOptions {
+            self.as_inner_mut().custom_flags(flags);
+            self
+        }
+
+        /// Sets the `dwFileAttributes` argument to the call to [`CreateFile2`] to
+        /// the specified value (or combines it with `custom_flags` and
+        /// `security_qos_flags` to set the `dwFlagsAndAttributes` for
+        /// [`CreateFile`]).
+        ///
+        /// If a _new_ file is created because it does not yet exist and
+        /// `.create(true)` or `.create_new(true)` are specified, the new file is
+        /// given the attributes declared with `.attributes()`.
+        ///
+        /// If an _existing_ file is opened with `.create(true).truncate(true)`, its
+        /// existing attributes are preserved and combined with the ones declared
+        /// with `.attributes()`.
+        ///
+        /// In all other cases the attributes get ignored.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use winapi::um::winnt::FILE_ATTRIBUTE_HIDDEN;
+        /// use tokio::fs::OpenOptions;
+        ///
+        /// # #[tokio::main]
+        /// # async fn main() -> std::io::Result<()> {
+        /// let file = OpenOptions::new()
+        ///     .write(true)
+        ///     .create(true)
+        ///     .attributes(FILE_ATTRIBUTE_HIDDEN)
+        ///     .open("foo.txt").await?;
+        /// # Ok(())
+        /// # }
+        /// ```
+        ///
+        /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea
+        /// [`CreateFile2`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfile2
+        pub fn attributes(&mut self, attributes: u32) -> &mut OpenOptions {
+            self.as_inner_mut().attributes(attributes);
+            self
+        }
+
+        /// Sets the `dwSecurityQosFlags` argument to the call to [`CreateFile2`] to
+        /// the specified value (or combines it with `custom_flags` and `attributes`
+        /// to set the `dwFlagsAndAttributes` for [`CreateFile`]).
+        ///
+        /// By default `security_qos_flags` is not set. It should be specified when
+        /// opening a named pipe, to control to which degree a server process can
+        /// act on behalf of a client process (security impersonation level).
+        ///
+        /// When `security_qos_flags` is not set, a malicious program can gain the
+        /// elevated privileges of a privileged Rust process when it allows opening
+        /// user-specified paths, by tricking it into opening a named pipe. So
+        /// arguably `security_qos_flags` should also be set when opening arbitrary
+        /// paths. However the bits can then conflict with other flags, specifically
+        /// `FILE_FLAG_OPEN_NO_RECALL`.
+        ///
+        /// For information about possible values, see [Impersonation Levels] on the
+        /// Windows Dev Center site. The `SECURITY_SQOS_PRESENT` flag is set
+        /// automatically when using this method.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use winapi::um::winbase::SECURITY_IDENTIFICATION;
+        /// use tokio::fs::OpenOptions;
+        ///
+        /// # #[tokio::main]
+        /// # async fn main() -> std::io::Result<()> {
+        /// let file = OpenOptions::new()
+        ///     .write(true)
+        ///     .create(true)
+        ///
+        ///     // Sets the flag value to `SecurityIdentification`.
+        ///     .security_qos_flags(SECURITY_IDENTIFICATION)
+        ///
+        ///     .open(r"\\.\pipe\MyPipe").await?;
+        /// # Ok(())
+        /// # }
+        /// ```
+        ///
+        /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea
+        /// [`CreateFile2`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfile2
+        /// [Impersonation Levels]:
+        ///     https://docs.microsoft.com/en-us/windows/win32/api/winnt/ne-winnt-security_impersonation_level
+        pub fn security_qos_flags(&mut self, flags: u32) -> &mut OpenOptions {
+            self.as_inner_mut().security_qos_flags(flags);
+            self
+        }
+    }
+}
+
+impl From<StdOpenOptions> for OpenOptions {
+    fn from(options: StdOpenOptions) -> OpenOptions {
         OpenOptions(options)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-//! OS-specific functionality.
-
-#[cfg(unix)]
-pub mod unix;
-
-#[cfg(windows)]
-pub mod windows;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/unix/dir_builder_ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/unix/dir_builder_ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/unix/dir_builder_ext.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/unix/dir_builder_ext.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-use crate::fs::dir_builder::DirBuilder;
-
-/// Unix-specific extensions to [`DirBuilder`].
-///
-/// [`DirBuilder`]: crate::fs::DirBuilder
-pub trait DirBuilderExt {
-    /// Sets the mode to create new directories with.
-    ///
-    /// This option defaults to 0o777.
-    ///
-    /// # Examples
-    ///
-    ///
-    /// ```no_run
-    /// use tokio::fs::DirBuilder;
-    /// use tokio::fs::os::unix::DirBuilderExt;
-    ///
-    /// let mut builder = DirBuilder::new();
-    /// builder.mode(0o775);
-    /// ```
-    fn mode(&mut self, mode: u32) -> &mut Self;
-}
-
-impl DirBuilderExt for DirBuilder {
-    fn mode(&mut self, mode: u32) -> &mut Self {
-        self.mode = Some(mode);
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/unix/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/unix/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/unix/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/unix/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-//! Unix-specific extensions to primitives in the `tokio_fs` module.
-
-mod symlink;
-pub use self::symlink::symlink;
-
-mod open_options_ext;
-pub use self::open_options_ext::OpenOptionsExt;
-
-mod dir_builder_ext;
-pub use self::dir_builder_ext::DirBuilderExt;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/unix/open_options_ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/unix/open_options_ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/unix/open_options_ext.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/unix/open_options_ext.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-use crate::fs::open_options::OpenOptions;
-use std::os::unix::fs::OpenOptionsExt as StdOpenOptionsExt;
-
-/// Unix-specific extensions to [`fs::OpenOptions`].
-///
-/// This mirrors the definition of [`std::os::unix::fs::OpenOptionsExt`].
-///
-///
-/// [`fs::OpenOptions`]: crate::fs::OpenOptions
-/// [`std::os::unix::fs::OpenOptionsExt`]: std::os::unix::fs::OpenOptionsExt
-pub trait OpenOptionsExt {
-    /// Sets the mode bits that a new file will be created with.
-    ///
-    /// If a new file is created as part of an `OpenOptions::open` call then this
-    /// specified `mode` will be used as the permission bits for the new file.
-    /// If no `mode` is set, the default of `0o666` will be used.
-    /// The operating system masks out bits with the system's `umask`, to produce
-    /// the final permissions.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use tokio::fs::OpenOptions;
-    /// use tokio::fs::os::unix::OpenOptionsExt;
-    /// use std::io;
-    ///
-    /// #[tokio::main]
-    /// async fn main() -> io::Result<()> {
-    ///     let mut options = OpenOptions::new();
-    ///     options.mode(0o644); // Give read/write for owner and read for others.
-    ///     let file = options.open("foo.txt").await?;
-    ///
-    ///     Ok(())
-    /// }
-    /// ```
-    fn mode(&mut self, mode: u32) -> &mut Self;
-
-    /// Pass custom flags to the `flags` argument of `open`.
-    ///
-    /// The bits that define the access mode are masked out with `O_ACCMODE`, to
-    /// ensure they do not interfere with the access mode set by Rusts options.
-    ///
-    /// Custom flags can only set flags, not remove flags set by Rusts options.
-    /// This options overwrites any previously set custom flags.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use libc;
-    /// use tokio::fs::OpenOptions;
-    /// use tokio::fs::os::unix::OpenOptionsExt;
-    /// use std::io;
-    ///
-    /// #[tokio::main]
-    /// async fn main() -> io::Result<()> {
-    ///     let mut options = OpenOptions::new();
-    ///     options.write(true);
-    ///     if cfg!(unix) {
-    ///         options.custom_flags(libc::O_NOFOLLOW);
-    ///     }
-    ///     let file = options.open("foo.txt").await?;
-    ///
-    ///     Ok(())
-    /// }
-    /// ```
-    fn custom_flags(&mut self, flags: i32) -> &mut Self;
-}
-
-impl OpenOptionsExt for OpenOptions {
-    fn mode(&mut self, mode: u32) -> &mut OpenOptions {
-        self.as_inner_mut().mode(mode);
-        self
-    }
-
-    fn custom_flags(&mut self, flags: i32) -> &mut OpenOptions {
-        self.as_inner_mut().custom_flags(flags);
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/unix/symlink.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/unix/symlink.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/unix/symlink.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/unix/symlink.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use crate::fs::asyncify;
-
-use std::io;
-use std::path::Path;
-
-/// Creates a new symbolic link on the filesystem.
-///
-/// The `dst` path will be a symbolic link pointing to the `src` path.
-///
-/// This is an async version of [`std::os::unix::fs::symlink`][std]
-///
-/// [std]: std::os::unix::fs::symlink
-pub async fn symlink(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
-    let src = src.as_ref().to_owned();
-    let dst = dst.as_ref().to_owned();
-
-    asyncify(move || std::os::unix::fs::symlink(src, dst)).await
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/windows/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/windows/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/windows/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/windows/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-//! Windows-specific extensions for the primitives in the `tokio_fs` module.
-
-mod symlink_dir;
-pub use self::symlink_dir::symlink_dir;
-
-mod symlink_file;
-pub use self::symlink_file::symlink_file;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/windows/symlink_dir.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/windows/symlink_dir.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/windows/symlink_dir.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/windows/symlink_dir.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-use crate::fs::asyncify;
-
-use std::io;
-use std::path::Path;
-
-/// Creates a new directory symlink on the filesystem.
-///
-/// The `dst` path will be a directory symbolic link pointing to the `src`
-/// path.
-///
-/// This is an async version of [`std::os::windows::fs::symlink_dir`][std]
-///
-/// [std]: std::os::windows::fs::symlink_dir
-pub async fn symlink_dir(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
-    let src = src.as_ref().to_owned();
-    let dst = dst.as_ref().to_owned();
-
-    asyncify(move || std::os::windows::fs::symlink_dir(src, dst)).await
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/windows/symlink_file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/windows/symlink_file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/os/windows/symlink_file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/os/windows/symlink_file.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-use crate::fs::asyncify;
-
-use std::io;
-use std::path::Path;
-
-/// Creates a new file symbolic link on the filesystem.
-///
-/// The `dst` path will be a file symbolic link pointing to the `src`
-/// path.
-///
-/// This is an async version of [`std::os::windows::fs::symlink_file`][std]
-///
-/// [std]: std::os::windows::fs::symlink_file
-pub async fn symlink_file(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
-    let src = src.as_ref().to_owned();
-    let dst = dst.as_ref().to_owned();
-
-    asyncify(move || std::os::windows::fs::symlink_file(src, dst)).await
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/read_dir.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/read_dir.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/read_dir.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/read_dir.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,32 @@
-use crate::fs::{asyncify, sys};
+use crate::fs::asyncify;
 
 use std::ffi::OsString;
 use std::fs::{FileType, Metadata};
 use std::future::Future;
 use std::io;
-#[cfg(unix)]
-use std::os::unix::fs::DirEntryExt;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::Context;
 use std::task::Poll;
 
+#[cfg(test)]
+use super::mocks::spawn_blocking;
+#[cfg(test)]
+use super::mocks::JoinHandle;
+#[cfg(not(test))]
+use crate::blocking::spawn_blocking;
+#[cfg(not(test))]
+use crate::blocking::JoinHandle;
+
 /// Returns a stream over the entries within a directory.
 ///
 /// This is an async version of [`std::fs::read_dir`](std::fs::read_dir)
+///
+/// This operation is implemented by running the equivalent blocking
+/// operation on a separate thread pool using [`spawn_blocking`].
+///
+/// [`spawn_blocking`]: crate::task::spawn_blocking
 pub async fn read_dir(path: impl AsRef<Path>) -> io::Result<ReadDir> {
     let path = path.as_ref().to_owned();
     let std = asyncify(|| std::fs::read_dir(path)).await?;
@@ -22,21 +34,23 @@
     Ok(ReadDir(State::Idle(Some(std))))
 }
 
-/// Stream of the entries in a directory.
+/// Read the the entries in a directory.
+///
+/// This struct is returned from the [`read_dir`] function of this module and
+/// will yield instances of [`DirEntry`]. Through a [`DirEntry`] information
+/// like the entry's path and possibly other metadata can be learned.
 ///
-/// This stream is returned from the [`read_dir`] function of this module and
-/// will yield instances of [`DirEntry`]. Through a [`DirEntry`]
-/// information like the entry's path and possibly other metadata can be
-/// learned.
+/// A `ReadDir` can be turned into a `Stream` with [`ReadDirStream`].
+///
+/// [`ReadDirStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.ReadDirStream.html
 ///
 /// # Errors
 ///
-/// This [`Stream`] will return an [`Err`] if there's some sort of intermittent
+/// This stream will return an [`Err`] if there's some sort of intermittent
 /// IO error during iteration.
 ///
 /// [`read_dir`]: read_dir
 /// [`DirEntry`]: DirEntry
-/// [`Stream`]: crate::stream::Stream
 /// [`Err`]: std::result::Result::Err
 #[derive(Debug)]
 #[must_use = "streams do nothing unless polled"]
@@ -45,24 +59,45 @@
 #[derive(Debug)]
 enum State {
     Idle(Option<std::fs::ReadDir>),
-    Pending(sys::Blocking<(Option<io::Result<std::fs::DirEntry>>, std::fs::ReadDir)>),
+    Pending(JoinHandle<(Option<io::Result<std::fs::DirEntry>>, std::fs::ReadDir)>),
 }
 
 impl ReadDir {
     /// Returns the next entry in the directory stream.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancellation safe.
     pub async fn next_entry(&mut self) -> io::Result<Option<DirEntry>> {
         use crate::future::poll_fn;
         poll_fn(|cx| self.poll_next_entry(cx)).await
     }
 
-    #[doc(hidden)]
+    /// Polls for the next directory entry in the stream.
+    ///
+    /// This method returns:
+    ///
+    ///  * `Poll::Pending` if the next directory entry is not yet available.
+    ///  * `Poll::Ready(Ok(Some(entry)))` if the next directory entry is available.
+    ///  * `Poll::Ready(Ok(None))` if there are no more directory entries in this
+    ///    stream.
+    ///  * `Poll::Ready(Err(err))` if an IO error occurred while reading the next
+    ///    directory entry.
+    ///
+    /// When the method returns `Poll::Pending`, the `Waker` in the provided
+    /// `Context` is scheduled to receive a wakeup when the next directory entry
+    /// becomes available on the underlying IO resource.
+    ///
+    /// Note that on multiple calls to `poll_next_entry`, only the `Waker` from
+    /// the `Context` passed to the most recent call is scheduled to receive a
+    /// wakeup.
     pub fn poll_next_entry(&mut self, cx: &mut Context<'_>) -> Poll<io::Result<Option<DirEntry>>> {
         loop {
             match self.0 {
                 State::Idle(ref mut std) => {
                     let mut std = std.take().unwrap();
 
-                    self.0 = State::Pending(sys::run(move || {
+                    self.0 = State::Pending(spawn_blocking(move || {
                         let ret = std.next();
                         (ret, std)
                     }));
@@ -84,16 +119,33 @@
     }
 }
 
-#[cfg(feature = "stream")]
-impl crate::stream::Stream for ReadDir {
-    type Item = io::Result<DirEntry>;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        Poll::Ready(match ready!(self.poll_next_entry(cx)) {
-            Ok(Some(entry)) => Some(Ok(entry)),
-            Ok(None) => None,
-            Err(err) => Some(Err(err)),
-        })
+feature! {
+    #![unix]
+
+    use std::os::unix::fs::DirEntryExt;
+
+    impl DirEntry {
+        /// Returns the underlying `d_ino` field in the contained `dirent`
+        /// structure.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// use tokio::fs;
+        ///
+        /// # #[tokio::main]
+        /// # async fn main() -> std::io::Result<()> {
+        /// let mut entries = fs::read_dir(".").await?;
+        /// while let Some(entry) = entries.next_entry().await? {
+        ///     // Here, `entry` is a `DirEntry`.
+        ///     println!("{:?}: {}", entry.file_name(), entry.ino());
+        /// }
+        /// # Ok(())
+        /// # }
+        /// ```
+        pub fn ino(&self) -> u64 {
+            self.as_inner().ino()
+        }
     }
 }
 
@@ -234,11 +286,10 @@
         let std = self.0.clone();
         asyncify(move || std.file_type()).await
     }
-}
 
-#[cfg(unix)]
-impl DirEntryExt for DirEntry {
-    fn ino(&self) -> u64 {
-        self.0.ino()
+    /// Returns a reference to the underlying `std::fs::DirEntry`
+    #[cfg(unix)]
+    pub(super) fn as_inner(&self) -> &std::fs::DirEntry {
+        &self.0
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,8 +13,12 @@
 /// buffer based on the file size when available, so it is generally faster than
 /// reading into a vector created with `Vec::new()`.
 ///
+/// This operation is implemented by running the equivalent blocking operation
+/// on a separate thread pool using [`spawn_blocking`].
+///
 /// [`File::open`]: super::File::open
 /// [`read_to_end`]: crate::io::AsyncReadExt::read_to_end
+/// [`spawn_blocking`]: crate::task::spawn_blocking
 ///
 /// # Errors
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/read_to_string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/read_to_string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/read_to_string.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/read_to_string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,13 @@
 /// Creates a future which will open a file for reading and read the entire
 /// contents into a string and return said string.
 ///
-/// This is the async equivalent of `std::fs::read_to_string`.
+/// This is the async equivalent of [`std::fs::read_to_string`][std].
+///
+/// This operation is implemented by running the equivalent blocking operation
+/// on a separate thread pool using [`spawn_blocking`].
+///
+/// [`spawn_blocking`]: crate::task::spawn_blocking
+/// [std]: fn@std::fs::read_to_string
 ///
 /// # Examples
 ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/symlink_dir.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/symlink_dir.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/symlink_dir.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/symlink_dir.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+use crate::fs::asyncify;
+
+use std::io;
+use std::path::Path;
+
+/// Creates a new directory symlink on the filesystem.
+///
+/// The `dst` path will be a directory symbolic link pointing to the `src`
+/// path.
+///
+/// This is an async version of [`std::os::windows::fs::symlink_dir`][std]
+///
+/// [std]: std::os::windows::fs::symlink_dir
+pub async fn symlink_dir(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
+    let src = src.as_ref().to_owned();
+    let dst = dst.as_ref().to_owned();
+
+    asyncify(move || std::os::windows::fs::symlink_dir(src, dst)).await
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/symlink_file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/symlink_file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/symlink_file.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/symlink_file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+use crate::fs::asyncify;
+
+use std::io;
+use std::path::Path;
+
+/// Creates a new file symbolic link on the filesystem.
+///
+/// The `dst` path will be a file symbolic link pointing to the `src`
+/// path.
+///
+/// This is an async version of [`std::os::windows::fs::symlink_file`][std]
+///
+/// [std]: std::os::windows::fs::symlink_file
+pub async fn symlink_file(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
+    let src = src.as_ref().to_owned();
+    let dst = dst.as_ref().to_owned();
+
+    asyncify(move || std::os::windows::fs::symlink_file(src, dst)).await
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/symlink.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/symlink.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/symlink.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/symlink.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+use crate::fs::asyncify;
+
+use std::io;
+use std::path::Path;
+
+/// Creates a new symbolic link on the filesystem.
+///
+/// The `dst` path will be a symbolic link pointing to the `src` path.
+///
+/// This is an async version of [`std::os::unix::fs::symlink`][std]
+///
+/// [std]: std::os::unix::fs::symlink
+pub async fn symlink(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
+    let src = src.as_ref().to_owned();
+    let dst = dst.as_ref().to_owned();
+
+    asyncify(move || std::os::unix::fs::symlink(src, dst)).await
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/write.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/write.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/fs/write.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/fs/write.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,13 @@
 /// Creates a future that will open a file for writing and write the entire
 /// contents of `contents` to it.
 ///
-/// This is the async equivalent of `std::fs::write`.
+/// This is the async equivalent of [`std::fs::write`][std].
+///
+/// This operation is implemented by running the equivalent blocking operation
+/// on a separate thread pool using [`spawn_blocking`].
+///
+/// [`spawn_blocking`]: crate::task::spawn_blocking
+/// [std]: fn@std::fs::write
 ///
 /// # Examples
 ///
@@ -17,7 +23,7 @@
 /// # Ok(())
 /// # }
 /// ```
-pub async fn write<C: AsRef<[u8]> + Unpin>(path: impl AsRef<Path>, contents: C) -> io::Result<()> {
+pub async fn write(path: impl AsRef<Path>, contents: impl AsRef<[u8]>) -> io::Result<()> {
     let path = path.as_ref().to_owned();
     let contents = contents.as_ref().to_owned();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/block_on.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/block_on.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/block_on.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/block_on.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+use std::future::Future;
+
+cfg_rt! {
+    pub(crate) fn block_on<F: Future>(f: F) -> F::Output {
+        let mut e = crate::runtime::enter::enter(false);
+        e.block_on(f).unwrap()
+    }
+}
+
+cfg_not_rt! {
+    pub(crate) fn block_on<F: Future>(f: F) -> F::Output {
+        let mut park = crate::park::thread::CachedParkThread::new();
+        park.block_on(f).unwrap()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,35 @@
-#![allow(unused_imports, dead_code)]
+#![cfg_attr(not(feature = "macros"), allow(unreachable_pub))]
 
 //! Asynchronous values.
 
-mod maybe_done;
-pub use maybe_done::{maybe_done, MaybeDone};
+#[cfg(any(feature = "macros", feature = "process"))]
+pub(crate) mod maybe_done;
 
 mod poll_fn;
 pub use poll_fn::poll_fn;
 
-mod ready;
-pub(crate) use ready::{ok, Ready};
+cfg_not_loom! {
+    mod ready;
+    pub(crate) use ready::{ok, Ready};
+}
 
-mod try_join;
-pub(crate) use try_join::try_join3;
+cfg_process! {
+    mod try_join;
+    pub(crate) use try_join::try_join3;
+}
+
+cfg_sync! {
+    mod block_on;
+    pub(crate) use block_on::block_on;
+}
+
+cfg_trace! {
+    mod trace;
+    pub(crate) use trace::InstrumentedFuture as Future;
+}
+
+cfg_not_trace! {
+    cfg_rt! {
+        pub(crate) use std::future::Future;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/pending.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/pending.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/pending.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/pending.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-use sdt::pin::Pin;
-use std::future::Future;
-use std::marker;
-use std::task::{Context, Poll};
-
-/// Future for the [`pending()`] function.
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-struct Pending<T> {
-    _data: marker::PhantomData<T>,
-}
-
-/// Creates a future which never resolves, representing a computation that never
-/// finishes.
-///
-/// The returned future will forever return [`Poll::Pending`].
-///
-/// # Examples
-///
-/// ```no_run
-/// use tokio::future;
-///
-/// #[tokio::main]
-/// async fn main {
-///     future::pending().await;
-///     unreachable!();
-/// }
-/// ```
-pub async fn pending() -> ! {
-    Pending {
-        _data: marker::PhantomData,
-    }
-    .await
-}
-
-impl<T> Future for Pending<T> {
-    type Output = !;
-
-    fn poll(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<T> {
-        Poll::Pending
-    }
-}
-
-impl<T> Unpin for Pending<T> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/poll_fn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/poll_fn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/poll_fn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/poll_fn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 //! Definition of the `PollFn` adapter combinator
 
 use std::fmt;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/trace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/trace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/trace.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/trace.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+use std::future::Future;
+
+pub(crate) trait InstrumentedFuture: Future {
+    fn id(&self) -> Option<tracing::Id>;
+}
+
+impl<F: Future> InstrumentedFuture for tracing::instrument::Instrumented<F> {
+    fn id(&self) -> Option<tracing::Id> {
+        self.span().id()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/try_join.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/try_join.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/future/try_join.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/future/try_join.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use crate::future::{maybe_done, MaybeDone};
+use crate::future::maybe_done::{maybe_done, MaybeDone};
 
 use pin_project_lite::pin_project;
 use std::future::Future;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/async_fd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/async_fd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/async_fd.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/async_fd.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,659 @@
+use crate::io::driver::{Handle, Interest, ReadyEvent, Registration};
+
+use mio::unix::SourceFd;
+use std::io;
+use std::os::unix::io::{AsRawFd, RawFd};
+use std::{task::Context, task::Poll};
+
+/// Associates an IO object backed by a Unix file descriptor with the tokio
+/// reactor, allowing for readiness to be polled. The file descriptor must be of
+/// a type that can be used with the OS polling facilities (ie, `poll`, `epoll`,
+/// `kqueue`, etc), such as a network socket or pipe, and the file descriptor
+/// must have the nonblocking mode set to true.
+///
+/// Creating an AsyncFd registers the file descriptor with the current tokio
+/// Reactor, allowing you to directly await the file descriptor being readable
+/// or writable. Once registered, the file descriptor remains registered until
+/// the AsyncFd is dropped.
+///
+/// The AsyncFd takes ownership of an arbitrary object to represent the IO
+/// object. It is intended that this object will handle closing the file
+/// descriptor when it is dropped, avoiding resource leaks and ensuring that the
+/// AsyncFd can clean up the registration before closing the file descriptor.
+/// The [`AsyncFd::into_inner`] function can be used to extract the inner object
+/// to retake control from the tokio IO reactor.
+///
+/// The inner object is required to implement [`AsRawFd`]. This file descriptor
+/// must not change while [`AsyncFd`] owns the inner object, i.e. the
+/// [`AsRawFd::as_raw_fd`] method on the inner type must always return the same
+/// file descriptor when called multiple times. Failure to uphold this results
+/// in unspecified behavior in the IO driver, which may include breaking
+/// notifications for other sockets/etc.
+///
+/// Polling for readiness is done by calling the async functions [`readable`]
+/// and [`writable`]. These functions complete when the associated readiness
+/// condition is observed. Any number of tasks can query the same `AsyncFd` in
+/// parallel, on the same or different conditions.
+///
+/// On some platforms, the readiness detecting mechanism relies on
+/// edge-triggered notifications. This means that the OS will only notify Tokio
+/// when the file descriptor transitions from not-ready to ready. For this to
+/// work you should first try to read or write and only poll for readiness
+/// if that fails with an error of [`std::io::ErrorKind::WouldBlock`].
+///
+/// Tokio internally tracks when it has received a ready notification, and when
+/// readiness checking functions like [`readable`] and [`writable`] are called,
+/// if the readiness flag is set, these async functions will complete
+/// immediately. This however does mean that it is critical to ensure that this
+/// ready flag is cleared when (and only when) the file descriptor ceases to be
+/// ready. The [`AsyncFdReadyGuard`] returned from readiness checking functions
+/// serves this function; after calling a readiness-checking async function,
+/// you must use this [`AsyncFdReadyGuard`] to signal to tokio whether the file
+/// descriptor is no longer in a ready state.
+///
+/// ## Use with to a poll-based API
+///
+/// In some cases it may be desirable to use `AsyncFd` from APIs similar to
+/// [`TcpStream::poll_read_ready`]. The [`AsyncFd::poll_read_ready`] and
+/// [`AsyncFd::poll_write_ready`] functions are provided for this purpose.
+/// Because these functions don't create a future to hold their state, they have
+/// the limitation that only one task can wait on each direction (read or write)
+/// at a time.
+///
+/// # Examples
+///
+/// This example shows how to turn [`std::net::TcpStream`] asynchronous using
+/// `AsyncFd`.  It implements `read` as an async fn, and `AsyncWrite` as a trait
+/// to show how to implement both approaches.
+///
+/// ```no_run
+/// use futures::ready;
+/// use std::io::{self, Read, Write};
+/// use std::net::TcpStream;
+/// use std::pin::Pin;
+/// use std::task::{Context, Poll};
+/// use tokio::io::AsyncWrite;
+/// use tokio::io::unix::AsyncFd;
+///
+/// pub struct AsyncTcpStream {
+///     inner: AsyncFd<TcpStream>,
+/// }
+///
+/// impl AsyncTcpStream {
+///     pub fn new(tcp: TcpStream) -> io::Result<Self> {
+///         Ok(Self {
+///             inner: AsyncFd::new(tcp)?,
+///         })
+///     }
+///
+///     pub async fn read(&self, out: &mut [u8]) -> io::Result<usize> {
+///         loop {
+///             let mut guard = self.inner.readable().await?;
+///
+///             match guard.try_io(|inner| inner.get_ref().read(out)) {
+///                 Ok(result) => return result,
+///                 Err(_would_block) => continue,
+///             }
+///         }
+///     }
+/// }
+///
+/// impl AsyncWrite for AsyncTcpStream {
+///     fn poll_write(
+///         self: Pin<&mut Self>,
+///         cx: &mut Context<'_>,
+///         buf: &[u8]
+///     ) -> Poll<io::Result<usize>> {
+///         loop {
+///             let mut guard = ready!(self.inner.poll_write_ready(cx))?;
+///
+///             match guard.try_io(|inner| inner.get_ref().write(buf)) {
+///                 Ok(result) => return Poll::Ready(result),
+///                 Err(_would_block) => continue,
+///             }
+///         }
+///     }
+///
+///     fn poll_flush(
+///         self: Pin<&mut Self>,
+///         cx: &mut Context<'_>,
+///     ) -> Poll<io::Result<()>> {
+///         // tcp flush is a no-op
+///         Poll::Ready(Ok(()))
+///     }
+///
+///     fn poll_shutdown(
+///         self: Pin<&mut Self>,
+///         cx: &mut Context<'_>,
+///     ) -> Poll<io::Result<()>> {
+///         self.inner.get_ref().shutdown(std::net::Shutdown::Write)?;
+///         Poll::Ready(Ok(()))
+///     }
+/// }
+/// ```
+///
+/// [`readable`]: method@Self::readable
+/// [`writable`]: method@Self::writable
+/// [`AsyncFdReadyGuard`]: struct@self::AsyncFdReadyGuard
+/// [`TcpStream::poll_read_ready`]: struct@crate::net::TcpStream
+pub struct AsyncFd<T: AsRawFd> {
+    registration: Registration,
+    inner: Option<T>,
+}
+
+/// Represents an IO-ready event detected on a particular file descriptor that
+/// has not yet been acknowledged. This is a `must_use` structure to help ensure
+/// that you do not forget to explicitly clear (or not clear) the event.
+///
+/// This type exposes an immutable reference to the underlying IO object.
+#[must_use = "You must explicitly choose whether to clear the readiness state by calling a method on ReadyGuard"]
+pub struct AsyncFdReadyGuard<'a, T: AsRawFd> {
+    async_fd: &'a AsyncFd<T>,
+    event: Option<ReadyEvent>,
+}
+
+/// Represents an IO-ready event detected on a particular file descriptor that
+/// has not yet been acknowledged. This is a `must_use` structure to help ensure
+/// that you do not forget to explicitly clear (or not clear) the event.
+///
+/// This type exposes a mutable reference to the underlying IO object.
+#[must_use = "You must explicitly choose whether to clear the readiness state by calling a method on ReadyGuard"]
+pub struct AsyncFdReadyMutGuard<'a, T: AsRawFd> {
+    async_fd: &'a mut AsyncFd<T>,
+    event: Option<ReadyEvent>,
+}
+
+const ALL_INTEREST: Interest = Interest::READABLE.add(Interest::WRITABLE);
+
+impl<T: AsRawFd> AsyncFd<T> {
+    #[inline]
+    /// Creates an AsyncFd backed by (and taking ownership of) an object
+    /// implementing [`AsRawFd`]. The backing file descriptor is cached at the
+    /// time of creation.
+    ///
+    /// This method must be called in the context of a tokio runtime.
+    pub fn new(inner: T) -> io::Result<Self>
+    where
+        T: AsRawFd,
+    {
+        Self::with_interest(inner, ALL_INTEREST)
+    }
+
+    #[inline]
+    /// Creates new instance as `new` with additional ability to customize interest,
+    /// allowing to specify whether file descriptor will be polled for read, write or both.
+    pub fn with_interest(inner: T, interest: Interest) -> io::Result<Self>
+    where
+        T: AsRawFd,
+    {
+        Self::new_with_handle_and_interest(inner, Handle::current(), interest)
+    }
+
+    pub(crate) fn new_with_handle_and_interest(
+        inner: T,
+        handle: Handle,
+        interest: Interest,
+    ) -> io::Result<Self> {
+        let fd = inner.as_raw_fd();
+
+        let registration =
+            Registration::new_with_interest_and_handle(&mut SourceFd(&fd), interest, handle)?;
+
+        Ok(AsyncFd {
+            registration,
+            inner: Some(inner),
+        })
+    }
+
+    /// Returns a shared reference to the backing object of this [`AsyncFd`]
+    #[inline]
+    pub fn get_ref(&self) -> &T {
+        self.inner.as_ref().unwrap()
+    }
+
+    /// Returns a mutable reference to the backing object of this [`AsyncFd`]
+    #[inline]
+    pub fn get_mut(&mut self) -> &mut T {
+        self.inner.as_mut().unwrap()
+    }
+
+    fn take_inner(&mut self) -> Option<T> {
+        let fd = self.inner.as_ref().map(AsRawFd::as_raw_fd);
+
+        if let Some(fd) = fd {
+            let _ = self.registration.deregister(&mut SourceFd(&fd));
+        }
+
+        self.inner.take()
+    }
+
+    /// Deregisters this file descriptor and returns ownership of the backing
+    /// object.
+    pub fn into_inner(mut self) -> T {
+        self.take_inner().unwrap()
+    }
+
+    /// Polls for read readiness.
+    ///
+    /// If the file descriptor is not currently ready for reading, this method
+    /// will store a clone of the [`Waker`] from the provided [`Context`]. When the
+    /// file descriptor becomes ready for reading, [`Waker::wake`] will be called.
+    ///
+    /// Note that on multiple calls to [`poll_read_ready`] or
+    /// [`poll_read_ready_mut`], only the `Waker` from the `Context` passed to the
+    /// most recent call is scheduled to receive a wakeup. (However,
+    /// [`poll_write_ready`] retains a second, independent waker).
+    ///
+    /// This method is intended for cases where creating and pinning a future
+    /// via [`readable`] is not feasible. Where possible, using [`readable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// This method takes `&self`, so it is possible to call this method
+    /// concurrently with other methods on this struct. This method only
+    /// provides shared access to the inner IO resource when handling the
+    /// [`AsyncFdReadyGuard`].
+    ///
+    /// [`poll_read_ready`]: method@Self::poll_read_ready
+    /// [`poll_read_ready_mut`]: method@Self::poll_read_ready_mut
+    /// [`poll_write_ready`]: method@Self::poll_write_ready
+    /// [`readable`]: method@Self::readable
+    /// [`Context`]: struct@std::task::Context
+    /// [`Waker`]: struct@std::task::Waker
+    /// [`Waker::wake`]: method@std::task::Waker::wake
+    pub fn poll_read_ready<'a>(
+        &'a self,
+        cx: &mut Context<'_>,
+    ) -> Poll<io::Result<AsyncFdReadyGuard<'a, T>>> {
+        let event = ready!(self.registration.poll_read_ready(cx))?;
+
+        Ok(AsyncFdReadyGuard {
+            async_fd: self,
+            event: Some(event),
+        })
+        .into()
+    }
+
+    /// Polls for read readiness.
+    ///
+    /// If the file descriptor is not currently ready for reading, this method
+    /// will store a clone of the [`Waker`] from the provided [`Context`]. When the
+    /// file descriptor becomes ready for reading, [`Waker::wake`] will be called.
+    ///
+    /// Note that on multiple calls to [`poll_read_ready`] or
+    /// [`poll_read_ready_mut`], only the `Waker` from the `Context` passed to the
+    /// most recent call is scheduled to receive a wakeup. (However,
+    /// [`poll_write_ready`] retains a second, independent waker).
+    ///
+    /// This method is intended for cases where creating and pinning a future
+    /// via [`readable`] is not feasible. Where possible, using [`readable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// This method takes `&mut self`, so it is possible to access the inner IO
+    /// resource mutably when handling the [`AsyncFdReadyMutGuard`].
+    ///
+    /// [`poll_read_ready`]: method@Self::poll_read_ready
+    /// [`poll_read_ready_mut`]: method@Self::poll_read_ready_mut
+    /// [`poll_write_ready`]: method@Self::poll_write_ready
+    /// [`readable`]: method@Self::readable
+    /// [`Context`]: struct@std::task::Context
+    /// [`Waker`]: struct@std::task::Waker
+    /// [`Waker::wake`]: method@std::task::Waker::wake
+    pub fn poll_read_ready_mut<'a>(
+        &'a mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<io::Result<AsyncFdReadyMutGuard<'a, T>>> {
+        let event = ready!(self.registration.poll_read_ready(cx))?;
+
+        Ok(AsyncFdReadyMutGuard {
+            async_fd: self,
+            event: Some(event),
+        })
+        .into()
+    }
+
+    /// Polls for write readiness.
+    ///
+    /// If the file descriptor is not currently ready for writing, this method
+    /// will store a clone of the [`Waker`] from the provided [`Context`]. When the
+    /// file descriptor becomes ready for writing, [`Waker::wake`] will be called.
+    ///
+    /// Note that on multiple calls to [`poll_write_ready`] or
+    /// [`poll_write_ready_mut`], only the `Waker` from the `Context` passed to the
+    /// most recent call is scheduled to receive a wakeup. (However,
+    /// [`poll_read_ready`] retains a second, independent waker).
+    ///
+    /// This method is intended for cases where creating and pinning a future
+    /// via [`writable`] is not feasible. Where possible, using [`writable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// This method takes `&self`, so it is possible to call this method
+    /// concurrently with other methods on this struct. This method only
+    /// provides shared access to the inner IO resource when handling the
+    /// [`AsyncFdReadyGuard`].
+    ///
+    /// [`poll_read_ready`]: method@Self::poll_read_ready
+    /// [`poll_write_ready`]: method@Self::poll_write_ready
+    /// [`poll_write_ready_mut`]: method@Self::poll_write_ready_mut
+    /// [`writable`]: method@Self::readable
+    /// [`Context`]: struct@std::task::Context
+    /// [`Waker`]: struct@std::task::Waker
+    /// [`Waker::wake`]: method@std::task::Waker::wake
+    pub fn poll_write_ready<'a>(
+        &'a self,
+        cx: &mut Context<'_>,
+    ) -> Poll<io::Result<AsyncFdReadyGuard<'a, T>>> {
+        let event = ready!(self.registration.poll_write_ready(cx))?;
+
+        Ok(AsyncFdReadyGuard {
+            async_fd: self,
+            event: Some(event),
+        })
+        .into()
+    }
+
+    /// Polls for write readiness.
+    ///
+    /// If the file descriptor is not currently ready for writing, this method
+    /// will store a clone of the [`Waker`] from the provided [`Context`]. When the
+    /// file descriptor becomes ready for writing, [`Waker::wake`] will be called.
+    ///
+    /// Note that on multiple calls to [`poll_write_ready`] or
+    /// [`poll_write_ready_mut`], only the `Waker` from the `Context` passed to the
+    /// most recent call is scheduled to receive a wakeup. (However,
+    /// [`poll_read_ready`] retains a second, independent waker).
+    ///
+    /// This method is intended for cases where creating and pinning a future
+    /// via [`writable`] is not feasible. Where possible, using [`writable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// This method takes `&mut self`, so it is possible to access the inner IO
+    /// resource mutably when handling the [`AsyncFdReadyMutGuard`].
+    ///
+    /// [`poll_read_ready`]: method@Self::poll_read_ready
+    /// [`poll_write_ready`]: method@Self::poll_write_ready
+    /// [`poll_write_ready_mut`]: method@Self::poll_write_ready_mut
+    /// [`writable`]: method@Self::readable
+    /// [`Context`]: struct@std::task::Context
+    /// [`Waker`]: struct@std::task::Waker
+    /// [`Waker::wake`]: method@std::task::Waker::wake
+    pub fn poll_write_ready_mut<'a>(
+        &'a mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<io::Result<AsyncFdReadyMutGuard<'a, T>>> {
+        let event = ready!(self.registration.poll_write_ready(cx))?;
+
+        Ok(AsyncFdReadyMutGuard {
+            async_fd: self,
+            event: Some(event),
+        })
+        .into()
+    }
+
+    async fn readiness(&self, interest: Interest) -> io::Result<AsyncFdReadyGuard<'_, T>> {
+        let event = self.registration.readiness(interest).await?;
+
+        Ok(AsyncFdReadyGuard {
+            async_fd: self,
+            event: Some(event),
+        })
+    }
+
+    async fn readiness_mut(
+        &mut self,
+        interest: Interest,
+    ) -> io::Result<AsyncFdReadyMutGuard<'_, T>> {
+        let event = self.registration.readiness(interest).await?;
+
+        Ok(AsyncFdReadyMutGuard {
+            async_fd: self,
+            event: Some(event),
+        })
+    }
+
+    /// Waits for the file descriptor to become readable, returning a
+    /// [`AsyncFdReadyGuard`] that must be dropped to resume read-readiness
+    /// polling.
+    ///
+    /// This method takes `&self`, so it is possible to call this method
+    /// concurrently with other methods on this struct. This method only
+    /// provides shared access to the inner IO resource when handling the
+    /// [`AsyncFdReadyGuard`].
+    #[allow(clippy::needless_lifetimes)] // The lifetime improves rustdoc rendering.
+    pub async fn readable<'a>(&'a self) -> io::Result<AsyncFdReadyGuard<'a, T>> {
+        self.readiness(Interest::READABLE).await
+    }
+
+    /// Waits for the file descriptor to become readable, returning a
+    /// [`AsyncFdReadyMutGuard`] that must be dropped to resume read-readiness
+    /// polling.
+    ///
+    /// This method takes `&mut self`, so it is possible to access the inner IO
+    /// resource mutably when handling the [`AsyncFdReadyMutGuard`].
+    #[allow(clippy::needless_lifetimes)] // The lifetime improves rustdoc rendering.
+    pub async fn readable_mut<'a>(&'a mut self) -> io::Result<AsyncFdReadyMutGuard<'a, T>> {
+        self.readiness_mut(Interest::READABLE).await
+    }
+
+    /// Waits for the file descriptor to become writable, returning a
+    /// [`AsyncFdReadyGuard`] that must be dropped to resume write-readiness
+    /// polling.
+    ///
+    /// This method takes `&self`, so it is possible to call this method
+    /// concurrently with other methods on this struct. This method only
+    /// provides shared access to the inner IO resource when handling the
+    /// [`AsyncFdReadyGuard`].
+    #[allow(clippy::needless_lifetimes)] // The lifetime improves rustdoc rendering.
+    pub async fn writable<'a>(&'a self) -> io::Result<AsyncFdReadyGuard<'a, T>> {
+        self.readiness(Interest::WRITABLE).await
+    }
+
+    /// Waits for the file descriptor to become writable, returning a
+    /// [`AsyncFdReadyMutGuard`] that must be dropped to resume write-readiness
+    /// polling.
+    ///
+    /// This method takes `&mut self`, so it is possible to access the inner IO
+    /// resource mutably when handling the [`AsyncFdReadyMutGuard`].
+    #[allow(clippy::needless_lifetimes)] // The lifetime improves rustdoc rendering.
+    pub async fn writable_mut<'a>(&'a mut self) -> io::Result<AsyncFdReadyMutGuard<'a, T>> {
+        self.readiness_mut(Interest::WRITABLE).await
+    }
+}
+
+impl<T: AsRawFd> AsRawFd for AsyncFd<T> {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_ref().unwrap().as_raw_fd()
+    }
+}
+
+impl<T: std::fmt::Debug + AsRawFd> std::fmt::Debug for AsyncFd<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("AsyncFd")
+            .field("inner", &self.inner)
+            .finish()
+    }
+}
+
+impl<T: AsRawFd> Drop for AsyncFd<T> {
+    fn drop(&mut self) {
+        let _ = self.take_inner();
+    }
+}
+
+impl<'a, Inner: AsRawFd> AsyncFdReadyGuard<'a, Inner> {
+    /// Indicates to tokio that the file descriptor is no longer ready. The
+    /// internal readiness flag will be cleared, and tokio will wait for the
+    /// next edge-triggered readiness notification from the OS.
+    ///
+    /// It is critical that this function not be called unless your code
+    /// _actually observes_ that the file descriptor is _not_ ready. Do not call
+    /// it simply because, for example, a read succeeded; it should be called
+    /// when a read is observed to block.
+    ///
+    /// [`drop`]: method@std::mem::drop
+    pub fn clear_ready(&mut self) {
+        if let Some(event) = self.event.take() {
+            self.async_fd.registration.clear_readiness(event);
+        }
+    }
+
+    /// This method should be invoked when you intentionally want to keep the
+    /// ready flag asserted.
+    ///
+    /// While this function is itself a no-op, it satisfies the `#[must_use]`
+    /// constraint on the [`AsyncFdReadyGuard`] type.
+    pub fn retain_ready(&mut self) {
+        // no-op
+    }
+
+    /// Performs the provided IO operation.
+    ///
+    /// If `f` returns a [`WouldBlock`] error, the readiness state associated
+    /// with this file descriptor is cleared, and the method returns
+    /// `Err(TryIoError::WouldBlock)`. You will typically need to poll the
+    /// `AsyncFd` again when this happens.
+    ///
+    /// This method helps ensure that the readiness state of the underlying file
+    /// descriptor remains in sync with the tokio-side readiness state, by
+    /// clearing the tokio-side state only when a [`WouldBlock`] condition
+    /// occurs. It is the responsibility of the caller to ensure that `f`
+    /// returns [`WouldBlock`] only if the file descriptor that originated this
+    /// `AsyncFdReadyGuard` no longer expresses the readiness state that was queried to
+    /// create this `AsyncFdReadyGuard`.
+    ///
+    /// [`WouldBlock`]: std::io::ErrorKind::WouldBlock
+    // Alias for old name in 0.x
+    #[cfg_attr(docsrs, doc(alias = "with_io"))]
+    pub fn try_io<R>(
+        &mut self,
+        f: impl FnOnce(&AsyncFd<Inner>) -> io::Result<R>,
+    ) -> Result<io::Result<R>, TryIoError> {
+        let result = f(self.async_fd);
+
+        if let Err(e) = result.as_ref() {
+            if e.kind() == io::ErrorKind::WouldBlock {
+                self.clear_ready();
+            }
+        }
+
+        match result {
+            Err(err) if err.kind() == io::ErrorKind::WouldBlock => Err(TryIoError(())),
+            result => Ok(result),
+        }
+    }
+
+    /// Returns a shared reference to the inner [`AsyncFd`].
+    pub fn get_ref(&self) -> &AsyncFd<Inner> {
+        self.async_fd
+    }
+
+    /// Returns a shared reference to the backing object of the inner [`AsyncFd`].
+    pub fn get_inner(&self) -> &Inner {
+        self.get_ref().get_ref()
+    }
+}
+
+impl<'a, Inner: AsRawFd> AsyncFdReadyMutGuard<'a, Inner> {
+    /// Indicates to tokio that the file descriptor is no longer ready. The
+    /// internal readiness flag will be cleared, and tokio will wait for the
+    /// next edge-triggered readiness notification from the OS.
+    ///
+    /// It is critical that this function not be called unless your code
+    /// _actually observes_ that the file descriptor is _not_ ready. Do not call
+    /// it simply because, for example, a read succeeded; it should be called
+    /// when a read is observed to block.
+    ///
+    /// [`drop`]: method@std::mem::drop
+    pub fn clear_ready(&mut self) {
+        if let Some(event) = self.event.take() {
+            self.async_fd.registration.clear_readiness(event);
+        }
+    }
+
+    /// This method should be invoked when you intentionally want to keep the
+    /// ready flag asserted.
+    ///
+    /// While this function is itself a no-op, it satisfies the `#[must_use]`
+    /// constraint on the [`AsyncFdReadyGuard`] type.
+    pub fn retain_ready(&mut self) {
+        // no-op
+    }
+
+    /// Performs the provided IO operation.
+    ///
+    /// If `f` returns a [`WouldBlock`] error, the readiness state associated
+    /// with this file descriptor is cleared, and the method returns
+    /// `Err(TryIoError::WouldBlock)`. You will typically need to poll the
+    /// `AsyncFd` again when this happens.
+    ///
+    /// This method helps ensure that the readiness state of the underlying file
+    /// descriptor remains in sync with the tokio-side readiness state, by
+    /// clearing the tokio-side state only when a [`WouldBlock`] condition
+    /// occurs. It is the responsibility of the caller to ensure that `f`
+    /// returns [`WouldBlock`] only if the file descriptor that originated this
+    /// `AsyncFdReadyGuard` no longer expresses the readiness state that was queried to
+    /// create this `AsyncFdReadyGuard`.
+    ///
+    /// [`WouldBlock`]: std::io::ErrorKind::WouldBlock
+    pub fn try_io<R>(
+        &mut self,
+        f: impl FnOnce(&mut AsyncFd<Inner>) -> io::Result<R>,
+    ) -> Result<io::Result<R>, TryIoError> {
+        let result = f(&mut self.async_fd);
+
+        if let Err(e) = result.as_ref() {
+            if e.kind() == io::ErrorKind::WouldBlock {
+                self.clear_ready();
+            }
+        }
+
+        match result {
+            Err(err) if err.kind() == io::ErrorKind::WouldBlock => Err(TryIoError(())),
+            result => Ok(result),
+        }
+    }
+
+    /// Returns a shared reference to the inner [`AsyncFd`].
+    pub fn get_ref(&self) -> &AsyncFd<Inner> {
+        self.async_fd
+    }
+
+    /// Returns a mutable reference to the inner [`AsyncFd`].
+    pub fn get_mut(&mut self) -> &mut AsyncFd<Inner> {
+        self.async_fd
+    }
+
+    /// Returns a shared reference to the backing object of the inner [`AsyncFd`].
+    pub fn get_inner(&self) -> &Inner {
+        self.get_ref().get_ref()
+    }
+
+    /// Returns a mutable reference to the backing object of the inner [`AsyncFd`].
+    pub fn get_inner_mut(&mut self) -> &mut Inner {
+        self.get_mut().get_mut()
+    }
+}
+
+impl<'a, T: std::fmt::Debug + AsRawFd> std::fmt::Debug for AsyncFdReadyGuard<'a, T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ReadyGuard")
+            .field("async_fd", &self.async_fd)
+            .finish()
+    }
+}
+
+impl<'a, T: std::fmt::Debug + AsRawFd> std::fmt::Debug for AsyncFdReadyMutGuard<'a, T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("MutReadyGuard")
+            .field("async_fd", &self.async_fd)
+            .finish()
+    }
+}
+
+/// The error type returned by [`try_io`].
+///
+/// This error indicates that the IO resource returned a [`WouldBlock`] error.
+///
+/// [`WouldBlock`]: std::io::ErrorKind::WouldBlock
+/// [`try_io`]: method@AsyncFdReadyGuard::try_io
+#[derive(Debug)]
+pub struct TryIoError(());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/async_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/async_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/async_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/async_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,5 @@
-use bytes::BufMut;
+use super::ReadBuf;
 use std::io;
-use std::mem::MaybeUninit;
 use std::ops::DerefMut;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -16,9 +15,10 @@
 /// Specifically, this means that the `poll_read` function will return one of
 /// the following:
 ///
-/// * `Poll::Ready(Ok(n))` means that `n` bytes of data was immediately read
-///   and placed into the output buffer, where `n` == 0 implies that EOF has
-///   been reached.
+/// * `Poll::Ready(Ok(()))` means that data was immediately read and placed into
+///   the output buffer. The amount of data read can be determined by the
+///   increase in the length of the slice returned by `ReadBuf::filled`. If the
+///   difference is 0, EOF has been reached.
 ///
 /// * `Poll::Pending` means that no data was read into the buffer
 ///   provided. The I/O object is not currently readable but may become readable
@@ -41,110 +41,29 @@
 /// [`Read::read`]: std::io::Read::read
 /// [`AsyncReadExt`]: crate::io::AsyncReadExt
 pub trait AsyncRead {
-    /// Prepares an uninitialized buffer to be safe to pass to `read`. Returns
-    /// `true` if the supplied buffer was zeroed out.
-    ///
-    /// While it would be highly unusual, implementations of [`io::Read`] are
-    /// able to read data from the buffer passed as an argument. Because of
-    /// this, the buffer passed to [`io::Read`] must be initialized memory. In
-    /// situations where large numbers of buffers are used, constantly having to
-    /// zero out buffers can be expensive.
-    ///
-    /// This function does any necessary work to prepare an uninitialized buffer
-    /// to be safe to pass to `read`. If `read` guarantees to never attempt to
-    /// read data out of the supplied buffer, then `prepare_uninitialized_buffer`
-    /// doesn't need to do any work.
-    ///
-    /// If this function returns `true`, then the memory has been zeroed out.
-    /// This allows implementations of `AsyncRead` which are composed of
-    /// multiple subimplementations to efficiently implement
-    /// `prepare_uninitialized_buffer`.
-    ///
-    /// This function isn't actually `unsafe` to call but `unsafe` to implement.
-    /// The implementer must ensure that either the whole `buf` has been zeroed
-    /// or `poll_read_buf()` overwrites the buffer without reading it and returns
-    /// correct value.
-    ///
-    /// This function is called from [`poll_read_buf`].
-    ///
-    /// # Safety
-    ///
-    /// Implementations that return `false` must never read from data slices
-    /// that they did not write to.
-    ///
-    /// [`io::Read`]: std::io::Read
-    /// [`poll_read_buf`]: method@Self::poll_read_buf
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        for x in buf {
-            *x = MaybeUninit::new(0);
-        }
-
-        true
-    }
-
     /// Attempts to read from the `AsyncRead` into `buf`.
     ///
-    /// On success, returns `Poll::Ready(Ok(num_bytes_read))`.
-    ///
-    /// If no data is available for reading, the method returns
-    /// `Poll::Pending` and arranges for the current task (via
-    /// `cx.waker()`) to receive a notification when the object becomes
-    /// readable or is closed.
+    /// On success, returns `Poll::Ready(Ok(()))` and places data in the
+    /// unfilled portion of `buf`. If no data was read (`buf.filled().len()` is
+    /// unchanged), it implies that EOF has been reached.
+    ///
+    /// If no data is available for reading, the method returns `Poll::Pending`
+    /// and arranges for the current task (via `cx.waker()`) to receive a
+    /// notification when the object becomes readable or is closed.
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>>;
-
-    /// Pulls some bytes from this source into the specified `BufMut`, returning
-    /// how many bytes were read.
-    ///
-    /// The `buf` provided will have bytes read into it and the internal cursor
-    /// will be advanced if any bytes were read. Note that this method typically
-    /// will not reallocate the buffer provided.
-    fn poll_read_buf<B: BufMut>(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut B,
-    ) -> Poll<io::Result<usize>>
-    where
-        Self: Sized,
-    {
-        if !buf.has_remaining_mut() {
-            return Poll::Ready(Ok(0));
-        }
-
-        unsafe {
-            let n = {
-                let b = buf.bytes_mut();
-
-                self.prepare_uninitialized_buffer(b);
-
-                // Convert to `&mut [u8]`
-                let b = &mut *(b as *mut [MaybeUninit<u8>] as *mut [u8]);
-
-                let n = ready!(self.poll_read(cx, b))?;
-                assert!(n <= b.len(), "Bad AsyncRead implementation, more bytes were reported as read than the buffer can hold");
-                n
-            };
-
-            buf.advance_mut(n);
-            Poll::Ready(Ok(n))
-        }
-    }
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>>;
 }
 
 macro_rules! deref_async_read {
     () => {
-        unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-            (**self).prepare_uninitialized_buffer(buf)
-        }
-
         fn poll_read(
             mut self: Pin<&mut Self>,
             cx: &mut Context<'_>,
-            buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
             Pin::new(&mut **self).poll_read(cx, buf)
         }
     };
@@ -163,43 +82,50 @@
     P: DerefMut + Unpin,
     P::Target: AsyncRead,
 {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        (**self).prepare_uninitialized_buffer(buf)
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.get_mut().as_mut().poll_read(cx, buf)
     }
 }
 
 impl AsyncRead for &[u8] {
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-
     fn poll_read(
-        self: Pin<&mut Self>,
+        mut self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        Poll::Ready(io::Read::read(self.get_mut(), buf))
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        let amt = std::cmp::min(self.len(), buf.remaining());
+        let (a, b) = self.split_at(amt);
+        buf.put_slice(a);
+        *self = b;
+        Poll::Ready(Ok(()))
     }
 }
 
 impl<T: AsRef<[u8]> + Unpin> AsyncRead for io::Cursor<T> {
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-
     fn poll_read(
-        self: Pin<&mut Self>,
+        mut self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        Poll::Ready(io::Read::read(self.get_mut(), buf))
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        let pos = self.position();
+        let slice: &[u8] = (*self).get_ref().as_ref();
+
+        // The position could technically be out of bounds, so don't panic...
+        if pos > slice.len() as u64 {
+            return Poll::Ready(Ok(()));
+        }
+
+        let start = pos as usize;
+        let amt = std::cmp::min(slice.len() - start, buf.remaining());
+        // Add won't overflow because of pos check above.
+        let end = start + amt;
+        buf.put_slice(&slice[start..end]);
+        self.set_position(end as u64);
+
+        Poll::Ready(Ok(()))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/async_seek.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/async_seek.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/async_seek.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/async_seek.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,36 +23,33 @@
     ///
     /// If this function returns successfully, then the job has been submitted.
     /// To find out when it completes, call `poll_complete`.
-    fn start_seek(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        position: SeekFrom,
-    ) -> Poll<io::Result<()>>;
+    ///
+    /// # Errors
+    ///
+    /// This function can return [`io::ErrorKind::Other`] in case there is
+    /// another seek in progress. To avoid this, it is advisable that any call
+    /// to `start_seek` is preceded by a call to `poll_complete` to ensure all
+    /// pending seeks have completed.
+    fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> io::Result<()>;
 
     /// Waits for a seek operation to complete.
     ///
     /// If the seek operation completed successfully,
     /// this method returns the new position from the start of the stream.
-    /// That position can be used later with [`SeekFrom::Start`].
+    /// That position can be used later with [`SeekFrom::Start`]. Repeatedly
+    /// calling this function without calling `start_seek` might return the
+    /// same result.
     ///
     /// # Errors
     ///
     /// Seeking to a negative offset is considered an error.
-    ///
-    /// # Panics
-    ///
-    /// Calling this method without calling `start_seek` first is an error.
     fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>>;
 }
 
 macro_rules! deref_async_seek {
     () => {
-        fn start_seek(
-            mut self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-            pos: SeekFrom,
-        ) -> Poll<io::Result<()>> {
-            Pin::new(&mut **self).start_seek(cx, pos)
+        fn start_seek(mut self: Pin<&mut Self>, pos: SeekFrom) -> io::Result<()> {
+            Pin::new(&mut **self).start_seek(pos)
         }
 
         fn poll_complete(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
@@ -74,12 +71,8 @@
     P: DerefMut + Unpin,
     P::Target: AsyncSeek,
 {
-    fn start_seek(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        pos: SeekFrom,
-    ) -> Poll<io::Result<()>> {
-        self.get_mut().as_mut().start_seek(cx, pos)
+    fn start_seek(self: Pin<&mut Self>, pos: SeekFrom) -> io::Result<()> {
+        self.get_mut().as_mut().start_seek(pos)
     }
 
     fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
@@ -88,12 +81,8 @@
 }
 
 impl<T: AsRef<[u8]> + Unpin> AsyncSeek for io::Cursor<T> {
-    fn start_seek(
-        mut self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-        pos: SeekFrom,
-    ) -> Poll<io::Result<()>> {
-        Poll::Ready(io::Seek::seek(&mut *self, pos).map(drop))
+    fn start_seek(mut self: Pin<&mut Self>, pos: SeekFrom) -> io::Result<()> {
+        io::Seek::seek(&mut *self, pos).map(drop)
     }
     fn poll_complete(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<u64>> {
         Poll::Ready(Ok(self.get_mut().position()))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/async_write.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/async_write.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/async_write.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/async_write.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,4 @@
-use bytes::Buf;
-use std::io;
+use std::io::{self, IoSlice};
 use std::ops::DerefMut;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -46,7 +45,11 @@
 pub trait AsyncWrite {
     /// Attempt to write bytes from `buf` into the object.
     ///
-    /// On success, returns `Poll::Ready(Ok(num_bytes_written))`.
+    /// On success, returns `Poll::Ready(Ok(num_bytes_written))`. If successful,
+    /// then it must be guaranteed that `n <= buf.len()`. A return value of `0`
+    /// typically means that the underlying object is no longer able to accept
+    /// bytes and will likely not be able to in the future as well, or that the
+    /// buffer provided is empty.
     ///
     /// If the object is not ready for writing, the method returns
     /// `Poll::Pending` and arranges for the current task (via
@@ -129,25 +132,53 @@
     /// task.
     fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>>;
 
-    /// Writes a `Buf` into this value, returning how many bytes were written.
+    /// Like [`poll_write`], except that it writes from a slice of buffers.
+    ///
+    /// Data is copied from each buffer in order, with the final buffer
+    /// read from possibly being only partially consumed. This method must
+    /// behave as a call to [`write`] with the buffers concatenated would.
+    ///
+    /// The default implementation calls [`poll_write`] with either the first nonempty
+    /// buffer provided, or an empty one if none exists.
+    ///
+    /// On success, returns `Poll::Ready(Ok(num_bytes_written))`.
+    ///
+    /// If the object is not ready for writing, the method returns
+    /// `Poll::Pending` and arranges for the current task (via
+    /// `cx.waker()`) to receive a notification when the object becomes
+    /// writable or is closed.
+    ///
+    /// # Note
+    ///
+    /// This should be implemented as a single "atomic" write action. If any
+    /// data has been partially written, it is wrong to return an error or
+    /// pending.
     ///
-    /// Note that this method will advance the `buf` provided automatically by
-    /// the number of bytes written.
-    fn poll_write_buf<B: Buf>(
+    /// [`poll_write`]: AsyncWrite::poll_write
+    fn poll_write_vectored(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut B,
-    ) -> Poll<Result<usize, io::Error>>
-    where
-        Self: Sized,
-    {
-        if !buf.has_remaining() {
-            return Poll::Ready(Ok(0));
-        }
-
-        let n = ready!(self.poll_write(cx, buf.bytes()))?;
-        buf.advance(n);
-        Poll::Ready(Ok(n))
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<Result<usize, io::Error>> {
+        let buf = bufs
+            .iter()
+            .find(|b| !b.is_empty())
+            .map_or(&[][..], |b| &**b);
+        self.poll_write(cx, buf)
+    }
+
+    /// Determines if this writer has an efficient [`poll_write_vectored`]
+    /// implementation.
+    ///
+    /// If a writer does not override the default [`poll_write_vectored`]
+    /// implementation, code using it may want to avoid the method all together
+    /// and coalesce writes into a single buffer for higher performance.
+    ///
+    /// The default implementation returns `false`.
+    ///
+    /// [`poll_write_vectored`]: AsyncWrite::poll_write_vectored
+    fn is_write_vectored(&self) -> bool {
+        false
     }
 }
 
@@ -161,6 +192,18 @@
             Pin::new(&mut **self).poll_write(cx, buf)
         }
 
+        fn poll_write_vectored(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            bufs: &[IoSlice<'_>],
+        ) -> Poll<io::Result<usize>> {
+            Pin::new(&mut **self).poll_write_vectored(cx, bufs)
+        }
+
+        fn is_write_vectored(&self) -> bool {
+            (**self).is_write_vectored()
+        }
+
         fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
             Pin::new(&mut **self).poll_flush(cx)
         }
@@ -192,6 +235,18 @@
         self.get_mut().as_mut().poll_write(cx, buf)
     }
 
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        self.get_mut().as_mut().poll_write_vectored(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        (**self).is_write_vectored()
+    }
+
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
         self.get_mut().as_mut().poll_flush(cx)
     }
@@ -211,6 +266,18 @@
         Poll::Ready(Ok(buf.len()))
     }
 
+    fn poll_write_vectored(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        Poll::Ready(io::Write::write_vectored(&mut *self, bufs))
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        true
+    }
+
     fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
         Poll::Ready(Ok(()))
     }
@@ -229,6 +296,18 @@
         Poll::Ready(io::Write::write(&mut *self, buf))
     }
 
+    fn poll_write_vectored(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        Poll::Ready(io::Write::write_vectored(&mut *self, bufs))
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        true
+    }
+
     fn poll_flush(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
         Poll::Ready(io::Write::flush(&mut *self))
     }
@@ -247,6 +326,18 @@
         Poll::Ready(io::Write::write(&mut *self, buf))
     }
 
+    fn poll_write_vectored(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        Poll::Ready(io::Write::write_vectored(&mut *self, bufs))
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        true
+    }
+
     fn poll_flush(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
         Poll::Ready(io::Write::flush(&mut *self))
     }
@@ -265,6 +356,18 @@
         Poll::Ready(io::Write::write(&mut *self, buf))
     }
 
+    fn poll_write_vectored(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        Poll::Ready(io::Write::write_vectored(&mut *self, bufs))
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        true
+    }
+
     fn poll_flush(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
         Poll::Ready(io::Write::flush(&mut *self))
     }
@@ -283,6 +386,18 @@
         Poll::Ready(io::Write::write(&mut *self, buf))
     }
 
+    fn poll_write_vectored(
+        mut self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        Poll::Ready(io::Write::write_vectored(&mut *self, bufs))
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        true
+    }
+
     fn poll_flush(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
         Poll::Ready(io::Write::flush(&mut *self))
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/blocking.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/blocking.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/blocking.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/blocking.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 use crate::io::sys;
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 
 use std::cmp;
 use std::future::Future;
@@ -53,17 +53,17 @@
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        dst: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        dst: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         loop {
             match self.state {
                 Idle(ref mut buf_cell) => {
                     let mut buf = buf_cell.take().unwrap();
 
                     if !buf.is_empty() {
-                        let n = buf.copy_to(dst);
+                        buf.copy_to(dst);
                         *buf_cell = Some(buf);
-                        return Ready(Ok(n));
+                        return Ready(Ok(()));
                     }
 
                     buf.ensure_capacity_for(dst);
@@ -80,9 +80,9 @@
 
                     match res {
                         Ok(_) => {
-                            let n = buf.copy_to(dst);
+                            buf.copy_to(dst);
                             self.state = Idle(Some(buf));
-                            return Ready(Ok(n));
+                            return Ready(Ok(()));
                         }
                         Err(e) => {
                             assert!(buf.is_empty());
@@ -175,7 +175,7 @@
     }
 }
 
-/// Repeates operations that are interrupted
+/// Repeats operations that are interrupted
 macro_rules! uninterruptibly {
     ($e:expr) => {{
         loop {
@@ -203,9 +203,9 @@
         self.buf.len() - self.pos
     }
 
-    pub(crate) fn copy_to(&mut self, dst: &mut [u8]) -> usize {
-        let n = cmp::min(self.len(), dst.len());
-        dst[..n].copy_from_slice(&self.bytes()[..n]);
+    pub(crate) fn copy_to(&mut self, dst: &mut ReadBuf<'_>) -> usize {
+        let n = cmp::min(self.len(), dst.remaining());
+        dst.put_slice(&self.bytes()[..n]);
         self.pos += n;
 
         if self.pos == self.buf.len() {
@@ -229,10 +229,10 @@
         &self.buf[self.pos..]
     }
 
-    pub(crate) fn ensure_capacity_for(&mut self, bytes: &[u8]) {
+    pub(crate) fn ensure_capacity_for(&mut self, bytes: &ReadBuf<'_>) {
         assert!(self.is_empty());
 
-        let len = cmp::min(bytes.len(), MAX_BUF);
+        let len = cmp::min(bytes.remaining(), MAX_BUF);
 
         if self.buf.len() < len {
             self.buf.reserve(len - self.buf.len());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/interest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/interest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/interest.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/interest.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,112 @@
+#![cfg_attr(not(feature = "net"), allow(dead_code, unreachable_pub))]
+
+use crate::io::driver::Ready;
+
+use std::fmt;
+use std::ops;
+
+/// Readiness event interest
+///
+/// Specifies the readiness events the caller is interested in when awaiting on
+/// I/O resource readiness states.
+#[cfg_attr(docsrs, doc(cfg(feature = "net")))]
+#[derive(Clone, Copy, Eq, PartialEq)]
+pub struct Interest(mio::Interest);
+
+impl Interest {
+    /// Interest in all readable events.
+    ///
+    /// Readable interest includes read-closed events.
+    pub const READABLE: Interest = Interest(mio::Interest::READABLE);
+
+    /// Interest in all writable events
+    ///
+    /// Writable interest includes write-closed events.
+    pub const WRITABLE: Interest = Interest(mio::Interest::WRITABLE);
+
+    /// Returns true if the value includes readable interest.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io::Interest;
+    ///
+    /// assert!(Interest::READABLE.is_readable());
+    /// assert!(!Interest::WRITABLE.is_readable());
+    ///
+    /// let both = Interest::READABLE | Interest::WRITABLE;
+    /// assert!(both.is_readable());
+    /// ```
+    pub const fn is_readable(self) -> bool {
+        self.0.is_readable()
+    }
+
+    /// Returns true if the value includes writable interest.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io::Interest;
+    ///
+    /// assert!(!Interest::READABLE.is_writable());
+    /// assert!(Interest::WRITABLE.is_writable());
+    ///
+    /// let both = Interest::READABLE | Interest::WRITABLE;
+    /// assert!(both.is_writable());
+    /// ```
+    pub const fn is_writable(self) -> bool {
+        self.0.is_writable()
+    }
+
+    /// Add together two `Interest` values.
+    ///
+    /// This function works from a `const` context.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io::Interest;
+    ///
+    /// const BOTH: Interest = Interest::READABLE.add(Interest::WRITABLE);
+    ///
+    /// assert!(BOTH.is_readable());
+    /// assert!(BOTH.is_writable());
+    pub const fn add(self, other: Interest) -> Interest {
+        Interest(self.0.add(other.0))
+    }
+
+    // This function must be crate-private to avoid exposing a `mio` dependency.
+    pub(crate) const fn to_mio(self) -> mio::Interest {
+        self.0
+    }
+
+    pub(super) fn mask(self) -> Ready {
+        match self {
+            Interest::READABLE => Ready::READABLE | Ready::READ_CLOSED,
+            Interest::WRITABLE => Ready::WRITABLE | Ready::WRITE_CLOSED,
+            _ => Ready::EMPTY,
+        }
+    }
+}
+
+impl ops::BitOr for Interest {
+    type Output = Self;
+
+    #[inline]
+    fn bitor(self, other: Self) -> Self {
+        self.add(other)
+    }
+}
+
+impl ops::BitOrAssign for Interest {
+    #[inline]
+    fn bitor_assign(&mut self, other: Self) {
+        self.0 = (*self | other).0;
+    }
+}
+
+impl fmt::Debug for Interest {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(fmt)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,48 @@
-pub(crate) mod platform;
+#![cfg_attr(not(feature = "rt"), allow(dead_code))]
+
+mod interest;
+#[allow(unreachable_pub)]
+pub use interest::Interest;
+
+mod ready;
+#[allow(unreachable_pub)]
+pub use ready::Ready;
+
+mod registration;
+pub(crate) use registration::Registration;
 
 mod scheduled_io;
-pub(crate) use scheduled_io::ScheduledIo; // pub(crate) for tests
+use scheduled_io::ScheduledIo;
 
-use crate::loom::sync::atomic::AtomicUsize;
 use crate::park::{Park, Unpark};
-use crate::runtime::context;
-use crate::util::slab::{Address, Slab};
+use crate::util::slab::{self, Slab};
+use crate::{loom::sync::Mutex, util::bit};
 
-use mio::event::Evented;
 use std::fmt;
 use std::io;
-use std::sync::atomic::Ordering::SeqCst;
 use std::sync::{Arc, Weak};
-use std::task::Waker;
 use std::time::Duration;
 
 /// I/O driver, backed by Mio
 pub(crate) struct Driver {
+    /// Tracks the number of times `turn` is called. It is safe for this to wrap
+    /// as it is mostly used to determine when to call `compact()`
+    tick: u8,
+
     /// Reuse the `mio::Events` value across calls to poll.
-    events: mio::Events,
+    events: Option<mio::Events>,
+
+    /// Primary slab handle containing the state for each resource registered
+    /// with this driver. During Drop this is moved into the Inner structure, so
+    /// this is an Option to allow it to be vacated (until Drop this is always
+    /// Some)
+    resources: Option<Slab<ScheduledIo>>,
+
+    /// The system event queue
+    poll: mio::Poll,
 
     /// State shared between the reactor and the handles.
     inner: Arc<Inner>,
-
-    _wakeup_registration: mio::Registration,
 }
 
 /// A reference to an I/O driver
@@ -33,27 +51,54 @@
     inner: Weak<Inner>,
 }
 
+pub(crate) struct ReadyEvent {
+    tick: u8,
+    pub(crate) ready: Ready,
+}
+
 pub(super) struct Inner {
-    /// The underlying system event queue.
-    io: mio::Poll,
+    /// Primary slab handle containing the state for each resource registered
+    /// with this driver.
+    ///
+    /// The ownership of this slab is moved into this structure during
+    /// `Driver::drop`, so that `Inner::drop` can notify all outstanding handles
+    /// without risking new ones being registered in the meantime.
+    resources: Mutex<Option<Slab<ScheduledIo>>>,
 
-    /// Dispatch slabs for I/O and futures events
-    pub(super) io_dispatch: Slab<ScheduledIo>,
+    /// Registers I/O resources
+    registry: mio::Registry,
 
-    /// The number of sources in `io_dispatch`.
-    n_sources: AtomicUsize,
+    /// Allocates `ScheduledIo` handles when creating new resources.
+    pub(super) io_dispatch: slab::Allocator<ScheduledIo>,
 
     /// Used to wake up the reactor from a call to `turn`
-    wakeup: mio::SetReadiness,
+    waker: mio::Waker,
 }
 
 #[derive(Debug, Eq, PartialEq, Clone, Copy)]
-pub(super) enum Direction {
+enum Direction {
     Read,
     Write,
 }
 
-const TOKEN_WAKEUP: mio::Token = mio::Token(Address::NULL);
+enum Tick {
+    Set(u8),
+    Clear(u8),
+}
+
+// TODO: Don't use a fake token. Instead, reserve a slot entry for the wakeup
+// token.
+const TOKEN_WAKEUP: mio::Token = mio::Token(1 << 31);
+
+const ADDRESS: bit::Pack = bit::Pack::least_significant(24);
+
+// Packs the generation value in the `readiness` field.
+//
+// The generation prevents a race condition where a slab slot is reused for a
+// new socket while the I/O driver is about to apply a readiness event. The
+// generation value is checked when setting new readiness. If the generation do
+// not match, then the readiness event is discarded.
+const GENERATION: bit::Pack = ADDRESS.then(7);
 
 fn _assert_kinds() {
     fn _assert<T: Send + Sync>() {}
@@ -67,24 +112,23 @@
     /// Creates a new event loop, returning any error that happened during the
     /// creation.
     pub(crate) fn new() -> io::Result<Driver> {
-        let io = mio::Poll::new()?;
-        let wakeup_pair = mio::Registration::new2();
+        let poll = mio::Poll::new()?;
+        let waker = mio::Waker::new(poll.registry(), TOKEN_WAKEUP)?;
+        let registry = poll.registry().try_clone()?;
 
-        io.register(
-            &wakeup_pair.0,
-            TOKEN_WAKEUP,
-            mio::Ready::readable(),
-            mio::PollOpt::level(),
-        )?;
+        let slab = Slab::new();
+        let allocator = slab.allocator();
 
         Ok(Driver {
-            events: mio::Events::with_capacity(1024),
-            _wakeup_registration: wakeup_pair.0,
+            tick: 0,
+            events: Some(mio::Events::with_capacity(1024)),
+            poll,
+            resources: Some(slab),
             inner: Arc::new(Inner {
-                io,
-                io_dispatch: Slab::new(),
-                n_sources: AtomicUsize::new(0),
-                wakeup: wakeup_pair.1,
+                resources: Mutex::new(None),
+                registry,
+                io_dispatch: allocator,
+                waker,
             }),
         })
     }
@@ -102,64 +146,77 @@
     }
 
     fn turn(&mut self, max_wait: Option<Duration>) -> io::Result<()> {
+        // How often to call `compact()` on the resource slab
+        const COMPACT_INTERVAL: u8 = 255;
+
+        self.tick = self.tick.wrapping_add(1);
+
+        if self.tick == COMPACT_INTERVAL {
+            self.resources.as_mut().unwrap().compact()
+        }
+
+        let mut events = self.events.take().expect("i/o driver event store missing");
+
         // Block waiting for an event to happen, peeling out how many events
         // happened.
-        match self.inner.io.poll(&mut self.events, max_wait) {
+        match self.poll.poll(&mut events, max_wait) {
             Ok(_) => {}
+            Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
             Err(e) => return Err(e),
         }
 
         // Process all the events that came in, dispatching appropriately
-
-        for event in self.events.iter() {
+        for event in events.iter() {
             let token = event.token();
 
-            if token == TOKEN_WAKEUP {
-                self.inner
-                    .wakeup
-                    .set_readiness(mio::Ready::empty())
-                    .unwrap();
-            } else {
-                self.dispatch(token, event.readiness());
+            if token != TOKEN_WAKEUP {
+                self.dispatch(token, Ready::from_mio(event));
             }
         }
 
+        self.events = Some(events);
+
         Ok(())
     }
 
-    fn dispatch(&self, token: mio::Token, ready: mio::Ready) {
-        let mut rd = None;
-        let mut wr = None;
+    fn dispatch(&mut self, token: mio::Token, ready: Ready) {
+        let addr = slab::Address::from_usize(ADDRESS.unpack(token.0));
 
-        let address = Address::from_usize(token.0);
+        let resources = self.resources.as_mut().unwrap();
 
-        let io = match self.inner.io_dispatch.get(address) {
+        let io = match resources.get(addr) {
             Some(io) => io,
             None => return,
         };
 
-        if io
-            .set_readiness(address, |curr| curr | ready.as_usize())
-            .is_err()
-        {
+        let res = io.set_readiness(Some(token.0), Tick::Set(self.tick), |curr| curr | ready);
+
+        if res.is_err() {
             // token no longer valid!
             return;
         }
 
-        if ready.is_writable() || platform::is_hup(ready) || platform::is_error(ready) {
-            wr = io.writer.take_waker();
-        }
+        io.wake(ready);
+    }
+}
 
-        if !(ready & (!mio::Ready::writable())).is_empty() {
-            rd = io.reader.take_waker();
-        }
+impl Drop for Driver {
+    fn drop(&mut self) {
+        (*self.inner.resources.lock()) = self.resources.take();
+    }
+}
 
-        if let Some(w) = rd {
-            w.wake();
-        }
+impl Drop for Inner {
+    fn drop(&mut self) {
+        let resources = self.resources.lock().take();
 
-        if let Some(w) = wr {
-            w.wake();
+        if let Some(mut slab) = resources {
+            slab.for_each(|io| {
+                // If a task is waiting on the I/O resource, notify it. The task
+                // will then attempt to use the I/O resource and fail due to the
+                // driver being shutdown.
+                io.shutdown();
+            });
         }
     }
 }
@@ -193,17 +250,35 @@
 
 // ===== impl Handle =====
 
-impl Handle {
-    /// Returns a handle to the current reactor
-    ///
-    /// # Panics
-    ///
-    /// This function panics if there is no current reactor set.
-    pub(super) fn current() -> Self {
-        context::io_handle()
-            .expect("there is no reactor running, must be called from the context of Tokio runtime")
+cfg_rt! {
+    impl Handle {
+        /// Returns a handle to the current reactor
+        ///
+        /// # Panics
+        ///
+        /// This function panics if there is no current reactor set and `rt` feature
+        /// flag is not enabled.
+        pub(super) fn current() -> Self {
+            crate::runtime::context::io_handle().expect("A Tokio 1.x context was found, but IO is disabled. Call `enable_io` on the runtime builder to enable IO.")
+        }
     }
+}
 
+cfg_not_rt! {
+    impl Handle {
+        /// Returns a handle to the current reactor
+        ///
+        /// # Panics
+        ///
+        /// This function panics if there is no current reactor set, or if the `rt`
+        /// feature flag is not enabled.
+        pub(super) fn current() -> Self {
+            panic!("{}", crate::util::error::CONTEXT_MISSING_ERROR)
+        }
+    }
+}
+
+impl Handle {
     /// Forces a reactor blocked in a call to `turn` to wakeup, or otherwise
     /// makes the next call to `turn` return immediately.
     ///
@@ -215,7 +290,7 @@
     /// return immediately.
     fn wakeup(&self) {
         if let Some(inner) = self.inner() {
-            inner.wakeup.set_readiness(mio::Ready::readable()).unwrap();
+            inner.waker.wake().expect("failed to wake I/O driver");
         }
     }
 
@@ -244,159 +319,35 @@
     /// The registration token is returned.
     pub(super) fn add_source(
         &self,
-        source: &dyn Evented,
-        ready: mio::Ready,
-    ) -> io::Result<Address> {
-        let address = self.io_dispatch.alloc().ok_or_else(|| {
+        source: &mut impl mio::event::Source,
+        interest: Interest,
+    ) -> io::Result<slab::Ref<ScheduledIo>> {
+        let (address, shared) = self.io_dispatch.allocate().ok_or_else(|| {
             io::Error::new(
                 io::ErrorKind::Other,
                 "reactor at max registered I/O resources",
             )
         })?;
 
-        self.n_sources.fetch_add(1, SeqCst);
+        let token = GENERATION.pack(shared.generation(), ADDRESS.pack(address.as_usize(), 0));
 
-        self.io.register(
-            source,
-            mio::Token(address.to_usize()),
-            ready,
-            mio::PollOpt::edge(),
-        )?;
+        self.registry
+            .register(source, mio::Token(token), interest.to_mio())?;
 
-        Ok(address)
+        Ok(shared)
     }
 
     /// Deregisters an I/O resource from the reactor.
-    pub(super) fn deregister_source(&self, source: &dyn Evented) -> io::Result<()> {
-        self.io.deregister(source)
-    }
-
-    pub(super) fn drop_source(&self, address: Address) {
-        self.io_dispatch.remove(address);
-        self.n_sources.fetch_sub(1, SeqCst);
-    }
-
-    /// Registers interest in the I/O resource associated with `token`.
-    pub(super) fn register(&self, token: Address, dir: Direction, w: Waker) {
-        let sched = self
-            .io_dispatch
-            .get(token)
-            .unwrap_or_else(|| panic!("IO resource for token {:?} does not exist!", token));
-
-        let waker = match dir {
-            Direction::Read => &sched.reader,
-            Direction::Write => &sched.writer,
-        };
-
-        waker.register(w);
+    pub(super) fn deregister_source(&self, source: &mut impl mio::event::Source) -> io::Result<()> {
+        self.registry.deregister(source)
     }
 }
 
 impl Direction {
-    pub(super) fn mask(self) -> mio::Ready {
+    pub(super) fn mask(self) -> Ready {
         match self {
-            Direction::Read => {
-                // Everything except writable is signaled through read.
-                mio::Ready::all() - mio::Ready::writable()
-            }
-            Direction::Write => mio::Ready::writable() | platform::hup() | platform::error(),
-        }
-    }
-}
-
-#[cfg(all(test, loom))]
-mod tests {
-    use super::*;
-    use loom::thread;
-
-    // No-op `Evented` impl just so we can have something to pass to `add_source`.
-    struct NotEvented;
-
-    impl Evented for NotEvented {
-        fn register(
-            &self,
-            _: &mio::Poll,
-            _: mio::Token,
-            _: mio::Ready,
-            _: mio::PollOpt,
-        ) -> io::Result<()> {
-            Ok(())
+            Direction::Read => Ready::READABLE | Ready::READ_CLOSED,
+            Direction::Write => Ready::WRITABLE | Ready::WRITE_CLOSED,
         }
-
-        fn reregister(
-            &self,
-            _: &mio::Poll,
-            _: mio::Token,
-            _: mio::Ready,
-            _: mio::PollOpt,
-        ) -> io::Result<()> {
-            Ok(())
-        }
-
-        fn deregister(&self, _: &mio::Poll) -> io::Result<()> {
-            Ok(())
-        }
-    }
-
-    #[test]
-    fn tokens_unique_when_dropped() {
-        loom::model(|| {
-            let reactor = Driver::new().unwrap();
-            let inner = reactor.inner;
-            let inner2 = inner.clone();
-
-            let token_1 = inner.add_source(&NotEvented, mio::Ready::all()).unwrap();
-            let thread = thread::spawn(move || {
-                inner2.drop_source(token_1);
-            });
-
-            let token_2 = inner.add_source(&NotEvented, mio::Ready::all()).unwrap();
-            thread.join().unwrap();
-
-            assert!(token_1 != token_2);
-        })
-    }
-
-    #[test]
-    fn tokens_unique_when_dropped_on_full_page() {
-        loom::model(|| {
-            let reactor = Driver::new().unwrap();
-            let inner = reactor.inner;
-            let inner2 = inner.clone();
-            // add sources to fill up the first page so that the dropped index
-            // may be reused.
-            for _ in 0..31 {
-                inner.add_source(&NotEvented, mio::Ready::all()).unwrap();
-            }
-
-            let token_1 = inner.add_source(&NotEvented, mio::Ready::all()).unwrap();
-            let thread = thread::spawn(move || {
-                inner2.drop_source(token_1);
-            });
-
-            let token_2 = inner.add_source(&NotEvented, mio::Ready::all()).unwrap();
-            thread.join().unwrap();
-
-            assert!(token_1 != token_2);
-        })
-    }
-
-    #[test]
-    fn tokens_unique_concurrent_add() {
-        loom::model(|| {
-            let reactor = Driver::new().unwrap();
-            let inner = reactor.inner;
-            let inner2 = inner.clone();
-
-            let thread = thread::spawn(move || {
-                let token_2 = inner2.add_source(&NotEvented, mio::Ready::all()).unwrap();
-                token_2
-            });
-
-            let token_1 = inner.add_source(&NotEvented, mio::Ready::all()).unwrap();
-            let token_2 = thread.join().unwrap();
-
-            assert!(token_1 != token_2);
-        })
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/ready.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/ready.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/ready.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/ready.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,239 @@
+#![cfg_attr(not(feature = "net"), allow(unreachable_pub))]
+
+use std::fmt;
+use std::ops;
+
+const READABLE: usize = 0b0_01;
+const WRITABLE: usize = 0b0_10;
+const READ_CLOSED: usize = 0b0_0100;
+const WRITE_CLOSED: usize = 0b0_1000;
+
+/// Describes the readiness state of an I/O resources.
+///
+/// `Ready` tracks which operation an I/O resource is ready to perform.
+#[cfg_attr(docsrs, doc(cfg(feature = "net")))]
+#[derive(Clone, Copy, PartialEq, PartialOrd)]
+pub struct Ready(usize);
+
+impl Ready {
+    /// Returns the empty `Ready` set.
+    pub const EMPTY: Ready = Ready(0);
+
+    /// Returns a `Ready` representing readable readiness.
+    pub const READABLE: Ready = Ready(READABLE);
+
+    /// Returns a `Ready` representing writable readiness.
+    pub const WRITABLE: Ready = Ready(WRITABLE);
+
+    /// Returns a `Ready` representing read closed readiness.
+    pub const READ_CLOSED: Ready = Ready(READ_CLOSED);
+
+    /// Returns a `Ready` representing write closed readiness.
+    pub const WRITE_CLOSED: Ready = Ready(WRITE_CLOSED);
+
+    /// Returns a `Ready` representing readiness for all operations.
+    pub const ALL: Ready = Ready(READABLE | WRITABLE | READ_CLOSED | WRITE_CLOSED);
+
+    // Must remain crate-private to avoid adding a public dependency on Mio.
+    pub(crate) fn from_mio(event: &mio::event::Event) -> Ready {
+        let mut ready = Ready::EMPTY;
+
+        if event.is_readable() {
+            ready |= Ready::READABLE;
+        }
+
+        if event.is_writable() {
+            ready |= Ready::WRITABLE;
+        }
+
+        if event.is_read_closed() {
+            ready |= Ready::READ_CLOSED;
+        }
+
+        if event.is_write_closed() {
+            ready |= Ready::WRITE_CLOSED;
+        }
+
+        ready
+    }
+
+    /// Returns true if `Ready` is the empty set
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io::Ready;
+    ///
+    /// assert!(Ready::EMPTY.is_empty());
+    /// assert!(!Ready::READABLE.is_empty());
+    /// ```
+    pub fn is_empty(self) -> bool {
+        self == Ready::EMPTY
+    }
+
+    /// Returns `true` if the value includes `readable`
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io::Ready;
+    ///
+    /// assert!(!Ready::EMPTY.is_readable());
+    /// assert!(Ready::READABLE.is_readable());
+    /// assert!(Ready::READ_CLOSED.is_readable());
+    /// assert!(!Ready::WRITABLE.is_readable());
+    /// ```
+    pub fn is_readable(self) -> bool {
+        self.contains(Ready::READABLE) || self.is_read_closed()
+    }
+
+    /// Returns `true` if the value includes writable `readiness`
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io::Ready;
+    ///
+    /// assert!(!Ready::EMPTY.is_writable());
+    /// assert!(!Ready::READABLE.is_writable());
+    /// assert!(Ready::WRITABLE.is_writable());
+    /// assert!(Ready::WRITE_CLOSED.is_writable());
+    /// ```
+    pub fn is_writable(self) -> bool {
+        self.contains(Ready::WRITABLE) || self.is_write_closed()
+    }
+
+    /// Returns `true` if the value includes read-closed `readiness`
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io::Ready;
+    ///
+    /// assert!(!Ready::EMPTY.is_read_closed());
+    /// assert!(!Ready::READABLE.is_read_closed());
+    /// assert!(Ready::READ_CLOSED.is_read_closed());
+    /// ```
+    pub fn is_read_closed(self) -> bool {
+        self.contains(Ready::READ_CLOSED)
+    }
+
+    /// Returns `true` if the value includes write-closed `readiness`
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io::Ready;
+    ///
+    /// assert!(!Ready::EMPTY.is_write_closed());
+    /// assert!(!Ready::WRITABLE.is_write_closed());
+    /// assert!(Ready::WRITE_CLOSED.is_write_closed());
+    /// ```
+    pub fn is_write_closed(self) -> bool {
+        self.contains(Ready::WRITE_CLOSED)
+    }
+
+    /// Returns true if `self` is a superset of `other`.
+    ///
+    /// `other` may represent more than one readiness operations, in which case
+    /// the function only returns true if `self` contains all readiness
+    /// specified in `other`.
+    pub(crate) fn contains<T: Into<Self>>(self, other: T) -> bool {
+        let other = other.into();
+        (self & other) == other
+    }
+
+    /// Create a `Ready` instance using the given `usize` representation.
+    ///
+    /// The `usize` representation must have been obtained from a call to
+    /// `Readiness::as_usize`.
+    ///
+    /// This function is mainly provided to allow the caller to get a
+    /// readiness value from an `AtomicUsize`.
+    pub(crate) fn from_usize(val: usize) -> Ready {
+        Ready(val & Ready::ALL.as_usize())
+    }
+
+    /// Returns a `usize` representation of the `Ready` value.
+    ///
+    /// This function is mainly provided to allow the caller to store a
+    /// readiness value in an `AtomicUsize`.
+    pub(crate) fn as_usize(self) -> usize {
+        self.0
+    }
+}
+
+cfg_io_readiness! {
+    use crate::io::Interest;
+
+    impl Ready {
+        pub(crate) fn from_interest(interest: Interest) -> Ready {
+            let mut ready = Ready::EMPTY;
+
+            if interest.is_readable() {
+                ready |= Ready::READABLE;
+                ready |= Ready::READ_CLOSED;
+            }
+
+            if interest.is_writable() {
+                ready |= Ready::WRITABLE;
+                ready |= Ready::WRITE_CLOSED;
+            }
+
+            ready
+        }
+
+        pub(crate) fn intersection(self, interest: Interest) -> Ready {
+            Ready(self.0 & Ready::from_interest(interest).0)
+        }
+
+        pub(crate) fn satisfies(self, interest: Interest) -> bool {
+            self.0 & Ready::from_interest(interest).0 != 0
+        }
+    }
+}
+
+impl ops::BitOr<Ready> for Ready {
+    type Output = Ready;
+
+    #[inline]
+    fn bitor(self, other: Ready) -> Ready {
+        Ready(self.0 | other.0)
+    }
+}
+
+impl ops::BitOrAssign<Ready> for Ready {
+    #[inline]
+    fn bitor_assign(&mut self, other: Ready) {
+        self.0 |= other.0;
+    }
+}
+
+impl ops::BitAnd<Ready> for Ready {
+    type Output = Ready;
+
+    #[inline]
+    fn bitand(self, other: Ready) -> Ready {
+        Ready(self.0 & other.0)
+    }
+}
+
+impl ops::Sub<Ready> for Ready {
+    type Output = Ready;
+
+    #[inline]
+    fn sub(self, other: Ready) -> Ready {
+        Ready(self.0 & !other.0)
+    }
+}
+
+impl fmt::Debug for Ready {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Ready")
+            .field("is_readable", &self.is_readable())
+            .field("is_writable", &self.is_writable())
+            .field("is_read_closed", &self.is_read_closed())
+            .field("is_write_closed", &self.is_write_closed())
+            .finish()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/registration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/registration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/registration.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/registration.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,262 @@
+#![cfg_attr(not(feature = "net"), allow(dead_code))]
+
+use crate::io::driver::{Direction, Handle, Interest, ReadyEvent, ScheduledIo};
+use crate::util::slab;
+
+use mio::event::Source;
+use std::io;
+use std::task::{Context, Poll};
+
+cfg_io_driver! {
+    /// Associates an I/O resource with the reactor instance that drives it.
+    ///
+    /// A registration represents an I/O resource registered with a Reactor such
+    /// that it will receive task notifications on readiness. This is the lowest
+    /// level API for integrating with a reactor.
+    ///
+    /// The association between an I/O resource is made by calling
+    /// [`new_with_interest_and_handle`].
+    /// Once the association is established, it remains established until the
+    /// registration instance is dropped.
+    ///
+    /// A registration instance represents two separate readiness streams. One
+    /// for the read readiness and one for write readiness. These streams are
+    /// independent and can be consumed from separate tasks.
+    ///
+    /// **Note**: while `Registration` is `Sync`, the caller must ensure that
+    /// there are at most two tasks that use a registration instance
+    /// concurrently. One task for [`poll_read_ready`] and one task for
+    /// [`poll_write_ready`]. While violating this requirement is "safe" from a
+    /// Rust memory safety point of view, it will result in unexpected behavior
+    /// in the form of lost notifications and tasks hanging.
+    ///
+    /// ## Platform-specific events
+    ///
+    /// `Registration` also allows receiving platform-specific `mio::Ready`
+    /// events. These events are included as part of the read readiness event
+    /// stream. The write readiness event stream is only for `Ready::writable()`
+    /// events.
+    ///
+    /// [`new_with_interest_and_handle`]: method@Self::new_with_interest_and_handle
+    /// [`poll_read_ready`]: method@Self::poll_read_ready`
+    /// [`poll_write_ready`]: method@Self::poll_write_ready`
+    #[derive(Debug)]
+    pub(crate) struct Registration {
+        /// Handle to the associated driver.
+        handle: Handle,
+
+        /// Reference to state stored by the driver.
+        shared: slab::Ref<ScheduledIo>,
+    }
+}
+
+unsafe impl Send for Registration {}
+unsafe impl Sync for Registration {}
+
+// ===== impl Registration =====
+
+impl Registration {
+    /// Registers the I/O resource with the default reactor, for a specific
+    /// `Interest`. `new_with_interest` should be used over `new` when you need
+    /// control over the readiness state, such as when a file descriptor only
+    /// allows reads. This does not add `hup` or `error` so if you are
+    /// interested in those states, you will need to add them to the readiness
+    /// state passed to this function.
+    ///
+    /// # Return
+    ///
+    /// - `Ok` if the registration happened successfully
+    /// - `Err` if an error was encountered during registration
+    pub(crate) fn new_with_interest_and_handle(
+        io: &mut impl Source,
+        interest: Interest,
+        handle: Handle,
+    ) -> io::Result<Registration> {
+        let shared = if let Some(inner) = handle.inner() {
+            inner.add_source(io, interest)?
+        } else {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "failed to find event loop",
+            ));
+        };
+
+        Ok(Registration { handle, shared })
+    }
+
+    /// Deregisters the I/O resource from the reactor it is associated with.
+    ///
+    /// This function must be called before the I/O resource associated with the
+    /// registration is dropped.
+    ///
+    /// Note that deregistering does not guarantee that the I/O resource can be
+    /// registered with a different reactor. Some I/O resource types can only be
+    /// associated with a single reactor instance for their lifetime.
+    ///
+    /// # Return
+    ///
+    /// If the deregistration was successful, `Ok` is returned. Any calls to
+    /// `Reactor::turn` that happen after a successful call to `deregister` will
+    /// no longer result in notifications getting sent for this registration.
+    ///
+    /// `Err` is returned if an error is encountered.
+    pub(crate) fn deregister(&mut self, io: &mut impl Source) -> io::Result<()> {
+        let inner = match self.handle.inner() {
+            Some(inner) => inner,
+            None => return Err(io::Error::new(io::ErrorKind::Other, "reactor gone")),
+        };
+        inner.deregister_source(io)
+    }
+
+    pub(crate) fn clear_readiness(&self, event: ReadyEvent) {
+        self.shared.clear_readiness(event);
+    }
+
+    // Uses the poll path, requiring the caller to ensure mutual exclusion for
+    // correctness. Only the last task to call this function is notified.
+    pub(crate) fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<ReadyEvent>> {
+        self.poll_ready(cx, Direction::Read)
+    }
+
+    // Uses the poll path, requiring the caller to ensure mutual exclusion for
+    // correctness. Only the last task to call this function is notified.
+    pub(crate) fn poll_write_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<ReadyEvent>> {
+        self.poll_ready(cx, Direction::Write)
+    }
+
+    // Uses the poll path, requiring the caller to ensure mutual exclusion for
+    // correctness. Only the last task to call this function is notified.
+    pub(crate) fn poll_read_io<R>(
+        &self,
+        cx: &mut Context<'_>,
+        f: impl FnMut() -> io::Result<R>,
+    ) -> Poll<io::Result<R>> {
+        self.poll_io(cx, Direction::Read, f)
+    }
+
+    // Uses the poll path, requiring the caller to ensure mutual exclusion for
+    // correctness. Only the last task to call this function is notified.
+    pub(crate) fn poll_write_io<R>(
+        &self,
+        cx: &mut Context<'_>,
+        f: impl FnMut() -> io::Result<R>,
+    ) -> Poll<io::Result<R>> {
+        self.poll_io(cx, Direction::Write, f)
+    }
+
+    /// Polls for events on the I/O resource's `direction` readiness stream.
+    ///
+    /// If called with a task context, notify the task when a new event is
+    /// received.
+    fn poll_ready(
+        &self,
+        cx: &mut Context<'_>,
+        direction: Direction,
+    ) -> Poll<io::Result<ReadyEvent>> {
+        // Keep track of task budget
+        let coop = ready!(crate::coop::poll_proceed(cx));
+        let ev = ready!(self.shared.poll_readiness(cx, direction));
+
+        if self.handle.inner().is_none() {
+            return Poll::Ready(Err(gone()));
+        }
+
+        coop.made_progress();
+        Poll::Ready(Ok(ev))
+    }
+
+    fn poll_io<R>(
+        &self,
+        cx: &mut Context<'_>,
+        direction: Direction,
+        mut f: impl FnMut() -> io::Result<R>,
+    ) -> Poll<io::Result<R>> {
+        loop {
+            let ev = ready!(self.poll_ready(cx, direction))?;
+
+            match f() {
+                Ok(ret) => {
+                    return Poll::Ready(Ok(ret));
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                    self.clear_readiness(ev);
+                }
+                Err(e) => return Poll::Ready(Err(e)),
+            }
+        }
+    }
+
+    pub(crate) fn try_io<R>(
+        &self,
+        interest: Interest,
+        f: impl FnOnce() -> io::Result<R>,
+    ) -> io::Result<R> {
+        let ev = self.shared.ready_event(interest);
+
+        // Don't attempt the operation if the resource is not ready.
+        if ev.ready.is_empty() {
+            return Err(io::ErrorKind::WouldBlock.into());
+        }
+
+        match f() {
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                self.clear_readiness(ev);
+                Err(io::ErrorKind::WouldBlock.into())
+            }
+            res => res,
+        }
+    }
+}
+
+impl Drop for Registration {
+    fn drop(&mut self) {
+        // It is possible for a cycle to be created between wakers stored in
+        // `ScheduledIo` instances and `Arc<driver::Inner>`. To break this
+        // cycle, wakers are cleared. This is an imperfect solution as it is
+        // possible to store a `Registration` in a waker. In this case, the
+        // cycle would remain.
+        //
+        // See tokio-rs/tokio#3481 for more details.
+        self.shared.clear_wakers();
+    }
+}
+
+fn gone() -> io::Error {
+    io::Error::new(io::ErrorKind::Other, "IO driver has terminated")
+}
+
+cfg_io_readiness! {
+    impl Registration {
+        pub(crate) async fn readiness(&self, interest: Interest) -> io::Result<ReadyEvent> {
+            use std::future::Future;
+            use std::pin::Pin;
+
+            let fut = self.shared.readiness(interest);
+            pin!(fut);
+
+            crate::future::poll_fn(|cx| {
+                if self.handle.inner().is_none() {
+                    return Poll::Ready(Err(io::Error::new(
+                        io::ErrorKind::Other,
+                        crate::util::error::RUNTIME_SHUTTING_DOWN_ERROR
+                    )));
+                }
+
+                Pin::new(&mut fut).poll(cx).map(Ok)
+            }).await
+        }
+
+        pub(crate) async fn async_io<R>(&self, interest: Interest, mut f: impl FnMut() -> io::Result<R>) -> io::Result<R> {
+            loop {
+                let event = self.readiness(interest).await?;
+
+                match f() {
+                    Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                        self.clear_readiness(event);
+                    }
+                    x => return x,
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/scheduled_io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/scheduled_io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/driver/scheduled_io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/driver/scheduled_io.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,47 +1,115 @@
-use crate::loom::future::AtomicWaker;
+use super::{Interest, Ready, ReadyEvent, Tick};
 use crate::loom::sync::atomic::AtomicUsize;
+use crate::loom::sync::Mutex;
 use crate::util::bit;
-use crate::util::slab::{Address, Entry, Generation};
+use crate::util::slab::Entry;
+use crate::util::WakeList;
 
-use std::sync::atomic::Ordering::{AcqRel, Acquire, SeqCst};
+use std::sync::atomic::Ordering::{AcqRel, Acquire, Release};
+use std::task::{Context, Poll, Waker};
 
+use super::Direction;
+
+cfg_io_readiness! {
+    use crate::util::linked_list::{self, LinkedList};
+
+    use std::cell::UnsafeCell;
+    use std::future::Future;
+    use std::marker::PhantomPinned;
+    use std::pin::Pin;
+    use std::ptr::NonNull;
+}
+
+/// Stored in the I/O driver resource slab.
 #[derive(Debug)]
 pub(crate) struct ScheduledIo {
+    /// Packs the resource's readiness with the resource's generation.
     readiness: AtomicUsize,
-    pub(crate) reader: AtomicWaker,
-    pub(crate) writer: AtomicWaker,
+
+    waiters: Mutex<Waiters>,
 }
 
-const PACK: bit::Pack = bit::Pack::most_significant(Generation::WIDTH);
+cfg_io_readiness! {
+    type WaitList = LinkedList<Waiter, <Waiter as linked_list::Link>::Target>;
+}
 
-impl Entry for ScheduledIo {
-    fn generation(&self) -> Generation {
-        unpack_generation(self.readiness.load(SeqCst))
+#[derive(Debug, Default)]
+struct Waiters {
+    #[cfg(feature = "net")]
+    /// List of all current waiters
+    list: WaitList,
+
+    /// Waker used for AsyncRead
+    reader: Option<Waker>,
+
+    /// Waker used for AsyncWrite
+    writer: Option<Waker>,
+
+    /// True if this ScheduledIo has been killed due to IO driver shutdown
+    is_shutdown: bool,
+}
+
+cfg_io_readiness! {
+    #[derive(Debug)]
+    struct Waiter {
+        pointers: linked_list::Pointers<Waiter>,
+
+        /// The waker for this task
+        waker: Option<Waker>,
+
+        /// The interest this waiter is waiting on
+        interest: Interest,
+
+        is_ready: bool,
+
+        /// Should never be `!Unpin`
+        _p: PhantomPinned,
     }
 
-    fn reset(&self, generation: Generation) -> bool {
-        let mut current = self.readiness.load(Acquire);
+    /// Future returned by `readiness()`
+    struct Readiness<'a> {
+        scheduled_io: &'a ScheduledIo,
 
-        loop {
-            if unpack_generation(current) != generation {
-                return false;
-            }
+        state: State,
 
-            let next = PACK.pack(generation.next().to_usize(), 0);
+        /// Entry in the waiter `LinkedList`.
+        waiter: UnsafeCell<Waiter>,
+    }
 
-            match self
-                .readiness
-                .compare_exchange(current, next, AcqRel, Acquire)
-            {
-                Ok(_) => break,
-                Err(actual) => current = actual,
-            }
-        }
+    enum State {
+        Init,
+        Waiting,
+        Done,
+    }
+}
+
+// The `ScheduledIo::readiness` (`AtomicUsize`) is packed full of goodness.
+//
+// | reserved | generation |  driver tick | readiness |
+// |----------+------------+--------------+-----------|
+// |   1 bit  |   7 bits   +    8 bits    +   16 bits |
+
+const READINESS: bit::Pack = bit::Pack::least_significant(16);
 
-        drop(self.reader.take_waker());
-        drop(self.writer.take_waker());
+const TICK: bit::Pack = READINESS.then(8);
 
-        true
+const GENERATION: bit::Pack = TICK.then(7);
+
+#[test]
+fn test_generations_assert_same() {
+    assert_eq!(super::GENERATION, GENERATION);
+}
+
+// ===== impl ScheduledIo =====
+
+impl Entry for ScheduledIo {
+    fn reset(&self) {
+        let state = self.readiness.load(Acquire);
+
+        let generation = GENERATION.unpack(state);
+        let next = GENERATION.pack_lossy(generation + 1, 0);
+
+        self.readiness.store(next, Release);
     }
 }
 
@@ -49,31 +117,20 @@
     fn default() -> ScheduledIo {
         ScheduledIo {
             readiness: AtomicUsize::new(0),
-            reader: AtomicWaker::new(),
-            writer: AtomicWaker::new(),
+            waiters: Mutex::new(Default::default()),
         }
     }
 }
 
 impl ScheduledIo {
-    #[cfg(all(test, loom))]
-    /// Returns the current readiness value of this `ScheduledIo`, if the
-    /// provided `token` is still a valid access.
-    ///
-    /// # Returns
-    ///
-    /// If the given token's generation no longer matches the `ScheduledIo`'s
-    /// generation, then the corresponding IO resource has been removed and
-    /// replaced with a new resource. In that case, this method returns `None`.
-    /// Otherwise, this returns the current readiness.
-    pub(crate) fn get_readiness(&self, address: Address) -> Option<usize> {
-        let ready = self.readiness.load(Acquire);
-
-        if unpack_generation(ready) != address.generation() {
-            return None;
-        }
+    pub(crate) fn generation(&self) -> usize {
+        GENERATION.unpack(self.readiness.load(Acquire))
+    }
 
-        Some(ready & !PACK.mask())
+    /// Invoked when the IO driver is shut down; forces this ScheduledIo into a
+    /// permanently ready state.
+    pub(super) fn shutdown(&self) {
+        self.wake0(Ready::ALL, true)
     }
 
     /// Sets the readiness on this `ScheduledIo` by invoking the given closure on
@@ -81,6 +138,8 @@
     ///
     /// # Arguments
     /// - `token`: the token for this `ScheduledIo`.
+    /// - `tick`: whether setting the tick or trying to clear readiness for a
+    ///    specific tick.
     /// - `f`: a closure returning a new readiness value given the previous
     ///   readiness.
     ///
@@ -90,52 +149,385 @@
     /// generation, then the corresponding IO resource has been removed and
     /// replaced with a new resource. In that case, this method returns `Err`.
     /// Otherwise, this returns the previous readiness.
-    pub(crate) fn set_readiness(
+    pub(super) fn set_readiness(
         &self,
-        address: Address,
-        f: impl Fn(usize) -> usize,
-    ) -> Result<usize, ()> {
-        let generation = address.generation();
-
+        token: Option<usize>,
+        tick: Tick,
+        f: impl Fn(Ready) -> Ready,
+    ) -> Result<(), ()> {
         let mut current = self.readiness.load(Acquire);
 
         loop {
-            // Check that the generation for this access is still the current
-            // one.
-            if unpack_generation(current) != generation {
-                return Err(());
-            }
-            // Mask out the generation bits so that the modifying function
-            // doesn't see them.
-            let current_readiness = current & mio::Ready::all().as_usize();
+            let current_generation = GENERATION.unpack(current);
+
+            if let Some(token) = token {
+                // Check that the generation for this access is still the
+                // current one.
+                if GENERATION.unpack(token) != current_generation {
+                    return Err(());
+                }
+            }
+
+            // Mask out the tick/generation bits so that the modifying
+            // function doesn't see them.
+            let current_readiness = Ready::from_usize(current);
             let new = f(current_readiness);
 
-            debug_assert!(
-                new <= !PACK.max_value(),
-                "new readiness value would overwrite generation bits!"
-            );
-
-            match self.readiness.compare_exchange(
-                current,
-                PACK.pack(generation.to_usize(), new),
-                AcqRel,
-                Acquire,
-            ) {
-                Ok(_) => return Ok(current),
+            let packed = match tick {
+                Tick::Set(t) => TICK.pack(t as usize, new.as_usize()),
+                Tick::Clear(t) => {
+                    if TICK.unpack(current) as u8 != t {
+                        // Trying to clear readiness with an old event!
+                        return Err(());
+                    }
+
+                    TICK.pack(t as usize, new.as_usize())
+                }
+            };
+
+            let next = GENERATION.pack(current_generation, packed);
+
+            match self
+                .readiness
+                .compare_exchange(current, next, AcqRel, Acquire)
+            {
+                Ok(_) => return Ok(()),
                 // we lost the race, retry!
                 Err(actual) => current = actual,
             }
         }
     }
+
+    /// Notifies all pending waiters that have registered interest in `ready`.
+    ///
+    /// There may be many waiters to notify. Waking the pending task **must** be
+    /// done from outside of the lock otherwise there is a potential for a
+    /// deadlock.
+    ///
+    /// A stack array of wakers is created and filled with wakers to notify, the
+    /// lock is released, and the wakers are notified. Because there may be more
+    /// than 32 wakers to notify, if the stack array fills up, the lock is
+    /// released, the array is cleared, and the iteration continues.
+    pub(super) fn wake(&self, ready: Ready) {
+        self.wake0(ready, false);
+    }
+
+    fn wake0(&self, ready: Ready, shutdown: bool) {
+        let mut wakers = WakeList::new();
+
+        let mut waiters = self.waiters.lock();
+
+        waiters.is_shutdown |= shutdown;
+
+        // check for AsyncRead slot
+        if ready.is_readable() {
+            if let Some(waker) = waiters.reader.take() {
+                wakers.push(waker);
+            }
+        }
+
+        // check for AsyncWrite slot
+        if ready.is_writable() {
+            if let Some(waker) = waiters.writer.take() {
+                wakers.push(waker);
+            }
+        }
+
+        #[cfg(feature = "net")]
+        'outer: loop {
+            let mut iter = waiters.list.drain_filter(|w| ready.satisfies(w.interest));
+
+            while wakers.can_push() {
+                match iter.next() {
+                    Some(waiter) => {
+                        let waiter = unsafe { &mut *waiter.as_ptr() };
+
+                        if let Some(waker) = waiter.waker.take() {
+                            waiter.is_ready = true;
+                            wakers.push(waker);
+                        }
+                    }
+                    None => {
+                        break 'outer;
+                    }
+                }
+            }
+
+            drop(waiters);
+
+            wakers.wake_all();
+
+            // Acquire the lock again.
+            waiters = self.waiters.lock();
+        }
+
+        // Release the lock before notifying
+        drop(waiters);
+
+        wakers.wake_all();
+    }
+
+    pub(super) fn ready_event(&self, interest: Interest) -> ReadyEvent {
+        let curr = self.readiness.load(Acquire);
+
+        ReadyEvent {
+            tick: TICK.unpack(curr) as u8,
+            ready: interest.mask() & Ready::from_usize(READINESS.unpack(curr)),
+        }
+    }
+
+    /// Poll version of checking readiness for a certain direction.
+    ///
+    /// These are to support `AsyncRead` and `AsyncWrite` polling methods,
+    /// which cannot use the `async fn` version. This uses reserved reader
+    /// and writer slots.
+    pub(super) fn poll_readiness(
+        &self,
+        cx: &mut Context<'_>,
+        direction: Direction,
+    ) -> Poll<ReadyEvent> {
+        let curr = self.readiness.load(Acquire);
+
+        let ready = direction.mask() & Ready::from_usize(READINESS.unpack(curr));
+
+        if ready.is_empty() {
+            // Update the task info
+            let mut waiters = self.waiters.lock();
+            let slot = match direction {
+                Direction::Read => &mut waiters.reader,
+                Direction::Write => &mut waiters.writer,
+            };
+
+            // Avoid cloning the waker if one is already stored that matches the
+            // current task.
+            match slot {
+                Some(existing) => {
+                    if !existing.will_wake(cx.waker()) {
+                        *existing = cx.waker().clone();
+                    }
+                }
+                None => {
+                    *slot = Some(cx.waker().clone());
+                }
+            }
+
+            // Try again, in case the readiness was changed while we were
+            // taking the waiters lock
+            let curr = self.readiness.load(Acquire);
+            let ready = direction.mask() & Ready::from_usize(READINESS.unpack(curr));
+            if waiters.is_shutdown {
+                Poll::Ready(ReadyEvent {
+                    tick: TICK.unpack(curr) as u8,
+                    ready: direction.mask(),
+                })
+            } else if ready.is_empty() {
+                Poll::Pending
+            } else {
+                Poll::Ready(ReadyEvent {
+                    tick: TICK.unpack(curr) as u8,
+                    ready,
+                })
+            }
+        } else {
+            Poll::Ready(ReadyEvent {
+                tick: TICK.unpack(curr) as u8,
+                ready,
+            })
+        }
+    }
+
+    pub(crate) fn clear_readiness(&self, event: ReadyEvent) {
+        // This consumes the current readiness state **except** for closed
+        // states. Closed states are excluded because they are final states.
+        let mask_no_closed = event.ready - Ready::READ_CLOSED - Ready::WRITE_CLOSED;
+
+        // result isn't important
+        let _ = self.set_readiness(None, Tick::Clear(event.tick), |curr| curr - mask_no_closed);
+    }
+
+    pub(crate) fn clear_wakers(&self) {
+        let mut waiters = self.waiters.lock();
+        waiters.reader.take();
+        waiters.writer.take();
+    }
 }
 
 impl Drop for ScheduledIo {
     fn drop(&mut self) {
-        self.writer.wake();
-        self.reader.wake();
+        self.wake(Ready::ALL);
     }
 }
 
-fn unpack_generation(src: usize) -> Generation {
-    Generation::new(PACK.unpack(src))
+unsafe impl Send for ScheduledIo {}
+unsafe impl Sync for ScheduledIo {}
+
+cfg_io_readiness! {
+    impl ScheduledIo {
+        /// An async version of `poll_readiness` which uses a linked list of wakers
+        pub(crate) async fn readiness(&self, interest: Interest) -> ReadyEvent {
+            self.readiness_fut(interest).await
+        }
+
+        // This is in a separate function so that the borrow checker doesn't think
+        // we are borrowing the `UnsafeCell` possibly over await boundaries.
+        //
+        // Go figure.
+        fn readiness_fut(&self, interest: Interest) -> Readiness<'_> {
+            Readiness {
+                scheduled_io: self,
+                state: State::Init,
+                waiter: UnsafeCell::new(Waiter {
+                    pointers: linked_list::Pointers::new(),
+                    waker: None,
+                    is_ready: false,
+                    interest,
+                    _p: PhantomPinned,
+                }),
+            }
+        }
+    }
+
+    unsafe impl linked_list::Link for Waiter {
+        type Handle = NonNull<Waiter>;
+        type Target = Waiter;
+
+        fn as_raw(handle: &NonNull<Waiter>) -> NonNull<Waiter> {
+            *handle
+        }
+
+        unsafe fn from_raw(ptr: NonNull<Waiter>) -> NonNull<Waiter> {
+            ptr
+        }
+
+        unsafe fn pointers(mut target: NonNull<Waiter>) -> NonNull<linked_list::Pointers<Waiter>> {
+            NonNull::from(&mut target.as_mut().pointers)
+        }
+    }
+
+    // ===== impl Readiness =====
+
+    impl Future for Readiness<'_> {
+        type Output = ReadyEvent;
+
+        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            use std::sync::atomic::Ordering::SeqCst;
+
+            let (scheduled_io, state, waiter) = unsafe {
+                let me = self.get_unchecked_mut();
+                (&me.scheduled_io, &mut me.state, &me.waiter)
+            };
+
+            loop {
+                match *state {
+                    State::Init => {
+                        // Optimistically check existing readiness
+                        let curr = scheduled_io.readiness.load(SeqCst);
+                        let ready = Ready::from_usize(READINESS.unpack(curr));
+
+                        // Safety: `waiter.interest` never changes
+                        let interest = unsafe { (*waiter.get()).interest };
+                        let ready = ready.intersection(interest);
+
+                        if !ready.is_empty() {
+                            // Currently ready!
+                            let tick = TICK.unpack(curr) as u8;
+                            *state = State::Done;
+                            return Poll::Ready(ReadyEvent { tick, ready });
+                        }
+
+                        // Wasn't ready, take the lock (and check again while locked).
+                        let mut waiters = scheduled_io.waiters.lock();
+
+                        let curr = scheduled_io.readiness.load(SeqCst);
+                        let mut ready = Ready::from_usize(READINESS.unpack(curr));
+
+                        if waiters.is_shutdown {
+                            ready = Ready::ALL;
+                        }
+
+                        let ready = ready.intersection(interest);
+
+                        if !ready.is_empty() {
+                            // Currently ready!
+                            let tick = TICK.unpack(curr) as u8;
+                            *state = State::Done;
+                            return Poll::Ready(ReadyEvent { tick, ready });
+                        }
+
+                        // Not ready even after locked, insert into list...
+
+                        // Safety: called while locked
+                        unsafe {
+                            (*waiter.get()).waker = Some(cx.waker().clone());
+                        }
+
+                        // Insert the waiter into the linked list
+                        //
+                        // safety: pointers from `UnsafeCell` are never null.
+                        waiters
+                            .list
+                            .push_front(unsafe { NonNull::new_unchecked(waiter.get()) });
+                        *state = State::Waiting;
+                    }
+                    State::Waiting => {
+                        // Currently in the "Waiting" state, implying the caller has
+                        // a waiter stored in the waiter list (guarded by
+                        // `notify.waiters`). In order to access the waker fields,
+                        // we must hold the lock.
+
+                        let waiters = scheduled_io.waiters.lock();
+
+                        // Safety: called while locked
+                        let w = unsafe { &mut *waiter.get() };
+
+                        if w.is_ready {
+                            // Our waker has been notified.
+                            *state = State::Done;
+                        } else {
+                            // Update the waker, if necessary.
+                            if !w.waker.as_ref().unwrap().will_wake(cx.waker()) {
+                                w.waker = Some(cx.waker().clone());
+                            }
+
+                            return Poll::Pending;
+                        }
+
+                        // Explicit drop of the lock to indicate the scope that the
+                        // lock is held. Because holding the lock is required to
+                        // ensure safe access to fields not held within the lock, it
+                        // is helpful to visualize the scope of the critical
+                        // section.
+                        drop(waiters);
+                    }
+                    State::Done => {
+                        let tick = TICK.unpack(scheduled_io.readiness.load(Acquire)) as u8;
+
+                        // Safety: State::Done means it is no longer shared
+                        let w = unsafe { &mut *waiter.get() };
+
+                        return Poll::Ready(ReadyEvent {
+                            tick,
+                            ready: Ready::from_interest(w.interest),
+                        });
+                    }
+                }
+            }
+        }
+    }
+
+    impl Drop for Readiness<'_> {
+        fn drop(&mut self) {
+            let mut waiters = self.scheduled_io.waiters.lock();
+
+            // Safety: `waiter` is only ever stored in `waiters`
+            unsafe {
+                waiters
+                    .list
+                    .remove(NonNull::new_unchecked(self.waiter.get()))
+            };
+        }
+    }
+
+    unsafe impl Send for Readiness<'_> {}
+    unsafe impl Sync for Readiness<'_> {}
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -144,7 +144,7 @@
 //! that implements [`AsyncRead`] and [`AsyncWrite`] into a `Sink`/`Stream` of
 //! your structured data.
 //!
-//! [tokio-util]: https://docs.rs/tokio-util/0.3/tokio_util/codec/index.html
+//! [tokio-util]: https://docs.rs/tokio-util/0.6/tokio_util/codec/index.html
 //!
 //! # Standard input and output
 //!
@@ -169,16 +169,16 @@
 //! [`AsyncWrite`]: trait@AsyncWrite
 //! [`AsyncReadExt`]: trait@AsyncReadExt
 //! [`AsyncWriteExt`]: trait@AsyncWriteExt
-//! ["codec"]: https://docs.rs/tokio-util/0.3/tokio_util/codec/index.html
-//! [`Encoder`]: https://docs.rs/tokio-util/0.3/tokio_util/codec/trait.Encoder.html
-//! [`Decoder`]: https://docs.rs/tokio-util/0.3/tokio_util/codec/trait.Decoder.html
+//! ["codec"]: https://docs.rs/tokio-util/0.6/tokio_util/codec/index.html
+//! [`Encoder`]: https://docs.rs/tokio-util/0.6/tokio_util/codec/trait.Encoder.html
+//! [`Decoder`]: https://docs.rs/tokio-util/0.6/tokio_util/codec/trait.Decoder.html
 //! [`Error`]: struct@Error
 //! [`ErrorKind`]: enum@ErrorKind
 //! [`Result`]: type@Result
 //! [`Read`]: std::io::Read
 //! [`SeekFrom`]: enum@SeekFrom
 //! [`Sink`]: https://docs.rs/futures/0.3/futures/sink/trait.Sink.html
-//! [`Stream`]: crate::stream::Stream
+//! [`Stream`]: https://docs.rs/futures/0.3/futures/stream/trait.Stream.html
 //! [`Write`]: std::io::Write
 cfg_io_blocking! {
     pub(crate) mod blocking;
@@ -196,21 +196,39 @@
 mod async_write;
 pub use self::async_write::AsyncWrite;
 
+mod read_buf;
+pub use self::read_buf::ReadBuf;
+
 // Re-export some types from `std::io` so that users don't have to deal
 // with conflicts when `use`ing `tokio::io` and `std::io`.
+#[doc(no_inline)]
 pub use std::io::{Error, ErrorKind, Result, SeekFrom};
 
-cfg_io_driver! {
+cfg_io_driver_impl! {
     pub(crate) mod driver;
 
+    cfg_net! {
+        pub use driver::{Interest, Ready};
+    }
+
     mod poll_evented;
-    pub use poll_evented::PollEvented;
 
-    mod registration;
-    pub use registration::Registration;
+    #[cfg(not(loom))]
+    pub(crate) use poll_evented::PollEvented;
+}
+
+cfg_net_unix! {
+    mod async_fd;
+
+    pub mod unix {
+        //! Asynchronous IO structures specific to Unix-like operating systems.
+        pub use super::async_fd::{AsyncFd, AsyncFdReadyGuard, AsyncFdReadyMutGuard, TryIoError};
+    }
 }
 
 cfg_io_std! {
+    mod stdio_common;
+
     mod stderr;
     pub use stderr::{stderr, Stderr};
 
@@ -226,18 +244,11 @@
     pub use split::{split, ReadHalf, WriteHalf};
 
     pub(crate) mod seek;
-    pub use self::seek::Seek;
-
     pub(crate) mod util;
     pub use util::{
-        copy, duplex, empty, repeat, sink, AsyncBufReadExt, AsyncReadExt, AsyncSeekExt, AsyncWriteExt,
-        BufReader, BufStream, BufWriter, DuplexStream, Copy, Empty, Lines, Repeat, Sink, Split, Take,
+        copy, copy_bidirectional, copy_buf, duplex, empty, repeat, sink, AsyncBufReadExt, AsyncReadExt, AsyncSeekExt, AsyncWriteExt,
+        BufReader, BufStream, BufWriter, DuplexStream, Empty, Lines, Repeat, Sink, Split, Take,
     };
-
-    cfg_stream! {
-        pub use util::{stream_reader, StreamReader};
-        pub use util::{reader_stream, ReaderStream};
-    }
 }
 
 cfg_not_io_util! {
@@ -250,7 +261,7 @@
     /// Types in this module can be mocked out in tests.
     mod sys {
         // TODO: don't rename
-        pub(crate) use crate::runtime::spawn_blocking as run;
-        pub(crate) use crate::task::JoinHandle as Blocking;
+        pub(crate) use crate::blocking::spawn_blocking as run;
+        pub(crate) use crate::blocking::JoinHandle as Blocking;
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/poll_evented.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/poll_evented.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/poll_evented.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/poll_evented.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,24 +1,19 @@
-use crate::io::driver::platform;
-use crate::io::{AsyncRead, AsyncWrite, Registration};
+use crate::io::driver::{Handle, Interest, Registration};
 
-use mio::event::Evented;
+use mio::event::Source;
 use std::fmt;
-use std::io::{self, Read, Write};
-use std::marker::Unpin;
-use std::pin::Pin;
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering::Relaxed;
-use std::task::{Context, Poll};
+use std::io;
+use std::ops::Deref;
 
 cfg_io_driver! {
     /// Associates an I/O resource that implements the [`std::io::Read`] and/or
     /// [`std::io::Write`] traits with the reactor that drives it.
     ///
     /// `PollEvented` uses [`Registration`] internally to take a type that
-    /// implements [`mio::Evented`] as well as [`std::io::Read`] and or
+    /// implements [`mio::event::Source`] as well as [`std::io::Read`] and or
     /// [`std::io::Write`] and associate it with a reactor that will drive it.
     ///
-    /// Once the [`mio::Evented`] type is wrapped by `PollEvented`, it can be
+    /// Once the [`mio::event::Source`] type is wrapped by `PollEvented`, it can be
     /// used from within the future's execution model. As such, the
     /// `PollEvented` type provides [`AsyncRead`] and [`AsyncWrite`]
     /// implementations using the underlying I/O resource as well as readiness
@@ -45,44 +40,12 @@
     /// [`poll_read_ready`] again will also indicate read readiness.
     ///
     /// When the operation is attempted and is unable to succeed due to the I/O
-    /// resource not being ready, the caller must call [`clear_read_ready`] or
-    /// [`clear_write_ready`]. This clears the readiness state until a new
-    /// readiness event is received.
+    /// resource not being ready, the caller must call `clear_readiness`.
+    /// This clears the readiness state until a new readiness event is received.
     ///
     /// This allows the caller to implement additional functions. For example,
     /// [`TcpListener`] implements poll_accept by using [`poll_read_ready`] and
-    /// [`clear_read_ready`].
-    ///
-    /// ```rust
-    /// use tokio::io::PollEvented;
-    ///
-    /// use futures::ready;
-    /// use mio::Ready;
-    /// use mio::net::{TcpStream, TcpListener};
-    /// use std::io;
-    /// use std::task::{Context, Poll};
-    ///
-    /// struct MyListener {
-    ///     poll_evented: PollEvented<TcpListener>,
-    /// }
-    ///
-    /// impl MyListener {
-    ///     pub fn poll_accept(&mut self, cx: &mut Context<'_>) -> Poll<Result<TcpStream, io::Error>> {
-    ///         let ready = Ready::readable();
-    ///
-    ///         ready!(self.poll_evented.poll_read_ready(cx, ready))?;
-    ///
-    ///         match self.poll_evented.get_ref().accept() {
-    ///             Ok((socket, _)) => Poll::Ready(Ok(socket)),
-    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-    ///                 self.poll_evented.clear_read_ready(cx, ready)?;
-    ///                 Poll::Pending
-    ///             }
-    ///             Err(e) => Poll::Ready(Err(e)),
-    ///         }
-    ///     }
-    /// }
-    /// ```
+    /// `clear_read_ready`.
     ///
     /// ## Platform-specific events
     ///
@@ -90,81 +53,20 @@
     /// These events are included as part of the read readiness event stream. The
     /// write readiness event stream is only for `Ready::writable()` events.
     ///
-    /// [`std::io::Read`]: trait@std::io::Read
-    /// [`std::io::Write`]: trait@std::io::Write
-    /// [`AsyncRead`]: trait@AsyncRead
-    /// [`AsyncWrite`]: trait@AsyncWrite
-    /// [`mio::Evented`]: trait@mio::Evented
-    /// [`Registration`]: struct@Registration
-    /// [`TcpListener`]: struct@crate::net::TcpListener
-    /// [`clear_read_ready`]: method@Self::clear_read_ready
-    /// [`clear_write_ready`]: method@Self::clear_write_ready
-    /// [`poll_read_ready`]: method@Self::poll_read_ready
-    /// [`poll_write_ready`]: method@Self::poll_write_ready
-    pub struct PollEvented<E: Evented> {
+    /// [`AsyncRead`]: crate::io::AsyncRead
+    /// [`AsyncWrite`]: crate::io::AsyncWrite
+    /// [`TcpListener`]: crate::net::TcpListener
+    /// [`poll_read_ready`]: Registration::poll_read_ready
+    /// [`poll_write_ready`]: Registration::poll_write_ready
+    pub(crate) struct PollEvented<E: Source> {
         io: Option<E>,
-        inner: Inner,
+        registration: Registration,
     }
 }
 
-struct Inner {
-    registration: Registration,
-
-    /// Currently visible read readiness
-    read_readiness: AtomicUsize,
-
-    /// Currently visible write readiness
-    write_readiness: AtomicUsize,
-}
-
 // ===== impl PollEvented =====
 
-macro_rules! poll_ready {
-    ($me:expr, $mask:expr, $cache:ident, $take:ident, $poll:expr) => {{
-        // Load cached & encoded readiness.
-        let mut cached = $me.inner.$cache.load(Relaxed);
-        let mask = $mask | platform::hup() | platform::error();
-
-        // See if the current readiness matches any bits.
-        let mut ret = mio::Ready::from_usize(cached) & $mask;
-
-        if ret.is_empty() {
-            // Readiness does not match, consume the registration's readiness
-            // stream. This happens in a loop to ensure that the stream gets
-            // drained.
-            loop {
-                let ready = match $poll? {
-                    Poll::Ready(v) => v,
-                    Poll::Pending => return Poll::Pending,
-                };
-                cached |= ready.as_usize();
-
-                // Update the cache store
-                $me.inner.$cache.store(cached, Relaxed);
-
-                ret |= ready & mask;
-
-                if !ret.is_empty() {
-                    return Poll::Ready(Ok(ret));
-                }
-            }
-        } else {
-            // Check what's new with the registration stream. This will not
-            // request to be notified
-            if let Some(ready) = $me.inner.registration.$take()? {
-                cached |= ready.as_usize();
-                $me.inner.$cache.store(cached, Relaxed);
-            }
-
-            Poll::Ready(Ok(mio::Ready::from_usize(cached)))
-        }
-    }};
-}
-
-impl<E> PollEvented<E>
-where
-    E: Evented,
-{
+impl<E: Source> PollEvented<E> {
     /// Creates a new `PollEvented` associated with the default reactor.
     ///
     /// # Panics
@@ -173,289 +75,135 @@
     ///
     /// The runtime is usually set implicitly when this function is called
     /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
-    pub fn new(io: E) -> io::Result<Self> {
-        PollEvented::new_with_ready(io, mio::Ready::all())
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
+    #[cfg_attr(feature = "signal", allow(unused))]
+    pub(crate) fn new(io: E) -> io::Result<Self> {
+        PollEvented::new_with_interest(io, Interest::READABLE | Interest::WRITABLE)
     }
 
-    /// Creates a new `PollEvented` associated with the default reactor, for specific `mio::Ready`
-    /// state. `new_with_ready` should be used over `new` when you need control over the readiness
-    /// state, such as when a file descriptor only allows reads. This does not add `hup` or `error`
-    /// so if you are interested in those states, you will need to add them to the readiness state
-    /// passed to this function.
-    ///
-    /// An example to listen to read only
-    ///
-    /// ```rust
-    /// ##[cfg(unix)]
-    ///     mio::Ready::from_usize(
-    ///         mio::Ready::readable().as_usize()
-    ///         | mio::unix::UnixReady::error().as_usize()
-    ///         | mio::unix::UnixReady::hup().as_usize()
-    ///     );
-    /// ```
+    /// Creates a new `PollEvented` associated with the default reactor, for
+    /// specific `Interest` state. `new_with_interest` should be used over `new`
+    /// when you need control over the readiness state, such as when a file
+    /// descriptor only allows reads. This does not add `hup` or `error` so if
+    /// you are interested in those states, you will need to add them to the
+    /// readiness state passed to this function.
     ///
     /// # Panics
     ///
     /// This function panics if thread-local runtime is not set.
     ///
-    /// The runtime is usually set implicitly when this function is called
-    /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
-    pub fn new_with_ready(io: E, ready: mio::Ready) -> io::Result<Self> {
-        let registration = Registration::new_with_ready(&io, ready)?;
+    /// The runtime is usually set implicitly when this function is called from
+    /// a future driven by a tokio runtime, otherwise runtime can be set
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter)
+    /// function.
+    #[cfg_attr(feature = "signal", allow(unused))]
+    pub(crate) fn new_with_interest(io: E, interest: Interest) -> io::Result<Self> {
+        Self::new_with_interest_and_handle(io, interest, Handle::current())
+    }
+
+    pub(crate) fn new_with_interest_and_handle(
+        mut io: E,
+        interest: Interest,
+        handle: Handle,
+    ) -> io::Result<Self> {
+        let registration = Registration::new_with_interest_and_handle(&mut io, interest, handle)?;
         Ok(Self {
             io: Some(io),
-            inner: Inner {
-                registration,
-                read_readiness: AtomicUsize::new(0),
-                write_readiness: AtomicUsize::new(0),
-            },
+            registration,
         })
     }
 
-    /// Returns a shared reference to the underlying I/O object this readiness
-    /// stream is wrapping.
-    pub fn get_ref(&self) -> &E {
-        self.io.as_ref().unwrap()
-    }
-
-    /// Returns a mutable reference to the underlying I/O object this readiness
-    /// stream is wrapping.
-    pub fn get_mut(&mut self) -> &mut E {
-        self.io.as_mut().unwrap()
-    }
-
-    /// Consumes self, returning the inner I/O object
-    ///
-    /// This function will deregister the I/O resource from the reactor before
-    /// returning. If the deregistration operation fails, an error is returned.
-    ///
-    /// Note that deregistering does not guarantee that the I/O resource can be
-    /// registered with a different reactor. Some I/O resource types can only be
-    /// associated with a single reactor instance for their lifetime.
-    pub fn into_inner(mut self) -> io::Result<E> {
-        let io = self.io.take().unwrap();
-        self.inner.registration.deregister(&io)?;
-        Ok(io)
-    }
-
-    /// Checks the I/O resource's read readiness state.
-    ///
-    /// The mask argument allows specifying what readiness to notify on. This
-    /// can be any value, including platform specific readiness, **except**
-    /// `writable`. HUP is always implicitly included on platforms that support
-    /// it.
-    ///
-    /// If the resource is not ready for a read then `Poll::Pending` is returned
-    /// and the current task is notified once a new event is received.
-    ///
-    /// The I/O resource will remain in a read-ready state until readiness is
-    /// cleared by calling [`clear_read_ready`].
-    ///
-    /// [`clear_read_ready`]: method@Self::clear_read_ready
-    ///
-    /// # Panics
-    ///
-    /// This function panics if:
-    ///
-    /// * `ready` includes writable.
-    /// * called from outside of a task context.
-    ///
-    /// # Warning
-    ///
-    /// This method may not be called concurrently. It takes `&self` to allow
-    /// calling it concurrently with `poll_write_ready`.
-    pub fn poll_read_ready(
-        &self,
-        cx: &mut Context<'_>,
-        mask: mio::Ready,
-    ) -> Poll<io::Result<mio::Ready>> {
-        assert!(!mask.is_writable(), "cannot poll for write readiness");
-        poll_ready!(
-            self,
-            mask,
-            read_readiness,
-            take_read_ready,
-            self.inner.registration.poll_read_ready(cx)
-        )
-    }
-
-    /// Clears the I/O resource's read readiness state and registers the current
-    /// task to be notified once a read readiness event is received.
-    ///
-    /// After calling this function, `poll_read_ready` will return
-    /// `Poll::Pending` until a new read readiness event has been received.
-    ///
-    /// The `mask` argument specifies the readiness bits to clear. This may not
-    /// include `writable` or `hup`.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if:
-    ///
-    /// * `ready` includes writable or HUP
-    /// * called from outside of a task context.
-    pub fn clear_read_ready(&self, cx: &mut Context<'_>, ready: mio::Ready) -> io::Result<()> {
-        // Cannot clear write readiness
-        assert!(!ready.is_writable(), "cannot clear write readiness");
-        assert!(!platform::is_hup(ready), "cannot clear HUP readiness");
-
-        self.inner
-            .read_readiness
-            .fetch_and(!ready.as_usize(), Relaxed);
-
-        if self.poll_read_ready(cx, ready)?.is_ready() {
-            // Notify the current task
-            cx.waker().wake_by_ref();
-        }
-
-        Ok(())
-    }
-
-    /// Checks the I/O resource's write readiness state.
-    ///
-    /// This always checks for writable readiness and also checks for HUP
-    /// readiness on platforms that support it.
-    ///
-    /// If the resource is not ready for a write then `Poll::Pending` is
-    /// returned and the current task is notified once a new event is received.
-    ///
-    /// The I/O resource will remain in a write-ready state until readiness is
-    /// cleared by calling [`clear_write_ready`].
-    ///
-    /// [`clear_write_ready`]: method@Self::clear_write_ready
-    ///
-    /// # Panics
-    ///
-    /// This function panics if:
-    ///
-    /// * `ready` contains bits besides `writable` and `hup`.
-    /// * called from outside of a task context.
-    ///
-    /// # Warning
-    ///
-    /// This method may not be called concurrently. It takes `&self` to allow
-    /// calling it concurrently with `poll_read_ready`.
-    pub fn poll_write_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<mio::Ready>> {
-        poll_ready!(
-            self,
-            mio::Ready::writable(),
-            write_readiness,
-            take_write_ready,
-            self.inner.registration.poll_write_ready(cx)
-        )
-    }
-
-    /// Resets the I/O resource's write readiness state and registers the current
-    /// task to be notified once a write readiness event is received.
-    ///
-    /// This only clears writable readiness. HUP (on platforms that support HUP)
-    /// cannot be cleared as it is a final state.
-    ///
-    /// After calling this function, `poll_write_ready(Ready::writable())` will
-    /// return `NotReady` until a new write readiness event has been received.
-    ///
-    /// # Panics
-    ///
-    /// This function will panic if called from outside of a task context.
-    pub fn clear_write_ready(&self, cx: &mut Context<'_>) -> io::Result<()> {
-        let ready = mio::Ready::writable();
-
-        self.inner
-            .write_readiness
-            .fetch_and(!ready.as_usize(), Relaxed);
-
-        if self.poll_write_ready(cx)?.is_ready() {
-            // Notify the current task
-            cx.waker().wake_by_ref();
+    /// Returns a reference to the registration
+    #[cfg(any(
+        feature = "net",
+        all(unix, feature = "process"),
+        all(unix, feature = "signal"),
+    ))]
+    pub(crate) fn registration(&self) -> &Registration {
+        &self.registration
+    }
+
+    /// Deregister the inner io from the registration and returns a Result containing the inner io
+    #[cfg(any(feature = "net", feature = "process"))]
+    pub(crate) fn into_inner(mut self) -> io::Result<E> {
+        let mut inner = self.io.take().unwrap(); // As io shouldn't ever be None, just unwrap here.
+        self.registration.deregister(&mut inner)?;
+        Ok(inner)
+    }
+}
+
+feature! {
+    #![any(feature = "net", feature = "process")]
+
+    use crate::io::ReadBuf;
+    use std::task::{Context, Poll};
+
+    impl<E: Source> PollEvented<E> {
+        // Safety: The caller must ensure that `E` can read into uninitialized memory
+        pub(crate) unsafe fn poll_read<'a>(
+            &'a self,
+            cx: &mut Context<'_>,
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>>
+        where
+            &'a E: io::Read + 'a,
+        {
+            use std::io::Read;
+
+            let n = ready!(self.registration.poll_read_io(cx, || {
+                let b = &mut *(buf.unfilled_mut() as *mut [std::mem::MaybeUninit<u8>] as *mut [u8]);
+                self.io.as_ref().unwrap().read(b)
+            }))?;
+
+            // Safety: We trust `TcpStream::read` to have filled up `n` bytes in the
+            // buffer.
+            buf.assume_init(n);
+            buf.advance(n);
+            Poll::Ready(Ok(()))
+        }
+
+        pub(crate) fn poll_write<'a>(&'a self, cx: &mut Context<'_>, buf: &[u8]) -> Poll<io::Result<usize>>
+        where
+            &'a E: io::Write + 'a,
+        {
+            use std::io::Write;
+            self.registration.poll_write_io(cx, || self.io.as_ref().unwrap().write(buf))
+        }
+
+        #[cfg(feature = "net")]
+        pub(crate) fn poll_write_vectored<'a>(
+            &'a self,
+            cx: &mut Context<'_>,
+            bufs: &[io::IoSlice<'_>],
+        ) -> Poll<io::Result<usize>>
+        where
+            &'a E: io::Write + 'a,
+        {
+            use std::io::Write;
+            self.registration.poll_write_io(cx, || self.io.as_ref().unwrap().write_vectored(bufs))
         }
-
-        Ok(())
-    }
-}
-
-// ===== Read / Write impls =====
-
-impl<E> AsyncRead for PollEvented<E>
-where
-    E: Evented + Read + Unpin,
-{
-    fn poll_read(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        ready!(self.poll_read_ready(cx, mio::Ready::readable()))?;
-
-        let r = (*self).get_mut().read(buf);
-
-        if is_wouldblock(&r) {
-            self.clear_read_ready(cx, mio::Ready::readable())?;
-            return Poll::Pending;
-        }
-
-        Poll::Ready(r)
     }
 }
 
-impl<E> AsyncWrite for PollEvented<E>
-where
-    E: Evented + Write + Unpin,
-{
-    fn poll_write(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &[u8],
-    ) -> Poll<io::Result<usize>> {
-        ready!(self.poll_write_ready(cx))?;
-
-        let r = (*self).get_mut().write(buf);
-
-        if is_wouldblock(&r) {
-            self.clear_write_ready(cx)?;
-            return Poll::Pending;
-        }
-
-        Poll::Ready(r)
-    }
-
-    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        ready!(self.poll_write_ready(cx))?;
-
-        let r = (*self).get_mut().flush();
-
-        if is_wouldblock(&r) {
-            self.clear_write_ready(cx)?;
-            return Poll::Pending;
-        }
-
-        Poll::Ready(r)
-    }
+impl<E: Source> Deref for PollEvented<E> {
+    type Target = E;
 
-    fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Poll::Ready(Ok(()))
-    }
-}
-
-fn is_wouldblock<T>(r: &io::Result<T>) -> bool {
-    match *r {
-        Ok(_) => false,
-        Err(ref e) => e.kind() == io::ErrorKind::WouldBlock,
+    fn deref(&self) -> &E {
+        self.io.as_ref().unwrap()
     }
 }
 
-impl<E: Evented + fmt::Debug> fmt::Debug for PollEvented<E> {
+impl<E: Source + fmt::Debug> fmt::Debug for PollEvented<E> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("PollEvented").field("io", &self.io).finish()
     }
 }
 
-impl<E: Evented> Drop for PollEvented<E> {
+impl<E: Source> Drop for PollEvented<E> {
     fn drop(&mut self) {
-        if let Some(io) = self.io.take() {
+        if let Some(mut io) = self.io.take() {
             // Ignore errors
-            let _ = self.inner.registration.deregister(&io);
+            let _ = self.registration.deregister(&mut io);
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/read_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/read_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/read_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/read_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,285 @@
+// This lint claims ugly casting is somehow safer than transmute, but there's
+// no evidence that is the case. Shush.
+#![allow(clippy::transmute_ptr_to_ptr)]
+
+use std::fmt;
+use std::mem::{self, MaybeUninit};
+
+/// A wrapper around a byte buffer that is incrementally filled and initialized.
+///
+/// This type is a sort of "double cursor". It tracks three regions in the
+/// buffer: a region at the beginning of the buffer that has been logically
+/// filled with data, a region that has been initialized at some point but not
+/// yet logically filled, and a region at the end that may be uninitialized.
+/// The filled region is guaranteed to be a subset of the initialized region.
+///
+/// In summary, the contents of the buffer can be visualized as:
+///
+/// ```not_rust
+/// [             capacity              ]
+/// [ filled |         unfilled         ]
+/// [    initialized    | uninitialized ]
+/// ```
+///
+/// It is undefined behavior to de-initialize any bytes from the uninitialized
+/// region, since it is merely unknown whether this region is uninitialized or
+/// not, and if part of it turns out to be initialized, it must stay initialized.
+pub struct ReadBuf<'a> {
+    buf: &'a mut [MaybeUninit<u8>],
+    filled: usize,
+    initialized: usize,
+}
+
+impl<'a> ReadBuf<'a> {
+    /// Creates a new `ReadBuf` from a fully initialized buffer.
+    #[inline]
+    pub fn new(buf: &'a mut [u8]) -> ReadBuf<'a> {
+        let initialized = buf.len();
+        let buf = unsafe { mem::transmute::<&mut [u8], &mut [MaybeUninit<u8>]>(buf) };
+        ReadBuf {
+            buf,
+            filled: 0,
+            initialized,
+        }
+    }
+
+    /// Creates a new `ReadBuf` from a fully uninitialized buffer.
+    ///
+    /// Use `assume_init` if part of the buffer is known to be already initialized.
+    #[inline]
+    pub fn uninit(buf: &'a mut [MaybeUninit<u8>]) -> ReadBuf<'a> {
+        ReadBuf {
+            buf,
+            filled: 0,
+            initialized: 0,
+        }
+    }
+
+    /// Returns the total capacity of the buffer.
+    #[inline]
+    pub fn capacity(&self) -> usize {
+        self.buf.len()
+    }
+
+    /// Returns a shared reference to the filled portion of the buffer.
+    #[inline]
+    pub fn filled(&self) -> &[u8] {
+        let slice = &self.buf[..self.filled];
+        // safety: filled describes how far into the buffer that the
+        // user has filled with bytes, so it's been initialized.
+        // TODO: This could use `MaybeUninit::slice_get_ref` when it is stable.
+        unsafe { mem::transmute::<&[MaybeUninit<u8>], &[u8]>(slice) }
+    }
+
+    /// Returns a mutable reference to the filled portion of the buffer.
+    #[inline]
+    pub fn filled_mut(&mut self) -> &mut [u8] {
+        let slice = &mut self.buf[..self.filled];
+        // safety: filled describes how far into the buffer that the
+        // user has filled with bytes, so it's been initialized.
+        // TODO: This could use `MaybeUninit::slice_get_mut` when it is stable.
+        unsafe { mem::transmute::<&mut [MaybeUninit<u8>], &mut [u8]>(slice) }
+    }
+
+    /// Returns a new `ReadBuf` comprised of the unfilled section up to `n`.
+    #[inline]
+    pub fn take(&mut self, n: usize) -> ReadBuf<'_> {
+        let max = std::cmp::min(self.remaining(), n);
+        // Safety: We don't set any of the `unfilled_mut` with `MaybeUninit::uninit`.
+        unsafe { ReadBuf::uninit(&mut self.unfilled_mut()[..max]) }
+    }
+
+    /// Returns a shared reference to the initialized portion of the buffer.
+    ///
+    /// This includes the filled portion.
+    #[inline]
+    pub fn initialized(&self) -> &[u8] {
+        let slice = &self.buf[..self.initialized];
+        // safety: initialized describes how far into the buffer that the
+        // user has at some point initialized with bytes.
+        // TODO: This could use `MaybeUninit::slice_get_ref` when it is stable.
+        unsafe { mem::transmute::<&[MaybeUninit<u8>], &[u8]>(slice) }
+    }
+
+    /// Returns a mutable reference to the initialized portion of the buffer.
+    ///
+    /// This includes the filled portion.
+    #[inline]
+    pub fn initialized_mut(&mut self) -> &mut [u8] {
+        let slice = &mut self.buf[..self.initialized];
+        // safety: initialized describes how far into the buffer that the
+        // user has at some point initialized with bytes.
+        // TODO: This could use `MaybeUninit::slice_get_mut` when it is stable.
+        unsafe { mem::transmute::<&mut [MaybeUninit<u8>], &mut [u8]>(slice) }
+    }
+
+    /// Returns a mutable reference to the entire buffer, without ensuring that it has been fully
+    /// initialized.
+    ///
+    /// The elements between 0 and `self.filled().len()` are filled, and those between 0 and
+    /// `self.initialized().len()` are initialized (and so can be transmuted to a `&mut [u8]`).
+    ///
+    /// The caller of this method must ensure that these invariants are upheld. For example, if the
+    /// caller initializes some of the uninitialized section of the buffer, it must call
+    /// [`assume_init`](Self::assume_init) with the number of bytes initialized.
+    ///
+    /// # Safety
+    ///
+    /// The caller must not de-initialize portions of the buffer that have already been initialized.
+    /// This includes any bytes in the region marked as uninitialized by `ReadBuf`.
+    #[inline]
+    pub unsafe fn inner_mut(&mut self) -> &mut [MaybeUninit<u8>] {
+        self.buf
+    }
+
+    /// Returns a mutable reference to the unfilled part of the buffer without ensuring that it has been fully
+    /// initialized.
+    ///
+    /// # Safety
+    ///
+    /// The caller must not de-initialize portions of the buffer that have already been initialized.
+    /// This includes any bytes in the region marked as uninitialized by `ReadBuf`.
+    #[inline]
+    pub unsafe fn unfilled_mut(&mut self) -> &mut [MaybeUninit<u8>] {
+        &mut self.buf[self.filled..]
+    }
+
+    /// Returns a mutable reference to the unfilled part of the buffer, ensuring it is fully initialized.
+    ///
+    /// Since `ReadBuf` tracks the region of the buffer that has been initialized, this is effectively "free" after
+    /// the first use.
+    #[inline]
+    pub fn initialize_unfilled(&mut self) -> &mut [u8] {
+        self.initialize_unfilled_to(self.remaining())
+    }
+
+    /// Returns a mutable reference to the first `n` bytes of the unfilled part of the buffer, ensuring it is
+    /// fully initialized.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `self.remaining()` is less than `n`.
+    #[inline]
+    pub fn initialize_unfilled_to(&mut self, n: usize) -> &mut [u8] {
+        assert!(self.remaining() >= n, "n overflows remaining");
+
+        // This can't overflow, otherwise the assert above would have failed.
+        let end = self.filled + n;
+
+        if self.initialized < end {
+            unsafe {
+                self.buf[self.initialized..end]
+                    .as_mut_ptr()
+                    .write_bytes(0, end - self.initialized);
+            }
+            self.initialized = end;
+        }
+
+        let slice = &mut self.buf[self.filled..end];
+        // safety: just above, we checked that the end of the buf has
+        // been initialized to some value.
+        unsafe { mem::transmute::<&mut [MaybeUninit<u8>], &mut [u8]>(slice) }
+    }
+
+    /// Returns the number of bytes at the end of the slice that have not yet been filled.
+    #[inline]
+    pub fn remaining(&self) -> usize {
+        self.capacity() - self.filled
+    }
+
+    /// Clears the buffer, resetting the filled region to empty.
+    ///
+    /// The number of initialized bytes is not changed, and the contents of the buffer are not modified.
+    #[inline]
+    pub fn clear(&mut self) {
+        self.filled = 0;
+    }
+
+    /// Advances the size of the filled region of the buffer.
+    ///
+    /// The number of initialized bytes is not changed.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the filled region of the buffer would become larger than the initialized region.
+    #[inline]
+    pub fn advance(&mut self, n: usize) {
+        let new = self.filled.checked_add(n).expect("filled overflow");
+        self.set_filled(new);
+    }
+
+    /// Sets the size of the filled region of the buffer.
+    ///
+    /// The number of initialized bytes is not changed.
+    ///
+    /// Note that this can be used to *shrink* the filled region of the buffer in addition to growing it (for
+    /// example, by a `AsyncRead` implementation that compresses data in-place).
+    ///
+    /// # Panics
+    ///
+    /// Panics if the filled region of the buffer would become larger than the initialized region.
+    #[inline]
+    pub fn set_filled(&mut self, n: usize) {
+        assert!(
+            n <= self.initialized,
+            "filled must not become larger than initialized"
+        );
+        self.filled = n;
+    }
+
+    /// Asserts that the first `n` unfilled bytes of the buffer are initialized.
+    ///
+    /// `ReadBuf` assumes that bytes are never de-initialized, so this method does nothing when called with fewer
+    /// bytes than are already known to be initialized.
+    ///
+    /// # Safety
+    ///
+    /// The caller must ensure that `n` unfilled bytes of the buffer have already been initialized.
+    #[inline]
+    pub unsafe fn assume_init(&mut self, n: usize) {
+        let new = self.filled + n;
+        if new > self.initialized {
+            self.initialized = new;
+        }
+    }
+
+    /// Appends data to the buffer, advancing the written position and possibly also the initialized position.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `self.remaining()` is less than `buf.len()`.
+    #[inline]
+    pub fn put_slice(&mut self, buf: &[u8]) {
+        assert!(
+            self.remaining() >= buf.len(),
+            "buf.len() must fit in remaining()"
+        );
+
+        let amt = buf.len();
+        // Cannot overflow, asserted above
+        let end = self.filled + amt;
+
+        // Safety: the length is asserted above
+        unsafe {
+            self.buf[self.filled..end]
+                .as_mut_ptr()
+                .cast::<u8>()
+                .copy_from_nonoverlapping(buf.as_ptr(), amt);
+        }
+
+        if self.initialized < end {
+            self.initialized = end;
+        }
+        self.filled = end;
+    }
+}
+
+impl fmt::Debug for ReadBuf<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ReadBuf")
+            .field("filled", &self.filled)
+            .field("initialized", &self.initialized)
+            .field("capacity", &self.capacity())
+            .finish()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/registration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/registration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/registration.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/registration.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,340 +0,0 @@
-use crate::io::driver::{platform, Direction, Handle};
-use crate::util::slab::Address;
-
-use mio::{self, Evented};
-use std::io;
-use std::task::{Context, Poll};
-
-cfg_io_driver! {
-    /// Associates an I/O resource with the reactor instance that drives it.
-    ///
-    /// A registration represents an I/O resource registered with a Reactor such
-    /// that it will receive task notifications on readiness. This is the lowest
-    /// level API for integrating with a reactor.
-    ///
-    /// The association between an I/O resource is made by calling [`new`]. Once
-    /// the association is established, it remains established until the
-    /// registration instance is dropped.
-    ///
-    /// A registration instance represents two separate readiness streams. One
-    /// for the read readiness and one for write readiness. These streams are
-    /// independent and can be consumed from separate tasks.
-    ///
-    /// **Note**: while `Registration` is `Sync`, the caller must ensure that
-    /// there are at most two tasks that use a registration instance
-    /// concurrently. One task for [`poll_read_ready`] and one task for
-    /// [`poll_write_ready`]. While violating this requirement is "safe" from a
-    /// Rust memory safety point of view, it will result in unexpected behavior
-    /// in the form of lost notifications and tasks hanging.
-    ///
-    /// ## Platform-specific events
-    ///
-    /// `Registration` also allows receiving platform-specific `mio::Ready`
-    /// events. These events are included as part of the read readiness event
-    /// stream. The write readiness event stream is only for `Ready::writable()`
-    /// events.
-    ///
-    /// [`new`]: method@Self::new
-    /// [`poll_read_ready`]: method@Self::poll_read_ready`
-    /// [`poll_write_ready`]: method@Self::poll_write_ready`
-    #[derive(Debug)]
-    pub struct Registration {
-        handle: Handle,
-        address: Address,
-    }
-}
-
-// ===== impl Registration =====
-
-impl Registration {
-    /// Registers the I/O resource with the default reactor.
-    ///
-    /// # Return
-    ///
-    /// - `Ok` if the registration happened successfully
-    /// - `Err` if an error was encountered during registration
-    ///
-    ///
-    /// # Panics
-    ///
-    /// This function panics if thread-local runtime is not set.
-    ///
-    /// The runtime is usually set implicitly when this function is called
-    /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
-    pub fn new<T>(io: &T) -> io::Result<Registration>
-    where
-        T: Evented,
-    {
-        Registration::new_with_ready(io, mio::Ready::all())
-    }
-
-    /// Registers the I/O resource with the default reactor, for a specific `mio::Ready` state.
-    /// `new_with_ready` should be used over `new` when you need control over the readiness state,
-    /// such as when a file descriptor only allows reads. This does not add `hup` or `error` so if
-    /// you are interested in those states, you will need to add them to the readiness state passed
-    /// to this function.
-    ///
-    /// An example to listen to read only
-    ///
-    /// ```rust
-    /// ##[cfg(unix)]
-    ///     mio::Ready::from_usize(
-    ///         mio::Ready::readable().as_usize()
-    ///         | mio::unix::UnixReady::error().as_usize()
-    ///         | mio::unix::UnixReady::hup().as_usize()
-    ///     );
-    /// ```
-    ///
-    /// # Return
-    ///
-    /// - `Ok` if the registration happened successfully
-    /// - `Err` if an error was encountered during registration
-    ///
-    ///
-    /// # Panics
-    ///
-    /// This function panics if thread-local runtime is not set.
-    ///
-    /// The runtime is usually set implicitly when this function is called
-    /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
-    pub fn new_with_ready<T>(io: &T, ready: mio::Ready) -> io::Result<Registration>
-    where
-        T: Evented,
-    {
-        let handle = Handle::current();
-        let address = if let Some(inner) = handle.inner() {
-            inner.add_source(io, ready)?
-        } else {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                "failed to find event loop",
-            ));
-        };
-
-        Ok(Registration { handle, address })
-    }
-
-    /// Deregisters the I/O resource from the reactor it is associated with.
-    ///
-    /// This function must be called before the I/O resource associated with the
-    /// registration is dropped.
-    ///
-    /// Note that deregistering does not guarantee that the I/O resource can be
-    /// registered with a different reactor. Some I/O resource types can only be
-    /// associated with a single reactor instance for their lifetime.
-    ///
-    /// # Return
-    ///
-    /// If the deregistration was successful, `Ok` is returned. Any calls to
-    /// `Reactor::turn` that happen after a successful call to `deregister` will
-    /// no longer result in notifications getting sent for this registration.
-    ///
-    /// `Err` is returned if an error is encountered.
-    pub fn deregister<T>(&mut self, io: &T) -> io::Result<()>
-    where
-        T: Evented,
-    {
-        let inner = match self.handle.inner() {
-            Some(inner) => inner,
-            None => return Err(io::Error::new(io::ErrorKind::Other, "reactor gone")),
-        };
-        inner.deregister_source(io)
-    }
-
-    /// Polls for events on the I/O resource's read readiness stream.
-    ///
-    /// If the I/O resource receives a new read readiness event since the last
-    /// call to `poll_read_ready`, it is returned. If it has not, the current
-    /// task is notified once a new event is received.
-    ///
-    /// All events except `HUP` are [edge-triggered]. Once `HUP` is returned,
-    /// the function will always return `Ready(HUP)`. This should be treated as
-    /// the end of the readiness stream.
-    ///
-    /// # Return value
-    ///
-    /// There are several possible return values:
-    ///
-    /// * `Poll::Ready(Ok(readiness))` means that the I/O resource has received
-    ///   a new readiness event. The readiness value is included.
-    ///
-    /// * `Poll::Pending` means that no new readiness events have been received
-    ///   since the last call to `poll_read_ready`.
-    ///
-    /// * `Poll::Ready(Err(err))` means that the registration has encountered an
-    ///   error. This could represent a permanent internal error for example.
-    ///
-    /// [edge-triggered]: struct@mio::Poll#edge-triggered-and-level-triggered
-    ///
-    /// # Panics
-    ///
-    /// This function will panic if called from outside of a task context.
-    pub fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<mio::Ready>> {
-        // Keep track of task budget
-        let coop = ready!(crate::coop::poll_proceed(cx));
-
-        let v = self.poll_ready(Direction::Read, Some(cx)).map_err(|e| {
-            coop.made_progress();
-            e
-        })?;
-        match v {
-            Some(v) => {
-                coop.made_progress();
-                Poll::Ready(Ok(v))
-            }
-            None => Poll::Pending,
-        }
-    }
-
-    /// Consume any pending read readiness event.
-    ///
-    /// This function is identical to [`poll_read_ready`] **except** that it
-    /// will not notify the current task when a new event is received. As such,
-    /// it is safe to call this function from outside of a task context.
-    ///
-    /// [`poll_read_ready`]: method@Self::poll_read_ready
-    pub fn take_read_ready(&self) -> io::Result<Option<mio::Ready>> {
-        self.poll_ready(Direction::Read, None)
-    }
-
-    /// Polls for events on the I/O resource's write readiness stream.
-    ///
-    /// If the I/O resource receives a new write readiness event since the last
-    /// call to `poll_write_ready`, it is returned. If it has not, the current
-    /// task is notified once a new event is received.
-    ///
-    /// All events except `HUP` are [edge-triggered]. Once `HUP` is returned,
-    /// the function will always return `Ready(HUP)`. This should be treated as
-    /// the end of the readiness stream.
-    ///
-    /// # Return value
-    ///
-    /// There are several possible return values:
-    ///
-    /// * `Poll::Ready(Ok(readiness))` means that the I/O resource has received
-    ///   a new readiness event. The readiness value is included.
-    ///
-    /// * `Poll::Pending` means that no new readiness events have been received
-    ///   since the last call to `poll_write_ready`.
-    ///
-    /// * `Poll::Ready(Err(err))` means that the registration has encountered an
-    ///   error. This could represent a permanent internal error for example.
-    ///
-    /// [edge-triggered]: struct@mio::Poll#edge-triggered-and-level-triggered
-    ///
-    /// # Panics
-    ///
-    /// This function will panic if called from outside of a task context.
-    pub fn poll_write_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<mio::Ready>> {
-        // Keep track of task budget
-        let coop = ready!(crate::coop::poll_proceed(cx));
-
-        let v = self.poll_ready(Direction::Write, Some(cx)).map_err(|e| {
-            coop.made_progress();
-            e
-        })?;
-        match v {
-            Some(v) => {
-                coop.made_progress();
-                Poll::Ready(Ok(v))
-            }
-            None => Poll::Pending,
-        }
-    }
-
-    /// Consumes any pending write readiness event.
-    ///
-    /// This function is identical to [`poll_write_ready`] **except** that it
-    /// will not notify the current task when a new event is received. As such,
-    /// it is safe to call this function from outside of a task context.
-    ///
-    /// [`poll_write_ready`]: method@Self::poll_write_ready
-    pub fn take_write_ready(&self) -> io::Result<Option<mio::Ready>> {
-        self.poll_ready(Direction::Write, None)
-    }
-
-    /// Polls for events on the I/O resource's `direction` readiness stream.
-    ///
-    /// If called with a task context, notify the task when a new event is
-    /// received.
-    fn poll_ready(
-        &self,
-        direction: Direction,
-        cx: Option<&mut Context<'_>>,
-    ) -> io::Result<Option<mio::Ready>> {
-        let inner = match self.handle.inner() {
-            Some(inner) => inner,
-            None => return Err(io::Error::new(io::ErrorKind::Other, "reactor gone")),
-        };
-
-        // If the task should be notified about new events, ensure that it has
-        // been registered
-        if let Some(ref cx) = cx {
-            inner.register(self.address, direction, cx.waker().clone())
-        }
-
-        let mask = direction.mask();
-        let mask_no_hup = (mask - platform::hup() - platform::error()).as_usize();
-
-        let sched = inner.io_dispatch.get(self.address).unwrap();
-
-        // This consumes the current readiness state **except** for HUP and
-        // error. HUP and error are excluded because a) they are final states
-        // and never transitition out and b) both the read AND the write
-        // directions need to be able to obvserve these states.
-        //
-        // # Platform-specific behavior
-        //
-        // HUP and error readiness are platform-specific. On epoll platforms,
-        // HUP has specific conditions that must be met by both peers of a
-        // connection in order to be triggered.
-        //
-        // On epoll platforms, `EPOLLERR` is signaled through
-        // `UnixReady::error()` and is important to be observable by both read
-        // AND write. A specific case that `EPOLLERR` occurs is when the read
-        // end of a pipe is closed. When this occurs, a peer blocked by
-        // writing to the pipe should be notified.
-        let curr_ready = sched
-            .set_readiness(self.address, |curr| curr & (!mask_no_hup))
-            .unwrap_or_else(|_| panic!("address {:?} no longer valid!", self.address));
-
-        let mut ready = mask & mio::Ready::from_usize(curr_ready);
-
-        if ready.is_empty() {
-            if let Some(cx) = cx {
-                // Update the task info
-                match direction {
-                    Direction::Read => sched.reader.register_by_ref(cx.waker()),
-                    Direction::Write => sched.writer.register_by_ref(cx.waker()),
-                }
-
-                // Try again
-                let curr_ready = sched
-                    .set_readiness(self.address, |curr| curr & (!mask_no_hup))
-                    .unwrap_or_else(|_| panic!("address {:?} no longer valid!", self.address));
-                ready = mask & mio::Ready::from_usize(curr_ready);
-            }
-        }
-
-        if ready.is_empty() {
-            Ok(None)
-        } else {
-            Ok(Some(ready))
-        }
-    }
-}
-
-unsafe impl Send for Registration {}
-unsafe impl Sync for Registration {}
-
-impl Drop for Registration {
-    fn drop(&mut self) {
-        let inner = match self.handle.inner() {
-            Some(inner) => inner,
-            None => return,
-        };
-        inner.drop_source(self.address);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/seek.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/seek.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/seek.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/seek.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,23 @@
 use crate::io::AsyncSeek;
+
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io::{self, SeekFrom};
+use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-/// Future for the [`seek`](crate::io::AsyncSeekExt::seek) method.
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Seek<'a, S: ?Sized> {
-    seek: &'a mut S,
-    pos: Option<SeekFrom>,
+pin_project! {
+    /// Future for the [`seek`](crate::io::AsyncSeekExt::seek) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Seek<'a, S: ?Sized> {
+        seek: &'a mut S,
+        pos: Option<SeekFrom>,
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
+    }
 }
 
 pub(crate) fn seek<S>(seek: &mut S, pos: SeekFrom) -> Seek<'_, S>
@@ -19,6 +27,7 @@
     Seek {
         seek,
         pos: Some(pos),
+        _pin: PhantomPinned,
     }
 }
 
@@ -28,29 +37,21 @@
 {
     type Output = io::Result<u64>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let me = &mut *self;
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
         match me.pos {
-            Some(pos) => match Pin::new(&mut me.seek).start_seek(cx, pos) {
-                Poll::Ready(Ok(())) => {
-                    me.pos = None;
-                    Pin::new(&mut me.seek).poll_complete(cx)
+            Some(pos) => {
+                // ensure no seek in progress
+                ready!(Pin::new(&mut *me.seek).poll_complete(cx))?;
+                match Pin::new(&mut *me.seek).start_seek(*pos) {
+                    Ok(()) => {
+                        *me.pos = None;
+                        Pin::new(&mut *me.seek).poll_complete(cx)
+                    }
+                    Err(e) => Poll::Ready(Err(e)),
                 }
-                Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
-                Poll::Pending => Poll::Pending,
-            },
-            None => Pin::new(&mut me.seek).poll_complete(cx),
+            }
+            None => Pin::new(&mut *me.seek).poll_complete(cx),
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<Seek<'_, PhantomPinned>>();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,9 +4,8 @@
 //! To restore this read/write object from its `split::ReadHalf` and
 //! `split::WriteHalf` use `unsplit`.
 
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 
-use bytes::{Buf, BufMut};
 use std::cell::UnsafeCell;
 use std::fmt;
 use std::io;
@@ -64,7 +63,7 @@
     /// Checks if this `ReadHalf` and some `WriteHalf` were split from the same
     /// stream.
     pub fn is_pair_of(&self, other: &WriteHalf<T>) -> bool {
-        other.is_pair_of(&self)
+        other.is_pair_of(self)
     }
 
     /// Reunites with a previously split `WriteHalf`.
@@ -102,20 +101,11 @@
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         let mut inner = ready!(self.inner.poll_lock(cx));
         inner.stream_pin().poll_read(cx, buf)
     }
-
-    fn poll_read_buf<B: BufMut>(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut B,
-    ) -> Poll<io::Result<usize>> {
-        let mut inner = ready!(self.inner.poll_lock(cx));
-        inner.stream_pin().poll_read_buf(cx, buf)
-    }
 }
 
 impl<T: AsyncWrite> AsyncWrite for WriteHalf<T> {
@@ -137,20 +127,15 @@
         let mut inner = ready!(self.inner.poll_lock(cx));
         inner.stream_pin().poll_shutdown(cx)
     }
-
-    fn poll_write_buf<B: Buf>(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut B,
-    ) -> Poll<Result<usize, io::Error>> {
-        let mut inner = ready!(self.inner.poll_lock(cx));
-        inner.stream_pin().poll_write_buf(cx, buf)
-    }
 }
 
 impl<T> Inner<T> {
     fn poll_lock(&self, cx: &mut Context<'_>) -> Poll<Guard<'_, T>> {
-        if !self.locked.compare_and_swap(false, true, Acquire) {
+        if self
+            .locked
+            .compare_exchange(false, true, Acquire, Acquire)
+            .is_ok()
+        {
             Poll::Ready(Guard { inner: self })
         } else {
             // Spin... but investigate a better strategy
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/stderr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/stderr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/stderr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/stderr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 use crate::io::blocking::Blocking;
+use crate::io::stdio_common::SplitByUtf8BoundaryIfWindows;
 use crate::io::AsyncWrite;
 
 use std::io;
@@ -35,7 +36,7 @@
     /// ```
     #[derive(Debug)]
     pub struct Stderr {
-        std: Blocking<std::io::Stderr>,
+        std: SplitByUtf8BoundaryIfWindows<Blocking<std::io::Stderr>>,
     }
 
     /// Constructs a new handle to the standard error of the current process.
@@ -59,7 +60,7 @@
     ///
     /// #[tokio::main]
     /// async fn main() -> io::Result<()> {
-    ///     let mut stderr = io::stdout();
+    ///     let mut stderr = io::stderr();
     ///     stderr.write_all(b"Print some error here.").await?;
     ///     Ok(())
     /// }
@@ -67,7 +68,7 @@
     pub fn stderr() -> Stderr {
         let std = io::stderr();
         Stderr {
-            std: Blocking::new(std),
+            std: SplitByUtf8BoundaryIfWindows::new(Blocking::new(std)),
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/stdin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/stdin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/stdin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/stdin.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 use crate::io::blocking::Blocking;
-use crate::io::AsyncRead;
+use crate::io::{AsyncRead, ReadBuf};
 
 use std::io;
 use std::pin::Pin;
@@ -63,16 +63,11 @@
 }
 
 impl AsyncRead for Stdin {
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        // https://github.com/rust-lang/rust/blob/09c817eeb29e764cfc12d0a8d94841e3ffe34023/src/libstd/io/stdio.rs#L97
-        false
-    }
-
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         Pin::new(&mut self.std).poll_read(cx, buf)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/stdio_common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/stdio_common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/stdio_common.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/stdio_common.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,220 @@
+//! Contains utilities for stdout and stderr.
+use crate::io::AsyncWrite;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+/// # Windows
+/// AsyncWrite adapter that finds last char boundary in given buffer and does not write the rest,
+/// if buffer contents seems to be utf8. Otherwise it only trims buffer down to MAX_BUF.
+/// That's why, wrapped writer will always receive well-formed utf-8 bytes.
+/// # Other platforms
+/// passes data to `inner` as is
+#[derive(Debug)]
+pub(crate) struct SplitByUtf8BoundaryIfWindows<W> {
+    inner: W,
+}
+
+impl<W> SplitByUtf8BoundaryIfWindows<W> {
+    pub(crate) fn new(inner: W) -> Self {
+        Self { inner }
+    }
+}
+
+// this constant is defined by Unicode standard.
+const MAX_BYTES_PER_CHAR: usize = 4;
+
+// Subject for tweaking here
+const MAGIC_CONST: usize = 8;
+
+impl<W> crate::io::AsyncWrite for SplitByUtf8BoundaryIfWindows<W>
+where
+    W: AsyncWrite + Unpin,
+{
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        mut buf: &[u8],
+    ) -> Poll<Result<usize, std::io::Error>> {
+        // just a closure to avoid repetitive code
+        let mut call_inner = move |buf| Pin::new(&mut self.inner).poll_write(cx, buf);
+
+        // 1. Only windows stdio can suffer from non-utf8.
+        // We also check for `test` so that we can write some tests
+        // for further code. Since `AsyncWrite` can always shrink
+        // buffer at its discretion, excessive (i.e. in tests) shrinking
+        // does not break correctness.
+        // 2. If buffer is small, it will not be shrinked.
+        // That's why, it's "textness" will not change, so we don't have
+        // to fixup it.
+        if cfg!(not(any(target_os = "windows", test))) || buf.len() <= crate::io::blocking::MAX_BUF
+        {
+            return call_inner(buf);
+        }
+
+        buf = &buf[..crate::io::blocking::MAX_BUF];
+
+        // Now there are two possibilities.
+        // If caller gave is binary buffer, we **should not** shrink it
+        // anymore, because excessive shrinking hits performance.
+        // If caller gave as binary buffer, we  **must** additionally
+        // shrink it to strip incomplete char at the end of buffer.
+        // that's why check we will perform now is allowed to have
+        // false-positive.
+
+        // Now let's look at the first MAX_BYTES_PER_CHAR * MAGIC_CONST bytes.
+        // if they are (possibly incomplete) utf8, then we can be quite sure
+        // that input buffer was utf8.
+
+        let have_to_fix_up = match std::str::from_utf8(&buf[..MAX_BYTES_PER_CHAR * MAGIC_CONST]) {
+            Ok(_) => true,
+            Err(err) => {
+                let incomplete_bytes = MAX_BYTES_PER_CHAR * MAGIC_CONST - err.valid_up_to();
+                incomplete_bytes < MAX_BYTES_PER_CHAR
+            }
+        };
+
+        if have_to_fix_up {
+            // We must pop several bytes at the end which form incomplete
+            // character. To achieve it, we exploit UTF8 encoding:
+            // for any code point, all bytes except first start with 0b10 prefix.
+            // see https://en.wikipedia.org/wiki/UTF-8#Encoding for details
+            let trailing_incomplete_char_size = buf
+                .iter()
+                .rev()
+                .take(MAX_BYTES_PER_CHAR)
+                .position(|byte| *byte < 0b1000_0000 || *byte >= 0b1100_0000)
+                .unwrap_or(0)
+                + 1;
+            buf = &buf[..buf.len() - trailing_incomplete_char_size];
+        }
+
+        call_inner(buf)
+    }
+
+    fn poll_flush(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        Pin::new(&mut self.inner).poll_flush(cx)
+    }
+
+    fn poll_shutdown(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        Pin::new(&mut self.inner).poll_shutdown(cx)
+    }
+}
+
+#[cfg(test)]
+#[cfg(not(loom))]
+mod tests {
+    use crate::io::AsyncWriteExt;
+    use std::io;
+    use std::pin::Pin;
+    use std::task::Context;
+    use std::task::Poll;
+
+    const MAX_BUF: usize = 16 * 1024;
+
+    struct TextMockWriter;
+
+    impl crate::io::AsyncWrite for TextMockWriter {
+        fn poll_write(
+            self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<Result<usize, io::Error>> {
+            assert!(buf.len() <= MAX_BUF);
+            assert!(std::str::from_utf8(buf).is_ok());
+            Poll::Ready(Ok(buf.len()))
+        }
+
+        fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+            Poll::Ready(Ok(()))
+        }
+
+        fn poll_shutdown(
+            self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+        ) -> Poll<Result<(), io::Error>> {
+            Poll::Ready(Ok(()))
+        }
+    }
+
+    struct LoggingMockWriter {
+        write_history: Vec<usize>,
+    }
+
+    impl LoggingMockWriter {
+        fn new() -> Self {
+            LoggingMockWriter {
+                write_history: Vec::new(),
+            }
+        }
+    }
+
+    impl crate::io::AsyncWrite for LoggingMockWriter {
+        fn poll_write(
+            mut self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<Result<usize, io::Error>> {
+            assert!(buf.len() <= MAX_BUF);
+            self.write_history.push(buf.len());
+            Poll::Ready(Ok(buf.len()))
+        }
+
+        fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+            Poll::Ready(Ok(()))
+        }
+
+        fn poll_shutdown(
+            self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+        ) -> Poll<Result<(), io::Error>> {
+            Poll::Ready(Ok(()))
+        }
+    }
+
+    #[test]
+    fn test_splitter() {
+        let data = str::repeat("â–ˆ", MAX_BUF);
+        let mut wr = super::SplitByUtf8BoundaryIfWindows::new(TextMockWriter);
+        let fut = async move {
+            wr.write_all(data.as_bytes()).await.unwrap();
+        };
+        crate::runtime::Builder::new_current_thread()
+            .build()
+            .unwrap()
+            .block_on(fut);
+    }
+
+    #[test]
+    fn test_pseudo_text() {
+        // In this test we write a piece of binary data, whose beginning is
+        // text though. We then validate that even in this corner case buffer
+        // was not shrinked too much.
+        let checked_count = super::MAGIC_CONST * super::MAX_BYTES_PER_CHAR;
+        let mut data: Vec<u8> = str::repeat("a", checked_count).into();
+        data.extend(std::iter::repeat(0b1010_1010).take(MAX_BUF - checked_count + 1));
+        let mut writer = LoggingMockWriter::new();
+        let mut splitter = super::SplitByUtf8BoundaryIfWindows::new(&mut writer);
+        crate::runtime::Builder::new_current_thread()
+            .build()
+            .unwrap()
+            .block_on(async {
+                splitter.write_all(&data).await.unwrap();
+            });
+        // Check that at most two writes were performed
+        assert!(writer.write_history.len() <= 2);
+        // Check that all has been written
+        assert_eq!(
+            writer.write_history.iter().copied().sum::<usize>(),
+            data.len()
+        );
+        // Check that at most MAX_BYTES_PER_CHAR + 1 (i.e. 5) bytes were shrinked
+        // from the buffer: one because it was outside of MAX_BUF boundary, and
+        // up to one "utf8 code point".
+        assert!(data.len() - writer.write_history[0] <= super::MAX_BYTES_PER_CHAR + 1);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/stdout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/stdout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/stdout.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/stdout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 use crate::io::blocking::Blocking;
+use crate::io::stdio_common::SplitByUtf8BoundaryIfWindows;
 use crate::io::AsyncWrite;
-
 use std::io;
 use std::pin::Pin;
 use std::task::Context;
@@ -35,7 +35,7 @@
     /// ```
     #[derive(Debug)]
     pub struct Stdout {
-        std: Blocking<std::io::Stdout>,
+        std: SplitByUtf8BoundaryIfWindows<Blocking<std::io::Stdout>>,
     }
 
     /// Constructs a new handle to the standard output of the current process.
@@ -67,7 +67,7 @@
     pub fn stdout() -> Stdout {
         let std = io::stdout();
         Stdout {
-            std: Blocking::new(std),
+            std: SplitByUtf8BoundaryIfWindows::new(Blocking::new(std)),
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/async_buf_read_ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/async_buf_read_ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/async_buf_read_ext.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/async_buf_read_ext.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use crate::io::util::fill_buf::{fill_buf, FillBuf};
 use crate::io::util::lines::{lines, Lines};
 use crate::io::util::read_line::{read_line, ReadLine};
 use crate::io::util::read_until::{read_until, ReadUntil};
@@ -14,7 +15,7 @@
         /// Equivalent to:
         ///
         /// ```ignore
-        /// async fn read_until(&mut self, buf: &mut Vec<u8>) -> io::Result<usize>;
+        /// async fn read_until(&mut self, byte: u8, buf: &mut Vec<u8>) -> io::Result<usize>;
         /// ```
         ///
         /// This function will read bytes from the underlying stream until the
@@ -23,6 +24,8 @@
         ///
         /// If successful, this function will return the total number of bytes read.
         ///
+        /// If this function returns `Ok(0)`, the stream has reached EOF.
+        ///
         /// # Errors
         ///
         /// This function will ignore all instances of [`ErrorKind::Interrupted`] and
@@ -34,6 +37,18 @@
         /// [`fill_buf`]: AsyncBufRead::poll_fill_buf
         /// [`ErrorKind::Interrupted`]: std::io::ErrorKind::Interrupted
         ///
+        /// # Cancel safety
+        ///
+        /// If the method is used as the event in a
+        /// [`tokio::select!`](crate::select) statement and some other branch
+        /// completes first, then some data may have been partially read. Any
+        /// partially read bytes are appended to `buf`, and the method can be
+        /// called again to continue reading until `byte`.
+        ///
+        /// This method returns the total number of bytes read. If you cancel
+        /// the call to `read_until` and then call it again to continue reading,
+        /// the counter is reset.
+        ///
         /// # Examples
         ///
         /// [`std::io::Cursor`][`Cursor`] is a type that implements `BufRead`. In
@@ -112,6 +127,30 @@
         ///
         /// [`read_until`]: AsyncBufReadExt::read_until
         ///
+        /// # Cancel safety
+        ///
+        /// This method is not cancellation safe. If the method is used as the
+        /// event in a [`tokio::select!`](crate::select) statement and some
+        /// other branch completes first, then some data may have been partially
+        /// read, and this data is lost. There are no guarantees regarding the
+        /// contents of `buf` when the call is cancelled. The current
+        /// implementation replaces `buf` with the empty string, but this may
+        /// change in the future.
+        ///
+        /// This function does not behave like [`read_until`] because of the
+        /// requirement that a string contains only valid utf-8. If you need a
+        /// cancellation safe `read_line`, there are three options:
+        ///
+        ///  * Call [`read_until`] with a newline character and manually perform the utf-8 check.
+        ///  * The stream returned by [`lines`] has a cancellation safe
+        ///    [`next_line`] method.
+        ///  * Use [`tokio_util::codec::LinesCodec`][LinesCodec].
+        ///
+        /// [LinesCodec]: https://docs.rs/tokio-util/0.6/tokio_util/codec/struct.LinesCodec.html
+        /// [`read_until`]: Self::read_until
+        /// [`lines`]: Self::lines
+        /// [`next_line`]: crate::io::Lines::next_line
+        ///
         /// # Examples
         ///
         /// [`std::io::Cursor`][`Cursor`] is a type that implements
@@ -171,10 +210,11 @@
         /// [`BufRead::split`](std::io::BufRead::split).
         ///
         /// The stream returned from this function will yield instances of
-        /// [`io::Result`]`<`[`Vec<u8>`]`>`. Each vector returned will *not* have
+        /// [`io::Result`]`<`[`Option`]`<`[`Vec<u8>`]`>>`. Each vector returned will *not* have
         /// the delimiter byte at the end.
         ///
         /// [`io::Result`]: std::io::Result
+        /// [`Option`]: core::option::Option
         /// [`Vec<u8>`]: std::vec::Vec
         ///
         /// # Errors
@@ -204,14 +244,68 @@
             split(self, byte)
         }
 
+        /// Returns the contents of the internal buffer, filling it with more
+        /// data from the inner reader if it is empty.
+        ///
+        /// This function is a lower-level call. It needs to be paired with the
+        /// [`consume`] method to function properly. When calling this method,
+        /// none of the contents will be "read" in the sense that later calling
+        /// `read` may return the same contents. As such, [`consume`] must be
+        /// called with the number of bytes that are consumed from this buffer
+        /// to ensure that the bytes are never returned twice.
+        ///
+        /// An empty buffer returned indicates that the stream has reached EOF.
+        ///
+        /// Equivalent to:
+        ///
+        /// ```ignore
+        /// async fn fill_buf(&mut self) -> io::Result<&[u8]>;
+        /// ```
+        ///
+        /// # Errors
+        ///
+        /// This function will return an I/O error if the underlying reader was
+        /// read, but returned an error.
+        ///
+        /// [`consume`]: crate::io::AsyncBufReadExt::consume
+        fn fill_buf(&mut self) -> FillBuf<'_, Self>
+        where
+            Self: Unpin,
+        {
+            fill_buf(self)
+        }
+
+        /// Tells this buffer that `amt` bytes have been consumed from the
+        /// buffer, so they should no longer be returned in calls to [`read`].
+        ///
+        /// This function is a lower-level call. It needs to be paired with the
+        /// [`fill_buf`] method to function properly. This function does not
+        /// perform any I/O, it simply informs this object that some amount of
+        /// its buffer, returned from [`fill_buf`], has been consumed and should
+        /// no longer be returned. As such, this function may do odd things if
+        /// [`fill_buf`] isn't called before calling it.
+        ///
+        /// The `amt` must be less than the number of bytes in the buffer
+        /// returned by [`fill_buf`].
+        ///
+        /// [`read`]: crate::io::AsyncReadExt::read
+        /// [`fill_buf`]: crate::io::AsyncBufReadExt::fill_buf
+        fn consume(&mut self, amt: usize)
+        where
+            Self: Unpin,
+        {
+            std::pin::Pin::new(self).consume(amt)
+        }
+
         /// Returns a stream over the lines of this reader.
         /// This method is the async equivalent to [`BufRead::lines`](std::io::BufRead::lines).
         ///
         /// The stream returned from this function will yield instances of
-        /// [`io::Result`]`<`[`String`]`>`. Each string returned will *not* have a newline
+        /// [`io::Result`]`<`[`Option`]`<`[`String`]`>>`. Each string returned will *not* have a newline
         /// byte (the 0xA byte) or CRLF (0xD, 0xA bytes) at the end.
         ///
         /// [`io::Result`]: std::io::Result
+        /// [`Option`]: core::option::Option
         /// [`String`]: String
         ///
         /// # Errors
@@ -228,7 +322,6 @@
         ///
         /// ```
         /// use tokio::io::AsyncBufReadExt;
-        /// use tokio::stream::StreamExt;
         ///
         /// use std::io::Cursor;
         ///
@@ -236,12 +329,12 @@
         /// async fn main() {
         ///     let cursor = Cursor::new(b"lorem\nipsum\r\ndolor");
         ///
-        ///     let mut lines = cursor.lines().map(|res| res.unwrap());
+        ///     let mut lines = cursor.lines();
         ///
-        ///     assert_eq!(lines.next().await, Some(String::from("lorem")));
-        ///     assert_eq!(lines.next().await, Some(String::from("ipsum")));
-        ///     assert_eq!(lines.next().await, Some(String::from("dolor")));
-        ///     assert_eq!(lines.next().await, None);
+        ///     assert_eq!(lines.next_line().await.unwrap(), Some(String::from("lorem")));
+        ///     assert_eq!(lines.next_line().await.unwrap(), Some(String::from("ipsum")));
+        ///     assert_eq!(lines.next_line().await.unwrap(), Some(String::from("dolor")));
+        ///     assert_eq!(lines.next_line().await.unwrap(), None);
         /// }
         /// ```
         ///
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/async_read_ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/async_read_ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/async_read_ext.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/async_read_ext.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,7 @@
 use crate::io::util::read::{read, Read};
 use crate::io::util::read_buf::{read_buf, ReadBuf};
 use crate::io::util::read_exact::{read_exact, ReadExact};
+use crate::io::util::read_int::{ReadF32, ReadF32Le, ReadF64, ReadF64Le};
 use crate::io::util::read_int::{
     ReadI128, ReadI128Le, ReadI16, ReadI16Le, ReadI32, ReadI32Le, ReadI64, ReadI64Le, ReadI8,
 };
@@ -35,15 +36,13 @@
 
     /// Reads bytes from a source.
     ///
-    /// Implemented as an extention trait, adding utility methods to all
+    /// Implemented as an extension trait, adding utility methods to all
     /// [`AsyncRead`] types. Callers will tend to import this trait instead of
     /// [`AsyncRead`].
     ///
-    /// As a convenience, this trait may be imported using the [`prelude`]:
-    ///
     /// ```no_run
     /// use tokio::fs::File;
-    /// use tokio::prelude::*;
+    /// use tokio::io::{self, AsyncReadExt};
     ///
     /// #[tokio::main]
     /// async fn main() -> io::Result<()> {
@@ -60,7 +59,6 @@
     /// See [module][crate::io] documentation for more details.
     ///
     /// [`AsyncRead`]: AsyncRead
-    /// [`prelude`]: crate::prelude
     pub trait AsyncReadExt: AsyncRead {
         /// Creates a new `AsyncRead` instance that chains this stream with
         /// `next`.
@@ -108,8 +106,10 @@
         /// async fn read(&mut self, buf: &mut [u8]) -> io::Result<usize>;
         /// ```
         ///
-        /// This function does not provide any guarantees about whether it
-        /// completes immediately or asynchronously
+        /// This method does not provide any guarantees about whether it
+        /// completes immediately or asynchronously.
+        ///
+        /// # Return
         ///
         /// If the return value of this method is `Ok(n)`, then it must be
         /// guaranteed that `0 <= n <= buf.len()`. A nonzero `n` value indicates
@@ -139,6 +139,12 @@
         /// variant will be returned. If an error is returned then it must be
         /// guaranteed that no bytes were read.
         ///
+        /// # Cancel safety
+        ///
+        /// This method is cancel safe. If you use it as the event in a
+        /// [`tokio::select!`](crate::select) statement and some other branch
+        /// completes first, then it is guaranteed that no data was read.
+        ///
         /// # Examples
         ///
         /// [`File`][crate::fs::File]s implement `Read`:
@@ -178,14 +184,19 @@
         /// Usually, only a single `read` syscall is issued, even if there is
         /// more space in the supplied buffer.
         ///
-        /// This function does not provide any guarantees about whether it
-        /// completes immediately or asynchronously
+        /// This method does not provide any guarantees about whether it
+        /// completes immediately or asynchronously.
         ///
         /// # Return
         ///
-        /// On a successful read, the number of read bytes is returned. If the
-        /// supplied buffer is not empty and the function returns `Ok(0)` then
-        /// the source as reached an "end-of-file" event.
+        /// A nonzero `n` value indicates that the buffer `buf` has been filled
+        /// in with `n` bytes of data from this source. If `n` is `0`, then it
+        /// can indicate one of two scenarios:
+        ///
+        /// 1. This reader has reached its "end of file" and will likely no longer
+        ///    be able to produce bytes. Note that this does not mean that the
+        ///    reader will *always* no longer be able to produce bytes.
+        /// 2. The buffer specified had a remaining capacity of zero.
         ///
         /// # Errors
         ///
@@ -193,6 +204,12 @@
         /// variant will be returned. If an error is returned then it must be
         /// guaranteed that no bytes were read.
         ///
+        /// # Cancel safety
+        ///
+        /// This method is cancel safe. If you use it as the event in a
+        /// [`tokio::select!`](crate::select) statement and some other branch
+        /// completes first, then it is guaranteed that no data was read.
+        ///
         /// # Examples
         ///
         /// [`File`] implements `Read` and [`BytesMut`] implements [`BufMut`]:
@@ -257,6 +274,13 @@
         /// it has read, but it will never read more than would be necessary to
         /// completely fill the buffer.
         ///
+        /// # Cancel safety
+        ///
+        /// This method is not cancellation safe. If the method is used as the
+        /// event in a [`tokio::select!`](crate::select) statement and some
+        /// other branch completes first, then some data may already have been
+        /// read into `buf`.
+        ///
         /// # Examples
         ///
         /// [`File`][crate::fs::File]s implement `Read`:
@@ -582,7 +606,7 @@
             /// async fn main() -> io::Result<()> {
             ///     let mut reader = Cursor::new(vec![0x80, 0, 0, 0, 0, 0, 0, 0]);
             ///
-            ///     assert_eq!(i64::min_value(), reader.read_i64().await?);
+            ///     assert_eq!(i64::MIN, reader.read_i64().await?);
             ///     Ok(())
             /// }
             /// ```
@@ -662,12 +686,88 @@
             ///         0, 0, 0, 0, 0, 0, 0, 0
             ///     ]);
             ///
-            ///     assert_eq!(i128::min_value(), reader.read_i128().await?);
+            ///     assert_eq!(i128::MIN, reader.read_i128().await?);
             ///     Ok(())
             /// }
             /// ```
             fn read_i128(&mut self) -> ReadI128;
 
+            /// Reads an 32-bit floating point type in big-endian order from the
+            /// underlying reader.
+            ///
+            /// Equivalent to:
+            ///
+            /// ```ignore
+            /// async fn read_f32(&mut self) -> io::Result<f32>;
+            /// ```
+            ///
+            /// It is recommended to use a buffered reader to avoid excessive
+            /// syscalls.
+            ///
+            /// # Errors
+            ///
+            /// This method returns the same errors as [`AsyncReadExt::read_exact`].
+            ///
+            /// [`AsyncReadExt::read_exact`]: AsyncReadExt::read_exact
+            ///
+            /// # Examples
+            ///
+            /// Read 32-bit floating point type from a `AsyncRead`:
+            ///
+            /// ```rust
+            /// use tokio::io::{self, AsyncReadExt};
+            ///
+            /// use std::io::Cursor;
+            ///
+            /// #[tokio::main]
+            /// async fn main() -> io::Result<()> {
+            ///     let mut reader = Cursor::new(vec![0xff, 0x7f, 0xff, 0xff]);
+            ///
+            ///     assert_eq!(f32::MIN, reader.read_f32().await?);
+            ///     Ok(())
+            /// }
+            /// ```
+            fn read_f32(&mut self) -> ReadF32;
+
+            /// Reads an 64-bit floating point type in big-endian order from the
+            /// underlying reader.
+            ///
+            /// Equivalent to:
+            ///
+            /// ```ignore
+            /// async fn read_f64(&mut self) -> io::Result<f64>;
+            /// ```
+            ///
+            /// It is recommended to use a buffered reader to avoid excessive
+            /// syscalls.
+            ///
+            /// # Errors
+            ///
+            /// This method returns the same errors as [`AsyncReadExt::read_exact`].
+            ///
+            /// [`AsyncReadExt::read_exact`]: AsyncReadExt::read_exact
+            ///
+            /// # Examples
+            ///
+            /// Read 64-bit floating point type from a `AsyncRead`:
+            ///
+            /// ```rust
+            /// use tokio::io::{self, AsyncReadExt};
+            ///
+            /// use std::io::Cursor;
+            ///
+            /// #[tokio::main]
+            /// async fn main() -> io::Result<()> {
+            ///     let mut reader = Cursor::new(vec![
+            ///         0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            ///     ]);
+            ///
+            ///     assert_eq!(f64::MIN, reader.read_f64().await?);
+            ///     Ok(())
+            /// }
+            /// ```
+            fn read_f64(&mut self) -> ReadF64;
+
             /// Reads an unsigned 16-bit integer in little-endian order from the
             /// underlying reader.
             ///
@@ -974,6 +1074,82 @@
             /// }
             /// ```
             fn read_i128_le(&mut self) -> ReadI128Le;
+
+            /// Reads an 32-bit floating point type in little-endian order from the
+            /// underlying reader.
+            ///
+            /// Equivalent to:
+            ///
+            /// ```ignore
+            /// async fn read_f32_le(&mut self) -> io::Result<f32>;
+            /// ```
+            ///
+            /// It is recommended to use a buffered reader to avoid excessive
+            /// syscalls.
+            ///
+            /// # Errors
+            ///
+            /// This method returns the same errors as [`AsyncReadExt::read_exact`].
+            ///
+            /// [`AsyncReadExt::read_exact`]: AsyncReadExt::read_exact
+            ///
+            /// # Examples
+            ///
+            /// Read 32-bit floating point type from a `AsyncRead`:
+            ///
+            /// ```rust
+            /// use tokio::io::{self, AsyncReadExt};
+            ///
+            /// use std::io::Cursor;
+            ///
+            /// #[tokio::main]
+            /// async fn main() -> io::Result<()> {
+            ///     let mut reader = Cursor::new(vec![0xff, 0xff, 0x7f, 0xff]);
+            ///
+            ///     assert_eq!(f32::MIN, reader.read_f32_le().await?);
+            ///     Ok(())
+            /// }
+            /// ```
+            fn read_f32_le(&mut self) -> ReadF32Le;
+
+            /// Reads an 64-bit floating point type in little-endian order from the
+            /// underlying reader.
+            ///
+            /// Equivalent to:
+            ///
+            /// ```ignore
+            /// async fn read_f64_le(&mut self) -> io::Result<f64>;
+            /// ```
+            ///
+            /// It is recommended to use a buffered reader to avoid excessive
+            /// syscalls.
+            ///
+            /// # Errors
+            ///
+            /// This method returns the same errors as [`AsyncReadExt::read_exact`].
+            ///
+            /// [`AsyncReadExt::read_exact`]: AsyncReadExt::read_exact
+            ///
+            /// # Examples
+            ///
+            /// Read 64-bit floating point type from a `AsyncRead`:
+            ///
+            /// ```rust
+            /// use tokio::io::{self, AsyncReadExt};
+            ///
+            /// use std::io::Cursor;
+            ///
+            /// #[tokio::main]
+            /// async fn main() -> io::Result<()> {
+            ///     let mut reader = Cursor::new(vec![
+            ///         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff
+            ///     ]);
+            ///
+            ///     assert_eq!(f64::MIN, reader.read_f64_le().await?);
+            ///     Ok(())
+            /// }
+            /// ```
+            fn read_f64_le(&mut self) -> ReadF64Le;
         }
 
         /// Reads all bytes until EOF in this source, placing them into `buf`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/async_seek_ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/async_seek_ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/async_seek_ext.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/async_seek_ext.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,65 +2,81 @@
 use crate::io::AsyncSeek;
 use std::io::SeekFrom;
 
-/// An extension trait which adds utility methods to [`AsyncSeek`] types.
-///
-/// As a convenience, this trait may be imported using the [`prelude`]:
-///
-/// # Examples
-///
-/// ```
-/// use std::io::{Cursor, SeekFrom};
-/// use tokio::prelude::*;
-///
-/// #[tokio::main]
-/// async fn main() -> io::Result<()> {
-///     let mut cursor = Cursor::new(b"abcdefg");
-///
-///     // the `seek` method is defined by this trait
-///     cursor.seek(SeekFrom::Start(3)).await?;
-///
-///     let mut buf = [0; 1];
-///     let n = cursor.read(&mut buf).await?;
-///     assert_eq!(n, 1);
-///     assert_eq!(buf, [b'd']);
-///
-///     Ok(())
-/// }
-/// ```
-///
-/// See [module][crate::io] documentation for more details.
-///
-/// [`AsyncSeek`]: AsyncSeek
-/// [`prelude`]: crate::prelude
-pub trait AsyncSeekExt: AsyncSeek {
-    /// Creates a future which will seek an IO object, and then yield the
-    /// new position in the object and the object itself.
-    ///
-    /// In the case of an error the buffer and the object will be discarded, with
-    /// the error yielded.
+cfg_io_util! {
+    /// An extension trait that adds utility methods to [`AsyncSeek`] types.
     ///
     /// # Examples
     ///
-    /// ```no_run
-    /// use tokio::fs::File;
-    /// use tokio::prelude::*;
-    ///
-    /// use std::io::SeekFrom;
-    ///
-    /// # async fn dox() -> std::io::Result<()> {
-    /// let mut file = File::open("foo.txt").await?;
-    /// file.seek(SeekFrom::Start(6)).await?;
-    ///
-    /// let mut contents = vec![0u8; 10];
-    /// file.read_exact(&mut contents).await?;
-    /// # Ok(())
-    /// # }
     /// ```
-    fn seek(&mut self, pos: SeekFrom) -> Seek<'_, Self>
-    where
-        Self: Unpin,
-    {
-        seek(self, pos)
+    /// use std::io::{self, Cursor, SeekFrom};
+    /// use tokio::io::{AsyncSeekExt, AsyncReadExt};
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let mut cursor = Cursor::new(b"abcdefg");
+    ///
+    ///     // the `seek` method is defined by this trait
+    ///     cursor.seek(SeekFrom::Start(3)).await?;
+    ///
+    ///     let mut buf = [0; 1];
+    ///     let n = cursor.read(&mut buf).await?;
+    ///     assert_eq!(n, 1);
+    ///     assert_eq!(buf, [b'd']);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// See [module][crate::io] documentation for more details.
+    ///
+    /// [`AsyncSeek`]: AsyncSeek
+    pub trait AsyncSeekExt: AsyncSeek {
+        /// Creates a future which will seek an IO object, and then yield the
+        /// new position in the object and the object itself.
+        ///
+        /// Equivalent to:
+        ///
+        /// ```ignore
+        /// async fn seek(&mut self, pos: SeekFrom) -> io::Result<u64>;
+        /// ```
+        ///
+        /// In the case of an error the buffer and the object will be discarded, with
+        /// the error yielded.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::fs::File;
+        /// use tokio::io::{AsyncSeekExt, AsyncReadExt};
+        ///
+        /// use std::io::SeekFrom;
+        ///
+        /// # async fn dox() -> std::io::Result<()> {
+        /// let mut file = File::open("foo.txt").await?;
+        /// file.seek(SeekFrom::Start(6)).await?;
+        ///
+        /// let mut contents = vec![0u8; 10];
+        /// file.read_exact(&mut contents).await?;
+        /// # Ok(())
+        /// # }
+        /// ```
+        fn seek(&mut self, pos: SeekFrom) -> Seek<'_, Self>
+        where
+            Self: Unpin,
+        {
+            seek(self, pos)
+        }
+
+        /// Creates a future which will return the current seek position from the
+        /// start of the stream.
+        ///
+        /// This is equivalent to `self.seek(SeekFrom::Current(0))`.
+        fn stream_position(&mut self) -> Seek<'_, Self>
+        where
+            Self: Unpin,
+        {
+            self.seek(SeekFrom::Current(0))
+        }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/async_write_ext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/async_write_ext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/async_write_ext.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/async_write_ext.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,9 @@
 use crate::io::util::shutdown::{shutdown, Shutdown};
 use crate::io::util::write::{write, Write};
 use crate::io::util::write_all::{write_all, WriteAll};
+use crate::io::util::write_all_buf::{write_all_buf, WriteAllBuf};
 use crate::io::util::write_buf::{write_buf, WriteBuf};
+use crate::io::util::write_int::{WriteF32, WriteF32Le, WriteF64, WriteF64Le};
 use crate::io::util::write_int::{
     WriteI128, WriteI128Le, WriteI16, WriteI16Le, WriteI32, WriteI32Le, WriteI64, WriteI64Le,
     WriteI8,
@@ -11,7 +13,9 @@
     WriteU128, WriteU128Le, WriteU16, WriteU16Le, WriteU32, WriteU32Le, WriteU64, WriteU64Le,
     WriteU8,
 };
+use crate::io::util::write_vectored::{write_vectored, WriteVectored};
 use crate::io::AsyncWrite;
+use std::io::IoSlice;
 
 use bytes::Buf;
 
@@ -35,14 +39,12 @@
 
     /// Writes bytes to a sink.
     ///
-    /// Implemented as an extention trait, adding utility methods to all
+    /// Implemented as an extension trait, adding utility methods to all
     /// [`AsyncWrite`] types. Callers will tend to import this trait instead of
     /// [`AsyncWrite`].
     ///
-    /// As a convenience, this trait may be imported using the [`prelude`]:
-    ///
     /// ```no_run
-    /// use tokio::prelude::*;
+    /// use tokio::io::{self, AsyncWriteExt};
     /// use tokio::fs::File;
     ///
     /// #[tokio::main]
@@ -64,7 +66,6 @@
     /// See [module][crate::io] documentation for more details.
     ///
     /// [`AsyncWrite`]: AsyncWrite
-    /// [`prelude`]: crate::prelude
     pub trait AsyncWriteExt: AsyncWrite {
         /// Writes a buffer into this writer, returning how many bytes were
         /// written.
@@ -97,6 +98,13 @@
         /// It is **not** considered an error if the entire buffer could not be
         /// written to this writer.
         ///
+        /// # Cancel safety
+        ///
+        /// This method is cancellation safe in the sense that if it is used as
+        /// the event in a [`tokio::select!`](crate::select) statement and some
+        /// other branch completes first, then it is guaranteed that no data was
+        /// written to this `AsyncWrite`.
+        ///
         /// # Examples
         ///
         /// ```no_run
@@ -119,6 +127,54 @@
             write(self, src)
         }
 
+        /// Like [`write`], except that it writes from a slice of buffers.
+        ///
+        /// Equivalent to:
+        ///
+        /// ```ignore
+        /// async fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize>;
+        /// ```
+        ///
+        /// See [`AsyncWrite::poll_write_vectored`] for more details.
+        ///
+        /// # Cancel safety
+        ///
+        /// This method is cancellation safe in the sense that if it is used as
+        /// the event in a [`tokio::select!`](crate::select) statement and some
+        /// other branch completes first, then it is guaranteed that no data was
+        /// written to this `AsyncWrite`.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::io::{self, AsyncWriteExt};
+        /// use tokio::fs::File;
+        /// use std::io::IoSlice;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> io::Result<()> {
+        ///     let mut file = File::create("foo.txt").await?;
+        ///
+        ///     let bufs: &[_] = &[
+        ///         IoSlice::new(b"hello"),
+        ///         IoSlice::new(b" "),
+        ///         IoSlice::new(b"world"),
+        ///     ];
+        ///
+        ///     file.write_vectored(&bufs).await?;
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        ///
+        /// [`write`]: AsyncWriteExt::write
+        fn write_vectored<'a, 'b>(&'a mut self, bufs: &'a [IoSlice<'b>]) -> WriteVectored<'a, 'b, Self>
+        where
+            Self: Unpin,
+        {
+            write_vectored(self, bufs)
+        }
+
         /// Writes a buffer into this writer, advancing the buffer's internal
         /// cursor.
         ///
@@ -134,7 +190,7 @@
         /// internal cursor is advanced by the number of bytes written. A
         /// subsequent call to `write_buf` using the **same** `buf` value will
         /// resume from the point that the first call to `write_buf` completed.
-        /// A call to `write` represents *at most one* attempt to write to any
+        /// A call to `write_buf` represents *at most one* attempt to write to any
         /// wrapped object.
         ///
         /// # Return
@@ -154,12 +210,20 @@
         /// It is **not** considered an error if the entire buffer could not be
         /// written to this writer.
         ///
+        /// # Cancel safety
+        ///
+        /// This method is cancellation safe in the sense that if it is used as
+        /// the event in a [`tokio::select!`](crate::select) statement and some
+        /// other branch completes first, then it is guaranteed that no data was
+        /// written to this `AsyncWrite`.
+        ///
         /// # Examples
         ///
-        /// [`File`] implements `Read` and [`Cursor<&[u8]>`] implements [`Buf`]:
+        /// [`File`] implements [`AsyncWrite`] and [`Cursor`]`<&[u8]>` implements [`Buf`]:
         ///
         /// [`File`]: crate::fs::File
         /// [`Buf`]: bytes::Buf
+        /// [`Cursor`]: std::io::Cursor
         ///
         /// ```no_run
         /// use tokio::io::{self, AsyncWriteExt};
@@ -192,6 +256,70 @@
             write_buf(self, src)
         }
 
+        /// Attempts to write an entire buffer into this writer
+        ///
+        /// Equivalent to:
+        ///
+        /// ```ignore
+        /// async fn write_all_buf(&mut self, buf: impl Buf) -> Result<(), io::Error> {
+        ///     while buf.has_remaining() {
+        ///         self.write_buf(&mut buf).await?;
+        ///     }
+        ///     Ok(())
+        /// }
+        /// ```
+        ///
+        /// This method will continuously call [`write`] until
+        /// [`buf.has_remaining()`](bytes::Buf::has_remaining) returns false. This method will not
+        /// return until the entire buffer has been successfully written or an error occurs. The
+        /// first error generated will be returned.
+        ///
+        /// The buffer is advanced after each chunk is successfully written. After failure,
+        /// `src.chunk()` will return the chunk that failed to write.
+        ///
+        /// # Cancel safety
+        ///
+        /// If `write_all_buf` is used as the event in a
+        /// [`tokio::select!`](crate::select) statement and some other branch
+        /// completes first, then the data in the provided buffer may have been
+        /// partially written. However, it is guaranteed that the provided
+        /// buffer has been [advanced] by the amount of bytes that have been
+        /// partially written.
+        ///
+        /// # Examples
+        ///
+        /// [`File`] implements [`AsyncWrite`] and [`Cursor`]`<&[u8]>` implements [`Buf`]:
+        ///
+        /// [`File`]: crate::fs::File
+        /// [`Buf`]: bytes::Buf
+        /// [`Cursor`]: std::io::Cursor
+        /// [advanced]: bytes::Buf::advance
+        ///
+        /// ```no_run
+        /// use tokio::io::{self, AsyncWriteExt};
+        /// use tokio::fs::File;
+        ///
+        /// use std::io::Cursor;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> io::Result<()> {
+        ///     let mut file = File::create("foo.txt").await?;
+        ///     let mut buffer = Cursor::new(b"data to write");
+        ///
+        ///     file.write_all_buf(&mut buffer).await?;
+        ///     Ok(())
+        /// }
+        /// ```
+        ///
+        /// [`write`]: AsyncWriteExt::write
+        fn write_all_buf<'a, B>(&'a mut self, src: &'a mut B) -> WriteAllBuf<'a, Self, B>
+        where
+            Self: Sized + Unpin,
+            B: Buf,
+        {
+            write_all_buf(self, src)
+        }
+
         /// Attempts to write an entire buffer into this writer.
         ///
         /// Equivalent to:
@@ -205,6 +333,14 @@
         /// has been successfully written or such an error occurs. The first
         /// error generated from this method will be returned.
         ///
+        /// # Cancel safety
+        ///
+        /// This method is not cancellation safe. If it is used as the event
+        /// in a [`tokio::select!`](crate::select) statement and some other
+        /// branch completes first, then the provided buffer may have been
+        /// partially written, but future calls to `write_all` will start over
+        /// from the beginning of the buffer.
+        ///
         /// # Errors
         ///
         /// This function will return the first error that [`write`] returns.
@@ -526,8 +662,8 @@
             /// async fn main() -> io::Result<()> {
             ///     let mut writer = Vec::new();
             ///
-            ///     writer.write_i64(i64::min_value()).await?;
-            ///     writer.write_i64(i64::max_value()).await?;
+            ///     writer.write_i64(i64::MIN).await?;
+            ///     writer.write_i64(i64::MAX).await?;
             ///
             ///     assert_eq!(writer, b"\x80\x00\x00\x00\x00\x00\x00\x00\x7f\xff\xff\xff\xff\xff\xff\xff");
             ///     Ok(())
@@ -604,7 +740,7 @@
             /// async fn main() -> io::Result<()> {
             ///     let mut writer = Vec::new();
             ///
-            ///     writer.write_i128(i128::min_value()).await?;
+            ///     writer.write_i128(i128::MIN).await?;
             ///
             ///     assert_eq!(writer, vec![
             ///         0x80, 0, 0, 0, 0, 0, 0, 0,
@@ -615,6 +751,81 @@
             /// ```
             fn write_i128(&mut self, n: i128) -> WriteI128;
 
+            /// Writes an 32-bit floating point type in big-endian order to the
+            /// underlying writer.
+            ///
+            /// Equivalent to:
+            ///
+            /// ```ignore
+            /// async fn write_f32(&mut self, n: f32) -> io::Result<()>;
+            /// ```
+            ///
+            /// It is recommended to use a buffered writer to avoid excessive
+            /// syscalls.
+            ///
+            /// # Errors
+            ///
+            /// This method returns the same errors as [`AsyncWriteExt::write_all`].
+            ///
+            /// [`AsyncWriteExt::write_all`]: AsyncWriteExt::write_all
+            ///
+            /// # Examples
+            ///
+            /// Write 32-bit floating point type to a `AsyncWrite`:
+            ///
+            /// ```rust
+            /// use tokio::io::{self, AsyncWriteExt};
+            ///
+            /// #[tokio::main]
+            /// async fn main() -> io::Result<()> {
+            ///     let mut writer = Vec::new();
+            ///
+            ///     writer.write_f32(f32::MIN).await?;
+            ///
+            ///     assert_eq!(writer, vec![0xff, 0x7f, 0xff, 0xff]);
+            ///     Ok(())
+            /// }
+            /// ```
+            fn write_f32(&mut self, n: f32) -> WriteF32;
+
+            /// Writes an 64-bit floating point type in big-endian order to the
+            /// underlying writer.
+            ///
+            /// Equivalent to:
+            ///
+            /// ```ignore
+            /// async fn write_f64(&mut self, n: f64) -> io::Result<()>;
+            /// ```
+            ///
+            /// It is recommended to use a buffered writer to avoid excessive
+            /// syscalls.
+            ///
+            /// # Errors
+            ///
+            /// This method returns the same errors as [`AsyncWriteExt::write_all`].
+            ///
+            /// [`AsyncWriteExt::write_all`]: AsyncWriteExt::write_all
+            ///
+            /// # Examples
+            ///
+            /// Write 64-bit floating point type to a `AsyncWrite`:
+            ///
+            /// ```rust
+            /// use tokio::io::{self, AsyncWriteExt};
+            ///
+            /// #[tokio::main]
+            /// async fn main() -> io::Result<()> {
+            ///     let mut writer = Vec::new();
+            ///
+            ///     writer.write_f64(f64::MIN).await?;
+            ///
+            ///     assert_eq!(writer, vec![
+            ///         0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            ///     ]);
+            ///     Ok(())
+            /// }
+            /// ```
+            fn write_f64(&mut self, n: f64) -> WriteF64;
 
             /// Writes an unsigned 16-bit integer in little-endian order to the
             /// underlying writer.
@@ -835,8 +1046,8 @@
             /// async fn main() -> io::Result<()> {
             ///     let mut writer = Vec::new();
             ///
-            ///     writer.write_i64_le(i64::min_value()).await?;
-            ///     writer.write_i64_le(i64::max_value()).await?;
+            ///     writer.write_i64_le(i64::MIN).await?;
+            ///     writer.write_i64_le(i64::MAX).await?;
             ///
             ///     assert_eq!(writer, b"\x00\x00\x00\x00\x00\x00\x00\x80\xff\xff\xff\xff\xff\xff\xff\x7f");
             ///     Ok(())
@@ -913,7 +1124,7 @@
             /// async fn main() -> io::Result<()> {
             ///     let mut writer = Vec::new();
             ///
-            ///     writer.write_i128_le(i128::min_value()).await?;
+            ///     writer.write_i128_le(i128::MIN).await?;
             ///
             ///     assert_eq!(writer, vec![
             ///          0, 0, 0, 0, 0, 0, 0,
@@ -923,6 +1134,82 @@
             /// }
             /// ```
             fn write_i128_le(&mut self, n: i128) -> WriteI128Le;
+
+            /// Writes an 32-bit floating point type in little-endian order to the
+            /// underlying writer.
+            ///
+            /// Equivalent to:
+            ///
+            /// ```ignore
+            /// async fn write_f32_le(&mut self, n: f32) -> io::Result<()>;
+            /// ```
+            ///
+            /// It is recommended to use a buffered writer to avoid excessive
+            /// syscalls.
+            ///
+            /// # Errors
+            ///
+            /// This method returns the same errors as [`AsyncWriteExt::write_all`].
+            ///
+            /// [`AsyncWriteExt::write_all`]: AsyncWriteExt::write_all
+            ///
+            /// # Examples
+            ///
+            /// Write 32-bit floating point type to a `AsyncWrite`:
+            ///
+            /// ```rust
+            /// use tokio::io::{self, AsyncWriteExt};
+            ///
+            /// #[tokio::main]
+            /// async fn main() -> io::Result<()> {
+            ///     let mut writer = Vec::new();
+            ///
+            ///     writer.write_f32_le(f32::MIN).await?;
+            ///
+            ///     assert_eq!(writer, vec![0xff, 0xff, 0x7f, 0xff]);
+            ///     Ok(())
+            /// }
+            /// ```
+            fn write_f32_le(&mut self, n: f32) -> WriteF32Le;
+
+            /// Writes an 64-bit floating point type in little-endian order to the
+            /// underlying writer.
+            ///
+            /// Equivalent to:
+            ///
+            /// ```ignore
+            /// async fn write_f64_le(&mut self, n: f64) -> io::Result<()>;
+            /// ```
+            ///
+            /// It is recommended to use a buffered writer to avoid excessive
+            /// syscalls.
+            ///
+            /// # Errors
+            ///
+            /// This method returns the same errors as [`AsyncWriteExt::write_all`].
+            ///
+            /// [`AsyncWriteExt::write_all`]: AsyncWriteExt::write_all
+            ///
+            /// # Examples
+            ///
+            /// Write 64-bit floating point type to a `AsyncWrite`:
+            ///
+            /// ```rust
+            /// use tokio::io::{self, AsyncWriteExt};
+            ///
+            /// #[tokio::main]
+            /// async fn main() -> io::Result<()> {
+            ///     let mut writer = Vec::new();
+            ///
+            ///     writer.write_f64_le(f64::MIN).await?;
+            ///
+            ///     assert_eq!(writer, vec![
+            ///         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff
+            ///     ]);
+            ///     Ok(())
+            /// }
+            /// ```
+            fn write_f64_le(&mut self, n: f64) -> WriteF64Le;
         }
 
         /// Flushes this output stream, ensuring that all intermediately buffered
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/buf_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/buf_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/buf_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/buf_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,11 @@
 use crate::io::util::DEFAULT_BUF_SIZE;
-use crate::io::{AsyncBufRead, AsyncRead, AsyncWrite};
+use crate::io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite, ReadBuf};
 
-use bytes::Buf;
 use pin_project_lite::pin_project;
-use std::io::{self, Read};
-use std::mem::MaybeUninit;
+use std::io::{self, IoSlice, SeekFrom};
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use std::{cmp, fmt};
+use std::{cmp, fmt, mem};
 
 pin_project! {
     /// The `BufReader` struct adds buffering to any reader.
@@ -32,6 +30,7 @@
         pub(super) buf: Box<[u8]>,
         pub(super) pos: usize,
         pub(super) cap: usize,
+        pub(super) seek_state: SeekState,
     }
 }
 
@@ -44,21 +43,13 @@
 
     /// Creates a new `BufReader` with the specified buffer capacity.
     pub fn with_capacity(capacity: usize, inner: R) -> Self {
-        unsafe {
-            let mut buffer = Vec::with_capacity(capacity);
-            buffer.set_len(capacity);
-
-            {
-                // Convert to MaybeUninit
-                let b = &mut *(&mut buffer[..] as *mut [u8] as *mut [MaybeUninit<u8>]);
-                inner.prepare_uninitialized_buffer(b);
-            }
-            Self {
-                inner,
-                buf: buffer.into_boxed_slice(),
-                pos: 0,
-                cap: 0,
-            }
+        let buffer = vec![0; capacity];
+        Self {
+            inner,
+            buf: buffer.into_boxed_slice(),
+            pos: 0,
+            cap: 0,
+            seek_state: SeekState::Init,
         }
     }
 
@@ -110,25 +101,21 @@
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         // If we don't have any buffered data and we're doing a massive read
         // (larger than our internal buffer), bypass our internal buffer
         // entirely.
-        if self.pos == self.cap && buf.len() >= self.buf.len() {
+        if self.pos == self.cap && buf.remaining() >= self.buf.len() {
             let res = ready!(self.as_mut().get_pin_mut().poll_read(cx, buf));
             self.discard_buffer();
             return Poll::Ready(res);
         }
-        let mut rem = ready!(self.as_mut().poll_fill_buf(cx))?;
-        let nread = rem.read(buf)?;
-        self.consume(nread);
-        Poll::Ready(Ok(nread))
-    }
-
-    // we can't skip unconditionally because of the large buffer case in read.
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        self.inner.prepare_uninitialized_buffer(buf)
+        let rem = ready!(self.as_mut().poll_fill_buf(cx))?;
+        let amt = std::cmp::min(rem.len(), buf.remaining());
+        buf.put_slice(&rem[..amt]);
+        self.consume(amt);
+        Poll::Ready(Ok(()))
     }
 }
 
@@ -142,7 +129,9 @@
         // to tell the compiler that the pos..cap slice is always valid.
         if *me.pos >= *me.cap {
             debug_assert!(*me.pos == *me.cap);
-            *me.cap = ready!(me.inner.poll_read(cx, me.buf))?;
+            let mut buf = ReadBuf::new(me.buf);
+            ready!(me.inner.poll_read(cx, &mut buf))?;
+            *me.cap = buf.filled().len();
             *me.pos = 0;
         }
         Poll::Ready(Ok(&me.buf[*me.pos..*me.cap]))
@@ -154,6 +143,122 @@
     }
 }
 
+#[derive(Debug, Clone, Copy)]
+pub(super) enum SeekState {
+    /// start_seek has not been called.
+    Init,
+    /// start_seek has been called, but poll_complete has not yet been called.
+    Start(SeekFrom),
+    /// Waiting for completion of the first poll_complete in the `n.checked_sub(remainder).is_none()` branch.
+    PendingOverflowed(i64),
+    /// Waiting for completion of poll_complete.
+    Pending,
+}
+
+/// Seek to an offset, in bytes, in the underlying reader.
+///
+/// The position used for seeking with `SeekFrom::Current(_)` is the
+/// position the underlying reader would be at if the `BufReader` had no
+/// internal buffer.
+///
+/// Seeking always discards the internal buffer, even if the seek position
+/// would otherwise fall within it. This guarantees that calling
+/// `.into_inner()` immediately after a seek yields the underlying reader
+/// at the same position.
+///
+/// See [`AsyncSeek`] for more details.
+///
+/// Note: In the edge case where you're seeking with `SeekFrom::Current(n)`
+/// where `n` minus the internal buffer length overflows an `i64`, two
+/// seeks will be performed instead of one. If the second seek returns
+/// `Err`, the underlying reader will be left at the same position it would
+/// have if you called `seek` with `SeekFrom::Current(0)`.
+impl<R: AsyncRead + AsyncSeek> AsyncSeek for BufReader<R> {
+    fn start_seek(self: Pin<&mut Self>, pos: SeekFrom) -> io::Result<()> {
+        // We needs to call seek operation multiple times.
+        // And we should always call both start_seek and poll_complete,
+        // as start_seek alone cannot guarantee that the operation will be completed.
+        // poll_complete receives a Context and returns a Poll, so it cannot be called
+        // inside start_seek.
+        *self.project().seek_state = SeekState::Start(pos);
+        Ok(())
+    }
+
+    fn poll_complete(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
+        let res = match mem::replace(self.as_mut().project().seek_state, SeekState::Init) {
+            SeekState::Init => {
+                // 1.x AsyncSeek recommends calling poll_complete before start_seek.
+                // We don't have to guarantee that the value returned by
+                // poll_complete called without start_seek is correct,
+                // so we'll return 0.
+                return Poll::Ready(Ok(0));
+            }
+            SeekState::Start(SeekFrom::Current(n)) => {
+                let remainder = (self.cap - self.pos) as i64;
+                // it should be safe to assume that remainder fits within an i64 as the alternative
+                // means we managed to allocate 8 exbibytes and that's absurd.
+                // But it's not out of the realm of possibility for some weird underlying reader to
+                // support seeking by i64::MIN so we need to handle underflow when subtracting
+                // remainder.
+                if let Some(offset) = n.checked_sub(remainder) {
+                    self.as_mut()
+                        .get_pin_mut()
+                        .start_seek(SeekFrom::Current(offset))?;
+                    self.as_mut().get_pin_mut().poll_complete(cx)?
+                } else {
+                    // seek backwards by our remainder, and then by the offset
+                    self.as_mut()
+                        .get_pin_mut()
+                        .start_seek(SeekFrom::Current(-remainder))?;
+                    if self.as_mut().get_pin_mut().poll_complete(cx)?.is_pending() {
+                        *self.as_mut().project().seek_state = SeekState::PendingOverflowed(n);
+                        return Poll::Pending;
+                    }
+
+                    // https://github.com/rust-lang/rust/pull/61157#issuecomment-495932676
+                    self.as_mut().discard_buffer();
+
+                    self.as_mut()
+                        .get_pin_mut()
+                        .start_seek(SeekFrom::Current(n))?;
+                    self.as_mut().get_pin_mut().poll_complete(cx)?
+                }
+            }
+            SeekState::PendingOverflowed(n) => {
+                if self.as_mut().get_pin_mut().poll_complete(cx)?.is_pending() {
+                    *self.as_mut().project().seek_state = SeekState::PendingOverflowed(n);
+                    return Poll::Pending;
+                }
+
+                // https://github.com/rust-lang/rust/pull/61157#issuecomment-495932676
+                self.as_mut().discard_buffer();
+
+                self.as_mut()
+                    .get_pin_mut()
+                    .start_seek(SeekFrom::Current(n))?;
+                self.as_mut().get_pin_mut().poll_complete(cx)?
+            }
+            SeekState::Start(pos) => {
+                // Seeking with Start/End doesn't care about our buffer length.
+                self.as_mut().get_pin_mut().start_seek(pos)?;
+                self.as_mut().get_pin_mut().poll_complete(cx)?
+            }
+            SeekState::Pending => self.as_mut().get_pin_mut().poll_complete(cx)?,
+        };
+
+        match res {
+            Poll::Ready(res) => {
+                self.discard_buffer();
+                Poll::Ready(Ok(res))
+            }
+            Poll::Pending => {
+                *self.as_mut().project().seek_state = SeekState::Pending;
+                Poll::Pending
+            }
+        }
+    }
+}
+
 impl<R: AsyncRead + AsyncWrite> AsyncWrite for BufReader<R> {
     fn poll_write(
         self: Pin<&mut Self>,
@@ -163,12 +268,16 @@
         self.get_pin_mut().poll_write(cx, buf)
     }
 
-    fn poll_write_buf<B: Buf>(
+    fn poll_write_vectored(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut B,
+        bufs: &[IoSlice<'_>],
     ) -> Poll<io::Result<usize>> {
-        self.get_pin_mut().poll_write_buf(cx, buf)
+        self.get_pin_mut().poll_write_vectored(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        self.get_ref().is_write_vectored()
     }
 
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/buf_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/buf_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/buf_stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/buf_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,8 @@
 use crate::io::util::{BufReader, BufWriter};
-use crate::io::{AsyncBufRead, AsyncRead, AsyncWrite};
+use crate::io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite, ReadBuf};
 
 use pin_project_lite::pin_project;
-use std::io;
-use std::mem::MaybeUninit;
+use std::io::{self, IoSlice, SeekFrom};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
@@ -95,9 +94,11 @@
                     buf: rbuf,
                     pos,
                     cap,
+                    seek_state: rseek_state,
                 },
             buf: wbuf,
             written,
+            seek_state: wseek_state,
         } = b;
 
         BufStream {
@@ -106,10 +107,12 @@
                     inner,
                     buf: wbuf,
                     written,
+                    seek_state: wseek_state,
                 },
                 buf: rbuf,
                 pos,
                 cap,
+                seek_state: rseek_state,
             },
         }
     }
@@ -124,6 +127,18 @@
         self.project().inner.poll_write(cx, buf)
     }
 
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        self.project().inner.poll_write_vectored(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        self.inner.is_write_vectored()
+    }
+
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
         self.project().inner.poll_flush(cx)
     }
@@ -137,14 +152,37 @@
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.project().inner.poll_read(cx, buf)
     }
+}
+
+/// Seek to an offset, in bytes, in the underlying stream.
+///
+/// The position used for seeking with `SeekFrom::Current(_)` is the
+/// position the underlying stream would be at if the `BufStream` had no
+/// internal buffer.
+///
+/// Seeking always discards the internal buffer, even if the seek position
+/// would otherwise fall within it. This guarantees that calling
+/// `.into_inner()` immediately after a seek yields the underlying reader
+/// at the same position.
+///
+/// See [`AsyncSeek`] for more details.
+///
+/// Note: In the edge case where you're seeking with `SeekFrom::Current(n)`
+/// where `n` minus the internal buffer length overflows an `i64`, two
+/// seeks will be performed instead of one. If the second seek returns
+/// `Err`, the underlying reader will be left at the same position it would
+/// have if you called `seek` with `SeekFrom::Current(0)`.
+impl<RW: AsyncRead + AsyncWrite + AsyncSeek> AsyncSeek for BufStream<RW> {
+    fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> io::Result<()> {
+        self.project().inner.start_seek(position)
+    }
 
-    // we can't skip unconditionally because of the large buffer case in read.
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        self.inner.prepare_uninitialized_buffer(buf)
+    fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
+        self.project().inner.poll_complete(cx)
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/buf_writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/buf_writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/buf_writer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/buf_writer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,9 @@
 use crate::io::util::DEFAULT_BUF_SIZE;
-use crate::io::{AsyncBufRead, AsyncRead, AsyncWrite};
+use crate::io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite, ReadBuf};
 
 use pin_project_lite::pin_project;
 use std::fmt;
-use std::io::{self, Write};
-use std::mem::MaybeUninit;
+use std::io::{self, IoSlice, SeekFrom, Write};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
@@ -35,6 +34,7 @@
         pub(super) inner: W,
         pub(super) buf: Vec<u8>,
         pub(super) written: usize,
+        pub(super) seek_state: SeekState,
     }
 }
 
@@ -51,6 +51,7 @@
             inner,
             buf: Vec::with_capacity(cap),
             written: 0,
+            seek_state: SeekState::Init,
         }
     }
 
@@ -132,6 +133,72 @@
         }
     }
 
+    fn poll_write_vectored(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        mut bufs: &[IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        if self.inner.is_write_vectored() {
+            let total_len = bufs
+                .iter()
+                .fold(0usize, |acc, b| acc.saturating_add(b.len()));
+            if total_len > self.buf.capacity() - self.buf.len() {
+                ready!(self.as_mut().flush_buf(cx))?;
+            }
+            let me = self.as_mut().project();
+            if total_len >= me.buf.capacity() {
+                // It's more efficient to pass the slices directly to the
+                // underlying writer than to buffer them.
+                // The case when the total_len calculation saturates at
+                // usize::MAX is also handled here.
+                me.inner.poll_write_vectored(cx, bufs)
+            } else {
+                bufs.iter().for_each(|b| me.buf.extend_from_slice(b));
+                Poll::Ready(Ok(total_len))
+            }
+        } else {
+            // Remove empty buffers at the beginning of bufs.
+            while bufs.first().map(|buf| buf.len()) == Some(0) {
+                bufs = &bufs[1..];
+            }
+            if bufs.is_empty() {
+                return Poll::Ready(Ok(0));
+            }
+            // Flush if the first buffer doesn't fit.
+            let first_len = bufs[0].len();
+            if first_len > self.buf.capacity() - self.buf.len() {
+                ready!(self.as_mut().flush_buf(cx))?;
+                debug_assert!(self.buf.is_empty());
+            }
+            let me = self.as_mut().project();
+            if first_len >= me.buf.capacity() {
+                // The slice is at least as large as the buffering capacity,
+                // so it's better to write it directly, bypassing the buffer.
+                debug_assert!(me.buf.is_empty());
+                return me.inner.poll_write(cx, &bufs[0]);
+            } else {
+                me.buf.extend_from_slice(&bufs[0]);
+                bufs = &bufs[1..];
+            }
+            let mut total_written = first_len;
+            debug_assert!(total_written != 0);
+            // Append the buffers that fit in the internal buffer.
+            for buf in bufs {
+                if buf.len() > me.buf.capacity() - me.buf.len() {
+                    break;
+                } else {
+                    me.buf.extend_from_slice(buf);
+                    total_written += buf.len();
+                }
+            }
+            Poll::Ready(Ok(total_written))
+        }
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        true
+    }
+
     fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
         ready!(self.as_mut().flush_buf(cx))?;
         self.get_pin_mut().poll_flush(cx)
@@ -143,19 +210,70 @@
     }
 }
 
+#[derive(Debug, Clone, Copy)]
+pub(super) enum SeekState {
+    /// start_seek has not been called.
+    Init,
+    /// start_seek has been called, but poll_complete has not yet been called.
+    Start(SeekFrom),
+    /// Waiting for completion of poll_complete.
+    Pending,
+}
+
+/// Seek to the offset, in bytes, in the underlying writer.
+///
+/// Seeking always writes out the internal buffer before seeking.
+impl<W: AsyncWrite + AsyncSeek> AsyncSeek for BufWriter<W> {
+    fn start_seek(self: Pin<&mut Self>, pos: SeekFrom) -> io::Result<()> {
+        // We need to flush the internal buffer before seeking.
+        // It receives a `Context` and returns a `Poll`, so it cannot be called
+        // inside `start_seek`.
+        *self.project().seek_state = SeekState::Start(pos);
+        Ok(())
+    }
+
+    fn poll_complete(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
+        let pos = match self.seek_state {
+            SeekState::Init => {
+                return self.project().inner.poll_complete(cx);
+            }
+            SeekState::Start(pos) => Some(pos),
+            SeekState::Pending => None,
+        };
+
+        // Flush the internal buffer before seeking.
+        ready!(self.as_mut().flush_buf(cx))?;
+
+        let mut me = self.project();
+        if let Some(pos) = pos {
+            // Ensure previous seeks have finished before starting a new one
+            ready!(me.inner.as_mut().poll_complete(cx))?;
+            if let Err(e) = me.inner.as_mut().start_seek(pos) {
+                *me.seek_state = SeekState::Init;
+                return Poll::Ready(Err(e));
+            }
+        }
+        match me.inner.poll_complete(cx) {
+            Poll::Ready(res) => {
+                *me.seek_state = SeekState::Init;
+                Poll::Ready(res)
+            }
+            Poll::Pending => {
+                *me.seek_state = SeekState::Pending;
+                Poll::Pending
+            }
+        }
+    }
+}
+
 impl<W: AsyncWrite + AsyncRead> AsyncRead for BufWriter<W> {
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.get_pin_mut().poll_read(cx, buf)
     }
-
-    // we can't skip unconditionally because of the large buffer case in read.
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        self.get_ref().prepare_uninitialized_buffer(buf)
-    }
 }
 
 impl<W: AsyncWrite + AsyncBufRead> AsyncBufRead for BufWriter<W> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/chain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/chain.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use crate::io::{AsyncBufRead, AsyncRead};
+use crate::io::{AsyncBufRead, AsyncRead, ReadBuf};
 
 use pin_project_lite::pin_project;
 use std::fmt;
@@ -84,26 +84,20 @@
     T: AsyncRead,
     U: AsyncRead,
 {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        if self.first.prepare_uninitialized_buffer(buf) {
-            return true;
-        }
-        if self.second.prepare_uninitialized_buffer(buf) {
-            return true;
-        }
-        false
-    }
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         let me = self.project();
 
         if !*me.done_first {
-            match ready!(me.first.poll_read(cx, buf)?) {
-                0 if !buf.is_empty() => *me.done_first = true,
-                n => return Poll::Ready(Ok(n)),
+            let rem = buf.remaining();
+            ready!(me.first.poll_read(cx, buf))?;
+            if buf.remaining() == rem {
+                *me.done_first = true;
+            } else {
+                return Poll::Ready(Ok(()));
             }
         }
         me.second.poll_read(cx, buf)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/copy_bidirectional.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/copy_bidirectional.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/copy_bidirectional.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/copy_bidirectional.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,120 @@
+use super::copy::CopyBuffer;
+
+use crate::io::{AsyncRead, AsyncWrite};
+
+use std::future::Future;
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+enum TransferState {
+    Running(CopyBuffer),
+    ShuttingDown(u64),
+    Done(u64),
+}
+
+struct CopyBidirectional<'a, A: ?Sized, B: ?Sized> {
+    a: &'a mut A,
+    b: &'a mut B,
+    a_to_b: TransferState,
+    b_to_a: TransferState,
+}
+
+fn transfer_one_direction<A, B>(
+    cx: &mut Context<'_>,
+    state: &mut TransferState,
+    r: &mut A,
+    w: &mut B,
+) -> Poll<io::Result<u64>>
+where
+    A: AsyncRead + AsyncWrite + Unpin + ?Sized,
+    B: AsyncRead + AsyncWrite + Unpin + ?Sized,
+{
+    let mut r = Pin::new(r);
+    let mut w = Pin::new(w);
+
+    loop {
+        match state {
+            TransferState::Running(buf) => {
+                let count = ready!(buf.poll_copy(cx, r.as_mut(), w.as_mut()))?;
+                *state = TransferState::ShuttingDown(count);
+            }
+            TransferState::ShuttingDown(count) => {
+                ready!(w.as_mut().poll_shutdown(cx))?;
+
+                *state = TransferState::Done(*count);
+            }
+            TransferState::Done(count) => return Poll::Ready(Ok(*count)),
+        }
+    }
+}
+
+impl<'a, A, B> Future for CopyBidirectional<'a, A, B>
+where
+    A: AsyncRead + AsyncWrite + Unpin + ?Sized,
+    B: AsyncRead + AsyncWrite + Unpin + ?Sized,
+{
+    type Output = io::Result<(u64, u64)>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        // Unpack self into mut refs to each field to avoid borrow check issues.
+        let CopyBidirectional {
+            a,
+            b,
+            a_to_b,
+            b_to_a,
+        } = &mut *self;
+
+        let a_to_b = transfer_one_direction(cx, a_to_b, &mut *a, &mut *b)?;
+        let b_to_a = transfer_one_direction(cx, b_to_a, &mut *b, &mut *a)?;
+
+        // It is not a problem if ready! returns early because transfer_one_direction for the
+        // other direction will keep returning TransferState::Done(count) in future calls to poll
+        let a_to_b = ready!(a_to_b);
+        let b_to_a = ready!(b_to_a);
+
+        Poll::Ready(Ok((a_to_b, b_to_a)))
+    }
+}
+
+/// Copies data in both directions between `a` and `b`.
+///
+/// This function returns a future that will read from both streams,
+/// writing any data read to the opposing stream.
+/// This happens in both directions concurrently.
+///
+/// If an EOF is observed on one stream, [`shutdown()`] will be invoked on
+/// the other, and reading from that stream will stop. Copying of data in
+/// the other direction will continue.
+///
+/// The future will complete successfully once both directions of communication has been shut down.
+/// A direction is shut down when the reader reports EOF,
+/// at which point [`shutdown()`] is called on the corresponding writer. When finished,
+/// it will return a tuple of the number of bytes copied from a to b
+/// and the number of bytes copied from b to a, in that order.
+///
+/// [`shutdown()`]: crate::io::AsyncWriteExt::shutdown
+///
+/// # Errors
+///
+/// The future will immediately return an error if any IO operation on `a`
+/// or `b` returns an error. Some data read from either stream may be lost (not
+/// written to the other stream) in this case.
+///
+/// # Return value
+///
+/// Returns a tuple of bytes copied `a` to `b` and bytes copied `b` to `a`.
+#[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
+pub async fn copy_bidirectional<A, B>(a: &mut A, b: &mut B) -> Result<(u64, u64), std::io::Error>
+where
+    A: AsyncRead + AsyncWrite + Unpin + ?Sized,
+    B: AsyncRead + AsyncWrite + Unpin + ?Sized,
+{
+    CopyBidirectional {
+        a,
+        b,
+        a_to_b: TransferState::Running(CopyBuffer::new()),
+        b_to_a: TransferState::Running(CopyBuffer::new()),
+    }
+    .await
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/copy_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/copy_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/copy_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/copy_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,102 @@
+use crate::io::{AsyncBufRead, AsyncWrite};
+use std::future::Future;
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+cfg_io_util! {
+    /// A future that asynchronously copies the entire contents of a reader into a
+    /// writer.
+    ///
+    /// This struct is generally created by calling [`copy_buf`][copy_buf]. Please
+    /// see the documentation of `copy_buf()` for more details.
+    ///
+    /// [copy_buf]: copy_buf()
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    struct CopyBuf<'a, R: ?Sized, W: ?Sized> {
+        reader: &'a mut R,
+        writer: &'a mut W,
+        amt: u64,
+    }
+
+    /// Asynchronously copies the entire contents of a reader into a writer.
+    ///
+    /// This function returns a future that will continuously read data from
+    /// `reader` and then write it into `writer` in a streaming fashion until
+    /// `reader` returns EOF.
+    ///
+    /// On success, the total number of bytes that were copied from `reader` to
+    /// `writer` is returned.
+    ///
+    ///
+    /// # Errors
+    ///
+    /// The returned future will finish with an error will return an error
+    /// immediately if any call to `poll_fill_buf` or `poll_write` returns an
+    /// error.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::io;
+    ///
+    /// # async fn dox() -> std::io::Result<()> {
+    /// let mut reader: &[u8] = b"hello";
+    /// let mut writer: Vec<u8> = vec![];
+    ///
+    /// io::copy_buf(&mut reader, &mut writer).await?;
+    ///
+    /// assert_eq!(b"hello", &writer[..]);
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn copy_buf<'a, R, W>(reader: &'a mut R, writer: &'a mut W) -> io::Result<u64>
+    where
+        R: AsyncBufRead + Unpin + ?Sized,
+        W: AsyncWrite + Unpin + ?Sized,
+    {
+        CopyBuf {
+            reader,
+            writer,
+            amt: 0,
+        }.await
+    }
+}
+
+impl<R, W> Future for CopyBuf<'_, R, W>
+where
+    R: AsyncBufRead + Unpin + ?Sized,
+    W: AsyncWrite + Unpin + ?Sized,
+{
+    type Output = io::Result<u64>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        loop {
+            let me = &mut *self;
+            let buffer = ready!(Pin::new(&mut *me.reader).poll_fill_buf(cx))?;
+            if buffer.is_empty() {
+                ready!(Pin::new(&mut self.writer).poll_flush(cx))?;
+                return Poll::Ready(Ok(self.amt));
+            }
+
+            let i = ready!(Pin::new(&mut *me.writer).poll_write(cx, buffer))?;
+            if i == 0 {
+                return Poll::Ready(Err(std::io::ErrorKind::WriteZero.into()));
+            }
+            self.amt += i as u64;
+            Pin::new(&mut *self.reader).consume(i);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn assert_unpin() {
+        use std::marker::PhantomPinned;
+        crate::is_unpin::<CopyBuf<'_, PhantomPinned, PhantomPinned>>();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/copy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/copy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/copy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/copy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,110 @@
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 
 use std::future::Future;
 use std::io;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-cfg_io_util! {
-    /// A future that asynchronously copies the entire contents of a reader into a
-    /// writer.
-    ///
-    /// This struct is generally created by calling [`copy`][copy]. Please
-    /// see the documentation of `copy()` for more details.
-    ///
-    /// [copy]: copy()
-    #[derive(Debug)]
-    #[must_use = "futures do nothing unless you `.await` or poll them"]
-    pub struct Copy<'a, R: ?Sized, W: ?Sized> {
-        reader: &'a mut R,
-        read_done: bool,
-        writer: &'a mut W,
-        pos: usize,
-        cap: usize,
-        amt: u64,
-        buf: Box<[u8]>,
+#[derive(Debug)]
+pub(super) struct CopyBuffer {
+    read_done: bool,
+    need_flush: bool,
+    pos: usize,
+    cap: usize,
+    amt: u64,
+    buf: Box<[u8]>,
+}
+
+impl CopyBuffer {
+    pub(super) fn new() -> Self {
+        Self {
+            read_done: false,
+            need_flush: false,
+            pos: 0,
+            cap: 0,
+            amt: 0,
+            buf: vec![0; 2048].into_boxed_slice(),
+        }
+    }
+
+    pub(super) fn poll_copy<R, W>(
+        &mut self,
+        cx: &mut Context<'_>,
+        mut reader: Pin<&mut R>,
+        mut writer: Pin<&mut W>,
+    ) -> Poll<io::Result<u64>>
+    where
+        R: AsyncRead + ?Sized,
+        W: AsyncWrite + ?Sized,
+    {
+        loop {
+            // If our buffer is empty, then we need to read some data to
+            // continue.
+            if self.pos == self.cap && !self.read_done {
+                let me = &mut *self;
+                let mut buf = ReadBuf::new(&mut me.buf);
+
+                match reader.as_mut().poll_read(cx, &mut buf) {
+                    Poll::Ready(Ok(_)) => (),
+                    Poll::Ready(Err(err)) => return Poll::Ready(Err(err)),
+                    Poll::Pending => {
+                        // Try flushing when the reader has no progress to avoid deadlock
+                        // when the reader depends on buffered writer.
+                        if self.need_flush {
+                            ready!(writer.as_mut().poll_flush(cx))?;
+                            self.need_flush = false;
+                        }
+
+                        return Poll::Pending;
+                    }
+                }
+
+                let n = buf.filled().len();
+                if n == 0 {
+                    self.read_done = true;
+                } else {
+                    self.pos = 0;
+                    self.cap = n;
+                }
+            }
+
+            // If our buffer has some data, let's write it out!
+            while self.pos < self.cap {
+                let me = &mut *self;
+                let i = ready!(writer.as_mut().poll_write(cx, &me.buf[me.pos..me.cap]))?;
+                if i == 0 {
+                    return Poll::Ready(Err(io::Error::new(
+                        io::ErrorKind::WriteZero,
+                        "write zero byte into writer",
+                    )));
+                } else {
+                    self.pos += i;
+                    self.amt += i as u64;
+                    self.need_flush = true;
+                }
+            }
+
+            // If we've written all the data and we've seen EOF, flush out the
+            // data and finish the transfer.
+            if self.pos == self.cap && self.read_done {
+                ready!(writer.as_mut().poll_flush(cx))?;
+                return Poll::Ready(Ok(self.amt));
+            }
+        }
     }
+}
 
+/// A future that asynchronously copies the entire contents of a reader into a
+/// writer.
+#[derive(Debug)]
+#[must_use = "futures do nothing unless you `.await` or poll them"]
+struct Copy<'a, R: ?Sized, W: ?Sized> {
+    reader: &'a mut R,
+    writer: &'a mut W,
+    buf: CopyBuffer,
+}
+
+cfg_io_util! {
     /// Asynchronously copies the entire contents of a reader into a writer.
     ///
     /// This function returns a future that will continuously read data from
@@ -40,8 +120,8 @@
     ///
     /// # Errors
     ///
-    /// The returned future will finish with an error will return an error
-    /// immediately if any call to `poll_read` or `poll_write` returns an error.
+    /// The returned future will return an error immediately if any call to
+    /// `poll_read` or `poll_write` returns an error.
     ///
     /// # Examples
     ///
@@ -58,20 +138,16 @@
     /// # Ok(())
     /// # }
     /// ```
-    pub fn copy<'a, R, W>(reader: &'a mut R, writer: &'a mut W) -> Copy<'a, R, W>
+    pub async fn copy<'a, R, W>(reader: &'a mut R, writer: &'a mut W) -> io::Result<u64>
     where
         R: AsyncRead + Unpin + ?Sized,
         W: AsyncWrite + Unpin + ?Sized,
     {
         Copy {
             reader,
-            read_done: false,
             writer,
-            amt: 0,
-            pos: 0,
-            cap: 0,
-            buf: vec![0; 2048].into_boxed_slice(),
-        }
+            buf: CopyBuffer::new()
+        }.await
     }
 }
 
@@ -83,53 +159,9 @@
     type Output = io::Result<u64>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
-        loop {
-            // If our buffer is empty, then we need to read some data to
-            // continue.
-            if self.pos == self.cap && !self.read_done {
-                let me = &mut *self;
-                let n = ready!(Pin::new(&mut *me.reader).poll_read(cx, &mut me.buf))?;
-                if n == 0 {
-                    self.read_done = true;
-                } else {
-                    self.pos = 0;
-                    self.cap = n;
-                }
-            }
-
-            // If our buffer has some data, let's write it out!
-            while self.pos < self.cap {
-                let me = &mut *self;
-                let i = ready!(Pin::new(&mut *me.writer).poll_write(cx, &me.buf[me.pos..me.cap]))?;
-                if i == 0 {
-                    return Poll::Ready(Err(io::Error::new(
-                        io::ErrorKind::WriteZero,
-                        "write zero byte into writer",
-                    )));
-                } else {
-                    self.pos += i;
-                    self.amt += i as u64;
-                }
-            }
-
-            // If we've written all the data and we've seen EOF, flush out the
-            // data and finish the transfer.
-            if self.pos == self.cap && self.read_done {
-                let me = &mut *self;
-                ready!(Pin::new(&mut *me.writer).poll_flush(cx))?;
-                return Poll::Ready(Ok(self.amt));
-            }
-        }
-    }
-}
+        let me = &mut *self;
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<Copy<'_, PhantomPinned, PhantomPinned>>();
+        me.buf
+            .poll_copy(cx, Pin::new(&mut *me.reader), Pin::new(&mut *me.writer))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/empty.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/empty.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/empty.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/empty.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use crate::io::{AsyncBufRead, AsyncRead};
+use crate::io::{AsyncBufRead, AsyncRead, ReadBuf};
 
 use std::fmt;
 use std::io;
@@ -47,16 +47,13 @@
 }
 
 impl AsyncRead for Empty {
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        false
-    }
     #[inline]
     fn poll_read(
         self: Pin<&mut Self>,
         _: &mut Context<'_>,
-        _: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        Poll::Ready(Ok(0))
+        _: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        Poll::Ready(Ok(()))
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/fill_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/fill_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/fill_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/fill_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+use crate::io::AsyncBufRead;
+
+use pin_project_lite::pin_project;
+use std::future::Future;
+use std::io;
+use std::marker::PhantomPinned;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+pin_project! {
+    /// Future for the [`fill_buf`](crate::io::AsyncBufReadExt::fill_buf) method.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct FillBuf<'a, R: ?Sized> {
+        reader: Option<&'a mut R>,
+        #[pin]
+        _pin: PhantomPinned,
+    }
+}
+
+pub(crate) fn fill_buf<R>(reader: &mut R) -> FillBuf<'_, R>
+where
+    R: AsyncBufRead + ?Sized + Unpin,
+{
+    FillBuf {
+        reader: Some(reader),
+        _pin: PhantomPinned,
+    }
+}
+
+impl<'a, R: AsyncBufRead + ?Sized + Unpin> Future for FillBuf<'a, R> {
+    type Output = io::Result<&'a [u8]>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
+
+        let reader = me.reader.take().expect("Polled after completion.");
+        match Pin::new(&mut *reader).poll_fill_buf(cx) {
+            Poll::Ready(Ok(slice)) => unsafe {
+                // Safety: This is necessary only due to a limitation in the
+                // borrow checker. Once Rust starts using the polonius borrow
+                // checker, this can be simplified.
+                let slice = std::mem::transmute::<&[u8], &'a [u8]>(slice);
+                Poll::Ready(Ok(slice))
+            },
+            Poll::Ready(Err(err)) => Poll::Ready(Err(err)),
+            Poll::Pending => {
+                *me.reader = Some(reader);
+                Poll::Pending
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/flush.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/flush.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/flush.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/flush.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,24 @@
 use crate::io::AsyncWrite;
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-cfg_io_util! {
+pin_project! {
     /// A future used to fully flush an I/O object.
     ///
     /// Created by the [`AsyncWriteExt::flush`][flush] function.
     /// [flush]: crate::io::AsyncWriteExt::flush
     #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct Flush<'a, A: ?Sized> {
         a: &'a mut A,
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -21,7 +27,10 @@
 where
     A: AsyncWrite + Unpin + ?Sized,
 {
-    Flush { a }
+    Flush {
+        a,
+        _pin: PhantomPinned,
+    }
 }
 
 impl<A> Future for Flush<'_, A>
@@ -30,19 +39,8 @@
 {
     type Output = io::Result<()>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let me = &mut *self;
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
         Pin::new(&mut *me.a).poll_flush(cx)
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<Flush<'_, PhantomPinned>>();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/lines.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/lines.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/lines.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/lines.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,7 +8,15 @@
 use std::task::{Context, Poll};
 
 pin_project! {
-    /// Stream for the [`lines`](crate::io::AsyncBufReadExt::lines) method.
+    /// Read lines from an [`AsyncBufRead`].
+    ///
+    /// A `Lines` can be turned into a `Stream` with [`LinesStream`].
+    ///
+    /// This type is usually created using the [`lines`] method.
+    ///
+    /// [`AsyncBufRead`]: crate::io::AsyncBufRead
+    /// [`LinesStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.LinesStream.html
+    /// [`lines`]: crate::io::AsyncBufReadExt::lines
     #[derive(Debug)]
     #[must_use = "streams do nothing unless polled"]
     #[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
@@ -39,6 +47,10 @@
 {
     /// Returns the next line in the stream.
     ///
+    /// # Cancel safety
+    ///
+    /// This method is cancellation safe.
+    ///
     /// # Examples
     ///
     /// ```
@@ -83,7 +95,20 @@
 where
     R: AsyncBufRead,
 {
-    #[doc(hidden)]
+    /// Polls for the next line in the stream.
+    ///
+    /// This method returns:
+    ///
+    ///  * `Poll::Pending` if the next line is not yet available.
+    ///  * `Poll::Ready(Ok(Some(line)))` if the next line is available.
+    ///  * `Poll::Ready(Ok(None))` if there are no more lines in this stream.
+    ///  * `Poll::Ready(Err(err))` if an IO error occurred while reading the next line.
+    ///
+    /// When the method returns `Poll::Pending`, the `Waker` in the provided
+    /// `Context` is scheduled to receive a wakeup when more bytes become
+    /// available on the underlying IO resource.  Note that on multiple calls to
+    /// `poll_next_line`, only the `Waker` from the `Context` passed to the most
+    /// recent call is scheduled to receive a wakeup.
     pub fn poll_next_line(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -105,20 +130,7 @@
             }
         }
 
-        Poll::Ready(Ok(Some(mem::replace(me.buf, String::new()))))
-    }
-}
-
-#[cfg(feature = "stream")]
-impl<R: AsyncBufRead> crate::stream::Stream for Lines<R> {
-    type Item = io::Result<String>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        Poll::Ready(match ready!(self.poll_next_line(cx)) {
-            Ok(Some(line)) => Some(Ok(line)),
-            Ok(None) => None,
-            Err(err) => Some(Err(err)),
-        })
+        Poll::Ready(Ok(Some(mem::take(me.buf))))
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/mem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/mem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/mem.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/mem.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 //! In-process memory IO types.
 
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 use crate::loom::sync::Mutex;
 
 use bytes::{Buf, BytesMut};
@@ -16,6 +16,14 @@
 /// that can be used as in-memory IO types. Writing to one of the pairs will
 /// allow that data to be read from the other, and vice versa.
 ///
+/// # Closing a `DuplexStream`
+///
+/// If one end of the `DuplexStream` channel is dropped, any pending reads on
+/// the other side will continue to read data until the buffer is drained, then
+/// they will signal EOF by returning 0 bytes. Any writes to the other side,
+/// including pending ones (that are waiting for free space in the buffer) will
+/// return `Err(BrokenPipe)` immediately.
+///
 /// # Example
 ///
 /// ```
@@ -37,6 +45,7 @@
 /// # }
 /// ```
 #[derive(Debug)]
+#[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
 pub struct DuplexStream {
     read: Arc<Mutex<Pipe>>,
     write: Arc<Mutex<Pipe>>,
@@ -72,6 +81,7 @@
 ///
 /// The `max_buf_size` argument is the maximum amount of bytes that can be
 /// written to a side before the write returns `Poll::Pending`.
+#[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
 pub fn duplex(max_buf_size: usize) -> (DuplexStream, DuplexStream) {
     let one = Arc::new(Mutex::new(Pipe::new(max_buf_size)));
     let two = Arc::new(Mutex::new(Pipe::new(max_buf_size)));
@@ -98,9 +108,9 @@
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut task::Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<std::io::Result<usize>> {
-        Pin::new(&mut *self.read.lock().unwrap()).poll_read(cx, buf)
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
+        Pin::new(&mut *self.read.lock()).poll_read(cx, buf)
     }
 }
 
@@ -111,7 +121,7 @@
         cx: &mut task::Context<'_>,
         buf: &[u8],
     ) -> Poll<std::io::Result<usize>> {
-        Pin::new(&mut *self.write.lock().unwrap()).poll_write(cx, buf)
+        Pin::new(&mut *self.write.lock()).poll_write(cx, buf)
     }
 
     #[allow(unused_mut)]
@@ -119,7 +129,7 @@
         mut self: Pin<&mut Self>,
         cx: &mut task::Context<'_>,
     ) -> Poll<std::io::Result<()>> {
-        Pin::new(&mut *self.write.lock().unwrap()).poll_flush(cx)
+        Pin::new(&mut *self.write.lock()).poll_flush(cx)
     }
 
     #[allow(unused_mut)]
@@ -127,14 +137,15 @@
         mut self: Pin<&mut Self>,
         cx: &mut task::Context<'_>,
     ) -> Poll<std::io::Result<()>> {
-        Pin::new(&mut *self.write.lock().unwrap()).poll_shutdown(cx)
+        Pin::new(&mut *self.write.lock()).poll_shutdown(cx)
     }
 }
 
 impl Drop for DuplexStream {
     fn drop(&mut self) {
         // notify the other side of the closure
-        self.write.lock().unwrap().close();
+        self.write.lock().close_write();
+        self.read.lock().close_read();
     }
 }
 
@@ -151,23 +162,33 @@
         }
     }
 
-    fn close(&mut self) {
+    fn close_write(&mut self) {
         self.is_closed = true;
+        // needs to notify any readers that no more data will come
         if let Some(waker) = self.read_waker.take() {
             waker.wake();
         }
     }
+
+    fn close_read(&mut self) {
+        self.is_closed = true;
+        // needs to notify any writers that they have to abort
+        if let Some(waker) = self.write_waker.take() {
+            waker.wake();
+        }
+    }
 }
 
 impl AsyncRead for Pipe {
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut task::Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<std::io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
         if self.buffer.has_remaining() {
-            let max = self.buffer.remaining().min(buf.len());
-            self.buffer.copy_to_slice(&mut buf[..max]);
+            let max = self.buffer.remaining().min(buf.remaining());
+            buf.put_slice(&self.buffer[..max]);
+            self.buffer.advance(max);
             if max > 0 {
                 // The passed `buf` might have been empty, don't wake up if
                 // no bytes have been moved.
@@ -175,9 +196,9 @@
                     waker.wake();
                 }
             }
-            Poll::Ready(Ok(max))
+            Poll::Ready(Ok(()))
         } else if self.is_closed {
-            Poll::Ready(Ok(0))
+            Poll::Ready(Ok(()))
         } else {
             self.read_waker = Some(cx.waker().clone());
             Poll::Pending
@@ -216,7 +237,7 @@
         mut self: Pin<&mut Self>,
         _: &mut task::Context<'_>,
     ) -> Poll<std::io::Result<()>> {
-        self.close();
+        self.close_write();
         Poll::Ready(Ok(()))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -25,7 +25,13 @@
     mod chain;
 
     mod copy;
-    pub use copy::{copy, Copy};
+    pub use copy::copy;
+
+    mod copy_bidirectional;
+    pub use copy_bidirectional::copy_bidirectional;
+
+    mod copy_buf;
+    pub use copy_buf::copy_buf;
 
     mod empty;
     pub use empty::{empty, Empty};
@@ -43,8 +49,10 @@
     mod read_exact;
     mod read_int;
     mod read_line;
+    mod fill_buf;
 
     mod read_to_end;
+    mod vec_with_initialized;
     cfg_process! {
         pub(crate) use read_to_end::read_to_end;
     }
@@ -63,30 +71,25 @@
     mod split;
     pub use split::Split;
 
-    cfg_stream! {
-        mod stream_reader;
-        pub use stream_reader::{stream_reader, StreamReader};
-
-        mod reader_stream;
-        pub use reader_stream::{reader_stream, ReaderStream};
-    }
-
     mod take;
     pub use take::Take;
 
     mod write;
+    mod write_vectored;
     mod write_all;
     mod write_buf;
+    mod write_all_buf;
     mod write_int;
 
 
     // used by `BufReader` and `BufWriter`
-    // https://github.com/rust-lang/rust/blob/master/src/libstd/sys_common/io.rs#L1
+    // https://github.com/rust-lang/rust/blob/master/library/std/src/sys_common/io.rs#L1
     const DEFAULT_BUF_SIZE: usize = 8 * 1024;
 }
 
 cfg_not_io_util! {
     cfg_process! {
+        mod vec_with_initialized;
         mod read_to_end;
         // Used by process
         pub(crate) use read_to_end::read_to_end;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_buf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,10 @@
 use crate::io::AsyncRead;
 
 use bytes::BufMut;
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
@@ -11,16 +13,22 @@
     R: AsyncRead + Unpin,
     B: BufMut,
 {
-    ReadBuf { reader, buf }
+    ReadBuf {
+        reader,
+        buf,
+        _pin: PhantomPinned,
+    }
 }
 
-cfg_io_util! {
+pin_project! {
     /// Future returned by [`read_buf`](crate::io::AsyncReadExt::read_buf).
     #[derive(Debug)]
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct ReadBuf<'a, R, B> {
         reader: &'a mut R,
         buf: &'a mut B,
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -31,8 +39,34 @@
 {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
-        let me = &mut *self;
-        Pin::new(&mut *me.reader).poll_read_buf(cx, me.buf)
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
+        use crate::io::ReadBuf;
+        use std::mem::MaybeUninit;
+
+        let me = self.project();
+
+        if !me.buf.has_remaining_mut() {
+            return Poll::Ready(Ok(0));
+        }
+
+        let n = {
+            let dst = me.buf.chunk_mut();
+            let dst = unsafe { &mut *(dst as *mut _ as *mut [MaybeUninit<u8>]) };
+            let mut buf = ReadBuf::uninit(dst);
+            let ptr = buf.filled().as_ptr();
+            ready!(Pin::new(me.reader).poll_read(cx, &mut buf)?);
+
+            // Ensure the pointer does not change from under us
+            assert_eq!(ptr, buf.filled().as_ptr());
+            buf.filled().len()
+        };
+
+        // Safety: This is guaranteed to be the number of initialized (and read)
+        // bytes due to the invariants provided by `ReadBuf::filled`.
+        unsafe {
+            me.buf.advance_mut(n);
+        }
+
+        Poll::Ready(Ok(n))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/reader_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/reader_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/reader_stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/reader_stream.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-use crate::io::AsyncRead;
-use crate::stream::Stream;
-use bytes::{Bytes, BytesMut};
-use pin_project_lite::pin_project;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-pin_project! {
-    /// Convert an [`AsyncRead`] implementor into a
-    /// [`Stream`] of Result<[`Bytes`], std::io::Error>.
-    /// After first error it will stop.
-    /// Additionally, this stream is fused: after it returns None at some
-    /// moment, it is guaranteed that further `next()`, `poll_next()` and
-    /// similar functions will instantly return None.
-    ///
-    /// This type can be created using the [`reader_stream`] function
-    ///
-    /// [`AsyncRead`]: crate::io::AsyncRead
-    /// [`Stream`]: crate::stream::Stream
-    /// [`Bytes`]: bytes::Bytes
-    /// [`reader_stream`]: crate::io::reader_stream
-    #[derive(Debug)]
-    #[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
-    #[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
-    pub struct ReaderStream<R> {
-        // Reader itself.
-        // None if we had error reading from the `reader` in the past.
-        #[pin]
-        reader: Option<R>,
-        // Working buffer, used to optimize allocations.
-        // # Capacity behavior
-        // Initially `buf` is empty. Also it's getting smaller and smaller
-        // during polls (because its chunks are returned to stream user).
-        // But when it's capacity reaches 0, it is growed.
-        buf: BytesMut,
-    }
-}
-
-/// Convert an [`AsyncRead`] implementor into a
-/// [`Stream`] of Result<[`Bytes`], std::io::Error>.
-///
-/// # Example
-///
-/// ```
-/// # #[tokio::main]
-/// # async fn main() -> std::io::Result<()> {
-/// use tokio::stream::StreamExt;
-///
-/// let data: &[u8] = b"hello, world!";
-/// let mut stream = tokio::io::reader_stream(data);
-/// let mut stream_contents = Vec::new();
-/// while let Some(chunk) = stream.next().await {
-///    stream_contents.extend_from_slice(chunk?.as_ref());
-/// }
-/// assert_eq!(stream_contents, data);
-/// # Ok(())
-/// # }
-/// ```
-///
-/// [`AsyncRead`]: crate::io::AsyncRead
-/// [`Stream`]: crate::stream::Stream
-/// [`Bytes`]: bytes::Bytes
-pub fn reader_stream<R>(reader: R) -> ReaderStream<R>
-where
-    R: AsyncRead,
-{
-    ReaderStream {
-        reader: Some(reader),
-        buf: BytesMut::new(),
-    }
-}
-
-const CAPACITY: usize = 4096;
-
-impl<R> Stream for ReaderStream<R>
-where
-    R: AsyncRead,
-{
-    type Item = std::io::Result<Bytes>;
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let mut this = self.as_mut().project();
-        let reader = match this.reader.as_pin_mut() {
-            Some(r) => r,
-            None => return Poll::Ready(None),
-        };
-        if this.buf.capacity() == 0 {
-            this.buf.reserve(CAPACITY);
-        }
-        match reader.poll_read_buf(cx, &mut this.buf) {
-            Poll::Pending => Poll::Pending,
-            Poll::Ready(Err(err)) => {
-                self.project().reader.set(None);
-                Poll::Ready(Some(Err(err)))
-            }
-            Poll::Ready(Ok(0)) => {
-                self.project().reader.set(None);
-                Poll::Ready(None)
-            }
-            Poll::Ready(Ok(_)) => {
-                let chunk = this.buf.split();
-                Poll::Ready(Some(Ok(chunk.freeze())))
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_exact.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_exact.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_exact.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_exact.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,9 @@
-use crate::io::AsyncRead;
+use crate::io::{AsyncRead, ReadBuf};
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::marker::Unpin;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -17,12 +19,12 @@
 {
     ReadExact {
         reader,
-        buf,
-        pos: 0,
+        buf: ReadBuf::new(buf),
+        _pin: PhantomPinned,
     }
 }
 
-cfg_io_util! {
+pin_project! {
     /// Creates a future which will read exactly enough bytes to fill `buf`,
     /// returning an error if EOF is hit sooner.
     ///
@@ -31,8 +33,10 @@
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct ReadExact<'a, A: ?Sized> {
         reader: &'a mut A,
-        buf: &'a mut [u8],
-        pos: usize,
+        buf: ReadBuf<'a>,
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -46,32 +50,20 @@
 {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
+        let mut me = self.project();
+
         loop {
             // if our buffer is empty, then we need to read some data to continue.
-            if self.pos < self.buf.len() {
-                let me = &mut *self;
-                let n = ready!(Pin::new(&mut *me.reader).poll_read(cx, &mut me.buf[me.pos..]))?;
-                me.pos += n;
-                if n == 0 {
+            let rem = me.buf.remaining();
+            if rem != 0 {
+                ready!(Pin::new(&mut *me.reader).poll_read(cx, &mut me.buf))?;
+                if me.buf.remaining() == rem {
                     return Err(eof()).into();
                 }
-            }
-
-            if self.pos >= self.buf.len() {
-                return Poll::Ready(Ok(self.pos));
+            } else {
+                return Poll::Ready(Ok(me.buf.capacity()));
             }
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<ReadExact<'_, PhantomPinned>>();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_int.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_int.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_int.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_int.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,11 @@
-use crate::io::AsyncRead;
+use crate::io::{AsyncRead, ReadBuf};
 
 use bytes::Buf;
 use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
 use std::io::ErrorKind::UnexpectedEof;
+use std::marker::PhantomPinned;
 use std::mem::size_of;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -16,11 +17,15 @@
     ($name:ident, $ty:ty, $reader:ident, $bytes:expr) => {
         pin_project! {
             #[doc(hidden)]
+            #[must_use = "futures do nothing unless you `.await` or poll them"]
             pub struct $name<R> {
                 #[pin]
                 src: R,
                 buf: [u8; $bytes],
                 read: u8,
+                // Make this future `!Unpin` for compatibility with async trait methods.
+                #[pin]
+                _pin: PhantomPinned,
             }
         }
 
@@ -30,6 +35,7 @@
                     src,
                     buf: [0; $bytes],
                     read: 0,
+                    _pin: PhantomPinned,
                 }
             }
         }
@@ -48,17 +54,19 @@
                 }
 
                 while *me.read < $bytes as u8 {
-                    *me.read += match me
-                        .src
-                        .as_mut()
-                        .poll_read(cx, &mut me.buf[*me.read as usize..])
-                    {
+                    let mut buf = ReadBuf::new(&mut me.buf[*me.read as usize..]);
+
+                    *me.read += match me.src.as_mut().poll_read(cx, &mut buf) {
                         Poll::Pending => return Poll::Pending,
                         Poll::Ready(Err(e)) => return Poll::Ready(Err(e.into())),
-                        Poll::Ready(Ok(0)) => {
-                            return Poll::Ready(Err(UnexpectedEof.into()));
+                        Poll::Ready(Ok(())) => {
+                            let n = buf.filled().len();
+                            if n == 0 {
+                                return Poll::Ready(Err(UnexpectedEof.into()));
+                            }
+
+                            n as u8
                         }
-                        Poll::Ready(Ok(n)) => n as u8,
                     };
                 }
 
@@ -75,15 +83,22 @@
         pin_project! {
             /// Future returned from `read_u8`
             #[doc(hidden)]
+            #[must_use = "futures do nothing unless you `.await` or poll them"]
             pub struct $name<R> {
                 #[pin]
                 reader: R,
+                // Make this future `!Unpin` for compatibility with async trait methods.
+                #[pin]
+                _pin: PhantomPinned,
             }
         }
 
         impl<R> $name<R> {
             pub(crate) fn new(reader: R) -> $name<R> {
-                $name { reader }
+                $name {
+                    reader,
+                    _pin: PhantomPinned,
+                }
             }
         }
 
@@ -97,12 +112,17 @@
                 let me = self.project();
 
                 let mut buf = [0; 1];
-                match me.reader.poll_read(cx, &mut buf[..]) {
+                let mut buf = ReadBuf::new(&mut buf);
+                match me.reader.poll_read(cx, &mut buf) {
                     Poll::Pending => Poll::Pending,
                     Poll::Ready(Err(e)) => Poll::Ready(Err(e.into())),
-                    Poll::Ready(Ok(0)) => Poll::Ready(Err(UnexpectedEof.into())),
-                    Poll::Ready(Ok(1)) => Poll::Ready(Ok(buf[0] as $ty)),
-                    Poll::Ready(Ok(_)) => unreachable!(),
+                    Poll::Ready(Ok(())) => {
+                        if buf.filled().len() == 0 {
+                            return Poll::Ready(Err(UnexpectedEof.into()));
+                        }
+
+                        Poll::Ready(Ok(buf.filled()[0] as $ty))
+                    }
                 }
             }
         }
@@ -122,6 +142,9 @@
 reader!(ReadI64, i64, get_i64);
 reader!(ReadI128, i128, get_i128);
 
+reader!(ReadF32, f32, get_f32);
+reader!(ReadF64, f64, get_f64);
+
 reader!(ReadU16Le, u16, get_u16_le);
 reader!(ReadU32Le, u32, get_u32_le);
 reader!(ReadU64Le, u64, get_u64_le);
@@ -131,3 +154,6 @@
 reader!(ReadI32Le, i32, get_i32_le);
 reader!(ReadI64Le, i64, get_i64_le);
 reader!(ReadI128Le, i128, get_i128_le);
+
+reader!(ReadF32Le, f32, get_f32_le);
+reader!(ReadF64Le, f64, get_f64_le);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_line.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_line.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_line.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_line.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,27 +1,32 @@
 use crate::io::util::read_until::read_until_internal;
 use crate::io::AsyncBufRead;
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::mem;
 use std::pin::Pin;
 use std::string::FromUtf8Error;
 use std::task::{Context, Poll};
 
-cfg_io_util! {
+pin_project! {
     /// Future for the [`read_line`](crate::io::AsyncBufReadExt::read_line) method.
     #[derive(Debug)]
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct ReadLine<'a, R: ?Sized> {
         reader: &'a mut R,
-        /// This is the buffer we were provided. It will be replaced with an empty string
-        /// while reading to postpone utf-8 handling until after reading.
+        // This is the buffer we were provided. It will be replaced with an empty string
+        // while reading to postpone utf-8 handling until after reading.
         output: &'a mut String,
-        /// The actual allocation of the string is moved into this vector instead.
+        // The actual allocation of the string is moved into this vector instead.
         buf: Vec<u8>,
-        /// The number of bytes appended to buf. This can be less than buf.len() if
-        /// the buffer was not empty when the operation was started.
+        // The number of bytes appended to buf. This can be less than buf.len() if
+        // the buffer was not empty when the operation was started.
         read: usize,
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -31,9 +36,10 @@
 {
     ReadLine {
         reader,
-        buf: mem::replace(string, String::new()).into_bytes(),
+        buf: mem::take(string).into_bytes(),
         output: string,
         read: 0,
+        _pin: PhantomPinned,
     }
 }
 
@@ -93,7 +99,7 @@
     read: &mut usize,
 ) -> Poll<io::Result<usize>> {
     let io_res = ready!(read_until_internal(reader, cx, b'\n', buf, read));
-    let utf8_res = String::from_utf8(mem::replace(buf, Vec::new()));
+    let utf8_res = String::from_utf8(mem::take(buf));
 
     // At this point both buf and output are empty. The allocation is in utf8_res.
 
@@ -105,25 +111,9 @@
 impl<R: AsyncBufRead + ?Sized + Unpin> Future for ReadLine<'_, R> {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let Self {
-            reader,
-            output,
-            buf,
-            read,
-        } = &mut *self;
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
 
-        read_line_internal(Pin::new(reader), cx, output, buf, read)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<ReadLine<'_, PhantomPinned>>();
+        read_line_internal(Pin::new(*me.reader), cx, me.output, me.buf, me.read)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,9 @@
-use crate::io::AsyncRead;
+use crate::io::{AsyncRead, ReadBuf};
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::marker::Unpin;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -15,10 +17,14 @@
 where
     R: AsyncRead + Unpin + ?Sized,
 {
-    Read { reader, buf }
+    Read {
+        reader,
+        buf,
+        _pin: PhantomPinned,
+    }
 }
 
-cfg_io_util! {
+pin_project! {
     /// A future which can be used to easily read available number of bytes to fill
     /// a buffer.
     ///
@@ -28,6 +34,9 @@
     pub struct Read<'a, R: ?Sized> {
         reader: &'a mut R,
         buf: &'a mut [u8],
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -37,19 +46,10 @@
 {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
-        let me = &mut *self;
-        Pin::new(&mut *me.reader).poll_read(cx, me.buf)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<Read<'_, PhantomPinned>>();
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
+        let me = self.project();
+        let mut buf = ReadBuf::new(*me.buf);
+        ready!(Pin::new(me.reader).poll_read(cx, &mut buf))?;
+        Poll::Ready(Ok(buf.filled().len()))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_to_end.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_to_end.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_to_end.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_to_end.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,47 +1,48 @@
+use crate::io::util::vec_with_initialized::{into_read_buf_parts, VecU8, VecWithInitialized};
 use crate::io::AsyncRead;
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
-use std::mem::{self, MaybeUninit};
+use std::marker::PhantomPinned;
+use std::mem;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-#[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
-pub struct ReadToEnd<'a, R: ?Sized> {
-    reader: &'a mut R,
-    buf: &'a mut Vec<u8>,
-    /// The number of bytes appended to buf. This can be less than buf.len() if
-    /// the buffer was not empty when the operation was started.
-    read: usize,
+pin_project! {
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct ReadToEnd<'a, R: ?Sized> {
+        reader: &'a mut R,
+        buf: VecWithInitialized<&'a mut Vec<u8>>,
+        // The number of bytes appended to buf. This can be less than buf.len() if
+        // the buffer was not empty when the operation was started.
+        read: usize,
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
+    }
 }
 
 pub(crate) fn read_to_end<'a, R>(reader: &'a mut R, buffer: &'a mut Vec<u8>) -> ReadToEnd<'a, R>
 where
     R: AsyncRead + Unpin + ?Sized,
 {
-    prepare_buffer(buffer, reader);
     ReadToEnd {
         reader,
-        buf: buffer,
+        buf: VecWithInitialized::new(buffer),
         read: 0,
+        _pin: PhantomPinned,
     }
 }
 
-/// # Safety
-///
-/// Before first calling this method, the unused capacity must have been
-/// prepared for use with the provided AsyncRead. This can be done using the
-/// `prepare_buffer` function later in this file.
-pub(super) unsafe fn read_to_end_internal<R: AsyncRead + ?Sized>(
-    buf: &mut Vec<u8>,
+pub(super) fn read_to_end_internal<V: VecU8, R: AsyncRead + ?Sized>(
+    buf: &mut VecWithInitialized<V>,
     mut reader: Pin<&mut R>,
     num_read: &mut usize,
     cx: &mut Context<'_>,
 ) -> Poll<io::Result<usize>> {
     loop {
-        // safety: The caller promised to prepare the buffer.
         let ret = ready!(poll_read_to_end(buf, reader.as_mut(), cx));
         match ret {
             Err(err) => return Poll::Ready(Err(err)),
@@ -56,14 +57,8 @@
 /// Tries to read from the provided AsyncRead.
 ///
 /// The length of the buffer is increased by the number of bytes read.
-///
-/// # Safety
-///
-/// The caller ensures that the buffer has been prepared for use with the
-/// AsyncRead before calling this function. This can be done using the
-/// `prepare_buffer` function later in this file.
-unsafe fn poll_read_to_end<R: AsyncRead + ?Sized>(
-    buf: &mut Vec<u8>,
+fn poll_read_to_end<V: VecU8, R: AsyncRead + ?Sized>(
+    buf: &mut VecWithInitialized<V>,
     read: Pin<&mut R>,
     cx: &mut Context<'_>,
 ) -> Poll<io::Result<usize>> {
@@ -73,75 +68,34 @@
     // of data to return. Simply tacking on an extra DEFAULT_BUF_SIZE space every
     // time is 4,500 times (!) slower than this if the reader has a very small
     // amount of data to return.
-    reserve(buf, &*read, 32);
-
-    let unused_capacity: &mut [MaybeUninit<u8>] = get_unused_capacity(buf);
-
-    // safety: The buffer has been prepared for use with the AsyncRead before
-    // calling this function.
-    let slice: &mut [u8] = &mut *(unused_capacity as *mut [MaybeUninit<u8>] as *mut [u8]);
-
-    let res = ready!(read.poll_read(cx, slice));
-    if let Ok(num) = res {
-        // safety: There are two situations:
-        //
-        // 1. The AsyncRead has not overriden `prepare_uninitialized_buffer`.
-        //
-        // In this situation, the default implementation of that method will have
-        // zeroed the unused capacity. This means that setting the length will
-        // never expose uninitialized memory in the vector.
-        //
-        // Note that the assert! below ensures that we don't set the length to
-        // something larger than the capacity, which malicious implementors might
-        // try to have us do.
-        //
-        // 2. The AsyncRead has overriden `prepare_uninitialized_buffer`.
-        //
-        // In this case, the safety of the `set_len` call below relies on this
-        // guarantee from the documentation on `prepare_uninitialized_buffer`:
-        //
-        // > This function isn't actually unsafe to call but unsafe to implement.
-        // > The implementer must ensure that either the whole buf has been zeroed
-        // > or poll_read() overwrites the buffer without reading it and returns
-        // > correct value.
-        //
-        // Note that `prepare_uninitialized_buffer` is unsafe to implement, so this
-        // is a guarantee we can rely on in unsafe code.
-        //
-        // The assert!() is technically only necessary in the first case.
-        let new_len = buf.len() + num;
-        assert!(new_len <= buf.capacity());
-
-        buf.set_len(new_len);
-    }
-    Poll::Ready(res)
-}
+    buf.reserve(32);
 
-/// This function prepares the unused capacity for use with the provided AsyncRead.
-pub(super) fn prepare_buffer<R: AsyncRead + ?Sized>(buf: &mut Vec<u8>, read: &R) {
-    let buffer = get_unused_capacity(buf);
-
-    // safety: This function is only unsafe to implement.
-    unsafe {
-        read.prepare_uninitialized_buffer(buffer);
-    }
-}
+    // Get a ReadBuf into the vector.
+    let mut read_buf = buf.get_read_buf();
 
-/// Allocates more memory and ensures that the unused capacity is prepared for use
-/// with the `AsyncRead`.
-fn reserve<R: AsyncRead + ?Sized>(buf: &mut Vec<u8>, read: &R, bytes: usize) {
-    if buf.capacity() - buf.len() >= bytes {
-        return;
+    let filled_before = read_buf.filled().len();
+    let poll_result = read.poll_read(cx, &mut read_buf);
+    let filled_after = read_buf.filled().len();
+    let n = filled_after - filled_before;
+
+    // Update the length of the vector using the result of poll_read.
+    let read_buf_parts = into_read_buf_parts(read_buf);
+    buf.apply_read_buf(read_buf_parts);
+
+    match poll_result {
+        Poll::Pending => {
+            // In this case, nothing should have been read. However we still
+            // update the vector in case the poll_read call initialized parts of
+            // the vector's unused capacity.
+            debug_assert_eq!(filled_before, filled_after);
+            Poll::Pending
+        }
+        Poll::Ready(Err(err)) => {
+            debug_assert_eq!(filled_before, filled_after);
+            Poll::Ready(Err(err))
+        }
+        Poll::Ready(Ok(())) => Poll::Ready(Ok(n)),
     }
-    buf.reserve(bytes);
-    // The call above has reallocated the buffer, so we must reinitialize the entire
-    // unused capacity, even if we already initialized some of it before the resize.
-    prepare_buffer(buf, read);
-}
-
-/// Returns the unused capacity of the provided vector.
-fn get_unused_capacity(buf: &mut Vec<u8>) -> &mut [MaybeUninit<u8>] {
-    bytes::BufMut::bytes_mut(buf)
 }
 
 impl<A> Future for ReadToEnd<'_, A>
@@ -150,21 +104,9 @@
 {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let Self { reader, buf, read } = &mut *self;
-
-        // safety: The constructor of ReadToEnd calls `prepare_buffer`
-        unsafe { read_to_end_internal(buf, Pin::new(*reader), read, cx) }
-    }
-}
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<ReadToEnd<'_, PhantomPinned>>();
+        read_to_end_internal(me.buf, Pin::new(*me.reader), me.read, cx)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_to_string.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_to_string.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_to_string.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_to_string.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,32 @@
 use crate::io::util::read_line::finish_string_read;
-use crate::io::util::read_to_end::{prepare_buffer, read_to_end_internal};
+use crate::io::util::read_to_end::read_to_end_internal;
+use crate::io::util::vec_with_initialized::VecWithInitialized;
 use crate::io::AsyncRead;
 
+use pin_project_lite::pin_project;
 use std::future::Future;
+use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::{io, mem};
 
-cfg_io_util! {
+pin_project! {
     /// Future for the [`read_to_string`](super::AsyncReadExt::read_to_string) method.
     #[derive(Debug)]
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct ReadToString<'a, R: ?Sized> {
         reader: &'a mut R,
-        /// This is the buffer we were provided. It will be replaced with an empty string
-        /// while reading to postpone utf-8 handling until after reading.
+        // This is the buffer we were provided. It will be replaced with an empty string
+        // while reading to postpone utf-8 handling until after reading.
         output: &'a mut String,
-        /// The actual allocation of the string is moved into this vector instead.
-        buf: Vec<u8>,
-        /// The number of bytes appended to buf. This can be less than buf.len() if
-        /// the buffer was not empty when the operation was started.
+        // The actual allocation of the string is moved into this vector instead.
+        buf: VecWithInitialized<Vec<u8>>,
+        // The number of bytes appended to buf. This can be less than buf.len() if
+        // the buffer was not empty when the operation was started.
         read: usize,
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -31,30 +37,25 @@
 where
     R: AsyncRead + ?Sized + Unpin,
 {
-    let mut buf = mem::replace(string, String::new()).into_bytes();
-    prepare_buffer(&mut buf, reader);
+    let buf = mem::take(string).into_bytes();
     ReadToString {
         reader,
-        buf,
+        buf: VecWithInitialized::new(buf),
         output: string,
         read: 0,
+        _pin: PhantomPinned,
     }
 }
 
-/// # Safety
-///
-/// Before first calling this method, the unused capacity must have been
-/// prepared for use with the provided AsyncRead. This can be done using the
-/// `prepare_buffer` function in `read_to_end.rs`.
-unsafe fn read_to_string_internal<R: AsyncRead + ?Sized>(
+fn read_to_string_internal<R: AsyncRead + ?Sized>(
     reader: Pin<&mut R>,
     output: &mut String,
-    buf: &mut Vec<u8>,
+    buf: &mut VecWithInitialized<Vec<u8>>,
     read: &mut usize,
     cx: &mut Context<'_>,
 ) -> Poll<io::Result<usize>> {
     let io_res = ready!(read_to_end_internal(buf, reader, read, cx));
-    let utf8_res = String::from_utf8(mem::replace(buf, Vec::new()));
+    let utf8_res = String::from_utf8(buf.take());
 
     // At this point both buf and output are empty. The allocation is in utf8_res.
 
@@ -69,26 +70,9 @@
 {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let Self {
-            reader,
-            buf,
-            output,
-            read,
-        } = &mut *self;
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
 
-        // safety: The constructor of ReadToString called `prepare_buffer`.
-        unsafe { read_to_string_internal(Pin::new(*reader), output, buf, read, cx) }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<ReadToString<'_, PhantomPinned>>();
+        read_to_string_internal(Pin::new(*me.reader), me.output, me.buf, me.read, cx)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_until.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_until.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/read_until.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/read_until.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,29 +1,34 @@
 use crate::io::AsyncBufRead;
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::mem;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-cfg_io_util! {
+pin_project! {
     /// Future for the [`read_until`](crate::io::AsyncBufReadExt::read_until) method.
-    /// The delimeter is included in the resulting vector.
+    /// The delimiter is included in the resulting vector.
     #[derive(Debug)]
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct ReadUntil<'a, R: ?Sized> {
         reader: &'a mut R,
-        delimeter: u8,
+        delimiter: u8,
         buf: &'a mut Vec<u8>,
-        /// The number of bytes appended to buf. This can be less than buf.len() if
-        /// the buffer was not empty when the operation was started.
+        // The number of bytes appended to buf. This can be less than buf.len() if
+        // the buffer was not empty when the operation was started.
         read: usize,
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
 pub(crate) fn read_until<'a, R>(
     reader: &'a mut R,
-    delimeter: u8,
+    delimiter: u8,
     buf: &'a mut Vec<u8>,
 ) -> ReadUntil<'a, R>
 where
@@ -31,23 +36,24 @@
 {
     ReadUntil {
         reader,
-        delimeter,
+        delimiter,
         buf,
         read: 0,
+        _pin: PhantomPinned,
     }
 }
 
 pub(super) fn read_until_internal<R: AsyncBufRead + ?Sized>(
     mut reader: Pin<&mut R>,
     cx: &mut Context<'_>,
-    delimeter: u8,
+    delimiter: u8,
     buf: &mut Vec<u8>,
     read: &mut usize,
 ) -> Poll<io::Result<usize>> {
     loop {
         let (done, used) = {
             let available = ready!(reader.as_mut().poll_fill_buf(cx))?;
-            if let Some(i) = memchr::memchr(delimeter, available) {
+            if let Some(i) = memchr::memchr(delimiter, available) {
                 buf.extend_from_slice(&available[..=i]);
                 (true, i + 1)
             } else {
@@ -66,24 +72,8 @@
 impl<R: AsyncBufRead + ?Sized + Unpin> Future for ReadUntil<'_, R> {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let Self {
-            reader,
-            delimeter,
-            buf,
-            read,
-        } = &mut *self;
-        read_until_internal(Pin::new(reader), cx, *delimeter, buf, read)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<ReadUntil<'_, PhantomPinned>>();
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
+        read_until_internal(Pin::new(*me.reader), cx, *me.delimiter, me.buf, me.read)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/repeat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/repeat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/repeat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/repeat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use crate::io::AsyncRead;
+use crate::io::{AsyncRead, ReadBuf};
 
 use std::io;
 use std::pin::Pin;
@@ -47,19 +47,17 @@
 }
 
 impl AsyncRead for Repeat {
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        false
-    }
     #[inline]
     fn poll_read(
         self: Pin<&mut Self>,
         _: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        for byte in &mut *buf {
-            *byte = self.byte;
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        // TODO: could be faster, but should we unsafe it?
+        while buf.remaining() != 0 {
+            buf.put_slice(&[self.byte]);
         }
-        Poll::Ready(Ok(buf.len()))
+        Poll::Ready(Ok(()))
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/shutdown.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/shutdown.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/shutdown.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/shutdown.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,24 @@
 use crate::io::AsyncWrite;
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-cfg_io_util! {
+pin_project! {
     /// A future used to shutdown an I/O object.
     ///
     /// Created by the [`AsyncWriteExt::shutdown`][shutdown] function.
     /// [shutdown]: crate::io::AsyncWriteExt::shutdown
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
     #[derive(Debug)]
     pub struct Shutdown<'a, A: ?Sized> {
         a: &'a mut A,
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -21,7 +27,10 @@
 where
     A: AsyncWrite + Unpin + ?Sized,
 {
-    Shutdown { a }
+    Shutdown {
+        a,
+        _pin: PhantomPinned,
+    }
 }
 
 impl<A> Future for Shutdown<'_, A>
@@ -30,19 +39,8 @@
 {
     type Output = io::Result<()>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let me = &mut *self;
-        Pin::new(&mut *me.a).poll_shutdown(cx)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<Shutdown<'_, PhantomPinned>>();
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
+        Pin::new(me.a).poll_shutdown(cx)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,7 +8,11 @@
 use std::task::{Context, Poll};
 
 pin_project! {
-    /// Stream for the [`split`](crate::io::AsyncBufReadExt::split) method.
+    /// Splitter for the [`split`](crate::io::AsyncBufReadExt::split) method.
+    ///
+    /// A `Split` can be turned into a `Stream` with [`SplitStream`].
+    ///
+    /// [`SplitStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.SplitStream.html
     #[derive(Debug)]
     #[must_use = "streams do nothing unless polled"]
     #[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
@@ -65,7 +69,23 @@
 where
     R: AsyncBufRead,
 {
-    #[doc(hidden)]
+    /// Polls for the next segment in the stream.
+    ///
+    /// This method returns:
+    ///
+    ///  * `Poll::Pending` if the next segment is not yet available.
+    ///  * `Poll::Ready(Ok(Some(segment)))` if the next segment is available.
+    ///  * `Poll::Ready(Ok(None))` if there are no more segments in this stream.
+    ///  * `Poll::Ready(Err(err))` if an IO error occurred while reading the
+    ///    next segment.
+    ///
+    /// When the method returns `Poll::Pending`, the `Waker` in the provided
+    /// `Context` is scheduled to receive a wakeup when more bytes become
+    /// available on the underlying IO resource.
+    ///
+    /// Note that on multiple calls to `poll_next_segment`, only the `Waker`
+    /// from the `Context` passed to the most recent call is scheduled to
+    /// receive a wakeup.
     pub fn poll_next_segment(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -75,7 +95,7 @@
         let n = ready!(read_until_internal(
             me.reader, cx, *me.delim, me.buf, me.read,
         ))?;
-        // read_until_internal resets me.read to zero once it finds the delimeter
+        // read_until_internal resets me.read to zero once it finds the delimiter
         debug_assert_eq!(*me.read, 0);
 
         if n == 0 && me.buf.is_empty() {
@@ -86,20 +106,7 @@
             me.buf.pop();
         }
 
-        Poll::Ready(Ok(Some(mem::replace(me.buf, Vec::new()))))
-    }
-}
-
-#[cfg(feature = "stream")]
-impl<R: AsyncBufRead> crate::stream::Stream for Split<R> {
-    type Item = io::Result<Vec<u8>>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        Poll::Ready(match ready!(self.poll_next_segment(cx)) {
-            Ok(Some(segment)) => Some(Ok(segment)),
-            Ok(None) => None,
-            Err(err) => Some(Err(err)),
-        })
+        Poll::Ready(Ok(Some(mem::take(me.buf))))
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/stream_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/stream_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/stream_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/stream_reader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,184 +0,0 @@
-use crate::io::{AsyncBufRead, AsyncRead};
-use crate::stream::Stream;
-use bytes::{Buf, BufMut};
-use pin_project_lite::pin_project;
-use std::io;
-use std::mem::MaybeUninit;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-pin_project! {
-    /// Convert a stream of byte chunks into an [`AsyncRead`].
-    ///
-    /// This type is usually created using the [`stream_reader`] function.
-    ///
-    /// [`AsyncRead`]: crate::io::AsyncRead
-    /// [`stream_reader`]: crate::io::stream_reader
-    #[derive(Debug)]
-    #[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
-    #[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
-    pub struct StreamReader<S, B> {
-        #[pin]
-        inner: S,
-        chunk: Option<B>,
-    }
-}
-
-/// Convert a stream of byte chunks into an [`AsyncRead`](crate::io::AsyncRead).
-///
-/// # Example
-///
-/// ```
-/// use bytes::Bytes;
-/// use tokio::io::{stream_reader, AsyncReadExt};
-/// # #[tokio::main]
-/// # async fn main() -> std::io::Result<()> {
-///
-/// // Create a stream from an iterator.
-/// let stream = tokio::stream::iter(vec![
-///     Ok(Bytes::from_static(&[0, 1, 2, 3])),
-///     Ok(Bytes::from_static(&[4, 5, 6, 7])),
-///     Ok(Bytes::from_static(&[8, 9, 10, 11])),
-/// ]);
-///
-/// // Convert it to an AsyncRead.
-/// let mut read = stream_reader(stream);
-///
-/// // Read five bytes from the stream.
-/// let mut buf = [0; 5];
-/// read.read_exact(&mut buf).await?;
-/// assert_eq!(buf, [0, 1, 2, 3, 4]);
-///
-/// // Read the rest of the current chunk.
-/// assert_eq!(read.read(&mut buf).await?, 3);
-/// assert_eq!(&buf[..3], [5, 6, 7]);
-///
-/// // Read the next chunk.
-/// assert_eq!(read.read(&mut buf).await?, 4);
-/// assert_eq!(&buf[..4], [8, 9, 10, 11]);
-///
-/// // We have now reached the end.
-/// assert_eq!(read.read(&mut buf).await?, 0);
-///
-/// # Ok(())
-/// # }
-/// ```
-#[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
-#[cfg_attr(docsrs, doc(cfg(feature = "io-util")))]
-pub fn stream_reader<S, B>(stream: S) -> StreamReader<S, B>
-where
-    S: Stream<Item = Result<B, io::Error>>,
-    B: Buf,
-{
-    StreamReader::new(stream)
-}
-
-impl<S, B> StreamReader<S, B>
-where
-    S: Stream<Item = Result<B, io::Error>>,
-    B: Buf,
-{
-    /// Convert the provided stream into an `AsyncRead`.
-    fn new(stream: S) -> Self {
-        Self {
-            inner: stream,
-            chunk: None,
-        }
-    }
-    /// Do we have a chunk and is it non-empty?
-    fn has_chunk(self: Pin<&mut Self>) -> bool {
-        if let Some(chunk) = self.project().chunk {
-            chunk.remaining() > 0
-        } else {
-            false
-        }
-    }
-}
-
-impl<S, B> AsyncRead for StreamReader<S, B>
-where
-    S: Stream<Item = Result<B, io::Error>>,
-    B: Buf,
-{
-    fn poll_read(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        if buf.is_empty() {
-            return Poll::Ready(Ok(0));
-        }
-
-        let inner_buf = match self.as_mut().poll_fill_buf(cx) {
-            Poll::Ready(Ok(buf)) => buf,
-            Poll::Ready(Err(err)) => return Poll::Ready(Err(err)),
-            Poll::Pending => return Poll::Pending,
-        };
-        let len = std::cmp::min(inner_buf.len(), buf.len());
-        (&mut buf[..len]).copy_from_slice(&inner_buf[..len]);
-
-        self.consume(len);
-        Poll::Ready(Ok(len))
-    }
-    fn poll_read_buf<BM: BufMut>(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut BM,
-    ) -> Poll<io::Result<usize>>
-    where
-        Self: Sized,
-    {
-        if !buf.has_remaining_mut() {
-            return Poll::Ready(Ok(0));
-        }
-
-        let inner_buf = match self.as_mut().poll_fill_buf(cx) {
-            Poll::Ready(Ok(buf)) => buf,
-            Poll::Ready(Err(err)) => return Poll::Ready(Err(err)),
-            Poll::Pending => return Poll::Pending,
-        };
-        let len = std::cmp::min(inner_buf.len(), buf.remaining_mut());
-        buf.put_slice(&inner_buf[..len]);
-
-        self.consume(len);
-        Poll::Ready(Ok(len))
-    }
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-}
-
-impl<S, B> AsyncBufRead for StreamReader<S, B>
-where
-    S: Stream<Item = Result<B, io::Error>>,
-    B: Buf,
-{
-    fn poll_fill_buf(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
-        loop {
-            if self.as_mut().has_chunk() {
-                // This unwrap is very sad, but it can't be avoided.
-                let buf = self.project().chunk.as_ref().unwrap().bytes();
-                return Poll::Ready(Ok(buf));
-            } else {
-                match self.as_mut().project().inner.poll_next(cx) {
-                    Poll::Ready(Some(Ok(chunk))) => {
-                        // Go around the loop in case the chunk is empty.
-                        *self.as_mut().project().chunk = Some(chunk);
-                    }
-                    Poll::Ready(Some(Err(err))) => return Poll::Ready(Err(err)),
-                    Poll::Ready(None) => return Poll::Ready(Ok(&[])),
-                    Poll::Pending => return Poll::Pending,
-                }
-            }
-        }
-    }
-    fn consume(self: Pin<&mut Self>, amt: usize) {
-        if amt > 0 {
-            self.project()
-                .chunk
-                .as_mut()
-                .expect("No chunk present")
-                .advance(amt);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/take.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/take.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/take.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/take.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,6 @@
-use crate::io::{AsyncBufRead, AsyncRead};
+use crate::io::{AsyncBufRead, AsyncRead, ReadBuf};
 
 use pin_project_lite::pin_project;
-use std::mem::MaybeUninit;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::{cmp, io};
@@ -76,24 +75,27 @@
 }
 
 impl<R: AsyncRead> AsyncRead for Take<R> {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        self.inner.prepare_uninitialized_buffer(buf)
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<Result<usize, io::Error>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<Result<(), io::Error>> {
         if self.limit_ == 0 {
-            return Poll::Ready(Ok(0));
+            return Poll::Ready(Ok(()));
         }
 
         let me = self.project();
-        let max = std::cmp::min(buf.len() as u64, *me.limit_) as usize;
-        let n = ready!(me.inner.poll_read(cx, &mut buf[..max]))?;
+        let mut b = buf.take(*me.limit_ as usize);
+        ready!(me.inner.poll_read(cx, &mut b))?;
+        let n = b.filled().len();
+
+        // We need to update the original ReadBuf
+        unsafe {
+            buf.assume_init(n);
+        }
+        buf.advance(n);
         *me.limit_ -= n as u64;
-        Poll::Ready(Ok(n))
+        Poll::Ready(Ok(()))
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/vec_with_initialized.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/vec_with_initialized.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/vec_with_initialized.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/vec_with_initialized.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,132 @@
+use crate::io::ReadBuf;
+use std::mem::MaybeUninit;
+
+mod private {
+    pub trait Sealed {}
+
+    impl Sealed for Vec<u8> {}
+    impl Sealed for &mut Vec<u8> {}
+}
+
+/// A sealed trait that constrains the generic type parameter in `VecWithInitialized<V>`.  That struct's safety relies
+/// on certain invariants upheld by `Vec<u8>`.
+pub(crate) trait VecU8: AsMut<Vec<u8>> + private::Sealed {}
+
+impl VecU8 for Vec<u8> {}
+impl VecU8 for &mut Vec<u8> {}
+/// This struct wraps a `Vec<u8>` or `&mut Vec<u8>`, combining it with a
+/// `num_initialized`, which keeps track of the number of initialized bytes
+/// in the unused capacity.
+///
+/// The purpose of this struct is to remember how many bytes were initialized
+/// through a `ReadBuf` from call to call.
+///
+/// This struct has the safety invariant that the first `num_initialized` of the
+/// vector's allocation must be initialized at any time.
+#[derive(Debug)]
+pub(crate) struct VecWithInitialized<V> {
+    vec: V,
+    // The number of initialized bytes in the vector.
+    // Always between `vec.len()` and `vec.capacity()`.
+    num_initialized: usize,
+}
+
+impl VecWithInitialized<Vec<u8>> {
+    #[cfg(feature = "io-util")]
+    pub(crate) fn take(&mut self) -> Vec<u8> {
+        self.num_initialized = 0;
+        std::mem::take(&mut self.vec)
+    }
+}
+
+impl<V> VecWithInitialized<V>
+where
+    V: VecU8,
+{
+    pub(crate) fn new(mut vec: V) -> Self {
+        // SAFETY: The safety invariants of vector guarantee that the bytes up
+        // to its length are initialized.
+        Self {
+            num_initialized: vec.as_mut().len(),
+            vec,
+        }
+    }
+
+    pub(crate) fn reserve(&mut self, num_bytes: usize) {
+        let vec = self.vec.as_mut();
+        if vec.capacity() - vec.len() >= num_bytes {
+            return;
+        }
+        // SAFETY: Setting num_initialized to `vec.len()` is correct as
+        // `reserve` does not change the length of the vector.
+        self.num_initialized = vec.len();
+        vec.reserve(num_bytes);
+    }
+
+    #[cfg(feature = "io-util")]
+    pub(crate) fn is_empty(&mut self) -> bool {
+        self.vec.as_mut().is_empty()
+    }
+
+    pub(crate) fn get_read_buf<'a>(&'a mut self) -> ReadBuf<'a> {
+        let num_initialized = self.num_initialized;
+
+        // SAFETY: Creating the slice is safe because of the safety invariants
+        // on Vec<u8>. The safety invariants of `ReadBuf` will further guarantee
+        // that no bytes in the slice are de-initialized.
+        let vec = self.vec.as_mut();
+        let len = vec.len();
+        let cap = vec.capacity();
+        let ptr = vec.as_mut_ptr().cast::<MaybeUninit<u8>>();
+        let slice = unsafe { std::slice::from_raw_parts_mut::<'a, MaybeUninit<u8>>(ptr, cap) };
+
+        // SAFETY: This is safe because the safety invariants of
+        // VecWithInitialized say that the first num_initialized bytes must be
+        // initialized.
+        let mut read_buf = ReadBuf::uninit(slice);
+        unsafe {
+            read_buf.assume_init(num_initialized);
+        }
+        read_buf.set_filled(len);
+
+        read_buf
+    }
+
+    pub(crate) fn apply_read_buf(&mut self, parts: ReadBufParts) {
+        let vec = self.vec.as_mut();
+        assert_eq!(vec.as_ptr(), parts.ptr);
+
+        // SAFETY:
+        // The ReadBufParts really does point inside `self.vec` due to the above
+        // check, and the safety invariants of `ReadBuf` guarantee that the
+        // first `parts.initialized` bytes of `self.vec` really have been
+        // initialized. Additionally, `ReadBuf` guarantees that `parts.len` is
+        // at most `parts.initialized`, so the first `parts.len` bytes are also
+        // initialized.
+        //
+        // Note that this relies on the fact that `V` is either `Vec<u8>` or
+        // `&mut Vec<u8>`, so the vector returned by `self.vec.as_mut()` cannot
+        // change from call to call.
+        unsafe {
+            self.num_initialized = parts.initialized;
+            vec.set_len(parts.len);
+        }
+    }
+}
+
+pub(crate) struct ReadBufParts {
+    // Pointer is only used to check that the ReadBuf actually came from the
+    // right VecWithInitialized.
+    ptr: *const u8,
+    len: usize,
+    initialized: usize,
+}
+
+// This is needed to release the borrow on `VecWithInitialized<V>`.
+pub(crate) fn into_read_buf_parts(rb: ReadBuf<'_>) -> ReadBufParts {
+    ReadBufParts {
+        ptr: rb.filled().as_ptr(),
+        len: rb.filled().len(),
+        initialized: rb.initialized().len(),
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_all_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_all_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_all_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_all_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,56 @@
+use crate::io::AsyncWrite;
+
+use bytes::Buf;
+use pin_project_lite::pin_project;
+use std::future::Future;
+use std::io;
+use std::marker::PhantomPinned;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+pin_project! {
+    /// A future to write some of the buffer to an `AsyncWrite`.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct WriteAllBuf<'a, W, B> {
+        writer: &'a mut W,
+        buf: &'a mut B,
+        #[pin]
+        _pin: PhantomPinned,
+    }
+}
+
+/// Tries to write some bytes from the given `buf` to the writer in an
+/// asynchronous manner, returning a future.
+pub(crate) fn write_all_buf<'a, W, B>(writer: &'a mut W, buf: &'a mut B) -> WriteAllBuf<'a, W, B>
+where
+    W: AsyncWrite + Unpin,
+    B: Buf,
+{
+    WriteAllBuf {
+        writer,
+        buf,
+        _pin: PhantomPinned,
+    }
+}
+
+impl<W, B> Future for WriteAllBuf<'_, W, B>
+where
+    W: AsyncWrite + Unpin,
+    B: Buf,
+{
+    type Output = io::Result<()>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        let me = self.project();
+        while me.buf.has_remaining() {
+            let n = ready!(Pin::new(&mut *me.writer).poll_write(cx, me.buf.chunk())?);
+            me.buf.advance(n);
+            if n == 0 {
+                return Poll::Ready(Err(io::ErrorKind::WriteZero.into()));
+            }
+        }
+
+        Poll::Ready(Ok(()))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_all.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,22 @@
 use crate::io::AsyncWrite;
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::mem;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-cfg_io_util! {
+pin_project! {
     #[derive(Debug)]
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct WriteAll<'a, W: ?Sized> {
         writer: &'a mut W,
         buf: &'a [u8],
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -19,7 +24,11 @@
 where
     W: AsyncWrite + Unpin + ?Sized,
 {
-    WriteAll { writer, buf }
+    WriteAll {
+        writer,
+        buf,
+        _pin: PhantomPinned,
+    }
 }
 
 impl<W> Future for WriteAll<'_, W>
@@ -28,13 +37,13 @@
 {
     type Output = io::Result<()>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        let me = &mut *self;
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        let me = self.project();
         while !me.buf.is_empty() {
-            let n = ready!(Pin::new(&mut me.writer).poll_write(cx, me.buf))?;
+            let n = ready!(Pin::new(&mut *me.writer).poll_write(cx, me.buf))?;
             {
-                let (_, rest) = mem::replace(&mut me.buf, &[]).split_at(n);
-                me.buf = rest;
+                let (_, rest) = mem::replace(&mut *me.buf, &[]).split_at(n);
+                *me.buf = rest;
             }
             if n == 0 {
                 return Poll::Ready(Err(io::ErrorKind::WriteZero.into()));
@@ -44,14 +53,3 @@
         Poll::Ready(Ok(()))
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn assert_unpin() {
-        use std::marker::PhantomPinned;
-        crate::is_unpin::<WriteAll<'_, PhantomPinned>>();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_buf.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,22 @@
 use crate::io::AsyncWrite;
 
 use bytes::Buf;
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-cfg_io_util! {
+pin_project! {
     /// A future to write some of the buffer to an `AsyncWrite`.
     #[derive(Debug)]
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct WriteBuf<'a, W, B> {
         writer: &'a mut W,
         buf: &'a mut B,
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -23,7 +27,11 @@
     W: AsyncWrite + Unpin,
     B: Buf,
 {
-    WriteBuf { writer, buf }
+    WriteBuf {
+        writer,
+        buf,
+        _pin: PhantomPinned,
+    }
 }
 
 impl<W, B> Future for WriteBuf<'_, W, B>
@@ -33,8 +41,15 @@
 {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
-        let me = &mut *self;
-        Pin::new(&mut *me.writer).poll_write_buf(cx, me.buf)
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
+        let me = self.project();
+
+        if !me.buf.has_remaining() {
+            return Poll::Ready(Ok(0));
+        }
+
+        let n = ready!(Pin::new(me.writer).poll_write(cx, me.buf.chunk()))?;
+        me.buf.advance(n);
+        Poll::Ready(Ok(n))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_int.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_int.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_int.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_int.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,7 @@
 use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::mem::size_of;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -15,20 +16,25 @@
     ($name:ident, $ty:ty, $writer:ident, $bytes:expr) => {
         pin_project! {
             #[doc(hidden)]
+            #[must_use = "futures do nothing unless you `.await` or poll them"]
             pub struct $name<W> {
                 #[pin]
                 dst: W,
                 buf: [u8; $bytes],
                 written: u8,
+                // Make this future `!Unpin` for compatibility with async trait methods.
+                #[pin]
+                _pin: PhantomPinned,
             }
         }
 
         impl<W> $name<W> {
             pub(crate) fn new(w: W, value: $ty) -> Self {
-                let mut writer = $name {
+                let mut writer = Self {
                     buf: [0; $bytes],
                     written: 0,
                     dst: w,
+                    _pin: PhantomPinned,
                 };
                 BufMut::$writer(&mut &mut writer.buf[..], value);
                 writer
@@ -72,16 +78,24 @@
     ($name:ident, $ty:ty) => {
         pin_project! {
             #[doc(hidden)]
+            #[must_use = "futures do nothing unless you `.await` or poll them"]
             pub struct $name<W> {
                 #[pin]
                 dst: W,
                 byte: $ty,
+                // Make this future `!Unpin` for compatibility with async trait methods.
+                #[pin]
+                _pin: PhantomPinned,
             }
         }
 
         impl<W> $name<W> {
             pub(crate) fn new(dst: W, byte: $ty) -> Self {
-                Self { dst, byte }
+                Self {
+                    dst,
+                    byte,
+                    _pin: PhantomPinned,
+                }
             }
         }
 
@@ -121,6 +135,9 @@
 writer!(WriteI64, i64, put_i64);
 writer!(WriteI128, i128, put_i128);
 
+writer!(WriteF32, f32, put_f32);
+writer!(WriteF64, f64, put_f64);
+
 writer!(WriteU16Le, u16, put_u16_le);
 writer!(WriteU32Le, u32, put_u32_le);
 writer!(WriteU64Le, u64, put_u64_le);
@@ -130,3 +147,6 @@
 writer!(WriteI32Le, i32, put_i32_le);
 writer!(WriteI64Le, i64, put_i64_le);
 writer!(WriteI128Le, i128, put_i128_le);
+
+writer!(WriteF32Le, f32, put_f32_le);
+writer!(WriteF64Le, f64, put_f64_le);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,22 @@
 use crate::io::AsyncWrite;
 
+use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
+use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-cfg_io_util! {
+pin_project! {
     /// A future to write some of the buffer to an `AsyncWrite`.
     #[derive(Debug)]
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub struct Write<'a, W: ?Sized> {
         writer: &'a mut W,
         buf: &'a [u8],
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
     }
 }
 
@@ -21,7 +26,11 @@
 where
     W: AsyncWrite + Unpin + ?Sized,
 {
-    Write { writer, buf }
+    Write {
+        writer,
+        buf,
+        _pin: PhantomPinned,
+    }
 }
 
 impl<W> Future for Write<'_, W>
@@ -30,8 +39,8 @@
 {
     type Output = io::Result<usize>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
-        let me = &mut *self;
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
+        let me = self.project();
         Pin::new(&mut *me.writer).poll_write(cx, me.buf)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_vectored.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_vectored.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/io/util/write_vectored.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/io/util/write_vectored.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+use crate::io::AsyncWrite;
+
+use pin_project_lite::pin_project;
+use std::io;
+use std::marker::PhantomPinned;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::{future::Future, io::IoSlice};
+
+pin_project! {
+    /// A future to write a slice of buffers to an `AsyncWrite`.
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct WriteVectored<'a, 'b, W: ?Sized> {
+        writer: &'a mut W,
+        bufs: &'a [IoSlice<'b>],
+        // Make this future `!Unpin` for compatibility with async trait methods.
+        #[pin]
+        _pin: PhantomPinned,
+    }
+}
+
+pub(crate) fn write_vectored<'a, 'b, W>(
+    writer: &'a mut W,
+    bufs: &'a [IoSlice<'b>],
+) -> WriteVectored<'a, 'b, W>
+where
+    W: AsyncWrite + Unpin + ?Sized,
+{
+    WriteVectored {
+        writer,
+        bufs,
+        _pin: PhantomPinned,
+    }
+}
+
+impl<W> Future for WriteVectored<'_, '_, W>
+where
+    W: AsyncWrite + Unpin + ?Sized,
+{
+    type Output = io::Result<usize>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
+        let me = self.project();
+        Pin::new(&mut *me.writer).poll_write_vectored(cx, me.bufs)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,7 @@
-#![doc(html_root_url = "https://docs.rs/tokio/0.2.24")]
 #![allow(
     clippy::cognitive_complexity,
     clippy::large_enum_variant,
-    clippy::needless_doctest_main,
-    clippy::match_like_matches_macro,
-    clippy::stable_sort_primitive
+    clippy::needless_doctest_main
 )]
 #![warn(
     missing_debug_implementations,
@@ -12,21 +9,23 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![cfg_attr(docsrs, deny(broken_intra_doc_links))]
+#![deny(unused_must_use)]
+#![cfg_attr(docsrs, deny(rustdoc::broken_intra_doc_links))]
 #![doc(test(
     no_crate_inject,
     attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
 ))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, allow(unused_attributes))]
 
-//! A runtime for writing reliable, asynchronous, and slim applications.
+//! A runtime for writing reliable network applications without compromising speed.
 //!
 //! Tokio is an event-driven, non-blocking I/O platform for writing asynchronous
 //! applications with the Rust programming language. At a high level, it
 //! provides a few major components:
 //!
 //! * Tools for [working with asynchronous tasks][tasks], including
-//!   [synchronization primitives and channels][sync] and [timeouts, delays, and
+//!   [synchronization primitives and channels][sync] and [timeouts, sleeps, and
 //!   intervals][time].
 //! * APIs for [performing asynchronous I/O][io], including [TCP and UDP][net] sockets,
 //!   [filesystem][fs] operations, and [process] and [signal] management.
@@ -59,59 +58,9 @@
 //! enabling the `full` feature flag:
 //!
 //! ```toml
-//! tokio = { version = "0.2", features = ["full"] }
+//! tokio = { version = "1", features = ["full"] }
 //! ```
 //!
-//! ## Feature flags
-//!
-//! Tokio uses a set of [feature flags] to reduce the amount of compiled code. It
-//! is possible to just enable certain features over others. By default, Tokio
-//! does not enable any features but allows one to enable a subset for their use
-//! case. Below is a list of the available feature flags. You may also notice
-//! above each function, struct and trait there is listed one or more feature flags
-//! that are required for that item to be used. If you are new to Tokio it is
-//! recommended that you use the `full` feature flag which will enable all public APIs.
-//! Beware though that this will pull in many extra dependencies that you may not
-//! need.
-//!
-//! - `full`: Enables all Tokio public API features listed below.
-//! - `rt-core`: Enables `tokio::spawn` and the basic (single-threaded) scheduler.
-//! - `rt-threaded`: Enables the heavier, multi-threaded, work-stealing scheduler.
-//! - `rt-util`: Enables non-scheduler utilities.
-//! - `io-driver`: Enables the `mio` based IO driver.
-//! - `io-util`: Enables the IO based `Ext` traits.
-//! - `io-std`: Enable `Stdout`, `Stdin` and `Stderr` types.
-//! - `net`: Enables `tokio::net` types such as `TcpStream`, `UnixStream` and `UdpSocket`.
-//! - `tcp`: Enables all `tokio::net::tcp` types.
-//! - `udp`: Enables all `tokio::net::udp` types.
-//! - `uds`: Enables all `tokio::net::unix` types.
-//! - `time`: Enables `tokio::time` types and allows the schedulers to enable
-//! the built in timer.
-//! - `process`: Enables `tokio::process` types.
-//! - `macros`: Enables `#[tokio::main]` and `#[tokio::test]` macros.
-//! - `sync`: Enables all `tokio::sync` types.
-//! - `stream`: Enables optional `Stream` implementations for types within Tokio.
-//! - `signal`: Enables all `tokio::signal` types.
-//! - `fs`: Enables `tokio::fs` types.
-//! - `dns`: Enables async `tokio::net::ToSocketAddrs`.
-//! - `test-util`: Enables testing based infrastructure for the Tokio runtime.
-//! - `blocking`: Enables `block_in_place` and `spawn_blocking`.
-//!
-//! _Note: `AsyncRead` and `AsyncWrite` traits do not require any features and are
-//! always available._
-//!
-//! ### Internal features
-//!
-//! These features do not expose any new API, but influence internal
-//! implementation aspects of Tokio, and can pull in additional
-//! dependencies. They are not included in `full`:
-//!
-//! - `parking_lot`: As a potential optimization, use the _parking_lot_ crate's
-//! synchronization primitives internally. MSRV may increase according to the
-//! _parking_lot_ release in use.
-//!
-//! [feature flags]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section
-//!
 //! ### Authoring applications
 //!
 //! Tokio is great for writing applications and most users in this case shouldn't
@@ -124,12 +73,12 @@
 //! This example shows the quickest way to get started with Tokio.
 //!
 //! ```toml
-//! tokio = { version = "0.2", features = ["full"] }
+//! tokio = { version = "1", features = ["full"] }
 //! ```
 //!
 //! ### Authoring libraries
 //!
-//! As a library author your goal should be to provide the lighest weight crate
+//! As a library author your goal should be to provide the lightest weight crate
 //! that is based on Tokio. To achieve this you should ensure that you only enable
 //! the features you need. This allows users to pick up your crate without having
 //! to enable unnecessary features.
@@ -140,7 +89,7 @@
 //! needs to `tokio::spawn` and use a `TcpStream`.
 //!
 //! ```toml
-//! tokio = { version = "0.2", features = ["rt-core", "tcp"] }
+//! tokio = { version = "1", features = ["rt", "net"] }
 //! ```
 //!
 //! ## Working With Tasks
@@ -154,7 +103,7 @@
 //! * Functions for [running blocking operations][blocking] in an asynchronous
 //!   task context.
 //!
-//! The [`tokio::task`] module is present only when the "rt-core" feature flag
+//! The [`tokio::task`] module is present only when the "rt" feature flag
 //! is enabled.
 //!
 //! [tasks]: task/index.html#what-are-tasks
@@ -185,25 +134,26 @@
 //!
 //! The [`tokio::time`] module provides utilities for tracking time and
 //! scheduling work. This includes functions for setting [timeouts][timeout] for
-//! tasks, [delaying][delay] work to run in the future, or [repeating an operation at an
+//! tasks, [sleeping][sleep] work to run in the future, or [repeating an operation at an
 //! interval][interval].
 //!
 //! In order to use `tokio::time`, the "time" feature flag must be enabled.
 //!
 //! [`tokio::time`]: crate::time
-//! [delay]: crate::time::delay_for()
+//! [sleep]: crate::time::sleep()
 //! [interval]: crate::time::interval()
 //! [timeout]: crate::time::timeout()
 //!
 //! Finally, Tokio provides a _runtime_ for executing asynchronous tasks. Most
 //! applications can use the [`#[tokio::main]`][main] macro to run their code on the
-//! Tokio runtime. In use-cases where manual control over the runtime is
-//! required, the [`tokio::runtime`] module provides APIs for configuring and
-//! managing runtimes.
-//!
-//! Using the runtime requires the "rt-core" or "rt-threaded" feature flags, to
-//! enable the basic [single-threaded scheduler][rt-core] and the [thread-pool
-//! scheduler][rt-threaded], respectively. See the [`runtime` module
+//! Tokio runtime. However, this macro provides only basic configuration options. As
+//! an alternative, the [`tokio::runtime`] module provides more powerful APIs for configuring
+//! and managing runtimes. You should use that module if the `#[tokio::main]` macro doesn't
+//! provide the functionality you need.
+//!
+//! Using the runtime requires the "rt" or "rt-multi-thread" feature flags, to
+//! enable the basic [single-threaded scheduler][rt] and the [thread-pool
+//! scheduler][rt-multi-thread], respectively. See the [`runtime` module
 //! documentation][rt-features] for details. In addition, the "macros" feature
 //! flag enables the `#[tokio::main]` and `#[tokio::test]` attributes.
 //!
@@ -211,8 +161,8 @@
 //! [`tokio::runtime`]: crate::runtime
 //! [`Builder`]: crate::runtime::Builder
 //! [`Runtime`]: crate::runtime::Runtime
-//! [rt-core]: runtime/index.html#basic-scheduler
-//! [rt-threaded]: runtime/index.html#threaded-scheduler
+//! [rt]: runtime/index.html#basic-scheduler
+//! [rt-multi-thread]: runtime/index.html#threaded-scheduler
 //! [rt-features]: runtime/index.html#runtime-scheduler
 //!
 //! ## CPU-bound tasks and blocking code
@@ -224,16 +174,18 @@
 //! combat this, Tokio provides two kinds of threads: Core threads and blocking
 //! threads. The core threads are where all asynchronous code runs, and Tokio
 //! will by default spawn one for each CPU core. The blocking threads are
-//! spawned on demand, and can be used to run blocking code that would otherwise
-//! block other tasks from running. Since it is not possible for Tokio to swap
-//! out blocking tasks, like it can do with asynchronous code, the upper limit
-//! on the number of blocking threads is very large. These limits can be
-//! configured on the [`Builder`].
+//! spawned on demand, can be used to run blocking code that would otherwise
+//! block other tasks from running and are kept alive when not used for a certain
+//! amount of time which can be configured with [`thread_keep_alive`].
+//! Since it is not possible for Tokio to swap out blocking tasks, like it
+//! can do with asynchronous code, the upper limit on the number of blocking
+//! threads is very large. These limits can be configured on the [`Builder`].
 //!
 //! To spawn a blocking task, you should use the [`spawn_blocking`] function.
 //!
 //! [`Builder`]: crate::runtime::Builder
 //! [`spawn_blocking`]: crate::task::spawn_blocking()
+//! [`thread_keep_alive`]: crate::runtime::Builder::thread_keep_alive()
 //!
 //! ```
 //! #[tokio::main]
@@ -269,8 +221,7 @@
 //! the [`AsyncRead`], [`AsyncWrite`], and [`AsyncBufRead`] traits. In addition,
 //! when the "io-util" feature flag is enabled, it also provides combinators and
 //! functions for working with these traits, forming as an asynchronous
-//! counterpart to [`std::io`]. When the "io-driver" feature flag is enabled, it
-//! also provides utilities for library authors implementing I/O resources.
+//! counterpart to [`std::io`].
 //!
 //! Tokio also includes APIs for performing various kinds of I/O and interacting
 //! with the operating system asynchronously. These include:
@@ -291,7 +242,7 @@
 //! [`std::io`]: std::io
 //! [`tokio::net`]: crate::net
 //! [TCP]: crate::net::tcp
-//! [UDP]: crate::net::udp
+//! [UDP]: crate::net::UdpSocket
 //! [UDS]: crate::net::unix
 //! [`tokio::fs`]: crate::fs
 //! [`std::fs`]: std::fs
@@ -304,11 +255,11 @@
 //!
 //! ```no_run
 //! use tokio::net::TcpListener;
-//! use tokio::prelude::*;
+//! use tokio::io::{AsyncReadExt, AsyncWriteExt};
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn std::error::Error>> {
-//!     let mut listener = TcpListener::bind("127.0.0.1:8080").await?;
+//!     let listener = TcpListener::bind("127.0.0.1:8080").await?;
 //!
 //!     loop {
 //!         let (mut socket, _) = listener.accept().await?;
@@ -338,6 +289,59 @@
 //!     }
 //! }
 //! ```
+//!
+//! ## Feature flags
+//!
+//! Tokio uses a set of [feature flags] to reduce the amount of compiled code. It
+//! is possible to just enable certain features over others. By default, Tokio
+//! does not enable any features but allows one to enable a subset for their use
+//! case. Below is a list of the available feature flags. You may also notice
+//! above each function, struct and trait there is listed one or more feature flags
+//! that are required for that item to be used. If you are new to Tokio it is
+//! recommended that you use the `full` feature flag which will enable all public APIs.
+//! Beware though that this will pull in many extra dependencies that you may not
+//! need.
+//!
+//! - `full`: Enables all Tokio public API features listed below except `test-util`.
+//! - `rt`: Enables `tokio::spawn`, the basic (current thread) scheduler,
+//!         and non-scheduler utilities.
+//! - `rt-multi-thread`: Enables the heavier, multi-threaded, work-stealing scheduler.
+//! - `io-util`: Enables the IO based `Ext` traits.
+//! - `io-std`: Enable `Stdout`, `Stdin` and `Stderr` types.
+//! - `net`: Enables `tokio::net` types such as `TcpStream`, `UnixStream` and `UdpSocket`,
+//!          as well as (on Unix-like systems) `AsyncFd`
+//! - `time`: Enables `tokio::time` types and allows the schedulers to enable
+//!           the built in timer.
+//! - `process`: Enables `tokio::process` types.
+//! - `macros`: Enables `#[tokio::main]` and `#[tokio::test]` macros.
+//! - `sync`: Enables all `tokio::sync` types.
+//! - `signal`: Enables all `tokio::signal` types.
+//! - `fs`: Enables `tokio::fs` types.
+//! - `test-util`: Enables testing based infrastructure for the Tokio runtime.
+//!
+//! _Note: `AsyncRead` and `AsyncWrite` traits do not require any features and are
+//! always available._
+//!
+//! ### Internal features
+//!
+//! These features do not expose any new API, but influence internal
+//! implementation aspects of Tokio, and can pull in additional
+//! dependencies.
+//!
+//! - `parking_lot`: As a potential optimization, use the _parking_lot_ crate's
+//! synchronization primitives internally. MSRV may increase according to the
+//! _parking_lot_ release in use.
+//!
+//! ### Unstable features
+//!
+//! These feature flags enable **unstable** features. The public API may break in 1.x
+//! releases. To enable these features, the `--cfg tokio_unstable` must be passed to
+//! `rustc` when compiling. This is easiest done using the `RUSTFLAGS` env variable:
+//! `RUSTFLAGS="--cfg tokio_unstable"`.
+//!
+//! - `tracing`: Enables tracing events.
+//!
+//! [feature flags]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section
 
 // Includes re-exports used by macros.
 //
@@ -351,8 +355,7 @@
     pub mod fs;
 }
 
-#[doc(hidden)]
-pub mod future;
+mod future;
 
 pub mod io;
 pub mod net;
@@ -360,13 +363,16 @@
 mod loom;
 mod park;
 
-pub mod prelude;
-
 cfg_process! {
     pub mod process;
 }
 
-pub mod runtime;
+#[cfg(any(feature = "net", feature = "fs", feature = "io-std"))]
+mod blocking;
+
+cfg_rt! {
+    pub mod runtime;
+}
 
 pub(crate) mod coop;
 
@@ -374,8 +380,11 @@
     pub mod signal;
 }
 
-cfg_stream! {
-    pub mod stream;
+cfg_signal_internal! {
+    #[cfg(not(feature = "signal"))]
+    #[allow(dead_code)]
+    #[allow(unreachable_pub)]
+    pub(crate) mod signal;
 }
 
 cfg_sync! {
@@ -385,8 +394,8 @@
     mod sync;
 }
 
-cfg_rt_core! {
-    pub mod task;
+pub mod task;
+cfg_rt! {
     pub use task::spawn;
 }
 
@@ -396,6 +405,67 @@
 
 mod util;
 
+/// Due to the `Stream` trait's inclusion in `std` landing later than Tokio's 1.0
+/// release, most of the Tokio stream utilities have been moved into the [`tokio-stream`]
+/// crate.
+///
+/// # Why was `Stream` not included in Tokio 1.0?
+///
+/// Originally, we had planned to ship Tokio 1.0 with a stable `Stream` type
+/// but unfortunately the [RFC] had not been merged in time for `Stream` to
+/// reach `std` on a stable compiler in time for the 1.0 release of Tokio. For
+/// this reason, the team has decided to move all `Stream` based utilities to
+/// the [`tokio-stream`] crate. While this is not ideal, once `Stream` has made
+/// it into the standard library and the MSRV period has passed, we will implement
+/// stream for our different types.
+///
+/// While this may seem unfortunate, not all is lost as you can get much of the
+/// `Stream` support with `async/await` and `while let` loops. It is also possible
+/// to create a `impl Stream` from `async fn` using the [`async-stream`] crate.
+///
+/// [`tokio-stream`]: https://docs.rs/tokio-stream
+/// [`async-stream`]: https://docs.rs/async-stream
+/// [RFC]: https://github.com/rust-lang/rfcs/pull/2996
+///
+/// # Example
+///
+/// Convert a [`sync::mpsc::Receiver`] to an `impl Stream`.
+///
+/// ```rust,no_run
+/// use tokio::sync::mpsc;
+///
+/// let (tx, mut rx) = mpsc::channel::<usize>(16);
+///
+/// let stream = async_stream::stream! {
+///     while let Some(item) = rx.recv().await {
+///         yield item;
+///     }
+/// };
+/// ```
+pub mod stream {}
+
+// local re-exports of platform specific things, allowing for decent
+// documentation to be shimmed in on docs.rs
+
+#[cfg(docsrs)]
+pub mod doc;
+
+#[cfg(docsrs)]
+#[allow(unused)]
+pub(crate) use self::doc::os;
+
+#[cfg(not(docsrs))]
+#[allow(unused)]
+pub(crate) use std::os;
+
+#[cfg(docsrs)]
+#[allow(unused)]
+pub(crate) use self::doc::winapi;
+
+#[cfg(all(not(docsrs), windows, feature = "net"))]
+#[allow(unused)]
+pub(crate) use ::winapi;
+
 cfg_macros! {
     /// Implementation detail of the `select!` macro. This macro is **not**
     /// intended to be used as part of the public API and is permitted to
@@ -403,31 +473,36 @@
     #[doc(hidden)]
     pub use tokio_macros::select_priv_declare_output_enum;
 
-    doc_rt_core! {
-        cfg_rt_threaded! {
-            // This is the docs.rs case (with all features) so make sure macros
-            // is included in doc(cfg).
-
-            #[cfg(not(test))] // Work around for rust-lang/rust#62127
-            #[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
-            pub use tokio_macros::main_threaded as main;
+    cfg_rt! {
+        #[cfg(feature = "rt-multi-thread")]
+        #[cfg(not(test))] // Work around for rust-lang/rust#62127
+        #[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
+        #[doc(inline)]
+        pub use tokio_macros::main;
 
-            #[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
-            pub use tokio_macros::test_threaded as test;
-        }
+        #[cfg(feature = "rt-multi-thread")]
+        #[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
+        #[doc(inline)]
+        pub use tokio_macros::test;
 
-        cfg_not_rt_threaded! {
+        cfg_not_rt_multi_thread! {
             #[cfg(not(test))] // Work around for rust-lang/rust#62127
-            pub use tokio_macros::main_basic as main;
-            pub use tokio_macros::test_basic as test;
+            #[doc(inline)]
+            pub use tokio_macros::main_rt as main;
+
+            #[doc(inline)]
+            pub use tokio_macros::test_rt as test;
         }
     }
 
-    // Maintains old behavior
-    cfg_not_rt_core! {
+    // Always fail if rt is not enabled.
+    cfg_not_rt! {
         #[cfg(not(test))]
-        pub use tokio_macros::main;
-        pub use tokio_macros::test;
+        #[doc(inline)]
+        pub use tokio_macros::main_fail as main;
+
+        #[doc(inline)]
+        pub use tokio_macros::test_fail as test;
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/mocked.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/mocked.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/mocked.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/mocked.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,32 @@
 pub(crate) use loom::*;
 
+pub(crate) mod sync {
+
+    pub(crate) use loom::sync::MutexGuard;
+
+    #[derive(Debug)]
+    pub(crate) struct Mutex<T>(loom::sync::Mutex<T>);
+
+    #[allow(dead_code)]
+    impl<T> Mutex<T> {
+        #[inline]
+        pub(crate) fn new(t: T) -> Mutex<T> {
+            Mutex(loom::sync::Mutex::new(t))
+        }
+
+        #[inline]
+        pub(crate) fn lock(&self) -> MutexGuard<'_, T> {
+            self.0.lock().unwrap()
+        }
+
+        #[inline]
+        pub(crate) fn try_lock(&self) -> Option<MutexGuard<'_, T>> {
+            self.0.try_lock().ok()
+        }
+    }
+    pub(crate) use loom::sync::*;
+}
+
 pub(crate) mod rand {
     pub(crate) fn seed() -> u64 {
         1
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,8 @@
 //! This module abstracts over `loom` and `std::sync` depending on whether we
 //! are running tests or not.
 
+#![allow(unused)]
+
 #[cfg(not(all(test, loom)))]
 mod std;
 #[cfg(not(all(test, loom)))]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_ptr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_ptr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_ptr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_ptr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 use std::fmt;
-use std::ops::Deref;
+use std::ops::{Deref, DerefMut};
 
 /// `AtomicPtr` providing an additional `load_unsync` function.
 pub(crate) struct AtomicPtr<T> {
@@ -21,6 +21,12 @@
     }
 }
 
+impl<T> DerefMut for AtomicPtr<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.inner
+    }
+}
+
 impl<T> fmt::Debug for AtomicPtr<T> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.deref().fmt(fmt)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u16.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u16.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u16.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u16.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 unsafe impl Sync for AtomicU16 {}
 
 impl AtomicU16 {
-    pub(crate) fn new(val: u16) -> AtomicU16 {
+    pub(crate) const fn new(val: u16) -> AtomicU16 {
         let inner = UnsafeCell::new(std::sync::atomic::AtomicU16::new(val));
         AtomicU16 { inner }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u32.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u32.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 unsafe impl Sync for AtomicU32 {}
 
 impl AtomicU32 {
-    pub(crate) fn new(val: u32) -> AtomicU32 {
+    pub(crate) const fn new(val: u32) -> AtomicU32 {
         let inner = UnsafeCell::new(std::sync::atomic::AtomicU32::new(val));
         AtomicU32 { inner }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u64.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u64.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u64.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u64.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,21 +2,17 @@
 //! re-export of `AtomicU64`. On 32 bit platforms, this is implemented using a
 //! `Mutex`.
 
-pub(crate) use self::imp::AtomicU64;
-
 // `AtomicU64` can only be used on targets with `target_has_atomic` is 64 or greater.
 // Once `cfg_target_has_atomic` feature is stable, we can replace it with
 // `#[cfg(target_has_atomic = "64")]`.
 // Refs: https://github.com/rust-lang/rust/tree/master/src/librustc_target
-#[cfg(not(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc")))]
-mod imp {
+cfg_has_atomic_u64! {
     pub(crate) use std::sync::atomic::AtomicU64;
 }
 
-#[cfg(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc"))]
-mod imp {
+cfg_not_has_atomic_u64! {
+    use crate::loom::sync::Mutex;
     use std::sync::atomic::Ordering;
-    use std::sync::Mutex;
 
     #[derive(Debug)]
     pub(crate) struct AtomicU64 {
@@ -24,37 +20,52 @@
     }
 
     impl AtomicU64 {
-        pub(crate) fn new(val: u64) -> AtomicU64 {
-            AtomicU64 {
+        pub(crate) fn new(val: u64) -> Self {
+            Self {
                 inner: Mutex::new(val),
             }
         }
 
         pub(crate) fn load(&self, _: Ordering) -> u64 {
-            *self.inner.lock().unwrap()
+            *self.inner.lock()
         }
 
         pub(crate) fn store(&self, val: u64, _: Ordering) {
-            *self.inner.lock().unwrap() = val;
+            *self.inner.lock() = val;
         }
 
         pub(crate) fn fetch_or(&self, val: u64, _: Ordering) -> u64 {
-            let mut lock = self.inner.lock().unwrap();
+            let mut lock = self.inner.lock();
             let prev = *lock;
             *lock = prev | val;
             prev
         }
 
-        pub(crate) fn compare_and_swap(&self, old: u64, new: u64, _: Ordering) -> u64 {
-            let mut lock = self.inner.lock().unwrap();
-            let prev = *lock;
-
-            if prev != old {
-                return prev;
+        pub(crate) fn compare_exchange(
+            &self,
+            current: u64,
+            new: u64,
+            _success: Ordering,
+            _failure: Ordering,
+        ) -> Result<u64, u64> {
+            let mut lock = self.inner.lock();
+
+            if *lock == current {
+                *lock = new;
+                Ok(current)
+            } else {
+                Err(*lock)
             }
+        }
 
-            *lock = new;
-            prev
+        pub(crate) fn compare_exchange_weak(
+            &self,
+            current: u64,
+            new: u64,
+            success: Ordering,
+            failure: Ordering,
+        ) -> Result<u64, u64> {
+            self.compare_exchange(current, new, success, failure)
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u8.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u8.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u8.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_u8.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 unsafe impl Sync for AtomicU8 {}
 
 impl AtomicU8 {
-    pub(crate) fn new(val: u8) -> AtomicU8 {
+    pub(crate) const fn new(val: u8) -> AtomicU8 {
         let inner = UnsafeCell::new(std::sync::atomic::AtomicU8::new(val));
         AtomicU8 { inner }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_usize.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_usize.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_usize.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/atomic_usize.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 unsafe impl Sync for AtomicUsize {}
 
 impl AtomicUsize {
-    pub(crate) fn new(val: usize) -> AtomicUsize {
+    pub(crate) const fn new(val: usize) -> AtomicUsize {
         let inner = UnsafeCell::new(std::sync::atomic::AtomicUsize::new(val));
         AtomicUsize { inner }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,6 +6,7 @@
 mod atomic_u64;
 mod atomic_u8;
 mod atomic_usize;
+mod mutex;
 #[cfg(feature = "parking_lot")]
 mod parking_lot;
 mod unsafe_cell;
@@ -14,7 +15,12 @@
     pub(crate) use super::unsafe_cell::UnsafeCell;
 }
 
-#[cfg(any(feature = "sync", feature = "io-driver"))]
+#[cfg(any(
+    feature = "net",
+    feature = "process",
+    feature = "signal",
+    feature = "sync",
+))]
 pub(crate) mod future {
     pub(crate) use crate::sync::AtomicWaker;
 }
@@ -41,7 +47,7 @@
 }
 
 pub(crate) mod sync {
-    pub(crate) use std::sync::Arc;
+    pub(crate) use std::sync::{Arc, Weak};
 
     // Below, make sure all the feature-influenced types are exported for
     // internal use. Note however that some are not _currently_ named by
@@ -55,9 +61,10 @@
 
     #[cfg(not(feature = "parking_lot"))]
     #[allow(unused_imports)]
-    pub(crate) use std::sync::{
-        Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult,
-    };
+    pub(crate) use std::sync::{Condvar, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult};
+
+    #[cfg(not(feature = "parking_lot"))]
+    pub(crate) use crate::loom::std::mutex::Mutex;
 
     pub(crate) mod atomic {
         pub(crate) use crate::loom::std::atomic_ptr::AtomicPtr;
@@ -67,17 +74,20 @@
         pub(crate) use crate::loom::std::atomic_u8::AtomicU8;
         pub(crate) use crate::loom::std::atomic_usize::AtomicUsize;
 
-        pub(crate) use std::sync::atomic::{spin_loop_hint, AtomicBool};
+        pub(crate) use std::sync::atomic::{fence, AtomicBool, Ordering};
+        // TODO: once we bump MSRV to 1.49+, use `hint::spin_loop` instead.
+        #[allow(deprecated)]
+        pub(crate) use std::sync::atomic::spin_loop_hint;
     }
 }
 
 pub(crate) mod sys {
-    #[cfg(feature = "rt-threaded")]
+    #[cfg(feature = "rt-multi-thread")]
     pub(crate) fn num_cpus() -> usize {
         usize::max(1, num_cpus::get())
     }
 
-    #[cfg(not(feature = "rt-threaded"))]
+    #[cfg(not(feature = "rt-multi-thread"))]
     pub(crate) fn num_cpus() -> usize {
         1
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/mutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/mutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/mutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/mutex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+use std::sync::{self, MutexGuard, TryLockError};
+
+/// Adapter for `std::Mutex` that removes the poisoning aspects
+// from its api
+#[derive(Debug)]
+pub(crate) struct Mutex<T: ?Sized>(sync::Mutex<T>);
+
+#[allow(dead_code)]
+impl<T> Mutex<T> {
+    #[inline]
+    pub(crate) fn new(t: T) -> Mutex<T> {
+        Mutex(sync::Mutex::new(t))
+    }
+
+    #[inline]
+    pub(crate) fn lock(&self) -> MutexGuard<'_, T> {
+        match self.0.lock() {
+            Ok(guard) => guard,
+            Err(p_err) => p_err.into_inner(),
+        }
+    }
+
+    #[inline]
+    pub(crate) fn try_lock(&self) -> Option<MutexGuard<'_, T>> {
+        match self.0.try_lock() {
+            Ok(guard) => Some(guard),
+            Err(TryLockError::Poisoned(p_err)) => Some(p_err.into_inner()),
+            Err(TryLockError::WouldBlock) => None,
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/parking_lot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/parking_lot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/parking_lot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/parking_lot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 //!
 //! This can be extended to additional types/methods as required.
 
-use std::sync::{LockResult, TryLockError, TryLockResult};
+use std::sync::LockResult;
 use std::time::Duration;
 
 // Types that do not need wrapping
@@ -27,16 +27,25 @@
     }
 
     #[inline]
-    pub(crate) fn lock(&self) -> LockResult<MutexGuard<'_, T>> {
-        Ok(self.0.lock())
+    #[cfg(all(feature = "parking_lot", not(all(loom, test)),))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "parking_lot",))))]
+    pub(crate) const fn const_new(t: T) -> Mutex<T> {
+        Mutex(parking_lot::const_mutex(t))
     }
 
     #[inline]
-    pub(crate) fn try_lock(&self) -> TryLockResult<MutexGuard<'_, T>> {
-        match self.0.try_lock() {
-            Some(guard) => Ok(guard),
-            None => Err(TryLockError::WouldBlock),
-        }
+    pub(crate) fn lock(&self) -> MutexGuard<'_, T> {
+        self.0.lock()
+    }
+
+    #[inline]
+    pub(crate) fn try_lock(&self) -> Option<MutexGuard<'_, T>> {
+        self.0.try_lock()
+    }
+
+    #[inline]
+    pub(crate) fn get_mut(&mut self) -> &mut T {
+        self.0.get_mut()
     }
 
     // Note: Additional methods `is_poisoned` and `into_inner`, can be
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/unsafe_cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/unsafe_cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/loom/std/unsafe_cell.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/loom/std/unsafe_cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 pub(crate) struct UnsafeCell<T>(std::cell::UnsafeCell<T>);
 
 impl<T> UnsafeCell<T> {
-    pub(crate) fn new(data: T) -> UnsafeCell<T> {
+    pub(crate) const fn new(data: T) -> UnsafeCell<T> {
         UnsafeCell(std::cell::UnsafeCell::new(data))
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/cfg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/cfg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/cfg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/cfg.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,144 +1,114 @@
 #![allow(unused_macros)]
 
-macro_rules! cfg_resource_drivers {
-    ($($item:item)*) => {
+macro_rules! feature {
+    (
+        #![$meta:meta]
+        $($item:item)*
+    ) => {
         $(
-            #[cfg(any(feature = "io-driver", feature = "time"))]
+            #[cfg($meta)]
+            #[cfg_attr(docsrs, doc(cfg($meta)))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_blocking {
-    ($($item:item)*) => {
-        $(
-            #[cfg(feature = "blocking")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "blocking")))]
-            $item
-        )*
-    }
-}
-
-/// Enables blocking API internals
-macro_rules! cfg_blocking_impl {
+/// Enables enter::block_on
+macro_rules! cfg_block_on {
     ($($item:item)*) => {
         $(
             #[cfg(any(
-                    feature = "blocking",
                     feature = "fs",
-                    feature = "dns",
+                    feature = "net",
                     feature = "io-std",
-                    feature = "rt-threaded",
+                    feature = "rt",
                     ))]
             $item
         )*
     }
 }
 
-/// Enables blocking API internals
-macro_rules! cfg_blocking_impl_or_task {
+/// Enables internal `AtomicWaker` impl
+macro_rules! cfg_atomic_waker_impl {
     ($($item:item)*) => {
         $(
             #[cfg(any(
-                    feature = "blocking",
-                    feature = "fs",
-                    feature = "dns",
-                    feature = "io-std",
-                    feature = "rt-threaded",
-                    feature = "task",
-                    ))]
+                feature = "net",
+                feature = "process",
+                feature = "rt",
+                feature = "signal",
+                feature = "time",
+            ))]
+            #[cfg(not(loom))]
             $item
         )*
     }
 }
 
-/// Enables enter::block_on
-macro_rules! cfg_block_on {
+macro_rules! cfg_fs {
     ($($item:item)*) => {
         $(
-            #[cfg(any(
-                    feature = "blocking",
-                    feature = "fs",
-                    feature = "dns",
-                    feature = "io-std",
-                    feature = "rt-core",
-                    ))]
+            #[cfg(feature = "fs")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "fs")))]
             $item
         )*
     }
 }
 
-/// Enables blocking API internals
-macro_rules! cfg_not_blocking_impl {
+macro_rules! cfg_io_blocking {
     ($($item:item)*) => {
-        $(
-            #[cfg(not(any(
-                        feature = "blocking",
-                        feature = "fs",
-                        feature = "dns",
-                        feature = "io-std",
-                        feature = "rt-threaded",
-                        )))]
-            $item
-        )*
+        $( #[cfg(any(feature = "io-std", feature = "fs"))] $item )*
     }
 }
 
-/// Enables internal `AtomicWaker` impl
-macro_rules! cfg_atomic_waker_impl {
+macro_rules! cfg_io_driver {
     ($($item:item)*) => {
         $(
             #[cfg(any(
-                feature = "io-driver",
-                feature = "time",
-                all(feature = "rt-core", feature = "rt-util")
+                feature = "net",
+                feature = "process",
+                all(unix, feature = "signal"),
             ))]
-            #[cfg(not(loom))]
-            $item
-        )*
-    }
-}
-
-macro_rules! cfg_dns {
-    ($($item:item)*) => {
-        $(
-            #[cfg(feature = "dns")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "dns")))]
+            #[cfg_attr(docsrs, doc(cfg(any(
+                feature = "net",
+                feature = "process",
+                all(unix, feature = "signal"),
+            ))))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_fs {
-    ($($item:item)*) => {
+macro_rules! cfg_io_driver_impl {
+    ( $( $item:item )* ) => {
         $(
-            #[cfg(feature = "fs")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "fs")))]
+            #[cfg(any(
+                feature = "net",
+                feature = "process",
+                all(unix, feature = "signal"),
+            ))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_io_blocking {
-    ($($item:item)*) => {
-        $( #[cfg(any(feature = "io-std", feature = "fs"))] $item )*
-    }
-}
-
-macro_rules! cfg_io_driver {
+macro_rules! cfg_not_io_driver {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "io-driver")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "io-driver")))]
+            #[cfg(not(any(
+                feature = "net",
+                feature = "process",
+                all(unix, feature = "signal"),
+            )))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_not_io_driver {
+macro_rules! cfg_io_readiness {
     ($($item:item)*) => {
         $(
-            #[cfg(not(feature = "io-driver"))]
+            #[cfg(feature = "net")]
             $item
         )*
     }
@@ -187,121 +157,166 @@
         $(
             #[cfg(feature = "macros")]
             #[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
-            #[doc(inline)]
             $item
         )*
     }
 }
 
-macro_rules! cfg_process {
+macro_rules! cfg_stats {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "process")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "process")))]
-            #[cfg(not(loom))]
+            #[cfg(all(tokio_unstable, feature = "stats"))]
+            #[cfg_attr(docsrs, doc(cfg(feature = "stats")))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_signal {
+macro_rules! cfg_not_stats {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "signal")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "signal")))]
-            #[cfg(not(loom))]
+            #[cfg(not(all(tokio_unstable, feature = "stats")))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_stream {
+macro_rules! cfg_net {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "stream")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
+            #[cfg(feature = "net")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "net")))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_sync {
+macro_rules! cfg_net_unix {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "sync")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "sync")))]
+            #[cfg(all(unix, feature = "net"))]
+            #[cfg_attr(docsrs, doc(cfg(all(unix, feature = "net"))))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_not_sync {
+macro_rules! cfg_net_windows {
     ($($item:item)*) => {
-        $( #[cfg(not(feature = "sync"))] $item )*
+        $(
+            #[cfg(all(any(all(doc, docsrs), windows), feature = "net"))]
+            #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "net"))))]
+            $item
+        )*
+    }
+}
+
+macro_rules! cfg_process {
+    ($($item:item)*) => {
+        $(
+            #[cfg(feature = "process")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "process")))]
+            #[cfg(not(loom))]
+            $item
+        )*
+    }
+}
+
+macro_rules! cfg_process_driver {
+    ($($item:item)*) => {
+        #[cfg(unix)]
+        #[cfg(not(loom))]
+        cfg_process! { $($item)* }
+    }
+}
+
+macro_rules! cfg_not_process_driver {
+    ($($item:item)*) => {
+        $(
+            #[cfg(not(all(unix, not(loom), feature = "process")))]
+            $item
+        )*
     }
 }
 
-macro_rules! cfg_rt_core {
+macro_rules! cfg_signal {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "rt-core")]
+            #[cfg(feature = "signal")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "signal")))]
+            #[cfg(not(loom))]
             $item
         )*
     }
 }
 
-macro_rules! doc_rt_core {
+macro_rules! cfg_signal_internal {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "rt-core")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "rt-core")))]
+            #[cfg(any(feature = "signal", all(unix, feature = "process")))]
+            #[cfg(not(loom))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_not_rt_core {
+macro_rules! cfg_not_signal_internal {
     ($($item:item)*) => {
-        $( #[cfg(not(feature = "rt-core"))] $item )*
+        $(
+            #[cfg(any(loom, not(unix), not(any(feature = "signal", all(unix, feature = "process")))))]
+            $item
+        )*
     }
 }
 
-macro_rules! cfg_rt_threaded {
+macro_rules! cfg_sync {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "rt-threaded")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "rt-threaded")))]
+            #[cfg(feature = "sync")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "sync")))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_rt_util {
+macro_rules! cfg_not_sync {
+    ($($item:item)*) => {
+        $( #[cfg(not(feature = "sync"))] $item )*
+    }
+}
+
+macro_rules! cfg_rt {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "rt-util")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "rt-util")))]
+            #[cfg(feature = "rt")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "rt")))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_not_rt_threaded {
+macro_rules! cfg_not_rt {
     ($($item:item)*) => {
-        $( #[cfg(not(feature = "rt-threaded"))] $item )*
+        $( #[cfg(not(feature = "rt"))] $item )*
     }
 }
 
-macro_rules! cfg_tcp {
+macro_rules! cfg_rt_multi_thread {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "tcp")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "tcp")))]
+            #[cfg(feature = "rt-multi-thread")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "rt-multi-thread")))]
             $item
         )*
     }
 }
 
+macro_rules! cfg_not_rt_multi_thread {
+    ($($item:item)*) => {
+        $( #[cfg(not(feature = "rt-multi-thread"))] $item )*
+    }
+}
+
 macro_rules! cfg_test_util {
     ($($item:item)*) => {
         $(
@@ -334,69 +349,81 @@
     }
 }
 
-macro_rules! cfg_udp {
+macro_rules! cfg_trace {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "udp")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "udp")))]
+            #[cfg(all(tokio_unstable, feature = "tracing"))]
+            #[cfg_attr(docsrs, doc(cfg(feature = "tracing")))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_uds {
+macro_rules! cfg_not_trace {
     ($($item:item)*) => {
         $(
-            #[cfg(all(unix, feature = "uds"))]
-            #[cfg_attr(docsrs, doc(cfg(feature = "uds")))]
+            #[cfg(any(not(tokio_unstable), not(feature = "tracing")))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_unstable {
+macro_rules! cfg_coop {
     ($($item:item)*) => {
         $(
-            #[cfg(tokio_unstable)]
-            #[cfg_attr(docsrs, doc(cfg(tokio_unstable)))]
+            #[cfg(any(
+                    feature = "fs",
+                    feature = "io-std",
+                    feature = "net",
+                    feature = "process",
+                    feature = "rt",
+                    feature = "signal",
+                    feature = "sync",
+                    feature = "time",
+                    ))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_trace {
+macro_rules! cfg_not_coop {
     ($($item:item)*) => {
         $(
-            #[cfg(feature = "tracing")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "tracing")))]
+            #[cfg(not(any(
+                    feature = "fs",
+                    feature = "io-std",
+                    feature = "net",
+                    feature = "process",
+                    feature = "rt",
+                    feature = "signal",
+                    feature = "sync",
+                    feature = "time",
+                    )))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_not_trace {
+macro_rules! cfg_has_atomic_u64 {
     ($($item:item)*) => {
         $(
-            #[cfg(not(feature = "tracing"))]
+            #[cfg(not(any(
+                    target_arch = "arm",
+                    target_arch = "mips",
+                    target_arch = "powerpc"
+                    )))]
             $item
         )*
     }
 }
 
-macro_rules! cfg_coop {
+macro_rules! cfg_not_has_atomic_u64 {
     ($($item:item)*) => {
         $(
             #[cfg(any(
-                    feature = "blocking",
-                    feature = "dns",
-                    feature = "fs",
-                    feature = "io-driver",
-                    feature = "io-std",
-                    feature = "process",
-                    feature = "rt-core",
-                    feature = "sync",
-                    feature = "stream",
-                    feature = "time"
+                    target_arch = "arm",
+                    target_arch = "mips",
+                    target_arch = "powerpc"
                     ))]
             $item
         )*
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,7 +16,7 @@
 mod thread_local;
 
 #[macro_use]
-#[cfg(feature = "rt-core")]
+#[cfg(feature = "rt")]
 pub(crate) mod scoped_tls;
 
 cfg_macros! {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/pin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/pin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/pin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/pin.rs	2021-12-09 12:01:26.000000000 +0000
@@ -44,7 +44,7 @@
 /// Stream + Unpin`.
 ///
 /// [`Future`]: trait@std::future::Future
-/// [`Box::pin`]: #
+/// [`Box::pin`]: std::boxed::Box::pin
 ///
 /// # Usage
 ///
@@ -71,7 +71,7 @@
 ///
 /// ```
 /// use tokio::{pin, select};
-/// use tokio::stream::{self, StreamExt};
+/// use tokio_stream::{self as stream, StreamExt};
 ///
 /// async fn my_async_fn() {
 ///     // async logic here
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/scoped_tls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/scoped_tls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/scoped_tls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/scoped_tls.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,9 +23,7 @@
 /// Type representing a thread local storage key corresponding to a reference
 /// to the type parameter `T`.
 pub(crate) struct ScopedKey<T> {
-    #[doc(hidden)]
     pub(crate) inner: &'static LocalKey<Cell<*const ()>>,
-    #[doc(hidden)]
     pub(crate) _marker: marker::PhantomData<T>,
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/select.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,7 @@
 /// branch, which evaluates if none of the other branches match their patterns:
 ///
 /// ```text
-/// else <expression>
+/// else => <expression>
 /// ```
 ///
 /// The macro aggregates all `<async expression>` expressions and runs them
@@ -23,10 +23,10 @@
 /// returns the result of evaluating the completed branch's `<handler>`
 /// expression.
 ///
-/// Additionally, each branch may include an optional `if` precondition. This
-/// precondition is evaluated **before** the `<async expression>`. If the
-/// precondition returns `false`, the branch is entirely disabled. This
-/// capability is useful when using `select!` within a loop.
+/// Additionally, each branch may include an optional `if` precondition. If the
+/// precondition returns `false`, then the branch is disabled. The provided
+/// `<async expression>` is still evaluated but the resulting future is never
+/// polled. This capability is useful when using `select!` within a loop.
 ///
 /// The complete lifecycle of a `select!` expression is as follows:
 ///
@@ -42,12 +42,10 @@
 ///    to the provided `<pattern>`, if the pattern matches, evaluate `<handler>`
 ///    and return. If the pattern **does not** match, disable the current branch
 ///    and for the remainder of the current call to `select!`. Continue from step 3.
-/// 5. If **all** branches are disabled, evaluate the `else` expression. If none
-///    is provided, panic.
+/// 5. If **all** branches are disabled, evaluate the `else` expression. If no
+///    else branch is provided, panic.
 ///
-/// # Notes
-///
-/// ### Runtime characteristics
+/// # Runtime characteristics
 ///
 /// By running all async expressions on the current task, the expressions are
 /// able to run **concurrently** but not in **parallel**. This means all
@@ -58,85 +56,84 @@
 ///
 /// [`tokio::spawn`]: crate::spawn
 ///
-/// ### Avoid racy `if` preconditions
-///
-/// Given that `if` preconditions are used to disable `select!` branches, some
-/// caution must be used to avoid missing values.
-///
-/// For example, here is **incorrect** usage of `delay` with `if`. The objective
-/// is to repeatedly run an asynchronous task for up to 50 milliseconds.
-/// However, there is a potential for the `delay` completion to be missed.
-///
-/// ```no_run
-/// use tokio::time::{self, Duration};
-///
-/// async fn some_async_work() {
-///     // do work
-/// }
-///
-/// #[tokio::main]
-/// async fn main() {
-///     let mut delay = time::delay_for(Duration::from_millis(50));
-///
-///     while !delay.is_elapsed() {
-///         tokio::select! {
-///             _ = &mut delay, if !delay.is_elapsed() => {
-///                 println!("operation timed out");
-///             }
-///             _ = some_async_work() => {
-///                 println!("operation completed");
-///             }
-///         }
-///     }
-/// }
-/// ```
-///
-/// In the above example, `delay.is_elapsed()` may return `true` even if
-/// `delay.poll()` never returned `Ready`. This opens up a potential race
-/// condition where `delay` expires between the `while !delay.is_elapsed()`
-/// check and the call to `select!` resulting in the `some_async_work()` call to
-/// run uninterrupted despite the delay having elapsed.
-///
-/// One way to write the above example without the race would be:
-///
-/// ```
-/// use tokio::time::{self, Duration};
+/// # Fairness
 ///
-/// async fn some_async_work() {
-/// # time::delay_for(Duration::from_millis(10)).await;
-///     // do work
-/// }
-///
-/// #[tokio::main]
-/// async fn main() {
-///     let mut delay = time::delay_for(Duration::from_millis(50));
-///
-///     loop {
-///         tokio::select! {
-///             _ = &mut delay => {
-///                 println!("operation timed out");
-///                 break;
-///             }
-///             _ = some_async_work() => {
-///                 println!("operation completed");
-///             }
-///         }
-///     }
-/// }
-/// ```
-///
-/// ### Fairness
-///
-/// `select!` randomly picks a branch to check first. This provides some level
-/// of fairness when calling `select!` in a loop with branches that are always
+/// By default, `select!` randomly picks a branch to check first. This provides
+/// some level of fairness when calling `select!` in a loop with branches that
+/// are always ready.
+///
+/// This behavior can be overridden by adding `biased;` to the beginning of the
+/// macro usage. See the examples for details. This will cause `select` to poll
+/// the futures in the order they appear from top to bottom. There are a few
+/// reasons you may want this:
+///
+/// - The random number generation of `tokio::select!` has a non-zero CPU cost
+/// - Your futures may interact in a way where known polling order is significant
+///
+/// But there is an important caveat to this mode. It becomes your responsibility
+/// to ensure that the polling order of your futures is fair. If for example you
+/// are selecting between a stream and a shutdown future, and the stream has a
+/// huge volume of messages and zero or nearly zero time between them, you should
+/// place the shutdown future earlier in the `select!` list to ensure that it is
+/// always polled, and will not be ignored due to the stream being constantly
 /// ready.
 ///
 /// # Panics
 ///
-/// `select!` panics if all branches are disabled **and** there is no provided
-/// `else` branch. A branch is disabled when the provided `if` precondition
-/// returns `false` **or** when the pattern does not match the result of `<async
-/// expression>.
+/// The `select!` macro panics if all branches are disabled **and** there is no
+/// provided `else` branch. A branch is disabled when the provided `if`
+/// precondition returns `false` **or** when the pattern does not match the
+/// result of `<async expression>`.
+///
+/// # Cancellation safety
+///
+/// When using `select!` in a loop to receive messages from multiple sources,
+/// you should make sure that the receive call is cancellation safe to avoid
+/// losing messages. This section goes through various common methods and
+/// describes whether they are cancel safe.  The lists in this section are not
+/// exhaustive.
+///
+/// The following methods are cancellation safe:
+///
+///  * [`tokio::sync::mpsc::Receiver::recv`](crate::sync::mpsc::Receiver::recv)
+///  * [`tokio::sync::mpsc::UnboundedReceiver::recv`](crate::sync::mpsc::UnboundedReceiver::recv)
+///  * [`tokio::sync::broadcast::Receiver::recv`](crate::sync::broadcast::Receiver::recv)
+///  * [`tokio::sync::watch::Receiver::changed`](crate::sync::watch::Receiver::changed)
+///  * [`tokio::net::TcpListener::accept`](crate::net::TcpListener::accept)
+///  * [`tokio::net::UnixListener::accept`](crate::net::UnixListener::accept)
+///  * [`tokio::io::AsyncReadExt::read`](crate::io::AsyncReadExt::read) on any `AsyncRead`
+///  * [`tokio::io::AsyncReadExt::read_buf`](crate::io::AsyncReadExt::read_buf) on any `AsyncRead`
+///  * [`tokio::io::AsyncWriteExt::write`](crate::io::AsyncWriteExt::write) on any `AsyncWrite`
+///  * [`tokio::io::AsyncWriteExt::write_buf`](crate::io::AsyncWriteExt::write_buf) on any `AsyncWrite`
+///  * [`tokio_stream::StreamExt::next`](https://docs.rs/tokio-stream/0.1/tokio_stream/trait.StreamExt.html#method.next) on any `Stream`
+///  * [`futures::stream::StreamExt::next`](https://docs.rs/futures/0.3/futures/stream/trait.StreamExt.html#method.next) on any `Stream`
+///
+/// The following methods are not cancellation safe and can lead to loss of data:
+///
+///  * [`tokio::io::AsyncReadExt::read_exact`](crate::io::AsyncReadExt::read_exact)
+///  * [`tokio::io::AsyncReadExt::read_to_end`](crate::io::AsyncReadExt::read_to_end)
+///  * [`tokio::io::AsyncReadExt::read_to_string`](crate::io::AsyncReadExt::read_to_string)
+///  * [`tokio::io::AsyncWriteExt::write_all`](crate::io::AsyncWriteExt::write_all)
+///
+/// The following methods are not cancellation safe because they use a queue for
+/// fairness and cancellation makes you lose your place in the queue:
+///
+///  * [`tokio::sync::Mutex::lock`](crate::sync::Mutex::lock)
+///  * [`tokio::sync::RwLock::read`](crate::sync::RwLock::read)
+///  * [`tokio::sync::RwLock::write`](crate::sync::RwLock::write)
+///  * [`tokio::sync::Semaphore::acquire`](crate::sync::Semaphore::acquire)
+///  * [`tokio::sync::Notify::notified`](crate::sync::Notify::notified)
+///
+/// To determine whether your own methods are cancellation safe, look for the
+/// location of uses of `.await`. This is because when an asynchronous method is
+/// cancelled, that always happens at an `.await`. If your function behaves
+/// correctly even if it is restarted while waiting at an `.await`, then it is
+/// cancellation safe.
+///
+/// Be aware that cancelling something that is not cancellation safe is not
+/// necessarily wrong. For example, if you are cancelling a task because the
+/// application is shutting down, then you probably don't care that partially
+/// read data is lost.
 ///
 /// # Examples
 ///
@@ -167,7 +164,7 @@
 /// Basic stream selecting.
 ///
 /// ```
-/// use tokio::stream::{self, StreamExt};
+/// use tokio_stream::{self as stream, StreamExt};
 ///
 /// #[tokio::main]
 /// async fn main() {
@@ -188,7 +185,7 @@
 /// is complete, all calls to `next()` return `None`.
 ///
 /// ```
-/// use tokio::stream::{self, StreamExt};
+/// use tokio_stream::{self as stream, StreamExt};
 ///
 /// #[tokio::main]
 /// async fn main() {
@@ -220,13 +217,14 @@
 /// Here, a stream is consumed for at most 1 second.
 ///
 /// ```
-/// use tokio::stream::{self, StreamExt};
+/// use tokio_stream::{self as stream, StreamExt};
 /// use tokio::time::{self, Duration};
 ///
 /// #[tokio::main]
 /// async fn main() {
 ///     let mut stream = stream::iter(vec![1, 2, 3]);
-///     let mut delay = time::delay_for(Duration::from_secs(1));
+///     let sleep = time::sleep(Duration::from_secs(1));
+///     tokio::pin!(sleep);
 ///
 ///     loop {
 ///         tokio::select! {
@@ -237,7 +235,7 @@
 ///                     break;
 ///                 }
 ///             }
-///             _ = &mut delay => {
+///             _ = &mut sleep => {
 ///                 println!("timeout");
 ///                 break;
 ///             }
@@ -280,6 +278,116 @@
 ///     assert_eq!(res.1, "second");
 /// }
 /// ```
+///
+/// Using the `biased;` mode to control polling order.
+///
+/// ```
+/// #[tokio::main]
+/// async fn main() {
+///     let mut count = 0u8;
+///
+///     loop {
+///         tokio::select! {
+///             // If you run this example without `biased;`, the polling order is
+///             // pseudo-random, and the assertions on the value of count will
+///             // (probably) fail.
+///             biased;
+///
+///             _ = async {}, if count < 1 => {
+///                 count += 1;
+///                 assert_eq!(count, 1);
+///             }
+///             _ = async {}, if count < 2 => {
+///                 count += 1;
+///                 assert_eq!(count, 2);
+///             }
+///             _ = async {}, if count < 3 => {
+///                 count += 1;
+///                 assert_eq!(count, 3);
+///             }
+///             _ = async {}, if count < 4 => {
+///                 count += 1;
+///                 assert_eq!(count, 4);
+///             }
+///
+///             else => {
+///                 break;
+///             }
+///         };
+///     }
+/// }
+/// ```
+///
+/// ## Avoid racy `if` preconditions
+///
+/// Given that `if` preconditions are used to disable `select!` branches, some
+/// caution must be used to avoid missing values.
+///
+/// For example, here is **incorrect** usage of `sleep` with `if`. The objective
+/// is to repeatedly run an asynchronous task for up to 50 milliseconds.
+/// However, there is a potential for the `sleep` completion to be missed.
+///
+/// ```no_run,should_panic
+/// use tokio::time::{self, Duration};
+///
+/// async fn some_async_work() {
+///     // do work
+/// }
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let sleep = time::sleep(Duration::from_millis(50));
+///     tokio::pin!(sleep);
+///
+///     while !sleep.is_elapsed() {
+///         tokio::select! {
+///             _ = &mut sleep, if !sleep.is_elapsed() => {
+///                 println!("operation timed out");
+///             }
+///             _ = some_async_work() => {
+///                 println!("operation completed");
+///             }
+///         }
+///     }
+///
+///     panic!("This example shows how not to do it!");
+/// }
+/// ```
+///
+/// In the above example, `sleep.is_elapsed()` may return `true` even if
+/// `sleep.poll()` never returned `Ready`. This opens up a potential race
+/// condition where `sleep` expires between the `while !sleep.is_elapsed()`
+/// check and the call to `select!` resulting in the `some_async_work()` call to
+/// run uninterrupted despite the sleep having elapsed.
+///
+/// One way to write the above example without the race would be:
+///
+/// ```
+/// use tokio::time::{self, Duration};
+///
+/// async fn some_async_work() {
+/// # time::sleep(Duration::from_millis(10)).await;
+///     // do work
+/// }
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let sleep = time::sleep(Duration::from_millis(50));
+///     tokio::pin!(sleep);
+///
+///     loop {
+///         tokio::select! {
+///             _ = &mut sleep => {
+///                 println!("operation timed out");
+///                 break;
+///             }
+///             _ = some_async_work() => {
+///                 println!("operation completed");
+///             }
+///         }
+///     }
+/// }
+/// ```
 #[macro_export]
 #[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
 macro_rules! select {
@@ -297,6 +405,10 @@
 
     // All input is normalized, now transform.
     (@ {
+        // The index of the future to poll first (in bias mode), or the RNG
+        // expression to use to pick a future to poll first.
+        start=$start:expr;
+
         // One `_` for each branch in the `select!` macro. Passing this to
         // `count!` converts $skip to an integer.
         ( $($count:tt)* )
@@ -336,7 +448,7 @@
         // set the appropriate bit in `disabled`.
         $(
             if !$c {
-                let mask = 1 << $crate::count!( $($skip)* );
+                let mask: util::Mask = 1 << $crate::count!( $($skip)* );
                 disabled |= mask;
             }
         )*
@@ -354,9 +466,11 @@
                 // disabled.
                 let mut is_pending = false;
 
-                // Randomly generate a starting point. This makes `select!` a
-                // bit more fair and avoids always polling the first future.
-                let start = $crate::macros::support::thread_rng_n(BRANCHES);
+                // Choose a starting index to begin polling the futures at. In
+                // practice, this will either be a pseudo-randomly generated
+                // number by default, or the constant 0 if `biased;` is
+                // supplied.
+                let start = $start;
 
                 for i in 0..BRANCHES {
                     let branch;
@@ -404,6 +518,7 @@
                                 // The future returned a value, check if matches
                                 // the specified pattern.
                                 #[allow(unused_variables)]
+                                #[allow(unused_mut)]
                                 match &out {
                                     $bind => {}
                                     _ => continue,
@@ -440,42 +555,48 @@
     // These rules match a single `select!` branch and normalize it for
     // processing by the first rule.
 
-    (@ { $($t:tt)* } ) => {
+    (@ { start=$start:expr; $($t:tt)* } ) => {
         // No `else` branch
-        $crate::select!(@{ $($t)*; unreachable!() })
+        $crate::select!(@{ start=$start; $($t)*; panic!("all branches are disabled and there is no else branch") })
     };
-    (@ { $($t:tt)* } else => $else:expr $(,)?) => {
-        $crate::select!(@{ $($t)*; $else })
+    (@ { start=$start:expr; $($t:tt)* } else => $else:expr $(,)?) => {
+        $crate::select!(@{ start=$start; $($t)*; $else })
     };
-    (@ { ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr, if $c:expr => $h:block, $($r:tt)* ) => {
-        $crate::select!(@{ ($($s)* _) $($t)* ($($s)*) $p = $f, if $c => $h, } $($r)*)
+    (@ { start=$start:expr; ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr, if $c:expr => $h:block, $($r:tt)* ) => {
+        $crate::select!(@{ start=$start; ($($s)* _) $($t)* ($($s)*) $p = $f, if $c => $h, } $($r)*)
     };
-    (@ { ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr => $h:block, $($r:tt)* ) => {
-        $crate::select!(@{ ($($s)* _) $($t)* ($($s)*) $p = $f, if true => $h, } $($r)*)
+    (@ { start=$start:expr; ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr => $h:block, $($r:tt)* ) => {
+        $crate::select!(@{ start=$start; ($($s)* _) $($t)* ($($s)*) $p = $f, if true => $h, } $($r)*)
     };
-    (@ { ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr, if $c:expr => $h:block $($r:tt)* ) => {
-        $crate::select!(@{ ($($s)* _) $($t)* ($($s)*) $p = $f, if $c => $h, } $($r)*)
+    (@ { start=$start:expr; ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr, if $c:expr => $h:block $($r:tt)* ) => {
+        $crate::select!(@{ start=$start; ($($s)* _) $($t)* ($($s)*) $p = $f, if $c => $h, } $($r)*)
     };
-    (@ { ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr => $h:block $($r:tt)* ) => {
-        $crate::select!(@{ ($($s)* _) $($t)* ($($s)*) $p = $f, if true => $h, } $($r)*)
+    (@ { start=$start:expr; ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr => $h:block $($r:tt)* ) => {
+        $crate::select!(@{ start=$start; ($($s)* _) $($t)* ($($s)*) $p = $f, if true => $h, } $($r)*)
     };
-    (@ { ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr, if $c:expr => $h:expr ) => {
-        $crate::select!(@{ ($($s)* _) $($t)* ($($s)*) $p = $f, if $c => $h, })
+    (@ { start=$start:expr; ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr, if $c:expr => $h:expr ) => {
+        $crate::select!(@{ start=$start; ($($s)* _) $($t)* ($($s)*) $p = $f, if $c => $h, })
     };
-    (@ { ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr => $h:expr ) => {
-        $crate::select!(@{ ($($s)* _) $($t)* ($($s)*) $p = $f, if true => $h, })
+    (@ { start=$start:expr; ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr => $h:expr ) => {
+        $crate::select!(@{ start=$start; ($($s)* _) $($t)* ($($s)*) $p = $f, if true => $h, })
     };
-    (@ { ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr, if $c:expr => $h:expr, $($r:tt)* ) => {
-        $crate::select!(@{ ($($s)* _) $($t)* ($($s)*) $p = $f, if $c => $h, } $($r)*)
+    (@ { start=$start:expr; ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr, if $c:expr => $h:expr, $($r:tt)* ) => {
+        $crate::select!(@{ start=$start; ($($s)* _) $($t)* ($($s)*) $p = $f, if $c => $h, } $($r)*)
     };
-    (@ { ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr => $h:expr, $($r:tt)* ) => {
-        $crate::select!(@{ ($($s)* _) $($t)* ($($s)*) $p = $f, if true => $h, } $($r)*)
+    (@ { start=$start:expr; ( $($s:tt)* ) $($t:tt)* } $p:pat = $f:expr => $h:expr, $($r:tt)* ) => {
+        $crate::select!(@{ start=$start; ($($s)* _) $($t)* ($($s)*) $p = $f, if true => $h, } $($r)*)
     };
 
     // ===== Entry point =====
 
+    (biased; $p:pat = $($t:tt)* ) => {
+        $crate::select!(@{ start=0; () } $p = $($t)*)
+    };
+
     ( $p:pat = $($t:tt)* ) => {
-        $crate::select!(@{ () } $p = $($t)*)
+        // Randomly generate a starting point. This makes `select!` a bit more
+        // fair and avoids always polling the first future.
+        $crate::select!(@{ start={ $crate::macros::support::thread_rng_n(BRANCHES) }; () } $p = $($t)*)
     };
     () => {
         compile_error!("select! requires at least one branch.")
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/support.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/support.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/macros/support.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/macros/support.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 cfg_macros! {
-    pub use crate::future::{maybe_done, poll_fn};
+    pub use crate::future::poll_fn;
+    pub use crate::future::maybe_done::maybe_done;
     pub use crate::util::thread_rng_n;
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/addr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/addr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/addr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/addr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,8 +8,6 @@
 /// # DNS
 ///
 /// Implementations of `ToSocketAddrs` for string types require a DNS lookup.
-/// These implementations are only provided when Tokio is used with the
-/// **`dns`** feature flag.
 ///
 /// # Calling
 ///
@@ -23,6 +21,15 @@
 
 type ReadyFuture<T> = future::Ready<io::Result<T>>;
 
+cfg_net! {
+    pub(crate) fn to_socket_addrs<T>(arg: T) -> T::Future
+    where
+        T: ToSocketAddrs,
+    {
+        arg.to_socket_addrs(sealed::Internal)
+    }
+}
+
 // ===== impl &impl ToSocketAddrs =====
 
 impl<T: ToSocketAddrs + ?Sized> ToSocketAddrs for &T {}
@@ -34,8 +41,8 @@
     type Iter = T::Iter;
     type Future = T::Future;
 
-    fn to_socket_addrs(&self) -> Self::Future {
-        (**self).to_socket_addrs()
+    fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
+        (**self).to_socket_addrs(sealed::Internal)
     }
 }
 
@@ -47,7 +54,7 @@
     type Iter = std::option::IntoIter<SocketAddr>;
     type Future = ReadyFuture<Self::Iter>;
 
-    fn to_socket_addrs(&self) -> Self::Future {
+    fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
         let iter = Some(*self).into_iter();
         future::ok(iter)
     }
@@ -61,8 +68,8 @@
     type Iter = std::option::IntoIter<SocketAddr>;
     type Future = ReadyFuture<Self::Iter>;
 
-    fn to_socket_addrs(&self) -> Self::Future {
-        SocketAddr::V4(*self).to_socket_addrs()
+    fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
+        SocketAddr::V4(*self).to_socket_addrs(sealed::Internal)
     }
 }
 
@@ -74,8 +81,8 @@
     type Iter = std::option::IntoIter<SocketAddr>;
     type Future = ReadyFuture<Self::Iter>;
 
-    fn to_socket_addrs(&self) -> Self::Future {
-        SocketAddr::V6(*self).to_socket_addrs()
+    fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
+        SocketAddr::V6(*self).to_socket_addrs(sealed::Internal)
     }
 }
 
@@ -87,7 +94,7 @@
     type Iter = std::option::IntoIter<SocketAddr>;
     type Future = ReadyFuture<Self::Iter>;
 
-    fn to_socket_addrs(&self) -> Self::Future {
+    fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
         let iter = Some(SocketAddr::from(*self)).into_iter();
         future::ok(iter)
     }
@@ -101,9 +108,9 @@
     type Iter = std::option::IntoIter<SocketAddr>;
     type Future = ReadyFuture<Self::Iter>;
 
-    fn to_socket_addrs(&self) -> Self::Future {
+    fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
         let (ip, port) = *self;
-        SocketAddrV4::new(ip, port).to_socket_addrs()
+        SocketAddrV4::new(ip, port).to_socket_addrs(sealed::Internal)
     }
 }
 
@@ -115,9 +122,9 @@
     type Iter = std::option::IntoIter<SocketAddr>;
     type Future = ReadyFuture<Self::Iter>;
 
-    fn to_socket_addrs(&self) -> Self::Future {
+    fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
         let (ip, port) = *self;
-        SocketAddrV6::new(ip, port, 0, 0).to_socket_addrs()
+        SocketAddrV6::new(ip, port, 0, 0).to_socket_addrs(sealed::Internal)
     }
 }
 
@@ -129,13 +136,13 @@
     type Iter = std::vec::IntoIter<SocketAddr>;
     type Future = ReadyFuture<Self::Iter>;
 
-    fn to_socket_addrs(&self) -> Self::Future {
+    fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
         let iter = self.to_vec().into_iter();
         future::ok(iter)
     }
 }
 
-cfg_dns! {
+cfg_net! {
     // ===== impl str =====
 
     impl ToSocketAddrs for str {}
@@ -144,23 +151,23 @@
         type Iter = sealed::OneOrMore;
         type Future = sealed::MaybeReady;
 
-        fn to_socket_addrs(&self) -> Self::Future {
-            use crate::runtime::spawn_blocking;
+        fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
+            use crate::blocking::spawn_blocking;
             use sealed::MaybeReady;
 
             // First check if the input parses as a socket address
             let res: Result<SocketAddr, _> = self.parse();
 
             if let Ok(addr) = res {
-                return MaybeReady::Ready(Some(addr));
+                return MaybeReady(sealed::State::Ready(Some(addr)));
             }
 
             // Run DNS lookup on the blocking pool
             let s = self.to_owned();
 
-            MaybeReady::Blocking(spawn_blocking(move || {
+            MaybeReady(sealed::State::Blocking(spawn_blocking(move || {
                 std::net::ToSocketAddrs::to_socket_addrs(&s)
-            }))
+            })))
         }
     }
 
@@ -172,8 +179,8 @@
         type Iter = sealed::OneOrMore;
         type Future = sealed::MaybeReady;
 
-        fn to_socket_addrs(&self) -> Self::Future {
-            use crate::runtime::spawn_blocking;
+        fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
+            use crate::blocking::spawn_blocking;
             use sealed::MaybeReady;
 
             let (host, port) = *self;
@@ -183,21 +190,21 @@
                 let addr = SocketAddrV4::new(addr, port);
                 let addr = SocketAddr::V4(addr);
 
-                return MaybeReady::Ready(Some(addr));
+                return MaybeReady(sealed::State::Ready(Some(addr)));
             }
 
             if let Ok(addr) = host.parse::<Ipv6Addr>() {
                 let addr = SocketAddrV6::new(addr, port, 0, 0);
                 let addr = SocketAddr::V6(addr);
 
-                return MaybeReady::Ready(Some(addr));
+                return MaybeReady(sealed::State::Ready(Some(addr)));
             }
 
             let host = host.to_owned();
 
-            MaybeReady::Blocking(spawn_blocking(move || {
+            MaybeReady(sealed::State::Blocking(spawn_blocking(move || {
                 std::net::ToSocketAddrs::to_socket_addrs(&(&host[..], port))
-            }))
+            })))
         }
     }
 
@@ -209,8 +216,8 @@
         type Iter = sealed::OneOrMore;
         type Future = sealed::MaybeReady;
 
-        fn to_socket_addrs(&self) -> Self::Future {
-            (self.0.as_str(), self.1).to_socket_addrs()
+        fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
+            (self.0.as_str(), self.1).to_socket_addrs(sealed::Internal)
         }
     }
 
@@ -222,8 +229,8 @@
         type Iter = <str as sealed::ToSocketAddrsPriv>::Iter;
         type Future = <str as sealed::ToSocketAddrsPriv>::Future;
 
-        fn to_socket_addrs(&self) -> Self::Future {
-            (&self[..]).to_socket_addrs()
+        fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
+            (&self[..]).to_socket_addrs(sealed::Internal)
         }
     }
 }
@@ -237,27 +244,31 @@
     use std::io;
     use std::net::SocketAddr;
 
-    cfg_dns! {
-        use crate::task::JoinHandle;
-
-        use std::option;
-        use std::pin::Pin;
-        use std::task::{Context, Poll};
-        use std::vec;
-    }
-
     #[doc(hidden)]
     pub trait ToSocketAddrsPriv {
         type Iter: Iterator<Item = SocketAddr> + Send + 'static;
         type Future: Future<Output = io::Result<Self::Iter>> + Send + 'static;
 
-        fn to_socket_addrs(&self) -> Self::Future;
+        fn to_socket_addrs(&self, internal: Internal) -> Self::Future;
     }
 
-    cfg_dns! {
+    #[allow(missing_debug_implementations)]
+    pub struct Internal;
+
+    cfg_net! {
+        use crate::blocking::JoinHandle;
+
+        use std::option;
+        use std::pin::Pin;
+        use std::task::{Context, Poll};
+        use std::vec;
+
         #[doc(hidden)]
         #[derive(Debug)]
-        pub enum MaybeReady {
+        pub struct MaybeReady(pub(super) State);
+
+        #[derive(Debug)]
+        pub(super) enum State {
             Ready(Option<SocketAddr>),
             Blocking(JoinHandle<io::Result<vec::IntoIter<SocketAddr>>>),
         }
@@ -273,12 +284,12 @@
             type Output = io::Result<OneOrMore>;
 
             fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-                match *self {
-                    MaybeReady::Ready(ref mut i) => {
+                match self.0 {
+                    State::Ready(ref mut i) => {
                         let iter = OneOrMore::One(i.take().into_iter());
                         Poll::Ready(Ok(iter))
                     }
-                    MaybeReady::Blocking(ref mut rx) => {
+                    State::Blocking(ref mut rx) => {
                         let res = ready!(Pin::new(rx).poll(cx))?.map(OneOrMore::More);
 
                         Poll::Ready(res)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/lookup_host.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/lookup_host.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/lookup_host.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/lookup_host.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
-cfg_dns! {
-    use crate::net::addr::ToSocketAddrs;
+cfg_net! {
+    use crate::net::addr::{self, ToSocketAddrs};
 
     use std::io;
     use std::net::SocketAddr;
@@ -33,6 +33,6 @@
     where
         T: ToSocketAddrs
     {
-        host.to_socket_addrs().await
+        addr::to_socket_addrs(host).await
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,27 +23,30 @@
 //! [`UnixDatagram`]: UnixDatagram
 
 mod addr;
+#[cfg(feature = "net")]
+pub(crate) use addr::to_socket_addrs;
 pub use addr::ToSocketAddrs;
 
-cfg_dns! {
+cfg_net! {
     mod lookup_host;
     pub use lookup_host::lookup_host;
-}
 
-cfg_tcp! {
     pub mod tcp;
     pub use tcp::listener::TcpListener;
+    pub use tcp::socket::TcpSocket;
     pub use tcp::stream::TcpStream;
-}
 
-cfg_udp! {
-    pub mod udp;
-    pub use udp::socket::UdpSocket;
+    mod udp;
+    pub use udp::UdpSocket;
 }
 
-cfg_uds! {
+cfg_net_unix! {
     pub mod unix;
     pub use unix::datagram::socket::UnixDatagram;
     pub use unix::listener::UnixListener;
     pub use unix::stream::UnixStream;
 }
+
+cfg_net_windows! {
+    pub mod windows;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/incoming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/incoming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/incoming.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/incoming.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-use crate::net::tcp::{TcpListener, TcpStream};
-
-use std::io;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-/// Stream returned by the `TcpListener::incoming` function representing the
-/// stream of sockets received from a listener.
-#[must_use = "streams do nothing unless polled"]
-#[derive(Debug)]
-pub struct Incoming<'a> {
-    inner: &'a mut TcpListener,
-}
-
-impl Incoming<'_> {
-    pub(crate) fn new(listener: &mut TcpListener) -> Incoming<'_> {
-        Incoming { inner: listener }
-    }
-
-    /// Attempts to poll `TcpStream` by polling inner `TcpListener` to accept
-    /// connection.
-    ///
-    /// If `TcpListener` isn't ready yet, `Poll::Pending` is returned and
-    /// current task will be notified by a waker.
-    pub fn poll_accept(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<io::Result<TcpStream>> {
-        let (socket, _) = ready!(self.inner.poll_accept(cx))?;
-        Poll::Ready(Ok(socket))
-    }
-}
-
-#[cfg(feature = "stream")]
-impl crate::stream::Stream for Incoming<'_> {
-    type Item = io::Result<TcpStream>;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let (socket, _) = ready!(self.inner.poll_accept(cx))?;
-        Poll::Ready(Some(Ok(socket)))
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/listener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/listener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/listener.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/listener.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,6 @@
-use crate::future::poll_fn;
-use crate::io::PollEvented;
-use crate::net::tcp::{Incoming, TcpStream};
-use crate::net::ToSocketAddrs;
+use crate::io::{Interest, PollEvented};
+use crate::net::tcp::TcpStream;
+use crate::net::{to_socket_addrs, ToSocketAddrs};
 
 use std::convert::TryFrom;
 use std::fmt;
@@ -9,13 +8,15 @@
 use std::net::{self, SocketAddr};
 use std::task::{Context, Poll};
 
-cfg_tcp! {
+cfg_net! {
     /// A TCP socket server, listening for connections.
     ///
-    /// You can accept a new connection by using the [`accept`](`TcpListener::accept`) method. Alternatively `TcpListener`
-    /// implements the [`Stream`](`crate::stream::Stream`) trait, which allows you to use the listener in places that want a
-    /// stream. The stream will never return `None` and will also not yield the peer's `SocketAddr` structure.  Iterating over
-    /// it is equivalent to calling accept in a loop.
+    /// You can accept a new connection by using the [`accept`](`TcpListener::accept`)
+    /// method.
+    ///
+    /// A `TcpListener` can be turned into a `Stream` with [`TcpListenerStream`].
+    ///
+    /// [`TcpListenerStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.TcpListenerStream.html
     ///
     /// # Errors
     ///
@@ -40,7 +41,7 @@
     ///
     /// #[tokio::main]
     /// async fn main() -> io::Result<()> {
-    ///     let mut listener = TcpListener::bind("127.0.0.1:8080").await?;
+    ///     let listener = TcpListener::bind("127.0.0.1:8080").await?;
     ///
     ///     loop {
     ///         let (socket, _) = listener.accept().await?;
@@ -48,24 +49,6 @@
     ///     }
     /// }
     /// ```
-    ///
-    /// Using `impl Stream`:
-    /// ```no_run
-    /// use tokio::{net::TcpListener, stream::StreamExt};
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///     let mut listener = TcpListener::bind("127.0.0.1:8080").await.unwrap();
-    ///     while let Some(stream) = listener.next().await {
-    ///         match stream {
-    ///             Ok(stream) => {
-    ///                 println!("new client!");
-    ///             }
-    ///             Err(e) => { /* connection failed */ }
-    ///         }
-    ///     }
-    /// }
-    /// ```
     pub struct TcpListener {
         io: PollEvented<mio::net::TcpListener>,
     }
@@ -81,9 +64,6 @@
     /// method.
     ///
     /// The address type can be any implementor of the [`ToSocketAddrs`] trait.
-    /// Note that strings only implement this trait when the **`dns`** feature
-    /// is enabled, as strings may contain domain names that need to be resolved.
-    ///
     /// If `addr` yields multiple addresses, bind will be attempted with each of
     /// the addresses until one succeeds and returns the listener. If none of
     /// the addresses succeed in creating a listener, the error returned from
@@ -91,7 +71,11 @@
     ///
     /// This function sets the `SO_REUSEADDR` option on the socket.
     ///
+    /// To configure the socket before binding, you can use the [`TcpSocket`]
+    /// type.
+    ///
     /// [`ToSocketAddrs`]: trait@crate::net::ToSocketAddrs
+    /// [`TcpSocket`]: struct@crate::net::TcpSocket
     ///
     /// # Examples
     ///
@@ -110,27 +94,8 @@
     ///     Ok(())
     /// }
     /// ```
-    ///
-    /// Without the `dns` feature:
-    ///
-    /// ```no_run
-    /// use tokio::net::TcpListener;
-    /// use std::net::Ipv4Addr;
-    ///
-    /// use std::io;
-    ///
-    /// #[tokio::main]
-    /// async fn main() -> io::Result<()> {
-    ///     let listener = TcpListener::bind((Ipv4Addr::new(127, 0, 0, 1), 2345)).await?;
-    ///
-    ///     // use the listener
-    ///
-    ///     # let _ = listener;
-    ///     Ok(())
-    /// }
-    /// ```
     pub async fn bind<A: ToSocketAddrs>(addr: A) -> io::Result<TcpListener> {
-        let addrs = addr.to_socket_addrs().await?;
+        let addrs = to_socket_addrs(addr).await?;
 
         let mut last_err = None;
 
@@ -150,7 +115,7 @@
     }
 
     fn bind_addr(addr: SocketAddr) -> io::Result<TcpListener> {
-        let listener = mio::net::TcpListener::bind(&addr)?;
+        let listener = mio::net::TcpListener::bind(addr)?;
         TcpListener::new(listener)
     }
 
@@ -160,6 +125,13 @@
     /// established, the corresponding [`TcpStream`] and the remote peer's
     /// address will be returned.
     ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If the method is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, then it is guaranteed that no new connections were
+    /// accepted by this method.
+    ///
     /// [`TcpStream`]: struct@crate::net::TcpStream
     ///
     /// # Examples
@@ -171,7 +143,7 @@
     ///
     /// #[tokio::main]
     /// async fn main() -> io::Result<()> {
-    ///     let mut listener = TcpListener::bind("127.0.0.1:8080").await?;
+    ///     let listener = TcpListener::bind("127.0.0.1:8080").await?;
     ///
     ///     match listener.accept().await {
     ///         Ok((_socket, addr)) => println!("new client: {:?}", addr),
@@ -181,67 +153,52 @@
     ///     Ok(())
     /// }
     /// ```
-    pub async fn accept(&mut self) -> io::Result<(TcpStream, SocketAddr)> {
-        poll_fn(|cx| self.poll_accept(cx)).await
+    pub async fn accept(&self) -> io::Result<(TcpStream, SocketAddr)> {
+        let (mio, addr) = self
+            .io
+            .registration()
+            .async_io(Interest::READABLE, || self.io.accept())
+            .await?;
+
+        let stream = TcpStream::new(mio)?;
+        Ok((stream, addr))
     }
 
     /// Polls to accept a new incoming connection to this listener.
     ///
-    /// If there is no connection to accept, `Poll::Pending` is returned and
-    /// the current task will be notified by a waker.
-    pub fn poll_accept(
-        &mut self,
-        cx: &mut Context<'_>,
-    ) -> Poll<io::Result<(TcpStream, SocketAddr)>> {
-        let (io, addr) = ready!(self.poll_accept_std(cx))?;
-
-        let io = mio::net::TcpStream::from_stream(io)?;
-        let io = TcpStream::new(io)?;
-
-        Poll::Ready(Ok((io, addr)))
-    }
-
-    fn poll_accept_std(
-        &mut self,
-        cx: &mut Context<'_>,
-    ) -> Poll<io::Result<(net::TcpStream, SocketAddr)>> {
-        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
-
-        match self.io.get_ref().accept_std() {
-            Ok(pair) => Poll::Ready(Ok(pair)),
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, mio::Ready::readable())?;
-                Poll::Pending
+    /// If there is no connection to accept, `Poll::Pending` is returned and the
+    /// current task will be notified by a waker.  Note that on multiple calls
+    /// to `poll_accept`, only the `Waker` from the `Context` passed to the most
+    /// recent call is scheduled to receive a wakeup.
+    pub fn poll_accept(&self, cx: &mut Context<'_>) -> Poll<io::Result<(TcpStream, SocketAddr)>> {
+        loop {
+            let ev = ready!(self.io.registration().poll_read_ready(cx))?;
+
+            match self.io.accept() {
+                Ok((io, addr)) => {
+                    let io = TcpStream::new(io)?;
+                    return Poll::Ready(Ok((io, addr)));
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                    self.io.registration().clear_readiness(ev);
+                }
+                Err(e) => return Poll::Ready(Err(e)),
             }
-            Err(e) => Poll::Ready(Err(e)),
         }
     }
 
-    /// Creates a new TCP listener from the standard library's TCP listener.
+    /// Creates new `TcpListener` from a `std::net::TcpListener`.
     ///
-    /// This method can be used when the `Handle::tcp_listen` method isn't
-    /// sufficient because perhaps some more configuration is needed in terms of
-    /// before the calls to `bind` and `listen`.
+    /// This function is intended to be used to wrap a TCP listener from the
+    /// standard library in the Tokio equivalent. The conversion assumes nothing
+    /// about the underlying listener; it is left up to the user to set it in
+    /// non-blocking mode.
     ///
-    /// This API is typically paired with the `net2` crate and the `TcpBuilder`
+    /// This API is typically paired with the `socket2` crate and the `Socket`
     /// type to build up and customize a listener before it's shipped off to the
     /// backing event loop. This allows configuration of options like
     /// `SO_REUSEPORT`, binding to multiple addresses, etc.
     ///
-    /// The `addr` argument here is one of the addresses that `listener` is
-    /// bound to and the listener will only be guaranteed to accept connections
-    /// of the same address type currently.
-    ///
-    /// The platform specific behavior of this function looks like:
-    ///
-    /// * On Unix, the socket is placed into nonblocking mode and connections
-    ///   can be accepted as normal
-    ///
-    /// * On Windows, the address is stored internally and all future accepts
-    ///   will only be for the same IP version as `addr` specified. That is, if
-    ///   `addr` is an IPv4 address then all sockets accepted will be IPv4 as
-    ///   well (same for IPv6).
-    ///
     /// # Examples
     ///
     /// ```rust,no_run
@@ -251,6 +208,7 @@
     /// #[tokio::main]
     /// async fn main() -> Result<(), Box<dyn Error>> {
     ///     let std_listener = std::net::TcpListener::bind("127.0.0.1:0")?;
+    ///     std_listener.set_nonblocking(true)?;
     ///     let listener = TcpListener::from_std(std_listener)?;
     ///     Ok(())
     /// }
@@ -262,14 +220,56 @@
     ///
     /// The runtime is usually set implicitly when this function is called
     /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
     pub fn from_std(listener: net::TcpListener) -> io::Result<TcpListener> {
-        let io = mio::net::TcpListener::from_std(listener)?;
+        let io = mio::net::TcpListener::from_std(listener);
         let io = PollEvented::new(io)?;
         Ok(TcpListener { io })
     }
 
-    fn new(listener: mio::net::TcpListener) -> io::Result<TcpListener> {
+    /// Turn a [`tokio::net::TcpListener`] into a [`std::net::TcpListener`].
+    ///
+    /// The returned [`std::net::TcpListener`] will have nonblocking mode set as
+    /// `true`.  Use [`set_nonblocking`] to change the blocking mode if needed.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,no_run
+    /// use std::error::Error;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let tokio_listener = tokio::net::TcpListener::bind("127.0.0.1:0").await?;
+    ///     let std_listener = tokio_listener.into_std()?;
+    ///     std_listener.set_nonblocking(false)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// [`tokio::net::TcpListener`]: TcpListener
+    /// [`std::net::TcpListener`]: std::net::TcpListener
+    /// [`set_nonblocking`]: fn@std::net::TcpListener::set_nonblocking
+    pub fn into_std(self) -> io::Result<std::net::TcpListener> {
+        #[cfg(unix)]
+        {
+            use std::os::unix::io::{FromRawFd, IntoRawFd};
+            self.io
+                .into_inner()
+                .map(|io| io.into_raw_fd())
+                .map(|raw_fd| unsafe { std::net::TcpListener::from_raw_fd(raw_fd) })
+        }
+
+        #[cfg(windows)]
+        {
+            use std::os::windows::io::{FromRawSocket, IntoRawSocket};
+            self.io
+                .into_inner()
+                .map(|io| io.into_raw_socket())
+                .map(|raw_socket| unsafe { std::net::TcpListener::from_raw_socket(raw_socket) })
+        }
+    }
+
+    pub(crate) fn new(listener: mio::net::TcpListener) -> io::Result<TcpListener> {
         let io = PollEvented::new(listener)?;
         Ok(TcpListener { io })
     }
@@ -298,47 +298,7 @@
     /// }
     /// ```
     pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().local_addr()
-    }
-
-    /// Returns a stream over the connections being received on this listener.
-    ///
-    /// Note that `TcpListener` also directly implements `Stream`.
-    ///
-    /// The returned stream will never return `None` and will also not yield the
-    /// peer's `SocketAddr` structure. Iterating over it is equivalent to
-    /// calling accept in a loop.
-    ///
-    /// # Errors
-    ///
-    /// Note that accepting a connection can lead to various errors and not all
-    /// of them are necessarily fatal ‒ for example having too many open file
-    /// descriptors or the other side closing the connection while it waits in
-    /// an accept queue. These would terminate the stream if not handled in any
-    /// way.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use tokio::{net::TcpListener, stream::StreamExt};
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///     let mut listener = TcpListener::bind("127.0.0.1:8080").await.unwrap();
-    ///     let mut incoming = listener.incoming();
-    ///
-    ///     while let Some(stream) = incoming.next().await {
-    ///         match stream {
-    ///             Ok(stream) => {
-    ///                 println!("new client!");
-    ///             }
-    ///             Err(e) => { /* connection failed */ }
-    ///         }
-    ///     }
-    /// }
-    /// ```
-    pub fn incoming(&mut self) -> Incoming<'_> {
-        Incoming::new(self)
+        self.io.local_addr()
     }
 
     /// Gets the value of the `IP_TTL` option for this socket.
@@ -365,7 +325,7 @@
     /// }
     /// ```
     pub fn ttl(&self) -> io::Result<u32> {
-        self.io.get_ref().ttl()
+        self.io.ttl()
     }
 
     /// Sets the value for the `IP_TTL` option on this socket.
@@ -390,34 +350,7 @@
     /// }
     /// ```
     pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.io.get_ref().set_ttl(ttl)
-    }
-}
-
-#[cfg(feature = "stream")]
-impl crate::stream::Stream for TcpListener {
-    type Item = io::Result<TcpStream>;
-
-    fn poll_next(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
-        let (socket, _) = ready!(self.poll_accept(cx))?;
-        Poll::Ready(Some(Ok(socket)))
-    }
-}
-
-impl TryFrom<TcpListener> for mio::net::TcpListener {
-    type Error = io::Error;
-
-    /// Consumes value, returning the mio I/O object.
-    ///
-    /// See [`PollEvented::into_inner`] for more details about
-    /// resource deregistration that happens during the call.
-    ///
-    /// [`PollEvented::into_inner`]: crate::io::PollEvented::into_inner
-    fn try_from(value: TcpListener) -> Result<Self, Self::Error> {
-        value.io.into_inner()
+        self.io.set_ttl(ttl)
     }
 }
 
@@ -435,7 +368,7 @@
 
 impl fmt::Debug for TcpListener {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.io.get_ref().fmt(f)
+        self.io.fmt(f)
     }
 }
 
@@ -446,21 +379,19 @@
 
     impl AsRawFd for TcpListener {
         fn as_raw_fd(&self) -> RawFd {
-            self.io.get_ref().as_raw_fd()
+            self.io.as_raw_fd()
         }
     }
 }
 
 #[cfg(windows)]
 mod sys {
-    // TODO: let's land these upstream with mio and then we can add them here.
-    //
-    // use std::os::windows::prelude::*;
-    // use super::{TcpListener;
-    //
-    // impl AsRawHandle for TcpListener {
-    //     fn as_raw_handle(&self) -> RawHandle {
-    //         self.listener.io().as_raw_handle()
-    //     }
-    // }
+    use super::TcpListener;
+    use std::os::windows::prelude::*;
+
+    impl AsRawSocket for TcpListener {
+        fn as_raw_socket(&self) -> RawSocket {
+            self.io.as_raw_socket()
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,8 @@
 //! TCP utility types
 
 pub(crate) mod listener;
-pub(crate) use listener::TcpListener;
 
-mod incoming;
-pub use incoming::Incoming;
+pub(crate) mod socket;
 
 mod split;
 pub use split::{ReadHalf, WriteHalf};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/socket.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/socket.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/socket.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/socket.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,589 @@
+use crate::net::{TcpListener, TcpStream};
+
+use std::fmt;
+use std::io;
+use std::net::SocketAddr;
+
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+#[cfg(windows)]
+use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
+
+cfg_net! {
+    /// A TCP socket that has not yet been converted to a `TcpStream` or
+    /// `TcpListener`.
+    ///
+    /// `TcpSocket` wraps an operating system socket and enables the caller to
+    /// configure the socket before establishing a TCP connection or accepting
+    /// inbound connections. The caller is able to set socket option and explicitly
+    /// bind the socket with a socket address.
+    ///
+    /// The underlying socket is closed when the `TcpSocket` value is dropped.
+    ///
+    /// `TcpSocket` should only be used directly if the default configuration used
+    /// by `TcpStream::connect` and `TcpListener::bind` does not meet the required
+    /// use case.
+    ///
+    /// Calling `TcpStream::connect("127.0.0.1:8080")` is equivalent to:
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     let stream = socket.connect(addr).await?;
+    /// # drop(stream);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// Calling `TcpListener::bind("127.0.0.1:8080")` is equivalent to:
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     // On platforms with Berkeley-derived sockets, this allows to quickly
+    ///     // rebind a socket, without needing to wait for the OS to clean up the
+    ///     // previous one.
+    ///     //
+    ///     // On Windows, this allows rebinding sockets which are actively in use,
+    ///     // which allows “socket hijacking�, so we explicitly don't set it here.
+    ///     // https://docs.microsoft.com/en-us/windows/win32/winsock/using-so-reuseaddr-and-so-exclusiveaddruse
+    ///     socket.set_reuseaddr(true)?;
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(1024)?;
+    /// # drop(listener);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// Setting socket options not explicitly provided by `TcpSocket` may be done by
+    /// accessing the `RawFd`/`RawSocket` using [`AsRawFd`]/[`AsRawSocket`] and
+    /// setting the option with a crate like [`socket2`].
+    ///
+    /// [`RawFd`]: https://doc.rust-lang.org/std/os/unix/io/type.RawFd.html
+    /// [`RawSocket`]: https://doc.rust-lang.org/std/os/windows/io/type.RawSocket.html
+    /// [`AsRawFd`]: https://doc.rust-lang.org/std/os/unix/io/trait.AsRawFd.html
+    /// [`AsRawSocket`]: https://doc.rust-lang.org/std/os/windows/io/trait.AsRawSocket.html
+    /// [`socket2`]: https://docs.rs/socket2/
+    pub struct TcpSocket {
+        inner: mio::net::TcpSocket,
+    }
+}
+
+impl TcpSocket {
+    /// Create a new socket configured for IPv4.
+    ///
+    /// Calls `socket(2)` with `AF_INET` and `SOCK_STREAM`.
+    ///
+    /// # Returns
+    ///
+    /// On success, the newly created `TcpSocket` is returned. If an error is
+    /// encountered, it is returned instead.
+    ///
+    /// # Examples
+    ///
+    /// Create a new IPv4 socket and start listening.
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(128)?;
+    /// # drop(listener);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn new_v4() -> io::Result<TcpSocket> {
+        let inner = mio::net::TcpSocket::new_v4()?;
+        Ok(TcpSocket { inner })
+    }
+
+    /// Create a new socket configured for IPv6.
+    ///
+    /// Calls `socket(2)` with `AF_INET6` and `SOCK_STREAM`.
+    ///
+    /// # Returns
+    ///
+    /// On success, the newly created `TcpSocket` is returned. If an error is
+    /// encountered, it is returned instead.
+    ///
+    /// # Examples
+    ///
+    /// Create a new IPv6 socket and start listening.
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "[::1]:8080".parse().unwrap();
+    ///     let socket = TcpSocket::new_v6()?;
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(128)?;
+    /// # drop(listener);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn new_v6() -> io::Result<TcpSocket> {
+        let inner = mio::net::TcpSocket::new_v6()?;
+        Ok(TcpSocket { inner })
+    }
+
+    /// Allow the socket to bind to an in-use address.
+    ///
+    /// Behavior is platform specific. Refer to the target platform's
+    /// documentation for more details.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     socket.set_reuseaddr(true)?;
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(1024)?;
+    /// # drop(listener);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn set_reuseaddr(&self, reuseaddr: bool) -> io::Result<()> {
+        self.inner.set_reuseaddr(reuseaddr)
+    }
+
+    /// Retrieves the value set for `SO_REUSEADDR` on this socket
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     socket.set_reuseaddr(true)?;
+    ///     assert!(socket.reuseaddr().unwrap());
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(1024)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn reuseaddr(&self) -> io::Result<bool> {
+        self.inner.get_reuseaddr()
+    }
+
+    /// Allow the socket to bind to an in-use port. Only available for unix systems
+    /// (excluding Solaris & Illumos).
+    ///
+    /// Behavior is platform specific. Refer to the target platform's
+    /// documentation for more details.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     socket.set_reuseport(true)?;
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(1024)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    #[cfg(all(unix, not(target_os = "solaris"), not(target_os = "illumos")))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(unix, not(target_os = "solaris"), not(target_os = "illumos"))))
+    )]
+    pub fn set_reuseport(&self, reuseport: bool) -> io::Result<()> {
+        self.inner.set_reuseport(reuseport)
+    }
+
+    /// Allow the socket to bind to an in-use port. Only available for unix systems
+    /// (excluding Solaris & Illumos).
+    ///
+    /// Behavior is platform specific. Refer to the target platform's
+    /// documentation for more details.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     socket.set_reuseport(true)?;
+    ///     assert!(socket.reuseport().unwrap());
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(1024)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    #[cfg(all(unix, not(target_os = "solaris"), not(target_os = "illumos")))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(all(unix, not(target_os = "solaris"), not(target_os = "illumos"))))
+    )]
+    pub fn reuseport(&self) -> io::Result<bool> {
+        self.inner.get_reuseport()
+    }
+
+    /// Sets the size of the TCP send buffer on this socket.
+    ///
+    /// On most operating systems, this sets the `SO_SNDBUF` socket option.
+    pub fn set_send_buffer_size(&self, size: u32) -> io::Result<()> {
+        self.inner.set_send_buffer_size(size)
+    }
+
+    /// Returns the size of the TCP send buffer for this socket.
+    ///
+    /// On most operating systems, this is the value of the `SO_SNDBUF` socket
+    /// option.
+    ///
+    /// Note that if [`set_send_buffer_size`] has been called on this socket
+    /// previously, the value returned by this function may not be the same as
+    /// the argument provided to `set_send_buffer_size`. This is for the
+    /// following reasons:
+    ///
+    /// * Most operating systems have minimum and maximum allowed sizes for the
+    ///   send buffer, and will clamp the provided value if it is below the
+    ///   minimum or above the maximum. The minimum and maximum buffer sizes are
+    ///   OS-dependent.
+    /// * Linux will double the buffer size to account for internal bookkeeping
+    ///   data, and returns the doubled value from `getsockopt(2)`. As per `man
+    ///   7 socket`:
+    ///   > Sets or gets the maximum socket send buffer in bytes. The
+    ///   > kernel doubles this value (to allow space for bookkeeping
+    ///   > overhead) when it is set using `setsockopt(2)`, and this doubled
+    ///   > value is returned by `getsockopt(2)`.
+    ///
+    /// [`set_send_buffer_size`]: #method.set_send_buffer_size
+    pub fn send_buffer_size(&self) -> io::Result<u32> {
+        self.inner.get_send_buffer_size()
+    }
+
+    /// Sets the size of the TCP receive buffer on this socket.
+    ///
+    /// On most operating systems, this sets the `SO_RCVBUF` socket option.
+    pub fn set_recv_buffer_size(&self, size: u32) -> io::Result<()> {
+        self.inner.set_recv_buffer_size(size)
+    }
+
+    /// Returns the size of the TCP receive buffer for this socket.
+    ///
+    /// On most operating systems, this is the value of the `SO_RCVBUF` socket
+    /// option.
+    ///
+    /// Note that if [`set_recv_buffer_size`] has been called on this socket
+    /// previously, the value returned by this function may not be the same as
+    /// the argument provided to `set_send_buffer_size`. This is for the
+    /// following reasons:
+    ///
+    /// * Most operating systems have minimum and maximum allowed sizes for the
+    ///   receive buffer, and will clamp the provided value if it is below the
+    ///   minimum or above the maximum. The minimum and maximum buffer sizes are
+    ///   OS-dependent.
+    /// * Linux will double the buffer size to account for internal bookkeeping
+    ///   data, and returns the doubled value from `getsockopt(2)`. As per `man
+    ///   7 socket`:
+    ///   > Sets or gets the maximum socket send buffer in bytes. The
+    ///   > kernel doubles this value (to allow space for bookkeeping
+    ///   > overhead) when it is set using `setsockopt(2)`, and this doubled
+    ///   > value is returned by `getsockopt(2)`.
+    ///
+    /// [`set_recv_buffer_size`]: #method.set_recv_buffer_size
+    pub fn recv_buffer_size(&self) -> io::Result<u32> {
+        self.inner.get_recv_buffer_size()
+    }
+
+    /// Get the local address of this socket.
+    ///
+    /// Will fail on windows if called before `bind`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     socket.bind(addr)?;
+    ///     assert_eq!(socket.local_addr().unwrap().to_string(), "127.0.0.1:8080");
+    ///     let listener = socket.listen(1024)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn local_addr(&self) -> io::Result<SocketAddr> {
+        self.inner.get_localaddr()
+    }
+
+    /// Bind the socket to the given address.
+    ///
+    /// This calls the `bind(2)` operating-system function. Behavior is
+    /// platform specific. Refer to the target platform's documentation for more
+    /// details.
+    ///
+    /// # Examples
+    ///
+    /// Bind a socket before listening.
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(1024)?;
+    /// # drop(listener);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn bind(&self, addr: SocketAddr) -> io::Result<()> {
+        self.inner.bind(addr)
+    }
+
+    /// Establish a TCP connection with a peer at the specified socket address.
+    ///
+    /// The `TcpSocket` is consumed. Once the connection is established, a
+    /// connected [`TcpStream`] is returned. If the connection fails, the
+    /// encountered error is returned.
+    ///
+    /// [`TcpStream`]: TcpStream
+    ///
+    /// This calls the `connect(2)` operating-system function. Behavior is
+    /// platform specific. Refer to the target platform's documentation for more
+    /// details.
+    ///
+    /// # Examples
+    ///
+    /// Connecting to a peer.
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     let stream = socket.connect(addr).await?;
+    /// # drop(stream);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn connect(self, addr: SocketAddr) -> io::Result<TcpStream> {
+        let mio = self.inner.connect(addr)?;
+        TcpStream::connect_mio(mio).await
+    }
+
+    /// Convert the socket into a `TcpListener`.
+    ///
+    /// `backlog` defines the maximum number of pending connections are queued
+    /// by the operating system at any given time. Connection are removed from
+    /// the queue with [`TcpListener::accept`]. When the queue is full, the
+    /// operating-system will start rejecting connections.
+    ///
+    /// [`TcpListener::accept`]: TcpListener::accept
+    ///
+    /// This calls the `listen(2)` operating-system function, marking the socket
+    /// as a passive socket. Behavior is platform specific. Refer to the target
+    /// platform's documentation for more details.
+    ///
+    /// # Examples
+    ///
+    /// Create a `TcpListener`.
+    ///
+    /// ```no_run
+    /// use tokio::net::TcpSocket;
+    ///
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let addr = "127.0.0.1:8080".parse().unwrap();
+    ///
+    ///     let socket = TcpSocket::new_v4()?;
+    ///     socket.bind(addr)?;
+    ///
+    ///     let listener = socket.listen(1024)?;
+    /// # drop(listener);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn listen(self, backlog: u32) -> io::Result<TcpListener> {
+        let mio = self.inner.listen(backlog)?;
+        TcpListener::new(mio)
+    }
+
+    /// Converts a [`std::net::TcpStream`] into a `TcpSocket`. The provided
+    /// socket must not have been connected prior to calling this function. This
+    /// function is typically used together with crates such as [`socket2`] to
+    /// configure socket options that are not available on `TcpSocket`.
+    ///
+    /// [`std::net::TcpStream`]: struct@std::net::TcpStream
+    /// [`socket2`]: https://docs.rs/socket2/
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::net::TcpSocket;
+    /// use socket2::{Domain, Socket, Type};
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> std::io::Result<()> {
+    ///     
+    ///     let socket2_socket = Socket::new(Domain::IPV4, Type::STREAM, None)?;
+    ///
+    ///     let socket = TcpSocket::from_std_stream(socket2_socket.into());
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn from_std_stream(std_stream: std::net::TcpStream) -> TcpSocket {
+        #[cfg(unix)]
+        {
+            use std::os::unix::io::{FromRawFd, IntoRawFd};
+
+            let raw_fd = std_stream.into_raw_fd();
+            unsafe { TcpSocket::from_raw_fd(raw_fd) }
+        }
+
+        #[cfg(windows)]
+        {
+            use std::os::windows::io::{FromRawSocket, IntoRawSocket};
+
+            let raw_socket = std_stream.into_raw_socket();
+            unsafe { TcpSocket::from_raw_socket(raw_socket) }
+        }
+    }
+}
+
+impl fmt::Debug for TcpSocket {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.inner.fmt(fmt)
+    }
+}
+
+#[cfg(unix)]
+impl AsRawFd for TcpSocket {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+#[cfg(unix)]
+impl FromRawFd for TcpSocket {
+    /// Converts a `RawFd` to a `TcpSocket`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_fd(fd: RawFd) -> TcpSocket {
+        let inner = mio::net::TcpSocket::from_raw_fd(fd);
+        TcpSocket { inner }
+    }
+}
+
+#[cfg(unix)]
+impl IntoRawFd for TcpSocket {
+    fn into_raw_fd(self) -> RawFd {
+        self.inner.into_raw_fd()
+    }
+}
+
+#[cfg(windows)]
+impl IntoRawSocket for TcpSocket {
+    fn into_raw_socket(self) -> RawSocket {
+        self.inner.into_raw_socket()
+    }
+}
+
+#[cfg(windows)]
+impl AsRawSocket for TcpSocket {
+    fn as_raw_socket(&self) -> RawSocket {
+        self.inner.as_raw_socket()
+    }
+}
+
+#[cfg(windows)]
+impl FromRawSocket for TcpSocket {
+    /// Converts a `RawSocket` to a `TcpStream`.
+    ///
+    /// # Notes
+    ///
+    /// The caller is responsible for ensuring that the socket is in
+    /// non-blocking mode.
+    unsafe fn from_raw_socket(socket: RawSocket) -> TcpSocket {
+        let inner = mio::net::TcpSocket::from_raw_socket(socket);
+        TcpSocket { inner }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/split_owned.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/split_owned.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/split_owned.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/split_owned.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,12 +9,10 @@
 //! level.
 
 use crate::future::poll_fn;
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 use crate::net::TcpStream;
 
-use bytes::Buf;
 use std::error::Error;
-use std::mem::MaybeUninit;
 use std::net::Shutdown;
 use std::pin::Pin;
 use std::sync::Arc;
@@ -24,12 +22,11 @@
 /// Owned read half of a [`TcpStream`], created by [`into_split`].
 ///
 /// Reading from an `OwnedReadHalf` is usually done using the convenience methods found
-/// on the [`AsyncReadExt`] trait. Examples import this trait through [the prelude].
+/// on the [`AsyncReadExt`] trait.
 ///
 /// [`TcpStream`]: TcpStream
 /// [`into_split`]: TcpStream::into_split()
 /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
-/// [the prelude]: crate::prelude
 #[derive(Debug)]
 pub struct OwnedReadHalf {
     inner: Arc<TcpStream>,
@@ -42,14 +39,13 @@
 /// will also shut down the write half of the TCP stream.
 ///
 /// Writing to an `OwnedWriteHalf` is usually done using the convenience methods found
-/// on the [`AsyncWriteExt`] trait. Examples import this trait through [the prelude].
+/// on the [`AsyncWriteExt`] trait.
 ///
 /// [`TcpStream`]: TcpStream
 /// [`into_split`]: TcpStream::into_split()
 /// [`AsyncWrite`]: trait@crate::io::AsyncWrite
 /// [`poll_shutdown`]: fn@crate::io::AsyncWrite::poll_shutdown
 /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-/// [the prelude]: crate::prelude
 #[derive(Debug)]
 pub struct OwnedWriteHalf {
     inner: Arc<TcpStream>,
@@ -112,12 +108,16 @@
     /// the queue, registering the current task for wakeup if data is not yet
     /// available.
     ///
-    /// See the [`TcpStream::poll_peek`] level documenation for more details.
+    /// Note that on multiple calls to `poll_peek` or `poll_read`, only the
+    /// `Waker` from the `Context` passed to the most recent call is scheduled
+    /// to receive a wakeup.
+    ///
+    /// See the [`TcpStream::poll_peek`] level documentation for more details.
     ///
     /// # Examples
     ///
     /// ```no_run
-    /// use tokio::io;
+    /// use tokio::io::{self, ReadBuf};
     /// use tokio::net::TcpStream;
     ///
     /// use futures::future::poll_fn;
@@ -127,6 +127,7 @@
     ///     let stream = TcpStream::connect("127.0.0.1:8000").await?;
     ///     let (mut read_half, _) = stream.into_split();
     ///     let mut buf = [0; 10];
+    ///     let mut buf = ReadBuf::new(&mut buf);
     ///
     ///     poll_fn(|cx| {
     ///         read_half.poll_peek(cx, &mut buf)
@@ -137,15 +138,19 @@
     /// ```
     ///
     /// [`TcpStream::poll_peek`]: TcpStream::poll_peek
-    pub fn poll_peek(&mut self, cx: &mut Context<'_>, buf: &mut [u8]) -> Poll<io::Result<usize>> {
-        self.inner.poll_peek2(cx, buf)
+    pub fn poll_peek(
+        &mut self,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<usize>> {
+        self.inner.poll_peek(cx, buf)
     }
 
     /// Receives data on the socket from the remote address to which it is
     /// connected, without removing that data from the queue. On success,
     /// returns the number of bytes peeked.
     ///
-    /// See the [`TcpStream::peek`] level documenation for more details.
+    /// See the [`TcpStream::peek`] level documentation for more details.
     ///
     /// [`TcpStream::peek`]: TcpStream::peek
     ///
@@ -153,7 +158,7 @@
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncReadExt;
     /// use std::error::Error;
     ///
     /// #[tokio::main]
@@ -181,20 +186,17 @@
     /// [`read`]: fn@crate::io::AsyncReadExt::read
     /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
     pub async fn peek(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.poll_peek(cx, buf)).await
+        let mut buf = ReadBuf::new(buf);
+        poll_fn(|cx| self.poll_peek(cx, &mut buf)).await
     }
 }
 
 impl AsyncRead for OwnedReadHalf {
-    unsafe fn prepare_uninitialized_buffer(&self, _: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.inner.poll_read_priv(cx, buf)
     }
 }
@@ -221,7 +223,7 @@
 impl Drop for OwnedWriteHalf {
     fn drop(&mut self) {
         if self.shutdown_on_drop {
-            let _ = self.inner.shutdown(Shutdown::Write);
+            let _ = self.inner.shutdown_std(Shutdown::Write);
         }
     }
 }
@@ -235,12 +237,16 @@
         self.inner.poll_write_priv(cx, buf)
     }
 
-    fn poll_write_buf<B: Buf>(
+    fn poll_write_vectored(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut B,
+        bufs: &[io::IoSlice<'_>],
     ) -> Poll<io::Result<usize>> {
-        self.inner.poll_write_buf_priv(cx, buf)
+        self.inner.poll_write_vectored_priv(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        self.inner.is_write_vectored()
     }
 
     #[inline]
@@ -251,7 +257,7 @@
 
     // `poll_shutdown` on a write half shutdowns the stream in the "write" direction.
     fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
-        let res = self.inner.shutdown(Shutdown::Write);
+        let res = self.inner.shutdown_std(Shutdown::Write);
         if res.is_ok() {
             Pin::into_inner(self).shutdown_on_drop = false;
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,12 +9,10 @@
 //! level.
 
 use crate::future::poll_fn;
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 use crate::net::TcpStream;
 
-use bytes::Buf;
 use std::io;
-use std::mem::MaybeUninit;
 use std::net::Shutdown;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -22,29 +20,27 @@
 /// Borrowed read half of a [`TcpStream`], created by [`split`].
 ///
 /// Reading from a `ReadHalf` is usually done using the convenience methods found on the
-/// [`AsyncReadExt`] trait. Examples import this trait through [the prelude].
+/// [`AsyncReadExt`] trait.
 ///
 /// [`TcpStream`]: TcpStream
 /// [`split`]: TcpStream::split()
 /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
-/// [the prelude]: crate::prelude
 #[derive(Debug)]
 pub struct ReadHalf<'a>(&'a TcpStream);
 
 /// Borrowed write half of a [`TcpStream`], created by [`split`].
 ///
-/// Note that in the [`AsyncWrite`] implemenation of this type, [`poll_shutdown`] will
+/// Note that in the [`AsyncWrite`] implementation of this type, [`poll_shutdown`] will
 /// shut down the TCP stream in the write direction.
 ///
 /// Writing to an `WriteHalf` is usually done using the convenience methods found
-/// on the [`AsyncWriteExt`] trait. Examples import this trait through [the prelude].
+/// on the [`AsyncWriteExt`] trait.
 ///
 /// [`TcpStream`]: TcpStream
 /// [`split`]: TcpStream::split()
 /// [`AsyncWrite`]: trait@crate::io::AsyncWrite
 /// [`poll_shutdown`]: fn@crate::io::AsyncWrite::poll_shutdown
 /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-/// [the prelude]: crate::prelude
 #[derive(Debug)]
 pub struct WriteHalf<'a>(&'a TcpStream);
 
@@ -57,12 +53,16 @@
     /// the queue, registering the current task for wakeup if data is not yet
     /// available.
     ///
-    /// See the [`TcpStream::poll_peek`] level documenation for more details.
+    /// Note that on multiple calls to `poll_peek` or `poll_read`, only the
+    /// `Waker` from the `Context` passed to the most recent call is scheduled
+    /// to receive a wakeup.
+    ///
+    /// See the [`TcpStream::poll_peek`] level documentation for more details.
     ///
     /// # Examples
     ///
     /// ```no_run
-    /// use tokio::io;
+    /// use tokio::io::{self, ReadBuf};
     /// use tokio::net::TcpStream;
     ///
     /// use futures::future::poll_fn;
@@ -72,6 +72,7 @@
     ///     let mut stream = TcpStream::connect("127.0.0.1:8000").await?;
     ///     let (mut read_half, _) = stream.split();
     ///     let mut buf = [0; 10];
+    ///     let mut buf = ReadBuf::new(&mut buf);
     ///
     ///     poll_fn(|cx| {
     ///         read_half.poll_peek(cx, &mut buf)
@@ -82,15 +83,19 @@
     /// ```
     ///
     /// [`TcpStream::poll_peek`]: TcpStream::poll_peek
-    pub fn poll_peek(&mut self, cx: &mut Context<'_>, buf: &mut [u8]) -> Poll<io::Result<usize>> {
-        self.0.poll_peek2(cx, buf)
+    pub fn poll_peek(
+        &mut self,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<usize>> {
+        self.0.poll_peek(cx, buf)
     }
 
     /// Receives data on the socket from the remote address to which it is
     /// connected, without removing that data from the queue. On success,
     /// returns the number of bytes peeked.
     ///
-    /// See the [`TcpStream::peek`] level documenation for more details.
+    /// See the [`TcpStream::peek`] level documentation for more details.
     ///
     /// [`TcpStream::peek`]: TcpStream::peek
     ///
@@ -98,7 +103,7 @@
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncReadExt;
     /// use std::error::Error;
     ///
     /// #[tokio::main]
@@ -126,20 +131,17 @@
     /// [`read`]: fn@crate::io::AsyncReadExt::read
     /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
     pub async fn peek(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.poll_peek(cx, buf)).await
+        let mut buf = ReadBuf::new(buf);
+        poll_fn(|cx| self.poll_peek(cx, &mut buf)).await
     }
 }
 
 impl AsyncRead for ReadHalf<'_> {
-    unsafe fn prepare_uninitialized_buffer(&self, _: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.0.poll_read_priv(cx, buf)
     }
 }
@@ -153,12 +155,16 @@
         self.0.poll_write_priv(cx, buf)
     }
 
-    fn poll_write_buf<B: Buf>(
+    fn poll_write_vectored(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut B,
+        bufs: &[io::IoSlice<'_>],
     ) -> Poll<io::Result<usize>> {
-        self.0.poll_write_buf_priv(cx, buf)
+        self.0.poll_write_vectored_priv(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        self.0.is_write_vectored()
     }
 
     #[inline]
@@ -169,7 +175,7 @@
 
     // `poll_shutdown` on a write half shutdowns the stream in the "write" direction.
     fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
-        self.0.shutdown(Shutdown::Write).into()
+        self.0.shutdown_std(Shutdown::Write).into()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/tcp/stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/tcp/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,42 +1,44 @@
 use crate::future::poll_fn;
-use crate::io::{AsyncRead, AsyncWrite, PollEvented};
+use crate::io::{AsyncRead, AsyncWrite, Interest, PollEvented, ReadBuf, Ready};
 use crate::net::tcp::split::{split, ReadHalf, WriteHalf};
 use crate::net::tcp::split_owned::{split_owned, OwnedReadHalf, OwnedWriteHalf};
-use crate::net::ToSocketAddrs;
+use crate::net::{to_socket_addrs, ToSocketAddrs};
 
-use bytes::Buf;
-use iovec::IoVec;
 use std::convert::TryFrom;
 use std::fmt;
-use std::io::{self, Read, Write};
-use std::mem::MaybeUninit;
-use std::net::{self, Shutdown, SocketAddr};
+use std::io;
+use std::net::{Shutdown, SocketAddr};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::time::Duration;
 
-cfg_tcp! {
+cfg_io_util! {
+    use bytes::BufMut;
+}
+
+cfg_net! {
     /// A TCP stream between a local and a remote socket.
     ///
     /// A TCP stream can either be created by connecting to an endpoint, via the
-    /// [`connect`] method, or by [accepting] a connection from a [listener].
+    /// [`connect`] method, or by [accepting] a connection from a [listener]. A
+    /// TCP stream can also be created via the [`TcpSocket`] type.
     ///
     /// Reading and writing to a `TcpStream` is usually done using the
     /// convenience methods found on the [`AsyncReadExt`] and [`AsyncWriteExt`]
-    /// traits. Examples import these traits through [the prelude].
+    /// traits.
     ///
     /// [`connect`]: method@TcpStream::connect
-    /// [accepting]: method@super::TcpListener::accept
-    /// [listener]: struct@super::TcpListener
+    /// [accepting]: method@crate::net::TcpListener::accept
+    /// [listener]: struct@crate::net::TcpListener
+    /// [`TcpSocket`]: struct@crate::net::TcpSocket
     /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
     /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-    /// [the prelude]: crate::prelude
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncWriteExt;
     /// use std::error::Error;
     ///
     /// #[tokio::main]
@@ -55,6 +57,13 @@
     ///
     /// [`write_all`]: fn@crate::io::AsyncWriteExt::write_all
     /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
+    ///
+    /// To shut down the stream in the write direction, you can call the
+    /// [`shutdown()`] method. This will cause the other peer to receive a read of
+    /// length 0, indicating that no more data will be sent. This only closes
+    /// the stream in one direction.
+    ///
+    /// [`shutdown()`]: fn@crate::io::AsyncWriteExt::shutdown
     pub struct TcpStream {
         io: PollEvented<mio::net::TcpStream>,
     }
@@ -64,22 +73,23 @@
     /// Opens a TCP connection to a remote host.
     ///
     /// `addr` is an address of the remote host. Anything which implements the
-    /// [`ToSocketAddrs`] trait can be supplied as the address. Note that
-    /// strings only implement this trait when the **`dns`** feature is enabled,
-    /// as strings may contain domain names that need to be resolved.
-    ///
-    /// If `addr` yields multiple addresses, connect will be attempted with each
-    /// of the addresses until a connection is successful. If none of the
-    /// addresses result in a successful connection, the error returned from the
-    /// last connection attempt (the last address) is returned.
+    /// [`ToSocketAddrs`] trait can be supplied as the address.  If `addr`
+    /// yields multiple addresses, connect will be attempted with each of the
+    /// addresses until a connection is successful. If none of the addresses
+    /// result in a successful connection, the error returned from the last
+    /// connection attempt (the last address) is returned.
+    ///
+    /// To configure the socket before connecting, you can use the [`TcpSocket`]
+    /// type.
     ///
     /// [`ToSocketAddrs`]: trait@crate::net::ToSocketAddrs
+    /// [`TcpSocket`]: struct@crate::net::TcpSocket
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
-    /// use tokio::prelude::*;
+    /// use tokio::io::AsyncWriteExt;
     /// use std::error::Error;
     ///
     /// #[tokio::main]
@@ -94,32 +104,12 @@
     /// }
     /// ```
     ///
-    /// Without the `dns` feature:
-    ///
-    /// ```no_run
-    /// use tokio::net::TcpStream;
-    /// use tokio::prelude::*;
-    /// use std::error::Error;
-    /// use std::net::Ipv4Addr;
-    ///
-    /// #[tokio::main]
-    /// async fn main() -> Result<(), Box<dyn Error>> {
-    ///     // Connect to a peer
-    ///     let mut stream = TcpStream::connect((Ipv4Addr::new(127, 0, 0, 1), 8080)).await?;
-    ///
-    ///     // Write some data.
-    ///     stream.write_all(b"hello world!").await?;
-    ///
-    ///     Ok(())
-    /// }
-    /// ```
-    ///
     /// The [`write_all`] method is defined on the [`AsyncWriteExt`] trait.
     ///
     /// [`write_all`]: fn@crate::io::AsyncWriteExt::write_all
     /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
     pub async fn connect<A: ToSocketAddrs>(addr: A) -> io::Result<TcpStream> {
-        let addrs = addr.to_socket_addrs().await?;
+        let addrs = to_socket_addrs(addr).await?;
 
         let mut last_err = None;
 
@@ -140,7 +130,11 @@
 
     /// Establishes a connection to the specified `addr`.
     async fn connect_addr(addr: SocketAddr) -> io::Result<TcpStream> {
-        let sys = mio::net::TcpStream::connect(&addr)?;
+        let sys = mio::net::TcpStream::connect(addr)?;
+        TcpStream::connect_mio(sys).await
+    }
+
+    pub(crate) async fn connect_mio(sys: mio::net::TcpStream) -> io::Result<TcpStream> {
         let stream = TcpStream::new(sys)?;
 
         // Once we've connected, wait for the stream to be writable as
@@ -149,9 +143,9 @@
         // actually hit an error or not.
         //
         // If all that succeeded then we ship everything on up.
-        poll_fn(|cx| stream.io.poll_write_ready(cx)).await?;
+        poll_fn(|cx| stream.io.registration().poll_write_ready(cx)).await?;
 
-        if let Some(e) = stream.io.get_ref().take_error()? {
+        if let Some(e) = stream.io.take_error()? {
             return Err(e);
         }
 
@@ -165,8 +159,10 @@
 
     /// Creates new `TcpStream` from a `std::net::TcpStream`.
     ///
-    /// This function will convert a TCP stream created by the standard library
-    /// to a TCP stream ready to be used with the provided event loop handle.
+    /// This function is intended to be used to wrap a TCP stream from the
+    /// standard library in the Tokio equivalent. The conversion assumes nothing
+    /// about the underlying stream; it is left up to the user to set it in
+    /// non-blocking mode.
     ///
     /// # Examples
     ///
@@ -177,6 +173,7 @@
     /// #[tokio::main]
     /// async fn main() -> Result<(), Box<dyn Error>> {
     ///     let std_stream = std::net::TcpStream::connect("127.0.0.1:34254")?;
+    ///     std_stream.set_nonblocking(true)?;
     ///     let stream = TcpStream::from_std(std_stream)?;
     ///     Ok(())
     /// }
@@ -188,35 +185,65 @@
     ///
     /// The runtime is usually set implicitly when this function is called
     /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
-    pub fn from_std(stream: net::TcpStream) -> io::Result<TcpStream> {
-        let io = mio::net::TcpStream::from_stream(stream)?;
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
+    pub fn from_std(stream: std::net::TcpStream) -> io::Result<TcpStream> {
+        let io = mio::net::TcpStream::from_std(stream);
         let io = PollEvented::new(io)?;
         Ok(TcpStream { io })
     }
 
-    // Connects `TcpStream` asynchronously that may be built with a net2 `TcpBuilder`.
-    //
-    // This should be removed in favor of some in-crate TcpSocket builder API.
-    #[doc(hidden)]
-    pub async fn connect_std(stream: net::TcpStream, addr: &SocketAddr) -> io::Result<TcpStream> {
-        let io = mio::net::TcpStream::connect_stream(stream, addr)?;
-        let io = PollEvented::new(io)?;
-        let stream = TcpStream { io };
-
-        // Once we've connected, wait for the stream to be writable as
-        // that's when the actual connection has been initiated. Once we're
-        // writable we check for `take_socket_error` to see if the connect
-        // actually hit an error or not.
-        //
-        // If all that succeeded then we ship everything on up.
-        poll_fn(|cx| stream.io.poll_write_ready(cx)).await?;
-
-        if let Some(e) = stream.io.get_ref().take_error()? {
-            return Err(e);
+    /// Turn a [`tokio::net::TcpStream`] into a [`std::net::TcpStream`].
+    ///
+    /// The returned [`std::net::TcpStream`] will have nonblocking mode set as `true`.
+    /// Use [`set_nonblocking`] to change the blocking mode if needed.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::error::Error;
+    /// use std::io::Read;
+    /// use tokio::net::TcpListener;
+    /// # use tokio::net::TcpStream;
+    /// # use tokio::io::AsyncWriteExt;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let mut data = [0u8; 12];
+    ///     let listener = TcpListener::bind("127.0.0.1:34254").await?;
+    /// #   let handle = tokio::spawn(async {
+    /// #       let mut stream: TcpStream = TcpStream::connect("127.0.0.1:34254").await.unwrap();
+    /// #       stream.write(b"Hello world!").await.unwrap();
+    /// #   });
+    ///     let (tokio_tcp_stream, _) = listener.accept().await?;
+    ///     let mut std_tcp_stream = tokio_tcp_stream.into_std()?;
+    /// #   handle.await.expect("The task being joined has panicked");
+    ///     std_tcp_stream.set_nonblocking(false)?;
+    ///     std_tcp_stream.read_exact(&mut data)?;
+    /// #   assert_eq!(b"Hello world!", &data);
+    ///     Ok(())
+    /// }
+    /// ```
+    /// [`tokio::net::TcpStream`]: TcpStream
+    /// [`std::net::TcpStream`]: std::net::TcpStream
+    /// [`set_nonblocking`]: fn@std::net::TcpStream::set_nonblocking
+    pub fn into_std(self) -> io::Result<std::net::TcpStream> {
+        #[cfg(unix)]
+        {
+            use std::os::unix::io::{FromRawFd, IntoRawFd};
+            self.io
+                .into_inner()
+                .map(|io| io.into_raw_fd())
+                .map(|raw_fd| unsafe { std::net::TcpStream::from_raw_fd(raw_fd) })
         }
 
-        Ok(stream)
+        #[cfg(windows)]
+        {
+            use std::os::windows::io::{FromRawSocket, IntoRawSocket};
+            self.io
+                .into_inner()
+                .map(|io| io.into_raw_socket())
+                .map(|raw_socket| unsafe { std::net::TcpStream::from_raw_socket(raw_socket) })
+        }
     }
 
     /// Returns the local address that this stream is bound to.
@@ -234,7 +261,7 @@
     /// # }
     /// ```
     pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().local_addr()
+        self.io.local_addr()
     }
 
     /// Returns the remote address that this stream is connected to.
@@ -252,13 +279,18 @@
     /// # }
     /// ```
     pub fn peer_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().peer_addr()
+        self.io.peer_addr()
     }
 
     /// Attempts to receive data on the socket, without removing that data from
     /// the queue, registering the current task for wakeup if data is not yet
     /// available.
     ///
+    /// Note that on multiple calls to `poll_peek`, `poll_read` or
+    /// `poll_read_ready`, only the `Waker` from the `Context` passed to the
+    /// most recent call is scheduled to receive a wakeup. (However,
+    /// `poll_write` retains a second, independent waker.)
+    ///
     /// # Return value
     ///
     /// The function returns:
@@ -274,15 +306,16 @@
     /// # Examples
     ///
     /// ```no_run
-    /// use tokio::io;
+    /// use tokio::io::{self, ReadBuf};
     /// use tokio::net::TcpStream;
     ///
     /// use futures::future::poll_fn;
     ///
     /// #[tokio::main]
     /// async fn main() -> io::Result<()> {
-    ///     let mut stream = TcpStream::connect("127.0.0.1:8000").await?;
+    ///     let stream = TcpStream::connect("127.0.0.1:8000").await?;
     ///     let mut buf = [0; 10];
+    ///     let mut buf = ReadBuf::new(&mut buf);
     ///
     ///     poll_fn(|cx| {
     ///         stream.poll_peek(cx, &mut buf)
@@ -291,234 +324,711 @@
     ///     Ok(())
     /// }
     /// ```
-    pub fn poll_peek(&mut self, cx: &mut Context<'_>, buf: &mut [u8]) -> Poll<io::Result<usize>> {
-        self.poll_peek2(cx, buf)
-    }
-
-    pub(super) fn poll_peek2(
+    pub fn poll_peek(
         &self,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
+        buf: &mut ReadBuf<'_>,
     ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
+        loop {
+            let ev = ready!(self.io.registration().poll_read_ready(cx))?;
 
-        match self.io.get_ref().peek(buf) {
-            Ok(ret) => Poll::Ready(Ok(ret)),
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, mio::Ready::readable())?;
-                Poll::Pending
+            let b = unsafe {
+                &mut *(buf.unfilled_mut() as *mut [std::mem::MaybeUninit<u8>] as *mut [u8])
+            };
+
+            match self.io.peek(b) {
+                Ok(ret) => {
+                    unsafe { buf.assume_init(ret) };
+                    buf.advance(ret);
+                    return Poll::Ready(Ok(ret));
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                    self.io.registration().clear_readiness(ev);
+                }
+                Err(e) => return Poll::Ready(Err(e)),
             }
-            Err(e) => Poll::Ready(Err(e)),
         }
     }
 
-    /// Receives data on the socket from the remote address to which it is
-    /// connected, without removing that data from the queue. On success,
-    /// returns the number of bytes peeked.
+    /// Wait for any of the requested ready states.
     ///
-    /// Successive calls return the same data. This is accomplished by passing
-    /// `MSG_PEEK` as a flag to the underlying recv system call.
+    /// This function is usually paired with `try_read()` or `try_write()`. It
+    /// can be used to concurrently read / write to the same socket on a single
+    /// task without splitting the socket.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to read or write that fails with `WouldBlock` or
+    /// `Poll::Pending`.
     ///
     /// # Examples
     ///
+    /// Concurrently read and write to the stream on the same task without
+    /// splitting.
+    ///
     /// ```no_run
+    /// use tokio::io::Interest;
     /// use tokio::net::TcpStream;
-    /// use tokio::prelude::*;
     /// use std::error::Error;
+    /// use std::io;
     ///
     /// #[tokio::main]
     /// async fn main() -> Result<(), Box<dyn Error>> {
-    ///     // Connect to a peer
-    ///     let mut stream = TcpStream::connect("127.0.0.1:8080").await?;
-    ///
-    ///     let mut b1 = [0; 10];
-    ///     let mut b2 = [0; 10];
-    ///
-    ///     // Peek at the data
-    ///     let n = stream.peek(&mut b1).await?;
+    ///     let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    ///     // Read the data
-    ///     assert_eq!(n, stream.read(&mut b2[..n]).await?);
-    ///     assert_eq!(&b1[..n], &b2[..n]);
+    ///     loop {
+    ///         let ready = stream.ready(Interest::READABLE | Interest::WRITABLE).await?;
     ///
-    ///     Ok(())
+    ///         if ready.is_readable() {
+    ///             let mut data = vec![0; 1024];
+    ///             // Try to read data, this may still fail with `WouldBlock`
+    ///             // if the readiness event is a false positive.
+    ///             match stream.try_read(&mut data) {
+    ///                 Ok(n) => {
+    ///                     println!("read {} bytes", n);        
+    ///                 }
+    ///                 Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                     continue;
+    ///                 }
+    ///                 Err(e) => {
+    ///                     return Err(e.into());
+    ///                 }
+    ///             }
+    ///
+    ///         }
+    ///
+    ///         if ready.is_writable() {
+    ///             // Try to write data, this may still fail with `WouldBlock`
+    ///             // if the readiness event is a false positive.
+    ///             match stream.try_write(b"hello world") {
+    ///                 Ok(n) => {
+    ///                     println!("write {} bytes", n);
+    ///                 }
+    ///                 Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                     continue
+    ///                 }
+    ///                 Err(e) => {
+    ///                     return Err(e.into());
+    ///                 }
+    ///             }
+    ///         }
+    ///     }
     /// }
     /// ```
-    ///
-    /// The [`read`] method is defined on the [`AsyncReadExt`] trait.
-    ///
-    /// [`read`]: fn@crate::io::AsyncReadExt::read
-    /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
-    pub async fn peek(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.poll_peek(cx, buf)).await
+    pub async fn ready(&self, interest: Interest) -> io::Result<Ready> {
+        let event = self.io.registration().readiness(interest).await?;
+        Ok(event.ready)
     }
 
-    /// Shuts down the read, write, or both halves of this connection.
+    /// Wait for the socket to become readable.
     ///
-    /// This function will cause all pending and future I/O on the specified
-    /// portions to return immediately with an appropriate value (see the
-    /// documentation of `Shutdown`).
+    /// This function is equivalent to `ready(Interest::READABLE)` and is usually
+    /// paired with `try_read()`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to read that fails with `WouldBlock` or
+    /// `Poll::Pending`.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
     /// use std::error::Error;
-    /// use std::net::Shutdown;
+    /// use std::io;
     ///
     /// #[tokio::main]
     /// async fn main() -> Result<(), Box<dyn Error>> {
     ///     // Connect to a peer
     ///     let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    ///     // Shutdown the stream
-    ///     stream.shutdown(Shutdown::Write)?;
+    ///     let mut msg = vec![0; 1024];
     ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         stream.readable().await?;
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_read(&mut msg) {
+    ///             Ok(n) => {
+    ///                 msg.truncate(n);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     println!("GOT = {:?}", msg);
     ///     Ok(())
     /// }
     /// ```
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        self.io.get_ref().shutdown(how)
+    pub async fn readable(&self) -> io::Result<()> {
+        self.ready(Interest::READABLE).await?;
+        Ok(())
+    }
+
+    /// Polls for read readiness.
+    ///
+    /// If the tcp stream is not currently ready for reading, this method will
+    /// store a clone of the `Waker` from the provided `Context`. When the tcp
+    /// stream becomes ready for reading, `Waker::wake` will be called on the
+    /// waker.
+    ///
+    /// Note that on multiple calls to `poll_read_ready`, `poll_read` or
+    /// `poll_peek`, only the `Waker` from the `Context` passed to the most
+    /// recent call is scheduled to receive a wakeup. (However,
+    /// `poll_write_ready` retains a second, independent waker.)
+    ///
+    /// This function is intended for cases where creating and pinning a future
+    /// via [`readable`] is not feasible. Where possible, using [`readable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the tcp stream is not ready for reading.
+    /// * `Poll::Ready(Ok(()))` if the tcp stream is ready for reading.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`readable`]: method@Self::readable
+    pub fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.io.registration().poll_read_ready(cx).map_ok(|_| ())
     }
 
-    /// Gets the value of the `TCP_NODELAY` option on this socket.
+    /// Try to read data from the stream into the provided buffer, returning how
+    /// many bytes were read.
     ///
-    /// For more information about this option, see [`set_nodelay`].
+    /// Receives any pending data from the socket but does not wait for new data
+    /// to arrive. On success, returns the number of bytes read. Because
+    /// `try_read()` is non-blocking, the buffer does not have to be stored by
+    /// the async task and can exist entirely on the stack.
     ///
-    /// [`set_nodelay`]: TcpStream::set_nodelay
+    /// Usually, [`readable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: TcpStream::readable()
+    /// [`ready()`]: TcpStream::ready()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+    /// number of bytes read. `Ok(0)` indicates the stream's read half is closed
+    /// and will no longer yield data. If the stream is not ready to read data
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
+    /// use std::error::Error;
+    /// use std::io;
     ///
-    /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
-    /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// println!("{:?}", stream.nodelay()?);
-    /// # Ok(())
-    /// # }
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         stream.readable().await?;
+    ///
+    ///         // Creating the buffer **after** the `await` prevents it from
+    ///         // being stored in the async task.
+    ///         let mut buf = [0; 4096];
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_read(&mut buf) {
+    ///             Ok(0) => break,
+    ///             Ok(n) => {
+    ///                 println!("read {} bytes", n);
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
     /// ```
-    pub fn nodelay(&self) -> io::Result<bool> {
-        self.io.get_ref().nodelay()
+    pub fn try_read(&self, buf: &mut [u8]) -> io::Result<usize> {
+        use std::io::Read;
+
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || (&*self.io).read(buf))
     }
 
-    /// Sets the value of the `TCP_NODELAY` option on this socket.
+    /// Try to read data from the stream into the provided buffers, returning
+    /// how many bytes were read.
     ///
-    /// If set, this option disables the Nagle algorithm. This means that
-    /// segments are always sent as soon as possible, even if there is only a
-    /// small amount of data. When not set, data is buffered until there is a
-    /// sufficient amount to send out, thereby avoiding the frequent sending of
-    /// small packets.
+    /// Data is copied to fill each buffer in order, with the final buffer
+    /// written to possibly being only partially filled. This method behaves
+    /// equivalently to a single call to [`try_read()`] with concatenated
+    /// buffers.
+    ///
+    /// Receives any pending data from the socket but does not wait for new data
+    /// to arrive. On success, returns the number of bytes read. Because
+    /// `try_read_vectored()` is non-blocking, the buffer does not have to be
+    /// stored by the async task and can exist entirely on the stack.
+    ///
+    /// Usually, [`readable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`try_read()`]: TcpStream::try_read()
+    /// [`readable()`]: TcpStream::readable()
+    /// [`ready()`]: TcpStream::ready()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+    /// number of bytes read. `Ok(0)` indicates the stream's read half is closed
+    /// and will no longer yield data. If the stream is not ready to read data
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
+    /// use std::error::Error;
+    /// use std::io::{self, IoSliceMut};
     ///
-    /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
-    /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// stream.set_nodelay(true)?;
-    /// # Ok(())
-    /// # }
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         stream.readable().await?;
+    ///
+    ///         // Creating the buffer **after** the `await` prevents it from
+    ///         // being stored in the async task.
+    ///         let mut buf_a = [0; 512];
+    ///         let mut buf_b = [0; 1024];
+    ///         let mut bufs = [
+    ///             IoSliceMut::new(&mut buf_a),
+    ///             IoSliceMut::new(&mut buf_b),
+    ///         ];
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_read_vectored(&mut bufs) {
+    ///             Ok(0) => break,
+    ///             Ok(n) => {
+    ///                 println!("read {} bytes", n);
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
     /// ```
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
-        self.io.get_ref().set_nodelay(nodelay)
+    pub fn try_read_vectored(&self, bufs: &mut [io::IoSliceMut<'_>]) -> io::Result<usize> {
+        use std::io::Read;
+
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || (&*self.io).read_vectored(bufs))
+    }
+
+    cfg_io_util! {
+        /// Try to read data from the stream into the provided buffer, advancing the
+        /// buffer's internal cursor, returning how many bytes were read.
+        ///
+        /// Receives any pending data from the socket but does not wait for new data
+        /// to arrive. On success, returns the number of bytes read. Because
+        /// `try_read_buf()` is non-blocking, the buffer does not have to be stored by
+        /// the async task and can exist entirely on the stack.
+        ///
+        /// Usually, [`readable()`] or [`ready()`] is used with this function.
+        ///
+        /// [`readable()`]: TcpStream::readable()
+        /// [`ready()`]: TcpStream::ready()
+        ///
+        /// # Return
+        ///
+        /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+        /// number of bytes read. `Ok(0)` indicates the stream's read half is closed
+        /// and will no longer yield data. If the stream is not ready to read data
+        /// `Err(io::ErrorKind::WouldBlock)` is returned.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::net::TcpStream;
+        /// use std::error::Error;
+        /// use std::io;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> Result<(), Box<dyn Error>> {
+        ///     // Connect to a peer
+        ///     let stream = TcpStream::connect("127.0.0.1:8080").await?;
+        ///
+        ///     loop {
+        ///         // Wait for the socket to be readable
+        ///         stream.readable().await?;
+        ///
+        ///         let mut buf = Vec::with_capacity(4096);
+        ///
+        ///         // Try to read data, this may still fail with `WouldBlock`
+        ///         // if the readiness event is a false positive.
+        ///         match stream.try_read_buf(&mut buf) {
+        ///             Ok(0) => break,
+        ///             Ok(n) => {
+        ///                 println!("read {} bytes", n);
+        ///             }
+        ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+        ///                 continue;
+        ///             }
+        ///             Err(e) => {
+        ///                 return Err(e.into());
+        ///             }
+        ///         }
+        ///     }
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        pub fn try_read_buf<B: BufMut>(&self, buf: &mut B) -> io::Result<usize> {
+            self.io.registration().try_io(Interest::READABLE, || {
+                use std::io::Read;
+
+                let dst = buf.chunk_mut();
+                let dst =
+                    unsafe { &mut *(dst as *mut _ as *mut [std::mem::MaybeUninit<u8>] as *mut [u8]) };
+
+                // Safety: We trust `TcpStream::read` to have filled up `n` bytes in the
+                // buffer.
+                let n = (&*self.io).read(dst)?;
+
+                unsafe {
+                    buf.advance_mut(n);
+                }
+
+                Ok(n)
+            })
+        }
     }
 
-    /// Gets the value of the `SO_RCVBUF` option on this socket.
+    /// Wait for the socket to become writable.
+    ///
+    /// This function is equivalent to `ready(Interest::WRITABLE)` and is usually
+    /// paired with `try_write()`.
     ///
-    /// For more information about this option, see [`set_recv_buffer_size`].
+    /// # Cancel safety
     ///
-    /// [`set_recv_buffer_size`]: TcpStream::set_recv_buffer_size
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to write that fails with `WouldBlock` or
+    /// `Poll::Pending`.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
+    /// use std::error::Error;
+    /// use std::io;
     ///
-    /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
-    /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// println!("{:?}", stream.recv_buffer_size()?);
-    /// # Ok(())
-    /// # }
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         stream.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_write(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
     /// ```
-    pub fn recv_buffer_size(&self) -> io::Result<usize> {
-        self.io.get_ref().recv_buffer_size()
+    pub async fn writable(&self) -> io::Result<()> {
+        self.ready(Interest::WRITABLE).await?;
+        Ok(())
+    }
+
+    /// Polls for write readiness.
+    ///
+    /// If the tcp stream is not currently ready for writing, this method will
+    /// store a clone of the `Waker` from the provided `Context`. When the tcp
+    /// stream becomes ready for writing, `Waker::wake` will be called on the
+    /// waker.
+    ///
+    /// Note that on multiple calls to `poll_write_ready` or `poll_write`, only
+    /// the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup. (However, `poll_read_ready` retains a
+    /// second, independent waker.)
+    ///
+    /// This function is intended for cases where creating and pinning a future
+    /// via [`writable`] is not feasible. Where possible, using [`writable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the tcp stream is not ready for writing.
+    /// * `Poll::Ready(Ok(()))` if the tcp stream is ready for writing.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`writable`]: method@Self::writable
+    pub fn poll_write_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.io.registration().poll_write_ready(cx).map_ok(|_| ())
     }
 
-    /// Sets the value of the `SO_RCVBUF` option on this socket.
+    /// Try to write a buffer to the stream, returning how many bytes were
+    /// written.
     ///
-    /// Changes the size of the operating system's receive buffer associated
-    /// with the socket.
+    /// The function will attempt to write the entire contents of `buf`, but
+    /// only part of the buffer may be written.
+    ///
+    /// This function is usually paired with `writable()`.
+    ///
+    /// # Return
+    ///
+    /// If data is successfully written, `Ok(n)` is returned, where `n` is the
+    /// number of bytes written. If the stream is not ready to write data,
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
+    /// use std::error::Error;
+    /// use std::io;
     ///
-    /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
-    /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// stream.set_recv_buffer_size(100)?;
-    /// # Ok(())
-    /// # }
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         stream.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_write(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
     /// ```
-    pub fn set_recv_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.io.get_ref().set_recv_buffer_size(size)
+    pub fn try_write(&self, buf: &[u8]) -> io::Result<usize> {
+        use std::io::Write;
+
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || (&*self.io).write(buf))
     }
 
-    /// Gets the value of the `SO_SNDBUF` option on this socket.
+    /// Try to write several buffers to the stream, returning how many bytes
+    /// were written.
     ///
-    /// For more information about this option, see [`set_send_buffer_size`].
+    /// Data is written from each buffer in order, with the final buffer read
+    /// from possible being only partially consumed. This method behaves
+    /// equivalently to a single call to [`try_write()`] with concatenated
+    /// buffers.
     ///
-    /// [`set_send_buffer_size`]: TcpStream::set_send_buffer_size
+    /// This function is usually paired with `writable()`.
+    ///
+    /// [`try_write()`]: TcpStream::try_write()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully written, `Ok(n)` is returned, where `n` is the
+    /// number of bytes written. If the stream is not ready to write data,
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
+    /// use std::error::Error;
+    /// use std::io;
     ///
-    /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
-    /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// println!("{:?}", stream.send_buffer_size()?);
-    /// # Ok(())
-    /// # }
+    ///     let bufs = [io::IoSlice::new(b"hello "), io::IoSlice::new(b"world")];
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         stream.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_write_vectored(&bufs) {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
     /// ```
-    pub fn send_buffer_size(&self) -> io::Result<usize> {
-        self.io.get_ref().send_buffer_size()
+    pub fn try_write_vectored(&self, bufs: &[io::IoSlice<'_>]) -> io::Result<usize> {
+        use std::io::Write;
+
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || (&*self.io).write_vectored(bufs))
+    }
+
+    /// Try to read or write from the socket using a user-provided IO operation.
+    ///
+    /// If the socket is ready, the provided closure is called. The closure
+    /// should attempt to perform IO operation from the socket by manually
+    /// calling the appropriate syscall. If the operation fails because the
+    /// socket is not actually ready, then the closure should return a
+    /// `WouldBlock` error and the readiness flag is cleared. The return value
+    /// of the closure is then returned by `try_io`.
+    ///
+    /// If the socket is not ready, then the closure is not called
+    /// and a `WouldBlock` error is returned.
+    ///
+    /// The closure should only return a `WouldBlock` error if it has performed
+    /// an IO operation on the socket that failed due to the socket not being
+    /// ready. Returning a `WouldBlock` error in any other situation will
+    /// incorrectly clear the readiness flag, which can cause the socket to
+    /// behave incorrectly.
+    ///
+    /// The closure should not perform the IO operation using any of the methods
+    /// defined on the Tokio `TcpStream` type, as this will mess with the
+    /// readiness flag and can cause the socket to behave incorrectly.
+    ///
+    /// Usually, [`readable()`], [`writable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: TcpStream::readable()
+    /// [`writable()`]: TcpStream::writable()
+    /// [`ready()`]: TcpStream::ready()
+    pub fn try_io<R>(
+        &self,
+        interest: Interest,
+        f: impl FnOnce() -> io::Result<R>,
+    ) -> io::Result<R> {
+        self.io.registration().try_io(interest, f)
     }
 
-    /// Sets the value of the `SO_SNDBUF` option on this socket.
+    /// Receives data on the socket from the remote address to which it is
+    /// connected, without removing that data from the queue. On success,
+    /// returns the number of bytes peeked.
     ///
-    /// Changes the size of the operating system's send buffer associated with
-    /// the socket.
+    /// Successive calls return the same data. This is accomplished by passing
+    /// `MSG_PEEK` as a flag to the underlying recv system call.
     ///
     /// # Examples
     ///
     /// ```no_run
     /// use tokio::net::TcpStream;
+    /// use tokio::io::AsyncReadExt;
+    /// use std::error::Error;
     ///
-    /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
-    /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let mut stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// stream.set_send_buffer_size(100)?;
-    /// # Ok(())
-    /// # }
+    ///     let mut b1 = [0; 10];
+    ///     let mut b2 = [0; 10];
+    ///
+    ///     // Peek at the data
+    ///     let n = stream.peek(&mut b1).await?;
+    ///
+    ///     // Read the data
+    ///     assert_eq!(n, stream.read(&mut b2[..n]).await?);
+    ///     assert_eq!(&b1[..n], &b2[..n]);
+    ///
+    ///     Ok(())
+    /// }
     /// ```
-    pub fn set_send_buffer_size(&self, size: usize) -> io::Result<()> {
-        self.io.get_ref().set_send_buffer_size(size)
+    ///
+    /// The [`read`] method is defined on the [`AsyncReadExt`] trait.
+    ///
+    /// [`read`]: fn@crate::io::AsyncReadExt::read
+    /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
+    pub async fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .async_io(Interest::READABLE, || self.io.peek(buf))
+            .await
+    }
+
+    /// Shuts down the read, write, or both halves of this connection.
+    ///
+    /// This function will cause all pending and future I/O on the specified
+    /// portions to return immediately with an appropriate value (see the
+    /// documentation of `Shutdown`).
+    pub(super) fn shutdown_std(&self, how: Shutdown) -> io::Result<()> {
+        self.io.shutdown(how)
     }
 
-    /// Returns whether keepalive messages are enabled on this socket, and if so
-    /// the duration of time between them.
+    /// Gets the value of the `TCP_NODELAY` option on this socket.
     ///
-    /// For more information about this option, see [`set_keepalive`].
+    /// For more information about this option, see [`set_nodelay`].
     ///
-    /// [`set_keepalive`]: TcpStream::set_keepalive
+    /// [`set_nodelay`]: TcpStream::set_nodelay
     ///
     /// # Examples
     ///
@@ -528,26 +1038,21 @@
     /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
     /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// println!("{:?}", stream.keepalive()?);
+    /// println!("{:?}", stream.nodelay()?);
     /// # Ok(())
     /// # }
     /// ```
-    pub fn keepalive(&self) -> io::Result<Option<Duration>> {
-        self.io.get_ref().keepalive()
+    pub fn nodelay(&self) -> io::Result<bool> {
+        self.io.nodelay()
     }
 
-    /// Sets whether keepalive messages are enabled to be sent on this socket.
-    ///
-    /// On Unix, this option will set the `SO_KEEPALIVE` as well as the
-    /// `TCP_KEEPALIVE` or `TCP_KEEPIDLE` option (depending on your platform).
-    /// On Windows, this will set the `SIO_KEEPALIVE_VALS` option.
-    ///
-    /// If `None` is specified then keepalive messages are disabled, otherwise
-    /// the duration specified will be the time to remain idle before sending a
-    /// TCP keepalive probe.
+    /// Sets the value of the `TCP_NODELAY` option on this socket.
     ///
-    /// Some platforms specify this value in seconds, so sub-second
-    /// specifications may be omitted.
+    /// If set, this option disables the Nagle algorithm. This means that
+    /// segments are always sent as soon as possible, even if there is only a
+    /// small amount of data. When not set, data is buffered until there is a
+    /// sufficient amount to send out, thereby avoiding the frequent sending of
+    /// small packets.
     ///
     /// # Examples
     ///
@@ -557,19 +1062,20 @@
     /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
     /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// stream.set_keepalive(None)?;
+    /// stream.set_nodelay(true)?;
     /// # Ok(())
     /// # }
     /// ```
-    pub fn set_keepalive(&self, keepalive: Option<Duration>) -> io::Result<()> {
-        self.io.get_ref().set_keepalive(keepalive)
+    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
+        self.io.set_nodelay(nodelay)
     }
 
-    /// Gets the value of the `IP_TTL` option for this socket.
+    /// Reads the linger duration for this socket by getting the `SO_LINGER`
+    /// option.
     ///
-    /// For more information about this option, see [`set_ttl`].
+    /// For more information about this option, see [`set_linger`].
     ///
-    /// [`set_ttl`]: TcpStream::set_ttl
+    /// [`set_linger`]: TcpStream::set_linger
     ///
     /// # Examples
     ///
@@ -579,18 +1085,24 @@
     /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
     /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// println!("{:?}", stream.ttl()?);
+    /// println!("{:?}", stream.linger()?);
     /// # Ok(())
     /// # }
     /// ```
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.io.get_ref().ttl()
+    pub fn linger(&self) -> io::Result<Option<Duration>> {
+        let mio_socket = std::mem::ManuallyDrop::new(self.to_mio());
+
+        mio_socket.get_linger()
     }
 
-    /// Sets the value for the `IP_TTL` option on this socket.
+    /// Sets the linger duration of this socket by setting the SO_LINGER option.
     ///
-    /// This value sets the time-to-live field that is used in every packet sent
-    /// from this socket.
+    /// This option controls the action taken when a stream has unsent messages and the stream is
+    /// closed. If SO_LINGER is set, the system shall block the process until it can transmit the
+    /// data or until the time expires.
+    ///
+    /// If SO_LINGER is not specified, and the stream is closed, the system handles the call in a
+    /// way that allows the process to continue as quickly as possible.
     ///
     /// # Examples
     ///
@@ -600,20 +1112,35 @@
     /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
     /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// stream.set_ttl(123)?;
+    /// stream.set_linger(None)?;
     /// # Ok(())
     /// # }
     /// ```
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.io.get_ref().set_ttl(ttl)
+    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
+        let mio_socket = std::mem::ManuallyDrop::new(self.to_mio());
+
+        mio_socket.set_linger(dur)
     }
 
-    /// Reads the linger duration for this socket by getting the `SO_LINGER`
-    /// option.
+    fn to_mio(&self) -> mio::net::TcpSocket {
+        #[cfg(windows)]
+        {
+            use std::os::windows::io::{AsRawSocket, FromRawSocket};
+            unsafe { mio::net::TcpSocket::from_raw_socket(self.as_raw_socket()) }
+        }
+
+        #[cfg(unix)]
+        {
+            use std::os::unix::io::{AsRawFd, FromRawFd};
+            unsafe { mio::net::TcpSocket::from_raw_fd(self.as_raw_fd()) }
+        }
+    }
+
+    /// Gets the value of the `IP_TTL` option for this socket.
     ///
-    /// For more information about this option, see [`set_linger`].
+    /// For more information about this option, see [`set_ttl`].
     ///
-    /// [`set_linger`]: TcpStream::set_linger
+    /// [`set_ttl`]: TcpStream::set_ttl
     ///
     /// # Examples
     ///
@@ -623,25 +1150,18 @@
     /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
     /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// println!("{:?}", stream.linger()?);
+    /// println!("{:?}", stream.ttl()?);
     /// # Ok(())
     /// # }
     /// ```
-    pub fn linger(&self) -> io::Result<Option<Duration>> {
-        self.io.get_ref().linger()
+    pub fn ttl(&self) -> io::Result<u32> {
+        self.io.ttl()
     }
 
-    /// Sets the linger duration of this socket by setting the `SO_LINGER`
-    /// option.
+    /// Sets the value for the `IP_TTL` option on this socket.
     ///
-    /// This option controls the action taken when a stream has unsent messages
-    /// and the stream is closed. If `SO_LINGER` is set, the system
-    /// shall block the process until it can transmit the data or until the
-    /// time expires.
-    ///
-    /// If `SO_LINGER` is not specified, and the stream is closed, the system
-    /// handles the call in a way that allows the process to continue as quickly
-    /// as possible.
+    /// This value sets the time-to-live field that is used in every packet sent
+    /// from this socket.
     ///
     /// # Examples
     ///
@@ -651,12 +1171,12 @@
     /// # async fn dox() -> Result<(), Box<dyn std::error::Error>> {
     /// let stream = TcpStream::connect("127.0.0.1:8080").await?;
     ///
-    /// stream.set_linger(None)?;
+    /// stream.set_ttl(123)?;
     /// # Ok(())
     /// # }
     /// ```
-    pub fn set_linger(&self, dur: Option<Duration>) -> io::Result<()> {
-        self.io.get_ref().set_linger(dur)
+    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
+        self.io.set_ttl(ttl)
     }
 
     // These lifetime markers also appear in the generated documentation, and make
@@ -680,39 +1200,27 @@
     /// this comes at the cost of a heap allocation.
     ///
     /// **Note:** Dropping the write half will shut down the write half of the TCP
-    /// stream. This is equivalent to calling [`shutdown(Write)`] on the `TcpStream`.
+    /// stream. This is equivalent to calling [`shutdown()`] on the `TcpStream`.
     ///
     /// [`split`]: TcpStream::split()
-    /// [`shutdown(Write)`]: fn@crate::net::TcpStream::shutdown
+    /// [`shutdown()`]: fn@crate::io::AsyncWriteExt::shutdown
     pub fn into_split(self) -> (OwnedReadHalf, OwnedWriteHalf) {
         split_owned(self)
     }
 
     // == Poll IO functions that takes `&self` ==
     //
-    // They are not public because (taken from the doc of `PollEvented`):
-    //
-    // While `PollEvented` is `Sync` (if the underlying I/O type is `Sync`), the
-    // caller must ensure that there are at most two tasks that use a
-    // `PollEvented` instance concurrently. One for reading and one for writing.
-    // While violating this requirement is "safe" from a Rust memory model point
-    // of view, it will result in unexpected behavior in the form of lost
-    // notifications and tasks hanging.
+    // To read or write without mutable access to the `UnixStream`, combine the
+    // `poll_read_ready` or `poll_write_ready` methods with the `try_read` or
+    // `try_write` methods.
 
     pub(crate) fn poll_read_priv(
         &self,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
-
-        match self.io.get_ref().read(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, mio::Ready::readable())?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        // Safety: `TcpStream::read` correctly handles reads into uninitialized memory
+        unsafe { self.io.poll_read(cx, buf) }
     }
 
     pub(super) fn poll_write_priv(
@@ -720,143 +1228,26 @@
         cx: &mut Context<'_>,
         buf: &[u8],
     ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_write_ready(cx))?;
-
-        match self.io.get_ref().write(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_write_ready(cx)?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
+        self.io.poll_write(cx, buf)
     }
 
-    pub(super) fn poll_write_buf_priv<B: Buf>(
+    pub(super) fn poll_write_vectored_priv(
         &self,
         cx: &mut Context<'_>,
-        buf: &mut B,
+        bufs: &[io::IoSlice<'_>],
     ) -> Poll<io::Result<usize>> {
-        use std::io::IoSlice;
-
-        ready!(self.io.poll_write_ready(cx))?;
-
-        // The `IoVec` (v0.1.x) type can't have a zero-length size, so create
-        // a dummy version from a 1-length slice which we'll overwrite with
-        // the `bytes_vectored` method.
-        static S: &[u8] = &[0];
-        const MAX_BUFS: usize = 64;
-
-        // IoSlice isn't Copy, so we must expand this manually ;_;
-        let mut slices: [IoSlice<'_>; MAX_BUFS] = [
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-            IoSlice::new(S),
-        ];
-        let cnt = buf.bytes_vectored(&mut slices);
-
-        let iovec = <&IoVec>::from(S);
-        let mut vecs = [iovec; MAX_BUFS];
-        for i in 0..cnt {
-            vecs[i] = (*slices[i]).into();
-        }
-
-        match self.io.get_ref().write_bufs(&vecs[..cnt]) {
-            Ok(n) => {
-                buf.advance(n);
-                Poll::Ready(Ok(n))
-            }
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_write_ready(cx)?;
-                Poll::Pending
-            }
-            Err(e) => Poll::Ready(Err(e)),
-        }
-    }
-}
-
-impl TryFrom<TcpStream> for mio::net::TcpStream {
-    type Error = io::Error;
-
-    /// Consumes value, returning the mio I/O object.
-    ///
-    /// See [`PollEvented::into_inner`] for more details about
-    /// resource deregistration that happens during the call.
-    ///
-    /// [`PollEvented::into_inner`]: crate::io::PollEvented::into_inner
-    fn try_from(value: TcpStream) -> Result<Self, Self::Error> {
-        value.io.into_inner()
+        self.io.poll_write_vectored(cx, bufs)
     }
 }
 
-impl TryFrom<net::TcpStream> for TcpStream {
+impl TryFrom<std::net::TcpStream> for TcpStream {
     type Error = io::Error;
 
     /// Consumes stream, returning the tokio I/O object.
     ///
     /// This is equivalent to
     /// [`TcpStream::from_std(stream)`](TcpStream::from_std).
-    fn try_from(stream: net::TcpStream) -> Result<Self, Self::Error> {
+    fn try_from(stream: std::net::TcpStream) -> Result<Self, Self::Error> {
         Self::from_std(stream)
     }
 }
@@ -864,15 +1255,11 @@
 // ===== impl Read / Write =====
 
 impl AsyncRead for TcpStream {
-    unsafe fn prepare_uninitialized_buffer(&self, _: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.poll_read_priv(cx, buf)
     }
 }
@@ -886,12 +1273,16 @@
         self.poll_write_priv(cx, buf)
     }
 
-    fn poll_write_buf<B: Buf>(
+    fn poll_write_vectored(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut B,
+        bufs: &[io::IoSlice<'_>],
     ) -> Poll<io::Result<usize>> {
-        self.poll_write_buf_priv(cx, buf)
+        self.poll_write_vectored_priv(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        true
     }
 
     #[inline]
@@ -901,14 +1292,14 @@
     }
 
     fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
-        self.shutdown(std::net::Shutdown::Write)?;
+        self.shutdown_std(std::net::Shutdown::Write)?;
         Poll::Ready(Ok(()))
     }
 }
 
 impl fmt::Debug for TcpStream {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.io.get_ref().fmt(f)
+        self.io.fmt(f)
     }
 }
 
@@ -919,21 +1310,19 @@
 
     impl AsRawFd for TcpStream {
         fn as_raw_fd(&self) -> RawFd {
-            self.io.get_ref().as_raw_fd()
+            self.io.as_raw_fd()
         }
     }
 }
 
 #[cfg(windows)]
 mod sys {
-    // TODO: let's land these upstream with mio and then we can add them here.
-    //
-    // use std::os::windows::prelude::*;
-    // use super::TcpStream;
-    //
-    // impl AsRawHandle for TcpStream {
-    //     fn as_raw_handle(&self) -> RawHandle {
-    //         self.io.get_ref().as_raw_handle()
-    //     }
-    // }
+    use super::TcpStream;
+    use std::os::windows::prelude::*;
+
+    impl AsRawSocket for TcpStream {
+        fn as_raw_socket(&self) -> RawSocket {
+            self.io.as_raw_socket()
+        }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/udp/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/udp/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/udp/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/udp/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-//! UDP utility types.
-
-pub(crate) mod socket;
-pub(crate) use socket::UdpSocket;
-
-mod split;
-pub use split::{RecvHalf, ReuniteError, SendHalf};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/udp/socket.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/udp/socket.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/udp/socket.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/udp/socket.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,454 +0,0 @@
-use crate::future::poll_fn;
-use crate::io::PollEvented;
-use crate::net::udp::split::{split, RecvHalf, SendHalf};
-use crate::net::ToSocketAddrs;
-
-use std::convert::TryFrom;
-use std::fmt;
-use std::io;
-use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr};
-use std::task::{Context, Poll};
-
-cfg_udp! {
-    /// A UDP socket
-    pub struct UdpSocket {
-        io: PollEvented<mio::net::UdpSocket>,
-    }
-}
-
-impl UdpSocket {
-    /// This function will create a new UDP socket and attempt to bind it to
-    /// the `addr` provided.
-    pub async fn bind<A: ToSocketAddrs>(addr: A) -> io::Result<UdpSocket> {
-        let addrs = addr.to_socket_addrs().await?;
-        let mut last_err = None;
-
-        for addr in addrs {
-            match UdpSocket::bind_addr(addr) {
-                Ok(socket) => return Ok(socket),
-                Err(e) => last_err = Some(e),
-            }
-        }
-
-        Err(last_err.unwrap_or_else(|| {
-            io::Error::new(
-                io::ErrorKind::InvalidInput,
-                "could not resolve to any address",
-            )
-        }))
-    }
-
-    fn bind_addr(addr: SocketAddr) -> io::Result<UdpSocket> {
-        let sys = mio::net::UdpSocket::bind(&addr)?;
-        UdpSocket::new(sys)
-    }
-
-    fn new(socket: mio::net::UdpSocket) -> io::Result<UdpSocket> {
-        let io = PollEvented::new(socket)?;
-        Ok(UdpSocket { io })
-    }
-
-    /// Creates a new `UdpSocket` from the previously bound socket provided.
-    ///
-    /// The socket given will be registered with the event loop that `handle`
-    /// is associated with. This function requires that `socket` has previously
-    /// been bound to an address to work correctly.
-    ///
-    /// This can be used in conjunction with net2's `UdpBuilder` interface to
-    /// configure a socket before it's handed off, such as setting options like
-    /// `reuse_address` or binding to multiple addresses.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if thread-local runtime is not set.
-    ///
-    /// The runtime is usually set implicitly when this function is called
-    /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
-    pub fn from_std(socket: net::UdpSocket) -> io::Result<UdpSocket> {
-        let io = mio::net::UdpSocket::from_socket(socket)?;
-        let io = PollEvented::new(io)?;
-        Ok(UdpSocket { io })
-    }
-
-    /// Splits the `UdpSocket` into a receive half and a send half. The two parts
-    /// can be used to receive and send datagrams concurrently, even from two
-    /// different tasks.
-    pub fn split(self) -> (RecvHalf, SendHalf) {
-        split(self)
-    }
-
-    /// Returns the local address that this socket is bound to.
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().local_addr()
-    }
-
-    /// Connects the UDP socket setting the default destination for send() and
-    /// limiting packets that are read via recv from the address specified in
-    /// `addr`.
-    pub async fn connect<A: ToSocketAddrs>(&self, addr: A) -> io::Result<()> {
-        let addrs = addr.to_socket_addrs().await?;
-        let mut last_err = None;
-
-        for addr in addrs {
-            match self.io.get_ref().connect(addr) {
-                Ok(_) => return Ok(()),
-                Err(e) => last_err = Some(e),
-            }
-        }
-
-        Err(last_err.unwrap_or_else(|| {
-            io::Error::new(
-                io::ErrorKind::InvalidInput,
-                "could not resolve to any address",
-            )
-        }))
-    }
-
-    /// Returns a future that sends data on the socket to the remote address to which it is connected.
-    /// On success, the future will resolve to the number of bytes written.
-    ///
-    /// The [`connect`] method will connect this socket to a remote address. The future
-    /// will resolve to an error if the socket is not connected.
-    ///
-    /// [`connect`]: method@Self::connect
-    pub async fn send(&mut self, buf: &[u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.poll_send(cx, buf)).await
-    }
-
-    /// Try to send data on the socket to the remote address to which it is
-    /// connected.
-    ///
-    /// # Returns
-    ///
-    /// If successfull, the number of bytes sent is returned. Users
-    /// should ensure that when the remote cannot receive, the
-    /// [`ErrorKind::WouldBlock`] is properly handled.
-    ///
-    /// [`ErrorKind::WouldBlock`]: std::io::ErrorKind::WouldBlock
-    pub fn try_send(&self, buf: &[u8]) -> io::Result<usize> {
-        self.io.get_ref().send(buf)
-    }
-
-    // Poll IO functions that takes `&self` are provided for the split API.
-    //
-    // They are not public because (taken from the doc of `PollEvented`):
-    //
-    // While `PollEvented` is `Sync` (if the underlying I/O type is `Sync`), the
-    // caller must ensure that there are at most two tasks that use a
-    // `PollEvented` instance concurrently. One for reading and one for writing.
-    // While violating this requirement is "safe" from a Rust memory model point
-    // of view, it will result in unexpected behavior in the form of lost
-    // notifications and tasks hanging.
-    #[doc(hidden)]
-    pub fn poll_send(&self, cx: &mut Context<'_>, buf: &[u8]) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_write_ready(cx))?;
-
-        match self.io.get_ref().send(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_write_ready(cx)?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
-    }
-
-    /// Returns a future that receives a single datagram message on the socket from
-    /// the remote address to which it is connected. On success, the future will resolve
-    /// to the number of bytes read.
-    ///
-    /// The function must be called with valid byte array `buf` of sufficient size to
-    /// hold the message bytes. If a message is too long to fit in the supplied buffer,
-    /// excess bytes may be discarded.
-    ///
-    /// The [`connect`] method will connect this socket to a remote address. The future
-    /// will fail if the socket is not connected.
-    ///
-    /// [`connect`]: method@Self::connect
-    pub async fn recv(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.poll_recv(cx, buf)).await
-    }
-
-    #[doc(hidden)]
-    pub fn poll_recv(&self, cx: &mut Context<'_>, buf: &mut [u8]) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
-
-        match self.io.get_ref().recv(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, mio::Ready::readable())?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
-    }
-
-    /// Returns a future that sends data on the socket to the given address.
-    /// On success, the future will resolve to the number of bytes written.
-    ///
-    /// The future will resolve to an error if the IP version of the socket does
-    /// not match that of `target`.
-    pub async fn send_to<A: ToSocketAddrs>(&mut self, buf: &[u8], target: A) -> io::Result<usize> {
-        let mut addrs = target.to_socket_addrs().await?;
-
-        match addrs.next() {
-            Some(target) => poll_fn(|cx| self.poll_send_to(cx, buf, &target)).await,
-            None => Err(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                "no addresses to send data to",
-            )),
-        }
-    }
-
-    /// Try to send data on the socket to the given address.
-    ///
-    /// # Returns
-    ///
-    /// If successfull, the future resolves to the number of bytes sent.
-    ///
-    /// Users should ensure that when the remote cannot receive, the
-    /// [`ErrorKind::WouldBlock`] is properly handled. An error can also occur
-    /// if the IP version of the socket does not match that of `target`.
-    ///
-    /// [`ErrorKind::WouldBlock`]: std::io::ErrorKind::WouldBlock
-    pub fn try_send_to(&self, buf: &[u8], target: SocketAddr) -> io::Result<usize> {
-        self.io.get_ref().send_to(buf, &target)
-    }
-
-    // TODO: Public or not?
-    #[doc(hidden)]
-    pub fn poll_send_to(
-        &self,
-        cx: &mut Context<'_>,
-        buf: &[u8],
-        target: &SocketAddr,
-    ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_write_ready(cx))?;
-
-        match self.io.get_ref().send_to(buf, target) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_write_ready(cx)?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
-    }
-
-    /// Returns a future that receives a single datagram on the socket. On success,
-    /// the future resolves to the number of bytes read and the origin.
-    ///
-    /// The function must be called with valid byte array `buf` of sufficient size
-    /// to hold the message bytes. If a message is too long to fit in the supplied
-    /// buffer, excess bytes may be discarded.
-    pub async fn recv_from(&mut self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        poll_fn(|cx| self.poll_recv_from(cx, buf)).await
-    }
-
-    #[doc(hidden)]
-    pub fn poll_recv_from(
-        &self,
-        cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<Result<(usize, SocketAddr), io::Error>> {
-        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
-
-        match self.io.get_ref().recv_from(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, mio::Ready::readable())?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
-    }
-
-    /// Gets the value of the `SO_BROADCAST` option for this socket.
-    ///
-    /// For more information about this option, see [`set_broadcast`].
-    ///
-    /// [`set_broadcast`]: method@Self::set_broadcast
-    pub fn broadcast(&self) -> io::Result<bool> {
-        self.io.get_ref().broadcast()
-    }
-
-    /// Sets the value of the `SO_BROADCAST` option for this socket.
-    ///
-    /// When enabled, this socket is allowed to send packets to a broadcast
-    /// address.
-    pub fn set_broadcast(&self, on: bool) -> io::Result<()> {
-        self.io.get_ref().set_broadcast(on)
-    }
-
-    /// Gets the value of the `IP_MULTICAST_LOOP` option for this socket.
-    ///
-    /// For more information about this option, see [`set_multicast_loop_v4`].
-    ///
-    /// [`set_multicast_loop_v4`]: method@Self::set_multicast_loop_v4
-    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
-        self.io.get_ref().multicast_loop_v4()
-    }
-
-    /// Sets the value of the `IP_MULTICAST_LOOP` option for this socket.
-    ///
-    /// If enabled, multicast packets will be looped back to the local socket.
-    ///
-    /// # Note
-    ///
-    /// This may not have any affect on IPv6 sockets.
-    pub fn set_multicast_loop_v4(&self, on: bool) -> io::Result<()> {
-        self.io.get_ref().set_multicast_loop_v4(on)
-    }
-
-    /// Gets the value of the `IP_MULTICAST_TTL` option for this socket.
-    ///
-    /// For more information about this option, see [`set_multicast_ttl_v4`].
-    ///
-    /// [`set_multicast_ttl_v4`]: method@Self::set_multicast_ttl_v4
-    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
-        self.io.get_ref().multicast_ttl_v4()
-    }
-
-    /// Sets the value of the `IP_MULTICAST_TTL` option for this socket.
-    ///
-    /// Indicates the time-to-live value of outgoing multicast packets for
-    /// this socket. The default value is 1 which means that multicast packets
-    /// don't leave the local network unless explicitly requested.
-    ///
-    /// # Note
-    ///
-    /// This may not have any affect on IPv6 sockets.
-    pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
-        self.io.get_ref().set_multicast_ttl_v4(ttl)
-    }
-
-    /// Gets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
-    ///
-    /// For more information about this option, see [`set_multicast_loop_v6`].
-    ///
-    /// [`set_multicast_loop_v6`]: method@Self::set_multicast_loop_v6
-    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
-        self.io.get_ref().multicast_loop_v6()
-    }
-
-    /// Sets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
-    ///
-    /// Controls whether this socket sees the multicast packets it sends itself.
-    ///
-    /// # Note
-    ///
-    /// This may not have any affect on IPv4 sockets.
-    pub fn set_multicast_loop_v6(&self, on: bool) -> io::Result<()> {
-        self.io.get_ref().set_multicast_loop_v6(on)
-    }
-
-    /// Gets the value of the `IP_TTL` option for this socket.
-    ///
-    /// For more information about this option, see [`set_ttl`].
-    ///
-    /// [`set_ttl`]: method@Self::set_ttl
-    pub fn ttl(&self) -> io::Result<u32> {
-        self.io.get_ref().ttl()
-    }
-
-    /// Sets the value for the `IP_TTL` option on this socket.
-    ///
-    /// This value sets the time-to-live field that is used in every packet sent
-    /// from this socket.
-    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
-        self.io.get_ref().set_ttl(ttl)
-    }
-
-    /// Executes an operation of the `IP_ADD_MEMBERSHIP` type.
-    ///
-    /// This function specifies a new multicast group for this socket to join.
-    /// The address must be a valid multicast address, and `interface` is the
-    /// address of the local interface with which the system should join the
-    /// multicast group. If it's equal to `INADDR_ANY` then an appropriate
-    /// interface is chosen by the system.
-    pub fn join_multicast_v4(&self, multiaddr: Ipv4Addr, interface: Ipv4Addr) -> io::Result<()> {
-        self.io.get_ref().join_multicast_v4(&multiaddr, &interface)
-    }
-
-    /// Executes an operation of the `IPV6_ADD_MEMBERSHIP` type.
-    ///
-    /// This function specifies a new multicast group for this socket to join.
-    /// The address must be a valid multicast address, and `interface` is the
-    /// index of the interface to join/leave (or 0 to indicate any interface).
-    pub fn join_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
-        self.io.get_ref().join_multicast_v6(multiaddr, interface)
-    }
-
-    /// Executes an operation of the `IP_DROP_MEMBERSHIP` type.
-    ///
-    /// For more information about this option, see [`join_multicast_v4`].
-    ///
-    /// [`join_multicast_v4`]: method@Self::join_multicast_v4
-    pub fn leave_multicast_v4(&self, multiaddr: Ipv4Addr, interface: Ipv4Addr) -> io::Result<()> {
-        self.io.get_ref().leave_multicast_v4(&multiaddr, &interface)
-    }
-
-    /// Executes an operation of the `IPV6_DROP_MEMBERSHIP` type.
-    ///
-    /// For more information about this option, see [`join_multicast_v6`].
-    ///
-    /// [`join_multicast_v6`]: method@Self::join_multicast_v6
-    pub fn leave_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
-        self.io.get_ref().leave_multicast_v6(multiaddr, interface)
-    }
-}
-
-impl TryFrom<UdpSocket> for mio::net::UdpSocket {
-    type Error = io::Error;
-
-    /// Consumes value, returning the mio I/O object.
-    ///
-    /// See [`PollEvented::into_inner`] for more details about
-    /// resource deregistration that happens during the call.
-    ///
-    /// [`PollEvented::into_inner`]: crate::io::PollEvented::into_inner
-    fn try_from(value: UdpSocket) -> Result<Self, Self::Error> {
-        value.io.into_inner()
-    }
-}
-
-impl TryFrom<net::UdpSocket> for UdpSocket {
-    type Error = io::Error;
-
-    /// Consumes stream, returning the tokio I/O object.
-    ///
-    /// This is equivalent to
-    /// [`UdpSocket::from_std(stream)`](UdpSocket::from_std).
-    fn try_from(stream: net::UdpSocket) -> Result<Self, Self::Error> {
-        Self::from_std(stream)
-    }
-}
-
-impl fmt::Debug for UdpSocket {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.io.get_ref().fmt(f)
-    }
-}
-
-#[cfg(all(unix))]
-mod sys {
-    use super::UdpSocket;
-    use std::os::unix::prelude::*;
-
-    impl AsRawFd for UdpSocket {
-        fn as_raw_fd(&self) -> RawFd {
-            self.io.get_ref().as_raw_fd()
-        }
-    }
-}
-
-#[cfg(windows)]
-mod sys {
-    // TODO: let's land these upstream with mio and then we can add them here.
-    //
-    // use std::os::windows::prelude::*;
-    // use super::UdpSocket;
-    //
-    // impl AsRawHandle for UdpSocket {
-    //     fn as_raw_handle(&self) -> RawHandle {
-    //         self.io.get_ref().as_raw_handle()
-    //     }
-    // }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/udp/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/udp/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/udp/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/udp/split.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-//! [`UdpSocket`](crate::net::UdpSocket) split support.
-//!
-//! The [`split`](method@crate::net::UdpSocket::split) method splits a
-//! `UdpSocket` into a receive half and a send half, which can be used to
-//! receive and send datagrams concurrently, even from two different tasks.
-//!
-//! The halves provide access to the underlying socket, implementing
-//! `AsRef<UdpSocket>`. This allows you to call `UdpSocket` methods that takes
-//! `&self`, e.g., to get local address, to get and set socket options, to join
-//! or leave multicast groups, etc.
-//!
-//! The halves can be reunited to the original socket with their `reunite`
-//! methods.
-
-use crate::future::poll_fn;
-use crate::net::udp::UdpSocket;
-
-use std::error::Error;
-use std::fmt;
-use std::io;
-use std::net::SocketAddr;
-use std::sync::Arc;
-
-/// The send half after [`split`](super::UdpSocket::split).
-///
-/// Use [`send_to`](method@Self::send_to) or [`send`](method@Self::send) to send
-/// datagrams.
-#[derive(Debug)]
-pub struct SendHalf(Arc<UdpSocket>);
-
-/// The recv half after [`split`](super::UdpSocket::split).
-///
-/// Use [`recv_from`](method@Self::recv_from) or [`recv`](method@Self::recv) to receive
-/// datagrams.
-#[derive(Debug)]
-pub struct RecvHalf(Arc<UdpSocket>);
-
-pub(crate) fn split(socket: UdpSocket) -> (RecvHalf, SendHalf) {
-    let shared = Arc::new(socket);
-    let send = shared.clone();
-    let recv = shared;
-    (RecvHalf(recv), SendHalf(send))
-}
-
-/// Error indicating that two halves were not from the same socket, and thus could
-/// not be `reunite`d.
-#[derive(Debug)]
-pub struct ReuniteError(pub SendHalf, pub RecvHalf);
-
-impl fmt::Display for ReuniteError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "tried to reunite halves that are not from the same socket"
-        )
-    }
-}
-
-impl Error for ReuniteError {}
-
-fn reunite(s: SendHalf, r: RecvHalf) -> Result<UdpSocket, ReuniteError> {
-    if Arc::ptr_eq(&s.0, &r.0) {
-        drop(r);
-        // Only two instances of the `Arc` are ever created, one for the
-        // receiver and one for the sender, and those `Arc`s are never exposed
-        // externally. And so when we drop one here, the other one must be the
-        // only remaining one.
-        Ok(Arc::try_unwrap(s.0).expect("udp: try_unwrap failed in reunite"))
-    } else {
-        Err(ReuniteError(s, r))
-    }
-}
-
-impl RecvHalf {
-    /// Attempts to put the two "halves" of a `UdpSocket` back together and
-    /// recover the original socket. Succeeds only if the two "halves"
-    /// originated from the same call to `UdpSocket::split`.
-    pub fn reunite(self, other: SendHalf) -> Result<UdpSocket, ReuniteError> {
-        reunite(other, self)
-    }
-
-    /// Returns a future that receives a single datagram on the socket. On success,
-    /// the future resolves to the number of bytes read and the origin.
-    ///
-    /// The function must be called with valid byte array `buf` of sufficient size
-    /// to hold the message bytes. If a message is too long to fit in the supplied
-    /// buffer, excess bytes may be discarded.
-    pub async fn recv_from(&mut self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        poll_fn(|cx| self.0.poll_recv_from(cx, buf)).await
-    }
-
-    /// Returns a future that receives a single datagram message on the socket from
-    /// the remote address to which it is connected. On success, the future will resolve
-    /// to the number of bytes read.
-    ///
-    /// The function must be called with valid byte array `buf` of sufficient size to
-    /// hold the message bytes. If a message is too long to fit in the supplied buffer,
-    /// excess bytes may be discarded.
-    ///
-    /// The [`connect`] method will connect this socket to a remote address. The future
-    /// will fail if the socket is not connected.
-    ///
-    /// [`connect`]: super::UdpSocket::connect
-    pub async fn recv(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.0.poll_recv(cx, buf)).await
-    }
-}
-
-impl SendHalf {
-    /// Attempts to put the two "halves" of a `UdpSocket` back together and
-    /// recover the original socket. Succeeds only if the two "halves"
-    /// originated from the same call to `UdpSocket::split`.
-    pub fn reunite(self, other: RecvHalf) -> Result<UdpSocket, ReuniteError> {
-        reunite(self, other)
-    }
-
-    /// Returns a future that sends data on the socket to the given address.
-    /// On success, the future will resolve to the number of bytes written.
-    ///
-    /// The future will resolve to an error if the IP version of the socket does
-    /// not match that of `target`.
-    pub async fn send_to(&mut self, buf: &[u8], target: &SocketAddr) -> io::Result<usize> {
-        poll_fn(|cx| self.0.poll_send_to(cx, buf, target)).await
-    }
-
-    /// Returns a future that sends data on the socket to the remote address to which it is connected.
-    /// On success, the future will resolve to the number of bytes written.
-    ///
-    /// The [`connect`] method will connect this socket to a remote address. The future
-    /// will resolve to an error if the socket is not connected.
-    ///
-    /// [`connect`]: super::UdpSocket::connect
-    pub async fn send(&mut self, buf: &[u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.0.poll_send(cx, buf)).await
-    }
-}
-
-impl AsRef<UdpSocket> for SendHalf {
-    fn as_ref(&self) -> &UdpSocket {
-        &self.0
-    }
-}
-
-impl AsRef<UdpSocket> for RecvHalf {
-    fn as_ref(&self) -> &UdpSocket {
-        &self.0
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/udp.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/udp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1519 @@
+use crate::io::{Interest, PollEvented, ReadBuf, Ready};
+use crate::net::{to_socket_addrs, ToSocketAddrs};
+
+use std::convert::TryFrom;
+use std::fmt;
+use std::io;
+use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr};
+use std::task::{Context, Poll};
+
+cfg_io_util! {
+    use bytes::BufMut;
+}
+
+cfg_net! {
+    /// A UDP socket
+    ///
+    /// UDP is "connectionless", unlike TCP. Meaning, regardless of what address you've bound to, a `UdpSocket`
+    /// is free to communicate with many different remotes. In tokio there are basically two main ways to use `UdpSocket`:
+    ///
+    /// * one to many: [`bind`](`UdpSocket::bind`) and use [`send_to`](`UdpSocket::send_to`)
+    ///   and [`recv_from`](`UdpSocket::recv_from`) to communicate with many different addresses
+    /// * one to one: [`connect`](`UdpSocket::connect`) and associate with a single address, using [`send`](`UdpSocket::send`)
+    ///   and [`recv`](`UdpSocket::recv`) to communicate only with that remote address
+    ///
+    /// This type does not provide a `split` method, because this functionality
+    /// can be achieved by instead wrapping the socket in an [`Arc`]. Note that
+    /// you do not need a `Mutex` to share the `UdpSocket` — an `Arc<UdpSocket>`
+    /// is enough. This is because all of the methods take `&self` instead of
+    /// `&mut self`. Once you have wrapped it in an `Arc`, you can call
+    /// `.clone()` on the `Arc<UdpSocket>` to get multiple shared handles to the
+    /// same socket. An example of such usage can be found further down.
+    ///
+    /// [`Arc`]: std::sync::Arc
+    ///
+    /// # Streams
+    ///
+    /// If you need to listen over UDP and produce a [`Stream`], you can look
+    /// at [`UdpFramed`].
+    ///
+    /// [`UdpFramed`]: https://docs.rs/tokio-util/latest/tokio_util/udp/struct.UdpFramed.html
+    /// [`Stream`]: https://docs.rs/futures/0.3/futures/stream/trait.Stream.html
+    ///
+    /// # Example: one to many (bind)
+    ///
+    /// Using `bind` we can create a simple echo server that sends and recv's with many different clients:
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let sock = UdpSocket::bind("0.0.0.0:8080").await?;
+    ///     let mut buf = [0; 1024];
+    ///     loop {
+    ///         let (len, addr) = sock.recv_from(&mut buf).await?;
+    ///         println!("{:?} bytes received from {:?}", len, addr);
+    ///
+    ///         let len = sock.send_to(&buf[..len], addr).await?;
+    ///         println!("{:?} bytes sent", len);
+    ///     }
+    /// }
+    /// ```
+    ///
+    /// # Example: one to one (connect)
+    ///
+    /// Or using `connect` we can echo with a single remote address using `send` and `recv`:
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let sock = UdpSocket::bind("0.0.0.0:8080").await?;
+    ///
+    ///     let remote_addr = "127.0.0.1:59611";
+    ///     sock.connect(remote_addr).await?;
+    ///     let mut buf = [0; 1024];
+    ///     loop {
+    ///         let len = sock.recv(&mut buf).await?;
+    ///         println!("{:?} bytes received from {:?}", len, remote_addr);
+    ///
+    ///         let len = sock.send(&buf[..len]).await?;
+    ///         println!("{:?} bytes sent", len);
+    ///     }
+    /// }
+    /// ```
+    ///
+    /// # Example: Splitting with `Arc`
+    ///
+    /// Because `send_to` and `recv_from` take `&self`. It's perfectly alright
+    /// to use an `Arc<UdpSocket>` and share the references to multiple tasks.
+    /// Here is a similar "echo" example that supports concurrent
+    /// sending/receiving:
+    ///
+    /// ```no_run
+    /// use tokio::{net::UdpSocket, sync::mpsc};
+    /// use std::{io, net::SocketAddr, sync::Arc};
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let sock = UdpSocket::bind("0.0.0.0:8080".parse::<SocketAddr>().unwrap()).await?;
+    ///     let r = Arc::new(sock);
+    ///     let s = r.clone();
+    ///     let (tx, mut rx) = mpsc::channel::<(Vec<u8>, SocketAddr)>(1_000);
+    ///
+    ///     tokio::spawn(async move {
+    ///         while let Some((bytes, addr)) = rx.recv().await {
+    ///             let len = s.send_to(&bytes, &addr).await.unwrap();
+    ///             println!("{:?} bytes sent", len);
+    ///         }
+    ///     });
+    ///
+    ///     let mut buf = [0; 1024];
+    ///     loop {
+    ///         let (len, addr) = r.recv_from(&mut buf).await?;
+    ///         println!("{:?} bytes received from {:?}", len, addr);
+    ///         tx.send((buf[..len].to_vec(), addr)).await.unwrap();
+    ///     }
+    /// }
+    /// ```
+    ///
+    pub struct UdpSocket {
+        io: PollEvented<mio::net::UdpSocket>,
+    }
+}
+
+impl UdpSocket {
+    /// This function will create a new UDP socket and attempt to bind it to
+    /// the `addr` provided.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let sock = UdpSocket::bind("0.0.0.0:8080").await?;
+    ///     // use `sock`
+    /// #   let _ = sock;
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn bind<A: ToSocketAddrs>(addr: A) -> io::Result<UdpSocket> {
+        let addrs = to_socket_addrs(addr).await?;
+        let mut last_err = None;
+
+        for addr in addrs {
+            match UdpSocket::bind_addr(addr) {
+                Ok(socket) => return Ok(socket),
+                Err(e) => last_err = Some(e),
+            }
+        }
+
+        Err(last_err.unwrap_or_else(|| {
+            io::Error::new(
+                io::ErrorKind::InvalidInput,
+                "could not resolve to any address",
+            )
+        }))
+    }
+
+    fn bind_addr(addr: SocketAddr) -> io::Result<UdpSocket> {
+        let sys = mio::net::UdpSocket::bind(addr)?;
+        UdpSocket::new(sys)
+    }
+
+    fn new(socket: mio::net::UdpSocket) -> io::Result<UdpSocket> {
+        let io = PollEvented::new(socket)?;
+        Ok(UdpSocket { io })
+    }
+
+    /// Creates new `UdpSocket` from a previously bound `std::net::UdpSocket`.
+    ///
+    /// This function is intended to be used to wrap a UDP socket from the
+    /// standard library in the Tokio equivalent. The conversion assumes nothing
+    /// about the underlying socket; it is left up to the user to set it in
+    /// non-blocking mode.
+    ///
+    /// This can be used in conjunction with socket2's `Socket` interface to
+    /// configure a socket before it's handed off, such as setting options like
+    /// `reuse_address` or binding to multiple addresses.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if thread-local runtime is not set.
+    ///
+    /// The runtime is usually set implicitly when this function is called
+    /// from a future driven by a tokio runtime, otherwise runtime can be set
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// # use std::{io, net::SocketAddr};
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() -> io::Result<()> {
+    /// let addr = "0.0.0.0:8080".parse::<SocketAddr>().unwrap();
+    /// let std_sock = std::net::UdpSocket::bind(addr)?;
+    /// std_sock.set_nonblocking(true)?;
+    /// let sock = UdpSocket::from_std(std_sock)?;
+    /// // use `sock`
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn from_std(socket: net::UdpSocket) -> io::Result<UdpSocket> {
+        let io = mio::net::UdpSocket::from_std(socket);
+        UdpSocket::new(io)
+    }
+
+    /// Turn a [`tokio::net::UdpSocket`] into a [`std::net::UdpSocket`].
+    ///
+    /// The returned [`std::net::UdpSocket`] will have nonblocking mode set as
+    /// `true`.  Use [`set_nonblocking`] to change the blocking mode if needed.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,no_run
+    /// use std::error::Error;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let tokio_socket = tokio::net::UdpSocket::bind("127.0.0.1:0").await?;
+    ///     let std_socket = tokio_socket.into_std()?;
+    ///     std_socket.set_nonblocking(false)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// [`tokio::net::UdpSocket`]: UdpSocket
+    /// [`std::net::UdpSocket`]: std::net::UdpSocket
+    /// [`set_nonblocking`]: fn@std::net::UdpSocket::set_nonblocking
+    pub fn into_std(self) -> io::Result<std::net::UdpSocket> {
+        #[cfg(unix)]
+        {
+            use std::os::unix::io::{FromRawFd, IntoRawFd};
+            self.io
+                .into_inner()
+                .map(|io| io.into_raw_fd())
+                .map(|raw_fd| unsafe { std::net::UdpSocket::from_raw_fd(raw_fd) })
+        }
+
+        #[cfg(windows)]
+        {
+            use std::os::windows::io::{FromRawSocket, IntoRawSocket};
+            self.io
+                .into_inner()
+                .map(|io| io.into_raw_socket())
+                .map(|raw_socket| unsafe { std::net::UdpSocket::from_raw_socket(raw_socket) })
+        }
+    }
+
+    /// Returns the local address that this socket is bound to.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// # use std::{io, net::SocketAddr};
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() -> io::Result<()> {
+    /// let addr = "0.0.0.0:8080".parse::<SocketAddr>().unwrap();
+    /// let sock = UdpSocket::bind(addr).await?;
+    /// // the address the socket is bound to
+    /// let local_addr = sock.local_addr()?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn local_addr(&self) -> io::Result<SocketAddr> {
+        self.io.local_addr()
+    }
+
+    /// Connects the UDP socket setting the default destination for send() and
+    /// limiting packets that are read via recv from the address specified in
+    /// `addr`.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// # use std::{io, net::SocketAddr};
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() -> io::Result<()> {
+    /// let sock = UdpSocket::bind("0.0.0.0:8080".parse::<SocketAddr>().unwrap()).await?;
+    ///
+    /// let remote_addr = "127.0.0.1:59600".parse::<SocketAddr>().unwrap();
+    /// sock.connect(remote_addr).await?;
+    /// let mut buf = [0u8; 32];
+    /// // recv from remote_addr
+    /// let len = sock.recv(&mut buf).await?;
+    /// // send to remote_addr
+    /// let _len = sock.send(&buf[..len]).await?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn connect<A: ToSocketAddrs>(&self, addr: A) -> io::Result<()> {
+        let addrs = to_socket_addrs(addr).await?;
+        let mut last_err = None;
+
+        for addr in addrs {
+            match self.io.connect(addr) {
+                Ok(_) => return Ok(()),
+                Err(e) => last_err = Some(e),
+            }
+        }
+
+        Err(last_err.unwrap_or_else(|| {
+            io::Error::new(
+                io::ErrorKind::InvalidInput,
+                "could not resolve to any address",
+            )
+        }))
+    }
+
+    /// Wait for any of the requested ready states.
+    ///
+    /// This function is usually paired with `try_recv()` or `try_send()`. It
+    /// can be used to concurrently recv / send to the same socket on a single
+    /// task without splitting the socket.
+    ///
+    /// The function may complete without the socket being ready. This is a
+    /// false-positive and attempting an operation will return with
+    /// `io::ErrorKind::WouldBlock`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to read or write that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// Concurrently receive from and send to the socket on the same task
+    /// without splitting.
+    ///
+    /// ```no_run
+    /// use tokio::io::{self, Interest};
+    /// use tokio::net::UdpSocket;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///     socket.connect("127.0.0.1:8081").await?;
+    ///
+    ///     loop {
+    ///         let ready = socket.ready(Interest::READABLE | Interest::WRITABLE).await?;
+    ///
+    ///         if ready.is_readable() {
+    ///             // The buffer is **not** included in the async task and will only exist
+    ///             // on the stack.
+    ///             let mut data = [0; 1024];
+    ///             match socket.try_recv(&mut data[..]) {
+    ///                 Ok(n) => {
+    ///                     println!("received {:?}", &data[..n]);
+    ///                 }
+    ///                 // False-positive, continue
+    ///                 Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {}
+    ///                 Err(e) => {
+    ///                     return Err(e);
+    ///                 }
+    ///             }
+    ///         }
+    ///
+    ///         if ready.is_writable() {
+    ///             // Write some data
+    ///             match socket.try_send(b"hello world") {
+    ///                 Ok(n) => {
+    ///                     println!("sent {} bytes", n);
+    ///                 }
+    ///                 // False-positive, continue
+    ///                 Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {}
+    ///                 Err(e) => {
+    ///                     return Err(e);
+    ///                 }
+    ///             }
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    pub async fn ready(&self, interest: Interest) -> io::Result<Ready> {
+        let event = self.io.registration().readiness(interest).await?;
+        Ok(event.ready)
+    }
+
+    /// Wait for the socket to become writable.
+    ///
+    /// This function is equivalent to `ready(Interest::WRITABLE)` and is
+    /// usually paired with `try_send()` or `try_send_to()`.
+    ///
+    /// The function may complete without the socket being writable. This is a
+    /// false-positive and attempting a `try_send()` will return with
+    /// `io::ErrorKind::WouldBlock`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to write that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Bind socket
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///     socket.connect("127.0.0.1:8081").await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         socket.writable().await?;
+    ///
+    ///         // Try to send data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_send(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn writable(&self) -> io::Result<()> {
+        self.ready(Interest::WRITABLE).await?;
+        Ok(())
+    }
+
+    /// Sends data on the socket to the remote address that the socket is
+    /// connected to.
+    ///
+    /// The [`connect`] method will connect this socket to a remote address.
+    /// This method will fail if the socket is not connected.
+    ///
+    /// [`connect`]: method@Self::connect
+    ///
+    /// # Return
+    ///
+    /// On success, the number of bytes sent is returned, otherwise, the
+    /// encountered error is returned.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `send` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, then it is guaranteed that the message was not sent.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::io;
+    /// use tokio::net::UdpSocket;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Bind socket
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///     socket.connect("127.0.0.1:8081").await?;
+    ///
+    ///     // Send a message
+    ///     socket.send(b"hello world").await?;
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn send(&self, buf: &[u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .async_io(Interest::WRITABLE, || self.io.send(buf))
+            .await
+    }
+
+    /// Attempts to send data on the socket to the remote address to which it
+    /// was previously `connect`ed.
+    ///
+    /// The [`connect`] method will connect this socket to a remote address.
+    /// This method will fail if the socket is not connected.
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the send direction,
+    /// only the `Waker` from the `Context` passed to the most recent call will
+    /// be scheduled to receive a wakeup.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not available to write
+    /// * `Poll::Ready(Ok(n))` `n` is the number of bytes sent
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`connect`]: method@Self::connect
+    pub fn poll_send(&self, cx: &mut Context<'_>, buf: &[u8]) -> Poll<io::Result<usize>> {
+        self.io
+            .registration()
+            .poll_write_io(cx, || self.io.send(buf))
+    }
+
+    /// Try to send data on the socket to the remote address to which it is
+    /// connected.
+    ///
+    /// When the socket buffer is full, `Err(io::ErrorKind::WouldBlock)` is
+    /// returned. This function is usually paired with `writable()`.
+    ///
+    /// # Returns
+    ///
+    /// If successful, `Ok(n)` is returned, where `n` is the number of bytes
+    /// sent. If the socket is not ready to send data,
+    /// `Err(ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Bind a UDP socket
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///
+    ///     // Connect to a peer
+    ///     socket.connect("127.0.0.1:8081").await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         socket.writable().await?;
+    ///
+    ///         // Try to send data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_send(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_send(&self, buf: &[u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || self.io.send(buf))
+    }
+
+    /// Wait for the socket to become readable.
+    ///
+    /// This function is equivalent to `ready(Interest::READABLE)` and is usually
+    /// paired with `try_recv()`.
+    ///
+    /// The function may complete without the socket being readable. This is a
+    /// false-positive and attempting a `try_recv()` will return with
+    /// `io::ErrorKind::WouldBlock`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to read that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Connect to a peer
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///     socket.connect("127.0.0.1:8081").await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         socket.readable().await?;
+    ///
+    ///         // The buffer is **not** included in the async task and will
+    ///         // only exist on the stack.
+    ///         let mut buf = [0; 1024];
+    ///
+    ///         // Try to recv data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_recv(&mut buf) {
+    ///             Ok(n) => {
+    ///                 println!("GOT {:?}", &buf[..n]);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn readable(&self) -> io::Result<()> {
+        self.ready(Interest::READABLE).await?;
+        Ok(())
+    }
+
+    /// Receives a single datagram message on the socket from the remote address
+    /// to which it is connected. On success, returns the number of bytes read.
+    ///
+    /// The function must be called with valid byte array `buf` of sufficient
+    /// size to hold the message bytes. If a message is too long to fit in the
+    /// supplied buffer, excess bytes may be discarded.
+    ///
+    /// The [`connect`] method will connect this socket to a remote address.
+    /// This method will fail if the socket is not connected.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `recv_from` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, it is guaranteed that no messages were received on this
+    /// socket.
+    ///
+    /// [`connect`]: method@Self::connect
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Bind socket
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///     socket.connect("127.0.0.1:8081").await?;
+    ///
+    ///     let mut buf = vec![0; 10];
+    ///     let n = socket.recv(&mut buf).await?;
+    ///
+    ///     println!("received {} bytes {:?}", n, &buf[..n]);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .async_io(Interest::READABLE, || self.io.recv(buf))
+            .await
+    }
+
+    /// Attempts to receive a single datagram message on the socket from the remote
+    /// address to which it is `connect`ed.
+    ///
+    /// The [`connect`] method will connect this socket to a remote address. This method
+    /// resolves to an error if the socket is not connected.
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the recv direction, only the
+    /// `Waker` from the `Context` passed to the most recent call will be scheduled to
+    /// receive a wakeup.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not ready to read
+    /// * `Poll::Ready(Ok(()))` reads data `ReadBuf` if the socket is ready
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`connect`]: method@Self::connect
+    pub fn poll_recv(&self, cx: &mut Context<'_>, buf: &mut ReadBuf<'_>) -> Poll<io::Result<()>> {
+        let n = ready!(self.io.registration().poll_read_io(cx, || {
+            // Safety: will not read the maybe uninitialized bytes.
+            let b = unsafe {
+                &mut *(buf.unfilled_mut() as *mut [std::mem::MaybeUninit<u8>] as *mut [u8])
+            };
+
+            self.io.recv(b)
+        }))?;
+
+        // Safety: We trust `recv` to have filled up `n` bytes in the buffer.
+        unsafe {
+            buf.assume_init(n);
+        }
+        buf.advance(n);
+        Poll::Ready(Ok(()))
+    }
+
+    /// Try to receive a single datagram message on the socket from the remote
+    /// address to which it is connected. On success, returns the number of
+    /// bytes read.
+    ///
+    /// The function must be called with valid byte array buf of sufficient size
+    /// to hold the message bytes. If a message is too long to fit in the
+    /// supplied buffer, excess bytes may be discarded.
+    ///
+    /// When there is no pending data, `Err(io::ErrorKind::WouldBlock)` is
+    /// returned. This function is usually paired with `readable()`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Connect to a peer
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///     socket.connect("127.0.0.1:8081").await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         socket.readable().await?;
+    ///
+    ///         // The buffer is **not** included in the async task and will
+    ///         // only exist on the stack.
+    ///         let mut buf = [0; 1024];
+    ///
+    ///         // Try to recv data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_recv(&mut buf) {
+    ///             Ok(n) => {
+    ///                 println!("GOT {:?}", &buf[..n]);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_recv(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || self.io.recv(buf))
+    }
+
+    cfg_io_util! {
+        /// Try to receive data from the stream into the provided buffer, advancing the
+        /// buffer's internal cursor, returning how many bytes were read.
+        ///
+        /// The function must be called with valid byte array buf of sufficient size
+        /// to hold the message bytes. If a message is too long to fit in the
+        /// supplied buffer, excess bytes may be discarded.
+        ///
+        /// When there is no pending data, `Err(io::ErrorKind::WouldBlock)` is
+        /// returned. This function is usually paired with `readable()`.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::net::UdpSocket;
+        /// use std::io;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> io::Result<()> {
+        ///     // Connect to a peer
+        ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+        ///     socket.connect("127.0.0.1:8081").await?;
+        ///
+        ///     loop {
+        ///         // Wait for the socket to be readable
+        ///         socket.readable().await?;
+        ///
+        ///         let mut buf = Vec::with_capacity(1024);
+        ///
+        ///         // Try to recv data, this may still fail with `WouldBlock`
+        ///         // if the readiness event is a false positive.
+        ///         match socket.try_recv_buf(&mut buf) {
+        ///             Ok(n) => {
+        ///                 println!("GOT {:?}", &buf[..n]);
+        ///                 break;
+        ///             }
+        ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+        ///                 continue;
+        ///             }
+        ///             Err(e) => {
+        ///                 return Err(e);
+        ///             }
+        ///         }
+        ///     }
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        pub fn try_recv_buf<B: BufMut>(&self, buf: &mut B) -> io::Result<usize> {
+            self.io.registration().try_io(Interest::READABLE, || {
+                let dst = buf.chunk_mut();
+                let dst =
+                    unsafe { &mut *(dst as *mut _ as *mut [std::mem::MaybeUninit<u8>] as *mut [u8]) };
+
+                // Safety: We trust `UdpSocket::recv` to have filled up `n` bytes in the
+                // buffer.
+                let n = (&*self.io).recv(dst)?;
+
+                unsafe {
+                    buf.advance_mut(n);
+                }
+
+                Ok(n)
+            })
+        }
+
+        /// Try to receive a single datagram message on the socket. On success,
+        /// returns the number of bytes read and the origin.
+        ///
+        /// The function must be called with valid byte array buf of sufficient size
+        /// to hold the message bytes. If a message is too long to fit in the
+        /// supplied buffer, excess bytes may be discarded.
+        ///
+        /// When there is no pending data, `Err(io::ErrorKind::WouldBlock)` is
+        /// returned. This function is usually paired with `readable()`.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::net::UdpSocket;
+        /// use std::io;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> io::Result<()> {
+        ///     // Connect to a peer
+        ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+        ///
+        ///     loop {
+        ///         // Wait for the socket to be readable
+        ///         socket.readable().await?;
+        ///
+        ///         let mut buf = Vec::with_capacity(1024);
+        ///
+        ///         // Try to recv data, this may still fail with `WouldBlock`
+        ///         // if the readiness event is a false positive.
+        ///         match socket.try_recv_buf_from(&mut buf) {
+        ///             Ok((n, _addr)) => {
+        ///                 println!("GOT {:?}", &buf[..n]);
+        ///                 break;
+        ///             }
+        ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+        ///                 continue;
+        ///             }
+        ///             Err(e) => {
+        ///                 return Err(e);
+        ///             }
+        ///         }
+        ///     }
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        pub fn try_recv_buf_from<B: BufMut>(&self, buf: &mut B) -> io::Result<(usize, SocketAddr)> {
+            self.io.registration().try_io(Interest::READABLE, || {
+                let dst = buf.chunk_mut();
+                let dst =
+                    unsafe { &mut *(dst as *mut _ as *mut [std::mem::MaybeUninit<u8>] as *mut [u8]) };
+
+                // Safety: We trust `UdpSocket::recv_from` to have filled up `n` bytes in the
+                // buffer.
+                let (n, addr) = (&*self.io).recv_from(dst)?;
+
+                unsafe {
+                    buf.advance_mut(n);
+                }
+
+                Ok((n, addr))
+            })
+        }
+    }
+
+    /// Sends data on the socket to the given address. On success, returns the
+    /// number of bytes written.
+    ///
+    /// Address type can be any implementor of [`ToSocketAddrs`] trait. See its
+    /// documentation for concrete examples.
+    ///
+    /// It is possible for `addr` to yield multiple addresses, but `send_to`
+    /// will only send data to the first address yielded by `addr`.
+    ///
+    /// This will return an error when the IP version of the local socket does
+    /// not match that returned from [`ToSocketAddrs`].
+    ///
+    /// [`ToSocketAddrs`]: crate::net::ToSocketAddrs
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `send_to` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, then it is guaranteed that the message was not sent.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///     let len = socket.send_to(b"hello world", "127.0.0.1:8081").await?;
+    ///
+    ///     println!("Sent {} bytes", len);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn send_to<A: ToSocketAddrs>(&self, buf: &[u8], target: A) -> io::Result<usize> {
+        let mut addrs = to_socket_addrs(target).await?;
+
+        match addrs.next() {
+            Some(target) => self.send_to_addr(buf, target).await,
+            None => Err(io::Error::new(
+                io::ErrorKind::InvalidInput,
+                "no addresses to send data to",
+            )),
+        }
+    }
+
+    /// Attempts to send data on the socket to a given address.
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the send direction, only the
+    /// `Waker` from the `Context` passed to the most recent call will be scheduled to
+    /// receive a wakeup.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not ready to write
+    /// * `Poll::Ready(Ok(n))` `n` is the number of bytes sent.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    pub fn poll_send_to(
+        &self,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+        target: SocketAddr,
+    ) -> Poll<io::Result<usize>> {
+        self.io
+            .registration()
+            .poll_write_io(cx, || self.io.send_to(buf, target))
+    }
+
+    /// Try to send data on the socket to the given address, but if the send is
+    /// blocked this will return right away.
+    ///
+    /// This function is usually paired with `writable()`.
+    ///
+    /// # Returns
+    ///
+    /// If successful, returns the number of bytes sent
+    ///
+    /// Users should ensure that when the remote cannot receive, the
+    /// [`ErrorKind::WouldBlock`] is properly handled. An error can also occur
+    /// if the IP version of the socket does not match that of `target`.
+    ///
+    /// [`ErrorKind::WouldBlock`]: std::io::ErrorKind::WouldBlock
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///
+    ///     let dst = "127.0.0.1:8081".parse()?;
+    ///
+    ///     loop {
+    ///         socket.writable().await?;
+    ///
+    ///         match socket.try_send_to(&b"hello world"[..], dst) {
+    ///             Ok(sent) => {
+    ///                 println!("sent {} bytes", sent);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 // Writable false positive.
+    ///                 continue;
+    ///             }
+    ///             Err(e) => return Err(e.into()),
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_send_to(&self, buf: &[u8], target: SocketAddr) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || self.io.send_to(buf, target))
+    }
+
+    async fn send_to_addr(&self, buf: &[u8], target: SocketAddr) -> io::Result<usize> {
+        self.io
+            .registration()
+            .async_io(Interest::WRITABLE, || self.io.send_to(buf, target))
+            .await
+    }
+
+    /// Receives a single datagram message on the socket. On success, returns
+    /// the number of bytes read and the origin.
+    ///
+    /// The function must be called with valid byte array `buf` of sufficient
+    /// size to hold the message bytes. If a message is too long to fit in the
+    /// supplied buffer, excess bytes may be discarded.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `recv_from` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, it is guaranteed that no messages were received on this
+    /// socket.
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///
+    ///     let mut buf = vec![0u8; 32];
+    ///     let (len, addr) = socket.recv_from(&mut buf).await?;
+    ///
+    ///     println!("received {:?} bytes from {:?}", len, addr);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
+        self.io
+            .registration()
+            .async_io(Interest::READABLE, || self.io.recv_from(buf))
+            .await
+    }
+
+    /// Attempts to receive a single datagram on the socket.
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the recv direction, only the
+    /// `Waker` from the `Context` passed to the most recent call will be scheduled to
+    /// receive a wakeup.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not ready to read
+    /// * `Poll::Ready(Ok(addr))` reads data from `addr` into `ReadBuf` if the socket is ready
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    pub fn poll_recv_from(
+        &self,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<SocketAddr>> {
+        let (n, addr) = ready!(self.io.registration().poll_read_io(cx, || {
+            // Safety: will not read the maybe uninitialized bytes.
+            let b = unsafe {
+                &mut *(buf.unfilled_mut() as *mut [std::mem::MaybeUninit<u8>] as *mut [u8])
+            };
+
+            self.io.recv_from(b)
+        }))?;
+
+        // Safety: We trust `recv` to have filled up `n` bytes in the buffer.
+        unsafe {
+            buf.assume_init(n);
+        }
+        buf.advance(n);
+        Poll::Ready(Ok(addr))
+    }
+
+    /// Try to receive a single datagram message on the socket. On success,
+    /// returns the number of bytes read and the origin.
+    ///
+    /// The function must be called with valid byte array buf of sufficient size
+    /// to hold the message bytes. If a message is too long to fit in the
+    /// supplied buffer, excess bytes may be discarded.
+    ///
+    /// When there is no pending data, `Err(io::ErrorKind::WouldBlock)` is
+    /// returned. This function is usually paired with `readable()`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Connect to a peer
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         socket.readable().await?;
+    ///
+    ///         // The buffer is **not** included in the async task and will
+    ///         // only exist on the stack.
+    ///         let mut buf = [0; 1024];
+    ///
+    ///         // Try to recv data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_recv_from(&mut buf) {
+    ///             Ok((n, _addr)) => {
+    ///                 println!("GOT {:?}", &buf[..n]);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || self.io.recv_from(buf))
+    }
+
+    /// Try to read or write from the socket using a user-provided IO operation.
+    ///
+    /// If the socket is ready, the provided closure is called. The closure
+    /// should attempt to perform IO operation from the socket by manually
+    /// calling the appropriate syscall. If the operation fails because the
+    /// socket is not actually ready, then the closure should return a
+    /// `WouldBlock` error and the readiness flag is cleared. The return value
+    /// of the closure is then returned by `try_io`.
+    ///
+    /// If the socket is not ready, then the closure is not called
+    /// and a `WouldBlock` error is returned.
+    ///
+    /// The closure should only return a `WouldBlock` error if it has performed
+    /// an IO operation on the socket that failed due to the socket not being
+    /// ready. Returning a `WouldBlock` error in any other situation will
+    /// incorrectly clear the readiness flag, which can cause the socket to
+    /// behave incorrectly.
+    ///
+    /// The closure should not perform the IO operation using any of the methods
+    /// defined on the Tokio `UdpSocket` type, as this will mess with the
+    /// readiness flag and can cause the socket to behave incorrectly.
+    ///
+    /// Usually, [`readable()`], [`writable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: UdpSocket::readable()
+    /// [`writable()`]: UdpSocket::writable()
+    /// [`ready()`]: UdpSocket::ready()
+    pub fn try_io<R>(
+        &self,
+        interest: Interest,
+        f: impl FnOnce() -> io::Result<R>,
+    ) -> io::Result<R> {
+        self.io.registration().try_io(interest, f)
+    }
+
+    /// Receives data from the socket, without removing it from the input queue.
+    /// On success, returns the number of bytes read and the address from whence
+    /// the data came.
+    ///
+    /// # Notes
+    ///
+    /// On Windows, if the data is larger than the buffer specified, the buffer
+    /// is filled with the first part of the data, and peek_from returns the error
+    /// WSAEMSGSIZE(10040). The excess data is lost.
+    /// Make sure to always use a sufficiently large buffer to hold the
+    /// maximum UDP packet size, which can be up to 65536 bytes in size.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let socket = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///
+    ///     let mut buf = vec![0u8; 32];
+    ///     let (len, addr) = socket.peek_from(&mut buf).await?;
+    ///
+    ///     println!("peeked {:?} bytes from {:?}", len, addr);
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn peek_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
+        self.io
+            .registration()
+            .async_io(Interest::READABLE, || self.io.peek_from(buf))
+            .await
+    }
+
+    /// Receives data from the socket, without removing it from the input queue.
+    /// On success, returns the number of bytes read.
+    ///
+    /// # Notes
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the recv direction, only the
+    /// `Waker` from the `Context` passed to the most recent call will be scheduled to
+    /// receive a wakeup
+    ///
+    /// On Windows, if the data is larger than the buffer specified, the buffer
+    /// is filled with the first part of the data, and peek returns the error
+    /// WSAEMSGSIZE(10040). The excess data is lost.
+    /// Make sure to always use a sufficiently large buffer to hold the
+    /// maximum UDP packet size, which can be up to 65536 bytes in size.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not ready to read
+    /// * `Poll::Ready(Ok(addr))` reads data from `addr` into `ReadBuf` if the socket is ready
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    pub fn poll_peek_from(
+        &self,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<SocketAddr>> {
+        let (n, addr) = ready!(self.io.registration().poll_read_io(cx, || {
+            // Safety: will not read the maybe uninitialized bytes.
+            let b = unsafe {
+                &mut *(buf.unfilled_mut() as *mut [std::mem::MaybeUninit<u8>] as *mut [u8])
+            };
+
+            self.io.peek_from(b)
+        }))?;
+
+        // Safety: We trust `recv` to have filled up `n` bytes in the buffer.
+        unsafe {
+            buf.assume_init(n);
+        }
+        buf.advance(n);
+        Poll::Ready(Ok(addr))
+    }
+
+    /// Gets the value of the `SO_BROADCAST` option for this socket.
+    ///
+    /// For more information about this option, see [`set_broadcast`].
+    ///
+    /// [`set_broadcast`]: method@Self::set_broadcast
+    pub fn broadcast(&self) -> io::Result<bool> {
+        self.io.broadcast()
+    }
+
+    /// Sets the value of the `SO_BROADCAST` option for this socket.
+    ///
+    /// When enabled, this socket is allowed to send packets to a broadcast
+    /// address.
+    pub fn set_broadcast(&self, on: bool) -> io::Result<()> {
+        self.io.set_broadcast(on)
+    }
+
+    /// Gets the value of the `IP_MULTICAST_LOOP` option for this socket.
+    ///
+    /// For more information about this option, see [`set_multicast_loop_v4`].
+    ///
+    /// [`set_multicast_loop_v4`]: method@Self::set_multicast_loop_v4
+    pub fn multicast_loop_v4(&self) -> io::Result<bool> {
+        self.io.multicast_loop_v4()
+    }
+
+    /// Sets the value of the `IP_MULTICAST_LOOP` option for this socket.
+    ///
+    /// If enabled, multicast packets will be looped back to the local socket.
+    ///
+    /// # Note
+    ///
+    /// This may not have any affect on IPv6 sockets.
+    pub fn set_multicast_loop_v4(&self, on: bool) -> io::Result<()> {
+        self.io.set_multicast_loop_v4(on)
+    }
+
+    /// Gets the value of the `IP_MULTICAST_TTL` option for this socket.
+    ///
+    /// For more information about this option, see [`set_multicast_ttl_v4`].
+    ///
+    /// [`set_multicast_ttl_v4`]: method@Self::set_multicast_ttl_v4
+    pub fn multicast_ttl_v4(&self) -> io::Result<u32> {
+        self.io.multicast_ttl_v4()
+    }
+
+    /// Sets the value of the `IP_MULTICAST_TTL` option for this socket.
+    ///
+    /// Indicates the time-to-live value of outgoing multicast packets for
+    /// this socket. The default value is 1 which means that multicast packets
+    /// don't leave the local network unless explicitly requested.
+    ///
+    /// # Note
+    ///
+    /// This may not have any affect on IPv6 sockets.
+    pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
+        self.io.set_multicast_ttl_v4(ttl)
+    }
+
+    /// Gets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
+    ///
+    /// For more information about this option, see [`set_multicast_loop_v6`].
+    ///
+    /// [`set_multicast_loop_v6`]: method@Self::set_multicast_loop_v6
+    pub fn multicast_loop_v6(&self) -> io::Result<bool> {
+        self.io.multicast_loop_v6()
+    }
+
+    /// Sets the value of the `IPV6_MULTICAST_LOOP` option for this socket.
+    ///
+    /// Controls whether this socket sees the multicast packets it sends itself.
+    ///
+    /// # Note
+    ///
+    /// This may not have any affect on IPv4 sockets.
+    pub fn set_multicast_loop_v6(&self, on: bool) -> io::Result<()> {
+        self.io.set_multicast_loop_v6(on)
+    }
+
+    /// Gets the value of the `IP_TTL` option for this socket.
+    ///
+    /// For more information about this option, see [`set_ttl`].
+    ///
+    /// [`set_ttl`]: method@Self::set_ttl
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// # use std::io;
+    ///
+    /// # async fn dox() -> io::Result<()> {
+    /// let sock = UdpSocket::bind("127.0.0.1:8080").await?;
+    ///
+    /// println!("{:?}", sock.ttl()?);
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn ttl(&self) -> io::Result<u32> {
+        self.io.ttl()
+    }
+
+    /// Sets the value for the `IP_TTL` option on this socket.
+    ///
+    /// This value sets the time-to-live field that is used in every packet sent
+    /// from this socket.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UdpSocket;
+    /// # use std::io;
+    ///
+    /// # async fn dox() -> io::Result<()> {
+    /// let sock = UdpSocket::bind("127.0.0.1:8080").await?;
+    /// sock.set_ttl(60)?;
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {
+        self.io.set_ttl(ttl)
+    }
+
+    /// Executes an operation of the `IP_ADD_MEMBERSHIP` type.
+    ///
+    /// This function specifies a new multicast group for this socket to join.
+    /// The address must be a valid multicast address, and `interface` is the
+    /// address of the local interface with which the system should join the
+    /// multicast group. If it's equal to `INADDR_ANY` then an appropriate
+    /// interface is chosen by the system.
+    pub fn join_multicast_v4(&self, multiaddr: Ipv4Addr, interface: Ipv4Addr) -> io::Result<()> {
+        self.io.join_multicast_v4(&multiaddr, &interface)
+    }
+
+    /// Executes an operation of the `IPV6_ADD_MEMBERSHIP` type.
+    ///
+    /// This function specifies a new multicast group for this socket to join.
+    /// The address must be a valid multicast address, and `interface` is the
+    /// index of the interface to join/leave (or 0 to indicate any interface).
+    pub fn join_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
+        self.io.join_multicast_v6(multiaddr, interface)
+    }
+
+    /// Executes an operation of the `IP_DROP_MEMBERSHIP` type.
+    ///
+    /// For more information about this option, see [`join_multicast_v4`].
+    ///
+    /// [`join_multicast_v4`]: method@Self::join_multicast_v4
+    pub fn leave_multicast_v4(&self, multiaddr: Ipv4Addr, interface: Ipv4Addr) -> io::Result<()> {
+        self.io.leave_multicast_v4(&multiaddr, &interface)
+    }
+
+    /// Executes an operation of the `IPV6_DROP_MEMBERSHIP` type.
+    ///
+    /// For more information about this option, see [`join_multicast_v6`].
+    ///
+    /// [`join_multicast_v6`]: method@Self::join_multicast_v6
+    pub fn leave_multicast_v6(&self, multiaddr: &Ipv6Addr, interface: u32) -> io::Result<()> {
+        self.io.leave_multicast_v6(multiaddr, interface)
+    }
+
+    /// Returns the value of the `SO_ERROR` option.
+    ///
+    /// # Examples
+    /// ```
+    /// use tokio::net::UdpSocket;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Create a socket
+    ///     let socket = UdpSocket::bind("0.0.0.0:8080").await?;
+    ///
+    ///     if let Ok(Some(err)) = socket.take_error() {
+    ///         println!("Got error: {:?}", err);
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        self.io.take_error()
+    }
+}
+
+impl TryFrom<std::net::UdpSocket> for UdpSocket {
+    type Error = io::Error;
+
+    /// Consumes stream, returning the tokio I/O object.
+    ///
+    /// This is equivalent to
+    /// [`UdpSocket::from_std(stream)`](UdpSocket::from_std).
+    fn try_from(stream: std::net::UdpSocket) -> Result<Self, Self::Error> {
+        Self::from_std(stream)
+    }
+}
+
+impl fmt::Debug for UdpSocket {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.io.fmt(f)
+    }
+}
+
+#[cfg(all(unix))]
+mod sys {
+    use super::UdpSocket;
+    use std::os::unix::prelude::*;
+
+    impl AsRawFd for UdpSocket {
+        fn as_raw_fd(&self) -> RawFd {
+            self.io.as_raw_fd()
+        }
+    }
+}
+
+#[cfg(windows)]
+mod sys {
+    use super::UdpSocket;
+    use std::os::windows::prelude::*;
+
+    impl AsRawSocket for UdpSocket {
+        fn as_raw_socket(&self) -> RawSocket {
+            self.io.as_raw_socket()
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,3 @@
 //! Unix datagram types.
 
 pub(crate) mod socket;
-pub(crate) mod split;
-pub(crate) mod split_owned;
-
-pub use split::{RecvHalf, SendHalf};
-pub use split_owned::{OwnedRecvHalf, OwnedSendHalf, ReuniteError};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/socket.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/socket.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/socket.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/socket.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,74 +1,470 @@
-use crate::future::poll_fn;
-use crate::io::PollEvented;
-use crate::net::unix::datagram::split::{split, RecvHalf, SendHalf};
-use crate::net::unix::datagram::split_owned::{split_owned, OwnedRecvHalf, OwnedSendHalf};
+use crate::io::{Interest, PollEvented, ReadBuf, Ready};
+use crate::net::unix::SocketAddr;
 
 use std::convert::TryFrom;
 use std::fmt;
 use std::io;
 use std::net::Shutdown;
-use std::os::unix::io::{AsRawFd, RawFd};
-use std::os::unix::net::{self, SocketAddr};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::net;
 use std::path::Path;
 use std::task::{Context, Poll};
 
-cfg_uds! {
+cfg_io_util! {
+    use bytes::BufMut;
+}
+
+cfg_net_unix! {
     /// An I/O object representing a Unix datagram socket.
+    ///
+    /// A socket can be either named (associated with a filesystem path) or
+    /// unnamed.
+    ///
+    /// This type does not provide a `split` method, because this functionality
+    /// can be achieved by wrapping the socket in an [`Arc`]. Note that you do
+    /// not need a `Mutex` to share the `UnixDatagram` — an `Arc<UnixDatagram>`
+    /// is enough. This is because all of the methods take `&self` instead of
+    /// `&mut self`.
+    ///
+    /// **Note:** named sockets are persisted even after the object is dropped
+    /// and the program has exited, and cannot be reconnected. It is advised
+    /// that you either check for and unlink the existing socket if it exists,
+    /// or use a temporary file that is guaranteed to not already exist.
+    ///
+    /// [`Arc`]: std::sync::Arc
+    ///
+    /// # Examples
+    /// Using named sockets, associated with a filesystem path:
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use tempfile::tempdir;
+    ///
+    /// // We use a temporary directory so that the socket
+    /// // files left by the bound sockets will get cleaned up.
+    /// let tmp = tempdir()?;
+    ///
+    /// // Bind each socket to a filesystem path
+    /// let tx_path = tmp.path().join("tx");
+    /// let tx = UnixDatagram::bind(&tx_path)?;
+    /// let rx_path = tmp.path().join("rx");
+    /// let rx = UnixDatagram::bind(&rx_path)?;
+    ///
+    /// let bytes = b"hello world";
+    /// tx.send_to(bytes, &rx_path).await?;
+    ///
+    /// let mut buf = vec![0u8; 24];
+    /// let (size, addr) = rx.recv_from(&mut buf).await?;
+    ///
+    /// let dgram = &buf[..size];
+    /// assert_eq!(dgram, bytes);
+    /// assert_eq!(addr.as_pathname().unwrap(), &tx_path);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
+    ///
+    /// Using unnamed sockets, created as a pair
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    ///
+    /// // Create the pair of sockets
+    /// let (sock1, sock2) = UnixDatagram::pair()?;
+    ///
+    /// // Since the sockets are paired, the paired send/recv
+    /// // functions can be used
+    /// let bytes = b"hello world";
+    /// sock1.send(bytes).await?;
+    ///
+    /// let mut buff = vec![0u8; 24];
+    /// let size = sock2.recv(&mut buff).await?;
+    ///
+    /// let dgram = &buff[..size];
+    /// assert_eq!(dgram, bytes);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub struct UnixDatagram {
-        io: PollEvented<mio_uds::UnixDatagram>,
+        io: PollEvented<mio::net::UnixDatagram>,
     }
 }
 
 impl UnixDatagram {
+    /// Wait for any of the requested ready states.
+    ///
+    /// This function is usually paired with `try_recv()` or `try_send()`. It
+    /// can be used to concurrently recv / send to the same socket on a single
+    /// task without splitting the socket.
+    ///
+    /// The function may complete without the socket being ready. This is a
+    /// false-positive and attempting an operation will return with
+    /// `io::ErrorKind::WouldBlock`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to read or write that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// Concurrently receive from and send to the socket on the same task
+    /// without splitting.
+    ///
+    /// ```no_run
+    /// use tokio::io::Interest;
+    /// use tokio::net::UnixDatagram;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let client_path = dir.path().join("client.sock");
+    ///     let server_path = dir.path().join("server.sock");
+    ///     let socket = UnixDatagram::bind(&client_path)?;
+    ///     socket.connect(&server_path)?;
+    ///
+    ///     loop {
+    ///         let ready = socket.ready(Interest::READABLE | Interest::WRITABLE).await?;
+    ///
+    ///         if ready.is_readable() {
+    ///             let mut data = [0; 1024];
+    ///             match socket.try_recv(&mut data[..]) {
+    ///                 Ok(n) => {
+    ///                     println!("received {:?}", &data[..n]);
+    ///                 }
+    ///                 // False-positive, continue
+    ///                 Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {}
+    ///                 Err(e) => {
+    ///                     return Err(e);
+    ///                 }
+    ///             }
+    ///         }
+    ///
+    ///         if ready.is_writable() {
+    ///             // Write some data
+    ///             match socket.try_send(b"hello world") {
+    ///                 Ok(n) => {
+    ///                     println!("sent {} bytes", n);
+    ///                 }
+    ///                 // False-positive, continue
+    ///                 Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {}
+    ///                 Err(e) => {
+    ///                     return Err(e);
+    ///                 }
+    ///             }
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    pub async fn ready(&self, interest: Interest) -> io::Result<Ready> {
+        let event = self.io.registration().readiness(interest).await?;
+        Ok(event.ready)
+    }
+
+    /// Wait for the socket to become writable.
+    ///
+    /// This function is equivalent to `ready(Interest::WRITABLE)` and is
+    /// usually paired with `try_send()` or `try_send_to()`.
+    ///
+    /// The function may complete without the socket being writable. This is a
+    /// false-positive and attempting a `try_send()` will return with
+    /// `io::ErrorKind::WouldBlock`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to write that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixDatagram;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let client_path = dir.path().join("client.sock");
+    ///     let server_path = dir.path().join("server.sock");
+    ///     let socket = UnixDatagram::bind(&client_path)?;
+    ///     socket.connect(&server_path)?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         socket.writable().await?;
+    ///
+    ///         // Try to send data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_send(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn writable(&self) -> io::Result<()> {
+        self.ready(Interest::WRITABLE).await?;
+        Ok(())
+    }
+
+    /// Wait for the socket to become readable.
+    ///
+    /// This function is equivalent to `ready(Interest::READABLE)` and is usually
+    /// paired with `try_recv()`.
+    ///
+    /// The function may complete without the socket being readable. This is a
+    /// false-positive and attempting a `try_recv()` will return with
+    /// `io::ErrorKind::WouldBlock`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to read that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixDatagram;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let client_path = dir.path().join("client.sock");
+    ///     let server_path = dir.path().join("server.sock");
+    ///     let socket = UnixDatagram::bind(&client_path)?;
+    ///     socket.connect(&server_path)?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         socket.readable().await?;
+    ///
+    ///         // The buffer is **not** included in the async task and will
+    ///         // only exist on the stack.
+    ///         let mut buf = [0; 1024];
+    ///
+    ///         // Try to recv data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_recv(&mut buf) {
+    ///             Ok(n) => {
+    ///                 println!("GOT {:?}", &buf[..n]);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn readable(&self) -> io::Result<()> {
+        self.ready(Interest::READABLE).await?;
+        Ok(())
+    }
+
     /// Creates a new `UnixDatagram` bound to the specified path.
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use tempfile::tempdir;
+    ///
+    /// // We use a temporary directory so that the socket
+    /// // files left by the bound sockets will get cleaned up.
+    /// let tmp = tempdir()?;
+    ///
+    /// // Bind the socket to a filesystem path
+    /// let socket_path = tmp.path().join("socket");
+    /// let socket = UnixDatagram::bind(&socket_path)?;
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub fn bind<P>(path: P) -> io::Result<UnixDatagram>
     where
         P: AsRef<Path>,
     {
-        let socket = mio_uds::UnixDatagram::bind(path)?;
+        let socket = mio::net::UnixDatagram::bind(path)?;
         UnixDatagram::new(socket)
     }
 
     /// Creates an unnamed pair of connected sockets.
     ///
     /// This function will create a pair of interconnected Unix sockets for
-    /// communicating back and forth between one another. Each socket will
-    /// be associated with the default event loop's handle.
+    /// communicating back and forth between one another.
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    ///
+    /// // Create the pair of sockets
+    /// let (sock1, sock2) = UnixDatagram::pair()?;
+    ///
+    /// // Since the sockets are paired, the paired send/recv
+    /// // functions can be used
+    /// let bytes = b"hail eris";
+    /// sock1.send(bytes).await?;
+    ///
+    /// let mut buff = vec![0u8; 24];
+    /// let size = sock2.recv(&mut buff).await?;
+    ///
+    /// let dgram = &buff[..size];
+    /// assert_eq!(dgram, bytes);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub fn pair() -> io::Result<(UnixDatagram, UnixDatagram)> {
-        let (a, b) = mio_uds::UnixDatagram::pair()?;
+        let (a, b) = mio::net::UnixDatagram::pair()?;
         let a = UnixDatagram::new(a)?;
         let b = UnixDatagram::new(b)?;
 
         Ok((a, b))
     }
 
-    /// Consumes a `UnixDatagram` in the standard library and returns a
-    /// nonblocking `UnixDatagram` from this crate.
+    /// Creates new `UnixDatagram` from a `std::os::unix::net::UnixDatagram`.
     ///
-    /// The returned datagram will be associated with the given event loop
-    /// specified by `handle` and is ready to perform I/O.
+    /// This function is intended to be used to wrap a UnixDatagram from the
+    /// standard library in the Tokio equivalent. The conversion assumes
+    /// nothing about the underlying datagram; it is left up to the user to set
+    /// it in non-blocking mode.
     ///
     /// # Panics
     ///
     /// This function panics if thread-local runtime is not set.
     ///
     /// The runtime is usually set implicitly when this function is called
-    /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
+    /// from a future driven by a Tokio runtime, otherwise runtime can be set
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use std::os::unix::net::UnixDatagram as StdUDS;
+    /// use tempfile::tempdir;
+    ///
+    /// // We use a temporary directory so that the socket
+    /// // files left by the bound sockets will get cleaned up.
+    /// let tmp = tempdir()?;
+    ///
+    /// // Bind the socket to a filesystem path
+    /// let socket_path = tmp.path().join("socket");
+    /// let std_socket = StdUDS::bind(&socket_path)?;
+    /// std_socket.set_nonblocking(true)?;
+    /// let tokio_socket = UnixDatagram::from_std(std_socket)?;
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub fn from_std(datagram: net::UnixDatagram) -> io::Result<UnixDatagram> {
-        let socket = mio_uds::UnixDatagram::from_datagram(datagram)?;
+        let socket = mio::net::UnixDatagram::from_std(datagram);
         let io = PollEvented::new(socket)?;
         Ok(UnixDatagram { io })
     }
 
-    fn new(socket: mio_uds::UnixDatagram) -> io::Result<UnixDatagram> {
+    /// Turn a [`tokio::net::UnixDatagram`] into a [`std::os::unix::net::UnixDatagram`].
+    ///
+    /// The returned [`std::os::unix::net::UnixDatagram`] will have nonblocking
+    /// mode set as `true`.  Use [`set_nonblocking`] to change the blocking mode
+    /// if needed.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,no_run
+    /// use std::error::Error;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let tokio_socket = tokio::net::UnixDatagram::bind("127.0.0.1:0")?;
+    ///     let std_socket = tokio_socket.into_std()?;
+    ///     std_socket.set_nonblocking(false)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// [`tokio::net::UnixDatagram`]: UnixDatagram
+    /// [`std::os::unix::net::UnixDatagram`]: std::os::unix::net::UnixDatagram
+    /// [`set_nonblocking`]: fn@std::os::unix::net::UnixDatagram::set_nonblocking
+    pub fn into_std(self) -> io::Result<std::os::unix::net::UnixDatagram> {
+        self.io
+            .into_inner()
+            .map(|io| io.into_raw_fd())
+            .map(|raw_fd| unsafe { std::os::unix::net::UnixDatagram::from_raw_fd(raw_fd) })
+    }
+
+    fn new(socket: mio::net::UnixDatagram) -> io::Result<UnixDatagram> {
         let io = PollEvented::new(socket)?;
         Ok(UnixDatagram { io })
     }
 
     /// Creates a new `UnixDatagram` which is not bound to any address.
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use tempfile::tempdir;
+    ///
+    /// // Create an unbound socket
+    /// let tx = UnixDatagram::unbound()?;
+    ///
+    /// // Create another, bound socket
+    /// let tmp = tempdir()?;
+    /// let rx_path = tmp.path().join("rx");
+    /// let rx = UnixDatagram::bind(&rx_path)?;
+    ///
+    /// // Send to the bound socket
+    /// let bytes = b"hello world";
+    /// tx.send_to(bytes, &rx_path).await?;
+    ///
+    /// let mut buf = vec![0u8; 24];
+    /// let (size, addr) = rx.recv_from(&mut buf).await?;
+    ///
+    /// let dgram = &buf[..size];
+    /// assert_eq!(dgram, bytes);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub fn unbound() -> io::Result<UnixDatagram> {
-        let socket = mio_uds::UnixDatagram::unbound()?;
+        let socket = mio::net::UnixDatagram::unbound()?;
         UnixDatagram::new(socket)
     }
 
@@ -76,200 +472,826 @@
     ///
     /// The `send` method may be used to send data to the specified address.
     /// `recv` and `recv_from` will only receive data from that address.
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use tempfile::tempdir;
+    ///
+    /// // Create an unbound socket
+    /// let tx = UnixDatagram::unbound()?;
+    ///
+    /// // Create another, bound socket
+    /// let tmp = tempdir()?;
+    /// let rx_path = tmp.path().join("rx");
+    /// let rx = UnixDatagram::bind(&rx_path)?;
+    ///
+    /// // Connect to the bound socket
+    /// tx.connect(&rx_path)?;
+    ///
+    /// // Send to the bound socket
+    /// let bytes = b"hello world";
+    /// tx.send(bytes).await?;
+    ///
+    /// let mut buf = vec![0u8; 24];
+    /// let (size, addr) = rx.recv_from(&mut buf).await?;
+    ///
+    /// let dgram = &buf[..size];
+    /// assert_eq!(dgram, bytes);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub fn connect<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
-        self.io.get_ref().connect(path)
+        self.io.connect(path)
     }
 
     /// Sends data on the socket to the socket's peer.
-    pub async fn send(&mut self, buf: &[u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.poll_send_priv(cx, buf)).await
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `send` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, then it is guaranteed that the message was not sent.
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    ///
+    /// // Create the pair of sockets
+    /// let (sock1, sock2) = UnixDatagram::pair()?;
+    ///
+    /// // Since the sockets are paired, the paired send/recv
+    /// // functions can be used
+    /// let bytes = b"hello world";
+    /// sock1.send(bytes).await?;
+    ///
+    /// let mut buff = vec![0u8; 24];
+    /// let size = sock2.recv(&mut buff).await?;
+    ///
+    /// let dgram = &buff[..size];
+    /// assert_eq!(dgram, bytes);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn send(&self, buf: &[u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .async_io(Interest::WRITABLE, || self.io.send(buf))
+            .await
     }
 
     /// Try to send a datagram to the peer without waiting.
     ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixDatagram;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let client_path = dir.path().join("client.sock");
+    ///     let server_path = dir.path().join("server.sock");
+    ///     let socket = UnixDatagram::bind(&client_path)?;
+    ///     socket.connect(&server_path)?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         socket.writable().await?;
+    ///
+    ///         // Try to send data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_send(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_send(&self, buf: &[u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || self.io.send(buf))
+    }
+
+    /// Try to send a datagram to the peer without waiting.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixDatagram;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let client_path = dir.path().join("client.sock");
+    ///     let server_path = dir.path().join("server.sock");
+    ///     let socket = UnixDatagram::bind(&client_path)?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         socket.writable().await?;
+    ///
+    ///         // Try to send data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_send_to(b"hello world", &server_path) {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_send_to<P>(&self, buf: &[u8], target: P) -> io::Result<usize>
+    where
+        P: AsRef<Path>,
+    {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || self.io.send_to(buf, target))
+    }
+
+    /// Receives data from the socket.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `recv` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, it is guaranteed that no messages were received on this
+    /// socket.
+    ///
+    /// # Examples
     /// ```
+    /// # use std::error::Error;
     /// # #[tokio::main]
-    /// # async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
     /// use tokio::net::UnixDatagram;
     ///
-    /// let bytes = b"bytes";
-    /// // We use a socket pair so that they are assigned
-    /// // each other as a peer.
-    /// let (mut first, mut second) = UnixDatagram::pair()?;
+    /// // Create the pair of sockets
+    /// let (sock1, sock2) = UnixDatagram::pair()?;
     ///
-    /// let size = first.try_send(bytes)?;
-    /// assert_eq!(size, bytes.len());
+    /// // Since the sockets are paired, the paired send/recv
+    /// // functions can be used
+    /// let bytes = b"hello world";
+    /// sock1.send(bytes).await?;
     ///
-    /// let mut buffer = vec![0u8; 24];
-    /// let size = second.try_recv(&mut buffer)?;
+    /// let mut buff = vec![0u8; 24];
+    /// let size = sock2.recv(&mut buff).await?;
     ///
-    /// let dgram = &buffer.as_slice()[..size];
+    /// let dgram = &buff[..size];
     /// assert_eq!(dgram, bytes);
+    ///
     /// # Ok(())
     /// # }
     /// ```
-    pub fn try_send(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.io.get_ref().send(buf)
+    pub async fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .async_io(Interest::READABLE, || self.io.recv(buf))
+            .await
     }
 
-    /// Try to send a datagram to the peer without waiting.
+    /// Try to receive a datagram from the peer without waiting.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixDatagram;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let client_path = dir.path().join("client.sock");
+    ///     let server_path = dir.path().join("server.sock");
+    ///     let socket = UnixDatagram::bind(&client_path)?;
+    ///     socket.connect(&server_path)?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         socket.readable().await?;
+    ///
+    ///         // The buffer is **not** included in the async task and will
+    ///         // only exist on the stack.
+    ///         let mut buf = [0; 1024];
+    ///
+    ///         // Try to recv data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_recv(&mut buf) {
+    ///             Ok(n) => {
+    ///                 println!("GOT {:?}", &buf[..n]);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_recv(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || self.io.recv(buf))
+    }
+
+    cfg_io_util! {
+        /// Try to receive data from the socket without waiting.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::net::UnixDatagram;
+        /// use std::io;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> io::Result<()> {
+        ///     // Connect to a peer
+        ///     let dir = tempfile::tempdir().unwrap();
+        ///     let client_path = dir.path().join("client.sock");
+        ///     let server_path = dir.path().join("server.sock");
+        ///     let socket = UnixDatagram::bind(&client_path)?;
+        ///
+        ///     loop {
+        ///         // Wait for the socket to be readable
+        ///         socket.readable().await?;
+        ///
+        ///         let mut buf = Vec::with_capacity(1024);
+        ///
+        ///         // Try to recv data, this may still fail with `WouldBlock`
+        ///         // if the readiness event is a false positive.
+        ///         match socket.try_recv_buf_from(&mut buf) {
+        ///             Ok((n, _addr)) => {
+        ///                 println!("GOT {:?}", &buf[..n]);
+        ///                 break;
+        ///             }
+        ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+        ///                 continue;
+        ///             }
+        ///             Err(e) => {
+        ///                 return Err(e);
+        ///             }
+        ///         }
+        ///     }
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        pub fn try_recv_buf_from<B: BufMut>(&self, buf: &mut B) -> io::Result<(usize, SocketAddr)> {
+            let (n, addr) = self.io.registration().try_io(Interest::READABLE, || {
+                let dst = buf.chunk_mut();
+                let dst =
+                    unsafe { &mut *(dst as *mut _ as *mut [std::mem::MaybeUninit<u8>] as *mut [u8]) };
+
+                // Safety: We trust `UnixDatagram::recv_from` to have filled up `n` bytes in the
+                // buffer.
+                let (n, addr) = (&*self.io).recv_from(dst)?;
+
+                unsafe {
+                    buf.advance_mut(n);
+                }
+
+                Ok((n, addr))
+            })?;
+
+            Ok((n, SocketAddr(addr)))
+        }
+
+        /// Try to read data from the stream into the provided buffer, advancing the
+        /// buffer's internal cursor, returning how many bytes were read.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::net::UnixDatagram;
+        /// use std::io;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> io::Result<()> {
+        ///     // Connect to a peer
+        ///     let dir = tempfile::tempdir().unwrap();
+        ///     let client_path = dir.path().join("client.sock");
+        ///     let server_path = dir.path().join("server.sock");
+        ///     let socket = UnixDatagram::bind(&client_path)?;
+        ///     socket.connect(&server_path)?;
+        ///
+        ///     loop {
+        ///         // Wait for the socket to be readable
+        ///         socket.readable().await?;
+        ///
+        ///         let mut buf = Vec::with_capacity(1024);
+        ///
+        ///         // Try to recv data, this may still fail with `WouldBlock`
+        ///         // if the readiness event is a false positive.
+        ///         match socket.try_recv_buf(&mut buf) {
+        ///             Ok(n) => {
+        ///                 println!("GOT {:?}", &buf[..n]);
+        ///                 break;
+        ///             }
+        ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+        ///                 continue;
+        ///             }
+        ///             Err(e) => {
+        ///                 return Err(e);
+        ///             }
+        ///         }
+        ///     }
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        pub fn try_recv_buf<B: BufMut>(&self, buf: &mut B) -> io::Result<usize> {
+            self.io.registration().try_io(Interest::READABLE, || {
+                let dst = buf.chunk_mut();
+                let dst =
+                    unsafe { &mut *(dst as *mut _ as *mut [std::mem::MaybeUninit<u8>] as *mut [u8]) };
+
+                // Safety: We trust `UnixDatagram::recv` to have filled up `n` bytes in the
+                // buffer.
+                let n = (&*self.io).recv(dst)?;
+
+                unsafe {
+                    buf.advance_mut(n);
+                }
+
+                Ok(n)
+            })
+        }
+    }
+
+    /// Sends data on the socket to the specified address.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `send_to` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, then it is guaranteed that the message was not sent.
     ///
+    /// # Examples
     /// ```
+    /// # use std::error::Error;
     /// # #[tokio::main]
-    /// # async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// use {
-    ///     tokio::net::UnixDatagram,
-    ///     tempfile::tempdir,
-    /// };
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use tempfile::tempdir;
     ///
-    /// let bytes = b"bytes";
     /// // We use a temporary directory so that the socket
     /// // files left by the bound sockets will get cleaned up.
-    /// let tmp = tempdir().unwrap();
-    ///
-    /// let server_path = tmp.path().join("server");
-    /// let mut server = UnixDatagram::bind(&server_path)?;
+    /// let tmp = tempdir()?;
     ///
-    /// let client_path = tmp.path().join("client");
-    /// let mut client = UnixDatagram::bind(&client_path)?;
+    /// // Bind each socket to a filesystem path
+    /// let tx_path = tmp.path().join("tx");
+    /// let tx = UnixDatagram::bind(&tx_path)?;
+    /// let rx_path = tmp.path().join("rx");
+    /// let rx = UnixDatagram::bind(&rx_path)?;
     ///
-    /// let size = client.try_send_to(bytes, &server_path)?;
-    /// assert_eq!(size, bytes.len());
+    /// let bytes = b"hello world";
+    /// tx.send_to(bytes, &rx_path).await?;
     ///
-    /// let mut buffer = vec![0u8; 24];
-    /// let (size, addr) = server.try_recv_from(&mut buffer)?;
+    /// let mut buf = vec![0u8; 24];
+    /// let (size, addr) = rx.recv_from(&mut buf).await?;
     ///
-    /// let dgram = &buffer.as_slice()[..size];
+    /// let dgram = &buf[..size];
     /// assert_eq!(dgram, bytes);
-    /// assert_eq!(addr.as_pathname().unwrap(), &client_path);
+    /// assert_eq!(addr.as_pathname().unwrap(), &tx_path);
+    ///
     /// # Ok(())
     /// # }
     /// ```
-    pub fn try_send_to<P>(&mut self, buf: &[u8], target: P) -> io::Result<usize>
+    pub async fn send_to<P>(&self, buf: &[u8], target: P) -> io::Result<usize>
     where
         P: AsRef<Path>,
     {
-        self.io.get_ref().send_to(buf, target)
-    }
-
-    // Poll IO functions that takes `&self` are provided for the split API.
-    //
-    // They are not public because (taken from the doc of `PollEvented`):
-    //
-    // While `PollEvented` is `Sync` (if the underlying I/O type is `Sync`), the
-    // caller must ensure that there are at most two tasks that use a
-    // `PollEvented` instance concurrently. One for reading and one for writing.
-    // While violating this requirement is "safe" from a Rust memory model point
-    // of view, it will result in unexpected behavior in the form of lost
-    // notifications and tasks hanging.
-    pub(crate) fn poll_send_priv(
-        &self,
-        cx: &mut Context<'_>,
-        buf: &[u8],
-    ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_write_ready(cx))?;
-
-        match self.io.get_ref().send(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_write_ready(cx)?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
+        self.io
+            .registration()
+            .async_io(Interest::WRITABLE, || self.io.send_to(buf, target.as_ref()))
+            .await
     }
 
     /// Receives data from the socket.
-    pub async fn recv(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.poll_recv_priv(cx, buf)).await
-    }
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `recv_from` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, it is guaranteed that no messages were received on this
+    /// socket.
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use tempfile::tempdir;
+    ///
+    /// // We use a temporary directory so that the socket
+    /// // files left by the bound sockets will get cleaned up.
+    /// let tmp = tempdir()?;
+    ///
+    /// // Bind each socket to a filesystem path
+    /// let tx_path = tmp.path().join("tx");
+    /// let tx = UnixDatagram::bind(&tx_path)?;
+    /// let rx_path = tmp.path().join("rx");
+    /// let rx = UnixDatagram::bind(&rx_path)?;
+    ///
+    /// let bytes = b"hello world";
+    /// tx.send_to(bytes, &rx_path).await?;
+    ///
+    /// let mut buf = vec![0u8; 24];
+    /// let (size, addr) = rx.recv_from(&mut buf).await?;
+    ///
+    /// let dgram = &buf[..size];
+    /// assert_eq!(dgram, bytes);
+    /// assert_eq!(addr.as_pathname().unwrap(), &tx_path);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
+        let (n, addr) = self
+            .io
+            .registration()
+            .async_io(Interest::READABLE, || self.io.recv_from(buf))
+            .await?;
 
-    /// Try to receive a datagram from the peer without waiting.
-    pub fn try_recv(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.io.get_ref().recv(buf)
+        Ok((n, SocketAddr(addr)))
     }
 
-    pub(crate) fn poll_recv_priv(
+    /// Attempts to receive a single datagram on the specified address.
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the recv direction, only the
+    /// `Waker` from the `Context` passed to the most recent call will be scheduled to
+    /// receive a wakeup.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not ready to read
+    /// * `Poll::Ready(Ok(addr))` reads data from `addr` into `ReadBuf` if the socket is ready
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    pub fn poll_recv_from(
         &self,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
-
-        match self.io.get_ref().recv(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, mio::Ready::readable())?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<SocketAddr>> {
+        let (n, addr) = ready!(self.io.registration().poll_read_io(cx, || {
+            // Safety: will not read the maybe uninitialized bytes.
+            let b = unsafe {
+                &mut *(buf.unfilled_mut() as *mut [std::mem::MaybeUninit<u8>] as *mut [u8])
+            };
+
+            self.io.recv_from(b)
+        }))?;
+
+        // Safety: We trust `recv` to have filled up `n` bytes in the buffer.
+        unsafe {
+            buf.assume_init(n);
         }
+        buf.advance(n);
+        Poll::Ready(Ok(SocketAddr(addr)))
     }
 
-    /// Sends data on the socket to the specified address.
-    pub async fn send_to<P>(&mut self, buf: &[u8], target: P) -> io::Result<usize>
-    where
-        P: AsRef<Path> + Unpin,
-    {
-        poll_fn(|cx| self.poll_send_to_priv(cx, buf, target.as_ref())).await
-    }
-
-    pub(crate) fn poll_send_to_priv(
+    /// Attempts to send data to the specified address.
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the send direction, only the
+    /// `Waker` from the `Context` passed to the most recent call will be scheduled to
+    /// receive a wakeup.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not ready to write
+    /// * `Poll::Ready(Ok(n))` `n` is the number of bytes sent.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    pub fn poll_send_to<P>(
         &self,
         cx: &mut Context<'_>,
         buf: &[u8],
-        target: &Path,
-    ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_write_ready(cx))?;
-
-        match self.io.get_ref().send_to(buf, target) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_write_ready(cx)?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
+        target: P,
+    ) -> Poll<io::Result<usize>>
+    where
+        P: AsRef<Path>,
+    {
+        self.io
+            .registration()
+            .poll_write_io(cx, || self.io.send_to(buf, target.as_ref()))
     }
 
-    /// Receives data from the socket.
-    pub async fn recv_from(&mut self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        poll_fn(|cx| self.poll_recv_from_priv(cx, buf)).await
+    /// Attempts to send data on the socket to the remote address to which it
+    /// was previously `connect`ed.
+    ///
+    /// The [`connect`] method will connect this socket to a remote address.
+    /// This method will fail if the socket is not connected.
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the send direction,
+    /// only the `Waker` from the `Context` passed to the most recent call will
+    /// be scheduled to receive a wakeup.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not available to write
+    /// * `Poll::Ready(Ok(n))` `n` is the number of bytes sent
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`connect`]: method@Self::connect
+    pub fn poll_send(&self, cx: &mut Context<'_>, buf: &[u8]) -> Poll<io::Result<usize>> {
+        self.io
+            .registration()
+            .poll_write_io(cx, || self.io.send(buf))
     }
 
-    /// Try to receive data from the socket without waiting.
-    pub fn try_recv_from(&mut self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        self.io.get_ref().recv_from(buf)
+    /// Attempts to receive a single datagram message on the socket from the remote
+    /// address to which it is `connect`ed.
+    ///
+    /// The [`connect`] method will connect this socket to a remote address. This method
+    /// resolves to an error if the socket is not connected.
+    ///
+    /// Note that on multiple calls to a `poll_*` method in the recv direction, only the
+    /// `Waker` from the `Context` passed to the most recent call will be scheduled to
+    /// receive a wakeup.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the socket is not ready to read
+    /// * `Poll::Ready(Ok(()))` reads data `ReadBuf` if the socket is ready
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`connect`]: method@Self::connect
+    pub fn poll_recv(&self, cx: &mut Context<'_>, buf: &mut ReadBuf<'_>) -> Poll<io::Result<()>> {
+        let n = ready!(self.io.registration().poll_read_io(cx, || {
+            // Safety: will not read the maybe uninitialized bytes.
+            let b = unsafe {
+                &mut *(buf.unfilled_mut() as *mut [std::mem::MaybeUninit<u8>] as *mut [u8])
+            };
+
+            self.io.recv(b)
+        }))?;
+
+        // Safety: We trust `recv` to have filled up `n` bytes in the buffer.
+        unsafe {
+            buf.assume_init(n);
+        }
+        buf.advance(n);
+        Poll::Ready(Ok(()))
     }
 
-    pub(crate) fn poll_recv_from_priv(
+    /// Try to receive data from the socket without waiting.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixDatagram;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let client_path = dir.path().join("client.sock");
+    ///     let server_path = dir.path().join("server.sock");
+    ///     let socket = UnixDatagram::bind(&client_path)?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         socket.readable().await?;
+    ///
+    ///         // The buffer is **not** included in the async task and will
+    ///         // only exist on the stack.
+    ///         let mut buf = [0; 1024];
+    ///
+    ///         // Try to recv data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match socket.try_recv_from(&mut buf) {
+    ///             Ok((n, _addr)) => {
+    ///                 println!("GOT {:?}", &buf[..n]);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e);
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
+        let (n, addr) = self
+            .io
+            .registration()
+            .try_io(Interest::READABLE, || self.io.recv_from(buf))?;
+
+        Ok((n, SocketAddr(addr)))
+    }
+
+    /// Try to read or write from the socket using a user-provided IO operation.
+    ///
+    /// If the socket is ready, the provided closure is called. The closure
+    /// should attempt to perform IO operation from the socket by manually
+    /// calling the appropriate syscall. If the operation fails because the
+    /// socket is not actually ready, then the closure should return a
+    /// `WouldBlock` error and the readiness flag is cleared. The return value
+    /// of the closure is then returned by `try_io`.
+    ///
+    /// If the socket is not ready, then the closure is not called
+    /// and a `WouldBlock` error is returned.
+    ///
+    /// The closure should only return a `WouldBlock` error if it has performed
+    /// an IO operation on the socket that failed due to the socket not being
+    /// ready. Returning a `WouldBlock` error in any other situation will
+    /// incorrectly clear the readiness flag, which can cause the socket to
+    /// behave incorrectly.
+    ///
+    /// The closure should not perform the IO operation using any of the methods
+    /// defined on the Tokio `UnixDatagram` type, as this will mess with the
+    /// readiness flag and can cause the socket to behave incorrectly.
+    ///
+    /// Usually, [`readable()`], [`writable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: UnixDatagram::readable()
+    /// [`writable()`]: UnixDatagram::writable()
+    /// [`ready()`]: UnixDatagram::ready()
+    pub fn try_io<R>(
         &self,
-        cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<Result<(usize, SocketAddr), io::Error>> {
-        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
-
-        match self.io.get_ref().recv_from(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, mio::Ready::readable())?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
+        interest: Interest,
+        f: impl FnOnce() -> io::Result<R>,
+    ) -> io::Result<R> {
+        self.io.registration().try_io(interest, f)
     }
 
     /// Returns the local address that this socket is bound to.
+    ///
+    /// # Examples
+    /// For a socket bound to a local path
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use tempfile::tempdir;
+    ///
+    /// // We use a temporary directory so that the socket
+    /// // files left by the bound sockets will get cleaned up.
+    /// let tmp = tempdir()?;
+    ///
+    /// // Bind socket to a filesystem path
+    /// let socket_path = tmp.path().join("socket");
+    /// let socket = UnixDatagram::bind(&socket_path)?;
+    ///
+    /// assert_eq!(socket.local_addr()?.as_pathname().unwrap(), &socket_path);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
+    ///
+    /// For an unbound socket
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    ///
+    /// // Create an unbound socket
+    /// let socket = UnixDatagram::unbound()?;
+    ///
+    /// assert!(socket.local_addr()?.is_unnamed());
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().local_addr()
+        self.io.local_addr().map(SocketAddr)
     }
 
     /// Returns the address of this socket's peer.
     ///
     /// The `connect` method will connect the socket to a peer.
+    ///
+    /// # Examples
+    /// For a peer with a local path
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use tempfile::tempdir;
+    ///
+    /// // Create an unbound socket
+    /// let tx = UnixDatagram::unbound()?;
+    ///
+    /// // Create another, bound socket
+    /// let tmp = tempdir()?;
+    /// let rx_path = tmp.path().join("rx");
+    /// let rx = UnixDatagram::bind(&rx_path)?;
+    ///
+    /// // Connect to the bound socket
+    /// tx.connect(&rx_path)?;
+    ///
+    /// assert_eq!(tx.peer_addr()?.as_pathname().unwrap(), &rx_path);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
+    ///
+    /// For an unbound peer
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    ///
+    /// // Create the pair of sockets
+    /// let (sock1, sock2) = UnixDatagram::pair()?;
+    ///
+    /// assert!(sock1.peer_addr()?.is_unnamed());
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub fn peer_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().peer_addr()
+        self.io.peer_addr().map(SocketAddr)
     }
 
     /// Returns the value of the `SO_ERROR` option.
+    ///
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    ///
+    /// // Create an unbound socket
+    /// let socket = UnixDatagram::unbound()?;
+    ///
+    /// if let Ok(Some(err)) = socket.take_error() {
+    ///     println!("Got error: {:?}", err);
+    /// }
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
     pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.io.get_ref().take_error()
+        self.io.take_error()
     }
 
     /// Shuts down the read, write, or both halves of this connection.
@@ -277,74 +1299,58 @@
     /// This function will cause all pending and future I/O calls on the
     /// specified portions to immediately return with an appropriate value
     /// (see the documentation of `Shutdown`).
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        self.io.get_ref().shutdown(how)
-    }
-
-    // These lifetime markers also appear in the generated documentation, and make
-    // it more clear that this is a *borrowed* split.
-    #[allow(clippy::needless_lifetimes)]
-    /// Split a `UnixDatagram` into a receive half and a send half, which can be used
-    /// to receive and send the datagram concurrently.
-    ///
-    /// This method is more efficient than [`into_split`], but the halves cannot
-    /// be moved into independently spawned tasks.
     ///
-    /// [`into_split`]: fn@crate::net::UnixDatagram::into_split
-    pub fn split<'a>(&'a mut self) -> (RecvHalf<'a>, SendHalf<'a>) {
-        split(self)
-    }
-
-    /// Split a `UnixDatagram` into a receive half and a send half, which can be used
-    /// to receive and send the datagram concurrently.
+    /// # Examples
+    /// ```
+    /// # use std::error::Error;
+    /// # #[tokio::main]
+    /// # async fn main() -> Result<(), Box<dyn Error>> {
+    /// use tokio::net::UnixDatagram;
+    /// use std::net::Shutdown;
     ///
-    /// Unlike [`split`], the owned halves can be moved to separate tasks,
-    /// however this comes at the cost of a heap allocation.
+    /// // Create an unbound socket
+    /// let (socket, other) = UnixDatagram::pair()?;
     ///
-    /// **Note:** Dropping the write half will shut down the write half of the
-    /// datagram. This is equivalent to calling [`shutdown(Write)`].
+    /// socket.shutdown(Shutdown::Both)?;
     ///
-    /// [`split`]: fn@crate::net::UnixDatagram::split
-    /// [`shutdown(Write)`]:fn@crate::net::UnixDatagram::shutdown
-    pub fn into_split(self) -> (OwnedRecvHalf, OwnedSendHalf) {
-        split_owned(self)
-    }
-}
-
-impl TryFrom<UnixDatagram> for mio_uds::UnixDatagram {
-    type Error = io::Error;
-
-    /// Consumes value, returning the mio I/O object.
+    /// // NOTE: the following commented out code does NOT work as expected.
+    /// // Due to an underlying issue, the recv call will block indefinitely.
+    /// // See: https://github.com/tokio-rs/tokio/issues/1679
+    /// //let mut buff = vec![0u8; 24];
+    /// //let size = socket.recv(&mut buff).await?;
+    /// //assert_eq!(size, 0);
     ///
-    /// See [`PollEvented::into_inner`] for more details about
-    /// resource deregistration that happens during the call.
+    /// let send_result = socket.send(b"hello world").await;
+    /// assert!(send_result.is_err());
     ///
-    /// [`PollEvented::into_inner`]: crate::io::PollEvented::into_inner
-    fn try_from(value: UnixDatagram) -> Result<Self, Self::Error> {
-        value.io.into_inner()
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
+        self.io.shutdown(how)
     }
 }
 
-impl TryFrom<net::UnixDatagram> for UnixDatagram {
+impl TryFrom<std::os::unix::net::UnixDatagram> for UnixDatagram {
     type Error = io::Error;
 
-    /// Consumes stream, returning the tokio I/O object.
+    /// Consumes stream, returning the Tokio I/O object.
     ///
     /// This is equivalent to
     /// [`UnixDatagram::from_std(stream)`](UnixDatagram::from_std).
-    fn try_from(stream: net::UnixDatagram) -> Result<Self, Self::Error> {
+    fn try_from(stream: std::os::unix::net::UnixDatagram) -> Result<Self, Self::Error> {
         Self::from_std(stream)
     }
 }
 
 impl fmt::Debug for UnixDatagram {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.io.get_ref().fmt(f)
+        self.io.fmt(f)
     }
 }
 
 impl AsRawFd for UnixDatagram {
     fn as_raw_fd(&self) -> RawFd {
-        self.io.get_ref().as_raw_fd()
+        self.io.as_raw_fd()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/split_owned.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/split_owned.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/split_owned.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/split_owned.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-//! `UnixDatagram` owned split support.
-//!
-//! A `UnixDatagram` can be split into an `OwnedSendHalf` and a `OwnedRecvHalf`
-//! with the `UnixDatagram::into_split` method.
-
-use crate::future::poll_fn;
-use crate::net::UnixDatagram;
-
-use std::error::Error;
-use std::net::Shutdown;
-use std::os::unix::net::SocketAddr;
-use std::path::Path;
-use std::sync::Arc;
-use std::{fmt, io};
-
-pub(crate) fn split_owned(socket: UnixDatagram) -> (OwnedRecvHalf, OwnedSendHalf) {
-    let shared = Arc::new(socket);
-    let send = shared.clone();
-    let recv = shared;
-    (
-        OwnedRecvHalf { inner: recv },
-        OwnedSendHalf {
-            inner: send,
-            shutdown_on_drop: true,
-        },
-    )
-}
-
-/// Owned send half of a [`UnixDatagram`], created by [`into_split`].
-///
-/// [`UnixDatagram`]: UnixDatagram
-/// [`into_split`]: UnixDatagram::into_split()
-#[derive(Debug)]
-pub struct OwnedSendHalf {
-    inner: Arc<UnixDatagram>,
-    shutdown_on_drop: bool,
-}
-
-/// Owned receive half of a [`UnixDatagram`], created by [`into_split`].
-///
-/// [`UnixDatagram`]: UnixDatagram
-/// [`into_split`]: UnixDatagram::into_split()
-#[derive(Debug)]
-pub struct OwnedRecvHalf {
-    inner: Arc<UnixDatagram>,
-}
-
-/// Error indicating that two halves were not from the same socket, and thus could
-/// not be `reunite`d.
-#[derive(Debug)]
-pub struct ReuniteError(pub OwnedSendHalf, pub OwnedRecvHalf);
-
-impl fmt::Display for ReuniteError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "tried to reunite halves that are not from the same socket"
-        )
-    }
-}
-
-impl Error for ReuniteError {}
-
-fn reunite(s: OwnedSendHalf, r: OwnedRecvHalf) -> Result<UnixDatagram, ReuniteError> {
-    if Arc::ptr_eq(&s.inner, &r.inner) {
-        s.forget();
-        // Only two instances of the `Arc` are ever created, one for the
-        // receiver and one for the sender, and those `Arc`s are never exposed
-        // externally. And so when we drop one here, the other one must be the
-        // only remaining one.
-        Ok(Arc::try_unwrap(r.inner).expect("UnixDatagram: try_unwrap failed in reunite"))
-    } else {
-        Err(ReuniteError(s, r))
-    }
-}
-
-impl OwnedRecvHalf {
-    /// Attempts to put the two "halves" of a `UnixDatagram` back together and
-    /// recover the original socket. Succeeds only if the two "halves"
-    /// originated from the same call to [`into_split`].
-    ///
-    /// [`into_split`]: UnixDatagram::into_split()
-    pub fn reunite(self, other: OwnedSendHalf) -> Result<UnixDatagram, ReuniteError> {
-        reunite(other, self)
-    }
-
-    /// Receives data from the socket.
-    pub async fn recv_from(&mut self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        poll_fn(|cx| self.inner.poll_recv_from_priv(cx, buf)).await
-    }
-
-    /// Receives data from the socket.
-    pub async fn recv(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.inner.poll_recv_priv(cx, buf)).await
-    }
-}
-
-impl OwnedSendHalf {
-    /// Attempts to put the two "halves" of a `UnixDatagram` back together and
-    /// recover the original socket. Succeeds only if the two "halves"
-    /// originated from the same call to [`into_split`].
-    ///
-    /// [`into_split`]: UnixDatagram::into_split()
-    pub fn reunite(self, other: OwnedRecvHalf) -> Result<UnixDatagram, ReuniteError> {
-        reunite(self, other)
-    }
-
-    /// Sends data on the socket to the specified address.
-    pub async fn send_to<P>(&mut self, buf: &[u8], target: P) -> io::Result<usize>
-    where
-        P: AsRef<Path> + Unpin,
-    {
-        poll_fn(|cx| self.inner.poll_send_to_priv(cx, buf, target.as_ref())).await
-    }
-
-    /// Sends data on the socket to the socket's peer.
-    pub async fn send(&mut self, buf: &[u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.inner.poll_send_priv(cx, buf)).await
-    }
-
-    /// Destroy the send half, but don't close the send half of the stream
-    /// until the receive half is dropped. If the read half has already been
-    /// dropped, this closes the stream.
-    pub fn forget(mut self) {
-        self.shutdown_on_drop = false;
-        drop(self);
-    }
-}
-
-impl Drop for OwnedSendHalf {
-    fn drop(&mut self) {
-        if self.shutdown_on_drop {
-            let _ = self.inner.shutdown(Shutdown::Write);
-        }
-    }
-}
-
-impl AsRef<UnixDatagram> for OwnedSendHalf {
-    fn as_ref(&self) -> &UnixDatagram {
-        &self.inner
-    }
-}
-
-impl AsRef<UnixDatagram> for OwnedRecvHalf {
-    fn as_ref(&self) -> &UnixDatagram {
-        &self.inner
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/datagram/split.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-//! `UnixDatagram` split support.
-//!
-//! A `UnixDatagram` can be split into a `RecvHalf` and a `SendHalf` with the
-//! `UnixDatagram::split` method.
-
-use crate::future::poll_fn;
-use crate::net::UnixDatagram;
-
-use std::io;
-use std::os::unix::net::SocketAddr;
-use std::path::Path;
-
-/// Borrowed receive half of a [`UnixDatagram`], created by [`split`].
-///
-/// [`UnixDatagram`]: UnixDatagram
-/// [`split`]: crate::net::UnixDatagram::split()
-#[derive(Debug)]
-pub struct RecvHalf<'a>(&'a UnixDatagram);
-
-/// Borrowed send half of a [`UnixDatagram`], created by [`split`].
-///
-/// [`UnixDatagram`]: UnixDatagram
-/// [`split`]: crate::net::UnixDatagram::split()
-#[derive(Debug)]
-pub struct SendHalf<'a>(&'a UnixDatagram);
-
-pub(crate) fn split(stream: &mut UnixDatagram) -> (RecvHalf<'_>, SendHalf<'_>) {
-    (RecvHalf(&*stream), SendHalf(&*stream))
-}
-
-impl RecvHalf<'_> {
-    /// Receives data from the socket.
-    pub async fn recv_from(&mut self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
-        poll_fn(|cx| self.0.poll_recv_from_priv(cx, buf)).await
-    }
-
-    /// Receives data from the socket.
-    pub async fn recv(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.0.poll_recv_priv(cx, buf)).await
-    }
-}
-
-impl SendHalf<'_> {
-    /// Sends data on the socket to the specified address.
-    pub async fn send_to<P>(&mut self, buf: &[u8], target: P) -> io::Result<usize>
-    where
-        P: AsRef<Path> + Unpin,
-    {
-        poll_fn(|cx| self.0.poll_send_to_priv(cx, buf, target.as_ref())).await
-    }
-
-    /// Sends data on the socket to the socket's peer.
-    pub async fn send(&mut self, buf: &[u8]) -> io::Result<usize> {
-        poll_fn(|cx| self.0.poll_send_priv(cx, buf)).await
-    }
-}
-
-impl AsRef<UnixDatagram> for RecvHalf<'_> {
-    fn as_ref(&self) -> &UnixDatagram {
-        self.0
-    }
-}
-
-impl AsRef<UnixDatagram> for SendHalf<'_> {
-    fn as_ref(&self) -> &UnixDatagram {
-        self.0
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/incoming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/incoming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/incoming.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/incoming.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-use crate::net::unix::{UnixListener, UnixStream};
-
-use std::io;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-/// Stream of listeners
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Incoming<'a> {
-    inner: &'a mut UnixListener,
-}
-
-impl Incoming<'_> {
-    pub(crate) fn new(listener: &mut UnixListener) -> Incoming<'_> {
-        Incoming { inner: listener }
-    }
-
-    /// Attempts to poll `UnixStream` by polling inner `UnixListener` to accept
-    /// connection.
-    ///
-    /// If `UnixListener` isn't ready yet, `Poll::Pending` is returned and
-    /// current task will be notified by a waker.  Otherwise `Poll::Ready` with
-    /// `Result` containing `UnixStream` will be returned.
-    pub fn poll_accept(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<io::Result<UnixStream>> {
-        let (socket, _) = ready!(self.inner.poll_accept(cx))?;
-        Poll::Ready(Ok(socket))
-    }
-}
-
-#[cfg(feature = "stream")]
-impl crate::stream::Stream for Incoming<'_> {
-    type Item = io::Result<UnixStream>;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let (socket, _) = ready!(self.inner.poll_accept(cx))?;
-        Poll::Ready(Some(Ok(socket)))
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/listener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/listener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/listener.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/listener.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,23 +1,22 @@
-use crate::future::poll_fn;
-use crate::io::PollEvented;
-use crate::net::unix::{Incoming, UnixStream};
+use crate::io::{Interest, PollEvented};
+use crate::net::unix::{SocketAddr, UnixStream};
 
-use mio::Ready;
 use std::convert::TryFrom;
 use std::fmt;
 use std::io;
-use std::os::unix::io::{AsRawFd, RawFd};
-use std::os::unix::net::{self, SocketAddr};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::net;
 use std::path::Path;
 use std::task::{Context, Poll};
 
-cfg_uds! {
+cfg_net_unix! {
     /// A Unix socket which can accept connections from other Unix sockets.
     ///
-    /// You can accept a new connection by using the [`accept`](`UnixListener::accept`) method. Alternatively `UnixListener`
-    /// implements the [`Stream`](`crate::stream::Stream`) trait, which allows you to use the listener in places that want a
-    /// stream. The stream will never return `None` and will also not yield the peer's `SocketAddr` structure. Iterating over
-    /// it is equivalent to calling accept in a loop.
+    /// You can accept a new connection by using the [`accept`](`UnixListener::accept`) method.
+    ///
+    /// A `UnixListener` can be turned into a `Stream` with [`UnixListenerStream`].
+    ///
+    /// [`UnixListenerStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.UnixListenerStream.html
     ///
     /// # Errors
     ///
@@ -31,14 +30,13 @@
     ///
     /// ```no_run
     /// use tokio::net::UnixListener;
-    /// use tokio::stream::StreamExt;
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let mut listener = UnixListener::bind("/path/to/the/socket").unwrap();
-    ///     while let Some(stream) = listener.next().await {
-    ///         match stream {
-    ///             Ok(stream) => {
+    ///     let listener = UnixListener::bind("/path/to/the/socket").unwrap();
+    ///     loop {
+    ///         match listener.accept().await {
+    ///             Ok((stream, _addr)) => {
     ///                 println!("new client!");
     ///             }
     ///             Err(e) => { /* connection failed */ }
@@ -47,7 +45,7 @@
     /// }
     /// ```
     pub struct UnixListener {
-        io: PollEvented<mio_uds::UnixListener>,
+        io: PollEvented<mio::net::UnixListener>,
     }
 }
 
@@ -60,21 +58,22 @@
     ///
     /// The runtime is usually set implicitly when this function is called
     /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
     pub fn bind<P>(path: P) -> io::Result<UnixListener>
     where
         P: AsRef<Path>,
     {
-        let listener = mio_uds::UnixListener::bind(path)?;
+        let listener = mio::net::UnixListener::bind(path)?;
         let io = PollEvented::new(listener)?;
         Ok(UnixListener { io })
     }
 
-    /// Consumes a `UnixListener` in the standard library and returns a
-    /// nonblocking `UnixListener` from this crate.
+    /// Creates new `UnixListener` from a `std::os::unix::net::UnixListener `.
     ///
-    /// The returned listener will be associated with the given event loop
-    /// specified by `handle` and is ready to perform I/O.
+    /// This function is intended to be used to wrap a UnixListener from the
+    /// standard library in the Tokio equivalent. The conversion assumes
+    /// nothing about the underlying listener; it is left up to the user to set
+    /// it in non-blocking mode.
     ///
     /// # Panics
     ///
@@ -82,151 +81,106 @@
     ///
     /// The runtime is usually set implicitly when this function is called
     /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
     pub fn from_std(listener: net::UnixListener) -> io::Result<UnixListener> {
-        let listener = mio_uds::UnixListener::from_listener(listener)?;
+        let listener = mio::net::UnixListener::from_std(listener);
         let io = PollEvented::new(listener)?;
         Ok(UnixListener { io })
     }
 
-    /// Returns the local socket address of this listener.
-    pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().local_addr()
-    }
-
-    /// Returns the value of the `SO_ERROR` option.
-    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.io.get_ref().take_error()
-    }
-
-    /// Accepts a new incoming connection to this listener.
-    pub async fn accept(&mut self) -> io::Result<(UnixStream, SocketAddr)> {
-        poll_fn(|cx| self.poll_accept(cx)).await
-    }
-
-    /// Polls to accept a new incoming connection to this listener.
-    ///
-    /// If there is no connection to accept, `Poll::Pending` is returned and
-    /// the current task will be notified by a waker.
-    pub fn poll_accept(
-        &mut self,
-        cx: &mut Context<'_>,
-    ) -> Poll<io::Result<(UnixStream, SocketAddr)>> {
-        let (io, addr) = ready!(self.poll_accept_std(cx))?;
-
-        let io = mio_uds::UnixStream::from_stream(io)?;
-        Ok((UnixStream::new(io)?, addr)).into()
-    }
-
-    fn poll_accept_std(
-        &mut self,
-        cx: &mut Context<'_>,
-    ) -> Poll<io::Result<(net::UnixStream, SocketAddr)>> {
-        ready!(self.io.poll_read_ready(cx, Ready::readable()))?;
-
-        match self.io.get_ref().accept_std() {
-            Ok(None) => {
-                self.io.clear_read_ready(cx, Ready::readable())?;
-                Poll::Pending
-            }
-            Ok(Some((sock, addr))) => Ok((sock, addr)).into(),
-            Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, Ready::readable())?;
-                Poll::Pending
-            }
-            Err(err) => Err(err).into(),
-        }
-    }
-
-    /// Returns a stream over the connections being received on this listener.
-    ///
-    /// Note that `UnixListener` also directly implements `Stream`.
-    ///
-    /// The returned stream will never return `None` and will also not yield the
-    /// peer's `SocketAddr` structure. Iterating over it is equivalent to
-    /// calling accept in a loop.
+    /// Turn a [`tokio::net::UnixListener`] into a [`std::os::unix::net::UnixListener`].
     ///
-    /// # Errors
-    ///
-    /// Note that accepting a connection can lead to various errors and not all
-    /// of them are necessarily fatal ‒ for example having too many open file
-    /// descriptors or the other side closing the connection while it waits in
-    /// an accept queue. These would terminate the stream if not handled in any
-    /// way.
+    /// The returned [`std::os::unix::net::UnixListener`] will have nonblocking mode
+    /// set as `true`.  Use [`set_nonblocking`] to change the blocking mode if needed.
     ///
     /// # Examples
     ///
-    /// ```no_run
-    /// use tokio::net::UnixListener;
-    /// use tokio::stream::StreamExt;
+    /// ```rust,no_run
+    /// use std::error::Error;
     ///
     /// #[tokio::main]
-    /// async fn main() {
-    ///     let mut listener = UnixListener::bind("/path/to/the/socket").unwrap();
-    ///     let mut incoming = listener.incoming();
-    ///
-    ///     while let Some(stream) = incoming.next().await {
-    ///         match stream {
-    ///             Ok(stream) => {
-    ///                 println!("new client!");
-    ///             }
-    ///             Err(e) => { /* connection failed */ }
-    ///         }
-    ///     }
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let tokio_listener = tokio::net::UnixListener::bind("127.0.0.1:0")?;
+    ///     let std_listener = tokio_listener.into_std()?;
+    ///     std_listener.set_nonblocking(false)?;
+    ///     Ok(())
     /// }
     /// ```
-    pub fn incoming(&mut self) -> Incoming<'_> {
-        Incoming::new(self)
+    ///
+    /// [`tokio::net::UnixListener`]: UnixListener
+    /// [`std::os::unix::net::UnixListener`]: std::os::unix::net::UnixListener
+    /// [`set_nonblocking`]: fn@std::os::unix::net::UnixListener::set_nonblocking
+    pub fn into_std(self) -> io::Result<std::os::unix::net::UnixListener> {
+        self.io
+            .into_inner()
+            .map(|io| io.into_raw_fd())
+            .map(|raw_fd| unsafe { net::UnixListener::from_raw_fd(raw_fd) })
     }
-}
 
-#[cfg(feature = "stream")]
-impl crate::stream::Stream for UnixListener {
-    type Item = io::Result<UnixStream>;
-
-    fn poll_next(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
-        let (socket, _) = ready!(self.poll_accept(cx))?;
-        Poll::Ready(Some(Ok(socket)))
+    /// Returns the local socket address of this listener.
+    pub fn local_addr(&self) -> io::Result<SocketAddr> {
+        self.io.local_addr().map(SocketAddr)
     }
-}
 
-impl TryFrom<UnixListener> for mio_uds::UnixListener {
-    type Error = io::Error;
+    /// Returns the value of the `SO_ERROR` option.
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        self.io.take_error()
+    }
 
-    /// Consumes value, returning the mio I/O object.
+    /// Accepts a new incoming connection to this listener.
+    ///
+    /// # Cancel safety
     ///
-    /// See [`PollEvented::into_inner`] for more details about
-    /// resource deregistration that happens during the call.
+    /// This method is cancel safe. If the method is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, then it is guaranteed that no new connections were
+    /// accepted by this method.
+    pub async fn accept(&self) -> io::Result<(UnixStream, SocketAddr)> {
+        let (mio, addr) = self
+            .io
+            .registration()
+            .async_io(Interest::READABLE, || self.io.accept())
+            .await?;
+
+        let addr = SocketAddr(addr);
+        let stream = UnixStream::new(mio)?;
+        Ok((stream, addr))
+    }
+
+    /// Polls to accept a new incoming connection to this listener.
     ///
-    /// [`PollEvented::into_inner`]: crate::io::PollEvented::into_inner
-    fn try_from(value: UnixListener) -> Result<Self, Self::Error> {
-        value.io.into_inner()
+    /// If there is no connection to accept, `Poll::Pending` is returned and the
+    /// current task will be notified by a waker.  Note that on multiple calls
+    /// to `poll_accept`, only the `Waker` from the `Context` passed to the most
+    /// recent call is scheduled to receive a wakeup.
+    pub fn poll_accept(&self, cx: &mut Context<'_>) -> Poll<io::Result<(UnixStream, SocketAddr)>> {
+        let (sock, addr) = ready!(self.io.registration().poll_read_io(cx, || self.io.accept()))?;
+        let addr = SocketAddr(addr);
+        let sock = UnixStream::new(sock)?;
+        Poll::Ready(Ok((sock, addr)))
     }
 }
 
-impl TryFrom<net::UnixListener> for UnixListener {
+impl TryFrom<std::os::unix::net::UnixListener> for UnixListener {
     type Error = io::Error;
 
     /// Consumes stream, returning the tokio I/O object.
     ///
     /// This is equivalent to
     /// [`UnixListener::from_std(stream)`](UnixListener::from_std).
-    fn try_from(stream: net::UnixListener) -> io::Result<Self> {
+    fn try_from(stream: std::os::unix::net::UnixListener) -> io::Result<Self> {
         Self::from_std(stream)
     }
 }
 
 impl fmt::Debug for UnixListener {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.io.get_ref().fmt(f)
+        self.io.fmt(f)
     }
 }
 
 impl AsRawFd for UnixListener {
     fn as_raw_fd(&self) -> RawFd {
-        self.io.get_ref().as_raw_fd()
+        self.io.as_raw_fd()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,12 @@
 //! Unix domain socket utility types
 
+// This module does not currently provide any public API, but it was
+// unintentionally defined as a public module. Hide it from the documentation
+// instead of changing it to a private module to avoid breakage.
+#[doc(hidden)]
 pub mod datagram;
 
-mod incoming;
-pub use incoming::Incoming;
-
 pub(crate) mod listener;
-pub(crate) use listener::UnixListener;
 
 mod split;
 pub use split::{ReadHalf, WriteHalf};
@@ -14,6 +14,9 @@
 mod split_owned;
 pub use split_owned::{OwnedReadHalf, OwnedWriteHalf, ReuniteError};
 
+mod socketaddr;
+pub use socketaddr::SocketAddr;
+
 pub(crate) mod stream;
 pub(crate) use stream::UnixStream;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/socketaddr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/socketaddr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/socketaddr.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/socketaddr.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+use std::fmt;
+use std::path::Path;
+
+/// An address associated with a Tokio Unix socket.
+pub struct SocketAddr(pub(super) mio::net::SocketAddr);
+
+impl SocketAddr {
+    /// Returns `true` if the address is unnamed.
+    ///
+    /// Documentation reflected in [`SocketAddr`]
+    ///
+    /// [`SocketAddr`]: std::os::unix::net::SocketAddr
+    pub fn is_unnamed(&self) -> bool {
+        self.0.is_unnamed()
+    }
+
+    /// Returns the contents of this address if it is a `pathname` address.
+    ///
+    /// Documentation reflected in [`SocketAddr`]
+    ///
+    /// [`SocketAddr`]: std::os::unix::net::SocketAddr
+    pub fn as_pathname(&self) -> Option<&Path> {
+        self.0.as_pathname()
+    }
+}
+
+impl fmt::Debug for SocketAddr {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(fmt)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/split_owned.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/split_owned.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/split_owned.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/split_owned.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,11 +8,10 @@
 //! split has no associated overhead and enforces all invariants at the type
 //! level.
 
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 use crate::net::UnixStream;
 
 use std::error::Error;
-use std::mem::MaybeUninit;
 use std::net::Shutdown;
 use std::pin::Pin;
 use std::sync::Arc;
@@ -22,12 +21,11 @@
 /// Owned read half of a [`UnixStream`], created by [`into_split`].
 ///
 /// Reading from an `OwnedReadHalf` is usually done using the convenience methods found
-/// on the [`AsyncReadExt`] trait. Examples import this trait through [the prelude].
+/// on the [`AsyncReadExt`] trait.
 ///
 /// [`UnixStream`]: crate::net::UnixStream
 /// [`into_split`]: crate::net::UnixStream::into_split()
 /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
-/// [the prelude]: crate::prelude
 #[derive(Debug)]
 pub struct OwnedReadHalf {
     inner: Arc<UnixStream>,
@@ -40,15 +38,13 @@
 /// Dropping the write half will also shut down the write half of the stream.
 ///
 /// Writing to an `OwnedWriteHalf` is usually done using the convenience methods
-/// found on the [`AsyncWriteExt`] trait. Examples import this trait through
-/// [the prelude].
+/// found on the [`AsyncWriteExt`] trait.
 ///
 /// [`UnixStream`]: crate::net::UnixStream
 /// [`into_split`]: crate::net::UnixStream::into_split()
 /// [`AsyncWrite`]: trait@crate::io::AsyncWrite
 /// [`poll_shutdown`]: fn@crate::io::AsyncWrite::poll_shutdown
 /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-/// [the prelude]: crate::prelude
 #[derive(Debug)]
 pub struct OwnedWriteHalf {
     inner: Arc<UnixStream>,
@@ -109,15 +105,11 @@
 }
 
 impl AsyncRead for OwnedReadHalf {
-    unsafe fn prepare_uninitialized_buffer(&self, _: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.inner.poll_read_priv(cx, buf)
     }
 }
@@ -144,7 +136,7 @@
 impl Drop for OwnedWriteHalf {
     fn drop(&mut self) {
         if self.shutdown_on_drop {
-            let _ = self.inner.shutdown(Shutdown::Write);
+            let _ = self.inner.shutdown_std(Shutdown::Write);
         }
     }
 }
@@ -158,6 +150,18 @@
         self.inner.poll_write_priv(cx, buf)
     }
 
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[io::IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        self.inner.poll_write_vectored_priv(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        self.inner.is_write_vectored()
+    }
+
     #[inline]
     fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
         // flush is a no-op
@@ -166,7 +170,7 @@
 
     // `poll_shutdown` on a write half shutdowns the stream in the "write" direction.
     fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
-        let res = self.inner.shutdown(Shutdown::Write);
+        let res = self.inner.shutdown_std(Shutdown::Write);
         if res.is_ok() {
             Pin::into_inner(self).shutdown_on_drop = false;
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,11 +8,10 @@
 //! split has no associated overhead and enforces all invariants at the type
 //! level.
 
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 use crate::net::UnixStream;
 
 use std::io;
-use std::mem::MaybeUninit;
 use std::net::Shutdown;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -20,29 +19,27 @@
 /// Borrowed read half of a [`UnixStream`], created by [`split`].
 ///
 /// Reading from a `ReadHalf` is usually done using the convenience methods found on the
-/// [`AsyncReadExt`] trait. Examples import this trait through [the prelude].
+/// [`AsyncReadExt`] trait.
 ///
 /// [`UnixStream`]: UnixStream
 /// [`split`]: UnixStream::split()
 /// [`AsyncReadExt`]: trait@crate::io::AsyncReadExt
-/// [the prelude]: crate::prelude
 #[derive(Debug)]
 pub struct ReadHalf<'a>(&'a UnixStream);
 
 /// Borrowed write half of a [`UnixStream`], created by [`split`].
 ///
-/// Note that in the [`AsyncWrite`] implemenation of this type, [`poll_shutdown`] will
+/// Note that in the [`AsyncWrite`] implementation of this type, [`poll_shutdown`] will
 /// shut down the UnixStream stream in the write direction.
 ///
 /// Writing to an `WriteHalf` is usually done using the convenience methods found
-/// on the [`AsyncWriteExt`] trait. Examples import this trait through [the prelude].
+/// on the [`AsyncWriteExt`] trait.
 ///
 /// [`UnixStream`]: UnixStream
 /// [`split`]: UnixStream::split()
 /// [`AsyncWrite`]: trait@crate::io::AsyncWrite
 /// [`poll_shutdown`]: fn@crate::io::AsyncWrite::poll_shutdown
 /// [`AsyncWriteExt`]: trait@crate::io::AsyncWriteExt
-/// [the prelude]: crate::prelude
 #[derive(Debug)]
 pub struct WriteHalf<'a>(&'a UnixStream);
 
@@ -51,15 +48,11 @@
 }
 
 impl AsyncRead for ReadHalf<'_> {
-    unsafe fn prepare_uninitialized_buffer(&self, _: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.0.poll_read_priv(cx, buf)
     }
 }
@@ -73,12 +66,24 @@
         self.0.poll_write_priv(cx, buf)
     }
 
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[io::IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        self.0.poll_write_vectored_priv(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        self.0.is_write_vectored()
+    }
+
     fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
         Poll::Ready(Ok(()))
     }
 
     fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
-        self.0.shutdown(Shutdown::Write).into()
+        self.0.shutdown_std(Shutdown::Write).into()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,28 +1,39 @@
 use crate::future::poll_fn;
-use crate::io::{AsyncRead, AsyncWrite, PollEvented};
+use crate::io::{AsyncRead, AsyncWrite, Interest, PollEvented, ReadBuf, Ready};
 use crate::net::unix::split::{split, ReadHalf, WriteHalf};
 use crate::net::unix::split_owned::{split_owned, OwnedReadHalf, OwnedWriteHalf};
 use crate::net::unix::ucred::{self, UCred};
+use crate::net::unix::SocketAddr;
 
 use std::convert::TryFrom;
 use std::fmt;
 use std::io::{self, Read, Write};
-use std::mem::MaybeUninit;
 use std::net::Shutdown;
-use std::os::unix::io::{AsRawFd, RawFd};
-use std::os::unix::net::{self, SocketAddr};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::net;
 use std::path::Path;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-cfg_uds! {
+cfg_io_util! {
+    use bytes::BufMut;
+}
+
+cfg_net_unix! {
     /// A structure representing a connected Unix socket.
     ///
     /// This socket can be connected directly with `UnixStream::connect` or accepted
     /// from a listener with `UnixListener::incoming`. Additionally, a pair of
     /// anonymous Unix sockets can be created with `UnixStream::pair`.
+    ///
+    /// To shut down the stream in the write direction, you can call the
+    /// [`shutdown()`] method. This will cause the other peer to receive a read of
+    /// length 0, indicating that no more data will be sent. This only closes
+    /// the stream in one direction.
+    ///
+    /// [`shutdown()`]: fn@crate::io::AsyncWriteExt::shutdown
     pub struct UnixStream {
-        io: PollEvented<mio_uds::UnixStream>,
+        io: PollEvented<mio::net::UnixStream>,
     }
 }
 
@@ -36,18 +47,653 @@
     where
         P: AsRef<Path>,
     {
-        let stream = mio_uds::UnixStream::connect(path)?;
+        let stream = mio::net::UnixStream::connect(path)?;
         let stream = UnixStream::new(stream)?;
 
-        poll_fn(|cx| stream.io.poll_write_ready(cx)).await?;
+        poll_fn(|cx| stream.io.registration().poll_write_ready(cx)).await?;
+
+        if let Some(e) = stream.io.take_error()? {
+            return Err(e);
+        }
+
         Ok(stream)
     }
 
-    /// Consumes a `UnixStream` in the standard library and returns a
-    /// nonblocking `UnixStream` from this crate.
+    /// Wait for any of the requested ready states.
+    ///
+    /// This function is usually paired with `try_read()` or `try_write()`. It
+    /// can be used to concurrently read / write to the same socket on a single
+    /// task without splitting the socket.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to read or write that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// Concurrently read and write to the stream on the same task without
+    /// splitting.
+    ///
+    /// ```no_run
+    /// use tokio::io::Interest;
+    /// use tokio::net::UnixStream;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let bind_path = dir.path().join("bind_path");
+    ///     let stream = UnixStream::connect(bind_path).await?;
+    ///
+    ///     loop {
+    ///         let ready = stream.ready(Interest::READABLE | Interest::WRITABLE).await?;
+    ///
+    ///         if ready.is_readable() {
+    ///             let mut data = vec![0; 1024];
+    ///             // Try to read data, this may still fail with `WouldBlock`
+    ///             // if the readiness event is a false positive.
+    ///             match stream.try_read(&mut data) {
+    ///                 Ok(n) => {
+    ///                     println!("read {} bytes", n);        
+    ///                 }
+    ///                 Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                     continue;
+    ///                 }
+    ///                 Err(e) => {
+    ///                     return Err(e.into());
+    ///                 }
+    ///             }
+    ///
+    ///         }
+    ///
+    ///         if ready.is_writable() {
+    ///             // Try to write data, this may still fail with `WouldBlock`
+    ///             // if the readiness event is a false positive.
+    ///             match stream.try_write(b"hello world") {
+    ///                 Ok(n) => {
+    ///                     println!("write {} bytes", n);
+    ///                 }
+    ///                 Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                     continue;
+    ///                 }
+    ///                 Err(e) => {
+    ///                     return Err(e.into());
+    ///                 }
+    ///             }
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    pub async fn ready(&self, interest: Interest) -> io::Result<Ready> {
+        let event = self.io.registration().readiness(interest).await?;
+        Ok(event.ready)
+    }
+
+    /// Wait for the socket to become readable.
+    ///
+    /// This function is equivalent to `ready(Interest::READABLE)` and is usually
+    /// paired with `try_read()`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to read that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixStream;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let bind_path = dir.path().join("bind_path");
+    ///     let stream = UnixStream::connect(bind_path).await?;
+    ///
+    ///     let mut msg = vec![0; 1024];
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         stream.readable().await?;
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_read(&mut msg) {
+    ///             Ok(n) => {
+    ///                 msg.truncate(n);
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     println!("GOT = {:?}", msg);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn readable(&self) -> io::Result<()> {
+        self.ready(Interest::READABLE).await?;
+        Ok(())
+    }
+
+    /// Polls for read readiness.
+    ///
+    /// If the unix stream is not currently ready for reading, this method will
+    /// store a clone of the `Waker` from the provided `Context`. When the unix
+    /// stream becomes ready for reading, `Waker::wake` will be called on the
+    /// waker.
+    ///
+    /// Note that on multiple calls to `poll_read_ready` or `poll_read`, only
+    /// the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup. (However, `poll_write_ready` retains a
+    /// second, independent waker.)
+    ///
+    /// This function is intended for cases where creating and pinning a future
+    /// via [`readable`] is not feasible. Where possible, using [`readable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the unix stream is not ready for reading.
+    /// * `Poll::Ready(Ok(()))` if the unix stream is ready for reading.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`readable`]: method@Self::readable
+    pub fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.io.registration().poll_read_ready(cx).map_ok(|_| ())
+    }
+
+    /// Try to read data from the stream into the provided buffer, returning how
+    /// many bytes were read.
+    ///
+    /// Receives any pending data from the socket but does not wait for new data
+    /// to arrive. On success, returns the number of bytes read. Because
+    /// `try_read()` is non-blocking, the buffer does not have to be stored by
+    /// the async task and can exist entirely on the stack.
+    ///
+    /// Usually, [`readable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: UnixStream::readable()
+    /// [`ready()`]: UnixStream::ready()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+    /// number of bytes read. `Ok(0)` indicates the stream's read half is closed
+    /// and will no longer yield data. If the stream is not ready to read data
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixStream;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let bind_path = dir.path().join("bind_path");
+    ///     let stream = UnixStream::connect(bind_path).await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         stream.readable().await?;
+    ///
+    ///         // Creating the buffer **after** the `await` prevents it from
+    ///         // being stored in the async task.
+    ///         let mut buf = [0; 4096];
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_read(&mut buf) {
+    ///             Ok(0) => break,
+    ///             Ok(n) => {
+    ///                 println!("read {} bytes", n);
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_read(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || (&*self.io).read(buf))
+    }
+
+    /// Try to read data from the stream into the provided buffers, returning
+    /// how many bytes were read.
+    ///
+    /// Data is copied to fill each buffer in order, with the final buffer
+    /// written to possibly being only partially filled. This method behaves
+    /// equivalently to a single call to [`try_read()`] with concatenated
+    /// buffers.
+    ///
+    /// Receives any pending data from the socket but does not wait for new data
+    /// to arrive. On success, returns the number of bytes read. Because
+    /// `try_read_vectored()` is non-blocking, the buffer does not have to be
+    /// stored by the async task and can exist entirely on the stack.
+    ///
+    /// Usually, [`readable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`try_read()`]: UnixStream::try_read()
+    /// [`readable()`]: UnixStream::readable()
+    /// [`ready()`]: UnixStream::ready()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+    /// number of bytes read. `Ok(0)` indicates the stream's read half is closed
+    /// and will no longer yield data. If the stream is not ready to read data
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixStream;
+    /// use std::error::Error;
+    /// use std::io::{self, IoSliceMut};
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let bind_path = dir.path().join("bind_path");
+    ///     let stream = UnixStream::connect(bind_path).await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be readable
+    ///         stream.readable().await?;
+    ///
+    ///         // Creating the buffer **after** the `await` prevents it from
+    ///         // being stored in the async task.
+    ///         let mut buf_a = [0; 512];
+    ///         let mut buf_b = [0; 1024];
+    ///         let mut bufs = [
+    ///             IoSliceMut::new(&mut buf_a),
+    ///             IoSliceMut::new(&mut buf_b),
+    ///         ];
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_read_vectored(&mut bufs) {
+    ///             Ok(0) => break,
+    ///             Ok(n) => {
+    ///                 println!("read {} bytes", n);
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_read_vectored(&self, bufs: &mut [io::IoSliceMut<'_>]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || (&*self.io).read_vectored(bufs))
+    }
+
+    cfg_io_util! {
+        /// Try to read data from the stream into the provided buffer, advancing the
+        /// buffer's internal cursor, returning how many bytes were read.
+        ///
+        /// Receives any pending data from the socket but does not wait for new data
+        /// to arrive. On success, returns the number of bytes read. Because
+        /// `try_read_buf()` is non-blocking, the buffer does not have to be stored by
+        /// the async task and can exist entirely on the stack.
+        ///
+        /// Usually, [`readable()`] or [`ready()`] is used with this function.
+        ///
+        /// [`readable()`]: UnixStream::readable()
+        /// [`ready()`]: UnixStream::ready()
+        ///
+        /// # Return
+        ///
+        /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+        /// number of bytes read. `Ok(0)` indicates the stream's read half is closed
+        /// and will no longer yield data. If the stream is not ready to read data
+        /// `Err(io::ErrorKind::WouldBlock)` is returned.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::net::UnixStream;
+        /// use std::error::Error;
+        /// use std::io;
+        ///
+        /// #[tokio::main]
+        /// async fn main() -> Result<(), Box<dyn Error>> {
+        ///     // Connect to a peer
+        ///     let dir = tempfile::tempdir().unwrap();
+        ///     let bind_path = dir.path().join("bind_path");
+        ///     let stream = UnixStream::connect(bind_path).await?;
+        ///
+        ///     loop {
+        ///         // Wait for the socket to be readable
+        ///         stream.readable().await?;
+        ///
+        ///         let mut buf = Vec::with_capacity(4096);
+        ///
+        ///         // Try to read data, this may still fail with `WouldBlock`
+        ///         // if the readiness event is a false positive.
+        ///         match stream.try_read_buf(&mut buf) {
+        ///             Ok(0) => break,
+        ///             Ok(n) => {
+        ///                 println!("read {} bytes", n);
+        ///             }
+        ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+        ///                 continue;
+        ///             }
+        ///             Err(e) => {
+        ///                 return Err(e.into());
+        ///             }
+        ///         }
+        ///     }
+        ///
+        ///     Ok(())
+        /// }
+        /// ```
+        pub fn try_read_buf<B: BufMut>(&self, buf: &mut B) -> io::Result<usize> {
+            self.io.registration().try_io(Interest::READABLE, || {
+                use std::io::Read;
+
+                let dst = buf.chunk_mut();
+                let dst =
+                    unsafe { &mut *(dst as *mut _ as *mut [std::mem::MaybeUninit<u8>] as *mut [u8]) };
+
+                // Safety: We trust `UnixStream::read` to have filled up `n` bytes in the
+                // buffer.
+                let n = (&*self.io).read(dst)?;
+
+                unsafe {
+                    buf.advance_mut(n);
+                }
+
+                Ok(n)
+            })
+        }
+    }
+
+    /// Wait for the socket to become writable.
     ///
-    /// The returned stream will be associated with the given event loop
-    /// specified by `handle` and is ready to perform I/O.
+    /// This function is equivalent to `ready(Interest::WRITABLE)` and is usually
+    /// paired with `try_write()`.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once a readiness event occurs, the method
+    /// will continue to return immediately until the readiness event is
+    /// consumed by an attempt to write that fails with `WouldBlock` or
+    /// `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixStream;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let bind_path = dir.path().join("bind_path");
+    ///     let stream = UnixStream::connect(bind_path).await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         stream.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_write(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn writable(&self) -> io::Result<()> {
+        self.ready(Interest::WRITABLE).await?;
+        Ok(())
+    }
+
+    /// Polls for write readiness.
+    ///
+    /// If the unix stream is not currently ready for writing, this method will
+    /// store a clone of the `Waker` from the provided `Context`. When the unix
+    /// stream becomes ready for writing, `Waker::wake` will be called on the
+    /// waker.
+    ///
+    /// Note that on multiple calls to `poll_write_ready` or `poll_write`, only
+    /// the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup. (However, `poll_read_ready` retains a
+    /// second, independent waker.)
+    ///
+    /// This function is intended for cases where creating and pinning a future
+    /// via [`writable`] is not feasible. Where possible, using [`writable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the unix stream is not ready for writing.
+    /// * `Poll::Ready(Ok(()))` if the unix stream is ready for writing.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`writable`]: method@Self::writable
+    pub fn poll_write_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.io.registration().poll_write_ready(cx).map_ok(|_| ())
+    }
+
+    /// Try to write a buffer to the stream, returning how many bytes were
+    /// written.
+    ///
+    /// The function will attempt to write the entire contents of `buf`, but
+    /// only part of the buffer may be written.
+    ///
+    /// This function is usually paired with `writable()`.
+    ///
+    /// # Return
+    ///
+    /// If data is successfully written, `Ok(n)` is returned, where `n` is the
+    /// number of bytes written. If the stream is not ready to write data,
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixStream;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let bind_path = dir.path().join("bind_path");
+    ///     let stream = UnixStream::connect(bind_path).await?;
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         stream.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_write(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_write(&self, buf: &[u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || (&*self.io).write(buf))
+    }
+
+    /// Try to write several buffers to the stream, returning how many bytes
+    /// were written.
+    ///
+    /// Data is written from each buffer in order, with the final buffer read
+    /// from possible being only partially consumed. This method behaves
+    /// equivalently to a single call to [`try_write()`] with concatenated
+    /// buffers.
+    ///
+    /// This function is usually paired with `writable()`.
+    ///
+    /// [`try_write()`]: UnixStream::try_write()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully written, `Ok(n)` is returned, where `n` is the
+    /// number of bytes written. If the stream is not ready to write data,
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::UnixStream;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     // Connect to a peer
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let bind_path = dir.path().join("bind_path");
+    ///     let stream = UnixStream::connect(bind_path).await?;
+    ///
+    ///     let bufs = [io::IoSlice::new(b"hello "), io::IoSlice::new(b"world")];
+    ///
+    ///     loop {
+    ///         // Wait for the socket to be writable
+    ///         stream.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match stream.try_write_vectored(&bufs) {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_write_vectored(&self, buf: &[io::IoSlice<'_>]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || (&*self.io).write_vectored(buf))
+    }
+
+    /// Try to read or write from the socket using a user-provided IO operation.
+    ///
+    /// If the socket is ready, the provided closure is called. The closure
+    /// should attempt to perform IO operation from the socket by manually
+    /// calling the appropriate syscall. If the operation fails because the
+    /// socket is not actually ready, then the closure should return a
+    /// `WouldBlock` error and the readiness flag is cleared. The return value
+    /// of the closure is then returned by `try_io`.
+    ///
+    /// If the socket is not ready, then the closure is not called
+    /// and a `WouldBlock` error is returned.
+    ///
+    /// The closure should only return a `WouldBlock` error if it has performed
+    /// an IO operation on the socket that failed due to the socket not being
+    /// ready. Returning a `WouldBlock` error in any other situation will
+    /// incorrectly clear the readiness flag, which can cause the socket to
+    /// behave incorrectly.
+    ///
+    /// The closure should not perform the IO operation using any of the methods
+    /// defined on the Tokio `UnixStream` type, as this will mess with the
+    /// readiness flag and can cause the socket to behave incorrectly.
+    ///
+    /// Usually, [`readable()`], [`writable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: UnixStream::readable()
+    /// [`writable()`]: UnixStream::writable()
+    /// [`ready()`]: UnixStream::ready()
+    pub fn try_io<R>(
+        &self,
+        interest: Interest,
+        f: impl FnOnce() -> io::Result<R>,
+    ) -> io::Result<R> {
+        self.io.registration().try_io(interest, f)
+    }
+
+    /// Creates new `UnixStream` from a `std::os::unix::net::UnixStream`.
+    ///
+    /// This function is intended to be used to wrap a UnixStream from the
+    /// standard library in the Tokio equivalent. The conversion assumes
+    /// nothing about the underlying stream; it is left up to the user to set
+    /// it in non-blocking mode.
     ///
     /// # Panics
     ///
@@ -55,40 +701,85 @@
     ///
     /// The runtime is usually set implicitly when this function is called
     /// from a future driven by a tokio runtime, otherwise runtime can be set
-    /// explicitly with [`Handle::enter`](crate::runtime::Handle::enter) function.
+    /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
     pub fn from_std(stream: net::UnixStream) -> io::Result<UnixStream> {
-        let stream = mio_uds::UnixStream::from_stream(stream)?;
+        let stream = mio::net::UnixStream::from_std(stream);
         let io = PollEvented::new(stream)?;
 
         Ok(UnixStream { io })
     }
 
+    /// Turn a [`tokio::net::UnixStream`] into a [`std::os::unix::net::UnixStream`].
+    ///
+    /// The returned [`std::os::unix::net::UnixStream`] will have nonblocking
+    /// mode set as `true`.  Use [`set_nonblocking`] to change the blocking
+    /// mode if needed.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::error::Error;
+    /// use std::io::Read;
+    /// use tokio::net::UnixListener;
+    /// # use tokio::net::UnixStream;
+    /// # use tokio::io::AsyncWriteExt;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let dir = tempfile::tempdir().unwrap();
+    ///     let bind_path = dir.path().join("bind_path");
+    ///
+    ///     let mut data = [0u8; 12];
+    ///     let listener = UnixListener::bind(&bind_path)?;
+    /// #   let handle = tokio::spawn(async {
+    /// #       let mut stream = UnixStream::connect(bind_path).await.unwrap();
+    /// #       stream.write(b"Hello world!").await.unwrap();
+    /// #   });
+    ///     let (tokio_unix_stream, _) = listener.accept().await?;
+    ///     let mut std_unix_stream = tokio_unix_stream.into_std()?;
+    /// #   handle.await.expect("The task being joined has panicked");
+    ///     std_unix_stream.set_nonblocking(false)?;
+    ///     std_unix_stream.read_exact(&mut data)?;
+    /// #   assert_eq!(b"Hello world!", &data);
+    ///     Ok(())
+    /// }
+    /// ```
+    /// [`tokio::net::UnixStream`]: UnixStream
+    /// [`std::os::unix::net::UnixStream`]: std::os::unix::net::UnixStream
+    /// [`set_nonblocking`]: fn@std::os::unix::net::UnixStream::set_nonblocking
+    pub fn into_std(self) -> io::Result<std::os::unix::net::UnixStream> {
+        self.io
+            .into_inner()
+            .map(|io| io.into_raw_fd())
+            .map(|raw_fd| unsafe { std::os::unix::net::UnixStream::from_raw_fd(raw_fd) })
+    }
+
     /// Creates an unnamed pair of connected sockets.
     ///
     /// This function will create a pair of interconnected Unix sockets for
     /// communicating back and forth between one another. Each socket will
     /// be associated with the default event loop's handle.
     pub fn pair() -> io::Result<(UnixStream, UnixStream)> {
-        let (a, b) = mio_uds::UnixStream::pair()?;
+        let (a, b) = mio::net::UnixStream::pair()?;
         let a = UnixStream::new(a)?;
         let b = UnixStream::new(b)?;
 
         Ok((a, b))
     }
 
-    pub(crate) fn new(stream: mio_uds::UnixStream) -> io::Result<UnixStream> {
+    pub(crate) fn new(stream: mio::net::UnixStream) -> io::Result<UnixStream> {
         let io = PollEvented::new(stream)?;
         Ok(UnixStream { io })
     }
 
     /// Returns the socket address of the local half of this connection.
     pub fn local_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().local_addr()
+        self.io.local_addr().map(SocketAddr)
     }
 
     /// Returns the socket address of the remote half of this connection.
     pub fn peer_addr(&self) -> io::Result<SocketAddr> {
-        self.io.get_ref().peer_addr()
+        self.io.peer_addr().map(SocketAddr)
     }
 
     /// Returns effective credentials of the process which called `connect` or `pair`.
@@ -98,7 +789,7 @@
 
     /// Returns the value of the `SO_ERROR` option.
     pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        self.io.get_ref().take_error()
+        self.io.take_error()
     }
 
     /// Shuts down the read, write, or both halves of this connection.
@@ -106,8 +797,8 @@
     /// This function will cause all pending and future I/O calls on the
     /// specified portions to immediately return with an appropriate value
     /// (see the documentation of `Shutdown`).
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        self.io.get_ref().shutdown(how)
+    pub(super) fn shutdown_std(&self, how: Shutdown) -> io::Result<()> {
+        self.io.shutdown(how)
     }
 
     // These lifetime markers also appear in the generated documentation, and make
@@ -131,29 +822,15 @@
     /// this comes at the cost of a heap allocation.
     ///
     /// **Note:** Dropping the write half will shut down the write half of the
-    /// stream. This is equivalent to calling [`shutdown(Write)`] on the `UnixStream`.
+    /// stream. This is equivalent to calling [`shutdown()`] on the `UnixStream`.
     ///
     /// [`split`]: Self::split()
-    /// [`shutdown(Write)`]: fn@Self::shutdown
+    /// [`shutdown()`]: fn@crate::io::AsyncWriteExt::shutdown
     pub fn into_split(self) -> (OwnedReadHalf, OwnedWriteHalf) {
         split_owned(self)
     }
 }
 
-impl TryFrom<UnixStream> for mio_uds::UnixStream {
-    type Error = io::Error;
-
-    /// Consumes value, returning the mio I/O object.
-    ///
-    /// See [`PollEvented::into_inner`] for more details about
-    /// resource deregistration that happens during the call.
-    ///
-    /// [`PollEvented::into_inner`]: crate::io::PollEvented::into_inner
-    fn try_from(value: UnixStream) -> Result<Self, Self::Error> {
-        value.io.into_inner()
-    }
-}
-
 impl TryFrom<net::UnixStream> for UnixStream {
     type Error = io::Error;
 
@@ -167,15 +844,11 @@
 }
 
 impl AsyncRead for UnixStream {
-    unsafe fn prepare_uninitialized_buffer(&self, _: &mut [MaybeUninit<u8>]) -> bool {
-        false
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         self.poll_read_priv(cx, buf)
     }
 }
@@ -189,12 +862,24 @@
         self.poll_write_priv(cx, buf)
     }
 
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[io::IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        self.poll_write_vectored_priv(cx, bufs)
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        true
+    }
+
     fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
         Poll::Ready(Ok(()))
     }
 
     fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
-        self.shutdown(std::net::Shutdown::Write)?;
+        self.shutdown_std(std::net::Shutdown::Write)?;
         Poll::Ready(Ok(()))
     }
 }
@@ -202,29 +887,17 @@
 impl UnixStream {
     // == Poll IO functions that takes `&self` ==
     //
-    // They are not public because (taken from the doc of `PollEvented`):
-    //
-    // While `PollEvented` is `Sync` (if the underlying I/O type is `Sync`), the
-    // caller must ensure that there are at most two tasks that use a
-    // `PollEvented` instance concurrently. One for reading and one for writing.
-    // While violating this requirement is "safe" from a Rust memory model point
-    // of view, it will result in unexpected behavior in the form of lost
-    // notifications and tasks hanging.
+    // To read or write without mutable access to the `UnixStream`, combine the
+    // `poll_read_ready` or `poll_write_ready` methods with the `try_read` or
+    // `try_write` methods.
 
     pub(crate) fn poll_read_priv(
         &self,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
-
-        match self.io.get_ref().read(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_read_ready(cx, mio::Ready::readable())?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        // Safety: `UnixStream::read` correctly handles reads into uninitialized memory
+        unsafe { self.io.poll_read(cx, buf) }
     }
 
     pub(crate) fn poll_write_priv(
@@ -232,26 +905,26 @@
         cx: &mut Context<'_>,
         buf: &[u8],
     ) -> Poll<io::Result<usize>> {
-        ready!(self.io.poll_write_ready(cx))?;
+        self.io.poll_write(cx, buf)
+    }
 
-        match self.io.get_ref().write(buf) {
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
-                self.io.clear_write_ready(cx)?;
-                Poll::Pending
-            }
-            x => Poll::Ready(x),
-        }
+    pub(super) fn poll_write_vectored_priv(
+        &self,
+        cx: &mut Context<'_>,
+        bufs: &[io::IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        self.io.poll_write_vectored(cx, bufs)
     }
 }
 
 impl fmt::Debug for UnixStream {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.io.get_ref().fmt(f)
+        self.io.fmt(f)
     }
 }
 
 impl AsRawFd for UnixStream {
     fn as_raw_fd(&self) -> RawFd {
-        self.io.get_ref().as_raw_fd()
+        self.io.as_raw_fd()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/ucred.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/ucred.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/unix/ucred.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/unix/ucred.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,37 +1,61 @@
-use libc::{gid_t, uid_t};
+use libc::{gid_t, pid_t, uid_t};
 
 /// Credentials of a process
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
 pub struct UCred {
+    /// PID (process ID) of the process
+    pid: Option<pid_t>,
     /// UID (user ID) of the process
-    pub uid: uid_t,
+    uid: uid_t,
     /// GID (group ID) of the process
-    pub gid: gid_t,
+    gid: gid_t,
 }
 
-#[cfg(any(target_os = "linux", target_os = "android"))]
+impl UCred {
+    /// Gets UID (user ID) of the process.
+    pub fn uid(&self) -> uid_t {
+        self.uid
+    }
+
+    /// Gets GID (group ID) of the process.
+    pub fn gid(&self) -> gid_t {
+        self.gid
+    }
+
+    /// Gets PID (process ID) of the process.
+    ///
+    /// This is only implemented under Linux, Android, iOS, macOS, Solaris and
+    /// Illumos. On other platforms this will always return `None`.
+    pub fn pid(&self) -> Option<pid_t> {
+        self.pid
+    }
+}
+
+#[cfg(any(target_os = "linux", target_os = "android", target_os = "openbsd"))]
 pub(crate) use self::impl_linux::get_peer_cred;
 
-#[cfg(any(
-    target_os = "dragonfly",
-    target_os = "macos",
-    target_os = "ios",
-    target_os = "freebsd",
-    target_os = "netbsd",
-    target_os = "openbsd"
-))]
+#[cfg(any(target_os = "netbsd"))]
+pub(crate) use self::impl_netbsd::get_peer_cred;
+
+#[cfg(any(target_os = "dragonfly", target_os = "freebsd"))]
+pub(crate) use self::impl_bsd::get_peer_cred;
+
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 pub(crate) use self::impl_macos::get_peer_cred;
 
 #[cfg(any(target_os = "solaris", target_os = "illumos"))]
 pub(crate) use self::impl_solaris::get_peer_cred;
 
-#[cfg(any(target_os = "linux", target_os = "android"))]
+#[cfg(any(target_os = "linux", target_os = "android", target_os = "openbsd"))]
 pub(crate) mod impl_linux {
     use crate::net::unix::UnixStream;
 
     use libc::{c_void, getsockopt, socklen_t, SOL_SOCKET, SO_PEERCRED};
     use std::{io, mem};
 
+    #[cfg(target_os = "openbsd")]
+    use libc::sockpeercred as ucred;
+    #[cfg(any(target_os = "linux", target_os = "android"))]
     use libc::ucred;
 
     pub(crate) fn get_peer_cred(sock: &UnixStream) -> io::Result<super::UCred> {
@@ -50,7 +74,7 @@
 
             // These paranoid checks should be optimized-out
             assert!(mem::size_of::<u32>() <= mem::size_of::<usize>());
-            assert!(ucred_size <= u32::max_value() as usize);
+            assert!(ucred_size <= u32::MAX as usize);
 
             let mut ucred_size = ucred_size as socklen_t;
 
@@ -65,6 +89,7 @@
                 Ok(super::UCred {
                     uid: ucred.uid,
                     gid: ucred.gid,
+                    pid: Some(ucred.pid),
                 })
             } else {
                 Err(io::Error::last_os_error())
@@ -73,15 +98,50 @@
     }
 }
 
-#[cfg(any(
-    target_os = "dragonfly",
-    target_os = "macos",
-    target_os = "ios",
-    target_os = "freebsd",
-    target_os = "netbsd",
-    target_os = "openbsd"
-))]
-pub(crate) mod impl_macos {
+#[cfg(any(target_os = "netbsd"))]
+pub(crate) mod impl_netbsd {
+    use crate::net::unix::UnixStream;
+
+    use libc::{c_void, getsockopt, socklen_t, unpcbid, LOCAL_PEEREID, SOL_SOCKET};
+    use std::io;
+    use std::mem::size_of;
+    use std::os::unix::io::AsRawFd;
+
+    pub(crate) fn get_peer_cred(sock: &UnixStream) -> io::Result<super::UCred> {
+        unsafe {
+            let raw_fd = sock.as_raw_fd();
+
+            let mut unpcbid = unpcbid {
+                unp_pid: 0,
+                unp_euid: 0,
+                unp_egid: 0,
+            };
+
+            let unpcbid_size = size_of::<unpcbid>();
+            let mut unpcbid_size = unpcbid_size as socklen_t;
+
+            let ret = getsockopt(
+                raw_fd,
+                SOL_SOCKET,
+                LOCAL_PEEREID,
+                &mut unpcbid as *mut unpcbid as *mut c_void,
+                &mut unpcbid_size,
+            );
+            if ret == 0 && unpcbid_size as usize == size_of::<unpcbid>() {
+                Ok(super::UCred {
+                    uid: unpcbid.unp_euid,
+                    gid: unpcbid.unp_egid,
+                    pid: Some(unpcbid.unp_pid),
+                })
+            } else {
+                Err(io::Error::last_os_error())
+            }
+        }
+    }
+}
+
+#[cfg(any(target_os = "dragonfly", target_os = "freebsd"))]
+pub(crate) mod impl_bsd {
     use crate::net::unix::UnixStream;
 
     use libc::getpeereid;
@@ -102,6 +162,7 @@
                 Ok(super::UCred {
                     uid: uid.assume_init(),
                     gid: gid.assume_init(),
+                    pid: None,
                 })
             } else {
                 Err(io::Error::last_os_error())
@@ -110,39 +171,79 @@
     }
 }
 
-#[cfg(any(target_os = "solaris", target_os = "illumos"))]
-pub(crate) mod impl_solaris {
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+pub(crate) mod impl_macos {
     use crate::net::unix::UnixStream;
+
+    use libc::{c_void, getpeereid, getsockopt, pid_t, LOCAL_PEEREPID, SOL_LOCAL};
     use std::io;
+    use std::mem::size_of;
+    use std::mem::MaybeUninit;
     use std::os::unix::io::AsRawFd;
-    use std::ptr;
 
-    #[allow(non_camel_case_types)]
-    enum ucred_t {}
+    pub(crate) fn get_peer_cred(sock: &UnixStream) -> io::Result<super::UCred> {
+        unsafe {
+            let raw_fd = sock.as_raw_fd();
+
+            let mut uid = MaybeUninit::uninit();
+            let mut gid = MaybeUninit::uninit();
+            let mut pid: MaybeUninit<pid_t> = MaybeUninit::uninit();
+            let mut pid_size: MaybeUninit<u32> = MaybeUninit::new(size_of::<pid_t>() as u32);
+
+            if getsockopt(
+                raw_fd,
+                SOL_LOCAL,
+                LOCAL_PEEREPID,
+                pid.as_mut_ptr() as *mut c_void,
+                pid_size.as_mut_ptr(),
+            ) != 0
+            {
+                return Err(io::Error::last_os_error());
+            }
 
-    extern "C" {
-        fn ucred_free(cred: *mut ucred_t);
-        fn ucred_geteuid(cred: *const ucred_t) -> super::uid_t;
-        fn ucred_getegid(cred: *const ucred_t) -> super::gid_t;
+            assert!(pid_size.assume_init() == (size_of::<pid_t>() as u32));
 
-        fn getpeerucred(fd: std::os::raw::c_int, cred: *mut *mut ucred_t) -> std::os::raw::c_int;
+            let ret = getpeereid(raw_fd, uid.as_mut_ptr(), gid.as_mut_ptr());
+
+            if ret == 0 {
+                Ok(super::UCred {
+                    uid: uid.assume_init(),
+                    gid: gid.assume_init(),
+                    pid: Some(pid.assume_init()),
+                })
+            } else {
+                Err(io::Error::last_os_error())
+            }
+        }
     }
+}
+
+#[cfg(any(target_os = "solaris", target_os = "illumos"))]
+pub(crate) mod impl_solaris {
+    use crate::net::unix::UnixStream;
+    use std::io;
+    use std::os::unix::io::AsRawFd;
+    use std::ptr;
 
     pub(crate) fn get_peer_cred(sock: &UnixStream) -> io::Result<super::UCred> {
         unsafe {
             let raw_fd = sock.as_raw_fd();
 
-            let mut cred = ptr::null_mut::<*mut ucred_t>() as *mut ucred_t;
-
-            let ret = getpeerucred(raw_fd, &mut cred);
+            let mut cred = ptr::null_mut();
+            let ret = libc::getpeerucred(raw_fd, &mut cred);
 
             if ret == 0 {
-                let uid = ucred_geteuid(cred);
-                let gid = ucred_getegid(cred);
+                let uid = libc::ucred_geteuid(cred);
+                let gid = libc::ucred_getegid(cred);
+                let pid = libc::ucred_getpid(cred);
 
-                ucred_free(cred);
+                libc::ucred_free(cred);
 
-                Ok(super::UCred { uid, gid })
+                Ok(super::UCred {
+                    uid,
+                    gid,
+                    pid: Some(pid),
+                })
             } else {
                 Err(io::Error::last_os_error())
             }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/windows/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/windows/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/windows/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/windows/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,3 @@
+//! Windows specific network types.
+
+pub mod named_pipe;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/windows/named_pipe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/windows/named_pipe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/net/windows/named_pipe.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/net/windows/named_pipe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2250 @@
+//! Tokio support for [Windows named pipes].
+//!
+//! [Windows named pipes]: https://docs.microsoft.com/en-us/windows/win32/ipc/named-pipes
+
+use std::ffi::c_void;
+use std::ffi::OsStr;
+use std::io::{self, Read, Write};
+use std::pin::Pin;
+use std::ptr;
+use std::task::{Context, Poll};
+
+use crate::io::{AsyncRead, AsyncWrite, Interest, PollEvented, ReadBuf, Ready};
+use crate::os::windows::io::{AsRawHandle, FromRawHandle, RawHandle};
+
+// Hide imports which are not used when generating documentation.
+#[cfg(not(docsrs))]
+mod doc {
+    pub(super) use crate::os::windows::ffi::OsStrExt;
+    pub(super) use crate::winapi::shared::minwindef::{DWORD, FALSE};
+    pub(super) use crate::winapi::um::fileapi;
+    pub(super) use crate::winapi::um::handleapi;
+    pub(super) use crate::winapi::um::namedpipeapi;
+    pub(super) use crate::winapi::um::winbase;
+    pub(super) use crate::winapi::um::winnt;
+
+    pub(super) use mio::windows as mio_windows;
+}
+
+// NB: none of these shows up in public API, so don't document them.
+#[cfg(docsrs)]
+mod doc {
+    pub type DWORD = crate::doc::NotDefinedHere;
+
+    pub(super) mod mio_windows {
+        pub type NamedPipe = crate::doc::NotDefinedHere;
+    }
+}
+
+use self::doc::*;
+
+/// A [Windows named pipe] server.
+///
+/// Accepting client connections involves creating a server with
+/// [`ServerOptions::create`] and waiting for clients to connect using
+/// [`NamedPipeServer::connect`].
+///
+/// To avoid having clients sporadically fail with
+/// [`std::io::ErrorKind::NotFound`] when they connect to a server, we must
+/// ensure that at least one server instance is available at all times. This
+/// means that the typical listen loop for a server is a bit involved, because
+/// we have to ensure that we never drop a server accidentally while a client
+/// might connect.
+///
+/// So a correctly implemented server looks like this:
+///
+/// ```no_run
+/// use std::io;
+/// use tokio::net::windows::named_pipe::ServerOptions;
+///
+/// const PIPE_NAME: &str = r"\\.\pipe\named-pipe-idiomatic-server";
+///
+/// # #[tokio::main] async fn main() -> std::io::Result<()> {
+/// // The first server needs to be constructed early so that clients can
+/// // be correctly connected. Otherwise calling .wait will cause the client to
+/// // error.
+/// //
+/// // Here we also make use of `first_pipe_instance`, which will ensure that
+/// // there are no other servers up and running already.
+/// let mut server = ServerOptions::new()
+///     .first_pipe_instance(true)
+///     .create(PIPE_NAME)?;
+///
+/// // Spawn the server loop.
+/// let server = tokio::spawn(async move {
+///     loop {
+///         // Wait for a client to connect.
+///         let connected = server.connect().await?;
+///
+///         // Construct the next server to be connected before sending the one
+///         // we already have of onto a task. This ensures that the server
+///         // isn't closed (after it's done in the task) before a new one is
+///         // available. Otherwise the client might error with
+///         // `io::ErrorKind::NotFound`.
+///         server = ServerOptions::new().create(PIPE_NAME)?;
+///
+///         let client = tokio::spawn(async move {
+///             /* use the connected client */
+/// #           Ok::<_, std::io::Error>(())
+///         });
+/// #       if true { break } // needed for type inference to work
+///     }
+///
+///     Ok::<_, io::Error>(())
+/// });
+///
+/// /* do something else not server related here */
+/// # Ok(()) }
+/// ```
+///
+/// [`ERROR_PIPE_BUSY`]: crate::winapi::shared::winerror::ERROR_PIPE_BUSY
+/// [Windows named pipe]: https://docs.microsoft.com/en-us/windows/win32/ipc/named-pipes
+#[derive(Debug)]
+pub struct NamedPipeServer {
+    io: PollEvented<mio_windows::NamedPipe>,
+}
+
+impl NamedPipeServer {
+    /// Construct a new named pipe server from the specified raw handle.
+    ///
+    /// This function will consume ownership of the handle given, passing
+    /// responsibility for closing the handle to the returned object.
+    ///
+    /// This function is also unsafe as the primitives currently returned have
+    /// the contract that they are the sole owner of the file descriptor they
+    /// are wrapping. Usage of this function could accidentally allow violating
+    /// this contract which can cause memory unsafety in code that relies on it
+    /// being true.
+    ///
+    /// # Errors
+    ///
+    /// This errors if called outside of a [Tokio Runtime], or in a runtime that
+    /// has not [enabled I/O], or if any OS-specific I/O errors occur.
+    ///
+    /// [Tokio Runtime]: crate::runtime::Runtime
+    /// [enabled I/O]: crate::runtime::Builder::enable_io
+    pub unsafe fn from_raw_handle(handle: RawHandle) -> io::Result<Self> {
+        let named_pipe = mio_windows::NamedPipe::from_raw_handle(handle);
+
+        Ok(Self {
+            io: PollEvented::new(named_pipe)?,
+        })
+    }
+
+    /// Retrieves information about the named pipe the server is associated
+    /// with.
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe::{PipeEnd, PipeMode, ServerOptions};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-server-info";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let server = ServerOptions::new()
+    ///     .pipe_mode(PipeMode::Message)
+    ///     .max_instances(5)
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// let server_info = server.info()?;
+    ///
+    /// assert_eq!(server_info.end, PipeEnd::Server);
+    /// assert_eq!(server_info.mode, PipeMode::Message);
+    /// assert_eq!(server_info.max_instances, 5);
+    /// # Ok(()) }
+    /// ```
+    pub fn info(&self) -> io::Result<PipeInfo> {
+        // Safety: we're ensuring the lifetime of the named pipe.
+        unsafe { named_pipe_info(self.io.as_raw_handle()) }
+    }
+
+    /// Enables a named pipe server process to wait for a client process to
+    /// connect to an instance of a named pipe. A client process connects by
+    /// creating a named pipe with the same name.
+    ///
+    /// This corresponds to the [`ConnectNamedPipe`] system call.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancellation safe in the sense that if it is used as the
+    /// event in a [`select!`](crate::select) statement and some other branch
+    /// completes first, then no connection events have been lost.
+    ///
+    /// [`ConnectNamedPipe`]: https://docs.microsoft.com/en-us/windows/win32/api/namedpipeapi/nf-namedpipeapi-connectnamedpipe
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe::ServerOptions;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\mynamedpipe";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let pipe = ServerOptions::new().create(PIPE_NAME)?;
+    ///
+    /// // Wait for a client to connect.
+    /// pipe.connect().await?;
+    ///
+    /// // Use the connected client...
+    /// # Ok(()) }
+    /// ```
+    pub async fn connect(&self) -> io::Result<()> {
+        loop {
+            match self.io.connect() {
+                Ok(()) => break,
+                Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+                    self.io.registration().readiness(Interest::WRITABLE).await?;
+                }
+                Err(e) => return Err(e),
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Disconnects the server end of a named pipe instance from a client
+    /// process.
+    ///
+    /// ```
+    /// use tokio::io::AsyncWriteExt;
+    /// use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions};
+    /// use winapi::shared::winerror;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-disconnect";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let server = ServerOptions::new()
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// let mut client = ClientOptions::new()
+    ///     .open(PIPE_NAME)?;
+    ///
+    /// // Wait for a client to become connected.
+    /// server.connect().await?;
+    ///
+    /// // Forcibly disconnect the client.
+    /// server.disconnect()?;
+    ///
+    /// // Write fails with an OS-specific error after client has been
+    /// // disconnected.
+    /// let e = client.write(b"ping").await.unwrap_err();
+    /// assert_eq!(e.raw_os_error(), Some(winerror::ERROR_PIPE_NOT_CONNECTED as i32));
+    /// # Ok(()) }
+    /// ```
+    pub fn disconnect(&self) -> io::Result<()> {
+        self.io.disconnect()
+    }
+
+    /// Wait for any of the requested ready states.
+    ///
+    /// This function is usually paired with `try_read()` or `try_write()`. It
+    /// can be used to concurrently read / write to the same pipe on a single
+    /// task without splitting the pipe.
+    ///
+    /// # Examples
+    ///
+    /// Concurrently read and write to the pipe on the same task without
+    /// splitting.
+    ///
+    /// ```no_run
+    /// use tokio::io::Interest;
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-server-ready";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let server = named_pipe::ServerOptions::new()
+    ///         .create(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         let ready = server.ready(Interest::READABLE | Interest::WRITABLE).await?;
+    ///
+    ///         if ready.is_readable() {
+    ///             let mut data = vec![0; 1024];
+    ///             // Try to read data, this may still fail with `WouldBlock`
+    ///             // if the readiness event is a false positive.
+    ///             match server.try_read(&mut data) {
+    ///                 Ok(n) => {
+    ///                     println!("read {} bytes", n);
+    ///                 }
+    ///                 Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                     continue;
+    ///                 }
+    ///                 Err(e) => {
+    ///                     return Err(e.into());
+    ///                 }
+    ///             }
+    ///         }
+    ///
+    ///         if ready.is_writable() {
+    ///             // Try to write data, this may still fail with `WouldBlock`
+    ///             // if the readiness event is a false positive.
+    ///             match server.try_write(b"hello world") {
+    ///                 Ok(n) => {
+    ///                     println!("write {} bytes", n);
+    ///                 }
+    ///                 Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                     continue;
+    ///                 }
+    ///                 Err(e) => {
+    ///                     return Err(e.into());
+    ///                 }
+    ///             }
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    pub async fn ready(&self, interest: Interest) -> io::Result<Ready> {
+        let event = self.io.registration().readiness(interest).await?;
+        Ok(event.ready)
+    }
+
+    /// Wait for the pipe to become readable.
+    ///
+    /// This function is equivalent to `ready(Interest::READABLE)` and is usually
+    /// paired with `try_read()`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-server-readable";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let server = named_pipe::ServerOptions::new()
+    ///         .create(PIPE_NAME)?;
+    ///
+    ///     let mut msg = vec![0; 1024];
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be readable
+    ///         server.readable().await?;
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match server.try_read(&mut msg) {
+    ///             Ok(n) => {
+    ///                 msg.truncate(n);
+    ///                 break;
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     println!("GOT = {:?}", msg);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn readable(&self) -> io::Result<()> {
+        self.ready(Interest::READABLE).await?;
+        Ok(())
+    }
+
+    /// Polls for read readiness.
+    ///
+    /// If the pipe is not currently ready for reading, this method will
+    /// store a clone of the `Waker` from the provided `Context`. When the pipe
+    /// becomes ready for reading, `Waker::wake` will be called on the waker.
+    ///
+    /// Note that on multiple calls to `poll_read_ready` or `poll_read`, only
+    /// the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup. (However, `poll_write_ready` retains a
+    /// second, independent waker.)
+    ///
+    /// This function is intended for cases where creating and pinning a future
+    /// via [`readable`] is not feasible. Where possible, using [`readable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the pipe is not ready for reading.
+    /// * `Poll::Ready(Ok(()))` if the pipe is ready for reading.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`readable`]: method@Self::readable
+    pub fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.io.registration().poll_read_ready(cx).map_ok(|_| ())
+    }
+
+    /// Try to read data from the pipe into the provided buffer, returning how
+    /// many bytes were read.
+    ///
+    /// Receives any pending data from the pipe but does not wait for new data
+    /// to arrive. On success, returns the number of bytes read. Because
+    /// `try_read()` is non-blocking, the buffer does not have to be stored by
+    /// the async task and can exist entirely on the stack.
+    ///
+    /// Usually, [`readable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: NamedPipeServer::readable()
+    /// [`ready()`]: NamedPipeServer::ready()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+    /// number of bytes read. `Ok(0)` indicates the pipe's read half is closed
+    /// and will no longer yield data. If the pipe is not ready to read data
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-server-try-read";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let server = named_pipe::ServerOptions::new()
+    ///         .create(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be readable
+    ///         server.readable().await?;
+    ///
+    ///         // Creating the buffer **after** the `await` prevents it from
+    ///         // being stored in the async task.
+    ///         let mut buf = [0; 4096];
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match server.try_read(&mut buf) {
+    ///             Ok(0) => break,
+    ///             Ok(n) => {
+    ///                 println!("read {} bytes", n);
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_read(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || (&*self.io).read(buf))
+    }
+
+    /// Try to read data from the pipe into the provided buffers, returning
+    /// how many bytes were read.
+    ///
+    /// Data is copied to fill each buffer in order, with the final buffer
+    /// written to possibly being only partially filled. This method behaves
+    /// equivalently to a single call to [`try_read()`] with concatenated
+    /// buffers.
+    ///
+    /// Receives any pending data from the pipe but does not wait for new data
+    /// to arrive. On success, returns the number of bytes read. Because
+    /// `try_read_vectored()` is non-blocking, the buffer does not have to be
+    /// stored by the async task and can exist entirely on the stack.
+    ///
+    /// Usually, [`readable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`try_read()`]: NamedPipeServer::try_read()
+    /// [`readable()`]: NamedPipeServer::readable()
+    /// [`ready()`]: NamedPipeServer::ready()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+    /// number of bytes read. `Ok(0)` indicates the pipe's read half is closed
+    /// and will no longer yield data. If the pipe is not ready to read data
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io::{self, IoSliceMut};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-server-try-read-vectored";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let server = named_pipe::ServerOptions::new()
+    ///         .create(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be readable
+    ///         server.readable().await?;
+    ///
+    ///         // Creating the buffer **after** the `await` prevents it from
+    ///         // being stored in the async task.
+    ///         let mut buf_a = [0; 512];
+    ///         let mut buf_b = [0; 1024];
+    ///         let mut bufs = [
+    ///             IoSliceMut::new(&mut buf_a),
+    ///             IoSliceMut::new(&mut buf_b),
+    ///         ];
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match server.try_read_vectored(&mut bufs) {
+    ///             Ok(0) => break,
+    ///             Ok(n) => {
+    ///                 println!("read {} bytes", n);
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_read_vectored(&self, bufs: &mut [io::IoSliceMut<'_>]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || (&*self.io).read_vectored(bufs))
+    }
+
+    /// Wait for the pipe to become writable.
+    ///
+    /// This function is equivalent to `ready(Interest::WRITABLE)` and is usually
+    /// paired with `try_write()`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-server-writable";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let server = named_pipe::ServerOptions::new()
+    ///         .create(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be writable
+    ///         server.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match server.try_write(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn writable(&self) -> io::Result<()> {
+        self.ready(Interest::WRITABLE).await?;
+        Ok(())
+    }
+
+    /// Polls for write readiness.
+    ///
+    /// If the pipe is not currently ready for writing, this method will
+    /// store a clone of the `Waker` from the provided `Context`. When the pipe
+    /// becomes ready for writing, `Waker::wake` will be called on the waker.
+    ///
+    /// Note that on multiple calls to `poll_write_ready` or `poll_write`, only
+    /// the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup. (However, `poll_read_ready` retains a
+    /// second, independent waker.)
+    ///
+    /// This function is intended for cases where creating and pinning a future
+    /// via [`writable`] is not feasible. Where possible, using [`writable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the pipe is not ready for writing.
+    /// * `Poll::Ready(Ok(()))` if the pipe is ready for writing.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`writable`]: method@Self::writable
+    pub fn poll_write_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.io.registration().poll_write_ready(cx).map_ok(|_| ())
+    }
+
+    /// Try to write a buffer to the pipe, returning how many bytes were
+    /// written.
+    ///
+    /// The function will attempt to write the entire contents of `buf`, but
+    /// only part of the buffer may be written.
+    ///
+    /// This function is usually paired with `writable()`.
+    ///
+    /// # Return
+    ///
+    /// If data is successfully written, `Ok(n)` is returned, where `n` is the
+    /// number of bytes written. If the pipe is not ready to write data,
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-server-try-write";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let server = named_pipe::ServerOptions::new()
+    ///         .create(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be writable
+    ///         server.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match server.try_write(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_write(&self, buf: &[u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || (&*self.io).write(buf))
+    }
+
+    /// Try to write several buffers to the pipe, returning how many bytes
+    /// were written.
+    ///
+    /// Data is written from each buffer in order, with the final buffer read
+    /// from possible being only partially consumed. This method behaves
+    /// equivalently to a single call to [`try_write()`] with concatenated
+    /// buffers.
+    ///
+    /// This function is usually paired with `writable()`.
+    ///
+    /// [`try_write()`]: NamedPipeServer::try_write()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully written, `Ok(n)` is returned, where `n` is the
+    /// number of bytes written. If the pipe is not ready to write data,
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-server-try-write-vectored";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let server = named_pipe::ServerOptions::new()
+    ///         .create(PIPE_NAME)?;
+    ///
+    ///     let bufs = [io::IoSlice::new(b"hello "), io::IoSlice::new(b"world")];
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be writable
+    ///         server.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match server.try_write_vectored(&bufs) {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_write_vectored(&self, buf: &[io::IoSlice<'_>]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || (&*self.io).write_vectored(buf))
+    }
+
+    /// Try to read or write from the socket using a user-provided IO operation.
+    ///
+    /// If the socket is ready, the provided closure is called. The closure
+    /// should attempt to perform IO operation from the socket by manually
+    /// calling the appropriate syscall. If the operation fails because the
+    /// socket is not actually ready, then the closure should return a
+    /// `WouldBlock` error and the readiness flag is cleared. The return value
+    /// of the closure is then returned by `try_io`.
+    ///
+    /// If the socket is not ready, then the closure is not called
+    /// and a `WouldBlock` error is returned.
+    ///
+    /// The closure should only return a `WouldBlock` error if it has performed
+    /// an IO operation on the socket that failed due to the socket not being
+    /// ready. Returning a `WouldBlock` error in any other situation will
+    /// incorrectly clear the readiness flag, which can cause the socket to
+    /// behave incorrectly.
+    ///
+    /// The closure should not perform the IO operation using any of the
+    /// methods defined on the Tokio `NamedPipeServer` type, as this will mess with
+    /// the readiness flag and can cause the socket to behave incorrectly.
+    ///
+    /// Usually, [`readable()`], [`writable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: NamedPipeServer::readable()
+    /// [`writable()`]: NamedPipeServer::writable()
+    /// [`ready()`]: NamedPipeServer::ready()
+    pub fn try_io<R>(
+        &self,
+        interest: Interest,
+        f: impl FnOnce() -> io::Result<R>,
+    ) -> io::Result<R> {
+        self.io.registration().try_io(interest, f)
+    }
+}
+
+impl AsyncRead for NamedPipeServer {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        unsafe { self.io.poll_read(cx, buf) }
+    }
+}
+
+impl AsyncWrite for NamedPipeServer {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
+        self.io.poll_write(cx, buf)
+    }
+
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[io::IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        self.io.poll_write_vectored(cx, bufs)
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.poll_flush(cx)
+    }
+}
+
+impl AsRawHandle for NamedPipeServer {
+    fn as_raw_handle(&self) -> RawHandle {
+        self.io.as_raw_handle()
+    }
+}
+
+/// A [Windows named pipe] client.
+///
+/// Constructed using [`ClientOptions::open`].
+///
+/// Connecting a client correctly involves a few steps. When connecting through
+/// [`ClientOptions::open`], it might error indicating one of two things:
+///
+/// * [`std::io::ErrorKind::NotFound`] - There is no server available.
+/// * [`ERROR_PIPE_BUSY`] - There is a server available, but it is busy. Sleep
+///   for a while and try again.
+///
+/// So a correctly implemented client looks like this:
+///
+/// ```no_run
+/// use std::time::Duration;
+/// use tokio::net::windows::named_pipe::ClientOptions;
+/// use tokio::time;
+/// use winapi::shared::winerror;
+///
+/// const PIPE_NAME: &str = r"\\.\pipe\named-pipe-idiomatic-client";
+///
+/// # #[tokio::main] async fn main() -> std::io::Result<()> {
+/// let client = loop {
+///     match ClientOptions::new().open(PIPE_NAME) {
+///         Ok(client) => break client,
+///         Err(e) if e.raw_os_error() == Some(winerror::ERROR_PIPE_BUSY as i32) => (),
+///         Err(e) => return Err(e),
+///     }
+///
+///     time::sleep(Duration::from_millis(50)).await;
+/// };
+///
+/// /* use the connected client */
+/// # Ok(()) }
+/// ```
+///
+/// [`ERROR_PIPE_BUSY`]: crate::winapi::shared::winerror::ERROR_PIPE_BUSY
+/// [Windows named pipe]: https://docs.microsoft.com/en-us/windows/win32/ipc/named-pipes
+#[derive(Debug)]
+pub struct NamedPipeClient {
+    io: PollEvented<mio_windows::NamedPipe>,
+}
+
+impl NamedPipeClient {
+    /// Construct a new named pipe client from the specified raw handle.
+    ///
+    /// This function will consume ownership of the handle given, passing
+    /// responsibility for closing the handle to the returned object.
+    ///
+    /// This function is also unsafe as the primitives currently returned have
+    /// the contract that they are the sole owner of the file descriptor they
+    /// are wrapping. Usage of this function could accidentally allow violating
+    /// this contract which can cause memory unsafety in code that relies on it
+    /// being true.
+    ///
+    /// # Errors
+    ///
+    /// This errors if called outside of a [Tokio Runtime], or in a runtime that
+    /// has not [enabled I/O], or if any OS-specific I/O errors occur.
+    ///
+    /// [Tokio Runtime]: crate::runtime::Runtime
+    /// [enabled I/O]: crate::runtime::Builder::enable_io
+    pub unsafe fn from_raw_handle(handle: RawHandle) -> io::Result<Self> {
+        let named_pipe = mio_windows::NamedPipe::from_raw_handle(handle);
+
+        Ok(Self {
+            io: PollEvented::new(named_pipe)?,
+        })
+    }
+
+    /// Retrieves information about the named pipe the client is associated
+    /// with.
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe::{ClientOptions, PipeEnd, PipeMode};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-info";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let client = ClientOptions::new()
+    ///     .open(PIPE_NAME)?;
+    ///
+    /// let client_info = client.info()?;
+    ///
+    /// assert_eq!(client_info.end, PipeEnd::Client);
+    /// assert_eq!(client_info.mode, PipeMode::Message);
+    /// assert_eq!(client_info.max_instances, 5);
+    /// # Ok(()) }
+    /// ```
+    pub fn info(&self) -> io::Result<PipeInfo> {
+        // Safety: we're ensuring the lifetime of the named pipe.
+        unsafe { named_pipe_info(self.io.as_raw_handle()) }
+    }
+
+    /// Wait for any of the requested ready states.
+    ///
+    /// This function is usually paired with `try_read()` or `try_write()`. It
+    /// can be used to concurrently read / write to the same pipe on a single
+    /// task without splitting the pipe.
+    ///
+    /// # Examples
+    ///
+    /// Concurrently read and write to the pipe on the same task without
+    /// splitting.
+    ///
+    /// ```no_run
+    /// use tokio::io::Interest;
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-ready";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let client = named_pipe::ClientOptions::new().open(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         let ready = client.ready(Interest::READABLE | Interest::WRITABLE).await?;
+    ///
+    ///         if ready.is_readable() {
+    ///             let mut data = vec![0; 1024];
+    ///             // Try to read data, this may still fail with `WouldBlock`
+    ///             // if the readiness event is a false positive.
+    ///             match client.try_read(&mut data) {
+    ///                 Ok(n) => {
+    ///                     println!("read {} bytes", n);
+    ///                 }
+    ///                 Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                     continue;
+    ///                 }
+    ///                 Err(e) => {
+    ///                     return Err(e.into());
+    ///                 }
+    ///             }
+    ///         }
+    ///
+    ///         if ready.is_writable() {
+    ///             // Try to write data, this may still fail with `WouldBlock`
+    ///             // if the readiness event is a false positive.
+    ///             match client.try_write(b"hello world") {
+    ///                 Ok(n) => {
+    ///                     println!("write {} bytes", n);
+    ///                 }
+    ///                 Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                     continue;
+    ///                 }
+    ///                 Err(e) => {
+    ///                     return Err(e.into());
+    ///                 }
+    ///             }
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    pub async fn ready(&self, interest: Interest) -> io::Result<Ready> {
+        let event = self.io.registration().readiness(interest).await?;
+        Ok(event.ready)
+    }
+
+    /// Wait for the pipe to become readable.
+    ///
+    /// This function is equivalent to `ready(Interest::READABLE)` and is usually
+    /// paired with `try_read()`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-readable";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let client = named_pipe::ClientOptions::new().open(PIPE_NAME)?;
+    ///
+    ///     let mut msg = vec![0; 1024];
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be readable
+    ///         client.readable().await?;
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match client.try_read(&mut msg) {
+    ///             Ok(n) => {
+    ///                 msg.truncate(n);
+    ///                 break;
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     println!("GOT = {:?}", msg);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn readable(&self) -> io::Result<()> {
+        self.ready(Interest::READABLE).await?;
+        Ok(())
+    }
+
+    /// Polls for read readiness.
+    ///
+    /// If the pipe is not currently ready for reading, this method will
+    /// store a clone of the `Waker` from the provided `Context`. When the pipe
+    /// becomes ready for reading, `Waker::wake` will be called on the waker.
+    ///
+    /// Note that on multiple calls to `poll_read_ready` or `poll_read`, only
+    /// the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup. (However, `poll_write_ready` retains a
+    /// second, independent waker.)
+    ///
+    /// This function is intended for cases where creating and pinning a future
+    /// via [`readable`] is not feasible. Where possible, using [`readable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the pipe is not ready for reading.
+    /// * `Poll::Ready(Ok(()))` if the pipe is ready for reading.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`readable`]: method@Self::readable
+    pub fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.io.registration().poll_read_ready(cx).map_ok(|_| ())
+    }
+
+    /// Try to read data from the pipe into the provided buffer, returning how
+    /// many bytes were read.
+    ///
+    /// Receives any pending data from the pipe but does not wait for new data
+    /// to arrive. On success, returns the number of bytes read. Because
+    /// `try_read()` is non-blocking, the buffer does not have to be stored by
+    /// the async task and can exist entirely on the stack.
+    ///
+    /// Usually, [`readable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: NamedPipeClient::readable()
+    /// [`ready()`]: NamedPipeClient::ready()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+    /// number of bytes read. `Ok(0)` indicates the pipe's read half is closed
+    /// and will no longer yield data. If the pipe is not ready to read data
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-try-read";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let client = named_pipe::ClientOptions::new().open(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be readable
+    ///         client.readable().await?;
+    ///
+    ///         // Creating the buffer **after** the `await` prevents it from
+    ///         // being stored in the async task.
+    ///         let mut buf = [0; 4096];
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match client.try_read(&mut buf) {
+    ///             Ok(0) => break,
+    ///             Ok(n) => {
+    ///                 println!("read {} bytes", n);
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_read(&self, buf: &mut [u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || (&*self.io).read(buf))
+    }
+
+    /// Try to read data from the pipe into the provided buffers, returning
+    /// how many bytes were read.
+    ///
+    /// Data is copied to fill each buffer in order, with the final buffer
+    /// written to possibly being only partially filled. This method behaves
+    /// equivalently to a single call to [`try_read()`] with concatenated
+    /// buffers.
+    ///
+    /// Receives any pending data from the pipe but does not wait for new data
+    /// to arrive. On success, returns the number of bytes read. Because
+    /// `try_read_vectored()` is non-blocking, the buffer does not have to be
+    /// stored by the async task and can exist entirely on the stack.
+    ///
+    /// Usually, [`readable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`try_read()`]: NamedPipeClient::try_read()
+    /// [`readable()`]: NamedPipeClient::readable()
+    /// [`ready()`]: NamedPipeClient::ready()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully read, `Ok(n)` is returned, where `n` is the
+    /// number of bytes read. `Ok(0)` indicates the pipe's read half is closed
+    /// and will no longer yield data. If the pipe is not ready to read data
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io::{self, IoSliceMut};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-try-read-vectored";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let client = named_pipe::ClientOptions::new().open(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be readable
+    ///         client.readable().await?;
+    ///
+    ///         // Creating the buffer **after** the `await` prevents it from
+    ///         // being stored in the async task.
+    ///         let mut buf_a = [0; 512];
+    ///         let mut buf_b = [0; 1024];
+    ///         let mut bufs = [
+    ///             IoSliceMut::new(&mut buf_a),
+    ///             IoSliceMut::new(&mut buf_b),
+    ///         ];
+    ///
+    ///         // Try to read data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match client.try_read_vectored(&mut bufs) {
+    ///             Ok(0) => break,
+    ///             Ok(n) => {
+    ///                 println!("read {} bytes", n);
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_read_vectored(&self, bufs: &mut [io::IoSliceMut<'_>]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::READABLE, || (&*self.io).read_vectored(bufs))
+    }
+
+    /// Wait for the pipe to become writable.
+    ///
+    /// This function is equivalent to `ready(Interest::WRITABLE)` and is usually
+    /// paired with `try_write()`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-writable";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let client = named_pipe::ClientOptions::new().open(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be writable
+    ///         client.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match client.try_write(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn writable(&self) -> io::Result<()> {
+        self.ready(Interest::WRITABLE).await?;
+        Ok(())
+    }
+
+    /// Polls for write readiness.
+    ///
+    /// If the pipe is not currently ready for writing, this method will
+    /// store a clone of the `Waker` from the provided `Context`. When the pipe
+    /// becomes ready for writing, `Waker::wake` will be called on the waker.
+    ///
+    /// Note that on multiple calls to `poll_write_ready` or `poll_write`, only
+    /// the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup. (However, `poll_read_ready` retains a
+    /// second, independent waker.)
+    ///
+    /// This function is intended for cases where creating and pinning a future
+    /// via [`writable`] is not feasible. Where possible, using [`writable`] is
+    /// preferred, as this supports polling from multiple tasks at once.
+    ///
+    /// # Return value
+    ///
+    /// The function returns:
+    ///
+    /// * `Poll::Pending` if the pipe is not ready for writing.
+    /// * `Poll::Ready(Ok(()))` if the pipe is ready for writing.
+    /// * `Poll::Ready(Err(e))` if an error is encountered.
+    ///
+    /// # Errors
+    ///
+    /// This function may encounter any standard I/O error except `WouldBlock`.
+    ///
+    /// [`writable`]: method@Self::writable
+    pub fn poll_write_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.io.registration().poll_write_ready(cx).map_ok(|_| ())
+    }
+
+    /// Try to write a buffer to the pipe, returning how many bytes were
+    /// written.
+    ///
+    /// The function will attempt to write the entire contents of `buf`, but
+    /// only part of the buffer may be written.
+    ///
+    /// This function is usually paired with `writable()`.
+    ///
+    /// # Return
+    ///
+    /// If data is successfully written, `Ok(n)` is returned, where `n` is the
+    /// number of bytes written. If the pipe is not ready to write data,
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-try-write";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let client = named_pipe::ClientOptions::new().open(PIPE_NAME)?;
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be writable
+    ///         client.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match client.try_write(b"hello world") {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_write(&self, buf: &[u8]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || (&*self.io).write(buf))
+    }
+
+    /// Try to write several buffers to the pipe, returning how many bytes
+    /// were written.
+    ///
+    /// Data is written from each buffer in order, with the final buffer read
+    /// from possible being only partially consumed. This method behaves
+    /// equivalently to a single call to [`try_write()`] with concatenated
+    /// buffers.
+    ///
+    /// This function is usually paired with `writable()`.
+    ///
+    /// [`try_write()`]: NamedPipeClient::try_write()
+    ///
+    /// # Return
+    ///
+    /// If data is successfully written, `Ok(n)` is returned, where `n` is the
+    /// number of bytes written. If the pipe is not ready to write data,
+    /// `Err(io::ErrorKind::WouldBlock)` is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tokio::net::windows::named_pipe;
+    /// use std::error::Error;
+    /// use std::io;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-try-write-vectored";
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn Error>> {
+    ///     let client = named_pipe::ClientOptions::new().open(PIPE_NAME)?;
+    ///
+    ///     let bufs = [io::IoSlice::new(b"hello "), io::IoSlice::new(b"world")];
+    ///
+    ///     loop {
+    ///         // Wait for the pipe to be writable
+    ///         client.writable().await?;
+    ///
+    ///         // Try to write data, this may still fail with `WouldBlock`
+    ///         // if the readiness event is a false positive.
+    ///         match client.try_write_vectored(&bufs) {
+    ///             Ok(n) => {
+    ///                 break;
+    ///             }
+    ///             Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+    ///                 continue;
+    ///             }
+    ///             Err(e) => {
+    ///                 return Err(e.into());
+    ///             }
+    ///         }
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn try_write_vectored(&self, buf: &[io::IoSlice<'_>]) -> io::Result<usize> {
+        self.io
+            .registration()
+            .try_io(Interest::WRITABLE, || (&*self.io).write_vectored(buf))
+    }
+
+    /// Try to read or write from the socket using a user-provided IO operation.
+    ///
+    /// If the socket is ready, the provided closure is called. The closure
+    /// should attempt to perform IO operation from the socket by manually
+    /// calling the appropriate syscall. If the operation fails because the
+    /// socket is not actually ready, then the closure should return a
+    /// `WouldBlock` error and the readiness flag is cleared. The return value
+    /// of the closure is then returned by `try_io`.
+    ///
+    /// If the socket is not ready, then the closure is not called
+    /// and a `WouldBlock` error is returned.
+    ///
+    /// The closure should only return a `WouldBlock` error if it has performed
+    /// an IO operation on the socket that failed due to the socket not being
+    /// ready. Returning a `WouldBlock` error in any other situation will
+    /// incorrectly clear the readiness flag, which can cause the socket to
+    /// behave incorrectly.
+    ///
+    /// The closure should not perform the IO operation using any of the methods
+    /// defined on the Tokio `NamedPipeClient` type, as this will mess with the
+    /// readiness flag and can cause the socket to behave incorrectly.
+    ///
+    /// Usually, [`readable()`], [`writable()`] or [`ready()`] is used with this function.
+    ///
+    /// [`readable()`]: NamedPipeClient::readable()
+    /// [`writable()`]: NamedPipeClient::writable()
+    /// [`ready()`]: NamedPipeClient::ready()
+    pub fn try_io<R>(
+        &self,
+        interest: Interest,
+        f: impl FnOnce() -> io::Result<R>,
+    ) -> io::Result<R> {
+        self.io.registration().try_io(interest, f)
+    }
+}
+
+impl AsyncRead for NamedPipeClient {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        unsafe { self.io.poll_read(cx, buf) }
+    }
+}
+
+impl AsyncWrite for NamedPipeClient {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
+        self.io.poll_write(cx, buf)
+    }
+
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bufs: &[io::IoSlice<'_>],
+    ) -> Poll<io::Result<usize>> {
+        self.io.poll_write_vectored(cx, bufs)
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.poll_flush(cx)
+    }
+}
+
+impl AsRawHandle for NamedPipeClient {
+    fn as_raw_handle(&self) -> RawHandle {
+        self.io.as_raw_handle()
+    }
+}
+
+// Helper to set a boolean flag as a bitfield.
+macro_rules! bool_flag {
+    ($f:expr, $t:expr, $flag:expr) => {{
+        let current = $f;
+
+        if $t {
+            $f = current | $flag;
+        } else {
+            $f = current & !$flag;
+        };
+    }};
+}
+
+/// A builder structure for construct a named pipe with named pipe-specific
+/// options. This is required to use for named pipe servers who wants to modify
+/// pipe-related options.
+///
+/// See [`ServerOptions::create`].
+#[derive(Debug, Clone)]
+pub struct ServerOptions {
+    open_mode: DWORD,
+    pipe_mode: DWORD,
+    max_instances: DWORD,
+    out_buffer_size: DWORD,
+    in_buffer_size: DWORD,
+    default_timeout: DWORD,
+}
+
+impl ServerOptions {
+    /// Creates a new named pipe builder with the default settings.
+    ///
+    /// ```
+    /// use tokio::net::windows::named_pipe::ServerOptions;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-new";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let server = ServerOptions::new().create(PIPE_NAME)?;
+    /// # Ok(()) }
+    /// ```
+    pub fn new() -> ServerOptions {
+        ServerOptions {
+            open_mode: winbase::PIPE_ACCESS_DUPLEX | winbase::FILE_FLAG_OVERLAPPED,
+            pipe_mode: winbase::PIPE_TYPE_BYTE | winbase::PIPE_REJECT_REMOTE_CLIENTS,
+            max_instances: winbase::PIPE_UNLIMITED_INSTANCES,
+            out_buffer_size: 65536,
+            in_buffer_size: 65536,
+            default_timeout: 0,
+        }
+    }
+
+    /// The pipe mode.
+    ///
+    /// The default pipe mode is [`PipeMode::Byte`]. See [`PipeMode`] for
+    /// documentation of what each mode means.
+    ///
+    /// This corresponding to specifying [`dwPipeMode`].
+    ///
+    /// [`dwPipeMode`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea
+    pub fn pipe_mode(&mut self, pipe_mode: PipeMode) -> &mut Self {
+        self.pipe_mode = match pipe_mode {
+            PipeMode::Byte => winbase::PIPE_TYPE_BYTE,
+            PipeMode::Message => winbase::PIPE_TYPE_MESSAGE,
+        };
+
+        self
+    }
+
+    /// The flow of data in the pipe goes from client to server only.
+    ///
+    /// This corresponds to setting [`PIPE_ACCESS_INBOUND`].
+    ///
+    /// [`PIPE_ACCESS_INBOUND`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea#pipe_access_inbound
+    ///
+    /// # Errors
+    ///
+    /// Server side prevents connecting by denying inbound access, client errors
+    /// with [`std::io::ErrorKind::PermissionDenied`] when attempting to create
+    /// the connection.
+    ///
+    /// ```
+    /// use std::io;
+    /// use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-access-inbound-err1";
+    ///
+    /// # #[tokio::main] async fn main() -> io::Result<()> {
+    /// let _server = ServerOptions::new()
+    ///     .access_inbound(false)
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// let e = ClientOptions::new()
+    ///     .open(PIPE_NAME)
+    ///     .unwrap_err();
+    ///
+    /// assert_eq!(e.kind(), io::ErrorKind::PermissionDenied);
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// Disabling writing allows a client to connect, but errors with
+    /// [`std::io::ErrorKind::PermissionDenied`] if a write is attempted.
+    ///
+    /// ```
+    /// use std::io;
+    /// use tokio::io::AsyncWriteExt;
+    /// use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-access-inbound-err2";
+    ///
+    /// # #[tokio::main] async fn main() -> io::Result<()> {
+    /// let server = ServerOptions::new()
+    ///     .access_inbound(false)
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// let mut client = ClientOptions::new()
+    ///     .write(false)
+    ///     .open(PIPE_NAME)?;
+    ///
+    /// server.connect().await?;
+    ///
+    /// let e = client.write(b"ping").await.unwrap_err();
+    /// assert_eq!(e.kind(), io::ErrorKind::PermissionDenied);
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// # Examples
+    ///
+    /// A unidirectional named pipe that only supports server-to-client
+    /// communication.
+    ///
+    /// ```
+    /// use std::io;
+    /// use tokio::io::{AsyncReadExt, AsyncWriteExt};
+    /// use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-access-inbound";
+    ///
+    /// # #[tokio::main] async fn main() -> io::Result<()> {
+    /// let mut server = ServerOptions::new()
+    ///     .access_inbound(false)
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// let mut client = ClientOptions::new()
+    ///     .write(false)
+    ///     .open(PIPE_NAME)?;
+    ///
+    /// server.connect().await?;
+    ///
+    /// let write = server.write_all(b"ping");
+    ///
+    /// let mut buf = [0u8; 4];
+    /// let read = client.read_exact(&mut buf);
+    ///
+    /// let ((), read) = tokio::try_join!(write, read)?;
+    ///
+    /// assert_eq!(read, 4);
+    /// assert_eq!(&buf[..], b"ping");
+    /// # Ok(()) }
+    /// ```
+    pub fn access_inbound(&mut self, allowed: bool) -> &mut Self {
+        bool_flag!(self.open_mode, allowed, winbase::PIPE_ACCESS_INBOUND);
+        self
+    }
+
+    /// The flow of data in the pipe goes from server to client only.
+    ///
+    /// This corresponds to setting [`PIPE_ACCESS_OUTBOUND`].
+    ///
+    /// [`PIPE_ACCESS_OUTBOUND`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea#pipe_access_outbound
+    ///
+    /// # Errors
+    ///
+    /// Server side prevents connecting by denying outbound access, client
+    /// errors with [`std::io::ErrorKind::PermissionDenied`] when attempting to
+    /// create the connection.
+    ///
+    /// ```
+    /// use std::io;
+    /// use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-access-outbound-err1";
+    ///
+    /// # #[tokio::main] async fn main() -> io::Result<()> {
+    /// let server = ServerOptions::new()
+    ///     .access_outbound(false)
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// let e = ClientOptions::new()
+    ///     .open(PIPE_NAME)
+    ///     .unwrap_err();
+    ///
+    /// assert_eq!(e.kind(), io::ErrorKind::PermissionDenied);
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// Disabling reading allows a client to connect, but attempting to read
+    /// will error with [`std::io::ErrorKind::PermissionDenied`].
+    ///
+    /// ```
+    /// use std::io;
+    /// use tokio::io::AsyncReadExt;
+    /// use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-access-outbound-err2";
+    ///
+    /// # #[tokio::main] async fn main() -> io::Result<()> {
+    /// let server = ServerOptions::new()
+    ///     .access_outbound(false)
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// let mut client = ClientOptions::new()
+    ///     .read(false)
+    ///     .open(PIPE_NAME)?;
+    ///
+    /// server.connect().await?;
+    ///
+    /// let mut buf = [0u8; 4];
+    /// let e = client.read(&mut buf).await.unwrap_err();
+    /// assert_eq!(e.kind(), io::ErrorKind::PermissionDenied);
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// # Examples
+    ///
+    /// A unidirectional named pipe that only supports client-to-server
+    /// communication.
+    ///
+    /// ```
+    /// use tokio::io::{AsyncReadExt, AsyncWriteExt};
+    /// use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-access-outbound";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let mut server = ServerOptions::new()
+    ///     .access_outbound(false)
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// let mut client = ClientOptions::new()
+    ///     .read(false)
+    ///     .open(PIPE_NAME)?;
+    ///
+    /// server.connect().await?;
+    ///
+    /// let write = client.write_all(b"ping");
+    ///
+    /// let mut buf = [0u8; 4];
+    /// let read = server.read_exact(&mut buf);
+    ///
+    /// let ((), read) = tokio::try_join!(write, read)?;
+    ///
+    /// println!("done reading and writing");
+    ///
+    /// assert_eq!(read, 4);
+    /// assert_eq!(&buf[..], b"ping");
+    /// # Ok(()) }
+    /// ```
+    pub fn access_outbound(&mut self, allowed: bool) -> &mut Self {
+        bool_flag!(self.open_mode, allowed, winbase::PIPE_ACCESS_OUTBOUND);
+        self
+    }
+
+    /// If you attempt to create multiple instances of a pipe with this flag
+    /// set, creation of the first server instance succeeds, but creation of any
+    /// subsequent instances will fail with
+    /// [`std::io::ErrorKind::PermissionDenied`].
+    ///
+    /// This option is intended to be used with servers that want to ensure that
+    /// they are the only process listening for clients on a given named pipe.
+    /// This is accomplished by enabling it for the first server instance
+    /// created in a process.
+    ///
+    /// This corresponds to setting [`FILE_FLAG_FIRST_PIPE_INSTANCE`].
+    ///
+    /// # Errors
+    ///
+    /// If this option is set and more than one instance of the server for a
+    /// given named pipe exists, calling [`create`] will fail with
+    /// [`std::io::ErrorKind::PermissionDenied`].
+    ///
+    /// ```
+    /// use std::io;
+    /// use tokio::net::windows::named_pipe::ServerOptions;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-first-instance-error";
+    ///
+    /// # #[tokio::main] async fn main() -> io::Result<()> {
+    /// let server1 = ServerOptions::new()
+    ///     .first_pipe_instance(true)
+    ///     .create(PIPE_NAME)?;
+    ///
+    /// // Second server errs, since it's not the first instance.
+    /// let e = ServerOptions::new()
+    ///     .first_pipe_instance(true)
+    ///     .create(PIPE_NAME)
+    ///     .unwrap_err();
+    ///
+    /// assert_eq!(e.kind(), io::ErrorKind::PermissionDenied);
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io;
+    /// use tokio::net::windows::named_pipe::ServerOptions;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-first-instance";
+    ///
+    /// # #[tokio::main] async fn main() -> io::Result<()> {
+    /// let mut builder = ServerOptions::new();
+    /// builder.first_pipe_instance(true);
+    ///
+    /// let server = builder.create(PIPE_NAME)?;
+    /// let e = builder.create(PIPE_NAME).unwrap_err();
+    /// assert_eq!(e.kind(), io::ErrorKind::PermissionDenied);
+    /// drop(server);
+    ///
+    /// // OK: since, we've closed the other instance.
+    /// let _server2 = builder.create(PIPE_NAME)?;
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// [`create`]: ServerOptions::create
+    /// [`FILE_FLAG_FIRST_PIPE_INSTANCE`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea#pipe_first_pipe_instance
+    pub fn first_pipe_instance(&mut self, first: bool) -> &mut Self {
+        bool_flag!(
+            self.open_mode,
+            first,
+            winbase::FILE_FLAG_FIRST_PIPE_INSTANCE
+        );
+        self
+    }
+
+    /// Indicates whether this server can accept remote clients or not. Remote
+    /// clients are disabled by default.
+    ///
+    /// This corresponds to setting [`PIPE_REJECT_REMOTE_CLIENTS`].
+    ///
+    /// [`PIPE_REJECT_REMOTE_CLIENTS`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea#pipe_reject_remote_clients
+    pub fn reject_remote_clients(&mut self, reject: bool) -> &mut Self {
+        bool_flag!(self.pipe_mode, reject, winbase::PIPE_REJECT_REMOTE_CLIENTS);
+        self
+    }
+
+    /// The maximum number of instances that can be created for this pipe. The
+    /// first instance of the pipe can specify this value; the same number must
+    /// be specified for other instances of the pipe. Acceptable values are in
+    /// the range 1 through 254. The default value is unlimited.
+    ///
+    /// This corresponds to specifying [`nMaxInstances`].
+    ///
+    /// [`nMaxInstances`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea
+    ///
+    /// # Errors
+    ///
+    /// The same numbers of `max_instances` have to be used by all servers. Any
+    /// additional servers trying to be built which uses a mismatching value
+    /// might error.
+    ///
+    /// ```
+    /// use std::io;
+    /// use tokio::net::windows::named_pipe::{ServerOptions, ClientOptions};
+    /// use winapi::shared::winerror;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-max-instances";
+    ///
+    /// # #[tokio::main] async fn main() -> io::Result<()> {
+    /// let mut server = ServerOptions::new();
+    /// server.max_instances(2);
+    ///
+    /// let s1 = server.create(PIPE_NAME)?;
+    /// let c1 = ClientOptions::new().open(PIPE_NAME);
+    ///
+    /// let s2 = server.create(PIPE_NAME)?;
+    /// let c2 = ClientOptions::new().open(PIPE_NAME);
+    ///
+    /// // Too many servers!
+    /// let e = server.create(PIPE_NAME).unwrap_err();
+    /// assert_eq!(e.raw_os_error(), Some(winerror::ERROR_PIPE_BUSY as i32));
+    ///
+    /// // Still too many servers even if we specify a higher value!
+    /// let e = server.max_instances(100).create(PIPE_NAME).unwrap_err();
+    /// assert_eq!(e.raw_os_error(), Some(winerror::ERROR_PIPE_BUSY as i32));
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// This function will panic if more than 254 instances are specified. If
+    /// you do not wish to set an instance limit, leave it unspecified.
+    ///
+    /// ```should_panic
+    /// use tokio::net::windows::named_pipe::ServerOptions;
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let builder = ServerOptions::new().max_instances(255);
+    /// # Ok(()) }
+    /// ```
+    pub fn max_instances(&mut self, instances: usize) -> &mut Self {
+        assert!(instances < 255, "cannot specify more than 254 instances");
+        self.max_instances = instances as DWORD;
+        self
+    }
+
+    /// The number of bytes to reserve for the output buffer.
+    ///
+    /// This corresponds to specifying [`nOutBufferSize`].
+    ///
+    /// [`nOutBufferSize`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea
+    pub fn out_buffer_size(&mut self, buffer: u32) -> &mut Self {
+        self.out_buffer_size = buffer as DWORD;
+        self
+    }
+
+    /// The number of bytes to reserve for the input buffer.
+    ///
+    /// This corresponds to specifying [`nInBufferSize`].
+    ///
+    /// [`nInBufferSize`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea
+    pub fn in_buffer_size(&mut self, buffer: u32) -> &mut Self {
+        self.in_buffer_size = buffer as DWORD;
+        self
+    }
+
+    /// Create the named pipe identified by `addr` for use as a server.
+    ///
+    /// This uses the [`CreateNamedPipe`] function.
+    ///
+    /// [`CreateNamedPipe`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea
+    ///
+    /// # Errors
+    ///
+    /// This errors if called outside of a [Tokio Runtime], or in a runtime that
+    /// has not [enabled I/O], or if any OS-specific I/O errors occur.
+    ///
+    /// [Tokio Runtime]: crate::runtime::Runtime
+    /// [enabled I/O]: crate::runtime::Builder::enable_io
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::net::windows::named_pipe::ServerOptions;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-create";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let server = ServerOptions::new().create(PIPE_NAME)?;
+    /// # Ok(()) }
+    /// ```
+    pub fn create(&self, addr: impl AsRef<OsStr>) -> io::Result<NamedPipeServer> {
+        // Safety: We're calling create_with_security_attributes_raw w/ a null
+        // pointer which disables it.
+        unsafe { self.create_with_security_attributes_raw(addr, ptr::null_mut()) }
+    }
+
+    /// Create the named pipe identified by `addr` for use as a server.
+    ///
+    /// This is the same as [`create`] except that it supports providing the raw
+    /// pointer to a structure of [`SECURITY_ATTRIBUTES`] which will be passed
+    /// as the `lpSecurityAttributes` argument to [`CreateFile`].
+    ///
+    /// # Errors
+    ///
+    /// This errors if called outside of a [Tokio Runtime], or in a runtime that
+    /// has not [enabled I/O], or if any OS-specific I/O errors occur.
+    ///
+    /// [Tokio Runtime]: crate::runtime::Runtime
+    /// [enabled I/O]: crate::runtime::Builder::enable_io
+    ///
+    /// # Safety
+    ///
+    /// The `attrs` argument must either be null or point at a valid instance of
+    /// the [`SECURITY_ATTRIBUTES`] structure. If the argument is null, the
+    /// behavior is identical to calling the [`create`] method.
+    ///
+    /// [`create`]: ServerOptions::create
+    /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew
+    /// [`SECURITY_ATTRIBUTES`]: crate::winapi::um::minwinbase::SECURITY_ATTRIBUTES
+    pub unsafe fn create_with_security_attributes_raw(
+        &self,
+        addr: impl AsRef<OsStr>,
+        attrs: *mut c_void,
+    ) -> io::Result<NamedPipeServer> {
+        let addr = encode_addr(addr);
+
+        let h = namedpipeapi::CreateNamedPipeW(
+            addr.as_ptr(),
+            self.open_mode,
+            self.pipe_mode,
+            self.max_instances,
+            self.out_buffer_size,
+            self.in_buffer_size,
+            self.default_timeout,
+            attrs as *mut _,
+        );
+
+        if h == handleapi::INVALID_HANDLE_VALUE {
+            return Err(io::Error::last_os_error());
+        }
+
+        NamedPipeServer::from_raw_handle(h)
+    }
+}
+
+/// A builder suitable for building and interacting with named pipes from the
+/// client side.
+///
+/// See [`ClientOptions::open`].
+#[derive(Debug, Clone)]
+pub struct ClientOptions {
+    desired_access: DWORD,
+    security_qos_flags: DWORD,
+}
+
+impl ClientOptions {
+    /// Creates a new named pipe builder with the default settings.
+    ///
+    /// ```
+    /// use tokio::net::windows::named_pipe::{ServerOptions, ClientOptions};
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\tokio-named-pipe-client-new";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// // Server must be created in order for the client creation to succeed.
+    /// let server = ServerOptions::new().create(PIPE_NAME)?;
+    /// let client = ClientOptions::new().open(PIPE_NAME)?;
+    /// # Ok(()) }
+    /// ```
+    pub fn new() -> Self {
+        Self {
+            desired_access: winnt::GENERIC_READ | winnt::GENERIC_WRITE,
+            security_qos_flags: winbase::SECURITY_IDENTIFICATION | winbase::SECURITY_SQOS_PRESENT,
+        }
+    }
+
+    /// If the client supports reading data. This is enabled by default.
+    ///
+    /// This corresponds to setting [`GENERIC_READ`] in the call to [`CreateFile`].
+    ///
+    /// [`GENERIC_READ`]: https://docs.microsoft.com/en-us/windows/win32/secauthz/generic-access-rights
+    /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew
+    pub fn read(&mut self, allowed: bool) -> &mut Self {
+        bool_flag!(self.desired_access, allowed, winnt::GENERIC_READ);
+        self
+    }
+
+    /// If the created pipe supports writing data. This is enabled by default.
+    ///
+    /// This corresponds to setting [`GENERIC_WRITE`] in the call to [`CreateFile`].
+    ///
+    /// [`GENERIC_WRITE`]: https://docs.microsoft.com/en-us/windows/win32/secauthz/generic-access-rights
+    /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew
+    pub fn write(&mut self, allowed: bool) -> &mut Self {
+        bool_flag!(self.desired_access, allowed, winnt::GENERIC_WRITE);
+        self
+    }
+
+    /// Sets qos flags which are combined with other flags and attributes in the
+    /// call to [`CreateFile`].
+    ///
+    /// By default `security_qos_flags` is set to [`SECURITY_IDENTIFICATION`],
+    /// calling this function would override that value completely with the
+    /// argument specified.
+    ///
+    /// When `security_qos_flags` is not set, a malicious program can gain the
+    /// elevated privileges of a privileged Rust process when it allows opening
+    /// user-specified paths, by tricking it into opening a named pipe. So
+    /// arguably `security_qos_flags` should also be set when opening arbitrary
+    /// paths. However the bits can then conflict with other flags, specifically
+    /// `FILE_FLAG_OPEN_NO_RECALL`.
+    ///
+    /// For information about possible values, see [Impersonation Levels] on the
+    /// Windows Dev Center site. The `SECURITY_SQOS_PRESENT` flag is set
+    /// automatically when using this method.
+    ///
+    /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea
+    /// [`SECURITY_IDENTIFICATION`]: crate::winapi::um::winbase::SECURITY_IDENTIFICATION
+    /// [Impersonation Levels]: https://docs.microsoft.com/en-us/windows/win32/api/winnt/ne-winnt-security_impersonation_level
+    pub fn security_qos_flags(&mut self, flags: u32) -> &mut Self {
+        // See: https://github.com/rust-lang/rust/pull/58216
+        self.security_qos_flags = flags | winbase::SECURITY_SQOS_PRESENT;
+        self
+    }
+
+    /// Open the named pipe identified by `addr`.
+    ///
+    /// This opens the client using [`CreateFile`] with the
+    /// `dwCreationDisposition` option set to `OPEN_EXISTING`.
+    ///
+    /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea
+    ///
+    /// # Errors
+    ///
+    /// This errors if called outside of a [Tokio Runtime], or in a runtime that
+    /// has not [enabled I/O], or if any OS-specific I/O errors occur.
+    ///
+    /// There are a few errors you need to take into account when creating a
+    /// named pipe on the client side:
+    ///
+    /// * [`std::io::ErrorKind::NotFound`] - This indicates that the named pipe
+    ///   does not exist. Presumably the server is not up.
+    /// * [`ERROR_PIPE_BUSY`] - This error is raised when the named pipe exists,
+    ///   but the server is not currently waiting for a connection. Please see the
+    ///   examples for how to check for this error.
+    ///
+    /// [`ERROR_PIPE_BUSY`]: crate::winapi::shared::winerror::ERROR_PIPE_BUSY
+    /// [`winapi`]: crate::winapi
+    /// [enabled I/O]: crate::runtime::Builder::enable_io
+    /// [Tokio Runtime]: crate::runtime::Runtime
+    ///
+    /// A connect loop that waits until a pipe becomes available looks like
+    /// this:
+    ///
+    /// ```no_run
+    /// use std::time::Duration;
+    /// use tokio::net::windows::named_pipe::ClientOptions;
+    /// use tokio::time;
+    /// use winapi::shared::winerror;
+    ///
+    /// const PIPE_NAME: &str = r"\\.\pipe\mynamedpipe";
+    ///
+    /// # #[tokio::main] async fn main() -> std::io::Result<()> {
+    /// let client = loop {
+    ///     match ClientOptions::new().open(PIPE_NAME) {
+    ///         Ok(client) => break client,
+    ///         Err(e) if e.raw_os_error() == Some(winerror::ERROR_PIPE_BUSY as i32) => (),
+    ///         Err(e) => return Err(e),
+    ///     }
+    ///
+    ///     time::sleep(Duration::from_millis(50)).await;
+    /// };
+    ///
+    /// // use the connected client.
+    /// # Ok(()) }
+    /// ```
+    pub fn open(&self, addr: impl AsRef<OsStr>) -> io::Result<NamedPipeClient> {
+        // Safety: We're calling open_with_security_attributes_raw w/ a null
+        // pointer which disables it.
+        unsafe { self.open_with_security_attributes_raw(addr, ptr::null_mut()) }
+    }
+
+    /// Open the named pipe identified by `addr`.
+    ///
+    /// This is the same as [`open`] except that it supports providing the raw
+    /// pointer to a structure of [`SECURITY_ATTRIBUTES`] which will be passed
+    /// as the `lpSecurityAttributes` argument to [`CreateFile`].
+    ///
+    /// # Safety
+    ///
+    /// The `attrs` argument must either be null or point at a valid instance of
+    /// the [`SECURITY_ATTRIBUTES`] structure. If the argument is null, the
+    /// behavior is identical to calling the [`open`] method.
+    ///
+    /// [`open`]: ClientOptions::open
+    /// [`CreateFile`]: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew
+    /// [`SECURITY_ATTRIBUTES`]: crate::winapi::um::minwinbase::SECURITY_ATTRIBUTES
+    pub unsafe fn open_with_security_attributes_raw(
+        &self,
+        addr: impl AsRef<OsStr>,
+        attrs: *mut c_void,
+    ) -> io::Result<NamedPipeClient> {
+        let addr = encode_addr(addr);
+
+        // NB: We could use a platform specialized `OpenOptions` here, but since
+        // we have access to winapi it ultimately doesn't hurt to use
+        // `CreateFile` explicitly since it allows the use of our already
+        // well-structured wide `addr` to pass into CreateFileW.
+        let h = fileapi::CreateFileW(
+            addr.as_ptr(),
+            self.desired_access,
+            0,
+            attrs as *mut _,
+            fileapi::OPEN_EXISTING,
+            self.get_flags(),
+            ptr::null_mut(),
+        );
+
+        if h == handleapi::INVALID_HANDLE_VALUE {
+            return Err(io::Error::last_os_error());
+        }
+
+        NamedPipeClient::from_raw_handle(h)
+    }
+
+    fn get_flags(&self) -> u32 {
+        self.security_qos_flags | winbase::FILE_FLAG_OVERLAPPED
+    }
+}
+
+/// The pipe mode of a named pipe.
+///
+/// Set through [`ServerOptions::pipe_mode`].
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum PipeMode {
+    /// Data is written to the pipe as a stream of bytes. The pipe does not
+    /// distinguish bytes written during different write operations.
+    ///
+    /// Corresponds to [`PIPE_TYPE_BYTE`][crate::winapi::um::winbase::PIPE_TYPE_BYTE].
+    Byte,
+    /// Data is written to the pipe as a stream of messages. The pipe treats the
+    /// bytes written during each write operation as a message unit. Any reading
+    /// on a named pipe returns [`ERROR_MORE_DATA`] when a message is not read
+    /// completely.
+    ///
+    /// Corresponds to [`PIPE_TYPE_MESSAGE`][crate::winapi::um::winbase::PIPE_TYPE_MESSAGE].
+    ///
+    /// [`ERROR_MORE_DATA`]: crate::winapi::shared::winerror::ERROR_MORE_DATA
+    Message,
+}
+
+/// Indicates the end of a named pipe.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum PipeEnd {
+    /// The named pipe refers to the client end of a named pipe instance.
+    ///
+    /// Corresponds to [`PIPE_CLIENT_END`][crate::winapi::um::winbase::PIPE_CLIENT_END].
+    Client,
+    /// The named pipe refers to the server end of a named pipe instance.
+    ///
+    /// Corresponds to [`PIPE_SERVER_END`][crate::winapi::um::winbase::PIPE_SERVER_END].
+    Server,
+}
+
+/// Information about a named pipe.
+///
+/// Constructed through [`NamedPipeServer::info`] or [`NamedPipeClient::info`].
+#[derive(Debug)]
+#[non_exhaustive]
+pub struct PipeInfo {
+    /// Indicates the mode of a named pipe.
+    pub mode: PipeMode,
+    /// Indicates the end of a named pipe.
+    pub end: PipeEnd,
+    /// The maximum number of instances that can be created for this pipe.
+    pub max_instances: u32,
+    /// The number of bytes to reserve for the output buffer.
+    pub out_buffer_size: u32,
+    /// The number of bytes to reserve for the input buffer.
+    pub in_buffer_size: u32,
+}
+
+/// Encode an address so that it is a null-terminated wide string.
+fn encode_addr(addr: impl AsRef<OsStr>) -> Box<[u16]> {
+    let len = addr.as_ref().encode_wide().count();
+    let mut vec = Vec::with_capacity(len + 1);
+    vec.extend(addr.as_ref().encode_wide());
+    vec.push(0);
+    vec.into_boxed_slice()
+}
+
+/// Internal function to get the info out of a raw named pipe.
+unsafe fn named_pipe_info(handle: RawHandle) -> io::Result<PipeInfo> {
+    let mut flags = 0;
+    let mut out_buffer_size = 0;
+    let mut in_buffer_size = 0;
+    let mut max_instances = 0;
+
+    let result = namedpipeapi::GetNamedPipeInfo(
+        handle,
+        &mut flags,
+        &mut out_buffer_size,
+        &mut in_buffer_size,
+        &mut max_instances,
+    );
+
+    if result == FALSE {
+        return Err(io::Error::last_os_error());
+    }
+
+    let mut end = PipeEnd::Client;
+    let mut mode = PipeMode::Byte;
+
+    if flags & winbase::PIPE_SERVER_END != 0 {
+        end = PipeEnd::Server;
+    }
+
+    if flags & winbase::PIPE_TYPE_MESSAGE != 0 {
+        mode = PipeMode::Message;
+    }
+
+    Ok(PipeInfo {
+        end,
+        mode,
+        out_buffer_size,
+        in_buffer_size,
+        max_instances,
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/park/either.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/park/either.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/park/either.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/park/either.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![cfg_attr(not(feature = "full"), allow(dead_code))]
+
 use crate::park::{Park, Unpark};
 
 use std::fmt;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/park/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/park/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/park/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/park/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,18 +34,14 @@
 //! * `park_timeout` does the same as `park` but allows specifying a maximum
 //!   time to block the thread for.
 
-cfg_resource_drivers! {
-    mod either;
-    pub(crate) use self::either::Either;
+cfg_rt! {
+    pub(crate) mod either;
 }
 
-mod thread;
-pub(crate) use self::thread::ParkThread;
-
-cfg_block_on! {
-    pub(crate) use self::thread::{CachedParkThread, ParkError};
-}
+#[cfg(any(feature = "rt", feature = "sync"))]
+pub(crate) mod thread;
 
+use std::fmt::Debug;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -55,7 +51,7 @@
     type Unpark: Unpark;
 
     /// Error returned by `park`
-    type Error;
+    type Error: Debug;
 
     /// Gets a new `Unpark` handle associated with this `Park` instance.
     fn unpark(&self) -> Self::Unpark;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/park/thread.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/park/thread.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/park/thread.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/park/thread.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![cfg_attr(not(feature = "full"), allow(dead_code))]
+
 use crate::loom::sync::atomic::AtomicUsize;
 use crate::loom::sync::{Arc, Condvar, Mutex};
 use crate::park::{Park, Unpark};
@@ -87,7 +89,7 @@
         }
 
         // Otherwise we need to coordinate going to sleep
-        let mut m = self.mutex.lock().unwrap();
+        let mut m = self.mutex.lock();
 
         match self.state.compare_exchange(EMPTY, PARKED, SeqCst, SeqCst) {
             Ok(_) => {}
@@ -137,7 +139,7 @@
             return;
         }
 
-        let m = self.mutex.lock().unwrap();
+        let m = self.mutex.lock();
 
         match self.state.compare_exchange(EMPTY, PARKED, SeqCst, SeqCst) {
             Ok(_) => {}
@@ -188,7 +190,7 @@
         // Releasing `lock` before the call to `notify_one` means that when the
         // parked thread wakes it doesn't get woken only to have to wait for us
         // to release `lock`.
-        drop(self.mutex.lock().unwrap());
+        drop(self.mutex.lock());
 
         self.condvar.notify_one()
     }
@@ -212,118 +214,133 @@
     }
 }
 
-cfg_block_on! {
-    use std::marker::PhantomData;
-    use std::rc::Rc;
-
-    use std::mem;
-    use std::task::{RawWaker, RawWakerVTable, Waker};
-
-    /// Blocks the current thread using a condition variable.
-    #[derive(Debug)]
-    pub(crate) struct CachedParkThread {
-        _anchor: PhantomData<Rc<()>>,
-    }
-
-    impl CachedParkThread {
-        /// Create a new `ParkThread` handle for the current thread.
-        ///
-        /// This type cannot be moved to other threads, so it should be created on
-        /// the thread that the caller intends to park.
-        pub(crate) fn new() -> CachedParkThread {
-            CachedParkThread {
-                _anchor: PhantomData,
-            }
-        }
+use std::future::Future;
+use std::marker::PhantomData;
+use std::mem;
+use std::rc::Rc;
+use std::task::{RawWaker, RawWakerVTable, Waker};
 
-        pub(crate) fn get_unpark(&self) -> Result<UnparkThread, ParkError> {
-            self.with_current(|park_thread| park_thread.unpark())
-        }
+/// Blocks the current thread using a condition variable.
+#[derive(Debug)]
+pub(crate) struct CachedParkThread {
+    _anchor: PhantomData<Rc<()>>,
+}
 
-        /// Get a reference to the `ParkThread` handle for this thread.
-        fn with_current<F, R>(&self, f: F) -> Result<R, ParkError>
-        where
-            F: FnOnce(&ParkThread) -> R,
-        {
-            CURRENT_PARKER.try_with(|inner| f(inner))
-                .map_err(|_| ())
+impl CachedParkThread {
+    /// Create a new `ParkThread` handle for the current thread.
+    ///
+    /// This type cannot be moved to other threads, so it should be created on
+    /// the thread that the caller intends to park.
+    pub(crate) fn new() -> CachedParkThread {
+        CachedParkThread {
+            _anchor: PhantomData,
         }
     }
 
-    impl Park for CachedParkThread {
-        type Unpark = UnparkThread;
-        type Error = ParkError;
+    pub(crate) fn get_unpark(&self) -> Result<UnparkThread, ParkError> {
+        self.with_current(|park_thread| park_thread.unpark())
+    }
 
-        fn unpark(&self) -> Self::Unpark {
-            self.get_unpark().unwrap()
-        }
+    /// Get a reference to the `ParkThread` handle for this thread.
+    fn with_current<F, R>(&self, f: F) -> Result<R, ParkError>
+    where
+        F: FnOnce(&ParkThread) -> R,
+    {
+        CURRENT_PARKER.try_with(|inner| f(inner)).map_err(|_| ())
+    }
 
-        fn park(&mut self) -> Result<(), Self::Error> {
-            self.with_current(|park_thread| park_thread.inner.park())?;
-            Ok(())
-        }
+    pub(crate) fn block_on<F: Future>(&mut self, f: F) -> Result<F::Output, ParkError> {
+        use std::task::Context;
+        use std::task::Poll::Ready;
 
-        fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
-            self.with_current(|park_thread| park_thread.inner.park_timeout(duration))?;
-            Ok(())
-        }
-
-        fn shutdown(&mut self) {
-            let _ = self.with_current(|park_thread| park_thread.inner.shutdown());
-        }
-    }
+        // `get_unpark()` should not return a Result
+        let waker = self.get_unpark()?.into_waker();
+        let mut cx = Context::from_waker(&waker);
 
+        pin!(f);
 
-    impl UnparkThread {
-        pub(crate) fn into_waker(self) -> Waker {
-            unsafe {
-                let raw = unparker_to_raw_waker(self.inner);
-                Waker::from_raw(raw)
+        loop {
+            if let Ready(v) = crate::coop::budget(|| f.as_mut().poll(&mut cx)) {
+                return Ok(v);
             }
+
+            self.park()?;
         }
     }
+}
 
-    impl Inner {
-        #[allow(clippy::wrong_self_convention)]
-        fn into_raw(this: Arc<Inner>) -> *const () {
-            Arc::into_raw(this) as *const ()
-        }
+impl Park for CachedParkThread {
+    type Unpark = UnparkThread;
+    type Error = ParkError;
 
-        unsafe fn from_raw(ptr: *const ()) -> Arc<Inner> {
-            Arc::from_raw(ptr as *const Inner)
-        }
+    fn unpark(&self) -> Self::Unpark {
+        self.get_unpark().unwrap()
     }
 
-    unsafe fn unparker_to_raw_waker(unparker: Arc<Inner>) -> RawWaker {
-        RawWaker::new(
-            Inner::into_raw(unparker),
-            &RawWakerVTable::new(clone, wake, wake_by_ref, drop_waker),
-        )
+    fn park(&mut self) -> Result<(), Self::Error> {
+        self.with_current(|park_thread| park_thread.inner.park())?;
+        Ok(())
     }
 
-    unsafe fn clone(raw: *const ()) -> RawWaker {
-        let unparker = Inner::from_raw(raw);
+    fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
+        self.with_current(|park_thread| park_thread.inner.park_timeout(duration))?;
+        Ok(())
+    }
 
-        // Increment the ref count
-        mem::forget(unparker.clone());
+    fn shutdown(&mut self) {
+        let _ = self.with_current(|park_thread| park_thread.inner.shutdown());
+    }
+}
 
-        unparker_to_raw_waker(unparker)
+impl UnparkThread {
+    pub(crate) fn into_waker(self) -> Waker {
+        unsafe {
+            let raw = unparker_to_raw_waker(self.inner);
+            Waker::from_raw(raw)
+        }
     }
+}
 
-    unsafe fn drop_waker(raw: *const ()) {
-        let _ = Inner::from_raw(raw);
+impl Inner {
+    #[allow(clippy::wrong_self_convention)]
+    fn into_raw(this: Arc<Inner>) -> *const () {
+        Arc::into_raw(this) as *const ()
     }
 
-    unsafe fn wake(raw: *const ()) {
-        let unparker = Inner::from_raw(raw);
-        unparker.unpark();
+    unsafe fn from_raw(ptr: *const ()) -> Arc<Inner> {
+        Arc::from_raw(ptr as *const Inner)
     }
+}
 
-    unsafe fn wake_by_ref(raw: *const ()) {
-        let unparker = Inner::from_raw(raw);
-        unparker.unpark();
+unsafe fn unparker_to_raw_waker(unparker: Arc<Inner>) -> RawWaker {
+    RawWaker::new(
+        Inner::into_raw(unparker),
+        &RawWakerVTable::new(clone, wake, wake_by_ref, drop_waker),
+    )
+}
 
-        // We don't actually own a reference to the unparker
-        mem::forget(unparker);
-    }
+unsafe fn clone(raw: *const ()) -> RawWaker {
+    let unparker = Inner::from_raw(raw);
+
+    // Increment the ref count
+    mem::forget(unparker.clone());
+
+    unparker_to_raw_waker(unparker)
+}
+
+unsafe fn drop_waker(raw: *const ()) {
+    let _ = Inner::from_raw(raw);
+}
+
+unsafe fn wake(raw: *const ()) {
+    let unparker = Inner::from_raw(raw);
+    unparker.unpark();
+}
+
+unsafe fn wake_by_ref(raw: *const ()) {
+    let unparker = Inner::from_raw(raw);
+    unparker.unpark();
+
+    // We don't actually own a reference to the unparker
+    mem::forget(unparker);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/prelude.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/prelude.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/prelude.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/prelude.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#![cfg(not(loom))]
-
-//! A "prelude" for users of the `tokio` crate.
-//!
-//! This prelude is similar to the standard library's prelude in that you'll
-//! almost always want to import its entire contents, but unlike the standard
-//! library's prelude you'll have to do so manually:
-//!
-//! ```
-//! # #![allow(warnings)]
-//! use tokio::prelude::*;
-//! ```
-//!
-//! The prelude may grow over time as additional items see ubiquitous use.
-
-pub use crate::io::{self, AsyncBufRead, AsyncRead, AsyncWrite};
-
-cfg_io_util! {
-    #[doc(no_inline)]
-    pub use crate::io::{AsyncBufReadExt as _, AsyncReadExt as _, AsyncSeekExt as _, AsyncWriteExt as _};
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,16 +18,15 @@
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn std::error::Error>> {
-//!     // The usage is the same as with the standard library's `Command` type, however the value
-//!     // returned from `spawn` is a `Result` containing a `Future`.
-//!     let child = Command::new("echo").arg("hello").arg("world")
-//!                         .spawn();
+//!     // The usage is similar as with the standard library's `Command` type
+//!     let mut child = Command::new("echo")
+//!         .arg("hello")
+//!         .arg("world")
+//!         .spawn()
+//!         .expect("failed to spawn");
 //!
-//!     // Make sure our child succeeded in spawning and process the result
-//!     let future = child.expect("failed to spawn");
-//!
-//!     // Await until the future (and the command) completes
-//!     let status = future.await?;
+//!     // Await until the command completes
+//!     let status = child.wait().await?;
 //!     println!("the command exited with: {}", status);
 //!     Ok(())
 //! }
@@ -83,8 +82,8 @@
 //!
 //!     // Ensure the child process is spawned in the runtime so it can
 //!     // make progress on its own while we await for any output.
-//!     tokio::spawn(async {
-//!         let status = child.await
+//!     tokio::spawn(async move {
+//!         let status = child.wait().await
 //!             .expect("child process encountered an error");
 //!
 //!         println!("child status was: {}", status);
@@ -98,37 +97,110 @@
 //! }
 //! ```
 //!
+//! With some coordination, we can also pipe the output of one command into
+//! another.
+//!
+//! ```no_run
+//! use tokio::join;
+//! use tokio::process::Command;
+//! use std::convert::TryInto;
+//! use std::process::Stdio;
+//!
+//! #[tokio::main]
+//! async fn main() -> Result<(), Box<dyn std::error::Error>> {
+//!     let mut echo = Command::new("echo")
+//!         .arg("hello world!")
+//!         .stdout(Stdio::piped())
+//!         .spawn()
+//!         .expect("failed to spawn echo");
+//!
+//!     let tr_stdin: Stdio = echo
+//!         .stdout
+//!         .take()
+//!         .unwrap()
+//!         .try_into()
+//!         .expect("failed to convert to Stdio");
+//!
+//!     let tr = Command::new("tr")
+//!         .arg("a-z")
+//!         .arg("A-Z")
+//!         .stdin(tr_stdin)
+//!         .stdout(Stdio::piped())
+//!         .spawn()
+//!         .expect("failed to spawn tr");
+//!
+//!     let (echo_result, tr_output) = join!(echo.wait(), tr.wait_with_output());
+//!
+//!     assert!(echo_result.unwrap().success());
+//!
+//!     let tr_output = tr_output.expect("failed to await tr");
+//!     assert!(tr_output.status.success());
+//!
+//!     assert_eq!(tr_output.stdout, b"HELLO WORLD!\n");
+//!
+//!     Ok(())
+//! }
+//! ```
+//!
 //! # Caveats
 //!
+//! ## Dropping/Cancellation
+//!
 //! Similar to the behavior to the standard library, and unlike the futures
 //! paradigm of dropping-implies-cancellation, a spawned process will, by
 //! default, continue to execute even after the `Child` handle has been dropped.
 //!
-//! The `Command::kill_on_drop` method can be used to modify this behavior
+//! The [`Command::kill_on_drop`] method can be used to modify this behavior
 //! and kill the child process if the `Child` wrapper is dropped before it
 //! has exited.
 //!
+//! ## Unix Processes
+//!
+//! On Unix platforms processes must be "reaped" by their parent process after
+//! they have exited in order to release all OS resources. A child process which
+//! has exited, but has not yet been reaped by its parent is considered a "zombie"
+//! process. Such processes continue to count against limits imposed by the system,
+//! and having too many zombie processes present can prevent additional processes
+//! from being spawned.
+//!
+//! The tokio runtime will, on a best-effort basis, attempt to reap and clean up
+//! any process which it has spawned. No additional guarantees are made with regards
+//! how quickly or how often this procedure will take place.
+//!
+//! It is recommended to avoid dropping a [`Child`] process handle before it has been
+//! fully `await`ed if stricter cleanup guarantees are required.
+//!
 //! [`Command`]: crate::process::Command
+//! [`Command::kill_on_drop`]: crate::process::Command::kill_on_drop
+//! [`Child`]: crate::process::Child
 
 #[path = "unix/mod.rs"]
 #[cfg(unix)]
 mod imp;
 
+#[cfg(unix)]
+pub(crate) mod unix {
+    pub(crate) use super::imp::*;
+}
+
 #[path = "windows.rs"]
 #[cfg(windows)]
 mod imp;
 
 mod kill;
 
-use crate::io::{AsyncRead, AsyncWrite};
+use crate::io::{AsyncRead, AsyncWrite, ReadBuf};
 use crate::process::kill::Kill;
 
+use std::convert::TryInto;
 use std::ffi::OsStr;
 use std::future::Future;
 use std::io;
 #[cfg(unix)]
 use std::os::unix::process::CommandExt;
 #[cfg(windows)]
+use std::os::windows::io::{AsRawHandle, RawHandle};
+#[cfg(windows)]
 use std::os::windows::process::CommandExt;
 use std::path::Path;
 use std::pin::Pin;
@@ -153,9 +225,9 @@
 
 pub(crate) struct SpawnedChild {
     child: imp::Child,
-    stdin: Option<imp::ChildStdin>,
-    stdout: Option<imp::ChildStdout>,
-    stderr: Option<imp::ChildStderr>,
+    stdin: Option<imp::ChildStdio>,
+    stdout: Option<imp::ChildStdio>,
+    stderr: Option<imp::ChildStdio>,
 }
 
 impl Command {
@@ -409,7 +481,7 @@
     /// Basic usage:
     ///
     /// ```no_run
-    /// use tokio::process::Command;;
+    /// use tokio::process::Command;
     /// use std::process::Stdio;
     ///
     /// let command = Command::new("ls")
@@ -433,7 +505,7 @@
     /// Basic usage:
     ///
     /// ```no_run
-    /// use tokio::process::Command;;
+    /// use tokio::process::Command;
     /// use std::process::{Stdio};
     ///
     /// let command = Command::new("ls")
@@ -450,6 +522,26 @@
     /// By default, this value is assumed to be `false`, meaning the next spawned
     /// process will not be killed on drop, similar to the behavior of the standard
     /// library.
+    ///
+    /// # Caveats
+    ///
+    /// On Unix platforms processes must be "reaped" by their parent process after
+    /// they have exited in order to release all OS resources. A child process which
+    /// has exited, but has not yet been reaped by its parent is considered a "zombie"
+    /// process. Such processes continue to count against limits imposed by the system,
+    /// and having too many zombie processes present can prevent additional processes
+    /// from being spawned.
+    ///
+    /// Although issuing a `kill` signal to the child process is a synchronous
+    /// operation, the resulting zombie process cannot be `.await`ed inside of the
+    /// destructor to avoid blocking other tasks. The tokio runtime will, on a
+    /// best-effort basis, attempt to reap and clean up such processes in the
+    /// background, but makes no additional guarantees are made with regards
+    /// how quickly or how often this procedure will take place.
+    ///
+    /// If stronger guarantees are required, it is recommended to avoid dropping
+    /// a [`Child`] handle where possible, and instead utilize `child.wait().await`
+    /// or `child.kill().await` where possible.
     pub fn kill_on_drop(&mut self, kill_on_drop: bool) -> &mut Command {
         self.kill_on_drop = kill_on_drop;
         self
@@ -461,6 +553,7 @@
     ///
     /// [1]: https://msdn.microsoft.com/en-us/library/windows/desktop/ms684863(v=vs.85).aspx
     #[cfg(windows)]
+    #[cfg_attr(docsrs, doc(cfg(windows)))]
     pub fn creation_flags(&mut self, flags: u32) -> &mut Command {
         self.std.creation_flags(flags);
         self
@@ -470,6 +563,7 @@
     /// `setuid` call in the child process. Failure in the `setuid`
     /// call will cause the spawn to fail.
     #[cfg(unix)]
+    #[cfg_attr(docsrs, doc(cfg(unix)))]
     pub fn uid(&mut self, id: u32) -> &mut Command {
         self.std.uid(id);
         self
@@ -478,11 +572,26 @@
     /// Similar to `uid` but sets the group ID of the child process. This has
     /// the same semantics as the `uid` field.
     #[cfg(unix)]
+    #[cfg_attr(docsrs, doc(cfg(unix)))]
     pub fn gid(&mut self, id: u32) -> &mut Command {
         self.std.gid(id);
         self
     }
 
+    /// Set executable argument
+    ///
+    /// Set the first process argument, `argv[0]`, to something other than the
+    /// default executable path.
+    #[cfg(unix)]
+    #[cfg_attr(docsrs, doc(cfg(unix)))]
+    pub fn arg0<S>(&mut self, arg: S) -> &mut Command
+    where
+        S: AsRef<OsStr>,
+    {
+        self.std.arg0(arg);
+        self
+    }
+
     /// Schedules a closure to be run just before the `exec` function is
     /// invoked.
     ///
@@ -513,6 +622,7 @@
     /// working directory have successfully been changed, so output to these
     /// locations may not appear where intended.
     #[cfg(unix)]
+    #[cfg_attr(docsrs, doc(cfg(unix)))]
     pub unsafe fn pre_exec<F>(&mut self, f: F) -> &mut Command
     where
         F: FnMut() -> io::Result<()> + Send + Sync + 'static,
@@ -534,16 +644,6 @@
     /// All I/O this child does will be associated with the current default
     /// event loop.
     ///
-    /// # Caveats
-    ///
-    /// Similar to the behavior to the standard library, and unlike the futures
-    /// paradigm of dropping-implies-cancellation, the spawned process will, by
-    /// default, continue to execute even after the `Child` handle has been dropped.
-    ///
-    /// The `Command::kill_on_drop` method can be used to modify this behavior
-    /// and kill the child process if the `Child` wrapper is dropped before it
-    /// has exited.
-    ///
     /// # Examples
     ///
     /// Basic usage:
@@ -555,16 +655,55 @@
     ///     Command::new("ls")
     ///         .spawn()
     ///         .expect("ls command failed to start")
+    ///         .wait()
     ///         .await
     ///         .expect("ls command failed to run")
     /// }
     /// ```
+    ///
+    /// # Caveats
+    ///
+    /// ## Dropping/Cancellation
+    ///
+    /// Similar to the behavior to the standard library, and unlike the futures
+    /// paradigm of dropping-implies-cancellation, a spawned process will, by
+    /// default, continue to execute even after the `Child` handle has been dropped.
+    ///
+    /// The [`Command::kill_on_drop`] method can be used to modify this behavior
+    /// and kill the child process if the `Child` wrapper is dropped before it
+    /// has exited.
+    ///
+    /// ## Unix Processes
+    ///
+    /// On Unix platforms processes must be "reaped" by their parent process after
+    /// they have exited in order to release all OS resources. A child process which
+    /// has exited, but has not yet been reaped by its parent is considered a "zombie"
+    /// process. Such processes continue to count against limits imposed by the system,
+    /// and having too many zombie processes present can prevent additional processes
+    /// from being spawned.
+    ///
+    /// The tokio runtime will, on a best-effort basis, attempt to reap and clean up
+    /// any process which it has spawned. No additional guarantees are made with regards
+    /// how quickly or how often this procedure will take place.
+    ///
+    /// It is recommended to avoid dropping a [`Child`] process handle before it has been
+    /// fully `await`ed if stricter cleanup guarantees are required.
+    ///
+    /// [`Command`]: crate::process::Command
+    /// [`Command::kill_on_drop`]: crate::process::Command::kill_on_drop
+    /// [`Child`]: crate::process::Child
+    ///
+    /// # Errors
+    ///
+    /// On Unix platforms this method will fail with `std::io::ErrorKind::WouldBlock`
+    /// if the system process limit is reached (which includes other applications
+    /// running on the system).
     pub fn spawn(&mut self) -> io::Result<Child> {
         imp::spawn_child(&mut self.std).map(|spawned_child| Child {
-            child: ChildDropGuard {
+            child: FusedChild::Child(ChildDropGuard {
                 inner: spawned_child.child,
                 kill_on_drop: self.kill_on_drop,
-            },
+            }),
             stdin: spawned_child.stdin.map(|inner| ChildStdin { inner }),
             stdout: spawned_child.stdout.map(|inner| ChildStdout { inner }),
             stderr: spawned_child.stderr.map(|inner| ChildStderr { inner }),
@@ -581,14 +720,20 @@
     /// All I/O this child does will be associated with the current default
     /// event loop.
     ///
-    /// If this future is dropped before the future resolves, then
-    /// the child will be killed, if it was spawned.
+    /// The destructor of the future returned by this function will kill
+    /// the child if [`kill_on_drop`] is set to true.
+    ///
+    /// [`kill_on_drop`]: fn@Self::kill_on_drop
     ///
     /// # Errors
     ///
     /// This future will return an error if the child process cannot be spawned
     /// or if there is an error while awaiting its status.
     ///
+    /// On Unix platforms this method will fail with `std::io::ErrorKind::WouldBlock`
+    /// if the system process limit is reached (which includes other applications
+    /// running on the system).
+    ///
     /// # Examples
     ///
     /// Basic usage:
@@ -602,6 +747,7 @@
     ///         .await
     ///         .expect("ls command failed to run")
     /// }
+    /// ```
     pub fn status(&mut self) -> impl Future<Output = io::Result<ExitStatus>> {
         let child = self.spawn();
 
@@ -615,7 +761,7 @@
             child.stdout.take();
             child.stderr.take();
 
-            child.await
+            child.wait().await
         }
     }
 
@@ -637,9 +783,19 @@
     /// All I/O this child does will be associated with the current default
     /// event loop.
     ///
-    /// If this future is dropped before the future resolves, then
-    /// the child will be killed, if it was spawned.
+    /// The destructor of the future returned by this function will kill
+    /// the child if [`kill_on_drop`] is set to true.
+    ///
+    /// [`kill_on_drop`]: fn@Self::kill_on_drop
+    ///
+    /// # Errors
     ///
+    /// This future will return an error if the child process cannot be spawned
+    /// or if there is an error while awaiting its status.
+    ///
+    /// On Unix platforms this method will fail with `std::io::ErrorKind::WouldBlock`
+    /// if the system process limit is reached (which includes other applications
+    /// running on the system).
     /// # Examples
     ///
     /// Basic usage:
@@ -654,6 +810,7 @@
     ///         .expect("ls command failed to run");
     ///     println!("stderr of ls: {:?}", output.stderr);
     /// }
+    /// ```
     pub fn output(&mut self) -> impl Future<Output = io::Result<Output>> {
         self.std.stdout(Stdio::piped());
         self.std.stderr(Stdio::piped());
@@ -725,12 +882,16 @@
     }
 }
 
+/// Keeps track of the exit status of a child process without worrying about
+/// polling the underlying futures even after they have completed.
+#[derive(Debug)]
+enum FusedChild {
+    Child(ChildDropGuard<imp::Child>),
+    Done(ExitStatus),
+}
+
 /// Representation of a child process spawned onto an event loop.
 ///
-/// This type is also a future which will yield the `ExitStatus` of the
-/// underlying child process. A `Child` here also provides access to information
-/// like the OS-assigned identifier and the stdio streams.
-///
 /// # Caveats
 /// Similar to the behavior to the standard library, and unlike the futures
 /// paradigm of dropping-implies-cancellation, a spawned process will, by
@@ -739,28 +900,85 @@
 /// The `Command::kill_on_drop` method can be used to modify this behavior
 /// and kill the child process if the `Child` wrapper is dropped before it
 /// has exited.
-#[must_use = "futures do nothing unless polled"]
 #[derive(Debug)]
 pub struct Child {
-    child: ChildDropGuard<imp::Child>,
+    child: FusedChild,
 
     /// The handle for writing to the child's standard input (stdin), if it has
-    /// been captured.
+    /// been captured. To avoid partially moving the `child` and thus blocking
+    /// yourself from calling functions on `child` while using `stdin`, you might
+    /// find it helpful to do:
+    ///
+    /// ```no_run
+    /// # let mut child = tokio::process::Command::new("echo").spawn().unwrap();
+    /// let stdin = child.stdin.take().unwrap();
+    /// ```
     pub stdin: Option<ChildStdin>,
 
     /// The handle for reading from the child's standard output (stdout), if it
-    /// has been captured.
+    /// has been captured. You might find it helpful to do
+    ///
+    /// ```no_run
+    /// # let mut child = tokio::process::Command::new("echo").spawn().unwrap();
+    /// let stdout = child.stdout.take().unwrap();
+    /// ```
+    ///
+    /// to avoid partially moving the `child` and thus blocking yourself from calling
+    /// functions on `child` while using `stdout`.
     pub stdout: Option<ChildStdout>,
 
     /// The handle for reading from the child's standard error (stderr), if it
-    /// has been captured.
+    /// has been captured. You might find it helpful to do
+    ///
+    /// ```no_run
+    /// # let mut child = tokio::process::Command::new("echo").spawn().unwrap();
+    /// let stderr = child.stderr.take().unwrap();
+    /// ```
+    ///
+    /// to avoid partially moving the `child` and thus blocking yourself from calling
+    /// functions on `child` while using `stderr`.
     pub stderr: Option<ChildStderr>,
 }
 
 impl Child {
-    /// Returns the OS-assigned process identifier associated with this child.
-    pub fn id(&self) -> u32 {
-        self.child.inner.id()
+    /// Returns the OS-assigned process identifier associated with this child
+    /// while it is still running.
+    ///
+    /// Once the child has been polled to completion this will return `None`.
+    /// This is done to avoid confusion on platforms like Unix where the OS
+    /// identifier could be reused once the process has completed.
+    pub fn id(&self) -> Option<u32> {
+        match &self.child {
+            FusedChild::Child(child) => Some(child.inner.id()),
+            FusedChild::Done(_) => None,
+        }
+    }
+
+    /// Extracts the raw handle of the process associated with this child while
+    /// it is still running. Returns `None` if the child has exited.
+    #[cfg(windows)]
+    pub fn raw_handle(&self) -> Option<RawHandle> {
+        match &self.child {
+            FusedChild::Child(c) => Some(c.inner.as_raw_handle()),
+            FusedChild::Done(_) => None,
+        }
+    }
+
+    /// Attempts to force the child to exit, but does not wait for the request
+    /// to take effect.
+    ///
+    /// On Unix platforms, this is the equivalent to sending a SIGKILL. Note
+    /// that on Unix platforms it is possible for a zombie process to remain
+    /// after a kill is sent; to avoid this, the caller should ensure that either
+    /// `child.wait().await` or `child.try_wait()` is invoked successfully.
+    pub fn start_kill(&mut self) -> io::Result<()> {
+        match &mut self.child {
+            FusedChild::Child(child) => child.kill(),
+            FusedChild::Done(_) => Err(io::Error::new(
+                io::ErrorKind::InvalidInput,
+                "invalid argument: can't kill an exited process",
+            )),
+        }
     }
 
     /// Forces the child to exit.
@@ -783,35 +1001,108 @@
     ///     let mut child = Command::new("sleep").arg("1").spawn().unwrap();
     ///     tokio::spawn(async move { send.send(()) });
     ///     tokio::select! {
-    ///         _ = &mut child => {}
-    ///         _ = recv => {
-    ///             &mut child.kill();
-    ///             // NB: await the child here to avoid a zombie process on Unix platforms
-    ///             child.await.unwrap();
-    ///         }
+    ///         _ = child.wait() => {}
+    ///         _ = recv => child.kill().await.expect("kill failed"),
     ///     }
     /// }
+    /// ```
+    pub async fn kill(&mut self) -> io::Result<()> {
+        self.start_kill()?;
+        self.wait().await?;
+        Ok(())
+    }
+
+    /// Waits for the child to exit completely, returning the status that it
+    /// exited with. This function will continue to have the same return value
+    /// after it has been called at least once.
+    ///
+    /// The stdin handle to the child process, if any, will be closed
+    /// before waiting. This helps avoid deadlock: it ensures that the
+    /// child does not block waiting for input from the parent, while
+    /// the parent waits for the child to exit.
+    ///
+    /// If the caller wishes to explicitly control when the child's stdin
+    /// handle is closed, they may `.take()` it before calling `.wait()`:
+    ///
+    /// ```
+    /// # #[cfg(not(unix))]fn main(){}
+    /// # #[cfg(unix)]
+    /// use tokio::io::AsyncWriteExt;
+    /// # #[cfg(unix)]
+    /// use tokio::process::Command;
+    /// # #[cfg(unix)]
+    /// use std::process::Stdio;
+    ///
+    /// # #[cfg(unix)]
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let mut child = Command::new("cat")
+    ///         .stdin(Stdio::piped())
+    ///         .spawn()
+    ///         .unwrap();
+    ///
+    ///     let mut stdin = child.stdin.take().unwrap();
+    ///     tokio::spawn(async move {
+    ///         // do something with stdin here...
+    ///         stdin.write_all(b"hello world\n").await.unwrap();
+    ///
+    ///         // then drop when finished
+    ///         drop(stdin);
+    ///     });
+    ///
+    ///     // wait for the process to complete
+    ///     let _ = child.wait().await;
+    /// }
+    /// ```
+    pub async fn wait(&mut self) -> io::Result<ExitStatus> {
+        // Ensure stdin is closed so the child isn't stuck waiting on
+        // input while the parent is waiting for it to exit.
+        drop(self.stdin.take());
 
-    pub fn kill(&mut self) -> io::Result<()> {
-        self.child.kill()
-    }
+        match &mut self.child {
+            FusedChild::Done(exit) => Ok(*exit),
+            FusedChild::Child(child) => {
+                let ret = child.await;
+
+                if let Ok(exit) = ret {
+                    self.child = FusedChild::Done(exit);
+                }
 
-    #[doc(hidden)]
-    #[deprecated(note = "please use `child.stdin` instead")]
-    pub fn stdin(&mut self) -> &mut Option<ChildStdin> {
-        &mut self.stdin
+                ret
+            }
+        }
     }
 
-    #[doc(hidden)]
-    #[deprecated(note = "please use `child.stdout` instead")]
-    pub fn stdout(&mut self) -> &mut Option<ChildStdout> {
-        &mut self.stdout
-    }
+    /// Attempts to collect the exit status of the child if it has already
+    /// exited.
+    ///
+    /// This function will not block the calling thread and will only
+    /// check to see if the child process has exited or not. If the child has
+    /// exited then on Unix the process ID is reaped. This function is
+    /// guaranteed to repeatedly return a successful exit status so long as the
+    /// child has already exited.
+    ///
+    /// If the child has exited, then `Ok(Some(status))` is returned. If the
+    /// exit status is not available at this time then `Ok(None)` is returned.
+    /// If an error occurs, then that error is returned.
+    ///
+    /// Note that unlike `wait`, this function will not attempt to drop stdin,
+    /// nor will it wake the current task if the child exits.
+    pub fn try_wait(&mut self) -> io::Result<Option<ExitStatus>> {
+        match &mut self.child {
+            FusedChild::Done(exit) => Ok(Some(*exit)),
+            FusedChild::Child(guard) => {
+                let ret = guard.inner.try_wait();
+
+                if let Ok(Some(exit)) = ret {
+                    // Avoid the overhead of trying to kill a reaped process
+                    guard.kill_on_drop = false;
+                    self.child = FusedChild::Done(exit);
+                }
 
-    #[doc(hidden)]
-    #[deprecated(note = "please use `child.stderr` instead")]
-    pub fn stderr(&mut self) -> &mut Option<ChildStderr> {
-        &mut self.stderr
+                ret
+            }
+        }
     }
 
     /// Returns a future that will resolve to an `Output`, containing the exit
@@ -841,11 +1132,10 @@
             Ok(vec)
         }
 
-        drop(self.stdin.take());
         let stdout_fut = read_to_end(self.stdout.take());
         let stderr_fut = read_to_end(self.stderr.take());
 
-        let (status, stdout, stderr) = try_join3(self, stdout_fut, stderr_fut).await?;
+        let (status, stdout, stderr) = try_join3(self.wait(), stdout_fut, stderr_fut).await?;
 
         Ok(Output {
             status,
@@ -855,21 +1145,13 @@
     }
 }
 
-impl Future for Child {
-    type Output = io::Result<ExitStatus>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.child).poll(cx)
-    }
-}
-
 /// The standard input stream for spawned children.
 ///
 /// This type implements the `AsyncWrite` trait to pass data to the stdin handle of
 /// handle of a child process asynchronously.
 #[derive(Debug)]
 pub struct ChildStdin {
-    inner: imp::ChildStdin,
+    inner: imp::ChildStdio,
 }
 
 /// The standard output stream for spawned children.
@@ -878,7 +1160,7 @@
 /// handle of a child process asynchronously.
 #[derive(Debug)]
 pub struct ChildStdout {
-    inner: imp::ChildStdout,
+    inner: imp::ChildStdio,
 }
 
 /// The standard error stream for spawned children.
@@ -887,54 +1169,115 @@
 /// handle of a child process asynchronously.
 #[derive(Debug)]
 pub struct ChildStderr {
-    inner: imp::ChildStderr,
+    inner: imp::ChildStdio,
+}
+
+impl ChildStdin {
+    /// Create an asynchronous `ChildStdin` from a synchronous one.
+    ///
+    /// # Errors
+    ///
+    /// This method may fail if an error is encountered when setting the pipe to
+    /// non-blocking mode, or when registering the pipe with the runtime's IO
+    /// driver.
+    pub fn from_std(inner: std::process::ChildStdin) -> io::Result<Self> {
+        Ok(Self {
+            inner: imp::stdio(inner)?,
+        })
+    }
+}
+
+impl ChildStdout {
+    /// Create an asynchronous `ChildStderr` from a synchronous one.
+    ///
+    /// # Errors
+    ///
+    /// This method may fail if an error is encountered when setting the pipe to
+    /// non-blocking mode, or when registering the pipe with the runtime's IO
+    /// driver.
+    pub fn from_std(inner: std::process::ChildStdout) -> io::Result<Self> {
+        Ok(Self {
+            inner: imp::stdio(inner)?,
+        })
+    }
+}
+
+impl ChildStderr {
+    /// Create an asynchronous `ChildStderr` from a synchronous one.
+    ///
+    /// # Errors
+    ///
+    /// This method may fail if an error is encountered when setting the pipe to
+    /// non-blocking mode, or when registering the pipe with the runtime's IO
+    /// driver.
+    pub fn from_std(inner: std::process::ChildStderr) -> io::Result<Self> {
+        Ok(Self {
+            inner: imp::stdio(inner)?,
+        })
+    }
 }
 
 impl AsyncWrite for ChildStdin {
     fn poll_write(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
         buf: &[u8],
     ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.inner).poll_write(cx, buf)
+        self.inner.poll_write(cx, buf)
     }
 
-    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Pin::new(&mut self.inner).poll_flush(cx)
+    fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Poll::Ready(Ok(()))
     }
 
-    fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Pin::new(&mut self.inner).poll_shutdown(cx)
+    fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Poll::Ready(Ok(()))
     }
 }
 
 impl AsyncRead for ChildStdout {
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        // https://github.com/rust-lang/rust/blob/09c817eeb29e764cfc12d0a8d94841e3ffe34023/src/libstd/process.rs#L314
-        false
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        // Safety: pipes support reading into uninitialized memory
+        unsafe { self.inner.poll_read(cx, buf) }
     }
+}
 
+impl AsyncRead for ChildStderr {
     fn poll_read(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.inner).poll_read(cx, buf)
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        // Safety: pipes support reading into uninitialized memory
+        unsafe { self.inner.poll_read(cx, buf) }
     }
 }
 
-impl AsyncRead for ChildStderr {
-    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        // https://github.com/rust-lang/rust/blob/09c817eeb29e764cfc12d0a8d94841e3ffe34023/src/libstd/process.rs#L375
-        false
+impl TryInto<Stdio> for ChildStdin {
+    type Error = io::Error;
+
+    fn try_into(self) -> Result<Stdio, Self::Error> {
+        imp::convert_to_stdio(self.inner)
     }
+}
 
-    fn poll_read(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.inner).poll_read(cx, buf)
+impl TryInto<Stdio> for ChildStdout {
+    type Error = io::Error;
+
+    fn try_into(self) -> Result<Stdio, Self::Error> {
+        imp::convert_to_stdio(self.inner)
+    }
+}
+
+impl TryInto<Stdio> for ChildStderr {
+    type Error = io::Error;
+
+    fn try_into(self) -> Result<Stdio, Self::Error> {
+        imp::convert_to_stdio(self.inner)
     }
 }
 
@@ -946,19 +1289,19 @@
 
     impl AsRawFd for ChildStdin {
         fn as_raw_fd(&self) -> RawFd {
-            self.inner.get_ref().as_raw_fd()
+            self.inner.as_raw_fd()
         }
     }
 
     impl AsRawFd for ChildStdout {
         fn as_raw_fd(&self) -> RawFd {
-            self.inner.get_ref().as_raw_fd()
+            self.inner.as_raw_fd()
         }
     }
 
     impl AsRawFd for ChildStderr {
         fn as_raw_fd(&self) -> RawFd {
-            self.inner.get_ref().as_raw_fd()
+            self.inner.as_raw_fd()
         }
     }
 }
@@ -971,19 +1314,19 @@
 
     impl AsRawHandle for ChildStdin {
         fn as_raw_handle(&self) -> RawHandle {
-            self.inner.get_ref().as_raw_handle()
+            self.inner.as_raw_handle()
         }
     }
 
     impl AsRawHandle for ChildStdout {
         fn as_raw_handle(&self) -> RawHandle {
-            self.inner.get_ref().as_raw_handle()
+            self.inner.as_raw_handle()
         }
     }
 
     impl AsRawHandle for ChildStderr {
         fn as_raw_handle(&self) -> RawHandle {
-            self.inner.get_ref().as_raw_handle()
+            self.inner.as_raw_handle()
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/unix/driver.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/unix/driver.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/unix/driver.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/unix/driver.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,58 @@
+#![cfg_attr(not(feature = "rt"), allow(dead_code))]
+
+//! Process driver
+
+use crate::park::Park;
+use crate::process::unix::GlobalOrphanQueue;
+use crate::signal::unix::driver::{Driver as SignalDriver, Handle as SignalHandle};
+
+use std::io;
+use std::time::Duration;
+
+/// Responsible for cleaning up orphaned child processes on Unix platforms.
+#[derive(Debug)]
+pub(crate) struct Driver {
+    park: SignalDriver,
+    signal_handle: SignalHandle,
+}
+
+// ===== impl Driver =====
+
+impl Driver {
+    /// Creates a new signal `Driver` instance that delegates wakeups to `park`.
+    pub(crate) fn new(park: SignalDriver) -> Self {
+        let signal_handle = park.handle();
+
+        Self {
+            park,
+            signal_handle,
+        }
+    }
+}
+
+// ===== impl Park for Driver =====
+
+impl Park for Driver {
+    type Unpark = <SignalDriver as Park>::Unpark;
+    type Error = io::Error;
+
+    fn unpark(&self) -> Self::Unpark {
+        self.park.unpark()
+    }
+
+    fn park(&mut self) -> Result<(), Self::Error> {
+        self.park.park()?;
+        GlobalOrphanQueue::reap_orphans(&self.signal_handle);
+        Ok(())
+    }
+
+    fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
+        self.park.park_timeout(duration)?;
+        GlobalOrphanQueue::reap_orphans(&self.signal_handle);
+        Ok(())
+    }
+
+    fn shutdown(&mut self) {
+        self.park.shutdown()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/unix/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/unix/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/unix/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/unix/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -21,7 +21,9 @@
 //! processes in general aren't scalable (e.g. millions) so it shouldn't be that
 //! bad in theory...
 
-mod orphan;
+pub(crate) mod driver;
+
+pub(crate) mod orphan;
 use orphan::{OrphanQueue, OrphanQueueImpl, Wait};
 
 mod reap;
@@ -30,21 +32,23 @@
 use crate::io::PollEvented;
 use crate::process::kill::Kill;
 use crate::process::SpawnedChild;
+use crate::signal::unix::driver::Handle as SignalHandle;
 use crate::signal::unix::{signal, Signal, SignalKind};
 
-use mio::event::Evented;
-use mio::unix::{EventedFd, UnixReady};
-use mio::{Poll as MioPoll, PollOpt, Ready, Token};
+use mio::event::Source;
+use mio::unix::SourceFd;
+use once_cell::sync::Lazy;
 use std::fmt;
+use std::fs::File;
 use std::future::Future;
 use std::io;
-use std::os::unix::io::{AsRawFd, RawFd};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 use std::pin::Pin;
-use std::process::ExitStatus;
+use std::process::{Child as StdChild, ExitStatus, Stdio};
 use std::task::Context;
 use std::task::Poll;
 
-impl Wait for std::process::Child {
+impl Wait for StdChild {
     fn id(&self) -> u32 {
         self.id()
     }
@@ -54,17 +58,15 @@
     }
 }
 
-impl Kill for std::process::Child {
+impl Kill for StdChild {
     fn kill(&mut self) -> io::Result<()> {
         self.kill()
     }
 }
 
-lazy_static::lazy_static! {
-    static ref ORPHAN_QUEUE: OrphanQueueImpl<std::process::Child> = OrphanQueueImpl::new();
-}
+static ORPHAN_QUEUE: Lazy<OrphanQueueImpl<StdChild>> = Lazy::new(OrphanQueueImpl::new);
 
-struct GlobalOrphanQueue;
+pub(crate) struct GlobalOrphanQueue;
 
 impl fmt::Debug for GlobalOrphanQueue {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -72,19 +74,21 @@
     }
 }
 
-impl OrphanQueue<std::process::Child> for GlobalOrphanQueue {
-    fn push_orphan(&self, orphan: std::process::Child) {
-        ORPHAN_QUEUE.push_orphan(orphan)
+impl GlobalOrphanQueue {
+    fn reap_orphans(handle: &SignalHandle) {
+        ORPHAN_QUEUE.reap_orphans(handle)
     }
+}
 
-    fn reap_orphans(&self) {
-        ORPHAN_QUEUE.reap_orphans()
+impl OrphanQueue<StdChild> for GlobalOrphanQueue {
+    fn push_orphan(&self, orphan: StdChild) {
+        ORPHAN_QUEUE.push_orphan(orphan)
     }
 }
 
 #[must_use = "futures do nothing unless polled"]
 pub(crate) struct Child {
-    inner: Reaper<std::process::Child, GlobalOrphanQueue, Signal>,
+    inner: Reaper<StdChild, GlobalOrphanQueue, Signal>,
 }
 
 impl fmt::Debug for Child {
@@ -97,9 +101,9 @@
 
 pub(crate) fn spawn_child(cmd: &mut std::process::Command) -> io::Result<SpawnedChild> {
     let mut child = cmd.spawn()?;
-    let stdin = stdio(child.stdin.take())?;
-    let stdout = stdio(child.stdout.take())?;
-    let stderr = stdio(child.stderr.take())?;
+    let stdin = child.stdin.take().map(stdio).transpose()?;
+    let stdout = child.stdout.take().map(stdio).transpose()?;
+    let stderr = child.stderr.take().map(stdio).transpose()?;
 
     let signal = signal(SignalKind::child())?;
 
@@ -117,6 +121,10 @@
     pub(crate) fn id(&self) -> u32 {
         self.inner.id()
     }
+
+    pub(crate) fn try_wait(&mut self) -> io::Result<Option<ExitStatus>> {
+        self.inner.inner_mut().try_wait()
+    }
 }
 
 impl Kill for Child {
@@ -134,94 +142,109 @@
 }
 
 #[derive(Debug)]
-pub(crate) struct Fd<T> {
-    inner: T,
+pub(crate) struct Pipe {
+    // Actually a pipe and not a File. However, we are reusing `File` to get
+    // close on drop. This is a similar trick as `mio`.
+    fd: File,
 }
 
-impl<T> io::Read for Fd<T>
-where
-    T: io::Read,
-{
+impl<T: IntoRawFd> From<T> for Pipe {
+    fn from(fd: T) -> Self {
+        let fd = unsafe { File::from_raw_fd(fd.into_raw_fd()) };
+        Self { fd }
+    }
+}
+
+impl<'a> io::Read for &'a Pipe {
     fn read(&mut self, bytes: &mut [u8]) -> io::Result<usize> {
-        self.inner.read(bytes)
+        (&self.fd).read(bytes)
     }
 }
 
-impl<T> io::Write for Fd<T>
-where
-    T: io::Write,
-{
+impl<'a> io::Write for &'a Pipe {
     fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
-        self.inner.write(bytes)
+        (&self.fd).write(bytes)
     }
 
     fn flush(&mut self) -> io::Result<()> {
-        self.inner.flush()
+        (&self.fd).flush()
     }
 }
 
-impl<T> AsRawFd for Fd<T>
-where
-    T: AsRawFd,
-{
+impl AsRawFd for Pipe {
     fn as_raw_fd(&self) -> RawFd {
-        self.inner.as_raw_fd()
+        self.fd.as_raw_fd()
     }
 }
 
-impl<T> Evented for Fd<T>
-where
-    T: AsRawFd,
-{
+pub(crate) fn convert_to_stdio(io: PollEvented<Pipe>) -> io::Result<Stdio> {
+    let mut fd = io.into_inner()?.fd;
+
+    // Ensure that the fd to be inherited is set to *blocking* mode, as this
+    // is the default that virtually all programs expect to have. Those
+    // programs that know how to work with nonblocking stdio will know how to
+    // change it to nonblocking mode.
+    set_nonblocking(&mut fd, false)?;
+
+    Ok(Stdio::from(fd))
+}
+
+impl Source for Pipe {
     fn register(
-        &self,
-        poll: &MioPoll,
-        token: Token,
-        interest: Ready,
-        opts: PollOpt,
+        &mut self,
+        registry: &mio::Registry,
+        token: mio::Token,
+        interest: mio::Interest,
     ) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).register(poll, token, interest | UnixReady::hup(), opts)
+        SourceFd(&self.as_raw_fd()).register(registry, token, interest)
     }
 
     fn reregister(
-        &self,
-        poll: &MioPoll,
-        token: Token,
-        interest: Ready,
-        opts: PollOpt,
+        &mut self,
+        registry: &mio::Registry,
+        token: mio::Token,
+        interest: mio::Interest,
     ) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).reregister(poll, token, interest | UnixReady::hup(), opts)
+        SourceFd(&self.as_raw_fd()).reregister(registry, token, interest)
     }
 
-    fn deregister(&self, poll: &MioPoll) -> io::Result<()> {
-        EventedFd(&self.as_raw_fd()).deregister(poll)
+    fn deregister(&mut self, registry: &mio::Registry) -> io::Result<()> {
+        SourceFd(&self.as_raw_fd()).deregister(registry)
     }
 }
 
-pub(crate) type ChildStdin = PollEvented<Fd<std::process::ChildStdin>>;
-pub(crate) type ChildStdout = PollEvented<Fd<std::process::ChildStdout>>;
-pub(crate) type ChildStderr = PollEvented<Fd<std::process::ChildStderr>>;
+pub(crate) type ChildStdio = PollEvented<Pipe>;
 
-fn stdio<T>(option: Option<T>) -> io::Result<Option<PollEvented<Fd<T>>>>
-where
-    T: AsRawFd,
-{
-    let io = match option {
-        Some(io) => io,
-        None => return Ok(None),
-    };
-
-    // Set the fd to nonblocking before we pass it to the event loop
+fn set_nonblocking<T: AsRawFd>(fd: &mut T, nonblocking: bool) -> io::Result<()> {
     unsafe {
-        let fd = io.as_raw_fd();
-        let r = libc::fcntl(fd, libc::F_GETFL);
-        if r == -1 {
+        let fd = fd.as_raw_fd();
+        let previous = libc::fcntl(fd, libc::F_GETFL);
+        if previous == -1 {
             return Err(io::Error::last_os_error());
         }
-        let r = libc::fcntl(fd, libc::F_SETFL, r | libc::O_NONBLOCK);
+
+        let new = if nonblocking {
+            previous | libc::O_NONBLOCK
+        } else {
+            previous & !libc::O_NONBLOCK
+        };
+
+        let r = libc::fcntl(fd, libc::F_SETFL, new);
         if r == -1 {
             return Err(io::Error::last_os_error());
         }
     }
-    Ok(Some(PollEvented::new(Fd { inner: io })?))
+
+    Ok(())
+}
+
+pub(super) fn stdio<T>(io: T) -> io::Result<PollEvented<Pipe>>
+where
+    T: IntoRawFd,
+{
+    // Set the fd to nonblocking before we pass it to the event loop
+    let mut pipe = Pipe::from(io);
+    set_nonblocking(&mut pipe, true)?;
+
+    PollEvented::new(pipe)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/unix/orphan.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/unix/orphan.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/unix/orphan.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/unix/orphan.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,9 @@
+use crate::loom::sync::{Mutex, MutexGuard};
+use crate::signal::unix::driver::Handle as SignalHandle;
+use crate::signal::unix::{signal_with_handle, SignalKind};
+use crate::sync::watch;
 use std::io;
 use std::process::ExitStatus;
-use std::sync::Mutex;
 
 /// An interface for waiting on a process to exit.
 pub(crate) trait Wait {
@@ -24,80 +27,126 @@
 pub(crate) trait OrphanQueue<T> {
     /// Adds an orphan to the queue.
     fn push_orphan(&self, orphan: T);
-    /// Attempts to reap every process in the queue, ignoring any errors and
-    /// enqueueing any orphans which have not yet exited.
-    fn reap_orphans(&self);
 }
 
 impl<T, O: OrphanQueue<T>> OrphanQueue<T> for &O {
     fn push_orphan(&self, orphan: T) {
         (**self).push_orphan(orphan);
     }
-
-    fn reap_orphans(&self) {
-        (**self).reap_orphans()
-    }
 }
 
 /// An implementation of `OrphanQueue`.
 #[derive(Debug)]
 pub(crate) struct OrphanQueueImpl<T> {
+    sigchild: Mutex<Option<watch::Receiver<()>>>,
     queue: Mutex<Vec<T>>,
 }
 
 impl<T> OrphanQueueImpl<T> {
     pub(crate) fn new() -> Self {
         Self {
+            sigchild: Mutex::new(None),
             queue: Mutex::new(Vec::new()),
         }
     }
 
     #[cfg(test)]
     fn len(&self) -> usize {
-        self.queue.lock().unwrap().len()
+        self.queue.lock().len()
     }
-}
 
-impl<T: Wait> OrphanQueue<T> for OrphanQueueImpl<T> {
-    fn push_orphan(&self, orphan: T) {
-        self.queue.lock().unwrap().push(orphan)
+    pub(crate) fn push_orphan(&self, orphan: T)
+    where
+        T: Wait,
+    {
+        self.queue.lock().push(orphan)
     }
 
-    fn reap_orphans(&self) {
-        let mut queue = self.queue.lock().unwrap();
-        let queue = &mut *queue;
-
-        let mut i = 0;
-        while i < queue.len() {
-            match queue[i].try_wait() {
-                Ok(Some(_)) => {}
-                Err(_) => {
-                    // TODO: bubble up error some how. Is this an internal bug?
-                    // Shoudl we panic? Is it OK for this to be silently
-                    // dropped?
+    /// Attempts to reap every process in the queue, ignoring any errors and
+    /// enqueueing any orphans which have not yet exited.
+    pub(crate) fn reap_orphans(&self, handle: &SignalHandle)
+    where
+        T: Wait,
+    {
+        // If someone else is holding the lock, they will be responsible for draining
+        // the queue as necessary, so we can safely bail if that happens
+        if let Some(mut sigchild_guard) = self.sigchild.try_lock() {
+            match &mut *sigchild_guard {
+                Some(sigchild) => {
+                    if sigchild.try_has_changed().and_then(Result::ok).is_some() {
+                        drain_orphan_queue(self.queue.lock());
+                    }
                 }
-                // Still not done yet
-                Ok(None) => {
-                    i += 1;
-                    continue;
+                None => {
+                    let queue = self.queue.lock();
+
+                    // Be lazy and only initialize the SIGCHLD listener if there
+                    // are any orphaned processes in the queue.
+                    if !queue.is_empty() {
+                        // An errors shouldn't really happen here, but if it does it
+                        // means that the signal driver isn't running, in
+                        // which case there isn't anything we can
+                        // register/initialize here, so we can try again later
+                        if let Ok(sigchild) = signal_with_handle(SignalKind::child(), handle) {
+                            *sigchild_guard = Some(sigchild);
+                            drain_orphan_queue(queue);
+                        }
+                    }
                 }
             }
+        }
+    }
+}
 
-            queue.remove(i);
+fn drain_orphan_queue<T>(mut queue: MutexGuard<'_, Vec<T>>)
+where
+    T: Wait,
+{
+    for i in (0..queue.len()).rev() {
+        match queue[i].try_wait() {
+            Ok(None) => {}
+            Ok(Some(_)) | Err(_) => {
+                // The stdlib handles interruption errors (EINTR) when polling a child process.
+                // All other errors represent invalid inputs or pids that have already been
+                // reaped, so we can drop the orphan in case an error is raised.
+                queue.swap_remove(i);
+            }
         }
     }
+
+    drop(queue);
 }
 
 #[cfg(all(test, not(loom)))]
-mod test {
-    use super::Wait;
-    use super::{OrphanQueue, OrphanQueueImpl};
-    use std::cell::Cell;
+pub(crate) mod test {
+    use super::*;
+    use crate::io::driver::Driver as IoDriver;
+    use crate::signal::unix::driver::{Driver as SignalDriver, Handle as SignalHandle};
+    use crate::sync::watch;
+    use std::cell::{Cell, RefCell};
     use std::io;
     use std::os::unix::process::ExitStatusExt;
     use std::process::ExitStatus;
     use std::rc::Rc;
 
+    pub(crate) struct MockQueue<W> {
+        pub(crate) all_enqueued: RefCell<Vec<W>>,
+    }
+
+    impl<W> MockQueue<W> {
+        pub(crate) fn new() -> Self {
+            Self {
+                all_enqueued: RefCell::new(Vec::new()),
+            }
+        }
+    }
+
+    impl<W> OrphanQueue<W> for MockQueue<W> {
+        fn push_orphan(&self, orphan: W) {
+            self.all_enqueued.borrow_mut().push(orphan);
+        }
+    }
+
     struct MockWait {
         total_waits: Rc<Cell<usize>>,
         num_wait_until_status: usize,
@@ -165,27 +214,107 @@
 
         assert_eq!(orphanage.len(), 4);
 
-        orphanage.reap_orphans();
+        drain_orphan_queue(orphanage.queue.lock());
         assert_eq!(orphanage.len(), 2);
         assert_eq!(first_waits.get(), 1);
         assert_eq!(second_waits.get(), 1);
         assert_eq!(third_waits.get(), 1);
         assert_eq!(fourth_waits.get(), 1);
 
-        orphanage.reap_orphans();
+        drain_orphan_queue(orphanage.queue.lock());
         assert_eq!(orphanage.len(), 1);
         assert_eq!(first_waits.get(), 1);
         assert_eq!(second_waits.get(), 2);
         assert_eq!(third_waits.get(), 2);
         assert_eq!(fourth_waits.get(), 1);
 
-        orphanage.reap_orphans();
+        drain_orphan_queue(orphanage.queue.lock());
         assert_eq!(orphanage.len(), 0);
         assert_eq!(first_waits.get(), 1);
         assert_eq!(second_waits.get(), 2);
         assert_eq!(third_waits.get(), 3);
         assert_eq!(fourth_waits.get(), 1);
 
-        orphanage.reap_orphans(); // Safe to reap when empty
+        // Safe to reap when empty
+        drain_orphan_queue(orphanage.queue.lock());
+    }
+
+    #[test]
+    fn no_reap_if_no_signal_received() {
+        let (tx, rx) = watch::channel(());
+
+        let handle = SignalHandle::default();
+
+        let orphanage = OrphanQueueImpl::new();
+        *orphanage.sigchild.lock() = Some(rx);
+
+        let orphan = MockWait::new(2);
+        let waits = orphan.total_waits.clone();
+        orphanage.push_orphan(orphan);
+
+        orphanage.reap_orphans(&handle);
+        assert_eq!(waits.get(), 0);
+
+        orphanage.reap_orphans(&handle);
+        assert_eq!(waits.get(), 0);
+
+        tx.send(()).unwrap();
+        orphanage.reap_orphans(&handle);
+        assert_eq!(waits.get(), 1);
+    }
+
+    #[test]
+    fn no_reap_if_signal_lock_held() {
+        let handle = SignalHandle::default();
+
+        let orphanage = OrphanQueueImpl::new();
+        let signal_guard = orphanage.sigchild.lock();
+
+        let orphan = MockWait::new(2);
+        let waits = orphan.total_waits.clone();
+        orphanage.push_orphan(orphan);
+
+        orphanage.reap_orphans(&handle);
+        assert_eq!(waits.get(), 0);
+
+        drop(signal_guard);
+    }
+
+    #[test]
+    fn does_not_register_signal_if_queue_empty() {
+        let signal_driver = IoDriver::new().and_then(SignalDriver::new).unwrap();
+        let handle = signal_driver.handle();
+
+        let orphanage = OrphanQueueImpl::new();
+        assert!(orphanage.sigchild.lock().is_none()); // Sanity
+
+        // No register when queue empty
+        orphanage.reap_orphans(&handle);
+        assert!(orphanage.sigchild.lock().is_none());
+
+        let orphan = MockWait::new(2);
+        let waits = orphan.total_waits.clone();
+        orphanage.push_orphan(orphan);
+
+        orphanage.reap_orphans(&handle);
+        assert!(orphanage.sigchild.lock().is_some());
+        assert_eq!(waits.get(), 1); // Eager reap when registering listener
+    }
+
+    #[test]
+    fn does_nothing_if_signal_could_not_be_registered() {
+        let handle = SignalHandle::default();
+
+        let orphanage = OrphanQueueImpl::new();
+        assert!(orphanage.sigchild.lock().is_none());
+
+        let orphan = MockWait::new(2);
+        let waits = orphan.total_waits.clone();
+        orphanage.push_orphan(orphan);
+
+        // Signal handler has "gone away", nothing to register or reap
+        orphanage.reap_orphans(&handle);
+        assert!(orphanage.sigchild.lock().is_none());
+        assert_eq!(waits.get(), 0);
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/unix/reap.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/unix/reap.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/unix/reap.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/unix/reap.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 use crate::process::imp::orphan::{OrphanQueue, Wait};
 use crate::process::kill::Kill;
-use crate::signal::unix::Signal;
+use crate::signal::unix::InternalStream;
 
 use std::future::Future;
 use std::io;
@@ -15,7 +15,7 @@
 #[derive(Debug)]
 pub(crate) struct Reaper<W, Q, S>
 where
-    W: Wait + Unpin,
+    W: Wait,
     Q: OrphanQueue<W>,
 {
     inner: Option<W>,
@@ -23,20 +23,9 @@
     signal: S,
 }
 
-// Work around removal of `futures_core` dependency
-pub(crate) trait Stream: Unpin {
-    fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>>;
-}
-
-impl Stream for Signal {
-    fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>> {
-        Signal::poll_recv(self, cx)
-    }
-}
-
 impl<W, Q, S> Deref for Reaper<W, Q, S>
 where
-    W: Wait + Unpin,
+    W: Wait,
     Q: OrphanQueue<W>,
 {
     type Target = W;
@@ -48,7 +37,7 @@
 
 impl<W, Q, S> Reaper<W, Q, S>
 where
-    W: Wait + Unpin,
+    W: Wait,
     Q: OrphanQueue<W>,
 {
     pub(crate) fn new(inner: W, orphan_queue: Q, signal: S) -> Self {
@@ -63,7 +52,7 @@
         self.inner.as_ref().expect("inner has gone away")
     }
 
-    fn inner_mut(&mut self) -> &mut W {
+    pub(crate) fn inner_mut(&mut self) -> &mut W {
         self.inner.as_mut().expect("inner has gone away")
     }
 }
@@ -72,7 +61,7 @@
 where
     W: Wait + Unpin,
     Q: OrphanQueue<W> + Unpin,
-    S: Stream,
+    S: InternalStream + Unpin,
 {
     type Output = io::Result<ExitStatus>;
 
@@ -80,10 +69,8 @@
         loop {
             // If the child hasn't exited yet, then it's our responsibility to
             // ensure the current task gets notified when it might be able to
-            // make progress.
-            //
-            // As described in `spawn` above, we just indicate that we can
-            // next make progress once a SIGCHLD is received.
+            // make progress. We can use the delivery of a SIGCHLD signal as a
+            // sign that we can potentially make progress.
             //
             // However, we will register for a notification on the next signal
             // BEFORE we poll the child. Otherwise it is possible that the child
@@ -99,7 +86,6 @@
             // should not cause significant issues with parent futures.
             let registered_interest = self.signal.poll_recv(cx).is_pending();
 
-            self.orphan_queue.reap_orphans();
             if let Some(status) = self.inner_mut().try_wait()? {
                 return Poll::Ready(Ok(status));
             }
@@ -120,7 +106,7 @@
 
 impl<W, Q, S> Kill for Reaper<W, Q, S>
 where
-    W: Kill + Wait + Unpin,
+    W: Kill + Wait,
     Q: OrphanQueue<W>,
 {
     fn kill(&mut self) -> io::Result<()> {
@@ -130,7 +116,7 @@
 
 impl<W, Q, S> Drop for Reaper<W, Q, S>
 where
-    W: Wait + Unpin,
+    W: Wait,
     Q: OrphanQueue<W>,
 {
     fn drop(&mut self) {
@@ -147,8 +133,8 @@
 mod test {
     use super::*;
 
+    use crate::process::unix::orphan::test::MockQueue;
     use futures::future::FutureExt;
-    use std::cell::{Cell, RefCell};
     use std::os::unix::process::ExitStatusExt;
     use std::process::ExitStatus;
     use std::task::Context;
@@ -211,7 +197,7 @@
         }
     }
 
-    impl Stream for MockStream {
+    impl InternalStream for MockStream {
         fn poll_recv(&mut self, _cx: &mut Context<'_>) -> Poll<Option<()>> {
             self.total_polls += 1;
             match self.values.remove(0) {
@@ -221,30 +207,6 @@
         }
     }
 
-    struct MockQueue<W> {
-        all_enqueued: RefCell<Vec<W>>,
-        total_reaps: Cell<usize>,
-    }
-
-    impl<W> MockQueue<W> {
-        fn new() -> Self {
-            Self {
-                all_enqueued: RefCell::new(Vec::new()),
-                total_reaps: Cell::new(0),
-            }
-        }
-    }
-
-    impl<W: Wait> OrphanQueue<W> for MockQueue<W> {
-        fn push_orphan(&self, orphan: W) {
-            self.all_enqueued.borrow_mut().push(orphan);
-        }
-
-        fn reap_orphans(&self) {
-            self.total_reaps.set(self.total_reaps.get() + 1);
-        }
-    }
-
     #[test]
     fn reaper() {
         let exit = ExitStatus::from_raw(0);
@@ -262,7 +224,6 @@
         assert!(grim.poll_unpin(&mut context).is_pending());
         assert_eq!(1, grim.signal.total_polls);
         assert_eq!(1, grim.total_waits);
-        assert_eq!(1, grim.orphan_queue.total_reaps.get());
         assert!(grim.orphan_queue.all_enqueued.borrow().is_empty());
 
         // Not yet exited, couldn't register interest the first time
@@ -270,7 +231,6 @@
         assert!(grim.poll_unpin(&mut context).is_pending());
         assert_eq!(3, grim.signal.total_polls);
         assert_eq!(3, grim.total_waits);
-        assert_eq!(3, grim.orphan_queue.total_reaps.get());
         assert!(grim.orphan_queue.all_enqueued.borrow().is_empty());
 
         // Exited
@@ -283,7 +243,6 @@
         }
         assert_eq!(4, grim.signal.total_polls);
         assert_eq!(4, grim.total_waits);
-        assert_eq!(4, grim.orphan_queue.total_reaps.get());
         assert!(grim.orphan_queue.all_enqueued.borrow().is_empty());
     }
 
@@ -298,7 +257,6 @@
 
         grim.kill().unwrap();
         assert_eq!(1, grim.total_kills);
-        assert_eq!(0, grim.orphan_queue.total_reaps.get());
         assert!(grim.orphan_queue.all_enqueued.borrow().is_empty());
     }
 
@@ -314,7 +272,6 @@
 
             drop(grim);
 
-            assert_eq!(0, queue.total_reaps.get());
             assert!(queue.all_enqueued.borrow().is_empty());
         }
 
@@ -332,7 +289,6 @@
             let grim = Reaper::new(&mut mock, &queue, MockStream::new(vec![]));
             drop(grim);
 
-            assert_eq!(0, queue.total_reaps.get());
             assert_eq!(1, queue.all_enqueued.borrow().len());
         }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/windows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/windows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/process/windows.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/process/windows.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,25 +20,25 @@
 use crate::process::SpawnedChild;
 use crate::sync::oneshot;
 
-use mio_named_pipes::NamedPipe;
+use mio::windows::NamedPipe;
 use std::fmt;
 use std::future::Future;
 use std::io;
-use std::os::windows::prelude::*;
-use std::os::windows::process::ExitStatusExt;
+use std::os::windows::prelude::{AsRawHandle, FromRawHandle, IntoRawHandle, RawHandle};
 use std::pin::Pin;
+use std::process::Stdio;
 use std::process::{Child as StdChild, Command as StdCommand, ExitStatus};
 use std::ptr;
 use std::task::Context;
 use std::task::Poll;
-use winapi::shared::minwindef::FALSE;
-use winapi::shared::winerror::WAIT_TIMEOUT;
-use winapi::um::handleapi::INVALID_HANDLE_VALUE;
-use winapi::um::processthreadsapi::GetExitCodeProcess;
-use winapi::um::synchapi::WaitForSingleObject;
+use winapi::shared::minwindef::{DWORD, FALSE};
+use winapi::um::handleapi::{DuplicateHandle, INVALID_HANDLE_VALUE};
+use winapi::um::processthreadsapi::GetCurrentProcess;
 use winapi::um::threadpoollegacyapiset::UnregisterWaitEx;
-use winapi::um::winbase::{RegisterWaitForSingleObject, INFINITE, WAIT_OBJECT_0};
-use winapi::um::winnt::{BOOLEAN, HANDLE, PVOID, WT_EXECUTEINWAITTHREAD, WT_EXECUTEONLYONCE};
+use winapi::um::winbase::{RegisterWaitForSingleObject, INFINITE};
+use winapi::um::winnt::{
+    BOOLEAN, DUPLICATE_SAME_ACCESS, HANDLE, PVOID, WT_EXECUTEINWAITTHREAD, WT_EXECUTEONLYONCE,
+};
 
 #[must_use = "futures do nothing unless polled"]
 pub(crate) struct Child {
@@ -67,9 +67,9 @@
 
 pub(crate) fn spawn_child(cmd: &mut StdCommand) -> io::Result<SpawnedChild> {
     let mut child = cmd.spawn()?;
-    let stdin = stdio(child.stdin.take());
-    let stdout = stdio(child.stdout.take());
-    let stderr = stdio(child.stderr.take());
+    let stdin = child.stdin.take().map(stdio).transpose()?;
+    let stdout = child.stdout.take().map(stdio).transpose()?;
+    let stderr = child.stderr.take().map(stdio).transpose()?;
 
     Ok(SpawnedChild {
         child: Child {
@@ -86,6 +86,10 @@
     pub(crate) fn id(&self) -> u32 {
         self.child.id()
     }
+
+    pub(crate) fn try_wait(&mut self) -> io::Result<Option<ExitStatus>> {
+        self.child.try_wait()
+    }
 }
 
 impl Kill for Child {
@@ -106,11 +110,11 @@
                     Poll::Ready(Err(_)) => panic!("should not be canceled"),
                     Poll::Pending => return Poll::Pending,
                 }
-                let status = try_wait(&inner.child)?.expect("not ready yet");
+                let status = inner.try_wait()?.expect("not ready yet");
                 return Poll::Ready(Ok(status));
             }
 
-            if let Some(e) = try_wait(&inner.child)? {
+            if let Some(e) = inner.try_wait()? {
                 return Poll::Ready(Ok(e));
             }
             let (tx, rx) = oneshot::channel();
@@ -140,6 +144,12 @@
     }
 }
 
+impl AsRawHandle for Child {
+    fn as_raw_handle(&self) -> RawHandle {
+        self.child.as_raw_handle()
+    }
+}
+
 impl Drop for Waiting {
     fn drop(&mut self) {
         unsafe {
@@ -157,35 +167,39 @@
     let _ = complete.take().unwrap().send(());
 }
 
-pub(crate) fn try_wait(child: &StdChild) -> io::Result<Option<ExitStatus>> {
-    unsafe {
-        match WaitForSingleObject(child.as_raw_handle(), 0) {
-            WAIT_OBJECT_0 => {}
-            WAIT_TIMEOUT => return Ok(None),
-            _ => return Err(io::Error::last_os_error()),
-        }
-        let mut status = 0;
-        let rc = GetExitCodeProcess(child.as_raw_handle(), &mut status);
-        if rc == FALSE {
-            Err(io::Error::last_os_error())
-        } else {
-            Ok(Some(ExitStatus::from_raw(status)))
-        }
-    }
-}
-
-pub(crate) type ChildStdin = PollEvented<NamedPipe>;
-pub(crate) type ChildStdout = PollEvented<NamedPipe>;
-pub(crate) type ChildStderr = PollEvented<NamedPipe>;
+pub(crate) type ChildStdio = PollEvented<NamedPipe>;
 
-fn stdio<T>(option: Option<T>) -> Option<PollEvented<NamedPipe>>
+pub(super) fn stdio<T>(io: T) -> io::Result<PollEvented<NamedPipe>>
 where
     T: IntoRawHandle,
 {
-    let io = match option {
-        Some(io) => io,
-        None => return None,
-    };
     let pipe = unsafe { NamedPipe::from_raw_handle(io.into_raw_handle()) };
-    PollEvented::new(pipe).ok()
+    PollEvented::new(pipe)
+}
+
+pub(crate) fn convert_to_stdio(io: PollEvented<NamedPipe>) -> io::Result<Stdio> {
+    let named_pipe = io.into_inner()?;
+
+    // Mio does not implement `IntoRawHandle` for `NamedPipe`, so we'll manually
+    // duplicate the handle here...
+    unsafe {
+        let mut dup_handle = INVALID_HANDLE_VALUE;
+        let cur_proc = GetCurrentProcess();
+
+        let status = DuplicateHandle(
+            cur_proc,
+            named_pipe.as_raw_handle(),
+            cur_proc,
+            &mut dup_handle,
+            0 as DWORD,
+            FALSE,
+            DUPLICATE_SAME_ACCESS,
+        );
+
+        if status == 0 {
+            return Err(io::Error::last_os_error());
+        }
+
+        Ok(Stdio::from_raw_handle(dup_handle))
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/basic_scheduler.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/basic_scheduler.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/basic_scheduler.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/basic_scheduler.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,37 @@
+use crate::future::poll_fn;
+use crate::loom::sync::atomic::AtomicBool;
+use crate::loom::sync::Mutex;
 use crate::park::{Park, Unpark};
-use crate::runtime;
-use crate::runtime::task::{self, JoinHandle, Schedule, Task};
-use crate::util::linked_list::LinkedList;
-use crate::util::{waker_ref, Wake};
+use crate::runtime::stats::{RuntimeStats, WorkerStatsBatcher};
+use crate::runtime::task::{self, JoinHandle, OwnedTasks, Schedule, Task};
+use crate::sync::notify::Notify;
+use crate::util::{waker_ref, Wake, WakerRef};
 
 use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::fmt;
 use std::future::Future;
-use std::sync::{Arc, Mutex};
-use std::task::Poll::Ready;
+use std::sync::atomic::Ordering::{AcqRel, Acquire, Release};
+use std::sync::Arc;
+use std::task::Poll::{Pending, Ready};
 use std::time::Duration;
 
 /// Executes tasks on the current thread
-pub(crate) struct BasicScheduler<P>
-where
-    P: Park,
-{
+pub(crate) struct BasicScheduler<P: Park> {
+    /// Inner state guarded by a mutex that is shared
+    /// between all `block_on` calls.
+    inner: Mutex<Option<Inner<P>>>,
+
+    /// Notifier for waking up other threads to steal the
+    /// parker.
+    notify: Notify,
+
+    /// Sendable task spawner
+    spawner: Spawner,
+}
+
+/// The inner scheduler that owns the task queue and the main parker P.
+struct Inner<P: Park> {
     /// Scheduler run queue
     ///
     /// When the scheduler is executed, the queue is removed from `self` and
@@ -33,6 +48,9 @@
 
     /// Thread park handle
     park: P,
+
+    /// Stats batcher
+    stats: WorkerStatsBatcher,
 }
 
 #[derive(Clone)]
@@ -41,25 +59,44 @@
 }
 
 struct Tasks {
-    /// Collection of all active tasks spawned onto this executor.
-    owned: LinkedList<Task<Arc<Shared>>>,
-
     /// Local run queue.
     ///
     /// Tasks notified from the current thread are pushed into this queue.
     queue: VecDeque<task::Notified<Arc<Shared>>>,
 }
 
+/// A remote scheduler entry.
+///
+/// These are filled in by remote threads sending instructions to the scheduler.
+enum RemoteMsg {
+    /// A remote thread wants to spawn a task.
+    Schedule(task::Notified<Arc<Shared>>),
+}
+
+// Safety: Used correctly, the task header is "thread safe". Ultimately the task
+// is owned by the current thread executor, for which this instruction is being
+// sent.
+unsafe impl Send for RemoteMsg {}
+
 /// Scheduler state shared between threads.
 struct Shared {
-    /// Remote run queue
-    queue: Mutex<VecDeque<task::Notified<Arc<Shared>>>>,
+    /// Remote run queue. None if the `Runtime` has been dropped.
+    queue: Mutex<Option<VecDeque<RemoteMsg>>>,
 
-    /// Unpark the blocked thread
+    /// Collection of all active tasks spawned onto this executor.
+    owned: OwnedTasks<Arc<Shared>>,
+
+    /// Unpark the blocked thread.
     unpark: Box<dyn Unpark>,
+
+    /// Indicates whether the blocked on thread was woken.
+    woken: AtomicBool,
+
+    /// Keeps track of various runtime stats.
+    stats: RuntimeStats,
 }
 
-/// Thread-local context
+/// Thread-local context.
 struct Context {
     /// Shared scheduler state
     shared: Arc<Shared>,
@@ -68,38 +105,49 @@
     tasks: RefCell<Tasks>,
 }
 
-/// Initial queue capacity
+/// Initial queue capacity.
 const INITIAL_CAPACITY: usize = 64;
 
 /// Max number of tasks to poll per tick.
+#[cfg(loom)]
+const MAX_TASKS_PER_TICK: usize = 4;
+#[cfg(not(loom))]
 const MAX_TASKS_PER_TICK: usize = 61;
 
-/// How often ot check the remote queue first
+/// How often to check the remote queue first.
 const REMOTE_FIRST_INTERVAL: u8 = 31;
 
-// Tracks the current BasicScheduler
+// Tracks the current BasicScheduler.
 scoped_thread_local!(static CURRENT: Context);
 
-impl<P> BasicScheduler<P>
-where
-    P: Park,
-{
+impl<P: Park> BasicScheduler<P> {
     pub(crate) fn new(park: P) -> BasicScheduler<P> {
         let unpark = Box::new(park.unpark());
 
-        BasicScheduler {
+        let spawner = Spawner {
+            shared: Arc::new(Shared {
+                queue: Mutex::new(Some(VecDeque::with_capacity(INITIAL_CAPACITY))),
+                owned: OwnedTasks::new(),
+                unpark: unpark as Box<dyn Unpark>,
+                woken: AtomicBool::new(false),
+                stats: RuntimeStats::new(1),
+            }),
+        };
+
+        let inner = Mutex::new(Some(Inner {
             tasks: Some(Tasks {
-                owned: LinkedList::new(),
                 queue: VecDeque::with_capacity(INITIAL_CAPACITY),
             }),
-            spawner: Spawner {
-                shared: Arc::new(Shared {
-                    queue: Mutex::new(VecDeque::with_capacity(INITIAL_CAPACITY)),
-                    unpark: unpark as Box<dyn Unpark>,
-                }),
-            },
+            spawner: spawner.clone(),
             tick: 0,
             park,
+            stats: WorkerStatsBatcher::new(0),
+        }));
+
+        BasicScheduler {
+            inner,
+            notify: Notify::new(),
+            spawner,
         }
     }
 
@@ -107,29 +155,69 @@
         &self.spawner
     }
 
-    /// Spawns a future onto the thread pool
-    pub(crate) fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
-    where
-        F: Future + Send + 'static,
-        F::Output: Send + 'static,
-    {
-        self.spawner.spawn(future)
+    pub(crate) fn block_on<F: Future>(&self, future: F) -> F::Output {
+        pin!(future);
+
+        // Attempt to steal the dedicated parker and block_on the future if we can there,
+        // otherwise, lets select on a notification that the parker is available
+        // or the future is complete.
+        loop {
+            if let Some(inner) = &mut self.take_inner() {
+                return inner.block_on(future);
+            } else {
+                let mut enter = crate::runtime::enter(false);
+
+                let notified = self.notify.notified();
+                pin!(notified);
+
+                if let Some(out) = enter
+                    .block_on(poll_fn(|cx| {
+                        if notified.as_mut().poll(cx).is_ready() {
+                            return Ready(None);
+                        }
+
+                        if let Ready(out) = future.as_mut().poll(cx) {
+                            return Ready(Some(out));
+                        }
+
+                        Pending
+                    }))
+                    .expect("Failed to `Enter::block_on`")
+                {
+                    return out;
+                }
+            }
+        }
     }
 
-    pub(crate) fn block_on<F>(&mut self, future: F) -> F::Output
-    where
-        F: Future,
-    {
+    fn take_inner(&self) -> Option<InnerGuard<'_, P>> {
+        let inner = self.inner.lock().take()?;
+
+        Some(InnerGuard {
+            inner: Some(inner),
+            basic_scheduler: self,
+        })
+    }
+}
+
+impl<P: Park> Inner<P> {
+    /// Block on the future provided and drive the runtime's driver.
+    fn block_on<F: Future>(&mut self, future: F) -> F::Output {
         enter(self, |scheduler, context| {
-            let _enter = runtime::enter(false);
-            let waker = waker_ref(&scheduler.spawner.shared);
+            let _enter = crate::runtime::enter(false);
+            let waker = scheduler.spawner.waker_ref();
             let mut cx = std::task::Context::from_waker(&waker);
+            let mut polled = false;
 
             pin!(future);
 
             'outer: loop {
-                if let Ready(v) = crate::coop::budget(|| future.as_mut().poll(&mut cx)) {
-                    return v;
+                if scheduler.spawner.was_woken() || !polled {
+                    polled = true;
+                    scheduler.stats.incr_poll_count();
+                    if let Ready(v) = crate::coop::budget(|| future.as_mut().poll(&mut cx)) {
+                        return v;
+                    }
                 }
 
                 for _ in 0..MAX_TASKS_PER_TICK {
@@ -137,38 +225,54 @@
                     let tick = scheduler.tick;
                     scheduler.tick = scheduler.tick.wrapping_add(1);
 
-                    let next = if tick % REMOTE_FIRST_INTERVAL == 0 {
-                        scheduler
-                            .spawner
-                            .pop()
-                            .or_else(|| context.tasks.borrow_mut().queue.pop_front())
+                    let entry = if tick % REMOTE_FIRST_INTERVAL == 0 {
+                        scheduler.spawner.pop().or_else(|| {
+                            context
+                                .tasks
+                                .borrow_mut()
+                                .queue
+                                .pop_front()
+                                .map(RemoteMsg::Schedule)
+                        })
                     } else {
                         context
                             .tasks
                             .borrow_mut()
                             .queue
                             .pop_front()
+                            .map(RemoteMsg::Schedule)
                             .or_else(|| scheduler.spawner.pop())
                     };
 
-                    match next {
-                        Some(task) => crate::coop::budget(|| task.run()),
+                    let entry = match entry {
+                        Some(entry) => entry,
                         None => {
                             // Park until the thread is signaled
-                            scheduler.park.park().ok().expect("failed to park");
+                            scheduler.stats.about_to_park();
+                            scheduler.stats.submit(&scheduler.spawner.shared.stats);
+                            scheduler.park.park().expect("failed to park");
+                            scheduler.stats.returned_from_park();
 
                             // Try polling the `block_on` future next
                             continue 'outer;
                         }
+                    };
+
+                    match entry {
+                        RemoteMsg::Schedule(task) => {
+                            scheduler.stats.incr_poll_count();
+                            let task = context.shared.owned.assert_owner(task);
+                            crate::coop::budget(|| task.run())
+                        }
                     }
                 }
 
                 // Yield to the park, this drives the timer and pulls any pending
                 // I/O events.
+                scheduler.stats.submit(&scheduler.spawner.shared.stats);
                 scheduler
                     .park
                     .park_timeout(Duration::from_millis(0))
-                    .ok()
                     .expect("failed to park");
             }
         })
@@ -177,16 +281,16 @@
 
 /// Enter the scheduler context. This sets the queue and other necessary
 /// scheduler state in the thread-local
-fn enter<F, R, P>(scheduler: &mut BasicScheduler<P>, f: F) -> R
+fn enter<F, R, P>(scheduler: &mut Inner<P>, f: F) -> R
 where
-    F: FnOnce(&mut BasicScheduler<P>, &Context) -> R,
+    F: FnOnce(&mut Inner<P>, &Context) -> R,
     P: Park,
 {
     // Ensures the run queue is placed back in the `BasicScheduler` instance
     // once `block_on` returns.`
     struct Guard<'a, P: Park> {
         context: Option<Context>,
-        scheduler: &'a mut BasicScheduler<P>,
+        scheduler: &'a mut Inner<P>,
     }
 
     impl<P: Park> Drop for Guard<'_, P> {
@@ -213,34 +317,45 @@
     CURRENT.set(context, || f(scheduler, context))
 }
 
-impl<P> Drop for BasicScheduler<P>
-where
-    P: Park,
-{
+impl<P: Park> Drop for BasicScheduler<P> {
     fn drop(&mut self) {
-        enter(self, |scheduler, context| {
-            // Loop required here to ensure borrow is dropped between iterations
-            #[allow(clippy::while_let_loop)]
-            loop {
-                let task = match context.tasks.borrow_mut().owned.pop_back() {
-                    Some(task) => task,
-                    None => break,
-                };
+        // Avoid a double panic if we are currently panicking and
+        // the lock may be poisoned.
 
-                task.shutdown();
-            }
+        let mut inner = match self.inner.lock().take() {
+            Some(inner) => inner,
+            None if std::thread::panicking() => return,
+            None => panic!("Oh no! We never placed the Inner state back, this is a bug!"),
+        };
+
+        enter(&mut inner, |scheduler, context| {
+            // Drain the OwnedTasks collection. This call also closes the
+            // collection, ensuring that no tasks are ever pushed after this
+            // call returns.
+            context.shared.owned.close_and_shutdown_all();
 
             // Drain local queue
+            // We already shut down every task, so we just need to drop the task.
             for task in context.tasks.borrow_mut().queue.drain(..) {
-                task.shutdown();
+                drop(task);
             }
 
-            // Drain remote queue
-            for task in scheduler.spawner.shared.queue.lock().unwrap().drain(..) {
-                task.shutdown();
+            // Drain remote queue and set it to None
+            let remote_queue = scheduler.spawner.shared.queue.lock().take();
+
+            // Using `Option::take` to replace the shared queue with `None`.
+            // We already shut down every task, so we just need to drop the task.
+            if let Some(remote_queue) = remote_queue {
+                for entry in remote_queue {
+                    match entry {
+                        RemoteMsg::Schedule(task) => {
+                            drop(task);
+                        }
+                    }
+                }
             }
 
-            assert!(context.tasks.borrow().owned.is_empty());
+            assert!(context.shared.owned.is_empty());
         });
     }
 }
@@ -254,19 +369,40 @@
 // ===== impl Spawner =====
 
 impl Spawner {
-    /// Spawns a future onto the thread pool
+    /// Spawns a future onto the basic scheduler
     pub(crate) fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
     where
-        F: Future + Send + 'static,
+        F: crate::future::Future + Send + 'static,
         F::Output: Send + 'static,
     {
-        let (task, handle) = task::joinable(future);
-        self.shared.schedule(task);
+        let (handle, notified) = self.shared.owned.bind(future, self.shared.clone());
+
+        if let Some(notified) = notified {
+            self.shared.schedule(notified);
+        }
+
         handle
     }
 
-    fn pop(&self) -> Option<task::Notified<Arc<Shared>>> {
-        self.shared.queue.lock().unwrap().pop_front()
+    pub(crate) fn stats(&self) -> &RuntimeStats {
+        &self.shared.stats
+    }
+
+    fn pop(&self) -> Option<RemoteMsg> {
+        match self.shared.queue.lock().as_mut() {
+            Some(queue) => queue.pop_front(),
+            None => None,
+        }
+    }
+
+    fn waker_ref(&self) -> WakerRef<'_> {
+        // clear the woken bit
+        self.shared.woken.swap(false, AcqRel);
+        waker_ref(&self.shared)
+    }
+
+    fn was_woken(&self) -> bool {
+        self.shared.woken.load(Acquire)
     }
 }
 
@@ -279,26 +415,8 @@
 // ===== impl Shared =====
 
 impl Schedule for Arc<Shared> {
-    fn bind(task: Task<Self>) -> Arc<Shared> {
-        CURRENT.with(|maybe_cx| {
-            let cx = maybe_cx.expect("scheduler context missing");
-            cx.tasks.borrow_mut().owned.push_front(task);
-            cx.shared.clone()
-        })
-    }
-
     fn release(&self, task: &Task<Self>) -> Option<Task<Self>> {
-        use std::ptr::NonNull;
-
-        CURRENT.with(|maybe_cx| {
-            let cx = maybe_cx.expect("scheduler context missing");
-
-            // safety: the task is inserted in the list in `bind`.
-            unsafe {
-                let ptr = NonNull::from(task.header());
-                cx.tasks.borrow_mut().owned.remove(ptr)
-            }
-        })
+        self.owned.remove(task)
     }
 
     fn schedule(&self, task: task::Notified<Self>) {
@@ -307,8 +425,14 @@
                 cx.tasks.borrow_mut().queue.push_back(task);
             }
             _ => {
-                self.queue.lock().unwrap().push_back(task);
-                self.unpark.unpark();
+                // If the queue is None, then the runtime has shut down. We
+                // don't need to do anything with the notification in that case.
+                let mut guard = self.queue.lock();
+                if let Some(queue) = guard.as_mut() {
+                    queue.push_back(RemoteMsg::Schedule(task));
+                    drop(guard);
+                    self.unpark.unpark();
+                }
             }
         });
     }
@@ -321,6 +445,41 @@
 
     /// Wake by reference
     fn wake_by_ref(arc_self: &Arc<Self>) {
+        arc_self.woken.store(true, Release);
         arc_self.unpark.unpark();
     }
 }
+
+// ===== InnerGuard =====
+
+/// Used to ensure we always place the Inner value
+/// back into its slot in `BasicScheduler`, even if the
+/// future panics.
+struct InnerGuard<'a, P: Park> {
+    inner: Option<Inner<P>>,
+    basic_scheduler: &'a BasicScheduler<P>,
+}
+
+impl<P: Park> InnerGuard<'_, P> {
+    fn block_on<F: Future>(&mut self, future: F) -> F::Output {
+        // The only time inner gets set to `None` is if we have dropped
+        // already so this unwrap is safe.
+        self.inner.as_mut().unwrap().block_on(future)
+    }
+}
+
+impl<P: Park> Drop for InnerGuard<'_, P> {
+    fn drop(&mut self) {
+        if let Some(scheduler) = self.inner.take() {
+            let mut lock = self.basic_scheduler.inner.lock();
+
+            // Replace old scheduler back into the state to allow
+            // other threads to pick it up and drive it.
+            lock.replace(scheduler);
+
+            // Wake up other possible threads that could steal
+            // the dedicated parker P.
+            self.basic_scheduler.notify.notify_one()
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,22 +3,22 @@
 //! shells. This isolates the complexity of dealing with conditional
 //! compilation.
 
-cfg_blocking_impl! {
-    mod pool;
-    pub(crate) use pool::{spawn_blocking, try_spawn_blocking, BlockingPool, Spawner};
-
-    mod schedule;
-    mod shutdown;
-    pub(crate) mod task;
+mod pool;
+pub(crate) use pool::{spawn_blocking, BlockingPool, Spawner};
 
-    use crate::runtime::Builder;
+mod schedule;
+mod shutdown;
+mod task;
+pub(crate) use schedule::NoopSchedule;
+pub(crate) use task::BlockingTask;
 
-    pub(crate) fn create_blocking_pool(builder: &Builder, thread_cap: usize) -> BlockingPool {
-        BlockingPool::new(builder, thread_cap)
+use crate::runtime::Builder;
 
-    }
+pub(crate) fn create_blocking_pool(builder: &Builder, thread_cap: usize) -> BlockingPool {
+    BlockingPool::new(builder, thread_cap)
 }
 
+/*
 cfg_not_blocking_impl! {
     use crate::runtime::Builder;
     use std::time::Duration;
@@ -41,3 +41,4 @@
         }
     }
 }
+*/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/pool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/pool.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,13 +4,13 @@
 use crate::loom::thread;
 use crate::runtime::blocking::schedule::NoopSchedule;
 use crate::runtime::blocking::shutdown;
-use crate::runtime::blocking::task::BlockingTask;
+use crate::runtime::builder::ThreadNameFn;
+use crate::runtime::context;
 use crate::runtime::task::{self, JoinHandle};
 use crate::runtime::{Builder, Callback, Handle};
+use crate::util::error::CONTEXT_MISSING_ERROR;
 
-use slab::Slab;
-
-use std::collections::VecDeque;
+use std::collections::{HashMap, VecDeque};
 use std::fmt;
 use std::time::Duration;
 
@@ -32,7 +32,7 @@
     condvar: Condvar,
 
     /// Spawned threads use this name
-    thread_name: String,
+    thread_name: ThreadNameFn,
 
     /// Spawned thread stack size
     stack_size: Option<usize>,
@@ -45,6 +45,9 @@
 
     // Maximum number of threads
     thread_cap: usize,
+
+    // Customizable wait timeout
+    keep_alive: Duration,
 }
 
 struct Shared {
@@ -54,10 +57,21 @@
     num_notify: u32,
     shutdown: bool,
     shutdown_tx: Option<shutdown::Sender>,
-    worker_threads: Slab<thread::JoinHandle<()>>,
+    /// Prior to shutdown, we clean up JoinHandles by having each timed-out
+    /// thread join on the previous timed-out thread. This is not strictly
+    /// necessary but helps avoid Valgrind false positives, see
+    /// <https://github.com/tokio-rs/tokio/commit/646fbae76535e397ef79dbcaacb945d4c829f666>
+    /// for more information.
+    last_exiting_thread: Option<thread::JoinHandle<()>>,
+    /// This holds the JoinHandles for all running threads; on shutdown, the thread
+    /// calling shutdown handles joining on these.
+    worker_threads: HashMap<usize, thread::JoinHandle<()>>,
+    /// This is a counter used to iterate worker_threads in a consistent order (for loom's
+    /// benefit)
+    worker_thread_index: usize,
 }
 
-type Task = task::Notified<NoopSchedule>;
+type Task = task::UnownedTask<NoopSchedule>;
 
 const KEEP_ALIVE: Duration = Duration::from_secs(10);
 
@@ -65,23 +79,10 @@
 pub(crate) fn spawn_blocking<F, R>(func: F) -> JoinHandle<R>
 where
     F: FnOnce() -> R + Send + 'static,
+    R: Send + 'static,
 {
-    let rt = Handle::current();
-
-    let (task, handle) = task::joinable(BlockingTask::new(func));
-    let _ = rt.blocking_spawner.spawn(task, &rt);
-    handle
-}
-
-#[allow(dead_code)]
-pub(crate) fn try_spawn_blocking<F, R>(func: F) -> Result<(), ()>
-where
-    F: FnOnce() -> R + Send + 'static,
-{
-    let rt = Handle::current();
-
-    let (task, _handle) = task::joinable(BlockingTask::new(func));
-    rt.blocking_spawner.spawn(task, &rt)
+    let rt = context::current().expect(CONTEXT_MISSING_ERROR);
+    rt.spawn_blocking(func)
 }
 
 // ===== impl BlockingPool =====
@@ -89,6 +90,7 @@
 impl BlockingPool {
     pub(crate) fn new(builder: &Builder, thread_cap: usize) -> BlockingPool {
         let (shutdown_tx, shutdown_rx) = shutdown::channel();
+        let keep_alive = builder.keep_alive.unwrap_or(KEEP_ALIVE);
 
         BlockingPool {
             spawner: Spawner {
@@ -100,7 +102,9 @@
                         num_notify: 0,
                         shutdown: false,
                         shutdown_tx: Some(shutdown_tx),
-                        worker_threads: Slab::new(),
+                        last_exiting_thread: None,
+                        worker_threads: HashMap::new(),
+                        worker_thread_index: 0,
                     }),
                     condvar: Condvar::new(),
                     thread_name: builder.thread_name.clone(),
@@ -108,6 +112,7 @@
                     after_start: builder.after_start.clone(),
                     before_stop: builder.before_stop.clone(),
                     thread_cap,
+                    keep_alive,
                 }),
             },
             shutdown_rx,
@@ -119,7 +124,7 @@
     }
 
     pub(crate) fn shutdown(&mut self, timeout: Option<Duration>) {
-        let mut shared = self.spawner.inner.shared.lock().unwrap();
+        let mut shared = self.spawner.inner.shared.lock();
 
         // The function can be called multiple times. First, by explicitly
         // calling `shutdown` then by the drop handler calling `shutdown`. This
@@ -131,12 +136,21 @@
         shared.shutdown = true;
         shared.shutdown_tx = None;
         self.spawner.inner.condvar.notify_all();
-        let mut workers = std::mem::replace(&mut shared.worker_threads, Slab::new());
+
+        let last_exited_thread = std::mem::take(&mut shared.last_exiting_thread);
+        let workers = std::mem::take(&mut shared.worker_threads);
 
         drop(shared);
 
         if self.shutdown_rx.wait(timeout) {
-            for handle in workers.drain() {
+            let _ = last_exited_thread.map(|th| th.join());
+
+            // Loom requires that execution be deterministic, so sort by thread ID before joining.
+            // (HashMaps use a randomly-seeded hash function, so the order is nondeterministic)
+            let mut workers: Vec<(usize, thread::JoinHandle<()>)> = workers.into_iter().collect();
+            workers.sort_by_key(|(id, _)| *id);
+
+            for (_id, handle) in workers.into_iter() {
                 let _ = handle.join();
             }
         }
@@ -160,7 +174,7 @@
 impl Spawner {
     pub(crate) fn spawn(&self, task: Task, rt: &Handle) -> Result<(), ()> {
         let shutdown_tx = {
-            let mut shared = self.inner.shared.lock().unwrap();
+            let mut shared = self.inner.shared.lock();
 
             if shared.shutdown {
                 // Shutdown the task
@@ -197,12 +211,14 @@
         };
 
         if let Some(shutdown_tx) = shutdown_tx {
-            let mut shared = self.inner.shared.lock().unwrap();
-            let entry = shared.worker_threads.vacant_entry();
+            let mut shared = self.inner.shared.lock();
 
-            let handle = self.spawn_thread(shutdown_tx, rt, entry.key());
+            let id = shared.worker_thread_index;
+            shared.worker_thread_index += 1;
 
-            entry.insert(handle);
+            let handle = self.spawn_thread(shutdown_tx, rt, id);
+
+            shared.worker_threads.insert(id, handle);
         }
 
         Ok(())
@@ -212,9 +228,9 @@
         &self,
         shutdown_tx: shutdown::Sender,
         rt: &Handle,
-        worker_id: usize,
+        id: usize,
     ) -> thread::JoinHandle<()> {
-        let mut builder = thread::Builder::new().name(self.inner.thread_name.clone());
+        let mut builder = thread::Builder::new().name((self.inner.thread_name)());
 
         if let Some(stack_size) = self.inner.stack_size {
             builder = builder.stack_size(stack_size);
@@ -225,23 +241,22 @@
         builder
             .spawn(move || {
                 // Only the reference should be moved into the closure
-                let rt = &rt;
-                rt.enter(move || {
-                    rt.blocking_spawner.inner.run(worker_id);
-                    drop(shutdown_tx);
-                })
+                let _enter = crate::runtime::context::enter(rt.clone());
+                rt.blocking_spawner.inner.run(id);
+                drop(shutdown_tx);
             })
             .unwrap()
     }
 }
 
 impl Inner {
-    fn run(&self, worker_id: usize) {
+    fn run(&self, worker_thread_id: usize) {
         if let Some(f) = &self.after_start {
             f()
         }
 
-        let mut shared = self.shared.lock().unwrap();
+        let mut shared = self.shared.lock();
+        let mut join_on_thread = None;
 
         'main: loop {
             // BUSY
@@ -249,14 +264,14 @@
                 drop(shared);
                 task.run();
 
-                shared = self.shared.lock().unwrap();
+                shared = self.shared.lock();
             }
 
             // IDLE
             shared.num_idle += 1;
 
             while !shared.shutdown {
-                let lock_result = self.condvar.wait_timeout(shared, KEEP_ALIVE).unwrap();
+                let lock_result = self.condvar.wait_timeout(shared, self.keep_alive).unwrap();
 
                 shared = lock_result.0;
                 let timeout_result = lock_result.1;
@@ -272,7 +287,11 @@
                 // Even if the condvar "timed out", if the pool is entering the
                 // shutdown phase, we want to perform the cleanup logic.
                 if !shared.shutdown && timeout_result.timed_out() {
-                    shared.worker_threads.remove(worker_id);
+                    // We'll join the prior timed-out thread's JoinHandle after dropping the lock.
+                    // This isn't done when shutting down, because the thread calling shutdown will
+                    // handle joining everything.
+                    let my_handle = shared.worker_threads.remove(&worker_thread_id);
+                    join_on_thread = std::mem::replace(&mut shared.last_exiting_thread, my_handle);
 
                     break 'main;
                 }
@@ -286,7 +305,7 @@
                     drop(shared);
                     task.shutdown();
 
-                    shared = self.shared.lock().unwrap();
+                    shared = self.shared.lock();
                 }
 
                 // Work was produced, and we "took" it (by decrementing num_notify).
@@ -319,6 +338,10 @@
         if let Some(f) = &self.before_stop {
             f()
         }
+
+        if let Some(handle) = join_on_thread {
+            let _ = handle.join();
+        }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/schedule.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/schedule.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/schedule.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/schedule.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,11 +9,6 @@
 pub(crate) struct NoopSchedule;
 
 impl task::Schedule for NoopSchedule {
-    fn bind(_task: Task<Self>) -> NoopSchedule {
-        // Do nothing w/ the task
-        NoopSchedule
-    }
-
     fn release(&self, _task: &Task<Self>) -> Option<Task<Self>> {
         None
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/shutdown.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/shutdown.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/shutdown.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/shutdown.rs	2021-12-09 12:01:26.000000000 +0000
@@ -38,7 +38,7 @@
         use crate::runtime::enter::try_enter;
 
         if timeout == Some(Duration::from_nanos(0)) {
-            return true;
+            return false;
         }
 
         let mut e = match try_enter(false) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/task.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/task.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/blocking/task.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/blocking/task.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,8 @@
 
 impl<T, R> Future for BlockingTask<T>
 where
-    T: FnOnce() -> R,
+    T: FnOnce() -> R + Send + 'static,
+    R: Send + 'static,
 {
     type Output = R;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/builder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/builder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/builder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/builder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,23 +1,24 @@
 use crate::runtime::handle::Handle;
-use crate::runtime::shell::Shell;
-use crate::runtime::{blocking, io, time, Callback, Runtime, Spawner};
+use crate::runtime::{blocking, driver, Callback, Runtime, Spawner};
 
 use std::fmt;
-#[cfg(not(loom))]
-use std::sync::Arc;
+use std::io;
+use std::time::Duration;
 
 /// Builds Tokio Runtime with custom configuration values.
 ///
 /// Methods can be chained in order to set the configuration values. The
 /// Runtime is constructed by calling [`build`].
 ///
-/// New instances of `Builder` are obtained via [`Builder::new`].
+/// New instances of `Builder` are obtained via [`Builder::new_multi_thread`]
+/// or [`Builder::new_current_thread`].
 ///
 /// See function level documentation for details on the various configuration
 /// settings.
 ///
 /// [`build`]: method@Self::build
-/// [`Builder::new`]: method@Self::new
+/// [`Builder::new_multi_thread`]: method@Self::new_multi_thread
+/// [`Builder::new_current_thread`]: method@Self::new_current_thread
 ///
 /// # Examples
 ///
@@ -26,9 +27,8 @@
 ///
 /// fn main() {
 ///     // build runtime
-///     let runtime = Builder::new()
-///         .threaded_scheduler()
-///         .core_threads(4)
+///     let runtime = Builder::new_multi_thread()
+///         .worker_threads(4)
 ///         .thread_name("my-custom-name")
 ///         .thread_stack_size(3 * 1024 * 1024)
 ///         .build()
@@ -38,7 +38,7 @@
 /// }
 /// ```
 pub struct Builder {
-    /// The task execution model to use.
+    /// Runtime type
     kind: Kind,
 
     /// Whether or not to enable the I/O driver
@@ -47,16 +47,19 @@
     /// Whether or not to enable the time driver
     enable_time: bool,
 
+    /// Whether or not the clock should start paused.
+    start_paused: bool,
+
     /// The number of worker threads, used by Runtime.
     ///
     /// Only used when not using the current-thread executor.
-    core_threads: Option<usize>,
+    worker_threads: Option<usize>,
 
     /// Cap on thread usage.
-    max_threads: usize,
+    max_blocking_threads: usize,
 
-    /// Name used for threads spawned by the runtime.
-    pub(super) thread_name: String,
+    /// Name fn used for threads spawned by the runtime.
+    pub(super) thread_name: ThreadNameFn,
 
     /// Stack size used for threads spawned by the runtime.
     pub(super) thread_stack_size: Option<usize>,
@@ -66,26 +69,48 @@
 
     /// To run before each worker thread stops
     pub(super) before_stop: Option<Callback>,
+
+    /// Customizable keep alive timeout for BlockingPool
+    pub(super) keep_alive: Option<Duration>,
 }
 
-#[derive(Debug, Clone, Copy)]
-enum Kind {
-    Shell,
-    #[cfg(feature = "rt-core")]
-    Basic,
-    #[cfg(feature = "rt-threaded")]
-    ThreadPool,
+pub(crate) type ThreadNameFn = std::sync::Arc<dyn Fn() -> String + Send + Sync + 'static>;
+
+pub(crate) enum Kind {
+    CurrentThread,
+    #[cfg(feature = "rt-multi-thread")]
+    MultiThread,
 }
 
 impl Builder {
+    /// Returns a new builder with the current thread scheduler selected.
+    ///
+    /// Configuration methods can be chained on the return value.
+    ///
+    /// To spawn non-`Send` tasks on the resulting runtime, combine it with a
+    /// [`LocalSet`].
+    ///
+    /// [`LocalSet`]: crate::task::LocalSet
+    pub fn new_current_thread() -> Builder {
+        Builder::new(Kind::CurrentThread)
+    }
+
+    /// Returns a new builder with the multi thread scheduler selected.
+    ///
+    /// Configuration methods can be chained on the return value.
+    #[cfg(feature = "rt-multi-thread")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rt-multi-thread")))]
+    pub fn new_multi_thread() -> Builder {
+        Builder::new(Kind::MultiThread)
+    }
+
     /// Returns a new runtime builder initialized with default configuration
     /// values.
     ///
     /// Configuration methods can be chained on the return value.
-    pub fn new() -> Builder {
+    pub(crate) fn new(kind: Kind) -> Builder {
         Builder {
-            // No task execution by default
-            kind: Kind::Shell,
+            kind,
 
             // I/O defaults to "off"
             enable_io: false,
@@ -93,13 +118,16 @@
             // Time defaults to "off"
             enable_time: false,
 
+            // The clock starts not-paused
+            start_paused: false,
+
             // Default to lazy auto-detection (one thread per CPU core)
-            core_threads: None,
+            worker_threads: None,
 
-            max_threads: 512,
+            max_blocking_threads: 512,
 
             // Default thread name
-            thread_name: "tokio-runtime-worker".into(),
+            thread_name: std::sync::Arc::new(|| "tokio-runtime-worker".into()),
 
             // Do not set a stack size by default
             thread_stack_size: None,
@@ -107,6 +135,8 @@
             // No worker thread callbacks
             after_start: None,
             before_stop: None,
+
+            keep_alive: None,
         }
     }
 
@@ -121,14 +151,13 @@
     /// ```
     /// use tokio::runtime;
     ///
-    /// let rt = runtime::Builder::new()
-    ///     .threaded_scheduler()
+    /// let rt = runtime::Builder::new_multi_thread()
     ///     .enable_all()
     ///     .build()
     ///     .unwrap();
     /// ```
     pub fn enable_all(&mut self) -> &mut Self {
-        #[cfg(feature = "io-driver")]
+        #[cfg(any(feature = "net", feature = "process", all(unix, feature = "signal")))]
         self.enable_io();
         #[cfg(feature = "time")]
         self.enable_time();
@@ -136,61 +165,86 @@
         self
     }
 
-    #[deprecated(note = "In future will be replaced by core_threads method")]
-    /// Sets the maximum number of worker threads for the `Runtime`'s thread pool.
+    /// Sets the number of worker threads the `Runtime` will use.
+    ///
+    /// This can be any number above 0 though it is advised to keep this value
+    /// on the smaller side.
     ///
-    /// This must be a number between 1 and 32,768 though it is advised to keep
-    /// this value on the smaller side.
+    /// # Default
     ///
     /// The default value is the number of cores available to the system.
-    pub fn num_threads(&mut self, val: usize) -> &mut Self {
-        self.core_threads = Some(val);
-        self
-    }
-
-    /// Sets the core number of worker threads for the `Runtime`'s thread pool.
     ///
-    /// This should be a number between 1 and 32,768 though it is advised to keep
-    /// this value on the smaller side.
+    /// # Panic
     ///
-    /// The default value is the number of cores available to the system.
+    /// When using the `current_thread` runtime this method will panic, since
+    /// those variants do not allow setting worker thread counts.
     ///
-    /// These threads will be always active and running.
     ///
     /// # Examples
     ///
+    /// ## Multi threaded runtime with 4 threads
+    ///
     /// ```
     /// use tokio::runtime;
     ///
-    /// let rt = runtime::Builder::new()
-    ///     .threaded_scheduler()
-    ///     .core_threads(4)
+    /// // This will spawn a work-stealing runtime with 4 worker threads.
+    /// let rt = runtime::Builder::new_multi_thread()
+    ///     .worker_threads(4)
     ///     .build()
     ///     .unwrap();
+    ///
+    /// rt.spawn(async move {});
+    /// ```
+    ///
+    /// ## Current thread runtime (will only run on the current thread via `Runtime::block_on`)
+    ///
     /// ```
-    pub fn core_threads(&mut self, val: usize) -> &mut Self {
-        assert_ne!(val, 0, "Core threads cannot be zero");
-        self.core_threads = Some(val);
+    /// use tokio::runtime;
+    ///
+    /// // Create a runtime that _must_ be driven from a call
+    /// // to `Runtime::block_on`.
+    /// let rt = runtime::Builder::new_current_thread()
+    ///     .build()
+    ///     .unwrap();
+    ///
+    /// // This will run the runtime and future on the current thread
+    /// rt.block_on(async move {});
+    /// ```
+    ///
+    /// # Panic
+    ///
+    /// This will panic if `val` is not larger than `0`.
+    pub fn worker_threads(&mut self, val: usize) -> &mut Self {
+        assert!(val > 0, "Worker threads cannot be set to 0");
+        self.worker_threads = Some(val);
         self
     }
 
-    /// Specifies limit for threads, spawned by the Runtime.
-    ///
-    /// This is number of threads to be used by Runtime, including `core_threads`
-    /// Having `max_threads` less than `core_threads` results in invalid configuration
-    /// when building multi-threaded `Runtime`, which would cause a panic.
+    /// Specifies the limit for additional threads spawned by the Runtime.
     ///
-    /// Similarly to the `core_threads`, this number should be between 1 and 32,768.
+    /// These threads are used for blocking operations like tasks spawned
+    /// through [`spawn_blocking`]. Unlike the [`worker_threads`], they are not
+    /// always active and will exit if left idle for too long. You can change
+    /// this timeout duration with [`thread_keep_alive`].
     ///
     /// The default value is 512.
     ///
-    /// When multi-threaded runtime is not used, will act as limit on additional threads.
+    /// # Panic
+    ///
+    /// This will panic if `val` is not larger than `0`.
+    ///
+    /// # Upgrading from 0.x
+    ///
+    /// In old versions `max_threads` limited both blocking and worker threads, but the
+    /// current `max_blocking_threads` does not include async worker threads in the count.
     ///
-    /// Otherwise as `core_threads` are always active, it limits additional threads (e.g. for
-    /// blocking annotations) as `max_threads - core_threads`.
-    pub fn max_threads(&mut self, val: usize) -> &mut Self {
-        assert_ne!(val, 0, "Thread limit cannot be zero");
-        self.max_threads = val;
+    /// [`spawn_blocking`]: fn@crate::task::spawn_blocking
+    /// [`worker_threads`]: Self::worker_threads
+    /// [`thread_keep_alive`]: Self::thread_keep_alive
+    #[cfg_attr(docsrs, doc(alias = "max_threads"))]
+    pub fn max_blocking_threads(&mut self, val: usize) -> &mut Self {
+        assert!(val > 0, "Max blocking threads cannot be set to 0");
+        self.max_blocking_threads = val;
         self
     }
 
@@ -204,13 +258,42 @@
     /// # use tokio::runtime;
     ///
     /// # pub fn main() {
-    /// let rt = runtime::Builder::new()
+    /// let rt = runtime::Builder::new_multi_thread()
     ///     .thread_name("my-pool")
     ///     .build();
     /// # }
     /// ```
     pub fn thread_name(&mut self, val: impl Into<String>) -> &mut Self {
-        self.thread_name = val.into();
+        let val = val.into();
+        self.thread_name = std::sync::Arc::new(move || val.clone());
+        self
+    }
+
+    /// Sets a function used to generate the name of threads spawned by the `Runtime`'s thread pool.
+    ///
+    /// The default name fn is `|| "tokio-runtime-worker".into()`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use tokio::runtime;
+    /// # use std::sync::atomic::{AtomicUsize, Ordering};
+    ///
+    /// # pub fn main() {
+    /// let rt = runtime::Builder::new_multi_thread()
+    ///     .thread_name_fn(|| {
+    ///        static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
+    ///        let id = ATOMIC_ID.fetch_add(1, Ordering::SeqCst);
+    ///        format!("my-pool-{}", id)
+    ///     })
+    ///     .build();
+    /// # }
+    /// ```
+    pub fn thread_name_fn<F>(&mut self, f: F) -> &mut Self
+    where
+        F: Fn() -> String + Send + Sync + 'static,
+    {
+        self.thread_name = std::sync::Arc::new(f);
         self
     }
 
@@ -228,8 +311,7 @@
     /// # use tokio::runtime;
     ///
     /// # pub fn main() {
-    /// let rt = runtime::Builder::new()
-    ///     .threaded_scheduler()
+    /// let rt = runtime::Builder::new_multi_thread()
     ///     .thread_stack_size(32 * 1024)
     ///     .build();
     /// # }
@@ -250,8 +332,7 @@
     /// # use tokio::runtime;
     ///
     /// # pub fn main() {
-    /// let runtime = runtime::Builder::new()
-    ///     .threaded_scheduler()
+    /// let runtime = runtime::Builder::new_multi_thread()
     ///     .on_thread_start(|| {
     ///         println!("thread started");
     ///     })
@@ -263,7 +344,7 @@
     where
         F: Fn() + Send + Sync + 'static,
     {
-        self.after_start = Some(Arc::new(f));
+        self.after_start = Some(std::sync::Arc::new(f));
         self
     }
 
@@ -277,8 +358,7 @@
     /// # use tokio::runtime;
     ///
     /// # pub fn main() {
-    /// let runtime = runtime::Builder::new()
-    ///     .threaded_scheduler()
+    /// let runtime = runtime::Builder::new_multi_thread()
     ///     .on_thread_stop(|| {
     ///         println!("thread stopping");
     ///     })
@@ -290,56 +370,92 @@
     where
         F: Fn() + Send + Sync + 'static,
     {
-        self.before_stop = Some(Arc::new(f));
+        self.before_stop = Some(std::sync::Arc::new(f));
         self
     }
 
     /// Creates the configured `Runtime`.
     ///
-    /// The returned `ThreadPool` instance is ready to spawn tasks.
+    /// The returned `Runtime` instance is ready to spawn tasks.
     ///
     /// # Examples
     ///
     /// ```
     /// use tokio::runtime::Builder;
     ///
-    /// let mut rt = Builder::new().build().unwrap();
+    /// let rt  = Builder::new_multi_thread().build().unwrap();
     ///
     /// rt.block_on(async {
     ///     println!("Hello from the Tokio runtime");
     /// });
     /// ```
     pub fn build(&mut self) -> io::Result<Runtime> {
-        match self.kind {
-            Kind::Shell => self.build_shell_runtime(),
-            #[cfg(feature = "rt-core")]
-            Kind::Basic => self.build_basic_runtime(),
-            #[cfg(feature = "rt-threaded")]
-            Kind::ThreadPool => self.build_threaded_runtime(),
+        match &self.kind {
+            Kind::CurrentThread => self.build_basic_runtime(),
+            #[cfg(feature = "rt-multi-thread")]
+            Kind::MultiThread => self.build_threaded_runtime(),
         }
     }
 
-    fn build_shell_runtime(&mut self) -> io::Result<Runtime> {
-        use crate::runtime::Kind;
+    fn get_cfg(&self) -> driver::Cfg {
+        driver::Cfg {
+            enable_pause_time: match self.kind {
+                Kind::CurrentThread => true,
+                #[cfg(feature = "rt-multi-thread")]
+                Kind::MultiThread => false,
+            },
+            enable_io: self.enable_io,
+            enable_time: self.enable_time,
+            start_paused: self.start_paused,
+        }
+    }
 
-        let clock = time::create_clock();
+    /// Sets a custom timeout for a thread in the blocking pool.
+    ///
+    /// By default, the timeout for a thread is set to 10 seconds. This can
+    /// be overridden using .thread_keep_alive().
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use tokio::runtime;
+    /// # use std::time::Duration;
+    ///
+    /// # pub fn main() {
+    /// let rt = runtime::Builder::new_multi_thread()
+    ///     .thread_keep_alive(Duration::from_millis(100))
+    ///     .build();
+    /// # }
+    /// ```
+    pub fn thread_keep_alive(&mut self, duration: Duration) -> &mut Self {
+        self.keep_alive = Some(duration);
+        self
+    }
+
+    fn build_basic_runtime(&mut self) -> io::Result<Runtime> {
+        use crate::runtime::{BasicScheduler, Kind};
 
-        // Create I/O driver
-        let (io_driver, io_handle) = io::create_driver(self.enable_io)?;
-        let (driver, time_handle) = time::create_driver(self.enable_time, io_driver, clock.clone());
+        let (driver, resources) = driver::Driver::new(self.get_cfg())?;
 
-        let spawner = Spawner::Shell;
+        // And now put a single-threaded scheduler on top of the timer. When
+        // there are no futures ready to do something, it'll let the timer or
+        // the reactor to generate some new stimuli for the futures to continue
+        // in their life.
+        let scheduler = BasicScheduler::new(driver);
+        let spawner = Spawner::Basic(scheduler.spawner().clone());
 
-        let blocking_pool = blocking::create_blocking_pool(self, self.max_threads);
+        // Blocking pool
+        let blocking_pool = blocking::create_blocking_pool(self, self.max_blocking_threads);
         let blocking_spawner = blocking_pool.spawner().clone();
 
         Ok(Runtime {
-            kind: Kind::Shell(Shell::new(driver)),
+            kind: Kind::CurrentThread(scheduler),
             handle: Handle {
                 spawner,
-                io_handle,
-                time_handle,
-                clock,
+                io_handle: resources.io_handle,
+                time_handle: resources.time_handle,
+                signal_handle: resources.signal_handle,
+                clock: resources.clock,
                 blocking_spawner,
             },
             blocking_pool,
@@ -359,7 +475,7 @@
         /// ```
         /// use tokio::runtime;
         ///
-        /// let rt = runtime::Builder::new()
+        /// let rt = runtime::Builder::new_multi_thread()
         ///     .enable_io()
         ///     .build()
         ///     .unwrap();
@@ -382,7 +498,7 @@
         /// ```
         /// use tokio::runtime;
         ///
-        /// let rt = runtime::Builder::new()
+        /// let rt = runtime::Builder::new_multi_thread()
         ///     .enable_time()
         ///     .build()
         ///     .unwrap();
@@ -394,103 +510,62 @@
     }
 }
 
-cfg_rt_core! {
+cfg_test_util! {
     impl Builder {
-        /// Sets runtime to use a simpler scheduler that runs all tasks on the current-thread.
+        /// Controls if the runtime's clock starts paused or advancing.
+        ///
+        /// Pausing time requires the current-thread runtime; construction of
+        /// the runtime will panic otherwise.
         ///
-        /// The executor and all necessary drivers will all be run on the current
-        /// thread during [`block_on`] calls.
+        /// # Examples
         ///
-        /// See also [the module level documentation][1], which has a section on scheduler
-        /// types.
+        /// ```
+        /// use tokio::runtime;
         ///
-        /// [1]: index.html#runtime-configurations
-        /// [`block_on`]: Runtime::block_on
-        pub fn basic_scheduler(&mut self) -> &mut Self {
-            self.kind = Kind::Basic;
+        /// let rt = runtime::Builder::new_current_thread()
+        ///     .enable_time()
+        ///     .start_paused(true)
+        ///     .build()
+        ///     .unwrap();
+        /// ```
+        pub fn start_paused(&mut self, start_paused: bool) -> &mut Self {
+            self.start_paused = start_paused;
             self
         }
-
-        fn build_basic_runtime(&mut self) -> io::Result<Runtime> {
-            use crate::runtime::{BasicScheduler, Kind};
-
-            let clock = time::create_clock();
-
-            // Create I/O driver
-            let (io_driver, io_handle) = io::create_driver(self.enable_io)?;
-
-            let (driver, time_handle) = time::create_driver(self.enable_time, io_driver, clock.clone());
-
-            // And now put a single-threaded scheduler on top of the timer. When
-            // there are no futures ready to do something, it'll let the timer or
-            // the reactor to generate some new stimuli for the futures to continue
-            // in their life.
-            let scheduler = BasicScheduler::new(driver);
-            let spawner = Spawner::Basic(scheduler.spawner().clone());
-
-            // Blocking pool
-            let blocking_pool = blocking::create_blocking_pool(self, self.max_threads);
-            let blocking_spawner = blocking_pool.spawner().clone();
-
-            Ok(Runtime {
-                kind: Kind::Basic(scheduler),
-                handle: Handle {
-                    spawner,
-                    io_handle,
-                    time_handle,
-                    clock,
-                    blocking_spawner,
-                },
-                blocking_pool,
-            })
-        }
     }
 }
 
-cfg_rt_threaded! {
+cfg_rt_multi_thread! {
     impl Builder {
-        /// Sets runtime to use a multi-threaded scheduler for executing tasks.
-        ///
-        /// See also [the module level documentation][1], which has a section on scheduler
-        /// types.
-        ///
-        /// [1]: index.html#runtime-configurations
-        pub fn threaded_scheduler(&mut self) -> &mut Self {
-            self.kind = Kind::ThreadPool;
-            self
-        }
-
         fn build_threaded_runtime(&mut self) -> io::Result<Runtime> {
             use crate::loom::sys::num_cpus;
             use crate::runtime::{Kind, ThreadPool};
             use crate::runtime::park::Parker;
-            use std::cmp;
 
-            let core_threads = self.core_threads.unwrap_or_else(|| cmp::min(self.max_threads, num_cpus()));
-            assert!(core_threads <= self.max_threads, "Core threads number cannot be above max limit");
+            let core_threads = self.worker_threads.unwrap_or_else(num_cpus);
 
-            let clock = time::create_clock();
+            let (driver, resources) = driver::Driver::new(self.get_cfg())?;
 
-            let (io_driver, io_handle) = io::create_driver(self.enable_io)?;
-            let (driver, time_handle) = time::create_driver(self.enable_time, io_driver, clock.clone());
             let (scheduler, launch) = ThreadPool::new(core_threads, Parker::new(driver));
             let spawner = Spawner::ThreadPool(scheduler.spawner().clone());
 
             // Create the blocking pool
-            let blocking_pool = blocking::create_blocking_pool(self, self.max_threads);
+            let blocking_pool = blocking::create_blocking_pool(self, self.max_blocking_threads + core_threads);
             let blocking_spawner = blocking_pool.spawner().clone();
 
             // Create the runtime handle
             let handle = Handle {
                 spawner,
-                io_handle,
-                time_handle,
-                clock,
+                io_handle: resources.io_handle,
+                time_handle: resources.time_handle,
+                signal_handle: resources.signal_handle,
+                clock: resources.clock,
                 blocking_spawner,
             };
 
             // Spawn the thread pool workers
-            handle.enter(|| launch.launch());
+            let _enter = crate::runtime::context::enter(handle.clone());
+            launch.launch();
 
             Ok(Runtime {
                 kind: Kind::ThreadPool(scheduler),
@@ -501,19 +576,15 @@
     }
 }
 
-impl Default for Builder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl fmt::Debug for Builder {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Builder")
-            .field("kind", &self.kind)
-            .field("core_threads", &self.core_threads)
-            .field("max_threads", &self.max_threads)
-            .field("thread_name", &self.thread_name)
+            .field("worker_threads", &self.worker_threads)
+            .field("max_blocking_threads", &self.max_blocking_threads)
+            .field(
+                "thread_name",
+                &"<dyn Fn() -> String + Send + Sync + 'static>",
+            )
             .field("thread_stack_size", &self.thread_stack_size)
             .field("after_start", &self.after_start.as_ref().map(|_| "..."))
             .field("before_stop", &self.after_start.as_ref().map(|_| "..."))
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/context.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/context.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/context.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/context.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,62 +12,62 @@
 }
 
 cfg_io_driver! {
-    pub(crate) fn io_handle() -> crate::runtime::io::Handle {
-        CONTEXT.with(|ctx| match *ctx.borrow() {
-            Some(ref ctx) => ctx.io_handle.clone(),
-            None => Default::default(),
+    pub(crate) fn io_handle() -> crate::runtime::driver::IoHandle {
+        CONTEXT.with(|ctx| {
+            let ctx = ctx.borrow();
+            ctx.as_ref().expect(crate::util::error::CONTEXT_MISSING_ERROR).io_handle.clone()
+        })
+    }
+}
+
+cfg_signal_internal! {
+    #[cfg(unix)]
+    pub(crate) fn signal_handle() -> crate::runtime::driver::SignalHandle {
+        CONTEXT.with(|ctx| {
+            let ctx = ctx.borrow();
+            ctx.as_ref().expect(crate::util::error::CONTEXT_MISSING_ERROR).signal_handle.clone()
         })
     }
 }
 
 cfg_time! {
-    pub(crate) fn time_handle() -> crate::runtime::time::Handle {
-        CONTEXT.with(|ctx| match *ctx.borrow() {
-            Some(ref ctx) => ctx.time_handle.clone(),
-            None => Default::default(),
+    pub(crate) fn time_handle() -> crate::runtime::driver::TimeHandle {
+        CONTEXT.with(|ctx| {
+            let ctx = ctx.borrow();
+            ctx.as_ref().expect(crate::util::error::CONTEXT_MISSING_ERROR).time_handle.clone()
         })
     }
 
     cfg_test_util! {
-        pub(crate) fn clock() -> Option<crate::runtime::time::Clock> {
-            CONTEXT.with(|ctx| match *ctx.borrow() {
-                Some(ref ctx) => Some(ctx.clock.clone()),
-                None => None,
-            })
+        pub(crate) fn clock() -> Option<crate::runtime::driver::Clock> {
+            CONTEXT.with(|ctx| (*ctx.borrow()).as_ref().map(|ctx| ctx.clock.clone()))
         }
     }
 }
 
-cfg_rt_core! {
+cfg_rt! {
     pub(crate) fn spawn_handle() -> Option<crate::runtime::Spawner> {
-        CONTEXT.with(|ctx| match *ctx.borrow() {
-            Some(ref ctx) => Some(ctx.spawner.clone()),
-            None => None,
-        })
+        CONTEXT.with(|ctx| (*ctx.borrow()).as_ref().map(|ctx| ctx.spawner.clone()))
     }
 }
 
 /// Set this [`Handle`] as the current active [`Handle`].
 ///
 /// [`Handle`]: Handle
-pub(crate) fn enter<F, R>(new: Handle, f: F) -> R
-where
-    F: FnOnce() -> R,
-{
-    struct DropGuard(Option<Handle>);
-
-    impl Drop for DropGuard {
-        fn drop(&mut self) {
-            CONTEXT.with(|ctx| {
-                *ctx.borrow_mut() = self.0.take();
-            });
-        }
-    }
-
-    let _guard = CONTEXT.with(|ctx| {
+pub(crate) fn enter(new: Handle) -> EnterGuard {
+    CONTEXT.with(|ctx| {
         let old = ctx.borrow_mut().replace(new);
-        DropGuard(old)
-    });
+        EnterGuard(old)
+    })
+}
 
-    f()
+#[derive(Debug)]
+pub(crate) struct EnterGuard(Option<Handle>);
+
+impl Drop for EnterGuard {
+    fn drop(&mut self) {
+        CONTEXT.with(|ctx| {
+            *ctx.borrow_mut() = self.0.take();
+        });
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/driver.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/driver.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/driver.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/driver.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,208 @@
+//! Abstracts out the entire chain of runtime sub-drivers into common types.
+use crate::park::thread::ParkThread;
+use crate::park::Park;
+
+use std::io;
+use std::time::Duration;
+
+// ===== io driver =====
+
+cfg_io_driver! {
+    type IoDriver = crate::io::driver::Driver;
+    type IoStack = crate::park::either::Either<ProcessDriver, ParkThread>;
+    pub(crate) type IoHandle = Option<crate::io::driver::Handle>;
+
+    fn create_io_stack(enabled: bool) -> io::Result<(IoStack, IoHandle, SignalHandle)> {
+        use crate::park::either::Either;
+
+        #[cfg(loom)]
+        assert!(!enabled);
+
+        let ret = if enabled {
+            let io_driver = crate::io::driver::Driver::new()?;
+            let io_handle = io_driver.handle();
+
+            let (signal_driver, signal_handle) = create_signal_driver(io_driver)?;
+            let process_driver = create_process_driver(signal_driver);
+
+            (Either::A(process_driver), Some(io_handle), signal_handle)
+        } else {
+            (Either::B(ParkThread::new()), Default::default(), Default::default())
+        };
+
+        Ok(ret)
+    }
+}
+
+cfg_not_io_driver! {
+    pub(crate) type IoHandle = ();
+    type IoStack = ParkThread;
+
+    fn create_io_stack(_enabled: bool) -> io::Result<(IoStack, IoHandle, SignalHandle)> {
+        Ok((ParkThread::new(), Default::default(), Default::default()))
+    }
+}
+
+// ===== signal driver =====
+
+macro_rules! cfg_signal_internal_and_unix {
+    ($($item:item)*) => {
+        #[cfg(unix)]
+        cfg_signal_internal! { $($item)* }
+    }
+}
+
+cfg_signal_internal_and_unix! {
+    type SignalDriver = crate::signal::unix::driver::Driver;
+    pub(crate) type SignalHandle = Option<crate::signal::unix::driver::Handle>;
+
+    fn create_signal_driver(io_driver: IoDriver) -> io::Result<(SignalDriver, SignalHandle)> {
+        let driver = crate::signal::unix::driver::Driver::new(io_driver)?;
+        let handle = driver.handle();
+        Ok((driver, Some(handle)))
+    }
+}
+
+cfg_not_signal_internal! {
+    pub(crate) type SignalHandle = ();
+
+    cfg_io_driver! {
+        type SignalDriver = IoDriver;
+
+        fn create_signal_driver(io_driver: IoDriver) -> io::Result<(SignalDriver, SignalHandle)> {
+            Ok((io_driver, ()))
+        }
+    }
+}
+
+// ===== process driver =====
+
+cfg_process_driver! {
+    type ProcessDriver = crate::process::unix::driver::Driver;
+
+    fn create_process_driver(signal_driver: SignalDriver) -> ProcessDriver {
+        crate::process::unix::driver::Driver::new(signal_driver)
+    }
+}
+
+cfg_not_process_driver! {
+    cfg_io_driver! {
+        type ProcessDriver = SignalDriver;
+
+        fn create_process_driver(signal_driver: SignalDriver) -> ProcessDriver {
+            signal_driver
+        }
+    }
+}
+
+// ===== time driver =====
+
+cfg_time! {
+    type TimeDriver = crate::park::either::Either<crate::time::driver::Driver<IoStack>, IoStack>;
+
+    pub(crate) type Clock = crate::time::Clock;
+    pub(crate) type TimeHandle = Option<crate::time::driver::Handle>;
+
+    fn create_clock(enable_pausing: bool, start_paused: bool) -> Clock {
+        crate::time::Clock::new(enable_pausing, start_paused)
+    }
+
+    fn create_time_driver(
+        enable: bool,
+        io_stack: IoStack,
+        clock: Clock,
+    ) -> (TimeDriver, TimeHandle) {
+        use crate::park::either::Either;
+
+        if enable {
+            let driver = crate::time::driver::Driver::new(io_stack, clock);
+            let handle = driver.handle();
+
+            (Either::A(driver), Some(handle))
+        } else {
+            (Either::B(io_stack), None)
+        }
+    }
+}
+
+cfg_not_time! {
+    type TimeDriver = IoStack;
+
+    pub(crate) type Clock = ();
+    pub(crate) type TimeHandle = ();
+
+    fn create_clock(_enable_pausing: bool, _start_paused: bool) -> Clock {
+        ()
+    }
+
+    fn create_time_driver(
+        _enable: bool,
+        io_stack: IoStack,
+        _clock: Clock,
+    ) -> (TimeDriver, TimeHandle) {
+        (io_stack, ())
+    }
+}
+
+// ===== runtime driver =====
+
+#[derive(Debug)]
+pub(crate) struct Driver {
+    inner: TimeDriver,
+}
+
+pub(crate) struct Resources {
+    pub(crate) io_handle: IoHandle,
+    pub(crate) signal_handle: SignalHandle,
+    pub(crate) time_handle: TimeHandle,
+    pub(crate) clock: Clock,
+}
+
+pub(crate) struct Cfg {
+    pub(crate) enable_io: bool,
+    pub(crate) enable_time: bool,
+    pub(crate) enable_pause_time: bool,
+    pub(crate) start_paused: bool,
+}
+
+impl Driver {
+    pub(crate) fn new(cfg: Cfg) -> io::Result<(Self, Resources)> {
+        let (io_stack, io_handle, signal_handle) = create_io_stack(cfg.enable_io)?;
+
+        let clock = create_clock(cfg.enable_pause_time, cfg.start_paused);
+
+        let (time_driver, time_handle) =
+            create_time_driver(cfg.enable_time, io_stack, clock.clone());
+
+        Ok((
+            Self { inner: time_driver },
+            Resources {
+                io_handle,
+                signal_handle,
+                time_handle,
+                clock,
+            },
+        ))
+    }
+}
+
+impl Park for Driver {
+    type Unpark = <TimeDriver as Park>::Unpark;
+    type Error = <TimeDriver as Park>::Error;
+
+    fn unpark(&self) -> Self::Unpark {
+        self.inner.unpark()
+    }
+
+    fn park(&mut self) -> Result<(), Self::Error> {
+        self.inner.park()
+    }
+
+    fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
+        self.inner.park_timeout(duration)
+    }
+
+    fn shutdown(&mut self) {
+        self.inner.shutdown()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/enter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/enter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/enter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/enter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,8 +4,8 @@
 
 #[derive(Debug, Clone, Copy)]
 pub(crate) enum EnterContext {
+    #[cfg_attr(not(feature = "rt"), allow(dead_code))]
     Entered {
-        #[allow(dead_code)]
         allow_blocking: bool,
     },
     NotEntered,
@@ -13,11 +13,7 @@
 
 impl EnterContext {
     pub(crate) fn is_entered(self) -> bool {
-        if let EnterContext::Entered { .. } = self {
-            true
-        } else {
-            false
-        }
+        matches!(self, EnterContext::Entered { .. })
     }
 }
 
@@ -28,32 +24,38 @@
     _p: PhantomData<RefCell<()>>,
 }
 
-/// Marks the current thread as being within the dynamic extent of an
-/// executor.
-pub(crate) fn enter(allow_blocking: bool) -> Enter {
-    if let Some(enter) = try_enter(allow_blocking) {
-        return enter;
-    }
-
-    panic!(
-        "Cannot start a runtime from within a runtime. This happens \
-         because a function (like `block_on`) attempted to block the \
-         current thread while the thread is being used to drive \
-         asynchronous tasks."
-    );
-}
-
-/// Tries to enter a runtime context, returns `None` if already in a runtime
-/// context.
-pub(crate) fn try_enter(allow_blocking: bool) -> Option<Enter> {
-    ENTERED.with(|c| {
-        if c.get().is_entered() {
-            None
-        } else {
-            c.set(EnterContext::Entered { allow_blocking });
-            Some(Enter { _p: PhantomData })
-        }
-    })
+cfg_rt! {
+    use crate::park::thread::ParkError;
+
+    use std::time::Duration;
+
+    /// Marks the current thread as being within the dynamic extent of an
+    /// executor.
+    pub(crate) fn enter(allow_blocking: bool) -> Enter {
+        if let Some(enter) = try_enter(allow_blocking) {
+            return enter;
+        }
+
+        panic!(
+            "Cannot start a runtime from within a runtime. This happens \
+            because a function (like `block_on`) attempted to block the \
+            current thread while the thread is being used to drive \
+            asynchronous tasks."
+        );
+    }
+
+    /// Tries to enter a runtime context, returns `None` if already in a runtime
+    /// context.
+    pub(crate) fn try_enter(allow_blocking: bool) -> Option<Enter> {
+        ENTERED.with(|c| {
+            if c.get().is_entered() {
+                None
+            } else {
+                c.set(EnterContext::Entered { allow_blocking });
+                Some(Enter { _p: PhantomData })
+            }
+        })
+    }
 }
 
 // Forces the current "entered" state to be cleared while the closure
@@ -62,116 +64,93 @@
 // # Warning
 //
 // This is hidden for a reason. Do not use without fully understanding
-// executors. Misuing can easily cause your program to deadlock.
-#[cfg(all(feature = "rt-threaded", feature = "blocking"))]
-pub(crate) fn exit<F: FnOnce() -> R, R>(f: F) -> R {
-    // Reset in case the closure panics
-    struct Reset(EnterContext);
-    impl Drop for Reset {
-        fn drop(&mut self) {
-            ENTERED.with(|c| {
-                assert!(!c.get().is_entered(), "closure claimed permanent executor");
-                c.set(self.0);
-            });
+// executors. Misusing can easily cause your program to deadlock.
+cfg_rt_multi_thread! {
+    pub(crate) fn exit<F: FnOnce() -> R, R>(f: F) -> R {
+        // Reset in case the closure panics
+        struct Reset(EnterContext);
+        impl Drop for Reset {
+            fn drop(&mut self) {
+                ENTERED.with(|c| {
+                    assert!(!c.get().is_entered(), "closure claimed permanent executor");
+                    c.set(self.0);
+                });
+            }
         }
+
+        let was = ENTERED.with(|c| {
+            let e = c.get();
+            assert!(e.is_entered(), "asked to exit when not entered");
+            c.set(EnterContext::NotEntered);
+            e
+        });
+
+        let _reset = Reset(was);
+        // dropping _reset after f() will reset ENTERED
+        f()
     }
+}
 
-    let was = ENTERED.with(|c| {
-        let e = c.get();
-        assert!(e.is_entered(), "asked to exit when not entered");
-        c.set(EnterContext::NotEntered);
-        e
-    });
-
-    let _reset = Reset(was);
-    // dropping _reset after f() will reset ENTERED
-    f()
-}
-
-cfg_rt_core! {
-    cfg_rt_util! {
-        /// Disallow blocking in the current runtime context until the guard is dropped.
-        pub(crate) fn disallow_blocking() -> DisallowBlockingGuard {
-            let reset = ENTERED.with(|c| {
-                if let EnterContext::Entered {
-                    allow_blocking: true,
-                } = c.get()
-                {
-                    c.set(EnterContext::Entered {
-                        allow_blocking: false,
-                    });
-                    true
-                } else {
-                    false
-                }
-            });
-            DisallowBlockingGuard(reset)
-        }
+cfg_rt! {
+    /// Disallow blocking in the current runtime context until the guard is dropped.
+    pub(crate) fn disallow_blocking() -> DisallowBlockingGuard {
+        let reset = ENTERED.with(|c| {
+            if let EnterContext::Entered {
+                allow_blocking: true,
+            } = c.get()
+            {
+                c.set(EnterContext::Entered {
+                    allow_blocking: false,
+                });
+                true
+            } else {
+                false
+            }
+        });
+        DisallowBlockingGuard(reset)
+    }
 
-        pub(crate) struct DisallowBlockingGuard(bool);
-        impl Drop for DisallowBlockingGuard {
-            fn drop(&mut self) {
-                if self.0 {
-                    // XXX: Do we want some kind of assertion here, or is "best effort" okay?
-                    ENTERED.with(|c| {
-                        if let EnterContext::Entered {
-                            allow_blocking: false,
-                        } = c.get()
-                        {
-                            c.set(EnterContext::Entered {
-                                allow_blocking: true,
-                            });
-                        }
-                    })
-                }
+    pub(crate) struct DisallowBlockingGuard(bool);
+    impl Drop for DisallowBlockingGuard {
+        fn drop(&mut self) {
+            if self.0 {
+                // XXX: Do we want some kind of assertion here, or is "best effort" okay?
+                ENTERED.with(|c| {
+                    if let EnterContext::Entered {
+                        allow_blocking: false,
+                    } = c.get()
+                    {
+                        c.set(EnterContext::Entered {
+                            allow_blocking: true,
+                        });
+                    }
+                })
             }
         }
     }
 }
 
-cfg_rt_threaded! {
-    cfg_blocking! {
-        /// Returns true if in a runtime context.
-        pub(crate) fn context() -> EnterContext {
-            ENTERED.with(|c| c.get())
-        }
+cfg_rt_multi_thread! {
+    /// Returns true if in a runtime context.
+    pub(crate) fn context() -> EnterContext {
+        ENTERED.with(|c| c.get())
     }
 }
 
-cfg_block_on! {
+cfg_rt! {
     impl Enter {
         /// Blocks the thread on the specified future, returning the value with
         /// which that future completes.
-        pub(crate) fn block_on<F>(&mut self, f: F) -> Result<F::Output, crate::park::ParkError>
+        pub(crate) fn block_on<F>(&mut self, f: F) -> Result<F::Output, ParkError>
         where
             F: std::future::Future,
         {
-            use crate::park::{CachedParkThread, Park};
-            use std::task::Context;
-            use std::task::Poll::Ready;
+            use crate::park::thread::CachedParkThread;
 
             let mut park = CachedParkThread::new();
-            let waker = park.get_unpark()?.into_waker();
-            let mut cx = Context::from_waker(&waker);
-
-            pin!(f);
-
-            loop {
-                if let Ready(v) = crate::coop::budget(|| f.as_mut().poll(&mut cx)) {
-                    return Ok(v);
-                }
-
-                park.park()?;
-            }
+            park.block_on(f)
         }
-    }
-}
 
-cfg_blocking_impl! {
-    use crate::park::ParkError;
-    use std::time::Duration;
-
-    impl Enter {
         /// Blocks the thread on the specified future for **at most** `timeout`
         ///
         /// If the future completes before `timeout`, the result is returned. If
@@ -180,7 +159,8 @@
         where
             F: std::future::Future,
         {
-            use crate::park::{CachedParkThread, Park};
+            use crate::park::Park;
+            use crate::park::thread::CachedParkThread;
             use std::task::Context;
             use std::task::Poll::Ready;
             use std::time::Instant;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/handle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/handle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/handle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/handle.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,10 @@
-use crate::runtime::{blocking, context, io, time, Spawner};
-use std::{error, fmt};
-
-cfg_blocking! {
-    use crate::runtime::task;
-    use crate::runtime::blocking::task::BlockingTask;
-}
+use crate::runtime::blocking::{BlockingTask, NoopSchedule};
+use crate::runtime::task::{self, JoinHandle};
+use crate::runtime::{blocking, context, driver, Spawner};
+use crate::util::error::CONTEXT_MISSING_ERROR;
 
-cfg_rt_core! {
-    use crate::task::JoinHandle;
-
-    use std::future::Future;
-}
+use std::future::Future;
+use std::{error, fmt};
 
 /// Handle to the runtime.
 ///
@@ -23,57 +17,47 @@
     pub(super) spawner: Spawner,
 
     /// Handles to the I/O drivers
-    pub(super) io_handle: io::Handle,
+    pub(super) io_handle: driver::IoHandle,
+
+    /// Handles to the signal drivers
+    pub(super) signal_handle: driver::SignalHandle,
 
     /// Handles to the time drivers
-    pub(super) time_handle: time::Handle,
+    pub(super) time_handle: driver::TimeHandle,
 
     /// Source of `Instant::now()`
-    pub(super) clock: time::Clock,
+    pub(super) clock: driver::Clock,
 
     /// Blocking pool spawner
     pub(super) blocking_spawner: blocking::Spawner,
 }
 
+/// Runtime context guard.
+///
+/// Returned by [`Runtime::enter`] and [`Handle::enter`], the context guard exits
+/// the runtime context on drop.
+///
+/// [`Runtime::enter`]: fn@crate::runtime::Runtime::enter
+#[derive(Debug)]
+#[must_use = "Creating and dropping a guard does nothing"]
+pub struct EnterGuard<'a> {
+    handle: &'a Handle,
+    guard: context::EnterGuard,
+}
+
 impl Handle {
     /// Enter the runtime context. This allows you to construct types that must
-    /// have an executor available on creation such as [`Delay`] or [`TcpStream`].
+    /// have an executor available on creation such as [`Sleep`] or [`TcpStream`].
     /// It will also allow you to call methods such as [`tokio::spawn`].
     ///
-    /// This function is also available as [`Runtime::enter`].
-    ///
-    /// [`Delay`]: struct@crate::time::Delay
+    /// [`Sleep`]: struct@crate::time::Sleep
     /// [`TcpStream`]: struct@crate::net::TcpStream
-    /// [`Runtime::enter`]: fn@crate::runtime::Runtime::enter
     /// [`tokio::spawn`]: fn@crate::spawn
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use tokio::runtime::Runtime;
-    ///
-    /// fn function_that_spawns(msg: String) {
-    ///     // Had we not used `handle.enter` below, this would panic.
-    ///     tokio::spawn(async move {
-    ///         println!("{}", msg);
-    ///     });
-    /// }
-    ///
-    /// fn main() {
-    ///     let rt = Runtime::new().unwrap();
-    ///     let handle = rt.handle().clone();
-    ///
-    ///     let s = "Hello World!".to_string();
-    ///
-    ///     // By entering the context, we tie `tokio::spawn` to this executor.
-    ///     handle.enter(|| function_that_spawns(s));
-    /// }
-    /// ```
-    pub fn enter<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce() -> R,
-    {
-        context::enter(self.clone(), f)
+    pub fn enter(&self) -> EnterGuard<'_> {
+        EnterGuard {
+            handle: self,
+            guard: context::enter(self.clone()),
+        }
     }
 
     /// Returns a `Handle` view over the currently running `Runtime`
@@ -106,7 +90,7 @@
     /// # let handle =
     /// thread::spawn(move || {
     ///     // Notice that the handle is created outside of this thread and then moved in
-    ///     handle.block_on(async { /* ... */ })
+    ///     handle.spawn(async { /* ... */ })
     ///     // This next line would cause a panic
     ///     // let handle2 = Handle::current();
     /// });
@@ -115,7 +99,7 @@
     /// # }
     /// ```
     pub fn current() -> Self {
-        context::current().expect("not currently running on the Tokio runtime.")
+        context::current().expect(CONTEXT_MISSING_ERROR)
     }
 
     /// Returns a Handle view over the currently running Runtime
@@ -126,230 +110,207 @@
     pub fn try_current() -> Result<Self, TryCurrentError> {
         context::current().ok_or(TryCurrentError(()))
     }
-}
 
-cfg_rt_core! {
-    impl Handle {
-        /// Spawns a future onto the Tokio runtime.
-        ///
-        /// This spawns the given future onto the runtime's executor, usually a
-        /// thread pool. The thread pool is then responsible for polling the future
-        /// until it completes.
-        ///
-        /// See [module level][mod] documentation for more details.
-        ///
-        /// [mod]: index.html
-        ///
-        /// # Examples
-        ///
-        /// ```
-        /// use tokio::runtime::Runtime;
-        ///
-        /// # fn dox() {
-        /// // Create the runtime
-        /// let rt = Runtime::new().unwrap();
-        /// let handle = rt.handle();
-        ///
-        /// // Spawn a future onto the runtime
-        /// handle.spawn(async {
-        ///     println!("now running on a worker thread");
-        /// });
-        /// # }
-        /// ```
-        ///
-        /// # Panics
-        ///
-        /// This function will not panic unless task execution is disabled on the
-        /// executor. This can only happen if the runtime was built using
-        /// [`Builder`] without picking either [`basic_scheduler`] or
-        /// [`threaded_scheduler`].
-        ///
-        /// [`Builder`]: struct@crate::runtime::Builder
-        /// [`threaded_scheduler`]: fn@crate::runtime::Builder::threaded_scheduler
-        /// [`basic_scheduler`]: fn@crate::runtime::Builder::basic_scheduler
-        pub fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
-        where
-            F: Future + Send + 'static,
-            F::Output: Send + 'static,
-        {
-            self.spawner.spawn(future)
+    cfg_stats! {
+        /// Returns a view that lets you get information about how the runtime
+        /// is performing.
+        pub fn stats(&self) -> &crate::runtime::stats::RuntimeStats {
+            self.spawner.stats()
         }
+    }
 
-        /// Run a future to completion on the Tokio runtime from a synchronous
-        /// context.
-        ///
-        /// This runs the given future on the runtime, blocking until it is
-        /// complete, and yielding its resolved result. Any tasks or timers which
-        /// the future spawns internally will be executed on the runtime.
-        ///
-        /// If the provided executor currently has no active core thread, this
-        /// function might hang until a core thread is added. This is not a
-        /// concern when using the [threaded scheduler], as it always has active
-        /// core threads, but if you use the [basic scheduler], some other
-        /// thread must currently be inside a call to [`Runtime::block_on`].
-        /// See also [the module level documentation][1], which has a section on
-        /// scheduler types.
-        ///
-        /// This method may not be called from an asynchronous context.
-        ///
-        /// [threaded scheduler]: fn@crate::runtime::Builder::threaded_scheduler
-        /// [basic scheduler]: fn@crate::runtime::Builder::basic_scheduler
-        /// [`Runtime::block_on`]: fn@crate::runtime::Runtime::block_on
-        /// [1]: index.html#runtime-configurations
-        ///
-        /// # Panics
-        ///
-        /// This function panics if the provided future panics, or if called
-        /// within an asynchronous execution context.
-        ///
-        /// # Examples
-        ///
-        /// Using `block_on` with the [threaded scheduler].
-        ///
-        /// ```
-        /// use tokio::runtime::Runtime;
-        /// use std::thread;
-        ///
-        /// // Create the runtime.
-        /// //
-        /// // If the rt-threaded feature is enabled, this creates a threaded
-        /// // scheduler by default.
-        /// let rt = Runtime::new().unwrap();
-        /// let handle = rt.handle().clone();
-        ///
-        /// // Use the runtime from another thread.
-        /// let th = thread::spawn(move || {
-        ///     // Execute the future, blocking the current thread until completion.
-        ///     //
-        ///     // This example uses the threaded scheduler, so no concurrent call to
-        ///     // `rt.block_on` is required.
-        ///     handle.block_on(async {
-        ///         println!("hello");
-        ///     });
-        /// });
-        ///
-        /// th.join().unwrap();
-        /// ```
-        ///
-        /// Using the [basic scheduler] requires a concurrent call to
-        /// [`Runtime::block_on`]:
-        ///
-        /// [threaded scheduler]: fn@crate::runtime::Builder::threaded_scheduler
-        /// [basic scheduler]: fn@crate::runtime::Builder::basic_scheduler
-        /// [`Runtime::block_on`]: fn@crate::runtime::Runtime::block_on
-        ///
-        /// ```
-        /// use tokio::runtime::Builder;
-        /// use tokio::sync::oneshot;
-        /// use std::thread;
-        ///
-        /// // Create the runtime.
-        /// let mut rt = Builder::new()
-        ///     .enable_all()
-        ///     .basic_scheduler()
-        ///     .build()
-        ///     .unwrap();
-        ///
-        /// let handle = rt.handle().clone();
-        ///
-        /// // Signal main thread when task has finished.
-        /// let (send, recv) = oneshot::channel();
-        ///
-        /// // Use the runtime from another thread.
-        /// let th = thread::spawn(move || {
-        ///     // Execute the future, blocking the current thread until completion.
-        ///     handle.block_on(async {
-        ///         send.send("done").unwrap();
-        ///     });
-        /// });
-        ///
-        /// // The basic scheduler is used, so the thread above might hang if we
-        /// // didn't call block_on on the rt too.
-        /// rt.block_on(async {
-        ///     assert_eq!(recv.await.unwrap(), "done");
-        /// });
-        /// # th.join().unwrap();
-        /// ```
-        ///
-        pub fn block_on<F: Future>(&self, future: F) -> F::Output {
-            self.enter(|| {
-                let mut enter = crate::runtime::enter(true);
-                enter.block_on(future).expect("failed to park thread")
-            })
-        }
+    /// Spawn a future onto the Tokio runtime.
+    ///
+    /// This spawns the given future onto the runtime's executor, usually a
+    /// thread pool. The thread pool is then responsible for polling the future
+    /// until it completes.
+    ///
+    /// See [module level][mod] documentation for more details.
+    ///
+    /// [mod]: index.html
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::runtime::Runtime;
+    ///
+    /// # fn dox() {
+    /// // Create the runtime
+    /// let rt = Runtime::new().unwrap();
+    /// // Get a handle from this runtime
+    /// let handle = rt.handle();
+    ///
+    /// // Spawn a future onto the runtime using the handle
+    /// handle.spawn(async {
+    ///     println!("now running on a worker thread");
+    /// });
+    /// # }
+    /// ```
+    #[cfg_attr(tokio_track_caller, track_caller)]
+    pub fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
+    where
+        F: Future + Send + 'static,
+        F::Output: Send + 'static,
+    {
+        #[cfg(all(tokio_unstable, feature = "tracing"))]
+        let future = crate::util::trace::task(future, "task", None);
+        self.spawner.spawn(future)
     }
-}
 
-cfg_blocking! {
-    impl Handle {
-        /// Runs the provided closure on a thread where blocking is acceptable.
-        ///
-        /// In general, issuing a blocking call or performing a lot of compute in a
-        /// future without yielding is not okay, as it may prevent the executor from
-        /// driving other futures forward. This function runs the provided closure
-        /// on a thread dedicated to blocking operations. See the [CPU-bound tasks
-        /// and blocking code][blocking] section for more information.
-        ///
-        /// Tokio will spawn more blocking threads when they are requested through
-        /// this function until the upper limit configured on the [`Builder`] is
-        /// reached.  This limit is very large by default, because `spawn_blocking` is
-        /// often used for various kinds of IO operations that cannot be performed
-        /// asynchronously. When you run CPU-bound code using `spawn_blocking`, you
-        /// should keep this large upper limit in mind; to run your CPU-bound
-        /// computations on only a few threads, you should use a separate thread
-        /// pool such as [rayon] rather than configuring the number of blocking
-        /// threads.
-        ///
-        /// This function is intended for non-async operations that eventually
-        /// finish on their own. If you want to spawn an ordinary thread, you should
-        /// use [`thread::spawn`] instead.
-        ///
-        /// Closures spawned using `spawn_blocking` cannot be cancelled. When you
-        /// shut down the executor, it will wait indefinitely for all blocking
-        /// operations to finish. You can use [`shutdown_timeout`] to stop waiting
-        /// for them after a certain timeout. Be aware that this will still not
-        /// cancel the tasks — they are simply allowed to keep running after the
-        /// method returns.
-        ///
-        /// Note that if you are using the [basic scheduler], this function will
-        /// still spawn additional threads for blocking operations. The basic
-        /// scheduler's single thread is only used for asynchronous code.
-        ///
-        /// [`Builder`]: struct@crate::runtime::Builder
-        /// [blocking]: ../index.html#cpu-bound-tasks-and-blocking-code
-        /// [rayon]: https://docs.rs/rayon
-        /// [basic scheduler]: fn@crate::runtime::Builder::basic_scheduler
-        /// [`thread::spawn`]: fn@std::thread::spawn
-        /// [`shutdown_timeout`]: fn@crate::runtime::Runtime::shutdown_timeout
-        ///
-        /// # Examples
-        ///
-        /// ```
-        /// use tokio::runtime::Runtime;
-        ///
-        /// # async fn docs() -> Result<(), Box<dyn std::error::Error>>{
-        /// // Create the runtime
-        /// let rt = Runtime::new().unwrap();
-        /// let handle = rt.handle();
-        ///
-        /// let res = handle.spawn_blocking(move || {
-        ///     // do some compute-heavy work or call synchronous code
-        ///     "done computing"
-        /// }).await?;
-        ///
-        /// assert_eq!(res, "done computing");
-        /// # Ok(())
-        /// # }
-        /// ```
-        pub fn spawn_blocking<F, R>(&self, f: F) -> JoinHandle<R>
-        where
-            F: FnOnce() -> R + Send + 'static,
-            R: Send + 'static,
-        {
-            let (task, handle) = task::joinable(BlockingTask::new(f));
-            let _ = self.blocking_spawner.spawn(task, self);
-            handle
-        }
+    /// Run the provided function on an executor dedicated to blocking
+    /// operations.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::runtime::Runtime;
+    ///
+    /// # fn dox() {
+    /// // Create the runtime
+    /// let rt = Runtime::new().unwrap();
+    /// // Get a handle from this runtime
+    /// let handle = rt.handle();
+    ///
+    /// // Spawn a blocking function onto the runtime using the handle
+    /// handle.spawn_blocking(|| {
+    ///     println!("now running on a worker thread");
+    /// });
+    /// # }
+    #[cfg_attr(tokio_track_caller, track_caller)]
+    pub fn spawn_blocking<F, R>(&self, func: F) -> JoinHandle<R>
+    where
+        F: FnOnce() -> R + Send + 'static,
+        R: Send + 'static,
+    {
+        self.spawn_blocking_inner(func, None)
+    }
+
+    #[cfg_attr(tokio_track_caller, track_caller)]
+    pub(crate) fn spawn_blocking_inner<F, R>(&self, func: F, name: Option<&str>) -> JoinHandle<R>
+    where
+        F: FnOnce() -> R + Send + 'static,
+        R: Send + 'static,
+    {
+        let fut = BlockingTask::new(func);
+
+        #[cfg(all(tokio_unstable, feature = "tracing"))]
+        let fut = {
+            use tracing::Instrument;
+            #[cfg(tokio_track_caller)]
+            let location = std::panic::Location::caller();
+            #[cfg(tokio_track_caller)]
+            let span = tracing::trace_span!(
+                target: "tokio::task::blocking",
+                "runtime.spawn",
+                kind = %"blocking",
+                task.name = %name.unwrap_or_default(),
+                "fn" = %std::any::type_name::<F>(),
+                spawn.location = %format_args!("{}:{}:{}", location.file(), location.line(), location.column()),
+            );
+            #[cfg(not(tokio_track_caller))]
+            let span = tracing::trace_span!(
+                target: "tokio::task::blocking",
+                "runtime.spawn",
+                kind = %"blocking",
+                task.name = %name.unwrap_or_default(),
+                "fn" = %std::any::type_name::<F>(),
+            );
+            fut.instrument(span)
+        };
+
+        #[cfg(not(all(tokio_unstable, feature = "tracing")))]
+        let _ = name;
+
+        let (task, handle) = task::unowned(fut, NoopSchedule);
+        let _ = self.blocking_spawner.spawn(task, self);
+        handle
+    }
+
+    /// Run a future to completion on this `Handle`'s associated `Runtime`.
+    ///
+    /// This runs the given future on the current thread, blocking until it is
+    /// complete, and yielding its resolved result. Any tasks or timers which
+    /// the future spawns internally will be executed on the runtime.
+    ///
+    /// When this is used on a `current_thread` runtime, only the
+    /// [`Runtime::block_on`] method can drive the IO and timer drivers, but the
+    /// `Handle::block_on` method cannot drive them. This means that, when using
+    /// this method on a current_thread runtime, anything that relies on IO or
+    /// timers will not work unless there is another thread currently calling
+    /// [`Runtime::block_on`] on the same runtime.
+    ///
+    /// # If the runtime has been shut down
+    ///
+    /// If the `Handle`'s associated `Runtime` has been shut down (through
+    /// [`Runtime::shutdown_background`], [`Runtime::shutdown_timeout`], or by
+    /// dropping it) and `Handle::block_on` is used it might return an error or
+    /// panic. Specifically IO resources will return an error and timers will
+    /// panic. Runtime independent futures will run as normal.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the provided future panics, if called within an
+    /// asynchronous execution context, or if a timer future is executed on a
+    /// runtime that has been shut down.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::runtime::Runtime;
+    ///
+    /// // Create the runtime
+    /// let rt  = Runtime::new().unwrap();
+    ///
+    /// // Get a handle from this runtime
+    /// let handle = rt.handle();
+    ///
+    /// // Execute the future, blocking the current thread until completion
+    /// handle.block_on(async {
+    ///     println!("hello");
+    /// });
+    /// ```
+    ///
+    /// Or using `Handle::current`:
+    ///
+    /// ```
+    /// use tokio::runtime::Handle;
+    ///
+    /// #[tokio::main]
+    /// async fn main () {
+    ///     let handle = Handle::current();
+    ///     std::thread::spawn(move || {
+    ///         // Using Handle::block_on to run async code in the new thread.
+    ///         handle.block_on(async {
+    ///             println!("hello");
+    ///         });
+    ///     });
+    /// }
+    /// ```
+    ///
+    /// [`JoinError`]: struct@crate::task::JoinError
+    /// [`JoinHandle`]: struct@crate::task::JoinHandle
+    /// [`Runtime::block_on`]: fn@crate::runtime::Runtime::block_on
+    /// [`Runtime::shutdown_background`]: fn@crate::runtime::Runtime::shutdown_background
+    /// [`Runtime::shutdown_timeout`]: fn@crate::runtime::Runtime::shutdown_timeout
+    /// [`spawn_blocking`]: crate::task::spawn_blocking
+    /// [`tokio::fs`]: crate::fs
+    /// [`tokio::net`]: crate::net
+    /// [`tokio::time`]: crate::time
+    pub fn block_on<F: Future>(&self, future: F) -> F::Output {
+        // Enter the **runtime** context. This configures spawning, the current I/O driver, ...
+        let _rt_enter = self.enter();
+
+        // Enter a **blocking** context. This prevents blocking from a runtime.
+        let mut blocking_enter = crate::runtime::enter(true);
+
+        // Block on the future
+        blocking_enter
+            .block_on(future)
+            .expect("failed to park thread")
+    }
+
+    pub(crate) fn shutdown(mut self) {
+        self.spawner.shutdown();
     }
 }
 
@@ -364,7 +325,7 @@
 
 impl fmt::Display for TryCurrentError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("no tokio Runtime has been initialized")
+        f.write_str(CONTEXT_MISSING_ERROR)
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/io.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/io.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/io.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/io.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-//! Abstracts out the APIs necessary to `Runtime` for integrating the I/O
-//! driver. When the `time` feature flag is **not** enabled. These APIs are
-//! shells. This isolates the complexity of dealing with conditional
-//! compilation.
-
-/// Re-exported for convenience.
-pub(crate) use std::io::Result;
-
-pub(crate) use variant::*;
-
-#[cfg(feature = "io-driver")]
-mod variant {
-    use crate::io::driver;
-    use crate::park::{Either, ParkThread};
-
-    use std::io;
-
-    /// The driver value the runtime passes to the `timer` layer.
-    ///
-    /// When the `io-driver` feature is enabled, this is the "real" I/O driver
-    /// backed by Mio. Without the `io-driver` feature, this is a thread parker
-    /// backed by a condition variable.
-    pub(crate) type Driver = Either<driver::Driver, ParkThread>;
-
-    /// The handle the runtime stores for future use.
-    ///
-    /// When the `io-driver` feature is **not** enabled, this is `()`.
-    pub(crate) type Handle = Option<driver::Handle>;
-
-    pub(crate) fn create_driver(enable: bool) -> io::Result<(Driver, Handle)> {
-        #[cfg(loom)]
-        assert!(!enable);
-
-        if enable {
-            let driver = driver::Driver::new()?;
-            let handle = driver.handle();
-
-            Ok((Either::A(driver), Some(handle)))
-        } else {
-            let driver = ParkThread::new();
-            Ok((Either::B(driver), None))
-        }
-    }
-}
-
-#[cfg(not(feature = "io-driver"))]
-mod variant {
-    use crate::park::ParkThread;
-
-    use std::io;
-
-    /// I/O is not enabled, use a condition variable based parker
-    pub(crate) type Driver = ParkThread;
-
-    /// There is no handle
-    pub(crate) type Handle = ();
-
-    pub(crate) fn create_driver(_enable: bool) -> io::Result<(Driver, Handle)> {
-        let driver = ParkThread::new();
-
-        Ok((driver, ()))
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,7 @@
 //! The Tokio runtime.
 //!
-//! Unlike other Rust programs, asynchronous applications require
-//! runtime support. In particular, the following runtime services are
-//! necessary:
+//! Unlike other Rust programs, asynchronous applications require runtime
+//! support. In particular, the following runtime services are necessary:
 //!
 //! * An **I/O event loop**, called the driver, which drives I/O resources and
 //!   dispatches I/O events to tasks that depend on them.
@@ -10,22 +9,22 @@
 //! * A **timer** for scheduling work to run after a set period of time.
 //!
 //! Tokio's [`Runtime`] bundles all of these services as a single type, allowing
-//! them to be started, shut down, and configured together. However, most
-//! applications won't need to use [`Runtime`] directly. Instead, they can
-//! use the [`tokio::main`] attribute macro, which creates a [`Runtime`] under
-//! the hood.
+//! them to be started, shut down, and configured together. However, often it is
+//! not required to configure a [`Runtime`] manually, and a user may just use the
+//! [`tokio::main`] attribute macro, which creates a [`Runtime`] under the hood.
 //!
 //! # Usage
 //!
-//! Most applications will use the [`tokio::main`] attribute macro.
+//! When no fine tuning is required, the [`tokio::main`] attribute macro can be
+//! used.
 //!
 //! ```no_run
 //! use tokio::net::TcpListener;
-//! use tokio::prelude::*;
+//! use tokio::io::{AsyncReadExt, AsyncWriteExt};
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn std::error::Error>> {
-//!     let mut listener = TcpListener::bind("127.0.0.1:8080").await?;
+//!     let listener = TcpListener::bind("127.0.0.1:8080").await?;
 //!
 //!     loop {
 //!         let (mut socket, _) = listener.accept().await?;
@@ -64,16 +63,16 @@
 //!
 //! ```no_run
 //! use tokio::net::TcpListener;
-//! use tokio::prelude::*;
+//! use tokio::io::{AsyncReadExt, AsyncWriteExt};
 //! use tokio::runtime::Runtime;
 //!
 //! fn main() -> Result<(), Box<dyn std::error::Error>> {
 //!     // Create the runtime
-//!     let mut rt = Runtime::new()?;
+//!     let rt  = Runtime::new()?;
 //!
 //!     // Spawn the root task
 //!     rt.block_on(async {
-//!         let mut listener = TcpListener::bind("127.0.0.1:8080").await?;
+//!         let listener = TcpListener::bind("127.0.0.1:8080").await?;
 //!
 //!         loop {
 //!             let (mut socket, _) = listener.accept().await?;
@@ -111,48 +110,38 @@
 //! applications. The [runtime builder] or `#[tokio::main]` attribute may be
 //! used to select which scheduler to use.
 //!
-//! #### Basic Scheduler
+//! #### Multi-Thread Scheduler
 //!
-//! The basic scheduler provides a _single-threaded_ future executor. All tasks
-//! will be created and executed on the current thread. The basic scheduler
-//! requires the `rt-core` feature flag, and can be selected using the
-//! [`Builder::basic_scheduler`] method:
+//! The multi-thread scheduler executes futures on a _thread pool_, using a
+//! work-stealing strategy. By default, it will start a worker thread for each
+//! CPU core available on the system. This tends to be the ideal configuration
+//! for most applications. The multi-thread scheduler requires the `rt-multi-thread`
+//! feature flag, and is selected by default:
 //! ```
 //! use tokio::runtime;
 //!
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
-//! let basic_rt = runtime::Builder::new()
-//!     .basic_scheduler()
-//!     .build()?;
+//! let threaded_rt = runtime::Runtime::new()?;
 //! # Ok(()) }
 //! ```
 //!
-//! If the `rt-core` feature is enabled and `rt-threaded` is not,
-//! [`Runtime::new`] will return a basic scheduler runtime by default.
+//! Most applications should use the multi-thread scheduler, except in some
+//! niche use-cases, such as when running only a single thread is required.
 //!
-//! #### Threaded Scheduler
+//! #### Current-Thread Scheduler
 //!
-//! The threaded scheduler executes futures on a _thread pool_, using a
-//! work-stealing strategy. By default, it will start a worker thread for each
-//! CPU core available on the system. This tends to be the ideal configurations
-//! for most applications. The threaded scheduler requires the `rt-threaded` feature
-//! flag, and can be selected using the  [`Builder::threaded_scheduler`] method:
+//! The current-thread scheduler provides a _single-threaded_ future executor.
+//! All tasks will be created and executed on the current thread. This requires
+//! the `rt` feature flag.
 //! ```
 //! use tokio::runtime;
 //!
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
-//! let threaded_rt = runtime::Builder::new()
-//!     .threaded_scheduler()
+//! let basic_rt = runtime::Builder::new_current_thread()
 //!     .build()?;
 //! # Ok(()) }
 //! ```
 //!
-//! If the `rt-threaded` feature flag is enabled, [`Runtime::new`] will return a
-//! threaded scheduler runtime by default.
-//!
-//! Most applications should use the threaded scheduler, except in some niche
-//! use-cases, such as when running only a single thread is required.
-//!
 //! #### Resource drivers
 //!
 //! When configuring a runtime by hand, no resource drivers are enabled by
@@ -164,8 +153,8 @@
 //! ## Lifetime of spawned threads
 //!
 //! The runtime may spawn threads depending on its configuration and usage. The
-//! threaded scheduler spawns threads to schedule tasks and calls to
-//! `spawn_blocking` spawn threads to run blocking operations.
+//! multi-thread scheduler spawns threads to schedule tasks and for `spawn_blocking`
+//! calls.
 //!
 //! While the `Runtime` is active, threads may shutdown after periods of being
 //! idle. Once `Runtime` is dropped, all runtime threads are forcibly shutdown.
@@ -188,393 +177,394 @@
 #[macro_use]
 mod tests;
 
-pub(crate) mod context;
+pub(crate) mod enter;
 
-cfg_rt_core! {
-    mod basic_scheduler;
-    use basic_scheduler::BasicScheduler;
+pub(crate) mod task;
 
-    pub(crate) mod task;
+cfg_stats! {
+    pub mod stats;
+}
+cfg_not_stats! {
+    pub(crate) mod stats;
 }
 
-mod blocking;
-use blocking::BlockingPool;
+cfg_rt! {
+    mod basic_scheduler;
+    use basic_scheduler::BasicScheduler;
 
-cfg_blocking_impl! {
-    #[allow(unused_imports)]
-    pub(crate) use blocking::{spawn_blocking, try_spawn_blocking};
-}
+    mod blocking;
+    use blocking::BlockingPool;
+    pub(crate) use blocking::spawn_blocking;
 
-mod builder;
-pub use self::builder::Builder;
+    mod builder;
+    pub use self::builder::Builder;
 
-pub(crate) mod enter;
-use self::enter::enter;
+    pub(crate) mod context;
+    pub(crate) mod driver;
 
-mod handle;
-pub use self::handle::{Handle, TryCurrentError};
+    use self::enter::enter;
 
-mod io;
+    mod handle;
+    pub use handle::{EnterGuard, Handle};
 
-cfg_rt_threaded! {
+    mod spawner;
+    use self::spawner::Spawner;
+}
+
+cfg_rt_multi_thread! {
     mod park;
     use park::Parker;
 }
 
-mod shell;
-use self::shell::Shell;
-
-mod spawner;
-use self::spawner::Spawner;
-
-mod time;
-
-cfg_rt_threaded! {
+cfg_rt_multi_thread! {
     mod queue;
 
     pub(crate) mod thread_pool;
     use self::thread_pool::ThreadPool;
 }
 
-cfg_rt_core! {
+cfg_rt! {
     use crate::task::JoinHandle;
-}
-
-use std::future::Future;
-use std::time::Duration;
-
-/// The Tokio runtime.
-///
-/// The runtime provides an I/O driver, task scheduler, [timer], and blocking
-/// pool, necessary for running asynchronous tasks.
-///
-/// Instances of `Runtime` can be created using [`new`] or [`Builder`]. However,
-/// most users will use the `#[tokio::main]` annotation on their entry point instead.
-///
-/// See [module level][mod] documentation for more details.
-///
-/// # Shutdown
-///
-/// Shutting down the runtime is done by dropping the value. The current thread
-/// will block until the shut down operation has completed.
-///
-/// * Drain any scheduled work queues.
-/// * Drop any futures that have not yet completed.
-/// * Drop the reactor.
-///
-/// Once the reactor has dropped, any outstanding I/O resources bound to
-/// that reactor will no longer function. Calling any method on them will
-/// result in an error.
-///
-/// [timer]: crate::time
-/// [mod]: index.html
-/// [`new`]: method@Self::new
-/// [`Builder`]: struct@Builder
-/// [`tokio::run`]: fn@run
-#[derive(Debug)]
-pub struct Runtime {
-    /// Task executor
-    kind: Kind,
-
-    /// Handle to runtime, also contains driver handles
-    handle: Handle,
-
-    /// Blocking pool handle, used to signal shutdown
-    blocking_pool: BlockingPool,
-}
-
-/// The runtime executor is either a thread-pool or a current-thread executor.
-#[derive(Debug)]
-enum Kind {
-    /// Not able to execute concurrent tasks. This variant is mostly used to get
-    /// access to the driver handles.
-    Shell(Shell),
-
-    /// Execute all tasks on the current-thread.
-    #[cfg(feature = "rt-core")]
-    Basic(BasicScheduler<time::Driver>),
-
-    /// Execute tasks across multiple threads.
-    #[cfg(feature = "rt-threaded")]
-    ThreadPool(ThreadPool),
-}
 
-/// After thread starts / before thread stops
-type Callback = std::sync::Arc<dyn Fn() + Send + Sync>;
+    use std::future::Future;
+    use std::time::Duration;
 
-impl Runtime {
-    /// Create a new runtime instance with default configuration values.
+    /// The Tokio runtime.
+    ///
+    /// The runtime provides an I/O driver, task scheduler, [timer], and
+    /// blocking pool, necessary for running asynchronous tasks.
     ///
-    /// This results in a scheduler, I/O driver, and time driver being
-    /// initialized. The type of scheduler used depends on what feature flags
-    /// are enabled: if the `rt-threaded` feature is enabled, the [threaded
-    /// scheduler] is used, while if only the `rt-core` feature is enabled, the
-    /// [basic scheduler] is used instead.
-    ///
-    /// If the threaded scheduler is selected, it will not spawn
-    /// any worker threads until it needs to, i.e. tasks are scheduled to run.
-    ///
-    /// Most applications will not need to call this function directly. Instead,
-    /// they will use the  [`#[tokio::main]` attribute][main]. When more complex
-    /// configuration is necessary, the [runtime builder] may be used.
+    /// Instances of `Runtime` can be created using [`new`], or [`Builder`].
+    /// However, most users will use the `#[tokio::main]` annotation on their
+    /// entry point instead.
     ///
     /// See [module level][mod] documentation for more details.
     ///
-    /// # Examples
+    /// # Shutdown
+    ///
+    /// Shutting down the runtime is done by dropping the value. The current
+    /// thread will block until the shut down operation has completed.
+    ///
+    /// * Drain any scheduled work queues.
+    /// * Drop any futures that have not yet completed.
+    /// * Drop the reactor.
     ///
-    /// Creating a new `Runtime` with default configuration values.
+    /// Once the reactor has dropped, any outstanding I/O resources bound to
+    /// that reactor will no longer function. Calling any method on them will
+    /// result in an error.
     ///
-    /// ```
-    /// use tokio::runtime::Runtime;
+    /// # Sharing
     ///
-    /// let rt = Runtime::new()
-    ///     .unwrap();
+    /// The Tokio runtime implements `Sync` and `Send` to allow you to wrap it
+    /// in a `Arc`. Most fn take `&self` to allow you to call them concurrently
+    /// across multiple threads.
     ///
-    /// // Use the runtime...
-    /// ```
+    /// Calls to `shutdown` and `shutdown_timeout` require exclusive ownership of
+    /// the runtime type and this can be achieved via `Arc::try_unwrap` when only
+    /// one strong count reference is left over.
     ///
+    /// [timer]: crate::time
     /// [mod]: index.html
-    /// [main]: ../attr.main.html
-    /// [threaded scheduler]: index.html#threaded-scheduler
-    /// [basic scheduler]: index.html#basic-scheduler
-    /// [runtime builder]: crate::runtime::Builder
-    pub fn new() -> io::Result<Runtime> {
-        #[cfg(feature = "rt-threaded")]
-        let ret = Builder::new().threaded_scheduler().enable_all().build();
+    /// [`new`]: method@Self::new
+    /// [`Builder`]: struct@Builder
+    #[derive(Debug)]
+    pub struct Runtime {
+        /// Task executor
+        kind: Kind,
 
-        #[cfg(all(not(feature = "rt-threaded"), feature = "rt-core"))]
-        let ret = Builder::new().basic_scheduler().enable_all().build();
+        /// Handle to runtime, also contains driver handles
+        handle: Handle,
 
-        #[cfg(not(feature = "rt-core"))]
-        let ret = Builder::new().enable_all().build();
+        /// Blocking pool handle, used to signal shutdown
+        blocking_pool: BlockingPool,
+    }
 
-        ret
+    /// The runtime executor is either a thread-pool or a current-thread executor.
+    #[derive(Debug)]
+    enum Kind {
+        /// Execute all tasks on the current-thread.
+        CurrentThread(BasicScheduler<driver::Driver>),
+
+        /// Execute tasks across multiple threads.
+        #[cfg(feature = "rt-multi-thread")]
+        ThreadPool(ThreadPool),
     }
 
-    /// Spawn a future onto the Tokio runtime.
-    ///
-    /// This spawns the given future onto the runtime's executor, usually a
-    /// thread pool. The thread pool is then responsible for polling the future
-    /// until it completes.
-    ///
-    /// See [module level][mod] documentation for more details.
-    ///
-    /// [mod]: index.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::runtime::Runtime;
-    ///
-    /// # fn dox() {
-    /// // Create the runtime
-    /// let rt = Runtime::new().unwrap();
-    ///
-    /// // Spawn a future onto the runtime
-    /// rt.spawn(async {
-    ///     println!("now running on a worker thread");
-    /// });
-    /// # }
-    /// ```
-    ///
-    /// # Panics
-    ///
-    /// This function will not panic unless task execution is disabled on the
-    /// executor. This can only happen if the runtime was built using
-    /// [`Builder`] without picking either [`basic_scheduler`] or
-    /// [`threaded_scheduler`].
-    ///
-    /// [`Builder`]: struct@Builder
-    /// [`threaded_scheduler`]: fn@Builder::threaded_scheduler
-    /// [`basic_scheduler`]: fn@Builder::basic_scheduler
-    #[cfg(feature = "rt-core")]
-    pub fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
-    where
-        F: Future + Send + 'static,
-        F::Output: Send + 'static,
-    {
-        match &self.kind {
-            Kind::Shell(_) => panic!("task execution disabled"),
-            #[cfg(feature = "rt-threaded")]
-            Kind::ThreadPool(exec) => exec.spawn(future),
-            Kind::Basic(exec) => exec.spawn(future),
+    /// After thread starts / before thread stops
+    type Callback = std::sync::Arc<dyn Fn() + Send + Sync>;
+
+    impl Runtime {
+        /// Create a new runtime instance with default configuration values.
+        ///
+        /// This results in the multi threaded scheduler, I/O driver, and time driver being
+        /// initialized.
+        ///
+        /// Most applications will not need to call this function directly. Instead,
+        /// they will use the  [`#[tokio::main]` attribute][main]. When a more complex
+        /// configuration is necessary, the [runtime builder] may be used.
+        ///
+        /// See [module level][mod] documentation for more details.
+        ///
+        /// # Examples
+        ///
+        /// Creating a new `Runtime` with default configuration values.
+        ///
+        /// ```
+        /// use tokio::runtime::Runtime;
+        ///
+        /// let rt = Runtime::new()
+        ///     .unwrap();
+        ///
+        /// // Use the runtime...
+        /// ```
+        ///
+        /// [mod]: index.html
+        /// [main]: ../attr.main.html
+        /// [threaded scheduler]: index.html#threaded-scheduler
+        /// [basic scheduler]: index.html#basic-scheduler
+        /// [runtime builder]: crate::runtime::Builder
+        #[cfg(feature = "rt-multi-thread")]
+        #[cfg_attr(docsrs, doc(cfg(feature = "rt-multi-thread")))]
+        pub fn new() -> std::io::Result<Runtime> {
+            Builder::new_multi_thread().enable_all().build()
         }
-    }
 
-    /// Run a future to completion on the Tokio runtime. This is the runtime's
-    /// entry point.
-    ///
-    /// This runs the given future on the runtime, blocking until it is
-    /// complete, and yielding its resolved result. Any tasks or timers which
-    /// the future spawns internally will be executed on the runtime.
-    ///
-    /// `&mut` is required as calling `block_on` **may** result in advancing the
-    /// state of the runtime. The details depend on how the runtime is
-    /// configured. [`runtime::Handle::block_on`][handle] provides a version
-    /// that takes `&self`.
-    ///
-    /// This method may not be called from an asynchronous context.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if the provided future panics, or if called within an
-    /// asynchronous execution context.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use tokio::runtime::Runtime;
-    ///
-    /// // Create the runtime
-    /// let mut rt = Runtime::new().unwrap();
-    ///
-    /// // Execute the future, blocking the current thread until completion
-    /// rt.block_on(async {
-    ///     println!("hello");
-    /// });
-    /// ```
-    ///
-    /// [handle]: fn@Handle::block_on
-    pub fn block_on<F: Future>(&mut self, future: F) -> F::Output {
-        let kind = &mut self.kind;
-
-        self.handle.enter(|| match kind {
-            Kind::Shell(exec) => exec.block_on(future),
-            #[cfg(feature = "rt-core")]
-            Kind::Basic(exec) => exec.block_on(future),
-            #[cfg(feature = "rt-threaded")]
-            Kind::ThreadPool(exec) => exec.block_on(future),
-        })
-    }
+        /// Return a handle to the runtime's spawner.
+        ///
+        /// The returned handle can be used to spawn tasks that run on this runtime, and can
+        /// be cloned to allow moving the `Handle` to other threads.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// use tokio::runtime::Runtime;
+        ///
+        /// let rt = Runtime::new()
+        ///     .unwrap();
+        ///
+        /// let handle = rt.handle();
+        ///
+        /// // Use the handle...
+        /// ```
+        pub fn handle(&self) -> &Handle {
+            &self.handle
+        }
 
-    /// Enter the runtime context. This allows you to construct types that must
-    /// have an executor available on creation such as [`Delay`] or [`TcpStream`].
-    /// It will also allow you to call methods such as [`tokio::spawn`].
-    ///
-    /// This function is also available as [`Handle::enter`].
-    ///
-    /// [`Delay`]: struct@crate::time::Delay
-    /// [`TcpStream`]: struct@crate::net::TcpStream
-    /// [`Handle::enter`]: fn@crate::runtime::Handle::enter
-    /// [`tokio::spawn`]: fn@crate::spawn
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use tokio::runtime::Runtime;
-    ///
-    /// fn function_that_spawns(msg: String) {
-    ///     // Had we not used `rt.enter` below, this would panic.
-    ///     tokio::spawn(async move {
-    ///         println!("{}", msg);
-    ///     });
-    /// }
-    ///
-    /// fn main() {
-    ///     let rt = Runtime::new().unwrap();
-    ///
-    ///     let s = "Hello World!".to_string();
-    ///
-    ///     // By entering the context, we tie `tokio::spawn` to this executor.
-    ///     rt.enter(|| function_that_spawns(s));
-    /// }
-    /// ```
-    pub fn enter<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce() -> R,
-    {
-        self.handle.enter(f)
-    }
+        /// Spawn a future onto the Tokio runtime.
+        ///
+        /// This spawns the given future onto the runtime's executor, usually a
+        /// thread pool. The thread pool is then responsible for polling the future
+        /// until it completes.
+        ///
+        /// See [module level][mod] documentation for more details.
+        ///
+        /// [mod]: index.html
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// use tokio::runtime::Runtime;
+        ///
+        /// # fn dox() {
+        /// // Create the runtime
+        /// let rt = Runtime::new().unwrap();
+        ///
+        /// // Spawn a future onto the runtime
+        /// rt.spawn(async {
+        ///     println!("now running on a worker thread");
+        /// });
+        /// # }
+        /// ```
+        #[cfg_attr(tokio_track_caller, track_caller)]
+        pub fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
+        where
+            F: Future + Send + 'static,
+            F::Output: Send + 'static,
+        {
+            self.handle.spawn(future)
+        }
 
-    /// Return a handle to the runtime's spawner.
-    ///
-    /// The returned handle can be used to spawn tasks that run on this runtime, and can
-    /// be cloned to allow moving the `Handle` to other threads.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::runtime::Runtime;
-    ///
-    /// let rt = Runtime::new()
-    ///     .unwrap();
-    ///
-    /// let handle = rt.handle();
-    ///
-    /// handle.spawn(async { println!("hello"); });
-    /// ```
-    pub fn handle(&self) -> &Handle {
-        &self.handle
-    }
+        /// Run the provided function on an executor dedicated to blocking operations.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// use tokio::runtime::Runtime;
+        ///
+        /// # fn dox() {
+        /// // Create the runtime
+        /// let rt = Runtime::new().unwrap();
+        ///
+        /// // Spawn a blocking function onto the runtime
+        /// rt.spawn_blocking(|| {
+        ///     println!("now running on a worker thread");
+        /// });
+        /// # }
+        #[cfg_attr(tokio_track_caller, track_caller)]
+        pub fn spawn_blocking<F, R>(&self, func: F) -> JoinHandle<R>
+        where
+            F: FnOnce() -> R + Send + 'static,
+            R: Send + 'static,
+        {
+            self.handle.spawn_blocking(func)
+        }
 
-    /// Shutdown the runtime, waiting for at most `duration` for all spawned
-    /// task to shutdown.
-    ///
-    /// Usually, dropping a `Runtime` handle is sufficient as tasks are able to
-    /// shutdown in a timely fashion. However, dropping a `Runtime` will wait
-    /// indefinitely for all tasks to terminate, and there are cases where a long
-    /// blocking task has been spawned, which can block dropping `Runtime`.
-    ///
-    /// In this case, calling `shutdown_timeout` with an explicit wait timeout
-    /// can work. The `shutdown_timeout` will signal all tasks to shutdown and
-    /// will wait for at most `duration` for all spawned tasks to terminate. If
-    /// `timeout` elapses before all tasks are dropped, the function returns and
-    /// outstanding tasks are potentially leaked.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::runtime::Runtime;
-    /// use tokio::task;
-    ///
-    /// use std::thread;
-    /// use std::time::Duration;
-    ///
-    /// fn main() {
-    ///    let mut runtime = Runtime::new().unwrap();
-    ///
-    ///    runtime.block_on(async move {
-    ///        task::spawn_blocking(move || {
-    ///            thread::sleep(Duration::from_secs(10_000));
-    ///        });
-    ///    });
-    ///
-    ///    runtime.shutdown_timeout(Duration::from_millis(100));
-    /// }
-    /// ```
-    pub fn shutdown_timeout(mut self, duration: Duration) {
-        // Wakeup and shutdown all the worker threads
-        self.handle.spawner.shutdown();
-        self.blocking_pool.shutdown(Some(duration));
-    }
+        /// Run a future to completion on the Tokio runtime. This is the
+        /// runtime's entry point.
+        ///
+        /// This runs the given future on the current thread, blocking until it is
+        /// complete, and yielding its resolved result. Any tasks or timers
+        /// which the future spawns internally will be executed on the runtime.
+        ///
+        /// # Multi thread scheduler
+        ///
+        /// When the multi thread scheduler is used this will allow futures
+        /// to run within the io driver and timer context of the overall runtime.
+        ///
+        /// # Current thread scheduler
+        ///
+        /// When the current thread scheduler is enabled `block_on`
+        /// can be called concurrently from multiple threads. The first call
+        /// will take ownership of the io and timer drivers. This means
+        /// other threads which do not own the drivers will hook into that one.
+        /// When the first `block_on` completes, other threads will be able to
+        /// "steal" the driver to allow continued execution of their futures.
+        ///
+        /// # Panics
+        ///
+        /// This function panics if the provided future panics, or if called within an
+        /// asynchronous execution context.
+        ///
+        /// # Examples
+        ///
+        /// ```no_run
+        /// use tokio::runtime::Runtime;
+        ///
+        /// // Create the runtime
+        /// let rt  = Runtime::new().unwrap();
+        ///
+        /// // Execute the future, blocking the current thread until completion
+        /// rt.block_on(async {
+        ///     println!("hello");
+        /// });
+        /// ```
+        ///
+        /// [handle]: fn@Handle::block_on
+        pub fn block_on<F: Future>(&self, future: F) -> F::Output {
+            let _enter = self.enter();
+
+            match &self.kind {
+                Kind::CurrentThread(exec) => exec.block_on(future),
+                #[cfg(feature = "rt-multi-thread")]
+                Kind::ThreadPool(exec) => exec.block_on(future),
+            }
+        }
 
-    /// Shutdown the runtime, without waiting for any spawned tasks to shutdown.
-    ///
-    /// This can be useful if you want to drop a runtime from within another runtime.
-    /// Normally, dropping a runtime will block indefinitely for spawned blocking tasks
-    /// to complete, which would normally not be permitted within an asynchronous context.
-    /// By calling `shutdown_background()`, you can drop the runtime from such a context.
-    ///
-    /// Note however, that because we do not wait for any blocking tasks to complete, this
-    /// may result in a resource leak (in that any blocking tasks are still running until they
-    /// return.
-    ///
-    /// This function is equivalent to calling `shutdown_timeout(Duration::of_nanos(0))`.
-    ///
-    /// ```
-    /// use tokio::runtime::Runtime;
-    ///
-    /// fn main() {
-    ///    let mut runtime = Runtime::new().unwrap();
-    ///
-    ///    runtime.block_on(async move {
-    ///        let inner_runtime = Runtime::new().unwrap();
-    ///        // ...
-    ///        inner_runtime.shutdown_background();
-    ///    });
-    /// }
-    /// ```
-    pub fn shutdown_background(self) {
-        self.shutdown_timeout(Duration::from_nanos(0))
+        /// Enter the runtime context.
+        ///
+        /// This allows you to construct types that must have an executor
+        /// available on creation such as [`Sleep`] or [`TcpStream`]. It will
+        /// also allow you to call methods such as [`tokio::spawn`].
+        ///
+        /// [`Sleep`]: struct@crate::time::Sleep
+        /// [`TcpStream`]: struct@crate::net::TcpStream
+        /// [`tokio::spawn`]: fn@crate::spawn
+        ///
+        /// # Example
+        ///
+        /// ```
+        /// use tokio::runtime::Runtime;
+        ///
+        /// fn function_that_spawns(msg: String) {
+        ///     // Had we not used `rt.enter` below, this would panic.
+        ///     tokio::spawn(async move {
+        ///         println!("{}", msg);
+        ///     });
+        /// }
+        ///
+        /// fn main() {
+        ///     let rt = Runtime::new().unwrap();
+        ///
+        ///     let s = "Hello World!".to_string();
+        ///
+        ///     // By entering the context, we tie `tokio::spawn` to this executor.
+        ///     let _guard = rt.enter();
+        ///     function_that_spawns(s);
+        /// }
+        /// ```
+        pub fn enter(&self) -> EnterGuard<'_> {
+            self.handle.enter()
+        }
+
+        /// Shutdown the runtime, waiting for at most `duration` for all spawned
+        /// task to shutdown.
+        ///
+        /// Usually, dropping a `Runtime` handle is sufficient as tasks are able to
+        /// shutdown in a timely fashion. However, dropping a `Runtime` will wait
+        /// indefinitely for all tasks to terminate, and there are cases where a long
+        /// blocking task has been spawned, which can block dropping `Runtime`.
+        ///
+        /// In this case, calling `shutdown_timeout` with an explicit wait timeout
+        /// can work. The `shutdown_timeout` will signal all tasks to shutdown and
+        /// will wait for at most `duration` for all spawned tasks to terminate. If
+        /// `timeout` elapses before all tasks are dropped, the function returns and
+        /// outstanding tasks are potentially leaked.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// use tokio::runtime::Runtime;
+        /// use tokio::task;
+        ///
+        /// use std::thread;
+        /// use std::time::Duration;
+        ///
+        /// fn main() {
+        ///    let runtime = Runtime::new().unwrap();
+        ///
+        ///    runtime.block_on(async move {
+        ///        task::spawn_blocking(move || {
+        ///            thread::sleep(Duration::from_secs(10_000));
+        ///        });
+        ///    });
+        ///
+        ///    runtime.shutdown_timeout(Duration::from_millis(100));
+        /// }
+        /// ```
+        pub fn shutdown_timeout(mut self, duration: Duration) {
+            // Wakeup and shutdown all the worker threads
+            self.handle.shutdown();
+            self.blocking_pool.shutdown(Some(duration));
+        }
+
+        /// Shutdown the runtime, without waiting for any spawned tasks to shutdown.
+        ///
+        /// This can be useful if you want to drop a runtime from within another runtime.
+        /// Normally, dropping a runtime will block indefinitely for spawned blocking tasks
+        /// to complete, which would normally not be permitted within an asynchronous context.
+        /// By calling `shutdown_background()`, you can drop the runtime from such a context.
+        ///
+        /// Note however, that because we do not wait for any blocking tasks to complete, this
+        /// may result in a resource leak (in that any blocking tasks are still running until they
+        /// return.
+        ///
+        /// This function is equivalent to calling `shutdown_timeout(Duration::of_nanos(0))`.
+        ///
+        /// ```
+        /// use tokio::runtime::Runtime;
+        ///
+        /// fn main() {
+        ///    let runtime = Runtime::new().unwrap();
+        ///
+        ///    runtime.block_on(async move {
+        ///        let inner_runtime = Runtime::new().unwrap();
+        ///        // ...
+        ///        inner_runtime.shutdown_background();
+        ///    });
+        /// }
+        /// ```
+        pub fn shutdown_background(self) {
+            self.shutdown_timeout(Duration::from_nanos(0))
+        }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/park.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/park.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/park.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/park.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 use crate::loom::sync::{Arc, Condvar, Mutex};
 use crate::loom::thread;
 use crate::park::{Park, Unpark};
-use crate::runtime::time;
+use crate::runtime::driver::Driver;
 use crate::util::TryLock;
 
 use std::sync::atomic::Ordering::SeqCst;
@@ -42,14 +42,14 @@
 /// Shared across multiple Parker handles
 struct Shared {
     /// Shared driver. Only one thread at a time can use this
-    driver: TryLock<time::Driver>,
+    driver: TryLock<Driver>,
 
     /// Unpark handle
-    handle: <time::Driver as Park>::Unpark,
+    handle: <Driver as Park>::Unpark,
 }
 
 impl Parker {
-    pub(crate) fn new(driver: time::Driver) -> Parker {
+    pub(crate) fn new(driver: Driver) -> Parker {
         let handle = driver.unpark();
 
         Parker {
@@ -142,7 +142,7 @@
 
     fn park_condvar(&self) {
         // Otherwise we need to coordinate going to sleep
-        let mut m = self.mutex.lock().unwrap();
+        let mut m = self.mutex.lock();
 
         match self
             .state
@@ -180,7 +180,7 @@
         }
     }
 
-    fn park_driver(&self, driver: &mut time::Driver) {
+    fn park_driver(&self, driver: &mut Driver) {
         match self
             .state
             .compare_exchange(EMPTY, PARKED_DRIVER, SeqCst, SeqCst)
@@ -238,7 +238,7 @@
         // Releasing `lock` before the call to `notify_one` means that when the
         // parked thread wakes it doesn't get woken only to have to wait for us
         // to release `lock`.
-        drop(self.mutex.lock().unwrap());
+        drop(self.mutex.lock());
 
         self.condvar.notify_one()
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
 //! Run-queue structures to support a work-stealing scheduler
 
 use crate::loom::cell::UnsafeCell;
-use crate::loom::sync::atomic::{AtomicU16, AtomicU32, AtomicUsize};
-use crate::loom::sync::{Arc, Mutex};
-use crate::runtime::task;
+use crate::loom::sync::atomic::{AtomicU16, AtomicU32};
+use crate::loom::sync::Arc;
+use crate::runtime::stats::WorkerStatsBatcher;
+use crate::runtime::task::{self, Inject};
 
-use std::marker::PhantomData;
 use std::mem::MaybeUninit;
-use std::ptr::{self, NonNull};
-use std::sync::atomic::Ordering::{AcqRel, Acquire, Release};
+use std::ptr;
+use std::sync::atomic::Ordering::{AcqRel, Acquire, Relaxed, Release};
 
 /// Producer handle. May only be used from a single thread.
 pub(super) struct Local<T: 'static> {
@@ -18,19 +18,6 @@
 /// Consumer handle. May be used from many threads.
 pub(super) struct Steal<T: 'static>(Arc<Inner<T>>);
 
-/// Growable, MPMC queue used to inject new tasks into the scheduler and as an
-/// overflow queue when the local, fixed-size, array queue overflows.
-pub(super) struct Inject<T: 'static> {
-    /// Pointers to the head and tail of the queue
-    pointers: Mutex<Pointers>,
-
-    /// Number of pending tasks in the queue. This helps prevent unnecessary
-    /// locking in the hot path.
-    len: AtomicUsize,
-
-    _p: PhantomData<T>,
-}
-
 pub(super) struct Inner<T: 'static> {
     /// Concurrently updated by many threads.
     ///
@@ -49,24 +36,11 @@
     tail: AtomicU16,
 
     /// Elements
-    buffer: Box<[UnsafeCell<MaybeUninit<task::Notified<T>>>]>,
-}
-
-struct Pointers {
-    /// True if the queue is closed
-    is_closed: bool,
-
-    /// Linked-list head
-    head: Option<NonNull<task::Header>>,
-
-    /// Linked-list tail
-    tail: Option<NonNull<task::Header>>,
+    buffer: Box<[UnsafeCell<MaybeUninit<task::Notified<T>>>; LOCAL_QUEUE_CAPACITY]>,
 }
 
 unsafe impl<T> Send for Inner<T> {}
 unsafe impl<T> Sync for Inner<T> {}
-unsafe impl<T> Send for Inject<T> {}
-unsafe impl<T> Sync for Inject<T> {}
 
 #[cfg(not(loom))]
 const LOCAL_QUEUE_CAPACITY: usize = 256;
@@ -79,6 +53,17 @@
 
 const MASK: usize = LOCAL_QUEUE_CAPACITY - 1;
 
+// Constructing the fixed size array directly is very awkward. The only way to
+// do it is to repeat `UnsafeCell::new(MaybeUninit::uninit())` 256 times, as
+// the contents are not Copy. The trick with defining a const doesn't work for
+// generic types.
+fn make_fixed_size<T>(buffer: Box<[T]>) -> Box<[T; LOCAL_QUEUE_CAPACITY]> {
+    assert_eq!(buffer.len(), LOCAL_QUEUE_CAPACITY);
+
+    // safety: We check that the length is correct.
+    unsafe { Box::from_raw(Box::into_raw(buffer).cast()) }
+}
+
 /// Create a new local run-queue
 pub(super) fn local<T: 'static>() -> (Steal<T>, Local<T>) {
     let mut buffer = Vec::with_capacity(LOCAL_QUEUE_CAPACITY);
@@ -90,7 +75,7 @@
     let inner = Arc::new(Inner {
         head: AtomicU32::new(0),
         tail: AtomicU16::new(0),
-        buffer: buffer.into(),
+        buffer: make_fixed_size(buffer.into_boxed_slice()),
     });
 
     let local = Local {
@@ -121,8 +106,8 @@
                 // There is capacity for the task
                 break tail;
             } else if steal != real {
-                // Concurrently stealing, this will free up capacity, so
-                // only push the new task onto the inject queue
+                // Concurrently stealing, this will free up capacity, so only
+                // push the task onto the inject queue
                 inject.push(task);
                 return;
             } else {
@@ -171,9 +156,12 @@
         tail: u16,
         inject: &Inject<T>,
     ) -> Result<(), task::Notified<T>> {
-        const BATCH_LEN: usize = LOCAL_QUEUE_CAPACITY / 2 + 1;
+        /// How many elements are we taking from the local queue.
+        ///
+        /// This is one less than the number of tasks pushed to the inject
+        /// queue as we are also inserting the `task` argument.
+        const NUM_TASKS_TAKEN: u16 = (LOCAL_QUEUE_CAPACITY / 2) as u16;
 
-        let n = (LOCAL_QUEUE_CAPACITY / 2) as u16;
         assert_eq!(
             tail.wrapping_sub(head) as usize,
             LOCAL_QUEUE_CAPACITY,
@@ -194,54 +182,61 @@
         // work. This is because all tasks are pushed into the queue from the
         // current thread (or memory has been acquired if the local queue handle
         // moved).
-        let actual = self.inner.head.compare_and_swap(
-            prev,
-            pack(head.wrapping_add(n), head.wrapping_add(n)),
-            Release,
-        );
-
-        if actual != prev {
+        if self
+            .inner
+            .head
+            .compare_exchange(
+                prev,
+                pack(
+                    head.wrapping_add(NUM_TASKS_TAKEN),
+                    head.wrapping_add(NUM_TASKS_TAKEN),
+                ),
+                Release,
+                Relaxed,
+            )
+            .is_err()
+        {
             // We failed to claim the tasks, losing the race. Return out of
             // this function and try the full `push` routine again. The queue
             // may not be full anymore.
             return Err(task);
         }
 
-        // link the tasks
-        for i in 0..n {
-            let j = i + 1;
-
-            let i_idx = i.wrapping_add(head) as usize & MASK;
-            let j_idx = j.wrapping_add(head) as usize & MASK;
-
-            // Get the next pointer
-            let next = if j == n {
-                // The last task in the local queue being moved
-                task.header().into()
-            } else {
-                // safety: The above CAS prevents a stealer from accessing these
-                // tasks and we are the only producer.
-                self.inner.buffer[j_idx].with(|ptr| unsafe {
-                    let value = (*ptr).as_ptr();
-                    (*value).header().into()
-                })
-            };
+        /// An iterator that takes elements out of the run queue.
+        struct BatchTaskIter<'a, T: 'static> {
+            buffer: &'a [UnsafeCell<MaybeUninit<task::Notified<T>>>; LOCAL_QUEUE_CAPACITY],
+            head: u32,
+            i: u32,
+        }
+        impl<'a, T: 'static> Iterator for BatchTaskIter<'a, T> {
+            type Item = task::Notified<T>;
+
+            #[inline]
+            fn next(&mut self) -> Option<task::Notified<T>> {
+                if self.i == u32::from(NUM_TASKS_TAKEN) {
+                    None
+                } else {
+                    let i_idx = self.i.wrapping_add(self.head) as usize & MASK;
+                    let slot = &self.buffer[i_idx];
+
+                    // safety: Our CAS from before has assumed exclusive ownership
+                    // of the task pointers in this range.
+                    let task = slot.with(|ptr| unsafe { ptr::read((*ptr).as_ptr()) });
 
-            // safety: the above CAS prevents a stealer from accessing these
-            // tasks and we are the only producer.
-            self.inner.buffer[i_idx].with_mut(|ptr| unsafe {
-                let ptr = (*ptr).as_ptr();
-                (*ptr).header().queue_next.with_mut(|ptr| *ptr = Some(next));
-            });
+                    self.i += 1;
+                    Some(task)
+                }
+            }
         }
 
-        // safety: the above CAS prevents a stealer from accessing these tasks
-        // and we are the only producer.
-        let head = self.inner.buffer[head as usize & MASK]
-            .with(|ptr| unsafe { ptr::read((*ptr).as_ptr()) });
-
-        // Push the tasks onto the inject queue
-        inject.push_batch(head, task, BATCH_LEN);
+        // safety: The CAS above ensures that no consumer will look at these
+        // values again, and we are the only producer.
+        let batch_iter = BatchTaskIter {
+            buffer: &*self.inner.buffer,
+            head: head as u32,
+            i: 0,
+        };
+        inject.push_batch(batch_iter.chain(std::iter::once(task)));
 
         Ok(())
     }
@@ -294,7 +289,11 @@
     }
 
     /// Steals half the tasks from self and place them into `dst`.
-    pub(super) fn steal_into(&self, dst: &mut Local<T>) -> Option<task::Notified<T>> {
+    pub(super) fn steal_into(
+        &self,
+        dst: &mut Local<T>,
+        stats: &mut WorkerStatsBatcher,
+    ) -> Option<task::Notified<T>> {
         // Safety: the caller is the only thread that mutates `dst.tail` and
         // holds a mutable reference.
         let dst_tail = unsafe { dst.inner.tail.unsync_load() };
@@ -313,6 +312,7 @@
         // Steal the tasks into `dst`'s buffer. This does not yet expose the
         // tasks in `dst`.
         let mut n = self.steal_into2(dst, dst_tail);
+        stats.incr_steal_count(n);
 
         if n == 0 {
             // No tasks were stolen
@@ -461,159 +461,10 @@
     }
 }
 
-impl<T: 'static> Inject<T> {
-    pub(super) fn new() -> Inject<T> {
-        Inject {
-            pointers: Mutex::new(Pointers {
-                is_closed: false,
-                head: None,
-                tail: None,
-            }),
-            len: AtomicUsize::new(0),
-            _p: PhantomData,
-        }
-    }
-
-    pub(super) fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    /// Close the injection queue, returns `true` if the queue is open when the
-    /// transition is made.
-    pub(super) fn close(&self) -> bool {
-        let mut p = self.pointers.lock().unwrap();
-
-        if p.is_closed {
-            return false;
-        }
-
-        p.is_closed = true;
-        true
-    }
-
-    pub(super) fn is_closed(&self) -> bool {
-        self.pointers.lock().unwrap().is_closed
-    }
-
-    pub(super) fn len(&self) -> usize {
-        self.len.load(Acquire)
-    }
-
-    /// Pushes a value into the queue.
-    pub(super) fn push(&self, task: task::Notified<T>) {
-        // Acquire queue lock
-        let mut p = self.pointers.lock().unwrap();
-
-        if p.is_closed {
-            // Drop the mutex to avoid a potential deadlock when
-            // re-entering.
-            drop(p);
-            drop(task);
-            return;
-        }
-
-        // safety: only mutated with the lock held
-        let len = unsafe { self.len.unsync_load() };
-        let task = task.into_raw();
-
-        // The next pointer should already be null
-        debug_assert!(get_next(task).is_none());
-
-        if let Some(tail) = p.tail {
-            set_next(tail, Some(task));
-        } else {
-            p.head = Some(task);
-        }
-
-        p.tail = Some(task);
-
-        self.len.store(len + 1, Release);
-    }
-
-    pub(super) fn push_batch(
-        &self,
-        batch_head: task::Notified<T>,
-        batch_tail: task::Notified<T>,
-        num: usize,
-    ) {
-        let batch_head = batch_head.into_raw();
-        let batch_tail = batch_tail.into_raw();
-
-        debug_assert!(get_next(batch_tail).is_none());
-
-        let mut p = self.pointers.lock().unwrap();
-
-        if let Some(tail) = p.tail {
-            set_next(tail, Some(batch_head));
-        } else {
-            p.head = Some(batch_head);
-        }
-
-        p.tail = Some(batch_tail);
-
-        // Increment the count.
-        //
-        // safety: All updates to the len atomic are guarded by the mutex. As
-        // such, a non-atomic load followed by a store is safe.
-        let len = unsafe { self.len.unsync_load() };
-
-        self.len.store(len + num, Release);
-    }
-
-    pub(super) fn pop(&self) -> Option<task::Notified<T>> {
-        // Fast path, if len == 0, then there are no values
-        if self.is_empty() {
-            return None;
-        }
-
-        let mut p = self.pointers.lock().unwrap();
-
-        // It is possible to hit null here if another thread poped the last
-        // task between us checking `len` and acquiring the lock.
-        let task = p.head?;
-
-        p.head = get_next(task);
-
-        if p.head.is_none() {
-            p.tail = None;
-        }
-
-        set_next(task, None);
-
-        // Decrement the count.
-        //
-        // safety: All updates to the len atomic are guarded by the mutex. As
-        // such, a non-atomic load followed by a store is safe.
-        self.len
-            .store(unsafe { self.len.unsync_load() } - 1, Release);
-
-        // safety: a `Notified` is pushed into the queue and now it is popped!
-        Some(unsafe { task::Notified::from_raw(task) })
-    }
-}
-
-impl<T: 'static> Drop for Inject<T> {
-    fn drop(&mut self) {
-        if !std::thread::panicking() {
-            assert!(self.pop().is_none(), "queue not empty");
-        }
-    }
-}
-
-fn get_next(header: NonNull<task::Header>) -> Option<NonNull<task::Header>> {
-    unsafe { header.as_ref().queue_next.with(|ptr| *ptr) }
-}
-
-fn set_next(header: NonNull<task::Header>, val: Option<NonNull<task::Header>>) {
-    unsafe {
-        header.as_ref().queue_next.with_mut(|ptr| *ptr = val);
-    }
-}
-
 /// Split the head value into the real head and the index a stealer is working
 /// on.
 fn unpack(n: u32) -> (u16, u16) {
-    let real = n & u16::max_value() as u32;
+    let real = n & u16::MAX as u32;
     let steal = n >> 16;
 
     (steal as u16, real as u16)
@@ -626,5 +477,5 @@
 
 #[test]
 fn test_local_queue_capacity() {
-    assert!(LOCAL_QUEUE_CAPACITY - 1 <= u8::max_value() as usize);
+    assert!(LOCAL_QUEUE_CAPACITY - 1 <= u8::MAX as usize);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/shell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/shell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/shell.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/shell.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-#![allow(clippy::redundant_clone)]
-
-use crate::park::{Park, Unpark};
-use crate::runtime::enter;
-use crate::runtime::time;
-use crate::util::{waker_ref, Wake};
-
-use std::future::Future;
-use std::sync::Arc;
-use std::task::Context;
-use std::task::Poll::Ready;
-
-#[derive(Debug)]
-pub(super) struct Shell {
-    driver: time::Driver,
-
-    /// TODO: don't store this
-    unpark: Arc<Handle>,
-}
-
-#[derive(Debug)]
-struct Handle(<time::Driver as Park>::Unpark);
-
-impl Shell {
-    pub(super) fn new(driver: time::Driver) -> Shell {
-        let unpark = Arc::new(Handle(driver.unpark()));
-
-        Shell { driver, unpark }
-    }
-
-    pub(super) fn block_on<F>(&mut self, f: F) -> F::Output
-    where
-        F: Future,
-    {
-        let _e = enter(true);
-
-        pin!(f);
-
-        let waker = waker_ref(&self.unpark);
-        let mut cx = Context::from_waker(&waker);
-
-        loop {
-            if let Ready(v) = crate::coop::budget(|| f.as_mut().poll(&mut cx)) {
-                return v;
-            }
-
-            self.driver.park().unwrap();
-        }
-    }
-}
-
-impl Wake for Handle {
-    /// Wake by value
-    fn wake(self: Arc<Self>) {
-        Wake::wake_by_ref(&self);
-    }
-
-    /// Wake by reference
-    fn wake_by_ref(arc_self: &Arc<Self>) {
-        arc_self.0.unpark();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/spawner.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/spawner.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/spawner.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/spawner.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,48 +1,47 @@
-cfg_rt_core! {
-    use crate::runtime::basic_scheduler;
-    use crate::task::JoinHandle;
+use crate::future::Future;
+use crate::runtime::basic_scheduler;
+use crate::runtime::stats::RuntimeStats;
+use crate::task::JoinHandle;
 
-    use std::future::Future;
-}
-
-cfg_rt_threaded! {
+cfg_rt_multi_thread! {
     use crate::runtime::thread_pool;
 }
 
 #[derive(Debug, Clone)]
 pub(crate) enum Spawner {
-    Shell,
-    #[cfg(feature = "rt-core")]
     Basic(basic_scheduler::Spawner),
-    #[cfg(feature = "rt-threaded")]
+    #[cfg(feature = "rt-multi-thread")]
     ThreadPool(thread_pool::Spawner),
 }
 
 impl Spawner {
     pub(crate) fn shutdown(&mut self) {
-        #[cfg(feature = "rt-threaded")]
+        #[cfg(feature = "rt-multi-thread")]
         {
             if let Spawner::ThreadPool(spawner) = self {
                 spawner.shutdown();
             }
         }
     }
-}
 
-cfg_rt_core! {
-    impl Spawner {
-        pub(crate) fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
-        where
-            F: Future + Send + 'static,
-            F::Output: Send + 'static,
-        {
-            match self {
-                Spawner::Shell => panic!("spawning not enabled for runtime"),
-                #[cfg(feature = "rt-core")]
-                Spawner::Basic(spawner) => spawner.spawn(future),
-                #[cfg(feature = "rt-threaded")]
-                Spawner::ThreadPool(spawner) => spawner.spawn(future),
-            }
+    pub(crate) fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
+    where
+        F: Future + Send + 'static,
+        F::Output: Send + 'static,
+    {
+        match self {
+            Spawner::Basic(spawner) => spawner.spawn(future),
+            #[cfg(feature = "rt-multi-thread")]
+            Spawner::ThreadPool(spawner) => spawner.spawn(future),
+        }
+    }
+
+    #[cfg_attr(not(all(tokio_unstable, feature = "stats")), allow(dead_code))]
+    pub(crate) fn stats(&self) -> &RuntimeStats {
+        match self {
+            Spawner::Basic(spawner) => spawner.stats(),
+            #[cfg(feature = "rt-multi-thread")]
+            Spawner::ThreadPool(spawner) => spawner.stats(),
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/stats/mock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/stats/mock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/stats/mock.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/stats/mock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+//! This file contains mocks of the types in src/runtime/stats/stats.rs
+
+pub(crate) struct RuntimeStats {}
+
+impl RuntimeStats {
+    pub(crate) fn new(_worker_threads: usize) -> Self {
+        Self {}
+    }
+}
+
+pub(crate) struct WorkerStatsBatcher {}
+
+impl WorkerStatsBatcher {
+    pub(crate) fn new(_my_index: usize) -> Self {
+        Self {}
+    }
+
+    pub(crate) fn submit(&mut self, _to: &RuntimeStats) {}
+
+    pub(crate) fn about_to_park(&mut self) {}
+    pub(crate) fn returned_from_park(&mut self) {}
+
+    #[cfg(feature = "rt-multi-thread")]
+    pub(crate) fn incr_steal_count(&mut self, _by: u16) {}
+
+    pub(crate) fn incr_poll_count(&mut self) {}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/stats/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/stats/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/stats/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/stats/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+//! This module contains information need to view information about how the
+//! runtime is performing.
+#![allow(clippy::module_inception)]
+
+cfg_stats! {
+    mod stats;
+
+    pub use self::stats::{RuntimeStats, WorkerStats};
+    pub(crate) use self::stats::WorkerStatsBatcher;
+}
+
+cfg_not_stats! {
+    #[path = "mock.rs"]
+    mod stats;
+
+    pub(crate) use self::stats::{RuntimeStats, WorkerStatsBatcher};
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/stats/stats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/stats/stats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/stats/stats.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/stats/stats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,97 @@
+//! This file contains the types necessary to collect various types of stats.
+use crate::loom::sync::atomic::{AtomicU64, Ordering::Relaxed};
+
+/// This type contains methods to retrieve stats from a Tokio runtime.
+#[derive(Debug)]
+pub struct RuntimeStats {
+    workers: Box<[WorkerStats]>,
+}
+
+/// This type contains methods to retrieve stats from a worker thread on a Tokio runtime.
+#[derive(Debug)]
+#[repr(align(128))]
+pub struct WorkerStats {
+    park_count: AtomicU64,
+    steal_count: AtomicU64,
+    poll_count: AtomicU64,
+}
+
+impl RuntimeStats {
+    pub(crate) fn new(worker_threads: usize) -> Self {
+        let mut workers = Vec::with_capacity(worker_threads);
+        for _ in 0..worker_threads {
+            workers.push(WorkerStats {
+                park_count: AtomicU64::new(0),
+                steal_count: AtomicU64::new(0),
+                poll_count: AtomicU64::new(0),
+            });
+        }
+
+        Self {
+            workers: workers.into_boxed_slice(),
+        }
+    }
+
+    /// Returns a slice containing the worker stats for each worker thread.
+    pub fn workers(&self) -> impl Iterator<Item = &WorkerStats> {
+        self.workers.iter()
+    }
+}
+
+impl WorkerStats {
+    /// Returns the total number of times this worker thread has parked.
+    pub fn park_count(&self) -> u64 {
+        self.park_count.load(Relaxed)
+    }
+
+    /// Returns the number of tasks this worker has stolen from other worker
+    /// threads.
+    pub fn steal_count(&self) -> u64 {
+        self.steal_count.load(Relaxed)
+    }
+
+    /// Returns the number of times this worker has polled a task.
+    pub fn poll_count(&self) -> u64 {
+        self.poll_count.load(Relaxed)
+    }
+}
+
+pub(crate) struct WorkerStatsBatcher {
+    my_index: usize,
+    park_count: u64,
+    steal_count: u64,
+    poll_count: u64,
+}
+
+impl WorkerStatsBatcher {
+    pub(crate) fn new(my_index: usize) -> Self {
+        Self {
+            my_index,
+            park_count: 0,
+            steal_count: 0,
+            poll_count: 0,
+        }
+    }
+    pub(crate) fn submit(&mut self, to: &RuntimeStats) {
+        let worker = &to.workers[self.my_index];
+
+        worker.park_count.store(self.park_count, Relaxed);
+        worker.steal_count.store(self.steal_count, Relaxed);
+        worker.poll_count.store(self.poll_count, Relaxed);
+    }
+
+    pub(crate) fn about_to_park(&mut self) {
+        self.park_count += 1;
+    }
+
+    pub(crate) fn returned_from_park(&mut self) {}
+
+    #[cfg(feature = "rt-multi-thread")]
+    pub(crate) fn incr_steal_count(&mut self, by: u16) {
+        self.steal_count += u64::from(by);
+    }
+
+    pub(crate) fn incr_poll_count(&mut self) {
+        self.poll_count += 1;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/core.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/core.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/core.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/core.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,14 +9,13 @@
 //! Make sure to consult the relevant safety section of each function before
 //! use.
 
+use crate::future::Future;
 use crate::loom::cell::UnsafeCell;
 use crate::runtime::task::raw::{self, Vtable};
 use crate::runtime::task::state::State;
-use crate::runtime::task::waker::waker_ref;
-use crate::runtime::task::{Notified, Schedule, Task};
+use crate::runtime::task::Schedule;
 use crate::util::linked_list;
 
-use std::future::Future;
 use std::pin::Pin;
 use std::ptr::NonNull;
 use std::task::{Context, Poll, Waker};
@@ -37,15 +36,19 @@
     pub(super) trailer: Trailer,
 }
 
+pub(super) struct CoreStage<T: Future> {
+    stage: UnsafeCell<Stage<T>>,
+}
+
 /// The core of the task.
 ///
 /// Holds the future or output, depending on the stage of execution.
 pub(super) struct Core<T: Future, S> {
     /// Scheduler used to drive this future
-    pub(super) scheduler: UnsafeCell<Option<S>>,
+    pub(super) scheduler: S,
 
     /// Either the future or the output
-    pub(super) stage: UnsafeCell<Stage<T>>,
+    pub(super) stage: CoreStage<T>,
 }
 
 /// Crate public as this is also needed by the pool.
@@ -54,16 +57,30 @@
     /// Task state
     pub(super) state: State,
 
-    pub(crate) owned: UnsafeCell<linked_list::Pointers<Header>>,
+    pub(super) owned: UnsafeCell<linked_list::Pointers<Header>>,
 
     /// Pointer to next task, used with the injection queue
-    pub(crate) queue_next: UnsafeCell<Option<NonNull<Header>>>,
-
-    /// Pointer to the next task in the transfer stack
-    pub(super) stack_next: UnsafeCell<Option<NonNull<Header>>>,
+    pub(super) queue_next: UnsafeCell<Option<NonNull<Header>>>,
 
     /// Table of function pointers for executing actions on the task.
     pub(super) vtable: &'static Vtable,
+
+    /// This integer contains the id of the OwnedTasks or LocalOwnedTasks that
+    /// this task is stored in. If the task is not in any list, should be the
+    /// id of the list that it was previously in, or zero if it has never been
+    /// in any list.
+    ///
+    /// Once a task has been bound to a list, it can never be bound to another
+    /// list, even if removed from the first list.
+    ///
+    /// The id is not unset when removed from a list because we want to be able
+    /// to read the id without synchronization, even if it is concurrently being
+    /// removed from the list.
+    pub(super) owner_id: UnsafeCell<u64>,
+
+    /// The tracing ID for this instrumented task.
+    #[cfg(all(tokio_unstable, feature = "tracing"))]
+    pub(super) id: Option<tracing::Id>,
 }
 
 unsafe impl Send for Header {}
@@ -85,18 +102,24 @@
 impl<T: Future, S: Schedule> Cell<T, S> {
     /// Allocates a new task cell, containing the header, trailer, and core
     /// structures.
-    pub(super) fn new(future: T, state: State) -> Box<Cell<T, S>> {
+    pub(super) fn new(future: T, scheduler: S, state: State) -> Box<Cell<T, S>> {
+        #[cfg(all(tokio_unstable, feature = "tracing"))]
+        let id = future.id();
         Box::new(Cell {
             header: Header {
                 state,
                 owned: UnsafeCell::new(linked_list::Pointers::new()),
                 queue_next: UnsafeCell::new(None),
-                stack_next: UnsafeCell::new(None),
                 vtable: raw::vtable::<T, S>(),
+                owner_id: UnsafeCell::new(0),
+                #[cfg(all(tokio_unstable, feature = "tracing"))]
+                id,
             },
             core: Core {
-                scheduler: UnsafeCell::new(None),
-                stage: UnsafeCell::new(Stage::Running(future)),
+                scheduler,
+                stage: CoreStage {
+                    stage: UnsafeCell::new(Stage::Running(future)),
+                },
             },
             trailer: Trailer {
                 waker: UnsafeCell::new(None),
@@ -105,39 +128,9 @@
     }
 }
 
-impl<T: Future, S: Schedule> Core<T, S> {
-    /// Bind a scheduler to the task.
-    ///
-    /// This only happens on the first poll and must be preceeded by a call to
-    /// `is_bound` to determine if binding is appropriate or not.
-    ///
-    /// # Safety
-    ///
-    /// Binding must not be done concurrently since it will mutate the task
-    /// core through a shared reference.
-    pub(super) fn bind_scheduler(&self, task: Task<S>) {
-        // This function may be called concurrently, but the __first__ time it
-        // is called, the caller has unique access to this field. All subsequent
-        // concurrent calls will be via the `Waker`, which will "happens after"
-        // the first poll.
-        //
-        // In other words, it is always safe to read the field and it is safe to
-        // write to the field when it is `None`.
-        debug_assert!(!self.is_bound());
-
-        // Bind the task to the scheduler
-        let scheduler = S::bind(task);
-
-        // Safety: As `scheduler` is not set, this is the first poll
-        self.scheduler.with_mut(|ptr| unsafe {
-            *ptr = Some(scheduler);
-        });
-    }
-
-    /// Returns true if the task is bound to a scheduler.
-    pub(super) fn is_bound(&self) -> bool {
-        // Safety: never called concurrently w/ a mutation.
-        self.scheduler.with(|ptr| unsafe { (*ptr).is_some() })
+impl<T: Future> CoreStage<T> {
+    pub(super) fn with_mut<R>(&self, f: impl FnOnce(*mut Stage<T>) -> R) -> R {
+        self.stage.with_mut(f)
     }
 
     /// Poll the future
@@ -145,7 +138,7 @@
     /// # Safety
     ///
     /// The caller must ensure it is safe to mutate the `state` field. This
-    /// requires ensuring mutal exclusion between any concurrent thread that
+    /// requires ensuring mutual exclusion between any concurrent thread that
     /// might modify the future or output field.
     ///
     /// The mutual exclusion is implemented by `Harness` and the `Lifecycle`
@@ -153,7 +146,7 @@
     ///
     /// `self` must also be pinned. This is handled by storing the task on the
     /// heap.
-    pub(super) fn poll(&self, header: &Header) -> Poll<T::Output> {
+    pub(super) fn poll(&self, mut cx: Context<'_>) -> Poll<T::Output> {
         let res = {
             self.stage.with_mut(|ptr| {
                 // Safety: The caller ensures mutual exclusion to the field.
@@ -165,11 +158,6 @@
                 // Safety: The caller ensures the future is pinned.
                 let future = unsafe { Pin::new_unchecked(future) };
 
-                // The waker passed into the `poll` function does not require a ref
-                // count increment.
-                let waker_ref = waker_ref::<T, S>(header);
-                let mut cx = Context::from_waker(&*waker_ref);
-
                 future.poll(&mut cx)
             })
         };
@@ -187,10 +175,10 @@
     ///
     /// The caller must ensure it is safe to mutate the `stage` field.
     pub(super) fn drop_future_or_output(&self) {
-        self.stage.with_mut(|ptr| {
-            // Safety: The caller ensures mutal exclusion to the field.
-            unsafe { *ptr = Stage::Consumed };
-        });
+        // Safety: the caller ensures mutual exclusion to the field.
+        unsafe {
+            self.set_stage(Stage::Consumed);
+        }
     }
 
     /// Store the task output
@@ -199,10 +187,10 @@
     ///
     /// The caller must ensure it is safe to mutate the `stage` field.
     pub(super) fn store_output(&self, output: super::Result<T::Output>) {
-        self.stage.with_mut(|ptr| {
-            // Safety: the caller ensures mutual exclusion to the field.
-            unsafe { *ptr = Stage::Finished(output) };
-        });
+        // Safety: the caller ensures mutual exclusion to the field.
+        unsafe {
+            self.set_stage(Stage::Finished(output));
+        }
     }
 
     /// Take the task output
@@ -214,69 +202,59 @@
         use std::mem;
 
         self.stage.with_mut(|ptr| {
-            // Safety:: the caller ensures mutal exclusion to the field.
+            // Safety:: the caller ensures mutual exclusion to the field.
             match mem::replace(unsafe { &mut *ptr }, Stage::Consumed) {
                 Stage::Finished(output) => output,
-                _ => panic!("unexpected task state"),
+                _ => panic!("JoinHandle polled after completion"),
             }
         })
     }
 
-    /// Schedule the future for execution
-    pub(super) fn schedule(&self, task: Notified<S>) {
-        self.scheduler.with(|ptr| {
-            // Safety: Can only be called after initial `poll`, which is the
-            // only time the field is mutated.
-            match unsafe { &*ptr } {
-                Some(scheduler) => scheduler.schedule(task),
-                None => panic!("no scheduler set"),
-            }
-        });
+    unsafe fn set_stage(&self, stage: Stage<T>) {
+        self.stage.with_mut(|ptr| *ptr = stage)
     }
+}
 
-    /// Schedule the future for execution in the near future, yielding the
-    /// thread to other tasks.
-    pub(super) fn yield_now(&self, task: Notified<S>) {
-        self.scheduler.with(|ptr| {
-            // Safety: Can only be called after initial `poll`, which is the
-            // only time the field is mutated.
-            match unsafe { &*ptr } {
-                Some(scheduler) => scheduler.yield_now(task),
-                None => panic!("no scheduler set"),
-            }
-        });
+cfg_rt_multi_thread! {
+    impl Header {
+        pub(super) unsafe fn set_next(&self, next: Option<NonNull<Header>>) {
+            self.queue_next.with_mut(|ptr| *ptr = next);
+        }
     }
+}
 
-    /// Release the task
-    ///
-    /// If the `Scheduler` implementation is able to, it returns the `Task`
-    /// handle immediately. The caller of this function will batch a ref-dec
-    /// with a state change.
-    pub(super) fn release(&self, task: Task<S>) -> Option<Task<S>> {
-        use std::mem::ManuallyDrop;
-
-        let task = ManuallyDrop::new(task);
-
-        self.scheduler.with(|ptr| {
-            // Safety: Can only be called after initial `poll`, which is the
-            // only time the field is mutated.
-            match unsafe { &*ptr } {
-                Some(scheduler) => scheduler.release(&*task),
-                // Task was never polled
-                None => None,
-            }
-        })
+impl Header {
+    // safety: The caller must guarantee exclusive access to this field, and
+    // must ensure that the id is either 0 or the id of the OwnedTasks
+    // containing this task.
+    pub(super) unsafe fn set_owner_id(&self, owner: u64) {
+        self.owner_id.with_mut(|ptr| *ptr = owner);
+    }
+
+    pub(super) fn get_owner_id(&self) -> u64 {
+        // safety: If there are concurrent writes, then that write has violated
+        // the safety requirements on `set_owner_id`.
+        unsafe { self.owner_id.with(|ptr| *ptr) }
     }
 }
 
-cfg_rt_threaded! {
-    impl Header {
-        pub(crate) fn shutdown(&self) {
-            use crate::runtime::task::RawTask;
+impl Trailer {
+    pub(super) unsafe fn set_waker(&self, waker: Option<Waker>) {
+        self.waker.with_mut(|ptr| {
+            *ptr = waker;
+        });
+    }
 
-            let task = unsafe { RawTask::from_raw(self.into()) };
-            task.shutdown();
-        }
+    pub(super) unsafe fn will_wake(&self, waker: &Waker) -> bool {
+        self.waker
+            .with(|ptr| (*ptr).as_ref().unwrap().will_wake(waker))
+    }
+
+    pub(super) fn wake_join(&self) {
+        self.waker.with(|ptr| match unsafe { &*ptr } {
+            Some(waker) => waker.wake_by_ref(),
+            None => panic!("waker missing"),
+        });
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,10 @@
 use std::any::Any;
 use std::fmt;
 use std::io;
-use std::sync::Mutex;
 
-doc_rt_core! {
+use crate::util::SyncWrapper;
+
+cfg_rt! {
     /// Task failed to execute to completion.
     pub struct JoinError {
         repr: Repr,
@@ -12,40 +13,25 @@
 
 enum Repr {
     Cancelled,
-    Panic(Mutex<Box<dyn Any + Send + 'static>>),
+    Panic(SyncWrapper<Box<dyn Any + Send + 'static>>),
 }
 
 impl JoinError {
-    #[doc(hidden)]
-    #[deprecated]
-    pub fn cancelled() -> JoinError {
-        Self::cancelled2()
-    }
-
-    pub(crate) fn cancelled2() -> JoinError {
+    pub(crate) fn cancelled() -> JoinError {
         JoinError {
             repr: Repr::Cancelled,
         }
     }
 
-    #[doc(hidden)]
-    #[deprecated]
-    pub fn panic(err: Box<dyn Any + Send + 'static>) -> JoinError {
-        Self::panic2(err)
-    }
-
-    pub(crate) fn panic2(err: Box<dyn Any + Send + 'static>) -> JoinError {
+    pub(crate) fn panic(err: Box<dyn Any + Send + 'static>) -> JoinError {
         JoinError {
-            repr: Repr::Panic(Mutex::new(err)),
+            repr: Repr::Panic(SyncWrapper::new(err)),
         }
     }
 
     /// Returns true if the error was caused by the task being cancelled
     pub fn is_cancelled(&self) -> bool {
-        match &self.repr {
-            Repr::Cancelled => true,
-            _ => false,
-        }
+        matches!(&self.repr, Repr::Cancelled)
     }
 
     /// Returns true if the error was caused by the task panicking
@@ -65,10 +51,7 @@
     /// }
     /// ```
     pub fn is_panic(&self) -> bool {
-        match &self.repr {
-            Repr::Panic(_) => true,
-            _ => false,
-        }
+        matches!(&self.repr, Repr::Panic(_))
     }
 
     /// Consumes the join error, returning the object with which the task panicked.
@@ -124,7 +107,7 @@
     /// ```
     pub fn try_into_panic(self) -> Result<Box<dyn Any + Send + 'static>, JoinError> {
         match self.repr {
-            Repr::Panic(p) => Ok(p.into_inner().expect("Extracting panic from mutex")),
+            Repr::Panic(p) => Ok(p.into_inner()),
             _ => Err(self),
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/harness.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/harness.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/harness.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/harness.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,12 +1,14 @@
-use crate::runtime::task::core::{Cell, Core, Header, Trailer};
+use crate::future::Future;
+use crate::runtime::task::core::{Cell, Core, CoreStage, Header, Trailer};
 use crate::runtime::task::state::Snapshot;
+use crate::runtime::task::waker::waker_ref;
 use crate::runtime::task::{JoinError, Notified, Schedule, Task};
 
-use std::future::Future;
 use std::mem;
+use std::mem::ManuallyDrop;
 use std::panic;
 use std::ptr::NonNull;
-use std::task::{Poll, Waker};
+use std::task::{Context, Poll, Waker};
 
 /// Typed raw task handle
 pub(super) struct Harness<T: Future, S: 'static> {
@@ -42,108 +44,111 @@
     T: Future,
     S: Schedule,
 {
-    /// Polls the inner future.
+    /// Polls the inner future. A ref-count is consumed.
     ///
     /// All necessary state checks and transitions are performed.
-    ///
     /// Panics raised while polling the future are handled.
     pub(super) fn poll(self) {
-        // If this is the first time the task is polled, the task will be bound
-        // to the scheduler, in which case the task ref count must be
-        // incremented.
-        let is_not_bound = !self.core().is_bound();
-
-        // Transition the task to the running state.
-        //
-        // A failure to transition here indicates the task has been cancelled
-        // while in the run queue pending execution.
-        let snapshot = match self.header().state.transition_to_running(is_not_bound) {
-            Ok(snapshot) => snapshot,
-            Err(_) => {
-                // The task was shutdown while in the run queue. At this point,
-                // we just hold a ref counted reference. Drop it here.
+        // We pass our ref-count to `poll_inner`.
+        match self.poll_inner() {
+            PollFuture::Notified => {
+                // The `poll_inner` call has given us two ref-counts back.
+                // We give one of them to a new task and call `yield_now`.
+                self.core()
+                    .scheduler
+                    .yield_now(Notified(self.get_new_task()));
+
+                // The remaining ref-count is now dropped. We kept the extra
+                // ref-count until now to ensure that even if the `yield_now`
+                // call drops the provided task, the task isn't deallocated
+                // before after `yield_now` returns.
                 self.drop_reference();
-                return;
             }
-        };
-
-        if is_not_bound {
-            // Ensure the task is bound to a scheduler instance. Since this is
-            // the first time polling the task, a scheduler instance is pulled
-            // from the local context and assigned to the task.
-            //
-            // The scheduler maintains ownership of the task and responds to
-            // `wake` calls.
-            //
-            // The task reference count has been incremented.
-            //
-            // Safety: Since we have unique access to the task so that we can
-            // safely call `bind_scheduler`.
-            self.core().bind_scheduler(self.to_task());
-        }
-
-        // The transition to `Running` done above ensures that a lock on the
-        // future has been obtained. This also ensures the `*mut T` pointer
-        // contains the future (as opposed to the output) and is initialized.
-
-        let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-            struct Guard<'a, T: Future, S: Schedule> {
-                core: &'a Core<T, S>,
+            PollFuture::Complete => {
+                self.complete();
             }
-
-            impl<T: Future, S: Schedule> Drop for Guard<'_, T, S> {
-                fn drop(&mut self) {
-                    self.core.drop_future_or_output();
-                }
+            PollFuture::Dealloc => {
+                self.dealloc();
             }
+            PollFuture::Done => (),
+        }
+    }
 
-            let guard = Guard { core: self.core() };
-
-            // If the task is cancelled, avoid polling it, instead signalling it
-            // is complete.
-            if snapshot.is_cancelled() {
-                Poll::Ready(Err(JoinError::cancelled2()))
-            } else {
-                let res = guard.core.poll(self.header());
-
-                // prevent the guard from dropping the future
-                mem::forget(guard);
-
-                res.map(Ok)
-            }
-        }));
+    /// Poll the task and cancel it if necessary. This takes ownership of a
+    /// ref-count.
+    ///
+    /// If the return value is Notified, the caller is given ownership of two
+    /// ref-counts.
+    ///
+    /// If the return value is Complete, the caller is given ownership of a
+    /// single ref-count, which should be passed on to `complete`.
+    ///
+    /// If the return value is Dealloc, then this call consumed the last
+    /// ref-count and the caller should call `dealloc`.
+    ///
+    /// Otherwise the ref-count is consumed and the caller should not access
+    /// `self` again.
+    fn poll_inner(&self) -> PollFuture {
+        use super::state::{TransitionToIdle, TransitionToRunning};
+
+        match self.header().state.transition_to_running() {
+            TransitionToRunning::Success => {
+                let waker_ref = waker_ref::<T, S>(self.header());
+                let cx = Context::from_waker(&*waker_ref);
+                let res = poll_future(&self.core().stage, cx);
+
+                if res == Poll::Ready(()) {
+                    // The future completed. Move on to complete the task.
+                    return PollFuture::Complete;
+                }
 
-        match res {
-            Ok(Poll::Ready(out)) => {
-                self.complete(out, snapshot.is_join_interested());
-            }
-            Ok(Poll::Pending) => {
                 match self.header().state.transition_to_idle() {
-                    Ok(snapshot) => {
-                        if snapshot.is_notified() {
-                            // Signal yield
-                            self.core().yield_now(Notified(self.to_task()));
-                            // The ref-count was incremented as part of
-                            // `transition_to_idle`.
-                            self.drop_reference();
-                        }
+                    TransitionToIdle::Ok => PollFuture::Done,
+                    TransitionToIdle::OkNotified => PollFuture::Notified,
+                    TransitionToIdle::OkDealloc => PollFuture::Dealloc,
+                    TransitionToIdle::Cancelled => {
+                        // The transition to idle failed because the task was
+                        // cancelled during the poll.
+
+                        cancel_task(&self.core().stage);
+                        PollFuture::Complete
                     }
-                    Err(_) => self.cancel_task(),
                 }
             }
-            Err(err) => {
-                self.complete(Err(JoinError::panic2(err)), snapshot.is_join_interested());
+            TransitionToRunning::Cancelled => {
+                cancel_task(&self.core().stage);
+                PollFuture::Complete
             }
+            TransitionToRunning::Failed => PollFuture::Done,
+            TransitionToRunning::Dealloc => PollFuture::Dealloc,
         }
     }
 
+    /// Forcibly shutdown the task
+    ///
+    /// Attempt to transition to `Running` in order to forcibly shutdown the
+    /// task. If the task is currently running or in a state of completion, then
+    /// there is nothing further to do. When the task completes running, it will
+    /// notice the `CANCELLED` bit and finalize the task.
+    pub(super) fn shutdown(self) {
+        if !self.header().state.transition_to_shutdown() {
+            // The task is concurrently running. No further work needed.
+            self.drop_reference();
+            return;
+        }
+
+        // By transitioning the lifecycle to `Running`, we have permission to
+        // drop the future.
+        cancel_task(&self.core().stage);
+        self.complete();
+    }
+
     pub(super) fn dealloc(self) {
         // Release the join waker, if there is one.
-        self.trailer().waker.with_mut(|_| ());
+        self.trailer().waker.with_mut(drop);
 
         // Check causality
-        self.core().stage.with_mut(|_| {});
-        self.core().scheduler.with_mut(|_| {});
+        self.core().stage.with_mut(drop);
 
         unsafe {
             drop(Box::from_raw(self.cell.as_ptr()));
@@ -154,86 +159,14 @@
 
     /// Read the task output into `dst`.
     pub(super) fn try_read_output(self, dst: &mut Poll<super::Result<T::Output>>, waker: &Waker) {
-        // Load a snapshot of the current task state
-        let snapshot = self.header().state.load();
-
-        debug_assert!(snapshot.is_join_interested());
-
-        if !snapshot.is_complete() {
-            // The waker must be stored in the task struct.
-            let res = if snapshot.has_join_waker() {
-                // There already is a waker stored in the struct. If it matches
-                // the provided waker, then there is no further work to do.
-                // Otherwise, the waker must be swapped.
-                let will_wake = unsafe {
-                    // Safety: when `JOIN_INTEREST` is set, only `JOIN_HANDLE`
-                    // may mutate the `waker` field.
-                    self.trailer()
-                        .waker
-                        .with(|ptr| (*ptr).as_ref().unwrap().will_wake(waker))
-                };
-
-                if will_wake {
-                    // The task is not complete **and** the waker is up to date,
-                    // there is nothing further that needs to be done.
-                    return;
-                }
-
-                // Unset the `JOIN_WAKER` to gain mutable access to the `waker`
-                // field then update the field with the new join worker.
-                //
-                // This requires two atomic operations, unsetting the bit and
-                // then resetting it. If the task transitions to complete
-                // concurrently to either one of those operations, then setting
-                // the join waker fails and we proceed to reading the task
-                // output.
-                self.header()
-                    .state
-                    .unset_waker()
-                    .and_then(|snapshot| self.set_join_waker(waker.clone(), snapshot))
-            } else {
-                self.set_join_waker(waker.clone(), snapshot)
-            };
-
-            match res {
-                Ok(_) => return,
-                Err(snapshot) => {
-                    assert!(snapshot.is_complete());
-                }
-            }
-        }
-
-        *dst = Poll::Ready(self.core().take_output());
-    }
-
-    fn set_join_waker(&self, waker: Waker, snapshot: Snapshot) -> Result<Snapshot, Snapshot> {
-        assert!(snapshot.is_join_interested());
-        assert!(!snapshot.has_join_waker());
-
-        // Safety: Only the `JoinHandle` may set the `waker` field. When
-        // `JOIN_INTEREST` is **not** set, nothing else will touch the field.
-        unsafe {
-            self.trailer().waker.with_mut(|ptr| {
-                *ptr = Some(waker);
-            });
+        if can_read_output(self.header(), self.trailer(), waker) {
+            *dst = Poll::Ready(self.core().stage.take_output());
         }
-
-        // Update the `JoinWaker` state accordingly
-        let res = self.header().state.set_join_waker();
-
-        // If the state could not be updated, then clear the join waker
-        if res.is_err() {
-            unsafe {
-                self.trailer().waker.with_mut(|ptr| {
-                    *ptr = None;
-                });
-            }
-        }
-
-        res
     }
 
     pub(super) fn drop_join_handle_slow(self) {
+        let mut maybe_panic = None;
+
         // Try to unset `JOIN_INTEREST`. This must be done as a first step in
         // case the task concurrently completed.
         if self.header().state.unset_join_interested().is_err() {
@@ -242,23 +175,95 @@
             // the scheduler or `JoinHandle`. i.e. if the output remains in the
             // task structure until the task is deallocated, it may be dropped
             // by a Waker on any arbitrary thread.
-            self.core().drop_future_or_output();
+            let panic = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+                self.core().stage.drop_future_or_output();
+            }));
+
+            if let Err(panic) = panic {
+                maybe_panic = Some(panic);
+            }
         }
 
         // Drop the `JoinHandle` reference, possibly deallocating the task
         self.drop_reference();
+
+        if let Some(panic) = maybe_panic {
+            panic::resume_unwind(panic);
+        }
+    }
+
+    /// Remotely abort the task.
+    ///
+    /// The caller should hold a ref-count, but we do not consume it.
+    ///
+    /// This is similar to `shutdown` except that it asks the runtime to perform
+    /// the shutdown. This is necessary to avoid the shutdown happening in the
+    /// wrong thread for non-Send tasks.
+    pub(super) fn remote_abort(self) {
+        if self.header().state.transition_to_notified_and_cancel() {
+            // The transition has created a new ref-count, which we turn into
+            // a Notified and pass to the task.
+            //
+            // Since the caller holds a ref-count, the task cannot be destroyed
+            // before the call to `schedule` returns even if the call drops the
+            // `Notified` internally.
+            self.core()
+                .scheduler
+                .schedule(Notified(self.get_new_task()));
+        }
     }
 
     // ===== waker behavior =====
 
+    /// This call consumes a ref-count and notifies the task. This will create a
+    /// new Notified and submit it if necessary.
+    ///
+    /// The caller does not need to hold a ref-count besides the one that was
+    /// passed to this call.
     pub(super) fn wake_by_val(self) {
-        self.wake_by_ref();
-        self.drop_reference();
+        use super::state::TransitionToNotifiedByVal;
+
+        match self.header().state.transition_to_notified_by_val() {
+            TransitionToNotifiedByVal::Submit => {
+                // The caller has given us a ref-count, and the transition has
+                // created a new ref-count, so we now hold two. We turn the new
+                // ref-count Notified and pass it to the call to `schedule`.
+                //
+                // The old ref-count is retained for now to ensure that the task
+                // is not dropped during the call to `schedule` if the call
+                // drops the task it was given.
+                self.core()
+                    .scheduler
+                    .schedule(Notified(self.get_new_task()));
+
+                // Now that we have completed the call to schedule, we can
+                // release our ref-count.
+                self.drop_reference();
+            }
+            TransitionToNotifiedByVal::Dealloc => {
+                self.dealloc();
+            }
+            TransitionToNotifiedByVal::DoNothing => {}
+        }
     }
 
+    /// This call notifies the task. It will not consume any ref-counts, but the
+    /// caller should hold a ref-count.  This will create a new Notified and
+    /// submit it if necessary.
     pub(super) fn wake_by_ref(&self) {
-        if self.header().state.transition_to_notified() {
-            self.core().schedule(Notified(self.to_task()));
+        use super::state::TransitionToNotifiedByRef;
+
+        match self.header().state.transition_to_notified_by_ref() {
+            TransitionToNotifiedByRef::Submit => {
+                // The transition above incremented the ref-count for a new task
+                // and the caller also holds a ref-count. The caller's ref-count
+                // ensures that the task is not destroyed even if the new task
+                // is dropped before `schedule` returns.
+                self.core()
+                    .scheduler
+                    .schedule(Notified(self.get_new_task()));
+            }
+            TransitionToNotifiedByRef::DoNothing => {}
         }
     }
 
@@ -268,104 +273,207 @@
         }
     }
 
-    /// Forcibly shutdown the task
-    ///
-    /// Attempt to transition to `Running` in order to forcibly shutdown the
-    /// task. If the task is currently running or in a state of completion, then
-    /// there is nothing further to do. When the task completes running, it will
-    /// notice the `CANCELLED` bit and finalize the task.
-    pub(super) fn shutdown(self) {
-        if !self.header().state.transition_to_shutdown() {
-            // The task is concurrently running. No further work needed.
-            return;
-        }
-
-        // By transitioning the lifcycle to `Running`, we have permission to
-        // drop the future.
-        self.cancel_task();
+    #[cfg(all(tokio_unstable, feature = "tracing"))]
+    pub(super) fn id(&self) -> Option<&tracing::Id> {
+        self.header().id.as_ref()
     }
 
     // ====== internal ======
 
-    fn cancel_task(self) {
-        // Drop the future from a panic guard.
-        let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-            self.core().drop_future_or_output();
+    /// Complete the task. This method assumes that the state is RUNNING.
+    fn complete(self) {
+        // The future has completed and its output has been written to the task
+        // stage. We transition from running to complete.
+
+        let snapshot = self.header().state.transition_to_complete();
+
+        // We catch panics here in case dropping the future or waking the
+        // JoinHandle panics.
+        let _ = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+            if !snapshot.is_join_interested() {
+                // The `JoinHandle` is not interested in the output of
+                // this task. It is our responsibility to drop the
+                // output.
+                self.core().stage.drop_future_or_output();
+            } else if snapshot.has_join_waker() {
+                // Notify the join handle. The previous transition obtains the
+                // lock on the waker cell.
+                self.trailer().wake_join();
+            }
         }));
 
-        if let Err(err) = res {
-            // Dropping the future panicked, complete the join
-            // handle with the panic to avoid dropping the panic
-            // on the ground.
-            self.complete(Err(JoinError::panic2(err)), true);
+        // The task has completed execution and will no longer be scheduled.
+        let num_release = self.release();
+
+        if self.header().state.transition_to_terminal(num_release) {
+            self.dealloc();
+        }
+    }
+
+    /// Release the task from the scheduler. Returns the number of ref-counts
+    /// that should be decremented.
+    fn release(&self) -> usize {
+        // We don't actually increment the ref-count here, but the new task is
+        // never destroyed, so that's ok.
+        let me = ManuallyDrop::new(self.get_new_task());
+
+        if let Some(task) = self.core().scheduler.release(&me) {
+            mem::forget(task);
+            2
         } else {
-            self.complete(Err(JoinError::cancelled2()), true);
+            1
         }
     }
 
-    fn complete(mut self, output: super::Result<T::Output>, is_join_interested: bool) {
-        if is_join_interested {
-            // Store the output. The future has already been dropped
-            //
-            // Safety: Mutual exclusion is obtained by having transitioned the task
-            // state -> Running
-            self.core().store_output(output);
+    /// Create a new task that holds its own ref-count.
+    ///
+    /// # Safety
+    ///
+    /// Any use of `self` after this call must ensure that a ref-count to the
+    /// task holds the task alive until after the use of `self`. Passing the
+    /// returned Task to any method on `self` is unsound if dropping the Task
+    /// could drop `self` before the call on `self` returned.
+    fn get_new_task(&self) -> Task<S> {
+        // safety: The header is at the beginning of the cell, so this cast is
+        // safe.
+        unsafe { Task::from_raw(self.cell.cast()) }
+    }
+}
 
-            // Transition to `Complete`, notifying the `JoinHandle` if necessary.
-            self.transition_to_complete();
-        }
+fn can_read_output(header: &Header, trailer: &Trailer, waker: &Waker) -> bool {
+    // Load a snapshot of the current task state
+    let snapshot = header.state.load();
+
+    debug_assert!(snapshot.is_join_interested());
+
+    if !snapshot.is_complete() {
+        // The waker must be stored in the task struct.
+        let res = if snapshot.has_join_waker() {
+            // There already is a waker stored in the struct. If it matches
+            // the provided waker, then there is no further work to do.
+            // Otherwise, the waker must be swapped.
+            let will_wake = unsafe {
+                // Safety: when `JOIN_INTEREST` is set, only `JOIN_HANDLE`
+                // may mutate the `waker` field.
+                trailer.will_wake(waker)
+            };
 
-        // The task has completed execution and will no longer be scheduled.
-        //
-        // Attempts to batch a ref-dec with the state transition below.
-        let ref_dec = if self.core().is_bound() {
-            if let Some(task) = self.core().release(self.to_task()) {
-                mem::forget(task);
-                true
-            } else {
-                false
+            if will_wake {
+                // The task is not complete **and** the waker is up to date,
+                // there is nothing further that needs to be done.
+                return false;
             }
+
+            // Unset the `JOIN_WAKER` to gain mutable access to the `waker`
+            // field then update the field with the new join worker.
+            //
+            // This requires two atomic operations, unsetting the bit and
+            // then resetting it. If the task transitions to complete
+            // concurrently to either one of those operations, then setting
+            // the join waker fails and we proceed to reading the task
+            // output.
+            header
+                .state
+                .unset_waker()
+                .and_then(|snapshot| set_join_waker(header, trailer, waker.clone(), snapshot))
         } else {
-            false
+            set_join_waker(header, trailer, waker.clone(), snapshot)
         };
 
-        // This might deallocate
-        let snapshot = self
-            .header()
-            .state
-            .transition_to_terminal(!is_join_interested, ref_dec);
-
-        if snapshot.ref_count() == 0 {
-            self.dealloc()
+        match res {
+            Ok(_) => return false,
+            Err(snapshot) => {
+                assert!(snapshot.is_complete());
+            }
         }
     }
+    true
+}
+
+fn set_join_waker(
+    header: &Header,
+    trailer: &Trailer,
+    waker: Waker,
+    snapshot: Snapshot,
+) -> Result<Snapshot, Snapshot> {
+    assert!(snapshot.is_join_interested());
+    assert!(!snapshot.has_join_waker());
+
+    // Safety: Only the `JoinHandle` may set the `waker` field. When
+    // `JOIN_INTEREST` is **not** set, nothing else will touch the field.
+    unsafe {
+        trailer.set_waker(Some(waker));
+    }
 
-    /// Transitions the task's lifecycle to `Complete`. Notifies the
-    /// `JoinHandle` if it still has interest in the completion.
-    fn transition_to_complete(&mut self) {
-        // Transition the task's lifecycle to `Complete` and get a snapshot of
-        // the task's sate.
-        let snapshot = self.header().state.transition_to_complete();
+    // Update the `JoinWaker` state accordingly
+    let res = header.state.set_join_waker();
 
-        if !snapshot.is_join_interested() {
-            // The `JoinHandle` is not interested in the output of this task. It
-            // is our responsibility to drop the output.
-            self.core().drop_future_or_output();
-        } else if snapshot.has_join_waker() {
-            // Notify the join handle. The previous transition obtains the
-            // lock on the waker cell.
-            self.wake_join();
+    // If the state could not be updated, then clear the join waker
+    if res.is_err() {
+        unsafe {
+            trailer.set_waker(None);
         }
     }
 
-    fn wake_join(&self) {
-        self.trailer().waker.with(|ptr| match unsafe { &*ptr } {
-            Some(waker) => waker.wake_by_ref(),
-            None => panic!("waker missing"),
-        });
-    }
+    res
+}
+
+enum PollFuture {
+    Complete,
+    Notified,
+    Done,
+    Dealloc,
+}
 
-    fn to_task(&self) -> Task<S> {
-        unsafe { Task::from_raw(self.header().into()) }
+/// Cancel the task and store the appropriate error in the stage field.
+fn cancel_task<T: Future>(stage: &CoreStage<T>) {
+    // Drop the future from a panic guard.
+    let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+        stage.drop_future_or_output();
+    }));
+
+    match res {
+        Ok(()) => {
+            stage.store_output(Err(JoinError::cancelled()));
+        }
+        Err(panic) => {
+            stage.store_output(Err(JoinError::panic(panic)));
+        }
     }
 }
+
+/// Poll the future. If the future completes, the output is written to the
+/// stage field.
+fn poll_future<T: Future>(core: &CoreStage<T>, cx: Context<'_>) -> Poll<()> {
+    // Poll the future.
+    let output = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+        struct Guard<'a, T: Future> {
+            core: &'a CoreStage<T>,
+        }
+        impl<'a, T: Future> Drop for Guard<'a, T> {
+            fn drop(&mut self) {
+                // If the future panics on poll, we drop it inside the panic
+                // guard.
+                self.core.drop_future_or_output();
+            }
+        }
+        let guard = Guard { core };
+        let res = guard.core.poll(cx);
+        mem::forget(guard);
+        res
+    }));
+
+    // Prepare output for being placed in the core stage.
+    let output = match output {
+        Ok(Poll::Pending) => return Poll::Pending,
+        Ok(Poll::Ready(output)) => Ok(output),
+        Err(panic) => Err(JoinError::panic(panic)),
+    };
+
+    // Catch and ignore panics if the future panics on drop.
+    let _ = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+        core.store_output(output);
+    }));
+
+    Poll::Ready(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/inject.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/inject.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/inject.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/inject.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,220 @@
+//! Inject queue used to send wakeups to a work-stealing scheduler
+
+use crate::loom::sync::atomic::AtomicUsize;
+use crate::loom::sync::Mutex;
+use crate::runtime::task;
+
+use std::marker::PhantomData;
+use std::ptr::NonNull;
+use std::sync::atomic::Ordering::{Acquire, Release};
+
+/// Growable, MPMC queue used to inject new tasks into the scheduler and as an
+/// overflow queue when the local, fixed-size, array queue overflows.
+pub(crate) struct Inject<T: 'static> {
+    /// Pointers to the head and tail of the queue
+    pointers: Mutex<Pointers>,
+
+    /// Number of pending tasks in the queue. This helps prevent unnecessary
+    /// locking in the hot path.
+    len: AtomicUsize,
+
+    _p: PhantomData<T>,
+}
+
+struct Pointers {
+    /// True if the queue is closed
+    is_closed: bool,
+
+    /// Linked-list head
+    head: Option<NonNull<task::Header>>,
+
+    /// Linked-list tail
+    tail: Option<NonNull<task::Header>>,
+}
+
+unsafe impl<T> Send for Inject<T> {}
+unsafe impl<T> Sync for Inject<T> {}
+
+impl<T: 'static> Inject<T> {
+    pub(crate) fn new() -> Inject<T> {
+        Inject {
+            pointers: Mutex::new(Pointers {
+                is_closed: false,
+                head: None,
+                tail: None,
+            }),
+            len: AtomicUsize::new(0),
+            _p: PhantomData,
+        }
+    }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Close the injection queue, returns `true` if the queue is open when the
+    /// transition is made.
+    pub(crate) fn close(&self) -> bool {
+        let mut p = self.pointers.lock();
+
+        if p.is_closed {
+            return false;
+        }
+
+        p.is_closed = true;
+        true
+    }
+
+    pub(crate) fn is_closed(&self) -> bool {
+        self.pointers.lock().is_closed
+    }
+
+    pub(crate) fn len(&self) -> usize {
+        self.len.load(Acquire)
+    }
+
+    /// Pushes a value into the queue.
+    ///
+    /// This does nothing if the queue is closed.
+    pub(crate) fn push(&self, task: task::Notified<T>) {
+        // Acquire queue lock
+        let mut p = self.pointers.lock();
+
+        if p.is_closed {
+            return;
+        }
+
+        // safety: only mutated with the lock held
+        let len = unsafe { self.len.unsync_load() };
+        let task = task.into_raw();
+
+        // The next pointer should already be null
+        debug_assert!(get_next(task).is_none());
+
+        if let Some(tail) = p.tail {
+            // safety: Holding the Notified for a task guarantees exclusive
+            // access to the `queue_next` field.
+            set_next(tail, Some(task));
+        } else {
+            p.head = Some(task);
+        }
+
+        p.tail = Some(task);
+
+        self.len.store(len + 1, Release);
+    }
+
+    /// Pushes several values into the queue.
+    #[inline]
+    pub(crate) fn push_batch<I>(&self, mut iter: I)
+    where
+        I: Iterator<Item = task::Notified<T>>,
+    {
+        let first = match iter.next() {
+            Some(first) => first.into_raw(),
+            None => return,
+        };
+
+        // Link up all the tasks.
+        let mut prev = first;
+        let mut counter = 1;
+
+        // We are going to be called with an `std::iter::Chain`, and that
+        // iterator overrides `for_each` to something that is easier for the
+        // compiler to optimize than a loop.
+        iter.for_each(|next| {
+            let next = next.into_raw();
+
+            // safety: Holding the Notified for a task guarantees exclusive
+            // access to the `queue_next` field.
+            set_next(prev, Some(next));
+            prev = next;
+            counter += 1;
+        });
+
+        // Now that the tasks are linked together, insert them into the
+        // linked list.
+        self.push_batch_inner(first, prev, counter);
+    }
+
+    /// Insert several tasks that have been linked together into the queue.
+    ///
+    /// The provided head and tail may be be the same task. In this case, a
+    /// single task is inserted.
+    #[inline]
+    fn push_batch_inner(
+        &self,
+        batch_head: NonNull<task::Header>,
+        batch_tail: NonNull<task::Header>,
+        num: usize,
+    ) {
+        debug_assert!(get_next(batch_tail).is_none());
+
+        let mut p = self.pointers.lock();
+
+        if let Some(tail) = p.tail {
+            set_next(tail, Some(batch_head));
+        } else {
+            p.head = Some(batch_head);
+        }
+
+        p.tail = Some(batch_tail);
+
+        // Increment the count.
+        //
+        // safety: All updates to the len atomic are guarded by the mutex. As
+        // such, a non-atomic load followed by a store is safe.
+        let len = unsafe { self.len.unsync_load() };
+
+        self.len.store(len + num, Release);
+    }
+
+    pub(crate) fn pop(&self) -> Option<task::Notified<T>> {
+        // Fast path, if len == 0, then there are no values
+        if self.is_empty() {
+            return None;
+        }
+
+        let mut p = self.pointers.lock();
+
+        // It is possible to hit null here if another thread popped the last
+        // task between us checking `len` and acquiring the lock.
+        let task = p.head?;
+
+        p.head = get_next(task);
+
+        if p.head.is_none() {
+            p.tail = None;
+        }
+
+        set_next(task, None);
+
+        // Decrement the count.
+        //
+        // safety: All updates to the len atomic are guarded by the mutex. As
+        // such, a non-atomic load followed by a store is safe.
+        self.len
+            .store(unsafe { self.len.unsync_load() } - 1, Release);
+
+        // safety: a `Notified` is pushed into the queue and now it is popped!
+        Some(unsafe { task::Notified::from_raw(task) })
+    }
+}
+
+impl<T: 'static> Drop for Inject<T> {
+    fn drop(&mut self) {
+        if !std::thread::panicking() {
+            assert!(self.pop().is_none(), "queue not empty");
+        }
+    }
+}
+
+fn get_next(header: NonNull<task::Header>) -> Option<NonNull<task::Header>> {
+    unsafe { header.as_ref().queue_next.with(|ptr| *ptr) }
+}
+
+fn set_next(header: NonNull<task::Header>, val: Option<NonNull<task::Header>>) {
+    unsafe {
+        header.as_ref().set_next(val);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/join.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/join.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/join.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/join.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-doc_rt_core! {
+cfg_rt! {
     /// An owned permission to join on a task (await its termination).
     ///
     /// This can be thought of as the equivalent of [`std::thread::JoinHandle`] for
@@ -45,6 +45,71 @@
     /// # }
     /// ```
     ///
+    /// The generic parameter `T` in `JoinHandle<T>` is the return type of the spawned task.
+    /// If the return value is an i32, the join handle has type `JoinHandle<i32>`:
+    ///
+    /// ```
+    /// use tokio::task;
+    ///
+    /// # async fn doc() {
+    /// let join_handle: task::JoinHandle<i32> = task::spawn(async {
+    ///     5 + 3
+    /// });
+    /// # }
+    ///
+    /// ```
+    ///
+    /// If the task does not have a return value, the join handle has type `JoinHandle<()>`:
+    ///
+    /// ```
+    /// use tokio::task;
+    ///
+    /// # async fn doc() {
+    /// let join_handle: task::JoinHandle<()> = task::spawn(async {
+    ///     println!("I return nothing.");
+    /// });
+    /// # }
+    /// ```
+    ///
+    /// Note that `handle.await` doesn't give you the return type directly. It is wrapped in a
+    /// `Result` because panics in the spawned task are caught by Tokio. The `?` operator has
+    /// to be double chained to extract the returned value:
+    ///
+    /// ```
+    /// use tokio::task;
+    /// use std::io;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let join_handle: task::JoinHandle<Result<i32, io::Error>> = tokio::spawn(async {
+    ///         Ok(5 + 3)
+    ///     });
+    ///
+    ///     let result = join_handle.await??;
+    ///     assert_eq!(result, 8);
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// If the task panics, the error is a [`JoinError`] that contains the panic:
+    ///
+    /// ```
+    /// use tokio::task;
+    /// use std::io;
+    /// use std::panic;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let join_handle: task::JoinHandle<Result<i32, io::Error>> = tokio::spawn(async {
+    ///         panic!("boom");
+    ///     });
+    ///
+    ///     let err = join_handle.await.unwrap_err();
+    ///     assert!(err.is_panic());
+    ///     Ok(())
+    /// }
+    ///
+    /// ```
     /// Child being detached and outliving its parent:
     ///
     /// ```no_run
@@ -56,7 +121,7 @@
     /// let original_task = task::spawn(async {
     ///     let _detached_task = task::spawn(async {
     ///         // Here we sleep to make sure that the first task returns before.
-    ///         time::delay_for(Duration::from_millis(10)).await;
+    ///         time::sleep(Duration::from_millis(10)).await;
     ///         // This will be called, even though the JoinHandle is dropped.
     ///         println!("♫ Still alive ♫");
     ///     });
@@ -68,13 +133,14 @@
     /// // We make sure that the new task has time to run, before the main
     /// // task returns.
     ///
-    /// time::delay_for(Duration::from_millis(1000)).await;
+    /// time::sleep(Duration::from_millis(1000)).await;
     /// # }
     /// ```
     ///
     /// [`task::spawn`]: crate::task::spawn()
     /// [`task::spawn_blocking`]: crate::task::spawn_blocking
     /// [`std::thread::JoinHandle`]: std::thread::JoinHandle
+    /// [`JoinError`]: crate::task::JoinError
     pub struct JoinHandle<T> {
         raw: Option<RawTask>,
         _p: PhantomData<T>,
@@ -91,6 +157,44 @@
             _p: PhantomData,
         }
     }
+
+    /// Abort the task associated with the handle.
+    ///
+    /// Awaiting a cancelled task might complete as usual if the task was
+    /// already completed at the time it was cancelled, but most likely it
+    /// will complete with a `Err(JoinError::Cancelled)`.
+    ///
+    /// ```rust
+    /// use tokio::time;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///    let mut handles = Vec::new();
+    ///
+    ///    handles.push(tokio::spawn(async {
+    ///       time::sleep(time::Duration::from_secs(10)).await;
+    ///       true
+    ///    }));
+    ///
+    ///    handles.push(tokio::spawn(async {
+    ///       time::sleep(time::Duration::from_secs(10)).await;
+    ///       false
+    ///    }));
+    ///
+    ///    for handle in &handles {
+    ///        handle.abort();
+    ///    }
+    ///
+    ///    for handle in handles {
+    ///        assert!(handle.await.unwrap_err().is_cancelled());
+    ///    }
+    /// }
+    /// ```
+    pub fn abort(&self) {
+        if let Some(raw) = self.raw {
+            raw.remote_abort();
+        }
+    }
 }
 
 impl<T> Unpin for JoinHandle<T> {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/list.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,297 @@
+//! This module has containers for storing the tasks spawned on a scheduler. The
+//! `OwnedTasks` container is thread-safe but can only store tasks that
+//! implement Send. The `LocalOwnedTasks` container is not thread safe, but can
+//! store non-Send tasks.
+//!
+//! The collections can be closed to prevent adding new tasks during shutdown of
+//! the scheduler with the collection.
+
+use crate::future::Future;
+use crate::loom::cell::UnsafeCell;
+use crate::loom::sync::Mutex;
+use crate::runtime::task::{JoinHandle, LocalNotified, Notified, Schedule, Task};
+use crate::util::linked_list::{Link, LinkedList};
+
+use std::marker::PhantomData;
+
+// The id from the module below is used to verify whether a given task is stored
+// in this OwnedTasks, or some other task. The counter starts at one so we can
+// use zero for tasks not owned by any list.
+//
+// The safety checks in this file can technically be violated if the counter is
+// overflown, but the checks are not supposed to ever fail unless there is a
+// bug in Tokio, so we accept that certain bugs would not be caught if the two
+// mixed up runtimes happen to have the same id.
+
+cfg_has_atomic_u64! {
+    use std::sync::atomic::{AtomicU64, Ordering};
+
+    static NEXT_OWNED_TASKS_ID: AtomicU64 = AtomicU64::new(1);
+
+    fn get_next_id() -> u64 {
+        loop {
+            let id = NEXT_OWNED_TASKS_ID.fetch_add(1, Ordering::Relaxed);
+            if id != 0 {
+                return id;
+            }
+        }
+    }
+}
+
+cfg_not_has_atomic_u64! {
+    use std::sync::atomic::{AtomicU32, Ordering};
+
+    static NEXT_OWNED_TASKS_ID: AtomicU32 = AtomicU32::new(1);
+
+    fn get_next_id() -> u64 {
+        loop {
+            let id = NEXT_OWNED_TASKS_ID.fetch_add(1, Ordering::Relaxed);
+            if id != 0 {
+                return u64::from(id);
+            }
+        }
+    }
+}
+
+pub(crate) struct OwnedTasks<S: 'static> {
+    inner: Mutex<OwnedTasksInner<S>>,
+    id: u64,
+}
+pub(crate) struct LocalOwnedTasks<S: 'static> {
+    inner: UnsafeCell<OwnedTasksInner<S>>,
+    id: u64,
+    _not_send_or_sync: PhantomData<*const ()>,
+}
+struct OwnedTasksInner<S: 'static> {
+    list: LinkedList<Task<S>, <Task<S> as Link>::Target>,
+    closed: bool,
+}
+
+impl<S: 'static> OwnedTasks<S> {
+    pub(crate) fn new() -> Self {
+        Self {
+            inner: Mutex::new(OwnedTasksInner {
+                list: LinkedList::new(),
+                closed: false,
+            }),
+            id: get_next_id(),
+        }
+    }
+
+    /// Bind the provided task to this OwnedTasks instance. This fails if the
+    /// OwnedTasks has been closed.
+    pub(crate) fn bind<T>(
+        &self,
+        task: T,
+        scheduler: S,
+    ) -> (JoinHandle<T::Output>, Option<Notified<S>>)
+    where
+        S: Schedule,
+        T: Future + Send + 'static,
+        T::Output: Send + 'static,
+    {
+        let (task, notified, join) = super::new_task(task, scheduler);
+
+        unsafe {
+            // safety: We just created the task, so we have exclusive access
+            // to the field.
+            task.header().set_owner_id(self.id);
+        }
+
+        let mut lock = self.inner.lock();
+        if lock.closed {
+            drop(lock);
+            drop(notified);
+            task.shutdown();
+            (join, None)
+        } else {
+            lock.list.push_front(task);
+            (join, Some(notified))
+        }
+    }
+
+    /// Assert that the given task is owned by this OwnedTasks and convert it to
+    /// a LocalNotified, giving the thread permission to poll this task.
+    #[inline]
+    pub(crate) fn assert_owner(&self, task: Notified<S>) -> LocalNotified<S> {
+        assert_eq!(task.header().get_owner_id(), self.id);
+
+        // safety: All tasks bound to this OwnedTasks are Send, so it is safe
+        // to poll it on this thread no matter what thread we are on.
+        LocalNotified {
+            task: task.0,
+            _not_send: PhantomData,
+        }
+    }
+
+    /// Shut down all tasks in the collection. This call also closes the
+    /// collection, preventing new items from being added.
+    pub(crate) fn close_and_shutdown_all(&self)
+    where
+        S: Schedule,
+    {
+        // The first iteration of the loop was unrolled so it can set the
+        // closed bool.
+        let first_task = {
+            let mut lock = self.inner.lock();
+            lock.closed = true;
+            lock.list.pop_back()
+        };
+        match first_task {
+            Some(task) => task.shutdown(),
+            None => return,
+        }
+
+        loop {
+            let task = match self.inner.lock().list.pop_back() {
+                Some(task) => task,
+                None => return,
+            };
+
+            task.shutdown();
+        }
+    }
+
+    pub(crate) fn remove(&self, task: &Task<S>) -> Option<Task<S>> {
+        let task_id = task.header().get_owner_id();
+        if task_id == 0 {
+            // The task is unowned.
+            return None;
+        }
+
+        assert_eq!(task_id, self.id);
+
+        // safety: We just checked that the provided task is not in some other
+        // linked list.
+        unsafe { self.inner.lock().list.remove(task.header().into()) }
+    }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        self.inner.lock().list.is_empty()
+    }
+}
+
+impl<S: 'static> LocalOwnedTasks<S> {
+    pub(crate) fn new() -> Self {
+        Self {
+            inner: UnsafeCell::new(OwnedTasksInner {
+                list: LinkedList::new(),
+                closed: false,
+            }),
+            id: get_next_id(),
+            _not_send_or_sync: PhantomData,
+        }
+    }
+
+    pub(crate) fn bind<T>(
+        &self,
+        task: T,
+        scheduler: S,
+    ) -> (JoinHandle<T::Output>, Option<Notified<S>>)
+    where
+        S: Schedule,
+        T: Future + 'static,
+        T::Output: 'static,
+    {
+        let (task, notified, join) = super::new_task(task, scheduler);
+
+        unsafe {
+            // safety: We just created the task, so we have exclusive access
+            // to the field.
+            task.header().set_owner_id(self.id);
+        }
+
+        if self.is_closed() {
+            drop(notified);
+            task.shutdown();
+            (join, None)
+        } else {
+            self.with_inner(|inner| {
+                inner.list.push_front(task);
+            });
+            (join, Some(notified))
+        }
+    }
+
+    /// Shut down all tasks in the collection. This call also closes the
+    /// collection, preventing new items from being added.
+    pub(crate) fn close_and_shutdown_all(&self)
+    where
+        S: Schedule,
+    {
+        self.with_inner(|inner| inner.closed = true);
+
+        while let Some(task) = self.with_inner(|inner| inner.list.pop_back()) {
+            task.shutdown();
+        }
+    }
+
+    pub(crate) fn remove(&self, task: &Task<S>) -> Option<Task<S>> {
+        let task_id = task.header().get_owner_id();
+        if task_id == 0 {
+            // The task is unowned.
+            return None;
+        }
+
+        assert_eq!(task_id, self.id);
+
+        self.with_inner(|inner|
+            // safety: We just checked that the provided task is not in some
+            // other linked list.
+            unsafe { inner.list.remove(task.header().into()) })
+    }
+
+    /// Assert that the given task is owned by this LocalOwnedTasks and convert
+    /// it to a LocalNotified, giving the thread permission to poll this task.
+    #[inline]
+    pub(crate) fn assert_owner(&self, task: Notified<S>) -> LocalNotified<S> {
+        assert_eq!(task.header().get_owner_id(), self.id);
+
+        // safety: The task was bound to this LocalOwnedTasks, and the
+        // LocalOwnedTasks is not Send or Sync, so we are on the right thread
+        // for polling this task.
+        LocalNotified {
+            task: task.0,
+            _not_send: PhantomData,
+        }
+    }
+
+    #[inline]
+    fn with_inner<F, T>(&self, f: F) -> T
+    where
+        F: FnOnce(&mut OwnedTasksInner<S>) -> T,
+    {
+        // safety: This type is not Sync, so concurrent calls of this method
+        // can't happen.  Furthermore, all uses of this method in this file make
+        // sure that they don't call `with_inner` recursively.
+        self.inner.with_mut(|ptr| unsafe { f(&mut *ptr) })
+    }
+
+    pub(crate) fn is_closed(&self) -> bool {
+        self.with_inner(|inner| inner.closed)
+    }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        self.with_inner(|inner| inner.list.is_empty())
+    }
+}
+
+#[cfg(all(test))]
+mod tests {
+    use super::*;
+
+    // This test may run in parallel with other tests, so we only test that ids
+    // come in increasing order.
+    #[test]
+    fn test_id_not_broken() {
+        let mut last_id = get_next_id();
+        assert_ne!(last_id, 0);
+
+        for _ in 0..1000 {
+            let next_id = get_next_id();
+            assert_ne!(next_id, 0);
+            assert!(last_id < next_id);
+            last_id = next_id;
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,143 @@
+//! The task module.
+//!
+//! The task module contains the code that manages spawned tasks and provides a
+//! safe API for the rest of the runtime to use. Each task in a runtime is
+//! stored in an OwnedTasks or LocalOwnedTasks object.
+//!
+//! # Task reference types
+//!
+//! A task is usually referenced by multiple handles, and there are several
+//! types of handles.
+//!
+//!  * OwnedTask - tasks stored in an OwnedTasks or LocalOwnedTasks are of this
+//!    reference type.
+//!
+//!  * JoinHandle - each task has a JoinHandle that allows access to the output
+//!    of the task.
+//!
+//!  * Waker - every waker for a task has this reference type. There can be any
+//!    number of waker references.
+//!
+//!  * Notified - tracks whether the task is notified.
+//!
+//!  * Unowned - this task reference type is used for tasks not stored in any
+//!    runtime. Mainly used for blocking tasks, but also in tests.
+//!
+//! The task uses a reference count to keep track of how many active references
+//! exist. The Unowned reference type takes up two ref-counts. All other
+//! reference types take pu a single ref-count.
+//!
+//! Besides the waker type, each task has at most one of each reference type.
+//!
+//! # State
+//!
+//! The task stores its state in an atomic usize with various bitfields for the
+//! necessary information. The state has the following bitfields:
+//!
+//!  * RUNNING - Tracks whether the task is currently being polled or cancelled.
+//!    This bit functions as a lock around the task.
+//!
+//!  * COMPLETE - Is one once the future has fully completed and has been
+//!    dropped. Never unset once set. Never set together with RUNNING.
+//!
+//!  * NOTIFIED - Tracks whether a Notified object currently exists.
+//!
+//!  * CANCELLED - Is set to one for tasks that should be cancelled as soon as
+//!    possible. May take any value for completed tasks.
+//!
+//!  * JOIN_INTEREST - Is set to one if there exists a JoinHandle.
+//!
+//!  * JOIN_WAKER - Is set to one if the JoinHandle has set a waker.
+//!
+//! The rest of the bits are used for the ref-count.
+//!
+//! # Fields in the task
+//!
+//! The task has various fields. This section describes how and when it is safe
+//! to access a field.
+//!
+//!  * The state field is accessed with atomic instructions.
+//!
+//!  * The OwnedTask reference has exclusive access to the `owned` field.
+//!
+//!  * The Notified reference has exclusive access to the `queue_next` field.
+//!
+//!  * The `owner_id` field can be set as part of construction of the task, but
+//!    is otherwise immutable and anyone can access the field immutably without
+//!    synchronization.
+//!
+//!  * If COMPLETE is one, then the JoinHandle has exclusive access to the
+//!    stage field. If COMPLETE is zero, then the RUNNING bitfield functions as
+//!    a lock for the stage field, and it can be accessed only by the thread
+//!    that set RUNNING to one.
+//!
+//!  * If JOIN_WAKER is zero, then the JoinHandle has exclusive access to the
+//!    join handle waker. If JOIN_WAKER and COMPLETE are both one, then the
+//!    thread that set COMPLETE to one has exclusive access to the join handle
+//!    waker.
+//!
+//! All other fields are immutable and can be accessed immutably without
+//! synchronization by anyone.
+//!
+//! # Safety
+//!
+//! This section goes through various situations and explains why the API is
+//! safe in that situation.
+//!
+//! ## Polling or dropping the future
+//!
+//! Any mutable access to the future happens after obtaining a lock by modifying
+//! the RUNNING field, so exclusive access is ensured.
+//!
+//! When the task completes, exclusive access to the output is transferred to
+//! the JoinHandle. If the JoinHandle is already dropped when the transition to
+//! complete happens, the thread performing that transition retains exclusive
+//! access to the output and should immediately drop it.
+//!
+//! ## Non-Send futures
+//!
+//! If a future is not Send, then it is bound to a LocalOwnedTasks.  The future
+//! will only ever be polled or dropped given a LocalNotified or inside a call
+//! to LocalOwnedTasks::shutdown_all. In either case, it is guaranteed that the
+//! future is on the right thread.
+//!
+//! If the task is never removed from the LocalOwnedTasks, then it is leaked, so
+//! there is no risk that the task is dropped on some other thread when the last
+//! ref-count drops.
+//!
+//! ## Non-Send output
+//!
+//! When a task completes, the output is placed in the stage of the task. Then,
+//! a transition that sets COMPLETE to true is performed, and the value of
+//! JOIN_INTEREST when this transition happens is read.
+//!
+//! If JOIN_INTEREST is zero when the transition to COMPLETE happens, then the
+//! output is immediately dropped.
+//!
+//! If JOIN_INTEREST is one when the transition to COMPLETE happens, then the
+//! JoinHandle is responsible for cleaning up the output. If the output is not
+//! Send, then this happens:
+//!
+//!  1. The output is created on the thread that the future was polled on. Since
+//!     only non-Send futures can have non-Send output, the future was polled on
+//!     the thread that the future was spawned from.
+//!  2. Since JoinHandle<Output> is not Send if Output is not Send, the
+//!     JoinHandle is also on the thread that the future was spawned from.
+//!  3. Thus, the JoinHandle will not move the output across threads when it
+//!     takes or drops the output.
+//!
+//! ## Recursive poll/shutdown
+//!
+//! Calling poll from inside a shutdown call or vice-versa is not prevented by
+//! the API exposed by the task module, so this has to be safe. In either case,
+//! the lock in the RUNNING bitfield makes the inner call return immediately. If
+//! the inner call is a `shutdown` call, then the CANCELLED bit is set, and the
+//! poll call will notice it when the poll finishes, and the task is cancelled
+//! at that point.
+
 mod core;
 use self::core::Cell;
-pub(crate) use self::core::Header;
+use self::core::Header;
 
 mod error;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
@@ -9,10 +146,18 @@
 mod harness;
 use self::harness::Harness;
 
+cfg_rt_multi_thread! {
+    mod inject;
+    pub(super) use self::inject::Inject;
+}
+
 mod join;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::join::JoinHandle;
 
+mod list;
+pub(crate) use self::list::{LocalOwnedTasks, OwnedTasks};
+
 mod raw;
 use self::raw::RawTask;
 
@@ -21,14 +166,9 @@
 
 mod waker;
 
-cfg_rt_threaded! {
-    mod stack;
-    pub(crate) use self::stack::TransferStack;
-}
-
+use crate::future::Future;
 use crate::util::linked_list;
 
-use std::future::Future;
 use std::marker::PhantomData;
 use std::ptr::NonNull;
 use std::{fmt, mem};
@@ -43,30 +183,43 @@
 unsafe impl<S> Send for Task<S> {}
 unsafe impl<S> Sync for Task<S> {}
 
-/// A task was notified
+/// A task was notified.
 #[repr(transparent)]
 pub(crate) struct Notified<S: 'static>(Task<S>);
 
+// safety: This type cannot be used to touch the task without first verifying
+// that the value is on a thread where it is safe to poll the task.
 unsafe impl<S: Schedule> Send for Notified<S> {}
 unsafe impl<S: Schedule> Sync for Notified<S> {}
 
+/// A non-Send variant of Notified with the invariant that it is on a thread
+/// where it is safe to poll it.
+#[repr(transparent)]
+pub(crate) struct LocalNotified<S: 'static> {
+    task: Task<S>,
+    _not_send: PhantomData<*const ()>,
+}
+
+/// A task that is not owned by any OwnedTasks. Used for blocking tasks.
+/// This type holds two ref-counts.
+pub(crate) struct UnownedTask<S: 'static> {
+    raw: RawTask,
+    _p: PhantomData<S>,
+}
+
+// safety: This type can only be created given a Send task.
+unsafe impl<S> Send for UnownedTask<S> {}
+unsafe impl<S> Sync for UnownedTask<S> {}
+
 /// Task result sent back
 pub(crate) type Result<T> = std::result::Result<T, JoinError>;
 
 pub(crate) trait Schedule: Sync + Sized + 'static {
-    /// Bind a task to the executor.
-    ///
-    /// Guaranteed to be called from the thread that called `poll` on the task.
-    /// The returned `Schedule` instance is associated with the task and is used
-    /// as `&self` in the other methods on this trait.
-    fn bind(task: Task<Self>) -> Self;
-
     /// The task has completed work and is ready to be released. The scheduler
-    /// is free to drop it whenever.
+    /// should release it immediately and return it. The task module will batch
+    /// the ref-dec with setting other options.
     ///
-    /// If the scheduler can immediately release the task, it should return
-    /// it as part of the function. This enables the task module to batch
-    /// the ref-dec with other options.
+    /// If the scheduler has already released the task, then None is returned.
     fn release(&self, task: &Task<Self>) -> Option<Task<Self>>;
 
     /// Schedule the task
@@ -79,70 +232,87 @@
     }
 }
 
-/// Create a new task with an associated join handle
-pub(crate) fn joinable<T, S>(task: T) -> (Notified<S>, JoinHandle<T::Output>)
-where
-    T: Future + Send + 'static,
-    S: Schedule,
-{
-    let raw = RawTask::new::<_, S>(task);
-
-    let task = Task {
-        raw,
-        _p: PhantomData,
-    };
-
-    let join = JoinHandle::new(raw);
-
-    (Notified(task), join)
-}
-
-cfg_rt_util! {
-    /// Create a new `!Send` task with an associated join handle
-    pub(crate) unsafe fn joinable_local<T, S>(task: T) -> (Notified<S>, JoinHandle<T::Output>)
+cfg_rt! {
+    /// This is the constructor for a new task. Three references to the task are
+    /// created. The first task reference is usually put into an OwnedTasks
+    /// immediately. The Notified is sent to the scheduler as an ordinary
+    /// notification.
+    fn new_task<T, S>(
+        task: T,
+        scheduler: S
+    ) -> (Task<S>, Notified<S>, JoinHandle<T::Output>)
     where
-        T: Future + 'static,
         S: Schedule,
+        T: Future + 'static,
+        T::Output: 'static,
     {
-        let raw = RawTask::new::<_, S>(task);
-
+        let raw = RawTask::new::<T, S>(task, scheduler);
         let task = Task {
             raw,
             _p: PhantomData,
         };
-
+        let notified = Notified(Task {
+            raw,
+            _p: PhantomData,
+        });
         let join = JoinHandle::new(raw);
 
-        (Notified(task), join)
+        (task, notified, join)
+    }
+
+    /// Create a new task with an associated join handle. This method is used
+    /// only when the task is not going to be stored in an `OwnedTasks` list.
+    ///
+    /// Currently only blocking tasks use this method.
+    pub(crate) fn unowned<T, S>(task: T, scheduler: S) -> (UnownedTask<S>, JoinHandle<T::Output>)
+    where
+        S: Schedule,
+        T: Send + Future + 'static,
+        T::Output: Send + 'static,
+    {
+        let (task, notified, join) = new_task(task, scheduler);
+
+        // This transfers the ref-count of task and notified into an UnownedTask.
+        // This is valid because an UnownedTask holds two ref-counts.
+        let unowned = UnownedTask {
+            raw: task.raw,
+            _p: PhantomData,
+        };
+        std::mem::forget(task);
+        std::mem::forget(notified);
+
+        (unowned, join)
     }
 }
 
 impl<S: 'static> Task<S> {
-    pub(crate) unsafe fn from_raw(ptr: NonNull<Header>) -> Task<S> {
+    unsafe fn from_raw(ptr: NonNull<Header>) -> Task<S> {
         Task {
             raw: RawTask::from_raw(ptr),
             _p: PhantomData,
         }
     }
 
-    pub(crate) fn header(&self) -> &Header {
+    fn header(&self) -> &Header {
         self.raw.header()
     }
 }
 
-cfg_rt_threaded! {
+impl<S: 'static> Notified<S> {
+    fn header(&self) -> &Header {
+        self.0.header()
+    }
+}
+
+cfg_rt_multi_thread! {
     impl<S: 'static> Notified<S> {
-        pub(crate) unsafe fn from_raw(ptr: NonNull<Header>) -> Notified<S> {
+        unsafe fn from_raw(ptr: NonNull<Header>) -> Notified<S> {
             Notified(Task::from_raw(ptr))
         }
-
-        pub(crate) fn header(&self) -> &Header {
-            self.0.header()
-        }
     }
 
     impl<S: 'static> Task<S> {
-        pub(crate) fn into_raw(self) -> NonNull<Header> {
+        fn into_raw(self) -> NonNull<Header> {
             let ret = self.header().into();
             mem::forget(self);
             ret
@@ -150,7 +320,7 @@
     }
 
     impl<S: 'static> Notified<S> {
-        pub(crate) fn into_raw(self) -> NonNull<Header> {
+        fn into_raw(self) -> NonNull<Header> {
             self.0.into_raw()
         }
     }
@@ -158,21 +328,61 @@
 
 impl<S: Schedule> Task<S> {
     /// Pre-emptively cancel the task as part of the shutdown process.
-    pub(crate) fn shutdown(&self) {
-        self.raw.shutdown();
+    pub(crate) fn shutdown(self) {
+        let raw = self.raw;
+        mem::forget(self);
+        raw.shutdown();
     }
 }
 
-impl<S: Schedule> Notified<S> {
+impl<S: Schedule> LocalNotified<S> {
     /// Run the task
     pub(crate) fn run(self) {
-        self.0.raw.poll();
+        let raw = self.task.raw;
         mem::forget(self);
+        raw.poll();
+    }
+}
+
+impl<S: Schedule> UnownedTask<S> {
+    // Used in test of the inject queue.
+    #[cfg(test)]
+    pub(super) fn into_notified(self) -> Notified<S> {
+        Notified(self.into_task())
+    }
+
+    fn into_task(self) -> Task<S> {
+        // Convert into a task.
+        let task = Task {
+            raw: self.raw,
+            _p: PhantomData,
+        };
+        mem::forget(self);
+
+        // Drop a ref-count since an UnownedTask holds two.
+        task.header().state.ref_dec();
+
+        task
+    }
+
+    pub(crate) fn run(self) {
+        let raw = self.raw;
+        mem::forget(self);
+
+        // Transfer one ref-count to a Task object.
+        let task = Task::<S> {
+            raw,
+            _p: PhantomData,
+        };
+
+        // Use the other ref-count to poll the task.
+        raw.poll();
+        // Decrement our extra ref-count
+        drop(task);
     }
 
-    /// Pre-emptively cancel the task as part of the shutdown process.
     pub(crate) fn shutdown(self) {
-        self.0.shutdown();
+        self.into_task().shutdown()
     }
 }
 
@@ -183,6 +393,16 @@
             // Deallocate if this is the final ref count
             self.raw.dealloc();
         }
+    }
+}
+
+impl<S: 'static> Drop for UnownedTask<S> {
+    fn drop(&mut self) {
+        // Decrement the ref count
+        if self.raw.header().state.ref_dec_twice() {
+            // Deallocate if this is the final ref count
+            self.raw.dealloc();
+        }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/raw.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/raw.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/raw.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/raw.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
+use crate::future::Future;
 use crate::runtime::task::{Cell, Harness, Header, Schedule, State};
 
-use std::future::Future;
 use std::ptr::NonNull;
 use std::task::{Poll, Waker};
 
@@ -22,6 +22,9 @@
     /// The join handle has been dropped
     pub(super) drop_join_handle_slow: unsafe fn(NonNull<Header>),
 
+    /// The task is remotely aborted
+    pub(super) remote_abort: unsafe fn(NonNull<Header>),
+
     /// Scheduler is being shutdown
     pub(super) shutdown: unsafe fn(NonNull<Header>),
 }
@@ -33,17 +36,18 @@
         dealloc: dealloc::<T, S>,
         try_read_output: try_read_output::<T, S>,
         drop_join_handle_slow: drop_join_handle_slow::<T, S>,
+        remote_abort: remote_abort::<T, S>,
         shutdown: shutdown::<T, S>,
     }
 }
 
 impl RawTask {
-    pub(super) fn new<T, S>(task: T) -> RawTask
+    pub(super) fn new<T, S>(task: T, scheduler: S) -> RawTask
     where
         T: Future,
         S: Schedule,
     {
-        let ptr = Box::into_raw(Cell::<_, S>::new(task, State::new()));
+        let ptr = Box::into_raw(Cell::<_, S>::new(task, scheduler, State::new()));
         let ptr = unsafe { NonNull::new_unchecked(ptr as *mut Header) };
 
         RawTask { ptr }
@@ -89,6 +93,11 @@
         let vtable = self.header().vtable;
         unsafe { (vtable.shutdown)(self.ptr) }
     }
+
+    pub(super) fn remote_abort(self) {
+        let vtable = self.header().vtable;
+        unsafe { (vtable.remote_abort)(self.ptr) }
+    }
 }
 
 impl Clone for RawTask {
@@ -125,6 +134,11 @@
     harness.drop_join_handle_slow()
 }
 
+unsafe fn remote_abort<T: Future, S: Schedule>(ptr: NonNull<Header>) {
+    let harness = Harness::<T, S>::from_raw(ptr);
+    harness.remote_abort()
+}
+
 unsafe fn shutdown<T: Future, S: Schedule>(ptr: NonNull<Header>) {
     let harness = Harness::<T, S>::from_raw(ptr);
     harness.shutdown()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/stack.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-use crate::loom::sync::atomic::AtomicPtr;
-use crate::runtime::task::{Header, Task};
-
-use std::marker::PhantomData;
-use std::ptr::{self, NonNull};
-use std::sync::atomic::Ordering::{Acquire, Relaxed, Release};
-
-/// Concurrent stack of tasks, used to pass ownership of a task from one worker
-/// to another.
-pub(crate) struct TransferStack<T: 'static> {
-    head: AtomicPtr<Header>,
-    _p: PhantomData<T>,
-}
-
-impl<T: 'static> TransferStack<T> {
-    pub(crate) fn new() -> TransferStack<T> {
-        TransferStack {
-            head: AtomicPtr::new(ptr::null_mut()),
-            _p: PhantomData,
-        }
-    }
-
-    pub(crate) fn push(&self, task: Task<T>) {
-        let task = task.into_raw();
-
-        // We don't care about any memory associated w/ setting the `head`
-        // field, just the current value.
-        //
-        // The compare-exchange creates a release sequence.
-        let mut curr = self.head.load(Relaxed);
-
-        loop {
-            unsafe {
-                task.as_ref()
-                    .stack_next
-                    .with_mut(|ptr| *ptr = NonNull::new(curr))
-            };
-
-            let res = self
-                .head
-                .compare_exchange(curr, task.as_ptr() as *mut _, Release, Relaxed);
-
-            match res {
-                Ok(_) => return,
-                Err(actual) => {
-                    curr = actual;
-                }
-            }
-        }
-    }
-
-    pub(crate) fn drain(&self) -> impl Iterator<Item = Task<T>> {
-        struct Iter<T: 'static>(Option<NonNull<Header>>, PhantomData<T>);
-
-        impl<T: 'static> Iterator for Iter<T> {
-            type Item = Task<T>;
-
-            fn next(&mut self) -> Option<Task<T>> {
-                let task = self.0?;
-
-                // Move the cursor forward
-                self.0 = unsafe { task.as_ref().stack_next.with(|ptr| *ptr) };
-
-                // Return the task
-                unsafe { Some(Task::from_raw(task)) }
-            }
-        }
-
-        impl<T: 'static> Drop for Iter<T> {
-            fn drop(&mut self) {
-                use std::process;
-
-                if self.0.is_some() {
-                    // we have bugs
-                    process::abort();
-                }
-            }
-        }
-
-        let ptr = self.head.swap(ptr::null_mut(), Acquire);
-        Iter(NonNull::new(ptr), PhantomData)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/state.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/state.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/state.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/state.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,12 +29,15 @@
 const NOTIFIED: usize = 0b100;
 
 /// The join handle is still around
+#[allow(clippy::unusual_byte_groupings)] // https://github.com/rust-lang/rust-clippy/issues/6556
 const JOIN_INTEREST: usize = 0b1_000;
 
 /// A join handle waker has been set
+#[allow(clippy::unusual_byte_groupings)] // https://github.com/rust-lang/rust-clippy/issues/6556
 const JOIN_WAKER: usize = 0b10_000;
 
 /// The task has been forcibly cancelled.
+#[allow(clippy::unusual_byte_groupings)] // https://github.com/rust-lang/rust-clippy/issues/6556
 const CANCELLED: usize = 0b100_000;
 
 /// All bits
@@ -51,22 +54,52 @@
 
 /// State a task is initialized with
 ///
-/// A task is initialized with two references: one for the scheduler and one for
-/// the `JoinHandle`. As the task starts with a `JoinHandle`, `JOIN_INTERST` is
-/// set. A new task is immediately pushed into the run queue for execution and
-/// starts with the `NOTIFIED` flag set.
-const INITIAL_STATE: usize = (REF_ONE * 2) | JOIN_INTEREST | NOTIFIED;
+/// A task is initialized with three references:
+///
+///  * A reference that will be stored in an OwnedTasks or LocalOwnedTasks.
+///  * A reference that will be sent to the scheduler as an ordinary notification.
+///  * A reference for the JoinHandle.
+///
+/// As the task starts with a `JoinHandle`, `JOIN_INTEREST` is set.
+/// As the task starts with a `Notified`, `NOTIFIED` is set.
+const INITIAL_STATE: usize = (REF_ONE * 3) | JOIN_INTEREST | NOTIFIED;
+
+#[must_use]
+pub(super) enum TransitionToRunning {
+    Success,
+    Cancelled,
+    Failed,
+    Dealloc,
+}
+
+#[must_use]
+pub(super) enum TransitionToIdle {
+    Ok,
+    OkNotified,
+    OkDealloc,
+    Cancelled,
+}
+
+#[must_use]
+pub(super) enum TransitionToNotifiedByVal {
+    DoNothing,
+    Submit,
+    Dealloc,
+}
+
+#[must_use]
+pub(super) enum TransitionToNotifiedByRef {
+    DoNothing,
+    Submit,
+}
 
 /// All transitions are performed via RMW operations. This establishes an
 /// unambiguous modification order.
 impl State {
     /// Return a task's initial state
     pub(super) fn new() -> State {
-        // A task is initialized with three references: one for the scheduler,
-        // one for the `JoinHandle`, one for the task handle made available in
-        // release. As the task starts with a `JoinHandle`, `JOIN_INTERST` is
-        // set. A new task is immediately pushed into the run queue for
-        // execution and starts with the `NOTIFIED` flag set.
+        // The raw task returned by this method has a ref-count of three. See
+        // the comment on INITIAL_STATE for more.
         State {
             val: AtomicUsize::new(INITIAL_STATE),
         }
@@ -77,57 +110,72 @@
         Snapshot(self.val.load(Acquire))
     }
 
-    /// Attempt to transition the lifecycle to `Running`.
-    ///
-    /// If `ref_inc` is set, the reference count is also incremented.
-    ///
-    /// The `NOTIFIED` bit is always unset.
-    pub(super) fn transition_to_running(&self, ref_inc: bool) -> UpdateResult {
-        self.fetch_update(|curr| {
-            assert!(curr.is_notified());
-
-            let mut next = curr;
+    /// Attempt to transition the lifecycle to `Running`. This sets the
+    /// notified bit to false so notifications during the poll can be detected.
+    pub(super) fn transition_to_running(&self) -> TransitionToRunning {
+        self.fetch_update_action(|mut next| {
+            let action;
+            assert!(next.is_notified());
 
             if !next.is_idle() {
-                return None;
-            }
-
-            if ref_inc {
-                next.ref_inc();
+                // This happens if the task is either currently running or if it
+                // has already completed, e.g. if it was cancelled during
+                // shutdown. Consume the ref-count and return.
+                next.ref_dec();
+                if next.ref_count() == 0 {
+                    action = TransitionToRunning::Dealloc;
+                } else {
+                    action = TransitionToRunning::Failed;
+                }
+            } else {
+                // We are able to lock the RUNNING bit.
+                next.set_running();
+                next.unset_notified();
+
+                if next.is_cancelled() {
+                    action = TransitionToRunning::Cancelled;
+                } else {
+                    action = TransitionToRunning::Success;
+                }
             }
-
-            next.set_running();
-            next.unset_notified();
-            Some(next)
+            (action, Some(next))
         })
     }
 
     /// Transitions the task from `Running` -> `Idle`.
     ///
-    /// Returns `Ok` if the transition to `Idle` is successful, `Err` otherwise.
-    /// In both cases, a snapshot of the state from **after** the transition is
-    /// returned.
-    ///
+    /// Returns `true` if the transition to `Idle` is successful, `false` otherwise.
     /// The transition to `Idle` fails if the task has been flagged to be
     /// cancelled.
-    pub(super) fn transition_to_idle(&self) -> UpdateResult {
-        self.fetch_update(|curr| {
+    pub(super) fn transition_to_idle(&self) -> TransitionToIdle {
+        self.fetch_update_action(|curr| {
             assert!(curr.is_running());
 
             if curr.is_cancelled() {
-                return None;
+                return (TransitionToIdle::Cancelled, None);
             }
 
             let mut next = curr;
+            let action;
             next.unset_running();
 
-            if next.is_notified() {
-                // The caller needs to schedule the task. To do this, it needs a
-                // waker. The waker requires a ref count.
+            if !next.is_notified() {
+                // Polling the future consumes the ref-count of the Notified.
+                next.ref_dec();
+                if next.ref_count() == 0 {
+                    action = TransitionToIdle::OkDealloc;
+                } else {
+                    action = TransitionToIdle::Ok;
+                }
+            } else {
+                // The caller will schedule a new notification, so we create a
+                // new ref-count for the notification. Our own ref-count is kept
+                // for now, and the caller will drop it shortly.
                 next.ref_inc();
+                action = TransitionToIdle::OkNotified;
             }
 
-            Some(next)
+            (action, Some(next))
         })
     }
 
@@ -143,38 +191,119 @@
     }
 
     /// Transition from `Complete` -> `Terminal`, decrementing the reference
-    /// count by 1.
+    /// count the specified number of times.
     ///
-    /// When `ref_dec` is set, an additional ref count decrement is performed.
-    /// This is used to batch atomic ops when possible.
-    pub(super) fn transition_to_terminal(&self, complete: bool, ref_dec: bool) -> Snapshot {
-        self.fetch_update(|mut snapshot| {
-            if complete {
-                snapshot.set_complete();
-            } else {
-                assert!(snapshot.is_complete());
-            }
+    /// Returns true if the task should be deallocated.
+    pub(super) fn transition_to_terminal(&self, count: usize) -> bool {
+        let prev = Snapshot(self.val.fetch_sub(count * REF_ONE, AcqRel));
+        assert!(
+            prev.ref_count() >= count,
+            "current: {}, sub: {}",
+            prev.ref_count(),
+            count
+        );
+        prev.ref_count() == count
+    }
+
+    /// Transitions the state to `NOTIFIED`.
+    ///
+    /// If no task needs to be submitted, a ref-count is consumed.
+    ///
+    /// If a task needs to be submitted, the ref-count is incremented for the
+    /// new Notified.
+    pub(super) fn transition_to_notified_by_val(&self) -> TransitionToNotifiedByVal {
+        self.fetch_update_action(|mut snapshot| {
+            let action;
+
+            if snapshot.is_running() {
+                // If the task is running, we mark it as notified, but we should
+                // not submit anything as the thread currently running the
+                // future is responsible for that.
+                snapshot.set_notified();
+                snapshot.ref_dec();
 
-            // Decrement the primary handle
-            snapshot.ref_dec();
+                // The thread that set the running bit also holds a ref-count.
+                assert!(snapshot.ref_count() > 0);
 
-            if ref_dec {
-                // Decrement a second time
+                action = TransitionToNotifiedByVal::DoNothing;
+            } else if snapshot.is_complete() || snapshot.is_notified() {
+                // We do not need to submit any notifications, but we have to
+                // decrement the ref-count.
                 snapshot.ref_dec();
+
+                if snapshot.ref_count() == 0 {
+                    action = TransitionToNotifiedByVal::Dealloc;
+                } else {
+                    action = TransitionToNotifiedByVal::DoNothing;
+                }
+            } else {
+                // We create a new notified that we can submit. The caller
+                // retains ownership of the ref-count they passed in.
+                snapshot.set_notified();
+                snapshot.ref_inc();
+                action = TransitionToNotifiedByVal::Submit;
             }
 
-            Some(snapshot)
+            (action, Some(snapshot))
         })
-        .unwrap()
     }
 
     /// Transitions the state to `NOTIFIED`.
+    pub(super) fn transition_to_notified_by_ref(&self) -> TransitionToNotifiedByRef {
+        self.fetch_update_action(|mut snapshot| {
+            if snapshot.is_complete() || snapshot.is_notified() {
+                // There is nothing to do in this case.
+                (TransitionToNotifiedByRef::DoNothing, None)
+            } else if snapshot.is_running() {
+                // If the task is running, we mark it as notified, but we should
+                // not submit as the thread currently running the future is
+                // responsible for that.
+                snapshot.set_notified();
+                (TransitionToNotifiedByRef::DoNothing, Some(snapshot))
+            } else {
+                // The task is idle and not notified. We should submit a
+                // notification.
+                snapshot.set_notified();
+                snapshot.ref_inc();
+                (TransitionToNotifiedByRef::Submit, Some(snapshot))
+            }
+        })
+    }
+
+    /// Set the cancelled bit and transition the state to `NOTIFIED` if idle.
     ///
     /// Returns `true` if the task needs to be submitted to the pool for
     /// execution
-    pub(super) fn transition_to_notified(&self) -> bool {
-        let prev = Snapshot(self.val.fetch_or(NOTIFIED, AcqRel));
-        prev.will_need_queueing()
+    pub(super) fn transition_to_notified_and_cancel(&self) -> bool {
+        self.fetch_update_action(|mut snapshot| {
+            if snapshot.is_cancelled() || snapshot.is_complete() {
+                // Aborts to completed or cancelled tasks are no-ops.
+                (false, None)
+            } else if snapshot.is_running() {
+                // If the task is running, we mark it as cancelled. The thread
+                // running the task will notice the cancelled bit when it
+                // stops polling and it will kill the task.
+                //
+                // The set_notified() call is not strictly necessary but it will
+                // in some cases let a wake_by_ref call return without having
+                // to perform a compare_exchange.
+                snapshot.set_notified();
+                snapshot.set_cancelled();
+                (false, Some(snapshot))
+            } else {
+                // The task is idle. We set the cancelled and notified bits and
+                // submit a notification if the notified bit was not already
+                // set.
+                snapshot.set_cancelled();
+                if !snapshot.is_notified() {
+                    snapshot.set_notified();
+                    snapshot.ref_inc();
+                    (true, Some(snapshot))
+                } else {
+                    (false, Some(snapshot))
+                }
+            }
+        })
     }
 
     /// Set the `CANCELLED` bit and attempt to transition to `Running`.
@@ -188,17 +317,11 @@
 
             if snapshot.is_idle() {
                 snapshot.set_running();
-
-                if snapshot.is_notified() {
-                    // If the task is idle and notified, this indicates the task is
-                    // in the run queue and is considered owned by the scheduler.
-                    // The shutdown operation claims ownership of the task, which
-                    // means we need to assign an additional ref-count to the task
-                    // in the queue.
-                    snapshot.ref_inc();
-                }
             }
 
+            // If the task was not idle, the thread currently running the task
+            // will notice the cancelled bit and cancel it once the poll
+            // completes.
             snapshot.set_cancelled();
             Some(snapshot)
         });
@@ -306,7 +429,7 @@
         let prev = self.val.fetch_add(REF_ONE, Relaxed);
 
         // If the reference count overflowed, abort.
-        if prev > isize::max_value() as usize {
+        if prev > isize::MAX as usize {
             process::abort();
         }
     }
@@ -314,9 +437,39 @@
     /// Returns `true` if the task should be released.
     pub(super) fn ref_dec(&self) -> bool {
         let prev = Snapshot(self.val.fetch_sub(REF_ONE, AcqRel));
+        assert!(prev.ref_count() >= 1);
         prev.ref_count() == 1
     }
 
+    /// Returns `true` if the task should be released.
+    pub(super) fn ref_dec_twice(&self) -> bool {
+        let prev = Snapshot(self.val.fetch_sub(2 * REF_ONE, AcqRel));
+        assert!(prev.ref_count() >= 2);
+        prev.ref_count() == 2
+    }
+
+    fn fetch_update_action<F, T>(&self, mut f: F) -> T
+    where
+        F: FnMut(Snapshot) -> (T, Option<Snapshot>),
+    {
+        let mut curr = self.load();
+
+        loop {
+            let (output, next) = f(curr);
+            let next = match next {
+                Some(next) => next,
+                None => return output,
+            };
+
+            let res = self.val.compare_exchange(curr.0, next.0, AcqRel, Acquire);
+
+            match res {
+                Ok(_) => return output,
+                Err(actual) => curr = Snapshot(actual),
+            }
+        }
+    }
+
     fn fetch_update<F>(&self, mut f: F) -> Result<Snapshot, Snapshot>
     where
         F: FnMut(Snapshot) -> Option<Snapshot>,
@@ -356,6 +509,10 @@
         self.0 &= !NOTIFIED
     }
 
+    fn set_notified(&mut self) {
+        self.0 |= NOTIFIED
+    }
+
     pub(super) fn is_running(self) -> bool {
         self.0 & RUNNING == RUNNING
     }
@@ -376,10 +533,6 @@
         self.0 |= CANCELLED;
     }
 
-    fn set_complete(&mut self) {
-        self.0 |= COMPLETE;
-    }
-
     /// Returns `true` if the task's future has completed execution.
     pub(super) fn is_complete(self) -> bool {
         self.0 & COMPLETE == COMPLETE
@@ -410,7 +563,7 @@
     }
 
     fn ref_inc(&mut self) {
-        assert!(self.0 <= isize::max_value() as usize);
+        assert!(self.0 <= isize::MAX as usize);
         self.0 += REF_ONE;
     }
 
@@ -418,10 +571,6 @@
         assert!(self.ref_count() > 0);
         self.0 -= REF_ONE
     }
-
-    fn will_need_queueing(self) -> bool {
-        !self.is_notified() && self.is_idle()
-    }
 }
 
 impl fmt::Debug for State {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/task/waker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/task/waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
+use crate::future::Future;
 use crate::runtime::task::harness::Harness;
 use crate::runtime::task::{Header, Schedule};
 
-use std::future::Future;
 use std::marker::PhantomData;
 use std::mem::ManuallyDrop;
 use std::ops;
@@ -44,12 +44,38 @@
     }
 }
 
+cfg_trace! {
+    macro_rules! trace {
+        ($harness:expr, $op:expr) => {
+            if let Some(id) = $harness.id() {
+                tracing::trace!(
+                    target: "tokio::task::waker",
+                    op = $op,
+                    task.id = id.into_u64(),
+                );
+            }
+        }
+    }
+}
+
+cfg_not_trace! {
+    macro_rules! trace {
+        ($harness:expr, $op:expr) => {
+            // noop
+            let _ = &$harness;
+        }
+    }
+}
+
 unsafe fn clone_waker<T, S>(ptr: *const ()) -> RawWaker
 where
     T: Future,
     S: Schedule,
 {
     let header = ptr as *const Header;
+    let ptr = NonNull::new_unchecked(ptr as *mut Header);
+    let harness = Harness::<T, S>::from_raw(ptr);
+    trace!(harness, "waker.clone");
     (*header).state.ref_inc();
     raw_waker::<T, S>(header)
 }
@@ -61,6 +87,7 @@
 {
     let ptr = NonNull::new_unchecked(ptr as *mut Header);
     let harness = Harness::<T, S>::from_raw(ptr);
+    trace!(harness, "waker.drop");
     harness.drop_reference();
 }
 
@@ -71,6 +98,7 @@
 {
     let ptr = NonNull::new_unchecked(ptr as *mut Header);
     let harness = Harness::<T, S>::from_raw(ptr);
+    trace!(harness, "waker.wake");
     harness.wake_by_val();
 }
 
@@ -82,6 +110,7 @@
 {
     let ptr = NonNull::new_unchecked(ptr as *mut Header);
     let harness = Harness::<T, S>::from_raw(ptr);
+    trace!(harness, "waker.wake_by_ref");
     harness.wake_by_ref();
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_basic_scheduler.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_basic_scheduler.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_basic_scheduler.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_basic_scheduler.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,82 @@
+use crate::loom::sync::atomic::AtomicUsize;
+use crate::loom::sync::Arc;
+use crate::loom::thread;
+use crate::runtime::{Builder, Runtime};
+use crate::sync::oneshot::{self, Receiver};
+use crate::task;
+use std::future::Future;
+use std::pin::Pin;
+use std::sync::atomic::Ordering::{Acquire, Release};
+use std::task::{Context, Poll};
+
+fn assert_at_most_num_polls(rt: Arc<Runtime>, at_most_polls: usize) {
+    let (tx, rx) = oneshot::channel();
+    let num_polls = Arc::new(AtomicUsize::new(0));
+    rt.spawn(async move {
+        for _ in 0..12 {
+            task::yield_now().await;
+        }
+        tx.send(()).unwrap();
+    });
+
+    rt.block_on(async {
+        BlockedFuture {
+            rx,
+            num_polls: num_polls.clone(),
+        }
+        .await;
+    });
+
+    let polls = num_polls.load(Acquire);
+    assert!(polls <= at_most_polls);
+}
+
+#[test]
+fn block_on_num_polls() {
+    loom::model(|| {
+        // we expect at most 3 number of polls because there are
+        // three points at which we poll the future. At any of these
+        // points it can be ready:
+        //
+        // - when we fail to steal the parker and we block on a
+        //   notification that it is available.
+        //
+        // - when we steal the parker and we schedule the future
+        //
+        // - when the future is woken up and we have ran the max
+        //   number of tasks for the current tick or there are no
+        //   more tasks to run.
+        //
+        let at_most = 3;
+
+        let rt1 = Arc::new(Builder::new_current_thread().build().unwrap());
+        let rt2 = rt1.clone();
+        let rt3 = rt1.clone();
+
+        let th1 = thread::spawn(move || assert_at_most_num_polls(rt1, at_most));
+        let th2 = thread::spawn(move || assert_at_most_num_polls(rt2, at_most));
+        let th3 = thread::spawn(move || assert_at_most_num_polls(rt3, at_most));
+
+        th1.join().unwrap();
+        th2.join().unwrap();
+        th3.join().unwrap();
+    });
+}
+
+struct BlockedFuture {
+    rx: Receiver<()>,
+    num_polls: Arc<AtomicUsize>,
+}
+
+impl Future for BlockedFuture {
+    type Output = ();
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        self.num_polls.fetch_add(1, Release);
+
+        match Pin::new(&mut self.rx).poll(cx) {
+            Poll::Pending => Poll::Pending,
+            _ => Poll::Ready(()),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_blocking.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_blocking.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_blocking.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_blocking.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,14 +8,15 @@
         let v = Arc::new(());
 
         let rt = mk_runtime(1);
-        rt.enter(|| {
+        {
+            let _enter = rt.enter();
             for _ in 0..2 {
                 let v = v.clone();
                 crate::task::spawn_blocking(move || {
                     assert!(1 < Arc::strong_count(&v));
                 });
             }
-        });
+        }
 
         drop(rt);
         assert_eq!(1, Arc::strong_count(&v));
@@ -23,9 +24,8 @@
 }
 
 fn mk_runtime(num_threads: usize) -> Runtime {
-    runtime::Builder::new()
-        .threaded_scheduler()
-        .core_threads(num_threads)
+    runtime::Builder::new_multi_thread()
+        .worker_threads(num_threads)
         .build()
         .unwrap()
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_local.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_local.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_local.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_local.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+use crate::runtime::tests::loom_oneshot as oneshot;
+use crate::runtime::Builder;
+use crate::task::LocalSet;
+
+use std::task::Poll;
+
+/// Waking a runtime will attempt to push a task into a queue of notifications
+/// in the runtime, however the tasks in such a queue usually have a reference
+/// to the runtime itself. This means that if they are not properly removed at
+/// runtime shutdown, this will cause a memory leak.
+///
+/// This test verifies that waking something during shutdown of a LocalSet does
+/// not result in tasks lingering in the queue once shutdown is complete. This
+/// is verified using loom's leak finder.
+#[test]
+fn wake_during_shutdown() {
+    loom::model(|| {
+        let rt = Builder::new_current_thread().build().unwrap();
+        let ls = LocalSet::new();
+
+        let (send, recv) = oneshot::channel();
+
+        ls.spawn_local(async move {
+            let mut send = Some(send);
+
+            let () = futures::future::poll_fn(|cx| {
+                if let Some(send) = send.take() {
+                    send.send(cx.waker().clone());
+                }
+
+                Poll::Pending
+            })
+            .await;
+        });
+
+        let handle = loom::thread::spawn(move || {
+            let waker = recv.recv();
+            waker.wake();
+        });
+
+        ls.block_on(&rt, crate::task::yield_now());
+
+        drop(ls);
+        handle.join().unwrap();
+        drop(rt);
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_oneshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_oneshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_oneshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_oneshot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,6 @@
+use crate::loom::sync::{Arc, Mutex};
 use loom::sync::Notify;
 
-use std::sync::{Arc, Mutex};
-
 pub(crate) fn channel<T>() -> (Sender<T>, Receiver<T>) {
     let inner = Arc::new(Inner {
         notify: Notify::new(),
@@ -31,7 +30,7 @@
 
 impl<T> Sender<T> {
     pub(crate) fn send(self, value: T) {
-        *self.inner.value.lock().unwrap() = Some(value);
+        *self.inner.value.lock() = Some(value);
         self.inner.notify.notify();
     }
 }
@@ -39,7 +38,7 @@
 impl<T> Receiver<T> {
     pub(crate) fn recv(self) -> T {
         loop {
-            if let Some(v) = self.inner.value.lock().unwrap().take() {
+            if let Some(v) = self.inner.value.lock().take() {
                 return v;
             }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_pool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_pool.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 use tokio_test::assert_ok;
 
 use loom::sync::atomic::{AtomicBool, AtomicUsize};
-use loom::sync::{Arc, Mutex};
+use loom::sync::Arc;
 
 use pin_project_lite::pin_project;
 use std::future::Future;
@@ -19,6 +19,57 @@
 use std::sync::atomic::Ordering::{Relaxed, SeqCst};
 use std::task::{Context, Poll};
 
+mod atomic_take {
+    use loom::sync::atomic::AtomicBool;
+    use std::mem::MaybeUninit;
+    use std::sync::atomic::Ordering::SeqCst;
+
+    pub(super) struct AtomicTake<T> {
+        inner: MaybeUninit<T>,
+        taken: AtomicBool,
+    }
+
+    impl<T> AtomicTake<T> {
+        pub(super) fn new(value: T) -> Self {
+            Self {
+                inner: MaybeUninit::new(value),
+                taken: AtomicBool::new(false),
+            }
+        }
+
+        pub(super) fn take(&self) -> Option<T> {
+            // safety: Only one thread will see the boolean change from false
+            // to true, so that thread is able to take the value.
+            match self.taken.fetch_or(true, SeqCst) {
+                false => unsafe { Some(std::ptr::read(self.inner.as_ptr())) },
+                true => None,
+            }
+        }
+    }
+
+    impl<T> Drop for AtomicTake<T> {
+        fn drop(&mut self) {
+            drop(self.take());
+        }
+    }
+}
+
+#[derive(Clone)]
+struct AtomicOneshot<T> {
+    value: std::sync::Arc<atomic_take::AtomicTake<oneshot::Sender<T>>>,
+}
+impl<T> AtomicOneshot<T> {
+    fn new(sender: oneshot::Sender<T>) -> Self {
+        Self {
+            value: std::sync::Arc::new(atomic_take::AtomicTake::new(sender)),
+        }
+    }
+
+    fn assert_send(&self, value: T) {
+        self.value.take().unwrap().send(value);
+    }
+}
+
 /// Tests are divided into groups to make the runs faster on CI.
 mod group_a {
     use super::*;
@@ -52,7 +103,7 @@
             let c1 = Arc::new(AtomicUsize::new(0));
 
             let (tx, rx) = oneshot::channel();
-            let tx1 = Arc::new(Mutex::new(Some(tx)));
+            let tx1 = AtomicOneshot::new(tx);
 
             // Spawn a task
             let c2 = c1.clone();
@@ -60,7 +111,7 @@
             pool.spawn(track(async move {
                 spawn(track(async move {
                     if 1 == c1.fetch_add(1, Relaxed) {
-                        tx1.lock().unwrap().take().unwrap().send(());
+                        tx1.assert_send(());
                     }
                 }));
             }));
@@ -69,7 +120,7 @@
             pool.spawn(track(async move {
                 spawn(track(async move {
                     if 1 == c2.fetch_add(1, Relaxed) {
-                        tx2.lock().unwrap().take().unwrap().send(());
+                        tx2.assert_send(());
                     }
                 }));
             }));
@@ -119,7 +170,7 @@
 
             let (block_tx, block_rx) = oneshot::channel();
             let (done_tx, done_rx) = oneshot::channel();
-            let done_tx = Arc::new(Mutex::new(Some(done_tx)));
+            let done_tx = AtomicOneshot::new(done_tx);
 
             pool.spawn(track(async move {
                 crate::task::block_in_place(move || {
@@ -136,7 +187,7 @@
 
                 pool.spawn(track(async move {
                     if NUM == cnt.fetch_add(1, Relaxed) + 1 {
-                        done_tx.lock().unwrap().take().unwrap().send(());
+                        done_tx.assert_send(());
                     }
                 }));
             }
@@ -159,26 +210,9 @@
     }
 
     #[test]
-    fn pool_shutdown() {
-        loom::model(|| {
-            let pool = mk_pool(2);
-
-            pool.spawn(track(async move {
-                gated2(true).await;
-            }));
-
-            pool.spawn(track(async move {
-                gated2(false).await;
-            }));
-
-            drop(pool);
-        });
-    }
-
-    #[test]
     fn join_output() {
         loom::model(|| {
-            let mut rt = mk_pool(1);
+            let rt = mk_pool(1);
 
             rt.block_on(async {
                 let t = crate::spawn(track(async { "hello" }));
@@ -192,7 +226,7 @@
     #[test]
     fn poll_drop_handle_then_drop() {
         loom::model(|| {
-            let mut rt = mk_pool(1);
+            let rt = mk_pool(1);
 
             rt.block_on(async move {
                 let mut t = crate::spawn(track(async { "hello" }));
@@ -209,7 +243,7 @@
     #[test]
     fn complete_block_on_under_load() {
         loom::model(|| {
-            let mut pool = mk_pool(1);
+            let pool = mk_pool(1);
 
             pool.block_on(async {
                 // Trigger a re-schedule
@@ -223,10 +257,6 @@
             });
         });
     }
-}
-
-mod group_c {
-    use super::*;
 
     #[test]
     fn shutdown_with_notification() {
@@ -255,6 +285,27 @@
     }
 }
 
+mod group_c {
+    use super::*;
+
+    #[test]
+    fn pool_shutdown() {
+        loom::model(|| {
+            let pool = mk_pool(2);
+
+            pool.spawn(track(async move {
+                gated2(true).await;
+            }));
+
+            pool.spawn(track(async move {
+                gated2(false).await;
+            }));
+
+            drop(pool);
+        });
+    }
+}
+
 mod group_d {
     use super::*;
 
@@ -266,17 +317,17 @@
             let c1 = Arc::new(AtomicUsize::new(0));
 
             let (done_tx, done_rx) = oneshot::channel();
-            let done_tx1 = Arc::new(Mutex::new(Some(done_tx)));
+            let done_tx1 = AtomicOneshot::new(done_tx);
+            let done_tx2 = done_tx1.clone();
 
             // Spawn a task
             let c2 = c1.clone();
-            let done_tx2 = done_tx1.clone();
             pool.spawn(track(async move {
                 gated().await;
                 gated().await;
 
                 if 1 == c1.fetch_add(1, Relaxed) {
-                    done_tx1.lock().unwrap().take().unwrap().send(());
+                    done_tx1.assert_send(());
                 }
             }));
 
@@ -286,7 +337,7 @@
                 gated().await;
 
                 if 1 == c2.fetch_add(1, Relaxed) {
-                    done_tx2.lock().unwrap().take().unwrap().send(());
+                    done_tx2.assert_send(());
                 }
             }));
 
@@ -296,9 +347,8 @@
 }
 
 fn mk_pool(num_threads: usize) -> Runtime {
-    runtime::Builder::new()
-        .threaded_scheduler()
-        .core_threads(num_threads)
+    runtime::Builder::new_multi_thread()
+        .worker_threads(num_threads)
         .build()
         .unwrap()
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,7 @@
+use crate::runtime::blocking::NoopSchedule;
 use crate::runtime::queue;
-use crate::runtime::task::{self, Schedule, Task};
+use crate::runtime::stats::WorkerStatsBatcher;
+use crate::runtime::task::Inject;
 
 use loom::thread;
 
@@ -7,14 +9,15 @@
 fn basic() {
     loom::model(|| {
         let (steal, mut local) = queue::local();
-        let inject = queue::Inject::new();
+        let inject = Inject::new();
 
         let th = thread::spawn(move || {
+            let mut stats = WorkerStatsBatcher::new(0);
             let (_, mut local) = queue::local();
             let mut n = 0;
 
             for _ in 0..3 {
-                if steal.steal_into(&mut local).is_some() {
+                if steal.steal_into(&mut local, &mut stats).is_some() {
                     n += 1;
                 }
 
@@ -30,7 +33,7 @@
 
         for _ in 0..2 {
             for _ in 0..2 {
-                let (task, _) = task::joinable::<_, Runtime>(async {});
+                let (task, _) = super::unowned(async {});
                 local.push_back(task, &inject);
             }
 
@@ -39,7 +42,7 @@
             }
 
             // Push another task
-            let (task, _) = task::joinable::<_, Runtime>(async {});
+            let (task, _) = super::unowned(async {});
             local.push_back(task, &inject);
 
             while local.pop().is_some() {
@@ -61,13 +64,14 @@
 fn steal_overflow() {
     loom::model(|| {
         let (steal, mut local) = queue::local();
-        let inject = queue::Inject::new();
+        let inject = Inject::new();
 
         let th = thread::spawn(move || {
+            let mut stats = WorkerStatsBatcher::new(0);
             let (_, mut local) = queue::local();
             let mut n = 0;
 
-            if steal.steal_into(&mut local).is_some() {
+            if steal.steal_into(&mut local, &mut stats).is_some() {
                 n += 1;
             }
 
@@ -81,7 +85,7 @@
         let mut n = 0;
 
         // push a task, pop a task
-        let (task, _) = task::joinable::<_, Runtime>(async {});
+        let (task, _) = super::unowned(async {});
         local.push_back(task, &inject);
 
         if local.pop().is_some() {
@@ -89,7 +93,7 @@
         }
 
         for _ in 0..6 {
-            let (task, _) = task::joinable::<_, Runtime>(async {});
+            let (task, _) = super::unowned(async {});
             local.push_back(task, &inject);
         }
 
@@ -111,10 +115,11 @@
 fn multi_stealer() {
     const NUM_TASKS: usize = 5;
 
-    fn steal_tasks(steal: queue::Steal<Runtime>) -> usize {
+    fn steal_tasks(steal: queue::Steal<NoopSchedule>) -> usize {
+        let mut stats = WorkerStatsBatcher::new(0);
         let (_, mut local) = queue::local();
 
-        if steal.steal_into(&mut local).is_none() {
+        if steal.steal_into(&mut local, &mut stats).is_none() {
             return 0;
         }
 
@@ -129,11 +134,11 @@
 
     loom::model(|| {
         let (steal, mut local) = queue::local();
-        let inject = queue::Inject::new();
+        let inject = Inject::new();
 
         // Push work
         for _ in 0..NUM_TASKS {
-            let (task, _) = task::joinable::<_, Runtime>(async {});
+            let (task, _) = super::unowned(async {});
             local.push_back(task, &inject);
         }
 
@@ -164,23 +169,25 @@
 #[test]
 fn chained_steal() {
     loom::model(|| {
+        let mut stats = WorkerStatsBatcher::new(0);
         let (s1, mut l1) = queue::local();
         let (s2, mut l2) = queue::local();
-        let inject = queue::Inject::new();
+        let inject = Inject::new();
 
         // Load up some tasks
         for _ in 0..4 {
-            let (task, _) = task::joinable::<_, Runtime>(async {});
+            let (task, _) = super::unowned(async {});
             l1.push_back(task, &inject);
 
-            let (task, _) = task::joinable::<_, Runtime>(async {});
+            let (task, _) = super::unowned(async {});
             l2.push_back(task, &inject);
         }
 
         // Spawn a task to steal from **our** queue
         let th = thread::spawn(move || {
+            let mut stats = WorkerStatsBatcher::new(0);
             let (_, mut local) = queue::local();
-            s1.steal_into(&mut local);
+            s1.steal_into(&mut local, &mut stats);
 
             while local.pop().is_some() {}
         });
@@ -188,7 +195,7 @@
         // Drain our tasks, then attempt to steal
         while l1.pop().is_some() {}
 
-        s2.steal_into(&mut l1);
+        s2.steal_into(&mut l1, &mut stats);
 
         th.join().unwrap();
 
@@ -197,20 +204,3 @@
         while inject.pop().is_some() {}
     });
 }
-
-struct Runtime;
-
-impl Schedule for Runtime {
-    fn bind(task: Task<Self>) -> Runtime {
-        std::mem::forget(task);
-        Runtime
-    }
-
-    fn release(&self, _task: &Task<Self>) -> Option<Task<Self>> {
-        None
-    }
-
-    fn schedule(&self, _task: task::Notified<Self>) {
-        unreachable!();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_shutdown_join.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_shutdown_join.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_shutdown_join.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/loom_shutdown_join.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,28 @@
+use crate::runtime::{Builder, Handle};
+
+#[test]
+fn join_handle_cancel_on_shutdown() {
+    let mut builder = loom::model::Builder::new();
+    builder.preemption_bound = Some(2);
+    builder.check(|| {
+        use futures::future::FutureExt;
+
+        let rt = Builder::new_multi_thread()
+            .worker_threads(2)
+            .build()
+            .unwrap();
+
+        let handle = rt.block_on(async move { Handle::current() });
+
+        let jh1 = handle.spawn(futures::future::pending::<()>());
+
+        drop(rt);
+
+        let jh2 = handle.spawn(futures::future::pending::<()>());
+
+        let err1 = jh1.now_or_never().unwrap().unwrap_err();
+        let err2 = jh2.now_or_never().unwrap().unwrap_err();
+        assert!(err1.is_cancelled());
+        assert!(err2.is_cancelled());
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,49 @@
+use self::unowned_wrapper::unowned;
+
+mod unowned_wrapper {
+    use crate::runtime::blocking::NoopSchedule;
+    use crate::runtime::task::{JoinHandle, Notified};
+
+    #[cfg(all(tokio_unstable, feature = "tracing"))]
+    pub(crate) fn unowned<T>(task: T) -> (Notified<NoopSchedule>, JoinHandle<T::Output>)
+    where
+        T: std::future::Future + Send + 'static,
+        T::Output: Send + 'static,
+    {
+        use tracing::Instrument;
+        let span = tracing::trace_span!("test_span");
+        let task = task.instrument(span);
+        let (task, handle) = crate::runtime::task::unowned(task, NoopSchedule);
+        (task.into_notified(), handle)
+    }
+
+    #[cfg(not(all(tokio_unstable, feature = "tracing")))]
+    pub(crate) fn unowned<T>(task: T) -> (Notified<NoopSchedule>, JoinHandle<T::Output>)
+    where
+        T: std::future::Future + Send + 'static,
+        T::Output: Send + 'static,
+    {
+        let (task, handle) = crate::runtime::task::unowned(task, NoopSchedule);
+        (task.into_notified(), handle)
+    }
+}
+
 cfg_loom! {
+    mod loom_basic_scheduler;
+    mod loom_local;
     mod loom_blocking;
     mod loom_oneshot;
     mod loom_pool;
     mod loom_queue;
+    mod loom_shutdown_join;
 }
 
 cfg_not_loom! {
     mod queue;
 
+    #[cfg(not(miri))]
+    mod task_combinations;
+
     #[cfg(miri)]
     mod task;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 use crate::runtime::queue;
-use crate::runtime::task::{self, Schedule, Task};
+use crate::runtime::stats::WorkerStatsBatcher;
+use crate::runtime::task::{self, Inject, Schedule, Task};
 
 use std::thread;
 use std::time::Duration;
@@ -7,10 +8,10 @@
 #[test]
 fn fits_256() {
     let (_, mut local) = queue::local();
-    let inject = queue::Inject::new();
+    let inject = Inject::new();
 
     for _ in 0..256 {
-        let (task, _) = task::joinable::<_, Runtime>(async {});
+        let (task, _) = super::unowned(async {});
         local.push_back(task, &inject);
     }
 
@@ -22,10 +23,10 @@
 #[test]
 fn overflow() {
     let (_, mut local) = queue::local();
-    let inject = queue::Inject::new();
+    let inject = Inject::new();
 
     for _ in 0..257 {
-        let (task, _) = task::joinable::<_, Runtime>(async {});
+        let (task, _) = super::unowned(async {});
         local.push_back(task, &inject);
     }
 
@@ -44,16 +45,18 @@
 
 #[test]
 fn steal_batch() {
+    let mut stats = WorkerStatsBatcher::new(0);
+
     let (steal1, mut local1) = queue::local();
     let (_, mut local2) = queue::local();
-    let inject = queue::Inject::new();
+    let inject = Inject::new();
 
     for _ in 0..4 {
-        let (task, _) = task::joinable::<_, Runtime>(async {});
+        let (task, _) = super::unowned(async {});
         local1.push_back(task, &inject);
     }
 
-    assert!(steal1.steal_into(&mut local2).is_some());
+    assert!(steal1.steal_into(&mut local2, &mut stats).is_some());
 
     for _ in 0..1 {
         assert!(local2.pop().is_some());
@@ -78,14 +81,15 @@
 
     for _ in 0..NUM_ITER {
         let (steal, mut local) = queue::local();
-        let inject = queue::Inject::new();
+        let inject = Inject::new();
 
         let th = thread::spawn(move || {
+            let mut stats = WorkerStatsBatcher::new(0);
             let (_, mut local) = queue::local();
             let mut n = 0;
 
             for _ in 0..NUM_STEAL {
-                if steal.steal_into(&mut local).is_some() {
+                if steal.steal_into(&mut local, &mut stats).is_some() {
                     n += 1;
                 }
 
@@ -103,7 +107,7 @@
 
         for _ in 0..NUM_LOCAL {
             for _ in 0..NUM_PUSH {
-                let (task, _) = task::joinable::<_, Runtime>(async {});
+                let (task, _) = super::unowned(async {});
                 local.push_back(task, &inject);
             }
 
@@ -134,14 +138,15 @@
 
     for _ in 0..NUM_ITER {
         let (steal, mut local) = queue::local();
-        let inject = queue::Inject::new();
+        let inject = Inject::new();
 
         let th = thread::spawn(move || {
+            let mut stats = WorkerStatsBatcher::new(0);
             let (_, mut local) = queue::local();
             let mut n = 0;
 
             for _ in 0..NUM_STEAL {
-                if steal.steal_into(&mut local).is_some() {
+                if steal.steal_into(&mut local, &mut stats).is_some() {
                     n += 1;
                 }
 
@@ -158,7 +163,7 @@
         let mut num_pop = 0;
 
         for i in 0..NUM_TASKS {
-            let (task, _) = task::joinable::<_, Runtime>(async {});
+            let (task, _) = super::unowned(async {});
             local.push_back(task, &inject);
 
             if i % 128 == 0 && local.pop().is_some() {
@@ -187,11 +192,6 @@
 struct Runtime;
 
 impl Schedule for Runtime {
-    fn bind(task: Task<Self>) -> Runtime {
-        std::mem::forget(task);
-        Runtime
-    }
-
     fn release(&self, _task: &Task<Self>) -> Option<Task<Self>> {
         None
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/task_combinations.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/task_combinations.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/task_combinations.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/task_combinations.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,380 @@
+use std::future::Future;
+use std::panic;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+use crate::runtime::Builder;
+use crate::sync::oneshot;
+use crate::task::JoinHandle;
+
+use futures::future::FutureExt;
+
+// Enums for each option in the combinations being tested
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+enum CombiRuntime {
+    CurrentThread,
+    Multi1,
+    Multi2,
+}
+#[derive(Copy, Clone, Debug, PartialEq)]
+enum CombiLocalSet {
+    Yes,
+    No,
+}
+#[derive(Copy, Clone, Debug, PartialEq)]
+enum CombiTask {
+    PanicOnRun,
+    PanicOnDrop,
+    PanicOnRunAndDrop,
+    NoPanic,
+}
+#[derive(Copy, Clone, Debug, PartialEq)]
+enum CombiOutput {
+    PanicOnDrop,
+    NoPanic,
+}
+#[derive(Copy, Clone, Debug, PartialEq)]
+enum CombiJoinInterest {
+    Polled,
+    NotPolled,
+}
+#[allow(clippy::enum_variant_names)] // we aren't using glob imports
+#[derive(Copy, Clone, Debug, PartialEq)]
+enum CombiJoinHandle {
+    DropImmediately = 1,
+    DropFirstPoll = 2,
+    DropAfterNoConsume = 3,
+    DropAfterConsume = 4,
+}
+#[derive(Copy, Clone, Debug, PartialEq)]
+enum CombiAbort {
+    NotAborted = 0,
+    AbortedImmediately = 1,
+    AbortedFirstPoll = 2,
+    AbortedAfterFinish = 3,
+    AbortedAfterConsumeOutput = 4,
+}
+
+#[test]
+fn test_combinations() {
+    let mut rt = &[
+        CombiRuntime::CurrentThread,
+        CombiRuntime::Multi1,
+        CombiRuntime::Multi2,
+    ][..];
+
+    if cfg!(miri) {
+        rt = &[CombiRuntime::CurrentThread];
+    }
+
+    let ls = [CombiLocalSet::Yes, CombiLocalSet::No];
+    let task = [
+        CombiTask::NoPanic,
+        CombiTask::PanicOnRun,
+        CombiTask::PanicOnDrop,
+        CombiTask::PanicOnRunAndDrop,
+    ];
+    let output = [CombiOutput::NoPanic, CombiOutput::PanicOnDrop];
+    let ji = [CombiJoinInterest::Polled, CombiJoinInterest::NotPolled];
+    let jh = [
+        CombiJoinHandle::DropImmediately,
+        CombiJoinHandle::DropFirstPoll,
+        CombiJoinHandle::DropAfterNoConsume,
+        CombiJoinHandle::DropAfterConsume,
+    ];
+    let abort = [
+        CombiAbort::NotAborted,
+        CombiAbort::AbortedImmediately,
+        CombiAbort::AbortedFirstPoll,
+        CombiAbort::AbortedAfterFinish,
+        CombiAbort::AbortedAfterConsumeOutput,
+    ];
+
+    for rt in rt.iter().copied() {
+        for ls in ls.iter().copied() {
+            for task in task.iter().copied() {
+                for output in output.iter().copied() {
+                    for ji in ji.iter().copied() {
+                        for jh in jh.iter().copied() {
+                            for abort in abort.iter().copied() {
+                                test_combination(rt, ls, task, output, ji, jh, abort);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+fn test_combination(
+    rt: CombiRuntime,
+    ls: CombiLocalSet,
+    task: CombiTask,
+    output: CombiOutput,
+    ji: CombiJoinInterest,
+    jh: CombiJoinHandle,
+    abort: CombiAbort,
+) {
+    if (jh as usize) < (abort as usize) {
+        // drop before abort not possible
+        return;
+    }
+    if (task == CombiTask::PanicOnDrop) && (output == CombiOutput::PanicOnDrop) {
+        // this causes double panic
+        return;
+    }
+    if (task == CombiTask::PanicOnRunAndDrop) && (abort != CombiAbort::AbortedImmediately) {
+        // this causes double panic
+        return;
+    }
+
+    println!("Runtime {:?}, LocalSet {:?}, Task {:?}, Output {:?}, JoinInterest {:?}, JoinHandle {:?}, Abort {:?}", rt, ls, task, output, ji, jh, abort);
+
+    // A runtime optionally with a LocalSet
+    struct Rt {
+        rt: crate::runtime::Runtime,
+        ls: Option<crate::task::LocalSet>,
+    }
+    impl Rt {
+        fn new(rt: CombiRuntime, ls: CombiLocalSet) -> Self {
+            let rt = match rt {
+                CombiRuntime::CurrentThread => Builder::new_current_thread().build().unwrap(),
+                CombiRuntime::Multi1 => Builder::new_multi_thread()
+                    .worker_threads(1)
+                    .build()
+                    .unwrap(),
+                CombiRuntime::Multi2 => Builder::new_multi_thread()
+                    .worker_threads(2)
+                    .build()
+                    .unwrap(),
+            };
+
+            let ls = match ls {
+                CombiLocalSet::Yes => Some(crate::task::LocalSet::new()),
+                CombiLocalSet::No => None,
+            };
+
+            Self { rt, ls }
+        }
+        fn block_on<T>(&self, task: T) -> T::Output
+        where
+            T: Future,
+        {
+            match &self.ls {
+                Some(ls) => ls.block_on(&self.rt, task),
+                None => self.rt.block_on(task),
+            }
+        }
+        fn spawn<T>(&self, task: T) -> JoinHandle<T::Output>
+        where
+            T: Future + Send + 'static,
+            T::Output: Send + 'static,
+        {
+            match &self.ls {
+                Some(ls) => ls.spawn_local(task),
+                None => self.rt.spawn(task),
+            }
+        }
+    }
+
+    // The type used for the output of the future
+    struct Output {
+        panic_on_drop: bool,
+        on_drop: Option<oneshot::Sender<()>>,
+    }
+    impl Output {
+        fn disarm(&mut self) {
+            self.panic_on_drop = false;
+        }
+    }
+    impl Drop for Output {
+        fn drop(&mut self) {
+            let _ = self.on_drop.take().unwrap().send(());
+            if self.panic_on_drop {
+                panic!("Panicking in Output");
+            }
+        }
+    }
+
+    // A wrapper around the future that is spawned
+    struct FutWrapper<F> {
+        inner: F,
+        on_drop: Option<oneshot::Sender<()>>,
+        panic_on_drop: bool,
+    }
+    impl<F: Future> Future for FutWrapper<F> {
+        type Output = F::Output;
+        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<F::Output> {
+            unsafe {
+                let me = Pin::into_inner_unchecked(self);
+                let inner = Pin::new_unchecked(&mut me.inner);
+                inner.poll(cx)
+            }
+        }
+    }
+    impl<F> Drop for FutWrapper<F> {
+        fn drop(&mut self) {
+            let _: Result<(), ()> = self.on_drop.take().unwrap().send(());
+            if self.panic_on_drop {
+                panic!("Panicking in FutWrapper");
+            }
+        }
+    }
+
+    // The channels passed to the task
+    struct Signals {
+        on_first_poll: Option<oneshot::Sender<()>>,
+        wait_complete: Option<oneshot::Receiver<()>>,
+        on_output_drop: Option<oneshot::Sender<()>>,
+    }
+
+    // The task we will spawn
+    async fn my_task(mut signal: Signals, task: CombiTask, out: CombiOutput) -> Output {
+        // Signal that we have been polled once
+        let _ = signal.on_first_poll.take().unwrap().send(());
+
+        // Wait for a signal, then complete the future
+        let _ = signal.wait_complete.take().unwrap().await;
+
+        // If the task gets past wait_complete without yielding, then aborts
+        // may not be caught without this yield_now.
+        crate::task::yield_now().await;
+
+        if task == CombiTask::PanicOnRun || task == CombiTask::PanicOnRunAndDrop {
+            panic!("Panicking in my_task on {:?}", std::thread::current().id());
+        }
+
+        Output {
+            panic_on_drop: out == CombiOutput::PanicOnDrop,
+            on_drop: signal.on_output_drop.take(),
+        }
+    }
+
+    let rt = Rt::new(rt, ls);
+
+    let (on_first_poll, wait_first_poll) = oneshot::channel();
+    let (on_complete, wait_complete) = oneshot::channel();
+    let (on_future_drop, wait_future_drop) = oneshot::channel();
+    let (on_output_drop, wait_output_drop) = oneshot::channel();
+    let signal = Signals {
+        on_first_poll: Some(on_first_poll),
+        wait_complete: Some(wait_complete),
+        on_output_drop: Some(on_output_drop),
+    };
+
+    // === Spawn task ===
+    let mut handle = Some(rt.spawn(FutWrapper {
+        inner: my_task(signal, task, output),
+        on_drop: Some(on_future_drop),
+        panic_on_drop: task == CombiTask::PanicOnDrop || task == CombiTask::PanicOnRunAndDrop,
+    }));
+
+    // Keep track of whether the task has been killed with an abort
+    let mut aborted = false;
+
+    // If we want to poll the JoinHandle, do it now
+    if ji == CombiJoinInterest::Polled {
+        assert!(
+            handle.as_mut().unwrap().now_or_never().is_none(),
+            "Polling handle succeeded"
+        );
+    }
+
+    if abort == CombiAbort::AbortedImmediately {
+        handle.as_mut().unwrap().abort();
+        aborted = true;
+    }
+    if jh == CombiJoinHandle::DropImmediately {
+        drop(handle.take().unwrap());
+    }
+
+    // === Wait for first poll ===
+    let got_polled = rt.block_on(wait_first_poll).is_ok();
+    if !got_polled {
+        // it's possible that we are aborted but still got polled
+        assert!(
+            aborted,
+            "Task completed without ever being polled but was not aborted."
+        );
+    }
+
+    if abort == CombiAbort::AbortedFirstPoll {
+        handle.as_mut().unwrap().abort();
+        aborted = true;
+    }
+    if jh == CombiJoinHandle::DropFirstPoll {
+        drop(handle.take().unwrap());
+    }
+
+    // Signal the future that it can return now
+    let _ = on_complete.send(());
+    // === Wait for future to be dropped ===
+    assert!(
+        rt.block_on(wait_future_drop).is_ok(),
+        "The future should always be dropped."
+    );
+
+    if abort == CombiAbort::AbortedAfterFinish {
+        // Don't set aborted to true here as the task already finished
+        handle.as_mut().unwrap().abort();
+    }
+    if jh == CombiJoinHandle::DropAfterNoConsume {
+        // The runtime will usually have dropped every ref-count at this point,
+        // in which case dropping the JoinHandle drops the output.
+        //
+        // (But it might race and still hold a ref-count)
+        let panic = panic::catch_unwind(panic::AssertUnwindSafe(|| {
+            drop(handle.take().unwrap());
+        }));
+        if panic.is_err() {
+            assert!(
+                (output == CombiOutput::PanicOnDrop)
+                    && (!matches!(task, CombiTask::PanicOnRun | CombiTask::PanicOnRunAndDrop))
+                    && !aborted,
+                "Dropping JoinHandle shouldn't panic here"
+            );
+        }
+    }
+
+    // Check whether we drop after consuming the output
+    if jh == CombiJoinHandle::DropAfterConsume {
+        // Using as_mut() to not immediately drop the handle
+        let result = rt.block_on(handle.as_mut().unwrap());
+
+        match result {
+            Ok(mut output) => {
+                // Don't panic here.
+                output.disarm();
+                assert!(!aborted, "Task was aborted but returned output");
+            }
+            Err(err) if err.is_cancelled() => assert!(aborted, "Cancelled output but not aborted"),
+            Err(err) if err.is_panic() => {
+                assert!(
+                    (task == CombiTask::PanicOnRun)
+                        || (task == CombiTask::PanicOnDrop)
+                        || (task == CombiTask::PanicOnRunAndDrop)
+                        || (output == CombiOutput::PanicOnDrop),
+                    "Panic but nothing should panic"
+                );
+            }
+            _ => unreachable!(),
+        }
+
+        let handle = handle.take().unwrap();
+        if abort == CombiAbort::AbortedAfterConsumeOutput {
+            handle.abort();
+        }
+        drop(handle);
+    }
+
+    // The output should have been dropped now. Check whether the output
+    // object was created at all.
+    let output_created = rt.block_on(wait_output_drop).is_ok();
+    assert_eq!(
+        output_created,
+        (!matches!(task, CombiTask::PanicOnRun | CombiTask::PanicOnRunAndDrop)) && !aborted,
+        "Creation of output object"
+    );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/task.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/task.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/tests/task.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/tests/task.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,44 +1,191 @@
-use crate::runtime::task::{self, Schedule, Task};
-use crate::util::linked_list::LinkedList;
+use crate::runtime::blocking::NoopSchedule;
+use crate::runtime::task::{self, unowned, JoinHandle, OwnedTasks, Schedule, Task};
 use crate::util::TryLock;
 
 use std::collections::VecDeque;
+use std::future::Future;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 
+struct AssertDropHandle {
+    is_dropped: Arc<AtomicBool>,
+}
+impl AssertDropHandle {
+    #[track_caller]
+    fn assert_dropped(&self) {
+        assert!(self.is_dropped.load(Ordering::SeqCst));
+    }
+
+    #[track_caller]
+    fn assert_not_dropped(&self) {
+        assert!(!self.is_dropped.load(Ordering::SeqCst));
+    }
+}
+
+struct AssertDrop {
+    is_dropped: Arc<AtomicBool>,
+}
+impl AssertDrop {
+    fn new() -> (Self, AssertDropHandle) {
+        let shared = Arc::new(AtomicBool::new(false));
+        (
+            AssertDrop {
+                is_dropped: shared.clone(),
+            },
+            AssertDropHandle {
+                is_dropped: shared.clone(),
+            },
+        )
+    }
+}
+impl Drop for AssertDrop {
+    fn drop(&mut self) {
+        self.is_dropped.store(true, Ordering::SeqCst);
+    }
+}
+
+// A Notified does not shut down on drop, but it is dropped once the ref-count
+// hits zero.
+#[test]
+fn create_drop1() {
+    let (ad, handle) = AssertDrop::new();
+    let (notified, join) = unowned(
+        async {
+            drop(ad);
+            unreachable!()
+        },
+        NoopSchedule,
+    );
+    drop(notified);
+    handle.assert_not_dropped();
+    drop(join);
+    handle.assert_dropped();
+}
+
+#[test]
+fn create_drop2() {
+    let (ad, handle) = AssertDrop::new();
+    let (notified, join) = unowned(
+        async {
+            drop(ad);
+            unreachable!()
+        },
+        NoopSchedule,
+    );
+    drop(join);
+    handle.assert_not_dropped();
+    drop(notified);
+    handle.assert_dropped();
+}
+
+// Shutting down through Notified works
 #[test]
-fn create_drop() {
-    let _ = task::joinable::<_, Runtime>(async { unreachable!() });
+fn create_shutdown1() {
+    let (ad, handle) = AssertDrop::new();
+    let (notified, join) = unowned(
+        async {
+            drop(ad);
+            unreachable!()
+        },
+        NoopSchedule,
+    );
+    drop(join);
+    handle.assert_not_dropped();
+    notified.shutdown();
+    handle.assert_dropped();
+}
+
+#[test]
+fn create_shutdown2() {
+    let (ad, handle) = AssertDrop::new();
+    let (notified, join) = unowned(
+        async {
+            drop(ad);
+            unreachable!()
+        },
+        NoopSchedule,
+    );
+    handle.assert_not_dropped();
+    notified.shutdown();
+    handle.assert_dropped();
+    drop(join);
+}
+
+#[test]
+fn unowned_poll() {
+    let (task, _) = unowned(async {}, NoopSchedule);
+    task.run();
 }
 
 #[test]
 fn schedule() {
     with(|rt| {
-        let (task, _) = task::joinable(async {
+        rt.spawn(async {
             crate::task::yield_now().await;
         });
 
-        rt.schedule(task);
-
         assert_eq!(2, rt.tick());
+        rt.shutdown();
     })
 }
 
 #[test]
 fn shutdown() {
     with(|rt| {
-        let (task, _) = task::joinable(async {
+        rt.spawn(async {
             loop {
                 crate::task::yield_now().await;
             }
         });
 
-        rt.schedule(task);
         rt.tick_max(1);
 
         rt.shutdown();
     })
 }
 
+#[test]
+fn shutdown_immediately() {
+    with(|rt| {
+        rt.spawn(async {
+            loop {
+                crate::task::yield_now().await;
+            }
+        });
+
+        rt.shutdown();
+    })
+}
+
+#[test]
+fn spawn_during_shutdown() {
+    static DID_SPAWN: AtomicBool = AtomicBool::new(false);
+
+    struct SpawnOnDrop(Runtime);
+    impl Drop for SpawnOnDrop {
+        fn drop(&mut self) {
+            DID_SPAWN.store(true, Ordering::SeqCst);
+            self.0.spawn(async {});
+        }
+    }
+
+    with(|rt| {
+        let rt2 = rt.clone();
+        rt.spawn(async move {
+            let _spawn_on_drop = SpawnOnDrop(rt2);
+
+            loop {
+                crate::task::yield_now().await;
+            }
+        });
+
+        rt.tick_max(1);
+        rt.shutdown();
+    });
+
+    assert!(DID_SPAWN.load(Ordering::SeqCst));
+}
+
 fn with(f: impl FnOnce(Runtime)) {
     struct Reset;
 
@@ -51,10 +198,9 @@
     let _reset = Reset;
 
     let rt = Runtime(Arc::new(Inner {
-        released: task::TransferStack::new(),
+        owned: OwnedTasks::new(),
         core: TryLock::new(Core {
             queue: VecDeque::new(),
-            tasks: LinkedList::new(),
         }),
     }));
 
@@ -66,20 +212,33 @@
 struct Runtime(Arc<Inner>);
 
 struct Inner {
-    released: task::TransferStack<Runtime>,
     core: TryLock<Core>,
+    owned: OwnedTasks<Runtime>,
 }
 
 struct Core {
     queue: VecDeque<task::Notified<Runtime>>,
-    tasks: LinkedList<Task<Runtime>>,
 }
 
 static CURRENT: TryLock<Option<Runtime>> = TryLock::new(None);
 
 impl Runtime {
+    fn spawn<T>(&self, future: T) -> JoinHandle<T::Output>
+    where
+        T: 'static + Send + Future,
+        T::Output: 'static + Send,
+    {
+        let (handle, notified) = self.0.owned.bind(future, self.clone());
+
+        if let Some(notified) = notified {
+            self.schedule(notified);
+        }
+
+        handle
+    }
+
     fn tick(&self) -> usize {
-        self.tick_max(usize::max_value())
+        self.tick_max(usize::MAX)
     }
 
     fn tick_max(&self, max: usize) -> usize {
@@ -88,11 +247,10 @@
         while !self.is_empty() && n < max {
             let task = self.next_task();
             n += 1;
+            let task = self.0.owned.assert_owner(task);
             task.run();
         }
 
-        self.0.maintenance();
-
         n
     }
 
@@ -107,50 +265,21 @@
     fn shutdown(&self) {
         let mut core = self.0.core.try_lock().unwrap();
 
-        for task in core.tasks.iter() {
-            task.shutdown();
-        }
+        self.0.owned.close_and_shutdown_all();
 
         while let Some(task) = core.queue.pop_back() {
-            task.shutdown();
+            drop(task);
         }
 
         drop(core);
 
-        while !self.0.core.try_lock().unwrap().tasks.is_empty() {
-            self.0.maintenance();
-        }
-    }
-}
-
-impl Inner {
-    fn maintenance(&self) {
-        use std::mem::ManuallyDrop;
-
-        for task in self.released.drain() {
-            let task = ManuallyDrop::new(task);
-
-            // safety: see worker.rs
-            unsafe {
-                let ptr = task.header().into();
-                self.core.try_lock().unwrap().tasks.remove(ptr);
-            }
-        }
+        assert!(self.0.owned.is_empty());
     }
 }
 
 impl Schedule for Runtime {
-    fn bind(task: Task<Self>) -> Runtime {
-        let rt = CURRENT.try_lock().unwrap().as_ref().unwrap().clone();
-        rt.0.core.try_lock().unwrap().tasks.push_front(task);
-        rt
-    }
-
     fn release(&self, task: &Task<Self>) -> Option<Task<Self>> {
-        // safety: copying worker.rs
-        let task = unsafe { Task::from_raw(task.header().into()) };
-        self.0.released.push(task);
-        None
+        self.0.owned.remove(task)
     }
 
     fn schedule(&self, task: task::Notified<Self>) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/atomic_cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/atomic_cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/atomic_cell.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/atomic_cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,6 @@
         from_raw(old)
     }
 
-    #[cfg(feature = "blocking")]
     pub(super) fn set(&self, val: Box<T>) {
         let _ = self.swap(Some(val));
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/idle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/idle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/idle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/idle.rs	2021-12-09 12:01:26.000000000 +0000
@@ -42,11 +42,11 @@
     /// worker currently sleeping.
     pub(super) fn worker_to_notify(&self) -> Option<usize> {
         // If at least one worker is spinning, work being notified will
-        // eventully be found. A searching thread will find **some** work and
+        // eventually be found. A searching thread will find **some** work and
         // notify another worker, eventually leading to our work being found.
         //
         // For this to happen, this load must happen before the thread
-        // transitioning `num_searching` to zero. Acquire / Relese does not
+        // transitioning `num_searching` to zero. Acquire / Release does not
         // provide sufficient guarantees, so this load is done with `SeqCst` and
         // will pair with the `fetch_sub(1)` when transitioning out of
         // searching.
@@ -55,7 +55,7 @@
         }
 
         // Acquire the lock
-        let mut sleepers = self.sleepers.lock().unwrap();
+        let mut sleepers = self.sleepers.lock();
 
         // Check again, now that the lock is acquired
         if !self.notify_should_wakeup() {
@@ -77,7 +77,7 @@
     /// work.
     pub(super) fn transition_worker_to_parked(&self, worker: usize, is_searching: bool) -> bool {
         // Acquire the lock
-        let mut sleepers = self.sleepers.lock().unwrap();
+        let mut sleepers = self.sleepers.lock();
 
         // Decrement the number of unparked threads
         let ret = State::dec_num_unparked(&self.state, is_searching);
@@ -112,13 +112,13 @@
     /// Unpark a specific worker. This happens if tasks are submitted from
     /// within the worker's park routine.
     pub(super) fn unpark_worker_by_id(&self, worker_id: usize) {
-        let mut sleepers = self.sleepers.lock().unwrap();
+        let mut sleepers = self.sleepers.lock();
 
         for index in 0..sleepers.len() {
             if sleepers[index] == worker_id {
                 sleepers.swap_remove(index);
 
-                // Update the state accordingly whle the lock is held.
+                // Update the state accordingly while the lock is held.
                 State::unpark_one(&self.state);
 
                 return;
@@ -128,7 +128,7 @@
 
     /// Returns `true` if `worker_id` is contained in the sleep set
     pub(super) fn is_parked(&self, worker_id: usize) -> bool {
-        let sleepers = self.sleepers.lock().unwrap();
+        let sleepers = self.sleepers.lock();
         sleepers.contains(&worker_id)
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,12 +9,11 @@
 mod worker;
 pub(crate) use worker::Launch;
 
-cfg_blocking! {
-    pub(crate) use worker::block_in_place;
-}
+pub(crate) use worker::block_in_place;
 
 use crate::loom::sync::Arc;
-use crate::runtime::task::{self, JoinHandle};
+use crate::runtime::stats::RuntimeStats;
+use crate::runtime::task::JoinHandle;
 use crate::runtime::Parker;
 
 use std::fmt;
@@ -32,7 +31,7 @@
 ///
 /// The `Spawner` handle is *only* used for spawning new futures. It does not
 /// impact the lifecycle of the thread pool in any way. The thread pool may
-/// shutdown while there are outstanding `Spawner` instances.
+/// shut down while there are outstanding `Spawner` instances.
 ///
 /// `Spawner` instances are obtained by calling [`ThreadPool::spawner`].
 ///
@@ -61,15 +60,6 @@
         &self.spawner
     }
 
-    /// Spawns a task
-    pub(crate) fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
-    where
-        F: Future + Send + 'static,
-        F::Output: Send + 'static,
-    {
-        self.spawner.spawn(future)
-    }
-
     /// Blocks the current thread waiting for the future to complete.
     ///
     /// The future will execute on the current thread, but all spawned tasks
@@ -101,17 +91,19 @@
     /// Spawns a future onto the thread pool
     pub(crate) fn spawn<F>(&self, future: F) -> JoinHandle<F::Output>
     where
-        F: Future + Send + 'static,
+        F: crate::future::Future + Send + 'static,
         F::Output: Send + 'static,
     {
-        let (task, handle) = task::joinable(future);
-        self.shared.schedule(task, false);
-        handle
+        worker::Shared::bind_new_task(&self.shared, future)
     }
 
     pub(crate) fn shutdown(&mut self) {
         self.shared.close();
     }
+
+    pub(crate) fn stats(&self) -> &RuntimeStats {
+        self.shared.stats()
+    }
 }
 
 impl fmt::Debug for Spawner {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/worker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/worker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/worker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/thread_pool/worker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,16 +3,71 @@
 //! run queue and other state. When `block_in_place` is called, the worker's
 //! "core" is handed off to a new thread allowing the scheduler to continue to
 //! make progress while the originating thread blocks.
+//!
+//! # Shutdown
+//!
+//! Shutting down the runtime involves the following steps:
+//!
+//!  1. The Shared::close method is called. This closes the inject queue and
+//!     OwnedTasks instance and wakes up all worker threads.
+//!
+//!  2. Each worker thread observes the close signal next time it runs
+//!     Core::maintenance by checking whether the inject queue is closed.
+//!     The Core::is_shutdown flag is set to true.
+//!
+//!  3. The worker thread calls `pre_shutdown` in parallel. Here, the worker
+//!     will keep removing tasks from OwnedTasks until it is empty. No new
+//!     tasks can be pushed to the OwnedTasks during or after this step as it
+//!     was closed in step 1.
+//!
+//!  5. The workers call Shared::shutdown to enter the single-threaded phase of
+//!     shutdown. These calls will push their core to Shared::shutdown_cores,
+//!     and the last thread to push its core will finish the shutdown procedure.
+//!
+//!  6. The local run queue of each core is emptied, then the inject queue is
+//!     emptied.
+//!
+//! At this point, shutdown has completed. It is not possible for any of the
+//! collections to contain any tasks at this point, as each collection was
+//! closed first, then emptied afterwards.
+//!
+//! ## Spawns during shutdown
+//!
+//! When spawning tasks during shutdown, there are two cases:
+//!
+//!  * The spawner observes the OwnedTasks being open, and the inject queue is
+//!    closed.
+//!  * The spawner observes the OwnedTasks being closed and doesn't check the
+//!    inject queue.
+//!
+//! The first case can only happen if the OwnedTasks::bind call happens before
+//! or during step 1 of shutdown. In this case, the runtime will clean up the
+//! task in step 3 of shutdown.
+//!
+//! In the latter case, the task was not spawned and the task is immediately
+//! cancelled by the spawner.
+//!
+//! The correctness of shutdown requires both the inject queue and OwnedTasks
+//! collection to have a closed bit. With a close bit on only the inject queue,
+//! spawning could run in to a situation where a task is successfully bound long
+//! after the runtime has shut down. With a close bit on only the OwnedTasks,
+//! the first spawning situation could result in the notification being pushed
+//! to the inject queue after step 6 of shutdown, which would leave a task in
+//! the inject queue indefinitely. This would be a ref-count cycle and a memory
+//! leak.
 
 use crate::coop;
+use crate::future::Future;
 use crate::loom::rand::seed;
 use crate::loom::sync::{Arc, Mutex};
 use crate::park::{Park, Unpark};
 use crate::runtime;
+use crate::runtime::enter::EnterContext;
 use crate::runtime::park::{Parker, Unparker};
+use crate::runtime::stats::{RuntimeStats, WorkerStatsBatcher};
+use crate::runtime::task::{Inject, JoinHandle, OwnedTasks};
 use crate::runtime::thread_pool::{AtomicCell, Idle};
 use crate::runtime::{queue, task};
-use crate::util::linked_list::LinkedList;
 use crate::util::FastRand;
 
 use std::cell::RefCell;
@@ -43,7 +98,7 @@
     lifo_slot: Option<Notified>,
 
     /// The worker-local run queue.
-    run_queue: queue::Local<Arc<Worker>>,
+    run_queue: queue::Local<Arc<Shared>>,
 
     /// True if the worker is currently searching for more work. Searching
     /// involves attempting to steal from other workers.
@@ -52,15 +107,15 @@
     /// True if the scheduler is being shutdown
     is_shutdown: bool,
 
-    /// Tasks owned by the core
-    tasks: LinkedList<Task>,
-
     /// Parker
     ///
     /// Stored in an `Option` as the parker is added / removed to make the
     /// borrow checker happy.
     park: Option<Parker>,
 
+    /// Batching stats so they can be submitted to RuntimeStats.
+    stats: WorkerStatsBatcher,
+
     /// Fast random number generator.
     rand: FastRand,
 }
@@ -72,26 +127,29 @@
     remotes: Box<[Remote]>,
 
     /// Submit work to the scheduler while **not** currently on a worker thread.
-    inject: queue::Inject<Arc<Worker>>,
+    inject: Inject<Arc<Shared>>,
 
     /// Coordinates idle workers
     idle: Idle,
 
-    /// Workers have have observed the shutdown signal
+    /// Collection of all active tasks spawned onto this executor.
+    owned: OwnedTasks<Arc<Shared>>,
+
+    /// Cores that have observed the shutdown signal
     ///
     /// The core is **not** placed back in the worker to avoid it from being
     /// stolen by a thread that was spawned as part of `block_in_place`.
-    shutdown_workers: Mutex<Vec<(Box<Core>, Arc<Worker>)>>,
+    #[allow(clippy::vec_box)] // we're moving an already-boxed value
+    shutdown_cores: Mutex<Vec<Box<Core>>>,
+
+    /// Collect stats from the runtime.
+    stats: RuntimeStats,
 }
 
 /// Used to communicate with a worker from other threads.
 struct Remote {
     /// Steal tasks from this worker.
-    steal: queue::Steal<Arc<Worker>>,
-
-    /// Transfers tasks to be released. Any worker pushes tasks, only the owning
-    /// worker pops.
-    pending_drop: task::TransferStack<Arc<Worker>>,
+    steal: queue::Steal<Arc<Shared>>,
 
     /// Unparks the associated worker thread
     unpark: Unparker,
@@ -115,10 +173,10 @@
 type RunResult = Result<Box<Core>, ()>;
 
 /// A task handle
-type Task = task::Task<Arc<Worker>>;
+type Task = task::Task<Arc<Shared>>;
 
 /// A notified task handle
-type Notified = task::Notified<Arc<Worker>>;
+type Notified = task::Notified<Arc<Shared>>;
 
 // Tracks thread-local state
 scoped_thread_local!(static CURRENT: Context);
@@ -128,7 +186,7 @@
     let mut remotes = vec![];
 
     // Create the local queues
-    for _ in 0..size {
+    for i in 0..size {
         let (steal, run_queue) = queue::local();
 
         let park = park.clone();
@@ -140,23 +198,21 @@
             run_queue,
             is_searching: false,
             is_shutdown: false,
-            tasks: LinkedList::new(),
             park: Some(park),
+            stats: WorkerStatsBatcher::new(i),
             rand: FastRand::new(seed()),
         }));
 
-        remotes.push(Remote {
-            steal,
-            pending_drop: task::TransferStack::new(),
-            unpark,
-        });
+        remotes.push(Remote { steal, unpark });
     }
 
     let shared = Arc::new(Shared {
         remotes: remotes.into_boxed_slice(),
-        inject: queue::Inject::new(),
+        inject: Inject::new(),
         idle: Idle::new(size),
-        shutdown_workers: Mutex::new(vec![]),
+        owned: OwnedTasks::new(),
+        shutdown_cores: Mutex::new(vec![]),
+        stats: RuntimeStats::new(size),
     });
 
     let mut launch = Launch(vec![]);
@@ -172,100 +228,98 @@
     (shared, launch)
 }
 
-cfg_blocking! {
-    use crate::runtime::enter::EnterContext;
-
-    pub(crate) fn block_in_place<F, R>(f: F) -> R
-    where
-        F: FnOnce() -> R,
-    {
-        // Try to steal the worker core back
-        struct Reset(coop::Budget);
-
-        impl Drop for Reset {
-            fn drop(&mut self) {
-                CURRENT.with(|maybe_cx| {
-                    if let Some(cx) = maybe_cx {
-                        let core = cx.worker.core.take();
-                        let mut cx_core = cx.core.borrow_mut();
-                        assert!(cx_core.is_none());
-                        *cx_core = core;
-
-                        // Reset the task budget as we are re-entering the
-                        // runtime.
-                        coop::set(self.0);
-                    }
-                });
-            }
+pub(crate) fn block_in_place<F, R>(f: F) -> R
+where
+    F: FnOnce() -> R,
+{
+    // Try to steal the worker core back
+    struct Reset(coop::Budget);
+
+    impl Drop for Reset {
+        fn drop(&mut self) {
+            CURRENT.with(|maybe_cx| {
+                if let Some(cx) = maybe_cx {
+                    let core = cx.worker.core.take();
+                    let mut cx_core = cx.core.borrow_mut();
+                    assert!(cx_core.is_none());
+                    *cx_core = core;
+
+                    // Reset the task budget as we are re-entering the
+                    // runtime.
+                    coop::set(self.0);
+                }
+            });
         }
+    }
 
-        let mut had_entered = false;
+    let mut had_entered = false;
 
-        CURRENT.with(|maybe_cx| {
-            match (crate::runtime::enter::context(),  maybe_cx.is_some()) {
-                (EnterContext::Entered { .. }, true) => {
-                    // We are on a thread pool runtime thread, so we just need to set up blocking.
+    CURRENT.with(|maybe_cx| {
+        match (crate::runtime::enter::context(), maybe_cx.is_some()) {
+            (EnterContext::Entered { .. }, true) => {
+                // We are on a thread pool runtime thread, so we just need to
+                // set up blocking.
+                had_entered = true;
+            }
+            (EnterContext::Entered { allow_blocking }, false) => {
+                // We are on an executor, but _not_ on the thread pool.  That is
+                // _only_ okay if we are in a thread pool runtime's block_on
+                // method:
+                if allow_blocking {
                     had_entered = true;
-                }
-                (EnterContext::Entered { allow_blocking }, false) => {
-                    // We are on an executor, but _not_ on the thread pool.
-                    // That is _only_ okay if we are in a thread pool runtime's block_on method:
-                    if allow_blocking {
-                        had_entered = true;
-                        return;
-                    } else {
-                        // This probably means we are on the basic_scheduler or in a LocalSet,
-                        // where it is _not_ okay to block.
-                        panic!("can call blocking only when running on the multi-threaded runtime");
-                    }
-                }
-                (EnterContext::NotEntered, true) => {
-                    // This is a nested call to block_in_place (we already exited).
-                    // All the necessary setup has already been done.
-                    return;
-                }
-                (EnterContext::NotEntered, false) => {
-                    // We are outside of the tokio runtime, so blocking is fine.
-                    // We can also skip all of the thread pool blocking setup steps.
                     return;
+                } else {
+                    // This probably means we are on the basic_scheduler or in a
+                    // LocalSet, where it is _not_ okay to block.
+                    panic!("can call blocking only when running on the multi-threaded runtime");
                 }
             }
+            (EnterContext::NotEntered, true) => {
+                // This is a nested call to block_in_place (we already exited).
+                // All the necessary setup has already been done.
+                return;
+            }
+            (EnterContext::NotEntered, false) => {
+                // We are outside of the tokio runtime, so blocking is fine.
+                // We can also skip all of the thread pool blocking setup steps.
+                return;
+            }
+        }
 
-            let cx = maybe_cx.expect("no .is_some() == false cases above should lead here");
+        let cx = maybe_cx.expect("no .is_some() == false cases above should lead here");
 
-            // Get the worker core. If none is set, then blocking is fine!
-            let core = match cx.core.borrow_mut().take() {
-                Some(core) => core,
-                None => return,
-            };
-
-            // The parker should be set here
-            assert!(core.park.is_some());
-
-            // In order to block, the core must be sent to another thread for
-            // execution.
-            //
-            // First, move the core back into the worker's shared core slot.
-            cx.worker.core.set(core);
-
-            // Next, clone the worker handle and send it to a new thread for
-            // processing.
-            //
-            // Once the blocking task is done executing, we will attempt to
-            // steal the core back.
-            let worker = cx.worker.clone();
-            runtime::spawn_blocking(move || run(worker));
-        });
+        // Get the worker core. If none is set, then blocking is fine!
+        let core = match cx.core.borrow_mut().take() {
+            Some(core) => core,
+            None => return,
+        };
 
-        if had_entered {
-            // Unset the current task's budget. Blocking sections are not
-            // constrained by task budgets.
-            let _reset = Reset(coop::stop());
+        // The parker should be set here
+        assert!(core.park.is_some());
 
-            crate::runtime::enter::exit(f)
-        } else {
-            f()
-        }
+        // In order to block, the core must be sent to another thread for
+        // execution.
+        //
+        // First, move the core back into the worker's shared core slot.
+        cx.worker.core.set(core);
+
+        // Next, clone the worker handle and send it to a new thread for
+        // processing.
+        //
+        // Once the blocking task is done executing, we will attempt to
+        // steal the core back.
+        let worker = cx.worker.clone();
+        runtime::spawn_blocking(move || run(worker));
+    });
+
+    if had_entered {
+        // Unset the current task's budget. Blocking sections are not
+        // constrained by task budgets.
+        let _reset = Reset(coop::stop());
+
+        crate::runtime::enter::exit(f)
+    } else {
+        f()
     }
 }
 
@@ -331,17 +385,22 @@
             }
         }
 
+        core.pre_shutdown(&self.worker);
+
         // Signal shutdown
-        self.worker.shared.shutdown(core, self.worker.clone());
+        self.worker.shared.shutdown(core);
         Err(())
     }
 
     fn run_task(&self, task: Notified, mut core: Box<Core>) -> RunResult {
-        // Make sure thew orker is not in the **searching** state. This enables
+        let task = self.worker.shared.owned.assert_owner(task);
+
+        // Make sure the worker is not in the **searching** state. This enables
         // another idle worker to try to steal work.
         core.transition_from_searching(&self.worker);
 
         // Make the core available to the runtime context
+        core.stats.incr_poll_count();
         *self.core.borrow_mut() = Some(core);
 
         // Run the task
@@ -366,7 +425,9 @@
 
                 if coop::has_budget_remaining() {
                     // Run the LIFO task, then loop
+                    core.stats.incr_poll_count();
                     *self.core.borrow_mut() = Some(core);
+                    let task = self.worker.shared.owned.assert_owner(task);
                     task.run();
                 } else {
                     // Not enough budget left to run the LIFO task, push it to
@@ -412,6 +473,8 @@
         // Take the parker out of core
         let mut park = core.park.take().expect("park missing");
 
+        core.stats.about_to_park();
+
         // Store `core` in context
         *self.core.borrow_mut() = Some(core);
 
@@ -433,6 +496,8 @@
             self.worker.shared.notify_parked();
         }
 
+        core.stats.returned_from_park();
+
         core
     }
 }
@@ -474,7 +539,10 @@
             }
 
             let target = &worker.shared.remotes[i];
-            if let Some(task) = target.steal.steal_into(&mut self.run_queue) {
+            if let Some(task) = target
+                .steal
+                .steal_into(&mut self.run_queue, &mut self.stats)
+            {
                 return Some(task);
             }
         }
@@ -538,10 +606,9 @@
         true
     }
 
-    /// Runs maintenance work such as free pending tasks and check the pool's
-    /// state.
+    /// Runs maintenance work such as checking the pool's state.
     fn maintenance(&mut self, worker: &Worker) {
-        self.drain_pending_drop(worker);
+        self.stats.submit(&worker.shared.stats);
 
         if !self.is_shutdown {
             // Check if the scheduler has been shutdown
@@ -549,147 +616,67 @@
         }
     }
 
-    // Shutdown the core
-    fn shutdown(&mut self, worker: &Worker) {
-        // Take the core
-        let mut park = self.park.take().expect("park missing");
-
+    /// Signals all tasks to shut down, and waits for them to complete. Must run
+    /// before we enter the single-threaded phase of shutdown processing.
+    fn pre_shutdown(&mut self, worker: &Worker) {
         // Signal to all tasks to shut down.
-        for header in self.tasks.iter() {
-            header.shutdown();
-        }
-
-        loop {
-            self.drain_pending_drop(worker);
+        worker.shared.owned.close_and_shutdown_all();
 
-            if self.tasks.is_empty() {
-                break;
-            }
+        self.stats.submit(&worker.shared.stats);
+    }
 
-            // Wait until signalled
-            park.park().expect("park failed");
-        }
+    /// Shutdown the core
+    fn shutdown(&mut self) {
+        // Take the core
+        let mut park = self.park.take().expect("park missing");
 
         // Drain the queue
         while self.next_local_task().is_some() {}
 
         park.shutdown();
     }
-
-    fn drain_pending_drop(&mut self, worker: &Worker) {
-        use std::mem::ManuallyDrop;
-
-        for task in worker.remote().pending_drop.drain() {
-            let task = ManuallyDrop::new(task);
-
-            // safety: tasks are only pushed into the `pending_drop` stacks that
-            // are associated with the list they are inserted into. When a task
-            // is pushed into `pending_drop`, the ref-inc is skipped, so we must
-            // not ref-dec here.
-            //
-            // See `bind` and `release` implementations.
-            unsafe {
-                self.tasks.remove(task.header().into());
-            }
-        }
-    }
 }
 
 impl Worker {
     /// Returns a reference to the scheduler's injection queue
-    fn inject(&self) -> &queue::Inject<Arc<Worker>> {
+    fn inject(&self) -> &Inject<Arc<Shared>> {
         &self.shared.inject
     }
-
-    /// Return a reference to this worker's remote data
-    fn remote(&self) -> &Remote {
-        &self.shared.remotes[self.index]
-    }
-
-    fn eq(&self, other: &Worker) -> bool {
-        self.shared.ptr_eq(&other.shared) && self.index == other.index
-    }
 }
 
-impl task::Schedule for Arc<Worker> {
-    fn bind(task: Task) -> Arc<Worker> {
-        CURRENT.with(|maybe_cx| {
-            let cx = maybe_cx.expect("scheduler context missing");
-
-            // Track the task
-            cx.core
-                .borrow_mut()
-                .as_mut()
-                .expect("scheduler core missing")
-                .tasks
-                .push_front(task);
-
-            // Return a clone of the worker
-            cx.worker.clone()
-        })
-    }
-
+impl task::Schedule for Arc<Shared> {
     fn release(&self, task: &Task) -> Option<Task> {
-        use std::ptr::NonNull;
-
-        CURRENT.with(|maybe_cx| {
-            let cx = maybe_cx.expect("scheduler context missing");
-
-            if self.eq(&cx.worker) {
-                let mut maybe_core = cx.core.borrow_mut();
-
-                if let Some(core) = &mut *maybe_core {
-                    // Directly remove the task
-                    //
-                    // safety: the task is inserted in the list in `bind`.
-                    unsafe {
-                        let ptr = NonNull::from(task.header());
-                        return core.tasks.remove(ptr);
-                    }
-                }
-            }
-
-            // Track the task to be released by the worker that owns it
-            //
-            // Safety: We get a new handle without incrementing the ref-count.
-            // A ref-count is held by the "owned" linked list and it is only
-            // ever removed from that list as part of the release process: this
-            // method or popping the task from `pending_drop`. Thus, we can rely
-            // on the ref-count held by the linked-list to keep the memory
-            // alive.
-            //
-            // When the task is removed from the stack, it is forgotten instead
-            // of dropped.
-            let task = unsafe { Task::from_raw(task.header().into()) };
-
-            self.remote().pending_drop.push(task);
-
-            if cx.core.borrow().is_some() {
-                return None;
-            }
-
-            // The worker core has been handed off to another thread. In the
-            // event that the scheduler is currently shutting down, the thread
-            // that owns the task may be waiting on the release to complete
-            // shutdown.
-            if self.inject().is_closed() {
-                self.remote().unpark.unpark();
-            }
-
-            None
-        })
+        self.owned.remove(task)
     }
 
     fn schedule(&self, task: Notified) {
-        self.shared.schedule(task, false);
+        (**self).schedule(task, false);
     }
 
     fn yield_now(&self, task: Notified) {
-        self.shared.schedule(task, true);
+        (**self).schedule(task, true);
     }
 }
 
 impl Shared {
+    pub(super) fn bind_new_task<T>(me: &Arc<Self>, future: T) -> JoinHandle<T::Output>
+    where
+        T: Future + Send + 'static,
+        T::Output: Send + 'static,
+    {
+        let (handle, notified) = me.owned.bind(future, me.clone());
+
+        if let Some(notified) = notified {
+            me.schedule(notified, false);
+        }
+
+        handle
+    }
+
+    pub(crate) fn stats(&self) -> &RuntimeStats {
+        &self.stats
+    }
+
     pub(super) fn schedule(&self, task: Notified, is_yield: bool) {
         CURRENT.with(|maybe_cx| {
             if let Some(cx) = maybe_cx {
@@ -703,10 +690,10 @@
                 }
             }
 
-            // Otherwise, use the inject queue
+            // Otherwise, use the inject queue.
             self.inject.push(task);
             self.notify_parked();
-        });
+        })
     }
 
     fn schedule_local(&self, core: &mut Core, task: Notified, is_yield: bool) {
@@ -782,23 +769,29 @@
     /// its core back into its handle.
     ///
     /// If all workers have reached this point, the final cleanup is performed.
-    fn shutdown(&self, core: Box<Core>, worker: Arc<Worker>) {
-        let mut workers = self.shutdown_workers.lock().unwrap();
-        workers.push((core, worker));
+    fn shutdown(&self, core: Box<Core>) {
+        let mut cores = self.shutdown_cores.lock();
+        cores.push(core);
 
-        if workers.len() != self.remotes.len() {
+        if cores.len() != self.remotes.len() {
             return;
         }
 
-        for (mut core, worker) in workers.drain(..) {
-            core.shutdown(&worker);
+        debug_assert!(self.owned.is_empty());
+
+        for mut core in cores.drain(..) {
+            core.shutdown();
         }
 
         // Drain the injection queue
-        while self.inject.pop().is_some() {}
+        //
+        // We already shut down every task, so we can simply drop the tasks.
+        while let Some(task) = self.inject.pop() {
+            drop(task);
+        }
     }
 
     fn ptr_eq(&self, other: &Shared) -> bool {
-        self as *const _ == other as *const _
+        std::ptr::eq(self, other)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/time.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/time.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/runtime/time.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/runtime/time.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-//! Abstracts out the APIs necessary to `Runtime` for integrating the time
-//! driver. When the `time` feature flag is **not** enabled. These APIs are
-//! shells. This isolates the complexity of dealing with conditional
-//! compilation.
-
-pub(crate) use variant::*;
-
-#[cfg(feature = "time")]
-mod variant {
-    use crate::park::Either;
-    use crate::runtime::io;
-    use crate::time::{self, driver};
-
-    pub(crate) type Clock = time::Clock;
-    pub(crate) type Driver = Either<driver::Driver<io::Driver>, io::Driver>;
-    pub(crate) type Handle = Option<driver::Handle>;
-
-    pub(crate) fn create_clock() -> Clock {
-        Clock::new()
-    }
-
-    /// Create a new timer driver / handle pair
-    pub(crate) fn create_driver(
-        enable: bool,
-        io_driver: io::Driver,
-        clock: Clock,
-    ) -> (Driver, Handle) {
-        if enable {
-            let driver = driver::Driver::new(io_driver, clock);
-            let handle = driver.handle();
-
-            (Either::A(driver), Some(handle))
-        } else {
-            (Either::B(io_driver), None)
-        }
-    }
-}
-
-#[cfg(not(feature = "time"))]
-mod variant {
-    use crate::runtime::io;
-
-    pub(crate) type Clock = ();
-    pub(crate) type Driver = io::Driver;
-    pub(crate) type Handle = ();
-
-    pub(crate) fn create_clock() -> Clock {
-        ()
-    }
-
-    /// Create a new timer driver / handle pair
-    pub(crate) fn create_driver(
-        _enable: bool,
-        io_driver: io::Driver,
-        _clock: Clock,
-    ) -> (Driver, Handle) {
-        (io_driver, ())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
 //! signal handling, but it should be evaluated for your own applications' needs
 //! to see if it's suitable.
 //!
-//! The are some fundamental limitations of this crate documented on the OS
+//! There are some fundamental limitations of this crate documented on the OS
 //! specific structures, as well.
 //!
 //! # Examples
@@ -42,6 +42,8 @@
 //! }
 //! # }
 //! ```
+use crate::sync::watch::Receiver;
+use std::task::{Context, Poll};
 
 mod ctrl_c;
 pub use ctrl_c::ctrl_c;
@@ -58,3 +60,41 @@
 
 pub mod unix;
 pub mod windows;
+
+mod reusable_box;
+use self::reusable_box::ReusableBoxFuture;
+
+#[derive(Debug)]
+struct RxFuture {
+    inner: ReusableBoxFuture<Receiver<()>>,
+}
+
+async fn make_future(mut rx: Receiver<()>) -> Receiver<()> {
+    match rx.changed().await {
+        Ok(()) => rx,
+        Err(_) => panic!("signal sender went away"),
+    }
+}
+
+impl RxFuture {
+    fn new(rx: Receiver<()>) -> Self {
+        Self {
+            inner: ReusableBoxFuture::new(make_future(rx)),
+        }
+    }
+
+    async fn recv(&mut self) -> Option<()> {
+        use crate::future::poll_fn;
+        poll_fn(|cx| self.poll_recv(cx)).await
+    }
+
+    fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>> {
+        match self.inner.poll(cx) {
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(rx) => {
+                self.inner.set(make_future(rx));
+                Poll::Ready(Some(()))
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/registry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/registry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/registry.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/registry.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,22 +2,32 @@
 
 use crate::signal::os::{OsExtraData, OsStorage};
 
-use crate::sync::mpsc::Sender;
+use crate::sync::watch;
 
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use std::ops;
 use std::pin::Pin;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Mutex;
 
 pub(crate) type EventId = usize;
 
 /// State for a specific event, whether a notification is pending delivery,
 /// and what listeners are registered.
-#[derive(Default, Debug)]
+#[derive(Debug)]
 pub(crate) struct EventInfo {
     pending: AtomicBool,
-    recipients: Mutex<Vec<Sender<()>>>,
+    tx: watch::Sender<()>,
+}
+
+impl Default for EventInfo {
+    fn default() -> Self {
+        let (tx, _rx) = watch::channel(());
+
+        Self {
+            pending: AtomicBool::new(false),
+            tx,
+        }
+    }
 }
 
 /// An interface for retrieving the `EventInfo` for a particular eventId.
@@ -67,14 +77,12 @@
 
 impl<S: Storage> Registry<S> {
     /// Registers a new listener for `event_id`.
-    fn register_listener(&self, event_id: EventId, listener: Sender<()>) {
+    fn register_listener(&self, event_id: EventId) -> watch::Receiver<()> {
         self.storage
             .event_info(event_id)
             .unwrap_or_else(|| panic!("invalid event_id: {}", event_id))
-            .recipients
-            .lock()
-            .unwrap()
-            .push(listener);
+            .tx
+            .subscribe()
     }
 
     /// Marks `event_id` as having been delivered, without broadcasting it to
@@ -89,8 +97,6 @@
     ///
     /// Returns `true` if an event was delivered to at least one listener.
     fn broadcast(&self) -> bool {
-        use crate::sync::mpsc::error::TrySendError;
-
         let mut did_notify = false;
         self.storage.for_each(|event_info| {
             // Any signal of this kind arrived since we checked last?
@@ -98,23 +104,9 @@
                 return;
             }
 
-            let mut recipients = event_info.recipients.lock().unwrap();
-
-            // Notify all waiters on this signal that the signal has been
-            // received. If we can't push a message into the queue then we don't
-            // worry about it as everything is coalesced anyway. If the channel
-            // has gone away then we can remove that slot.
-            for i in (0..recipients.len()).rev() {
-                match recipients[i].try_send(()) {
-                    Ok(()) => did_notify = true,
-                    Err(TrySendError::Closed(..)) => {
-                        recipients.swap_remove(i);
-                    }
-
-                    // Channel is full, ignore the error since the
-                    // receiver has already been woken up
-                    Err(_) => {}
-                }
+            // Ignore errors if there are no listeners
+            if event_info.tx.send(()).is_ok() {
+                did_notify = true;
             }
         });
 
@@ -137,8 +129,8 @@
 
 impl Globals {
     /// Registers a new listener for `event_id`.
-    pub(crate) fn register_listener(&self, event_id: EventId, listener: Sender<()>) {
-        self.registry.register_listener(event_id, listener);
+    pub(crate) fn register_listener(&self, event_id: EventId) -> watch::Receiver<()> {
+        self.registry.register_listener(event_id)
     }
 
     /// Marks `event_id` as having been delivered, without broadcasting it to
@@ -165,12 +157,12 @@
     OsExtraData: 'static + Send + Sync + Init,
     OsStorage: 'static + Send + Sync + Init,
 {
-    lazy_static! {
-        static ref GLOBALS: Pin<Box<Globals>> = Box::pin(Globals {
+    static GLOBALS: Lazy<Pin<Box<Globals>>> = Lazy::new(|| {
+        Box::pin(Globals {
             extra: OsExtraData::init(),
             registry: Registry::new(OsStorage::init()),
-        });
-    }
+        })
+    });
 
     GLOBALS.as_ref()
 }
@@ -179,13 +171,13 @@
 mod tests {
     use super::*;
     use crate::runtime::{self, Runtime};
-    use crate::sync::{mpsc, oneshot};
+    use crate::sync::{oneshot, watch};
 
     use futures::future;
 
     #[test]
     fn smoke() {
-        let mut rt = rt();
+        let rt = rt();
         rt.block_on(async move {
             let registry = Registry::new(vec![
                 EventInfo::default(),
@@ -193,13 +185,9 @@
                 EventInfo::default(),
             ]);
 
-            let (first_tx, first_rx) = mpsc::channel(3);
-            let (second_tx, second_rx) = mpsc::channel(3);
-            let (third_tx, third_rx) = mpsc::channel(3);
-
-            registry.register_listener(0, first_tx);
-            registry.register_listener(1, second_tx);
-            registry.register_listener(2, third_tx);
+            let first = registry.register_listener(0);
+            let second = registry.register_listener(1);
+            let third = registry.register_listener(2);
 
             let (fire, wait) = oneshot::channel();
 
@@ -213,6 +201,9 @@
                 registry.record_event(1);
                 registry.broadcast();
 
+                // Yield so the previous broadcast can get received
+                crate::time::sleep(std::time::Duration::from_millis(10)).await;
+
                 // Send subsequent signal
                 registry.record_event(0);
                 registry.broadcast();
@@ -221,7 +212,7 @@
             });
 
             let _ = fire.send(());
-            let all = future::join3(collect(first_rx), collect(second_rx), collect(third_rx));
+            let all = future::join3(collect(first), collect(second), collect(third));
 
             let (first_results, second_results, third_results) = all.await;
             assert_eq!(2, first_results.len());
@@ -235,8 +226,7 @@
     fn register_panics_on_invalid_input() {
         let registry = Registry::new(vec![EventInfo::default()]);
 
-        let (tx, _) = mpsc::channel(1);
-        registry.register_listener(1, tx);
+        registry.register_listener(1);
     }
 
     #[test]
@@ -246,73 +236,36 @@
     }
 
     #[test]
-    fn broadcast_cleans_up_disconnected_listeners() {
-        let mut rt = Runtime::new().unwrap();
-
-        rt.block_on(async {
-            let registry = Registry::new(vec![EventInfo::default()]);
-
-            let (first_tx, first_rx) = mpsc::channel(1);
-            let (second_tx, second_rx) = mpsc::channel(1);
-            let (third_tx, third_rx) = mpsc::channel(1);
-
-            registry.register_listener(0, first_tx);
-            registry.register_listener(0, second_tx);
-            registry.register_listener(0, third_tx);
-
-            drop(first_rx);
-            drop(second_rx);
-
-            let (fire, wait) = oneshot::channel();
-
-            crate::spawn(async {
-                wait.await.expect("wait failed");
-
-                registry.record_event(0);
-                registry.broadcast();
-
-                assert_eq!(1, registry.storage[0].recipients.lock().unwrap().len());
-                drop(registry);
-            });
-
-            let _ = fire.send(());
-            let results = collect(third_rx).await;
-
-            assert_eq!(1, results.len());
-        });
-    }
-
-    #[test]
     fn broadcast_returns_if_at_least_one_event_fired() {
-        let registry = Registry::new(vec![EventInfo::default()]);
+        let registry = Registry::new(vec![EventInfo::default(), EventInfo::default()]);
 
         registry.record_event(0);
-        assert_eq!(false, registry.broadcast());
+        assert!(!registry.broadcast());
 
-        let (first_tx, first_rx) = mpsc::channel(1);
-        let (second_tx, second_rx) = mpsc::channel(1);
-
-        registry.register_listener(0, first_tx);
-        registry.register_listener(0, second_tx);
+        let first = registry.register_listener(0);
+        let second = registry.register_listener(1);
 
         registry.record_event(0);
-        assert_eq!(true, registry.broadcast());
+        assert!(registry.broadcast());
 
-        drop(first_rx);
+        drop(first);
         registry.record_event(0);
-        assert_eq!(false, registry.broadcast());
+        assert!(!registry.broadcast());
 
-        drop(second_rx);
+        drop(second);
     }
 
     fn rt() -> Runtime {
-        runtime::Builder::new().basic_scheduler().build().unwrap()
+        runtime::Builder::new_current_thread()
+            .enable_time()
+            .build()
+            .unwrap()
     }
 
-    async fn collect(mut rx: crate::sync::mpsc::Receiver<()>) -> Vec<()> {
+    async fn collect(mut rx: watch::Receiver<()>) -> Vec<()> {
         let mut ret = vec![];
 
-        while let Some(v) = rx.recv().await {
+        while let Ok(v) = rx.changed().await {
             ret.push(v);
         }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/reusable_box.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/reusable_box.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/reusable_box.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/reusable_box.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,227 @@
+use std::alloc::Layout;
+use std::future::Future;
+use std::panic::AssertUnwindSafe;
+use std::pin::Pin;
+use std::ptr::{self, NonNull};
+use std::task::{Context, Poll};
+use std::{fmt, panic};
+
+/// A reusable `Pin<Box<dyn Future<Output = T> + Send>>`.
+///
+/// This type lets you replace the future stored in the box without
+/// reallocating when the size and alignment permits this.
+pub(crate) struct ReusableBoxFuture<T> {
+    boxed: NonNull<dyn Future<Output = T> + Send>,
+}
+
+impl<T> ReusableBoxFuture<T> {
+    /// Create a new `ReusableBoxFuture<T>` containing the provided future.
+    pub(crate) fn new<F>(future: F) -> Self
+    where
+        F: Future<Output = T> + Send + 'static,
+    {
+        let boxed: Box<dyn Future<Output = T> + Send> = Box::new(future);
+
+        let boxed = Box::into_raw(boxed);
+
+        // SAFETY: Box::into_raw does not return null pointers.
+        let boxed = unsafe { NonNull::new_unchecked(boxed) };
+
+        Self { boxed }
+    }
+
+    /// Replace the future currently stored in this box.
+    ///
+    /// This reallocates if and only if the layout of the provided future is
+    /// different from the layout of the currently stored future.
+    pub(crate) fn set<F>(&mut self, future: F)
+    where
+        F: Future<Output = T> + Send + 'static,
+    {
+        if let Err(future) = self.try_set(future) {
+            *self = Self::new(future);
+        }
+    }
+
+    /// Replace the future currently stored in this box.
+    ///
+    /// This function never reallocates, but returns an error if the provided
+    /// future has a different size or alignment from the currently stored
+    /// future.
+    pub(crate) fn try_set<F>(&mut self, future: F) -> Result<(), F>
+    where
+        F: Future<Output = T> + Send + 'static,
+    {
+        // SAFETY: The pointer is not dangling.
+        let self_layout = {
+            let dyn_future: &(dyn Future<Output = T> + Send) = unsafe { self.boxed.as_ref() };
+            Layout::for_value(dyn_future)
+        };
+
+        if Layout::new::<F>() == self_layout {
+            // SAFETY: We just checked that the layout of F is correct.
+            unsafe {
+                self.set_same_layout(future);
+            }
+
+            Ok(())
+        } else {
+            Err(future)
+        }
+    }
+
+    /// Set the current future.
+    ///
+    /// # Safety
+    ///
+    /// This function requires that the layout of the provided future is the
+    /// same as `self.layout`.
+    unsafe fn set_same_layout<F>(&mut self, future: F)
+    where
+        F: Future<Output = T> + Send + 'static,
+    {
+        // Drop the existing future, catching any panics.
+        let result = panic::catch_unwind(AssertUnwindSafe(|| {
+            ptr::drop_in_place(self.boxed.as_ptr());
+        }));
+
+        // Overwrite the future behind the pointer. This is safe because the
+        // allocation was allocated with the same size and alignment as the type F.
+        let self_ptr: *mut F = self.boxed.as_ptr() as *mut F;
+        ptr::write(self_ptr, future);
+
+        // Update the vtable of self.boxed. The pointer is not null because we
+        // just got it from self.boxed, which is not null.
+        self.boxed = NonNull::new_unchecked(self_ptr);
+
+        // If the old future's destructor panicked, resume unwinding.
+        match result {
+            Ok(()) => {}
+            Err(payload) => {
+                panic::resume_unwind(payload);
+            }
+        }
+    }
+
+    /// Get a pinned reference to the underlying future.
+    pub(crate) fn get_pin(&mut self) -> Pin<&mut (dyn Future<Output = T> + Send)> {
+        // SAFETY: The user of this box cannot move the box, and we do not move it
+        // either.
+        unsafe { Pin::new_unchecked(self.boxed.as_mut()) }
+    }
+
+    /// Poll the future stored inside this box.
+    pub(crate) fn poll(&mut self, cx: &mut Context<'_>) -> Poll<T> {
+        self.get_pin().poll(cx)
+    }
+}
+
+impl<T> Future for ReusableBoxFuture<T> {
+    type Output = T;
+
+    /// Poll the future stored inside this box.
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<T> {
+        Pin::into_inner(self).get_pin().poll(cx)
+    }
+}
+
+// The future stored inside ReusableBoxFuture<T> must be Send.
+unsafe impl<T> Send for ReusableBoxFuture<T> {}
+
+// The only method called on self.boxed is poll, which takes &mut self, so this
+// struct being Sync does not permit any invalid access to the Future, even if
+// the future is not Sync.
+unsafe impl<T> Sync for ReusableBoxFuture<T> {}
+
+// Just like a Pin<Box<dyn Future>> is always Unpin, so is this type.
+impl<T> Unpin for ReusableBoxFuture<T> {}
+
+impl<T> Drop for ReusableBoxFuture<T> {
+    fn drop(&mut self) {
+        unsafe {
+            drop(Box::from_raw(self.boxed.as_ptr()));
+        }
+    }
+}
+
+impl<T> fmt::Debug for ReusableBoxFuture<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ReusableBoxFuture").finish()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::ReusableBoxFuture;
+    use futures::future::FutureExt;
+    use std::alloc::Layout;
+    use std::future::Future;
+    use std::pin::Pin;
+    use std::task::{Context, Poll};
+
+    #[test]
+    fn test_different_futures() {
+        let fut = async move { 10 };
+        // Not zero sized!
+        assert_eq!(Layout::for_value(&fut).size(), 1);
+
+        let mut b = ReusableBoxFuture::new(fut);
+
+        assert_eq!(b.get_pin().now_or_never(), Some(10));
+
+        b.try_set(async move { 20 })
+            .unwrap_or_else(|_| panic!("incorrect size"));
+
+        assert_eq!(b.get_pin().now_or_never(), Some(20));
+
+        b.try_set(async move { 30 })
+            .unwrap_or_else(|_| panic!("incorrect size"));
+
+        assert_eq!(b.get_pin().now_or_never(), Some(30));
+    }
+
+    #[test]
+    fn test_different_sizes() {
+        let fut1 = async move { 10 };
+        let val = [0u32; 1000];
+        let fut2 = async move { val[0] };
+        let fut3 = ZeroSizedFuture {};
+
+        assert_eq!(Layout::for_value(&fut1).size(), 1);
+        assert_eq!(Layout::for_value(&fut2).size(), 4004);
+        assert_eq!(Layout::for_value(&fut3).size(), 0);
+
+        let mut b = ReusableBoxFuture::new(fut1);
+        assert_eq!(b.get_pin().now_or_never(), Some(10));
+        b.set(fut2);
+        assert_eq!(b.get_pin().now_or_never(), Some(0));
+        b.set(fut3);
+        assert_eq!(b.get_pin().now_or_never(), Some(5));
+    }
+
+    struct ZeroSizedFuture {}
+    impl Future for ZeroSizedFuture {
+        type Output = u32;
+        fn poll(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<u32> {
+            Poll::Ready(5)
+        }
+    }
+
+    #[test]
+    fn test_zero_sized() {
+        let fut = ZeroSizedFuture {};
+        // Zero sized!
+        assert_eq!(Layout::for_value(&fut).size(), 0);
+
+        let mut b = ReusableBoxFuture::new(fut);
+
+        assert_eq!(b.get_pin().now_or_never(), Some(5));
+        assert_eq!(b.get_pin().now_or_never(), Some(5));
+
+        b.try_set(ZeroSizedFuture {})
+            .unwrap_or_else(|_| panic!("incorrect size"));
+
+        assert_eq!(b.get_pin().now_or_never(), Some(5));
+        assert_eq!(b.get_pin().now_or_never(), Some(5));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/unix/driver.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/unix/driver.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/unix/driver.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/unix/driver.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,207 @@
+#![cfg_attr(not(feature = "rt"), allow(dead_code))]
+
+//! Signal driver
+
+use crate::io::driver::{Driver as IoDriver, Interest};
+use crate::io::PollEvented;
+use crate::park::Park;
+use crate::signal::registry::globals;
+
+use mio::net::UnixStream;
+use std::io::{self, Read};
+use std::ptr;
+use std::sync::{Arc, Weak};
+use std::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};
+use std::time::Duration;
+
+/// Responsible for registering wakeups when an OS signal is received, and
+/// subsequently dispatching notifications to any signal listeners as appropriate.
+///
+/// Note: this driver relies on having an enabled IO driver in order to listen to
+/// pipe write wakeups.
+#[derive(Debug)]
+pub(crate) struct Driver {
+    /// Thread parker. The `Driver` park implementation delegates to this.
+    park: IoDriver,
+
+    /// A pipe for receiving wake events from the signal handler
+    receiver: PollEvented<UnixStream>,
+
+    /// Shared state
+    inner: Arc<Inner>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub(crate) struct Handle {
+    inner: Weak<Inner>,
+}
+
+#[derive(Debug)]
+pub(super) struct Inner(());
+
+// ===== impl Driver =====
+
+impl Driver {
+    /// Creates a new signal `Driver` instance that delegates wakeups to `park`.
+    pub(crate) fn new(park: IoDriver) -> io::Result<Self> {
+        use std::mem::ManuallyDrop;
+        use std::os::unix::io::{AsRawFd, FromRawFd};
+
+        // NB: We give each driver a "fresh" receiver file descriptor to avoid
+        // the issues described in alexcrichton/tokio-process#42.
+        //
+        // In the past we would reuse the actual receiver file descriptor and
+        // swallow any errors around double registration of the same descriptor.
+        // I'm not sure if the second (failed) registration simply doesn't end
+        // up receiving wake up notifications, or there could be some race
+        // condition when consuming readiness events, but having distinct
+        // descriptors for distinct PollEvented instances appears to mitigate
+        // this.
+        //
+        // Unfortunately we cannot just use a single global PollEvented instance
+        // either, since we can't compare Handles or assume they will always
+        // point to the exact same reactor.
+        //
+        // Mio 0.7 removed `try_clone()` as an API due to unexpected behavior
+        // with registering dups with the same reactor. In this case, duping is
+        // safe as each dup is registered with separate reactors **and** we
+        // only expect at least one dup to receive the notification.
+
+        // Manually drop as we don't actually own this instance of UnixStream.
+        let receiver_fd = globals().receiver.as_raw_fd();
+
+        // safety: there is nothing unsafe about this, but the `from_raw_fd` fn is marked as unsafe.
+        let original =
+            ManuallyDrop::new(unsafe { std::os::unix::net::UnixStream::from_raw_fd(receiver_fd) });
+        let receiver = UnixStream::from_std(original.try_clone()?);
+        let receiver = PollEvented::new_with_interest_and_handle(
+            receiver,
+            Interest::READABLE | Interest::WRITABLE,
+            park.handle(),
+        )?;
+
+        Ok(Self {
+            park,
+            receiver,
+            inner: Arc::new(Inner(())),
+        })
+    }
+
+    /// Returns a handle to this event loop which can be sent across threads
+    /// and can be used as a proxy to the event loop itself.
+    pub(crate) fn handle(&self) -> Handle {
+        Handle {
+            inner: Arc::downgrade(&self.inner),
+        }
+    }
+
+    fn process(&self) {
+        // Check if the pipe is ready to read and therefore has "woken" us up
+        //
+        // To do so, we will `poll_read_ready` with a noop waker, since we don't
+        // need to actually be notified when read ready...
+        let waker = unsafe { Waker::from_raw(RawWaker::new(ptr::null(), &NOOP_WAKER_VTABLE)) };
+        let mut cx = Context::from_waker(&waker);
+
+        let ev = match self.receiver.registration().poll_read_ready(&mut cx) {
+            Poll::Ready(Ok(ev)) => ev,
+            Poll::Ready(Err(e)) => panic!("reactor gone: {}", e),
+            Poll::Pending => return, // No wake has arrived, bail
+        };
+
+        // Drain the pipe completely so we can receive a new readiness event
+        // if another signal has come in.
+        let mut buf = [0; 128];
+        loop {
+            match (&*self.receiver).read(&mut buf) {
+                Ok(0) => panic!("EOF on self-pipe"),
+                Ok(_) => continue, // Keep reading
+                Err(e) if e.kind() == io::ErrorKind::WouldBlock => break,
+                Err(e) => panic!("Bad read on self-pipe: {}", e),
+            }
+        }
+
+        self.receiver.registration().clear_readiness(ev);
+
+        // Broadcast any signals which were received
+        globals().broadcast();
+    }
+}
+
+const NOOP_WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(noop_clone, noop, noop, noop);
+
+unsafe fn noop_clone(_data: *const ()) -> RawWaker {
+    RawWaker::new(ptr::null(), &NOOP_WAKER_VTABLE)
+}
+
+unsafe fn noop(_data: *const ()) {}
+
+// ===== impl Park for Driver =====
+
+impl Park for Driver {
+    type Unpark = <IoDriver as Park>::Unpark;
+    type Error = io::Error;
+
+    fn unpark(&self) -> Self::Unpark {
+        self.park.unpark()
+    }
+
+    fn park(&mut self) -> Result<(), Self::Error> {
+        self.park.park()?;
+        self.process();
+        Ok(())
+    }
+
+    fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
+        self.park.park_timeout(duration)?;
+        self.process();
+        Ok(())
+    }
+
+    fn shutdown(&mut self) {
+        self.park.shutdown()
+    }
+}
+
+// ===== impl Handle =====
+
+impl Handle {
+    pub(super) fn check_inner(&self) -> io::Result<()> {
+        if self.inner.strong_count() > 0 {
+            Ok(())
+        } else {
+            Err(io::Error::new(io::ErrorKind::Other, "signal driver gone"))
+        }
+    }
+}
+
+cfg_rt! {
+    impl Handle {
+        /// Returns a handle to the current driver
+        ///
+        /// # Panics
+        ///
+        /// This function panics if there is no current signal driver set.
+        pub(super) fn current() -> Self {
+            crate::runtime::context::signal_handle().expect(
+                "there is no signal driver running, must be called from the context of Tokio runtime",
+            )
+        }
+    }
+}
+
+cfg_not_rt! {
+    impl Handle {
+        /// Returns a handle to the current driver
+        ///
+        /// # Panics
+        ///
+        /// This function panics if there is no current signal driver set.
+        pub(super) fn current() -> Self {
+            panic!(
+                "there is no signal driver running, must be called from the context of Tokio runtime or with\
+                `rt` enabled.",
+            )
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/unix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/unix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/unix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/unix.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,19 +4,22 @@
 //! `Signal` type for receiving notifications of signals.
 
 #![cfg(unix)]
+#![cfg_attr(docsrs, doc(cfg(all(unix, feature = "signal"))))]
 
-use crate::io::{AsyncRead, PollEvented};
 use crate::signal::registry::{globals, EventId, EventInfo, Globals, Init, Storage};
-use crate::sync::mpsc::{channel, Receiver};
+use crate::signal::RxFuture;
+use crate::sync::watch;
 
-use libc::c_int;
-use mio_uds::UnixStream;
+use mio::net::UnixStream;
 use std::io::{self, Error, ErrorKind, Write};
 use std::pin::Pin;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Once;
 use std::task::{Context, Poll};
 
+pub(crate) mod driver;
+use self::driver::Handle;
+
 pub(crate) type OsStorage = Vec<SignalInfo>;
 
 // Number of different unix signals
@@ -58,7 +61,7 @@
 
 /// Represents the specific kind of signal to listen for.
 #[derive(Debug, Clone, Copy)]
-pub struct SignalKind(c_int);
+pub struct SignalKind(libc::c_int);
 
 impl SignalKind {
     /// Allows for listening to any valid OS signal.
@@ -71,8 +74,14 @@
     /// // let signum = libc::OS_SPECIFIC_SIGNAL;
     /// let kind = SignalKind::from_raw(signum);
     /// ```
-    pub fn from_raw(signum: c_int) -> Self {
-        Self(signum)
+    // Use `std::os::raw::c_int` on public API to prevent leaking a non-stable
+    // type alias from libc.
+    // `libc::c_int` and `std::os::raw::c_int` are currently the same type, and are
+    // unlikely to change to other types, but technically libc can change this
+    // in the future minor version.
+    // See https://github.com/tokio-rs/tokio/issues/3767 for more.
+    pub fn from_raw(signum: std::os::raw::c_int) -> Self {
+        Self(signum as libc::c_int)
     }
 
     /// Represents the SIGALRM signal.
@@ -202,10 +211,10 @@
 /// The purpose of this signal handler is to primarily:
 ///
 /// 1. Flag that our specific signal was received (e.g. store an atomic flag)
-/// 2. Wake up driver tasks by writing a byte to a pipe
+/// 2. Wake up the driver by writing a byte to a pipe
 ///
-/// Those two operations shoudl both be async-signal safe.
-fn action(globals: Pin<&'static Globals>, signal: c_int) {
+/// Those two operations should both be async-signal safe.
+fn action(globals: Pin<&'static Globals>, signal: libc::c_int) {
     globals.record_event(signal as EventId);
 
     // Send a wakeup, ignore any errors (anything reasonably possible is
@@ -219,7 +228,8 @@
 ///
 /// This will register the signal handler if it hasn't already been registered,
 /// returning any error along the way if that fails.
-fn signal_enable(signal: c_int) -> io::Result<()> {
+fn signal_enable(signal: SignalKind, handle: &Handle) -> io::Result<()> {
+    let signal = signal.0;
     if signal < 0 || signal_hook_registry::FORBIDDEN.contains(&signal) {
         return Err(Error::new(
             ErrorKind::Other,
@@ -227,6 +237,9 @@
         ));
     }
 
+    // Check that we have a signal driver running
+    handle.check_inner()?;
+
     let globals = globals();
     let siginfo = match globals.storage().get(signal as EventId) {
         Some(slot) => slot,
@@ -254,63 +267,6 @@
     }
 }
 
-#[derive(Debug)]
-struct Driver {
-    wakeup: PollEvented<UnixStream>,
-}
-
-impl Driver {
-    fn poll(&mut self, cx: &mut Context<'_>) -> Poll<()> {
-        // Drain the data from the pipe and maintain interest in getting more
-        self.drain(cx);
-        // Broadcast any signals which were received
-        globals().broadcast();
-
-        Poll::Pending
-    }
-}
-
-impl Driver {
-    fn new() -> io::Result<Driver> {
-        // NB: We give each driver a "fresh" reciever file descriptor to avoid
-        // the issues described in alexcrichton/tokio-process#42.
-        //
-        // In the past we would reuse the actual receiver file descriptor and
-        // swallow any errors around double registration of the same descriptor.
-        // I'm not sure if the second (failed) registration simply doesn't end up
-        // receiving wake up notifications, or there could be some race condition
-        // when consuming readiness events, but having distinct descriptors for
-        // distinct PollEvented instances appears to mitigate this.
-        //
-        // Unfortunately we cannot just use a single global PollEvented instance
-        // either, since we can't compare Handles or assume they will always
-        // point to the exact same reactor.
-        let stream = globals().receiver.try_clone()?;
-        let wakeup = PollEvented::new(stream)?;
-
-        Ok(Driver { wakeup })
-    }
-
-    /// Drain all data in the global receiver, ensuring we'll get woken up when
-    /// there is a write on the other end.
-    ///
-    /// We do *NOT* use the existence of any read bytes as evidence a signal was
-    /// received since the `pending` flags would have already been set if that
-    /// was the case. See
-    /// [#38](https://github.com/alexcrichton/tokio-signal/issues/38) for more
-    /// info.
-    fn drain(&mut self, cx: &mut Context<'_>) {
-        loop {
-            match Pin::new(&mut self.wakeup).poll_read(cx, &mut [0; 128]) {
-                Poll::Ready(Ok(0)) => panic!("EOF on self-pipe"),
-                Poll::Ready(Ok(_)) => {}
-                Poll::Ready(Err(e)) => panic!("Bad read on self-pipe: {}", e),
-                Poll::Pending => break,
-            }
-        }
-    }
-}
-
 /// A stream of events for receiving a particular type of OS signal.
 ///
 /// In general signal handling on Unix is a pretty tricky topic, and this
@@ -376,8 +332,7 @@
 #[must_use = "streams do nothing unless polled"]
 #[derive(Debug)]
 pub struct Signal {
-    driver: Driver,
-    rx: Receiver<()>,
+    inner: RxFuture,
 }
 
 /// Creates a new stream which will receive notifications when the current
@@ -403,21 +358,21 @@
 /// * If the signal is one of
 ///   [`signal_hook::FORBIDDEN`](fn@signal_hook_registry::register#panics)
 pub fn signal(kind: SignalKind) -> io::Result<Signal> {
-    let signal = kind.0;
+    let rx = signal_with_handle(kind, &Handle::current())?;
 
-    // Turn the signal delivery on once we are ready for it
-    signal_enable(signal)?;
+    Ok(Signal {
+        inner: RxFuture::new(rx),
+    })
+}
 
-    // Ensure there's a driver for our associated event loop processing
-    // signals.
-    let driver = Driver::new()?;
-
-    // One wakeup in a queue is enough, no need for us to buffer up any
-    // more.
-    let (tx, rx) = channel(1);
-    globals().register_listener(signal as EventId, tx);
+pub(crate) fn signal_with_handle(
+    kind: SignalKind,
+    handle: &Handle,
+) -> io::Result<watch::Receiver<()>> {
+    // Turn the signal delivery on once we are ready for it
+    signal_enable(kind, handle)?;
 
-    Ok(Signal { driver, rx })
+    Ok(globals().register_listener(kind.0 as EventId))
 }
 
 impl Signal {
@@ -445,14 +400,19 @@
     /// }
     /// ```
     pub async fn recv(&mut self) -> Option<()> {
-        use crate::future::poll_fn;
-        poll_fn(|cx| self.poll_recv(cx)).await
+        self.inner.recv().await
     }
 
     /// Polls to receive the next signal notification event, outside of an
     /// `async` context.
     ///
-    /// `None` is returned if no more events can be received by this stream.
+    /// This method returns:
+    ///
+    ///  * `Poll::Pending` if no signals are available but the channel is not
+    ///    closed.
+    ///  * `Poll::Ready(Some(()))` if a signal is available.
+    ///  * `Poll::Ready(None)` if the channel has been closed and all signals
+    ///    sent before it was closed have been received.
     ///
     /// # Examples
     ///
@@ -478,18 +438,18 @@
     /// }
     /// ```
     pub fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>> {
-        let _ = self.driver.poll(cx);
-        self.rx.poll_recv(cx)
+        self.inner.poll_recv(cx)
     }
 }
 
-cfg_stream! {
-    impl crate::stream::Stream for Signal {
-        type Item = ();
+// Work around for abstracting streams internally
+pub(crate) trait InternalStream {
+    fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>>;
+}
 
-        fn poll_next(mut self: std::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<()>> {
-            self.poll_recv(cx)
-        }
+impl InternalStream for Signal {
+    fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>> {
+        self.poll_recv(cx)
     }
 }
 
@@ -503,11 +463,15 @@
 
     #[test]
     fn signal_enable_error_on_invalid_input() {
-        signal_enable(-1).unwrap_err();
+        signal_enable(SignalKind::from_raw(-1), &Handle::default()).unwrap_err();
     }
 
     #[test]
     fn signal_enable_error_on_forbidden_input() {
-        signal_enable(signal_hook_registry::FORBIDDEN[0]).unwrap_err();
+        signal_enable(
+            SignalKind::from_raw(signal_hook_registry::FORBIDDEN[0]),
+            &Handle::default(),
+        )
+        .unwrap_err();
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/windows/stub.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/windows/stub.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/windows/stub.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/windows/stub.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+//! Stub implementations for the platform API so that rustdoc can build linkable
+//! documentation on non-windows platforms.
+
+use crate::signal::RxFuture;
+use std::io;
+
+pub(super) fn ctrl_c() -> io::Result<RxFuture> {
+    panic!()
+}
+
+pub(super) fn ctrl_break() -> io::Result<RxFuture> {
+    panic!()
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/windows/sys.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/windows/sys.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/windows/sys.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/windows/sys.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,153 @@
+use std::convert::TryFrom;
+use std::io;
+use std::sync::Once;
+
+use crate::signal::registry::{globals, EventId, EventInfo, Init, Storage};
+use crate::signal::RxFuture;
+
+use winapi::shared::minwindef::{BOOL, DWORD, FALSE, TRUE};
+use winapi::um::consoleapi::SetConsoleCtrlHandler;
+use winapi::um::wincon::{CTRL_BREAK_EVENT, CTRL_C_EVENT};
+
+pub(super) fn ctrl_c() -> io::Result<RxFuture> {
+    new(CTRL_C_EVENT)
+}
+
+pub(super) fn ctrl_break() -> io::Result<RxFuture> {
+    new(CTRL_BREAK_EVENT)
+}
+
+fn new(signum: DWORD) -> io::Result<RxFuture> {
+    global_init()?;
+    let rx = globals().register_listener(signum as EventId);
+    Ok(RxFuture::new(rx))
+}
+
+#[derive(Debug)]
+pub(crate) struct OsStorage {
+    ctrl_c: EventInfo,
+    ctrl_break: EventInfo,
+}
+
+impl Init for OsStorage {
+    fn init() -> Self {
+        Self {
+            ctrl_c: EventInfo::default(),
+            ctrl_break: EventInfo::default(),
+        }
+    }
+}
+
+impl Storage for OsStorage {
+    fn event_info(&self, id: EventId) -> Option<&EventInfo> {
+        match DWORD::try_from(id) {
+            Ok(CTRL_C_EVENT) => Some(&self.ctrl_c),
+            Ok(CTRL_BREAK_EVENT) => Some(&self.ctrl_break),
+            _ => None,
+        }
+    }
+
+    fn for_each<'a, F>(&'a self, mut f: F)
+    where
+        F: FnMut(&'a EventInfo),
+    {
+        f(&self.ctrl_c);
+        f(&self.ctrl_break);
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct OsExtraData {}
+
+impl Init for OsExtraData {
+    fn init() -> Self {
+        Self {}
+    }
+}
+
+fn global_init() -> io::Result<()> {
+    static INIT: Once = Once::new();
+
+    let mut init = None;
+
+    INIT.call_once(|| unsafe {
+        let rc = SetConsoleCtrlHandler(Some(handler), TRUE);
+        let ret = if rc == 0 {
+            Err(io::Error::last_os_error())
+        } else {
+            Ok(())
+        };
+
+        init = Some(ret);
+    });
+
+    init.unwrap_or_else(|| Ok(()))
+}
+
+unsafe extern "system" fn handler(ty: DWORD) -> BOOL {
+    let globals = globals();
+    globals.record_event(ty as EventId);
+
+    // According to https://docs.microsoft.com/en-us/windows/console/handlerroutine
+    // the handler routine is always invoked in a new thread, thus we don't
+    // have the same restrictions as in Unix signal handlers, meaning we can
+    // go ahead and perform the broadcast here.
+    if globals.broadcast() {
+        TRUE
+    } else {
+        // No one is listening for this notification any more
+        // let the OS fire the next (possibly the default) handler.
+        FALSE
+    }
+}
+
+#[cfg(all(test, not(loom)))]
+mod tests {
+    use super::*;
+    use crate::runtime::Runtime;
+
+    use tokio_test::{assert_ok, assert_pending, assert_ready_ok, task};
+
+    #[test]
+    fn ctrl_c() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let mut ctrl_c = task::spawn(crate::signal::ctrl_c());
+
+        assert_pending!(ctrl_c.poll());
+
+        // Windows doesn't have a good programmatic way of sending events
+        // like sending signals on Unix, so we'll stub out the actual OS
+        // integration and test that our handling works.
+        unsafe {
+            super::handler(CTRL_C_EVENT);
+        }
+
+        assert_ready_ok!(ctrl_c.poll());
+    }
+
+    #[test]
+    fn ctrl_break() {
+        let rt = rt();
+
+        rt.block_on(async {
+            let mut ctrl_break = assert_ok!(crate::signal::windows::ctrl_break());
+
+            // Windows doesn't have a good programmatic way of sending events
+            // like sending signals on Unix, so we'll stub out the actual OS
+            // integration and test that our handling works.
+            unsafe {
+                super::handler(CTRL_BREAK_EVENT);
+            }
+
+            ctrl_break.recv().await.unwrap();
+        });
+    }
+
+    fn rt() -> Runtime {
+        crate::runtime::Builder::new_current_thread()
+            .build()
+            .unwrap()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/windows.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/windows.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/signal/windows.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/signal/windows.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,137 +1,126 @@
 //! Windows-specific types for signal handling.
 //!
-//! This module is only defined on Windows and contains the primary `Event` type
-//! for receiving notifications of events. These events are listened for via the
+//! This module is only defined on Windows and allows receiving "ctrl-c"
+//! and "ctrl-break" notifications. These events are listened for via the
 //! `SetConsoleCtrlHandler` function which receives events of the type
-//! `CTRL_C_EVENT` and `CTRL_BREAK_EVENT`
+//! `CTRL_C_EVENT` and `CTRL_BREAK_EVENT`.
 
-#![cfg(windows)]
+#![cfg(any(windows, docsrs))]
+#![cfg_attr(docsrs, doc(cfg(all(windows, feature = "signal"))))]
 
-use crate::signal::registry::{globals, EventId, EventInfo, Init, Storage};
-use crate::sync::mpsc::{channel, Receiver};
-
-use std::convert::TryFrom;
+use crate::signal::RxFuture;
 use std::io;
-use std::sync::Once;
 use std::task::{Context, Poll};
-use winapi::shared::minwindef::*;
-use winapi::um::consoleapi::SetConsoleCtrlHandler;
-use winapi::um::wincon::*;
-
-#[derive(Debug)]
-pub(crate) struct OsStorage {
-    ctrl_c: EventInfo,
-    ctrl_break: EventInfo,
-}
-
-impl Init for OsStorage {
-    fn init() -> Self {
-        Self {
-            ctrl_c: EventInfo::default(),
-            ctrl_break: EventInfo::default(),
-        }
-    }
-}
 
-impl Storage for OsStorage {
-    fn event_info(&self, id: EventId) -> Option<&EventInfo> {
-        match DWORD::try_from(id) {
-            Ok(CTRL_C_EVENT) => Some(&self.ctrl_c),
-            Ok(CTRL_BREAK_EVENT) => Some(&self.ctrl_break),
-            _ => None,
-        }
-    }
-
-    fn for_each<'a, F>(&'a self, mut f: F)
-    where
-        F: FnMut(&'a EventInfo),
-    {
-        f(&self.ctrl_c);
-        f(&self.ctrl_break);
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct OsExtraData {}
+#[cfg(not(docsrs))]
+#[path = "windows/sys.rs"]
+mod imp;
+#[cfg(not(docsrs))]
+pub(crate) use self::imp::{OsExtraData, OsStorage};
+
+#[cfg(docsrs)]
+#[path = "windows/stub.rs"]
+mod imp;
 
-impl Init for OsExtraData {
-    fn init() -> Self {
-        Self {}
-    }
+/// Creates a new stream which receives "ctrl-c" notifications sent to the
+/// process.
+///
+/// # Examples
+///
+/// ```rust,no_run
+/// use tokio::signal::windows::ctrl_c;
+///
+/// #[tokio::main]
+/// async fn main() -> Result<(), Box<dyn std::error::Error>> {
+///     // An infinite stream of CTRL-C events.
+///     let mut stream = ctrl_c()?;
+///
+///     // Print whenever a CTRL-C event is received.
+///     for countdown in (0..3).rev() {
+///         stream.recv().await;
+///         println!("got CTRL-C. {} more to exit", countdown);
+///     }
+///
+///     Ok(())
+/// }
+/// ```
+pub fn ctrl_c() -> io::Result<CtrlC> {
+    Ok(CtrlC {
+        inner: self::imp::ctrl_c()?,
+    })
 }
 
-/// Stream of events discovered via `SetConsoleCtrlHandler`.
+/// Represents a stream which receives "ctrl-c" notifications sent to the process
+/// via `SetConsoleCtrlHandler`.
 ///
-/// This structure can be used to listen for events of the type `CTRL_C_EVENT`
-/// and `CTRL_BREAK_EVENT`. The `Stream` trait is implemented for this struct
-/// and will resolve for each notification received by the process. Note that
-/// there are few limitations with this as well:
-///
-/// * A notification to this process notifies *all* `Event` streams for that
-///   event type.
-/// * Notifications to an `Event` stream **are coalesced** if they aren't
-///   processed quickly enough. This means that if two notifications are
-///   received back-to-back, then the stream may only receive one item about the
-///   two notifications.
+/// A notification to this process notifies *all* streams listening for
+/// this event. Moreover, the notifications **are coalesced** if they aren't processed
+/// quickly enough. This means that if two notifications are received back-to-back,
+/// then the stream may only receive one item about the two notifications.
 #[must_use = "streams do nothing unless polled"]
 #[derive(Debug)]
-pub(crate) struct Event {
-    rx: Receiver<()>,
+pub struct CtrlC {
+    inner: RxFuture,
 }
 
-pub(crate) fn ctrl_c() -> io::Result<Event> {
-    Event::new(CTRL_C_EVENT)
-}
-
-impl Event {
-    fn new(signum: DWORD) -> io::Result<Self> {
-        global_init()?;
-
-        let (tx, rx) = channel(1);
-        globals().register_listener(signum as EventId, tx);
-
-        Ok(Event { rx })
-    }
-
-    pub(crate) async fn recv(&mut self) -> Option<()> {
-        use crate::future::poll_fn;
-        poll_fn(|cx| self.rx.poll_recv(cx)).await
+impl CtrlC {
+    /// Receives the next signal notification event.
+    ///
+    /// `None` is returned if no more events can be received by this stream.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,no_run
+    /// use tokio::signal::windows::ctrl_c;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    ///     // An infinite stream of CTRL-C events.
+    ///     let mut stream = ctrl_c()?;
+    ///
+    ///     // Print whenever a CTRL-C event is received.
+    ///     for countdown in (0..3).rev() {
+    ///         stream.recv().await;
+    ///         println!("got CTRL-C. {} more to exit", countdown);
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub async fn recv(&mut self) -> Option<()> {
+        self.inner.recv().await
     }
-}
-
-fn global_init() -> io::Result<()> {
-    static INIT: Once = Once::new();
 
-    let mut init = None;
-
-    INIT.call_once(|| unsafe {
-        let rc = SetConsoleCtrlHandler(Some(handler), TRUE);
-        let ret = if rc == 0 {
-            Err(io::Error::last_os_error())
-        } else {
-            Ok(())
-        };
-
-        init = Some(ret);
-    });
-
-    init.unwrap_or_else(|| Ok(()))
-}
-
-unsafe extern "system" fn handler(ty: DWORD) -> BOOL {
-    let globals = globals();
-    globals.record_event(ty as EventId);
-
-    // According to https://docs.microsoft.com/en-us/windows/console/handlerroutine
-    // the handler routine is always invoked in a new thread, thus we don't
-    // have the same restrictions as in Unix signal handlers, meaning we can
-    // go ahead and perform the broadcast here.
-    if globals.broadcast() {
-        TRUE
-    } else {
-        // No one is listening for this notification any more
-        // let the OS fire the next (possibly the default) handler.
-        FALSE
+    /// Polls to receive the next signal notification event, outside of an
+    /// `async` context.
+    ///
+    /// `None` is returned if no more events can be received by this stream.
+    ///
+    /// # Examples
+    ///
+    /// Polling from a manually implemented future
+    ///
+    /// ```rust,no_run
+    /// use std::pin::Pin;
+    /// use std::future::Future;
+    /// use std::task::{Context, Poll};
+    /// use tokio::signal::windows::CtrlC;
+    ///
+    /// struct MyFuture {
+    ///     ctrl_c: CtrlC,
+    /// }
+    ///
+    /// impl Future for MyFuture {
+    ///     type Output = Option<()>;
+    ///
+    ///     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    ///         println!("polling MyFuture");
+    ///         self.ctrl_c.poll_recv(cx)
+    ///     }
+    /// }
+    /// ```
+    pub fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>> {
+        self.inner.poll_recv(cx)
     }
 }
 
@@ -145,7 +134,7 @@
 #[must_use = "streams do nothing unless polled"]
 #[derive(Debug)]
 pub struct CtrlBreak {
-    inner: Event,
+    inner: RxFuture,
 }
 
 impl CtrlBreak {
@@ -163,7 +152,7 @@
     ///     // An infinite stream of CTRL-BREAK events.
     ///     let mut stream = ctrl_break()?;
     ///
-    ///     // Print whenever a CTRL-BREAK event is received
+    ///     // Print whenever a CTRL-BREAK event is received.
     ///     loop {
     ///         stream.recv().await;
     ///         println!("got signal CTRL-BREAK");
@@ -171,8 +160,7 @@
     /// }
     /// ```
     pub async fn recv(&mut self) -> Option<()> {
-        use crate::future::poll_fn;
-        poll_fn(|cx| self.poll_recv(cx)).await
+        self.inner.recv().await
     }
 
     /// Polls to receive the next signal notification event, outside of an
@@ -204,17 +192,7 @@
     /// }
     /// ```
     pub fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>> {
-        self.inner.rx.poll_recv(cx)
-    }
-}
-
-cfg_stream! {
-    impl crate::stream::Stream for CtrlBreak {
-        type Item = ();
-
-        fn poll_next(mut self: std::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<()>> {
-            self.poll_recv(cx)
-        }
+        self.inner.poll_recv(cx)
     }
 }
 
@@ -231,7 +209,7 @@
 ///     // An infinite stream of CTRL-BREAK events.
 ///     let mut stream = ctrl_break()?;
 ///
-///     // Print whenever a CTRL-BREAK event is received
+///     // Print whenever a CTRL-BREAK event is received.
 ///     loop {
 ///         stream.recv().await;
 ///         println!("got signal CTRL-BREAK");
@@ -239,59 +217,7 @@
 /// }
 /// ```
 pub fn ctrl_break() -> io::Result<CtrlBreak> {
-    Event::new(CTRL_BREAK_EVENT).map(|inner| CtrlBreak { inner })
-}
-
-#[cfg(all(test, not(loom)))]
-mod tests {
-    use super::*;
-    use crate::runtime::Runtime;
-    use crate::stream::StreamExt;
-
-    use tokio_test::{assert_ok, assert_pending, assert_ready_ok, task};
-
-    #[test]
-    fn ctrl_c() {
-        let rt = rt();
-
-        rt.enter(|| {
-            let mut ctrl_c = task::spawn(crate::signal::ctrl_c());
-
-            assert_pending!(ctrl_c.poll());
-
-            // Windows doesn't have a good programmatic way of sending events
-            // like sending signals on Unix, so we'll stub out the actual OS
-            // integration and test that our handling works.
-            unsafe {
-                super::handler(CTRL_C_EVENT);
-            }
-
-            assert_ready_ok!(ctrl_c.poll());
-        });
-    }
-
-    #[test]
-    fn ctrl_break() {
-        let mut rt = rt();
-
-        rt.block_on(async {
-            let mut ctrl_break = assert_ok!(super::ctrl_break());
-
-            // Windows doesn't have a good programmatic way of sending events
-            // like sending signals on Unix, so we'll stub out the actual OS
-            // integration and test that our handling works.
-            unsafe {
-                super::handler(CTRL_BREAK_EVENT);
-            }
-
-            ctrl_break.next().await.unwrap();
-        });
-    }
-
-    fn rt() -> Runtime {
-        crate::runtime::Builder::new()
-            .basic_scheduler()
-            .build()
-            .unwrap()
-    }
+    Ok(CtrlBreak {
+        inner: self::imp::ctrl_break()?,
+    })
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/all.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/all.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/all.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/all.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-use crate::stream::Stream;
-
-use core::future::Future;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-
-/// Future for the [`all`](super::StreamExt::all) method.
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct AllFuture<'a, St: ?Sized, F> {
-    stream: &'a mut St,
-    f: F,
-}
-
-impl<'a, St: ?Sized, F> AllFuture<'a, St, F> {
-    pub(super) fn new(stream: &'a mut St, f: F) -> Self {
-        Self { stream, f }
-    }
-}
-
-impl<St: ?Sized + Unpin, F> Unpin for AllFuture<'_, St, F> {}
-
-impl<St, F> Future for AllFuture<'_, St, F>
-where
-    St: ?Sized + Stream + Unpin,
-    F: FnMut(St::Item) -> bool,
-{
-    type Output = bool;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let next = futures_core::ready!(Pin::new(&mut self.stream).poll_next(cx));
-
-        match next {
-            Some(v) => {
-                if !(&mut self.f)(v) {
-                    Poll::Ready(false)
-                } else {
-                    cx.waker().wake_by_ref();
-                    Poll::Pending
-                }
-            }
-            None => Poll::Ready(true),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/any.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/any.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/any.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/any.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-use crate::stream::Stream;
-
-use core::future::Future;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-
-/// Future for the [`any`](super::StreamExt::any) method.
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct AnyFuture<'a, St: ?Sized, F> {
-    stream: &'a mut St,
-    f: F,
-}
-
-impl<'a, St: ?Sized, F> AnyFuture<'a, St, F> {
-    pub(super) fn new(stream: &'a mut St, f: F) -> Self {
-        Self { stream, f }
-    }
-}
-
-impl<St: ?Sized + Unpin, F> Unpin for AnyFuture<'_, St, F> {}
-
-impl<St, F> Future for AnyFuture<'_, St, F>
-where
-    St: ?Sized + Stream + Unpin,
-    F: FnMut(St::Item) -> bool,
-{
-    type Output = bool;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let next = futures_core::ready!(Pin::new(&mut self.stream).poll_next(cx));
-
-        match next {
-            Some(v) => {
-                if (&mut self.f)(v) {
-                    Poll::Ready(true)
-                } else {
-                    cx.waker().wake_by_ref();
-                    Poll::Pending
-                }
-            }
-            None => Poll::Ready(false),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/chain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/chain.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-use crate::stream::{Fuse, Stream};
-
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream returned by the [`chain`](super::StreamExt::chain) method.
-    pub struct Chain<T, U> {
-        #[pin]
-        a: Fuse<T>,
-        #[pin]
-        b: U,
-    }
-}
-
-impl<T, U> Chain<T, U> {
-    pub(super) fn new(a: T, b: U) -> Chain<T, U>
-    where
-        T: Stream,
-        U: Stream,
-    {
-        Chain { a: Fuse::new(a), b }
-    }
-}
-
-impl<T, U> Stream for Chain<T, U>
-where
-    T: Stream,
-    U: Stream<Item = T::Item>,
-{
-    type Item = T::Item;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T::Item>> {
-        use Poll::Ready;
-
-        let me = self.project();
-
-        if let Some(v) = ready!(me.a.poll_next(cx)) {
-            return Ready(Some(v));
-        }
-
-        me.b.poll_next(cx)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        super::merge_size_hints(self.a.size_hint(), self.b.size_hint())
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/collect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/collect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/collect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/collect.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,246 +0,0 @@
-use crate::stream::Stream;
-
-use bytes::{Buf, BufMut, Bytes, BytesMut};
-use core::future::Future;
-use core::mem;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-// Do not export this struct until `FromStream` can be unsealed.
-pin_project! {
-    /// Future returned by the [`collect`](super::StreamExt::collect) method.
-    #[must_use = "streams do nothing unless polled"]
-    #[derive(Debug)]
-    pub struct Collect<T, U>
-    where
-        T: Stream,
-        U: FromStream<T::Item>,
-    {
-        #[pin]
-        stream: T,
-        collection: U::Collection,
-    }
-}
-
-/// Convert from a [`Stream`](crate::stream::Stream).
-///
-/// This trait is not intended to be used directly. Instead, call
-/// [`StreamExt::collect()`](super::StreamExt::collect).
-///
-/// # Implementing
-///
-/// Currently, this trait may not be implemented by third parties. The trait is
-/// sealed in order to make changes in the future. Stabilization is pending
-/// enhancements to the Rust language.
-pub trait FromStream<T>: sealed::FromStreamPriv<T> {}
-
-impl<T, U> Collect<T, U>
-where
-    T: Stream,
-    U: FromStream<T::Item>,
-{
-    pub(super) fn new(stream: T) -> Collect<T, U> {
-        let (lower, upper) = stream.size_hint();
-        let collection = U::initialize(lower, upper);
-
-        Collect { stream, collection }
-    }
-}
-
-impl<T, U> Future for Collect<T, U>
-where
-    T: Stream,
-    U: FromStream<T::Item>,
-{
-    type Output = U;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<U> {
-        use Poll::Ready;
-
-        loop {
-            let mut me = self.as_mut().project();
-
-            let item = match ready!(me.stream.poll_next(cx)) {
-                Some(item) => item,
-                None => {
-                    return Ready(U::finalize(&mut me.collection));
-                }
-            };
-
-            if !U::extend(&mut me.collection, item) {
-                return Ready(U::finalize(&mut me.collection));
-            }
-        }
-    }
-}
-
-// ===== FromStream implementations
-
-impl FromStream<()> for () {}
-
-impl sealed::FromStreamPriv<()> for () {
-    type Collection = ();
-
-    fn initialize(_lower: usize, _upper: Option<usize>) {}
-
-    fn extend(_collection: &mut (), _item: ()) -> bool {
-        true
-    }
-
-    fn finalize(_collection: &mut ()) {}
-}
-
-impl<T: AsRef<str>> FromStream<T> for String {}
-
-impl<T: AsRef<str>> sealed::FromStreamPriv<T> for String {
-    type Collection = String;
-
-    fn initialize(_lower: usize, _upper: Option<usize>) -> String {
-        String::new()
-    }
-
-    fn extend(collection: &mut String, item: T) -> bool {
-        collection.push_str(item.as_ref());
-        true
-    }
-
-    fn finalize(collection: &mut String) -> String {
-        mem::replace(collection, String::new())
-    }
-}
-
-impl<T> FromStream<T> for Vec<T> {}
-
-impl<T> sealed::FromStreamPriv<T> for Vec<T> {
-    type Collection = Vec<T>;
-
-    fn initialize(lower: usize, _upper: Option<usize>) -> Vec<T> {
-        Vec::with_capacity(lower)
-    }
-
-    fn extend(collection: &mut Vec<T>, item: T) -> bool {
-        collection.push(item);
-        true
-    }
-
-    fn finalize(collection: &mut Vec<T>) -> Vec<T> {
-        mem::replace(collection, vec![])
-    }
-}
-
-impl<T> FromStream<T> for Box<[T]> {}
-
-impl<T> sealed::FromStreamPriv<T> for Box<[T]> {
-    type Collection = Vec<T>;
-
-    fn initialize(lower: usize, upper: Option<usize>) -> Vec<T> {
-        <Vec<T> as sealed::FromStreamPriv<T>>::initialize(lower, upper)
-    }
-
-    fn extend(collection: &mut Vec<T>, item: T) -> bool {
-        <Vec<T> as sealed::FromStreamPriv<T>>::extend(collection, item)
-    }
-
-    fn finalize(collection: &mut Vec<T>) -> Box<[T]> {
-        <Vec<T> as sealed::FromStreamPriv<T>>::finalize(collection).into_boxed_slice()
-    }
-}
-
-impl<T, U, E> FromStream<Result<T, E>> for Result<U, E> where U: FromStream<T> {}
-
-impl<T, U, E> sealed::FromStreamPriv<Result<T, E>> for Result<U, E>
-where
-    U: FromStream<T>,
-{
-    type Collection = Result<U::Collection, E>;
-
-    fn initialize(lower: usize, upper: Option<usize>) -> Result<U::Collection, E> {
-        Ok(U::initialize(lower, upper))
-    }
-
-    fn extend(collection: &mut Self::Collection, item: Result<T, E>) -> bool {
-        assert!(collection.is_ok());
-        match item {
-            Ok(item) => {
-                let collection = collection.as_mut().ok().expect("invalid state");
-                U::extend(collection, item)
-            }
-            Err(err) => {
-                *collection = Err(err);
-                false
-            }
-        }
-    }
-
-    fn finalize(collection: &mut Self::Collection) -> Result<U, E> {
-        if let Ok(collection) = collection.as_mut() {
-            Ok(U::finalize(collection))
-        } else {
-            let res = mem::replace(collection, Ok(U::initialize(0, Some(0))));
-
-            if let Err(err) = res {
-                Err(err)
-            } else {
-                unreachable!();
-            }
-        }
-    }
-}
-
-impl<T: Buf> FromStream<T> for Bytes {}
-
-impl<T: Buf> sealed::FromStreamPriv<T> for Bytes {
-    type Collection = BytesMut;
-
-    fn initialize(_lower: usize, _upper: Option<usize>) -> BytesMut {
-        BytesMut::new()
-    }
-
-    fn extend(collection: &mut BytesMut, item: T) -> bool {
-        collection.put(item);
-        true
-    }
-
-    fn finalize(collection: &mut BytesMut) -> Bytes {
-        mem::replace(collection, BytesMut::new()).freeze()
-    }
-}
-
-impl<T: Buf> FromStream<T> for BytesMut {}
-
-impl<T: Buf> sealed::FromStreamPriv<T> for BytesMut {
-    type Collection = BytesMut;
-
-    fn initialize(_lower: usize, _upper: Option<usize>) -> BytesMut {
-        BytesMut::new()
-    }
-
-    fn extend(collection: &mut BytesMut, item: T) -> bool {
-        collection.put(item);
-        true
-    }
-
-    fn finalize(collection: &mut BytesMut) -> BytesMut {
-        mem::replace(collection, BytesMut::new())
-    }
-}
-
-pub(crate) mod sealed {
-    #[doc(hidden)]
-    pub trait FromStreamPriv<T> {
-        /// Intermediate type used during collection process
-        type Collection;
-
-        /// Initialize the collection
-        fn initialize(lower: usize, upper: Option<usize>) -> Self::Collection;
-
-        /// Extend the collection with the received item
-        ///
-        /// Return `true` to continue streaming, `false` complete collection.
-        fn extend(collection: &mut Self::Collection, item: T) -> bool;
-
-        /// Finalize collection into target type.
-        fn finalize(collection: &mut Self::Collection) -> Self;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/empty.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/empty.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/empty.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/empty.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-use crate::stream::Stream;
-
-use core::marker::PhantomData;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-
-/// Stream for the [`empty`](fn@empty) function.
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Empty<T>(PhantomData<T>);
-
-impl<T> Unpin for Empty<T> {}
-unsafe impl<T> Send for Empty<T> {}
-unsafe impl<T> Sync for Empty<T> {}
-
-/// Creates a stream that yields nothing.
-///
-/// The returned stream is immediately ready and returns `None`. Use
-/// [`stream::pending()`](super::pending()) to obtain a stream that is never
-/// ready.
-///
-/// # Examples
-///
-/// Basic usage:
-///
-/// ```
-/// use tokio::stream::{self, StreamExt};
-///
-/// #[tokio::main]
-/// async fn main() {
-///     let mut none = stream::empty::<i32>();
-///
-///     assert_eq!(None, none.next().await);
-/// }
-/// ```
-pub const fn empty<T>() -> Empty<T> {
-    Empty(PhantomData)
-}
-
-impl<T> Stream for Empty<T> {
-    type Item = T;
-
-    fn poll_next(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<T>> {
-        Poll::Ready(None)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, Some(0))
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/filter_map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/filter_map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/filter_map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/filter_map.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-use crate::stream::Stream;
-
-use core::fmt;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream returned by the [`filter_map`](super::StreamExt::filter_map) method.
-    #[must_use = "streams do nothing unless polled"]
-    pub struct FilterMap<St, F> {
-        #[pin]
-        stream: St,
-        f: F,
-    }
-}
-
-impl<St, F> fmt::Debug for FilterMap<St, F>
-where
-    St: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("FilterMap")
-            .field("stream", &self.stream)
-            .finish()
-    }
-}
-
-impl<St, F> FilterMap<St, F> {
-    pub(super) fn new(stream: St, f: F) -> Self {
-        Self { stream, f }
-    }
-}
-
-impl<St, F, T> Stream for FilterMap<St, F>
-where
-    St: Stream,
-    F: FnMut(St::Item) -> Option<T>,
-{
-    type Item = T;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
-        loop {
-            match ready!(self.as_mut().project().stream.poll_next(cx)) {
-                Some(e) => {
-                    if let Some(e) = (self.as_mut().project().f)(e) {
-                        return Poll::Ready(Some(e));
-                    }
-                }
-                None => return Poll::Ready(None),
-            }
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, self.stream.size_hint().1) // can't know a lower bound, due to the predicate
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/filter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/filter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/filter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/filter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-use crate::stream::Stream;
-
-use core::fmt;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream returned by the [`filter`](super::StreamExt::filter) method.
-    #[must_use = "streams do nothing unless polled"]
-    pub struct Filter<St, F> {
-        #[pin]
-        stream: St,
-        f: F,
-    }
-}
-
-impl<St, F> fmt::Debug for Filter<St, F>
-where
-    St: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Filter")
-            .field("stream", &self.stream)
-            .finish()
-    }
-}
-
-impl<St, F> Filter<St, F> {
-    pub(super) fn new(stream: St, f: F) -> Self {
-        Self { stream, f }
-    }
-}
-
-impl<St, F> Stream for Filter<St, F>
-where
-    St: Stream,
-    F: FnMut(&St::Item) -> bool,
-{
-    type Item = St::Item;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<St::Item>> {
-        loop {
-            match ready!(self.as_mut().project().stream.poll_next(cx)) {
-                Some(e) => {
-                    if (self.as_mut().project().f)(&e) {
-                        return Poll::Ready(Some(e));
-                    }
-                }
-                None => return Poll::Ready(None),
-            }
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, self.stream.size_hint().1) // can't know a lower bound, due to the predicate
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/fold.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/fold.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/fold.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/fold.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-use crate::stream::Stream;
-
-use core::future::Future;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Future returned by the [`fold`](super::StreamExt::fold) method.
-    #[derive(Debug)]
-    pub struct FoldFuture<St, B, F> {
-        #[pin]
-        stream: St,
-        acc: Option<B>,
-        f: F,
-    }
-}
-
-impl<St, B, F> FoldFuture<St, B, F> {
-    pub(super) fn new(stream: St, init: B, f: F) -> Self {
-        Self {
-            stream,
-            acc: Some(init),
-            f,
-        }
-    }
-}
-
-impl<St, B, F> Future for FoldFuture<St, B, F>
-where
-    St: Stream,
-    F: FnMut(B, St::Item) -> B,
-{
-    type Output = B;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut me = self.project();
-        loop {
-            let next = ready!(me.stream.as_mut().poll_next(cx));
-
-            match next {
-                Some(v) => {
-                    let old = me.acc.take().unwrap();
-                    let new = (me.f)(old, v);
-                    *me.acc = Some(new);
-                }
-                None => return Poll::Ready(me.acc.take().unwrap()),
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/fuse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/fuse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/fuse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/fuse.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-use crate::stream::Stream;
-
-use pin_project_lite::pin_project;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-pin_project! {
-    /// Stream returned by [`fuse()`][super::StreamExt::fuse].
-    #[derive(Debug)]
-    pub struct Fuse<T> {
-        #[pin]
-        stream: Option<T>,
-    }
-}
-
-impl<T> Fuse<T>
-where
-    T: Stream,
-{
-    pub(crate) fn new(stream: T) -> Fuse<T> {
-        Fuse {
-            stream: Some(stream),
-        }
-    }
-}
-
-impl<T> Stream for Fuse<T>
-where
-    T: Stream,
-{
-    type Item = T::Item;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T::Item>> {
-        let res = match Option::as_pin_mut(self.as_mut().project().stream) {
-            Some(stream) => ready!(stream.poll_next(cx)),
-            None => return Poll::Ready(None),
-        };
-
-        if res.is_none() {
-            // Do not poll the stream anymore
-            self.as_mut().project().stream.set(None);
-        }
-
-        Poll::Ready(res)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        match self.stream {
-            Some(ref stream) => stream.size_hint(),
-            None => (0, Some(0)),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/iter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-use crate::stream::Stream;
-
-use core::pin::Pin;
-use core::task::{Context, Poll};
-
-/// Stream for the [`iter`](fn@iter) function.
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Iter<I> {
-    iter: I,
-}
-
-impl<I> Unpin for Iter<I> {}
-
-/// Converts an `Iterator` into a `Stream` which is always ready
-/// to yield the next value.
-///
-/// Iterators in Rust don't express the ability to block, so this adapter
-/// simply always calls `iter.next()` and returns that.
-///
-/// ```
-/// # async fn dox() {
-/// use tokio::stream::{self, StreamExt};
-///
-/// let mut stream = stream::iter(vec![17, 19]);
-///
-/// assert_eq!(stream.next().await, Some(17));
-/// assert_eq!(stream.next().await, Some(19));
-/// assert_eq!(stream.next().await, None);
-/// # }
-/// ```
-pub fn iter<I>(i: I) -> Iter<I::IntoIter>
-where
-    I: IntoIterator,
-{
-    Iter {
-        iter: i.into_iter(),
-    }
-}
-
-impl<I> Stream for Iter<I>
-where
-    I: Iterator,
-{
-    type Item = I::Item;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<I::Item>> {
-        let coop = ready!(crate::coop::poll_proceed(cx));
-        coop.made_progress();
-        Poll::Ready(self.iter.next())
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/map.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-use crate::stream::Stream;
-
-use core::fmt;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream for the [`map`](super::StreamExt::map) method.
-    #[must_use = "streams do nothing unless polled"]
-    pub struct Map<St, F> {
-        #[pin]
-        stream: St,
-        f: F,
-    }
-}
-
-impl<St, F> fmt::Debug for Map<St, F>
-where
-    St: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Map").field("stream", &self.stream).finish()
-    }
-}
-
-impl<St, F> Map<St, F> {
-    pub(super) fn new(stream: St, f: F) -> Self {
-        Map { stream, f }
-    }
-}
-
-impl<St, F, T> Stream for Map<St, F>
-where
-    St: Stream,
-    F: FnMut(St::Item) -> T,
-{
-    type Item = T;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
-        self.as_mut()
-            .project()
-            .stream
-            .poll_next(cx)
-            .map(|opt| opt.map(|x| (self.as_mut().project().f)(x)))
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.stream.size_hint()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/merge.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/merge.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/merge.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/merge.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-use crate::stream::{Fuse, Stream};
-
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream returned by the [`merge`](super::StreamExt::merge) method.
-    pub struct Merge<T, U> {
-        #[pin]
-        a: Fuse<T>,
-        #[pin]
-        b: Fuse<U>,
-        // When `true`, poll `a` first, otherwise, `poll` b`.
-        a_first: bool,
-    }
-}
-
-impl<T, U> Merge<T, U> {
-    pub(super) fn new(a: T, b: U) -> Merge<T, U>
-    where
-        T: Stream,
-        U: Stream,
-    {
-        Merge {
-            a: Fuse::new(a),
-            b: Fuse::new(b),
-            a_first: true,
-        }
-    }
-}
-
-impl<T, U> Stream for Merge<T, U>
-where
-    T: Stream,
-    U: Stream<Item = T::Item>,
-{
-    type Item = T::Item;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T::Item>> {
-        let me = self.project();
-        let a_first = *me.a_first;
-
-        // Toggle the flag
-        *me.a_first = !a_first;
-
-        if a_first {
-            poll_next(me.a, me.b, cx)
-        } else {
-            poll_next(me.b, me.a, cx)
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        super::merge_size_hints(self.a.size_hint(), self.b.size_hint())
-    }
-}
-
-fn poll_next<T, U>(
-    first: Pin<&mut T>,
-    second: Pin<&mut U>,
-    cx: &mut Context<'_>,
-) -> Poll<Option<T::Item>>
-where
-    T: Stream,
-    U: Stream<Item = T::Item>,
-{
-    use Poll::*;
-
-    let mut done = true;
-
-    match first.poll_next(cx) {
-        Ready(Some(val)) => return Ready(Some(val)),
-        Ready(None) => {}
-        Pending => done = false,
-    }
-
-    match second.poll_next(cx) {
-        Ready(Some(val)) => return Ready(Some(val)),
-        Ready(None) => {}
-        Pending => done = false,
-    }
-
-    if done {
-        Ready(None)
-    } else {
-        Pending
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,837 +0,0 @@
-//! Stream utilities for Tokio.
-//!
-//! A `Stream` is an asynchronous sequence of values. It can be thought of as an asynchronous version of the standard library's `Iterator` trait.
-//!
-//! This module provides helpers to work with them.
-
-mod all;
-use all::AllFuture;
-
-mod any;
-use any::AnyFuture;
-
-mod chain;
-use chain::Chain;
-
-mod collect;
-use collect::Collect;
-pub use collect::FromStream;
-
-mod empty;
-pub use empty::{empty, Empty};
-
-mod filter;
-use filter::Filter;
-
-mod filter_map;
-use filter_map::FilterMap;
-
-mod fold;
-use fold::FoldFuture;
-
-mod fuse;
-use fuse::Fuse;
-
-mod iter;
-pub use iter::{iter, Iter};
-
-mod map;
-use map::Map;
-
-mod merge;
-use merge::Merge;
-
-mod next;
-use next::Next;
-
-mod once;
-pub use once::{once, Once};
-
-mod pending;
-pub use pending::{pending, Pending};
-
-mod stream_map;
-pub use stream_map::StreamMap;
-
-mod skip;
-use skip::Skip;
-
-mod skip_while;
-use skip_while::SkipWhile;
-
-mod try_next;
-use try_next::TryNext;
-
-mod take;
-use take::Take;
-
-mod take_while;
-use take_while::TakeWhile;
-
-cfg_time! {
-    mod timeout;
-    use timeout::Timeout;
-    use std::time::Duration;
-}
-
-pub use futures_core::Stream;
-
-/// An extension trait for `Stream`s that provides a variety of convenient
-/// combinator functions.
-pub trait StreamExt: Stream {
-    /// Consumes and returns the next value in the stream or `None` if the
-    /// stream is finished.
-    ///
-    /// Equivalent to:
-    ///
-    /// ```ignore
-    /// async fn next(&mut self) -> Option<Self::Item>;
-    /// ```
-    ///
-    /// Note that because `next` doesn't take ownership over the stream,
-    /// the [`Stream`] type must be [`Unpin`]. If you want to use `next` with a
-    /// [`!Unpin`](Unpin) stream, you'll first have to pin the stream. This can
-    /// be done by boxing the stream using [`Box::pin`] or
-    /// pinning it to the stack using the `pin_mut!` macro from the `pin_utils`
-    /// crate.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let mut stream = stream::iter(1..=3);
-    ///
-    /// assert_eq!(stream.next().await, Some(1));
-    /// assert_eq!(stream.next().await, Some(2));
-    /// assert_eq!(stream.next().await, Some(3));
-    /// assert_eq!(stream.next().await, None);
-    /// # }
-    /// ```
-    fn next(&mut self) -> Next<'_, Self>
-    where
-        Self: Unpin,
-    {
-        Next::new(self)
-    }
-
-    /// Consumes and returns the next item in the stream. If an error is
-    /// encountered before the next item, the error is returned instead.
-    ///
-    /// Equivalent to:
-    ///
-    /// ```ignore
-    /// async fn try_next(&mut self) -> Result<Option<T>, E>;
-    /// ```
-    ///
-    /// This is similar to the [`next`](StreamExt::next) combinator,
-    /// but returns a [`Result<Option<T>, E>`](Result) rather than
-    /// an [`Option<Result<T, E>>`](Option), making for easy use
-    /// with the [`?`](std::ops::Try) operator.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let mut stream = stream::iter(vec![Ok(1), Ok(2), Err("nope")]);
-    ///
-    /// assert_eq!(stream.try_next().await, Ok(Some(1)));
-    /// assert_eq!(stream.try_next().await, Ok(Some(2)));
-    /// assert_eq!(stream.try_next().await, Err("nope"));
-    /// # }
-    /// ```
-    fn try_next<T, E>(&mut self) -> TryNext<'_, Self>
-    where
-        Self: Stream<Item = Result<T, E>> + Unpin,
-    {
-        TryNext::new(self)
-    }
-
-    /// Maps this stream's items to a different type, returning a new stream of
-    /// the resulting type.
-    ///
-    /// The provided closure is executed over all elements of this stream as
-    /// they are made available. It is executed inline with calls to
-    /// [`poll_next`](Stream::poll_next).
-    ///
-    /// Note that this function consumes the stream passed into it and returns a
-    /// wrapped version of it, similar to the existing `map` methods in the
-    /// standard library.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let stream = stream::iter(1..=3);
-    /// let mut stream = stream.map(|x| x + 3);
-    ///
-    /// assert_eq!(stream.next().await, Some(4));
-    /// assert_eq!(stream.next().await, Some(5));
-    /// assert_eq!(stream.next().await, Some(6));
-    /// # }
-    /// ```
-    fn map<T, F>(self, f: F) -> Map<Self, F>
-    where
-        F: FnMut(Self::Item) -> T,
-        Self: Sized,
-    {
-        Map::new(self, f)
-    }
-
-    /// Combine two streams into one by interleaving the output of both as it
-    /// is produced.
-    ///
-    /// Values are produced from the merged stream in the order they arrive from
-    /// the two source streams. If both source streams provide values
-    /// simultaneously, the merge stream alternates between them. This provides
-    /// some level of fairness. You should not chain calls to `merge`, as this
-    /// will break the fairness of the merging.
-    ///
-    /// The merged stream completes once **both** source streams complete. When
-    /// one source stream completes before the other, the merge stream
-    /// exclusively polls the remaining stream.
-    ///
-    /// For merging multiple streams, consider using [`StreamMap`] instead.
-    ///
-    /// [`StreamMap`]: crate::stream::StreamMap
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::StreamExt;
-    /// use tokio::sync::mpsc;
-    /// use tokio::time;
-    ///
-    /// use std::time::Duration;
-    ///
-    /// # /*
-    /// #[tokio::main]
-    /// # */
-    /// # #[tokio::main(basic_scheduler)]
-    /// async fn main() {
-    /// # time::pause();
-    ///     let (mut tx1, rx1) = mpsc::channel(10);
-    ///     let (mut tx2, rx2) = mpsc::channel(10);
-    ///
-    ///     let mut rx = rx1.merge(rx2);
-    ///
-    ///     tokio::spawn(async move {
-    ///         // Send some values immediately
-    ///         tx1.send(1).await.unwrap();
-    ///         tx1.send(2).await.unwrap();
-    ///
-    ///         // Let the other task send values
-    ///         time::delay_for(Duration::from_millis(20)).await;
-    ///
-    ///         tx1.send(4).await.unwrap();
-    ///     });
-    ///
-    ///     tokio::spawn(async move {
-    ///         // Wait for the first task to send values
-    ///         time::delay_for(Duration::from_millis(5)).await;
-    ///
-    ///         tx2.send(3).await.unwrap();
-    ///
-    ///         time::delay_for(Duration::from_millis(25)).await;
-    ///
-    ///         // Send the final value
-    ///         tx2.send(5).await.unwrap();
-    ///     });
-    ///
-    ///    assert_eq!(1, rx.next().await.unwrap());
-    ///    assert_eq!(2, rx.next().await.unwrap());
-    ///    assert_eq!(3, rx.next().await.unwrap());
-    ///    assert_eq!(4, rx.next().await.unwrap());
-    ///    assert_eq!(5, rx.next().await.unwrap());
-    ///
-    ///    // The merged stream is consumed
-    ///    assert!(rx.next().await.is_none());
-    /// }
-    /// ```
-    fn merge<U>(self, other: U) -> Merge<Self, U>
-    where
-        U: Stream<Item = Self::Item>,
-        Self: Sized,
-    {
-        Merge::new(self, other)
-    }
-
-    /// Filters the values produced by this stream according to the provided
-    /// predicate.
-    ///
-    /// As values of this stream are made available, the provided predicate `f`
-    /// will be run against them. If the predicate
-    /// resolves to `true`, then the stream will yield the value, but if the
-    /// predicate resolves to `false`, then the value
-    /// will be discarded and the next value will be produced.
-    ///
-    /// Note that this function consumes the stream passed into it and returns a
-    /// wrapped version of it, similar to [`Iterator::filter`] method in the
-    /// standard library.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let stream = stream::iter(1..=8);
-    /// let mut evens = stream.filter(|x| x % 2 == 0);
-    ///
-    /// assert_eq!(Some(2), evens.next().await);
-    /// assert_eq!(Some(4), evens.next().await);
-    /// assert_eq!(Some(6), evens.next().await);
-    /// assert_eq!(Some(8), evens.next().await);
-    /// assert_eq!(None, evens.next().await);
-    /// # }
-    /// ```
-    fn filter<F>(self, f: F) -> Filter<Self, F>
-    where
-        F: FnMut(&Self::Item) -> bool,
-        Self: Sized,
-    {
-        Filter::new(self, f)
-    }
-
-    /// Filters the values produced by this stream while simultaneously mapping
-    /// them to a different type according to the provided closure.
-    ///
-    /// As values of this stream are made available, the provided function will
-    /// be run on them. If the predicate `f` resolves to
-    /// [`Some(item)`](Some) then the stream will yield the value `item`, but if
-    /// it resolves to [`None`], then the value will be skipped.
-    ///
-    /// Note that this function consumes the stream passed into it and returns a
-    /// wrapped version of it, similar to [`Iterator::filter_map`] method in the
-    /// standard library.
-    ///
-    /// # Examples
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let stream = stream::iter(1..=8);
-    /// let mut evens = stream.filter_map(|x| {
-    ///     if x % 2 == 0 { Some(x + 1) } else { None }
-    /// });
-    ///
-    /// assert_eq!(Some(3), evens.next().await);
-    /// assert_eq!(Some(5), evens.next().await);
-    /// assert_eq!(Some(7), evens.next().await);
-    /// assert_eq!(Some(9), evens.next().await);
-    /// assert_eq!(None, evens.next().await);
-    /// # }
-    /// ```
-    fn filter_map<T, F>(self, f: F) -> FilterMap<Self, F>
-    where
-        F: FnMut(Self::Item) -> Option<T>,
-        Self: Sized,
-    {
-        FilterMap::new(self, f)
-    }
-
-    /// Creates a stream which ends after the first `None`.
-    ///
-    /// After a stream returns `None`, behavior is undefined. Future calls to
-    /// `poll_next` may or may not return `Some(T)` again or they may panic.
-    /// `fuse()` adapts a stream, ensuring that after `None` is given, it will
-    /// return `None` forever.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{Stream, StreamExt};
-    ///
-    /// use std::pin::Pin;
-    /// use std::task::{Context, Poll};
-    ///
-    /// // a stream which alternates between Some and None
-    /// struct Alternate {
-    ///     state: i32,
-    /// }
-    ///
-    /// impl Stream for Alternate {
-    ///     type Item = i32;
-    ///
-    ///     fn poll_next(mut self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<i32>> {
-    ///         let val = self.state;
-    ///         self.state = self.state + 1;
-    ///
-    ///         // if it's even, Some(i32), else None
-    ///         if val % 2 == 0 {
-    ///             Poll::Ready(Some(val))
-    ///         } else {
-    ///             Poll::Ready(None)
-    ///         }
-    ///     }
-    /// }
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///     let mut stream = Alternate { state: 0 };
-    ///
-    ///     // the stream goes back and forth
-    ///     assert_eq!(stream.next().await, Some(0));
-    ///     assert_eq!(stream.next().await, None);
-    ///     assert_eq!(stream.next().await, Some(2));
-    ///     assert_eq!(stream.next().await, None);
-    ///
-    ///     // however, once it is fused
-    ///     let mut stream = stream.fuse();
-    ///
-    ///     assert_eq!(stream.next().await, Some(4));
-    ///     assert_eq!(stream.next().await, None);
-    ///
-    ///     // it will always return `None` after the first time.
-    ///     assert_eq!(stream.next().await, None);
-    ///     assert_eq!(stream.next().await, None);
-    ///     assert_eq!(stream.next().await, None);
-    /// }
-    /// ```
-    fn fuse(self) -> Fuse<Self>
-    where
-        Self: Sized,
-    {
-        Fuse::new(self)
-    }
-
-    /// Creates a new stream of at most `n` items of the underlying stream.
-    ///
-    /// Once `n` items have been yielded from this stream then it will always
-    /// return that the stream is done.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let mut stream = stream::iter(1..=10).take(3);
-    ///
-    /// assert_eq!(Some(1), stream.next().await);
-    /// assert_eq!(Some(2), stream.next().await);
-    /// assert_eq!(Some(3), stream.next().await);
-    /// assert_eq!(None, stream.next().await);
-    /// # }
-    /// ```
-    fn take(self, n: usize) -> Take<Self>
-    where
-        Self: Sized,
-    {
-        Take::new(self, n)
-    }
-
-    /// Take elements from this stream while the provided predicate
-    /// resolves to `true`.
-    ///
-    /// This function, like `Iterator::take_while`, will take elements from the
-    /// stream until the predicate `f` resolves to `false`. Once one element
-    /// returns false it will always return that the stream is done.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let mut stream = stream::iter(1..=10).take_while(|x| *x <= 3);
-    ///
-    /// assert_eq!(Some(1), stream.next().await);
-    /// assert_eq!(Some(2), stream.next().await);
-    /// assert_eq!(Some(3), stream.next().await);
-    /// assert_eq!(None, stream.next().await);
-    /// # }
-    /// ```
-    fn take_while<F>(self, f: F) -> TakeWhile<Self, F>
-    where
-        F: FnMut(&Self::Item) -> bool,
-        Self: Sized,
-    {
-        TakeWhile::new(self, f)
-    }
-
-    /// Creates a new stream that will skip the `n` first items of the
-    /// underlying stream.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let mut stream = stream::iter(1..=10).skip(7);
-    ///
-    /// assert_eq!(Some(8), stream.next().await);
-    /// assert_eq!(Some(9), stream.next().await);
-    /// assert_eq!(Some(10), stream.next().await);
-    /// assert_eq!(None, stream.next().await);
-    /// # }
-    /// ```
-    fn skip(self, n: usize) -> Skip<Self>
-    where
-        Self: Sized,
-    {
-        Skip::new(self, n)
-    }
-
-    /// Skip elements from the underlying stream while the provided predicate
-    /// resolves to `true`.
-    ///
-    /// This function, like [`Iterator::skip_while`], will ignore elemets from the
-    /// stream until the predicate `f` resolves to `false`. Once one element
-    /// returns false, the rest of the elements will be yielded.
-    ///
-    /// [`Iterator::skip_while`]: std::iter::Iterator::skip_while()
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    /// let mut stream = stream::iter(vec![1,2,3,4,1]).skip_while(|x| *x < 3);
-    ///
-    /// assert_eq!(Some(3), stream.next().await);
-    /// assert_eq!(Some(4), stream.next().await);
-    /// assert_eq!(Some(1), stream.next().await);
-    /// assert_eq!(None, stream.next().await);
-    /// # }
-    /// ```
-    fn skip_while<F>(self, f: F) -> SkipWhile<Self, F>
-    where
-        F: FnMut(&Self::Item) -> bool,
-        Self: Sized,
-    {
-        SkipWhile::new(self, f)
-    }
-
-    /// Tests if every element of the stream matches a predicate.
-    ///
-    /// `all()` takes a closure that returns `true` or `false`. It applies
-    /// this closure to each element of the stream, and if they all return
-    /// `true`, then so does `all`. If any of them return `false`, it
-    /// returns `false`. An empty stream returns `true`.
-    ///
-    /// `all()` is short-circuiting; in other words, it will stop processing
-    /// as soon as it finds a `false`, given that no matter what else happens,
-    /// the result will also be `false`.
-    ///
-    /// An empty stream returns `true`.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let a = [1, 2, 3];
-    ///
-    /// assert!(stream::iter(&a).all(|&x| x > 0).await);
-    ///
-    /// assert!(!stream::iter(&a).all(|&x| x > 2).await);
-    /// # }
-    /// ```
-    ///
-    /// Stopping at the first `false`:
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let a = [1, 2, 3];
-    ///
-    /// let mut iter = stream::iter(&a);
-    ///
-    /// assert!(!iter.all(|&x| x != 2).await);
-    ///
-    /// // we can still use `iter`, as there are more elements.
-    /// assert_eq!(iter.next().await, Some(&3));
-    /// # }
-    /// ```
-    fn all<F>(&mut self, f: F) -> AllFuture<'_, Self, F>
-    where
-        Self: Unpin,
-        F: FnMut(Self::Item) -> bool,
-    {
-        AllFuture::new(self, f)
-    }
-
-    /// Tests if any element of the stream matches a predicate.
-    ///
-    /// `any()` takes a closure that returns `true` or `false`. It applies
-    /// this closure to each element of the stream, and if any of them return
-    /// `true`, then so does `any()`. If they all return `false`, it
-    /// returns `false`.
-    ///
-    /// `any()` is short-circuiting; in other words, it will stop processing
-    /// as soon as it finds a `true`, given that no matter what else happens,
-    /// the result will also be `true`.
-    ///
-    /// An empty stream returns `false`.
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let a = [1, 2, 3];
-    ///
-    /// assert!(stream::iter(&a).any(|&x| x > 0).await);
-    ///
-    /// assert!(!stream::iter(&a).any(|&x| x > 5).await);
-    /// # }
-    /// ```
-    ///
-    /// Stopping at the first `true`:
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// let a = [1, 2, 3];
-    ///
-    /// let mut iter = stream::iter(&a);
-    ///
-    /// assert!(iter.any(|&x| x != 2).await);
-    ///
-    /// // we can still use `iter`, as there are more elements.
-    /// assert_eq!(iter.next().await, Some(&2));
-    /// # }
-    /// ```
-    fn any<F>(&mut self, f: F) -> AnyFuture<'_, Self, F>
-    where
-        Self: Unpin,
-        F: FnMut(Self::Item) -> bool,
-    {
-        AnyFuture::new(self, f)
-    }
-
-    /// Combine two streams into one by first returning all values from the
-    /// first stream then all values from the second stream.
-    ///
-    /// As long as `self` still has values to emit, no values from `other` are
-    /// emitted, even if some are ready.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///     let one = stream::iter(vec![1, 2, 3]);
-    ///     let two = stream::iter(vec![4, 5, 6]);
-    ///
-    ///     let mut stream = one.chain(two);
-    ///
-    ///     assert_eq!(stream.next().await, Some(1));
-    ///     assert_eq!(stream.next().await, Some(2));
-    ///     assert_eq!(stream.next().await, Some(3));
-    ///     assert_eq!(stream.next().await, Some(4));
-    ///     assert_eq!(stream.next().await, Some(5));
-    ///     assert_eq!(stream.next().await, Some(6));
-    ///     assert_eq!(stream.next().await, None);
-    /// }
-    /// ```
-    fn chain<U>(self, other: U) -> Chain<Self, U>
-    where
-        U: Stream<Item = Self::Item>,
-        Self: Sized,
-    {
-        Chain::new(self, other)
-    }
-
-    /// A combinator that applies a function to every element in a stream
-    /// producing a single, final value.
-    ///
-    /// # Examples
-    /// Basic usage:
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, *};
-    ///
-    /// let s = stream::iter(vec![1u8, 2, 3]);
-    /// let sum = s.fold(0, |acc, x| acc + x).await;
-    ///
-    /// assert_eq!(sum, 6);
-    /// # }
-    /// ```
-    fn fold<B, F>(self, init: B, f: F) -> FoldFuture<Self, B, F>
-    where
-        Self: Sized,
-        F: FnMut(B, Self::Item) -> B,
-    {
-        FoldFuture::new(self, init, f)
-    }
-
-    /// Drain stream pushing all emitted values into a collection.
-    ///
-    /// `collect` streams all values, awaiting as needed. Values are pushed into
-    /// a collection. A number of different target collection types are
-    /// supported, including [`Vec`](std::vec::Vec),
-    /// [`String`](std::string::String), and [`Bytes`](bytes::Bytes).
-    ///
-    /// # `Result`
-    ///
-    /// `collect()` can also be used with streams of type `Result<T, E>` where
-    /// `T: FromStream<_>`. In this case, `collect()` will stream as long as
-    /// values yielded from the stream are `Ok(_)`. If `Err(_)` is encountered,
-    /// streaming is terminated and `collect()` returns the `Err`.
-    ///
-    /// # Notes
-    ///
-    /// `FromStream` is currently a sealed trait. Stabilization is pending
-    /// enhancements to the Rust language.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///     let doubled: Vec<i32> =
-    ///         stream::iter(vec![1, 2, 3])
-    ///             .map(|x| x * 2)
-    ///             .collect()
-    ///             .await;
-    ///
-    ///     assert_eq!(vec![2, 4, 6], doubled);
-    /// }
-    /// ```
-    ///
-    /// Collecting a stream of `Result` values
-    ///
-    /// ```
-    /// use tokio::stream::{self, StreamExt};
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///     // A stream containing only `Ok` values will be collected
-    ///     let values: Result<Vec<i32>, &str> =
-    ///         stream::iter(vec![Ok(1), Ok(2), Ok(3)])
-    ///             .collect()
-    ///             .await;
-    ///
-    ///     assert_eq!(Ok(vec![1, 2, 3]), values);
-    ///
-    ///     // A stream containing `Err` values will return the first error.
-    ///     let results = vec![Ok(1), Err("no"), Ok(2), Ok(3), Err("nein")];
-    ///
-    ///     let values: Result<Vec<i32>, &str> =
-    ///         stream::iter(results)
-    ///             .collect()
-    ///             .await;
-    ///
-    ///     assert_eq!(Err("no"), values);
-    /// }
-    /// ```
-    fn collect<T>(self) -> Collect<Self, T>
-    where
-        T: FromStream<Self::Item>,
-        Self: Sized,
-    {
-        Collect::new(self)
-    }
-
-    /// Applies a per-item timeout to the passed stream.
-    ///
-    /// `timeout()` takes a `Duration` that represents the maximum amount of
-    /// time each element of the stream has to complete before timing out.
-    ///
-    /// If the wrapped stream yields a value before the deadline is reached, the
-    /// value is returned. Otherwise, an error is returned. The caller may decide
-    /// to continue consuming the stream and will eventually get the next source
-    /// stream value once it becomes available.
-    ///
-    /// # Notes
-    ///
-    /// This function consumes the stream passed into it and returns a
-    /// wrapped version of it.
-    ///
-    /// Polling the returned stream will continue to poll the inner stream even
-    /// if one or more items time out.
-    ///
-    /// # Examples
-    ///
-    /// Suppose we have a stream `int_stream` that yields 3 numbers (1, 2, 3):
-    ///
-    /// ```
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// use tokio::stream::{self, StreamExt};
-    /// use std::time::Duration;
-    /// # let int_stream = stream::iter(1..=3);
-    ///
-    /// let mut int_stream = int_stream.timeout(Duration::from_secs(1));
-    ///
-    /// // When no items time out, we get the 3 elements in succession:
-    /// assert_eq!(int_stream.try_next().await, Ok(Some(1)));
-    /// assert_eq!(int_stream.try_next().await, Ok(Some(2)));
-    /// assert_eq!(int_stream.try_next().await, Ok(Some(3)));
-    /// assert_eq!(int_stream.try_next().await, Ok(None));
-    ///
-    /// // If the second item times out, we get an error and continue polling the stream:
-    /// # let mut int_stream = stream::iter(vec![Ok(1), Err(()), Ok(2), Ok(3)]);
-    /// assert_eq!(int_stream.try_next().await, Ok(Some(1)));
-    /// assert!(int_stream.try_next().await.is_err());
-    /// assert_eq!(int_stream.try_next().await, Ok(Some(2)));
-    /// assert_eq!(int_stream.try_next().await, Ok(Some(3)));
-    /// assert_eq!(int_stream.try_next().await, Ok(None));
-    ///
-    /// // If we want to stop consuming the source stream the first time an
-    /// // element times out, we can use the `take_while` operator:
-    /// # let int_stream = stream::iter(vec![Ok(1), Err(()), Ok(2), Ok(3)]);
-    /// let mut int_stream = int_stream.take_while(Result::is_ok);
-    ///
-    /// assert_eq!(int_stream.try_next().await, Ok(Some(1)));
-    /// assert_eq!(int_stream.try_next().await, Ok(None));
-    /// # }
-    /// ```
-    #[cfg(all(feature = "time"))]
-    #[cfg_attr(docsrs, doc(cfg(feature = "time")))]
-    fn timeout(self, duration: Duration) -> Timeout<Self>
-    where
-        Self: Sized,
-    {
-        Timeout::new(self, duration)
-    }
-}
-
-impl<St: ?Sized> StreamExt for St where St: Stream {}
-
-/// Merge the size hints from two streams.
-fn merge_size_hints(
-    (left_low, left_high): (usize, Option<usize>),
-    (right_low, right_hign): (usize, Option<usize>),
-) -> (usize, Option<usize>) {
-    let low = left_low.saturating_add(right_low);
-    let high = match (left_high, right_hign) {
-        (Some(h1), Some(h2)) => h1.checked_add(h2),
-        _ => None,
-    };
-    (low, high)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/next.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/next.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/next.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/next.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-use crate::stream::Stream;
-
-use core::future::Future;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-
-/// Future for the [`next`](super::StreamExt::next) method.
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Next<'a, St: ?Sized> {
-    stream: &'a mut St,
-}
-
-impl<St: ?Sized + Unpin> Unpin for Next<'_, St> {}
-
-impl<'a, St: ?Sized> Next<'a, St> {
-    pub(super) fn new(stream: &'a mut St) -> Self {
-        Next { stream }
-    }
-}
-
-impl<St: ?Sized + Stream + Unpin> Future for Next<'_, St> {
-    type Output = Option<St::Item>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.stream).poll_next(cx)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/once.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/once.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/once.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/once.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-use crate::stream::{self, Iter, Stream};
-
-use core::option;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-
-/// Stream for the [`once`](fn@once) function.
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Once<T> {
-    iter: Iter<option::IntoIter<T>>,
-}
-
-impl<I> Unpin for Once<I> {}
-
-/// Creates a stream that emits an element exactly once.
-///
-/// The returned stream is immediately ready and emits the provided value once.
-///
-/// # Examples
-///
-/// ```
-/// use tokio::stream::{self, StreamExt};
-///
-/// #[tokio::main]
-/// async fn main() {
-///     // one is the loneliest number
-///     let mut one = stream::once(1);
-///
-///     assert_eq!(Some(1), one.next().await);
-///
-///     // just one, that's all we get
-///     assert_eq!(None, one.next().await);
-/// }
-/// ```
-pub fn once<T>(value: T) -> Once<T> {
-    Once {
-        iter: stream::iter(Some(value).into_iter()),
-    }
-}
-
-impl<T> Stream for Once<T> {
-    type Item = T;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
-        Pin::new(&mut self.iter).poll_next(cx)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/pending.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/pending.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/pending.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/pending.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-use crate::stream::Stream;
-
-use core::marker::PhantomData;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-
-/// Stream for the [`pending`](fn@pending) function.
-#[derive(Debug)]
-#[must_use = "streams do nothing unless polled"]
-pub struct Pending<T>(PhantomData<T>);
-
-impl<T> Unpin for Pending<T> {}
-unsafe impl<T> Send for Pending<T> {}
-unsafe impl<T> Sync for Pending<T> {}
-
-/// Creates a stream that is never ready
-///
-/// The returned stream is never ready. Attempting to call
-/// [`next()`](crate::stream::StreamExt::next) will never complete. Use
-/// [`stream::empty()`](super::empty()) to obtain a stream that is is
-/// immediately empty but returns no values.
-///
-/// # Examples
-///
-/// Basic usage:
-///
-/// ```no_run
-/// use tokio::stream::{self, StreamExt};
-///
-/// #[tokio::main]
-/// async fn main() {
-///     let mut never = stream::pending::<i32>();
-///
-///     // This will never complete
-///     never.next().await;
-///
-///     unreachable!();
-/// }
-/// ```
-pub const fn pending<T>() -> Pending<T> {
-    Pending(PhantomData)
-}
-
-impl<T> Stream for Pending<T> {
-    type Item = T;
-
-    fn poll_next(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<T>> {
-        Poll::Pending
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, None)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/skip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/skip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/skip.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/skip.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-use crate::stream::Stream;
-
-use core::fmt;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream for the [`skip`](super::StreamExt::skip) method.
-    #[must_use = "streams do nothing unless polled"]
-    pub struct Skip<St> {
-        #[pin]
-        stream: St,
-        remaining: usize,
-    }
-}
-
-impl<St> fmt::Debug for Skip<St>
-where
-    St: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Skip")
-            .field("stream", &self.stream)
-            .finish()
-    }
-}
-
-impl<St> Skip<St> {
-    pub(super) fn new(stream: St, remaining: usize) -> Self {
-        Self { stream, remaining }
-    }
-}
-
-impl<St> Stream for Skip<St>
-where
-    St: Stream,
-{
-    type Item = St::Item;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        loop {
-            match ready!(self.as_mut().project().stream.poll_next(cx)) {
-                Some(e) => {
-                    if self.remaining == 0 {
-                        return Poll::Ready(Some(e));
-                    }
-                    *self.as_mut().project().remaining -= 1;
-                }
-                None => return Poll::Ready(None),
-            }
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let (lower, upper) = self.stream.size_hint();
-
-        let lower = lower.saturating_sub(self.remaining);
-        let upper = upper.map(|x| x.saturating_sub(self.remaining));
-
-        (lower, upper)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/skip_while.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/skip_while.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/skip_while.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/skip_while.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-use crate::stream::Stream;
-
-use core::fmt;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream for the [`skip_while`](super::StreamExt::skip_while) method.
-    #[must_use = "streams do nothing unless polled"]
-    pub struct SkipWhile<St, F> {
-        #[pin]
-        stream: St,
-        predicate: Option<F>,
-    }
-}
-
-impl<St, F> fmt::Debug for SkipWhile<St, F>
-where
-    St: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("SkipWhile")
-            .field("stream", &self.stream)
-            .finish()
-    }
-}
-
-impl<St, F> SkipWhile<St, F> {
-    pub(super) fn new(stream: St, predicate: F) -> Self {
-        Self {
-            stream,
-            predicate: Some(predicate),
-        }
-    }
-}
-
-impl<St, F> Stream for SkipWhile<St, F>
-where
-    St: Stream,
-    F: FnMut(&St::Item) -> bool,
-{
-    type Item = St::Item;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let mut this = self.project();
-        if let Some(predicate) = this.predicate {
-            loop {
-                match ready!(this.stream.as_mut().poll_next(cx)) {
-                    Some(item) => {
-                        if !(predicate)(&item) {
-                            *this.predicate = None;
-                            return Poll::Ready(Some(item));
-                        }
-                    }
-                    None => return Poll::Ready(None),
-                }
-            }
-        } else {
-            this.stream.poll_next(cx)
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let (lower, upper) = self.stream.size_hint();
-
-        if self.predicate.is_some() {
-            return (0, upper);
-        }
-
-        (lower, upper)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/stream_map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/stream_map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/stream_map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/stream_map.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,503 +0,0 @@
-use crate::stream::Stream;
-
-use std::borrow::Borrow;
-use std::hash::Hash;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-/// Combine many streams into one, indexing each source stream with a unique
-/// key.
-///
-/// `StreamMap` is similar to [`StreamExt::merge`] in that it combines source
-/// streams into a single merged stream that yields values in the order that
-/// they arrive from the source streams. However, `StreamMap` has a lot more
-/// flexibility in usage patterns.
-///
-/// `StreamMap` can:
-///
-/// * Merge an arbitrary number of streams.
-/// * Track which source stream the value was received from.
-/// * Handle inserting and removing streams from the set of managed streams at
-///   any point during iteration.
-///
-/// All source streams held by `StreamMap` are indexed using a key. This key is
-/// included with the value when a source stream yields a value. The key is also
-/// used to remove the stream from the `StreamMap` before the stream has
-/// completed streaming.
-///
-/// # `Unpin`
-///
-/// Because the `StreamMap` API moves streams during runtime, both streams and
-/// keys must be `Unpin`. In order to insert a `!Unpin` stream into a
-/// `StreamMap`, use [`pin!`] to pin the stream to the stack or [`Box::pin`] to
-/// pin the stream in the heap.
-///
-/// # Implementation
-///
-/// `StreamMap` is backed by a `Vec<(K, V)>`. There is no guarantee that this
-/// internal implementation detail will persist in future versions, but it is
-/// important to know the runtime implications. In general, `StreamMap` works
-/// best with a "smallish" number of streams as all entries are scanned on
-/// insert, remove, and polling. In cases where a large number of streams need
-/// to be merged, it may be advisable to use tasks sending values on a shared
-/// [`mpsc`] channel.
-///
-/// [`StreamExt::merge`]: crate::stream::StreamExt::merge
-/// [`mpsc`]: crate::sync::mpsc
-/// [`pin!`]: macro@pin
-/// [`Box::pin`]: std::boxed::Box::pin
-///
-/// # Examples
-///
-/// Merging two streams, then remove them after receiving the first value
-///
-/// ```
-/// use tokio::stream::{StreamExt, StreamMap};
-/// use tokio::sync::mpsc;
-///
-/// #[tokio::main]
-/// async fn main() {
-///     let (mut tx1, rx1) = mpsc::channel(10);
-///     let (mut tx2, rx2) = mpsc::channel(10);
-///
-///     tokio::spawn(async move {
-///         tx1.send(1).await.unwrap();
-///
-///         // This value will never be received. The send may or may not return
-///         // `Err` depending on if the remote end closed first or not.
-///         let _ = tx1.send(2).await;
-///     });
-///
-///     tokio::spawn(async move {
-///         tx2.send(3).await.unwrap();
-///         let _ = tx2.send(4).await;
-///     });
-///
-///     let mut map = StreamMap::new();
-///
-///     // Insert both streams
-///     map.insert("one", rx1);
-///     map.insert("two", rx2);
-///
-///     // Read twice
-///     for _ in 0..2 {
-///         let (key, val) = map.next().await.unwrap();
-///
-///         if key == "one" {
-///             assert_eq!(val, 1);
-///         } else {
-///             assert_eq!(val, 3);
-///         }
-///
-///         // Remove the stream to prevent reading the next value
-///         map.remove(key);
-///     }
-/// }
-/// ```
-///
-/// This example models a read-only client to a chat system with channels. The
-/// client sends commands to join and leave channels. `StreamMap` is used to
-/// manage active channel subscriptions.
-///
-/// For simplicity, messages are displayed with `println!`, but they could be
-/// sent to the client over a socket.
-///
-/// ```no_run
-/// use tokio::stream::{Stream, StreamExt, StreamMap};
-///
-/// enum Command {
-///     Join(String),
-///     Leave(String),
-/// }
-///
-/// fn commands() -> impl Stream<Item = Command> {
-///     // Streams in user commands by parsing `stdin`.
-/// # tokio::stream::pending()
-/// }
-///
-/// // Join a channel, returns a stream of messages received on the channel.
-/// fn join(channel: &str) -> impl Stream<Item = String> + Unpin {
-///     // left as an exercise to the reader
-/// # tokio::stream::pending()
-/// }
-///
-/// #[tokio::main]
-/// async fn main() {
-///     let mut channels = StreamMap::new();
-///
-///     // Input commands (join / leave channels).
-///     let cmds = commands();
-///     tokio::pin!(cmds);
-///
-///     loop {
-///         tokio::select! {
-///             Some(cmd) = cmds.next() => {
-///                 match cmd {
-///                     Command::Join(chan) => {
-///                         // Join the channel and add it to the `channels`
-///                         // stream map
-///                         let msgs = join(&chan);
-///                         channels.insert(chan, msgs);
-///                     }
-///                     Command::Leave(chan) => {
-///                         channels.remove(&chan);
-///                     }
-///                 }
-///             }
-///             Some((chan, msg)) = channels.next() => {
-///                 // Received a message, display it on stdout with the channel
-///                 // it originated from.
-///                 println!("{}: {}", chan, msg);
-///             }
-///             // Both the `commands` stream and the `channels` stream are
-///             // complete. There is no more work to do, so leave the loop.
-///             else => break,
-///         }
-///     }
-/// }
-/// ```
-#[derive(Debug, Default)]
-pub struct StreamMap<K, V> {
-    /// Streams stored in the map
-    entries: Vec<(K, V)>,
-}
-
-impl<K, V> StreamMap<K, V> {
-    /// Creates an empty `StreamMap`.
-    ///
-    /// The stream map is initially created with a capacity of `0`, so it will
-    /// not allocate until it is first inserted into.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, Pending};
-    ///
-    /// let map: StreamMap<&str, Pending<()>> = StreamMap::new();
-    /// ```
-    pub fn new() -> StreamMap<K, V> {
-        StreamMap { entries: vec![] }
-    }
-
-    /// Creates an empty `StreamMap` with the specified capacity.
-    ///
-    /// The stream map will be able to hold at least `capacity` elements without
-    /// reallocating. If `capacity` is 0, the stream map will not allocate.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, Pending};
-    ///
-    /// let map: StreamMap<&str, Pending<()>> = StreamMap::with_capacity(10);
-    /// ```
-    pub fn with_capacity(capacity: usize) -> StreamMap<K, V> {
-        StreamMap {
-            entries: Vec::with_capacity(capacity),
-        }
-    }
-
-    /// Returns an iterator visiting all keys in arbitrary order.
-    ///
-    /// The iterator element type is &'a K.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, pending};
-    ///
-    /// let mut map = StreamMap::new();
-    ///
-    /// map.insert("a", pending::<i32>());
-    /// map.insert("b", pending());
-    /// map.insert("c", pending());
-    ///
-    /// for key in map.keys() {
-    ///     println!("{}", key);
-    /// }
-    /// ```
-    pub fn keys(&self) -> impl Iterator<Item = &K> {
-        self.entries.iter().map(|(k, _)| k)
-    }
-
-    /// An iterator visiting all values in arbitrary order.
-    ///
-    /// The iterator element type is &'a V.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, pending};
-    ///
-    /// let mut map = StreamMap::new();
-    ///
-    /// map.insert("a", pending::<i32>());
-    /// map.insert("b", pending());
-    /// map.insert("c", pending());
-    ///
-    /// for stream in map.values() {
-    ///     println!("{:?}", stream);
-    /// }
-    /// ```
-    pub fn values(&self) -> impl Iterator<Item = &V> {
-        self.entries.iter().map(|(_, v)| v)
-    }
-
-    /// An iterator visiting all values mutably in arbitrary order.
-    ///
-    /// The iterator element type is &'a mut V.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, pending};
-    ///
-    /// let mut map = StreamMap::new();
-    ///
-    /// map.insert("a", pending::<i32>());
-    /// map.insert("b", pending());
-    /// map.insert("c", pending());
-    ///
-    /// for stream in map.values_mut() {
-    ///     println!("{:?}", stream);
-    /// }
-    /// ```
-    pub fn values_mut(&mut self) -> impl Iterator<Item = &mut V> {
-        self.entries.iter_mut().map(|(_, v)| v)
-    }
-
-    /// Returns the number of streams the map can hold without reallocating.
-    ///
-    /// This number is a lower bound; the `StreamMap` might be able to hold
-    /// more, but is guaranteed to be able to hold at least this many.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, Pending};
-    ///
-    /// let map: StreamMap<i32, Pending<()>> = StreamMap::with_capacity(100);
-    /// assert!(map.capacity() >= 100);
-    /// ```
-    pub fn capacity(&self) -> usize {
-        self.entries.capacity()
-    }
-
-    /// Returns the number of streams in the map.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, pending};
-    ///
-    /// let mut a = StreamMap::new();
-    /// assert_eq!(a.len(), 0);
-    /// a.insert(1, pending::<i32>());
-    /// assert_eq!(a.len(), 1);
-    /// ```
-    pub fn len(&self) -> usize {
-        self.entries.len()
-    }
-
-    /// Returns `true` if the map contains no elements.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::collections::HashMap;
-    ///
-    /// let mut a = HashMap::new();
-    /// assert!(a.is_empty());
-    /// a.insert(1, "a");
-    /// assert!(!a.is_empty());
-    /// ```
-    pub fn is_empty(&self) -> bool {
-        self.entries.is_empty()
-    }
-
-    /// Clears the map, removing all key-stream pairs. Keeps the allocated
-    /// memory for reuse.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, pending};
-    ///
-    /// let mut a = StreamMap::new();
-    /// a.insert(1, pending::<i32>());
-    /// a.clear();
-    /// assert!(a.is_empty());
-    /// ```
-    pub fn clear(&mut self) {
-        self.entries.clear();
-    }
-
-    /// Insert a key-stream pair into the map.
-    ///
-    /// If the map did not have this key present, `None` is returned.
-    ///
-    /// If the map did have this key present, the new `stream` replaces the old
-    /// one and the old stream is returned.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, pending};
-    ///
-    /// let mut map = StreamMap::new();
-    ///
-    /// assert!(map.insert(37, pending::<i32>()).is_none());
-    /// assert!(!map.is_empty());
-    ///
-    /// map.insert(37, pending());
-    /// assert!(map.insert(37, pending()).is_some());
-    /// ```
-    pub fn insert(&mut self, k: K, stream: V) -> Option<V>
-    where
-        K: Hash + Eq,
-    {
-        let ret = self.remove(&k);
-        self.entries.push((k, stream));
-
-        ret
-    }
-
-    /// Removes a key from the map, returning the stream at the key if the key was previously in the map.
-    ///
-    /// The key may be any borrowed form of the map's key type, but `Hash` and
-    /// `Eq` on the borrowed form must match those for the key type.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, pending};
-    ///
-    /// let mut map = StreamMap::new();
-    /// map.insert(1, pending::<i32>());
-    /// assert!(map.remove(&1).is_some());
-    /// assert!(map.remove(&1).is_none());
-    /// ```
-    pub fn remove<Q: ?Sized>(&mut self, k: &Q) -> Option<V>
-    where
-        K: Borrow<Q>,
-        Q: Hash + Eq,
-    {
-        for i in 0..self.entries.len() {
-            if self.entries[i].0.borrow() == k {
-                return Some(self.entries.swap_remove(i).1);
-            }
-        }
-
-        None
-    }
-
-    /// Returns `true` if the map contains a stream for the specified key.
-    ///
-    /// The key may be any borrowed form of the map's key type, but `Hash` and
-    /// `Eq` on the borrowed form must match those for the key type.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::stream::{StreamMap, pending};
-    ///
-    /// let mut map = StreamMap::new();
-    /// map.insert(1, pending::<i32>());
-    /// assert_eq!(map.contains_key(&1), true);
-    /// assert_eq!(map.contains_key(&2), false);
-    /// ```
-    pub fn contains_key<Q: ?Sized>(&self, k: &Q) -> bool
-    where
-        K: Borrow<Q>,
-        Q: Hash + Eq,
-    {
-        for i in 0..self.entries.len() {
-            if self.entries[i].0.borrow() == k {
-                return true;
-            }
-        }
-
-        false
-    }
-}
-
-impl<K, V> StreamMap<K, V>
-where
-    K: Unpin,
-    V: Stream + Unpin,
-{
-    /// Polls the next value, includes the vec entry index
-    fn poll_next_entry(&mut self, cx: &mut Context<'_>) -> Poll<Option<(usize, V::Item)>> {
-        use Poll::*;
-
-        let start = crate::util::thread_rng_n(self.entries.len() as u32) as usize;
-        let mut idx = start;
-
-        for _ in 0..self.entries.len() {
-            let (_, stream) = &mut self.entries[idx];
-
-            match Pin::new(stream).poll_next(cx) {
-                Ready(Some(val)) => return Ready(Some((idx, val))),
-                Ready(None) => {
-                    // Remove the entry
-                    self.entries.swap_remove(idx);
-
-                    // Check if this was the last entry, if so the cursor needs
-                    // to wrap
-                    if idx == self.entries.len() {
-                        idx = 0;
-                    } else if idx < start && start <= self.entries.len() {
-                        // The stream being swapped into the current index has
-                        // already been polled, so skip it.
-                        idx = idx.wrapping_add(1) % self.entries.len();
-                    }
-                }
-                Pending => {
-                    idx = idx.wrapping_add(1) % self.entries.len();
-                }
-            }
-        }
-
-        // If the map is empty, then the stream is complete.
-        if self.entries.is_empty() {
-            Ready(None)
-        } else {
-            Pending
-        }
-    }
-}
-
-impl<K, V> Stream for StreamMap<K, V>
-where
-    K: Clone + Unpin,
-    V: Stream + Unpin,
-{
-    type Item = (K, V::Item);
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        if let Some((idx, val)) = ready!(self.poll_next_entry(cx)) {
-            let key = self.entries[idx].0.clone();
-            Poll::Ready(Some((key, val)))
-        } else {
-            Poll::Ready(None)
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let mut ret = (0, Some(0));
-
-        for (_, stream) in &self.entries {
-            let hint = stream.size_hint();
-
-            ret.0 += hint.0;
-
-            match (ret.1, hint.1) {
-                (Some(a), Some(b)) => ret.1 = Some(a + b),
-                (Some(_), None) => ret.1 = None,
-                _ => {}
-            }
-        }
-
-        ret
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/take.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/take.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/take.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/take.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-use crate::stream::Stream;
-
-use core::cmp;
-use core::fmt;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream for the [`take`](super::StreamExt::take) method.
-    #[must_use = "streams do nothing unless polled"]
-    pub struct Take<St> {
-        #[pin]
-        stream: St,
-        remaining: usize,
-    }
-}
-
-impl<St> fmt::Debug for Take<St>
-where
-    St: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Take")
-            .field("stream", &self.stream)
-            .finish()
-    }
-}
-
-impl<St> Take<St> {
-    pub(super) fn new(stream: St, remaining: usize) -> Self {
-        Self { stream, remaining }
-    }
-}
-
-impl<St> Stream for Take<St>
-where
-    St: Stream,
-{
-    type Item = St::Item;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        if *self.as_mut().project().remaining > 0 {
-            self.as_mut().project().stream.poll_next(cx).map(|ready| {
-                match &ready {
-                    Some(_) => {
-                        *self.as_mut().project().remaining -= 1;
-                    }
-                    None => {
-                        *self.as_mut().project().remaining = 0;
-                    }
-                }
-                ready
-            })
-        } else {
-            Poll::Ready(None)
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        if self.remaining == 0 {
-            return (0, Some(0));
-        }
-
-        let (lower, upper) = self.stream.size_hint();
-
-        let lower = cmp::min(lower, self.remaining as usize);
-
-        let upper = match upper {
-            Some(x) if x < self.remaining as usize => Some(x),
-            _ => Some(self.remaining as usize),
-        };
-
-        (lower, upper)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/take_while.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/take_while.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/take_while.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/take_while.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-use crate::stream::Stream;
-
-use core::fmt;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-
-pin_project! {
-    /// Stream for the [`take_while`](super::StreamExt::take_while) method.
-    #[must_use = "streams do nothing unless polled"]
-    pub struct TakeWhile<St, F> {
-        #[pin]
-        stream: St,
-        predicate: F,
-        done: bool,
-    }
-}
-
-impl<St, F> fmt::Debug for TakeWhile<St, F>
-where
-    St: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TakeWhile")
-            .field("stream", &self.stream)
-            .field("done", &self.done)
-            .finish()
-    }
-}
-
-impl<St, F> TakeWhile<St, F> {
-    pub(super) fn new(stream: St, predicate: F) -> Self {
-        Self {
-            stream,
-            predicate,
-            done: false,
-        }
-    }
-}
-
-impl<St, F> Stream for TakeWhile<St, F>
-where
-    St: Stream,
-    F: FnMut(&St::Item) -> bool,
-{
-    type Item = St::Item;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        if !*self.as_mut().project().done {
-            self.as_mut().project().stream.poll_next(cx).map(|ready| {
-                let ready = ready.and_then(|item| {
-                    if !(self.as_mut().project().predicate)(&item) {
-                        None
-                    } else {
-                        Some(item)
-                    }
-                });
-
-                if ready.is_none() {
-                    *self.as_mut().project().done = true;
-                }
-
-                ready
-            })
-        } else {
-            Poll::Ready(None)
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        if self.done {
-            return (0, Some(0));
-        }
-
-        let (_, upper) = self.stream.size_hint();
-
-        (0, upper)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/timeout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/timeout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/timeout.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/timeout.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-use crate::stream::{Fuse, Stream};
-use crate::time::{Delay, Elapsed, Instant};
-
-use core::future::Future;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-use pin_project_lite::pin_project;
-use std::time::Duration;
-
-pin_project! {
-    /// Stream returned by the [`timeout`](super::StreamExt::timeout) method.
-    #[must_use = "streams do nothing unless polled"]
-    #[derive(Debug)]
-    pub struct Timeout<S> {
-        #[pin]
-        stream: Fuse<S>,
-        deadline: Delay,
-        duration: Duration,
-        poll_deadline: bool,
-    }
-}
-
-impl<S: Stream> Timeout<S> {
-    pub(super) fn new(stream: S, duration: Duration) -> Self {
-        let next = Instant::now() + duration;
-        let deadline = Delay::new_timeout(next, duration);
-
-        Timeout {
-            stream: Fuse::new(stream),
-            deadline,
-            duration,
-            poll_deadline: true,
-        }
-    }
-}
-
-impl<S: Stream> Stream for Timeout<S> {
-    type Item = Result<S::Item, Elapsed>;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        match self.as_mut().project().stream.poll_next(cx) {
-            Poll::Ready(v) => {
-                if v.is_some() {
-                    let next = Instant::now() + self.duration;
-                    self.as_mut().project().deadline.reset(next);
-                    *self.as_mut().project().poll_deadline = true;
-                }
-                return Poll::Ready(v.map(Ok));
-            }
-            Poll::Pending => {}
-        };
-
-        if self.poll_deadline {
-            ready!(Pin::new(self.as_mut().project().deadline).poll(cx));
-            *self.as_mut().project().poll_deadline = false;
-            return Poll::Ready(Some(Err(Elapsed::new())));
-        }
-
-        Poll::Pending
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.stream.size_hint()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/try_next.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/try_next.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/stream/try_next.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/stream/try_next.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-use crate::stream::{Next, Stream};
-
-use core::future::Future;
-use core::pin::Pin;
-use core::task::{Context, Poll};
-
-/// Future for the [`try_next`](super::StreamExt::try_next) method.
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct TryNext<'a, St: ?Sized> {
-    inner: Next<'a, St>,
-}
-
-impl<St: ?Sized + Unpin> Unpin for TryNext<'_, St> {}
-
-impl<'a, St: ?Sized> TryNext<'a, St> {
-    pub(super) fn new(stream: &'a mut St) -> Self {
-        Self {
-            inner: Next::new(stream),
-        }
-    }
-}
-
-impl<T, E, St: ?Sized + Stream<Item = Result<T, E>> + Unpin> Future for TryNext<'_, St> {
-    type Output = Result<Option<T>, E>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.inner).poll(cx).map(Option::transpose)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/barrier.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/barrier.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/barrier.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/barrier.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,12 @@
+use crate::loom::sync::Mutex;
 use crate::sync::watch;
 
-use std::sync::Mutex;
-
-/// A barrier enables multiple threads to synchronize the beginning of some computation.
+/// A barrier enables multiple tasks to synchronize the beginning of some computation.
 ///
 /// ```
 /// # #[tokio::main]
 /// # async fn main() {
 /// use tokio::sync::Barrier;
-///
-/// use futures::future::join_all;
 /// use std::sync::Arc;
 ///
 /// let mut handles = Vec::with_capacity(10);
@@ -18,17 +15,25 @@
 ///     let c = barrier.clone();
 ///     // The same messages will be printed together.
 ///     // You will NOT see any interleaving.
-///     handles.push(async move {
+///     handles.push(tokio::spawn(async move {
 ///         println!("before wait");
-///         let wr = c.wait().await;
+///         let wait_result = c.wait().await;
 ///         println!("after wait");
-///         wr
-///     });
+///         wait_result
+///     }));
+/// }
+///
+/// // Will not resolve until all "after wait" messages have been printed
+/// let mut num_leaders = 0;
+/// for handle in handles {
+///     let wait_result = handle.await.unwrap();
+///     if wait_result.is_leader() {
+///         num_leaders += 1;
+///     }
 /// }
-/// // Will not resolve until all "before wait" messages have been printed
-/// let wrs = join_all(handles).await;
+///
 /// // Exactly one barrier will resolve as the "leader"
-/// assert_eq!(wrs.into_iter().filter(|wr| wr.is_leader()).count(), 1);
+/// assert_eq!(num_leaders, 1);
 /// # }
 /// ```
 #[derive(Debug)]
@@ -46,10 +51,10 @@
 }
 
 impl Barrier {
-    /// Creates a new barrier that can block a given number of threads.
+    /// Creates a new barrier that can block a given number of tasks.
     ///
-    /// A barrier will block `n`-1 threads which call [`Barrier::wait`] and then wake up all
-    /// threads at once when the `n`th thread calls `wait`.
+    /// A barrier will block `n`-1 tasks which call [`Barrier::wait`] and then wake up all
+    /// tasks at once when the `n`th task calls `wait`.
     pub fn new(mut n: usize) -> Barrier {
         let (waker, wait) = crate::sync::watch::channel(0);
 
@@ -73,11 +78,11 @@
 
     /// Does not resolve until all tasks have rendezvoused here.
     ///
-    /// Barriers are re-usable after all threads have rendezvoused once, and can
+    /// Barriers are re-usable after all tasks have rendezvoused once, and can
     /// be used continuously.
     ///
     /// A single (arbitrary) future will receive a [`BarrierWaitResult`] that returns `true` from
-    /// [`BarrierWaitResult::is_leader`] when returning from this function, and all other threads
+    /// [`BarrierWaitResult::is_leader`] when returning from this function, and all other tasks
     /// will receive a result that will return `false` from `is_leader`.
     pub async fn wait(&self) -> BarrierWaitResult {
         // NOTE: we are taking a _synchronous_ lock here.
@@ -88,7 +93,7 @@
         // NOTE: the extra scope here is so that the compiler doesn't think `state` is held across
         // a yield point, and thus marks the returned future as !Send.
         let generation = {
-            let mut state = self.state.lock().unwrap();
+            let mut state = self.state.lock();
             let generation = state.generation;
             state.arrived += 1;
             if state.arrived == self.n {
@@ -96,7 +101,7 @@
                 // wake everyone, increment the generation, and return
                 state
                     .waker
-                    .broadcast(state.generation)
+                    .send(state.generation)
                     .expect("there is at least one receiver");
                 state.arrived = 0;
                 state.generation += 1;
@@ -110,9 +115,11 @@
         let mut wait = self.wait.clone();
 
         loop {
+            let _ = wait.changed().await;
+
             // note that the first time through the loop, this _will_ yield a generation
             // immediately, since we cloned a receiver that has never seen any values.
-            if wait.recv().await.expect("sender hasn't been closed") >= generation {
+            if *wait.borrow() >= generation {
                 break;
             }
         }
@@ -121,14 +128,14 @@
     }
 }
 
-/// A `BarrierWaitResult` is returned by `wait` when all threads in the `Barrier` have rendezvoused.
+/// A `BarrierWaitResult` is returned by `wait` when all tasks in the `Barrier` have rendezvoused.
 #[derive(Debug, Clone)]
 pub struct BarrierWaitResult(bool);
 
 impl BarrierWaitResult {
-    /// Returns `true` if this thread from wait is the "leader thread".
+    /// Returns `true` if this task from wait is the "leader task".
     ///
-    /// Only one thread will have `true` returned from their result, all other threads will have
+    /// Only one task will have `true` returned from their result, all other tasks will have
     /// `false` returned.
     pub fn is_leader(&self) -> bool {
         self.0
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/batch_semaphore.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/batch_semaphore.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/batch_semaphore.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/batch_semaphore.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+#![cfg_attr(not(feature = "sync"), allow(unreachable_pub, dead_code))]
 //! # Implementation Details
 //!
 //! The semaphore is implemented using an intrusive linked list of waiters. An
@@ -18,6 +19,7 @@
 use crate::loom::sync::atomic::AtomicUsize;
 use crate::loom::sync::{Mutex, MutexGuard};
 use crate::util::linked_list::{self, LinkedList};
+use crate::util::WakeList;
 
 use std::future::Future;
 use std::marker::PhantomPinned;
@@ -36,19 +38,32 @@
 }
 
 struct Waitlist {
-    queue: LinkedList<Waiter>,
+    queue: LinkedList<Waiter, <Waiter as linked_list::Link>::Target>,
     closed: bool,
 }
 
-/// Error returned by `Semaphore::try_acquire`.
-#[derive(Debug)]
-pub(crate) enum TryAcquireError {
+/// Error returned from the [`Semaphore::try_acquire`] function.
+///
+/// [`Semaphore::try_acquire`]: crate::sync::Semaphore::try_acquire
+#[derive(Debug, PartialEq)]
+pub enum TryAcquireError {
+    /// The semaphore has been [closed] and cannot issue new permits.
+    ///
+    /// [closed]: crate::sync::Semaphore::close
     Closed,
+
+    /// The semaphore has no available permits.
     NoPermits,
 }
-/// Error returned by `Semaphore::acquire`.
+/// Error returned from the [`Semaphore::acquire`] function.
+///
+/// An `acquire` operation can only fail if the semaphore has been
+/// [closed].
+///
+/// [closed]: crate::sync::Semaphore::close
+/// [`Semaphore::acquire`]: crate::sync::Semaphore::acquire
 #[derive(Debug)]
-pub(crate) struct AcquireError(());
+pub struct AcquireError(());
 
 pub(crate) struct Acquire<'a> {
     node: Waiter,
@@ -96,10 +111,13 @@
     /// Note that this reserves three bits of flags in the permit counter, but
     /// we only actually use one of them. However, the previous semaphore
     /// implementation used three bits, so we will continue to reserve them to
-    /// avoid a breaking change if additional flags need to be aadded in the
+    /// avoid a breaking change if additional flags need to be added in the
     /// future.
     pub(crate) const MAX_PERMITS: usize = std::usize::MAX >> 3;
     const CLOSED: usize = 1;
+    // The least-significant bit in the number of permits is reserved to use
+    // as a flag indicating that the semaphore has been closed. Consequently
+    // PERMIT_SHIFT is used to leave that bit for that purpose.
     const PERMIT_SHIFT: usize = 1;
 
     /// Creates a new semaphore with the initial number of permits
@@ -120,6 +138,27 @@
         }
     }
 
+    /// Creates a new semaphore with the initial number of permits
+    ///
+    /// Maximum number of permits on 32-bit platforms is `1<<29`.
+    ///
+    /// If the specified number of permits exceeds the maximum permit amount
+    /// Then the value will get clamped to the maximum number of permits.
+    #[cfg(all(feature = "parking_lot", not(all(loom, test))))]
+    pub(crate) const fn const_new(mut permits: usize) -> Self {
+        // NOTE: assertions and by extension panics are still being worked on: https://github.com/rust-lang/rust/issues/74925
+        // currently we just clamp the permit count when it exceeds the max
+        permits &= Self::MAX_PERMITS;
+
+        Self {
+            permits: AtomicUsize::new(permits << Self::PERMIT_SHIFT),
+            waiters: Mutex::const_new(Waitlist {
+                queue: LinkedList::new(),
+                closed: false,
+            }),
+        }
+    }
+
     /// Returns the current number of available permits
     pub(crate) fn available_permits(&self) -> usize {
         self.permits.load(Acquire) >> Self::PERMIT_SHIFT
@@ -134,16 +173,13 @@
         }
 
         // Assign permits to the wait queue
-        self.add_permits_locked(added, self.waiters.lock().unwrap());
+        self.add_permits_locked(added, self.waiters.lock());
     }
 
     /// Closes the semaphore. This prevents the semaphore from issuing new
     /// permits and notifies all pending waiters.
-    // This will be used once the bounded MPSC is updated to use the new
-    // semaphore implementation.
-    #[allow(dead_code)]
     pub(crate) fn close(&self) {
-        let mut waiters = self.waiters.lock().unwrap();
+        let mut waiters = self.waiters.lock();
         // If the semaphore's permits counter has enough permits for an
         // unqueued waiter to acquire all the permits it needs immediately,
         // it won't touch the wait list. Therefore, we have to set a bit on
@@ -161,6 +197,11 @@
         }
     }
 
+    /// Returns true if the semaphore is closed
+    pub(crate) fn is_closed(&self) -> bool {
+        self.permits.load(Acquire) & Self::CLOSED == Self::CLOSED
+    }
+
     pub(crate) fn try_acquire(&self, num_permits: u32) -> Result<(), TryAcquireError> {
         assert!(
             num_permits as usize <= Self::MAX_PERMITS,
@@ -170,8 +211,8 @@
         let num_permits = (num_permits as usize) << Self::PERMIT_SHIFT;
         let mut curr = self.permits.load(Acquire);
         loop {
-            // Has the semaphore closed?git
-            if curr & Self::CLOSED > 0 {
+            // Has the semaphore closed?
+            if curr & Self::CLOSED == Self::CLOSED {
                 return Err(TryAcquireError::Closed);
             }
 
@@ -199,12 +240,12 @@
     /// If `rem` exceeds the number of permits needed by the wait list, the
     /// remainder are assigned back to the semaphore.
     fn add_permits_locked(&self, mut rem: usize, waiters: MutexGuard<'_, Waitlist>) {
-        let mut wakers: [Option<Waker>; 8] = Default::default();
+        let mut wakers = WakeList::new();
         let mut lock = Some(waiters);
         let mut is_empty = false;
         while rem > 0 {
-            let mut waiters = lock.take().unwrap_or_else(|| self.waiters.lock().unwrap());
-            'inner: for slot in &mut wakers[..] {
+            let mut waiters = lock.take().unwrap_or_else(|| self.waiters.lock());
+            'inner: while wakers.can_push() {
                 // Was the waiter assigned enough permits to wake it?
                 match waiters.queue.last() {
                     Some(waiter) => {
@@ -220,17 +261,22 @@
                     }
                 };
                 let mut waiter = waiters.queue.pop_back().unwrap();
-                *slot = unsafe { waiter.as_mut().waker.with_mut(|waker| (*waker).take()) };
+                if let Some(waker) =
+                    unsafe { waiter.as_mut().waker.with_mut(|waker| (*waker).take()) }
+                {
+                    wakers.push(waker);
+                }
             }
 
             if rem > 0 && is_empty {
-                let permits = rem << Self::PERMIT_SHIFT;
+                let permits = rem;
                 assert!(
-                    permits < Self::MAX_PERMITS,
+                    permits <= Self::MAX_PERMITS,
                     "cannot add more than MAX_PERMITS permits ({})",
                     Self::MAX_PERMITS
                 );
                 let prev = self.permits.fetch_add(rem << Self::PERMIT_SHIFT, Release);
+                let prev = prev >> Self::PERMIT_SHIFT;
                 assert!(
                     prev + permits <= Self::MAX_PERMITS,
                     "number of added permits ({}) would overflow MAX_PERMITS ({})",
@@ -242,10 +288,7 @@
 
             drop(waiters); // release the lock
 
-            wakers
-                .iter_mut()
-                .filter_map(Option::take)
-                .for_each(Waker::wake);
+            wakers.wake_all();
         }
 
         assert_eq!(rem, 0);
@@ -296,7 +339,7 @@
                 // counter. Otherwise, if we subtract the permits and then
                 // acquire the lock, we might miss additional permits being
                 // added while waiting for the lock.
-                lock = Some(self.waiters.lock().unwrap());
+                lock = Some(self.waiters.lock());
             }
 
             match self.permits.compare_exchange(curr, next, AcqRel, Acquire) {
@@ -306,7 +349,7 @@
                         if !queued {
                             return Ready(Ok(()));
                         } else if lock.is_none() {
-                            break self.waiters.lock().unwrap();
+                            break self.waiters.lock();
                         }
                     }
                     break lock.expect("lock must be acquired before waiting");
@@ -357,7 +400,7 @@
 impl fmt::Debug for Semaphore {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Semaphore")
-            .field("permits", &self.permits.load(Relaxed))
+            .field("permits", &self.available_permits())
             .finish()
     }
 }
@@ -437,7 +480,7 @@
             let this = self.get_unchecked_mut();
             (
                 Pin::new_unchecked(&mut this.node),
-                &this.semaphore,
+                this.semaphore,
                 this.num_permits,
                 &mut this.queued,
             )
@@ -456,14 +499,7 @@
         // This is where we ensure safety. The future is being dropped,
         // which means we must ensure that the waiter entry is no longer stored
         // in the linked list.
-        let mut waiters = match self.semaphore.waiters.lock() {
-            Ok(lock) => lock,
-            // Removing the node from the linked list is necessary to ensure
-            // safety. Even if the lock was poisoned, we need to make sure it is
-            // removed from the linked list before dropping it --- otherwise,
-            // the list will contain a dangling pointer to this node.
-            Err(e) => e.into_inner(),
-        };
+        let mut waiters = self.semaphore.waiters.lock();
 
         // remove the entry from the list
         let node = NonNull::from(&mut self.node);
@@ -506,20 +542,14 @@
     /// Returns `true` if the error was caused by a closed semaphore.
     #[allow(dead_code)] // may be used later!
     pub(crate) fn is_closed(&self) -> bool {
-        match self {
-            TryAcquireError::Closed => true,
-            _ => false,
-        }
+        matches!(self, TryAcquireError::Closed)
     }
 
     /// Returns `true` if the error was caused by calling `try_acquire` on a
     /// semaphore with no available permits.
     #[allow(dead_code)] // may be used later!
     pub(crate) fn is_no_permits(&self) -> bool {
-        match self {
-            TryAcquireError::NoPermits => true,
-            _ => false,
-        }
+        matches!(self, TryAcquireError::NoPermits)
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/broadcast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/broadcast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/broadcast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/broadcast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -55,8 +55,8 @@
 //! [`Sender::subscribe`]: crate::sync::broadcast::Sender::subscribe
 //! [`Receiver`]: crate::sync::broadcast::Receiver
 //! [`channel`]: crate::sync::broadcast::channel
-//! [`RecvError::Lagged`]: crate::sync::broadcast::RecvError::Lagged
-//! [`RecvError::Closed`]: crate::sync::broadcast::RecvError::Closed
+//! [`RecvError::Lagged`]: crate::sync::broadcast::error::RecvError::Lagged
+//! [`RecvError::Closed`]: crate::sync::broadcast::error::RecvError::Closed
 //! [`recv`]: crate::sync::broadcast::Receiver::recv
 //!
 //! # Examples
@@ -107,6 +107,7 @@
 //!     assert_eq!(20, rx.recv().await.unwrap());
 //!     assert_eq!(30, rx.recv().await.unwrap());
 //! }
+//! ```
 
 use crate::loom::cell::UnsafeCell;
 use crate::loom::sync::atomic::AtomicUsize;
@@ -162,6 +163,11 @@
 /// Must not be used concurrently. Messages may be retrieved using
 /// [`recv`][Receiver::recv].
 ///
+/// To turn this receiver into a `Stream`, you can use the [`BroadcastStream`]
+/// wrapper.
+///
+/// [`BroadcastStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.BroadcastStream.html
+///
 /// # Examples
 ///
 /// ```
@@ -194,58 +200,99 @@
 
     /// Next position to read from
     next: u64,
-
-    /// Used to support the deprecated `poll_recv` fn
-    waiter: Option<Pin<Box<UnsafeCell<Waiter>>>>,
 }
 
-/// Error returned by [`Sender::send`][Sender::send].
-///
-/// A **send** operation can only fail if there are no active receivers,
-/// implying that the message could never be received. The error contains the
-/// message being sent as a payload so it can be recovered.
-#[derive(Debug)]
-pub struct SendError<T>(pub T);
+pub mod error {
+    //! Broadcast error types
 
-/// An error returned from the [`recv`] function on a [`Receiver`].
-///
-/// [`recv`]: crate::sync::broadcast::Receiver::recv
-/// [`Receiver`]: crate::sync::broadcast::Receiver
-#[derive(Debug, PartialEq)]
-pub enum RecvError {
-    /// There are no more active senders implying no further messages will ever
-    /// be sent.
-    Closed,
+    use std::fmt;
 
-    /// The receiver lagged too far behind. Attempting to receive again will
-    /// return the oldest message still retained by the channel.
+    /// Error returned by from the [`send`] function on a [`Sender`].
     ///
-    /// Includes the number of skipped messages.
-    Lagged(u64),
-}
+    /// A **send** operation can only fail if there are no active receivers,
+    /// implying that the message could never be received. The error contains the
+    /// message being sent as a payload so it can be recovered.
+    ///
+    /// [`send`]: crate::sync::broadcast::Sender::send
+    /// [`Sender`]: crate::sync::broadcast::Sender
+    #[derive(Debug)]
+    pub struct SendError<T>(pub T);
 
-/// An error returned from the [`try_recv`] function on a [`Receiver`].
-///
-/// [`try_recv`]: crate::sync::broadcast::Receiver::try_recv
-/// [`Receiver`]: crate::sync::broadcast::Receiver
-#[derive(Debug, PartialEq)]
-pub enum TryRecvError {
-    /// The channel is currently empty. There are still active
-    /// [`Sender`][Sender] handles, so data may yet become available.
-    Empty,
-
-    /// There are no more active senders implying no further messages will ever
-    /// be sent.
-    Closed,
-
-    /// The receiver lagged too far behind and has been forcibly disconnected.
-    /// Attempting to receive again will return the oldest message still
-    /// retained by the channel.
+    impl<T> fmt::Display for SendError<T> {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            write!(f, "channel closed")
+        }
+    }
+
+    impl<T: fmt::Debug> std::error::Error for SendError<T> {}
+
+    /// An error returned from the [`recv`] function on a [`Receiver`].
     ///
-    /// Includes the number of skipped messages.
-    Lagged(u64),
+    /// [`recv`]: crate::sync::broadcast::Receiver::recv
+    /// [`Receiver`]: crate::sync::broadcast::Receiver
+    #[derive(Debug, PartialEq)]
+    pub enum RecvError {
+        /// There are no more active senders implying no further messages will ever
+        /// be sent.
+        Closed,
+
+        /// The receiver lagged too far behind. Attempting to receive again will
+        /// return the oldest message still retained by the channel.
+        ///
+        /// Includes the number of skipped messages.
+        Lagged(u64),
+    }
+
+    impl fmt::Display for RecvError {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            match self {
+                RecvError::Closed => write!(f, "channel closed"),
+                RecvError::Lagged(amt) => write!(f, "channel lagged by {}", amt),
+            }
+        }
+    }
+
+    impl std::error::Error for RecvError {}
+
+    /// An error returned from the [`try_recv`] function on a [`Receiver`].
+    ///
+    /// [`try_recv`]: crate::sync::broadcast::Receiver::try_recv
+    /// [`Receiver`]: crate::sync::broadcast::Receiver
+    #[derive(Debug, PartialEq)]
+    pub enum TryRecvError {
+        /// The channel is currently empty. There are still active
+        /// [`Sender`] handles, so data may yet become available.
+        ///
+        /// [`Sender`]: crate::sync::broadcast::Sender
+        Empty,
+
+        /// There are no more active senders implying no further messages will ever
+        /// be sent.
+        Closed,
+
+        /// The receiver lagged too far behind and has been forcibly disconnected.
+        /// Attempting to receive again will return the oldest message still
+        /// retained by the channel.
+        ///
+        /// Includes the number of skipped messages.
+        Lagged(u64),
+    }
+
+    impl fmt::Display for TryRecvError {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            match self {
+                TryRecvError::Empty => write!(f, "channel empty"),
+                TryRecvError::Closed => write!(f, "channel closed"),
+                TryRecvError::Lagged(amt) => write!(f, "channel lagged by {}", amt),
+            }
+        }
+    }
+
+    impl std::error::Error for TryRecvError {}
 }
 
+use self::error::*;
+
 /// Data shared between senders and receivers
 struct Shared<T> {
     /// slots in the channel
@@ -273,7 +320,7 @@
     closed: bool,
 
     /// Receivers waiting for a value
-    waiters: LinkedList<Waiter>,
+    waiters: LinkedList<Waiter, <Waiter as linked_list::Link>::Target>,
 }
 
 /// Slot in the buffer
@@ -319,38 +366,16 @@
 }
 
 /// Receive a value future
-struct Recv<R, T>
-where
-    R: AsMut<Receiver<T>>,
-{
+struct Recv<'a, T> {
     /// Receiver being waited on
-    receiver: R,
+    receiver: &'a mut Receiver<T>,
 
     /// Entry in the waiter `LinkedList`
     waiter: UnsafeCell<Waiter>,
-
-    _p: std::marker::PhantomData<T>,
 }
 
-/// `AsMut<T>` is not implemented for `T` (coherence). Explicitly implementing
-/// `AsMut` for `Receiver` would be included in the public API of the receiver
-/// type. Instead, `Borrow` is used internally to bridge the gap.
-struct Borrow<T>(T);
-
-impl<T> AsMut<Receiver<T>> for Borrow<Receiver<T>> {
-    fn as_mut(&mut self) -> &mut Receiver<T> {
-        &mut self.0
-    }
-}
-
-impl<'a, T> AsMut<Receiver<T>> for Borrow<&'a mut Receiver<T>> {
-    fn as_mut(&mut self) -> &mut Receiver<T> {
-        &mut *self.0
-    }
-}
-
-unsafe impl<R: AsMut<Receiver<T>> + Send, T: Send> Send for Recv<R, T> {}
-unsafe impl<R: AsMut<Receiver<T>> + Sync, T: Send> Sync for Recv<R, T> {}
+unsafe impl<'a, T: Send> Send for Recv<'a, T> {}
+unsafe impl<'a, T: Send> Sync for Recv<'a, T> {}
 
 /// Max number of receivers. Reserve space to lock.
 const MAX_RECEIVERS: usize = usize::MAX >> 2;
@@ -373,8 +398,8 @@
 /// [`Sender::subscribe`]: crate::sync::broadcast::Sender::subscribe
 /// [`Receiver`]: crate::sync::broadcast::Receiver
 /// [`recv`]: crate::sync::broadcast::Receiver::recv
-/// [`SendError`]: crate::sync::broadcast::SendError
-/// [`RecvError`]: crate::sync::broadcast::RecvError
+/// [`SendError`]: crate::sync::broadcast::error::SendError
+/// [`RecvError`]: crate::sync::broadcast::error::RecvError
 ///
 /// # Examples
 ///
@@ -400,7 +425,7 @@
 ///     tx.send(20).unwrap();
 /// }
 /// ```
-pub fn channel<T>(mut capacity: usize) -> (Sender<T>, Receiver<T>) {
+pub fn channel<T: Clone>(mut capacity: usize) -> (Sender<T>, Receiver<T>) {
     assert!(capacity > 0, "capacity is empty");
     assert!(capacity <= usize::MAX >> 1, "requested capacity too large");
 
@@ -433,7 +458,6 @@
     let rx = Receiver {
         shared: shared.clone(),
         next: 0,
-        waiter: None,
     };
 
     let tx = Sender { shared };
@@ -528,23 +552,7 @@
     /// ```
     pub fn subscribe(&self) -> Receiver<T> {
         let shared = self.shared.clone();
-
-        let mut tail = shared.tail.lock().unwrap();
-
-        if tail.rx_cnt == MAX_RECEIVERS {
-            panic!("max receivers");
-        }
-
-        tail.rx_cnt = tail.rx_cnt.checked_add(1).expect("overflow");
-        let next = tail.pos;
-
-        drop(tail);
-
-        Receiver {
-            shared,
-            next,
-            waiter: None,
-        }
+        new_receiver(shared)
     }
 
     /// Returns the number of active receivers
@@ -584,12 +592,12 @@
     /// }
     /// ```
     pub fn receiver_count(&self) -> usize {
-        let tail = self.shared.tail.lock().unwrap();
+        let tail = self.shared.tail.lock();
         tail.rx_cnt
     }
 
     fn send2(&self, value: Option<T>) -> Result<usize, SendError<Option<T>>> {
-        let mut tail = self.shared.tail.lock().unwrap();
+        let mut tail = self.shared.tail.lock();
 
         if tail.rx_cnt == 0 {
             return Err(SendError(value));
@@ -634,6 +642,22 @@
     }
 }
 
+fn new_receiver<T>(shared: Arc<Shared<T>>) -> Receiver<T> {
+    let mut tail = shared.tail.lock();
+
+    if tail.rx_cnt == MAX_RECEIVERS {
+        panic!("max receivers");
+    }
+
+    tail.rx_cnt = tail.rx_cnt.checked_add(1).expect("overflow");
+
+    let next = tail.pos;
+
+    drop(tail);
+
+    Receiver { shared, next }
+}
+
 impl Tail {
     fn notify_rx(&mut self) {
         while let Some(mut waiter) = self.waiters.pop_back() {
@@ -695,7 +719,7 @@
             // the slot lock.
             drop(slot);
 
-            let mut tail = self.shared.tail.lock().unwrap();
+            let mut tail = self.shared.tail.lock();
 
             // Acquire slot lock again
             slot = self.shared.buffer[idx].read().unwrap();
@@ -784,107 +808,7 @@
     }
 }
 
-impl<T> Receiver<T>
-where
-    T: Clone,
-{
-    /// Attempts to return a pending value on this receiver without awaiting.
-    ///
-    /// This is useful for a flavor of "optimistic check" before deciding to
-    /// await on a receiver.
-    ///
-    /// Compared with [`recv`], this function has three failure cases instead of one
-    /// (one for closed, one for an empty buffer, one for a lagging receiver).
-    ///
-    /// `Err(TryRecvError::Closed)` is returned when all `Sender` halves have
-    /// dropped, indicating that no further values can be sent on the channel.
-    ///
-    /// If the [`Receiver`] handle falls behind, once the channel is full, newly
-    /// sent values will overwrite old values. At this point, a call to [`recv`]
-    /// will return with `Err(TryRecvError::Lagged)` and the [`Receiver`]'s
-    /// internal cursor is updated to point to the oldest value still held by
-    /// the channel. A subsequent call to [`try_recv`] will return this value
-    /// **unless** it has been since overwritten. If there are no values to
-    /// receive, `Err(TryRecvError::Empty)` is returned.
-    ///
-    /// [`recv`]: crate::sync::broadcast::Receiver::recv
-    /// [`try_recv`]: crate::sync::broadcast::Receiver::try_recv
-    /// [`Receiver`]: crate::sync::broadcast::Receiver
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::sync::broadcast;
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///     let (tx, mut rx) = broadcast::channel(16);
-    ///
-    ///     assert!(rx.try_recv().is_err());
-    ///
-    ///     tx.send(10).unwrap();
-    ///
-    ///     let value = rx.try_recv().unwrap();
-    ///     assert_eq!(10, value);
-    /// }
-    /// ```
-    pub fn try_recv(&mut self) -> Result<T, TryRecvError> {
-        let guard = self.recv_ref(None)?;
-        guard.clone_value().ok_or(TryRecvError::Closed)
-    }
-
-    #[doc(hidden)]
-    #[deprecated(since = "0.2.21", note = "use async fn recv()")]
-    pub fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Result<T, RecvError>> {
-        use Poll::{Pending, Ready};
-
-        // The borrow checker prohibits calling `self.poll_ref` while passing in
-        // a mutable ref to a field (as it should). To work around this,
-        // `waiter` is first *removed* from `self` then `poll_recv` is called.
-        //
-        // However, for safety, we must ensure that `waiter` is **not** dropped.
-        // It could be contained in the intrusive linked list. The `Receiver`
-        // drop implementation handles cleanup.
-        //
-        // The guard pattern is used to ensure that, on return, even due to
-        // panic, the waiter node is replaced on `self`.
-
-        struct Guard<'a, T> {
-            waiter: Option<Pin<Box<UnsafeCell<Waiter>>>>,
-            receiver: &'a mut Receiver<T>,
-        }
-
-        impl<'a, T> Drop for Guard<'a, T> {
-            fn drop(&mut self) {
-                self.receiver.waiter = self.waiter.take();
-            }
-        }
-
-        let waiter = self.waiter.take().or_else(|| {
-            Some(Box::pin(UnsafeCell::new(Waiter {
-                queued: false,
-                waker: None,
-                pointers: linked_list::Pointers::new(),
-                _p: PhantomPinned,
-            })))
-        });
-
-        let guard = Guard {
-            waiter,
-            receiver: self,
-        };
-        let res = guard
-            .receiver
-            .recv_ref(Some((&guard.waiter.as_ref().unwrap(), cx.waker())));
-
-        match res {
-            Ok(guard) => Ready(guard.clone_value().ok_or(RecvError::Closed)),
-            Err(TryRecvError::Closed) => Ready(Err(RecvError::Closed)),
-            Err(TryRecvError::Lagged(n)) => Ready(Err(RecvError::Lagged(n))),
-            Err(TryRecvError::Empty) => Pending,
-        }
-    }
-
+impl<T: Clone> Receiver<T> {
     /// Receives the next value for this receiver.
     ///
     /// Each [`Receiver`] handle will receive a clone of all values sent
@@ -900,6 +824,13 @@
     /// the channel. A subsequent call to [`recv`] will return this value
     /// **unless** it has been since overwritten.
     ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `recv` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, it is guaranteed that no messages were received on this
+    /// channel.
+    ///
     /// [`Receiver`]: crate::sync::broadcast::Receiver
     /// [`recv`]: crate::sync::broadcast::Receiver::recv
     ///
@@ -949,61 +880,68 @@
     ///     assert_eq!(20, rx.recv().await.unwrap());
     ///     assert_eq!(30, rx.recv().await.unwrap());
     /// }
+    /// ```
     pub async fn recv(&mut self) -> Result<T, RecvError> {
-        let fut = Recv::<_, T>::new(Borrow(self));
+        let fut = Recv::new(self);
         fut.await
     }
-}
 
-#[cfg(feature = "stream")]
-#[doc(hidden)]
-#[deprecated(since = "0.2.21", note = "use `into_stream()`")]
-impl<T> crate::stream::Stream for Receiver<T>
-where
-    T: Clone,
-{
-    type Item = Result<T, RecvError>;
-
-    fn poll_next(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<T, RecvError>>> {
-        #[allow(deprecated)]
-        self.poll_recv(cx).map(|v| match v {
-            Ok(v) => Some(Ok(v)),
-            lag @ Err(RecvError::Lagged(_)) => Some(lag),
-            Err(RecvError::Closed) => None,
-        })
+    /// Attempts to return a pending value on this receiver without awaiting.
+    ///
+    /// This is useful for a flavor of "optimistic check" before deciding to
+    /// await on a receiver.
+    ///
+    /// Compared with [`recv`], this function has three failure cases instead of two
+    /// (one for closed, one for an empty buffer, one for a lagging receiver).
+    ///
+    /// `Err(TryRecvError::Closed)` is returned when all `Sender` halves have
+    /// dropped, indicating that no further values can be sent on the channel.
+    ///
+    /// If the [`Receiver`] handle falls behind, once the channel is full, newly
+    /// sent values will overwrite old values. At this point, a call to [`recv`]
+    /// will return with `Err(TryRecvError::Lagged)` and the [`Receiver`]'s
+    /// internal cursor is updated to point to the oldest value still held by
+    /// the channel. A subsequent call to [`try_recv`] will return this value
+    /// **unless** it has been since overwritten. If there are no values to
+    /// receive, `Err(TryRecvError::Empty)` is returned.
+    ///
+    /// [`recv`]: crate::sync::broadcast::Receiver::recv
+    /// [`try_recv`]: crate::sync::broadcast::Receiver::try_recv
+    /// [`Receiver`]: crate::sync::broadcast::Receiver
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::broadcast;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = broadcast::channel(16);
+    ///
+    ///     assert!(rx.try_recv().is_err());
+    ///
+    ///     tx.send(10).unwrap();
+    ///
+    ///     let value = rx.try_recv().unwrap();
+    ///     assert_eq!(10, value);
+    /// }
+    /// ```
+    pub fn try_recv(&mut self) -> Result<T, TryRecvError> {
+        let guard = self.recv_ref(None)?;
+        guard.clone_value().ok_or(TryRecvError::Closed)
     }
 }
 
 impl<T> Drop for Receiver<T> {
     fn drop(&mut self) {
-        let mut tail = self.shared.tail.lock().unwrap();
-
-        if let Some(waiter) = &self.waiter {
-            // safety: tail lock is held
-            let queued = waiter.with(|ptr| unsafe { (*ptr).queued });
-
-            if queued {
-                // Remove the node
-                //
-                // safety: tail lock is held and the wait node is verified to be in
-                // the list.
-                unsafe {
-                    waiter.with_mut(|ptr| {
-                        tail.waiters.remove((&mut *ptr).into());
-                    });
-                }
-            }
-        }
+        let mut tail = self.shared.tail.lock();
 
         tail.rx_cnt -= 1;
         let until = tail.pos;
 
         drop(tail);
 
-        while self.next != until {
+        while self.next < until {
             match self.recv_ref(None) {
                 Ok(_) => {}
                 // The channel is closed
@@ -1017,11 +955,8 @@
     }
 }
 
-impl<R, T> Recv<R, T>
-where
-    R: AsMut<Receiver<T>>,
-{
-    fn new(receiver: R) -> Recv<R, T> {
+impl<'a, T> Recv<'a, T> {
+    fn new(receiver: &'a mut Receiver<T>) -> Recv<'a, T> {
         Recv {
             receiver,
             waiter: UnsafeCell::new(Waiter {
@@ -1030,7 +965,6 @@
                 pointers: linked_list::Pointers::new(),
                 _p: PhantomPinned,
             }),
-            _p: std::marker::PhantomData,
         }
     }
 
@@ -1042,14 +976,13 @@
             is_unpin::<&mut Receiver<T>>();
 
             let me = self.get_unchecked_mut();
-            (me.receiver.as_mut(), &me.waiter)
+            (me.receiver, &me.waiter)
         }
     }
 }
 
-impl<R, T> Future for Recv<R, T>
+impl<'a, T> Future for Recv<'a, T>
 where
-    R: AsMut<Receiver<T>>,
     T: Clone,
 {
     type Output = Result<T, RecvError>;
@@ -1068,81 +1001,11 @@
     }
 }
 
-cfg_stream! {
-    use futures_core::Stream;
-
-    impl<T: Clone> Receiver<T> {
-        /// Convert the receiver into a `Stream`.
-        ///
-        /// The conversion allows using `Receiver` with APIs that require stream
-        /// values.
-        ///
-        /// # Examples
-        ///
-        /// ```
-        /// use tokio::stream::StreamExt;
-        /// use tokio::sync::broadcast;
-        ///
-        /// #[tokio::main]
-        /// async fn main() {
-        ///     let (tx, rx) = broadcast::channel(128);
-        ///
-        ///     tokio::spawn(async move {
-        ///         for i in 0..10_i32 {
-        ///             tx.send(i).unwrap();
-        ///         }
-        ///     });
-        ///
-        ///    // Streams must be pinned to iterate.
-        ///     tokio::pin! {
-        ///         let stream = rx
-        ///             .into_stream()
-        ///             .filter(Result::is_ok)
-        ///             .map(Result::unwrap)
-        ///             .filter(|v| v % 2 == 0)
-        ///             .map(|v| v + 1);
-        ///     }
-        ///
-        ///     while let Some(i) = stream.next().await {
-        ///         println!("{}", i);
-        ///     }
-        /// }
-        /// ```
-        pub fn into_stream(self) -> impl Stream<Item = Result<T, RecvError>> {
-            Recv::new(Borrow(self))
-        }
-    }
-
-    impl<R, T: Clone> Stream for Recv<R, T>
-    where
-        R: AsMut<Receiver<T>>,
-        T: Clone,
-    {
-        type Item = Result<T, RecvError>;
-
-        fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-            let (receiver, waiter) = self.project();
-
-            let guard = match receiver.recv_ref(Some((waiter, cx.waker()))) {
-                Ok(value) => value,
-                Err(TryRecvError::Empty) => return Poll::Pending,
-                Err(TryRecvError::Lagged(n)) => return Poll::Ready(Some(Err(RecvError::Lagged(n)))),
-                Err(TryRecvError::Closed) => return Poll::Ready(None),
-            };
-
-            Poll::Ready(guard.clone_value().map(Ok))
-        }
-    }
-}
-
-impl<R, T> Drop for Recv<R, T>
-where
-    R: AsMut<Receiver<T>>,
-{
+impl<'a, T> Drop for Recv<'a, T> {
     fn drop(&mut self) {
         // Acquire the tail lock. This is required for safety before accessing
         // the waiter node.
-        let mut tail = self.receiver.as_mut().shared.tail.lock().unwrap();
+        let mut tail = self.receiver.shared.tail.lock();
 
         // safety: tail lock is held
         let queued = self.waiter.with(|ptr| unsafe { (*ptr).queued });
@@ -1212,27 +1075,4 @@
     }
 }
 
-impl fmt::Display for RecvError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            RecvError::Closed => write!(f, "channel closed"),
-            RecvError::Lagged(amt) => write!(f, "channel lagged by {}", amt),
-        }
-    }
-}
-
-impl std::error::Error for RecvError {}
-
-impl fmt::Display for TryRecvError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            TryRecvError::Empty => write!(f, "channel empty"),
-            TryRecvError::Closed => write!(f, "channel closed"),
-            TryRecvError::Lagged(amt) => write!(f, "channel lagged by {}", amt),
-        }
-    }
-}
-
-impl std::error::Error for TryRecvError {}
-
 fn is_unpin<T: Unpin>() {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/cancellation_token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/cancellation_token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/cancellation_token.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/cancellation_token.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,861 +0,0 @@
-//! An asynchronously awaitable `CancellationToken`.
-//! The token allows to signal a cancellation request to one or more tasks.
-
-use crate::loom::sync::atomic::AtomicUsize;
-use crate::loom::sync::Mutex;
-use crate::util::intrusive_double_linked_list::{LinkedList, ListNode};
-
-use core::future::Future;
-use core::pin::Pin;
-use core::ptr::NonNull;
-use core::sync::atomic::Ordering;
-use core::task::{Context, Poll, Waker};
-
-/// A token which can be used to signal a cancellation request to one or more
-/// tasks.
-///
-/// Tasks can call [`CancellationToken::cancelled()`] in order to
-/// obtain a Future which will be resolved when cancellation is requested.
-///
-/// Cancellation can be requested through the [`CancellationToken::cancel`] method.
-///
-/// # Examples
-///
-/// ```ignore
-/// use tokio::select;
-/// use tokio::scope::CancellationToken;
-///
-/// #[tokio::main]
-/// async fn main() {
-///     let token = CancellationToken::new();
-///     let cloned_token = token.clone();
-///
-///     let join_handle = tokio::spawn(async move {
-///         // Wait for either cancellation or a very long time
-///         select! {
-///             _ = cloned_token.cancelled() => {
-///                 // The token was cancelled
-///                 5
-///             }
-///             _ = tokio::time::delay_for(std::time::Duration::from_secs(9999)) => {
-///                 99
-///             }
-///         }
-///     });
-///
-///     tokio::spawn(async move {
-///         tokio::time::delay_for(std::time::Duration::from_millis(10)).await;
-///         token.cancel();
-///     });
-///
-///     assert_eq!(5, join_handle.await.unwrap());
-/// }
-/// ```
-pub struct CancellationToken {
-    inner: NonNull<CancellationTokenState>,
-}
-
-// Safety: The CancellationToken is thread-safe and can be moved between threads,
-// since all methods are internally synchronized.
-unsafe impl Send for CancellationToken {}
-unsafe impl Sync for CancellationToken {}
-
-/// A Future that is resolved once the corresponding [`CancellationToken`]
-/// was cancelled
-#[must_use = "futures do nothing unless polled"]
-pub struct WaitForCancellationFuture<'a> {
-    /// The CancellationToken that is associated with this WaitForCancellationFuture
-    cancellation_token: Option<&'a CancellationToken>,
-    /// Node for waiting at the cancellation_token
-    wait_node: ListNode<WaitQueueEntry>,
-    /// Whether this future was registered at the token yet as a waiter
-    is_registered: bool,
-}
-
-// Safety: Futures can be sent between threads as long as the underlying
-// cancellation_token is thread-safe (Sync),
-// which allows to poll/register/unregister from a different thread.
-unsafe impl<'a> Send for WaitForCancellationFuture<'a> {}
-
-// ===== impl CancellationToken =====
-
-impl core::fmt::Debug for CancellationToken {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        f.debug_struct("CancellationToken")
-            .field("is_cancelled", &self.is_cancelled())
-            .finish()
-    }
-}
-
-impl Clone for CancellationToken {
-    fn clone(&self) -> Self {
-        // Safety: The state inside a `CancellationToken` is always valid, since
-        // is reference counted
-        let inner = self.state();
-
-        // Tokens are cloned by increasing their refcount
-        let current_state = inner.snapshot();
-        inner.increment_refcount(current_state);
-
-        CancellationToken { inner: self.inner }
-    }
-}
-
-impl Drop for CancellationToken {
-    fn drop(&mut self) {
-        let token_state_pointer = self.inner;
-
-        // Safety: The state inside a `CancellationToken` is always valid, since
-        // is reference counted
-        let inner = unsafe { &mut *self.inner.as_ptr() };
-
-        let mut current_state = inner.snapshot();
-
-        // We need to safe the parent, since the state might be released by the
-        // next call
-        let parent = inner.parent;
-
-        // Drop our own refcount
-        current_state = inner.decrement_refcount(current_state);
-
-        // If this was the last reference, unregister from the parent
-        if current_state.refcount == 0 {
-            if let Some(mut parent) = parent {
-                // Safety: Since we still retain a reference on the parent, it must be valid.
-                let parent = unsafe { parent.as_mut() };
-                parent.unregister_child(token_state_pointer, current_state);
-            }
-        }
-    }
-}
-
-impl CancellationToken {
-    /// Creates a new CancellationToken in the non-cancelled state.
-    pub fn new() -> CancellationToken {
-        let state = Box::new(CancellationTokenState::new(
-            None,
-            StateSnapshot {
-                cancel_state: CancellationState::NotCancelled,
-                has_parent_ref: false,
-                refcount: 1,
-            },
-        ));
-
-        // Safety: We just created the Box. The pointer is guaranteed to be
-        // not null
-        CancellationToken {
-            inner: unsafe { NonNull::new_unchecked(Box::into_raw(state)) },
-        }
-    }
-
-    /// Returns a reference to the utilized `CancellationTokenState`.
-    fn state(&self) -> &CancellationTokenState {
-        // Safety: The state inside a `CancellationToken` is always valid, since
-        // is reference counted
-        unsafe { &*self.inner.as_ptr() }
-    }
-
-    /// Creates a `CancellationToken` which will get cancelled whenever the
-    /// current token gets cancelled.
-    ///
-    /// If the current token is already cancelled, the child token will get
-    /// returned in cancelled state.
-    ///
-    /// # Examples
-    ///
-    /// ```ignore
-    /// use tokio::select;
-    /// use tokio::scope::CancellationToken;
-    ///
-    /// #[tokio::main]
-    /// async fn main() {
-    ///     let token = CancellationToken::new();
-    ///     let child_token = token.child_token();
-    ///
-    ///     let join_handle = tokio::spawn(async move {
-    ///         // Wait for either cancellation or a very long time
-    ///         select! {
-    ///             _ = child_token.cancelled() => {
-    ///                 // The token was cancelled
-    ///                 5
-    ///             }
-    ///             _ = tokio::time::delay_for(std::time::Duration::from_secs(9999)) => {
-    ///                 99
-    ///             }
-    ///         }
-    ///     });
-    ///
-    ///     tokio::spawn(async move {
-    ///         tokio::time::delay_for(std::time::Duration::from_millis(10)).await;
-    ///         token.cancel();
-    ///     });
-    ///
-    ///     assert_eq!(5, join_handle.await.unwrap());
-    /// }
-    /// ```
-    pub fn child_token(&self) -> CancellationToken {
-        let inner = self.state();
-
-        // Increment the refcount of this token. It will be referenced by the
-        // child, independent of whether the child is immediately cancelled or
-        // not.
-        let _current_state = inner.increment_refcount(inner.snapshot());
-
-        let mut unpacked_child_state = StateSnapshot {
-            has_parent_ref: true,
-            refcount: 1,
-            cancel_state: CancellationState::NotCancelled,
-        };
-        let mut child_token_state = Box::new(CancellationTokenState::new(
-            Some(self.inner),
-            unpacked_child_state,
-        ));
-
-        {
-            let mut guard = inner.synchronized.lock().unwrap();
-            if guard.is_cancelled {
-                // This task was already cancelled. In this case we should not
-                // insert the child into the list, since it would never get removed
-                // from the list.
-                (*child_token_state.synchronized.lock().unwrap()).is_cancelled = true;
-                unpacked_child_state.cancel_state = CancellationState::Cancelled;
-                // Since it's not in the list, the parent doesn't need to retain
-                // a reference to it.
-                unpacked_child_state.has_parent_ref = false;
-                child_token_state
-                    .state
-                    .store(unpacked_child_state.pack(), Ordering::SeqCst);
-            } else {
-                if let Some(mut first_child) = guard.first_child {
-                    child_token_state.from_parent.next_peer = Some(first_child);
-                    // Safety: We manipulate other child task inside the Mutex
-                    // and retain a parent reference on it. The child token can't
-                    // get invalidated while the Mutex is held.
-                    unsafe {
-                        first_child.as_mut().from_parent.prev_peer =
-                            Some((&mut *child_token_state).into())
-                    };
-                }
-                guard.first_child = Some((&mut *child_token_state).into());
-            }
-        };
-
-        let child_token_ptr = Box::into_raw(child_token_state);
-        // Safety: We just created the pointer from a `Box`
-        CancellationToken {
-            inner: unsafe { NonNull::new_unchecked(child_token_ptr) },
-        }
-    }
-
-    /// Cancel the [`CancellationToken`] and all child tokens which had been
-    /// derived from it.
-    ///
-    /// This will wake up all tasks which are waiting for cancellation.
-    pub fn cancel(&self) {
-        self.state().cancel();
-    }
-
-    /// Returns `true` if the `CancellationToken` had been cancelled
-    pub fn is_cancelled(&self) -> bool {
-        self.state().is_cancelled()
-    }
-
-    /// Returns a `Future` that gets fulfilled when cancellation is requested.
-    pub fn cancelled(&self) -> WaitForCancellationFuture<'_> {
-        WaitForCancellationFuture {
-            cancellation_token: Some(self),
-            wait_node: ListNode::new(WaitQueueEntry::new()),
-            is_registered: false,
-        }
-    }
-
-    unsafe fn register(
-        &self,
-        wait_node: &mut ListNode<WaitQueueEntry>,
-        cx: &mut Context<'_>,
-    ) -> Poll<()> {
-        self.state().register(wait_node, cx)
-    }
-
-    fn check_for_cancellation(
-        &self,
-        wait_node: &mut ListNode<WaitQueueEntry>,
-        cx: &mut Context<'_>,
-    ) -> Poll<()> {
-        self.state().check_for_cancellation(wait_node, cx)
-    }
-
-    fn unregister(&self, wait_node: &mut ListNode<WaitQueueEntry>) {
-        self.state().unregister(wait_node)
-    }
-}
-
-// ===== impl WaitForCancellationFuture =====
-
-impl<'a> core::fmt::Debug for WaitForCancellationFuture<'a> {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        f.debug_struct("WaitForCancellationFuture").finish()
-    }
-}
-
-impl<'a> Future for WaitForCancellationFuture<'a> {
-    type Output = ();
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
-        // Safety: We do not move anything out of `WaitForCancellationFuture`
-        let mut_self: &mut WaitForCancellationFuture<'_> = unsafe { Pin::get_unchecked_mut(self) };
-
-        let cancellation_token = mut_self
-            .cancellation_token
-            .expect("polled WaitForCancellationFuture after completion");
-
-        let poll_res = if !mut_self.is_registered {
-            // Safety: The `ListNode` is pinned through the Future,
-            // and we will unregister it in `WaitForCancellationFuture::drop`
-            // before the Future is dropped and the memory reference is invalidated.
-            unsafe { cancellation_token.register(&mut mut_self.wait_node, cx) }
-        } else {
-            cancellation_token.check_for_cancellation(&mut mut_self.wait_node, cx)
-        };
-
-        if let Poll::Ready(()) = poll_res {
-            // The cancellation_token was signalled
-            mut_self.cancellation_token = None;
-            // A signalled Token means the Waker won't be enqueued anymore
-            mut_self.is_registered = false;
-            mut_self.wait_node.task = None;
-        } else {
-            // This `Future` and its stored `Waker` stay registered at the
-            // `CancellationToken`
-            mut_self.is_registered = true;
-        }
-
-        poll_res
-    }
-}
-
-impl<'a> Drop for WaitForCancellationFuture<'a> {
-    fn drop(&mut self) {
-        // If this WaitForCancellationFuture has been polled and it was added to the
-        // wait queue at the cancellation_token, it must be removed before dropping.
-        // Otherwise the cancellation_token would access invalid memory.
-        if let Some(token) = self.cancellation_token {
-            if self.is_registered {
-                token.unregister(&mut self.wait_node);
-            }
-        }
-    }
-}
-
-/// Tracks how the future had interacted with the [`CancellationToken`]
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-enum PollState {
-    /// The task has never interacted with the [`CancellationToken`].
-    New,
-    /// The task was added to the wait queue at the [`CancellationToken`].
-    Waiting,
-    /// The task has been polled to completion.
-    Done,
-}
-
-/// Tracks the WaitForCancellationFuture waiting state.
-/// Access to this struct is synchronized through the mutex in the CancellationToken.
-struct WaitQueueEntry {
-    /// The task handle of the waiting task
-    task: Option<Waker>,
-    // Current polling state. This state is only updated inside the Mutex of
-    // the CancellationToken.
-    state: PollState,
-}
-
-impl WaitQueueEntry {
-    /// Creates a new WaitQueueEntry
-    fn new() -> WaitQueueEntry {
-        WaitQueueEntry {
-            task: None,
-            state: PollState::New,
-        }
-    }
-}
-
-struct SynchronizedState {
-    waiters: LinkedList<WaitQueueEntry>,
-    first_child: Option<NonNull<CancellationTokenState>>,
-    is_cancelled: bool,
-}
-
-impl SynchronizedState {
-    fn new() -> Self {
-        Self {
-            waiters: LinkedList::new(),
-            first_child: None,
-            is_cancelled: false,
-        }
-    }
-}
-
-/// Information embedded in child tokens which is synchronized through the Mutex
-/// in their parent.
-struct SynchronizedThroughParent {
-    next_peer: Option<NonNull<CancellationTokenState>>,
-    prev_peer: Option<NonNull<CancellationTokenState>>,
-}
-
-/// Possible states of a `CancellationToken`
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-enum CancellationState {
-    NotCancelled = 0,
-    Cancelling = 1,
-    Cancelled = 2,
-}
-
-impl CancellationState {
-    fn pack(self) -> usize {
-        self as usize
-    }
-
-    fn unpack(value: usize) -> Self {
-        match value {
-            0 => CancellationState::NotCancelled,
-            1 => CancellationState::Cancelling,
-            2 => CancellationState::Cancelled,
-            _ => unreachable!("Invalid value"),
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-struct StateSnapshot {
-    /// The amount of references to this particular CancellationToken.
-    /// `CancellationToken` structs hold these references to a `CancellationTokenState`.
-    /// Also the state is referenced by the state of each child.
-    refcount: usize,
-    /// Whether the state is still referenced by it's parent and can therefore
-    /// not be freed.
-    has_parent_ref: bool,
-    /// Whether the token is cancelled
-    cancel_state: CancellationState,
-}
-
-impl StateSnapshot {
-    /// Packs the snapshot into a `usize`
-    fn pack(self) -> usize {
-        self.refcount << 3 | if self.has_parent_ref { 4 } else { 0 } | self.cancel_state.pack()
-    }
-
-    /// Unpacks the snapshot from a `usize`
-    fn unpack(value: usize) -> Self {
-        let refcount = value >> 3;
-        let has_parent_ref = value & 4 != 0;
-        let cancel_state = CancellationState::unpack(value & 0x03);
-
-        StateSnapshot {
-            refcount,
-            has_parent_ref,
-            cancel_state,
-        }
-    }
-
-    /// Whether this `CancellationTokenState` is still referenced by any
-    /// `CancellationToken`.
-    fn has_refs(&self) -> bool {
-        self.refcount != 0 || self.has_parent_ref
-    }
-}
-
-/// The maximum permitted amount of references to a CancellationToken. This
-/// is derived from the intent to never use more than 32bit in the `Snapshot`.
-const MAX_REFS: u32 = (std::u32::MAX - 7) >> 3;
-
-/// Internal state of the `CancellationToken` pair above
-struct CancellationTokenState {
-    state: AtomicUsize,
-    parent: Option<NonNull<CancellationTokenState>>,
-    from_parent: SynchronizedThroughParent,
-    synchronized: Mutex<SynchronizedState>,
-}
-
-impl CancellationTokenState {
-    fn new(
-        parent: Option<NonNull<CancellationTokenState>>,
-        state: StateSnapshot,
-    ) -> CancellationTokenState {
-        CancellationTokenState {
-            parent,
-            from_parent: SynchronizedThroughParent {
-                prev_peer: None,
-                next_peer: None,
-            },
-            state: AtomicUsize::new(state.pack()),
-            synchronized: Mutex::new(SynchronizedState::new()),
-        }
-    }
-
-    /// Returns a snapshot of the current atomic state of the token
-    fn snapshot(&self) -> StateSnapshot {
-        StateSnapshot::unpack(self.state.load(Ordering::SeqCst))
-    }
-
-    fn atomic_update_state<F>(&self, mut current_state: StateSnapshot, func: F) -> StateSnapshot
-    where
-        F: Fn(StateSnapshot) -> StateSnapshot,
-    {
-        let mut current_packed_state = current_state.pack();
-        loop {
-            let next_state = func(current_state);
-            match self.state.compare_exchange(
-                current_packed_state,
-                next_state.pack(),
-                Ordering::SeqCst,
-                Ordering::SeqCst,
-            ) {
-                Ok(_) => {
-                    return next_state;
-                }
-                Err(actual) => {
-                    current_packed_state = actual;
-                    current_state = StateSnapshot::unpack(actual);
-                }
-            }
-        }
-    }
-
-    fn increment_refcount(&self, current_state: StateSnapshot) -> StateSnapshot {
-        self.atomic_update_state(current_state, |mut state: StateSnapshot| {
-            if state.refcount >= MAX_REFS as usize {
-                eprintln!("[ERROR] Maximum reference count for CancellationToken was exceeded");
-                std::process::abort();
-            }
-            state.refcount += 1;
-            state
-        })
-    }
-
-    fn decrement_refcount(&self, current_state: StateSnapshot) -> StateSnapshot {
-        let current_state = self.atomic_update_state(current_state, |mut state: StateSnapshot| {
-            state.refcount -= 1;
-            state
-        });
-
-        // Drop the State if it is not referenced anymore
-        if !current_state.has_refs() {
-            // Safety: `CancellationTokenState` is always stored in refcounted
-            // Boxes
-            let _ = unsafe { Box::from_raw(self as *const Self as *mut Self) };
-        }
-
-        current_state
-    }
-
-    fn remove_parent_ref(&self, current_state: StateSnapshot) -> StateSnapshot {
-        let current_state = self.atomic_update_state(current_state, |mut state: StateSnapshot| {
-            state.has_parent_ref = false;
-            state
-        });
-
-        // Drop the State if it is not referenced anymore
-        if !current_state.has_refs() {
-            // Safety: `CancellationTokenState` is always stored in refcounted
-            // Boxes
-            let _ = unsafe { Box::from_raw(self as *const Self as *mut Self) };
-        }
-
-        current_state
-    }
-
-    /// Unregisters a child from the parent token.
-    /// The child tokens state is not exactly known at this point in time.
-    /// If the parent token is cancelled, the child token gets removed from the
-    /// parents list, and might therefore already have been freed. If the parent
-    /// token is not cancelled, the child token is still valid.
-    fn unregister_child(
-        &mut self,
-        mut child_state: NonNull<CancellationTokenState>,
-        current_child_state: StateSnapshot,
-    ) {
-        let removed_child = {
-            // Remove the child toke from the parents linked list
-            let mut guard = self.synchronized.lock().unwrap();
-            if !guard.is_cancelled {
-                // Safety: Since the token was not cancelled, the child must
-                // still be in the list and valid.
-                let mut child_state = unsafe { child_state.as_mut() };
-                debug_assert!(child_state.snapshot().has_parent_ref);
-
-                if guard.first_child == Some(child_state.into()) {
-                    guard.first_child = child_state.from_parent.next_peer;
-                }
-                // Safety: If peers wouldn't be valid anymore, they would try
-                // to remove themselves from the list. This would require locking
-                // the Mutex that we currently own.
-                unsafe {
-                    if let Some(mut prev_peer) = child_state.from_parent.prev_peer {
-                        prev_peer.as_mut().from_parent.next_peer =
-                            child_state.from_parent.next_peer;
-                    }
-                    if let Some(mut next_peer) = child_state.from_parent.next_peer {
-                        next_peer.as_mut().from_parent.prev_peer =
-                            child_state.from_parent.prev_peer;
-                    }
-                }
-                child_state.from_parent.prev_peer = None;
-                child_state.from_parent.next_peer = None;
-
-                // The child is no longer referenced by the parent, since we were able
-                // to remove its reference from the parents list.
-                true
-            } else {
-                // Do not touch the linked list anymore. If the parent is cancelled
-                // it will move all childs outside of the Mutex and manipulate
-                // the pointers there. Manipulating the pointers here too could
-                // lead to races. Therefore leave them just as as and let the
-                // parent deal with it. The parent will make sure to retain a
-                // reference to this state as long as it manipulates the list
-                // pointers. Therefore the pointers are not dangling.
-                false
-            }
-        };
-
-        if removed_child {
-            // If the token removed itself from the parents list, it can reset
-            // the the parent ref status. If it is isn't able to do so, because the
-            // parent removed it from the list, there is no need to do this.
-            // The parent ref acts as as another reference count. Therefore
-            // removing this reference can free the object.
-            // Safety: The token was in the list. This means the parent wasn't
-            // cancelled before, and the token must still be alive.
-            unsafe { child_state.as_mut().remove_parent_ref(current_child_state) };
-        }
-
-        // Decrement the refcount on the parent and free it if necessary
-        self.decrement_refcount(self.snapshot());
-    }
-
-    fn cancel(&self) {
-        // Move the state of the CancellationToken from `NotCancelled` to `Cancelling`
-        let mut current_state = self.snapshot();
-
-        let state_after_cancellation = loop {
-            if current_state.cancel_state != CancellationState::NotCancelled {
-                // Another task already initiated the cancellation
-                return;
-            }
-
-            let mut next_state = current_state;
-            next_state.cancel_state = CancellationState::Cancelling;
-            match self.state.compare_exchange(
-                current_state.pack(),
-                next_state.pack(),
-                Ordering::SeqCst,
-                Ordering::SeqCst,
-            ) {
-                Ok(_) => break next_state,
-                Err(actual) => current_state = StateSnapshot::unpack(actual),
-            }
-        };
-
-        // This task cancelled the token
-
-        // Take the task list out of the Token
-        // We do not want to cancel child token inside this lock. If one of the
-        // child tasks would have additional child tokens, we would recursively
-        // take locks.
-
-        // Doing this action has an impact if the child token is dropped concurrently:
-        // It will try to deregister itself from the parent task, but can not find
-        // itself in the task list anymore. Therefore it needs to assume the parent
-        // has extracted the list and will process it. It may not modify the list.
-        // This is OK from a memory safety perspective, since the parent still
-        // retains a reference to the child task until it finished iterating over
-        // it.
-
-        let mut first_child = {
-            let mut guard = self.synchronized.lock().unwrap();
-            // Save the cancellation also inside the Mutex
-            // This allows child tokens which want to detach themselves to detect
-            // that this is no longer required since the parent cleared the list.
-            guard.is_cancelled = true;
-
-            // Wakeup all waiters
-            // This happens inside the lock to make cancellation reliable
-            // If we would access waiters outside of the lock, the pointers
-            // may no longer be valid.
-            // Typically this shouldn't be an issue, since waking a task should
-            // only move it from the blocked into the ready state and not have
-            // further side effects.
-
-            // Use a reverse iterator, so that the oldest waiter gets
-            // scheduled first
-            guard.waiters.reverse_drain(|waiter| {
-                // We are not allowed to move the `Waker` out of the list node.
-                // The `Future` relies on the fact that the old `Waker` stays there
-                // as long as the `Future` has not completed in order to perform
-                // the `will_wake()` check.
-                // Therefore `wake_by_ref` is used instead of `wake()`
-                if let Some(handle) = &mut waiter.task {
-                    handle.wake_by_ref();
-                }
-                // Mark the waiter to have been removed from the list.
-                waiter.state = PollState::Done;
-            });
-
-            guard.first_child.take()
-        };
-
-        while let Some(mut child) = first_child {
-            // Safety: We know this is a valid pointer since it is in our child pointer
-            // list. It can't have been freed in between, since we retain a a reference
-            // to each child.
-            let mut_child = unsafe { child.as_mut() };
-
-            // Get the next child and clean up list pointers
-            first_child = mut_child.from_parent.next_peer;
-            mut_child.from_parent.prev_peer = None;
-            mut_child.from_parent.next_peer = None;
-
-            // Cancel the child task
-            mut_child.cancel();
-
-            // Drop the parent reference. This `CancellationToken` is not interested
-            // in interacting with the child anymore.
-            // This is ONLY allowed once we promised not to touch the state anymore
-            // after this interaction.
-            mut_child.remove_parent_ref(mut_child.snapshot());
-        }
-
-        // The cancellation has completed
-        // At this point in time tasks which registered a wait node can be sure
-        // that this wait node already had been dequeued from the list without
-        // needing to inspect the list.
-        self.atomic_update_state(state_after_cancellation, |mut state| {
-            state.cancel_state = CancellationState::Cancelled;
-            state
-        });
-    }
-
-    /// Returns `true` if the `CancellationToken` had been cancelled
-    fn is_cancelled(&self) -> bool {
-        let current_state = self.snapshot();
-        current_state.cancel_state != CancellationState::NotCancelled
-    }
-
-    /// Registers a waiting task at the `CancellationToken`.
-    /// Safety: This method is only safe as long as the waiting waiting task
-    /// will properly unregister the wait node before it gets moved.
-    unsafe fn register(
-        &self,
-        wait_node: &mut ListNode<WaitQueueEntry>,
-        cx: &mut Context<'_>,
-    ) -> Poll<()> {
-        debug_assert_eq!(PollState::New, wait_node.state);
-        let current_state = self.snapshot();
-
-        // Perform an optimistic cancellation check before. This is not strictly
-        // necessary since we also check for cancellation in the Mutex, but
-        // reduces the necessary work to be performed for tasks which already
-        // had been cancelled.
-        if current_state.cancel_state != CancellationState::NotCancelled {
-            return Poll::Ready(());
-        }
-
-        // So far the token is not cancelled. However it could be cancelld before
-        // we get the chance to store the `Waker`. Therfore we need to check
-        // for cancellation again inside the mutex.
-        let mut guard = self.synchronized.lock().unwrap();
-        if guard.is_cancelled {
-            // Cancellation was signalled
-            wait_node.state = PollState::Done;
-            Poll::Ready(())
-        } else {
-            // Added the task to the wait queue
-            wait_node.task = Some(cx.waker().clone());
-            wait_node.state = PollState::Waiting;
-            guard.waiters.add_front(wait_node);
-            Poll::Pending
-        }
-    }
-
-    fn check_for_cancellation(
-        &self,
-        wait_node: &mut ListNode<WaitQueueEntry>,
-        cx: &mut Context<'_>,
-    ) -> Poll<()> {
-        debug_assert!(
-            wait_node.task.is_some(),
-            "Method can only be called after task had been registered"
-        );
-
-        let current_state = self.snapshot();
-
-        if current_state.cancel_state != CancellationState::NotCancelled {
-            // If the cancellation had been fully completed we know that our `Waker`
-            // is no longer registered at the `CancellationToken`.
-            // Otherwise the cancel call may or may not yet have iterated
-            // through the waiters list and removed the wait nodes.
-            // If it hasn't yet, we need to remove it. Otherwise an attempt to
-            // reuse the `wait_node´ might get freed due to the `WaitForCancellationFuture`
-            // getting dropped before the cancellation had interacted with it.
-            if current_state.cancel_state != CancellationState::Cancelled {
-                self.unregister(wait_node);
-            }
-            Poll::Ready(())
-        } else {
-            // Check if we need to swap the `Waker`. This will make the check more
-            // expensive, since the `Waker` is synchronized through the Mutex.
-            // If we don't need to perform a `Waker` update, an atomic check for
-            // cancellation is sufficient.
-            let need_waker_update = wait_node
-                .task
-                .as_ref()
-                .map(|waker| waker.will_wake(cx.waker()))
-                .unwrap_or(true);
-
-            if need_waker_update {
-                let guard = self.synchronized.lock().unwrap();
-                if guard.is_cancelled {
-                    // Cancellation was signalled. Since this cancellation signal
-                    // is set inside the Mutex, the old waiter must already have
-                    // been removed from the waiting list
-                    debug_assert_eq!(PollState::Done, wait_node.state);
-                    wait_node.task = None;
-                    Poll::Ready(())
-                } else {
-                    // The WaitForCancellationFuture is already in the queue.
-                    // The CancellationToken can't have been cancelled,
-                    // since this would change the is_cancelled flag inside the mutex.
-                    // Therefore we just have to update the Waker. A follow-up
-                    // cancellation will always use the new waker.
-                    wait_node.task = Some(cx.waker().clone());
-                    Poll::Pending
-                }
-            } else {
-                // Do nothing. If the token gets cancelled, this task will get
-                // woken again and can fetch the cancellation.
-                Poll::Pending
-            }
-        }
-    }
-
-    fn unregister(&self, wait_node: &mut ListNode<WaitQueueEntry>) {
-        debug_assert!(
-            wait_node.task.is_some(),
-            "waiter can not be active without task"
-        );
-
-        let mut guard = self.synchronized.lock().unwrap();
-        // WaitForCancellationFuture only needs to get removed if it has been added to
-        // the wait queue of the CancellationToken.
-        // This has happened in the PollState::Waiting case.
-        if let PollState::Waiting = wait_node.state {
-            // Safety: Due to the state, we know that the node must be part
-            // of the waiter list
-            if !unsafe { guard.waiters.remove(wait_node) } {
-                // Panic if the address isn't found. This can only happen if the contract was
-                // violated, e.g. the WaitQueueEntry got moved after the initial poll.
-                panic!("Future could not be removed from wait queue");
-            }
-            wait_node.state = PollState::Done;
-        }
-        wait_node.task = None;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
 //! few flavors of channels provided by Tokio. Each channel flavor supports
 //! different message passing patterns. When a channel supports multiple
 //! producers, many separate tasks may **send** messages. When a channel
-//! supports muliple consumers, many different separate tasks may **receive**
+//! supports multiple consumers, many different separate tasks may **receive**
 //! messages.
 //!
 //! Tokio provides many different channel flavors as different message passing
@@ -106,7 +106,7 @@
 //!
 //! #[tokio::main]
 //! async fn main() {
-//!     let (mut tx, mut rx) = mpsc::channel(100);
+//!     let (tx, mut rx) = mpsc::channel(100);
 //!
 //!     tokio::spawn(async move {
 //!         for i in 0..10 {
@@ -150,7 +150,7 @@
 //!     for _ in 0..10 {
 //!         // Each task needs its own `tx` handle. This is done by cloning the
 //!         // original handle.
-//!         let mut tx = tx.clone();
+//!         let tx = tx.clone();
 //!
 //!         tokio::spawn(async move {
 //!             tx.send(&b"data to write"[..]).await.unwrap();
@@ -213,7 +213,7 @@
 //!
 //!     // Spawn tasks that will send the increment command.
 //!     for _ in 0..10 {
-//!         let mut cmd_tx = cmd_tx.clone();
+//!         let cmd_tx = cmd_tx.clone();
 //!
 //!         join_handles.push(tokio::spawn(async move {
 //!             let (resp_tx, resp_rx) = oneshot::channel();
@@ -322,7 +322,7 @@
 //!     tokio::spawn(async move {
 //!         loop {
 //!             // Wait 10 seconds between checks
-//!             time::delay_for(Duration::from_secs(10)).await;
+//!             time::sleep(Duration::from_secs(10)).await;
 //!
 //!             // Load the configuration file
 //!             let new_config = Config::load_from_file().await.unwrap();
@@ -330,7 +330,7 @@
 //!             // If the configuration changed, send the new config value
 //!             // on the watch channel.
 //!             if new_config != config {
-//!                 tx.broadcast(new_config.clone()).unwrap();
+//!                 tx.send(new_config.clone()).unwrap();
 //!                 config = new_config;
 //!             }
 //!         }
@@ -355,17 +355,16 @@
 //!             let op = my_async_operation();
 //!             tokio::pin!(op);
 //!
-//!             // Receive the **initial** configuration value. As this is the
-//!             // first time the config is received from the watch, it will
-//!             // always complete immediatedly.
-//!             let mut conf = rx.recv().await.unwrap();
+//!             // Get the initial config value
+//!             let mut conf = rx.borrow().clone();
 //!
 //!             let mut op_start = Instant::now();
-//!             let mut delay = time::delay_until(op_start + conf.timeout);
+//!             let sleep = time::sleep_until(op_start + conf.timeout);
+//!             tokio::pin!(sleep);
 //!
 //!             loop {
 //!                 tokio::select! {
-//!                     _ = &mut delay => {
+//!                     _ = &mut sleep => {
 //!                         // The operation elapsed. Restart it
 //!                         op.set(my_async_operation());
 //!
@@ -373,14 +372,14 @@
 //!                         op_start = Instant::now();
 //!
 //!                         // Restart the timeout
-//!                         delay = time::delay_until(op_start + conf.timeout);
+//!                         sleep.set(time::sleep_until(op_start + conf.timeout));
 //!                     }
-//!                     new_conf = rx.recv() => {
-//!                         conf = new_conf.unwrap();
+//!                     _ = rx.changed() => {
+//!                         conf = rx.borrow().clone();
 //!
 //!                         // The configuration has been updated. Update the
-//!                         // `delay` using the new `timeout` value.
-//!                         delay.reset(op_start + conf.timeout);
+//!                         // `sleep` using the new `timeout` value.
+//!                         sleep.as_mut().reset(op_start + conf.timeout);
 //!                     }
 //!                     _ = &mut op => {
 //!                         // The operation completed!
@@ -406,7 +405,7 @@
 //!
 //! The remaining synchronization primitives focus on synchronizing state.
 //! These are asynchronous equivalents to versions provided by `std`. They
-//! operate in a similar way as their `std` counterparts parts but will wait
+//! operate in a similar way as their `std` counterparts but will wait
 //! asynchronously instead of blocking the thread.
 //!
 //! * [`Barrier`](Barrier) Ensures multiple tasks will wait for each other to
@@ -429,56 +428,70 @@
 //!   bounding of any kind.
 
 cfg_sync! {
+    /// Named future types.
+    pub mod futures {
+        pub use super::notify::Notified;
+    }
+
     mod barrier;
     pub use barrier::{Barrier, BarrierWaitResult};
 
     pub mod broadcast;
 
-    cfg_unstable! {
-        mod cancellation_token;
-        pub use cancellation_token::{CancellationToken, WaitForCancellationFuture};
-    }
-
     pub mod mpsc;
 
     mod mutex;
-    pub use mutex::{Mutex, MutexGuard, TryLockError, OwnedMutexGuard};
+    pub use mutex::{Mutex, MutexGuard, TryLockError, OwnedMutexGuard, MappedMutexGuard};
 
-    mod notify;
+    pub(crate) mod notify;
     pub use notify::Notify;
 
     pub mod oneshot;
 
     pub(crate) mod batch_semaphore;
-    pub(crate) mod semaphore_ll;
+    pub use batch_semaphore::{AcquireError, TryAcquireError};
+
     mod semaphore;
     pub use semaphore::{Semaphore, SemaphorePermit, OwnedSemaphorePermit};
 
     mod rwlock;
-    pub use rwlock::{RwLock, RwLockReadGuard, RwLockWriteGuard};
+    pub use rwlock::RwLock;
+    pub use rwlock::owned_read_guard::OwnedRwLockReadGuard;
+    pub use rwlock::owned_write_guard::OwnedRwLockWriteGuard;
+    pub use rwlock::owned_write_guard_mapped::OwnedRwLockMappedWriteGuard;
+    pub use rwlock::read_guard::RwLockReadGuard;
+    pub use rwlock::write_guard::RwLockWriteGuard;
+    pub use rwlock::write_guard_mapped::RwLockMappedWriteGuard;
 
     mod task;
     pub(crate) use task::AtomicWaker;
 
+    mod once_cell;
+    pub use self::once_cell::{OnceCell, SetError};
+
     pub mod watch;
 }
 
 cfg_not_sync! {
-    cfg_atomic_waker_impl! {
-        mod task;
-        pub(crate) use task::AtomicWaker;
+    cfg_fs! {
+        pub(crate) mod batch_semaphore;
+        mod mutex;
+        pub(crate) use mutex::Mutex;
     }
 
-    #[cfg(any(
-            feature = "rt-core",
-            feature = "process",
-            feature = "signal"))]
+    #[cfg(any(feature = "rt", feature = "signal", all(unix, feature = "process")))]
+    pub(crate) mod notify;
+
+    #[cfg(any(feature = "rt", all(windows, feature = "process")))]
     pub(crate) mod oneshot;
 
-    cfg_signal! {
-        pub(crate) mod mpsc;
-        pub(crate) mod semaphore_ll;
+    cfg_atomic_waker_impl! {
+        mod task;
+        pub(crate) use task::AtomicWaker;
     }
+
+    #[cfg(any(feature = "signal", all(unix, feature = "process")))]
+    pub(crate) mod watch;
 }
 
 /// Unit tests
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/block.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/block.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/block.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/block.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,5 @@
-use crate::loom::{
-    cell::UnsafeCell,
-    sync::atomic::{AtomicPtr, AtomicUsize},
-    thread,
-};
+use crate::loom::cell::UnsafeCell;
+use crate::loom::sync::atomic::{AtomicPtr, AtomicUsize};
 
 use std::mem::MaybeUninit;
 use std::ops;
@@ -188,7 +185,7 @@
     ///
     /// * The block will no longer be accessed by any sender.
     pub(crate) unsafe fn tx_release(&self, tail_position: usize) {
-        // Track the observed tail_position. Any sender targetting a greater
+        // Track the observed tail_position. Any sender targeting a greater
         // tail_position is guaranteed to not access this block.
         self.observed_tail_position
             .with_mut(|ptr| *ptr = tail_position);
@@ -260,13 +257,15 @@
     pub(crate) unsafe fn try_push(
         &self,
         block: &mut NonNull<Block<T>>,
-        ordering: Ordering,
+        success: Ordering,
+        failure: Ordering,
     ) -> Result<(), NonNull<Block<T>>> {
         block.as_mut().start_index = self.start_index.wrapping_add(BLOCK_CAP);
 
         let next_ptr = self
             .next
-            .compare_and_swap(ptr::null_mut(), block.as_ptr(), ordering);
+            .compare_exchange(ptr::null_mut(), block.as_ptr(), success, failure)
+            .unwrap_or_else(|x| x);
 
         match NonNull::new(next_ptr) {
             Some(next_ptr) => Err(next_ptr),
@@ -308,11 +307,11 @@
         //
         // `Release` ensures that the newly allocated block is available to
         // other threads acquiring the next pointer.
-        let next = NonNull::new(self.next.compare_and_swap(
-            ptr::null_mut(),
-            new_block.as_ptr(),
-            AcqRel,
-        ));
+        let next = NonNull::new(
+            self.next
+                .compare_exchange(ptr::null_mut(), new_block.as_ptr(), AcqRel, Acquire)
+                .unwrap_or_else(|x| x),
+        );
 
         let next = match next {
             Some(next) => next,
@@ -335,7 +334,7 @@
 
         // TODO: Should this iteration be capped?
         loop {
-            let actual = unsafe { curr.as_ref().try_push(&mut new_block, AcqRel) };
+            let actual = unsafe { curr.as_ref().try_push(&mut new_block, AcqRel, Acquire) };
 
             curr = match actual {
                 Ok(_) => {
@@ -344,13 +343,18 @@
                 Err(curr) => curr,
             };
 
-            // When running outside of loom, this calls `spin_loop_hint`.
-            thread::yield_now();
+            #[cfg(all(test, loom))]
+            crate::loom::thread::yield_now();
+
+            // TODO: once we bump MSRV to 1.49+, use `hint::spin_loop` instead.
+            #[cfg(not(all(test, loom)))]
+            #[allow(deprecated)]
+            std::sync::atomic::spin_loop_hint();
         }
     }
 }
 
-/// Returns `true` if the specificed slot has a value ready to be consumed.
+/// Returns `true` if the specified slot has a value ready to be consumed.
 fn is_ready(bits: usize, slot: usize) -> bool {
     let mask = 1 << slot;
     mask == mask & bits
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/bounded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/bounded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/bounded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/bounded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
+use crate::sync::batch_semaphore::{self as semaphore, TryAcquireError};
 use crate::sync::mpsc::chan;
-use crate::sync::mpsc::error::{ClosedError, SendError, TryRecvError, TrySendError};
-use crate::sync::semaphore_ll as semaphore;
+use crate::sync::mpsc::error::{SendError, TrySendError};
 
 cfg_time! {
     use crate::sync::mpsc::error::SendTimeoutError;
@@ -13,44 +13,60 @@
 /// Send values to the associated `Receiver`.
 ///
 /// Instances are created by the [`channel`](channel) function.
+///
+/// To use the `Sender` in a poll function, you can use the [`PollSender`]
+/// utility.
+///
+/// [`PollSender`]: https://docs.rs/tokio-util/0.6/tokio_util/sync/struct.PollSender.html
 pub struct Sender<T> {
     chan: chan::Tx<T, Semaphore>,
 }
 
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Self {
-        Sender {
-            chan: self.chan.clone(),
-        }
-    }
+/// Permit to send one value into the channel.
+///
+/// `Permit` values are returned by [`Sender::reserve()`] and [`Sender::try_reserve()`]
+/// and are used to guarantee channel capacity before generating a message to send.
+///
+/// [`Sender::reserve()`]: Sender::reserve
+/// [`Sender::try_reserve()`]: Sender::try_reserve
+pub struct Permit<'a, T> {
+    chan: &'a chan::Tx<T, Semaphore>,
 }
 
-impl<T> fmt::Debug for Sender<T> {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.debug_struct("Sender")
-            .field("chan", &self.chan)
-            .finish()
-    }
+/// Owned permit to send one value into the channel.
+///
+/// This is identical to the [`Permit`] type, except that it moves the sender
+/// rather than borrowing it.
+///
+/// `OwnedPermit` values are returned by [`Sender::reserve_owned()`] and
+/// [`Sender::try_reserve_owned()`] and are used to guarantee channel capacity
+/// before generating a message to send.
+///
+/// [`Permit`]: Permit
+/// [`Sender::reserve_owned()`]: Sender::reserve_owned
+/// [`Sender::try_reserve_owned()`]: Sender::try_reserve_owned
+pub struct OwnedPermit<T> {
+    chan: Option<chan::Tx<T, Semaphore>>,
 }
 
 /// Receive values from the associated `Sender`.
 ///
 /// Instances are created by the [`channel`](channel) function.
+///
+/// This receiver can be turned into a `Stream` using [`ReceiverStream`].
+///
+/// [`ReceiverStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.ReceiverStream.html
 pub struct Receiver<T> {
     /// The channel receiver
     chan: chan::Rx<T, Semaphore>,
 }
 
-impl<T> fmt::Debug for Receiver<T> {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.debug_struct("Receiver")
-            .field("chan", &self.chan)
-            .finish()
-    }
-}
-
-/// Creates a bounded mpsc channel for communicating between asynchronous tasks,
-/// returning the sender/receiver halves.
+/// Creates a bounded mpsc channel for communicating between asynchronous tasks
+/// with backpressure.
+///
+/// The channel will buffer up to the provided number of messages.  Once the
+/// buffer is full, attempts to send new messages will wait until a message is
+/// received from the channel. The provided buffer capacity must be at least 1.
 ///
 /// All data sent on `Sender` will become available on `Receiver` in the same
 /// order as it was sent.
@@ -60,7 +76,11 @@
 ///
 /// If the `Receiver` is disconnected while trying to `send`, the `send` method
 /// will return a `SendError`. Similarly, if `Sender` is disconnected while
-/// trying to `recv`, the `recv` method will return a `RecvError`.
+/// trying to `recv`, the `recv` method will return `None`.
+///
+/// # Panics
+///
+/// Panics if the buffer capacity is 0.
 ///
 /// # Examples
 ///
@@ -69,7 +89,7 @@
 ///
 /// #[tokio::main]
 /// async fn main() {
-///     let (mut tx, mut rx) = mpsc::channel(100);
+///     let (tx, mut rx) = mpsc::channel(100);
 ///
 ///     tokio::spawn(async move {
 ///         for i in 0..10 {
@@ -107,8 +127,26 @@
 
     /// Receives the next value for this receiver.
     ///
-    /// `None` is returned when all `Sender` halves have dropped, indicating
-    /// that no further values can be sent on the channel.
+    /// This method returns `None` if the channel has been closed and there are
+    /// no remaining messages in the channel's buffer. This indicates that no
+    /// further values can ever be received from this `Receiver`. The channel is
+    /// closed when all senders have been dropped, or when [`close`] is called.
+    ///
+    /// If there are no messages in the channel's buffer, but the channel has
+    /// not yet been closed, this method will sleep until a message is sent or
+    /// the channel is closed.  Note that if [`close`] is called, but there are
+    /// still outstanding [`Permits`] from before it was closed, the channel is
+    /// not considered closed by `recv` until the permits are released.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `recv` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, it is guaranteed that no messages were received on this
+    /// channel.
+    ///
+    /// [`close`]: Self::close
+    /// [`Permits`]: struct@crate::sync::mpsc::Permit
     ///
     /// # Examples
     ///
@@ -117,7 +155,7 @@
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let (mut tx, mut rx) = mpsc::channel(100);
+    ///     let (tx, mut rx) = mpsc::channel(100);
     ///
     ///     tokio::spawn(async move {
     ///         tx.send("hello").await.unwrap();
@@ -135,7 +173,7 @@
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let (mut tx, mut rx) = mpsc::channel(100);
+    ///     let (tx, mut rx) = mpsc::channel(100);
     ///
     ///     tx.send("hello").await.unwrap();
     ///     tx.send("world").await.unwrap();
@@ -146,51 +184,138 @@
     /// ```
     pub async fn recv(&mut self) -> Option<T> {
         use crate::future::poll_fn;
-
-        poll_fn(|cx| self.poll_recv(cx)).await
+        poll_fn(|cx| self.chan.recv(cx)).await
     }
 
-    #[doc(hidden)] // TODO: document
-    pub fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<T>> {
-        self.chan.recv(cx)
-    }
-
-    /// Attempts to return a pending value on this receiver without blocking.
+    /// Blocking receive to call outside of asynchronous contexts.
+    ///
+    /// This method returns `None` if the channel has been closed and there are
+    /// no remaining messages in the channel's buffer. This indicates that no
+    /// further values can ever be received from this `Receiver`. The channel is
+    /// closed when all senders have been dropped, or when [`close`] is called.
+    ///
+    /// If there are no messages in the channel's buffer, but the channel has
+    /// not yet been closed, this method will block until a message is sent or
+    /// the channel is closed.
     ///
-    /// This method will never block the caller in order to wait for data to
-    /// become available. Instead, this will always return immediately with
-    /// a possible option of pending data on the channel.
+    /// This method is intended for use cases where you are sending from
+    /// asynchronous code to synchronous code, and will work even if the sender
+    /// is not using [`blocking_send`] to send the message.
     ///
-    /// This is useful for a flavor of "optimistic check" before deciding to
-    /// block on a receiver.
+    /// Note that if [`close`] is called, but there are still outstanding
+    /// [`Permits`] from before it was closed, the channel is not considered
+    /// closed by `blocking_recv` until the permits are released.
+    ///
+    /// [`close`]: Self::close
+    /// [`Permits`]: struct@crate::sync::mpsc::Permit
+    /// [`blocking_send`]: fn@crate::sync::mpsc::Sender::blocking_send
+    ///
+    /// # Panics
+    ///
+    /// This function panics if called within an asynchronous execution
+    /// context.
+    ///
+    /// # Examples
     ///
-    /// Compared with recv, this function has two failure cases instead of
-    /// one (one for disconnection, one for an empty buffer).
-    pub fn try_recv(&mut self) -> Result<T, TryRecvError> {
-        self.chan.try_recv()
+    /// ```
+    /// use std::thread;
+    /// use tokio::runtime::Runtime;
+    /// use tokio::sync::mpsc;
+    ///
+    /// fn main() {
+    ///     let (tx, mut rx) = mpsc::channel::<u8>(10);
+    ///
+    ///     let sync_code = thread::spawn(move || {
+    ///         assert_eq!(Some(10), rx.blocking_recv());
+    ///     });
+    ///
+    ///     Runtime::new()
+    ///         .unwrap()
+    ///         .block_on(async move {
+    ///             let _ = tx.send(10).await;
+    ///         });
+    ///     sync_code.join().unwrap()
+    /// }
+    /// ```
+    #[cfg(feature = "sync")]
+    pub fn blocking_recv(&mut self) -> Option<T> {
+        crate::future::block_on(self.recv())
     }
 
-    /// Closes the receiving half of a channel, without dropping it.
+    /// Closes the receiving half of a channel without dropping it.
     ///
     /// This prevents any further messages from being sent on the channel while
-    /// still enabling the receiver to drain messages that are buffered.
+    /// still enabling the receiver to drain messages that are buffered. Any
+    /// outstanding [`Permit`] values will still be able to send messages.
+    ///
+    /// To guarantee that no messages are dropped, after calling `close()`,
+    /// `recv()` must be called until `None` is returned. If there are
+    /// outstanding [`Permit`] or [`OwnedPermit`] values, the `recv` method will
+    /// not return `None` until those are released.
+    ///
+    /// [`Permit`]: Permit
+    /// [`OwnedPermit`]: OwnedPermit
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel(20);
+    ///
+    ///     tokio::spawn(async move {
+    ///         let mut i = 0;
+    ///         while let Ok(permit) = tx.reserve().await {
+    ///             permit.send(i);
+    ///             i += 1;
+    ///         }
+    ///     });
+    ///
+    ///     rx.close();
+    ///
+    ///     while let Some(msg) = rx.recv().await {
+    ///         println!("got {}", msg);
+    ///     }
+    ///
+    ///     // Channel closed and no messages are lost.
+    /// }
+    /// ```
     pub fn close(&mut self) {
         self.chan.close();
     }
-}
-
-impl<T> Unpin for Receiver<T> {}
 
-cfg_stream! {
-    impl<T> crate::stream::Stream for Receiver<T> {
-        type Item = T;
+    /// Polls to receive the next message on this channel.
+    ///
+    /// This method returns:
+    ///
+    ///  * `Poll::Pending` if no messages are available but the channel is not
+    ///    closed.
+    ///  * `Poll::Ready(Some(message))` if a message is available.
+    ///  * `Poll::Ready(None)` if the channel has been closed and all messages
+    ///    sent before it was closed have been received.
+    ///
+    /// When the method returns `Poll::Pending`, the `Waker` in the provided
+    /// `Context` is scheduled to receive a wakeup when a message is sent on any
+    /// receiver, or when the channel is closed.  Note that on multiple calls to
+    /// `poll_recv`, only the `Waker` from the `Context` passed to the most
+    /// recent call is scheduled to receive a wakeup.
+    pub fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<T>> {
+        self.chan.recv(cx)
+    }
+}
 
-        fn poll_next(mut self: std::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
-            self.poll_recv(cx)
-        }
+impl<T> fmt::Debug for Receiver<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Receiver")
+            .field("chan", &self.chan)
+            .finish()
     }
 }
 
+impl<T> Unpin for Receiver<T> {}
+
 impl<T> Sender<T> {
     pub(crate) fn new(chan: chan::Tx<T, Semaphore>) -> Sender<T> {
         Sender { chan }
@@ -215,6 +340,16 @@
     /// [`close`]: Receiver::close
     /// [`Receiver`]: Receiver
     ///
+    /// # Cancel safety
+    ///
+    /// If `send` is used as the event in a [`tokio::select!`](crate::select)
+    /// statement and some other branch completes first, then it is guaranteed
+    /// that the message was not sent.
+    ///
+    /// This channel uses a queue to ensure that calls to `send` and `reserve`
+    /// complete in the order they were requested.  Cancelling a call to
+    /// `send` makes you lose your place in the queue.
+    ///
     /// # Examples
     ///
     /// In the following example, each call to `send` will block until the
@@ -225,7 +360,7 @@
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let (mut tx, mut rx) = mpsc::channel(1);
+    ///     let (tx, mut rx) = mpsc::channel(1);
     ///
     ///     tokio::spawn(async move {
     ///         for i in 0..10 {
@@ -241,18 +376,54 @@
     ///     }
     /// }
     /// ```
-    pub async fn send(&mut self, value: T) -> Result<(), SendError<T>> {
-        use crate::future::poll_fn;
-
-        if poll_fn(|cx| self.poll_ready(cx)).await.is_err() {
-            return Err(SendError(value));
+    pub async fn send(&self, value: T) -> Result<(), SendError<T>> {
+        match self.reserve().await {
+            Ok(permit) => {
+                permit.send(value);
+                Ok(())
+            }
+            Err(_) => Err(SendError(value)),
         }
+    }
 
-        match self.try_send(value) {
-            Ok(()) => Ok(()),
-            Err(TrySendError::Full(_)) => unreachable!(),
-            Err(TrySendError::Closed(value)) => Err(SendError(value)),
-        }
+    /// Completes when the receiver has dropped.
+    ///
+    /// This allows the producers to get notified when interest in the produced
+    /// values is canceled and immediately stop doing work.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once the channel is closed, it stays closed
+    /// forever and all future calls to `closed` will return immediately.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx1, rx) = mpsc::channel::<()>(1);
+    ///     let tx2 = tx1.clone();
+    ///     let tx3 = tx1.clone();
+    ///     let tx4 = tx1.clone();
+    ///     let tx5 = tx1.clone();
+    ///     tokio::spawn(async move {
+    ///         drop(rx);
+    ///     });
+    ///
+    ///     futures::join!(
+    ///         tx1.closed(),
+    ///         tx2.closed(),
+    ///         tx3.closed(),
+    ///         tx4.closed(),
+    ///         tx5.closed()
+    ///     );
+    ///     println!("Receiver dropped");
+    /// }
+    /// ```
+    pub async fn closed(&self) {
+        self.chan.closed().await
     }
 
     /// Attempts to immediately send a message on this `Sender`
@@ -262,9 +433,6 @@
     /// with [`send`], this function has two failure cases instead of one (one for
     /// disconnection, one for a full buffer).
     ///
-    /// This function may be paired with [`poll_ready`] in order to wait for
-    /// channel capacity before trying to send a value.
-    ///
     /// # Errors
     ///
     /// If the channel capacity has been reached, i.e., the channel has `n`
@@ -276,7 +444,6 @@
     /// an error. The error includes the value passed to `send`.
     ///
     /// [`send`]: Sender::send
-    /// [`poll_ready`]: Sender::poll_ready
     /// [`channel`]: channel
     /// [`close`]: Receiver::close
     ///
@@ -288,8 +455,8 @@
     /// #[tokio::main]
     /// async fn main() {
     ///     // Create a channel with buffer size 1
-    ///     let (mut tx1, mut rx) = mpsc::channel(1);
-    ///     let mut tx2 = tx1.clone();
+    ///     let (tx1, mut rx) = mpsc::channel(1);
+    ///     let tx2 = tx1.clone();
     ///
     ///     tokio::spawn(async move {
     ///         tx1.send(1).await.unwrap();
@@ -317,8 +484,15 @@
     ///     }
     /// }
     /// ```
-    pub fn try_send(&mut self, message: T) -> Result<(), TrySendError<T>> {
-        self.chan.try_send(message)?;
+    pub fn try_send(&self, message: T) -> Result<(), TrySendError<T>> {
+        match self.chan.semaphore().0.try_acquire(1) {
+            Ok(_) => {}
+            Err(TryAcquireError::Closed) => return Err(TrySendError::Closed(message)),
+            Err(TryAcquireError::NoPermits) => return Err(TrySendError::Full(message)),
+        }
+
+        // Send the message
+        self.chan.send(message);
         Ok(())
     }
 
@@ -346,11 +520,11 @@
     ///
     /// ```rust
     /// use tokio::sync::mpsc;
-    /// use tokio::time::{delay_for, Duration};
+    /// use tokio::time::{sleep, Duration};
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let (mut tx, mut rx) = mpsc::channel(1);
+    ///     let (tx, mut rx) = mpsc::channel(1);
     ///
     ///     tokio::spawn(async move {
     ///         for i in 0..10 {
@@ -363,117 +537,604 @@
     ///
     ///     while let Some(i) = rx.recv().await {
     ///         println!("got = {}", i);
-    ///         delay_for(Duration::from_millis(200)).await;
+    ///         sleep(Duration::from_millis(200)).await;
     ///     }
     /// }
     /// ```
     #[cfg(feature = "time")]
     #[cfg_attr(docsrs, doc(cfg(feature = "time")))]
     pub async fn send_timeout(
-        &mut self,
+        &self,
         value: T,
         timeout: Duration,
     ) -> Result<(), SendTimeoutError<T>> {
-        use crate::future::poll_fn;
-
-        match crate::time::timeout(timeout, poll_fn(|cx| self.poll_ready(cx))).await {
+        let permit = match crate::time::timeout(timeout, self.reserve()).await {
             Err(_) => {
                 return Err(SendTimeoutError::Timeout(value));
             }
             Ok(Err(_)) => {
                 return Err(SendTimeoutError::Closed(value));
             }
+            Ok(Ok(permit)) => permit,
+        };
+
+        permit.send(value);
+        Ok(())
+    }
+
+    /// Blocking send to call outside of asynchronous contexts.
+    ///
+    /// This method is intended for use cases where you are sending from
+    /// synchronous code to asynchronous code, and will work even if the
+    /// receiver is not using [`blocking_recv`] to receive the message.
+    ///
+    /// [`blocking_recv`]: fn@crate::sync::mpsc::Receiver::blocking_recv
+    ///
+    /// # Panics
+    ///
+    /// This function panics if called within an asynchronous execution
+    /// context.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use tokio::runtime::Runtime;
+    /// use tokio::sync::mpsc;
+    ///
+    /// fn main() {
+    ///     let (tx, mut rx) = mpsc::channel::<u8>(1);
+    ///
+    ///     let sync_code = thread::spawn(move || {
+    ///         tx.blocking_send(10).unwrap();
+    ///     });
+    ///
+    ///     Runtime::new().unwrap().block_on(async move {
+    ///         assert_eq!(Some(10), rx.recv().await);
+    ///     });
+    ///     sync_code.join().unwrap()
+    /// }
+    /// ```
+    #[cfg(feature = "sync")]
+    pub fn blocking_send(&self, value: T) -> Result<(), SendError<T>> {
+        crate::future::block_on(self.send(value))
+    }
+
+    /// Checks if the channel has been closed. This happens when the
+    /// [`Receiver`] is dropped, or when the [`Receiver::close`] method is
+    /// called.
+    ///
+    /// [`Receiver`]: crate::sync::mpsc::Receiver
+    /// [`Receiver::close`]: crate::sync::mpsc::Receiver::close
+    ///
+    /// ```
+    /// let (tx, rx) = tokio::sync::mpsc::channel::<()>(42);
+    /// assert!(!tx.is_closed());
+    ///
+    /// let tx2 = tx.clone();
+    /// assert!(!tx2.is_closed());
+    ///
+    /// drop(rx);
+    /// assert!(tx.is_closed());
+    /// assert!(tx2.is_closed());
+    /// ```
+    pub fn is_closed(&self) -> bool {
+        self.chan.is_closed()
+    }
+
+    /// Wait for channel capacity. Once capacity to send one message is
+    /// available, it is reserved for the caller.
+    ///
+    /// If the channel is full, the function waits for the number of unreceived
+    /// messages to become less than the channel capacity. Capacity to send one
+    /// message is reserved for the caller. A [`Permit`] is returned to track
+    /// the reserved capacity. The [`send`] function on [`Permit`] consumes the
+    /// reserved capacity.
+    ///
+    /// Dropping [`Permit`] without sending a message releases the capacity back
+    /// to the channel.
+    ///
+    /// [`Permit`]: Permit
+    /// [`send`]: Permit::send
+    ///
+    /// # Cancel safety
+    ///
+    /// This channel uses a queue to ensure that calls to `send` and `reserve`
+    /// complete in the order they were requested.  Cancelling a call to
+    /// `reserve` makes you lose your place in the queue.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel(1);
+    ///
+    ///     // Reserve capacity
+    ///     let permit = tx.reserve().await.unwrap();
+    ///
+    ///     // Trying to send directly on the `tx` will fail due to no
+    ///     // available capacity.
+    ///     assert!(tx.try_send(123).is_err());
+    ///
+    ///     // Sending on the permit succeeds
+    ///     permit.send(456);
+    ///
+    ///     // The value sent on the permit is received
+    ///     assert_eq!(rx.recv().await.unwrap(), 456);
+    /// }
+    /// ```
+    pub async fn reserve(&self) -> Result<Permit<'_, T>, SendError<()>> {
+        self.reserve_inner().await?;
+        Ok(Permit { chan: &self.chan })
+    }
+
+    /// Wait for channel capacity, moving the `Sender` and returning an owned
+    /// permit. Once capacity to send one message is available, it is reserved
+    /// for the caller.
+    ///
+    /// This moves the sender _by value_, and returns an owned permit that can
+    /// be used to send a message into the channel. Unlike [`Sender::reserve`],
+    /// this method may be used in cases where the permit must be valid for the
+    /// `'static` lifetime. `Sender`s may be cloned cheaply (`Sender::clone` is
+    /// essentially a reference count increment, comparable to [`Arc::clone`]),
+    /// so when multiple [`OwnedPermit`]s are needed or the `Sender` cannot be
+    /// moved, it can be cloned prior to calling `reserve_owned`.
+    ///
+    /// If the channel is full, the function waits for the number of unreceived
+    /// messages to become less than the channel capacity. Capacity to send one
+    /// message is reserved for the caller. An [`OwnedPermit`] is returned to
+    /// track the reserved capacity. The [`send`] function on [`OwnedPermit`]
+    /// consumes the reserved capacity.
+    ///
+    /// Dropping the [`OwnedPermit`] without sending a message releases the
+    /// capacity back to the channel.
+    ///
+    /// # Cancel safety
+    ///
+    /// This channel uses a queue to ensure that calls to `send` and `reserve`
+    /// complete in the order they were requested.  Cancelling a call to
+    /// `reserve_owned` makes you lose your place in the queue.
+    ///
+    /// # Examples
+    /// Sending a message using an [`OwnedPermit`]:
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel(1);
+    ///
+    ///     // Reserve capacity, moving the sender.
+    ///     let permit = tx.reserve_owned().await.unwrap();
+    ///
+    ///     // Send a message, consuming the permit and returning
+    ///     // the moved sender.
+    ///     let tx = permit.send(123);
+    ///
+    ///     // The value sent on the permit is received.
+    ///     assert_eq!(rx.recv().await.unwrap(), 123);
+    ///
+    ///     // The sender can now be used again.
+    ///     tx.send(456).await.unwrap();
+    /// }
+    /// ```
+    ///
+    /// When multiple [`OwnedPermit`]s are needed, or the sender cannot be moved
+    /// by value, it can be inexpensively cloned before calling `reserve_owned`:
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel(1);
+    ///
+    ///     // Clone the sender and reserve capacity.
+    ///     let permit = tx.clone().reserve_owned().await.unwrap();
+    ///
+    ///     // Trying to send directly on the `tx` will fail due to no
+    ///     // available capacity.
+    ///     assert!(tx.try_send(123).is_err());
+    ///
+    ///     // Sending on the permit succeeds.
+    ///     permit.send(456);
+    ///
+    ///     // The value sent on the permit is received
+    ///     assert_eq!(rx.recv().await.unwrap(), 456);
+    /// }
+    /// ```
+    ///
+    /// [`Sender::reserve`]: Sender::reserve
+    /// [`OwnedPermit`]: OwnedPermit
+    /// [`send`]: OwnedPermit::send
+    /// [`Arc::clone`]: std::sync::Arc::clone
+    pub async fn reserve_owned(self) -> Result<OwnedPermit<T>, SendError<()>> {
+        self.reserve_inner().await?;
+        Ok(OwnedPermit {
+            chan: Some(self.chan),
+        })
+    }
+
+    async fn reserve_inner(&self) -> Result<(), SendError<()>> {
+        match self.chan.semaphore().0.acquire(1).await {
+            Ok(_) => Ok(()),
+            Err(_) => Err(SendError(())),
+        }
+    }
+
+    /// Try to acquire a slot in the channel without waiting for the slot to become
+    /// available.
+    ///
+    /// If the channel is full this function will return [`TrySendError`], otherwise
+    /// if there is a slot available it will return a [`Permit`] that will then allow you
+    /// to [`send`] on the channel with a guaranteed slot. This function is similar to
+    /// [`reserve`] except it does not await for the slot to become available.
+    ///
+    /// Dropping [`Permit`] without sending a message releases the capacity back
+    /// to the channel.
+    ///
+    /// [`Permit`]: Permit
+    /// [`send`]: Permit::send
+    /// [`reserve`]: Sender::reserve
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel(1);
+    ///
+    ///     // Reserve capacity
+    ///     let permit = tx.try_reserve().unwrap();
+    ///
+    ///     // Trying to send directly on the `tx` will fail due to no
+    ///     // available capacity.
+    ///     assert!(tx.try_send(123).is_err());
+    ///
+    ///     // Trying to reserve an additional slot on the `tx` will
+    ///     // fail because there is no capacity.
+    ///     assert!(tx.try_reserve().is_err());
+    ///
+    ///     // Sending on the permit succeeds
+    ///     permit.send(456);
+    ///
+    ///     // The value sent on the permit is received
+    ///     assert_eq!(rx.recv().await.unwrap(), 456);
+    ///
+    /// }
+    /// ```
+    pub fn try_reserve(&self) -> Result<Permit<'_, T>, TrySendError<()>> {
+        match self.chan.semaphore().0.try_acquire(1) {
             Ok(_) => {}
+            Err(_) => return Err(TrySendError::Full(())),
+        }
+
+        Ok(Permit { chan: &self.chan })
+    }
+
+    /// Try to acquire a slot in the channel without waiting for the slot to become
+    /// available, returning an owned permit.
+    ///
+    /// This moves the sender _by value_, and returns an owned permit that can
+    /// be used to send a message into the channel. Unlike [`Sender::try_reserve`],
+    /// this method may be used in cases where the permit must be valid for the
+    /// `'static` lifetime.  `Sender`s may be cloned cheaply (`Sender::clone` is
+    /// essentially a reference count increment, comparable to [`Arc::clone`]),
+    /// so when multiple [`OwnedPermit`]s are needed or the `Sender` cannot be
+    /// moved, it can be cloned prior to calling `try_reserve_owned`.
+    ///
+    /// If the channel is full this function will return a [`TrySendError`].
+    /// Since the sender is taken by value, the `TrySendError` returned in this
+    /// case contains the sender, so that it may be used again. Otherwise, if
+    /// there is a slot available, this method will return an [`OwnedPermit`]
+    /// that can then be used to [`send`] on the channel with a guaranteed slot.
+    /// This function is similar to  [`reserve_owned`] except it does not await
+    /// for the slot to become available.
+    ///
+    /// Dropping the [`OwnedPermit`] without sending a message releases the capacity back
+    /// to the channel.
+    ///
+    /// [`OwnedPermit`]: OwnedPermit
+    /// [`send`]: OwnedPermit::send
+    /// [`reserve_owned`]: Sender::reserve_owned
+    /// [`Arc::clone`]: std::sync::Arc::clone
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel(1);
+    ///
+    ///     // Reserve capacity
+    ///     let permit = tx.clone().try_reserve_owned().unwrap();
+    ///
+    ///     // Trying to send directly on the `tx` will fail due to no
+    ///     // available capacity.
+    ///     assert!(tx.try_send(123).is_err());
+    ///
+    ///     // Trying to reserve an additional slot on the `tx` will
+    ///     // fail because there is no capacity.
+    ///     assert!(tx.try_reserve().is_err());
+    ///
+    ///     // Sending on the permit succeeds
+    ///     permit.send(456);
+    ///
+    ///     // The value sent on the permit is received
+    ///     assert_eq!(rx.recv().await.unwrap(), 456);
+    ///
+    /// }
+    /// ```
+    pub fn try_reserve_owned(self) -> Result<OwnedPermit<T>, TrySendError<Self>> {
+        match self.chan.semaphore().0.try_acquire(1) {
+            Ok(_) => {}
+            Err(_) => return Err(TrySendError::Full(self)),
+        }
+
+        Ok(OwnedPermit {
+            chan: Some(self.chan),
+        })
+    }
+
+    /// Returns `true` if senders belong to the same channel.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// let (tx, rx) = tokio::sync::mpsc::channel::<()>(1);
+    /// let  tx2 = tx.clone();
+    /// assert!(tx.same_channel(&tx2));
+    ///
+    /// let (tx3, rx3) = tokio::sync::mpsc::channel::<()>(1);
+    /// assert!(!tx3.same_channel(&tx2));
+    /// ```
+    pub fn same_channel(&self, other: &Self) -> bool {
+        self.chan.same_channel(&other.chan)
+    }
+
+    /// Returns the current capacity of the channel.
+    ///
+    /// The capacity goes down when sending a value by calling [`send`] or by reserving capacity
+    /// with [`reserve`]. The capacity goes up when values are received by the [`Receiver`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel::<()>(5);
+    ///
+    ///     assert_eq!(tx.capacity(), 5);
+    ///
+    ///     // Making a reservation drops the capacity by one.
+    ///     let permit = tx.reserve().await.unwrap();
+    ///     assert_eq!(tx.capacity(), 4);
+    ///
+    ///     // Sending and receiving a value increases the capacity by one.
+    ///     permit.send(());
+    ///     rx.recv().await.unwrap();
+    ///     assert_eq!(tx.capacity(), 5);
+    /// }
+    /// ```
+    ///
+    /// [`send`]: Sender::send
+    /// [`reserve`]: Sender::reserve
+    pub fn capacity(&self) -> usize {
+        self.chan.semaphore().0.available_permits()
+    }
+}
+
+impl<T> Clone for Sender<T> {
+    fn clone(&self) -> Self {
+        Sender {
+            chan: self.chan.clone(),
         }
+    }
+}
 
-        match self.try_send(value) {
-            Ok(()) => Ok(()),
-            Err(TrySendError::Full(_)) => unreachable!(),
-            Err(TrySendError::Closed(value)) => Err(SendTimeoutError::Closed(value)),
+impl<T> fmt::Debug for Sender<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Sender")
+            .field("chan", &self.chan)
+            .finish()
+    }
+}
+
+// ===== impl Permit =====
+
+impl<T> Permit<'_, T> {
+    /// Sends a value using the reserved capacity.
+    ///
+    /// Capacity for the message has already been reserved. The message is sent
+    /// to the receiver and the permit is consumed. The operation will succeed
+    /// even if the receiver half has been closed. See [`Receiver::close`] for
+    /// more details on performing a clean shutdown.
+    ///
+    /// [`Receiver::close`]: Receiver::close
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel(1);
+    ///
+    ///     // Reserve capacity
+    ///     let permit = tx.reserve().await.unwrap();
+    ///
+    ///     // Trying to send directly on the `tx` will fail due to no
+    ///     // available capacity.
+    ///     assert!(tx.try_send(123).is_err());
+    ///
+    ///     // Send a message on the permit
+    ///     permit.send(456);
+    ///
+    ///     // The value sent on the permit is received
+    ///     assert_eq!(rx.recv().await.unwrap(), 456);
+    /// }
+    /// ```
+    pub fn send(self, value: T) {
+        use std::mem;
+
+        self.chan.send(value);
+
+        // Avoid the drop logic
+        mem::forget(self);
+    }
+}
+
+impl<T> Drop for Permit<'_, T> {
+    fn drop(&mut self) {
+        use chan::Semaphore;
+
+        let semaphore = self.chan.semaphore();
+
+        // Add the permit back to the semaphore
+        semaphore.add_permit();
+
+        // If this is the last sender for this channel, wake the receiver so
+        // that it can be notified that the channel is closed.
+        if semaphore.is_closed() && semaphore.is_idle() {
+            self.chan.wake_rx();
         }
     }
+}
 
-    /// Returns `Poll::Ready(Ok(()))` when the channel is able to accept another item.
+impl<T> fmt::Debug for Permit<'_, T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Permit")
+            .field("chan", &self.chan)
+            .finish()
+    }
+}
+
+// ===== impl Permit =====
+
+impl<T> OwnedPermit<T> {
+    /// Sends a value using the reserved capacity.
+    ///
+    /// Capacity for the message has already been reserved. The message is sent
+    /// to the receiver and the permit is consumed. The operation will succeed
+    /// even if the receiver half has been closed. See [`Receiver::close`] for
+    /// more details on performing a clean shutdown.
     ///
-    /// If the channel is full, then `Poll::Pending` is returned and the task is notified when a
-    /// slot becomes available.
+    /// Unlike [`Permit::send`], this method returns the [`Sender`] from which
+    /// the `OwnedPermit` was reserved.
     ///
-    /// Once `poll_ready` returns `Poll::Ready(Ok(()))`, a call to `try_send` will succeed unless
-    /// the channel has since been closed. To provide this guarantee, the channel reserves one slot
-    /// in the channel for the coming send. This reserved slot is not available to other `Sender`
-    /// instances, so you need to be careful to not end up with deadlocks by blocking after calling
-    /// `poll_ready` but before sending an element.
-    ///
-    /// If, after `poll_ready` succeeds, you decide you do not wish to send an item after all, you
-    /// can use [`disarm`](Sender::disarm) to release the reserved slot.
-    ///
-    /// Until an item is sent or [`disarm`](Sender::disarm) is called, repeated calls to
-    /// `poll_ready` will return either `Poll::Ready(Ok(()))` or `Poll::Ready(Err(_))` if channel
-    /// is closed.
-    pub fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), ClosedError>> {
-        self.chan.poll_ready(cx).map_err(|_| ClosedError::new())
-    }
-
-    /// Undo a successful call to `poll_ready`.
-    ///
-    /// Once a call to `poll_ready` returns `Poll::Ready(Ok(()))`, it holds up one slot in the
-    /// channel to make room for the coming send. `disarm` allows you to give up that slot if you
-    /// decide you do not wish to send an item after all. After calling `disarm`, you must call
-    /// `poll_ready` until it returns `Poll::Ready(Ok(()))` before attempting to send again.
-    ///
-    /// Returns `false` if no slot is reserved for this sender (usually because `poll_ready` was
-    /// not previously called, or did not succeed).
-    ///
-    /// # Motivation
-    ///
-    /// Since `poll_ready` takes up one of the finite number of slots in a bounded channel, callers
-    /// need to send an item shortly after `poll_ready` succeeds. If they do not, idle senders may
-    /// take up all the slots of the channel, and prevent active senders from getting any requests
-    /// through. Consider this code that forwards from one channel to another:
-    ///
-    /// ```rust,ignore
-    /// loop {
-    ///   ready!(tx.poll_ready(cx))?;
-    ///   if let Some(item) = ready!(rx.poll_recv(cx)) {
-    ///     tx.try_send(item)?;
-    ///   } else {
-    ///     break;
-    ///   }
-    /// }
-    /// ```
-    ///
-    /// If many such forwarders exist, and they all forward into a single (cloned) `Sender`, then
-    /// any number of forwarders may be waiting for `rx.poll_recv` at the same time. While they do,
-    /// they are effectively each reducing the channel's capacity by 1. If enough of these
-    /// forwarders are idle, forwarders whose `rx` _do_ have elements will be unable to find a spot
-    /// for them through `poll_ready`, and the system will deadlock.
-    ///
-    /// `disarm` solves this problem by allowing you to give up the reserved slot if you find that
-    /// you have to block. We can then fix the code above by writing:
-    ///
-    /// ```rust,ignore
-    /// loop {
-    ///   ready!(tx.poll_ready(cx))?;
-    ///   let item = rx.poll_recv(cx);
-    ///   if let Poll::Ready(Ok(_)) = item {
-    ///     // we're going to send the item below, so don't disarm
-    ///   } else {
-    ///     // give up our send slot, we won't need it for a while
-    ///     tx.disarm();
-    ///   }
-    ///   if let Some(item) = ready!(item) {
-    ///     tx.try_send(item)?;
-    ///   } else {
-    ///     break;
-    ///   }
-    /// }
-    /// ```
-    pub fn disarm(&mut self) -> bool {
-        if self.chan.is_ready() {
-            self.chan.disarm();
-            true
-        } else {
-            false
+    /// [`Receiver::close`]: Receiver::close
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::channel(1);
+    ///
+    ///     // Reserve capacity
+    ///     let permit = tx.reserve_owned().await.unwrap();
+    ///
+    ///     // Send a message on the permit, returning the sender.
+    ///     let tx = permit.send(456);
+    ///
+    ///     // The value sent on the permit is received
+    ///     assert_eq!(rx.recv().await.unwrap(), 456);
+    ///
+    ///     // We may now reuse `tx` to send another message.
+    ///     tx.send(789).await.unwrap();
+    /// }
+    /// ```
+    pub fn send(mut self, value: T) -> Sender<T> {
+        let chan = self.chan.take().unwrap_or_else(|| {
+            unreachable!("OwnedPermit channel is only taken when the permit is moved")
+        });
+        chan.send(value);
+
+        Sender { chan }
+    }
+
+    /// Release the reserved capacity *without* sending a message, returning the
+    /// [`Sender`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, rx) = mpsc::channel(1);
+    ///
+    ///     // Clone the sender and reserve capacity
+    ///     let permit = tx.clone().reserve_owned().await.unwrap();
+    ///
+    ///     // Trying to send on the original `tx` will fail, since the `permit`
+    ///     // has reserved all the available capacity.
+    ///     assert!(tx.try_send(123).is_err());
+    ///
+    ///     // Release the permit without sending a message, returning the clone
+    ///     // of the sender.
+    ///     let tx2 = permit.release();
+    ///
+    ///     // We may now reuse `tx` to send another message.
+    ///     tx.send(789).await.unwrap();
+    ///     # drop(rx); drop(tx2);
+    /// }
+    /// ```
+    ///
+    /// [`Sender`]: Sender
+    pub fn release(mut self) -> Sender<T> {
+        use chan::Semaphore;
+
+        let chan = self.chan.take().unwrap_or_else(|| {
+            unreachable!("OwnedPermit channel is only taken when the permit is moved")
+        });
+
+        // Add the permit back to the semaphore
+        chan.semaphore().add_permit();
+        Sender { chan }
+    }
+}
+
+impl<T> Drop for OwnedPermit<T> {
+    fn drop(&mut self) {
+        use chan::Semaphore;
+
+        // Are we still holding onto the sender?
+        if let Some(chan) = self.chan.take() {
+            let semaphore = chan.semaphore();
+
+            // Add the permit back to the semaphore
+            semaphore.add_permit();
+
+            // If this `OwnedPermit` is holding the last sender for this
+            // channel, wake the receiver so that it can be notified that the
+            // channel is closed.
+            if semaphore.is_closed() && semaphore.is_idle() {
+                chan.wake_rx();
+            }
         }
+
+        // Otherwise, do nothing.
+    }
+}
+
+impl<T> fmt::Debug for OwnedPermit<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("OwnedPermit")
+            .field("chan", &self.chan)
+            .finish()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/chan.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/chan.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/chan.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/chan.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,8 +2,8 @@
 use crate::loom::future::AtomicWaker;
 use crate::loom::sync::atomic::AtomicUsize;
 use crate::loom::sync::Arc;
-use crate::sync::mpsc::error::{ClosedError, TryRecvError};
-use crate::sync::mpsc::{error, list};
+use crate::sync::mpsc::list;
+use crate::sync::notify::Notify;
 
 use std::fmt;
 use std::process;
@@ -12,21 +12,13 @@
 use std::task::{Context, Poll};
 
 /// Channel sender
-pub(crate) struct Tx<T, S: Semaphore> {
+pub(crate) struct Tx<T, S> {
     inner: Arc<Chan<T, S>>,
-    permit: S::Permit,
 }
 
-impl<T, S: Semaphore> fmt::Debug for Tx<T, S>
-where
-    S::Permit: fmt::Debug,
-    S: fmt::Debug,
-{
+impl<T, S: fmt::Debug> fmt::Debug for Tx<T, S> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.debug_struct("Tx")
-            .field("inner", &self.inner)
-            .field("permit", &self.permit)
-            .finish()
+        fmt.debug_struct("Tx").field("inner", &self.inner).finish()
     }
 }
 
@@ -35,74 +27,26 @@
     inner: Arc<Chan<T, S>>,
 }
 
-impl<T, S: Semaphore> fmt::Debug for Rx<T, S>
-where
-    S: fmt::Debug,
-{
+impl<T, S: Semaphore + fmt::Debug> fmt::Debug for Rx<T, S> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Rx").field("inner", &self.inner).finish()
     }
 }
 
-#[derive(Debug, Eq, PartialEq)]
-pub(crate) enum TrySendError {
-    Closed,
-    Full,
-}
-
-impl<T> From<(T, TrySendError)> for error::SendError<T> {
-    fn from(src: (T, TrySendError)) -> error::SendError<T> {
-        match src.1 {
-            TrySendError::Closed => error::SendError(src.0),
-            TrySendError::Full => unreachable!(),
-        }
-    }
-}
-
-impl<T> From<(T, TrySendError)> for error::TrySendError<T> {
-    fn from(src: (T, TrySendError)) -> error::TrySendError<T> {
-        match src.1 {
-            TrySendError::Closed => error::TrySendError::Closed(src.0),
-            TrySendError::Full => error::TrySendError::Full(src.0),
-        }
-    }
-}
-
 pub(crate) trait Semaphore {
-    type Permit;
-
-    fn new_permit() -> Self::Permit;
-
-    /// The permit is dropped without a value being sent. In this case, the
-    /// permit must be returned to the semaphore.
-    ///
-    /// # Return
-    ///
-    /// Returns true if the permit was acquired.
-    fn drop_permit(&self, permit: &mut Self::Permit) -> bool;
-
     fn is_idle(&self) -> bool;
 
     fn add_permit(&self);
 
-    fn poll_acquire(
-        &self,
-        cx: &mut Context<'_>,
-        permit: &mut Self::Permit,
-    ) -> Poll<Result<(), ClosedError>>;
-
-    fn try_acquire(&self, permit: &mut Self::Permit) -> Result<(), TrySendError>;
-
-    /// A value was sent into the channel and the permit held by `tx` is
-    /// dropped. In this case, the permit should not immeditely be returned to
-    /// the semaphore. Instead, the permit is returnred to the semaphore once
-    /// the sent value is read by the rx handle.
-    fn forget(&self, permit: &mut Self::Permit);
-
     fn close(&self);
+
+    fn is_closed(&self) -> bool;
 }
 
 struct Chan<T, S> {
+    /// Notifies all tasks listening for the receiver being dropped
+    notify_rx_closed: Notify,
+
     /// Handle to the push half of the lock-free list.
     tx: list::Tx<T>,
 
@@ -157,13 +101,11 @@
 unsafe impl<T: Send, S: Send> Send for Chan<T, S> {}
 unsafe impl<T: Send, S: Sync> Sync for Chan<T, S> {}
 
-pub(crate) fn channel<T, S>(semaphore: S) -> (Tx<T, S>, Rx<T, S>)
-where
-    S: Semaphore,
-{
+pub(crate) fn channel<T, S: Semaphore>(semaphore: S) -> (Tx<T, S>, Rx<T, S>) {
     let (tx, rx) = list::channel();
 
     let chan = Arc::new(Chan {
+        notify_rx_closed: Notify::new(),
         tx,
         semaphore,
         rx_waker: AtomicWaker::new(),
@@ -179,48 +121,50 @@
 
 // ===== impl Tx =====
 
-impl<T, S> Tx<T, S>
-where
-    S: Semaphore,
-{
+impl<T, S> Tx<T, S> {
     fn new(chan: Arc<Chan<T, S>>) -> Tx<T, S> {
-        Tx {
-            inner: chan,
-            permit: S::new_permit(),
-        }
+        Tx { inner: chan }
     }
 
-    pub(crate) fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), ClosedError>> {
-        self.inner.semaphore.poll_acquire(cx, &mut self.permit)
+    pub(super) fn semaphore(&self) -> &S {
+        &self.inner.semaphore
     }
 
-    pub(crate) fn disarm(&mut self) {
-        // TODO: should this error if not acquired?
-        self.inner.semaphore.drop_permit(&mut self.permit);
+    /// Send a message and notify the receiver.
+    pub(crate) fn send(&self, value: T) {
+        self.inner.send(value);
     }
 
-    /// Send a message and notify the receiver.
-    pub(crate) fn try_send(&mut self, value: T) -> Result<(), (T, TrySendError)> {
-        self.inner.try_send(value, &mut self.permit)
+    /// Wake the receive half
+    pub(crate) fn wake_rx(&self) {
+        self.inner.rx_waker.wake();
     }
-}
 
-impl<T> Tx<T, (crate::sync::semaphore_ll::Semaphore, usize)> {
-    pub(crate) fn is_ready(&self) -> bool {
-        self.permit.is_acquired()
+    /// Returns `true` if senders belong to the same channel.
+    pub(crate) fn same_channel(&self, other: &Self) -> bool {
+        Arc::ptr_eq(&self.inner, &other.inner)
     }
 }
 
-impl<T> Tx<T, AtomicUsize> {
-    pub(crate) fn send_unbounded(&self, value: T) -> Result<(), (T, TrySendError)> {
-        self.inner.try_send(value, &mut ())
+impl<T, S: Semaphore> Tx<T, S> {
+    pub(crate) fn is_closed(&self) -> bool {
+        self.inner.semaphore.is_closed()
+    }
+
+    pub(crate) async fn closed(&self) {
+        // In order to avoid a race condition, we first request a notification,
+        // **then** check whether the semaphore is closed. If the semaphore is
+        // closed the notification request is dropped.
+        let notified = self.inner.notify_rx_closed.notified();
+
+        if self.inner.semaphore.is_closed() {
+            return;
+        }
+        notified.await;
     }
 }
 
-impl<T, S> Clone for Tx<T, S>
-where
-    S: Semaphore,
-{
+impl<T, S> Clone for Tx<T, S> {
     fn clone(&self) -> Tx<T, S> {
         // Using a Relaxed ordering here is sufficient as the caller holds a
         // strong ref to `self`, preventing a concurrent decrement to zero.
@@ -228,22 +172,12 @@
 
         Tx {
             inner: self.inner.clone(),
-            permit: S::new_permit(),
         }
     }
 }
 
-impl<T, S> Drop for Tx<T, S>
-where
-    S: Semaphore,
-{
+impl<T, S> Drop for Tx<T, S> {
     fn drop(&mut self) {
-        let notify = self.inner.semaphore.drop_permit(&mut self.permit);
-
-        if notify && self.inner.semaphore.is_idle() {
-            self.inner.rx_waker.wake();
-        }
-
         if self.inner.tx_count.fetch_sub(1, AcqRel) != 1 {
             return;
         }
@@ -252,16 +186,13 @@
         self.inner.tx.close();
 
         // Notify the receiver
-        self.inner.rx_waker.wake();
+        self.wake_rx();
     }
 }
 
 // ===== impl Rx =====
 
-impl<T, S> Rx<T, S>
-where
-    S: Semaphore,
-{
+impl<T, S: Semaphore> Rx<T, S> {
     fn new(chan: Arc<Chan<T, S>>) -> Rx<T, S> {
         Rx { inner: chan }
     }
@@ -278,6 +209,7 @@
         });
 
         self.inner.semaphore.close();
+        self.inner.notify_rx_closed.notify_waiters();
     }
 
     /// Receive the next value
@@ -331,28 +263,9 @@
             }
         })
     }
-
-    /// Receives the next value without blocking
-    pub(crate) fn try_recv(&mut self) -> Result<T, TryRecvError> {
-        use super::block::Read::*;
-        self.inner.rx_fields.with_mut(|rx_fields_ptr| {
-            let rx_fields = unsafe { &mut *rx_fields_ptr };
-            match rx_fields.list.pop(&self.inner.tx) {
-                Some(Value(value)) => {
-                    self.inner.semaphore.add_permit();
-                    Ok(value)
-                }
-                Some(Closed) => Err(TryRecvError::Closed),
-                None => Err(TryRecvError::Empty),
-            }
-        })
-    }
 }
 
-impl<T, S> Drop for Rx<T, S>
-where
-    S: Semaphore,
-{
+impl<T, S: Semaphore> Drop for Rx<T, S> {
     fn drop(&mut self) {
         use super::block::Read::Value;
 
@@ -370,25 +283,13 @@
 
 // ===== impl Chan =====
 
-impl<T, S> Chan<T, S>
-where
-    S: Semaphore,
-{
-    fn try_send(&self, value: T, permit: &mut S::Permit) -> Result<(), (T, TrySendError)> {
-        if let Err(e) = self.semaphore.try_acquire(permit) {
-            return Err((value, e));
-        }
-
+impl<T, S> Chan<T, S> {
+    fn send(&self, value: T) {
         // Push the value
         self.tx.push(value);
 
         // Notify the rx task
         self.rx_waker.wake();
-
-        // Release the permit
-        self.semaphore.forget(permit);
-
-        Ok(())
     }
 }
 
@@ -407,74 +308,24 @@
     }
 }
 
-use crate::sync::semaphore_ll::TryAcquireError;
-
-impl From<TryAcquireError> for TrySendError {
-    fn from(src: TryAcquireError) -> TrySendError {
-        if src.is_closed() {
-            TrySendError::Closed
-        } else if src.is_no_permits() {
-            TrySendError::Full
-        } else {
-            unreachable!();
-        }
-    }
-}
-
 // ===== impl Semaphore for (::Semaphore, capacity) =====
 
-use crate::sync::semaphore_ll::Permit;
-
-impl Semaphore for (crate::sync::semaphore_ll::Semaphore, usize) {
-    type Permit = Permit;
-
-    fn new_permit() -> Permit {
-        Permit::new()
-    }
-
-    fn drop_permit(&self, permit: &mut Permit) -> bool {
-        let ret = permit.is_acquired();
-        permit.release(1, &self.0);
-        ret
-    }
-
+impl Semaphore for (crate::sync::batch_semaphore::Semaphore, usize) {
     fn add_permit(&self) {
-        self.0.add_permits(1)
+        self.0.release(1)
     }
 
     fn is_idle(&self) -> bool {
         self.0.available_permits() == self.1
     }
 
-    fn poll_acquire(
-        &self,
-        cx: &mut Context<'_>,
-        permit: &mut Permit,
-    ) -> Poll<Result<(), ClosedError>> {
-        // Keep track of task budget
-        let coop = ready!(crate::coop::poll_proceed(cx));
-
-        permit
-            .poll_acquire(cx, 1, &self.0)
-            .map_err(|_| ClosedError::new())
-            .map(move |r| {
-                coop.made_progress();
-                r
-            })
-    }
-
-    fn try_acquire(&self, permit: &mut Permit) -> Result<(), TrySendError> {
-        permit.try_acquire(1, &self.0)?;
-        Ok(())
-    }
-
-    fn forget(&self, permit: &mut Self::Permit) {
-        permit.forget(1);
-    }
-
     fn close(&self) {
         self.0.close();
     }
+
+    fn is_closed(&self) -> bool {
+        self.0.is_closed()
+    }
 }
 
 // ===== impl Semaphore for AtomicUsize =====
@@ -483,14 +334,6 @@
 use std::usize;
 
 impl Semaphore for AtomicUsize {
-    type Permit = ();
-
-    fn new_permit() {}
-
-    fn drop_permit(&self, _permit: &mut ()) -> bool {
-        false
-    }
-
     fn add_permit(&self) {
         let prev = self.fetch_sub(2, Release);
 
@@ -504,40 +347,11 @@
         self.load(Acquire) >> 1 == 0
     }
 
-    fn poll_acquire(
-        &self,
-        _cx: &mut Context<'_>,
-        permit: &mut (),
-    ) -> Poll<Result<(), ClosedError>> {
-        Ready(self.try_acquire(permit).map_err(|_| ClosedError::new()))
-    }
-
-    fn try_acquire(&self, _permit: &mut ()) -> Result<(), TrySendError> {
-        let mut curr = self.load(Acquire);
-
-        loop {
-            if curr & 1 == 1 {
-                return Err(TrySendError::Closed);
-            }
-
-            if curr == usize::MAX ^ 1 {
-                // Overflowed the ref count. There is no safe way to recover, so
-                // abort the process. In practice, this should never happen.
-                process::abort()
-            }
-
-            match self.compare_exchange(curr, curr + 2, AcqRel, Acquire) {
-                Ok(_) => return Ok(()),
-                Err(actual) => {
-                    curr = actual;
-                }
-            }
-        }
-    }
-
-    fn forget(&self, _permit: &mut ()) {}
-
     fn close(&self) {
         self.fetch_or(1, Release);
     }
+
+    fn is_closed(&self) -> bool {
+        self.load(Acquire) & 1 == 1
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -55,65 +55,20 @@
 
 /// Error returned by `Receiver`.
 #[derive(Debug)]
+#[doc(hidden)]
+#[deprecated(note = "This type is unused because recv returns an Option.")]
 pub struct RecvError(());
 
+#[allow(deprecated)]
 impl fmt::Display for RecvError {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(fmt, "channel closed")
     }
 }
 
+#[allow(deprecated)]
 impl Error for RecvError {}
 
-// ===== TryRecvError =====
-
-/// This enumeration is the list of the possible reasons that try_recv
-/// could not return data when called.
-#[derive(Debug, PartialEq)]
-pub enum TryRecvError {
-    /// This channel is currently empty, but the Sender(s) have not yet
-    /// disconnected, so data may yet become available.
-    Empty,
-    /// The channel's sending half has been closed, and there will
-    /// never be any more data received on it.
-    Closed,
-}
-
-impl fmt::Display for TryRecvError {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            fmt,
-            "{}",
-            match self {
-                TryRecvError::Empty => "channel empty",
-                TryRecvError::Closed => "channel closed",
-            }
-        )
-    }
-}
-
-impl Error for TryRecvError {}
-
-// ===== ClosedError =====
-
-/// Error returned by [`Sender::poll_ready`](super::Sender::poll_ready).
-#[derive(Debug)]
-pub struct ClosedError(());
-
-impl ClosedError {
-    pub(crate) fn new() -> ClosedError {
-        ClosedError(())
-    }
-}
-
-impl fmt::Display for ClosedError {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(fmt, "channel closed")
-    }
-}
-
-impl Error for ClosedError {}
-
 cfg_time! {
     // ===== SendTimeoutError =====
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/list.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,7 @@
 //! A concurrent, lock-free, FIFO list.
 
-use crate::loom::{
-    sync::atomic::{AtomicPtr, AtomicUsize},
-    thread,
-};
+use crate::loom::sync::atomic::{AtomicPtr, AtomicUsize};
+use crate::loom::thread;
 use crate::sync::mpsc::block::{self, Block};
 
 use std::fmt;
@@ -142,11 +140,11 @@
                 //
                 // Acquire is not needed as any "actual" value is not accessed.
                 // At this point, the linked list is walked to acquire blocks.
-                let actual =
-                    self.block_tail
-                        .compare_and_swap(block_ptr, next_block.as_ptr(), Release);
-
-                if actual == block_ptr {
+                if self
+                    .block_tail
+                    .compare_exchange(block_ptr, next_block.as_ptr(), Release, Relaxed)
+                    .is_ok()
+                {
                     // Synchronize with any senders
                     let tail_position = self.tail_position.fetch_add(0, Release);
 
@@ -193,7 +191,7 @@
 
         // TODO: Unify this logic with Block::grow
         for _ in 0..3 {
-            match curr.as_ref().try_push(&mut block, AcqRel) {
+            match curr.as_ref().try_push(&mut block, AcqRel, Acquire) {
                 Ok(_) => {
                     reused = true;
                     break;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,23 +1,27 @@
 #![cfg_attr(not(feature = "sync"), allow(dead_code, unreachable_pub))]
 
-//! A multi-producer, single-consumer queue for sending values across
+//! A multi-producer, single-consumer queue for sending values between
 //! asynchronous tasks.
 //!
-//! Similar to `std`, channel creation provides [`Receiver`] and [`Sender`]
-//! handles. [`Receiver`] implements `Stream` and allows a task to read values
-//! out of the channel. If there is no message to read, the current task will be
-//! notified when a new value is sent. If the channel is at capacity, the send
-//! is rejected and the task will be notified when additional capacity is
-//! available. In other words, the channel provides backpressure.
-//!
 //! This module provides two variants of the channel: bounded and unbounded. The
 //! bounded variant has a limit on the number of messages that the channel can
 //! store, and if this limit is reached, trying to send another message will
 //! wait until a message is received from the channel. An unbounded channel has
-//! an infinite capacity, so the `send` method never does any kind of sleeping.
+//! an infinite capacity, so the `send` method will always complete immediately.
 //! This makes the [`UnboundedSender`] usable from both synchronous and
 //! asynchronous code.
 //!
+//! Similar to the `mpsc` channels provided by `std`, the channel constructor
+//! functions provide separate send and receive handles, [`Sender`] and
+//! [`Receiver`] for the bounded channel, [`UnboundedSender`] and
+//! [`UnboundedReceiver`] for the unbounded channel. If there is no message to read,
+//! the current task will be notified when a new value is sent. [`Sender`] and
+//! [`UnboundedSender`] allow sending values into the channel. If the bounded
+//! channel is at capacity, the send is rejected and the task will be notified
+//! when additional capacity is available. In other words, the channel provides
+//! backpressure.
+//!
+//!
 //! # Disconnection
 //!
 //! When all [`Sender`] handles have been dropped, it is no longer
@@ -43,11 +47,10 @@
 //! are two situations to consider:
 //!
 //! **Bounded channel**: If you need a bounded channel, you should use a bounded
-//! Tokio `mpsc` channel for both directions of communication. To call the async
-//! [`send`][bounded-send] or [`recv`][bounded-recv] methods in sync code, you
-//! will need to use [`Handle::block_on`], which allow you to execute an async
-//! method in synchronous code. This is necessary because a bounded channel may
-//! need to wait for additional capacity to become available.
+//! Tokio `mpsc` channel for both directions of communication. Instead of calling
+//! the async [`send`][bounded-send] or [`recv`][bounded-recv] methods, in
+//! synchronous code you will need to use the [`blocking_send`][blocking-send] or
+//! [`blocking_recv`][blocking-recv] methods.
 //!
 //! **Unbounded channel**: You should use the kind of channel that matches where
 //! the receiver is. So for sending a message _from async to sync_, you should
@@ -59,7 +62,10 @@
 //! [`Receiver`]: crate::sync::mpsc::Receiver
 //! [bounded-send]: crate::sync::mpsc::Sender::send()
 //! [bounded-recv]: crate::sync::mpsc::Receiver::recv()
+//! [blocking-send]: crate::sync::mpsc::Sender::blocking_send()
+//! [blocking-recv]: crate::sync::mpsc::Receiver::blocking_recv()
 //! [`UnboundedSender`]: crate::sync::mpsc::UnboundedSender
+//! [`UnboundedReceiver`]: crate::sync::mpsc::UnboundedReceiver
 //! [`Handle::block_on`]: crate::runtime::Handle::block_on()
 //! [std-unbounded]: std::sync::mpsc::channel
 //! [crossbeam-unbounded]: https://docs.rs/crossbeam/*/crossbeam/channel/fn.unbounded.html
@@ -67,7 +73,7 @@
 pub(super) mod block;
 
 mod bounded;
-pub use self::bounded::{channel, Receiver, Sender};
+pub use self::bounded::{channel, OwnedPermit, Permit, Receiver, Sender};
 
 mod chan;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/unbounded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/unbounded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mpsc/unbounded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mpsc/unbounded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 use crate::loom::sync::atomic::AtomicUsize;
 use crate::sync::mpsc::chan;
-use crate::sync::mpsc::error::{SendError, TryRecvError};
+use crate::sync::mpsc::error::SendError;
 
 use std::fmt;
 use std::task::{Context, Poll};
@@ -33,6 +33,10 @@
 ///
 /// Instances are created by the
 /// [`unbounded_channel`](unbounded_channel) function.
+///
+/// This receiver can be turned into a `Stream` using [`UnboundedReceiverStream`].
+///
+/// [`UnboundedReceiverStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.UnboundedReceiverStream.html
 pub struct UnboundedReceiver<T> {
     /// The channel receiver
     chan: chan::Rx<T, Semaphore>,
@@ -47,7 +51,7 @@
 }
 
 /// Creates an unbounded mpsc channel for communicating between asynchronous
-/// tasks.
+/// tasks without backpressure.
 ///
 /// A `send` on this channel will always succeed as long as the receive half has
 /// not been closed. If the receiver falls behind, messages will be arbitrarily
@@ -73,16 +77,18 @@
         UnboundedReceiver { chan }
     }
 
-    #[doc(hidden)] // TODO: doc
-    pub fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<T>> {
-        self.chan.recv(cx)
-    }
-
     /// Receives the next value for this receiver.
     ///
     /// `None` is returned when all `Sender` halves have dropped, indicating
     /// that no further values can be sent on the channel.
     ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. If `recv` is used as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, it is guaranteed that no messages were received on this
+    /// channel.
+    ///
     /// # Examples
     ///
     /// ```
@@ -123,19 +129,34 @@
         poll_fn(|cx| self.poll_recv(cx)).await
     }
 
-    /// Attempts to return a pending value on this receiver without blocking.
+    /// Blocking receive to call outside of asynchronous contexts.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if called within an asynchronous execution
+    /// context.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, mut rx) = mpsc::unbounded_channel::<u8>();
+    ///
+    ///     let sync_code = thread::spawn(move || {
+    ///         assert_eq!(Some(10), rx.blocking_recv());
+    ///     });
     ///
-    /// This method will never block the caller in order to wait for data to
-    /// become available. Instead, this will always return immediately with
-    /// a possible option of pending data on the channel.
-    ///
-    /// This is useful for a flavor of "optimistic check" before deciding to
-    /// block on a receiver.
-    ///
-    /// Compared with recv, this function has two failure cases instead of
-    /// one (one for disconnection, one for an empty buffer).
-    pub fn try_recv(&mut self) -> Result<T, TryRecvError> {
-        self.chan.try_recv()
+    ///     let _ = tx.send(10);
+    ///     sync_code.join().unwrap();
+    /// }
+    /// ```
+    #[cfg(feature = "sync")]
+    pub fn blocking_recv(&mut self) -> Option<T> {
+        crate::future::block_on(self.recv())
     }
 
     /// Closes the receiving half of a channel, without dropping it.
@@ -145,14 +166,24 @@
     pub fn close(&mut self) {
         self.chan.close();
     }
-}
-
-#[cfg(feature = "stream")]
-impl<T> crate::stream::Stream for UnboundedReceiver<T> {
-    type Item = T;
 
-    fn poll_next(mut self: std::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
-        self.poll_recv(cx)
+    /// Polls to receive the next message on this channel.
+    ///
+    /// This method returns:
+    ///
+    ///  * `Poll::Pending` if no messages are available but the channel is not
+    ///    closed.
+    ///  * `Poll::Ready(Some(message))` if a message is available.
+    ///  * `Poll::Ready(None)` if the channel has been closed and all messages
+    ///    sent before it was closed have been received.
+    ///
+    /// When the method returns `Poll::Pending`, the `Waker` in the provided
+    /// `Context` is scheduled to receive a wakeup when a message is sent on any
+    /// receiver, or when the channel is closed.  Note that on multiple calls to
+    /// `poll_recv`, only the `Waker` from the `Context` passed to the most
+    /// recent call is scheduled to receive a wakeup.
+    pub fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<T>> {
+        self.chan.recv(cx)
     }
 }
 
@@ -174,7 +205,119 @@
     /// [`close`]: UnboundedReceiver::close
     /// [`UnboundedReceiver`]: UnboundedReceiver
     pub fn send(&self, message: T) -> Result<(), SendError<T>> {
-        self.chan.send_unbounded(message)?;
+        if !self.inc_num_messages() {
+            return Err(SendError(message));
+        }
+
+        self.chan.send(message);
         Ok(())
     }
+
+    fn inc_num_messages(&self) -> bool {
+        use std::process;
+        use std::sync::atomic::Ordering::{AcqRel, Acquire};
+
+        let mut curr = self.chan.semaphore().load(Acquire);
+
+        loop {
+            if curr & 1 == 1 {
+                return false;
+            }
+
+            if curr == usize::MAX ^ 1 {
+                // Overflowed the ref count. There is no safe way to recover, so
+                // abort the process. In practice, this should never happen.
+                process::abort()
+            }
+
+            match self
+                .chan
+                .semaphore()
+                .compare_exchange(curr, curr + 2, AcqRel, Acquire)
+            {
+                Ok(_) => return true,
+                Err(actual) => {
+                    curr = actual;
+                }
+            }
+        }
+    }
+
+    /// Completes when the receiver has dropped.
+    ///
+    /// This allows the producers to get notified when interest in the produced
+    /// values is canceled and immediately stop doing work.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once the channel is closed, it stays closed
+    /// forever and all future calls to `closed` will return immediately.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::mpsc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx1, rx) = mpsc::unbounded_channel::<()>();
+    ///     let tx2 = tx1.clone();
+    ///     let tx3 = tx1.clone();
+    ///     let tx4 = tx1.clone();
+    ///     let tx5 = tx1.clone();
+    ///     tokio::spawn(async move {
+    ///         drop(rx);
+    ///     });
+    ///
+    ///     futures::join!(
+    ///         tx1.closed(),
+    ///         tx2.closed(),
+    ///         tx3.closed(),
+    ///         tx4.closed(),
+    ///         tx5.closed()
+    ///     );
+    ////     println!("Receiver dropped");
+    /// }
+    /// ```
+    pub async fn closed(&self) {
+        self.chan.closed().await
+    }
+
+    /// Checks if the channel has been closed. This happens when the
+    /// [`UnboundedReceiver`] is dropped, or when the
+    /// [`UnboundedReceiver::close`] method is called.
+    ///
+    /// [`UnboundedReceiver`]: crate::sync::mpsc::UnboundedReceiver
+    /// [`UnboundedReceiver::close`]: crate::sync::mpsc::UnboundedReceiver::close
+    ///
+    /// ```
+    /// let (tx, rx) = tokio::sync::mpsc::unbounded_channel::<()>();
+    /// assert!(!tx.is_closed());
+    ///
+    /// let tx2 = tx.clone();
+    /// assert!(!tx2.is_closed());
+    ///
+    /// drop(rx);
+    /// assert!(tx.is_closed());
+    /// assert!(tx2.is_closed());
+    /// ```
+    pub fn is_closed(&self) -> bool {
+        self.chan.is_closed()
+    }
+
+    /// Returns `true` if senders belong to the same channel.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// let (tx, rx) = tokio::sync::mpsc::unbounded_channel::<()>();
+    /// let  tx2 = tx.clone();
+    /// assert!(tx.same_channel(&tx2));
+    ///
+    /// let (tx3, rx3) = tokio::sync::mpsc::unbounded_channel::<()>();
+    /// assert!(!tx3.same_channel(&tx2));
+    /// ```
+    pub fn same_channel(&self, other: &Self) -> bool {
+        self.chan.same_channel(&other.chan)
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/mutex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/mutex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,30 +1,37 @@
+#![cfg_attr(not(feature = "sync"), allow(unreachable_pub, dead_code))]
+
 use crate::sync::batch_semaphore as semaphore;
 
 use std::cell::UnsafeCell;
 use std::error::Error;
-use std::fmt;
 use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
+use std::{fmt, marker, mem};
 
 /// An asynchronous `Mutex`-like type.
 ///
-/// This type acts similarly to an asynchronous [`std::sync::Mutex`], with one
-/// major difference: [`lock`] does not block and the lock guard can be held
-/// across await points.
+/// This type acts similarly to [`std::sync::Mutex`], with two major
+/// differences: [`lock`] is an async method so does not block, and the lock
+/// guard is designed to be held across `.await` points.
 ///
 /// # Which kind of mutex should you use?
 ///
 /// Contrary to popular belief, it is ok and often preferred to use the ordinary
-/// [`Mutex`][std] from the standard library in asynchronous code. This section
-/// will help you decide on which kind of mutex you should use.
+/// [`Mutex`][std] from the standard library in asynchronous code.
 ///
-/// The primary use case of the async mutex is to provide shared mutable access
-/// to IO resources such as a database connection. If the data stored behind the
-/// mutex is just data, it is often better to use a blocking mutex such as the
-/// one in the standard library or [`parking_lot`]. This is because the feature
-/// that the async mutex offers over the blocking mutex is that it is possible
-/// to keep the mutex locked across an `.await` point, which is rarely necessary
-/// for data.
+/// The feature that the async mutex offers over the blocking mutex is the
+/// ability to keep it locked across an `.await` point. This makes the async
+/// mutex more expensive than the blocking mutex, so the blocking mutex should
+/// be preferred in the cases where it can be used. The primary use case for the
+/// async mutex is to provide shared mutable access to IO resources such as a
+/// database connection. If the value behind the mutex is just data, it's
+/// usually appropriate to use a blocking mutex such as the one in the standard
+/// library or [`parking_lot`].
+///
+/// Note that, although the compiler will not prevent the std `Mutex` from holding
+/// its guard across `.await` points in situations where the task is not movable
+/// between threads, this virtually never leads to correct concurrent code in
+/// practice as it can easily lead to deadlocks.
 ///
 /// A common pattern is to wrap the `Arc<Mutex<...>>` in a struct that provides
 /// non-async methods for performing operations on the data within, and only
@@ -69,13 +76,13 @@
 /// async fn main() {
 ///     let count = Arc::new(Mutex::new(0));
 ///
-///     for _ in 0..5 {
+///     for i in 0..5 {
 ///         let my_count = Arc::clone(&count);
 ///         tokio::spawn(async move {
-///             for _ in 0..10 {
+///             for j in 0..10 {
 ///                 let mut lock = my_count.lock().await;
 ///                 *lock += 1;
-///                 println!("{}", lock);
+///                 println!("{} {} {}", i, j, lock);
 ///             }
 ///         });
 ///     }
@@ -98,9 +105,10 @@
 /// Tokio's Mutex works in a simple FIFO (first in, first out) style where all
 /// calls to [`lock`] complete in the order they were performed. In that way the
 /// Mutex is "fair" and predictable in how it distributes the locks to inner
-/// data. This is why the output of the program above is an in-order count to
-/// 50. Locks are released and reacquired after every iteration, so basically,
+/// data. Locks are released and reacquired after every iteration, so basically,
 /// each thread goes to the back of the line after it increments the value once.
+/// Note that there's some unpredictability to the timing between when the
+/// threads are started, but once they are going they alternate predictably.
 /// Finally, since there is only a single valid lock at any given time, there is
 /// no possibility of a race condition when mutating the inner value.
 ///
@@ -120,7 +128,8 @@
     c: UnsafeCell<T>,
 }
 
-/// A handle to a held `Mutex`.
+/// A handle to a held `Mutex`. The guard can be held across any `.await` point
+/// as it is [`Send`].
 ///
 /// As long as you have this guard, you have exclusive access to the underlying
 /// `T`. The guard internally borrows the `Mutex`, so the mutex will not be
@@ -140,7 +149,7 @@
 /// unlike `MutexGuard`, it will have the `'static` lifetime.
 ///
 /// As long as you have this guard, you have exclusive access to the underlying
-/// `T`. The guard internally keeps a reference-couned pointer to the original
+/// `T`. The guard internally keeps a reference-counted pointer to the original
 /// `Mutex`, so even if the lock goes away, the guard remains valid.
 ///
 /// The lock is automatically released whenever the guard is dropped, at which
@@ -151,6 +160,19 @@
     lock: Arc<Mutex<T>>,
 }
 
+/// A handle to a held `Mutex` that has had a function applied to it via [`MutexGuard::map`].
+///
+/// This can be used to hold a subfield of the protected data.
+///
+/// [`MutexGuard::map`]: method@MutexGuard::map
+#[must_use = "if unused the Mutex will immediately unlock"]
+pub struct MappedMutexGuard<'a, T: ?Sized> {
+    s: &'a semaphore::Semaphore,
+    data: *mut T,
+    // Needed to tell the borrow checker that we are holding a `&mut T`
+    marker: marker::PhantomData<&'a mut T>,
+}
+
 // As long as T: Send, it's fine to send and share Mutex<T> between threads.
 // If T was not Send, sending and sharing a Mutex<T> would be bad, since you can
 // access T through Mutex<T>.
@@ -158,14 +180,25 @@
 unsafe impl<T> Sync for Mutex<T> where T: ?Sized + Send {}
 unsafe impl<T> Sync for MutexGuard<'_, T> where T: ?Sized + Send + Sync {}
 unsafe impl<T> Sync for OwnedMutexGuard<T> where T: ?Sized + Send + Sync {}
+unsafe impl<'a, T> Sync for MappedMutexGuard<'a, T> where T: ?Sized + Sync + 'a {}
+unsafe impl<'a, T> Send for MappedMutexGuard<'a, T> where T: ?Sized + Send + 'a {}
 
-/// Error returned from the [`Mutex::try_lock`] function.
+/// Error returned from the [`Mutex::try_lock`], [`RwLock::try_read`] and
+/// [`RwLock::try_write`] functions.
 ///
-/// A `try_lock` operation can only fail if the mutex is already locked.
+/// `Mutex::try_lock` operation will only fail if the mutex is already locked.
+///
+/// `RwLock::try_read` operation will only fail if the lock is currently held
+/// by an exclusive writer.
+///
+/// `RwLock::try_write` operation will if lock is held by any reader or by an
+/// exclusive writer.
 ///
 /// [`Mutex::try_lock`]: Mutex::try_lock
+/// [`RwLock::try_read`]: fn@super::RwLock::try_read
+/// [`RwLock::try_write`]: fn@super::RwLock::try_write
 #[derive(Debug)]
-pub struct TryLockError(());
+pub struct TryLockError(pub(super) ());
 
 impl fmt::Display for TryLockError {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -219,9 +252,36 @@
         }
     }
 
-    /// Locks this mutex, causing the current task
-    /// to yield until the lock has been acquired.
-    /// When the lock has been acquired, function returns a [`MutexGuard`].
+    /// Creates a new lock in an unlocked state ready for use.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::Mutex;
+    ///
+    /// static LOCK: Mutex<i32> = Mutex::const_new(5);
+    /// ```
+    #[cfg(all(feature = "parking_lot", not(all(loom, test)),))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "parking_lot")))]
+    pub const fn const_new(t: T) -> Self
+    where
+        T: Sized,
+    {
+        Self {
+            c: UnsafeCell::new(t),
+            s: semaphore::Semaphore::const_new(1),
+        }
+    }
+
+    /// Locks this mutex, causing the current task to yield until the lock has
+    /// been acquired.  When the lock has been acquired, function returns a
+    /// [`MutexGuard`].
+    ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute locks in the order they
+    /// were requested. Cancelling a call to `lock` makes you lose your place in
+    /// the queue.
     ///
     /// # Examples
     ///
@@ -251,6 +311,12 @@
     /// method, and the guard will live for the `'static` lifetime, as it keeps
     /// the `Mutex` alive by holding an `Arc`.
     ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute locks in the order they
+    /// were requested. Cancelling a call to `lock_owned` makes you lose your
+    /// place in the queue.
+    ///
     /// # Examples
     ///
     /// ```
@@ -304,6 +370,30 @@
         }
     }
 
+    /// Returns a mutable reference to the underlying data.
+    ///
+    /// Since this call borrows the `Mutex` mutably, no actual locking needs to
+    /// take place -- the mutable borrow statically guarantees no locks exist.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::Mutex;
+    ///
+    /// fn main() {
+    ///     let mut mutex = Mutex::new(1);
+    ///
+    ///     let n = mutex.get_mut();
+    ///     *n = 2;
+    /// }
+    /// ```
+    pub fn get_mut(&mut self) -> &mut T {
+        unsafe {
+            // Safety: This is https://github.com/rust-lang/rust/pull/76936
+            &mut *self.c.get()
+        }
+    }
+
     /// Attempts to acquire the lock, and returns [`TryLockError`] if the lock
     /// is currently held somewhere else.
     ///
@@ -388,6 +478,129 @@
 
 // === impl MutexGuard ===
 
+impl<'a, T: ?Sized> MutexGuard<'a, T> {
+    /// Makes a new [`MappedMutexGuard`] for a component of the locked data.
+    ///
+    /// This operation cannot fail as the [`MutexGuard`] passed in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be used as `MutexGuard::map(...)`. A method
+    /// would interfere with methods of the same name on the contents of the locked data.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{Mutex, MutexGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let foo = Mutex::new(Foo(1));
+    ///
+    /// {
+    ///     let mut mapped = MutexGuard::map(foo.lock().await, |f| &mut f.0);
+    ///     *mapped = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *foo.lock().await);
+    /// # }
+    /// ```
+    ///
+    /// [`MutexGuard`]: struct@MutexGuard
+    /// [`MappedMutexGuard`]: struct@MappedMutexGuard
+    #[inline]
+    pub fn map<U, F>(mut this: Self, f: F) -> MappedMutexGuard<'a, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let data = f(&mut *this) as *mut U;
+        let s = &this.lock.s;
+        mem::forget(this);
+        MappedMutexGuard {
+            s,
+            data,
+            marker: marker::PhantomData,
+        }
+    }
+
+    /// Attempts to make a new [`MappedMutexGuard`] for a component of the locked data. The
+    /// original guard is returned if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the [`MutexGuard`] passed in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be used as `MutexGuard::try_map(...)`. A
+    /// method would interfere with methods of the same name on the contents of the locked data.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{Mutex, MutexGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let foo = Mutex::new(Foo(1));
+    ///
+    /// {
+    ///     let mut mapped = MutexGuard::try_map(foo.lock().await, |f| Some(&mut f.0))
+    ///         .expect("should not fail");
+    ///     *mapped = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *foo.lock().await);
+    /// # }
+    /// ```
+    ///
+    /// [`MutexGuard`]: struct@MutexGuard
+    /// [`MappedMutexGuard`]: struct@MappedMutexGuard
+    #[inline]
+    pub fn try_map<U, F>(mut this: Self, f: F) -> Result<MappedMutexGuard<'a, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let data = match f(&mut *this) {
+            Some(data) => data as *mut U,
+            None => return Err(this),
+        };
+        let s = &this.lock.s;
+        mem::forget(this);
+        Ok(MappedMutexGuard {
+            s,
+            data,
+            marker: marker::PhantomData,
+        })
+    }
+
+    /// Returns a reference to the original `Mutex`.
+    ///
+    /// ```
+    /// use tokio::sync::{Mutex, MutexGuard};
+    ///
+    /// async fn unlock_and_relock<'l>(guard: MutexGuard<'l, u32>) -> MutexGuard<'l, u32> {
+    ///     println!("1. contains: {:?}", *guard);
+    ///     let mutex = MutexGuard::mutex(&guard);
+    ///     drop(guard);
+    ///     let guard = mutex.lock().await;
+    ///     println!("2. contains: {:?}", *guard);
+    ///     guard
+    /// }
+    /// #
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// #     let mutex = Mutex::new(0u32);
+    /// #     let guard = mutex.lock().await;
+    /// #     unlock_and_relock(guard).await;
+    /// # }
+    /// ```
+    #[inline]
+    pub fn mutex(this: &Self) -> &'a Mutex<T> {
+        this.lock
+    }
+}
+
 impl<T: ?Sized> Drop for MutexGuard<'_, T> {
     fn drop(&mut self) {
         self.lock.s.release(1)
@@ -421,6 +634,35 @@
 
 // === impl OwnedMutexGuard ===
 
+impl<T: ?Sized> OwnedMutexGuard<T> {
+    /// Returns a reference to the original `Arc<Mutex>`.
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{Mutex, OwnedMutexGuard};
+    ///
+    /// async fn unlock_and_relock(guard: OwnedMutexGuard<u32>) -> OwnedMutexGuard<u32> {
+    ///     println!("1. contains: {:?}", *guard);
+    ///     let mutex: Arc<Mutex<u32>> = OwnedMutexGuard::mutex(&guard).clone();
+    ///     drop(guard);
+    ///     let guard = mutex.lock_owned().await;
+    ///     println!("2. contains: {:?}", *guard);
+    ///     guard
+    /// }
+    /// #
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// #     let mutex = Arc::new(Mutex::new(0u32));
+    /// #     let guard = mutex.lock_owned().await;
+    /// #     unlock_and_relock(guard).await;
+    /// # }
+    /// ```
+    #[inline]
+    pub fn mutex(this: &Self) -> &Arc<Mutex<T>> {
+        &this.lock
+    }
+}
+
 impl<T: ?Sized> Drop for OwnedMutexGuard<T> {
     fn drop(&mut self) {
         self.lock.s.release(1)
@@ -450,4 +692,89 @@
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(&**self, f)
     }
+}
+
+// === impl MappedMutexGuard ===
+
+impl<'a, T: ?Sized> MappedMutexGuard<'a, T> {
+    /// Makes a new [`MappedMutexGuard`] for a component of the locked data.
+    ///
+    /// This operation cannot fail as the [`MappedMutexGuard`] passed in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be used as `MappedMutexGuard::map(...)`. A
+    /// method would interfere with methods of the same name on the contents of the locked data.
+    ///
+    /// [`MappedMutexGuard`]: struct@MappedMutexGuard
+    #[inline]
+    pub fn map<U, F>(mut this: Self, f: F) -> MappedMutexGuard<'a, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let data = f(&mut *this) as *mut U;
+        let s = this.s;
+        mem::forget(this);
+        MappedMutexGuard {
+            s,
+            data,
+            marker: marker::PhantomData,
+        }
+    }
+
+    /// Attempts to make a new [`MappedMutexGuard`] for a component of the locked data. The
+    /// original guard is returned if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the [`MappedMutexGuard`] passed in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be used as `MappedMutexGuard::try_map(...)`. A
+    /// method would interfere with methods of the same name on the contents of the locked data.
+    ///
+    /// [`MappedMutexGuard`]: struct@MappedMutexGuard
+    #[inline]
+    pub fn try_map<U, F>(mut this: Self, f: F) -> Result<MappedMutexGuard<'a, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let data = match f(&mut *this) {
+            Some(data) => data as *mut U,
+            None => return Err(this),
+        };
+        let s = this.s;
+        mem::forget(this);
+        Ok(MappedMutexGuard {
+            s,
+            data,
+            marker: marker::PhantomData,
+        })
+    }
+}
+
+impl<'a, T: ?Sized> Drop for MappedMutexGuard<'a, T> {
+    fn drop(&mut self) {
+        self.s.release(1)
+    }
+}
+
+impl<'a, T: ?Sized> Deref for MappedMutexGuard<'a, T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        unsafe { &*self.data }
+    }
+}
+
+impl<'a, T: ?Sized> DerefMut for MappedMutexGuard<'a, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        unsafe { &mut *self.data }
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Debug> fmt::Debug for MappedMutexGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Display> fmt::Display for MappedMutexGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/notify.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/notify.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/notify.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/notify.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,14 @@
-use crate::loom::sync::atomic::AtomicU8;
+// Allow `unreachable_pub` warnings when sync is not enabled
+// due to the usage of `Notify` within the `rt` feature set.
+// When this module is compiled with `sync` enabled we will warn on
+// this lint. When `rt` is enabled we use `pub(crate)` which
+// triggers this warning but it is safe to ignore in this case.
+#![cfg_attr(not(feature = "sync"), allow(unreachable_pub, dead_code))]
+
+use crate::loom::sync::atomic::AtomicUsize;
 use crate::loom::sync::Mutex;
 use crate::util::linked_list::{self, LinkedList};
+use crate::util::WakeList;
 
 use std::cell::UnsafeCell;
 use std::future::Future;
@@ -10,6 +18,8 @@
 use std::sync::atomic::Ordering::SeqCst;
 use std::task::{Context, Poll, Waker};
 
+type WaitList = LinkedList<Waiter, <Waiter as linked_list::Link>::Target>;
+
 /// Notify a single task to wake up.
 ///
 /// `Notify` provides a basic mechanism to notify a single task of an event.
@@ -17,20 +27,20 @@
 /// another task to perform an operation.
 ///
 /// `Notify` can be thought of as a [`Semaphore`] starting with 0 permits.
-/// [`notified().await`] waits for a permit to become available, and [`notify()`]
+/// [`notified().await`] waits for a permit to become available, and [`notify_one()`]
 /// sets a permit **if there currently are no available permits**.
 ///
 /// The synchronization details of `Notify` are similar to
 /// [`thread::park`][park] and [`Thread::unpark`][unpark] from std. A [`Notify`]
 /// value contains a single permit. [`notified().await`] waits for the permit to
-/// be made available, consumes the permit, and resumes.  [`notify()`] sets the
+/// be made available, consumes the permit, and resumes.  [`notify_one()`] sets the
 /// permit, waking a pending task if there is one.
 ///
-/// If `notify()` is called **before** `notfied().await`, then the next call to
+/// If `notify_one()` is called **before** `notified().await`, then the next call to
 /// `notified().await` will complete immediately, consuming the permit. Any
 /// subsequent calls to `notified().await` will wait for a new permit.
 ///
-/// If `notify()` is called **multiple** times before `notified().await`, only a
+/// If `notify_one()` is called **multiple** times before `notified().await`, only a
 /// **single** permit is stored. The next call to `notified().await` will
 /// complete immediately, but the one after will wait for a new permit.
 ///
@@ -53,7 +63,7 @@
 ///     });
 ///
 ///     println!("sending notification");
-///     notify.notify();
+///     notify.notify_one();
 /// }
 /// ```
 ///
@@ -76,7 +86,7 @@
 ///             .push_back(value);
 ///
 ///         // Notify the consumer a value is available
-///         self.notify.notify();
+///         self.notify.notify_one();
 ///     }
 ///
 ///     pub async fn recv(&self) -> T {
@@ -96,12 +106,24 @@
 /// [park]: std::thread::park
 /// [unpark]: std::thread::Thread::unpark
 /// [`notified().await`]: Notify::notified()
-/// [`notify()`]: Notify::notify()
+/// [`notify_one()`]: Notify::notify_one()
 /// [`Semaphore`]: crate::sync::Semaphore
 #[derive(Debug)]
 pub struct Notify {
-    state: AtomicU8,
-    waiters: Mutex<LinkedList<Waiter>>,
+    // This uses 2 bits to store one of `EMPTY`,
+    // `WAITING` or `NOTIFIED`. The rest of the bits
+    // are used to store the number of times `notify_waiters`
+    // was called.
+    state: AtomicUsize,
+    waiters: Mutex<WaitList>,
+}
+
+#[derive(Debug, Clone, Copy)]
+enum NotificationType {
+    // Notification triggered by calling `notify_waiters`
+    AllWaiters,
+    // Notification triggered by calling `notify_one`
+    OneWaiter,
 }
 
 #[derive(Debug)]
@@ -113,15 +135,15 @@
     waker: Option<Waker>,
 
     /// `true` if the notification has been assigned to this waiter.
-    notified: bool,
+    notified: Option<NotificationType>,
 
     /// Should not be `Unpin`.
     _p: PhantomPinned,
 }
 
-/// Future returned from `notified()`
+/// Future returned from [`Notify::notified()`]
 #[derive(Debug)]
-struct Notified<'a> {
+pub struct Notified<'a> {
     /// The `Notify` being received on.
     notify: &'a Notify,
 
@@ -137,19 +159,43 @@
 
 #[derive(Debug)]
 enum State {
-    Init,
+    Init(usize),
     Waiting,
     Done,
 }
 
+const NOTIFY_WAITERS_SHIFT: usize = 2;
+const STATE_MASK: usize = (1 << NOTIFY_WAITERS_SHIFT) - 1;
+const NOTIFY_WAITERS_CALLS_MASK: usize = !STATE_MASK;
+
 /// Initial "idle" state
-const EMPTY: u8 = 0;
+const EMPTY: usize = 0;
 
 /// One or more threads are currently waiting to be notified.
-const WAITING: u8 = 1;
+const WAITING: usize = 1;
 
 /// Pending notification
-const NOTIFIED: u8 = 2;
+const NOTIFIED: usize = 2;
+
+fn set_state(data: usize, state: usize) -> usize {
+    (data & NOTIFY_WAITERS_CALLS_MASK) | (state & STATE_MASK)
+}
+
+fn get_state(data: usize) -> usize {
+    data & STATE_MASK
+}
+
+fn get_num_notify_waiters_calls(data: usize) -> usize {
+    (data & NOTIFY_WAITERS_CALLS_MASK) >> NOTIFY_WAITERS_SHIFT
+}
+
+fn inc_num_notify_waiters_calls(data: usize) -> usize {
+    data + (1 << NOTIFY_WAITERS_SHIFT)
+}
+
+fn atomic_inc_num_notify_waiters_calls(data: &AtomicUsize) {
+    data.fetch_add(1 << NOTIFY_WAITERS_SHIFT, SeqCst);
+}
 
 impl Notify {
     /// Create a new `Notify`, initialized without a permit.
@@ -163,19 +209,49 @@
     /// ```
     pub fn new() -> Notify {
         Notify {
-            state: AtomicU8::new(0),
+            state: AtomicUsize::new(0),
             waiters: Mutex::new(LinkedList::new()),
         }
     }
 
+    /// Create a new `Notify`, initialized without a permit.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::Notify;
+    ///
+    /// static NOTIFY: Notify = Notify::const_new();
+    /// ```
+    #[cfg(all(feature = "parking_lot", not(all(loom, test))))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "parking_lot")))]
+    pub const fn const_new() -> Notify {
+        Notify {
+            state: AtomicUsize::new(0),
+            waiters: Mutex::const_new(LinkedList::new()),
+        }
+    }
+
     /// Wait for a notification.
     ///
+    /// Equivalent to:
+    ///
+    /// ```ignore
+    /// async fn notified(&self);
+    /// ```
+    ///
     /// Each `Notify` value holds a single permit. If a permit is available from
-    /// an earlier call to [`notify()`], then `notified().await` will complete
+    /// an earlier call to [`notify_one()`], then `notified().await` will complete
     /// immediately, consuming that permit. Otherwise, `notified().await` waits
-    /// for a permit to be made available by the next call to `notify()`.
+    /// for a permit to be made available by the next call to `notify_one()`.
+    ///
+    /// [`notify_one()`]: Notify::notify_one
     ///
-    /// [`notify()`]: Notify::notify
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute notifications in the order
+    /// they were requested. Cancelling a call to `notified` makes you lose your
+    /// place in the queue.
     ///
     /// # Examples
     ///
@@ -194,21 +270,23 @@
     ///     });
     ///
     ///     println!("sending notification");
-    ///     notify.notify();
+    ///     notify.notify_one();
     /// }
     /// ```
-    pub async fn notified(&self) {
+    pub fn notified(&self) -> Notified<'_> {
+        // we load the number of times notify_waiters
+        // was called and store that in our initial state
+        let state = self.state.load(SeqCst);
         Notified {
             notify: self,
-            state: State::Init,
+            state: State::Init(state >> NOTIFY_WAITERS_SHIFT),
             waiter: UnsafeCell::new(Waiter {
                 pointers: linked_list::Pointers::new(),
                 waker: None,
-                notified: false,
+                notified: None,
                 _p: PhantomPinned,
             }),
         }
-        .await
     }
 
     /// Notifies a waiting task
@@ -216,10 +294,10 @@
     /// If a task is currently waiting, that task is notified. Otherwise, a
     /// permit is stored in this `Notify` value and the **next** call to
     /// [`notified().await`] will complete immediately consuming the permit made
-    /// available by this call to `notify()`.
+    /// available by this call to `notify_one()`.
     ///
     /// At most one permit may be stored by `Notify`. Many sequential calls to
-    /// `notify` will result in a single permit being stored. The next call to
+    /// `notify_one` will result in a single permit being stored. The next call to
     /// `notified().await` will complete immediately, but the one after that
     /// will wait.
     ///
@@ -242,19 +320,22 @@
     ///     });
     ///
     ///     println!("sending notification");
-    ///     notify.notify();
+    ///     notify.notify_one();
     /// }
     /// ```
-    pub fn notify(&self) {
+    // Alias for old name in 0.x
+    #[cfg_attr(docsrs, doc(alias = "notify"))]
+    pub fn notify_one(&self) {
         // Load the current state
         let mut curr = self.state.load(SeqCst);
 
         // If the state is `EMPTY`, transition to `NOTIFIED` and return.
-        while let EMPTY | NOTIFIED = curr {
+        while let EMPTY | NOTIFIED = get_state(curr) {
             // The compare-exchange from `NOTIFIED` -> `NOTIFIED` is intended. A
             // happens-before synchronization must happen between this atomic
             // operation and a task calling `notified().await`.
-            let res = self.state.compare_exchange(curr, NOTIFIED, SeqCst, SeqCst);
+            let new = set_state(curr, NOTIFIED);
+            let res = self.state.compare_exchange(curr, new, SeqCst, SeqCst);
 
             match res {
                 // No waiters, no further work to do
@@ -266,7 +347,7 @@
         }
 
         // There are waiters, the lock must be acquired to notify.
-        let mut waiters = self.waiters.lock().unwrap();
+        let mut waiters = self.waiters.lock();
 
         // The state must be reloaded while the lock is held. The state may only
         // transition out of WAITING while the lock is held.
@@ -277,6 +358,99 @@
             waker.wake();
         }
     }
+
+    /// Notifies all waiting tasks
+    ///
+    /// If a task is currently waiting, that task is notified. Unlike with
+    /// `notify_one()`, no permit is stored to be used by the next call to
+    /// `notified().await`. The purpose of this method is to notify all
+    /// already registered waiters. Registering for notification is done by
+    /// acquiring an instance of the `Notified` future via calling `notified()`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::Notify;
+    /// use std::sync::Arc;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let notify = Arc::new(Notify::new());
+    ///     let notify2 = notify.clone();
+    ///
+    ///     let notified1 = notify.notified();
+    ///     let notified2 = notify.notified();
+    ///
+    ///     let handle = tokio::spawn(async move {
+    ///         println!("sending notifications");
+    ///         notify2.notify_waiters();
+    ///     });
+    ///
+    ///     notified1.await;
+    ///     notified2.await;
+    ///     println!("received notifications");
+    /// }
+    /// ```
+    pub fn notify_waiters(&self) {
+        let mut wakers = WakeList::new();
+
+        // There are waiters, the lock must be acquired to notify.
+        let mut waiters = self.waiters.lock();
+
+        // The state must be reloaded while the lock is held. The state may only
+        // transition out of WAITING while the lock is held.
+        let curr = self.state.load(SeqCst);
+
+        if let EMPTY | NOTIFIED = get_state(curr) {
+            // There are no waiting tasks. All we need to do is increment the
+            // number of times this method was called.
+            atomic_inc_num_notify_waiters_calls(&self.state);
+            return;
+        }
+
+        // At this point, it is guaranteed that the state will not
+        // concurrently change, as holding the lock is required to
+        // transition **out** of `WAITING`.
+        'outer: loop {
+            while wakers.can_push() {
+                match waiters.pop_back() {
+                    Some(mut waiter) => {
+                        // Safety: `waiters` lock is still held.
+                        let waiter = unsafe { waiter.as_mut() };
+
+                        assert!(waiter.notified.is_none());
+
+                        waiter.notified = Some(NotificationType::AllWaiters);
+
+                        if let Some(waker) = waiter.waker.take() {
+                            wakers.push(waker);
+                        }
+                    }
+                    None => {
+                        break 'outer;
+                    }
+                }
+            }
+
+            drop(waiters);
+
+            wakers.wake_all();
+
+            // Acquire the lock again.
+            waiters = self.waiters.lock();
+        }
+
+        // All waiters will be notified, the state must be transitioned to
+        // `EMPTY`. As transitioning **from** `WAITING` requires the lock to be
+        // held, a `store` is sufficient.
+        let new = set_state(inc_num_notify_waiters_calls(curr), EMPTY);
+        self.state.store(new, SeqCst);
+
+        // Release the lock before notifying
+        drop(waiters);
+
+        wakers.wake_all();
+    }
 }
 
 impl Default for Notify {
@@ -285,17 +459,18 @@
     }
 }
 
-fn notify_locked(waiters: &mut LinkedList<Waiter>, state: &AtomicU8, curr: u8) -> Option<Waker> {
+fn notify_locked(waiters: &mut WaitList, state: &AtomicUsize, curr: usize) -> Option<Waker> {
     loop {
-        match curr {
+        match get_state(curr) {
             EMPTY | NOTIFIED => {
-                let res = state.compare_exchange(curr, NOTIFIED, SeqCst, SeqCst);
+                let res = state.compare_exchange(curr, set_state(curr, NOTIFIED), SeqCst, SeqCst);
 
                 match res {
                     Ok(_) => return None,
                     Err(actual) => {
-                        assert!(actual == EMPTY || actual == NOTIFIED);
-                        state.store(NOTIFIED, SeqCst);
+                        let actual_state = get_state(actual);
+                        assert!(actual_state == EMPTY || actual_state == NOTIFIED);
+                        state.store(set_state(actual, NOTIFIED), SeqCst);
                         return None;
                     }
                 }
@@ -311,9 +486,9 @@
                 // Safety: `waiters` lock is still held.
                 let waiter = unsafe { waiter.as_mut() };
 
-                assert!(!waiter.notified);
+                assert!(waiter.notified.is_none());
 
-                waiter.notified = true;
+                waiter.notified = Some(NotificationType::OneWaiter);
                 let waker = waiter.waker.take();
 
                 if waiters.is_empty() {
@@ -321,7 +496,7 @@
                     // must be transitioned to `EMPTY`. As transitioning
                     // **from** `WAITING` requires the lock to be held, a
                     // `store` is sufficient.
-                    state.store(EMPTY, SeqCst);
+                    state.store(set_state(curr, EMPTY), SeqCst);
                 }
 
                 return waker;
@@ -341,10 +516,10 @@
             // Safety: both `notify` and `state` are `Unpin`.
 
             is_unpin::<&Notify>();
-            is_unpin::<AtomicU8>();
+            is_unpin::<AtomicUsize>();
 
             let me = self.get_unchecked_mut();
-            (&me.notify, &mut me.state, &me.waiter)
+            (me.notify, &mut me.state, &me.waiter)
         }
     }
 }
@@ -359,11 +534,16 @@
 
         loop {
             match *state {
-                Init => {
+                Init(initial_notify_waiters_calls) => {
+                    let curr = notify.state.load(SeqCst);
+
                     // Optimistically try acquiring a pending notification
-                    let res = notify
-                        .state
-                        .compare_exchange(NOTIFIED, EMPTY, SeqCst, SeqCst);
+                    let res = notify.state.compare_exchange(
+                        set_state(curr, NOTIFIED),
+                        set_state(curr, EMPTY),
+                        SeqCst,
+                        SeqCst,
+                    );
 
                     if res.is_ok() {
                         // Acquired the notification
@@ -373,22 +553,32 @@
 
                     // Acquire the lock and attempt to transition to the waiting
                     // state.
-                    let mut waiters = notify.waiters.lock().unwrap();
+                    let mut waiters = notify.waiters.lock();
 
                     // Reload the state with the lock held
                     let mut curr = notify.state.load(SeqCst);
 
+                    // if notify_waiters has been called after the future
+                    // was created, then we are done
+                    if get_num_notify_waiters_calls(curr) != initial_notify_waiters_calls {
+                        *state = Done;
+                        return Poll::Ready(());
+                    }
+
                     // Transition the state to WAITING.
                     loop {
-                        match curr {
+                        match get_state(curr) {
                             EMPTY => {
                                 // Transition to WAITING
-                                let res = notify
-                                    .state
-                                    .compare_exchange(EMPTY, WAITING, SeqCst, SeqCst);
+                                let res = notify.state.compare_exchange(
+                                    set_state(curr, EMPTY),
+                                    set_state(curr, WAITING),
+                                    SeqCst,
+                                    SeqCst,
+                                );
 
                                 if let Err(actual) = res {
-                                    assert_eq!(actual, NOTIFIED);
+                                    assert_eq!(get_state(actual), NOTIFIED);
                                     curr = actual;
                                 } else {
                                     break;
@@ -397,9 +587,12 @@
                             WAITING => break,
                             NOTIFIED => {
                                 // Try consuming the notification
-                                let res = notify
-                                    .state
-                                    .compare_exchange(NOTIFIED, EMPTY, SeqCst, SeqCst);
+                                let res = notify.state.compare_exchange(
+                                    set_state(curr, NOTIFIED),
+                                    set_state(curr, EMPTY),
+                                    SeqCst,
+                                    SeqCst,
+                                );
 
                                 match res {
                                     Ok(_) => {
@@ -408,7 +601,7 @@
                                         return Poll::Ready(());
                                     }
                                     Err(actual) => {
-                                        assert_eq!(actual, EMPTY);
+                                        assert_eq!(get_state(actual), EMPTY);
                                         curr = actual;
                                     }
                                 }
@@ -428,6 +621,8 @@
                     waiters.push_front(unsafe { NonNull::new_unchecked(waiter.get()) });
 
                     *state = Waiting;
+
+                    return Poll::Pending;
                 }
                 Waiting => {
                     // Currently in the "Waiting" state, implying the caller has
@@ -435,16 +630,16 @@
                     // `notify.waiters`). In order to access the waker fields,
                     // we must hold the lock.
 
-                    let waiters = notify.waiters.lock().unwrap();
+                    let waiters = notify.waiters.lock();
 
                     // Safety: called while locked
                     let w = unsafe { &mut *waiter.get() };
 
-                    if w.notified {
+                    if w.notified.is_some() {
                         // Our waker has been notified. Reset the fields and
                         // remove it from the list.
                         w.waker = None;
-                        w.notified = false;
+                        w.notified = None;
 
                         *state = Done;
                     } else {
@@ -482,48 +677,29 @@
         // dropped, which means we must ensure that the waiter entry is no
         // longer stored in the linked list.
         if let Waiting = *state {
-            let mut notify_state = WAITING;
-            let mut waiters = notify.waiters.lock().unwrap();
-
-            // `Notify.state` may be in any of the three states (Empty, Waiting,
-            // Notified). It doesn't actually matter what the atomic is set to
-            // at this point. We hold the lock and will ensure the atomic is in
-            // the correct state once th elock is dropped.
-            //
-            // Because the atomic state is not checked, at first glance, it may
-            // seem like this routine does not handle the case where the
-            // receiver is notified but has not yet observed the notification.
-            // If this happens, no matter how many notifications happen between
-            // this receiver being notified and the receive future dropping, all
-            // we need to do is ensure that one notification is returned back to
-            // the `Notify`. This is done by calling `notify_locked` if `self`
-            // has the `notified` flag set.
+            let mut waiters = notify.waiters.lock();
+            let mut notify_state = notify.state.load(SeqCst);
 
-            // remove the entry from the list
+            // remove the entry from the list (if not already removed)
             //
             // safety: the waiter is only added to `waiters` by virtue of it
             // being the only `LinkedList` available to the type.
             unsafe { waiters.remove(NonNull::new_unchecked(waiter.get())) };
 
             if waiters.is_empty() {
-                notify_state = EMPTY;
-                // If the state *should* be `NOTIFIED`, the call to
-                // `notify_locked` below will end up doing the
-                // `store(NOTIFIED)`. If a concurrent receiver races and
-                // observes the incorrect `EMPTY` state, it will then obtain the
-                // lock and block until `notify.state` is in the correct final
-                // state.
-                notify.state.store(EMPTY, SeqCst);
+                if let WAITING = get_state(notify_state) {
+                    notify_state = set_state(notify_state, EMPTY);
+                    notify.state.store(notify_state, SeqCst);
+                }
             }
 
-            // See if the node was notified but not received. In this case, the
-            // notification must be sent to another waiter.
+            // See if the node was notified but not received. In this case, if
+            // the notification was triggered via `notify_one`, it must be sent
+            // to the next waiter.
             //
             // Safety: with the entry removed from the linked list, there can be
             // no concurrent access to the entry
-            let notified = unsafe { (*waiter.get()).notified };
-
-            if notified {
+            if let Some(NotificationType::OneWaiter) = unsafe { (*waiter.get()).notified } {
                 if let Some(waker) = notify_locked(&mut waiters, &notify.state, notify_state) {
                     drop(waiters);
                     waker.wake();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/once_cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/once_cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/once_cell.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/once_cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,457 @@
+use super::{Semaphore, SemaphorePermit, TryAcquireError};
+use crate::loom::cell::UnsafeCell;
+use std::error::Error;
+use std::fmt;
+use std::future::Future;
+use std::mem::MaybeUninit;
+use std::ops::Drop;
+use std::ptr;
+use std::sync::atomic::{AtomicBool, Ordering};
+
+// This file contains an implementation of an OnceCell. The principle
+// behind the safety the of the cell is that any thread with an `&OnceCell` may
+// access the `value` field according the following rules:
+//
+//  1. When `value_set` is false, the `value` field may be modified by the
+//     thread holding the permit on the semaphore.
+//  2. When `value_set` is true, the `value` field may be accessed immutably by
+//     any thread.
+//
+// It is an invariant that if the semaphore is closed, then `value_set` is true.
+// The reverse does not necessarily hold — but if not, the semaphore may not
+// have any available permits.
+//
+// A thread with a `&mut OnceCell` may modify the value in any way it wants as
+// long as the invariants are upheld.
+
+/// A thread-safe cell that can be written to only once.
+///
+/// A `OnceCell` is typically used for global variables that need to be
+/// initialized once on first use, but need no further changes. The `OnceCell`
+/// in Tokio allows the initialization procedure to be asynchronous.
+///
+/// # Examples
+///
+/// ```
+/// use tokio::sync::OnceCell;
+///
+/// async fn some_computation() -> u32 {
+///     1 + 1
+/// }
+///
+/// static ONCE: OnceCell<u32> = OnceCell::const_new();
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let result = ONCE.get_or_init(some_computation).await;
+///     assert_eq!(*result, 2);
+/// }
+/// ```
+///
+/// It is often useful to write a wrapper method for accessing the value.
+///
+/// ```
+/// use tokio::sync::OnceCell;
+///
+/// static ONCE: OnceCell<u32> = OnceCell::const_new();
+///
+/// async fn get_global_integer() -> &'static u32 {
+///     ONCE.get_or_init(|| async {
+///         1 + 1
+///     }).await
+/// }
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let result = get_global_integer().await;
+///     assert_eq!(*result, 2);
+/// }
+/// ```
+pub struct OnceCell<T> {
+    value_set: AtomicBool,
+    value: UnsafeCell<MaybeUninit<T>>,
+    semaphore: Semaphore,
+}
+
+impl<T> Default for OnceCell<T> {
+    fn default() -> OnceCell<T> {
+        OnceCell::new()
+    }
+}
+
+impl<T: fmt::Debug> fmt::Debug for OnceCell<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("OnceCell")
+            .field("value", &self.get())
+            .finish()
+    }
+}
+
+impl<T: Clone> Clone for OnceCell<T> {
+    fn clone(&self) -> OnceCell<T> {
+        OnceCell::new_with(self.get().cloned())
+    }
+}
+
+impl<T: PartialEq> PartialEq for OnceCell<T> {
+    fn eq(&self, other: &OnceCell<T>) -> bool {
+        self.get() == other.get()
+    }
+}
+
+impl<T: Eq> Eq for OnceCell<T> {}
+
+impl<T> Drop for OnceCell<T> {
+    fn drop(&mut self) {
+        if self.initialized_mut() {
+            unsafe {
+                self.value
+                    .with_mut(|ptr| ptr::drop_in_place((&mut *ptr).as_mut_ptr()));
+            };
+        }
+    }
+}
+
+impl<T> From<T> for OnceCell<T> {
+    fn from(value: T) -> Self {
+        let semaphore = Semaphore::new(0);
+        semaphore.close();
+        OnceCell {
+            value_set: AtomicBool::new(true),
+            value: UnsafeCell::new(MaybeUninit::new(value)),
+            semaphore,
+        }
+    }
+}
+
+impl<T> OnceCell<T> {
+    /// Creates a new empty `OnceCell` instance.
+    pub fn new() -> Self {
+        OnceCell {
+            value_set: AtomicBool::new(false),
+            value: UnsafeCell::new(MaybeUninit::uninit()),
+            semaphore: Semaphore::new(1),
+        }
+    }
+
+    /// Creates a new `OnceCell` that contains the provided value, if any.
+    ///
+    /// If the `Option` is `None`, this is equivalent to `OnceCell::new`.
+    ///
+    /// [`OnceCell::new`]: crate::sync::OnceCell::new
+    pub fn new_with(value: Option<T>) -> Self {
+        if let Some(v) = value {
+            OnceCell::from(v)
+        } else {
+            OnceCell::new()
+        }
+    }
+
+    /// Creates a new empty `OnceCell` instance.
+    ///
+    /// Equivalent to `OnceCell::new`, except that it can be used in static
+    /// variables.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use tokio::sync::OnceCell;
+    ///
+    /// static ONCE: OnceCell<u32> = OnceCell::const_new();
+    ///
+    /// async fn get_global_integer() -> &'static u32 {
+    ///     ONCE.get_or_init(|| async {
+    ///         1 + 1
+    ///     }).await
+    /// }
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let result = get_global_integer().await;
+    ///     assert_eq!(*result, 2);
+    /// }
+    /// ```
+    #[cfg(all(feature = "parking_lot", not(all(loom, test))))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "parking_lot")))]
+    pub const fn const_new() -> Self {
+        OnceCell {
+            value_set: AtomicBool::new(false),
+            value: UnsafeCell::new(MaybeUninit::uninit()),
+            semaphore: Semaphore::const_new(1),
+        }
+    }
+
+    /// Returns `true` if the `OnceCell` currently contains a value, and `false`
+    /// otherwise.
+    pub fn initialized(&self) -> bool {
+        // Using acquire ordering so any threads that read a true from this
+        // atomic is able to read the value.
+        self.value_set.load(Ordering::Acquire)
+    }
+
+    /// Returns `true` if the `OnceCell` currently contains a value, and `false`
+    /// otherwise.
+    fn initialized_mut(&mut self) -> bool {
+        *self.value_set.get_mut()
+    }
+
+    // SAFETY: The OnceCell must not be empty.
+    unsafe fn get_unchecked(&self) -> &T {
+        &*self.value.with(|ptr| (*ptr).as_ptr())
+    }
+
+    // SAFETY: The OnceCell must not be empty.
+    unsafe fn get_unchecked_mut(&mut self) -> &mut T {
+        &mut *self.value.with_mut(|ptr| (*ptr).as_mut_ptr())
+    }
+
+    fn set_value(&self, value: T, permit: SemaphorePermit<'_>) -> &T {
+        // SAFETY: We are holding the only permit on the semaphore.
+        unsafe {
+            self.value.with_mut(|ptr| (*ptr).as_mut_ptr().write(value));
+        }
+
+        // Using release ordering so any threads that read a true from this
+        // atomic is able to read the value we just stored.
+        self.value_set.store(true, Ordering::Release);
+        self.semaphore.close();
+        permit.forget();
+
+        // SAFETY: We just initialized the cell.
+        unsafe { self.get_unchecked() }
+    }
+
+    /// Returns a reference to the value currently stored in the `OnceCell`, or
+    /// `None` if the `OnceCell` is empty.
+    pub fn get(&self) -> Option<&T> {
+        if self.initialized() {
+            Some(unsafe { self.get_unchecked() })
+        } else {
+            None
+        }
+    }
+
+    /// Returns a mutable reference to the value currently stored in the
+    /// `OnceCell`, or `None` if the `OnceCell` is empty.
+    ///
+    /// Since this call borrows the `OnceCell` mutably, it is safe to mutate the
+    /// value inside the `OnceCell` — the mutable borrow statically guarantees
+    /// no other references exist.
+    pub fn get_mut(&mut self) -> Option<&mut T> {
+        if self.initialized_mut() {
+            Some(unsafe { self.get_unchecked_mut() })
+        } else {
+            None
+        }
+    }
+
+    /// Set the value of the `OnceCell` to the given value if the `OnceCell` is
+    /// empty.
+    ///
+    /// If the `OnceCell` already has a value, this call will fail with an
+    /// [`SetError::AlreadyInitializedError`].
+    ///
+    /// If the `OnceCell` is empty, but some other task is currently trying to
+    /// set the value, this call will fail with [`SetError::InitializingError`].
+    ///
+    /// [`SetError::AlreadyInitializedError`]: crate::sync::SetError::AlreadyInitializedError
+    /// [`SetError::InitializingError`]: crate::sync::SetError::InitializingError
+    pub fn set(&self, value: T) -> Result<(), SetError<T>> {
+        if self.initialized() {
+            return Err(SetError::AlreadyInitializedError(value));
+        }
+
+        // Another task might be initializing the cell, in which case
+        // `try_acquire` will return an error. If we succeed to acquire the
+        // permit, then we can set the value.
+        match self.semaphore.try_acquire() {
+            Ok(permit) => {
+                debug_assert!(!self.initialized());
+                self.set_value(value, permit);
+                Ok(())
+            }
+            Err(TryAcquireError::NoPermits) => {
+                // Some other task is holding the permit. That task is
+                // currently trying to initialize the value.
+                Err(SetError::InitializingError(value))
+            }
+            Err(TryAcquireError::Closed) => {
+                // The semaphore was closed. Some other task has initialized
+                // the value.
+                Err(SetError::AlreadyInitializedError(value))
+            }
+        }
+    }
+
+    /// Get the value currently in the `OnceCell`, or initialize it with the
+    /// given asynchronous operation.
+    ///
+    /// If some other task is currently working on initializing the `OnceCell`,
+    /// this call will wait for that other task to finish, then return the value
+    /// that the other task produced.
+    ///
+    /// If the provided operation is cancelled or panics, the initialization
+    /// attempt is cancelled. If there are other tasks waiting for the value to
+    /// be initialized, one of them will start another attempt at initializing
+    /// the value.
+    ///
+    /// This will deadlock if `f` tries to initialize the cell recursively.
+    pub async fn get_or_init<F, Fut>(&self, f: F) -> &T
+    where
+        F: FnOnce() -> Fut,
+        Fut: Future<Output = T>,
+    {
+        if self.initialized() {
+            // SAFETY: The OnceCell has been fully initialized.
+            unsafe { self.get_unchecked() }
+        } else {
+            // Here we try to acquire the semaphore permit. Holding the permit
+            // will allow us to set the value of the OnceCell, and prevents
+            // other tasks from initializing the OnceCell while we are holding
+            // it.
+            match self.semaphore.acquire().await {
+                Ok(permit) => {
+                    debug_assert!(!self.initialized());
+
+                    // If `f()` panics or `select!` is called, this
+                    // `get_or_init` call is aborted and the semaphore permit is
+                    // dropped.
+                    let value = f().await;
+
+                    self.set_value(value, permit)
+                }
+                Err(_) => {
+                    debug_assert!(self.initialized());
+
+                    // SAFETY: The semaphore has been closed. This only happens
+                    // when the OnceCell is fully initialized.
+                    unsafe { self.get_unchecked() }
+                }
+            }
+        }
+    }
+
+    /// Get the value currently in the `OnceCell`, or initialize it with the
+    /// given asynchronous operation.
+    ///
+    /// If some other task is currently working on initializing the `OnceCell`,
+    /// this call will wait for that other task to finish, then return the value
+    /// that the other task produced.
+    ///
+    /// If the provided operation returns an error, is cancelled or panics, the
+    /// initialization attempt is cancelled. If there are other tasks waiting
+    /// for the value to be initialized, one of them will start another attempt
+    /// at initializing the value.
+    ///
+    /// This will deadlock if `f` tries to initialize the cell recursively.
+    pub async fn get_or_try_init<E, F, Fut>(&self, f: F) -> Result<&T, E>
+    where
+        F: FnOnce() -> Fut,
+        Fut: Future<Output = Result<T, E>>,
+    {
+        if self.initialized() {
+            // SAFETY: The OnceCell has been fully initialized.
+            unsafe { Ok(self.get_unchecked()) }
+        } else {
+            // Here we try to acquire the semaphore permit. Holding the permit
+            // will allow us to set the value of the OnceCell, and prevents
+            // other tasks from initializing the OnceCell while we are holding
+            // it.
+            match self.semaphore.acquire().await {
+                Ok(permit) => {
+                    debug_assert!(!self.initialized());
+
+                    // If `f()` panics or `select!` is called, this
+                    // `get_or_try_init` call is aborted and the semaphore
+                    // permit is dropped.
+                    let value = f().await;
+
+                    match value {
+                        Ok(value) => Ok(self.set_value(value, permit)),
+                        Err(e) => Err(e),
+                    }
+                }
+                Err(_) => {
+                    debug_assert!(self.initialized());
+
+                    // SAFETY: The semaphore has been closed. This only happens
+                    // when the OnceCell is fully initialized.
+                    unsafe { Ok(self.get_unchecked()) }
+                }
+            }
+        }
+    }
+
+    /// Take the value from the cell, destroying the cell in the process.
+    /// Returns `None` if the cell is empty.
+    pub fn into_inner(mut self) -> Option<T> {
+        if self.initialized_mut() {
+            // Set to uninitialized for the destructor of `OnceCell` to work properly
+            *self.value_set.get_mut() = false;
+            Some(unsafe { self.value.with(|ptr| ptr::read(ptr).assume_init()) })
+        } else {
+            None
+        }
+    }
+
+    /// Takes ownership of the current value, leaving the cell empty.  Returns
+    /// `None` if the cell is empty.
+    pub fn take(&mut self) -> Option<T> {
+        std::mem::take(self).into_inner()
+    }
+}
+
+// Since `get` gives us access to immutable references of the OnceCell, OnceCell
+// can only be Sync if T is Sync, otherwise OnceCell would allow sharing
+// references of !Sync values across threads. We need T to be Send in order for
+// OnceCell to by Sync because we can use `set` on `&OnceCell<T>` to send values
+// (of type T) across threads.
+unsafe impl<T: Sync + Send> Sync for OnceCell<T> {}
+
+// Access to OnceCell's value is guarded by the semaphore permit
+// and atomic operations on `value_set`, so as long as T itself is Send
+// it's safe to send it to another thread
+unsafe impl<T: Send> Send for OnceCell<T> {}
+
+/// Errors that can be returned from [`OnceCell::set`].
+///
+/// [`OnceCell::set`]: crate::sync::OnceCell::set
+#[derive(Debug, PartialEq)]
+pub enum SetError<T> {
+    /// The cell was already initialized when [`OnceCell::set`] was called.
+    ///
+    /// [`OnceCell::set`]: crate::sync::OnceCell::set
+    AlreadyInitializedError(T),
+
+    /// The cell is currently being initialized.
+    InitializingError(T),
+}
+
+impl<T> fmt::Display for SetError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SetError::AlreadyInitializedError(_) => write!(f, "AlreadyInitializedError"),
+            SetError::InitializingError(_) => write!(f, "InitializingError"),
+        }
+    }
+}
+
+impl<T: fmt::Debug> Error for SetError<T> {}
+
+impl<T> SetError<T> {
+    /// Whether `SetError` is `SetError::AlreadyInitializedError`.
+    pub fn is_already_init_err(&self) -> bool {
+        match self {
+            SetError::AlreadyInitializedError(_) => true,
+            SetError::InitializingError(_) => false,
+        }
+    }
+
+    /// Whether `SetError` is `SetError::InitializingError`
+    pub fn is_initializing_err(&self) -> bool {
+        match self {
+            SetError::AlreadyInitializedError(_) => false,
+            SetError::InitializingError(_) => true,
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/oneshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/oneshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/oneshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/oneshot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,56 @@
 #![cfg_attr(not(feature = "sync"), allow(dead_code, unreachable_pub))]
 
-//! A channel for sending a single message between asynchronous tasks.
+//! A one-shot channel is used for sending a single message between
+//! asynchronous tasks. The [`channel`] function is used to create a
+//! [`Sender`] and [`Receiver`] handle pair that form the channel.
+//!
+//! The `Sender` handle is used by the producer to send the value.
+//! The `Receiver` handle is used by the consumer to receive the value.
+//!
+//! Each handle can be used on separate tasks.
+//!
+//! # Examples
+//!
+//! ```
+//! use tokio::sync::oneshot;
+//!
+//! #[tokio::main]
+//! async fn main() {
+//!     let (tx, rx) = oneshot::channel();
+//!
+//!     tokio::spawn(async move {
+//!         if let Err(_) = tx.send(3) {
+//!             println!("the receiver dropped");
+//!         }
+//!     });
+//!
+//!     match rx.await {
+//!         Ok(v) => println!("got = {:?}", v),
+//!         Err(_) => println!("the sender dropped"),
+//!     }
+//! }
+//! ```
+//!
+//! If the sender is dropped without sending, the receiver will fail with
+//! [`error::RecvError`]:
+//!
+//! ```
+//! use tokio::sync::oneshot;
+//!
+//! #[tokio::main]
+//! async fn main() {
+//!     let (tx, rx) = oneshot::channel::<u32>();
+//!
+//!     tokio::spawn(async move {
+//!         drop(tx);
+//!     });
+//!
+//!     match rx.await {
+//!         Ok(_) => panic!("This doesn't happen"),
+//!         Err(_) => println!("the sender dropped"),
+//!     }
+//! }
+//! ```
 
 use crate::loom::cell::UnsafeCell;
 use crate::loom::sync::atomic::AtomicUsize;
@@ -14,17 +64,62 @@
 use std::task::Poll::{Pending, Ready};
 use std::task::{Context, Poll, Waker};
 
-/// Sends a value to the associated `Receiver`.
+/// Sends a value to the associated [`Receiver`].
 ///
-/// Instances are created by the [`channel`](fn@channel) function.
+/// A pair of both a [`Sender`] and a [`Receiver`]  are created by the
+/// [`channel`](fn@channel) function.
 #[derive(Debug)]
 pub struct Sender<T> {
     inner: Option<Arc<Inner<T>>>,
 }
 
-/// Receive a value from the associated `Sender`.
+/// Receive a value from the associated [`Sender`].
 ///
-/// Instances are created by the [`channel`](fn@channel) function.
+/// A pair of both a [`Sender`] and a [`Receiver`]  are created by the
+/// [`channel`](fn@channel) function.
+///
+/// # Examples
+///
+/// ```
+/// use tokio::sync::oneshot;
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let (tx, rx) = oneshot::channel();
+///
+///     tokio::spawn(async move {
+///         if let Err(_) = tx.send(3) {
+///             println!("the receiver dropped");
+///         }
+///     });
+///
+///     match rx.await {
+///         Ok(v) => println!("got = {:?}", v),
+///         Err(_) => println!("the sender dropped"),
+///     }
+/// }
+/// ```
+///
+/// If the sender is dropped without sending, the receiver will fail with
+/// [`error::RecvError`]:
+///
+/// ```
+/// use tokio::sync::oneshot;
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let (tx, rx) = oneshot::channel::<u32>();
+///
+///     tokio::spawn(async move {
+///         drop(tx);
+///     });
+///
+///     match rx.await {
+///         Ok(_) => panic!("This doesn't happen"),
+///         Err(_) => println!("the sender dropped"),
+///     }
+/// }
+/// ```
 #[derive(Debug)]
 pub struct Receiver<T> {
     inner: Option<Arc<Inner<T>>>,
@@ -84,10 +179,42 @@
     value: UnsafeCell<Option<T>>,
 
     /// The task to notify when the receiver drops without consuming the value.
-    tx_task: UnsafeCell<MaybeUninit<Waker>>,
+    tx_task: Task,
 
     /// The task to notify when the value is sent.
-    rx_task: UnsafeCell<MaybeUninit<Waker>>,
+    rx_task: Task,
+}
+
+struct Task(UnsafeCell<MaybeUninit<Waker>>);
+
+impl Task {
+    unsafe fn will_wake(&self, cx: &mut Context<'_>) -> bool {
+        self.with_task(|w| w.will_wake(cx.waker()))
+    }
+
+    unsafe fn with_task<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&Waker) -> R,
+    {
+        self.0.with(|ptr| {
+            let waker: *const Waker = (&*ptr).as_ptr();
+            f(&*waker)
+        })
+    }
+
+    unsafe fn drop_task(&self) {
+        self.0.with_mut(|ptr| {
+            let ptr: *mut Waker = (&mut *ptr).as_mut_ptr();
+            ptr.drop_in_place();
+        });
+    }
+
+    unsafe fn set_task(&self, cx: &mut Context<'_>) {
+        self.0.with_mut(|ptr| {
+            let ptr: *mut Waker = (&mut *ptr).as_mut_ptr();
+            ptr.write(cx.waker().clone());
+        });
+    }
 }
 
 #[derive(Clone, Copy)]
@@ -124,12 +251,11 @@
 /// }
 /// ```
 pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
-    #[allow(deprecated)]
     let inner = Arc::new(Inner {
         state: AtomicUsize::new(State::new().as_usize()),
         value: UnsafeCell::new(None),
-        tx_task: UnsafeCell::new(MaybeUninit::uninit()),
-        rx_task: UnsafeCell::new(MaybeUninit::uninit()),
+        tx_task: Task(UnsafeCell::new(MaybeUninit::uninit())),
+        rx_task: Task(UnsafeCell::new(MaybeUninit::uninit())),
     });
 
     let tx = Sender {
@@ -189,61 +315,12 @@
         });
 
         if !inner.complete() {
-            return Err(inner
-                .value
-                .with_mut(|ptr| unsafe { (*ptr).take() }.unwrap()));
-        }
-
-        Ok(())
-    }
-
-    #[doc(hidden)] // TODO: remove
-    pub fn poll_closed(&mut self, cx: &mut Context<'_>) -> Poll<()> {
-        // Keep track of task budget
-        let coop = ready!(crate::coop::poll_proceed(cx));
-
-        let inner = self.inner.as_ref().unwrap();
-
-        let mut state = State::load(&inner.state, Acquire);
-
-        if state.is_closed() {
-            coop.made_progress();
-            return Poll::Ready(());
-        }
-
-        if state.is_tx_task_set() {
-            let will_notify = unsafe { inner.with_tx_task(|w| w.will_wake(cx.waker())) };
-
-            if !will_notify {
-                state = State::unset_tx_task(&inner.state);
-
-                if state.is_closed() {
-                    // Set the flag again so that the waker is released in drop
-                    State::set_tx_task(&inner.state);
-                    coop.made_progress();
-                    return Ready(());
-                } else {
-                    unsafe { inner.drop_tx_task() };
-                }
-            }
-        }
-
-        if !state.is_tx_task_set() {
-            // Attempt to set the task
             unsafe {
-                inner.set_tx_task(cx);
-            }
-
-            // Update the state
-            state = State::set_tx_task(&inner.state);
-
-            if state.is_closed() {
-                coop.made_progress();
-                return Ready(());
+                return Err(inner.consume_value().unwrap());
             }
         }
 
-        Pending
+        Ok(())
     }
 
     /// Waits for the associated [`Receiver`] handle to close.
@@ -287,8 +364,6 @@
     /// use tokio::sync::oneshot;
     /// use tokio::time::{self, Duration};
     ///
-    /// use futures::{select, FutureExt};
-    ///
     /// async fn compute() -> String {
     ///     // Complex computation returning a `String`
     /// # "hello".to_string()
@@ -299,12 +374,14 @@
     ///     let (mut tx, rx) = oneshot::channel();
     ///
     ///     tokio::spawn(async move {
-    ///         select! {
-    ///             _ = tx.closed().fuse() => {
+    ///         tokio::select! {
+    ///             _ = tx.closed() => {
     ///                 // The receiver dropped, no need to do any further work
     ///             }
-    ///             value = compute().fuse() => {
-    ///                 tx.send(value).unwrap()
+    ///             value = compute() => {
+    ///                 // The send can fail if the channel was closed at the exact same
+    ///                 // time as when compute() finished, so just ignore the failure.
+    ///                 let _ = tx.send(value);
     ///             }
     ///         }
     ///     });
@@ -352,6 +429,94 @@
         let state = State::load(&inner.state, Acquire);
         state.is_closed()
     }
+
+    /// Check whether the oneshot channel has been closed, and if not, schedules the
+    /// `Waker` in the provided `Context` to receive a notification when the channel is
+    /// closed.
+    ///
+    /// A [`Receiver`] is closed by either calling [`close`] explicitly, or when the
+    /// [`Receiver`] value is dropped.
+    ///
+    /// Note that on multiple calls to poll, only the `Waker` from the `Context` passed
+    /// to the most recent call will be scheduled to receive a wakeup.
+    ///
+    /// [`Receiver`]: struct@crate::sync::oneshot::Receiver
+    /// [`close`]: fn@crate::sync::oneshot::Receiver::close
+    ///
+    /// # Return value
+    ///
+    /// This function returns:
+    ///
+    ///  * `Poll::Pending` if the channel is still open.
+    ///  * `Poll::Ready(())` if the channel is closed.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::oneshot;
+    ///
+    /// use futures::future::poll_fn;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (mut tx, mut rx) = oneshot::channel::<()>();
+    ///
+    ///     tokio::spawn(async move {
+    ///         rx.close();
+    ///     });
+    ///
+    ///     poll_fn(|cx| tx.poll_closed(cx)).await;
+    ///
+    ///     println!("the receiver dropped");
+    /// }
+    /// ```
+    pub fn poll_closed(&mut self, cx: &mut Context<'_>) -> Poll<()> {
+        // Keep track of task budget
+        let coop = ready!(crate::coop::poll_proceed(cx));
+
+        let inner = self.inner.as_ref().unwrap();
+
+        let mut state = State::load(&inner.state, Acquire);
+
+        if state.is_closed() {
+            coop.made_progress();
+            return Poll::Ready(());
+        }
+
+        if state.is_tx_task_set() {
+            let will_notify = unsafe { inner.tx_task.will_wake(cx) };
+
+            if !will_notify {
+                state = State::unset_tx_task(&inner.state);
+
+                if state.is_closed() {
+                    // Set the flag again so that the waker is released in drop
+                    State::set_tx_task(&inner.state);
+                    coop.made_progress();
+                    return Ready(());
+                } else {
+                    unsafe { inner.tx_task.drop_task() };
+                }
+            }
+        }
+
+        if !state.is_tx_task_set() {
+            // Attempt to set the task
+            unsafe {
+                inner.tx_task.set_task(cx);
+            }
+
+            // Update the state
+            state = State::set_tx_task(&inner.state);
+
+            if state.is_closed() {
+                coop.made_progress();
+                return Ready(());
+            }
+        }
+
+        Pending
+    }
 }
 
 impl<T> Drop for Sender<T> {
@@ -373,6 +538,9 @@
     /// This function is useful to perform a graceful shutdown and ensure that a
     /// value will not be sent into the channel and never received.
     ///
+    /// `close` is no-op if a message is already received or the channel
+    /// is already closed.
+    ///
     /// [`Sender`]: Sender
     /// [`try_recv`]: Receiver::try_recv
     ///
@@ -420,8 +588,9 @@
     /// }
     /// ```
     pub fn close(&mut self) {
-        let inner = self.inner.as_ref().unwrap();
-        inner.close();
+        if let Some(inner) = self.inner.as_ref() {
+            inner.close();
+        }
     }
 
     /// Attempts to receive a value.
@@ -503,7 +672,7 @@
                 return Err(TryRecvError::Empty);
             }
         } else {
-            panic!("called after complete");
+            Err(TryRecvError::Closed)
         };
 
         self.inner = None;
@@ -546,7 +715,7 @@
         if prev.is_rx_task_set() {
             // TODO: Consume waker?
             unsafe {
-                self.with_rx_task(Waker::wake_by_ref);
+                self.rx_task.with_task(Waker::wake_by_ref);
             }
         }
 
@@ -571,7 +740,7 @@
             Ready(Err(RecvError(())))
         } else {
             if state.is_rx_task_set() {
-                let will_notify = unsafe { self.with_rx_task(|w| w.will_wake(cx.waker())) };
+                let will_notify = unsafe { self.rx_task.will_wake(cx) };
 
                 // Check if the task is still the same
                 if !will_notify {
@@ -587,7 +756,7 @@
                             None => Ready(Err(RecvError(()))),
                         };
                     } else {
-                        unsafe { self.drop_rx_task() };
+                        unsafe { self.rx_task.drop_task() };
                     }
                 }
             }
@@ -595,7 +764,7 @@
             if !state.is_rx_task_set() {
                 // Attempt to set the task
                 unsafe {
-                    self.set_rx_task(cx);
+                    self.rx_task.set_task(cx);
                 }
 
                 // Update the state
@@ -622,7 +791,7 @@
 
         if prev.is_tx_task_set() && !prev.is_complete() {
             unsafe {
-                self.with_tx_task(Waker::wake_by_ref);
+                self.tx_task.with_task(Waker::wake_by_ref);
             }
         }
     }
@@ -631,72 +800,28 @@
     unsafe fn consume_value(&self) -> Option<T> {
         self.value.with_mut(|ptr| (*ptr).take())
     }
-
-    unsafe fn with_rx_task<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&Waker) -> R,
-    {
-        self.rx_task.with(|ptr| {
-            let waker: *const Waker = (&*ptr).as_ptr();
-            f(&*waker)
-        })
-    }
-
-    unsafe fn with_tx_task<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&Waker) -> R,
-    {
-        self.tx_task.with(|ptr| {
-            let waker: *const Waker = (&*ptr).as_ptr();
-            f(&*waker)
-        })
-    }
-
-    unsafe fn drop_rx_task(&self) {
-        self.rx_task.with_mut(|ptr| {
-            let ptr: *mut Waker = (&mut *ptr).as_mut_ptr();
-            ptr.drop_in_place();
-        });
-    }
-
-    unsafe fn drop_tx_task(&self) {
-        self.tx_task.with_mut(|ptr| {
-            let ptr: *mut Waker = (&mut *ptr).as_mut_ptr();
-            ptr.drop_in_place();
-        });
-    }
-
-    unsafe fn set_rx_task(&self, cx: &mut Context<'_>) {
-        self.rx_task.with_mut(|ptr| {
-            let ptr: *mut Waker = (&mut *ptr).as_mut_ptr();
-            ptr.write(cx.waker().clone());
-        });
-    }
-
-    unsafe fn set_tx_task(&self, cx: &mut Context<'_>) {
-        self.tx_task.with_mut(|ptr| {
-            let ptr: *mut Waker = (&mut *ptr).as_mut_ptr();
-            ptr.write(cx.waker().clone());
-        });
-    }
 }
 
 unsafe impl<T: Send> Send for Inner<T> {}
 unsafe impl<T: Send> Sync for Inner<T> {}
 
+fn mut_load(this: &mut AtomicUsize) -> usize {
+    this.with_mut(|v| *v)
+}
+
 impl<T> Drop for Inner<T> {
     fn drop(&mut self) {
-        let state = State(self.state.with_mut(|v| *v));
+        let state = State(mut_load(&mut self.state));
 
         if state.is_rx_task_set() {
             unsafe {
-                self.drop_rx_task();
+                self.rx_task.drop_task();
             }
         }
 
         if state.is_tx_task_set() {
             unsafe {
-                self.drop_tx_task();
+                self.tx_task.drop_task();
             }
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_read_guard.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_read_guard.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_read_guard.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_read_guard.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,149 @@
+use crate::sync::rwlock::RwLock;
+use std::fmt;
+use std::marker::PhantomData;
+use std::mem;
+use std::mem::ManuallyDrop;
+use std::ops;
+use std::sync::Arc;
+
+/// Owned RAII structure used to release the shared read access of a lock when
+/// dropped.
+///
+/// This structure is created by the [`read_owned`] method on
+/// [`RwLock`].
+///
+/// [`read_owned`]: method@crate::sync::RwLock::read_owned
+/// [`RwLock`]: struct@crate::sync::RwLock
+pub struct OwnedRwLockReadGuard<T: ?Sized, U: ?Sized = T> {
+    // ManuallyDrop allows us to destructure into this field without running the destructor.
+    pub(super) lock: ManuallyDrop<Arc<RwLock<T>>>,
+    pub(super) data: *const U,
+    pub(super) _p: PhantomData<T>,
+}
+
+impl<T: ?Sized, U: ?Sized> OwnedRwLockReadGuard<T, U> {
+    /// Make a new `OwnedRwLockReadGuard` for a component of the locked data.
+    /// This operation cannot fail as the `OwnedRwLockReadGuard` passed in
+    /// already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `OwnedRwLockReadGuard::map(...)`. A method would interfere with
+    /// methods of the same name on the contents of the locked data.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{RwLock, OwnedRwLockReadGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = Arc::new(RwLock::new(Foo(1)));
+    ///
+    /// let guard = lock.read_owned().await;
+    /// let guard = OwnedRwLockReadGuard::map(guard, |f| &f.0);
+    ///
+    /// assert_eq!(1, *guard);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn map<F, V: ?Sized>(mut this: Self, f: F) -> OwnedRwLockReadGuard<T, V>
+    where
+        F: FnOnce(&U) -> &V,
+    {
+        let data = f(&*this) as *const V;
+        let lock = unsafe { ManuallyDrop::take(&mut this.lock) };
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        OwnedRwLockReadGuard {
+            lock: ManuallyDrop::new(lock),
+            data,
+            _p: PhantomData,
+        }
+    }
+
+    /// Attempts to make a new [`OwnedRwLockReadGuard`] for a component of the
+    /// locked data. The original guard is returned if the closure returns
+    /// `None`.
+    ///
+    /// This operation cannot fail as the `OwnedRwLockReadGuard` passed in
+    /// already locked the data.
+    ///
+    /// This is an associated function that needs to be used as
+    /// `OwnedRwLockReadGuard::try_map(..)`. A method would interfere with
+    /// methods of the same name on the contents of the locked data.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{RwLock, OwnedRwLockReadGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = Arc::new(RwLock::new(Foo(1)));
+    ///
+    /// let guard = lock.read_owned().await;
+    /// let guard = OwnedRwLockReadGuard::try_map(guard, |f| Some(&f.0)).expect("should not fail");
+    ///
+    /// assert_eq!(1, *guard);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn try_map<F, V: ?Sized>(mut this: Self, f: F) -> Result<OwnedRwLockReadGuard<T, V>, Self>
+    where
+        F: FnOnce(&U) -> Option<&V>,
+    {
+        let data = match f(&*this) {
+            Some(data) => data as *const V,
+            None => return Err(this),
+        };
+        let lock = unsafe { ManuallyDrop::take(&mut this.lock) };
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        Ok(OwnedRwLockReadGuard {
+            lock: ManuallyDrop::new(lock),
+            data,
+            _p: PhantomData,
+        })
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> ops::Deref for OwnedRwLockReadGuard<T, U> {
+    type Target = U;
+
+    fn deref(&self) -> &U {
+        unsafe { &*self.data }
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> fmt::Debug for OwnedRwLockReadGuard<T, U>
+where
+    U: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> fmt::Display for OwnedRwLockReadGuard<T, U>
+where
+    U: fmt::Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> Drop for OwnedRwLockReadGuard<T, U> {
+    fn drop(&mut self) {
+        self.lock.s.release(1);
+        unsafe { ManuallyDrop::drop(&mut self.lock) };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_write_guard_mapped.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_write_guard_mapped.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_write_guard_mapped.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_write_guard_mapped.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,171 @@
+use crate::sync::rwlock::RwLock;
+use std::fmt;
+use std::marker::PhantomData;
+use std::mem::{self, ManuallyDrop};
+use std::ops;
+use std::sync::Arc;
+
+/// Owned RAII structure used to release the exclusive write access of a lock when
+/// dropped.
+///
+/// This structure is created by [mapping] an [`OwnedRwLockWriteGuard`]. It is a
+/// separate type from `OwnedRwLockWriteGuard` to disallow downgrading a mapped
+/// guard, since doing so can cause undefined behavior.
+///
+/// [mapping]: method@crate::sync::OwnedRwLockWriteGuard::map
+/// [`OwnedRwLockWriteGuard`]: struct@crate::sync::OwnedRwLockWriteGuard
+pub struct OwnedRwLockMappedWriteGuard<T: ?Sized, U: ?Sized = T> {
+    pub(super) permits_acquired: u32,
+    // ManuallyDrop allows us to destructure into this field without running the destructor.
+    pub(super) lock: ManuallyDrop<Arc<RwLock<T>>>,
+    pub(super) data: *mut U,
+    pub(super) _p: PhantomData<T>,
+}
+
+impl<T: ?Sized, U: ?Sized> OwnedRwLockMappedWriteGuard<T, U> {
+    /// Make a new `OwnedRwLockMappedWriteGuard` for a component of the locked
+    /// data.
+    ///
+    /// This operation cannot fail as the `OwnedRwLockMappedWriteGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be used as
+    /// `OwnedRwLockWriteGuard::map(..)`. A method would interfere with methods
+    /// of the same name on the contents of the locked data.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{RwLock, OwnedRwLockWriteGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = Arc::new(RwLock::new(Foo(1)));
+    ///
+    /// {
+    ///     let lock = Arc::clone(&lock);
+    ///     let mut mapped = OwnedRwLockWriteGuard::map(lock.write_owned().await, |f| &mut f.0);
+    ///     *mapped = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *lock.read().await);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn map<F, V: ?Sized>(mut this: Self, f: F) -> OwnedRwLockMappedWriteGuard<T, V>
+    where
+        F: FnOnce(&mut U) -> &mut V,
+    {
+        let data = f(&mut *this) as *mut V;
+        let lock = unsafe { ManuallyDrop::take(&mut this.lock) };
+        let permits_acquired = this.permits_acquired;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        OwnedRwLockMappedWriteGuard {
+            permits_acquired,
+            lock: ManuallyDrop::new(lock),
+            data,
+            _p: PhantomData,
+        }
+    }
+
+    /// Attempts to make a new `OwnedRwLockMappedWriteGuard` for a component
+    /// of the locked data. The original guard is returned if the closure
+    /// returns `None`.
+    ///
+    /// This operation cannot fail as the `OwnedRwLockMappedWriteGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `OwnedRwLockMappedWriteGuard::try_map(...)`. A method would interfere with
+    /// methods of the same name on the contents of the locked data.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{RwLock, OwnedRwLockWriteGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = Arc::new(RwLock::new(Foo(1)));
+    ///
+    /// {
+    ///     let guard = Arc::clone(&lock).write_owned().await;
+    ///     let mut guard = OwnedRwLockWriteGuard::try_map(guard, |f| Some(&mut f.0)).expect("should not fail");
+    ///     *guard = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *lock.read().await);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn try_map<F, V: ?Sized>(
+        mut this: Self,
+        f: F,
+    ) -> Result<OwnedRwLockMappedWriteGuard<T, V>, Self>
+    where
+        F: FnOnce(&mut U) -> Option<&mut V>,
+    {
+        let data = match f(&mut *this) {
+            Some(data) => data as *mut V,
+            None => return Err(this),
+        };
+        let lock = unsafe { ManuallyDrop::take(&mut this.lock) };
+        let permits_acquired = this.permits_acquired;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        Ok(OwnedRwLockMappedWriteGuard {
+            permits_acquired,
+            lock: ManuallyDrop::new(lock),
+            data,
+            _p: PhantomData,
+        })
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> ops::Deref for OwnedRwLockMappedWriteGuard<T, U> {
+    type Target = U;
+
+    fn deref(&self) -> &U {
+        unsafe { &*self.data }
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> ops::DerefMut for OwnedRwLockMappedWriteGuard<T, U> {
+    fn deref_mut(&mut self) -> &mut U {
+        unsafe { &mut *self.data }
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> fmt::Debug for OwnedRwLockMappedWriteGuard<T, U>
+where
+    U: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> fmt::Display for OwnedRwLockMappedWriteGuard<T, U>
+where
+    U: fmt::Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
+}
+
+impl<T: ?Sized, U: ?Sized> Drop for OwnedRwLockMappedWriteGuard<T, U> {
+    fn drop(&mut self) {
+        self.lock.s.release(self.permits_acquired as usize);
+        unsafe { ManuallyDrop::drop(&mut self.lock) };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_write_guard.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_write_guard.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_write_guard.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/owned_write_guard.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,234 @@
+use crate::sync::rwlock::owned_read_guard::OwnedRwLockReadGuard;
+use crate::sync::rwlock::owned_write_guard_mapped::OwnedRwLockMappedWriteGuard;
+use crate::sync::rwlock::RwLock;
+use std::fmt;
+use std::marker::PhantomData;
+use std::mem::{self, ManuallyDrop};
+use std::ops;
+use std::sync::Arc;
+
+/// Owned RAII structure used to release the exclusive write access of a lock when
+/// dropped.
+///
+/// This structure is created by the [`write_owned`] method
+/// on [`RwLock`].
+///
+/// [`write_owned`]: method@crate::sync::RwLock::write_owned
+/// [`RwLock`]: struct@crate::sync::RwLock
+pub struct OwnedRwLockWriteGuard<T: ?Sized> {
+    pub(super) permits_acquired: u32,
+    // ManuallyDrop allows us to destructure into this field without running the destructor.
+    pub(super) lock: ManuallyDrop<Arc<RwLock<T>>>,
+    pub(super) data: *mut T,
+    pub(super) _p: PhantomData<T>,
+}
+
+impl<T: ?Sized> OwnedRwLockWriteGuard<T> {
+    /// Make a new [`OwnedRwLockMappedWriteGuard`] for a component of the locked
+    /// data.
+    ///
+    /// This operation cannot fail as the `OwnedRwLockWriteGuard` passed in
+    /// already locked the data.
+    ///
+    /// This is an associated function that needs to be used as
+    /// `OwnedRwLockWriteGuard::map(..)`. A method would interfere with methods
+    /// of the same name on the contents of the locked data.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{RwLock, OwnedRwLockWriteGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = Arc::new(RwLock::new(Foo(1)));
+    ///
+    /// {
+    ///     let lock = Arc::clone(&lock);
+    ///     let mut mapped = OwnedRwLockWriteGuard::map(lock.write_owned().await, |f| &mut f.0);
+    ///     *mapped = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *lock.read().await);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn map<F, U: ?Sized>(mut this: Self, f: F) -> OwnedRwLockMappedWriteGuard<T, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let data = f(&mut *this) as *mut U;
+        let lock = unsafe { ManuallyDrop::take(&mut this.lock) };
+        let permits_acquired = this.permits_acquired;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        OwnedRwLockMappedWriteGuard {
+            permits_acquired,
+            lock: ManuallyDrop::new(lock),
+            data,
+            _p: PhantomData,
+        }
+    }
+
+    /// Attempts to make  a new [`OwnedRwLockMappedWriteGuard`] for a component
+    /// of the locked data. The original guard is returned if the closure
+    /// returns `None`.
+    ///
+    /// This operation cannot fail as the `OwnedRwLockWriteGuard` passed in
+    /// already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `OwnedRwLockWriteGuard::try_map(...)`. A method would interfere
+    /// with methods of the same name on the contents of the locked data.
+    ///
+    /// [`RwLockMappedWriteGuard`]: struct@crate::sync::RwLockMappedWriteGuard
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{RwLock, OwnedRwLockWriteGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = Arc::new(RwLock::new(Foo(1)));
+    ///
+    /// {
+    ///     let guard = Arc::clone(&lock).write_owned().await;
+    ///     let mut guard = OwnedRwLockWriteGuard::try_map(guard, |f| Some(&mut f.0)).expect("should not fail");
+    ///     *guard = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *lock.read().await);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn try_map<F, U: ?Sized>(
+        mut this: Self,
+        f: F,
+    ) -> Result<OwnedRwLockMappedWriteGuard<T, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let data = match f(&mut *this) {
+            Some(data) => data as *mut U,
+            None => return Err(this),
+        };
+        let permits_acquired = this.permits_acquired;
+        let lock = unsafe { ManuallyDrop::take(&mut this.lock) };
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        Ok(OwnedRwLockMappedWriteGuard {
+            permits_acquired,
+            lock: ManuallyDrop::new(lock),
+            data,
+            _p: PhantomData,
+        })
+    }
+
+    /// Converts this `OwnedRwLockWriteGuard` into an
+    /// `OwnedRwLockMappedWriteGuard`. This method can be used to store a
+    /// non-mapped guard in a struct field that expects a mapped guard.
+    ///
+    /// This is equivalent to calling `OwnedRwLockWriteGuard::map(guard, |me| me)`.
+    #[inline]
+    pub fn into_mapped(this: Self) -> OwnedRwLockMappedWriteGuard<T> {
+        Self::map(this, |me| me)
+    }
+
+    /// Atomically downgrades a write lock into a read lock without allowing
+    /// any writers to take exclusive access of the lock in the meantime.
+    ///
+    /// **Note:** This won't *necessarily* allow any additional readers to acquire
+    /// locks, since [`RwLock`] is fair and it is possible that a writer is next
+    /// in line.
+    ///
+    /// Returns an RAII guard which will drop this read access of the `RwLock`
+    /// when dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use tokio::sync::RwLock;
+    /// # use std::sync::Arc;
+    /// #
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = Arc::new(RwLock::new(1));
+    ///
+    /// let n = lock.clone().write_owned().await;
+    ///
+    /// let cloned_lock = lock.clone();
+    /// let handle = tokio::spawn(async move {
+    ///     *cloned_lock.write_owned().await = 2;
+    /// });
+    ///
+    /// let n = n.downgrade();
+    /// assert_eq!(*n, 1, "downgrade is atomic");
+    ///
+    /// drop(n);
+    /// handle.await.unwrap();
+    /// assert_eq!(*lock.read().await, 2, "second writer obtained write lock");
+    /// # }
+    /// ```
+    pub fn downgrade(mut self) -> OwnedRwLockReadGuard<T> {
+        let lock = unsafe { ManuallyDrop::take(&mut self.lock) };
+        let data = self.data;
+
+        // Release all but one of the permits held by the write guard
+        lock.s.release((self.permits_acquired - 1) as usize);
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(self);
+        OwnedRwLockReadGuard {
+            lock: ManuallyDrop::new(lock),
+            data,
+            _p: PhantomData,
+        }
+    }
+}
+
+impl<T: ?Sized> ops::Deref for OwnedRwLockWriteGuard<T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.data }
+    }
+}
+
+impl<T: ?Sized> ops::DerefMut for OwnedRwLockWriteGuard<T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.data }
+    }
+}
+
+impl<T: ?Sized> fmt::Debug for OwnedRwLockWriteGuard<T>
+where
+    T: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<T: ?Sized> fmt::Display for OwnedRwLockWriteGuard<T>
+where
+    T: fmt::Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
+}
+
+impl<T: ?Sized> Drop for OwnedRwLockWriteGuard<T> {
+    fn drop(&mut self) {
+        self.lock.s.release(self.permits_acquired as usize);
+        unsafe { ManuallyDrop::drop(&mut self.lock) };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/read_guard.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/read_guard.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/read_guard.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/read_guard.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,156 @@
+use crate::sync::batch_semaphore::Semaphore;
+use std::fmt;
+use std::marker;
+use std::mem;
+use std::ops;
+
+/// RAII structure used to release the shared read access of a lock when
+/// dropped.
+///
+/// This structure is created by the [`read`] method on
+/// [`RwLock`].
+///
+/// [`read`]: method@crate::sync::RwLock::read
+/// [`RwLock`]: struct@crate::sync::RwLock
+pub struct RwLockReadGuard<'a, T: ?Sized> {
+    pub(super) s: &'a Semaphore,
+    pub(super) data: *const T,
+    pub(super) marker: marker::PhantomData<&'a T>,
+}
+
+impl<'a, T: ?Sized> RwLockReadGuard<'a, T> {
+    /// Make a new `RwLockReadGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `RwLockReadGuard` passed in already
+    /// locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `RwLockReadGuard::map(...)`. A method would interfere with
+    /// methods of the same name on the contents of the locked data.
+    ///
+    /// This is an asynchronous version of [`RwLockReadGuard::map`] from the
+    /// [`parking_lot` crate].
+    ///
+    /// [`RwLockReadGuard::map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockReadGuard.html#method.map
+    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{RwLock, RwLockReadGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = RwLock::new(Foo(1));
+    ///
+    /// let guard = lock.read().await;
+    /// let guard = RwLockReadGuard::map(guard, |f| &f.0);
+    ///
+    /// assert_eq!(1, *guard);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn map<F, U: ?Sized>(this: Self, f: F) -> RwLockReadGuard<'a, U>
+    where
+        F: FnOnce(&T) -> &U,
+    {
+        let data = f(&*this) as *const U;
+        let s = this.s;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        RwLockReadGuard {
+            s,
+            data,
+            marker: marker::PhantomData,
+        }
+    }
+
+    /// Attempts to make a new [`RwLockReadGuard`] for a component of the
+    /// locked data. The original guard is returned if the closure returns
+    /// `None`.
+    ///
+    /// This operation cannot fail as the `RwLockReadGuard` passed in already
+    /// locked the data.
+    ///
+    /// This is an associated function that needs to be used as
+    /// `RwLockReadGuard::try_map(..)`. A method would interfere with methods of the
+    /// same name on the contents of the locked data.
+    ///
+    /// This is an asynchronous version of [`RwLockReadGuard::try_map`] from the
+    /// [`parking_lot` crate].
+    ///
+    /// [`RwLockReadGuard::try_map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockReadGuard.html#method.try_map
+    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{RwLock, RwLockReadGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = RwLock::new(Foo(1));
+    ///
+    /// let guard = lock.read().await;
+    /// let guard = RwLockReadGuard::try_map(guard, |f| Some(&f.0)).expect("should not fail");
+    ///
+    /// assert_eq!(1, *guard);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn try_map<F, U: ?Sized>(this: Self, f: F) -> Result<RwLockReadGuard<'a, U>, Self>
+    where
+        F: FnOnce(&T) -> Option<&U>,
+    {
+        let data = match f(&*this) {
+            Some(data) => data as *const U,
+            None => return Err(this),
+        };
+        let s = this.s;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        Ok(RwLockReadGuard {
+            s,
+            data,
+            marker: marker::PhantomData,
+        })
+    }
+}
+
+impl<T: ?Sized> ops::Deref for RwLockReadGuard<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.data }
+    }
+}
+
+impl<'a, T: ?Sized> fmt::Debug for RwLockReadGuard<'a, T>
+where
+    T: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized> fmt::Display for RwLockReadGuard<'a, T>
+where
+    T: fmt::Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized> Drop for RwLockReadGuard<'a, T> {
+    fn drop(&mut self) {
+        self.s.release(1);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/write_guard_mapped.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/write_guard_mapped.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/write_guard_mapped.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/write_guard_mapped.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,176 @@
+use crate::sync::batch_semaphore::Semaphore;
+use std::fmt;
+use std::marker;
+use std::mem;
+use std::ops;
+
+/// RAII structure used to release the exclusive write access of a lock when
+/// dropped.
+///
+/// This structure is created by [mapping] an [`RwLockWriteGuard`]. It is a
+/// separate type from `RwLockWriteGuard` to disallow downgrading a mapped
+/// guard, since doing so can cause undefined behavior.
+///
+/// [mapping]: method@crate::sync::RwLockWriteGuard::map
+/// [`RwLockWriteGuard`]: struct@crate::sync::RwLockWriteGuard
+pub struct RwLockMappedWriteGuard<'a, T: ?Sized> {
+    pub(super) permits_acquired: u32,
+    pub(super) s: &'a Semaphore,
+    pub(super) data: *mut T,
+    pub(super) marker: marker::PhantomData<&'a mut T>,
+}
+
+impl<'a, T: ?Sized> RwLockMappedWriteGuard<'a, T> {
+    /// Make a new `RwLockMappedWriteGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `RwLockMappedWriteGuard` passed in already
+    /// locked the data.
+    ///
+    /// This is an associated function that needs to be used as
+    /// `RwLockMappedWriteGuard::map(..)`. A method would interfere with methods
+    /// of the same name on the contents of the locked data.
+    ///
+    /// This is an asynchronous version of [`RwLockWriteGuard::map`] from the
+    /// [`parking_lot` crate].
+    ///
+    /// [`RwLockWriteGuard::map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockWriteGuard.html#method.map
+    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{RwLock, RwLockWriteGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = RwLock::new(Foo(1));
+    ///
+    /// {
+    ///     let mut mapped = RwLockWriteGuard::map(lock.write().await, |f| &mut f.0);
+    ///     *mapped = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *lock.read().await);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn map<F, U: ?Sized>(mut this: Self, f: F) -> RwLockMappedWriteGuard<'a, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let data = f(&mut *this) as *mut U;
+        let s = this.s;
+        let permits_acquired = this.permits_acquired;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        RwLockMappedWriteGuard {
+            permits_acquired,
+            s,
+            data,
+            marker: marker::PhantomData,
+        }
+    }
+
+    /// Attempts to make a new [`RwLockMappedWriteGuard`] for a component of
+    /// the locked data. The original guard is returned if the closure returns
+    /// `None`.
+    ///
+    /// This operation cannot fail as the `RwLockMappedWriteGuard` passed in already
+    /// locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `RwLockMappedWriteGuard::try_map(...)`. A method would interfere
+    /// with methods of the same name on the contents of the locked data.
+    ///
+    /// This is an asynchronous version of [`RwLockWriteGuard::try_map`] from
+    /// the [`parking_lot` crate].
+    ///
+    /// [`RwLockWriteGuard::try_map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockWriteGuard.html#method.try_map
+    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{RwLock, RwLockWriteGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = RwLock::new(Foo(1));
+    ///
+    /// {
+    ///     let guard = lock.write().await;
+    ///     let mut guard = RwLockWriteGuard::try_map(guard, |f| Some(&mut f.0)).expect("should not fail");
+    ///     *guard = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *lock.read().await);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn try_map<F, U: ?Sized>(
+        mut this: Self,
+        f: F,
+    ) -> Result<RwLockMappedWriteGuard<'a, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let data = match f(&mut *this) {
+            Some(data) => data as *mut U,
+            None => return Err(this),
+        };
+        let s = this.s;
+        let permits_acquired = this.permits_acquired;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        Ok(RwLockMappedWriteGuard {
+            permits_acquired,
+            s,
+            data,
+            marker: marker::PhantomData,
+        })
+    }
+}
+
+impl<T: ?Sized> ops::Deref for RwLockMappedWriteGuard<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.data }
+    }
+}
+
+impl<T: ?Sized> ops::DerefMut for RwLockMappedWriteGuard<'_, T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.data }
+    }
+}
+
+impl<'a, T: ?Sized> fmt::Debug for RwLockMappedWriteGuard<'a, T>
+where
+    T: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized> fmt::Display for RwLockMappedWriteGuard<'a, T>
+where
+    T: fmt::Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized> Drop for RwLockMappedWriteGuard<'a, T> {
+    fn drop(&mut self) {
+        self.s.release(self.permits_acquired as usize);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/write_guard.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/write_guard.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock/write_guard.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock/write_guard.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,240 @@
+use crate::sync::batch_semaphore::Semaphore;
+use crate::sync::rwlock::read_guard::RwLockReadGuard;
+use crate::sync::rwlock::write_guard_mapped::RwLockMappedWriteGuard;
+use std::fmt;
+use std::marker;
+use std::mem;
+use std::ops;
+
+/// RAII structure used to release the exclusive write access of a lock when
+/// dropped.
+///
+/// This structure is created by the [`write`] method
+/// on [`RwLock`].
+///
+/// [`write`]: method@crate::sync::RwLock::write
+/// [`RwLock`]: struct@crate::sync::RwLock
+pub struct RwLockWriteGuard<'a, T: ?Sized> {
+    pub(super) permits_acquired: u32,
+    pub(super) s: &'a Semaphore,
+    pub(super) data: *mut T,
+    pub(super) marker: marker::PhantomData<&'a mut T>,
+}
+
+impl<'a, T: ?Sized> RwLockWriteGuard<'a, T> {
+    /// Make a new [`RwLockMappedWriteGuard`] for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `RwLockWriteGuard` passed in already
+    /// locked the data.
+    ///
+    /// This is an associated function that needs to be used as
+    /// `RwLockWriteGuard::map(..)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    ///
+    /// This is an asynchronous version of [`RwLockWriteGuard::map`] from the
+    /// [`parking_lot` crate].
+    ///
+    /// [`RwLockMappedWriteGuard`]: struct@crate::sync::RwLockMappedWriteGuard
+    /// [`RwLockWriteGuard::map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockWriteGuard.html#method.map
+    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{RwLock, RwLockWriteGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = RwLock::new(Foo(1));
+    ///
+    /// {
+    ///     let mut mapped = RwLockWriteGuard::map(lock.write().await, |f| &mut f.0);
+    ///     *mapped = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *lock.read().await);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn map<F, U: ?Sized>(mut this: Self, f: F) -> RwLockMappedWriteGuard<'a, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let data = f(&mut *this) as *mut U;
+        let s = this.s;
+        let permits_acquired = this.permits_acquired;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        RwLockMappedWriteGuard {
+            permits_acquired,
+            s,
+            data,
+            marker: marker::PhantomData,
+        }
+    }
+
+    /// Attempts to make  a new [`RwLockMappedWriteGuard`] for a component of
+    /// the locked data. The original guard is returned if the closure returns
+    /// `None`.
+    ///
+    /// This operation cannot fail as the `RwLockWriteGuard` passed in already
+    /// locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `RwLockWriteGuard::try_map(...)`. A method would interfere with
+    /// methods of the same name on the contents of the locked data.
+    ///
+    /// This is an asynchronous version of [`RwLockWriteGuard::try_map`] from
+    /// the [`parking_lot` crate].
+    ///
+    /// [`RwLockMappedWriteGuard`]: struct@crate::sync::RwLockMappedWriteGuard
+    /// [`RwLockWriteGuard::try_map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockWriteGuard.html#method.try_map
+    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{RwLock, RwLockWriteGuard};
+    ///
+    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    /// struct Foo(u32);
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = RwLock::new(Foo(1));
+    ///
+    /// {
+    ///     let guard = lock.write().await;
+    ///     let mut guard = RwLockWriteGuard::try_map(guard, |f| Some(&mut f.0)).expect("should not fail");
+    ///     *guard = 2;
+    /// }
+    ///
+    /// assert_eq!(Foo(2), *lock.read().await);
+    /// # }
+    /// ```
+    #[inline]
+    pub fn try_map<F, U: ?Sized>(
+        mut this: Self,
+        f: F,
+    ) -> Result<RwLockMappedWriteGuard<'a, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let data = match f(&mut *this) {
+            Some(data) => data as *mut U,
+            None => return Err(this),
+        };
+        let s = this.s;
+        let permits_acquired = this.permits_acquired;
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(this);
+        Ok(RwLockMappedWriteGuard {
+            permits_acquired,
+            s,
+            data,
+            marker: marker::PhantomData,
+        })
+    }
+
+    /// Converts this `RwLockWriteGuard` into an `RwLockMappedWriteGuard`. This
+    /// method can be used to store a non-mapped guard in a struct field that
+    /// expects a mapped guard.
+    ///
+    /// This is equivalent to calling `RwLockWriteGuard::map(guard, |me| me)`.
+    #[inline]
+    pub fn into_mapped(this: Self) -> RwLockMappedWriteGuard<'a, T> {
+        RwLockWriteGuard::map(this, |me| me)
+    }
+
+    /// Atomically downgrades a write lock into a read lock without allowing
+    /// any writers to take exclusive access of the lock in the meantime.
+    ///
+    /// **Note:** This won't *necessarily* allow any additional readers to acquire
+    /// locks, since [`RwLock`] is fair and it is possible that a writer is next
+    /// in line.
+    ///
+    /// Returns an RAII guard which will drop this read access of the `RwLock`
+    /// when dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use tokio::sync::RwLock;
+    /// # use std::sync::Arc;
+    /// #
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let lock = Arc::new(RwLock::new(1));
+    ///
+    /// let n = lock.write().await;
+    ///
+    /// let cloned_lock = lock.clone();
+    /// let handle = tokio::spawn(async move {
+    ///     *cloned_lock.write().await = 2;
+    /// });
+    ///
+    /// let n = n.downgrade();
+    /// assert_eq!(*n, 1, "downgrade is atomic");
+    ///
+    /// drop(n);
+    /// handle.await.unwrap();
+    /// assert_eq!(*lock.read().await, 2, "second writer obtained write lock");
+    /// # }
+    /// ```
+    ///
+    /// [`RwLock`]: struct@crate::sync::RwLock
+    pub fn downgrade(self) -> RwLockReadGuard<'a, T> {
+        let RwLockWriteGuard { s, data, .. } = self;
+
+        // Release all but one of the permits held by the write guard
+        s.release((self.permits_acquired - 1) as usize);
+        // NB: Forget to avoid drop impl from being called.
+        mem::forget(self);
+        RwLockReadGuard {
+            s,
+            data,
+            marker: marker::PhantomData,
+        }
+    }
+}
+
+impl<T: ?Sized> ops::Deref for RwLockWriteGuard<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.data }
+    }
+}
+
+impl<T: ?Sized> ops::DerefMut for RwLockWriteGuard<'_, T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.data }
+    }
+}
+
+impl<'a, T: ?Sized> fmt::Debug for RwLockWriteGuard<'a, T>
+where
+    T: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized> fmt::Display for RwLockWriteGuard<'a, T>
+where
+    T: fmt::Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized> Drop for RwLockWriteGuard<'a, T> {
+    fn drop(&mut self) {
+        self.s.release(self.permits_acquired as usize);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/rwlock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/rwlock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,31 @@
-use crate::sync::batch_semaphore::Semaphore;
+use crate::sync::batch_semaphore::{Semaphore, TryAcquireError};
+use crate::sync::mutex::TryLockError;
 use std::cell::UnsafeCell;
-use std::fmt;
 use std::marker;
-use std::mem;
-use std::ops;
+use std::marker::PhantomData;
+use std::mem::ManuallyDrop;
+use std::sync::Arc;
+
+pub(crate) mod owned_read_guard;
+pub(crate) mod owned_write_guard;
+pub(crate) mod owned_write_guard_mapped;
+pub(crate) mod read_guard;
+pub(crate) mod write_guard;
+pub(crate) mod write_guard_mapped;
+pub(crate) use owned_read_guard::OwnedRwLockReadGuard;
+pub(crate) use owned_write_guard::OwnedRwLockWriteGuard;
+pub(crate) use owned_write_guard_mapped::OwnedRwLockMappedWriteGuard;
+pub(crate) use read_guard::RwLockReadGuard;
+pub(crate) use write_guard::RwLockWriteGuard;
+pub(crate) use write_guard_mapped::RwLockMappedWriteGuard;
 
 #[cfg(not(loom))]
-const MAX_READS: usize = 32;
+const MAX_READS: u32 = std::u32::MAX >> 3;
 
 #[cfg(loom)]
-const MAX_READS: usize = 10;
+const MAX_READS: u32 = 10;
 
-/// An asynchronous reader-writer lock
+/// An asynchronous reader-writer lock.
 ///
 /// This type of lock allows a number of readers or at most one writer at any
 /// point in time. The write portion of this lock typically allows modification
@@ -72,6 +86,9 @@
 /// [_write-preferring_]: https://en.wikipedia.org/wiki/Readers%E2%80%93writer_lock#Priority_policies
 #[derive(Debug)]
 pub struct RwLock<T: ?Sized> {
+    // maximum number of concurrent readers
+    mr: u32,
+
     //semaphore to coordinate read and write access to T
     s: Semaphore,
 
@@ -79,297 +96,6 @@
     c: UnsafeCell<T>,
 }
 
-/// RAII structure used to release the shared read access of a lock when
-/// dropped.
-///
-/// This structure is created by the [`read`] method on
-/// [`RwLock`].
-///
-/// [`read`]: method@RwLock::read
-/// [`RwLock`]: struct@RwLock
-pub struct RwLockReadGuard<'a, T: ?Sized> {
-    s: &'a Semaphore,
-    data: *const T,
-    marker: marker::PhantomData<&'a T>,
-}
-
-impl<'a, T> RwLockReadGuard<'a, T> {
-    /// Make a new `RwLockReadGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `RwLockReadGuard` passed in already
-    /// locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `RwLockReadGuard::map(...)`. A method would interfere with
-    /// methods of the same name on the contents of the locked data.
-    ///
-    /// This is an asynchronous version of [`RwLockReadGuard::map`] from the
-    /// [`parking_lot` crate].
-    ///
-    /// [`RwLockReadGuard::map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockReadGuard.html#method.map
-    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::sync::{RwLock, RwLockReadGuard};
-    ///
-    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-    /// struct Foo(u32);
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// let lock = RwLock::new(Foo(1));
-    ///
-    /// let guard = lock.read().await;
-    /// let guard = RwLockReadGuard::map(guard, |f| &f.0);
-    ///
-    /// assert_eq!(1, *guard);
-    /// # }
-    /// ```
-    #[inline]
-    pub fn map<F, U: ?Sized>(this: Self, f: F) -> RwLockReadGuard<'a, U>
-    where
-        F: FnOnce(&T) -> &U,
-    {
-        let data = f(&*this) as *const U;
-        let s = this.s;
-        // NB: Forget to avoid drop impl from being called.
-        mem::forget(this);
-        RwLockReadGuard {
-            s,
-            data,
-            marker: marker::PhantomData,
-        }
-    }
-
-    /// Attempts to make a new [`RwLockReadGuard`] for a component of the
-    /// locked data. The original guard is returned if the closure returns
-    /// `None`.
-    ///
-    /// This operation cannot fail as the `RwLockReadGuard` passed in already
-    /// locked the data.
-    ///
-    /// This is an associated function that needs to be used as
-    /// `RwLockReadGuard::try_map(..)`. A method would interfere with methods of the
-    /// same name on the contents of the locked data.
-    ///
-    /// This is an asynchronous version of [`RwLockReadGuard::try_map`] from the
-    /// [`parking_lot` crate].
-    ///
-    /// [`RwLockReadGuard::try_map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockReadGuard.html#method.try_map
-    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::sync::{RwLock, RwLockReadGuard};
-    ///
-    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-    /// struct Foo(u32);
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// let lock = RwLock::new(Foo(1));
-    ///
-    /// let guard = lock.read().await;
-    /// let guard = RwLockReadGuard::try_map(guard, |f| Some(&f.0)).expect("should not fail");
-    ///
-    /// assert_eq!(1, *guard);
-    /// # }
-    /// ```
-    #[inline]
-    pub fn try_map<F, U: ?Sized>(this: Self, f: F) -> Result<RwLockReadGuard<'a, U>, Self>
-    where
-        F: FnOnce(&T) -> Option<&U>,
-    {
-        let data = match f(&*this) {
-            Some(data) => data as *const U,
-            None => return Err(this),
-        };
-        let s = this.s;
-        // NB: Forget to avoid drop impl from being called.
-        mem::forget(this);
-        Ok(RwLockReadGuard {
-            s,
-            data,
-            marker: marker::PhantomData,
-        })
-    }
-}
-
-impl<'a, T: ?Sized> fmt::Debug for RwLockReadGuard<'a, T>
-where
-    T: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Debug::fmt(&**self, f)
-    }
-}
-
-impl<'a, T: ?Sized> fmt::Display for RwLockReadGuard<'a, T>
-where
-    T: fmt::Display,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Display::fmt(&**self, f)
-    }
-}
-
-impl<'a, T: ?Sized> Drop for RwLockReadGuard<'a, T> {
-    fn drop(&mut self) {
-        self.s.release(1);
-    }
-}
-
-/// RAII structure used to release the exclusive write access of a lock when
-/// dropped.
-///
-/// This structure is created by the [`write`] and method
-/// on [`RwLock`].
-///
-/// [`write`]: method@RwLock::write
-/// [`RwLock`]: struct@RwLock
-pub struct RwLockWriteGuard<'a, T: ?Sized> {
-    s: &'a Semaphore,
-    data: *mut T,
-    marker: marker::PhantomData<&'a mut T>,
-}
-
-impl<'a, T: ?Sized> RwLockWriteGuard<'a, T> {
-    /// Make a new `RwLockWriteGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `RwLockWriteGuard` passed in already
-    /// locked the data.
-    ///
-    /// This is an associated function that needs to be used as
-    /// `RwLockWriteGuard::map(..)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    ///
-    /// This is an asynchronous version of [`RwLockWriteGuard::map`] from the
-    /// [`parking_lot` crate].
-    ///
-    /// [`RwLockWriteGuard::map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockWriteGuard.html#method.map
-    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::sync::{RwLock, RwLockWriteGuard};
-    ///
-    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-    /// struct Foo(u32);
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// let lock = RwLock::new(Foo(1));
-    ///
-    /// {
-    ///     let mut mapped = RwLockWriteGuard::map(lock.write().await, |f| &mut f.0);
-    ///     *mapped = 2;
-    /// }
-    ///
-    /// assert_eq!(Foo(2), *lock.read().await);
-    /// # }
-    /// ```
-    #[inline]
-    pub fn map<F, U: ?Sized>(mut this: Self, f: F) -> RwLockWriteGuard<'a, U>
-    where
-        F: FnOnce(&mut T) -> &mut U,
-    {
-        let data = f(&mut *this) as *mut U;
-        let s = this.s;
-        // NB: Forget to avoid drop impl from being called.
-        mem::forget(this);
-        RwLockWriteGuard {
-            s,
-            data,
-            marker: marker::PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new [`RwLockWriteGuard`] for a component of
-    /// the locked data. The original guard is returned if the closure returns
-    /// `None`.
-    ///
-    /// This operation cannot fail as the `RwLockWriteGuard` passed in already
-    /// locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `RwLockWriteGuard::try_map(...)`. A method would interfere with
-    /// methods of the same name on the contents of the locked data.
-    ///
-    /// This is an asynchronous version of [`RwLockWriteGuard::try_map`] from
-    /// the [`parking_lot` crate].
-    ///
-    /// [`RwLockWriteGuard::try_map`]: https://docs.rs/lock_api/latest/lock_api/struct.RwLockWriteGuard.html#method.try_map
-    /// [`parking_lot` crate]: https://crates.io/crates/parking_lot
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::sync::{RwLock, RwLockWriteGuard};
-    ///
-    /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-    /// struct Foo(u32);
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    /// let lock = RwLock::new(Foo(1));
-    ///
-    /// {
-    ///     let guard = lock.write().await;
-    ///     let mut guard = RwLockWriteGuard::try_map(guard, |f| Some(&mut f.0)).expect("should not fail");
-    ///     *guard = 2;
-    /// }
-    ///
-    /// assert_eq!(Foo(2), *lock.read().await);
-    /// # }
-    /// ```
-    #[inline]
-    pub fn try_map<F, U: ?Sized>(mut this: Self, f: F) -> Result<RwLockWriteGuard<'a, U>, Self>
-    where
-        F: FnOnce(&mut T) -> Option<&mut U>,
-    {
-        let data = match f(&mut *this) {
-            Some(data) => data as *mut U,
-            None => return Err(this),
-        };
-        let s = this.s;
-        // NB: Forget to avoid drop impl from being called.
-        mem::forget(this);
-        Ok(RwLockWriteGuard {
-            s,
-            data,
-            marker: marker::PhantomData,
-        })
-    }
-}
-
-impl<'a, T: ?Sized> fmt::Debug for RwLockWriteGuard<'a, T>
-where
-    T: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Debug::fmt(&**self, f)
-    }
-}
-
-impl<'a, T: ?Sized> fmt::Display for RwLockWriteGuard<'a, T>
-where
-    T: fmt::Display,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Display::fmt(&**self, f)
-    }
-}
-
-impl<'a, T: ?Sized> Drop for RwLockWriteGuard<'a, T> {
-    fn drop(&mut self) {
-        self.s.release(MAX_READS);
-    }
-}
-
 #[test]
 #[cfg(not(loom))]
 fn bounds() {
@@ -387,13 +113,31 @@
     check_sync::<RwLockReadGuard<'_, u32>>();
     check_unpin::<RwLockReadGuard<'_, u32>>();
 
+    check_send::<OwnedRwLockReadGuard<u32, i32>>();
+    check_sync::<OwnedRwLockReadGuard<u32, i32>>();
+    check_unpin::<OwnedRwLockReadGuard<u32, i32>>();
+
     check_send::<RwLockWriteGuard<'_, u32>>();
     check_sync::<RwLockWriteGuard<'_, u32>>();
     check_unpin::<RwLockWriteGuard<'_, u32>>();
 
-    let rwlock = RwLock::new(0);
+    check_send::<RwLockMappedWriteGuard<'_, u32>>();
+    check_sync::<RwLockMappedWriteGuard<'_, u32>>();
+    check_unpin::<RwLockMappedWriteGuard<'_, u32>>();
+
+    check_send::<OwnedRwLockWriteGuard<u32>>();
+    check_sync::<OwnedRwLockWriteGuard<u32>>();
+    check_unpin::<OwnedRwLockWriteGuard<u32>>();
+
+    check_send::<OwnedRwLockMappedWriteGuard<u32, i32>>();
+    check_sync::<OwnedRwLockMappedWriteGuard<u32, i32>>();
+    check_unpin::<OwnedRwLockMappedWriteGuard<u32, i32>>();
+
+    let rwlock = Arc::new(RwLock::new(0));
     check_send_sync_val(rwlock.read());
+    check_send_sync_val(Arc::clone(&rwlock).read_owned());
     check_send_sync_val(rwlock.write());
+    check_send_sync_val(Arc::clone(&rwlock).write_owned());
 }
 
 // As long as T: Send + Sync, it's fine to send and share RwLock<T> between threads.
@@ -406,12 +150,42 @@
 // `T` is `Send`.
 unsafe impl<T> Send for RwLockReadGuard<'_, T> where T: ?Sized + Sync {}
 unsafe impl<T> Sync for RwLockReadGuard<'_, T> where T: ?Sized + Send + Sync {}
+// T is required to be `Send` because an OwnedRwLockReadGuard can be used to drop the value held in
+// the RwLock, unlike RwLockReadGuard.
+unsafe impl<T, U> Send for OwnedRwLockReadGuard<T, U>
+where
+    T: ?Sized + Send + Sync,
+    U: ?Sized + Sync,
+{
+}
+unsafe impl<T, U> Sync for OwnedRwLockReadGuard<T, U>
+where
+    T: ?Sized + Send + Sync,
+    U: ?Sized + Send + Sync,
+{
+}
 unsafe impl<T> Sync for RwLockWriteGuard<'_, T> where T: ?Sized + Send + Sync {}
+unsafe impl<T> Sync for OwnedRwLockWriteGuard<T> where T: ?Sized + Send + Sync {}
+unsafe impl<T> Sync for RwLockMappedWriteGuard<'_, T> where T: ?Sized + Send + Sync {}
+unsafe impl<T, U> Sync for OwnedRwLockMappedWriteGuard<T, U>
+where
+    T: ?Sized + Send + Sync,
+    U: ?Sized + Send + Sync,
+{
+}
 // Safety: Stores a raw pointer to `T`, so if `T` is `Sync`, the lock guard over
 // `T` is `Send` - but since this is also provides mutable access, we need to
 // make sure that `T` is `Send` since its value can be sent across thread
 // boundaries.
 unsafe impl<T> Send for RwLockWriteGuard<'_, T> where T: ?Sized + Send + Sync {}
+unsafe impl<T> Send for OwnedRwLockWriteGuard<T> where T: ?Sized + Send + Sync {}
+unsafe impl<T> Send for RwLockMappedWriteGuard<'_, T> where T: ?Sized + Send + Sync {}
+unsafe impl<T, U> Send for OwnedRwLockMappedWriteGuard<T, U>
+where
+    T: ?Sized + Send + Sync,
+    U: ?Sized + Send + Sync,
+{
+}
 
 impl<T: ?Sized> RwLock<T> {
     /// Creates a new instance of an `RwLock<T>` which is unlocked.
@@ -428,17 +202,108 @@
         T: Sized,
     {
         RwLock {
+            mr: MAX_READS,
             c: UnsafeCell::new(value),
-            s: Semaphore::new(MAX_READS),
+            s: Semaphore::new(MAX_READS as usize),
         }
     }
 
-    /// Locks this rwlock with shared read access, causing the current task
+    /// Creates a new instance of an `RwLock<T>` which is unlocked
+    /// and allows a maximum of `max_reads` concurrent readers.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::RwLock;
+    ///
+    /// let lock = RwLock::with_max_readers(5, 1024);
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// Panics if `max_reads` is more than `u32::MAX >> 3`.
+    pub fn with_max_readers(value: T, max_reads: u32) -> RwLock<T>
+    where
+        T: Sized,
+    {
+        assert!(
+            max_reads <= MAX_READS,
+            "a RwLock may not be created with more than {} readers",
+            MAX_READS
+        );
+        RwLock {
+            mr: max_reads,
+            c: UnsafeCell::new(value),
+            s: Semaphore::new(max_reads as usize),
+        }
+    }
+
+    /// Creates a new instance of an `RwLock<T>` which is unlocked.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::RwLock;
+    ///
+    /// static LOCK: RwLock<i32> = RwLock::const_new(5);
+    /// ```
+    #[cfg(all(feature = "parking_lot", not(all(loom, test))))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "parking_lot")))]
+    pub const fn const_new(value: T) -> RwLock<T>
+    where
+        T: Sized,
+    {
+        RwLock {
+            mr: MAX_READS,
+            c: UnsafeCell::new(value),
+            s: Semaphore::const_new(MAX_READS as usize),
+        }
+    }
+
+    /// Creates a new instance of an `RwLock<T>` which is unlocked
+    /// and allows a maximum of `max_reads` concurrent readers.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::RwLock;
+    ///
+    /// static LOCK: RwLock<i32> = RwLock::const_with_max_readers(5, 1024);
+    /// ```
+    #[cfg(all(feature = "parking_lot", not(all(loom, test))))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "parking_lot")))]
+    pub const fn const_with_max_readers(value: T, mut max_reads: u32) -> RwLock<T>
+    where
+        T: Sized,
+    {
+        max_reads &= MAX_READS;
+        RwLock {
+            mr: max_reads,
+            c: UnsafeCell::new(value),
+            s: Semaphore::const_new(max_reads as usize),
+        }
+    }
+
+    /// Locks this `RwLock` with shared read access, causing the current task
     /// to yield until the lock has been acquired.
     ///
-    /// The calling task will yield until there are no more writers which
-    /// hold the lock. There may be other readers currently inside the lock when
-    /// this method returns.
+    /// The calling task will yield until there are no writers which hold the
+    /// lock. There may be other readers inside the lock when the task resumes.
+    ///
+    /// Note that under the priority policy of [`RwLock`], read locks are not
+    /// granted until prior write locks, to prevent starvation. Therefore
+    /// deadlock may occur if a read lock is held by the current task, a write
+    /// lock attempt is made, and then a subsequent read lock attempt is made
+    /// by the current task.
+    ///
+    /// Returns an RAII guard which will drop this read access of the `RwLock`
+    /// when dropped.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute locks in the order they
+    /// were requested. Cancelling a call to `read` makes you lose your place in
+    /// the queue.
     ///
     /// # Examples
     ///
@@ -458,7 +323,7 @@
     ///         // While main has an active read lock, we acquire one too.
     ///         let r = c_lock.read().await;
     ///         assert_eq!(*r, 1);
-    ///     }).await.expect("The spawned task has paniced");
+    ///     }).await.expect("The spawned task has panicked");
     ///
     ///     // Drop the guard after the spawned task finishes.
     ///     drop(n);
@@ -477,15 +342,183 @@
         }
     }
 
-    /// Locks this rwlock with exclusive write access, causing the current task
+    /// Locks this `RwLock` with shared read access, causing the current task
     /// to yield until the lock has been acquired.
     ///
-    /// This function will not return while other writers or other readers
-    /// currently have access to the lock.
+    /// The calling task will yield until there are no writers which hold the
+    /// lock. There may be other readers inside the lock when the task resumes.
     ///
-    /// Returns an RAII guard which will drop the write access of this rwlock
+    /// This method is identical to [`RwLock::read`], except that the returned
+    /// guard references the `RwLock` with an [`Arc`] rather than by borrowing
+    /// it. Therefore, the `RwLock` must be wrapped in an `Arc` to call this
+    /// method, and the guard will live for the `'static` lifetime, as it keeps
+    /// the `RwLock` alive by holding an `Arc`.
+    ///
+    /// Note that under the priority policy of [`RwLock`], read locks are not
+    /// granted until prior write locks, to prevent starvation. Therefore
+    /// deadlock may occur if a read lock is held by the current task, a write
+    /// lock attempt is made, and then a subsequent read lock attempt is made
+    /// by the current task.
+    ///
+    /// Returns an RAII guard which will drop this read access of the `RwLock`
     /// when dropped.
     ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute locks in the order they
+    /// were requested. Cancelling a call to `read_owned` makes you lose your
+    /// place in the queue.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::RwLock;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let lock = Arc::new(RwLock::new(1));
+    ///     let c_lock = lock.clone();
+    ///
+    ///     let n = lock.read_owned().await;
+    ///     assert_eq!(*n, 1);
+    ///
+    ///     tokio::spawn(async move {
+    ///         // While main has an active read lock, we acquire one too.
+    ///         let r = c_lock.read_owned().await;
+    ///         assert_eq!(*r, 1);
+    ///     }).await.expect("The spawned task has panicked");
+    ///
+    ///     // Drop the guard after the spawned task finishes.
+    ///     drop(n);
+    ///}
+    /// ```
+    pub async fn read_owned(self: Arc<Self>) -> OwnedRwLockReadGuard<T> {
+        self.s.acquire(1).await.unwrap_or_else(|_| {
+            // The semaphore was closed. but, we never explicitly close it, and we have a
+            // handle to it through the Arc, which means that this can never happen.
+            unreachable!()
+        });
+        OwnedRwLockReadGuard {
+            data: self.c.get(),
+            lock: ManuallyDrop::new(self),
+            _p: PhantomData,
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with shared read access.
+    ///
+    /// If the access couldn't be acquired immediately, returns [`TryLockError`].
+    /// Otherwise, an RAII guard is returned which will release read access
+    /// when dropped.
+    ///
+    /// [`TryLockError`]: TryLockError
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::RwLock;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let lock = Arc::new(RwLock::new(1));
+    ///     let c_lock = lock.clone();
+    ///
+    ///     let v = lock.try_read().unwrap();
+    ///     assert_eq!(*v, 1);
+    ///
+    ///     tokio::spawn(async move {
+    ///         // While main has an active read lock, we acquire one too.
+    ///         let n = c_lock.read().await;
+    ///         assert_eq!(*n, 1);
+    ///     }).await.expect("The spawned task has panicked");
+    ///
+    ///     // Drop the guard when spawned task finishes.
+    ///     drop(v);
+    /// }
+    /// ```
+    pub fn try_read(&self) -> Result<RwLockReadGuard<'_, T>, TryLockError> {
+        match self.s.try_acquire(1) {
+            Ok(permit) => permit,
+            Err(TryAcquireError::NoPermits) => return Err(TryLockError(())),
+            Err(TryAcquireError::Closed) => unreachable!(),
+        }
+
+        Ok(RwLockReadGuard {
+            s: &self.s,
+            data: self.c.get(),
+            marker: marker::PhantomData,
+        })
+    }
+
+    /// Attempts to acquire this `RwLock` with shared read access.
+    ///
+    /// If the access couldn't be acquired immediately, returns [`TryLockError`].
+    /// Otherwise, an RAII guard is returned which will release read access
+    /// when dropped.
+    ///
+    /// This method is identical to [`RwLock::try_read`], except that the
+    /// returned guard references the `RwLock` with an [`Arc`] rather than by
+    /// borrowing it. Therefore, the `RwLock` must be wrapped in an `Arc` to
+    /// call this method, and the guard will live for the `'static` lifetime,
+    /// as it keeps the `RwLock` alive by holding an `Arc`.
+    ///
+    /// [`TryLockError`]: TryLockError
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::RwLock;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let lock = Arc::new(RwLock::new(1));
+    ///     let c_lock = lock.clone();
+    ///
+    ///     let v = lock.try_read_owned().unwrap();
+    ///     assert_eq!(*v, 1);
+    ///
+    ///     tokio::spawn(async move {
+    ///         // While main has an active read lock, we acquire one too.
+    ///         let n = c_lock.read_owned().await;
+    ///         assert_eq!(*n, 1);
+    ///     }).await.expect("The spawned task has panicked");
+    ///
+    ///     // Drop the guard when spawned task finishes.
+    ///     drop(v);
+    /// }
+    /// ```
+    pub fn try_read_owned(self: Arc<Self>) -> Result<OwnedRwLockReadGuard<T>, TryLockError> {
+        match self.s.try_acquire(1) {
+            Ok(permit) => permit,
+            Err(TryAcquireError::NoPermits) => return Err(TryLockError(())),
+            Err(TryAcquireError::Closed) => unreachable!(),
+        }
+
+        Ok(OwnedRwLockReadGuard {
+            data: self.c.get(),
+            lock: ManuallyDrop::new(self),
+            _p: PhantomData,
+        })
+    }
+
+    /// Locks this `RwLock` with exclusive write access, causing the current
+    /// task to yield until the lock has been acquired.
+    ///
+    /// The calling task will yield while other writers or readers currently
+    /// have access to the lock.
+    ///
+    /// Returns an RAII guard which will drop the write access of this `RwLock`
+    /// when dropped.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute locks in the order they
+    /// were requested. Cancelling a call to `write` makes you lose your place
+    /// in the queue.
+    ///
     /// # Examples
     ///
     /// ```
@@ -500,46 +533,181 @@
     ///}
     /// ```
     pub async fn write(&self) -> RwLockWriteGuard<'_, T> {
-        self.s.acquire(MAX_READS as u32).await.unwrap_or_else(|_| {
+        self.s.acquire(self.mr).await.unwrap_or_else(|_| {
             // The semaphore was closed. but, we never explicitly close it, and we have a
             // handle to it through the Arc, which means that this can never happen.
             unreachable!()
         });
         RwLockWriteGuard {
+            permits_acquired: self.mr,
             s: &self.s,
             data: self.c.get(),
             marker: marker::PhantomData,
         }
     }
 
-    /// Consumes the lock, returning the underlying data.
-    pub fn into_inner(self) -> T
-    where
-        T: Sized,
-    {
-        self.c.into_inner()
+    /// Locks this `RwLock` with exclusive write access, causing the current
+    /// task to yield until the lock has been acquired.
+    ///
+    /// The calling task will yield while other writers or readers currently
+    /// have access to the lock.
+    ///
+    /// This method is identical to [`RwLock::write`], except that the returned
+    /// guard references the `RwLock` with an [`Arc`] rather than by borrowing
+    /// it. Therefore, the `RwLock` must be wrapped in an `Arc` to call this
+    /// method, and the guard will live for the `'static` lifetime, as it keeps
+    /// the `RwLock` alive by holding an `Arc`.
+    ///
+    /// Returns an RAII guard which will drop the write access of this `RwLock`
+    /// when dropped.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute locks in the order they
+    /// were requested. Cancelling a call to `write_owned` makes you lose your
+    /// place in the queue.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::RwLock;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///   let lock = Arc::new(RwLock::new(1));
+    ///
+    ///   let mut n = lock.write_owned().await;
+    ///   *n = 2;
+    ///}
+    /// ```
+    pub async fn write_owned(self: Arc<Self>) -> OwnedRwLockWriteGuard<T> {
+        self.s.acquire(self.mr).await.unwrap_or_else(|_| {
+            // The semaphore was closed. but, we never explicitly close it, and we have a
+            // handle to it through the Arc, which means that this can never happen.
+            unreachable!()
+        });
+        OwnedRwLockWriteGuard {
+            permits_acquired: self.mr,
+            data: self.c.get(),
+            lock: ManuallyDrop::new(self),
+            _p: PhantomData,
+        }
     }
-}
 
-impl<T: ?Sized> ops::Deref for RwLockReadGuard<'_, T> {
-    type Target = T;
+    /// Attempts to acquire this `RwLock` with exclusive write access.
+    ///
+    /// If the access couldn't be acquired immediately, returns [`TryLockError`].
+    /// Otherwise, an RAII guard is returned which will release write access
+    /// when dropped.
+    ///
+    /// [`TryLockError`]: TryLockError
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::RwLock;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let rw = RwLock::new(1);
+    ///
+    ///     let v = rw.read().await;
+    ///     assert_eq!(*v, 1);
+    ///
+    ///     assert!(rw.try_write().is_err());
+    /// }
+    /// ```
+    pub fn try_write(&self) -> Result<RwLockWriteGuard<'_, T>, TryLockError> {
+        match self.s.try_acquire(self.mr) {
+            Ok(permit) => permit,
+            Err(TryAcquireError::NoPermits) => return Err(TryLockError(())),
+            Err(TryAcquireError::Closed) => unreachable!(),
+        }
 
-    fn deref(&self) -> &T {
-        unsafe { &*self.data }
+        Ok(RwLockWriteGuard {
+            permits_acquired: self.mr,
+            s: &self.s,
+            data: self.c.get(),
+            marker: marker::PhantomData,
+        })
     }
-}
 
-impl<T: ?Sized> ops::Deref for RwLockWriteGuard<'_, T> {
-    type Target = T;
+    /// Attempts to acquire this `RwLock` with exclusive write access.
+    ///
+    /// If the access couldn't be acquired immediately, returns [`TryLockError`].
+    /// Otherwise, an RAII guard is returned which will release write access
+    /// when dropped.
+    ///
+    /// This method is identical to [`RwLock::try_write`], except that the
+    /// returned guard references the `RwLock` with an [`Arc`] rather than by
+    /// borrowing it. Therefore, the `RwLock` must be wrapped in an `Arc` to
+    /// call this method, and the guard will live for the `'static` lifetime,
+    /// as it keeps the `RwLock` alive by holding an `Arc`.
+    ///
+    /// [`TryLockError`]: TryLockError
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::RwLock;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let rw = Arc::new(RwLock::new(1));
+    ///
+    ///     let v = Arc::clone(&rw).read_owned().await;
+    ///     assert_eq!(*v, 1);
+    ///
+    ///     assert!(rw.try_write_owned().is_err());
+    /// }
+    /// ```
+    pub fn try_write_owned(self: Arc<Self>) -> Result<OwnedRwLockWriteGuard<T>, TryLockError> {
+        match self.s.try_acquire(self.mr) {
+            Ok(permit) => permit,
+            Err(TryAcquireError::NoPermits) => return Err(TryLockError(())),
+            Err(TryAcquireError::Closed) => unreachable!(),
+        }
 
-    fn deref(&self) -> &T {
-        unsafe { &*self.data }
+        Ok(OwnedRwLockWriteGuard {
+            permits_acquired: self.mr,
+            data: self.c.get(),
+            lock: ManuallyDrop::new(self),
+            _p: PhantomData,
+        })
     }
-}
 
-impl<T: ?Sized> ops::DerefMut for RwLockWriteGuard<'_, T> {
-    fn deref_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.data }
+    /// Returns a mutable reference to the underlying data.
+    ///
+    /// Since this call borrows the `RwLock` mutably, no actual locking needs to
+    /// take place -- the mutable borrow statically guarantees no locks exist.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::RwLock;
+    ///
+    /// fn main() {
+    ///     let mut lock = RwLock::new(1);
+    ///
+    ///     let n = lock.get_mut();
+    ///     *n = 2;
+    /// }
+    /// ```
+    pub fn get_mut(&mut self) -> &mut T {
+        unsafe {
+            // Safety: This is https://github.com/rust-lang/rust/pull/76936
+            &mut *self.c.get()
+        }
+    }
+
+    /// Consumes the lock, returning the underlying data.
+    pub fn into_inner(self) -> T
+    where
+        T: Sized,
+    {
+        self.c.into_inner()
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/semaphore_ll.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/semaphore_ll.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/semaphore_ll.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/semaphore_ll.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1225 +0,0 @@
-#![cfg_attr(not(feature = "sync"), allow(dead_code, unreachable_pub))]
-
-//! Thread-safe, asynchronous counting semaphore.
-//!
-//! A `Semaphore` instance holds a set of permits. Permits are used to
-//! synchronize access to a shared resource.
-//!
-//! Before accessing the shared resource, callers acquire a permit from the
-//! semaphore. Once the permit is acquired, the caller then enters the critical
-//! section. If no permits are available, then acquiring the semaphore returns
-//! `Pending`. The task is woken once a permit becomes available.
-
-use crate::loom::cell::UnsafeCell;
-use crate::loom::future::AtomicWaker;
-use crate::loom::sync::atomic::{AtomicPtr, AtomicUsize};
-use crate::loom::thread;
-
-use std::cmp;
-use std::fmt;
-use std::ptr::{self, NonNull};
-use std::sync::atomic::Ordering::{self, AcqRel, Acquire, Relaxed, Release};
-use std::task::Poll::{Pending, Ready};
-use std::task::{Context, Poll};
-use std::usize;
-
-/// Futures-aware semaphore.
-pub(crate) struct Semaphore {
-    /// Tracks both the waiter queue tail pointer and the number of remaining
-    /// permits.
-    state: AtomicUsize,
-
-    /// waiter queue head pointer.
-    head: UnsafeCell<NonNull<Waiter>>,
-
-    /// Coordinates access to the queue head.
-    rx_lock: AtomicUsize,
-
-    /// Stub waiter node used as part of the MPSC channel algorithm.
-    stub: Box<Waiter>,
-}
-
-/// A semaphore permit
-///
-/// Tracks the lifecycle of a semaphore permit.
-///
-/// An instance of `Permit` is intended to be used with a **single** instance of
-/// `Semaphore`. Using a single instance of `Permit` with multiple semaphore
-/// instances will result in unexpected behavior.
-///
-/// `Permit` does **not** release the permit back to the semaphore on drop. It
-/// is the user's responsibility to ensure that `Permit::release` is called
-/// before dropping the permit.
-#[derive(Debug)]
-pub(crate) struct Permit {
-    waiter: Option<Box<Waiter>>,
-    state: PermitState,
-}
-
-/// Error returned by `Permit::poll_acquire`.
-#[derive(Debug)]
-pub(crate) struct AcquireError(());
-
-/// Error returned by `Permit::try_acquire`.
-#[derive(Debug)]
-pub(crate) enum TryAcquireError {
-    Closed,
-    NoPermits,
-}
-
-/// Node used to notify the semaphore waiter when permit is available.
-#[derive(Debug)]
-struct Waiter {
-    /// Stores waiter state.
-    ///
-    /// See `WaiterState` for more details.
-    state: AtomicUsize,
-
-    /// Task to wake when a permit is made available.
-    waker: AtomicWaker,
-
-    /// Next pointer in the queue of waiting senders.
-    next: AtomicPtr<Waiter>,
-}
-
-/// Semaphore state
-///
-/// The 2 low bits track the modes.
-///
-/// - Closed
-/// - Full
-///
-/// When not full, the rest of the `usize` tracks the total number of messages
-/// in the channel. When full, the rest of the `usize` is a pointer to the tail
-/// of the "waiting senders" queue.
-#[derive(Copy, Clone)]
-struct SemState(usize);
-
-/// Permit state
-#[derive(Debug, Copy, Clone)]
-enum PermitState {
-    /// Currently waiting for permits to be made available and assigned to the
-    /// waiter.
-    Waiting(u16),
-
-    /// The number of acquired permits
-    Acquired(u16),
-}
-
-/// State for an individual waker node
-#[derive(Debug, Copy, Clone)]
-struct WaiterState(usize);
-
-/// Waiter node is in the semaphore queue
-const QUEUED: usize = 0b001;
-
-/// Semaphore has been closed, no more permits will be issued.
-const CLOSED: usize = 0b10;
-
-/// The permit that owns the `Waiter` dropped.
-const DROPPED: usize = 0b100;
-
-/// Represents "one requested permit" in the waiter state
-const PERMIT_ONE: usize = 0b1000;
-
-/// Masks the waiter state to only contain bits tracking number of requested
-/// permits.
-const PERMIT_MASK: usize = usize::MAX - (PERMIT_ONE - 1);
-
-/// How much to shift a permit count to pack it into the waker state
-const PERMIT_SHIFT: u32 = PERMIT_ONE.trailing_zeros();
-
-/// Flag differentiating between available permits and waiter pointers.
-///
-/// If we assume pointers are properly aligned, then the least significant bit
-/// will always be zero. So, we use that bit to track if the value represents a
-/// number.
-const NUM_FLAG: usize = 0b01;
-
-/// Signal the semaphore is closed
-const CLOSED_FLAG: usize = 0b10;
-
-/// Maximum number of permits a semaphore can manage
-const MAX_PERMITS: usize = usize::MAX >> NUM_SHIFT;
-
-/// When representing "numbers", the state has to be shifted this much (to get
-/// rid of the flag bit).
-const NUM_SHIFT: usize = 2;
-
-// ===== impl Semaphore =====
-
-impl Semaphore {
-    /// Creates a new semaphore with the initial number of permits
-    ///
-    /// # Panics
-    ///
-    /// Panics if `permits` is zero.
-    pub(crate) fn new(permits: usize) -> Semaphore {
-        let stub = Box::new(Waiter::new());
-        let ptr = NonNull::from(&*stub);
-
-        // Allocations are aligned
-        debug_assert!(ptr.as_ptr() as usize & NUM_FLAG == 0);
-
-        let state = SemState::new(permits, &stub);
-
-        Semaphore {
-            state: AtomicUsize::new(state.to_usize()),
-            head: UnsafeCell::new(ptr),
-            rx_lock: AtomicUsize::new(0),
-            stub,
-        }
-    }
-
-    /// Returns the current number of available permits
-    pub(crate) fn available_permits(&self) -> usize {
-        let curr = SemState(self.state.load(Acquire));
-        curr.available_permits()
-    }
-
-    /// Tries to acquire the requested number of permits, registering the waiter
-    /// if not enough permits are available.
-    fn poll_acquire(
-        &self,
-        cx: &mut Context<'_>,
-        num_permits: u16,
-        permit: &mut Permit,
-    ) -> Poll<Result<(), AcquireError>> {
-        self.poll_acquire2(num_permits, || {
-            let waiter = permit.waiter.get_or_insert_with(|| Box::new(Waiter::new()));
-
-            waiter.waker.register_by_ref(cx.waker());
-
-            Some(NonNull::from(&**waiter))
-        })
-    }
-
-    fn try_acquire(&self, num_permits: u16) -> Result<(), TryAcquireError> {
-        match self.poll_acquire2(num_permits, || None) {
-            Poll::Ready(res) => res.map_err(to_try_acquire),
-            Poll::Pending => Err(TryAcquireError::NoPermits),
-        }
-    }
-
-    /// Polls for a permit
-    ///
-    /// Tries to acquire available permits first. If unable to acquire a
-    /// sufficient number of permits, the caller's waiter is pushed onto the
-    /// semaphore's wait queue.
-    fn poll_acquire2<F>(
-        &self,
-        num_permits: u16,
-        mut get_waiter: F,
-    ) -> Poll<Result<(), AcquireError>>
-    where
-        F: FnMut() -> Option<NonNull<Waiter>>,
-    {
-        let num_permits = num_permits as usize;
-
-        // Load the current state
-        let mut curr = SemState(self.state.load(Acquire));
-
-        // Saves a ref to the waiter node
-        let mut maybe_waiter: Option<NonNull<Waiter>> = None;
-
-        /// Used in branches where we attempt to push the waiter into the wait
-        /// queue but fail due to permits becoming available or the wait queue
-        /// transitioning to "closed". In this case, the waiter must be
-        /// transitioned back to the "idle" state.
-        macro_rules! revert_to_idle {
-            () => {
-                if let Some(waiter) = maybe_waiter {
-                    unsafe { waiter.as_ref() }.revert_to_idle();
-                }
-            };
-        }
-
-        loop {
-            let mut next = curr;
-
-            if curr.is_closed() {
-                revert_to_idle!();
-                return Ready(Err(AcquireError::closed()));
-            }
-
-            let acquired = next.acquire_permits(num_permits, &self.stub);
-
-            if !acquired {
-                // There are not enough available permits to satisfy the
-                // request. The permit transitions to a waiting state.
-                debug_assert!(curr.waiter().is_some() || curr.available_permits() < num_permits);
-
-                if let Some(waiter) = maybe_waiter.as_ref() {
-                    // Safety: the caller owns the waiter.
-                    let w = unsafe { waiter.as_ref() };
-                    w.set_permits_to_acquire(num_permits - curr.available_permits());
-                } else {
-                    // Get the waiter for the permit.
-                    if let Some(waiter) = get_waiter() {
-                        // Safety: the caller owns the waiter.
-                        let w = unsafe { waiter.as_ref() };
-
-                        // If there are any currently available permits, the
-                        // waiter acquires those immediately and waits for the
-                        // remaining permits to become available.
-                        if !w.to_queued(num_permits - curr.available_permits()) {
-                            // The node is alrady queued, there is no further work
-                            // to do.
-                            return Pending;
-                        }
-
-                        maybe_waiter = Some(waiter);
-                    } else {
-                        // No waiter, this indicates the caller does not wish to
-                        // "wait", so there is nothing left to do.
-                        return Pending;
-                    }
-                }
-
-                next.set_waiter(maybe_waiter.unwrap());
-            }
-
-            debug_assert_ne!(curr.0, 0);
-            debug_assert_ne!(next.0, 0);
-
-            match self.state.compare_exchange(curr.0, next.0, AcqRel, Acquire) {
-                Ok(_) => {
-                    if acquired {
-                        // Successfully acquire permits **without** queuing the
-                        // waiter node. The waiter node is not currently in the
-                        // queue.
-                        revert_to_idle!();
-                        return Ready(Ok(()));
-                    } else {
-                        // The node is pushed into the queue, the final step is
-                        // to set the node's "next" pointer to return the wait
-                        // queue into a consistent state.
-
-                        let prev_waiter =
-                            curr.waiter().unwrap_or_else(|| NonNull::from(&*self.stub));
-
-                        let waiter = maybe_waiter.unwrap();
-
-                        // Link the nodes.
-                        //
-                        // Safety: the mpsc algorithm guarantees the old tail of
-                        // the queue is not removed from the queue during the
-                        // push process.
-                        unsafe {
-                            prev_waiter.as_ref().store_next(waiter);
-                        }
-
-                        return Pending;
-                    }
-                }
-                Err(actual) => {
-                    curr = SemState(actual);
-                }
-            }
-        }
-    }
-
-    /// Closes the semaphore. This prevents the semaphore from issuing new
-    /// permits and notifies all pending waiters.
-    pub(crate) fn close(&self) {
-        // Acquire the `rx_lock`, setting the "closed" flag on the lock.
-        let prev = self.rx_lock.fetch_or(1, AcqRel);
-
-        if prev != 0 {
-            // Another thread has the lock and will be responsible for notifying
-            // pending waiters.
-            return;
-        }
-
-        self.add_permits_locked(0, true);
-    }
-    /// Adds `n` new permits to the semaphore.
-    ///
-    /// The maximum number of permits is `usize::MAX >> 3`, and this function will panic if the limit is exceeded.
-    pub(crate) fn add_permits(&self, n: usize) {
-        if n == 0 {
-            return;
-        }
-
-        // TODO: Handle overflow. A panic is not sufficient, the process must
-        // abort.
-        let prev = self.rx_lock.fetch_add(n << 1, AcqRel);
-
-        if prev != 0 {
-            // Another thread has the lock and will be responsible for notifying
-            // pending waiters.
-            return;
-        }
-
-        self.add_permits_locked(n, false);
-    }
-
-    fn add_permits_locked(&self, mut rem: usize, mut closed: bool) {
-        while rem > 0 || closed {
-            if closed {
-                SemState::fetch_set_closed(&self.state, AcqRel);
-            }
-
-            // Release the permits and notify
-            self.add_permits_locked2(rem, closed);
-
-            let n = rem << 1;
-
-            let actual = if closed {
-                let actual = self.rx_lock.fetch_sub(n | 1, AcqRel);
-                closed = false;
-                actual
-            } else {
-                let actual = self.rx_lock.fetch_sub(n, AcqRel);
-                closed = actual & 1 == 1;
-                actual
-            };
-
-            rem = (actual >> 1) - rem;
-        }
-    }
-
-    /// Releases a specific amount of permits to the semaphore
-    ///
-    /// This function is called by `add_permits` after the add lock has been
-    /// acquired.
-    fn add_permits_locked2(&self, mut n: usize, closed: bool) {
-        // If closing the semaphore, we want to drain the entire queue. The
-        // number of permits being assigned doesn't matter.
-        if closed {
-            n = usize::MAX;
-        }
-
-        'outer: while n > 0 {
-            unsafe {
-                let mut head = self.head.with(|head| *head);
-                let mut next_ptr = head.as_ref().next.load(Acquire);
-
-                let stub = self.stub();
-
-                if head == stub {
-                    // The stub node indicates an empty queue. Any remaining
-                    // permits get assigned back to the semaphore.
-                    let next = match NonNull::new(next_ptr) {
-                        Some(next) => next,
-                        None => {
-                            // This loop is not part of the standard intrusive mpsc
-                            // channel algorithm. This is where we atomically pop
-                            // the last task and add `n` to the remaining capacity.
-                            //
-                            // This modification to the pop algorithm works because,
-                            // at this point, we have not done any work (only done
-                            // reading). We have a *pretty* good idea that there is
-                            // no concurrent pusher.
-                            //
-                            // The capacity is then atomically added by doing an
-                            // AcqRel CAS on `state`. The `state` cell is the
-                            // linchpin of the algorithm.
-                            //
-                            // By successfully CASing `head` w/ AcqRel, we ensure
-                            // that, if any thread was racing and entered a push, we
-                            // see that and abort pop, retrying as it is
-                            // "inconsistent".
-                            let mut curr = SemState::load(&self.state, Acquire);
-
-                            loop {
-                                if curr.has_waiter(&self.stub) {
-                                    // A waiter is being added concurrently.
-                                    // This is the MPSC queue's "inconsistent"
-                                    // state and we must loop and try again.
-                                    thread::yield_now();
-                                    continue 'outer;
-                                }
-
-                                // If closing, nothing more to do.
-                                if closed {
-                                    debug_assert!(curr.is_closed(), "state = {:?}", curr);
-                                    return;
-                                }
-
-                                let mut next = curr;
-                                next.release_permits(n, &self.stub);
-
-                                match self.state.compare_exchange(curr.0, next.0, AcqRel, Acquire) {
-                                    Ok(_) => return,
-                                    Err(actual) => {
-                                        curr = SemState(actual);
-                                    }
-                                }
-                            }
-                        }
-                    };
-
-                    self.head.with_mut(|head| *head = next);
-                    head = next;
-                    next_ptr = next.as_ref().next.load(Acquire);
-                }
-
-                // `head` points to a waiter assign permits to the waiter. If
-                // all requested permits are satisfied, then we can continue,
-                // otherwise the node stays in the wait queue.
-                if !head.as_ref().assign_permits(&mut n, closed) {
-                    assert_eq!(n, 0);
-                    return;
-                }
-
-                if let Some(next) = NonNull::new(next_ptr) {
-                    self.head.with_mut(|head| *head = next);
-
-                    self.remove_queued(head, closed);
-                    continue 'outer;
-                }
-
-                let state = SemState::load(&self.state, Acquire);
-
-                // This must always be a pointer as the wait list is not empty.
-                let tail = state.waiter().unwrap();
-
-                if tail != head {
-                    // Inconsistent
-                    thread::yield_now();
-                    continue 'outer;
-                }
-
-                self.push_stub(closed);
-
-                next_ptr = head.as_ref().next.load(Acquire);
-
-                if let Some(next) = NonNull::new(next_ptr) {
-                    self.head.with_mut(|head| *head = next);
-
-                    self.remove_queued(head, closed);
-                    continue 'outer;
-                }
-
-                // Inconsistent state, loop
-                thread::yield_now();
-            }
-        }
-    }
-
-    /// The wait node has had all of its permits assigned and has been removed
-    /// from the wait queue.
-    ///
-    /// Attempt to remove the QUEUED bit from the node. If additional permits
-    /// are concurrently requested, the node must be pushed back into the wait
-    /// queued.
-    fn remove_queued(&self, waiter: NonNull<Waiter>, closed: bool) {
-        let mut curr = WaiterState(unsafe { waiter.as_ref() }.state.load(Acquire));
-
-        loop {
-            if curr.is_dropped() {
-                // The Permit dropped, it is on us to release the memory
-                let _ = unsafe { Box::from_raw(waiter.as_ptr()) };
-                return;
-            }
-
-            // The node is removed from the queue. We attempt to unset the
-            // queued bit, but concurrently the waiter has requested more
-            // permits. When the waiter requested more permits, it saw the
-            // queued bit set so took no further action. This requires us to
-            // push the node back into the queue.
-            if curr.permits_to_acquire() > 0 {
-                // More permits are requested. The waiter must be re-queued
-                unsafe {
-                    self.push_waiter(waiter, closed);
-                }
-                return;
-            }
-
-            let mut next = curr;
-            next.unset_queued();
-
-            let w = unsafe { waiter.as_ref() };
-
-            match w.state.compare_exchange(curr.0, next.0, AcqRel, Acquire) {
-                Ok(_) => return,
-                Err(actual) => {
-                    curr = WaiterState(actual);
-                }
-            }
-        }
-    }
-
-    unsafe fn push_stub(&self, closed: bool) {
-        self.push_waiter(self.stub(), closed);
-    }
-
-    unsafe fn push_waiter(&self, waiter: NonNull<Waiter>, closed: bool) {
-        // Set the next pointer. This does not require an atomic operation as
-        // this node is not accessible. The write will be flushed with the next
-        // operation
-        waiter.as_ref().next.store(ptr::null_mut(), Relaxed);
-
-        // Update the tail to point to the new node. We need to see the previous
-        // node in order to update the next pointer as well as release `task`
-        // to any other threads calling `push`.
-        let next = SemState::new_ptr(waiter, closed);
-        let prev = SemState(self.state.swap(next.0, AcqRel));
-
-        debug_assert_eq!(closed, prev.is_closed());
-
-        // This function is only called when there are pending tasks. Because of
-        // this, the state must *always* be in pointer mode.
-        let prev = prev.waiter().unwrap();
-
-        // No cycles plz
-        debug_assert_ne!(prev, waiter);
-
-        // Release `task` to the consume end.
-        prev.as_ref().next.store(waiter.as_ptr(), Release);
-    }
-
-    fn stub(&self) -> NonNull<Waiter> {
-        unsafe { NonNull::new_unchecked(&*self.stub as *const _ as *mut _) }
-    }
-}
-
-impl Drop for Semaphore {
-    fn drop(&mut self) {
-        self.close();
-    }
-}
-
-impl fmt::Debug for Semaphore {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.debug_struct("Semaphore")
-            .field("state", &SemState::load(&self.state, Relaxed))
-            .field("head", &self.head.with(|ptr| ptr))
-            .field("rx_lock", &self.rx_lock.load(Relaxed))
-            .field("stub", &self.stub)
-            .finish()
-    }
-}
-
-unsafe impl Send for Semaphore {}
-unsafe impl Sync for Semaphore {}
-
-// ===== impl Permit =====
-
-impl Permit {
-    /// Creates a new `Permit`.
-    ///
-    /// The permit begins in the "unacquired" state.
-    pub(crate) fn new() -> Permit {
-        use PermitState::Acquired;
-
-        Permit {
-            waiter: None,
-            state: Acquired(0),
-        }
-    }
-
-    /// Returns `true` if the permit has been acquired
-    #[allow(dead_code)] // may be used later
-    pub(crate) fn is_acquired(&self) -> bool {
-        match self.state {
-            PermitState::Acquired(num) if num > 0 => true,
-            _ => false,
-        }
-    }
-
-    /// Tries to acquire the permit. If no permits are available, the current task
-    /// is notified once a new permit becomes available.
-    pub(crate) fn poll_acquire(
-        &mut self,
-        cx: &mut Context<'_>,
-        num_permits: u16,
-        semaphore: &Semaphore,
-    ) -> Poll<Result<(), AcquireError>> {
-        use std::cmp::Ordering::*;
-        use PermitState::*;
-
-        match self.state {
-            Waiting(requested) => {
-                // There must be a waiter
-                let waiter = self.waiter.as_ref().unwrap();
-
-                match requested.cmp(&num_permits) {
-                    Less => {
-                        let delta = num_permits - requested;
-
-                        // Request additional permits. If the waiter has been
-                        // dequeued, it must be re-queued.
-                        if !waiter.try_inc_permits_to_acquire(delta as usize) {
-                            let waiter = NonNull::from(&**waiter);
-
-                            // Ignore the result. The check for
-                            // `permits_to_acquire()` will converge the state as
-                            // needed
-                            let _ = semaphore.poll_acquire2(delta, || Some(waiter))?;
-                        }
-
-                        self.state = Waiting(num_permits);
-                    }
-                    Greater => {
-                        let delta = requested - num_permits;
-                        let to_release = waiter.try_dec_permits_to_acquire(delta as usize);
-
-                        semaphore.add_permits(to_release);
-                        self.state = Waiting(num_permits);
-                    }
-                    Equal => {}
-                }
-
-                if waiter.permits_to_acquire()? == 0 {
-                    self.state = Acquired(requested);
-                    return Ready(Ok(()));
-                }
-
-                waiter.waker.register_by_ref(cx.waker());
-
-                if waiter.permits_to_acquire()? == 0 {
-                    self.state = Acquired(requested);
-                    return Ready(Ok(()));
-                }
-
-                Pending
-            }
-            Acquired(acquired) => {
-                if acquired >= num_permits {
-                    Ready(Ok(()))
-                } else {
-                    match semaphore.poll_acquire(cx, num_permits - acquired, self)? {
-                        Ready(()) => {
-                            self.state = Acquired(num_permits);
-                            Ready(Ok(()))
-                        }
-                        Pending => {
-                            self.state = Waiting(num_permits);
-                            Pending
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /// Tries to acquire the permit.
-    pub(crate) fn try_acquire(
-        &mut self,
-        num_permits: u16,
-        semaphore: &Semaphore,
-    ) -> Result<(), TryAcquireError> {
-        use PermitState::*;
-
-        match self.state {
-            Waiting(requested) => {
-                // There must be a waiter
-                let waiter = self.waiter.as_ref().unwrap();
-
-                if requested > num_permits {
-                    let delta = requested - num_permits;
-                    let to_release = waiter.try_dec_permits_to_acquire(delta as usize);
-
-                    semaphore.add_permits(to_release);
-                    self.state = Waiting(num_permits);
-                }
-
-                let res = waiter.permits_to_acquire().map_err(to_try_acquire)?;
-
-                if res == 0 {
-                    if requested < num_permits {
-                        // Try to acquire the additional permits
-                        semaphore.try_acquire(num_permits - requested)?;
-                    }
-
-                    self.state = Acquired(num_permits);
-                    Ok(())
-                } else {
-                    Err(TryAcquireError::NoPermits)
-                }
-            }
-            Acquired(acquired) => {
-                if acquired < num_permits {
-                    semaphore.try_acquire(num_permits - acquired)?;
-                    self.state = Acquired(num_permits);
-                }
-
-                Ok(())
-            }
-        }
-    }
-
-    /// Releases a permit back to the semaphore
-    pub(crate) fn release(&mut self, n: u16, semaphore: &Semaphore) {
-        let n = self.forget(n);
-        semaphore.add_permits(n as usize);
-    }
-
-    /// Forgets the permit **without** releasing it back to the semaphore.
-    ///
-    /// After calling `forget`, `poll_acquire` is able to acquire new permit
-    /// from the semaphore.
-    ///
-    /// Repeatedly calling `forget` without associated calls to `add_permit`
-    /// will result in the semaphore losing all permits.
-    ///
-    /// Will forget **at most** the number of acquired permits. This number is
-    /// returned.
-    pub(crate) fn forget(&mut self, n: u16) -> u16 {
-        use PermitState::*;
-
-        match self.state {
-            Waiting(requested) => {
-                let n = cmp::min(n, requested);
-
-                // Decrement
-                let acquired = self
-                    .waiter
-                    .as_ref()
-                    .unwrap()
-                    .try_dec_permits_to_acquire(n as usize) as u16;
-
-                if n == requested {
-                    self.state = Acquired(0);
-                } else if acquired == requested - n {
-                    self.state = Waiting(acquired);
-                } else {
-                    self.state = Waiting(requested - n);
-                }
-
-                acquired
-            }
-            Acquired(acquired) => {
-                let n = cmp::min(n, acquired);
-                self.state = Acquired(acquired - n);
-                n
-            }
-        }
-    }
-}
-
-impl Default for Permit {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Drop for Permit {
-    fn drop(&mut self) {
-        if let Some(waiter) = self.waiter.take() {
-            // Set the dropped flag
-            let state = WaiterState(waiter.state.fetch_or(DROPPED, AcqRel));
-
-            if state.is_queued() {
-                // The waiter is stored in the queue. The semaphore will drop it
-                std::mem::forget(waiter);
-            }
-        }
-    }
-}
-
-// ===== impl AcquireError ====
-
-impl AcquireError {
-    fn closed() -> AcquireError {
-        AcquireError(())
-    }
-}
-
-fn to_try_acquire(_: AcquireError) -> TryAcquireError {
-    TryAcquireError::Closed
-}
-
-impl fmt::Display for AcquireError {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(fmt, "semaphore closed")
-    }
-}
-
-impl std::error::Error for AcquireError {}
-
-// ===== impl TryAcquireError =====
-
-impl TryAcquireError {
-    /// Returns `true` if the error was caused by a closed semaphore.
-    pub(crate) fn is_closed(&self) -> bool {
-        match self {
-            TryAcquireError::Closed => true,
-            _ => false,
-        }
-    }
-
-    /// Returns `true` if the error was caused by calling `try_acquire` on a
-    /// semaphore with no available permits.
-    pub(crate) fn is_no_permits(&self) -> bool {
-        match self {
-            TryAcquireError::NoPermits => true,
-            _ => false,
-        }
-    }
-}
-
-impl fmt::Display for TryAcquireError {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            TryAcquireError::Closed => write!(fmt, "semaphore closed"),
-            TryAcquireError::NoPermits => write!(fmt, "no permits available"),
-        }
-    }
-}
-
-impl std::error::Error for TryAcquireError {}
-
-// ===== impl Waiter =====
-
-impl Waiter {
-    fn new() -> Waiter {
-        Waiter {
-            state: AtomicUsize::new(0),
-            waker: AtomicWaker::new(),
-            next: AtomicPtr::new(ptr::null_mut()),
-        }
-    }
-
-    fn permits_to_acquire(&self) -> Result<usize, AcquireError> {
-        let state = WaiterState(self.state.load(Acquire));
-
-        if state.is_closed() {
-            Err(AcquireError(()))
-        } else {
-            Ok(state.permits_to_acquire())
-        }
-    }
-
-    /// Only increments the number of permits *if* the waiter is currently
-    /// queued.
-    ///
-    /// # Returns
-    ///
-    /// `true` if the number of permits to acquire has been incremented. `false`
-    /// otherwise. On `false`, the caller should use `Semaphore::poll_acquire`.
-    fn try_inc_permits_to_acquire(&self, n: usize) -> bool {
-        let mut curr = WaiterState(self.state.load(Acquire));
-
-        loop {
-            if !curr.is_queued() {
-                assert_eq!(0, curr.permits_to_acquire());
-                return false;
-            }
-
-            let mut next = curr;
-            next.set_permits_to_acquire(n + curr.permits_to_acquire());
-
-            match self.state.compare_exchange(curr.0, next.0, AcqRel, Acquire) {
-                Ok(_) => return true,
-                Err(actual) => curr = WaiterState(actual),
-            }
-        }
-    }
-
-    /// Try to decrement the number of permits to acquire. This returns the
-    /// actual number of permits that were decremented. The delta between `n`
-    /// and the return has been assigned to the permit and the caller must
-    /// assign these back to the semaphore.
-    fn try_dec_permits_to_acquire(&self, n: usize) -> usize {
-        let mut curr = WaiterState(self.state.load(Acquire));
-
-        loop {
-            if curr.is_closed() {
-                return 0;
-            }
-
-            if !curr.is_queued() {
-                assert_eq!(0, curr.permits_to_acquire());
-            }
-
-            let delta = cmp::min(n, curr.permits_to_acquire());
-            let rem = curr.permits_to_acquire() - delta;
-
-            let mut next = curr;
-            next.set_permits_to_acquire(rem);
-
-            match self.state.compare_exchange(curr.0, next.0, AcqRel, Acquire) {
-                Ok(_) => return n - delta,
-                Err(actual) => curr = WaiterState(actual),
-            }
-        }
-    }
-
-    /// Store the number of remaining permits needed to satisfy the waiter and
-    /// transition to the "QUEUED" state.
-    ///
-    /// # Returns
-    ///
-    /// `true` if the `QUEUED` bit was set as part of the transition.
-    fn to_queued(&self, num_permits: usize) -> bool {
-        let mut curr = WaiterState(self.state.load(Acquire));
-
-        // The waiter should **not** be waiting for any permits.
-        debug_assert_eq!(curr.permits_to_acquire(), 0);
-
-        loop {
-            let mut next = curr;
-            next.set_permits_to_acquire(num_permits);
-            next.set_queued();
-
-            match self.state.compare_exchange(curr.0, next.0, AcqRel, Acquire) {
-                Ok(_) => {
-                    if curr.is_queued() {
-                        return false;
-                    } else {
-                        // Make sure the next pointer is null
-                        self.next.store(ptr::null_mut(), Relaxed);
-                        return true;
-                    }
-                }
-                Err(actual) => curr = WaiterState(actual),
-            }
-        }
-    }
-
-    /// Set the number of permits to acquire.
-    ///
-    /// This function is only called when the waiter is being inserted into the
-    /// wait queue. Because of this, there are no concurrent threads that can
-    /// modify the state and using `store` is safe.
-    fn set_permits_to_acquire(&self, num_permits: usize) {
-        debug_assert!(WaiterState(self.state.load(Acquire)).is_queued());
-
-        let mut state = WaiterState(QUEUED);
-        state.set_permits_to_acquire(num_permits);
-
-        self.state.store(state.0, Release);
-    }
-
-    /// Assign permits to the waiter.
-    ///
-    /// Returns `true` if the waiter should be removed from the queue
-    fn assign_permits(&self, n: &mut usize, closed: bool) -> bool {
-        let mut curr = WaiterState(self.state.load(Acquire));
-
-        loop {
-            let mut next = curr;
-
-            // Number of permits to assign to this waiter
-            let assign = cmp::min(curr.permits_to_acquire(), *n);
-
-            // Assign the permits
-            next.set_permits_to_acquire(curr.permits_to_acquire() - assign);
-
-            if closed {
-                next.set_closed();
-            }
-
-            match self.state.compare_exchange(curr.0, next.0, AcqRel, Acquire) {
-                Ok(_) => {
-                    // Update `n`
-                    *n -= assign;
-
-                    if next.permits_to_acquire() == 0 {
-                        if curr.permits_to_acquire() > 0 {
-                            self.waker.wake();
-                        }
-
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
-                Err(actual) => curr = WaiterState(actual),
-            }
-        }
-    }
-
-    fn revert_to_idle(&self) {
-        // An idle node is not waiting on any permits
-        self.state.store(0, Relaxed);
-    }
-
-    fn store_next(&self, next: NonNull<Waiter>) {
-        self.next.store(next.as_ptr(), Release);
-    }
-}
-
-// ===== impl SemState =====
-
-impl SemState {
-    /// Returns a new default `State` value.
-    fn new(permits: usize, stub: &Waiter) -> SemState {
-        assert!(permits <= MAX_PERMITS);
-
-        if permits > 0 {
-            SemState((permits << NUM_SHIFT) | NUM_FLAG)
-        } else {
-            SemState(stub as *const _ as usize)
-        }
-    }
-
-    /// Returns a `State` tracking `ptr` as the tail of the queue.
-    fn new_ptr(tail: NonNull<Waiter>, closed: bool) -> SemState {
-        let mut val = tail.as_ptr() as usize;
-
-        if closed {
-            val |= CLOSED_FLAG;
-        }
-
-        SemState(val)
-    }
-
-    /// Returns the amount of remaining capacity
-    fn available_permits(self) -> usize {
-        if !self.has_available_permits() {
-            return 0;
-        }
-
-        self.0 >> NUM_SHIFT
-    }
-
-    /// Returns `true` if the state has permits that can be claimed by a waiter.
-    fn has_available_permits(self) -> bool {
-        self.0 & NUM_FLAG == NUM_FLAG
-    }
-
-    fn has_waiter(self, stub: &Waiter) -> bool {
-        !self.has_available_permits() && !self.is_stub(stub)
-    }
-
-    /// Tries to atomically acquire specified number of permits.
-    ///
-    /// # Return
-    ///
-    /// Returns `true` if the specified number of permits were acquired, `false`
-    /// otherwise. Returning false does not mean that there are no more
-    /// available permits.
-    fn acquire_permits(&mut self, num: usize, stub: &Waiter) -> bool {
-        debug_assert!(num > 0);
-
-        if self.available_permits() < num {
-            return false;
-        }
-
-        debug_assert!(self.waiter().is_none());
-
-        self.0 -= num << NUM_SHIFT;
-
-        if self.0 == NUM_FLAG {
-            // Set the state to the stub pointer.
-            self.0 = stub as *const _ as usize;
-        }
-
-        true
-    }
-
-    /// Releases permits
-    ///
-    /// Returns `true` if the permits were accepted.
-    fn release_permits(&mut self, permits: usize, stub: &Waiter) {
-        debug_assert!(permits > 0);
-
-        if self.is_stub(stub) {
-            self.0 = (permits << NUM_SHIFT) | NUM_FLAG | (self.0 & CLOSED_FLAG);
-            return;
-        }
-
-        debug_assert!(self.has_available_permits());
-
-        self.0 += permits << NUM_SHIFT;
-    }
-
-    fn is_waiter(self) -> bool {
-        self.0 & NUM_FLAG == 0
-    }
-
-    /// Returns the waiter, if one is set.
-    fn waiter(self) -> Option<NonNull<Waiter>> {
-        if self.is_waiter() {
-            let waiter = NonNull::new(self.as_ptr()).expect("null pointer stored");
-
-            Some(waiter)
-        } else {
-            None
-        }
-    }
-
-    /// Assumes `self` represents a pointer
-    fn as_ptr(self) -> *mut Waiter {
-        (self.0 & !CLOSED_FLAG) as *mut Waiter
-    }
-
-    /// Sets to a pointer to a waiter.
-    ///
-    /// This can only be done from the full state.
-    fn set_waiter(&mut self, waiter: NonNull<Waiter>) {
-        let waiter = waiter.as_ptr() as usize;
-        debug_assert!(!self.is_closed());
-
-        self.0 = waiter;
-    }
-
-    fn is_stub(self, stub: &Waiter) -> bool {
-        self.as_ptr() as usize == stub as *const _ as usize
-    }
-
-    /// Loads the state from an AtomicUsize.
-    fn load(cell: &AtomicUsize, ordering: Ordering) -> SemState {
-        let value = cell.load(ordering);
-        SemState(value)
-    }
-
-    fn fetch_set_closed(cell: &AtomicUsize, ordering: Ordering) -> SemState {
-        let value = cell.fetch_or(CLOSED_FLAG, ordering);
-        SemState(value)
-    }
-
-    fn is_closed(self) -> bool {
-        self.0 & CLOSED_FLAG == CLOSED_FLAG
-    }
-
-    /// Converts the state into a `usize` representation.
-    fn to_usize(self) -> usize {
-        self.0
-    }
-}
-
-impl fmt::Debug for SemState {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut fmt = fmt.debug_struct("SemState");
-
-        if self.is_waiter() {
-            fmt.field("state", &"<waiter>");
-        } else {
-            fmt.field("permits", &self.available_permits());
-        }
-
-        fmt.finish()
-    }
-}
-
-// ===== impl WaiterState =====
-
-impl WaiterState {
-    fn permits_to_acquire(self) -> usize {
-        self.0 >> PERMIT_SHIFT
-    }
-
-    fn set_permits_to_acquire(&mut self, val: usize) {
-        self.0 = (val << PERMIT_SHIFT) | (self.0 & !PERMIT_MASK)
-    }
-
-    fn is_queued(self) -> bool {
-        self.0 & QUEUED == QUEUED
-    }
-
-    fn set_queued(&mut self) {
-        self.0 |= QUEUED;
-    }
-
-    fn is_closed(self) -> bool {
-        self.0 & CLOSED == CLOSED
-    }
-
-    fn set_closed(&mut self) {
-        self.0 |= CLOSED;
-    }
-
-    fn unset_queued(&mut self) {
-        assert!(self.is_queued());
-        self.0 -= QUEUED;
-    }
-
-    fn is_dropped(self) -> bool {
-        self.0 & DROPPED == DROPPED
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/semaphore.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/semaphore.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/semaphore.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/semaphore.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,8 @@
 use super::batch_semaphore as ll; // low level implementation
+use super::{AcquireError, TryAcquireError};
 use std::sync::Arc;
 
-/// Counting semaphore performing asynchronous permit aquisition.
+/// Counting semaphore performing asynchronous permit acquisition.
 ///
 /// A semaphore maintains a set of permits. Permits are used to synchronize
 /// access to a shared resource. A semaphore differs from a mutex in that it
@@ -12,6 +13,66 @@
 /// function immediately returns a permit. However, if no remaining permits are
 /// available, `acquire` (asynchronously) waits until an outstanding permit is
 /// dropped. At this point, the freed permit is assigned to the caller.
+///
+/// This `Semaphore` is fair, which means that permits are given out in the order
+/// they were requested. This fairness is also applied when `acquire_many` gets
+/// involved, so if a call to `acquire_many` at the front of the queue requests
+/// more permits than currently available, this can prevent a call to `acquire`
+/// from completing, even if the semaphore has enough permits complete the call
+/// to `acquire`.
+///
+/// To use the `Semaphore` in a poll function, you can use the [`PollSemaphore`]
+/// utility.
+///
+/// # Examples
+///
+/// Basic usage:
+///
+/// ```
+/// use tokio::sync::{Semaphore, TryAcquireError};
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let semaphore = Semaphore::new(3);
+///
+///     let a_permit = semaphore.acquire().await.unwrap();
+///     let two_permits = semaphore.acquire_many(2).await.unwrap();
+///
+///     assert_eq!(semaphore.available_permits(), 0);
+///
+///     let permit_attempt = semaphore.try_acquire();
+///     assert_eq!(permit_attempt.err(), Some(TryAcquireError::NoPermits));
+/// }
+/// ```
+///
+/// Use [`Semaphore::acquire_owned`] to move permits across tasks:
+///
+/// ```
+/// use std::sync::Arc;
+/// use tokio::sync::Semaphore;
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let semaphore = Arc::new(Semaphore::new(3));
+///     let mut join_handles = Vec::new();
+///
+///     for _ in 0..5 {
+///         let permit = semaphore.clone().acquire_owned().await.unwrap();
+///         join_handles.push(tokio::spawn(async move {
+///             // perform task...
+///             // explicitly own `permit` in the task
+///             drop(permit);
+///         }));
+///     }
+///
+///     for handle in join_handles {
+///         handle.await.unwrap();
+///     }
+/// }
+/// ```
+///
+/// [`PollSemaphore`]: https://docs.rs/tokio-util/0.6/tokio_util/sync/struct.PollSemaphore.html
+/// [`Semaphore::acquire_owned`]: crate::sync::Semaphore::acquire_owned
 #[derive(Debug)]
 pub struct Semaphore {
     /// The low level semaphore
@@ -27,7 +88,7 @@
 #[derive(Debug)]
 pub struct SemaphorePermit<'a> {
     sem: &'a Semaphore,
-    permits: u16,
+    permits: u32,
 }
 
 /// An owned permit from the semaphore.
@@ -39,18 +100,9 @@
 #[derive(Debug)]
 pub struct OwnedSemaphorePermit {
     sem: Arc<Semaphore>,
-    permits: u16,
+    permits: u32,
 }
 
-/// Error returned from the [`Semaphore::try_acquire`] function.
-///
-/// A `try_acquire` operation can only fail if the semaphore has no available
-/// permits.
-///
-/// [`Semaphore::try_acquire`]: Semaphore::try_acquire
-#[derive(Debug)]
-pub struct TryAcquireError(());
-
 #[test]
 #[cfg(not(loom))]
 fn bounds() {
@@ -74,6 +126,24 @@
         }
     }
 
+    /// Creates a new semaphore with the initial number of permits.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::Semaphore;
+    ///
+    /// static SEM: Semaphore = Semaphore::const_new(10);
+    /// ```
+    ///
+    #[cfg(all(feature = "parking_lot", not(all(loom, test))))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "parking_lot")))]
+    pub const fn const_new(permits: usize) -> Self {
+        Self {
+            ll_sem: ll::Semaphore::const_new(permits),
+        }
+    }
+
     /// Returns the current number of available permits.
     pub fn available_permits(&self) -> usize {
         self.ll_sem.available_permits()
@@ -86,53 +156,381 @@
         self.ll_sem.release(n);
     }
 
-    /// Acquires permit from the semaphore.
-    pub async fn acquire(&self) -> SemaphorePermit<'_> {
-        self.ll_sem.acquire(1).await.unwrap();
-        SemaphorePermit {
-            sem: &self,
+    /// Acquires a permit from the semaphore.
+    ///
+    /// If the semaphore has been closed, this returns an [`AcquireError`].
+    /// Otherwise, this returns a [`SemaphorePermit`] representing the
+    /// acquired permit.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute permits in the order they
+    /// were requested. Cancelling a call to `acquire` makes you lose your place
+    /// in the queue.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::Semaphore;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let semaphore = Semaphore::new(2);
+    ///
+    ///     let permit_1 = semaphore.acquire().await.unwrap();
+    ///     assert_eq!(semaphore.available_permits(), 1);
+    ///
+    ///     let permit_2 = semaphore.acquire().await.unwrap();
+    ///     assert_eq!(semaphore.available_permits(), 0);
+    ///
+    ///     drop(permit_1);
+    ///     assert_eq!(semaphore.available_permits(), 1);
+    /// }
+    /// ```
+    ///
+    /// [`AcquireError`]: crate::sync::AcquireError
+    /// [`SemaphorePermit`]: crate::sync::SemaphorePermit
+    pub async fn acquire(&self) -> Result<SemaphorePermit<'_>, AcquireError> {
+        self.ll_sem.acquire(1).await?;
+        Ok(SemaphorePermit {
+            sem: self,
             permits: 1,
-        }
+        })
+    }
+
+    /// Acquires `n` permits from the semaphore.
+    ///
+    /// If the semaphore has been closed, this returns an [`AcquireError`].
+    /// Otherwise, this returns a [`SemaphorePermit`] representing the
+    /// acquired permits.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute permits in the order they
+    /// were requested. Cancelling a call to `acquire_many` makes you lose your
+    /// place in the queue.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::Semaphore;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let semaphore = Semaphore::new(5);
+    ///
+    ///     let permit = semaphore.acquire_many(3).await.unwrap();
+    ///     assert_eq!(semaphore.available_permits(), 2);
+    /// }
+    /// ```
+    ///
+    /// [`AcquireError`]: crate::sync::AcquireError
+    /// [`SemaphorePermit`]: crate::sync::SemaphorePermit
+    pub async fn acquire_many(&self, n: u32) -> Result<SemaphorePermit<'_>, AcquireError> {
+        self.ll_sem.acquire(n).await?;
+        Ok(SemaphorePermit {
+            sem: self,
+            permits: n,
+        })
     }
 
     /// Tries to acquire a permit from the semaphore.
+    ///
+    /// If the semaphore has been closed, this returns a [`TryAcquireError::Closed`]
+    /// and a [`TryAcquireError::NoPermits`] if there are no permits left. Otherwise,
+    /// this returns a [`SemaphorePermit`] representing the acquired permits.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{Semaphore, TryAcquireError};
+    ///
+    /// # fn main() {
+    /// let semaphore = Semaphore::new(2);
+    ///
+    /// let permit_1 = semaphore.try_acquire().unwrap();
+    /// assert_eq!(semaphore.available_permits(), 1);
+    ///
+    /// let permit_2 = semaphore.try_acquire().unwrap();
+    /// assert_eq!(semaphore.available_permits(), 0);
+    ///
+    /// let permit_3 = semaphore.try_acquire();
+    /// assert_eq!(permit_3.err(), Some(TryAcquireError::NoPermits));
+    /// # }
+    /// ```
+    ///
+    /// [`TryAcquireError::Closed`]: crate::sync::TryAcquireError::Closed
+    /// [`TryAcquireError::NoPermits`]: crate::sync::TryAcquireError::NoPermits
+    /// [`SemaphorePermit`]: crate::sync::SemaphorePermit
     pub fn try_acquire(&self) -> Result<SemaphorePermit<'_>, TryAcquireError> {
         match self.ll_sem.try_acquire(1) {
             Ok(_) => Ok(SemaphorePermit {
                 sem: self,
                 permits: 1,
             }),
-            Err(_) => Err(TryAcquireError(())),
+            Err(e) => Err(e),
+        }
+    }
+
+    /// Tries to acquire `n` permits from the semaphore.
+    ///
+    /// If the semaphore has been closed, this returns a [`TryAcquireError::Closed`]
+    /// and a [`TryAcquireError::NoPermits`] if there are not enough permits left.
+    /// Otherwise, this returns a [`SemaphorePermit`] representing the acquired permits.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::{Semaphore, TryAcquireError};
+    ///
+    /// # fn main() {
+    /// let semaphore = Semaphore::new(4);
+    ///
+    /// let permit_1 = semaphore.try_acquire_many(3).unwrap();
+    /// assert_eq!(semaphore.available_permits(), 1);
+    ///
+    /// let permit_2 = semaphore.try_acquire_many(2);
+    /// assert_eq!(permit_2.err(), Some(TryAcquireError::NoPermits));
+    /// # }
+    /// ```
+    ///
+    /// [`TryAcquireError::Closed`]: crate::sync::TryAcquireError::Closed
+    /// [`TryAcquireError::NoPermits`]: crate::sync::TryAcquireError::NoPermits
+    /// [`SemaphorePermit`]: crate::sync::SemaphorePermit
+    pub fn try_acquire_many(&self, n: u32) -> Result<SemaphorePermit<'_>, TryAcquireError> {
+        match self.ll_sem.try_acquire(n) {
+            Ok(_) => Ok(SemaphorePermit {
+                sem: self,
+                permits: n,
+            }),
+            Err(e) => Err(e),
         }
     }
 
-    /// Acquires permit from the semaphore.
+    /// Acquires a permit from the semaphore.
     ///
     /// The semaphore must be wrapped in an [`Arc`] to call this method.
+    /// If the semaphore has been closed, this returns an [`AcquireError`].
+    /// Otherwise, this returns a [`OwnedSemaphorePermit`] representing the
+    /// acquired permit.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute permits in the order they
+    /// were requested. Cancelling a call to `acquire_owned` makes you lose your
+    /// place in the queue.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::Semaphore;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let semaphore = Arc::new(Semaphore::new(3));
+    ///     let mut join_handles = Vec::new();
+    ///
+    ///     for _ in 0..5 {
+    ///         let permit = semaphore.clone().acquire_owned().await.unwrap();
+    ///         join_handles.push(tokio::spawn(async move {
+    ///             // perform task...
+    ///             // explicitly own `permit` in the task
+    ///             drop(permit);
+    ///         }));
+    ///     }
+    ///
+    ///     for handle in join_handles {
+    ///         handle.await.unwrap();
+    ///     }
+    /// }
+    /// ```
     ///
     /// [`Arc`]: std::sync::Arc
-    pub async fn acquire_owned(self: Arc<Self>) -> OwnedSemaphorePermit {
-        self.ll_sem.acquire(1).await.unwrap();
-        OwnedSemaphorePermit {
-            sem: self.clone(),
+    /// [`AcquireError`]: crate::sync::AcquireError
+    /// [`OwnedSemaphorePermit`]: crate::sync::OwnedSemaphorePermit
+    pub async fn acquire_owned(self: Arc<Self>) -> Result<OwnedSemaphorePermit, AcquireError> {
+        self.ll_sem.acquire(1).await?;
+        Ok(OwnedSemaphorePermit {
+            sem: self,
             permits: 1,
-        }
+        })
     }
 
-    /// Tries to acquire a permit from the semaphore.
+    /// Acquires `n` permits from the semaphore.
     ///
     /// The semaphore must be wrapped in an [`Arc`] to call this method.
+    /// If the semaphore has been closed, this returns an [`AcquireError`].
+    /// Otherwise, this returns a [`OwnedSemaphorePermit`] representing the
+    /// acquired permit.
+    ///
+    /// # Cancel safety
+    ///
+    /// This method uses a queue to fairly distribute permits in the order they
+    /// were requested. Cancelling a call to `acquire_many_owned` makes you lose
+    /// your place in the queue.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::Semaphore;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let semaphore = Arc::new(Semaphore::new(10));
+    ///     let mut join_handles = Vec::new();
+    ///
+    ///     for _ in 0..5 {
+    ///         let permit = semaphore.clone().acquire_many_owned(2).await.unwrap();
+    ///         join_handles.push(tokio::spawn(async move {
+    ///             // perform task...
+    ///             // explicitly own `permit` in the task
+    ///             drop(permit);
+    ///         }));
+    ///     }
+    ///
+    ///     for handle in join_handles {
+    ///         handle.await.unwrap();
+    ///     }
+    /// }
+    /// ```
+    ///
+    /// [`Arc`]: std::sync::Arc
+    /// [`AcquireError`]: crate::sync::AcquireError
+    /// [`OwnedSemaphorePermit`]: crate::sync::OwnedSemaphorePermit
+    pub async fn acquire_many_owned(
+        self: Arc<Self>,
+        n: u32,
+    ) -> Result<OwnedSemaphorePermit, AcquireError> {
+        self.ll_sem.acquire(n).await?;
+        Ok(OwnedSemaphorePermit {
+            sem: self,
+            permits: n,
+        })
+    }
+
+    /// Tries to acquire a permit from the semaphore.
+    ///
+    /// The semaphore must be wrapped in an [`Arc`] to call this method. If
+    /// the semaphore has been closed, this returns a [`TryAcquireError::Closed`]
+    /// and a [`TryAcquireError::NoPermits`] if there are no permits left.
+    /// Otherwise, this returns a [`OwnedSemaphorePermit`] representing the
+    /// acquired permit.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{Semaphore, TryAcquireError};
+    ///
+    /// # fn main() {
+    /// let semaphore = Arc::new(Semaphore::new(2));
+    ///
+    /// let permit_1 = Arc::clone(&semaphore).try_acquire_owned().unwrap();
+    /// assert_eq!(semaphore.available_permits(), 1);
+    ///
+    /// let permit_2 = Arc::clone(&semaphore).try_acquire_owned().unwrap();
+    /// assert_eq!(semaphore.available_permits(), 0);
+    ///
+    /// let permit_3 = semaphore.try_acquire_owned();
+    /// assert_eq!(permit_3.err(), Some(TryAcquireError::NoPermits));
+    /// # }
+    /// ```
     ///
     /// [`Arc`]: std::sync::Arc
+    /// [`TryAcquireError::Closed`]: crate::sync::TryAcquireError::Closed
+    /// [`TryAcquireError::NoPermits`]: crate::sync::TryAcquireError::NoPermits
+    /// [`OwnedSemaphorePermit`]: crate::sync::OwnedSemaphorePermit
     pub fn try_acquire_owned(self: Arc<Self>) -> Result<OwnedSemaphorePermit, TryAcquireError> {
         match self.ll_sem.try_acquire(1) {
             Ok(_) => Ok(OwnedSemaphorePermit {
-                sem: self.clone(),
+                sem: self,
                 permits: 1,
             }),
-            Err(_) => Err(TryAcquireError(())),
+            Err(e) => Err(e),
         }
     }
+
+    /// Tries to acquire `n` permits from the semaphore.
+    ///
+    /// The semaphore must be wrapped in an [`Arc`] to call this method. If
+    /// the semaphore has been closed, this returns a [`TryAcquireError::Closed`]
+    /// and a [`TryAcquireError::NoPermits`] if there are no permits left.
+    /// Otherwise, this returns a [`OwnedSemaphorePermit`] representing the
+    /// acquired permit.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::sync::Arc;
+    /// use tokio::sync::{Semaphore, TryAcquireError};
+    ///
+    /// # fn main() {
+    /// let semaphore = Arc::new(Semaphore::new(4));
+    ///
+    /// let permit_1 = Arc::clone(&semaphore).try_acquire_many_owned(3).unwrap();
+    /// assert_eq!(semaphore.available_permits(), 1);
+    ///
+    /// let permit_2 = semaphore.try_acquire_many_owned(2);
+    /// assert_eq!(permit_2.err(), Some(TryAcquireError::NoPermits));
+    /// # }
+    /// ```
+    ///
+    /// [`Arc`]: std::sync::Arc
+    /// [`TryAcquireError::Closed`]: crate::sync::TryAcquireError::Closed
+    /// [`TryAcquireError::NoPermits`]: crate::sync::TryAcquireError::NoPermits
+    /// [`OwnedSemaphorePermit`]: crate::sync::OwnedSemaphorePermit
+    pub fn try_acquire_many_owned(
+        self: Arc<Self>,
+        n: u32,
+    ) -> Result<OwnedSemaphorePermit, TryAcquireError> {
+        match self.ll_sem.try_acquire(n) {
+            Ok(_) => Ok(OwnedSemaphorePermit {
+                sem: self,
+                permits: n,
+            }),
+            Err(e) => Err(e),
+        }
+    }
+
+    /// Closes the semaphore.
+    ///
+    /// This prevents the semaphore from issuing new permits and notifies all pending waiters.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::Semaphore;
+    /// use std::sync::Arc;
+    /// use tokio::sync::TryAcquireError;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let semaphore = Arc::new(Semaphore::new(1));
+    ///     let semaphore2 = semaphore.clone();
+    ///
+    ///     tokio::spawn(async move {
+    ///         let permit = semaphore.acquire_many(2).await;
+    ///         assert!(permit.is_err());
+    ///         println!("waiter received error");
+    ///     });
+    ///
+    ///     println!("closing semaphore");
+    ///     semaphore2.close();
+    ///
+    ///     // Cannot obtain more permits
+    ///     assert_eq!(semaphore2.try_acquire().err(), Some(TryAcquireError::Closed))
+    /// }
+    /// ```
+    pub fn close(&self) {
+        self.ll_sem.close();
+    }
+
+    /// Returns true if the semaphore is closed
+    pub fn is_closed(&self) -> bool {
+        self.ll_sem.is_closed()
+    }
 }
 
 impl<'a> SemaphorePermit<'a> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/task/atomic_waker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/task/atomic_waker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/task/atomic_waker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/task/atomic_waker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,7 +29,7 @@
 
 // `AtomicWaker` is a multi-consumer, single-producer transfer cell. The cell
 // stores a `Waker` value produced by calls to `register` and many threads can
-// race to take the waker by calling `wake.
+// race to take the waker by calling `wake`.
 //
 // If a new `Waker` instance is produced by calling `register` before an existing
 // one is consumed, then the existing one is overwritten.
@@ -141,13 +141,12 @@
         }
     }
 
+    /*
     /// Registers the current waker to be notified on calls to `wake`.
-    ///
-    /// This is the same as calling `register_task` with `task::current()`.
-    #[cfg(feature = "io-driver")]
     pub(crate) fn register(&self, waker: Waker) {
         self.do_register(waker);
     }
+    */
 
     /// Registers the provided waker to be notified on calls to `wake`.
     ///
@@ -172,7 +171,11 @@
     where
         W: WakerRef,
     {
-        match self.state.compare_and_swap(WAITING, REGISTERING, Acquire) {
+        match self
+            .state
+            .compare_exchange(WAITING, REGISTERING, Acquire, Acquire)
+            .unwrap_or_else(|x| x)
+        {
             WAITING => {
                 unsafe {
                     // Locked acquired, update the waker cell
@@ -220,6 +223,8 @@
                 waker.wake();
 
                 // This is equivalent to a spin lock, so use a spin hint.
+                // TODO: once we bump MSRV to 1.49+, use `hint::spin_loop` instead.
+                #[allow(deprecated)]
                 atomic::spin_loop_hint();
             }
             state => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_broadcast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_broadcast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_broadcast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_broadcast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 use crate::sync::broadcast;
-use crate::sync::broadcast::RecvError::{Closed, Lagged};
+use crate::sync::broadcast::error::RecvError::{Closed, Lagged};
 
 use loom::future::block_on;
 use loom::sync::Arc;
@@ -176,5 +176,32 @@
 
         assert_ok!(th1.join());
         assert_ok!(th2.join());
+    });
+}
+
+#[test]
+fn drop_multiple_rx_with_overflow() {
+    loom::model(move || {
+        // It is essential to have multiple senders and receivers in this test case.
+        let (tx, mut rx) = broadcast::channel(1);
+        let _rx2 = tx.subscribe();
+
+        let _ = tx.send(());
+        let tx2 = tx.clone();
+        let th1 = thread::spawn(move || {
+            block_on(async {
+                for _ in 0..100 {
+                    let _ = tx2.send(());
+                }
+            });
+        });
+        let _ = tx.send(());
+
+        let th2 = thread::spawn(move || {
+            block_on(async { while let Ok(_) = rx.recv().await {} });
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
     });
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_cancellation_token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_cancellation_token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_cancellation_token.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_cancellation_token.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-use crate::sync::CancellationToken;
-
-use loom::{future::block_on, thread};
-use tokio_test::assert_ok;
-
-#[test]
-fn cancel_token() {
-    loom::model(|| {
-        let token = CancellationToken::new();
-        let token1 = token.clone();
-
-        let th1 = thread::spawn(move || {
-            block_on(async {
-                token1.cancelled().await;
-            });
-        });
-
-        let th2 = thread::spawn(move || {
-            token.cancel();
-        });
-
-        assert_ok!(th1.join());
-        assert_ok!(th2.join());
-    });
-}
-
-#[test]
-fn cancel_with_child() {
-    loom::model(|| {
-        let token = CancellationToken::new();
-        let token1 = token.clone();
-        let token2 = token.clone();
-        let child_token = token.child_token();
-
-        let th1 = thread::spawn(move || {
-            block_on(async {
-                token1.cancelled().await;
-            });
-        });
-
-        let th2 = thread::spawn(move || {
-            token2.cancel();
-        });
-
-        let th3 = thread::spawn(move || {
-            block_on(async {
-                child_token.cancelled().await;
-            });
-        });
-
-        assert_ok!(th1.join());
-        assert_ok!(th2.join());
-        assert_ok!(th3.join());
-    });
-}
-
-#[test]
-fn drop_token_no_child() {
-    loom::model(|| {
-        let token = CancellationToken::new();
-        let token1 = token.clone();
-        let token2 = token.clone();
-
-        let th1 = thread::spawn(move || {
-            drop(token1);
-        });
-
-        let th2 = thread::spawn(move || {
-            drop(token2);
-        });
-
-        let th3 = thread::spawn(move || {
-            drop(token);
-        });
-
-        assert_ok!(th1.join());
-        assert_ok!(th2.join());
-        assert_ok!(th3.join());
-    });
-}
-
-#[test]
-fn drop_token_with_childs() {
-    loom::model(|| {
-        let token1 = CancellationToken::new();
-        let child_token1 = token1.child_token();
-        let child_token2 = token1.child_token();
-
-        let th1 = thread::spawn(move || {
-            drop(token1);
-        });
-
-        let th2 = thread::spawn(move || {
-            drop(child_token1);
-        });
-
-        let th3 = thread::spawn(move || {
-            drop(child_token2);
-        });
-
-        assert_ok!(th1.join());
-        assert_ok!(th2.join());
-        assert_ok!(th3.join());
-    });
-}
-
-#[test]
-fn drop_and_cancel_token() {
-    loom::model(|| {
-        let token1 = CancellationToken::new();
-        let token2 = token1.clone();
-        let child_token = token1.child_token();
-
-        let th1 = thread::spawn(move || {
-            drop(token1);
-        });
-
-        let th2 = thread::spawn(move || {
-            token2.cancel();
-        });
-
-        let th3 = thread::spawn(move || {
-            drop(child_token);
-        });
-
-        assert_ok!(th1.join());
-        assert_ok!(th2.join());
-        assert_ok!(th3.join());
-    });
-}
-
-#[test]
-fn cancel_parent_and_child() {
-    loom::model(|| {
-        let token1 = CancellationToken::new();
-        let token2 = token1.clone();
-        let child_token = token1.child_token();
-
-        let th1 = thread::spawn(move || {
-            drop(token1);
-        });
-
-        let th2 = thread::spawn(move || {
-            token2.cancel();
-        });
-
-        let th3 = thread::spawn(move || {
-            child_token.cancel();
-        });
-
-        assert_ok!(th1.join());
-        assert_ok!(th2.join());
-        assert_ok!(th3.join());
-    });
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_mpsc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_mpsc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_mpsc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_mpsc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,22 +2,24 @@
 
 use futures::future::poll_fn;
 use loom::future::block_on;
+use loom::sync::Arc;
 use loom::thread;
+use tokio_test::assert_ok;
 
 #[test]
 fn closing_tx() {
     loom::model(|| {
-        let (mut tx, mut rx) = mpsc::channel(16);
+        let (tx, mut rx) = mpsc::channel(16);
 
         thread::spawn(move || {
             tx.try_send(()).unwrap();
             drop(tx);
         });
 
-        let v = block_on(poll_fn(|cx| rx.poll_recv(cx)));
+        let v = block_on(rx.recv());
         assert!(v.is_some());
 
-        let v = block_on(poll_fn(|cx| rx.poll_recv(cx)));
+        let v = block_on(rx.recv());
         assert!(v.is_none());
     });
 }
@@ -32,15 +34,70 @@
             drop(tx);
         });
 
-        let v = block_on(poll_fn(|cx| rx.poll_recv(cx)));
+        let v = block_on(rx.recv());
         assert!(v.is_some());
 
-        let v = block_on(poll_fn(|cx| rx.poll_recv(cx)));
+        let v = block_on(rx.recv());
         assert!(v.is_none());
     });
 }
 
 #[test]
+fn closing_bounded_rx() {
+    loom::model(|| {
+        let (tx1, rx) = mpsc::channel::<()>(16);
+        let tx2 = tx1.clone();
+        thread::spawn(move || {
+            drop(rx);
+        });
+
+        block_on(tx1.closed());
+        block_on(tx2.closed());
+    });
+}
+
+#[test]
+fn closing_and_sending() {
+    loom::model(|| {
+        let (tx1, mut rx) = mpsc::channel::<()>(16);
+        let tx1 = Arc::new(tx1);
+        let tx2 = tx1.clone();
+
+        let th1 = thread::spawn(move || {
+            tx1.try_send(()).unwrap();
+        });
+
+        let th2 = thread::spawn(move || {
+            block_on(tx2.closed());
+        });
+
+        let th3 = thread::spawn(move || {
+            let v = block_on(rx.recv());
+            assert!(v.is_some());
+            drop(rx);
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn closing_unbounded_rx() {
+    loom::model(|| {
+        let (tx1, rx) = mpsc::unbounded_channel::<()>();
+        let tx2 = tx1.clone();
+        thread::spawn(move || {
+            drop(rx);
+        });
+
+        block_on(tx1.closed());
+        block_on(tx2.closed());
+    });
+}
+
+#[test]
 fn dropping_tx() {
     loom::model(|| {
         let (tx, mut rx) = mpsc::channel::<()>(16);
@@ -53,7 +110,7 @@
         }
         drop(tx);
 
-        let v = block_on(poll_fn(|cx| rx.poll_recv(cx)));
+        let v = block_on(rx.recv());
         assert!(v.is_none());
     });
 }
@@ -71,7 +128,7 @@
         }
         drop(tx);
 
-        let v = block_on(poll_fn(|cx| rx.poll_recv(cx)));
+        let v = block_on(rx.recv());
         assert!(v.is_none());
     });
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_notify.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_notify.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_notify.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_notify.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,12 +16,62 @@
             });
         });
 
-        tx.notify();
+        tx.notify_one();
         th.join().unwrap();
     });
 }
 
 #[test]
+fn notify_waiters() {
+    loom::model(|| {
+        let notify = Arc::new(Notify::new());
+        let tx = notify.clone();
+        let notified1 = notify.notified();
+        let notified2 = notify.notified();
+
+        let th = thread::spawn(move || {
+            tx.notify_waiters();
+        });
+
+        block_on(async {
+            notified1.await;
+            notified2.await;
+        });
+
+        th.join().unwrap();
+    });
+}
+
+#[test]
+fn notify_waiters_and_one() {
+    loom::model(|| {
+        let notify = Arc::new(Notify::new());
+        let tx1 = notify.clone();
+        let tx2 = notify.clone();
+
+        let th1 = thread::spawn(move || {
+            tx1.notify_waiters();
+        });
+
+        let th2 = thread::spawn(move || {
+            tx2.notify_one();
+        });
+
+        let th3 = thread::spawn(move || {
+            let notified = notify.notified();
+
+            block_on(async {
+                notified.await;
+            });
+        });
+
+        th1.join().unwrap();
+        th2.join().unwrap();
+        th3.join().unwrap();
+    });
+}
+
+#[test]
 fn notify_multi() {
     loom::model(|| {
         let notify = Arc::new(Notify::new());
@@ -34,12 +84,12 @@
             ths.push(thread::spawn(move || {
                 block_on(async {
                     notify.notified().await;
-                    notify.notify();
+                    notify.notify_one();
                 })
             }));
         }
 
-        notify.notify();
+        notify.notify_one();
 
         for th in ths.drain(..) {
             th.join().unwrap();
@@ -67,7 +117,7 @@
 
             block_on(poll_fn(|cx| {
                 if recv.as_mut().poll(cx).is_ready() {
-                    rx1.notify();
+                    rx1.notify_one();
                 }
                 Poll::Ready(())
             }));
@@ -77,12 +127,12 @@
             block_on(async {
                 rx2.notified().await;
                 // Trigger second notification
-                rx2.notify();
+                rx2.notify_one();
                 rx2.notified().await;
             });
         });
 
-        notify.notify();
+        notify.notify_one();
 
         th1.join().unwrap();
         th2.join().unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_oneshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_oneshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_oneshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_oneshot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -75,8 +75,10 @@
     type Output = bool;
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<bool> {
-        let res = self.get_mut().tx.poll_closed(cx);
-        Ready(res.is_ready())
+        let fut = self.get_mut().tx.closed();
+        crate::pin!(fut);
+
+        Ready(fut.poll(cx).is_ready())
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_rwlock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_rwlock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_rwlock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_rwlock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -6,7 +6,7 @@
 
 #[test]
 fn concurrent_write() {
-    let mut b = loom::model::Builder::new();
+    let b = loom::model::Builder::new();
 
     b.check(|| {
         let rwlock = Arc::new(RwLock::<u32>::new(0));
@@ -22,7 +22,7 @@
         let rwclone = rwlock.clone();
         let t2 = thread::spawn(move || {
             block_on(async {
-                let mut guard = rwclone.write().await;
+                let mut guard = rwclone.write_owned().await;
                 *guard += 5;
             });
         });
@@ -37,7 +37,7 @@
 
 #[test]
 fn concurrent_read_write() {
-    let mut b = loom::model::Builder::new();
+    let b = loom::model::Builder::new();
 
     b.check(|| {
         let rwlock = Arc::new(RwLock::<u32>::new(0));
@@ -53,7 +53,7 @@
         let rwclone = rwlock.clone();
         let t2 = thread::spawn(move || {
             block_on(async {
-                let mut guard = rwclone.write().await;
+                let mut guard = rwclone.write_owned().await;
                 *guard += 5;
             });
         });
@@ -67,6 +67,12 @@
             });
         });
 
+        {
+            let guard = block_on(rwlock.clone().read_owned());
+            //at this state the value on the lock may either be 0, 5, or 10
+            assert!(*guard == 0 || *guard == 5 || *guard == 10);
+        }
+
         t1.join().expect("thread 1 write should not panic");
         t2.join().expect("thread 2 write should not panic");
         t3.join().expect("thread 3 read should not panic");
@@ -76,3 +82,24 @@
         assert_eq!(10, *guard);
     });
 }
+#[test]
+fn downgrade() {
+    loom::model(|| {
+        let lock = Arc::new(RwLock::new(1));
+
+        let n = block_on(lock.write());
+
+        let cloned_lock = lock.clone();
+        let handle = thread::spawn(move || {
+            let mut guard = block_on(cloned_lock.write());
+            *guard = 2;
+        });
+
+        let n = n.downgrade();
+        assert_eq!(*n, 1);
+
+        drop(n);
+        handle.join().unwrap();
+        assert_eq!(*block_on(lock.read()), 2);
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_semaphore_ll.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_semaphore_ll.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_semaphore_ll.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_semaphore_ll.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-use crate::sync::semaphore_ll::*;
-
-use futures::future::poll_fn;
-use loom::future::block_on;
-use loom::thread;
-use std::future::Future;
-use std::pin::Pin;
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering::SeqCst;
-use std::sync::Arc;
-use std::task::Poll::Ready;
-use std::task::{Context, Poll};
-
-#[test]
-fn basic_usage() {
-    const NUM: usize = 2;
-
-    struct Actor {
-        waiter: Permit,
-        shared: Arc<Shared>,
-    }
-
-    struct Shared {
-        semaphore: Semaphore,
-        active: AtomicUsize,
-    }
-
-    impl Future for Actor {
-        type Output = ();
-
-        fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
-            let me = &mut *self;
-
-            ready!(me.waiter.poll_acquire(cx, 1, &me.shared.semaphore)).unwrap();
-
-            let actual = me.shared.active.fetch_add(1, SeqCst);
-            assert!(actual <= NUM - 1);
-
-            let actual = me.shared.active.fetch_sub(1, SeqCst);
-            assert!(actual <= NUM);
-
-            me.waiter.release(1, &me.shared.semaphore);
-
-            Ready(())
-        }
-    }
-
-    loom::model(|| {
-        let shared = Arc::new(Shared {
-            semaphore: Semaphore::new(NUM),
-            active: AtomicUsize::new(0),
-        });
-
-        for _ in 0..NUM {
-            let shared = shared.clone();
-
-            thread::spawn(move || {
-                block_on(Actor {
-                    waiter: Permit::new(),
-                    shared,
-                });
-            });
-        }
-
-        block_on(Actor {
-            waiter: Permit::new(),
-            shared,
-        });
-    });
-}
-
-#[test]
-fn release() {
-    loom::model(|| {
-        let semaphore = Arc::new(Semaphore::new(1));
-
-        {
-            let semaphore = semaphore.clone();
-            thread::spawn(move || {
-                let mut permit = Permit::new();
-
-                block_on(poll_fn(|cx| permit.poll_acquire(cx, 1, &semaphore))).unwrap();
-
-                permit.release(1, &semaphore);
-            });
-        }
-
-        let mut permit = Permit::new();
-
-        block_on(poll_fn(|cx| permit.poll_acquire(cx, 1, &semaphore))).unwrap();
-
-        permit.release(1, &semaphore);
-    });
-}
-
-#[test]
-fn basic_closing() {
-    const NUM: usize = 2;
-
-    loom::model(|| {
-        let semaphore = Arc::new(Semaphore::new(1));
-
-        for _ in 0..NUM {
-            let semaphore = semaphore.clone();
-
-            thread::spawn(move || {
-                let mut permit = Permit::new();
-
-                for _ in 0..2 {
-                    block_on(poll_fn(|cx| {
-                        permit.poll_acquire(cx, 1, &semaphore).map_err(|_| ())
-                    }))?;
-
-                    permit.release(1, &semaphore);
-                }
-
-                Ok::<(), ()>(())
-            });
-        }
-
-        semaphore.close();
-    });
-}
-
-#[test]
-fn concurrent_close() {
-    const NUM: usize = 3;
-
-    loom::model(|| {
-        let semaphore = Arc::new(Semaphore::new(1));
-
-        for _ in 0..NUM {
-            let semaphore = semaphore.clone();
-
-            thread::spawn(move || {
-                let mut permit = Permit::new();
-
-                block_on(poll_fn(|cx| {
-                    permit.poll_acquire(cx, 1, &semaphore).map_err(|_| ())
-                }))?;
-
-                permit.release(1, &semaphore);
-
-                semaphore.close();
-
-                Ok::<(), ()>(())
-            });
-        }
-    });
-}
-
-#[test]
-fn batch() {
-    let mut b = loom::model::Builder::new();
-    b.preemption_bound = Some(1);
-
-    b.check(|| {
-        let semaphore = Arc::new(Semaphore::new(10));
-        let active = Arc::new(AtomicUsize::new(0));
-        let mut ths = vec![];
-
-        for _ in 0..2 {
-            let semaphore = semaphore.clone();
-            let active = active.clone();
-
-            ths.push(thread::spawn(move || {
-                let mut permit = Permit::new();
-
-                for n in &[4, 10, 8] {
-                    block_on(poll_fn(|cx| permit.poll_acquire(cx, *n, &semaphore))).unwrap();
-
-                    active.fetch_add(*n as usize, SeqCst);
-
-                    let num_active = active.load(SeqCst);
-                    assert!(num_active <= 10);
-
-                    thread::yield_now();
-
-                    active.fetch_sub(*n as usize, SeqCst);
-
-                    permit.release(*n, &semaphore);
-                }
-            }));
-        }
-
-        for th in ths.into_iter() {
-            th.join().unwrap();
-        }
-
-        assert_eq!(10, semaphore.available_permits());
-    });
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_watch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_watch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_watch.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/loom_watch.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+use crate::sync::watch;
+
+use loom::future::block_on;
+use loom::thread;
+
+#[test]
+fn smoke() {
+    loom::model(|| {
+        let (tx, mut rx1) = watch::channel(1);
+        let mut rx2 = rx1.clone();
+        let mut rx3 = rx1.clone();
+        let mut rx4 = rx1.clone();
+        let mut rx5 = rx1.clone();
+
+        let th = thread::spawn(move || {
+            tx.send(2).unwrap();
+        });
+
+        block_on(rx1.changed()).unwrap();
+        assert_eq!(*rx1.borrow(), 2);
+
+        block_on(rx2.changed()).unwrap();
+        assert_eq!(*rx2.borrow(), 2);
+
+        block_on(rx3.changed()).unwrap();
+        assert_eq!(*rx3.borrow(), 2);
+
+        block_on(rx4.changed()).unwrap();
+        assert_eq!(*rx4.borrow(), 2);
+
+        block_on(rx5.changed()).unwrap();
+        assert_eq!(*rx5.borrow(), 2);
+
+        th.join().unwrap();
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,16 @@
 cfg_not_loom! {
     mod atomic_waker;
-    mod semaphore_ll;
     mod semaphore_batch;
 }
 
 cfg_loom! {
     mod loom_atomic_waker;
     mod loom_broadcast;
-    #[cfg(tokio_unstable)]
-    mod loom_cancellation_token;
     mod loom_list;
     mod loom_mpsc;
     mod loom_notify;
     mod loom_oneshot;
     mod loom_semaphore_batch;
-    mod loom_semaphore_ll;
+    mod loom_watch;
+    mod loom_rwlock;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/semaphore_ll.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/semaphore_ll.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/tests/semaphore_ll.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/tests/semaphore_ll.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,470 +0,0 @@
-use crate::sync::semaphore_ll::{Permit, Semaphore};
-use tokio_test::*;
-
-#[test]
-fn poll_acquire_one_available() {
-    let s = Semaphore::new(100);
-    assert_eq!(s.available_permits(), 100);
-
-    // Polling for a permit succeeds immediately
-    let mut permit = task::spawn(Permit::new());
-    assert!(!permit.is_acquired());
-
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_eq!(s.available_permits(), 99);
-    assert!(permit.is_acquired());
-
-    // Polling again on the same waiter does not claim a new permit
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_eq!(s.available_permits(), 99);
-    assert!(permit.is_acquired());
-}
-
-#[test]
-fn poll_acquire_many_available() {
-    let s = Semaphore::new(100);
-    assert_eq!(s.available_permits(), 100);
-
-    // Polling for a permit succeeds immediately
-    let mut permit = task::spawn(Permit::new());
-    assert!(!permit.is_acquired());
-
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 5, &s)));
-    assert_eq!(s.available_permits(), 95);
-    assert!(permit.is_acquired());
-
-    // Polling again on the same waiter does not claim a new permit
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_eq!(s.available_permits(), 95);
-    assert!(permit.is_acquired());
-
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 5, &s)));
-    assert_eq!(s.available_permits(), 95);
-    assert!(permit.is_acquired());
-
-    // Polling for a larger number of permits acquires more
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 8, &s)));
-    assert_eq!(s.available_permits(), 92);
-    assert!(permit.is_acquired());
-}
-
-#[test]
-fn try_acquire_one_available() {
-    let s = Semaphore::new(100);
-    assert_eq!(s.available_permits(), 100);
-
-    // Polling for a permit succeeds immediately
-    let mut permit = Permit::new();
-    assert!(!permit.is_acquired());
-
-    assert_ok!(permit.try_acquire(1, &s));
-    assert_eq!(s.available_permits(), 99);
-    assert!(permit.is_acquired());
-
-    // Polling again on the same waiter does not claim a new permit
-    assert_ok!(permit.try_acquire(1, &s));
-    assert_eq!(s.available_permits(), 99);
-    assert!(permit.is_acquired());
-}
-
-#[test]
-fn try_acquire_many_available() {
-    let s = Semaphore::new(100);
-    assert_eq!(s.available_permits(), 100);
-
-    // Polling for a permit succeeds immediately
-    let mut permit = Permit::new();
-    assert!(!permit.is_acquired());
-
-    assert_ok!(permit.try_acquire(5, &s));
-    assert_eq!(s.available_permits(), 95);
-    assert!(permit.is_acquired());
-
-    // Polling again on the same waiter does not claim a new permit
-    assert_ok!(permit.try_acquire(5, &s));
-    assert_eq!(s.available_permits(), 95);
-    assert!(permit.is_acquired());
-}
-
-#[test]
-fn poll_acquire_one_unavailable() {
-    let s = Semaphore::new(1);
-
-    let mut permit_1 = task::spawn(Permit::new());
-    let mut permit_2 = task::spawn(Permit::new());
-
-    // Acquire the first permit
-    assert_ready_ok!(permit_1.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_eq!(s.available_permits(), 0);
-
-    permit_2.enter(|cx, mut p| {
-        // Try to acquire the second permit
-        assert_pending!(p.poll_acquire(cx, 1, &s));
-    });
-
-    permit_1.release(1, &s);
-
-    assert_eq!(s.available_permits(), 0);
-    assert!(permit_2.is_woken());
-    assert_ready_ok!(permit_2.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    permit_2.release(1, &s);
-    assert_eq!(s.available_permits(), 1);
-}
-
-#[test]
-fn forget_acquired() {
-    let s = Semaphore::new(1);
-
-    // Polling for a permit succeeds immediately
-    let mut permit = task::spawn(Permit::new());
-
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    assert_eq!(s.available_permits(), 0);
-
-    permit.forget(1);
-    assert_eq!(s.available_permits(), 0);
-}
-
-#[test]
-fn forget_waiting() {
-    let s = Semaphore::new(0);
-
-    // Polling for a permit succeeds immediately
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    assert_eq!(s.available_permits(), 0);
-
-    permit.forget(1);
-
-    s.add_permits(1);
-
-    assert!(!permit.is_woken());
-    assert_eq!(s.available_permits(), 1);
-}
-
-#[test]
-fn poll_acquire_many_unavailable() {
-    let s = Semaphore::new(5);
-
-    let mut permit_1 = task::spawn(Permit::new());
-    let mut permit_2 = task::spawn(Permit::new());
-    let mut permit_3 = task::spawn(Permit::new());
-
-    // Acquire the first permit
-    assert_ready_ok!(permit_1.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_eq!(s.available_permits(), 4);
-
-    permit_2.enter(|cx, mut p| {
-        // Try to acquire the second permit
-        assert_pending!(p.poll_acquire(cx, 5, &s));
-    });
-
-    assert_eq!(s.available_permits(), 0);
-
-    permit_3.enter(|cx, mut p| {
-        // Try to acquire the third permit
-        assert_pending!(p.poll_acquire(cx, 3, &s));
-    });
-
-    permit_1.release(1, &s);
-
-    assert_eq!(s.available_permits(), 0);
-    assert!(permit_2.is_woken());
-    assert_ready_ok!(permit_2.enter(|cx, mut p| p.poll_acquire(cx, 5, &s)));
-
-    assert!(!permit_3.is_woken());
-    assert_eq!(s.available_permits(), 0);
-
-    permit_2.release(1, &s);
-    assert!(!permit_3.is_woken());
-    assert_eq!(s.available_permits(), 0);
-
-    permit_2.release(2, &s);
-    assert!(permit_3.is_woken());
-
-    assert_ready_ok!(permit_3.enter(|cx, mut p| p.poll_acquire(cx, 3, &s)));
-}
-
-#[test]
-fn try_acquire_one_unavailable() {
-    let s = Semaphore::new(1);
-
-    let mut permit_1 = Permit::new();
-    let mut permit_2 = Permit::new();
-
-    // Acquire the first permit
-    assert_ok!(permit_1.try_acquire(1, &s));
-    assert_eq!(s.available_permits(), 0);
-
-    assert_err!(permit_2.try_acquire(1, &s));
-
-    permit_1.release(1, &s);
-
-    assert_eq!(s.available_permits(), 1);
-    assert_ok!(permit_2.try_acquire(1, &s));
-
-    permit_2.release(1, &s);
-    assert_eq!(s.available_permits(), 1);
-}
-
-#[test]
-fn try_acquire_many_unavailable() {
-    let s = Semaphore::new(5);
-
-    let mut permit_1 = Permit::new();
-    let mut permit_2 = Permit::new();
-
-    // Acquire the first permit
-    assert_ok!(permit_1.try_acquire(1, &s));
-    assert_eq!(s.available_permits(), 4);
-
-    assert_err!(permit_2.try_acquire(5, &s));
-
-    permit_1.release(1, &s);
-    assert_eq!(s.available_permits(), 5);
-
-    assert_ok!(permit_2.try_acquire(5, &s));
-
-    permit_2.release(1, &s);
-    assert_eq!(s.available_permits(), 1);
-
-    permit_2.release(1, &s);
-    assert_eq!(s.available_permits(), 2);
-}
-
-#[test]
-fn poll_acquire_one_zero_permits() {
-    let s = Semaphore::new(0);
-    assert_eq!(s.available_permits(), 0);
-
-    let mut permit = task::spawn(Permit::new());
-
-    // Try to acquire the permit
-    permit.enter(|cx, mut p| {
-        assert_pending!(p.poll_acquire(cx, 1, &s));
-    });
-
-    s.add_permits(1);
-
-    assert!(permit.is_woken());
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-}
-
-#[test]
-#[should_panic]
-fn validates_max_permits() {
-    use std::usize;
-    Semaphore::new((usize::MAX >> 2) + 1);
-}
-
-#[test]
-fn close_semaphore_prevents_acquire() {
-    let s = Semaphore::new(5);
-    s.close();
-
-    assert_eq!(5, s.available_permits());
-
-    let mut permit_1 = task::spawn(Permit::new());
-    let mut permit_2 = task::spawn(Permit::new());
-
-    assert_ready_err!(permit_1.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_eq!(5, s.available_permits());
-
-    assert_ready_err!(permit_2.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-    assert_eq!(5, s.available_permits());
-}
-
-#[test]
-fn close_semaphore_notifies_permit1() {
-    let s = Semaphore::new(0);
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    s.close();
-
-    assert!(permit.is_woken());
-    assert_ready_err!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-}
-
-#[test]
-fn close_semaphore_notifies_permit2() {
-    let s = Semaphore::new(2);
-
-    let mut permit1 = task::spawn(Permit::new());
-    let mut permit2 = task::spawn(Permit::new());
-    let mut permit3 = task::spawn(Permit::new());
-    let mut permit4 = task::spawn(Permit::new());
-
-    // Acquire a couple of permits
-    assert_ready_ok!(permit1.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_ready_ok!(permit2.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    assert_pending!(permit3.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_pending!(permit4.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    s.close();
-
-    assert!(permit3.is_woken());
-    assert!(permit4.is_woken());
-
-    assert_ready_err!(permit3.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_ready_err!(permit4.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    assert_eq!(0, s.available_permits());
-
-    permit1.release(1, &s);
-
-    assert_eq!(1, s.available_permits());
-
-    assert_ready_err!(permit1.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    permit2.release(1, &s);
-
-    assert_eq!(2, s.available_permits());
-}
-
-#[test]
-fn poll_acquire_additional_permits_while_waiting_before_assigned() {
-    let s = Semaphore::new(1);
-
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 3, &s)));
-
-    s.add_permits(1);
-    assert!(!permit.is_woken());
-
-    s.add_permits(1);
-    assert!(permit.is_woken());
-
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 3, &s)));
-}
-
-#[test]
-fn try_acquire_additional_permits_while_waiting_before_assigned() {
-    let s = Semaphore::new(1);
-
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-
-    assert_err!(permit.enter(|_, mut p| p.try_acquire(3, &s)));
-
-    s.add_permits(1);
-    assert!(permit.is_woken());
-
-    assert_ok!(permit.enter(|_, mut p| p.try_acquire(2, &s)));
-}
-
-#[test]
-fn poll_acquire_additional_permits_while_waiting_after_assigned_success() {
-    let s = Semaphore::new(1);
-
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-
-    s.add_permits(2);
-
-    assert!(permit.is_woken());
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 3, &s)));
-}
-
-#[test]
-fn poll_acquire_additional_permits_while_waiting_after_assigned_requeue() {
-    let s = Semaphore::new(1);
-
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-
-    s.add_permits(2);
-
-    assert!(permit.is_woken());
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 4, &s)));
-
-    s.add_permits(1);
-
-    assert!(permit.is_woken());
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 4, &s)));
-}
-
-#[test]
-fn poll_acquire_fewer_permits_while_waiting() {
-    let s = Semaphore::new(1);
-
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-    assert_eq!(s.available_permits(), 0);
-
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-    assert_eq!(s.available_permits(), 0);
-}
-
-#[test]
-fn poll_acquire_fewer_permits_after_assigned() {
-    let s = Semaphore::new(1);
-
-    let mut permit1 = task::spawn(Permit::new());
-    let mut permit2 = task::spawn(Permit::new());
-
-    assert_pending!(permit1.enter(|cx, mut p| p.poll_acquire(cx, 5, &s)));
-    assert_eq!(s.available_permits(), 0);
-
-    assert_pending!(permit2.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    s.add_permits(4);
-    assert!(permit1.is_woken());
-    assert!(!permit2.is_woken());
-
-    assert_ready_ok!(permit1.enter(|cx, mut p| p.poll_acquire(cx, 3, &s)));
-
-    assert!(permit2.is_woken());
-    assert_eq!(s.available_permits(), 1);
-
-    assert_ready_ok!(permit2.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-}
-
-#[test]
-fn forget_partial_1() {
-    let s = Semaphore::new(0);
-
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-    s.add_permits(1);
-
-    assert_eq!(0, s.available_permits());
-
-    permit.release(1, &s);
-
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 1, &s)));
-
-    assert_eq!(s.available_permits(), 0);
-}
-
-#[test]
-fn forget_partial_2() {
-    let s = Semaphore::new(0);
-
-    let mut permit = task::spawn(Permit::new());
-
-    assert_pending!(permit.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-    s.add_permits(1);
-
-    assert_eq!(0, s.available_permits());
-
-    permit.release(1, &s);
-
-    s.add_permits(1);
-
-    assert_ready_ok!(permit.enter(|cx, mut p| p.poll_acquire(cx, 2, &s)));
-    assert_eq!(s.available_permits(), 0);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/watch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/watch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/sync/watch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/sync/watch.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![cfg_attr(not(feature = "sync"), allow(dead_code, unreachable_pub))]
+
 //! A single-producer, multi-consumer channel that only retains the *last* sent
 //! value.
 //!
@@ -6,13 +8,11 @@
 //!
 //! # Usage
 //!
-//! [`channel`] returns a [`Sender`] / [`Receiver`] pair. These are
-//! the producer and sender halves of the channel. The channel is
-//! created with an initial value. [`Receiver::recv`] will always
-//! be ready upon creation and will yield either this initial value or
-//! the latest value that has been sent by `Sender`.
-//!
-//! Calls to [`Receiver::recv`] will always yield the latest value.
+//! [`channel`] returns a [`Sender`] / [`Receiver`] pair. These are the producer
+//! and sender halves of the channel. The channel is created with an initial
+//! value. The **latest** value stored in the channel is accessed with
+//! [`Receiver::borrow()`]. Awaiting [`Receiver::changed()`] waits for a new
+//! value to sent by the [`Sender`] half.
 //!
 //! # Examples
 //!
@@ -23,21 +23,21 @@
 //!     let (tx, mut rx) = watch::channel("hello");
 //!
 //!     tokio::spawn(async move {
-//!         while let Some(value) = rx.recv().await {
-//!             println!("received = {:?}", value);
+//!         while rx.changed().await.is_ok() {
+//!             println!("received = {:?}", *rx.borrow());
 //!         }
 //!     });
 //!
-//!     tx.broadcast("world")?;
+//!     tx.send("world")?;
 //! # Ok(())
 //! # }
 //! ```
 //!
 //! # Closing
 //!
-//! [`Sender::closed`] allows the producer to detect when all [`Receiver`]
-//! handles have been dropped. This indicates that there is no further interest
-//! in the values being produced and work can be stopped.
+//! [`Sender::is_closed`] and [`Sender::closed`] allow the producer to detect
+//! when all [`Receiver`] handles have been dropped. This indicates that there
+//! is no further interest in the values being produced and work can be stopped.
 //!
 //! # Thread safety
 //!
@@ -47,31 +47,34 @@
 //!
 //! [`Sender`]: crate::sync::watch::Sender
 //! [`Receiver`]: crate::sync::watch::Receiver
-//! [`Receiver::recv`]: crate::sync::watch::Receiver::recv
+//! [`Receiver::changed()`]: crate::sync::watch::Receiver::changed
+//! [`Receiver::borrow()`]: crate::sync::watch::Receiver::borrow
 //! [`channel`]: crate::sync::watch::channel
+//! [`Sender::is_closed`]: crate::sync::watch::Sender::is_closed
 //! [`Sender::closed`]: crate::sync::watch::Sender::closed
 
-use crate::future::poll_fn;
-use crate::sync::task::AtomicWaker;
+use crate::sync::notify::Notify;
 
-use fnv::FnvHashSet;
+use crate::loom::sync::atomic::AtomicUsize;
+use crate::loom::sync::atomic::Ordering::Relaxed;
+use crate::loom::sync::{Arc, RwLock, RwLockReadGuard};
 use std::ops;
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering::{Relaxed, SeqCst};
-use std::sync::{Arc, Mutex, RwLock, RwLockReadGuard, Weak};
-use std::task::Poll::{Pending, Ready};
-use std::task::{Context, Poll};
 
 /// Receives values from the associated [`Sender`](struct@Sender).
 ///
 /// Instances are created by the [`channel`](fn@channel) function.
+///
+/// To turn this receiver into a `Stream`, you can use the [`WatchStream`]
+/// wrapper.
+///
+/// [`WatchStream`]: https://docs.rs/tokio-stream/0.1/tokio_stream/wrappers/struct.WatchStream.html
 #[derive(Debug)]
 pub struct Receiver<T> {
     /// Pointer to the shared state
     shared: Arc<Shared<T>>,
 
-    /// Pointer to the watcher's internal state
-    inner: Watcher,
+    /// Last observed version
+    version: Version,
 }
 
 /// Sends values to the associated [`Receiver`](struct@Receiver).
@@ -79,7 +82,7 @@
 /// Instances are created by the [`channel`](fn@channel) function.
 #[derive(Debug)]
 pub struct Sender<T> {
-    shared: Weak<Shared<T>>,
+    shared: Arc<Shared<T>>,
 }
 
 /// Returns a reference to the inner value
@@ -92,6 +95,27 @@
     inner: RwLockReadGuard<'a, T>,
 }
 
+#[derive(Debug)]
+struct Shared<T> {
+    /// The most recent value
+    value: RwLock<T>,
+
+    /// The current version
+    ///
+    /// The lowest bit represents a "closed" state. The rest of the bits
+    /// represent the current version.
+    state: AtomicState,
+
+    /// Tracks the number of `Receiver` instances
+    ref_count_rx: AtomicUsize,
+
+    /// Notifies waiting receivers that the value changed.
+    notify_rx: Notify,
+
+    /// Notifies any task listening for `Receiver` dropped events
+    notify_tx: Notify,
+}
+
 pub mod error {
     //! Watch error types
 
@@ -112,40 +136,88 @@
     }
 
     impl<T: fmt::Debug> std::error::Error for SendError<T> {}
+
+    /// Error produced when receiving a change notification.
+    #[derive(Debug)]
+    pub struct RecvError(pub(super) ());
+
+    // ===== impl RecvError =====
+
+    impl fmt::Display for RecvError {
+        fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+            write!(fmt, "channel closed")
+        }
+    }
+
+    impl std::error::Error for RecvError {}
 }
 
-#[derive(Debug)]
-struct Shared<T> {
-    /// The most recent value
-    value: RwLock<T>,
+use self::state::{AtomicState, Version};
+mod state {
+    use crate::loom::sync::atomic::AtomicUsize;
+    use crate::loom::sync::atomic::Ordering::SeqCst;
 
-    /// The current version
+    const CLOSED: usize = 1;
+
+    /// The version part of the state. The lowest bit is always zero.
+    #[derive(Copy, Clone, Debug, Eq, PartialEq)]
+    pub(super) struct Version(usize);
+
+    /// Snapshot of the state. The first bit is used as the CLOSED bit.
+    /// The remaining bits are used as the version.
     ///
-    /// The lowest bit represents a "closed" state. The rest of the bits
-    /// represent the current version.
-    version: AtomicUsize,
+    /// The CLOSED bit tracks whether the Sender has been dropped. Dropping all
+    /// receivers does not set it.
+    #[derive(Copy, Clone, Debug)]
+    pub(super) struct StateSnapshot(usize);
 
-    /// All watchers
-    watchers: Mutex<Watchers>,
+    /// The state stored in an atomic integer.
+    #[derive(Debug)]
+    pub(super) struct AtomicState(AtomicUsize);
 
-    /// Task to notify when all watchers drop
-    cancel: AtomicWaker,
-}
+    impl Version {
+        /// Get the initial version when creating the channel.
+        pub(super) fn initial() -> Self {
+            Version(0)
+        }
+    }
 
-type Watchers = FnvHashSet<Watcher>;
+    impl StateSnapshot {
+        /// Extract the version from the state.
+        pub(super) fn version(self) -> Version {
+            Version(self.0 & !CLOSED)
+        }
 
-/// The watcher's ID is based on the Arc's pointer.
-#[derive(Clone, Debug)]
-struct Watcher(Arc<WatchInner>);
+        /// Is the closed bit set?
+        pub(super) fn is_closed(self) -> bool {
+            (self.0 & CLOSED) == CLOSED
+        }
+    }
 
-#[derive(Debug)]
-struct WatchInner {
-    /// Last observed version
-    version: AtomicUsize,
-    waker: AtomicWaker,
-}
+    impl AtomicState {
+        /// Create a new `AtomicState` that is not closed and which has the
+        /// version set to `Version::initial()`.
+        pub(super) fn new() -> Self {
+            AtomicState(AtomicUsize::new(0))
+        }
+
+        /// Load the current value of the state.
+        pub(super) fn load(&self) -> StateSnapshot {
+            StateSnapshot(self.0.load(SeqCst))
+        }
 
-const CLOSED: usize = 1;
+        /// Increment the version counter.
+        pub(super) fn increment_version(&self) {
+            // Increment by two to avoid touching the CLOSED bit.
+            self.0.fetch_add(2, SeqCst);
+        }
+
+        /// Set the closed bit in the state.
+        pub(super) fn set_closed(&self) {
+            self.0.fetch_or(CLOSED, SeqCst);
+        }
+    }
+}
 
 /// Creates a new watch channel, returning the "send" and "receive" handles.
 ///
@@ -162,52 +234,60 @@
 ///     let (tx, mut rx) = watch::channel("hello");
 ///
 ///     tokio::spawn(async move {
-///         while let Some(value) = rx.recv().await {
-///             println!("received = {:?}", value);
+///         while rx.changed().await.is_ok() {
+///             println!("received = {:?}", *rx.borrow());
 ///         }
 ///     });
 ///
-///     tx.broadcast("world")?;
+///     tx.send("world")?;
 /// # Ok(())
 /// # }
 /// ```
 ///
 /// [`Sender`]: struct@Sender
 /// [`Receiver`]: struct@Receiver
-pub fn channel<T: Clone>(init: T) -> (Sender<T>, Receiver<T>) {
-    const VERSION_0: usize = 0;
-    const VERSION_1: usize = 2;
-
-    // We don't start knowing VERSION_1
-    let inner = Watcher::new_version(VERSION_0);
-
-    // Insert the watcher
-    let mut watchers = FnvHashSet::with_capacity_and_hasher(0, Default::default());
-    watchers.insert(inner.clone());
-
+pub fn channel<T>(init: T) -> (Sender<T>, Receiver<T>) {
     let shared = Arc::new(Shared {
         value: RwLock::new(init),
-        version: AtomicUsize::new(VERSION_1),
-        watchers: Mutex::new(watchers),
-        cancel: AtomicWaker::new(),
+        state: AtomicState::new(),
+        ref_count_rx: AtomicUsize::new(1),
+        notify_rx: Notify::new(),
+        notify_tx: Notify::new(),
     });
 
     let tx = Sender {
-        shared: Arc::downgrade(&shared),
+        shared: shared.clone(),
     };
 
-    let rx = Receiver { shared, inner };
+    let rx = Receiver {
+        shared,
+        version: Version::initial(),
+    };
 
     (tx, rx)
 }
 
 impl<T> Receiver<T> {
-    /// Returns a reference to the most recently sent value
+    fn from_shared(version: Version, shared: Arc<Shared<T>>) -> Self {
+        // No synchronization necessary as this is only used as a counter and
+        // not memory access.
+        shared.ref_count_rx.fetch_add(1, Relaxed);
+
+        Self { shared, version }
+    }
+
+    /// Returns a reference to the most recently sent value.
+    ///
+    /// This method does not mark the returned value as seen, so future calls to
+    /// [`changed`] may return immediately even if you have already seen the
+    /// value with a call to `borrow`.
     ///
     /// Outstanding borrows hold a read lock. This means that long lived borrows
     /// could cause the send half to block. It is recommended to keep the borrow
     /// as short lived as possible.
     ///
+    /// [`changed`]: Receiver::changed
+    ///
     /// # Examples
     ///
     /// ```
@@ -221,39 +301,42 @@
         Ref { inner }
     }
 
-    // TODO: document
-    #[doc(hidden)]
-    pub fn poll_recv_ref<'a>(&'a mut self, cx: &mut Context<'_>) -> Poll<Option<Ref<'a, T>>> {
-        // Make sure the task is up to date
-        self.inner.waker.register_by_ref(cx.waker());
-
-        let state = self.shared.version.load(SeqCst);
-        let version = state & !CLOSED;
-
-        if self.inner.version.swap(version, Relaxed) != version {
-            let inner = self.shared.value.read().unwrap();
-
-            return Ready(Some(Ref { inner }));
-        }
-
-        if CLOSED == state & CLOSED {
-            // The `Store` handle has been dropped.
-            return Ready(None);
-        }
-
-        Pending
+    /// Returns a reference to the most recently sent value and mark that value
+    /// as seen.
+    ///
+    /// This method marks the value as seen, so [`changed`] will not return
+    /// immediately if the newest value is one previously returned by
+    /// `borrow_and_update`.
+    ///
+    /// Outstanding borrows hold a read lock. This means that long lived borrows
+    /// could cause the send half to block. It is recommended to keep the borrow
+    /// as short lived as possible.
+    ///
+    /// [`changed`]: Receiver::changed
+    pub fn borrow_and_update(&mut self) -> Ref<'_, T> {
+        let inner = self.shared.value.read().unwrap();
+        self.version = self.shared.state.load().version();
+        Ref { inner }
     }
-}
 
-impl<T: Clone> Receiver<T> {
-    /// Attempts to clone the latest value sent via the channel.
+    /// Wait for a change notification, then mark the newest value as seen.
+    ///
+    /// If the newest value in the channel has not yet been marked seen when
+    /// this method is called, the method marks that value seen and returns
+    /// immediately. If the newest value has already been marked seen, then the
+    /// method sleeps until a new message is sent by the [`Sender`] connected to
+    /// this `Receiver`, or until the [`Sender`] is dropped.
+    ///
+    /// This method returns an error if and only if the [`Sender`] is dropped.
+    ///
+    /// # Cancel safety
     ///
-    /// If this is the first time the function is called on a `Receiver`
-    /// instance, then the function completes immediately with the **current**
-    /// value held by the channel. On the next call, the function waits until
-    /// a new value is sent in the channel.
+    /// This method is cancel safe. If you use it as the event in a
+    /// [`tokio::select!`](crate::select) statement and some other branch
+    /// completes first, then it is guaranteed that no values have been marked
+    /// seen by this call to `changed`.
     ///
-    /// `None` is returned if the `Sender` half is dropped.
+    /// [`Sender`]: struct@Sender
     ///
     /// # Examples
     ///
@@ -264,118 +347,283 @@
     /// async fn main() {
     ///     let (tx, mut rx) = watch::channel("hello");
     ///
-    ///     let v = rx.recv().await.unwrap();
-    ///     assert_eq!(v, "hello");
-    ///
     ///     tokio::spawn(async move {
-    ///         tx.broadcast("goodbye").unwrap();
+    ///         tx.send("goodbye").unwrap();
     ///     });
     ///
-    ///     // Waits for the new task to spawn and send the value.
-    ///     let v = rx.recv().await.unwrap();
-    ///     assert_eq!(v, "goodbye");
+    ///     assert!(rx.changed().await.is_ok());
+    ///     assert_eq!(*rx.borrow(), "goodbye");
     ///
-    ///     let v = rx.recv().await;
-    ///     assert!(v.is_none());
+    ///     // The `tx` handle has been dropped
+    ///     assert!(rx.changed().await.is_err());
     /// }
     /// ```
-    pub async fn recv(&mut self) -> Option<T> {
-        poll_fn(|cx| {
-            let v_ref = ready!(self.poll_recv_ref(cx));
-            Poll::Ready(v_ref.map(|v_ref| (*v_ref).clone()))
-        })
-        .await
-    }
-}
+    pub async fn changed(&mut self) -> Result<(), error::RecvError> {
+        loop {
+            // In order to avoid a race condition, we first request a notification,
+            // **then** check the current value's version. If a new version exists,
+            // the notification request is dropped.
+            let notified = self.shared.notify_rx.notified();
 
-#[cfg(feature = "stream")]
-impl<T: Clone> crate::stream::Stream for Receiver<T> {
-    type Item = T;
+            if let Some(ret) = maybe_changed(&self.shared, &mut self.version) {
+                return ret;
+            }
+
+            notified.await;
+            // loop around again in case the wake-up was spurious
+        }
+    }
 
-    fn poll_next(mut self: std::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
-        let v_ref = ready!(self.poll_recv_ref(cx));
+    cfg_process_driver! {
+        pub(crate) fn try_has_changed(&mut self) -> Option<Result<(), error::RecvError>> {
+            maybe_changed(&self.shared, &mut self.version)
+        }
+    }
+}
 
-        Poll::Ready(v_ref.map(|v_ref| (*v_ref).clone()))
+fn maybe_changed<T>(
+    shared: &Shared<T>,
+    version: &mut Version,
+) -> Option<Result<(), error::RecvError>> {
+    // Load the version from the state
+    let state = shared.state.load();
+    let new_version = state.version();
+
+    if *version != new_version {
+        // Observe the new version and return
+        *version = new_version;
+        return Some(Ok(()));
+    }
+
+    if state.is_closed() {
+        // All receivers have dropped.
+        return Some(Err(error::RecvError(())));
     }
+
+    None
 }
 
 impl<T> Clone for Receiver<T> {
     fn clone(&self) -> Self {
-        let ver = self.inner.version.load(Relaxed);
-        let inner = Watcher::new_version(ver);
+        let version = self.version;
         let shared = self.shared.clone();
 
-        shared.watchers.lock().unwrap().insert(inner.clone());
-
-        Receiver { shared, inner }
+        Self::from_shared(version, shared)
     }
 }
 
 impl<T> Drop for Receiver<T> {
     fn drop(&mut self) {
-        self.shared.watchers.lock().unwrap().remove(&self.inner);
+        // No synchronization necessary as this is only used as a counter and
+        // not memory access.
+        if 1 == self.shared.ref_count_rx.fetch_sub(1, Relaxed) {
+            // This is the last `Receiver` handle, tasks waiting on `Sender::closed()`
+            self.shared.notify_tx.notify_waiters();
+        }
     }
 }
 
 impl<T> Sender<T> {
-    /// Broadcasts a new value via the channel, notifying all receivers.
-    pub fn broadcast(&self, value: T) -> Result<(), error::SendError<T>> {
-        let shared = match self.shared.upgrade() {
-            Some(shared) => shared,
-            // All `Watch` handles have been canceled
-            None => return Err(error::SendError { inner: value }),
-        };
+    /// Sends a new value via the channel, notifying all receivers.
+    ///
+    /// This method fails if the channel has been closed, which happens when
+    /// every receiver has been dropped.
+    pub fn send(&self, value: T) -> Result<(), error::SendError<T>> {
+        // This is pretty much only useful as a hint anyway, so synchronization isn't critical.
+        if 0 == self.receiver_count() {
+            return Err(error::SendError { inner: value });
+        }
 
-        // Replace the value
         {
-            let mut lock = shared.value.write().unwrap();
+            // Acquire the write lock and update the value.
+            let mut lock = self.shared.value.write().unwrap();
             *lock = value;
-        }
 
-        // Update the version. 2 is used so that the CLOSED bit is not set.
-        shared.version.fetch_add(2, SeqCst);
+            self.shared.state.increment_version();
+
+            // Release the write lock.
+            //
+            // Incrementing the version counter while holding the lock ensures
+            // that receivers are able to figure out the version number of the
+            // value they are currently looking at.
+            drop(lock);
+        }
 
         // Notify all watchers
-        notify_all(&*shared);
+        self.shared.notify_rx.notify_waiters();
 
         Ok(())
     }
 
+    /// Returns a reference to the most recently sent value
+    ///
+    /// Outstanding borrows hold a read lock. This means that long lived borrows
+    /// could cause the send half to block. It is recommended to keep the borrow
+    /// as short lived as possible.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::watch;
+    ///
+    /// let (tx, _) = watch::channel("hello");
+    /// assert_eq!(*tx.borrow(), "hello");
+    /// ```
+    pub fn borrow(&self) -> Ref<'_, T> {
+        let inner = self.shared.value.read().unwrap();
+        Ref { inner }
+    }
+
+    /// Checks if the channel has been closed. This happens when all receivers
+    /// have dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// let (tx, rx) = tokio::sync::watch::channel(());
+    /// assert!(!tx.is_closed());
+    ///
+    /// drop(rx);
+    /// assert!(tx.is_closed());
+    /// ```
+    pub fn is_closed(&self) -> bool {
+        self.receiver_count() == 0
+    }
+
     /// Completes when all receivers have dropped.
     ///
     /// This allows the producer to get notified when interest in the produced
     /// values is canceled and immediately stop doing work.
-    pub async fn closed(&mut self) {
-        poll_fn(|cx| self.poll_close(cx)).await
-    }
+    ///
+    /// # Cancel safety
+    ///
+    /// This method is cancel safe. Once the channel is closed, it stays closed
+    /// forever and all future calls to `closed` will return immediately.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::watch;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, rx) = watch::channel("hello");
+    ///
+    ///     tokio::spawn(async move {
+    ///         // use `rx`
+    ///         drop(rx);
+    ///     });
+    ///
+    ///     // Waits for `rx` to drop
+    ///     tx.closed().await;
+    ///     println!("the `rx` handles dropped")
+    /// }
+    /// ```
+    pub async fn closed(&self) {
+        while self.receiver_count() > 0 {
+            let notified = self.shared.notify_tx.notified();
 
-    fn poll_close(&mut self, cx: &mut Context<'_>) -> Poll<()> {
-        match self.shared.upgrade() {
-            Some(shared) => {
-                shared.cancel.register_by_ref(cx.waker());
-                Pending
+            if self.receiver_count() == 0 {
+                return;
             }
-            None => Ready(()),
+
+            notified.await;
+            // The channel could have been reopened in the meantime by calling
+            // `subscribe`, so we loop again.
         }
     }
-}
 
-/// Notifies all watchers of a change
-fn notify_all<T>(shared: &Shared<T>) {
-    let watchers = shared.watchers.lock().unwrap();
+    /// Creates a new [`Receiver`] connected to this `Sender`.
+    ///
+    /// All messages sent before this call to `subscribe` are initially marked
+    /// as seen by the new `Receiver`.
+    ///
+    /// This method can be called even if there are no other receivers. In this
+    /// case, the channel is reopened.
+    ///
+    /// # Examples
+    ///
+    /// The new channel will receive messages sent on this `Sender`.
+    ///
+    /// ```
+    /// use tokio::sync::watch;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, _rx) = watch::channel(0u64);
+    ///
+    ///     tx.send(5).unwrap();
+    ///
+    ///     let rx = tx.subscribe();
+    ///     assert_eq!(5, *rx.borrow());
+    ///
+    ///     tx.send(10).unwrap();
+    ///     assert_eq!(10, *rx.borrow());
+    /// }
+    /// ```
+    ///
+    /// The most recent message is considered seen by the channel, so this test
+    /// is guaranteed to pass.
+    ///
+    /// ```
+    /// use tokio::sync::watch;
+    /// use tokio::time::Duration;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, _rx) = watch::channel(0u64);
+    ///     tx.send(5).unwrap();
+    ///     let mut rx = tx.subscribe();
+    ///
+    ///     tokio::spawn(async move {
+    ///         // by spawning and sleeping, the message is sent after `main`
+    ///         // hits the call to `changed`.
+    ///         # if false {
+    ///         tokio::time::sleep(Duration::from_millis(10)).await;
+    ///         # }
+    ///         tx.send(100).unwrap();
+    ///     });
+    ///
+    ///     rx.changed().await.unwrap();
+    ///     assert_eq!(100, *rx.borrow());
+    /// }
+    /// ```
+    pub fn subscribe(&self) -> Receiver<T> {
+        let shared = self.shared.clone();
+        let version = shared.state.load().version();
 
-    for watcher in watchers.iter() {
-        // Notify the task
-        watcher.waker.wake();
+        // The CLOSED bit in the state tracks only whether the sender is
+        // dropped, so we do not need to unset it if this reopens the channel.
+        Receiver::from_shared(version, shared)
+    }
+
+    /// Returns the number of receivers that currently exist
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio::sync::watch;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let (tx, rx1) = watch::channel("hello");
+    ///
+    ///     assert_eq!(1, tx.receiver_count());
+    ///
+    ///     let mut _rx2 = rx1.clone();
+    ///
+    ///     assert_eq!(2, tx.receiver_count());
+    /// }
+    /// ```
+    pub fn receiver_count(&self) -> usize {
+        self.shared.ref_count_rx.load(Relaxed)
     }
 }
 
 impl<T> Drop for Sender<T> {
     fn drop(&mut self) {
-        if let Some(shared) = self.shared.upgrade() {
-            shared.version.fetch_or(CLOSED, SeqCst);
-            notify_all(&*shared);
-        }
+        self.shared.state.set_closed();
+        self.shared.notify_rx.notify_waiters();
     }
 }
 
@@ -389,43 +637,83 @@
     }
 }
 
-// ===== impl Shared =====
+#[cfg(all(test, loom))]
+mod tests {
+    use futures::future::FutureExt;
+    use loom::thread;
 
-impl<T> Drop for Shared<T> {
-    fn drop(&mut self) {
-        self.cancel.wake();
-    }
-}
+    // test for https://github.com/tokio-rs/tokio/issues/3168
+    #[test]
+    fn watch_spurious_wakeup() {
+        loom::model(|| {
+            let (send, mut recv) = crate::sync::watch::channel(0i32);
 
-// ===== impl Watcher =====
+            send.send(1).unwrap();
 
-impl Watcher {
-    fn new_version(version: usize) -> Self {
-        Watcher(Arc::new(WatchInner {
-            version: AtomicUsize::new(version),
-            waker: AtomicWaker::new(),
-        }))
-    }
-}
+            let send_thread = thread::spawn(move || {
+                send.send(2).unwrap();
+                send
+            });
 
-impl std::cmp::PartialEq for Watcher {
-    fn eq(&self, other: &Watcher) -> bool {
-        Arc::ptr_eq(&self.0, &other.0)
-    }
-}
+            recv.changed().now_or_never();
+
+            let send = send_thread.join().unwrap();
+            let recv_thread = thread::spawn(move || {
+                recv.changed().now_or_never();
+                recv.changed().now_or_never();
+                recv
+            });
+
+            send.send(3).unwrap();
+
+            let mut recv = recv_thread.join().unwrap();
+            let send_thread = thread::spawn(move || {
+                send.send(2).unwrap();
+            });
 
-impl std::cmp::Eq for Watcher {}
+            recv.changed().now_or_never();
 
-impl std::hash::Hash for Watcher {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        (&*self.0 as *const WatchInner).hash(state)
+            send_thread.join().unwrap();
+        });
     }
-}
 
-impl std::ops::Deref for Watcher {
-    type Target = WatchInner;
+    #[test]
+    fn watch_borrow() {
+        loom::model(|| {
+            let (send, mut recv) = crate::sync::watch::channel(0i32);
+
+            assert!(send.borrow().eq(&0));
+            assert!(recv.borrow().eq(&0));
+
+            send.send(1).unwrap();
+            assert!(send.borrow().eq(&1));
+
+            let send_thread = thread::spawn(move || {
+                send.send(2).unwrap();
+                send
+            });
+
+            recv.changed().now_or_never();
+
+            let send = send_thread.join().unwrap();
+            let recv_thread = thread::spawn(move || {
+                recv.changed().now_or_never();
+                recv.changed().now_or_never();
+                recv
+            });
+
+            send.send(3).unwrap();
+
+            let recv = recv_thread.join().unwrap();
+            assert!(recv.borrow().eq(&3));
+            assert!(send.borrow().eq(&3));
+
+            send.send(2).unwrap();
 
-    fn deref(&self) -> &Self::Target {
-        &self.0
+            thread::spawn(move || {
+                assert!(recv.borrow().eq(&2));
+            });
+            assert!(send.borrow().eq(&2));
+        });
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/blocking.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/blocking.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/blocking.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/blocking.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,23 +1,28 @@
 use crate::task::JoinHandle;
 
-cfg_rt_threaded! {
+cfg_rt_multi_thread! {
     /// Runs the provided blocking function on the current thread without
     /// blocking the executor.
     ///
     /// In general, issuing a blocking call or performing a lot of compute in a
-    /// future without yielding is not okay, as it may prevent the executor from
-    /// driving other futures forward.  This function runs the closure on the
-    /// current thread by having the thread temporarily cease from being a core
-    /// thread, and turns it into a blocking thread. See the [CPU-bound tasks
-    /// and blocking code][blocking] section for more information.
-    ///
-    /// Although this function avoids starving other independently spawned
-    /// tasks, any other code running concurrently in the same task will be
-    /// suspended during the call to `block_in_place`. This can happen e.g. when
-    /// using the [`join!`] macro. To avoid this issue, use [`spawn_blocking`]
-    /// instead.
-    ///
-    /// Note that this function can only be used on the [threaded scheduler].
+    /// future without yielding is problematic, as it may prevent the executor
+    /// from driving other tasks forward. Calling this function informs the
+    /// executor that the currently executing task is about to block the thread,
+    /// so the executor is able to hand off any other tasks it has to a new
+    /// worker thread before that happens. See the [CPU-bound tasks and blocking
+    /// code][blocking] section for more information.
+    ///
+    /// Be aware that although this function avoids starving other independently
+    /// spawned tasks, any other code running concurrently in the same task will
+    /// be suspended during the call to `block_in_place`. This can happen e.g.
+    /// when using the [`join!`] macro. To avoid this issue, use
+    /// [`spawn_blocking`] instead of `block_in_place`.
+    ///
+    /// Note that this function cannot be used within a [`current_thread`] runtime
+    /// because in this case there are no other worker threads to hand off tasks
+    /// to. On the other hand, calling the function outside a runtime is
+    /// allowed. In this case, `block_in_place` just calls the provided closure
+    /// normally.
     ///
     /// Code running behind `block_in_place` cannot be cancelled. When you shut
     /// down the executor, it will wait indefinitely for all blocking operations
@@ -27,7 +32,6 @@
     /// returns.
     ///
     /// [blocking]: ../index.html#cpu-bound-tasks-and-blocking-code
-    /// [threaded scheduler]: fn@crate::runtime::Builder::threaded_scheduler
     /// [`spawn_blocking`]: fn@crate::task::spawn_blocking
     /// [`join!`]: macro@join
     /// [`thread::spawn`]: fn@std::thread::spawn
@@ -44,7 +48,28 @@
     /// });
     /// # }
     /// ```
-    #[cfg_attr(docsrs, doc(cfg(feature = "blocking")))]
+    ///
+    /// Code running inside `block_in_place` may use `block_on` to reenter the
+    /// async context.
+    ///
+    /// ```
+    /// use tokio::task;
+    /// use tokio::runtime::Handle;
+    ///
+    /// # async fn docs() {
+    /// task::block_in_place(move || {
+    ///     Handle::current().block_on(async move {
+    ///         // do something async
+    ///     });
+    /// });
+    /// # }
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// This function panics if called from a [`current_thread`] runtime.
+    ///
+    /// [`current_thread`]: fn@crate::runtime::Builder::new_current_thread
     pub fn block_in_place<F, R>(f: F) -> R
     where
         F: FnOnce() -> R,
@@ -53,44 +78,43 @@
     }
 }
 
-cfg_blocking! {
+cfg_rt! {
     /// Runs the provided closure on a thread where blocking is acceptable.
     ///
     /// In general, issuing a blocking call or performing a lot of compute in a
-    /// future without yielding is not okay, as it may prevent the executor from
-    /// driving other futures forward. This function runs the provided closure
-    /// on a thread dedicated to blocking operations. See the [CPU-bound tasks
-    /// and blocking code][blocking] section for more information.
-    ///
-    /// Tokio will spawn more blocking threads when they are requested through
-    /// this function until the upper limit configured on the [`Builder`] is
-    /// reached.  This limit is very large by default, because `spawn_blocking` is
-    /// often used for various kinds of IO operations that cannot be performed
-    /// asynchronously. When you run CPU-bound code using `spawn_blocking`, you
-    /// should keep this large upper limit in mind; to run your CPU-bound
-    /// computations on only a few threads, you should use a separate thread
-    /// pool such as [rayon] rather than configuring the number of blocking
-    /// threads.
-    ///
-    /// This function is intended for non-async operations that eventually
-    /// finish on their own. If you want to spawn an ordinary thread, you should
-    /// use [`thread::spawn`] instead.
-    ///
-    /// Closures spawned using `spawn_blocking` cannot be cancelled. When you
-    /// shut down the executor, it will wait indefinitely for all blocking
-    /// operations to finish. You can use [`shutdown_timeout`] to stop waiting
-    /// for them after a certain timeout. Be aware that this will still not
-    /// cancel the tasks — they are simply allowed to keep running after the
-    /// method returns.
+    /// future without yielding is problematic, as it may prevent the executor from
+    /// driving other futures forward. This function runs the provided closure on a
+    /// thread dedicated to blocking operations. See the [CPU-bound tasks and
+    /// blocking code][blocking] section for more information.
+    ///
+    /// Tokio will spawn more blocking threads when they are requested through this
+    /// function until the upper limit configured on the [`Builder`] is reached.
+    /// After reaching the upper limit, the tasks are put in a queue.
+    /// The thread limit is very large by default, because `spawn_blocking` is often
+    /// used for various kinds of IO operations that cannot be performed
+    /// asynchronously.  When you run CPU-bound code using `spawn_blocking`, you
+    /// should keep this large upper limit in mind. When running many CPU-bound
+    /// computations, a semaphore or some other synchronization primitive should be
+    /// used to limit the number of computation executed in parallel. Specialized
+    /// CPU-bound executors, such as [rayon], may also be a good fit.
+    ///
+    /// This function is intended for non-async operations that eventually finish on
+    /// their own. If you want to spawn an ordinary thread, you should use
+    /// [`thread::spawn`] instead.
+    ///
+    /// Closures spawned using `spawn_blocking` cannot be cancelled. When you shut
+    /// down the executor, it will wait indefinitely for all blocking operations to
+    /// finish. You can use [`shutdown_timeout`] to stop waiting for them after a
+    /// certain timeout. Be aware that this will still not cancel the tasks — they
+    /// are simply allowed to keep running after the method returns.
     ///
-    /// Note that if you are using the [basic scheduler], this function will
+    /// Note that if you are using the single threaded runtime, this function will
     /// still spawn additional threads for blocking operations. The basic
     /// scheduler's single thread is only used for asynchronous code.
     ///
     /// [`Builder`]: struct@crate::runtime::Builder
     /// [blocking]: ../index.html#cpu-bound-tasks-and-blocking-code
     /// [rayon]: https://docs.rs/rayon
-    /// [basic scheduler]: fn@crate::runtime::Builder::basic_scheduler
     /// [`thread::spawn`]: fn@std::thread::spawn
     /// [`shutdown_timeout`]: fn@crate::runtime::Runtime::shutdown_timeout
     ///
@@ -109,24 +133,12 @@
     /// # Ok(())
     /// # }
     /// ```
+    #[cfg_attr(tokio_track_caller, track_caller)]
     pub fn spawn_blocking<F, R>(f: F) -> JoinHandle<R>
     where
         F: FnOnce() -> R + Send + 'static,
         R: Send + 'static,
     {
-        #[cfg(feature = "tracing")]
-        let f = {
-            let span = tracing::trace_span!(
-                target: "tokio::task",
-                "task",
-                kind = %"blocking",
-                function = %std::any::type_name::<F>(),
-            );
-            move || {
-                let _g = span.enter();
-                f()
-            }
-        };
         crate::runtime::spawn_blocking(f)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/builder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/builder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/builder.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/builder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,105 @@
+#![allow(unreachable_pub)]
+use crate::util::error::CONTEXT_MISSING_ERROR;
+use crate::{runtime::context, task::JoinHandle};
+use std::future::Future;
+
+/// Factory which is used to configure the properties of a new task.
+///
+/// Methods can be chained in order to configure it.
+///
+/// Currently, there is only one configuration option:
+///
+/// - [`name`], which specifies an associated name for
+///   the task
+///
+/// There are three types of task that can be spawned from a Builder:
+/// - [`spawn_local`] for executing futures on the current thread
+/// - [`spawn`] for executing [`Send`] futures on the runtime
+/// - [`spawn_blocking`] for executing blocking code in the
+///   blocking thread pool.
+///
+/// ## Example
+///
+/// ```no_run
+/// use tokio::net::{TcpListener, TcpStream};
+///
+/// use std::io;
+///
+/// async fn process(socket: TcpStream) {
+///     // ...
+/// # drop(socket);
+/// }
+///
+/// #[tokio::main]
+/// async fn main() -> io::Result<()> {
+///     let listener = TcpListener::bind("127.0.0.1:8080").await?;
+///
+///     loop {
+///         let (socket, _) = listener.accept().await?;
+///
+///         tokio::task::Builder::new()
+///             .name("tcp connection handler")
+///             .spawn(async move {
+///                 // Process each socket concurrently.
+///                 process(socket).await
+///             });
+///     }
+/// }
+/// ```
+#[derive(Default, Debug)]
+pub struct Builder<'a> {
+    name: Option<&'a str>,
+}
+
+impl<'a> Builder<'a> {
+    /// Creates a new task builder.
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Assigns a name to the task which will be spawned.
+    pub fn name(&self, name: &'a str) -> Self {
+        Self { name: Some(name) }
+    }
+
+    /// Spawns a task on the executor.
+    ///
+    /// See [`task::spawn`](crate::task::spawn) for
+    /// more details.
+    #[cfg_attr(tokio_track_caller, track_caller)]
+    pub fn spawn<Fut>(self, future: Fut) -> JoinHandle<Fut::Output>
+    where
+        Fut: Future + Send + 'static,
+        Fut::Output: Send + 'static,
+    {
+        super::spawn::spawn_inner(future, self.name)
+    }
+
+    /// Spawns a task on the current thread.
+    ///
+    /// See [`task::spawn_local`](crate::task::spawn_local)
+    /// for more details.
+    #[cfg_attr(tokio_track_caller, track_caller)]
+    pub fn spawn_local<Fut>(self, future: Fut) -> JoinHandle<Fut::Output>
+    where
+        Fut: Future + 'static,
+        Fut::Output: 'static,
+    {
+        super::local::spawn_local_inner(future, self.name)
+    }
+
+    /// Spawns blocking code on the blocking threadpool.
+    ///
+    /// See [`task::spawn_blocking`](crate::task::spawn_blocking)
+    /// for more details.
+    #[cfg_attr(tokio_track_caller, track_caller)]
+    pub fn spawn_blocking<Function, Output>(self, function: Function) -> JoinHandle<Output>
+    where
+        Function: FnOnce() -> Output + Send + 'static,
+        Output: Send + 'static,
+    {
+        context::current()
+            .expect(CONTEXT_MISSING_ERROR)
+            .spawn_blocking_inner(function, self.name)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/local.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/local.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/local.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/local.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,20 @@
 //! Runs `!Send` futures on the current thread.
-use crate::runtime::task::{self, JoinHandle, Task};
+use crate::loom::sync::{Arc, Mutex};
+use crate::runtime::task::{self, JoinHandle, LocalOwnedTasks, Task};
 use crate::sync::AtomicWaker;
-use crate::util::linked_list::LinkedList;
+use crate::util::VecDequeCell;
 
-use std::cell::{Cell, RefCell};
+use std::cell::Cell;
 use std::collections::VecDeque;
 use std::fmt;
 use std::future::Future;
 use std::marker::PhantomData;
 use std::pin::Pin;
-use std::sync::{Arc, Mutex};
 use std::task::Poll;
 
 use pin_project_lite::pin_project;
 
-cfg_rt_util! {
+cfg_rt! {
     /// A set of tasks which are executed on the same thread.
     ///
     /// In some cases, it is necessary to run one or more futures that do not
@@ -43,10 +43,13 @@
     ///     }).await.unwrap();
     /// }
     /// ```
-    /// In order to spawn `!Send` futures, we can use a local task set to
-    /// schedule them on the thread calling [`Runtime::block_on`]. When running
-    /// inside of the local task set, we can use [`task::spawn_local`], which can
-    /// spawn `!Send` futures. For example:
+    ///
+    /// # Use with `run_until`
+    ///
+    /// To spawn `!Send` futures, we can use a local task set to schedule them
+    /// on the thread calling [`Runtime::block_on`]. When running inside of the
+    /// local task set, we can use [`task::spawn_local`], which can spawn
+    /// `!Send` futures. For example:
     ///
     /// ```rust
     /// use std::rc::Rc;
@@ -71,6 +74,9 @@
     ///     }).await;
     /// }
     /// ```
+    /// **Note:** The `run_until` method can only be used in `#[tokio::main]`,
+    /// `#[tokio::test]` or directly inside a call to [`Runtime::block_on`]. It
+    /// cannot be used inside a task spawned with `tokio::spawn`.
     ///
     /// ## Awaiting a `LocalSet`
     ///
@@ -95,7 +101,7 @@
     ///     });
     ///
     ///     local.spawn_local(async move {
-    ///         time::delay_for(time::Duration::from_millis(100)).await;
+    ///         time::sleep(time::Duration::from_millis(100)).await;
     ///         println!("goodbye {}", unsend_data)
     ///     });
     ///
@@ -104,11 +110,106 @@
     ///     local.await;
     /// }
     /// ```
+    /// **Note:** Awaiting a `LocalSet` can only be done inside
+    /// `#[tokio::main]`, `#[tokio::test]` or directly inside a call to
+    /// [`Runtime::block_on`]. It cannot be used inside a task spawned with
+    /// `tokio::spawn`.
+    ///
+    /// ## Use inside `tokio::spawn`
+    ///
+    /// The two methods mentioned above cannot be used inside `tokio::spawn`, so
+    /// to spawn `!Send` futures from inside `tokio::spawn`, we need to do
+    /// something else. The solution is to create the `LocalSet` somewhere else,
+    /// and communicate with it using an [`mpsc`] channel.
+    ///
+    /// The following example puts the `LocalSet` inside a new thread.
+    /// ```
+    /// use tokio::runtime::Builder;
+    /// use tokio::sync::{mpsc, oneshot};
+    /// use tokio::task::LocalSet;
+    ///
+    /// // This struct describes the task you want to spawn. Here we include
+    /// // some simple examples. The oneshot channel allows sending a response
+    /// // to the spawner.
+    /// #[derive(Debug)]
+    /// enum Task {
+    ///     PrintNumber(u32),
+    ///     AddOne(u32, oneshot::Sender<u32>),
+    /// }
+    ///
+    /// #[derive(Clone)]
+    /// struct LocalSpawner {
+    ///    send: mpsc::UnboundedSender<Task>,
+    /// }
+    ///
+    /// impl LocalSpawner {
+    ///     pub fn new() -> Self {
+    ///         let (send, mut recv) = mpsc::unbounded_channel();
+    ///
+    ///         let rt = Builder::new_current_thread()
+    ///             .enable_all()
+    ///             .build()
+    ///             .unwrap();
+    ///
+    ///         std::thread::spawn(move || {
+    ///             let local = LocalSet::new();
+    ///
+    ///             local.spawn_local(async move {
+    ///                 while let Some(new_task) = recv.recv().await {
+    ///                     tokio::task::spawn_local(run_task(new_task));
+    ///                 }
+    ///                 // If the while loop returns, then all the LocalSpawner
+    ///                 // objects have have been dropped.
+    ///             });
+    ///
+    ///             // This will return once all senders are dropped and all
+    ///             // spawned tasks have returned.
+    ///             rt.block_on(local);
+    ///         });
+    ///
+    ///         Self {
+    ///             send,
+    ///         }
+    ///     }
+    ///
+    ///     pub fn spawn(&self, task: Task) {
+    ///         self.send.send(task).expect("Thread with LocalSet has shut down.");
+    ///     }
+    /// }
+    ///
+    /// // This task may do !Send stuff. We use printing a number as an example,
+    /// // but it could be anything.
+    /// //
+    /// // The Task struct is an enum to support spawning many different kinds
+    /// // of operations.
+    /// async fn run_task(task: Task) {
+    ///     match task {
+    ///         Task::PrintNumber(n) => {
+    ///             println!("{}", n);
+    ///         },
+    ///         Task::AddOne(n, response) => {
+    ///             // We ignore failures to send the response.
+    ///             let _ = response.send(n + 1);
+    ///         },
+    ///     }
+    /// }
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let spawner = LocalSpawner::new();
+    ///
+    ///     let (send, response) = oneshot::channel();
+    ///     spawner.spawn(Task::AddOne(10, send));
+    ///     let eleven = response.await.unwrap();
+    ///     assert_eq!(eleven, 11);
+    /// }
+    /// ```
     ///
     /// [`Send`]: trait@std::marker::Send
     /// [local task set]: struct@LocalSet
     /// [`Runtime::block_on`]: method@crate::runtime::Runtime::block_on
     /// [`task::spawn_local`]: fn@spawn_local
+    /// [`mpsc`]: mod@crate::sync::mpsc
     pub struct LocalSet {
         /// Current scheduler tick
         tick: Cell<u8>,
@@ -123,25 +224,20 @@
 
 /// State available from the thread-local
 struct Context {
-    /// Owned task set and local run queue
-    tasks: RefCell<Tasks>,
-
-    /// State shared between threads.
-    shared: Arc<Shared>,
-}
-
-struct Tasks {
     /// Collection of all active tasks spawned onto this executor.
-    owned: LinkedList<Task<Arc<Shared>>>,
+    owned: LocalOwnedTasks<Arc<Shared>>,
 
     /// Local run queue sender and receiver.
-    queue: VecDeque<task::Notified<Arc<Shared>>>,
+    queue: VecDequeCell<task::Notified<Arc<Shared>>>,
+
+    /// State shared between threads.
+    shared: Arc<Shared>,
 }
 
 /// LocalSet state shared between threads.
 struct Shared {
     /// Remote run queue sender
-    queue: Mutex<VecDeque<task::Notified<Arc<Shared>>>>,
+    queue: Mutex<Option<VecDeque<task::Notified<Arc<Shared>>>>>,
 
     /// Wake the `LocalSet` task
     waker: AtomicWaker,
@@ -158,7 +254,7 @@
 
 scoped_thread_local!(static CURRENT: Context);
 
-cfg_rt_util! {
+cfg_rt! {
     /// Spawns a `!Send` future on the local task set.
     ///
     /// The spawned future will be run on the same thread that called `spawn_local.`
@@ -190,20 +286,30 @@
     ///     }).await;
     /// }
     /// ```
+    #[cfg_attr(tokio_track_caller, track_caller)]
     pub fn spawn_local<F>(future: F) -> JoinHandle<F::Output>
     where
         F: Future + 'static,
         F::Output: 'static,
     {
-        let future = crate::util::trace::task(future, "local");
+        spawn_local_inner(future, None)
+    }
+
+    pub(super) fn spawn_local_inner<F>(future: F, name: Option<&str>) -> JoinHandle<F::Output>
+    where F: Future + 'static,
+          F::Output: 'static
+    {
+        let future = crate::util::trace::task(future, "local", name);
         CURRENT.with(|maybe_cx| {
             let cx = maybe_cx
                 .expect("`spawn_local` called from outside of a `task::LocalSet`");
 
-            // Safety: Tasks are only polled and dropped from the thread that
-            // spawns them.
-            let (task, handle) = unsafe { task::joinable_local(future) };
-            cx.tasks.borrow_mut().queue.push_back(task);
+            let (handle, notified) = cx.owned.bind(future, cx.shared.clone());
+
+            if let Some(notified) = notified {
+                cx.shared.schedule(notified);
+            }
+
             handle
         })
     }
@@ -224,12 +330,10 @@
         LocalSet {
             tick: Cell::new(0),
             context: Context {
-                tasks: RefCell::new(Tasks {
-                    owned: LinkedList::new(),
-                    queue: VecDeque::with_capacity(INITIAL_CAPACITY),
-                }),
+                owned: LocalOwnedTasks::new(),
+                queue: VecDequeCell::with_capacity(INITIAL_CAPACITY),
                 shared: Arc::new(Shared {
-                    queue: Mutex::new(VecDeque::with_capacity(INITIAL_CAPACITY)),
+                    queue: Mutex::new(Some(VecDeque::with_capacity(INITIAL_CAPACITY))),
                     waker: AtomicWaker::new(),
                 }),
             },
@@ -273,14 +377,21 @@
     /// }
     /// ```
     /// [`spawn_local`]: fn@spawn_local
+    #[cfg_attr(tokio_track_caller, track_caller)]
     pub fn spawn_local<F>(&self, future: F) -> JoinHandle<F::Output>
     where
         F: Future + 'static,
         F::Output: 'static,
     {
-        let future = crate::util::trace::task(future, "local");
-        let (task, handle) = unsafe { task::joinable_local(future) };
-        self.context.tasks.borrow_mut().queue.push_back(task);
+        let future = crate::util::trace::task(future, "local", None);
+
+        let (handle, notified) = self.context.owned.bind(future, self.context.shared.clone());
+
+        if let Some(notified) = notified {
+            self.context.shared.schedule(notified);
+        }
+
+        self.context.shared.waker.wake();
         handle
     }
 
@@ -312,9 +423,9 @@
     /// use tokio::runtime::Runtime;
     /// use tokio::task;
     ///
-    /// let mut rt = Runtime::new().unwrap();
+    /// let rt  = Runtime::new().unwrap();
     /// let local = task::LocalSet::new();
-    /// local.block_on(&mut rt, async {
+    /// local.block_on(&rt, async {
     ///     let join = task::spawn_local(async {
     ///         let blocking_result = task::block_in_place(|| {
     ///             // ...
@@ -329,9 +440,9 @@
     /// use tokio::runtime::Runtime;
     /// use tokio::task;
     ///
-    /// let mut rt = Runtime::new().unwrap();
+    /// let rt  = Runtime::new().unwrap();
     /// let local = task::LocalSet::new();
-    /// local.block_on(&mut rt, async {
+    /// local.block_on(&rt, async {
     ///     let join = task::spawn_local(async {
     ///         let blocking_result = task::spawn_blocking(|| {
     ///             // ...
@@ -346,7 +457,9 @@
     /// [`Runtime::block_on`]: method@crate::runtime::Runtime::block_on
     /// [in-place blocking]: fn@crate::task::block_in_place
     /// [`spawn_blocking`]: fn@crate::task::spawn_blocking
-    pub fn block_on<F>(&self, rt: &mut crate::runtime::Runtime, future: F) -> F::Output
+    #[cfg(feature = "rt")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rt")))]
+    pub fn block_on<F>(&self, rt: &crate::runtime::Runtime, future: F) -> F::Output
     where
         F: Future,
     {
@@ -416,26 +529,30 @@
         true
     }
 
-    fn next_task(&self) -> Option<task::Notified<Arc<Shared>>> {
+    fn next_task(&self) -> Option<task::LocalNotified<Arc<Shared>>> {
         let tick = self.tick.get();
         self.tick.set(tick.wrapping_add(1));
 
-        if tick % REMOTE_FIRST_INTERVAL == 0 {
+        let task = if tick % REMOTE_FIRST_INTERVAL == 0 {
             self.context
                 .shared
                 .queue
                 .lock()
-                .unwrap()
-                .pop_front()
-                .or_else(|| self.context.tasks.borrow_mut().queue.pop_front())
+                .as_mut()
+                .and_then(|queue| queue.pop_front())
+                .or_else(|| self.context.queue.pop_front())
         } else {
-            self.context
-                .tasks
-                .borrow_mut()
-                .queue
-                .pop_front()
-                .or_else(|| self.context.shared.queue.lock().unwrap().pop_front())
-        }
+            self.context.queue.pop_front().or_else(|| {
+                self.context
+                    .shared
+                    .queue
+                    .lock()
+                    .as_mut()
+                    .and_then(|queue| queue.pop_front())
+            })
+        };
+
+        task.map(|task| self.context.owned.assert_owner(task))
     }
 
     fn with<T>(&self, f: impl FnOnce() -> T) -> T {
@@ -461,7 +578,7 @@
             // there are still tasks remaining in the run queue.
             cx.waker().wake_by_ref();
             Poll::Pending
-        } else if self.context.tasks.borrow().owned.is_empty() {
+        } else if self.context.owned.is_empty() {
             // If the scheduler has no remaining futures, we're done!
             Poll::Ready(())
         } else {
@@ -482,27 +599,24 @@
 impl Drop for LocalSet {
     fn drop(&mut self) {
         self.with(|| {
-            // Loop required here to ensure borrow is dropped between iterations
-            #[allow(clippy::while_let_loop)]
-            loop {
-                let task = match self.context.tasks.borrow_mut().owned.pop_back() {
-                    Some(task) => task,
-                    None => break,
-                };
-
-                // Safety: same as `run_unchecked`.
-                task.shutdown();
+            // Shut down all tasks in the LocalOwnedTasks and close it to
+            // prevent new tasks from ever being added.
+            self.context.owned.close_and_shutdown_all();
+
+            // We already called shutdown on all tasks above, so there is no
+            // need to call shutdown.
+            for task in self.context.queue.take() {
+                drop(task);
             }
 
-            for task in self.context.tasks.borrow_mut().queue.drain(..) {
-                task.shutdown();
+            // Take the queue from the Shared object to prevent pushing
+            // notifications to it in the future.
+            let queue = self.context.shared.queue.lock().take().unwrap();
+            for task in queue {
+                drop(task);
             }
 
-            for task in self.context.shared.queue.lock().unwrap().drain(..) {
-                task.shutdown();
-            }
-
-            assert!(self.context.tasks.borrow().owned.is_empty());
+            assert!(self.context.owned.is_empty());
         });
     }
 }
@@ -545,41 +659,34 @@
     fn schedule(&self, task: task::Notified<Arc<Self>>) {
         CURRENT.with(|maybe_cx| match maybe_cx {
             Some(cx) if cx.shared.ptr_eq(self) => {
-                cx.tasks.borrow_mut().queue.push_back(task);
+                cx.queue.push_back(task);
             }
             _ => {
-                self.queue.lock().unwrap().push_back(task);
-                self.waker.wake();
+                // First check whether the queue is still there (if not, the
+                // LocalSet is dropped). Then push to it if so, and if not,
+                // do nothing.
+                let mut lock = self.queue.lock();
+
+                if let Some(queue) = lock.as_mut() {
+                    queue.push_back(task);
+                    drop(lock);
+                    self.waker.wake();
+                }
             }
         });
     }
 
     fn ptr_eq(&self, other: &Shared) -> bool {
-        self as *const _ == other as *const _
+        std::ptr::eq(self, other)
     }
 }
 
 impl task::Schedule for Arc<Shared> {
-    fn bind(task: Task<Self>) -> Arc<Shared> {
-        CURRENT.with(|maybe_cx| {
-            let cx = maybe_cx.expect("scheduler context missing");
-            cx.tasks.borrow_mut().owned.push_front(task);
-            cx.shared.clone()
-        })
-    }
-
     fn release(&self, task: &Task<Self>) -> Option<Task<Self>> {
-        use std::ptr::NonNull;
-
         CURRENT.with(|maybe_cx| {
             let cx = maybe_cx.expect("scheduler context missing");
-
             assert!(cx.shared.ptr_eq(self));
-
-            let ptr = NonNull::from(task.header());
-            // safety: task must be contained by list. It is inserted into the
-            // list in `bind`.
-            unsafe { cx.tasks.borrow_mut().owned.remove(ptr) }
+            cx.owned.remove(task)
         })
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -86,7 +86,7 @@
 //! ```
 //!
 //! Again, like `std::thread`'s [`JoinHandle` type][thread_join], if the spawned
-//! task panics, awaiting its `JoinHandle` will return a [`JoinError`]`. For
+//! task panics, awaiting its `JoinHandle` will return a [`JoinError`]. For
 //! example:
 //!
 //! ```
@@ -102,7 +102,7 @@
 //! # }
 //! ```
 //!
-//! `spawn`, `JoinHandle`, and `JoinError` are present when the "rt-core"
+//! `spawn`, `JoinHandle`, and `JoinError` are present when the "rt"
 //! feature flag is enabled.
 //!
 //! [`task::spawn`]: crate::task::spawn()
@@ -122,6 +122,11 @@
 //! Instead, Tokio provides two APIs for running blocking operations in an
 //! asynchronous context: [`task::spawn_blocking`] and [`task::block_in_place`].
 //!
+//! Be aware that if you call a non-async method from async code, that non-async
+//! method is still inside the asynchronous context, so you should also avoid
+//! blocking operations there. This includes destructors of objects destroyed in
+//! async code.
+//!
 //! #### spawn_blocking
 //!
 //! The `task::spawn_blocking` function is similar to the `task::spawn` function
@@ -159,7 +164,7 @@
 //!
 //! #### block_in_place
 //!
-//! When using the [threaded runtime][rt-threaded], the [`task::block_in_place`]
+//! When using the [multi-threaded runtime][rt-multi-thread], the [`task::block_in_place`]
 //! function is also available. Like `task::spawn_blocking`, this function
 //! allows running a blocking operation from an asynchronous context. Unlike
 //! `spawn_blocking`, however, `block_in_place` works by transitioning the
@@ -209,34 +214,99 @@
 //! # }
 //! ```
 //!
+//! ### Cooperative scheduling
+//!
+//! A single call to [`poll`] on a top-level task may potentially do a lot of
+//! work before it returns `Poll::Pending`. If a task runs for a long period of
+//! time without yielding back to the executor, it can starve other tasks
+//! waiting on that executor to execute them, or drive underlying resources.
+//! Since Rust does not have a runtime, it is difficult to forcibly preempt a
+//! long-running task. Instead, this module provides an opt-in mechanism for
+//! futures to collaborate with the executor to avoid starvation.
+//!
+//! Consider a future like this one:
+//!
+//! ```
+//! # use tokio_stream::{Stream, StreamExt};
+//! async fn drop_all<I: Stream + Unpin>(mut input: I) {
+//!     while let Some(_) = input.next().await {}
+//! }
+//! ```
+//!
+//! It may look harmless, but consider what happens under heavy load if the
+//! input stream is _always_ ready. If we spawn `drop_all`, the task will never
+//! yield, and will starve other tasks and resources on the same executor.
+//!
+//! To account for this, Tokio has explicit yield points in a number of library
+//! functions, which force tasks to return to the executor periodically.
+//!
+//!
+//! #### unconstrained
+//!
+//! If necessary, [`task::unconstrained`] lets you opt out a future of Tokio's cooperative
+//! scheduling. When a future is wrapped with `unconstrained`, it will never be forced to yield to
+//! Tokio. For example:
+//!
+//! ```
+//! # #[tokio::main]
+//! # async fn main() {
+//! use tokio::{task, sync::mpsc};
+//!
+//! let fut = async {
+//!     let (tx, mut rx) = mpsc::unbounded_channel();
+//!
+//!     for i in 0..1000 {
+//!         let _ = tx.send(());
+//!         // This will always be ready. If coop was in effect, this code would be forced to yield
+//!         // periodically. However, if left unconstrained, then this code will never yield.
+//!         rx.recv().await;
+//!     }
+//! };
+//!
+//! task::unconstrained(fut).await;
+//! # }
+//! ```
+//!
 //! [`task::spawn_blocking`]: crate::task::spawn_blocking
 //! [`task::block_in_place`]: crate::task::block_in_place
-//! [rt-threaded]: ../runtime/index.html#threaded-scheduler
+//! [rt-multi-thread]: ../runtime/index.html#threaded-scheduler
 //! [`task::yield_now`]: crate::task::yield_now()
 //! [`thread::yield_now`]: std::thread::yield_now
-cfg_blocking! {
-    mod blocking;
-    pub use blocking::spawn_blocking;
-
-    cfg_rt_threaded! {
-        pub use blocking::block_in_place;
-    }
-}
+//! [`task::unconstrained`]: crate::task::unconstrained()
+//! [`poll`]: method@std::future::Future::poll
 
-cfg_rt_core! {
+cfg_rt! {
     pub use crate::runtime::task::{JoinError, JoinHandle};
 
+    mod blocking;
+    pub use blocking::spawn_blocking;
+
     mod spawn;
     pub use spawn::spawn;
 
+    cfg_rt_multi_thread! {
+        pub use blocking::block_in_place;
+    }
+
     mod yield_now;
     pub use yield_now::yield_now;
-}
 
-cfg_rt_util! {
     mod local;
     pub use local::{spawn_local, LocalSet};
 
     mod task_local;
     pub use task_local::LocalKey;
+
+    mod unconstrained;
+    pub use unconstrained::{unconstrained, Unconstrained};
+
+    cfg_trace! {
+        mod builder;
+        pub use builder::Builder;
+    }
+
+    /// Task-related futures.
+    pub mod futures {
+        pub use super::task_local::TaskLocalFuture;
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/spawn.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/spawn.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/spawn.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/spawn.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,9 +1,8 @@
-use crate::runtime;
-use crate::task::JoinHandle;
+use crate::{task::JoinHandle, util::error::CONTEXT_MISSING_ERROR};
 
 use std::future::Future;
 
-doc_rt_core! {
+cfg_rt! {
     /// Spawns a new asynchronous task, returning a
     /// [`JoinHandle`](super::JoinHandle) for it.
     ///
@@ -18,7 +17,7 @@
     ///
     /// This function must be called from the context of a Tokio runtime. Tasks running on
     /// the Tokio runtime are always inside its context, but you can also enter the context
-    /// using the [`Handle::enter`](crate::runtime::Handle::enter()) method.
+    /// using the [`Runtime::enter`](crate::runtime::Runtime::enter()) method.
     ///
     /// # Examples
     ///
@@ -37,7 +36,7 @@
     ///
     /// #[tokio::main]
     /// async fn main() -> io::Result<()> {
-    ///     let mut listener = TcpListener::bind("127.0.0.1:8080").await?;
+    ///     let listener = TcpListener::bind("127.0.0.1:8080").await?;
     ///
     ///     loop {
     ///         let (socket, _) = listener.accept().await?;
@@ -122,14 +121,29 @@
     /// ```text
     /// error[E0391]: cycle detected when processing `main`
     /// ```
-    pub fn spawn<T>(task: T) -> JoinHandle<T::Output>
+    #[cfg_attr(tokio_track_caller, track_caller)]
+    pub fn spawn<T>(future: T) -> JoinHandle<T::Output>
     where
         T: Future + Send + 'static,
         T::Output: Send + 'static,
     {
-        let spawn_handle = runtime::context::spawn_handle()
-        .expect("must be called from the context of Tokio runtime configured with either `basic_scheduler` or `threaded_scheduler`");
-        let task = crate::util::trace::task(task, "task");
+        // preventing stack overflows on debug mode, by quickly sending the
+        // task to the heap.
+        if cfg!(debug_assertions) && std::mem::size_of::<T>() > 2048 {
+            spawn_inner(Box::pin(future), None)
+        } else {
+            spawn_inner(future, None)
+        }
+    }
+
+    #[cfg_attr(tokio_track_caller, track_caller)]
+    pub(super) fn spawn_inner<T>(future: T, name: Option<&str>) -> JoinHandle<T::Output>
+    where
+        T: Future + Send + 'static,
+        T::Output: Send + 'static,
+    {
+        let spawn_handle = crate::runtime::context::spawn_handle().expect(CONTEXT_MISSING_ERROR);
+        let task = crate::util::trace::task(future, "task", name);
         spawn_handle.spawn(task)
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/task_local.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/task_local.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/task_local.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/task_local.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,7 @@
 use std::cell::RefCell;
 use std::error::Error;
 use std::future::Future;
+use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::{fmt, thread};
@@ -31,6 +32,7 @@
 ///
 /// [`tokio::task::LocalKey`]: struct@crate::task::LocalKey
 #[macro_export]
+#[cfg_attr(docsrs, doc(cfg(feature = "rt")))]
 macro_rules! task_local {
      // empty (base case for the recursion)
     () => {};
@@ -90,6 +92,7 @@
 /// # }
 /// ```
 /// [`std::thread::LocalKey`]: struct@std::thread::LocalKey
+#[cfg_attr(docsrs, doc(cfg(feature = "rt")))]
 pub struct LocalKey<T: 'static> {
     #[doc(hidden)]
     pub inner: thread::LocalKey<RefCell<Option<T>>>,
@@ -113,16 +116,47 @@
     /// }).await;
     /// # }
     /// ```
-    pub async fn scope<F>(&'static self, value: T, f: F) -> F::Output
+    pub fn scope<F>(&'static self, value: T, f: F) -> TaskLocalFuture<T, F>
     where
         F: Future,
     {
         TaskLocalFuture {
-            local: &self,
+            local: self,
             slot: Some(value),
             future: f,
+            _pinned: PhantomPinned,
         }
-        .await
+    }
+
+    /// Sets a value `T` as the task-local value for the closure `F`.
+    ///
+    /// On completion of `scope`, the task-local will be dropped.
+    ///
+    /// ### Examples
+    ///
+    /// ```
+    /// # async fn dox() {
+    /// tokio::task_local! {
+    ///     static NUMBER: u32;
+    /// }
+    ///
+    /// NUMBER.sync_scope(1, || {
+    ///     println!("task local value: {}", NUMBER.get());
+    /// });
+    /// # }
+    /// ```
+    pub fn sync_scope<F, R>(&'static self, value: T, f: F) -> R
+    where
+        F: FnOnce() -> R,
+    {
+        let scope = TaskLocalFuture {
+            local: self,
+            slot: Some(value),
+            future: (),
+            _pinned: PhantomPinned,
+        };
+        crate::pin!(scope);
+        scope.with_task(|_| f())
     }
 
     /// Accesses the current task-local and runs the provided closure.
@@ -143,7 +177,7 @@
 
     /// Accesses the current task-local and runs the provided closure.
     ///
-    /// If the task-local with the accociated key is not present, this
+    /// If the task-local with the associated key is not present, this
     /// method will return an `AccessError`. For a panicking variant,
     /// see `with`.
     pub fn try_with<F, R>(&'static self, f: F) -> Result<R, AccessError>
@@ -175,18 +209,42 @@
 }
 
 pin_project! {
-    struct TaskLocalFuture<T: StaticLifetime, F> {
+    /// A future that sets a value `T` of a task local for the future `F` during
+    /// its execution.
+    ///
+    /// The value of the task-local must be `'static` and will be dropped on the
+    /// completion of the future.
+    ///
+    /// Created by the function [`LocalKey::scope`](self::LocalKey::scope).
+    ///
+    /// ### Examples
+    ///
+    /// ```
+    /// # async fn dox() {
+    /// tokio::task_local! {
+    ///     static NUMBER: u32;
+    /// }
+    ///
+    /// NUMBER.scope(1, async move {
+    ///     println!("task local value: {}", NUMBER.get());
+    /// }).await;
+    /// # }
+    /// ```
+    pub struct TaskLocalFuture<T, F>
+    where
+        T: 'static
+    {
         local: &'static LocalKey<T>,
         slot: Option<T>,
         #[pin]
         future: F,
+        #[pin]
+        _pinned: PhantomPinned,
     }
 }
 
-impl<T: 'static, F: Future> Future for TaskLocalFuture<T, F> {
-    type Output = F::Output;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+impl<T: 'static, F> TaskLocalFuture<T, F> {
+    fn with_task<F2: FnOnce(Pin<&mut F>) -> R, R>(self: Pin<&mut Self>, f: F2) -> R {
         struct Guard<'a, T: 'static> {
             local: &'static LocalKey<T>,
             slot: &'a mut Option<T>,
@@ -211,13 +269,17 @@
             local: *project.local,
         };
 
-        project.future.poll(cx)
+        f(project.future)
     }
 }
 
-// Required to make `pin_project` happy.
-trait StaticLifetime: 'static {}
-impl<T: 'static> StaticLifetime for T {}
+impl<T: 'static, F: Future> Future for TaskLocalFuture<T, F> {
+    type Output = F::Output;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        self.with_task(|f| f.poll(cx))
+    }
+}
 
 /// An error returned by [`LocalKey::try_with`](method@LocalKey::try_with).
 #[derive(Clone, Copy, Eq, PartialEq)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/unconstrained.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/unconstrained.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/unconstrained.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/unconstrained.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+use pin_project_lite::pin_project;
+use std::future::Future;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+pin_project! {
+    /// Future for the [`unconstrained`](unconstrained) method.
+    #[cfg_attr(docsrs, doc(cfg(feature = "rt")))]
+    #[must_use = "Unconstrained does nothing unless polled"]
+    pub struct Unconstrained<F> {
+        #[pin]
+        inner: F,
+    }
+}
+
+impl<F> Future for Unconstrained<F>
+where
+    F: Future,
+{
+    type Output = <F as Future>::Output;
+
+    cfg_coop! {
+        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            let inner = self.project().inner;
+            crate::coop::with_unconstrained(|| inner.poll(cx))
+        }
+    }
+
+    cfg_not_coop! {
+        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            let inner = self.project().inner;
+            inner.poll(cx)
+        }
+    }
+}
+
+/// Turn off cooperative scheduling for a future. The future will never be forced to yield by
+/// Tokio. Using this exposes your service to starvation if the unconstrained future never yields
+/// otherwise.
+///
+/// See also the usage example in the [task module](index.html#unconstrained).
+#[cfg_attr(docsrs, doc(cfg(feature = "rt")))]
+pub fn unconstrained<F>(inner: F) -> Unconstrained<F> {
+    Unconstrained { inner }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/yield_now.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/yield_now.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/task/yield_now.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/task/yield_now.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-doc_rt_core! {
+cfg_rt! {
     /// Yields execution back to the Tokio runtime.
     ///
     /// A task yields by awaiting on `yield_now()`, and may resume when that
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/clock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/clock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/clock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/clock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+#![cfg_attr(not(feature = "rt"), allow(dead_code))]
+
 //! Source of time abstraction.
 //!
 //! By default, `std::time::Instant::now()` is used. However, when the
@@ -5,7 +7,7 @@
 //! configurable.
 
 cfg_not_test_util! {
-    use crate::time::{Duration, Instant};
+    use crate::time::{Instant};
 
     #[derive(Debug, Clone)]
     pub(crate) struct Clock {}
@@ -15,28 +17,31 @@
     }
 
     impl Clock {
-        pub(crate) fn new() -> Clock {
+        pub(crate) fn new(_enable_pausing: bool, _start_paused: bool) -> Clock {
             Clock {}
         }
 
         pub(crate) fn now(&self) -> Instant {
             now()
         }
-
-        pub(crate) fn is_paused(&self) -> bool {
-            false
-        }
-
-        pub(crate) fn advance(&self, _dur: Duration) {
-            unreachable!();
-        }
     }
 }
 
 cfg_test_util! {
     use crate::time::{Duration, Instant};
-    use std::sync::{Arc, Mutex};
-    use crate::runtime::context;
+    use crate::loom::sync::{Arc, Mutex};
+
+    cfg_rt! {
+        fn clock() -> Option<Clock> {
+            crate::runtime::context::clock()
+        }
+    }
+
+    cfg_not_rt! {
+        fn clock() -> Option<Clock> {
+            None
+        }
+    }
 
     /// A handle to a source of time.
     #[derive(Debug, Clone)]
@@ -46,6 +51,9 @@
 
     #[derive(Debug)]
     struct Inner {
+        /// True if the ability to pause time is enabled.
+        enable_pausing: bool,
+
         /// Instant to use as the clock's base instant.
         base: std::time::Instant,
 
@@ -56,16 +64,30 @@
     /// Pause time
     ///
     /// The current value of `Instant::now()` is saved and all subsequent calls
-    /// to `Instant::now()` until the timer wheel is checked again will return the saved value.
-    /// Once the timer wheel is checked, time will immediately advance to the next registered
-    /// `Delay`. This is useful for running tests that depend on time.
+    /// to `Instant::now()` until the timer wheel is checked again will return
+    /// the saved value. Once the timer wheel is checked, time will immediately
+    /// advance to the next registered `Sleep`. This is useful for running tests
+    /// that depend on time.
+    ///
+    /// Pausing time requires the `current_thread` Tokio runtime. This is the
+    /// default runtime used by `#[tokio::test]`. The runtime can be initialized
+    /// with time in a paused state using the `Builder::start_paused` method.
     ///
     /// # Panics
     ///
-    /// Panics if time is already frozen or if called from outside of the Tokio
-    /// runtime.
+    /// Panics if time is already frozen or if called from outside of a
+    /// `current_thread` Tokio runtime.
+    ///
+    /// # Auto-advance
+    ///
+    /// If time is paused and the runtime has no work to do, the clock is
+    /// auto-advanced to the next pending timer. This means that [`Sleep`] or
+    /// other timer-backed primitives can cause the runtime to advance the
+    /// current time when awaited.
+    ///
+    /// [`Sleep`]: crate::time::Sleep
     pub fn pause() {
-        let clock = context::clock().expect("time cannot be frozen from outside the Tokio runtime");
+        let clock = clock().expect("time cannot be frozen from outside the Tokio runtime");
         clock.pause();
     }
 
@@ -79,8 +101,8 @@
     /// Panics if time is not frozen or if called from outside of the Tokio
     /// runtime.
     pub fn resume() {
-        let clock = context::clock().expect("time cannot be frozen from outside the Tokio runtime");
-        let mut inner = clock.inner.lock().unwrap();
+        let clock = clock().expect("time cannot be frozen from outside the Tokio runtime");
+        let mut inner = clock.inner.lock();
 
         if inner.unfrozen.is_some() {
             panic!("time is not frozen");
@@ -98,15 +120,22 @@
     ///
     /// Panics if time is not frozen or if called from outside of the Tokio
     /// runtime.
+    ///
+    /// # Auto-advance
+    ///
+    /// If the time is paused and there is no work to do, the runtime advances
+    /// time to the next timer. See [`pause`](pause#auto-advance) for more
+    /// details.
     pub async fn advance(duration: Duration) {
-        let clock = context::clock().expect("time cannot be frozen from outside the Tokio runtime");
+        let clock = clock().expect("time cannot be frozen from outside the Tokio runtime");
         clock.advance(duration);
+
         crate::task::yield_now().await;
     }
 
     /// Return the current instant, factoring in frozen time.
     pub(crate) fn now() -> Instant {
-        if let Some(clock) = context::clock() {
+        if let Some(clock) = clock() {
             clock.now()
         } else {
             Instant::from_std(std::time::Instant::now())
@@ -116,19 +145,32 @@
     impl Clock {
         /// Return a new `Clock` instance that uses the current execution context's
         /// source of time.
-        pub(crate) fn new() -> Clock {
+        pub(crate) fn new(enable_pausing: bool, start_paused: bool) -> Clock {
             let now = std::time::Instant::now();
 
-            Clock {
+            let clock = Clock {
                 inner: Arc::new(Mutex::new(Inner {
+                    enable_pausing,
                     base: now,
                     unfrozen: Some(now),
                 })),
+            };
+
+            if start_paused {
+                clock.pause();
             }
+
+            clock
         }
 
         pub(crate) fn pause(&self) {
-            let mut inner = self.inner.lock().unwrap();
+            let mut inner = self.inner.lock();
+
+            if !inner.enable_pausing {
+                drop(inner); // avoid poisoning the lock
+                panic!("`time::pause()` requires the `current_thread` Tokio runtime. \
+                        This is the default Runtime used by `#[tokio::test].");
+            }
 
             let elapsed = inner.unfrozen.as_ref().expect("time is already frozen").elapsed();
             inner.base += elapsed;
@@ -136,12 +178,12 @@
         }
 
         pub(crate) fn is_paused(&self) -> bool {
-            let inner = self.inner.lock().unwrap();
+            let inner = self.inner.lock();
             inner.unfrozen.is_none()
         }
 
         pub(crate) fn advance(&self, duration: Duration) {
-            let mut inner = self.inner.lock().unwrap();
+            let mut inner = self.inner.lock();
 
             if inner.unfrozen.is_some() {
                 panic!("time is not frozen");
@@ -151,7 +193,7 @@
         }
 
         pub(crate) fn now(&self) -> Instant {
-            let inner = self.inner.lock().unwrap();
+            let inner = self.inner.lock();
 
             let mut ret = inner.base;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/delay_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/delay_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/delay_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/delay_queue.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,895 +0,0 @@
-//! A queue of delayed elements.
-//!
-//! See [`DelayQueue`] for more details.
-//!
-//! [`DelayQueue`]: struct@DelayQueue
-
-use crate::time::wheel::{self, Wheel};
-use crate::time::{delay_until, Delay, Duration, Error, Instant};
-
-use slab::Slab;
-use std::cmp;
-use std::future::Future;
-use std::marker::PhantomData;
-use std::pin::Pin;
-use std::task::{self, Poll};
-
-/// A queue of delayed elements.
-///
-/// Once an element is inserted into the `DelayQueue`, it is yielded once the
-/// specified deadline has been reached.
-///
-/// # Usage
-///
-/// Elements are inserted into `DelayQueue` using the [`insert`] or
-/// [`insert_at`] methods. A deadline is provided with the item and a [`Key`] is
-/// returned. The key is used to remove the entry or to change the deadline at
-/// which it should be yielded back.
-///
-/// Once delays have been configured, the `DelayQueue` is used via its
-/// [`Stream`] implementation. [`poll_expired`] is called. If an entry has reached its
-/// deadline, it is returned. If not, `Poll::Pending` indicating that the
-/// current task will be notified once the deadline has been reached.
-///
-/// # `Stream` implementation
-///
-/// Items are retrieved from the queue via [`DelayQueue::poll_expired`]. If no delays have
-/// expired, no items are returned. In this case, `NotReady` is returned and the
-/// current task is registered to be notified once the next item's delay has
-/// expired.
-///
-/// If no items are in the queue, i.e. `is_empty()` returns `true`, then `poll`
-/// returns `Ready(None)`. This indicates that the stream has reached an end.
-/// However, if a new item is inserted *after*, `poll` will once again start
-/// returning items or `NotReady.
-///
-/// Items are returned ordered by their expirations. Items that are configured
-/// to expire first will be returned first. There are no ordering guarantees
-/// for items configured to expire the same instant. Also note that delays are
-/// rounded to the closest millisecond.
-///
-/// # Implementation
-///
-/// The [`DelayQueue`] is backed by a separate instance of the same timer wheel used internally by
-/// Tokio's standalone timer utilities such as [`delay_for`]. Because of this, it offers the same
-/// performance and scalability benefits.
-///
-/// State associated with each entry is stored in a [`slab`]. This amortizes the cost of allocation,
-/// and allows reuse of the memory allocated for expired entires.
-///
-/// Capacity can be checked using [`capacity`] and allocated preemptively by using
-/// the [`reserve`] method.
-///
-/// # Usage
-///
-/// Using `DelayQueue` to manage cache entries.
-///
-/// ```rust,no_run
-/// use tokio::time::{delay_queue, DelayQueue, Error};
-///
-/// use futures::ready;
-/// use std::collections::HashMap;
-/// use std::task::{Context, Poll};
-/// use std::time::Duration;
-/// # type CacheKey = String;
-/// # type Value = String;
-///
-/// struct Cache {
-///     entries: HashMap<CacheKey, (Value, delay_queue::Key)>,
-///     expirations: DelayQueue<CacheKey>,
-/// }
-///
-/// const TTL_SECS: u64 = 30;
-///
-/// impl Cache {
-///     fn insert(&mut self, key: CacheKey, value: Value) {
-///         let delay = self.expirations
-///             .insert(key.clone(), Duration::from_secs(TTL_SECS));
-///
-///         self.entries.insert(key, (value, delay));
-///     }
-///
-///     fn get(&self, key: &CacheKey) -> Option<&Value> {
-///         self.entries.get(key)
-///             .map(|&(ref v, _)| v)
-///     }
-///
-///     fn remove(&mut self, key: &CacheKey) {
-///         if let Some((_, cache_key)) = self.entries.remove(key) {
-///             self.expirations.remove(&cache_key);
-///         }
-///     }
-///
-///     fn poll_purge(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Error>> {
-///         while let Some(res) = ready!(self.expirations.poll_expired(cx)) {
-///             let entry = res?;
-///             self.entries.remove(entry.get_ref());
-///         }
-///
-///         Poll::Ready(Ok(()))
-///     }
-/// }
-/// ```
-///
-/// [`insert`]: method@Self::insert
-/// [`insert_at`]: method@Self::insert_at
-/// [`Key`]: struct@Key
-/// [`Stream`]: https://docs.rs/futures/0.1/futures/stream/trait.Stream.html
-/// [`poll_expired`]: method@Self::poll_expired
-/// [`Stream::poll_expired`]: method@Self::poll_expired
-/// [`DelayQueue`]: struct@DelayQueue
-/// [`delay_for`]: fn@super::delay_for
-/// [`slab`]: slab
-/// [`capacity`]: method@Self::capacity
-/// [`reserve`]: method@Self::reserve
-#[derive(Debug)]
-pub struct DelayQueue<T> {
-    /// Stores data associated with entries
-    slab: Slab<Data<T>>,
-
-    /// Lookup structure tracking all delays in the queue
-    wheel: Wheel<Stack<T>>,
-
-    /// Delays that were inserted when already expired. These cannot be stored
-    /// in the wheel
-    expired: Stack<T>,
-
-    /// Delay expiring when the *first* item in the queue expires
-    delay: Option<Delay>,
-
-    /// Wheel polling state
-    poll: wheel::Poll,
-
-    /// Instant at which the timer starts
-    start: Instant,
-}
-
-/// An entry in `DelayQueue` that has expired and removed.
-///
-/// Values are returned by [`DelayQueue::poll_expired`].
-///
-/// [`DelayQueue::poll_expired`]: method@DelayQueue::poll_expired
-#[derive(Debug)]
-pub struct Expired<T> {
-    /// The data stored in the queue
-    data: T,
-
-    /// The expiration time
-    deadline: Instant,
-
-    /// The key associated with the entry
-    key: Key,
-}
-
-/// Token to a value stored in a `DelayQueue`.
-///
-/// Instances of `Key` are returned by [`DelayQueue::insert`]. See [`DelayQueue`]
-/// documentation for more details.
-///
-/// [`DelayQueue`]: struct@DelayQueue
-/// [`DelayQueue::insert`]: method@DelayQueue::insert
-#[derive(Debug, Clone)]
-pub struct Key {
-    index: usize,
-}
-
-#[derive(Debug)]
-struct Stack<T> {
-    /// Head of the stack
-    head: Option<usize>,
-    _p: PhantomData<fn() -> T>,
-}
-
-#[derive(Debug)]
-struct Data<T> {
-    /// The data being stored in the queue and will be returned at the requested
-    /// instant.
-    inner: T,
-
-    /// The instant at which the item is returned.
-    when: u64,
-
-    /// Set to true when stored in the `expired` queue
-    expired: bool,
-
-    /// Next entry in the stack
-    next: Option<usize>,
-
-    /// Previous entry in the stack
-    prev: Option<usize>,
-}
-
-/// Maximum number of entries the queue can handle
-const MAX_ENTRIES: usize = (1 << 30) - 1;
-
-impl<T> DelayQueue<T> {
-    /// Creates a new, empty, `DelayQueue`
-    ///
-    /// The queue will not allocate storage until items are inserted into it.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// # use tokio::time::DelayQueue;
-    /// let delay_queue: DelayQueue<u32> = DelayQueue::new();
-    /// ```
-    pub fn new() -> DelayQueue<T> {
-        DelayQueue::with_capacity(0)
-    }
-
-    /// Creates a new, empty, `DelayQueue` with the specified capacity.
-    ///
-    /// The queue will be able to hold at least `capacity` elements without
-    /// reallocating. If `capacity` is 0, the queue will not allocate for
-    /// storage.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// # use tokio::time::DelayQueue;
-    /// # use std::time::Duration;
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::with_capacity(10);
-    ///
-    ///     // These insertions are done without further allocation
-    ///     for i in 0..10 {
-    ///         delay_queue.insert(i, Duration::from_secs(i));
-    ///     }
-    ///
-    ///     // This will make the queue allocate additional storage
-    ///     delay_queue.insert(11, Duration::from_secs(11));
-    /// # }
-    /// ```
-    pub fn with_capacity(capacity: usize) -> DelayQueue<T> {
-        DelayQueue {
-            wheel: Wheel::new(),
-            slab: Slab::with_capacity(capacity),
-            expired: Stack::default(),
-            delay: None,
-            poll: wheel::Poll::new(0),
-            start: Instant::now(),
-        }
-    }
-
-    /// Inserts `value` into the queue set to expire at a specific instant in
-    /// time.
-    ///
-    /// This function is identical to `insert`, but takes an `Instant` instead
-    /// of a `Duration`.
-    ///
-    /// `value` is stored in the queue until `when` is reached. At which point,
-    /// `value` will be returned from [`poll_expired`]. If `when` has already been
-    /// reached, then `value` is immediately made available to poll.
-    ///
-    /// The return value represents the insertion and is used at an argument to
-    /// [`remove`] and [`reset`]. Note that [`Key`] is token and is reused once
-    /// `value` is removed from the queue either by calling [`poll_expired`] after
-    /// `when` is reached or by calling [`remove`]. At this point, the caller
-    /// must take care to not use the returned [`Key`] again as it may reference
-    /// a different item in the queue.
-    ///
-    /// See [type] level documentation for more details.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if `when` is too far in the future.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage
-    ///
-    /// ```rust
-    /// use tokio::time::{DelayQueue, Duration, Instant};
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::new();
-    ///     let key = delay_queue.insert_at(
-    ///         "foo", Instant::now() + Duration::from_secs(5));
-    ///
-    ///     // Remove the entry
-    ///     let item = delay_queue.remove(&key);
-    ///     assert_eq!(*item.get_ref(), "foo");
-    /// # }
-    /// ```
-    ///
-    /// [`poll_expired`]: method@Self::poll_expired
-    /// [`remove`]: method@Self::remove
-    /// [`reset`]: method@Self::reset
-    /// [`Key`]: struct@Key
-    /// [type]: #
-    pub fn insert_at(&mut self, value: T, when: Instant) -> Key {
-        assert!(self.slab.len() < MAX_ENTRIES, "max entries exceeded");
-
-        // Normalize the deadline. Values cannot be set to expire in the past.
-        let when = self.normalize_deadline(when);
-
-        // Insert the value in the store
-        let key = self.slab.insert(Data {
-            inner: value,
-            when,
-            expired: false,
-            next: None,
-            prev: None,
-        });
-
-        self.insert_idx(when, key);
-
-        // Set a new delay if the current's deadline is later than the one of the new item
-        let should_set_delay = if let Some(ref delay) = self.delay {
-            let current_exp = self.normalize_deadline(delay.deadline());
-            current_exp > when
-        } else {
-            true
-        };
-
-        if should_set_delay {
-            let delay_time = self.start + Duration::from_millis(when);
-            if let Some(ref mut delay) = &mut self.delay {
-                delay.reset(delay_time);
-            } else {
-                self.delay = Some(delay_until(delay_time));
-            }
-        }
-
-        Key::new(key)
-    }
-
-    /// Attempts to pull out the next value of the delay queue, registering the
-    /// current task for wakeup if the value is not yet available, and returning
-    /// None if the queue is exhausted.
-    pub fn poll_expired(
-        &mut self,
-        cx: &mut task::Context<'_>,
-    ) -> Poll<Option<Result<Expired<T>, Error>>> {
-        let item = ready!(self.poll_idx(cx));
-        Poll::Ready(item.map(|result| {
-            result.map(|idx| {
-                let data = self.slab.remove(idx);
-                debug_assert!(data.next.is_none());
-                debug_assert!(data.prev.is_none());
-
-                Expired {
-                    key: Key::new(idx),
-                    data: data.inner,
-                    deadline: self.start + Duration::from_millis(data.when),
-                }
-            })
-        }))
-    }
-
-    /// Inserts `value` into the queue set to expire after the requested duration
-    /// elapses.
-    ///
-    /// This function is identical to `insert_at`, but takes a `Duration`
-    /// instead of an `Instant`.
-    ///
-    /// `value` is stored in the queue until `when` is reached. At which point,
-    /// `value` will be returned from [`poll_expired`]. If `when` has already been
-    /// reached, then `value` is immediately made available to poll.
-    ///
-    /// The return value represents the insertion and is used at an argument to
-    /// [`remove`] and [`reset`]. Note that [`Key`] is token and is reused once
-    /// `value` is removed from the queue either by calling [`poll_expired`] after
-    /// `when` is reached or by calling [`remove`]. At this point, the caller
-    /// must take care to not use the returned [`Key`] again as it may reference
-    /// a different item in the queue.
-    ///
-    /// See [type] level documentation for more details.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if `timeout` is greater than the maximum supported
-    /// duration.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage
-    ///
-    /// ```rust
-    /// use tokio::time::DelayQueue;
-    /// use std::time::Duration;
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::new();
-    ///     let key = delay_queue.insert("foo", Duration::from_secs(5));
-    ///
-    ///     // Remove the entry
-    ///     let item = delay_queue.remove(&key);
-    ///     assert_eq!(*item.get_ref(), "foo");
-    /// # }
-    /// ```
-    ///
-    /// [`poll_expired`]: method@Self::poll_expired
-    /// [`remove`]: method@Self::remove
-    /// [`reset`]: method@Self::reset
-    /// [`Key`]: struct@Key
-    /// [type]: #
-    pub fn insert(&mut self, value: T, timeout: Duration) -> Key {
-        self.insert_at(value, Instant::now() + timeout)
-    }
-
-    fn insert_idx(&mut self, when: u64, key: usize) {
-        use self::wheel::{InsertError, Stack};
-
-        // Register the deadline with the timer wheel
-        match self.wheel.insert(when, key, &mut self.slab) {
-            Ok(_) => {}
-            Err((_, InsertError::Elapsed)) => {
-                self.slab[key].expired = true;
-                // The delay is already expired, store it in the expired queue
-                self.expired.push(key, &mut self.slab);
-            }
-            Err((_, err)) => panic!("invalid deadline; err={:?}", err),
-        }
-    }
-
-    /// Removes the key fom the expired queue or the timer wheel
-    /// depending on its expiration status
-    ///
-    /// # Panics
-    /// Panics if the key is not contained in the expired queue or the wheel
-    fn remove_key(&mut self, key: &Key) {
-        use crate::time::wheel::Stack;
-
-        // Special case the `expired` queue
-        if self.slab[key.index].expired {
-            self.expired.remove(&key.index, &mut self.slab);
-        } else {
-            self.wheel.remove(&key.index, &mut self.slab);
-        }
-    }
-
-    /// Removes the item associated with `key` from the queue.
-    ///
-    /// There must be an item associated with `key`. The function returns the
-    /// removed item as well as the `Instant` at which it will the delay will
-    /// have expired.
-    ///
-    /// # Panics
-    ///
-    /// The function panics if `key` is not contained by the queue.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage
-    ///
-    /// ```rust
-    /// use tokio::time::DelayQueue;
-    /// use std::time::Duration;
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::new();
-    ///     let key = delay_queue.insert("foo", Duration::from_secs(5));
-    ///
-    ///     // Remove the entry
-    ///     let item = delay_queue.remove(&key);
-    ///     assert_eq!(*item.get_ref(), "foo");
-    /// # }
-    /// ```
-    pub fn remove(&mut self, key: &Key) -> Expired<T> {
-        self.remove_key(key);
-        let data = self.slab.remove(key.index);
-
-        Expired {
-            key: Key::new(key.index),
-            data: data.inner,
-            deadline: self.start + Duration::from_millis(data.when),
-        }
-    }
-
-    /// Sets the delay of the item associated with `key` to expire at `when`.
-    ///
-    /// This function is identical to `reset` but takes an `Instant` instead of
-    /// a `Duration`.
-    ///
-    /// The item remains in the queue but the delay is set to expire at `when`.
-    /// If `when` is in the past, then the item is immediately made available to
-    /// the caller.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if `when` is too far in the future or if `key` is
-    /// not contained by the queue.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage
-    ///
-    /// ```rust
-    /// use tokio::time::{DelayQueue, Duration, Instant};
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::new();
-    ///     let key = delay_queue.insert("foo", Duration::from_secs(5));
-    ///
-    ///     // "foo" is scheduled to be returned in 5 seconds
-    ///
-    ///     delay_queue.reset_at(&key, Instant::now() + Duration::from_secs(10));
-    ///
-    ///     // "foo"is now scheduled to be returned in 10 seconds
-    /// # }
-    /// ```
-    pub fn reset_at(&mut self, key: &Key, when: Instant) {
-        self.remove_key(key);
-
-        // Normalize the deadline. Values cannot be set to expire in the past.
-        let when = self.normalize_deadline(when);
-
-        self.slab[key.index].when = when;
-        self.insert_idx(when, key.index);
-
-        let next_deadline = self.next_deadline();
-        if let (Some(ref mut delay), Some(deadline)) = (&mut self.delay, next_deadline) {
-            delay.reset(deadline);
-        }
-    }
-
-    /// Returns the next time poll as determined by the wheel
-    fn next_deadline(&mut self) -> Option<Instant> {
-        self.wheel
-            .poll_at()
-            .map(|poll_at| self.start + Duration::from_millis(poll_at))
-    }
-
-    /// Sets the delay of the item associated with `key` to expire after
-    /// `timeout`.
-    ///
-    /// This function is identical to `reset_at` but takes a `Duration` instead
-    /// of an `Instant`.
-    ///
-    /// The item remains in the queue but the delay is set to expire after
-    /// `timeout`. If `timeout` is zero, then the item is immediately made
-    /// available to the caller.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if `timeout` is greater than the maximum supported
-    /// duration or if `key` is not contained by the queue.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage
-    ///
-    /// ```rust
-    /// use tokio::time::DelayQueue;
-    /// use std::time::Duration;
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::new();
-    ///     let key = delay_queue.insert("foo", Duration::from_secs(5));
-    ///
-    ///     // "foo" is scheduled to be returned in 5 seconds
-    ///
-    ///     delay_queue.reset(&key, Duration::from_secs(10));
-    ///
-    ///     // "foo"is now scheduled to be returned in 10 seconds
-    /// # }
-    /// ```
-    pub fn reset(&mut self, key: &Key, timeout: Duration) {
-        self.reset_at(key, Instant::now() + timeout);
-    }
-
-    /// Clears the queue, removing all items.
-    ///
-    /// After calling `clear`, [`poll_expired`] will return `Ok(Ready(None))`.
-    ///
-    /// Note that this method has no effect on the allocated capacity.
-    ///
-    /// [`poll_expired`]: method@Self::poll_expired
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use tokio::time::DelayQueue;
-    /// use std::time::Duration;
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::new();
-    ///
-    ///     delay_queue.insert("foo", Duration::from_secs(5));
-    ///
-    ///     assert!(!delay_queue.is_empty());
-    ///
-    ///     delay_queue.clear();
-    ///
-    ///     assert!(delay_queue.is_empty());
-    /// # }
-    /// ```
-    pub fn clear(&mut self) {
-        self.slab.clear();
-        self.expired = Stack::default();
-        self.wheel = Wheel::new();
-        self.delay = None;
-    }
-
-    /// Returns the number of elements the queue can hold without reallocating.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use tokio::time::DelayQueue;
-    ///
-    /// let delay_queue: DelayQueue<i32> = DelayQueue::with_capacity(10);
-    /// assert_eq!(delay_queue.capacity(), 10);
-    /// ```
-    pub fn capacity(&self) -> usize {
-        self.slab.capacity()
-    }
-
-    /// Returns the number of elements currently in the queue.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use tokio::time::DelayQueue;
-    /// use std::time::Duration;
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue: DelayQueue<i32> = DelayQueue::with_capacity(10);
-    ///     assert_eq!(delay_queue.len(), 0);
-    ///     delay_queue.insert(3, Duration::from_secs(5));
-    ///     assert_eq!(delay_queue.len(), 1);
-    /// # }
-    /// ```
-    pub fn len(&self) -> usize {
-        self.slab.len()
-    }
-
-    /// Reserves capacity for at least `additional` more items to be queued
-    /// without allocating.
-    ///
-    /// `reserve` does nothing if the queue already has sufficient capacity for
-    /// `additional` more values. If more capacity is required, a new segment of
-    /// memory will be allocated and all existing values will be copied into it.
-    /// As such, if the queue is already very large, a call to `reserve` can end
-    /// up being expensive.
-    ///
-    /// The queue may reserve more than `additional` extra space in order to
-    /// avoid frequent reallocations.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the new capacity exceeds the maximum number of entries the
-    /// queue can contain.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::time::DelayQueue;
-    /// use std::time::Duration;
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::new();
-    ///
-    ///     delay_queue.insert("hello", Duration::from_secs(10));
-    ///     delay_queue.reserve(10);
-    ///
-    ///     assert!(delay_queue.capacity() >= 11);
-    /// # }
-    /// ```
-    pub fn reserve(&mut self, additional: usize) {
-        self.slab.reserve(additional);
-    }
-
-    /// Returns `true` if there are no items in the queue.
-    ///
-    /// Note that this function returns `false` even if all items have not yet
-    /// expired and a call to `poll` will return `NotReady`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tokio::time::DelayQueue;
-    /// use std::time::Duration;
-    ///
-    /// # #[tokio::main]
-    /// # async fn main() {
-    ///     let mut delay_queue = DelayQueue::new();
-    ///     assert!(delay_queue.is_empty());
-    ///
-    ///     delay_queue.insert("hello", Duration::from_secs(5));
-    ///     assert!(!delay_queue.is_empty());
-    /// # }
-    /// ```
-    pub fn is_empty(&self) -> bool {
-        self.slab.is_empty()
-    }
-
-    /// Polls the queue, returning the index of the next slot in the slab that
-    /// should be returned.
-    ///
-    /// A slot should be returned when the associated deadline has been reached.
-    fn poll_idx(&mut self, cx: &mut task::Context<'_>) -> Poll<Option<Result<usize, Error>>> {
-        use self::wheel::Stack;
-
-        let expired = self.expired.pop(&mut self.slab);
-
-        if expired.is_some() {
-            return Poll::Ready(expired.map(Ok));
-        }
-
-        loop {
-            if let Some(ref mut delay) = self.delay {
-                if !delay.is_elapsed() {
-                    ready!(Pin::new(&mut *delay).poll(cx));
-                }
-
-                let now = crate::time::ms(delay.deadline() - self.start, crate::time::Round::Down);
-
-                self.poll = wheel::Poll::new(now);
-            }
-
-            // We poll the wheel to get the next value out before finding the next deadline.
-            let wheel_idx = self.wheel.poll(&mut self.poll, &mut self.slab);
-
-            self.delay = self.next_deadline().map(delay_until);
-
-            if let Some(idx) = wheel_idx {
-                return Poll::Ready(Some(Ok(idx)));
-            }
-
-            if self.delay.is_none() {
-                return Poll::Ready(None);
-            }
-        }
-    }
-
-    fn normalize_deadline(&self, when: Instant) -> u64 {
-        let when = if when < self.start {
-            0
-        } else {
-            crate::time::ms(when - self.start, crate::time::Round::Up)
-        };
-
-        cmp::max(when, self.wheel.elapsed())
-    }
-}
-
-// We never put `T` in a `Pin`...
-impl<T> Unpin for DelayQueue<T> {}
-
-impl<T> Default for DelayQueue<T> {
-    fn default() -> DelayQueue<T> {
-        DelayQueue::new()
-    }
-}
-
-#[cfg(feature = "stream")]
-impl<T> futures_core::Stream for DelayQueue<T> {
-    // DelayQueue seems much more specific, where a user may care that it
-    // has reached capacity, so return those errors instead of panicking.
-    type Item = Result<Expired<T>, Error>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Option<Self::Item>> {
-        DelayQueue::poll_expired(self.get_mut(), cx)
-    }
-}
-
-impl<T> wheel::Stack for Stack<T> {
-    type Owned = usize;
-    type Borrowed = usize;
-    type Store = Slab<Data<T>>;
-
-    fn is_empty(&self) -> bool {
-        self.head.is_none()
-    }
-
-    fn push(&mut self, item: Self::Owned, store: &mut Self::Store) {
-        // Ensure the entry is not already in a stack.
-        debug_assert!(store[item].next.is_none());
-        debug_assert!(store[item].prev.is_none());
-
-        // Remove the old head entry
-        let old = self.head.take();
-
-        if let Some(idx) = old {
-            store[idx].prev = Some(item);
-        }
-
-        store[item].next = old;
-        self.head = Some(item)
-    }
-
-    fn pop(&mut self, store: &mut Self::Store) -> Option<Self::Owned> {
-        if let Some(idx) = self.head {
-            self.head = store[idx].next;
-
-            if let Some(idx) = self.head {
-                store[idx].prev = None;
-            }
-
-            store[idx].next = None;
-            debug_assert!(store[idx].prev.is_none());
-
-            Some(idx)
-        } else {
-            None
-        }
-    }
-
-    fn remove(&mut self, item: &Self::Borrowed, store: &mut Self::Store) {
-        assert!(store.contains(*item));
-
-        // Ensure that the entry is in fact contained by the stack
-        debug_assert!({
-            // This walks the full linked list even if an entry is found.
-            let mut next = self.head;
-            let mut contains = false;
-
-            while let Some(idx) = next {
-                if idx == *item {
-                    debug_assert!(!contains);
-                    contains = true;
-                }
-
-                next = store[idx].next;
-            }
-
-            contains
-        });
-
-        if let Some(next) = store[*item].next {
-            store[next].prev = store[*item].prev;
-        }
-
-        if let Some(prev) = store[*item].prev {
-            store[prev].next = store[*item].next;
-        } else {
-            self.head = store[*item].next;
-        }
-
-        store[*item].next = None;
-        store[*item].prev = None;
-    }
-
-    fn when(item: &Self::Borrowed, store: &Self::Store) -> u64 {
-        store[*item].when
-    }
-}
-
-impl<T> Default for Stack<T> {
-    fn default() -> Stack<T> {
-        Stack {
-            head: None,
-            _p: PhantomData,
-        }
-    }
-}
-
-impl Key {
-    pub(crate) fn new(index: usize) -> Key {
-        Key { index }
-    }
-}
-
-impl<T> Expired<T> {
-    /// Returns a reference to the inner value.
-    pub fn get_ref(&self) -> &T {
-        &self.data
-    }
-
-    /// Returns a mutable reference to the inner value.
-    pub fn get_mut(&mut self) -> &mut T {
-        &mut self.data
-    }
-
-    /// Consumes `self` and returns the inner value.
-    pub fn into_inner(self) -> T {
-        self.data
-    }
-
-    /// Returns the deadline that the expiration was set to.
-    pub fn deadline(&self) -> Instant {
-        self.deadline
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/delay.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/delay.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/delay.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/delay.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-use crate::time::driver::Registration;
-use crate::time::{Duration, Instant};
-
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{self, Poll};
-
-/// Waits until `deadline` is reached.
-///
-/// No work is performed while awaiting on the delay to complete. The delay
-/// operates at millisecond granularity and should not be used for tasks that
-/// require high-resolution timers.
-///
-/// # Cancellation
-///
-/// Canceling a delay is done by dropping the returned future. No additional
-/// cleanup work is required.
-pub fn delay_until(deadline: Instant) -> Delay {
-    let registration = Registration::new(deadline, Duration::from_millis(0));
-    Delay { registration }
-}
-
-/// Waits until `duration` has elapsed.
-///
-/// Equivalent to `delay_until(Instant::now() + duration)`. An asynchronous
-/// analog to `std::thread::sleep`.
-///
-/// No work is performed while awaiting on the delay to complete. The delay
-/// operates at millisecond granularity and should not be used for tasks that
-/// require high-resolution timers.
-///
-/// To run something regularly on a schedule, see [`interval`].
-///
-/// # Cancellation
-///
-/// Canceling a delay is done by dropping the returned future. No additional
-/// cleanup work is required.
-///
-/// # Examples
-///
-/// Wait 100ms and print "100 ms have elapsed".
-///
-/// ```
-/// use tokio::time::{delay_for, Duration};
-///
-/// #[tokio::main]
-/// async fn main() {
-///     delay_for(Duration::from_millis(100)).await;
-///     println!("100 ms have elapsed");
-/// }
-/// ```
-///
-/// [`interval`]: crate::time::interval()
-#[cfg_attr(docsrs, doc(alias = "sleep"))]
-pub fn delay_for(duration: Duration) -> Delay {
-    delay_until(Instant::now() + duration)
-}
-
-/// Future returned by [`delay_until`](delay_until) and
-/// [`delay_for`](delay_for).
-#[derive(Debug)]
-#[must_use = "futures do nothing unless you `.await` or poll them"]
-pub struct Delay {
-    /// The link between the `Delay` instance and the timer that drives it.
-    ///
-    /// This also stores the `deadline` value.
-    registration: Registration,
-}
-
-impl Delay {
-    pub(crate) fn new_timeout(deadline: Instant, duration: Duration) -> Delay {
-        let registration = Registration::new(deadline, duration);
-        Delay { registration }
-    }
-
-    /// Returns the instant at which the future will complete.
-    pub fn deadline(&self) -> Instant {
-        self.registration.deadline()
-    }
-
-    /// Returns `true` if the `Delay` has elapsed
-    ///
-    /// A `Delay` is elapsed when the requested duration has elapsed.
-    pub fn is_elapsed(&self) -> bool {
-        self.registration.is_elapsed()
-    }
-
-    /// Resets the `Delay` instance to a new deadline.
-    ///
-    /// Calling this function allows changing the instant at which the `Delay`
-    /// future completes without having to create new associated state.
-    ///
-    /// This function can be called both before and after the future has
-    /// completed.
-    pub fn reset(&mut self, deadline: Instant) {
-        self.registration.reset(deadline);
-    }
-}
-
-impl Future for Delay {
-    type Output = ();
-
-    fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
-        // `poll_elapsed` can return an error in two cases:
-        //
-        // - AtCapacity: this is a pathlogical case where far too many
-        //   delays have been scheduled.
-        // - Shutdown: No timer has been setup, which is a mis-use error.
-        //
-        // Both cases are extremely rare, and pretty accurately fit into
-        // "logic errors", so we just panic in this case. A user couldn't
-        // really do much better if we passed the error onwards.
-        match ready!(self.registration.poll_elapsed(cx)) {
-            Ok(()) => Poll::Ready(()),
-            Err(e) => panic!("timer error: {}", e),
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/atomic_stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/atomic_stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/atomic_stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/atomic_stack.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-use crate::time::driver::Entry;
-use crate::time::Error;
-
-use std::ptr;
-use std::sync::atomic::AtomicPtr;
-use std::sync::atomic::Ordering::SeqCst;
-use std::sync::Arc;
-
-/// A stack of `Entry` nodes
-#[derive(Debug)]
-pub(crate) struct AtomicStack {
-    /// Stack head
-    head: AtomicPtr<Entry>,
-}
-
-/// Entries that were removed from the stack
-#[derive(Debug)]
-pub(crate) struct AtomicStackEntries {
-    ptr: *mut Entry,
-}
-
-/// Used to indicate that the timer has shutdown.
-const SHUTDOWN: *mut Entry = 1 as *mut _;
-
-impl AtomicStack {
-    pub(crate) fn new() -> AtomicStack {
-        AtomicStack {
-            head: AtomicPtr::new(ptr::null_mut()),
-        }
-    }
-
-    /// Pushes an entry onto the stack.
-    ///
-    /// Returns `true` if the entry was pushed, `false` if the entry is already
-    /// on the stack, `Err` if the timer is shutdown.
-    pub(crate) fn push(&self, entry: &Arc<Entry>) -> Result<bool, Error> {
-        // First, set the queued bit on the entry
-        let queued = entry.queued.fetch_or(true, SeqCst);
-
-        if queued {
-            // Already queued, nothing more to do
-            return Ok(false);
-        }
-
-        let ptr = Arc::into_raw(entry.clone()) as *mut _;
-
-        let mut curr = self.head.load(SeqCst);
-
-        loop {
-            if curr == SHUTDOWN {
-                // Don't leak the entry node
-                let _ = unsafe { Arc::from_raw(ptr) };
-
-                return Err(Error::shutdown());
-            }
-
-            // Update the `next` pointer. This is safe because setting the queued
-            // bit is a "lock" on this field.
-            unsafe {
-                *(entry.next_atomic.get()) = curr;
-            }
-
-            let actual = self.head.compare_and_swap(curr, ptr, SeqCst);
-
-            if actual == curr {
-                break;
-            }
-
-            curr = actual;
-        }
-
-        Ok(true)
-    }
-
-    /// Takes all entries from the stack
-    pub(crate) fn take(&self) -> AtomicStackEntries {
-        let ptr = self.head.swap(ptr::null_mut(), SeqCst);
-        AtomicStackEntries { ptr }
-    }
-
-    /// Drains all remaining nodes in the stack and prevent any new nodes from
-    /// being pushed onto the stack.
-    pub(crate) fn shutdown(&self) {
-        // Shutdown the processing queue
-        let ptr = self.head.swap(SHUTDOWN, SeqCst);
-
-        // Let the drop fn of `AtomicStackEntries` handle draining the stack
-        drop(AtomicStackEntries { ptr });
-    }
-}
-
-// ===== impl AtomicStackEntries =====
-
-impl Iterator for AtomicStackEntries {
-    type Item = Arc<Entry>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.ptr.is_null() || self.ptr == SHUTDOWN {
-            return None;
-        }
-
-        // Convert the pointer to an `Arc<Entry>`
-        let entry = unsafe { Arc::from_raw(self.ptr) };
-
-        // Update `self.ptr` to point to the next element of the stack
-        self.ptr = unsafe { *entry.next_atomic.get() };
-
-        // Unset the queued flag
-        let res = entry.queued.fetch_and(false, SeqCst);
-        debug_assert!(res);
-
-        // Return the entry
-        Some(entry)
-    }
-}
-
-impl Drop for AtomicStackEntries {
-    fn drop(&mut self) {
-        for entry in self {
-            // Flag the entry as errored
-            entry.error(Error::shutdown());
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/entry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/entry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/entry.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/entry.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,358 +1,629 @@
+//! Timer state structures.
+//!
+//! This module contains the heart of the intrusive timer implementation, and as
+//! such the structures inside are full of tricky concurrency and unsafe code.
+//!
+//! # Ground rules
+//!
+//! The heart of the timer implementation here is the `TimerShared` structure,
+//! shared between the `TimerEntry` and the driver. Generally, we permit access
+//! to `TimerShared` ONLY via either 1) a mutable reference to `TimerEntry` or
+//! 2) a held driver lock.
+//!
+//! It follows from this that any changes made while holding BOTH 1 and 2 will
+//! be reliably visible, regardless of ordering. This is because of the acq/rel
+//! fences on the driver lock ensuring ordering with 2, and rust mutable
+//! reference rules for 1 (a mutable reference to an object can't be passed
+//! between threads without an acq/rel barrier, and same-thread we have local
+//! happens-before ordering).
+//!
+//! # State field
+//!
+//! Each timer has a state field associated with it. This field contains either
+//! the current scheduled time, or a special flag value indicating its state.
+//! This state can either indicate that the timer is on the 'pending' queue (and
+//! thus will be fired with an `Ok(())` result soon) or that it has already been
+//! fired/deregistered.
+//!
+//! This single state field allows for code that is firing the timer to
+//! synchronize with any racing `reset` calls reliably.
+//!
+//! # Cached vs true timeouts
+//!
+//! To allow for the use case of a timeout that is periodically reset before
+//! expiration to be as lightweight as possible, we support optimistically
+//! lock-free timer resets, in the case where a timer is rescheduled to a later
+//! point than it was originally scheduled for.
+//!
+//! This is accomplished by lazily rescheduling timers. That is, we update the
+//! state field field with the true expiration of the timer from the holder of
+//! the [`TimerEntry`]. When the driver services timers (ie, whenever it's
+//! walking lists of timers), it checks this "true when" value, and reschedules
+//! based on it.
+//!
+//! We do, however, also need to track what the expiration time was when we
+//! originally registered the timer; this is used to locate the right linked
+//! list when the timer is being cancelled. This is referred to as the "cached
+//! when" internally.
+//!
+//! There is of course a race condition between timer reset and timer
+//! expiration. If the driver fails to observe the updated expiration time, it
+//! could trigger expiration of the timer too early. However, because
+//! `mark_pending` performs a compare-and-swap, it will identify this race and
+//! refuse to mark the timer as pending.
+
+use crate::loom::cell::UnsafeCell;
 use crate::loom::sync::atomic::AtomicU64;
+use crate::loom::sync::atomic::Ordering;
+
 use crate::sync::AtomicWaker;
-use crate::time::driver::{Handle, Inner};
-use crate::time::{Duration, Error, Instant};
+use crate::time::Instant;
+use crate::util::linked_list;
 
-use std::cell::UnsafeCell;
-use std::ptr;
-use std::sync::atomic::Ordering::SeqCst;
-use std::sync::atomic::{AtomicBool, AtomicU8};
-use std::sync::{Arc, Weak};
-use std::task::{self, Poll};
-use std::u64;
+use super::Handle;
 
-/// Internal state shared between a `Delay` instance and the timer.
-///
-/// This struct is used as a node in two intrusive data structures:
-///
-/// * An atomic stack used to signal to the timer thread that the entry state
-///   has changed. The timer thread will observe the entry on this stack and
-///   perform any actions as necessary.
+use std::cell::UnsafeCell as StdUnsafeCell;
+use std::task::{Context, Poll, Waker};
+use std::{marker::PhantomPinned, pin::Pin, ptr::NonNull};
+
+type TimerResult = Result<(), crate::time::error::Error>;
+
+const STATE_DEREGISTERED: u64 = u64::MAX;
+const STATE_PENDING_FIRE: u64 = STATE_DEREGISTERED - 1;
+const STATE_MIN_VALUE: u64 = STATE_PENDING_FIRE;
+
+/// This structure holds the current shared state of the timer - its scheduled
+/// time (if registered), or otherwise the result of the timer completing, as
+/// well as the registered waker.
 ///
-/// * A doubly linked list used **only** by the timer thread. Each slot in the
-///   timer wheel is a head pointer to the list of entries that must be
-///   processed during that timer tick.
-#[derive(Debug)]
-pub(crate) struct Entry {
-    /// Only accessed from `Registration`.
-    time: CachePadded<UnsafeCell<Time>>,
-
-    /// Timer internals. Using a weak pointer allows the timer to shutdown
-    /// without all `Delay` instances having completed.
-    ///
-    /// When empty, it means that the entry has not yet been linked with a
-    /// timer instance.
-    inner: Weak<Inner>,
-
-    /// Tracks the entry state. This value contains the following information:
-    ///
-    /// * The deadline at which the entry must be "fired".
-    /// * A flag indicating if the entry has already been fired.
-    /// * Whether or not the entry transitioned to the error state.
-    ///
-    /// When an `Entry` is created, `state` is initialized to the instant at
-    /// which the entry must be fired. When a timer is reset to a different
-    /// instant, this value is changed.
+/// Generally, the StateCell is only permitted to be accessed from two contexts:
+/// Either a thread holding the corresponding &mut TimerEntry, or a thread
+/// holding the timer driver lock. The write actions on the StateCell amount to
+/// passing "ownership" of the StateCell between these contexts; moving a timer
+/// from the TimerEntry to the driver requires _both_ holding the &mut
+/// TimerEntry and the driver lock, while moving it back (firing the timer)
+/// requires only the driver lock.
+pub(super) struct StateCell {
+    /// Holds either the scheduled expiration time for this timer, or (if the
+    /// timer has been fired and is unregistered), `u64::MAX`.
     state: AtomicU64,
+    /// If the timer is fired (an Acquire order read on state shows
+    /// `u64::MAX`), holds the result that should be returned from
+    /// polling the timer. Otherwise, the contents are unspecified and reading
+    /// without holding the driver lock is undefined behavior.
+    result: UnsafeCell<TimerResult>,
+    /// The currently-registered waker
+    waker: CachePadded<AtomicWaker>,
+}
 
-    /// Stores the actual error. If `state` indicates that an error occurred,
-    /// this is guaranteed to be a non-zero value representing the first error
-    /// that occurred. Otherwise its value is undefined.
-    error: AtomicU8,
+impl Default for StateCell {
+    fn default() -> Self {
+        Self::new()
+    }
+}
 
-    /// Task to notify once the deadline is reached.
-    waker: AtomicWaker,
+impl std::fmt::Debug for StateCell {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "StateCell({:?})", self.read_state())
+    }
+}
 
-    /// True when the entry is queued in the "process" stack. This value
-    /// is set before pushing the value and unset after popping the value.
-    ///
-    /// TODO: This could possibly be rolled up into `state`.
-    pub(super) queued: AtomicBool,
+impl StateCell {
+    fn new() -> Self {
+        Self {
+            state: AtomicU64::new(STATE_DEREGISTERED),
+            result: UnsafeCell::new(Ok(())),
+            waker: CachePadded(AtomicWaker::new()),
+        }
+    }
 
-    /// Next entry in the "process" linked list.
-    ///
-    /// Access to this field is coordinated by the `queued` flag.
-    ///
-    /// Represents a strong Arc ref.
-    pub(super) next_atomic: UnsafeCell<*mut Entry>,
+    fn is_pending(&self) -> bool {
+        self.state.load(Ordering::Relaxed) == STATE_PENDING_FIRE
+    }
+
+    /// Returns the current expiration time, or None if not currently scheduled.
+    fn when(&self) -> Option<u64> {
+        let cur_state = self.state.load(Ordering::Relaxed);
+
+        if cur_state == u64::MAX {
+            None
+        } else {
+            Some(cur_state)
+        }
+    }
+
+    /// If the timer is completed, returns the result of the timer. Otherwise,
+    /// returns None and registers the waker.
+    fn poll(&self, waker: &Waker) -> Poll<TimerResult> {
+        // We must register first. This ensures that either `fire` will
+        // observe the new waker, or we will observe a racing fire to have set
+        // the state, or both.
+        self.waker.0.register_by_ref(waker);
 
-    /// When the entry expires, relative to the `start` of the timer
-    /// (Inner::start). This is only used by the timer.
+        self.read_state()
+    }
+
+    fn read_state(&self) -> Poll<TimerResult> {
+        let cur_state = self.state.load(Ordering::Acquire);
+
+        if cur_state == STATE_DEREGISTERED {
+            // SAFETY: The driver has fired this timer; this involves writing
+            // the result, and then writing (with release ordering) the state
+            // field.
+            Poll::Ready(unsafe { self.result.with(|p| *p) })
+        } else {
+            Poll::Pending
+        }
+    }
+
+    /// Marks this timer as being moved to the pending list, if its scheduled
+    /// time is not after `not_after`.
     ///
-    /// A `Delay` instance can be reset to a different deadline by the thread
-    /// that owns the `Delay` instance. In this case, the timer thread will not
-    /// immediately know that this has happened. The timer thread must know the
-    /// last deadline that it saw as it uses this value to locate the entry in
-    /// its wheel.
+    /// If the timer is scheduled for a time after not_after, returns an Err
+    /// containing the current scheduled time.
     ///
-    /// Once the timer thread observes that the instant has changed, it updates
-    /// the wheel and sets this value. The idea is that this value eventually
-    /// converges to the value of `state` as the timer thread makes updates.
-    when: UnsafeCell<Option<u64>>,
+    /// SAFETY: Must hold the driver lock.
+    unsafe fn mark_pending(&self, not_after: u64) -> Result<(), u64> {
+        // Quick initial debug check to see if the timer is already fired. Since
+        // firing the timer can only happen with the driver lock held, we know
+        // we shouldn't be able to "miss" a transition to a fired state, even
+        // with relaxed ordering.
+        let mut cur_state = self.state.load(Ordering::Relaxed);
 
-    /// Next entry in the State's linked list.
-    ///
-    /// This is only accessed by the timer
-    pub(super) next_stack: UnsafeCell<Option<Arc<Entry>>>,
+        loop {
+            debug_assert!(cur_state < STATE_MIN_VALUE);
 
-    /// Previous entry in the State's linked list.
-    ///
-    /// This is only accessed by the timer and is used to unlink a canceled
-    /// entry.
+            if cur_state > not_after {
+                break Err(cur_state);
+            }
+
+            match self.state.compare_exchange(
+                cur_state,
+                STATE_PENDING_FIRE,
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            ) {
+                Ok(_) => {
+                    break Ok(());
+                }
+                Err(actual_state) => {
+                    cur_state = actual_state;
+                }
+            }
+        }
+    }
+
+    /// Fires the timer, setting the result to the provided result.
     ///
-    /// This is a weak reference.
-    pub(super) prev_stack: UnsafeCell<*const Entry>,
+    /// Returns:
+    /// * `Some(waker) - if fired and a waker needs to be invoked once the
+    ///   driver lock is released
+    /// * `None` - if fired and a waker does not need to be invoked, or if
+    ///   already fired
+    ///
+    /// SAFETY: The driver lock must be held.
+    unsafe fn fire(&self, result: TimerResult) -> Option<Waker> {
+        // Quick initial check to see if the timer is already fired. Since
+        // firing the timer can only happen with the driver lock held, we know
+        // we shouldn't be able to "miss" a transition to a fired state, even
+        // with relaxed ordering.
+        let cur_state = self.state.load(Ordering::Relaxed);
+        if cur_state == STATE_DEREGISTERED {
+            return None;
+        }
+
+        // SAFETY: We assume the driver lock is held and the timer is not
+        // fired, so only the driver is accessing this field.
+        //
+        // We perform a release-ordered store to state below, to ensure this
+        // write is visible before the state update is visible.
+        unsafe { self.result.with_mut(|p| *p = result) };
+
+        self.state.store(STATE_DEREGISTERED, Ordering::Release);
+
+        self.waker.0.take_waker()
+    }
+
+    /// Marks the timer as registered (poll will return None) and sets the
+    /// expiration time.
+    ///
+    /// While this function is memory-safe, it should only be called from a
+    /// context holding both `&mut TimerEntry` and the driver lock.
+    fn set_expiration(&self, timestamp: u64) {
+        debug_assert!(timestamp < STATE_MIN_VALUE);
+
+        // We can use relaxed ordering because we hold the driver lock and will
+        // fence when we release the lock.
+        self.state.store(timestamp, Ordering::Relaxed);
+    }
+
+    /// Attempts to adjust the timer to a new timestamp.
+    ///
+    /// If the timer has already been fired, is pending firing, or the new
+    /// timestamp is earlier than the old timestamp, (or occasionally
+    /// spuriously) returns Err without changing the timer's state. In this
+    /// case, the timer must be deregistered and re-registered.
+    fn extend_expiration(&self, new_timestamp: u64) -> Result<(), ()> {
+        let mut prior = self.state.load(Ordering::Relaxed);
+        loop {
+            if new_timestamp < prior || prior >= STATE_MIN_VALUE {
+                return Err(());
+            }
+
+            match self.state.compare_exchange_weak(
+                prior,
+                new_timestamp,
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            ) {
+                Ok(_) => {
+                    return Ok(());
+                }
+                Err(true_prior) => {
+                    prior = true_prior;
+                }
+            }
+        }
+    }
+
+    /// Returns true if the state of this timer indicates that the timer might
+    /// be registered with the driver. This check is performed with relaxed
+    /// ordering, but is conservative - if it returns false, the timer is
+    /// definitely _not_ registered.
+    pub(super) fn might_be_registered(&self) -> bool {
+        self.state.load(Ordering::Relaxed) != u64::MAX
+    }
 }
 
-/// Stores the info for `Delay`.
+/// A timer entry.
+///
+/// This is the handle to a timer that is controlled by the requester of the
+/// timer. As this participates in intrusive data structures, it must be pinned
+/// before polling.
 #[derive(Debug)]
-pub(crate) struct Time {
-    pub(crate) deadline: Instant,
-    pub(crate) duration: Duration,
+pub(super) struct TimerEntry {
+    /// Arc reference to the driver. We can only free the driver after
+    /// deregistering everything from their respective timer wheels.
+    driver: Handle,
+    /// Shared inner structure; this is part of an intrusive linked list, and
+    /// therefore other references can exist to it while mutable references to
+    /// Entry exist.
+    ///
+    /// This is manipulated only under the inner mutex. TODO: Can we use loom
+    /// cells for this?
+    inner: StdUnsafeCell<TimerShared>,
+    /// Initial deadline for the timer. This is used to register on the first
+    /// poll, as we can't register prior to being pinned.
+    initial_deadline: Option<Instant>,
+    /// Ensure the type is !Unpin
+    _m: std::marker::PhantomPinned,
 }
 
-/// Flag indicating a timer entry has elapsed
-const ELAPSED: u64 = 1 << 63;
+unsafe impl Send for TimerEntry {}
+unsafe impl Sync for TimerEntry {}
 
-/// Flag indicating a timer entry has reached an error state
-const ERROR: u64 = u64::MAX;
+/// An TimerHandle is the (non-enforced) "unique" pointer from the driver to the
+/// timer entry. Generally, at most one TimerHandle exists for a timer at a time
+/// (enforced by the timer state machine).
+///
+/// SAFETY: An TimerHandle is essentially a raw pointer, and the usual caveats
+/// of pointer safety apply. In particular, TimerHandle does not itself enforce
+/// that the timer does still exist; however, normally an TimerHandle is created
+/// immediately before registering the timer, and is consumed when firing the
+/// timer, to help minimize mistakes. Still, because TimerHandle cannot enforce
+/// memory safety, all operations are unsafe.
+#[derive(Debug)]
+pub(crate) struct TimerHandle {
+    inner: NonNull<TimerShared>,
+}
 
-// ===== impl Entry =====
+pub(super) type EntryList = crate::util::linked_list::LinkedList<TimerShared, TimerShared>;
 
-impl Entry {
-    pub(crate) fn new(handle: &Handle, deadline: Instant, duration: Duration) -> Arc<Entry> {
-        let inner = handle.inner().unwrap();
-        let entry: Entry;
-
-        // Increment the number of active timeouts
-        if let Err(err) = inner.increment() {
-            entry = Entry::new2(deadline, duration, Weak::new(), ERROR);
-            entry.error(err);
-        } else {
-            let when = inner.normalize_deadline(deadline);
-            let state = if when <= inner.elapsed() {
-                ELAPSED
-            } else {
-                when
-            };
-            entry = Entry::new2(deadline, duration, Arc::downgrade(&inner), state);
-        }
+/// The shared state structure of a timer. This structure is shared between the
+/// frontend (`Entry`) and driver backend.
+///
+/// Note that this structure is located inside the `TimerEntry` structure.
+#[derive(Debug)]
+pub(crate) struct TimerShared {
+    /// Current state. This records whether the timer entry is currently under
+    /// the ownership of the driver, and if not, its current state (not
+    /// complete, fired, error, etc).
+    state: StateCell,
 
-        let entry = Arc::new(entry);
-        if let Err(err) = inner.queue(&entry) {
-            entry.error(err);
+    /// Data manipulated by the driver thread itself, only.
+    driver_state: CachePadded<TimerSharedPadded>,
+
+    _p: PhantomPinned,
+}
+
+impl TimerShared {
+    pub(super) fn new() -> Self {
+        Self {
+            state: StateCell::default(),
+            driver_state: CachePadded(TimerSharedPadded::new()),
+            _p: PhantomPinned,
         }
+    }
 
-        entry
+    /// Gets the cached time-of-expiration value
+    pub(super) fn cached_when(&self) -> u64 {
+        // Cached-when is only accessed under the driver lock, so we can use relaxed
+        self.driver_state.0.cached_when.load(Ordering::Relaxed)
     }
 
-    /// Only called by `Registration`
-    pub(crate) fn time_ref(&self) -> &Time {
-        unsafe { &*self.time.0.get() }
+    /// Gets the true time-of-expiration value, and copies it into the cached
+    /// time-of-expiration value.
+    ///
+    /// SAFETY: Must be called with the driver lock held, and when this entry is
+    /// not in any timer wheel lists.
+    pub(super) unsafe fn sync_when(&self) -> u64 {
+        let true_when = self.true_when();
+
+        self.driver_state
+            .0
+            .cached_when
+            .store(true_when, Ordering::Relaxed);
+
+        true_when
     }
 
-    /// Only called by `Registration`
-    #[allow(clippy::mut_from_ref)] // https://github.com/rust-lang/rust-clippy/issues/4281
-    pub(crate) unsafe fn time_mut(&self) -> &mut Time {
-        &mut *self.time.0.get()
+    /// Sets the cached time-of-expiration value.
+    ///
+    /// SAFETY: Must be called with the driver lock held, and when this entry is
+    /// not in any timer wheel lists.
+    unsafe fn set_cached_when(&self, when: u64) {
+        self.driver_state
+            .0
+            .cached_when
+            .store(when, Ordering::Relaxed);
     }
 
-    /// The current entry state as known by the timer. This is not the value of
-    /// `state`, but lets the timer know how to converge its state to `state`.
-    pub(crate) fn when_internal(&self) -> Option<u64> {
-        unsafe { *self.when.get() }
+    /// Returns the true time-of-expiration value, with relaxed memory ordering.
+    pub(super) fn true_when(&self) -> u64 {
+        self.state.when().expect("Timer already fired")
     }
 
-    pub(crate) fn set_when_internal(&self, when: Option<u64>) {
-        unsafe {
-            *self.when.get() = when;
-        }
+    /// Sets the true time-of-expiration value, even if it is less than the
+    /// current expiration or the timer is deregistered.
+    ///
+    /// SAFETY: Must only be called with the driver lock held and the entry not
+    /// in the timer wheel.
+    pub(super) unsafe fn set_expiration(&self, t: u64) {
+        self.state.set_expiration(t);
+        self.driver_state.0.cached_when.store(t, Ordering::Relaxed);
     }
 
-    /// Called by `Timer` to load the current value of `state` for processing
-    pub(crate) fn load_state(&self) -> Option<u64> {
-        let state = self.state.load(SeqCst);
+    /// Sets the true time-of-expiration only if it is after the current.
+    pub(super) fn extend_expiration(&self, t: u64) -> Result<(), ()> {
+        self.state.extend_expiration(t)
+    }
 
-        if is_elapsed(state) {
-            None
-        } else {
-            Some(state)
+    /// Returns a TimerHandle for this timer.
+    pub(super) fn handle(&self) -> TimerHandle {
+        TimerHandle {
+            inner: NonNull::from(self),
         }
     }
 
-    pub(crate) fn is_elapsed(&self) -> bool {
-        let state = self.state.load(SeqCst);
-        is_elapsed(state)
+    /// Returns true if the state of this timer indicates that the timer might
+    /// be registered with the driver. This check is performed with relaxed
+    /// ordering, but is conservative - if it returns false, the timer is
+    /// definitely _not_ registered.
+    pub(super) fn might_be_registered(&self) -> bool {
+        self.state.might_be_registered()
     }
+}
 
-    pub(crate) fn fire(&self, when: u64) {
-        let mut curr = self.state.load(SeqCst);
+/// Additional shared state between the driver and the timer which is cache
+/// padded. This contains the information that the driver thread accesses most
+/// frequently to minimize contention. In particular, we move it away from the
+/// waker, as the waker is updated on every poll.
+struct TimerSharedPadded {
+    /// The expiration time for which this entry is currently registered.
+    /// Generally owned by the driver, but is accessed by the entry when not
+    /// registered.
+    cached_when: AtomicU64,
 
-        loop {
-            if is_elapsed(curr) || curr > when {
-                return;
-            }
+    /// The true expiration time. Set by the timer future, read by the driver.
+    true_when: AtomicU64,
 
-            let next = ELAPSED | curr;
-            let actual = self.state.compare_and_swap(curr, next, SeqCst);
+    /// A link within the doubly-linked list of timers on a particular level and
+    /// slot. Valid only if state is equal to Registered.
+    ///
+    /// Only accessed under the entry lock.
+    pointers: StdUnsafeCell<linked_list::Pointers<TimerShared>>,
+}
 
-            if curr == actual {
-                break;
-            }
+impl std::fmt::Debug for TimerSharedPadded {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("TimerSharedPadded")
+            .field("when", &self.true_when.load(Ordering::Relaxed))
+            .field("cached_when", &self.cached_when.load(Ordering::Relaxed))
+            .finish()
+    }
+}
 
-            curr = actual;
+impl TimerSharedPadded {
+    fn new() -> Self {
+        Self {
+            cached_when: AtomicU64::new(0),
+            true_when: AtomicU64::new(0),
+            pointers: StdUnsafeCell::new(linked_list::Pointers::new()),
         }
-
-        self.waker.wake();
     }
+}
 
-    pub(crate) fn error(&self, error: Error) {
-        // Record the precise nature of the error, if there isn't already an
-        // error present. If we don't actually transition to the error state
-        // below, that's fine, as the error details we set here will be ignored.
-        self.error.compare_and_swap(0, error.as_u8(), SeqCst);
+unsafe impl Send for TimerShared {}
+unsafe impl Sync for TimerShared {}
 
-        // Only transition to the error state if not currently elapsed
-        let mut curr = self.state.load(SeqCst);
+unsafe impl linked_list::Link for TimerShared {
+    type Handle = TimerHandle;
 
-        loop {
-            if is_elapsed(curr) {
-                return;
-            }
+    type Target = TimerShared;
 
-            let next = ERROR;
+    fn as_raw(handle: &Self::Handle) -> NonNull<Self::Target> {
+        handle.inner
+    }
 
-            let actual = self.state.compare_and_swap(curr, next, SeqCst);
+    unsafe fn from_raw(ptr: NonNull<Self::Target>) -> Self::Handle {
+        TimerHandle { inner: ptr }
+    }
 
-            if curr == actual {
-                break;
-            }
+    unsafe fn pointers(
+        target: NonNull<Self::Target>,
+    ) -> NonNull<linked_list::Pointers<Self::Target>> {
+        unsafe { NonNull::new(target.as_ref().driver_state.0.pointers.get()).unwrap() }
+    }
+}
 
-            curr = actual;
-        }
+// ===== impl Entry =====
+
+impl TimerEntry {
+    pub(crate) fn new(handle: &Handle, deadline: Instant) -> Self {
+        let driver = handle.clone();
 
-        self.waker.wake();
+        Self {
+            driver,
+            inner: StdUnsafeCell::new(TimerShared::new()),
+            initial_deadline: Some(deadline),
+            _m: std::marker::PhantomPinned,
+        }
     }
 
-    pub(crate) fn cancel(entry: &Arc<Entry>) {
-        let state = entry.state.fetch_or(ELAPSED, SeqCst);
+    fn inner(&self) -> &TimerShared {
+        unsafe { &*self.inner.get() }
+    }
 
-        if is_elapsed(state) {
-            // Nothing more to do
-            return;
-        }
+    pub(crate) fn is_elapsed(&self) -> bool {
+        !self.inner().state.might_be_registered() && self.initial_deadline.is_none()
+    }
 
-        // If registered with a timer instance, try to upgrade the Arc.
-        let inner = match entry.upgrade_inner() {
-            Some(inner) => inner,
-            None => return,
-        };
-
-        let _ = inner.queue(entry);
-    }
-
-    pub(crate) fn poll_elapsed(&self, cx: &mut task::Context<'_>) -> Poll<Result<(), Error>> {
-        let mut curr = self.state.load(SeqCst);
-
-        if is_elapsed(curr) {
-            return Poll::Ready(if curr == ERROR {
-                Err(Error::from_u8(self.error.load(SeqCst)))
-            } else {
-                Ok(())
-            });
-        }
+    /// Cancels and deregisters the timer. This operation is irreversible.
+    pub(crate) fn cancel(self: Pin<&mut Self>) {
+        // We need to perform an acq/rel fence with the driver thread, and the
+        // simplest way to do so is to grab the driver lock.
+        //
+        // Why is this necessary? We're about to release this timer's memory for
+        // some other non-timer use. However, we've been doing a bunch of
+        // relaxed (or even non-atomic) writes from the driver thread, and we'll
+        // be doing more from _this thread_ (as this memory is interpreted as
+        // something else).
+        //
+        // It is critical to ensure that, from the point of view of the driver,
+        // those future non-timer writes happen-after the timer is fully fired,
+        // and from the purpose of this thread, the driver's writes all
+        // happen-before we drop the timer. This in turn requires us to perform
+        // an acquire-release barrier in _both_ directions between the driver
+        // and dropping thread.
+        //
+        // The lock acquisition in clear_entry serves this purpose. All of the
+        // driver manipulations happen with the lock held, so we can just take
+        // the lock and be sure that this drop happens-after everything the
+        // driver did so far and happens-before everything the driver does in
+        // the future. While we have the lock held, we also go ahead and
+        // deregister the entry if necessary.
+        unsafe { self.driver.clear_entry(NonNull::from(self.inner())) };
+    }
 
-        self.waker.register_by_ref(cx.waker());
+    pub(crate) fn reset(mut self: Pin<&mut Self>, new_time: Instant) {
+        unsafe { self.as_mut().get_unchecked_mut() }.initial_deadline = None;
 
-        curr = self.state.load(SeqCst);
+        let tick = self.driver.time_source().deadline_to_tick(new_time);
 
-        if is_elapsed(curr) {
-            return Poll::Ready(if curr == ERROR {
-                Err(Error::from_u8(self.error.load(SeqCst)))
-            } else {
-                Ok(())
-            });
+        if self.inner().extend_expiration(tick).is_ok() {
+            return;
         }
 
-        Poll::Pending
+        unsafe {
+            self.driver.reregister(tick, self.inner().into());
+        }
     }
 
-    /// Only called by `Registration`
-    pub(crate) fn reset(entry: &mut Arc<Entry>) {
-        let inner = match entry.upgrade_inner() {
-            Some(inner) => inner,
-            None => return,
-        };
-
-        let deadline = entry.time_ref().deadline;
-        let when = inner.normalize_deadline(deadline);
-        let elapsed = inner.elapsed();
-
-        let next = if when <= elapsed { ELAPSED } else { when };
+    pub(crate) fn poll_elapsed(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<(), super::Error>> {
+        if self.driver.is_shutdown() {
+            panic!("{}", crate::util::error::RUNTIME_SHUTTING_DOWN_ERROR);
+        }
 
-        let mut curr = entry.state.load(SeqCst);
+        if let Some(deadline) = self.initial_deadline {
+            self.as_mut().reset(deadline);
+        }
 
-        loop {
-            // In these two cases, there is no work to do when resetting the
-            // timer. If the `Entry` is in an error state, then it cannot be
-            // used anymore. If resetting the entry to the current value, then
-            // the reset is a noop.
-            if curr == ERROR || curr == when {
-                return;
-            }
+        let this = unsafe { self.get_unchecked_mut() };
 
-            let actual = entry.state.compare_and_swap(curr, next, SeqCst);
+        this.inner().state.poll(cx.waker())
+    }
+}
 
-            if curr == actual {
-                break;
-            }
+impl TimerHandle {
+    pub(super) unsafe fn cached_when(&self) -> u64 {
+        unsafe { self.inner.as_ref().cached_when() }
+    }
 
-            curr = actual;
-        }
+    pub(super) unsafe fn sync_when(&self) -> u64 {
+        unsafe { self.inner.as_ref().sync_when() }
+    }
 
-        // If the state has transitioned to 'elapsed' then wake the task as
-        // this entry is ready to be polled.
-        if !is_elapsed(curr) && is_elapsed(next) {
-            entry.waker.wake();
-        }
+    pub(super) unsafe fn is_pending(&self) -> bool {
+        unsafe { self.inner.as_ref().state.is_pending() }
+    }
 
-        // The driver tracks all non-elapsed entries; notify the driver that it
-        // should update its state for this entry unless the entry had already
-        // elapsed and remains elapsed.
-        if !is_elapsed(curr) || !is_elapsed(next) {
-            let _ = inner.queue(entry);
-        }
+    /// Forcibly sets the true and cached expiration times to the given tick.
+    ///
+    /// SAFETY: The caller must ensure that the handle remains valid, the driver
+    /// lock is held, and that the timer is not in any wheel linked lists.
+    pub(super) unsafe fn set_expiration(&self, tick: u64) {
+        self.inner.as_ref().set_expiration(tick);
     }
 
-    fn new2(deadline: Instant, duration: Duration, inner: Weak<Inner>, state: u64) -> Self {
-        Self {
-            time: CachePadded(UnsafeCell::new(Time { deadline, duration })),
-            inner,
-            waker: AtomicWaker::new(),
-            state: AtomicU64::new(state),
-            queued: AtomicBool::new(false),
-            error: AtomicU8::new(0),
-            next_atomic: UnsafeCell::new(ptr::null_mut()),
-            when: UnsafeCell::new(None),
-            next_stack: UnsafeCell::new(None),
-            prev_stack: UnsafeCell::new(ptr::null_mut()),
+    /// Attempts to mark this entry as pending. If the expiration time is after
+    /// `not_after`, however, returns an Err with the current expiration time.
+    ///
+    /// If an `Err` is returned, the `cached_when` value will be updated to this
+    /// new expiration time.
+    ///
+    /// SAFETY: The caller must ensure that the handle remains valid, the driver
+    /// lock is held, and that the timer is not in any wheel linked lists.
+    /// After returning Ok, the entry must be added to the pending list.
+    pub(super) unsafe fn mark_pending(&self, not_after: u64) -> Result<(), u64> {
+        match self.inner.as_ref().state.mark_pending(not_after) {
+            Ok(()) => {
+                // mark this as being on the pending queue in cached_when
+                self.inner.as_ref().set_cached_when(u64::MAX);
+                Ok(())
+            }
+            Err(tick) => {
+                self.inner.as_ref().set_cached_when(tick);
+                Err(tick)
+            }
         }
     }
 
-    fn upgrade_inner(&self) -> Option<Arc<Inner>> {
-        self.inner.upgrade()
+    /// Attempts to transition to a terminal state. If the state is already a
+    /// terminal state, does nothing.
+    ///
+    /// Because the entry might be dropped after the state is moved to a
+    /// terminal state, this function consumes the handle to ensure we don't
+    /// access the entry afterwards.
+    ///
+    /// Returns the last-registered waker, if any.
+    ///
+    /// SAFETY: The driver lock must be held while invoking this function, and
+    /// the entry must not be in any wheel linked lists.
+    pub(super) unsafe fn fire(self, completed_state: TimerResult) -> Option<Waker> {
+        self.inner.as_ref().state.fire(completed_state)
     }
 }
 
-fn is_elapsed(state: u64) -> bool {
-    state & ELAPSED == ELAPSED
-}
-
-impl Drop for Entry {
+impl Drop for TimerEntry {
     fn drop(&mut self) {
-        let inner = match self.upgrade_inner() {
-            Some(inner) => inner,
-            None => return,
-        };
-
-        inner.decrement();
+        unsafe { Pin::new_unchecked(self) }.as_mut().cancel()
     }
 }
 
-unsafe impl Send for Entry {}
-unsafe impl Sync for Entry {}
-
 #[cfg_attr(target_arch = "x86_64", repr(align(128)))]
 #[cfg_attr(not(target_arch = "x86_64"), repr(align(64)))]
-#[derive(Debug)]
+#[derive(Debug, Default)]
 struct CachePadded<T>(T);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/handle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/handle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/handle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/handle.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,33 +1,83 @@
-use crate::runtime::context;
-use crate::time::driver::Inner;
+use crate::loom::sync::Arc;
+use crate::time::driver::ClockTime;
 use std::fmt;
-use std::sync::{Arc, Weak};
 
 /// Handle to time driver instance.
 #[derive(Clone)]
 pub(crate) struct Handle {
-    inner: Weak<Inner>,
+    time_source: ClockTime,
+    inner: Arc<super::Inner>,
 }
 
 impl Handle {
     /// Creates a new timer `Handle` from a shared `Inner` timer state.
-    pub(crate) fn new(inner: Weak<Inner>) -> Self {
-        Handle { inner }
+    pub(super) fn new(inner: Arc<super::Inner>) -> Self {
+        let time_source = inner.state.lock().time_source.clone();
+        Handle { time_source, inner }
     }
 
-    /// Tries to get a handle to the current timer.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if there is no current timer set.
-    pub(crate) fn current() -> Self {
-        context::time_handle()
-            .expect("there is no timer running, must be called from the context of Tokio runtime")
-    }
-
-    /// Tries to return a strong ref to the inner
-    pub(crate) fn inner(&self) -> Option<Arc<Inner>> {
-        self.inner.upgrade()
+    /// Returns the time source associated with this handle
+    pub(super) fn time_source(&self) -> &ClockTime {
+        &self.time_source
+    }
+
+    /// Access the driver's inner structure
+    pub(super) fn get(&self) -> &super::Inner {
+        &*self.inner
+    }
+
+    // Check whether the driver has been shutdown
+    pub(super) fn is_shutdown(&self) -> bool {
+        self.inner.is_shutdown()
+    }
+}
+
+cfg_rt! {
+    impl Handle {
+        /// Tries to get a handle to the current timer.
+        ///
+        /// # Panics
+        ///
+        /// This function panics if there is no current timer set.
+        ///
+        /// It can be triggered when `Builder::enable_time()` or
+        /// `Builder::enable_all()` are not included in the builder.
+        ///
+        /// It can also panic whenever a timer is created outside of a
+        /// Tokio runtime. That is why `rt.block_on(delay_for(...))` will panic,
+        /// since the function is executed outside of the runtime.
+        /// Whereas `rt.block_on(async {delay_for(...).await})` doesn't panic.
+        /// And this is because wrapping the function on an async makes it lazy,
+        /// and so gets executed inside the runtime successfully without
+        /// panicking.
+        pub(crate) fn current() -> Self {
+            crate::runtime::context::time_handle()
+                .expect("A Tokio 1.x context was found, but timers are disabled. Call `enable_time` on the runtime builder to enable timers.")
+        }
+    }
+}
+
+cfg_not_rt! {
+    impl Handle {
+        /// Tries to get a handle to the current timer.
+        ///
+        /// # Panics
+        ///
+        /// This function panics if there is no current timer set.
+        ///
+        /// It can be triggered when `Builder::enable_time()` or
+        /// `Builder::enable_all()` are not included in the builder.
+        ///
+        /// It can also panic whenever a timer is created outside of a Tokio
+        /// runtime. That is why `rt.block_on(delay_for(...))` will panic,
+        /// since the function is executed outside of the runtime.
+        /// Whereas `rt.block_on(async {delay_for(...).await})` doesn't
+        /// panic. And this is because wrapping the function on an async makes it
+        /// lazy, and so outside executed inside the runtime successfully without
+        /// panicking.
+        pub(crate) fn current() -> Self {
+            panic!("{}", crate::util::error::CONTEXT_MISSING_ERROR)
+        }
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,37 +1,37 @@
-//! Time driver
+// Currently, rust warns when an unsafe fn contains an unsafe {} block. However,
+// in the future, this will change to the reverse. For now, suppress this
+// warning and generally stick with being explicit about unsafety.
+#![allow(unused_unsafe)]
+#![cfg_attr(not(feature = "rt"), allow(dead_code))]
 
-mod atomic_stack;
-use self::atomic_stack::AtomicStack;
+//! Time driver
 
 mod entry;
-pub(super) use self::entry::Entry;
+pub(self) use self::entry::{EntryList, TimerEntry, TimerHandle, TimerShared};
 
 mod handle;
 pub(crate) use self::handle::Handle;
 
-mod registration;
-pub(crate) use self::registration::Registration;
+mod wheel;
 
-mod stack;
-use self::stack::Stack;
+pub(super) mod sleep;
 
-use crate::loom::sync::atomic::{AtomicU64, AtomicUsize};
+use crate::loom::sync::atomic::{AtomicBool, Ordering};
+use crate::loom::sync::{Arc, Mutex};
 use crate::park::{Park, Unpark};
-use crate::time::{wheel, Error};
+use crate::time::error::Error;
 use crate::time::{Clock, Duration, Instant};
 
-use std::sync::atomic::Ordering::{Acquire, Relaxed, Release, SeqCst};
-
-use std::sync::Arc;
-use std::usize;
-use std::{cmp, fmt};
+use std::convert::TryInto;
+use std::fmt;
+use std::{num::NonZeroU64, ptr::NonNull, task::Waker};
 
-/// Time implementation that drives [`Delay`][delay], [`Interval`][interval], and [`Timeout`][timeout].
+/// Time implementation that drives [`Sleep`][sleep], [`Interval`][interval], and [`Timeout`][timeout].
 ///
 /// A `Driver` instance tracks the state necessary for managing time and
-/// notifying the [`Delay`][delay] instances once their deadlines are reached.
+/// notifying the [`Sleep`][sleep] instances once their deadlines are reached.
 ///
-/// It is expected that a single instance manages many individual [`Delay`][delay]
+/// It is expected that a single instance manages many individual [`Sleep`][sleep]
 /// instances. The `Driver` implementation is thread-safe and, as such, is able
 /// to handle callers from across threads.
 ///
@@ -42,9 +42,9 @@
 /// The driver has a resolution of one millisecond. Any unit of time that falls
 /// between milliseconds are rounded up to the next millisecond.
 ///
-/// When an instance is dropped, any outstanding [`Delay`][delay] instance that has not
+/// When an instance is dropped, any outstanding [`Sleep`][sleep] instance that has not
 /// elapsed will be notified with an error. At this point, calling `poll` on the
-/// [`Delay`][delay] instance will result in panic.
+/// [`Sleep`][sleep] instance will result in panic.
 ///
 /// # Implementation
 ///
@@ -71,337 +71,450 @@
 /// * Level 5: 64 x ~12 day slots.
 ///
 /// When the timer processes entries at level zero, it will notify all the
-/// `Delay` instances as their deadlines have been reached. For all higher
+/// `Sleep` instances as their deadlines have been reached. For all higher
 /// levels, all entries will be redistributed across the wheel at the next level
-/// down. Eventually, as time progresses, entries will [`Delay`][delay] instances will
+/// down. Eventually, as time progresses, entries with [`Sleep`][sleep] instances will
 /// either be canceled (dropped) or their associated entries will reach level
 /// zero and be notified.
 ///
 /// [paper]: http://www.cs.columbia.edu/~nahum/w6998/papers/ton97-timing-wheels.pdf
-/// [delay]: crate::time::Delay
+/// [sleep]: crate::time::Sleep
 /// [timeout]: crate::time::Timeout
 /// [interval]: crate::time::Interval
 #[derive(Debug)]
-pub(crate) struct Driver<T: Park> {
+pub(crate) struct Driver<P: Park + 'static> {
+    /// Timing backend in use
+    time_source: ClockTime,
+
     /// Shared state
-    inner: Arc<Inner>,
+    handle: Handle,
 
-    /// Timer wheel
-    wheel: wheel::Wheel<Stack>,
+    /// Parker to delegate to
+    park: P,
 
-    /// Thread parker. The `Driver` park implementation delegates to this.
-    park: T,
+    // When `true`, a call to `park_timeout` should immediately return and time
+    // should not advance. One reason for this to be `true` is if the task
+    // passed to `Runtime::block_on` called `task::yield_now()`.
+    //
+    // While it may look racy, it only has any effect when the clock is paused
+    // and pausing the clock is restricted to a single-threaded runtime.
+    #[cfg(feature = "test-util")]
+    did_wake: Arc<AtomicBool>,
+}
 
-    /// Source of "now" instances
-    clock: Clock,
+/// A structure which handles conversion from Instants to u64 timestamps.
+#[derive(Debug, Clone)]
+pub(self) struct ClockTime {
+    clock: super::clock::Clock,
+    start_time: Instant,
+}
 
-    /// True if the driver is being shutdown
-    is_shutdown: bool,
+impl ClockTime {
+    pub(self) fn new(clock: Clock) -> Self {
+        Self {
+            start_time: clock.now(),
+            clock,
+        }
+    }
+
+    pub(self) fn deadline_to_tick(&self, t: Instant) -> u64 {
+        // Round up to the end of a ms
+        self.instant_to_tick(t + Duration::from_nanos(999_999))
+    }
+
+    pub(self) fn instant_to_tick(&self, t: Instant) -> u64 {
+        // round up
+        let dur: Duration = t
+            .checked_duration_since(self.start_time)
+            .unwrap_or_else(|| Duration::from_secs(0));
+        let ms = dur.as_millis();
+
+        ms.try_into().expect("Duration too far into the future")
+    }
+
+    pub(self) fn tick_to_duration(&self, t: u64) -> Duration {
+        Duration::from_millis(t)
+    }
+
+    pub(self) fn now(&self) -> u64 {
+        self.instant_to_tick(self.clock.now())
+    }
 }
 
 /// Timer state shared between `Driver`, `Handle`, and `Registration`.
-pub(crate) struct Inner {
-    /// The instant at which the timer started running.
-    start: Instant,
+struct Inner {
+    // The state is split like this so `Handle` can access `is_shutdown` without locking the mutex
+    pub(super) state: Mutex<InnerState>,
+
+    /// True if the driver is being shutdown
+    pub(super) is_shutdown: AtomicBool,
+}
+
+/// Time state shared which must be protected by a `Mutex`
+struct InnerState {
+    /// Timing backend in use
+    time_source: ClockTime,
 
     /// The last published timer `elapsed` value.
-    elapsed: AtomicU64,
+    elapsed: u64,
 
-    /// Number of active timeouts
-    num: AtomicUsize,
+    /// The earliest time at which we promise to wake up without unparking
+    next_wake: Option<NonZeroU64>,
 
-    /// Head of the "process" linked list.
-    process: AtomicStack,
+    /// Timer wheel
+    wheel: wheel::Wheel,
 
-    /// Unparks the timer thread.
+    /// Unparker that can be used to wake the time driver
     unpark: Box<dyn Unpark>,
 }
 
-/// Maximum number of timeouts the system can handle concurrently.
-const MAX_TIMEOUTS: usize = usize::MAX >> 1;
-
 // ===== impl Driver =====
 
-impl<T> Driver<T>
+impl<P> Driver<P>
 where
-    T: Park,
+    P: Park + 'static,
 {
     /// Creates a new `Driver` instance that uses `park` to block the current
-    /// thread and `clock` to get the current `Instant`.
+    /// thread and `time_source` to get the current time and convert to ticks.
     ///
     /// Specifying the source of time is useful when testing.
-    pub(crate) fn new(park: T, clock: Clock) -> Driver<T> {
-        let unpark = Box::new(park.unpark());
+    pub(crate) fn new(park: P, clock: Clock) -> Driver<P> {
+        let time_source = ClockTime::new(clock);
+
+        let inner = Inner::new(time_source.clone(), Box::new(park.unpark()));
 
         Driver {
-            inner: Arc::new(Inner::new(clock.now(), unpark)),
-            wheel: wheel::Wheel::new(),
+            time_source,
+            handle: Handle::new(Arc::new(inner)),
             park,
-            clock,
-            is_shutdown: false,
+            #[cfg(feature = "test-util")]
+            did_wake: Arc::new(AtomicBool::new(false)),
         }
     }
 
     /// Returns a handle to the timer.
     ///
-    /// The `Handle` is how `Delay` instances are created. The `Delay` instances
+    /// The `Handle` is how `Sleep` instances are created. The `Sleep` instances
     /// can either be created directly or the `Handle` instance can be passed to
     /// `with_default`, setting the timer as the default timer for the execution
     /// context.
     pub(crate) fn handle(&self) -> Handle {
-        Handle::new(Arc::downgrade(&self.inner))
+        self.handle.clone()
     }
 
-    /// Converts an `Expiration` to an `Instant`.
-    fn expiration_instant(&self, when: u64) -> Instant {
-        self.inner.start + Duration::from_millis(when)
-    }
+    fn park_internal(&mut self, limit: Option<Duration>) -> Result<(), P::Error> {
+        let mut lock = self.handle.get().state.lock();
 
-    /// Runs timer related logic
-    fn process(&mut self) {
-        let now = crate::time::ms(
-            self.clock.now() - self.inner.start,
-            crate::time::Round::Down,
-        );
-        let mut poll = wheel::Poll::new(now);
+        assert!(!self.handle.is_shutdown());
 
-        while let Some(entry) = self.wheel.poll(&mut poll, &mut ()) {
-            let when = entry.when_internal().expect("invalid internal entry state");
+        let next_wake = lock.wheel.next_expiration_time();
+        lock.next_wake =
+            next_wake.map(|t| NonZeroU64::new(t).unwrap_or_else(|| NonZeroU64::new(1).unwrap()));
 
-            // Fire the entry
-            entry.fire(when);
+        drop(lock);
 
-            // Track that the entry has been fired
-            entry.set_when_internal(None);
+        match next_wake {
+            Some(when) => {
+                let now = self.time_source.now();
+                // Note that we effectively round up to 1ms here - this avoids
+                // very short-duration microsecond-resolution sleeps that the OS
+                // might treat as zero-length.
+                let mut duration = self.time_source.tick_to_duration(when.saturating_sub(now));
+
+                if duration > Duration::from_millis(0) {
+                    if let Some(limit) = limit {
+                        duration = std::cmp::min(limit, duration);
+                    }
+
+                    self.park_timeout(duration)?;
+                } else {
+                    self.park.park_timeout(Duration::from_secs(0))?;
+                }
+            }
+            None => {
+                if let Some(duration) = limit {
+                    self.park_timeout(duration)?;
+                } else {
+                    self.park.park()?;
+                }
+            }
         }
 
-        // Update the elapsed cache
-        self.inner.elapsed.store(self.wheel.elapsed(), SeqCst);
+        // Process pending timers after waking up
+        self.handle.process();
+
+        Ok(())
     }
 
-    /// Processes the entry queue
-    ///
-    /// This handles adding and canceling timeouts.
-    fn process_queue(&mut self) {
-        for entry in self.inner.process.take() {
-            match (entry.when_internal(), entry.load_state()) {
-                (None, None) => {
-                    // Nothing to do
-                }
-                (Some(_), None) => {
-                    // Remove the entry
-                    self.clear_entry(&entry);
-                }
-                (None, Some(when)) => {
-                    // Queue the entry
-                    self.add_entry(entry, when);
-                }
-                (Some(_), Some(next)) => {
-                    self.clear_entry(&entry);
-                    self.add_entry(entry, next);
+    cfg_test_util! {
+        fn park_timeout(&mut self, duration: Duration) -> Result<(), P::Error> {
+            let clock = &self.time_source.clock;
+
+            if clock.is_paused() {
+                self.park.park_timeout(Duration::from_secs(0))?;
+
+                // If the time driver was woken, then the park completed
+                // before the "duration" elapsed (usually caused by a
+                // yield in `Runtime::block_on`). In this case, we don't
+                // advance the clock.
+                if !self.did_wake() {
+                    // Simulate advancing time
+                    clock.advance(duration);
                 }
+            } else {
+                self.park.park_timeout(duration)?;
             }
+
+            Ok(())
         }
-    }
 
-    fn clear_entry(&mut self, entry: &Arc<Entry>) {
-        self.wheel.remove(entry, &mut ());
-        entry.set_when_internal(None);
+        fn did_wake(&self) -> bool {
+            self.did_wake.swap(false, Ordering::SeqCst)
+        }
     }
 
-    /// Fires the entry if it needs to, otherwise queue it to be processed later.
-    ///
-    /// Returns `None` if the entry was fired.
-    fn add_entry(&mut self, entry: Arc<Entry>, when: u64) {
-        use crate::time::wheel::InsertError;
-
-        entry.set_when_internal(Some(when));
-
-        match self.wheel.insert(when, entry, &mut ()) {
-            Ok(_) => {}
-            Err((entry, InsertError::Elapsed)) => {
-                // The entry's deadline has elapsed, so fire it and update the
-                // internal state accordingly.
-                entry.set_when_internal(None);
-                entry.fire(when);
-            }
-            Err((entry, InsertError::Invalid)) => {
-                // The entry's deadline is invalid, so error it and update the
-                // internal state accordingly.
-                entry.set_when_internal(None);
-                entry.error(Error::invalid());
-            }
+    cfg_not_test_util! {
+        fn park_timeout(&mut self, duration: Duration) -> Result<(), P::Error> {
+            self.park.park_timeout(duration)
         }
     }
 }
 
-impl<T> Park for Driver<T>
-where
-    T: Park,
-{
-    type Unpark = T::Unpark;
-    type Error = T::Error;
+impl Handle {
+    /// Runs timer related logic, and returns the next wakeup time
+    pub(self) fn process(&self) {
+        let now = self.time_source().now();
 
-    fn unpark(&self) -> Self::Unpark {
-        self.park.unpark()
+        self.process_at_time(now)
     }
 
-    fn park(&mut self) -> Result<(), Self::Error> {
-        self.process_queue();
+    pub(self) fn process_at_time(&self, mut now: u64) {
+        let mut waker_list: [Option<Waker>; 32] = Default::default();
+        let mut waker_idx = 0;
 
-        match self.wheel.poll_at() {
-            Some(when) => {
-                let now = self.clock.now();
-                let deadline = self.expiration_instant(when);
+        let mut lock = self.get().lock();
+
+        if now < lock.elapsed {
+            // Time went backwards! This normally shouldn't happen as the Rust language
+            // guarantees that an Instant is monotonic, but can happen when running
+            // Linux in a VM on a Windows host due to std incorrectly trusting the
+            // hardware clock to be monotonic.
+            //
+            // See <https://github.com/tokio-rs/tokio/issues/3619> for more information.
+            now = lock.elapsed;
+        }
 
-                if deadline > now {
-                    let dur = deadline - now;
+        while let Some(entry) = lock.wheel.poll(now) {
+            debug_assert!(unsafe { entry.is_pending() });
 
-                    if self.clock.is_paused() {
-                        self.park.park_timeout(Duration::from_secs(0))?;
-                        self.clock.advance(dur);
-                    } else {
-                        self.park.park_timeout(dur)?;
+            // SAFETY: We hold the driver lock, and just removed the entry from any linked lists.
+            if let Some(waker) = unsafe { entry.fire(Ok(())) } {
+                waker_list[waker_idx] = Some(waker);
+
+                waker_idx += 1;
+
+                if waker_idx == waker_list.len() {
+                    // Wake a batch of wakers. To avoid deadlock, we must do this with the lock temporarily dropped.
+                    drop(lock);
+
+                    for waker in waker_list.iter_mut() {
+                        waker.take().unwrap().wake();
                     }
-                } else {
-                    self.park.park_timeout(Duration::from_secs(0))?;
+
+                    waker_idx = 0;
+
+                    lock = self.get().lock();
                 }
             }
-            None => {
-                self.park.park()?;
-            }
         }
 
-        self.process();
+        // Update the elapsed cache
+        lock.elapsed = lock.wheel.elapsed();
+        lock.next_wake = lock
+            .wheel
+            .poll_at()
+            .map(|t| NonZeroU64::new(t).unwrap_or_else(|| NonZeroU64::new(1).unwrap()));
 
-        Ok(())
+        drop(lock);
+
+        for waker in waker_list[0..waker_idx].iter_mut() {
+            waker.take().unwrap().wake();
+        }
     }
 
-    fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
-        self.process_queue();
+    /// Removes a registered timer from the driver.
+    ///
+    /// The timer will be moved to the cancelled state. Wakers will _not_ be
+    /// invoked. If the timer is already completed, this function is a no-op.
+    ///
+    /// This function always acquires the driver lock, even if the entry does
+    /// not appear to be registered.
+    ///
+    /// SAFETY: The timer must not be registered with some other driver, and
+    /// `add_entry` must not be called concurrently.
+    pub(self) unsafe fn clear_entry(&self, entry: NonNull<TimerShared>) {
+        unsafe {
+            let mut lock = self.get().lock();
 
-        match self.wheel.poll_at() {
-            Some(when) => {
-                let now = self.clock.now();
-                let deadline = self.expiration_instant(when);
+            if entry.as_ref().might_be_registered() {
+                lock.wheel.remove(entry);
+            }
 
-                if deadline > now {
-                    let duration = cmp::min(deadline - now, duration);
+            entry.as_ref().handle().fire(Ok(()));
+        }
+    }
 
-                    if self.clock.is_paused() {
-                        self.park.park_timeout(Duration::from_secs(0))?;
-                        self.clock.advance(duration);
-                    } else {
-                        self.park.park_timeout(duration)?;
+    /// Removes and re-adds an entry to the driver.
+    ///
+    /// SAFETY: The timer must be either unregistered, or registered with this
+    /// driver. No other threads are allowed to concurrently manipulate the
+    /// timer at all (the current thread should hold an exclusive reference to
+    /// the `TimerEntry`)
+    pub(self) unsafe fn reregister(&self, new_tick: u64, entry: NonNull<TimerShared>) {
+        let waker = unsafe {
+            let mut lock = self.get().lock();
+
+            // We may have raced with a firing/deregistration, so check before
+            // deregistering.
+            if unsafe { entry.as_ref().might_be_registered() } {
+                lock.wheel.remove(entry);
+            }
+
+            // Now that we have exclusive control of this entry, mint a handle to reinsert it.
+            let entry = entry.as_ref().handle();
+
+            if self.is_shutdown() {
+                unsafe { entry.fire(Err(crate::time::error::Error::shutdown())) }
+            } else {
+                entry.set_expiration(new_tick);
+
+                // Note: We don't have to worry about racing with some other resetting
+                // thread, because add_entry and reregister require exclusive control of
+                // the timer entry.
+                match unsafe { lock.wheel.insert(entry) } {
+                    Ok(when) => {
+                        if lock
+                            .next_wake
+                            .map(|next_wake| when < next_wake.get())
+                            .unwrap_or(true)
+                        {
+                            lock.unpark.unpark();
+                        }
+
+                        None
                     }
-                } else {
-                    self.park.park_timeout(Duration::from_secs(0))?;
+                    Err((entry, super::error::InsertError::Elapsed)) => unsafe {
+                        entry.fire(Ok(()))
+                    },
                 }
             }
-            None => {
-                self.park.park_timeout(duration)?;
-            }
+
+            // Must release lock before invoking waker to avoid the risk of deadlock.
+        };
+
+        // The timer was fired synchronously as a result of the reregistration.
+        // Wake the waker; this is needed because we might reset _after_ a poll,
+        // and otherwise the task won't be awoken to poll again.
+        if let Some(waker) = waker {
+            waker.wake();
         }
+    }
+}
 
-        self.process();
+impl<P> Park for Driver<P>
+where
+    P: Park + 'static,
+{
+    type Unpark = TimerUnpark<P>;
+    type Error = P::Error;
 
-        Ok(())
+    fn unpark(&self) -> Self::Unpark {
+        TimerUnpark::new(self)
+    }
+
+    fn park(&mut self) -> Result<(), Self::Error> {
+        self.park_internal(None)
+    }
+
+    fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
+        self.park_internal(Some(duration))
     }
 
     fn shutdown(&mut self) {
-        if self.is_shutdown {
+        if self.handle.is_shutdown() {
             return;
         }
 
-        use std::u64;
+        self.handle.get().is_shutdown.store(true, Ordering::SeqCst);
 
-        // Shutdown the stack of entries to process, preventing any new entries
-        // from being pushed.
-        self.inner.process.shutdown();
+        // Advance time forward to the end of time.
 
-        // Clear the wheel, using u64::MAX allows us to drain everything
-        let mut poll = wheel::Poll::new(u64::MAX);
-
-        while let Some(entry) = self.wheel.poll(&mut poll, &mut ()) {
-            entry.error(Error::shutdown());
-        }
+        self.handle.process_at_time(u64::MAX);
 
         self.park.shutdown();
-
-        self.is_shutdown = true;
     }
 }
 
-impl<T> Drop for Driver<T>
+impl<P> Drop for Driver<P>
 where
-    T: Park,
+    P: Park + 'static,
 {
     fn drop(&mut self) {
         self.shutdown();
     }
 }
 
-// ===== impl Inner =====
+pub(crate) struct TimerUnpark<P: Park + 'static> {
+    inner: P::Unpark,
 
-impl Inner {
-    fn new(start: Instant, unpark: Box<dyn Unpark>) -> Inner {
-        Inner {
-            num: AtomicUsize::new(0),
-            elapsed: AtomicU64::new(0),
-            process: AtomicStack::new(),
-            start,
-            unpark,
-        }
-    }
+    #[cfg(feature = "test-util")]
+    did_wake: Arc<AtomicBool>,
+}
 
-    fn elapsed(&self) -> u64 {
-        self.elapsed.load(SeqCst)
-    }
+impl<P: Park + 'static> TimerUnpark<P> {
+    fn new(driver: &Driver<P>) -> TimerUnpark<P> {
+        TimerUnpark {
+            inner: driver.park.unpark(),
 
-    #[cfg(all(test, loom))]
-    fn num(&self, ordering: std::sync::atomic::Ordering) -> usize {
-        self.num.load(ordering)
+            #[cfg(feature = "test-util")]
+            did_wake: driver.did_wake.clone(),
+        }
     }
+}
 
-    /// Increments the number of active timeouts
-    fn increment(&self) -> Result<(), Error> {
-        let mut curr = self.num.load(Relaxed);
-        loop {
-            if curr == MAX_TIMEOUTS {
-                return Err(Error::at_capacity());
-            }
+impl<P: Park + 'static> Unpark for TimerUnpark<P> {
+    fn unpark(&self) {
+        #[cfg(feature = "test-util")]
+        self.did_wake.store(true, Ordering::SeqCst);
 
-            match self
-                .num
-                .compare_exchange_weak(curr, curr + 1, Release, Relaxed)
-            {
-                Ok(_) => return Ok(()),
-                Err(next) => curr = next,
-            }
-        }
+        self.inner.unpark();
     }
+}
 
-    /// Decrements the number of active timeouts
-    fn decrement(&self) {
-        let prev = self.num.fetch_sub(1, Acquire);
-        debug_assert!(prev <= MAX_TIMEOUTS);
-    }
+// ===== impl Inner =====
 
-    fn queue(&self, entry: &Arc<Entry>) -> Result<(), Error> {
-        if self.process.push(entry)? {
-            // The timer is notified so that it can process the timeout
-            self.unpark.unpark();
+impl Inner {
+    pub(self) fn new(time_source: ClockTime, unpark: Box<dyn Unpark>) -> Self {
+        Inner {
+            state: Mutex::new(InnerState {
+                time_source,
+                elapsed: 0,
+                next_wake: None,
+                unpark,
+                wheel: wheel::Wheel::new(),
+            }),
+            is_shutdown: AtomicBool::new(false),
         }
-
-        Ok(())
     }
 
-    fn normalize_deadline(&self, deadline: Instant) -> u64 {
-        if deadline < self.start {
-            return 0;
-        }
+    /// Locks the driver's inner structure
+    pub(super) fn lock(&self) -> crate::loom::sync::MutexGuard<'_, InnerState> {
+        self.state.lock()
+    }
 
-        crate::time::ms(deadline - self.start, crate::time::Round::Up)
+    // Check whether the driver has been shutdown
+    pub(super) fn is_shutdown(&self) -> bool {
+        self.is_shutdown.load(Ordering::SeqCst)
     }
 }
 
@@ -411,5 +524,5 @@
     }
 }
 
-#[cfg(all(test, loom))]
+#[cfg(test)]
 mod tests;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/registration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/registration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/registration.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/registration.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-use crate::time::driver::{Entry, Handle};
-use crate::time::{Duration, Error, Instant};
-
-use std::sync::Arc;
-use std::task::{self, Poll};
-
-/// Registration with a timer.
-///
-/// The association between a `Delay` instance and a timer is done lazily in
-/// `poll`
-#[derive(Debug)]
-pub(crate) struct Registration {
-    entry: Arc<Entry>,
-}
-
-impl Registration {
-    pub(crate) fn new(deadline: Instant, duration: Duration) -> Registration {
-        let handle = Handle::current();
-
-        Registration {
-            entry: Entry::new(&handle, deadline, duration),
-        }
-    }
-
-    pub(crate) fn deadline(&self) -> Instant {
-        self.entry.time_ref().deadline
-    }
-
-    pub(crate) fn reset(&mut self, deadline: Instant) {
-        unsafe {
-            self.entry.time_mut().deadline = deadline;
-        }
-
-        Entry::reset(&mut self.entry);
-    }
-
-    pub(crate) fn is_elapsed(&self) -> bool {
-        self.entry.is_elapsed()
-    }
-
-    pub(crate) fn poll_elapsed(&self, cx: &mut task::Context<'_>) -> Poll<Result<(), Error>> {
-        // Keep track of task budget
-        let coop = ready!(crate::coop::poll_proceed(cx));
-
-        self.entry.poll_elapsed(cx).map(move |r| {
-            coop.made_progress();
-            r
-        })
-    }
-}
-
-impl Drop for Registration {
-    fn drop(&mut self) {
-        Entry::cancel(&self.entry);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/sleep.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/sleep.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/sleep.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/sleep.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,283 @@
+use crate::time::driver::{Handle, TimerEntry};
+use crate::time::{error::Error, Duration, Instant};
+
+use pin_project_lite::pin_project;
+use std::future::Future;
+use std::pin::Pin;
+use std::task::{self, Poll};
+
+/// Waits until `deadline` is reached.
+///
+/// No work is performed while awaiting on the sleep future to complete. `Sleep`
+/// operates at millisecond granularity and should not be used for tasks that
+/// require high-resolution timers.
+///
+/// To run something regularly on a schedule, see [`interval`].
+///
+/// # Cancellation
+///
+/// Canceling a sleep instance is done by dropping the returned future. No additional
+/// cleanup work is required.
+///
+/// # Examples
+///
+/// Wait 100ms and print "100 ms have elapsed".
+///
+/// ```
+/// use tokio::time::{sleep_until, Instant, Duration};
+///
+/// #[tokio::main]
+/// async fn main() {
+///     sleep_until(Instant::now() + Duration::from_millis(100)).await;
+///     println!("100 ms have elapsed");
+/// }
+/// ```
+///
+/// See the documentation for the [`Sleep`] type for more examples.
+///
+/// [`Sleep`]: struct@crate::time::Sleep
+/// [`interval`]: crate::time::interval()
+// Alias for old name in 0.x
+#[cfg_attr(docsrs, doc(alias = "delay_until"))]
+pub fn sleep_until(deadline: Instant) -> Sleep {
+    Sleep::new_timeout(deadline)
+}
+
+/// Waits until `duration` has elapsed.
+///
+/// Equivalent to `sleep_until(Instant::now() + duration)`. An asynchronous
+/// analog to `std::thread::sleep`.
+///
+/// No work is performed while awaiting on the sleep future to complete. `Sleep`
+/// operates at millisecond granularity and should not be used for tasks that
+/// require high-resolution timers.
+///
+/// To run something regularly on a schedule, see [`interval`].
+///
+/// The maximum duration for a sleep is 68719476734 milliseconds (approximately 2.2 years).
+///
+/// # Cancellation
+///
+/// Canceling a sleep instance is done by dropping the returned future. No additional
+/// cleanup work is required.
+///
+/// # Examples
+///
+/// Wait 100ms and print "100 ms have elapsed".
+///
+/// ```
+/// use tokio::time::{sleep, Duration};
+///
+/// #[tokio::main]
+/// async fn main() {
+///     sleep(Duration::from_millis(100)).await;
+///     println!("100 ms have elapsed");
+/// }
+/// ```
+///
+/// See the documentation for the [`Sleep`] type for more examples.
+///
+/// [`Sleep`]: struct@crate::time::Sleep
+/// [`interval`]: crate::time::interval()
+// Alias for old name in 0.x
+#[cfg_attr(docsrs, doc(alias = "delay_for"))]
+#[cfg_attr(docsrs, doc(alias = "wait"))]
+pub fn sleep(duration: Duration) -> Sleep {
+    match Instant::now().checked_add(duration) {
+        Some(deadline) => sleep_until(deadline),
+        None => sleep_until(Instant::far_future()),
+    }
+}
+
+pin_project! {
+    /// Future returned by [`sleep`](sleep) and [`sleep_until`](sleep_until).
+    ///
+    /// This type does not implement the `Unpin` trait, which means that if you
+    /// use it with [`select!`] or by calling `poll`, you have to pin it first.
+    /// If you use it with `.await`, this does not apply.
+    ///
+    /// # Examples
+    ///
+    /// Wait 100ms and print "100 ms have elapsed".
+    ///
+    /// ```
+    /// use tokio::time::{sleep, Duration};
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     sleep(Duration::from_millis(100)).await;
+    ///     println!("100 ms have elapsed");
+    /// }
+    /// ```
+    ///
+    /// Use with [`select!`]. Pinning the `Sleep` with [`tokio::pin!`] is
+    /// necessary when the same `Sleep` is selected on multiple times.
+    /// ```no_run
+    /// use tokio::time::{self, Duration, Instant};
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let sleep = time::sleep(Duration::from_millis(10));
+    ///     tokio::pin!(sleep);
+    ///
+    ///     loop {
+    ///         tokio::select! {
+    ///             () = &mut sleep => {
+    ///                 println!("timer elapsed");
+    ///                 sleep.as_mut().reset(Instant::now() + Duration::from_millis(50));
+    ///             },
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    /// Use in a struct with boxing. By pinning the `Sleep` with a `Box`, the
+    /// `HasSleep` struct implements `Unpin`, even though `Sleep` does not.
+    /// ```
+    /// use std::future::Future;
+    /// use std::pin::Pin;
+    /// use std::task::{Context, Poll};
+    /// use tokio::time::Sleep;
+    ///
+    /// struct HasSleep {
+    ///     sleep: Pin<Box<Sleep>>,
+    /// }
+    ///
+    /// impl Future for HasSleep {
+    ///     type Output = ();
+    ///
+    ///     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
+    ///         self.sleep.as_mut().poll(cx)
+    ///     }
+    /// }
+    /// ```
+    /// Use in a struct with pin projection. This method avoids the `Box`, but
+    /// the `HasSleep` struct will not be `Unpin` as a consequence.
+    /// ```
+    /// use std::future::Future;
+    /// use std::pin::Pin;
+    /// use std::task::{Context, Poll};
+    /// use tokio::time::Sleep;
+    /// use pin_project_lite::pin_project;
+    ///
+    /// pin_project! {
+    ///     struct HasSleep {
+    ///         #[pin]
+    ///         sleep: Sleep,
+    ///     }
+    /// }
+    ///
+    /// impl Future for HasSleep {
+    ///     type Output = ();
+    ///
+    ///     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
+    ///         self.project().sleep.poll(cx)
+    ///     }
+    /// }
+    /// ```
+    ///
+    /// [`select!`]: ../macro.select.html
+    /// [`tokio::pin!`]: ../macro.pin.html
+    // Alias for old name in 0.2
+    #[cfg_attr(docsrs, doc(alias = "Delay"))]
+    #[derive(Debug)]
+    #[must_use = "futures do nothing unless you `.await` or poll them"]
+    pub struct Sleep {
+        deadline: Instant,
+
+        // The link between the `Sleep` instance and the timer that drives it.
+        #[pin]
+        entry: TimerEntry,
+    }
+}
+
+impl Sleep {
+    pub(crate) fn new_timeout(deadline: Instant) -> Sleep {
+        let handle = Handle::current();
+        let entry = TimerEntry::new(&handle, deadline);
+
+        Sleep { deadline, entry }
+    }
+
+    pub(crate) fn far_future() -> Sleep {
+        Self::new_timeout(Instant::far_future())
+    }
+
+    /// Returns the instant at which the future will complete.
+    pub fn deadline(&self) -> Instant {
+        self.deadline
+    }
+
+    /// Returns `true` if `Sleep` has elapsed.
+    ///
+    /// A `Sleep` instance is elapsed when the requested duration has elapsed.
+    pub fn is_elapsed(&self) -> bool {
+        self.entry.is_elapsed()
+    }
+
+    /// Resets the `Sleep` instance to a new deadline.
+    ///
+    /// Calling this function allows changing the instant at which the `Sleep`
+    /// future completes without having to create new associated state.
+    ///
+    /// This function can be called both before and after the future has
+    /// completed.
+    ///
+    /// To call this method, you will usually combine the call with
+    /// [`Pin::as_mut`], which lets you call the method without consuming the
+    /// `Sleep` itself.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use tokio::time::{Duration, Instant};
+    ///
+    /// # #[tokio::main(flavor = "current_thread")]
+    /// # async fn main() {
+    /// let sleep = tokio::time::sleep(Duration::from_millis(10));
+    /// tokio::pin!(sleep);
+    ///
+    /// sleep.as_mut().reset(Instant::now() + Duration::from_millis(20));
+    /// # }
+    /// ```
+    ///
+    /// See also the top-level examples.
+    ///
+    /// [`Pin::as_mut`]: fn@std::pin::Pin::as_mut
+    pub fn reset(self: Pin<&mut Self>, deadline: Instant) {
+        let me = self.project();
+        me.entry.reset(deadline);
+        *me.deadline = deadline;
+    }
+
+    fn poll_elapsed(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Result<(), Error>> {
+        let me = self.project();
+
+        // Keep track of task budget
+        let coop = ready!(crate::coop::poll_proceed(cx));
+
+        me.entry.poll_elapsed(cx).map(move |r| {
+            coop.made_progress();
+            r
+        })
+    }
+}
+
+impl Future for Sleep {
+    type Output = ();
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
+        // `poll_elapsed` can return an error in two cases:
+        //
+        // - AtCapacity: this is a pathological case where far too many
+        //   sleep instances have been scheduled.
+        // - Shutdown: No timer has been setup, which is a mis-use error.
+        //
+        // Both cases are extremely rare, and pretty accurately fit into
+        // "logic errors", so we just panic in this case. A user couldn't
+        // really do much better if we passed the error onwards.
+        match ready!(self.as_mut().poll_elapsed(cx)) {
+            Ok(()) => Poll::Ready(()),
+            Err(e) => panic!("timer error: {}", e),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/stack.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-use crate::time::driver::Entry;
-use crate::time::wheel;
-
-use std::ptr;
-use std::sync::Arc;
-
-/// A doubly linked stack
-#[derive(Debug)]
-pub(crate) struct Stack {
-    head: Option<Arc<Entry>>,
-}
-
-impl Default for Stack {
-    fn default() -> Stack {
-        Stack { head: None }
-    }
-}
-
-impl wheel::Stack for Stack {
-    type Owned = Arc<Entry>;
-    type Borrowed = Entry;
-    type Store = ();
-
-    fn is_empty(&self) -> bool {
-        self.head.is_none()
-    }
-
-    fn push(&mut self, entry: Self::Owned, _: &mut Self::Store) {
-        // Get a pointer to the entry to for the prev link
-        let ptr: *const Entry = &*entry as *const _;
-
-        // Remove the old head entry
-        let old = self.head.take();
-
-        unsafe {
-            // Ensure the entry is not already in a stack.
-            debug_assert!((*entry.next_stack.get()).is_none());
-            debug_assert!((*entry.prev_stack.get()).is_null());
-
-            if let Some(ref entry) = old.as_ref() {
-                debug_assert!({
-                    // The head is not already set to the entry
-                    ptr != &***entry as *const _
-                });
-
-                // Set the previous link on the old head
-                *entry.prev_stack.get() = ptr;
-            }
-
-            // Set this entry's next pointer
-            *entry.next_stack.get() = old;
-        }
-
-        // Update the head pointer
-        self.head = Some(entry);
-    }
-
-    /// Pops an item from the stack
-    fn pop(&mut self, _: &mut ()) -> Option<Arc<Entry>> {
-        let entry = self.head.take();
-
-        unsafe {
-            if let Some(entry) = entry.as_ref() {
-                self.head = (*entry.next_stack.get()).take();
-
-                if let Some(entry) = self.head.as_ref() {
-                    *entry.prev_stack.get() = ptr::null();
-                }
-
-                *entry.prev_stack.get() = ptr::null();
-            }
-        }
-
-        entry
-    }
-
-    fn remove(&mut self, entry: &Entry, _: &mut ()) {
-        unsafe {
-            // Ensure that the entry is in fact contained by the stack
-            debug_assert!({
-                // This walks the full linked list even if an entry is found.
-                let mut next = self.head.as_ref();
-                let mut contains = false;
-
-                while let Some(n) = next {
-                    if entry as *const _ == &**n as *const _ {
-                        debug_assert!(!contains);
-                        contains = true;
-                    }
-
-                    next = (*n.next_stack.get()).as_ref();
-                }
-
-                contains
-            });
-
-            // Unlink `entry` from the next node
-            let next = (*entry.next_stack.get()).take();
-
-            if let Some(next) = next.as_ref() {
-                (*next.prev_stack.get()) = *entry.prev_stack.get();
-            }
-
-            // Unlink `entry` from the prev node
-
-            if let Some(prev) = (*entry.prev_stack.get()).as_ref() {
-                *prev.next_stack.get() = next;
-            } else {
-                // It is the head
-                self.head = next;
-            }
-
-            // Unset the prev pointer
-            *entry.prev_stack.get() = ptr::null();
-        }
-    }
-
-    fn when(item: &Entry, _: &()) -> u64 {
-        item.when_internal().expect("invalid internal state")
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/tests/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/tests/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/tests/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/tests/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,18 +1,249 @@
-use crate::park::Unpark;
-use crate::time::driver::Inner;
-use crate::time::Instant;
+use std::{task::Context, time::Duration};
 
-use loom::thread;
+#[cfg(not(loom))]
+use futures::task::noop_waker_ref;
 
-use std::sync::atomic::Ordering;
-use std::sync::Arc;
+use crate::loom::sync::Arc;
+use crate::loom::thread;
+use crate::{
+    loom::sync::atomic::{AtomicBool, Ordering},
+    park::Unpark,
+};
 
-struct MockUnpark;
+use super::{Handle, TimerEntry};
 
+struct MockUnpark {}
 impl Unpark for MockUnpark {
     fn unpark(&self) {}
 }
+impl MockUnpark {
+    fn mock() -> Box<dyn Unpark> {
+        Box::new(Self {})
+    }
+}
+
+fn block_on<T>(f: impl std::future::Future<Output = T>) -> T {
+    #[cfg(loom)]
+    return loom::future::block_on(f);
+
+    #[cfg(not(loom))]
+    return futures::executor::block_on(f);
+}
+
+fn model(f: impl Fn() + Send + Sync + 'static) {
+    #[cfg(loom)]
+    loom::model(f);
+
+    #[cfg(not(loom))]
+    f();
+}
+
+#[test]
+fn single_timer() {
+    model(|| {
+        let clock = crate::time::clock::Clock::new(true, false);
+        let time_source = super::ClockTime::new(clock.clone());
+
+        let inner = super::Inner::new(time_source.clone(), MockUnpark::mock());
+        let handle = Handle::new(Arc::new(inner));
+
+        let handle_ = handle.clone();
+        let jh = thread::spawn(move || {
+            let entry = TimerEntry::new(&handle_, clock.now() + Duration::from_secs(1));
+            pin!(entry);
+
+            block_on(futures::future::poll_fn(|cx| {
+                entry.as_mut().poll_elapsed(cx)
+            }))
+            .unwrap();
+        });
+
+        thread::yield_now();
+
+        // This may or may not return Some (depending on how it races with the
+        // thread). If it does return None, however, the timer should complete
+        // synchronously.
+        handle.process_at_time(time_source.now() + 2_000_000_000);
+
+        jh.join().unwrap();
+    })
+}
+
+#[test]
+fn drop_timer() {
+    model(|| {
+        let clock = crate::time::clock::Clock::new(true, false);
+        let time_source = super::ClockTime::new(clock.clone());
+
+        let inner = super::Inner::new(time_source.clone(), MockUnpark::mock());
+        let handle = Handle::new(Arc::new(inner));
+
+        let handle_ = handle.clone();
+        let jh = thread::spawn(move || {
+            let entry = TimerEntry::new(&handle_, clock.now() + Duration::from_secs(1));
+            pin!(entry);
+
+            let _ = entry
+                .as_mut()
+                .poll_elapsed(&mut Context::from_waker(futures::task::noop_waker_ref()));
+            let _ = entry
+                .as_mut()
+                .poll_elapsed(&mut Context::from_waker(futures::task::noop_waker_ref()));
+        });
+
+        thread::yield_now();
+
+        // advance 2s in the future.
+        handle.process_at_time(time_source.now() + 2_000_000_000);
+
+        jh.join().unwrap();
+    })
+}
+
+#[test]
+fn change_waker() {
+    model(|| {
+        let clock = crate::time::clock::Clock::new(true, false);
+        let time_source = super::ClockTime::new(clock.clone());
+
+        let inner = super::Inner::new(time_source.clone(), MockUnpark::mock());
+        let handle = Handle::new(Arc::new(inner));
+
+        let handle_ = handle.clone();
+        let jh = thread::spawn(move || {
+            let entry = TimerEntry::new(&handle_, clock.now() + Duration::from_secs(1));
+            pin!(entry);
+
+            let _ = entry
+                .as_mut()
+                .poll_elapsed(&mut Context::from_waker(futures::task::noop_waker_ref()));
+
+            block_on(futures::future::poll_fn(|cx| {
+                entry.as_mut().poll_elapsed(cx)
+            }))
+            .unwrap();
+        });
+
+        thread::yield_now();
+
+        // advance 2s
+        handle.process_at_time(time_source.now() + 2_000_000_000);
+
+        jh.join().unwrap();
+    })
+}
+
+#[test]
+fn reset_future() {
+    model(|| {
+        let finished_early = Arc::new(AtomicBool::new(false));
+
+        let clock = crate::time::clock::Clock::new(true, false);
+        let time_source = super::ClockTime::new(clock.clone());
+
+        let inner = super::Inner::new(time_source.clone(), MockUnpark::mock());
+        let handle = Handle::new(Arc::new(inner));
+
+        let handle_ = handle.clone();
+        let finished_early_ = finished_early.clone();
+        let start = clock.now();
+
+        let jh = thread::spawn(move || {
+            let entry = TimerEntry::new(&handle_, start + Duration::from_secs(1));
+            pin!(entry);
+
+            let _ = entry
+                .as_mut()
+                .poll_elapsed(&mut Context::from_waker(futures::task::noop_waker_ref()));
+
+            entry.as_mut().reset(start + Duration::from_secs(2));
+
+            // shouldn't complete before 2s
+            block_on(futures::future::poll_fn(|cx| {
+                entry.as_mut().poll_elapsed(cx)
+            }))
+            .unwrap();
+
+            finished_early_.store(true, Ordering::Relaxed);
+        });
+
+        thread::yield_now();
+
+        // This may or may not return a wakeup time.
+        handle.process_at_time(time_source.instant_to_tick(start + Duration::from_millis(1500)));
+
+        assert!(!finished_early.load(Ordering::Relaxed));
+
+        handle.process_at_time(time_source.instant_to_tick(start + Duration::from_millis(2500)));
+
+        jh.join().unwrap();
+
+        assert!(finished_early.load(Ordering::Relaxed));
+    })
+}
+
+#[test]
+#[cfg(not(loom))]
+fn poll_process_levels() {
+    let clock = crate::time::clock::Clock::new(true, false);
+    clock.pause();
+
+    let time_source = super::ClockTime::new(clock.clone());
+
+    let inner = super::Inner::new(time_source, MockUnpark::mock());
+    let handle = Handle::new(Arc::new(inner));
+
+    let mut entries = vec![];
+
+    for i in 0..1024 {
+        let mut entry = Box::pin(TimerEntry::new(
+            &handle,
+            clock.now() + Duration::from_millis(i),
+        ));
+
+        let _ = entry
+            .as_mut()
+            .poll_elapsed(&mut Context::from_waker(noop_waker_ref()));
+
+        entries.push(entry);
+    }
+
+    for t in 1..1024 {
+        handle.process_at_time(t as u64);
+        for (deadline, future) in entries.iter_mut().enumerate() {
+            let mut context = Context::from_waker(noop_waker_ref());
+            if deadline <= t {
+                assert!(future.as_mut().poll_elapsed(&mut context).is_ready());
+            } else {
+                assert!(future.as_mut().poll_elapsed(&mut context).is_pending());
+            }
+        }
+    }
+}
+
+#[test]
+#[cfg(not(loom))]
+fn poll_process_levels_targeted() {
+    let mut context = Context::from_waker(noop_waker_ref());
+
+    let clock = crate::time::clock::Clock::new(true, false);
+    clock.pause();
+
+    let time_source = super::ClockTime::new(clock.clone());
+
+    let inner = super::Inner::new(time_source, MockUnpark::mock());
+    let handle = Handle::new(Arc::new(inner));
+
+    let e1 = TimerEntry::new(&handle, clock.now() + Duration::from_millis(193));
+    pin!(e1);
+
+    handle.process_at_time(62);
+    assert!(e1.as_mut().poll_elapsed(&mut context).is_pending());
+    handle.process_at_time(192);
+    handle.process_at_time(192);
+}
 
+/*
 #[test]
 fn balanced_incr_and_decr() {
     const OPS: usize = 5;
@@ -53,3 +284,4 @@
         assert_eq!(inner.num(Ordering::SeqCst), 0);
     })
 }
+*/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/level.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/level.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/level.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/level.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,275 @@
+use crate::time::driver::TimerHandle;
+
+use crate::time::driver::{EntryList, TimerShared};
+
+use std::{fmt, ptr::NonNull};
+
+/// Wheel for a single level in the timer. This wheel contains 64 slots.
+pub(crate) struct Level {
+    level: usize,
+
+    /// Bit field tracking which slots currently contain entries.
+    ///
+    /// Using a bit field to track slots that contain entries allows avoiding a
+    /// scan to find entries. This field is updated when entries are added or
+    /// removed from a slot.
+    ///
+    /// The least-significant bit represents slot zero.
+    occupied: u64,
+
+    /// Slots. We access these via the EntryInner `current_list` as well, so this needs to be an UnsafeCell.
+    slot: [EntryList; LEVEL_MULT],
+}
+
+/// Indicates when a slot must be processed next.
+#[derive(Debug)]
+pub(crate) struct Expiration {
+    /// The level containing the slot.
+    pub(crate) level: usize,
+
+    /// The slot index.
+    pub(crate) slot: usize,
+
+    /// The instant at which the slot needs to be processed.
+    pub(crate) deadline: u64,
+}
+
+/// Level multiplier.
+///
+/// Being a power of 2 is very important.
+const LEVEL_MULT: usize = 64;
+
+impl Level {
+    pub(crate) fn new(level: usize) -> Level {
+        // A value has to be Copy in order to use syntax like:
+        //     let stack = Stack::default();
+        //     ...
+        //     slots: [stack; 64],
+        //
+        // Alternatively, since Stack is Default one can
+        // use syntax like:
+        //     let slots: [Stack; 64] = Default::default();
+        //
+        // However, that is only supported for arrays of size
+        // 32 or fewer.  So in our case we have to explicitly
+        // invoke the constructor for each array element.
+        let ctor = || EntryList::default();
+
+        Level {
+            level,
+            occupied: 0,
+            slot: [
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+                ctor(),
+            ],
+        }
+    }
+
+    /// Finds the slot that needs to be processed next and returns the slot and
+    /// `Instant` at which this slot must be processed.
+    pub(crate) fn next_expiration(&self, now: u64) -> Option<Expiration> {
+        // Use the `occupied` bit field to get the index of the next slot that
+        // needs to be processed.
+        let slot = match self.next_occupied_slot(now) {
+            Some(slot) => slot,
+            None => return None,
+        };
+
+        // From the slot index, calculate the `Instant` at which it needs to be
+        // processed. This value *must* be in the future with respect to `now`.
+
+        let level_range = level_range(self.level);
+        let slot_range = slot_range(self.level);
+
+        // TODO: This can probably be simplified w/ power of 2 math
+        let level_start = now - (now % level_range);
+        let mut deadline = level_start + slot as u64 * slot_range;
+
+        if deadline <= now {
+            // A timer is in a slot "prior" to the current time. This can occur
+            // because we do not have an infinite hierarchy of timer levels, and
+            // eventually a timer scheduled for a very distant time might end up
+            // being placed in a slot that is beyond the end of all of the
+            // arrays.
+            //
+            // To deal with this, we first limit timers to being scheduled no
+            // more than MAX_DURATION ticks in the future; that is, they're at
+            // most one rotation of the top level away. Then, we force timers
+            // that logically would go into the top+1 level, to instead go into
+            // the top level's slots.
+            //
+            // What this means is that the top level's slots act as a
+            // pseudo-ring buffer, and we rotate around them indefinitely. If we
+            // compute a deadline before now, and it's the top level, it
+            // therefore means we're actually looking at a slot in the future.
+            debug_assert_eq!(self.level, super::NUM_LEVELS - 1);
+
+            deadline += level_range;
+        }
+
+        debug_assert!(
+            deadline >= now,
+            "deadline={:016X}; now={:016X}; level={}; lr={:016X}, sr={:016X}, slot={}; occupied={:b}",
+            deadline,
+            now,
+            self.level,
+            level_range,
+            slot_range,
+            slot,
+            self.occupied
+        );
+
+        Some(Expiration {
+            level: self.level,
+            slot,
+            deadline,
+        })
+    }
+
+    fn next_occupied_slot(&self, now: u64) -> Option<usize> {
+        if self.occupied == 0 {
+            return None;
+        }
+
+        // Get the slot for now using Maths
+        let now_slot = (now / slot_range(self.level)) as usize;
+        let occupied = self.occupied.rotate_right(now_slot as u32);
+        let zeros = occupied.trailing_zeros() as usize;
+        let slot = (zeros + now_slot) % 64;
+
+        Some(slot)
+    }
+
+    pub(crate) unsafe fn add_entry(&mut self, item: TimerHandle) {
+        let slot = slot_for(item.cached_when(), self.level);
+
+        self.slot[slot].push_front(item);
+
+        self.occupied |= occupied_bit(slot);
+    }
+
+    pub(crate) unsafe fn remove_entry(&mut self, item: NonNull<TimerShared>) {
+        let slot = slot_for(unsafe { item.as_ref().cached_when() }, self.level);
+
+        unsafe { self.slot[slot].remove(item) };
+        if self.slot[slot].is_empty() {
+            // The bit is currently set
+            debug_assert!(self.occupied & occupied_bit(slot) != 0);
+
+            // Unset the bit
+            self.occupied ^= occupied_bit(slot);
+        }
+    }
+
+    pub(crate) fn take_slot(&mut self, slot: usize) -> EntryList {
+        self.occupied &= !occupied_bit(slot);
+
+        std::mem::take(&mut self.slot[slot])
+    }
+}
+
+impl fmt::Debug for Level {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Level")
+            .field("occupied", &self.occupied)
+            .finish()
+    }
+}
+
+fn occupied_bit(slot: usize) -> u64 {
+    1 << slot
+}
+
+fn slot_range(level: usize) -> u64 {
+    LEVEL_MULT.pow(level as u32) as u64
+}
+
+fn level_range(level: usize) -> u64 {
+    LEVEL_MULT as u64 * slot_range(level)
+}
+
+/// Convert a duration (milliseconds) and a level to a slot position
+fn slot_for(duration: u64, level: usize) -> usize {
+    ((duration >> (level * 6)) % LEVEL_MULT as u64) as usize
+}
+
+#[cfg(all(test, not(loom)))]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_slot_for() {
+        for pos in 0..64 {
+            assert_eq!(pos as usize, slot_for(pos, 0));
+        }
+
+        for level in 1..5 {
+            for pos in level..64 {
+                let a = pos * 64_usize.pow(level as u32);
+                assert_eq!(pos as usize, slot_for(a as u64, level));
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,359 @@
+use crate::time::driver::{TimerHandle, TimerShared};
+use crate::time::error::InsertError;
+
+mod level;
+pub(crate) use self::level::Expiration;
+use self::level::Level;
+
+use std::ptr::NonNull;
+
+use super::EntryList;
+
+/// Timing wheel implementation.
+///
+/// This type provides the hashed timing wheel implementation that backs `Timer`
+/// and `DelayQueue`.
+///
+/// The structure is generic over `T: Stack`. This allows handling timeout data
+/// being stored on the heap or in a slab. In order to support the latter case,
+/// the slab must be passed into each function allowing the implementation to
+/// lookup timer entries.
+///
+/// See `Timer` documentation for some implementation notes.
+#[derive(Debug)]
+pub(crate) struct Wheel {
+    /// The number of milliseconds elapsed since the wheel started.
+    elapsed: u64,
+
+    /// Timer wheel.
+    ///
+    /// Levels:
+    ///
+    /// * 1 ms slots / 64 ms range
+    /// * 64 ms slots / ~ 4 sec range
+    /// * ~ 4 sec slots / ~ 4 min range
+    /// * ~ 4 min slots / ~ 4 hr range
+    /// * ~ 4 hr slots / ~ 12 day range
+    /// * ~ 12 day slots / ~ 2 yr range
+    levels: Vec<Level>,
+
+    /// Entries queued for firing
+    pending: EntryList,
+}
+
+/// Number of levels. Each level has 64 slots. By using 6 levels with 64 slots
+/// each, the timer is able to track time up to 2 years into the future with a
+/// precision of 1 millisecond.
+const NUM_LEVELS: usize = 6;
+
+/// The maximum duration of a `Sleep`
+pub(super) const MAX_DURATION: u64 = (1 << (6 * NUM_LEVELS)) - 1;
+
+impl Wheel {
+    /// Create a new timing wheel
+    pub(crate) fn new() -> Wheel {
+        let levels = (0..NUM_LEVELS).map(Level::new).collect();
+
+        Wheel {
+            elapsed: 0,
+            levels,
+            pending: EntryList::new(),
+        }
+    }
+
+    /// Return the number of milliseconds that have elapsed since the timing
+    /// wheel's creation.
+    pub(crate) fn elapsed(&self) -> u64 {
+        self.elapsed
+    }
+
+    /// Insert an entry into the timing wheel.
+    ///
+    /// # Arguments
+    ///
+    /// * `item`: The item to insert into the wheel.
+    ///
+    /// # Return
+    ///
+    /// Returns `Ok` when the item is successfully inserted, `Err` otherwise.
+    ///
+    /// `Err(Elapsed)` indicates that `when` represents an instant that has
+    /// already passed. In this case, the caller should fire the timeout
+    /// immediately.
+    ///
+    /// `Err(Invalid)` indicates an invalid `when` argument as been supplied.
+    ///
+    /// # Safety
+    ///
+    /// This function registers item into an intrusive linked list. The caller
+    /// must ensure that `item` is pinned and will not be dropped without first
+    /// being deregistered.
+    pub(crate) unsafe fn insert(
+        &mut self,
+        item: TimerHandle,
+    ) -> Result<u64, (TimerHandle, InsertError)> {
+        let when = item.sync_when();
+
+        if when <= self.elapsed {
+            return Err((item, InsertError::Elapsed));
+        }
+
+        // Get the level at which the entry should be stored
+        let level = self.level_for(when);
+
+        unsafe {
+            self.levels[level].add_entry(item);
+        }
+
+        debug_assert!({
+            self.levels[level]
+                .next_expiration(self.elapsed)
+                .map(|e| e.deadline >= self.elapsed)
+                .unwrap_or(true)
+        });
+
+        Ok(when)
+    }
+
+    /// Remove `item` from the timing wheel.
+    pub(crate) unsafe fn remove(&mut self, item: NonNull<TimerShared>) {
+        unsafe {
+            let when = item.as_ref().cached_when();
+            if when == u64::MAX {
+                self.pending.remove(item);
+            } else {
+                debug_assert!(
+                    self.elapsed <= when,
+                    "elapsed={}; when={}",
+                    self.elapsed,
+                    when
+                );
+
+                let level = self.level_for(when);
+
+                self.levels[level].remove_entry(item);
+            }
+        }
+    }
+
+    /// Instant at which to poll
+    pub(crate) fn poll_at(&self) -> Option<u64> {
+        self.next_expiration().map(|expiration| expiration.deadline)
+    }
+
+    /// Advances the timer up to the instant represented by `now`.
+    pub(crate) fn poll(&mut self, now: u64) -> Option<TimerHandle> {
+        loop {
+            if let Some(handle) = self.pending.pop_back() {
+                return Some(handle);
+            }
+
+            // under what circumstances is poll.expiration Some vs. None?
+            let expiration = self.next_expiration().and_then(|expiration| {
+                if expiration.deadline > now {
+                    None
+                } else {
+                    Some(expiration)
+                }
+            });
+
+            match expiration {
+                Some(ref expiration) if expiration.deadline > now => return None,
+                Some(ref expiration) => {
+                    self.process_expiration(expiration);
+
+                    self.set_elapsed(expiration.deadline);
+                }
+                None => {
+                    // in this case the poll did not indicate an expiration
+                    // _and_ we were not able to find a next expiration in
+                    // the current list of timers.  advance to the poll's
+                    // current time and do nothing else.
+                    self.set_elapsed(now);
+                    break;
+                }
+            }
+        }
+
+        self.pending.pop_back()
+    }
+
+    /// Returns the instant at which the next timeout expires.
+    fn next_expiration(&self) -> Option<Expiration> {
+        if !self.pending.is_empty() {
+            // Expire immediately as we have things pending firing
+            return Some(Expiration {
+                level: 0,
+                slot: 0,
+                deadline: self.elapsed,
+            });
+        }
+
+        // Check all levels
+        for level in 0..NUM_LEVELS {
+            if let Some(expiration) = self.levels[level].next_expiration(self.elapsed) {
+                // There cannot be any expirations at a higher level that happen
+                // before this one.
+                debug_assert!(self.no_expirations_before(level + 1, expiration.deadline));
+
+                return Some(expiration);
+            }
+        }
+
+        None
+    }
+
+    /// Returns the tick at which this timer wheel next needs to perform some
+    /// processing, or None if there are no timers registered.
+    pub(super) fn next_expiration_time(&self) -> Option<u64> {
+        self.next_expiration().map(|ex| ex.deadline)
+    }
+
+    /// Used for debug assertions
+    fn no_expirations_before(&self, start_level: usize, before: u64) -> bool {
+        let mut res = true;
+
+        for l2 in start_level..NUM_LEVELS {
+            if let Some(e2) = self.levels[l2].next_expiration(self.elapsed) {
+                if e2.deadline < before {
+                    res = false;
+                }
+            }
+        }
+
+        res
+    }
+
+    /// iteratively find entries that are between the wheel's current
+    /// time and the expiration time.  for each in that population either
+    /// queue it for notification (in the case of the last level) or tier
+    /// it down to the next level (in all other cases).
+    pub(crate) fn process_expiration(&mut self, expiration: &Expiration) {
+        // Note that we need to take _all_ of the entries off the list before
+        // processing any of them. This is important because it's possible that
+        // those entries might need to be reinserted into the same slot.
+        //
+        // This happens only on the highest level, when an entry is inserted
+        // more than MAX_DURATION into the future. When this happens, we wrap
+        // around, and process some entries a multiple of MAX_DURATION before
+        // they actually need to be dropped down a level. We then reinsert them
+        // back into the same position; we must make sure we don't then process
+        // those entries again or we'll end up in an infinite loop.
+        let mut entries = self.take_entries(expiration);
+
+        while let Some(item) = entries.pop_back() {
+            if expiration.level == 0 {
+                debug_assert_eq!(unsafe { item.cached_when() }, expiration.deadline);
+            }
+
+            // Try to expire the entry; this is cheap (doesn't synchronize) if
+            // the timer is not expired, and updates cached_when.
+            match unsafe { item.mark_pending(expiration.deadline) } {
+                Ok(()) => {
+                    // Item was expired
+                    self.pending.push_front(item);
+                }
+                Err(expiration_tick) => {
+                    let level = level_for(expiration.deadline, expiration_tick);
+                    unsafe {
+                        self.levels[level].add_entry(item);
+                    }
+                }
+            }
+        }
+    }
+
+    fn set_elapsed(&mut self, when: u64) {
+        assert!(
+            self.elapsed <= when,
+            "elapsed={:?}; when={:?}",
+            self.elapsed,
+            when
+        );
+
+        if when > self.elapsed {
+            self.elapsed = when;
+        }
+    }
+
+    /// Obtains the list of entries that need processing for the given expiration.
+    ///
+    fn take_entries(&mut self, expiration: &Expiration) -> EntryList {
+        self.levels[expiration.level].take_slot(expiration.slot)
+    }
+
+    fn level_for(&self, when: u64) -> usize {
+        level_for(self.elapsed, when)
+    }
+}
+
+fn level_for(elapsed: u64, when: u64) -> usize {
+    const SLOT_MASK: u64 = (1 << 6) - 1;
+
+    // Mask in the trailing bits ignored by the level calculation in order to cap
+    // the possible leading zeros
+    let mut masked = elapsed ^ when | SLOT_MASK;
+
+    if masked >= MAX_DURATION {
+        // Fudge the timer into the top level
+        masked = MAX_DURATION - 1;
+    }
+
+    let leading_zeros = masked.leading_zeros() as usize;
+    let significant = 63 - leading_zeros;
+
+    significant / 6
+}
+
+#[cfg(all(test, not(loom)))]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_level_for() {
+        for pos in 0..64 {
+            assert_eq!(
+                0,
+                level_for(0, pos),
+                "level_for({}) -- binary = {:b}",
+                pos,
+                pos
+            );
+        }
+
+        for level in 1..5 {
+            for pos in level..64 {
+                let a = pos * 64_usize.pow(level as u32);
+                assert_eq!(
+                    level,
+                    level_for(0, a as u64),
+                    "level_for({}) -- binary = {:b}",
+                    a,
+                    a
+                );
+
+                if pos > level {
+                    let a = a - 1;
+                    assert_eq!(
+                        level,
+                        level_for(0, a as u64),
+                        "level_for({}) -- binary = {:b}",
+                        a,
+                        a
+                    );
+                }
+
+                if pos < 64 {
+                    let a = a + 1;
+                    assert_eq!(
+                        level,
+                        level_for(0, a as u64),
+                        "level_for({}) -- binary = {:b}",
+                        a,
+                        a
+                    );
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/stack.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/driver/wheel/stack.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,112 @@
+use super::{Item, OwnedItem};
+use crate::time::driver::Entry;
+
+use std::ptr;
+
+/// A doubly linked stack
+#[derive(Debug)]
+pub(crate) struct Stack {
+    head: Option<OwnedItem>,
+}
+
+impl Default for Stack {
+    fn default() -> Stack {
+        Stack { head: None }
+    }
+}
+
+impl Stack {
+    pub(crate) fn is_empty(&self) -> bool {
+        self.head.is_none()
+    }
+
+    pub(crate) fn push(&mut self, entry: OwnedItem) {
+        // Get a pointer to the entry to for the prev link
+        let ptr: *const Entry = &*entry as *const _;
+
+        // Remove the old head entry
+        let old = self.head.take();
+
+        unsafe {
+            // Ensure the entry is not already in a stack.
+            debug_assert!((*entry.next_stack.get()).is_none());
+            debug_assert!((*entry.prev_stack.get()).is_null());
+
+            if let Some(ref entry) = old.as_ref() {
+                debug_assert!({
+                    // The head is not already set to the entry
+                    ptr != &***entry as *const _
+                });
+
+                // Set the previous link on the old head
+                *entry.prev_stack.get() = ptr;
+            }
+
+            // Set this entry's next pointer
+            *entry.next_stack.get() = old;
+        }
+
+        // Update the head pointer
+        self.head = Some(entry);
+    }
+
+    /// Pops an item from the stack
+    pub(crate) fn pop(&mut self) -> Option<OwnedItem> {
+        let entry = self.head.take();
+
+        unsafe {
+            if let Some(entry) = entry.as_ref() {
+                self.head = (*entry.next_stack.get()).take();
+
+                if let Some(entry) = self.head.as_ref() {
+                    *entry.prev_stack.get() = ptr::null();
+                }
+
+                *entry.prev_stack.get() = ptr::null();
+            }
+        }
+
+        entry
+    }
+
+    pub(crate) fn remove(&mut self, entry: &Item) {
+        unsafe {
+            // Ensure that the entry is in fact contained by the stack
+            debug_assert!({
+                // This walks the full linked list even if an entry is found.
+                let mut next = self.head.as_ref();
+                let mut contains = false;
+
+                while let Some(n) = next {
+                    if entry as *const _ == &**n as *const _ {
+                        debug_assert!(!contains);
+                        contains = true;
+                    }
+
+                    next = (*n.next_stack.get()).as_ref();
+                }
+
+                contains
+            });
+
+            // Unlink `entry` from the next node
+            let next = (*entry.next_stack.get()).take();
+
+            if let Some(next) = next.as_ref() {
+                (*next.prev_stack.get()) = *entry.prev_stack.get();
+            }
+
+            // Unlink `entry` from the prev node
+
+            if let Some(prev) = (*entry.prev_stack.get()).as_ref() {
+                *prev.next_stack.get() = next;
+            } else {
+                // It is the head
+                self.head = next;
+            }
+
+            // Unset the prev pointer
+            *entry.prev_stack.get() = ptr::null();
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,5 @@
+//! Time error types.
+
 use self::Kind::*;
 use std::error;
 use std::fmt;
@@ -13,7 +15,7 @@
 ///   succeed in the future.
 ///
 /// * `at_capacity` occurs when a timer operation is attempted, but the timer
-///   instance is currently handling its maximum number of outstanding delays.
+///   instance is currently handling its maximum number of outstanding sleep instances.
 ///   In this case, the operation is not able to be performed at the current
 ///   moment, and `at_capacity` is returned. This is a transient error, i.e., at
 ///   some point in the future, if the operation is attempted again, it might
@@ -21,17 +23,34 @@
 ///   way to do this would be dropping the future that issued the timer operation.
 ///
 /// [shed load]: https://en.wikipedia.org/wiki/Load_Shedding
-#[derive(Debug)]
+#[derive(Debug, Copy, Clone)]
 pub struct Error(Kind);
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
 #[repr(u8)]
-enum Kind {
+pub(crate) enum Kind {
     Shutdown = 1,
     AtCapacity = 2,
     Invalid = 3,
 }
 
+impl From<Kind> for Error {
+    fn from(k: Kind) -> Self {
+        Error(k)
+    }
+}
+
+/// Error returned by `Timeout`.
+#[derive(Debug, PartialEq)]
+pub struct Elapsed(());
+
+#[derive(Debug)]
+pub(crate) enum InsertError {
+    Elapsed,
+}
+
+// ===== impl Error =====
+
 impl Error {
     /// Creates an error representing a shutdown timer.
     pub fn shutdown() -> Error {
@@ -40,10 +59,7 @@
 
     /// Returns `true` if the error was caused by the timer being shutdown.
     pub fn is_shutdown(&self) -> bool {
-        match self.0 {
-            Kind::Shutdown => true,
-            _ => false,
-        }
+        matches!(self.0, Kind::Shutdown)
     }
 
     /// Creates an error representing a timer at capacity.
@@ -53,10 +69,7 @@
 
     /// Returns `true` if the error was caused by the timer being at capacity.
     pub fn is_at_capacity(&self) -> bool {
-        match self.0 {
-            Kind::AtCapacity => true,
-            _ => false,
-        }
+        matches!(self.0, Kind::AtCapacity)
     }
 
     /// Create an error representing a misconfigured timer.
@@ -66,23 +79,7 @@
 
     /// Returns `true` if the error was caused by the timer being misconfigured.
     pub fn is_invalid(&self) -> bool {
-        match self.0 {
-            Kind::Invalid => true,
-            _ => false,
-        }
-    }
-
-    pub(crate) fn as_u8(&self) -> u8 {
-        self.0 as u8
-    }
-
-    pub(crate) fn from_u8(n: u8) -> Self {
-        Error(match n {
-            1 => Shutdown,
-            2 => AtCapacity,
-            3 => Invalid,
-            _ => panic!("u8 does not correspond to any time error variant"),
-        })
+        matches!(self.0, Kind::Invalid)
     }
 }
 
@@ -99,3 +96,25 @@
         write!(fmt, "{}", descr)
     }
 }
+
+// ===== impl Elapsed =====
+
+impl Elapsed {
+    pub(crate) fn new() -> Self {
+        Elapsed(())
+    }
+}
+
+impl fmt::Display for Elapsed {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        "deadline has elapsed".fmt(fmt)
+    }
+}
+
+impl std::error::Error for Elapsed {}
+
+impl From<Elapsed> for std::io::Error {
+    fn from(_err: Elapsed) -> std::io::Error {
+        std::io::ErrorKind::TimedOut.into()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/instant.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/instant.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/instant.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/instant.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,8 +4,32 @@
 use std::ops;
 use std::time::Duration;
 
-/// A measurement of the system clock, useful for talking to
-/// external entities like the file system or other processes.
+/// A measurement of a monotonically nondecreasing clock.
+/// Opaque and useful only with `Duration`.
+///
+/// Instants are always guaranteed to be no less than any previously measured
+/// instant when created, and are often useful for tasks such as measuring
+/// benchmarks or timing how long an operation takes.
+///
+/// Note, however, that instants are not guaranteed to be **steady**. In other
+/// words, each tick of the underlying clock may not be the same length (e.g.
+/// some seconds may be longer than others). An instant may jump forwards or
+/// experience time dilation (slow down or speed up), but it will never go
+/// backwards.
+///
+/// Instants are opaque types that can only be compared to one another. There is
+/// no method to get "the number of seconds" from an instant. Instead, it only
+/// allows measuring the duration between two instants (or comparing two
+/// instants).
+///
+/// The size of an `Instant` struct may vary depending on the target operating
+/// system.
+///
+/// # Note
+///
+/// This type wraps the inner `std` variant and is used to align the Tokio
+/// clock for uses of `now()`. This can be useful for testing where you can
+/// take advantage of `time::pause()` and `time::advance()`.
 #[derive(Clone, Copy, Eq, PartialEq, PartialOrd, Ord, Hash)]
 pub struct Instant {
     std: std::time::Instant,
@@ -30,6 +54,14 @@
         Instant { std }
     }
 
+    pub(crate) fn far_future() -> Instant {
+        // Roughly 30 years from now.
+        // API does not provide a way to obtain max `Instant`
+        // or convert specific date in the future to instant.
+        // 1000 years overflows on macOS, 100 years overflows on FreeBSD.
+        Self::now() + Duration::from_secs(86400 * 365 * 30)
+    }
+
     /// Convert the value into a `std::time::Instant`.
     pub fn into_std(self) -> std::time::Instant {
         self.std
@@ -50,12 +82,12 @@
     /// # Examples
     ///
     /// ```
-    /// use tokio::time::{Duration, Instant, delay_for};
+    /// use tokio::time::{Duration, Instant, sleep};
     ///
     /// #[tokio::main]
     /// async fn main() {
     ///     let now = Instant::now();
-    ///     delay_for(Duration::new(1, 0)).await;
+    ///     sleep(Duration::new(1, 0)).await;
     ///     let new_now = Instant::now();
     ///     println!("{:?}", new_now.checked_duration_since(now));
     ///     println!("{:?}", now.checked_duration_since(new_now)); // None
@@ -66,17 +98,17 @@
     }
 
     /// Returns the amount of time elapsed from another instant to this one, or
-    /// zero duration if that instant is earlier than this one.
+    /// zero duration if that instant is later than this one.
     ///
     /// # Examples
     ///
     /// ```
-    /// use tokio::time::{Duration, Instant, delay_for};
+    /// use tokio::time::{Duration, Instant, sleep};
     ///
     /// #[tokio::main]
     /// async fn main() {
     ///     let now = Instant::now();
-    ///     delay_for(Duration::new(1, 0)).await;
+    ///     sleep(Duration::new(1, 0)).await;
     ///     let new_now = Instant::now();
     ///     println!("{:?}", new_now.saturating_duration_since(now));
     ///     println!("{:?}", now.saturating_duration_since(new_now)); // 0ns
@@ -97,13 +129,13 @@
     /// # Examples
     ///
     /// ```
-    /// use tokio::time::{Duration, Instant, delay_for};
+    /// use tokio::time::{Duration, Instant, sleep};
     ///
     /// #[tokio::main]
     /// async fn main() {
     ///     let instant = Instant::now();
     ///     let three_secs = Duration::from_secs(3);
-    ///     delay_for(three_secs).await;
+    ///     sleep(three_secs).await;
     ///     assert!(instant.elapsed() >= three_secs);
     /// }
     /// ```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/interval.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/interval.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/interval.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/interval.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,17 +1,20 @@
 use crate::future::poll_fn;
-use crate::time::{delay_until, Delay, Duration, Instant};
+use crate::time::{sleep_until, Duration, Instant, Sleep};
 
-use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};
+use std::{convert::TryInto, future::Future};
 
-/// Creates new `Interval` that yields with interval of `duration`. The first
-/// tick completes immediately.
+/// Creates new [`Interval`] that yields with interval of `period`. The first
+/// tick completes immediately. The default [`MissedTickBehavior`] is
+/// [`Burst`](MissedTickBehavior::Burst), but this can be configured
+/// by calling [`set_missed_tick_behavior`](Interval::set_missed_tick_behavior).
 ///
-/// An interval will tick indefinitely. At any time, the `Interval` value can be
-/// dropped. This cancels the interval.
+/// An interval will tick indefinitely. At any time, the [`Interval`] value can
+/// be dropped. This cancels the interval.
 ///
-/// This function is equivalent to `interval_at(Instant::now(), period)`.
+/// This function is equivalent to
+/// [`interval_at(Instant::now(), period)`](interval_at).
 ///
 /// # Panics
 ///
@@ -26,9 +29,9 @@
 /// async fn main() {
 ///     let mut interval = time::interval(Duration::from_millis(10));
 ///
-///     interval.tick().await;
-///     interval.tick().await;
-///     interval.tick().await;
+///     interval.tick().await; // ticks immediately
+///     interval.tick().await; // ticks after 10ms
+///     interval.tick().await; // ticks after 10ms
 ///
 ///     // approximately 20ms have elapsed.
 /// }
@@ -36,12 +39,12 @@
 ///
 /// A simple example using `interval` to execute a task every two seconds.
 ///
-/// The difference between `interval` and [`delay_for`] is that an `interval`
-/// measures the time since the last tick, which means that `.tick().await`
+/// The difference between `interval` and [`sleep`] is that an [`Interval`]
+/// measures the time since the last tick, which means that [`.tick().await`]
 /// may wait for a shorter time than the duration specified for the interval
-/// if some time has passed between calls to `.tick().await`.
+/// if some time has passed between calls to [`.tick().await`].
 ///
-/// If the tick in the example below was replaced with [`delay_for`], the task
+/// If the tick in the example below was replaced with [`sleep`], the task
 /// would only be executed once every three seconds, and not every two
 /// seconds.
 ///
@@ -50,7 +53,7 @@
 ///
 /// async fn task_that_takes_a_second() {
 ///     println!("hello");
-///     time::delay_for(time::Duration::from_secs(1)).await
+///     time::sleep(time::Duration::from_secs(1)).await
 /// }
 ///
 /// #[tokio::main]
@@ -63,18 +66,21 @@
 /// }
 /// ```
 ///
-/// [`delay_for`]: crate::time::delay_for()
+/// [`sleep`]: crate::time::sleep()
+/// [`.tick().await`]: Interval::tick
 pub fn interval(period: Duration) -> Interval {
     assert!(period > Duration::new(0, 0), "`period` must be non-zero.");
 
     interval_at(Instant::now(), period)
 }
 
-/// Creates new `Interval` that yields with interval of `period` with the
-/// first tick completing at `start`.
+/// Creates new [`Interval`] that yields with interval of `period` with the
+/// first tick completing at `start`. The default [`MissedTickBehavior`] is
+/// [`Burst`](MissedTickBehavior::Burst), but this can be configured
+/// by calling [`set_missed_tick_behavior`](Interval::set_missed_tick_behavior).
 ///
-/// An interval will tick indefinitely. At any time, the `Interval` value can be
-/// dropped. This cancels the interval.
+/// An interval will tick indefinitely. At any time, the [`Interval`] value can
+/// be dropped. This cancels the interval.
 ///
 /// # Panics
 ///
@@ -90,9 +96,9 @@
 ///     let start = Instant::now() + Duration::from_millis(50);
 ///     let mut interval = interval_at(start, Duration::from_millis(10));
 ///
-///     interval.tick().await;
-///     interval.tick().await;
-///     interval.tick().await;
+///     interval.tick().await; // ticks after 50ms
+///     interval.tick().await; // ticks after 10ms
+///     interval.tick().await; // ticks after 10ms
 ///
 ///     // approximately 70ms have elapsed.
 /// }
@@ -101,44 +107,264 @@
     assert!(period > Duration::new(0, 0), "`period` must be non-zero.");
 
     Interval {
-        delay: delay_until(start),
+        delay: Box::pin(sleep_until(start)),
         period,
+        missed_tick_behavior: Default::default(),
     }
 }
 
-/// Stream returned by [`interval`](interval) and [`interval_at`](interval_at).
+/// Defines the behavior of an [`Interval`] when it misses a tick.
 ///
-/// This type only implements the [`Stream`] trait if the "stream" feature is
-/// enabled.
+/// Sometimes, an [`Interval`]'s tick is missed. For example, consider the
+/// following:
 ///
-/// [`Stream`]: trait@crate::stream::Stream
+/// ```
+/// use tokio::time::{self, Duration};
+/// # async fn task_that_takes_one_to_three_millis() {}
+///
+/// #[tokio::main]
+/// async fn main() {
+///     // ticks every 2 seconds
+///     let mut interval = time::interval(Duration::from_millis(2));
+///     for _ in 0..5 {
+///         interval.tick().await;
+///         // if this takes more than 2 milliseconds, a tick will be delayed
+///         task_that_takes_one_to_three_millis().await;
+///     }
+/// }
+/// ```
+///
+/// Generally, a tick is missed if too much time is spent without calling
+/// [`Interval::tick()`].
+///
+/// By default, when a tick is missed, [`Interval`] fires ticks as quickly as it
+/// can until it is "caught up" in time to where it should be.
+/// `MissedTickBehavior` can be used to specify a different behavior for
+/// [`Interval`] to exhibit. Each variant represents a different strategy.
+///
+/// Note that because the executor cannot guarantee exact precision with timers,
+/// these strategies will only apply when the delay is greater than 5
+/// milliseconds.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum MissedTickBehavior {
+    /// Tick as fast as possible until caught up.
+    ///
+    /// When this strategy is used, [`Interval`] schedules ticks "normally" (the
+    /// same as it would have if the ticks hadn't been delayed), which results
+    /// in it firing ticks as fast as possible until it is caught up in time to
+    /// where it should be. Unlike [`Delay`] and [`Skip`], the ticks yielded
+    /// when `Burst` is used (the [`Instant`]s that [`tick`](Interval::tick)
+    /// yields) aren't different than they would have been if a tick had not
+    /// been missed. Like [`Skip`], and unlike [`Delay`], the ticks may be
+    /// shortened.
+    ///
+    /// This looks something like this:
+    /// ```text
+    /// Expected ticks: |     1     |     2     |     3     |     4     |     5     |     6     |
+    /// Actual ticks:   | work -----|          delay          | work | work | work -| work -----|
+    /// ```
+    ///
+    /// In code:
+    ///
+    /// ```
+    /// use tokio::time::{interval, Duration};
+    /// # async fn task_that_takes_200_millis() {}
+    ///
+    /// # #[tokio::main(flavor = "current_thread")]
+    /// # async fn main() {
+    /// let mut interval = interval(Duration::from_millis(50));
+    ///
+    /// task_that_takes_200_millis().await;
+    /// // The `Interval` has missed a tick
+    ///
+    /// // Since we have exceeded our timeout, this will resolve immediately
+    /// interval.tick().await;
+    ///
+    /// // Since we are more than 100ms after the start of `interval`, this will
+    /// // also resolve immediately.
+    /// interval.tick().await;
+    ///
+    /// // Also resolves immediately, because it was supposed to resolve at
+    /// // 150ms after the start of `interval`
+    /// interval.tick().await;
+    ///
+    /// // Resolves immediately
+    /// interval.tick().await;
+    ///
+    /// // Since we have gotten to 200ms after the start of `interval`, this
+    /// // will resolve after 50ms
+    /// interval.tick().await;
+    /// # }
+    /// ```
+    ///
+    /// This is the default behavior when [`Interval`] is created with
+    /// [`interval`] and [`interval_at`].
+    ///
+    /// [`Delay`]: MissedTickBehavior::Delay
+    /// [`Skip`]: MissedTickBehavior::Skip
+    Burst,
+
+    /// Tick at multiples of `period` from when [`tick`] was called, rather than
+    /// from `start`.
+    ///
+    /// When this strategy is used and [`Interval`] has missed a tick, instead
+    /// of scheduling ticks to fire at multiples of `period` from `start` (the
+    /// time when the first tick was fired), it schedules all future ticks to
+    /// happen at a regular `period` from the point when [`tick`] was called.
+    /// Unlike [`Burst`] and [`Skip`], ticks are not shortened, and they aren't
+    /// guaranteed to happen at a multiple of `period` from `start` any longer.
+    ///
+    /// This looks something like this:
+    /// ```text
+    /// Expected ticks: |     1     |     2     |     3     |     4     |     5     |     6     |
+    /// Actual ticks:   | work -----|          delay          | work -----| work -----| work -----|
+    /// ```
+    ///
+    /// In code:
+    ///
+    /// ```
+    /// use tokio::time::{interval, Duration, MissedTickBehavior};
+    /// # async fn task_that_takes_more_than_50_millis() {}
+    ///
+    /// # #[tokio::main(flavor = "current_thread")]
+    /// # async fn main() {
+    /// let mut interval = interval(Duration::from_millis(50));
+    /// interval.set_missed_tick_behavior(MissedTickBehavior::Delay);
+    ///
+    /// task_that_takes_more_than_50_millis().await;
+    /// // The `Interval` has missed a tick
+    ///
+    /// // Since we have exceeded our timeout, this will resolve immediately
+    /// interval.tick().await;
+    ///
+    /// // But this one, rather than also resolving immediately, as might happen
+    /// // with the `Burst` or `Skip` behaviors, will not resolve until
+    /// // 50ms after the call to `tick` up above. That is, in `tick`, when we
+    /// // recognize that we missed a tick, we schedule the next tick to happen
+    /// // 50ms (or whatever the `period` is) from right then, not from when
+    /// // were were *supposed* to tick
+    /// interval.tick().await;
+    /// # }
+    /// ```
+    ///
+    /// [`Burst`]: MissedTickBehavior::Burst
+    /// [`Skip`]: MissedTickBehavior::Skip
+    /// [`tick`]: Interval::tick
+    Delay,
+
+    /// Skip missed ticks and tick on the next multiple of `period` from
+    /// `start`.
+    ///
+    /// When this strategy is used, [`Interval`] schedules the next tick to fire
+    /// at the next-closest tick that is a multiple of `period` away from
+    /// `start` (the point where [`Interval`] first ticked). Like [`Burst`], all
+    /// ticks remain multiples of `period` away from `start`, but unlike
+    /// [`Burst`], the ticks may not be *one* multiple of `period` away from the
+    /// last tick. Like [`Delay`], the ticks are no longer the same as they
+    /// would have been if ticks had not been missed, but unlike [`Delay`], and
+    /// like [`Burst`], the ticks may be shortened to be less than one `period`
+    /// away from each other.
+    ///
+    /// This looks something like this:
+    /// ```text
+    /// Expected ticks: |     1     |     2     |     3     |     4     |     5     |     6     |
+    /// Actual ticks:   | work -----|          delay          | work ---| work -----| work -----|
+    /// ```
+    ///
+    /// In code:
+    ///
+    /// ```
+    /// use tokio::time::{interval, Duration, MissedTickBehavior};
+    /// # async fn task_that_takes_75_millis() {}
+    ///
+    /// # #[tokio::main(flavor = "current_thread")]
+    /// # async fn main() {
+    /// let mut interval = interval(Duration::from_millis(50));
+    /// interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+    ///
+    /// task_that_takes_75_millis().await;
+    /// // The `Interval` has missed a tick
+    ///
+    /// // Since we have exceeded our timeout, this will resolve immediately
+    /// interval.tick().await;
+    ///
+    /// // This one will resolve after 25ms, 100ms after the start of
+    /// // `interval`, which is the closest multiple of `period` from the start
+    /// // of `interval` after the call to `tick` up above.
+    /// interval.tick().await;
+    /// # }
+    /// ```
+    ///
+    /// [`Burst`]: MissedTickBehavior::Burst
+    /// [`Delay`]: MissedTickBehavior::Delay
+    Skip,
+}
+
+impl MissedTickBehavior {
+    /// If a tick is missed, this method is called to determine when the next tick should happen.
+    fn next_timeout(&self, timeout: Instant, now: Instant, period: Duration) -> Instant {
+        match self {
+            Self::Burst => timeout + period,
+            Self::Delay => now + period,
+            Self::Skip => {
+                now + period
+                    - Duration::from_nanos(
+                        ((now - timeout).as_nanos() % period.as_nanos())
+                            .try_into()
+                            // This operation is practically guaranteed not to
+                            // fail, as in order for it to fail, `period` would
+                            // have to be longer than `now - timeout`, and both
+                            // would have to be longer than 584 years.
+                            //
+                            // If it did fail, there's not a good way to pass
+                            // the error along to the user, so we just panic.
+                            .expect(
+                                "too much time has elapsed since the interval was supposed to tick",
+                            ),
+                    )
+            }
+        }
+    }
+}
+
+impl Default for MissedTickBehavior {
+    /// Returns [`MissedTickBehavior::Burst`].
+    ///
+    /// For most usecases, the [`Burst`] strategy is what is desired.
+    /// Additionally, to preserve backwards compatibility, the [`Burst`]
+    /// strategy must be the default. For these reasons,
+    /// [`MissedTickBehavior::Burst`] is the default for [`MissedTickBehavior`].
+    /// See [`Burst`] for more details.
+    ///
+    /// [`Burst`]: MissedTickBehavior::Burst
+    fn default() -> Self {
+        Self::Burst
+    }
+}
+
+/// Interval returned by [`interval`] and [`interval_at`]
+///
+/// This type allows you to wait on a sequence of instants with a certain
+/// duration between each instant. Unlike calling [`sleep`] in a loop, this lets
+/// you count the time spent between the calls to [`sleep`] as well.
+///
+/// An `Interval` can be turned into a `Stream` with [`IntervalStream`].
+///
+/// [`IntervalStream`]: https://docs.rs/tokio-stream/latest/tokio_stream/wrappers/struct.IntervalStream.html
+/// [`sleep`]: crate::time::sleep
 #[derive(Debug)]
 pub struct Interval {
     /// Future that completes the next time the `Interval` yields a value.
-    delay: Delay,
+    delay: Pin<Box<Sleep>>,
 
     /// The duration between values yielded by `Interval`.
     period: Duration,
+
+    /// The strategy `Interval` should use when a tick is missed.
+    missed_tick_behavior: MissedTickBehavior,
 }
 
 impl Interval {
-    #[doc(hidden)] // TODO: document
-    pub fn poll_tick(&mut self, cx: &mut Context<'_>) -> Poll<Instant> {
-        // Wait for the delay to be done
-        ready!(Pin::new(&mut self.delay).poll(cx));
-
-        // Get the `now` by looking at the `delay` deadline
-        let now = self.delay.deadline();
-
-        // The next interval value is `duration` after the one that just
-        // yielded.
-        let next = now + self.period;
-        self.delay.reset(next);
-
-        // Return the current instant
-        Poll::Ready(now)
-    }
-
     /// Completes when the next instant in the interval has been reached.
     ///
     /// # Examples
@@ -159,17 +385,63 @@
     ///     // approximately 20ms have elapsed.
     /// }
     /// ```
-    #[allow(clippy::should_implement_trait)] // TODO: rename (tokio-rs/tokio#1261)
     pub async fn tick(&mut self) -> Instant {
         poll_fn(|cx| self.poll_tick(cx)).await
     }
-}
 
-#[cfg(feature = "stream")]
-impl crate::stream::Stream for Interval {
-    type Item = Instant;
+    /// Poll for the next instant in the interval to be reached.
+    ///
+    /// This method can return the following values:
+    ///
+    ///  * `Poll::Pending` if the next instant has not yet been reached.
+    ///  * `Poll::Ready(instant)` if the next instant has been reached.
+    ///
+    /// When this method returns `Poll::Pending`, the current task is scheduled
+    /// to receive a wakeup when the instant has elapsed. Note that on multiple
+    /// calls to `poll_tick`, only the [`Waker`](std::task::Waker) from the
+    /// [`Context`] passed to the most recent call is scheduled to receive a
+    /// wakeup.
+    pub fn poll_tick(&mut self, cx: &mut Context<'_>) -> Poll<Instant> {
+        // Wait for the delay to be done
+        ready!(Pin::new(&mut self.delay).poll(cx));
+
+        // Get the time when we were scheduled to tick
+        let timeout = self.delay.deadline();
+
+        let now = Instant::now();
+
+        // If a tick was not missed, and thus we are being called before the
+        // next tick is due, just schedule the next tick normally, one `period`
+        // after `timeout`
+        //
+        // However, if a tick took excessively long and we are now behind,
+        // schedule the next tick according to how the user specified with
+        // `MissedTickBehavior`
+        let next = if now > timeout + Duration::from_millis(5) {
+            self.missed_tick_behavior
+                .next_timeout(timeout, now, self.period)
+        } else {
+            timeout + self.period
+        };
+
+        self.delay.as_mut().reset(next);
+
+        // Return the time when we were scheduled to tick
+        Poll::Ready(timeout)
+    }
+
+    /// Returns the [`MissedTickBehavior`] strategy currently being used.
+    pub fn missed_tick_behavior(&self) -> MissedTickBehavior {
+        self.missed_tick_behavior
+    }
+
+    /// Sets the [`MissedTickBehavior`] strategy that should be used.
+    pub fn set_missed_tick_behavior(&mut self, behavior: MissedTickBehavior) {
+        self.missed_tick_behavior = behavior;
+    }
 
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Instant>> {
-        Poll::Ready(Some(ready!(self.poll_tick(cx))))
+    /// Returns the period of the interval.
+    pub fn period(&self) -> Duration {
+        self.period
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,45 +3,38 @@
 //! This module provides a number of types for executing code after a set period
 //! of time.
 //!
-//! * `Delay` is a future that does no work and completes at a specific `Instant`
+//! * [`Sleep`] is a future that does no work and completes at a specific [`Instant`]
 //!   in time.
 //!
-//! * `Interval` is a stream yielding a value at a fixed period. It is
-//!   initialized with a `Duration` and repeatedly yields each time the duration
+//! * [`Interval`] is a stream yielding a value at a fixed period. It is
+//!   initialized with a [`Duration`] and repeatedly yields each time the duration
 //!   elapses.
 //!
-//! * `Timeout`: Wraps a future or stream, setting an upper bound to the amount
+//! * [`Timeout`]: Wraps a future or stream, setting an upper bound to the amount
 //!   of time it is allowed to execute. If the future or stream does not
 //!   complete in time, then it is canceled and an error is returned.
 //!
-//! * `DelayQueue`: A queue where items are returned once the requested delay
-//!   has expired.
-//!
 //! These types are sufficient for handling a large number of scenarios
 //! involving time.
 //!
-//! These types must be used from within the context of the `Runtime`.
+//! These types must be used from within the context of the [`Runtime`](crate::runtime::Runtime).
 //!
 //! # Examples
 //!
 //! Wait 100ms and print "100 ms have elapsed"
 //!
 //! ```
-//! use tokio::time::delay_for;
-//!
 //! use std::time::Duration;
-//!
+//! use tokio::time::sleep;
 //!
 //! #[tokio::main]
 //! async fn main() {
-//!     delay_for(Duration::from_millis(100)).await;
+//!     sleep(Duration::from_millis(100)).await;
 //!     println!("100 ms have elapsed");
 //! }
 //! ```
 //!
-//! Require that an operation takes no more than 300ms. Note that this uses the
-//! `timeout` function on the `FutureExt` trait. This trait is included in the
-//! prelude.
+//! Require that an operation takes no more than 1s.
 //!
 //! ```
 //! use tokio::time::{timeout, Duration};
@@ -61,12 +54,12 @@
 //!
 //! A simple example using [`interval`] to execute a task every two seconds.
 //!
-//! The difference between [`interval`] and [`delay_for`] is that an
-//! [`interval`] measures the time since the last tick, which means that
-//! `.tick().await` may wait for a shorter time than the duration specified
-//! for the interval if some time has passed between calls to `.tick().await`.
+//! The difference between [`interval`] and [`sleep`] is that an [`interval`]
+//! measures the time since the last tick, which means that `.tick().await` may
+//! wait for a shorter time than the duration specified for the interval
+//! if some time has passed between calls to `.tick().await`.
 //!
-//! If the tick in the example below was replaced with [`delay_for`], the task
+//! If the tick in the example below was replaced with [`sleep`], the task
 //! would only be executed once every three seconds, and not every two
 //! seconds.
 //!
@@ -75,7 +68,7 @@
 //!
 //! async fn task_that_takes_a_second() {
 //!     println!("hello");
-//!     time::delay_for(time::Duration::from_secs(1)).await
+//!     time::sleep(time::Duration::from_secs(1)).await
 //! }
 //!
 //! #[tokio::main]
@@ -88,7 +81,6 @@
 //! }
 //! ```
 //!
-//! [`delay_for`]: crate::time::delay_for()
 //! [`interval`]: crate::time::interval()
 
 mod clock;
@@ -96,67 +88,27 @@
 #[cfg(feature = "test-util")]
 pub use clock::{advance, pause, resume};
 
-pub mod delay_queue;
-#[doc(inline)]
-pub use delay_queue::DelayQueue;
-
-mod delay;
-pub use delay::{delay_for, delay_until, Delay};
-
 pub(crate) mod driver;
 
-mod error;
-pub use error::Error;
+#[doc(inline)]
+pub use driver::sleep::{sleep, sleep_until, Sleep};
+
+pub mod error;
 
 mod instant;
 pub use self::instant::Instant;
 
 mod interval;
-pub use interval::{interval, interval_at, Interval};
+pub use interval::{interval, interval_at, Interval, MissedTickBehavior};
 
 mod timeout;
 #[doc(inline)]
-pub use timeout::{timeout, timeout_at, Elapsed, Timeout};
-
-cfg_stream! {
-    mod throttle;
-    pub use throttle::{throttle, Throttle};
-}
-
-mod wheel;
+pub use timeout::{timeout, timeout_at, Timeout};
 
 #[cfg(test)]
 #[cfg(not(loom))]
 mod tests;
 
 // Re-export for convenience
+#[doc(no_inline)]
 pub use std::time::Duration;
-
-// ===== Internal utils =====
-
-enum Round {
-    Up,
-    Down,
-}
-
-/// Convert a `Duration` to milliseconds, rounding up and saturating at
-/// `u64::MAX`.
-///
-/// The saturating is fine because `u64::MAX` milliseconds are still many
-/// million years.
-#[inline]
-fn ms(duration: Duration, round: Round) -> u64 {
-    const NANOS_PER_MILLI: u32 = 1_000_000;
-    const MILLIS_PER_SEC: u64 = 1_000;
-
-    // Round up.
-    let millis = match round {
-        Round::Up => (duration.subsec_nanos() + NANOS_PER_MILLI - 1) / NANOS_PER_MILLI,
-        Round::Down => duration.subsec_millis(),
-    };
-
-    duration
-        .as_secs()
-        .saturating_mul(MILLIS_PER_SEC)
-        .saturating_add(u64::from(millis))
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/tests/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/tests/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/tests/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/tests/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-mod test_delay;
+mod test_sleep;
 
 use crate::time::{self, Instant};
 use std::time::Duration;
@@ -8,15 +8,15 @@
 
 #[test]
 fn registration_is_send_and_sync() {
-    use crate::time::driver::Registration;
+    use crate::time::Sleep;
 
-    assert_send::<Registration>();
-    assert_sync::<Registration>();
+    assert_send::<Sleep>();
+    assert_sync::<Sleep>();
 }
 
 #[test]
 #[should_panic]
-fn delay_is_eager() {
+fn sleep_is_eager() {
     let when = Instant::now() + Duration::from_millis(100);
-    let _ = time::delay_until(when);
+    let _ = time::sleep_until(when);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/tests/test_delay.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/tests/test_delay.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/tests/test_delay.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/tests/test_delay.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,449 +0,0 @@
-use crate::park::{Park, Unpark};
-use crate::time::driver::{Driver, Entry, Handle};
-use crate::time::Clock;
-use crate::time::{Duration, Instant};
-
-use tokio_test::task;
-use tokio_test::{assert_ok, assert_pending, assert_ready_ok};
-
-use std::sync::Arc;
-
-macro_rules! poll {
-    ($e:expr) => {
-        $e.enter(|cx, e| e.poll_elapsed(cx))
-    };
-}
-
-#[test]
-fn frozen_utility_returns_correct_advanced_duration() {
-    let clock = Clock::new();
-    clock.pause();
-    let start = clock.now();
-
-    clock.advance(ms(10));
-    assert_eq!(clock.now() - start, ms(10));
-}
-
-#[test]
-fn immediate_delay() {
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    let when = clock.now();
-    let mut e = task::spawn(delay_until(&handle, when));
-
-    assert_ready_ok!(poll!(e));
-
-    assert_ok!(driver.park_timeout(Duration::from_millis(1000)));
-
-    // The time has not advanced. The `turn` completed immediately.
-    assert_eq!(clock.now() - start, ms(1000));
-}
-
-#[test]
-fn delayed_delay_level_0() {
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    for &i in &[1, 10, 60] {
-        // Create a `Delay` that elapses in the future
-        let mut e = task::spawn(delay_until(&handle, start + ms(i)));
-
-        // The delay has not elapsed.
-        assert_pending!(poll!(e));
-
-        assert_ok!(driver.park());
-        assert_eq!(clock.now() - start, ms(i));
-
-        assert_ready_ok!(poll!(e));
-    }
-}
-
-#[test]
-fn sub_ms_delayed_delay() {
-    let (mut driver, clock, handle) = setup();
-
-    for _ in 0..5 {
-        let deadline = clock.now() + ms(1) + Duration::new(0, 1);
-
-        let mut e = task::spawn(delay_until(&handle, deadline));
-
-        assert_pending!(poll!(e));
-
-        assert_ok!(driver.park());
-        assert_ready_ok!(poll!(e));
-
-        assert!(clock.now() >= deadline);
-
-        clock.advance(Duration::new(0, 1));
-    }
-}
-
-#[test]
-fn delayed_delay_wrapping_level_0() {
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    assert_ok!(driver.park_timeout(ms(5)));
-    assert_eq!(clock.now() - start, ms(5));
-
-    let mut e = task::spawn(delay_until(&handle, clock.now() + ms(60)));
-
-    assert_pending!(poll!(e));
-
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(64));
-    assert_pending!(poll!(e));
-
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(65));
-
-    assert_ready_ok!(poll!(e));
-}
-
-#[test]
-fn timer_wrapping_with_higher_levels() {
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    // Set delay to hit level 1
-    let mut e1 = task::spawn(delay_until(&handle, clock.now() + ms(64)));
-    assert_pending!(poll!(e1));
-
-    // Turn a bit
-    assert_ok!(driver.park_timeout(ms(5)));
-
-    // Set timeout such that it will hit level 0, but wrap
-    let mut e2 = task::spawn(delay_until(&handle, clock.now() + ms(60)));
-    assert_pending!(poll!(e2));
-
-    // This should result in s1 firing
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(64));
-
-    assert_ready_ok!(poll!(e1));
-    assert_pending!(poll!(e2));
-
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(65));
-
-    assert_ready_ok!(poll!(e1));
-}
-
-#[test]
-fn delay_with_deadline_in_past() {
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    // Create `Delay` that elapsed immediately.
-    let mut e = task::spawn(delay_until(&handle, clock.now() - ms(100)));
-
-    // Even though the delay expires in the past, it is not ready yet
-    // because the timer must observe it.
-    assert_ready_ok!(poll!(e));
-
-    // Turn the timer, it runs for the elapsed time
-    assert_ok!(driver.park_timeout(ms(1000)));
-
-    // The time has not advanced. The `turn` completed immediately.
-    assert_eq!(clock.now() - start, ms(1000));
-}
-
-#[test]
-fn delayed_delay_level_1() {
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    // Create a `Delay` that elapses in the future
-    let mut e = task::spawn(delay_until(&handle, clock.now() + ms(234)));
-
-    // The delay has not elapsed.
-    assert_pending!(poll!(e));
-
-    // Turn the timer, this will wake up to cascade the timer down.
-    assert_ok!(driver.park_timeout(ms(1000)));
-    assert_eq!(clock.now() - start, ms(192));
-
-    // The delay has not elapsed.
-    assert_pending!(poll!(e));
-
-    // Turn the timer again
-    assert_ok!(driver.park_timeout(ms(1000)));
-    assert_eq!(clock.now() - start, ms(234));
-
-    // The delay has elapsed.
-    assert_ready_ok!(poll!(e));
-
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    // Create a `Delay` that elapses in the future
-    let mut e = task::spawn(delay_until(&handle, clock.now() + ms(234)));
-
-    // The delay has not elapsed.
-    assert_pending!(poll!(e));
-
-    // Turn the timer with a smaller timeout than the cascade.
-    assert_ok!(driver.park_timeout(ms(100)));
-    assert_eq!(clock.now() - start, ms(100));
-
-    assert_pending!(poll!(e));
-
-    // Turn the timer, this will wake up to cascade the timer down.
-    assert_ok!(driver.park_timeout(ms(1000)));
-    assert_eq!(clock.now() - start, ms(192));
-
-    // The delay has not elapsed.
-    assert_pending!(poll!(e));
-
-    // Turn the timer again
-    assert_ok!(driver.park_timeout(ms(1000)));
-    assert_eq!(clock.now() - start, ms(234));
-
-    // The delay has elapsed.
-    assert_ready_ok!(poll!(e));
-}
-
-#[test]
-fn concurrently_set_two_timers_second_one_shorter() {
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    let mut e1 = task::spawn(delay_until(&handle, clock.now() + ms(500)));
-    let mut e2 = task::spawn(delay_until(&handle, clock.now() + ms(200)));
-
-    // The delay has not elapsed
-    assert_pending!(poll!(e1));
-    assert_pending!(poll!(e2));
-
-    // Delay until a cascade
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(192));
-
-    // Delay until the second timer.
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(200));
-
-    // The shorter delay fires
-    assert_ready_ok!(poll!(e2));
-    assert_pending!(poll!(e1));
-
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(448));
-
-    assert_pending!(poll!(e1));
-
-    // Turn again, this time the time will advance to the second delay
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(500));
-
-    assert_ready_ok!(poll!(e1));
-}
-
-#[test]
-fn short_delay() {
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    // Create a `Delay` that elapses in the future
-    let mut e = task::spawn(delay_until(&handle, clock.now() + ms(1)));
-
-    // The delay has not elapsed.
-    assert_pending!(poll!(e));
-
-    // Turn the timer, but not enough time will go by.
-    assert_ok!(driver.park());
-
-    // The delay has elapsed.
-    assert_ready_ok!(poll!(e));
-
-    // The time has advanced to the point of the delay elapsing.
-    assert_eq!(clock.now() - start, ms(1));
-}
-
-#[test]
-fn sorta_long_delay_until() {
-    const MIN_5: u64 = 5 * 60 * 1000;
-
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    // Create a `Delay` that elapses in the future
-    let mut e = task::spawn(delay_until(&handle, clock.now() + ms(MIN_5)));
-
-    // The delay has not elapsed.
-    assert_pending!(poll!(e));
-
-    let cascades = &[262_144, 262_144 + 9 * 4096, 262_144 + 9 * 4096 + 15 * 64];
-
-    for &elapsed in cascades {
-        assert_ok!(driver.park());
-        assert_eq!(clock.now() - start, ms(elapsed));
-
-        assert_pending!(poll!(e));
-    }
-
-    assert_ok!(driver.park());
-    assert_eq!(clock.now() - start, ms(MIN_5));
-
-    // The delay has elapsed.
-    assert_ready_ok!(poll!(e));
-}
-
-#[test]
-fn very_long_delay() {
-    const MO_5: u64 = 5 * 30 * 24 * 60 * 60 * 1000;
-
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    // Create a `Delay` that elapses in the future
-    let mut e = task::spawn(delay_until(&handle, clock.now() + ms(MO_5)));
-
-    // The delay has not elapsed.
-    assert_pending!(poll!(e));
-
-    let cascades = &[
-        12_884_901_888,
-        12_952_010_752,
-        12_959_875_072,
-        12_959_997_952,
-    ];
-
-    for &elapsed in cascades {
-        assert_ok!(driver.park());
-        assert_eq!(clock.now() - start, ms(elapsed));
-
-        assert_pending!(poll!(e));
-    }
-
-    // Turn the timer, but not enough time will go by.
-    assert_ok!(driver.park());
-
-    // The time has advanced to the point of the delay elapsing.
-    assert_eq!(clock.now() - start, ms(MO_5));
-
-    // The delay has elapsed.
-    assert_ready_ok!(poll!(e));
-}
-
-#[test]
-fn unpark_is_delayed() {
-    // A special park that will take much longer than the requested duration
-    struct MockPark(Clock);
-
-    struct MockUnpark;
-
-    impl Park for MockPark {
-        type Unpark = MockUnpark;
-        type Error = ();
-
-        fn unpark(&self) -> Self::Unpark {
-            MockUnpark
-        }
-
-        fn park(&mut self) -> Result<(), Self::Error> {
-            panic!("parking forever");
-        }
-
-        fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
-            assert_eq!(duration, ms(0));
-            self.0.advance(ms(436));
-            Ok(())
-        }
-
-        fn shutdown(&mut self) {}
-    }
-
-    impl Unpark for MockUnpark {
-        fn unpark(&self) {}
-    }
-
-    let clock = Clock::new();
-    clock.pause();
-    let start = clock.now();
-    let mut driver = Driver::new(MockPark(clock.clone()), clock.clone());
-    let handle = driver.handle();
-
-    let mut e1 = task::spawn(delay_until(&handle, clock.now() + ms(100)));
-    let mut e2 = task::spawn(delay_until(&handle, clock.now() + ms(101)));
-    let mut e3 = task::spawn(delay_until(&handle, clock.now() + ms(200)));
-
-    assert_pending!(poll!(e1));
-    assert_pending!(poll!(e2));
-    assert_pending!(poll!(e3));
-
-    assert_ok!(driver.park());
-
-    assert_eq!(clock.now() - start, ms(500));
-
-    assert_ready_ok!(poll!(e1));
-    assert_ready_ok!(poll!(e2));
-    assert_ready_ok!(poll!(e3));
-}
-
-#[test]
-fn set_timeout_at_deadline_greater_than_max_timer() {
-    const YR_1: u64 = 365 * 24 * 60 * 60 * 1000;
-    const YR_5: u64 = 5 * YR_1;
-
-    let (mut driver, clock, handle) = setup();
-    let start = clock.now();
-
-    for _ in 0..5 {
-        assert_ok!(driver.park_timeout(ms(YR_1)));
-    }
-
-    let mut e = task::spawn(delay_until(&handle, clock.now() + ms(1)));
-    assert_pending!(poll!(e));
-
-    assert_ok!(driver.park_timeout(ms(1000)));
-    assert_eq!(clock.now() - start, ms(YR_5) + ms(1));
-
-    assert_ready_ok!(poll!(e));
-}
-
-fn setup() -> (Driver<MockPark>, Clock, Handle) {
-    let clock = Clock::new();
-    clock.pause();
-    let driver = Driver::new(MockPark(clock.clone()), clock.clone());
-    let handle = driver.handle();
-
-    (driver, clock, handle)
-}
-
-fn delay_until(handle: &Handle, when: Instant) -> Arc<Entry> {
-    Entry::new(&handle, when, ms(0))
-}
-
-struct MockPark(Clock);
-
-struct MockUnpark;
-
-impl Park for MockPark {
-    type Unpark = MockUnpark;
-    type Error = ();
-
-    fn unpark(&self) -> Self::Unpark {
-        MockUnpark
-    }
-
-    fn park(&mut self) -> Result<(), Self::Error> {
-        panic!("parking forever");
-    }
-
-    fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
-        self.0.advance(duration);
-        Ok(())
-    }
-
-    fn shutdown(&mut self) {}
-}
-
-impl Unpark for MockUnpark {
-    fn unpark(&self) {}
-}
-
-fn ms(n: u64) -> Duration {
-    Duration::from_millis(n)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/tests/test_sleep.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/tests/test_sleep.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/tests/test_sleep.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/tests/test_sleep.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,443 @@
+//use crate::time::driver::{Driver, Entry, Handle};
+
+/*
+macro_rules! poll {
+    ($e:expr) => {
+        $e.enter(|cx, e| e.poll_elapsed(cx))
+    };
+}
+
+#[test]
+fn frozen_utility_returns_correct_advanced_duration() {
+    let clock = Clock::new();
+    clock.pause();
+    let start = clock.now();
+
+    clock.advance(ms(10));
+    assert_eq!(clock.now() - start, ms(10));
+}
+
+#[test]
+fn immediate_sleep() {
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    let when = clock.now();
+    let mut e = task::spawn(sleep_until(&handle, when));
+
+    assert_ready_ok!(poll!(e));
+
+    assert_ok!(driver.park_timeout(Duration::from_millis(1000)));
+
+    // The time has not advanced. The `turn` completed immediately.
+    assert_eq!(clock.now() - start, ms(1000));
+}
+
+#[test]
+fn delayed_sleep_level_0() {
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    for &i in &[1, 10, 60] {
+        // Create a `Sleep` that elapses in the future
+        let mut e = task::spawn(sleep_until(&handle, start + ms(i)));
+
+        // The sleep instance has not elapsed.
+        assert_pending!(poll!(e));
+
+        assert_ok!(driver.park());
+        assert_eq!(clock.now() - start, ms(i));
+
+        assert_ready_ok!(poll!(e));
+    }
+}
+
+#[test]
+fn sub_ms_delayed_sleep() {
+    let (mut driver, clock, handle) = setup();
+
+    for _ in 0..5 {
+        let deadline = clock.now() + ms(1) + Duration::new(0, 1);
+
+        let mut e = task::spawn(sleep_until(&handle, deadline));
+
+        assert_pending!(poll!(e));
+
+        assert_ok!(driver.park());
+        assert_ready_ok!(poll!(e));
+
+        assert!(clock.now() >= deadline);
+
+        clock.advance(Duration::new(0, 1));
+    }
+}
+
+#[test]
+fn delayed_sleep_wrapping_level_0() {
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    assert_ok!(driver.park_timeout(ms(5)));
+    assert_eq!(clock.now() - start, ms(5));
+
+    let mut e = task::spawn(sleep_until(&handle, clock.now() + ms(60)));
+
+    assert_pending!(poll!(e));
+
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(64));
+    assert_pending!(poll!(e));
+
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(65));
+
+    assert_ready_ok!(poll!(e));
+}
+
+#[test]
+fn timer_wrapping_with_higher_levels() {
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    // Set sleep to hit level 1
+    let mut e1 = task::spawn(sleep_until(&handle, clock.now() + ms(64)));
+    assert_pending!(poll!(e1));
+
+    // Turn a bit
+    assert_ok!(driver.park_timeout(ms(5)));
+
+    // Set timeout such that it will hit level 0, but wrap
+    let mut e2 = task::spawn(sleep_until(&handle, clock.now() + ms(60)));
+    assert_pending!(poll!(e2));
+
+    // This should result in s1 firing
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(64));
+
+    assert_ready_ok!(poll!(e1));
+    assert_pending!(poll!(e2));
+
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(65));
+
+    assert_ready_ok!(poll!(e1));
+}
+
+#[test]
+fn sleep_with_deadline_in_past() {
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    // Create `Sleep` that elapsed immediately.
+    let mut e = task::spawn(sleep_until(&handle, clock.now() - ms(100)));
+
+    // Even though the `Sleep` expires in the past, it is not ready yet
+    // because the timer must observe it.
+    assert_ready_ok!(poll!(e));
+
+    // Turn the timer, it runs for the elapsed time
+    assert_ok!(driver.park_timeout(ms(1000)));
+
+    // The time has not advanced. The `turn` completed immediately.
+    assert_eq!(clock.now() - start, ms(1000));
+}
+
+#[test]
+fn delayed_sleep_level_1() {
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    // Create a `Sleep` that elapses in the future
+    let mut e = task::spawn(sleep_until(&handle, clock.now() + ms(234)));
+
+    // The sleep has not elapsed.
+    assert_pending!(poll!(e));
+
+    // Turn the timer, this will wake up to cascade the timer down.
+    assert_ok!(driver.park_timeout(ms(1000)));
+    assert_eq!(clock.now() - start, ms(192));
+
+    // The sleep has not elapsed.
+    assert_pending!(poll!(e));
+
+    // Turn the timer again
+    assert_ok!(driver.park_timeout(ms(1000)));
+    assert_eq!(clock.now() - start, ms(234));
+
+    // The sleep has elapsed.
+    assert_ready_ok!(poll!(e));
+
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    // Create a `Sleep` that elapses in the future
+    let mut e = task::spawn(sleep_until(&handle, clock.now() + ms(234)));
+
+    // The sleep has not elapsed.
+    assert_pending!(poll!(e));
+
+    // Turn the timer with a smaller timeout than the cascade.
+    assert_ok!(driver.park_timeout(ms(100)));
+    assert_eq!(clock.now() - start, ms(100));
+
+    assert_pending!(poll!(e));
+
+    // Turn the timer, this will wake up to cascade the timer down.
+    assert_ok!(driver.park_timeout(ms(1000)));
+    assert_eq!(clock.now() - start, ms(192));
+
+    // The sleep has not elapsed.
+    assert_pending!(poll!(e));
+
+    // Turn the timer again
+    assert_ok!(driver.park_timeout(ms(1000)));
+    assert_eq!(clock.now() - start, ms(234));
+
+    // The sleep has elapsed.
+    assert_ready_ok!(poll!(e));
+}
+
+#[test]
+fn concurrently_set_two_timers_second_one_shorter() {
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    let mut e1 = task::spawn(sleep_until(&handle, clock.now() + ms(500)));
+    let mut e2 = task::spawn(sleep_until(&handle, clock.now() + ms(200)));
+
+    // The sleep has not elapsed
+    assert_pending!(poll!(e1));
+    assert_pending!(poll!(e2));
+
+    // Sleep until a cascade
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(192));
+
+    // Sleep until the second timer.
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(200));
+
+    // The shorter sleep fires
+    assert_ready_ok!(poll!(e2));
+    assert_pending!(poll!(e1));
+
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(448));
+
+    assert_pending!(poll!(e1));
+
+    // Turn again, this time the time will advance to the second sleep
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(500));
+
+    assert_ready_ok!(poll!(e1));
+}
+
+#[test]
+fn short_sleep() {
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    // Create a `Sleep` that elapses in the future
+    let mut e = task::spawn(sleep_until(&handle, clock.now() + ms(1)));
+
+    // The sleep has not elapsed.
+    assert_pending!(poll!(e));
+
+    // Turn the timer, but not enough time will go by.
+    assert_ok!(driver.park());
+
+    // The sleep has elapsed.
+    assert_ready_ok!(poll!(e));
+
+    // The time has advanced to the point of the sleep elapsing.
+    assert_eq!(clock.now() - start, ms(1));
+}
+
+#[test]
+fn sorta_long_sleep_until() {
+    const MIN_5: u64 = 5 * 60 * 1000;
+
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    // Create a `Sleep` that elapses in the future
+    let mut e = task::spawn(sleep_until(&handle, clock.now() + ms(MIN_5)));
+
+    // The sleep has not elapsed.
+    assert_pending!(poll!(e));
+
+    let cascades = &[262_144, 262_144 + 9 * 4096, 262_144 + 9 * 4096 + 15 * 64];
+
+    for &elapsed in cascades {
+        assert_ok!(driver.park());
+        assert_eq!(clock.now() - start, ms(elapsed));
+
+        assert_pending!(poll!(e));
+    }
+
+    assert_ok!(driver.park());
+    assert_eq!(clock.now() - start, ms(MIN_5));
+
+    // The sleep has elapsed.
+    assert_ready_ok!(poll!(e));
+}
+
+#[test]
+fn very_long_sleep() {
+    const MO_5: u64 = 5 * 30 * 24 * 60 * 60 * 1000;
+
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    // Create a `Sleep` that elapses in the future
+    let mut e = task::spawn(sleep_until(&handle, clock.now() + ms(MO_5)));
+
+    // The sleep has not elapsed.
+    assert_pending!(poll!(e));
+
+    let cascades = &[
+        12_884_901_888,
+        12_952_010_752,
+        12_959_875_072,
+        12_959_997_952,
+    ];
+
+    for &elapsed in cascades {
+        assert_ok!(driver.park());
+        assert_eq!(clock.now() - start, ms(elapsed));
+
+        assert_pending!(poll!(e));
+    }
+
+    // Turn the timer, but not enough time will go by.
+    assert_ok!(driver.park());
+
+    // The time has advanced to the point of the sleep elapsing.
+    assert_eq!(clock.now() - start, ms(MO_5));
+
+    // The sleep has elapsed.
+    assert_ready_ok!(poll!(e));
+}
+
+#[test]
+fn unpark_is_delayed() {
+    // A special park that will take much longer than the requested duration
+    struct MockPark(Clock);
+
+    struct MockUnpark;
+
+    impl Park for MockPark {
+        type Unpark = MockUnpark;
+        type Error = ();
+
+        fn unpark(&self) -> Self::Unpark {
+            MockUnpark
+        }
+
+        fn park(&mut self) -> Result<(), Self::Error> {
+            panic!("parking forever");
+        }
+
+        fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
+            assert_eq!(duration, ms(0));
+            self.0.advance(ms(436));
+            Ok(())
+        }
+
+        fn shutdown(&mut self) {}
+    }
+
+    impl Unpark for MockUnpark {
+        fn unpark(&self) {}
+    }
+
+    let clock = Clock::new();
+    clock.pause();
+    let start = clock.now();
+    let mut driver = Driver::new(MockPark(clock.clone()), clock.clone());
+    let handle = driver.handle();
+
+    let mut e1 = task::spawn(sleep_until(&handle, clock.now() + ms(100)));
+    let mut e2 = task::spawn(sleep_until(&handle, clock.now() + ms(101)));
+    let mut e3 = task::spawn(sleep_until(&handle, clock.now() + ms(200)));
+
+    assert_pending!(poll!(e1));
+    assert_pending!(poll!(e2));
+    assert_pending!(poll!(e3));
+
+    assert_ok!(driver.park());
+
+    assert_eq!(clock.now() - start, ms(500));
+
+    assert_ready_ok!(poll!(e1));
+    assert_ready_ok!(poll!(e2));
+    assert_ready_ok!(poll!(e3));
+}
+
+#[test]
+fn set_timeout_at_deadline_greater_than_max_timer() {
+    const YR_1: u64 = 365 * 24 * 60 * 60 * 1000;
+    const YR_5: u64 = 5 * YR_1;
+
+    let (mut driver, clock, handle) = setup();
+    let start = clock.now();
+
+    for _ in 0..5 {
+        assert_ok!(driver.park_timeout(ms(YR_1)));
+    }
+
+    let mut e = task::spawn(sleep_until(&handle, clock.now() + ms(1)));
+    assert_pending!(poll!(e));
+
+    assert_ok!(driver.park_timeout(ms(1000)));
+    assert_eq!(clock.now() - start, ms(YR_5) + ms(1));
+
+    assert_ready_ok!(poll!(e));
+}
+
+fn setup() -> (Driver<MockPark>, Clock, Handle) {
+    let clock = Clock::new();
+    clock.pause();
+    let driver = Driver::new(MockPark(clock.clone()), clock.clone());
+    let handle = driver.handle();
+
+    (driver, clock, handle)
+}
+
+fn sleep_until(handle: &Handle, when: Instant) -> Arc<Entry> {
+    Entry::new(&handle, when, ms(0))
+}
+
+struct MockPark(Clock);
+
+struct MockUnpark;
+
+impl Park for MockPark {
+    type Unpark = MockUnpark;
+    type Error = ();
+
+    fn unpark(&self) -> Self::Unpark {
+        MockUnpark
+    }
+
+    fn park(&mut self) -> Result<(), Self::Error> {
+        panic!("parking forever");
+    }
+
+    fn park_timeout(&mut self, duration: Duration) -> Result<(), Self::Error> {
+        self.0.advance(duration);
+        Ok(())
+    }
+
+    fn shutdown(&mut self) {}
+}
+
+impl Unpark for MockUnpark {
+    fn unpark(&self) {}
+}
+
+fn ms(n: u64) -> Duration {
+    Duration::from_millis(n)
+}
+*/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/throttle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/throttle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/throttle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/throttle.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-//! Slow down a stream by enforcing a delay between items.
-
-use crate::stream::Stream;
-use crate::time::{Delay, Duration, Instant};
-
-use std::future::Future;
-use std::marker::Unpin;
-use std::pin::Pin;
-use std::task::{self, Poll};
-
-use pin_project_lite::pin_project;
-
-/// Slows down a stream by enforcing a delay between items.
-/// They will be produced not more often than the specified interval.
-///
-/// # Example
-///
-/// Create a throttled stream.
-/// ```rust,no_run
-/// use std::time::Duration;
-/// use tokio::stream::StreamExt;
-/// use tokio::time::throttle;
-///
-/// # async fn dox() {
-/// let mut item_stream = throttle(Duration::from_secs(2), futures::stream::repeat("one"));
-///
-/// loop {
-///     // The string will be produced at most every 2 seconds
-///     println!("{:?}", item_stream.next().await);
-/// }
-/// # }
-/// ```
-pub fn throttle<T>(duration: Duration, stream: T) -> Throttle<T>
-where
-    T: Stream,
-{
-    let delay = if duration == Duration::from_millis(0) {
-        None
-    } else {
-        Some(Delay::new_timeout(Instant::now() + duration, duration))
-    };
-
-    Throttle {
-        delay,
-        duration,
-        has_delayed: true,
-        stream,
-    }
-}
-
-pin_project! {
-    /// Stream for the [`throttle`](throttle) function.
-    #[derive(Debug)]
-    #[must_use = "streams do nothing unless polled"]
-    pub struct Throttle<T> {
-        // `None` when duration is zero.
-        delay: Option<Delay>,
-        duration: Duration,
-
-        // Set to true when `delay` has returned ready, but `stream` hasn't.
-        has_delayed: bool,
-
-        // The stream to throttle
-        #[pin]
-        stream: T,
-    }
-}
-
-// XXX: are these safe if `T: !Unpin`?
-impl<T: Unpin> Throttle<T> {
-    /// Acquires a reference to the underlying stream that this combinator is
-    /// pulling from.
-    pub fn get_ref(&self) -> &T {
-        &self.stream
-    }
-
-    /// Acquires a mutable reference to the underlying stream that this combinator
-    /// is pulling from.
-    ///
-    /// Note that care must be taken to avoid tampering with the state of the stream
-    /// which may otherwise confuse this combinator.
-    pub fn get_mut(&mut self) -> &mut T {
-        &mut self.stream
-    }
-
-    /// Consumes this combinator, returning the underlying stream.
-    ///
-    /// Note that this may discard intermediate state of this combinator, so care
-    /// should be taken to avoid losing resources when this is called.
-    pub fn into_inner(self) -> T {
-        self.stream
-    }
-}
-
-impl<T: Stream> Stream for Throttle<T> {
-    type Item = T::Item;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Option<Self::Item>> {
-        if !self.has_delayed && self.delay.is_some() {
-            ready!(Pin::new(self.as_mut().project().delay.as_mut().unwrap()).poll(cx));
-            *self.as_mut().project().has_delayed = true;
-        }
-
-        let value = ready!(self.as_mut().project().stream.poll_next(cx));
-
-        if value.is_some() {
-            let dur = self.duration;
-            if let Some(ref mut delay) = self.as_mut().project().delay {
-                delay.reset(Instant::now() + dur);
-            }
-
-            *self.as_mut().project().has_delayed = false;
-        }
-
-        Poll::Ready(value)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/timeout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/timeout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/timeout.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/timeout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,10 +4,9 @@
 //!
 //! [`Timeout`]: struct@Timeout
 
-use crate::time::{delay_until, Delay, Duration, Instant};
+use crate::time::{error::Elapsed, sleep_until, Duration, Instant, Sleep};
 
 use pin_project_lite::pin_project;
-use std::fmt;
 use std::future::Future;
 use std::pin::Pin;
 use std::task::{self, Poll};
@@ -50,7 +49,11 @@
 where
     T: Future,
 {
-    let delay = Delay::new_timeout(Instant::now() + duration, duration);
+    let deadline = Instant::now().checked_add(duration);
+    let delay = match deadline {
+        Some(deadline) => Sleep::new_timeout(deadline),
+        None => Sleep::far_future(),
+    };
     Timeout::new_with_delay(future, delay)
 }
 
@@ -92,7 +95,7 @@
 where
     T: Future,
 {
-    let delay = delay_until(deadline);
+    let delay = sleep_until(deadline);
 
     Timeout {
         value: future,
@@ -108,24 +111,12 @@
         #[pin]
         value: T,
         #[pin]
-        delay: Delay,
-    }
-}
-
-/// Error returned by `Timeout`.
-#[derive(Debug, PartialEq)]
-pub struct Elapsed(());
-
-impl Elapsed {
-    // Used on StreamExt::timeout
-    #[allow(unused)]
-    pub(crate) fn new() -> Self {
-        Elapsed(())
+        delay: Sleep,
     }
 }
 
 impl<T> Timeout<T> {
-    pub(crate) fn new_with_delay(value: T, delay: Delay) -> Timeout<T> {
+    pub(crate) fn new_with_delay(value: T, delay: Sleep) -> Timeout<T> {
         Timeout { value, delay }
     }
 
@@ -161,24 +152,8 @@
 
         // Now check the timer
         match me.delay.poll(cx) {
-            Poll::Ready(()) => Poll::Ready(Err(Elapsed(()))),
+            Poll::Ready(()) => Poll::Ready(Err(Elapsed::new())),
             Poll::Pending => Poll::Pending,
         }
     }
 }
-
-// ===== impl Elapsed =====
-
-impl fmt::Display for Elapsed {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        "deadline has elapsed".fmt(fmt)
-    }
-}
-
-impl std::error::Error for Elapsed {}
-
-impl From<Elapsed> for std::io::Error {
-    fn from(_err: Elapsed) -> std::io::Error {
-        std::io::ErrorKind::TimedOut.into()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/wheel/level.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/wheel/level.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/wheel/level.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/wheel/level.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,255 +0,0 @@
-use crate::time::wheel::Stack;
-
-use std::fmt;
-
-/// Wheel for a single level in the timer. This wheel contains 64 slots.
-pub(crate) struct Level<T> {
-    level: usize,
-
-    /// Bit field tracking which slots currently contain entries.
-    ///
-    /// Using a bit field to track slots that contain entries allows avoiding a
-    /// scan to find entries. This field is updated when entries are added or
-    /// removed from a slot.
-    ///
-    /// The least-significant bit represents slot zero.
-    occupied: u64,
-
-    /// Slots
-    slot: [T; LEVEL_MULT],
-}
-
-/// Indicates when a slot must be processed next.
-#[derive(Debug)]
-pub(crate) struct Expiration {
-    /// The level containing the slot.
-    pub(crate) level: usize,
-
-    /// The slot index.
-    pub(crate) slot: usize,
-
-    /// The instant at which the slot needs to be processed.
-    pub(crate) deadline: u64,
-}
-
-/// Level multiplier.
-///
-/// Being a power of 2 is very important.
-const LEVEL_MULT: usize = 64;
-
-impl<T: Stack> Level<T> {
-    pub(crate) fn new(level: usize) -> Level<T> {
-        // Rust's derived implementations for arrays require that the value
-        // contained by the array be `Copy`. So, here we have to manually
-        // initialize every single slot.
-        macro_rules! s {
-            () => {
-                T::default()
-            };
-        };
-
-        Level {
-            level,
-            occupied: 0,
-            slot: [
-                // It does not look like the necessary traits are
-                // derived for [T; 64].
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-                s!(),
-            ],
-        }
-    }
-
-    /// Finds the slot that needs to be processed next and returns the slot and
-    /// `Instant` at which this slot must be processed.
-    pub(crate) fn next_expiration(&self, now: u64) -> Option<Expiration> {
-        // Use the `occupied` bit field to get the index of the next slot that
-        // needs to be processed.
-        let slot = match self.next_occupied_slot(now) {
-            Some(slot) => slot,
-            None => return None,
-        };
-
-        // From the slot index, calculate the `Instant` at which it needs to be
-        // processed. This value *must* be in the future with respect to `now`.
-
-        let level_range = level_range(self.level);
-        let slot_range = slot_range(self.level);
-
-        // TODO: This can probably be simplified w/ power of 2 math
-        let level_start = now - (now % level_range);
-        let deadline = level_start + slot as u64 * slot_range;
-
-        debug_assert!(
-            deadline >= now,
-            "deadline={}; now={}; level={}; slot={}; occupied={:b}",
-            deadline,
-            now,
-            self.level,
-            slot,
-            self.occupied
-        );
-
-        Some(Expiration {
-            level: self.level,
-            slot,
-            deadline,
-        })
-    }
-
-    fn next_occupied_slot(&self, now: u64) -> Option<usize> {
-        if self.occupied == 0 {
-            return None;
-        }
-
-        // Get the slot for now using Maths
-        let now_slot = (now / slot_range(self.level)) as usize;
-        let occupied = self.occupied.rotate_right(now_slot as u32);
-        let zeros = occupied.trailing_zeros() as usize;
-        let slot = (zeros + now_slot) % 64;
-
-        Some(slot)
-    }
-
-    pub(crate) fn add_entry(&mut self, when: u64, item: T::Owned, store: &mut T::Store) {
-        let slot = slot_for(when, self.level);
-
-        self.slot[slot].push(item, store);
-        self.occupied |= occupied_bit(slot);
-    }
-
-    pub(crate) fn remove_entry(&mut self, when: u64, item: &T::Borrowed, store: &mut T::Store) {
-        let slot = slot_for(when, self.level);
-
-        self.slot[slot].remove(item, store);
-
-        if self.slot[slot].is_empty() {
-            // The bit is currently set
-            debug_assert!(self.occupied & occupied_bit(slot) != 0);
-
-            // Unset the bit
-            self.occupied ^= occupied_bit(slot);
-        }
-    }
-
-    pub(crate) fn pop_entry_slot(&mut self, slot: usize, store: &mut T::Store) -> Option<T::Owned> {
-        let ret = self.slot[slot].pop(store);
-
-        if ret.is_some() && self.slot[slot].is_empty() {
-            // The bit is currently set
-            debug_assert!(self.occupied & occupied_bit(slot) != 0);
-
-            self.occupied ^= occupied_bit(slot);
-        }
-
-        ret
-    }
-}
-
-impl<T> fmt::Debug for Level<T> {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.debug_struct("Level")
-            .field("occupied", &self.occupied)
-            .finish()
-    }
-}
-
-fn occupied_bit(slot: usize) -> u64 {
-    1 << slot
-}
-
-fn slot_range(level: usize) -> u64 {
-    LEVEL_MULT.pow(level as u32) as u64
-}
-
-fn level_range(level: usize) -> u64 {
-    LEVEL_MULT as u64 * slot_range(level)
-}
-
-/// Convert a duration (milliseconds) and a level to a slot position
-fn slot_for(duration: u64, level: usize) -> usize {
-    ((duration >> (level * 6)) % LEVEL_MULT as u64) as usize
-}
-
-/*
-#[cfg(all(test, not(loom)))]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_slot_for() {
-        for pos in 1..64 {
-            assert_eq!(pos as usize, slot_for(pos, 0));
-        }
-
-        for level in 1..5 {
-            for pos in level..64 {
-                let a = pos * 64_usize.pow(level as u32);
-                assert_eq!(pos as usize, slot_for(a as u64, level));
-            }
-        }
-    }
-}
-*/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/wheel/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/wheel/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/wheel/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/wheel/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,314 +0,0 @@
-mod level;
-pub(crate) use self::level::Expiration;
-use self::level::Level;
-
-mod stack;
-pub(crate) use self::stack::Stack;
-
-use std::borrow::Borrow;
-use std::usize;
-
-/// Timing wheel implementation.
-///
-/// This type provides the hashed timing wheel implementation that backs `Timer`
-/// and `DelayQueue`.
-///
-/// The structure is generic over `T: Stack`. This allows handling timeout data
-/// being stored on the heap or in a slab. In order to support the latter case,
-/// the slab must be passed into each function allowing the implementation to
-/// lookup timer entries.
-///
-/// See `Timer` documentation for some implementation notes.
-#[derive(Debug)]
-pub(crate) struct Wheel<T> {
-    /// The number of milliseconds elapsed since the wheel started.
-    elapsed: u64,
-
-    /// Timer wheel.
-    ///
-    /// Levels:
-    ///
-    /// * 1 ms slots / 64 ms range
-    /// * 64 ms slots / ~ 4 sec range
-    /// * ~ 4 sec slots / ~ 4 min range
-    /// * ~ 4 min slots / ~ 4 hr range
-    /// * ~ 4 hr slots / ~ 12 day range
-    /// * ~ 12 day slots / ~ 2 yr range
-    levels: Vec<Level<T>>,
-}
-
-/// Number of levels. Each level has 64 slots. By using 6 levels with 64 slots
-/// each, the timer is able to track time up to 2 years into the future with a
-/// precision of 1 millisecond.
-const NUM_LEVELS: usize = 6;
-
-/// The maximum duration of a delay
-const MAX_DURATION: u64 = (1 << (6 * NUM_LEVELS)) - 1;
-
-#[derive(Debug)]
-pub(crate) enum InsertError {
-    Elapsed,
-    Invalid,
-}
-
-/// Poll expirations from the wheel
-#[derive(Debug, Default)]
-pub(crate) struct Poll {
-    now: u64,
-    expiration: Option<Expiration>,
-}
-
-impl<T> Wheel<T>
-where
-    T: Stack,
-{
-    /// Create a new timing wheel
-    pub(crate) fn new() -> Wheel<T> {
-        let levels = (0..NUM_LEVELS).map(Level::new).collect();
-
-        Wheel { elapsed: 0, levels }
-    }
-
-    /// Return the number of milliseconds that have elapsed since the timing
-    /// wheel's creation.
-    pub(crate) fn elapsed(&self) -> u64 {
-        self.elapsed
-    }
-
-    /// Insert an entry into the timing wheel.
-    ///
-    /// # Arguments
-    ///
-    /// * `when`: is the instant at which the entry should be fired. It is
-    ///           represented as the number of milliseconds since the creation
-    ///           of the timing wheel.
-    ///
-    /// * `item`: The item to insert into the wheel.
-    ///
-    /// * `store`: The slab or `()` when using heap storage.
-    ///
-    /// # Return
-    ///
-    /// Returns `Ok` when the item is successfully inserted, `Err` otherwise.
-    ///
-    /// `Err(Elapsed)` indicates that `when` represents an instant that has
-    /// already passed. In this case, the caller should fire the timeout
-    /// immediately.
-    ///
-    /// `Err(Invalid)` indicates an invalid `when` argument as been supplied.
-    pub(crate) fn insert(
-        &mut self,
-        when: u64,
-        item: T::Owned,
-        store: &mut T::Store,
-    ) -> Result<(), (T::Owned, InsertError)> {
-        if when <= self.elapsed {
-            return Err((item, InsertError::Elapsed));
-        } else if when - self.elapsed > MAX_DURATION {
-            return Err((item, InsertError::Invalid));
-        }
-
-        // Get the level at which the entry should be stored
-        let level = self.level_for(when);
-
-        self.levels[level].add_entry(when, item, store);
-
-        debug_assert!({
-            self.levels[level]
-                .next_expiration(self.elapsed)
-                .map(|e| e.deadline >= self.elapsed)
-                .unwrap_or(true)
-        });
-
-        Ok(())
-    }
-
-    /// Remove `item` from thee timing wheel.
-    pub(crate) fn remove(&mut self, item: &T::Borrowed, store: &mut T::Store) {
-        let when = T::when(item, store);
-        let level = self.level_for(when);
-
-        self.levels[level].remove_entry(when, item, store);
-    }
-
-    /// Instant at which to poll
-    pub(crate) fn poll_at(&self) -> Option<u64> {
-        self.next_expiration().map(|expiration| expiration.deadline)
-    }
-
-    pub(crate) fn poll(&mut self, poll: &mut Poll, store: &mut T::Store) -> Option<T::Owned> {
-        loop {
-            if poll.expiration.is_none() {
-                poll.expiration = self.next_expiration().and_then(|expiration| {
-                    if expiration.deadline > poll.now {
-                        None
-                    } else {
-                        Some(expiration)
-                    }
-                });
-            }
-
-            match poll.expiration {
-                Some(ref expiration) => {
-                    if let Some(item) = self.poll_expiration(expiration, store) {
-                        return Some(item);
-                    }
-
-                    self.set_elapsed(expiration.deadline);
-                }
-                None => {
-                    self.set_elapsed(poll.now);
-                    return None;
-                }
-            }
-
-            poll.expiration = None;
-        }
-    }
-
-    /// Returns the instant at which the next timeout expires.
-    fn next_expiration(&self) -> Option<Expiration> {
-        // Check all levels
-        for level in 0..NUM_LEVELS {
-            if let Some(expiration) = self.levels[level].next_expiration(self.elapsed) {
-                // There cannot be any expirations at a higher level that happen
-                // before this one.
-                debug_assert!(self.no_expirations_before(level + 1, expiration.deadline));
-
-                return Some(expiration);
-            }
-        }
-
-        None
-    }
-
-    /// Used for debug assertions
-    fn no_expirations_before(&self, start_level: usize, before: u64) -> bool {
-        let mut res = true;
-
-        for l2 in start_level..NUM_LEVELS {
-            if let Some(e2) = self.levels[l2].next_expiration(self.elapsed) {
-                if e2.deadline < before {
-                    res = false;
-                }
-            }
-        }
-
-        res
-    }
-
-    pub(crate) fn poll_expiration(
-        &mut self,
-        expiration: &Expiration,
-        store: &mut T::Store,
-    ) -> Option<T::Owned> {
-        while let Some(item) = self.pop_entry(expiration, store) {
-            if expiration.level == 0 {
-                debug_assert_eq!(T::when(item.borrow(), store), expiration.deadline);
-
-                return Some(item);
-            } else {
-                let when = T::when(item.borrow(), store);
-
-                let next_level = expiration.level - 1;
-
-                self.levels[next_level].add_entry(when, item, store);
-            }
-        }
-
-        None
-    }
-
-    fn set_elapsed(&mut self, when: u64) {
-        assert!(
-            self.elapsed <= when,
-            "elapsed={:?}; when={:?}",
-            self.elapsed,
-            when
-        );
-
-        if when > self.elapsed {
-            self.elapsed = when;
-        }
-    }
-
-    fn pop_entry(&mut self, expiration: &Expiration, store: &mut T::Store) -> Option<T::Owned> {
-        self.levels[expiration.level].pop_entry_slot(expiration.slot, store)
-    }
-
-    fn level_for(&self, when: u64) -> usize {
-        level_for(self.elapsed, when)
-    }
-}
-
-fn level_for(elapsed: u64, when: u64) -> usize {
-    let masked = elapsed ^ when;
-
-    assert!(masked != 0, "elapsed={}; when={}", elapsed, when);
-
-    let leading_zeros = masked.leading_zeros() as usize;
-    let significant = 63 - leading_zeros;
-    significant / 6
-}
-
-impl Poll {
-    pub(crate) fn new(now: u64) -> Poll {
-        Poll {
-            now,
-            expiration: None,
-        }
-    }
-}
-
-#[cfg(all(test, not(loom)))]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_level_for() {
-        for pos in 1..64 {
-            assert_eq!(
-                0,
-                level_for(0, pos),
-                "level_for({}) -- binary = {:b}",
-                pos,
-                pos
-            );
-        }
-
-        for level in 1..5 {
-            for pos in level..64 {
-                let a = pos * 64_usize.pow(level as u32);
-                assert_eq!(
-                    level,
-                    level_for(0, a as u64),
-                    "level_for({}) -- binary = {:b}",
-                    a,
-                    a
-                );
-
-                if pos > level {
-                    let a = a - 1;
-                    assert_eq!(
-                        level,
-                        level_for(0, a as u64),
-                        "level_for({}) -- binary = {:b}",
-                        a,
-                        a
-                    );
-                }
-
-                if pos < 64 {
-                    let a = a + 1;
-                    assert_eq!(
-                        level,
-                        level_for(0, a as u64),
-                        "level_for({}) -- binary = {:b}",
-                        a,
-                        a
-                    );
-                }
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/wheel/stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/wheel/stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/time/wheel/stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/time/wheel/stack.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-use std::borrow::Borrow;
-
-/// Abstracts the stack operations needed to track timeouts.
-pub(crate) trait Stack: Default {
-    /// Type of the item stored in the stack
-    type Owned: Borrow<Self::Borrowed>;
-
-    /// Borrowed item
-    type Borrowed;
-
-    /// Item storage, this allows a slab to be used instead of just the heap
-    type Store;
-
-    /// Returns `true` if the stack is empty
-    fn is_empty(&self) -> bool;
-
-    /// Push an item onto the stack
-    fn push(&mut self, item: Self::Owned, store: &mut Self::Store);
-
-    /// Pop an item from the stack
-    fn pop(&mut self, store: &mut Self::Store) -> Option<Self::Owned>;
-
-    fn remove(&mut self, item: &Self::Borrowed, store: &mut Self::Store);
-
-    fn when(item: &Self::Borrowed, store: &Self::Store) -> u64;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/bit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/bit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/bit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/bit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,12 @@
 use std::fmt;
 
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, PartialEq)]
 pub(crate) struct Pack {
     mask: usize,
     shift: u32,
 }
 
 impl Pack {
-    /// Value is packed in the `width` most-significant bits.
-    pub(crate) const fn most_significant(width: u32) -> Pack {
-        let mask = mask_for(width).reverse_bits();
-
-        Pack {
-            mask,
-            shift: mask.trailing_zeros(),
-        }
-    }
-
     /// Value is packed in the `width` least-significant bits.
     pub(crate) const fn least_significant(width: u32) -> Pack {
         let mask = mask_for(width);
@@ -32,12 +22,6 @@
         Pack { mask, shift }
     }
 
-    /// Mask used to unpack value
-    #[cfg(all(test, loom))]
-    pub(crate) const fn mask(&self) -> usize {
-        self.mask
-    }
-
     /// Width, in bits, dedicated to storing the value.
     pub(crate) const fn width(&self) -> u32 {
         pointer_width() - (self.mask >> self.shift).leading_zeros()
@@ -53,6 +37,14 @@
         (base & !self.mask) | (value << self.shift)
     }
 
+    /// Packs the value with `base`, losing any bits of `value` that fit.
+    ///
+    /// If `value` is larger than the max value that can be represented by the
+    /// allotted width, the most significant bits are truncated.
+    pub(crate) fn pack_lossy(&self, value: usize, base: usize) -> usize {
+        self.pack(value & self.max_value(), base)
+    }
+
     pub(crate) fn unpack(&self, src: usize) -> usize {
         unpack(src, self.mask, self.shift)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+/// Error string explaining that the Tokio context hasn't been instantiated.
+pub(crate) const CONTEXT_MISSING_ERROR: &str =
+    "there is no reactor running, must be called from the context of a Tokio 1.x runtime";
+
+// some combinations of features might not use this
+#[allow(dead_code)]
+/// Error string explaining that the Tokio context is shutting down and cannot drive timers.
+pub(crate) const RUNTIME_SHUTTING_DOWN_ERROR: &str =
+    "A Tokio 1.x context was found, but it is being shutdown.";
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/intrusive_double_linked_list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/intrusive_double_linked_list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/intrusive_double_linked_list.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/intrusive_double_linked_list.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,788 +0,0 @@
-//! An intrusive double linked list of data
-
-#![allow(dead_code, unreachable_pub)]
-
-use core::{
-    marker::PhantomPinned,
-    ops::{Deref, DerefMut},
-    ptr::NonNull,
-};
-
-/// A node which carries data of type `T` and is stored in an intrusive list
-#[derive(Debug)]
-pub struct ListNode<T> {
-    /// The previous node in the list. `None` if there is no previous node.
-    prev: Option<NonNull<ListNode<T>>>,
-    /// The next node in the list. `None` if there is no previous node.
-    next: Option<NonNull<ListNode<T>>>,
-    /// The data which is associated to this list item
-    data: T,
-    /// Prevents `ListNode`s from being `Unpin`. They may never be moved, since
-    /// the list semantics require addresses to be stable.
-    _pin: PhantomPinned,
-}
-
-impl<T> ListNode<T> {
-    /// Creates a new node with the associated data
-    pub fn new(data: T) -> ListNode<T> {
-        Self {
-            prev: None,
-            next: None,
-            data,
-            _pin: PhantomPinned,
-        }
-    }
-}
-
-impl<T> Deref for ListNode<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        &self.data
-    }
-}
-
-impl<T> DerefMut for ListNode<T> {
-    fn deref_mut(&mut self) -> &mut T {
-        &mut self.data
-    }
-}
-
-/// An intrusive linked list of nodes, where each node carries associated data
-/// of type `T`.
-#[derive(Debug)]
-pub struct LinkedList<T> {
-    head: Option<NonNull<ListNode<T>>>,
-    tail: Option<NonNull<ListNode<T>>>,
-}
-
-impl<T> LinkedList<T> {
-    /// Creates an empty linked list
-    pub fn new() -> Self {
-        LinkedList::<T> {
-            head: None,
-            tail: None,
-        }
-    }
-
-    /// Adds a node at the front of the linked list.
-    /// Safety: This function is only safe as long as `node` is guaranteed to
-    /// get removed from the list before it gets moved or dropped.
-    /// In addition to this `node` may not be added to another other list before
-    /// it is removed from the current one.
-    pub unsafe fn add_front(&mut self, node: &mut ListNode<T>) {
-        node.next = self.head;
-        node.prev = None;
-        if let Some(mut head) = self.head {
-            head.as_mut().prev = Some(node.into())
-        };
-        self.head = Some(node.into());
-        if self.tail.is_none() {
-            self.tail = Some(node.into());
-        }
-    }
-
-    /// Inserts a node into the list in a way that the list keeps being sorted.
-    /// Safety: This function is only safe as long as `node` is guaranteed to
-    /// get removed from the list before it gets moved or dropped.
-    /// In addition to this `node` may not be added to another other list before
-    /// it is removed from the current one.
-    pub unsafe fn add_sorted(&mut self, node: &mut ListNode<T>)
-    where
-        T: PartialOrd,
-    {
-        if self.head.is_none() {
-            // First node in the list
-            self.head = Some(node.into());
-            self.tail = Some(node.into());
-            return;
-        }
-
-        let mut prev: Option<NonNull<ListNode<T>>> = None;
-        let mut current = self.head;
-
-        while let Some(mut current_node) = current {
-            if node.data < current_node.as_ref().data {
-                // Need to insert before the current node
-                current_node.as_mut().prev = Some(node.into());
-                match prev {
-                    Some(mut prev) => {
-                        prev.as_mut().next = Some(node.into());
-                    }
-                    None => {
-                        // We are inserting at the beginning of the list
-                        self.head = Some(node.into());
-                    }
-                }
-                node.next = current;
-                node.prev = prev;
-                return;
-            }
-            prev = current;
-            current = current_node.as_ref().next;
-        }
-
-        // We looped through the whole list and the nodes data is bigger or equal
-        // than everything we found up to now.
-        // Insert at the end. Since we checked before that the list isn't empty,
-        // tail always has a value.
-        node.prev = self.tail;
-        node.next = None;
-        self.tail.as_mut().unwrap().as_mut().next = Some(node.into());
-        self.tail = Some(node.into());
-    }
-
-    /// Returns the first node in the linked list without removing it from the list
-    /// The function is only safe as long as valid pointers are stored inside
-    /// the linked list.
-    /// The returned pointer is only guaranteed to be valid as long as the list
-    /// is not mutated
-    pub fn peek_first(&self) -> Option<&mut ListNode<T>> {
-        // Safety: When the node was inserted it was promised that it is alive
-        // until it gets removed from the list.
-        // The returned node has a pointer which constrains it to the lifetime
-        // of the list. This is ok, since the Node is supposed to outlive
-        // its insertion in the list.
-        unsafe {
-            self.head
-                .map(|mut node| &mut *(node.as_mut() as *mut ListNode<T>))
-        }
-    }
-
-    /// Returns the last node in the linked list without removing it from the list
-    /// The function is only safe as long as valid pointers are stored inside
-    /// the linked list.
-    /// The returned pointer is only guaranteed to be valid as long as the list
-    /// is not mutated
-    pub fn peek_last(&self) -> Option<&mut ListNode<T>> {
-        // Safety: When the node was inserted it was promised that it is alive
-        // until it gets removed from the list.
-        // The returned node has a pointer which constrains it to the lifetime
-        // of the list. This is ok, since the Node is supposed to outlive
-        // its insertion in the list.
-        unsafe {
-            self.tail
-                .map(|mut node| &mut *(node.as_mut() as *mut ListNode<T>))
-        }
-    }
-
-    /// Removes the first node from the linked list
-    pub fn remove_first(&mut self) -> Option<&mut ListNode<T>> {
-        #![allow(clippy::debug_assert_with_mut_call)]
-
-        // Safety: When the node was inserted it was promised that it is alive
-        // until it gets removed from the list
-        unsafe {
-            let mut head = self.head?;
-            self.head = head.as_mut().next;
-
-            let first_ref = head.as_mut();
-            match first_ref.next {
-                None => {
-                    // This was the only node in the list
-                    debug_assert_eq!(Some(first_ref.into()), self.tail);
-                    self.tail = None;
-                }
-                Some(mut next) => {
-                    next.as_mut().prev = None;
-                }
-            }
-
-            first_ref.prev = None;
-            first_ref.next = None;
-            Some(&mut *(first_ref as *mut ListNode<T>))
-        }
-    }
-
-    /// Removes the last node from the linked list and returns it
-    pub fn remove_last(&mut self) -> Option<&mut ListNode<T>> {
-        #![allow(clippy::debug_assert_with_mut_call)]
-
-        // Safety: When the node was inserted it was promised that it is alive
-        // until it gets removed from the list
-        unsafe {
-            let mut tail = self.tail?;
-            self.tail = tail.as_mut().prev;
-
-            let last_ref = tail.as_mut();
-            match last_ref.prev {
-                None => {
-                    // This was the last node in the list
-                    debug_assert_eq!(Some(last_ref.into()), self.head);
-                    self.head = None;
-                }
-                Some(mut prev) => {
-                    prev.as_mut().next = None;
-                }
-            }
-
-            last_ref.prev = None;
-            last_ref.next = None;
-            Some(&mut *(last_ref as *mut ListNode<T>))
-        }
-    }
-
-    /// Returns whether the linked list doesn not contain any node
-    pub fn is_empty(&self) -> bool {
-        if self.head.is_some() {
-            return false;
-        }
-
-        debug_assert!(self.tail.is_none());
-        true
-    }
-
-    /// Removes the given `node` from the linked list.
-    /// Returns whether the `node` was removed.
-    /// It is also only safe if it is known that the `node` is either part of this
-    /// list, or of no list at all. If `node` is part of another list, the
-    /// behavior is undefined.
-    pub unsafe fn remove(&mut self, node: &mut ListNode<T>) -> bool {
-        #![allow(clippy::debug_assert_with_mut_call)]
-
-        match node.prev {
-            None => {
-                // This might be the first node in the list. If it is not, the
-                // node is not in the list at all. Since our precondition is that
-                // the node must either be in this list or in no list, we check that
-                // the node is really in no list.
-                if self.head != Some(node.into()) {
-                    debug_assert!(node.next.is_none());
-                    return false;
-                }
-                self.head = node.next;
-            }
-            Some(mut prev) => {
-                debug_assert_eq!(prev.as_ref().next, Some(node.into()));
-                prev.as_mut().next = node.next;
-            }
-        }
-
-        match node.next {
-            None => {
-                // This must be the last node in our list. Otherwise the list
-                // is inconsistent.
-                debug_assert_eq!(self.tail, Some(node.into()));
-                self.tail = node.prev;
-            }
-            Some(mut next) => {
-                debug_assert_eq!(next.as_mut().prev, Some(node.into()));
-                next.as_mut().prev = node.prev;
-            }
-        }
-
-        node.next = None;
-        node.prev = None;
-
-        true
-    }
-
-    /// Drains the list iby calling a callback on each list node
-    ///
-    /// The method does not return an iterator since stopping or deferring
-    /// draining the list is not permitted. If the method would push nodes to
-    /// an iterator we could not guarantee that the nodes do not get utilized
-    /// after having been removed from the list anymore.
-    pub fn drain<F>(&mut self, mut func: F)
-    where
-        F: FnMut(&mut ListNode<T>),
-    {
-        let mut current = self.head;
-        self.head = None;
-        self.tail = None;
-
-        while let Some(mut node) = current {
-            // Safety: The nodes have not been removed from the list yet and must
-            // therefore contain valid data. The nodes can also not be added to
-            // the list again during iteration, since the list is mutably borrowed.
-            unsafe {
-                let node_ref = node.as_mut();
-                current = node_ref.next;
-
-                node_ref.next = None;
-                node_ref.prev = None;
-
-                // Note: We do not reset the pointers from the next element in the
-                // list to the current one since we will iterate over the whole
-                // list anyway, and therefore clean up all pointers.
-
-                func(node_ref);
-            }
-        }
-    }
-
-    /// Drains the list in reverse order by calling a callback on each list node
-    ///
-    /// The method does not return an iterator since stopping or deferring
-    /// draining the list is not permitted. If the method would push nodes to
-    /// an iterator we could not guarantee that the nodes do not get utilized
-    /// after having been removed from the list anymore.
-    pub fn reverse_drain<F>(&mut self, mut func: F)
-    where
-        F: FnMut(&mut ListNode<T>),
-    {
-        let mut current = self.tail;
-        self.head = None;
-        self.tail = None;
-
-        while let Some(mut node) = current {
-            // Safety: The nodes have not been removed from the list yet and must
-            // therefore contain valid data. The nodes can also not be added to
-            // the list again during iteration, since the list is mutably borrowed.
-            unsafe {
-                let node_ref = node.as_mut();
-                current = node_ref.prev;
-
-                node_ref.next = None;
-                node_ref.prev = None;
-
-                // Note: We do not reset the pointers from the next element in the
-                // list to the current one since we will iterate over the whole
-                // list anyway, and therefore clean up all pointers.
-
-                func(node_ref);
-            }
-        }
-    }
-}
-
-#[cfg(all(test, feature = "std"))] // Tests make use of Vec at the moment
-mod tests {
-    use super::*;
-
-    fn collect_list<T: Copy>(mut list: LinkedList<T>) -> Vec<T> {
-        let mut result = Vec::new();
-        list.drain(|node| {
-            result.push(**node);
-        });
-        result
-    }
-
-    fn collect_reverse_list<T: Copy>(mut list: LinkedList<T>) -> Vec<T> {
-        let mut result = Vec::new();
-        list.reverse_drain(|node| {
-            result.push(**node);
-        });
-        result
-    }
-
-    unsafe fn add_nodes(list: &mut LinkedList<i32>, nodes: &mut [&mut ListNode<i32>]) {
-        for node in nodes.iter_mut() {
-            list.add_front(node);
-        }
-    }
-
-    unsafe fn assert_clean<T>(node: &mut ListNode<T>) {
-        assert!(node.next.is_none());
-        assert!(node.prev.is_none());
-    }
-
-    #[test]
-    fn insert_and_iterate() {
-        unsafe {
-            let mut a = ListNode::new(5);
-            let mut b = ListNode::new(7);
-            let mut c = ListNode::new(31);
-
-            let mut setup = |list: &mut LinkedList<i32>| {
-                assert_eq!(true, list.is_empty());
-                list.add_front(&mut c);
-                assert_eq!(31, **list.peek_first().unwrap());
-                assert_eq!(false, list.is_empty());
-                list.add_front(&mut b);
-                assert_eq!(7, **list.peek_first().unwrap());
-                list.add_front(&mut a);
-                assert_eq!(5, **list.peek_first().unwrap());
-            };
-
-            let mut list = LinkedList::new();
-            setup(&mut list);
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([5, 7, 31].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            setup(&mut list);
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([31, 7, 5].to_vec(), items);
-        }
-    }
-
-    #[test]
-    fn add_sorted() {
-        unsafe {
-            let mut a = ListNode::new(5);
-            let mut b = ListNode::new(7);
-            let mut c = ListNode::new(31);
-            let mut d = ListNode::new(99);
-
-            let mut list = LinkedList::new();
-            list.add_sorted(&mut a);
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([5].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            list.add_sorted(&mut a);
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([5].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut d, &mut c, &mut b]);
-            list.add_sorted(&mut a);
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([5, 7, 31, 99].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut d, &mut c, &mut b]);
-            list.add_sorted(&mut a);
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([99, 31, 7, 5].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut d, &mut c, &mut a]);
-            list.add_sorted(&mut b);
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([5, 7, 31, 99].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut d, &mut c, &mut a]);
-            list.add_sorted(&mut b);
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([99, 31, 7, 5].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut d, &mut b, &mut a]);
-            list.add_sorted(&mut c);
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([5, 7, 31, 99].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut d, &mut b, &mut a]);
-            list.add_sorted(&mut c);
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([99, 31, 7, 5].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-            list.add_sorted(&mut d);
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([5, 7, 31, 99].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-            list.add_sorted(&mut d);
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([99, 31, 7, 5].to_vec(), items);
-        }
-    }
-
-    #[test]
-    fn drain_and_collect() {
-        unsafe {
-            let mut a = ListNode::new(5);
-            let mut b = ListNode::new(7);
-            let mut c = ListNode::new(31);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-
-            let taken_items: Vec<i32> = collect_list(list);
-            assert_eq!([5, 7, 31].to_vec(), taken_items);
-        }
-    }
-
-    #[test]
-    fn peek_last() {
-        unsafe {
-            let mut a = ListNode::new(5);
-            let mut b = ListNode::new(7);
-            let mut c = ListNode::new(31);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-
-            let last = list.peek_last();
-            assert_eq!(31, **last.unwrap());
-            list.remove_last();
-
-            let last = list.peek_last();
-            assert_eq!(7, **last.unwrap());
-            list.remove_last();
-
-            let last = list.peek_last();
-            assert_eq!(5, **last.unwrap());
-            list.remove_last();
-
-            let last = list.peek_last();
-            assert!(last.is_none());
-        }
-    }
-
-    #[test]
-    fn remove_first() {
-        unsafe {
-            // We iterate forward and backwards through the manipulated lists
-            // to make sure pointers in both directions are still ok.
-            let mut a = ListNode::new(5);
-            let mut b = ListNode::new(7);
-            let mut c = ListNode::new(31);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-            let removed = list.remove_first().unwrap();
-            assert_clean(removed);
-            assert!(!list.is_empty());
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([7, 31].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-            let removed = list.remove_first().unwrap();
-            assert_clean(removed);
-            assert!(!list.is_empty());
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([31, 7].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut b, &mut a]);
-            let removed = list.remove_first().unwrap();
-            assert_clean(removed);
-            assert!(!list.is_empty());
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([7].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut b, &mut a]);
-            let removed = list.remove_first().unwrap();
-            assert_clean(removed);
-            assert!(!list.is_empty());
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([7].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut a]);
-            let removed = list.remove_first().unwrap();
-            assert_clean(removed);
-            assert!(list.is_empty());
-            let items: Vec<i32> = collect_list(list);
-            assert!(items.is_empty());
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut a]);
-            let removed = list.remove_first().unwrap();
-            assert_clean(removed);
-            assert!(list.is_empty());
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert!(items.is_empty());
-        }
-    }
-
-    #[test]
-    fn remove_last() {
-        unsafe {
-            // We iterate forward and backwards through the manipulated lists
-            // to make sure pointers in both directions are still ok.
-            let mut a = ListNode::new(5);
-            let mut b = ListNode::new(7);
-            let mut c = ListNode::new(31);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-            let removed = list.remove_last().unwrap();
-            assert_clean(removed);
-            assert!(!list.is_empty());
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([5, 7].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-            let removed = list.remove_last().unwrap();
-            assert_clean(removed);
-            assert!(!list.is_empty());
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([7, 5].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut b, &mut a]);
-            let removed = list.remove_last().unwrap();
-            assert_clean(removed);
-            assert!(!list.is_empty());
-            let items: Vec<i32> = collect_list(list);
-            assert_eq!([5].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut b, &mut a]);
-            let removed = list.remove_last().unwrap();
-            assert_clean(removed);
-            assert!(!list.is_empty());
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert_eq!([5].to_vec(), items);
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut a]);
-            let removed = list.remove_last().unwrap();
-            assert_clean(removed);
-            assert!(list.is_empty());
-            let items: Vec<i32> = collect_list(list);
-            assert!(items.is_empty());
-
-            let mut list = LinkedList::new();
-            add_nodes(&mut list, &mut [&mut a]);
-            let removed = list.remove_last().unwrap();
-            assert_clean(removed);
-            assert!(list.is_empty());
-            let items: Vec<i32> = collect_reverse_list(list);
-            assert!(items.is_empty());
-        }
-    }
-
-    #[test]
-    fn remove_by_address() {
-        unsafe {
-            let mut a = ListNode::new(5);
-            let mut b = ListNode::new(7);
-            let mut c = ListNode::new(31);
-
-            {
-                // Remove first
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut a));
-                assert_clean((&mut a).into());
-                // a should be no longer there and can't be removed twice
-                assert_eq!(false, list.remove(&mut a));
-                assert_eq!(Some((&mut b).into()), list.head);
-                assert_eq!(Some((&mut c).into()), b.next);
-                assert_eq!(Some((&mut b).into()), c.prev);
-                let items: Vec<i32> = collect_list(list);
-                assert_eq!([7, 31].to_vec(), items);
-
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut a));
-                assert_clean((&mut a).into());
-                // a should be no longer there and can't be removed twice
-                assert_eq!(false, list.remove(&mut a));
-                assert_eq!(Some((&mut c).into()), b.next);
-                assert_eq!(Some((&mut b).into()), c.prev);
-                let items: Vec<i32> = collect_reverse_list(list);
-                assert_eq!([31, 7].to_vec(), items);
-            }
-
-            {
-                // Remove middle
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut b));
-                assert_clean((&mut b).into());
-                assert_eq!(Some((&mut c).into()), a.next);
-                assert_eq!(Some((&mut a).into()), c.prev);
-                let items: Vec<i32> = collect_list(list);
-                assert_eq!([5, 31].to_vec(), items);
-
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut b));
-                assert_clean((&mut b).into());
-                assert_eq!(Some((&mut c).into()), a.next);
-                assert_eq!(Some((&mut a).into()), c.prev);
-                let items: Vec<i32> = collect_reverse_list(list);
-                assert_eq!([31, 5].to_vec(), items);
-            }
-
-            {
-                // Remove last
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut c));
-                assert_clean((&mut c).into());
-                assert!(b.next.is_none());
-                assert_eq!(Some((&mut b).into()), list.tail);
-                let items: Vec<i32> = collect_list(list);
-                assert_eq!([5, 7].to_vec(), items);
-
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut c));
-                assert_clean((&mut c).into());
-                assert!(b.next.is_none());
-                assert_eq!(Some((&mut b).into()), list.tail);
-                let items: Vec<i32> = collect_reverse_list(list);
-                assert_eq!([7, 5].to_vec(), items);
-            }
-
-            {
-                // Remove first of two
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut a));
-                assert_clean((&mut a).into());
-                // a should be no longer there and can't be removed twice
-                assert_eq!(false, list.remove(&mut a));
-                assert_eq!(Some((&mut b).into()), list.head);
-                assert_eq!(Some((&mut b).into()), list.tail);
-                assert!(b.next.is_none());
-                assert!(b.prev.is_none());
-                let items: Vec<i32> = collect_list(list);
-                assert_eq!([7].to_vec(), items);
-
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut a));
-                assert_clean((&mut a).into());
-                // a should be no longer there and can't be removed twice
-                assert_eq!(false, list.remove(&mut a));
-                assert_eq!(Some((&mut b).into()), list.head);
-                assert_eq!(Some((&mut b).into()), list.tail);
-                assert!(b.next.is_none());
-                assert!(b.prev.is_none());
-                let items: Vec<i32> = collect_reverse_list(list);
-                assert_eq!([7].to_vec(), items);
-            }
-
-            {
-                // Remove last of two
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut b));
-                assert_clean((&mut b).into());
-                assert_eq!(Some((&mut a).into()), list.head);
-                assert_eq!(Some((&mut a).into()), list.tail);
-                assert!(a.next.is_none());
-                assert!(a.prev.is_none());
-                let items: Vec<i32> = collect_list(list);
-                assert_eq!([5].to_vec(), items);
-
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut b, &mut a]);
-                assert_eq!(true, list.remove(&mut b));
-                assert_clean((&mut b).into());
-                assert_eq!(Some((&mut a).into()), list.head);
-                assert_eq!(Some((&mut a).into()), list.tail);
-                assert!(a.next.is_none());
-                assert!(a.prev.is_none());
-                let items: Vec<i32> = collect_reverse_list(list);
-                assert_eq!([5].to_vec(), items);
-            }
-
-            {
-                // Remove last item
-                let mut list = LinkedList::new();
-                add_nodes(&mut list, &mut [&mut a]);
-                assert_eq!(true, list.remove(&mut a));
-                assert_clean((&mut a).into());
-                assert!(list.head.is_none());
-                assert!(list.tail.is_none());
-                let items: Vec<i32> = collect_list(list);
-                assert!(items.is_empty());
-            }
-
-            {
-                // Remove missing
-                let mut list = LinkedList::new();
-                list.add_front(&mut b);
-                list.add_front(&mut a);
-                assert_eq!(false, list.remove(&mut c));
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/linked_list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/linked_list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/linked_list.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/linked_list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,27 +1,34 @@
+#![cfg_attr(not(feature = "full"), allow(dead_code))]
+
 //! An intrusive double linked list of data
 //!
 //! The data structure supports tracking pinned nodes. Most of the data
 //! structure's APIs are `unsafe` as they require the caller to ensure the
 //! specified node is actually contained by the list.
 
+use core::cell::UnsafeCell;
 use core::fmt;
+use core::marker::{PhantomData, PhantomPinned};
 use core::mem::ManuallyDrop;
-use core::ptr::NonNull;
+use core::ptr::{self, NonNull};
 
 /// An intrusive linked list.
 ///
 /// Currently, the list is not emptied on drop. It is the caller's
 /// responsibility to ensure the list is empty before dropping it.
-pub(crate) struct LinkedList<T: Link> {
+pub(crate) struct LinkedList<L, T> {
     /// Linked list head
-    head: Option<NonNull<T::Target>>,
+    head: Option<NonNull<T>>,
 
     /// Linked list tail
-    tail: Option<NonNull<T::Target>>,
+    tail: Option<NonNull<T>>,
+
+    /// Node type marker.
+    _marker: PhantomData<*const L>,
 }
 
-unsafe impl<T: Link> Send for LinkedList<T> where T::Target: Send {}
-unsafe impl<T: Link> Sync for LinkedList<T> where T::Target: Sync {}
+unsafe impl<L: Link> Send for LinkedList<L, L::Target> where L::Target: Send {}
+unsafe impl<L: Link> Sync for LinkedList<L, L::Target> where L::Target: Sync {}
 
 /// Defines how a type is tracked within a linked list.
 ///
@@ -43,6 +50,7 @@
     type Target;
 
     /// Convert the handle to a raw pointer without consuming the handle
+    #[allow(clippy::wrong_self_convention)]
     fn as_raw(handle: &Self::Handle) -> NonNull<Self::Target>;
 
     /// Convert the raw pointer to a handle
@@ -54,11 +62,40 @@
 
 /// Previous / next pointers
 pub(crate) struct Pointers<T> {
+    inner: UnsafeCell<PointersInner<T>>,
+}
+/// We do not want the compiler to put the `noalias` attribute on mutable
+/// references to this type, so the type has been made `!Unpin` with a
+/// `PhantomPinned` field.
+///
+/// Additionally, we never access the `prev` or `next` fields directly, as any
+/// such access would implicitly involve the creation of a reference to the
+/// field, which we want to avoid since the fields are not `!Unpin`, and would
+/// hence be given the `noalias` attribute if we were to do such an access.
+/// As an alternative to accessing the fields directly, the `Pointers` type
+/// provides getters and setters for the two fields, and those are implemented
+/// using raw pointer casts and offsets, which is valid since the struct is
+/// #[repr(C)].
+///
+/// See this link for more information:
+/// <https://github.com/rust-lang/rust/pull/82834>
+#[repr(C)]
+struct PointersInner<T> {
     /// The previous node in the list. null if there is no previous node.
+    ///
+    /// This field is accessed through pointer manipulation, so it is not dead code.
+    #[allow(dead_code)]
     prev: Option<NonNull<T>>,
 
     /// The next node in the list. null if there is no previous node.
+    ///
+    /// This field is accessed through pointer manipulation, so it is not dead code.
+    #[allow(dead_code)]
     next: Option<NonNull<T>>,
+
+    /// This type is !Unpin due to the heuristic from:
+    /// <https://github.com/rust-lang/rust/pull/82834>
+    _pin: PhantomPinned,
 }
 
 unsafe impl<T: Send> Send for Pointers<T> {}
@@ -66,27 +103,30 @@
 
 // ===== impl LinkedList =====
 
-impl<T: Link> LinkedList<T> {
-    /// Creates an empty linked list
-    pub(crate) fn new() -> LinkedList<T> {
+impl<L, T> LinkedList<L, T> {
+    /// Creates an empty linked list.
+    pub(crate) const fn new() -> LinkedList<L, T> {
         LinkedList {
             head: None,
             tail: None,
+            _marker: PhantomData,
         }
     }
+}
 
+impl<L: Link> LinkedList<L, L::Target> {
     /// Adds an element first in the list.
-    pub(crate) fn push_front(&mut self, val: T::Handle) {
+    pub(crate) fn push_front(&mut self, val: L::Handle) {
         // The value should not be dropped, it is being inserted into the list
         let val = ManuallyDrop::new(val);
-        let ptr = T::as_raw(&*val);
+        let ptr = L::as_raw(&*val);
         assert_ne!(self.head, Some(ptr));
         unsafe {
-            T::pointers(ptr).as_mut().next = self.head;
-            T::pointers(ptr).as_mut().prev = None;
+            L::pointers(ptr).as_mut().set_next(self.head);
+            L::pointers(ptr).as_mut().set_prev(None);
 
             if let Some(head) = self.head {
-                T::pointers(head).as_mut().prev = Some(ptr);
+                L::pointers(head).as_mut().set_prev(Some(ptr));
             }
 
             self.head = Some(ptr);
@@ -99,25 +139,25 @@
 
     /// Removes the last element from a list and returns it, or None if it is
     /// empty.
-    pub(crate) fn pop_back(&mut self) -> Option<T::Handle> {
+    pub(crate) fn pop_back(&mut self) -> Option<L::Handle> {
         unsafe {
             let last = self.tail?;
-            self.tail = T::pointers(last).as_ref().prev;
+            self.tail = L::pointers(last).as_ref().get_prev();
 
-            if let Some(prev) = T::pointers(last).as_ref().prev {
-                T::pointers(prev).as_mut().next = None;
+            if let Some(prev) = L::pointers(last).as_ref().get_prev() {
+                L::pointers(prev).as_mut().set_next(None);
             } else {
                 self.head = None
             }
 
-            T::pointers(last).as_mut().prev = None;
-            T::pointers(last).as_mut().next = None;
+            L::pointers(last).as_mut().set_prev(None);
+            L::pointers(last).as_mut().set_next(None);
 
-            Some(T::from_raw(last))
+            Some(L::from_raw(last))
         }
     }
 
-    /// Returns whether the linked list doesn not contain any node
+    /// Returns whether the linked list does not contain any node
     pub(crate) fn is_empty(&self) -> bool {
         if self.head.is_some() {
             return false;
@@ -133,38 +173,42 @@
     ///
     /// The caller **must** ensure that `node` is currently contained by
     /// `self` or not contained by any other list.
-    pub(crate) unsafe fn remove(&mut self, node: NonNull<T::Target>) -> Option<T::Handle> {
-        if let Some(prev) = T::pointers(node).as_ref().prev {
-            debug_assert_eq!(T::pointers(prev).as_ref().next, Some(node));
-            T::pointers(prev).as_mut().next = T::pointers(node).as_ref().next;
+    pub(crate) unsafe fn remove(&mut self, node: NonNull<L::Target>) -> Option<L::Handle> {
+        if let Some(prev) = L::pointers(node).as_ref().get_prev() {
+            debug_assert_eq!(L::pointers(prev).as_ref().get_next(), Some(node));
+            L::pointers(prev)
+                .as_mut()
+                .set_next(L::pointers(node).as_ref().get_next());
         } else {
             if self.head != Some(node) {
                 return None;
             }
 
-            self.head = T::pointers(node).as_ref().next;
+            self.head = L::pointers(node).as_ref().get_next();
         }
 
-        if let Some(next) = T::pointers(node).as_ref().next {
-            debug_assert_eq!(T::pointers(next).as_ref().prev, Some(node));
-            T::pointers(next).as_mut().prev = T::pointers(node).as_ref().prev;
+        if let Some(next) = L::pointers(node).as_ref().get_next() {
+            debug_assert_eq!(L::pointers(next).as_ref().get_prev(), Some(node));
+            L::pointers(next)
+                .as_mut()
+                .set_prev(L::pointers(node).as_ref().get_prev());
         } else {
             // This might be the last item in the list
             if self.tail != Some(node) {
                 return None;
             }
 
-            self.tail = T::pointers(node).as_ref().prev;
+            self.tail = L::pointers(node).as_ref().get_prev();
         }
 
-        T::pointers(node).as_mut().next = None;
-        T::pointers(node).as_mut().prev = None;
+        L::pointers(node).as_mut().set_next(None);
+        L::pointers(node).as_mut().set_prev(None);
 
-        Some(T::from_raw(node))
+        Some(L::from_raw(node))
     }
 }
 
-impl<T: Link> fmt::Debug for LinkedList<T> {
+impl<L: Link> fmt::Debug for LinkedList<L, L::Target> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("LinkedList")
             .field("head", &self.head)
@@ -173,44 +217,67 @@
     }
 }
 
-cfg_sync! {
-    impl<T: Link> LinkedList<T> {
-        pub(crate) fn last(&self) -> Option<&T::Target> {
-            let tail = self.tail.as_ref()?;
-            unsafe {
-                Some(&*tail.as_ptr())
-            }
-        }
+#[cfg(any(
+    feature = "fs",
+    all(unix, feature = "process"),
+    feature = "signal",
+    feature = "sync",
+))]
+impl<L: Link> LinkedList<L, L::Target> {
+    pub(crate) fn last(&self) -> Option<&L::Target> {
+        let tail = self.tail.as_ref()?;
+        unsafe { Some(&*tail.as_ptr()) }
     }
 }
 
-// ===== impl Iter =====
+impl<L: Link> Default for LinkedList<L, L::Target> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+// ===== impl DrainFilter =====
 
-cfg_rt_threaded! {
-    pub(crate) struct Iter<'a, T: Link> {
+cfg_io_readiness! {
+    pub(crate) struct DrainFilter<'a, T: Link, F> {
+        list: &'a mut LinkedList<T, T::Target>,
+        filter: F,
         curr: Option<NonNull<T::Target>>,
-        _p: core::marker::PhantomData<&'a T>,
     }
 
-    impl<T: Link> LinkedList<T> {
-        pub(crate) fn iter(&self) -> Iter<'_, T> {
-            Iter {
-                curr: self.head,
-                _p: core::marker::PhantomData,
+    impl<T: Link> LinkedList<T, T::Target> {
+        pub(crate) fn drain_filter<F>(&mut self, filter: F) -> DrainFilter<'_, T, F>
+        where
+            F: FnMut(&mut T::Target) -> bool,
+        {
+            let curr = self.head;
+            DrainFilter {
+                curr,
+                filter,
+                list: self,
             }
         }
     }
 
-    impl<'a, T: Link> Iterator for Iter<'a, T> {
-        type Item = &'a T::Target;
-
-        fn next(&mut self) -> Option<&'a T::Target> {
-            let curr = self.curr?;
-            // safety: the pointer references data contained by the list
-            self.curr = unsafe { T::pointers(curr).as_ref() }.next;
+    impl<'a, T, F> Iterator for DrainFilter<'a, T, F>
+    where
+        T: Link,
+        F: FnMut(&mut T::Target) -> bool,
+    {
+        type Item = T::Handle;
+
+        fn next(&mut self) -> Option<Self::Item> {
+            while let Some(curr) = self.curr {
+                // safety: the pointer references data contained by the list
+                self.curr = unsafe { T::pointers(curr).as_ref() }.get_next();
+
+                // safety: the value is still owned by the linked list.
+                if (self.filter)(unsafe { &mut *curr.as_ptr() }) {
+                    return unsafe { self.list.remove(curr) };
+                }
+            }
 
-            // safety: the value is still owned by the linked list.
-            Some(unsafe { &*curr.as_ptr() })
+            None
         }
     }
 }
@@ -221,17 +288,58 @@
     /// Create a new set of empty pointers
     pub(crate) fn new() -> Pointers<T> {
         Pointers {
-            prev: None,
-            next: None,
+            inner: UnsafeCell::new(PointersInner {
+                prev: None,
+                next: None,
+                _pin: PhantomPinned,
+            }),
+        }
+    }
+
+    fn get_prev(&self) -> Option<NonNull<T>> {
+        // SAFETY: prev is the first field in PointersInner, which is #[repr(C)].
+        unsafe {
+            let inner = self.inner.get();
+            let prev = inner as *const Option<NonNull<T>>;
+            ptr::read(prev)
+        }
+    }
+    fn get_next(&self) -> Option<NonNull<T>> {
+        // SAFETY: next is the second field in PointersInner, which is #[repr(C)].
+        unsafe {
+            let inner = self.inner.get();
+            let prev = inner as *const Option<NonNull<T>>;
+            let next = prev.add(1);
+            ptr::read(next)
+        }
+    }
+
+    fn set_prev(&mut self, value: Option<NonNull<T>>) {
+        // SAFETY: prev is the first field in PointersInner, which is #[repr(C)].
+        unsafe {
+            let inner = self.inner.get();
+            let prev = inner as *mut Option<NonNull<T>>;
+            ptr::write(prev, value);
+        }
+    }
+    fn set_next(&mut self, value: Option<NonNull<T>>) {
+        // SAFETY: next is the second field in PointersInner, which is #[repr(C)].
+        unsafe {
+            let inner = self.inner.get();
+            let prev = inner as *mut Option<NonNull<T>>;
+            let next = prev.add(1);
+            ptr::write(next, value);
         }
     }
 }
 
 impl<T> fmt::Debug for Pointers<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let prev = self.get_prev();
+        let next = self.get_next();
         f.debug_struct("Pointers")
-            .field("prev", &self.prev)
-            .field("next", &self.next)
+            .field("prev", &prev)
+            .field("next", &next)
             .finish()
     }
 }
@@ -258,7 +366,7 @@
         }
 
         unsafe fn from_raw(ptr: NonNull<Entry>) -> Pin<&'a Entry> {
-            Pin::new(&*ptr.as_ptr())
+            Pin::new_unchecked(&*ptr.as_ptr())
         }
 
         unsafe fn pointers(mut target: NonNull<Entry>) -> NonNull<Pointers<Entry>> {
@@ -277,7 +385,7 @@
         r.as_ref().get_ref().into()
     }
 
-    fn collect_list(list: &mut LinkedList<&'_ Entry>) -> Vec<i32> {
+    fn collect_list(list: &mut LinkedList<&'_ Entry, <&'_ Entry as Link>::Target>) -> Vec<i32> {
         let mut ret = vec![];
 
         while let Some(entry) = list.pop_back() {
@@ -287,7 +395,10 @@
         ret
     }
 
-    fn push_all<'a>(list: &mut LinkedList<&'a Entry>, entries: &[Pin<&'a Entry>]) {
+    fn push_all<'a>(
+        list: &mut LinkedList<&'a Entry, <&'_ Entry as Link>::Target>,
+        entries: &[Pin<&'a Entry>],
+    ) {
         for entry in entries.iter() {
             list.push_front(*entry);
         }
@@ -295,8 +406,8 @@
 
     macro_rules! assert_clean {
         ($e:ident) => {{
-            assert!($e.pointers.next.is_none());
-            assert!($e.pointers.prev.is_none());
+            assert!($e.pointers.get_next().is_none());
+            assert!($e.pointers.get_prev().is_none());
         }};
     }
 
@@ -308,6 +419,11 @@
     }
 
     #[test]
+    fn const_new() {
+        const _: LinkedList<&Entry, <&Entry as Link>::Target> = LinkedList::new();
+    }
+
+    #[test]
     fn push_and_drain() {
         let a = entry(5);
         let b = entry(7);
@@ -332,7 +448,7 @@
         let a = entry(5);
         let b = entry(7);
 
-        let mut list = LinkedList::<&Entry>::new();
+        let mut list = LinkedList::<&Entry, <&Entry as Link>::Target>::new();
 
         list.push_front(a.as_ref());
 
@@ -389,8 +505,8 @@
             assert_clean!(a);
 
             assert_ptr_eq!(b, list.head);
-            assert_ptr_eq!(c, b.pointers.next);
-            assert_ptr_eq!(b, c.pointers.prev);
+            assert_ptr_eq!(c, b.pointers.get_next());
+            assert_ptr_eq!(b, c.pointers.get_prev());
 
             let items = collect_list(&mut list);
             assert_eq!([31, 7].to_vec(), items);
@@ -405,8 +521,8 @@
             assert!(list.remove(ptr(&b)).is_some());
             assert_clean!(b);
 
-            assert_ptr_eq!(c, a.pointers.next);
-            assert_ptr_eq!(a, c.pointers.prev);
+            assert_ptr_eq!(c, a.pointers.get_next());
+            assert_ptr_eq!(a, c.pointers.get_prev());
 
             let items = collect_list(&mut list);
             assert_eq!([31, 5].to_vec(), items);
@@ -422,7 +538,7 @@
             assert!(list.remove(ptr(&c)).is_some());
             assert_clean!(c);
 
-            assert!(b.pointers.next.is_none());
+            assert!(b.pointers.get_next().is_none());
             assert_ptr_eq!(b, list.tail);
 
             let items = collect_list(&mut list);
@@ -445,8 +561,8 @@
             assert_ptr_eq!(b, list.head);
             assert_ptr_eq!(b, list.tail);
 
-            assert!(b.pointers.next.is_none());
-            assert!(b.pointers.prev.is_none());
+            assert!(b.pointers.get_next().is_none());
+            assert!(b.pointers.get_prev().is_none());
 
             let items = collect_list(&mut list);
             assert_eq!([7].to_vec(), items);
@@ -465,8 +581,8 @@
             assert_ptr_eq!(a, list.head);
             assert_ptr_eq!(a, list.tail);
 
-            assert!(a.pointers.next.is_none());
-            assert!(a.pointers.prev.is_none());
+            assert!(a.pointers.get_next().is_none());
+            assert!(a.pointers.get_prev().is_none());
 
             let items = collect_list(&mut list);
             assert_eq!([5].to_vec(), items);
@@ -489,7 +605,7 @@
 
         unsafe {
             // Remove missing
-            let mut list = LinkedList::<&Entry>::new();
+            let mut list = LinkedList::<&Entry, <&Entry as Link>::Target>::new();
 
             list.push_front(b.as_ref());
             list.push_front(a.as_ref());
@@ -498,24 +614,6 @@
         }
     }
 
-    #[test]
-    fn iter() {
-        let a = entry(5);
-        let b = entry(7);
-
-        let mut list = LinkedList::<&Entry>::new();
-
-        assert_eq!(0, list.iter().count());
-
-        list.push_front(a.as_ref());
-        list.push_front(b.as_ref());
-
-        let mut i = list.iter();
-        assert_eq!(7, i.next().unwrap().val);
-        assert_eq!(5, i.next().unwrap().val);
-        assert!(i.next().is_none());
-    }
-
     proptest::proptest! {
         #[test]
         fn fuzz_linked_list(ops: Vec<usize>) {
@@ -543,7 +641,7 @@
             })
             .collect::<Vec<_>>();
 
-        let mut ll = LinkedList::<&Entry>::new();
+        let mut ll = LinkedList::<&Entry, <&Entry as Link>::Target>::new();
         let mut reference = VecDeque::new();
 
         let entries: Vec<_> = (0..ops.len()).map(|i| entry(i as i32)).collect();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,17 +3,57 @@
     pub(crate) mod slab;
 }
 
-#[cfg(any(feature = "sync", feature = "rt-core"))]
+#[cfg(any(
+    // io driver uses `WakeList` directly
+    feature = "net",
+    feature = "process",
+    // `sync` enables `Notify` and `batch_semaphore`, which require `WakeList`.
+    feature = "sync",
+    // `fs` uses `batch_semaphore`, which requires `WakeList`.
+    feature = "fs",
+    // rt and signal use `Notify`, which requires `WakeList`.
+    feature = "rt",
+    feature = "signal",
+))]
+mod wake_list;
+#[cfg(any(
+    feature = "net",
+    feature = "process",
+    feature = "sync",
+    feature = "fs",
+    feature = "rt",
+    feature = "signal",
+))]
+pub(crate) use wake_list::WakeList;
+
+#[cfg(any(
+    feature = "fs",
+    feature = "net",
+    feature = "process",
+    feature = "rt",
+    feature = "sync",
+    feature = "signal",
+    feature = "time",
+))]
 pub(crate) mod linked_list;
 
-#[cfg(any(feature = "rt-threaded", feature = "macros", feature = "stream"))]
+#[cfg(any(feature = "rt-multi-thread", feature = "macros"))]
 mod rand;
 
-mod wake;
-pub(crate) use wake::{waker_ref, Wake};
+cfg_rt! {
+    mod wake;
+    pub(crate) use wake::WakerRef;
+    pub(crate) use wake::{waker_ref, Wake};
 
-cfg_rt_threaded! {
-    pub(crate) use rand::FastRand;
+    mod sync_wrapper;
+    pub(crate) use sync_wrapper::SyncWrapper;
+
+    mod vec_deque_cell;
+    pub(crate) use vec_deque_cell::VecDequeCell;
+}
+
+cfg_rt_multi_thread! {
+    pub(crate) use self::rand::FastRand;
 
     mod try_lock;
     pub(crate) use try_lock::TryLock;
@@ -21,8 +61,15 @@
 
 pub(crate) mod trace;
 
-#[cfg(any(feature = "macros", feature = "stream"))]
+#[cfg(any(feature = "macros"))]
 #[cfg_attr(not(feature = "macros"), allow(unreachable_pub))]
-pub use rand::thread_rng_n;
+pub use self::rand::thread_rng_n;
 
-pub(crate) mod intrusive_double_linked_list;
+#[cfg(any(
+    feature = "rt",
+    feature = "time",
+    feature = "net",
+    feature = "process",
+    all(unix, feature = "signal")
+))]
+pub(crate) mod error;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/rand.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/rand.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/rand.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/rand.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,10 +3,10 @@
 /// Fast random number generate
 ///
 /// Implement xorshift64+: 2 32-bit xorshift sequences added together.
-/// Shift triplet [17,7,16] was calculated as indicated in Marsaglia's
-/// Xorshift paper: https://www.jstatsoft.org/article/view/v008i14/xorshift.pdf
+/// Shift triplet `[17,7,16]` was calculated as indicated in Marsaglia's
+/// Xorshift paper: <https://www.jstatsoft.org/article/view/v008i14/xorshift.pdf>
 /// This generator passes the SmallCrush suite, part of TestU01 framework:
-/// http://simul.iro.umontreal.ca/testu01/tu01.html
+/// <http://simul.iro.umontreal.ca/testu01/tu01.html>
 #[derive(Debug)]
 pub(crate) struct FastRand {
     one: Cell<u32>,
@@ -52,7 +52,7 @@
 }
 
 // Used by the select macro and `StreamMap`
-#[cfg(any(feature = "macros", feature = "stream"))]
+#[cfg(any(feature = "macros"))]
 #[doc(hidden)]
 #[cfg_attr(not(feature = "macros"), allow(unreachable_pub))]
 pub fn thread_rng_n(n: u32) -> u32 {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/addr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/addr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/addr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/addr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-//! Tracks the location of an entry in a slab.
-//!
-//! # Index packing
-//!
-//! A slab index consists of multiple indices packed into a single `usize` value
-//! that correspond to different parts of the slab.
-//!
-//! The least significant `MAX_PAGES + INITIAL_PAGE_SIZE.trailing_zeros() + 1`
-//! bits store the address within a shard, starting at 0 for the first slot on
-//! the first page. To index a slot within a shard, we first find the index of
-//! the page that the address falls on, and then the offset of the slot within
-//! that page.
-//!
-//! Since every page is twice as large as the previous page, and all page sizes
-//! are powers of two, we can determine the page index that contains a given
-//! address by shifting the address down by the smallest page size and looking
-//! at how many twos places necessary to represent that number, telling us what
-//! power of two page size it fits inside of. We can determine the number of
-//! twos places by counting the number of leading zeros (unused twos places) in
-//! the number's binary representation, and subtracting that count from the
-//! total number of bits in a word.
-//!
-//! Once we know what page contains an address, we can subtract the size of all
-//! previous pages from the address to determine the offset within the page.
-//!
-//! After the page address, the next `MAX_THREADS.trailing_zeros() + 1` least
-//! significant bits are the thread ID. These are used to index the array of
-//! shards to find which shard a slot belongs to. If an entry is being removed
-//! and the thread ID of its index matches that of the current thread, we can
-//! use the `remove_local` fast path; otherwise, we have to use the synchronized
-//! `remove_remote` path.
-//!
-//! Finally, a generation value is packed into the index. The `RESERVED_BITS`
-//! most significant bits are left unused, and the remaining bits between the
-//! last bit of the thread ID and the first reserved bit are used to store the
-//! generation. The generation is used as part of an atomic read-modify-write
-//! loop every time a `ScheduledIo`'s readiness is modified, or when the
-//! resource is removed, to guard against the ABA problem.
-//!
-//! Visualized:
-//!
-//! ```text
-//!     ┌──────────┬───────────────┬──────────────────┬──────────────────────────�
-//!     │ reserved │  generation   │    thread ID     │         address          │
-//!     └▲─────────┴▲──────────────┴▲─────────────────┴▲────────────────────────▲┘
-//!      │          │               │                  │                        │
-//! bits(usize)     │       bits(MAX_THREADS)          │                        0
-//!                 │                                  │
-//!      bits(usize) - RESERVED       MAX_PAGES + bits(INITIAL_PAGE_SIZE)
-//! ```
-
-use crate::util::bit;
-use crate::util::slab::{Generation, INITIAL_PAGE_SIZE, MAX_PAGES, MAX_THREADS};
-
-use std::usize;
-
-/// References the location at which an entry is stored in a slab.
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub(crate) struct Address(usize);
-
-const PAGE_INDEX_SHIFT: u32 = INITIAL_PAGE_SIZE.trailing_zeros() + 1;
-
-/// Address in the shard
-const SLOT: bit::Pack = bit::Pack::least_significant(MAX_PAGES as u32 + PAGE_INDEX_SHIFT);
-
-/// Masks the thread identifier
-const THREAD: bit::Pack = SLOT.then(MAX_THREADS.trailing_zeros() + 1);
-
-/// Masks the generation
-const GENERATION: bit::Pack = THREAD
-    .then(bit::pointer_width().wrapping_sub(RESERVED.width() + THREAD.width() + SLOT.width()));
-
-// Chosen arbitrarily
-const RESERVED: bit::Pack = bit::Pack::most_significant(5);
-
-impl Address {
-    /// Represents no entry, picked to avoid collision with Mio's internals.
-    /// This value should not be passed to mio.
-    pub(crate) const NULL: usize = usize::MAX >> 1;
-
-    /// Re-exported by `Generation`.
-    pub(super) const GENERATION_WIDTH: u32 = GENERATION.width();
-
-    pub(super) fn new(shard_index: usize, generation: Generation) -> Address {
-        let mut repr = 0;
-
-        repr = SLOT.pack(shard_index, repr);
-        repr = GENERATION.pack(generation.to_usize(), repr);
-
-        Address(repr)
-    }
-
-    /// Convert from a `usize` representation.
-    pub(crate) fn from_usize(src: usize) -> Address {
-        assert_ne!(src, Self::NULL);
-
-        Address(src)
-    }
-
-    /// Convert to a `usize` representation
-    pub(crate) fn to_usize(self) -> usize {
-        self.0
-    }
-
-    pub(crate) fn generation(self) -> Generation {
-        Generation::new(GENERATION.unpack(self.0))
-    }
-
-    /// Returns the page index
-    pub(super) fn page(self) -> usize {
-        // Since every page is twice as large as the previous page, and all page
-        // sizes are powers of two, we can determine the page index that
-        // contains a given address by shifting the address down by the smallest
-        // page size and looking at how many twos places necessary to represent
-        // that number, telling us what power of two page size it fits inside
-        // of. We can determine the number of twos places by counting the number
-        // of leading zeros (unused twos places) in the number's binary
-        // representation, and subtracting that count from the total number of
-        // bits in a word.
-        let slot_shifted = (self.slot() + INITIAL_PAGE_SIZE) >> PAGE_INDEX_SHIFT;
-        (bit::pointer_width() - slot_shifted.leading_zeros()) as usize
-    }
-
-    /// Returns the slot index
-    pub(super) fn slot(self) -> usize {
-        SLOT.unpack(self.0)
-    }
-}
-
-#[cfg(test)]
-cfg_not_loom! {
-    use proptest::proptest;
-
-    #[test]
-    fn test_pack_format() {
-        assert_eq!(5, RESERVED.width());
-        assert_eq!(0b11111, RESERVED.max_value());
-    }
-
-    proptest! {
-        #[test]
-        fn address_roundtrips(
-            slot in 0usize..SLOT.max_value(),
-            generation in 0usize..Generation::MAX,
-        ) {
-            let address = Address::new(slot, Generation::new(generation));
-            // Round trip
-            let address = Address::from_usize(address.to_usize());
-
-            assert_eq!(address.slot(), slot);
-            assert_eq!(address.generation().to_usize(), generation);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/entry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/entry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/entry.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/entry.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-use crate::util::slab::Generation;
-
-pub(crate) trait Entry: Default {
-    fn generation(&self) -> Generation;
-
-    fn reset(&self, generation: Generation) -> bool;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/generation.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/generation.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/generation.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/generation.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-use crate::util::bit;
-use crate::util::slab::Address;
-
-/// An mutation identifier for a slot in the slab. The generation helps prevent
-/// accessing an entry with an outdated token.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord, PartialOrd)]
-pub(crate) struct Generation(usize);
-
-impl Generation {
-    pub(crate) const WIDTH: u32 = Address::GENERATION_WIDTH;
-
-    pub(super) const MAX: usize = bit::mask_for(Address::GENERATION_WIDTH);
-
-    /// Create a new generation
-    ///
-    /// # Panics
-    ///
-    /// Panics if `value` is greater than max generation.
-    pub(crate) fn new(value: usize) -> Generation {
-        assert!(value <= Self::MAX);
-        Generation(value)
-    }
-
-    /// Returns the next generation value
-    pub(crate) fn next(self) -> Generation {
-        Generation((self.0 + 1) & Self::MAX)
-    }
-
-    pub(crate) fn to_usize(self) -> usize {
-        self.0
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-//! A lock-free concurrent slab.
-
-mod addr;
-pub(crate) use addr::Address;
-
-mod entry;
-pub(crate) use entry::Entry;
-
-mod generation;
-pub(crate) use generation::Generation;
-
-mod page;
-
-mod shard;
-use shard::Shard;
-
-mod slot;
-use slot::Slot;
-
-mod stack;
-use stack::TransferStack;
-
-#[cfg(all(loom, test))]
-mod tests;
-
-use crate::loom::sync::Mutex;
-use crate::util::bit;
-
-use std::fmt;
-
-#[cfg(target_pointer_width = "64")]
-const MAX_THREADS: usize = 4096;
-
-#[cfg(target_pointer_width = "32")]
-const MAX_THREADS: usize = 2048;
-
-/// Max number of pages per slab
-const MAX_PAGES: usize = bit::pointer_width() as usize / 4;
-
-cfg_not_loom! {
-    /// Size of first page
-    const INITIAL_PAGE_SIZE: usize = 32;
-}
-
-cfg_loom! {
-    const INITIAL_PAGE_SIZE: usize = 2;
-}
-
-/// A sharded slab.
-pub(crate) struct Slab<T> {
-    // Signal shard for now. Eventually there will be more.
-    shard: Shard<T>,
-    local: Mutex<()>,
-}
-
-unsafe impl<T: Send> Send for Slab<T> {}
-unsafe impl<T: Sync> Sync for Slab<T> {}
-
-impl<T: Entry> Slab<T> {
-    /// Returns a new slab with the default configuration parameters.
-    pub(crate) fn new() -> Slab<T> {
-        Slab {
-            shard: Shard::new(),
-            local: Mutex::new(()),
-        }
-    }
-
-    /// allocs a value into the slab, returning a key that can be used to
-    /// access it.
-    ///
-    /// If this function returns `None`, then the shard for the current thread
-    /// is full and no items can be added until some are removed, or the maximum
-    /// number of shards has been reached.
-    pub(crate) fn alloc(&self) -> Option<Address> {
-        // we must lock the slab to alloc an item.
-        let _local = self.local.lock().unwrap();
-        self.shard.alloc()
-    }
-
-    /// Removes the value associated with the given key from the slab.
-    pub(crate) fn remove(&self, idx: Address) {
-        // try to lock the slab so that we can use `remove_local`.
-        let lock = self.local.try_lock();
-
-        // if we were able to lock the slab, we are "local" and can use the fast
-        // path; otherwise, we will use `remove_remote`.
-        if lock.is_ok() {
-            self.shard.remove_local(idx)
-        } else {
-            self.shard.remove_remote(idx)
-        }
-    }
-
-    /// Return a reference to the value associated with the given key.
-    ///
-    /// If the slab does not contain a value for the given key, `None` is
-    /// returned instead.
-    pub(crate) fn get(&self, token: Address) -> Option<&T> {
-        self.shard.get(token)
-    }
-}
-
-impl<T> fmt::Debug for Slab<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Slab").field("shard", &self.shard).finish()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/page.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/page.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/page.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/page.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-use crate::loom::cell::UnsafeCell;
-use crate::util::slab::{Address, Entry, Slot, TransferStack, INITIAL_PAGE_SIZE};
-
-use std::fmt;
-
-/// Data accessed only by the thread that owns the shard.
-pub(crate) struct Local {
-    head: UnsafeCell<usize>,
-}
-
-/// Data accessed by any thread.
-pub(crate) struct Shared<T> {
-    remote: TransferStack,
-    size: usize,
-    prev_sz: usize,
-    slab: UnsafeCell<Option<Box<[Slot<T>]>>>,
-}
-
-/// Returns the size of the page at index `n`
-pub(super) fn size(n: usize) -> usize {
-    INITIAL_PAGE_SIZE << n
-}
-
-impl Local {
-    pub(crate) fn new() -> Self {
-        Self {
-            head: UnsafeCell::new(0),
-        }
-    }
-
-    fn head(&self) -> usize {
-        self.head.with(|head| unsafe { *head })
-    }
-
-    fn set_head(&self, new_head: usize) {
-        self.head.with_mut(|head| unsafe {
-            *head = new_head;
-        })
-    }
-}
-
-impl<T: Entry> Shared<T> {
-    pub(crate) fn new(size: usize, prev_sz: usize) -> Shared<T> {
-        Self {
-            prev_sz,
-            size,
-            remote: TransferStack::new(),
-            slab: UnsafeCell::new(None),
-        }
-    }
-
-    /// Allocates storage for this page if it does not allready exist.
-    ///
-    /// This requires unique access to the page (e.g. it is called from the
-    /// thread that owns the page, or, in the case of `SingleShard`, while the
-    /// lock is held). In order to indicate this, a reference to the page's
-    /// `Local` data is taken by this function; the `Local` argument is not
-    /// actually used, but requiring it ensures that this is only called when
-    /// local access is held.
-    #[cold]
-    fn alloc_page(&self, _: &Local) {
-        debug_assert!(self.slab.with(|s| unsafe { (*s).is_none() }));
-
-        let mut slab = Vec::with_capacity(self.size);
-        slab.extend((1..self.size).map(Slot::new));
-        slab.push(Slot::new(Address::NULL));
-
-        self.slab.with_mut(|s| {
-            // this mut access is safe — it only occurs to initially
-            // allocate the page, which only happens on this thread; if the
-            // page has not yet been allocated, other threads will not try
-            // to access it yet.
-            unsafe {
-                *s = Some(slab.into_boxed_slice());
-            }
-        });
-    }
-
-    pub(crate) fn alloc(&self, local: &Local) -> Option<Address> {
-        let head = local.head();
-
-        // are there any items on the local free list? (fast path)
-        let head = if head < self.size {
-            head
-        } else {
-            // if the local free list is empty, pop all the items on the remote
-            // free list onto the local free list.
-            self.remote.pop_all()?
-        };
-
-        // if the head is still null, both the local and remote free lists are
-        // empty --- we can't fit any more items on this page.
-        if head == Address::NULL {
-            return None;
-        }
-
-        // do we need to allocate storage for this page?
-        let page_needs_alloc = self.slab.with(|s| unsafe { (*s).is_none() });
-        if page_needs_alloc {
-            self.alloc_page(local);
-        }
-
-        let gen = self.slab.with(|slab| {
-            let slab = unsafe { &*(slab) }
-                .as_ref()
-                .expect("page must have been allocated to alloc!");
-
-            let slot = &slab[head];
-
-            local.set_head(slot.next());
-            slot.generation()
-        });
-
-        let index = head + self.prev_sz;
-
-        Some(Address::new(index, gen))
-    }
-
-    pub(crate) fn get(&self, addr: Address) -> Option<&T> {
-        let page_offset = addr.slot() - self.prev_sz;
-
-        self.slab
-            .with(|slab| unsafe { &*slab }.as_ref()?.get(page_offset))
-            .map(|slot| slot.get())
-    }
-
-    pub(crate) fn remove_local(&self, local: &Local, addr: Address) {
-        let offset = addr.slot() - self.prev_sz;
-
-        self.slab.with(|slab| {
-            let slab = unsafe { &*slab }.as_ref();
-
-            let slot = if let Some(slot) = slab.and_then(|slab| slab.get(offset)) {
-                slot
-            } else {
-                return;
-            };
-
-            if slot.reset(addr.generation()) {
-                slot.set_next(local.head());
-                local.set_head(offset);
-            }
-        })
-    }
-
-    pub(crate) fn remove_remote(&self, addr: Address) {
-        let offset = addr.slot() - self.prev_sz;
-
-        self.slab.with(|slab| {
-            let slab = unsafe { &*slab }.as_ref();
-
-            let slot = if let Some(slot) = slab.and_then(|slab| slab.get(offset)) {
-                slot
-            } else {
-                return;
-            };
-
-            if !slot.reset(addr.generation()) {
-                return;
-            }
-
-            self.remote.push(offset, |next| slot.set_next(next));
-        })
-    }
-}
-
-impl fmt::Debug for Local {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.head.with(|head| {
-            let head = unsafe { *head };
-            f.debug_struct("Local")
-                .field("head", &format_args!("{:#0x}", head))
-                .finish()
-        })
-    }
-}
-
-impl<T> fmt::Debug for Shared<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Shared")
-            .field("remote", &self.remote)
-            .field("prev_sz", &self.prev_sz)
-            .field("size", &self.size)
-            // .field("slab", &self.slab)
-            .finish()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/shard.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/shard.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/shard.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/shard.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-use crate::util::slab::{page, Address, Entry, MAX_PAGES};
-
-use std::fmt;
-
-// ┌─────────────�      ┌────────�
-// │ page 1      │      │        │
-// ├─────────────┤ ┌───▶│  next──┼─�
-// │ page 2      │ │    ├────────┤ │
-// │             │ │    │XXXXXXXX│ │
-// │ local_free──┼─┘    ├────────┤ │
-// │ global_free─┼─�    │        │◀┘
-// ├─────────────┤ └───▶│  next──┼─�
-// │   page 3    │      ├────────┤ │
-// └─────────────┘      │XXXXXXXX│ │
-//       ...            ├────────┤ │
-// ┌─────────────�      │XXXXXXXX│ │
-// │ page n      │      ├────────┤ │
-// └─────────────┘      │        │◀┘
-//                      │  next──┼───▶
-//                      ├────────┤
-//                      │XXXXXXXX│
-//                      └────────┘
-//                         ...
-pub(super) struct Shard<T> {
-    /// The local free list for each page.
-    ///
-    /// These are only ever accessed from this shard's thread, so they are
-    /// stored separately from the shared state for the page that can be
-    /// accessed concurrently, to minimize false sharing.
-    local: Box<[page::Local]>,
-    /// The shared state for each page in this shard.
-    ///
-    /// This consists of the page's metadata (size, previous size), remote free
-    /// list, and a pointer to the actual array backing that page.
-    shared: Box<[page::Shared<T>]>,
-}
-
-impl<T: Entry> Shard<T> {
-    pub(super) fn new() -> Shard<T> {
-        let mut total_sz = 0;
-        let shared = (0..MAX_PAGES)
-            .map(|page_num| {
-                let sz = page::size(page_num);
-                let prev_sz = total_sz;
-                total_sz += sz;
-                page::Shared::new(sz, prev_sz)
-            })
-            .collect();
-
-        let local = (0..MAX_PAGES).map(|_| page::Local::new()).collect();
-
-        Shard { local, shared }
-    }
-
-    pub(super) fn alloc(&self) -> Option<Address> {
-        // Can we fit the value into an existing page?
-        for (page_idx, page) in self.shared.iter().enumerate() {
-            let local = self.local(page_idx);
-
-            if let Some(page_offset) = page.alloc(local) {
-                return Some(page_offset);
-            }
-        }
-
-        None
-    }
-
-    pub(super) fn get(&self, addr: Address) -> Option<&T> {
-        let page_idx = addr.page();
-
-        if page_idx > self.shared.len() {
-            return None;
-        }
-
-        self.shared[page_idx].get(addr)
-    }
-
-    /// Remove an item on the shard's local thread.
-    pub(super) fn remove_local(&self, addr: Address) {
-        let page_idx = addr.page();
-
-        if let Some(page) = self.shared.get(page_idx) {
-            page.remove_local(self.local(page_idx), addr);
-        }
-    }
-
-    /// Remove an item, while on a different thread from the shard's local thread.
-    pub(super) fn remove_remote(&self, addr: Address) {
-        if let Some(page) = self.shared.get(addr.page()) {
-            page.remove_remote(addr);
-        }
-    }
-
-    fn local(&self, i: usize) -> &page::Local {
-        &self.local[i]
-    }
-}
-
-impl<T> fmt::Debug for Shard<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Shard")
-            .field("shared", &self.shared)
-            .finish()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/slot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/slot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/slot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/slot.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-use crate::loom::cell::UnsafeCell;
-use crate::util::slab::{Entry, Generation};
-
-/// Stores an entry in the slab.
-pub(super) struct Slot<T> {
-    next: UnsafeCell<usize>,
-    entry: T,
-}
-
-impl<T: Entry> Slot<T> {
-    /// Initialize a new `Slot` linked to `next`.
-    ///
-    /// The entry is initialized to a default value.
-    pub(super) fn new(next: usize) -> Slot<T> {
-        Slot {
-            next: UnsafeCell::new(next),
-            entry: T::default(),
-        }
-    }
-
-    pub(super) fn get(&self) -> &T {
-        &self.entry
-    }
-
-    pub(super) fn generation(&self) -> Generation {
-        self.entry.generation()
-    }
-
-    pub(super) fn reset(&self, generation: Generation) -> bool {
-        self.entry.reset(generation)
-    }
-
-    pub(super) fn next(&self) -> usize {
-        self.next.with(|next| unsafe { *next })
-    }
-
-    pub(super) fn set_next(&self, next: usize) {
-        self.next.with_mut(|n| unsafe {
-            (*n) = next;
-        })
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/stack.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-use crate::loom::sync::atomic::AtomicUsize;
-use crate::util::slab::Address;
-
-use std::fmt;
-use std::sync::atomic::Ordering;
-use std::usize;
-
-pub(super) struct TransferStack {
-    head: AtomicUsize,
-}
-
-impl TransferStack {
-    pub(super) fn new() -> Self {
-        Self {
-            head: AtomicUsize::new(Address::NULL),
-        }
-    }
-
-    pub(super) fn pop_all(&self) -> Option<usize> {
-        let val = self.head.swap(Address::NULL, Ordering::Acquire);
-
-        if val == Address::NULL {
-            None
-        } else {
-            Some(val)
-        }
-    }
-
-    pub(super) fn push(&self, value: usize, before: impl Fn(usize)) {
-        let mut next = self.head.load(Ordering::Relaxed);
-
-        loop {
-            before(next);
-
-            match self
-                .head
-                .compare_exchange(next, value, Ordering::AcqRel, Ordering::Acquire)
-            {
-                // lost the race!
-                Err(actual) => next = actual,
-                Ok(_) => return,
-            }
-        }
-    }
-}
-
-impl fmt::Debug for TransferStack {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // Loom likes to dump all its internal state in `fmt::Debug` impls, so
-        // we override this to just print the current value in tests.
-        f.debug_struct("TransferStack")
-            .field(
-                "head",
-                &format_args!("{:#x}", self.head.load(Ordering::Relaxed)),
-            )
-            .finish()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/tests/loom_slab.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/tests/loom_slab.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/tests/loom_slab.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/tests/loom_slab.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,327 +0,0 @@
-use crate::io::driver::ScheduledIo;
-use crate::util::slab::{Address, Slab};
-
-use loom::sync::{Arc, Condvar, Mutex};
-use loom::thread;
-
-#[test]
-fn local_remove() {
-    loom::model(|| {
-        let slab = Arc::new(Slab::new());
-
-        let s = slab.clone();
-        let t1 = thread::spawn(move || {
-            let idx = store_val(&s, 1);
-            assert_eq!(get_val(&s, idx), Some(1));
-            s.remove(idx);
-            assert_eq!(get_val(&s, idx), None);
-            let idx = store_val(&s, 2);
-            assert_eq!(get_val(&s, idx), Some(2));
-            s.remove(idx);
-            assert_eq!(get_val(&s, idx), None);
-        });
-
-        let s = slab.clone();
-        let t2 = thread::spawn(move || {
-            let idx = store_val(&s, 3);
-            assert_eq!(get_val(&s, idx), Some(3));
-            s.remove(idx);
-            assert_eq!(get_val(&s, idx), None);
-            let idx = store_val(&s, 4);
-            s.remove(idx);
-            assert_eq!(get_val(&s, idx), None);
-        });
-
-        let s = slab;
-        let idx1 = store_val(&s, 5);
-        assert_eq!(get_val(&s, idx1), Some(5));
-        let idx2 = store_val(&s, 6);
-        assert_eq!(get_val(&s, idx2), Some(6));
-        s.remove(idx1);
-        assert_eq!(get_val(&s, idx1), None);
-        assert_eq!(get_val(&s, idx2), Some(6));
-        s.remove(idx2);
-        assert_eq!(get_val(&s, idx2), None);
-
-        t1.join().expect("thread 1 should not panic");
-        t2.join().expect("thread 2 should not panic");
-    });
-}
-
-#[test]
-fn remove_remote() {
-    loom::model(|| {
-        let slab = Arc::new(Slab::new());
-
-        let idx1 = store_val(&slab, 1);
-        assert_eq!(get_val(&slab, idx1), Some(1));
-
-        let idx2 = store_val(&slab, 2);
-        assert_eq!(get_val(&slab, idx2), Some(2));
-
-        let idx3 = store_val(&slab, 3);
-        assert_eq!(get_val(&slab, idx3), Some(3));
-
-        let s = slab.clone();
-        let t1 = thread::spawn(move || {
-            assert_eq!(get_val(&s, idx2), Some(2));
-            s.remove(idx2);
-            assert_eq!(get_val(&s, idx2), None);
-        });
-
-        let s = slab.clone();
-        let t2 = thread::spawn(move || {
-            assert_eq!(get_val(&s, idx3), Some(3));
-            s.remove(idx3);
-            assert_eq!(get_val(&s, idx3), None);
-        });
-
-        t1.join().expect("thread 1 should not panic");
-        t2.join().expect("thread 2 should not panic");
-
-        assert_eq!(get_val(&slab, idx1), Some(1));
-        assert_eq!(get_val(&slab, idx2), None);
-        assert_eq!(get_val(&slab, idx3), None);
-    });
-}
-
-#[test]
-fn remove_remote_and_reuse() {
-    loom::model(|| {
-        let slab = Arc::new(Slab::new());
-
-        let idx1 = store_val(&slab, 1);
-        let idx2 = store_val(&slab, 2);
-
-        assert_eq!(get_val(&slab, idx1), Some(1));
-        assert_eq!(get_val(&slab, idx2), Some(2));
-
-        let s = slab.clone();
-        let t1 = thread::spawn(move || {
-            s.remove(idx1);
-            let value = get_val(&s, idx1);
-
-            // We may or may not see the new value yet, depending on when
-            // this occurs, but we must either see the new value or `None`;
-            // the old value has been removed!
-            assert!(value == None || value == Some(3));
-        });
-
-        let idx3 = store_when_free(&slab, 3);
-        t1.join().expect("thread 1 should not panic");
-
-        assert_eq!(get_val(&slab, idx3), Some(3));
-        assert_eq!(get_val(&slab, idx2), Some(2));
-    });
-}
-
-#[test]
-fn concurrent_alloc_remove() {
-    loom::model(|| {
-        let slab = Arc::new(Slab::new());
-        let pair = Arc::new((Mutex::new(None), Condvar::new()));
-
-        let slab2 = slab.clone();
-        let pair2 = pair.clone();
-        let remover = thread::spawn(move || {
-            let (lock, cvar) = &*pair2;
-            for _ in 0..2 {
-                let mut next = lock.lock().unwrap();
-                while next.is_none() {
-                    next = cvar.wait(next).unwrap();
-                }
-                let key = next.take().unwrap();
-                slab2.remove(key);
-                assert_eq!(get_val(&slab2, key), None);
-                cvar.notify_one();
-            }
-        });
-
-        let (lock, cvar) = &*pair;
-        for i in 0..2 {
-            let key = store_val(&slab, i);
-
-            let mut next = lock.lock().unwrap();
-            *next = Some(key);
-            cvar.notify_one();
-
-            // Wait for the item to be removed.
-            while next.is_some() {
-                next = cvar.wait(next).unwrap();
-            }
-
-            assert_eq!(get_val(&slab, key), None);
-        }
-
-        remover.join().unwrap();
-    })
-}
-
-#[test]
-fn concurrent_remove_remote_and_reuse() {
-    loom::model(|| {
-        let slab = Arc::new(Slab::new());
-
-        let idx1 = store_val(&slab, 1);
-        let idx2 = store_val(&slab, 2);
-
-        assert_eq!(get_val(&slab, idx1), Some(1));
-        assert_eq!(get_val(&slab, idx2), Some(2));
-
-        let s = slab.clone();
-        let s2 = slab.clone();
-        let t1 = thread::spawn(move || {
-            s.remove(idx1);
-        });
-
-        let t2 = thread::spawn(move || {
-            s2.remove(idx2);
-        });
-
-        let idx3 = store_when_free(&slab, 3);
-        t1.join().expect("thread 1 should not panic");
-        t2.join().expect("thread 1 should not panic");
-
-        assert!(get_val(&slab, idx1).is_none());
-        assert!(get_val(&slab, idx2).is_none());
-        assert_eq!(get_val(&slab, idx3), Some(3));
-    });
-}
-
-#[test]
-fn alloc_remove_get() {
-    loom::model(|| {
-        let slab = Arc::new(Slab::new());
-        let pair = Arc::new((Mutex::new(None), Condvar::new()));
-
-        let slab2 = slab.clone();
-        let pair2 = pair.clone();
-        let t1 = thread::spawn(move || {
-            let slab = slab2;
-            let (lock, cvar) = &*pair2;
-            // allocate one entry just so that we have to use the final one for
-            // all future allocations.
-            let _key0 = store_val(&slab, 0);
-            let key = store_val(&slab, 1);
-
-            let mut next = lock.lock().unwrap();
-            *next = Some(key);
-            cvar.notify_one();
-            // remove the second entry
-            slab.remove(key);
-            // store a new readiness at the same location (since the slab
-            // already has an entry in slot 0)
-            store_val(&slab, 2);
-        });
-
-        let (lock, cvar) = &*pair;
-        // wait for the second entry to be stored...
-        let mut next = lock.lock().unwrap();
-        while next.is_none() {
-            next = cvar.wait(next).unwrap();
-        }
-        let key = next.unwrap();
-
-        // our generation will be stale when the second store occurs at that
-        // index, we must not see the value of that store.
-        let val = get_val(&slab, key);
-        assert_ne!(val, Some(2), "generation must have advanced!");
-
-        t1.join().unwrap();
-    })
-}
-
-#[test]
-fn alloc_remove_set() {
-    loom::model(|| {
-        let slab = Arc::new(Slab::new());
-        let pair = Arc::new((Mutex::new(None), Condvar::new()));
-
-        let slab2 = slab.clone();
-        let pair2 = pair.clone();
-        let t1 = thread::spawn(move || {
-            let slab = slab2;
-            let (lock, cvar) = &*pair2;
-            // allocate one entry just so that we have to use the final one for
-            // all future allocations.
-            let _key0 = store_val(&slab, 0);
-            let key = store_val(&slab, 1);
-
-            let mut next = lock.lock().unwrap();
-            *next = Some(key);
-            cvar.notify_one();
-
-            slab.remove(key);
-            // remove the old entry and insert a new one, with a new generation.
-            let key2 = slab.alloc().expect("store key 2");
-            // after the remove, we must not see the value written with the
-            // stale index.
-            assert_eq!(
-                get_val(&slab, key),
-                None,
-                "stale set must no longer be visible"
-            );
-            assert_eq!(get_val(&slab, key2), Some(0));
-            key2
-        });
-
-        let (lock, cvar) = &*pair;
-
-        // wait for the second entry to be stored. the index we get from the
-        // other thread may become stale after a write.
-        let mut next = lock.lock().unwrap();
-        while next.is_none() {
-            next = cvar.wait(next).unwrap();
-        }
-        let key = next.unwrap();
-
-        // try to write to the index with our generation
-        slab.get(key).map(|val| val.set_readiness(key, |_| 2));
-
-        let key2 = t1.join().unwrap();
-        // after the remove, we must not see the value written with the
-        // stale index either.
-        assert_eq!(
-            get_val(&slab, key),
-            None,
-            "stale set must no longer be visible"
-        );
-        assert_eq!(get_val(&slab, key2), Some(0));
-    });
-}
-
-fn get_val(slab: &Arc<Slab<ScheduledIo>>, address: Address) -> Option<usize> {
-    slab.get(address).and_then(|s| s.get_readiness(address))
-}
-
-fn store_val(slab: &Arc<Slab<ScheduledIo>>, readiness: usize) -> Address {
-    let key = slab.alloc().expect("allocate slot");
-
-    if let Some(slot) = slab.get(key) {
-        slot.set_readiness(key, |_| readiness)
-            .expect("generation should still be valid!");
-    } else {
-        panic!("slab did not contain a value for {:?}", key);
-    }
-
-    key
-}
-
-fn store_when_free(slab: &Arc<Slab<ScheduledIo>>, readiness: usize) -> Address {
-    let key = loop {
-        if let Some(key) = slab.alloc() {
-            break key;
-        }
-
-        thread::yield_now();
-    };
-
-    if let Some(slot) = slab.get(key) {
-        slot.set_readiness(key, |_| readiness)
-            .expect("generation should still be valid!");
-    } else {
-        panic!("slab did not contain a value for {:?}", key);
-    }
-
-    key
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/tests/loom_stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/tests/loom_stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/tests/loom_stack.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/tests/loom_stack.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-use crate::util::slab::TransferStack;
-
-use loom::cell::UnsafeCell;
-use loom::sync::Arc;
-use loom::thread;
-
-#[test]
-fn transfer_stack() {
-    loom::model(|| {
-        let causalities = [UnsafeCell::new(None), UnsafeCell::new(None)];
-        let shared = Arc::new((causalities, TransferStack::new()));
-        let shared1 = shared.clone();
-        let shared2 = shared.clone();
-
-        // Spawn two threads that both try to push to the stack.
-        let t1 = thread::spawn(move || {
-            let (causalities, stack) = &*shared1;
-            stack.push(0, |prev| {
-                causalities[0].with_mut(|c| unsafe {
-                    *c = Some(prev);
-                });
-            });
-        });
-
-        let t2 = thread::spawn(move || {
-            let (causalities, stack) = &*shared2;
-            stack.push(1, |prev| {
-                causalities[1].with_mut(|c| unsafe {
-                    *c = Some(prev);
-                });
-            });
-        });
-
-        let (causalities, stack) = &*shared;
-
-        // Try to pop from the stack...
-        let mut idx = stack.pop_all();
-        while idx == None {
-            idx = stack.pop_all();
-            thread::yield_now();
-        }
-        let idx = idx.unwrap();
-
-        let saw_both = causalities[idx].with(|val| {
-            let val = unsafe { *val };
-            assert!(
-                val.is_some(),
-                "UnsafeCell write must happen-before index is pushed to the stack!",
-            );
-            // were there two entries in the stack? if so, check that
-            // both saw a write.
-            if let Some(c) = causalities.get(val.unwrap()) {
-                c.with(|val| {
-                    let val = unsafe { *val };
-                    assert!(
-                        val.is_some(),
-                        "UnsafeCell write must happen-before index is pushed to the stack!",
-                    );
-                });
-                true
-            } else {
-                false
-            }
-        });
-
-        // We only saw one push. Ensure that the other push happens too.
-        if !saw_both {
-            // Try to pop from the stack...
-            let mut idx = stack.pop_all();
-            while idx == None {
-                idx = stack.pop_all();
-                thread::yield_now();
-            }
-            let idx = idx.unwrap();
-
-            causalities[idx].with(|val| {
-                let val = unsafe { *val };
-                assert!(
-                    val.is_some(),
-                    "UnsafeCell write must happen-before index is pushed to the stack!",
-                );
-            });
-        }
-
-        t1.join().unwrap();
-        t2.join().unwrap();
-    });
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/tests/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/tests/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab/tests/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab/tests/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-mod loom_slab;
-mod loom_stack;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/slab.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/slab.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,841 @@
+#![cfg_attr(not(feature = "rt"), allow(dead_code))]
+
+use crate::loom::cell::UnsafeCell;
+use crate::loom::sync::atomic::{AtomicBool, AtomicUsize};
+use crate::loom::sync::{Arc, Mutex};
+use crate::util::bit;
+use std::fmt;
+use std::mem;
+use std::ops;
+use std::ptr;
+use std::sync::atomic::Ordering::Relaxed;
+
+/// Amortized allocation for homogeneous data types.
+///
+/// The slab pre-allocates chunks of memory to store values. It uses a similar
+/// growing strategy as `Vec`. When new capacity is needed, the slab grows by
+/// 2x.
+///
+/// # Pages
+///
+/// Unlike `Vec`, growing does not require moving existing elements. Instead of
+/// being a continuous chunk of memory for all elements, `Slab` is an array of
+/// arrays. The top-level array is an array of pages. Each page is 2x bigger
+/// than the previous one. When the slab grows, a new page is allocated.
+///
+/// Pages are lazily initialized.
+///
+/// # Allocating
+///
+/// When allocating an object, first previously used slots are reused. If no
+/// previously used slot is available, a new slot is initialized in an existing
+/// page. If all pages are full, then a new page is allocated.
+///
+/// When an allocated object is released, it is pushed into it's page's free
+/// list. Allocating scans all pages for a free slot.
+///
+/// # Indexing
+///
+/// The slab is able to index values using an address. Even when the indexed
+/// object has been released, it is still safe to index. This is a key ability
+/// for using the slab with the I/O driver. Addresses are registered with the
+/// OS's selector and I/O resources can be released without synchronizing with
+/// the OS.
+///
+/// # Compaction
+///
+/// `Slab::compact` will release pages that have been allocated but are no
+/// longer used. This is done by scanning the pages and finding pages with no
+/// allocated objects. These pages are then freed.
+///
+/// # Synchronization
+///
+/// The `Slab` structure is able to provide (mostly) unsynchronized reads to
+/// values stored in the slab. Insertions and removals are synchronized. Reading
+/// objects via `Ref` is fully unsynchronized. Indexing objects uses amortized
+/// synchronization.
+///
+pub(crate) struct Slab<T> {
+    /// Array of pages. Each page is synchronized.
+    pages: [Arc<Page<T>>; NUM_PAGES],
+
+    /// Caches the array pointer & number of initialized slots.
+    cached: [CachedPage<T>; NUM_PAGES],
+}
+
+/// Allocate values in the associated slab.
+pub(crate) struct Allocator<T> {
+    /// Pages in the slab. The first page has a capacity of 16 elements. Each
+    /// following page has double the capacity of the previous page.
+    ///
+    /// Each returned `Ref` holds a reference count to this `Arc`.
+    pages: [Arc<Page<T>>; NUM_PAGES],
+}
+
+/// References a slot in the slab. Indexing a slot using an `Address` is memory
+/// safe even if the slot has been released or the page has been deallocated.
+/// However, it is not guaranteed that the slot has not been reused and is now
+/// represents a different value.
+///
+/// The I/O driver uses a counter to track the slot's generation. Once accessing
+/// the slot, the generations are compared. If they match, the value matches the
+/// address.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub(crate) struct Address(usize);
+
+/// An entry in the slab.
+pub(crate) trait Entry: Default {
+    /// Reset the entry's value and track the generation.
+    fn reset(&self);
+}
+
+/// A reference to a value stored in the slab
+pub(crate) struct Ref<T> {
+    value: *const Value<T>,
+}
+
+/// Maximum number of pages a slab can contain.
+const NUM_PAGES: usize = 19;
+
+/// Minimum number of slots a page can contain.
+const PAGE_INITIAL_SIZE: usize = 32;
+const PAGE_INDEX_SHIFT: u32 = PAGE_INITIAL_SIZE.trailing_zeros() + 1;
+
+/// A page in the slab
+struct Page<T> {
+    /// Slots
+    slots: Mutex<Slots<T>>,
+
+    // Number of slots currently being used. This is not guaranteed to be up to
+    // date and should only be used as a hint.
+    used: AtomicUsize,
+
+    // Set to `true` when the page has been allocated.
+    allocated: AtomicBool,
+
+    // The number of slots the page can hold.
+    len: usize,
+
+    // Length of all previous pages combined
+    prev_len: usize,
+}
+
+struct CachedPage<T> {
+    /// Pointer to the page's slots.
+    slots: *const Slot<T>,
+
+    /// Number of initialized slots.
+    init: usize,
+}
+
+/// Page state
+struct Slots<T> {
+    /// Slots
+    slots: Vec<Slot<T>>,
+
+    head: usize,
+
+    /// Number of slots currently in use.
+    used: usize,
+}
+
+unsafe impl<T: Sync> Sync for Page<T> {}
+unsafe impl<T: Sync> Send for Page<T> {}
+unsafe impl<T: Sync> Sync for CachedPage<T> {}
+unsafe impl<T: Sync> Send for CachedPage<T> {}
+unsafe impl<T: Sync> Sync for Ref<T> {}
+unsafe impl<T: Sync> Send for Ref<T> {}
+
+/// A slot in the slab. Contains slot-specific metadata.
+///
+/// `#[repr(C)]` guarantees that the struct starts w/ `value`. We use pointer
+/// math to map a value pointer to an index in the page.
+#[repr(C)]
+struct Slot<T> {
+    /// Pointed to by `Ref`.
+    value: UnsafeCell<Value<T>>,
+
+    /// Next entry in the free list.
+    next: u32,
+}
+
+/// Value paired with a reference to the page
+struct Value<T> {
+    /// Value stored in the value
+    value: T,
+
+    /// Pointer to the page containing the slot.
+    ///
+    /// A raw pointer is used as this creates a ref cycle.
+    page: *const Page<T>,
+}
+
+impl<T> Slab<T> {
+    /// Create a new, empty, slab
+    pub(crate) fn new() -> Slab<T> {
+        // Initializing arrays is a bit annoying. Instead of manually writing
+        // out an array and every single entry, `Default::default()` is used to
+        // initialize the array, then the array is iterated and each value is
+        // initialized.
+        let mut slab = Slab {
+            pages: Default::default(),
+            cached: Default::default(),
+        };
+
+        let mut len = PAGE_INITIAL_SIZE;
+        let mut prev_len: usize = 0;
+
+        for page in &mut slab.pages {
+            let page = Arc::get_mut(page).unwrap();
+            page.len = len;
+            page.prev_len = prev_len;
+            len *= 2;
+            prev_len += page.len;
+
+            // Ensure we don't exceed the max address space.
+            debug_assert!(
+                page.len - 1 + page.prev_len < (1 << 24),
+                "max = {:b}",
+                page.len - 1 + page.prev_len
+            );
+        }
+
+        slab
+    }
+
+    /// Returns a new `Allocator`.
+    ///
+    /// The `Allocator` supports concurrent allocation of objects.
+    pub(crate) fn allocator(&self) -> Allocator<T> {
+        Allocator {
+            pages: self.pages.clone(),
+        }
+    }
+
+    /// Returns a reference to the value stored at the given address.
+    ///
+    /// `&mut self` is used as the call may update internal cached state.
+    pub(crate) fn get(&mut self, addr: Address) -> Option<&T> {
+        let page_idx = addr.page();
+        let slot_idx = self.pages[page_idx].slot(addr);
+
+        // If the address references a slot that was last seen as uninitialized,
+        // the `CachedPage` is updated. This requires acquiring the page lock
+        // and updating the slot pointer and initialized offset.
+        if self.cached[page_idx].init <= slot_idx {
+            self.cached[page_idx].refresh(&self.pages[page_idx]);
+        }
+
+        // If the address **still** references an uninitialized slot, then the
+        // address is invalid and `None` is returned.
+        if self.cached[page_idx].init <= slot_idx {
+            return None;
+        }
+
+        // Get a reference to the value. The lifetime of the returned reference
+        // is bound to `&self`. The only way to invalidate the underlying memory
+        // is to call `compact()`. The lifetimes prevent calling `compact()`
+        // while references to values are outstanding.
+        //
+        // The referenced data is never mutated. Only `&self` references are
+        // used and the data is `Sync`.
+        Some(self.cached[page_idx].get(slot_idx))
+    }
+
+    /// Calls the given function with a reference to each slot in the slab. The
+    /// slot may not be in-use.
+    ///
+    /// This is used by the I/O driver during the shutdown process to notify
+    /// each pending task.
+    pub(crate) fn for_each(&mut self, mut f: impl FnMut(&T)) {
+        for page_idx in 0..self.pages.len() {
+            // It is required to avoid holding the lock when calling the
+            // provided function. The function may attempt to acquire the lock
+            // itself. If we hold the lock here while calling `f`, a deadlock
+            // situation is possible.
+            //
+            // Instead of iterating the slots directly in `page`, which would
+            // require holding the lock, the cache is updated and the slots are
+            // iterated from the cache.
+            self.cached[page_idx].refresh(&self.pages[page_idx]);
+
+            for slot_idx in 0..self.cached[page_idx].init {
+                f(self.cached[page_idx].get(slot_idx));
+            }
+        }
+    }
+
+    // Release memory back to the allocator.
+    //
+    // If pages are empty, the underlying memory is released back to the
+    // allocator.
+    pub(crate) fn compact(&mut self) {
+        // Iterate each page except the very first one. The very first page is
+        // never freed.
+        for (idx, page) in self.pages.iter().enumerate().skip(1) {
+            if page.used.load(Relaxed) != 0 || !page.allocated.load(Relaxed) {
+                // If the page has slots in use or the memory has not been
+                // allocated then it cannot be compacted.
+                continue;
+            }
+
+            let mut slots = match page.slots.try_lock() {
+                Some(slots) => slots,
+                // If the lock cannot be acquired due to being held by another
+                // thread, don't try to compact the page.
+                _ => continue,
+            };
+
+            if slots.used > 0 || slots.slots.capacity() == 0 {
+                // The page is in use or it has not yet been allocated. Either
+                // way, there is no more work to do.
+                continue;
+            }
+
+            page.allocated.store(false, Relaxed);
+
+            // Remove the slots vector from the page. This is done so that the
+            // freeing process is done outside of the lock's critical section.
+            let vec = mem::take(&mut slots.slots);
+            slots.head = 0;
+
+            // Drop the lock so we can drop the vector outside the lock below.
+            drop(slots);
+
+            debug_assert!(
+                self.cached[idx].slots.is_null() || self.cached[idx].slots == vec.as_ptr(),
+                "cached = {:?}; actual = {:?}",
+                self.cached[idx].slots,
+                vec.as_ptr(),
+            );
+
+            // Clear cache
+            self.cached[idx].slots = ptr::null();
+            self.cached[idx].init = 0;
+
+            drop(vec);
+        }
+    }
+}
+
+impl<T> fmt::Debug for Slab<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        debug(fmt, "Slab", &self.pages[..])
+    }
+}
+
+impl<T: Entry> Allocator<T> {
+    /// Allocate a new entry and return a handle to the entry.
+    ///
+    /// Scans pages from smallest to biggest, stopping when a slot is found.
+    /// Pages are allocated if necessary.
+    ///
+    /// Returns `None` if the slab is full.
+    pub(crate) fn allocate(&self) -> Option<(Address, Ref<T>)> {
+        // Find the first available slot.
+        for page in &self.pages[..] {
+            if let Some((addr, val)) = Page::allocate(page) {
+                return Some((addr, val));
+            }
+        }
+
+        None
+    }
+}
+
+impl<T> fmt::Debug for Allocator<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        debug(fmt, "slab::Allocator", &self.pages[..])
+    }
+}
+
+impl<T> ops::Deref for Ref<T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        // Safety: `&mut` is never handed out to the underlying value. The page
+        // is not freed until all `Ref` values are dropped.
+        unsafe { &(*self.value).value }
+    }
+}
+
+impl<T> Drop for Ref<T> {
+    fn drop(&mut self) {
+        // Safety: `&mut` is never handed out to the underlying value. The page
+        // is not freed until all `Ref` values are dropped.
+        let _ = unsafe { (*self.value).release() };
+    }
+}
+
+impl<T: fmt::Debug> fmt::Debug for Ref<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(fmt)
+    }
+}
+
+impl<T: Entry> Page<T> {
+    // Allocates an object, returns the ref and address.
+    //
+    // `self: &Arc<Page<T>>` is avoided here as this would not work with the
+    // loom `Arc`.
+    fn allocate(me: &Arc<Page<T>>) -> Option<(Address, Ref<T>)> {
+        // Before acquiring the lock, use the `used` hint.
+        if me.used.load(Relaxed) == me.len {
+            return None;
+        }
+
+        // Allocating objects requires synchronization
+        let mut locked = me.slots.lock();
+
+        if locked.head < locked.slots.len() {
+            // Re-use an already initialized slot.
+            //
+            // Help out the borrow checker
+            let locked = &mut *locked;
+
+            // Get the index of the slot at the head of the free stack. This is
+            // the slot that will be reused.
+            let idx = locked.head;
+            let slot = &locked.slots[idx];
+
+            // Update the free stack head to point to the next slot.
+            locked.head = slot.next as usize;
+
+            // Increment the number of used slots
+            locked.used += 1;
+            me.used.store(locked.used, Relaxed);
+
+            // Reset the slot
+            slot.value.with(|ptr| unsafe { (*ptr).value.reset() });
+
+            // Return a reference to the slot
+            Some((me.addr(idx), slot.gen_ref(me)))
+        } else if me.len == locked.slots.len() {
+            // The page is full
+            None
+        } else {
+            // No initialized slots are available, but the page has more
+            // capacity. Initialize a new slot.
+            let idx = locked.slots.len();
+
+            if idx == 0 {
+                // The page has not yet been allocated. Allocate the storage for
+                // all page slots.
+                locked.slots.reserve_exact(me.len);
+            }
+
+            // Initialize a new slot
+            locked.slots.push(Slot {
+                value: UnsafeCell::new(Value {
+                    value: Default::default(),
+                    page: &**me as *const _,
+                }),
+                next: 0,
+            });
+
+            // Increment the head to indicate the free stack is empty
+            locked.head += 1;
+
+            // Increment the number of used slots
+            locked.used += 1;
+            me.used.store(locked.used, Relaxed);
+            me.allocated.store(true, Relaxed);
+
+            debug_assert_eq!(locked.slots.len(), locked.head);
+
+            Some((me.addr(idx), locked.slots[idx].gen_ref(me)))
+        }
+    }
+}
+
+impl<T> Page<T> {
+    /// Returns the slot index within the current page referenced by the given
+    /// address.
+    fn slot(&self, addr: Address) -> usize {
+        addr.0 - self.prev_len
+    }
+
+    /// Returns the address for the given slot
+    fn addr(&self, slot: usize) -> Address {
+        Address(slot + self.prev_len)
+    }
+}
+
+impl<T> Default for Page<T> {
+    fn default() -> Page<T> {
+        Page {
+            used: AtomicUsize::new(0),
+            allocated: AtomicBool::new(false),
+            slots: Mutex::new(Slots {
+                slots: Vec::new(),
+                head: 0,
+                used: 0,
+            }),
+            len: 0,
+            prev_len: 0,
+        }
+    }
+}
+
+impl<T> Page<T> {
+    /// Release a slot into the page's free list
+    fn release(&self, value: *const Value<T>) {
+        let mut locked = self.slots.lock();
+
+        let idx = locked.index_for(value);
+        locked.slots[idx].next = locked.head as u32;
+        locked.head = idx;
+        locked.used -= 1;
+
+        self.used.store(locked.used, Relaxed);
+    }
+}
+
+impl<T> CachedPage<T> {
+    /// Refresh the cache
+    fn refresh(&mut self, page: &Page<T>) {
+        let slots = page.slots.lock();
+
+        if !slots.slots.is_empty() {
+            self.slots = slots.slots.as_ptr();
+            self.init = slots.slots.len();
+        }
+    }
+
+    // Get a value by index
+    fn get(&self, idx: usize) -> &T {
+        assert!(idx < self.init);
+
+        // Safety: Pages are allocated concurrently, but are only ever
+        // **deallocated** by `Slab`. `Slab` will always have a more
+        // conservative view on the state of the slot array. Once `CachedPage`
+        // sees a slot pointer and initialized offset, it will remain valid
+        // until `compact()` is called. The `compact()` function also updates
+        // `CachedPage`.
+        unsafe {
+            let slot = self.slots.add(idx);
+            let value = slot as *const Value<T>;
+
+            &(*value).value
+        }
+    }
+}
+
+impl<T> Default for CachedPage<T> {
+    fn default() -> CachedPage<T> {
+        CachedPage {
+            slots: ptr::null(),
+            init: 0,
+        }
+    }
+}
+
+impl<T> Slots<T> {
+    /// Maps a slot pointer to an offset within the current page.
+    ///
+    /// The pointer math removes the `usize` index from the `Ref` struct,
+    /// shrinking the struct to a single pointer size. The contents of the
+    /// function is safe, the resulting `usize` is bounds checked before being
+    /// used.
+    ///
+    /// # Panics
+    ///
+    /// panics if the provided slot pointer is not contained by the page.
+    fn index_for(&self, slot: *const Value<T>) -> usize {
+        use std::mem;
+
+        let base = &self.slots[0] as *const _ as usize;
+
+        assert!(base != 0, "page is unallocated");
+
+        let slot = slot as usize;
+        let width = mem::size_of::<Slot<T>>();
+
+        assert!(slot >= base, "unexpected pointer");
+
+        let idx = (slot - base) / width;
+        assert!(idx < self.slots.len() as usize);
+
+        idx
+    }
+}
+
+impl<T: Entry> Slot<T> {
+    /// Generates a `Ref` for the slot. This involves bumping the page's ref count.
+    fn gen_ref(&self, page: &Arc<Page<T>>) -> Ref<T> {
+        // The ref holds a ref on the page. The `Arc` is forgotten here and is
+        // resurrected in `release` when the `Ref` is dropped. By avoiding to
+        // hold on to an explicit `Arc` value, the struct size of `Ref` is
+        // reduced.
+        mem::forget(page.clone());
+        let slot = self as *const Slot<T>;
+        let value = slot as *const Value<T>;
+
+        Ref { value }
+    }
+}
+
+impl<T> Value<T> {
+    // Release the slot, returning the `Arc<Page<T>>` logically owned by the ref.
+    fn release(&self) -> Arc<Page<T>> {
+        // Safety: called by `Ref`, which owns an `Arc<Page<T>>` instance.
+        let page = unsafe { Arc::from_raw(self.page) };
+        page.release(self as *const _);
+        page
+    }
+}
+
+impl Address {
+    fn page(self) -> usize {
+        // Since every page is twice as large as the previous page, and all page
+        // sizes are powers of two, we can determine the page index that
+        // contains a given address by shifting the address down by the smallest
+        // page size and looking at how many twos places necessary to represent
+        // that number, telling us what power of two page size it fits inside
+        // of. We can determine the number of twos places by counting the number
+        // of leading zeros (unused twos places) in the number's binary
+        // representation, and subtracting that count from the total number of
+        // bits in a word.
+        let slot_shifted = (self.0 + PAGE_INITIAL_SIZE) >> PAGE_INDEX_SHIFT;
+        (bit::pointer_width() - slot_shifted.leading_zeros()) as usize
+    }
+
+    pub(crate) const fn as_usize(self) -> usize {
+        self.0
+    }
+
+    pub(crate) fn from_usize(src: usize) -> Address {
+        Address(src)
+    }
+}
+
+fn debug<T>(fmt: &mut fmt::Formatter<'_>, name: &str, pages: &[Arc<Page<T>>]) -> fmt::Result {
+    let mut capacity = 0;
+    let mut len = 0;
+
+    for page in pages {
+        if page.allocated.load(Relaxed) {
+            capacity += page.len;
+            len += page.used.load(Relaxed);
+        }
+    }
+
+    fmt.debug_struct(name)
+        .field("len", &len)
+        .field("capacity", &capacity)
+        .finish()
+}
+
+#[cfg(all(test, not(loom)))]
+mod test {
+    use super::*;
+    use std::sync::atomic::AtomicUsize;
+    use std::sync::atomic::Ordering::SeqCst;
+
+    struct Foo {
+        cnt: AtomicUsize,
+        id: AtomicUsize,
+    }
+
+    impl Default for Foo {
+        fn default() -> Foo {
+            Foo {
+                cnt: AtomicUsize::new(0),
+                id: AtomicUsize::new(0),
+            }
+        }
+    }
+
+    impl Entry for Foo {
+        fn reset(&self) {
+            self.cnt.fetch_add(1, SeqCst);
+        }
+    }
+
+    #[test]
+    fn insert_remove() {
+        let mut slab = Slab::<Foo>::new();
+        let alloc = slab.allocator();
+
+        let (addr1, foo1) = alloc.allocate().unwrap();
+        foo1.id.store(1, SeqCst);
+        assert_eq!(0, foo1.cnt.load(SeqCst));
+
+        let (addr2, foo2) = alloc.allocate().unwrap();
+        foo2.id.store(2, SeqCst);
+        assert_eq!(0, foo2.cnt.load(SeqCst));
+
+        assert_eq!(1, slab.get(addr1).unwrap().id.load(SeqCst));
+        assert_eq!(2, slab.get(addr2).unwrap().id.load(SeqCst));
+
+        drop(foo1);
+
+        assert_eq!(1, slab.get(addr1).unwrap().id.load(SeqCst));
+
+        let (addr3, foo3) = alloc.allocate().unwrap();
+        assert_eq!(addr3, addr1);
+        assert_eq!(1, foo3.cnt.load(SeqCst));
+        foo3.id.store(3, SeqCst);
+        assert_eq!(3, slab.get(addr3).unwrap().id.load(SeqCst));
+
+        drop(foo2);
+        drop(foo3);
+
+        slab.compact();
+
+        // The first page is never released
+        assert!(slab.get(addr1).is_some());
+        assert!(slab.get(addr2).is_some());
+        assert!(slab.get(addr3).is_some());
+    }
+
+    #[test]
+    fn insert_many() {
+        let mut slab = Slab::<Foo>::new();
+        let alloc = slab.allocator();
+        let mut entries = vec![];
+
+        for i in 0..10_000 {
+            let (addr, val) = alloc.allocate().unwrap();
+            val.id.store(i, SeqCst);
+            entries.push((addr, val));
+        }
+
+        for (i, (addr, v)) in entries.iter().enumerate() {
+            assert_eq!(i, v.id.load(SeqCst));
+            assert_eq!(i, slab.get(*addr).unwrap().id.load(SeqCst));
+        }
+
+        entries.clear();
+
+        for i in 0..10_000 {
+            let (addr, val) = alloc.allocate().unwrap();
+            val.id.store(10_000 - i, SeqCst);
+            entries.push((addr, val));
+        }
+
+        for (i, (addr, v)) in entries.iter().enumerate() {
+            assert_eq!(10_000 - i, v.id.load(SeqCst));
+            assert_eq!(10_000 - i, slab.get(*addr).unwrap().id.load(SeqCst));
+        }
+    }
+
+    #[test]
+    fn insert_drop_reverse() {
+        let mut slab = Slab::<Foo>::new();
+        let alloc = slab.allocator();
+        let mut entries = vec![];
+
+        for i in 0..10_000 {
+            let (addr, val) = alloc.allocate().unwrap();
+            val.id.store(i, SeqCst);
+            entries.push((addr, val));
+        }
+
+        for _ in 0..10 {
+            // Drop 1000 in reverse
+            for _ in 0..1_000 {
+                entries.pop();
+            }
+
+            // Check remaining
+            for (i, (addr, v)) in entries.iter().enumerate() {
+                assert_eq!(i, v.id.load(SeqCst));
+                assert_eq!(i, slab.get(*addr).unwrap().id.load(SeqCst));
+            }
+        }
+    }
+
+    #[test]
+    fn no_compaction_if_page_still_in_use() {
+        let mut slab = Slab::<Foo>::new();
+        let alloc = slab.allocator();
+        let mut entries1 = vec![];
+        let mut entries2 = vec![];
+
+        for i in 0..10_000 {
+            let (addr, val) = alloc.allocate().unwrap();
+            val.id.store(i, SeqCst);
+
+            if i % 2 == 0 {
+                entries1.push((addr, val, i));
+            } else {
+                entries2.push(val);
+            }
+        }
+
+        drop(entries2);
+
+        for (addr, _, i) in &entries1 {
+            assert_eq!(*i, slab.get(*addr).unwrap().id.load(SeqCst));
+        }
+    }
+
+    #[test]
+    fn compact_all() {
+        let mut slab = Slab::<Foo>::new();
+        let alloc = slab.allocator();
+        let mut entries = vec![];
+
+        for _ in 0..2 {
+            entries.clear();
+
+            for i in 0..10_000 {
+                let (addr, val) = alloc.allocate().unwrap();
+                val.id.store(i, SeqCst);
+
+                entries.push((addr, val));
+            }
+
+            let mut addrs = vec![];
+
+            for (addr, _) in entries.drain(..) {
+                addrs.push(addr);
+            }
+
+            slab.compact();
+
+            // The first page is never freed
+            for addr in &addrs[PAGE_INITIAL_SIZE..] {
+                assert!(slab.get(*addr).is_none());
+            }
+        }
+    }
+
+    #[test]
+    fn issue_3014() {
+        let mut slab = Slab::<Foo>::new();
+        let alloc = slab.allocator();
+        let mut entries = vec![];
+
+        for _ in 0..5 {
+            entries.clear();
+
+            // Allocate a few pages + 1
+            for i in 0..(32 + 64 + 128 + 1) {
+                let (addr, val) = alloc.allocate().unwrap();
+                val.id.store(i, SeqCst);
+
+                entries.push((addr, val, i));
+            }
+
+            for (addr, val, i) in &entries {
+                assert_eq!(*i, val.id.load(SeqCst));
+                assert_eq!(*i, slab.get(*addr).unwrap().id.load(SeqCst));
+            }
+
+            // Release the last entry
+            entries.pop();
+
+            // Compact
+            slab.compact();
+
+            // Check all the addresses
+
+            for (addr, val, i) in &entries {
+                assert_eq!(*i, val.id.load(SeqCst));
+                assert_eq!(*i, slab.get(*addr).unwrap().id.load(SeqCst));
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/sync_wrapper.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/sync_wrapper.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/sync_wrapper.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/sync_wrapper.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+//! This module contains a type that can make `Send + !Sync` types `Sync` by
+//! disallowing all immutable access to the value.
+//!
+//! A similar primitive is provided in the `sync_wrapper` crate.
+
+pub(crate) struct SyncWrapper<T> {
+    value: T,
+}
+
+// safety: The SyncWrapper being send allows you to send the inner value across
+// thread boundaries.
+unsafe impl<T: Send> Send for SyncWrapper<T> {}
+
+// safety: An immutable reference to a SyncWrapper is useless, so moving such an
+// immutable reference across threads is safe.
+unsafe impl<T> Sync for SyncWrapper<T> {}
+
+impl<T> SyncWrapper<T> {
+    pub(crate) fn new(value: T) -> Self {
+        Self { value }
+    }
+
+    pub(crate) fn into_inner(self) -> T {
+        self.value
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/trace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/trace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/trace.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/trace.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,55 +1,37 @@
 cfg_trace! {
-    cfg_rt_core! {
-        use std::future::Future;
-        use std::pin::Pin;
-        use std::task::{Context, Poll};
-        use pin_project_lite::pin_project;
-
-        use tracing::Span;
-
-        pin_project! {
-            /// A future that has been instrumented with a `tracing` span.
-            #[derive(Debug, Clone)]
-            pub(crate) struct Instrumented<T> {
-                #[pin]
-                inner: T,
-                span: Span,
-            }
-        }
-
-        impl<T: Future> Future for Instrumented<T> {
-            type Output = T::Output;
-
-            fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-                let this = self.project();
-                let _enter = this.span.enter();
-                this.inner.poll(cx)
-            }
-        }
-
-        impl<T> Instrumented<T> {
-            pub(crate) fn new(inner: T, span: Span) -> Self {
-                Self { inner, span }
-            }
-        }
+    cfg_rt! {
+        pub(crate) use tracing::instrument::Instrumented;
 
         #[inline]
-        pub(crate) fn task<F>(task: F, kind: &'static str) -> Instrumented<F> {
+        #[cfg_attr(tokio_track_caller, track_caller)]
+        pub(crate) fn task<F>(task: F, kind: &'static str, name: Option<&str>) -> Instrumented<F> {
+            use tracing::instrument::Instrument;
+            #[cfg(tokio_track_caller)]
+            let location = std::panic::Location::caller();
+            #[cfg(tokio_track_caller)]
+            let span = tracing::trace_span!(
+                target: "tokio::task",
+                "runtime.spawn",
+                %kind,
+                task.name = %name.unwrap_or_default(),
+                spawn.location = %format_args!("{}:{}:{}", location.file(), location.line(), location.column()),
+            );
+            #[cfg(not(tokio_track_caller))]
             let span = tracing::trace_span!(
                 target: "tokio::task",
-                "task",
+                "runtime.spawn",
                 %kind,
-                future = %std::any::type_name::<F>(),
+                task.name = %name.unwrap_or_default(),
             );
-            Instrumented::new(task, span)
+            task.instrument(span)
         }
     }
 }
 
 cfg_not_trace! {
-    cfg_rt_core! {
+    cfg_rt! {
         #[inline]
-        pub(crate) fn task<F>(task: F, _: &'static str) -> F {
+        pub(crate) fn task<F>(task: F, _: &'static str, _name: Option<&str>) -> F {
             // nop
             task
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/vec_deque_cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/vec_deque_cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/vec_deque_cell.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/vec_deque_cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+use crate::loom::cell::UnsafeCell;
+
+use std::collections::VecDeque;
+use std::marker::PhantomData;
+
+/// This type is like VecDeque, except that it is not Sync and can be modified
+/// through immutable references.
+pub(crate) struct VecDequeCell<T> {
+    inner: UnsafeCell<VecDeque<T>>,
+    _not_sync: PhantomData<*const ()>,
+}
+
+// This is Send for the same reasons that RefCell<VecDeque<T>> is Send.
+unsafe impl<T: Send> Send for VecDequeCell<T> {}
+
+impl<T> VecDequeCell<T> {
+    pub(crate) fn with_capacity(cap: usize) -> Self {
+        Self {
+            inner: UnsafeCell::new(VecDeque::with_capacity(cap)),
+            _not_sync: PhantomData,
+        }
+    }
+
+    /// Safety: This method may not be called recursively.
+    #[inline]
+    unsafe fn with_inner<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&mut VecDeque<T>) -> R,
+    {
+        // safety: This type is not Sync, so concurrent calls of this method
+        // cannot happen. Furthermore, the caller guarantees that the method is
+        // not called recursively. Finally, this is the only place that can
+        // create mutable references to the inner VecDeque. This ensures that
+        // any mutable references created here are exclusive.
+        self.inner.with_mut(|ptr| f(&mut *ptr))
+    }
+
+    pub(crate) fn pop_front(&self) -> Option<T> {
+        unsafe { self.with_inner(VecDeque::pop_front) }
+    }
+
+    pub(crate) fn push_back(&self, item: T) {
+        unsafe {
+            self.with_inner(|inner| inner.push_back(item));
+        }
+    }
+
+    /// Replace the inner VecDeque with an empty VecDeque and return the current
+    /// contents.
+    pub(crate) fn take(&self) -> VecDeque<T> {
+        unsafe { self.with_inner(|inner| std::mem::take(inner)) }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/wake_list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/wake_list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/wake_list.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/wake_list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+use core::mem::MaybeUninit;
+use core::ptr;
+use std::task::Waker;
+
+const NUM_WAKERS: usize = 32;
+
+pub(crate) struct WakeList {
+    inner: [MaybeUninit<Waker>; NUM_WAKERS],
+    curr: usize,
+}
+
+impl WakeList {
+    pub(crate) fn new() -> Self {
+        Self {
+            inner: unsafe {
+                // safety: Create an uninitialized array of `MaybeUninit`. The
+                // `assume_init` is safe because the type we are claiming to
+                // have initialized here is a bunch of `MaybeUninit`s, which do
+                // not require initialization.
+                MaybeUninit::uninit().assume_init()
+            },
+            curr: 0,
+        }
+    }
+
+    #[inline]
+    pub(crate) fn can_push(&self) -> bool {
+        self.curr < NUM_WAKERS
+    }
+
+    pub(crate) fn push(&mut self, val: Waker) {
+        debug_assert!(self.can_push());
+
+        self.inner[self.curr] = MaybeUninit::new(val);
+        self.curr += 1;
+    }
+
+    pub(crate) fn wake_all(&mut self) {
+        assert!(self.curr <= NUM_WAKERS);
+        while self.curr > 0 {
+            self.curr -= 1;
+            let waker = unsafe { ptr::read(self.inner[self.curr].as_mut_ptr()) };
+            waker.wake();
+        }
+    }
+}
+
+impl Drop for WakeList {
+    fn drop(&mut self) {
+        let slice = ptr::slice_from_raw_parts_mut(self.inner.as_mut_ptr() as *mut Waker, self.curr);
+        unsafe { ptr::drop_in_place(slice) };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/wake.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/wake.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/src/util/wake.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/src/util/wake.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 use std::sync::Arc;
 use std::task::{RawWaker, RawWakerVTable, Waker};
 
-/// Simplfied waking interface based on Arcs
+/// Simplified waking interface based on Arcs
 pub(crate) trait Wake: Send + Sync {
     /// Wake by value
     fn wake(self: Arc<Self>);
@@ -54,11 +54,7 @@
     let arc = ManuallyDrop::new(Arc::<T>::from_raw(data as *const T));
 
     // Now increase refcount, but don't drop new refcount either
-    let arc_clone: ManuallyDrop<_> = arc.clone();
-
-    // Drop explicitly to avoid clippy warnings
-    drop(arc);
-    drop(arc_clone);
+    let _arc_clone: ManuallyDrop<_> = arc.clone();
 }
 
 unsafe fn clone_arc_raw<T: Wake>(data: *const ()) -> RawWaker {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/async_send_sync.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/async_send_sync.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/async_send_sync.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/async_send_sync.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,33 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
+#![allow(clippy::type_complexity, clippy::diverging_sub_expression)]
 
 use std::cell::Cell;
-use std::io::Cursor;
+use std::future::Future;
+use std::io::SeekFrom;
 use std::net::SocketAddr;
+use std::pin::Pin;
 use std::rc::Rc;
 use tokio::net::TcpStream;
 use tokio::time::{Duration, Instant};
 
+// The names of these structs behaves better when sorted.
+// Send: Yes, Sync: Yes
+#[derive(Clone)]
+struct YY {}
+
+// Send: Yes, Sync: No
+#[derive(Clone)]
+struct YN {
+    _value: Cell<u8>,
+}
+
+// Send: No, Sync: No
+#[derive(Clone)]
+struct NN {
+    _value: Rc<u8>,
+}
+
 #[allow(dead_code)]
 type BoxFutureSync<T> = std::pin::Pin<Box<dyn std::future::Future<Output = T> + Send + Sync>>;
 #[allow(dead_code)]
@@ -16,9 +36,18 @@
 type BoxFuture<T> = std::pin::Pin<Box<dyn std::future::Future<Output = T>>>;
 
 #[allow(dead_code)]
+type BoxAsyncRead = std::pin::Pin<Box<dyn tokio::io::AsyncBufRead + Send + Sync>>;
+#[allow(dead_code)]
+type BoxAsyncSeek = std::pin::Pin<Box<dyn tokio::io::AsyncSeek + Send + Sync>>;
+#[allow(dead_code)]
+type BoxAsyncWrite = std::pin::Pin<Box<dyn tokio::io::AsyncWrite + Send + Sync>>;
+
+#[allow(dead_code)]
 fn require_send<T: Send>(_t: &T) {}
 #[allow(dead_code)]
 fn require_sync<T: Sync>(_t: &T) {}
+#[allow(dead_code)]
+fn require_unpin<T: Unpin>(_t: &T) {}
 
 #[allow(dead_code)]
 struct Invalid;
@@ -35,230 +64,606 @@
 impl<T: ?Sized> AmbiguousIfSync<()> for T {}
 impl<T: ?Sized + Sync> AmbiguousIfSync<Invalid> for T {}
 
+trait AmbiguousIfUnpin<A> {
+    fn some_item(&self) {}
+}
+impl<T: ?Sized> AmbiguousIfUnpin<()> for T {}
+impl<T: ?Sized + Unpin> AmbiguousIfUnpin<Invalid> for T {}
+
 macro_rules! into_todo {
     ($typ:ty) => {{
         let x: $typ = todo!();
         x
     }};
 }
-macro_rules! assert_value {
-    ($type:ty: Send & Sync) => {
-        #[allow(unreachable_code)]
-        #[allow(unused_variables)]
-        const _: fn() = || {
-            let f: $type = todo!();
-            require_send(&f);
-            require_sync(&f);
-        };
+
+macro_rules! async_assert_fn_send {
+    (Send & $(!)?Sync & $(!)?Unpin, $value:expr) => {
+        require_send(&$value);
     };
-    ($type:ty: !Send & Sync) => {
-        #[allow(unreachable_code)]
-        #[allow(unused_variables)]
-        const _: fn() = || {
-            let f: $type = todo!();
-            AmbiguousIfSend::some_item(&f);
-            require_sync(&f);
-        };
+    (!Send & $(!)?Sync & $(!)?Unpin, $value:expr) => {
+        AmbiguousIfSend::some_item(&$value);
     };
-    ($type:ty: Send & !Sync) => {
-        #[allow(unreachable_code)]
-        #[allow(unused_variables)]
-        const _: fn() = || {
-            let f: $type = todo!();
-            require_send(&f);
-            AmbiguousIfSync::some_item(&f);
-        };
+}
+macro_rules! async_assert_fn_sync {
+    ($(!)?Send & Sync & $(!)?Unpin, $value:expr) => {
+        require_sync(&$value);
     };
-    ($type:ty: !Send & !Sync) => {
-        #[allow(unreachable_code)]
-        #[allow(unused_variables)]
-        const _: fn() = || {
-            let f: $type = todo!();
-            AmbiguousIfSend::some_item(&f);
-            AmbiguousIfSync::some_item(&f);
-        };
+    ($(!)?Send & !Sync & $(!)?Unpin, $value:expr) => {
+        AmbiguousIfSync::some_item(&$value);
     };
 }
-macro_rules! async_assert_fn {
-    ($($f:ident $(< $($generic:ty),* > )? )::+($($arg:ty),*): Send & Sync) => {
-        #[allow(unreachable_code)]
-        #[allow(unused_variables)]
-        const _: fn() = || {
-            let f = $($f $(::<$($generic),*>)? )::+( $( into_todo!($arg) ),* );
-            require_send(&f);
-            require_sync(&f);
-        };
+macro_rules! async_assert_fn_unpin {
+    ($(!)?Send & $(!)?Sync & Unpin, $value:expr) => {
+        require_unpin(&$value);
     };
-    ($($f:ident $(< $($generic:ty),* > )? )::+($($arg:ty),*): Send & !Sync) => {
-        #[allow(unreachable_code)]
-        #[allow(unused_variables)]
-        const _: fn() = || {
-            let f = $($f $(::<$($generic),*>)? )::+( $( into_todo!($arg) ),* );
-            require_send(&f);
-            AmbiguousIfSync::some_item(&f);
-        };
+    ($(!)?Send & $(!)?Sync & !Unpin, $value:expr) => {
+        AmbiguousIfUnpin::some_item(&$value);
     };
-    ($($f:ident $(< $($generic:ty),* > )? )::+($($arg:ty),*): !Send & Sync) => {
+}
+
+macro_rules! async_assert_fn {
+    ($($f:ident $(< $($generic:ty),* > )? )::+($($arg:ty),*): $($tok:tt)*) => {
         #[allow(unreachable_code)]
         #[allow(unused_variables)]
         const _: fn() = || {
             let f = $($f $(::<$($generic),*>)? )::+( $( into_todo!($arg) ),* );
-            AmbiguousIfSend::some_item(&f);
-            require_sync(&f);
+            async_assert_fn_send!($($tok)*, f);
+            async_assert_fn_sync!($($tok)*, f);
+            async_assert_fn_unpin!($($tok)*, f);
         };
     };
-    ($($f:ident $(< $($generic:ty),* > )? )::+($($arg:ty),*): !Send & !Sync) => {
+}
+macro_rules! assert_value {
+    ($type:ty: $($tok:tt)*) => {
         #[allow(unreachable_code)]
         #[allow(unused_variables)]
         const _: fn() = || {
-            let f = $($f $(::<$($generic),*>)? )::+( $( into_todo!($arg) ),* );
-            AmbiguousIfSend::some_item(&f);
-            AmbiguousIfSync::some_item(&f);
+            let f: $type = todo!();
+            async_assert_fn_send!($($tok)*, f);
+            async_assert_fn_sync!($($tok)*, f);
+            async_assert_fn_unpin!($($tok)*, f);
         };
     };
 }
 
-async_assert_fn!(tokio::io::copy(&mut TcpStream, &mut TcpStream): Send & Sync);
-async_assert_fn!(tokio::io::empty(): Send & Sync);
-async_assert_fn!(tokio::io::repeat(u8): Send & Sync);
-async_assert_fn!(tokio::io::sink(): Send & Sync);
-async_assert_fn!(tokio::io::split(TcpStream): Send & Sync);
-async_assert_fn!(tokio::io::stderr(): Send & Sync);
-async_assert_fn!(tokio::io::stdin(): Send & Sync);
-async_assert_fn!(tokio::io::stdout(): Send & Sync);
-async_assert_fn!(tokio::io::Split<Cursor<Vec<u8>>>::next_segment(_): Send & Sync);
-
-async_assert_fn!(tokio::fs::canonicalize(&str): Send & Sync);
-async_assert_fn!(tokio::fs::copy(&str, &str): Send & Sync);
-async_assert_fn!(tokio::fs::create_dir(&str): Send & Sync);
-async_assert_fn!(tokio::fs::create_dir_all(&str): Send & Sync);
-async_assert_fn!(tokio::fs::hard_link(&str, &str): Send & Sync);
-async_assert_fn!(tokio::fs::metadata(&str): Send & Sync);
-async_assert_fn!(tokio::fs::read(&str): Send & Sync);
-async_assert_fn!(tokio::fs::read_dir(&str): Send & Sync);
-async_assert_fn!(tokio::fs::read_link(&str): Send & Sync);
-async_assert_fn!(tokio::fs::read_to_string(&str): Send & Sync);
-async_assert_fn!(tokio::fs::remove_dir(&str): Send & Sync);
-async_assert_fn!(tokio::fs::remove_dir_all(&str): Send & Sync);
-async_assert_fn!(tokio::fs::remove_file(&str): Send & Sync);
-async_assert_fn!(tokio::fs::rename(&str, &str): Send & Sync);
-async_assert_fn!(tokio::fs::set_permissions(&str, std::fs::Permissions): Send & Sync);
-async_assert_fn!(tokio::fs::symlink_metadata(&str): Send & Sync);
-async_assert_fn!(tokio::fs::write(&str, Vec<u8>): Send & Sync);
-async_assert_fn!(tokio::fs::ReadDir::next_entry(_): Send & Sync);
-async_assert_fn!(tokio::fs::OpenOptions::open(_, &str): Send & Sync);
-async_assert_fn!(tokio::fs::DirEntry::metadata(_): Send & Sync);
-async_assert_fn!(tokio::fs::DirEntry::file_type(_): Send & Sync);
-
-async_assert_fn!(tokio::fs::File::open(&str): Send & Sync);
-async_assert_fn!(tokio::fs::File::create(&str): Send & Sync);
-async_assert_fn!(tokio::fs::File::seek(_, std::io::SeekFrom): Send & Sync);
-async_assert_fn!(tokio::fs::File::sync_all(_): Send & Sync);
-async_assert_fn!(tokio::fs::File::sync_data(_): Send & Sync);
-async_assert_fn!(tokio::fs::File::set_len(_, u64): Send & Sync);
-async_assert_fn!(tokio::fs::File::metadata(_): Send & Sync);
-async_assert_fn!(tokio::fs::File::try_clone(_): Send & Sync);
-async_assert_fn!(tokio::fs::File::into_std(_): Send & Sync);
-async_assert_fn!(tokio::fs::File::set_permissions(_, std::fs::Permissions): Send & Sync);
-
-async_assert_fn!(tokio::net::lookup_host(SocketAddr): Send & Sync);
-async_assert_fn!(tokio::net::TcpListener::bind(SocketAddr): Send & Sync);
-async_assert_fn!(tokio::net::TcpListener::accept(_): Send & Sync);
-async_assert_fn!(tokio::net::TcpStream::connect(SocketAddr): Send & Sync);
-async_assert_fn!(tokio::net::TcpStream::peek(_, &mut [u8]): Send & Sync);
-async_assert_fn!(tokio::net::tcp::ReadHalf::peek(_, &mut [u8]): Send & Sync);
-async_assert_fn!(tokio::net::UdpSocket::bind(SocketAddr): Send & Sync);
-async_assert_fn!(tokio::net::UdpSocket::connect(_, SocketAddr): Send & Sync);
-async_assert_fn!(tokio::net::UdpSocket::send(_, &[u8]): Send & Sync);
-async_assert_fn!(tokio::net::UdpSocket::recv(_, &mut [u8]): Send & Sync);
-async_assert_fn!(tokio::net::UdpSocket::send_to(_, &[u8], SocketAddr): Send & Sync);
-async_assert_fn!(tokio::net::UdpSocket::recv_from(_, &mut [u8]): Send & Sync);
-async_assert_fn!(tokio::net::udp::RecvHalf::recv(_, &mut [u8]): Send & Sync);
-async_assert_fn!(tokio::net::udp::RecvHalf::recv_from(_, &mut [u8]): Send & Sync);
-async_assert_fn!(tokio::net::udp::SendHalf::send(_, &[u8]): Send & Sync);
-async_assert_fn!(tokio::net::udp::SendHalf::send_to(_, &[u8], &SocketAddr): Send & Sync);
+assert_value!(tokio::fs::DirBuilder: Send & Sync & Unpin);
+assert_value!(tokio::fs::DirEntry: Send & Sync & Unpin);
+assert_value!(tokio::fs::File: Send & Sync & Unpin);
+assert_value!(tokio::fs::OpenOptions: Send & Sync & Unpin);
+assert_value!(tokio::fs::ReadDir: Send & Sync & Unpin);
+
+async_assert_fn!(tokio::fs::canonicalize(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::copy(&str, &str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::create_dir(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::create_dir_all(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::hard_link(&str, &str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::metadata(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::read(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::read_dir(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::read_link(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::read_to_string(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::remove_dir(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::remove_dir_all(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::remove_file(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::rename(&str, &str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::set_permissions(&str, std::fs::Permissions): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::symlink_metadata(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::write(&str, Vec<u8>): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::ReadDir::next_entry(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::OpenOptions::open(_, &str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::DirBuilder::create(_, &str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::DirEntry::metadata(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::DirEntry::file_type(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::open(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::create(&str): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::sync_all(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::sync_data(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::set_len(_, u64): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::metadata(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::try_clone(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::into_std(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::fs::File::set_permissions(_, std::fs::Permissions): Send & Sync & !Unpin);
+
+assert_value!(tokio::net::TcpListener: Send & Sync & Unpin);
+assert_value!(tokio::net::TcpSocket: Send & Sync & Unpin);
+assert_value!(tokio::net::TcpStream: Send & Sync & Unpin);
+assert_value!(tokio::net::UdpSocket: Send & Sync & Unpin);
+assert_value!(tokio::net::tcp::OwnedReadHalf: Send & Sync & Unpin);
+assert_value!(tokio::net::tcp::OwnedWriteHalf: Send & Sync & Unpin);
+assert_value!(tokio::net::tcp::ReadHalf<'_>: Send & Sync & Unpin);
+assert_value!(tokio::net::tcp::ReuniteError: Send & Sync & Unpin);
+assert_value!(tokio::net::tcp::WriteHalf<'_>: Send & Sync & Unpin);
+async_assert_fn!(tokio::net::TcpListener::accept(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::TcpListener::bind(SocketAddr): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::TcpStream::connect(SocketAddr): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::TcpStream::peek(_, &mut [u8]): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::TcpStream::readable(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::TcpStream::ready(_, tokio::io::Interest): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::TcpStream::writable(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::bind(SocketAddr): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::connect(_, SocketAddr): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::peek_from(_, &mut [u8]): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::readable(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::ready(_, tokio::io::Interest): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::recv(_, &mut [u8]): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::recv_from(_, &mut [u8]): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::send(_, &[u8]): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::send_to(_, &[u8], SocketAddr): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::UdpSocket::writable(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::lookup_host(SocketAddr): Send & Sync & !Unpin);
+async_assert_fn!(tokio::net::tcp::ReadHalf::peek(_, &mut [u8]): Send & Sync & !Unpin);
 
 #[cfg(unix)]
 mod unix_datagram {
     use super::*;
-    async_assert_fn!(tokio::net::UnixListener::bind(&str): Send & Sync);
-    async_assert_fn!(tokio::net::UnixListener::accept(_): Send & Sync);
-    async_assert_fn!(tokio::net::UnixDatagram::send(_, &[u8]): Send & Sync);
-    async_assert_fn!(tokio::net::UnixDatagram::recv(_, &mut [u8]): Send & Sync);
-    async_assert_fn!(tokio::net::UnixDatagram::send_to(_, &[u8], &str): Send & Sync);
-    async_assert_fn!(tokio::net::UnixDatagram::recv_from(_, &mut [u8]): Send & Sync);
-    async_assert_fn!(tokio::net::UnixStream::connect(&str): Send & Sync);
+    use tokio::net::*;
+    assert_value!(UnixDatagram: Send & Sync & Unpin);
+    assert_value!(UnixListener: Send & Sync & Unpin);
+    assert_value!(UnixStream: Send & Sync & Unpin);
+    assert_value!(unix::OwnedReadHalf: Send & Sync & Unpin);
+    assert_value!(unix::OwnedWriteHalf: Send & Sync & Unpin);
+    assert_value!(unix::ReadHalf<'_>: Send & Sync & Unpin);
+    assert_value!(unix::ReuniteError: Send & Sync & Unpin);
+    assert_value!(unix::SocketAddr: Send & Sync & Unpin);
+    assert_value!(unix::UCred: Send & Sync & Unpin);
+    assert_value!(unix::WriteHalf<'_>: Send & Sync & Unpin);
+    async_assert_fn!(UnixDatagram::readable(_): Send & Sync & !Unpin);
+    async_assert_fn!(UnixDatagram::ready(_, tokio::io::Interest): Send & Sync & !Unpin);
+    async_assert_fn!(UnixDatagram::recv(_, &mut [u8]): Send & Sync & !Unpin);
+    async_assert_fn!(UnixDatagram::recv_from(_, &mut [u8]): Send & Sync & !Unpin);
+    async_assert_fn!(UnixDatagram::send(_, &[u8]): Send & Sync & !Unpin);
+    async_assert_fn!(UnixDatagram::send_to(_, &[u8], &str): Send & Sync & !Unpin);
+    async_assert_fn!(UnixDatagram::writable(_): Send & Sync & !Unpin);
+    async_assert_fn!(UnixListener::accept(_): Send & Sync & !Unpin);
+    async_assert_fn!(UnixStream::connect(&str): Send & Sync & !Unpin);
+    async_assert_fn!(UnixStream::readable(_): Send & Sync & !Unpin);
+    async_assert_fn!(UnixStream::ready(_, tokio::io::Interest): Send & Sync & !Unpin);
+    async_assert_fn!(UnixStream::writable(_): Send & Sync & !Unpin);
 }
 
-async_assert_fn!(tokio::process::Child::wait_with_output(_): Send & Sync);
-async_assert_fn!(tokio::signal::ctrl_c(): Send & Sync);
+#[cfg(windows)]
+mod windows_named_pipe {
+    use super::*;
+    use tokio::net::windows::named_pipe::*;
+    assert_value!(ClientOptions: Send & Sync & Unpin);
+    assert_value!(NamedPipeClient: Send & Sync & Unpin);
+    assert_value!(NamedPipeServer: Send & Sync & Unpin);
+    assert_value!(PipeEnd: Send & Sync & Unpin);
+    assert_value!(PipeInfo: Send & Sync & Unpin);
+    assert_value!(PipeMode: Send & Sync & Unpin);
+    assert_value!(ServerOptions: Send & Sync & Unpin);
+    async_assert_fn!(NamedPipeClient::readable(_): Send & Sync & !Unpin);
+    async_assert_fn!(NamedPipeClient::ready(_, tokio::io::Interest): Send & Sync & !Unpin);
+    async_assert_fn!(NamedPipeClient::writable(_): Send & Sync & !Unpin);
+    async_assert_fn!(NamedPipeServer::connect(_): Send & Sync & !Unpin);
+    async_assert_fn!(NamedPipeServer::readable(_): Send & Sync & !Unpin);
+    async_assert_fn!(NamedPipeServer::ready(_, tokio::io::Interest): Send & Sync & !Unpin);
+    async_assert_fn!(NamedPipeServer::writable(_): Send & Sync & !Unpin);
+}
+
+assert_value!(tokio::process::Child: Send & Sync & Unpin);
+assert_value!(tokio::process::ChildStderr: Send & Sync & Unpin);
+assert_value!(tokio::process::ChildStdin: Send & Sync & Unpin);
+assert_value!(tokio::process::ChildStdout: Send & Sync & Unpin);
+assert_value!(tokio::process::Command: Send & Sync & Unpin);
+async_assert_fn!(tokio::process::Child::kill(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::process::Child::wait(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::process::Child::wait_with_output(_): Send & Sync & !Unpin);
+
+async_assert_fn!(tokio::signal::ctrl_c(): Send & Sync & !Unpin);
 #[cfg(unix)]
-async_assert_fn!(tokio::signal::unix::Signal::recv(_): Send & Sync);
+mod unix_signal {
+    use super::*;
+    assert_value!(tokio::signal::unix::Signal: Send & Sync & Unpin);
+    assert_value!(tokio::signal::unix::SignalKind: Send & Sync & Unpin);
+    async_assert_fn!(tokio::signal::unix::Signal::recv(_): Send & Sync & !Unpin);
+}
+#[cfg(windows)]
+mod windows_signal {
+    use super::*;
+    assert_value!(tokio::signal::windows::CtrlC: Send & Sync & Unpin);
+    assert_value!(tokio::signal::windows::CtrlBreak: Send & Sync & Unpin);
+    async_assert_fn!(tokio::signal::windows::CtrlC::recv(_): Send & Sync & !Unpin);
+    async_assert_fn!(tokio::signal::windows::CtrlBreak::recv(_): Send & Sync & !Unpin);
+}
 
-async_assert_fn!(tokio::stream::empty<Rc<u8>>(): Send & Sync);
-async_assert_fn!(tokio::stream::pending<Rc<u8>>(): Send & Sync);
-async_assert_fn!(tokio::stream::iter(std::vec::IntoIter<u8>): Send & Sync);
-
-async_assert_fn!(tokio::sync::Barrier::wait(_): Send & Sync);
-async_assert_fn!(tokio::sync::Mutex<u8>::lock(_): Send & Sync);
-async_assert_fn!(tokio::sync::Mutex<Cell<u8>>::lock(_): Send & Sync);
-async_assert_fn!(tokio::sync::Mutex<Rc<u8>>::lock(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::Mutex<u8>::lock_owned(_): Send & Sync);
-async_assert_fn!(tokio::sync::Mutex<Cell<u8>>::lock_owned(_): Send & Sync);
-async_assert_fn!(tokio::sync::Mutex<Rc<u8>>::lock_owned(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::Notify::notified(_): Send & !Sync);
-async_assert_fn!(tokio::sync::RwLock<u8>::read(_): Send & Sync);
-async_assert_fn!(tokio::sync::RwLock<u8>::write(_): Send & Sync);
-async_assert_fn!(tokio::sync::RwLock<Cell<u8>>::read(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::RwLock<Cell<u8>>::write(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::RwLock<Rc<u8>>::read(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::RwLock<Rc<u8>>::write(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::Semaphore::acquire(_): Send & Sync);
-
-async_assert_fn!(tokio::sync::broadcast::Receiver<u8>::recv(_): Send & Sync);
-async_assert_fn!(tokio::sync::broadcast::Receiver<Cell<u8>>::recv(_): Send & Sync);
-async_assert_fn!(tokio::sync::broadcast::Receiver<Rc<u8>>::recv(_): !Send & !Sync);
-
-async_assert_fn!(tokio::sync::mpsc::Receiver<u8>::recv(_): Send & Sync);
-async_assert_fn!(tokio::sync::mpsc::Receiver<Cell<u8>>::recv(_): Send & Sync);
-async_assert_fn!(tokio::sync::mpsc::Receiver<Rc<u8>>::recv(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::mpsc::Sender<u8>::send(_, u8): Send & Sync);
-async_assert_fn!(tokio::sync::mpsc::Sender<Cell<u8>>::send(_, Cell<u8>): Send & !Sync);
-async_assert_fn!(tokio::sync::mpsc::Sender<Rc<u8>>::send(_, Rc<u8>): !Send & !Sync);
-
-async_assert_fn!(tokio::sync::mpsc::UnboundedReceiver<u8>::recv(_): Send & Sync);
-async_assert_fn!(tokio::sync::mpsc::UnboundedReceiver<Cell<u8>>::recv(_): Send & Sync);
-async_assert_fn!(tokio::sync::mpsc::UnboundedReceiver<Rc<u8>>::recv(_): !Send & !Sync);
-
-async_assert_fn!(tokio::sync::watch::Receiver<u8>::recv(_): Send & Sync);
-async_assert_fn!(tokio::sync::watch::Receiver<Cell<u8>>::recv(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::watch::Receiver<Rc<u8>>::recv(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::watch::Sender<u8>::closed(_): Send & Sync);
-async_assert_fn!(tokio::sync::watch::Sender<Cell<u8>>::closed(_): !Send & !Sync);
-async_assert_fn!(tokio::sync::watch::Sender<Rc<u8>>::closed(_): !Send & !Sync);
-
-async_assert_fn!(tokio::task::LocalKey<u32>::scope(_, u32, BoxFutureSync<()>): Send & Sync);
-async_assert_fn!(tokio::task::LocalKey<u32>::scope(_, u32, BoxFutureSend<()>): Send & !Sync);
-async_assert_fn!(tokio::task::LocalKey<u32>::scope(_, u32, BoxFuture<()>): !Send & !Sync);
-async_assert_fn!(tokio::task::LocalKey<Cell<u32>>::scope(_, Cell<u32>, BoxFutureSync<()>): Send & !Sync);
-async_assert_fn!(tokio::task::LocalKey<Cell<u32>>::scope(_, Cell<u32>, BoxFutureSend<()>): Send & !Sync);
-async_assert_fn!(tokio::task::LocalKey<Cell<u32>>::scope(_, Cell<u32>, BoxFuture<()>): !Send & !Sync);
-async_assert_fn!(tokio::task::LocalKey<Rc<u32>>::scope(_, Rc<u32>, BoxFutureSync<()>): !Send & !Sync);
-async_assert_fn!(tokio::task::LocalKey<Rc<u32>>::scope(_, Rc<u32>, BoxFutureSend<()>): !Send & !Sync);
-async_assert_fn!(tokio::task::LocalKey<Rc<u32>>::scope(_, Rc<u32>, BoxFuture<()>): !Send & !Sync);
-async_assert_fn!(tokio::task::LocalSet::run_until(_, BoxFutureSync<()>): !Send & !Sync);
-assert_value!(tokio::task::LocalSet: !Send & !Sync);
-
-async_assert_fn!(tokio::time::advance(Duration): Send & Sync);
-async_assert_fn!(tokio::time::delay_for(Duration): Send & Sync);
-async_assert_fn!(tokio::time::delay_until(Instant): Send & Sync);
-async_assert_fn!(tokio::time::timeout(Duration, BoxFutureSync<()>): Send & Sync);
-async_assert_fn!(tokio::time::timeout(Duration, BoxFutureSend<()>): Send & !Sync);
-async_assert_fn!(tokio::time::timeout(Duration, BoxFuture<()>): !Send & !Sync);
-async_assert_fn!(tokio::time::timeout_at(Instant, BoxFutureSync<()>): Send & Sync);
-async_assert_fn!(tokio::time::timeout_at(Instant, BoxFutureSend<()>): Send & !Sync);
-async_assert_fn!(tokio::time::timeout_at(Instant, BoxFuture<()>): !Send & !Sync);
-async_assert_fn!(tokio::time::Interval::tick(_): Send & Sync);
+assert_value!(tokio::sync::AcquireError: Send & Sync & Unpin);
+assert_value!(tokio::sync::Barrier: Send & Sync & Unpin);
+assert_value!(tokio::sync::BarrierWaitResult: Send & Sync & Unpin);
+assert_value!(tokio::sync::MappedMutexGuard<'_, NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::MappedMutexGuard<'_, YN>: Send & !Sync & Unpin);
+assert_value!(tokio::sync::MappedMutexGuard<'_, YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::Mutex<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::Mutex<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::Mutex<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::MutexGuard<'_, NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::MutexGuard<'_, YN>: Send & !Sync & Unpin);
+assert_value!(tokio::sync::MutexGuard<'_, YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::Notify: Send & Sync & Unpin);
+assert_value!(tokio::sync::OnceCell<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::OnceCell<YN>: Send & !Sync & Unpin);
+assert_value!(tokio::sync::OnceCell<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::OwnedMutexGuard<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::OwnedMutexGuard<YN>: Send & !Sync & Unpin);
+assert_value!(tokio::sync::OwnedMutexGuard<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockMappedWriteGuard<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockMappedWriteGuard<YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockMappedWriteGuard<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockReadGuard<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockReadGuard<YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockReadGuard<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockWriteGuard<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockWriteGuard<YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::OwnedRwLockWriteGuard<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::OwnedSemaphorePermit: Send & Sync & Unpin);
+assert_value!(tokio::sync::RwLock<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::RwLock<YN>: Send & !Sync & Unpin);
+assert_value!(tokio::sync::RwLock<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::RwLockMappedWriteGuard<'_, NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::RwLockMappedWriteGuard<'_, YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::RwLockMappedWriteGuard<'_, YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::RwLockReadGuard<'_, NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::RwLockReadGuard<'_, YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::RwLockReadGuard<'_, YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::RwLockWriteGuard<'_, NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::RwLockWriteGuard<'_, YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::RwLockWriteGuard<'_, YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::Semaphore: Send & Sync & Unpin);
+assert_value!(tokio::sync::SemaphorePermit<'_>: Send & Sync & Unpin);
+assert_value!(tokio::sync::TryAcquireError: Send & Sync & Unpin);
+assert_value!(tokio::sync::TryLockError: Send & Sync & Unpin);
+assert_value!(tokio::sync::broadcast::Receiver<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::broadcast::Receiver<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::broadcast::Receiver<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::broadcast::Sender<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::broadcast::Sender<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::broadcast::Sender<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::futures::Notified<'_>: Send & Sync & !Unpin);
+assert_value!(tokio::sync::mpsc::OwnedPermit<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::OwnedPermit<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::OwnedPermit<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Permit<'_, NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Permit<'_, YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Permit<'_, YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Receiver<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Receiver<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Receiver<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Sender<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Sender<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::Sender<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::UnboundedReceiver<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::UnboundedReceiver<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::UnboundedReceiver<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::UnboundedSender<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::UnboundedSender<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::UnboundedSender<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::SendError<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::SendError<YN>: Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::SendError<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::SendTimeoutError<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::SendTimeoutError<YN>: Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::SendTimeoutError<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::TrySendError<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::TrySendError<YN>: Send & !Sync & Unpin);
+assert_value!(tokio::sync::mpsc::error::TrySendError<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::oneshot::Receiver<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::oneshot::Receiver<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::oneshot::Receiver<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::oneshot::Sender<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::oneshot::Sender<YN>: Send & Sync & Unpin);
+assert_value!(tokio::sync::oneshot::Sender<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::watch::Receiver<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::watch::Receiver<YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::watch::Receiver<YY>: Send & Sync & Unpin);
+assert_value!(tokio::sync::watch::Ref<'_, NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::watch::Ref<'_, YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::watch::Ref<'_, YY>: !Send & Sync & Unpin);
+assert_value!(tokio::sync::watch::Sender<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::watch::Sender<YN>: !Send & !Sync & Unpin);
+assert_value!(tokio::sync::watch::Sender<YY>: Send & Sync & Unpin);
+async_assert_fn!(tokio::sync::Barrier::wait(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Mutex<NN>::lock(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::Mutex<NN>::lock_owned(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::Mutex<YN>::lock(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Mutex<YN>::lock_owned(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Mutex<YY>::lock(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Mutex<YY>::lock_owned(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Notify::notified(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<NN>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = NN> + Send + Sync>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<NN>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = NN> + Send>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<NN>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = NN>>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<NN>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<NN>> + Send + Sync>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<NN>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<NN>> + Send>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<NN>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<NN>>>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YN>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = YN> + Send + Sync>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YN>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = YN> + Send>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YN>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = YN>>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YN>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<YN>> + Send + Sync>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YN>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<YN>> + Send>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YN>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<YN>>>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YY>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = YY> + Send + Sync>>): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YY>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = YY> + Send>>): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YY>::get_or_init( _, fn() -> Pin<Box<dyn Future<Output = YY>>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YY>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<YY>> + Send + Sync>>): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YY>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<YY>> + Send>>): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::OnceCell<YY>::get_or_try_init( _, fn() -> Pin<Box<dyn Future<Output = std::io::Result<YY>>>>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::RwLock<NN>::read(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::RwLock<NN>::write(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::RwLock<YN>::read(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::RwLock<YN>::write(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::RwLock<YY>::read(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::RwLock<YY>::write(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Semaphore::acquire(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Semaphore::acquire_many(_, u32): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Semaphore::acquire_many_owned(_, u32): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::Semaphore::acquire_owned(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::broadcast::Receiver<NN>::recv(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::broadcast::Receiver<YN>::recv(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::broadcast::Receiver<YY>::recv(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Receiver<NN>::recv(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Receiver<YN>::recv(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Receiver<YY>::recv(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<NN>::closed(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<NN>::reserve(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<NN>::reserve_owned(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<NN>::send(_, NN): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<NN>::send_timeout(_, NN, Duration): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YN>::closed(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YN>::reserve(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YN>::reserve_owned(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YN>::send(_, YN): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YN>::send_timeout(_, YN, Duration): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YY>::closed(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YY>::reserve(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YY>::reserve_owned(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YY>::send(_, YY): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::Sender<YY>::send_timeout(_, YY, Duration): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::UnboundedReceiver<NN>::recv(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::UnboundedReceiver<YN>::recv(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::UnboundedReceiver<YY>::recv(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::UnboundedSender<NN>::closed(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::UnboundedSender<YN>::closed(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::mpsc::UnboundedSender<YY>::closed(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::oneshot::Sender<NN>::closed(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::oneshot::Sender<YN>::closed(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::oneshot::Sender<YY>::closed(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::watch::Receiver<NN>::changed(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::watch::Receiver<YN>::changed(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::watch::Receiver<YY>::changed(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::sync::watch::Sender<NN>::closed(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::watch::Sender<YN>::closed(_): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::sync::watch::Sender<YY>::closed(_): Send & Sync & !Unpin);
+
+async_assert_fn!(tokio::task::LocalKey<u32>::scope(_, u32, BoxFutureSync<()>): Send & Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalKey<u32>::scope(_, u32, BoxFutureSend<()>): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalKey<u32>::scope(_, u32, BoxFuture<()>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalKey<Cell<u32>>::scope(_, Cell<u32>, BoxFutureSync<()>): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalKey<Cell<u32>>::scope(_, Cell<u32>, BoxFutureSend<()>): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalKey<Cell<u32>>::scope(_, Cell<u32>, BoxFuture<()>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalKey<Rc<u32>>::scope(_, Rc<u32>, BoxFutureSync<()>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalKey<Rc<u32>>::scope(_, Rc<u32>, BoxFutureSend<()>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalKey<Rc<u32>>::scope(_, Rc<u32>, BoxFuture<()>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::LocalSet::run_until(_, BoxFutureSync<()>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::task::unconstrained(BoxFuture<()>): !Send & !Sync & Unpin);
+async_assert_fn!(tokio::task::unconstrained(BoxFutureSend<()>): Send & !Sync & Unpin);
+async_assert_fn!(tokio::task::unconstrained(BoxFutureSync<()>): Send & Sync & Unpin);
+assert_value!(tokio::task::LocalSet: !Send & !Sync & Unpin);
+assert_value!(tokio::task::JoinHandle<YY>: Send & Sync & Unpin);
+assert_value!(tokio::task::JoinHandle<YN>: Send & Sync & Unpin);
+assert_value!(tokio::task::JoinHandle<NN>: !Send & !Sync & Unpin);
+assert_value!(tokio::task::JoinError: Send & Sync & Unpin);
+
+assert_value!(tokio::runtime::Builder: Send & Sync & Unpin);
+assert_value!(tokio::runtime::EnterGuard<'_>: Send & Sync & Unpin);
+assert_value!(tokio::runtime::Handle: Send & Sync & Unpin);
+assert_value!(tokio::runtime::Runtime: Send & Sync & Unpin);
+
+assert_value!(tokio::time::Interval: Send & Sync & Unpin);
+assert_value!(tokio::time::Instant: Send & Sync & Unpin);
+assert_value!(tokio::time::Sleep: Send & Sync & !Unpin);
+assert_value!(tokio::time::Timeout<BoxFutureSync<()>>: Send & Sync & !Unpin);
+assert_value!(tokio::time::Timeout<BoxFutureSend<()>>: Send & !Sync & !Unpin);
+assert_value!(tokio::time::Timeout<BoxFuture<()>>: !Send & !Sync & !Unpin);
+assert_value!(tokio::time::error::Elapsed: Send & Sync & Unpin);
+assert_value!(tokio::time::error::Error: Send & Sync & Unpin);
+async_assert_fn!(tokio::time::advance(Duration): Send & Sync & !Unpin);
+async_assert_fn!(tokio::time::sleep(Duration): Send & Sync & !Unpin);
+async_assert_fn!(tokio::time::sleep_until(Instant): Send & Sync & !Unpin);
+async_assert_fn!(tokio::time::timeout(Duration, BoxFutureSync<()>): Send & Sync & !Unpin);
+async_assert_fn!(tokio::time::timeout(Duration, BoxFutureSend<()>): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::time::timeout(Duration, BoxFuture<()>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::time::timeout_at(Instant, BoxFutureSync<()>): Send & Sync & !Unpin);
+async_assert_fn!(tokio::time::timeout_at(Instant, BoxFutureSend<()>): Send & !Sync & !Unpin);
+async_assert_fn!(tokio::time::timeout_at(Instant, BoxFuture<()>): !Send & !Sync & !Unpin);
+async_assert_fn!(tokio::time::Interval::tick(_): Send & Sync & !Unpin);
+
+assert_value!(tokio::io::BufReader<TcpStream>: Send & Sync & Unpin);
+assert_value!(tokio::io::BufStream<TcpStream>: Send & Sync & Unpin);
+assert_value!(tokio::io::BufWriter<TcpStream>: Send & Sync & Unpin);
+assert_value!(tokio::io::DuplexStream: Send & Sync & Unpin);
+assert_value!(tokio::io::Empty: Send & Sync & Unpin);
+assert_value!(tokio::io::Interest: Send & Sync & Unpin);
+assert_value!(tokio::io::Lines<TcpStream>: Send & Sync & Unpin);
+assert_value!(tokio::io::ReadBuf<'_>: Send & Sync & Unpin);
+assert_value!(tokio::io::ReadHalf<TcpStream>: Send & Sync & Unpin);
+assert_value!(tokio::io::Ready: Send & Sync & Unpin);
+assert_value!(tokio::io::Repeat: Send & Sync & Unpin);
+assert_value!(tokio::io::Sink: Send & Sync & Unpin);
+assert_value!(tokio::io::Split<TcpStream>: Send & Sync & Unpin);
+assert_value!(tokio::io::Stderr: Send & Sync & Unpin);
+assert_value!(tokio::io::Stdin: Send & Sync & Unpin);
+assert_value!(tokio::io::Stdout: Send & Sync & Unpin);
+assert_value!(tokio::io::Take<TcpStream>: Send & Sync & Unpin);
+assert_value!(tokio::io::WriteHalf<TcpStream>: Send & Sync & Unpin);
+async_assert_fn!(tokio::io::copy(&mut TcpStream, &mut TcpStream): Send & Sync & !Unpin);
+async_assert_fn!(
+    tokio::io::copy_bidirectional(&mut TcpStream, &mut TcpStream): Send & Sync & !Unpin
+);
+async_assert_fn!(tokio::io::copy_buf(&mut tokio::io::BufReader<TcpStream>, &mut TcpStream): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::empty(): Send & Sync & Unpin);
+async_assert_fn!(tokio::io::repeat(u8): Send & Sync & Unpin);
+async_assert_fn!(tokio::io::sink(): Send & Sync & Unpin);
+async_assert_fn!(tokio::io::split(TcpStream): Send & Sync & Unpin);
+async_assert_fn!(tokio::io::stderr(): Send & Sync & Unpin);
+async_assert_fn!(tokio::io::stdin(): Send & Sync & Unpin);
+async_assert_fn!(tokio::io::stdout(): Send & Sync & Unpin);
+async_assert_fn!(tokio::io::Split<tokio::io::BufReader<TcpStream>>::next_segment(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::Lines<tokio::io::BufReader<TcpStream>>::next_line(_): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncBufReadExt::read_until(&mut BoxAsyncRead, u8, &mut Vec<u8>): Send & Sync & !Unpin);
+async_assert_fn!(
+    tokio::io::AsyncBufReadExt::read_line(&mut BoxAsyncRead, &mut String): Send & Sync & !Unpin
+);
+async_assert_fn!(tokio::io::AsyncBufReadExt::fill_buf(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read(&mut BoxAsyncRead, &mut [u8]): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_buf(&mut BoxAsyncRead, &mut Vec<u8>): Send & Sync & !Unpin);
+async_assert_fn!(
+    tokio::io::AsyncReadExt::read_exact(&mut BoxAsyncRead, &mut [u8]): Send & Sync & !Unpin
+);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u8(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i8(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u16(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i16(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u32(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i32(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u64(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i64(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u128(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i128(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_f32(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_f64(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u16_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i16_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u32_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i32_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u64_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i64_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_u128_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_i128_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_f32_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_f64_le(&mut BoxAsyncRead): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncReadExt::read_to_end(&mut BoxAsyncRead, &mut Vec<u8>): Send & Sync & !Unpin);
+async_assert_fn!(
+    tokio::io::AsyncReadExt::read_to_string(&mut BoxAsyncRead, &mut String): Send & Sync & !Unpin
+);
+async_assert_fn!(tokio::io::AsyncSeekExt::seek(&mut BoxAsyncSeek, SeekFrom): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncSeekExt::stream_position(&mut BoxAsyncSeek): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncWriteExt::write(&mut BoxAsyncWrite, &[u8]): Send & Sync & !Unpin);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_vectored(&mut BoxAsyncWrite, _): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_buf(&mut BoxAsyncWrite, &mut bytes::Bytes): Send
+        & Sync
+        & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_all_buf(&mut BoxAsyncWrite, &mut bytes::Bytes): Send
+        & Sync
+        & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_all(&mut BoxAsyncWrite, &[u8]): Send & Sync & !Unpin
+);
+async_assert_fn!(tokio::io::AsyncWriteExt::write_u8(&mut BoxAsyncWrite, u8): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncWriteExt::write_i8(&mut BoxAsyncWrite, i8): Send & Sync & !Unpin);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_u16(&mut BoxAsyncWrite, u16): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_i16(&mut BoxAsyncWrite, i16): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_u32(&mut BoxAsyncWrite, u32): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_i32(&mut BoxAsyncWrite, i32): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_u64(&mut BoxAsyncWrite, u64): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_i64(&mut BoxAsyncWrite, i64): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_u128(&mut BoxAsyncWrite, u128): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_i128(&mut BoxAsyncWrite, i128): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_f32(&mut BoxAsyncWrite, f32): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_f64(&mut BoxAsyncWrite, f64): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_u16_le(&mut BoxAsyncWrite, u16): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_i16_le(&mut BoxAsyncWrite, i16): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_u32_le(&mut BoxAsyncWrite, u32): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_i32_le(&mut BoxAsyncWrite, i32): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_u64_le(&mut BoxAsyncWrite, u64): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_i64_le(&mut BoxAsyncWrite, i64): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_u128_le(&mut BoxAsyncWrite, u128): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_i128_le(&mut BoxAsyncWrite, i128): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_f32_le(&mut BoxAsyncWrite, f32): Send & Sync & !Unpin
+);
+async_assert_fn!(
+    tokio::io::AsyncWriteExt::write_f64_le(&mut BoxAsyncWrite, f64): Send & Sync & !Unpin
+);
+async_assert_fn!(tokio::io::AsyncWriteExt::flush(&mut BoxAsyncWrite): Send & Sync & !Unpin);
+async_assert_fn!(tokio::io::AsyncWriteExt::shutdown(&mut BoxAsyncWrite): Send & Sync & !Unpin);
 
-#[cfg(tokio_unstable)]
-assert_value!(tokio::sync::CancellationToken: Send & Sync);
+#[cfg(unix)]
+mod unix_asyncfd {
+    use super::*;
+    use tokio::io::unix::*;
+
+    struct ImplsFd<T> {
+        _t: T,
+    }
+    impl<T> std::os::unix::io::AsRawFd for ImplsFd<T> {
+        fn as_raw_fd(&self) -> std::os::unix::io::RawFd {
+            unreachable!()
+        }
+    }
+
+    assert_value!(AsyncFd<ImplsFd<YY>>: Send & Sync & Unpin);
+    assert_value!(AsyncFd<ImplsFd<YN>>: Send & !Sync & Unpin);
+    assert_value!(AsyncFd<ImplsFd<NN>>: !Send & !Sync & Unpin);
+    assert_value!(AsyncFdReadyGuard<'_, ImplsFd<YY>>: Send & Sync & Unpin);
+    assert_value!(AsyncFdReadyGuard<'_, ImplsFd<YN>>: !Send & !Sync & Unpin);
+    assert_value!(AsyncFdReadyGuard<'_, ImplsFd<NN>>: !Send & !Sync & Unpin);
+    assert_value!(AsyncFdReadyMutGuard<'_, ImplsFd<YY>>: Send & Sync & Unpin);
+    assert_value!(AsyncFdReadyMutGuard<'_, ImplsFd<YN>>: Send & !Sync & Unpin);
+    assert_value!(AsyncFdReadyMutGuard<'_, ImplsFd<NN>>: !Send & !Sync & Unpin);
+    assert_value!(TryIoError: Send & Sync & Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<YY>>::readable(_): Send & Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<YY>>::readable_mut(_): Send & Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<YY>>::writable(_): Send & Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<YY>>::writable_mut(_): Send & Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<YN>>::readable(_): !Send & !Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<YN>>::readable_mut(_): Send & !Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<YN>>::writable(_): !Send & !Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<YN>>::writable_mut(_): Send & !Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<NN>>::readable(_): !Send & !Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<NN>>::readable_mut(_): !Send & !Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<NN>>::writable(_): !Send & !Sync & !Unpin);
+    async_assert_fn!(AsyncFd<ImplsFd<NN>>::writable_mut(_): !Send & !Sync & !Unpin);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/buffered.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/buffered.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/buffered.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/buffered.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,6 @@
 #![cfg(feature = "full")]
 
 use tokio::net::TcpListener;
-use tokio::prelude::*;
 use tokio_test::assert_ok;
 
 use std::io::prelude::*;
@@ -13,7 +12,7 @@
 async fn echo_server() {
     const N: usize = 1024;
 
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
 
     let msg = "foo bar baz";
@@ -41,7 +40,7 @@
     let (mut a, _) = assert_ok!(srv.accept().await);
     let (mut b, _) = assert_ok!(srv.accept().await);
 
-    let n = assert_ok!(io::copy(&mut a, &mut b).await);
+    let n = assert_ok!(tokio::io::copy(&mut a, &mut b).await);
 
     let (expected, t2) = t.join().unwrap();
     let actual = t2.join().unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/fs_dir.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/fs_dir.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/fs_dir.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/fs_dir.rs	2021-12-09 12:01:26.000000000 +0000
@@ -85,35 +85,3 @@
         vec!["aa".to_string(), "bb".to_string(), "cc".to_string()]
     );
 }
-
-#[tokio::test]
-async fn read_stream() {
-    use tokio::stream::StreamExt;
-
-    let base_dir = tempdir().unwrap();
-
-    let p = base_dir.path();
-    std::fs::create_dir(p.join("aa")).unwrap();
-    std::fs::create_dir(p.join("bb")).unwrap();
-    std::fs::create_dir(p.join("cc")).unwrap();
-
-    let files = Arc::new(Mutex::new(Vec::new()));
-
-    let f = files.clone();
-    let p = p.to_path_buf();
-
-    let mut entries = fs::read_dir(p).await.unwrap();
-
-    while let Some(res) = entries.next().await {
-        let e = assert_ok!(res);
-        let s = e.file_name().to_str().unwrap().to_string();
-        f.lock().unwrap().push(s);
-    }
-
-    let mut files = files.lock().unwrap();
-    files.sort(); // because the order is not guaranteed
-    assert_eq!(
-        *files,
-        vec!["aa".to_string(), "bb".to_string(), "cc".to_string()]
-    );
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/fs_file_mocked.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/fs_file_mocked.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/fs_file_mocked.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/fs_file_mocked.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,777 +0,0 @@
-#![warn(rust_2018_idioms)]
-#![cfg(feature = "full")]
-
-macro_rules! ready {
-    ($e:expr $(,)?) => {
-        match $e {
-            std::task::Poll::Ready(t) => t,
-            std::task::Poll::Pending => return std::task::Poll::Pending,
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! cfg_fs {
-    ($($item:item)*) => { $($item)* }
-}
-
-#[macro_export]
-macro_rules! cfg_io_std {
-    ($($item:item)*) => { $($item)* }
-}
-
-use futures::future;
-
-// Load source
-#[allow(warnings)]
-#[path = "../src/fs/file.rs"]
-mod file;
-use file::File;
-
-#[allow(warnings)]
-#[path = "../src/io/blocking.rs"]
-mod blocking;
-
-// Load mocked types
-mod support {
-    pub(crate) mod mock_file;
-    pub(crate) mod mock_pool;
-}
-pub(crate) use support::mock_pool as pool;
-
-// Place them where the source expects them
-pub(crate) mod io {
-    pub(crate) use tokio::io::*;
-
-    pub(crate) use crate::blocking;
-
-    pub(crate) mod sys {
-        pub(crate) use crate::support::mock_pool::{run, Blocking};
-    }
-}
-pub(crate) mod fs {
-    pub(crate) mod sys {
-        pub(crate) use crate::support::mock_file::File;
-        pub(crate) use crate::support::mock_pool::{run, Blocking};
-    }
-
-    pub(crate) use crate::support::mock_pool::asyncify;
-}
-use fs::sys;
-
-use tokio::prelude::*;
-use tokio_test::{assert_pending, assert_ready, assert_ready_err, assert_ready_ok, task};
-
-use std::io::SeekFrom;
-
-const HELLO: &[u8] = b"hello world...";
-const FOO: &[u8] = b"foo bar baz...";
-
-#[test]
-fn open_read() {
-    let (mock, file) = sys::File::mock();
-    mock.read(HELLO);
-
-    let mut file = File::from_std(file);
-
-    let mut buf = [0; 1024];
-    let mut t = task::spawn(file.read(&mut buf));
-
-    assert_eq!(0, pool::len());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, mock.remaining());
-    assert_eq!(1, pool::len());
-
-    pool::run_one();
-
-    assert_eq!(0, mock.remaining());
-    assert!(t.is_woken());
-
-    let n = assert_ready_ok!(t.poll());
-    assert_eq!(n, HELLO.len());
-    assert_eq!(&buf[..n], HELLO);
-}
-
-#[test]
-fn read_twice_before_dispatch() {
-    let (mock, file) = sys::File::mock();
-    mock.read(HELLO);
-
-    let mut file = File::from_std(file);
-
-    let mut buf = [0; 1024];
-    let mut t = task::spawn(file.read(&mut buf));
-
-    assert_pending!(t.poll());
-    assert_pending!(t.poll());
-
-    assert_eq!(pool::len(), 1);
-    pool::run_one();
-
-    assert!(t.is_woken());
-
-    let n = assert_ready_ok!(t.poll());
-    assert_eq!(&buf[..n], HELLO);
-}
-
-#[test]
-fn read_with_smaller_buf() {
-    let (mock, file) = sys::File::mock();
-    mock.read(HELLO);
-
-    let mut file = File::from_std(file);
-
-    {
-        let mut buf = [0; 32];
-        let mut t = task::spawn(file.read(&mut buf));
-        assert_pending!(t.poll());
-    }
-
-    pool::run_one();
-
-    {
-        let mut buf = [0; 4];
-        let mut t = task::spawn(file.read(&mut buf));
-        let n = assert_ready_ok!(t.poll());
-        assert_eq!(n, 4);
-        assert_eq!(&buf[..], &HELLO[..n]);
-    }
-
-    // Calling again immediately succeeds with the rest of the buffer
-    let mut buf = [0; 32];
-    let mut t = task::spawn(file.read(&mut buf));
-    let n = assert_ready_ok!(t.poll());
-    assert_eq!(n, 10);
-    assert_eq!(&buf[..n], &HELLO[4..]);
-
-    assert_eq!(0, pool::len());
-}
-
-#[test]
-fn read_with_bigger_buf() {
-    let (mock, file) = sys::File::mock();
-    mock.read(&HELLO[..4]).read(&HELLO[4..]);
-
-    let mut file = File::from_std(file);
-
-    {
-        let mut buf = [0; 4];
-        let mut t = task::spawn(file.read(&mut buf));
-        assert_pending!(t.poll());
-    }
-
-    pool::run_one();
-
-    {
-        let mut buf = [0; 32];
-        let mut t = task::spawn(file.read(&mut buf));
-        let n = assert_ready_ok!(t.poll());
-        assert_eq!(n, 4);
-        assert_eq!(&buf[..n], &HELLO[..n]);
-    }
-
-    // Calling again immediately succeeds with the rest of the buffer
-    let mut buf = [0; 32];
-    let mut t = task::spawn(file.read(&mut buf));
-
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-
-    let n = assert_ready_ok!(t.poll());
-    assert_eq!(n, 10);
-    assert_eq!(&buf[..n], &HELLO[4..]);
-
-    assert_eq!(0, pool::len());
-}
-
-#[test]
-fn read_err_then_read_success() {
-    let (mock, file) = sys::File::mock();
-    mock.read_err().read(&HELLO);
-
-    let mut file = File::from_std(file);
-
-    {
-        let mut buf = [0; 32];
-        let mut t = task::spawn(file.read(&mut buf));
-        assert_pending!(t.poll());
-
-        pool::run_one();
-
-        assert_ready_err!(t.poll());
-    }
-
-    {
-        let mut buf = [0; 32];
-        let mut t = task::spawn(file.read(&mut buf));
-        assert_pending!(t.poll());
-
-        pool::run_one();
-
-        let n = assert_ready_ok!(t.poll());
-
-        assert_eq!(n, HELLO.len());
-        assert_eq!(&buf[..n], HELLO);
-    }
-}
-
-#[test]
-fn open_write() {
-    let (mock, file) = sys::File::mock();
-    mock.write(HELLO);
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.write(HELLO));
-
-    assert_eq!(0, pool::len());
-    assert_ready_ok!(t.poll());
-
-    assert_eq!(1, mock.remaining());
-    assert_eq!(1, pool::len());
-
-    pool::run_one();
-
-    assert_eq!(0, mock.remaining());
-    assert!(!t.is_woken());
-
-    let mut t = task::spawn(file.flush());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn flush_while_idle() {
-    let (_mock, file) = sys::File::mock();
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.flush());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn read_with_buffer_larger_than_max() {
-    // Chunks
-    let chunk_a = 16 * 1024;
-    let chunk_b = chunk_a * 2;
-    let chunk_c = chunk_a * 3;
-    let chunk_d = chunk_a * 4;
-
-    assert_eq!(chunk_d / 1024, 64);
-
-    let mut data = vec![];
-    for i in 0..(chunk_d - 1) {
-        data.push((i % 151) as u8);
-    }
-
-    let (mock, file) = sys::File::mock();
-    mock.read(&data[0..chunk_a])
-        .read(&data[chunk_a..chunk_b])
-        .read(&data[chunk_b..chunk_c])
-        .read(&data[chunk_c..]);
-
-    let mut file = File::from_std(file);
-
-    let mut actual = vec![0; chunk_d];
-    let mut pos = 0;
-
-    while pos < data.len() {
-        let mut t = task::spawn(file.read(&mut actual[pos..]));
-
-        assert_pending!(t.poll());
-        pool::run_one();
-        assert!(t.is_woken());
-
-        let n = assert_ready_ok!(t.poll());
-        assert!(n <= chunk_a);
-
-        pos += n;
-    }
-
-    assert_eq!(mock.remaining(), 0);
-    assert_eq!(data, &actual[..data.len()]);
-}
-
-#[test]
-fn write_with_buffer_larger_than_max() {
-    // Chunks
-    let chunk_a = 16 * 1024;
-    let chunk_b = chunk_a * 2;
-    let chunk_c = chunk_a * 3;
-    let chunk_d = chunk_a * 4;
-
-    assert_eq!(chunk_d / 1024, 64);
-
-    let mut data = vec![];
-    for i in 0..(chunk_d - 1) {
-        data.push((i % 151) as u8);
-    }
-
-    let (mock, file) = sys::File::mock();
-    mock.write(&data[0..chunk_a])
-        .write(&data[chunk_a..chunk_b])
-        .write(&data[chunk_b..chunk_c])
-        .write(&data[chunk_c..]);
-
-    let mut file = File::from_std(file);
-
-    let mut rem = &data[..];
-
-    let mut first = true;
-
-    while !rem.is_empty() {
-        let mut task = task::spawn(file.write(rem));
-
-        if !first {
-            assert_pending!(task.poll());
-            pool::run_one();
-            assert!(task.is_woken());
-        }
-
-        first = false;
-
-        let n = assert_ready_ok!(task.poll());
-
-        rem = &rem[n..];
-    }
-
-    pool::run_one();
-
-    assert_eq!(mock.remaining(), 0);
-}
-
-#[test]
-fn write_twice_before_dispatch() {
-    let (mock, file) = sys::File::mock();
-    mock.write(HELLO).write(FOO);
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    let mut t = task::spawn(file.write(FOO));
-    assert_pending!(t.poll());
-
-    assert_eq!(pool::len(), 1);
-    pool::run_one();
-
-    assert!(t.is_woken());
-
-    assert_ready_ok!(t.poll());
-
-    let mut t = task::spawn(file.flush());
-    assert_pending!(t.poll());
-
-    assert_eq!(pool::len(), 1);
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn incomplete_read_followed_by_write() {
-    let (mock, file) = sys::File::mock();
-    mock.read(HELLO)
-        .seek_current_ok(-(HELLO.len() as i64), 0)
-        .write(FOO);
-
-    let mut file = File::from_std(file);
-
-    let mut buf = [0; 32];
-
-    let mut t = task::spawn(file.read(&mut buf));
-    assert_pending!(t.poll());
-
-    pool::run_one();
-
-    let mut t = task::spawn(file.write(FOO));
-    assert_ready_ok!(t.poll());
-
-    assert_eq!(pool::len(), 1);
-    pool::run_one();
-
-    let mut t = task::spawn(file.flush());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn incomplete_partial_read_followed_by_write() {
-    let (mock, file) = sys::File::mock();
-    mock.read(HELLO).seek_current_ok(-10, 0).write(FOO);
-
-    let mut file = File::from_std(file);
-
-    let mut buf = [0; 32];
-    let mut t = task::spawn(file.read(&mut buf));
-    assert_pending!(t.poll());
-
-    pool::run_one();
-
-    let mut buf = [0; 4];
-    let mut t = task::spawn(file.read(&mut buf));
-    assert_ready_ok!(t.poll());
-
-    let mut t = task::spawn(file.write(FOO));
-    assert_ready_ok!(t.poll());
-
-    assert_eq!(pool::len(), 1);
-    pool::run_one();
-
-    let mut t = task::spawn(file.flush());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn incomplete_read_followed_by_flush() {
-    let (mock, file) = sys::File::mock();
-    mock.read(HELLO)
-        .seek_current_ok(-(HELLO.len() as i64), 0)
-        .write(FOO);
-
-    let mut file = File::from_std(file);
-
-    let mut buf = [0; 32];
-
-    let mut t = task::spawn(file.read(&mut buf));
-    assert_pending!(t.poll());
-
-    pool::run_one();
-
-    let mut t = task::spawn(file.flush());
-    assert_ready_ok!(t.poll());
-
-    let mut t = task::spawn(file.write(FOO));
-    assert_ready_ok!(t.poll());
-
-    pool::run_one();
-}
-
-#[test]
-fn incomplete_flush_followed_by_write() {
-    let (mock, file) = sys::File::mock();
-    mock.write(HELLO).write(FOO);
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.write(HELLO));
-    let n = assert_ready_ok!(t.poll());
-    assert_eq!(n, HELLO.len());
-
-    let mut t = task::spawn(file.flush());
-    assert_pending!(t.poll());
-
-    // TODO: Move under write
-    pool::run_one();
-
-    let mut t = task::spawn(file.write(FOO));
-    assert_ready_ok!(t.poll());
-
-    pool::run_one();
-
-    let mut t = task::spawn(file.flush());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn read_err() {
-    let (mock, file) = sys::File::mock();
-    mock.read_err();
-
-    let mut file = File::from_std(file);
-
-    let mut buf = [0; 1024];
-    let mut t = task::spawn(file.read(&mut buf));
-
-    assert_pending!(t.poll());
-
-    pool::run_one();
-    assert!(t.is_woken());
-
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn write_write_err() {
-    let (mock, file) = sys::File::mock();
-    mock.write_err();
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    pool::run_one();
-
-    let mut t = task::spawn(file.write(FOO));
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn write_read_write_err() {
-    let (mock, file) = sys::File::mock();
-    mock.write_err().read(HELLO);
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    pool::run_one();
-
-    let mut buf = [0; 1024];
-    let mut t = task::spawn(file.read(&mut buf));
-
-    assert_pending!(t.poll());
-
-    pool::run_one();
-
-    let mut t = task::spawn(file.write(FOO));
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn write_read_flush_err() {
-    let (mock, file) = sys::File::mock();
-    mock.write_err().read(HELLO);
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    pool::run_one();
-
-    let mut buf = [0; 1024];
-    let mut t = task::spawn(file.read(&mut buf));
-
-    assert_pending!(t.poll());
-
-    pool::run_one();
-
-    let mut t = task::spawn(file.flush());
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn write_seek_write_err() {
-    let (mock, file) = sys::File::mock();
-    mock.write_err().seek_start_ok(0);
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    pool::run_one();
-
-    {
-        let mut t = task::spawn(file.seek(SeekFrom::Start(0)));
-        assert_pending!(t.poll());
-    }
-
-    pool::run_one();
-
-    let mut t = task::spawn(file.write(FOO));
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn write_seek_flush_err() {
-    let (mock, file) = sys::File::mock();
-    mock.write_err().seek_start_ok(0);
-
-    let mut file = File::from_std(file);
-
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    pool::run_one();
-
-    {
-        let mut t = task::spawn(file.seek(SeekFrom::Start(0)));
-        assert_pending!(t.poll());
-    }
-
-    pool::run_one();
-
-    let mut t = task::spawn(file.flush());
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn sync_all_ordered_after_write() {
-    let (mock, file) = sys::File::mock();
-    mock.write(HELLO).sync_all();
-
-    let mut file = File::from_std(file);
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    let mut t = task::spawn(file.sync_all());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn sync_all_err_ordered_after_write() {
-    let (mock, file) = sys::File::mock();
-    mock.write(HELLO).sync_all_err();
-
-    let mut file = File::from_std(file);
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    let mut t = task::spawn(file.sync_all());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn sync_data_ordered_after_write() {
-    let (mock, file) = sys::File::mock();
-    mock.write(HELLO).sync_data();
-
-    let mut file = File::from_std(file);
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    let mut t = task::spawn(file.sync_data());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn sync_data_err_ordered_after_write() {
-    let (mock, file) = sys::File::mock();
-    mock.write(HELLO).sync_data_err();
-
-    let mut file = File::from_std(file);
-    let mut t = task::spawn(file.write(HELLO));
-    assert_ready_ok!(t.poll());
-
-    let mut t = task::spawn(file.sync_data());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_pending!(t.poll());
-
-    assert_eq!(1, pool::len());
-    pool::run_one();
-
-    assert!(t.is_woken());
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn open_set_len_ok() {
-    let (mock, file) = sys::File::mock();
-    mock.set_len(123);
-
-    let mut file = File::from_std(file);
-    let mut t = task::spawn(file.set_len(123));
-
-    assert_pending!(t.poll());
-    assert_eq!(1, mock.remaining());
-
-    pool::run_one();
-    assert_eq!(0, mock.remaining());
-
-    assert!(t.is_woken());
-    assert_ready_ok!(t.poll());
-}
-
-#[test]
-fn open_set_len_err() {
-    let (mock, file) = sys::File::mock();
-    mock.set_len_err(123);
-
-    let mut file = File::from_std(file);
-    let mut t = task::spawn(file.set_len(123));
-
-    assert_pending!(t.poll());
-    assert_eq!(1, mock.remaining());
-
-    pool::run_one();
-    assert_eq!(0, mock.remaining());
-
-    assert!(t.is_woken());
-    assert_ready_err!(t.poll());
-}
-
-#[test]
-fn partial_read_set_len_ok() {
-    let (mock, file) = sys::File::mock();
-    mock.read(HELLO)
-        .seek_current_ok(-14, 0)
-        .set_len(123)
-        .read(FOO);
-
-    let mut buf = [0; 32];
-    let mut file = File::from_std(file);
-
-    {
-        let mut t = task::spawn(file.read(&mut buf));
-        assert_pending!(t.poll());
-    }
-
-    pool::run_one();
-
-    {
-        let mut t = task::spawn(file.set_len(123));
-
-        assert_pending!(t.poll());
-        pool::run_one();
-        assert_ready_ok!(t.poll());
-    }
-
-    let mut t = task::spawn(file.read(&mut buf));
-    assert_pending!(t.poll());
-    pool::run_one();
-    let n = assert_ready_ok!(t.poll());
-
-    assert_eq!(n, FOO.len());
-    assert_eq!(&buf[..n], FOO);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/fs_file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/fs_file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/fs_file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/fs_file.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,7 +2,7 @@
 #![cfg(feature = "full")]
 
 use tokio::fs::File;
-use tokio::prelude::*;
+use tokio::io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
 use tokio_test::task;
 
 use std::io::prelude::*;
@@ -35,6 +35,19 @@
 
     let file = std::fs::read(tempfile.path()).unwrap();
     assert_eq!(file, HELLO);
+}
+
+#[tokio::test]
+async fn basic_write_and_shutdown() {
+    let tempfile = tempfile();
+
+    let mut file = File::create(tempfile.path()).await.unwrap();
+
+    file.write_all(HELLO).await.unwrap();
+    file.shutdown().await.unwrap();
+
+    let file = std::fs::read(tempfile.path()).unwrap();
+    assert_eq!(file, HELLO);
 }
 
 #[tokio::test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/fs_link.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/fs_link.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/fs_link.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/fs_link.rs	2021-12-09 12:01:26.000000000 +0000
@@ -48,9 +48,7 @@
     let src_2 = src.clone();
     let dst_2 = dst.clone();
 
-    assert!(fs::os::unix::symlink(src_2.clone(), dst_2.clone())
-        .await
-        .is_ok());
+    assert!(fs::symlink(src_2.clone(), dst_2.clone()).await.is_ok());
 
     let mut content = String::new();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_async_fd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_async_fd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_async_fd.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_async_fd.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,601 @@
+#![warn(rust_2018_idioms)]
+#![cfg(all(unix, feature = "full"))]
+
+use std::os::unix::io::{AsRawFd, RawFd};
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
+use std::time::Duration;
+use std::{
+    future::Future,
+    io::{self, ErrorKind, Read, Write},
+    task::{Context, Waker},
+};
+
+use nix::unistd::{close, read, write};
+
+use futures::poll;
+
+use tokio::io::unix::{AsyncFd, AsyncFdReadyGuard};
+use tokio_test::{assert_err, assert_pending};
+
+struct TestWaker {
+    inner: Arc<TestWakerInner>,
+    waker: Waker,
+}
+
+#[derive(Default)]
+struct TestWakerInner {
+    awoken: AtomicBool,
+}
+
+impl futures::task::ArcWake for TestWakerInner {
+    fn wake_by_ref(arc_self: &Arc<Self>) {
+        arc_self.awoken.store(true, Ordering::SeqCst);
+    }
+}
+
+impl TestWaker {
+    fn new() -> Self {
+        let inner: Arc<TestWakerInner> = Default::default();
+
+        Self {
+            inner: inner.clone(),
+            waker: futures::task::waker(inner),
+        }
+    }
+
+    fn awoken(&self) -> bool {
+        self.inner.awoken.swap(false, Ordering::SeqCst)
+    }
+
+    fn context(&self) -> Context<'_> {
+        Context::from_waker(&self.waker)
+    }
+}
+
+#[derive(Debug)]
+struct FileDescriptor {
+    fd: RawFd,
+}
+
+impl AsRawFd for FileDescriptor {
+    fn as_raw_fd(&self) -> RawFd {
+        self.fd
+    }
+}
+
+impl Read for &FileDescriptor {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        read(self.fd, buf).map_err(io::Error::from)
+    }
+}
+
+impl Read for FileDescriptor {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        (self as &Self).read(buf)
+    }
+}
+
+impl Write for &FileDescriptor {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        write(self.fd, buf).map_err(io::Error::from)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl Write for FileDescriptor {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        (self as &Self).write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        (self as &Self).flush()
+    }
+}
+
+impl Drop for FileDescriptor {
+    fn drop(&mut self) {
+        let _ = close(self.fd);
+    }
+}
+
+fn set_nonblocking(fd: RawFd) {
+    use nix::fcntl::{OFlag, F_GETFL, F_SETFL};
+
+    let flags = nix::fcntl::fcntl(fd, F_GETFL).expect("fcntl(F_GETFD)");
+
+    if flags < 0 {
+        panic!(
+            "bad return value from fcntl(F_GETFL): {} ({:?})",
+            flags,
+            nix::Error::last()
+        );
+    }
+
+    let flags = OFlag::from_bits_truncate(flags) | OFlag::O_NONBLOCK;
+
+    nix::fcntl::fcntl(fd, F_SETFL(flags)).expect("fcntl(F_SETFD)");
+}
+
+fn socketpair() -> (FileDescriptor, FileDescriptor) {
+    use nix::sys::socket::{self, AddressFamily, SockFlag, SockType};
+
+    let (fd_a, fd_b) = socket::socketpair(
+        AddressFamily::Unix,
+        SockType::Stream,
+        None,
+        SockFlag::empty(),
+    )
+    .expect("socketpair");
+    let fds = (FileDescriptor { fd: fd_a }, FileDescriptor { fd: fd_b });
+
+    set_nonblocking(fds.0.fd);
+    set_nonblocking(fds.1.fd);
+
+    fds
+}
+
+fn drain(mut fd: &FileDescriptor) {
+    let mut buf = [0u8; 512];
+
+    loop {
+        match fd.read(&mut buf[..]) {
+            Err(e) if e.kind() == ErrorKind::WouldBlock => break,
+            Ok(0) => panic!("unexpected EOF"),
+            Err(e) => panic!("unexpected error: {:?}", e),
+            Ok(_) => continue,
+        }
+    }
+}
+
+#[tokio::test]
+async fn initially_writable() {
+    let (a, b) = socketpair();
+
+    let afd_a = AsyncFd::new(a).unwrap();
+    let afd_b = AsyncFd::new(b).unwrap();
+
+    afd_a.writable().await.unwrap().clear_ready();
+    afd_b.writable().await.unwrap().clear_ready();
+
+    tokio::select! {
+        biased;
+        _ = tokio::time::sleep(Duration::from_millis(10)) => {},
+        _ = afd_a.readable() => panic!("Unexpected readable state"),
+        _ = afd_b.readable() => panic!("Unexpected readable state"),
+    }
+}
+
+#[tokio::test]
+async fn reset_readable() {
+    let (a, mut b) = socketpair();
+
+    let afd_a = AsyncFd::new(a).unwrap();
+
+    let readable = afd_a.readable();
+    tokio::pin!(readable);
+
+    tokio::select! {
+        _ = readable.as_mut() => panic!(),
+        _ = tokio::time::sleep(Duration::from_millis(10)) => {}
+    }
+
+    b.write_all(b"0").unwrap();
+
+    let mut guard = readable.await.unwrap();
+
+    guard
+        .try_io(|_| afd_a.get_ref().read(&mut [0]))
+        .unwrap()
+        .unwrap();
+
+    // `a` is not readable, but the reactor still thinks it is
+    // (because we have not observed a not-ready error yet)
+    afd_a.readable().await.unwrap().retain_ready();
+
+    // Explicitly clear the ready state
+    guard.clear_ready();
+
+    let readable = afd_a.readable();
+    tokio::pin!(readable);
+
+    tokio::select! {
+        _ = readable.as_mut() => panic!(),
+        _ = tokio::time::sleep(Duration::from_millis(10)) => {}
+    }
+
+    b.write_all(b"0").unwrap();
+
+    // We can observe the new readable event
+    afd_a.readable().await.unwrap().clear_ready();
+}
+
+#[tokio::test]
+async fn reset_writable() {
+    let (a, b) = socketpair();
+
+    let afd_a = AsyncFd::new(a).unwrap();
+
+    let mut guard = afd_a.writable().await.unwrap();
+
+    // Write until we get a WouldBlock. This also clears the ready state.
+    while guard
+        .try_io(|_| afd_a.get_ref().write(&[0; 512][..]))
+        .is_ok()
+    {}
+
+    // Writable state should be cleared now.
+    let writable = afd_a.writable();
+    tokio::pin!(writable);
+
+    tokio::select! {
+        _ = writable.as_mut() => panic!(),
+        _ = tokio::time::sleep(Duration::from_millis(10)) => {}
+    }
+
+    // Read from the other side; we should become writable now.
+    drain(&b);
+
+    let _ = writable.await.unwrap();
+}
+
+#[derive(Debug)]
+struct ArcFd<T>(Arc<T>);
+impl<T: AsRawFd> AsRawFd for ArcFd<T> {
+    fn as_raw_fd(&self) -> RawFd {
+        self.0.as_raw_fd()
+    }
+}
+
+#[tokio::test]
+async fn drop_closes() {
+    let (a, mut b) = socketpair();
+
+    let afd_a = AsyncFd::new(a).unwrap();
+
+    assert_eq!(
+        ErrorKind::WouldBlock,
+        b.read(&mut [0]).err().unwrap().kind()
+    );
+
+    std::mem::drop(afd_a);
+
+    assert_eq!(0, b.read(&mut [0]).unwrap());
+
+    // into_inner does not close the fd
+
+    let (a, mut b) = socketpair();
+    let afd_a = AsyncFd::new(a).unwrap();
+    let _a: FileDescriptor = afd_a.into_inner();
+
+    assert_eq!(
+        ErrorKind::WouldBlock,
+        b.read(&mut [0]).err().unwrap().kind()
+    );
+
+    // Drop closure behavior is delegated to the inner object
+    let (a, mut b) = socketpair();
+    let arc_fd = Arc::new(a);
+    let afd_a = AsyncFd::new(ArcFd(arc_fd.clone())).unwrap();
+    std::mem::drop(afd_a);
+
+    assert_eq!(
+        ErrorKind::WouldBlock,
+        b.read(&mut [0]).err().unwrap().kind()
+    );
+
+    std::mem::drop(arc_fd); // suppress unnecessary clone clippy warning
+}
+
+#[tokio::test]
+async fn reregister() {
+    let (a, _b) = socketpair();
+
+    let afd_a = AsyncFd::new(a).unwrap();
+    let a = afd_a.into_inner();
+    AsyncFd::new(a).unwrap();
+}
+
+#[tokio::test]
+async fn try_io() {
+    let (a, mut b) = socketpair();
+
+    b.write_all(b"0").unwrap();
+
+    let afd_a = AsyncFd::new(a).unwrap();
+
+    let mut guard = afd_a.readable().await.unwrap();
+
+    afd_a.get_ref().read_exact(&mut [0]).unwrap();
+
+    // Should not clear the readable state
+    let _ = guard.try_io(|_| Ok(()));
+
+    // Still readable...
+    let _ = afd_a.readable().await.unwrap();
+
+    // Should clear the readable state
+    let _ = guard.try_io(|_| io::Result::<()>::Err(ErrorKind::WouldBlock.into()));
+
+    // Assert not readable
+    let readable = afd_a.readable();
+    tokio::pin!(readable);
+
+    tokio::select! {
+        _ = readable.as_mut() => panic!(),
+        _ = tokio::time::sleep(Duration::from_millis(10)) => {}
+    }
+
+    // Write something down b again and make sure we're reawoken
+    b.write_all(b"0").unwrap();
+    let _ = readable.await.unwrap();
+}
+
+#[tokio::test]
+async fn multiple_waiters() {
+    let (a, mut b) = socketpair();
+    let afd_a = Arc::new(AsyncFd::new(a).unwrap());
+
+    let barrier = Arc::new(tokio::sync::Barrier::new(11));
+
+    let mut tasks = Vec::new();
+    for _ in 0..10 {
+        let afd_a = afd_a.clone();
+        let barrier = barrier.clone();
+
+        let f = async move {
+            let notify_barrier = async {
+                barrier.wait().await;
+                futures::future::pending::<()>().await;
+            };
+
+            tokio::select! {
+                biased;
+                guard = afd_a.readable() => {
+                    tokio::task::yield_now().await;
+                    guard.unwrap().clear_ready()
+                },
+                _ = notify_barrier => unreachable!(),
+            }
+
+            std::mem::drop(afd_a);
+        };
+
+        tasks.push(tokio::spawn(f));
+    }
+
+    let mut all_tasks = futures::future::try_join_all(tasks);
+
+    tokio::select! {
+        r = std::pin::Pin::new(&mut all_tasks) => {
+            r.unwrap(); // propagate panic
+            panic!("Tasks exited unexpectedly")
+        },
+        _ = barrier.wait() => {}
+    };
+
+    b.write_all(b"0").unwrap();
+
+    all_tasks.await.unwrap();
+}
+
+#[tokio::test]
+async fn poll_fns() {
+    let (a, b) = socketpair();
+    let afd_a = Arc::new(AsyncFd::new(a).unwrap());
+    let afd_b = Arc::new(AsyncFd::new(b).unwrap());
+
+    // Fill up the write side of A
+    while afd_a.get_ref().write(&[0; 512]).is_ok() {}
+
+    let waker = TestWaker::new();
+
+    assert_pending!(afd_a.as_ref().poll_read_ready(&mut waker.context()));
+
+    let afd_a_2 = afd_a.clone();
+    let r_barrier = Arc::new(tokio::sync::Barrier::new(2));
+    let barrier_clone = r_barrier.clone();
+
+    let read_fut = tokio::spawn(async move {
+        // Move waker onto this task first
+        assert_pending!(poll!(futures::future::poll_fn(|cx| afd_a_2
+            .as_ref()
+            .poll_read_ready(cx))));
+        barrier_clone.wait().await;
+
+        let _ = futures::future::poll_fn(|cx| afd_a_2.as_ref().poll_read_ready(cx)).await;
+    });
+
+    let afd_a_2 = afd_a.clone();
+    let w_barrier = Arc::new(tokio::sync::Barrier::new(2));
+    let barrier_clone = w_barrier.clone();
+
+    let mut write_fut = tokio::spawn(async move {
+        // Move waker onto this task first
+        assert_pending!(poll!(futures::future::poll_fn(|cx| afd_a_2
+            .as_ref()
+            .poll_write_ready(cx))));
+        barrier_clone.wait().await;
+
+        let _ = futures::future::poll_fn(|cx| afd_a_2.as_ref().poll_write_ready(cx)).await;
+    });
+
+    r_barrier.wait().await;
+    w_barrier.wait().await;
+
+    let readable = afd_a.readable();
+    tokio::pin!(readable);
+
+    tokio::select! {
+        _ = &mut readable => unreachable!(),
+        _ = tokio::task::yield_now() => {}
+    }
+
+    // Make A readable. We expect that 'readable' and 'read_fut' will both complete quickly
+    afd_b.get_ref().write_all(b"0").unwrap();
+
+    let _ = tokio::join!(readable, read_fut);
+
+    // Our original waker should _not_ be awoken (poll_read_ready retains only the last context)
+    assert!(!waker.awoken());
+
+    // The writable side should not be awoken
+    tokio::select! {
+        _ = &mut write_fut => unreachable!(),
+        _ = tokio::time::sleep(Duration::from_millis(5)) => {}
+    }
+
+    // Make it writable now
+    drain(afd_b.get_ref());
+
+    // now we should be writable (ie - the waker for poll_write should still be registered after we wake the read side)
+    let _ = write_fut.await;
+}
+
+fn assert_pending<T: std::fmt::Debug, F: Future<Output = T>>(f: F) -> std::pin::Pin<Box<F>> {
+    let mut pinned = Box::pin(f);
+
+    assert_pending!(pinned
+        .as_mut()
+        .poll(&mut Context::from_waker(futures::task::noop_waker_ref())));
+
+    pinned
+}
+
+fn rt() -> tokio::runtime::Runtime {
+    tokio::runtime::Builder::new_current_thread()
+        .enable_all()
+        .build()
+        .unwrap()
+}
+
+#[test]
+fn driver_shutdown_wakes_currently_pending() {
+    let rt = rt();
+
+    let (a, _b) = socketpair();
+    let afd_a = {
+        let _enter = rt.enter();
+        AsyncFd::new(a).unwrap()
+    };
+
+    let readable = assert_pending(afd_a.readable());
+
+    std::mem::drop(rt);
+
+    // The future was initialized **before** dropping the rt
+    assert_err!(futures::executor::block_on(readable));
+
+    // The future is initialized **after** dropping the rt.
+    assert_err!(futures::executor::block_on(afd_a.readable()));
+}
+
+#[test]
+fn driver_shutdown_wakes_future_pending() {
+    let rt = rt();
+
+    let (a, _b) = socketpair();
+    let afd_a = {
+        let _enter = rt.enter();
+        AsyncFd::new(a).unwrap()
+    };
+
+    std::mem::drop(rt);
+
+    assert_err!(futures::executor::block_on(afd_a.readable()));
+}
+
+#[test]
+fn driver_shutdown_wakes_pending_race() {
+    // TODO: make this a loom test
+    for _ in 0..100 {
+        let rt = rt();
+
+        let (a, _b) = socketpair();
+        let afd_a = {
+            let _enter = rt.enter();
+            AsyncFd::new(a).unwrap()
+        };
+
+        let _ = std::thread::spawn(move || std::mem::drop(rt));
+
+        // This may or may not return an error (but will be awoken)
+        let _ = futures::executor::block_on(afd_a.readable());
+
+        // However retrying will always return an error
+        assert_err!(futures::executor::block_on(afd_a.readable()));
+    }
+}
+
+async fn poll_readable<T: AsRawFd>(fd: &AsyncFd<T>) -> std::io::Result<AsyncFdReadyGuard<'_, T>> {
+    futures::future::poll_fn(|cx| fd.poll_read_ready(cx)).await
+}
+
+async fn poll_writable<T: AsRawFd>(fd: &AsyncFd<T>) -> std::io::Result<AsyncFdReadyGuard<'_, T>> {
+    futures::future::poll_fn(|cx| fd.poll_write_ready(cx)).await
+}
+
+#[test]
+fn driver_shutdown_wakes_currently_pending_polls() {
+    let rt = rt();
+
+    let (a, _b) = socketpair();
+    let afd_a = {
+        let _enter = rt.enter();
+        AsyncFd::new(a).unwrap()
+    };
+
+    while afd_a.get_ref().write(&[0; 512]).is_ok() {} // make not writable
+
+    let readable = assert_pending(poll_readable(&afd_a));
+    let writable = assert_pending(poll_writable(&afd_a));
+
+    std::mem::drop(rt);
+
+    // Attempting to poll readiness when the rt is dropped is an error
+    assert_err!(futures::executor::block_on(readable));
+    assert_err!(futures::executor::block_on(writable));
+}
+
+#[test]
+fn driver_shutdown_wakes_poll() {
+    let rt = rt();
+
+    let (a, _b) = socketpair();
+    let afd_a = {
+        let _enter = rt.enter();
+        AsyncFd::new(a).unwrap()
+    };
+
+    std::mem::drop(rt);
+
+    assert_err!(futures::executor::block_on(poll_readable(&afd_a)));
+    assert_err!(futures::executor::block_on(poll_writable(&afd_a)));
+}
+
+#[test]
+fn driver_shutdown_wakes_poll_race() {
+    // TODO: make this a loom test
+    for _ in 0..100 {
+        let rt = rt();
+
+        let (a, _b) = socketpair();
+        let afd_a = {
+            let _enter = rt.enter();
+            AsyncFd::new(a).unwrap()
+        };
+
+        while afd_a.get_ref().write(&[0; 512]).is_ok() {} // make not writable
+
+        let _ = std::thread::spawn(move || std::mem::drop(rt));
+
+        // The poll variants will always return an error in this case
+        assert_err!(futures::executor::block_on(poll_readable(&afd_a)));
+        assert_err!(futures::executor::block_on(poll_writable(&afd_a)));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_async_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_async_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_async_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_async_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,148 +1,10 @@
-#![allow(clippy::transmute_ptr_to_ptr)]
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
 use tokio::io::AsyncRead;
-use tokio_test::task;
-use tokio_test::{assert_ready_err, assert_ready_ok};
-
-use bytes::{BufMut, BytesMut};
-use std::io;
-use std::mem::MaybeUninit;
-use std::pin::Pin;
-use std::task::{Context, Poll};
 
 #[test]
 fn assert_obj_safe() {
     fn _assert<T>() {}
     _assert::<Box<dyn AsyncRead>>();
 }
-
-#[test]
-fn read_buf_success() {
-    struct Rd;
-
-    impl AsyncRead for Rd {
-        fn poll_read(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-            buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
-            buf[0..11].copy_from_slice(b"hello world");
-            Poll::Ready(Ok(11))
-        }
-    }
-
-    let mut buf = BytesMut::with_capacity(65);
-
-    task::spawn(Rd).enter(|cx, rd| {
-        let n = assert_ready_ok!(rd.poll_read_buf(cx, &mut buf));
-
-        assert_eq!(11, n);
-        assert_eq!(buf[..], b"hello world"[..]);
-    });
-}
-
-#[test]
-fn read_buf_error() {
-    struct Rd;
-
-    impl AsyncRead for Rd {
-        fn poll_read(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-            _buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
-            let err = io::ErrorKind::Other.into();
-            Poll::Ready(Err(err))
-        }
-    }
-
-    let mut buf = BytesMut::with_capacity(65);
-
-    task::spawn(Rd).enter(|cx, rd| {
-        let err = assert_ready_err!(rd.poll_read_buf(cx, &mut buf));
-        assert_eq!(err.kind(), io::ErrorKind::Other);
-    });
-}
-
-#[test]
-fn read_buf_no_capacity() {
-    struct Rd;
-
-    impl AsyncRead for Rd {
-        fn poll_read(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-            _buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
-            unimplemented!();
-        }
-    }
-
-    let mut buf = [0u8; 0];
-
-    task::spawn(Rd).enter(|cx, rd| {
-        let n = assert_ready_ok!(rd.poll_read_buf(cx, &mut &mut buf[..]));
-        assert_eq!(0, n);
-    });
-}
-
-#[test]
-fn read_buf_no_uninitialized() {
-    struct Rd;
-
-    impl AsyncRead for Rd {
-        fn poll_read(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-            buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
-            for b in buf {
-                assert_eq!(0, *b);
-            }
-
-            Poll::Ready(Ok(0))
-        }
-    }
-
-    let mut buf = BytesMut::with_capacity(64);
-
-    task::spawn(Rd).enter(|cx, rd| {
-        let n = assert_ready_ok!(rd.poll_read_buf(cx, &mut buf));
-        assert_eq!(0, n);
-    });
-}
-
-#[test]
-fn read_buf_uninitialized_ok() {
-    struct Rd;
-
-    impl AsyncRead for Rd {
-        unsafe fn prepare_uninitialized_buffer(&self, _: &mut [MaybeUninit<u8>]) -> bool {
-            false
-        }
-
-        fn poll_read(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-            buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
-            assert_eq!(buf[0..11], b"hello world"[..]);
-            Poll::Ready(Ok(0))
-        }
-    }
-
-    // Can't create BytesMut w/ zero capacity, so fill it up
-    let mut buf = BytesMut::with_capacity(64);
-
-    unsafe {
-        let b: &mut [u8] = std::mem::transmute(buf.bytes_mut());
-        b[0..11].copy_from_slice(b"hello world");
-    }
-
-    task::spawn(Rd).enter(|cx, rd| {
-        let n = assert_ready_ok!(rd.poll_read_buf(cx, &mut buf));
-        assert_eq!(0, n);
-    });
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_buf_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_buf_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_buf_reader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_buf_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,379 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+// https://github.com/rust-lang/futures-rs/blob/1803948ff091b4eabf7f3bf39e16bbbdefca5cc8/futures/tests/io_buf_reader.rs
+
+use futures::task::{noop_waker_ref, Context, Poll};
+use std::cmp;
+use std::io::{self, Cursor};
+use std::pin::Pin;
+use tokio::io::{
+    AsyncBufRead, AsyncBufReadExt, AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt, AsyncWriteExt,
+    BufReader, ReadBuf, SeekFrom,
+};
+use tokio_test::task::spawn;
+use tokio_test::{assert_pending, assert_ready};
+
+macro_rules! run_fill_buf {
+    ($reader:expr) => {{
+        let mut cx = Context::from_waker(noop_waker_ref());
+        loop {
+            if let Poll::Ready(x) = Pin::new(&mut $reader).poll_fill_buf(&mut cx) {
+                break x;
+            }
+        }
+    }};
+}
+
+struct MaybePending<'a> {
+    inner: &'a [u8],
+    ready_read: bool,
+    ready_fill_buf: bool,
+}
+
+impl<'a> MaybePending<'a> {
+    fn new(inner: &'a [u8]) -> Self {
+        Self {
+            inner,
+            ready_read: false,
+            ready_fill_buf: false,
+        }
+    }
+}
+
+impl AsyncRead for MaybePending<'_> {
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        if self.ready_read {
+            self.ready_read = false;
+            Pin::new(&mut self.inner).poll_read(cx, buf)
+        } else {
+            self.ready_read = true;
+            cx.waker().wake_by_ref();
+            Poll::Pending
+        }
+    }
+}
+
+impl AsyncBufRead for MaybePending<'_> {
+    fn poll_fill_buf(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
+        if self.ready_fill_buf {
+            self.ready_fill_buf = false;
+            if self.inner.is_empty() {
+                return Poll::Ready(Ok(&[]));
+            }
+            let len = cmp::min(2, self.inner.len());
+            Poll::Ready(Ok(&self.inner[0..len]))
+        } else {
+            self.ready_fill_buf = true;
+            Poll::Pending
+        }
+    }
+
+    fn consume(mut self: Pin<&mut Self>, amt: usize) {
+        self.inner = &self.inner[amt..];
+    }
+}
+
+#[tokio::test]
+async fn test_buffered_reader() {
+    let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+    let mut reader = BufReader::with_capacity(2, inner);
+
+    let mut buf = [0, 0, 0];
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 3);
+    assert_eq!(buf, [5, 6, 7]);
+    assert_eq!(reader.buffer(), []);
+
+    let mut buf = [0, 0];
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 2);
+    assert_eq!(buf, [0, 1]);
+    assert_eq!(reader.buffer(), []);
+
+    let mut buf = [0];
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 1);
+    assert_eq!(buf, [2]);
+    assert_eq!(reader.buffer(), [3]);
+
+    let mut buf = [0, 0, 0];
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 1);
+    assert_eq!(buf, [3, 0, 0]);
+    assert_eq!(reader.buffer(), []);
+
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 1);
+    assert_eq!(buf, [4, 0, 0]);
+    assert_eq!(reader.buffer(), []);
+
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+}
+
+#[tokio::test]
+async fn test_buffered_reader_seek() {
+    let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+    let mut reader = BufReader::with_capacity(2, Cursor::new(inner));
+
+    assert_eq!(reader.seek(SeekFrom::Start(3)).await.unwrap(), 3);
+    assert_eq!(run_fill_buf!(reader).unwrap(), &[0, 1][..]);
+    assert!(reader.seek(SeekFrom::Current(i64::MIN)).await.is_err());
+    assert_eq!(run_fill_buf!(reader).unwrap(), &[0, 1][..]);
+    assert_eq!(reader.seek(SeekFrom::Current(1)).await.unwrap(), 4);
+    assert_eq!(run_fill_buf!(reader).unwrap(), &[1, 2][..]);
+    Pin::new(&mut reader).consume(1);
+    assert_eq!(reader.seek(SeekFrom::Current(-2)).await.unwrap(), 3);
+}
+
+#[tokio::test]
+async fn test_buffered_reader_seek_underflow() {
+    // gimmick reader that yields its position modulo 256 for each byte
+    struct PositionReader {
+        pos: u64,
+    }
+    impl AsyncRead for PositionReader {
+        fn poll_read(
+            mut self: Pin<&mut Self>,
+            _: &mut Context<'_>,
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
+            let b = buf.initialize_unfilled();
+            let len = b.len();
+            for x in b {
+                *x = self.pos as u8;
+                self.pos = self.pos.wrapping_add(1);
+            }
+            buf.advance(len);
+            Poll::Ready(Ok(()))
+        }
+    }
+    impl AsyncSeek for PositionReader {
+        fn start_seek(mut self: Pin<&mut Self>, pos: SeekFrom) -> io::Result<()> {
+            match pos {
+                SeekFrom::Start(n) => {
+                    self.pos = n;
+                }
+                SeekFrom::Current(n) => {
+                    self.pos = self.pos.wrapping_add(n as u64);
+                }
+                SeekFrom::End(n) => {
+                    self.pos = u64::MAX.wrapping_add(n as u64);
+                }
+            }
+            Ok(())
+        }
+        fn poll_complete(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<u64>> {
+            Poll::Ready(Ok(self.pos))
+        }
+    }
+
+    let mut reader = BufReader::with_capacity(5, PositionReader { pos: 0 });
+    assert_eq!(run_fill_buf!(reader).unwrap(), &[0, 1, 2, 3, 4][..]);
+    assert_eq!(reader.seek(SeekFrom::End(-5)).await.unwrap(), u64::MAX - 5);
+    assert_eq!(run_fill_buf!(reader).unwrap().len(), 5);
+    // the following seek will require two underlying seeks
+    let expected = 9_223_372_036_854_775_802;
+    assert_eq!(
+        reader.seek(SeekFrom::Current(i64::MIN)).await.unwrap(),
+        expected
+    );
+    assert_eq!(run_fill_buf!(reader).unwrap().len(), 5);
+    // seeking to 0 should empty the buffer.
+    assert_eq!(reader.seek(SeekFrom::Current(0)).await.unwrap(), expected);
+    assert_eq!(reader.get_ref().pos, expected);
+}
+
+#[tokio::test]
+async fn test_short_reads() {
+    /// A dummy reader intended at testing short-reads propagation.
+    struct ShortReader {
+        lengths: Vec<usize>,
+    }
+
+    impl AsyncRead for ShortReader {
+        fn poll_read(
+            mut self: Pin<&mut Self>,
+            _: &mut Context<'_>,
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
+            if !self.lengths.is_empty() {
+                buf.advance(self.lengths.remove(0));
+            }
+            Poll::Ready(Ok(()))
+        }
+    }
+
+    let inner = ShortReader {
+        lengths: vec![0, 1, 2, 0, 1, 0],
+    };
+    let mut reader = BufReader::new(inner);
+    let mut buf = [0, 0];
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 1);
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 2);
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 1);
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+}
+
+#[tokio::test]
+async fn maybe_pending() {
+    let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+    let mut reader = BufReader::with_capacity(2, MaybePending::new(inner));
+
+    let mut buf = [0, 0, 0];
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 3);
+    assert_eq!(buf, [5, 6, 7]);
+    assert_eq!(reader.buffer(), []);
+
+    let mut buf = [0, 0];
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 2);
+    assert_eq!(buf, [0, 1]);
+    assert_eq!(reader.buffer(), []);
+
+    let mut buf = [0];
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 1);
+    assert_eq!(buf, [2]);
+    assert_eq!(reader.buffer(), [3]);
+
+    let mut buf = [0, 0, 0];
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 1);
+    assert_eq!(buf, [3, 0, 0]);
+    assert_eq!(reader.buffer(), []);
+
+    let nread = reader.read(&mut buf).await.unwrap();
+    assert_eq!(nread, 1);
+    assert_eq!(buf, [4, 0, 0]);
+    assert_eq!(reader.buffer(), []);
+
+    assert_eq!(reader.read(&mut buf).await.unwrap(), 0);
+}
+
+#[tokio::test]
+async fn maybe_pending_buf_read() {
+    let inner = MaybePending::new(&[0, 1, 2, 3, 1, 0]);
+    let mut reader = BufReader::with_capacity(2, inner);
+    let mut v = Vec::new();
+    reader.read_until(3, &mut v).await.unwrap();
+    assert_eq!(v, [0, 1, 2, 3]);
+    v.clear();
+    reader.read_until(1, &mut v).await.unwrap();
+    assert_eq!(v, [1]);
+    v.clear();
+    reader.read_until(8, &mut v).await.unwrap();
+    assert_eq!(v, [0]);
+    v.clear();
+    reader.read_until(9, &mut v).await.unwrap();
+    assert_eq!(v, []);
+}
+
+// https://github.com/rust-lang/futures-rs/pull/1573#discussion_r281162309
+#[tokio::test]
+async fn maybe_pending_seek() {
+    struct MaybePendingSeek<'a> {
+        inner: Cursor<&'a [u8]>,
+        ready: bool,
+        seek_res: Option<io::Result<()>>,
+    }
+
+    impl<'a> MaybePendingSeek<'a> {
+        fn new(inner: &'a [u8]) -> Self {
+            Self {
+                inner: Cursor::new(inner),
+                ready: true,
+                seek_res: None,
+            }
+        }
+    }
+
+    impl AsyncRead for MaybePendingSeek<'_> {
+        fn poll_read(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
+            Pin::new(&mut self.inner).poll_read(cx, buf)
+        }
+    }
+
+    impl AsyncBufRead for MaybePendingSeek<'_> {
+        fn poll_fill_buf(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+        ) -> Poll<io::Result<&[u8]>> {
+            let this: *mut Self = &mut *self as *mut _;
+            Pin::new(&mut unsafe { &mut *this }.inner).poll_fill_buf(cx)
+        }
+
+        fn consume(mut self: Pin<&mut Self>, amt: usize) {
+            Pin::new(&mut self.inner).consume(amt)
+        }
+    }
+
+    impl AsyncSeek for MaybePendingSeek<'_> {
+        fn start_seek(mut self: Pin<&mut Self>, pos: SeekFrom) -> io::Result<()> {
+            self.seek_res = Some(Pin::new(&mut self.inner).start_seek(pos));
+            Ok(())
+        }
+        fn poll_complete(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
+            if self.ready {
+                self.ready = false;
+                self.seek_res.take().unwrap_or(Ok(()))?;
+                Pin::new(&mut self.inner).poll_complete(cx)
+            } else {
+                self.ready = true;
+                cx.waker().wake_by_ref();
+                Poll::Pending
+            }
+        }
+    }
+
+    let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+    let mut reader = BufReader::with_capacity(2, MaybePendingSeek::new(inner));
+
+    assert_eq!(reader.seek(SeekFrom::Current(3)).await.unwrap(), 3);
+    assert_eq!(run_fill_buf!(reader).unwrap(), &[0, 1][..]);
+    assert!(reader.seek(SeekFrom::Current(i64::MIN)).await.is_err());
+    assert_eq!(run_fill_buf!(reader).unwrap(), &[0, 1][..]);
+    assert_eq!(reader.seek(SeekFrom::Current(1)).await.unwrap(), 4);
+    assert_eq!(run_fill_buf!(reader).unwrap(), &[1, 2][..]);
+    Pin::new(&mut reader).consume(1);
+    assert_eq!(reader.seek(SeekFrom::Current(-2)).await.unwrap(), 3);
+}
+
+// This tests the AsyncBufReadExt::fill_buf wrapper.
+#[tokio::test]
+async fn test_fill_buf_wrapper() {
+    let (mut write, read) = tokio::io::duplex(16);
+
+    let mut read = BufReader::new(read);
+    write.write_all(b"hello world").await.unwrap();
+
+    assert_eq!(read.fill_buf().await.unwrap(), b"hello world");
+    read.consume(b"hello ".len());
+    assert_eq!(read.fill_buf().await.unwrap(), b"world");
+    assert_eq!(read.fill_buf().await.unwrap(), b"world");
+    read.consume(b"world".len());
+
+    let mut fill = spawn(read.fill_buf());
+    assert_pending!(fill.poll());
+
+    write.write_all(b"foo bar").await.unwrap();
+    assert_eq!(assert_ready!(fill.poll()).unwrap(), b"foo bar");
+    drop(fill);
+
+    drop(write);
+    assert_eq!(read.fill_buf().await.unwrap(), b"foo bar");
+    read.consume(b"foo bar".len());
+    assert_eq!(read.fill_buf().await.unwrap(), b"");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_buf_writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_buf_writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_buf_writer.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_buf_writer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,537 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+// https://github.com/rust-lang/futures-rs/blob/1803948ff091b4eabf7f3bf39e16bbbdefca5cc8/futures/tests/io_buf_writer.rs
+
+use futures::task::{Context, Poll};
+use std::io::{self, Cursor};
+use std::pin::Pin;
+use tokio::io::{AsyncSeek, AsyncSeekExt, AsyncWrite, AsyncWriteExt, BufWriter, SeekFrom};
+
+use futures::future;
+use tokio_test::assert_ok;
+
+use std::cmp;
+use std::io::IoSlice;
+
+mod support {
+    pub(crate) mod io_vec;
+}
+use support::io_vec::IoBufs;
+
+struct MaybePending {
+    inner: Vec<u8>,
+    ready: bool,
+}
+
+impl MaybePending {
+    fn new(inner: Vec<u8>) -> Self {
+        Self {
+            inner,
+            ready: false,
+        }
+    }
+}
+
+impl AsyncWrite for MaybePending {
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
+        if self.ready {
+            self.ready = false;
+            Pin::new(&mut self.inner).poll_write(cx, buf)
+        } else {
+            self.ready = true;
+            cx.waker().wake_by_ref();
+            Poll::Pending
+        }
+    }
+
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Pin::new(&mut self.inner).poll_flush(cx)
+    }
+
+    fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Pin::new(&mut self.inner).poll_shutdown(cx)
+    }
+}
+
+async fn write_vectored<W>(writer: &mut W, bufs: &[IoSlice<'_>]) -> io::Result<usize>
+where
+    W: AsyncWrite + Unpin,
+{
+    let mut writer = Pin::new(writer);
+    future::poll_fn(|cx| writer.as_mut().poll_write_vectored(cx, bufs)).await
+}
+
+#[tokio::test]
+async fn buf_writer() {
+    let mut writer = BufWriter::with_capacity(2, Vec::new());
+
+    writer.write(&[0, 1]).await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(*writer.get_ref(), [0, 1]);
+
+    writer.write(&[2]).await.unwrap();
+    assert_eq!(writer.buffer(), [2]);
+    assert_eq!(*writer.get_ref(), [0, 1]);
+
+    writer.write(&[3]).await.unwrap();
+    assert_eq!(writer.buffer(), [2, 3]);
+    assert_eq!(*writer.get_ref(), [0, 1]);
+
+    writer.flush().await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(*writer.get_ref(), [0, 1, 2, 3]);
+
+    writer.write(&[4]).await.unwrap();
+    writer.write(&[5]).await.unwrap();
+    assert_eq!(writer.buffer(), [4, 5]);
+    assert_eq!(*writer.get_ref(), [0, 1, 2, 3]);
+
+    writer.write(&[6]).await.unwrap();
+    assert_eq!(writer.buffer(), [6]);
+    assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5]);
+
+    writer.write(&[7, 8]).await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8]);
+
+    writer.write(&[9, 10, 11]).await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+
+    writer.flush().await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+}
+
+#[tokio::test]
+async fn buf_writer_inner_flushes() {
+    let mut w = BufWriter::with_capacity(3, Vec::new());
+    w.write(&[0, 1]).await.unwrap();
+    assert_eq!(*w.get_ref(), []);
+    w.flush().await.unwrap();
+    let w = w.into_inner();
+    assert_eq!(w, [0, 1]);
+}
+
+#[tokio::test]
+async fn buf_writer_seek() {
+    let mut w = BufWriter::with_capacity(3, Cursor::new(Vec::new()));
+    w.write_all(&[0, 1, 2, 3, 4, 5]).await.unwrap();
+    w.write_all(&[6, 7]).await.unwrap();
+    assert_eq!(w.seek(SeekFrom::Current(0)).await.unwrap(), 8);
+    assert_eq!(&w.get_ref().get_ref()[..], &[0, 1, 2, 3, 4, 5, 6, 7][..]);
+    assert_eq!(w.seek(SeekFrom::Start(2)).await.unwrap(), 2);
+    w.write_all(&[8, 9]).await.unwrap();
+    w.flush().await.unwrap();
+    assert_eq!(&w.into_inner().into_inner()[..], &[0, 1, 8, 9, 4, 5, 6, 7]);
+}
+
+#[tokio::test]
+async fn maybe_pending_buf_writer() {
+    let mut writer = BufWriter::with_capacity(2, MaybePending::new(Vec::new()));
+
+    writer.write(&[0, 1]).await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(&writer.get_ref().inner, &[0, 1]);
+
+    writer.write(&[2]).await.unwrap();
+    assert_eq!(writer.buffer(), [2]);
+    assert_eq!(&writer.get_ref().inner, &[0, 1]);
+
+    writer.write(&[3]).await.unwrap();
+    assert_eq!(writer.buffer(), [2, 3]);
+    assert_eq!(&writer.get_ref().inner, &[0, 1]);
+
+    writer.flush().await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(&writer.get_ref().inner, &[0, 1, 2, 3]);
+
+    writer.write(&[4]).await.unwrap();
+    writer.write(&[5]).await.unwrap();
+    assert_eq!(writer.buffer(), [4, 5]);
+    assert_eq!(&writer.get_ref().inner, &[0, 1, 2, 3]);
+
+    writer.write(&[6]).await.unwrap();
+    assert_eq!(writer.buffer(), [6]);
+    assert_eq!(writer.get_ref().inner, &[0, 1, 2, 3, 4, 5]);
+
+    writer.write(&[7, 8]).await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(writer.get_ref().inner, &[0, 1, 2, 3, 4, 5, 6, 7, 8]);
+
+    writer.write(&[9, 10, 11]).await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(
+        writer.get_ref().inner,
+        &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+    );
+
+    writer.flush().await.unwrap();
+    assert_eq!(writer.buffer(), []);
+    assert_eq!(
+        &writer.get_ref().inner,
+        &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+    );
+}
+
+#[tokio::test]
+async fn maybe_pending_buf_writer_inner_flushes() {
+    let mut w = BufWriter::with_capacity(3, MaybePending::new(Vec::new()));
+    w.write(&[0, 1]).await.unwrap();
+    assert_eq!(&w.get_ref().inner, &[]);
+    w.flush().await.unwrap();
+    let w = w.into_inner().inner;
+    assert_eq!(w, [0, 1]);
+}
+
+#[tokio::test]
+async fn maybe_pending_buf_writer_seek() {
+    struct MaybePendingSeek {
+        inner: Cursor<Vec<u8>>,
+        ready_write: bool,
+        ready_seek: bool,
+        seek_res: Option<io::Result<()>>,
+    }
+
+    impl MaybePendingSeek {
+        fn new(inner: Vec<u8>) -> Self {
+            Self {
+                inner: Cursor::new(inner),
+                ready_write: false,
+                ready_seek: false,
+                seek_res: None,
+            }
+        }
+    }
+
+    impl AsyncWrite for MaybePendingSeek {
+        fn poll_write(
+            mut self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<io::Result<usize>> {
+            if self.ready_write {
+                self.ready_write = false;
+                Pin::new(&mut self.inner).poll_write(cx, buf)
+            } else {
+                self.ready_write = true;
+                cx.waker().wake_by_ref();
+                Poll::Pending
+            }
+        }
+
+        fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Pin::new(&mut self.inner).poll_flush(cx)
+        }
+
+        fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Pin::new(&mut self.inner).poll_shutdown(cx)
+        }
+    }
+
+    impl AsyncSeek for MaybePendingSeek {
+        fn start_seek(mut self: Pin<&mut Self>, pos: SeekFrom) -> io::Result<()> {
+            self.seek_res = Some(Pin::new(&mut self.inner).start_seek(pos));
+            Ok(())
+        }
+        fn poll_complete(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<u64>> {
+            if self.ready_seek {
+                self.ready_seek = false;
+                self.seek_res.take().unwrap_or(Ok(()))?;
+                Pin::new(&mut self.inner).poll_complete(cx)
+            } else {
+                self.ready_seek = true;
+                cx.waker().wake_by_ref();
+                Poll::Pending
+            }
+        }
+    }
+
+    let mut w = BufWriter::with_capacity(3, MaybePendingSeek::new(Vec::new()));
+    w.write_all(&[0, 1, 2, 3, 4, 5]).await.unwrap();
+    w.write_all(&[6, 7]).await.unwrap();
+    assert_eq!(w.seek(SeekFrom::Current(0)).await.unwrap(), 8);
+    assert_eq!(
+        &w.get_ref().inner.get_ref()[..],
+        &[0, 1, 2, 3, 4, 5, 6, 7][..]
+    );
+    assert_eq!(w.seek(SeekFrom::Start(2)).await.unwrap(), 2);
+    w.write_all(&[8, 9]).await.unwrap();
+    w.flush().await.unwrap();
+    assert_eq!(
+        &w.into_inner().inner.into_inner()[..],
+        &[0, 1, 8, 9, 4, 5, 6, 7]
+    );
+}
+
+struct MockWriter {
+    data: Vec<u8>,
+    write_len: usize,
+    vectored: bool,
+}
+
+impl MockWriter {
+    fn new(write_len: usize) -> Self {
+        MockWriter {
+            data: Vec::new(),
+            write_len,
+            vectored: false,
+        }
+    }
+
+    fn vectored(write_len: usize) -> Self {
+        MockWriter {
+            data: Vec::new(),
+            write_len,
+            vectored: true,
+        }
+    }
+
+    fn write_up_to(&mut self, buf: &[u8], limit: usize) -> usize {
+        let len = cmp::min(buf.len(), limit);
+        self.data.extend_from_slice(&buf[..len]);
+        len
+    }
+}
+
+impl AsyncWrite for MockWriter {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<Result<usize, io::Error>> {
+        let this = self.get_mut();
+        let n = this.write_up_to(buf, this.write_len);
+        Ok(n).into()
+    }
+
+    fn poll_write_vectored(
+        self: Pin<&mut Self>,
+        _: &mut Context<'_>,
+        bufs: &[IoSlice<'_>],
+    ) -> Poll<Result<usize, io::Error>> {
+        let this = self.get_mut();
+        let mut total_written = 0;
+        for buf in bufs {
+            let n = this.write_up_to(buf, this.write_len - total_written);
+            total_written += n;
+            if total_written == this.write_len {
+                break;
+            }
+        }
+        Ok(total_written).into()
+    }
+
+    fn is_write_vectored(&self) -> bool {
+        self.vectored
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+        Ok(()).into()
+    }
+
+    fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+        Ok(()).into()
+    }
+}
+
+#[tokio::test]
+async fn write_vectored_empty_on_non_vectored() {
+    let mut w = BufWriter::new(MockWriter::new(4));
+    let n = assert_ok!(write_vectored(&mut w, &[]).await);
+    assert_eq!(n, 0);
+
+    let io_vec = [IoSlice::new(&[]); 3];
+    let n = assert_ok!(write_vectored(&mut w, &io_vec).await);
+    assert_eq!(n, 0);
+
+    assert_ok!(w.flush().await);
+    assert!(w.get_ref().data.is_empty());
+}
+
+#[tokio::test]
+async fn write_vectored_empty_on_vectored() {
+    let mut w = BufWriter::new(MockWriter::vectored(4));
+    let n = assert_ok!(write_vectored(&mut w, &[]).await);
+    assert_eq!(n, 0);
+
+    let io_vec = [IoSlice::new(&[]); 3];
+    let n = assert_ok!(write_vectored(&mut w, &io_vec).await);
+    assert_eq!(n, 0);
+
+    assert_ok!(w.flush().await);
+    assert!(w.get_ref().data.is_empty());
+}
+
+#[tokio::test]
+async fn write_vectored_basic_on_non_vectored() {
+    let msg = b"foo bar baz";
+    let bufs = [
+        IoSlice::new(&msg[0..4]),
+        IoSlice::new(&msg[4..8]),
+        IoSlice::new(&msg[8..]),
+    ];
+    let mut w = BufWriter::new(MockWriter::new(4));
+    let n = assert_ok!(write_vectored(&mut w, &bufs).await);
+    assert_eq!(n, msg.len());
+    assert!(w.buffer() == &msg[..]);
+    assert_ok!(w.flush().await);
+    assert_eq!(w.get_ref().data, msg);
+}
+
+#[tokio::test]
+async fn write_vectored_basic_on_vectored() {
+    let msg = b"foo bar baz";
+    let bufs = [
+        IoSlice::new(&msg[0..4]),
+        IoSlice::new(&msg[4..8]),
+        IoSlice::new(&msg[8..]),
+    ];
+    let mut w = BufWriter::new(MockWriter::vectored(4));
+    let n = assert_ok!(write_vectored(&mut w, &bufs).await);
+    assert_eq!(n, msg.len());
+    assert!(w.buffer() == &msg[..]);
+    assert_ok!(w.flush().await);
+    assert_eq!(w.get_ref().data, msg);
+}
+
+#[tokio::test]
+async fn write_vectored_large_total_on_non_vectored() {
+    let msg = b"foo bar baz";
+    let mut bufs = [
+        IoSlice::new(&msg[0..4]),
+        IoSlice::new(&msg[4..8]),
+        IoSlice::new(&msg[8..]),
+    ];
+    let io_vec = IoBufs::new(&mut bufs);
+    let mut w = BufWriter::with_capacity(8, MockWriter::new(4));
+    let n = assert_ok!(write_vectored(&mut w, &io_vec).await);
+    assert_eq!(n, 8);
+    assert!(w.buffer() == &msg[..8]);
+    let io_vec = io_vec.advance(n);
+    let n = assert_ok!(write_vectored(&mut w, &io_vec).await);
+    assert_eq!(n, 3);
+    assert!(w.get_ref().data.as_slice() == &msg[..8]);
+    assert!(w.buffer() == &msg[8..]);
+}
+
+#[tokio::test]
+async fn write_vectored_large_total_on_vectored() {
+    let msg = b"foo bar baz";
+    let mut bufs = [
+        IoSlice::new(&msg[0..4]),
+        IoSlice::new(&msg[4..8]),
+        IoSlice::new(&msg[8..]),
+    ];
+    let io_vec = IoBufs::new(&mut bufs);
+    let mut w = BufWriter::with_capacity(8, MockWriter::vectored(10));
+    let n = assert_ok!(write_vectored(&mut w, &io_vec).await);
+    assert_eq!(n, 10);
+    assert!(w.buffer().is_empty());
+    let io_vec = io_vec.advance(n);
+    let n = assert_ok!(write_vectored(&mut w, &io_vec).await);
+    assert_eq!(n, 1);
+    assert!(w.get_ref().data.as_slice() == &msg[..10]);
+    assert!(w.buffer() == &msg[10..]);
+}
+
+struct VectoredWriteHarness {
+    writer: BufWriter<MockWriter>,
+    buf_capacity: usize,
+}
+
+impl VectoredWriteHarness {
+    fn new(buf_capacity: usize) -> Self {
+        VectoredWriteHarness {
+            writer: BufWriter::with_capacity(buf_capacity, MockWriter::new(4)),
+            buf_capacity,
+        }
+    }
+
+    fn with_vectored_backend(buf_capacity: usize) -> Self {
+        VectoredWriteHarness {
+            writer: BufWriter::with_capacity(buf_capacity, MockWriter::vectored(4)),
+            buf_capacity,
+        }
+    }
+
+    async fn write_all<'a, 'b>(&mut self, mut io_vec: IoBufs<'a, 'b>) -> usize {
+        let mut total_written = 0;
+        while !io_vec.is_empty() {
+            let n = assert_ok!(write_vectored(&mut self.writer, &io_vec).await);
+            assert!(n != 0);
+            assert!(self.writer.buffer().len() <= self.buf_capacity);
+            total_written += n;
+            io_vec = io_vec.advance(n);
+        }
+        total_written
+    }
+
+    async fn flush(&mut self) -> &[u8] {
+        assert_ok!(self.writer.flush().await);
+        &self.writer.get_ref().data
+    }
+}
+
+#[tokio::test]
+async fn write_vectored_odd_on_non_vectored() {
+    let msg = b"foo bar baz";
+    let mut bufs = [
+        IoSlice::new(&msg[0..4]),
+        IoSlice::new(&[]),
+        IoSlice::new(&msg[4..9]),
+        IoSlice::new(&msg[9..]),
+    ];
+    let mut h = VectoredWriteHarness::new(8);
+    let bytes_written = h.write_all(IoBufs::new(&mut bufs)).await;
+    assert_eq!(bytes_written, msg.len());
+    assert_eq!(h.flush().await, msg);
+}
+
+#[tokio::test]
+async fn write_vectored_odd_on_vectored() {
+    let msg = b"foo bar baz";
+    let mut bufs = [
+        IoSlice::new(&msg[0..4]),
+        IoSlice::new(&[]),
+        IoSlice::new(&msg[4..9]),
+        IoSlice::new(&msg[9..]),
+    ];
+    let mut h = VectoredWriteHarness::with_vectored_backend(8);
+    let bytes_written = h.write_all(IoBufs::new(&mut bufs)).await;
+    assert_eq!(bytes_written, msg.len());
+    assert_eq!(h.flush().await, msg);
+}
+
+#[tokio::test]
+async fn write_vectored_large_slice_on_non_vectored() {
+    let msg = b"foo bar baz";
+    let mut bufs = [
+        IoSlice::new(&[]),
+        IoSlice::new(&msg[..9]),
+        IoSlice::new(&msg[9..]),
+    ];
+    let mut h = VectoredWriteHarness::new(8);
+    let bytes_written = h.write_all(IoBufs::new(&mut bufs)).await;
+    assert_eq!(bytes_written, msg.len());
+    assert_eq!(h.flush().await, msg);
+}
+
+#[tokio::test]
+async fn write_vectored_large_slice_on_vectored() {
+    let msg = b"foo bar baz";
+    let mut bufs = [
+        IoSlice::new(&[]),
+        IoSlice::new(&msg[..9]),
+        IoSlice::new(&msg[9..]),
+    ];
+    let mut h = VectoredWriteHarness::with_vectored_backend(8);
+    let bytes_written = h.write_all(IoBufs::new(&mut bufs)).await;
+    assert_eq!(bytes_written, msg.len());
+    assert_eq!(h.flush().await, msg);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_copy_bidirectional.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_copy_bidirectional.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_copy_bidirectional.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_copy_bidirectional.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,128 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use std::time::Duration;
+use tokio::io::{self, copy_bidirectional, AsyncReadExt, AsyncWriteExt};
+use tokio::net::TcpStream;
+use tokio::task::JoinHandle;
+
+async fn make_socketpair() -> (TcpStream, TcpStream) {
+    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+    let addr = listener.local_addr().unwrap();
+    let connector = TcpStream::connect(addr);
+    let acceptor = listener.accept();
+
+    let (c1, c2) = tokio::join!(connector, acceptor);
+
+    (c1.unwrap(), c2.unwrap().0)
+}
+
+async fn block_write(s: &mut TcpStream) -> usize {
+    static BUF: [u8; 2048] = [0; 2048];
+
+    let mut copied = 0;
+    loop {
+        tokio::select! {
+            result = s.write(&BUF) => {
+                copied += result.expect("write error")
+            },
+            _ = tokio::time::sleep(Duration::from_millis(10)) => {
+                break;
+            }
+        }
+    }
+
+    copied
+}
+
+async fn symmetric<F, Fut>(mut cb: F)
+where
+    F: FnMut(JoinHandle<io::Result<(u64, u64)>>, TcpStream, TcpStream) -> Fut,
+    Fut: std::future::Future<Output = ()>,
+{
+    // We run the test twice, with streams passed to copy_bidirectional in
+    // different orders, in order to ensure that the two arguments are
+    // interchangeable.
+
+    let (a, mut a1) = make_socketpair().await;
+    let (b, mut b1) = make_socketpair().await;
+
+    let handle = tokio::spawn(async move { copy_bidirectional(&mut a1, &mut b1).await });
+    cb(handle, a, b).await;
+
+    let (a, mut a1) = make_socketpair().await;
+    let (b, mut b1) = make_socketpair().await;
+
+    let handle = tokio::spawn(async move { copy_bidirectional(&mut b1, &mut a1).await });
+
+    cb(handle, b, a).await;
+}
+
+#[tokio::test]
+async fn test_basic_transfer() {
+    symmetric(|_handle, mut a, mut b| async move {
+        a.write_all(b"test").await.unwrap();
+        let mut tmp = [0; 4];
+        b.read_exact(&mut tmp).await.unwrap();
+        assert_eq!(&tmp[..], b"test");
+    })
+    .await
+}
+
+#[tokio::test]
+async fn test_transfer_after_close() {
+    symmetric(|handle, mut a, mut b| async move {
+        AsyncWriteExt::shutdown(&mut a).await.unwrap();
+        b.read_to_end(&mut Vec::new()).await.unwrap();
+
+        b.write_all(b"quux").await.unwrap();
+        let mut tmp = [0; 4];
+        a.read_exact(&mut tmp).await.unwrap();
+        assert_eq!(&tmp[..], b"quux");
+
+        // Once both are closed, we should have our handle back
+        drop(b);
+
+        assert_eq!(handle.await.unwrap().unwrap(), (0, 4));
+    })
+    .await
+}
+
+#[tokio::test]
+async fn blocking_one_side_does_not_block_other() {
+    symmetric(|handle, mut a, mut b| async move {
+        block_write(&mut a).await;
+
+        b.write_all(b"quux").await.unwrap();
+        let mut tmp = [0; 4];
+        a.read_exact(&mut tmp).await.unwrap();
+        assert_eq!(&tmp[..], b"quux");
+
+        AsyncWriteExt::shutdown(&mut a).await.unwrap();
+
+        let mut buf = Vec::new();
+        b.read_to_end(&mut buf).await.unwrap();
+
+        drop(b);
+
+        assert_eq!(handle.await.unwrap().unwrap(), (buf.len() as u64, 4));
+    })
+    .await
+}
+
+#[tokio::test]
+async fn immediate_exit_on_error() {
+    symmetric(|handle, mut a, mut b| async move {
+        block_write(&mut a).await;
+
+        // Fill up the b->copy->a path. We expect that this will _not_ drain
+        // before we exit the copy task.
+        let _bytes_written = block_write(&mut b).await;
+
+        // Drop b. We should not wait for a to consume the data buffered in the
+        // copy loop, since b will be failing writes.
+        drop(b);
+        assert!(handle.await.unwrap().is_err());
+    })
+    .await
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_copy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_copy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_copy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_copy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,9 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
-use tokio::io::{self, AsyncRead};
+use bytes::BytesMut;
+use futures::ready;
+use tokio::io::{self, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf};
 use tokio_test::assert_ok;
 
 use std::pin::Pin;
@@ -15,14 +17,14 @@
         fn poll_read(
             mut self: Pin<&mut Self>,
             _cx: &mut Context<'_>,
-            buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
             if self.0 {
-                buf[0..11].copy_from_slice(b"hello world");
+                buf.put_slice(b"hello world");
                 self.0 = false;
-                Poll::Ready(Ok(11))
+                Poll::Ready(Ok(()))
             } else {
-                Poll::Ready(Ok(0))
+                Poll::Ready(Ok(()))
             }
         }
     }
@@ -34,3 +36,52 @@
     assert_eq!(n, 11);
     assert_eq!(wr, b"hello world");
 }
+
+#[tokio::test]
+async fn proxy() {
+    struct BufferedWd {
+        buf: BytesMut,
+        writer: io::DuplexStream,
+    }
+
+    impl AsyncWrite for BufferedWd {
+        fn poll_write(
+            self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<io::Result<usize>> {
+            self.get_mut().buf.extend_from_slice(buf);
+            Poll::Ready(Ok(buf.len()))
+        }
+
+        fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            let this = self.get_mut();
+
+            while !this.buf.is_empty() {
+                let n = ready!(Pin::new(&mut this.writer).poll_write(cx, &this.buf))?;
+                let _ = this.buf.split_to(n);
+            }
+
+            Pin::new(&mut this.writer).poll_flush(cx)
+        }
+
+        fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Pin::new(&mut self.writer).poll_shutdown(cx)
+        }
+    }
+
+    let (rd, wd) = io::duplex(1024);
+    let mut rd = rd.take(1024);
+    let mut wd = BufferedWd {
+        buf: BytesMut::new(),
+        writer: wd,
+    };
+
+    // write start bytes
+    assert_ok!(wd.write_all(&[0x42; 512]).await);
+    assert_ok!(wd.flush().await);
+
+    let n = assert_ok!(io::copy(&mut rd, &mut wd).await);
+
+    assert_eq!(n, 1024);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_driver_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_driver_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_driver_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_driver_drop.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,10 +9,11 @@
 fn tcp_doesnt_block() {
     let rt = rt();
 
-    let mut listener = rt.enter(|| {
+    let listener = {
+        let _enter = rt.enter();
         let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
         TcpListener::from_std(listener).unwrap()
-    });
+    };
 
     drop(rt);
 
@@ -27,10 +28,11 @@
 fn drop_wakes() {
     let rt = rt();
 
-    let mut listener = rt.enter(|| {
+    let listener = {
+        let _enter = rt.enter();
         let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
         TcpListener::from_std(listener).unwrap()
-    });
+    };
 
     let mut task = task::spawn(async move {
         assert_err!(listener.accept().await);
@@ -45,8 +47,7 @@
 }
 
 fn rt() -> runtime::Runtime {
-    runtime::Builder::new()
-        .basic_scheduler()
+    runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_driver.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_driver.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_driver.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_driver.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,8 +45,7 @@
     // shutting down. Then, when the task handle is dropped, the task itself is
     // dropped.
 
-    let mut rt = runtime::Builder::new()
-        .basic_scheduler()
+    let rt = runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap();
@@ -56,7 +55,7 @@
     // Define a task that just drains the listener
     let task = Arc::new(Task::new(async move {
         // Create a listener
-        let mut listener = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+        let listener = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
 
         // Send the address
         let addr = listener.local_addr().unwrap();
@@ -68,11 +67,10 @@
     }));
 
     {
-        rt.enter(|| {
-            let waker = waker_ref(&task);
-            let mut cx = Context::from_waker(&waker);
-            assert_pending!(task.future.lock().unwrap().as_mut().poll(&mut cx));
-        });
+        let _enter = rt.enter();
+        let waker = waker_ref(&task);
+        let mut cx = Context::from_waker(&waker);
+        assert_pending!(task.future.lock().unwrap().as_mut().poll(&mut cx));
     }
 
     // Get the address
@@ -86,3 +84,16 @@
     // Force the reactor to turn
     rt.block_on(async {});
 }
+
+#[test]
+#[should_panic(
+    expected = "A Tokio 1.x context was found, but IO is disabled. Call `enable_io` on the runtime builder to enable IO."
+)]
+fn panics_when_io_disabled() {
+    let rt = runtime::Builder::new_current_thread().build().unwrap();
+
+    rt.block_on(async {
+        let _ =
+            tokio::net::TcpListener::from_std(std::net::TcpListener::bind("127.0.0.1:0").unwrap());
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_fill_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_fill_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_fill_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_fill_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,34 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use tempfile::NamedTempFile;
+use tokio::fs::File;
+use tokio::io::{AsyncBufReadExt, BufReader};
+use tokio_test::assert_ok;
+
+#[tokio::test]
+async fn fill_buf_file() {
+    let file = NamedTempFile::new().unwrap();
+
+    assert_ok!(std::fs::write(file.path(), b"hello"));
+
+    let file = assert_ok!(File::open(file.path()).await);
+    let mut file = BufReader::new(file);
+
+    let mut contents = Vec::new();
+
+    loop {
+        let consumed = {
+            let buffer = assert_ok!(file.fill_buf().await);
+            if buffer.is_empty() {
+                break;
+            }
+            contents.extend_from_slice(buffer);
+            buffer.len()
+        };
+
+        file.consume(consumed);
+    }
+
+    assert_eq!(contents, b"hello");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_lines.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_lines.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_lines.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_lines.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,19 +17,3 @@
     assert_eq!(b, "");
     assert!(assert_ok!(st.next_line().await).is_none());
 }
-
-#[tokio::test]
-async fn lines_stream() {
-    use tokio::stream::StreamExt;
-
-    let rd: &[u8] = b"hello\r\nworld\n\n";
-    let mut st = rd.lines();
-
-    let b = assert_ok!(st.next().await.unwrap());
-    assert_eq!(b, "hello");
-    let b = assert_ok!(st.next().await.unwrap());
-    assert_eq!(b, "world");
-    let b = assert_ok!(st.next().await.unwrap());
-    assert_eq!(b, "");
-    assert!(st.next().await.is_none());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_mem_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_mem_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_mem_stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_mem_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -63,6 +63,25 @@
 }
 
 #[tokio::test]
+async fn disconnect_reader() {
+    let (a, mut b) = duplex(2);
+
+    let t1 = tokio::spawn(async move {
+        // this will block, as not all data fits into duplex
+        b.write_all(b"ping").await.unwrap_err();
+    });
+
+    let t2 = tokio::spawn(async move {
+        // here we drop the reader side, and we expect the writer in the other
+        // task to exit with an error
+        drop(a);
+    });
+
+    t2.await.unwrap();
+    t1.await.unwrap();
+}
+
+#[tokio::test]
 async fn max_write_size() {
     let (mut a, mut b) = duplex(32);
 
@@ -73,11 +92,11 @@
         assert_eq!(n, 4);
     });
 
-    let t2 = tokio::spawn(async move {
-        let mut buf = [0u8; 4];
-        b.read_exact(&mut buf).await.unwrap();
-    });
+    let mut buf = [0u8; 4];
+    b.read_exact(&mut buf).await.unwrap();
 
     t1.await.unwrap();
-    t2.await.unwrap();
+
+    // drop b only after task t1 finishes writing
+    drop(b);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_read_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_read_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_read_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_read_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use tokio::io::{AsyncRead, AsyncReadExt, ReadBuf};
+use tokio_test::assert_ok;
+
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+#[tokio::test]
+async fn read_buf() {
+    struct Rd {
+        cnt: usize,
+    }
+
+    impl AsyncRead for Rd {
+        fn poll_read(
+            mut self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
+            self.cnt += 1;
+            buf.put_slice(b"hello world");
+            Poll::Ready(Ok(()))
+        }
+    }
+
+    let mut buf = vec![];
+    let mut rd = Rd { cnt: 0 };
+
+    let n = assert_ok!(rd.read_buf(&mut buf).await);
+    assert_eq!(1, rd.cnt);
+    assert_eq!(n, 11);
+    assert_eq!(buf[..], b"hello world"[..]);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_reader_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_reader_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_reader_stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_reader_stream.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-#![warn(rust_2018_idioms)]
-#![cfg(feature = "full")]
-
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use tokio::io::AsyncRead;
-use tokio::stream::StreamExt;
-
-/// produces at most `remaining` zeros, that returns error.
-/// each time it reads at most 31 byte.
-struct Reader {
-    remaining: usize,
-}
-
-impl AsyncRead for Reader {
-    fn poll_read(
-        self: Pin<&mut Self>,
-        _cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<std::io::Result<usize>> {
-        let this = Pin::into_inner(self);
-        assert_ne!(buf.len(), 0);
-        if this.remaining > 0 {
-            let n = std::cmp::min(this.remaining, buf.len());
-            let n = std::cmp::min(n, 31);
-            for x in &mut buf[..n] {
-                *x = 0;
-            }
-            this.remaining -= n;
-            Poll::Ready(Ok(n))
-        } else {
-            Poll::Ready(Err(std::io::Error::from_raw_os_error(22)))
-        }
-    }
-}
-
-#[tokio::test]
-async fn correct_behavior_on_errors() {
-    let reader = Reader { remaining: 8000 };
-    let mut stream = tokio::io::reader_stream(reader);
-    let mut zeros_received = 0;
-    let mut had_error = false;
-    loop {
-        let item = stream.next().await.unwrap();
-        match item {
-            Ok(bytes) => {
-                let bytes = &*bytes;
-                for byte in bytes {
-                    assert_eq!(*byte, 0);
-                    zeros_received += 1;
-                }
-            }
-            Err(_) => {
-                assert!(!had_error);
-                had_error = true;
-                break;
-            }
-        }
-    }
-
-    assert!(had_error);
-    assert_eq!(zeros_received, 8000);
-    assert!(stream.next().await.is_none());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
-use tokio::io::{AsyncRead, AsyncReadExt};
+use tokio::io::{AsyncRead, AsyncReadExt, ReadBuf};
 use tokio_test::assert_ok;
 
 use std::io;
@@ -19,13 +19,13 @@
         fn poll_read(
             mut self: Pin<&mut Self>,
             _cx: &mut Context<'_>,
-            buf: &mut [u8],
-        ) -> Poll<io::Result<usize>> {
+            buf: &mut ReadBuf<'_>,
+        ) -> Poll<io::Result<()>> {
             assert_eq!(0, self.poll_cnt);
             self.poll_cnt += 1;
 
-            buf[0..11].copy_from_slice(b"hello world");
-            Poll::Ready(Ok(11))
+            buf.put_slice(b"hello world");
+            Poll::Ready(Ok(()))
         }
     }
 
@@ -43,12 +43,11 @@
     fn poll_read(
         self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        for b in &mut *buf {
-            *b = b'a';
-        }
-        Poll::Ready(Ok(buf.len() * 2))
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        *buf = ReadBuf::new(Box::leak(vec![0; buf.capacity()].into_boxed_slice()));
+        buf.advance(buf.capacity());
+        Poll::Ready(Ok(()))
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_read_to_end.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_read_to_end.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_read_to_end.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_read_to_end.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,9 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
-use tokio::io::AsyncReadExt;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use tokio::io::{AsyncRead, AsyncReadExt, ReadBuf};
 use tokio_test::assert_ok;
 
 #[tokio::test]
@@ -13,3 +15,64 @@
     assert_eq!(n, 11);
     assert_eq!(buf[..], b"hello world"[..]);
 }
+
+#[derive(Copy, Clone, Debug)]
+enum State {
+    Initializing,
+    JustFilling,
+    Done,
+}
+
+struct UninitTest {
+    num_init: usize,
+    state: State,
+}
+
+impl AsyncRead for UninitTest {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        _cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
+        let me = Pin::into_inner(self);
+        let real_num_init = buf.initialized().len() - buf.filled().len();
+        assert_eq!(real_num_init, me.num_init, "{:?}", me.state);
+
+        match me.state {
+            State::Initializing => {
+                buf.initialize_unfilled_to(me.num_init + 2);
+                buf.advance(1);
+                me.num_init += 1;
+
+                if me.num_init == 24 {
+                    me.state = State::JustFilling;
+                }
+            }
+            State::JustFilling => {
+                buf.advance(1);
+                me.num_init -= 1;
+
+                if me.num_init == 15 {
+                    // The buffer is resized on next call.
+                    me.num_init = 0;
+                    me.state = State::Done;
+                }
+            }
+            State::Done => { /* .. do nothing .. */ }
+        }
+
+        Poll::Ready(Ok(()))
+    }
+}
+
+#[tokio::test]
+async fn read_to_end_uninit() {
+    let mut buf = Vec::with_capacity(64);
+    let mut test = UninitTest {
+        num_init: 0,
+        state: State::Initializing,
+    };
+
+    test.read_to_end(&mut buf).await.unwrap();
+    assert_eq!(buf.len(), 33);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,7 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
-use tokio::io::{split, AsyncRead, AsyncWrite, ReadHalf, WriteHalf};
+use tokio::io::{split, AsyncRead, AsyncWrite, ReadBuf, ReadHalf, WriteHalf};
 
 use std::io;
 use std::pin::Pin;
@@ -13,9 +13,10 @@
     fn poll_read(
         self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
-        _buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        Poll::Ready(Ok(1))
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        buf.put_slice(&[b'z']);
+        Poll::Ready(Ok(()))
     }
 }
 
@@ -49,10 +50,10 @@
 fn split_stream_id() {
     let (r1, w1) = split(RW);
     let (r2, w2) = split(RW);
-    assert_eq!(r1.is_pair_of(&w1), true);
-    assert_eq!(r1.is_pair_of(&w2), false);
-    assert_eq!(r2.is_pair_of(&w2), true);
-    assert_eq!(r2.is_pair_of(&w1), false);
+    assert!(r1.is_pair_of(&w1));
+    assert!(!r1.is_pair_of(&w2));
+    assert!(r2.is_pair_of(&w2));
+    assert!(!r2.is_pair_of(&w1));
 }
 
 #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_write_all_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_write_all_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_write_all_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_write_all_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use tokio::io::{AsyncWrite, AsyncWriteExt};
+use tokio_test::{assert_err, assert_ok};
+
+use bytes::{Buf, Bytes, BytesMut};
+use std::cmp;
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+#[tokio::test]
+async fn write_all_buf() {
+    struct Wr {
+        buf: BytesMut,
+        cnt: usize,
+    }
+
+    impl AsyncWrite for Wr {
+        fn poll_write(
+            mut self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<io::Result<usize>> {
+            let n = cmp::min(4, buf.len());
+            dbg!(buf);
+            let buf = &buf[0..n];
+
+            self.cnt += 1;
+            self.buf.extend(buf);
+            Ok(buf.len()).into()
+        }
+
+        fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Ok(()).into()
+        }
+
+        fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Ok(()).into()
+        }
+    }
+
+    let mut wr = Wr {
+        buf: BytesMut::with_capacity(64),
+        cnt: 0,
+    };
+
+    let mut buf = Bytes::from_static(b"hello").chain(Bytes::from_static(b"world"));
+
+    assert_ok!(wr.write_all_buf(&mut buf).await);
+    assert_eq!(wr.buf, b"helloworld"[..]);
+    // expect 4 writes, [hell],[o],[worl],[d]
+    assert_eq!(wr.cnt, 4);
+    assert!(!buf.has_remaining());
+}
+
+#[tokio::test]
+async fn write_buf_err() {
+    /// Error out after writing the first 4 bytes
+    struct Wr {
+        cnt: usize,
+    }
+
+    impl AsyncWrite for Wr {
+        fn poll_write(
+            mut self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+            _buf: &[u8],
+        ) -> Poll<io::Result<usize>> {
+            self.cnt += 1;
+            if self.cnt == 2 {
+                return Poll::Ready(Err(io::Error::new(io::ErrorKind::Other, "whoops")));
+            }
+            Poll::Ready(Ok(4))
+        }
+
+        fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Ok(()).into()
+        }
+
+        fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Ok(()).into()
+        }
+    }
+
+    let mut wr = Wr { cnt: 0 };
+
+    let mut buf = Bytes::from_static(b"hello").chain(Bytes::from_static(b"world"));
+
+    assert_err!(wr.write_all_buf(&mut buf).await);
+    assert_eq!(
+        buf.copy_to_bytes(buf.remaining()),
+        Bytes::from_static(b"oworld")
+    );
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_write_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_write_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/io_write_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/io_write_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,56 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use tokio::io::{AsyncWrite, AsyncWriteExt};
+use tokio_test::assert_ok;
+
+use bytes::BytesMut;
+use std::cmp;
+use std::io::{self, Cursor};
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+#[tokio::test]
+async fn write_all() {
+    struct Wr {
+        buf: BytesMut,
+        cnt: usize,
+    }
+
+    impl AsyncWrite for Wr {
+        fn poll_write(
+            mut self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<io::Result<usize>> {
+            assert_eq!(self.cnt, 0);
+
+            let n = cmp::min(4, buf.len());
+            let buf = &buf[0..n];
+
+            self.cnt += 1;
+            self.buf.extend(buf);
+            Ok(buf.len()).into()
+        }
+
+        fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Ok(()).into()
+        }
+
+        fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Ok(()).into()
+        }
+    }
+
+    let mut wr = Wr {
+        buf: BytesMut::with_capacity(64),
+        cnt: 0,
+    };
+
+    let mut buf = Cursor::new(&b"hello world"[..]);
+
+    assert_ok!(wr.write_buf(&mut buf).await);
+    assert_eq!(wr.buf, b"hell"[..]);
+    assert_eq!(wr.cnt, 1);
+    assert_eq!(buf.position(), 4);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/macros_select.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/macros_select.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/macros_select.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/macros_select.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,4 @@
-#![allow(clippy::blacklisted_name, clippy::stable_sort_primitive)]
-
+#![allow(clippy::blacklisted_name)]
 use tokio::sync::{mpsc, oneshot};
 use tokio::task;
 use tokio_test::{assert_ok, assert_pending, assert_ready};
@@ -153,7 +152,7 @@
         }
     }
 
-    msgs.sort();
+    msgs.sort_unstable();
     assert_eq!(&msgs[..], &[1, 2, 3]);
 }
 
@@ -360,12 +359,25 @@
 async fn use_future_in_if_condition() {
     use tokio::time::{self, Duration};
 
-    let mut delay = time::delay_for(Duration::from_millis(50));
+    tokio::select! {
+        _ = time::sleep(Duration::from_millis(10)), if false => {
+            panic!("if condition ignored")
+        }
+        _ = async { 1u32 } => {
+        }
+    }
+}
+
+#[tokio::test]
+async fn use_future_in_if_condition_biased() {
+    use tokio::time::{self, Duration};
 
     tokio::select! {
-        _ = &mut delay, if !delay.is_elapsed() => {
+        biased;
+        _ = time::sleep(Duration::from_millis(10)), if false => {
+            panic!("if condition ignored")
         }
-        _ = async { 1 } => {
+        _ = async { 1u32 } => {
         }
     }
 }
@@ -458,8 +470,91 @@
 async fn async_noop() {}
 
 async fn async_never() -> ! {
-    use tokio::time::Duration;
+    futures::future::pending().await
+}
+
+// From https://github.com/tokio-rs/tokio/issues/2857
+#[tokio::test]
+async fn mut_on_left_hand_side() {
+    let v = async move {
+        let ok = async { 1 };
+        tokio::pin!(ok);
+        tokio::select! {
+            mut a = &mut ok => {
+                a += 1;
+                a
+            }
+        }
+    }
+    .await;
+    assert_eq!(v, 2);
+}
+
+#[tokio::test]
+async fn biased_one_not_ready() {
+    let (_tx1, rx1) = oneshot::channel::<i32>();
+    let (tx2, rx2) = oneshot::channel::<i32>();
+    let (tx3, rx3) = oneshot::channel::<i32>();
+
+    tx2.send(2).unwrap();
+    tx3.send(3).unwrap();
+
+    let v = tokio::select! {
+        biased;
+
+        _ = rx1 => unreachable!(),
+        res = rx2 => {
+            assert_ok!(res)
+        },
+        _ = rx3 => {
+            panic!("This branch should never be activated because `rx2` should be polled before `rx3` due to `biased;`.")
+        }
+    };
+
+    assert_eq!(2, v);
+}
+
+#[tokio::test]
+async fn biased_eventually_ready() {
+    use tokio::task::yield_now;
+
+    let one = async {};
+    let two = async { yield_now().await };
+    let three = async { yield_now().await };
+
+    let mut count = 0u8;
+
+    tokio::pin!(one, two, three);
+
     loop {
-        tokio::time::delay_for(Duration::from_millis(10)).await;
+        tokio::select! {
+            biased;
+
+            _ = &mut two, if count < 2 => {
+                count += 1;
+                assert_eq!(count, 2);
+            }
+            _ = &mut three, if count < 3 => {
+                count += 1;
+                assert_eq!(count, 3);
+            }
+            _ = &mut one, if count < 1 => {
+                count += 1;
+                assert_eq!(count, 1);
+            }
+            else => break,
+        }
+    }
+
+    assert_eq!(count, 3);
+}
+
+// https://github.com/tokio-rs/tokio/issues/3830
+// https://github.com/rust-lang/rust-clippy/issues/7304
+#[warn(clippy::default_numeric_fallback)]
+pub async fn default_numeric_fallback() {
+    tokio::select! {
+        _ = async {} => (),
+        else => (),
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/macros_test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/macros_test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/macros_test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/macros_test.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,18 +2,31 @@
 
 #[test]
 async fn test_macro_can_be_used_via_use() {
-    tokio::spawn(async {
-        assert_eq!(1 + 1, 2);
-    })
-    .await
-    .unwrap();
+    tokio::spawn(async {}).await.unwrap();
 }
 
 #[tokio::test]
 async fn test_macro_is_resilient_to_shadowing() {
-    tokio::spawn(async {
-        assert_eq!(1 + 1, 2);
-    })
-    .await
-    .unwrap();
+    tokio::spawn(async {}).await.unwrap();
+}
+
+// https://github.com/tokio-rs/tokio/issues/3403
+#[rustfmt::skip] // this `rustfmt::skip` is necessary because unused_braces does not warn if the block contains newline.
+#[tokio::main]
+pub async fn unused_braces_main() { println!("hello") }
+#[rustfmt::skip] // this `rustfmt::skip` is necessary because unused_braces does not warn if the block contains newline.
+#[tokio::test]
+async fn unused_braces_test() { assert_eq!(1 + 1, 2) }
+
+// https://github.com/tokio-rs/tokio/pull/3766#issuecomment-835508651
+#[std::prelude::v1::test]
+fn trait_method() {
+    trait A {
+        fn f(self);
+    }
+    impl A for () {
+        #[tokio::main]
+        async fn f(self) {}
+    }
+    ().f()
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/named_pipe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/named_pipe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/named_pipe.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/named_pipe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,393 @@
+#![cfg(feature = "full")]
+#![cfg(all(windows))]
+
+use std::io;
+use std::mem;
+use std::os::windows::io::AsRawHandle;
+use std::time::Duration;
+use tokio::io::AsyncWriteExt;
+use tokio::net::windows::named_pipe::{ClientOptions, PipeMode, ServerOptions};
+use tokio::time;
+use winapi::shared::winerror;
+
+#[tokio::test]
+async fn test_named_pipe_client_drop() -> io::Result<()> {
+    const PIPE_NAME: &str = r"\\.\pipe\test-named-pipe-client-drop";
+
+    let mut server = ServerOptions::new().create(PIPE_NAME)?;
+
+    assert_eq!(num_instances("test-named-pipe-client-drop")?, 1);
+
+    let client = ClientOptions::new().open(PIPE_NAME)?;
+
+    server.connect().await?;
+    drop(client);
+
+    // instance will be broken because client is gone
+    match server.write_all(b"ping").await {
+        Err(e) if e.raw_os_error() == Some(winerror::ERROR_NO_DATA as i32) => (),
+        x => panic!("{:?}", x),
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_named_pipe_single_client() -> io::Result<()> {
+    use tokio::io::{AsyncBufReadExt as _, BufReader};
+
+    const PIPE_NAME: &str = r"\\.\pipe\test-named-pipe-single-client";
+
+    let server = ServerOptions::new().create(PIPE_NAME)?;
+
+    let server = tokio::spawn(async move {
+        // Note: we wait for a client to connect.
+        server.connect().await?;
+
+        let mut server = BufReader::new(server);
+
+        let mut buf = String::new();
+        server.read_line(&mut buf).await?;
+        server.write_all(b"pong\n").await?;
+        Ok::<_, io::Error>(buf)
+    });
+
+    let client = tokio::spawn(async move {
+        let client = ClientOptions::new().open(PIPE_NAME)?;
+
+        let mut client = BufReader::new(client);
+
+        let mut buf = String::new();
+        client.write_all(b"ping\n").await?;
+        client.read_line(&mut buf).await?;
+        Ok::<_, io::Error>(buf)
+    });
+
+    let (server, client) = tokio::try_join!(server, client)?;
+
+    assert_eq!(server?, "ping\n");
+    assert_eq!(client?, "pong\n");
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_named_pipe_multi_client() -> io::Result<()> {
+    use tokio::io::{AsyncBufReadExt as _, BufReader};
+
+    const PIPE_NAME: &str = r"\\.\pipe\test-named-pipe-multi-client";
+    const N: usize = 10;
+
+    // The first server needs to be constructed early so that clients can
+    // be correctly connected. Otherwise calling .wait will cause the client to
+    // error.
+    let mut server = ServerOptions::new().create(PIPE_NAME)?;
+
+    let server = tokio::spawn(async move {
+        for _ in 0..N {
+            // Wait for client to connect.
+            server.connect().await?;
+            let mut inner = BufReader::new(server);
+
+            // Construct the next server to be connected before sending the one
+            // we already have of onto a task. This ensures that the server
+            // isn't closed (after it's done in the task) before a new one is
+            // available. Otherwise the client might error with
+            // `io::ErrorKind::NotFound`.
+            server = ServerOptions::new().create(PIPE_NAME)?;
+
+            let _ = tokio::spawn(async move {
+                let mut buf = String::new();
+                inner.read_line(&mut buf).await?;
+                inner.write_all(b"pong\n").await?;
+                inner.flush().await?;
+                Ok::<_, io::Error>(())
+            });
+        }
+
+        Ok::<_, io::Error>(())
+    });
+
+    let mut clients = Vec::new();
+
+    for _ in 0..N {
+        clients.push(tokio::spawn(async move {
+            // This showcases a generic connect loop.
+            //
+            // We immediately try to create a client, if it's not found or the
+            // pipe is busy we use the specialized wait function on the client
+            // builder.
+            let client = loop {
+                match ClientOptions::new().open(PIPE_NAME) {
+                    Ok(client) => break client,
+                    Err(e) if e.raw_os_error() == Some(winerror::ERROR_PIPE_BUSY as i32) => (),
+                    Err(e) if e.kind() == io::ErrorKind::NotFound => (),
+                    Err(e) => return Err(e),
+                }
+
+                // Wait for a named pipe to become available.
+                time::sleep(Duration::from_millis(10)).await;
+            };
+
+            let mut client = BufReader::new(client);
+
+            let mut buf = String::new();
+            client.write_all(b"ping\n").await?;
+            client.flush().await?;
+            client.read_line(&mut buf).await?;
+            Ok::<_, io::Error>(buf)
+        }));
+    }
+
+    for client in clients {
+        let result = client.await?;
+        assert_eq!(result?, "pong\n");
+    }
+
+    server.await??;
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_named_pipe_multi_client_ready() -> io::Result<()> {
+    use tokio::io::Interest;
+
+    const PIPE_NAME: &str = r"\\.\pipe\test-named-pipe-multi-client-ready";
+    const N: usize = 10;
+
+    // The first server needs to be constructed early so that clients can
+    // be correctly connected. Otherwise calling .wait will cause the client to
+    // error.
+    let mut server = ServerOptions::new().create(PIPE_NAME)?;
+
+    let server = tokio::spawn(async move {
+        for _ in 0..N {
+            // Wait for client to connect.
+            server.connect().await?;
+
+            let inner_server = server;
+
+            // Construct the next server to be connected before sending the one
+            // we already have of onto a task. This ensures that the server
+            // isn't closed (after it's done in the task) before a new one is
+            // available. Otherwise the client might error with
+            // `io::ErrorKind::NotFound`.
+            server = ServerOptions::new().create(PIPE_NAME)?;
+
+            let _ = tokio::spawn(async move {
+                let server = inner_server;
+
+                {
+                    let mut read_buf = [0u8; 5];
+                    let mut read_buf_cursor = 0;
+
+                    loop {
+                        server.readable().await?;
+
+                        let buf = &mut read_buf[read_buf_cursor..];
+
+                        match server.try_read(buf) {
+                            Ok(n) => {
+                                read_buf_cursor += n;
+
+                                if read_buf_cursor == read_buf.len() {
+                                    break;
+                                }
+                            }
+                            Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+                                continue;
+                            }
+                            Err(e) => {
+                                return Err(e);
+                            }
+                        }
+                    }
+                };
+
+                {
+                    let write_buf = b"pong\n";
+                    let mut write_buf_cursor = 0;
+
+                    loop {
+                        server.writable().await?;
+                        let buf = &write_buf[write_buf_cursor..];
+
+                        match server.try_write(buf) {
+                            Ok(n) => {
+                                write_buf_cursor += n;
+
+                                if write_buf_cursor == write_buf.len() {
+                                    break;
+                                }
+                            }
+                            Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+                                continue;
+                            }
+                            Err(e) => {
+                                return Err(e);
+                            }
+                        }
+                    }
+                }
+
+                Ok::<_, io::Error>(())
+            });
+        }
+
+        Ok::<_, io::Error>(())
+    });
+
+    let mut clients = Vec::new();
+
+    for _ in 0..N {
+        clients.push(tokio::spawn(async move {
+            // This showcases a generic connect loop.
+            //
+            // We immediately try to create a client, if it's not found or the
+            // pipe is busy we use the specialized wait function on the client
+            // builder.
+            let client = loop {
+                match ClientOptions::new().open(PIPE_NAME) {
+                    Ok(client) => break client,
+                    Err(e) if e.raw_os_error() == Some(winerror::ERROR_PIPE_BUSY as i32) => (),
+                    Err(e) if e.kind() == io::ErrorKind::NotFound => (),
+                    Err(e) => return Err(e),
+                }
+
+                // Wait for a named pipe to become available.
+                time::sleep(Duration::from_millis(10)).await;
+            };
+
+            let mut read_buf = [0u8; 5];
+            let mut read_buf_cursor = 0;
+            let write_buf = b"ping\n";
+            let mut write_buf_cursor = 0;
+
+            loop {
+                let mut interest = Interest::READABLE;
+                if write_buf_cursor < write_buf.len() {
+                    interest |= Interest::WRITABLE;
+                }
+
+                let ready = client.ready(interest).await?;
+
+                if ready.is_readable() {
+                    let buf = &mut read_buf[read_buf_cursor..];
+
+                    match client.try_read(buf) {
+                        Ok(n) => {
+                            read_buf_cursor += n;
+
+                            if read_buf_cursor == read_buf.len() {
+                                break;
+                            }
+                        }
+                        Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+                            continue;
+                        }
+                        Err(e) => {
+                            return Err(e);
+                        }
+                    }
+                }
+
+                if ready.is_writable() {
+                    let buf = &write_buf[write_buf_cursor..];
+
+                    if buf.is_empty() {
+                        continue;
+                    }
+
+                    match client.try_write(buf) {
+                        Ok(n) => {
+                            write_buf_cursor += n;
+                        }
+                        Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+                            continue;
+                        }
+                        Err(e) => {
+                            return Err(e);
+                        }
+                    }
+                }
+            }
+
+            let buf = String::from_utf8_lossy(&read_buf).into_owned();
+
+            Ok::<_, io::Error>(buf)
+        }));
+    }
+
+    for client in clients {
+        let result = client.await?;
+        assert_eq!(result?, "pong\n");
+    }
+
+    server.await??;
+    Ok(())
+}
+
+// This tests what happens when a client tries to disconnect.
+#[tokio::test]
+async fn test_named_pipe_mode_message() -> io::Result<()> {
+    const PIPE_NAME: &str = r"\\.\pipe\test-named-pipe-mode-message";
+
+    let server = ServerOptions::new()
+        .pipe_mode(PipeMode::Message)
+        .create(PIPE_NAME)?;
+
+    let _ = ClientOptions::new().open(PIPE_NAME)?;
+    server.connect().await?;
+    Ok(())
+}
+
+fn num_instances(pipe_name: impl AsRef<str>) -> io::Result<u32> {
+    use ntapi::ntioapi;
+    use winapi::shared::ntdef;
+
+    let mut name = pipe_name.as_ref().encode_utf16().collect::<Vec<_>>();
+    let mut name = ntdef::UNICODE_STRING {
+        Length: (name.len() * mem::size_of::<u16>()) as u16,
+        MaximumLength: (name.len() * mem::size_of::<u16>()) as u16,
+        Buffer: name.as_mut_ptr(),
+    };
+    let root = std::fs::File::open(r"\\.\Pipe\")?;
+    let mut io_status_block = unsafe { mem::zeroed() };
+    let mut file_directory_information = [0_u8; 1024];
+
+    let status = unsafe {
+        ntioapi::NtQueryDirectoryFile(
+            root.as_raw_handle(),
+            std::ptr::null_mut(),
+            None,
+            std::ptr::null_mut(),
+            &mut io_status_block,
+            &mut file_directory_information as *mut _ as *mut _,
+            1024,
+            ntioapi::FileDirectoryInformation,
+            0,
+            &mut name,
+            0,
+        )
+    };
+
+    if status as u32 != winerror::NO_ERROR {
+        return Err(io::Error::last_os_error());
+    }
+
+    let info = unsafe {
+        mem::transmute::<_, &ntioapi::FILE_DIRECTORY_INFORMATION>(&file_directory_information)
+    };
+    let raw_name = unsafe {
+        std::slice::from_raw_parts(
+            info.FileName.as_ptr(),
+            info.FileNameLength as usize / mem::size_of::<u16>(),
+        )
+    };
+    let name = String::from_utf16(raw_name).unwrap();
+    let num_instances = unsafe { *info.EndOfFile.QuadPart() };
+
+    assert_eq!(name, pipe_name.as_ref());
+
+    Ok(num_instances as u32)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/no_rt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/no_rt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/no_rt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/no_rt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,13 +7,17 @@
 use std::net::TcpListener;
 
 #[test]
-#[should_panic(expected = "no timer running")]
-fn panics_when_no_timer() {
+#[should_panic(
+    expected = "there is no reactor running, must be called from the context of a Tokio 1.x runtime"
+)]
+fn timeout_panics_when_no_tokio_context() {
     block_on(timeout_value());
 }
 
 #[test]
-#[should_panic(expected = "no reactor running")]
+#[should_panic(
+    expected = "there is no reactor running, must be called from the context of a Tokio 1.x runtime"
+)]
 fn panics_when_no_reactor() {
     let srv = TcpListener::bind("127.0.0.1:0").unwrap();
     let addr = srv.local_addr().unwrap();
@@ -22,6 +26,14 @@
 
 async fn timeout_value() {
     let (_tx, rx) = oneshot::channel::<()>();
-    let dur = Duration::from_millis(20);
+    let dur = Duration::from_millis(10);
     let _ = timeout(dur, rx).await;
 }
+
+#[test]
+#[should_panic(
+    expected = "there is no reactor running, must be called from the context of a Tokio 1.x runtime"
+)]
+fn io_panics_when_no_tokio_context() {
+    let _ = tokio::net::TcpListener::from_std(std::net::TcpListener::bind("127.0.0.1:0").unwrap());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_arg0.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_arg0.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_arg0.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_arg0.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+#![warn(rust_2018_idioms)]
+#![cfg(all(feature = "full", unix))]
+
+use tokio::process::Command;
+
+#[tokio::test]
+async fn arg0() {
+    let mut cmd = Command::new("sh");
+    cmd.arg0("test_string").arg("-c").arg("echo $0");
+
+    let output = cmd.output().await.unwrap();
+    assert_eq!(output.stdout, b"test_string\n");
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_issue_2174.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_issue_2174.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_issue_2174.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_issue_2174.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 
 use std::process::Stdio;
 use std::time::Duration;
-use tokio::prelude::*;
+use tokio::io::AsyncWriteExt;
 use tokio::process::Command;
 use tokio::time;
 use tokio_test::assert_err;
@@ -36,11 +36,10 @@
     });
 
     // Sleep enough time so that the child process's stdin's buffer fills.
-    time::delay_for(Duration::from_secs(1)).await;
+    time::sleep(Duration::from_secs(1)).await;
 
     // Kill the child process.
-    child.kill().unwrap();
-    let _ = child.await;
+    child.kill().await.unwrap();
 
     assert_err!(handle.await);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_issue_42.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_issue_42.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_issue_42.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_issue_42.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,14 +18,16 @@
     let join_handles = (0..10usize).map(|_| {
         task::spawn(async {
             let processes = (0..10usize).map(|i| {
-                Command::new("echo")
+                let mut child = Command::new("echo")
                     .arg(format!("I am spawned process #{}", i))
                     .stdin(Stdio::null())
                     .stdout(Stdio::null())
                     .stderr(Stdio::null())
                     .kill_on_drop(true)
                     .spawn()
-                    .unwrap()
+                    .unwrap();
+
+                async move { child.wait().await }
             });
 
             join_all(processes).await;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_kill_on_drop.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_kill_on_drop.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_kill_on_drop.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_kill_on_drop.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,17 @@
 #![cfg(all(unix, feature = "process"))]
 #![warn(rust_2018_idioms)]
 
+use std::io::ErrorKind;
 use std::process::Stdio;
 use std::time::Duration;
 use tokio::io::AsyncReadExt;
 use tokio::process::Command;
-use tokio::time::delay_for;
+use tokio::time::sleep;
 use tokio_test::assert_ok;
 
 #[tokio::test]
 async fn kill_on_drop() {
-    let mut cmd = Command::new("sh");
+    let mut cmd = Command::new("bash");
     cmd.args(&[
         "-c",
         "
@@ -24,13 +25,14 @@
     ",
     ]);
 
-    let mut child = cmd
-        .kill_on_drop(true)
-        .stdout(Stdio::piped())
-        .spawn()
-        .unwrap();
+    let e = cmd.kill_on_drop(true).stdout(Stdio::piped()).spawn();
+    if e.is_err() && e.as_ref().unwrap_err().kind() == ErrorKind::NotFound {
+        println!("bash not available; skipping test");
+        return;
+    }
+    let mut child = e.unwrap();
 
-    delay_for(Duration::from_secs(2)).await;
+    sleep(Duration::from_secs(2)).await;
 
     let mut out = child.stdout.take().unwrap();
     drop(child);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_raw_handle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_raw_handle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_raw_handle.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_raw_handle.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+#![cfg(windows)]
+
+use tokio::process::Command;
+use winapi::um::processthreadsapi::GetProcessId;
+
+#[tokio::test]
+async fn obtain_raw_handle() {
+    let mut cmd = Command::new("cmd");
+    cmd.kill_on_drop(true);
+    cmd.arg("/c");
+    cmd.arg("pause");
+
+    let child = cmd.spawn().unwrap();
+
+    let orig_id = child.id().expect("missing id");
+    assert!(orig_id > 0);
+
+    let handle = child.raw_handle().expect("process stopped");
+    let handled_id = unsafe { GetProcessId(handle as _) };
+    assert_eq!(handled_id, orig_id);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_smoke.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_smoke.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/process_smoke.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/process_smoke.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,12 +18,17 @@
 
     let mut child = cmd.arg("exit 2").spawn().unwrap();
 
-    let id = child.id();
+    let id = child.id().expect("missing id");
     assert!(id > 0);
 
-    let status = assert_ok!((&mut child).await);
+    let status = assert_ok!(child.wait().await);
     assert_eq!(status.code(), Some(2));
 
-    assert_eq!(child.id(), id);
+    // test that the `.wait()` method is fused just like the stdlib
+    let status = assert_ok!(child.wait().await);
+    assert_eq!(status.code(), Some(2));
+
+    // Can't get id after process has exited
+    assert_eq!(child.id(), None);
     drop(child.kill());
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/rt_basic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/rt_basic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/rt_basic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/rt_basic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,17 +2,21 @@
 #![cfg(feature = "full")]
 
 use tokio::runtime::Runtime;
-use tokio::sync::{mpsc, oneshot};
+use tokio::sync::oneshot;
 use tokio_test::{assert_err, assert_ok};
 
 use std::thread;
-use std::time::Duration;
+use tokio::time::{timeout, Duration};
+
+mod support {
+    pub(crate) mod mpsc_stream;
+}
 
 #[test]
 fn spawned_task_does_not_progress_without_block_on() {
     let (tx, mut rx) = oneshot::channel();
 
-    let mut rt = rt();
+    let rt = rt();
 
     rt.spawn(async move {
         assert_ok!(tx.send("hello"));
@@ -36,7 +40,7 @@
         Arc,
     };
     use std::task::{Context, Poll};
-    use tokio::stream::{Stream, StreamExt};
+    use tokio_stream::{Stream, StreamExt};
 
     pin_project! {
         struct TrackPolls<S> {
@@ -58,14 +62,17 @@
         }
     }
 
-    let (tx, rx) = mpsc::unbounded_channel();
-    let mut rx = TrackPolls {
+    let (tx, rx) = support::mpsc_stream::unbounded_channel_stream::<()>();
+    let rx = TrackPolls {
         npolls: Arc::new(AtomicUsize::new(0)),
         s: rx,
     };
     let npolls = Arc::clone(&rx.npolls);
 
-    let mut rt = rt();
+    let rt = rt();
+
+    // TODO: could probably avoid this, but why not.
+    let mut rx = Box::pin(rx);
 
     rt.spawn(async move { while rx.next().await.is_some() {} });
     rt.block_on(async {
@@ -100,7 +107,7 @@
     let (tx1, rx1) = oneshot::channel();
     let (tx2, rx2) = oneshot::channel();
 
-    let mut rt = rt();
+    let rt = rt();
 
     rt.spawn(async move {
         let _ = rx2.await;
@@ -128,9 +135,23 @@
     drop(rt);
 }
 
+#[test]
+#[should_panic(
+    expected = "A Tokio 1.x context was found, but timers are disabled. Call `enable_time` on the runtime builder to enable timers."
+)]
+fn timeout_panics_when_no_time_handle() {
+    let rt = tokio::runtime::Builder::new_current_thread()
+        .build()
+        .unwrap();
+    rt.block_on(async {
+        let (_tx, rx) = oneshot::channel::<()>();
+        let dur = Duration::from_millis(20);
+        let _ = timeout(dur, rx).await;
+    });
+}
+
 fn rt() -> Runtime {
-    tokio::runtime::Builder::new()
-        .basic_scheduler()
+    tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/rt_common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/rt_common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/rt_common.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/rt_common.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![allow(clippy::needless_range_loop, clippy::stable_sort_primitive)]
+#![allow(clippy::needless_range_loop)]
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
@@ -6,41 +6,41 @@
 
 macro_rules! rt_test {
     ($($t:tt)*) => {
-        mod basic_scheduler {
+        mod current_thread_scheduler {
             $($t)*
 
-            fn rt() -> Runtime {
-                tokio::runtime::Builder::new()
-                    .basic_scheduler()
+            fn rt() -> Arc<Runtime> {
+                tokio::runtime::Builder::new_current_thread()
                     .enable_all()
                     .build()
                     .unwrap()
+                    .into()
             }
         }
 
         mod threaded_scheduler_4_threads {
             $($t)*
 
-            fn rt() -> Runtime {
-                tokio::runtime::Builder::new()
-                    .threaded_scheduler()
-                    .core_threads(4)
+            fn rt() -> Arc<Runtime> {
+                tokio::runtime::Builder::new_multi_thread()
+                    .worker_threads(4)
                     .enable_all()
                     .build()
                     .unwrap()
+                    .into()
             }
         }
 
         mod threaded_scheduler_1_thread {
             $($t)*
 
-            fn rt() -> Runtime {
-                tokio::runtime::Builder::new()
-                    .threaded_scheduler()
-                    .core_threads(1)
+            fn rt() -> Arc<Runtime> {
+                tokio::runtime::Builder::new_multi_thread()
+                    .worker_threads(1)
                     .enable_all()
                     .build()
                     .unwrap()
+                    .into()
             }
         }
     }
@@ -56,7 +56,7 @@
 
 rt_test! {
     use tokio::net::{TcpListener, TcpStream, UdpSocket};
-    use tokio::prelude::*;
+    use tokio::io::{AsyncReadExt, AsyncWriteExt};
     use tokio::runtime::Runtime;
     use tokio::sync::oneshot;
     use tokio::{task, time};
@@ -72,7 +72,7 @@
 
     #[test]
     fn block_on_sync() {
-        let mut rt = rt();
+        let rt = rt();
 
         let mut win = false;
         rt.block_on(async {
@@ -82,41 +82,12 @@
         assert!(win);
     }
 
-    #[test]
-    fn block_on_handle_sync() {
-        let rt = rt();
-
-        let mut win = false;
-        rt.handle().block_on(async {
-            win = true;
-        });
-
-        assert!(win);
-    }
 
     #[test]
     fn block_on_async() {
-        let mut rt = rt();
-
-        let out = rt.block_on(async {
-            let (tx, rx) = oneshot::channel();
-
-            thread::spawn(move || {
-                thread::sleep(Duration::from_millis(50));
-                tx.send("ZOMG").unwrap();
-            });
-
-            assert_ok!(rx.await)
-        });
-
-        assert_eq!(out, "ZOMG");
-    }
-
-    #[test]
-    fn block_on_handle_async() {
         let rt = rt();
 
-        let out = rt.handle().block_on(async {
+        let out = rt.block_on(async {
             let (tx, rx) = oneshot::channel();
 
             thread::spawn(move || {
@@ -132,7 +103,7 @@
 
     #[test]
     fn spawn_one_bg() {
-        let mut rt = rt();
+        let rt = rt();
 
         let out = rt.block_on(async {
             let (tx, rx) = oneshot::channel();
@@ -149,7 +120,7 @@
 
     #[test]
     fn spawn_one_join() {
-        let mut rt = rt();
+        let rt = rt();
 
         let out = rt.block_on(async {
             let (tx, rx) = oneshot::channel();
@@ -172,7 +143,7 @@
 
     #[test]
     fn spawn_two() {
-        let mut rt = rt();
+        let rt = rt();
 
         let out = rt.block_on(async {
             let (tx1, rx1) = oneshot::channel();
@@ -199,7 +170,7 @@
 
         const ITER: usize = 200;
 
-        let mut rt = rt();
+        let rt = rt();
 
         let out = rt.block_on(async {
             let (done_tx, mut done_rx) = mpsc::unbounded_channel();
@@ -232,7 +203,7 @@
                 out.push(i);
             }
 
-            out.sort();
+            out.sort_unstable();
             out
         });
 
@@ -249,7 +220,7 @@
 
         const ITER: usize = 500;
 
-        let mut rt = rt();
+        let rt = rt();
 
         let out = rt.block_on(async {
             tokio::spawn(async move {
@@ -291,7 +262,7 @@
                     out.push(i);
                 }
 
-                out.sort();
+                out.sort_unstable();
                 out
             }).await.unwrap()
         });
@@ -305,7 +276,7 @@
 
     #[test]
     fn spawn_await_chain() {
-        let mut rt = rt();
+        let rt = rt();
 
         let out = rt.block_on(async {
             assert_ok!(tokio::spawn(async {
@@ -320,7 +291,7 @@
 
     #[test]
     fn outstanding_tasks_dropped() {
-        let mut rt = rt();
+        let rt = rt();
 
         let cnt = Arc::new(());
 
@@ -343,16 +314,16 @@
     #[test]
     #[should_panic]
     fn nested_rt() {
-        let mut rt1 = rt();
-        let mut rt2 = rt();
+        let rt1 = rt();
+        let rt2 = rt();
 
         rt1.block_on(async { rt2.block_on(async { "hello" }) });
     }
 
     #[test]
     fn create_rt_in_block_on() {
-        let mut rt1 = rt();
-        let mut rt2 = rt1.block_on(async { rt() });
+        let rt1 = rt();
+        let rt2 = rt1.block_on(async { rt() });
         let out = rt2.block_on(async { "ZOMG" });
 
         assert_eq!(out, "ZOMG");
@@ -360,7 +331,7 @@
 
     #[test]
     fn complete_block_on_under_load() {
-        let mut rt = rt();
+        let rt = rt();
 
         rt.block_on(async {
             let (tx, rx) = oneshot::channel();
@@ -383,7 +354,7 @@
 
     #[test]
     fn complete_task_under_load() {
-        let mut rt = rt();
+        let rt = rt();
 
         rt.block_on(async {
             let (tx1, rx1) = oneshot::channel();
@@ -412,8 +383,8 @@
 
     #[test]
     fn spawn_from_other_thread_idle() {
-        let mut rt = rt();
-        let handle = rt.handle().clone();
+        let rt = rt();
+        let handle = rt.clone();
 
         let (tx, rx) = oneshot::channel();
 
@@ -432,8 +403,8 @@
 
     #[test]
     fn spawn_from_other_thread_under_load() {
-        let mut rt = rt();
-        let handle = rt.handle().clone();
+        let rt = rt();
+        let handle = rt.clone();
 
         let (tx, rx) = oneshot::channel();
 
@@ -456,22 +427,22 @@
     }
 
     #[test]
-    fn delay_at_root() {
-        let mut rt = rt();
+    fn sleep_at_root() {
+        let rt = rt();
 
         let now = Instant::now();
         let dur = Duration::from_millis(50);
 
         rt.block_on(async move {
-            time::delay_for(dur).await;
+            time::sleep(dur).await;
         });
 
         assert!(now.elapsed() >= dur);
     }
 
     #[test]
-    fn delay_in_spawn() {
-        let mut rt = rt();
+    fn sleep_in_spawn() {
+        let rt = rt();
 
         let now = Instant::now();
         let dur = Duration::from_millis(50);
@@ -480,7 +451,7 @@
             let (tx, rx) = oneshot::channel();
 
             tokio::spawn(async move {
-                time::delay_for(dur).await;
+                time::sleep(dur).await;
                 assert_ok!(tx.send(()));
             });
 
@@ -492,12 +463,12 @@
 
     #[test]
     fn block_on_socket() {
-        let mut rt = rt();
+        let rt = rt();
 
         rt.block_on(async move {
             let (tx, rx) = oneshot::channel();
 
-            let mut listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+            let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
             let addr = listener.local_addr().unwrap();
 
             tokio::spawn(async move {
@@ -512,7 +483,7 @@
 
     #[test]
     fn spawn_from_blocking() {
-        let mut rt = rt();
+        let rt = rt();
 
         let out = rt.block_on(async move {
             let inner = assert_ok!(tokio::task::spawn_blocking(|| {
@@ -527,7 +498,7 @@
 
     #[test]
     fn spawn_blocking_from_blocking() {
-        let mut rt = rt();
+        let rt = rt();
 
         let out = rt.block_on(async move {
             let inner = assert_ok!(tokio::task::spawn_blocking(|| {
@@ -541,8 +512,8 @@
     }
 
     #[test]
-    fn delay_from_blocking() {
-        let mut rt = rt();
+    fn sleep_from_blocking() {
+        let rt = rt();
 
         rt.block_on(async move {
             assert_ok!(tokio::task::spawn_blocking(|| {
@@ -552,7 +523,7 @@
                 // use the futures' block_on fn to make sure we aren't setting
                 // any Tokio context
                 futures::executor::block_on(async {
-                    tokio::time::delay_for(dur).await;
+                    tokio::time::sleep(dur).await;
                 });
 
                 assert!(now.elapsed() >= dur);
@@ -562,10 +533,10 @@
 
     #[test]
     fn socket_from_blocking() {
-        let mut rt = rt();
+        let rt = rt();
 
         rt.block_on(async move {
-            let mut listener = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+            let listener = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
             let addr = assert_ok!(listener.local_addr());
 
             let peer = tokio::task::spawn_blocking(move || {
@@ -584,20 +555,35 @@
     }
 
     #[test]
-    fn spawn_blocking_after_shutdown() {
+    fn always_active_parker() {
+        // This test it to show that we will always have
+        // an active parker even if we call block_on concurrently
+
         let rt = rt();
-        let handle = rt.handle().clone();
+        let rt2 = rt.clone();
 
-        // Shutdown
-        drop(rt);
+        let (tx1, rx1) = oneshot::channel();
+        let (tx2, rx2) = oneshot::channel();
 
-        handle.enter(|| {
-            let res = task::spawn_blocking(|| unreachable!());
+        let jh1 = thread::spawn(move || {
+                rt.block_on(async move {
+                    rx2.await.unwrap();
+                    time::sleep(Duration::from_millis(5)).await;
+                    tx1.send(()).unwrap();
+                });
+        });
 
-            // Avoid using a tokio runtime
-            let out = futures::executor::block_on(res);
-            assert!(out.is_err());
+        let jh2 = thread::spawn(move || {
+            rt2.block_on(async move {
+                tx2.send(()).unwrap();
+                time::sleep(Duration::from_millis(5)).await;
+                rx1.await.unwrap();
+                time::sleep(Duration::from_millis(5)).await;
+            });
         });
+
+        jh1.join().unwrap();
+        jh2.join().unwrap();
     }
 
     #[test]
@@ -615,7 +601,7 @@
     // test is disabled.
     #[cfg(not(windows))]
     fn io_driver_called_when_under_load() {
-        let mut rt = rt();
+        let rt = rt();
 
         // Create a lot of constant load. The scheduler will always be busy.
         for _ in 0..100 {
@@ -628,7 +614,7 @@
 
         // Do some I/O work
         rt.block_on(async {
-            let mut listener = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+            let listener = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
             let addr = assert_ok!(listener.local_addr());
 
             let srv = tokio::spawn(async move {
@@ -651,7 +637,7 @@
 
     #[test]
     fn client_server_block_on() {
-        let mut rt = rt();
+        let rt = rt();
         let (tx, rx) = mpsc::channel();
 
         rt.block_on(async move { client_server(tx).await });
@@ -662,7 +648,7 @@
 
     #[test]
     fn panic_in_task() {
-        let mut rt = rt();
+        let rt = rt();
         let (tx, rx) = oneshot::channel();
 
         struct Boom(Option<oneshot::Sender<()>>);
@@ -689,7 +675,7 @@
     #[test]
     #[should_panic]
     fn panic_in_block_on() {
-        let mut rt = rt();
+        let rt = rt();
         rt.block_on(async { panic!() });
     }
 
@@ -709,10 +695,11 @@
 
     #[test]
     fn enter_and_spawn() {
-        let mut rt = rt();
-        let handle = rt.enter(|| {
+        let rt = rt();
+        let handle = {
+            let _enter = rt.enter();
             tokio::spawn(async {})
-        });
+        };
 
         assert_ok!(rt.block_on(handle));
     }
@@ -739,7 +726,7 @@
             }
         }
 
-        let mut rt = rt();
+        let rt = rt();
 
         let (drop_tx, drop_rx) = mpsc::channel();
         let (run_tx, run_rx) = oneshot::channel();
@@ -775,17 +762,17 @@
         let (tx2, rx2) = oneshot::channel();
         let (tx3, rx3) = oneshot::channel();
 
-        let mut rt = rt();
+        let rt = rt();
 
-        let h1 = rt.handle().clone();
+        let h1 = rt.clone();
 
-        rt.handle().spawn(async move {
+        rt.spawn(async move {
             // Ensure a waker gets stored in oneshot 1.
             let _ = rx1.await;
             tx3.send(()).unwrap();
         });
 
-        rt.handle().spawn(async move {
+        rt.spawn(async move {
             // When this task is dropped, we'll be "closing remotes".
             // We spawn a new task that owns the `tx1`, to move its Drop
             // out of here.
@@ -802,7 +789,7 @@
             let _ = rx2.await;
         });
 
-        rt.handle().spawn(async move {
+        rt.spawn(async move {
             let _ = rx3.await;
             // We'll never get here, but once task 3 drops, this will
             // force task 2 to re-schedule since it's waiting on oneshot 2.
@@ -821,14 +808,16 @@
     #[test]
     fn io_notify_while_shutting_down() {
         use std::net::Ipv6Addr;
+        use std::sync::Arc;
 
         for _ in 1..10 {
-            let mut runtime = rt();
+            let runtime = rt();
 
             runtime.block_on(async {
                 let socket = UdpSocket::bind((Ipv6Addr::LOCALHOST, 0)).await.unwrap();
                 let addr = socket.local_addr().unwrap();
-                let (mut recv_half, mut send_half) = socket.split();
+                let send_half = Arc::new(socket);
+                let recv_half = send_half.clone();
 
                 tokio::spawn(async move {
                     let mut buf = [0];
@@ -842,11 +831,11 @@
                     let buf = [0];
                     loop {
                         send_half.send_to(&buf, &addr).await.unwrap();
-                        tokio::time::delay_for(Duration::from_millis(1)).await;
+                        tokio::time::sleep(Duration::from_millis(1)).await;
                     }
                 });
 
-                tokio::time::delay_for(Duration::from_millis(5)).await;
+                tokio::time::sleep(Duration::from_millis(5)).await;
             });
         }
     }
@@ -854,7 +843,7 @@
     #[test]
     fn shutdown_timeout() {
         let (tx, rx) = oneshot::channel();
-        let mut runtime = rt();
+        let runtime = rt();
 
         runtime.block_on(async move {
             task::spawn_blocking(move || {
@@ -865,18 +854,33 @@
             rx.await.unwrap();
         });
 
-        runtime.shutdown_timeout(Duration::from_millis(100));
+        Arc::try_unwrap(runtime).unwrap().shutdown_timeout(Duration::from_millis(100));
+    }
+
+    #[test]
+    fn shutdown_timeout_0() {
+        let runtime = rt();
+
+        runtime.block_on(async move {
+            task::spawn_blocking(move || {
+                thread::sleep(Duration::from_secs(10_000));
+            });
+        });
+
+        let now = Instant::now();
+        Arc::try_unwrap(runtime).unwrap().shutdown_timeout(Duration::from_nanos(0));
+        assert!(now.elapsed().as_secs() < 1);
     }
 
     #[test]
     fn shutdown_wakeup_time() {
-        let mut runtime = rt();
+        let runtime = rt();
 
         runtime.block_on(async move {
-            tokio::time::delay_for(std::time::Duration::from_millis(100)).await;
+            tokio::time::sleep(std::time::Duration::from_millis(100)).await;
         });
 
-        runtime.shutdown_timeout(Duration::from_secs(10_000));
+        Arc::try_unwrap(runtime).unwrap().shutdown_timeout(Duration::from_secs(10_000));
     }
 
     // This test is currently ignored on Windows because of a
@@ -894,7 +898,9 @@
 
         thread::spawn(|| {
             R.with(|cell| {
-                *cell.borrow_mut() = Some(rt());
+                let rt = rt();
+                let rt = Arc::try_unwrap(rt).unwrap();
+                *cell.borrow_mut() = Some(rt);
             });
 
             let _rt = rt();
@@ -902,7 +908,7 @@
     }
 
     async fn client_server(tx: mpsc::Sender<()>) {
-        let mut server = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+        let server = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
 
         // Get the assigned address
         let addr = assert_ok!(server.local_addr());
@@ -927,13 +933,13 @@
 
     #[test]
     fn local_set_block_on_socket() {
-        let mut rt = rt();
+        let rt = rt();
         let local = task::LocalSet::new();
 
-        local.block_on(&mut rt, async move {
+        local.block_on(&rt, async move {
             let (tx, rx) = oneshot::channel();
 
-            let mut listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+            let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
             let addr = listener.local_addr().unwrap();
 
             task::spawn_local(async move {
@@ -948,19 +954,19 @@
 
     #[test]
     fn local_set_client_server_block_on() {
-        let mut rt = rt();
+        let rt = rt();
         let (tx, rx) = mpsc::channel();
 
         let local = task::LocalSet::new();
 
-        local.block_on(&mut rt, async move { client_server_local(tx).await });
+        local.block_on(&rt, async move { client_server_local(tx).await });
 
         assert_ok!(rx.try_recv());
         assert_err!(rx.try_recv());
     }
 
     async fn client_server_local(tx: mpsc::Sender<()>) {
-        let mut server = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+        let server = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
 
         // Get the assigned address
         let addr = assert_ok!(server.local_addr());
@@ -987,7 +993,7 @@
     fn coop() {
         use std::task::Poll::Ready;
 
-        let mut rt = rt();
+        let rt = rt();
 
         rt.block_on(async {
             // Create a bunch of tasks
@@ -996,7 +1002,7 @@
             }).collect::<Vec<_>>();
 
             // Hope that all the tasks complete...
-            time::delay_for(Duration::from_millis(100)).await;
+            time::sleep(Duration::from_millis(100)).await;
 
             poll_fn(|cx| {
                 // At least one task should not be ready
@@ -1011,43 +1017,75 @@
         });
     }
 
+    #[test]
+    fn coop_unconstrained() {
+        use std::task::Poll::Ready;
+
+        let rt = rt();
+
+        rt.block_on(async {
+            // Create a bunch of tasks
+            let mut tasks = (0..1_000).map(|_| {
+                tokio::spawn(async { })
+            }).collect::<Vec<_>>();
+
+            // Hope that all the tasks complete...
+            time::sleep(Duration::from_millis(100)).await;
+
+            tokio::task::unconstrained(poll_fn(|cx| {
+                // All the tasks should be ready
+                for task in &mut tasks {
+                    assert!(Pin::new(task).poll(cx).is_ready());
+                }
+
+                Ready(())
+            })).await;
+        });
+    }
+
     // Tests that the "next task" scheduler optimization is not able to starve
     // other tasks.
     #[test]
     fn ping_pong_saturation() {
+        use std::sync::atomic::{Ordering, AtomicBool};
         use tokio::sync::mpsc;
 
         const NUM: usize = 100;
 
-        let mut rt = rt();
+        let rt = rt();
+
+        let running = Arc::new(AtomicBool::new(true));
 
         rt.block_on(async {
             let (spawned_tx, mut spawned_rx) = mpsc::unbounded_channel();
 
+            let mut tasks = vec![];
             // Spawn a bunch of tasks that ping ping between each other to
             // saturate the runtime.
             for _ in 0..NUM {
                 let (tx1, mut rx1) = mpsc::unbounded_channel();
                 let (tx2, mut rx2) = mpsc::unbounded_channel();
                 let spawned_tx = spawned_tx.clone();
-
-                task::spawn(async move {
+                let running = running.clone();
+                tasks.push(task::spawn(async move {
                     spawned_tx.send(()).unwrap();
 
-                    tx1.send(()).unwrap();
 
-                    loop {
-                        rx2.recv().await.unwrap();
+                    while running.load(Ordering::Relaxed) {
                         tx1.send(()).unwrap();
+                        rx2.recv().await.unwrap();
                     }
-                });
 
-                task::spawn(async move {
-                    loop {
-                        rx1.recv().await.unwrap();
+                    // Close the channel and wait for the other task to exit.
+                    drop(tx1);
+                    assert!(rx2.recv().await.is_none());
+                }));
+
+                tasks.push(task::spawn(async move {
+                    while rx1.recv().await.is_some() {
                         tx2.send(()).unwrap();
                     }
-                });
+                }));
             }
 
             for _ in 0..NUM {
@@ -1062,6 +1100,10 @@
                 }
             });
             handle.await.unwrap();
+            running.store(false, Ordering::Relaxed);
+            for t in tasks {
+                t.await.unwrap();
+            }
         });
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/rt_handle_block_on.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/rt_handle_block_on.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/rt_handle_block_on.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/rt_handle_block_on.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,533 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+// All io tests that deal with shutdown is currently ignored because there are known bugs in with
+// shutting down the io driver while concurrently registering new resources. See
+// https://github.com/tokio-rs/tokio/pull/3569#pullrequestreview-612703467 fo more details.
+//
+// When this has been fixed we want to re-enable these tests.
+
+use std::time::Duration;
+use tokio::runtime::{Handle, Runtime};
+use tokio::sync::mpsc;
+use tokio::task::spawn_blocking;
+use tokio::{fs, net, time};
+
+macro_rules! multi_threaded_rt_test {
+    ($($t:tt)*) => {
+        mod threaded_scheduler_4_threads_only {
+            use super::*;
+
+            $($t)*
+
+            fn rt() -> Runtime {
+                tokio::runtime::Builder::new_multi_thread()
+                    .worker_threads(4)
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            }
+        }
+
+        mod threaded_scheduler_1_thread_only {
+            use super::*;
+
+            $($t)*
+
+            fn rt() -> Runtime {
+                tokio::runtime::Builder::new_multi_thread()
+                    .worker_threads(1)
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            }
+        }
+    }
+}
+
+macro_rules! rt_test {
+    ($($t:tt)*) => {
+        mod current_thread_scheduler {
+            use super::*;
+
+            $($t)*
+
+            fn rt() -> Runtime {
+                tokio::runtime::Builder::new_current_thread()
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            }
+        }
+
+        mod threaded_scheduler_4_threads {
+            use super::*;
+
+            $($t)*
+
+            fn rt() -> Runtime {
+                tokio::runtime::Builder::new_multi_thread()
+                    .worker_threads(4)
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            }
+        }
+
+        mod threaded_scheduler_1_thread {
+            use super::*;
+
+            $($t)*
+
+            fn rt() -> Runtime {
+                tokio::runtime::Builder::new_multi_thread()
+                    .worker_threads(1)
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            }
+        }
+    }
+}
+
+// ==== runtime independent futures ======
+
+#[test]
+fn basic() {
+    test_with_runtimes(|| {
+        let one = Handle::current().block_on(async { 1 });
+        assert_eq!(1, one);
+    });
+}
+
+#[test]
+fn bounded_mpsc_channel() {
+    test_with_runtimes(|| {
+        let (tx, mut rx) = mpsc::channel(1024);
+
+        Handle::current().block_on(tx.send(42)).unwrap();
+
+        let value = Handle::current().block_on(rx.recv()).unwrap();
+        assert_eq!(value, 42);
+    });
+}
+
+#[test]
+fn unbounded_mpsc_channel() {
+    test_with_runtimes(|| {
+        let (tx, mut rx) = mpsc::unbounded_channel();
+
+        let _ = tx.send(42);
+
+        let value = Handle::current().block_on(rx.recv()).unwrap();
+        assert_eq!(value, 42);
+    })
+}
+
+rt_test! {
+    // ==== spawn blocking futures ======
+
+    #[test]
+    fn basic_fs() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let contents = Handle::current()
+            .block_on(fs::read_to_string("Cargo.toml"))
+            .unwrap();
+        assert!(contents.contains("Cargo.toml"));
+    }
+
+    #[test]
+    fn fs_shutdown_before_started() {
+        let rt = rt();
+        let _enter = rt.enter();
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        let err: std::io::Error = Handle::current()
+            .block_on(fs::read_to_string("Cargo.toml"))
+            .unwrap_err();
+
+        assert_eq!(err.kind(), std::io::ErrorKind::Other);
+
+        let inner_err = err.get_ref().expect("no inner error");
+        assert_eq!(inner_err.to_string(), "background task failed");
+    }
+
+    #[test]
+    fn basic_spawn_blocking() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let answer = Handle::current()
+            .block_on(spawn_blocking(|| {
+                std::thread::sleep(Duration::from_millis(100));
+                42
+            }))
+            .unwrap();
+
+        assert_eq!(answer, 42);
+    }
+
+    #[test]
+    fn spawn_blocking_after_shutdown_fails() {
+        let rt = rt();
+        let _enter = rt.enter();
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        let join_err = Handle::current()
+            .block_on(spawn_blocking(|| {
+                std::thread::sleep(Duration::from_millis(100));
+                42
+            }))
+            .unwrap_err();
+
+        assert!(join_err.is_cancelled());
+    }
+
+    #[test]
+    fn spawn_blocking_started_before_shutdown_continues() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let handle = spawn_blocking(|| {
+            std::thread::sleep(Duration::from_secs(1));
+            42
+        });
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        let answer = Handle::current().block_on(handle).unwrap();
+
+        assert_eq!(answer, 42);
+    }
+
+    // ==== net ======
+
+    #[test]
+    fn tcp_listener_bind() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        Handle::current()
+            .block_on(net::TcpListener::bind("127.0.0.1:0"))
+            .unwrap();
+    }
+
+    // All io tests are ignored for now. See above why that is.
+    #[ignore]
+    #[test]
+    fn tcp_listener_connect_after_shutdown() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        let err = Handle::current()
+            .block_on(net::TcpListener::bind("127.0.0.1:0"))
+            .unwrap_err();
+
+        assert_eq!(err.kind(), std::io::ErrorKind::Other);
+        assert_eq!(
+            err.get_ref().unwrap().to_string(),
+            "A Tokio 1.x context was found, but it is being shutdown.",
+        );
+    }
+
+    // All io tests are ignored for now. See above why that is.
+    #[ignore]
+    #[test]
+    fn tcp_listener_connect_before_shutdown() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let bind_future = net::TcpListener::bind("127.0.0.1:0");
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        let err = Handle::current().block_on(bind_future).unwrap_err();
+
+        assert_eq!(err.kind(), std::io::ErrorKind::Other);
+        assert_eq!(
+            err.get_ref().unwrap().to_string(),
+            "A Tokio 1.x context was found, but it is being shutdown.",
+        );
+    }
+
+    #[test]
+    fn udp_socket_bind() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        Handle::current()
+            .block_on(net::UdpSocket::bind("127.0.0.1:0"))
+            .unwrap();
+    }
+
+    // All io tests are ignored for now. See above why that is.
+    #[ignore]
+    #[test]
+    fn udp_stream_bind_after_shutdown() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        let err = Handle::current()
+            .block_on(net::UdpSocket::bind("127.0.0.1:0"))
+            .unwrap_err();
+
+        assert_eq!(err.kind(), std::io::ErrorKind::Other);
+        assert_eq!(
+            err.get_ref().unwrap().to_string(),
+            "A Tokio 1.x context was found, but it is being shutdown.",
+        );
+    }
+
+    // All io tests are ignored for now. See above why that is.
+    #[ignore]
+    #[test]
+    fn udp_stream_bind_before_shutdown() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let bind_future = net::UdpSocket::bind("127.0.0.1:0");
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        let err = Handle::current().block_on(bind_future).unwrap_err();
+
+        assert_eq!(err.kind(), std::io::ErrorKind::Other);
+        assert_eq!(
+            err.get_ref().unwrap().to_string(),
+            "A Tokio 1.x context was found, but it is being shutdown.",
+        );
+    }
+
+    // All io tests are ignored for now. See above why that is.
+    #[ignore]
+    #[cfg(unix)]
+    #[test]
+    fn unix_listener_bind_after_shutdown() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("socket");
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        let err = net::UnixListener::bind(path).unwrap_err();
+
+        assert_eq!(err.kind(), std::io::ErrorKind::Other);
+        assert_eq!(
+            err.get_ref().unwrap().to_string(),
+            "A Tokio 1.x context was found, but it is being shutdown.",
+        );
+    }
+
+    // All io tests are ignored for now. See above why that is.
+    #[ignore]
+    #[cfg(unix)]
+    #[test]
+    fn unix_listener_shutdown_after_bind() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("socket");
+
+        let listener = net::UnixListener::bind(path).unwrap();
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        // this should not timeout but fail immediately since the runtime has been shutdown
+        let err = Handle::current().block_on(listener.accept()).unwrap_err();
+
+        assert_eq!(err.kind(), std::io::ErrorKind::Other);
+        assert_eq!(err.get_ref().unwrap().to_string(), "reactor gone");
+    }
+
+    // All io tests are ignored for now. See above why that is.
+    #[ignore]
+    #[cfg(unix)]
+    #[test]
+    fn unix_listener_shutdown_after_accept() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("socket");
+
+        let listener = net::UnixListener::bind(path).unwrap();
+
+        let accept_future = listener.accept();
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        // this should not timeout but fail immediately since the runtime has been shutdown
+        let err = Handle::current().block_on(accept_future).unwrap_err();
+
+        assert_eq!(err.kind(), std::io::ErrorKind::Other);
+        assert_eq!(err.get_ref().unwrap().to_string(), "reactor gone");
+    }
+
+    // ==== nesting ======
+
+    #[test]
+    #[should_panic(
+        expected = "Cannot start a runtime from within a runtime. This happens because a function (like `block_on`) attempted to block the current thread while the thread is being used to drive asynchronous tasks."
+    )]
+    fn nesting() {
+        fn some_non_async_function() -> i32 {
+            Handle::current().block_on(time::sleep(Duration::from_millis(10)));
+            1
+        }
+
+        let rt = rt();
+
+        rt.block_on(async { some_non_async_function() });
+    }
+
+    #[test]
+    fn spawn_after_runtime_dropped() {
+        use futures::future::FutureExt;
+
+        let rt = rt();
+
+        let handle = rt.block_on(async move {
+            Handle::current()
+        });
+
+        let jh1 = handle.spawn(futures::future::pending::<()>());
+
+        drop(rt);
+
+        let jh2 = handle.spawn(futures::future::pending::<()>());
+
+        let err1 = jh1.now_or_never().unwrap().unwrap_err();
+        let err2 = jh2.now_or_never().unwrap().unwrap_err();
+        assert!(err1.is_cancelled());
+        assert!(err2.is_cancelled());
+    }
+}
+
+multi_threaded_rt_test! {
+    #[cfg(unix)]
+    #[test]
+    fn unix_listener_bind() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("socket");
+
+        let listener = net::UnixListener::bind(path).unwrap();
+
+        // this should timeout and not fail immediately since the runtime has not been shutdown
+        let _: tokio::time::error::Elapsed = Handle::current()
+            .block_on(tokio::time::timeout(
+                Duration::from_millis(10),
+                listener.accept(),
+            ))
+            .unwrap_err();
+    }
+
+    // ==== timers ======
+
+    // `Handle::block_on` doesn't work with timer futures on a current thread runtime as there is no
+    // one to drive the timers so they will just hang forever. Therefore they are not tested.
+
+    #[test]
+    fn sleep() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        Handle::current().block_on(time::sleep(Duration::from_millis(100)));
+    }
+
+    #[test]
+    #[should_panic(expected = "A Tokio 1.x context was found, but it is being shutdown.")]
+    fn sleep_before_shutdown_panics() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        let f = time::sleep(Duration::from_millis(100));
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        Handle::current().block_on(f);
+    }
+
+    #[test]
+    #[should_panic(expected = "A Tokio 1.x context was found, but it is being shutdown.")]
+    fn sleep_after_shutdown_panics() {
+        let rt = rt();
+        let _enter = rt.enter();
+
+        rt.shutdown_timeout(Duration::from_secs(1000));
+
+        Handle::current().block_on(time::sleep(Duration::from_millis(100)));
+    }
+}
+
+// ==== utils ======
+
+/// Create a new multi threaded runtime
+fn new_multi_thread(n: usize) -> Runtime {
+    tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(n)
+        .enable_all()
+        .build()
+        .unwrap()
+}
+
+/// Create a new single threaded runtime
+fn new_current_thread() -> Runtime {
+    tokio::runtime::Builder::new_current_thread()
+        .enable_all()
+        .build()
+        .unwrap()
+}
+
+/// Utility to test things on both kinds of runtimes both before and after shutting it down.
+fn test_with_runtimes<F>(f: F)
+where
+    F: Fn(),
+{
+    {
+        println!("current thread runtime");
+
+        let rt = new_current_thread();
+        let _enter = rt.enter();
+        f();
+
+        println!("current thread runtime after shutdown");
+        rt.shutdown_timeout(Duration::from_secs(1000));
+        f();
+    }
+
+    {
+        println!("multi thread (1 thread) runtime");
+
+        let rt = new_multi_thread(1);
+        let _enter = rt.enter();
+        f();
+
+        println!("multi thread runtime after shutdown");
+        rt.shutdown_timeout(Duration::from_secs(1000));
+        f();
+    }
+
+    {
+        println!("multi thread (4 threads) runtime");
+
+        let rt = new_multi_thread(4);
+        let _enter = rt.enter();
+        f();
+
+        println!("multi thread runtime after shutdown");
+        rt.shutdown_timeout(Duration::from_secs(1000));
+        f();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/rt_threaded.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/rt_threaded.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/rt_threaded.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/rt_threaded.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,16 +12,15 @@
 use std::pin::Pin;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering::Relaxed;
-use std::sync::{mpsc, Arc};
-use std::task::{Context, Poll};
+use std::sync::{mpsc, Arc, Mutex};
+use std::task::{Context, Poll, Waker};
 
 #[test]
 fn single_thread() {
     // No panic when starting a runtime w/ a single thread
-    let _ = runtime::Builder::new()
-        .threaded_scheduler()
+    let _ = runtime::Builder::new_multi_thread()
         .enable_all()
-        .core_threads(1)
+        .worker_threads(1)
         .build();
 }
 
@@ -57,22 +56,20 @@
 }
 #[test]
 fn many_multishot_futures() {
-    use tokio::sync::mpsc;
-
     const CHAIN: usize = 200;
     const CYCLES: usize = 5;
     const TRACKS: usize = 50;
 
     for _ in 0..50 {
-        let mut rt = rt();
+        let rt = rt();
         let mut start_txs = Vec::with_capacity(TRACKS);
         let mut final_rxs = Vec::with_capacity(TRACKS);
 
         for _ in 0..TRACKS {
-            let (start_tx, mut chain_rx) = mpsc::channel(10);
+            let (start_tx, mut chain_rx) = tokio::sync::mpsc::channel(10);
 
             for _ in 0..CHAIN {
-                let (mut next_tx, next_rx) = mpsc::channel(10);
+                let (next_tx, next_rx) = tokio::sync::mpsc::channel(10);
 
                 // Forward all the messages
                 rt.spawn(async move {
@@ -85,8 +82,8 @@
             }
 
             // This final task cycles if needed
-            let (mut final_tx, final_rx) = mpsc::channel(10);
-            let mut cycle_tx = start_tx.clone();
+            let (final_tx, final_rx) = tokio::sync::mpsc::channel(10);
+            let cycle_tx = start_tx.clone();
             let mut rem = CYCLES;
 
             rt.spawn(async move {
@@ -109,7 +106,7 @@
 
         {
             rt.block_on(async move {
-                for mut start_tx in start_txs {
+                for start_tx in start_txs {
                     start_tx.send("ping").await.unwrap();
                 }
 
@@ -123,7 +120,7 @@
 
 #[test]
 fn spawn_shutdown() {
-    let mut rt = rt();
+    let rt = rt();
     let (tx, rx) = mpsc::channel();
 
     rt.block_on(async {
@@ -141,7 +138,7 @@
 }
 
 async fn client_server(tx: mpsc::Sender<()>) {
-    let mut server = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let server = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
 
     // Get the assigned address
     let addr = assert_ok!(server.local_addr());
@@ -190,8 +187,7 @@
         let a = num_inc.clone();
         let b = num_dec.clone();
 
-        let rt = runtime::Builder::new()
-            .threaded_scheduler()
+        let rt = runtime::Builder::new_multi_thread()
             .enable_all()
             .on_thread_start(move || {
                 a.fetch_add(1, Relaxed);
@@ -230,8 +226,7 @@
 
     let after_inner = after_start.clone();
     let before_inner = before_stop.clone();
-    let mut rt = tokio::runtime::Builder::new()
-        .threaded_scheduler()
+    let rt = tokio::runtime::Builder::new_multi_thread()
         .enable_all()
         .on_thread_start(move || {
             after_inner.clone().fetch_add(1, Ordering::Relaxed);
@@ -331,20 +326,17 @@
 // channel yields occasionally even if there are values ready to receive.
 #[test]
 fn coop_and_block_in_place() {
-    use tokio::sync::mpsc;
-
-    let mut rt = tokio::runtime::Builder::new()
-        .threaded_scheduler()
+    let rt = tokio::runtime::Builder::new_multi_thread()
         // Setting max threads to 1 prevents another thread from claiming the
         // runtime worker yielded as part of `block_in_place` and guarantees the
         // same thread will reclaim the worker at the end of the
         // `block_in_place` call.
-        .max_threads(1)
+        .max_blocking_threads(1)
         .build()
         .unwrap();
 
     rt.block_on(async move {
-        let (mut tx, mut rx) = mpsc::channel(1024);
+        let (tx, mut rx) = tokio::sync::mpsc::channel(1024);
 
         // Fill the channel
         for _ in 0..1024 {
@@ -383,14 +375,104 @@
 
 // Testing this does not panic
 #[test]
-fn max_threads() {
-    let _rt = tokio::runtime::Builder::new()
-        .threaded_scheduler()
-        .max_threads(1)
+fn max_blocking_threads() {
+    let _rt = tokio::runtime::Builder::new_multi_thread()
+        .max_blocking_threads(1)
+        .build()
+        .unwrap();
+}
+
+#[test]
+#[should_panic]
+fn max_blocking_threads_set_to_zero() {
+    let _rt = tokio::runtime::Builder::new_multi_thread()
+        .max_blocking_threads(0)
         .build()
         .unwrap();
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn hang_on_shutdown() {
+    let (sync_tx, sync_rx) = std::sync::mpsc::channel::<()>();
+    tokio::spawn(async move {
+        tokio::task::block_in_place(|| sync_rx.recv().ok());
+    });
+
+    tokio::spawn(async {
+        tokio::time::sleep(std::time::Duration::from_secs(2)).await;
+        drop(sync_tx);
+    });
+    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+}
+
+/// Demonstrates tokio-rs/tokio#3869
+#[test]
+fn wake_during_shutdown() {
+    struct Shared {
+        waker: Option<Waker>,
+    }
+
+    struct MyFuture {
+        shared: Arc<Mutex<Shared>>,
+        put_waker: bool,
+    }
+
+    impl MyFuture {
+        fn new() -> (Self, Self) {
+            let shared = Arc::new(Mutex::new(Shared { waker: None }));
+            let f1 = MyFuture {
+                shared: shared.clone(),
+                put_waker: true,
+            };
+            let f2 = MyFuture {
+                shared,
+                put_waker: false,
+            };
+            (f1, f2)
+        }
+    }
+
+    impl Future for MyFuture {
+        type Output = ();
+
+        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
+            let me = Pin::into_inner(self);
+            let mut lock = me.shared.lock().unwrap();
+            println!("poll {}", me.put_waker);
+            if me.put_waker {
+                println!("putting");
+                lock.waker = Some(cx.waker().clone());
+            }
+            Poll::Pending
+        }
+    }
+
+    impl Drop for MyFuture {
+        fn drop(&mut self) {
+            println!("drop {} start", self.put_waker);
+            let mut lock = self.shared.lock().unwrap();
+            if !self.put_waker {
+                lock.waker.take().unwrap().wake();
+            }
+            drop(lock);
+            println!("drop {} stop", self.put_waker);
+        }
+    }
+
+    let rt = tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(1)
+        .enable_all()
+        .build()
+        .unwrap();
+
+    let (f1, f2) = MyFuture::new();
+
+    rt.spawn(f1);
+    rt.spawn(f2);
+
+    rt.block_on(async { tokio::time::sleep(tokio::time::Duration::from_millis(20)).await });
+}
+
 fn rt() -> Runtime {
     Runtime::new().unwrap()
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/signal_drop_rt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/signal_drop_rt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/signal_drop_rt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/signal_drop_rt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,11 +14,11 @@
 fn dropping_loops_does_not_cause_starvation() {
     let kind = SignalKind::user_defined1();
 
-    let mut first_rt = rt();
+    let first_rt = rt();
     let mut first_signal =
         first_rt.block_on(async { signal(kind).expect("failed to register first signal") });
 
-    let mut second_rt = rt();
+    let second_rt = rt();
     let mut second_signal =
         second_rt.block_on(async { signal(kind).expect("failed to register second signal") });
 
@@ -37,8 +37,7 @@
 }
 
 fn rt() -> Runtime {
-    tokio::runtime::Builder::new()
-        .basic_scheduler()
+    tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/signal_multi_rt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/signal_multi_rt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/signal_multi_rt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/signal_multi_rt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -24,7 +24,7 @@
             .map(|_| {
                 let sender = sender.clone();
                 thread::spawn(move || {
-                    let mut rt = rt();
+                    let rt = rt();
                     let _ = rt.block_on(async {
                         let mut signal = signal(SignalKind::hangup()).unwrap();
                         sender.send(()).unwrap();
@@ -47,8 +47,7 @@
 }
 
 fn rt() -> Runtime {
-    tokio::runtime::Builder::new()
-        .basic_scheduler()
+    tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_chain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_chain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_chain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_chain.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-use tokio::stream::{self, Stream, StreamExt};
-use tokio::sync::mpsc;
-use tokio_test::{assert_pending, assert_ready, task};
-
-#[tokio::test]
-async fn basic_usage() {
-    let one = stream::iter(vec![1, 2, 3]);
-    let two = stream::iter(vec![4, 5, 6]);
-
-    let mut stream = one.chain(two);
-
-    assert_eq!(stream.size_hint(), (6, Some(6)));
-    assert_eq!(stream.next().await, Some(1));
-
-    assert_eq!(stream.size_hint(), (5, Some(5)));
-    assert_eq!(stream.next().await, Some(2));
-
-    assert_eq!(stream.size_hint(), (4, Some(4)));
-    assert_eq!(stream.next().await, Some(3));
-
-    assert_eq!(stream.size_hint(), (3, Some(3)));
-    assert_eq!(stream.next().await, Some(4));
-
-    assert_eq!(stream.size_hint(), (2, Some(2)));
-    assert_eq!(stream.next().await, Some(5));
-
-    assert_eq!(stream.size_hint(), (1, Some(1)));
-    assert_eq!(stream.next().await, Some(6));
-
-    assert_eq!(stream.size_hint(), (0, Some(0)));
-    assert_eq!(stream.next().await, None);
-
-    assert_eq!(stream.size_hint(), (0, Some(0)));
-    assert_eq!(stream.next().await, None);
-}
-
-#[tokio::test]
-async fn pending_first() {
-    let (tx1, rx1) = mpsc::unbounded_channel();
-    let (tx2, rx2) = mpsc::unbounded_channel();
-
-    let mut stream = task::spawn(rx1.chain(rx2));
-    assert_eq!(stream.size_hint(), (0, None));
-
-    assert_pending!(stream.poll_next());
-
-    tx2.send(2).unwrap();
-    assert!(!stream.is_woken());
-
-    assert_pending!(stream.poll_next());
-
-    tx1.send(1).unwrap();
-    assert!(stream.is_woken());
-    assert_eq!(Some(1), assert_ready!(stream.poll_next()));
-
-    assert_pending!(stream.poll_next());
-
-    drop(tx1);
-
-    assert_eq!(stream.size_hint(), (0, None));
-
-    assert!(stream.is_woken());
-    assert_eq!(Some(2), assert_ready!(stream.poll_next()));
-
-    assert_eq!(stream.size_hint(), (0, None));
-
-    drop(tx2);
-
-    assert_eq!(stream.size_hint(), (0, None));
-    assert_eq!(None, assert_ready!(stream.poll_next()));
-}
-
-#[test]
-fn size_overflow() {
-    struct Monster;
-
-    impl tokio::stream::Stream for Monster {
-        type Item = ();
-        fn poll_next(
-            self: std::pin::Pin<&mut Self>,
-            _cx: &mut std::task::Context<'_>,
-        ) -> std::task::Poll<Option<()>> {
-            panic!()
-        }
-
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            (usize::max_value(), Some(usize::max_value()))
-        }
-    }
-
-    let m1 = Monster;
-    let m2 = Monster;
-    let m = m1.chain(m2);
-    assert_eq!(m.size_hint(), (usize::max_value(), None));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_collect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_collect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_collect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_collect.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-use tokio::stream::{self, StreamExt};
-use tokio::sync::mpsc;
-use tokio_test::{assert_pending, assert_ready, assert_ready_err, assert_ready_ok, task};
-
-use bytes::{Bytes, BytesMut};
-
-#[allow(clippy::let_unit_value)]
-#[tokio::test]
-async fn empty_unit() {
-    // Drains the stream.
-    let mut iter = vec![(), (), ()].into_iter();
-    let _: () = stream::iter(&mut iter).collect().await;
-    assert!(iter.next().is_none());
-}
-
-#[tokio::test]
-async fn empty_vec() {
-    let coll: Vec<u32> = stream::empty().collect().await;
-    assert!(coll.is_empty());
-}
-
-#[tokio::test]
-async fn empty_box_slice() {
-    let coll: Box<[u32]> = stream::empty().collect().await;
-    assert!(coll.is_empty());
-}
-
-#[tokio::test]
-async fn empty_bytes() {
-    let coll: Bytes = stream::empty::<&[u8]>().collect().await;
-    assert!(coll.is_empty());
-}
-
-#[tokio::test]
-async fn empty_bytes_mut() {
-    let coll: BytesMut = stream::empty::<&[u8]>().collect().await;
-    assert!(coll.is_empty());
-}
-
-#[tokio::test]
-async fn empty_string() {
-    let coll: String = stream::empty::<&str>().collect().await;
-    assert!(coll.is_empty());
-}
-
-#[tokio::test]
-async fn empty_result() {
-    let coll: Result<Vec<u32>, &str> = stream::empty().collect().await;
-    assert_eq!(Ok(vec![]), coll);
-}
-
-#[tokio::test]
-async fn collect_vec_items() {
-    let (tx, rx) = mpsc::unbounded_channel();
-    let mut fut = task::spawn(rx.collect::<Vec<i32>>());
-
-    assert_pending!(fut.poll());
-
-    tx.send(1).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    tx.send(2).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    drop(tx);
-    assert!(fut.is_woken());
-    let coll = assert_ready!(fut.poll());
-    assert_eq!(vec![1, 2], coll);
-}
-
-#[tokio::test]
-async fn collect_string_items() {
-    let (tx, rx) = mpsc::unbounded_channel();
-    let mut fut = task::spawn(rx.collect::<String>());
-
-    assert_pending!(fut.poll());
-
-    tx.send("hello ".to_string()).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    tx.send("world".to_string()).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    drop(tx);
-    assert!(fut.is_woken());
-    let coll = assert_ready!(fut.poll());
-    assert_eq!("hello world", coll);
-}
-
-#[tokio::test]
-async fn collect_str_items() {
-    let (tx, rx) = mpsc::unbounded_channel();
-    let mut fut = task::spawn(rx.collect::<String>());
-
-    assert_pending!(fut.poll());
-
-    tx.send("hello ").unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    tx.send("world").unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    drop(tx);
-    assert!(fut.is_woken());
-    let coll = assert_ready!(fut.poll());
-    assert_eq!("hello world", coll);
-}
-
-#[tokio::test]
-async fn collect_bytes() {
-    let (tx, rx) = mpsc::unbounded_channel();
-    let mut fut = task::spawn(rx.collect::<Bytes>());
-
-    assert_pending!(fut.poll());
-
-    tx.send(&b"hello "[..]).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    tx.send(&b"world"[..]).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    drop(tx);
-    assert!(fut.is_woken());
-    let coll = assert_ready!(fut.poll());
-    assert_eq!(&b"hello world"[..], coll);
-}
-
-#[tokio::test]
-async fn collect_results_ok() {
-    let (tx, rx) = mpsc::unbounded_channel();
-    let mut fut = task::spawn(rx.collect::<Result<String, &str>>());
-
-    assert_pending!(fut.poll());
-
-    tx.send(Ok("hello ")).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    tx.send(Ok("world")).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    drop(tx);
-    assert!(fut.is_woken());
-    let coll = assert_ready_ok!(fut.poll());
-    assert_eq!("hello world", coll);
-}
-
-#[tokio::test]
-async fn collect_results_err() {
-    let (tx, rx) = mpsc::unbounded_channel();
-    let mut fut = task::spawn(rx.collect::<Result<String, &str>>());
-
-    assert_pending!(fut.poll());
-
-    tx.send(Ok("hello ")).unwrap();
-    assert!(fut.is_woken());
-    assert_pending!(fut.poll());
-
-    tx.send(Err("oh no")).unwrap();
-    assert!(fut.is_woken());
-    let err = assert_ready_err!(fut.poll());
-    assert_eq!("oh no", err);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_empty.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_empty.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_empty.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_empty.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-use tokio::stream::{self, Stream, StreamExt};
-
-#[tokio::test]
-async fn basic_usage() {
-    let mut stream = stream::empty::<i32>();
-
-    for _ in 0..2 {
-        assert_eq!(stream.size_hint(), (0, Some(0)));
-        assert_eq!(None, stream.next().await);
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_fuse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_fuse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_fuse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_fuse.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-use tokio::stream::{Stream, StreamExt};
-
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-// a stream which alternates between Some and None
-struct Alternate {
-    state: i32,
-}
-
-impl Stream for Alternate {
-    type Item = i32;
-
-    fn poll_next(mut self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<i32>> {
-        let val = self.state;
-        self.state += 1;
-
-        // if it's even, Some(i32), else None
-        if val % 2 == 0 {
-            Poll::Ready(Some(val))
-        } else {
-            Poll::Ready(None)
-        }
-    }
-}
-
-#[tokio::test]
-async fn basic_usage() {
-    let mut stream = Alternate { state: 0 };
-
-    // the stream goes back and forth
-    assert_eq!(stream.next().await, Some(0));
-    assert_eq!(stream.next().await, None);
-    assert_eq!(stream.next().await, Some(2));
-    assert_eq!(stream.next().await, None);
-
-    // however, once it is fused
-    let mut stream = stream.fuse();
-
-    assert_eq!(stream.size_hint(), (0, None));
-    assert_eq!(stream.next().await, Some(4));
-
-    assert_eq!(stream.size_hint(), (0, None));
-    assert_eq!(stream.next().await, None);
-
-    // it will always return `None` after the first time.
-    assert_eq!(stream.size_hint(), (0, Some(0)));
-    assert_eq!(stream.next().await, None);
-    assert_eq!(stream.size_hint(), (0, Some(0)));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_iter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_iter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_iter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_iter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use tokio::stream;
-use tokio_test::task;
-
-use std::iter;
-
-#[tokio::test]
-async fn coop() {
-    let mut stream = task::spawn(stream::iter(iter::repeat(1)));
-
-    for _ in 0..10_000 {
-        if stream.poll_next().is_pending() {
-            assert!(stream.is_woken());
-            return;
-        }
-    }
-
-    panic!("did not yield");
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_merge.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_merge.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_merge.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_merge.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-use tokio::stream::{self, Stream, StreamExt};
-use tokio::sync::mpsc;
-use tokio_test::task;
-use tokio_test::{assert_pending, assert_ready};
-
-#[tokio::test]
-async fn merge_sync_streams() {
-    let mut s = stream::iter(vec![0, 2, 4, 6]).merge(stream::iter(vec![1, 3, 5]));
-
-    for i in 0..7 {
-        let rem = 7 - i;
-        assert_eq!(s.size_hint(), (rem, Some(rem)));
-        assert_eq!(Some(i), s.next().await);
-    }
-
-    assert!(s.next().await.is_none());
-}
-
-#[tokio::test]
-async fn merge_async_streams() {
-    let (tx1, rx1) = mpsc::unbounded_channel();
-    let (tx2, rx2) = mpsc::unbounded_channel();
-
-    let mut rx = task::spawn(rx1.merge(rx2));
-
-    assert_eq!(rx.size_hint(), (0, None));
-
-    assert_pending!(rx.poll_next());
-
-    tx1.send(1).unwrap();
-
-    assert!(rx.is_woken());
-    assert_eq!(Some(1), assert_ready!(rx.poll_next()));
-
-    assert_pending!(rx.poll_next());
-    tx2.send(2).unwrap();
-
-    assert!(rx.is_woken());
-    assert_eq!(Some(2), assert_ready!(rx.poll_next()));
-    assert_pending!(rx.poll_next());
-
-    drop(tx1);
-    assert!(rx.is_woken());
-    assert_pending!(rx.poll_next());
-
-    tx2.send(3).unwrap();
-    assert!(rx.is_woken());
-    assert_eq!(Some(3), assert_ready!(rx.poll_next()));
-    assert_pending!(rx.poll_next());
-
-    drop(tx2);
-    assert!(rx.is_woken());
-    assert_eq!(None, assert_ready!(rx.poll_next()));
-}
-
-#[test]
-fn size_overflow() {
-    struct Monster;
-
-    impl tokio::stream::Stream for Monster {
-        type Item = ();
-        fn poll_next(
-            self: std::pin::Pin<&mut Self>,
-            _cx: &mut std::task::Context<'_>,
-        ) -> std::task::Poll<Option<()>> {
-            panic!()
-        }
-
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            (usize::max_value(), Some(usize::max_value()))
-        }
-    }
-
-    let m1 = Monster;
-    let m2 = Monster;
-    let m = m1.merge(m2);
-    assert_eq!(m.size_hint(), (usize::max_value(), None));
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_once.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_once.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_once.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_once.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-use tokio::stream::{self, Stream, StreamExt};
-
-#[tokio::test]
-async fn basic_usage() {
-    let mut one = stream::once(1);
-
-    assert_eq!(one.size_hint(), (1, Some(1)));
-    assert_eq!(Some(1), one.next().await);
-
-    assert_eq!(one.size_hint(), (0, Some(0)));
-    assert_eq!(None, one.next().await);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_pending.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_pending.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_pending.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_pending.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-use tokio::stream::{self, Stream, StreamExt};
-use tokio_test::{assert_pending, task};
-
-#[tokio::test]
-async fn basic_usage() {
-    let mut stream = stream::pending::<i32>();
-
-    for _ in 0..2 {
-        assert_eq!(stream.size_hint(), (0, None));
-
-        let mut next = task::spawn(async { stream.next().await });
-        assert_pending!(next.poll());
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_reader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#![warn(rust_2018_idioms)]
-#![cfg(feature = "full")]
-
-use bytes::Bytes;
-use tokio::io::{stream_reader, AsyncReadExt};
-use tokio::stream::iter;
-
-#[tokio::test]
-async fn test_stream_reader() -> std::io::Result<()> {
-    let stream = iter(vec![
-        Ok(Bytes::from_static(&[])),
-        Ok(Bytes::from_static(&[0, 1, 2, 3])),
-        Ok(Bytes::from_static(&[])),
-        Ok(Bytes::from_static(&[4, 5, 6, 7])),
-        Ok(Bytes::from_static(&[])),
-        Ok(Bytes::from_static(&[8, 9, 10, 11])),
-        Ok(Bytes::from_static(&[])),
-    ]);
-
-    let mut read = stream_reader(stream);
-
-    let mut buf = [0; 5];
-    read.read_exact(&mut buf).await?;
-    assert_eq!(buf, [0, 1, 2, 3, 4]);
-
-    assert_eq!(read.read(&mut buf).await?, 3);
-    assert_eq!(&buf[..3], [5, 6, 7]);
-
-    assert_eq!(read.read(&mut buf).await?, 4);
-    assert_eq!(&buf[..4], [8, 9, 10, 11]);
-
-    assert_eq!(read.read(&mut buf).await?, 0);
-
-    Ok(())
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_stream_map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_stream_map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_stream_map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_stream_map.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,376 +0,0 @@
-#![allow(clippy::stable_sort_primitive)]
-
-use tokio::stream::{self, pending, Stream, StreamExt, StreamMap};
-use tokio::sync::mpsc;
-use tokio_test::{assert_ok, assert_pending, assert_ready, task};
-
-use std::pin::Pin;
-
-macro_rules! assert_ready_some {
-    ($($t:tt)*) => {
-        match assert_ready!($($t)*) {
-            Some(v) => v,
-            None => panic!("expected `Some`, got `None`"),
-        }
-    };
-}
-
-macro_rules! assert_ready_none {
-    ($($t:tt)*) => {
-        match assert_ready!($($t)*) {
-            None => {}
-            Some(v) => panic!("expected `None`, got `Some({:?})`", v),
-        }
-    };
-}
-
-#[tokio::test]
-async fn empty() {
-    let mut map = StreamMap::<&str, stream::Pending<()>>::new();
-
-    assert_eq!(map.len(), 0);
-    assert!(map.is_empty());
-
-    assert!(map.next().await.is_none());
-    assert!(map.next().await.is_none());
-
-    assert!(map.remove("foo").is_none());
-}
-
-#[tokio::test]
-async fn single_entry() {
-    let mut map = task::spawn(StreamMap::new());
-    let (tx, rx) = mpsc::unbounded_channel();
-
-    assert_ready_none!(map.poll_next());
-
-    assert!(map.insert("foo", rx).is_none());
-    assert!(map.contains_key("foo"));
-    assert!(!map.contains_key("bar"));
-
-    assert_eq!(map.len(), 1);
-    assert!(!map.is_empty());
-
-    assert_pending!(map.poll_next());
-
-    assert_ok!(tx.send(1));
-
-    assert!(map.is_woken());
-    let (k, v) = assert_ready_some!(map.poll_next());
-    assert_eq!(k, "foo");
-    assert_eq!(v, 1);
-
-    assert_pending!(map.poll_next());
-
-    assert_ok!(tx.send(2));
-
-    assert!(map.is_woken());
-    let (k, v) = assert_ready_some!(map.poll_next());
-    assert_eq!(k, "foo");
-    assert_eq!(v, 2);
-
-    assert_pending!(map.poll_next());
-    drop(tx);
-    assert!(map.is_woken());
-    assert_ready_none!(map.poll_next());
-}
-
-#[tokio::test]
-async fn multiple_entries() {
-    let mut map = task::spawn(StreamMap::new());
-    let (tx1, rx1) = mpsc::unbounded_channel();
-    let (tx2, rx2) = mpsc::unbounded_channel();
-
-    map.insert("foo", rx1);
-    map.insert("bar", rx2);
-
-    assert_pending!(map.poll_next());
-
-    assert_ok!(tx1.send(1));
-
-    assert!(map.is_woken());
-    let (k, v) = assert_ready_some!(map.poll_next());
-    assert_eq!(k, "foo");
-    assert_eq!(v, 1);
-
-    assert_pending!(map.poll_next());
-
-    assert_ok!(tx2.send(2));
-
-    assert!(map.is_woken());
-    let (k, v) = assert_ready_some!(map.poll_next());
-    assert_eq!(k, "bar");
-    assert_eq!(v, 2);
-
-    assert_pending!(map.poll_next());
-
-    assert_ok!(tx1.send(3));
-    assert_ok!(tx2.send(4));
-
-    assert!(map.is_woken());
-
-    // Given the randomization, there is no guarantee what order the values will
-    // be received in.
-    let mut v = (0..2)
-        .map(|_| assert_ready_some!(map.poll_next()))
-        .collect::<Vec<_>>();
-
-    assert_pending!(map.poll_next());
-
-    v.sort();
-    assert_eq!(v[0].0, "bar");
-    assert_eq!(v[0].1, 4);
-    assert_eq!(v[1].0, "foo");
-    assert_eq!(v[1].1, 3);
-
-    drop(tx1);
-    assert!(map.is_woken());
-    assert_pending!(map.poll_next());
-    drop(tx2);
-
-    assert_ready_none!(map.poll_next());
-}
-
-#[tokio::test]
-async fn insert_remove() {
-    let mut map = task::spawn(StreamMap::new());
-    let (tx, rx) = mpsc::unbounded_channel();
-
-    assert_ready_none!(map.poll_next());
-
-    assert!(map.insert("foo", rx).is_none());
-    let rx = map.remove("foo").unwrap();
-
-    assert_ok!(tx.send(1));
-
-    assert!(!map.is_woken());
-    assert_ready_none!(map.poll_next());
-
-    assert!(map.insert("bar", rx).is_none());
-
-    let v = assert_ready_some!(map.poll_next());
-    assert_eq!(v.0, "bar");
-    assert_eq!(v.1, 1);
-
-    assert!(map.remove("bar").is_some());
-    assert_ready_none!(map.poll_next());
-
-    assert!(map.is_empty());
-    assert_eq!(0, map.len());
-}
-
-#[tokio::test]
-async fn replace() {
-    let mut map = task::spawn(StreamMap::new());
-    let (tx1, rx1) = mpsc::unbounded_channel();
-    let (tx2, rx2) = mpsc::unbounded_channel();
-
-    assert!(map.insert("foo", rx1).is_none());
-
-    assert_pending!(map.poll_next());
-
-    let _rx1 = map.insert("foo", rx2).unwrap();
-
-    assert_pending!(map.poll_next());
-
-    tx1.send(1).unwrap();
-    assert_pending!(map.poll_next());
-
-    tx2.send(2).unwrap();
-    assert!(map.is_woken());
-    let v = assert_ready_some!(map.poll_next());
-    assert_eq!(v.0, "foo");
-    assert_eq!(v.1, 2);
-}
-
-#[test]
-fn size_hint_with_upper() {
-    let mut map = StreamMap::new();
-
-    map.insert("a", stream::iter(vec![1]));
-    map.insert("b", stream::iter(vec![1, 2]));
-    map.insert("c", stream::iter(vec![1, 2, 3]));
-
-    assert_eq!(3, map.len());
-    assert!(!map.is_empty());
-
-    let size_hint = map.size_hint();
-    assert_eq!(size_hint, (6, Some(6)));
-}
-
-#[test]
-fn size_hint_without_upper() {
-    let mut map = StreamMap::new();
-
-    map.insert("a", pin_box(stream::iter(vec![1])));
-    map.insert("b", pin_box(stream::iter(vec![1, 2])));
-    map.insert("c", pin_box(pending()));
-
-    let size_hint = map.size_hint();
-    assert_eq!(size_hint, (3, None));
-}
-
-#[test]
-fn new_capacity_zero() {
-    let map = StreamMap::<&str, stream::Pending<()>>::new();
-    assert_eq!(0, map.capacity());
-
-    let mut keys = map.keys();
-    assert!(keys.next().is_none());
-}
-
-#[test]
-fn with_capacity() {
-    let map = StreamMap::<&str, stream::Pending<()>>::with_capacity(10);
-    assert!(10 <= map.capacity());
-
-    let mut keys = map.keys();
-    assert!(keys.next().is_none());
-}
-
-#[test]
-fn iter_keys() {
-    let mut map = StreamMap::new();
-
-    map.insert("a", pending::<i32>());
-    map.insert("b", pending());
-    map.insert("c", pending());
-
-    let mut keys = map.keys().collect::<Vec<_>>();
-    keys.sort();
-
-    assert_eq!(&keys[..], &[&"a", &"b", &"c"]);
-}
-
-#[test]
-fn iter_values() {
-    let mut map = StreamMap::new();
-
-    map.insert("a", stream::iter(vec![1]));
-    map.insert("b", stream::iter(vec![1, 2]));
-    map.insert("c", stream::iter(vec![1, 2, 3]));
-
-    let mut size_hints = map.values().map(|s| s.size_hint().0).collect::<Vec<_>>();
-
-    size_hints.sort();
-
-    assert_eq!(&size_hints[..], &[1, 2, 3]);
-}
-
-#[test]
-fn iter_values_mut() {
-    let mut map = StreamMap::new();
-
-    map.insert("a", stream::iter(vec![1]));
-    map.insert("b", stream::iter(vec![1, 2]));
-    map.insert("c", stream::iter(vec![1, 2, 3]));
-
-    let mut size_hints = map
-        .values_mut()
-        .map(|s: &mut _| s.size_hint().0)
-        .collect::<Vec<_>>();
-
-    size_hints.sort();
-
-    assert_eq!(&size_hints[..], &[1, 2, 3]);
-}
-
-#[test]
-fn clear() {
-    let mut map = task::spawn(StreamMap::new());
-
-    map.insert("a", stream::iter(vec![1]));
-    map.insert("b", stream::iter(vec![1, 2]));
-    map.insert("c", stream::iter(vec![1, 2, 3]));
-
-    assert_ready_some!(map.poll_next());
-
-    map.clear();
-
-    assert_ready_none!(map.poll_next());
-    assert!(map.is_empty());
-}
-
-#[test]
-fn contains_key_borrow() {
-    let mut map = StreamMap::new();
-    map.insert("foo".to_string(), pending::<()>());
-
-    assert!(map.contains_key("foo"));
-}
-
-#[test]
-fn one_ready_many_none() {
-    // Run a few times because of randomness
-    for _ in 0..100 {
-        let mut map = task::spawn(StreamMap::new());
-
-        map.insert(0, pin_box(stream::empty()));
-        map.insert(1, pin_box(stream::empty()));
-        map.insert(2, pin_box(stream::once("hello")));
-        map.insert(3, pin_box(stream::pending()));
-
-        let v = assert_ready_some!(map.poll_next());
-        assert_eq!(v, (2, "hello"));
-    }
-}
-
-proptest::proptest! {
-    #[test]
-    fn fuzz_pending_complete_mix(kinds: Vec<bool>) {
-        use std::task::{Context, Poll};
-
-        struct DidPoll<T> {
-            did_poll: bool,
-            inner: T,
-        }
-
-        impl<T: Stream + Unpin> Stream for DidPoll<T> {
-            type Item = T::Item;
-
-            fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>)
-                -> Poll<Option<T::Item>>
-            {
-                self.did_poll = true;
-                Pin::new(&mut self.inner).poll_next(cx)
-            }
-        }
-
-        for _ in 0..10 {
-            let mut map = task::spawn(StreamMap::new());
-            let mut expect = 0;
-
-            for (i, &is_empty) in kinds.iter().enumerate() {
-                let inner = if is_empty {
-                    pin_box(stream::empty::<()>())
-                } else {
-                    expect += 1;
-                    pin_box(stream::pending::<()>())
-                };
-
-                let stream = DidPoll {
-                    did_poll: false,
-                    inner,
-                };
-
-                map.insert(i, stream);
-            }
-
-            if expect == 0 {
-                assert_ready_none!(map.poll_next());
-            } else {
-                assert_pending!(map.poll_next());
-
-                assert_eq!(expect, map.values().count());
-
-                for stream in map.values() {
-                    assert!(stream.did_poll);
-                }
-            }
-        }
-    }
-}
-
-fn pin_box<T: Stream<Item = U> + 'static, U>(s: T) -> Pin<Box<dyn Stream<Item = U>>> {
-    Box::pin(s)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_timeout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_timeout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/stream_timeout.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/stream_timeout.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-#![cfg(feature = "full")]
-
-use tokio::stream::{self, StreamExt};
-use tokio::time::{self, delay_for, Duration};
-use tokio_test::*;
-
-use futures::StreamExt as _;
-
-async fn maybe_delay(idx: i32) -> i32 {
-    if idx % 2 == 0 {
-        delay_for(ms(200)).await;
-    }
-    idx
-}
-
-fn ms(n: u64) -> Duration {
-    Duration::from_millis(n)
-}
-
-#[tokio::test]
-async fn basic_usage() {
-    time::pause();
-
-    // Items 2 and 4 time out. If we run the stream until it completes,
-    // we end up with the following items:
-    //
-    // [Ok(1), Err(Elapsed), Ok(2), Ok(3), Err(Elapsed), Ok(4)]
-
-    let stream = stream::iter(1..=4).then(maybe_delay).timeout(ms(100));
-    let mut stream = task::spawn(stream);
-
-    // First item completes immediately
-    assert_ready_eq!(stream.poll_next(), Some(Ok(1)));
-
-    // Second item is delayed 200ms, times out after 100ms
-    assert_pending!(stream.poll_next());
-
-    time::advance(ms(150)).await;
-    let v = assert_ready!(stream.poll_next());
-    assert!(v.unwrap().is_err());
-
-    assert_pending!(stream.poll_next());
-
-    time::advance(ms(100)).await;
-    assert_ready_eq!(stream.poll_next(), Some(Ok(2)));
-
-    // Third item is ready immediately
-    assert_ready_eq!(stream.poll_next(), Some(Ok(3)));
-
-    // Fourth item is delayed 200ms, times out after 100ms
-    assert_pending!(stream.poll_next());
-
-    time::advance(ms(60)).await;
-    assert_pending!(stream.poll_next()); // nothing ready yet
-
-    time::advance(ms(60)).await;
-    let v = assert_ready!(stream.poll_next());
-    assert!(v.unwrap().is_err()); // timeout!
-
-    time::advance(ms(120)).await;
-    assert_ready_eq!(stream.poll_next(), Some(Ok(4)));
-
-    // Done.
-    assert_ready_eq!(stream.poll_next(), None);
-}
-
-#[tokio::test]
-async fn return_elapsed_errors_only_once() {
-    time::pause();
-
-    let stream = stream::iter(1..=3).then(maybe_delay).timeout(ms(50));
-    let mut stream = task::spawn(stream);
-
-    // First item completes immediately
-    assert_ready_eq!(stream.poll_next(), Some(Ok(1)));
-
-    // Second item is delayed 200ms, times out after 50ms. Only one `Elapsed`
-    // error is returned.
-    assert_pending!(stream.poll_next());
-    //
-    time::advance(ms(50)).await;
-    let v = assert_ready!(stream.poll_next());
-    assert!(v.unwrap().is_err()); // timeout!
-
-    // deadline elapses again, but no error is returned
-    time::advance(ms(50)).await;
-    assert_pending!(stream.poll_next());
-
-    time::advance(ms(100)).await;
-    assert_ready_eq!(stream.poll_next(), Some(Ok(2)));
-    assert_ready_eq!(stream.poll_next(), Some(Ok(3)));
-
-    // Done
-    assert_ready_eq!(stream.poll_next(), None);
-}
-
-#[tokio::test]
-async fn no_timeouts() {
-    let stream = stream::iter(vec![1, 3, 5])
-        .then(maybe_delay)
-        .timeout(ms(100));
-
-    let mut stream = task::spawn(stream);
-
-    assert_ready_eq!(stream.poll_next(), Some(Ok(1)));
-    assert_ready_eq!(stream.poll_next(), Some(Ok(3)));
-    assert_ready_eq!(stream.poll_next(), Some(Ok(5)));
-    assert_ready_eq!(stream.poll_next(), None);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/support/io_vec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/support/io_vec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/support/io_vec.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/support/io_vec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+use std::io::IoSlice;
+use std::ops::Deref;
+use std::slice;
+
+pub struct IoBufs<'a, 'b>(&'b mut [IoSlice<'a>]);
+
+impl<'a, 'b> IoBufs<'a, 'b> {
+    pub fn new(slices: &'b mut [IoSlice<'a>]) -> Self {
+        IoBufs(slices)
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn advance(mut self, n: usize) -> IoBufs<'a, 'b> {
+        let mut to_remove = 0;
+        let mut remaining_len = n;
+        for slice in self.0.iter() {
+            if remaining_len < slice.len() {
+                break;
+            } else {
+                remaining_len -= slice.len();
+                to_remove += 1;
+            }
+        }
+        self.0 = self.0.split_at_mut(to_remove).1;
+        if let Some(slice) = self.0.first_mut() {
+            let tail = &slice[remaining_len..];
+            // Safety: recasts slice to the original lifetime
+            let tail = unsafe { slice::from_raw_parts(tail.as_ptr(), tail.len()) };
+            *slice = IoSlice::new(tail);
+        } else if remaining_len != 0 {
+            panic!("advance past the end of the slice vector");
+        }
+        self
+    }
+}
+
+impl<'a, 'b> Deref for IoBufs<'a, 'b> {
+    type Target = [IoSlice<'a>];
+    fn deref(&self) -> &[IoSlice<'a>] {
+        self.0
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/support/mock_file.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/support/mock_file.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/support/mock_file.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/support/mock_file.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,281 +0,0 @@
-#![allow(clippy::unnecessary_operation)]
-
-use std::collections::VecDeque;
-use std::fmt;
-use std::fs::{Metadata, Permissions};
-use std::io;
-use std::io::prelude::*;
-use std::io::SeekFrom;
-use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
-
-pub struct File {
-    shared: Arc<Mutex<Shared>>,
-}
-
-pub struct Handle {
-    shared: Arc<Mutex<Shared>>,
-}
-
-struct Shared {
-    calls: VecDeque<Call>,
-}
-
-#[derive(Debug)]
-enum Call {
-    Read(io::Result<Vec<u8>>),
-    Write(io::Result<Vec<u8>>),
-    Seek(SeekFrom, io::Result<u64>),
-    SyncAll(io::Result<()>),
-    SyncData(io::Result<()>),
-    SetLen(u64, io::Result<()>),
-}
-
-impl Handle {
-    pub fn read(&self, data: &[u8]) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls.push_back(Call::Read(Ok(data.to_owned())));
-        self
-    }
-
-    pub fn read_err(&self) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls
-            .push_back(Call::Read(Err(io::ErrorKind::Other.into())));
-        self
-    }
-
-    pub fn write(&self, data: &[u8]) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls.push_back(Call::Write(Ok(data.to_owned())));
-        self
-    }
-
-    pub fn write_err(&self) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls
-            .push_back(Call::Write(Err(io::ErrorKind::Other.into())));
-        self
-    }
-
-    pub fn seek_start_ok(&self, offset: u64) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls
-            .push_back(Call::Seek(SeekFrom::Start(offset), Ok(offset)));
-        self
-    }
-
-    pub fn seek_current_ok(&self, offset: i64, ret: u64) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls
-            .push_back(Call::Seek(SeekFrom::Current(offset), Ok(ret)));
-        self
-    }
-
-    pub fn sync_all(&self) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls.push_back(Call::SyncAll(Ok(())));
-        self
-    }
-
-    pub fn sync_all_err(&self) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls
-            .push_back(Call::SyncAll(Err(io::ErrorKind::Other.into())));
-        self
-    }
-
-    pub fn sync_data(&self) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls.push_back(Call::SyncData(Ok(())));
-        self
-    }
-
-    pub fn sync_data_err(&self) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls
-            .push_back(Call::SyncData(Err(io::ErrorKind::Other.into())));
-        self
-    }
-
-    pub fn set_len(&self, size: u64) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls.push_back(Call::SetLen(size, Ok(())));
-        self
-    }
-
-    pub fn set_len_err(&self, size: u64) -> &Self {
-        let mut s = self.shared.lock().unwrap();
-        s.calls
-            .push_back(Call::SetLen(size, Err(io::ErrorKind::Other.into())));
-        self
-    }
-
-    pub fn remaining(&self) -> usize {
-        let s = self.shared.lock().unwrap();
-        s.calls.len()
-    }
-}
-
-impl Drop for Handle {
-    fn drop(&mut self) {
-        if !std::thread::panicking() {
-            let s = self.shared.lock().unwrap();
-            assert_eq!(0, s.calls.len());
-        }
-    }
-}
-
-impl File {
-    pub fn open(_: PathBuf) -> io::Result<File> {
-        unimplemented!();
-    }
-
-    pub fn create(_: PathBuf) -> io::Result<File> {
-        unimplemented!();
-    }
-
-    pub fn mock() -> (Handle, File) {
-        let shared = Arc::new(Mutex::new(Shared {
-            calls: VecDeque::new(),
-        }));
-
-        let handle = Handle {
-            shared: shared.clone(),
-        };
-        let file = File { shared };
-
-        (handle, file)
-    }
-
-    pub fn sync_all(&self) -> io::Result<()> {
-        use self::Call::*;
-
-        let mut s = self.shared.lock().unwrap();
-
-        match s.calls.pop_front() {
-            Some(SyncAll(ret)) => ret,
-            Some(op) => panic!("expected next call to be {:?}; was sync_all", op),
-            None => panic!("did not expect call"),
-        }
-    }
-
-    pub fn sync_data(&self) -> io::Result<()> {
-        use self::Call::*;
-
-        let mut s = self.shared.lock().unwrap();
-
-        match s.calls.pop_front() {
-            Some(SyncData(ret)) => ret,
-            Some(op) => panic!("expected next call to be {:?}; was sync_all", op),
-            None => panic!("did not expect call"),
-        }
-    }
-
-    pub fn set_len(&self, size: u64) -> io::Result<()> {
-        use self::Call::*;
-
-        let mut s = self.shared.lock().unwrap();
-
-        match s.calls.pop_front() {
-            Some(SetLen(arg, ret)) => {
-                assert_eq!(arg, size);
-                ret
-            }
-            Some(op) => panic!("expected next call to be {:?}; was sync_all", op),
-            None => panic!("did not expect call"),
-        }
-    }
-
-    pub fn metadata(&self) -> io::Result<Metadata> {
-        unimplemented!();
-    }
-
-    pub fn set_permissions(&self, _perm: Permissions) -> io::Result<()> {
-        unimplemented!();
-    }
-
-    pub fn try_clone(&self) -> io::Result<Self> {
-        unimplemented!();
-    }
-}
-
-impl Read for &'_ File {
-    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
-        use self::Call::*;
-
-        let mut s = self.shared.lock().unwrap();
-
-        match s.calls.pop_front() {
-            Some(Read(Ok(data))) => {
-                assert!(dst.len() >= data.len());
-                assert!(dst.len() <= 16 * 1024, "actual = {}", dst.len()); // max buffer
-
-                &mut dst[..data.len()].copy_from_slice(&data);
-                Ok(data.len())
-            }
-            Some(Read(Err(e))) => Err(e),
-            Some(op) => panic!("expected next call to be {:?}; was a read", op),
-            None => panic!("did not expect call"),
-        }
-    }
-}
-
-impl Write for &'_ File {
-    fn write(&mut self, src: &[u8]) -> io::Result<usize> {
-        use self::Call::*;
-
-        let mut s = self.shared.lock().unwrap();
-
-        match s.calls.pop_front() {
-            Some(Write(Ok(data))) => {
-                assert_eq!(src, &data[..]);
-                Ok(src.len())
-            }
-            Some(Write(Err(e))) => Err(e),
-            Some(op) => panic!("expected next call to be {:?}; was write", op),
-            None => panic!("did not expect call"),
-        }
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-impl Seek for &'_ File {
-    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
-        use self::Call::*;
-
-        let mut s = self.shared.lock().unwrap();
-
-        match s.calls.pop_front() {
-            Some(Seek(expect, res)) => {
-                assert_eq!(expect, pos);
-                res
-            }
-            Some(op) => panic!("expected call {:?}; was `seek`", op),
-            None => panic!("did not expect call; was `seek`"),
-        }
-    }
-}
-
-impl fmt::Debug for File {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.debug_struct("mock::File").finish()
-    }
-}
-
-#[cfg(unix)]
-impl std::os::unix::io::AsRawFd for File {
-    fn as_raw_fd(&self) -> std::os::unix::io::RawFd {
-        unimplemented!();
-    }
-}
-
-#[cfg(windows)]
-impl std::os::windows::io::AsRawHandle for File {
-    fn as_raw_handle(&self) -> std::os::windows::io::RawHandle {
-        unimplemented!();
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/support/mock_pool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/support/mock_pool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/support/mock_pool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/support/mock_pool.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-use tokio::sync::oneshot;
-
-use std::cell::RefCell;
-use std::collections::VecDeque;
-use std::future::Future;
-use std::io;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-thread_local! {
-    static QUEUE: RefCell<VecDeque<Box<dyn FnOnce() + Send>>> = RefCell::new(VecDeque::new())
-}
-
-#[derive(Debug)]
-pub(crate) struct Blocking<T> {
-    rx: oneshot::Receiver<T>,
-}
-
-pub(crate) fn run<F, R>(f: F) -> Blocking<R>
-where
-    F: FnOnce() -> R + Send + 'static,
-    R: Send + 'static,
-{
-    let (tx, rx) = oneshot::channel();
-    let task = Box::new(move || {
-        let _ = tx.send(f());
-    });
-
-    QUEUE.with(|cell| cell.borrow_mut().push_back(task));
-
-    Blocking { rx }
-}
-
-impl<T> Future for Blocking<T> {
-    type Output = Result<T, io::Error>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        use std::task::Poll::*;
-
-        match Pin::new(&mut self.rx).poll(cx) {
-            Ready(Ok(v)) => Ready(Ok(v)),
-            Ready(Err(e)) => panic!("error = {:?}", e),
-            Pending => Pending,
-        }
-    }
-}
-
-pub(crate) async fn asyncify<F, T>(f: F) -> io::Result<T>
-where
-    F: FnOnce() -> io::Result<T> + Send + 'static,
-    T: Send + 'static,
-{
-    run(f).await?
-}
-
-pub(crate) fn len() -> usize {
-    QUEUE.with(|cell| cell.borrow().len())
-}
-
-pub(crate) fn run_one() {
-    let task = QUEUE
-        .with(|cell| cell.borrow_mut().pop_front())
-        .expect("expected task to run, but none ready");
-
-    task();
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/support/mpsc_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/support/mpsc_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/support/mpsc_stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/support/mpsc_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+#![allow(dead_code)]
+
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use tokio::sync::mpsc::{self, Receiver, Sender, UnboundedReceiver, UnboundedSender};
+use tokio_stream::Stream;
+
+struct UnboundedStream<T> {
+    recv: UnboundedReceiver<T>,
+}
+impl<T> Stream for UnboundedStream<T> {
+    type Item = T;
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
+        Pin::into_inner(self).recv.poll_recv(cx)
+    }
+}
+
+pub fn unbounded_channel_stream<T: Unpin>() -> (UnboundedSender<T>, impl Stream<Item = T>) {
+    let (tx, rx) = mpsc::unbounded_channel();
+
+    let stream = UnboundedStream { recv: rx };
+
+    (tx, stream)
+}
+
+struct BoundedStream<T> {
+    recv: Receiver<T>,
+}
+impl<T> Stream for BoundedStream<T> {
+    type Item = T;
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<T>> {
+        Pin::into_inner(self).recv.poll_recv(cx)
+    }
+}
+
+pub fn channel_stream<T: Unpin>(size: usize) -> (Sender<T>, impl Stream<Item = T>) {
+    let (tx, rx) = mpsc::channel(size);
+
+    let stream = BoundedStream { recv: rx };
+
+    (tx, stream)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_broadcast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_broadcast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_broadcast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_broadcast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![allow(clippy::cognitive_complexity, clippy::match_like_matches_macro)]
+#![allow(clippy::cognitive_complexity)]
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "sync")]
 
@@ -23,7 +23,7 @@
     ($e:expr) => {
         match $e.try_recv() {
             Ok(value) => panic!("expected empty; got = {:?}", value),
-            Err(broadcast::TryRecvError::Empty) => {}
+            Err(broadcast::error::TryRecvError::Empty) => {}
             Err(e) => panic!("expected empty; got = {:?}", e),
         }
     };
@@ -32,7 +32,7 @@
 macro_rules! assert_lagged {
     ($e:expr, $n:expr) => {
         match assert_err!($e) {
-            broadcast::TryRecvError::Lagged(n) => {
+            broadcast::error::TryRecvError::Lagged(n) => {
                 assert_eq!(n, $n);
             }
             _ => panic!("did not lag"),
@@ -43,7 +43,7 @@
 macro_rules! assert_closed {
     ($e:expr) => {
         match assert_err!($e) {
-            broadcast::TryRecvError::Closed => {}
+            broadcast::error::TryRecvError::Closed => {}
             _ => panic!("did not lag"),
         }
     };
@@ -89,46 +89,6 @@
     assert_empty!(rx2);
 }
 
-#[tokio::test]
-async fn send_recv_into_stream_ready() {
-    use tokio::stream::StreamExt;
-
-    let (tx, rx) = broadcast::channel::<i32>(8);
-    tokio::pin! {
-        let rx = rx.into_stream();
-    }
-
-    assert_ok!(tx.send(1));
-    assert_ok!(tx.send(2));
-
-    assert_eq!(Some(Ok(1)), rx.next().await);
-    assert_eq!(Some(Ok(2)), rx.next().await);
-
-    drop(tx);
-
-    assert_eq!(None, rx.next().await);
-}
-
-#[tokio::test]
-async fn send_recv_into_stream_pending() {
-    use tokio::stream::StreamExt;
-
-    let (tx, rx) = broadcast::channel::<i32>(8);
-
-    tokio::pin! {
-        let rx = rx.into_stream();
-    }
-
-    let mut recv = task::spawn(rx.next());
-    assert_pending!(recv.poll());
-
-    assert_ok!(tx.send(1));
-
-    assert!(recv.is_woken());
-    let val = assert_ready!(recv.poll());
-    assert_eq!(val, Some(Ok(1)));
-}
-
 #[test]
 fn send_recv_bounded() {
     let (tx, mut rx) = broadcast::channel(16);
@@ -491,42 +451,6 @@
     assert_empty!(rx);
 }
 
-#[tokio::test]
-async fn send_recv_stream_ready_deprecated() {
-    use tokio::stream::StreamExt;
-
-    let (tx, mut rx) = broadcast::channel::<i32>(8);
-
-    assert_ok!(tx.send(1));
-    assert_ok!(tx.send(2));
-
-    assert_eq!(Some(Ok(1)), rx.next().await);
-    assert_eq!(Some(Ok(2)), rx.next().await);
-
-    drop(tx);
-
-    assert_eq!(None, rx.next().await);
-}
-
-#[tokio::test]
-async fn send_recv_stream_pending_deprecated() {
-    use tokio::stream::StreamExt;
-
-    let (tx, mut rx) = broadcast::channel::<i32>(8);
-
-    let mut recv = task::spawn(rx.next());
-    assert_pending!(recv.poll());
-
-    assert_ok!(tx.send(1));
-
-    assert!(recv.is_woken());
-    let val = assert_ready!(recv.poll());
-    assert_eq!(val, Some(Ok(1)));
-}
-
-fn is_closed(err: broadcast::RecvError) -> bool {
-    match err {
-        broadcast::RecvError::Closed => true,
-        _ => false,
-    }
+fn is_closed(err: broadcast::error::RecvError) -> bool {
+    matches!(err, broadcast::error::RecvError::Closed)
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_cancellation_token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_cancellation_token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_cancellation_token.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_cancellation_token.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,220 +0,0 @@
-#![cfg(tokio_unstable)]
-
-use tokio::pin;
-use tokio::sync::CancellationToken;
-
-use core::future::Future;
-use core::task::{Context, Poll};
-use futures_test::task::new_count_waker;
-
-#[test]
-fn cancel_token() {
-    let (waker, wake_counter) = new_count_waker();
-    let token = CancellationToken::new();
-    assert_eq!(false, token.is_cancelled());
-
-    let wait_fut = token.cancelled();
-    pin!(wait_fut);
-
-    assert_eq!(
-        Poll::Pending,
-        wait_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(wake_counter, 0);
-
-    let wait_fut_2 = token.cancelled();
-    pin!(wait_fut_2);
-
-    token.cancel();
-    assert_eq!(wake_counter, 1);
-    assert_eq!(true, token.is_cancelled());
-
-    assert_eq!(
-        Poll::Ready(()),
-        wait_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(
-        Poll::Ready(()),
-        wait_fut_2.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-}
-
-#[test]
-fn cancel_child_token_through_parent() {
-    let (waker, wake_counter) = new_count_waker();
-    let token = CancellationToken::new();
-
-    let child_token = token.child_token();
-    assert!(!child_token.is_cancelled());
-
-    let child_fut = child_token.cancelled();
-    pin!(child_fut);
-    let parent_fut = token.cancelled();
-    pin!(parent_fut);
-
-    assert_eq!(
-        Poll::Pending,
-        child_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(
-        Poll::Pending,
-        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(wake_counter, 0);
-
-    token.cancel();
-    assert_eq!(wake_counter, 2);
-    assert_eq!(true, token.is_cancelled());
-    assert_eq!(true, child_token.is_cancelled());
-
-    assert_eq!(
-        Poll::Ready(()),
-        child_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(
-        Poll::Ready(()),
-        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-}
-
-#[test]
-fn cancel_child_token_without_parent() {
-    let (waker, wake_counter) = new_count_waker();
-    let token = CancellationToken::new();
-
-    let child_token_1 = token.child_token();
-
-    let child_fut = child_token_1.cancelled();
-    pin!(child_fut);
-    let parent_fut = token.cancelled();
-    pin!(parent_fut);
-
-    assert_eq!(
-        Poll::Pending,
-        child_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(
-        Poll::Pending,
-        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(wake_counter, 0);
-
-    child_token_1.cancel();
-    assert_eq!(wake_counter, 1);
-    assert_eq!(false, token.is_cancelled());
-    assert_eq!(true, child_token_1.is_cancelled());
-
-    assert_eq!(
-        Poll::Ready(()),
-        child_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(
-        Poll::Pending,
-        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-
-    let child_token_2 = token.child_token();
-    let child_fut_2 = child_token_2.cancelled();
-    pin!(child_fut_2);
-
-    assert_eq!(
-        Poll::Pending,
-        child_fut_2.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(
-        Poll::Pending,
-        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-
-    token.cancel();
-    assert_eq!(wake_counter, 3);
-    assert_eq!(true, token.is_cancelled());
-    assert_eq!(true, child_token_2.is_cancelled());
-
-    assert_eq!(
-        Poll::Ready(()),
-        child_fut_2.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-    assert_eq!(
-        Poll::Ready(()),
-        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
-    );
-}
-
-#[test]
-fn create_child_token_after_parent_was_cancelled() {
-    for drop_child_first in [true, false].iter().cloned() {
-        let (waker, wake_counter) = new_count_waker();
-        let token = CancellationToken::new();
-        token.cancel();
-
-        let child_token = token.child_token();
-        assert!(child_token.is_cancelled());
-
-        {
-            let child_fut = child_token.cancelled();
-            pin!(child_fut);
-            let parent_fut = token.cancelled();
-            pin!(parent_fut);
-
-            assert_eq!(
-                Poll::Ready(()),
-                child_fut.as_mut().poll(&mut Context::from_waker(&waker))
-            );
-            assert_eq!(
-                Poll::Ready(()),
-                parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
-            );
-            assert_eq!(wake_counter, 0);
-
-            drop(child_fut);
-            drop(parent_fut);
-        }
-
-        if drop_child_first {
-            drop(child_token);
-            drop(token);
-        } else {
-            drop(token);
-            drop(child_token);
-        }
-    }
-}
-
-#[test]
-fn drop_multiple_child_tokens() {
-    for drop_first_child_first in &[true, false] {
-        let token = CancellationToken::new();
-        let mut child_tokens = [None, None, None];
-        for i in 0..child_tokens.len() {
-            child_tokens[i] = Some(token.child_token());
-        }
-
-        assert!(!token.is_cancelled());
-        assert!(!child_tokens[0].as_ref().unwrap().is_cancelled());
-
-        for i in 0..child_tokens.len() {
-            if *drop_first_child_first {
-                child_tokens[i] = None;
-            } else {
-                child_tokens[child_tokens.len() - 1 - i] = None;
-            }
-            assert!(!token.is_cancelled());
-        }
-
-        drop(token);
-    }
-}
-
-#[test]
-fn drop_parent_before_child_tokens() {
-    let token = CancellationToken::new();
-    let child1 = token.child_token();
-    let child2 = token.child_token();
-
-    drop(token);
-    assert!(!child1.is_cancelled());
-
-    drop(child1);
-    drop(child2);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_mpsc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_mpsc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_mpsc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_mpsc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,8 +2,10 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
+use std::thread;
+use tokio::runtime::Runtime;
 use tokio::sync::mpsc;
-use tokio::sync::mpsc::error::{TryRecvError, TrySendError};
+use tokio::sync::mpsc::error::TrySendError;
 use tokio_test::task;
 use tokio_test::{
     assert_err, assert_ok, assert_pending, assert_ready, assert_ready_err, assert_ready_ok,
@@ -11,78 +13,81 @@
 
 use std::sync::Arc;
 
+mod support {
+    pub(crate) mod mpsc_stream;
+}
+
 trait AssertSend: Send {}
 impl AssertSend for mpsc::Sender<i32> {}
 impl AssertSend for mpsc::Receiver<i32> {}
 
-#[test]
-fn send_recv_with_buffer() {
-    let (tx, rx) = mpsc::channel::<i32>(16);
-    let mut tx = task::spawn(tx);
-    let mut rx = task::spawn(rx);
+#[tokio::test]
+async fn send_recv_with_buffer() {
+    let (tx, mut rx) = mpsc::channel::<i32>(16);
 
     // Using poll_ready / try_send
-    assert_ready_ok!(tx.enter(|cx, mut tx| tx.poll_ready(cx)));
-    tx.try_send(1).unwrap();
+    // let permit assert_ready_ok!(tx.reserve());
+    let permit = tx.reserve().await.unwrap();
+    permit.send(1);
 
     // Without poll_ready
     tx.try_send(2).unwrap();
 
     drop(tx);
 
-    let val = assert_ready!(rx.enter(|cx, mut rx| rx.poll_recv(cx)));
+    let val = rx.recv().await;
     assert_eq!(val, Some(1));
 
-    let val = assert_ready!(rx.enter(|cx, mut rx| rx.poll_recv(cx)));
+    let val = rx.recv().await;
     assert_eq!(val, Some(2));
 
-    let val = assert_ready!(rx.enter(|cx, mut rx| rx.poll_recv(cx)));
+    let val = rx.recv().await;
     assert!(val.is_none());
 }
 
-#[test]
-fn disarm() {
-    let (tx, rx) = mpsc::channel::<i32>(2);
-    let mut tx1 = task::spawn(tx.clone());
-    let mut tx2 = task::spawn(tx.clone());
-    let mut tx3 = task::spawn(tx.clone());
-    let mut tx4 = task::spawn(tx);
-    let mut rx = task::spawn(rx);
+#[tokio::test]
+async fn reserve_disarm() {
+    let (tx, mut rx) = mpsc::channel::<i32>(2);
+    let tx1 = tx.clone();
+    let tx2 = tx.clone();
+    let tx3 = tx.clone();
+    let tx4 = tx;
 
     // We should be able to `poll_ready` two handles without problem
-    assert_ready_ok!(tx1.enter(|cx, mut tx| tx.poll_ready(cx)));
-    assert_ready_ok!(tx2.enter(|cx, mut tx| tx.poll_ready(cx)));
+    let permit1 = assert_ok!(tx1.reserve().await);
+    let permit2 = assert_ok!(tx2.reserve().await);
 
     // But a third should not be ready
-    assert_pending!(tx3.enter(|cx, mut tx| tx.poll_ready(cx)));
+    let mut r3 = task::spawn(tx3.reserve());
+    assert_pending!(r3.poll());
+
+    let mut r4 = task::spawn(tx4.reserve());
+    assert_pending!(r4.poll());
 
     // Using one of the reserved slots should allow a new handle to become ready
-    tx1.try_send(1).unwrap();
+    permit1.send(1);
+
     // We also need to receive for the slot to be free
-    let _ = assert_ready!(rx.enter(|cx, mut rx| rx.poll_recv(cx))).unwrap();
+    assert!(!r3.is_woken());
+    rx.recv().await.unwrap();
     // Now there's a free slot!
-    assert_ready_ok!(tx3.enter(|cx, mut tx| tx.poll_ready(cx)));
-    assert_pending!(tx4.enter(|cx, mut tx| tx.poll_ready(cx)));
+    assert!(r3.is_woken());
+    assert!(!r4.is_woken());
 
-    // Dropping a ready handle should also open up a slot
-    drop(tx2);
-    assert_ready_ok!(tx4.enter(|cx, mut tx| tx.poll_ready(cx)));
-    assert_pending!(tx1.enter(|cx, mut tx| tx.poll_ready(cx)));
+    // Dropping a permit should also open up a slot
+    drop(permit2);
+    assert!(r4.is_woken());
 
-    // Explicitly disarming a handle should also open a slot
-    assert!(tx3.disarm());
-    assert_ready_ok!(tx1.enter(|cx, mut tx| tx.poll_ready(cx)));
-
-    // Disarming a non-armed sender does not free up a slot
-    assert!(!tx3.disarm());
-    assert_pending!(tx3.enter(|cx, mut tx| tx.poll_ready(cx)));
+    let mut r1 = task::spawn(tx1.reserve());
+    assert_pending!(r1.poll());
 }
 
 #[tokio::test]
 async fn send_recv_stream_with_buffer() {
-    use tokio::stream::StreamExt;
+    use tokio_stream::StreamExt;
 
-    let (mut tx, mut rx) = mpsc::channel::<i32>(16);
+    let (tx, rx) = support::mpsc_stream::channel_stream::<i32>(16);
+    let mut rx = Box::pin(rx);
 
     tokio::spawn(async move {
         assert_ok!(tx.send(1).await);
@@ -96,7 +101,7 @@
 
 #[tokio::test]
 async fn async_send_recv_with_buffer() {
-    let (mut tx, mut rx) = mpsc::channel(16);
+    let (tx, mut rx) = mpsc::channel(16);
 
     tokio::spawn(async move {
         assert_ok!(tx.send(1).await);
@@ -108,37 +113,36 @@
     assert_eq!(None, rx.recv().await);
 }
 
-#[test]
-fn start_send_past_cap() {
+#[tokio::test]
+async fn start_send_past_cap() {
+    use std::future::Future;
+
     let mut t1 = task::spawn(());
-    let mut t2 = task::spawn(());
-    let mut t3 = task::spawn(());
 
-    let (mut tx1, mut rx) = mpsc::channel(1);
-    let mut tx2 = tx1.clone();
+    let (tx1, mut rx) = mpsc::channel(1);
+    let tx2 = tx1.clone();
 
     assert_ok!(tx1.try_send(()));
 
-    t1.enter(|cx, _| {
-        assert_pending!(tx1.poll_ready(cx));
-    });
+    let mut r1 = Box::pin(tx1.reserve());
+    t1.enter(|cx, _| assert_pending!(r1.as_mut().poll(cx)));
 
-    t2.enter(|cx, _| {
-        assert_pending!(tx2.poll_ready(cx));
-    });
+    {
+        let mut r2 = task::spawn(tx2.reserve());
+        assert_pending!(r2.poll());
 
-    drop(tx1);
+        drop(r1);
 
-    let val = t3.enter(|cx, _| assert_ready!(rx.poll_recv(cx)));
-    assert!(val.is_some());
+        assert!(rx.recv().await.is_some());
 
-    assert!(t2.is_woken());
-    assert!(!t1.is_woken());
+        assert!(r2.is_woken());
+        assert!(!t1.is_woken());
+    }
 
+    drop(tx1);
     drop(tx2);
 
-    let val = t3.enter(|cx, _| assert_ready!(rx.poll_recv(cx)));
-    assert!(val.is_none());
+    assert!(rx.recv().await.is_none());
 }
 
 #[test]
@@ -147,26 +151,20 @@
     mpsc::channel::<i32>(0);
 }
 
-#[test]
-fn send_recv_unbounded() {
-    let mut t1 = task::spawn(());
-
+#[tokio::test]
+async fn send_recv_unbounded() {
     let (tx, mut rx) = mpsc::unbounded_channel::<i32>();
 
     // Using `try_send`
     assert_ok!(tx.send(1));
     assert_ok!(tx.send(2));
 
-    let val = assert_ready!(t1.enter(|cx, _| rx.poll_recv(cx)));
-    assert_eq!(val, Some(1));
-
-    let val = assert_ready!(t1.enter(|cx, _| rx.poll_recv(cx)));
-    assert_eq!(val, Some(2));
+    assert_eq!(rx.recv().await, Some(1));
+    assert_eq!(rx.recv().await, Some(2));
 
     drop(tx);
 
-    let val = assert_ready!(t1.enter(|cx, _| rx.poll_recv(cx)));
-    assert!(val.is_none());
+    assert!(rx.recv().await.is_none());
 }
 
 #[tokio::test]
@@ -185,9 +183,11 @@
 
 #[tokio::test]
 async fn send_recv_stream_unbounded() {
-    use tokio::stream::StreamExt;
+    use tokio_stream::StreamExt;
 
-    let (tx, mut rx) = mpsc::unbounded_channel::<i32>();
+    let (tx, rx) = support::mpsc_stream::unbounded_channel_stream::<i32>();
+
+    let mut rx = Box::pin(rx);
 
     tokio::spawn(async move {
         assert_ok!(tx.send(1));
@@ -199,11 +199,10 @@
     assert_eq!(None, rx.next().await);
 }
 
-#[test]
-fn no_t_bounds_buffer() {
+#[tokio::test]
+async fn no_t_bounds_buffer() {
     struct NoImpls;
 
-    let mut t1 = task::spawn(());
     let (tx, mut rx) = mpsc::channel(100);
 
     // sender should be Debug even though T isn't Debug
@@ -213,15 +212,13 @@
     // and sender should be Clone even though T isn't Clone
     assert!(tx.clone().try_send(NoImpls).is_ok());
 
-    let val = assert_ready!(t1.enter(|cx, _| rx.poll_recv(cx)));
-    assert!(val.is_some());
+    assert!(rx.recv().await.is_some());
 }
 
-#[test]
-fn no_t_bounds_unbounded() {
+#[tokio::test]
+async fn no_t_bounds_unbounded() {
     struct NoImpls;
 
-    let mut t1 = task::spawn(());
     let (tx, mut rx) = mpsc::unbounded_channel();
 
     // sender should be Debug even though T isn't Debug
@@ -231,133 +228,87 @@
     // and sender should be Clone even though T isn't Clone
     assert!(tx.clone().send(NoImpls).is_ok());
 
-    let val = assert_ready!(t1.enter(|cx, _| rx.poll_recv(cx)));
-    assert!(val.is_some());
+    assert!(rx.recv().await.is_some());
 }
 
-#[test]
-fn send_recv_buffer_limited() {
-    let mut t1 = task::spawn(());
-    let mut t2 = task::spawn(());
-
-    let (mut tx, mut rx) = mpsc::channel::<i32>(1);
-
-    // Run on a task context
-    t1.enter(|cx, _| {
-        assert_ready_ok!(tx.poll_ready(cx));
-
-        // Send first message
-        assert_ok!(tx.try_send(1));
+#[tokio::test]
+async fn send_recv_buffer_limited() {
+    let (tx, mut rx) = mpsc::channel::<i32>(1);
 
-        // Not ready
-        assert_pending!(tx.poll_ready(cx));
+    // Reserve capacity
+    let p1 = assert_ok!(tx.reserve().await);
 
-        // Send second message
-        assert_err!(tx.try_send(1337));
-    });
+    // Send first message
+    p1.send(1);
 
-    t2.enter(|cx, _| {
-        // Take the value
-        let val = assert_ready!(rx.poll_recv(cx));
-        assert_eq!(Some(1), val);
-    });
+    // Not ready
+    let mut p2 = task::spawn(tx.reserve());
+    assert_pending!(p2.poll());
 
-    assert!(t1.is_woken());
+    // Take the value
+    assert!(rx.recv().await.is_some());
 
-    t1.enter(|cx, _| {
-        assert_ready_ok!(tx.poll_ready(cx));
+    // Notified
+    assert!(p2.is_woken());
 
-        assert_ok!(tx.try_send(2));
+    // Trying to send fails
+    assert_err!(tx.try_send(1337));
 
-        // Not ready
-        assert_pending!(tx.poll_ready(cx));
-    });
+    // Send second
+    let permit = assert_ready_ok!(p2.poll());
+    permit.send(2);
 
-    t2.enter(|cx, _| {
-        // Take the value
-        let val = assert_ready!(rx.poll_recv(cx));
-        assert_eq!(Some(2), val);
-    });
-
-    t1.enter(|cx, _| {
-        assert_ready_ok!(tx.poll_ready(cx));
-    });
+    assert!(rx.recv().await.is_some());
 }
 
-#[test]
-fn recv_close_gets_none_idle() {
-    let mut t1 = task::spawn(());
-
-    let (mut tx, mut rx) = mpsc::channel::<i32>(10);
+#[tokio::test]
+async fn recv_close_gets_none_idle() {
+    let (tx, mut rx) = mpsc::channel::<i32>(10);
 
     rx.close();
 
-    t1.enter(|cx, _| {
-        let val = assert_ready!(rx.poll_recv(cx));
-        assert!(val.is_none());
-        assert_ready_err!(tx.poll_ready(cx));
-    });
-}
-
-#[test]
-fn recv_close_gets_none_reserved() {
-    let mut t1 = task::spawn(());
-    let mut t2 = task::spawn(());
-    let mut t3 = task::spawn(());
-
-    let (mut tx1, mut rx) = mpsc::channel::<i32>(1);
-    let mut tx2 = tx1.clone();
+    assert!(rx.recv().await.is_none());
 
-    assert_ready_ok!(t1.enter(|cx, _| tx1.poll_ready(cx)));
+    assert_err!(tx.send(1).await);
+}
 
-    t2.enter(|cx, _| {
-        assert_pending!(tx2.poll_ready(cx));
-    });
+#[tokio::test]
+async fn recv_close_gets_none_reserved() {
+    let (tx1, mut rx) = mpsc::channel::<i32>(1);
+    let tx2 = tx1.clone();
+
+    let permit1 = assert_ok!(tx1.reserve().await);
+    let mut permit2 = task::spawn(tx2.reserve());
+    assert_pending!(permit2.poll());
 
     rx.close();
 
-    assert!(t2.is_woken());
-
-    t2.enter(|cx, _| {
-        assert_ready_err!(tx2.poll_ready(cx));
-    });
-
-    t3.enter(|cx, _| assert_pending!(rx.poll_recv(cx)));
-
-    assert!(!t1.is_woken());
-    assert!(!t2.is_woken());
+    assert!(permit2.is_woken());
+    assert_ready_err!(permit2.poll());
 
-    assert_ok!(tx1.try_send(123));
+    {
+        let mut recv = task::spawn(rx.recv());
+        assert_pending!(recv.poll());
 
-    assert!(t3.is_woken());
+        permit1.send(123);
+        assert!(recv.is_woken());
 
-    t3.enter(|cx, _| {
-        let v = assert_ready!(rx.poll_recv(cx));
+        let v = assert_ready!(recv.poll());
         assert_eq!(v, Some(123));
+    }
 
-        let v = assert_ready!(rx.poll_recv(cx));
-        assert!(v.is_none());
-    });
+    assert!(rx.recv().await.is_none());
 }
 
-#[test]
-fn tx_close_gets_none() {
-    let mut t1 = task::spawn(());
-
+#[tokio::test]
+async fn tx_close_gets_none() {
     let (_, mut rx) = mpsc::channel::<i32>(10);
-
-    // Run on a task context
-    t1.enter(|cx, _| {
-        let v = assert_ready!(rx.poll_recv(cx));
-        assert!(v.is_none());
-    });
+    assert!(rx.recv().await.is_none());
 }
 
-#[test]
-fn try_send_fail() {
-    let mut t1 = task::spawn(());
-
-    let (mut tx, mut rx) = mpsc::channel(1);
+#[tokio::test]
+async fn try_send_fail() {
+    let (tx, mut rx) = mpsc::channel(1);
 
     tx.try_send("hello").unwrap();
 
@@ -367,60 +318,71 @@
         _ => panic!(),
     }
 
-    let val = assert_ready!(t1.enter(|cx, _| rx.poll_recv(cx)));
-    assert_eq!(val, Some("hello"));
+    assert_eq!(rx.recv().await, Some("hello"));
 
     assert_ok!(tx.try_send("goodbye"));
     drop(tx);
 
-    let val = assert_ready!(t1.enter(|cx, _| rx.poll_recv(cx)));
-    assert_eq!(val, Some("goodbye"));
-
-    let val = assert_ready!(t1.enter(|cx, _| rx.poll_recv(cx)));
-    assert!(val.is_none());
+    assert_eq!(rx.recv().await, Some("goodbye"));
+    assert!(rx.recv().await.is_none());
 }
 
-#[test]
-fn drop_tx_with_permit_releases_permit() {
-    let mut t1 = task::spawn(());
-    let mut t2 = task::spawn(());
+#[tokio::test]
+async fn try_reserve_fails() {
+    let (tx, mut rx) = mpsc::channel(1);
 
-    // poll_ready reserves capacity, ensure that the capacity is released if tx
-    // is dropped w/o sending a value.
-    let (mut tx1, _rx) = mpsc::channel::<i32>(1);
-    let mut tx2 = tx1.clone();
+    let permit = tx.try_reserve().unwrap();
 
-    assert_ready_ok!(t1.enter(|cx, _| tx1.poll_ready(cx)));
+    // This should fail
+    match assert_err!(tx.try_reserve()) {
+        TrySendError::Full(()) => {}
+        _ => panic!(),
+    }
 
-    t2.enter(|cx, _| {
-        assert_pending!(tx2.poll_ready(cx));
-    });
+    permit.send("foo");
 
-    drop(tx1);
+    assert_eq!(rx.recv().await, Some("foo"));
 
-    assert!(t2.is_woken());
+    // Dropping permit releases the slot.
+    let permit = tx.try_reserve().unwrap();
+    drop(permit);
 
-    assert_ready_ok!(t2.enter(|cx, _| tx2.poll_ready(cx)));
+    let _permit = tx.try_reserve().unwrap();
 }
 
-#[test]
-fn dropping_rx_closes_channel() {
-    let mut t1 = task::spawn(());
+#[tokio::test]
+async fn drop_permit_releases_permit() {
+    // poll_ready reserves capacity, ensure that the capacity is released if tx
+    // is dropped w/o sending a value.
+    let (tx1, _rx) = mpsc::channel::<i32>(1);
+    let tx2 = tx1.clone();
+
+    let permit = assert_ok!(tx1.reserve().await);
+
+    let mut reserve2 = task::spawn(tx2.reserve());
+    assert_pending!(reserve2.poll());
 
-    let (mut tx, rx) = mpsc::channel(100);
+    drop(permit);
+
+    assert!(reserve2.is_woken());
+    assert_ready_ok!(reserve2.poll());
+}
+
+#[tokio::test]
+async fn dropping_rx_closes_channel() {
+    let (tx, rx) = mpsc::channel(100);
 
     let msg = Arc::new(());
     assert_ok!(tx.try_send(msg.clone()));
 
     drop(rx);
-    assert_ready_err!(t1.enter(|cx, _| tx.poll_ready(cx)));
-
+    assert_err!(tx.reserve().await);
     assert_eq!(1, Arc::strong_count(&msg));
 }
 
 #[test]
 fn dropping_rx_closes_channel_for_try() {
-    let (mut tx, rx) = mpsc::channel(100);
+    let (tx, rx) = mpsc::channel(100);
 
     let msg = Arc::new(());
     tx.try_send(msg.clone()).unwrap();
@@ -442,7 +404,7 @@
 fn unconsumed_messages_are_dropped() {
     let msg = Arc::new(());
 
-    let (mut tx, rx) = mpsc::channel(100);
+    let (tx, rx) = mpsc::channel(100);
 
     tx.try_send(msg.clone()).unwrap();
 
@@ -454,85 +416,81 @@
 }
 
 #[test]
-fn try_recv() {
-    let (mut tx, mut rx) = mpsc::channel(1);
-    match rx.try_recv() {
-        Err(TryRecvError::Empty) => {}
-        _ => panic!(),
-    }
-    tx.try_send(42).unwrap();
-    match rx.try_recv() {
-        Ok(42) => {}
-        _ => panic!(),
-    }
-    drop(tx);
-    match rx.try_recv() {
-        Err(TryRecvError::Closed) => {}
-        _ => panic!(),
-    }
+fn blocking_recv() {
+    let (tx, mut rx) = mpsc::channel::<u8>(1);
+
+    let sync_code = thread::spawn(move || {
+        assert_eq!(Some(10), rx.blocking_recv());
+    });
+
+    Runtime::new().unwrap().block_on(async move {
+        let _ = tx.send(10).await;
+    });
+    sync_code.join().unwrap()
 }
 
-#[test]
-fn try_recv_unbounded() {
-    let (tx, mut rx) = mpsc::unbounded_channel();
-    match rx.try_recv() {
-        Err(TryRecvError::Empty) => {}
-        _ => panic!(),
-    }
-    tx.send(42).unwrap();
-    match rx.try_recv() {
-        Ok(42) => {}
-        _ => panic!(),
-    }
-    drop(tx);
-    match rx.try_recv() {
-        Err(TryRecvError::Closed) => {}
-        _ => panic!(),
-    }
+#[tokio::test]
+#[should_panic]
+async fn blocking_recv_async() {
+    let (_tx, mut rx) = mpsc::channel::<()>(1);
+    let _ = rx.blocking_recv();
 }
 
 #[test]
-fn ready_close_cancel_bounded() {
-    use futures::future::poll_fn;
+fn blocking_send() {
+    let (tx, mut rx) = mpsc::channel::<u8>(1);
 
-    let (mut tx, mut rx) = mpsc::channel::<()>(100);
+    let sync_code = thread::spawn(move || {
+        tx.blocking_send(10).unwrap();
+    });
+
+    Runtime::new().unwrap().block_on(async move {
+        assert_eq!(Some(10), rx.recv().await);
+    });
+    sync_code.join().unwrap()
+}
+
+#[tokio::test]
+#[should_panic]
+async fn blocking_send_async() {
+    let (tx, _rx) = mpsc::channel::<()>(1);
+    let _ = tx.blocking_send(());
+}
+
+#[tokio::test]
+async fn ready_close_cancel_bounded() {
+    let (tx, mut rx) = mpsc::channel::<()>(100);
     let _tx2 = tx.clone();
 
-    {
-        let mut ready = task::spawn(async { poll_fn(|cx| tx.poll_ready(cx)).await });
-        assert_ready_ok!(ready.poll());
-    }
+    let permit = assert_ok!(tx.reserve().await);
 
     rx.close();
 
-    let mut recv = task::spawn(async { rx.recv().await });
+    let mut recv = task::spawn(rx.recv());
     assert_pending!(recv.poll());
 
-    drop(tx);
+    drop(permit);
 
     assert!(recv.is_woken());
+    let val = assert_ready!(recv.poll());
+    assert!(val.is_none());
 }
 
 #[tokio::test]
 async fn permit_available_not_acquired_close() {
-    use futures::future::poll_fn;
+    let (tx1, mut rx) = mpsc::channel::<()>(1);
+    let tx2 = tx1.clone();
 
-    let (mut tx1, mut rx) = mpsc::channel::<()>(1);
-    let mut tx2 = tx1.clone();
+    let permit1 = assert_ok!(tx1.reserve().await);
 
-    {
-        let mut ready = task::spawn(poll_fn(|cx| tx1.poll_ready(cx)));
-        assert_ready_ok!(ready.poll());
-    }
-
-    let mut ready = task::spawn(poll_fn(|cx| tx2.poll_ready(cx)));
-    assert_pending!(ready.poll());
+    let mut permit2 = task::spawn(tx2.reserve());
+    assert_pending!(permit2.poll());
 
     rx.close();
 
-    drop(tx1);
-    assert!(ready.is_woken());
+    drop(permit1);
+    assert!(permit2.is_woken());
 
-    drop(tx2);
+    drop(permit2);
     assert!(rx.recv().await.is_none());
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_mutex_owned.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_mutex_owned.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_mutex_owned.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_mutex_owned.rs	2021-12-09 12:01:26.000000000 +0000
@@ -58,10 +58,11 @@
         let m2 = m1.clone();
         // Try to lock mutex in a future that is aborted prematurely
         timeout(Duration::from_millis(1u64), async move {
-            let mut iv = interval(Duration::from_millis(1000));
+            let iv = interval(Duration::from_millis(1000));
+            tokio::pin!(iv);
             m2.lock_owned().await;
-            iv.tick().await;
-            iv.tick().await;
+            iv.as_mut().tick().await;
+            iv.as_mut().tick().await;
         })
         .await
         .unwrap_err();
@@ -105,12 +106,12 @@
     let m: Arc<Mutex<usize>> = Arc::new(Mutex::new(0));
     {
         let g1 = m.clone().try_lock_owned();
-        assert_eq!(g1.is_ok(), true);
+        assert!(g1.is_ok());
         let g2 = m.clone().try_lock_owned();
-        assert_eq!(g2.is_ok(), false);
+        assert!(!g2.is_ok());
     }
     let g3 = m.try_lock_owned();
-    assert_eq!(g3.is_ok(), true);
+    assert!(g3.is_ok());
 }
 
 #[tokio::test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_mutex.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_mutex.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_mutex.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_mutex.rs	2021-12-09 12:01:26.000000000 +0000
@@ -91,10 +91,11 @@
         let m2 = m1.clone();
         // Try to lock mutex in a future that is aborted prematurely
         timeout(Duration::from_millis(1u64), async move {
-            let mut iv = interval(Duration::from_millis(1000));
+            let iv = interval(Duration::from_millis(1000));
+            tokio::pin!(iv);
             m2.lock().await;
-            iv.tick().await;
-            iv.tick().await;
+            iv.as_mut().tick().await;
+            iv.as_mut().tick().await;
         })
         .await
         .unwrap_err();
@@ -138,12 +139,12 @@
     let m: Mutex<usize> = Mutex::new(0);
     {
         let g1 = m.try_lock();
-        assert_eq!(g1.is_ok(), true);
+        assert!(g1.is_ok());
         let g2 = m.try_lock();
-        assert_eq!(g2.is_ok(), false);
+        assert!(!g2.is_ok());
     }
     let g3 = m.try_lock();
-    assert_eq!(g3.is_ok(), true);
+    assert!(g3.is_ok());
 }
 
 #[tokio::test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_notify.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_notify.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_notify.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_notify.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
     let notify = Notify::new();
     let mut notified = spawn(async { notify.notified().await });
 
-    notify.notify();
+    notify.notify_one();
     assert_ready!(notified.poll());
 }
 
@@ -24,7 +24,7 @@
 
     assert_pending!(notified.poll());
 
-    notify.notify();
+    notify.notify_one();
     assert!(notified.is_woken());
     assert_ready!(notified.poll());
 }
@@ -38,7 +38,7 @@
     assert_pending!(notified1.poll());
     assert_pending!(notified2.poll());
 
-    notify.notify();
+    notify.notify_one();
     assert!(notified1.is_woken());
     assert!(!notified2.is_woken());
 
@@ -50,7 +50,7 @@
 fn notify_notified_multi() {
     let notify = Notify::new();
 
-    notify.notify();
+    notify.notify_one();
 
     let mut notified1 = spawn(async { notify.notified().await });
     let mut notified2 = spawn(async { notify.notified().await });
@@ -58,7 +58,7 @@
     assert_ready!(notified1.poll());
     assert_pending!(notified2.poll());
 
-    notify.notify();
+    notify.notify_one();
 
     assert!(notified2.is_woken());
     assert_ready!(notified2.poll());
@@ -76,7 +76,7 @@
 
     assert_pending!(notified2.poll());
 
-    notify.notify();
+    notify.notify_one();
     assert!(notified2.is_woken());
     assert_ready!(notified2.poll());
 }
@@ -90,7 +90,7 @@
     assert_pending!(notified1.poll());
     assert_pending!(notified2.poll());
 
-    notify.notify();
+    notify.notify_one();
 
     assert!(notified1.is_woken());
     assert!(!notified2.is_woken());
@@ -100,3 +100,54 @@
     assert!(notified2.is_woken());
     assert_ready!(notified2.poll());
 }
+
+#[test]
+fn notify_in_drop_after_wake() {
+    use futures::task::ArcWake;
+    use std::future::Future;
+    use std::sync::Arc;
+
+    let notify = Arc::new(Notify::new());
+
+    struct NotifyOnDrop(Arc<Notify>);
+
+    impl ArcWake for NotifyOnDrop {
+        fn wake_by_ref(_arc_self: &Arc<Self>) {}
+    }
+
+    impl Drop for NotifyOnDrop {
+        fn drop(&mut self) {
+            self.0.notify_waiters();
+        }
+    }
+
+    let mut fut = Box::pin(async {
+        notify.notified().await;
+    });
+
+    {
+        let waker = futures::task::waker(Arc::new(NotifyOnDrop(notify.clone())));
+        let mut cx = std::task::Context::from_waker(&waker);
+        assert!(fut.as_mut().poll(&mut cx).is_pending());
+    }
+
+    // Now, notifying **should not** deadlock
+    notify.notify_waiters();
+}
+
+#[test]
+fn notify_one_after_dropped_all() {
+    let notify = Notify::new();
+    let mut notified1 = spawn(async { notify.notified().await });
+
+    assert_pending!(notified1.poll());
+
+    notify.notify_waiters();
+    notify.notify_one();
+
+    drop(notified1);
+
+    let mut notified2 = spawn(async { notify.notified().await });
+
+    assert_ready!(notified2.poll());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_once_cell.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_once_cell.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_once_cell.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_once_cell.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,274 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use std::mem;
+use std::ops::Drop;
+use std::sync::atomic::{AtomicU32, Ordering};
+use std::time::Duration;
+use tokio::runtime;
+use tokio::sync::{OnceCell, SetError};
+use tokio::time;
+
+async fn func1() -> u32 {
+    5
+}
+
+async fn func2() -> u32 {
+    time::sleep(Duration::from_millis(1)).await;
+    10
+}
+
+async fn func_err() -> Result<u32, ()> {
+    Err(())
+}
+
+async fn func_ok() -> Result<u32, ()> {
+    Ok(10)
+}
+
+async fn func_panic() -> u32 {
+    time::sleep(Duration::from_millis(1)).await;
+    panic!();
+}
+
+async fn sleep_and_set() -> u32 {
+    // Simulate sleep by pausing time and waiting for another thread to
+    // resume clock when calling `set`, then finding the cell being initialized
+    // by this call
+    time::sleep(Duration::from_millis(2)).await;
+    5
+}
+
+async fn advance_time_and_set(cell: &'static OnceCell<u32>, v: u32) -> Result<(), SetError<u32>> {
+    time::advance(Duration::from_millis(1)).await;
+    cell.set(v)
+}
+
+#[test]
+fn get_or_init() {
+    let rt = runtime::Builder::new_current_thread()
+        .enable_time()
+        .start_paused(true)
+        .build()
+        .unwrap();
+
+    static ONCE: OnceCell<u32> = OnceCell::const_new();
+
+    rt.block_on(async {
+        let handle1 = rt.spawn(async { ONCE.get_or_init(func1).await });
+        let handle2 = rt.spawn(async { ONCE.get_or_init(func2).await });
+
+        time::advance(Duration::from_millis(1)).await;
+        time::resume();
+
+        let result1 = handle1.await.unwrap();
+        let result2 = handle2.await.unwrap();
+
+        assert_eq!(*result1, 5);
+        assert_eq!(*result2, 5);
+    });
+}
+
+#[test]
+fn get_or_init_panic() {
+    let rt = runtime::Builder::new_current_thread()
+        .enable_time()
+        .build()
+        .unwrap();
+
+    static ONCE: OnceCell<u32> = OnceCell::const_new();
+
+    rt.block_on(async {
+        time::pause();
+
+        let handle1 = rt.spawn(async { ONCE.get_or_init(func1).await });
+        let handle2 = rt.spawn(async { ONCE.get_or_init(func_panic).await });
+
+        time::advance(Duration::from_millis(1)).await;
+
+        let result1 = handle1.await.unwrap();
+        let result2 = handle2.await.unwrap();
+
+        assert_eq!(*result1, 5);
+        assert_eq!(*result2, 5);
+    });
+}
+
+#[test]
+fn set_and_get() {
+    let rt = runtime::Builder::new_current_thread()
+        .enable_time()
+        .build()
+        .unwrap();
+
+    static ONCE: OnceCell<u32> = OnceCell::const_new();
+
+    rt.block_on(async {
+        let _ = rt.spawn(async { ONCE.set(5) }).await;
+        let value = ONCE.get().unwrap();
+        assert_eq!(*value, 5);
+    });
+}
+
+#[test]
+fn get_uninit() {
+    static ONCE: OnceCell<u32> = OnceCell::const_new();
+    let uninit = ONCE.get();
+    assert!(uninit.is_none());
+}
+
+#[test]
+fn set_twice() {
+    static ONCE: OnceCell<u32> = OnceCell::const_new();
+
+    let first = ONCE.set(5);
+    assert_eq!(first, Ok(()));
+    let second = ONCE.set(6);
+    assert!(second.err().unwrap().is_already_init_err());
+}
+
+#[test]
+fn set_while_initializing() {
+    let rt = runtime::Builder::new_current_thread()
+        .enable_time()
+        .build()
+        .unwrap();
+
+    static ONCE: OnceCell<u32> = OnceCell::const_new();
+
+    rt.block_on(async {
+        time::pause();
+
+        let handle1 = rt.spawn(async { ONCE.get_or_init(sleep_and_set).await });
+        let handle2 = rt.spawn(async { advance_time_and_set(&ONCE, 10).await });
+
+        time::advance(Duration::from_millis(2)).await;
+
+        let result1 = handle1.await.unwrap();
+        let result2 = handle2.await.unwrap();
+
+        assert_eq!(*result1, 5);
+        assert!(result2.err().unwrap().is_initializing_err());
+    });
+}
+
+#[test]
+fn get_or_try_init() {
+    let rt = runtime::Builder::new_current_thread()
+        .enable_time()
+        .start_paused(true)
+        .build()
+        .unwrap();
+
+    static ONCE: OnceCell<u32> = OnceCell::const_new();
+
+    rt.block_on(async {
+        let handle1 = rt.spawn(async { ONCE.get_or_try_init(func_err).await });
+        let handle2 = rt.spawn(async { ONCE.get_or_try_init(func_ok).await });
+
+        time::advance(Duration::from_millis(1)).await;
+        time::resume();
+
+        let result1 = handle1.await.unwrap();
+        assert!(result1.is_err());
+
+        let result2 = handle2.await.unwrap();
+        assert_eq!(*result2.unwrap(), 10);
+    });
+}
+
+#[test]
+fn drop_cell() {
+    static NUM_DROPS: AtomicU32 = AtomicU32::new(0);
+
+    struct Foo {}
+
+    let fooer = Foo {};
+
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            NUM_DROPS.fetch_add(1, Ordering::Release);
+        }
+    }
+
+    {
+        let once_cell = OnceCell::new();
+        let prev = once_cell.set(fooer);
+        assert!(prev.is_ok())
+    }
+    assert!(NUM_DROPS.load(Ordering::Acquire) == 1);
+}
+
+#[test]
+fn drop_cell_new_with() {
+    static NUM_DROPS: AtomicU32 = AtomicU32::new(0);
+
+    struct Foo {}
+
+    let fooer = Foo {};
+
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            NUM_DROPS.fetch_add(1, Ordering::Release);
+        }
+    }
+
+    {
+        let once_cell = OnceCell::new_with(Some(fooer));
+        assert!(once_cell.initialized());
+    }
+    assert!(NUM_DROPS.load(Ordering::Acquire) == 1);
+}
+
+#[test]
+fn drop_into_inner() {
+    static NUM_DROPS: AtomicU32 = AtomicU32::new(0);
+
+    struct Foo {}
+
+    let fooer = Foo {};
+
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            NUM_DROPS.fetch_add(1, Ordering::Release);
+        }
+    }
+
+    let once_cell = OnceCell::new();
+    assert!(once_cell.set(fooer).is_ok());
+    let fooer = once_cell.into_inner();
+    let count = NUM_DROPS.load(Ordering::Acquire);
+    assert!(count == 0);
+    drop(fooer);
+    let count = NUM_DROPS.load(Ordering::Acquire);
+    assert!(count == 1);
+}
+
+#[test]
+fn drop_into_inner_new_with() {
+    static NUM_DROPS: AtomicU32 = AtomicU32::new(0);
+
+    struct Foo {}
+
+    let fooer = Foo {};
+
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            NUM_DROPS.fetch_add(1, Ordering::Release);
+        }
+    }
+
+    let once_cell = OnceCell::new_with(Some(fooer));
+    let fooer = once_cell.into_inner();
+    let count = NUM_DROPS.load(Ordering::Acquire);
+    assert!(count == 0);
+    mem::drop(fooer);
+    let count = NUM_DROPS.load(Ordering::Acquire);
+    assert!(count == 1);
+}
+
+#[test]
+fn from() {
+    let cell = OnceCell::from(2);
+    assert_eq!(*cell.get().unwrap(), 2);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_oneshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_oneshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_oneshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_oneshot.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,15 +2,29 @@
 #![cfg(feature = "full")]
 
 use tokio::sync::oneshot;
+use tokio::sync::oneshot::error::TryRecvError;
 use tokio_test::*;
 
 use std::future::Future;
 use std::pin::Pin;
+use std::task::{Context, Poll};
 
 trait AssertSend: Send {}
 impl AssertSend for oneshot::Sender<i32> {}
 impl AssertSend for oneshot::Receiver<i32> {}
 
+trait SenderExt {
+    fn poll_closed(&mut self, cx: &mut Context<'_>) -> Poll<()>;
+}
+impl<T> SenderExt for oneshot::Sender<T> {
+    fn poll_closed(&mut self, cx: &mut Context<'_>) -> Poll<()> {
+        tokio::pin! {
+            let fut = self.closed();
+        }
+        fut.poll(cx)
+    }
+}
+
 #[test]
 fn send_recv() {
     let (tx, rx) = oneshot::channel();
@@ -168,6 +182,27 @@
 }
 
 #[test]
+fn close_after_recv() {
+    let (tx, mut rx) = oneshot::channel::<i32>();
+
+    tx.send(17).unwrap();
+
+    assert_eq!(17, rx.try_recv().unwrap());
+    rx.close();
+}
+
+#[test]
+fn try_recv_after_completion() {
+    let (tx, mut rx) = oneshot::channel::<i32>();
+
+    tx.send(17).unwrap();
+
+    assert_eq!(17, rx.try_recv().unwrap());
+    assert_eq!(Err(TryRecvError::Closed), rx.try_recv());
+    rx.close();
+}
+
+#[test]
 fn drops_tasks() {
     let (mut tx, mut rx) = oneshot::channel::<i32>();
     let mut tx_task = task::spawn(());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_rwlock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_rwlock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_rwlock.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_rwlock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,11 +50,11 @@
     assert_pending!(t2.poll());
 }
 
-// If the max shared access is reached and subsquent shared access is pending
-// should be made available when one of the shared acesses is dropped
+// If the max shared access is reached and subsequent shared access is pending
+// should be made available when one of the shared accesses is dropped
 #[test]
 fn exhaust_reading() {
-    let rwlock = RwLock::new(100);
+    let rwlock = RwLock::with_max_readers(100, 1024);
     let mut reads = Vec::new();
     loop {
         let mut t = spawn(rwlock.read());
@@ -166,7 +166,7 @@
 }
 
 // A single RwLock is contested by tasks in multiple threads
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread", worker_threads = 8)]
 async fn multithreaded() {
     let barrier = Arc::new(Barrier::new(5));
     let rwlock = Arc::new(RwLock::<u32>::new(0));
@@ -235,3 +235,36 @@
     let g = rwlock.read().await;
     assert_eq!(*g, 17_000);
 }
+
+#[tokio::test]
+async fn try_write() {
+    let lock = RwLock::new(0);
+    let read_guard = lock.read().await;
+    assert!(lock.try_write().is_err());
+    drop(read_guard);
+    assert!(lock.try_write().is_ok());
+}
+
+#[test]
+fn try_read_try_write() {
+    let lock: RwLock<usize> = RwLock::new(15);
+
+    {
+        let rg1 = lock.try_read().unwrap();
+        assert_eq!(*rg1, 15);
+
+        assert!(lock.try_write().is_err());
+
+        let rg2 = lock.try_read().unwrap();
+        assert_eq!(*rg2, 15)
+    }
+
+    {
+        let mut wg = lock.try_write().unwrap();
+        *wg = 1515;
+
+        assert!(lock.try_read().is_err())
+    }
+
+    assert_eq!(*lock.try_read().unwrap(), 1515);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_semaphore_owned.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_semaphore_owned.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_semaphore_owned.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_semaphore_owned.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,6 +16,22 @@
     assert!(p3.is_ok());
 }
 
+#[test]
+fn try_acquire_many() {
+    let sem = Arc::new(Semaphore::new(42));
+    {
+        let p1 = sem.clone().try_acquire_many_owned(42);
+        assert!(p1.is_ok());
+        let p2 = sem.clone().try_acquire_owned();
+        assert!(p2.is_err());
+    }
+    let p3 = sem.clone().try_acquire_many_owned(32);
+    assert!(p3.is_ok());
+    let p4 = sem.clone().try_acquire_many_owned(10);
+    assert!(p4.is_ok());
+    assert!(sem.try_acquire_owned().is_err());
+}
+
 #[tokio::test]
 async fn acquire() {
     let sem = Arc::new(Semaphore::new(1));
@@ -29,6 +45,21 @@
 }
 
 #[tokio::test]
+async fn acquire_many() {
+    let semaphore = Arc::new(Semaphore::new(42));
+    let permit32 = semaphore.clone().try_acquire_many_owned(32).unwrap();
+    let (sender, receiver) = tokio::sync::oneshot::channel();
+    let join_handle = tokio::spawn(async move {
+        let _permit10 = semaphore.clone().acquire_many_owned(10).await.unwrap();
+        sender.send(()).unwrap();
+        let _permit32 = semaphore.acquire_many_owned(32).await.unwrap();
+    });
+    receiver.await.unwrap();
+    drop(permit32);
+    join_handle.await.unwrap();
+}
+
+#[tokio::test]
 async fn add_permits() {
     let sem = Arc::new(Semaphore::new(0));
     let sem_clone = sem.clone();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_semaphore.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_semaphore.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_semaphore.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_semaphore.rs	2021-12-09 12:01:26.000000000 +0000
@@ -79,3 +79,17 @@
     let _p5 = sem.try_acquire().unwrap();
     assert!(sem.try_acquire().is_err());
 }
+
+#[test]
+fn add_max_amount_permits() {
+    let s = tokio::sync::Semaphore::new(0);
+    s.add_permits(usize::MAX >> 3);
+    assert_eq!(s.available_permits(), usize::MAX >> 3);
+}
+
+#[test]
+#[should_panic]
+fn add_more_than_max_amount_permits() {
+    let s = tokio::sync::Semaphore::new(1);
+    s.add_permits(usize::MAX >> 3);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_watch.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_watch.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/sync_watch.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/sync_watch.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,41 +4,41 @@
 
 use tokio::sync::watch;
 use tokio_test::task::spawn;
-use tokio_test::{assert_pending, assert_ready};
+use tokio_test::{assert_pending, assert_ready, assert_ready_err, assert_ready_ok};
 
 #[test]
 fn single_rx_recv() {
     let (tx, mut rx) = watch::channel("one");
 
     {
-        let mut t = spawn(rx.recv());
-        let v = assert_ready!(t.poll()).unwrap();
-        assert_eq!(v, "one");
+        // Not initially notified
+        let mut t = spawn(rx.changed());
+        assert_pending!(t.poll());
     }
+    assert_eq!(*rx.borrow(), "one");
 
     {
-        let mut t = spawn(rx.recv());
-
+        let mut t = spawn(rx.changed());
         assert_pending!(t.poll());
 
-        tx.broadcast("two").unwrap();
+        tx.send("two").unwrap();
 
         assert!(t.is_woken());
 
-        let v = assert_ready!(t.poll()).unwrap();
-        assert_eq!(v, "two");
+        assert_ready_ok!(t.poll());
     }
+    assert_eq!(*rx.borrow(), "two");
 
     {
-        let mut t = spawn(rx.recv());
-
+        let mut t = spawn(rx.changed());
         assert_pending!(t.poll());
 
         drop(tx);
 
-        let res = assert_ready!(t.poll());
-        assert!(res.is_none());
+        assert!(t.is_woken());
+        assert_ready_err!(t.poll());
     }
+    assert_eq!(*rx.borrow(), "two");
 }
 
 #[test]
@@ -47,82 +47,65 @@
     let mut rx2 = rx1.clone();
 
     {
-        let mut t1 = spawn(rx1.recv());
-        let mut t2 = spawn(rx2.recv());
-
-        let res = assert_ready!(t1.poll());
-        assert_eq!(res.unwrap(), "one");
+        let mut t1 = spawn(rx1.changed());
+        let mut t2 = spawn(rx2.changed());
 
-        let res = assert_ready!(t2.poll());
-        assert_eq!(res.unwrap(), "one");
+        assert_pending!(t1.poll());
+        assert_pending!(t2.poll());
     }
+    assert_eq!(*rx1.borrow(), "one");
+    assert_eq!(*rx2.borrow(), "one");
 
-    let mut t2 = spawn(rx2.recv());
+    let mut t2 = spawn(rx2.changed());
 
     {
-        let mut t1 = spawn(rx1.recv());
+        let mut t1 = spawn(rx1.changed());
 
         assert_pending!(t1.poll());
         assert_pending!(t2.poll());
 
-        tx.broadcast("two").unwrap();
+        tx.send("two").unwrap();
 
         assert!(t1.is_woken());
         assert!(t2.is_woken());
 
-        let res = assert_ready!(t1.poll());
-        assert_eq!(res.unwrap(), "two");
+        assert_ready_ok!(t1.poll());
     }
+    assert_eq!(*rx1.borrow(), "two");
 
     {
-        let mut t1 = spawn(rx1.recv());
+        let mut t1 = spawn(rx1.changed());
 
         assert_pending!(t1.poll());
 
-        tx.broadcast("three").unwrap();
+        tx.send("three").unwrap();
 
         assert!(t1.is_woken());
         assert!(t2.is_woken());
 
-        let res = assert_ready!(t1.poll());
-        assert_eq!(res.unwrap(), "three");
-
-        let res = assert_ready!(t2.poll());
-        assert_eq!(res.unwrap(), "three");
+        assert_ready_ok!(t1.poll());
+        assert_ready_ok!(t2.poll());
     }
+    assert_eq!(*rx1.borrow(), "three");
 
     drop(t2);
 
+    assert_eq!(*rx2.borrow(), "three");
+
     {
-        let mut t1 = spawn(rx1.recv());
-        let mut t2 = spawn(rx2.recv());
+        let mut t1 = spawn(rx1.changed());
+        let mut t2 = spawn(rx2.changed());
 
         assert_pending!(t1.poll());
         assert_pending!(t2.poll());
 
-        tx.broadcast("four").unwrap();
-
-        let res = assert_ready!(t1.poll());
-        assert_eq!(res.unwrap(), "four");
-        drop(t1);
+        tx.send("four").unwrap();
 
-        let mut t1 = spawn(rx1.recv());
-        assert_pending!(t1.poll());
-
-        drop(tx);
-
-        assert!(t1.is_woken());
-        let res = assert_ready!(t1.poll());
-        assert!(res.is_none());
-
-        let res = assert_ready!(t2.poll());
-        assert_eq!(res.unwrap(), "four");
-
-        drop(t2);
-        let mut t2 = spawn(rx2.recv());
-        let res = assert_ready!(t2.poll());
-        assert!(res.is_none());
+        assert_ready_ok!(t1.poll());
+        assert_ready_ok!(t2.poll());
     }
+    assert_eq!(*rx1.borrow(), "four");
+    assert_eq!(*rx2.borrow(), "four");
 }
 
 #[test]
@@ -133,52 +116,46 @@
     drop(tx);
 
     {
-        let mut t1 = spawn(rx.recv());
-        let res = assert_ready!(t1.poll());
-        assert_eq!(res.unwrap(), "one");
-    }
-
-    {
-        let mut t1 = spawn(rx.recv());
-        let res = assert_ready!(t1.poll());
-        assert!(res.is_none());
+        let mut t1 = spawn(rx.changed());
+        assert_ready_err!(t1.poll());
     }
+    assert_eq!(*rx.borrow(), "one");
 
     // Sending a value
 
     let (tx, mut rx) = watch::channel("one");
 
-    tx.broadcast("two").unwrap();
+    tx.send("two").unwrap();
 
     {
-        let mut t1 = spawn(rx.recv());
-        let res = assert_ready!(t1.poll());
-        assert_eq!(res.unwrap(), "two");
+        let mut t1 = spawn(rx.changed());
+        assert_ready_ok!(t1.poll());
     }
+    assert_eq!(*rx.borrow(), "two");
 
     {
-        let mut t1 = spawn(rx.recv());
+        let mut t1 = spawn(rx.changed());
         assert_pending!(t1.poll());
 
-        tx.broadcast("three").unwrap();
+        tx.send("three").unwrap();
         drop(tx);
 
         assert!(t1.is_woken());
 
-        let res = assert_ready!(t1.poll());
-        assert_eq!(res.unwrap(), "three");
+        assert_ready_ok!(t1.poll());
     }
+    assert_eq!(*rx.borrow(), "three");
 
     {
-        let mut t1 = spawn(rx.recv());
-        let res = assert_ready!(t1.poll());
-        assert!(res.is_none());
+        let mut t1 = spawn(rx.changed());
+        assert_ready_err!(t1.poll());
     }
+    assert_eq!(*rx.borrow(), "three");
 }
 
 #[test]
 fn poll_close() {
-    let (mut tx, rx) = watch::channel("one");
+    let (tx, rx) = watch::channel("one");
 
     {
         let mut t = spawn(tx.closed());
@@ -190,42 +167,37 @@
         assert_ready!(t.poll());
     }
 
-    assert!(tx.broadcast("two").is_err());
+    assert!(tx.send("two").is_err());
 }
 
 #[test]
-fn stream_impl() {
-    use tokio::stream::StreamExt;
-
+fn borrow_and_update() {
     let (tx, mut rx) = watch::channel("one");
 
-    {
-        let mut t = spawn(rx.next());
-        let v = assert_ready!(t.poll()).unwrap();
-        assert_eq!(v, "one");
-    }
-
-    {
-        let mut t = spawn(rx.next());
-
-        assert_pending!(t.poll());
+    tx.send("two").unwrap();
+    assert_ready!(spawn(rx.changed()).poll()).unwrap();
+    assert_pending!(spawn(rx.changed()).poll());
+
+    tx.send("three").unwrap();
+    assert_eq!(*rx.borrow_and_update(), "three");
+    assert_pending!(spawn(rx.changed()).poll());
 
-        tx.broadcast("two").unwrap();
-
-        assert!(t.is_woken());
-
-        let v = assert_ready!(t.poll()).unwrap();
-        assert_eq!(v, "two");
-    }
+    drop(tx);
+    assert_eq!(*rx.borrow_and_update(), "three");
+    assert_ready!(spawn(rx.changed()).poll()).unwrap_err();
+}
 
-    {
-        let mut t = spawn(rx.next());
+#[test]
+fn reopened_after_subscribe() {
+    let (tx, rx) = watch::channel("one");
+    assert!(!tx.is_closed());
 
-        assert_pending!(t.poll());
+    drop(rx);
+    assert!(tx.is_closed());
 
-        drop(tx);
+    let rx = tx.subscribe();
+    assert!(!tx.is_closed());
 
-        let res = assert_ready!(t.poll());
-        assert!(res.is_none());
-    }
+    drop(rx);
+    assert!(tx.is_closed());
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_abort.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_abort.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_abort.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_abort.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,224 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use std::sync::Arc;
+use std::thread::sleep;
+use tokio::time::Duration;
+
+use tokio::runtime::Builder;
+
+struct PanicOnDrop;
+
+impl Drop for PanicOnDrop {
+    fn drop(&mut self) {
+        panic!("Well what did you expect would happen...");
+    }
+}
+
+/// Checks that a suspended task can be aborted without panicking as reported in
+/// issue #3157: <https://github.com/tokio-rs/tokio/issues/3157>.
+#[test]
+fn test_abort_without_panic_3157() {
+    let rt = Builder::new_multi_thread()
+        .enable_time()
+        .worker_threads(1)
+        .build()
+        .unwrap();
+
+    rt.block_on(async move {
+        let handle = tokio::spawn(async move {
+            println!("task started");
+            tokio::time::sleep(Duration::new(100, 0)).await
+        });
+
+        // wait for task to sleep.
+        tokio::time::sleep(Duration::from_millis(10)).await;
+
+        handle.abort();
+        let _ = handle.await;
+    });
+}
+
+/// Checks that a suspended task can be aborted inside of a current_thread
+/// executor without panicking as reported in issue #3662:
+/// <https://github.com/tokio-rs/tokio/issues/3662>.
+#[test]
+fn test_abort_without_panic_3662() {
+    use std::sync::atomic::{AtomicBool, Ordering};
+    use std::sync::Arc;
+
+    struct DropCheck(Arc<AtomicBool>);
+
+    impl Drop for DropCheck {
+        fn drop(&mut self) {
+            self.0.store(true, Ordering::SeqCst);
+        }
+    }
+
+    let rt = Builder::new_current_thread().build().unwrap();
+
+    rt.block_on(async move {
+        let drop_flag = Arc::new(AtomicBool::new(false));
+        let drop_check = DropCheck(drop_flag.clone());
+
+        let j = tokio::spawn(async move {
+            // NB: just grab the drop check here so that it becomes part of the
+            // task.
+            let _drop_check = drop_check;
+            futures::future::pending::<()>().await;
+        });
+
+        let drop_flag2 = drop_flag.clone();
+
+        let task = std::thread::spawn(move || {
+            // This runs in a separate thread so it doesn't have immediate
+            // thread-local access to the executor. It does however transition
+            // the underlying task to be completed, which will cause it to be
+            // dropped (but not in this thread).
+            assert!(!drop_flag2.load(Ordering::SeqCst));
+            j.abort();
+            j
+        })
+        .join()
+        .unwrap();
+
+        let result = task.await;
+        assert!(drop_flag.load(Ordering::SeqCst));
+        assert!(result.unwrap_err().is_cancelled());
+
+        // Note: We do the following to trigger a deferred task cleanup.
+        //
+        // The relevant piece of code you want to look at is in:
+        // `Inner::block_on` of `basic_scheduler.rs`.
+        //
+        // We cause the cleanup to happen by having a poll return Pending once
+        // so that the scheduler can go into the "auxiliary tasks" mode, at
+        // which point the task is removed from the scheduler.
+        let i = tokio::spawn(async move {
+            tokio::task::yield_now().await;
+        });
+
+        i.await.unwrap();
+    });
+}
+
+/// Checks that a suspended LocalSet task can be aborted from a remote thread
+/// without panicking and without running the tasks destructor on the wrong thread.
+/// <https://github.com/tokio-rs/tokio/issues/3929>
+#[test]
+fn remote_abort_local_set_3929() {
+    struct DropCheck {
+        created_on: std::thread::ThreadId,
+        not_send: std::marker::PhantomData<*const ()>,
+    }
+
+    impl DropCheck {
+        fn new() -> Self {
+            Self {
+                created_on: std::thread::current().id(),
+                not_send: std::marker::PhantomData,
+            }
+        }
+    }
+    impl Drop for DropCheck {
+        fn drop(&mut self) {
+            if std::thread::current().id() != self.created_on {
+                panic!("non-Send value dropped in another thread!");
+            }
+        }
+    }
+
+    let rt = Builder::new_current_thread().build().unwrap();
+    let local = tokio::task::LocalSet::new();
+
+    let check = DropCheck::new();
+    let jh = local.spawn_local(async move {
+        futures::future::pending::<()>().await;
+        drop(check);
+    });
+
+    let jh2 = std::thread::spawn(move || {
+        sleep(Duration::from_millis(10));
+        jh.abort();
+    });
+
+    rt.block_on(local);
+    jh2.join().unwrap();
+}
+
+/// Checks that a suspended task can be aborted even if the `JoinHandle` is immediately dropped.
+/// issue #3964: <https://github.com/tokio-rs/tokio/issues/3964>.
+#[test]
+fn test_abort_wakes_task_3964() {
+    let rt = Builder::new_current_thread().enable_time().build().unwrap();
+
+    rt.block_on(async move {
+        let notify_dropped = Arc::new(());
+        let weak_notify_dropped = Arc::downgrade(&notify_dropped);
+
+        let handle = tokio::spawn(async move {
+            // Make sure the Arc is moved into the task
+            let _notify_dropped = notify_dropped;
+            println!("task started");
+            tokio::time::sleep(Duration::new(100, 0)).await
+        });
+
+        // wait for task to sleep.
+        tokio::time::sleep(Duration::from_millis(10)).await;
+
+        handle.abort();
+        drop(handle);
+
+        // wait for task to abort.
+        tokio::time::sleep(Duration::from_millis(10)).await;
+
+        // Check that the Arc has been dropped.
+        assert!(weak_notify_dropped.upgrade().is_none());
+    });
+}
+
+/// Checks that aborting a task whose destructor panics does not allow the
+/// panic to escape the task.
+#[test]
+fn test_abort_task_that_panics_on_drop_contained() {
+    let rt = Builder::new_current_thread().enable_time().build().unwrap();
+
+    rt.block_on(async move {
+        let handle = tokio::spawn(async move {
+            // Make sure the Arc is moved into the task
+            let _panic_dropped = PanicOnDrop;
+            println!("task started");
+            tokio::time::sleep(Duration::new(100, 0)).await
+        });
+
+        // wait for task to sleep.
+        tokio::time::sleep(Duration::from_millis(10)).await;
+
+        handle.abort();
+        drop(handle);
+
+        // wait for task to abort.
+        tokio::time::sleep(Duration::from_millis(10)).await;
+    });
+}
+
+/// Checks that aborting a task whose destructor panics has the expected result.
+#[test]
+fn test_abort_task_that_panics_on_drop_returned() {
+    let rt = Builder::new_current_thread().enable_time().build().unwrap();
+
+    rt.block_on(async move {
+        let handle = tokio::spawn(async move {
+            // Make sure the Arc is moved into the task
+            let _panic_dropped = PanicOnDrop;
+            println!("task started");
+            tokio::time::sleep(Duration::new(100, 0)).await
+        });
+
+        // wait for task to sleep.
+        tokio::time::sleep(Duration::from_millis(10)).await;
+
+        handle.abort();
+        assert!(handle.await.unwrap_err().is_panic());
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_blocking.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_blocking.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_blocking.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_blocking.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,6 +7,10 @@
 use std::thread;
 use std::time::Duration;
 
+mod support {
+    pub(crate) mod mpsc_stream;
+}
+
 #[tokio::test]
 async fn basic_blocking() {
     // Run a few times
@@ -28,7 +32,7 @@
     }
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn block_in_blocking() {
     // Run a few times
     for _ in 0..100 {
@@ -51,7 +55,7 @@
     }
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn block_in_block() {
     // Run a few times
     for _ in 0..100 {
@@ -71,7 +75,7 @@
     }
 }
 
-#[tokio::test(basic_scheduler)]
+#[tokio::test(flavor = "current_thread")]
 #[should_panic]
 async fn no_block_in_basic_scheduler() {
     task::block_in_place(|| {});
@@ -79,10 +83,7 @@
 
 #[test]
 fn yes_block_in_threaded_block_on() {
-    let mut rt = runtime::Builder::new()
-        .threaded_scheduler()
-        .build()
-        .unwrap();
+    let rt = runtime::Runtime::new().unwrap();
     rt.block_on(async {
         task::block_in_place(|| {});
     });
@@ -91,7 +92,7 @@
 #[test]
 #[should_panic]
 fn no_block_in_basic_block_on() {
-    let mut rt = runtime::Builder::new().basic_scheduler().build().unwrap();
+    let rt = runtime::Builder::new_current_thread().build().unwrap();
     rt.block_on(async {
         task::block_in_place(|| {});
     });
@@ -99,15 +100,11 @@
 
 #[test]
 fn can_enter_basic_rt_from_within_block_in_place() {
-    let mut outer = tokio::runtime::Builder::new()
-        .threaded_scheduler()
-        .build()
-        .unwrap();
+    let outer = tokio::runtime::Runtime::new().unwrap();
 
     outer.block_on(async {
         tokio::task::block_in_place(|| {
-            let mut inner = tokio::runtime::Builder::new()
-                .basic_scheduler()
+            let inner = tokio::runtime::Builder::new_current_thread()
                 .build()
                 .unwrap();
 
@@ -120,15 +117,11 @@
 fn useful_panic_message_when_dropping_rt_in_rt() {
     use std::panic::{catch_unwind, AssertUnwindSafe};
 
-    let mut outer = tokio::runtime::Builder::new()
-        .threaded_scheduler()
-        .build()
-        .unwrap();
+    let outer = tokio::runtime::Runtime::new().unwrap();
 
     let result = catch_unwind(AssertUnwindSafe(|| {
         outer.block_on(async {
-            let _ = tokio::runtime::Builder::new()
-                .basic_scheduler()
+            let _ = tokio::runtime::Builder::new_current_thread()
                 .build()
                 .unwrap();
         });
@@ -139,7 +132,7 @@
     let err: &'static str = err.downcast_ref::<&'static str>().unwrap();
 
     assert!(
-        err.find("Cannot drop a runtime").is_some(),
+        err.contains("Cannot drop a runtime"),
         "Wrong panic message: {:?}",
         err
     );
@@ -147,14 +140,10 @@
 
 #[test]
 fn can_shutdown_with_zero_timeout_in_runtime() {
-    let mut outer = tokio::runtime::Builder::new()
-        .threaded_scheduler()
-        .build()
-        .unwrap();
+    let outer = tokio::runtime::Runtime::new().unwrap();
 
     outer.block_on(async {
-        let rt = tokio::runtime::Builder::new()
-            .basic_scheduler()
+        let rt = tokio::runtime::Builder::new_current_thread()
             .build()
             .unwrap();
         rt.shutdown_timeout(Duration::from_nanos(0));
@@ -163,14 +152,10 @@
 
 #[test]
 fn can_shutdown_now_in_runtime() {
-    let mut outer = tokio::runtime::Builder::new()
-        .threaded_scheduler()
-        .build()
-        .unwrap();
+    let outer = tokio::runtime::Runtime::new().unwrap();
 
     outer.block_on(async {
-        let rt = tokio::runtime::Builder::new()
-            .basic_scheduler()
+        let rt = tokio::runtime::Builder::new_current_thread()
             .build()
             .unwrap();
         rt.shutdown_background();
@@ -179,13 +164,13 @@
 
 #[test]
 fn coop_disabled_in_block_in_place() {
-    let mut outer = tokio::runtime::Builder::new()
-        .threaded_scheduler()
+    let outer = tokio::runtime::Builder::new_multi_thread()
         .enable_time()
         .build()
         .unwrap();
 
-    let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
+    let (tx, rx) = support::mpsc_stream::unbounded_channel_stream();
+
     for i in 0..200 {
         tx.send(i).unwrap();
     }
@@ -195,7 +180,7 @@
         let jh = tokio::spawn(async move {
             tokio::task::block_in_place(move || {
                 futures::executor::block_on(async move {
-                    use tokio::stream::StreamExt;
+                    use tokio_stream::StreamExt;
                     assert_eq!(rx.fold(0, |n, _| n + 1).await, 200);
                 })
             })
@@ -213,12 +198,10 @@
     let (done_tx, done_rx) = std::sync::mpsc::channel();
     let done = done_tx.clone();
     thread::spawn(move || {
-        let mut outer = tokio::runtime::Builder::new()
-            .threaded_scheduler()
-            .build()
-            .unwrap();
+        let outer = tokio::runtime::Runtime::new().unwrap();
+
+        let (tx, rx) = support::mpsc_stream::unbounded_channel_stream();
 
-        let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
         for i in 0..200 {
             tx.send(i).unwrap();
         }
@@ -227,7 +210,7 @@
         outer.block_on(async move {
             tokio::task::block_in_place(move || {
                 futures::executor::block_on(async move {
-                    use tokio::stream::StreamExt;
+                    use tokio_stream::StreamExt;
                     assert_eq!(rx.fold(0, |n, _| n + 1).await, 200);
                 })
             })
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_builder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_builder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_builder.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_builder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,67 @@
+#[cfg(all(tokio_unstable, feature = "tracing"))]
+mod tests {
+    use std::rc::Rc;
+    use tokio::{
+        task::{Builder, LocalSet},
+        test,
+    };
+
+    #[test]
+    async fn spawn_with_name() {
+        let result = Builder::new()
+            .name("name")
+            .spawn(async { "task executed" })
+            .await;
+
+        assert_eq!(result.unwrap(), "task executed");
+    }
+
+    #[test]
+    async fn spawn_blocking_with_name() {
+        let result = Builder::new()
+            .name("name")
+            .spawn_blocking(|| "task executed")
+            .await;
+
+        assert_eq!(result.unwrap(), "task executed");
+    }
+
+    #[test]
+    async fn spawn_local_with_name() {
+        let unsend_data = Rc::new("task executed");
+        let result = LocalSet::new()
+            .run_until(async move {
+                Builder::new()
+                    .name("name")
+                    .spawn_local(async move { unsend_data })
+                    .await
+            })
+            .await;
+
+        assert_eq!(*result.unwrap(), "task executed");
+    }
+
+    #[test]
+    async fn spawn_without_name() {
+        let result = Builder::new().spawn(async { "task executed" }).await;
+
+        assert_eq!(result.unwrap(), "task executed");
+    }
+
+    #[test]
+    async fn spawn_blocking_without_name() {
+        let result = Builder::new().spawn_blocking(|| "task executed").await;
+
+        assert_eq!(result.unwrap(), "task executed");
+    }
+
+    #[test]
+    async fn spawn_local_without_name() {
+        let unsend_data = Rc::new("task executed");
+        let result = LocalSet::new()
+            .run_until(async move { Builder::new().spawn_local(async move { unsend_data }).await })
+            .await;
+
+        assert_eq!(*result.unwrap(), "task executed");
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_local.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_local.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_local.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_local.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
     pub static FOO: bool;
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn local() {
     let j1 = tokio::spawn(REQ_ID.scope(1, async move {
         assert_eq!(REQ_ID.get(), 1);
@@ -16,7 +16,7 @@
             assert_eq!(*v, 2);
         });
 
-        tokio::time::delay_for(std::time::Duration::from_millis(10)).await;
+        tokio::time::sleep(std::time::Duration::from_millis(10)).await;
 
         assert_eq!(REQ_ID.get(), 2);
     }));
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_local_set.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_local_set.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/task_local_set.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/task_local_set.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,11 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
+use futures::{
+    future::{pending, ready},
+    FutureExt,
+};
+
 use tokio::runtime::{self, Runtime};
 use tokio::sync::{mpsc, oneshot};
 use tokio::task::{self, LocalSet};
@@ -11,7 +16,7 @@
 use std::sync::atomic::{AtomicBool, AtomicUsize};
 use std::time::Duration;
 
-#[tokio::test(basic_scheduler)]
+#[tokio::test(flavor = "current_thread")]
 async fn local_basic_scheduler() {
     LocalSet::new()
         .run_until(async {
@@ -20,7 +25,7 @@
         .await;
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn local_threadpool() {
     thread_local! {
         static ON_RT_THREAD: Cell<bool> = Cell::new(false);
@@ -40,7 +45,7 @@
         .await;
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn localset_future_threadpool() {
     thread_local! {
         static ON_LOCAL_THREAD: Cell<bool> = Cell::new(false);
@@ -55,18 +60,18 @@
     local.await;
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn localset_future_timers() {
     static RAN1: AtomicBool = AtomicBool::new(false);
     static RAN2: AtomicBool = AtomicBool::new(false);
 
     let local = LocalSet::new();
     local.spawn_local(async move {
-        time::delay_for(Duration::from_millis(10)).await;
+        time::sleep(Duration::from_millis(5)).await;
         RAN1.store(true, Ordering::SeqCst);
     });
     local.spawn_local(async move {
-        time::delay_for(Duration::from_millis(20)).await;
+        time::sleep(Duration::from_millis(10)).await;
         RAN2.store(true, Ordering::SeqCst);
     });
     local.await;
@@ -99,7 +104,7 @@
     assert!(RAN3.load(Ordering::SeqCst));
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn local_threadpool_timer() {
     // This test ensures that runtime services like the timer are properly
     // set for the local task set.
@@ -114,7 +119,7 @@
             assert!(ON_RT_THREAD.with(|cell| cell.get()));
             let join = task::spawn_local(async move {
                 assert!(ON_RT_THREAD.with(|cell| cell.get()));
-                time::delay_for(Duration::from_millis(10)).await;
+                time::sleep(Duration::from_millis(10)).await;
                 assert!(ON_RT_THREAD.with(|cell| cell.get()));
             });
             join.await.unwrap();
@@ -133,12 +138,11 @@
 
     ON_RT_THREAD.with(|cell| cell.set(true));
 
-    let mut rt = runtime::Builder::new()
-        .threaded_scheduler()
+    let rt = runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap();
-    LocalSet::new().block_on(&mut rt, async {
+    LocalSet::new().block_on(&rt, async {
         assert!(ON_RT_THREAD.with(|cell| cell.get()));
         let join = task::spawn_local(async move {
             assert!(ON_RT_THREAD.with(|cell| cell.get()));
@@ -149,7 +153,7 @@
     });
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn local_threadpool_blocking_run() {
     thread_local! {
         static ON_RT_THREAD: Cell<bool> = Cell::new(false);
@@ -177,7 +181,7 @@
         .await;
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn all_spawns_are_local() {
     use futures::future;
     thread_local! {
@@ -203,7 +207,7 @@
         .await;
 }
 
-#[tokio::test(threaded_scheduler)]
+#[tokio::test(flavor = "multi_thread")]
 async fn nested_spawn_is_local() {
     thread_local! {
         static ON_RT_THREAD: Cell<bool> = Cell::new(false);
@@ -246,12 +250,9 @@
 
     ON_RT_THREAD.with(|cell| cell.set(true));
 
-    let mut rt = runtime::Builder::new()
-        .threaded_scheduler()
-        .build()
-        .unwrap();
+    let rt = runtime::Runtime::new().unwrap();
     let local = LocalSet::new();
-    local.block_on(&mut rt, async move {
+    local.block_on(&rt, async move {
         let (tx, rx) = oneshot::channel();
         let join = task::spawn_local(async move {
             println!("hello world running...");
@@ -286,7 +287,7 @@
     use std::rc::Rc;
 
     // This test reproduces issue #1842
-    let mut rt = rt();
+    let rt = rt();
     let rc1 = Rc::new(());
     let rc2 = rc1.clone();
 
@@ -298,12 +299,10 @@
         let _rc2 = rc2;
 
         started_tx.send(()).unwrap();
-        loop {
-            time::delay_for(Duration::from_secs(3600)).await;
-        }
+        futures::future::pending::<()>().await;
     });
 
-    local.block_on(&mut rt, async {
+    local.block_on(&rt, async {
         started_rx.await.unwrap();
     });
     drop(local);
@@ -333,7 +332,7 @@
     // something we can easily make assertions about, we'll run it in a
     // thread. When the test thread finishes, it will send a message on a
     // channel to this thread. We'll wait for that message with a fairly
-    // generous timeout, and if we don't recieve it, we assume the test
+    // generous timeout, and if we don't receive it, we assume the test
     // thread has hung.
     //
     // Note that it should definitely complete in under a minute, but just
@@ -362,12 +361,12 @@
     with_timeout(Duration::from_secs(60), || {
         let (tx, mut rx) = mpsc::channel::<()>(1024);
 
-        let mut rt = rt();
+        let rt = rt();
 
         let local = LocalSet::new();
         local.spawn_local(async move { while rx.recv().await.is_some() {} });
-        local.block_on(&mut rt, async {
-            time::delay_for(Duration::from_millis(1)).await;
+        local.block_on(&rt, async {
+            time::sleep(Duration::from_millis(1)).await;
         });
 
         drop(tx);
@@ -385,7 +384,7 @@
         use futures::future::join_all;
         use tokio::task::LocalSet;
 
-        let mut rt = rt();
+        let rt = rt();
         let set = LocalSet::new();
         let mut handles = Vec::new();
 
@@ -399,13 +398,32 @@
     });
 }
 
-#[tokio::test]
-async fn local_tasks_are_polled_after_tick() {
+#[test]
+fn local_tasks_are_polled_after_tick() {
+    // This test depends on timing, so we run it up to five times.
+    for _ in 0..4 {
+        let res = std::panic::catch_unwind(local_tasks_are_polled_after_tick_inner);
+        if res.is_ok() {
+            // success
+            return;
+        }
+    }
+
+    // Test failed 4 times. Try one more time without catching panics. If it
+    // fails again, the test fails.
+    local_tasks_are_polled_after_tick_inner();
+}
+
+#[tokio::main(flavor = "current_thread")]
+async fn local_tasks_are_polled_after_tick_inner() {
     // Reproduces issues #1899 and #1900
 
     static RX1: AtomicUsize = AtomicUsize::new(0);
     static RX2: AtomicUsize = AtomicUsize::new(0);
-    static EXPECTED: usize = 500;
+    const EXPECTED: usize = 500;
+
+    RX1.store(0, SeqCst);
+    RX2.store(0, SeqCst);
 
     let (tx, mut rx) = mpsc::unbounded_channel();
 
@@ -415,7 +433,7 @@
         .run_until(async {
             let task2 = task::spawn(async move {
                 // Wait a bit
-                time::delay_for(Duration::from_millis(100)).await;
+                time::sleep(Duration::from_millis(10)).await;
 
                 let mut oneshots = Vec::with_capacity(EXPECTED);
 
@@ -426,13 +444,13 @@
                     tx.send(oneshot_rx).unwrap();
                 }
 
-                time::delay_for(Duration::from_millis(100)).await;
+                time::sleep(Duration::from_millis(10)).await;
 
                 for tx in oneshots.drain(..) {
                     tx.send(()).unwrap();
                 }
 
-                time::delay_for(Duration::from_millis(300)).await;
+                time::sleep(Duration::from_millis(20)).await;
                 let rx1 = RX1.load(SeqCst);
                 let rx2 = RX2.load(SeqCst);
                 println!("EXPECT = {}; RX1 = {}; RX2 = {}", EXPECTED, rx1, rx2);
@@ -490,9 +508,17 @@
     drop(local);
 }
 
+#[tokio::test]
+async fn spawn_wakes_localset() {
+    let local = LocalSet::new();
+    futures::select! {
+        _ = local.run_until(pending::<()>()).fuse() => unreachable!(),
+        ret = async { local.spawn_local(ready(())).await.unwrap()}.fuse() => ret
+    }
+}
+
 fn rt() -> Runtime {
-    tokio::runtime::Builder::new()
-        .basic_scheduler()
+    tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()
         .unwrap()
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_accept.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_accept.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_accept.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_accept.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,6 +5,7 @@
 use tokio::sync::{mpsc, oneshot};
 use tokio_test::assert_ok;
 
+use std::io;
 use std::net::{IpAddr, SocketAddr};
 
 macro_rules! test_accept {
@@ -12,7 +13,7 @@
         $(
             #[tokio::test]
             async fn $ident() {
-                let mut listener = assert_ok!(TcpListener::bind($target).await);
+                let listener = assert_ok!(TcpListener::bind($target).await);
                 let addr = listener.local_addr().unwrap();
 
                 let (tx, rx) = oneshot::channel();
@@ -39,32 +40,25 @@
     (ip_port_tuple, ("127.0.0.1".parse::<IpAddr>().unwrap(), 0)),
 }
 
-use pin_project_lite::pin_project;
 use std::pin::Pin;
 use std::sync::{
     atomic::{AtomicUsize, Ordering::SeqCst},
     Arc,
 };
 use std::task::{Context, Poll};
-use tokio::stream::{Stream, StreamExt};
+use tokio_stream::{Stream, StreamExt};
 
-pin_project! {
-    struct TrackPolls<S> {
-        npolls: Arc<AtomicUsize>,
-        #[pin]
-        s: S,
-    }
+struct TrackPolls<'a> {
+    npolls: Arc<AtomicUsize>,
+    listener: &'a mut TcpListener,
 }
 
-impl<S> Stream for TrackPolls<S>
-where
-    S: Stream,
-{
-    type Item = S::Item;
+impl<'a> Stream for TrackPolls<'a> {
+    type Item = io::Result<(TcpStream, SocketAddr)>;
+
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let this = self.project();
-        this.npolls.fetch_add(1, SeqCst);
-        this.s.poll_next(cx)
+        self.npolls.fetch_add(1, SeqCst);
+        self.listener.poll_accept(cx).map(Some)
     }
 }
 
@@ -79,7 +73,7 @@
     tokio::spawn(async move {
         let mut incoming = TrackPolls {
             npolls: Arc::new(AtomicUsize::new(0)),
-            s: listener.incoming(),
+            listener: &mut listener,
         };
         assert_ok!(tx.send(Arc::clone(&incoming.npolls)));
         while incoming.next().await.is_some() {
@@ -94,8 +88,70 @@
     assert_eq!(npolls.load(SeqCst), 1);
 
     let _ = assert_ok!(TcpStream::connect(&addr).await);
-    accepted_rx.next().await.unwrap();
+    accepted_rx.recv().await.unwrap();
 
     // should have been polled twice more: once to yield Some(), then once to yield Pending
     assert_eq!(npolls.load(SeqCst), 1 + 2);
 }
+
+#[tokio::test]
+async fn accept_many() {
+    use futures::future::poll_fn;
+    use std::future::Future;
+    use std::sync::atomic::AtomicBool;
+
+    const N: usize = 50;
+
+    let listener = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let listener = Arc::new(listener);
+    let addr = listener.local_addr().unwrap();
+    let connected = Arc::new(AtomicBool::new(false));
+
+    let (pending_tx, mut pending_rx) = mpsc::unbounded_channel();
+    let (notified_tx, mut notified_rx) = mpsc::unbounded_channel();
+
+    for _ in 0..N {
+        let listener = listener.clone();
+        let connected = connected.clone();
+        let pending_tx = pending_tx.clone();
+        let notified_tx = notified_tx.clone();
+
+        tokio::spawn(async move {
+            let accept = listener.accept();
+            tokio::pin!(accept);
+
+            let mut polled = false;
+
+            poll_fn(|cx| {
+                if !polled {
+                    polled = true;
+                    assert!(Pin::new(&mut accept).poll(cx).is_pending());
+                    pending_tx.send(()).unwrap();
+                    Poll::Pending
+                } else if connected.load(SeqCst) {
+                    notified_tx.send(()).unwrap();
+                    Poll::Ready(())
+                } else {
+                    Poll::Pending
+                }
+            })
+            .await;
+
+            pending_tx.send(()).unwrap();
+        });
+    }
+
+    // Wait for all tasks to have polled at least once
+    for _ in 0..N {
+        pending_rx.recv().await.unwrap();
+    }
+
+    // Establish a TCP connection
+    connected.store(true, SeqCst);
+    let _sock = TcpStream::connect(addr).await.unwrap();
+
+    // Wait for all notifications
+    for _ in 0..N {
+        notified_rx.recv().await.unwrap();
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_connect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_connect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_connect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_connect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
 
 #[tokio::test]
 async fn connect_v4() {
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
     assert!(addr.is_ipv4());
 
@@ -36,7 +36,7 @@
 
 #[tokio::test]
 async fn connect_v6() {
-    let mut srv = assert_ok!(TcpListener::bind("[::1]:0").await);
+    let srv = assert_ok!(TcpListener::bind("[::1]:0").await);
     let addr = assert_ok!(srv.local_addr());
     assert!(addr.is_ipv6());
 
@@ -63,7 +63,7 @@
 
 #[tokio::test]
 async fn connect_addr_ip_string() {
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
     let addr = format!("127.0.0.1:{}", addr.port());
 
@@ -80,7 +80,7 @@
 
 #[tokio::test]
 async fn connect_addr_ip_str_slice() {
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
     let addr = format!("127.0.0.1:{}", addr.port());
 
@@ -97,7 +97,7 @@
 
 #[tokio::test]
 async fn connect_addr_host_string() {
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
     let addr = format!("localhost:{}", addr.port());
 
@@ -114,7 +114,7 @@
 
 #[tokio::test]
 async fn connect_addr_ip_port_tuple() {
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
     let addr = (addr.ip(), addr.port());
 
@@ -131,7 +131,7 @@
 
 #[tokio::test]
 async fn connect_addr_ip_str_port_tuple() {
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
     let addr = ("127.0.0.1", addr.port());
 
@@ -148,7 +148,7 @@
 
 #[tokio::test]
 async fn connect_addr_host_str_port_tuple() {
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
     let addr = ("localhost", addr.port());
 
@@ -169,7 +169,7 @@
 #[cfg(target_os = "linux")]
 mod linux {
     use tokio::net::{TcpListener, TcpStream};
-    use tokio::prelude::*;
+    use tokio::io::{AsyncReadExt, AsyncWriteExt};
     use tokio_test::assert_ok;
 
     use mio::unix::UnixReady;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_echo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_echo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_echo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_echo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
+use tokio::io::{self, AsyncReadExt, AsyncWriteExt};
 use tokio::net::{TcpListener, TcpStream};
-use tokio::prelude::*;
 use tokio::sync::oneshot;
 use tokio_test::assert_ok;
 
@@ -12,7 +12,7 @@
 
     let (tx, rx) = oneshot::channel();
 
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
 
     let msg = "foo bar baz";
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_into_split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_into_split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_into_split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_into_split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 async fn split() -> Result<()> {
     const MSG: &[u8] = b"split";
 
-    let mut listener = TcpListener::bind("127.0.0.1:0").await?;
+    let listener = TcpListener::bind("127.0.0.1:0").await?;
     let addr = listener.local_addr()?;
 
     let (stream1, (mut stream2, _)) = try_join! {
@@ -116,7 +116,7 @@
 
     // drop it while the read is in progress
     std::thread::spawn(move || {
-        thread::sleep(std::time::Duration::from_millis(50));
+        thread::sleep(std::time::Duration::from_millis(10));
         drop(write_half);
     });
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_into_std.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_into_std.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_into_std.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_into_std.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use std::io::Read;
+use std::io::Result;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::TcpListener;
+use tokio::net::TcpStream;
+
+#[tokio::test]
+async fn tcp_into_std() -> Result<()> {
+    let mut data = [0u8; 12];
+    let listener = TcpListener::bind("127.0.0.1:0").await?;
+    let addr = listener.local_addr().unwrap().to_string();
+
+    let handle = tokio::spawn(async {
+        let stream: TcpStream = TcpStream::connect(addr).await.unwrap();
+        stream
+    });
+
+    let (tokio_tcp_stream, _) = listener.accept().await?;
+    let mut std_tcp_stream = tokio_tcp_stream.into_std()?;
+    std_tcp_stream
+        .set_nonblocking(false)
+        .expect("set_nonblocking call failed");
+
+    let mut client = handle.await.expect("The task being joined has panicked");
+    client.write_all(b"Hello world!").await?;
+
+    std_tcp_stream
+        .read_exact(&mut data)
+        .expect("std TcpStream read failed!");
+    assert_eq!(b"Hello world!", &data);
+
+    // test back to tokio stream
+    std_tcp_stream
+        .set_nonblocking(true)
+        .expect("set_nonblocking call failed");
+    let mut tokio_tcp_stream = TcpStream::from_std(std_tcp_stream)?;
+    client.write_all(b"Hello tokio!").await?;
+    let _size = tokio_tcp_stream.read_exact(&mut data).await?;
+    assert_eq!(b"Hello tokio!", &data);
+
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_shutdown.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_shutdown.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_shutdown.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_shutdown.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,13 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
-use tokio::io::{self, AsyncWriteExt};
+use tokio::io::{self, AsyncReadExt, AsyncWriteExt};
 use tokio::net::{TcpListener, TcpStream};
-use tokio::prelude::*;
 use tokio_test::assert_ok;
 
 #[tokio::test]
 async fn shutdown() {
-    let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
     let addr = assert_ok!(srv.local_addr());
 
     tokio::spawn(async move {
@@ -16,7 +15,7 @@
 
         assert_ok!(AsyncWriteExt::shutdown(&mut stream).await);
 
-        let mut buf = [0; 1];
+        let mut buf = [0u8; 1];
         let n = assert_ok!(stream.read(&mut buf).await);
         assert_eq!(n, 0);
     });
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_socket.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_socket.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_socket.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_socket.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,60 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use tokio::net::TcpSocket;
+use tokio_test::assert_ok;
+
+#[tokio::test]
+async fn basic_usage_v4() {
+    // Create server
+    let addr = assert_ok!("127.0.0.1:0".parse());
+    let srv = assert_ok!(TcpSocket::new_v4());
+    assert_ok!(srv.bind(addr));
+
+    let srv = assert_ok!(srv.listen(128));
+
+    // Create client & connect
+    let addr = srv.local_addr().unwrap();
+    let cli = assert_ok!(TcpSocket::new_v4());
+    let _cli = assert_ok!(cli.connect(addr).await);
+
+    // Accept
+    let _ = assert_ok!(srv.accept().await);
+}
+
+#[tokio::test]
+async fn basic_usage_v6() {
+    // Create server
+    let addr = assert_ok!("[::1]:0".parse());
+    let srv = assert_ok!(TcpSocket::new_v6());
+    assert_ok!(srv.bind(addr));
+
+    let srv = assert_ok!(srv.listen(128));
+
+    // Create client & connect
+    let addr = srv.local_addr().unwrap();
+    let cli = assert_ok!(TcpSocket::new_v6());
+    let _cli = assert_ok!(cli.connect(addr).await);
+
+    // Accept
+    let _ = assert_ok!(srv.accept().await);
+}
+
+#[tokio::test]
+async fn bind_before_connect() {
+    // Create server
+    let any_addr = assert_ok!("127.0.0.1:0".parse());
+    let srv = assert_ok!(TcpSocket::new_v4());
+    assert_ok!(srv.bind(any_addr));
+
+    let srv = assert_ok!(srv.listen(128));
+
+    // Create client & connect
+    let addr = srv.local_addr().unwrap();
+    let cli = assert_ok!(TcpSocket::new_v4());
+    assert_ok!(cli.bind(any_addr));
+    let _cli = assert_ok!(cli.connect(addr).await);
+
+    // Accept
+    let _ = assert_ok!(srv.accept().await);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/tcp_stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/tcp_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,359 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use tokio::io::{AsyncReadExt, AsyncWriteExt, Interest};
+use tokio::net::{TcpListener, TcpStream};
+use tokio::try_join;
+use tokio_test::task;
+use tokio_test::{assert_ok, assert_pending, assert_ready_ok};
+
+use std::io;
+use std::task::Poll;
+use std::time::Duration;
+
+use futures::future::poll_fn;
+
+#[tokio::test]
+async fn set_linger() {
+    let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+
+    let stream = TcpStream::connect(listener.local_addr().unwrap())
+        .await
+        .unwrap();
+
+    assert_ok!(stream.set_linger(Some(Duration::from_secs(1))));
+    assert_eq!(stream.linger().unwrap().unwrap().as_secs(), 1);
+
+    assert_ok!(stream.set_linger(None));
+    assert!(stream.linger().unwrap().is_none());
+}
+
+#[tokio::test]
+async fn try_read_write() {
+    const DATA: &[u8] = b"this is some data to write to the socket";
+
+    // Create listener
+    let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+
+    // Create socket pair
+    let client = TcpStream::connect(listener.local_addr().unwrap())
+        .await
+        .unwrap();
+    let (server, _) = listener.accept().await.unwrap();
+    let mut written = DATA.to_vec();
+
+    // Track the server receiving data
+    let mut readable = task::spawn(server.readable());
+    assert_pending!(readable.poll());
+
+    // Write data.
+    client.writable().await.unwrap();
+    assert_eq!(DATA.len(), client.try_write(DATA).unwrap());
+
+    // The task should be notified
+    while !readable.is_woken() {
+        tokio::task::yield_now().await;
+    }
+
+    // Fill the write buffer using non-vectored I/O
+    loop {
+        // Still ready
+        let mut writable = task::spawn(client.writable());
+        assert_ready_ok!(writable.poll());
+
+        match client.try_write(DATA) {
+            Ok(n) => written.extend(&DATA[..n]),
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                break;
+            }
+            Err(e) => panic!("error = {:?}", e),
+        }
+    }
+
+    {
+        // Write buffer full
+        let mut writable = task::spawn(client.writable());
+        assert_pending!(writable.poll());
+
+        // Drain the socket from the server end using non-vectored I/O
+        let mut read = vec![0; written.len()];
+        let mut i = 0;
+
+        while i < read.len() {
+            server.readable().await.unwrap();
+
+            match server.try_read(&mut read[i..]) {
+                Ok(n) => i += n,
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("error = {:?}", e),
+            }
+        }
+
+        assert_eq!(read, written);
+    }
+
+    written.clear();
+    client.writable().await.unwrap();
+
+    // Fill the write buffer using vectored I/O
+    let data_bufs: Vec<_> = DATA.chunks(10).map(io::IoSlice::new).collect();
+    loop {
+        // Still ready
+        let mut writable = task::spawn(client.writable());
+        assert_ready_ok!(writable.poll());
+
+        match client.try_write_vectored(&data_bufs) {
+            Ok(n) => written.extend(&DATA[..n]),
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                break;
+            }
+            Err(e) => panic!("error = {:?}", e),
+        }
+    }
+
+    {
+        // Write buffer full
+        let mut writable = task::spawn(client.writable());
+        assert_pending!(writable.poll());
+
+        // Drain the socket from the server end using vectored I/O
+        let mut read = vec![0; written.len()];
+        let mut i = 0;
+
+        while i < read.len() {
+            server.readable().await.unwrap();
+
+            let mut bufs: Vec<_> = read[i..]
+                .chunks_mut(0x10000)
+                .map(io::IoSliceMut::new)
+                .collect();
+            match server.try_read_vectored(&mut bufs) {
+                Ok(n) => i += n,
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("error = {:?}", e),
+            }
+        }
+
+        assert_eq!(read, written);
+    }
+
+    // Now, we listen for shutdown
+    drop(client);
+
+    loop {
+        let ready = server.ready(Interest::READABLE).await.unwrap();
+
+        if ready.is_read_closed() {
+            return;
+        } else {
+            tokio::task::yield_now().await;
+        }
+    }
+}
+
+#[test]
+fn buffer_not_included_in_future() {
+    use std::mem;
+
+    const N: usize = 4096;
+
+    let fut = async {
+        let stream = TcpStream::connect("127.0.0.1:8080").await.unwrap();
+
+        loop {
+            stream.readable().await.unwrap();
+
+            let mut buf = [0; N];
+            let n = stream.try_read(&mut buf[..]).unwrap();
+
+            if n == 0 {
+                break;
+            }
+        }
+    };
+
+    let n = mem::size_of_val(&fut);
+    assert!(n < 1000);
+}
+
+macro_rules! assert_readable_by_polling {
+    ($stream:expr) => {
+        assert_ok!(poll_fn(|cx| $stream.poll_read_ready(cx)).await);
+    };
+}
+
+macro_rules! assert_not_readable_by_polling {
+    ($stream:expr) => {
+        poll_fn(|cx| {
+            assert_pending!($stream.poll_read_ready(cx));
+            Poll::Ready(())
+        })
+        .await;
+    };
+}
+
+macro_rules! assert_writable_by_polling {
+    ($stream:expr) => {
+        assert_ok!(poll_fn(|cx| $stream.poll_write_ready(cx)).await);
+    };
+}
+
+macro_rules! assert_not_writable_by_polling {
+    ($stream:expr) => {
+        poll_fn(|cx| {
+            assert_pending!($stream.poll_write_ready(cx));
+            Poll::Ready(())
+        })
+        .await;
+    };
+}
+
+#[tokio::test]
+async fn poll_read_ready() {
+    let (mut client, mut server) = create_pair().await;
+
+    // Initial state - not readable.
+    assert_not_readable_by_polling!(server);
+
+    // There is data in the buffer - readable.
+    assert_ok!(client.write_all(b"ping").await);
+    assert_readable_by_polling!(server);
+
+    // Readable until calls to `poll_read` return `Poll::Pending`.
+    let mut buf = [0u8; 4];
+    assert_ok!(server.read_exact(&mut buf).await);
+    assert_readable_by_polling!(server);
+    read_until_pending(&mut server);
+    assert_not_readable_by_polling!(server);
+
+    // Detect the client disconnect.
+    drop(client);
+    assert_readable_by_polling!(server);
+}
+
+#[tokio::test]
+async fn poll_write_ready() {
+    let (mut client, server) = create_pair().await;
+
+    // Initial state - writable.
+    assert_writable_by_polling!(client);
+
+    // No space to write - not writable.
+    write_until_pending(&mut client);
+    assert_not_writable_by_polling!(client);
+
+    // Detect the server disconnect.
+    drop(server);
+    assert_writable_by_polling!(client);
+}
+
+async fn create_pair() -> (TcpStream, TcpStream) {
+    let listener = assert_ok!(TcpListener::bind("127.0.0.1:0").await);
+    let addr = assert_ok!(listener.local_addr());
+    let (client, (server, _)) = assert_ok!(try_join!(TcpStream::connect(&addr), listener.accept()));
+    (client, server)
+}
+
+fn read_until_pending(stream: &mut TcpStream) {
+    let mut buf = vec![0u8; 1024 * 1024];
+    loop {
+        match stream.try_read(&mut buf) {
+            Ok(_) => (),
+            Err(err) => {
+                assert_eq!(err.kind(), io::ErrorKind::WouldBlock);
+                break;
+            }
+        }
+    }
+}
+
+fn write_until_pending(stream: &mut TcpStream) {
+    let buf = vec![0u8; 1024 * 1024];
+    loop {
+        match stream.try_write(&buf) {
+            Ok(_) => (),
+            Err(err) => {
+                assert_eq!(err.kind(), io::ErrorKind::WouldBlock);
+                break;
+            }
+        }
+    }
+}
+
+#[tokio::test]
+async fn try_read_buf() {
+    const DATA: &[u8] = b"this is some data to write to the socket";
+
+    // Create listener
+    let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+
+    // Create socket pair
+    let client = TcpStream::connect(listener.local_addr().unwrap())
+        .await
+        .unwrap();
+    let (server, _) = listener.accept().await.unwrap();
+    let mut written = DATA.to_vec();
+
+    // Track the server receiving data
+    let mut readable = task::spawn(server.readable());
+    assert_pending!(readable.poll());
+
+    // Write data.
+    client.writable().await.unwrap();
+    assert_eq!(DATA.len(), client.try_write(DATA).unwrap());
+
+    // The task should be notified
+    while !readable.is_woken() {
+        tokio::task::yield_now().await;
+    }
+
+    // Fill the write buffer
+    loop {
+        // Still ready
+        let mut writable = task::spawn(client.writable());
+        assert_ready_ok!(writable.poll());
+
+        match client.try_write(DATA) {
+            Ok(n) => written.extend(&DATA[..n]),
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                break;
+            }
+            Err(e) => panic!("error = {:?}", e),
+        }
+    }
+
+    {
+        // Write buffer full
+        let mut writable = task::spawn(client.writable());
+        assert_pending!(writable.poll());
+
+        // Drain the socket from the server end
+        let mut read = Vec::with_capacity(written.len());
+        let mut i = 0;
+
+        while i < read.capacity() {
+            server.readable().await.unwrap();
+
+            match server.try_read_buf(&mut read) {
+                Ok(n) => i += n,
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("error = {:?}", e),
+            }
+        }
+
+        assert_eq!(read, written);
+    }
+
+    // Now, we listen for shutdown
+    drop(client);
+
+    loop {
+        let ready = server.ready(Interest::READABLE).await.unwrap();
+
+        if ready.is_read_closed() {
+            return;
+        } else {
+            tokio::task::yield_now().await;
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_delay_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_delay_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_delay_queue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_delay_queue.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,567 +0,0 @@
-#![allow(clippy::blacklisted_name, clippy::stable_sort_primitive)]
-#![warn(rust_2018_idioms)]
-#![cfg(feature = "full")]
-
-use tokio::time::{self, delay_for, DelayQueue, Duration, Instant};
-use tokio_test::{assert_ok, assert_pending, assert_ready, task};
-
-macro_rules! poll {
-    ($queue:ident) => {
-        $queue.enter(|cx, mut queue| queue.poll_expired(cx))
-    };
-}
-
-macro_rules! assert_ready_ok {
-    ($e:expr) => {{
-        assert_ok!(match assert_ready!($e) {
-            Some(v) => v,
-            None => panic!("None"),
-        })
-    }};
-}
-
-#[tokio::test]
-async fn single_immediate_delay() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-    let _key = queue.insert_at("foo", Instant::now());
-
-    // Advance time by 1ms to handle thee rounding
-    delay_for(ms(1)).await;
-
-    assert_ready_ok!(poll!(queue));
-
-    let entry = assert_ready!(poll!(queue));
-    assert!(entry.is_none())
-}
-
-#[tokio::test]
-async fn multi_immediate_delays() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let _k = queue.insert_at("1", Instant::now());
-    let _k = queue.insert_at("2", Instant::now());
-    let _k = queue.insert_at("3", Instant::now());
-
-    delay_for(ms(1)).await;
-
-    let mut res = vec![];
-
-    while res.len() < 3 {
-        let entry = assert_ready_ok!(poll!(queue));
-        res.push(entry.into_inner());
-    }
-
-    let entry = assert_ready!(poll!(queue));
-    assert!(entry.is_none());
-
-    res.sort();
-
-    assert_eq!("1", res[0]);
-    assert_eq!("2", res[1]);
-    assert_eq!("3", res[2]);
-}
-
-#[tokio::test]
-async fn single_short_delay() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-    let _key = queue.insert_at("foo", Instant::now() + ms(5));
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(1)).await;
-
-    assert!(!queue.is_woken());
-
-    delay_for(ms(5)).await;
-
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue));
-    assert_eq!(*entry.get_ref(), "foo");
-
-    let entry = assert_ready!(poll!(queue));
-    assert!(entry.is_none());
-}
-
-#[tokio::test]
-async fn multi_delay_at_start() {
-    time::pause();
-
-    let long = 262_144 + 9 * 4096;
-    let delays = &[1000, 2, 234, long, 60, 10];
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    // Setup the delays
-    for &i in delays {
-        let _key = queue.insert_at(i, Instant::now() + ms(i));
-    }
-
-    assert_pending!(poll!(queue));
-    assert!(!queue.is_woken());
-
-    for elapsed in 0..1200 {
-        delay_for(ms(1)).await;
-        let elapsed = elapsed + 1;
-
-        if delays.contains(&elapsed) {
-            assert!(queue.is_woken());
-            assert_ready!(poll!(queue));
-            assert_pending!(poll!(queue));
-        } else if queue.is_woken() {
-            let cascade = &[192, 960];
-            assert!(cascade.contains(&elapsed), "elapsed={}", elapsed);
-
-            assert_pending!(poll!(queue));
-        }
-    }
-}
-
-#[tokio::test]
-async fn insert_in_past_fires_immediately() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-    let now = Instant::now();
-
-    delay_for(ms(10)).await;
-
-    queue.insert_at("foo", now);
-
-    assert_ready!(poll!(queue));
-}
-
-#[tokio::test]
-async fn remove_entry() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let key = queue.insert_at("foo", Instant::now() + ms(5));
-
-    assert_pending!(poll!(queue));
-
-    let entry = queue.remove(&key);
-    assert_eq!(entry.into_inner(), "foo");
-
-    delay_for(ms(10)).await;
-
-    let entry = assert_ready!(poll!(queue));
-    assert!(entry.is_none());
-}
-
-#[tokio::test]
-async fn reset_entry() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-    let key = queue.insert_at("foo", now + ms(5));
-
-    assert_pending!(poll!(queue));
-    delay_for(ms(1)).await;
-
-    queue.reset_at(&key, now + ms(10));
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(7)).await;
-
-    assert!(!queue.is_woken());
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(3)).await;
-
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue));
-    assert_eq!(*entry.get_ref(), "foo");
-
-    let entry = assert_ready!(poll!(queue));
-    assert!(entry.is_none())
-}
-
-// Reproduces tokio-rs/tokio#849.
-#[tokio::test]
-async fn reset_much_later() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-    delay_for(ms(1)).await;
-
-    let key = queue.insert_at("foo", now + ms(200));
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(3)).await;
-
-    queue.reset_at(&key, now + ms(5));
-
-    delay_for(ms(20)).await;
-
-    assert!(queue.is_woken());
-}
-
-// Reproduces tokio-rs/tokio#849.
-#[tokio::test]
-async fn reset_twice() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-    let now = Instant::now();
-
-    delay_for(ms(1)).await;
-
-    let key = queue.insert_at("foo", now + ms(200));
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(3)).await;
-
-    queue.reset_at(&key, now + ms(50));
-
-    delay_for(ms(20)).await;
-
-    queue.reset_at(&key, now + ms(40));
-
-    delay_for(ms(20)).await;
-
-    assert!(queue.is_woken());
-}
-
-#[tokio::test]
-async fn remove_expired_item() {
-    time::pause();
-
-    let mut queue = DelayQueue::new();
-
-    let now = Instant::now();
-
-    delay_for(ms(10)).await;
-
-    let key = queue.insert_at("foo", now);
-
-    let entry = queue.remove(&key);
-    assert_eq!(entry.into_inner(), "foo");
-}
-
-#[tokio::test]
-async fn expires_before_last_insert() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    queue.insert_at("foo", now + ms(10_000));
-
-    // Delay should be set to 8.192s here.
-    assert_pending!(poll!(queue));
-
-    // Delay should be set to the delay of the new item here
-    queue.insert_at("bar", now + ms(600));
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(600)).await;
-
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "bar");
-}
-
-#[tokio::test]
-async fn multi_reset() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    let one = queue.insert_at("one", now + ms(200));
-    let two = queue.insert_at("two", now + ms(250));
-
-    assert_pending!(poll!(queue));
-
-    queue.reset_at(&one, now + ms(300));
-    queue.reset_at(&two, now + ms(350));
-    queue.reset_at(&one, now + ms(400));
-
-    delay_for(ms(310)).await;
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(50)).await;
-
-    let entry = assert_ready_ok!(poll!(queue));
-    assert_eq!(*entry.get_ref(), "two");
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(50)).await;
-
-    let entry = assert_ready_ok!(poll!(queue));
-    assert_eq!(*entry.get_ref(), "one");
-
-    let entry = assert_ready!(poll!(queue));
-    assert!(entry.is_none())
-}
-
-#[tokio::test]
-async fn expire_first_key_when_reset_to_expire_earlier() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    let one = queue.insert_at("one", now + ms(200));
-    queue.insert_at("two", now + ms(250));
-
-    assert_pending!(poll!(queue));
-
-    queue.reset_at(&one, now + ms(100));
-
-    delay_for(ms(100)).await;
-
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "one");
-}
-
-#[tokio::test]
-async fn expire_second_key_when_reset_to_expire_earlier() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    queue.insert_at("one", now + ms(200));
-    let two = queue.insert_at("two", now + ms(250));
-
-    assert_pending!(poll!(queue));
-
-    queue.reset_at(&two, now + ms(100));
-
-    delay_for(ms(100)).await;
-
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "two");
-}
-
-#[tokio::test]
-async fn reset_first_expiring_item_to_expire_later() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    let one = queue.insert_at("one", now + ms(200));
-    let _two = queue.insert_at("two", now + ms(250));
-
-    assert_pending!(poll!(queue));
-
-    queue.reset_at(&one, now + ms(300));
-    delay_for(ms(250)).await;
-
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "two");
-}
-
-#[tokio::test]
-async fn insert_before_first_after_poll() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    let _one = queue.insert_at("one", now + ms(200));
-
-    assert_pending!(poll!(queue));
-
-    let _two = queue.insert_at("two", now + ms(100));
-
-    delay_for(ms(99)).await;
-
-    assert!(!queue.is_woken());
-
-    delay_for(ms(1)).await;
-
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "two");
-}
-
-#[tokio::test]
-async fn insert_after_ready_poll() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    queue.insert_at("1", now + ms(100));
-    queue.insert_at("2", now + ms(100));
-    queue.insert_at("3", now + ms(100));
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(100)).await;
-
-    assert!(queue.is_woken());
-
-    let mut res = vec![];
-
-    while res.len() < 3 {
-        let entry = assert_ready_ok!(poll!(queue));
-        res.push(entry.into_inner());
-        queue.insert_at("foo", now + ms(500));
-    }
-
-    res.sort();
-
-    assert_eq!("1", res[0]);
-    assert_eq!("2", res[1]);
-    assert_eq!("3", res[2]);
-}
-
-#[tokio::test]
-async fn reset_later_after_slot_starts() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    let foo = queue.insert_at("foo", now + ms(100));
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(80)).await;
-
-    assert!(!queue.is_woken());
-
-    // At this point the queue hasn't been polled, so `elapsed` on the wheel
-    // for the queue is still at 0 and hence the 1ms resolution slots cover
-    // [0-64).  Resetting the time on the entry to 120 causes it to get put in
-    // the [64-128) slot.  As the queue knows that the first entry is within
-    // that slot, but doesn't know when, it must wake immediately to advance
-    // the wheel.
-    queue.reset_at(&foo, now + ms(120));
-    assert!(queue.is_woken());
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(39)).await;
-    assert!(!queue.is_woken());
-
-    delay_for(ms(1)).await;
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "foo");
-}
-
-#[tokio::test]
-async fn reset_inserted_expired() {
-    time::pause();
-    let mut queue = task::spawn(DelayQueue::new());
-    let now = Instant::now();
-
-    let key = queue.insert_at("foo", now - ms(100));
-
-    // this causes the panic described in #2473
-    queue.reset_at(&key, now + ms(100));
-
-    assert_eq!(1, queue.len());
-
-    delay_for(ms(200)).await;
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "foo");
-
-    assert_eq!(queue.len(), 0);
-}
-
-#[tokio::test]
-async fn reset_earlier_after_slot_starts() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    let foo = queue.insert_at("foo", now + ms(200));
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(80)).await;
-
-    assert!(!queue.is_woken());
-
-    // At this point the queue hasn't been polled, so `elapsed` on the wheel
-    // for the queue is still at 0 and hence the 1ms resolution slots cover
-    // [0-64).  Resetting the time on the entry to 120 causes it to get put in
-    // the [64-128) slot.  As the queue knows that the first entry is within
-    // that slot, but doesn't know when, it must wake immediately to advance
-    // the wheel.
-    queue.reset_at(&foo, now + ms(120));
-    assert!(queue.is_woken());
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(39)).await;
-    assert!(!queue.is_woken());
-
-    delay_for(ms(1)).await;
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "foo");
-}
-
-#[tokio::test]
-async fn insert_in_past_after_poll_fires_immediately() {
-    time::pause();
-
-    let mut queue = task::spawn(DelayQueue::new());
-
-    let now = Instant::now();
-
-    queue.insert_at("foo", now + ms(200));
-
-    assert_pending!(poll!(queue));
-
-    delay_for(ms(80)).await;
-
-    assert!(!queue.is_woken());
-    queue.insert_at("bar", now + ms(40));
-
-    assert!(queue.is_woken());
-
-    let entry = assert_ready_ok!(poll!(queue)).into_inner();
-    assert_eq!(entry, "bar");
-}
-
-fn ms(n: u64) -> Duration {
-    Duration::from_millis(n)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_delay.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_delay.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_delay.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_delay.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,196 +0,0 @@
-#![warn(rust_2018_idioms)]
-#![cfg(feature = "full")]
-
-use tokio::time::{self, Duration, Instant};
-use tokio_test::{assert_pending, assert_ready, task};
-
-macro_rules! assert_elapsed {
-    ($now:expr, $ms:expr) => {{
-        let elapsed = $now.elapsed();
-        let lower = ms($ms);
-
-        // Handles ms rounding
-        assert!(
-            elapsed >= lower && elapsed <= lower + ms(1),
-            "actual = {:?}, expected = {:?}",
-            elapsed,
-            lower
-        );
-    }};
-}
-
-#[tokio::test]
-async fn immediate_delay() {
-    time::pause();
-
-    let now = Instant::now();
-
-    // Ready!
-    time::delay_until(now).await;
-    assert_elapsed!(now, 0);
-}
-
-#[tokio::test]
-async fn delayed_delay_level_0() {
-    time::pause();
-
-    for &i in &[1, 10, 60] {
-        let now = Instant::now();
-
-        time::delay_until(now + ms(i)).await;
-
-        assert_elapsed!(now, i);
-    }
-}
-
-#[tokio::test]
-async fn sub_ms_delayed_delay() {
-    time::pause();
-
-    for _ in 0..5 {
-        let now = Instant::now();
-        let deadline = now + ms(1) + Duration::new(0, 1);
-
-        time::delay_until(deadline).await;
-
-        assert_elapsed!(now, 1);
-    }
-}
-
-#[tokio::test]
-async fn delayed_delay_wrapping_level_0() {
-    time::pause();
-
-    time::delay_for(ms(5)).await;
-
-    let now = Instant::now();
-    time::delay_until(now + ms(60)).await;
-
-    assert_elapsed!(now, 60);
-}
-
-#[tokio::test]
-async fn reset_future_delay_before_fire() {
-    time::pause();
-
-    let now = Instant::now();
-
-    let mut delay = task::spawn(time::delay_until(now + ms(100)));
-    assert_pending!(delay.poll());
-
-    let mut delay = delay.into_inner();
-
-    delay.reset(Instant::now() + ms(200));
-    delay.await;
-
-    assert_elapsed!(now, 200);
-}
-
-#[tokio::test]
-async fn reset_past_delay_before_turn() {
-    time::pause();
-
-    let now = Instant::now();
-
-    let mut delay = task::spawn(time::delay_until(now + ms(100)));
-    assert_pending!(delay.poll());
-
-    let mut delay = delay.into_inner();
-
-    delay.reset(now + ms(80));
-    delay.await;
-
-    assert_elapsed!(now, 80);
-}
-
-#[tokio::test]
-async fn reset_past_delay_before_fire() {
-    time::pause();
-
-    let now = Instant::now();
-
-    let mut delay = task::spawn(time::delay_until(now + ms(100)));
-    assert_pending!(delay.poll());
-
-    let mut delay = delay.into_inner();
-
-    time::delay_for(ms(10)).await;
-
-    delay.reset(now + ms(80));
-    delay.await;
-
-    assert_elapsed!(now, 80);
-}
-
-#[tokio::test]
-async fn reset_future_delay_after_fire() {
-    time::pause();
-
-    let now = Instant::now();
-    let mut delay = time::delay_until(now + ms(100));
-
-    (&mut delay).await;
-    assert_elapsed!(now, 100);
-
-    delay.reset(now + ms(110));
-    delay.await;
-    assert_elapsed!(now, 110);
-}
-
-#[tokio::test]
-async fn reset_delay_to_past() {
-    time::pause();
-
-    let now = Instant::now();
-
-    let mut delay = task::spawn(time::delay_until(now + ms(100)));
-    assert_pending!(delay.poll());
-
-    time::delay_for(ms(50)).await;
-
-    assert!(!delay.is_woken());
-
-    delay.reset(now + ms(40));
-
-    assert!(delay.is_woken());
-
-    assert_ready!(delay.poll());
-}
-
-#[test]
-#[should_panic]
-fn creating_delay_outside_of_context() {
-    let now = Instant::now();
-
-    // This creates a delay outside of the context of a mock timer. This tests
-    // that it will panic.
-    let _fut = time::delay_until(now + ms(500));
-}
-
-#[should_panic]
-#[tokio::test]
-async fn greater_than_max() {
-    const YR_5: u64 = 5 * 365 * 24 * 60 * 60 * 1000;
-
-    time::delay_until(Instant::now() + ms(YR_5)).await;
-}
-
-const NUM_LEVELS: usize = 6;
-const MAX_DURATION: u64 = (1 << (6 * NUM_LEVELS)) - 1;
-
-#[should_panic]
-#[tokio::test]
-async fn exactly_max() {
-    // TODO: this should not panic but `time::ms()` is acting up
-    time::delay_for(ms(MAX_DURATION)).await;
-}
-
-#[tokio::test]
-async fn no_out_of_bounds_close_to_max() {
-    time::pause();
-    time::delay_for(ms(MAX_DURATION - 1)).await;
-}
-
-fn ms(n: u64) -> Duration {
-    Duration::from_millis(n)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_interval.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_interval.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_interval.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_interval.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,60 +1,169 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
-use tokio::time::{self, Duration, Instant};
+use tokio::time::{self, Duration, Instant, MissedTickBehavior};
 use tokio_test::{assert_pending, assert_ready_eq, task};
 
 use std::task::Poll;
 
+// Takes the `Interval` task, `start` variable, and optional time deltas
+// For each time delta, it polls the `Interval` and asserts that the result is
+// equal to `start` + the specific time delta. Then it asserts that the
+// `Interval` is pending.
+macro_rules! check_interval_poll {
+    ($i:ident, $start:ident, $($delta:expr),*$(,)?) => {
+        $(
+            assert_ready_eq!(poll_next(&mut $i), $start + ms($delta));
+        )*
+        assert_pending!(poll_next(&mut $i));
+    };
+    ($i:ident, $start:ident) => {
+        check_interval_poll!($i, $start,);
+    };
+}
+
 #[tokio::test]
 #[should_panic]
 async fn interval_zero_duration() {
     let _ = time::interval_at(Instant::now(), ms(0));
 }
 
-#[tokio::test]
-async fn usage() {
-    time::pause();
-
+// Expected ticks: |     1     |     2     |     3     |     4     |     5     |     6     |
+// Actual ticks:   | work -----|          delay          | work | work | work -| work -----|
+// Poll behavior:  |   |       |                         |      |      |       |           |
+//                 |   |       |                         |      |      |       |           |
+//          Ready(s)   |       |             Ready(s + 2p)      |      |       |           |
+//               Pending       |                    Ready(s + 3p)      |       |           |
+//                  Ready(s + p)                           Ready(s + 4p)       |           |
+//                                                                 Ready(s + 5p)           |
+//                                                                             Ready(s + 6p)
+#[tokio::test(start_paused = true)]
+async fn burst() {
     let start = Instant::now();
 
-    // TODO: Skip this
+    // This is necessary because the timer is only so granular, and in order for
+    // all our ticks to resolve, the time needs to be 1ms ahead of what we
+    // expect, so that the runtime will see that it is time to resolve the timer
     time::advance(ms(1)).await;
 
     let mut i = task::spawn(time::interval_at(start, ms(300)));
 
-    assert_ready_eq!(poll_next(&mut i), start);
-    assert_pending!(poll_next(&mut i));
+    check_interval_poll!(i, start, 0);
 
     time::advance(ms(100)).await;
-    assert_pending!(poll_next(&mut i));
+    check_interval_poll!(i, start);
+
+    time::advance(ms(200)).await;
+    check_interval_poll!(i, start, 300);
+
+    time::advance(ms(650)).await;
+    check_interval_poll!(i, start, 600, 900);
 
     time::advance(ms(200)).await;
-    assert_ready_eq!(poll_next(&mut i), start + ms(300));
-    assert_pending!(poll_next(&mut i));
+    check_interval_poll!(i, start);
+
+    time::advance(ms(100)).await;
+    check_interval_poll!(i, start, 1200);
+
+    time::advance(ms(250)).await;
+    check_interval_poll!(i, start, 1500);
 
-    time::advance(ms(400)).await;
-    assert_ready_eq!(poll_next(&mut i), start + ms(600));
-    assert_pending!(poll_next(&mut i));
-
-    time::advance(ms(500)).await;
-    assert_ready_eq!(poll_next(&mut i), start + ms(900));
-    assert_ready_eq!(poll_next(&mut i), start + ms(1200));
-    assert_pending!(poll_next(&mut i));
+    time::advance(ms(300)).await;
+    check_interval_poll!(i, start, 1800);
 }
 
-#[tokio::test]
-async fn usage_stream() {
-    use tokio::stream::StreamExt;
+// Expected ticks: |     1     |     2     |     3     |     4     |     5     |     6     |
+// Actual ticks:   | work -----|          delay          | work -----| work -----| work -----|
+// Poll behavior:  |   |       |                         |   |       |           |           |
+//                 |   |       |                         |   |       |           |           |
+//          Ready(s)   |       |             Ready(s + 2p)   |       |           |           |
+//               Pending       |                       Pending       |           |           |
+//                  Ready(s + p)                     Ready(s + 2p + d)           |           |
+//                                                               Ready(s + 3p + d)           |
+//                                                                           Ready(s + 4p + d)
+#[tokio::test(start_paused = true)]
+async fn delay() {
+    let start = Instant::now();
+
+    // This is necessary because the timer is only so granular, and in order for
+    // all our ticks to resolve, the time needs to be 1ms ahead of what we
+    // expect, so that the runtime will see that it is time to resolve the timer
+    time::advance(ms(1)).await;
+
+    let mut i = task::spawn(time::interval_at(start, ms(300)));
+    i.set_missed_tick_behavior(MissedTickBehavior::Delay);
+
+    check_interval_poll!(i, start, 0);
+
+    time::advance(ms(100)).await;
+    check_interval_poll!(i, start);
 
+    time::advance(ms(200)).await;
+    check_interval_poll!(i, start, 300);
+
+    time::advance(ms(650)).await;
+    check_interval_poll!(i, start, 600);
+
+    time::advance(ms(100)).await;
+    check_interval_poll!(i, start);
+
+    // We have to add one here for the same reason as is above.
+    // Because `Interval` has reset its timer according to `Instant::now()`,
+    // we have to go forward 1 more millisecond than is expected so that the
+    // runtime realizes that it's time to resolve the timer.
+    time::advance(ms(201)).await;
+    // We add one because when using the `Delay` behavior, `Interval`
+    // adds the `period` from `Instant::now()`, which will always be off by one
+    // because we have to advance time by 1 (see above).
+    check_interval_poll!(i, start, 1251);
+
+    time::advance(ms(300)).await;
+    // Again, we add one.
+    check_interval_poll!(i, start, 1551);
+
+    time::advance(ms(300)).await;
+    check_interval_poll!(i, start, 1851);
+}
+
+// Expected ticks: |     1     |     2     |     3     |     4     |     5     |     6     |
+// Actual ticks:   | work -----|          delay          | work ---| work -----| work -----|
+// Poll behavior:  |   |       |                         |         |           |           |
+//                 |   |       |                         |         |           |           |
+//          Ready(s)   |       |             Ready(s + 2p)         |           |           |
+//               Pending       |                       Ready(s + 4p)           |           |
+//                  Ready(s + p)                                   Ready(s + 5p)           |
+//                                                                             Ready(s + 6p)
+#[tokio::test(start_paused = true)]
+async fn skip() {
     let start = Instant::now();
-    let mut interval = time::interval(ms(10));
 
-    for _ in 0..3 {
-        interval.next().await.unwrap();
-    }
+    // This is necessary because the timer is only so granular, and in order for
+    // all our ticks to resolve, the time needs to be 1ms ahead of what we
+    // expect, so that the runtime will see that it is time to resolve the timer
+    time::advance(ms(1)).await;
+
+    let mut i = task::spawn(time::interval_at(start, ms(300)));
+    i.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    check_interval_poll!(i, start, 0);
+
+    time::advance(ms(100)).await;
+    check_interval_poll!(i, start);
+
+    time::advance(ms(200)).await;
+    check_interval_poll!(i, start, 300);
+
+    time::advance(ms(650)).await;
+    check_interval_poll!(i, start, 600);
+
+    time::advance(ms(250)).await;
+    check_interval_poll!(i, start, 1200);
+
+    time::advance(ms(300)).await;
+    check_interval_poll!(i, start, 1500);
 
-    assert!(start.elapsed() > ms(20));
+    time::advance(ms(300)).await;
+    check_interval_poll!(i, start, 1800);
 }
 
 fn poll_next(interval: &mut task::Spawn<time::Interval>) -> Poll<Instant> {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_pause.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_pause.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_pause.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_pause.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,326 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use rand::SeedableRng;
+use rand::{rngs::StdRng, Rng};
+use tokio::time::{self, Duration, Instant, Sleep};
+use tokio_test::{assert_elapsed, assert_err, assert_pending, assert_ready, assert_ready_eq, task};
+
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+#[tokio::test]
+async fn pause_time_in_main() {
+    tokio::time::pause();
+}
+
+#[tokio::test]
+async fn pause_time_in_task() {
+    let t = tokio::spawn(async {
+        tokio::time::pause();
+    });
+
+    t.await.unwrap();
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[should_panic]
+async fn pause_time_in_main_threads() {
+    tokio::time::pause();
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+async fn pause_time_in_spawn_threads() {
+    let t = tokio::spawn(async {
+        tokio::time::pause();
+    });
+
+    assert_err!(t.await);
+}
+
+#[test]
+fn paused_time_is_deterministic() {
+    let run_1 = paused_time_stress_run();
+    let run_2 = paused_time_stress_run();
+
+    assert_eq!(run_1, run_2);
+}
+
+#[tokio::main(flavor = "current_thread", start_paused = true)]
+async fn paused_time_stress_run() -> Vec<Duration> {
+    let mut rng = StdRng::seed_from_u64(1);
+
+    let mut times = vec![];
+    let start = Instant::now();
+    for _ in 0..10_000 {
+        let sleep = rng.gen_range(Duration::from_secs(0)..Duration::from_secs(1));
+        time::sleep(sleep).await;
+        times.push(start.elapsed());
+    }
+
+    times
+}
+
+#[tokio::test(start_paused = true)]
+async fn advance_after_poll() {
+    time::sleep(ms(1)).await;
+
+    let start = Instant::now();
+
+    let mut sleep = task::spawn(time::sleep_until(start + ms(300)));
+
+    assert_pending!(sleep.poll());
+
+    let before = Instant::now();
+    time::advance(ms(100)).await;
+    assert_elapsed!(before, ms(100));
+
+    assert_pending!(sleep.poll());
+}
+
+#[tokio::test(start_paused = true)]
+async fn sleep_no_poll() {
+    let start = Instant::now();
+
+    // TODO: Skip this
+    time::advance(ms(1)).await;
+
+    let mut sleep = task::spawn(time::sleep_until(start + ms(300)));
+
+    let before = Instant::now();
+    time::advance(ms(100)).await;
+    assert_elapsed!(before, ms(100));
+
+    assert_pending!(sleep.poll());
+}
+
+enum State {
+    Begin,
+    AwaitingAdvance(Pin<Box<dyn Future<Output = ()>>>),
+    AfterAdvance,
+}
+
+struct Tester {
+    sleep: Pin<Box<Sleep>>,
+    state: State,
+    before: Option<Instant>,
+    poll: bool,
+}
+
+impl Future for Tester {
+    type Output = ();
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        match &mut self.state {
+            State::Begin => {
+                if self.poll {
+                    assert_pending!(self.sleep.as_mut().poll(cx));
+                }
+                self.before = Some(Instant::now());
+                let advance_fut = Box::pin(time::advance(ms(100)));
+                self.state = State::AwaitingAdvance(advance_fut);
+                self.poll(cx)
+            }
+            State::AwaitingAdvance(ref mut advance_fut) => match advance_fut.as_mut().poll(cx) {
+                Poll::Pending => Poll::Pending,
+                Poll::Ready(()) => {
+                    self.state = State::AfterAdvance;
+                    self.poll(cx)
+                }
+            },
+            State::AfterAdvance => {
+                assert_elapsed!(self.before.unwrap(), ms(100));
+
+                assert_pending!(self.sleep.as_mut().poll(cx));
+
+                Poll::Ready(())
+            }
+        }
+    }
+}
+
+#[tokio::test(start_paused = true)]
+async fn sleep_same_task() {
+    let start = Instant::now();
+
+    // TODO: Skip this
+    time::advance(ms(1)).await;
+
+    let sleep = Box::pin(time::sleep_until(start + ms(300)));
+
+    Tester {
+        sleep,
+        state: State::Begin,
+        before: None,
+        poll: true,
+    }
+    .await;
+}
+
+#[tokio::test(start_paused = true)]
+async fn sleep_same_task_no_poll() {
+    let start = Instant::now();
+
+    // TODO: Skip this
+    time::advance(ms(1)).await;
+
+    let sleep = Box::pin(time::sleep_until(start + ms(300)));
+
+    Tester {
+        sleep,
+        state: State::Begin,
+        before: None,
+        poll: false,
+    }
+    .await;
+}
+
+#[tokio::test(start_paused = true)]
+async fn interval() {
+    let start = Instant::now();
+
+    // TODO: Skip this
+    time::advance(ms(1)).await;
+
+    let mut i = task::spawn(time::interval_at(start, ms(300)));
+
+    assert_ready_eq!(poll_next(&mut i), start);
+    assert_pending!(poll_next(&mut i));
+
+    let before = Instant::now();
+    time::advance(ms(100)).await;
+    assert_elapsed!(before, ms(100));
+    assert_pending!(poll_next(&mut i));
+
+    let before = Instant::now();
+    time::advance(ms(200)).await;
+    assert_elapsed!(before, ms(200));
+    assert_ready_eq!(poll_next(&mut i), start + ms(300));
+    assert_pending!(poll_next(&mut i));
+
+    let before = Instant::now();
+    time::advance(ms(400)).await;
+    assert_elapsed!(before, ms(400));
+    assert_ready_eq!(poll_next(&mut i), start + ms(600));
+    assert_pending!(poll_next(&mut i));
+
+    let before = Instant::now();
+    time::advance(ms(500)).await;
+    assert_elapsed!(before, ms(500));
+    assert_ready_eq!(poll_next(&mut i), start + ms(900));
+    assert_ready_eq!(poll_next(&mut i), start + ms(1200));
+    assert_pending!(poll_next(&mut i));
+}
+
+#[tokio::test(start_paused = true)]
+async fn test_time_advance_sub_ms() {
+    let now = Instant::now();
+
+    let dur = Duration::from_micros(51_592);
+    time::advance(dur).await;
+
+    assert_eq!(now.elapsed(), dur);
+
+    let now = Instant::now();
+    let dur = Duration::from_micros(1);
+    time::advance(dur).await;
+
+    assert_eq!(now.elapsed(), dur);
+}
+
+#[tokio::test(start_paused = true)]
+async fn test_time_advance_3ms_and_change() {
+    let now = Instant::now();
+
+    let dur = Duration::from_micros(3_141_592);
+    time::advance(dur).await;
+
+    assert_eq!(now.elapsed(), dur);
+
+    let now = Instant::now();
+    let dur = Duration::from_micros(3_123_456);
+    time::advance(dur).await;
+
+    assert_eq!(now.elapsed(), dur);
+}
+
+#[tokio::test(start_paused = true)]
+async fn regression_3710_with_submillis_advance() {
+    let start = Instant::now();
+
+    time::advance(Duration::from_millis(1)).await;
+
+    let mut sleep = task::spawn(time::sleep_until(start + Duration::from_secs(60)));
+
+    assert_pending!(sleep.poll());
+
+    let before = Instant::now();
+    let dur = Duration::from_micros(51_592);
+    time::advance(dur).await;
+    assert_eq!(before.elapsed(), dur);
+
+    assert_pending!(sleep.poll());
+}
+
+#[tokio::test(start_paused = true)]
+async fn exact_1ms_advance() {
+    let now = Instant::now();
+
+    let dur = Duration::from_millis(1);
+    time::advance(dur).await;
+
+    assert_eq!(now.elapsed(), dur);
+
+    let now = Instant::now();
+    let dur = Duration::from_millis(1);
+    time::advance(dur).await;
+
+    assert_eq!(now.elapsed(), dur);
+}
+
+#[tokio::test(start_paused = true)]
+async fn advance_once_with_timer() {
+    let mut sleep = task::spawn(time::sleep(Duration::from_millis(1)));
+    assert_pending!(sleep.poll());
+
+    time::advance(Duration::from_micros(250)).await;
+    assert_pending!(sleep.poll());
+
+    time::advance(Duration::from_micros(1500)).await;
+
+    assert!(sleep.is_woken());
+    assert_ready!(sleep.poll());
+}
+
+#[tokio::test(start_paused = true)]
+async fn advance_multi_with_timer() {
+    // Round to the nearest ms
+    // time::sleep(Duration::from_millis(1)).await;
+
+    let mut sleep = task::spawn(time::sleep(Duration::from_millis(1)));
+    assert_pending!(sleep.poll());
+
+    time::advance(Duration::from_micros(250)).await;
+    assert_pending!(sleep.poll());
+
+    time::advance(Duration::from_micros(250)).await;
+    assert_pending!(sleep.poll());
+
+    time::advance(Duration::from_micros(250)).await;
+    assert_pending!(sleep.poll());
+
+    time::advance(Duration::from_micros(250)).await;
+    assert!(sleep.is_woken());
+    assert_ready!(sleep.poll());
+}
+
+fn poll_next(interval: &mut task::Spawn<time::Interval>) -> Poll<Instant> {
+    interval.enter(|cx, mut interval| interval.poll_tick(cx))
+}
+
+fn ms(n: u64) -> Duration {
+    Duration::from_millis(n)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_rt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_rt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_rt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_rt.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,9 +13,9 @@
     let (tx, rx) = mpsc::channel();
 
     rt.spawn(async move {
-        let when = Instant::now() + Duration::from_millis(100);
+        let when = Instant::now() + Duration::from_millis(10);
 
-        delay_until(when).await;
+        sleep_until(when).await;
         assert!(Instant::now() >= when);
 
         tx.send(()).unwrap();
@@ -28,17 +28,13 @@
 fn timer_with_basic_scheduler() {
     use tokio::runtime::Builder;
 
-    let mut rt = Builder::new()
-        .basic_scheduler()
-        .enable_all()
-        .build()
-        .unwrap();
+    let rt = Builder::new_current_thread().enable_all().build().unwrap();
     let (tx, rx) = mpsc::channel();
 
     rt.block_on(async move {
-        let when = Instant::now() + Duration::from_millis(100);
+        let when = Instant::now() + Duration::from_millis(10);
 
-        delay_until(when).await;
+        sleep_until(when).await;
         assert!(Instant::now() >= when);
 
         tx.send(()).unwrap();
@@ -71,8 +67,8 @@
         }
     }
 
-    let when = Instant::now() + Duration::from_millis(20);
-    let starve = Starve(delay_until(when), 0);
+    let when = Instant::now() + Duration::from_millis(10);
+    let starve = Starve(Box::pin(sleep_until(when)), 0);
 
     starve.await;
     assert!(Instant::now() >= when);
@@ -85,7 +81,7 @@
     let (_tx, rx) = oneshot::channel::<()>();
 
     let now = Instant::now();
-    let dur = Duration::from_millis(20);
+    let dur = Duration::from_millis(10);
 
     let res = timeout(dur, rx).await;
     assert!(res.is_err());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_sleep.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_sleep.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_sleep.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_sleep.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,372 @@
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use std::future::Future;
+use std::task::Context;
+
+use futures::task::noop_waker_ref;
+
+use tokio::time::{self, Duration, Instant};
+use tokio_test::{assert_elapsed, assert_pending, assert_ready, task};
+
+#[tokio::test]
+async fn immediate_sleep() {
+    time::pause();
+
+    let now = Instant::now();
+
+    // Ready!
+    time::sleep_until(now).await;
+    assert_elapsed!(now, ms(1));
+}
+
+#[tokio::test]
+async fn is_elapsed() {
+    time::pause();
+
+    let sleep = time::sleep(Duration::from_millis(10));
+
+    tokio::pin!(sleep);
+
+    assert!(!sleep.is_elapsed());
+
+    assert!(futures::poll!(sleep.as_mut()).is_pending());
+
+    assert!(!sleep.is_elapsed());
+
+    sleep.as_mut().await;
+
+    assert!(sleep.is_elapsed());
+}
+
+#[tokio::test]
+async fn delayed_sleep_level_0() {
+    time::pause();
+
+    for &i in &[1, 10, 60] {
+        let now = Instant::now();
+        let dur = ms(i);
+
+        time::sleep_until(now + dur).await;
+
+        assert_elapsed!(now, dur);
+    }
+}
+
+#[tokio::test]
+async fn sub_ms_delayed_sleep() {
+    time::pause();
+
+    for _ in 0..5 {
+        let now = Instant::now();
+        let deadline = now + ms(1) + Duration::new(0, 1);
+
+        time::sleep_until(deadline).await;
+
+        assert_elapsed!(now, ms(1));
+    }
+}
+
+#[tokio::test]
+async fn delayed_sleep_wrapping_level_0() {
+    time::pause();
+
+    time::sleep(ms(5)).await;
+
+    let now = Instant::now();
+    time::sleep_until(now + ms(60)).await;
+
+    assert_elapsed!(now, ms(60));
+}
+
+#[tokio::test]
+async fn reset_future_sleep_before_fire() {
+    time::pause();
+
+    let now = Instant::now();
+
+    let mut sleep = task::spawn(Box::pin(time::sleep_until(now + ms(100))));
+    assert_pending!(sleep.poll());
+
+    let mut sleep = sleep.into_inner();
+
+    sleep.as_mut().reset(Instant::now() + ms(200));
+    sleep.await;
+
+    assert_elapsed!(now, ms(200));
+}
+
+#[tokio::test]
+async fn reset_past_sleep_before_turn() {
+    time::pause();
+
+    let now = Instant::now();
+
+    let mut sleep = task::spawn(Box::pin(time::sleep_until(now + ms(100))));
+    assert_pending!(sleep.poll());
+
+    let mut sleep = sleep.into_inner();
+
+    sleep.as_mut().reset(now + ms(80));
+    sleep.await;
+
+    assert_elapsed!(now, ms(80));
+}
+
+#[tokio::test]
+async fn reset_past_sleep_before_fire() {
+    time::pause();
+
+    let now = Instant::now();
+
+    let mut sleep = task::spawn(Box::pin(time::sleep_until(now + ms(100))));
+    assert_pending!(sleep.poll());
+
+    let mut sleep = sleep.into_inner();
+
+    time::sleep(ms(10)).await;
+
+    sleep.as_mut().reset(now + ms(80));
+    sleep.await;
+
+    assert_elapsed!(now, ms(80));
+}
+
+#[tokio::test]
+async fn reset_future_sleep_after_fire() {
+    time::pause();
+
+    let now = Instant::now();
+    let mut sleep = Box::pin(time::sleep_until(now + ms(100)));
+
+    sleep.as_mut().await;
+    assert_elapsed!(now, ms(100));
+
+    sleep.as_mut().reset(now + ms(110));
+    sleep.await;
+    assert_elapsed!(now, ms(110));
+}
+
+#[tokio::test]
+async fn reset_sleep_to_past() {
+    time::pause();
+
+    let now = Instant::now();
+
+    let mut sleep = task::spawn(Box::pin(time::sleep_until(now + ms(100))));
+    assert_pending!(sleep.poll());
+
+    time::sleep(ms(50)).await;
+
+    assert!(!sleep.is_woken());
+
+    sleep.as_mut().reset(now + ms(40));
+
+    // TODO: is this required?
+    //assert!(sleep.is_woken());
+
+    assert_ready!(sleep.poll());
+}
+
+#[test]
+#[should_panic]
+fn creating_sleep_outside_of_context() {
+    let now = Instant::now();
+
+    // This creates a delay outside of the context of a mock timer. This tests
+    // that it will panic.
+    let _fut = time::sleep_until(now + ms(500));
+}
+
+#[tokio::test]
+async fn greater_than_max() {
+    const YR_5: u64 = 5 * 365 * 24 * 60 * 60 * 1000;
+
+    time::pause();
+    time::sleep_until(Instant::now() + ms(YR_5)).await;
+}
+
+#[tokio::test]
+async fn short_sleeps() {
+    for i in 0..10000 {
+        if (i % 10) == 0 {
+            eprintln!("=== {}", i);
+        }
+        tokio::time::sleep(std::time::Duration::from_millis(0)).await;
+    }
+}
+
+#[tokio::test]
+async fn multi_long_sleeps() {
+    tokio::time::pause();
+
+    for _ in 0..5u32 {
+        tokio::time::sleep(Duration::from_secs(
+            // about a year
+            365 * 24 * 3600,
+        ))
+        .await;
+    }
+
+    let deadline = tokio::time::Instant::now()
+        + Duration::from_secs(
+            // about 10 years
+            10 * 365 * 24 * 3600,
+        );
+
+    tokio::time::sleep_until(deadline).await;
+
+    assert!(tokio::time::Instant::now() >= deadline);
+}
+
+#[tokio::test]
+async fn long_sleeps() {
+    tokio::time::pause();
+
+    let deadline = tokio::time::Instant::now()
+        + Duration::from_secs(
+            // about 10 years
+            10 * 365 * 24 * 3600,
+        );
+
+    tokio::time::sleep_until(deadline).await;
+
+    assert!(tokio::time::Instant::now() >= deadline);
+    assert!(tokio::time::Instant::now() <= deadline + Duration::from_millis(1));
+}
+
+#[tokio::test]
+#[should_panic(expected = "Duration too far into the future")]
+async fn very_long_sleeps() {
+    tokio::time::pause();
+
+    // Some platforms (eg macos) can't represent times this far in the future
+    if let Some(deadline) = tokio::time::Instant::now().checked_add(Duration::from_secs(1u64 << 62))
+    {
+        tokio::time::sleep_until(deadline).await;
+    } else {
+        // make it pass anyway (we can't skip/ignore the test based on the
+        // result of checked_add)
+        panic!("Duration too far into the future (test ignored)")
+    }
+}
+
+#[tokio::test]
+async fn reset_after_firing() {
+    let timer = tokio::time::sleep(std::time::Duration::from_millis(1));
+    tokio::pin!(timer);
+
+    let deadline = timer.deadline();
+
+    timer.as_mut().await;
+    assert_ready!(timer
+        .as_mut()
+        .poll(&mut Context::from_waker(noop_waker_ref())));
+    timer
+        .as_mut()
+        .reset(tokio::time::Instant::now() + std::time::Duration::from_secs(600));
+
+    assert_ne!(deadline, timer.deadline());
+
+    assert_pending!(timer
+        .as_mut()
+        .poll(&mut Context::from_waker(noop_waker_ref())));
+    assert_pending!(timer
+        .as_mut()
+        .poll(&mut Context::from_waker(noop_waker_ref())));
+}
+
+const NUM_LEVELS: usize = 6;
+const MAX_DURATION: u64 = (1 << (6 * NUM_LEVELS)) - 1;
+
+#[tokio::test]
+async fn exactly_max() {
+    time::pause();
+    time::sleep(ms(MAX_DURATION)).await;
+}
+
+#[tokio::test]
+async fn no_out_of_bounds_close_to_max() {
+    time::pause();
+    time::sleep(ms(MAX_DURATION - 1)).await;
+}
+
+fn ms(n: u64) -> Duration {
+    Duration::from_millis(n)
+}
+
+#[tokio::test]
+async fn drop_after_reschedule_at_new_scheduled_time() {
+    use futures::poll;
+
+    tokio::time::pause();
+
+    let start = tokio::time::Instant::now();
+
+    let mut a = Box::pin(tokio::time::sleep(Duration::from_millis(5)));
+    let mut b = Box::pin(tokio::time::sleep(Duration::from_millis(5)));
+    let mut c = Box::pin(tokio::time::sleep(Duration::from_millis(10)));
+
+    let _ = poll!(&mut a);
+    let _ = poll!(&mut b);
+    let _ = poll!(&mut c);
+
+    b.as_mut().reset(start + Duration::from_millis(10));
+    a.await;
+
+    drop(b);
+}
+
+#[tokio::test]
+async fn drop_from_wake() {
+    use std::future::Future;
+    use std::pin::Pin;
+    use std::sync::atomic::{AtomicBool, Ordering};
+    use std::sync::{Arc, Mutex};
+    use std::task::Context;
+
+    let panicked = Arc::new(AtomicBool::new(false));
+    let list: Arc<Mutex<Vec<Pin<Box<tokio::time::Sleep>>>>> = Arc::new(Mutex::new(Vec::new()));
+
+    let arc_wake = Arc::new(DropWaker(panicked.clone(), list.clone()));
+    let arc_wake = futures::task::waker(arc_wake);
+
+    tokio::time::pause();
+
+    let mut lock = list.lock().unwrap();
+
+    for _ in 0..100 {
+        let mut timer = Box::pin(tokio::time::sleep(Duration::from_millis(10)));
+
+        let _ = timer.as_mut().poll(&mut Context::from_waker(&arc_wake));
+
+        lock.push(timer);
+    }
+
+    drop(lock);
+
+    tokio::time::sleep(Duration::from_millis(11)).await;
+
+    assert!(
+        !panicked.load(Ordering::SeqCst),
+        "panicked when dropping timers"
+    );
+
+    #[derive(Clone)]
+    struct DropWaker(
+        Arc<AtomicBool>,
+        Arc<Mutex<Vec<Pin<Box<tokio::time::Sleep>>>>>,
+    );
+
+    impl futures::task::ArcWake for DropWaker {
+        fn wake_by_ref(arc_self: &Arc<Self>) {
+            let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+                *arc_self.1.lock().expect("panic in lock") = Vec::new()
+            }));
+
+            if result.is_err() {
+                arc_self.0.store(true, Ordering::SeqCst);
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_throttle.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_throttle.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_throttle.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_throttle.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#![warn(rust_2018_idioms)]
-#![cfg(feature = "full")]
-
-use tokio::time::{self, throttle};
-use tokio_test::*;
-
-use std::time::Duration;
-
-#[tokio::test]
-async fn usage() {
-    time::pause();
-
-    let mut stream = task::spawn(throttle(
-        Duration::from_millis(100),
-        futures::stream::repeat(()),
-    ));
-
-    assert_ready!(stream.poll_next());
-    assert_pending!(stream.poll_next());
-
-    time::advance(Duration::from_millis(90)).await;
-
-    assert_pending!(stream.poll_next());
-
-    time::advance(Duration::from_millis(101)).await;
-
-    assert!(stream.is_woken());
-
-    assert_ready!(stream.poll_next());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_timeout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_timeout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/time_timeout.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/time_timeout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -75,6 +75,33 @@
 }
 
 #[tokio::test]
+async fn very_large_timeout() {
+    time::pause();
+
+    // Not yet complete
+    let (tx, rx) = oneshot::channel();
+
+    // copy-paste unstable `Duration::MAX`
+    let duration_max = Duration::from_secs(u64::MAX) + Duration::from_nanos(999_999_999);
+
+    // Wrap it with a deadline
+    let mut fut = task::spawn(timeout(duration_max, rx));
+
+    // Ready!
+    assert_pending!(fut.poll());
+
+    // Turn the timer, it runs for the elapsed time
+    time::advance(Duration::from_secs(86400 * 365 * 10)).await;
+
+    assert_pending!(fut.poll());
+
+    // Complete the future
+    tx.send(()).unwrap();
+
+    assert_ready_ok!(fut.poll()).unwrap();
+}
+
+#[tokio::test]
 async fn deadline_now_elapses() {
     use futures::future::pending;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/udp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/udp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,18 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 
-use tokio::net::UdpSocket;
+use futures::future::poll_fn;
+use std::io;
+use std::sync::Arc;
+use tokio::{io::ReadBuf, net::UdpSocket};
 
 const MSG: &[u8] = b"hello";
 const MSG_LEN: usize = MSG.len();
 
 #[tokio::test]
 async fn send_recv() -> std::io::Result<()> {
-    let mut sender = UdpSocket::bind("127.0.0.1:0").await?;
-    let mut receiver = UdpSocket::bind("127.0.0.1:0").await?;
+    let sender = UdpSocket::bind("127.0.0.1:0").await?;
+    let receiver = UdpSocket::bind("127.0.0.1:0").await?;
 
     sender.connect(receiver.local_addr()?).await?;
     receiver.connect(sender.local_addr()?).await?;
@@ -24,9 +27,27 @@
 }
 
 #[tokio::test]
+async fn send_recv_poll() -> std::io::Result<()> {
+    let sender = UdpSocket::bind("127.0.0.1:0").await?;
+    let receiver = UdpSocket::bind("127.0.0.1:0").await?;
+
+    sender.connect(receiver.local_addr()?).await?;
+    receiver.connect(sender.local_addr()?).await?;
+
+    poll_fn(|cx| sender.poll_send(cx, MSG)).await?;
+
+    let mut recv_buf = [0u8; 32];
+    let mut read = ReadBuf::new(&mut recv_buf);
+    let _len = poll_fn(|cx| receiver.poll_recv(cx, &mut read)).await?;
+
+    assert_eq!(read.filled(), MSG);
+    Ok(())
+}
+
+#[tokio::test]
 async fn send_to_recv_from() -> std::io::Result<()> {
-    let mut sender = UdpSocket::bind("127.0.0.1:0").await?;
-    let mut receiver = UdpSocket::bind("127.0.0.1:0").await?;
+    let sender = UdpSocket::bind("127.0.0.1:0").await?;
+    let receiver = UdpSocket::bind("127.0.0.1:0").await?;
 
     let receiver_addr = receiver.local_addr()?;
     sender.send_to(MSG, &receiver_addr).await?;
@@ -40,11 +61,85 @@
 }
 
 #[tokio::test]
+async fn send_to_recv_from_poll() -> std::io::Result<()> {
+    let sender = UdpSocket::bind("127.0.0.1:0").await?;
+    let receiver = UdpSocket::bind("127.0.0.1:0").await?;
+
+    let receiver_addr = receiver.local_addr()?;
+    poll_fn(|cx| sender.poll_send_to(cx, MSG, receiver_addr)).await?;
+
+    let mut recv_buf = [0u8; 32];
+    let mut read = ReadBuf::new(&mut recv_buf);
+    let addr = poll_fn(|cx| receiver.poll_recv_from(cx, &mut read)).await?;
+
+    assert_eq!(read.filled(), MSG);
+    assert_eq!(addr, sender.local_addr()?);
+    Ok(())
+}
+
+#[tokio::test]
+async fn send_to_peek_from() -> std::io::Result<()> {
+    let sender = UdpSocket::bind("127.0.0.1:0").await?;
+    let receiver = UdpSocket::bind("127.0.0.1:0").await?;
+
+    let receiver_addr = receiver.local_addr()?;
+    poll_fn(|cx| sender.poll_send_to(cx, MSG, receiver_addr)).await?;
+
+    // peek
+    let mut recv_buf = [0u8; 32];
+    let (n, addr) = receiver.peek_from(&mut recv_buf).await?;
+    assert_eq!(&recv_buf[..n], MSG);
+    assert_eq!(addr, sender.local_addr()?);
+
+    // peek
+    let mut recv_buf = [0u8; 32];
+    let (n, addr) = receiver.peek_from(&mut recv_buf).await?;
+    assert_eq!(&recv_buf[..n], MSG);
+    assert_eq!(addr, sender.local_addr()?);
+
+    let mut recv_buf = [0u8; 32];
+    let (n, addr) = receiver.recv_from(&mut recv_buf).await?;
+    assert_eq!(&recv_buf[..n], MSG);
+    assert_eq!(addr, sender.local_addr()?);
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn send_to_peek_from_poll() -> std::io::Result<()> {
+    let sender = UdpSocket::bind("127.0.0.1:0").await?;
+    let receiver = UdpSocket::bind("127.0.0.1:0").await?;
+
+    let receiver_addr = receiver.local_addr()?;
+    poll_fn(|cx| sender.poll_send_to(cx, MSG, receiver_addr)).await?;
+
+    let mut recv_buf = [0u8; 32];
+    let mut read = ReadBuf::new(&mut recv_buf);
+    let addr = poll_fn(|cx| receiver.poll_peek_from(cx, &mut read)).await?;
+
+    assert_eq!(read.filled(), MSG);
+    assert_eq!(addr, sender.local_addr()?);
+
+    let mut recv_buf = [0u8; 32];
+    let mut read = ReadBuf::new(&mut recv_buf);
+    poll_fn(|cx| receiver.poll_peek_from(cx, &mut read)).await?;
+
+    assert_eq!(read.filled(), MSG);
+    let mut recv_buf = [0u8; 32];
+    let mut read = ReadBuf::new(&mut recv_buf);
+
+    poll_fn(|cx| receiver.poll_recv_from(cx, &mut read)).await?;
+    assert_eq!(read.filled(), MSG);
+    Ok(())
+}
+
+#[tokio::test]
 async fn split() -> std::io::Result<()> {
     let socket = UdpSocket::bind("127.0.0.1:0").await?;
-    let (mut r, mut s) = socket.split();
+    let s = Arc::new(socket);
+    let r = s.clone();
 
-    let addr = s.as_ref().local_addr()?;
+    let addr = s.local_addr()?;
     tokio::spawn(async move {
         s.send_to(MSG, &addr).await.unwrap();
     });
@@ -55,20 +150,71 @@
 }
 
 #[tokio::test]
-async fn reunite() -> std::io::Result<()> {
+async fn split_chan() -> std::io::Result<()> {
+    // setup UdpSocket that will echo all sent items
     let socket = UdpSocket::bind("127.0.0.1:0").await?;
-    let (s, r) = socket.split();
-    assert!(s.reunite(r).is_ok());
+    let addr = socket.local_addr().unwrap();
+    let s = Arc::new(socket);
+    let r = s.clone();
+
+    let (tx, mut rx) = tokio::sync::mpsc::channel::<(Vec<u8>, std::net::SocketAddr)>(1_000);
+    tokio::spawn(async move {
+        while let Some((bytes, addr)) = rx.recv().await {
+            s.send_to(&bytes, &addr).await.unwrap();
+        }
+    });
+
+    tokio::spawn(async move {
+        let mut buf = [0u8; 32];
+        loop {
+            let (len, addr) = r.recv_from(&mut buf).await.unwrap();
+            tx.send((buf[..len].to_vec(), addr)).await.unwrap();
+        }
+    });
+
+    // test that we can send a value and get back some response
+    let sender = UdpSocket::bind("127.0.0.1:0").await?;
+    sender.send_to(MSG, addr).await?;
+    let mut recv_buf = [0u8; 32];
+    let (len, _) = sender.recv_from(&mut recv_buf).await?;
+    assert_eq!(&recv_buf[..len], MSG);
     Ok(())
 }
 
 #[tokio::test]
-async fn reunite_error() -> std::io::Result<()> {
+async fn split_chan_poll() -> std::io::Result<()> {
+    // setup UdpSocket that will echo all sent items
     let socket = UdpSocket::bind("127.0.0.1:0").await?;
-    let socket1 = UdpSocket::bind("127.0.0.1:0").await?;
-    let (s, _) = socket.split();
-    let (_, r1) = socket1.split();
-    assert!(s.reunite(r1).is_err());
+    let addr = socket.local_addr().unwrap();
+    let s = Arc::new(socket);
+    let r = s.clone();
+
+    let (tx, mut rx) = tokio::sync::mpsc::channel::<(Vec<u8>, std::net::SocketAddr)>(1_000);
+    tokio::spawn(async move {
+        while let Some((bytes, addr)) = rx.recv().await {
+            poll_fn(|cx| s.poll_send_to(cx, &bytes, addr))
+                .await
+                .unwrap();
+        }
+    });
+
+    tokio::spawn(async move {
+        let mut recv_buf = [0u8; 32];
+        let mut read = ReadBuf::new(&mut recv_buf);
+        loop {
+            let addr = poll_fn(|cx| r.poll_recv_from(cx, &mut read)).await.unwrap();
+            tx.send((read.filled().to_vec(), addr)).await.unwrap();
+        }
+    });
+
+    // test that we can send a value and get back some response
+    let sender = UdpSocket::bind("127.0.0.1:0").await?;
+    poll_fn(|cx| sender.poll_send_to(cx, MSG, addr)).await?;
+
+    let mut recv_buf = [0u8; 32];
+    let mut read = ReadBuf::new(&mut recv_buf);
+    let _ = poll_fn(|cx| sender.poll_recv_from(cx, &mut read)).await?;
+    assert_eq!(read.filled(), MSG);
     Ok(())
 }
 
@@ -86,13 +232,15 @@
     const MSG2_LEN: usize = MSG2.len();
 
     let sender = UdpSocket::bind("127.0.0.1:0").await.unwrap();
-    let mut receiver = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+    let receiver = UdpSocket::bind("127.0.0.1:0").await.unwrap();
 
     receiver
         .connect(sender.local_addr().unwrap())
         .await
         .unwrap();
 
+    sender.writable().await.unwrap();
+
     let sent = &sender
         .try_send_to(MSG, receiver.local_addr().unwrap())
         .unwrap();
@@ -118,3 +266,177 @@
 
     assert_eq!(received, MSG_LEN * 2 + MSG2_LEN);
 }
+
+#[tokio::test]
+async fn try_send_recv() {
+    // Create listener
+    let server = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+
+    // Create socket pair
+    let client = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+
+    // Connect the two
+    client.connect(server.local_addr().unwrap()).await.unwrap();
+    server.connect(client.local_addr().unwrap()).await.unwrap();
+
+    for _ in 0..5 {
+        loop {
+            client.writable().await.unwrap();
+
+            match client.try_send(b"hello world") {
+                Ok(n) => {
+                    assert_eq!(n, 11);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+
+        loop {
+            server.readable().await.unwrap();
+
+            let mut buf = [0; 512];
+
+            match server.try_recv(&mut buf) {
+                Ok(n) => {
+                    assert_eq!(n, 11);
+                    assert_eq!(&buf[0..11], &b"hello world"[..]);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+    }
+}
+
+#[tokio::test]
+async fn try_send_to_recv_from() {
+    // Create listener
+    let server = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+    let saddr = server.local_addr().unwrap();
+
+    // Create socket pair
+    let client = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+    let caddr = client.local_addr().unwrap();
+
+    for _ in 0..5 {
+        loop {
+            client.writable().await.unwrap();
+
+            match client.try_send_to(b"hello world", saddr) {
+                Ok(n) => {
+                    assert_eq!(n, 11);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+
+        loop {
+            server.readable().await.unwrap();
+
+            let mut buf = [0; 512];
+
+            match server.try_recv_from(&mut buf) {
+                Ok((n, addr)) => {
+                    assert_eq!(n, 11);
+                    assert_eq!(addr, caddr);
+                    assert_eq!(&buf[0..11], &b"hello world"[..]);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+    }
+}
+
+#[tokio::test]
+async fn try_recv_buf() {
+    // Create listener
+    let server = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+
+    // Create socket pair
+    let client = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+
+    // Connect the two
+    client.connect(server.local_addr().unwrap()).await.unwrap();
+    server.connect(client.local_addr().unwrap()).await.unwrap();
+
+    for _ in 0..5 {
+        loop {
+            client.writable().await.unwrap();
+
+            match client.try_send(b"hello world") {
+                Ok(n) => {
+                    assert_eq!(n, 11);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+
+        loop {
+            server.readable().await.unwrap();
+
+            let mut buf = Vec::with_capacity(512);
+
+            match server.try_recv_buf(&mut buf) {
+                Ok(n) => {
+                    assert_eq!(n, 11);
+                    assert_eq!(&buf[0..11], &b"hello world"[..]);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+    }
+}
+
+#[tokio::test]
+async fn try_recv_buf_from() {
+    // Create listener
+    let server = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+    let saddr = server.local_addr().unwrap();
+
+    // Create socket pair
+    let client = UdpSocket::bind("127.0.0.1:0").await.unwrap();
+    let caddr = client.local_addr().unwrap();
+
+    for _ in 0..5 {
+        loop {
+            client.writable().await.unwrap();
+
+            match client.try_send_to(b"hello world", saddr) {
+                Ok(n) => {
+                    assert_eq!(n, 11);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+
+        loop {
+            server.readable().await.unwrap();
+
+            let mut buf = Vec::with_capacity(512);
+
+            match server.try_recv_buf_from(&mut buf) {
+                Ok((n, addr)) => {
+                    assert_eq!(n, 11);
+                    assert_eq!(addr, caddr);
+                    assert_eq!(&buf[0..11], &b"hello world"[..]);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/uds_cred.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/uds_cred.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/uds_cred.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/uds_cred.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,10 +9,6 @@
 
 #[tokio::test]
 #[cfg_attr(
-    target_os = "freebsd",
-    ignore = "Requires FreeBSD 12.0 or later. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=176419"
-)]
-#[cfg_attr(
     target_os = "netbsd",
     ignore = "NetBSD does not support getpeereid() for sockets created by socketpair()"
 )]
@@ -25,6 +21,6 @@
     let uid = unsafe { geteuid() };
     let gid = unsafe { getegid() };
 
-    assert_eq!(cred_a.uid, uid);
-    assert_eq!(cred_a.gid, gid);
+    assert_eq!(cred_a.uid(), uid);
+    assert_eq!(cred_a.gid(), gid);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/uds_datagram.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/uds_datagram.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/uds_datagram.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/uds_datagram.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,12 +2,15 @@
 #![cfg(feature = "full")]
 #![cfg(unix)]
 
+use futures::future::poll_fn;
+use tokio::io::ReadBuf;
 use tokio::net::UnixDatagram;
 use tokio::try_join;
 
 use std::io;
+use std::sync::Arc;
 
-async fn echo_server(mut socket: UnixDatagram) -> io::Result<()> {
+async fn echo_server(socket: UnixDatagram) -> io::Result<()> {
     let mut recv_buf = vec![0u8; 1024];
     loop {
         let (len, peer_addr) = socket.recv_from(&mut recv_buf[..]).await?;
@@ -32,7 +35,7 @@
     });
 
     {
-        let mut socket = UnixDatagram::bind(&client_path).unwrap();
+        let socket = UnixDatagram::bind(&client_path).unwrap();
         socket.connect(server_path)?;
         socket.send(b"ECHO").await?;
         let mut recv_buf = [0u8; 16];
@@ -43,6 +46,33 @@
     Ok(())
 }
 
+#[tokio::test]
+async fn echo_from() -> io::Result<()> {
+    let dir = tempfile::tempdir().unwrap();
+    let server_path = dir.path().join("server.sock");
+    let client_path = dir.path().join("client.sock");
+
+    let server_socket = UnixDatagram::bind(server_path.clone())?;
+
+    tokio::spawn(async move {
+        if let Err(e) = echo_server(server_socket).await {
+            eprintln!("Error in echo server: {}", e);
+        }
+    });
+
+    {
+        let socket = UnixDatagram::bind(&client_path).unwrap();
+        socket.connect(&server_path)?;
+        socket.send(b"ECHO").await?;
+        let mut recv_buf = [0u8; 16];
+        let (len, addr) = socket.recv_from(&mut recv_buf[..]).await?;
+        assert_eq!(&recv_buf[..len], b"ECHO");
+        assert_eq!(addr.as_pathname(), Some(server_path.as_path()));
+    }
+
+    Ok(())
+}
+
 // Even though we use sync non-blocking io we still need a reactor.
 #[tokio::test]
 async fn try_send_recv_never_block() -> io::Result<()> {
@@ -50,14 +80,19 @@
     let payload = b"PAYLOAD";
     let mut count = 0;
 
-    let (mut dgram1, mut dgram2) = UnixDatagram::pair()?;
+    let (dgram1, dgram2) = UnixDatagram::pair()?;
 
     // Send until we hit the OS `net.unix.max_dgram_qlen`.
     loop {
+        dgram1.writable().await.unwrap();
+
         match dgram1.try_send(payload) {
-            Err(err) => match err.kind() {
-                io::ErrorKind::WouldBlock | io::ErrorKind::Other => break,
-                _ => unreachable!("unexpected error {:?}", err),
+            Err(err) => match (err.kind(), err.raw_os_error()) {
+                (io::ErrorKind::WouldBlock, _) => break,
+                (_, Some(libc::ENOBUFS)) => break,
+                _ => {
+                    panic!("unexpected error {:?}", err);
+                }
             },
             Ok(len) => {
                 assert_eq!(len, payload.len());
@@ -68,6 +103,7 @@
 
     // Read every dgram we sent.
     while count > 0 {
+        dgram2.readable().await.unwrap();
         let len = dgram2.try_recv(&mut recv_buf[..])?;
         assert_eq!(len, payload.len());
         assert_eq!(payload, &recv_buf[..len]);
@@ -87,8 +123,8 @@
 async fn split() -> std::io::Result<()> {
     let dir = tempfile::tempdir().unwrap();
     let path = dir.path().join("split.sock");
-    let socket = UnixDatagram::bind(path.clone())?;
-    let (mut r, mut s) = socket.into_split();
+    let s = Arc::new(UnixDatagram::bind(path.clone())?);
+    let r = s.clone();
 
     let msg = b"hello";
     let ((), ()) = try_join! {
@@ -108,26 +144,187 @@
 }
 
 #[tokio::test]
-async fn reunite() -> std::io::Result<()> {
+async fn send_to_recv_from_poll() -> std::io::Result<()> {
+    let dir = tempfile::tempdir().unwrap();
+    let sender_path = dir.path().join("sender.sock");
+    let receiver_path = dir.path().join("receiver.sock");
+
+    let sender = UnixDatagram::bind(&sender_path)?;
+    let receiver = UnixDatagram::bind(&receiver_path)?;
+
+    let msg = b"hello";
+    poll_fn(|cx| sender.poll_send_to(cx, msg, &receiver_path)).await?;
+
+    let mut recv_buf = [0u8; 32];
+    let mut read = ReadBuf::new(&mut recv_buf);
+    let addr = poll_fn(|cx| receiver.poll_recv_from(cx, &mut read)).await?;
+
+    assert_eq!(read.filled(), msg);
+    assert_eq!(addr.as_pathname(), Some(sender_path.as_ref()));
+    Ok(())
+}
+
+#[tokio::test]
+async fn send_recv_poll() -> std::io::Result<()> {
     let dir = tempfile::tempdir().unwrap();
-    let path = dir.path().join("reunite.sock");
-    let socket = UnixDatagram::bind(path)?;
-    let (s, r) = socket.into_split();
-    assert!(s.reunite(r).is_ok());
+    let sender_path = dir.path().join("sender.sock");
+    let receiver_path = dir.path().join("receiver.sock");
+
+    let sender = UnixDatagram::bind(&sender_path)?;
+    let receiver = UnixDatagram::bind(&receiver_path)?;
+
+    sender.connect(&receiver_path)?;
+    receiver.connect(&sender_path)?;
+
+    let msg = b"hello";
+    poll_fn(|cx| sender.poll_send(cx, msg)).await?;
+
+    let mut recv_buf = [0u8; 32];
+    let mut read = ReadBuf::new(&mut recv_buf);
+    let _len = poll_fn(|cx| receiver.poll_recv(cx, &mut read)).await?;
+
+    assert_eq!(read.filled(), msg);
     Ok(())
 }
 
 #[tokio::test]
-async fn reunite_error() -> std::io::Result<()> {
+async fn try_send_to_recv_from() -> std::io::Result<()> {
     let dir = tempfile::tempdir().unwrap();
-    let path = dir.path().join("reunit.sock");
+    let server_path = dir.path().join("server.sock");
+    let client_path = dir.path().join("client.sock");
+
+    // Create listener
+    let server = UnixDatagram::bind(&server_path)?;
+
+    // Create socket pair
+    let client = UnixDatagram::bind(&client_path)?;
+
+    for _ in 0..5 {
+        loop {
+            client.writable().await?;
+
+            match client.try_send_to(b"hello world", &server_path) {
+                Ok(n) => {
+                    assert_eq!(n, 11);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+
+        loop {
+            server.readable().await?;
+
+            let mut buf = [0; 512];
+
+            match server.try_recv_from(&mut buf) {
+                Ok((n, addr)) => {
+                    assert_eq!(n, 11);
+                    assert_eq!(addr.as_pathname(), Some(client_path.as_ref()));
+                    assert_eq!(&buf[0..11], &b"hello world"[..]);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn try_recv_buf_from() -> std::io::Result<()> {
     let dir = tempfile::tempdir().unwrap();
-    let path1 = dir.path().join("reunit.sock");
-    let socket = UnixDatagram::bind(path)?;
-    let socket1 = UnixDatagram::bind(path1)?;
+    let server_path = dir.path().join("server.sock");
+    let client_path = dir.path().join("client.sock");
+
+    // Create listener
+    let server = UnixDatagram::bind(&server_path)?;
+
+    // Create socket pair
+    let client = UnixDatagram::bind(&client_path)?;
+
+    for _ in 0..5 {
+        loop {
+            client.writable().await?;
+
+            match client.try_send_to(b"hello world", &server_path) {
+                Ok(n) => {
+                    assert_eq!(n, 11);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+
+        loop {
+            server.readable().await?;
+
+            let mut buf = Vec::with_capacity(512);
+
+            match server.try_recv_buf_from(&mut buf) {
+                Ok((n, addr)) => {
+                    assert_eq!(n, 11);
+                    assert_eq!(addr.as_pathname(), Some(client_path.as_ref()));
+                    assert_eq!(&buf[0..11], &b"hello world"[..]);
+                    break;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("{:?}", e),
+            }
+        }
+    }
+
+    Ok(())
+}
+
+// Even though we use sync non-blocking io we still need a reactor.
+#[tokio::test]
+async fn try_recv_buf_never_block() -> io::Result<()> {
+    let payload = b"PAYLOAD";
+    let mut count = 0;
+
+    let (dgram1, dgram2) = UnixDatagram::pair()?;
+
+    // Send until we hit the OS `net.unix.max_dgram_qlen`.
+    loop {
+        dgram1.writable().await.unwrap();
+
+        match dgram1.try_send(payload) {
+            Err(err) => match (err.kind(), err.raw_os_error()) {
+                (io::ErrorKind::WouldBlock, _) => break,
+                (_, Some(libc::ENOBUFS)) => break,
+                _ => {
+                    panic!("unexpected error {:?}", err);
+                }
+            },
+            Ok(len) => {
+                assert_eq!(len, payload.len());
+            }
+        }
+        count += 1;
+    }
+
+    // Read every dgram we sent.
+    while count > 0 {
+        let mut recv_buf = Vec::with_capacity(16);
+
+        dgram2.readable().await.unwrap();
+        let len = dgram2.try_recv_buf(&mut recv_buf)?;
+        assert_eq!(len, payload.len());
+        assert_eq!(payload, &recv_buf[..len]);
+        count -= 1;
+    }
+
+    let mut recv_buf = vec![0; 16];
+    let err = dgram2.try_recv_from(&mut recv_buf).unwrap_err();
+    match err.kind() {
+        io::ErrorKind::WouldBlock => (),
+        _ => unreachable!("unexpected error {:?}", err),
+    }
 
-    let (s, _) = socket.into_split();
-    let (_, r1) = socket1.into_split();
-    assert!(s.reunite(r1).is_err());
     Ok(())
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/uds_split.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/uds_split.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/uds_split.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/uds_split.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,8 +2,8 @@
 #![cfg(feature = "full")]
 #![cfg(unix)]
 
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 use tokio::net::UnixStream;
-use tokio::prelude::*;
 
 /// Checks that `UnixStream` can be split into a read half and a write half using
 /// `UnixStream::split` and `UnixStream::split_mut`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/uds_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/uds_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio/tests/uds_stream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio/tests/uds_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,10 +2,14 @@
 #![warn(rust_2018_idioms)]
 #![cfg(unix)]
 
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use std::io;
+use std::task::Poll;
+
+use tokio::io::{AsyncReadExt, AsyncWriteExt, Interest};
 use tokio::net::{UnixListener, UnixStream};
+use tokio_test::{assert_ok, assert_pending, assert_ready_ok, task};
 
-use futures::future::try_join;
+use futures::future::{poll_fn, try_join};
 
 #[tokio::test]
 async fn accept_read_write() -> std::io::Result<()> {
@@ -15,7 +19,7 @@
         .unwrap();
     let sock_path = dir.path().join("connect.sock");
 
-    let mut listener = UnixListener::bind(&sock_path)?;
+    let listener = UnixListener::bind(&sock_path)?;
 
     let accept = listener.accept();
     let connect = UnixStream::connect(&sock_path);
@@ -42,7 +46,7 @@
         .unwrap();
     let sock_path = dir.path().join("connect.sock");
 
-    let mut listener = UnixListener::bind(&sock_path)?;
+    let listener = UnixListener::bind(&sock_path)?;
 
     let accept = listener.accept();
     let connect = UnixStream::connect(&sock_path);
@@ -56,3 +60,352 @@
     assert_eq!(n, 0);
     Ok(())
 }
+
+#[tokio::test]
+async fn try_read_write() -> std::io::Result<()> {
+    let msg = b"hello world";
+
+    let dir = tempfile::tempdir()?;
+    let bind_path = dir.path().join("bind.sock");
+
+    // Create listener
+    let listener = UnixListener::bind(&bind_path)?;
+
+    // Create socket pair
+    let client = UnixStream::connect(&bind_path).await?;
+
+    let (server, _) = listener.accept().await?;
+    let mut written = msg.to_vec();
+
+    // Track the server receiving data
+    let mut readable = task::spawn(server.readable());
+    assert_pending!(readable.poll());
+
+    // Write data.
+    client.writable().await?;
+    assert_eq!(msg.len(), client.try_write(msg)?);
+
+    // The task should be notified
+    while !readable.is_woken() {
+        tokio::task::yield_now().await;
+    }
+
+    // Fill the write buffer using non-vectored I/O
+    loop {
+        // Still ready
+        let mut writable = task::spawn(client.writable());
+        assert_ready_ok!(writable.poll());
+
+        match client.try_write(msg) {
+            Ok(n) => written.extend(&msg[..n]),
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                break;
+            }
+            Err(e) => panic!("error = {:?}", e),
+        }
+    }
+
+    {
+        // Write buffer full
+        let mut writable = task::spawn(client.writable());
+        assert_pending!(writable.poll());
+
+        // Drain the socket from the server end using non-vectored I/O
+        let mut read = vec![0; written.len()];
+        let mut i = 0;
+
+        while i < read.len() {
+            server.readable().await?;
+
+            match server.try_read(&mut read[i..]) {
+                Ok(n) => i += n,
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("error = {:?}", e),
+            }
+        }
+
+        assert_eq!(read, written);
+    }
+
+    written.clear();
+    client.writable().await.unwrap();
+
+    // Fill the write buffer using vectored I/O
+    let msg_bufs: Vec<_> = msg.chunks(3).map(io::IoSlice::new).collect();
+    loop {
+        // Still ready
+        let mut writable = task::spawn(client.writable());
+        assert_ready_ok!(writable.poll());
+
+        match client.try_write_vectored(&msg_bufs) {
+            Ok(n) => written.extend(&msg[..n]),
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                break;
+            }
+            Err(e) => panic!("error = {:?}", e),
+        }
+    }
+
+    {
+        // Write buffer full
+        let mut writable = task::spawn(client.writable());
+        assert_pending!(writable.poll());
+
+        // Drain the socket from the server end using vectored I/O
+        let mut read = vec![0; written.len()];
+        let mut i = 0;
+
+        while i < read.len() {
+            server.readable().await?;
+
+            let mut bufs: Vec<_> = read[i..]
+                .chunks_mut(0x10000)
+                .map(io::IoSliceMut::new)
+                .collect();
+            match server.try_read_vectored(&mut bufs) {
+                Ok(n) => i += n,
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("error = {:?}", e),
+            }
+        }
+
+        assert_eq!(read, written);
+    }
+
+    // Now, we listen for shutdown
+    drop(client);
+
+    loop {
+        let ready = server.ready(Interest::READABLE).await?;
+
+        if ready.is_read_closed() {
+            break;
+        } else {
+            tokio::task::yield_now().await;
+        }
+    }
+
+    Ok(())
+}
+
+async fn create_pair() -> (UnixStream, UnixStream) {
+    let dir = assert_ok!(tempfile::tempdir());
+    let bind_path = dir.path().join("bind.sock");
+
+    let listener = assert_ok!(UnixListener::bind(&bind_path));
+
+    let accept = listener.accept();
+    let connect = UnixStream::connect(&bind_path);
+    let ((server, _), client) = assert_ok!(try_join(accept, connect).await);
+
+    (client, server)
+}
+
+macro_rules! assert_readable_by_polling {
+    ($stream:expr) => {
+        assert_ok!(poll_fn(|cx| $stream.poll_read_ready(cx)).await);
+    };
+}
+
+macro_rules! assert_not_readable_by_polling {
+    ($stream:expr) => {
+        poll_fn(|cx| {
+            assert_pending!($stream.poll_read_ready(cx));
+            Poll::Ready(())
+        })
+        .await;
+    };
+}
+
+macro_rules! assert_writable_by_polling {
+    ($stream:expr) => {
+        assert_ok!(poll_fn(|cx| $stream.poll_write_ready(cx)).await);
+    };
+}
+
+macro_rules! assert_not_writable_by_polling {
+    ($stream:expr) => {
+        poll_fn(|cx| {
+            assert_pending!($stream.poll_write_ready(cx));
+            Poll::Ready(())
+        })
+        .await;
+    };
+}
+
+#[tokio::test]
+async fn poll_read_ready() {
+    let (mut client, mut server) = create_pair().await;
+
+    // Initial state - not readable.
+    assert_not_readable_by_polling!(server);
+
+    // There is data in the buffer - readable.
+    assert_ok!(client.write_all(b"ping").await);
+    assert_readable_by_polling!(server);
+
+    // Readable until calls to `poll_read` return `Poll::Pending`.
+    let mut buf = [0u8; 4];
+    assert_ok!(server.read_exact(&mut buf).await);
+    assert_readable_by_polling!(server);
+    read_until_pending(&mut server);
+    assert_not_readable_by_polling!(server);
+
+    // Detect the client disconnect.
+    drop(client);
+    assert_readable_by_polling!(server);
+}
+
+#[tokio::test]
+async fn poll_write_ready() {
+    let (mut client, server) = create_pair().await;
+
+    // Initial state - writable.
+    assert_writable_by_polling!(client);
+
+    // No space to write - not writable.
+    write_until_pending(&mut client);
+    assert_not_writable_by_polling!(client);
+
+    // Detect the server disconnect.
+    drop(server);
+    assert_writable_by_polling!(client);
+}
+
+fn read_until_pending(stream: &mut UnixStream) {
+    let mut buf = vec![0u8; 1024 * 1024];
+    loop {
+        match stream.try_read(&mut buf) {
+            Ok(_) => (),
+            Err(err) => {
+                assert_eq!(err.kind(), io::ErrorKind::WouldBlock);
+                break;
+            }
+        }
+    }
+}
+
+fn write_until_pending(stream: &mut UnixStream) {
+    let buf = vec![0u8; 1024 * 1024];
+    loop {
+        match stream.try_write(&buf) {
+            Ok(_) => (),
+            Err(err) => {
+                assert_eq!(err.kind(), io::ErrorKind::WouldBlock);
+                break;
+            }
+        }
+    }
+}
+
+#[tokio::test]
+async fn try_read_buf() -> std::io::Result<()> {
+    let msg = b"hello world";
+
+    let dir = tempfile::tempdir()?;
+    let bind_path = dir.path().join("bind.sock");
+
+    // Create listener
+    let listener = UnixListener::bind(&bind_path)?;
+
+    // Create socket pair
+    let client = UnixStream::connect(&bind_path).await?;
+
+    let (server, _) = listener.accept().await?;
+    let mut written = msg.to_vec();
+
+    // Track the server receiving data
+    let mut readable = task::spawn(server.readable());
+    assert_pending!(readable.poll());
+
+    // Write data.
+    client.writable().await?;
+    assert_eq!(msg.len(), client.try_write(msg)?);
+
+    // The task should be notified
+    while !readable.is_woken() {
+        tokio::task::yield_now().await;
+    }
+
+    // Fill the write buffer
+    loop {
+        // Still ready
+        let mut writable = task::spawn(client.writable());
+        assert_ready_ok!(writable.poll());
+
+        match client.try_write(msg) {
+            Ok(n) => written.extend(&msg[..n]),
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
+                break;
+            }
+            Err(e) => panic!("error = {:?}", e),
+        }
+    }
+
+    {
+        // Write buffer full
+        let mut writable = task::spawn(client.writable());
+        assert_pending!(writable.poll());
+
+        // Drain the socket from the server end
+        let mut read = Vec::with_capacity(written.len());
+        let mut i = 0;
+
+        while i < read.capacity() {
+            server.readable().await?;
+
+            match server.try_read_buf(&mut read) {
+                Ok(n) => i += n,
+                Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => continue,
+                Err(e) => panic!("error = {:?}", e),
+            }
+        }
+
+        assert_eq!(read, written);
+    }
+
+    // Now, we listen for shutdown
+    drop(client);
+
+    loop {
+        let ready = server.ready(Interest::READABLE).await?;
+
+        if ready.is_read_closed() {
+            break;
+        } else {
+            tokio::task::yield_now().await;
+        }
+    }
+
+    Ok(())
+}
+
+// https://github.com/tokio-rs/tokio/issues/3879
+#[tokio::test]
+#[cfg(not(target_os = "macos"))]
+async fn epollhup() -> io::Result<()> {
+    let dir = tempfile::Builder::new()
+        .prefix("tokio-uds-tests")
+        .tempdir()
+        .unwrap();
+    let sock_path = dir.path().join("connect.sock");
+
+    let listener = UnixListener::bind(&sock_path)?;
+    let connect = UnixStream::connect(&sock_path);
+    tokio::pin!(connect);
+
+    // Poll `connect` once.
+    poll_fn(|cx| {
+        use std::future::Future;
+
+        assert_pending!(connect.as_mut().poll(cx));
+        Poll::Ready(())
+    })
+    .await;
+
+    drop(listener);
+
+    let err = connect.await.unwrap_err();
+    assert_eq!(err.kind(), io::ErrorKind::ConnectionReset);
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"8a8a1d1a3df87d242be74c306f838f89ac0f9597596dcfd82cf42204acd988d5","Cargo.lock":"726dd940e0f6755e9f1f6784590bace47038c53b293b2ace749fe2898402ed98","Cargo.toml":"c312c7f824e557d2d89d31fa551c727b75cf25969bd1a5bc2c0aae72046eefde","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"c67dbbda2b1036378bc287ac7297156dabbdf2d557c363b2311abf7ff307ff52","examples/download-rust-lang.rs":"def23a173284d3712ec82db9ce5c760462754d89dddd8defd8e230409366c9de","examples/echo.rs":"f2afbd685532a9c1fcf07b20a6f071f0c499cb0c2398c105c3f568c8d225b391","examples/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","scripts/generate-certificate.sh":"a4b6225beb38a99b68b71ce9dcef6c64e7958687ef71117502bd005588aadab1","src/lib.rs":"475652d8434587a07e0bfa8098a93c2c2860bbb418b72dd4451693ebd107e54e","tests/bad.rs":"42ab60c1a04c58d80ee5aa26b2432feb2daab60314502a77fc27492b706da6ec","tests/cert.der":"4712b939fbcb42a6b5101b42139a25b14f81b418facabd378746f12f85cc6544","tests/google.rs":"90d1926e6a63cd7fd09043341e7c4d2c3afa922992e48a280b9bf6f090918a8a","tests/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","tests/root-ca.der":"063d70aef5de8fa5a9c35cdd46aea1cb4368ae50e99debd2049e7fa02568d7cc","tests/smoke.rs":"c05f9a44a552b9e349abe05f0224d1434d911632d13dac78bbd0377ecfa4d7ff"},"package":"f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,709 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "MacTypes-sys"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "bytes"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72"
+
+[[package]]
+name = "cc"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "core-foundation"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980"
+dependencies = [
+ "core-foundation-sys 0.5.1",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+dependencies = [
+ "core-foundation-sys 0.8.2",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+
+[[package]]
+name = "env_logger"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "futures"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+
+[[package]]
+name = "futures-task"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "futures-util"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project",
+ "pin-utils",
+ "proc-macro-hack",
+ "proc-macro-nested",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+
+[[package]]
+name = "log"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+dependencies = [
+ "cfg-if 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "mio"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b"
+dependencies = [
+ "libc",
+ "log",
+ "miow",
+ "ntapi",
+ "winapi",
+]
+
+[[package]]
+name = "miow"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
+dependencies = [
+ "socket2",
+ "winapi",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework 2.0.0",
+ "security-framework-sys 2.0.0",
+ "tempfile",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+
+[[package]]
+name = "openssl"
+version = "0.10.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "foreign-types",
+ "lazy_static",
+ "libc",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
+dependencies = [
+ "autocfg",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
+dependencies = [
+ "lazy_static",
+ "winapi",
+]
+
+[[package]]
+name = "security-framework"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfab8dda0e7a327c696d893df9ffa19cadc4bd195797997f5223cf5831beaf05"
+dependencies = [
+ "core-foundation 0.5.1",
+ "core-foundation-sys 0.5.1",
+ "libc",
+ "security-framework-sys 0.2.3",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.9.1",
+ "core-foundation-sys 0.8.2",
+ "libc",
+ "security-framework-sys 2.0.0",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc"
+dependencies = [
+ "MacTypes-sys",
+ "core-foundation-sys 0.5.1",
+ "libc",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
+dependencies = [
+ "core-foundation-sys 0.8.2",
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+
+[[package]]
+name = "socket2"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "rand",
+ "redox_syscall",
+ "remove_dir_all",
+ "winapi",
+]
+
+[[package]]
+name = "tokio"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f4bfdcbd00fa893ac0549b38aa27080636a0104b0d0c38475a99439405e1df8"
+dependencies = [
+ "autocfg",
+ "bytes",
+ "libc",
+ "memchr",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "tokio-macros",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42517d2975ca3114b22a16192634e8241dc5cc1f130be194645970cc1c371494"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.0"
+dependencies = [
+ "cfg-if 0.1.10",
+ "env_logger",
+ "futures",
+ "lazy_static",
+ "native-tls",
+ "openssl",
+ "schannel",
+ "security-framework 0.2.2",
+ "tempfile",
+ "tokio",
+ "tokio-util",
+ "winapi",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f3be913b74b13210c8fe04b17ab833f5a124f45b93d0f99f59fff621f64392a"
+dependencies = [
+ "async-stream",
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36135b7e7da911f5f8b9331209f7fab4cc13498f3fff52f72a710c78187e3148"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "log",
+ "pin-project-lite",
+ "slab",
+ "tokio",
+ "tokio-stream",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,64 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "tokio-native-tls"
+version = "0.3.0"
+authors = ["Tokio Contributors <team@tokio.rs>"]
+description = "An implementation of TLS/SSL streams for Tokio using native-tls giving an implementation of TLS\nfor nonblocking I/O streams.\n"
+homepage = "https://tokio.rs"
+documentation = "https://docs.rs/tokio-native-tls"
+categories = ["asynchronous", "network-programming"]
+license = "MIT"
+repository = "https://github.com/tokio-rs/tls"
+[package.metadata.docs.rs]
+all-features = true
+[dependencies.native-tls]
+version = "0.2"
+
+[dependencies.tokio]
+version = "1.0"
+[dev-dependencies.cfg-if]
+version = "0.1"
+
+[dev-dependencies.env_logger]
+version = "0.6"
+default-features = false
+
+[dev-dependencies.futures]
+version = "0.3.0"
+features = ["async-await"]
+
+[dev-dependencies.lazy_static]
+version = "1.4.0"
+
+[dev-dependencies.tempfile]
+version = "3.1"
+
+[dev-dependencies.tokio]
+version = "1.0"
+features = ["macros", "rt", "rt-multi-thread", "io-util", "net"]
+
+[dev-dependencies.tokio-util]
+version = "0.6.0"
+features = ["full"]
+[target."cfg(all(not(target_os = \"macos\"), not(windows), not(target_os = \"ios\")))".dev-dependencies.openssl]
+version = "0.10"
+[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dev-dependencies.security-framework]
+version = "0.2"
+[target."cfg(windows)".dev-dependencies.schannel]
+version = "0.1"
+
+[target."cfg(windows)".dev-dependencies.winapi]
+version = "0.3"
+features = ["lmcons", "basetsd", "minwinbase", "minwindef", "ntdef", "sysinfoapi", "timezoneapi", "wincrypt", "winerror"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+# 0.3.0 (December 23, 2020)
+
+- Upgrade to `tokio 1.0`.
+
+# 0.2.0 (October 16, 2020)
+
+- Upgrade to `tokio 0.3`.
+
+# 0.1.0 (January 9th, 2019)
+
+- Initial release from `tokio-tls 0.3`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/examples/download-rust-lang.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/examples/download-rust-lang.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/examples/download-rust-lang.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/examples/download-rust-lang.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,39 @@
+// #![warn(rust_2018_idioms)]
+
+use native_tls::TlsConnector;
+use std::error::Error;
+use std::net::ToSocketAddrs;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::TcpStream;
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
+    let addr = "www.rust-lang.org:443"
+        .to_socket_addrs()?
+        .next()
+        .ok_or("failed to resolve www.rust-lang.org")?;
+
+    let socket = TcpStream::connect(&addr).await?;
+    let cx = TlsConnector::builder().build()?;
+    let cx = tokio_native_tls::TlsConnector::from(cx);
+
+    let mut socket = cx.connect("www.rust-lang.org", socket).await?;
+
+    socket
+        .write_all(
+            "\
+             GET / HTTP/1.0\r\n\
+             Host: www.rust-lang.org\r\n\
+             \r\n\
+             "
+            .as_bytes(),
+        )
+        .await?;
+
+    let mut data = Vec::new();
+    socket.read_to_end(&mut data).await?;
+
+    // println!("data: {:?}", &data);
+    println!("{}", String::from_utf8_lossy(&data[..]));
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/examples/echo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/examples/echo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/examples/echo.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/examples/echo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,54 @@
+#![warn(rust_2018_idioms)]
+
+// A tiny async TLS echo server with Tokio
+use native_tls;
+use native_tls::Identity;
+use tokio;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::TcpListener;
+
+/**
+an example to setup a tls server.
+how to test:
+wget https://127.0.0.1:12345 --no-check-certificate
+*/
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // Bind the server's socket
+    let addr = "127.0.0.1:12345".to_string();
+    let tcp: TcpListener = TcpListener::bind(&addr).await?;
+
+    // Create the TLS acceptor.
+    let der = include_bytes!("identity.p12");
+    let cert = Identity::from_pkcs12(der, "mypass")?;
+    let tls_acceptor =
+        tokio_native_tls::TlsAcceptor::from(native_tls::TlsAcceptor::builder(cert).build()?);
+    loop {
+        // Asynchronously wait for an inbound socket.
+        let (socket, remote_addr) = tcp.accept().await?;
+        let tls_acceptor = tls_acceptor.clone();
+        println!("accept connection from {}", remote_addr);
+        tokio::spawn(async move {
+            // Accept the TLS connection.
+            let mut tls_stream = tls_acceptor.accept(socket).await.expect("accept error");
+            // In a loop, read data from the socket and write the data back.
+
+            let mut buf = [0; 1024];
+            let n = tls_stream
+                .read(&mut buf)
+                .await
+                .expect("failed to read data from socket");
+
+            if n == 0 {
+                return;
+            }
+            println!("read={}", unsafe {
+                String::from_utf8_unchecked(buf[0..n].into())
+            });
+            tls_stream
+                .write_all(&buf[0..n])
+                .await
+                .expect("failed to write data to socket");
+        });
+    }
+}
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/examples/identity.p12 and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/examples/identity.p12 differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2019 Tokio Contributors
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+# tokio-tls
+
+An implementation of TLS/SSL streams for Tokio built on top of the [`native-tls`
+crate]
+
+## License
+
+This project is licensed under the [MIT license](./LICENSE).
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in Tokio by you, shall be licensed as MIT, without any additional
+terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/scripts/generate-certificate.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/scripts/generate-certificate.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/scripts/generate-certificate.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/scripts/generate-certificate.sh	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,57 @@
+#!/bin/bash
+set -e
+
+cd $1
+
+# prepare config file for root CA generation
+cat <<EOF >> root.cnf
+[ req ]
+distinguished_name = req_dn
+[ req_dn ]
+[ v3_ca ]
+basicConstraints = CA:TRUE
+keyUsage = digitalSignature, nonRepudiation, keyCertSign, cRLSign
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always
+EOF
+
+ROOT_CA_KEY=root-ca.key.pem
+ROOT_CA=root-ca.pem
+ROOT_CA_DER=root-ca.der
+
+echo "Generate root CA key"
+openssl genrsa -out $ROOT_CA_KEY 4096
+
+echo "Generate root CA certificate"
+openssl req -x509 -new -key $ROOT_CA_KEY -out $ROOT_CA -days 365 -SHA256 -subj "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd" -config root.cnf -extensions v3_ca
+openssl x509 -outform der -in $ROOT_CA -out $ROOT_CA_DER
+
+rm root.cnf
+
+# prepare config file for server certificate generation
+cat <<EOF >> server.cnf
+extendedKeyUsage=serverAuth
+subjectAltName = @alt_names
+[alt_names]
+DNS.1 = foobar.com
+EOF
+
+
+SERVER_KEY=server.key.pem
+SERVER_CERT=cert.pem
+SERVER_CERT_DER=cert.der
+IDENTITY=identity.p12
+PASSPHRASE=mypass
+
+echo "Generate server key"
+openssl genrsa -out $SERVER_KEY 4096
+
+echo "Generate server certificate"
+openssl req -out server.csr -key $SERVER_KEY -new -days 365 -SHA256 -subj "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=foobar.com"
+openssl x509 -req -days 365 -SHA256 -in server.csr -CA $ROOT_CA -CAkey $ROOT_CA_KEY -CAcreateserial -out $SERVER_CERT -extfile server.cnf
+openssl x509 -outform der -in $SERVER_CERT -out $SERVER_CERT_DER
+
+openssl pkcs12 -export -out $IDENTITY -inkey $SERVER_KEY -in $SERVER_CERT -passout pass:$PASSPHRASE
+
+rm server.csr
+rm server.cnf
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,366 @@
+#![doc(html_root_url = "https://docs.rs/tokio-native-tls/0.3.0")]
+#![warn(
+    missing_debug_implementations,
+    missing_docs,
+    rust_2018_idioms,
+    unreachable_pub
+)]
+#![deny(broken_intra_doc_links)]
+#![doc(test(
+    no_crate_inject,
+    attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
+))]
+
+//! Async TLS streams
+//!
+//! This library is an implementation of TLS streams using the most appropriate
+//! system library by default for negotiating the connection. That is, on
+//! Windows this library uses SChannel, on OSX it uses SecureTransport, and on
+//! other platforms it uses OpenSSL.
+//!
+//! Each TLS stream implements the `Read` and `Write` traits to interact and
+//! interoperate with the rest of the futures I/O ecosystem. Client connections
+//! initiated from this crate verify hostnames automatically and by default.
+//!
+//! This crate primarily exports this ability through two newtypes,
+//! `TlsConnector` and `TlsAcceptor`. These newtypes augment the
+//! functionality provided by the `native-tls` crate, on which this crate is
+//! built. Configuration of TLS parameters is still primarily done through the
+//! `native-tls` crate.
+
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+
+use crate::native_tls::{Error, HandshakeError, MidHandshakeTlsStream};
+use std::fmt;
+use std::future::Future;
+use std::io::{self, Read, Write};
+use std::marker::Unpin;
+use std::pin::Pin;
+use std::ptr::null_mut;
+use std::task::{Context, Poll};
+
+/// An intermediate wrapper for the inner stream `S`.
+#[derive(Debug)]
+pub struct AllowStd<S> {
+    inner: S,
+    context: *mut (),
+}
+
+impl<S> AllowStd<S> {
+    /// Returns a shared reference to the inner stream.
+    pub fn get_ref(&self) -> &S {
+        &self.inner
+    }
+
+    /// Returns a mutable reference to the inner stream.
+    pub fn get_mut(&mut self) -> &mut S {
+        &mut self.inner
+    }
+}
+
+/// A wrapper around an underlying raw stream which implements the TLS or SSL
+/// protocol.
+///
+/// A `TlsStream<S>` represents a handshake that has been completed successfully
+/// and both the server and the client are ready for receiving and sending
+/// data. Bytes read from a `TlsStream` are decrypted from `S` and bytes written
+/// to a `TlsStream` are encrypted when passing through to `S`.
+#[derive(Debug)]
+pub struct TlsStream<S>(native_tls::TlsStream<AllowStd<S>>);
+
+/// A wrapper around a `native_tls::TlsConnector`, providing an async `connect`
+/// method.
+#[derive(Clone)]
+pub struct TlsConnector(native_tls::TlsConnector);
+
+/// A wrapper around a `native_tls::TlsAcceptor`, providing an async `accept`
+/// method.
+#[derive(Clone)]
+pub struct TlsAcceptor(native_tls::TlsAcceptor);
+
+struct MidHandshake<S>(Option<MidHandshakeTlsStream<AllowStd<S>>>);
+
+enum StartedHandshake<S> {
+    Done(TlsStream<S>),
+    Mid(MidHandshakeTlsStream<AllowStd<S>>),
+}
+
+struct StartedHandshakeFuture<F, S>(Option<StartedHandshakeFutureInner<F, S>>);
+struct StartedHandshakeFutureInner<F, S> {
+    f: F,
+    stream: S,
+}
+
+struct Guard<'a, S>(&'a mut TlsStream<S>)
+where
+    AllowStd<S>: Read + Write;
+
+impl<S> Drop for Guard<'_, S>
+where
+    AllowStd<S>: Read + Write,
+{
+    fn drop(&mut self) {
+        (self.0).0.get_mut().context = null_mut();
+    }
+}
+
+// *mut () context is neither Send nor Sync
+unsafe impl<S: Send> Send for AllowStd<S> {}
+unsafe impl<S: Sync> Sync for AllowStd<S> {}
+
+impl<S> AllowStd<S>
+where
+    S: Unpin,
+{
+    fn with_context<F, R>(&mut self, f: F) -> io::Result<R>
+    where
+        F: FnOnce(&mut Context<'_>, Pin<&mut S>) -> Poll<io::Result<R>>,
+    {
+        unsafe {
+            assert!(!self.context.is_null());
+            let waker = &mut *(self.context as *mut _);
+            match f(waker, Pin::new(&mut self.inner)) {
+                Poll::Ready(r) => r,
+                Poll::Pending => Err(io::Error::from(io::ErrorKind::WouldBlock)),
+            }
+        }
+    }
+}
+
+impl<S> Read for AllowStd<S>
+where
+    S: AsyncRead + Unpin,
+{
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let mut buf = ReadBuf::new(buf);
+        self.with_context(|ctx, stream| stream.poll_read(ctx, &mut buf))?;
+        Ok(buf.filled().len())
+    }
+}
+
+impl<S> Write for AllowStd<S>
+where
+    S: AsyncWrite + Unpin,
+{
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.with_context(|ctx, stream| stream.poll_write(ctx, buf))
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.with_context(|ctx, stream| stream.poll_flush(ctx))
+    }
+}
+
+impl<S> TlsStream<S> {
+    fn with_context<F, R>(&mut self, ctx: &mut Context<'_>, f: F) -> Poll<io::Result<R>>
+    where
+        F: FnOnce(&mut native_tls::TlsStream<AllowStd<S>>) -> io::Result<R>,
+        AllowStd<S>: Read + Write,
+    {
+        self.0.get_mut().context = ctx as *mut _ as *mut ();
+        let g = Guard(self);
+        match f(&mut (g.0).0) {
+            Ok(v) => Poll::Ready(Ok(v)),
+            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => Poll::Pending,
+            Err(e) => Poll::Ready(Err(e)),
+        }
+    }
+
+    /// Returns a shared reference to the inner stream.
+    pub fn get_ref(&self) -> &native_tls::TlsStream<AllowStd<S>>
+    where
+        S: AsyncRead + AsyncWrite + Unpin,
+    {
+        &self.0
+    }
+
+    /// Returns a mutable reference to the inner stream.
+    pub fn get_mut(&mut self) -> &mut native_tls::TlsStream<AllowStd<S>>
+    where
+        S: AsyncRead + AsyncWrite + Unpin,
+    {
+        &mut self.0
+    }
+}
+
+impl<S> AsyncRead for TlsStream<S>
+where
+    S: AsyncRead + AsyncWrite + Unpin,
+{
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        ctx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        self.with_context(ctx, |s| {
+            let n = s.read(buf.initialize_unfilled())?;
+            buf.advance(n);
+            Ok(())
+        })
+    }
+}
+
+impl<S> AsyncWrite for TlsStream<S>
+where
+    S: AsyncRead + AsyncWrite + Unpin,
+{
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        ctx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
+        self.with_context(ctx, |s| s.write(buf))
+    }
+
+    fn poll_flush(mut self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.with_context(ctx, |s| s.flush())
+    }
+
+    fn poll_shutdown(mut self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.with_context(ctx, |s| s.shutdown())
+    }
+}
+
+async fn handshake<F, S>(f: F, stream: S) -> Result<TlsStream<S>, Error>
+where
+    F: FnOnce(
+            AllowStd<S>,
+        ) -> Result<native_tls::TlsStream<AllowStd<S>>, HandshakeError<AllowStd<S>>>
+        + Unpin,
+    S: AsyncRead + AsyncWrite + Unpin,
+{
+    let start = StartedHandshakeFuture(Some(StartedHandshakeFutureInner { f, stream }));
+
+    match start.await {
+        Err(e) => Err(e),
+        Ok(StartedHandshake::Done(s)) => Ok(s),
+        Ok(StartedHandshake::Mid(s)) => MidHandshake(Some(s)).await,
+    }
+}
+
+impl<F, S> Future for StartedHandshakeFuture<F, S>
+where
+    F: FnOnce(
+            AllowStd<S>,
+        ) -> Result<native_tls::TlsStream<AllowStd<S>>, HandshakeError<AllowStd<S>>>
+        + Unpin,
+    S: Unpin,
+    AllowStd<S>: Read + Write,
+{
+    type Output = Result<StartedHandshake<S>, Error>;
+
+    fn poll(
+        mut self: Pin<&mut Self>,
+        ctx: &mut Context<'_>,
+    ) -> Poll<Result<StartedHandshake<S>, Error>> {
+        let inner = self.0.take().expect("future polled after completion");
+        let stream = AllowStd {
+            inner: inner.stream,
+            context: ctx as *mut _ as *mut (),
+        };
+
+        match (inner.f)(stream) {
+            Ok(mut s) => {
+                s.get_mut().context = null_mut();
+                Poll::Ready(Ok(StartedHandshake::Done(TlsStream(s))))
+            }
+            Err(HandshakeError::WouldBlock(mut s)) => {
+                s.get_mut().context = null_mut();
+                Poll::Ready(Ok(StartedHandshake::Mid(s)))
+            }
+            Err(HandshakeError::Failure(e)) => Poll::Ready(Err(e)),
+        }
+    }
+}
+
+impl TlsConnector {
+    /// Connects the provided stream with this connector, assuming the provided
+    /// domain.
+    ///
+    /// This function will internally call `TlsConnector::connect` to connect
+    /// the stream and returns a future representing the resolution of the
+    /// connection operation. The returned future will resolve to either
+    /// `TlsStream<S>` or `Error` depending if it's successful or not.
+    ///
+    /// This is typically used for clients who have already established, for
+    /// example, a TCP connection to a remote server. That stream is then
+    /// provided here to perform the client half of a connection to a
+    /// TLS-powered server.
+    pub async fn connect<S>(&self, domain: &str, stream: S) -> Result<TlsStream<S>, Error>
+    where
+        S: AsyncRead + AsyncWrite + Unpin,
+    {
+        handshake(move |s| self.0.connect(domain, s), stream).await
+    }
+}
+
+impl fmt::Debug for TlsConnector {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("TlsConnector").finish()
+    }
+}
+
+impl From<native_tls::TlsConnector> for TlsConnector {
+    fn from(inner: native_tls::TlsConnector) -> TlsConnector {
+        TlsConnector(inner)
+    }
+}
+
+impl TlsAcceptor {
+    /// Accepts a new client connection with the provided stream.
+    ///
+    /// This function will internally call `TlsAcceptor::accept` to connect
+    /// the stream and returns a future representing the resolution of the
+    /// connection operation. The returned future will resolve to either
+    /// `TlsStream<S>` or `Error` depending if it's successful or not.
+    ///
+    /// This is typically used after a new socket has been accepted from a
+    /// `TcpListener`. That socket is then passed to this function to perform
+    /// the server half of accepting a client connection.
+    pub async fn accept<S>(&self, stream: S) -> Result<TlsStream<S>, Error>
+    where
+        S: AsyncRead + AsyncWrite + Unpin,
+    {
+        handshake(move |s| self.0.accept(s), stream).await
+    }
+}
+
+impl fmt::Debug for TlsAcceptor {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("TlsAcceptor").finish()
+    }
+}
+
+impl From<native_tls::TlsAcceptor> for TlsAcceptor {
+    fn from(inner: native_tls::TlsAcceptor) -> TlsAcceptor {
+        TlsAcceptor(inner)
+    }
+}
+
+impl<S: AsyncRead + AsyncWrite + Unpin> Future for MidHandshake<S> {
+    type Output = Result<TlsStream<S>, Error>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let mut_self = self.get_mut();
+        let mut s = mut_self.0.take().expect("future polled after completion");
+
+        s.get_mut().context = cx as *mut _ as *mut ();
+        match s.handshake() {
+            Ok(mut s) => {
+                s.get_mut().context = null_mut();
+                Poll::Ready(Ok(TlsStream(s)))
+            }
+            Err(HandshakeError::WouldBlock(mut s)) => {
+                s.get_mut().context = null_mut();
+                mut_self.0 = Some(s);
+                Poll::Pending
+            }
+            Err(HandshakeError::Failure(e)) => Poll::Ready(Err(e)),
+        }
+    }
+}
+
+/// re-export native_tls
+pub mod native_tls {
+    pub use native_tls::*;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/bad.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/bad.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/bad.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/bad.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,123 @@
+#![warn(rust_2018_idioms)]
+
+use cfg_if::cfg_if;
+use env_logger;
+use native_tls::TlsConnector;
+use std::io::{self, Error};
+use std::net::ToSocketAddrs;
+use tokio::net::TcpStream;
+
+macro_rules! t {
+    ($e:expr) => {
+        match $e {
+            Ok(e) => e,
+            Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
+        }
+    };
+}
+
+cfg_if! {
+    if #[cfg(feature = "force-rustls")] {
+        fn verify_failed(err: &Error, s:  &str) {
+            let err = err.to_string();
+            assert!(err.contains(s), "bad error: {}", err);
+        }
+
+        fn assert_expired_error(err: &Error) {
+            verify_failed(err, "CertExpired");
+        }
+
+        fn assert_wrong_host(err: &Error) {
+            verify_failed(err, "CertNotValidForName");
+        }
+
+        fn assert_self_signed(err: &Error) {
+            verify_failed(err, "UnknownIssuer");
+        }
+
+        fn assert_untrusted_root(err: &Error) {
+            verify_failed(err, "UnknownIssuer");
+        }
+    } else if #[cfg(any(feature = "force-openssl",
+                        all(not(target_os = "macos"),
+                            not(target_os = "windows"),
+                            not(target_os = "ios"))))] {
+        fn verify_failed(err: &Error) {
+            assert!(format!("{}", err).contains("certificate verify failed"))
+        }
+
+        use verify_failed as assert_expired_error;
+        use verify_failed as assert_wrong_host;
+        use verify_failed as assert_self_signed;
+        use verify_failed as assert_untrusted_root;
+    } else if #[cfg(any(target_os = "macos", target_os = "ios"))] {
+
+        fn assert_invalid_cert_chain(err: &Error) {
+            assert!(format!("{}", err).contains("was not trusted."))
+        }
+
+        use crate::assert_invalid_cert_chain as assert_expired_error;
+        use crate::assert_invalid_cert_chain as assert_wrong_host;
+        use crate::assert_invalid_cert_chain as assert_self_signed;
+        use crate::assert_invalid_cert_chain as assert_untrusted_root;
+    } else {
+        fn assert_expired_error(err: &Error) {
+            let s = err.to_string();
+            assert!(s.contains("system clock"), "error = {:?}", s);
+        }
+
+        fn assert_wrong_host(err: &Error) {
+            let s = err.to_string();
+            assert!(s.contains("CN name"), "error = {:?}", s);
+        }
+
+        fn assert_self_signed(err: &Error) {
+            let s = err.to_string();
+            assert!(s.contains("root certificate which is not trusted"), "error = {:?}", s);
+        }
+
+        use assert_self_signed as assert_untrusted_root;
+    }
+}
+
+async fn get_host(host: &'static str) -> Error {
+    drop(env_logger::try_init());
+
+    let addr = format!("{}:443", host);
+    let addr = t!(addr.to_socket_addrs()).next().unwrap();
+
+    let socket = t!(TcpStream::connect(&addr).await);
+    let builder = TlsConnector::builder();
+    let cx = t!(builder.build());
+    let cx = tokio_native_tls::TlsConnector::from(cx);
+    let res = cx
+        .connect(host, socket)
+        .await
+        .map_err(|e| Error::new(io::ErrorKind::Other, e));
+
+    assert!(res.is_err());
+    res.err().unwrap()
+}
+
+#[tokio::test]
+async fn expired() {
+    assert_expired_error(&get_host("expired.badssl.com").await)
+}
+
+// TODO: the OSX builders on Travis apparently fail this tests spuriously?
+//       passes locally though? Seems... bad!
+#[tokio::test]
+#[cfg_attr(all(target_os = "macos", feature = "force-openssl"), ignore)]
+async fn wrong_host() {
+    assert_wrong_host(&get_host("wrong.host.badssl.com").await)
+}
+
+#[tokio::test]
+async fn self_signed() {
+    assert_self_signed(&get_host("self-signed.badssl.com").await)
+}
+
+#[tokio::test]
+async fn untrusted_root() {
+    assert_untrusted_root(&get_host("untrusted-root.badssl.com").await)
+}
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/cert.der and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/cert.der differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/google.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/google.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/google.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/google.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,101 @@
+#![warn(rust_2018_idioms)]
+
+use cfg_if::cfg_if;
+use env_logger;
+use native_tls;
+use native_tls::TlsConnector;
+use std::io;
+use std::net::ToSocketAddrs;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::TcpStream;
+
+macro_rules! t {
+    ($e:expr) => {
+        match $e {
+            Ok(e) => e,
+            Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
+        }
+    };
+}
+
+cfg_if! {
+    if #[cfg(feature = "force-rustls")] {
+        fn assert_bad_hostname_error(err: &io::Error) {
+            let err = err.to_string();
+            assert!(err.contains("CertNotValidForName"), "bad error: {}", err);
+        }
+    } else if #[cfg(any(feature = "force-openssl",
+                        all(not(target_os = "macos"),
+                            not(target_os = "windows"),
+                            not(target_os = "ios"))))] {
+        fn assert_bad_hostname_error(err: &io::Error) {
+            let err = err.get_ref().unwrap();
+            let err = err.downcast_ref::<native_tls::Error>().unwrap();
+            assert!(format!("{}", err).contains("certificate verify failed"));
+        }
+    } else if #[cfg(any(target_os = "macos", target_os = "ios"))] {
+        fn assert_bad_hostname_error(err: &io::Error) {
+            let err = err.get_ref().unwrap();
+            let err = err.downcast_ref::<native_tls::Error>().unwrap();
+            assert!(format!("{}", err).contains("was not trusted."));
+        }
+    } else {
+        fn assert_bad_hostname_error(err: &io::Error) {
+            let err = err.get_ref().unwrap();
+            let err = err.downcast_ref::<native_tls::Error>().unwrap();
+            assert!(format!("{}", err).contains("CN name"));
+        }
+    }
+}
+
+#[tokio::test]
+async fn fetch_google() {
+    drop(env_logger::try_init());
+
+    // First up, resolve google.com
+    let addr = t!("google.com:443".to_socket_addrs()).next().unwrap();
+
+    let socket = TcpStream::connect(&addr).await.unwrap();
+
+    // Send off the request by first negotiating an SSL handshake, then writing
+    // of our request, then flushing, then finally read off the response.
+    let builder = TlsConnector::builder();
+    let connector = t!(builder.build());
+    let connector = tokio_native_tls::TlsConnector::from(connector);
+    let mut socket = t!(connector.connect("google.com", socket).await);
+    t!(socket.write_all(b"GET / HTTP/1.0\r\n\r\n").await);
+    let mut data = Vec::new();
+    t!(socket.read_to_end(&mut data).await);
+
+    // any response code is fine
+    assert!(data.starts_with(b"HTTP/1.0 "));
+
+    let data = String::from_utf8_lossy(&data);
+    let data = data.trim_end();
+    assert!(data.ends_with("</html>") || data.ends_with("</HTML>"));
+}
+
+fn native2io(e: native_tls::Error) -> io::Error {
+    io::Error::new(io::ErrorKind::Other, e)
+}
+
+// see comment in bad.rs for ignore reason
+#[cfg_attr(all(target_os = "macos", feature = "force-openssl"), ignore)]
+#[tokio::test]
+async fn wrong_hostname_error() {
+    drop(env_logger::try_init());
+
+    let addr = t!("google.com:443".to_socket_addrs()).next().unwrap();
+
+    let socket = t!(TcpStream::connect(&addr).await);
+    let builder = TlsConnector::builder();
+    let connector = t!(builder.build());
+    let connector = tokio_native_tls::TlsConnector::from(connector);
+    let res = connector
+        .connect("rust-lang.org", socket)
+        .await
+        .map_err(native2io);
+
+    assert!(res.is_err());
+    assert_bad_hostname_error(&res.err().unwrap());
+}
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/identity.p12 and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/identity.p12 differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/root-ca.der and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/root-ca.der differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/smoke.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/smoke.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-native-tls/tests/smoke.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-native-tls/tests/smoke.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,172 @@
+use futures::join;
+use lazy_static::lazy_static;
+use native_tls::{Certificate, Identity};
+use std::{fs, io::Error, path::PathBuf, process::Command};
+use tokio::{
+    io::{AsyncReadExt, AsyncWrite, AsyncWriteExt},
+    net::{TcpListener, TcpStream},
+};
+use tokio_native_tls::{TlsAcceptor, TlsConnector};
+
+lazy_static! {
+    static ref CERT_DIR: PathBuf = {
+        if cfg!(unix) {
+            let dir = tempfile::TempDir::new().unwrap();
+            let path = dir.path().to_str().unwrap();
+
+            Command::new("sh")
+                .arg("-c")
+                .arg(format!("./scripts/generate-certificate.sh {}", path))
+                .output()
+                .expect("failed to execute process");
+
+            dir.into_path()
+        } else {
+            PathBuf::from("tests")
+        }
+    };
+}
+
+#[tokio::test]
+async fn client_to_server() {
+    let srv = TcpListener::bind("127.0.0.1:0").await.unwrap();
+    let addr = srv.local_addr().unwrap();
+
+    let (server_tls, client_tls) = context();
+
+    // Create a future to accept one socket, connect the ssl stream, and then
+    // read all the data from it.
+    let server = async move {
+        let (socket, _) = srv.accept().await.unwrap();
+        let mut socket = server_tls.accept(socket).await.unwrap();
+
+        // Verify access to all of the nested inner streams (e.g. so that peer
+        // certificates can be accessed). This is just a compile check.
+        let native_tls_stream: &native_tls::TlsStream<_> = socket.get_ref();
+        let _peer_cert = native_tls_stream.peer_certificate().unwrap();
+        let allow_std_stream: &tokio_native_tls::AllowStd<_> = native_tls_stream.get_ref();
+        let _tokio_tcp_stream: &tokio::net::TcpStream = allow_std_stream.get_ref();
+
+        let mut data = Vec::new();
+        socket.read_to_end(&mut data).await.unwrap();
+        data
+    };
+
+    // Create a future to connect to our server, connect the ssl stream, and
+    // then write a bunch of data to it.
+    let client = async move {
+        let socket = TcpStream::connect(&addr).await.unwrap();
+        let socket = client_tls.connect("foobar.com", socket).await.unwrap();
+        copy_data(socket).await
+    };
+
+    // Finally, run everything!
+    let (data, _) = join!(server, client);
+    // assert_eq!(amt, AMT);
+    assert!(data == vec![9; AMT]);
+}
+
+#[tokio::test]
+async fn server_to_client() {
+    // Create a server listening on a port, then figure out what that port is
+    let srv = TcpListener::bind("127.0.0.1:0").await.unwrap();
+    let addr = srv.local_addr().unwrap();
+
+    let (server_tls, client_tls) = context();
+
+    let server = async move {
+        let (socket, _) = srv.accept().await.unwrap();
+        let socket = server_tls.accept(socket).await.unwrap();
+        copy_data(socket).await
+    };
+
+    let client = async move {
+        let socket = TcpStream::connect(&addr).await.unwrap();
+        let mut socket = client_tls.connect("foobar.com", socket).await.unwrap();
+        let mut data = Vec::new();
+        socket.read_to_end(&mut data).await.unwrap();
+        data
+    };
+
+    // Finally, run everything!
+    let (_, data) = join!(server, client);
+    assert!(data == vec![9; AMT]);
+}
+
+#[tokio::test]
+async fn one_byte_at_a_time() {
+    const AMT: usize = 1024;
+
+    let srv = TcpListener::bind("127.0.0.1:0").await.unwrap();
+    let addr = srv.local_addr().unwrap();
+
+    let (server_tls, client_tls) = context();
+
+    let server = async move {
+        let (socket, _) = srv.accept().await.unwrap();
+        let mut socket = server_tls.accept(socket).await.unwrap();
+        let mut amt = 0;
+        for b in std::iter::repeat(9).take(AMT) {
+            let data = [b as u8];
+            socket.write_all(&data).await.unwrap();
+            amt += 1;
+        }
+        amt
+    };
+
+    let client = async move {
+        let socket = TcpStream::connect(&addr).await.unwrap();
+        let mut socket = client_tls.connect("foobar.com", socket).await.unwrap();
+        let mut data = Vec::new();
+        loop {
+            let mut buf = [0; 1];
+            match socket.read_exact(&mut buf).await {
+                Ok(_) => data.extend_from_slice(&buf),
+                Err(ref err) if err.kind() == std::io::ErrorKind::UnexpectedEof => break,
+                Err(err) => panic!(err),
+            }
+        }
+        data
+    };
+
+    let (amt, data) = join!(server, client);
+    assert_eq!(amt, AMT);
+    assert!(data == vec![9; AMT as usize]);
+}
+
+fn context() -> (TlsAcceptor, TlsConnector) {
+    let pkcs12 = fs::read(CERT_DIR.join("identity.p12")).unwrap();
+    let der = fs::read(CERT_DIR.join("root-ca.der")).unwrap();
+
+    let identity = Identity::from_pkcs12(&pkcs12, "mypass").unwrap();
+    let acceptor = native_tls::TlsAcceptor::builder(identity).build().unwrap();
+
+    let cert = Certificate::from_der(&der).unwrap();
+    let connector = native_tls::TlsConnector::builder()
+        .add_root_certificate(cert)
+        .build()
+        .unwrap();
+
+    (acceptor.into(), connector.into())
+}
+
+const AMT: usize = 128 * 1024;
+
+async fn copy_data<W: AsyncWrite + Unpin>(mut w: W) -> Result<usize, Error> {
+    let mut data = vec![9; AMT as usize];
+    let mut amt = 0;
+    while !data.is_empty() {
+        let written = w.write(&data).await?;
+        if written <= data.len() {
+            amt += written;
+            data.resize(data.len() - written, 0);
+        } else {
+            w.write_all(&data).await?;
+            amt += data.len();
+            break;
+        }
+
+        println!("remaining: {}", data.len());
+    }
+    Ok(amt)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"34ca47fe04180ac270860fd68e5c1d978ebca92384c056f47abad1da415653dc","Cargo.lock":"dec145811a923324b3b9d4aa74875d6ac957262783a26f53c4e952430b8fe121","Cargo.toml":"bf70f46cbd54476b4856e313c314cf1b2b56725fbc5f7efca62d6cc10bf64fd8","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"f541719dbf6a4122ba15b07de784f324e48dc345765adb39564adb1f51ac17ce","examples/download-rust-lang.rs":"53a1884a1c733270b84e80c74c30ca087172f853b7b82b383aaef1303e8c8c3a","examples/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","examples/tls-echo.rs":"abdbf7b1fca6abc0fe8e4f8aef3101da55653303b3662f75aad5dd8c7cf61d68","src/lib.rs":"a73820a6c6082e8866bd10621a319b500b077784c5c357a2cb5c992c8c521a3c","tests/bad.rs":"8f92aae082ad5c000589e85b00f71f2e147a2408e69120b7091d2b34e1c20e44","tests/google.rs":"99cadf6edf64acf66541133fe96529b0c2d7285933b8b5a2eb2b3a0b0139f267","tests/smoke.rs":"5cc3af65f3e120134709118d2f1fad25c81bd22cb0bbbafcc58d257b67f328ba"},"package":"9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,686 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "MacTypes-sys"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "bytes"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
-
-[[package]]
-name = "cc"
-version = "1.0.52"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "core-foundation"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980"
-dependencies = [
- "core-foundation-sys 0.5.1",
- "libc",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-
-[[package]]
-name = "env_logger"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
-
-[[package]]
-name = "futures-task"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
-
-[[package]]
-name = "futures-util"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
- "slab",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
-
-[[package]]
-name = "log"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "memchr"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-
-[[package]]
-name = "mio"
-version = "0.6.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
-dependencies = [
- "cfg-if",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio-uds"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
-dependencies = [
- "iovec",
- "libc",
- "mio",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework 0.4.3",
- "security-framework-sys 0.4.3",
- "tempfile",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
-dependencies = [
- "cfg-if",
- "libc",
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types",
- "lazy_static",
- "libc",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-dependencies = [
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19"
-dependencies = [
- "lazy_static",
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "security-framework"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfab8dda0e7a327c696d893df9ffa19cadc4bd195797997f5223cf5831beaf05"
-dependencies = [
- "core-foundation 0.5.1",
- "core-foundation-sys 0.5.1",
- "libc",
- "security-framework-sys 0.2.3",
-]
-
-[[package]]
-name = "security-framework"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620"
-dependencies = [
- "bitflags",
- "core-foundation 0.7.0",
- "core-foundation-sys 0.7.0",
- "libc",
- "security-framework-sys 0.4.3",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc"
-dependencies = [
- "MacTypes-sys",
- "core-foundation-sys 0.5.1",
- "libc",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-
-[[package]]
-name = "syn"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-dependencies = [
- "cfg-if",
- "libc",
- "rand",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "tokio"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05c1d570eb1a36f0345a5ce9c6c6e665b70b73d11236912c0b477616aeec47b1"
-dependencies = [
- "bytes",
- "futures-core",
- "iovec",
- "lazy_static",
- "libc",
- "memchr",
- "mio",
- "mio-uds",
- "pin-project-lite",
- "tokio-macros",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-tls"
-version = "0.3.1"
-dependencies = [
- "cfg-if",
- "env_logger",
- "futures",
- "native-tls",
- "openssl",
- "schannel",
- "security-framework 0.2.2",
- "tokio",
- "tokio-util",
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-io",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "tokio-tls"
-version = "0.3.1"
-authors = ["Tokio Contributors <team@tokio.rs>"]
-description = "Deprecated in favor of `tokio-naitve-tls`.\n\nAn implementation of TLS/SSL streams for Tokio giving an implementation of TLS\nfor nonblocking I/O streams.\n"
-homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio-tls/0.3.1/tokio_tls/"
-categories = ["asynchronous", "network-programming"]
-license = "MIT"
-repository = "https://github.com/tokio-rs/tokio"
-[package.metadata.docs.rs]
-all-features = true
-[dependencies.native-tls]
-version = "0.2"
-
-[dependencies.tokio]
-version = "0.2.0"
-[dev-dependencies.cfg-if]
-version = "0.1"
-
-[dev-dependencies.env_logger]
-version = "0.6"
-default-features = false
-
-[dev-dependencies.futures]
-version = "0.3.0"
-features = ["async-await"]
-
-[dev-dependencies.tokio]
-version = "0.2.0"
-features = ["macros", "stream", "rt-core", "io-util", "net"]
-
-[dev-dependencies.tokio-util]
-version = "0.3.0"
-features = ["full"]
-[target."cfg(all(not(target_os = \"macos\"), not(windows), not(target_os = \"ios\")))".dev-dependencies.openssl]
-version = "0.10"
-[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dev-dependencies.security-framework]
-version = "0.2"
-[target."cfg(windows)".dev-dependencies.schannel]
-version = "0.1"
-
-[target."cfg(windows)".dev-dependencies.winapi]
-version = "0.3"
-features = ["lmcons", "basetsd", "minwinbase", "minwindef", "ntdef", "sysinfoapi", "timezoneapi", "wincrypt", "winerror"]
-[badges.travis-ci]
-repository = "tokio-rs/tokio-tls"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# 0.3.1 (April 4, 2020)
-
-- Deprecate crate in favor of `tokio-native-tls`.
-
-# 0.3.0 (November 26, 2019)
-
-- Updates for tokio 0.2 release.
-
-# 0.3.0-alpha.6 (September 30, 2019)
-
-- Move to `futures-*-preview 0.3.0-alpha.19`.
-- Move to `pin-project 0.4`.
-
-# 0.3.0-alpha.5 (September 19, 2019)
-
-### Added
-- `TlsStream::get_ref` and `TlsStream::get_mut` ([#1537]).
-
-# 0.3.0-alpha.4 (August 30, 2019)
-
-### Changed
-- Track `tokio` 0.2.0-alpha.4.
-
-# 0.3.0-alpha.2 (August 17, 2019)
-
-### Changed
-- Update `futures` dependency to 0.3.0-alpha.18.
-
-# 0.3.0-alpha.1 (August 8, 2019)
-
-### Changed
-- Switch to `async`, `await`, and `std::future`.
-
-# 0.2.1 (January 6, 2019)
-
-* Implement `Clone` for `TlsConnector` and `TlsAcceptor` ([#777])
-
-# 0.2.0 (August 8, 2018)
-
-* Initial release with `tokio` support.
-
-[#1537]: https://github.com/tokio-rs/tokio/pull/1537
-[#777]:  https://github.com/tokio-rs/tokio/pull/777
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/examples/download-rust-lang.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/examples/download-rust-lang.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/examples/download-rust-lang.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/examples/download-rust-lang.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// #![warn(rust_2018_idioms)]
-
-use native_tls::TlsConnector;
-use std::error::Error;
-use std::net::ToSocketAddrs;
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use tokio::net::TcpStream;
-use tokio_tls;
-
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
-    let addr = "www.rust-lang.org:443"
-        .to_socket_addrs()?
-        .next()
-        .ok_or("failed to resolve www.rust-lang.org")?;
-
-    let socket = TcpStream::connect(&addr).await?;
-    let cx = TlsConnector::builder().build()?;
-    let cx = tokio_tls::TlsConnector::from(cx);
-
-    let mut socket = cx.connect("www.rust-lang.org", socket).await?;
-
-    socket
-        .write_all(
-            "\
-             GET / HTTP/1.0\r\n\
-             Host: www.rust-lang.org\r\n\
-             \r\n\
-             "
-            .as_bytes(),
-        )
-        .await?;
-
-    let mut data = Vec::new();
-    socket.read_to_end(&mut data).await?;
-
-    // println!("data: {:?}", &data);
-    println!("{}", String::from_utf8_lossy(&data[..]));
-    Ok(())
-}
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/examples/identity.p12 and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/examples/identity.p12 differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/examples/tls-echo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/examples/tls-echo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/examples/tls-echo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/examples/tls-echo.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-#![warn(rust_2018_idioms)]
-
-// A tiny async TLS echo server with Tokio
-use native_tls;
-use native_tls::Identity;
-use tokio;
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use tokio::net::TcpListener;
-use tokio_tls;
-
-/**
-an example to setup a tls server.
-how to test:
-wget https://127.0.0.1:12345 --no-check-certificate
-*/
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // Bind the server's socket
-    let addr = "127.0.0.1:12345".to_string();
-    let mut tcp: TcpListener = TcpListener::bind(&addr).await?;
-
-    // Create the TLS acceptor.
-    let der = include_bytes!("identity.p12");
-    let cert = Identity::from_pkcs12(der, "mypass")?;
-    let tls_acceptor =
-        tokio_tls::TlsAcceptor::from(native_tls::TlsAcceptor::builder(cert).build()?);
-    loop {
-        // Asynchronously wait for an inbound socket.
-        let (socket, remote_addr) = tcp.accept().await?;
-        let tls_acceptor = tls_acceptor.clone();
-        println!("accept connection from {}", remote_addr);
-        tokio::spawn(async move {
-            // Accept the TLS connection.
-            let mut tls_stream = tls_acceptor.accept(socket).await.expect("accept error");
-            // In a loop, read data from the socket and write the data back.
-
-            let mut buf = [0; 1024];
-            let n = tls_stream
-                .read(&mut buf)
-                .await
-                .expect("failed to read data from socket");
-
-            if n == 0 {
-                return;
-            }
-            println!("read={}", unsafe {
-                String::from_utf8_unchecked(buf[0..n].into())
-            });
-            tls_stream
-                .write_all(&buf[0..n])
-                .await
-                .expect("failed to write data to socket");
-        });
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2019 Tokio Contributors
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-# tokio-tls
-
-**Deprecated** in favor of `tokio-native-tls`.
-
-An implementation of TLS/SSL streams for Tokio built on top of the [`native-tls`
-crate]
-
-## License
-
-This project is licensed under the [MIT license](./LICENSE).
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Tokio by you, shall be licensed as MIT, without any additional
-terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,364 +0,0 @@
-#![doc(html_root_url = "https://docs.rs/tokio-tls/0.3.1")]
-#![warn(
-    missing_debug_implementations,
-    missing_docs,
-    rust_2018_idioms,
-    unreachable_pub
-)]
-#![deny(intra_doc_link_resolution_failure)]
-#![doc(test(
-    no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
-))]
-
-//! Async TLS streams
-//!
-//! > **Note:** This crate is **deprecated** and has been moved
-//! into the [`tokio-native-tls`] crate.
-//!
-//! This library is an implementation of TLS streams using the most appropriate
-//! system library by default for negotiating the connection. That is, on
-//! Windows this library uses SChannel, on OSX it uses SecureTransport, and on
-//! other platforms it uses OpenSSL.
-//!
-//! Each TLS stream implements the `Read` and `Write` traits to interact and
-//! interoperate with the rest of the futures I/O ecosystem. Client connections
-//! initiated from this crate verify hostnames automatically and by default.
-//!
-//! This crate primarily exports this ability through two newtypes,
-//! `TlsConnector` and `TlsAcceptor`. These newtypes augment the
-//! functionality provided by the `native-tls` crate, on which this crate is
-//! built. Configuration of TLS parameters is still primarily done through the
-//! `native-tls` crate.
-
-use tokio::io::{AsyncRead, AsyncWrite};
-
-use native_tls::{Error, HandshakeError, MidHandshakeTlsStream};
-use std::fmt;
-use std::future::Future;
-use std::io::{self, Read, Write};
-use std::marker::Unpin;
-use std::mem::MaybeUninit;
-use std::pin::Pin;
-use std::ptr::null_mut;
-use std::task::{Context, Poll};
-
-#[derive(Debug)]
-struct AllowStd<S> {
-    inner: S,
-    context: *mut (),
-}
-
-/// A wrapper around an underlying raw stream which implements the TLS or SSL
-/// protocol.
-///
-/// A `TlsStream<S>` represents a handshake that has been completed successfully
-/// and both the server and the client are ready for receiving and sending
-/// data. Bytes read from a `TlsStream` are decrypted from `S` and bytes written
-/// to a `TlsStream` are encrypted when passing through to `S`.
-#[derive(Debug)]
-pub struct TlsStream<S>(native_tls::TlsStream<AllowStd<S>>);
-
-/// A wrapper around a `native_tls::TlsConnector`, providing an async `connect`
-/// method.
-#[derive(Clone)]
-pub struct TlsConnector(native_tls::TlsConnector);
-
-/// A wrapper around a `native_tls::TlsAcceptor`, providing an async `accept`
-/// method.
-#[derive(Clone)]
-pub struct TlsAcceptor(native_tls::TlsAcceptor);
-
-struct MidHandshake<S>(Option<MidHandshakeTlsStream<AllowStd<S>>>);
-
-enum StartedHandshake<S> {
-    Done(TlsStream<S>),
-    Mid(MidHandshakeTlsStream<AllowStd<S>>),
-}
-
-struct StartedHandshakeFuture<F, S>(Option<StartedHandshakeFutureInner<F, S>>);
-struct StartedHandshakeFutureInner<F, S> {
-    f: F,
-    stream: S,
-}
-
-struct Guard<'a, S>(&'a mut TlsStream<S>)
-where
-    AllowStd<S>: Read + Write;
-
-impl<S> Drop for Guard<'_, S>
-where
-    AllowStd<S>: Read + Write,
-{
-    fn drop(&mut self) {
-        (self.0).0.get_mut().context = null_mut();
-    }
-}
-
-// *mut () context is neither Send nor Sync
-unsafe impl<S: Send> Send for AllowStd<S> {}
-unsafe impl<S: Sync> Sync for AllowStd<S> {}
-
-impl<S> AllowStd<S>
-where
-    S: Unpin,
-{
-    fn with_context<F, R>(&mut self, f: F) -> R
-    where
-        F: FnOnce(&mut Context<'_>, Pin<&mut S>) -> R,
-    {
-        unsafe {
-            assert!(!self.context.is_null());
-            let waker = &mut *(self.context as *mut _);
-            f(waker, Pin::new(&mut self.inner))
-        }
-    }
-}
-
-impl<S> Read for AllowStd<S>
-where
-    S: AsyncRead + Unpin,
-{
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        match self.with_context(|ctx, stream| stream.poll_read(ctx, buf)) {
-            Poll::Ready(r) => r,
-            Poll::Pending => Err(io::Error::from(io::ErrorKind::WouldBlock)),
-        }
-    }
-}
-
-impl<S> Write for AllowStd<S>
-where
-    S: AsyncWrite + Unpin,
-{
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        match self.with_context(|ctx, stream| stream.poll_write(ctx, buf)) {
-            Poll::Ready(r) => r,
-            Poll::Pending => Err(io::Error::from(io::ErrorKind::WouldBlock)),
-        }
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        match self.with_context(|ctx, stream| stream.poll_flush(ctx)) {
-            Poll::Ready(r) => r,
-            Poll::Pending => Err(io::Error::from(io::ErrorKind::WouldBlock)),
-        }
-    }
-}
-
-fn cvt<T>(r: io::Result<T>) -> Poll<io::Result<T>> {
-    match r {
-        Ok(v) => Poll::Ready(Ok(v)),
-        Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => Poll::Pending,
-        Err(e) => Poll::Ready(Err(e)),
-    }
-}
-
-impl<S> TlsStream<S> {
-    fn with_context<F, R>(&mut self, ctx: &mut Context<'_>, f: F) -> R
-    where
-        F: FnOnce(&mut native_tls::TlsStream<AllowStd<S>>) -> R,
-        AllowStd<S>: Read + Write,
-    {
-        self.0.get_mut().context = ctx as *mut _ as *mut ();
-        let g = Guard(self);
-        f(&mut (g.0).0)
-    }
-
-    /// Returns a shared reference to the inner stream.
-    pub fn get_ref(&self) -> &S
-    where
-        S: AsyncRead + AsyncWrite + Unpin,
-    {
-        &self.0.get_ref().inner
-    }
-
-    /// Returns a mutable reference to the inner stream.
-    pub fn get_mut(&mut self) -> &mut S
-    where
-        S: AsyncRead + AsyncWrite + Unpin,
-    {
-        &mut self.0.get_mut().inner
-    }
-}
-
-impl<S> AsyncRead for TlsStream<S>
-where
-    S: AsyncRead + AsyncWrite + Unpin,
-{
-    unsafe fn prepare_uninitialized_buffer(&self, _: &mut [MaybeUninit<u8>]) -> bool {
-        // Note that this does not forward to `S` because the buffer is
-        // unconditionally filled in by OpenSSL, not the actual object `S`.
-        // We're decrypting bytes from `S` into the buffer above!
-        false
-    }
-
-    fn poll_read(
-        mut self: Pin<&mut Self>,
-        ctx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        self.with_context(ctx, |s| cvt(s.read(buf)))
-    }
-}
-
-impl<S> AsyncWrite for TlsStream<S>
-where
-    S: AsyncRead + AsyncWrite + Unpin,
-{
-    fn poll_write(
-        mut self: Pin<&mut Self>,
-        ctx: &mut Context<'_>,
-        buf: &[u8],
-    ) -> Poll<io::Result<usize>> {
-        self.with_context(ctx, |s| cvt(s.write(buf)))
-    }
-
-    fn poll_flush(mut self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        self.with_context(ctx, |s| cvt(s.flush()))
-    }
-
-    fn poll_shutdown(mut self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        match self.with_context(ctx, |s| s.shutdown()) {
-            Ok(()) => Poll::Ready(Ok(())),
-            Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => Poll::Pending,
-            Err(e) => Poll::Ready(Err(e)),
-        }
-    }
-}
-
-async fn handshake<F, S>(f: F, stream: S) -> Result<TlsStream<S>, Error>
-where
-    F: FnOnce(
-            AllowStd<S>,
-        ) -> Result<native_tls::TlsStream<AllowStd<S>>, HandshakeError<AllowStd<S>>>
-        + Unpin,
-    S: AsyncRead + AsyncWrite + Unpin,
-{
-    let start = StartedHandshakeFuture(Some(StartedHandshakeFutureInner { f, stream }));
-
-    match start.await {
-        Err(e) => Err(e),
-        Ok(StartedHandshake::Done(s)) => Ok(s),
-        Ok(StartedHandshake::Mid(s)) => MidHandshake(Some(s)).await,
-    }
-}
-
-impl<F, S> Future for StartedHandshakeFuture<F, S>
-where
-    F: FnOnce(
-            AllowStd<S>,
-        ) -> Result<native_tls::TlsStream<AllowStd<S>>, HandshakeError<AllowStd<S>>>
-        + Unpin,
-    S: Unpin,
-    AllowStd<S>: Read + Write,
-{
-    type Output = Result<StartedHandshake<S>, Error>;
-
-    fn poll(
-        mut self: Pin<&mut Self>,
-        ctx: &mut Context<'_>,
-    ) -> Poll<Result<StartedHandshake<S>, Error>> {
-        let inner = self.0.take().expect("future polled after completion");
-        let stream = AllowStd {
-            inner: inner.stream,
-            context: ctx as *mut _ as *mut (),
-        };
-
-        match (inner.f)(stream) {
-            Ok(mut s) => {
-                s.get_mut().context = null_mut();
-                Poll::Ready(Ok(StartedHandshake::Done(TlsStream(s))))
-            }
-            Err(HandshakeError::WouldBlock(mut s)) => {
-                s.get_mut().context = null_mut();
-                Poll::Ready(Ok(StartedHandshake::Mid(s)))
-            }
-            Err(HandshakeError::Failure(e)) => Poll::Ready(Err(e)),
-        }
-    }
-}
-
-impl TlsConnector {
-    /// Connects the provided stream with this connector, assuming the provided
-    /// domain.
-    ///
-    /// This function will internally call `TlsConnector::connect` to connect
-    /// the stream and returns a future representing the resolution of the
-    /// connection operation. The returned future will resolve to either
-    /// `TlsStream<S>` or `Error` depending if it's successful or not.
-    ///
-    /// This is typically used for clients who have already established, for
-    /// example, a TCP connection to a remote server. That stream is then
-    /// provided here to perform the client half of a connection to a
-    /// TLS-powered server.
-    pub async fn connect<S>(&self, domain: &str, stream: S) -> Result<TlsStream<S>, Error>
-    where
-        S: AsyncRead + AsyncWrite + Unpin,
-    {
-        handshake(move |s| self.0.connect(domain, s), stream).await
-    }
-}
-
-impl fmt::Debug for TlsConnector {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TlsConnector").finish()
-    }
-}
-
-impl From<native_tls::TlsConnector> for TlsConnector {
-    fn from(inner: native_tls::TlsConnector) -> TlsConnector {
-        TlsConnector(inner)
-    }
-}
-
-impl TlsAcceptor {
-    /// Accepts a new client connection with the provided stream.
-    ///
-    /// This function will internally call `TlsAcceptor::accept` to connect
-    /// the stream and returns a future representing the resolution of the
-    /// connection operation. The returned future will resolve to either
-    /// `TlsStream<S>` or `Error` depending if it's successful or not.
-    ///
-    /// This is typically used after a new socket has been accepted from a
-    /// `TcpListener`. That socket is then passed to this function to perform
-    /// the server half of accepting a client connection.
-    pub async fn accept<S>(&self, stream: S) -> Result<TlsStream<S>, Error>
-    where
-        S: AsyncRead + AsyncWrite + Unpin,
-    {
-        handshake(move |s| self.0.accept(s), stream).await
-    }
-}
-
-impl fmt::Debug for TlsAcceptor {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TlsAcceptor").finish()
-    }
-}
-
-impl From<native_tls::TlsAcceptor> for TlsAcceptor {
-    fn from(inner: native_tls::TlsAcceptor) -> TlsAcceptor {
-        TlsAcceptor(inner)
-    }
-}
-
-impl<S: AsyncRead + AsyncWrite + Unpin> Future for MidHandshake<S> {
-    type Output = Result<TlsStream<S>, Error>;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut_self = self.get_mut();
-        let mut s = mut_self.0.take().expect("future polled after completion");
-
-        s.get_mut().context = cx as *mut _ as *mut ();
-        match s.handshake() {
-            Ok(stream) => Poll::Ready(Ok(TlsStream(stream))),
-            Err(HandshakeError::Failure(e)) => Poll::Ready(Err(e)),
-            Err(HandshakeError::WouldBlock(mut s)) => {
-                s.get_mut().context = null_mut();
-                mut_self.0 = Some(s);
-                Poll::Pending
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/tests/bad.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/tests/bad.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/tests/bad.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/tests/bad.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-#![warn(rust_2018_idioms)]
-
-use cfg_if::cfg_if;
-use env_logger;
-use native_tls::TlsConnector;
-use std::io::{self, Error};
-use std::net::ToSocketAddrs;
-use tokio::net::TcpStream;
-use tokio_tls;
-
-macro_rules! t {
-    ($e:expr) => {
-        match $e {
-            Ok(e) => e,
-            Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
-        }
-    };
-}
-
-cfg_if! {
-    if #[cfg(feature = "force-rustls")] {
-        fn verify_failed(err: &Error, s:  &str) {
-            let err = err.to_string();
-            assert!(err.contains(s), "bad error: {}", err);
-        }
-
-        fn assert_expired_error(err: &Error) {
-            verify_failed(err, "CertExpired");
-        }
-
-        fn assert_wrong_host(err: &Error) {
-            verify_failed(err, "CertNotValidForName");
-        }
-
-        fn assert_self_signed(err: &Error) {
-            verify_failed(err, "UnknownIssuer");
-        }
-
-        fn assert_untrusted_root(err: &Error) {
-            verify_failed(err, "UnknownIssuer");
-        }
-    } else if #[cfg(any(feature = "force-openssl",
-                        all(not(target_os = "macos"),
-                            not(target_os = "windows"),
-                            not(target_os = "ios"))))] {
-        fn verify_failed(err: &Error) {
-            assert!(format!("{}", err).contains("certificate verify failed"))
-        }
-
-        use verify_failed as assert_expired_error;
-        use verify_failed as assert_wrong_host;
-        use verify_failed as assert_self_signed;
-        use verify_failed as assert_untrusted_root;
-    } else if #[cfg(any(target_os = "macos", target_os = "ios"))] {
-
-        fn assert_invalid_cert_chain(err: &Error) {
-            assert!(format!("{}", err).contains("was not trusted."))
-        }
-
-        use crate::assert_invalid_cert_chain as assert_expired_error;
-        use crate::assert_invalid_cert_chain as assert_wrong_host;
-        use crate::assert_invalid_cert_chain as assert_self_signed;
-        use crate::assert_invalid_cert_chain as assert_untrusted_root;
-    } else {
-        fn assert_expired_error(err: &Error) {
-            let s = err.to_string();
-            assert!(s.contains("system clock"), "error = {:?}", s);
-        }
-
-        fn assert_wrong_host(err: &Error) {
-            let s = err.to_string();
-            assert!(s.contains("CN name"), "error = {:?}", s);
-        }
-
-        fn assert_self_signed(err: &Error) {
-            let s = err.to_string();
-            assert!(s.contains("root certificate which is not trusted"), "error = {:?}", s);
-        }
-
-        use assert_self_signed as assert_untrusted_root;
-    }
-}
-
-async fn get_host(host: &'static str) -> Error {
-    drop(env_logger::try_init());
-
-    let addr = format!("{}:443", host);
-    let addr = t!(addr.to_socket_addrs()).next().unwrap();
-
-    let socket = t!(TcpStream::connect(&addr).await);
-    let builder = TlsConnector::builder();
-    let cx = t!(builder.build());
-    let cx = tokio_tls::TlsConnector::from(cx);
-    let res = cx
-        .connect(host, socket)
-        .await
-        .map_err(|e| Error::new(io::ErrorKind::Other, e));
-
-    assert!(res.is_err());
-    res.err().unwrap()
-}
-
-#[tokio::test]
-async fn expired() {
-    assert_expired_error(&get_host("expired.badssl.com").await)
-}
-
-// TODO: the OSX builders on Travis apparently fail this tests spuriously?
-//       passes locally though? Seems... bad!
-#[tokio::test]
-#[cfg_attr(all(target_os = "macos", feature = "force-openssl"), ignore)]
-async fn wrong_host() {
-    assert_wrong_host(&get_host("wrong.host.badssl.com").await)
-}
-
-#[tokio::test]
-async fn self_signed() {
-    assert_self_signed(&get_host("self-signed.badssl.com").await)
-}
-
-#[tokio::test]
-async fn untrusted_root() {
-    assert_untrusted_root(&get_host("untrusted-root.badssl.com").await)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/tests/google.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/tests/google.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/tests/google.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/tests/google.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-#![warn(rust_2018_idioms)]
-
-use cfg_if::cfg_if;
-use env_logger;
-use native_tls;
-use native_tls::TlsConnector;
-use std::io;
-use std::net::ToSocketAddrs;
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use tokio::net::TcpStream;
-use tokio_tls;
-
-macro_rules! t {
-    ($e:expr) => {
-        match $e {
-            Ok(e) => e,
-            Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
-        }
-    };
-}
-
-cfg_if! {
-    if #[cfg(feature = "force-rustls")] {
-        fn assert_bad_hostname_error(err: &io::Error) {
-            let err = err.to_string();
-            assert!(err.contains("CertNotValidForName"), "bad error: {}", err);
-        }
-    } else if #[cfg(any(feature = "force-openssl",
-                        all(not(target_os = "macos"),
-                            not(target_os = "windows"),
-                            not(target_os = "ios"))))] {
-        fn assert_bad_hostname_error(err: &io::Error) {
-            let err = err.get_ref().unwrap();
-            let err = err.downcast_ref::<native_tls::Error>().unwrap();
-            assert!(format!("{}", err).contains("certificate verify failed"));
-        }
-    } else if #[cfg(any(target_os = "macos", target_os = "ios"))] {
-        fn assert_bad_hostname_error(err: &io::Error) {
-            let err = err.get_ref().unwrap();
-            let err = err.downcast_ref::<native_tls::Error>().unwrap();
-            assert!(format!("{}", err).contains("was not trusted."));
-        }
-    } else {
-        fn assert_bad_hostname_error(err: &io::Error) {
-            let err = err.get_ref().unwrap();
-            let err = err.downcast_ref::<native_tls::Error>().unwrap();
-            assert!(format!("{}", err).contains("CN name"));
-        }
-    }
-}
-
-#[tokio::test]
-async fn fetch_google() {
-    drop(env_logger::try_init());
-
-    // First up, resolve google.com
-    let addr = t!("google.com:443".to_socket_addrs()).next().unwrap();
-
-    let socket = TcpStream::connect(&addr).await.unwrap();
-
-    // Send off the request by first negotiating an SSL handshake, then writing
-    // of our request, then flushing, then finally read off the response.
-    let builder = TlsConnector::builder();
-    let connector = t!(builder.build());
-    let connector = tokio_tls::TlsConnector::from(connector);
-    let mut socket = t!(connector.connect("google.com", socket).await);
-    t!(socket.write_all(b"GET / HTTP/1.0\r\n\r\n").await);
-    let mut data = Vec::new();
-    t!(socket.read_to_end(&mut data).await);
-
-    // any response code is fine
-    assert!(data.starts_with(b"HTTP/1.0 "));
-
-    let data = String::from_utf8_lossy(&data);
-    let data = data.trim_end();
-    assert!(data.ends_with("</html>") || data.ends_with("</HTML>"));
-}
-
-fn native2io(e: native_tls::Error) -> io::Error {
-    io::Error::new(io::ErrorKind::Other, e)
-}
-
-// see comment in bad.rs for ignore reason
-#[cfg_attr(all(target_os = "macos", feature = "force-openssl"), ignore)]
-#[tokio::test]
-async fn wrong_hostname_error() {
-    drop(env_logger::try_init());
-
-    let addr = t!("google.com:443".to_socket_addrs()).next().unwrap();
-
-    let socket = t!(TcpStream::connect(&addr).await);
-    let builder = TlsConnector::builder();
-    let connector = t!(builder.build());
-    let connector = tokio_tls::TlsConnector::from(connector);
-    let res = connector
-        .connect("rust-lang.org", socket)
-        .await
-        .map_err(native2io);
-
-    assert!(res.is_err());
-    assert_bad_hostname_error(&res.err().unwrap());
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/tests/smoke.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/tests/smoke.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-tls/tests/smoke.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-tls/tests/smoke.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,629 +0,0 @@
-#![warn(rust_2018_idioms)]
-
-use cfg_if::cfg_if;
-use env_logger;
-use futures::join;
-use native_tls;
-use native_tls::{Identity, TlsAcceptor, TlsConnector};
-use std::io::Write;
-use std::marker::Unpin;
-use std::process::Command;
-use std::ptr;
-use tokio::io::{AsyncReadExt, AsyncWrite, AsyncWriteExt, Error, ErrorKind};
-use tokio::net::{TcpListener, TcpStream};
-use tokio::stream::StreamExt;
-use tokio_tls;
-
-macro_rules! t {
-    ($e:expr) => {
-        match $e {
-            Ok(e) => e,
-            Err(e) => panic!("{} failed with {:?}", stringify!($e), e),
-        }
-    };
-}
-
-#[allow(dead_code)]
-struct Keys {
-    cert_der: Vec<u8>,
-    pkey_der: Vec<u8>,
-    pkcs12_der: Vec<u8>,
-}
-
-#[allow(dead_code)]
-fn openssl_keys() -> &'static Keys {
-    static INIT: Once = Once::new();
-    static mut KEYS: *mut Keys = ptr::null_mut();
-
-    INIT.call_once(|| {
-        let path = t!(env::current_exe());
-        let path = path.parent().unwrap();
-        let keyfile = path.join("test.key");
-        let certfile = path.join("test.crt");
-        let config = path.join("openssl.config");
-
-        File::create(&config)
-            .unwrap()
-            .write_all(
-                b"\
-            [req]\n\
-            distinguished_name=dn\n\
-            [ dn ]\n\
-            CN=localhost\n\
-            [ ext ]\n\
-            basicConstraints=CA:FALSE,pathlen:0\n\
-            subjectAltName = @alt_names
-            extendedKeyUsage=serverAuth,clientAuth
-            [alt_names]
-            DNS.1 = localhost
-        ",
-            )
-            .unwrap();
-
-        let subj = "/C=US/ST=Denial/L=Sprintfield/O=Dis/CN=localhost";
-        let output = t!(Command::new("openssl")
-            .arg("req")
-            .arg("-nodes")
-            .arg("-x509")
-            .arg("-newkey")
-            .arg("rsa:2048")
-            .arg("-config")
-            .arg(&config)
-            .arg("-extensions")
-            .arg("ext")
-            .arg("-subj")
-            .arg(subj)
-            .arg("-keyout")
-            .arg(&keyfile)
-            .arg("-out")
-            .arg(&certfile)
-            .arg("-days")
-            .arg("1")
-            .output());
-        assert!(output.status.success());
-
-        let crtout = t!(Command::new("openssl")
-            .arg("x509")
-            .arg("-outform")
-            .arg("der")
-            .arg("-in")
-            .arg(&certfile)
-            .output());
-        assert!(crtout.status.success());
-        let keyout = t!(Command::new("openssl")
-            .arg("rsa")
-            .arg("-outform")
-            .arg("der")
-            .arg("-in")
-            .arg(&keyfile)
-            .output());
-        assert!(keyout.status.success());
-
-        let pkcs12out = t!(Command::new("openssl")
-            .arg("pkcs12")
-            .arg("-export")
-            .arg("-nodes")
-            .arg("-inkey")
-            .arg(&keyfile)
-            .arg("-in")
-            .arg(&certfile)
-            .arg("-password")
-            .arg("pass:foobar")
-            .output());
-        assert!(pkcs12out.status.success());
-
-        let keys = Box::new(Keys {
-            cert_der: crtout.stdout,
-            pkey_der: keyout.stdout,
-            pkcs12_der: pkcs12out.stdout,
-        });
-        unsafe {
-            KEYS = Box::into_raw(keys);
-        }
-    });
-    unsafe { &*KEYS }
-}
-
-cfg_if! {
-    if #[cfg(feature = "rustls")] {
-        use webpki;
-        use untrusted;
-        use std::env;
-        use std::fs::File;
-        use std::process::Command;
-        use std::sync::Once;
-
-        use untrusted::Input;
-        use webpki::trust_anchor_util;
-
-        fn server_cx() -> io::Result<ServerContext> {
-            let mut cx = ServerContext::new();
-
-            let (cert, key) = keys();
-            cx.config_mut()
-              .set_single_cert(vec![cert.to_vec()], key.to_vec());
-
-            Ok(cx)
-        }
-
-        fn configure_client(cx: &mut ClientContext) {
-            let (cert, _key) = keys();
-            let cert = Input::from(cert);
-            let anchor = trust_anchor_util::cert_der_as_trust_anchor(cert).unwrap();
-            cx.config_mut().root_store.add_trust_anchors(&[anchor]);
-        }
-
-        // Like OpenSSL we generate certificates on the fly, but for OSX we
-        // also have to put them into a specific keychain. We put both the
-        // certificates and the keychain next to our binary.
-        //
-        // Right now I don't know of a way to programmatically create a
-        // self-signed certificate, so we just fork out to the `openssl` binary.
-        fn keys() -> (&'static [u8], &'static [u8]) {
-            static INIT: Once = Once::new();
-            static mut KEYS: *mut (Vec<u8>, Vec<u8>) = ptr::null_mut();
-
-            INIT.call_once(|| {
-                let (key, cert) = openssl_keys();
-                let path = t!(env::current_exe());
-                let path = path.parent().unwrap();
-                let keyfile = path.join("test.key");
-                let certfile = path.join("test.crt");
-                let config = path.join("openssl.config");
-
-                File::create(&config).unwrap().write_all(b"\
-                    [req]\n\
-                    distinguished_name=dn\n\
-                    [ dn ]\n\
-                    CN=localhost\n\
-                    [ ext ]\n\
-                    basicConstraints=CA:FALSE,pathlen:0\n\
-                    subjectAltName = @alt_names
-                    [alt_names]
-                    DNS.1 = localhost
-                ").unwrap();
-
-                let subj = "/C=US/ST=Denial/L=Sprintfield/O=Dis/CN=localhost";
-                let output = t!(Command::new("openssl")
-                                        .arg("req")
-                                        .arg("-nodes")
-                                        .arg("-x509")
-                                        .arg("-newkey").arg("rsa:2048")
-                                        .arg("-config").arg(&config)
-                                        .arg("-extensions").arg("ext")
-                                        .arg("-subj").arg(subj)
-                                        .arg("-keyout").arg(&keyfile)
-                                        .arg("-out").arg(&certfile)
-                                        .arg("-days").arg("1")
-                                        .output());
-                assert!(output.status.success());
-
-                let crtout = t!(Command::new("openssl")
-                                        .arg("x509")
-                                        .arg("-outform").arg("der")
-                                        .arg("-in").arg(&certfile)
-                                        .output());
-                assert!(crtout.status.success());
-                let keyout = t!(Command::new("openssl")
-                                        .arg("rsa")
-                                        .arg("-outform").arg("der")
-                                        .arg("-in").arg(&keyfile)
-                                        .output());
-                assert!(keyout.status.success());
-
-                let cert = crtout.stdout;
-                let key = keyout.stdout;
-                unsafe {
-                    KEYS = Box::into_raw(Box::new((cert, key)));
-                }
-            });
-            unsafe {
-                (&(*KEYS).0, &(*KEYS).1)
-            }
-        }
-    } else if #[cfg(any(feature = "force-openssl",
-                        all(not(target_os = "macos"),
-                            not(target_os = "windows"),
-                            not(target_os = "ios"))))] {
-        use std::fs::File;
-        use std::env;
-        use std::sync::Once;
-
-        fn contexts() -> (tokio_tls::TlsAcceptor, tokio_tls::TlsConnector) {
-            let keys = openssl_keys();
-
-            let pkcs12 = t!(Identity::from_pkcs12(&keys.pkcs12_der, "foobar"));
-            let srv = TlsAcceptor::builder(pkcs12);
-
-            let cert = t!(native_tls::Certificate::from_der(&keys.cert_der));
-
-            let mut client = TlsConnector::builder();
-            t!(client.add_root_certificate(cert).build());
-
-            (t!(srv.build()).into(), t!(client.build()).into())
-        }
-    } else if #[cfg(any(target_os = "macos", target_os = "ios"))] {
-        use std::env;
-        use std::fs::File;
-        use std::sync::Once;
-
-        fn contexts() -> (tokio_tls::TlsAcceptor, tokio_tls::TlsConnector) {
-            let keys = openssl_keys();
-
-            let pkcs12 = t!(Identity::from_pkcs12(&keys.pkcs12_der, "foobar"));
-            let srv = TlsAcceptor::builder(pkcs12);
-
-            let cert = native_tls::Certificate::from_der(&keys.cert_der).unwrap();
-            let mut client = TlsConnector::builder();
-            client.add_root_certificate(cert);
-
-            (t!(srv.build()).into(), t!(client.build()).into())
-        }
-    } else {
-        use schannel;
-        use winapi;
-
-        use std::env;
-        use std::fs::File;
-        use std::io;
-        use std::mem;
-        use std::sync::Once;
-
-        use schannel::cert_context::CertContext;
-        use schannel::cert_store::{CertStore, CertAdd, Memory};
-        use winapi::shared::basetsd::*;
-        use winapi::shared::lmcons::*;
-        use winapi::shared::minwindef::*;
-        use winapi::shared::ntdef::WCHAR;
-        use winapi::um::minwinbase::*;
-        use winapi::um::sysinfoapi::*;
-        use winapi::um::timezoneapi::*;
-        use winapi::um::wincrypt::*;
-
-        const FRIENDLY_NAME: &str = "tokio-tls localhost testing cert";
-
-        fn contexts() -> (tokio_tls::TlsAcceptor, tokio_tls::TlsConnector) {
-            let cert = localhost_cert();
-            let mut store = t!(Memory::new()).into_store();
-            t!(store.add_cert(&cert, CertAdd::Always));
-            let pkcs12_der = t!(store.export_pkcs12("foobar"));
-            let pkcs12 = t!(Identity::from_pkcs12(&pkcs12_der, "foobar"));
-
-            let srv = TlsAcceptor::builder(pkcs12);
-            let client = TlsConnector::builder();
-            (t!(srv.build()).into(), t!(client.build()).into())
-        }
-
-        // ====================================================================
-        // Magic!
-        //
-        // Lots of magic is happening here to wrangle certificates for running
-        // these tests on Windows. For more information see the test suite
-        // in the schannel-rs crate as this is just coyping that.
-        //
-        // The general gist of this though is that the only way to add custom
-        // trusted certificates is to add it to the system store of trust. To
-        // do that we go through the whole rigamarole here to generate a new
-        // self-signed certificate and then insert that into the system store.
-        //
-        // This generates some dialogs, so we print what we're doing sometimes,
-        // and otherwise we just manage the ephemeral certificates. Because
-        // they're in the system store we always ensure that they're only valid
-        // for a small period of time (e.g. 1 day).
-
-        fn localhost_cert() -> CertContext {
-            static INIT: Once = Once::new();
-            INIT.call_once(|| {
-                for cert in local_root_store().certs() {
-                    let name = match cert.friendly_name() {
-                        Ok(name) => name,
-                        Err(_) => continue,
-                    };
-                    if name != FRIENDLY_NAME {
-                        continue
-                    }
-                    if !cert.is_time_valid().unwrap() {
-                        io::stdout().write_all(br#"
-
-The tokio-tls test suite is about to delete an old copy of one of its
-certificates from your root trust store. This certificate was only valid for one
-day and it is no longer needed. The host should be "localhost" and the
-description should mention "tokio-tls".
-
-        "#).unwrap();
-                        cert.delete().unwrap();
-                    } else {
-                        return
-                    }
-                }
-
-                install_certificate().unwrap();
-            });
-
-            for cert in local_root_store().certs() {
-                let name = match cert.friendly_name() {
-                    Ok(name) => name,
-                    Err(_) => continue,
-                };
-                if name == FRIENDLY_NAME {
-                    return cert
-                }
-            }
-
-            panic!("couldn't find a cert");
-        }
-
-        fn local_root_store() -> CertStore {
-            if env::var("CI").is_ok() {
-                CertStore::open_local_machine("Root").unwrap()
-            } else {
-                CertStore::open_current_user("Root").unwrap()
-            }
-        }
-
-        fn install_certificate() -> io::Result<CertContext> {
-            unsafe {
-                let mut provider = 0;
-                let mut hkey = 0;
-
-                let mut buffer = "tokio-tls test suite".encode_utf16()
-                                                         .chain(Some(0))
-                                                         .collect::<Vec<_>>();
-                let res = CryptAcquireContextW(&mut provider,
-                                               buffer.as_ptr(),
-                                               ptr::null_mut(),
-                                               PROV_RSA_FULL,
-                                               CRYPT_MACHINE_KEYSET);
-                if res != TRUE {
-                    // create a new key container (since it does not exist)
-                    let res = CryptAcquireContextW(&mut provider,
-                                                   buffer.as_ptr(),
-                                                   ptr::null_mut(),
-                                                   PROV_RSA_FULL,
-                                                   CRYPT_NEWKEYSET | CRYPT_MACHINE_KEYSET);
-                    if res != TRUE {
-                        return Err(Error::last_os_error())
-                    }
-                }
-
-                // create a new keypair (RSA-2048)
-                let res = CryptGenKey(provider,
-                                      AT_SIGNATURE,
-                                      0x0800<<16 | CRYPT_EXPORTABLE,
-                                      &mut hkey);
-                if res != TRUE {
-                    return Err(Error::last_os_error());
-                }
-
-                // start creating the certificate
-                let name = "CN=localhost,O=tokio-tls,OU=tokio-tls,\
-                            G=tokio_tls".encode_utf16()
-                                          .chain(Some(0))
-                                          .collect::<Vec<_>>();
-                let mut cname_buffer: [WCHAR; UNLEN as usize + 1] = mem::zeroed();
-                let mut cname_len = cname_buffer.len() as DWORD;
-                let res = CertStrToNameW(X509_ASN_ENCODING,
-                                         name.as_ptr(),
-                                         CERT_X500_NAME_STR,
-                                         ptr::null_mut(),
-                                         cname_buffer.as_mut_ptr() as *mut u8,
-                                         &mut cname_len,
-                                         ptr::null_mut());
-                if res != TRUE {
-                    return Err(Error::last_os_error());
-                }
-
-                let mut subject_issuer = CERT_NAME_BLOB {
-                    cbData: cname_len,
-                    pbData: cname_buffer.as_ptr() as *mut u8,
-                };
-                let mut key_provider = CRYPT_KEY_PROV_INFO {
-                    pwszContainerName: buffer.as_mut_ptr(),
-                    pwszProvName: ptr::null_mut(),
-                    dwProvType: PROV_RSA_FULL,
-                    dwFlags: CRYPT_MACHINE_KEYSET,
-                    cProvParam: 0,
-                    rgProvParam: ptr::null_mut(),
-                    dwKeySpec: AT_SIGNATURE,
-                };
-                let mut sig_algorithm = CRYPT_ALGORITHM_IDENTIFIER {
-                    pszObjId: szOID_RSA_SHA256RSA.as_ptr() as *mut _,
-                    Parameters: mem::zeroed(),
-                };
-                let mut expiration_date: SYSTEMTIME = mem::zeroed();
-                GetSystemTime(&mut expiration_date);
-                let mut file_time: FILETIME = mem::zeroed();
-                let res = SystemTimeToFileTime(&expiration_date,
-                                               &mut file_time);
-                if res != TRUE {
-                    return Err(Error::last_os_error());
-                }
-                let mut timestamp: u64 = file_time.dwLowDateTime as u64 |
-                                         (file_time.dwHighDateTime as u64) << 32;
-                // one day, timestamp unit is in 100 nanosecond intervals
-                timestamp += (1E9 as u64) / 100 * (60 * 60 * 24);
-                file_time.dwLowDateTime = timestamp as u32;
-                file_time.dwHighDateTime = (timestamp >> 32) as u32;
-                let res = FileTimeToSystemTime(&file_time,
-                                               &mut expiration_date);
-                if res != TRUE {
-                    return Err(Error::last_os_error());
-                }
-
-                // create a self signed certificate
-                let cert_context = CertCreateSelfSignCertificate(
-                        0 as ULONG_PTR,
-                        &mut subject_issuer,
-                        0,
-                        &mut key_provider,
-                        &mut sig_algorithm,
-                        ptr::null_mut(),
-                        &mut expiration_date,
-                        ptr::null_mut());
-                if cert_context.is_null() {
-                    return Err(Error::last_os_error());
-                }
-
-                // TODO: this is.. a terrible hack. Right now `schannel`
-                //       doesn't provide a public method to go from a raw
-                //       cert context pointer to the `CertContext` structure it
-                //       has, so we just fake it here with a transmute. This'll
-                //       probably break at some point, but hopefully by then
-                //       it'll have a method to do this!
-                struct MyCertContext<T>(T);
-                impl<T> Drop for MyCertContext<T> {
-                    fn drop(&mut self) {}
-                }
-
-                let cert_context = MyCertContext(cert_context);
-                let cert_context: CertContext = mem::transmute(cert_context);
-
-                cert_context.set_friendly_name(FRIENDLY_NAME)?;
-
-                // install the certificate to the machine's local store
-                io::stdout().write_all(br#"
-
-The tokio-tls test suite is about to add a certificate to your set of root
-and trusted certificates. This certificate should be for the domain "localhost"
-with the description related to "tokio-tls". This certificate is only valid
-for one day and will be automatically deleted if you re-run the tokio-tls
-test suite later.
-
-        "#).unwrap();
-                local_root_store().add_cert(&cert_context,
-                                                 CertAdd::ReplaceExisting)?;
-                Ok(cert_context)
-            }
-        }
-    }
-}
-
-const AMT: usize = 128 * 1024;
-
-async fn copy_data<W: AsyncWrite + Unpin>(mut w: W) -> Result<usize, Error> {
-    let mut data = vec![9; AMT as usize];
-    let mut amt = 0;
-    while !data.is_empty() {
-        let written = w.write(&data).await?;
-        if written <= data.len() {
-            amt += written;
-            data.resize(data.len() - written, 0);
-        } else {
-            w.write_all(&data).await?;
-            amt += data.len();
-            break;
-        }
-
-        println!("remaining: {}", data.len());
-    }
-    Ok(amt)
-}
-
-#[tokio::test]
-async fn client_to_server() {
-    drop(env_logger::try_init());
-
-    // Create a server listening on a port, then figure out what that port is
-    let mut srv = t!(TcpListener::bind("127.0.0.1:0").await);
-    let addr = t!(srv.local_addr());
-
-    let (server_cx, client_cx) = contexts();
-
-    // Create a future to accept one socket, connect the ssl stream, and then
-    // read all the data from it.
-    let server = async move {
-        let mut incoming = srv.incoming();
-        let socket = t!(incoming.next().await.unwrap());
-        let mut socket = t!(server_cx.accept(socket).await);
-        let mut data = Vec::new();
-        t!(socket.read_to_end(&mut data).await);
-        data
-    };
-
-    // Create a future to connect to our server, connect the ssl stream, and
-    // then write a bunch of data to it.
-    let client = async move {
-        let socket = t!(TcpStream::connect(&addr).await);
-        let socket = t!(client_cx.connect("localhost", socket).await);
-        copy_data(socket).await
-    };
-
-    // Finally, run everything!
-    let (data, _) = join!(server, client);
-    // assert_eq!(amt, AMT);
-    assert!(data == vec![9; AMT]);
-}
-
-#[tokio::test]
-async fn server_to_client() {
-    drop(env_logger::try_init());
-
-    // Create a server listening on a port, then figure out what that port is
-    let mut srv = t!(TcpListener::bind("127.0.0.1:0").await);
-    let addr = t!(srv.local_addr());
-
-    let (server_cx, client_cx) = contexts();
-
-    let server = async move {
-        let mut incoming = srv.incoming();
-        let socket = t!(incoming.next().await.unwrap());
-        let socket = t!(server_cx.accept(socket).await);
-        copy_data(socket).await
-    };
-
-    let client = async move {
-        let socket = t!(TcpStream::connect(&addr).await);
-        let mut socket = t!(client_cx.connect("localhost", socket).await);
-        let mut data = Vec::new();
-        t!(socket.read_to_end(&mut data).await);
-        data
-    };
-
-    // Finally, run everything!
-    let (_, data) = join!(server, client);
-    // assert_eq!(amt, AMT);
-    assert!(data == vec![9; AMT]);
-}
-
-#[tokio::test]
-async fn one_byte_at_a_time() {
-    const AMT: usize = 1024;
-    drop(env_logger::try_init());
-
-    let mut srv = t!(TcpListener::bind("127.0.0.1:0").await);
-    let addr = t!(srv.local_addr());
-
-    let (server_cx, client_cx) = contexts();
-
-    let server = async move {
-        let mut incoming = srv.incoming();
-        let socket = t!(incoming.next().await.unwrap());
-        let mut socket = t!(server_cx.accept(socket).await);
-        let mut amt = 0;
-        for b in std::iter::repeat(9).take(AMT) {
-            let data = [b as u8];
-            t!(socket.write_all(&data).await);
-            amt += 1;
-        }
-        amt
-    };
-
-    let client = async move {
-        let socket = t!(TcpStream::connect(&addr).await);
-        let mut socket = t!(client_cx.connect("localhost", socket).await);
-        let mut data = Vec::new();
-        loop {
-            let mut buf = [0; 1];
-            match socket.read_exact(&mut buf).await {
-                Ok(_) => data.extend_from_slice(&buf),
-                Err(ref err) if err.kind() == ErrorKind::UnexpectedEof => break,
-                Err(err) => panic!(err),
-            }
-        }
-        data
-    };
-
-    let (amt, data) = join!(server, client);
-    assert_eq!(amt, AMT);
-    assert!(data == vec![9; AMT as usize]);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"d39499c8607262a6112cf883e057780d74435427094588428b33e06d6de49976","Cargo.toml":"7dc2883683e9235e2a8663b2229f29496a5730e22c465be4a277a31e5b0cfbc4","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"e895cbba8345655607ebd830f0101e66d2e6e9287ad3b9ddf697cca230738053","src/cfg.rs":"841d4ffefda4dcfc58bb446a2e5f1979624197144d9b5270a0d87d83bba339f0","src/codec/bytes_codec.rs":"8f72654774efa35ad05f9a6cb442968e29da917610e9829e03b07c6be929c241","src/codec/decoder.rs":"d3dda76d433634afe069096fb7441c4b2a7e7e397d6b539405e57c0091509c51","src/codec/encoder.rs":"e4544af47cdde075d1238ddee9555037912089bf25ce51cb4dd6f5d4f76ecf70","src/codec/framed.rs":"b2658ec109350bede71c921f677837a02e15a6bbe454912377346ca6c26c065d","src/codec/framed_read.rs":"bb8b22d0161a8c12cf2912293d2e7ebef46924f200e99860a4c7419a3cb164b7","src/codec/framed_write.rs":"43710103c96166b47c9f92646e2b0f60ad082aa932d08fd888f39daff78091b0","src/codec/length_delimited.rs":"d7e89abede31908c88b6abaa1cb5f22d0666ce7ba9613a35aed22b0a029e9874","src/codec/lines_codec.rs":"3e5b8bff27094d0084f76b477db8dd3e358c3b5491248c93ac2bfe6ec3d77671","src/codec/mod.rs":"774f4fe3dd1426b2cec676068919e9919225bd483c1a4ec6b2fe5a279698c9be","src/compat.rs":"0ec982a329d043228ac737fede8a6760584a90788b9eef89f6a6532122f1bb05","src/lib.rs":"cc5dd262c58c5f93d7e68a18bfaa25c410510d2a0f6f9f7f3a53cd8fbc320293","src/udp/frame.rs":"2245be9d4199df8731ba699fc011408c1ff3638b89fd23df5c0a80292026b435","src/udp/mod.rs":"699abcf4e12d8180a9e3f2b986edee6e2989ca995ec07c8be1d62d2c263c4a1e","tests/codecs.rs":"6b3ed6b6324a6603644d616bfb8c0719ccc8c3adc30dd31064dd83b0e2385a69","tests/framed.rs":"825c69bf7d5786181e49207a22855aabbb9d61369e9edc11be1dcf1763ec8a8c","tests/framed_read.rs":"426294cf1673156e7faaf58cb3b84a65f57d99ebf90852c3d0423a2e8d635505","tests/framed_write.rs":"fd84338701bcf4b54414c46112910d0193d2db73f794c28f663b4460fe2a3a0b","tests/length_delimited.rs":"3bad5a560b7bf081ebc03b34b190db58035b30138ba2f7c5cc64ae8fd2507700","tests/udp.rs":"d903ab35440ee6e8a10b31cb84937c9454a9ad3c582cb332e909788a15c00c0e"},"package":"be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"51f497ea85d358830c13d3ee4c886a35f226886311a019d52de84a6be887c9ba","Cargo.toml":"c14a5d5601be45a0e62202c2ccaa33d387eb597c1634e22cac7a78c1814f9fb8","LICENSE":"d4ecf952201c14fd13203c2aa64dee75d81271e3d7e3ca0e8aa0e59b9aeeb9c6","README.md":"e895cbba8345655607ebd830f0101e66d2e6e9287ad3b9ddf697cca230738053","src/cfg.rs":"a91243bef2fbc99b72398b5421561b437a3f7f3f20740b3061fa60fa7950bea7","src/codec/any_delimiter_codec.rs":"fd446c0d71fbb4265cd38e4e41c3aee0d3098f21b497440bfe570079da085b82","src/codec/bytes_codec.rs":"2dc3e495094126bb8464524320fe0913d14eb1dc876b483a19829a08300be468","src/codec/decoder.rs":"3c490b40e6c7cad45c3613eb477fa729629d5002de700e2d923730ff5a097a51","src/codec/encoder.rs":"e4544af47cdde075d1238ddee9555037912089bf25ce51cb4dd6f5d4f76ecf70","src/codec/framed.rs":"16d9b667d6c3630cfcc3f667b01f1c65db8b0162c4e676b2c10489ba01212ca7","src/codec/framed_impl.rs":"9a02b92163a5a561cb1ffb48c902f785cb0c01a3e964401f30d3eb062da5cf44","src/codec/framed_read.rs":"bdb8764298d0ed2f8353836a805eeb0359c4570a3f16a06e5f4422fedb3f908d","src/codec/framed_write.rs":"74b6faffe0ec04072b4f95838cf65a97596f290124af95f96caa104cc88a10e6","src/codec/length_delimited.rs":"f658d4dba8314f3e5b81f7c7a213453633408fc43ed51a56ddda2ae84743b4e9","src/codec/lines_codec.rs":"34612ef17ed91bcddacaf3ad7808bd82dd82dbf0412e6f9b79bfe272d9c03a91","src/codec/mod.rs":"95a11e3018bb850ff5934ef48cbc5056bdf2758d130cfa357ad406f0531946ae","src/compat.rs":"0f9e5685d1a4066b69133295135788ce1dd28e1b66e46b0f3ce787f5280cf52f","src/context.rs":"45a23756c6ce6b834da0f1817f556cc5bdd16412ddfc1dc9082da8a56819741a","src/either.rs":"58a020fe066a191712a07dc25788005caf41c9a5f722f4a602746d08f0583807","src/io/mod.rs":"5fb20aa2f526a10c3cbfe3b54658950bddbe77db898a7420754ed34ff568bd63","src/io/read_buf.rs":"7043c2fbec74e548395eb2f12073c41c1b30e2f2c283b30eddfb5a16125387d0","src/io/reader_stream.rs":"90b2b34b786021f34f954716e7d29e37f7d3c700d012313492d79ff92532a0cc","src/io/stream_reader.rs":"675c7fccb00e68c3de8e074c10f5842318fdde8cfe63fc16e73709433e85f97a","src/lib.rs":"208865d46158739358de526763050492a6482e41cedaaf645734511d8089c777","src/loom.rs":"9028ba504687ad5ec98f3c69387bc2424ec23324b1eed3df5082a9cf23c6502e","src/sync/cancellation_token.rs":"55488b4e1abdbd032356ed699498da937cbcd8dd8b81a03b7e31f6cedbc09299","src/sync/intrusive_double_linked_list.rs":"58d5bfb2ce1a2ddb9eeced387c6ca244e820f72c145d857c838ec6d81c3ca4c9","src/sync/mod.rs":"c16a1b489fdbd2e1991b5682d29b3166ff36ebaf6d831b82f3e7d5e34399aa76","src/sync/mpsc.rs":"3acb294324b491f38c25b17df70b5c6eb3cd1a4acb884b8d432c62fe78fbc856","src/sync/poll_semaphore.rs":"968c5120d34dd575d81fa5f62c04b268c13891c9815302bceffdca2f9b930d5a","src/sync/reusable_box.rs":"570d2393465171cda4aac704a4c8a2cc12bd2af45e2d16a1a685d06f106acff3","src/sync/tests/loom_cancellation_token.rs":"6393c5a12f09abef9300be4b66bb039bf02a63a04d6175fb7cfe68464784bdbd","src/sync/tests/mod.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/time/delay_queue.rs":"47616614517a332aa89e39b7feb72ff0502222225eda34cb86aa8578b2952b7e","src/time/mod.rs":"f7a3b1d2253c1f80575555ba8524867267ee07c7f3f5ecd13b3c6ca19c0db1a9","src/time/wheel/level.rs":"75f6b29212e0a58aa3196c78688cc9e23272d8eae3fc829d8b381ab49de2372b","src/time/wheel/mod.rs":"ff97c47c771e672cf43b7458529efe8c065b0f80e8f6a4d05d3a29b32bb81f64","src/time/wheel/stack.rs":"ac5fd0f6cac1bfdd9497b6eaa4f64beb816bc5605ecae463bd10a5e4c48e78c0","src/udp/frame.rs":"0717c9c0442d126b60bffa56217d750933cfd107e584b858b5ea786cc35d6208","src/udp/mod.rs":"869302c0c15eb41f7079ef12ce03fa7c889a83152282ab0b7faf73d1c092ed4e","tests/_require_full.rs":"f8dedb6ad88884209b074ff6f5faa4979528b32653b45ab8047d2ebb28e19122","tests/codecs.rs":"f45fa953d3a5c2b53e4616cbeb4cc637e6a5c69348337949db175d9968c4b0b7","tests/context.rs":"917f80db694b54db07e6d1660aa5210272efda71cc0203f062dfecd81a8289a7","tests/framed.rs":"beb646811ec8e13df08d6d5607dde0f66c316f998e517ab067e5e3c0a68e9dae","tests/framed_read.rs":"2eb86dada9a8477de9926c8216a91ab58e396893564209f5f53028418f6e2706","tests/framed_write.rs":"fd84338701bcf4b54414c46112910d0193d2db73f794c28f663b4460fe2a3a0b","tests/io_reader_stream.rs":"1c9f79782c5574c5e489e86205bdb63b332fc0e8560fc4c2d602dfc2d2741a5e","tests/io_stream_reader.rs":"d86e225eafbd196be3124147b1275bed384459e7ec3e8cb21775906253f75086","tests/length_delimited.rs":"6bb4714c29b8b76ccdaddb59b1ea51f73499e8e223e8b08a62107a9190af4ba5","tests/mpsc.rs":"13fabcb04135739bbfea75defdb81a726d4b24186c5b4bc8d955caa0031ee567","tests/poll_semaphore.rs":"3451b4048b32cbba8f08bf094e71b95d965862267ba1c8b73ca1d4cff6e33ec4","tests/reusable_box.rs":"f12e98533443fd6c53ea586185c7e349a95c595bfd00930d764510592a5274cd","tests/sync_cancellation_token.rs":"f76ea31cd433616434593114677847afba00b4aee8ab85f06a1c2be88f3b0ca3","tests/time_delay_queue.rs":"0892b5d5de451332bb32e6d905d88fc035213b35a2c6a635649e8b346697fa92","tests/udp.rs":"c2f8d90eeae9d3b7f107c12f3723d54ba591ec9e879893e195ec13ecfcb4db27"},"package":"1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,11 +13,11 @@
 [package]
 edition = "2018"
 name = "tokio-util"
-version = "0.3.1"
+version = "0.6.7"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 description = "Additional utilities for working with Tokio.\n"
 homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio-util/0.3.1/tokio_util"
+documentation = "https://docs.rs/tokio-util/0.6.7/tokio_util"
 categories = ["asynchronous"]
 license = "MIT"
 repository = "https://github.com/tokio-rs/tokio"
@@ -25,7 +25,7 @@
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.bytes]
-version = "0.5.0"
+version = "1.0.0"
 
 [dependencies.futures-core]
 version = "0.3.0"
@@ -37,27 +37,49 @@
 [dependencies.futures-sink]
 version = "0.3.0"
 
+[dependencies.futures-util]
+version = "0.3.0"
+optional = true
+
 [dependencies.log]
 version = "0.4"
 
 [dependencies.pin-project-lite]
-version = "0.1.4"
+version = "0.2.0"
+
+[dependencies.slab]
+version = "0.4.1"
+optional = true
 
 [dependencies.tokio]
-version = "0.2.5"
+version = "1.0.0"
+features = ["sync"]
+[dev-dependencies.async-stream]
+version = "0.3.0"
+
 [dev-dependencies.futures]
 version = "0.3.0"
 
+[dev-dependencies.futures-test]
+version = "0.3.5"
+
 [dev-dependencies.tokio]
-version = "0.2.0"
+version = "1.0.0"
 features = ["full"]
 
+[dev-dependencies.tokio-stream]
+version = "0.1"
+
 [dev-dependencies.tokio-test]
-version = "0.2.0"
+version = "0.4.0"
 
 [features]
-codec = ["tokio/stream"]
+__docs_rs = ["futures-util"]
+codec = []
 compat = ["futures-io"]
 default = []
-full = ["codec", "udp", "compat"]
-udp = ["tokio/udp"]
+full = ["codec", "compat", "io", "time", "net", "rt"]
+io = []
+net = ["tokio/net"]
+rt = ["tokio/rt"]
+time = ["tokio/time", "slab"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,148 @@
+# 0.6.7 (May 14, 2021)
+
+### Added
+
+- udp: make `UdpFramed` take `Borrow<UdpSocket>` ([#3451])
+- compat: implement `AsRawFd`/`AsRawHandle` for `Compat<T>` ([#3765])
+
+[#3451]: https://github.com/tokio-rs/tokio/pull/3451
+[#3765]: https://github.com/tokio-rs/tokio/pull/3765
+
+# 0.6.6 (April 12, 2021)
+
+### Added
+
+- util: makes `Framed` and `FramedStream` resumable after eof ([#3272])
+- util: add `PollSemaphore::{add_permits, available_permits}` ([#3683])
+
+### Fixed
+
+- chore: avoid allocation if `PollSemaphore` is unused ([#3634])
+
+[#3272]: https://github.com/tokio-rs/tokio/pull/3272
+[#3634]: https://github.com/tokio-rs/tokio/pull/3634
+[#3683]: https://github.com/tokio-rs/tokio/pull/3683
+
+# 0.6.5 (March 20, 2021)
+
+### Fixed
+
+- util: annotate time module as requiring `time` feature ([#3606])
+
+[#3606]: https://github.com/tokio-rs/tokio/pull/3606
+
+# 0.6.4 (March 9, 2021)
+
+### Added
+
+- codec: `AnyDelimiter` codec ([#3406])
+- sync: add pollable `mpsc::Sender` ([#3490])
+
+### Fixed
+
+- codec: `LinesCodec` should only return `MaxLineLengthExceeded` once per line ([#3556])
+- sync: fuse PollSemaphore ([#3578])
+
+[#3406]: https://github.com/tokio-rs/tokio/pull/3406
+[#3490]: https://github.com/tokio-rs/tokio/pull/3490
+[#3556]: https://github.com/tokio-rs/tokio/pull/3556
+[#3578]: https://github.com/tokio-rs/tokio/pull/3578
+
+# 0.6.3 (January 31, 2021)
+
+### Added
+
+- sync: add `ReusableBoxFuture` utility ([#3464])
+
+### Changed
+
+- sync: use `ReusableBoxFuture` for `PollSemaphore` ([#3463])
+- deps: remove `async-stream` dependency ([#3463])
+- deps: remove `tokio-stream` dependency ([#3487])
+
+# 0.6.2 (January 21, 2021)
+
+### Added
+
+- sync: add pollable `Semaphore` ([#3444])
+
+### Fixed
+
+- time: fix panics on updating `DelayQueue` entries ([#3270])
+
+# 0.6.1 (January 12, 2021)
+
+### Added
+
+- codec: `get_ref()`, `get_mut()`, `get_pin_mut()` and `into_inner()` for
+  `Framed`, `FramedRead`, `FramedWrite` and `StreamReader` ([#3364]).
+- codec: `write_buffer()` and `write_buffer_mut()` for `Framed` and
+  `FramedWrite` ([#3387]).
+
+# 0.6.0 (December 23, 2020)
+
+### Changed
+- depend on `tokio` 1.0.
+
+### Added
+- rt: add constructors to `TokioContext` (#3221).
+
+# 0.5.1 (December 3, 2020)
+
+### Added
+- io: `poll_read_buf` util fn (#2972).
+- io: `poll_write_buf` util fn with vectored write support (#3156).
+
+# 0.5.0 (October 30, 2020)
+
+### Changed
+- io: update `bytes` to 0.6 (#3071).
+
+# 0.4.0 (October 15, 2020)
+
+### Added
+- sync: `CancellationToken` for coordinating task cancellation (#2747).
+- rt: `TokioContext` sets the Tokio runtime for the duration of a future (#2791)
+- io: `StreamReader`/`ReaderStream` map between `AsyncRead` values and `Stream`
+  of bytes (#2788).
+- time: `DelayQueue` to manage many delays (#2897).
+
 # 0.3.1 (March 18, 2020)
 
 ### Fixed
 
 - Adjust minimum-supported Tokio version to v0.2.5 to account for an internal
-  dependency on features in that version of Tokio. (#2326)
+  dependency on features in that version of Tokio. ([#2326])
 
 # 0.3.0 (March 4, 2020)
 
 ### Changed
 
 - **Breaking Change**: Change `Encoder` trait to take a generic `Item` parameter, which allows
-  codec writers to pass references into `Framed` and `FramedWrite` types. (#1746)
+  codec writers to pass references into `Framed` and `FramedWrite` types. ([#1746])
 
 ### Added
 
-- Add futures-io/tokio::io compatibility layer. (#2117)
-- Add `Framed::with_capacity`. (#2215)
+- Add futures-io/tokio::io compatibility layer. ([#2117])
+- Add `Framed::with_capacity`. ([#2215])
 
 ### Fixed
 
-- Use advance over split_to when data is not needed. (#2198)
+- Use advance over split_to when data is not needed. ([#2198])
 
 # 0.2.0 (November 26, 2019)
 
 - Initial release
+
+[#3487]: https://github.com/tokio-rs/tokio/pull/3487
+[#3464]: https://github.com/tokio-rs/tokio/pull/3464
+[#3463]: https://github.com/tokio-rs/tokio/pull/3463
+[#3444]: https://github.com/tokio-rs/tokio/pull/3444
+[#3387]: https://github.com/tokio-rs/tokio/pull/3387
+[#3364]: https://github.com/tokio-rs/tokio/pull/3364
+[#3270]: https://github.com/tokio-rs/tokio/pull/3270
+[#2326]: https://github.com/tokio-rs/tokio/pull/2326
+[#2215]: https://github.com/tokio-rs/tokio/pull/2215
+[#2198]: https://github.com/tokio-rs/tokio/pull/2198
+[#2117]: https://github.com/tokio-rs/tokio/pull/2117
+[#1746]: https://github.com/tokio-rs/tokio/pull/1746
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Tokio Contributors
+Copyright (c) 2021 Tokio Contributors
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/cfg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/cfg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/cfg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/cfg.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,11 +18,41 @@
     }
 }
 
-macro_rules! cfg_udp {
+macro_rules! cfg_net {
     ($($item:item)*) => {
         $(
-            #[cfg(all(feature = "udp", feature = "codec"))]
-            #[cfg_attr(docsrs, doc(cfg(all(feature = "udp", feature = "codec"))))]
+            #[cfg(all(feature = "net", feature = "codec"))]
+            #[cfg_attr(docsrs, doc(cfg(all(feature = "net", feature = "codec"))))]
+            $item
+        )*
+    }
+}
+
+macro_rules! cfg_io {
+    ($($item:item)*) => {
+        $(
+            #[cfg(feature = "io")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "io")))]
+            $item
+        )*
+    }
+}
+
+macro_rules! cfg_rt {
+    ($($item:item)*) => {
+        $(
+            #[cfg(feature = "rt")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "rt")))]
+            $item
+        )*
+    }
+}
+
+macro_rules! cfg_time {
+    ($($item:item)*) => {
+        $(
+            #[cfg(feature = "time")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "time")))]
             $item
         )*
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/any_delimiter_codec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/any_delimiter_codec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/any_delimiter_codec.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/any_delimiter_codec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,263 @@
+use crate::codec::decoder::Decoder;
+use crate::codec::encoder::Encoder;
+
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+use std::{cmp, fmt, io, str, usize};
+
+const DEFAULT_SEEK_DELIMITERS: &[u8] = b",;\n\r";
+const DEFAULT_SEQUENCE_WRITER: &[u8] = b",";
+/// A simple [`Decoder`] and [`Encoder`] implementation that splits up data into chunks based on any character in the given delimiter string.
+///
+/// [`Decoder`]: crate::codec::Decoder
+/// [`Encoder`]: crate::codec::Encoder
+///
+/// # Example
+/// Decode string of bytes containing various different delimiters.
+///
+/// [`BytesMut`]: bytes::BytesMut
+/// [`Error`]: std::io::Error
+///
+/// ```
+/// use tokio_util::codec::{AnyDelimiterCodec, Decoder};
+/// use bytes::{BufMut, BytesMut};
+///
+/// #
+/// # #[tokio::main(flavor = "current_thread")]
+/// # async fn main() -> Result<(), std::io::Error> {
+/// let mut codec = AnyDelimiterCodec::new(b",;\r\n".to_vec(),b";".to_vec());
+/// let buf = &mut BytesMut::new();
+/// buf.reserve(200);
+/// buf.put_slice(b"chunk 1,chunk 2;chunk 3\n\r");
+/// assert_eq!("chunk 1", codec.decode(buf).unwrap().unwrap());
+/// assert_eq!("chunk 2", codec.decode(buf).unwrap().unwrap());
+/// assert_eq!("chunk 3", codec.decode(buf).unwrap().unwrap());
+/// assert_eq!("", codec.decode(buf).unwrap().unwrap());
+/// assert_eq!(None, codec.decode(buf).unwrap());
+/// # Ok(())
+/// # }
+/// ```
+///
+#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+pub struct AnyDelimiterCodec {
+    // Stored index of the next index to examine for the delimiter character.
+    // This is used to optimize searching.
+    // For example, if `decode` was called with `abc` and the delimiter is '{}', it would hold `3`,
+    // because that is the next index to examine.
+    // The next time `decode` is called with `abcde}`, the method will
+    // only look at `de}` before returning.
+    next_index: usize,
+
+    /// The maximum length for a given chunk. If `usize::MAX`, chunks will be
+    /// read until a delimiter character is reached.
+    max_length: usize,
+
+    /// Are we currently discarding the remainder of a chunk which was over
+    /// the length limit?
+    is_discarding: bool,
+
+    /// The bytes that are using for search during decode
+    seek_delimiters: Vec<u8>,
+
+    /// The bytes that are using for encoding
+    sequence_writer: Vec<u8>,
+}
+
+impl AnyDelimiterCodec {
+    /// Returns a `AnyDelimiterCodec` for splitting up data into chunks.
+    ///
+    /// # Note
+    ///
+    /// The returned `AnyDelimiterCodec` will not have an upper bound on the length
+    /// of a buffered chunk. See the documentation for [`new_with_max_length`]
+    /// for information on why this could be a potential security risk.
+    ///
+    /// [`new_with_max_length`]: crate::codec::AnyDelimiterCodec::new_with_max_length()
+    pub fn new(seek_delimiters: Vec<u8>, sequence_writer: Vec<u8>) -> AnyDelimiterCodec {
+        AnyDelimiterCodec {
+            next_index: 0,
+            max_length: usize::MAX,
+            is_discarding: false,
+            seek_delimiters,
+            sequence_writer,
+        }
+    }
+
+    /// Returns a `AnyDelimiterCodec` with a maximum chunk length limit.
+    ///
+    /// If this is set, calls to `AnyDelimiterCodec::decode` will return a
+    /// [`AnyDelimiterCodecError`] when a chunk exceeds the length limit. Subsequent calls
+    /// will discard up to `limit` bytes from that chunk until a delimiter
+    /// character is reached, returning `None` until the delimiter over the limit
+    /// has been fully discarded. After that point, calls to `decode` will
+    /// function as normal.
+    ///
+    /// # Note
+    ///
+    /// Setting a length limit is highly recommended for any `AnyDelimiterCodec` which
+    /// will be exposed to untrusted input. Otherwise, the size of the buffer
+    /// that holds the chunk currently being read is unbounded. An attacker could
+    /// exploit this unbounded buffer by sending an unbounded amount of input
+    /// without any delimiter characters, causing unbounded memory consumption.
+    ///
+    /// [`AnyDelimiterCodecError`]: crate::codec::AnyDelimiterCodecError
+    pub fn new_with_max_length(
+        seek_delimiters: Vec<u8>,
+        sequence_writer: Vec<u8>,
+        max_length: usize,
+    ) -> Self {
+        AnyDelimiterCodec {
+            max_length,
+            ..AnyDelimiterCodec::new(seek_delimiters, sequence_writer)
+        }
+    }
+
+    /// Returns the maximum chunk length when decoding.
+    ///
+    /// ```
+    /// use std::usize;
+    /// use tokio_util::codec::AnyDelimiterCodec;
+    ///
+    /// let codec = AnyDelimiterCodec::new(b",;\n".to_vec(), b";".to_vec());
+    /// assert_eq!(codec.max_length(), usize::MAX);
+    /// ```
+    /// ```
+    /// use tokio_util::codec::AnyDelimiterCodec;
+    ///
+    /// let codec = AnyDelimiterCodec::new_with_max_length(b",;\n".to_vec(), b";".to_vec(), 256);
+    /// assert_eq!(codec.max_length(), 256);
+    /// ```
+    pub fn max_length(&self) -> usize {
+        self.max_length
+    }
+}
+
+impl Decoder for AnyDelimiterCodec {
+    type Item = Bytes;
+    type Error = AnyDelimiterCodecError;
+
+    fn decode(&mut self, buf: &mut BytesMut) -> Result<Option<Bytes>, AnyDelimiterCodecError> {
+        loop {
+            // Determine how far into the buffer we'll search for a delimiter. If
+            // there's no max_length set, we'll read to the end of the buffer.
+            let read_to = cmp::min(self.max_length.saturating_add(1), buf.len());
+
+            let new_chunk_offset = buf[self.next_index..read_to].iter().position(|b| {
+                self.seek_delimiters
+                    .iter()
+                    .any(|delimiter| *b == *delimiter)
+            });
+
+            match (self.is_discarding, new_chunk_offset) {
+                (true, Some(offset)) => {
+                    // If we found a new chunk, discard up to that offset and
+                    // then stop discarding. On the next iteration, we'll try
+                    // to read a chunk normally.
+                    buf.advance(offset + self.next_index + 1);
+                    self.is_discarding = false;
+                    self.next_index = 0;
+                }
+                (true, None) => {
+                    // Otherwise, we didn't find a new chunk, so we'll discard
+                    // everything we read. On the next iteration, we'll continue
+                    // discarding up to max_len bytes unless we find a new chunk.
+                    buf.advance(read_to);
+                    self.next_index = 0;
+                    if buf.is_empty() {
+                        return Ok(None);
+                    }
+                }
+                (false, Some(offset)) => {
+                    // Found a chunk!
+                    let new_chunk_index = offset + self.next_index;
+                    self.next_index = 0;
+                    let mut chunk = buf.split_to(new_chunk_index + 1);
+                    chunk.truncate(chunk.len() - 1);
+                    let chunk = chunk.freeze();
+                    return Ok(Some(chunk));
+                }
+                (false, None) if buf.len() > self.max_length => {
+                    // Reached the maximum length without finding a
+                    // new chunk, return an error and start discarding on the
+                    // next call.
+                    self.is_discarding = true;
+                    return Err(AnyDelimiterCodecError::MaxChunkLengthExceeded);
+                }
+                (false, None) => {
+                    // We didn't find a chunk or reach the length limit, so the next
+                    // call will resume searching at the current offset.
+                    self.next_index = read_to;
+                    return Ok(None);
+                }
+            }
+        }
+    }
+
+    fn decode_eof(&mut self, buf: &mut BytesMut) -> Result<Option<Bytes>, AnyDelimiterCodecError> {
+        Ok(match self.decode(buf)? {
+            Some(frame) => Some(frame),
+            None => {
+                // return remaining data, if any
+                if buf.is_empty() {
+                    None
+                } else {
+                    let chunk = buf.split_to(buf.len());
+                    self.next_index = 0;
+                    Some(chunk.freeze())
+                }
+            }
+        })
+    }
+}
+
+impl<T> Encoder<T> for AnyDelimiterCodec
+where
+    T: AsRef<str>,
+{
+    type Error = AnyDelimiterCodecError;
+
+    fn encode(&mut self, chunk: T, buf: &mut BytesMut) -> Result<(), AnyDelimiterCodecError> {
+        let chunk = chunk.as_ref();
+        buf.reserve(chunk.len() + 1);
+        buf.put(chunk.as_bytes());
+        buf.put(self.sequence_writer.as_ref());
+
+        Ok(())
+    }
+}
+
+impl Default for AnyDelimiterCodec {
+    fn default() -> Self {
+        Self::new(
+            DEFAULT_SEEK_DELIMITERS.to_vec(),
+            DEFAULT_SEQUENCE_WRITER.to_vec(),
+        )
+    }
+}
+
+/// An error occured while encoding or decoding a chunk.
+#[derive(Debug)]
+pub enum AnyDelimiterCodecError {
+    /// The maximum chunk length was exceeded.
+    MaxChunkLengthExceeded,
+    /// An IO error occurred.
+    Io(io::Error),
+}
+
+impl fmt::Display for AnyDelimiterCodecError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AnyDelimiterCodecError::MaxChunkLengthExceeded => {
+                write!(f, "max chunk length exceeded")
+            }
+            AnyDelimiterCodecError::Io(e) => write!(f, "{}", e),
+        }
+    }
+}
+
+impl From<io::Error> for AnyDelimiterCodecError {
+    fn from(e: io::Error) -> AnyDelimiterCodecError {
+        AnyDelimiterCodecError::Io(e)
+    }
+}
+
+impl std::error::Error for AnyDelimiterCodecError {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/bytes_codec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/bytes_codec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/bytes_codec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/bytes_codec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,7 +33,7 @@
 /// #     }
 /// # }
 /// #
-/// # #[tokio::main(core_threads = 1)]
+/// # #[tokio::main(flavor = "current_thread")]
 /// # async fn main() -> Result<(), std::io::Error> {
 /// let my_async_read = File::open("filename.txt").await?;
 /// let my_stream_of_bytes = FramedRead::new(my_async_read, BytesCodec::new());
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/decoder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/decoder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/decoder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/decoder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,6 +16,20 @@
 /// implementing stateful streaming parsers. In many cases, though, this type
 /// will simply be a unit struct (e.g. `struct HttpDecoder`).
 ///
+/// For some underlying data-sources, namely files and FIFOs,
+/// it's possible to temporarily read 0 bytes by reaching EOF.
+///
+/// In these cases `decode_eof` will be called until it signals
+/// fullfillment of all closing frames by returning `Ok(None)`.
+/// After that, repeated attempts to read from the [`Framed`] or [`FramedRead`]
+/// will not invoke `decode` or `decode_eof` again, until data can be read
+/// during a retry.
+///
+/// It is up to the Decoder to keep track of a restart after an EOF,
+/// and to decide how to handle such an event by, for example,
+/// allowing frames to cross EOF boundaries, re-emitting opening frames, or
+/// reseting the entire internal state.
+///
 /// [`Framed`]: crate::codec::Framed
 /// [`FramedRead`]: crate::codec::FramedRead
 pub trait Decoder {
@@ -115,13 +129,18 @@
     /// This method defaults to calling `decode` and returns an error if
     /// `Ok(None)` is returned while there is unconsumed data in `buf`.
     /// Typically this doesn't need to be implemented unless the framing
-    /// protocol differs near the end of the stream.
+    /// protocol differs near the end of the stream, or if you need to construct
+    /// frames _across_ eof boundaries on sources that can be resumed.
     ///
     /// Note that the `buf` argument may be empty. If a previous call to
     /// `decode_eof` consumed all the bytes in the buffer, `decode_eof` will be
     /// called again until it returns `None`, indicating that there are no more
     /// frames to yield. This behavior enables returning finalization frames
     /// that may not be based on inbound data.
+    ///
+    /// Once `None` has been returned, `decode_eof` won't be called again until
+    /// an attempt to resume the stream has been made, where the underlying stream
+    /// actually returned more data.
     fn decode_eof(&mut self, buf: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
         match self.decode(buf)? {
             Some(frame) => Ok(Some(frame)),
@@ -153,7 +172,7 @@
     /// calling `split` on the [`Framed`] returned by this method, which will
     /// break them into separate objects, allowing them to interact more easily.
     ///
-    /// [`Stream`]: tokio::stream::Stream
+    /// [`Stream`]: futures_core::Stream
     /// [`Sink`]: futures_sink::Sink
     /// [`Framed`]: crate::codec::Framed
     fn framed<T: AsyncRead + AsyncWrite + Sized>(self, io: T) -> Framed<T, Self>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/framed_impl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/framed_impl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/framed_impl.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/framed_impl.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,278 @@
+use crate::codec::decoder::Decoder;
+use crate::codec::encoder::Encoder;
+
+use futures_core::Stream;
+use tokio::io::{AsyncRead, AsyncWrite};
+
+use bytes::BytesMut;
+use futures_core::ready;
+use futures_sink::Sink;
+use log::trace;
+use pin_project_lite::pin_project;
+use std::borrow::{Borrow, BorrowMut};
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+pin_project! {
+    #[derive(Debug)]
+    pub(crate) struct FramedImpl<T, U, State> {
+        #[pin]
+        pub(crate) inner: T,
+        pub(crate) state: State,
+        pub(crate) codec: U,
+    }
+}
+
+const INITIAL_CAPACITY: usize = 8 * 1024;
+const BACKPRESSURE_BOUNDARY: usize = INITIAL_CAPACITY;
+
+pub(crate) struct ReadFrame {
+    pub(crate) eof: bool,
+    pub(crate) is_readable: bool,
+    pub(crate) buffer: BytesMut,
+}
+
+pub(crate) struct WriteFrame {
+    pub(crate) buffer: BytesMut,
+}
+
+#[derive(Default)]
+pub(crate) struct RWFrames {
+    pub(crate) read: ReadFrame,
+    pub(crate) write: WriteFrame,
+}
+
+impl Default for ReadFrame {
+    fn default() -> Self {
+        Self {
+            eof: false,
+            is_readable: false,
+            buffer: BytesMut::with_capacity(INITIAL_CAPACITY),
+        }
+    }
+}
+
+impl Default for WriteFrame {
+    fn default() -> Self {
+        Self {
+            buffer: BytesMut::with_capacity(INITIAL_CAPACITY),
+        }
+    }
+}
+
+impl From<BytesMut> for ReadFrame {
+    fn from(mut buffer: BytesMut) -> Self {
+        let size = buffer.capacity();
+        if size < INITIAL_CAPACITY {
+            buffer.reserve(INITIAL_CAPACITY - size);
+        }
+
+        Self {
+            buffer,
+            is_readable: size > 0,
+            eof: false,
+        }
+    }
+}
+
+impl From<BytesMut> for WriteFrame {
+    fn from(mut buffer: BytesMut) -> Self {
+        let size = buffer.capacity();
+        if size < INITIAL_CAPACITY {
+            buffer.reserve(INITIAL_CAPACITY - size);
+        }
+
+        Self { buffer }
+    }
+}
+
+impl Borrow<ReadFrame> for RWFrames {
+    fn borrow(&self) -> &ReadFrame {
+        &self.read
+    }
+}
+impl BorrowMut<ReadFrame> for RWFrames {
+    fn borrow_mut(&mut self) -> &mut ReadFrame {
+        &mut self.read
+    }
+}
+impl Borrow<WriteFrame> for RWFrames {
+    fn borrow(&self) -> &WriteFrame {
+        &self.write
+    }
+}
+impl BorrowMut<WriteFrame> for RWFrames {
+    fn borrow_mut(&mut self) -> &mut WriteFrame {
+        &mut self.write
+    }
+}
+impl<T, U, R> Stream for FramedImpl<T, U, R>
+where
+    T: AsyncRead,
+    U: Decoder,
+    R: BorrowMut<ReadFrame>,
+{
+    type Item = Result<U::Item, U::Error>;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        use crate::util::poll_read_buf;
+
+        let mut pinned = self.project();
+        let state: &mut ReadFrame = pinned.state.borrow_mut();
+        // The following loops implements a state machine with each state corresponding
+        // to a combination of the `is_readable` and `eof` flags. States persist across
+        // loop entries and most state transitions occur with a return.
+        //
+        // The intitial state is `reading`.
+        //
+        // | state   | eof   | is_readable |
+        // |---------|-------|-------------|
+        // | reading | false | false       |
+        // | framing | false | true        |
+        // | pausing | true  | true        |
+        // | paused  | true  | false       |
+        //
+        //                                 `decode_eof`
+        //                                 returns `Some`             read 0 bytes
+        //                                   │       │                 │      │
+        //                                   │       ▼                 │      ▼
+        //                                   ┌───────� `decode_eof`    ┌──────�
+        //                 ┌──read 0 bytes──▶│pausing│─returns `None`─▶│paused│──�
+        //                 │                 └───────┘                 └──────┘  │
+        // pending read�   │                     ┌──────�                  │  ▲  │
+        //      │      │   │                     │      │                  │  │  │
+        //      │      ▼   │                     │  `decode` returns `Some`│ pending read
+        //      │  ╔�������╗                 ┌───────�◀─┘                  │
+        //      └──║reading║─read n>0 bytes─▶│framing│                     │
+        //         ╚��������                 └───────┘◀──────read n>0 bytes┘
+        //             ▲                         │
+        //             │                         │
+        //             └─`decode` returns `None`─┘
+        loop {
+            // Repeatedly call `decode` or `decode_eof` while the buffer is "readable",
+            // i.e. it _might_ contain data consumable as a frame or closing frame.
+            // Both signal that there is no such data by returning `None`.
+            //
+            // If `decode` couldn't read a frame and the upstream source has returned eof,
+            // `decode_eof` will attemp to decode the remaining bytes as closing frames.
+            //
+            // If the underlying AsyncRead is resumable, we may continue after an EOF,
+            // but must finish emmiting all of it's associated `decode_eof` frames.
+            // Furthermore, we don't want to emit any `decode_eof` frames on retried
+            // reads after an EOF unless we've actually read more data.
+            if state.is_readable {
+                // pausing or framing
+                if state.eof {
+                    // pausing
+                    let frame = pinned.codec.decode_eof(&mut state.buffer)?;
+                    if frame.is_none() {
+                        state.is_readable = false; // prepare pausing -> paused
+                    }
+                    // implicit pausing -> pausing or pausing -> paused
+                    return Poll::Ready(frame.map(Ok));
+                }
+
+                // framing
+                trace!("attempting to decode a frame");
+
+                if let Some(frame) = pinned.codec.decode(&mut state.buffer)? {
+                    trace!("frame decoded from buffer");
+                    // implicit framing -> framing
+                    return Poll::Ready(Some(Ok(frame)));
+                }
+
+                // framing -> reading
+                state.is_readable = false;
+            }
+            // reading or paused
+            // If we can't build a frame yet, try to read more data and try again.
+            // Make sure we've got room for at least one byte to read to ensure
+            // that we don't get a spurious 0 that looks like EOF.
+            state.buffer.reserve(1);
+            let bytect = match poll_read_buf(pinned.inner.as_mut(), cx, &mut state.buffer)? {
+                Poll::Ready(ct) => ct,
+                // implicit reading -> reading or implicit paused -> paused
+                Poll::Pending => return Poll::Pending,
+            };
+            if bytect == 0 {
+                if state.eof {
+                    // We're already at an EOF, and since we've reached this path
+                    // we're also not readable. This implies that we've already finished
+                    // our `decode_eof` handling, so we can simply return `None`.
+                    // implicit paused -> paused
+                    return Poll::Ready(None);
+                }
+                // prepare reading -> paused
+                state.eof = true;
+            } else {
+                // prepare paused -> framing or noop reading -> framing
+                state.eof = false;
+            }
+
+            // paused -> framing or reading -> framing or reading -> pausing
+            state.is_readable = true;
+        }
+    }
+}
+
+impl<T, I, U, W> Sink<I> for FramedImpl<T, U, W>
+where
+    T: AsyncWrite,
+    U: Encoder<I>,
+    U::Error: From<io::Error>,
+    W: BorrowMut<WriteFrame>,
+{
+    type Error = U::Error;
+
+    fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        if self.state.borrow().buffer.len() >= BACKPRESSURE_BOUNDARY {
+            self.as_mut().poll_flush(cx)
+        } else {
+            Poll::Ready(Ok(()))
+        }
+    }
+
+    fn start_send(self: Pin<&mut Self>, item: I) -> Result<(), Self::Error> {
+        let pinned = self.project();
+        pinned
+            .codec
+            .encode(item, &mut pinned.state.borrow_mut().buffer)?;
+        Ok(())
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        use crate::util::poll_write_buf;
+        trace!("flushing framed transport");
+        let mut pinned = self.project();
+
+        while !pinned.state.borrow_mut().buffer.is_empty() {
+            let WriteFrame { buffer } = pinned.state.borrow_mut();
+            trace!("writing; remaining={}", buffer.len());
+
+            let n = ready!(poll_write_buf(pinned.inner.as_mut(), cx, buffer))?;
+
+            if n == 0 {
+                return Poll::Ready(Err(io::Error::new(
+                    io::ErrorKind::WriteZero,
+                    "failed to \
+                     write frame to transport",
+                )
+                .into()));
+            }
+        }
+
+        // Try flushing the underlying IO
+        ready!(pinned.inner.poll_flush(cx))?;
+
+        trace!("framed transport flushed");
+        Poll::Ready(Ok(()))
+    }
+
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        ready!(self.as_mut().poll_flush(cx))?;
+        ready!(self.project().inner.poll_shutdown(cx))?;
+
+        Poll::Ready(Ok(()))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/framed_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/framed_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/framed_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/framed_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
-use crate::codec::framed::{Fuse, ProjectFuse};
+use crate::codec::framed_impl::{FramedImpl, ReadFrame};
 use crate::codec::Decoder;
 
-use tokio::{io::AsyncRead, stream::Stream};
+use futures_core::Stream;
+use tokio::io::AsyncRead;
 
 use bytes::BytesMut;
 use futures_sink::Sink;
-use log::trace;
 use pin_project_lite::pin_project;
 use std::fmt;
 use std::pin::Pin;
@@ -14,26 +14,14 @@
 pin_project! {
     /// A [`Stream`] of messages decoded from an [`AsyncRead`].
     ///
-    /// [`Stream`]: tokio::stream::Stream
+    /// [`Stream`]: futures_core::Stream
     /// [`AsyncRead`]: tokio::io::AsyncRead
     pub struct FramedRead<T, D> {
         #[pin]
-        inner: FramedRead2<Fuse<T, D>>,
+        inner: FramedImpl<T, D, ReadFrame>,
     }
 }
 
-pin_project! {
-    pub(crate) struct FramedRead2<T> {
-        #[pin]
-        inner: T,
-        eof: bool,
-        is_readable: bool,
-        buffer: BytesMut,
-    }
-}
-
-const INITIAL_CAPACITY: usize = 8 * 1024;
-
 // ===== impl FramedRead =====
 
 impl<T, D> FramedRead<T, D>
@@ -44,10 +32,11 @@
     /// Creates a new `FramedRead` with the given `decoder`.
     pub fn new(inner: T, decoder: D) -> FramedRead<T, D> {
         FramedRead {
-            inner: framed_read2(Fuse {
-                io: inner,
+            inner: FramedImpl {
+                inner,
                 codec: decoder,
-            }),
+                state: Default::default(),
+            },
         }
     }
 
@@ -55,13 +44,15 @@
     /// initial size.
     pub fn with_capacity(inner: T, decoder: D, capacity: usize) -> FramedRead<T, D> {
         FramedRead {
-            inner: framed_read2_with_buffer(
-                Fuse {
-                    io: inner,
-                    codec: decoder,
+            inner: FramedImpl {
+                inner,
+                codec: decoder,
+                state: ReadFrame {
+                    eof: false,
+                    is_readable: false,
+                    buffer: BytesMut::with_capacity(capacity),
                 },
-                BytesMut::with_capacity(capacity),
-            ),
+            },
         }
     }
 }
@@ -74,7 +65,7 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn get_ref(&self) -> &T {
-        &self.inner.inner.io
+        &self.inner.inner
     }
 
     /// Returns a mutable reference to the underlying I/O stream wrapped by
@@ -84,7 +75,17 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn get_mut(&mut self) -> &mut T {
-        &mut self.inner.inner.io
+        &mut self.inner.inner
+    }
+
+    /// Returns a pinned mutable reference to the underlying I/O stream wrapped by
+    /// `FramedRead`.
+    ///
+    /// Note that care should be taken to not tamper with the underlying stream
+    /// of data coming in as it may corrupt the stream of frames otherwise
+    /// being worked with.
+    pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
+        self.project().inner.project().inner
     }
 
     /// Consumes the `FramedRead`, returning its underlying I/O stream.
@@ -93,25 +94,31 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn into_inner(self) -> T {
-        self.inner.inner.io
+        self.inner.inner
     }
 
     /// Returns a reference to the underlying decoder.
     pub fn decoder(&self) -> &D {
-        &self.inner.inner.codec
+        &self.inner.codec
     }
 
     /// Returns a mutable reference to the underlying decoder.
     pub fn decoder_mut(&mut self) -> &mut D {
-        &mut self.inner.inner.codec
+        &mut self.inner.codec
     }
 
     /// Returns a reference to the read buffer.
     pub fn read_buffer(&self) -> &BytesMut {
-        &self.inner.buffer
+        &self.inner.state.buffer
+    }
+
+    /// Returns a mutable reference to the read buffer.
+    pub fn read_buffer_mut(&mut self) -> &mut BytesMut {
+        &mut self.inner.state.buffer
     }
 }
 
+// This impl just defers to the underlying FramedImpl
 impl<T, D> Stream for FramedRead<T, D>
 where
     T: AsyncRead,
@@ -132,43 +139,19 @@
     type Error = T::Error;
 
     fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.project()
-            .inner
-            .project()
-            .inner
-            .project()
-            .io
-            .poll_ready(cx)
+        self.project().inner.project().inner.poll_ready(cx)
     }
 
     fn start_send(self: Pin<&mut Self>, item: I) -> Result<(), Self::Error> {
-        self.project()
-            .inner
-            .project()
-            .inner
-            .project()
-            .io
-            .start_send(item)
+        self.project().inner.project().inner.start_send(item)
     }
 
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.project()
-            .inner
-            .project()
-            .inner
-            .project()
-            .io
-            .poll_flush(cx)
+        self.project().inner.project().inner.poll_flush(cx)
     }
 
     fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.project()
-            .inner
-            .project()
-            .inner
-            .project()
-            .io
-            .poll_close(cx)
+        self.project().inner.project().inner.poll_close(cx)
     }
 }
 
@@ -179,126 +162,11 @@
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("FramedRead")
-            .field("inner", &self.inner.inner.io)
-            .field("decoder", &self.inner.inner.codec)
-            .field("eof", &self.inner.eof)
-            .field("is_readable", &self.inner.is_readable)
-            .field("buffer", &self.inner.buffer)
+            .field("inner", &self.get_ref())
+            .field("decoder", &self.decoder())
+            .field("eof", &self.inner.state.eof)
+            .field("is_readable", &self.inner.state.is_readable)
+            .field("buffer", &self.read_buffer())
             .finish()
     }
 }
-
-// ===== impl FramedRead2 =====
-
-pub(crate) fn framed_read2<T>(inner: T) -> FramedRead2<T> {
-    FramedRead2 {
-        inner,
-        eof: false,
-        is_readable: false,
-        buffer: BytesMut::with_capacity(INITIAL_CAPACITY),
-    }
-}
-
-pub(crate) fn framed_read2_with_buffer<T>(inner: T, mut buf: BytesMut) -> FramedRead2<T> {
-    if buf.capacity() < INITIAL_CAPACITY {
-        let bytes_to_reserve = INITIAL_CAPACITY - buf.capacity();
-        buf.reserve(bytes_to_reserve);
-    }
-    FramedRead2 {
-        inner,
-        eof: false,
-        is_readable: !buf.is_empty(),
-        buffer: buf,
-    }
-}
-
-impl<T> FramedRead2<T> {
-    pub(crate) fn get_ref(&self) -> &T {
-        &self.inner
-    }
-
-    pub(crate) fn into_inner(self) -> T {
-        self.inner
-    }
-
-    pub(crate) fn into_parts(self) -> (T, BytesMut) {
-        (self.inner, self.buffer)
-    }
-
-    pub(crate) fn get_mut(&mut self) -> &mut T {
-        &mut self.inner
-    }
-
-    pub(crate) fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
-        self.project().inner
-    }
-
-    pub(crate) fn buffer(&self) -> &BytesMut {
-        &self.buffer
-    }
-}
-
-impl<T> Stream for FramedRead2<T>
-where
-    T: ProjectFuse + AsyncRead,
-    T::Codec: Decoder,
-{
-    type Item = Result<<T::Codec as Decoder>::Item, <T::Codec as Decoder>::Error>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let mut pinned = self.project();
-        loop {
-            // Repeatedly call `decode` or `decode_eof` as long as it is
-            // "readable". Readable is defined as not having returned `None`. If
-            // the upstream has returned EOF, and the decoder is no longer
-            // readable, it can be assumed that the decoder will never become
-            // readable again, at which point the stream is terminated.
-            if *pinned.is_readable {
-                if *pinned.eof {
-                    let frame = pinned
-                        .inner
-                        .as_mut()
-                        .project()
-                        .codec
-                        .decode_eof(&mut pinned.buffer)?;
-                    return Poll::Ready(frame.map(Ok));
-                }
-
-                trace!("attempting to decode a frame");
-
-                if let Some(frame) = pinned
-                    .inner
-                    .as_mut()
-                    .project()
-                    .codec
-                    .decode(&mut pinned.buffer)?
-                {
-                    trace!("frame decoded from buffer");
-                    return Poll::Ready(Some(Ok(frame)));
-                }
-
-                *pinned.is_readable = false;
-            }
-
-            assert!(!*pinned.eof);
-
-            // Otherwise, try to read more data and try again. Make sure we've
-            // got room for at least one byte to read to ensure that we don't
-            // get a spurious 0 that looks like EOF
-            pinned.buffer.reserve(1);
-            let bytect = match pinned
-                .inner
-                .as_mut()
-                .poll_read_buf(cx, &mut pinned.buffer)?
-            {
-                Poll::Ready(ct) => ct,
-                Poll::Pending => return Poll::Pending,
-            };
-            if bytect == 0 {
-                *pinned.eof = true;
-            }
-
-            *pinned.is_readable = true;
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/framed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/framed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/framed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/framed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,19 +1,15 @@
 use crate::codec::decoder::Decoder;
 use crate::codec::encoder::Encoder;
-use crate::codec::framed_read::{framed_read2, framed_read2_with_buffer, FramedRead2};
-use crate::codec::framed_write::{framed_write2, framed_write2_with_buffer, FramedWrite2};
+use crate::codec::framed_impl::{FramedImpl, RWFrames, ReadFrame, WriteFrame};
 
-use tokio::{
-    io::{AsyncBufRead, AsyncRead, AsyncWrite},
-    stream::Stream,
-};
+use futures_core::Stream;
+use tokio::io::{AsyncRead, AsyncWrite};
 
 use bytes::BytesMut;
 use futures_sink::Sink;
 use pin_project_lite::pin_project;
 use std::fmt;
-use std::io::{self, BufRead, Read, Write};
-use std::mem::MaybeUninit;
+use std::io;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
@@ -24,43 +20,13 @@
     /// You can create a `Framed` instance by using the [`Decoder::framed`] adapter, or
     /// by using the `new` function seen below.
     ///
-    /// [`Stream`]: tokio::stream::Stream
+    /// [`Stream`]: futures_core::Stream
     /// [`Sink`]: futures_sink::Sink
     /// [`AsyncRead`]: tokio::io::AsyncRead
     /// [`Decoder::framed`]: crate::codec::Decoder::framed()
     pub struct Framed<T, U> {
         #[pin]
-        inner: FramedRead2<FramedWrite2<Fuse<T, U>>>,
-    }
-}
-
-pin_project! {
-    pub(crate) struct Fuse<T, U> {
-        #[pin]
-        pub(crate) io: T,
-        pub(crate) codec: U,
-    }
-}
-
-/// Abstracts over `FramedRead2` being either `FramedRead2<FramedWrite2<Fuse<T, U>>>` or
-/// `FramedRead2<Fuse<T, U>>` and lets the io and codec parts be extracted in either case.
-pub(crate) trait ProjectFuse {
-    type Io;
-    type Codec;
-
-    fn project(self: Pin<&mut Self>) -> Fuse<Pin<&mut Self::Io>, &mut Self::Codec>;
-}
-
-impl<T, U> ProjectFuse for Fuse<T, U> {
-    type Io = T;
-    type Codec = U;
-
-    fn project(self: Pin<&mut Self>) -> Fuse<Pin<&mut Self::Io>, &mut Self::Codec> {
-        let self_ = self.project();
-        Fuse {
-            io: self_.io,
-            codec: self_.codec,
-        }
+        inner: FramedImpl<T, U, RWFrames>
     }
 }
 
@@ -86,14 +52,23 @@
     /// calling [`split`] on the `Framed` returned by this method, which will
     /// break them into separate objects, allowing them to interact more easily.
     ///
-    /// [`Stream`]: tokio::stream::Stream
+    /// Note that, for some byte sources, the stream can be resumed after an EOF
+    /// by reading from it, even after it has returned `None`. Repeated attempts
+    /// to do so, without new data available, continue to return `None` without
+    /// creating more (closing) frames.
+    ///
+    /// [`Stream`]: futures_core::Stream
     /// [`Sink`]: futures_sink::Sink
     /// [`Decode`]: crate::codec::Decoder
     /// [`Encoder`]: crate::codec::Encoder
     /// [`split`]: https://docs.rs/futures/0.3/futures/stream/trait.StreamExt.html#method.split
     pub fn new(inner: T, codec: U) -> Framed<T, U> {
         Framed {
-            inner: framed_read2(framed_write2(Fuse { io: inner, codec })),
+            inner: FramedImpl {
+                inner,
+                codec,
+                state: Default::default(),
+            },
         }
     }
 
@@ -116,17 +91,25 @@
     /// calling [`split`] on the `Framed` returned by this method, which will
     /// break them into separate objects, allowing them to interact more easily.
     ///
-    /// [`Stream`]: tokio::stream::Stream
+    /// [`Stream`]: futures_core::Stream
     /// [`Sink`]: futures_sink::Sink
     /// [`Decode`]: crate::codec::Decoder
     /// [`Encoder`]: crate::codec::Encoder
     /// [`split`]: https://docs.rs/futures/0.3/futures/stream/trait.StreamExt.html#method.split
     pub fn with_capacity(inner: T, codec: U, capacity: usize) -> Framed<T, U> {
         Framed {
-            inner: framed_read2_with_buffer(
-                framed_write2(Fuse { io: inner, codec }),
-                BytesMut::with_capacity(capacity),
-            ),
+            inner: FramedImpl {
+                inner,
+                codec,
+                state: RWFrames {
+                    read: ReadFrame {
+                        eof: false,
+                        is_readable: false,
+                        buffer: BytesMut::with_capacity(capacity),
+                    },
+                    write: WriteFrame::default(),
+                },
+            },
         }
     }
 }
@@ -153,7 +136,7 @@
     /// calling [`split`] on the `Framed` returned by this method, which will
     /// break them into separate objects, allowing them to interact more easily.
     ///
-    /// [`Stream`]: tokio::stream::Stream
+    /// [`Stream`]: futures_core::Stream
     /// [`Sink`]: futures_sink::Sink
     /// [`Decoder`]: crate::codec::Decoder
     /// [`Encoder`]: crate::codec::Encoder
@@ -161,16 +144,14 @@
     /// [`split`]: https://docs.rs/futures/0.3/futures/stream/trait.StreamExt.html#method.split
     pub fn from_parts(parts: FramedParts<T, U>) -> Framed<T, U> {
         Framed {
-            inner: framed_read2_with_buffer(
-                framed_write2_with_buffer(
-                    Fuse {
-                        io: parts.io,
-                        codec: parts.codec,
-                    },
-                    parts.write_buf,
-                ),
-                parts.read_buf,
-            ),
+            inner: FramedImpl {
+                inner: parts.io,
+                codec: parts.codec,
+                state: RWFrames {
+                    read: parts.read_buf.into(),
+                    write: parts.write_buf.into(),
+                },
+            },
         }
     }
 
@@ -181,7 +162,7 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn get_ref(&self) -> &T {
-        &self.inner.get_ref().get_ref().io
+        &self.inner.inner
     }
 
     /// Returns a mutable reference to the underlying I/O stream wrapped by
@@ -191,7 +172,17 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn get_mut(&mut self) -> &mut T {
-        &mut self.inner.get_mut().get_mut().io
+        &mut self.inner.inner
+    }
+
+    /// Returns a pinned mutable reference to the underlying I/O stream wrapped by
+    /// `Framed`.
+    ///
+    /// Note that care should be taken to not tamper with the underlying stream
+    /// of data coming in as it may corrupt the stream of frames otherwise
+    /// being worked with.
+    pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
+        self.project().inner.project().inner
     }
 
     /// Returns a reference to the underlying codec wrapped by
@@ -200,7 +191,7 @@
     /// Note that care should be taken to not tamper with the underlying codec
     /// as it may corrupt the stream of frames otherwise being worked with.
     pub fn codec(&self) -> &U {
-        &self.inner.get_ref().get_ref().codec
+        &self.inner.codec
     }
 
     /// Returns a mutable reference to the underlying codec wrapped by
@@ -209,12 +200,27 @@
     /// Note that care should be taken to not tamper with the underlying codec
     /// as it may corrupt the stream of frames otherwise being worked with.
     pub fn codec_mut(&mut self) -> &mut U {
-        &mut self.inner.get_mut().get_mut().codec
+        &mut self.inner.codec
     }
 
     /// Returns a reference to the read buffer.
     pub fn read_buffer(&self) -> &BytesMut {
-        self.inner.buffer()
+        &self.inner.state.read.buffer
+    }
+
+    /// Returns a mutable reference to the read buffer.
+    pub fn read_buffer_mut(&mut self) -> &mut BytesMut {
+        &mut self.inner.state.read.buffer
+    }
+
+    /// Returns a reference to the write buffer.
+    pub fn write_buffer(&self) -> &BytesMut {
+        &self.inner.state.write.buffer
+    }
+
+    /// Returns a mutable reference to the write buffer.
+    pub fn write_buffer_mut(&mut self) -> &mut BytesMut {
+        &mut self.inner.state.write.buffer
     }
 
     /// Consumes the `Framed`, returning its underlying I/O stream.
@@ -223,7 +229,7 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn into_inner(self) -> T {
-        self.inner.into_inner().into_inner().io
+        self.inner.inner
     }
 
     /// Consumes the `Framed`, returning its underlying I/O stream, the buffer
@@ -233,19 +239,17 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn into_parts(self) -> FramedParts<T, U> {
-        let (inner, read_buf) = self.inner.into_parts();
-        let (inner, write_buf) = inner.into_parts();
-
         FramedParts {
-            io: inner.io,
-            codec: inner.codec,
-            read_buf,
-            write_buf,
+            io: self.inner.inner,
+            codec: self.inner.codec,
+            read_buf: self.inner.state.read.buffer,
+            write_buf: self.inner.state.write.buffer,
             _priv: (),
         }
     }
 }
 
+// This impl just defers to the underlying FramedImpl
 impl<T, U> Stream for Framed<T, U>
 where
     T: AsyncRead,
@@ -258,6 +262,7 @@
     }
 }
 
+// This impl just defers to the underlying FramedImpl
 impl<T, I, U> Sink<I> for Framed<T, U>
 where
     T: AsyncWrite,
@@ -267,19 +272,19 @@
     type Error = U::Error;
 
     fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.project().inner.get_pin_mut().poll_ready(cx)
+        self.project().inner.poll_ready(cx)
     }
 
     fn start_send(self: Pin<&mut Self>, item: I) -> Result<(), Self::Error> {
-        self.project().inner.get_pin_mut().start_send(item)
+        self.project().inner.start_send(item)
     }
 
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.project().inner.get_pin_mut().poll_flush(cx)
+        self.project().inner.poll_flush(cx)
     }
 
     fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.project().inner.get_pin_mut().poll_close(cx)
+        self.project().inner.poll_close(cx)
     }
 }
 
@@ -290,109 +295,19 @@
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Framed")
-            .field("io", &self.inner.get_ref().get_ref().io)
-            .field("codec", &self.inner.get_ref().get_ref().codec)
+            .field("io", self.get_ref())
+            .field("codec", self.codec())
             .finish()
     }
 }
 
-// ===== impl Fuse =====
-
-impl<T: Read, U> Read for Fuse<T, U> {
-    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
-        self.io.read(dst)
-    }
-}
-
-impl<T: BufRead, U> BufRead for Fuse<T, U> {
-    fn fill_buf(&mut self) -> io::Result<&[u8]> {
-        self.io.fill_buf()
-    }
-
-    fn consume(&mut self, amt: usize) {
-        self.io.consume(amt)
-    }
-}
-
-impl<T: AsyncRead, U> AsyncRead for Fuse<T, U> {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        self.io.prepare_uninitialized_buffer(buf)
-    }
-
-    fn poll_read(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<Result<usize, io::Error>> {
-        self.project().io.poll_read(cx, buf)
-    }
-}
-
-impl<T: AsyncBufRead, U> AsyncBufRead for Fuse<T, U> {
-    fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
-        self.project().io.poll_fill_buf(cx)
-    }
-
-    fn consume(self: Pin<&mut Self>, amt: usize) {
-        self.project().io.consume(amt)
-    }
-}
-
-impl<T: Write, U> Write for Fuse<T, U> {
-    fn write(&mut self, src: &[u8]) -> io::Result<usize> {
-        self.io.write(src)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.io.flush()
-    }
-}
-
-impl<T: AsyncWrite, U> AsyncWrite for Fuse<T, U> {
-    fn poll_write(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &[u8],
-    ) -> Poll<Result<usize, io::Error>> {
-        self.project().io.poll_write(cx, buf)
-    }
-
-    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
-        self.project().io.poll_flush(cx)
-    }
-
-    fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
-        self.project().io.poll_shutdown(cx)
-    }
-}
-
-impl<T, U: Decoder> Decoder for Fuse<T, U> {
-    type Item = U::Item;
-    type Error = U::Error;
-
-    fn decode(&mut self, buffer: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
-        self.codec.decode(buffer)
-    }
-
-    fn decode_eof(&mut self, buffer: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
-        self.codec.decode_eof(buffer)
-    }
-}
-
-impl<T, I, U: Encoder<I>> Encoder<I> for Fuse<T, U> {
-    type Error = U::Error;
-
-    fn encode(&mut self, item: I, dst: &mut BytesMut) -> Result<(), Self::Error> {
-        self.codec.encode(item, dst)
-    }
-}
-
 /// `FramedParts` contains an export of the data of a Framed transport.
 /// It can be used to construct a new [`Framed`] with a different codec.
 /// It contains all current buffers and the inner transport.
 ///
 /// [`Framed`]: crate::codec::Framed
 #[derive(Debug)]
+#[allow(clippy::manual_non_exhaustive)]
 pub struct FramedParts<T, U> {
     /// The inner transport used to read bytes to and write bytes to
     pub io: T,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/framed_write.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/framed_write.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/framed_write.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/framed_write.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,20 +1,14 @@
-use crate::codec::decoder::Decoder;
 use crate::codec::encoder::Encoder;
-use crate::codec::framed::{Fuse, ProjectFuse};
+use crate::codec::framed_impl::{FramedImpl, WriteFrame};
 
-use tokio::{
-    io::{AsyncBufRead, AsyncRead, AsyncWrite},
-    stream::Stream,
-};
+use futures_core::Stream;
+use tokio::io::AsyncWrite;
 
-use bytes::{Buf, BytesMut};
-use futures_core::ready;
+use bytes::BytesMut;
 use futures_sink::Sink;
-use log::trace;
 use pin_project_lite::pin_project;
 use std::fmt;
-use std::io::{self, BufRead, Read};
-use std::mem::MaybeUninit;
+use std::io;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
@@ -24,21 +18,10 @@
     /// [`Sink`]: futures_sink::Sink
     pub struct FramedWrite<T, E> {
         #[pin]
-        inner: FramedWrite2<Fuse<T, E>>,
+        inner: FramedImpl<T, E, WriteFrame>,
     }
 }
 
-pin_project! {
-    pub(crate) struct FramedWrite2<T> {
-        #[pin]
-        inner: T,
-        buffer: BytesMut,
-    }
-}
-
-const INITIAL_CAPACITY: usize = 8 * 1024;
-const BACKPRESSURE_BOUNDARY: usize = INITIAL_CAPACITY;
-
 impl<T, E> FramedWrite<T, E>
 where
     T: AsyncWrite,
@@ -46,10 +29,11 @@
     /// Creates a new `FramedWrite` with the given `encoder`.
     pub fn new(inner: T, encoder: E) -> FramedWrite<T, E> {
         FramedWrite {
-            inner: framed_write2(Fuse {
-                io: inner,
+            inner: FramedImpl {
+                inner,
                 codec: encoder,
-            }),
+                state: WriteFrame::default(),
+            },
         }
     }
 }
@@ -62,7 +46,7 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn get_ref(&self) -> &T {
-        &self.inner.inner.io
+        &self.inner.inner
     }
 
     /// Returns a mutable reference to the underlying I/O stream wrapped by
@@ -72,7 +56,17 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn get_mut(&mut self) -> &mut T {
-        &mut self.inner.inner.io
+        &mut self.inner.inner
+    }
+
+    /// Returns a pinned mutable reference to the underlying I/O stream wrapped by
+    /// `FramedWrite`.
+    ///
+    /// Note that care should be taken to not tamper with the underlying stream
+    /// of data coming in as it may corrupt the stream of frames otherwise
+    /// being worked with.
+    pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
+        self.project().inner.project().inner
     }
 
     /// Consumes the `FramedWrite`, returning its underlying I/O stream.
@@ -81,21 +75,31 @@
     /// of data coming in as it may corrupt the stream of frames otherwise
     /// being worked with.
     pub fn into_inner(self) -> T {
-        self.inner.inner.io
+        self.inner.inner
     }
 
-    /// Returns a reference to the underlying decoder.
+    /// Returns a reference to the underlying encoder.
     pub fn encoder(&self) -> &E {
-        &self.inner.inner.codec
+        &self.inner.codec
     }
 
-    /// Returns a mutable reference to the underlying decoder.
+    /// Returns a mutable reference to the underlying encoder.
     pub fn encoder_mut(&mut self) -> &mut E {
-        &mut self.inner.inner.codec
+        &mut self.inner.codec
+    }
+
+    /// Returns a reference to the write buffer.
+    pub fn write_buffer(&self) -> &BytesMut {
+        &self.inner.state.buffer
+    }
+
+    /// Returns a mutable reference to the write buffer.
+    pub fn write_buffer_mut(&mut self) -> &mut BytesMut {
+        &mut self.inner.state.buffer
     }
 }
 
-// This impl just defers to the underlying FramedWrite2
+// This impl just defers to the underlying FramedImpl
 impl<T, I, E> Sink<I> for FramedWrite<T, E>
 where
     T: AsyncWrite,
@@ -121,6 +125,7 @@
     }
 }
 
+// This impl just defers to the underlying T: Stream
 impl<T, D> Stream for FramedWrite<T, D>
 where
     T: Stream,
@@ -128,13 +133,7 @@
     type Item = T::Item;
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        self.project()
-            .inner
-            .project()
-            .inner
-            .project()
-            .io
-            .poll_next(cx)
+        self.project().inner.project().inner.poll_next(cx)
     }
 }
 
@@ -145,180 +144,9 @@
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("FramedWrite")
-            .field("inner", &self.inner.get_ref().io)
-            .field("encoder", &self.inner.get_ref().codec)
-            .field("buffer", &self.inner.buffer)
+            .field("inner", &self.get_ref())
+            .field("encoder", &self.encoder())
+            .field("buffer", &self.inner.state.buffer)
             .finish()
     }
 }
-
-// ===== impl FramedWrite2 =====
-
-pub(crate) fn framed_write2<T>(inner: T) -> FramedWrite2<T> {
-    FramedWrite2 {
-        inner,
-        buffer: BytesMut::with_capacity(INITIAL_CAPACITY),
-    }
-}
-
-pub(crate) fn framed_write2_with_buffer<T>(inner: T, mut buf: BytesMut) -> FramedWrite2<T> {
-    if buf.capacity() < INITIAL_CAPACITY {
-        let bytes_to_reserve = INITIAL_CAPACITY - buf.capacity();
-        buf.reserve(bytes_to_reserve);
-    }
-    FramedWrite2 { inner, buffer: buf }
-}
-
-impl<T> FramedWrite2<T> {
-    pub(crate) fn get_ref(&self) -> &T {
-        &self.inner
-    }
-
-    pub(crate) fn into_inner(self) -> T {
-        self.inner
-    }
-
-    pub(crate) fn into_parts(self) -> (T, BytesMut) {
-        (self.inner, self.buffer)
-    }
-
-    pub(crate) fn get_mut(&mut self) -> &mut T {
-        &mut self.inner
-    }
-}
-
-impl<I, T> Sink<I> for FramedWrite2<T>
-where
-    T: ProjectFuse + AsyncWrite,
-    T::Codec: Encoder<I>,
-{
-    type Error = <T::Codec as Encoder<I>>::Error;
-
-    fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        // If the buffer is already over 8KiB, then attempt to flush it. If after flushing it's
-        // *still* over 8KiB, then apply backpressure (reject the send).
-        if self.buffer.len() >= BACKPRESSURE_BOUNDARY {
-            match self.as_mut().poll_flush(cx) {
-                Poll::Pending => return Poll::Pending,
-                Poll::Ready(Err(e)) => return Poll::Ready(Err(e)),
-                Poll::Ready(Ok(())) => (),
-            };
-
-            if self.buffer.len() >= BACKPRESSURE_BOUNDARY {
-                return Poll::Pending;
-            }
-        }
-        Poll::Ready(Ok(()))
-    }
-
-    fn start_send(self: Pin<&mut Self>, item: I) -> Result<(), Self::Error> {
-        let mut pinned = self.project();
-        pinned
-            .inner
-            .project()
-            .codec
-            .encode(item, &mut pinned.buffer)?;
-        Ok(())
-    }
-
-    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        trace!("flushing framed transport");
-        let mut pinned = self.project();
-
-        while !pinned.buffer.is_empty() {
-            trace!("writing; remaining={}", pinned.buffer.len());
-
-            let buf = &pinned.buffer;
-            let n = ready!(pinned.inner.as_mut().poll_write(cx, &buf))?;
-
-            if n == 0 {
-                return Poll::Ready(Err(io::Error::new(
-                    io::ErrorKind::WriteZero,
-                    "failed to \
-                     write frame to transport",
-                )
-                .into()));
-            }
-
-            pinned.buffer.advance(n);
-        }
-
-        // Try flushing the underlying IO
-        ready!(pinned.inner.poll_flush(cx))?;
-
-        trace!("framed transport flushed");
-        Poll::Ready(Ok(()))
-    }
-
-    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        ready!(self.as_mut().poll_flush(cx))?;
-        ready!(self.project().inner.poll_shutdown(cx))?;
-
-        Poll::Ready(Ok(()))
-    }
-}
-
-impl<T: Decoder> Decoder for FramedWrite2<T> {
-    type Item = T::Item;
-    type Error = T::Error;
-
-    fn decode(&mut self, src: &mut BytesMut) -> Result<Option<T::Item>, T::Error> {
-        self.inner.decode(src)
-    }
-
-    fn decode_eof(&mut self, src: &mut BytesMut) -> Result<Option<T::Item>, T::Error> {
-        self.inner.decode_eof(src)
-    }
-}
-
-impl<T: Read> Read for FramedWrite2<T> {
-    fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
-        self.inner.read(dst)
-    }
-}
-
-impl<T: BufRead> BufRead for FramedWrite2<T> {
-    fn fill_buf(&mut self) -> io::Result<&[u8]> {
-        self.inner.fill_buf()
-    }
-
-    fn consume(&mut self, amt: usize) {
-        self.inner.consume(amt)
-    }
-}
-
-impl<T: AsyncRead> AsyncRead for FramedWrite2<T> {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
-        self.inner.prepare_uninitialized_buffer(buf)
-    }
-
-    fn poll_read(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<Result<usize, io::Error>> {
-        self.project().inner.poll_read(cx, buf)
-    }
-}
-
-impl<T: AsyncBufRead> AsyncBufRead for FramedWrite2<T> {
-    fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
-        self.project().inner.poll_fill_buf(cx)
-    }
-
-    fn consume(self: Pin<&mut Self>, amt: usize) {
-        self.project().inner.consume(amt)
-    }
-}
-
-impl<T> ProjectFuse for FramedWrite2<T>
-where
-    T: ProjectFuse,
-{
-    type Io = T::Io;
-    type Codec = T::Codec;
-
-    fn project(self: Pin<&mut Self>) -> Fuse<Pin<&mut Self::Io>, &mut Self::Codec> {
-        self.project().inner.project()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/length_delimited.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/length_delimited.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/length_delimited.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/length_delimited.rs	2021-12-09 12:01:26.000000000 +0000
@@ -39,7 +39,7 @@
 //! Specifically, given the following:
 //!
 //! ```
-//! use tokio::prelude::*;
+//! use tokio::io::{AsyncRead, AsyncWrite};
 //! use tokio_util::codec::{Framed, LengthDelimitedCodec};
 //!
 //! use futures::SinkExt;
@@ -302,6 +302,37 @@
 //! anywhere because it already is factored into the total frame length that
 //! is read from the byte stream.
 //!
+//! ## Example 7
+//!
+//! The following will parse a 3 byte length field at offset 0 in a 4 byte
+//! frame head, excluding the 4th byte from the yielded `BytesMut`.
+//!
+//! ```
+//! # use tokio::io::AsyncRead;
+//! # use tokio_util::codec::LengthDelimitedCodec;
+//! # fn bind_read<T: AsyncRead>(io: T) {
+//! LengthDelimitedCodec::builder()
+//!     .length_field_offset(0) // default value
+//!     .length_field_length(3)
+//!     .length_adjustment(0)  // default value
+//!     .num_skip(4) // skip the first 4 bytes
+//!     .new_read(io);
+//! # }
+//! # pub fn main() {}
+//! ```
+//!
+//! The following frame will be decoded as such:
+//!
+//! ```text
+//!                  INPUT                       DECODED
+//! +------- len ------+--- Payload ---+    +--- Payload ---+
+//! | \x00\x00\x0B\xFF |  Hello world  | => |  Hello world  |
+//! +------------------+---------------+    +---------------+
+//! ```
+//!
+//! A simple example where there are unused bytes between the length field
+//! and the payload.
+//!
 //! # Encoding
 //!
 //! [`FramedWrite`] adapts an [`AsyncWrite`] into a `Sink` of [`BytesMut`],
@@ -333,13 +364,13 @@
 //! +------------+--------------+
 //! ```
 //!
-//! [`LengthDelimitedCodec::new()`]: struct.LengthDelimitedCodec.html#method.new
-//! [`FramedRead`]: struct.FramedRead.html
-//! [`FramedWrite`]: struct.FramedWrite.html
-//! [`AsyncRead`]: ../../trait.AsyncRead.html
-//! [`AsyncWrite`]: ../../trait.AsyncWrite.html
-//! [`Encoder`]: ../trait.Encoder.html
-//! [`BytesMut`]: https://docs.rs/bytes/0.4/bytes/struct.BytesMut.html
+//! [`LengthDelimitedCodec::new()`]: method@LengthDelimitedCodec::new
+//! [`FramedRead`]: struct@FramedRead
+//! [`FramedWrite`]: struct@FramedWrite
+//! [`AsyncRead`]: trait@tokio::io::AsyncRead
+//! [`AsyncWrite`]: trait@tokio::io::AsyncWrite
+//! [`Encoder`]: trait@Encoder
+//! [`BytesMut`]: bytes::BytesMut
 
 use crate::codec::{Decoder, Encoder, Framed, FramedRead, FramedWrite};
 
@@ -504,14 +535,14 @@
         Ok(Some(n))
     }
 
-    fn decode_data(&self, n: usize, src: &mut BytesMut) -> io::Result<Option<BytesMut>> {
+    fn decode_data(&self, n: usize, src: &mut BytesMut) -> Option<BytesMut> {
         // At this point, the buffer has already had the required capacity
         // reserved. All there is to do is read.
         if src.len() < n {
-            return Ok(None);
+            return None;
         }
 
-        Ok(Some(src.split_to(n)))
+        Some(src.split_to(n))
     }
 }
 
@@ -531,7 +562,7 @@
             DecodeState::Data(n) => n,
         };
 
-        match self.decode_data(n, src)? {
+        match self.decode_data(n, src) {
             Some(data) => {
                 // Update the decode state
                 self.state = DecodeState::Head;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/lines_codec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/lines_codec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/lines_codec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/lines_codec.rs	2021-12-09 12:01:26.000000000 +0000
@@ -133,7 +133,7 @@
                     buf.advance(read_to);
                     self.next_index = 0;
                     if buf.is_empty() {
-                        return Err(LinesCodecError::MaxLineLengthExceeded);
+                        return Ok(None);
                     }
                 }
                 (false, Some(offset)) => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/codec/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/codec/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,262 @@
-//! Utilities for encoding and decoding frames.
+//! Adaptors from AsyncRead/AsyncWrite to Stream/Sink
 //!
-//! Contains adapters to go from streams of bytes, [`AsyncRead`] and
+//! Raw I/O objects work with byte sequences, but higher-level code usually
+//! wants to batch these into meaningful chunks, called "frames".
+//!
+//! This module contains adapters to go from streams of bytes, [`AsyncRead`] and
 //! [`AsyncWrite`], to framed streams implementing [`Sink`] and [`Stream`].
 //! Framed streams are also known as transports.
 //!
+//! # The Decoder trait
+//!
+//! A [`Decoder`] is used together with [`FramedRead`] or [`Framed`] to turn an
+//! [`AsyncRead`] into a [`Stream`]. The job of the decoder trait is to specify
+//! how sequences of bytes are turned into a sequence of frames, and to
+//! determine where the boundaries between frames are.  The job of the
+//! `FramedRead` is to repeatedly switch between reading more data from the IO
+//! resource, and asking the decoder whether we have received enough data to
+//! decode another frame of data.
+//!
+//! The main method on the `Decoder` trait is the [`decode`] method. This method
+//! takes as argument the data that has been read so far, and when it is called,
+//! it will be in one of the following situations:
+//!
+//!  1. The buffer contains less than a full frame.
+//!  2. The buffer contains exactly a full frame.
+//!  3. The buffer contains more than a full frame.
+//!
+//! In the first situation, the decoder should return `Ok(None)`.
+//!
+//! In the second situation, the decoder should clear the provided buffer and
+//! return `Ok(Some(the_decoded_frame))`.
+//!
+//! In the third situation, the decoder should use a method such as [`split_to`]
+//! or [`advance`] to modify the buffer such that the frame is removed from the
+//! buffer, but any data in the buffer after that frame should still remain in
+//! the buffer. The decoder should also return `Ok(Some(the_decoded_frame))` in
+//! this case.
+//!
+//! Finally the decoder may return an error if the data is invalid in some way.
+//! The decoder should _not_ return an error just because it has yet to receive
+//! a full frame.
+//!
+//! It is guaranteed that, from one call to `decode` to another, the provided
+//! buffer will contain the exact same data as before, except that if more data
+//! has arrived through the IO resource, that data will have been appended to
+//! the buffer.  This means that reading frames from a `FramedRead` is
+//! essentially equivalent to the following loop:
+//!
+//! ```no_run
+//! use tokio::io::AsyncReadExt;
+//! # // This uses async_stream to create an example that compiles.
+//! # fn foo() -> impl futures_core::Stream<Item = std::io::Result<bytes::BytesMut>> { async_stream::try_stream! {
+//! # use tokio_util::codec::Decoder;
+//! # let mut decoder = tokio_util::codec::BytesCodec::new();
+//! # let io_resource = &mut &[0u8, 1, 2, 3][..];
+//!
+//! let mut buf = bytes::BytesMut::new();
+//! loop {
+//!     // The read_buf call will append to buf rather than overwrite existing data.
+//!     let len = io_resource.read_buf(&mut buf).await?;
+//!
+//!     if len == 0 {
+//!         while let Some(frame) = decoder.decode_eof(&mut buf)? {
+//!             yield frame;
+//!         }
+//!         break;
+//!     }
+//!
+//!     while let Some(frame) = decoder.decode(&mut buf)? {
+//!         yield frame;
+//!     }
+//! }
+//! # }}
+//! ```
+//! The example above uses `yield` whenever the `Stream` produces an item.
+//!
+//! ## Example decoder
+//!
+//! As an example, consider a protocol that can be used to send strings where
+//! each frame is a four byte integer that contains the length of the frame,
+//! followed by that many bytes of string data. The decoder fails with an error
+//! if the string data is not valid utf-8 or too long.
+//!
+//! Such a decoder can be written like this:
+//! ```
+//! use tokio_util::codec::Decoder;
+//! use bytes::{BytesMut, Buf};
+//!
+//! struct MyStringDecoder {}
+//!
+//! const MAX: usize = 8 * 1024 * 1024;
+//!
+//! impl Decoder for MyStringDecoder {
+//!     type Item = String;
+//!     type Error = std::io::Error;
+//!
+//!     fn decode(
+//!         &mut self,
+//!         src: &mut BytesMut
+//!     ) -> Result<Option<Self::Item>, Self::Error> {
+//!         if src.len() < 4 {
+//!             // Not enough data to read length marker.
+//!             return Ok(None);
+//!         }
+//!
+//!         // Read length marker.
+//!         let mut length_bytes = [0u8; 4];
+//!         length_bytes.copy_from_slice(&src[..4]);
+//!         let length = u32::from_le_bytes(length_bytes) as usize;
+//!
+//!         // Check that the length is not too large to avoid a denial of
+//!         // service attack where the server runs out of memory.
+//!         if length > MAX {
+//!             return Err(std::io::Error::new(
+//!                 std::io::ErrorKind::InvalidData,
+//!                 format!("Frame of length {} is too large.", length)
+//!             ));
+//!         }
+//!
+//!         if src.len() < 4 + length {
+//!             // The full string has not yet arrived.
+//!             //
+//!             // We reserve more space in the buffer. This is not strictly
+//!             // necessary, but is a good idea performance-wise.
+//!             src.reserve(4 + length - src.len());
+//!
+//!             // We inform the Framed that we need more bytes to form the next
+//!             // frame.
+//!             return Ok(None);
+//!         }
+//!
+//!         // Use advance to modify src such that it no longer contains
+//!         // this frame.
+//!         let data = src[4..4 + length].to_vec();
+//!         src.advance(4 + length);
+//!
+//!         // Convert the data to a string, or fail if it is not valid utf-8.
+//!         match String::from_utf8(data) {
+//!             Ok(string) => Ok(Some(string)),
+//!             Err(utf8_error) => {
+//!                 Err(std::io::Error::new(
+//!                     std::io::ErrorKind::InvalidData,
+//!                     utf8_error.utf8_error(),
+//!                 ))
+//!             },
+//!         }
+//!     }
+//! }
+//! ```
+//!
+//! # The Encoder trait
+//!
+//! An [`Encoder`] is used together with [`FramedWrite`] or [`Framed`] to turn
+//! an [`AsyncWrite`] into a [`Sink`]. The job of the encoder trait is to
+//! specify how frames are turned into a sequences of bytes.  The job of the
+//! `FramedWrite` is to take the resulting sequence of bytes and write it to the
+//! IO resource.
+//!
+//! The main method on the `Encoder` trait is the [`encode`] method. This method
+//! takes an item that is being written, and a buffer to write the item to. The
+//! buffer may already contain data, and in this case, the encoder should append
+//! the new frame the to buffer rather than overwrite the existing data.
+//!
+//! It is guaranteed that, from one call to `encode` to another, the provided
+//! buffer will contain the exact same data as before, except that some of the
+//! data may have been removed from the front of the buffer. Writing to a
+//! `FramedWrite` is essentially equivalent to the following loop:
+//!
+//! ```no_run
+//! use tokio::io::AsyncWriteExt;
+//! use bytes::Buf; // for advance
+//! # use tokio_util::codec::Encoder;
+//! # async fn next_frame() -> bytes::Bytes { bytes::Bytes::new() }
+//! # async fn no_more_frames() { }
+//! # #[tokio::main] async fn main() -> std::io::Result<()> {
+//! # let mut io_resource = tokio::io::sink();
+//! # let mut encoder = tokio_util::codec::BytesCodec::new();
+//!
+//! const MAX: usize = 8192;
+//!
+//! let mut buf = bytes::BytesMut::new();
+//! loop {
+//!     tokio::select! {
+//!         num_written = io_resource.write(&buf), if !buf.is_empty() => {
+//!             buf.advance(num_written?);
+//!         },
+//!         frame = next_frame(), if buf.len() < MAX => {
+//!             encoder.encode(frame, &mut buf)?;
+//!         },
+//!         _ = no_more_frames() => {
+//!             io_resource.write_all(&buf).await?;
+//!             io_resource.shutdown().await?;
+//!             return Ok(());
+//!         },
+//!     }
+//! }
+//! # }
+//! ```
+//! Here the `next_frame` method corresponds to any frames you write to the
+//! `FramedWrite`. The `no_more_frames` method corresponds to closing the
+//! `FramedWrite` with [`SinkExt::close`].
+//!
+//! ## Example encoder
+//!
+//! As an example, consider a protocol that can be used to send strings where
+//! each frame is a four byte integer that contains the length of the frame,
+//! followed by that many bytes of string data. The encoder will fail if the
+//! string is too long.
+//!
+//! Such an encoder can be written like this:
+//! ```
+//! use tokio_util::codec::Encoder;
+//! use bytes::BytesMut;
+//!
+//! struct MyStringEncoder {}
+//!
+//! const MAX: usize = 8 * 1024 * 1024;
+//!
+//! impl Encoder<String> for MyStringEncoder {
+//!     type Error = std::io::Error;
+//!
+//!     fn encode(&mut self, item: String, dst: &mut BytesMut) -> Result<(), Self::Error> {
+//!         // Don't send a string if it is longer than the other end will
+//!         // accept.
+//!         if item.len() > MAX {
+//!             return Err(std::io::Error::new(
+//!                 std::io::ErrorKind::InvalidData,
+//!                 format!("Frame of length {} is too large.", item.len())
+//!             ));
+//!         }
+//!
+//!         // Convert the length into a byte array.
+//!         // The cast to u32 cannot overflow due to the length check above.
+//!         let len_slice = u32::to_le_bytes(item.len() as u32);
+//!
+//!         // Reserve space in the buffer.
+//!         dst.reserve(4 + item.len());
+//!
+//!         // Write the length and string to the buffer.
+//!         dst.extend_from_slice(&len_slice);
+//!         dst.extend_from_slice(item.as_bytes());
+//!         Ok(())
+//!     }
+//! }
+//! ```
+//!
 //! [`AsyncRead`]: tokio::io::AsyncRead
 //! [`AsyncWrite`]: tokio::io::AsyncWrite
-//! [`Stream`]: tokio::stream::Stream
+//! [`Stream`]: futures_core::Stream
 //! [`Sink`]: futures_sink::Sink
+//! [`SinkExt::close`]: https://docs.rs/futures/0.3/futures/sink/trait.SinkExt.html#method.close
+//! [`FramedRead`]: struct@crate::codec::FramedRead
+//! [`FramedWrite`]: struct@crate::codec::FramedWrite
+//! [`Framed`]: struct@crate::codec::Framed
+//! [`Decoder`]: trait@crate::codec::Decoder
+//! [`decode`]: fn@crate::codec::Decoder::decode
+//! [`encode`]: fn@crate::codec::Encoder::encode
+//! [`split_to`]: fn@bytes::BytesMut::split_to
+//! [`advance`]: fn@bytes::Buf::advance
 
 mod bytes_codec;
 pub use self::bytes_codec::BytesCodec;
@@ -18,6 +267,10 @@
 mod encoder;
 pub use self::encoder::Encoder;
 
+mod framed_impl;
+#[allow(unused_imports)]
+pub(crate) use self::framed_impl::{FramedImpl, RWFrames, ReadFrame, WriteFrame};
+
 mod framed;
 pub use self::framed::{Framed, FramedParts};
 
@@ -32,3 +285,6 @@
 
 mod lines_codec;
 pub use self::lines_codec::{LinesCodec, LinesCodecError};
+
+mod any_delimiter_codec;
+pub use self::any_delimiter_codec::{AnyDelimiterCodec, AnyDelimiterCodecError};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/compat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/compat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/compat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/compat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,6 @@
 //! Compatibility between the `tokio::io` and `futures-io` versions of the
 //! `AsyncRead` and `AsyncWrite` traits.
+use futures_core::ready;
 use pin_project_lite::pin_project;
 use std::io;
 use std::pin::Pin;
@@ -19,7 +20,7 @@
 /// `futures_io::AsyncRead` to implement `tokio::io::AsyncRead`.
 pub trait FuturesAsyncReadCompatExt: futures_io::AsyncRead {
     /// Wraps `self` with a compatibility layer that implements
-    /// `tokio_io::AsyncWrite`.
+    /// `tokio_io::AsyncRead`.
     fn compat(self) -> Compat<Self>
     where
         Self: Sized,
@@ -47,7 +48,7 @@
 
 /// Extension trait that allows converting a type implementing
 /// `tokio::io::AsyncRead` to implement `futures_io::AsyncRead`.
-pub trait Tokio02AsyncReadCompatExt: tokio::io::AsyncRead {
+pub trait TokioAsyncReadCompatExt: tokio::io::AsyncRead {
     /// Wraps `self` with a compatibility layer that implements
     /// `futures_io::AsyncRead`.
     fn compat(self) -> Compat<Self>
@@ -58,11 +59,11 @@
     }
 }
 
-impl<T: tokio::io::AsyncRead> Tokio02AsyncReadCompatExt for T {}
+impl<T: tokio::io::AsyncRead> TokioAsyncReadCompatExt for T {}
 
 /// Extension trait that allows converting a type implementing
 /// `tokio::io::AsyncWrite` to implement `futures_io::AsyncWrite`.
-pub trait Tokio02AsyncWriteCompatExt: tokio::io::AsyncWrite {
+pub trait TokioAsyncWriteCompatExt: tokio::io::AsyncWrite {
     /// Wraps `self` with a compatibility layer that implements
     /// `futures_io::AsyncWrite`.
     fn compat_write(self) -> Compat<Self>
@@ -73,7 +74,7 @@
     }
 }
 
-impl<T: tokio::io::AsyncWrite> Tokio02AsyncWriteCompatExt for T {}
+impl<T: tokio::io::AsyncWrite> TokioAsyncWriteCompatExt for T {}
 
 // === impl Compat ===
 
@@ -107,9 +108,18 @@
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        futures_io::AsyncRead::poll_read(self.project().inner, cx, buf)
+        buf: &mut tokio::io::ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        // We can't trust the inner type to not peak at the bytes,
+        // so we must defensively initialize the buffer.
+        let slice = buf.initialize_unfilled();
+        let n = ready!(futures_io::AsyncRead::poll_read(
+            self.project().inner,
+            cx,
+            slice
+        ))?;
+        buf.advance(n);
+        Poll::Ready(Ok(()))
     }
 }
 
@@ -120,9 +130,15 @@
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
+        slice: &mut [u8],
     ) -> Poll<io::Result<usize>> {
-        tokio::io::AsyncRead::poll_read(self.project().inner, cx, buf)
+        let mut buf = tokio::io::ReadBuf::new(slice);
+        ready!(tokio::io::AsyncRead::poll_read(
+            self.project().inner,
+            cx,
+            &mut buf
+        ))?;
+        Poll::Ready(Ok(buf.filled().len()))
     }
 }
 
@@ -199,3 +215,17 @@
         tokio::io::AsyncWrite::poll_shutdown(self.project().inner, cx)
     }
 }
+
+#[cfg(unix)]
+impl<T: std::os::unix::io::AsRawFd> std::os::unix::io::AsRawFd for Compat<T> {
+    fn as_raw_fd(&self) -> std::os::unix::io::RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
+#[cfg(windows)]
+impl<T: std::os::windows::io::AsRawHandle> std::os::windows::io::AsRawHandle for Compat<T> {
+    fn as_raw_handle(&self) -> std::os::windows::io::RawHandle {
+        self.inner.as_raw_handle()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/context.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/context.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/context.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/context.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,190 @@
+//! Tokio context aware futures utilities.
+//!
+//! This module includes utilities around integrating tokio with other runtimes
+//! by allowing the context to be attached to futures. This allows spawning
+//! futures on other executors while still using tokio to drive them. This
+//! can be useful if you need to use a tokio based library in an executor/runtime
+//! that does not provide a tokio context.
+
+use pin_project_lite::pin_project;
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{Context, Poll},
+};
+use tokio::runtime::{Handle, Runtime};
+
+pin_project! {
+    /// `TokioContext` allows running futures that must be inside Tokio's
+    /// context on a non-Tokio runtime.
+    ///
+    /// It contains a [`Handle`] to the runtime. A handle to the runtime can be
+    /// obtain by calling the [`Runtime::handle()`] method.
+    ///
+    /// Note that the `TokioContext` wrapper only works if the `Runtime` it is
+    /// connected to has not yet been destroyed. You must keep the `Runtime`
+    /// alive until the future has finished executing.
+    ///
+    /// **Warning:** If `TokioContext` is used together with a [current thread]
+    /// runtime, that runtime must be inside a call to `block_on` for the
+    /// wrapped future to work. For this reason, it is recommended to use a
+    /// [multi thread] runtime, even if you configure it to only spawn one
+    /// worker thread.
+    ///
+    /// # Examples
+    ///
+    /// This example creates two runtimes, but only [enables time] on one of
+    /// them. It then uses the context of the runtime with the timer enabled to
+    /// execute a [`sleep`] future on the runtime with timing disabled.
+    /// ```
+    /// use tokio::time::{sleep, Duration};
+    /// use tokio_util::context::RuntimeExt;
+    ///
+    /// // This runtime has timers enabled.
+    /// let rt = tokio::runtime::Builder::new_multi_thread()
+    ///     .enable_all()
+    ///     .build()
+    ///     .unwrap();
+    ///
+    /// // This runtime has timers disabled.
+    /// let rt2 = tokio::runtime::Builder::new_multi_thread()
+    ///     .build()
+    ///     .unwrap();
+    ///
+    /// // Wrap the sleep future in the context of rt.
+    /// let fut = rt.wrap(async { sleep(Duration::from_millis(2)).await });
+    ///
+    /// // Execute the future on rt2.
+    /// rt2.block_on(fut);
+    /// ```
+    ///
+    /// [`Handle`]: struct@tokio::runtime::Handle
+    /// [`Runtime::handle()`]: fn@tokio::runtime::Runtime::handle
+    /// [`RuntimeExt`]: trait@crate::context::RuntimeExt
+    /// [`new_static`]: fn@Self::new_static
+    /// [`sleep`]: fn@tokio::time::sleep
+    /// [current thread]: fn@tokio::runtime::Builder::new_current_thread
+    /// [enables time]: fn@tokio::runtime::Builder::enable_time
+    /// [multi thread]: fn@tokio::runtime::Builder::new_multi_thread
+    pub struct TokioContext<F> {
+        #[pin]
+        inner: F,
+        handle: Handle,
+    }
+}
+
+impl<F> TokioContext<F> {
+    /// Associate the provided future with the context of the runtime behind
+    /// the provided `Handle`.
+    ///
+    /// This constructor uses a `'static` lifetime to opt-out of checking that
+    /// the runtime still exists.
+    ///
+    /// # Examples
+    ///
+    /// This is the same as the example above, but uses the `new` constructor
+    /// rather than [`RuntimeExt::wrap`].
+    ///
+    /// [`RuntimeExt::wrap`]: fn@RuntimeExt::wrap
+    ///
+    /// ```
+    /// use tokio::time::{sleep, Duration};
+    /// use tokio_util::context::TokioContext;
+    ///
+    /// // This runtime has timers enabled.
+    /// let rt = tokio::runtime::Builder::new_multi_thread()
+    ///     .enable_all()
+    ///     .build()
+    ///     .unwrap();
+    ///
+    /// // This runtime has timers disabled.
+    /// let rt2 = tokio::runtime::Builder::new_multi_thread()
+    ///     .build()
+    ///     .unwrap();
+    ///
+    /// let fut = TokioContext::new(
+    ///     async { sleep(Duration::from_millis(2)).await },
+    ///     rt.handle().clone(),
+    /// );
+    ///
+    /// // Execute the future on rt2.
+    /// rt2.block_on(fut);
+    /// ```
+    pub fn new(future: F, handle: Handle) -> TokioContext<F> {
+        TokioContext {
+            inner: future,
+            handle,
+        }
+    }
+
+    /// Obtain a reference to the handle inside this `TokioContext`.
+    pub fn handle(&self) -> &Handle {
+        &self.handle
+    }
+
+    /// Remove the association between the Tokio runtime and the wrapped future.
+    pub fn into_inner(self) -> F {
+        self.inner
+    }
+}
+
+impl<F: Future> Future for TokioContext<F> {
+    type Output = F::Output;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let me = self.project();
+        let handle = me.handle;
+        let fut = me.inner;
+
+        let _enter = handle.enter();
+        fut.poll(cx)
+    }
+}
+
+/// Extension trait that simplifies bundling a `Handle` with a `Future`.
+pub trait RuntimeExt {
+    /// Create a [`TokioContext`] that wraps the provided future and runs it in
+    /// this runtime's context.
+    ///
+    /// # Examples
+    ///
+    /// This example creates two runtimes, but only [enables time] on one of
+    /// them. It then uses the context of the runtime with the timer enabled to
+    /// execute a [`sleep`] future on the runtime with timing disabled.
+    ///
+    /// ```
+    /// use tokio::time::{sleep, Duration};
+    /// use tokio_util::context::RuntimeExt;
+    ///
+    /// // This runtime has timers enabled.
+    /// let rt = tokio::runtime::Builder::new_multi_thread()
+    ///     .enable_all()
+    ///     .build()
+    ///     .unwrap();
+    ///
+    /// // This runtime has timers disabled.
+    /// let rt2 = tokio::runtime::Builder::new_multi_thread()
+    ///     .build()
+    ///     .unwrap();
+    ///
+    /// // Wrap the sleep future in the context of rt.
+    /// let fut = rt.wrap(async { sleep(Duration::from_millis(2)).await });
+    ///
+    /// // Execute the future on rt2.
+    /// rt2.block_on(fut);
+    /// ```
+    ///
+    /// [`TokioContext`]: struct@crate::context::TokioContext
+    /// [`sleep`]: fn@tokio::time::sleep
+    /// [enables time]: fn@tokio::runtime::Builder::enable_time
+    fn wrap<F: Future>(&self, fut: F) -> TokioContext<F>;
+}
+
+impl RuntimeExt for Runtime {
+    fn wrap<F: Future>(&self, fut: F) -> TokioContext<F> {
+        TokioContext {
+            inner: fut,
+            handle: self.handle().clone(),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/either.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/either.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/either.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/either.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,188 @@
+//! Module defining an Either type.
+use std::{
+    future::Future,
+    io::SeekFrom,
+    pin::Pin,
+    task::{Context, Poll},
+};
+use tokio::io::{AsyncBufRead, AsyncRead, AsyncSeek, AsyncWrite, ReadBuf, Result};
+
+/// Combines two different futures, streams, or sinks having the same associated types into a single type.
+///
+/// This type implements common asynchronous traits such as [`Future`] and those in Tokio.
+///
+/// [`Future`]: std::future::Future
+///
+/// # Example
+///
+/// The following code will not work:
+///
+/// ```compile_fail
+/// # fn some_condition() -> bool { true }
+/// # async fn some_async_function() -> u32 { 10 }
+/// # async fn other_async_function() -> u32 { 20 }
+/// #[tokio::main]
+/// async fn main() {
+///     let result = if some_condition() {
+///         some_async_function()
+///     } else {
+///         other_async_function() // <- Will print: "`if` and `else` have incompatible types"
+///     };
+///
+///     println!("Result is {}", result.await);
+/// }
+/// ```
+///
+// This is because although the output types for both futures is the same, the exact future
+// types are different, but the compiler must be able to choose a single type for the
+// `result` variable.
+///
+/// When the output type is the same, we can wrap each future in `Either` to avoid the
+/// issue:
+///
+/// ```
+/// use tokio_util::either::Either;
+/// # fn some_condition() -> bool { true }
+/// # async fn some_async_function() -> u32 { 10 }
+/// # async fn other_async_function() -> u32 { 20 }
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let result = if some_condition() {
+///         Either::Left(some_async_function())
+///     } else {
+///         Either::Right(other_async_function())
+///     };
+///
+///     let value = result.await;
+///     println!("Result is {}", value);
+///     # assert_eq!(value, 10);
+/// }
+/// ```
+#[allow(missing_docs)] // Doc-comments for variants in this particular case don't make much sense.
+#[derive(Debug, Clone)]
+pub enum Either<L, R> {
+    Left(L),
+    Right(R),
+}
+
+/// A small helper macro which reduces amount of boilerplate in the actual trait method implementation.
+/// It takes an invokation of method as an argument (e.g. `self.poll(cx)`), and redirects it to either
+/// enum variant held in `self`.
+macro_rules! delegate_call {
+    ($self:ident.$method:ident($($args:ident),+)) => {
+        unsafe {
+            match $self.get_unchecked_mut() {
+                Self::Left(l) => Pin::new_unchecked(l).$method($($args),+),
+                Self::Right(r) => Pin::new_unchecked(r).$method($($args),+),
+            }
+        }
+    }
+}
+
+impl<L, R, O> Future for Either<L, R>
+where
+    L: Future<Output = O>,
+    R: Future<Output = O>,
+{
+    type Output = O;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        delegate_call!(self.poll(cx))
+    }
+}
+
+impl<L, R> AsyncRead for Either<L, R>
+where
+    L: AsyncRead,
+    R: AsyncRead,
+{
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<Result<()>> {
+        delegate_call!(self.poll_read(cx, buf))
+    }
+}
+
+impl<L, R> AsyncBufRead for Either<L, R>
+where
+    L: AsyncBufRead,
+    R: AsyncBufRead,
+{
+    fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<&[u8]>> {
+        delegate_call!(self.poll_fill_buf(cx))
+    }
+
+    fn consume(self: Pin<&mut Self>, amt: usize) {
+        delegate_call!(self.consume(amt))
+    }
+}
+
+impl<L, R> AsyncSeek for Either<L, R>
+where
+    L: AsyncSeek,
+    R: AsyncSeek,
+{
+    fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> Result<()> {
+        delegate_call!(self.start_seek(position))
+    }
+
+    fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<u64>> {
+        delegate_call!(self.poll_complete(cx))
+    }
+}
+
+impl<L, R> AsyncWrite for Either<L, R>
+where
+    L: AsyncWrite,
+    R: AsyncWrite,
+{
+    fn poll_write(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8]) -> Poll<Result<usize>> {
+        delegate_call!(self.poll_write(cx, buf))
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<tokio::io::Result<()>> {
+        delegate_call!(self.poll_flush(cx))
+    }
+
+    fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<tokio::io::Result<()>> {
+        delegate_call!(self.poll_shutdown(cx))
+    }
+}
+
+impl<L, R> futures_core::stream::Stream for Either<L, R>
+where
+    L: futures_core::stream::Stream,
+    R: futures_core::stream::Stream<Item = L::Item>,
+{
+    type Item = L::Item;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        delegate_call!(self.poll_next(cx))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tokio::io::{repeat, AsyncReadExt, Repeat};
+    use tokio_stream::{once, Once, StreamExt};
+
+    #[tokio::test]
+    async fn either_is_stream() {
+        let mut either: Either<Once<u32>, Once<u32>> = Either::Left(once(1));
+
+        assert_eq!(Some(1u32), either.next().await);
+    }
+
+    #[tokio::test]
+    async fn either_is_async_read() {
+        let mut buffer = [0; 3];
+        let mut either: Either<Repeat, Repeat> = Either::Right(repeat(0b101));
+
+        either.read_exact(&mut buffer).await.unwrap();
+        assert_eq!(buffer, [0b101, 0b101, 0b101]);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/io/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/io/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/io/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/io/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+//! Helpers for IO related tasks.
+//!
+//! These types are often used in combination with hyper or reqwest, as they
+//! allow converting between a hyper [`Body`] and [`AsyncRead`].
+//!
+//! [`Body`]: https://docs.rs/hyper/0.13/hyper/struct.Body.html
+//! [`AsyncRead`]: tokio::io::AsyncRead
+
+mod read_buf;
+mod reader_stream;
+mod stream_reader;
+
+pub use self::read_buf::read_buf;
+pub use self::reader_stream::ReaderStream;
+pub use self::stream_reader::StreamReader;
+pub use crate::util::{poll_read_buf, poll_write_buf};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/io/read_buf.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/io/read_buf.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/io/read_buf.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/io/read_buf.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,65 @@
+use bytes::BufMut;
+use std::future::Future;
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use tokio::io::AsyncRead;
+
+/// Read data from an `AsyncRead` into an implementer of the [`BufMut`] trait.
+///
+/// [`BufMut`]: bytes::BufMut
+///
+/// # Example
+///
+/// ```
+/// use bytes::{Bytes, BytesMut};
+/// use tokio_stream as stream;
+/// use tokio::io::Result;
+/// use tokio_util::io::{StreamReader, read_buf};
+/// # #[tokio::main]
+/// # async fn main() -> std::io::Result<()> {
+///
+/// // Create a reader from an iterator. This particular reader will always be
+/// // ready.
+/// let mut read = StreamReader::new(stream::iter(vec![Result::Ok(Bytes::from_static(&[0, 1, 2, 3]))]));
+///
+/// let mut buf = BytesMut::new();
+/// let mut reads = 0;
+///
+/// loop {
+///     reads += 1;
+///     let n = read_buf(&mut read, &mut buf).await?;
+///
+///     if n == 0 {
+///         break;
+///     }
+/// }
+///
+/// // one or more reads might be necessary.
+/// assert!(reads >= 1);
+/// assert_eq!(&buf[..], &[0, 1, 2, 3]);
+/// # Ok(())
+/// # }
+/// ```
+pub async fn read_buf<R, B>(read: &mut R, buf: &mut B) -> io::Result<usize>
+where
+    R: AsyncRead + Unpin,
+    B: BufMut,
+{
+    return ReadBufFn(read, buf).await;
+
+    struct ReadBufFn<'a, R, B>(&'a mut R, &'a mut B);
+
+    impl<'a, R, B> Future for ReadBufFn<'a, R, B>
+    where
+        R: AsyncRead + Unpin,
+        B: BufMut,
+    {
+        type Output = io::Result<usize>;
+
+        fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            let this = &mut *self;
+            crate::util::poll_read_buf(Pin::new(this.0), cx, this.1)
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/io/reader_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/io/reader_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/io/reader_stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/io/reader_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,102 @@
+use bytes::{Bytes, BytesMut};
+use futures_core::stream::Stream;
+use pin_project_lite::pin_project;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use tokio::io::AsyncRead;
+
+const CAPACITY: usize = 4096;
+
+pin_project! {
+    /// Convert an [`AsyncRead`] into a [`Stream`] of byte chunks.
+    ///
+    /// This stream is fused. It performs the inverse operation of
+    /// [`StreamReader`].
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # #[tokio::main]
+    /// # async fn main() -> std::io::Result<()> {
+    /// use tokio_stream::StreamExt;
+    /// use tokio_util::io::ReaderStream;
+    ///
+    /// // Create a stream of data.
+    /// let data = b"hello, world!";
+    /// let mut stream = ReaderStream::new(&data[..]);
+    ///
+    /// // Read all of the chunks into a vector.
+    /// let mut stream_contents = Vec::new();
+    /// while let Some(chunk) = stream.next().await {
+    ///    stream_contents.extend_from_slice(&chunk?);
+    /// }
+    ///
+    /// // Once the chunks are concatenated, we should have the
+    /// // original data.
+    /// assert_eq!(stream_contents, data);
+    /// # Ok(())
+    /// # }
+    /// ```
+    ///
+    /// [`AsyncRead`]: tokio::io::AsyncRead
+    /// [`StreamReader`]: crate::io::StreamReader
+    /// [`Stream`]: futures_core::Stream
+    #[derive(Debug)]
+    pub struct ReaderStream<R> {
+        // Reader itself.
+        //
+        // This value is `None` if the stream has terminated.
+        #[pin]
+        reader: Option<R>,
+        // Working buffer, used to optimize allocations.
+        buf: BytesMut,
+    }
+}
+
+impl<R: AsyncRead> ReaderStream<R> {
+    /// Convert an [`AsyncRead`] into a [`Stream`] with item type
+    /// `Result<Bytes, std::io::Error>`.
+    ///
+    /// [`AsyncRead`]: tokio::io::AsyncRead
+    /// [`Stream`]: futures_core::Stream
+    pub fn new(reader: R) -> Self {
+        ReaderStream {
+            reader: Some(reader),
+            buf: BytesMut::new(),
+        }
+    }
+}
+
+impl<R: AsyncRead> Stream for ReaderStream<R> {
+    type Item = std::io::Result<Bytes>;
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        use crate::util::poll_read_buf;
+
+        let mut this = self.as_mut().project();
+
+        let reader = match this.reader.as_pin_mut() {
+            Some(r) => r,
+            None => return Poll::Ready(None),
+        };
+
+        if this.buf.capacity() == 0 {
+            this.buf.reserve(CAPACITY);
+        }
+
+        match poll_read_buf(reader, cx, &mut this.buf) {
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(Err(err)) => {
+                self.project().reader.set(None);
+                Poll::Ready(Some(Err(err)))
+            }
+            Poll::Ready(Ok(0)) => {
+                self.project().reader.set(None);
+                Poll::Ready(None)
+            }
+            Poll::Ready(Ok(_)) => {
+                let chunk = this.buf.split();
+                Poll::Ready(Some(Ok(chunk.freeze())))
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/io/stream_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/io/stream_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/io/stream_reader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/io/stream_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,188 @@
+use bytes::Buf;
+use futures_core::stream::Stream;
+use pin_project_lite::pin_project;
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use tokio::io::{AsyncBufRead, AsyncRead, ReadBuf};
+
+pin_project! {
+    /// Convert a [`Stream`] of byte chunks into an [`AsyncRead`].
+    ///
+    /// This type performs the inverse operation of [`ReaderStream`].
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use bytes::Bytes;
+    /// use tokio::io::{AsyncReadExt, Result};
+    /// use tokio_util::io::StreamReader;
+    /// # #[tokio::main]
+    /// # async fn main() -> std::io::Result<()> {
+    ///
+    /// // Create a stream from an iterator.
+    /// let stream = tokio_stream::iter(vec![
+    ///     Result::Ok(Bytes::from_static(&[0, 1, 2, 3])),
+    ///     Result::Ok(Bytes::from_static(&[4, 5, 6, 7])),
+    ///     Result::Ok(Bytes::from_static(&[8, 9, 10, 11])),
+    /// ]);
+    ///
+    /// // Convert it to an AsyncRead.
+    /// let mut read = StreamReader::new(stream);
+    ///
+    /// // Read five bytes from the stream.
+    /// let mut buf = [0; 5];
+    /// read.read_exact(&mut buf).await?;
+    /// assert_eq!(buf, [0, 1, 2, 3, 4]);
+    ///
+    /// // Read the rest of the current chunk.
+    /// assert_eq!(read.read(&mut buf).await?, 3);
+    /// assert_eq!(&buf[..3], [5, 6, 7]);
+    ///
+    /// // Read the next chunk.
+    /// assert_eq!(read.read(&mut buf).await?, 4);
+    /// assert_eq!(&buf[..4], [8, 9, 10, 11]);
+    ///
+    /// // We have now reached the end.
+    /// assert_eq!(read.read(&mut buf).await?, 0);
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
+    ///
+    /// [`AsyncRead`]: tokio::io::AsyncRead
+    /// [`Stream`]: futures_core::Stream
+    /// [`ReaderStream`]: crate::io::ReaderStream
+    #[derive(Debug)]
+    pub struct StreamReader<S, B> {
+        #[pin]
+        inner: S,
+        chunk: Option<B>,
+    }
+}
+
+impl<S, B, E> StreamReader<S, B>
+where
+    S: Stream<Item = Result<B, E>>,
+    B: Buf,
+    E: Into<std::io::Error>,
+{
+    /// Convert a stream of byte chunks into an [`AsyncRead`](tokio::io::AsyncRead).
+    ///
+    /// The item should be a [`Result`] with the ok variant being something that
+    /// implements the [`Buf`] trait (e.g. `Vec<u8>` or `Bytes`). The error
+    /// should be convertible into an [io error].
+    ///
+    /// [`Result`]: std::result::Result
+    /// [`Buf`]: bytes::Buf
+    /// [io error]: std::io::Error
+    pub fn new(stream: S) -> Self {
+        Self {
+            inner: stream,
+            chunk: None,
+        }
+    }
+
+    /// Do we have a chunk and is it non-empty?
+    fn has_chunk(self: Pin<&mut Self>) -> bool {
+        if let Some(chunk) = self.project().chunk {
+            chunk.remaining() > 0
+        } else {
+            false
+        }
+    }
+}
+
+impl<S, B> StreamReader<S, B> {
+    /// Gets a reference to the underlying stream.
+    ///
+    /// It is inadvisable to directly read from the underlying stream.
+    pub fn get_ref(&self) -> &S {
+        &self.inner
+    }
+
+    /// Gets a mutable reference to the underlying stream.
+    ///
+    /// It is inadvisable to directly read from the underlying stream.
+    pub fn get_mut(&mut self) -> &mut S {
+        &mut self.inner
+    }
+
+    /// Gets a pinned mutable reference to the underlying stream.
+    ///
+    /// It is inadvisable to directly read from the underlying stream.
+    pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut S> {
+        self.project().inner
+    }
+
+    /// Consumes this `BufWriter`, returning the underlying stream.
+    ///
+    /// Note that any leftover data in the internal buffer is lost.
+    pub fn into_inner(self) -> S {
+        self.inner
+    }
+}
+
+impl<S, B, E> AsyncRead for StreamReader<S, B>
+where
+    S: Stream<Item = Result<B, E>>,
+    B: Buf,
+    E: Into<std::io::Error>,
+{
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        if buf.remaining() == 0 {
+            return Poll::Ready(Ok(()));
+        }
+
+        let inner_buf = match self.as_mut().poll_fill_buf(cx) {
+            Poll::Ready(Ok(buf)) => buf,
+            Poll::Ready(Err(err)) => return Poll::Ready(Err(err)),
+            Poll::Pending => return Poll::Pending,
+        };
+        let len = std::cmp::min(inner_buf.len(), buf.remaining());
+        buf.put_slice(&inner_buf[..len]);
+
+        self.consume(len);
+        Poll::Ready(Ok(()))
+    }
+}
+
+impl<S, B, E> AsyncBufRead for StreamReader<S, B>
+where
+    S: Stream<Item = Result<B, E>>,
+    B: Buf,
+    E: Into<std::io::Error>,
+{
+    fn poll_fill_buf(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
+        loop {
+            if self.as_mut().has_chunk() {
+                // This unwrap is very sad, but it can't be avoided.
+                let buf = self.project().chunk.as_ref().unwrap().chunk();
+                return Poll::Ready(Ok(buf));
+            } else {
+                match self.as_mut().project().inner.poll_next(cx) {
+                    Poll::Ready(Some(Ok(chunk))) => {
+                        // Go around the loop in case the chunk is empty.
+                        *self.as_mut().project().chunk = Some(chunk);
+                    }
+                    Poll::Ready(Some(Err(err))) => return Poll::Ready(Err(err.into())),
+                    Poll::Ready(None) => return Poll::Ready(Ok(&[])),
+                    Poll::Pending => return Poll::Pending,
+                }
+            }
+        }
+    }
+    fn consume(self: Pin<&mut Self>, amt: usize) {
+        if amt > 0 {
+            self.project()
+                .chunk
+                .as_mut()
+                .expect("No chunk present")
+                .advance(amt);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,3 @@
-#![doc(html_root_url = "https://docs.rs/tokio-util/0.3.1")]
 #![allow(clippy::needless_doctest_main)]
 #![warn(
     missing_debug_implementations,
@@ -6,7 +5,7 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![deny(intra_doc_link_resolution_failure)]
+#![cfg_attr(docsrs, deny(broken_intra_doc_links))]
 #![doc(test(
     no_crate_inject,
     attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
@@ -24,14 +23,178 @@
 #[macro_use]
 mod cfg;
 
+mod loom;
+
 cfg_codec! {
     pub mod codec;
 }
 
-cfg_udp! {
+cfg_net! {
     pub mod udp;
 }
 
 cfg_compat! {
     pub mod compat;
 }
+
+cfg_io! {
+    pub mod io;
+}
+
+cfg_rt! {
+    pub mod context;
+}
+
+cfg_time! {
+    pub mod time;
+}
+
+pub mod sync;
+
+pub mod either;
+
+#[cfg(any(feature = "io", feature = "codec"))]
+mod util {
+    use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+
+    use bytes::{Buf, BufMut};
+    use futures_core::ready;
+    use std::io::{self, IoSlice};
+    use std::mem::MaybeUninit;
+    use std::pin::Pin;
+    use std::task::{Context, Poll};
+
+    /// Try to read data from an `AsyncRead` into an implementer of the [`BufMut`] trait.
+    ///
+    /// [`BufMut`]: bytes::Buf
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use bytes::{Bytes, BytesMut};
+    /// use tokio_stream as stream;
+    /// use tokio::io::Result;
+    /// use tokio_util::io::{StreamReader, poll_read_buf};
+    /// use futures::future::poll_fn;
+    /// use std::pin::Pin;
+    /// # #[tokio::main]
+    /// # async fn main() -> std::io::Result<()> {
+    ///
+    /// // Create a reader from an iterator. This particular reader will always be
+    /// // ready.
+    /// let mut read = StreamReader::new(stream::iter(vec![Result::Ok(Bytes::from_static(&[0, 1, 2, 3]))]));
+    ///
+    /// let mut buf = BytesMut::new();
+    /// let mut reads = 0;
+    ///
+    /// loop {
+    ///     reads += 1;
+    ///     let n = poll_fn(|cx| poll_read_buf(Pin::new(&mut read), cx, &mut buf)).await?;
+    ///
+    ///     if n == 0 {
+    ///         break;
+    ///     }
+    /// }
+    ///
+    /// // one or more reads might be necessary.
+    /// assert!(reads >= 1);
+    /// assert_eq!(&buf[..], &[0, 1, 2, 3]);
+    /// # Ok(())
+    /// # }
+    /// ```
+    #[cfg_attr(not(feature = "io"), allow(unreachable_pub))]
+    pub fn poll_read_buf<T: AsyncRead, B: BufMut>(
+        io: Pin<&mut T>,
+        cx: &mut Context<'_>,
+        buf: &mut B,
+    ) -> Poll<io::Result<usize>> {
+        if !buf.has_remaining_mut() {
+            return Poll::Ready(Ok(0));
+        }
+
+        let n = {
+            let dst = buf.chunk_mut();
+            let dst = unsafe { &mut *(dst as *mut _ as *mut [MaybeUninit<u8>]) };
+            let mut buf = ReadBuf::uninit(dst);
+            let ptr = buf.filled().as_ptr();
+            ready!(io.poll_read(cx, &mut buf)?);
+
+            // Ensure the pointer does not change from under us
+            assert_eq!(ptr, buf.filled().as_ptr());
+            buf.filled().len()
+        };
+
+        // Safety: This is guaranteed to be the number of initialized (and read)
+        // bytes due to the invariants provided by `ReadBuf::filled`.
+        unsafe {
+            buf.advance_mut(n);
+        }
+
+        Poll::Ready(Ok(n))
+    }
+
+    /// Try to write data from an implementer of the [`Buf`] trait to an
+    /// [`AsyncWrite`], advancing the buffer's internal cursor.
+    ///
+    /// This function will use [vectored writes] when the [`AsyncWrite`] supports
+    /// vectored writes.
+    ///
+    /// # Examples
+    ///
+    /// [`File`] implements [`AsyncWrite`] and [`Cursor<&[u8]>`] implements
+    /// [`Buf`]:
+    ///
+    /// ```no_run
+    /// use tokio_util::io::poll_write_buf;
+    /// use tokio::io;
+    /// use tokio::fs::File;
+    ///
+    /// use bytes::Buf;
+    /// use std::io::Cursor;
+    /// use std::pin::Pin;
+    /// use futures::future::poll_fn;
+    ///
+    /// #[tokio::main]
+    /// async fn main() -> io::Result<()> {
+    ///     let mut file = File::create("foo.txt").await?;
+    ///     let mut buf = Cursor::new(b"data to write");
+    ///
+    ///     // Loop until the entire contents of the buffer are written to
+    ///     // the file.
+    ///     while buf.has_remaining() {
+    ///         poll_fn(|cx| poll_write_buf(Pin::new(&mut file), cx, &mut buf)).await?;
+    ///     }
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// [`Buf`]: bytes::Buf
+    /// [`AsyncWrite`]: tokio::io::AsyncWrite
+    /// [`File`]: tokio::fs::File
+    /// [vectored writes]: tokio::io::AsyncWrite::poll_write_vectored
+    #[cfg_attr(not(feature = "io"), allow(unreachable_pub))]
+    pub fn poll_write_buf<T: AsyncWrite, B: Buf>(
+        io: Pin<&mut T>,
+        cx: &mut Context<'_>,
+        buf: &mut B,
+    ) -> Poll<io::Result<usize>> {
+        const MAX_BUFS: usize = 64;
+
+        if !buf.has_remaining() {
+            return Poll::Ready(Ok(0));
+        }
+
+        let n = if io.is_write_vectored() {
+            let mut slices = [IoSlice::new(&[]); MAX_BUFS];
+            let cnt = buf.chunks_vectored(&mut slices);
+            ready!(io.poll_write_vectored(cx, &slices[..cnt]))?
+        } else {
+            ready!(io.poll_write(cx, buf.chunk()))?
+        };
+
+        buf.advance(n);
+
+        Poll::Ready(Ok(n))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/loom.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/loom.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/loom.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/loom.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+pub(crate) use std::sync;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/cancellation_token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/cancellation_token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/cancellation_token.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/cancellation_token.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,867 @@
+//! An asynchronously awaitable `CancellationToken`.
+//! The token allows to signal a cancellation request to one or more tasks.
+
+use crate::loom::sync::atomic::AtomicUsize;
+use crate::loom::sync::Mutex;
+use crate::sync::intrusive_double_linked_list::{LinkedList, ListNode};
+
+use core::future::Future;
+use core::pin::Pin;
+use core::ptr::NonNull;
+use core::sync::atomic::Ordering;
+use core::task::{Context, Poll, Waker};
+
+/// A token which can be used to signal a cancellation request to one or more
+/// tasks.
+///
+/// Tasks can call [`CancellationToken::cancelled()`] in order to
+/// obtain a Future which will be resolved when cancellation is requested.
+///
+/// Cancellation can be requested through the [`CancellationToken::cancel`] method.
+///
+/// # Examples
+///
+/// ```ignore
+/// use tokio::select;
+/// use tokio::scope::CancellationToken;
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let token = CancellationToken::new();
+///     let cloned_token = token.clone();
+///
+///     let join_handle = tokio::spawn(async move {
+///         // Wait for either cancellation or a very long time
+///         select! {
+///             _ = cloned_token.cancelled() => {
+///                 // The token was cancelled
+///                 5
+///             }
+///             _ = tokio::time::sleep(std::time::Duration::from_secs(9999)) => {
+///                 99
+///             }
+///         }
+///     });
+///
+///     tokio::spawn(async move {
+///         tokio::time::sleep(std::time::Duration::from_millis(10)).await;
+///         token.cancel();
+///     });
+///
+///     assert_eq!(5, join_handle.await.unwrap());
+/// }
+/// ```
+pub struct CancellationToken {
+    inner: NonNull<CancellationTokenState>,
+}
+
+// Safety: The CancellationToken is thread-safe and can be moved between threads,
+// since all methods are internally synchronized.
+unsafe impl Send for CancellationToken {}
+unsafe impl Sync for CancellationToken {}
+
+/// A Future that is resolved once the corresponding [`CancellationToken`]
+/// was cancelled
+#[must_use = "futures do nothing unless polled"]
+pub struct WaitForCancellationFuture<'a> {
+    /// The CancellationToken that is associated with this WaitForCancellationFuture
+    cancellation_token: Option<&'a CancellationToken>,
+    /// Node for waiting at the cancellation_token
+    wait_node: ListNode<WaitQueueEntry>,
+    /// Whether this future was registered at the token yet as a waiter
+    is_registered: bool,
+}
+
+// Safety: Futures can be sent between threads as long as the underlying
+// cancellation_token is thread-safe (Sync),
+// which allows to poll/register/unregister from a different thread.
+unsafe impl<'a> Send for WaitForCancellationFuture<'a> {}
+
+// ===== impl CancellationToken =====
+
+impl core::fmt::Debug for CancellationToken {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_struct("CancellationToken")
+            .field("is_cancelled", &self.is_cancelled())
+            .finish()
+    }
+}
+
+impl Clone for CancellationToken {
+    fn clone(&self) -> Self {
+        // Safety: The state inside a `CancellationToken` is always valid, since
+        // is reference counted
+        let inner = self.state();
+
+        // Tokens are cloned by increasing their refcount
+        let current_state = inner.snapshot();
+        inner.increment_refcount(current_state);
+
+        CancellationToken { inner: self.inner }
+    }
+}
+
+impl Drop for CancellationToken {
+    fn drop(&mut self) {
+        let token_state_pointer = self.inner;
+
+        // Safety: The state inside a `CancellationToken` is always valid, since
+        // is reference counted
+        let inner = unsafe { &mut *self.inner.as_ptr() };
+
+        let mut current_state = inner.snapshot();
+
+        // We need to safe the parent, since the state might be released by the
+        // next call
+        let parent = inner.parent;
+
+        // Drop our own refcount
+        current_state = inner.decrement_refcount(current_state);
+
+        // If this was the last reference, unregister from the parent
+        if current_state.refcount == 0 {
+            if let Some(mut parent) = parent {
+                // Safety: Since we still retain a reference on the parent, it must be valid.
+                let parent = unsafe { parent.as_mut() };
+                parent.unregister_child(token_state_pointer, current_state);
+            }
+        }
+    }
+}
+
+impl Default for CancellationToken {
+    fn default() -> CancellationToken {
+        CancellationToken::new()
+    }
+}
+
+impl CancellationToken {
+    /// Creates a new CancellationToken in the non-cancelled state.
+    pub fn new() -> CancellationToken {
+        let state = Box::new(CancellationTokenState::new(
+            None,
+            StateSnapshot {
+                cancel_state: CancellationState::NotCancelled,
+                has_parent_ref: false,
+                refcount: 1,
+            },
+        ));
+
+        // Safety: We just created the Box. The pointer is guaranteed to be
+        // not null
+        CancellationToken {
+            inner: unsafe { NonNull::new_unchecked(Box::into_raw(state)) },
+        }
+    }
+
+    /// Returns a reference to the utilized `CancellationTokenState`.
+    fn state(&self) -> &CancellationTokenState {
+        // Safety: The state inside a `CancellationToken` is always valid, since
+        // is reference counted
+        unsafe { &*self.inner.as_ptr() }
+    }
+
+    /// Creates a `CancellationToken` which will get cancelled whenever the
+    /// current token gets cancelled.
+    ///
+    /// If the current token is already cancelled, the child token will get
+    /// returned in cancelled state.
+    ///
+    /// # Examples
+    ///
+    /// ```ignore
+    /// use tokio::select;
+    /// use tokio::scope::CancellationToken;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let token = CancellationToken::new();
+    ///     let child_token = token.child_token();
+    ///
+    ///     let join_handle = tokio::spawn(async move {
+    ///         // Wait for either cancellation or a very long time
+    ///         select! {
+    ///             _ = child_token.cancelled() => {
+    ///                 // The token was cancelled
+    ///                 5
+    ///             }
+    ///             _ = tokio::time::sleep(std::time::Duration::from_secs(9999)) => {
+    ///                 99
+    ///             }
+    ///         }
+    ///     });
+    ///
+    ///     tokio::spawn(async move {
+    ///         tokio::time::sleep(std::time::Duration::from_millis(10)).await;
+    ///         token.cancel();
+    ///     });
+    ///
+    ///     assert_eq!(5, join_handle.await.unwrap());
+    /// }
+    /// ```
+    pub fn child_token(&self) -> CancellationToken {
+        let inner = self.state();
+
+        // Increment the refcount of this token. It will be referenced by the
+        // child, independent of whether the child is immediately cancelled or
+        // not.
+        let _current_state = inner.increment_refcount(inner.snapshot());
+
+        let mut unpacked_child_state = StateSnapshot {
+            has_parent_ref: true,
+            refcount: 1,
+            cancel_state: CancellationState::NotCancelled,
+        };
+        let mut child_token_state = Box::new(CancellationTokenState::new(
+            Some(self.inner),
+            unpacked_child_state,
+        ));
+
+        {
+            let mut guard = inner.synchronized.lock().unwrap();
+            if guard.is_cancelled {
+                // This task was already cancelled. In this case we should not
+                // insert the child into the list, since it would never get removed
+                // from the list.
+                (*child_token_state.synchronized.lock().unwrap()).is_cancelled = true;
+                unpacked_child_state.cancel_state = CancellationState::Cancelled;
+                // Since it's not in the list, the parent doesn't need to retain
+                // a reference to it.
+                unpacked_child_state.has_parent_ref = false;
+                child_token_state
+                    .state
+                    .store(unpacked_child_state.pack(), Ordering::SeqCst);
+            } else {
+                if let Some(mut first_child) = guard.first_child {
+                    child_token_state.from_parent.next_peer = Some(first_child);
+                    // Safety: We manipulate other child task inside the Mutex
+                    // and retain a parent reference on it. The child token can't
+                    // get invalidated while the Mutex is held.
+                    unsafe {
+                        first_child.as_mut().from_parent.prev_peer =
+                            Some((&mut *child_token_state).into())
+                    };
+                }
+                guard.first_child = Some((&mut *child_token_state).into());
+            }
+        };
+
+        let child_token_ptr = Box::into_raw(child_token_state);
+        // Safety: We just created the pointer from a `Box`
+        CancellationToken {
+            inner: unsafe { NonNull::new_unchecked(child_token_ptr) },
+        }
+    }
+
+    /// Cancel the [`CancellationToken`] and all child tokens which had been
+    /// derived from it.
+    ///
+    /// This will wake up all tasks which are waiting for cancellation.
+    pub fn cancel(&self) {
+        self.state().cancel();
+    }
+
+    /// Returns `true` if the `CancellationToken` had been cancelled
+    pub fn is_cancelled(&self) -> bool {
+        self.state().is_cancelled()
+    }
+
+    /// Returns a `Future` that gets fulfilled when cancellation is requested.
+    pub fn cancelled(&self) -> WaitForCancellationFuture<'_> {
+        WaitForCancellationFuture {
+            cancellation_token: Some(self),
+            wait_node: ListNode::new(WaitQueueEntry::new()),
+            is_registered: false,
+        }
+    }
+
+    unsafe fn register(
+        &self,
+        wait_node: &mut ListNode<WaitQueueEntry>,
+        cx: &mut Context<'_>,
+    ) -> Poll<()> {
+        self.state().register(wait_node, cx)
+    }
+
+    fn check_for_cancellation(
+        &self,
+        wait_node: &mut ListNode<WaitQueueEntry>,
+        cx: &mut Context<'_>,
+    ) -> Poll<()> {
+        self.state().check_for_cancellation(wait_node, cx)
+    }
+
+    fn unregister(&self, wait_node: &mut ListNode<WaitQueueEntry>) {
+        self.state().unregister(wait_node)
+    }
+}
+
+// ===== impl WaitForCancellationFuture =====
+
+impl<'a> core::fmt::Debug for WaitForCancellationFuture<'a> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_struct("WaitForCancellationFuture").finish()
+    }
+}
+
+impl<'a> Future for WaitForCancellationFuture<'a> {
+    type Output = ();
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
+        // Safety: We do not move anything out of `WaitForCancellationFuture`
+        let mut_self: &mut WaitForCancellationFuture<'_> = unsafe { Pin::get_unchecked_mut(self) };
+
+        let cancellation_token = mut_self
+            .cancellation_token
+            .expect("polled WaitForCancellationFuture after completion");
+
+        let poll_res = if !mut_self.is_registered {
+            // Safety: The `ListNode` is pinned through the Future,
+            // and we will unregister it in `WaitForCancellationFuture::drop`
+            // before the Future is dropped and the memory reference is invalidated.
+            unsafe { cancellation_token.register(&mut mut_self.wait_node, cx) }
+        } else {
+            cancellation_token.check_for_cancellation(&mut mut_self.wait_node, cx)
+        };
+
+        if let Poll::Ready(()) = poll_res {
+            // The cancellation_token was signalled
+            mut_self.cancellation_token = None;
+            // A signalled Token means the Waker won't be enqueued anymore
+            mut_self.is_registered = false;
+            mut_self.wait_node.task = None;
+        } else {
+            // This `Future` and its stored `Waker` stay registered at the
+            // `CancellationToken`
+            mut_self.is_registered = true;
+        }
+
+        poll_res
+    }
+}
+
+impl<'a> Drop for WaitForCancellationFuture<'a> {
+    fn drop(&mut self) {
+        // If this WaitForCancellationFuture has been polled and it was added to the
+        // wait queue at the cancellation_token, it must be removed before dropping.
+        // Otherwise the cancellation_token would access invalid memory.
+        if let Some(token) = self.cancellation_token {
+            if self.is_registered {
+                token.unregister(&mut self.wait_node);
+            }
+        }
+    }
+}
+
+/// Tracks how the future had interacted with the [`CancellationToken`]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+enum PollState {
+    /// The task has never interacted with the [`CancellationToken`].
+    New,
+    /// The task was added to the wait queue at the [`CancellationToken`].
+    Waiting,
+    /// The task has been polled to completion.
+    Done,
+}
+
+/// Tracks the WaitForCancellationFuture waiting state.
+/// Access to this struct is synchronized through the mutex in the CancellationToken.
+struct WaitQueueEntry {
+    /// The task handle of the waiting task
+    task: Option<Waker>,
+    // Current polling state. This state is only updated inside the Mutex of
+    // the CancellationToken.
+    state: PollState,
+}
+
+impl WaitQueueEntry {
+    /// Creates a new WaitQueueEntry
+    fn new() -> WaitQueueEntry {
+        WaitQueueEntry {
+            task: None,
+            state: PollState::New,
+        }
+    }
+}
+
+struct SynchronizedState {
+    waiters: LinkedList<WaitQueueEntry>,
+    first_child: Option<NonNull<CancellationTokenState>>,
+    is_cancelled: bool,
+}
+
+impl SynchronizedState {
+    fn new() -> Self {
+        Self {
+            waiters: LinkedList::new(),
+            first_child: None,
+            is_cancelled: false,
+        }
+    }
+}
+
+/// Information embedded in child tokens which is synchronized through the Mutex
+/// in their parent.
+struct SynchronizedThroughParent {
+    next_peer: Option<NonNull<CancellationTokenState>>,
+    prev_peer: Option<NonNull<CancellationTokenState>>,
+}
+
+/// Possible states of a `CancellationToken`
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+enum CancellationState {
+    NotCancelled = 0,
+    Cancelling = 1,
+    Cancelled = 2,
+}
+
+impl CancellationState {
+    fn pack(self) -> usize {
+        self as usize
+    }
+
+    fn unpack(value: usize) -> Self {
+        match value {
+            0 => CancellationState::NotCancelled,
+            1 => CancellationState::Cancelling,
+            2 => CancellationState::Cancelled,
+            _ => unreachable!("Invalid value"),
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+struct StateSnapshot {
+    /// The amount of references to this particular CancellationToken.
+    /// `CancellationToken` structs hold these references to a `CancellationTokenState`.
+    /// Also the state is referenced by the state of each child.
+    refcount: usize,
+    /// Whether the state is still referenced by it's parent and can therefore
+    /// not be freed.
+    has_parent_ref: bool,
+    /// Whether the token is cancelled
+    cancel_state: CancellationState,
+}
+
+impl StateSnapshot {
+    /// Packs the snapshot into a `usize`
+    fn pack(self) -> usize {
+        self.refcount << 3 | if self.has_parent_ref { 4 } else { 0 } | self.cancel_state.pack()
+    }
+
+    /// Unpacks the snapshot from a `usize`
+    fn unpack(value: usize) -> Self {
+        let refcount = value >> 3;
+        let has_parent_ref = value & 4 != 0;
+        let cancel_state = CancellationState::unpack(value & 0x03);
+
+        StateSnapshot {
+            refcount,
+            has_parent_ref,
+            cancel_state,
+        }
+    }
+
+    /// Whether this `CancellationTokenState` is still referenced by any
+    /// `CancellationToken`.
+    fn has_refs(&self) -> bool {
+        self.refcount != 0 || self.has_parent_ref
+    }
+}
+
+/// The maximum permitted amount of references to a CancellationToken. This
+/// is derived from the intent to never use more than 32bit in the `Snapshot`.
+const MAX_REFS: u32 = (std::u32::MAX - 7) >> 3;
+
+/// Internal state of the `CancellationToken` pair above
+struct CancellationTokenState {
+    state: AtomicUsize,
+    parent: Option<NonNull<CancellationTokenState>>,
+    from_parent: SynchronizedThroughParent,
+    synchronized: Mutex<SynchronizedState>,
+}
+
+impl CancellationTokenState {
+    fn new(
+        parent: Option<NonNull<CancellationTokenState>>,
+        state: StateSnapshot,
+    ) -> CancellationTokenState {
+        CancellationTokenState {
+            parent,
+            from_parent: SynchronizedThroughParent {
+                prev_peer: None,
+                next_peer: None,
+            },
+            state: AtomicUsize::new(state.pack()),
+            synchronized: Mutex::new(SynchronizedState::new()),
+        }
+    }
+
+    /// Returns a snapshot of the current atomic state of the token
+    fn snapshot(&self) -> StateSnapshot {
+        StateSnapshot::unpack(self.state.load(Ordering::SeqCst))
+    }
+
+    fn atomic_update_state<F>(&self, mut current_state: StateSnapshot, func: F) -> StateSnapshot
+    where
+        F: Fn(StateSnapshot) -> StateSnapshot,
+    {
+        let mut current_packed_state = current_state.pack();
+        loop {
+            let next_state = func(current_state);
+            match self.state.compare_exchange(
+                current_packed_state,
+                next_state.pack(),
+                Ordering::SeqCst,
+                Ordering::SeqCst,
+            ) {
+                Ok(_) => {
+                    return next_state;
+                }
+                Err(actual) => {
+                    current_packed_state = actual;
+                    current_state = StateSnapshot::unpack(actual);
+                }
+            }
+        }
+    }
+
+    fn increment_refcount(&self, current_state: StateSnapshot) -> StateSnapshot {
+        self.atomic_update_state(current_state, |mut state: StateSnapshot| {
+            if state.refcount >= MAX_REFS as usize {
+                eprintln!("[ERROR] Maximum reference count for CancellationToken was exceeded");
+                std::process::abort();
+            }
+            state.refcount += 1;
+            state
+        })
+    }
+
+    fn decrement_refcount(&self, current_state: StateSnapshot) -> StateSnapshot {
+        let current_state = self.atomic_update_state(current_state, |mut state: StateSnapshot| {
+            state.refcount -= 1;
+            state
+        });
+
+        // Drop the State if it is not referenced anymore
+        if !current_state.has_refs() {
+            // Safety: `CancellationTokenState` is always stored in refcounted
+            // Boxes
+            let _ = unsafe { Box::from_raw(self as *const Self as *mut Self) };
+        }
+
+        current_state
+    }
+
+    fn remove_parent_ref(&self, current_state: StateSnapshot) -> StateSnapshot {
+        let current_state = self.atomic_update_state(current_state, |mut state: StateSnapshot| {
+            state.has_parent_ref = false;
+            state
+        });
+
+        // Drop the State if it is not referenced anymore
+        if !current_state.has_refs() {
+            // Safety: `CancellationTokenState` is always stored in refcounted
+            // Boxes
+            let _ = unsafe { Box::from_raw(self as *const Self as *mut Self) };
+        }
+
+        current_state
+    }
+
+    /// Unregisters a child from the parent token.
+    /// The child tokens state is not exactly known at this point in time.
+    /// If the parent token is cancelled, the child token gets removed from the
+    /// parents list, and might therefore already have been freed. If the parent
+    /// token is not cancelled, the child token is still valid.
+    fn unregister_child(
+        &mut self,
+        mut child_state: NonNull<CancellationTokenState>,
+        current_child_state: StateSnapshot,
+    ) {
+        let removed_child = {
+            // Remove the child toke from the parents linked list
+            let mut guard = self.synchronized.lock().unwrap();
+            if !guard.is_cancelled {
+                // Safety: Since the token was not cancelled, the child must
+                // still be in the list and valid.
+                let mut child_state = unsafe { child_state.as_mut() };
+                debug_assert!(child_state.snapshot().has_parent_ref);
+
+                if guard.first_child == Some(child_state.into()) {
+                    guard.first_child = child_state.from_parent.next_peer;
+                }
+                // Safety: If peers wouldn't be valid anymore, they would try
+                // to remove themselves from the list. This would require locking
+                // the Mutex that we currently own.
+                unsafe {
+                    if let Some(mut prev_peer) = child_state.from_parent.prev_peer {
+                        prev_peer.as_mut().from_parent.next_peer =
+                            child_state.from_parent.next_peer;
+                    }
+                    if let Some(mut next_peer) = child_state.from_parent.next_peer {
+                        next_peer.as_mut().from_parent.prev_peer =
+                            child_state.from_parent.prev_peer;
+                    }
+                }
+                child_state.from_parent.prev_peer = None;
+                child_state.from_parent.next_peer = None;
+
+                // The child is no longer referenced by the parent, since we were able
+                // to remove its reference from the parents list.
+                true
+            } else {
+                // Do not touch the linked list anymore. If the parent is cancelled
+                // it will move all childs outside of the Mutex and manipulate
+                // the pointers there. Manipulating the pointers here too could
+                // lead to races. Therefore leave them just as as and let the
+                // parent deal with it. The parent will make sure to retain a
+                // reference to this state as long as it manipulates the list
+                // pointers. Therefore the pointers are not dangling.
+                false
+            }
+        };
+
+        if removed_child {
+            // If the token removed itself from the parents list, it can reset
+            // the parent ref status. If it is isn't able to do so, because the
+            // parent removed it from the list, there is no need to do this.
+            // The parent ref acts as as another reference count. Therefore
+            // removing this reference can free the object.
+            // Safety: The token was in the list. This means the parent wasn't
+            // cancelled before, and the token must still be alive.
+            unsafe { child_state.as_mut().remove_parent_ref(current_child_state) };
+        }
+
+        // Decrement the refcount on the parent and free it if necessary
+        self.decrement_refcount(self.snapshot());
+    }
+
+    fn cancel(&self) {
+        // Move the state of the CancellationToken from `NotCancelled` to `Cancelling`
+        let mut current_state = self.snapshot();
+
+        let state_after_cancellation = loop {
+            if current_state.cancel_state != CancellationState::NotCancelled {
+                // Another task already initiated the cancellation
+                return;
+            }
+
+            let mut next_state = current_state;
+            next_state.cancel_state = CancellationState::Cancelling;
+            match self.state.compare_exchange(
+                current_state.pack(),
+                next_state.pack(),
+                Ordering::SeqCst,
+                Ordering::SeqCst,
+            ) {
+                Ok(_) => break next_state,
+                Err(actual) => current_state = StateSnapshot::unpack(actual),
+            }
+        };
+
+        // This task cancelled the token
+
+        // Take the task list out of the Token
+        // We do not want to cancel child token inside this lock. If one of the
+        // child tasks would have additional child tokens, we would recursively
+        // take locks.
+
+        // Doing this action has an impact if the child token is dropped concurrently:
+        // It will try to deregister itself from the parent task, but can not find
+        // itself in the task list anymore. Therefore it needs to assume the parent
+        // has extracted the list and will process it. It may not modify the list.
+        // This is OK from a memory safety perspective, since the parent still
+        // retains a reference to the child task until it finished iterating over
+        // it.
+
+        let mut first_child = {
+            let mut guard = self.synchronized.lock().unwrap();
+            // Save the cancellation also inside the Mutex
+            // This allows child tokens which want to detach themselves to detect
+            // that this is no longer required since the parent cleared the list.
+            guard.is_cancelled = true;
+
+            // Wakeup all waiters
+            // This happens inside the lock to make cancellation reliable
+            // If we would access waiters outside of the lock, the pointers
+            // may no longer be valid.
+            // Typically this shouldn't be an issue, since waking a task should
+            // only move it from the blocked into the ready state and not have
+            // further side effects.
+
+            // Use a reverse iterator, so that the oldest waiter gets
+            // scheduled first
+            guard.waiters.reverse_drain(|waiter| {
+                // We are not allowed to move the `Waker` out of the list node.
+                // The `Future` relies on the fact that the old `Waker` stays there
+                // as long as the `Future` has not completed in order to perform
+                // the `will_wake()` check.
+                // Therefore `wake_by_ref` is used instead of `wake()`
+                if let Some(handle) = &mut waiter.task {
+                    handle.wake_by_ref();
+                }
+                // Mark the waiter to have been removed from the list.
+                waiter.state = PollState::Done;
+            });
+
+            guard.first_child.take()
+        };
+
+        while let Some(mut child) = first_child {
+            // Safety: We know this is a valid pointer since it is in our child pointer
+            // list. It can't have been freed in between, since we retain a a reference
+            // to each child.
+            let mut_child = unsafe { child.as_mut() };
+
+            // Get the next child and clean up list pointers
+            first_child = mut_child.from_parent.next_peer;
+            mut_child.from_parent.prev_peer = None;
+            mut_child.from_parent.next_peer = None;
+
+            // Cancel the child task
+            mut_child.cancel();
+
+            // Drop the parent reference. This `CancellationToken` is not interested
+            // in interacting with the child anymore.
+            // This is ONLY allowed once we promised not to touch the state anymore
+            // after this interaction.
+            mut_child.remove_parent_ref(mut_child.snapshot());
+        }
+
+        // The cancellation has completed
+        // At this point in time tasks which registered a wait node can be sure
+        // that this wait node already had been dequeued from the list without
+        // needing to inspect the list.
+        self.atomic_update_state(state_after_cancellation, |mut state| {
+            state.cancel_state = CancellationState::Cancelled;
+            state
+        });
+    }
+
+    /// Returns `true` if the `CancellationToken` had been cancelled
+    fn is_cancelled(&self) -> bool {
+        let current_state = self.snapshot();
+        current_state.cancel_state != CancellationState::NotCancelled
+    }
+
+    /// Registers a waiting task at the `CancellationToken`.
+    /// Safety: This method is only safe as long as the waiting waiting task
+    /// will properly unregister the wait node before it gets moved.
+    unsafe fn register(
+        &self,
+        wait_node: &mut ListNode<WaitQueueEntry>,
+        cx: &mut Context<'_>,
+    ) -> Poll<()> {
+        debug_assert_eq!(PollState::New, wait_node.state);
+        let current_state = self.snapshot();
+
+        // Perform an optimistic cancellation check before. This is not strictly
+        // necessary since we also check for cancellation in the Mutex, but
+        // reduces the necessary work to be performed for tasks which already
+        // had been cancelled.
+        if current_state.cancel_state != CancellationState::NotCancelled {
+            return Poll::Ready(());
+        }
+
+        // So far the token is not cancelled. However it could be cancelld before
+        // we get the chance to store the `Waker`. Therfore we need to check
+        // for cancellation again inside the mutex.
+        let mut guard = self.synchronized.lock().unwrap();
+        if guard.is_cancelled {
+            // Cancellation was signalled
+            wait_node.state = PollState::Done;
+            Poll::Ready(())
+        } else {
+            // Added the task to the wait queue
+            wait_node.task = Some(cx.waker().clone());
+            wait_node.state = PollState::Waiting;
+            guard.waiters.add_front(wait_node);
+            Poll::Pending
+        }
+    }
+
+    fn check_for_cancellation(
+        &self,
+        wait_node: &mut ListNode<WaitQueueEntry>,
+        cx: &mut Context<'_>,
+    ) -> Poll<()> {
+        debug_assert!(
+            wait_node.task.is_some(),
+            "Method can only be called after task had been registered"
+        );
+
+        let current_state = self.snapshot();
+
+        if current_state.cancel_state != CancellationState::NotCancelled {
+            // If the cancellation had been fully completed we know that our `Waker`
+            // is no longer registered at the `CancellationToken`.
+            // Otherwise the cancel call may or may not yet have iterated
+            // through the waiters list and removed the wait nodes.
+            // If it hasn't yet, we need to remove it. Otherwise an attempt to
+            // reuse the `wait_node´ might get freed due to the `WaitForCancellationFuture`
+            // getting dropped before the cancellation had interacted with it.
+            if current_state.cancel_state != CancellationState::Cancelled {
+                self.unregister(wait_node);
+            }
+            Poll::Ready(())
+        } else {
+            // Check if we need to swap the `Waker`. This will make the check more
+            // expensive, since the `Waker` is synchronized through the Mutex.
+            // If we don't need to perform a `Waker` update, an atomic check for
+            // cancellation is sufficient.
+            let need_waker_update = wait_node
+                .task
+                .as_ref()
+                .map(|waker| waker.will_wake(cx.waker()))
+                .unwrap_or(true);
+
+            if need_waker_update {
+                let guard = self.synchronized.lock().unwrap();
+                if guard.is_cancelled {
+                    // Cancellation was signalled. Since this cancellation signal
+                    // is set inside the Mutex, the old waiter must already have
+                    // been removed from the waiting list
+                    debug_assert_eq!(PollState::Done, wait_node.state);
+                    wait_node.task = None;
+                    Poll::Ready(())
+                } else {
+                    // The WaitForCancellationFuture is already in the queue.
+                    // The CancellationToken can't have been cancelled,
+                    // since this would change the is_cancelled flag inside the mutex.
+                    // Therefore we just have to update the Waker. A follow-up
+                    // cancellation will always use the new waker.
+                    wait_node.task = Some(cx.waker().clone());
+                    Poll::Pending
+                }
+            } else {
+                // Do nothing. If the token gets cancelled, this task will get
+                // woken again and can fetch the cancellation.
+                Poll::Pending
+            }
+        }
+    }
+
+    fn unregister(&self, wait_node: &mut ListNode<WaitQueueEntry>) {
+        debug_assert!(
+            wait_node.task.is_some(),
+            "waiter can not be active without task"
+        );
+
+        let mut guard = self.synchronized.lock().unwrap();
+        // WaitForCancellationFuture only needs to get removed if it has been added to
+        // the wait queue of the CancellationToken.
+        // This has happened in the PollState::Waiting case.
+        if let PollState::Waiting = wait_node.state {
+            // Safety: Due to the state, we know that the node must be part
+            // of the waiter list
+            if !unsafe { guard.waiters.remove(wait_node) } {
+                // Panic if the address isn't found. This can only happen if the contract was
+                // violated, e.g. the WaitQueueEntry got moved after the initial poll.
+                panic!("Future could not be removed from wait queue");
+            }
+            wait_node.state = PollState::Done;
+        }
+        wait_node.task = None;
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/intrusive_double_linked_list.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/intrusive_double_linked_list.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/intrusive_double_linked_list.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/intrusive_double_linked_list.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,788 @@
+//! An intrusive double linked list of data
+
+#![allow(dead_code, unreachable_pub)]
+
+use core::{
+    marker::PhantomPinned,
+    ops::{Deref, DerefMut},
+    ptr::NonNull,
+};
+
+/// A node which carries data of type `T` and is stored in an intrusive list
+#[derive(Debug)]
+pub struct ListNode<T> {
+    /// The previous node in the list. `None` if there is no previous node.
+    prev: Option<NonNull<ListNode<T>>>,
+    /// The next node in the list. `None` if there is no previous node.
+    next: Option<NonNull<ListNode<T>>>,
+    /// The data which is associated to this list item
+    data: T,
+    /// Prevents `ListNode`s from being `Unpin`. They may never be moved, since
+    /// the list semantics require addresses to be stable.
+    _pin: PhantomPinned,
+}
+
+impl<T> ListNode<T> {
+    /// Creates a new node with the associated data
+    pub fn new(data: T) -> ListNode<T> {
+        Self {
+            prev: None,
+            next: None,
+            data,
+            _pin: PhantomPinned,
+        }
+    }
+}
+
+impl<T> Deref for ListNode<T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        &self.data
+    }
+}
+
+impl<T> DerefMut for ListNode<T> {
+    fn deref_mut(&mut self) -> &mut T {
+        &mut self.data
+    }
+}
+
+/// An intrusive linked list of nodes, where each node carries associated data
+/// of type `T`.
+#[derive(Debug)]
+pub struct LinkedList<T> {
+    head: Option<NonNull<ListNode<T>>>,
+    tail: Option<NonNull<ListNode<T>>>,
+}
+
+impl<T> LinkedList<T> {
+    /// Creates an empty linked list
+    pub fn new() -> Self {
+        LinkedList::<T> {
+            head: None,
+            tail: None,
+        }
+    }
+
+    /// Adds a node at the front of the linked list.
+    /// Safety: This function is only safe as long as `node` is guaranteed to
+    /// get removed from the list before it gets moved or dropped.
+    /// In addition to this `node` may not be added to another other list before
+    /// it is removed from the current one.
+    pub unsafe fn add_front(&mut self, node: &mut ListNode<T>) {
+        node.next = self.head;
+        node.prev = None;
+        if let Some(mut head) = self.head {
+            head.as_mut().prev = Some(node.into())
+        };
+        self.head = Some(node.into());
+        if self.tail.is_none() {
+            self.tail = Some(node.into());
+        }
+    }
+
+    /// Inserts a node into the list in a way that the list keeps being sorted.
+    /// Safety: This function is only safe as long as `node` is guaranteed to
+    /// get removed from the list before it gets moved or dropped.
+    /// In addition to this `node` may not be added to another other list before
+    /// it is removed from the current one.
+    pub unsafe fn add_sorted(&mut self, node: &mut ListNode<T>)
+    where
+        T: PartialOrd,
+    {
+        if self.head.is_none() {
+            // First node in the list
+            self.head = Some(node.into());
+            self.tail = Some(node.into());
+            return;
+        }
+
+        let mut prev: Option<NonNull<ListNode<T>>> = None;
+        let mut current = self.head;
+
+        while let Some(mut current_node) = current {
+            if node.data < current_node.as_ref().data {
+                // Need to insert before the current node
+                current_node.as_mut().prev = Some(node.into());
+                match prev {
+                    Some(mut prev) => {
+                        prev.as_mut().next = Some(node.into());
+                    }
+                    None => {
+                        // We are inserting at the beginning of the list
+                        self.head = Some(node.into());
+                    }
+                }
+                node.next = current;
+                node.prev = prev;
+                return;
+            }
+            prev = current;
+            current = current_node.as_ref().next;
+        }
+
+        // We looped through the whole list and the nodes data is bigger or equal
+        // than everything we found up to now.
+        // Insert at the end. Since we checked before that the list isn't empty,
+        // tail always has a value.
+        node.prev = self.tail;
+        node.next = None;
+        self.tail.as_mut().unwrap().as_mut().next = Some(node.into());
+        self.tail = Some(node.into());
+    }
+
+    /// Returns the first node in the linked list without removing it from the list
+    /// The function is only safe as long as valid pointers are stored inside
+    /// the linked list.
+    /// The returned pointer is only guaranteed to be valid as long as the list
+    /// is not mutated
+    pub fn peek_first(&self) -> Option<&mut ListNode<T>> {
+        // Safety: When the node was inserted it was promised that it is alive
+        // until it gets removed from the list.
+        // The returned node has a pointer which constrains it to the lifetime
+        // of the list. This is ok, since the Node is supposed to outlive
+        // its insertion in the list.
+        unsafe {
+            self.head
+                .map(|mut node| &mut *(node.as_mut() as *mut ListNode<T>))
+        }
+    }
+
+    /// Returns the last node in the linked list without removing it from the list
+    /// The function is only safe as long as valid pointers are stored inside
+    /// the linked list.
+    /// The returned pointer is only guaranteed to be valid as long as the list
+    /// is not mutated
+    pub fn peek_last(&self) -> Option<&mut ListNode<T>> {
+        // Safety: When the node was inserted it was promised that it is alive
+        // until it gets removed from the list.
+        // The returned node has a pointer which constrains it to the lifetime
+        // of the list. This is ok, since the Node is supposed to outlive
+        // its insertion in the list.
+        unsafe {
+            self.tail
+                .map(|mut node| &mut *(node.as_mut() as *mut ListNode<T>))
+        }
+    }
+
+    /// Removes the first node from the linked list
+    pub fn remove_first(&mut self) -> Option<&mut ListNode<T>> {
+        #![allow(clippy::debug_assert_with_mut_call)]
+
+        // Safety: When the node was inserted it was promised that it is alive
+        // until it gets removed from the list
+        unsafe {
+            let mut head = self.head?;
+            self.head = head.as_mut().next;
+
+            let first_ref = head.as_mut();
+            match first_ref.next {
+                None => {
+                    // This was the only node in the list
+                    debug_assert_eq!(Some(first_ref.into()), self.tail);
+                    self.tail = None;
+                }
+                Some(mut next) => {
+                    next.as_mut().prev = None;
+                }
+            }
+
+            first_ref.prev = None;
+            first_ref.next = None;
+            Some(&mut *(first_ref as *mut ListNode<T>))
+        }
+    }
+
+    /// Removes the last node from the linked list and returns it
+    pub fn remove_last(&mut self) -> Option<&mut ListNode<T>> {
+        #![allow(clippy::debug_assert_with_mut_call)]
+
+        // Safety: When the node was inserted it was promised that it is alive
+        // until it gets removed from the list
+        unsafe {
+            let mut tail = self.tail?;
+            self.tail = tail.as_mut().prev;
+
+            let last_ref = tail.as_mut();
+            match last_ref.prev {
+                None => {
+                    // This was the last node in the list
+                    debug_assert_eq!(Some(last_ref.into()), self.head);
+                    self.head = None;
+                }
+                Some(mut prev) => {
+                    prev.as_mut().next = None;
+                }
+            }
+
+            last_ref.prev = None;
+            last_ref.next = None;
+            Some(&mut *(last_ref as *mut ListNode<T>))
+        }
+    }
+
+    /// Returns whether the linked list doesn not contain any node
+    pub fn is_empty(&self) -> bool {
+        if self.head.is_some() {
+            return false;
+        }
+
+        debug_assert!(self.tail.is_none());
+        true
+    }
+
+    /// Removes the given `node` from the linked list.
+    /// Returns whether the `node` was removed.
+    /// It is also only safe if it is known that the `node` is either part of this
+    /// list, or of no list at all. If `node` is part of another list, the
+    /// behavior is undefined.
+    pub unsafe fn remove(&mut self, node: &mut ListNode<T>) -> bool {
+        #![allow(clippy::debug_assert_with_mut_call)]
+
+        match node.prev {
+            None => {
+                // This might be the first node in the list. If it is not, the
+                // node is not in the list at all. Since our precondition is that
+                // the node must either be in this list or in no list, we check that
+                // the node is really in no list.
+                if self.head != Some(node.into()) {
+                    debug_assert!(node.next.is_none());
+                    return false;
+                }
+                self.head = node.next;
+            }
+            Some(mut prev) => {
+                debug_assert_eq!(prev.as_ref().next, Some(node.into()));
+                prev.as_mut().next = node.next;
+            }
+        }
+
+        match node.next {
+            None => {
+                // This must be the last node in our list. Otherwise the list
+                // is inconsistent.
+                debug_assert_eq!(self.tail, Some(node.into()));
+                self.tail = node.prev;
+            }
+            Some(mut next) => {
+                debug_assert_eq!(next.as_mut().prev, Some(node.into()));
+                next.as_mut().prev = node.prev;
+            }
+        }
+
+        node.next = None;
+        node.prev = None;
+
+        true
+    }
+
+    /// Drains the list iby calling a callback on each list node
+    ///
+    /// The method does not return an iterator since stopping or deferring
+    /// draining the list is not permitted. If the method would push nodes to
+    /// an iterator we could not guarantee that the nodes do not get utilized
+    /// after having been removed from the list anymore.
+    pub fn drain<F>(&mut self, mut func: F)
+    where
+        F: FnMut(&mut ListNode<T>),
+    {
+        let mut current = self.head;
+        self.head = None;
+        self.tail = None;
+
+        while let Some(mut node) = current {
+            // Safety: The nodes have not been removed from the list yet and must
+            // therefore contain valid data. The nodes can also not be added to
+            // the list again during iteration, since the list is mutably borrowed.
+            unsafe {
+                let node_ref = node.as_mut();
+                current = node_ref.next;
+
+                node_ref.next = None;
+                node_ref.prev = None;
+
+                // Note: We do not reset the pointers from the next element in the
+                // list to the current one since we will iterate over the whole
+                // list anyway, and therefore clean up all pointers.
+
+                func(node_ref);
+            }
+        }
+    }
+
+    /// Drains the list in reverse order by calling a callback on each list node
+    ///
+    /// The method does not return an iterator since stopping or deferring
+    /// draining the list is not permitted. If the method would push nodes to
+    /// an iterator we could not guarantee that the nodes do not get utilized
+    /// after having been removed from the list anymore.
+    pub fn reverse_drain<F>(&mut self, mut func: F)
+    where
+        F: FnMut(&mut ListNode<T>),
+    {
+        let mut current = self.tail;
+        self.head = None;
+        self.tail = None;
+
+        while let Some(mut node) = current {
+            // Safety: The nodes have not been removed from the list yet and must
+            // therefore contain valid data. The nodes can also not be added to
+            // the list again during iteration, since the list is mutably borrowed.
+            unsafe {
+                let node_ref = node.as_mut();
+                current = node_ref.prev;
+
+                node_ref.next = None;
+                node_ref.prev = None;
+
+                // Note: We do not reset the pointers from the next element in the
+                // list to the current one since we will iterate over the whole
+                // list anyway, and therefore clean up all pointers.
+
+                func(node_ref);
+            }
+        }
+    }
+}
+
+#[cfg(all(test, feature = "std"))] // Tests make use of Vec at the moment
+mod tests {
+    use super::*;
+
+    fn collect_list<T: Copy>(mut list: LinkedList<T>) -> Vec<T> {
+        let mut result = Vec::new();
+        list.drain(|node| {
+            result.push(**node);
+        });
+        result
+    }
+
+    fn collect_reverse_list<T: Copy>(mut list: LinkedList<T>) -> Vec<T> {
+        let mut result = Vec::new();
+        list.reverse_drain(|node| {
+            result.push(**node);
+        });
+        result
+    }
+
+    unsafe fn add_nodes(list: &mut LinkedList<i32>, nodes: &mut [&mut ListNode<i32>]) {
+        for node in nodes.iter_mut() {
+            list.add_front(node);
+        }
+    }
+
+    unsafe fn assert_clean<T>(node: &mut ListNode<T>) {
+        assert!(node.next.is_none());
+        assert!(node.prev.is_none());
+    }
+
+    #[test]
+    fn insert_and_iterate() {
+        unsafe {
+            let mut a = ListNode::new(5);
+            let mut b = ListNode::new(7);
+            let mut c = ListNode::new(31);
+
+            let mut setup = |list: &mut LinkedList<i32>| {
+                assert_eq!(true, list.is_empty());
+                list.add_front(&mut c);
+                assert_eq!(31, **list.peek_first().unwrap());
+                assert_eq!(false, list.is_empty());
+                list.add_front(&mut b);
+                assert_eq!(7, **list.peek_first().unwrap());
+                list.add_front(&mut a);
+                assert_eq!(5, **list.peek_first().unwrap());
+            };
+
+            let mut list = LinkedList::new();
+            setup(&mut list);
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([5, 7, 31].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            setup(&mut list);
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([31, 7, 5].to_vec(), items);
+        }
+    }
+
+    #[test]
+    fn add_sorted() {
+        unsafe {
+            let mut a = ListNode::new(5);
+            let mut b = ListNode::new(7);
+            let mut c = ListNode::new(31);
+            let mut d = ListNode::new(99);
+
+            let mut list = LinkedList::new();
+            list.add_sorted(&mut a);
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([5].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            list.add_sorted(&mut a);
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([5].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut d, &mut c, &mut b]);
+            list.add_sorted(&mut a);
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([5, 7, 31, 99].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut d, &mut c, &mut b]);
+            list.add_sorted(&mut a);
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([99, 31, 7, 5].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut d, &mut c, &mut a]);
+            list.add_sorted(&mut b);
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([5, 7, 31, 99].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut d, &mut c, &mut a]);
+            list.add_sorted(&mut b);
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([99, 31, 7, 5].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut d, &mut b, &mut a]);
+            list.add_sorted(&mut c);
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([5, 7, 31, 99].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut d, &mut b, &mut a]);
+            list.add_sorted(&mut c);
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([99, 31, 7, 5].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+            list.add_sorted(&mut d);
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([5, 7, 31, 99].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+            list.add_sorted(&mut d);
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([99, 31, 7, 5].to_vec(), items);
+        }
+    }
+
+    #[test]
+    fn drain_and_collect() {
+        unsafe {
+            let mut a = ListNode::new(5);
+            let mut b = ListNode::new(7);
+            let mut c = ListNode::new(31);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+
+            let taken_items: Vec<i32> = collect_list(list);
+            assert_eq!([5, 7, 31].to_vec(), taken_items);
+        }
+    }
+
+    #[test]
+    fn peek_last() {
+        unsafe {
+            let mut a = ListNode::new(5);
+            let mut b = ListNode::new(7);
+            let mut c = ListNode::new(31);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+
+            let last = list.peek_last();
+            assert_eq!(31, **last.unwrap());
+            list.remove_last();
+
+            let last = list.peek_last();
+            assert_eq!(7, **last.unwrap());
+            list.remove_last();
+
+            let last = list.peek_last();
+            assert_eq!(5, **last.unwrap());
+            list.remove_last();
+
+            let last = list.peek_last();
+            assert!(last.is_none());
+        }
+    }
+
+    #[test]
+    fn remove_first() {
+        unsafe {
+            // We iterate forward and backwards through the manipulated lists
+            // to make sure pointers in both directions are still ok.
+            let mut a = ListNode::new(5);
+            let mut b = ListNode::new(7);
+            let mut c = ListNode::new(31);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+            let removed = list.remove_first().unwrap();
+            assert_clean(removed);
+            assert!(!list.is_empty());
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([7, 31].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+            let removed = list.remove_first().unwrap();
+            assert_clean(removed);
+            assert!(!list.is_empty());
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([31, 7].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut b, &mut a]);
+            let removed = list.remove_first().unwrap();
+            assert_clean(removed);
+            assert!(!list.is_empty());
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([7].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut b, &mut a]);
+            let removed = list.remove_first().unwrap();
+            assert_clean(removed);
+            assert!(!list.is_empty());
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([7].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut a]);
+            let removed = list.remove_first().unwrap();
+            assert_clean(removed);
+            assert!(list.is_empty());
+            let items: Vec<i32> = collect_list(list);
+            assert!(items.is_empty());
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut a]);
+            let removed = list.remove_first().unwrap();
+            assert_clean(removed);
+            assert!(list.is_empty());
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert!(items.is_empty());
+        }
+    }
+
+    #[test]
+    fn remove_last() {
+        unsafe {
+            // We iterate forward and backwards through the manipulated lists
+            // to make sure pointers in both directions are still ok.
+            let mut a = ListNode::new(5);
+            let mut b = ListNode::new(7);
+            let mut c = ListNode::new(31);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+            let removed = list.remove_last().unwrap();
+            assert_clean(removed);
+            assert!(!list.is_empty());
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([5, 7].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+            let removed = list.remove_last().unwrap();
+            assert_clean(removed);
+            assert!(!list.is_empty());
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([7, 5].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut b, &mut a]);
+            let removed = list.remove_last().unwrap();
+            assert_clean(removed);
+            assert!(!list.is_empty());
+            let items: Vec<i32> = collect_list(list);
+            assert_eq!([5].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut b, &mut a]);
+            let removed = list.remove_last().unwrap();
+            assert_clean(removed);
+            assert!(!list.is_empty());
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert_eq!([5].to_vec(), items);
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut a]);
+            let removed = list.remove_last().unwrap();
+            assert_clean(removed);
+            assert!(list.is_empty());
+            let items: Vec<i32> = collect_list(list);
+            assert!(items.is_empty());
+
+            let mut list = LinkedList::new();
+            add_nodes(&mut list, &mut [&mut a]);
+            let removed = list.remove_last().unwrap();
+            assert_clean(removed);
+            assert!(list.is_empty());
+            let items: Vec<i32> = collect_reverse_list(list);
+            assert!(items.is_empty());
+        }
+    }
+
+    #[test]
+    fn remove_by_address() {
+        unsafe {
+            let mut a = ListNode::new(5);
+            let mut b = ListNode::new(7);
+            let mut c = ListNode::new(31);
+
+            {
+                // Remove first
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut a));
+                assert_clean((&mut a).into());
+                // a should be no longer there and can't be removed twice
+                assert_eq!(false, list.remove(&mut a));
+                assert_eq!(Some((&mut b).into()), list.head);
+                assert_eq!(Some((&mut c).into()), b.next);
+                assert_eq!(Some((&mut b).into()), c.prev);
+                let items: Vec<i32> = collect_list(list);
+                assert_eq!([7, 31].to_vec(), items);
+
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut a));
+                assert_clean((&mut a).into());
+                // a should be no longer there and can't be removed twice
+                assert_eq!(false, list.remove(&mut a));
+                assert_eq!(Some((&mut c).into()), b.next);
+                assert_eq!(Some((&mut b).into()), c.prev);
+                let items: Vec<i32> = collect_reverse_list(list);
+                assert_eq!([31, 7].to_vec(), items);
+            }
+
+            {
+                // Remove middle
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut b));
+                assert_clean((&mut b).into());
+                assert_eq!(Some((&mut c).into()), a.next);
+                assert_eq!(Some((&mut a).into()), c.prev);
+                let items: Vec<i32> = collect_list(list);
+                assert_eq!([5, 31].to_vec(), items);
+
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut b));
+                assert_clean((&mut b).into());
+                assert_eq!(Some((&mut c).into()), a.next);
+                assert_eq!(Some((&mut a).into()), c.prev);
+                let items: Vec<i32> = collect_reverse_list(list);
+                assert_eq!([31, 5].to_vec(), items);
+            }
+
+            {
+                // Remove last
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut c));
+                assert_clean((&mut c).into());
+                assert!(b.next.is_none());
+                assert_eq!(Some((&mut b).into()), list.tail);
+                let items: Vec<i32> = collect_list(list);
+                assert_eq!([5, 7].to_vec(), items);
+
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut c, &mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut c));
+                assert_clean((&mut c).into());
+                assert!(b.next.is_none());
+                assert_eq!(Some((&mut b).into()), list.tail);
+                let items: Vec<i32> = collect_reverse_list(list);
+                assert_eq!([7, 5].to_vec(), items);
+            }
+
+            {
+                // Remove first of two
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut a));
+                assert_clean((&mut a).into());
+                // a should be no longer there and can't be removed twice
+                assert_eq!(false, list.remove(&mut a));
+                assert_eq!(Some((&mut b).into()), list.head);
+                assert_eq!(Some((&mut b).into()), list.tail);
+                assert!(b.next.is_none());
+                assert!(b.prev.is_none());
+                let items: Vec<i32> = collect_list(list);
+                assert_eq!([7].to_vec(), items);
+
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut a));
+                assert_clean((&mut a).into());
+                // a should be no longer there and can't be removed twice
+                assert_eq!(false, list.remove(&mut a));
+                assert_eq!(Some((&mut b).into()), list.head);
+                assert_eq!(Some((&mut b).into()), list.tail);
+                assert!(b.next.is_none());
+                assert!(b.prev.is_none());
+                let items: Vec<i32> = collect_reverse_list(list);
+                assert_eq!([7].to_vec(), items);
+            }
+
+            {
+                // Remove last of two
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut b));
+                assert_clean((&mut b).into());
+                assert_eq!(Some((&mut a).into()), list.head);
+                assert_eq!(Some((&mut a).into()), list.tail);
+                assert!(a.next.is_none());
+                assert!(a.prev.is_none());
+                let items: Vec<i32> = collect_list(list);
+                assert_eq!([5].to_vec(), items);
+
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut b, &mut a]);
+                assert_eq!(true, list.remove(&mut b));
+                assert_clean((&mut b).into());
+                assert_eq!(Some((&mut a).into()), list.head);
+                assert_eq!(Some((&mut a).into()), list.tail);
+                assert!(a.next.is_none());
+                assert!(a.prev.is_none());
+                let items: Vec<i32> = collect_reverse_list(list);
+                assert_eq!([5].to_vec(), items);
+            }
+
+            {
+                // Remove last item
+                let mut list = LinkedList::new();
+                add_nodes(&mut list, &mut [&mut a]);
+                assert_eq!(true, list.remove(&mut a));
+                assert_clean((&mut a).into());
+                assert!(list.head.is_none());
+                assert!(list.tail.is_none());
+                let items: Vec<i32> = collect_list(list);
+                assert!(items.is_empty());
+            }
+
+            {
+                // Remove missing
+                let mut list = LinkedList::new();
+                list.add_front(&mut b);
+                list.add_front(&mut a);
+                assert_eq!(false, list.remove(&mut c));
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+//! Synchronization primitives
+
+mod cancellation_token;
+pub use cancellation_token::{CancellationToken, WaitForCancellationFuture};
+
+mod intrusive_double_linked_list;
+
+mod mpsc;
+pub use mpsc::PollSender;
+
+mod poll_semaphore;
+pub use poll_semaphore::PollSemaphore;
+
+mod reusable_box;
+pub use reusable_box::ReusableBoxFuture;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/mpsc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/mpsc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/mpsc.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/mpsc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,221 @@
+use futures_core::ready;
+use futures_sink::Sink;
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::{Context, Poll};
+use tokio::sync::mpsc::{error::SendError, Sender};
+
+use super::ReusableBoxFuture;
+
+// This implementation was chosen over something based on permits because to get a
+// `tokio::sync::mpsc::Permit` out of the `inner` future, you must transmute the
+// lifetime on the permit to `'static`.
+
+/// A wrapper around [`mpsc::Sender`] that can be polled.
+///
+/// [`mpsc::Sender`]: tokio::sync::mpsc::Sender
+#[derive(Debug)]
+pub struct PollSender<T> {
+    /// is none if closed
+    sender: Option<Arc<Sender<T>>>,
+    is_sending: bool,
+    inner: ReusableBoxFuture<Result<(), SendError<T>>>,
+}
+
+// By reusing the same async fn for both Some and None, we make sure every
+// future passed to ReusableBoxFuture has the same underlying type, and hence
+// the same size and alignment.
+async fn make_future<T>(data: Option<(Arc<Sender<T>>, T)>) -> Result<(), SendError<T>> {
+    match data {
+        Some((sender, value)) => sender.send(value).await,
+        None => unreachable!(
+            "This future should not be pollable, as is_sending should be set to false."
+        ),
+    }
+}
+
+impl<T: Send + 'static> PollSender<T> {
+    /// Create a new `PollSender`.
+    pub fn new(sender: Sender<T>) -> Self {
+        Self {
+            sender: Some(Arc::new(sender)),
+            is_sending: false,
+            inner: ReusableBoxFuture::new(make_future(None)),
+        }
+    }
+
+    /// Start sending a new item.
+    ///
+    /// This method panics if a send is currently in progress. To ensure that no
+    /// send is in progress, call `poll_send_done` first until it returns
+    /// `Poll::Ready`.
+    ///
+    /// If this method returns an error, that indicates that the channel is
+    /// closed. Note that this method is not guaranteed to return an error if
+    /// the channel is closed, but in that case the error would be reported by
+    /// the first call to `poll_send_done`.
+    pub fn start_send(&mut self, value: T) -> Result<(), SendError<T>> {
+        if self.is_sending {
+            panic!("start_send called while not ready.");
+        }
+        match self.sender.clone() {
+            Some(sender) => {
+                self.inner.set(make_future(Some((sender, value))));
+                self.is_sending = true;
+                Ok(())
+            }
+            None => Err(SendError(value)),
+        }
+    }
+
+    /// If a send is in progress, poll for its completion. If no send is in progress,
+    /// this method returns `Poll::Ready(Ok(()))`.
+    ///
+    /// This method can return the following values:
+    ///
+    ///  - `Poll::Ready(Ok(()))` if the in-progress send has been completed, or there is
+    ///    no send in progress (even if the channel is closed).
+    ///  - `Poll::Ready(Err(err))` if the in-progress send failed because the channel has
+    ///    been closed.
+    ///  - `Poll::Pending` if a send is in progress, but it could not complete now.
+    ///
+    /// When this method returns `Poll::Pending`, the current task is scheduled
+    /// to receive a wakeup when the message is sent, or when the entire channel
+    /// is closed (but not if just this sender is closed by
+    /// `close_this_sender`). Note that on multiple calls to `poll_send_done`,
+    /// only the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup.
+    ///
+    /// If this method returns `Poll::Ready`, then `start_send` is guaranteed to
+    /// not panic.
+    pub fn poll_send_done(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), SendError<T>>> {
+        if !self.is_sending {
+            return Poll::Ready(Ok(()));
+        }
+
+        let result = self.inner.poll(cx);
+        if result.is_ready() {
+            self.is_sending = false;
+        }
+        if let Poll::Ready(Err(_)) = &result {
+            self.sender = None;
+        }
+        result
+    }
+
+    /// Check whether the channel is ready to send more messages now.
+    ///
+    /// If this method returns `true`, then `start_send` is guaranteed to not
+    /// panic.
+    ///
+    /// If the channel is closed, this method returns `true`.
+    pub fn is_ready(&self) -> bool {
+        !self.is_sending
+    }
+
+    /// Check whether the channel has been closed.
+    pub fn is_closed(&self) -> bool {
+        match &self.sender {
+            Some(sender) => sender.is_closed(),
+            None => true,
+        }
+    }
+
+    /// Clone the underlying `Sender`.
+    ///
+    /// If this method returns `None`, then the channel is closed. (But it is
+    /// not guaranteed to return `None` if the channel is closed.)
+    pub fn clone_inner(&self) -> Option<Sender<T>> {
+        self.sender.as_ref().map(|sender| (&**sender).clone())
+    }
+
+    /// Access the underlying `Sender`.
+    ///
+    /// If this method returns `None`, then the channel is closed. (But it is
+    /// not guaranteed to return `None` if the channel is closed.)
+    pub fn inner_ref(&self) -> Option<&Sender<T>> {
+        self.sender.as_deref()
+    }
+
+    // This operation is supported because it is required by the Sink trait.
+    /// Close this sender. No more messages can be sent from this sender.
+    ///
+    /// Note that this only closes the channel from the view-point of this
+    /// sender. The channel remains open until all senders have gone away, or
+    /// until the [`Receiver`] closes the channel.
+    ///
+    /// If there is a send in progress when this method is called, that send is
+    /// unaffected by this operation, and `poll_send_done` can still be called
+    /// to complete that send.
+    ///
+    /// [`Receiver`]: tokio::sync::mpsc::Receiver
+    pub fn close_this_sender(&mut self) {
+        self.sender = None;
+    }
+
+    /// Abort the current in-progress send, if any.
+    ///
+    /// Returns `true` if a send was aborted.
+    pub fn abort_send(&mut self) -> bool {
+        if self.is_sending {
+            self.inner.set(make_future(None));
+            self.is_sending = false;
+            true
+        } else {
+            false
+        }
+    }
+}
+
+impl<T> Clone for PollSender<T> {
+    /// Clones this `PollSender`. The resulting clone will not have any
+    /// in-progress send operations, even if the current `PollSender` does.
+    fn clone(&self) -> PollSender<T> {
+        Self {
+            sender: self.sender.clone(),
+            is_sending: false,
+            inner: ReusableBoxFuture::new(async { unreachable!() }),
+        }
+    }
+}
+
+impl<T: Send + 'static> Sink<T> for PollSender<T> {
+    type Error = SendError<T>;
+
+    /// This is equivalent to calling [`poll_send_done`].
+    ///
+    /// [`poll_send_done`]: PollSender::poll_send_done
+    fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Pin::into_inner(self).poll_send_done(cx)
+    }
+
+    /// This is equivalent to calling [`poll_send_done`].
+    ///
+    /// [`poll_send_done`]: PollSender::poll_send_done
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Pin::into_inner(self).poll_send_done(cx)
+    }
+
+    /// This is equivalent to calling [`start_send`].
+    ///
+    /// [`start_send`]: PollSender::start_send
+    fn start_send(self: Pin<&mut Self>, item: T) -> Result<(), Self::Error> {
+        Pin::into_inner(self).start_send(item)
+    }
+
+    /// This method will first flush the `PollSender`, and then close it by
+    /// calling [`close_this_sender`].
+    ///
+    /// If a send fails while flushing because the [`Receiver`] has gone away,
+    /// then this function returns an error. The channel is still successfully
+    /// closed in this situation.
+    ///
+    /// [`close_this_sender`]: PollSender::close_this_sender
+    /// [`Receiver`]: tokio::sync::mpsc::Receiver
+    fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        ready!(self.as_mut().poll_flush(cx))?;
+
+        Pin::into_inner(self).close_this_sender();
+        Poll::Ready(Ok(()))
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/poll_semaphore.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/poll_semaphore.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/poll_semaphore.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/poll_semaphore.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,136 @@
+use futures_core::{ready, Stream};
+use std::fmt;
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::{Context, Poll};
+use tokio::sync::{AcquireError, OwnedSemaphorePermit, Semaphore, TryAcquireError};
+
+use super::ReusableBoxFuture;
+
+/// A wrapper around [`Semaphore`] that provides a `poll_acquire` method.
+///
+/// [`Semaphore`]: tokio::sync::Semaphore
+pub struct PollSemaphore {
+    semaphore: Arc<Semaphore>,
+    permit_fut: Option<ReusableBoxFuture<Result<OwnedSemaphorePermit, AcquireError>>>,
+}
+
+impl PollSemaphore {
+    /// Create a new `PollSemaphore`.
+    pub fn new(semaphore: Arc<Semaphore>) -> Self {
+        Self {
+            semaphore,
+            permit_fut: None,
+        }
+    }
+
+    /// Closes the semaphore.
+    pub fn close(&self) {
+        self.semaphore.close()
+    }
+
+    /// Obtain a clone of the inner semaphore.
+    pub fn clone_inner(&self) -> Arc<Semaphore> {
+        self.semaphore.clone()
+    }
+
+    /// Get back the inner semaphore.
+    pub fn into_inner(self) -> Arc<Semaphore> {
+        self.semaphore
+    }
+
+    /// Poll to acquire a permit from the semaphore.
+    ///
+    /// This can return the following values:
+    ///
+    ///  - `Poll::Pending` if a permit is not currently available.
+    ///  - `Poll::Ready(Some(permit))` if a permit was acquired.
+    ///  - `Poll::Ready(None)` if the semaphore has been closed.
+    ///
+    /// When this method returns `Poll::Pending`, the current task is scheduled
+    /// to receive a wakeup when a permit becomes available, or when the
+    /// semaphore is closed. Note that on multiple calls to `poll_acquire`, only
+    /// the `Waker` from the `Context` passed to the most recent call is
+    /// scheduled to receive a wakeup.
+    pub fn poll_acquire(&mut self, cx: &mut Context<'_>) -> Poll<Option<OwnedSemaphorePermit>> {
+        let permit_future = match self.permit_fut.as_mut() {
+            Some(fut) => fut,
+            None => {
+                // avoid allocations completely if we can grab a permit immediately
+                match Arc::clone(&self.semaphore).try_acquire_owned() {
+                    Ok(permit) => return Poll::Ready(Some(permit)),
+                    Err(TryAcquireError::Closed) => return Poll::Ready(None),
+                    Err(TryAcquireError::NoPermits) => {}
+                }
+
+                let next_fut = Arc::clone(&self.semaphore).acquire_owned();
+                self.permit_fut
+                    .get_or_insert(ReusableBoxFuture::new(next_fut))
+            }
+        };
+
+        let result = ready!(permit_future.poll(cx));
+
+        let next_fut = Arc::clone(&self.semaphore).acquire_owned();
+        permit_future.set(next_fut);
+
+        match result {
+            Ok(permit) => Poll::Ready(Some(permit)),
+            Err(_closed) => {
+                self.permit_fut = None;
+                Poll::Ready(None)
+            }
+        }
+    }
+
+    /// Returns the current number of available permits.
+    ///
+    /// This is equivalent to the [`Semaphore::available_permits`] method on the
+    /// `tokio::sync::Semaphore` type.
+    ///
+    /// [`Semaphore::available_permits`]: tokio::sync::Semaphore::available_permits
+    pub fn available_permits(&self) -> usize {
+        self.semaphore.available_permits()
+    }
+
+    /// Adds `n` new permits to the semaphore.
+    ///
+    /// The maximum number of permits is `usize::MAX >> 3`, and this function
+    /// will panic if the limit is exceeded.
+    ///
+    /// This is equivalent to the [`Semaphore::add_permits`] method on the
+    /// `tokio::sync::Semaphore` type.
+    ///
+    /// [`Semaphore::add_permits`]: tokio::sync::Semaphore::add_permits
+    pub fn add_permits(&self, n: usize) {
+        self.semaphore.add_permits(n);
+    }
+}
+
+impl Stream for PollSemaphore {
+    type Item = OwnedSemaphorePermit;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<OwnedSemaphorePermit>> {
+        Pin::into_inner(self).poll_acquire(cx)
+    }
+}
+
+impl Clone for PollSemaphore {
+    fn clone(&self) -> PollSemaphore {
+        PollSemaphore::new(self.clone_inner())
+    }
+}
+
+impl fmt::Debug for PollSemaphore {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("PollSemaphore")
+            .field("semaphore", &self.semaphore)
+            .finish()
+    }
+}
+
+impl AsRef<Semaphore> for PollSemaphore {
+    fn as_ref(&self) -> &Semaphore {
+        &*self.semaphore
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/reusable_box.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/reusable_box.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/reusable_box.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/reusable_box.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,151 @@
+use std::alloc::Layout;
+use std::future::Future;
+use std::panic::AssertUnwindSafe;
+use std::pin::Pin;
+use std::ptr::{self, NonNull};
+use std::task::{Context, Poll};
+use std::{fmt, panic};
+
+/// A reusable `Pin<Box<dyn Future<Output = T> + Send>>`.
+///
+/// This type lets you replace the future stored in the box without
+/// reallocating when the size and alignment permits this.
+pub struct ReusableBoxFuture<T> {
+    boxed: NonNull<dyn Future<Output = T> + Send>,
+}
+
+impl<T> ReusableBoxFuture<T> {
+    /// Create a new `ReusableBoxFuture<T>` containing the provided future.
+    pub fn new<F>(future: F) -> Self
+    where
+        F: Future<Output = T> + Send + 'static,
+    {
+        let boxed: Box<dyn Future<Output = T> + Send> = Box::new(future);
+
+        let boxed = Box::into_raw(boxed);
+
+        // SAFETY: Box::into_raw does not return null pointers.
+        let boxed = unsafe { NonNull::new_unchecked(boxed) };
+
+        Self { boxed }
+    }
+
+    /// Replace the future currently stored in this box.
+    ///
+    /// This reallocates if and only if the layout of the provided future is
+    /// different from the layout of the currently stored future.
+    pub fn set<F>(&mut self, future: F)
+    where
+        F: Future<Output = T> + Send + 'static,
+    {
+        if let Err(future) = self.try_set(future) {
+            *self = Self::new(future);
+        }
+    }
+
+    /// Replace the future currently stored in this box.
+    ///
+    /// This function never reallocates, but returns an error if the provided
+    /// future has a different size or alignment from the currently stored
+    /// future.
+    pub fn try_set<F>(&mut self, future: F) -> Result<(), F>
+    where
+        F: Future<Output = T> + Send + 'static,
+    {
+        // SAFETY: The pointer is not dangling.
+        let self_layout = {
+            let dyn_future: &(dyn Future<Output = T> + Send) = unsafe { self.boxed.as_ref() };
+            Layout::for_value(dyn_future)
+        };
+
+        if Layout::new::<F>() == self_layout {
+            // SAFETY: We just checked that the layout of F is correct.
+            unsafe {
+                self.set_same_layout(future);
+            }
+
+            Ok(())
+        } else {
+            Err(future)
+        }
+    }
+
+    /// Set the current future.
+    ///
+    /// # Safety
+    ///
+    /// This function requires that the layout of the provided future is the
+    /// same as `self.layout`.
+    unsafe fn set_same_layout<F>(&mut self, future: F)
+    where
+        F: Future<Output = T> + Send + 'static,
+    {
+        // Drop the existing future, catching any panics.
+        let result = panic::catch_unwind(AssertUnwindSafe(|| {
+            ptr::drop_in_place(self.boxed.as_ptr());
+        }));
+
+        // Overwrite the future behind the pointer. This is safe because the
+        // allocation was allocated with the same size and alignment as the type F.
+        let self_ptr: *mut F = self.boxed.as_ptr() as *mut F;
+        ptr::write(self_ptr, future);
+
+        // Update the vtable of self.boxed. The pointer is not null because we
+        // just got it from self.boxed, which is not null.
+        self.boxed = NonNull::new_unchecked(self_ptr);
+
+        // If the old future's destructor panicked, resume unwinding.
+        match result {
+            Ok(()) => {}
+            Err(payload) => {
+                panic::resume_unwind(payload);
+            }
+        }
+    }
+
+    /// Get a pinned reference to the underlying future.
+    pub fn get_pin(&mut self) -> Pin<&mut (dyn Future<Output = T> + Send)> {
+        // SAFETY: The user of this box cannot move the box, and we do not move it
+        // either.
+        unsafe { Pin::new_unchecked(self.boxed.as_mut()) }
+    }
+
+    /// Poll the future stored inside this box.
+    pub fn poll(&mut self, cx: &mut Context<'_>) -> Poll<T> {
+        self.get_pin().poll(cx)
+    }
+}
+
+impl<T> Future for ReusableBoxFuture<T> {
+    type Output = T;
+
+    /// Poll the future stored inside this box.
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<T> {
+        Pin::into_inner(self).get_pin().poll(cx)
+    }
+}
+
+// The future stored inside ReusableBoxFuture<T> must be Send.
+unsafe impl<T> Send for ReusableBoxFuture<T> {}
+
+// The only method called on self.boxed is poll, which takes &mut self, so this
+// struct being Sync does not permit any invalid access to the Future, even if
+// the future is not Sync.
+unsafe impl<T> Sync for ReusableBoxFuture<T> {}
+
+// Just like a Pin<Box<dyn Future>> is always Unpin, so is this type.
+impl<T> Unpin for ReusableBoxFuture<T> {}
+
+impl<T> Drop for ReusableBoxFuture<T> {
+    fn drop(&mut self) {
+        unsafe {
+            drop(Box::from_raw(self.boxed.as_ptr()));
+        }
+    }
+}
+
+impl<T> fmt::Debug for ReusableBoxFuture<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ReusableBoxFuture").finish()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/tests/loom_cancellation_token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/tests/loom_cancellation_token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/tests/loom_cancellation_token.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/tests/loom_cancellation_token.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,155 @@
+use crate::sync::CancellationToken;
+
+use loom::{future::block_on, thread};
+use tokio_test::assert_ok;
+
+#[test]
+fn cancel_token() {
+    loom::model(|| {
+        let token = CancellationToken::new();
+        let token1 = token.clone();
+
+        let th1 = thread::spawn(move || {
+            block_on(async {
+                token1.cancelled().await;
+            });
+        });
+
+        let th2 = thread::spawn(move || {
+            token.cancel();
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+    });
+}
+
+#[test]
+fn cancel_with_child() {
+    loom::model(|| {
+        let token = CancellationToken::new();
+        let token1 = token.clone();
+        let token2 = token.clone();
+        let child_token = token.child_token();
+
+        let th1 = thread::spawn(move || {
+            block_on(async {
+                token1.cancelled().await;
+            });
+        });
+
+        let th2 = thread::spawn(move || {
+            token2.cancel();
+        });
+
+        let th3 = thread::spawn(move || {
+            block_on(async {
+                child_token.cancelled().await;
+            });
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn drop_token_no_child() {
+    loom::model(|| {
+        let token = CancellationToken::new();
+        let token1 = token.clone();
+        let token2 = token.clone();
+
+        let th1 = thread::spawn(move || {
+            drop(token1);
+        });
+
+        let th2 = thread::spawn(move || {
+            drop(token2);
+        });
+
+        let th3 = thread::spawn(move || {
+            drop(token);
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn drop_token_with_childs() {
+    loom::model(|| {
+        let token1 = CancellationToken::new();
+        let child_token1 = token1.child_token();
+        let child_token2 = token1.child_token();
+
+        let th1 = thread::spawn(move || {
+            drop(token1);
+        });
+
+        let th2 = thread::spawn(move || {
+            drop(child_token1);
+        });
+
+        let th3 = thread::spawn(move || {
+            drop(child_token2);
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn drop_and_cancel_token() {
+    loom::model(|| {
+        let token1 = CancellationToken::new();
+        let token2 = token1.clone();
+        let child_token = token1.child_token();
+
+        let th1 = thread::spawn(move || {
+            drop(token1);
+        });
+
+        let th2 = thread::spawn(move || {
+            token2.cancel();
+        });
+
+        let th3 = thread::spawn(move || {
+            drop(child_token);
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn cancel_parent_and_child() {
+    loom::model(|| {
+        let token1 = CancellationToken::new();
+        let token2 = token1.clone();
+        let child_token = token1.child_token();
+
+        let th1 = thread::spawn(move || {
+            drop(token1);
+        });
+
+        let th2 = thread::spawn(move || {
+            token2.cancel();
+        });
+
+        let th3 = thread::spawn(move || {
+            child_token.cancel();
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/tests/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/tests/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/sync/tests/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/sync/tests/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/delay_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/delay_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/delay_queue.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/delay_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,924 @@
+//! A queue of delayed elements.
+//!
+//! See [`DelayQueue`] for more details.
+//!
+//! [`DelayQueue`]: struct@DelayQueue
+
+use crate::time::wheel::{self, Wheel};
+
+use futures_core::ready;
+use tokio::time::{error::Error, sleep_until, Duration, Instant, Sleep};
+
+use slab::Slab;
+use std::cmp;
+use std::future::Future;
+use std::marker::PhantomData;
+use std::pin::Pin;
+use std::task::{self, Poll, Waker};
+
+/// A queue of delayed elements.
+///
+/// Once an element is inserted into the `DelayQueue`, it is yielded once the
+/// specified deadline has been reached.
+///
+/// # Usage
+///
+/// Elements are inserted into `DelayQueue` using the [`insert`] or
+/// [`insert_at`] methods. A deadline is provided with the item and a [`Key`] is
+/// returned. The key is used to remove the entry or to change the deadline at
+/// which it should be yielded back.
+///
+/// Once delays have been configured, the `DelayQueue` is used via its
+/// [`Stream`] implementation. [`poll_expired`] is called. If an entry has reached its
+/// deadline, it is returned. If not, `Poll::Pending` is returned indicating that the
+/// current task will be notified once the deadline has been reached.
+///
+/// # `Stream` implementation
+///
+/// Items are retrieved from the queue via [`DelayQueue::poll_expired`]. If no delays have
+/// expired, no items are returned. In this case, `Poll::Pending` is returned and the
+/// current task is registered to be notified once the next item's delay has
+/// expired.
+///
+/// If no items are in the queue, i.e. `is_empty()` returns `true`, then `poll`
+/// returns `Poll::Ready(None)`. This indicates that the stream has reached an end.
+/// However, if a new item is inserted *after*, `poll` will once again start
+/// returning items or `Poll::Pending`.
+///
+/// Items are returned ordered by their expirations. Items that are configured
+/// to expire first will be returned first. There are no ordering guarantees
+/// for items configured to expire at the same instant. Also note that delays are
+/// rounded to the closest millisecond.
+///
+/// # Implementation
+///
+/// The [`DelayQueue`] is backed by a separate instance of a timer wheel similar to that used internally
+/// by Tokio's standalone timer utilities such as [`sleep`]. Because of this, it offers the same
+/// performance and scalability benefits.
+///
+/// State associated with each entry is stored in a [`slab`]. This amortizes the cost of allocation,
+/// and allows reuse of the memory allocated for expired entires.
+///
+/// Capacity can be checked using [`capacity`] and allocated preemptively by using
+/// the [`reserve`] method.
+///
+/// # Usage
+///
+/// Using `DelayQueue` to manage cache entries.
+///
+/// ```rust,no_run
+/// use tokio::time::error::Error;
+/// use tokio_util::time::{DelayQueue, delay_queue};
+///
+/// use futures::ready;
+/// use std::collections::HashMap;
+/// use std::task::{Context, Poll};
+/// use std::time::Duration;
+/// # type CacheKey = String;
+/// # type Value = String;
+///
+/// struct Cache {
+///     entries: HashMap<CacheKey, (Value, delay_queue::Key)>,
+///     expirations: DelayQueue<CacheKey>,
+/// }
+///
+/// const TTL_SECS: u64 = 30;
+///
+/// impl Cache {
+///     fn insert(&mut self, key: CacheKey, value: Value) {
+///         let delay = self.expirations
+///             .insert(key.clone(), Duration::from_secs(TTL_SECS));
+///
+///         self.entries.insert(key, (value, delay));
+///     }
+///
+///     fn get(&self, key: &CacheKey) -> Option<&Value> {
+///         self.entries.get(key)
+///             .map(|&(ref v, _)| v)
+///     }
+///
+///     fn remove(&mut self, key: &CacheKey) {
+///         if let Some((_, cache_key)) = self.entries.remove(key) {
+///             self.expirations.remove(&cache_key);
+///         }
+///     }
+///
+///     fn poll_purge(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Error>> {
+///         while let Some(res) = ready!(self.expirations.poll_expired(cx)) {
+///             let entry = res?;
+///             self.entries.remove(entry.get_ref());
+///         }
+///
+///         Poll::Ready(Ok(()))
+///     }
+/// }
+/// ```
+///
+/// [`insert`]: method@Self::insert
+/// [`insert_at`]: method@Self::insert_at
+/// [`Key`]: struct@Key
+/// [`Stream`]: https://docs.rs/futures/0.1/futures/stream/trait.Stream.html
+/// [`poll_expired`]: method@Self::poll_expired
+/// [`Stream::poll_expired`]: method@Self::poll_expired
+/// [`DelayQueue`]: struct@DelayQueue
+/// [`sleep`]: fn@tokio::time::sleep
+/// [`slab`]: slab
+/// [`capacity`]: method@Self::capacity
+/// [`reserve`]: method@Self::reserve
+#[derive(Debug)]
+pub struct DelayQueue<T> {
+    /// Stores data associated with entries
+    slab: Slab<Data<T>>,
+
+    /// Lookup structure tracking all delays in the queue
+    wheel: Wheel<Stack<T>>,
+
+    /// Delays that were inserted when already expired. These cannot be stored
+    /// in the wheel
+    expired: Stack<T>,
+
+    /// Delay expiring when the *first* item in the queue expires
+    delay: Option<Pin<Box<Sleep>>>,
+
+    /// Wheel polling state
+    wheel_now: u64,
+
+    /// Instant at which the timer starts
+    start: Instant,
+
+    /// Waker that is invoked when we potentially need to reset the timer.
+    /// Because we lazily create the timer when the first entry is created, we
+    /// need to awaken any poller that polled us before that point.
+    waker: Option<Waker>,
+}
+
+/// An entry in `DelayQueue` that has expired and been removed.
+///
+/// Values are returned by [`DelayQueue::poll_expired`].
+///
+/// [`DelayQueue::poll_expired`]: method@DelayQueue::poll_expired
+#[derive(Debug)]
+pub struct Expired<T> {
+    /// The data stored in the queue
+    data: T,
+
+    /// The expiration time
+    deadline: Instant,
+
+    /// The key associated with the entry
+    key: Key,
+}
+
+/// Token to a value stored in a `DelayQueue`.
+///
+/// Instances of `Key` are returned by [`DelayQueue::insert`]. See [`DelayQueue`]
+/// documentation for more details.
+///
+/// [`DelayQueue`]: struct@DelayQueue
+/// [`DelayQueue::insert`]: method@DelayQueue::insert
+#[derive(Debug, Clone)]
+pub struct Key {
+    index: usize,
+}
+
+#[derive(Debug)]
+struct Stack<T> {
+    /// Head of the stack
+    head: Option<usize>,
+    _p: PhantomData<fn() -> T>,
+}
+
+#[derive(Debug)]
+struct Data<T> {
+    /// The data being stored in the queue and will be returned at the requested
+    /// instant.
+    inner: T,
+
+    /// The instant at which the item is returned.
+    when: u64,
+
+    /// Set to true when stored in the `expired` queue
+    expired: bool,
+
+    /// Next entry in the stack
+    next: Option<usize>,
+
+    /// Previous entry in the stack
+    prev: Option<usize>,
+}
+
+/// Maximum number of entries the queue can handle
+const MAX_ENTRIES: usize = (1 << 30) - 1;
+
+impl<T> DelayQueue<T> {
+    /// Creates a new, empty, `DelayQueue`.
+    ///
+    /// The queue will not allocate storage until items are inserted into it.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// # use tokio_util::time::DelayQueue;
+    /// let delay_queue: DelayQueue<u32> = DelayQueue::new();
+    /// ```
+    pub fn new() -> DelayQueue<T> {
+        DelayQueue::with_capacity(0)
+    }
+
+    /// Creates a new, empty, `DelayQueue` with the specified capacity.
+    ///
+    /// The queue will be able to hold at least `capacity` elements without
+    /// reallocating. If `capacity` is 0, the queue will not allocate for
+    /// storage.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// # use tokio_util::time::DelayQueue;
+    /// # use std::time::Duration;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::with_capacity(10);
+    ///
+    /// // These insertions are done without further allocation
+    /// for i in 0..10 {
+    ///     delay_queue.insert(i, Duration::from_secs(i));
+    /// }
+    ///
+    /// // This will make the queue allocate additional storage
+    /// delay_queue.insert(11, Duration::from_secs(11));
+    /// # }
+    /// ```
+    pub fn with_capacity(capacity: usize) -> DelayQueue<T> {
+        DelayQueue {
+            wheel: Wheel::new(),
+            slab: Slab::with_capacity(capacity),
+            expired: Stack::default(),
+            delay: None,
+            wheel_now: 0,
+            start: Instant::now(),
+            waker: None,
+        }
+    }
+
+    /// Inserts `value` into the queue set to expire at a specific instant in
+    /// time.
+    ///
+    /// This function is identical to `insert`, but takes an `Instant` instead
+    /// of a `Duration`.
+    ///
+    /// `value` is stored in the queue until `when` is reached. At which point,
+    /// `value` will be returned from [`poll_expired`]. If `when` has already been
+    /// reached, then `value` is immediately made available to poll.
+    ///
+    /// The return value represents the insertion and is used as an argument to
+    /// [`remove`] and [`reset`]. Note that [`Key`] is a token and is reused once
+    /// `value` is removed from the queue either by calling [`poll_expired`] after
+    /// `when` is reached or by calling [`remove`]. At this point, the caller
+    /// must take care to not use the returned [`Key`] again as it may reference
+    /// a different item in the queue.
+    ///
+    /// See [type] level documentation for more details.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if `when` is too far in the future.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage
+    ///
+    /// ```rust
+    /// use tokio::time::{Duration, Instant};
+    /// use tokio_util::time::DelayQueue;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::new();
+    /// let key = delay_queue.insert_at(
+    ///     "foo", Instant::now() + Duration::from_secs(5));
+    ///
+    /// // Remove the entry
+    /// let item = delay_queue.remove(&key);
+    /// assert_eq!(*item.get_ref(), "foo");
+    /// # }
+    /// ```
+    ///
+    /// [`poll_expired`]: method@Self::poll_expired
+    /// [`remove`]: method@Self::remove
+    /// [`reset`]: method@Self::reset
+    /// [`Key`]: struct@Key
+    /// [type]: #
+    pub fn insert_at(&mut self, value: T, when: Instant) -> Key {
+        assert!(self.slab.len() < MAX_ENTRIES, "max entries exceeded");
+
+        // Normalize the deadline. Values cannot be set to expire in the past.
+        let when = self.normalize_deadline(when);
+
+        // Insert the value in the store
+        let key = self.slab.insert(Data {
+            inner: value,
+            when,
+            expired: false,
+            next: None,
+            prev: None,
+        });
+
+        self.insert_idx(when, key);
+
+        // Set a new delay if the current's deadline is later than the one of the new item
+        let should_set_delay = if let Some(ref delay) = self.delay {
+            let current_exp = self.normalize_deadline(delay.deadline());
+            current_exp > when
+        } else {
+            true
+        };
+
+        if should_set_delay {
+            if let Some(waker) = self.waker.take() {
+                waker.wake();
+            }
+
+            let delay_time = self.start + Duration::from_millis(when);
+            if let Some(ref mut delay) = &mut self.delay {
+                delay.as_mut().reset(delay_time);
+            } else {
+                self.delay = Some(Box::pin(sleep_until(delay_time)));
+            }
+        }
+
+        Key::new(key)
+    }
+
+    /// Attempts to pull out the next value of the delay queue, registering the
+    /// current task for wakeup if the value is not yet available, and returning
+    /// `None` if the queue is exhausted.
+    pub fn poll_expired(
+        &mut self,
+        cx: &mut task::Context<'_>,
+    ) -> Poll<Option<Result<Expired<T>, Error>>> {
+        if !self
+            .waker
+            .as_ref()
+            .map(|w| w.will_wake(cx.waker()))
+            .unwrap_or(false)
+        {
+            self.waker = Some(cx.waker().clone());
+        }
+
+        let item = ready!(self.poll_idx(cx));
+        Poll::Ready(item.map(|result| {
+            result.map(|idx| {
+                let data = self.slab.remove(idx);
+                debug_assert!(data.next.is_none());
+                debug_assert!(data.prev.is_none());
+
+                Expired {
+                    key: Key::new(idx),
+                    data: data.inner,
+                    deadline: self.start + Duration::from_millis(data.when),
+                }
+            })
+        }))
+    }
+
+    /// Inserts `value` into the queue set to expire after the requested duration
+    /// elapses.
+    ///
+    /// This function is identical to `insert_at`, but takes a `Duration`
+    /// instead of an `Instant`.
+    ///
+    /// `value` is stored in the queue until `timeout` duration has
+    /// elapsed after `insert` was called. At that point, `value` will
+    /// be returned from [`poll_expired`]. If `timeout` is a `Duration` of
+    /// zero, then `value` is immediately made available to poll.
+    ///
+    /// The return value represents the insertion and is used as an
+    /// argument to [`remove`] and [`reset`]. Note that [`Key`] is a
+    /// token and is reused once `value` is removed from the queue
+    /// either by calling [`poll_expired`] after `timeout` has elapsed
+    /// or by calling [`remove`]. At this point, the caller must not
+    /// use the returned [`Key`] again as it may reference a different
+    /// item in the queue.
+    ///
+    /// See [type] level documentation for more details.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if `timeout` is greater than the maximum
+    /// duration supported by the timer in the current `Runtime`.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage
+    ///
+    /// ```rust
+    /// use tokio_util::time::DelayQueue;
+    /// use std::time::Duration;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::new();
+    /// let key = delay_queue.insert("foo", Duration::from_secs(5));
+    ///
+    /// // Remove the entry
+    /// let item = delay_queue.remove(&key);
+    /// assert_eq!(*item.get_ref(), "foo");
+    /// # }
+    /// ```
+    ///
+    /// [`poll_expired`]: method@Self::poll_expired
+    /// [`remove`]: method@Self::remove
+    /// [`reset`]: method@Self::reset
+    /// [`Key`]: struct@Key
+    /// [type]: #
+    pub fn insert(&mut self, value: T, timeout: Duration) -> Key {
+        self.insert_at(value, Instant::now() + timeout)
+    }
+
+    fn insert_idx(&mut self, when: u64, key: usize) {
+        use self::wheel::{InsertError, Stack};
+
+        // Register the deadline with the timer wheel
+        match self.wheel.insert(when, key, &mut self.slab) {
+            Ok(_) => {}
+            Err((_, InsertError::Elapsed)) => {
+                self.slab[key].expired = true;
+                // The delay is already expired, store it in the expired queue
+                self.expired.push(key, &mut self.slab);
+            }
+            Err((_, err)) => panic!("invalid deadline; err={:?}", err),
+        }
+    }
+
+    /// Removes the key from the expired queue or the timer wheel
+    /// depending on its expiration status.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the key is not contained in the expired queue or the wheel.
+    fn remove_key(&mut self, key: &Key) {
+        use crate::time::wheel::Stack;
+
+        // Special case the `expired` queue
+        if self.slab[key.index].expired {
+            self.expired.remove(&key.index, &mut self.slab);
+        } else {
+            self.wheel.remove(&key.index, &mut self.slab);
+        }
+    }
+
+    /// Removes the item associated with `key` from the queue.
+    ///
+    /// There must be an item associated with `key`. The function returns the
+    /// removed item as well as the `Instant` at which it will the delay will
+    /// have expired.
+    ///
+    /// # Panics
+    ///
+    /// The function panics if `key` is not contained by the queue.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage
+    ///
+    /// ```rust
+    /// use tokio_util::time::DelayQueue;
+    /// use std::time::Duration;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::new();
+    /// let key = delay_queue.insert("foo", Duration::from_secs(5));
+    ///
+    /// // Remove the entry
+    /// let item = delay_queue.remove(&key);
+    /// assert_eq!(*item.get_ref(), "foo");
+    /// # }
+    /// ```
+    pub fn remove(&mut self, key: &Key) -> Expired<T> {
+        self.remove_key(key);
+        let data = self.slab.remove(key.index);
+
+        Expired {
+            key: Key::new(key.index),
+            data: data.inner,
+            deadline: self.start + Duration::from_millis(data.when),
+        }
+    }
+
+    /// Sets the delay of the item associated with `key` to expire at `when`.
+    ///
+    /// This function is identical to `reset` but takes an `Instant` instead of
+    /// a `Duration`.
+    ///
+    /// The item remains in the queue but the delay is set to expire at `when`.
+    /// If `when` is in the past, then the item is immediately made available to
+    /// the caller.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if `when` is too far in the future or if `key` is
+    /// not contained by the queue.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage
+    ///
+    /// ```rust
+    /// use tokio::time::{Duration, Instant};
+    /// use tokio_util::time::DelayQueue;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::new();
+    /// let key = delay_queue.insert("foo", Duration::from_secs(5));
+    ///
+    /// // "foo" is scheduled to be returned in 5 seconds
+    ///
+    /// delay_queue.reset_at(&key, Instant::now() + Duration::from_secs(10));
+    ///
+    /// // "foo" is now scheduled to be returned in 10 seconds
+    /// # }
+    /// ```
+    pub fn reset_at(&mut self, key: &Key, when: Instant) {
+        self.remove_key(key);
+
+        // Normalize the deadline. Values cannot be set to expire in the past.
+        let when = self.normalize_deadline(when);
+
+        self.slab[key.index].when = when;
+        self.slab[key.index].expired = false;
+
+        self.insert_idx(when, key.index);
+
+        let next_deadline = self.next_deadline();
+        if let (Some(ref mut delay), Some(deadline)) = (&mut self.delay, next_deadline) {
+            // This should awaken us if necessary (ie, if already expired)
+            delay.as_mut().reset(deadline);
+        }
+    }
+
+    /// Returns the next time to poll as determined by the wheel
+    fn next_deadline(&mut self) -> Option<Instant> {
+        self.wheel
+            .poll_at()
+            .map(|poll_at| self.start + Duration::from_millis(poll_at))
+    }
+
+    /// Sets the delay of the item associated with `key` to expire after
+    /// `timeout`.
+    ///
+    /// This function is identical to `reset_at` but takes a `Duration` instead
+    /// of an `Instant`.
+    ///
+    /// The item remains in the queue but the delay is set to expire after
+    /// `timeout`. If `timeout` is zero, then the item is immediately made
+    /// available to the caller.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if `timeout` is greater than the maximum supported
+    /// duration or if `key` is not contained by the queue.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage
+    ///
+    /// ```rust
+    /// use tokio_util::time::DelayQueue;
+    /// use std::time::Duration;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::new();
+    /// let key = delay_queue.insert("foo", Duration::from_secs(5));
+    ///
+    /// // "foo" is scheduled to be returned in 5 seconds
+    ///
+    /// delay_queue.reset(&key, Duration::from_secs(10));
+    ///
+    /// // "foo"is now scheduled to be returned in 10 seconds
+    /// # }
+    /// ```
+    pub fn reset(&mut self, key: &Key, timeout: Duration) {
+        self.reset_at(key, Instant::now() + timeout);
+    }
+
+    /// Clears the queue, removing all items.
+    ///
+    /// After calling `clear`, [`poll_expired`] will return `Ok(Ready(None))`.
+    ///
+    /// Note that this method has no effect on the allocated capacity.
+    ///
+    /// [`poll_expired`]: method@Self::poll_expired
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use tokio_util::time::DelayQueue;
+    /// use std::time::Duration;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::new();
+    ///
+    /// delay_queue.insert("foo", Duration::from_secs(5));
+    ///
+    /// assert!(!delay_queue.is_empty());
+    ///
+    /// delay_queue.clear();
+    ///
+    /// assert!(delay_queue.is_empty());
+    /// # }
+    /// ```
+    pub fn clear(&mut self) {
+        self.slab.clear();
+        self.expired = Stack::default();
+        self.wheel = Wheel::new();
+        self.delay = None;
+    }
+
+    /// Returns the number of elements the queue can hold without reallocating.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use tokio_util::time::DelayQueue;
+    ///
+    /// let delay_queue: DelayQueue<i32> = DelayQueue::with_capacity(10);
+    /// assert_eq!(delay_queue.capacity(), 10);
+    /// ```
+    pub fn capacity(&self) -> usize {
+        self.slab.capacity()
+    }
+
+    /// Returns the number of elements currently in the queue.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use tokio_util::time::DelayQueue;
+    /// use std::time::Duration;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue: DelayQueue<i32> = DelayQueue::with_capacity(10);
+    /// assert_eq!(delay_queue.len(), 0);
+    /// delay_queue.insert(3, Duration::from_secs(5));
+    /// assert_eq!(delay_queue.len(), 1);
+    /// # }
+    /// ```
+    pub fn len(&self) -> usize {
+        self.slab.len()
+    }
+
+    /// Reserves capacity for at least `additional` more items to be queued
+    /// without allocating.
+    ///
+    /// `reserve` does nothing if the queue already has sufficient capacity for
+    /// `additional` more values. If more capacity is required, a new segment of
+    /// memory will be allocated and all existing values will be copied into it.
+    /// As such, if the queue is already very large, a call to `reserve` can end
+    /// up being expensive.
+    ///
+    /// The queue may reserve more than `additional` extra space in order to
+    /// avoid frequent reallocations.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the new capacity exceeds the maximum number of entries the
+    /// queue can contain.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio_util::time::DelayQueue;
+    /// use std::time::Duration;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::new();
+    ///
+    /// delay_queue.insert("hello", Duration::from_secs(10));
+    /// delay_queue.reserve(10);
+    ///
+    /// assert!(delay_queue.capacity() >= 11);
+    /// # }
+    /// ```
+    pub fn reserve(&mut self, additional: usize) {
+        self.slab.reserve(additional);
+    }
+
+    /// Returns `true` if there are no items in the queue.
+    ///
+    /// Note that this function returns `false` even if all items have not yet
+    /// expired and a call to `poll` will return `Poll::Pending`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tokio_util::time::DelayQueue;
+    /// use std::time::Duration;
+    ///
+    /// # #[tokio::main]
+    /// # async fn main() {
+    /// let mut delay_queue = DelayQueue::new();
+    /// assert!(delay_queue.is_empty());
+    ///
+    /// delay_queue.insert("hello", Duration::from_secs(5));
+    /// assert!(!delay_queue.is_empty());
+    /// # }
+    /// ```
+    pub fn is_empty(&self) -> bool {
+        self.slab.is_empty()
+    }
+
+    /// Polls the queue, returning the index of the next slot in the slab that
+    /// should be returned.
+    ///
+    /// A slot should be returned when the associated deadline has been reached.
+    fn poll_idx(&mut self, cx: &mut task::Context<'_>) -> Poll<Option<Result<usize, Error>>> {
+        use self::wheel::Stack;
+
+        let expired = self.expired.pop(&mut self.slab);
+
+        if expired.is_some() {
+            return Poll::Ready(expired.map(Ok));
+        }
+
+        loop {
+            if let Some(ref mut delay) = self.delay {
+                if !delay.is_elapsed() {
+                    ready!(Pin::new(&mut *delay).poll(cx));
+                }
+
+                let now = crate::time::ms(delay.deadline() - self.start, crate::time::Round::Down);
+
+                self.wheel_now = now;
+            }
+
+            // We poll the wheel to get the next value out before finding the next deadline.
+            let wheel_idx = self.wheel.poll(self.wheel_now, &mut self.slab);
+
+            self.delay = self.next_deadline().map(|when| Box::pin(sleep_until(when)));
+
+            if let Some(idx) = wheel_idx {
+                return Poll::Ready(Some(Ok(idx)));
+            }
+
+            if self.delay.is_none() {
+                return Poll::Ready(None);
+            }
+        }
+    }
+
+    fn normalize_deadline(&self, when: Instant) -> u64 {
+        let when = if when < self.start {
+            0
+        } else {
+            crate::time::ms(when - self.start, crate::time::Round::Up)
+        };
+
+        cmp::max(when, self.wheel.elapsed())
+    }
+}
+
+// We never put `T` in a `Pin`...
+impl<T> Unpin for DelayQueue<T> {}
+
+impl<T> Default for DelayQueue<T> {
+    fn default() -> DelayQueue<T> {
+        DelayQueue::new()
+    }
+}
+
+impl<T> futures_core::Stream for DelayQueue<T> {
+    // DelayQueue seems much more specific, where a user may care that it
+    // has reached capacity, so return those errors instead of panicking.
+    type Item = Result<Expired<T>, Error>;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Option<Self::Item>> {
+        DelayQueue::poll_expired(self.get_mut(), cx)
+    }
+}
+
+impl<T> wheel::Stack for Stack<T> {
+    type Owned = usize;
+    type Borrowed = usize;
+    type Store = Slab<Data<T>>;
+
+    fn is_empty(&self) -> bool {
+        self.head.is_none()
+    }
+
+    fn push(&mut self, item: Self::Owned, store: &mut Self::Store) {
+        // Ensure the entry is not already in a stack.
+        debug_assert!(store[item].next.is_none());
+        debug_assert!(store[item].prev.is_none());
+
+        // Remove the old head entry
+        let old = self.head.take();
+
+        if let Some(idx) = old {
+            store[idx].prev = Some(item);
+        }
+
+        store[item].next = old;
+        self.head = Some(item)
+    }
+
+    fn pop(&mut self, store: &mut Self::Store) -> Option<Self::Owned> {
+        if let Some(idx) = self.head {
+            self.head = store[idx].next;
+
+            if let Some(idx) = self.head {
+                store[idx].prev = None;
+            }
+
+            store[idx].next = None;
+            debug_assert!(store[idx].prev.is_none());
+
+            Some(idx)
+        } else {
+            None
+        }
+    }
+
+    fn remove(&mut self, item: &Self::Borrowed, store: &mut Self::Store) {
+        assert!(store.contains(*item));
+
+        // Ensure that the entry is in fact contained by the stack
+        debug_assert!({
+            // This walks the full linked list even if an entry is found.
+            let mut next = self.head;
+            let mut contains = false;
+
+            while let Some(idx) = next {
+                if idx == *item {
+                    debug_assert!(!contains);
+                    contains = true;
+                }
+
+                next = store[idx].next;
+            }
+
+            contains
+        });
+
+        if let Some(next) = store[*item].next {
+            store[next].prev = store[*item].prev;
+        }
+
+        if let Some(prev) = store[*item].prev {
+            store[prev].next = store[*item].next;
+        } else {
+            self.head = store[*item].next;
+        }
+
+        store[*item].next = None;
+        store[*item].prev = None;
+    }
+
+    fn when(item: &Self::Borrowed, store: &Self::Store) -> u64 {
+        store[*item].when
+    }
+}
+
+impl<T> Default for Stack<T> {
+    fn default() -> Stack<T> {
+        Stack {
+            head: None,
+            _p: PhantomData,
+        }
+    }
+}
+
+impl Key {
+    pub(crate) fn new(index: usize) -> Key {
+        Key { index }
+    }
+}
+
+impl<T> Expired<T> {
+    /// Returns a reference to the inner value.
+    pub fn get_ref(&self) -> &T {
+        &self.data
+    }
+
+    /// Returns a mutable reference to the inner value.
+    pub fn get_mut(&mut self) -> &mut T {
+        &mut self.data
+    }
+
+    /// Consumes `self` and returns the inner value.
+    pub fn into_inner(self) -> T {
+        self.data
+    }
+
+    /// Returns the deadline that the expiration was set to.
+    pub fn deadline(&self) -> Instant {
+        self.deadline
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,47 @@
+//! Additional utilities for tracking time.
+//!
+//! This module provides additional utilities for executing code after a set period
+//! of time. Currently there is only one:
+//!
+//! * `DelayQueue`: A queue where items are returned once the requested delay
+//!   has expired.
+//!
+//! This type must be used from within the context of the `Runtime`.
+
+use std::time::Duration;
+
+mod wheel;
+
+#[doc(inline)]
+pub mod delay_queue;
+
+pub use delay_queue::DelayQueue;
+
+// ===== Internal utils =====
+
+enum Round {
+    Up,
+    Down,
+}
+
+/// Convert a `Duration` to milliseconds, rounding up and saturating at
+/// `u64::MAX`.
+///
+/// The saturating is fine because `u64::MAX` milliseconds are still many
+/// million years.
+#[inline]
+fn ms(duration: Duration, round: Round) -> u64 {
+    const NANOS_PER_MILLI: u32 = 1_000_000;
+    const MILLIS_PER_SEC: u64 = 1_000;
+
+    // Round up.
+    let millis = match round {
+        Round::Up => (duration.subsec_nanos() + NANOS_PER_MILLI - 1) / NANOS_PER_MILLI,
+        Round::Down => duration.subsec_millis(),
+    };
+
+    duration
+        .as_secs()
+        .saturating_mul(MILLIS_PER_SEC)
+        .saturating_add(u64::from(millis))
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/wheel/level.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/wheel/level.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/wheel/level.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/wheel/level.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,253 @@
+use crate::time::wheel::Stack;
+
+use std::fmt;
+
+/// Wheel for a single level in the timer. This wheel contains 64 slots.
+pub(crate) struct Level<T> {
+    level: usize,
+
+    /// Bit field tracking which slots currently contain entries.
+    ///
+    /// Using a bit field to track slots that contain entries allows avoiding a
+    /// scan to find entries. This field is updated when entries are added or
+    /// removed from a slot.
+    ///
+    /// The least-significant bit represents slot zero.
+    occupied: u64,
+
+    /// Slots
+    slot: [T; LEVEL_MULT],
+}
+
+/// Indicates when a slot must be processed next.
+#[derive(Debug)]
+pub(crate) struct Expiration {
+    /// The level containing the slot.
+    pub(crate) level: usize,
+
+    /// The slot index.
+    pub(crate) slot: usize,
+
+    /// The instant at which the slot needs to be processed.
+    pub(crate) deadline: u64,
+}
+
+/// Level multiplier.
+///
+/// Being a power of 2 is very important.
+const LEVEL_MULT: usize = 64;
+
+impl<T: Stack> Level<T> {
+    pub(crate) fn new(level: usize) -> Level<T> {
+        // Rust's derived implementations for arrays require that the value
+        // contained by the array be `Copy`. So, here we have to manually
+        // initialize every single slot.
+        macro_rules! s {
+            () => {
+                T::default()
+            };
+        }
+
+        Level {
+            level,
+            occupied: 0,
+            slot: [
+                // It does not look like the necessary traits are
+                // derived for [T; 64].
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+                s!(),
+            ],
+        }
+    }
+
+    /// Finds the slot that needs to be processed next and returns the slot and
+    /// `Instant` at which this slot must be processed.
+    pub(crate) fn next_expiration(&self, now: u64) -> Option<Expiration> {
+        // Use the `occupied` bit field to get the index of the next slot that
+        // needs to be processed.
+        let slot = match self.next_occupied_slot(now) {
+            Some(slot) => slot,
+            None => return None,
+        };
+
+        // From the slot index, calculate the `Instant` at which it needs to be
+        // processed. This value *must* be in the future with respect to `now`.
+
+        let level_range = level_range(self.level);
+        let slot_range = slot_range(self.level);
+
+        // TODO: This can probably be simplified w/ power of 2 math
+        let level_start = now - (now % level_range);
+        let deadline = level_start + slot as u64 * slot_range;
+
+        debug_assert!(
+            deadline >= now,
+            "deadline={}; now={}; level={}; slot={}; occupied={:b}",
+            deadline,
+            now,
+            self.level,
+            slot,
+            self.occupied
+        );
+
+        Some(Expiration {
+            level: self.level,
+            slot,
+            deadline,
+        })
+    }
+
+    fn next_occupied_slot(&self, now: u64) -> Option<usize> {
+        if self.occupied == 0 {
+            return None;
+        }
+
+        // Get the slot for now using Maths
+        let now_slot = (now / slot_range(self.level)) as usize;
+        let occupied = self.occupied.rotate_right(now_slot as u32);
+        let zeros = occupied.trailing_zeros() as usize;
+        let slot = (zeros + now_slot) % 64;
+
+        Some(slot)
+    }
+
+    pub(crate) fn add_entry(&mut self, when: u64, item: T::Owned, store: &mut T::Store) {
+        let slot = slot_for(when, self.level);
+
+        self.slot[slot].push(item, store);
+        self.occupied |= occupied_bit(slot);
+    }
+
+    pub(crate) fn remove_entry(&mut self, when: u64, item: &T::Borrowed, store: &mut T::Store) {
+        let slot = slot_for(when, self.level);
+
+        self.slot[slot].remove(item, store);
+
+        if self.slot[slot].is_empty() {
+            // The bit is currently set
+            debug_assert!(self.occupied & occupied_bit(slot) != 0);
+
+            // Unset the bit
+            self.occupied ^= occupied_bit(slot);
+        }
+    }
+
+    pub(crate) fn pop_entry_slot(&mut self, slot: usize, store: &mut T::Store) -> Option<T::Owned> {
+        let ret = self.slot[slot].pop(store);
+
+        if ret.is_some() && self.slot[slot].is_empty() {
+            // The bit is currently set
+            debug_assert!(self.occupied & occupied_bit(slot) != 0);
+
+            self.occupied ^= occupied_bit(slot);
+        }
+
+        ret
+    }
+}
+
+impl<T> fmt::Debug for Level<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.debug_struct("Level")
+            .field("occupied", &self.occupied)
+            .finish()
+    }
+}
+
+fn occupied_bit(slot: usize) -> u64 {
+    1 << slot
+}
+
+fn slot_range(level: usize) -> u64 {
+    LEVEL_MULT.pow(level as u32) as u64
+}
+
+fn level_range(level: usize) -> u64 {
+    LEVEL_MULT as u64 * slot_range(level)
+}
+
+/// Convert a duration (milliseconds) and a level to a slot position
+fn slot_for(duration: u64, level: usize) -> usize {
+    ((duration >> (level * 6)) % LEVEL_MULT as u64) as usize
+}
+
+#[cfg(all(test, not(loom)))]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_slot_for() {
+        for pos in 0..64 {
+            assert_eq!(pos as usize, slot_for(pos, 0));
+        }
+
+        for level in 1..5 {
+            for pos in level..64 {
+                let a = pos * 64_usize.pow(level as u32);
+                assert_eq!(pos as usize, slot_for(a as u64, level));
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/wheel/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/wheel/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/wheel/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/wheel/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,313 @@
+mod level;
+pub(crate) use self::level::Expiration;
+use self::level::Level;
+
+mod stack;
+pub(crate) use self::stack::Stack;
+
+use std::borrow::Borrow;
+use std::usize;
+
+/// Timing wheel implementation.
+///
+/// This type provides the hashed timing wheel implementation that backs `Timer`
+/// and `DelayQueue`.
+///
+/// The structure is generic over `T: Stack`. This allows handling timeout data
+/// being stored on the heap or in a slab. In order to support the latter case,
+/// the slab must be passed into each function allowing the implementation to
+/// lookup timer entries.
+///
+/// See `Timer` documentation for some implementation notes.
+#[derive(Debug)]
+pub(crate) struct Wheel<T> {
+    /// The number of milliseconds elapsed since the wheel started.
+    elapsed: u64,
+
+    /// Timer wheel.
+    ///
+    /// Levels:
+    ///
+    /// * 1 ms slots / 64 ms range
+    /// * 64 ms slots / ~ 4 sec range
+    /// * ~ 4 sec slots / ~ 4 min range
+    /// * ~ 4 min slots / ~ 4 hr range
+    /// * ~ 4 hr slots / ~ 12 day range
+    /// * ~ 12 day slots / ~ 2 yr range
+    levels: Vec<Level<T>>,
+}
+
+/// Number of levels. Each level has 64 slots. By using 6 levels with 64 slots
+/// each, the timer is able to track time up to 2 years into the future with a
+/// precision of 1 millisecond.
+const NUM_LEVELS: usize = 6;
+
+/// The maximum duration of a delay
+const MAX_DURATION: u64 = (1 << (6 * NUM_LEVELS)) - 1;
+
+#[derive(Debug)]
+pub(crate) enum InsertError {
+    Elapsed,
+    Invalid,
+}
+
+impl<T> Wheel<T>
+where
+    T: Stack,
+{
+    /// Create a new timing wheel
+    pub(crate) fn new() -> Wheel<T> {
+        let levels = (0..NUM_LEVELS).map(Level::new).collect();
+
+        Wheel { elapsed: 0, levels }
+    }
+
+    /// Return the number of milliseconds that have elapsed since the timing
+    /// wheel's creation.
+    pub(crate) fn elapsed(&self) -> u64 {
+        self.elapsed
+    }
+
+    /// Insert an entry into the timing wheel.
+    ///
+    /// # Arguments
+    ///
+    /// * `when`: is the instant at which the entry should be fired. It is
+    ///           represented as the number of milliseconds since the creation
+    ///           of the timing wheel.
+    ///
+    /// * `item`: The item to insert into the wheel.
+    ///
+    /// * `store`: The slab or `()` when using heap storage.
+    ///
+    /// # Return
+    ///
+    /// Returns `Ok` when the item is successfully inserted, `Err` otherwise.
+    ///
+    /// `Err(Elapsed)` indicates that `when` represents an instant that has
+    /// already passed. In this case, the caller should fire the timeout
+    /// immediately.
+    ///
+    /// `Err(Invalid)` indicates an invalid `when` argument as been supplied.
+    pub(crate) fn insert(
+        &mut self,
+        when: u64,
+        item: T::Owned,
+        store: &mut T::Store,
+    ) -> Result<(), (T::Owned, InsertError)> {
+        if when <= self.elapsed {
+            return Err((item, InsertError::Elapsed));
+        } else if when - self.elapsed > MAX_DURATION {
+            return Err((item, InsertError::Invalid));
+        }
+
+        // Get the level at which the entry should be stored
+        let level = self.level_for(when);
+
+        self.levels[level].add_entry(when, item, store);
+
+        debug_assert!({
+            self.levels[level]
+                .next_expiration(self.elapsed)
+                .map(|e| e.deadline >= self.elapsed)
+                .unwrap_or(true)
+        });
+
+        Ok(())
+    }
+
+    /// Remove `item` from the timing wheel.
+    pub(crate) fn remove(&mut self, item: &T::Borrowed, store: &mut T::Store) {
+        let when = T::when(item, store);
+
+        assert!(
+            self.elapsed <= when,
+            "elapsed={}; when={}",
+            self.elapsed,
+            when
+        );
+
+        let level = self.level_for(when);
+
+        self.levels[level].remove_entry(when, item, store);
+    }
+
+    /// Instant at which to poll
+    pub(crate) fn poll_at(&self) -> Option<u64> {
+        self.next_expiration().map(|expiration| expiration.deadline)
+    }
+
+    /// Advances the timer up to the instant represented by `now`.
+    pub(crate) fn poll(&mut self, now: u64, store: &mut T::Store) -> Option<T::Owned> {
+        loop {
+            let expiration = self.next_expiration().and_then(|expiration| {
+                if expiration.deadline > now {
+                    None
+                } else {
+                    Some(expiration)
+                }
+            });
+
+            match expiration {
+                Some(ref expiration) => {
+                    if let Some(item) = self.poll_expiration(expiration, store) {
+                        return Some(item);
+                    }
+
+                    self.set_elapsed(expiration.deadline);
+                }
+                None => {
+                    // in this case the poll did not indicate an expiration
+                    // _and_ we were not able to find a next expiration in
+                    // the current list of timers.  advance to the poll's
+                    // current time and do nothing else.
+                    self.set_elapsed(now);
+                    return None;
+                }
+            }
+        }
+    }
+
+    /// Returns the instant at which the next timeout expires.
+    fn next_expiration(&self) -> Option<Expiration> {
+        // Check all levels
+        for level in 0..NUM_LEVELS {
+            if let Some(expiration) = self.levels[level].next_expiration(self.elapsed) {
+                // There cannot be any expirations at a higher level that happen
+                // before this one.
+                debug_assert!(self.no_expirations_before(level + 1, expiration.deadline));
+
+                return Some(expiration);
+            }
+        }
+
+        None
+    }
+
+    /// Used for debug assertions
+    fn no_expirations_before(&self, start_level: usize, before: u64) -> bool {
+        let mut res = true;
+
+        for l2 in start_level..NUM_LEVELS {
+            if let Some(e2) = self.levels[l2].next_expiration(self.elapsed) {
+                if e2.deadline < before {
+                    res = false;
+                }
+            }
+        }
+
+        res
+    }
+
+    /// iteratively find entries that are between the wheel's current
+    /// time and the expiration time.  for each in that population either
+    /// return it for notification (in the case of the last level) or tier
+    /// it down to the next level (in all other cases).
+    pub(crate) fn poll_expiration(
+        &mut self,
+        expiration: &Expiration,
+        store: &mut T::Store,
+    ) -> Option<T::Owned> {
+        while let Some(item) = self.pop_entry(expiration, store) {
+            if expiration.level == 0 {
+                debug_assert_eq!(T::when(item.borrow(), store), expiration.deadline);
+
+                return Some(item);
+            } else {
+                let when = T::when(item.borrow(), store);
+
+                let next_level = expiration.level - 1;
+
+                self.levels[next_level].add_entry(when, item, store);
+            }
+        }
+
+        None
+    }
+
+    fn set_elapsed(&mut self, when: u64) {
+        assert!(
+            self.elapsed <= when,
+            "elapsed={:?}; when={:?}",
+            self.elapsed,
+            when
+        );
+
+        if when > self.elapsed {
+            self.elapsed = when;
+        }
+    }
+
+    fn pop_entry(&mut self, expiration: &Expiration, store: &mut T::Store) -> Option<T::Owned> {
+        self.levels[expiration.level].pop_entry_slot(expiration.slot, store)
+    }
+
+    fn level_for(&self, when: u64) -> usize {
+        level_for(self.elapsed, when)
+    }
+}
+
+fn level_for(elapsed: u64, when: u64) -> usize {
+    const SLOT_MASK: u64 = (1 << 6) - 1;
+
+    // Mask in the trailing bits ignored by the level calculation in order to cap
+    // the possible leading zeros
+    let masked = elapsed ^ when | SLOT_MASK;
+
+    let leading_zeros = masked.leading_zeros() as usize;
+    let significant = 63 - leading_zeros;
+    significant / 6
+}
+
+#[cfg(all(test, not(loom)))]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_level_for() {
+        for pos in 0..64 {
+            assert_eq!(
+                0,
+                level_for(0, pos),
+                "level_for({}) -- binary = {:b}",
+                pos,
+                pos
+            );
+        }
+
+        for level in 1..5 {
+            for pos in level..64 {
+                let a = pos * 64_usize.pow(level as u32);
+                assert_eq!(
+                    level,
+                    level_for(0, a as u64),
+                    "level_for({}) -- binary = {:b}",
+                    a,
+                    a
+                );
+
+                if pos > level {
+                    let a = a - 1;
+                    assert_eq!(
+                        level,
+                        level_for(0, a as u64),
+                        "level_for({}) -- binary = {:b}",
+                        a,
+                        a
+                    );
+                }
+
+                if pos < 64 {
+                    let a = a + 1;
+                    assert_eq!(
+                        level,
+                        level_for(0, a as u64),
+                        "level_for({}) -- binary = {:b}",
+                        a,
+                        a
+                    );
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/wheel/stack.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/wheel/stack.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/time/wheel/stack.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/time/wheel/stack.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+use std::borrow::Borrow;
+
+/// Abstracts the stack operations needed to track timeouts.
+pub(crate) trait Stack: Default {
+    /// Type of the item stored in the stack
+    type Owned: Borrow<Self::Borrowed>;
+
+    /// Borrowed item
+    type Borrowed;
+
+    /// Item storage, this allows a slab to be used instead of just the heap
+    type Store;
+
+    /// Returns `true` if the stack is empty
+    fn is_empty(&self) -> bool;
+
+    /// Push an item onto the stack
+    fn push(&mut self, item: Self::Owned, store: &mut Self::Store);
+
+    /// Pop an item from the stack
+    fn pop(&mut self, store: &mut Self::Store) -> Option<Self::Owned>;
+
+    fn remove(&mut self, item: &Self::Borrowed, store: &mut Self::Store);
+
+    fn when(item: &Self::Borrowed, store: &Self::Store) -> u64;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/udp/frame.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/udp/frame.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/udp/frame.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/udp/frame.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,20 @@
 use crate::codec::{Decoder, Encoder};
 
-use tokio::{net::UdpSocket, stream::Stream};
+use futures_core::Stream;
+use tokio::{io::ReadBuf, net::UdpSocket};
 
 use bytes::{BufMut, BytesMut};
 use futures_core::ready;
 use futures_sink::Sink;
-use std::io;
-use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 use std::pin::Pin;
 use std::task::{Context, Poll};
+use std::{
+    borrow::Borrow,
+    net::{Ipv4Addr, SocketAddr, SocketAddrV4},
+};
+use std::{io, mem::MaybeUninit};
 
-/// A unified `Stream` and `Sink` interface to an underlying `UdpSocket`, using
+/// A unified [`Stream`] and [`Sink`] interface to an underlying `UdpSocket`, using
 /// the `Encoder` and `Decoder` traits to encode and decode frames.
 ///
 /// Raw UDP sockets work with datagrams, but higher-level code usually wants to
@@ -19,26 +23,41 @@
 /// handle encoding and decoding of messages frames. Note that the incoming and
 /// outgoing frame types may be distinct.
 ///
-/// This function returns a *single* object that is both `Stream` and `Sink`;
+/// This function returns a *single* object that is both [`Stream`] and [`Sink`];
 /// grouping this into a single object is often useful for layering things which
 /// require both read and write access to the underlying object.
 ///
 /// If you want to work more directly with the streams and sink, consider
-/// calling `split` on the `UdpFramed` returned by this method, which will break
+/// calling [`split`] on the `UdpFramed` returned by this method, which will break
 /// them into separate objects, allowing them to interact more easily.
+///
+/// [`Stream`]: futures_core::Stream
+/// [`Sink`]: futures_sink::Sink
+/// [`split`]: https://docs.rs/futures/0.3/futures/stream/trait.StreamExt.html#method.split
 #[must_use = "sinks do nothing unless polled"]
-#[cfg_attr(docsrs, doc(all(feature = "codec", feature = "udp")))]
+#[cfg_attr(docsrs, doc(cfg(all(feature = "codec", feature = "udp"))))]
 #[derive(Debug)]
-pub struct UdpFramed<C> {
-    socket: UdpSocket,
+pub struct UdpFramed<C, T = UdpSocket> {
+    socket: T,
     codec: C,
     rd: BytesMut,
     wr: BytesMut,
     out_addr: SocketAddr,
     flushed: bool,
+    is_readable: bool,
+    current_addr: Option<SocketAddr>,
 }
 
-impl<C: Decoder + Unpin> Stream for UdpFramed<C> {
+const INITIAL_RD_CAPACITY: usize = 64 * 1024;
+const INITIAL_WR_CAPACITY: usize = 8 * 1024;
+
+impl<C, T> Unpin for UdpFramed<C, T> {}
+
+impl<C, T> Stream for UdpFramed<C, T>
+where
+    T: Borrow<UdpSocket>,
+    C: Decoder,
+{
     type Item = Result<(C::Item, SocketAddr), C::Error>;
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
@@ -46,31 +65,48 @@
 
         pin.rd.reserve(INITIAL_RD_CAPACITY);
 
-        let (_n, addr) = unsafe {
-            // Read into the buffer without having to initialize the memory.
-            //
-            // safety: we know tokio::net::UdpSocket never reads from the memory
-            // during a recv
-            let res = {
-                let bytes = &mut *(pin.rd.bytes_mut() as *mut _ as *mut [u8]);
-                ready!(Pin::new(&mut pin.socket).poll_recv_from(cx, bytes))
-            };
-
-            let (n, addr) = res?;
-            pin.rd.advance_mut(n);
-            (n, addr)
-        };
+        loop {
+            // Are there still bytes left in the read buffer to decode?
+            if pin.is_readable {
+                if let Some(frame) = pin.codec.decode_eof(&mut pin.rd)? {
+                    let current_addr = pin
+                        .current_addr
+                        .expect("will always be set before this line is called");
+
+                    return Poll::Ready(Some(Ok((frame, current_addr))));
+                }
+
+                // if this line has been reached then decode has returned `None`.
+                pin.is_readable = false;
+                pin.rd.clear();
+            }
 
-        let frame_res = pin.codec.decode(&mut pin.rd);
-        pin.rd.clear();
-        let frame = frame_res?;
-        let result = frame.map(|frame| Ok((frame, addr))); // frame -> (frame, addr)
+            // We're out of data. Try and fetch more data to decode
+            let addr = unsafe {
+                // Convert `&mut [MaybeUnit<u8>]` to `&mut [u8]` because we will be
+                // writing to it via `poll_recv_from` and therefore initializing the memory.
+                let buf = &mut *(pin.rd.chunk_mut() as *mut _ as *mut [MaybeUninit<u8>]);
+                let mut read = ReadBuf::uninit(buf);
+                let ptr = read.filled().as_ptr();
+                let res = ready!(pin.socket.borrow().poll_recv_from(cx, &mut read));
+
+                assert_eq!(ptr, read.filled().as_ptr());
+                let addr = res?;
+                pin.rd.advance_mut(read.filled().len());
+                addr
+            };
 
-        Poll::Ready(result)
+            pin.current_addr = Some(addr);
+            pin.is_readable = true;
+        }
     }
 }
 
-impl<I, C: Encoder<I> + Unpin> Sink<(I, SocketAddr)> for UdpFramed<C> {
+impl<I, C, T> Sink<(I, SocketAddr)> for UdpFramed<C, T>
+where
+    T: Borrow<UdpSocket>,
+    C: Encoder<I>,
+{
     type Error = C::Error;
 
     fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
@@ -102,13 +138,13 @@
         }
 
         let Self {
-            ref mut socket,
+            ref socket,
             ref mut out_addr,
             ref mut wr,
             ..
         } = *self;
 
-        let n = ready!(socket.poll_send_to(cx, &wr, &out_addr))?;
+        let n = ready!(socket.borrow().poll_send_to(cx, &wr, *out_addr))?;
 
         let wrote_all = n == self.wr.len();
         self.wr.clear();
@@ -133,21 +169,23 @@
     }
 }
 
-const INITIAL_RD_CAPACITY: usize = 64 * 1024;
-const INITIAL_WR_CAPACITY: usize = 8 * 1024;
-
-impl<C> UdpFramed<C> {
+impl<C, T> UdpFramed<C, T>
+where
+    T: Borrow<UdpSocket>,
+{
     /// Create a new `UdpFramed` backed by the given socket and codec.
     ///
     /// See struct level documentation for more details.
-    pub fn new(socket: UdpSocket, codec: C) -> UdpFramed<C> {
-        UdpFramed {
+    pub fn new(socket: T, codec: C) -> UdpFramed<C, T> {
+        Self {
             socket,
             codec,
             out_addr: SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), 0)),
             rd: BytesMut::with_capacity(INITIAL_RD_CAPACITY),
             wr: BytesMut::with_capacity(INITIAL_WR_CAPACITY),
             flushed: true,
+            is_readable: false,
+            current_addr: None,
         }
     }
 
@@ -158,24 +196,51 @@
     /// Care should be taken to not tamper with the underlying stream of data
     /// coming in as it may corrupt the stream of frames otherwise being worked
     /// with.
-    pub fn get_ref(&self) -> &UdpSocket {
+    pub fn get_ref(&self) -> &T {
         &self.socket
     }
 
-    /// Returns a mutable reference to the underlying I/O stream wrapped by
-    /// `Framed`.
+    /// Returns a mutable reference to the underlying I/O stream wrapped by `Framed`.
     ///
     /// # Note
     ///
     /// Care should be taken to not tamper with the underlying stream of data
     /// coming in as it may corrupt the stream of frames otherwise being worked
     /// with.
-    pub fn get_mut(&mut self) -> &mut UdpSocket {
+    pub fn get_mut(&mut self) -> &mut T {
         &mut self.socket
     }
 
+    /// Returns a reference to the underlying codec wrapped by
+    /// `Framed`.
+    ///
+    /// Note that care should be taken to not tamper with the underlying codec
+    /// as it may corrupt the stream of frames otherwise being worked with.
+    pub fn codec(&self) -> &C {
+        &self.codec
+    }
+
+    /// Returns a mutable reference to the underlying codec wrapped by
+    /// `UdpFramed`.
+    ///
+    /// Note that care should be taken to not tamper with the underlying codec
+    /// as it may corrupt the stream of frames otherwise being worked with.
+    pub fn codec_mut(&mut self) -> &mut C {
+        &mut self.codec
+    }
+
+    /// Returns a reference to the read buffer.
+    pub fn read_buffer(&self) -> &BytesMut {
+        &self.rd
+    }
+
+    /// Returns a mutable reference to the read buffer.
+    pub fn read_buffer_mut(&mut self) -> &mut BytesMut {
+        &mut self.rd
+    }
+
     /// Consumes the `Framed`, returning its underlying I/O stream.
-    pub fn into_inner(self) -> UdpSocket {
+    pub fn into_inner(self) -> T {
         self.socket
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/udp/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/udp/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/src/udp/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/src/udp/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
 //! UDP framing
 
 mod frame;
-pub use self::frame::UdpFramed;
+pub use frame::UdpFramed;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/codecs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/codecs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/codecs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/codecs.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 #![warn(rust_2018_idioms)]
 
-use tokio_util::codec::{BytesCodec, Decoder, Encoder, LinesCodec};
+use tokio_util::codec::{AnyDelimiterCodec, BytesCodec, Decoder, Encoder, LinesCodec};
 
 use bytes::{BufMut, Bytes, BytesMut};
 
@@ -201,7 +201,26 @@
     buf.put_slice(b"aa");
     assert!(codec.decode(buf).is_err());
     buf.put_slice(b"a");
+    assert_eq!(None, codec.decode(buf).unwrap());
+}
+
+// Regression test for [subsequent calls to LinesCodec decode does not return the desired results bug](https://github.com/tokio-rs/tokio/issues/3555)
+#[test]
+fn lines_decoder_max_length_underrun_twice() {
+    const MAX_LENGTH: usize = 11;
+
+    let mut codec = LinesCodec::new_with_max_length(MAX_LENGTH);
+    let buf = &mut BytesMut::new();
+
+    buf.reserve(200);
+    buf.put_slice(b"line ");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b"too very l");
     assert!(codec.decode(buf).is_err());
+    buf.put_slice(b"aaaaaaaaaaaaaaaaaaaaaaa");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b"ong\nshort\n");
+    assert_eq!("short", codec.decode(buf).unwrap().unwrap());
 }
 
 #[test]
@@ -215,3 +234,228 @@
     codec.encode("line 2", &mut buf).unwrap();
     assert_eq!("line 1\nline 2\n", buf);
 }
+
+#[test]
+fn any_delimiters_decoder_any_character() {
+    let mut codec = AnyDelimiterCodec::new(b",;\n\r".to_vec(), b",".to_vec());
+    let buf = &mut BytesMut::new();
+    buf.reserve(200);
+    buf.put_slice(b"chunk 1,chunk 2;chunk 3\n\r");
+    assert_eq!("chunk 1", codec.decode(buf).unwrap().unwrap());
+    assert_eq!("chunk 2", codec.decode(buf).unwrap().unwrap());
+    assert_eq!("chunk 3", codec.decode(buf).unwrap().unwrap());
+    assert_eq!("", codec.decode(buf).unwrap().unwrap());
+    assert_eq!(None, codec.decode(buf).unwrap());
+    assert_eq!(None, codec.decode_eof(buf).unwrap());
+    buf.put_slice(b"k");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    assert_eq!("k", codec.decode_eof(buf).unwrap().unwrap());
+    assert_eq!(None, codec.decode(buf).unwrap());
+    assert_eq!(None, codec.decode_eof(buf).unwrap());
+}
+
+#[test]
+fn any_delimiters_decoder_max_length() {
+    const MAX_LENGTH: usize = 7;
+
+    let mut codec =
+        AnyDelimiterCodec::new_with_max_length(b",;\n\r".to_vec(), b",".to_vec(), MAX_LENGTH);
+    let buf = &mut BytesMut::new();
+
+    buf.reserve(200);
+    buf.put_slice(b"chunk 1 is too long\nchunk 2\nchunk 3\r\nchunk 4\n\r\n");
+
+    assert!(codec.decode(buf).is_err());
+
+    let chunk = codec.decode(buf).unwrap().unwrap();
+    assert!(
+        chunk.len() <= MAX_LENGTH,
+        "{:?}.len() <= {:?}",
+        chunk,
+        MAX_LENGTH
+    );
+    assert_eq!("chunk 2", chunk);
+
+    let chunk = codec.decode(buf).unwrap().unwrap();
+    assert!(
+        chunk.len() <= MAX_LENGTH,
+        "{:?}.len() <= {:?}",
+        chunk,
+        MAX_LENGTH
+    );
+    assert_eq!("chunk 3", chunk);
+
+    // \r\n cause empty chunk
+    let chunk = codec.decode(buf).unwrap().unwrap();
+    assert!(
+        chunk.len() <= MAX_LENGTH,
+        "{:?}.len() <= {:?}",
+        chunk,
+        MAX_LENGTH
+    );
+    assert_eq!("", chunk);
+
+    let chunk = codec.decode(buf).unwrap().unwrap();
+    assert!(
+        chunk.len() <= MAX_LENGTH,
+        "{:?}.len() <= {:?}",
+        chunk,
+        MAX_LENGTH
+    );
+    assert_eq!("chunk 4", chunk);
+
+    let chunk = codec.decode(buf).unwrap().unwrap();
+    assert!(
+        chunk.len() <= MAX_LENGTH,
+        "{:?}.len() <= {:?}",
+        chunk,
+        MAX_LENGTH
+    );
+    assert_eq!("", chunk);
+
+    let chunk = codec.decode(buf).unwrap().unwrap();
+    assert!(
+        chunk.len() <= MAX_LENGTH,
+        "{:?}.len() <= {:?}",
+        chunk,
+        MAX_LENGTH
+    );
+    assert_eq!("", chunk);
+
+    assert_eq!(None, codec.decode(buf).unwrap());
+    assert_eq!(None, codec.decode_eof(buf).unwrap());
+    buf.put_slice(b"k");
+    assert_eq!(None, codec.decode(buf).unwrap());
+
+    let chunk = codec.decode_eof(buf).unwrap().unwrap();
+    assert!(
+        chunk.len() <= MAX_LENGTH,
+        "{:?}.len() <= {:?}",
+        chunk,
+        MAX_LENGTH
+    );
+    assert_eq!("k", chunk);
+
+    assert_eq!(None, codec.decode(buf).unwrap());
+    assert_eq!(None, codec.decode_eof(buf).unwrap());
+
+    // Delimiter that's one character too long. This could cause an out of bounds
+    // error if we peek at the next characters using slice indexing.
+    buf.put_slice(b"aaabbbcc");
+    assert!(codec.decode(buf).is_err());
+}
+
+#[test]
+fn any_delimiter_decoder_max_length_underrun() {
+    const MAX_LENGTH: usize = 7;
+
+    let mut codec =
+        AnyDelimiterCodec::new_with_max_length(b",;\n\r".to_vec(), b",".to_vec(), MAX_LENGTH);
+    let buf = &mut BytesMut::new();
+
+    buf.reserve(200);
+    buf.put_slice(b"chunk ");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b"too l");
+    assert!(codec.decode(buf).is_err());
+    buf.put_slice(b"ong\n");
+    assert_eq!(None, codec.decode(buf).unwrap());
+
+    buf.put_slice(b"chunk 2");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b",");
+    assert_eq!("chunk 2", codec.decode(buf).unwrap().unwrap());
+}
+
+#[test]
+fn any_delimiter_decoder_max_length_underrun_twice() {
+    const MAX_LENGTH: usize = 11;
+
+    let mut codec =
+        AnyDelimiterCodec::new_with_max_length(b",;\n\r".to_vec(), b",".to_vec(), MAX_LENGTH);
+    let buf = &mut BytesMut::new();
+
+    buf.reserve(200);
+    buf.put_slice(b"chunk ");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b"too very l");
+    assert!(codec.decode(buf).is_err());
+    buf.put_slice(b"aaaaaaaaaaaaaaaaaaaaaaa");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b"ong\nshort\n");
+    assert_eq!("short", codec.decode(buf).unwrap().unwrap());
+}
+#[test]
+fn any_delimiter_decoder_max_length_bursts() {
+    const MAX_LENGTH: usize = 11;
+
+    let mut codec =
+        AnyDelimiterCodec::new_with_max_length(b",;\n\r".to_vec(), b",".to_vec(), MAX_LENGTH);
+    let buf = &mut BytesMut::new();
+
+    buf.reserve(200);
+    buf.put_slice(b"chunk ");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b"too l");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b"ong\n");
+    assert!(codec.decode(buf).is_err());
+}
+
+#[test]
+fn any_delimiter_decoder_max_length_big_burst() {
+    const MAX_LENGTH: usize = 11;
+
+    let mut codec =
+        AnyDelimiterCodec::new_with_max_length(b",;\n\r".to_vec(), b",".to_vec(), MAX_LENGTH);
+    let buf = &mut BytesMut::new();
+
+    buf.reserve(200);
+    buf.put_slice(b"chunk ");
+    assert_eq!(None, codec.decode(buf).unwrap());
+    buf.put_slice(b"too long!\n");
+    assert!(codec.decode(buf).is_err());
+}
+
+#[test]
+fn any_delimiter_decoder_max_length_delimiter_between_decodes() {
+    const MAX_LENGTH: usize = 5;
+
+    let mut codec =
+        AnyDelimiterCodec::new_with_max_length(b",;\n\r".to_vec(), b",".to_vec(), MAX_LENGTH);
+    let buf = &mut BytesMut::new();
+
+    buf.reserve(200);
+    buf.put_slice(b"hello");
+    assert_eq!(None, codec.decode(buf).unwrap());
+
+    buf.put_slice(b",world");
+    assert_eq!("hello", codec.decode(buf).unwrap().unwrap());
+}
+
+#[test]
+fn any_delimiter_decoder_discard_repeat() {
+    const MAX_LENGTH: usize = 1;
+
+    let mut codec =
+        AnyDelimiterCodec::new_with_max_length(b",;\n\r".to_vec(), b",".to_vec(), MAX_LENGTH);
+    let buf = &mut BytesMut::new();
+
+    buf.reserve(200);
+    buf.put_slice(b"aa");
+    assert!(codec.decode(buf).is_err());
+    buf.put_slice(b"a");
+    assert_eq!(None, codec.decode(buf).unwrap());
+}
+
+#[test]
+fn any_delimiter_encoder() {
+    let mut codec = AnyDelimiterCodec::new(b",".to_vec(), b";--;".to_vec());
+    let mut buf = BytesMut::new();
+
+    codec.encode("chunk 1", &mut buf).unwrap();
+    assert_eq!("chunk 1;--;", buf);
+
+    codec.encode("chunk 2", &mut buf).unwrap();
+    assert_eq!("chunk 1;--;chunk 2;--;", buf);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/context.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/context.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/context.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/context.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+#![cfg(feature = "rt")]
+#![warn(rust_2018_idioms)]
+
+use tokio::runtime::Builder;
+use tokio::time::*;
+use tokio_util::context::RuntimeExt;
+
+#[test]
+fn tokio_context_with_another_runtime() {
+    let rt1 = Builder::new_multi_thread()
+        .worker_threads(1)
+        // no timer!
+        .build()
+        .unwrap();
+    let rt2 = Builder::new_multi_thread()
+        .worker_threads(1)
+        .enable_all()
+        .build()
+        .unwrap();
+
+    // Without the `HandleExt.wrap()` there would be a panic because there is
+    // no timer running, since it would be referencing runtime r1.
+    let _ = rt1.block_on(rt2.wrap(async move { sleep(Duration::from_millis(2)).await }));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/framed_read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/framed_read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/framed_read.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/framed_read.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 #![warn(rust_2018_idioms)]
 
-use tokio::io::AsyncRead;
+use tokio::io::{AsyncRead, ReadBuf};
 use tokio_test::assert_ready;
 use tokio_test::task;
 use tokio_util::codec::{Decoder, FramedRead};
@@ -185,8 +185,8 @@
 #[test]
 fn huge_size() {
     let mut task = task::spawn(());
-    let data = [0; 32 * 1024];
-    let mut framed = FramedRead::new(Slice(&data[..]), BigDecoder);
+    let data = &[0; 32 * 1024][..];
+    let mut framed = FramedRead::new(data, BigDecoder);
 
     task.enter(|cx, _| {
         assert_read!(pin!(framed).poll_next(cx), 0);
@@ -212,7 +212,7 @@
 #[test]
 fn data_remaining_is_error() {
     let mut task = task::spawn(());
-    let slice = Slice(&[0; 5]);
+    let slice = &[0; 5][..];
     let mut framed = FramedRead::new(slice, U32Decoder);
 
     task.enter(|cx, _| {
@@ -254,6 +254,29 @@
     });
 }
 
+#[test]
+fn read_eof_then_resume() {
+    let mut task = task::spawn(());
+    let mock = mock! {
+        Ok(b"\x00\x00\x00\x01".to_vec()),
+        Ok(b"".to_vec()),
+        Ok(b"\x00\x00\x00\x02".to_vec()),
+        Ok(b"".to_vec()),
+        Ok(b"\x00\x00\x00\x03".to_vec()),
+    };
+    let mut framed = FramedRead::new(mock, U32Decoder);
+
+    task.enter(|cx, _| {
+        assert_read!(pin!(framed).poll_next(cx), 1);
+        assert!(assert_ready!(pin!(framed).poll_next(cx)).is_none());
+        assert_read!(pin!(framed).poll_next(cx), 2);
+        assert!(assert_ready!(pin!(framed).poll_next(cx)).is_none());
+        assert_read!(pin!(framed).poll_next(cx), 3);
+        assert!(assert_ready!(pin!(framed).poll_next(cx)).is_none());
+        assert!(assert_ready!(pin!(framed).poll_next(cx)).is_none());
+    });
+}
+
 // ===== Mock ======
 
 struct Mock {
@@ -264,32 +287,19 @@
     fn poll_read(
         mut self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         use io::ErrorKind::WouldBlock;
 
         match self.calls.pop_front() {
             Some(Ok(data)) => {
-                debug_assert!(buf.len() >= data.len());
-                buf[..data.len()].copy_from_slice(&data[..]);
-                Ready(Ok(data.len()))
+                debug_assert!(buf.remaining() >= data.len());
+                buf.put_slice(&data);
+                Ready(Ok(()))
             }
             Some(Err(ref e)) if e.kind() == WouldBlock => Pending,
             Some(Err(e)) => Ready(Err(e)),
-            None => Ready(Ok(0)),
+            None => Ready(Ok(())),
         }
     }
 }
-
-// TODO this newtype is necessary because `&[u8]` does not currently implement `AsyncRead`
-struct Slice<'a>(&'a [u8]);
-
-impl AsyncRead for Slice<'_> {
-    fn poll_read(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_read(cx, buf)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/framed.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/framed.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/framed.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/framed.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 #![warn(rust_2018_idioms)]
 
-use tokio::{prelude::*, stream::StreamExt};
+use tokio_stream::StreamExt;
 use tokio_test::assert_ok;
 use tokio_util::codec::{Decoder, Encoder, Framed, FramedParts};
 
@@ -51,12 +51,12 @@
     }
 }
 
-impl AsyncRead for DontReadIntoThis {
+impl tokio::io::AsyncRead for DontReadIntoThis {
     fn poll_read(
         self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
-        _buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        _buf: &mut tokio::io::ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         unreachable!()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/io_reader_stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/io_reader_stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/io_reader_stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/io_reader_stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,65 @@
+#![warn(rust_2018_idioms)]
+
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use tokio::io::{AsyncRead, ReadBuf};
+use tokio_stream::StreamExt;
+
+/// produces at most `remaining` zeros, that returns error.
+/// each time it reads at most 31 byte.
+struct Reader {
+    remaining: usize,
+}
+
+impl AsyncRead for Reader {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        _cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
+        let this = Pin::into_inner(self);
+        assert_ne!(buf.remaining(), 0);
+        if this.remaining > 0 {
+            let n = std::cmp::min(this.remaining, buf.remaining());
+            let n = std::cmp::min(n, 31);
+            for x in &mut buf.initialize_unfilled_to(n)[..n] {
+                *x = 0;
+            }
+            buf.advance(n);
+            this.remaining -= n;
+            Poll::Ready(Ok(()))
+        } else {
+            Poll::Ready(Err(std::io::Error::from_raw_os_error(22)))
+        }
+    }
+}
+
+#[tokio::test]
+async fn correct_behavior_on_errors() {
+    let reader = Reader { remaining: 8000 };
+    let mut stream = tokio_util::io::ReaderStream::new(reader);
+    let mut zeros_received = 0;
+    let mut had_error = false;
+    loop {
+        let item = stream.next().await.unwrap();
+        println!("{:?}", item);
+        match item {
+            Ok(bytes) => {
+                let bytes = &*bytes;
+                for byte in bytes {
+                    assert_eq!(*byte, 0);
+                    zeros_received += 1;
+                }
+            }
+            Err(_) => {
+                assert!(!had_error);
+                had_error = true;
+                break;
+            }
+        }
+    }
+
+    assert!(had_error);
+    assert_eq!(zeros_received, 8000);
+    assert!(stream.next().await.is_none());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/io_stream_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/io_stream_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/io_stream_reader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/io_stream_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,35 @@
+#![warn(rust_2018_idioms)]
+
+use bytes::Bytes;
+use tokio::io::AsyncReadExt;
+use tokio_stream::iter;
+use tokio_util::io::StreamReader;
+
+#[tokio::test]
+async fn test_stream_reader() -> std::io::Result<()> {
+    let stream = iter(vec![
+        std::io::Result::Ok(Bytes::from_static(&[])),
+        Ok(Bytes::from_static(&[0, 1, 2, 3])),
+        Ok(Bytes::from_static(&[])),
+        Ok(Bytes::from_static(&[4, 5, 6, 7])),
+        Ok(Bytes::from_static(&[])),
+        Ok(Bytes::from_static(&[8, 9, 10, 11])),
+        Ok(Bytes::from_static(&[])),
+    ]);
+
+    let mut read = StreamReader::new(stream);
+
+    let mut buf = [0; 5];
+    read.read_exact(&mut buf).await?;
+    assert_eq!(buf, [0, 1, 2, 3, 4]);
+
+    assert_eq!(read.read(&mut buf).await?, 3);
+    assert_eq!(&buf[..3], [5, 6, 7]);
+
+    assert_eq!(read.read(&mut buf).await?, 4);
+    assert_eq!(&buf[..4], [8, 9, 10, 11]);
+
+    assert_eq!(read.read(&mut buf).await?, 0);
+
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/length_delimited.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/length_delimited.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/length_delimited.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/length_delimited.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 #![warn(rust_2018_idioms)]
 
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio_test::task;
 use tokio_test::{
     assert_err, assert_ok, assert_pending, assert_ready, assert_ready_err, assert_ready_ok,
@@ -373,6 +373,25 @@
 }
 
 #[test]
+fn read_single_frame_length_adjusted() {
+    let mut d: Vec<u8> = vec![];
+    d.extend_from_slice(b"\x00\x00\x0b\x0cHello world");
+
+    let io = length_delimited::Builder::new()
+        .length_field_offset(0)
+        .length_field_length(3)
+        .length_adjustment(0)
+        .num_skip(4)
+        .new_read(mock! {
+            data(&d),
+        });
+    pin_mut!(io);
+
+    assert_next_eq!(io, b"Hello world");
+    assert_done!(io);
+}
+
+#[test]
 fn read_single_multi_frame_one_packet_length_includes_head() {
     let mut d: Vec<u8> = vec![];
     d.extend_from_slice(b"\x00\x0babcdefghi");
@@ -688,18 +707,18 @@
     fn poll_read(
         mut self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
-        dst: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        dst: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         match self.calls.pop_front() {
             Some(Ready(Ok(Op::Data(data)))) => {
-                debug_assert!(dst.len() >= data.len());
-                dst[..data.len()].copy_from_slice(&data[..]);
-                Ready(Ok(data.len()))
+                debug_assert!(dst.remaining() >= data.len());
+                dst.put_slice(&data);
+                Ready(Ok(()))
             }
             Some(Ready(Ok(_))) => panic!(),
             Some(Ready(Err(e))) => Ready(Err(e)),
             Some(Pending) => Pending,
-            None => Ready(Ok(0)),
+            None => Ready(Ok(())),
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/mpsc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/mpsc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/mpsc.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/mpsc.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,95 @@
+use futures::future::poll_fn;
+use tokio::sync::mpsc::channel;
+use tokio_test::task::spawn;
+use tokio_test::{assert_pending, assert_ready, assert_ready_err, assert_ready_ok};
+use tokio_util::sync::PollSender;
+
+#[tokio::test]
+async fn test_simple() {
+    let (send, mut recv) = channel(3);
+    let mut send = PollSender::new(send);
+
+    for i in 1..=3i32 {
+        send.start_send(i).unwrap();
+        assert_ready_ok!(spawn(poll_fn(|cx| send.poll_send_done(cx))).poll());
+    }
+
+    send.start_send(4).unwrap();
+    let mut fourth_send = spawn(poll_fn(|cx| send.poll_send_done(cx)));
+    assert_pending!(fourth_send.poll());
+    assert_eq!(recv.recv().await.unwrap(), 1);
+    assert!(fourth_send.is_woken());
+    assert_ready_ok!(fourth_send.poll());
+
+    drop(recv);
+
+    // Here, start_send is not guaranteed to fail, but if it doesn't the first
+    // call to poll_send_done should.
+    if send.start_send(5).is_ok() {
+        assert_ready_err!(spawn(poll_fn(|cx| send.poll_send_done(cx))).poll());
+    }
+}
+
+#[tokio::test]
+async fn test_abort() {
+    let (send, mut recv) = channel(3);
+    let mut send = PollSender::new(send);
+    let send2 = send.clone_inner().unwrap();
+
+    for i in 1..=3i32 {
+        send.start_send(i).unwrap();
+        assert_ready_ok!(spawn(poll_fn(|cx| send.poll_send_done(cx))).poll());
+    }
+
+    send.start_send(4).unwrap();
+    {
+        let mut fourth_send = spawn(poll_fn(|cx| send.poll_send_done(cx)));
+        assert_pending!(fourth_send.poll());
+        assert_eq!(recv.recv().await.unwrap(), 1);
+        assert!(fourth_send.is_woken());
+    }
+
+    let mut send2_send = spawn(send2.send(5));
+    assert_pending!(send2_send.poll());
+    send.abort_send();
+    assert!(send2_send.is_woken());
+    assert_ready_ok!(send2_send.poll());
+
+    assert_eq!(recv.recv().await.unwrap(), 2);
+    assert_eq!(recv.recv().await.unwrap(), 3);
+    assert_eq!(recv.recv().await.unwrap(), 5);
+}
+
+#[tokio::test]
+async fn close_sender_last() {
+    let (send, mut recv) = channel::<i32>(3);
+    let mut send = PollSender::new(send);
+
+    let mut recv_task = spawn(recv.recv());
+    assert_pending!(recv_task.poll());
+
+    send.close_this_sender();
+
+    assert!(recv_task.is_woken());
+    assert!(assert_ready!(recv_task.poll()).is_none());
+}
+
+#[tokio::test]
+async fn close_sender_not_last() {
+    let (send, mut recv) = channel::<i32>(3);
+    let send2 = send.clone();
+    let mut send = PollSender::new(send);
+
+    let mut recv_task = spawn(recv.recv());
+    assert_pending!(recv_task.poll());
+
+    send.close_this_sender();
+
+    assert!(!recv_task.is_woken());
+    assert_pending!(recv_task.poll());
+
+    drop(send2);
+
+    assert!(recv_task.is_woken());
+    assert!(assert_ready!(recv_task.poll()).is_none());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/poll_semaphore.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/poll_semaphore.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/poll_semaphore.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/poll_semaphore.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+use std::future::Future;
+use std::sync::Arc;
+use std::task::Poll;
+use tokio::sync::{OwnedSemaphorePermit, Semaphore};
+use tokio_util::sync::PollSemaphore;
+
+type SemRet = Option<OwnedSemaphorePermit>;
+
+fn semaphore_poll<'a>(
+    sem: &'a mut PollSemaphore,
+) -> tokio_test::task::Spawn<impl Future<Output = SemRet> + 'a> {
+    let fut = futures::future::poll_fn(move |cx| sem.poll_acquire(cx));
+    tokio_test::task::spawn(fut)
+}
+
+#[tokio::test]
+async fn it_works() {
+    let sem = Arc::new(Semaphore::new(1));
+    let mut poll_sem = PollSemaphore::new(sem.clone());
+
+    let permit = sem.acquire().await.unwrap();
+    let mut poll = semaphore_poll(&mut poll_sem);
+    assert!(poll.poll().is_pending());
+    drop(permit);
+
+    assert!(matches!(poll.poll(), Poll::Ready(Some(_))));
+    drop(poll);
+
+    sem.close();
+
+    assert!(semaphore_poll(&mut poll_sem).await.is_none());
+
+    // Check that it is fused.
+    assert!(semaphore_poll(&mut poll_sem).await.is_none());
+    assert!(semaphore_poll(&mut poll_sem).await.is_none());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/_require_full.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/_require_full.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/_require_full.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/_require_full.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2 @@
+#![cfg(not(feature = "full"))]
+compile_error!("run tokio-util tests with `--features full`");
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/reusable_box.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/reusable_box.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/reusable_box.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/reusable_box.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,72 @@
+use futures::future::FutureExt;
+use std::alloc::Layout;
+use std::future::Future;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use tokio_util::sync::ReusableBoxFuture;
+
+#[test]
+fn test_different_futures() {
+    let fut = async move { 10 };
+    // Not zero sized!
+    assert_eq!(Layout::for_value(&fut).size(), 1);
+
+    let mut b = ReusableBoxFuture::new(fut);
+
+    assert_eq!(b.get_pin().now_or_never(), Some(10));
+
+    b.try_set(async move { 20 })
+        .unwrap_or_else(|_| panic!("incorrect size"));
+
+    assert_eq!(b.get_pin().now_or_never(), Some(20));
+
+    b.try_set(async move { 30 })
+        .unwrap_or_else(|_| panic!("incorrect size"));
+
+    assert_eq!(b.get_pin().now_or_never(), Some(30));
+}
+
+#[test]
+fn test_different_sizes() {
+    let fut1 = async move { 10 };
+    let val = [0u32; 1000];
+    let fut2 = async move { val[0] };
+    let fut3 = ZeroSizedFuture {};
+
+    assert_eq!(Layout::for_value(&fut1).size(), 1);
+    assert_eq!(Layout::for_value(&fut2).size(), 4004);
+    assert_eq!(Layout::for_value(&fut3).size(), 0);
+
+    let mut b = ReusableBoxFuture::new(fut1);
+    assert_eq!(b.get_pin().now_or_never(), Some(10));
+    b.set(fut2);
+    assert_eq!(b.get_pin().now_or_never(), Some(0));
+    b.set(fut3);
+    assert_eq!(b.get_pin().now_or_never(), Some(5));
+}
+
+struct ZeroSizedFuture {}
+impl Future for ZeroSizedFuture {
+    type Output = u32;
+    fn poll(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<u32> {
+        Poll::Ready(5)
+    }
+}
+
+#[test]
+fn test_zero_sized() {
+    let fut = ZeroSizedFuture {};
+    // Zero sized!
+    assert_eq!(Layout::for_value(&fut).size(), 0);
+
+    let mut b = ReusableBoxFuture::new(fut);
+
+    assert_eq!(b.get_pin().now_or_never(), Some(5));
+    assert_eq!(b.get_pin().now_or_never(), Some(5));
+
+    b.try_set(ZeroSizedFuture {})
+        .unwrap_or_else(|_| panic!("incorrect size"));
+
+    assert_eq!(b.get_pin().now_or_never(), Some(5));
+    assert_eq!(b.get_pin().now_or_never(), Some(5));
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/sync_cancellation_token.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/sync_cancellation_token.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/sync_cancellation_token.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/sync_cancellation_token.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,220 @@
+#![warn(rust_2018_idioms)]
+
+use tokio::pin;
+use tokio_util::sync::CancellationToken;
+
+use core::future::Future;
+use core::task::{Context, Poll};
+use futures_test::task::new_count_waker;
+
+#[test]
+fn cancel_token() {
+    let (waker, wake_counter) = new_count_waker();
+    let token = CancellationToken::new();
+    assert_eq!(false, token.is_cancelled());
+
+    let wait_fut = token.cancelled();
+    pin!(wait_fut);
+
+    assert_eq!(
+        Poll::Pending,
+        wait_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(wake_counter, 0);
+
+    let wait_fut_2 = token.cancelled();
+    pin!(wait_fut_2);
+
+    token.cancel();
+    assert_eq!(wake_counter, 1);
+    assert_eq!(true, token.is_cancelled());
+
+    assert_eq!(
+        Poll::Ready(()),
+        wait_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(
+        Poll::Ready(()),
+        wait_fut_2.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+}
+
+#[test]
+fn cancel_child_token_through_parent() {
+    let (waker, wake_counter) = new_count_waker();
+    let token = CancellationToken::new();
+
+    let child_token = token.child_token();
+    assert!(!child_token.is_cancelled());
+
+    let child_fut = child_token.cancelled();
+    pin!(child_fut);
+    let parent_fut = token.cancelled();
+    pin!(parent_fut);
+
+    assert_eq!(
+        Poll::Pending,
+        child_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(
+        Poll::Pending,
+        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(wake_counter, 0);
+
+    token.cancel();
+    assert_eq!(wake_counter, 2);
+    assert_eq!(true, token.is_cancelled());
+    assert_eq!(true, child_token.is_cancelled());
+
+    assert_eq!(
+        Poll::Ready(()),
+        child_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(
+        Poll::Ready(()),
+        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+}
+
+#[test]
+fn cancel_child_token_without_parent() {
+    let (waker, wake_counter) = new_count_waker();
+    let token = CancellationToken::new();
+
+    let child_token_1 = token.child_token();
+
+    let child_fut = child_token_1.cancelled();
+    pin!(child_fut);
+    let parent_fut = token.cancelled();
+    pin!(parent_fut);
+
+    assert_eq!(
+        Poll::Pending,
+        child_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(
+        Poll::Pending,
+        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(wake_counter, 0);
+
+    child_token_1.cancel();
+    assert_eq!(wake_counter, 1);
+    assert_eq!(false, token.is_cancelled());
+    assert_eq!(true, child_token_1.is_cancelled());
+
+    assert_eq!(
+        Poll::Ready(()),
+        child_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(
+        Poll::Pending,
+        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+
+    let child_token_2 = token.child_token();
+    let child_fut_2 = child_token_2.cancelled();
+    pin!(child_fut_2);
+
+    assert_eq!(
+        Poll::Pending,
+        child_fut_2.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(
+        Poll::Pending,
+        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+
+    token.cancel();
+    assert_eq!(wake_counter, 3);
+    assert_eq!(true, token.is_cancelled());
+    assert_eq!(true, child_token_2.is_cancelled());
+
+    assert_eq!(
+        Poll::Ready(()),
+        child_fut_2.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+    assert_eq!(
+        Poll::Ready(()),
+        parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
+    );
+}
+
+#[test]
+fn create_child_token_after_parent_was_cancelled() {
+    for drop_child_first in [true, false].iter().cloned() {
+        let (waker, wake_counter) = new_count_waker();
+        let token = CancellationToken::new();
+        token.cancel();
+
+        let child_token = token.child_token();
+        assert!(child_token.is_cancelled());
+
+        {
+            let child_fut = child_token.cancelled();
+            pin!(child_fut);
+            let parent_fut = token.cancelled();
+            pin!(parent_fut);
+
+            assert_eq!(
+                Poll::Ready(()),
+                child_fut.as_mut().poll(&mut Context::from_waker(&waker))
+            );
+            assert_eq!(
+                Poll::Ready(()),
+                parent_fut.as_mut().poll(&mut Context::from_waker(&waker))
+            );
+            assert_eq!(wake_counter, 0);
+
+            drop(child_fut);
+            drop(parent_fut);
+        }
+
+        if drop_child_first {
+            drop(child_token);
+            drop(token);
+        } else {
+            drop(token);
+            drop(child_token);
+        }
+    }
+}
+
+#[test]
+fn drop_multiple_child_tokens() {
+    for drop_first_child_first in &[true, false] {
+        let token = CancellationToken::new();
+        let mut child_tokens = [None, None, None];
+        for child in &mut child_tokens {
+            *child = Some(token.child_token());
+        }
+
+        assert!(!token.is_cancelled());
+        assert!(!child_tokens[0].as_ref().unwrap().is_cancelled());
+
+        for i in 0..child_tokens.len() {
+            if *drop_first_child_first {
+                child_tokens[i] = None;
+            } else {
+                child_tokens[child_tokens.len() - 1 - i] = None;
+            }
+            assert!(!token.is_cancelled());
+        }
+
+        drop(token);
+    }
+}
+
+#[test]
+fn drop_parent_before_child_tokens() {
+    let token = CancellationToken::new();
+    let child1 = token.child_token();
+    let child2 = token.child_token();
+
+    drop(token);
+    assert!(!child1.is_cancelled());
+
+    drop(child1);
+    drop(child2);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/time_delay_queue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/time_delay_queue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/time_delay_queue.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/time_delay_queue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,635 @@
+#![allow(clippy::blacklisted_name)]
+#![warn(rust_2018_idioms)]
+#![cfg(feature = "full")]
+
+use tokio::time::{self, sleep, sleep_until, Duration, Instant};
+use tokio_test::{assert_ok, assert_pending, assert_ready, task};
+use tokio_util::time::DelayQueue;
+
+macro_rules! poll {
+    ($queue:ident) => {
+        $queue.enter(|cx, mut queue| queue.poll_expired(cx))
+    };
+}
+
+macro_rules! assert_ready_ok {
+    ($e:expr) => {{
+        assert_ok!(match assert_ready!($e) {
+            Some(v) => v,
+            None => panic!("None"),
+        })
+    }};
+}
+
+#[tokio::test]
+async fn single_immediate_delay() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+    let _key = queue.insert_at("foo", Instant::now());
+
+    // Advance time by 1ms to handle thee rounding
+    sleep(ms(1)).await;
+
+    assert_ready_ok!(poll!(queue));
+
+    let entry = assert_ready!(poll!(queue));
+    assert!(entry.is_none())
+}
+
+#[tokio::test]
+async fn multi_immediate_delays() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let _k = queue.insert_at("1", Instant::now());
+    let _k = queue.insert_at("2", Instant::now());
+    let _k = queue.insert_at("3", Instant::now());
+
+    sleep(ms(1)).await;
+
+    let mut res = vec![];
+
+    while res.len() < 3 {
+        let entry = assert_ready_ok!(poll!(queue));
+        res.push(entry.into_inner());
+    }
+
+    let entry = assert_ready!(poll!(queue));
+    assert!(entry.is_none());
+
+    res.sort_unstable();
+
+    assert_eq!("1", res[0]);
+    assert_eq!("2", res[1]);
+    assert_eq!("3", res[2]);
+}
+
+#[tokio::test]
+async fn single_short_delay() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+    let _key = queue.insert_at("foo", Instant::now() + ms(5));
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(1)).await;
+
+    assert!(!queue.is_woken());
+
+    sleep(ms(5)).await;
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue));
+    assert_eq!(*entry.get_ref(), "foo");
+
+    let entry = assert_ready!(poll!(queue));
+    assert!(entry.is_none());
+}
+
+#[tokio::test]
+async fn multi_delay_at_start() {
+    time::pause();
+
+    let long = 262_144 + 9 * 4096;
+    let delays = &[1000, 2, 234, long, 60, 10];
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    // Setup the delays
+    for &i in delays {
+        let _key = queue.insert_at(i, Instant::now() + ms(i));
+    }
+
+    assert_pending!(poll!(queue));
+    assert!(!queue.is_woken());
+
+    let start = Instant::now();
+    for elapsed in 0..1200 {
+        let elapsed = elapsed + 1;
+        tokio::time::sleep_until(start + ms(elapsed)).await;
+
+        if delays.contains(&elapsed) {
+            assert!(queue.is_woken());
+            assert_ready!(poll!(queue));
+            assert_pending!(poll!(queue));
+        } else if queue.is_woken() {
+            let cascade = &[192, 960];
+            assert!(
+                cascade.contains(&elapsed),
+                "elapsed={} dt={:?}",
+                elapsed,
+                Instant::now() - start
+            );
+
+            assert_pending!(poll!(queue));
+        }
+    }
+}
+
+#[tokio::test]
+async fn insert_in_past_fires_immediately() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+    let now = Instant::now();
+
+    sleep(ms(10)).await;
+
+    queue.insert_at("foo", now);
+
+    assert_ready!(poll!(queue));
+}
+
+#[tokio::test]
+async fn remove_entry() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let key = queue.insert_at("foo", Instant::now() + ms(5));
+
+    assert_pending!(poll!(queue));
+
+    let entry = queue.remove(&key);
+    assert_eq!(entry.into_inner(), "foo");
+
+    sleep(ms(10)).await;
+
+    let entry = assert_ready!(poll!(queue));
+    assert!(entry.is_none());
+}
+
+#[tokio::test]
+async fn reset_entry() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+    let key = queue.insert_at("foo", now + ms(5));
+
+    assert_pending!(poll!(queue));
+    sleep(ms(1)).await;
+
+    queue.reset_at(&key, now + ms(10));
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(7)).await;
+
+    assert!(!queue.is_woken());
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(3)).await;
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue));
+    assert_eq!(*entry.get_ref(), "foo");
+
+    let entry = assert_ready!(poll!(queue));
+    assert!(entry.is_none())
+}
+
+// Reproduces tokio-rs/tokio#849.
+#[tokio::test]
+async fn reset_much_later() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+    sleep(ms(1)).await;
+
+    let key = queue.insert_at("foo", now + ms(200));
+    assert_pending!(poll!(queue));
+
+    sleep(ms(3)).await;
+
+    queue.reset_at(&key, now + ms(10));
+
+    sleep(ms(20)).await;
+
+    assert!(queue.is_woken());
+}
+
+// Reproduces tokio-rs/tokio#849.
+#[tokio::test]
+async fn reset_twice() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+    let now = Instant::now();
+
+    sleep(ms(1)).await;
+
+    let key = queue.insert_at("foo", now + ms(200));
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(3)).await;
+
+    queue.reset_at(&key, now + ms(50));
+
+    sleep(ms(20)).await;
+
+    queue.reset_at(&key, now + ms(40));
+
+    sleep(ms(20)).await;
+
+    assert!(queue.is_woken());
+}
+
+/// Regression test: Given an entry inserted with a deadline in the past, so
+/// that it is placed directly on the expired queue, reset the entry to a
+/// deadline in the future. Validate that this leaves the entry and queue in an
+/// internally consistent state by running an additional reset on the entry
+/// before polling it to completion.
+#[tokio::test]
+async fn repeatedly_reset_entry_inserted_as_expired() {
+    time::pause();
+    let mut queue = task::spawn(DelayQueue::new());
+    let now = Instant::now();
+
+    let key = queue.insert_at("foo", now - ms(100));
+
+    queue.reset_at(&key, now + ms(100));
+    queue.reset_at(&key, now + ms(50));
+
+    assert_pending!(poll!(queue));
+
+    time::sleep_until(now + ms(60)).await;
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "foo");
+
+    let entry = assert_ready!(poll!(queue));
+    assert!(entry.is_none());
+}
+
+#[tokio::test]
+async fn remove_expired_item() {
+    time::pause();
+
+    let mut queue = DelayQueue::new();
+
+    let now = Instant::now();
+
+    sleep(ms(10)).await;
+
+    let key = queue.insert_at("foo", now);
+
+    let entry = queue.remove(&key);
+    assert_eq!(entry.into_inner(), "foo");
+}
+
+/// Regression test: it should be possible to remove entries which fall in the
+/// 0th slot of the internal timer wheel — that is, entries whose expiration
+/// (a) falls at the beginning of one of the wheel's hierarchical levels and (b)
+/// is equal to the wheel's current elapsed time.
+#[tokio::test]
+async fn remove_at_timer_wheel_threshold() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    let key1 = queue.insert_at("foo", now + ms(64));
+    let key2 = queue.insert_at("bar", now + ms(64));
+
+    sleep(ms(80)).await;
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+
+    match entry {
+        "foo" => {
+            let entry = queue.remove(&key2).into_inner();
+            assert_eq!(entry, "bar");
+        }
+        "bar" => {
+            let entry = queue.remove(&key1).into_inner();
+            assert_eq!(entry, "foo");
+        }
+        other => panic!("other: {:?}", other),
+    }
+}
+
+#[tokio::test]
+async fn expires_before_last_insert() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    queue.insert_at("foo", now + ms(10_000));
+
+    // Delay should be set to 8.192s here.
+    assert_pending!(poll!(queue));
+
+    // Delay should be set to the delay of the new item here
+    queue.insert_at("bar", now + ms(600));
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(600)).await;
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "bar");
+}
+
+#[tokio::test]
+async fn multi_reset() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    let one = queue.insert_at("one", now + ms(200));
+    let two = queue.insert_at("two", now + ms(250));
+
+    assert_pending!(poll!(queue));
+
+    queue.reset_at(&one, now + ms(300));
+    queue.reset_at(&two, now + ms(350));
+    queue.reset_at(&one, now + ms(400));
+
+    sleep(ms(310)).await;
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(50)).await;
+
+    let entry = assert_ready_ok!(poll!(queue));
+    assert_eq!(*entry.get_ref(), "two");
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(50)).await;
+
+    let entry = assert_ready_ok!(poll!(queue));
+    assert_eq!(*entry.get_ref(), "one");
+
+    let entry = assert_ready!(poll!(queue));
+    assert!(entry.is_none())
+}
+
+#[tokio::test]
+async fn expire_first_key_when_reset_to_expire_earlier() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    let one = queue.insert_at("one", now + ms(200));
+    queue.insert_at("two", now + ms(250));
+
+    assert_pending!(poll!(queue));
+
+    queue.reset_at(&one, now + ms(100));
+
+    sleep(ms(100)).await;
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "one");
+}
+
+#[tokio::test]
+async fn expire_second_key_when_reset_to_expire_earlier() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    queue.insert_at("one", now + ms(200));
+    let two = queue.insert_at("two", now + ms(250));
+
+    assert_pending!(poll!(queue));
+
+    queue.reset_at(&two, now + ms(100));
+
+    sleep(ms(100)).await;
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "two");
+}
+
+#[tokio::test]
+async fn reset_first_expiring_item_to_expire_later() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    let one = queue.insert_at("one", now + ms(200));
+    let _two = queue.insert_at("two", now + ms(250));
+
+    assert_pending!(poll!(queue));
+
+    queue.reset_at(&one, now + ms(300));
+    sleep(ms(250)).await;
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "two");
+}
+
+#[tokio::test]
+async fn insert_before_first_after_poll() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    let _one = queue.insert_at("one", now + ms(200));
+
+    assert_pending!(poll!(queue));
+
+    let _two = queue.insert_at("two", now + ms(100));
+
+    sleep(ms(99)).await;
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(1)).await;
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "two");
+}
+
+#[tokio::test]
+async fn insert_after_ready_poll() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    queue.insert_at("1", now + ms(100));
+    queue.insert_at("2", now + ms(100));
+    queue.insert_at("3", now + ms(100));
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(100)).await;
+
+    assert!(queue.is_woken());
+
+    let mut res = vec![];
+
+    while res.len() < 3 {
+        let entry = assert_ready_ok!(poll!(queue));
+        res.push(entry.into_inner());
+        queue.insert_at("foo", now + ms(500));
+    }
+
+    res.sort_unstable();
+
+    assert_eq!("1", res[0]);
+    assert_eq!("2", res[1]);
+    assert_eq!("3", res[2]);
+}
+
+#[tokio::test]
+async fn reset_later_after_slot_starts() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    let foo = queue.insert_at("foo", now + ms(100));
+
+    assert_pending!(poll!(queue));
+
+    sleep_until(now + Duration::from_millis(80)).await;
+
+    assert!(!queue.is_woken());
+
+    // At this point the queue hasn't been polled, so `elapsed` on the wheel
+    // for the queue is still at 0 and hence the 1ms resolution slots cover
+    // [0-64).  Resetting the time on the entry to 120 causes it to get put in
+    // the [64-128) slot.  As the queue knows that the first entry is within
+    // that slot, but doesn't know when, it must wake immediately to advance
+    // the wheel.
+    queue.reset_at(&foo, now + ms(120));
+    assert!(queue.is_woken());
+
+    assert_pending!(poll!(queue));
+
+    sleep_until(now + Duration::from_millis(119)).await;
+    assert!(!queue.is_woken());
+
+    sleep(ms(1)).await;
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "foo");
+}
+
+#[tokio::test]
+async fn reset_inserted_expired() {
+    time::pause();
+    let mut queue = task::spawn(DelayQueue::new());
+    let now = Instant::now();
+
+    let key = queue.insert_at("foo", now - ms(100));
+
+    // this causes the panic described in #2473
+    queue.reset_at(&key, now + ms(100));
+
+    assert_eq!(1, queue.len());
+
+    sleep(ms(200)).await;
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "foo");
+
+    assert_eq!(queue.len(), 0);
+}
+
+#[tokio::test]
+async fn reset_earlier_after_slot_starts() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    let foo = queue.insert_at("foo", now + ms(200));
+
+    assert_pending!(poll!(queue));
+
+    sleep_until(now + Duration::from_millis(80)).await;
+
+    assert!(!queue.is_woken());
+
+    // At this point the queue hasn't been polled, so `elapsed` on the wheel
+    // for the queue is still at 0 and hence the 1ms resolution slots cover
+    // [0-64).  Resetting the time on the entry to 120 causes it to get put in
+    // the [64-128) slot.  As the queue knows that the first entry is within
+    // that slot, but doesn't know when, it must wake immediately to advance
+    // the wheel.
+    queue.reset_at(&foo, now + ms(120));
+    assert!(queue.is_woken());
+
+    assert_pending!(poll!(queue));
+
+    sleep_until(now + Duration::from_millis(119)).await;
+    assert!(!queue.is_woken());
+
+    sleep(ms(1)).await;
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "foo");
+}
+
+#[tokio::test]
+async fn insert_in_past_after_poll_fires_immediately() {
+    time::pause();
+
+    let mut queue = task::spawn(DelayQueue::new());
+
+    let now = Instant::now();
+
+    queue.insert_at("foo", now + ms(200));
+
+    assert_pending!(poll!(queue));
+
+    sleep(ms(80)).await;
+
+    assert!(!queue.is_woken());
+    queue.insert_at("bar", now + ms(40));
+
+    assert!(queue.is_woken());
+
+    let entry = assert_ready_ok!(poll!(queue)).into_inner();
+    assert_eq!(entry, "bar");
+}
+
+fn ms(n: u64) -> Duration {
+    Duration::from_millis(n)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/udp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/udp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tokio-util/tests/udp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tokio-util/tests/udp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,8 @@
-use tokio::{net::UdpSocket, stream::StreamExt};
-use tokio_util::codec::{Decoder, Encoder};
+#![warn(rust_2018_idioms)]
+
+use tokio::net::UdpSocket;
+use tokio_stream::StreamExt;
+use tokio_util::codec::{Decoder, Encoder, LinesCodec};
 use tokio_util::udp::UdpFramed;
 
 use bytes::{BufMut, BytesMut};
@@ -7,10 +10,11 @@
 use futures::future::FutureExt;
 use futures::sink::SinkExt;
 use std::io;
+use std::sync::Arc;
 
 #[cfg_attr(any(target_os = "macos", target_os = "ios"), allow(unused_assignments))]
 #[tokio::test]
-async fn send_framed() -> std::io::Result<()> {
+async fn send_framed_byte_codec() -> std::io::Result<()> {
     let mut a_soc = UdpSocket::bind("127.0.0.1:0").await?;
     let mut b_soc = UdpSocket::bind("127.0.0.1:0").await?;
 
@@ -77,3 +81,52 @@
         Ok(())
     }
 }
+
+#[tokio::test]
+async fn send_framed_lines_codec() -> std::io::Result<()> {
+    let a_soc = UdpSocket::bind("127.0.0.1:0").await?;
+    let b_soc = UdpSocket::bind("127.0.0.1:0").await?;
+
+    let a_addr = a_soc.local_addr()?;
+    let b_addr = b_soc.local_addr()?;
+
+    let mut a = UdpFramed::new(a_soc, ByteCodec);
+    let mut b = UdpFramed::new(b_soc, LinesCodec::new());
+
+    let msg = b"1\r\n2\r\n3\r\n".to_vec();
+    a.send((&msg, b_addr)).await?;
+
+    assert_eq!(b.next().await.unwrap().unwrap(), ("1".to_string(), a_addr));
+    assert_eq!(b.next().await.unwrap().unwrap(), ("2".to_string(), a_addr));
+    assert_eq!(b.next().await.unwrap().unwrap(), ("3".to_string(), a_addr));
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn framed_half() -> std::io::Result<()> {
+    let a_soc = Arc::new(UdpSocket::bind("127.0.0.1:0").await?);
+    let b_soc = a_soc.clone();
+
+    let a_addr = a_soc.local_addr()?;
+    let b_addr = b_soc.local_addr()?;
+
+    let mut a = UdpFramed::new(a_soc, ByteCodec);
+    let mut b = UdpFramed::new(b_soc, LinesCodec::new());
+
+    let msg = b"1\r\n2\r\n3\r\n".to_vec();
+    a.send((&msg, b_addr)).await?;
+
+    let msg = b"4\r\n5\r\n6\r\n".to_vec();
+    a.send((&msg, b_addr)).await?;
+
+    assert_eq!(b.next().await.unwrap().unwrap(), ("1".to_string(), a_addr));
+    assert_eq!(b.next().await.unwrap().unwrap(), ("2".to_string(), a_addr));
+    assert_eq!(b.next().await.unwrap().unwrap(), ("3".to_string(), a_addr));
+
+    assert_eq!(b.next().await.unwrap().unwrap(), ("4".to_string(), a_addr));
+    assert_eq!(b.next().await.unwrap().unwrap(), ("5".to_string(), a_addr));
+    assert_eq!(b.next().await.unwrap().unwrap(), ("6".to_string(), a_addr));
+
+    Ok(())
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"f27f052f43dce93f155dd4ed266b839bf248362b397c4257d522a03deccd677d","Cargo.toml":"5faca0916e798cd3dc035b976aabdc551e3a470242a0f6a4a2b3260fd4b2afe3","LICENSE":"4249c8e6c5ebb85f97c77e6457c6fafc1066406eb8f1ef61e796fbdc5ff18482","README.md":"7960fa603065260070c6f538f7e521f6829794e823080c29041e30a9c95970d9","src/lib.rs":"35582b17016726fbc69688d20d946143e541855b47e04b9efc65a90baa91d515"},"package":"e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"a202a1d257e8b3def187b371f26a47161afae5804040d7ad43d344809d1d1674","Cargo.toml":"09b0ebd19eac7f2185ac817da8d3877dea0725502d1ad1bbb96ea4fdf2621b42","LICENSE":"4249c8e6c5ebb85f97c77e6457c6fafc1066406eb8f1ef61e796fbdc5ff18482","README.md":"da9cb4815bf06e0991df6bf4e9f46272e26115dcc4e2c8f9ffc05e11d486179e","src/lib.rs":"d24ae2a7f7e075372839fddd13f833268d8e9ff8ffa3ca7aa1bf00e18fb57b80"},"package":"360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,16 +13,25 @@
 [package]
 edition = "2018"
 name = "tower-service"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Tower Maintainers <team@tower-rs.com>"]
 description = "Trait representing an asynchronous, request / response based, client or server.\n"
 homepage = "https://github.com/tower-rs/tower"
-documentation = "https://docs.rs/tower-service/0.3.0"
+documentation = "https://docs.rs/tower-service/0.3.1"
 readme = "README.md"
 categories = ["asynchronous", "network-programming"]
 license = "MIT"
 repository = "https://github.com/tower-rs/tower"
 
 [dependencies]
+[dev-dependencies.futures]
+version = "0.3"
+
 [dev-dependencies.http]
-version = "0.1"
+version = "0.2"
+
+[dev-dependencies.tokio]
+version = "1"
+
+[dev-dependencies.tower-layer]
+version = "0.3"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,11 @@
+# Unreleased
+
+# 0.3.1 (November 29, 2019)
+
+- Improve example in `Service` docs. ([#510])
+
+[#510]: https://github.com/tower-rs/tower/pull/510
+
 # 0.3.0 (November 29, 2019)
 
 - Update to `futures 0.3`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,30 @@
 # Tower Service
 
-The foundational `Service` trait that Tower is based on.
+The foundational `Service` trait that [Tower] is based on.
+
+[![Crates.io][crates-badge]][crates-url]
+[![Documentation][docs-badge]][docs-url]
+[![Documentation (master)][docs-master-badge]][docs-master-url]
+[![MIT licensed][mit-badge]][mit-url]
+[![Build Status][actions-badge]][actions-url]
+[![Discord chat][discord-badge]][discord-url]
+
+[crates-badge]: https://img.shields.io/crates/v/tower-service.svg
+[crates-url]: https://crates.io/crates/tower-service
+[docs-badge]: https://docs.rs/tower-service/badge.svg
+[docs-url]: https://docs.rs/tower-service
+[docs-master-badge]: https://img.shields.io/badge/docs-master-blue
+[docs-master-url]: https://tower-rs.github.io/tower/tower_service
+[mit-badge]: https://img.shields.io/badge/license-MIT-blue.svg
+[mit-url]: LICENSE
+[actions-badge]: https://github.com/tower-rs/tower/workflows/CI/badge.svg
+[actions-url]:https://github.com/tower-rs/tower/actions?query=workflow%3ACI
+[discord-badge]: https://img.shields.io/discord/500028886025895936?logo=discord&label=discord&logoColor=white
+[discord-url]: https://discord.gg/EeF3cQw
 
 ## Overview
 
-The [`Service`] trait provides the foundation upon which Tower is built. It is a
+The [`Service`] trait provides the foundation upon which [Tower] is built. It is a
 simple, but powerful trait. At its heart, `Service` is just an asynchronous
 function of request to response.
 
@@ -24,7 +44,7 @@
 middleware may take actions such as modify the request.
 
 [`Service`]: https://docs.rs/tower-service/latest/tower_service/trait.Service.html
-
+[Tower]: https://crates.io/crates/tower
 ## License
 
 This project is licensed under the [MIT license](LICENSE).
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tower-service/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tower-service/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,11 @@
-#![doc(html_root_url = "https://docs.rs/tower-service/0.3.0")]
+#![doc(html_root_url = "https://docs.rs/tower-service/0.3.1")]
 #![warn(
     missing_debug_implementations,
     missing_docs,
     rust_2018_idioms,
     unreachable_pub
 )]
+#![deny(broken_intra_doc_links)]
 
 //! Definition of the core `Service` trait to Tower
 //!
@@ -46,7 +47,6 @@
 /// # use std::task::{Poll, Context};
 /// # use std::future::Future;
 /// # use tower_service::Service;
-///
 /// use http::{Request, Response, StatusCode};
 ///
 /// struct HelloWorld;
@@ -70,7 +70,7 @@
 ///             .status(StatusCode::OK)
 ///             .body(body)
 ///             .expect("Unable to create `http::Response`");
-///         
+///
 ///         // create a response in a future.
 ///         let fut = async {
 ///             Ok(resp)
@@ -111,7 +111,7 @@
 ///
 /// Take timeouts as an example:
 ///
-/// ```rust,ignore
+/// ```rust
 /// use tower_service::Service;
 /// use tower_layer::Layer;
 /// use futures::FutureExt;
@@ -119,17 +119,16 @@
 /// use std::task::{Context, Poll};
 /// use std::time::Duration;
 /// use std::pin::Pin;
+/// use std::fmt;
+/// use std::error::Error;
 ///
-///
+/// // Our timeout service, which wraps another service and
+/// // adds a timeout to its response future.
 /// pub struct Timeout<T> {
 ///     inner: T,
 ///     timeout: Duration,
 /// }
 ///
-/// pub struct TimeoutLayer(Duration);
-///
-/// pub struct Expired;
-///
 /// impl<T> Timeout<T> {
 ///     pub fn new(inner: T, timeout: Duration) -> Timeout<T> {
 ///         Timeout {
@@ -139,48 +138,84 @@
 ///     }
 /// }
 ///
+/// // The error returned if processing a request timed out
+/// #[derive(Debug)]
+/// pub struct Expired;
+///
+/// impl fmt::Display for Expired {
+///     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+///         write!(f, "expired")
+///     }
+/// }
+///
+/// impl Error for Expired {}
+///
+/// // We can implement `Service` for `Timeout<T>` if `T` is a `Service`
 /// impl<T, Request> Service<Request> for Timeout<T>
 /// where
 ///     T: Service<Request>,
 ///     T::Future: 'static,
-///     T::Error: From<Expired> + 'static,
-///     T::Response: 'static
+///     T::Error: Into<Box<dyn Error + Send + Sync>> + 'static,
+///     T::Response: 'static,
 /// {
+///     // `Timeout` doesn't modify the response type, so we use `T`'s response type
 ///     type Response = T::Response;
-///     type Error = T::Error;
+///     // Errors may be either `Expired` if the timeout expired, or the inner service's
+///     // `Error` type. Therefore, we return a boxed `dyn Error + Send + Sync` trait object to erase
+///     // the error's type.
+///     type Error = Box<dyn Error + Send + Sync>;
 ///     type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>>>>;
 ///
 ///     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+///         // Our timeout service is ready if the inner service is ready.
+///         // This is how backpressure can be propagated through a tree of nested services.
 ///        self.inner.poll_ready(cx).map_err(Into::into)
 ///     }
 ///
 ///     fn call(&mut self, req: Request) -> Self::Future {
-///         let timeout = tokio_timer::delay_for(self.timeout)
-///             .map(|_| Err(Self::Error::from(Expired)));
+///         // Create a future that completes after `self.timeout`
+///         let timeout = tokio::time::sleep(self.timeout);
+///
+///         // Call the inner service and get a future that resolves to the response
+///         let fut = self.inner.call(req);
 ///
-///         let fut = Box::pin(self.inner.call(req));
-///         let f = futures::select(fut, timeout)
-///             .map(|either| either.factor_first().0);
+///         // Wrap those two futures in another future that completes when either one completes
+///         //
+///         // If the inner service is too slow the `sleep` future will complete first
+///         // And an error will be returned and `fut` will be dropped and not polled again
+///         //
+///         // We have to box the errors so the types match
+///         let f = async move {
+///             tokio::select! {
+///                 res = fut => {
+///                     res.map_err(|err| err.into())
+///                 },
+///                 _ = timeout => {
+///                     Err(Box::new(Expired) as Box<dyn Error + Send + Sync>)
+///                 },
+///             }
+///         };
 ///
 ///         Box::pin(f)
 ///     }
 /// }
 ///
+/// // A layer for wrapping services in `Timeout`
+/// pub struct TimeoutLayer(Duration);
+///
 /// impl TimeoutLayer {
 ///     pub fn new(delay: Duration) -> Self {
 ///         TimeoutLayer(delay)
 ///     }
 /// }
 ///
-/// impl<S> Layer<S> for TimeoutLayer
-/// {
+/// impl<S> Layer<S> for TimeoutLayer {
 ///     type Service = Timeout<S>;
 ///
 ///     fn layer(&self, service: S) -> Timeout<S> {
 ///         Timeout::new(service, self.0)
 ///     }
 /// }
-///
 /// ```
 ///
 /// The above timeout implementation is decoupled from the underlying protocol
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"c10928b768694439a84a3a2f55c494e4c22def90d05073c6410d6ab5213a8d9e","Cargo.toml":"43f730c8da76c66f5956df24e7520b3834eebbd8d39abe123ed4829bf26b952d","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"51b28c82dbee63ef93f99e89936c28815dc41d3d3aab8692cd5f3da0a2085bb7","benches/no_subscriber.rs":"799c293113c78255e1cb45eec3656ee85c0f8910458bc3412f3175c44c2bff46","benches/subscriber.rs":"066a69119ffc8dc5ccf2801b0d75fb73cbd563dbaadb824121b9a68301a68a4e","src/dispatcher.rs":"8279c019ecceae81e47407323cebe8f7a017abbf4fd6b5314fb88b7b1c9ec26e","src/field.rs":"f5537ea28cc98850a27f86dc6b937e8baff40869b8999b17751ae3f559500ab0","src/instrument.rs":"fe0a173f404b970f0ce78785f151f56a8f53ded97a9ac56214864f7670527a9d","src/level_filters.rs":"8b81db76629b00a802b40a91f4a617b97a6f78b3d9fda233b6d9ec99ecb4bb8a","src/lib.rs":"d9cddbbedbbc08e7e3a7117ca1755ed2ef895c705734e74e3e46d6a7135cb2d6","src/macros.rs":"aba201cd59e0ff119794b1af6774db678d556e18ddedb4a39415680e8fc20fdb","src/span.rs":"24304f752eb893aa912bcf73ac748f6df679327d5a75ba4a052bc91349e1c3b4","src/stdlib.rs":"248514a9bae6106e436358aee44c92abf8e7f79022895c4a25136ddef211d198","src/subscriber.rs":"4d489dfa55b29db439b447bb42eedd5fa030579634b9f403603afb0055fb9371","tests/event.rs":"7c043893e2ec6202906043ac0a2b9433b53ba6156b59afdd264bf4b9e38fc712","tests/filter_caching_is_lexically_scoped.rs":"0845255a0cf0b3288f8d641fd7d72277051b759fdbce6ff24e266523219ee68c","tests/filters_are_not_reevaluated_for_the_same_span.rs":"d3287dabe73e321870128e87b4084e20548ec18964004cd73cc3ca6383b73c26","tests/filters_are_reevaluated_for_different_call_sites.rs":"98c891a0ebd8c2297c9f4a38a7a0406b0a55757f99cc0deea968929d2a998092","tests/filters_dont_leak.rs":"f302ea2ba976f32400206b81a8de6110aa53a4d4555cd4c284242d0417220dab","tests/macro_imports.rs":"d5de857162185d4a2384f3cb644bfcf76c7f5c1a3b5f72bfa0d2620ac6e3873c","tests/macros.rs":"846a3ce9fbd3f781000b8557485b5dc99f8ff89915e602d4e0c17e3775a50627","tests/max_level_hint.rs":"973124e340f6250ecb2ef8a8e5602623702ddfc75885187b15107accfb378e08","tests/multiple_max_level_hints.rs":"c8339fe81dafdc89ab4a86658be2a44d0ddd70d639522a76cd273f03f563d09c","tests/span.rs":"399615f8a2d8e2f4cce9c63adb0c1f2bbf7eaa70347adb3dc1e4c5ba3522f449","tests/subscriber.rs":"51035f71f9642dea4c5b9348691d47611b1d77fe78dd217931187f7b7549e5db","tests/support/event.rs":"ffcfa68f305782b393bb30ac4514308751757d2d81001ef5e774588141b595db","tests/support/field.rs":"bc221de91feb5f6705fedf1440fb6fccc5d7e1e0906c8a8d01a3029b1af77054","tests/support/metadata.rs":"408f9cb169e7a9330f1db0db25bdff7eaa8580143c99b3aca0d3653d8e155ea8","tests/support/mod.rs":"c67ea2e17f9cf8642069972ee6b02acd23e6d782a4382b57828810d3130de24d","tests/support/span.rs":"769690c93c2766a7a3ba683c59c41ccbd24e183d14e8151f028960785918e636","tests/support/subscriber.rs":"8c24fbb0e96bb3d3d03c0cd3f8b344bf78cbb4e946878f4d3c3a75107cd53b0d"},"package":"9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"994d1d6d1061eba7d0ff62f11975a3377680cb026b791eadade891b579d117c6","Cargo.toml":"7beae48fd4100e655c74d8fbb333e860e77732ab9bf20aa4fdcf23430e4ab9ae","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"31773bd4677fa057fdb303bed0d91ef152844bf022d0f275d20369fab2b66a74","benches/no_subscriber.rs":"799c293113c78255e1cb45eec3656ee85c0f8910458bc3412f3175c44c2bff46","benches/subscriber.rs":"066a69119ffc8dc5ccf2801b0d75fb73cbd563dbaadb824121b9a68301a68a4e","src/dispatcher.rs":"8279c019ecceae81e47407323cebe8f7a017abbf4fd6b5314fb88b7b1c9ec26e","src/field.rs":"f5537ea28cc98850a27f86dc6b937e8baff40869b8999b17751ae3f559500ab0","src/instrument.rs":"fe0a173f404b970f0ce78785f151f56a8f53ded97a9ac56214864f7670527a9d","src/level_filters.rs":"b763c481137d2f46d9cf82616cb2dc0eb493c205ee8638ae8948ae3478ea2580","src/lib.rs":"6b28fc527a5290d0762509c2f13d35654448f3a86f4c06c78e87e6949ffc485b","src/macros.rs":"bf739ba70ccd2c42699b5d83cd3c2699d3c58da632ccd3b51fd5c25ef9ea7da6","src/span.rs":"2b7b8716dcc12b1e796bdc62957e2eac038d6bb0b80a36dfcf53713c7283b8c7","src/stdlib.rs":"248514a9bae6106e436358aee44c92abf8e7f79022895c4a25136ddef211d198","src/subscriber.rs":"4d489dfa55b29db439b447bb42eedd5fa030579634b9f403603afb0055fb9371","tests/event.rs":"7c043893e2ec6202906043ac0a2b9433b53ba6156b59afdd264bf4b9e38fc712","tests/filter_caching_is_lexically_scoped.rs":"0845255a0cf0b3288f8d641fd7d72277051b759fdbce6ff24e266523219ee68c","tests/filters_are_not_reevaluated_for_the_same_span.rs":"d3287dabe73e321870128e87b4084e20548ec18964004cd73cc3ca6383b73c26","tests/filters_are_reevaluated_for_different_call_sites.rs":"98c891a0ebd8c2297c9f4a38a7a0406b0a55757f99cc0deea968929d2a998092","tests/filters_dont_leak.rs":"f302ea2ba976f32400206b81a8de6110aa53a4d4555cd4c284242d0417220dab","tests/macro_imports.rs":"d5de857162185d4a2384f3cb644bfcf76c7f5c1a3b5f72bfa0d2620ac6e3873c","tests/macros.rs":"5a5891cf694c9e652da01695483fd0ca761ef109336071b0866d4047a5f23502","tests/max_level_hint.rs":"973124e340f6250ecb2ef8a8e5602623702ddfc75885187b15107accfb378e08","tests/multiple_max_level_hints.rs":"c8339fe81dafdc89ab4a86658be2a44d0ddd70d639522a76cd273f03f563d09c","tests/span.rs":"140c009514db18ab0fe2d4d183fd81f9cb20267bd332ae6d60d957431e8f2c51","tests/subscriber.rs":"757cd6a8c589c600ccb6a0c08497636d3a23150929aab7fa36f2cfcef17817ce","tests/support/event.rs":"ffcfa68f305782b393bb30ac4514308751757d2d81001ef5e774588141b595db","tests/support/field.rs":"29716ea10fb1c219b0ae3134005aff6b22c01a2549ddfdafa5134133f3e729f7","tests/support/metadata.rs":"408f9cb169e7a9330f1db0db25bdff7eaa8580143c99b3aca0d3653d8e155ea8","tests/support/mod.rs":"c67ea2e17f9cf8642069972ee6b02acd23e6d782a4382b57828810d3130de24d","tests/support/span.rs":"7a9296d3c88a568c9d1115a28c7186625b3bb5abfeffc02e578ef884b5a8dd80","tests/support/subscriber.rs":"727eeb5c325653c6aea9adb8862dd4b0b3ddcfd02baa4ab6d91ba79eecf09e48"},"package":"09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "tracing"
-version = "0.1.22"
+version = "0.1.26"
 authors = ["Eliza Weisman <eliza@buoyant.io>", "Tokio Contributors <team@tokio.rs>"]
 description = "Application-level tracing for Rust.\n"
 homepage = "https://tokio.rs"
@@ -44,11 +44,11 @@
 version = "0.2"
 
 [dependencies.tracing-attributes]
-version = "0.1.10"
+version = "0.1.15"
 optional = true
 
 [dependencies.tracing-core]
-version = "0.1.17"
+version = "0.1.18"
 default-features = false
 [dev-dependencies.criterion]
 version = "0.3"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,99 @@
+# 0.1.26 (April 30, 2021)
+
+### Fixed
+
+- **attributes**: Compatibility between `#[instrument]` and `async-trait`
+  v0.1.43 and newer ([#1228])
+- Several documentation fixes ([#1305], [#1344])
+### Added
+
+- `Subscriber` impl for `Box<dyn Subscriber + Send + Sync + 'static>` ([#1358])
+- `Subscriber` impl for `Arc<dyn Subscriber + Send + Sync + 'static>` ([#1374])
+- Symmetric `From` impls for existing `Into` impls on `span::Current`, `Span`,
+  and `Option<Id>` ([#1335], [#1338])
+- `From<EnteredSpan>` implementation for `Option<Id>`, allowing `EnteredSpan` to
+  be used in a `span!` macro's `parent:` field ([#1325])
+- `Attributes::fields` accessor that returns the set of fields defined on a
+  span's `Attributes` ([#1331])
+
+
+Thanks to @Folyd, @nightmared, and new contributors @rmsc and @Fishrock123 for
+contributing to this release!
+
+[#1227]: https://github.com/tokio-rs/tracing/pull/1228
+[#1305]: https://github.com/tokio-rs/tracing/pull/1305
+[#1325]: https://github.com/tokio-rs/tracing/pull/1325
+[#1338]: https://github.com/tokio-rs/tracing/pull/1338
+[#1344]: https://github.com/tokio-rs/tracing/pull/1344
+[#1358]: https://github.com/tokio-rs/tracing/pull/1358
+[#1374]: https://github.com/tokio-rs/tracing/pull/1374
+[#1335]: https://github.com/tokio-rs/tracing/pull/1335
+[#1331]: https://github.com/tokio-rs/tracing/pull/1331
+
+# 0.1.25 (February 23, 2021)
+
+### Added
+
+- `Span::entered` method for entering a span and moving it into a guard by value
+  rather than borrowing it ([#1252])
+
+Thanks to @matklad for contributing to this release!
+
+[#1252]: https://github.com/tokio-rs/tracing/pull/1252
+
+# 0.1.24 (February 17, 2021)
+
+### Fixed
+
+- **attributes**: Compiler error when using `#[instrument(err)]` on functions
+  which return `impl Trait` ([#1236])
+- Fixed broken match arms in event macros ([#1239])
+- Documentation improvements ([#1232])
+
+Thanks to @bkchr and @lfranke for contributing to this release!
+
+[#1236]: https://github.com/tokio-rs/tracing/pull/1236
+[#1239]: https://github.com/tokio-rs/tracing/pull/1239
+[#1232]: https://github.com/tokio-rs/tracing/pull/1232
+
+# 0.1.23 (February 4, 2021)
+
+### Fixed
+
+- **attributes**: Compiler error when using `#[instrument(err)]` on functions
+  with mutable parameters ([#1167])
+- **attributes**: Missing function visibility modifier when using
+  `#[instrument]` with `async-trait` ([#977])
+- **attributes** Removed unused `syn` features ([#928])
+- **log**: Fixed an issue where the `tracing` macros would generate code for
+  events whose levels are disabled statically by the `log` crate's
+  `static_max_level_XXX` features ([#1175])
+- Fixed deprecations and clippy lints ([#1195])
+- Several documentation fixes and improvements ([#941], [#965], [#981], [#1146],
+  [#1215])
+  
+### Changed
+
+- **attributes**: `tracing-futures` dependency is no longer required when using
+  `#[instrument]` on async functions ([#808])
+- **attributes**: Updated `tracing-attributes` minimum dependency to v0.1.12
+  ([#1222])
+
+Thanks to @nagisa, @Txuritan, @TaKO8Ki, @okready, and @krojew for contributing
+to this release!
+
+[#1167]: https://github.com/tokio-rs/tracing/pull/1167
+[#977]: https://github.com/tokio-rs/tracing/pull/977
+[#965]: https://github.com/tokio-rs/tracing/pull/965
+[#981]: https://github.com/tokio-rs/tracing/pull/981
+[#1215]: https://github.com/tokio-rs/tracing/pull/1215
+[#808]: https://github.com/tokio-rs/tracing/pull/808
+[#941]: https://github.com/tokio-rs/tracing/pull/941
+[#1146]: https://github.com/tokio-rs/tracing/pull/1146
+[#1175]: https://github.com/tokio-rs/tracing/pull/1175
+[#1195]: https://github.com/tokio-rs/tracing/pull/1195
+[#1222]: https://github.com/tokio-rs/tracing/pull/1222
+
 # 0.1.22 (November 23, 2020)
 
 ### Changed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -16,9 +16,9 @@
 [Documentation][docs-url] | [Chat][discord-url]
 
 [crates-badge]: https://img.shields.io/crates/v/tracing.svg
-[crates-url]: https://crates.io/crates/tracing/0.1.22
+[crates-url]: https://crates.io/crates/tracing/0.1.26
 [docs-badge]: https://docs.rs/tracing/badge.svg
-[docs-url]: https://docs.rs/tracing/0.1.22
+[docs-url]: https://docs.rs/tracing/0.1.26
 [docs-master-badge]: https://img.shields.io/badge/docs-master-blue
 [docs-master-url]: https://tracing-rs.netlify.com/tracing
 [mit-badge]: https://img.shields.io/badge/license-MIT-blue.svg
@@ -108,7 +108,7 @@
 
 ```rust
 use tracing::{info, Level};
-use tracing_subscruber::FmtSubscriber;
+use tracing_subscriber::FmtSubscriber;
 
 fn main() {
     let subscriber = tracing_subscriber::FmtSubscriber::builder()
@@ -174,8 +174,7 @@
     //
     // local variables (`yaks`) can be used as field values
     // without an assignment, similar to struct initializers.
-    let span = span!(Level::TRACE, "shaving_yaks", yaks);
-    let _enter = span.enter();
+    let _span_ = span!(Level::TRACE, "shaving_yaks", yaks).entered();
 
     info!("shaving yaks");
 
@@ -212,7 +211,7 @@
 [`std::future::Future`](https://doc.rust-lang.org/stable/std/future/trait.Future.html)
 or async/await, be sure to use the
 [`tracing-futures`](https://docs.rs/tracing-futures) crate. This is needed
-because the following example _will not_ work:
+because the following examples _will not_ work:
 
 ```rust
 async {
@@ -220,6 +219,12 @@
     // ...
 }
 ```
+```rust
+async {
+    let _s = tracing::span!(...).entered();
+    // ...
+}
+```
 
 The span guard `_s` will not exit until the future generated by the `async` block is complete.
 Since futures and spans can be entered and exited _multiple_ times without them completing,
@@ -246,7 +251,7 @@
 is as long as the future's.
 
 The second, and preferred, option is through the
-[`#[instrument]`](https://docs.rs/tracing/0.1.22/tracing/attr.instrument.html)
+[`#[instrument]`](https://docs.rs/tracing/0.1.26/tracing/attr.instrument.html)
 attribute:
 
 ```rust
@@ -293,7 +298,7 @@
 // Dropping the span will close it, indicating that it has ended.
 ```
 
-The [`#[instrument]`](https://docs.rs/tracing/0.1.22/tracing/attr.instrument.html) attribute macro
+The [`#[instrument]`](https://docs.rs/tracing/0.1.26/tracing/attr.instrument.html) attribute macro
 can reduce some of this boilerplate:
 
 ```rust
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/src/level_filters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/src/level_filters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/src/level_filters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/src/level_filters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,10 +33,23 @@
 //! [dependencies]
 //! tracing = { version = "0.1", features = ["max_level_debug", "release_max_level_warn"] }
 //! ```
+//! ## Notes
 //!
-//! *Compiler support: requires rustc 1.39+*
+//! Please note that `tracing`'s static max level features do *not* control the
+//! [`log`] records that may be emitted when [`tracing`'s "log" feature flag][f] is
+//! enabled. This is to allow `tracing` to be disabled entirely at compile time
+//! while still emitting `log` records --- such as when a library using
+//! `tracing` is used by an application using `log` that doesn't want to
+//! generate any `tracing`-related code, but does want to collect `log` records.
 //!
-//! [`log` crate]: https://docs.rs/log/0.4.6/log/#compile-time-filters
+//! This means that if the "log" feature is in use, some code may be generated
+//! for `log` records emitted by disabled `tracing` events. If this is not
+//! desirable, `log` records may be disabled separately using [`log`'s static
+//! max level features][`log` crate].
+//!
+//! [`log`]: https://docs.rs/log/
+//! [`log` crate]: https://docs.rs/log/latest/log/#compile-time-filters
+//! [f]: https://docs.rs/tracing/latest/tracing/#emitting-log-records
 pub use tracing_core::{metadata::ParseLevelFilterError, LevelFilter};
 
 /// The statically configured maximum trace level.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -173,6 +173,25 @@
 //! # fn main() {}
 //! ```
 //!
+//! For functions which don't have built-in tracing support and can't have
+//! the `#[instrument]` attribute applied (such as from an external crate,
+//! the [`Span` struct][`Span`] has a [`in_scope()` method][`in_scope`]
+//! which can be used to easily wrap synchonous code in a span.
+//!
+//! For example:
+//! ```rust
+//! use tracing::info_span;
+//!
+//! # fn doc() -> Result<(), ()> {
+//! # mod serde_json {
+//! #    pub(crate) fn from_slice(buf: &[u8]) -> Result<(), ()> { Ok(()) }
+//! # }
+//! # let buf: [u8; 0] = [];
+//! let json = info_span!("json.parse").in_scope(|| serde_json::from_slice(&buf))?;
+//! # let _ = json; // suppress unused variable warning
+//! # Ok(())
+//! # }
+//! ```
 //!
 //! You can find more examples showing how to use this crate [here][examples].
 //!
@@ -192,8 +211,8 @@
 //!
 //! ## Using the Macros
 //!
-//! The [`span!`] and [`event!`] macros use fairly similar syntax, with some
-//! exceptions.
+//! The [`span!`] and [`event!`] macros as well as the `#[instrument]` attribute
+//! use fairly similar syntax, with some exceptions.
 //!
 //! ### Configuring Attributes
 //!
@@ -495,8 +514,7 @@
 //!     //
 //!     // local variables (`yaks`) can be used as field values
 //!     // without an assignment, similar to struct initializers.
-//!     let span = span!(Level::TRACE, "shaving_yaks", yaks);
-//!     let _enter = span.enter();
+//!     let _span = span!(Level::TRACE, "shaving_yaks", yaks).entered();
 //!
 //!     info!("shaving yaks");
 //!
@@ -722,6 +740,7 @@
 //!  - [`diesel-tracing`] provides integration with [`diesel`] database connections.
 //!  - [`tracing-tracy`] provides a way to collect [Tracy] profiles in instrumented
 //!    applications.
+//!  - [`tracing-elastic-apm`] provides a layer for reporting traces to [Elastic APM].
 //!
 //! If you're the maintainer of a `tracing` ecosystem crate not listed above,
 //! please let us know! We'd love to add your project to the list!
@@ -747,6 +766,8 @@
 //! [`diesel-tracing`]: https://crates.io/crates/diesel-tracing
 //! [`tracing-tracy`]: https://crates.io/crates/tracing-tracy
 //! [Tracy]: https://github.com/wolfpld/tracy
+//! [`tracing-elastic-apm`]: https://crates.io/crates/tracing-elastic-apm
+//! [Elastic APM]: https://www.elastic.co/apm
 //!
 //! <div class="information">
 //!     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
@@ -781,7 +802,7 @@
 //!
 //!   ```toml
 //!   [dependencies]
-//!   tracing = { version = "0.1.22", default-features = false }
+//!   tracing = { version = "0.1.26", default-features = false }
 //!   ```
 //!
 //! <div class="information">
@@ -837,7 +858,7 @@
 //! [flags]: #crate-feature-flags
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(docsrs, feature(doc_cfg), deny(broken_intra_doc_links))]
-#![doc(html_root_url = "https://docs.rs/tracing/0.1.22")]
+#![doc(html_root_url = "https://docs.rs/tracing/0.1.26")]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tokio-rs/tracing/master/assets/logo-type.png",
     issue_tracker_base_url = "https://github.com/tokio-rs/tracing/issues/"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/src/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,7 +45,7 @@
                 )
             } else {
                 let span = CALLSITE.disabled_span();
-                $crate::if_log_enabled! {{
+                $crate::if_log_enabled! { $lvl, {
                     span.record_all(&$crate::valueset!(CALLSITE.metadata().fields(), $($fields)*));
                 }};
                 span
@@ -75,7 +75,7 @@
                 )
             } else {
                 let span = CALLSITE.disabled_span();
-                $crate::if_log_enabled! {{
+                $crate::if_log_enabled! { $lvl, {
                     span.record_all(&$crate::valueset!(CALLSITE.metadata().fields(), $($fields)*));
                 }};
                 span
@@ -684,14 +684,6 @@
             { message = format_args!($($arg)+), $($fields)* }
         )
     );
-    (parent: $parent:expr, $lvl:expr, { $($fields:tt)* }, $($arg:tt)+ ) => (
-        $crate::event!(
-            target: module_path!(),
-            $lvl,
-            parent: $parent,
-            { message = format_args!($($arg)+), $($fields)* }
-        )
-    );
     (parent: $parent:expr, $lvl:expr, $($k:ident).+ = $($field:tt)*) => (
         $crate::event!(
             target: module_path!(),
@@ -920,14 +912,14 @@
     (target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, $crate::Level::TRACE, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::TRACE, { $($k).+ $($field)* })
     );
-    (target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::TRACE, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
+    (target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::TRACE, { %$($k).+ $($field)* })
     );
     (target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, $crate::Level::TRACE, {}, $($arg)+)
@@ -1107,14 +1099,14 @@
     (target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, $crate::Level::DEBUG, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::DEBUG, { $($k).+ $($field)* })
     );
-    (target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::DEBUG, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
+    (target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::DEBUG, { %$($k).+ $($field)* })
     );
     (target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1319,14 +1311,14 @@
     (target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, $crate::Level::INFO, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::INFO, { $($k).+ $($field)* })
     );
-    (target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::INFO, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
+    (target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::INFO, { $($k).+ $($field)* })
     );
     (target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, $crate::Level::INFO, {}, $($arg)+)
@@ -1356,7 +1348,7 @@
     (%$($k:ident).+ = $($field:tt)*) => (
         $crate::event!(
             target: module_path!(),
-            $crate::Level::TRACE,
+            $crate::Level::INFO,
             { %$($k).+ = $($field)*}
         )
     );
@@ -1524,14 +1516,14 @@
     (target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, $crate::Level::WARN, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::WARN, { $($k).+ $($field)* })
     );
-    (target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::WARN, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
+    (target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::WARN, { %$($k).+ $($field)* })
     );
     (target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, $crate::Level::WARN, {}, $($arg)+)
@@ -1725,14 +1717,14 @@
     (target: $target:expr, { $($field:tt)* }, $($arg:tt)* ) => (
         $crate::event!(target: $target, $crate::Level::ERROR, { $($field)* }, $($arg)*)
     );
-    (target: $target:expr, $($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (target: $target:expr, $($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::ERROR, { $($k).+ $($field)* })
     );
-    (target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (target: $target:expr, ?$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::ERROR, { ?$($k).+ $($field)* })
     );
-    (target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
-        $crate::event!(target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
+    (target: $target:expr, %$($k:ident).+ $($field:tt)* ) => (
+        $crate::event!(target: $target, $crate::Level::ERROR, { %$($k).+ $($field)* })
     );
     (target: $target:expr, $($arg:tt)+ ) => (
         $crate::event!(target: $target, $crate::Level::ERROR, {}, $($arg)+)
@@ -1762,7 +1754,7 @@
     (%$($k:ident).+ = $($field:tt)*) => (
         $crate::event!(
             target: module_path!(),
-            $crate::Level::TRACE,
+            $crate::Level::ERROR,
             { %$($k).+ = $($field)*}
         )
     );
@@ -2295,10 +2287,10 @@
 #[macro_export]
 macro_rules! __tracing_log {
     (target: $target:expr, $level:expr, $($field:tt)+ ) => {
-        $crate::if_log_enabled! {{
+        $crate::if_log_enabled! { $level, {
             use $crate::log;
             let level = $crate::level_to_log!($level);
-            if level <= log::STATIC_MAX_LEVEL && level <= log::max_level() {
+            if level <= log::max_level() {
                 let log_meta = log::Metadata::builder()
                     .level(level)
                     .target($target)
@@ -2322,13 +2314,13 @@
 #[doc(hidden)]
 #[macro_export]
 macro_rules! if_log_enabled {
-    ($e:expr;) => {
-        $crate::if_log_enabled! { $e }
+    ($lvl:expr, $e:expr;) => {
+        $crate::if_log_enabled! { $lvl, $e }
     };
-    ($if_log:block) => {
-        $crate::if_log_enabled! { $if_log else {} }
+    ($lvl:expr, $if_log:block) => {
+        $crate::if_log_enabled! { $lvl, $if_log else {} }
     };
-    ($if_log:block else $else_block:block) => {
+    ($lvl:expr, $if_log:block else $else_block:block) => {
         $else_block
     };
 }
@@ -2337,15 +2329,19 @@
 #[doc(hidden)]
 #[macro_export]
 macro_rules! if_log_enabled {
-    ($e:expr;) => {
-        $crate::if_log_enabled! { $e }
+    ($lvl:expr, $e:expr;) => {
+        $crate::if_log_enabled! { $lvl, $e }
     };
-    ($if_log:block) => {
-        $crate::if_log_enabled! { $if_log else {} }
+    ($lvl:expr, $if_log:block) => {
+        $crate::if_log_enabled! { $lvl, $if_log else {} }
     };
-    ($if_log:block else $else_block:block) => {
-        if !$crate::dispatcher::has_been_set() {
-            $if_log
+    ($lvl:expr, $if_log:block else $else_block:block) => {
+        if $crate::level_to_log!($lvl) <= $crate::log::STATIC_MAX_LEVEL {
+            if !$crate::dispatcher::has_been_set() {
+                $if_log
+            } else {
+                $else_block
+            }
         } else {
             $else_block
         }
@@ -2356,14 +2352,18 @@
 #[doc(hidden)]
 #[macro_export]
 macro_rules! if_log_enabled {
-    ($e:expr;) => {
-        $crate::if_log_enabled! { $e }
+    ($lvl:expr, $e:expr;) => {
+        $crate::if_log_enabled! { $lvl, $e }
     };
-    ($if_log:block) => {
-        $crate::if_log_enabled! { $if_log else {} }
+    ($lvl:expr, $if_log:block) => {
+        $crate::if_log_enabled! { $lvl, $if_log else {} }
     };
-    ($if_log:block else $else_block:block) => {
-        #[allow(unused_braces)]
-        $if_log
+    ($lvl:expr, $if_log:block else $else_block:block) => {
+        if $crate::level_to_log!($lvl) <= $crate::log::STATIC_MAX_LEVEL {
+            #[allow(unused_braces)]
+            $if_log
+        } else {
+            $else_block
+        }
     };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/src/span.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/src/span.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/src/span.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/src/span.rs	2021-12-09 12:01:26.000000000 +0000
@@ -57,13 +57,12 @@
 //!
 //! A thread of execution is said to _enter_ a span when it begins executing,
 //! and _exit_ the span when it switches to another context. Spans may be
-//! entered through the [`enter`] and [`in_scope`] methods.
+//! entered through the [`enter`], [`entered`], and [`in_scope`] methods.
 //!
-//! The `enter` method enters a span, returning a [guard] that exits the span
+//! The [`enter`] method enters a span, returning a [guard] that exits the span
 //! when dropped
 //! ```
-//! # #[macro_use] extern crate tracing;
-//! # use tracing::Level;
+//! # use tracing::{span, Level};
 //! let my_var: u64 = 5;
 //! let my_span = span!(Level::TRACE, "my_span", my_var);
 //!
@@ -86,11 +85,28 @@
 //!     for details.
 //! </pre></div>
 //!
-//! `in_scope` takes a closure or function pointer and executes it inside the
-//! span.
+//! The [`entered`] method is analogous to [`enter`], but moves the span into
+//! the returned guard, rather than borrowing it. This allows creating and
+//! entering a span in a single expression:
+//!
 //! ```
-//! # #[macro_use] extern crate tracing;
-//! # use tracing::Level;
+//! # use tracing::{span, Level};
+//! // Create a span and enter it, returning a guard:
+//! let span = span!(Level::INFO, "my_span").entered();
+//!
+//! // We are now inside the span! Like `enter()`, the guard returned by
+//! // `entered()` will exit the span when it is dropped...
+//!
+//! // ...but, it can also be exited explicitly, returning the `Span`
+//! // struct:
+//! let span = span.exit();
+//! ```
+//!
+//! Finally, [`in_scope`] takes a closure or function pointer and executes it
+//! inside the span:
+//!
+//! ```
+//! # use tracing::{span, Level};
 //! let my_var: u64 = 5;
 //! let my_span = span!(Level::TRACE, "my_span", my_var = &my_var);
 //!
@@ -309,6 +325,7 @@
 //! [`Subscriber`]: ../subscriber/trait.Subscriber.html
 //! [`Attributes`]: struct.Attributes.html
 //! [`enter`]: struct.Span.html#method.enter
+//! [`entered`]: struct.Span.html#method.entered
 //! [`in_scope`]: struct.Span.html#method.in_scope
 //! [`follows_from`]: struct.Span.html#method.follows_from
 //! [guard]: struct.Entered.html
@@ -318,6 +335,9 @@
 use crate::stdlib::{
     cmp, fmt,
     hash::{Hash, Hasher},
+    marker::PhantomData,
+    mem,
+    ops::Deref,
 };
 use crate::{
     dispatcher::{self, Dispatch},
@@ -381,6 +401,28 @@
     span: &'a Span,
 }
 
+/// An owned version of [`Entered`], a guard representing a span which has been
+/// entered and is currently executing.
+///
+/// When the guard is dropped, the span will be exited.
+///
+/// This is returned by the [`Span::entered`] function.
+///
+/// [`Span::entered`]: super::Span::entered()
+#[derive(Debug)]
+#[must_use = "once a span has been entered, it should be exited"]
+pub struct EnteredSpan {
+    span: Span,
+
+    /// ```compile_fail
+    /// use tracing::span::*;
+    /// trait AssertSend: Send {}
+    ///
+    /// impl AssertSend for EnteredSpan {}
+    /// ```
+    _not_send: PhantomNotSend,
+}
+
 /// `log` target for all span lifecycle (creation/enter/exit/close) records.
 #[cfg(feature = "log")]
 const LIFECYCLE_LOG_TARGET: &str = "tracing::span";
@@ -544,7 +586,7 @@
             meta: Some(meta),
         };
 
-        if_log_enabled! {{
+        if_log_enabled! { *meta.level(), {
             let target = if attrs.is_empty() {
                 LIFECYCLE_LOG_TARGET
             } else {
@@ -555,6 +597,7 @@
 
         span
     }
+
     /// Enters this span, returning a guard that will exit the span when dropped.
     ///
     /// If this span is enabled by the current subscriber, then this function will
@@ -744,18 +787,157 @@
     /// [`Subscriber::enter`]: ../subscriber/trait.Subscriber.html#method.enter
     /// [`Subscriber::exit`]: ../subscriber/trait.Subscriber.html#method.exit
     /// [`Id`]: ../struct.Id.html
+    #[inline]
     pub fn enter(&self) -> Entered<'_> {
-        if let Some(ref inner) = self.inner.as_ref() {
+        self.do_enter();
+        Entered { span: self }
+    }
+
+    /// Enters this span, consuming it and returning a [guard][`EnteredSpan`]
+    /// that will exit the span when dropped.
+    ///
+    /// If this span is enabled by the current subscriber, then this function will
+    /// call [`Subscriber::enter`] with the span's [`Id`], and dropping the guard
+    /// will call [`Subscriber::exit`]. If the span is disabled, this does
+    /// nothing.
+    ///
+    /// This is similar to the [`Span::enter`] method, except that it moves the
+    /// span by value into the returned guard, rather than borrowing it.
+    /// Therefore, this method can be used to create and enter a span in a
+    /// single expression, without requiring a `let`-binding. For example:
+    ///
+    /// ```
+    /// # use tracing::info_span;
+    /// let _span = info_span!("something_interesting").entered();
+    /// ```
+    /// rather than:
+    /// ```
+    /// # use tracing::info_span;
+    /// let span = info_span!("something_interesting");
+    /// let _e = span.enter();
+    /// ```
+    ///
+    /// Furthermore, `entered` may be used when the span must be stored in some
+    /// other struct or be passed to a function while remaining entered.
+    ///
+    /// <div class="information">
+    ///     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
+    /// </div>
+    /// <div class="example-wrap" style="display:inline-block">
+    /// <pre class="ignore" style="white-space:normal;font:inherit;">
+    ///
+    /// **Note**: The returned [`EnteredSpan`] guard does not
+    /// implement `Send`. Dropping the guard will exit *this* span,
+    /// and if the guard is sent to another thread and dropped there, that thread may
+    /// never have entered this span. Thus, `EnteredSpan`s should not be sent
+    /// between threads.
+    ///
+    /// </pre></div>
+    ///
+    /// **Warning**: in asynchronous code that uses [async/await syntax][syntax],
+    /// [`Span::entered`] should be used very carefully or avoided entirely. Holding
+    /// the drop guard returned by `Span::entered` across `.await` points will
+    /// result in incorrect traces. See the documentation for the
+    /// [`Span::enter`] method for details.
+    ///
+    /// [syntax]: https://rust-lang.github.io/async-book/01_getting_started/04_async_await_primer.html
+    ///
+    /// # Examples
+    ///
+    /// The returned guard can be [explicitly exited][EnteredSpan::exit],
+    /// returning the un-entered span:
+    ///
+    /// ```
+    /// # use tracing::{Level, span};
+    /// let span = span!(Level::INFO, "doing_something").entered();
+    ///
+    /// // code here is within the span
+    ///
+    /// // explicitly exit the span, returning it
+    /// let span = span.exit();
+    ///
+    /// // code here is no longer within the span
+    ///
+    /// // enter the span again
+    /// let span = span.entered();
+    ///
+    /// // now we are inside the span once again
+    /// ```
+    ///
+    /// Guards need not be explicitly dropped:
+    ///
+    /// ```
+    /// # use tracing::trace_span;
+    /// fn my_function() -> String {
+    ///     // enter a span for the duration of this function.
+    ///     let span = trace_span!("my_function").entered();
+    ///
+    ///     // anything happening in functions we call is still inside the span...
+    ///     my_other_function();
+    ///
+    ///     // returning from the function drops the guard, exiting the span.
+    ///     return "Hello world".to_owned();
+    /// }
+    ///
+    /// fn my_other_function() {
+    ///     // ...
+    /// }
+    /// ```
+    ///
+    /// Since the [`EnteredSpan`] guard can dereference to the [`Span`] itself,
+    /// the span may still be accessed while entered. For example:
+    ///
+    /// ```rust
+    /// # use tracing::info_span;
+    /// use tracing::field;
+    ///
+    /// // create the span with an empty field, and enter it.
+    /// let span = info_span!("my_span", some_field = field::Empty).entered();
+    ///
+    /// // we can still record a value for the field while the span is entered.
+    /// span.record("some_field", &"hello world!");
+    /// ```
+    ///
+    /// [`Subscriber::enter`]: ../subscriber/trait.Subscriber.html#method.enter
+    /// [`Subscriber::exit`]: ../subscriber/trait.Subscriber.html#method.exit
+    /// [`Id`]: ../struct.Id.html
+    #[inline]
+    pub fn entered(self) -> EnteredSpan {
+        self.do_enter();
+        EnteredSpan {
+            span: self,
+            _not_send: PhantomNotSend,
+        }
+    }
+
+    #[inline]
+    fn do_enter(&self) {
+        if let Some(inner) = self.inner.as_ref() {
             inner.subscriber.enter(&inner.id);
         }
 
-        if_log_enabled! {{
+        if_log_enabled! { crate::Level::TRACE, {
             if let Some(ref meta) = self.meta {
                 self.log(ACTIVITY_LOG_TARGET, log::Level::Trace, format_args!("-> {}", meta.name()));
             }
         }}
+    }
 
-        Entered { span: self }
+    // Called from [`Entered`] and [`EnteredSpan`] drops.
+    //
+    // Running this behaviour on drop rather than with an explicit function
+    // call means that spans may still be exited when unwinding.
+    #[inline]
+    fn do_exit(&self) {
+        if let Some(inner) = self.inner.as_ref() {
+            inner.subscriber.exit(&inner.id);
+        }
+
+        if_log_enabled! { crate::Level::TRACE, {
+            if let Some(ref _meta) = self.meta {
+                self.log(ACTIVITY_LOG_TARGET, log::Level::Trace, format_args!("<- {}", _meta.name()));
+            }
+        }}
     }
 
     /// Executes the given function in the context of this span.
@@ -916,16 +1098,16 @@
             inner.record(&record);
         }
 
-        if_log_enabled! {{
-            if let Some(ref meta) = self.meta {
+        if let Some(ref _meta) = self.meta {
+            if_log_enabled! { *_meta.level(), {
                 let target = if record.is_empty() {
                     LIFECYCLE_LOG_TARGET
                 } else {
-                    meta.target()
+                    _meta.target()
                 };
-                self.log(target, level_to_log!(*meta.level()), format_args!("{}{}", meta.name(), FmtValues(&record)));
-            }
-        }}
+                self.log(target, level_to_log!(*_meta.level()), format_args!("{}{}", _meta.name(), FmtValues(&record)));
+            }}
+        }
 
         self
     }
@@ -1118,21 +1300,33 @@
     }
 }
 
-impl<'a> Into<Option<&'a Id>> for &'a Span {
-    fn into(self) -> Option<&'a Id> {
-        self.inner.as_ref().map(|inner| &inner.id)
+impl<'a> From<&'a Span> for Option<&'a Id> {
+    fn from(span: &'a Span) -> Self {
+        span.inner.as_ref().map(|inner| &inner.id)
     }
 }
 
-impl<'a> Into<Option<Id>> for &'a Span {
-    fn into(self) -> Option<Id> {
-        self.inner.as_ref().map(Inner::id)
+impl<'a> From<&'a Span> for Option<Id> {
+    fn from(span: &'a Span) -> Self {
+        span.inner.as_ref().map(Inner::id)
     }
 }
 
-impl Into<Option<Id>> for Span {
-    fn into(self) -> Option<Id> {
-        self.inner.as_ref().map(Inner::id)
+impl From<Span> for Option<Id> {
+    fn from(span: Span) -> Self {
+        span.inner.as_ref().map(Inner::id)
+    }
+}
+
+impl<'a> From<&'a EnteredSpan> for Option<&'a Id> {
+    fn from(span: &'a EnteredSpan) -> Self {
+        span.inner.as_ref().map(|inner| &inner.id)
+    }
+}
+
+impl<'a> From<&'a EnteredSpan> for Option<Id> {
+    fn from(span: &'a EnteredSpan) -> Self {
+        span.inner.as_ref().map(Inner::id)
     }
 }
 
@@ -1146,15 +1340,15 @@
             subscriber.try_close(id.clone());
         }
 
-        if_log_enabled!({
-            if let Some(ref meta) = self.meta {
+        if let Some(ref _meta) = self.meta {
+            if_log_enabled! { crate::Level::TRACE, {
                 self.log(
                     LIFECYCLE_LOG_TARGET,
                     log::Level::Trace,
-                    format_args!("-- {}", meta.name()),
+                    format_args!("-- {}", _meta.name()),
                 );
-            }
-        })
+            }}
+        }
     }
 }
 
@@ -1220,25 +1414,72 @@
 
 // ===== impl Entered =====
 
+impl EnteredSpan {
+    /// Returns this span's `Id`, if it is enabled.
+    pub fn id(&self) -> Option<Id> {
+        self.inner.as_ref().map(Inner::id)
+    }
+
+    /// Exits this span, returning the underlying [`Span`].
+    #[inline]
+    pub fn exit(mut self) -> Span {
+        // One does not simply move out of a struct with `Drop`.
+        let span = mem::replace(&mut self.span, Span::none());
+        span.do_exit();
+        span
+    }
+}
+
+impl Deref for EnteredSpan {
+    type Target = Span;
+
+    #[inline]
+    fn deref(&self) -> &Span {
+        &self.span
+    }
+}
+
 impl<'a> Drop for Entered<'a> {
     #[inline]
     fn drop(&mut self) {
-        // Dropping the guard exits the span.
-        //
-        // Running this behaviour on drop rather than with an explicit function
-        // call means that spans may still be exited when unwinding.
-        if let Some(inner) = self.span.inner.as_ref() {
-            inner.subscriber.exit(&inner.id);
-        }
+        self.span.do_exit()
+    }
+}
 
-        if_log_enabled! {{
-            if let Some(ref meta) = self.span.meta {
-                self.span.log(ACTIVITY_LOG_TARGET, log::Level::Trace, format_args!("<- {}", meta.name()));
-            }
-        }}
+impl Drop for EnteredSpan {
+    #[inline]
+    fn drop(&mut self) {
+        self.span.do_exit()
     }
 }
 
+/// Technically, `EnteredSpan` _can_ implement both `Send` *and*
+/// `Sync` safely. It doesn't, because it has a `PhantomNotSend` field,
+/// specifically added in order to make it `!Send`.
+///
+/// Sending an `EnteredSpan` guard between threads cannot cause memory unsafety.
+/// However, it *would* result in incorrect behavior, so we add a
+/// `PhantomNotSend` to prevent it from being sent between threads. This is
+/// because it must be *dropped* on the same thread that it was created;
+/// otherwise, the span will never be exited on the thread where it was entered,
+/// and it will attempt to exit the span on a thread that may never have entered
+/// it. However, we still want them to be `Sync` so that a struct holding an
+/// `Entered` guard can be `Sync`.
+///
+/// Thus, this is totally safe.
+#[derive(Debug)]
+struct PhantomNotSend {
+    ghost: PhantomData<*mut ()>,
+}
+
+#[allow(non_upper_case_globals)]
+const PhantomNotSend: PhantomNotSend = PhantomNotSend { ghost: PhantomData };
+
+/// # Safety
+///
+/// Trivially safe, as `PhantomNotSend` doesn't have any API.
+unsafe impl Sync for PhantomNotSend {}
+
 #[cfg(feature = "log")]
 struct FmtValues<'a>(&'a Record<'a>);
 
@@ -1280,4 +1521,6 @@
 
     trait AssertSync: Sync {}
     impl AssertSync for Span {}
+    impl AssertSync for Entered<'_> {}
+    impl AssertSync for EnteredSpan {}
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/macros.rs	2021-12-09 12:01:26.000000000 +0000
@@ -407,6 +407,12 @@
     trace!(?foo);
     trace!(%foo);
     trace!(foo);
+    trace!(target: "foo_events", ?foo);
+    trace!(target: "foo_events", %foo);
+    trace!(target: "foo_events", foo);
+    trace!(target: "foo_events", ?foo, true, "message");
+    trace!(target: "foo_events", %foo, true, "message");
+    trace!(target: "foo_events", foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -437,6 +443,12 @@
     debug!(?foo);
     debug!(%foo);
     debug!(foo);
+    debug!(target: "foo_events", ?foo);
+    debug!(target: "foo_events", %foo);
+    debug!(target: "foo_events", foo);
+    debug!(target: "foo_events", ?foo, true, "message");
+    debug!(target: "foo_events", %foo, true, "message");
+    debug!(target: "foo_events", foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -467,6 +479,12 @@
     info!(?foo);
     info!(%foo);
     info!(foo);
+    info!(target: "foo_events", ?foo);
+    info!(target: "foo_events", %foo);
+    info!(target: "foo_events", foo);
+    info!(target: "foo_events", ?foo, true, "message");
+    info!(target: "foo_events", %foo, true, "message");
+    info!(target: "foo_events", foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -497,6 +515,12 @@
     warn!(?foo);
     warn!(%foo);
     warn!(foo);
+    warn!(target: "foo_events", ?foo);
+    warn!(target: "foo_events", %foo);
+    warn!(target: "foo_events", foo);
+    warn!(target: "foo_events", ?foo, true, "message");
+    warn!(target: "foo_events", %foo, true, "message");
+    warn!(target: "foo_events", foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -527,6 +551,12 @@
     error!(?foo);
     error!(%foo);
     error!(foo);
+    error!(target: "foo_events", ?foo);
+    error!(target: "foo_events", %foo);
+    error!(target: "foo_events", foo);
+    error!(target: "foo_events", ?foo, true, "message");
+    error!(target: "foo_events", %foo, true, "message");
+    error!(target: "foo_events", foo, true, "message");
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/span.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/span.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/span.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/span.rs	2021-12-09 12:01:26.000000000 +0000
@@ -299,6 +299,44 @@
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]
+fn entered() {
+    let (subscriber, handle) = subscriber::mock()
+        .enter(span::mock().named("foo"))
+        .event(event::mock())
+        .exit(span::mock().named("foo"))
+        .drop_span(span::mock().named("foo"))
+        .done()
+        .run_with_handle();
+    with_default(subscriber, || {
+        let _span = span!(Level::TRACE, "foo").entered();
+        debug!("dropping guard...");
+    });
+
+    handle.assert_finished();
+}
+
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
+#[test]
+fn entered_api() {
+    let (subscriber, handle) = subscriber::mock()
+        .enter(span::mock().named("foo"))
+        .event(event::mock())
+        .exit(span::mock().named("foo"))
+        .drop_span(span::mock().named("foo"))
+        .done()
+        .run_with_handle();
+    with_default(subscriber, || {
+        let span = span!(Level::TRACE, "foo").entered();
+        let _derefs_to_span = span.id();
+        debug!("exiting span...");
+        let _: Span = span.exit();
+    });
+
+    handle.assert_finished();
+}
+
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
+#[test]
 fn moved_field() {
     let (subscriber, handle) = subscriber::mock()
         .new_span(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/subscriber.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/subscriber.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/subscriber.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/subscriber.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,11 +9,16 @@
 #[macro_use]
 extern crate tracing;
 use tracing::{
-    span,
+    field::display,
+    span::{Attributes, Id, Record},
     subscriber::{with_default, Interest, Subscriber},
     Event, Level, Metadata,
 };
 
+mod support;
+
+use self::support::*;
+
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[test]
 fn event_macros_dont_infinite_loop() {
@@ -33,25 +38,98 @@
             true
         }
 
-        fn new_span(&self, _: &span::Attributes<'_>) -> span::Id {
-            span::Id::from_u64(0xAAAA)
+        fn new_span(&self, _: &Attributes<'_>) -> Id {
+            Id::from_u64(0xAAAA)
         }
 
-        fn record(&self, _: &span::Id, _: &span::Record<'_>) {}
+        fn record(&self, _: &Id, _: &Record<'_>) {}
 
-        fn record_follows_from(&self, _: &span::Id, _: &span::Id) {}
+        fn record_follows_from(&self, _: &Id, _: &Id) {}
 
         fn event(&self, event: &Event<'_>) {
             assert!(event.metadata().fields().iter().any(|f| f.name() == "foo"));
             event!(Level::TRACE, baz = false);
         }
 
-        fn enter(&self, _: &span::Id) {}
+        fn enter(&self, _: &Id) {}
 
-        fn exit(&self, _: &span::Id) {}
+        fn exit(&self, _: &Id) {}
     }
 
     with_default(TestSubscriber, || {
         event!(Level::TRACE, foo = false);
     })
 }
+
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
+#[test]
+fn boxed_subscriber() {
+    let (subscriber, handle) = subscriber::mock()
+        .new_span(
+            span::mock().named("foo").with_field(
+                field::mock("bar")
+                    .with_value(&display("hello from my span"))
+                    .only(),
+            ),
+        )
+        .enter(span::mock().named("foo"))
+        .exit(span::mock().named("foo"))
+        .drop_span(span::mock().named("foo"))
+        .done()
+        .run_with_handle();
+    let subscriber: Box<dyn Subscriber + Send + Sync + 'static> = Box::new(subscriber);
+
+    with_default(subscriber, || {
+        let from = "my span";
+        let span = span!(
+            Level::TRACE,
+            "foo",
+            bar = format_args!("hello from {}", from)
+        );
+        span.in_scope(|| {});
+    });
+
+    handle.assert_finished();
+}
+
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
+#[test]
+fn arced_subscriber() {
+    use std::sync::Arc;
+
+    let (subscriber, handle) = subscriber::mock()
+        .new_span(
+            span::mock().named("foo").with_field(
+                field::mock("bar")
+                    .with_value(&display("hello from my span"))
+                    .only(),
+            ),
+        )
+        .enter(span::mock().named("foo"))
+        .exit(span::mock().named("foo"))
+        .drop_span(span::mock().named("foo"))
+        .event(
+            event::mock()
+                .with_fields(field::mock("message").with_value(&display("hello from my event"))),
+        )
+        .done()
+        .run_with_handle();
+    let subscriber: Arc<dyn Subscriber + Send + Sync + 'static> = Arc::new(subscriber);
+
+    // Test using a clone of the `Arc`ed subscriber
+    with_default(subscriber.clone(), || {
+        let from = "my span";
+        let span = span!(
+            Level::TRACE,
+            "foo",
+            bar = format_args!("hello from {}", from)
+        );
+        span.in_scope(|| {});
+    });
+
+    with_default(subscriber, || {
+        tracing::info!("hello from my event");
+    });
+
+    handle.assert_finished();
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/support/field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/support/field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/support/field.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/support/field.rs	2021-12-09 12:01:26.000000000 +0000
@@ -66,13 +66,13 @@
     }
 }
 
-impl Into<Expect> for MockField {
-    fn into(self) -> Expect {
+impl From<MockField> for Expect {
+    fn from(field: MockField) -> Self {
         Expect {
             fields: HashMap::new(),
             only: false,
         }
-        .and(self)
+        .and(field)
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/support/span.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/support/span.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/support/span.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/support/span.rs	2021-12-09 12:01:26.000000000 +0000
@@ -113,10 +113,10 @@
     }
 }
 
-impl Into<NewSpan> for MockSpan {
-    fn into(self) -> NewSpan {
-        NewSpan {
-            span: self,
+impl From<MockSpan> for NewSpan {
+    fn from(span: MockSpan) -> Self {
+        Self {
+            span,
             ..Default::default()
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/support/subscriber.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/support/subscriber.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing/tests/support/subscriber.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing/tests/support/subscriber.rs	2021-12-09 12:01:26.000000000 +0000
@@ -536,7 +536,7 @@
 }
 
 impl Expect {
-    fn bad<'a>(&self, name: impl AsRef<str>, what: fmt::Arguments<'a>) {
+    fn bad(&self, name: impl AsRef<str>, what: fmt::Arguments<'_>) {
         let name = name.as_ref();
         match self {
             Expect::Event(e) => panic!("[{}] expected event {}, but {} instead", name, e, what,),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"c0e17b9a0e4f134b8507ba8f6ac2d4800eb1a4024c42f8888c24525cfbf0c1ae","Cargo.toml":"5d803dae41ee1b5f564ee9321d14bd7f5b25b8b237c9f2e9e9a4a0d6bc24238b","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"cefe3a66d7cdf9d71089d5104a4997a93ed231232f1024799b240bb436721288","src/callsite.rs":"2c0ef84a22d2c93aa6c70220c38f40ac1416de427b0d2d3169541e05eac901bf","src/dispatcher.rs":"386fb35ec3a2ebd37c96b50a52eca8232e8c55756681815963d8050ecbc3a417","src/event.rs":"afac8c061d1c450799fdab8512df6792b64ea11456703a4b3589bc4e696f099e","src/field.rs":"560179f2399d52ed37bda79939ce1b29a60da03baa7068d5613a7ecac5814e50","src/lazy_static/LICENSE":"1e2391052f82d7b0111f512680dcbecf01b06842f5295833e7bd435be2b09a9b","src/lazy_static/core_lazy.rs":"b4c1aaec440177f0de3148fd7b5b60f052890267035966069e9d6a167a72af6a","src/lazy_static/mod.rs":"31abed65708c02b36ec4c72d0788b3fc18c684274ba943dc80fc9f2347f5fb2f","src/lib.rs":"c5ec7961ecb51ad0f30e077edd310d69be09446692c81cf19edf04d03a87e97e","src/metadata.rs":"ef18a9de74a7e8891e33585269d58b2f62613f80d450195cb50c44cde7805d9c","src/parent.rs":"5d5ad733343280a64a1feb6a008e186c39305ec554f14279012b8d7915821471","src/span.rs":"18d9000b35469ea91c56d3e0023e18a982ef625232c617c2827a417793b02c4a","src/spin/LICENSE":"58545fed1565e42d687aecec6897d35c6d37ccb71479a137c0deb2203e125c79","src/spin/mod.rs":"c458ce5e875acb7fbfb279f23254f4924d7c6d6fee419b740800d2e8087d1524","src/spin/mutex.rs":"eaf592b586a5ed73735d6442009b16b0350cb1f71013dafcc95a512c1a49f187","src/spin/once.rs":"c611328c4287adf5c63ae768e2923f34228cad6e019263c98dd33f96a3357edf","src/stdlib.rs":"491c9e37321798c86124c0690f7c5f29054bc444cc51406c36b6fdb106392303","src/subscriber.rs":"66edfcad19821e4d8d92c9ad44b4717c97a89ea5e5172a4c6d6301bdd5a76025","tests/common/mod.rs":"0bbb217baa17df0f96cc1ff57dfa74ccc5a959e7f66b15bb7d25d5f43358a278","tests/dispatch.rs":"c99a9ee042b2a9185d090ffc1a042e1bced0626ce95608c610dd8f7867022f3d","tests/global_dispatch.rs":"cdc05d77e448ee8b50bfb930abafa3f19b4c6f922b7bebc7797fa1dbdaa1d398","tests/macros.rs":"b1603d888b349c8d103794deceec3b1ae4538b8d3eba805f3f561899e8ad0dd2"},"package":"f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"0a88a9c408354ceda243517c7bef3a598b4e859f5143fbd5f3e9ddead3f9b808","Cargo.toml":"4d30446d94db976e324935b1fd3390e71382a4bf5d2b3ffa60eba18392657533","LICENSE":"898b1ae9821e98daf8964c8d6c7f61641f5f5aa78ad500020771c0939ee0dea1","README.md":"02213527db4c4aa8e59347f79b69368dbb00cbcf165e8622db331e5dd785f614","src/callsite.rs":"2ce1e76222dff082fc633f99928ad5caa5384aa57c9fd387e961123010bec4b6","src/dispatcher.rs":"4e1ab501ab36e44cd612347ef38cc1d3c7ceae50a6e0d302ace0870b07232525","src/event.rs":"f1e7004a29dace2f45fd69107fba82ec475bbf6cfdeb980b5a003f647358e4ab","src/field.rs":"3943334bf110a903b216fe8f6ff6c5449586869173bfc4e3e66f45849beb83d6","src/lazy_static/LICENSE":"1e2391052f82d7b0111f512680dcbecf01b06842f5295833e7bd435be2b09a9b","src/lazy_static/core_lazy.rs":"b4c1aaec440177f0de3148fd7b5b60f052890267035966069e9d6a167a72af6a","src/lazy_static/mod.rs":"31abed65708c02b36ec4c72d0788b3fc18c684274ba943dc80fc9f2347f5fb2f","src/lib.rs":"828823b0e71cb791fde86af58eab226b7acf5f82b4556da526f6486d91a7d512","src/metadata.rs":"2a8b5e757ae53e34d87757219cd58ef8a98dc6d5c01034358f1dc04ad1b3be51","src/parent.rs":"5d5ad733343280a64a1feb6a008e186c39305ec554f14279012b8d7915821471","src/span.rs":"17828991cb06a2dad07aa3dc315f2e0b97da6c11663443f736a1739eae359624","src/spin/LICENSE":"58545fed1565e42d687aecec6897d35c6d37ccb71479a137c0deb2203e125c79","src/spin/mod.rs":"c458ce5e875acb7fbfb279f23254f4924d7c6d6fee419b740800d2e8087d1524","src/spin/mutex.rs":"eaf592b586a5ed73735d6442009b16b0350cb1f71013dafcc95a512c1a49f187","src/spin/once.rs":"c611328c4287adf5c63ae768e2923f34228cad6e019263c98dd33f96a3357edf","src/stdlib.rs":"491c9e37321798c86124c0690f7c5f29054bc444cc51406c36b6fdb106392303","src/subscriber.rs":"1c88d3f8fca2509f5a1b672cf9fd931df61178d5b1458a9090a85eadfedd0d71","tests/common/mod.rs":"0bbb217baa17df0f96cc1ff57dfa74ccc5a959e7f66b15bb7d25d5f43358a278","tests/dispatch.rs":"c99a9ee042b2a9185d090ffc1a042e1bced0626ce95608c610dd8f7867022f3d","tests/global_dispatch.rs":"cdc05d77e448ee8b50bfb930abafa3f19b4c6f922b7bebc7797fa1dbdaa1d398","tests/macros.rs":"b1603d888b349c8d103794deceec3b1ae4538b8d3eba805f3f561899e8ad0dd2"},"package":"2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.19"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 description = "Core primitives for application-level tracing.\n"
 homepage = "https://tokio.rs"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,38 @@
+# 0.1.19 (August 17, 2021)
+### Added
+
+- `Level::as_str` ([#1413])
+- `Hash` implementation for `Level` and `LevelFilter` ([#1456])
+- `Value` implementation for `&mut T where T: Value` ([#1385])
+- Multiple documentation fixes and improvements ([#1435], [#1446])
+
+Thanks to @Folyd, @teozkr, and @dvdplm for contributing to this release!
+
+[#1413]: https://github.com/tokio-rs/tracing/pull/1413
+[#1456]: https://github.com/tokio-rs/tracing/pull/1456
+[#1385]: https://github.com/tokio-rs/tracing/pull/1385
+[#1435]: https://github.com/tokio-rs/tracing/pull/1435
+[#1446]: https://github.com/tokio-rs/tracing/pull/1446
+
+# 0.1.19 (April 30, 2021)
+
+### Added
+
+- `Subscriber` impl for `Box<dyn Subscriber + Send + Sync + 'static>` ([#1358])
+- `Subscriber` impl for `Arc<dyn Subscriber + Send + Sync + 'static>` ([#1374])
+- Symmetric `From` impls for existing `Into` impls on `Current` and `Option<Id>`
+  ([#1335])
+- `Attributes::fields` accessor that returns the set of fields defined on a
+  span's `Attributes` ([#1331])
+
+
+Thanks to @Folyd for contributing to this release!
+
+[#1358]: https://github.com/tokio-rs/tracing/pull/1358
+[#1374]: https://github.com/tokio-rs/tracing/pull/1374
+[#1335]: https://github.com/tokio-rs/tracing/pull/1335
+[#1331]: https://github.com/tokio-rs/tracing/pull/1331
+
 # 0.1.17 (September 28, 2020)
 
 ### Fixed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -16,9 +16,9 @@
 [Documentation][docs-url] | [Chat][discord-url]
 
 [crates-badge]: https://img.shields.io/crates/v/tracing-core.svg
-[crates-url]: https://crates.io/crates/tracing-core/0.1.17
+[crates-url]: https://crates.io/crates/tracing-core/0.1.19
 [docs-badge]: https://docs.rs/tracing-core/badge.svg
-[docs-url]: https://docs.rs/tracing-core/0.1.17
+[docs-url]: https://docs.rs/tracing-core/0.1.19
 [docs-master-badge]: https://img.shields.io/badge/docs-master-blue
 [docs-master-url]: https://tracing-rs.netlify.com/tracing_core
 [mit-badge]: https://img.shields.io/badge/license-MIT-blue.svg
@@ -53,7 +53,7 @@
 In addition, it defines the global callsite registry and per-thread current
 dispatcher which other components of the tracing system rely on.
 
-*Compiler support: [requires `rustc` 1.40+][msrv]*
+*Compiler support: [requires `rustc` 1.42+][msrv]*
 
 [msrv]: #supported-rust-versions
 
@@ -79,27 +79,27 @@
 
   ```toml
   [dependencies]
-  tracing-core = { version = "0.1.17", default-features = false }
+  tracing-core = { version = "0.1.19", default-features = false }
   ```
 
   **Note**:`tracing-core`'s `no_std` support requires `liballoc`.
 
 [`tracing`]: ../tracing
-[`span::Id`]: https://docs.rs/tracing-core/0.1.17/tracing_core/span/struct.Id.html
-[`Event`]: https://docs.rs/tracing-core/0.1.17/tracing_core/event/struct.Event.html
-[`Subscriber`]: https://docs.rs/tracing-core/0.1.17/tracing_core/subscriber/trait.Subscriber.html
-[`Metadata`]: https://docs.rs/tracing-core/0.1.17/tracing_core/metadata/struct.Metadata.html
-[`Callsite`]: https://docs.rs/tracing-core/0.1.17/tracing_core/callsite/trait.Callsite.html
-[`Field`]: https://docs.rs/tracing-core/0.1.17/tracing_core/field/struct.Field.html
-[`FieldSet`]: https://docs.rs/tracing-core/0.1.17/tracing_core/field/struct.FieldSet.html
-[`Value`]: https://docs.rs/tracing-core/0.1.17/tracing_core/field/trait.Value.html
-[`ValueSet`]: https://docs.rs/tracing-core/0.1.17/tracing_core/field/struct.ValueSet.html
-[`Dispatch`]: https://docs.rs/tracing-core/0.1.17/tracing_core/dispatcher/struct.Dispatch.html
+[`span::Id`]: https://docs.rs/tracing-core/0.1.19/tracing_core/span/struct.Id.html
+[`Event`]: https://docs.rs/tracing-core/0.1.19/tracing_core/event/struct.Event.html
+[`Subscriber`]: https://docs.rs/tracing-core/0.1.19/tracing_core/subscriber/trait.Subscriber.html
+[`Metadata`]: https://docs.rs/tracing-core/0.1.19/tracing_core/metadata/struct.Metadata.html
+[`Callsite`]: https://docs.rs/tracing-core/0.1.19/tracing_core/callsite/trait.Callsite.html
+[`Field`]: https://docs.rs/tracing-core/0.1.19/tracing_core/field/struct.Field.html
+[`FieldSet`]: https://docs.rs/tracing-core/0.1.19/tracing_core/field/struct.FieldSet.html
+[`Value`]: https://docs.rs/tracing-core/0.1.19/tracing_core/field/trait.Value.html
+[`ValueSet`]: https://docs.rs/tracing-core/0.1.19/tracing_core/field/struct.ValueSet.html
+[`Dispatch`]: https://docs.rs/tracing-core/0.1.19/tracing_core/dispatcher/struct.Dispatch.html
 
 ## Supported Rust Versions
 
 Tracing is built against the latest stable release. The minimum supported
-version is 1.40. The current Tracing version is not guaranteed to build on Rust
+version is 1.42. The current Tracing version is not guaranteed to build on Rust
 versions earlier than the minimum supported version.
 
 Tracing follows the same compiler support policies as the rest of the Tokio
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/callsite.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/callsite.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/callsite.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/callsite.rs	2021-12-09 12:01:26.000000000 +0000
@@ -149,7 +149,10 @@
 
 impl PartialEq for Identifier {
     fn eq(&self, other: &Identifier) -> bool {
-        self.0 as *const _ as *const () == other.0 as *const _ as *const ()
+        core::ptr::eq(
+            self.0 as *const _ as *const (),
+            other.0 as *const _ as *const (),
+        )
     }
 }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/dispatcher.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/dispatcher.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/dispatcher.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/dispatcher.rs	2021-12-09 12:01:26.000000000 +0000
@@ -108,9 +108,6 @@
 //! // `my_subscriber` is now the default
 //! ```
 //!
-//! <div class="information">
-//!     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
-//! </div>
 //! <div class="example-wrap" style="display:inline-block">
 //! <pre class="ignore" style="white-space:normal;font:inherit;">
 //! <strong>Note</strong>:the thread-local scoped dispatcher
@@ -211,9 +208,6 @@
 /// The default dispatcher is used when creating a new [span] or
 /// [`Event`].
 ///
-/// <div class="information">
-///     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
-/// </div>
 /// <div class="example-wrap" style="display:inline-block">
 /// <pre class="ignore" style="white-space:normal;font:inherit;">
 /// <strong>Note</strong>: This function required the Rust standard library.
@@ -239,9 +233,6 @@
 /// Sets the dispatch as the default dispatch for the duration of the lifetime
 /// of the returned DefaultGuard
 ///
-/// <div class="information">
-///     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
-/// </div>
 /// <div class="example-wrap" style="display:inline-block">
 /// <pre class="ignore" style="white-space:normal;font:inherit;">
 /// <strong>Note</strong>: This function required the Rust standard library.
@@ -268,8 +259,6 @@
 /// Returns `Err` if the global default has already been set.
 ///
 ///
-/// <div class="information">
-///     <div class="tooltip compile_fail" style="">&#x26a0; &#xfe0f;<span class="tooltiptext">Warning</span></div>
 /// </div><div class="example-wrap" style="display:inline-block"><pre class="compile_fail" style="white-space:normal;font:inherit;">
 /// <strong>Warning</strong>: In general, libraries should <em>not</em> call
 /// <code>set_global_default()</code>! Doing so will cause conflicts when
@@ -280,7 +269,16 @@
 /// [`Subscriber`]: ../subscriber/trait.Subscriber.html
 /// [`Event`]: ../event/struct.Event.html
 pub fn set_global_default(dispatcher: Dispatch) -> Result<(), SetGlobalDefaultError> {
-    if GLOBAL_INIT.compare_and_swap(UNINITIALIZED, INITIALIZING, Ordering::SeqCst) == UNINITIALIZED
+    // if `compare_exchange` returns Result::Ok(_), then `new` has been set and
+    // `current`—now the prior value—has been returned in the `Ok()` branch.
+    if GLOBAL_INIT
+        .compare_exchange(
+            UNINITIALIZED,
+            INITIALIZING,
+            Ordering::SeqCst,
+            Ordering::SeqCst,
+        )
+        .is_ok()
     {
         unsafe {
             GLOBAL_DISPATCH = Some(dispatcher);
@@ -563,7 +561,7 @@
     /// [`new_span`]: ../subscriber/trait.Subscriber.html#method.new_span
     #[inline]
     pub fn clone_span(&self, id: &span::Id) -> span::Id {
-        self.subscriber.clone_span(&id)
+        self.subscriber.clone_span(id)
     }
 
     /// Notifies the subscriber that a [span ID] has been dropped.
@@ -576,9 +574,6 @@
     /// This calls the [`drop_span`] function on the [`Subscriber`] that this
     ///  `Dispatch` forwards to.
     ///
-    /// <div class="information">
-    ///     <div class="tooltip compile_fail" style="">&#x26a0; &#xfe0f;<span class="tooltiptext">Warning</span></div>
-    /// </div>
     /// <div class="example-wrap" style="display:inline-block"><pre class="compile_fail" style="white-space:normal;font:inherit;">
     /// <strong>Deprecated</strong>: The <a href="#method.try_close"><code>try_close</code></a>
     /// method is functionally identical, but returns <code>true</code> if the span is now closed.
@@ -632,14 +627,14 @@
     /// `T`.
     #[inline]
     pub fn is<T: Any>(&self) -> bool {
-        Subscriber::is::<T>(&*self.subscriber)
+        <dyn Subscriber>::is::<T>(&*self.subscriber)
     }
 
     /// Returns some reference to the `Subscriber` this `Dispatch` forwards to
     /// if it is of type `T`, or `None` if it isn't.
     #[inline]
     pub fn downcast_ref<T: Any>(&self) -> Option<&T> {
-        Subscriber::downcast_ref(&*self.subscriber)
+        <dyn Subscriber>::downcast_ref(&*self.subscriber)
     }
 }
 
@@ -729,7 +724,7 @@
     #[inline]
     fn enter(&self) -> Option<Entered<'_>> {
         if self.can_enter.replace(false) {
-            Some(Entered(&self))
+            Some(Entered(self))
         } else {
             None
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/event.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/event.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/event.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/event.rs	2021-12-09 12:01:26.000000000 +0000
@@ -41,8 +41,8 @@
     #[inline]
     pub fn new(metadata: &'static Metadata<'static>, fields: &'a field::ValueSet<'a>) -> Self {
         Event {
-            metadata,
             fields,
+            metadata,
             parent: Parent::Current,
         }
     }
@@ -60,8 +60,8 @@
             None => Parent::Root,
         };
         Event {
-            metadata,
             fields,
+            metadata,
             parent,
         }
     }
@@ -101,10 +101,7 @@
 
     /// Returns true if the new event should be a root.
     pub fn is_root(&self) -> bool {
-        match self.parent {
-            Parent::Root => true,
-            _ => false,
-        }
+        matches!(self.parent, Parent::Root)
     }
 
     /// Returns true if the new event's parent should be determined based on the
@@ -115,10 +112,7 @@
     /// thread is _not_ inside a span, then the new event will be the root of its
     /// own trace tree.
     pub fn is_contextual(&self) -> bool {
-        match self.parent {
-            Parent::Current => true,
-            _ => false,
-        }
+        matches!(self.parent, Parent::Current)
     }
 
     /// Returns the new event's explicitly-specified parent, if there is one.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/field.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/field.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/field.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/field.rs	2021-12-09 12:01:26.000000000 +0000
@@ -169,9 +169,6 @@
 /// `examples/counters.rs`, which demonstrates a very simple metrics system
 /// implemented using `tracing`.
 ///
-/// <div class="information">
-///     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
-/// </div>
 /// <div class="example-wrap" style="display:inline-block">
 /// <pre class="ignore" style="white-space:normal;font:inherit;">
 /// <strong>Note</strong>: The <code>record_error</code> trait method is only
@@ -209,9 +206,6 @@
 
     /// Records a type implementing `Error`.
     ///
-    /// <div class="information">
-    ///     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
-    /// </div>
     /// <div class="example-wrap" style="display:inline-block">
     /// <pre class="ignore" style="white-space:normal;font:inherit;">
     /// <strong>Note</strong>: This is only enabled when the Rust standard library is
@@ -407,7 +401,7 @@
 
 impl Value for str {
     fn record(&self, key: &Field, visitor: &mut dyn Visit) {
-        visitor.record_str(key, &self)
+        visitor.record_str(key, self)
     }
 }
 
@@ -433,6 +427,19 @@
     }
 }
 
+impl<'a, T: ?Sized> crate::sealed::Sealed for &'a mut T where T: Value + crate::sealed::Sealed + 'a {}
+
+impl<'a, T: ?Sized> Value for &'a mut T
+where
+    T: Value + 'a,
+{
+    fn record(&self, key: &Field, visitor: &mut dyn Visit) {
+        // Don't use `(*self).record(key, visitor)`, otherwise would
+        // cause stack overflow due to `unconditional_recursion`.
+        T::record(self, key, visitor)
+    }
+}
+
 impl<'a> crate::sealed::Sealed for fmt::Arguments<'a> {}
 
 impl<'a> Value for fmt::Arguments<'a> {
@@ -623,9 +630,6 @@
 
     /// Returns `true` if `self` contains the given `field`.
     ///
-    /// <div class="information">
-    ///     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
-    /// </div>
     /// <div class="example-wrap" style="display:inline-block">
     /// <pre class="ignore" style="white-space:normal;font:inherit;">
     /// <strong>Note</strong>: If <code>field</code> shares a name with a field
@@ -662,7 +666,7 @@
     {
         ValueSet {
             fields: self,
-            values: &values.borrow()[..],
+            values: values.borrow(),
         }
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -23,7 +23,7 @@
 //! In addition, it defines the global callsite registry and per-thread current
 //! dispatcher which other components of the tracing system rely on.
 //!
-//! *Compiler support: [requires `rustc` 1.40+][msrv]*
+//! *Compiler support: [requires `rustc` 1.42+][msrv]*
 //!
 //! [msrv]: #supported-rust-versions
 //!
@@ -53,7 +53,7 @@
 //!
 //!   ```toml
 //!   [dependencies]
-//!   tracing-core = { version = "0.1.17", default-features = false }
+//!   tracing-core = { version = "0.1.19", default-features = false }
 //!   ```
 //!
 //!   **Note**:`tracing-core`'s `no_std` support requires `liballoc`.
@@ -61,7 +61,7 @@
 //! ## Supported Rust Versions
 //!
 //! Tracing is built against the latest stable release. The minimum supported
-//! version is 1.40. The current Tracing version is not guaranteed to build on
+//! version is 1.42. The current Tracing version is not guaranteed to build on
 //! Rust versions earlier than the minimum supported version.
 //!
 //! Tracing follows the same compiler support policies as the rest of the Tokio
@@ -85,7 +85,7 @@
 //! [`Dispatch`]: dispatcher/struct.Dispatch.html
 //! [`tokio-rs/tracing`]: https://github.com/tokio-rs/tracing
 //! [`tracing`]: https://crates.io/crates/tracing
-#![doc(html_root_url = "https://docs.rs/tracing-core/0.1.17")]
+#![doc(html_root_url = "https://docs.rs/tracing-core/0.1.19")]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tokio-rs/tracing/master/assets/logo-type.png",
     issue_tracker_base_url = "https://github.com/tokio-rs/tracing/issues/"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/metadata.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/metadata.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/metadata.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/metadata.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,9 @@
 ///   or event occurred. The `tracing` macros default to using the module
 ///   path where the span or event originated as the target, but it may be
 ///   overridden.
-/// - A [verbosity level].
+/// - A [verbosity level]. This determines how verbose a given span or event
+///   is, and allows enabling or disabling more verbose diagnostics
+///   situationally. See the documentation for the [`Level`] type for details.
 /// - The names of the [fields] defined by the span or event.
 /// - Whether the metadata corresponds to a span or event.
 ///
@@ -33,9 +35,6 @@
 /// _significantly_ lower than that of creating the actual span. Therefore,
 /// filtering is based on metadata, rather than on the constructed span.
 ///
-/// <div class="information">
-///     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
-/// </div>
 /// <div class="example-wrap" style="display:inline-block">
 /// <pre class="ignore" style="white-space:normal;font:inherit;">
 /// <strong>Note</strong>: Although instances of <code>Metadata</code> cannot
@@ -92,22 +91,152 @@
 /// Indicates whether the callsite is a span or event.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Kind(KindInner);
-
 /// Describes the level of verbosity of a span or event.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+///
+/// # Comparing Levels
+///
+/// `Level` implements the [`PartialOrd`] and [`Ord`] traits, allowing two
+/// `Level`s to be compared to determine which is considered more or less
+/// verbose. Levels which are more verbose are considered "greater than" levels
+/// which are less verbose, with [`Level::ERROR`] considered the lowest, and
+/// [`Level::TRACE`] considered the highest.
+///
+/// For example:
+/// ```
+/// use tracing_core::Level;
+///
+/// assert!(Level::TRACE > Level::DEBUG);
+/// assert!(Level::ERROR < Level::WARN);
+/// assert!(Level::INFO <= Level::DEBUG);
+/// assert_eq!(Level::TRACE, Level::TRACE);
+/// ```
+///
+/// # Filtering
+///
+/// `Level`s are typically used to implement filtering that determines which
+/// spans and events are enabled. Depending on the use case, more or less
+/// verbose diagnostics may be desired. For example, when running in
+/// development, [`DEBUG`]-level traces may be enabled by default. When running in
+/// production, only [`INFO`]-level and lower traces might be enabled. Libraries
+/// may include very verbose diagnostics at the [`DEBUG`] and/or [`TRACE`] levels.
+/// Applications using those libraries typically chose to ignore those traces. However, when
+/// debugging an issue involving said libraries, it may be useful to temporarily
+/// enable the more verbose traces.
+///
+/// The [`LevelFilter`] type is provided to enable filtering traces by
+/// verbosity. `Level`s can be compared against [`LevelFilter`]s, and
+/// [`LevelFilter`] has a variant for each `Level`, which compares analogously
+/// to that level. In addition, [`LevelFilter`] adds a [`LevelFilter::OFF`]
+/// variant, which is considered "less verbose" than every other `Level. This is
+/// intended to allow filters to completely disable tracing in a particular context.
+///
+/// For example:
+/// ```
+/// use tracing_core::{Level, LevelFilter};
+///
+/// assert!(LevelFilter::OFF < Level::TRACE);
+/// assert!(LevelFilter::TRACE > Level::DEBUG);
+/// assert!(LevelFilter::ERROR < Level::WARN);
+/// assert!(LevelFilter::INFO <= Level::DEBUG);
+/// assert!(LevelFilter::INFO >= Level::INFO);
+/// ```
+///
+/// ## Examples
+///
+/// Below is a simple example of how a [`Subscriber`] could implement filtering through
+/// a [`LevelFilter`]. When a span or event is recorded, the [`Subscriber::enabled`] method
+/// compares the span or event's `Level` against the configured [`LevelFilter`].
+/// The optional [`Subscriber::max_level_hint`] method can also be implemented to allow spans
+/// and events above a maximum verbosity level to be skipped more efficiently,
+/// often improving performance in short-lived programs.
+///
+/// ```
+/// use tracing_core::{span, Event, Level, LevelFilter, Subscriber, Metadata};
+/// # use tracing_core::span::{Id, Record, Current};
+///
+/// #[derive(Debug)]
+/// pub struct MySubscriber {
+///     /// The most verbose level that this subscriber will enable.
+///     max_level: LevelFilter,
+///
+///     // ...
+/// }
+///
+/// impl MySubscriber {
+///     /// Returns a new `MySubscriber` which will record spans and events up to
+///     /// `max_level`.
+///     pub fn with_max_level(max_level: LevelFilter) -> Self {
+///         Self {
+///             max_level,
+///             // ...
+///         }
+///     }
+/// }
+/// impl Subscriber for MySubscriber {
+///     fn enabled(&self, meta: &Metadata<'_>) -> bool {
+///         // A span or event is enabled if it is at or below the configured
+///         // maximum level.
+///         meta.level() <= &self.max_level
+///     }
+///
+///     // This optional method returns the most verbose level that this
+///     // subscriber will enable. Although implementing this method is not
+///     // *required*, it permits additional optimizations when it is provided,
+///     // allowing spans and events above the max level to be skipped
+///     // more efficiently.
+///     fn max_level_hint(&self) -> Option<LevelFilter> {
+///         Some(self.max_level)
+///     }
+///
+///     // Implement the rest of the subscriber...
+///     fn new_span(&self, span: &span::Attributes<'_>) -> span::Id {
+///         // ...
+///         # drop(span); Id::from_u64(1)
+///     }
+
+///     fn event(&self, event: &Event<'_>) {
+///         // ...
+///         # drop(event);
+///     }
+///
+///     // ...
+///     # fn enter(&self, _: &Id) {}
+///     # fn exit(&self, _: &Id) {}
+///     # fn record(&self, _: &Id, _: &Record<'_>) {}
+///     # fn record_follows_from(&self, _: &Id, _: &Id) {}
+/// }
+/// ```
+///
+/// It is worth noting that the `tracing-subscriber` crate provides [additional
+/// APIs][envfilter] for performing more sophisticated filtering, such as
+/// enabling different levels based on which module or crate a span or event is
+/// recorded in.
+///
+/// [`DEBUG`]: Level::DEBUG
+/// [`INFO`]: Level::INFO
+/// [`TRACE`]: Level::TRACE
+/// [`Subscriber::enabled`]: crate::subscriber::Subscriber::enabled
+/// [`Subscriber::max_level_hint`]: crate::subscriber::Subscriber::max_level_hint
+/// [subscriber]: crate::subscriber::Subscriber
+/// [envfilter]: https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Level(LevelInner);
 
-/// A filter comparable to a verbosity `Level`.
+/// A filter comparable to a verbosity [`Level`].
 ///
-/// If a `Level` is considered less than a `LevelFilter`, it should be
+/// If a [`Level`] is considered less than a `LevelFilter`, it should be
 /// considered disabled; if greater than or equal to the `LevelFilter`, that
 /// level is enabled.
 ///
 /// Note that this is essentially identical to the `Level` type, but with the
-/// addition of an `OFF` level that completely disables all trace
+/// addition of an [`OFF`] level that completely disables all trace
 /// instrumentation.
+///
+/// See the documentation for the [`Level`] type for more details.
+///
+/// [`OFF`]: LevelFilter::OFF
 #[repr(transparent)]
-#[derive(Copy, Clone, Eq, PartialEq)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash)]
 pub struct LevelFilter(Option<Level>);
 
 /// Indicates that a string could not be parsed to a valid level.
@@ -251,18 +380,12 @@
 
     /// Return true if the callsite kind is `Span`
     pub fn is_span(&self) -> bool {
-        match self {
-            Kind(KindInner::Span) => true,
-            _ => false,
-        }
+        matches!(self, Kind(KindInner::Span))
     }
 
     /// Return true if the callsite kind is `Event`
     pub fn is_event(&self) -> bool {
-        match self {
-            Kind(KindInner::Event) => true,
-            _ => false,
-        }
+        matches!(self, Kind(KindInner::Event))
     }
 }
 
@@ -289,6 +412,19 @@
     ///
     /// Designates very low priority, often extremely verbose, information.
     pub const TRACE: Level = Level(LevelInner::Trace);
+
+    /// Returns the string representation of the `Level`.
+    ///
+    /// This returns the same string as the `fmt::Display` implementation.
+    pub fn as_str(&self) -> &'static str {
+        match *self {
+            Level::TRACE => "TRACE",
+            Level::DEBUG => "DEBUG",
+            Level::INFO => "INFO",
+            Level::WARN => "WARN",
+            Level::ERROR => "ERROR",
+        }
+    }
 }
 
 impl fmt::Display for Level {
@@ -372,10 +508,10 @@
     }
 }
 
-impl Into<Option<Level>> for LevelFilter {
+impl From<LevelFilter> for Option<Level> {
     #[inline]
-    fn into(self) -> Option<Level> {
-        self.into_level()
+    fn from(filter: LevelFilter) -> Self {
+        filter.into_level()
     }
 }
 
@@ -554,7 +690,7 @@
                 s if s.eq_ignore_ascii_case("off") => Some(LevelFilter::OFF),
                 _ => None,
             })
-            .ok_or_else(|| ParseLevelFilterError(()))
+            .ok_or(ParseLevelFilterError(()))
     }
 }
 
@@ -825,10 +961,10 @@
             (LevelFilter::TRACE, Some(Level::TRACE)),
         ];
         for (filter, level) in mapping.iter() {
-            assert_eq!(filter.clone().into_level(), *level);
+            assert_eq!(filter.into_level(), *level);
             match level {
                 Some(level) => {
-                    let actual: LevelFilter = level.clone().into();
+                    let actual: LevelFilter = (*level).into();
                     assert_eq!(actual, *filter);
                 }
                 None => {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/span.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/span.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/span.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/span.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,5 @@
 //! Spans represent periods of time in the execution of a program.
+use crate::field::FieldSet;
 use crate::parent::Parent;
 use crate::stdlib::num::NonZeroU64;
 use crate::{field, Metadata};
@@ -60,15 +61,12 @@
 impl Id {
     /// Constructs a new span ID from the given `u64`.
     ///
-    /// <div class="information">
-    ///     <div class="tooltip ignore" style="">ⓘ<span class="tooltiptext">Note</span></div>
-    /// </div>
     /// <div class="example-wrap" style="display:inline-block">
     /// <pre class="ignore" style="white-space:normal;font:inherit;">
     /// <strong>Note</strong>: Span IDs must be greater than zero.</pre></div>
     ///
     /// # Panics
-    /// - If the provided `u64` is 0
+    /// - If the provided `u64` is 0.
     pub fn from_u64(u: u64) -> Self {
         Id(NonZeroU64::new(u).expect("span IDs must be > 0"))
     }
@@ -97,9 +95,9 @@
     }
 }
 
-impl<'a> Into<Option<Id>> for &'a Id {
-    fn into(self) -> Option<Id> {
-        Some(self.clone())
+impl<'a> From<&'a Id> for Option<Id> {
+    fn from(id: &'a Id) -> Self {
+        Some(id.clone())
     }
 }
 
@@ -153,10 +151,7 @@
 
     /// Returns true if the new span should be a root.
     pub fn is_root(&self) -> bool {
-        match self.parent {
-            Parent::Root => true,
-            _ => false,
-        }
+        matches!(self.parent, Parent::Root)
     }
 
     /// Returns true if the new span's parent should be determined based on the
@@ -167,10 +162,7 @@
     /// thread is _not_ inside a span, then the new span will be the root of its
     /// own trace tree.
     pub fn is_contextual(&self) -> bool {
-        match self.parent {
-            Parent::Current => true,
-            _ => false,
-        }
+        matches!(self.parent, Parent::Current)
     }
 
     /// Returns the new span's explicitly-specified parent, if there is one.
@@ -202,6 +194,21 @@
     pub fn is_empty(&self) -> bool {
         self.values.is_empty()
     }
+
+    /// Returns the set of all [fields] defined by this span's [`Metadata`].
+    ///
+    /// Note that the [`FieldSet`] returned by this method includes *all* the
+    /// fields declared by this span, not just those with values that are recorded
+    /// as part of this set of `Attributes`. Other fields with values not present in
+    /// this `Attributes`' value set may [record] values later.
+    ///
+    /// [fields]: crate::field
+    /// [record]: Attributes::record()
+    /// [`Metadata`]: crate::metadata::Metadata
+    /// [`FieldSet`]: crate::field::FieldSet
+    pub fn fields(&self) -> &FieldSet {
+        self.values.field_set()
+    }
 }
 
 // ===== impl Record =====
@@ -270,10 +277,7 @@
     /// [`metadata`]: #method.metadata
     /// [`into_inner`]: #method.into_inner
     pub fn is_known(&self) -> bool {
-        match self.inner {
-            CurrentInner::Unknown => false,
-            _ => true,
-        }
+        !matches!(self.inner, CurrentInner::Unknown)
     }
 
     /// Consumes `self` and returns the span `Id` and `Metadata` of the current
@@ -296,32 +300,35 @@
     /// Borrows the `Metadata` of the current span, if one exists and is known.
     pub fn metadata(&self) -> Option<&'static Metadata<'static>> {
         match self.inner {
-            CurrentInner::Current { ref metadata, .. } => Some(*metadata),
+            CurrentInner::Current { metadata, .. } => Some(metadata),
             _ => None,
         }
     }
 }
 
-impl<'a> Into<Option<&'a Id>> for &'a Current {
-    fn into(self) -> Option<&'a Id> {
-        self.id()
+impl<'a> From<&'a Current> for Option<&'a Id> {
+    fn from(cur: &'a Current) -> Self {
+        cur.id()
     }
 }
 
-impl<'a> Into<Option<Id>> for &'a Current {
-    fn into(self) -> Option<Id> {
-        self.id().cloned()
+impl<'a> From<&'a Current> for Option<Id> {
+    fn from(cur: &'a Current) -> Self {
+        cur.id().cloned()
     }
 }
 
-impl Into<Option<Id>> for Current {
-    fn into(self) -> Option<Id> {
-        self.id().cloned()
+impl From<Current> for Option<Id> {
+    fn from(cur: Current) -> Self {
+        match cur.inner {
+            CurrentInner::Current { id, .. } => Some(id),
+            _ => None,
+        }
     }
 }
 
-impl<'a> Into<Option<&'static Metadata<'static>>> for &'a Current {
-    fn into(self) -> Option<&'static Metadata<'static>> {
-        self.metadata()
+impl<'a> From<&'a Current> for Option<&'static Metadata<'static>> {
+    fn from(cur: &'a Current) -> Self {
+        cur.metadata()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/subscriber.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/subscriber.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-core/src/subscriber.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-core/src/subscriber.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,7 +1,11 @@
 //! Subscribers collect and record trace data.
 use crate::{span, Event, LevelFilter, Metadata};
 
-use crate::stdlib::any::{Any, TypeId};
+use crate::stdlib::{
+    any::{Any, TypeId},
+    boxed::Box,
+    sync::Arc,
+};
 
 /// Trait representing the functions required to collect trace data.
 ///
@@ -528,30 +532,21 @@
     /// about this callsite.
     #[inline]
     pub fn is_never(&self) -> bool {
-        match self.0 {
-            InterestKind::Never => true,
-            _ => false,
-        }
+        matches!(self.0, InterestKind::Never)
     }
 
     /// Returns `true` if the subscriber is sometimes interested in being notified
     /// about this callsite.
     #[inline]
     pub fn is_sometimes(&self) -> bool {
-        match self.0 {
-            InterestKind::Sometimes => true,
-            _ => false,
-        }
+        matches!(self.0, InterestKind::Sometimes)
     }
 
     /// Returns `true` if the subscriber is always interested in being notified
     /// about this callsite.
     #[inline]
     pub fn is_always(&self) -> bool {
-        match self.0 {
-            InterestKind::Always => true,
-            _ => false,
-        }
+        matches!(self.0, InterestKind::Always)
     }
 
     /// Returns the common interest between these two Interests.
@@ -568,3 +563,157 @@
         }
     }
 }
+
+impl Subscriber for Box<dyn Subscriber + Send + Sync + 'static> {
+    #[inline]
+    fn register_callsite(&self, metadata: &'static Metadata<'static>) -> Interest {
+        self.as_ref().register_callsite(metadata)
+    }
+
+    #[inline]
+    fn enabled(&self, metadata: &Metadata<'_>) -> bool {
+        self.as_ref().enabled(metadata)
+    }
+
+    #[inline]
+    fn max_level_hint(&self) -> Option<LevelFilter> {
+        self.as_ref().max_level_hint()
+    }
+
+    #[inline]
+    fn new_span(&self, span: &span::Attributes<'_>) -> span::Id {
+        self.as_ref().new_span(span)
+    }
+
+    #[inline]
+    fn record(&self, span: &span::Id, values: &span::Record<'_>) {
+        self.as_ref().record(span, values)
+    }
+
+    #[inline]
+    fn record_follows_from(&self, span: &span::Id, follows: &span::Id) {
+        self.as_ref().record_follows_from(span, follows)
+    }
+
+    #[inline]
+    fn event(&self, event: &Event<'_>) {
+        self.as_ref().event(event)
+    }
+
+    #[inline]
+    fn enter(&self, span: &span::Id) {
+        self.as_ref().enter(span)
+    }
+
+    #[inline]
+    fn exit(&self, span: &span::Id) {
+        self.as_ref().exit(span)
+    }
+
+    #[inline]
+    fn clone_span(&self, id: &span::Id) -> span::Id {
+        self.as_ref().clone_span(id)
+    }
+
+    #[inline]
+    fn try_close(&self, id: span::Id) -> bool {
+        self.as_ref().try_close(id)
+    }
+
+    #[inline]
+    #[allow(deprecated)]
+    fn drop_span(&self, id: span::Id) {
+        self.as_ref().try_close(id);
+    }
+
+    #[inline]
+    fn current_span(&self) -> span::Current {
+        self.as_ref().current_span()
+    }
+
+    #[inline]
+    unsafe fn downcast_raw(&self, id: TypeId) -> Option<*const ()> {
+        if id == TypeId::of::<Self>() {
+            return Some(self as *const Self as *const _);
+        }
+
+        self.as_ref().downcast_raw(id)
+    }
+}
+
+impl Subscriber for Arc<dyn Subscriber + Send + Sync + 'static> {
+    #[inline]
+    fn register_callsite(&self, metadata: &'static Metadata<'static>) -> Interest {
+        self.as_ref().register_callsite(metadata)
+    }
+
+    #[inline]
+    fn enabled(&self, metadata: &Metadata<'_>) -> bool {
+        self.as_ref().enabled(metadata)
+    }
+
+    #[inline]
+    fn max_level_hint(&self) -> Option<LevelFilter> {
+        self.as_ref().max_level_hint()
+    }
+
+    #[inline]
+    fn new_span(&self, span: &span::Attributes<'_>) -> span::Id {
+        self.as_ref().new_span(span)
+    }
+
+    #[inline]
+    fn record(&self, span: &span::Id, values: &span::Record<'_>) {
+        self.as_ref().record(span, values)
+    }
+
+    #[inline]
+    fn record_follows_from(&self, span: &span::Id, follows: &span::Id) {
+        self.as_ref().record_follows_from(span, follows)
+    }
+
+    #[inline]
+    fn event(&self, event: &Event<'_>) {
+        self.as_ref().event(event)
+    }
+
+    #[inline]
+    fn enter(&self, span: &span::Id) {
+        self.as_ref().enter(span)
+    }
+
+    #[inline]
+    fn exit(&self, span: &span::Id) {
+        self.as_ref().exit(span)
+    }
+
+    #[inline]
+    fn clone_span(&self, id: &span::Id) -> span::Id {
+        self.as_ref().clone_span(id)
+    }
+
+    #[inline]
+    fn try_close(&self, id: span::Id) -> bool {
+        self.as_ref().try_close(id)
+    }
+
+    #[inline]
+    #[allow(deprecated)]
+    fn drop_span(&self, id: span::Id) {
+        self.as_ref().try_close(id);
+    }
+
+    #[inline]
+    fn current_span(&self) -> span::Current {
+        self.as_ref().current_span()
+    }
+
+    #[inline]
+    unsafe fn downcast_raw(&self, id: TypeId) -> Option<*const ()> {
+        if id == TypeId::of::<Self>() {
+            return Some(self as *const Self as *const _);
+        }
+
+        self.as_ref().downcast_raw(id)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"a04da92598ba15d2df5e2b33568b7070ebc5d9e8d36ac7ff4fa6866d8723a5dc","Cargo.toml":"bd0aa5902185d97d1ea66e4dabb343d5343e3104080b32cf00a68cdaa870b147","README.md":"c547ca291ce49370e607c7d9dad420ba25c7296b699dac3b64759b52d8960e2e","src/executor/futures_01.rs":"0fa61bd42b073f773366c9654bebbc0cc8f8fcebe277c77fd234b4ef12274b44","src/executor/futures_03.rs":"a35c90808e5ae7c2f14900c1f247fc09b5b6a881b8bc31c39b7e37952ce67cc0","src/executor/futures_preview.rs":"bd5389303042508c78ce5c268439ceffa3a09e2cf1c60fdce7db4d1d87c4d3d9","src/executor/mod.rs":"853599e2d86926b0d5a9eb1844e67f446d712e1cb69e2b4fbd41fa2db4f92ec6","src/lib.rs":"49bd428019ee09447e1c29289211c33ad3014d36a8b3c58e22f36cc4b28af256","src/stdlib.rs":"ab87b9c4253344ef0bc580b5b4ea0d2662a908188ed9aa1fee688ad04e9dd1a9","tests/std_future.rs":"9618aad31b0c3c842a4d0156f5a3252aff8e8dc92ce03c9b8836a54360f9c655","tests/support.rs":"7ea63c57f453d7035f90b6daad48865471391421b98670c34845abaf898ddf6a"},"package":"ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "tracing-futures"
-version = "0.2.4"
-authors = ["Eliza Weisman <eliza@buoyant.io>", "Tokio Contributors <team@tokio.rs>"]
-description = "Utilities for instrumenting `futures` with `tracing`.\n"
-homepage = "https://tokio.rs"
-readme = "README.md"
-keywords = ["logging", "profiling", "tracing", "futures", "async"]
-categories = ["development-tools::debugging", "development-tools::profiling", "asynchronous"]
-license = "MIT"
-repository = "https://github.com/tokio-rs/tracing"
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-[dependencies.futures]
-version = "0.3.0"
-optional = true
-
-[dependencies.futures-task]
-version = "0.3"
-optional = true
-
-[dependencies.futures_01]
-version = "0.1"
-optional = true
-package = "futures"
-
-[dependencies.pin-project]
-version = "0.4"
-optional = true
-
-[dependencies.tokio]
-version = "0.1"
-optional = true
-
-[dependencies.tokio-executor]
-version = "0.1"
-optional = true
-
-[dependencies.tracing]
-version = "0.1"
-default-features = false
-[dev-dependencies.tokio]
-version = "0.1.22"
-
-[dev-dependencies.tokio-test]
-version = "0.2"
-
-[dev-dependencies.tracing-core]
-version = "0.1.2"
-
-[features]
-default = ["std-future", "std"]
-futures-01 = ["futures_01", "std"]
-futures-03 = ["std-future", "futures", "futures-task", "std"]
-std = ["tracing/std"]
-std-future = ["pin-project"]
-[badges.maintenance]
-status = "actively-developed"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-# 0.2.4 (April 21, 2020)
-
-### Fixed
-
-- docs.rs build failures (#618)
-- Spelling in documentation skins -> sinks (#643)
-
-# 0.2.3 (Feb 26, 2020)
-
-### Added
-
-- `WithDispatch::inner` and `WithDispatch::inner_mut` methods to allow borrowing
-  the wrapped type (#589)
-- `WithDispatch::with_dispatch` method, to propagate the subscriber to another
-  type (#589)
-- `inner_pin_ref` and `inner_pin_mut` methods to `Instrumented` and
-  `WithDispatch` to project to the inner future when pinned (#590)
-
-# 0.2.2 (Feb 14, 2020)
-
-### Added
-
-- Support for `futures` 0.3 `Stream`s and `Sink`s (#544)
-
-### Fixed
-
-- Compilation errors when using the `futures-03` feature (#576)
-
-Thanks to @obergner and @najamelan for their contributions to this release!
-
-# 0.2.1 (Jan 15, 2020)
-
-### Added
-
-- API documentation now shows which features are required by feature-flagged items (#523)
-- `no_std` support (#498)
-
-# 0.2.0 (Dec 3, 2019)
-
-### Changed
-
-- **Breaking Change**: the default `Future` implementation comes from the `std-future` feature.
-  Compatibility with futures v0.1 is available via the `futures-01` feature.
-
-# 0.1.1 (Oct 25, 2019)
-
-### Added
-
-- `Instrumented::inner` and `inner_mut` methods that expose access to the
-  instrumented future (#386)
-
-# 0.1.0 (Oct 8, 2019)
-
-- Initial release
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-# tracing-futures
-
-Utilities for instrumenting futures-based code with [`tracing`].
-
-[![Crates.io][crates-badge]][crates-url]
-[![Documentation][docs-badge]][docs-url]
-[![Documentation (master)][docs-master-badge]][docs-master-url]
-[![MIT licensed][mit-badge]][mit-url]
-[![Build Status][actions-badge]][actions-url]
-[![Discord chat][discord-badge]][discord-url]
-![maintenance status][maint-badge]
-
-[Documentation][docs-url] | [Chat][discord-url]
-
-[crates-badge]: https://img.shields.io/crates/v/tracing-futures.svg
-[crates-url]: https://crates.io/crates/tracing-futures/0.2.3
-[docs-badge]: https://docs.rs/tracing-futures/badge.svg
-[docs-url]: https://docs.rs/tracing-futures/0.2.3/tracing_futures
-[docs-master-badge]: https://img.shields.io/badge/docs-master-blue
-[docs-master-url]: https://tracing-rs.netlify.com/tracing_futures
-[mit-badge]: https://img.shields.io/badge/license-MIT-blue.svg
-[mit-url]: LICENSE
-[actions-badge]: https://github.com/tokio-rs/tracing/workflows/CI/badge.svg
-[actions-url]:https://github.com/tokio-rs/tracing/actions?query=workflow%3ACI
-[discord-badge]: https://img.shields.io/discord/500028886025895936?logo=discord&label=discord&logoColor=white
-[discord-url]: https://discord.gg/EeF3cQw
-[maint-badge]: https://img.shields.io/badge/maintenance-actively--developed-brightgreen.svg
-
-## Overview
-
-[`tracing`] is a framework for instrumenting Rust programs to collect
-structured, event-based diagnostic information. This crate provides utilities
-for using `tracing` to instrument asynchronous code written using futures and
-async/await.
-
-The crate provides the following traits:
-
-* [`Instrument`] allows a `tracing` [span] to be attached to a future, sink,
-  stream, or executor.
-
-* [`WithSubscriber`] allows a `tracing` [`Subscriber`] to be attached to a
-  future, sink, stream, or executor.
-
-[`Instrument`]: https://docs.rs/tracing-futures/0.2.3/tracing_futures/trait.Instrument.html
-[`WithSubscriber`]: https://docs.rs/tracing-futures/0.2.3/tracing_futures/trait.WithSubscriber.html
-[span]: https://docs.rs/tracing/latest/tracing/span/index.html
-[`Subscriber`]: https://docs.rs/tracing/latest/tracing/subscriber/index.html
-[`tracing`]: https://crates.io/tracing
-
-## License
-
-This project is licensed under the [MIT license](LICENSE).
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Tracing by you, shall be licensed as MIT, without any additional
-terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_01.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_01.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_01.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_01.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,343 +0,0 @@
-use crate::{Instrument, Instrumented, WithDispatch};
-use futures_01::{
-    future::{ExecuteError, Executor},
-    Future,
-};
-
-macro_rules! deinstrument_err {
-    ($e:expr) => {
-        $e.map_err(|e| {
-            let kind = e.kind();
-            let future = e.into_future().inner;
-            ExecuteError::new(kind, future)
-        })
-    };
-}
-
-impl<T, F> Executor<F> for Instrumented<T>
-where
-    T: Executor<Instrumented<F>>,
-    F: Future<Item = (), Error = ()>,
-{
-    fn execute(&self, future: F) -> Result<(), ExecuteError<F>> {
-        let future = future.instrument(self.span.clone());
-        deinstrument_err!(self.inner.execute(future))
-    }
-}
-
-impl<T, F> Executor<F> for WithDispatch<T>
-where
-    T: Executor<WithDispatch<F>>,
-    F: Future<Item = (), Error = ()>,
-{
-    fn execute(&self, future: F) -> Result<(), ExecuteError<F>> {
-        let future = self.with_dispatch(future);
-        deinstrument_err!(self.inner.execute(future))
-    }
-}
-
-#[cfg(feature = "tokio")]
-#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
-pub use self::tokio::*;
-
-#[cfg(feature = "tokio")]
-mod tokio {
-    use crate::{Instrument, Instrumented, WithDispatch};
-    use futures_01::Future;
-    use tokio::{
-        executor::{Executor, SpawnError, TypedExecutor},
-        runtime::{current_thread, Runtime, TaskExecutor},
-    };
-
-    impl<T> Executor for Instrumented<T>
-    where
-        T: Executor,
-    {
-        fn spawn(
-            &mut self,
-            future: Box<dyn Future<Error = (), Item = ()> + 'static + Send>,
-        ) -> Result<(), SpawnError> {
-            // TODO: get rid of double box somehow?
-            let future = Box::new(future.instrument(self.span.clone()));
-            self.inner.spawn(future)
-        }
-    }
-
-    impl<T, F> TypedExecutor<F> for Instrumented<T>
-    where
-        T: TypedExecutor<Instrumented<F>>,
-    {
-        fn spawn(&mut self, future: F) -> Result<(), SpawnError> {
-            self.inner.spawn(future.instrument(self.span.clone()))
-        }
-
-        fn status(&self) -> Result<(), SpawnError> {
-            self.inner.status()
-        }
-    }
-
-    impl Instrumented<Runtime> {
-        /// Spawn an instrumented future onto the Tokio runtime.
-        ///
-        /// This spawns the given future onto the runtime's executor, usually a
-        /// thread pool. The thread pool is then responsible for polling the
-        /// future until it completes.
-        ///
-        /// This method simply wraps a call to `tokio::runtime::Runtime::spawn`,
-        /// instrumenting the spawned future beforehand.
-        pub fn spawn<F>(&mut self, future: F) -> &mut Self
-        where
-            F: Future<Item = (), Error = ()> + Send + 'static,
-        {
-            let future = future.instrument(self.span.clone());
-            self.inner.spawn(future);
-            self
-        }
-
-        /// Run an instrumented future to completion on the Tokio runtime.
-        ///
-        /// This runs the given future on the runtime, blocking until it is
-        /// complete, and yielding its resolved result. Any tasks or timers which
-        /// the future spawns internally will be executed on the runtime.
-        ///
-        /// This method should not be called from an asynchronous context.
-        ///
-        /// This method simply wraps a call to `tokio::runtime::Runtime::block_on`,
-        /// instrumenting the spawned future beforehand.
-        ///
-        /// # Panics
-        ///
-        /// This function panics if the executor is at capacity, if the provided
-        /// future panics, or if called within an asynchronous execution context.
-        pub fn block_on<F, R, E>(&mut self, future: F) -> Result<R, E>
-        where
-            F: Send + 'static + Future<Item = R, Error = E>,
-            R: Send + 'static,
-            E: Send + 'static,
-        {
-            let future = future.instrument(self.span.clone());
-            self.inner.block_on(future)
-        }
-
-        /// Return an instrumented handle to the runtime's executor.
-        ///
-        /// The returned handle can be used to spawn tasks that run on this runtime.
-        ///
-        /// The instrumented handle functions identically to a
-        /// `tokio::runtime::TaskExecutor`, but instruments the spawned
-        /// futures prior to spawning them.
-        pub fn executor(&self) -> Instrumented<TaskExecutor> {
-            self.inner.executor().instrument(self.span.clone())
-        }
-    }
-
-    impl Instrumented<current_thread::Runtime> {
-        /// Spawn an instrumented future onto the single-threaded Tokio runtime.
-        ///
-        /// This method simply wraps a call to `current_thread::Runtime::spawn`,
-        /// instrumenting the spawned future beforehand.
-        pub fn spawn<F>(&mut self, future: F) -> &mut Self
-        where
-            F: Future<Item = (), Error = ()> + 'static,
-        {
-            let future = future.instrument(self.span.clone());
-            self.inner.spawn(future);
-            self
-        }
-
-        /// Instruments and runs the provided future, blocking the current thread
-        /// until the future completes.
-        ///
-        /// This function can be used to synchronously block the current thread
-        /// until the provided `future` has resolved either successfully or with an
-        /// error. The result of the future is then returned from this function
-        /// call.
-        ///
-        /// Note that this function will **also** execute any spawned futures on the
-        /// current thread, but will **not** block until these other spawned futures
-        /// have completed. Once the function returns, any uncompleted futures
-        /// remain pending in the `Runtime` instance. These futures will not run
-        /// until `block_on` or `run` is called again.
-        ///
-        /// The caller is responsible for ensuring that other spawned futures
-        /// complete execution by calling `block_on` or `run`.
-        ///
-        /// This method simply wraps a call to `current_thread::Runtime::block_on`,
-        /// instrumenting the spawned future beforehand.
-        ///
-        /// # Panics
-        ///
-        /// This function panics if the executor is at capacity, if the provided
-        /// future panics, or if called within an asynchronous execution context.
-        pub fn block_on<F, R, E>(&mut self, future: F) -> Result<R, E>
-        where
-            F: 'static + Future<Item = R, Error = E>,
-            R: 'static,
-            E: 'static,
-        {
-            let future = future.instrument(self.span.clone());
-            self.inner.block_on(future)
-        }
-
-        /// Get a new instrumented handle to spawn futures on the single-threaded
-        /// Tokio runtime
-        ///
-        /// Different to the runtime itself, the handle can be sent to different
-        /// threads.
-        ///
-        /// The instrumented handle functions identically to a
-        /// `tokio::runtime::current_thread::Handle`, but instruments the spawned
-        /// futures prior to spawning them.
-        pub fn handle(&self) -> Instrumented<current_thread::Handle> {
-            self.inner.handle().instrument(self.span.clone())
-        }
-    }
-
-    impl<T> Executor for WithDispatch<T>
-    where
-        T: Executor,
-    {
-        fn spawn(
-            &mut self,
-            future: Box<dyn Future<Error = (), Item = ()> + 'static + Send>,
-        ) -> Result<(), SpawnError> {
-            // TODO: get rid of double box?
-            let future = Box::new(self.with_dispatch(future));
-            self.inner.spawn(future)
-        }
-    }
-
-    impl<T, F> TypedExecutor<F> for WithDispatch<T>
-    where
-        T: TypedExecutor<WithDispatch<F>>,
-    {
-        fn spawn(&mut self, future: F) -> Result<(), SpawnError> {
-            self.inner.spawn(self.with_dispatch(future))
-        }
-
-        fn status(&self) -> Result<(), SpawnError> {
-            self.inner.status()
-        }
-    }
-
-    impl WithDispatch<Runtime> {
-        /// Spawn a future onto the Tokio runtime, in the context of this
-        /// `WithDispatch`'s trace dispatcher.
-        ///
-        /// This spawns the given future onto the runtime's executor, usually a
-        /// thread pool. The thread pool is then responsible for polling the
-        /// future until it completes.
-        ///
-        /// This method simply wraps a call to `tokio::runtime::Runtime::spawn`,
-        /// instrumenting the spawned future beforehand.
-        pub fn spawn<F>(&mut self, future: F) -> &mut Self
-        where
-            F: Future<Item = (), Error = ()> + Send + 'static,
-        {
-            let future = self.with_dispatch(future);
-            self.inner.spawn(future);
-            self
-        }
-
-        /// Run a future to completion on the Tokio runtime, in the context of this
-        /// `WithDispatch`'s trace dispatcher.
-        ///
-        /// This runs the given future on the runtime, blocking until it is
-        /// complete, and yielding its resolved result. Any tasks or timers which
-        /// the future spawns internally will be executed on the runtime.
-        ///
-        /// This method should not be called from an asynchronous context.
-        ///
-        /// This method simply wraps a call to `tokio::runtime::Runtime::block_on`,
-        /// instrumenting the spawned future beforehand.
-        ///
-        /// # Panics
-        ///
-        /// This function panics if the executor is at capacity, if the provided
-        /// future panics, or if called within an asynchronous execution context.
-        pub fn block_on<F, R, E>(&mut self, future: F) -> Result<R, E>
-        where
-            F: Send + 'static + Future<Item = R, Error = E>,
-            R: Send + 'static,
-            E: Send + 'static,
-        {
-            let future = self.with_dispatch(future);
-            self.inner.block_on(future)
-        }
-
-        /// Return a handle to the runtime's executor, in the context of this
-        /// `WithDispatch`'s trace dispatcher.
-        ///
-        /// The returned handle can be used to spawn tasks that run on this runtime.
-        ///
-        /// The instrumented handle functions identically to a
-        /// `tokio::runtime::TaskExecutor`, but instruments the spawned
-        /// futures prior to spawning them.
-        pub fn executor(&self) -> WithDispatch<TaskExecutor> {
-            self.with_dispatch(self.inner.executor())
-        }
-    }
-
-    impl WithDispatch<current_thread::Runtime> {
-        /// Spawn a future onto the single-threaded Tokio runtime, in the context
-        /// of this `WithDispatch`'s trace dispatcher.
-        ///
-        /// This method simply wraps a call to `current_thread::Runtime::spawn`,
-        /// instrumenting the spawned future beforehand.
-        pub fn spawn<F>(&mut self, future: F) -> &mut Self
-        where
-            F: Future<Item = (), Error = ()> + 'static,
-        {
-            let future = self.with_dispatch(future);
-            self.inner.spawn(future);
-            self
-        }
-
-        /// Runs the provided future in the context of this `WithDispatch`'s trace
-        /// dispatcher, blocking the current thread until the future completes.
-        ///
-        /// This function can be used to synchronously block the current thread
-        /// until the provided `future` has resolved either successfully or with an
-        /// error. The result of the future is then returned from this function
-        /// call.
-        ///
-        /// Note that this function will **also** execute any spawned futures on the
-        /// current thread, but will **not** block until these other spawned futures
-        /// have completed. Once the function returns, any uncompleted futures
-        /// remain pending in the `Runtime` instance. These futures will not run
-        /// until `block_on` or `run` is called again.
-        ///
-        /// The caller is responsible for ensuring that other spawned futures
-        /// complete execution by calling `block_on` or `run`.
-        ///
-        /// This method simply wraps a call to `current_thread::Runtime::block_on`,
-        /// instrumenting the spawned future beforehand.
-        ///
-        /// # Panics
-        ///
-        /// This function panics if the executor is at capacity, if the provided
-        /// future panics, or if called within an asynchronous execution context.
-        pub fn block_on<F, R, E>(&mut self, future: F) -> Result<R, E>
-        where
-            F: 'static + Future<Item = R, Error = E>,
-            R: 'static,
-            E: 'static,
-        {
-            let future = self.with_dispatch(future);
-            self.inner.block_on(future)
-        }
-
-        /// Get a new handle to spawn futures on the single-threaded Tokio runtime,
-        /// in the context of this `WithDispatch`'s trace dispatcher.\
-        ///
-        /// Different to the runtime itself, the handle can be sent to different
-        /// threads.
-        ///
-        /// The instrumented handle functions identically to a
-        /// `tokio::runtime::current_thread::Handle`, but the spawned
-        /// futures are run in the context of the trace dispatcher.
-        pub fn handle(&self) -> WithDispatch<current_thread::Handle> {
-            self.with_dispatch(self.inner.handle())
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_03.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_03.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_03.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_03.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-use crate::{Instrument, Instrumented, WithDispatch};
-use futures_task::{FutureObj, LocalFutureObj, LocalSpawn, Spawn, SpawnError};
-
-impl<T> Spawn for Instrumented<T>
-where
-    T: Spawn,
-{
-    /// Spawns a future that will be run to completion.
-    ///
-    /// # Errors
-    ///
-    /// The executor may be unable to spawn tasks. Spawn errors should
-    /// represent relatively rare scenarios, such as the executor
-    /// having been shut down so that it is no longer able to accept
-    /// tasks.
-    fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
-        let future = future.instrument(self.span.clone());
-        self.inner.spawn_obj(FutureObj::new(Box::new(future)))
-    }
-
-    /// Determines whether the executor is able to spawn new tasks.
-    ///
-    /// This method will return `Ok` when the executor is *likely*
-    /// (but not guaranteed) to accept a subsequent spawn attempt.
-    /// Likewise, an `Err` return means that `spawn` is likely, but
-    /// not guaranteed, to yield an error.
-    #[inline]
-    fn status(&self) -> Result<(), SpawnError> {
-        self.inner.status()
-    }
-}
-
-impl<T> Spawn for WithDispatch<T>
-where
-    T: Spawn,
-{
-    /// Spawns a future that will be run to completion.
-    ///
-    /// # Errors
-    ///
-    /// The executor may be unable to spawn tasks. Spawn errors should
-    /// represent relatively rare scenarios, such as the executor
-    /// having been shut down so that it is no longer able to accept
-    /// tasks.
-    fn spawn_obj(&self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
-        self.inner
-            .spawn_obj(FutureObj::new(Box::new(self.with_dispatch(future))))
-    }
-
-    /// Determines whether the executor is able to spawn new tasks.
-    ///
-    /// This method will return `Ok` when the executor is *likely*
-    /// (but not guaranteed) to accept a subsequent spawn attempt.
-    /// Likewise, an `Err` return means that `spawn` is likely, but
-    /// not guaranteed, to yield an error.
-    #[inline]
-    fn status(&self) -> Result<(), SpawnError> {
-        self.inner.status()
-    }
-}
-
-impl<T> LocalSpawn for Instrumented<T>
-where
-    T: LocalSpawn,
-{
-    /// Spawns a future that will be run to completion.
-    ///
-    /// # Errors
-    ///
-    /// The executor may be unable to spawn tasks. Spawn errors should
-    /// represent relatively rare scenarios, such as the executor
-    /// having been shut down so that it is no longer able to accept
-    /// tasks.
-    fn spawn_local_obj(&self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
-        let future = future.instrument(self.span.clone());
-        self.inner
-            .spawn_local_obj(LocalFutureObj::new(Box::new(future)))
-    }
-
-    /// Determines whether the executor is able to spawn new tasks.
-    ///
-    /// This method will return `Ok` when the executor is *likely*
-    /// (but not guaranteed) to accept a subsequent spawn attempt.
-    /// Likewise, an `Err` return means that `spawn` is likely, but
-    /// not guaranteed, to yield an error.
-    #[inline]
-    fn status_local(&self) -> Result<(), SpawnError> {
-        self.inner.status_local()
-    }
-}
-
-impl<T> LocalSpawn for WithDispatch<T>
-where
-    T: LocalSpawn,
-{
-    /// Spawns a future that will be run to completion.
-    ///
-    /// # Errors
-    ///
-    /// The executor may be unable to spawn tasks. Spawn errors should
-    /// represent relatively rare scenarios, such as the executor
-    /// having been shut down so that it is no longer able to accept
-    /// tasks.
-    fn spawn_local_obj(&self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
-        self.inner
-            .spawn_local_obj(LocalFutureObj::new(Box::new(self.with_dispatch(future))))
-    }
-
-    /// Determines whether the executor is able to spawn new tasks.
-    ///
-    /// This method will return `Ok` when the executor is *likely*
-    /// (but not guaranteed) to accept a subsequent spawn attempt.
-    /// Likewise, an `Err` return means that `spawn` is likely, but
-    /// not guaranteed, to yield an error.
-    #[inline]
-    fn status_local(&self) -> Result<(), SpawnError> {
-        self.inner.status_local()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_preview.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_preview.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_preview.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/executor/futures_preview.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-use crate::stdlib::future::Future;
-use crate::{Instrument, Instrumented, WithDispatch};
-use futures_core_preview::{
-    future::FutureObj,
-    task::{LocalSpawn, Spawn, SpawnError},
-};
-
-impl<T> Spawn for Instrumented<T>
-where
-    T: Spawn,
-{
-    /// Spawns a future that will be run to completion.
-    ///
-    /// # Errors
-    ///
-    /// The executor may be unable to spawn tasks. Spawn errors should
-    /// represent relatively rare scenarios, such as the executor
-    /// having been shut down so that it is no longer able to accept
-    /// tasks.
-    fn spawn_obj(&mut self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
-        let future = future.instrument(self.span.clone());
-        self.inner.spawn_obj(Box::pin(future))
-    }
-
-    /// Determines whether the executor is able to spawn new tasks.
-    ///
-    /// This method will return `Ok` when the executor is *likely*
-    /// (but not guaranteed) to accept a subsequent spawn attempt.
-    /// Likewise, an `Err` return means that `spawn` is likely, but
-    /// not guaranteed, to yield an error.
-    #[inline]
-    fn status(&self) -> Result<(), SpawnError> {
-        self.inner.status()
-    }
-}
-
-impl<T> Spawn for WithDispatch<T>
-where
-    T: Spawn,
-{
-    /// Spawns a future that will be run to completion.
-    ///
-    /// # Errors
-    ///
-    /// The executor may be unable to spawn tasks. Spawn errors should
-    /// represent relatively rare scenarios, such as the executor
-    /// having been shut down so that it is no longer able to accept
-    /// tasks.
-    fn spawn_obj(&mut self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
-        self.inner.spawn_obj(Box::pin(self.with_dispatch(future)))
-    }
-
-    /// Determines whether the executor is able to spawn new tasks.
-    ///
-    /// This method will return `Ok` when the executor is *likely*
-    /// (but not guaranteed) to accept a subsequent spawn attempt.
-    /// Likewise, an `Err` return means that `spawn` is likely, but
-    /// not guaranteed, to yield an error.
-    #[inline]
-    fn status(&self) -> Result<(), SpawnError> {
-        self.inner.status()
-    }
-}
-
-impl<T> LocalSpawn for Instrumented<T>
-where
-    T: LocalSpawn,
-{
-    /// Spawns a future that will be run to completion.
-    ///
-    /// # Errors
-    ///
-    /// The executor may be unable to spawn tasks. Spawn errors should
-    /// represent relatively rare scenarios, such as the executor
-    /// having been shut down so that it is no longer able to accept
-    /// tasks.
-    fn spawn_local_obj(&mut self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
-        let future = future.instrument(self.span.clone());
-        self.inner.spawn_local_obj(Box::pin(future))
-    }
-
-    /// Determines whether the executor is able to spawn new tasks.
-    ///
-    /// This method will return `Ok` when the executor is *likely*
-    /// (but not guaranteed) to accept a subsequent spawn attempt.
-    /// Likewise, an `Err` return means that `spawn` is likely, but
-    /// not guaranteed, to yield an error.
-    #[inline]
-    fn status_local(&self) -> Result<(), SpawnError> {
-        self.inner.status_local()
-    }
-}
-
-impl<T> LocalSpawn for WithDispatch<T>
-where
-    T: Spawn,
-{
-    /// Spawns a future that will be run to completion.
-    ///
-    /// # Errors
-    ///
-    /// The executor may be unable to spawn tasks. Spawn errors should
-    /// represent relatively rare scenarios, such as the executor
-    /// having been shut down so that it is no longer able to accept
-    /// tasks.
-    fn spawn_local_obj(&mut self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
-        self.inner
-            .spawn_local_obj(Box::pin(self.with_dispatch(future)))
-    }
-
-    /// Determines whether the executor is able to spawn new tasks.
-    ///
-    /// This method will return `Ok` when the executor is *likely*
-    /// (but not guaranteed) to accept a subsequent spawn attempt.
-    /// Likewise, an `Err` return means that `spawn` is likely, but
-    /// not guaranteed, to yield an error.
-    #[inline]
-    fn status_local(&self) -> Result<(), SpawnError> {
-        self.inner.status_local()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/executor/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/executor/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/executor/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/executor/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#[cfg(feature = "futures-01")]
-mod futures_01;
-#[cfg(feature = "futures-01")]
-pub use self::futures_01::*;
-
-#[cfg(feature = "futures_preview")]
-mod futures_preview;
-#[cfg(feature = "futures_preview")]
-pub use self::futures_preview::*;
-
-#[cfg(feature = "futures-03")]
-mod futures_03;
-#[cfg(feature = "futures-03")]
-pub use self::futures_03::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,684 +0,0 @@
-//! Futures compatibility for [`tracing`].
-//!
-//! # Overview
-//!
-//! [`tracing`] is a framework for instrumenting Rust programs to collect
-//! structured, event-based diagnostic information. This crate provides utilities
-//! for using `tracing` to instrument asynchronous code written using futures and
-//! async/await.
-//!
-//! The crate provides the following traits:
-//!
-//! * [`Instrument`] allows a `tracing` [span] to be attached to a future, sink,
-//!   stream, or executor.
-//!
-//! * [`WithSubscriber`] allows a `tracing` [`Subscriber`] to be attached to a
-//!   future, sink, stream, or executor.
-//!
-//! # Feature flags
-//!
-//! This crate provides a number of feature flags that enable compatibility
-//! features with other crates in the asynchronous ecosystem:
-//!
-//! - `tokio`: Enables compatibility with the `tokio` crate, including
-//!    [`Instrument`] and [`WithSubscriber`] implementations for
-//!    `tokio::executor::Executor`, `tokio::runtime::Runtime`, and
-//!    `tokio::runtime::current_thread`. Enabled by default.
-//! - `tokio-executor`: Enables compatibility with the `tokio-executor`
-//!    crate, including  [`Instrument`] and [`WithSubscriber`]
-//!    implementations for types implementing `tokio_executor::Executor`.
-//!    This is intended primarily for use in crates which depend on
-//!    `tokio-executor` rather than `tokio`; in general the `tokio` feature
-//!    should be used instead.
-//! - `std-future`: Enables compatibility with `std::future::Future`.
-//! - `futures-01`: Enables compatibility with version 0.1.x of the [`futures`]
-//!   crate.
-//! - `futures-03`: Enables compatibility with version 0.3.x of the `futures`
-//!   crate's `Spawn` and `LocalSpawn` traits.
-//! - `tokio-alpha`: Enables compatibility with `tokio` 0.2's alpha releases,
-//!   including the `tokio` 0.2 `Executor` and `TypedExecutor` traits.
-//! - `std`: Depend on the Rust standard library.
-//!
-//!   `no_std` users may disable this feature with `default-features = false`:
-//!
-//!   ```toml
-//!   [dependencies]
-//!   tracing-futures = { version = "0.2.3", default-features = false }
-//!   ```
-//!
-//! The `tokio`, `std-future` and `std` features are enabled by default.
-//!
-//! [`tracing`]: https://crates.io/crates/tracing
-//! [span]: https://docs.rs/tracing/latest/tracing/span/index.html
-//! [`Subscriber`]: https://docs.rs/tracing/latest/tracing/subscriber/index.html
-//! [`Instrument`]: trait.Instrument.html
-//! [`WithSubscriber`]: trait.WithSubscriber.html
-//! [`futures`]: https://crates.io/crates/futures
-#![doc(html_root_url = "https://docs.rs/tracing-futures/0.2.3")]
-#![warn(
-    missing_debug_implementations,
-    missing_docs,
-    rust_2018_idioms,
-    unreachable_pub,
-    bad_style,
-    const_err,
-    dead_code,
-    improper_ctypes,
-    non_shorthand_field_patterns,
-    no_mangle_generic_items,
-    overflowing_literals,
-    path_statements,
-    patterns_in_fns_without_body,
-    private_in_public,
-    unconditional_recursion,
-    unused,
-    unused_allocation,
-    unused_comparisons,
-    unused_parens,
-    while_true
-)]
-#![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
-#[cfg(feature = "std-future")]
-use pin_project::pin_project;
-
-pub(crate) mod stdlib;
-
-#[cfg(feature = "std-future")]
-use crate::stdlib::{pin::Pin, task::Context};
-
-use tracing::dispatcher;
-use tracing::{Dispatch, Span};
-
-/// Implementations for `Instrument`ed future executors.
-pub mod executor;
-
-/// Extension trait allowing futures, streams, sinks, and executors to be
-/// instrumented with a `tracing` [span].
-///
-/// [span]: https://docs.rs/tracing/latest/tracing/span/index.html
-pub trait Instrument: Sized {
-    /// Instruments this type with the provided `Span`, returning an
-    /// `Instrumented` wrapper.
-    ///
-    /// If the instrumented type is a future, stream, or sink, the attached `Span`
-    /// will be [entered] every time it is polled. If the instrumented type
-    /// is a future executor, every future spawned on that executor will be
-    /// instrumented by the attached `Span`.
-    ///
-    /// # Examples
-    ///
-    /// Instrumenting a future:
-    ///
-    // TODO: ignored until async-await is stable...
-    /// ```rust,ignore
-    /// use tracing_futures::Instrument;
-    ///
-    /// # async fn doc() {
-    /// let my_future = async {
-    ///     // ...
-    /// };
-    ///
-    /// my_future
-    ///     .instrument(tracing::info_span!("my_future"))
-    ///     .await
-    /// # }
-    /// ```
-    ///
-    /// [entered]: https://docs.rs/tracing/latest/tracing/span/struct.Span.html#method.enter
-    fn instrument(self, span: Span) -> Instrumented<Self> {
-        Instrumented { inner: self, span }
-    }
-
-    /// Instruments this type with the [current] `Span`, returning an
-    /// `Instrumented` wrapper.
-    ///
-    /// If the instrumented type is a future, stream, or sink, the attached `Span`
-    /// will be [entered] every time it is polled. If the instrumented type
-    /// is a future executor, every future spawned on that executor will be
-    /// instrumented by the attached `Span`.
-    ///
-    /// This can be used to propagate the current span when spawning a new future.
-    ///
-    /// # Examples
-    ///
-    // TODO: ignored until async-await is stable...
-    /// ```rust,ignore
-    /// use tracing_futures::Instrument;
-    ///
-    /// # async fn doc() {
-    /// let span = tracing::info_span!("my_span");
-    /// let _enter = span.enter();
-    ///
-    /// // ...
-    ///
-    /// let future = async {
-    ///     tracing::debug!("this event will occur inside `my_span`");
-    ///     // ...
-    /// };
-    /// tokio::spawn(future.in_current_span());
-    /// # }
-    /// ```
-    ///
-    /// [current]: https://docs.rs/tracing/latest/tracing/span/struct.Span.html#method.current
-    /// [entered]: https://docs.rs/tracing/latest/tracing/span/struct.Span.html#method.enter
-    #[inline]
-    fn in_current_span(self) -> Instrumented<Self> {
-        self.instrument(Span::current())
-    }
-}
-
-/// Extension trait allowing futures, streams, and sinks to be instrumented with
-/// a `tracing` [`Subscriber`].
-///
-/// [`Subscriber`]: https://docs.rs/tracing/latest/tracing/subscriber/trait.Subscriber.html
-#[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
-pub trait WithSubscriber: Sized {
-    /// Attaches the provided [`Subscriber`] to this type, returning a
-    /// `WithDispatch` wrapper.
-    ///
-    /// When the wrapped type is a future, stream, or sink, the attached
-    /// subscriber will be set as the [default] while it is being polled.
-    /// When the wrapped type is an executor, the subscriber will be set as the
-    /// default for any futures spawned on that executor.
-    ///
-    /// [`Subscriber`]: https://docs.rs/tracing/latest/tracing/subscriber/trait.Subscriber.html
-    /// [default]: https://docs.rs/tracing/latest/tracing/dispatcher/index.html#setting-the-default-subscriber
-    fn with_subscriber<S>(self, subscriber: S) -> WithDispatch<Self>
-    where
-        S: Into<Dispatch>,
-    {
-        WithDispatch {
-            inner: self,
-            dispatch: subscriber.into(),
-        }
-    }
-
-    /// Attaches the current [default] [`Subscriber`] to this type, returning a
-    /// `WithDispatch` wrapper.
-    ///
-    /// When the wrapped type is a future, stream, or sink, the attached
-    /// subscriber will be set as the [default] while it is being polled.
-    /// When the wrapped type is an executor, the subscriber will be set as the
-    /// default for any futures spawned on that executor.
-    ///
-    /// This can be used to propagate the current dispatcher context when
-    /// spawning a new future.
-    ///
-    /// [`Subscriber`]: https://docs.rs/tracing/latest/tracing/subscriber/trait.Subscriber.html
-    /// [default]: https://docs.rs/tracing/latest/tracing/dispatcher/index.html#setting-the-default-subscriber
-    #[inline]
-    fn with_current_subscriber(self) -> WithDispatch<Self> {
-        WithDispatch {
-            inner: self,
-            dispatch: dispatcher::get_default(|default| default.clone()),
-        }
-    }
-}
-
-/// A future, stream, sink, or executor that has been instrumented with a `tracing` span.
-#[cfg_attr(feature = "std-future", pin_project)]
-#[derive(Debug, Clone)]
-pub struct Instrumented<T> {
-    #[cfg(feature = "std-future")]
-    #[pin]
-    inner: T,
-    #[cfg(not(feature = "std-future"))]
-    inner: T,
-    span: Span,
-}
-
-/// A future, stream, sink, or executor that has been instrumented with a
-/// `tracing` subscriber.
-#[cfg(feature = "std")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
-#[cfg_attr(feature = "std-future", pin_project)]
-#[derive(Clone, Debug)]
-pub struct WithDispatch<T> {
-    // cfg_attr doesn't work inside structs, apparently...
-    #[cfg(feature = "std-future")]
-    #[pin]
-    inner: T,
-    #[cfg(not(feature = "std-future"))]
-    inner: T,
-    dispatch: Dispatch,
-}
-
-impl<T: Sized> Instrument for T {}
-
-#[cfg(feature = "std-future")]
-#[cfg_attr(docsrs, doc(cfg(feature = "std-future")))]
-impl<T: crate::stdlib::future::Future> crate::stdlib::future::Future for Instrumented<T> {
-    type Output = T::Output;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> crate::stdlib::task::Poll<Self::Output> {
-        let this = self.project();
-        let _enter = this.span.enter();
-        this.inner.poll(cx)
-    }
-}
-
-#[cfg(feature = "futures-01")]
-#[cfg_attr(docsrs, doc(cfg(feature = "futures-01")))]
-impl<T: futures_01::Future> futures_01::Future for Instrumented<T> {
-    type Item = T::Item;
-    type Error = T::Error;
-
-    fn poll(&mut self) -> futures_01::Poll<Self::Item, Self::Error> {
-        let _enter = self.span.enter();
-        self.inner.poll()
-    }
-}
-
-#[cfg(feature = "futures-01")]
-#[cfg_attr(docsrs, doc(cfg(feature = "futures-01")))]
-impl<T: futures_01::Stream> futures_01::Stream for Instrumented<T> {
-    type Item = T::Item;
-    type Error = T::Error;
-
-    fn poll(&mut self) -> futures_01::Poll<Option<Self::Item>, Self::Error> {
-        let _enter = self.span.enter();
-        self.inner.poll()
-    }
-}
-
-#[cfg(feature = "futures-01")]
-#[cfg_attr(docsrs, doc(cfg(feature = "futures-01")))]
-impl<T: futures_01::Sink> futures_01::Sink for Instrumented<T> {
-    type SinkItem = T::SinkItem;
-    type SinkError = T::SinkError;
-
-    fn start_send(
-        &mut self,
-        item: Self::SinkItem,
-    ) -> futures_01::StartSend<Self::SinkItem, Self::SinkError> {
-        let _enter = self.span.enter();
-        self.inner.start_send(item)
-    }
-
-    fn poll_complete(&mut self) -> futures_01::Poll<(), Self::SinkError> {
-        let _enter = self.span.enter();
-        self.inner.poll_complete()
-    }
-}
-
-#[cfg(all(feature = "futures-03", feature = "std-future"))]
-#[cfg_attr(docsrs, doc(cfg(all(feature = "futures-03", feature = "std-future"))))]
-impl<T: futures::Stream> futures::Stream for Instrumented<T> {
-    type Item = T::Item;
-
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> futures::task::Poll<Option<Self::Item>> {
-        let this = self.project();
-        let _enter = this.span.enter();
-        T::poll_next(this.inner, cx)
-    }
-}
-
-#[cfg(all(feature = "futures-03", feature = "std-future"))]
-#[cfg_attr(docsrs, doc(cfg(all(feature = "futures-03", feature = "std-future"))))]
-impl<I, T: futures::Sink<I>> futures::Sink<I> for Instrumented<T>
-where
-    T: futures::Sink<I>,
-{
-    type Error = T::Error;
-
-    fn poll_ready(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> futures::task::Poll<Result<(), Self::Error>> {
-        let this = self.project();
-        let _enter = this.span.enter();
-        T::poll_ready(this.inner, cx)
-    }
-
-    fn start_send(self: Pin<&mut Self>, item: I) -> Result<(), Self::Error> {
-        let this = self.project();
-        let _enter = this.span.enter();
-        T::start_send(this.inner, item)
-    }
-
-    fn poll_flush(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> futures::task::Poll<Result<(), Self::Error>> {
-        let this = self.project();
-        let _enter = this.span.enter();
-        T::poll_flush(this.inner, cx)
-    }
-
-    fn poll_close(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> futures::task::Poll<Result<(), Self::Error>> {
-        let this = self.project();
-        let _enter = this.span.enter();
-        T::poll_close(this.inner, cx)
-    }
-}
-
-impl<T> Instrumented<T> {
-    /// Borrows the `Span` that this type is instrumented by.
-    pub fn span(&self) -> &Span {
-        &self.span
-    }
-
-    /// Mutably borrows the `Span` that this type is instrumented by.
-    pub fn span_mut(&mut self) -> &mut Span {
-        &mut self.span
-    }
-
-    /// Borrows the wrapped type.
-    pub fn inner(&self) -> &T {
-        &self.inner
-    }
-
-    /// Mutably borrows the wrapped type.
-    pub fn inner_mut(&mut self) -> &mut T {
-        &mut self.inner
-    }
-
-    /// Get a pinned reference to the wrapped type.
-    #[cfg(feature = "std-future")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "std-future")))]
-    pub fn inner_pin_ref(self: Pin<&Self>) -> Pin<&T> {
-        self.project_ref().inner
-    }
-
-    /// Get a pinned mutable reference to the wrapped type.
-    #[cfg(feature = "std-future")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "std-future")))]
-    pub fn inner_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
-        self.project().inner
-    }
-
-    /// Consumes the `Instrumented`, returning the wrapped type.
-    ///
-    /// Note that this drops the span.
-    pub fn into_inner(self) -> T {
-        self.inner
-    }
-}
-
-#[cfg(feature = "std")]
-impl<T: Sized> WithSubscriber for T {}
-
-#[cfg(all(feature = "futures-01", feature = "std"))]
-#[cfg_attr(docsrs, doc(cfg(all(feature = "futures-01", feature = "std"))))]
-impl<T: futures_01::Future> futures_01::Future for WithDispatch<T> {
-    type Item = T::Item;
-    type Error = T::Error;
-
-    fn poll(&mut self) -> futures_01::Poll<Self::Item, Self::Error> {
-        let inner = &mut self.inner;
-        dispatcher::with_default(&self.dispatch, || inner.poll())
-    }
-}
-
-#[cfg(all(feature = "std-future", feature = "std"))]
-#[cfg_attr(docsrs, doc(cfg(all(feature = "std-future", feature = "std"))))]
-impl<T: crate::stdlib::future::Future> crate::stdlib::future::Future for WithDispatch<T> {
-    type Output = T::Output;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> crate::stdlib::task::Poll<Self::Output> {
-        let this = self.project();
-        let dispatch = this.dispatch;
-        let future = this.inner;
-        dispatcher::with_default(dispatch, || future.poll(cx))
-    }
-}
-
-#[cfg(feature = "std")]
-impl<T> WithDispatch<T> {
-    /// Wrap a future, stream, sink or executor with the same subscriber as this WithDispatch.
-    pub fn with_dispatch<U>(&self, inner: U) -> WithDispatch<U> {
-        WithDispatch {
-            dispatch: self.dispatch.clone(),
-            inner,
-        }
-    }
-
-    /// Borrows the `Dispatch` that this type is instrumented by.
-    pub fn dispatch(&self) -> &Dispatch {
-        &self.dispatch
-    }
-
-    /// Get a pinned reference to the wrapped type.
-    #[cfg(feature = "std-future")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "std-future")))]
-    pub fn inner_pin_ref(self: Pin<&Self>) -> Pin<&T> {
-        self.project_ref().inner
-    }
-
-    /// Get a pinned mutable reference to the wrapped type.
-    #[cfg(feature = "std-future")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "std-future")))]
-    pub fn inner_pin_mut(self: Pin<&mut Self>) -> Pin<&mut T> {
-        self.project().inner
-    }
-
-    /// Borrows the wrapped type.
-    pub fn inner(&self) -> &T {
-        &self.inner
-    }
-
-    /// Mutably borrows the wrapped type.
-    pub fn inner_mut(&mut self) -> &mut T {
-        &mut self.inner
-    }
-
-    /// Consumes the `WithDispatch`, returning the wrapped type.
-    pub fn into_inner(self) -> T {
-        self.inner
-    }
-}
-
-#[cfg(test)]
-pub(crate) use self::support as test_support;
-// This has to have the same name as the module in `tracing`.
-#[path = "../../tracing/tests/support/mod.rs"]
-#[cfg(test)]
-#[allow(unreachable_pub)]
-pub(crate) mod support;
-
-#[cfg(test)]
-mod tests {
-    use super::{test_support::*, *};
-
-    #[cfg(feature = "futures-01")]
-    mod futures_01_tests {
-        use futures_01::{future, stream, task, Async, Future, Stream};
-        use tracing::subscriber::with_default;
-
-        use super::*;
-
-        struct PollN<T, E> {
-            and_return: Option<Result<T, E>>,
-            finish_at: usize,
-            polls: usize,
-        }
-
-        impl PollN<(), ()> {
-            fn new_ok(finish_at: usize) -> Self {
-                Self {
-                    and_return: Some(Ok(())),
-                    finish_at,
-                    polls: 0,
-                }
-            }
-
-            fn new_err(finish_at: usize) -> Self {
-                Self {
-                    and_return: Some(Err(())),
-                    finish_at,
-                    polls: 0,
-                }
-            }
-        }
-
-        impl<T, E> futures_01::Future for PollN<T, E> {
-            type Item = T;
-            type Error = E;
-            fn poll(&mut self) -> futures_01::Poll<Self::Item, Self::Error> {
-                self.polls += 1;
-                if self.polls == self.finish_at {
-                    self.and_return
-                        .take()
-                        .expect("polled after ready")
-                        .map(Async::Ready)
-                } else {
-                    task::current().notify();
-                    Ok(Async::NotReady)
-                }
-            }
-        }
-
-        #[test]
-        fn future_enter_exit_is_reasonable() {
-            let (subscriber, handle) = subscriber::mock()
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .drop_span(span::mock().named("foo"))
-                .done()
-                .run_with_handle();
-            with_default(subscriber, || {
-                PollN::new_ok(2)
-                    .instrument(tracing::trace_span!("foo"))
-                    .wait()
-                    .unwrap();
-            });
-            handle.assert_finished();
-        }
-
-        #[test]
-        fn future_error_ends_span() {
-            let (subscriber, handle) = subscriber::mock()
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .drop_span(span::mock().named("foo"))
-                .done()
-                .run_with_handle();
-            with_default(subscriber, || {
-                PollN::new_err(2)
-                    .instrument(tracing::trace_span!("foo"))
-                    .wait()
-                    .unwrap_err();
-            });
-
-            handle.assert_finished();
-        }
-
-        #[test]
-        fn stream_enter_exit_is_reasonable() {
-            let (subscriber, handle) = subscriber::mock()
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .drop_span(span::mock().named("foo"))
-                .run_with_handle();
-            with_default(subscriber, || {
-                stream::iter_ok::<_, ()>(&[1, 2, 3])
-                    .instrument(tracing::trace_span!("foo"))
-                    .for_each(|_| future::ok(()))
-                    .wait()
-                    .unwrap();
-            });
-            handle.assert_finished();
-        }
-
-        #[test]
-        fn span_follows_future_onto_threadpool() {
-            let (subscriber, handle) = subscriber::mock()
-                .enter(span::mock().named("a"))
-                .enter(span::mock().named("b"))
-                .exit(span::mock().named("b"))
-                .enter(span::mock().named("b"))
-                .exit(span::mock().named("b"))
-                .drop_span(span::mock().named("b"))
-                .exit(span::mock().named("a"))
-                .drop_span(span::mock().named("a"))
-                .done()
-                .run_with_handle();
-            let mut runtime = tokio::runtime::Runtime::new().unwrap();
-            with_default(subscriber, || {
-                tracing::trace_span!("a").in_scope(|| {
-                    let future = PollN::new_ok(2)
-                        .instrument(tracing::trace_span!("b"))
-                        .map(|_| {
-                            tracing::trace_span!("c").in_scope(|| {
-                                // "c" happens _outside_ of the instrumented future's
-                                // span, so we don't expect it.
-                            })
-                        });
-                    runtime.block_on(Box::new(future)).unwrap();
-                })
-            });
-            handle.assert_finished();
-        }
-    }
-
-    #[cfg(all(feature = "futures-03", feature = "std-future"))]
-    mod futures_03_tests {
-        use futures::{future, sink, stream, FutureExt, SinkExt, StreamExt};
-        use tracing::subscriber::with_default;
-
-        use super::*;
-
-        #[test]
-        fn stream_enter_exit_is_reasonable() {
-            let (subscriber, handle) = subscriber::mock()
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .drop_span(span::mock().named("foo"))
-                .run_with_handle();
-            with_default(subscriber, || {
-                stream::iter(&[1, 2, 3])
-                    .instrument(tracing::trace_span!("foo"))
-                    .for_each(|_| future::ready(()))
-                    .now_or_never()
-                    .unwrap();
-            });
-            handle.assert_finished();
-        }
-
-        #[test]
-        fn sink_enter_exit_is_reasonable() {
-            let (subscriber, handle) = subscriber::mock()
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .enter(span::mock().named("foo"))
-                .exit(span::mock().named("foo"))
-                .drop_span(span::mock().named("foo"))
-                .run_with_handle();
-            with_default(subscriber, || {
-                sink::drain()
-                    .instrument(tracing::trace_span!("foo"))
-                    .send(1u8)
-                    .now_or_never()
-                    .unwrap()
-                    .unwrap()
-            });
-            handle.assert_finished();
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/stdlib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/stdlib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/src/stdlib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/src/stdlib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-//! Re-exports either the Rust `std` library or `core` and `alloc` when `std` is
-//! disabled.
-//!
-//! `crate::stdlib::...` should be used rather than `std::` when adding code that
-//! will be available with the standard library disabled.
-//!
-//! Note that this module is called `stdlib` rather than `std`, as Rust 1.34.0
-//! does not permit redefining the name `stdlib` (although this works on the
-//! latest stable Rust).
-#[cfg(feature = "std")]
-pub(crate) use std::*;
-
-#[cfg(not(feature = "std"))]
-pub(crate) use self::no_std::*;
-
-#[cfg(not(feature = "std"))]
-mod no_std {
-    // We pre-emptively export everything from libcore/liballoc, (even modules
-    // we aren't using currently) to make adding new code easier. Therefore,
-    // some of these imports will be unused.
-    #![allow(unused_imports)]
-
-    pub(crate) use core::{
-        any, array, ascii, cell, char, clone, cmp, convert, default, f32, f64, ffi, future, hash,
-        hint, i128, i16, i8, isize, iter, marker, mem, num, ops, option, pin, ptr, result, task,
-        time, u128, u16, u32, u8, usize,
-    };
-
-    pub(crate) mod borrow {
-        pub(crate) use core::borrow::*;
-    }
-
-    pub(crate) mod fmt {
-        pub(crate) use core::fmt::*;
-    }
-
-    pub(crate) mod slice {
-        pub(crate) use core::slice::*;
-    }
-
-    pub(crate) mod str {
-        pub(crate) use core::str::*;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/tests/std_future.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/tests/std_future.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/tests/std_future.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/tests/std_future.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-mod support;
-use support::*;
-
-use tracing::{subscriber::with_default, Level};
-use tracing_futures::Instrument;
-
-#[test]
-fn enter_exit_is_reasonable() {
-    let (subscriber, handle) = subscriber::mock()
-        .enter(span::mock().named("foo"))
-        .exit(span::mock().named("foo"))
-        .enter(span::mock().named("foo"))
-        .exit(span::mock().named("foo"))
-        .drop_span(span::mock().named("foo"))
-        .done()
-        .run_with_handle();
-    with_default(subscriber, || {
-        let future = PollN::new_ok(2).instrument(tracing::span!(Level::TRACE, "foo"));
-        block_on_future(future).unwrap();
-    });
-    handle.assert_finished();
-}
-
-#[test]
-fn error_ends_span() {
-    let (subscriber, handle) = subscriber::mock()
-        .enter(span::mock().named("foo"))
-        .exit(span::mock().named("foo"))
-        .enter(span::mock().named("foo"))
-        .exit(span::mock().named("foo"))
-        .drop_span(span::mock().named("foo"))
-        .done()
-        .run_with_handle();
-    with_default(subscriber, || {
-        let future = PollN::new_err(2).instrument(tracing::span!(Level::TRACE, "foo"));
-        block_on_future(future).unwrap_err();
-    });
-    handle.assert_finished();
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/tests/support.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/tests/support.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/tracing-futures/tests/support.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/tracing-futures/tests/support.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-// this is the only way to make the path attribute play nice with `in
-// crate::support`...
-#[allow(clippy::module_inception)]
-#[path = "../../tracing/tests/support/mod.rs"]
-mod support;
-use std::{
-    future::Future,
-    pin::Pin,
-    task::{Context, Poll},
-};
-pub use support::*;
-use tokio_test::task;
-
-pub struct PollN<T, E> {
-    and_return: Option<Result<T, E>>,
-    finish_at: usize,
-    polls: usize,
-}
-
-impl<T, E> std::future::Future for PollN<T, E>
-where
-    T: Unpin,
-    E: Unpin,
-{
-    type Output = Result<T, E>;
-    fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
-        let this = self.get_mut();
-
-        this.polls += 1;
-        if this.polls == this.finish_at {
-            let value = this.and_return.take().expect("polled after ready");
-
-            Poll::Ready(value)
-        } else {
-            cx.waker().wake_by_ref();
-            Poll::Pending
-        }
-    }
-}
-
-impl PollN<(), ()> {
-    pub fn new_ok(finish_at: usize) -> Self {
-        Self {
-            and_return: Some(Ok(())),
-            finish_at,
-            polls: 0,
-        }
-    }
-
-    pub fn new_err(finish_at: usize) -> Self {
-        Self {
-            and_return: Some(Err(())),
-            finish_at,
-            polls: 0,
-        }
-    }
-}
-
-pub fn block_on_future<F>(future: F) -> F::Output
-where
-    F: Future,
-{
-    let mut task = task::spawn(future);
-    loop {
-        if let Poll::Ready(v) = task.poll() {
-            break v;
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/build/main.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/build/main.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/build/main.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/build/main.rs	2021-12-09 12:01:26.000000000 +0000
@@ -151,11 +151,11 @@
 */
 #[allow(missing_docs)]
 pub mod consts {{
-    use uint::{{UInt, UTerm}};
-    use int::{{PInt, NInt}};
+    use crate::uint::{{UInt, UTerm}};
+    use crate::int::{{PInt, NInt}};
 
-    pub use bit::{{B0, B1}};
-    pub use int::Z0;
+    pub use crate::bit::{{B0, B1}};
+    pub use crate::int::Z0;
 
     pub type True = B1;
     pub type False = B0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/build/op.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/build/op.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/build/op.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/build/op.rs	2021-12-09 12:01:26.000000000 +0000
@@ -307,13 +307,13 @@
     write!(
         f,
         "*/
-#[macro_export]
+#[macro_export(local_inner_macros)]
 macro_rules! op {{
     ($($tail:tt)*) => ( __op_internal__!($($tail)*) );
 }}
 
     #[doc(hidden)]
-    #[macro_export]
+    #[macro_export(local_inner_macros)]
     macro_rules! __op_internal__ {{
 "
     )?;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"da926e359e6bac0d613f4e10ae2779c19c71edaf1211aba37a05eb738e2f3562","Cargo.toml":"bdb5ab87623aa54ae0d19b6085b6953e8c9871fa3c7eb25921d9055a66beea45","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"b679fca0a62c85b18ebdf1a7d8cde9c133f4e81295bb34b002aa3cd471880d07","build/main.rs":"194dcb1ebce383021b1583b7c833ac82fe6e62e7952678e100df8ee6ab3f5106","build/op.rs":"a51b9f90c4be236f54e56df6fd31a0293dabab9aa99c2caa93d46efca245e85e","build/tests.rs":"4e74a95412d9a7ad1dfba36cced27e3f723ab474a4b695d97c6adc30c5850d44","clippy.toml":"493258e6a4be8bbb66ecbc4236d8f4964f867d4bcddd5f13897aa655a206af7b","src/array.rs":"9dc02ae1990bf341cf65322ec04952db411e7a170029dbe01df566edee29c76b","src/bit.rs":"51f3156215f1f943ca2468db57838fae49d91d7e31cdc744e580b6dd3b403217","src/int.rs":"4087246553e7ab61c684173122c38c270759365d0fa06c21934ac71080ce74fb","src/lib.rs":"6f199636589dfe53492aa3351c448a2bcd75dc10438513e6c1e46f74f5cbe68f","src/marker_traits.rs":"dd0254b49d475b7a111b9b8d606fb20d91d87dcb7c492bb057741812f1615631","src/operator_aliases.rs":"d333519c4595296e2d8d9bb65bd5bb3933d26247b37b9b21e0ee7fed49fc7d4e","src/private.rs":"e05862cb4f8080687ef3180713180dc26605dc35909d52ef552230549ab4eff3","src/type_operators.rs":"38c9ca7df38fe9113eb4e3affd8c95f819f1004dbed5f97ca19a03c4e9d23d3a","src/uint.rs":"b7cb75f9dd6c47aa37f0e946224265397e157b41808509c411db0b07d4fcaa04","tests/test.rs":"92139fa86ffcacc1dff60e6fc36420c850d70dc814bd21dc18e87857553c6cea"},"package":"373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"92e1e29e70ee869230fcf3dd8b269ba497d93eefc5b1ce32e65e2c1d72d00840","Cargo.toml":"5e731996ca564e9d0db48ded6db03f006e7678f65f96ca7fcbb22c8194fb0d19","LICENSE":"db11fec9946737df39ca3898d9cd8c10ec6f6c3a884a6802b0ad0b81b4e8f23a","LICENSE-APACHE":"516b24e051bf5630880ebbd55c40a25ce9552ebaf8970a53e8976eb70e522406","LICENSE-MIT":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"ab1dc7cd2ee48283b3a511463785da5dd3a93b387a26beb89185442eb66c7471","build/main.rs":"95d42640cb9ef15c7421869f53547a43e07d034f627148aa57b38ee31d58d309","build/op.rs":"f9fbdb6c907ebf0cf22071271ca3b5acac0db41db962c4211bf57eb21d12ee5c","build/tests.rs":"4e74a95412d9a7ad1dfba36cced27e3f723ab474a4b695d97c6adc30c5850d44","clippy.toml":"493258e6a4be8bbb66ecbc4236d8f4964f867d4bcddd5f13897aa655a206af7b","rustfmt.toml":"4953048a8d16fba8736c5cdb65ce418e462317a79793f16f79023f571f3fd5ce","src/array.rs":"9dc02ae1990bf341cf65322ec04952db411e7a170029dbe01df566edee29c76b","src/bit.rs":"4da5d37ca3495c71cd6ff407745e8c8959a8e8f775140e9eebfc4bf662d174b0","src/int.rs":"1bdf66bfa14a5735f266c8c6638052cce05baee394d387b23a827a19d8cfc0e9","src/lib.rs":"9f17e05eed4d9c01424facad23b912e974fd7f8aa29a58899550897f8cd99f37","src/marker_traits.rs":"a55a4aada49e80202838f14cc7c319a2217ff127b8b0780c62000ff46ccbdd8c","src/operator_aliases.rs":"c190f5bcf9f674c2f2bb56886a45ff548e5acb9320b406cbc45204ef3bac46d5","src/private.rs":"e2ab0e29eacdedfe4182aa0567ac8e9cb53680dc04e1d75e197321b4e1446111","src/type_operators.rs":"a9ea16c765254e40f958f512b7a6899e6441e9105f3c8f9590170a984d966cf6","src/uint.rs":"439779dbb9bba42bbbf27982d4a0c7becd8fb0835e4a578c7f6217101edc76a3","tests/test.rs":"92139fa86ffcacc1dff60e6fc36420c850d70dc814bd21dc18e87857553c6cea"},"package":"879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,15 +11,16 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "typenum"
-version = "1.12.0"
+version = "1.13.0"
 authors = ["Paho Lurie-Gregg <paho@paholg.com>", "Andre Bogus <bogusandre@gmail.com>"]
 build = "build/main.rs"
-description = "Typenum is a Rust library for type-level numbers evaluated at compile time. It currently supports bits, unsigned integers, and signed integers. It also provides a type-level array of type-level numbers, but its implementation is incomplete."
+description = "Typenum is a Rust library for type-level numbers evaluated at\n    compile time. It currently supports bits, unsigned integers, and signed\n    integers. It also provides a type-level array of type-level numbers, but its\n    implementation is incomplete."
 documentation = "https://docs.rs/typenum"
 readme = "README.md"
 categories = ["no-std"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/paholg/typenum"
 
 [lib]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,12 +2,20 @@
 
 This project follows semantic versioning.
 
-The MSRV (Minimum Supported Rust Version) is 1.22.0, and typenum is tested against this Rust
-version. Much of typenum should work on as low a version as 1.20.0, but that is not guaranteed.
+The MSRV (Minimum Supported Rust Version) is 1.37.0, and typenum is tested
+against this Rust version.
 
 ### Unreleased
 
-### 1.12.0 (2020-04-03)
+### 1.13.0 (2021-03-12)
+- [changed] MSRV from 1.22.0 to 1.37.0.
+- [fixed] `op` macro with 2018 edition import.
+- [changed] Allowed calling `assert_type_eq` and `assert_type` at top level.
+- [added] Marker trait `Zero` for `Z0`, `U0`, and `B0`.
+- [added] Implementation of `Pow` trait for f32 and f64 with negative exponent.
+- [added] Trait `ToInt`.
+
+### 1.12.0 (2020-04-13)
 - [added] Feature `force_unix_path_separator` to support building without Cargo.
 - [added] Greatest common divisor operator `Gcd` with alias `Gcf`.
 - [added] `gcd` to the `op!` macro.
@@ -21,13 +29,15 @@
 - [fixed] Cross compilation from Linux to Windows.
 
 ### 1.11.1 (2019-08-25)
-- [fixed] Builds on earlier Rust builds again and added Rust 1.22.0 to Travis to prevent future breakage.
+- [fixed] Builds on earlier Rust builds again and added Rust 1.22.0 to Travis to
+  prevent future breakage.
 
 ### 1.11.0 (2019-08-25)
 - [added] Integer `log2` to the `op!` macro.
 - [added] Integer binary logarithm operator `Logarithm2` with alias `Log2`.
-- [changed] Removed `feature(i128_type)` when running with the `i128` feature. Kept the feature flag.
-  for typenum to maintain compatibility with old Rust versions.
+- [changed] Removed `feature(i128_type)` when running with the `i128`
+  feature. Kept the feature flag.  for typenum to maintain compatibility with
+  old Rust versions.
 - [added] Integer `sqrt` to the `op!` macro.
 - [added] Integer square root operator `SquareRoot` with alias `Sqrt`.
 - [fixed] Bug with attempting to create U1024 type alias twice.
@@ -38,7 +48,8 @@
 
 ### 1.9.0 (2017-05-14)
 - [added] The `Abs` type operater and corresponding `AbsVal` alias.
-- [added] The feature `i128` that enables creating 128-bit integers from typenums.
+- [added] The feature `i128` that enables creating 128-bit integers from
+  typenums.
 - [added] The `assert_type!` and `assert_type_eq!` macros.
 - [added] Operators to the `op!` macro, including those performed by `cmp!`.
 - [fixed] Bug in `op!` macro involving functions and convoluted expressions.
@@ -50,13 +61,14 @@
 - [added] Some comparison type-operators that are used by the `cmp!` macro.
 
 ### 1.7.0 (2017-03-24)
-- [added] Type operators `Min` and `Max` with accompanying aliases `Minimum` and `Maximum`
+- [added] Type operators `Min` and `Max` with accompanying aliases `Minimum` and
+  `Maximum`
 
 ### 1.6.0 (2017-02-24)
 - [fixed] Bug in `Array` division.
 - [fixed] Bug where `Rem` would sometimes exit early with the wrong answer.
-- [added] `PartialDiv` operator that performs division as a partial function -- it's defined only
-  when there is no remainder.
+- [added] `PartialDiv` operator that performs division as a partial function --
+  it's defined only when there is no remainder.
 
 ### 1.5.2 (2017-02-04)
 - [fixed] Bug between `Div` implementation and type system.
@@ -65,9 +77,9 @@
 - [fixed] Expanded implementation of `Pow` for primitives.
 
 ### 1.5.0 (2016-11-03)
-- [added] Functions to the `Pow` and `Len` traits. This is *technically* a breaking change, but it
-  would only break someone's code if they have a custom impl for `Pow`. I would be very surprised
-  if that is anyone other than me.
+- [added] Functions to the `Pow` and `Len` traits. This is *technically* a
+  breaking change, but it would only break someone's code if they have a custom
+  impl for `Pow`. I would be very surprised if that is anyone other than me.
 
 ### 1.4.0 (2016-10-29)
 - [added] Type-level arrays of type-level integers. (PR #66)
@@ -83,4 +95,5 @@
 ### 1.2.0 (2016-01-03)
 - [added] This change log!
 - [added] Convenience type aliases for operators. (Issue #48, PR #50)
-- [added] Types in this crate now derive all possible traits. (Issue #42, PR #51)
+- [added] Types in this crate now derive all possible traits. (Issue #42, PR
+  #51)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/LICENSE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/LICENSE	2021-12-09 12:01:26.000000000 +0000
@@ -1,21 +1 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Paho Lurie-Gregg
-
-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.
+MIT OR Apache-2.0
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright 2014 Paho Lurie-Gregg
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Paho Lurie-Gregg
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,11 +1,11 @@
 [![crates.io](https://img.shields.io/crates/v/typenum.svg)](https://crates.io/crates/typenum)
-[![Build Status](https://travis-ci.org/paholg/typenum.svg?branch=master)](https://travis-ci.org/paholg/typenum)
+[![Build Status](https://github.com/paholg/typenum/actions/workflows/check.yml/badge.svg)](https://github.com/paholg/typenum/actions/workflows/check.yml)
 
 Typenum
 =====
 
-Typenum is a Rust library for type-level numbers evaluated at compile time. It currently
-supports bits, unsigned integers, and signed integers.
+Typenum is a Rust library for type-level numbers evaluated at compile time. It
+currently supports bits, unsigned integers, and signed integers.
 
 Typenum depends only on libcore, and so is suitable for use on any platform!
 
@@ -13,11 +13,12 @@
 
 ### Importing
 
-While `typenum` is divided into several modules, they are all re-exported through the crate root,
-so you can import anything contained herein with `use typenum::whatever;`, ignoring the
-crate structure.
+While `typenum` is divided into several modules, they are all re-exported
+through the crate root, so you can import anything contained herein with `use
+typenum::whatever;`, ignoring the crate structure.
 
-You may also find it useful to treat the `consts` module as a prelude, perfoming a glob import.
+You may also find it useful to treat the `consts` module as a prelude, perfoming
+a glob import.
 
 ### Example
 
@@ -33,17 +34,34 @@
 assert_eq!(<Y as Integer>::to_i32(), -8);
 ```
 
-For a non-trivial example of its use, see one of the crates that depends on it. The full
-list is [here](https://crates.io/crates/typenum/reverse_dependencies). Of note are
-[dimensioned](https://crates.io/crates/dimensioned/) which does compile-time type
-checking for arbitrary unit systems and
-[generic-array](https://crates.io/crates/generic-array/) which provides arrays whose
-length you can generically refer to.
+For a non-trivial example of its use, see one of the crates that depends on
+it. The full list is
+[here](https://crates.io/crates/typenum/reverse_dependencies). Of note are
+[dimensioned](https://crates.io/crates/dimensioned/) which does compile-time
+type checking for arbitrary unit systems and
+[generic-array](https://crates.io/crates/generic-array/) which provides arrays
+whose length you can generically refer to.
 
 ### Error messages
 
 
-Typenum's error messages aren't great, and can be difficult to parse. The good news is
-that the fine folks at Auxon have written a tool to help with it. Please take a look at
-[tnfilt](https://github.com/auxoncorp/tnfilt).
+Typenum's error messages aren't great, and can be difficult to parse. The good
+news is that the fine folks at Auxon have written a tool to help with it. Please
+take a look at [tnfilt](https://github.com/auxoncorp/tnfilt).
 
+### License
+
+Licensed under either of
+
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license
+   ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/rustfmt.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1 @@
+format_code_in_doc_comments = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/bit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/bit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/bit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/bit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,13 +8,11 @@
 //!
 //! - From `core::ops`: `BitAnd`, `BitOr`, `BitXor`, and `Not`.
 //! - From `typenum`: `Same` and `Cmp`.
-//!
 
+use crate::{private::InternalMarker, Cmp, Equal, Greater, Less, NonZero, PowerOfTwo, Zero};
 use core::ops::{BitAnd, BitOr, BitXor, Not};
-use private::InternalMarker;
-use {Cmp, Equal, Greater, Less, NonZero, PowerOfTwo};
 
-pub use marker_traits::Bit;
+pub use crate::marker_traits::Bit;
 
 /// The type-level bit 0.
 #[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
@@ -45,6 +43,10 @@
     const BOOL: bool = false;
 
     #[inline]
+    fn new() -> Self {
+        Self
+    }
+    #[inline]
     fn to_u8() -> u8 {
         0
     }
@@ -59,6 +61,10 @@
     const BOOL: bool = true;
 
     #[inline]
+    fn new() -> Self {
+        Self
+    }
+    #[inline]
     fn to_u8() -> u8 {
         1
     }
@@ -68,6 +74,7 @@
     }
 }
 
+impl Zero for B0 {}
 impl NonZero for B1 {}
 impl PowerOfTwo for B1 {}
 
@@ -248,7 +255,7 @@
     }
 }
 
-use Min;
+use crate::Min;
 impl Min<B0> for B0 {
     type Output = B0;
     #[inline]
@@ -278,7 +285,7 @@
     }
 }
 
-use Max;
+use crate::Max;
 impl Max<B0> for B0 {
     type Output = B0;
     #[inline]
@@ -307,3 +314,22 @@
         self
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn bit_creation() {
+        {
+            use crate::{B0, B1};
+            let _: B0 = B0::new();
+            let _: B1 = B1::new();
+        }
+
+        {
+            use crate::{Bit, B0, B1};
+
+            let _: B0 = <B0 as Bit>::new();
+            let _: B1 = <B1 as Bit>::new();
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/int.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/int.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/int.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/int.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,7 +16,7 @@
 //!
 //! # Example
 //! ```rust
-//! use std::ops::{Add, Sub, Mul, Div, Rem};
+//! use std::ops::{Add, Div, Mul, Rem, Sub};
 //! use typenum::{Integer, N3, P2};
 //!
 //! assert_eq!(<N3 as Add<P2>>::Output::to_i32(), -1);
@@ -25,19 +25,17 @@
 //! assert_eq!(<N3 as Div<P2>>::Output::to_i32(), -1);
 //! assert_eq!(<N3 as Rem<P2>>::Output::to_i32(), -1);
 //! ```
-//!
 
+pub use crate::marker_traits::Integer;
+use crate::{
+    bit::{Bit, B0, B1},
+    consts::{N1, P1, U0, U1},
+    private::{Internal, InternalMarker, PrivateDivInt, PrivateIntegerAdd, PrivateRem},
+    uint::{UInt, Unsigned},
+    Cmp, Equal, Greater, Less, NonZero, Pow, PowerOfTwo, ToInt, Zero,
+};
 use core::ops::{Add, Div, Mul, Neg, Rem, Sub};
 
-use bit::{Bit, B0, B1};
-use consts::{N1, P1, U0, U1};
-use private::{Internal, InternalMarker};
-use private::{PrivateDivInt, PrivateIntegerAdd, PrivateRem};
-use uint::{UInt, Unsigned};
-use {Cmp, Equal, Greater, Less, NonZero, Pow, PowerOfTwo};
-
-pub use marker_traits::Integer;
-
 /// Type-level signed integers with positive sign.
 #[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
 pub struct PInt<U: Unsigned + NonZero> {
@@ -80,6 +78,7 @@
 
 impl<U: Unsigned + NonZero> NonZero for PInt<U> {}
 impl<U: Unsigned + NonZero> NonZero for NInt<U> {}
+impl Zero for Z0 {}
 
 impl<U: Unsigned + NonZero + PowerOfTwo> PowerOfTwo for PInt<U> {}
 
@@ -610,7 +609,7 @@
 // ---------------------------------------------------------------------------------------
 // PartialDiv
 
-use {PartialDiv, Quot};
+use crate::{PartialDiv, Quot};
 
 impl<M, N> PartialDiv<N> for M
 where
@@ -888,7 +887,7 @@
 
 // ---------------------------------------------------------------------------------------
 // Gcd
-use {Gcd, Gcf};
+use crate::{Gcd, Gcf};
 
 impl Gcd<Z0> for Z0 {
     type Output = Z0;
@@ -960,7 +959,7 @@
 
 // ---------------------------------------------------------------------------------------
 // Min
-use {Max, Maximum, Min, Minimum};
+use crate::{Max, Maximum, Min, Minimum};
 
 impl Min<Z0> for Z0 {
     type Output = Z0;
@@ -1177,14 +1176,175 @@
     }
 }
 
+// -----------------------------------------
+// ToInt
+
+impl ToInt<i8> for Z0 {
+    #[inline]
+    fn to_int() -> i8 {
+        Self::I8
+    }
+}
+
+impl ToInt<i16> for Z0 {
+    #[inline]
+    fn to_int() -> i16 {
+        Self::I16
+    }
+}
+
+impl ToInt<i32> for Z0 {
+    #[inline]
+    fn to_int() -> i32 {
+        Self::I32
+    }
+}
+
+impl ToInt<i64> for Z0 {
+    #[inline]
+    fn to_int() -> i64 {
+        Self::I64
+    }
+}
+
+// negative numbers
+
+impl<U> ToInt<i8> for NInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    #[inline]
+    fn to_int() -> i8 {
+        Self::I8
+    }
+}
+
+impl<U> ToInt<i16> for NInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    #[inline]
+    fn to_int() -> i16 {
+        Self::I16
+    }
+}
+
+impl<U> ToInt<i32> for NInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    #[inline]
+    fn to_int() -> i32 {
+        Self::I32
+    }
+}
+
+impl<U> ToInt<i64> for NInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    #[inline]
+    fn to_int() -> i64 {
+        Self::I64
+    }
+}
+
+// positive numbers
+
+impl<U> ToInt<i8> for PInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    #[inline]
+    fn to_int() -> i8 {
+        Self::I8
+    }
+}
+
+impl<U> ToInt<i16> for PInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    #[inline]
+    fn to_int() -> i16 {
+        Self::I16
+    }
+}
+
+impl<U> ToInt<i32> for PInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    #[inline]
+    fn to_int() -> i32 {
+        Self::I32
+    }
+}
+
+impl<U> ToInt<i64> for PInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    #[inline]
+    fn to_int() -> i64 {
+        Self::I64
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use consts::*;
-    use Integer;
+    use crate::{consts::*, Integer, ToInt};
 
     #[test]
     fn to_ix_min() {
         assert_eq!(N128::to_i8(), ::core::i8::MIN);
         assert_eq!(N32768::to_i16(), ::core::i16::MIN);
     }
+
+    #[test]
+    fn int_toint_test() {
+        // i8
+        assert_eq!(0_i8, Z0::to_int());
+        assert_eq!(1_i8, P1::to_int());
+        assert_eq!(2_i8, P2::to_int());
+        assert_eq!(3_i8, P3::to_int());
+        assert_eq!(4_i8, P4::to_int());
+        assert_eq!(-1_i8, N1::to_int());
+        assert_eq!(-2_i8, N2::to_int());
+        assert_eq!(-3_i8, N3::to_int());
+        assert_eq!(-4_i8, N4::to_int());
+
+        // i16
+        assert_eq!(0_i16, Z0::to_int());
+        assert_eq!(1_i16, P1::to_int());
+        assert_eq!(2_i16, P2::to_int());
+        assert_eq!(3_i16, P3::to_int());
+        assert_eq!(4_i16, P4::to_int());
+        assert_eq!(-1_i16, N1::to_int());
+        assert_eq!(-2_i16, N2::to_int());
+        assert_eq!(-3_i16, N3::to_int());
+        assert_eq!(-4_i16, N4::to_int());
+
+        // i32
+        assert_eq!(0_i32, Z0::to_int());
+        assert_eq!(1_i32, P1::to_int());
+        assert_eq!(2_i32, P2::to_int());
+        assert_eq!(3_i32, P3::to_int());
+        assert_eq!(4_i32, P4::to_int());
+        assert_eq!(-1_i32, N1::to_int());
+        assert_eq!(-2_i32, N2::to_int());
+        assert_eq!(-3_i32, N3::to_int());
+        assert_eq!(-4_i32, N4::to_int());
+
+        // i64
+        assert_eq!(0_i64, Z0::to_int());
+        assert_eq!(1_i64, P1::to_int());
+        assert_eq!(2_i64, P2::to_int());
+        assert_eq!(3_i64, P3::to_int());
+        assert_eq!(4_i64, P4::to_int());
+        assert_eq!(-1_i64, N1::to_int());
+        assert_eq!(-2_i64, N2::to_int());
+        assert_eq!(-3_i64, N3::to_int());
+        assert_eq!(-4_i64, N4::to_int());
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -8,7 +8,7 @@
 //! example,
 //!
 //! ```rust
-//! use typenum::{N4, Integer};
+//! use typenum::{Integer, N4};
 //!
 //! assert_eq!(N4::to_i32(), -4);
 //! ```
@@ -34,14 +34,13 @@
 //! could be replaced with
 //!
 //! ```rust
-//! use typenum::{Sum, Integer, P3, P4};
+//! use typenum::{Integer, Sum, P3, P4};
 //!
 //! type X = Sum<P3, P4>;
 //! assert_eq!(<X as Integer>::to_i32(), 7);
 //! ```
 //!
 //! Documented in each module is the full list of type operators implemented.
-//!
 
 #![no_std]
 #![forbid(unsafe_code)]
@@ -51,10 +50,12 @@
 #![cfg_attr(
     feature = "cargo-clippy",
     allow(
-        clippy::type_complexity,
         clippy::len_without_is_empty,
+        clippy::many_single_char_names,
         clippy::new_without_default,
-        clippy::many_single_char_names
+        clippy::suspicious_arithmetic_impl,
+        clippy::type_complexity,
+        clippy::wrong_self_convention,
     )
 )]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy::missing_inline_in_public_items))]
@@ -87,15 +88,16 @@
 
 pub mod array;
 
-pub use consts::*;
-pub use generated::consts;
-pub use marker_traits::*;
-pub use operator_aliases::*;
-pub use type_operators::*;
-
-pub use array::{ATerm, TArr};
-pub use int::{NInt, PInt};
-pub use uint::{UInt, UTerm};
+pub use crate::{
+    array::{ATerm, TArr},
+    consts::*,
+    generated::consts,
+    int::{NInt, PInt},
+    marker_traits::*,
+    operator_aliases::*,
+    type_operators::*,
+    uint::{UInt, UTerm},
+};
 
 /// A potential output from `Cmp`, this is the type equivalent to the enum variant
 /// `core::cmp::Ordering::Greater`.
@@ -140,7 +142,8 @@
 #[macro_export]
 macro_rules! assert_type_eq {
     ($a:ty, $b:ty) => {
-        let _: <$a as $crate::Same<$b>>::Output;
+        const _: core::marker::PhantomData<<$a as $crate::Same<$b>>::Output> =
+            core::marker::PhantomData;
     };
 }
 
@@ -148,6 +151,7 @@
 #[macro_export]
 macro_rules! assert_type {
     ($a:ty) => {
-        let _: <$a as $crate::Same<True>>::Output;
+        const _: core::marker::PhantomData<<$a as $crate::Same<True>>::Output> =
+            core::marker::PhantomData;
     };
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/marker_traits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/marker_traits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/marker_traits.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/marker_traits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,17 +9,20 @@
 //! to_i32() -> i32` and the associated constant `I32` so that one can do this:
 //!
 //! ```
-//! use typenum::{N42, Integer};
+//! use typenum::{Integer, N42};
 //!
 //! assert_eq!(-42, N42::to_i32());
 //! assert_eq!(-42, N42::I32);
 //! ```
-//!
 
 /// A **marker trait** to designate that a type is not zero. All number types in this
 /// crate implement `NonZero` except `B0`, `U0`, and `Z0`.
 pub trait NonZero {}
 
+/// A **marker trait** to designate that a type is zero. Only `B0`, `U0`, and `Z0`
+/// implement this trait.
+pub trait Zero {}
+
 /// A **Marker trait** for the types `Greater`, `Equal`, and `Less`.
 ///
 /// This trait should not be implemented for anything outside this crate.
@@ -37,6 +40,9 @@
     #[allow(missing_docs)]
     const BOOL: bool;
 
+    /// Instantiates a singleton representing this bit.
+    fn new() -> Self;
+
     #[allow(missing_docs)]
     fn to_u8() -> u8;
     #[allow(missing_docs)]
@@ -49,7 +55,7 @@
 ///
 /// # Example
 /// ```rust
-/// use typenum::{U3, Unsigned};
+/// use typenum::{Unsigned, U3};
 ///
 /// assert_eq!(U3::to_u32(), 3);
 /// assert_eq!(U3::I32, 3);
@@ -118,7 +124,7 @@
 ///
 /// # Example
 /// ```rust
-/// use typenum::{P3, Integer};
+/// use typenum::{Integer, P3};
 ///
 /// assert_eq!(P3::to_i32(), 3);
 /// assert_eq!(P3::I32, 3);
@@ -171,9 +177,9 @@
 /// Here's a working example:
 ///
 /// ```rust
-/// use typenum::{P4, P8, PowerOfTwo};
+/// use typenum::{PowerOfTwo, P4, P8};
 ///
-/// fn only_p2<P: PowerOfTwo>() { }
+/// fn only_p2<P: PowerOfTwo>() {}
 ///
 /// only_p2::<P4>();
 /// only_p2::<P8>();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/operator_aliases.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/operator_aliases.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/operator_aliases.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/operator_aliases.rs	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,6 @@
 //!
 //! ```rust
 //! # #[macro_use] extern crate typenum;
-//! # fn main() {
 //! use std::ops::Mul;
 //! use typenum::{Prod, P5, P7};
 //!
@@ -15,14 +14,13 @@
 //! type Y = Prod<P7, P5>;
 //!
 //! assert_type_eq!(X, Y);
-//! # }
 //! ```
-//!
-//!
 
 // Aliases!!!
+use crate::type_operators::{
+    Abs, Cmp, Gcd, Len, Logarithm2, Max, Min, PartialDiv, Pow, SquareRoot,
+};
 use core::ops::{Add, BitAnd, BitOr, BitXor, Div, Mul, Neg, Rem, Shl, Shr, Sub};
-use type_operators::{Abs, Cmp, Gcd, Len, Logarithm2, Max, Min, PartialDiv, Pow, SquareRoot};
 
 /// Alias for the associated type of `BitAnd`: `And<A, B> = <A as BitAnd<B>>::Output`
 pub type And<A, B> = <A as BitAnd<B>>::Output;
@@ -64,12 +62,12 @@
 pub type Gcf<A, B> = <A as Gcd<B>>::Output;
 
 /// Alias to make it easy to add 1: `Add1<A> = <A as Add<B1>>::Output`
-pub type Add1<A> = <A as Add<::bit::B1>>::Output;
+pub type Add1<A> = <A as Add<crate::bit::B1>>::Output;
 /// Alias to make it easy to subtract 1: `Sub1<A> = <A as Sub<B1>>::Output`
-pub type Sub1<A> = <A as Sub<::bit::B1>>::Output;
+pub type Sub1<A> = <A as Sub<crate::bit::B1>>::Output;
 
 /// Alias to make it easy to multiply by 2. `Double<A> = Shleft<A, B1>`
-pub type Double<A> = Shleft<A, ::bit::B1>;
+pub type Double<A> = Shleft<A, crate::bit::B1>;
 
 /// Alias to make it easy to square. `Square<A> = <A as Mul<A>>::Output`
 pub type Square<A> = <A as Mul>::Output;
@@ -91,7 +89,9 @@
 /// Alias for the associated type of `Max`: `Maximum<A, B> = <A as Max<B>>::Output`
 pub type Maximum<A, B> = <A as Max<B>>::Output;
 
-use type_operators::{IsEqual, IsGreater, IsGreaterOrEqual, IsLess, IsLessOrEqual, IsNotEqual};
+use crate::type_operators::{
+    IsEqual, IsGreater, IsGreaterOrEqual, IsLess, IsLessOrEqual, IsNotEqual,
+};
 /// Alias for the associated type of `IsLess`: `Le<A, B> = <A as IsLess<B>>::Output`
 pub type Le<A, B> = <A as IsLess<B>>::Output;
 /// Alias for the associated type of `IsEqual`: `Eq<A, B> = <A as IsEqual<B>>::Output`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/private.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/private.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/private.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/private.rs	2021-12-09 12:01:26.000000000 +0000
@@ -17,12 +17,13 @@
 //!
 //! Note: Aliases for private type operators will all be named simply that operator followed
 //! by an abbreviated name of its associated type.
-//!
 
 #![doc(hidden)]
 
-use bit::{Bit, B0, B1};
-use uint::{UInt, UTerm, Unsigned};
+use crate::{
+    bit::{Bit, B0, B1},
+    uint::{UInt, UTerm, Unsigned},
+};
 
 /// A marker for restricting a method on a public trait to internal use only.
 pub(crate) enum Internal {}
@@ -63,7 +64,7 @@
 pub trait PrivateInvert<Rhs> {
     type Output;
 
-    fn private_invert(self, Rhs) -> Self::Output;
+    fn private_invert(self, rhs: Rhs) -> Self::Output;
 }
 pub type PrivateInvertOut<A, Rhs> = <A as PrivateInvert<Rhs>>::Output;
 
@@ -80,7 +81,7 @@
 pub trait PrivateAnd<Rhs = Self> {
     type Output;
 
-    fn private_and(self, Rhs) -> Self::Output;
+    fn private_and(self, rhs: Rhs) -> Self::Output;
 }
 pub type PrivateAndOut<A, Rhs> = <A as PrivateAnd<Rhs>>::Output;
 
@@ -88,7 +89,7 @@
 pub trait PrivateXor<Rhs = Self> {
     type Output;
 
-    fn private_xor(self, Rhs) -> Self::Output;
+    fn private_xor(self, rhs: Rhs) -> Self::Output;
 }
 pub type PrivateXorOut<A, Rhs> = <A as PrivateXor<Rhs>>::Output;
 
@@ -96,7 +97,7 @@
 pub trait PrivateSub<Rhs = Self> {
     type Output;
 
-    fn private_sub(self, Rhs) -> Self::Output;
+    fn private_sub(self, rhs: Rhs) -> Self::Output;
 }
 pub type PrivateSubOut<A, Rhs> = <A as PrivateSub<Rhs>>::Output;
 
@@ -106,14 +107,14 @@
 pub trait PrivateIntegerAdd<C, N> {
     type Output;
 
-    fn private_integer_add(self, C, N) -> Self::Output;
+    fn private_integer_add(self, _: C, _: N) -> Self::Output;
 }
 pub type PrivateIntegerAddOut<P, C, N> = <P as PrivateIntegerAdd<C, N>>::Output;
 
 pub trait PrivatePow<Y, N> {
     type Output;
 
-    fn private_pow(self, Y, N) -> Self::Output;
+    fn private_pow(self, _: Y, _: N) -> Self::Output;
 }
 pub type PrivatePowOut<A, Y, N> = <A as PrivatePow<Y, N>>::Output;
 
@@ -199,10 +200,10 @@
 
 #[test]
 fn test_inversion() {
-    type Test4 = <::consts::U4 as Invert>::Output;
-    type Test5 = <::consts::U5 as Invert>::Output;
-    type Test12 = <::consts::U12 as Invert>::Output;
-    type Test16 = <::consts::U16 as Invert>::Output;
+    type Test4 = <crate::consts::U4 as Invert>::Output;
+    type Test5 = <crate::consts::U5 as Invert>::Output;
+    type Test12 = <crate::consts::U12 as Invert>::Output;
+    type Test16 = <crate::consts::U16 as Invert>::Output;
 
     assert_eq!(1, <Test4 as InvertedUnsigned>::to_u64());
     assert_eq!(5, <Test5 as InvertedUnsigned>::to_u64());
@@ -260,10 +261,10 @@
 
 #[test]
 fn test_double_inversion() {
-    type Test4 = <<::consts::U4 as Invert>::Output as Invert>::Output;
-    type Test5 = <<::consts::U5 as Invert>::Output as Invert>::Output;
-    type Test12 = <<::consts::U12 as Invert>::Output as Invert>::Output;
-    type Test16 = <<::consts::U16 as Invert>::Output as Invert>::Output;
+    type Test4 = <<crate::consts::U4 as Invert>::Output as Invert>::Output;
+    type Test5 = <<crate::consts::U5 as Invert>::Output as Invert>::Output;
+    type Test12 = <<crate::consts::U12 as Invert>::Output as Invert>::Output;
+    type Test16 = <<crate::consts::U16 as Invert>::Output as Invert>::Output;
 
     assert_eq!(4, <Test4 as Unsigned>::to_u64());
     assert_eq!(5, <Test5 as Unsigned>::to_u64());
@@ -320,7 +321,7 @@
 pub trait PrivateCmp<Rhs, SoFar> {
     type Output;
 
-    fn private_cmp(&self, &Rhs, SoFar) -> Self::Output;
+    fn private_cmp(&self, _: &Rhs, _: SoFar) -> Self::Output;
 }
 pub type PrivateCmpOut<A, Rhs, SoFar> = <A as PrivateCmp<Rhs, SoFar>>::Output;
 
@@ -328,7 +329,7 @@
 pub trait PrivateSetBit<I, B> {
     type Output;
 
-    fn private_set_bit(self, I, B) -> Self::Output;
+    fn private_set_bit(self, _: I, _: B) -> Self::Output;
 }
 pub type PrivateSetBitOut<N, I, B> = <N as PrivateSetBit<I, B>>::Output;
 
@@ -337,9 +338,9 @@
     type Quotient;
     type Remainder;
 
-    fn private_div_quotient(self, N, D, Q, R, I) -> Self::Quotient;
+    fn private_div_quotient(self, _: N, _: D, _: Q, _: R, _: I) -> Self::Quotient;
 
-    fn private_div_remainder(self, N, D, Q, R, I) -> Self::Remainder;
+    fn private_div_remainder(self, _: N, _: D, _: Q, _: R, _: I) -> Self::Remainder;
 }
 
 pub type PrivateDivQuot<N, D, Q, R, I> = <() as PrivateDiv<N, D, Q, R, I>>::Quotient;
@@ -349,9 +350,9 @@
     type Quotient;
     type Remainder;
 
-    fn private_div_if_quotient(self, N, D, Q, R, I, RcmpD) -> Self::Quotient;
+    fn private_div_if_quotient(self, _: N, _: D, _: Q, _: R, _: I, _: RcmpD) -> Self::Quotient;
 
-    fn private_div_if_remainder(self, N, D, Q, R, I, RcmpD) -> Self::Remainder;
+    fn private_div_if_remainder(self, _: N, _: D, _: Q, _: R, _: I, _: RcmpD) -> Self::Remainder;
 }
 
 pub type PrivateDivIfQuot<N, D, Q, R, I, RcmpD> =
@@ -363,38 +364,38 @@
 pub trait PrivateDivInt<C, Divisor> {
     type Output;
 
-    fn private_div_int(self, C, Divisor) -> Self::Output;
+    fn private_div_int(self, _: C, _: Divisor) -> Self::Output;
 }
 pub type PrivateDivIntOut<A, C, Divisor> = <A as PrivateDivInt<C, Divisor>>::Output;
 
 pub trait PrivateRem<URem, Divisor> {
     type Output;
 
-    fn private_rem(self, URem, Divisor) -> Self::Output;
+    fn private_rem(self, _: URem, _: Divisor) -> Self::Output;
 }
 pub type PrivateRemOut<A, URem, Divisor> = <A as PrivateRem<URem, Divisor>>::Output;
 
 // min max
 pub trait PrivateMin<Rhs, CmpResult> {
     type Output;
-    fn private_min(self, Rhs) -> Self::Output;
+    fn private_min(self, rhs: Rhs) -> Self::Output;
 }
 pub type PrivateMinOut<A, B, CmpResult> = <A as PrivateMin<B, CmpResult>>::Output;
 
 pub trait PrivateMax<Rhs, CmpResult> {
     type Output;
-    fn private_max(self, Rhs) -> Self::Output;
+    fn private_max(self, rhs: Rhs) -> Self::Output;
 }
 pub type PrivateMaxOut<A, B, CmpResult> = <A as PrivateMax<B, CmpResult>>::Output;
 
 // Comparisons
 
-use {Equal, False, Greater, Less, True};
+use crate::{Equal, False, Greater, Less, True};
 
 pub trait IsLessPrivate<Rhs, Cmp> {
     type Output: Bit;
 
-    fn is_less_private(self, Rhs, Cmp) -> Self::Output;
+    fn is_less_private(self, _: Rhs, _: Cmp) -> Self::Output;
 }
 
 impl<A, B> IsLessPrivate<B, Less> for A {
@@ -425,7 +426,7 @@
 pub trait IsEqualPrivate<Rhs, Cmp> {
     type Output: Bit;
 
-    fn is_equal_private(self, Rhs, Cmp) -> Self::Output;
+    fn is_equal_private(self, _: Rhs, _: Cmp) -> Self::Output;
 }
 
 impl<A, B> IsEqualPrivate<B, Less> for A {
@@ -456,7 +457,7 @@
 pub trait IsGreaterPrivate<Rhs, Cmp> {
     type Output: Bit;
 
-    fn is_greater_private(self, Rhs, Cmp) -> Self::Output;
+    fn is_greater_private(self, _: Rhs, _: Cmp) -> Self::Output;
 }
 
 impl<A, B> IsGreaterPrivate<B, Less> for A {
@@ -487,7 +488,7 @@
 pub trait IsLessOrEqualPrivate<Rhs, Cmp> {
     type Output: Bit;
 
-    fn is_less_or_equal_private(self, Rhs, Cmp) -> Self::Output;
+    fn is_less_or_equal_private(self, _: Rhs, _: Cmp) -> Self::Output;
 }
 
 impl<A, B> IsLessOrEqualPrivate<B, Less> for A {
@@ -518,7 +519,7 @@
 pub trait IsNotEqualPrivate<Rhs, Cmp> {
     type Output: Bit;
 
-    fn is_not_equal_private(self, Rhs, Cmp) -> Self::Output;
+    fn is_not_equal_private(self, _: Rhs, _: Cmp) -> Self::Output;
 }
 
 impl<A, B> IsNotEqualPrivate<B, Less> for A {
@@ -549,7 +550,7 @@
 pub trait IsGreaterOrEqualPrivate<Rhs, Cmp> {
     type Output: Bit;
 
-    fn is_greater_or_equal_private(self, Rhs, Cmp) -> Self::Output;
+    fn is_greater_or_equal_private(self, _: Rhs, _: Cmp) -> Self::Output;
 }
 
 impl<A, B> IsGreaterOrEqualPrivate<B, Less> for A {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/type_operators.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/type_operators.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/type_operators.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/type_operators.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,9 @@
 //! Useful **type operators** that are not defined in `core::ops`.
-//!
 
-use private::{Internal, InternalMarker};
-use {Bit, NInt, NonZero, PInt, UInt, UTerm, Unsigned, Z0};
+use crate::{
+    private::{Internal, InternalMarker},
+    Bit, NInt, NonZero, PInt, UInt, UTerm, Unsigned, Z0,
+};
 
 /// A **type operator** that ensures that `Rhs` is the same as `Self`, it is mainly useful
 /// for writing macros that can take arbitrary binary or unary operators.
@@ -15,7 +16,7 @@
 ///
 /// # Example
 /// ```rust
-/// use typenum::{Same, U4, U5, Unsigned};
+/// use typenum::{Same, Unsigned, U4, U5};
 ///
 /// assert_eq!(<U5 as Same<U5>>::Output::to_u32(), 5);
 ///
@@ -38,7 +39,7 @@
 ///
 /// # Example
 /// ```rust
-/// use typenum::{Abs, N5, Integer};
+/// use typenum::{Abs, Integer, N5};
 ///
 /// assert_eq!(<N5 as Abs>::Output::to_i32(), 5);
 /// ```
@@ -63,7 +64,7 @@
 ///
 /// # Example
 /// ```rust
-/// use typenum::{Pow, N3, P3, Integer};
+/// use typenum::{Integer, Pow, N3, P3};
 ///
 /// assert_eq!(<N3 as Pow<P3>>::Output::to_i32(), -27);
 /// ```
@@ -171,6 +172,15 @@
                 acc
             }
         }
+
+        impl<U: Unsigned + NonZero> Pow<NInt<U>> for $t {
+            type Output = $t;
+
+            #[inline]
+            fn powi(self, _: NInt<U>) -> Self::Output {
+                <$t as Pow<PInt<U>>>::powi(self, PInt::new()).recip()
+            }
+        }
     };
 }
 
@@ -222,12 +232,13 @@
 
 #[test]
 fn pow_test() {
-    use consts::*;
+    use crate::consts::*;
     let z0 = Z0::new();
     let p3 = P3::new();
 
     let u0 = U0::new();
     let u3 = U3::new();
+    let n3 = N3::new();
 
     macro_rules! check {
         ($x:ident) => {
@@ -243,6 +254,15 @@
 
             assert!((<$f as Pow<P3>>::powi(*$x, p3) - $x * $x * $x).abs() < ::core::$f::EPSILON);
             assert!((<$f as Pow<U3>>::powi(*$x, u3) - $x * $x * $x).abs() < ::core::$f::EPSILON);
+
+            if *$x == 0.0 {
+                assert!(<$f as Pow<N3>>::powi(*$x, n3).is_infinite());
+            } else {
+                assert!(
+                    (<$f as Pow<N3>>::powi(*$x, n3) - 1. / $x / $x / $x).abs()
+                        < ::core::$f::EPSILON
+                );
+            }
         };
     }
 
@@ -284,13 +304,13 @@
     type Output;
 
     #[doc(hidden)]
-    fn compare<IM: InternalMarker>(&self, &Rhs) -> Self::Output;
+    fn compare<IM: InternalMarker>(&self, _: &Rhs) -> Self::Output;
 }
 
 /// A **type operator** that gives the length of an `Array` or the number of bits in a `UInt`.
 pub trait Len {
     /// The length as a type-level unsigned integer.
-    type Output: ::Unsigned;
+    type Output: crate::Unsigned;
     /// This function isn't used in this crate, but may be useful for others.
     fn len(&self) -> Self::Output;
 }
@@ -320,7 +340,7 @@
     fn max(self, rhs: Rhs) -> Self::Output;
 }
 
-use Compare;
+use crate::Compare;
 
 /// A **type operator** that returns `True` if `Self < Rhs`, otherwise returns `False`.
 pub trait IsLess<Rhs = Self> {
@@ -330,7 +350,7 @@
     fn is_less(self, rhs: Rhs) -> Self::Output;
 }
 
-use private::IsLessPrivate;
+use crate::private::IsLessPrivate;
 impl<A, B> IsLess<B> for A
 where
     A: Cmp<B> + IsLessPrivate<B, Compare<A, B>>,
@@ -352,7 +372,7 @@
     fn is_equal(self, rhs: Rhs) -> Self::Output;
 }
 
-use private::IsEqualPrivate;
+use crate::private::IsEqualPrivate;
 impl<A, B> IsEqual<B> for A
 where
     A: Cmp<B> + IsEqualPrivate<B, Compare<A, B>>,
@@ -374,7 +394,7 @@
     fn is_greater(self, rhs: Rhs) -> Self::Output;
 }
 
-use private::IsGreaterPrivate;
+use crate::private::IsGreaterPrivate;
 impl<A, B> IsGreater<B> for A
 where
     A: Cmp<B> + IsGreaterPrivate<B, Compare<A, B>>,
@@ -396,7 +416,7 @@
     fn is_less_or_equal(self, rhs: Rhs) -> Self::Output;
 }
 
-use private::IsLessOrEqualPrivate;
+use crate::private::IsLessOrEqualPrivate;
 impl<A, B> IsLessOrEqual<B> for A
 where
     A: Cmp<B> + IsLessOrEqualPrivate<B, Compare<A, B>>,
@@ -418,7 +438,7 @@
     fn is_not_equal(self, rhs: Rhs) -> Self::Output;
 }
 
-use private::IsNotEqualPrivate;
+use crate::private::IsNotEqualPrivate;
 impl<A, B> IsNotEqual<B> for A
 where
     A: Cmp<B> + IsNotEqualPrivate<B, Compare<A, B>>,
@@ -440,7 +460,7 @@
     fn is_greater_or_equal(self, rhs: Rhs) -> Self::Output;
 }
 
-use private::IsGreaterOrEqualPrivate;
+use crate::private::IsGreaterOrEqualPrivate;
 impl<A, B> IsGreaterOrEqual<B> for A
 where
     A: Cmp<B> + IsGreaterOrEqualPrivate<B, Compare<A, B>>,
@@ -550,7 +570,7 @@
 /// # Example
 ///
 /// ```rust
-/// use typenum::{Gcd, U12, U8, Unsigned};
+/// use typenum::{Gcd, Unsigned, U12, U8};
 ///
 /// assert_eq!(<U12 as Gcd<U8>>::Output::to_i32(), 4);
 /// ```
@@ -558,3 +578,13 @@
     /// The greatest common divisor.
     type Output;
 }
+
+/// A **type operator** for taking a concrete integer value from a type.
+///
+/// It returns arbitrary integer value without explicitly specifying the
+/// type. It is useful when you pass the values to methods that accept
+/// distinct types without runtime casting.
+pub trait ToInt<T> {
+    /// Method returning the concrete value for the type.
+    fn to_int() -> T;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/uint.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/uint.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/typenum/src/uint.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/typenum/src/uint.rs	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 //!
 //! **Type operators** implemented:
 //!
-//! From `core::ops`: `BitAnd`, `BitOr`, `BitXor`, `Shl`, `Shr`, `Add`, `Sub`,
+//! From `::core::ops`: `BitAnd`, `BitOr`, `BitXor`, `Shl`, `Shr`, `Add`, `Sub`,
 //!                 `Mul`, `Div`, and `Rem`.
 //! From `typenum`: `Same`, `Cmp`, and `Pow`.
 //!
@@ -12,7 +12,7 @@
 //!
 //! # Example
 //! ```rust
-//! use std::ops::{BitAnd, BitOr, BitXor, Shl, Shr, Add, Sub, Mul, Div, Rem};
+//! use std::ops::{Add, BitAnd, BitOr, BitXor, Div, Mul, Rem, Shl, Shr, Sub};
 //! use typenum::{Unsigned, U1, U2, U3, U4};
 //!
 //! assert_eq!(<U3 as BitAnd<U2>>::Output::to_u32(), 2);
@@ -26,31 +26,22 @@
 //! assert_eq!(<U3 as Div<U2>>::Output::to_u32(), 1);
 //! assert_eq!(<U3 as Rem<U2>>::Output::to_u32(), 1);
 //! ```
-//!
-
-use core::ops::{Add, BitAnd, BitOr, BitXor, Mul, Shl, Shr, Sub};
-use {
-    Cmp, Equal, Gcd, Greater, IsGreaterOrEqual, Len, Less, Logarithm2, Maximum, Minimum, NonZero,
-    Ord, Pow, SquareRoot,
-};
-
-use bit::{Bit, B0, B1};
 
-use private::{
-    BitDiff, PrivateAnd, PrivateCmp, PrivateLogarithm2, PrivatePow, PrivateSquareRoot, PrivateSub,
-    PrivateXor, Trim,
+use crate::{
+    bit::{Bit, B0, B1},
+    consts::{U0, U1},
+    private::{
+        BitDiff, BitDiffOut, Internal, InternalMarker, PrivateAnd, PrivateAndOut, PrivateCmp,
+        PrivateCmpOut, PrivateLogarithm2, PrivatePow, PrivatePowOut, PrivateSquareRoot, PrivateSub,
+        PrivateSubOut, PrivateXor, PrivateXorOut, Trim, TrimOut,
+    },
+    Add1, Cmp, Double, Equal, Gcd, Gcf, GrEq, Greater, IsGreaterOrEqual, Len, Length, Less, Log2,
+    Logarithm2, Maximum, Minimum, NonZero, Or, Ord, Pow, Prod, Shleft, Shright, Sqrt, Square,
+    SquareRoot, Sub1, Sum, ToInt, Zero,
 };
+use core::ops::{Add, BitAnd, BitOr, BitXor, Mul, Shl, Shr, Sub};
 
-use private::{
-    BitDiffOut, PrivateAndOut, PrivateCmpOut, PrivatePowOut, PrivateSubOut, PrivateXorOut, TrimOut,
-};
-
-use private::{Internal, InternalMarker};
-
-use consts::{U0, U1};
-use {Add1, Double, Gcf, GrEq, Length, Log2, Or, Prod, Shleft, Shright, Sqrt, Square, Sub1, Sum};
-
-pub use marker_traits::{PowerOfTwo, Unsigned};
+pub use crate::marker_traits::{PowerOfTwo, Unsigned};
 
 /// The terminating type for `UInt`; it always comes after the most significant
 /// bit. `UTerm` by itself represents zero, which is aliased to `U0`.
@@ -146,7 +137,7 @@
 ///
 /// # Example
 /// ```rust
-/// use typenum::{B0, B1, UInt, UTerm};
+/// use typenum::{UInt, UTerm, B0, B1};
 ///
 /// # #[allow(dead_code)]
 /// type U6 = UInt<UInt<UInt<UTerm, B1>, B1>, B0>;
@@ -238,6 +229,7 @@
 }
 
 impl<U: Unsigned, B: Bit> NonZero for UInt<U, B> {}
+impl Zero for UTerm {}
 
 impl PowerOfTwo for UInt<UTerm, B1> {}
 impl<U: Unsigned + PowerOfTwo> PowerOfTwo for UInt<U, B0> {}
@@ -1289,7 +1281,7 @@
 
 // ---------------------------------------------------------------------------------------
 // Shifting one number until it's the size of another
-use private::ShiftDiff;
+use crate::private::ShiftDiff;
 impl<Ul: Unsigned, Ur: Unsigned> ShiftDiff<Ur> for Ul
 where
     Ur: BitDiff<Ul>,
@@ -1439,7 +1431,7 @@
 #[cfg(test)]
 mod gcd_tests {
     use super::*;
-    use consts::*;
+    use crate::consts::*;
 
     macro_rules! gcd_test {
         (
@@ -1475,7 +1467,7 @@
     type Output;
 
     #[doc(hidden)]
-    fn get_bit<IM: InternalMarker>(&self, &I) -> Self::Output;
+    fn get_bit<IM: InternalMarker>(&self, _: &I) -> Self::Output;
 }
 
 #[allow(missing_docs)]
@@ -1520,8 +1512,8 @@
 
 #[test]
 fn test_get_bit() {
-    use consts::*;
-    use Same;
+    use crate::consts::*;
+    use crate::Same;
     type T1 = <GetBitOut<U2, U0> as Same<B0>>::Output;
     type T2 = <GetBitOut<U2, U1> as Same<B1>>::Output;
     type T3 = <GetBitOut<U2, U2> as Same<B0>>::Output;
@@ -1541,12 +1533,12 @@
     type Output;
 
     #[doc(hidden)]
-    fn set_bit<IM: InternalMarker>(self, I, B) -> Self::Output;
+    fn set_bit<IM: InternalMarker>(self, _: I, _: B) -> Self::Output;
 }
 /// Alias for the result of calling `SetBit`: `SetBitOut<N, I, B> = <N as SetBit<I, B>>::Output`.
 pub type SetBitOut<N, I, B> = <N as SetBit<I, B>>::Output;
 
-use private::{PrivateSetBit, PrivateSetBitOut};
+use crate::private::{PrivateSetBit, PrivateSetBitOut};
 
 // Call private one then trim it
 impl<N, I, B> SetBit<I, B> for N
@@ -1617,8 +1609,8 @@
 
 #[test]
 fn test_set_bit() {
-    use consts::*;
-    use Same;
+    use crate::consts::*;
+    use crate::Same;
     type T1 = <SetBitOut<U2, U0, B0> as Same<U2>>::Output;
     type T2 = <SetBitOut<U2, U0, B1> as Same<U3>>::Output;
     type T3 = <SetBitOut<U2, U1, B0> as Same<U0>>::Output;
@@ -1669,8 +1661,8 @@
     }
     #[test]
     fn test_div() {
-        use consts::*;
-        use {Quot, Same};
+        use crate::consts::*;
+        use crate::{Quot, Same};
 
         test_div!(U0 / U1 = U0);
         test_div!(U1 / U1 = U1);
@@ -1747,9 +1739,9 @@
 
 // -----------------------------------------
 // PrivateDiv
-use private::{PrivateDiv, PrivateDivQuot, PrivateDivRem};
+use crate::private::{PrivateDiv, PrivateDivQuot, PrivateDivRem};
 
-use Compare;
+use crate::Compare;
 // R == 0: We set R = UInt<UTerm, N[i]>, then call out to PrivateDivIf for the if statement
 impl<N, D, Q, I> PrivateDiv<N, D, Q, U0, I> for ()
 where
@@ -1861,7 +1853,7 @@
 // -----------------------------------------
 // PrivateDivIf
 
-use private::{PrivateDivIf, PrivateDivIfQuot, PrivateDivIfRem};
+use crate::private::{PrivateDivIf, PrivateDivIfQuot, PrivateDivIfRem};
 
 // R < D, I > 0, we do nothing and recurse
 impl<N, D, Q, R, Ui, Bi> PrivateDivIf<N, D, Q, R, UInt<Ui, Bi>, Less> for ()
@@ -1940,7 +1932,7 @@
     }
 }
 
-use Diff;
+use crate::Diff;
 // R > D, I > 0, we set R -= D, Q[I] = 1 and recurse
 impl<N, D, Q, R, Ui, Bi> PrivateDivIf<N, D, Q, R, UInt<Ui, Bi>, Greater> for ()
 where
@@ -2049,7 +2041,7 @@
 
 // -----------------------------------------
 // PartialDiv
-use {PartialDiv, Quot};
+use crate::{PartialDiv, Quot};
 impl<Ur: Unsigned, Br: Bit> PartialDiv<UInt<Ur, Br>> for UTerm {
     type Output = UTerm;
     #[inline]
@@ -2072,7 +2064,7 @@
 
 // -----------------------------------------
 // PrivateMin
-use private::{PrivateMin, PrivateMinOut};
+use crate::private::{PrivateMin, PrivateMinOut};
 
 impl<U, B, Ur> PrivateMin<Ur, Equal> for UInt<U, B>
 where
@@ -2115,7 +2107,7 @@
 
 // -----------------------------------------
 // Min
-use Min;
+use crate::Min;
 
 impl<U> Min<U> for UTerm
 where
@@ -2144,7 +2136,7 @@
 
 // -----------------------------------------
 // PrivateMax
-use private::{PrivateMax, PrivateMaxOut};
+use crate::private::{PrivateMax, PrivateMaxOut};
 
 impl<U, B, Ur> PrivateMax<Ur, Equal> for UInt<U, B>
 where
@@ -2187,7 +2179,7 @@
 
 // -----------------------------------------
 // Max
-use Max;
+use crate::Max;
 
 impl<U> Max<U> for UTerm
 where
@@ -2262,7 +2254,7 @@
 
 #[test]
 fn sqrt_test() {
-    use consts::*;
+    use crate::consts::*;
 
     assert_eq!(0, <Sqrt<U0>>::to_u32());
 
@@ -2324,47 +2316,283 @@
     type Output = Add1<Log2<U>>;
 }
 
-#[test]
-fn log2_test() {
-    use consts::*;
+// -----------------------------------------
+// ToInt
 
-    assert_eq!(0, <Log2<U1>>::to_u32());
+impl ToInt<i8> for UTerm {
+    #[inline]
+    fn to_int() -> i8 {
+        Self::I8
+    }
+}
 
-    assert_eq!(1, <Log2<U2>>::to_u32());
-    assert_eq!(1, <Log2<U3>>::to_u32());
+impl ToInt<i16> for UTerm {
+    #[inline]
+    fn to_int() -> i16 {
+        Self::I16
+    }
+}
 
-    assert_eq!(2, <Log2<U4>>::to_u32());
-    assert_eq!(2, <Log2<U5>>::to_u32());
-    assert_eq!(2, <Log2<U6>>::to_u32());
-    assert_eq!(2, <Log2<U7>>::to_u32());
-
-    assert_eq!(3, <Log2<U8>>::to_u32());
-    assert_eq!(3, <Log2<U9>>::to_u32());
-    assert_eq!(3, <Log2<U10>>::to_u32());
-    assert_eq!(3, <Log2<U11>>::to_u32());
-    assert_eq!(3, <Log2<U12>>::to_u32());
-    assert_eq!(3, <Log2<U13>>::to_u32());
-    assert_eq!(3, <Log2<U14>>::to_u32());
-    assert_eq!(3, <Log2<U15>>::to_u32());
-
-    assert_eq!(4, <Log2<U16>>::to_u32());
-    assert_eq!(4, <Log2<U17>>::to_u32());
-    assert_eq!(4, <Log2<U18>>::to_u32());
-    assert_eq!(4, <Log2<U19>>::to_u32());
-    assert_eq!(4, <Log2<U20>>::to_u32());
-    assert_eq!(4, <Log2<U21>>::to_u32());
-    assert_eq!(4, <Log2<U22>>::to_u32());
-    assert_eq!(4, <Log2<U23>>::to_u32());
-    assert_eq!(4, <Log2<U24>>::to_u32());
-    assert_eq!(4, <Log2<U25>>::to_u32());
-    assert_eq!(4, <Log2<U26>>::to_u32());
-    assert_eq!(4, <Log2<U27>>::to_u32());
-    assert_eq!(4, <Log2<U28>>::to_u32());
-    assert_eq!(4, <Log2<U29>>::to_u32());
-    assert_eq!(4, <Log2<U30>>::to_u32());
-    assert_eq!(4, <Log2<U31>>::to_u32());
+impl ToInt<i32> for UTerm {
+    #[inline]
+    fn to_int() -> i32 {
+        Self::I32
+    }
+}
 
-    assert_eq!(5, <Log2<U32>>::to_u32());
-    assert_eq!(5, <Log2<U33>>::to_u32());
-    // ...
+impl ToInt<i64> for UTerm {
+    #[inline]
+    fn to_int() -> i64 {
+        Self::I64
+    }
+}
+
+impl ToInt<u8> for UTerm {
+    #[inline]
+    fn to_int() -> u8 {
+        Self::U8
+    }
+}
+
+impl ToInt<u16> for UTerm {
+    #[inline]
+    fn to_int() -> u16 {
+        Self::U16
+    }
+}
+
+impl ToInt<u32> for UTerm {
+    #[inline]
+    fn to_int() -> u32 {
+        Self::U32
+    }
+}
+
+impl ToInt<u64> for UTerm {
+    #[inline]
+    fn to_int() -> u64 {
+        Self::U64
+    }
+}
+
+impl ToInt<usize> for UTerm {
+    #[inline]
+    fn to_int() -> usize {
+        Self::USIZE
+    }
+}
+
+impl<U, B> ToInt<i8> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> i8 {
+        Self::I8
+    }
+}
+
+impl<U, B> ToInt<i16> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> i16 {
+        Self::I16
+    }
+}
+
+impl<U, B> ToInt<i32> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> i32 {
+        Self::I32
+    }
+}
+
+impl<U, B> ToInt<i64> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> i64 {
+        Self::I64
+    }
+}
+
+impl<U, B> ToInt<u8> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> u8 {
+        Self::U8
+    }
+}
+
+impl<U, B> ToInt<u16> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> u16 {
+        Self::U16
+    }
+}
+
+impl<U, B> ToInt<u32> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> u32 {
+        Self::U32
+    }
+}
+
+impl<U, B> ToInt<u64> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> u64 {
+        Self::U64
+    }
+}
+
+impl<U, B> ToInt<usize> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+{
+    #[inline]
+    fn to_int() -> usize {
+        Self::USIZE
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::consts::*;
+    use crate::{Log2, ToInt, Unsigned};
+
+    #[test]
+    fn log2_test() {
+        assert_eq!(0, <Log2<U1>>::to_u32());
+
+        assert_eq!(1, <Log2<U2>>::to_u32());
+        assert_eq!(1, <Log2<U3>>::to_u32());
+
+        assert_eq!(2, <Log2<U4>>::to_u32());
+        assert_eq!(2, <Log2<U5>>::to_u32());
+        assert_eq!(2, <Log2<U6>>::to_u32());
+        assert_eq!(2, <Log2<U7>>::to_u32());
+
+        assert_eq!(3, <Log2<U8>>::to_u32());
+        assert_eq!(3, <Log2<U9>>::to_u32());
+        assert_eq!(3, <Log2<U10>>::to_u32());
+        assert_eq!(3, <Log2<U11>>::to_u32());
+        assert_eq!(3, <Log2<U12>>::to_u32());
+        assert_eq!(3, <Log2<U13>>::to_u32());
+        assert_eq!(3, <Log2<U14>>::to_u32());
+        assert_eq!(3, <Log2<U15>>::to_u32());
+
+        assert_eq!(4, <Log2<U16>>::to_u32());
+        assert_eq!(4, <Log2<U17>>::to_u32());
+        assert_eq!(4, <Log2<U18>>::to_u32());
+        assert_eq!(4, <Log2<U19>>::to_u32());
+        assert_eq!(4, <Log2<U20>>::to_u32());
+        assert_eq!(4, <Log2<U21>>::to_u32());
+        assert_eq!(4, <Log2<U22>>::to_u32());
+        assert_eq!(4, <Log2<U23>>::to_u32());
+        assert_eq!(4, <Log2<U24>>::to_u32());
+        assert_eq!(4, <Log2<U25>>::to_u32());
+        assert_eq!(4, <Log2<U26>>::to_u32());
+        assert_eq!(4, <Log2<U27>>::to_u32());
+        assert_eq!(4, <Log2<U28>>::to_u32());
+        assert_eq!(4, <Log2<U29>>::to_u32());
+        assert_eq!(4, <Log2<U30>>::to_u32());
+        assert_eq!(4, <Log2<U31>>::to_u32());
+
+        assert_eq!(5, <Log2<U32>>::to_u32());
+        assert_eq!(5, <Log2<U33>>::to_u32());
+
+        // ...
+    }
+
+    #[test]
+    fn uint_toint_test() {
+        // i8
+        assert_eq!(0_i8, U0::to_int());
+        assert_eq!(1_i8, U1::to_int());
+        assert_eq!(2_i8, U2::to_int());
+        assert_eq!(3_i8, U3::to_int());
+        assert_eq!(4_i8, U4::to_int());
+
+        // i16
+        assert_eq!(0_i16, U0::to_int());
+        assert_eq!(1_i16, U1::to_int());
+        assert_eq!(2_i16, U2::to_int());
+        assert_eq!(3_i16, U3::to_int());
+        assert_eq!(4_i16, U4::to_int());
+
+        // i32
+        assert_eq!(0_i32, U0::to_int());
+        assert_eq!(1_i32, U1::to_int());
+        assert_eq!(2_i32, U2::to_int());
+        assert_eq!(3_i32, U3::to_int());
+        assert_eq!(4_i32, U4::to_int());
+
+        // i64
+        assert_eq!(0_i64, U0::to_int());
+        assert_eq!(1_i64, U1::to_int());
+        assert_eq!(2_i64, U2::to_int());
+        assert_eq!(3_i64, U3::to_int());
+        assert_eq!(4_i64, U4::to_int());
+
+        // u8
+        assert_eq!(0_u8, U0::to_int());
+        assert_eq!(1_u8, U1::to_int());
+        assert_eq!(2_u8, U2::to_int());
+        assert_eq!(3_u8, U3::to_int());
+        assert_eq!(4_u8, U4::to_int());
+
+        // u16
+        assert_eq!(0_u16, U0::to_int());
+        assert_eq!(1_u16, U1::to_int());
+        assert_eq!(2_u16, U2::to_int());
+        assert_eq!(3_u16, U3::to_int());
+        assert_eq!(4_u16, U4::to_int());
+
+        // u32
+        assert_eq!(0_u32, U0::to_int());
+        assert_eq!(1_u32, U1::to_int());
+        assert_eq!(2_u32, U2::to_int());
+        assert_eq!(3_u32, U3::to_int());
+        assert_eq!(4_u32, U4::to_int());
+
+        // u64
+        assert_eq!(0_u64, U0::to_int());
+        assert_eq!(1_u64, U1::to_int());
+        assert_eq!(2_u64, U2::to_int());
+        assert_eq!(3_u64, U3::to_int());
+        assert_eq!(4_u64, U4::to_int());
+
+        // usize
+        assert_eq!(0_usize, U0::to_int());
+        assert_eq!(1_usize, U1::to_int());
+        assert_eq!(2_usize, U2::to_int());
+        assert_eq!(3_usize, U3::to_int());
+        assert_eq!(4_usize, U4::to_int());
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/benches/bench.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/benches/bench.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/benches/bench.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/benches/bench.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#![feature(test)]
-
-#[macro_use]
-extern crate lazy_static;
-extern crate test;
-
-use ucd_trie::TrieSetOwned;
-
-#[bench]
-fn bench_trie_set(b: &mut test::Bencher) {
-    const CHARS: &'static [char] = &['a', 'β', '☃', '😼'];
-    // const CHARS: &'static [char] = &['a'];
-    lazy_static! {
-        static ref SET: TrieSetOwned =
-            TrieSetOwned::from_scalars(CHARS).unwrap();
-    }
-
-    let set = &*SET;
-    let mut i = 0;
-    b.iter(|| {
-        let c = CHARS[i];
-        i = (i + 1) % CHARS.len();
-
-        for _ in 0..10000 {
-            assert!(set.contains_char(c));
-        }
-    });
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"164cfd341c21e0a60950d5c45d905093cf7275519c94eea00dfc9ed3f680445a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"59f7959bcf6f02efe8b325c66ea8247bd4ac6d7dd16afc585b118bd651de65e1","benches/bench.rs":"a3ca5c4d295b1611e2f79ae2295708ddd0c523d9bb1e3319ccf701832d73b9e5","src/general_category.rs":"7501e09b55f8ad0fc5c6c4f42a9d3030a8f81d1dfbe53d42e1dc17c9e24e5cac","src/lib.rs":"55c391de5921cadc39b5142d12fd603dd60b136ae0a61462546bfcf5052958f9","src/owned.rs":"b897f815685f597f3a98613d5f8196153a207a741e61bbb19f48f90c2bf594ae"},"package":"56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "ucd-trie"
-version = "0.1.3"
-authors = ["Andrew Gallant <jamslam@gmail.com>"]
-description = "A trie for storing Unicode codepoint sets and maps.\n"
-homepage = "https://github.com/BurntSushi/ucd-generate"
-documentation = "https://docs.rs/ucd-trie"
-readme = "README.md"
-keywords = ["unicode", "database", "character", "codepoint", "trie"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/BurntSushi/ucd-generate"
-[dev-dependencies.lazy_static]
-version = "1"
-
-[features]
-default = ["std"]
-std = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Andrew Gallant
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-ucd-trie
-========
-A library that provides compressed trie sets specifically tailored toward
-representing boolean Unicode character properties.
-
-[![Linux build status](https://api.travis-ci.org/BurntSushi/ucd-generate.png)](https://travis-ci.org/BurntSushi/ucd-generate)
-[![](http://meritbadge.herokuapp.com/ucd-generate)](https://crates.io/crates/ucd-trie)
-
-
-### Documentation
-
-https://docs.rs/ucd-trie
-
-
-### License
-
-This project is licensed under either of
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
-at your option.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/src/general_category.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/src/general_category.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/src/general_category.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/src/general_category.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,6297 +0,0 @@
-// DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
-//
-//  ucd-generate general-category ./ucd-13.0.0
-//
-// ucd-generate 0.2.6 is available on crates.io.
-
-pub const BY_NAME: &'static [(&'static str, &'static [(u32, u32)])] = &[
-    ("Cased_Letter", CASED_LETTER),
-    ("Close_Punctuation", CLOSE_PUNCTUATION),
-    ("Connector_Punctuation", CONNECTOR_PUNCTUATION),
-    ("Control", CONTROL),
-    ("Currency_Symbol", CURRENCY_SYMBOL),
-    ("Dash_Punctuation", DASH_PUNCTUATION),
-    ("Decimal_Number", DECIMAL_NUMBER),
-    ("Enclosing_Mark", ENCLOSING_MARK),
-    ("Final_Punctuation", FINAL_PUNCTUATION),
-    ("Format", FORMAT),
-    ("Initial_Punctuation", INITIAL_PUNCTUATION),
-    ("Letter", LETTER),
-    ("Letter_Number", LETTER_NUMBER),
-    ("Line_Separator", LINE_SEPARATOR),
-    ("Lowercase_Letter", LOWERCASE_LETTER),
-    ("Mark", MARK),
-    ("Math_Symbol", MATH_SYMBOL),
-    ("Modifier_Letter", MODIFIER_LETTER),
-    ("Modifier_Symbol", MODIFIER_SYMBOL),
-    ("Nonspacing_Mark", NONSPACING_MARK),
-    ("Number", NUMBER),
-    ("Open_Punctuation", OPEN_PUNCTUATION),
-    ("Other", OTHER),
-    ("Other_Letter", OTHER_LETTER),
-    ("Other_Number", OTHER_NUMBER),
-    ("Other_Punctuation", OTHER_PUNCTUATION),
-    ("Other_Symbol", OTHER_SYMBOL),
-    ("Paragraph_Separator", PARAGRAPH_SEPARATOR),
-    ("Private_Use", PRIVATE_USE),
-    ("Punctuation", PUNCTUATION),
-    ("Separator", SEPARATOR),
-    ("Space_Separator", SPACE_SEPARATOR),
-    ("Spacing_Mark", SPACING_MARK),
-    ("Surrogate", SURROGATE),
-    ("Symbol", SYMBOL),
-    ("Titlecase_Letter", TITLECASE_LETTER),
-    ("Unassigned", UNASSIGNED),
-    ("Uppercase_Letter", UPPERCASE_LETTER),
-];
-
-pub const CASED_LETTER: &'static [(u32, u32)] = &[
-    (65, 90),
-    (97, 122),
-    (181, 181),
-    (192, 214),
-    (216, 246),
-    (248, 442),
-    (444, 447),
-    (452, 659),
-    (661, 687),
-    (880, 883),
-    (886, 887),
-    (891, 893),
-    (895, 895),
-    (902, 902),
-    (904, 906),
-    (908, 908),
-    (910, 929),
-    (931, 1013),
-    (1015, 1153),
-    (1162, 1327),
-    (1329, 1366),
-    (1376, 1416),
-    (4256, 4293),
-    (4295, 4295),
-    (4301, 4301),
-    (4304, 4346),
-    (4349, 4351),
-    (5024, 5109),
-    (5112, 5117),
-    (7296, 7304),
-    (7312, 7354),
-    (7357, 7359),
-    (7424, 7467),
-    (7531, 7543),
-    (7545, 7578),
-    (7680, 7957),
-    (7960, 7965),
-    (7968, 8005),
-    (8008, 8013),
-    (8016, 8023),
-    (8025, 8025),
-    (8027, 8027),
-    (8029, 8029),
-    (8031, 8061),
-    (8064, 8116),
-    (8118, 8124),
-    (8126, 8126),
-    (8130, 8132),
-    (8134, 8140),
-    (8144, 8147),
-    (8150, 8155),
-    (8160, 8172),
-    (8178, 8180),
-    (8182, 8188),
-    (8450, 8450),
-    (8455, 8455),
-    (8458, 8467),
-    (8469, 8469),
-    (8473, 8477),
-    (8484, 8484),
-    (8486, 8486),
-    (8488, 8488),
-    (8490, 8493),
-    (8495, 8500),
-    (8505, 8505),
-    (8508, 8511),
-    (8517, 8521),
-    (8526, 8526),
-    (8579, 8580),
-    (11264, 11310),
-    (11312, 11358),
-    (11360, 11387),
-    (11390, 11492),
-    (11499, 11502),
-    (11506, 11507),
-    (11520, 11557),
-    (11559, 11559),
-    (11565, 11565),
-    (42560, 42605),
-    (42624, 42651),
-    (42786, 42863),
-    (42865, 42887),
-    (42891, 42894),
-    (42896, 42943),
-    (42946, 42954),
-    (42997, 42998),
-    (43002, 43002),
-    (43824, 43866),
-    (43872, 43880),
-    (43888, 43967),
-    (64256, 64262),
-    (64275, 64279),
-    (65313, 65338),
-    (65345, 65370),
-    (66560, 66639),
-    (66736, 66771),
-    (66776, 66811),
-    (68736, 68786),
-    (68800, 68850),
-    (71840, 71903),
-    (93760, 93823),
-    (119808, 119892),
-    (119894, 119964),
-    (119966, 119967),
-    (119970, 119970),
-    (119973, 119974),
-    (119977, 119980),
-    (119982, 119993),
-    (119995, 119995),
-    (119997, 120003),
-    (120005, 120069),
-    (120071, 120074),
-    (120077, 120084),
-    (120086, 120092),
-    (120094, 120121),
-    (120123, 120126),
-    (120128, 120132),
-    (120134, 120134),
-    (120138, 120144),
-    (120146, 120485),
-    (120488, 120512),
-    (120514, 120538),
-    (120540, 120570),
-    (120572, 120596),
-    (120598, 120628),
-    (120630, 120654),
-    (120656, 120686),
-    (120688, 120712),
-    (120714, 120744),
-    (120746, 120770),
-    (120772, 120779),
-    (125184, 125251),
-];
-
-pub const CLOSE_PUNCTUATION: &'static [(u32, u32)] = &[
-    (41, 41),
-    (93, 93),
-    (125, 125),
-    (3899, 3899),
-    (3901, 3901),
-    (5788, 5788),
-    (8262, 8262),
-    (8318, 8318),
-    (8334, 8334),
-    (8969, 8969),
-    (8971, 8971),
-    (9002, 9002),
-    (10089, 10089),
-    (10091, 10091),
-    (10093, 10093),
-    (10095, 10095),
-    (10097, 10097),
-    (10099, 10099),
-    (10101, 10101),
-    (10182, 10182),
-    (10215, 10215),
-    (10217, 10217),
-    (10219, 10219),
-    (10221, 10221),
-    (10223, 10223),
-    (10628, 10628),
-    (10630, 10630),
-    (10632, 10632),
-    (10634, 10634),
-    (10636, 10636),
-    (10638, 10638),
-    (10640, 10640),
-    (10642, 10642),
-    (10644, 10644),
-    (10646, 10646),
-    (10648, 10648),
-    (10713, 10713),
-    (10715, 10715),
-    (10749, 10749),
-    (11811, 11811),
-    (11813, 11813),
-    (11815, 11815),
-    (11817, 11817),
-    (12297, 12297),
-    (12299, 12299),
-    (12301, 12301),
-    (12303, 12303),
-    (12305, 12305),
-    (12309, 12309),
-    (12311, 12311),
-    (12313, 12313),
-    (12315, 12315),
-    (12318, 12319),
-    (64830, 64830),
-    (65048, 65048),
-    (65078, 65078),
-    (65080, 65080),
-    (65082, 65082),
-    (65084, 65084),
-    (65086, 65086),
-    (65088, 65088),
-    (65090, 65090),
-    (65092, 65092),
-    (65096, 65096),
-    (65114, 65114),
-    (65116, 65116),
-    (65118, 65118),
-    (65289, 65289),
-    (65341, 65341),
-    (65373, 65373),
-    (65376, 65376),
-    (65379, 65379),
-];
-
-pub const CONNECTOR_PUNCTUATION: &'static [(u32, u32)] = &[
-    (95, 95),
-    (8255, 8256),
-    (8276, 8276),
-    (65075, 65076),
-    (65101, 65103),
-    (65343, 65343),
-];
-
-pub const CONTROL: &'static [(u32, u32)] = &[(0, 31), (127, 159)];
-
-pub const CURRENCY_SYMBOL: &'static [(u32, u32)] = &[
-    (36, 36),
-    (162, 165),
-    (1423, 1423),
-    (1547, 1547),
-    (2046, 2047),
-    (2546, 2547),
-    (2555, 2555),
-    (2801, 2801),
-    (3065, 3065),
-    (3647, 3647),
-    (6107, 6107),
-    (8352, 8383),
-    (43064, 43064),
-    (65020, 65020),
-    (65129, 65129),
-    (65284, 65284),
-    (65504, 65505),
-    (65509, 65510),
-    (73693, 73696),
-    (123647, 123647),
-    (126128, 126128),
-];
-
-pub const DASH_PUNCTUATION: &'static [(u32, u32)] = &[
-    (45, 45),
-    (1418, 1418),
-    (1470, 1470),
-    (5120, 5120),
-    (6150, 6150),
-    (8208, 8213),
-    (11799, 11799),
-    (11802, 11802),
-    (11834, 11835),
-    (11840, 11840),
-    (12316, 12316),
-    (12336, 12336),
-    (12448, 12448),
-    (65073, 65074),
-    (65112, 65112),
-    (65123, 65123),
-    (65293, 65293),
-    (69293, 69293),
-];
-
-pub const DECIMAL_NUMBER: &'static [(u32, u32)] = &[
-    (48, 57),
-    (1632, 1641),
-    (1776, 1785),
-    (1984, 1993),
-    (2406, 2415),
-    (2534, 2543),
-    (2662, 2671),
-    (2790, 2799),
-    (2918, 2927),
-    (3046, 3055),
-    (3174, 3183),
-    (3302, 3311),
-    (3430, 3439),
-    (3558, 3567),
-    (3664, 3673),
-    (3792, 3801),
-    (3872, 3881),
-    (4160, 4169),
-    (4240, 4249),
-    (6112, 6121),
-    (6160, 6169),
-    (6470, 6479),
-    (6608, 6617),
-    (6784, 6793),
-    (6800, 6809),
-    (6992, 7001),
-    (7088, 7097),
-    (7232, 7241),
-    (7248, 7257),
-    (42528, 42537),
-    (43216, 43225),
-    (43264, 43273),
-    (43472, 43481),
-    (43504, 43513),
-    (43600, 43609),
-    (44016, 44025),
-    (65296, 65305),
-    (66720, 66729),
-    (68912, 68921),
-    (69734, 69743),
-    (69872, 69881),
-    (69942, 69951),
-    (70096, 70105),
-    (70384, 70393),
-    (70736, 70745),
-    (70864, 70873),
-    (71248, 71257),
-    (71360, 71369),
-    (71472, 71481),
-    (71904, 71913),
-    (72016, 72025),
-    (72784, 72793),
-    (73040, 73049),
-    (73120, 73129),
-    (92768, 92777),
-    (93008, 93017),
-    (120782, 120831),
-    (123200, 123209),
-    (123632, 123641),
-    (125264, 125273),
-    (130032, 130041),
-];
-
-pub const ENCLOSING_MARK: &'static [(u32, u32)] =
-    &[(1160, 1161), (6846, 6846), (8413, 8416), (8418, 8420), (42608, 42610)];
-
-pub const FINAL_PUNCTUATION: &'static [(u32, u32)] = &[
-    (187, 187),
-    (8217, 8217),
-    (8221, 8221),
-    (8250, 8250),
-    (11779, 11779),
-    (11781, 11781),
-    (11786, 11786),
-    (11789, 11789),
-    (11805, 11805),
-    (11809, 11809),
-];
-
-pub const FORMAT: &'static [(u32, u32)] = &[
-    (173, 173),
-    (1536, 1541),
-    (1564, 1564),
-    (1757, 1757),
-    (1807, 1807),
-    (2274, 2274),
-    (6158, 6158),
-    (8203, 8207),
-    (8234, 8238),
-    (8288, 8292),
-    (8294, 8303),
-    (65279, 65279),
-    (65529, 65531),
-    (69821, 69821),
-    (69837, 69837),
-    (78896, 78904),
-    (113824, 113827),
-    (119155, 119162),
-    (917505, 917505),
-    (917536, 917631),
-];
-
-pub const INITIAL_PUNCTUATION: &'static [(u32, u32)] = &[
-    (171, 171),
-    (8216, 8216),
-    (8219, 8220),
-    (8223, 8223),
-    (8249, 8249),
-    (11778, 11778),
-    (11780, 11780),
-    (11785, 11785),
-    (11788, 11788),
-    (11804, 11804),
-    (11808, 11808),
-];
-
-pub const LETTER: &'static [(u32, u32)] = &[
-    (65, 90),
-    (97, 122),
-    (170, 170),
-    (181, 181),
-    (186, 186),
-    (192, 214),
-    (216, 246),
-    (248, 705),
-    (710, 721),
-    (736, 740),
-    (748, 748),
-    (750, 750),
-    (880, 884),
-    (886, 887),
-    (890, 893),
-    (895, 895),
-    (902, 902),
-    (904, 906),
-    (908, 908),
-    (910, 929),
-    (931, 1013),
-    (1015, 1153),
-    (1162, 1327),
-    (1329, 1366),
-    (1369, 1369),
-    (1376, 1416),
-    (1488, 1514),
-    (1519, 1522),
-    (1568, 1610),
-    (1646, 1647),
-    (1649, 1747),
-    (1749, 1749),
-    (1765, 1766),
-    (1774, 1775),
-    (1786, 1788),
-    (1791, 1791),
-    (1808, 1808),
-    (1810, 1839),
-    (1869, 1957),
-    (1969, 1969),
-    (1994, 2026),
-    (2036, 2037),
-    (2042, 2042),
-    (2048, 2069),
-    (2074, 2074),
-    (2084, 2084),
-    (2088, 2088),
-    (2112, 2136),
-    (2144, 2154),
-    (2208, 2228),
-    (2230, 2247),
-    (2308, 2361),
-    (2365, 2365),
-    (2384, 2384),
-    (2392, 2401),
-    (2417, 2432),
-    (2437, 2444),
-    (2447, 2448),
-    (2451, 2472),
-    (2474, 2480),
-    (2482, 2482),
-    (2486, 2489),
-    (2493, 2493),
-    (2510, 2510),
-    (2524, 2525),
-    (2527, 2529),
-    (2544, 2545),
-    (2556, 2556),
-    (2565, 2570),
-    (2575, 2576),
-    (2579, 2600),
-    (2602, 2608),
-    (2610, 2611),
-    (2613, 2614),
-    (2616, 2617),
-    (2649, 2652),
-    (2654, 2654),
-    (2674, 2676),
-    (2693, 2701),
-    (2703, 2705),
-    (2707, 2728),
-    (2730, 2736),
-    (2738, 2739),
-    (2741, 2745),
-    (2749, 2749),
-    (2768, 2768),
-    (2784, 2785),
-    (2809, 2809),
-    (2821, 2828),
-    (2831, 2832),
-    (2835, 2856),
-    (2858, 2864),
-    (2866, 2867),
-    (2869, 2873),
-    (2877, 2877),
-    (2908, 2909),
-    (2911, 2913),
-    (2929, 2929),
-    (2947, 2947),
-    (2949, 2954),
-    (2958, 2960),
-    (2962, 2965),
-    (2969, 2970),
-    (2972, 2972),
-    (2974, 2975),
-    (2979, 2980),
-    (2984, 2986),
-    (2990, 3001),
-    (3024, 3024),
-    (3077, 3084),
-    (3086, 3088),
-    (3090, 3112),
-    (3114, 3129),
-    (3133, 3133),
-    (3160, 3162),
-    (3168, 3169),
-    (3200, 3200),
-    (3205, 3212),
-    (3214, 3216),
-    (3218, 3240),
-    (3242, 3251),
-    (3253, 3257),
-    (3261, 3261),
-    (3294, 3294),
-    (3296, 3297),
-    (3313, 3314),
-    (3332, 3340),
-    (3342, 3344),
-    (3346, 3386),
-    (3389, 3389),
-    (3406, 3406),
-    (3412, 3414),
-    (3423, 3425),
-    (3450, 3455),
-    (3461, 3478),
-    (3482, 3505),
-    (3507, 3515),
-    (3517, 3517),
-    (3520, 3526),
-    (3585, 3632),
-    (3634, 3635),
-    (3648, 3654),
-    (3713, 3714),
-    (3716, 3716),
-    (3718, 3722),
-    (3724, 3747),
-    (3749, 3749),
-    (3751, 3760),
-    (3762, 3763),
-    (3773, 3773),
-    (3776, 3780),
-    (3782, 3782),
-    (3804, 3807),
-    (3840, 3840),
-    (3904, 3911),
-    (3913, 3948),
-    (3976, 3980),
-    (4096, 4138),
-    (4159, 4159),
-    (4176, 4181),
-    (4186, 4189),
-    (4193, 4193),
-    (4197, 4198),
-    (4206, 4208),
-    (4213, 4225),
-    (4238, 4238),
-    (4256, 4293),
-    (4295, 4295),
-    (4301, 4301),
-    (4304, 4346),
-    (4348, 4680),
-    (4682, 4685),
-    (4688, 4694),
-    (4696, 4696),
-    (4698, 4701),
-    (4704, 4744),
-    (4746, 4749),
-    (4752, 4784),
-    (4786, 4789),
-    (4792, 4798),
-    (4800, 4800),
-    (4802, 4805),
-    (4808, 4822),
-    (4824, 4880),
-    (4882, 4885),
-    (4888, 4954),
-    (4992, 5007),
-    (5024, 5109),
-    (5112, 5117),
-    (5121, 5740),
-    (5743, 5759),
-    (5761, 5786),
-    (5792, 5866),
-    (5873, 5880),
-    (5888, 5900),
-    (5902, 5905),
-    (5920, 5937),
-    (5952, 5969),
-    (5984, 5996),
-    (5998, 6000),
-    (6016, 6067),
-    (6103, 6103),
-    (6108, 6108),
-    (6176, 6264),
-    (6272, 6276),
-    (6279, 6312),
-    (6314, 6314),
-    (6320, 6389),
-    (6400, 6430),
-    (6480, 6509),
-    (6512, 6516),
-    (6528, 6571),
-    (6576, 6601),
-    (6656, 6678),
-    (6688, 6740),
-    (6823, 6823),
-    (6917, 6963),
-    (6981, 6987),
-    (7043, 7072),
-    (7086, 7087),
-    (7098, 7141),
-    (7168, 7203),
-    (7245, 7247),
-    (7258, 7293),
-    (7296, 7304),
-    (7312, 7354),
-    (7357, 7359),
-    (7401, 7404),
-    (7406, 7411),
-    (7413, 7414),
-    (7418, 7418),
-    (7424, 7615),
-    (7680, 7957),
-    (7960, 7965),
-    (7968, 8005),
-    (8008, 8013),
-    (8016, 8023),
-    (8025, 8025),
-    (8027, 8027),
-    (8029, 8029),
-    (8031, 8061),
-    (8064, 8116),
-    (8118, 8124),
-    (8126, 8126),
-    (8130, 8132),
-    (8134, 8140),
-    (8144, 8147),
-    (8150, 8155),
-    (8160, 8172),
-    (8178, 8180),
-    (8182, 8188),
-    (8305, 8305),
-    (8319, 8319),
-    (8336, 8348),
-    (8450, 8450),
-    (8455, 8455),
-    (8458, 8467),
-    (8469, 8469),
-    (8473, 8477),
-    (8484, 8484),
-    (8486, 8486),
-    (8488, 8488),
-    (8490, 8493),
-    (8495, 8505),
-    (8508, 8511),
-    (8517, 8521),
-    (8526, 8526),
-    (8579, 8580),
-    (11264, 11310),
-    (11312, 11358),
-    (11360, 11492),
-    (11499, 11502),
-    (11506, 11507),
-    (11520, 11557),
-    (11559, 11559),
-    (11565, 11565),
-    (11568, 11623),
-    (11631, 11631),
-    (11648, 11670),
-    (11680, 11686),
-    (11688, 11694),
-    (11696, 11702),
-    (11704, 11710),
-    (11712, 11718),
-    (11720, 11726),
-    (11728, 11734),
-    (11736, 11742),
-    (11823, 11823),
-    (12293, 12294),
-    (12337, 12341),
-    (12347, 12348),
-    (12353, 12438),
-    (12445, 12447),
-    (12449, 12538),
-    (12540, 12543),
-    (12549, 12591),
-    (12593, 12686),
-    (12704, 12735),
-    (12784, 12799),
-    (13312, 19903),
-    (19968, 40956),
-    (40960, 42124),
-    (42192, 42237),
-    (42240, 42508),
-    (42512, 42527),
-    (42538, 42539),
-    (42560, 42606),
-    (42623, 42653),
-    (42656, 42725),
-    (42775, 42783),
-    (42786, 42888),
-    (42891, 42943),
-    (42946, 42954),
-    (42997, 43009),
-    (43011, 43013),
-    (43015, 43018),
-    (43020, 43042),
-    (43072, 43123),
-    (43138, 43187),
-    (43250, 43255),
-    (43259, 43259),
-    (43261, 43262),
-    (43274, 43301),
-    (43312, 43334),
-    (43360, 43388),
-    (43396, 43442),
-    (43471, 43471),
-    (43488, 43492),
-    (43494, 43503),
-    (43514, 43518),
-    (43520, 43560),
-    (43584, 43586),
-    (43588, 43595),
-    (43616, 43638),
-    (43642, 43642),
-    (43646, 43695),
-    (43697, 43697),
-    (43701, 43702),
-    (43705, 43709),
-    (43712, 43712),
-    (43714, 43714),
-    (43739, 43741),
-    (43744, 43754),
-    (43762, 43764),
-    (43777, 43782),
-    (43785, 43790),
-    (43793, 43798),
-    (43808, 43814),
-    (43816, 43822),
-    (43824, 43866),
-    (43868, 43881),
-    (43888, 44002),
-    (44032, 55203),
-    (55216, 55238),
-    (55243, 55291),
-    (63744, 64109),
-    (64112, 64217),
-    (64256, 64262),
-    (64275, 64279),
-    (64285, 64285),
-    (64287, 64296),
-    (64298, 64310),
-    (64312, 64316),
-    (64318, 64318),
-    (64320, 64321),
-    (64323, 64324),
-    (64326, 64433),
-    (64467, 64829),
-    (64848, 64911),
-    (64914, 64967),
-    (65008, 65019),
-    (65136, 65140),
-    (65142, 65276),
-    (65313, 65338),
-    (65345, 65370),
-    (65382, 65470),
-    (65474, 65479),
-    (65482, 65487),
-    (65490, 65495),
-    (65498, 65500),
-    (65536, 65547),
-    (65549, 65574),
-    (65576, 65594),
-    (65596, 65597),
-    (65599, 65613),
-    (65616, 65629),
-    (65664, 65786),
-    (66176, 66204),
-    (66208, 66256),
-    (66304, 66335),
-    (66349, 66368),
-    (66370, 66377),
-    (66384, 66421),
-    (66432, 66461),
-    (66464, 66499),
-    (66504, 66511),
-    (66560, 66717),
-    (66736, 66771),
-    (66776, 66811),
-    (66816, 66855),
-    (66864, 66915),
-    (67072, 67382),
-    (67392, 67413),
-    (67424, 67431),
-    (67584, 67589),
-    (67592, 67592),
-    (67594, 67637),
-    (67639, 67640),
-    (67644, 67644),
-    (67647, 67669),
-    (67680, 67702),
-    (67712, 67742),
-    (67808, 67826),
-    (67828, 67829),
-    (67840, 67861),
-    (67872, 67897),
-    (67968, 68023),
-    (68030, 68031),
-    (68096, 68096),
-    (68112, 68115),
-    (68117, 68119),
-    (68121, 68149),
-    (68192, 68220),
-    (68224, 68252),
-    (68288, 68295),
-    (68297, 68324),
-    (68352, 68405),
-    (68416, 68437),
-    (68448, 68466),
-    (68480, 68497),
-    (68608, 68680),
-    (68736, 68786),
-    (68800, 68850),
-    (68864, 68899),
-    (69248, 69289),
-    (69296, 69297),
-    (69376, 69404),
-    (69415, 69415),
-    (69424, 69445),
-    (69552, 69572),
-    (69600, 69622),
-    (69635, 69687),
-    (69763, 69807),
-    (69840, 69864),
-    (69891, 69926),
-    (69956, 69956),
-    (69959, 69959),
-    (69968, 70002),
-    (70006, 70006),
-    (70019, 70066),
-    (70081, 70084),
-    (70106, 70106),
-    (70108, 70108),
-    (70144, 70161),
-    (70163, 70187),
-    (70272, 70278),
-    (70280, 70280),
-    (70282, 70285),
-    (70287, 70301),
-    (70303, 70312),
-    (70320, 70366),
-    (70405, 70412),
-    (70415, 70416),
-    (70419, 70440),
-    (70442, 70448),
-    (70450, 70451),
-    (70453, 70457),
-    (70461, 70461),
-    (70480, 70480),
-    (70493, 70497),
-    (70656, 70708),
-    (70727, 70730),
-    (70751, 70753),
-    (70784, 70831),
-    (70852, 70853),
-    (70855, 70855),
-    (71040, 71086),
-    (71128, 71131),
-    (71168, 71215),
-    (71236, 71236),
-    (71296, 71338),
-    (71352, 71352),
-    (71424, 71450),
-    (71680, 71723),
-    (71840, 71903),
-    (71935, 71942),
-    (71945, 71945),
-    (71948, 71955),
-    (71957, 71958),
-    (71960, 71983),
-    (71999, 71999),
-    (72001, 72001),
-    (72096, 72103),
-    (72106, 72144),
-    (72161, 72161),
-    (72163, 72163),
-    (72192, 72192),
-    (72203, 72242),
-    (72250, 72250),
-    (72272, 72272),
-    (72284, 72329),
-    (72349, 72349),
-    (72384, 72440),
-    (72704, 72712),
-    (72714, 72750),
-    (72768, 72768),
-    (72818, 72847),
-    (72960, 72966),
-    (72968, 72969),
-    (72971, 73008),
-    (73030, 73030),
-    (73056, 73061),
-    (73063, 73064),
-    (73066, 73097),
-    (73112, 73112),
-    (73440, 73458),
-    (73648, 73648),
-    (73728, 74649),
-    (74880, 75075),
-    (77824, 78894),
-    (82944, 83526),
-    (92160, 92728),
-    (92736, 92766),
-    (92880, 92909),
-    (92928, 92975),
-    (92992, 92995),
-    (93027, 93047),
-    (93053, 93071),
-    (93760, 93823),
-    (93952, 94026),
-    (94032, 94032),
-    (94099, 94111),
-    (94176, 94177),
-    (94179, 94179),
-    (94208, 100343),
-    (100352, 101589),
-    (101632, 101640),
-    (110592, 110878),
-    (110928, 110930),
-    (110948, 110951),
-    (110960, 111355),
-    (113664, 113770),
-    (113776, 113788),
-    (113792, 113800),
-    (113808, 113817),
-    (119808, 119892),
-    (119894, 119964),
-    (119966, 119967),
-    (119970, 119970),
-    (119973, 119974),
-    (119977, 119980),
-    (119982, 119993),
-    (119995, 119995),
-    (119997, 120003),
-    (120005, 120069),
-    (120071, 120074),
-    (120077, 120084),
-    (120086, 120092),
-    (120094, 120121),
-    (120123, 120126),
-    (120128, 120132),
-    (120134, 120134),
-    (120138, 120144),
-    (120146, 120485),
-    (120488, 120512),
-    (120514, 120538),
-    (120540, 120570),
-    (120572, 120596),
-    (120598, 120628),
-    (120630, 120654),
-    (120656, 120686),
-    (120688, 120712),
-    (120714, 120744),
-    (120746, 120770),
-    (120772, 120779),
-    (123136, 123180),
-    (123191, 123197),
-    (123214, 123214),
-    (123584, 123627),
-    (124928, 125124),
-    (125184, 125251),
-    (125259, 125259),
-    (126464, 126467),
-    (126469, 126495),
-    (126497, 126498),
-    (126500, 126500),
-    (126503, 126503),
-    (126505, 126514),
-    (126516, 126519),
-    (126521, 126521),
-    (126523, 126523),
-    (126530, 126530),
-    (126535, 126535),
-    (126537, 126537),
-    (126539, 126539),
-    (126541, 126543),
-    (126545, 126546),
-    (126548, 126548),
-    (126551, 126551),
-    (126553, 126553),
-    (126555, 126555),
-    (126557, 126557),
-    (126559, 126559),
-    (126561, 126562),
-    (126564, 126564),
-    (126567, 126570),
-    (126572, 126578),
-    (126580, 126583),
-    (126585, 126588),
-    (126590, 126590),
-    (126592, 126601),
-    (126603, 126619),
-    (126625, 126627),
-    (126629, 126633),
-    (126635, 126651),
-    (131072, 173789),
-    (173824, 177972),
-    (177984, 178205),
-    (178208, 183969),
-    (183984, 191456),
-    (194560, 195101),
-    (196608, 201546),
-];
-
-pub const LETTER_NUMBER: &'static [(u32, u32)] = &[
-    (5870, 5872),
-    (8544, 8578),
-    (8581, 8584),
-    (12295, 12295),
-    (12321, 12329),
-    (12344, 12346),
-    (42726, 42735),
-    (65856, 65908),
-    (66369, 66369),
-    (66378, 66378),
-    (66513, 66517),
-    (74752, 74862),
-];
-
-pub const LINE_SEPARATOR: &'static [(u32, u32)] = &[(8232, 8232)];
-
-pub const LOWERCASE_LETTER: &'static [(u32, u32)] = &[
-    (97, 122),
-    (181, 181),
-    (223, 246),
-    (248, 255),
-    (257, 257),
-    (259, 259),
-    (261, 261),
-    (263, 263),
-    (265, 265),
-    (267, 267),
-    (269, 269),
-    (271, 271),
-    (273, 273),
-    (275, 275),
-    (277, 277),
-    (279, 279),
-    (281, 281),
-    (283, 283),
-    (285, 285),
-    (287, 287),
-    (289, 289),
-    (291, 291),
-    (293, 293),
-    (295, 295),
-    (297, 297),
-    (299, 299),
-    (301, 301),
-    (303, 303),
-    (305, 305),
-    (307, 307),
-    (309, 309),
-    (311, 312),
-    (314, 314),
-    (316, 316),
-    (318, 318),
-    (320, 320),
-    (322, 322),
-    (324, 324),
-    (326, 326),
-    (328, 329),
-    (331, 331),
-    (333, 333),
-    (335, 335),
-    (337, 337),
-    (339, 339),
-    (341, 341),
-    (343, 343),
-    (345, 345),
-    (347, 347),
-    (349, 349),
-    (351, 351),
-    (353, 353),
-    (355, 355),
-    (357, 357),
-    (359, 359),
-    (361, 361),
-    (363, 363),
-    (365, 365),
-    (367, 367),
-    (369, 369),
-    (371, 371),
-    (373, 373),
-    (375, 375),
-    (378, 378),
-    (380, 380),
-    (382, 384),
-    (387, 387),
-    (389, 389),
-    (392, 392),
-    (396, 397),
-    (402, 402),
-    (405, 405),
-    (409, 411),
-    (414, 414),
-    (417, 417),
-    (419, 419),
-    (421, 421),
-    (424, 424),
-    (426, 427),
-    (429, 429),
-    (432, 432),
-    (436, 436),
-    (438, 438),
-    (441, 442),
-    (445, 447),
-    (454, 454),
-    (457, 457),
-    (460, 460),
-    (462, 462),
-    (464, 464),
-    (466, 466),
-    (468, 468),
-    (470, 470),
-    (472, 472),
-    (474, 474),
-    (476, 477),
-    (479, 479),
-    (481, 481),
-    (483, 483),
-    (485, 485),
-    (487, 487),
-    (489, 489),
-    (491, 491),
-    (493, 493),
-    (495, 496),
-    (499, 499),
-    (501, 501),
-    (505, 505),
-    (507, 507),
-    (509, 509),
-    (511, 511),
-    (513, 513),
-    (515, 515),
-    (517, 517),
-    (519, 519),
-    (521, 521),
-    (523, 523),
-    (525, 525),
-    (527, 527),
-    (529, 529),
-    (531, 531),
-    (533, 533),
-    (535, 535),
-    (537, 537),
-    (539, 539),
-    (541, 541),
-    (543, 543),
-    (545, 545),
-    (547, 547),
-    (549, 549),
-    (551, 551),
-    (553, 553),
-    (555, 555),
-    (557, 557),
-    (559, 559),
-    (561, 561),
-    (563, 569),
-    (572, 572),
-    (575, 576),
-    (578, 578),
-    (583, 583),
-    (585, 585),
-    (587, 587),
-    (589, 589),
-    (591, 659),
-    (661, 687),
-    (881, 881),
-    (883, 883),
-    (887, 887),
-    (891, 893),
-    (912, 912),
-    (940, 974),
-    (976, 977),
-    (981, 983),
-    (985, 985),
-    (987, 987),
-    (989, 989),
-    (991, 991),
-    (993, 993),
-    (995, 995),
-    (997, 997),
-    (999, 999),
-    (1001, 1001),
-    (1003, 1003),
-    (1005, 1005),
-    (1007, 1011),
-    (1013, 1013),
-    (1016, 1016),
-    (1019, 1020),
-    (1072, 1119),
-    (1121, 1121),
-    (1123, 1123),
-    (1125, 1125),
-    (1127, 1127),
-    (1129, 1129),
-    (1131, 1131),
-    (1133, 1133),
-    (1135, 1135),
-    (1137, 1137),
-    (1139, 1139),
-    (1141, 1141),
-    (1143, 1143),
-    (1145, 1145),
-    (1147, 1147),
-    (1149, 1149),
-    (1151, 1151),
-    (1153, 1153),
-    (1163, 1163),
-    (1165, 1165),
-    (1167, 1167),
-    (1169, 1169),
-    (1171, 1171),
-    (1173, 1173),
-    (1175, 1175),
-    (1177, 1177),
-    (1179, 1179),
-    (1181, 1181),
-    (1183, 1183),
-    (1185, 1185),
-    (1187, 1187),
-    (1189, 1189),
-    (1191, 1191),
-    (1193, 1193),
-    (1195, 1195),
-    (1197, 1197),
-    (1199, 1199),
-    (1201, 1201),
-    (1203, 1203),
-    (1205, 1205),
-    (1207, 1207),
-    (1209, 1209),
-    (1211, 1211),
-    (1213, 1213),
-    (1215, 1215),
-    (1218, 1218),
-    (1220, 1220),
-    (1222, 1222),
-    (1224, 1224),
-    (1226, 1226),
-    (1228, 1228),
-    (1230, 1231),
-    (1233, 1233),
-    (1235, 1235),
-    (1237, 1237),
-    (1239, 1239),
-    (1241, 1241),
-    (1243, 1243),
-    (1245, 1245),
-    (1247, 1247),
-    (1249, 1249),
-    (1251, 1251),
-    (1253, 1253),
-    (1255, 1255),
-    (1257, 1257),
-    (1259, 1259),
-    (1261, 1261),
-    (1263, 1263),
-    (1265, 1265),
-    (1267, 1267),
-    (1269, 1269),
-    (1271, 1271),
-    (1273, 1273),
-    (1275, 1275),
-    (1277, 1277),
-    (1279, 1279),
-    (1281, 1281),
-    (1283, 1283),
-    (1285, 1285),
-    (1287, 1287),
-    (1289, 1289),
-    (1291, 1291),
-    (1293, 1293),
-    (1295, 1295),
-    (1297, 1297),
-    (1299, 1299),
-    (1301, 1301),
-    (1303, 1303),
-    (1305, 1305),
-    (1307, 1307),
-    (1309, 1309),
-    (1311, 1311),
-    (1313, 1313),
-    (1315, 1315),
-    (1317, 1317),
-    (1319, 1319),
-    (1321, 1321),
-    (1323, 1323),
-    (1325, 1325),
-    (1327, 1327),
-    (1376, 1416),
-    (4304, 4346),
-    (4349, 4351),
-    (5112, 5117),
-    (7296, 7304),
-    (7424, 7467),
-    (7531, 7543),
-    (7545, 7578),
-    (7681, 7681),
-    (7683, 7683),
-    (7685, 7685),
-    (7687, 7687),
-    (7689, 7689),
-    (7691, 7691),
-    (7693, 7693),
-    (7695, 7695),
-    (7697, 7697),
-    (7699, 7699),
-    (7701, 7701),
-    (7703, 7703),
-    (7705, 7705),
-    (7707, 7707),
-    (7709, 7709),
-    (7711, 7711),
-    (7713, 7713),
-    (7715, 7715),
-    (7717, 7717),
-    (7719, 7719),
-    (7721, 7721),
-    (7723, 7723),
-    (7725, 7725),
-    (7727, 7727),
-    (7729, 7729),
-    (7731, 7731),
-    (7733, 7733),
-    (7735, 7735),
-    (7737, 7737),
-    (7739, 7739),
-    (7741, 7741),
-    (7743, 7743),
-    (7745, 7745),
-    (7747, 7747),
-    (7749, 7749),
-    (7751, 7751),
-    (7753, 7753),
-    (7755, 7755),
-    (7757, 7757),
-    (7759, 7759),
-    (7761, 7761),
-    (7763, 7763),
-    (7765, 7765),
-    (7767, 7767),
-    (7769, 7769),
-    (7771, 7771),
-    (7773, 7773),
-    (7775, 7775),
-    (7777, 7777),
-    (7779, 7779),
-    (7781, 7781),
-    (7783, 7783),
-    (7785, 7785),
-    (7787, 7787),
-    (7789, 7789),
-    (7791, 7791),
-    (7793, 7793),
-    (7795, 7795),
-    (7797, 7797),
-    (7799, 7799),
-    (7801, 7801),
-    (7803, 7803),
-    (7805, 7805),
-    (7807, 7807),
-    (7809, 7809),
-    (7811, 7811),
-    (7813, 7813),
-    (7815, 7815),
-    (7817, 7817),
-    (7819, 7819),
-    (7821, 7821),
-    (7823, 7823),
-    (7825, 7825),
-    (7827, 7827),
-    (7829, 7837),
-    (7839, 7839),
-    (7841, 7841),
-    (7843, 7843),
-    (7845, 7845),
-    (7847, 7847),
-    (7849, 7849),
-    (7851, 7851),
-    (7853, 7853),
-    (7855, 7855),
-    (7857, 7857),
-    (7859, 7859),
-    (7861, 7861),
-    (7863, 7863),
-    (7865, 7865),
-    (7867, 7867),
-    (7869, 7869),
-    (7871, 7871),
-    (7873, 7873),
-    (7875, 7875),
-    (7877, 7877),
-    (7879, 7879),
-    (7881, 7881),
-    (7883, 7883),
-    (7885, 7885),
-    (7887, 7887),
-    (7889, 7889),
-    (7891, 7891),
-    (7893, 7893),
-    (7895, 7895),
-    (7897, 7897),
-    (7899, 7899),
-    (7901, 7901),
-    (7903, 7903),
-    (7905, 7905),
-    (7907, 7907),
-    (7909, 7909),
-    (7911, 7911),
-    (7913, 7913),
-    (7915, 7915),
-    (7917, 7917),
-    (7919, 7919),
-    (7921, 7921),
-    (7923, 7923),
-    (7925, 7925),
-    (7927, 7927),
-    (7929, 7929),
-    (7931, 7931),
-    (7933, 7933),
-    (7935, 7943),
-    (7952, 7957),
-    (7968, 7975),
-    (7984, 7991),
-    (8000, 8005),
-    (8016, 8023),
-    (8032, 8039),
-    (8048, 8061),
-    (8064, 8071),
-    (8080, 8087),
-    (8096, 8103),
-    (8112, 8116),
-    (8118, 8119),
-    (8126, 8126),
-    (8130, 8132),
-    (8134, 8135),
-    (8144, 8147),
-    (8150, 8151),
-    (8160, 8167),
-    (8178, 8180),
-    (8182, 8183),
-    (8458, 8458),
-    (8462, 8463),
-    (8467, 8467),
-    (8495, 8495),
-    (8500, 8500),
-    (8505, 8505),
-    (8508, 8509),
-    (8518, 8521),
-    (8526, 8526),
-    (8580, 8580),
-    (11312, 11358),
-    (11361, 11361),
-    (11365, 11366),
-    (11368, 11368),
-    (11370, 11370),
-    (11372, 11372),
-    (11377, 11377),
-    (11379, 11380),
-    (11382, 11387),
-    (11393, 11393),
-    (11395, 11395),
-    (11397, 11397),
-    (11399, 11399),
-    (11401, 11401),
-    (11403, 11403),
-    (11405, 11405),
-    (11407, 11407),
-    (11409, 11409),
-    (11411, 11411),
-    (11413, 11413),
-    (11415, 11415),
-    (11417, 11417),
-    (11419, 11419),
-    (11421, 11421),
-    (11423, 11423),
-    (11425, 11425),
-    (11427, 11427),
-    (11429, 11429),
-    (11431, 11431),
-    (11433, 11433),
-    (11435, 11435),
-    (11437, 11437),
-    (11439, 11439),
-    (11441, 11441),
-    (11443, 11443),
-    (11445, 11445),
-    (11447, 11447),
-    (11449, 11449),
-    (11451, 11451),
-    (11453, 11453),
-    (11455, 11455),
-    (11457, 11457),
-    (11459, 11459),
-    (11461, 11461),
-    (11463, 11463),
-    (11465, 11465),
-    (11467, 11467),
-    (11469, 11469),
-    (11471, 11471),
-    (11473, 11473),
-    (11475, 11475),
-    (11477, 11477),
-    (11479, 11479),
-    (11481, 11481),
-    (11483, 11483),
-    (11485, 11485),
-    (11487, 11487),
-    (11489, 11489),
-    (11491, 11492),
-    (11500, 11500),
-    (11502, 11502),
-    (11507, 11507),
-    (11520, 11557),
-    (11559, 11559),
-    (11565, 11565),
-    (42561, 42561),
-    (42563, 42563),
-    (42565, 42565),
-    (42567, 42567),
-    (42569, 42569),
-    (42571, 42571),
-    (42573, 42573),
-    (42575, 42575),
-    (42577, 42577),
-    (42579, 42579),
-    (42581, 42581),
-    (42583, 42583),
-    (42585, 42585),
-    (42587, 42587),
-    (42589, 42589),
-    (42591, 42591),
-    (42593, 42593),
-    (42595, 42595),
-    (42597, 42597),
-    (42599, 42599),
-    (42601, 42601),
-    (42603, 42603),
-    (42605, 42605),
-    (42625, 42625),
-    (42627, 42627),
-    (42629, 42629),
-    (42631, 42631),
-    (42633, 42633),
-    (42635, 42635),
-    (42637, 42637),
-    (42639, 42639),
-    (42641, 42641),
-    (42643, 42643),
-    (42645, 42645),
-    (42647, 42647),
-    (42649, 42649),
-    (42651, 42651),
-    (42787, 42787),
-    (42789, 42789),
-    (42791, 42791),
-    (42793, 42793),
-    (42795, 42795),
-    (42797, 42797),
-    (42799, 42801),
-    (42803, 42803),
-    (42805, 42805),
-    (42807, 42807),
-    (42809, 42809),
-    (42811, 42811),
-    (42813, 42813),
-    (42815, 42815),
-    (42817, 42817),
-    (42819, 42819),
-    (42821, 42821),
-    (42823, 42823),
-    (42825, 42825),
-    (42827, 42827),
-    (42829, 42829),
-    (42831, 42831),
-    (42833, 42833),
-    (42835, 42835),
-    (42837, 42837),
-    (42839, 42839),
-    (42841, 42841),
-    (42843, 42843),
-    (42845, 42845),
-    (42847, 42847),
-    (42849, 42849),
-    (42851, 42851),
-    (42853, 42853),
-    (42855, 42855),
-    (42857, 42857),
-    (42859, 42859),
-    (42861, 42861),
-    (42863, 42863),
-    (42865, 42872),
-    (42874, 42874),
-    (42876, 42876),
-    (42879, 42879),
-    (42881, 42881),
-    (42883, 42883),
-    (42885, 42885),
-    (42887, 42887),
-    (42892, 42892),
-    (42894, 42894),
-    (42897, 42897),
-    (42899, 42901),
-    (42903, 42903),
-    (42905, 42905),
-    (42907, 42907),
-    (42909, 42909),
-    (42911, 42911),
-    (42913, 42913),
-    (42915, 42915),
-    (42917, 42917),
-    (42919, 42919),
-    (42921, 42921),
-    (42927, 42927),
-    (42933, 42933),
-    (42935, 42935),
-    (42937, 42937),
-    (42939, 42939),
-    (42941, 42941),
-    (42943, 42943),
-    (42947, 42947),
-    (42952, 42952),
-    (42954, 42954),
-    (42998, 42998),
-    (43002, 43002),
-    (43824, 43866),
-    (43872, 43880),
-    (43888, 43967),
-    (64256, 64262),
-    (64275, 64279),
-    (65345, 65370),
-    (66600, 66639),
-    (66776, 66811),
-    (68800, 68850),
-    (71872, 71903),
-    (93792, 93823),
-    (119834, 119859),
-    (119886, 119892),
-    (119894, 119911),
-    (119938, 119963),
-    (119990, 119993),
-    (119995, 119995),
-    (119997, 120003),
-    (120005, 120015),
-    (120042, 120067),
-    (120094, 120119),
-    (120146, 120171),
-    (120198, 120223),
-    (120250, 120275),
-    (120302, 120327),
-    (120354, 120379),
-    (120406, 120431),
-    (120458, 120485),
-    (120514, 120538),
-    (120540, 120545),
-    (120572, 120596),
-    (120598, 120603),
-    (120630, 120654),
-    (120656, 120661),
-    (120688, 120712),
-    (120714, 120719),
-    (120746, 120770),
-    (120772, 120777),
-    (120779, 120779),
-    (125218, 125251),
-];
-
-pub const MARK: &'static [(u32, u32)] = &[
-    (768, 879),
-    (1155, 1161),
-    (1425, 1469),
-    (1471, 1471),
-    (1473, 1474),
-    (1476, 1477),
-    (1479, 1479),
-    (1552, 1562),
-    (1611, 1631),
-    (1648, 1648),
-    (1750, 1756),
-    (1759, 1764),
-    (1767, 1768),
-    (1770, 1773),
-    (1809, 1809),
-    (1840, 1866),
-    (1958, 1968),
-    (2027, 2035),
-    (2045, 2045),
-    (2070, 2073),
-    (2075, 2083),
-    (2085, 2087),
-    (2089, 2093),
-    (2137, 2139),
-    (2259, 2273),
-    (2275, 2307),
-    (2362, 2364),
-    (2366, 2383),
-    (2385, 2391),
-    (2402, 2403),
-    (2433, 2435),
-    (2492, 2492),
-    (2494, 2500),
-    (2503, 2504),
-    (2507, 2509),
-    (2519, 2519),
-    (2530, 2531),
-    (2558, 2558),
-    (2561, 2563),
-    (2620, 2620),
-    (2622, 2626),
-    (2631, 2632),
-    (2635, 2637),
-    (2641, 2641),
-    (2672, 2673),
-    (2677, 2677),
-    (2689, 2691),
-    (2748, 2748),
-    (2750, 2757),
-    (2759, 2761),
-    (2763, 2765),
-    (2786, 2787),
-    (2810, 2815),
-    (2817, 2819),
-    (2876, 2876),
-    (2878, 2884),
-    (2887, 2888),
-    (2891, 2893),
-    (2901, 2903),
-    (2914, 2915),
-    (2946, 2946),
-    (3006, 3010),
-    (3014, 3016),
-    (3018, 3021),
-    (3031, 3031),
-    (3072, 3076),
-    (3134, 3140),
-    (3142, 3144),
-    (3146, 3149),
-    (3157, 3158),
-    (3170, 3171),
-    (3201, 3203),
-    (3260, 3260),
-    (3262, 3268),
-    (3270, 3272),
-    (3274, 3277),
-    (3285, 3286),
-    (3298, 3299),
-    (3328, 3331),
-    (3387, 3388),
-    (3390, 3396),
-    (3398, 3400),
-    (3402, 3405),
-    (3415, 3415),
-    (3426, 3427),
-    (3457, 3459),
-    (3530, 3530),
-    (3535, 3540),
-    (3542, 3542),
-    (3544, 3551),
-    (3570, 3571),
-    (3633, 3633),
-    (3636, 3642),
-    (3655, 3662),
-    (3761, 3761),
-    (3764, 3772),
-    (3784, 3789),
-    (3864, 3865),
-    (3893, 3893),
-    (3895, 3895),
-    (3897, 3897),
-    (3902, 3903),
-    (3953, 3972),
-    (3974, 3975),
-    (3981, 3991),
-    (3993, 4028),
-    (4038, 4038),
-    (4139, 4158),
-    (4182, 4185),
-    (4190, 4192),
-    (4194, 4196),
-    (4199, 4205),
-    (4209, 4212),
-    (4226, 4237),
-    (4239, 4239),
-    (4250, 4253),
-    (4957, 4959),
-    (5906, 5908),
-    (5938, 5940),
-    (5970, 5971),
-    (6002, 6003),
-    (6068, 6099),
-    (6109, 6109),
-    (6155, 6157),
-    (6277, 6278),
-    (6313, 6313),
-    (6432, 6443),
-    (6448, 6459),
-    (6679, 6683),
-    (6741, 6750),
-    (6752, 6780),
-    (6783, 6783),
-    (6832, 6848),
-    (6912, 6916),
-    (6964, 6980),
-    (7019, 7027),
-    (7040, 7042),
-    (7073, 7085),
-    (7142, 7155),
-    (7204, 7223),
-    (7376, 7378),
-    (7380, 7400),
-    (7405, 7405),
-    (7412, 7412),
-    (7415, 7417),
-    (7616, 7673),
-    (7675, 7679),
-    (8400, 8432),
-    (11503, 11505),
-    (11647, 11647),
-    (11744, 11775),
-    (12330, 12335),
-    (12441, 12442),
-    (42607, 42610),
-    (42612, 42621),
-    (42654, 42655),
-    (42736, 42737),
-    (43010, 43010),
-    (43014, 43014),
-    (43019, 43019),
-    (43043, 43047),
-    (43052, 43052),
-    (43136, 43137),
-    (43188, 43205),
-    (43232, 43249),
-    (43263, 43263),
-    (43302, 43309),
-    (43335, 43347),
-    (43392, 43395),
-    (43443, 43456),
-    (43493, 43493),
-    (43561, 43574),
-    (43587, 43587),
-    (43596, 43597),
-    (43643, 43645),
-    (43696, 43696),
-    (43698, 43700),
-    (43703, 43704),
-    (43710, 43711),
-    (43713, 43713),
-    (43755, 43759),
-    (43765, 43766),
-    (44003, 44010),
-    (44012, 44013),
-    (64286, 64286),
-    (65024, 65039),
-    (65056, 65071),
-    (66045, 66045),
-    (66272, 66272),
-    (66422, 66426),
-    (68097, 68099),
-    (68101, 68102),
-    (68108, 68111),
-    (68152, 68154),
-    (68159, 68159),
-    (68325, 68326),
-    (68900, 68903),
-    (69291, 69292),
-    (69446, 69456),
-    (69632, 69634),
-    (69688, 69702),
-    (69759, 69762),
-    (69808, 69818),
-    (69888, 69890),
-    (69927, 69940),
-    (69957, 69958),
-    (70003, 70003),
-    (70016, 70018),
-    (70067, 70080),
-    (70089, 70092),
-    (70094, 70095),
-    (70188, 70199),
-    (70206, 70206),
-    (70367, 70378),
-    (70400, 70403),
-    (70459, 70460),
-    (70462, 70468),
-    (70471, 70472),
-    (70475, 70477),
-    (70487, 70487),
-    (70498, 70499),
-    (70502, 70508),
-    (70512, 70516),
-    (70709, 70726),
-    (70750, 70750),
-    (70832, 70851),
-    (71087, 71093),
-    (71096, 71104),
-    (71132, 71133),
-    (71216, 71232),
-    (71339, 71351),
-    (71453, 71467),
-    (71724, 71738),
-    (71984, 71989),
-    (71991, 71992),
-    (71995, 71998),
-    (72000, 72000),
-    (72002, 72003),
-    (72145, 72151),
-    (72154, 72160),
-    (72164, 72164),
-    (72193, 72202),
-    (72243, 72249),
-    (72251, 72254),
-    (72263, 72263),
-    (72273, 72283),
-    (72330, 72345),
-    (72751, 72758),
-    (72760, 72767),
-    (72850, 72871),
-    (72873, 72886),
-    (73009, 73014),
-    (73018, 73018),
-    (73020, 73021),
-    (73023, 73029),
-    (73031, 73031),
-    (73098, 73102),
-    (73104, 73105),
-    (73107, 73111),
-    (73459, 73462),
-    (92912, 92916),
-    (92976, 92982),
-    (94031, 94031),
-    (94033, 94087),
-    (94095, 94098),
-    (94180, 94180),
-    (94192, 94193),
-    (113821, 113822),
-    (119141, 119145),
-    (119149, 119154),
-    (119163, 119170),
-    (119173, 119179),
-    (119210, 119213),
-    (119362, 119364),
-    (121344, 121398),
-    (121403, 121452),
-    (121461, 121461),
-    (121476, 121476),
-    (121499, 121503),
-    (121505, 121519),
-    (122880, 122886),
-    (122888, 122904),
-    (122907, 122913),
-    (122915, 122916),
-    (122918, 122922),
-    (123184, 123190),
-    (123628, 123631),
-    (125136, 125142),
-    (125252, 125258),
-    (917760, 917999),
-];
-
-pub const MATH_SYMBOL: &'static [(u32, u32)] = &[
-    (43, 43),
-    (60, 62),
-    (124, 124),
-    (126, 126),
-    (172, 172),
-    (177, 177),
-    (215, 215),
-    (247, 247),
-    (1014, 1014),
-    (1542, 1544),
-    (8260, 8260),
-    (8274, 8274),
-    (8314, 8316),
-    (8330, 8332),
-    (8472, 8472),
-    (8512, 8516),
-    (8523, 8523),
-    (8592, 8596),
-    (8602, 8603),
-    (8608, 8608),
-    (8611, 8611),
-    (8614, 8614),
-    (8622, 8622),
-    (8654, 8655),
-    (8658, 8658),
-    (8660, 8660),
-    (8692, 8959),
-    (8992, 8993),
-    (9084, 9084),
-    (9115, 9139),
-    (9180, 9185),
-    (9655, 9655),
-    (9665, 9665),
-    (9720, 9727),
-    (9839, 9839),
-    (10176, 10180),
-    (10183, 10213),
-    (10224, 10239),
-    (10496, 10626),
-    (10649, 10711),
-    (10716, 10747),
-    (10750, 11007),
-    (11056, 11076),
-    (11079, 11084),
-    (64297, 64297),
-    (65122, 65122),
-    (65124, 65126),
-    (65291, 65291),
-    (65308, 65310),
-    (65372, 65372),
-    (65374, 65374),
-    (65506, 65506),
-    (65513, 65516),
-    (120513, 120513),
-    (120539, 120539),
-    (120571, 120571),
-    (120597, 120597),
-    (120629, 120629),
-    (120655, 120655),
-    (120687, 120687),
-    (120713, 120713),
-    (120745, 120745),
-    (120771, 120771),
-    (126704, 126705),
-];
-
-pub const MODIFIER_LETTER: &'static [(u32, u32)] = &[
-    (688, 705),
-    (710, 721),
-    (736, 740),
-    (748, 748),
-    (750, 750),
-    (884, 884),
-    (890, 890),
-    (1369, 1369),
-    (1600, 1600),
-    (1765, 1766),
-    (2036, 2037),
-    (2042, 2042),
-    (2074, 2074),
-    (2084, 2084),
-    (2088, 2088),
-    (2417, 2417),
-    (3654, 3654),
-    (3782, 3782),
-    (4348, 4348),
-    (6103, 6103),
-    (6211, 6211),
-    (6823, 6823),
-    (7288, 7293),
-    (7468, 7530),
-    (7544, 7544),
-    (7579, 7615),
-    (8305, 8305),
-    (8319, 8319),
-    (8336, 8348),
-    (11388, 11389),
-    (11631, 11631),
-    (11823, 11823),
-    (12293, 12293),
-    (12337, 12341),
-    (12347, 12347),
-    (12445, 12446),
-    (12540, 12542),
-    (40981, 40981),
-    (42232, 42237),
-    (42508, 42508),
-    (42623, 42623),
-    (42652, 42653),
-    (42775, 42783),
-    (42864, 42864),
-    (42888, 42888),
-    (43000, 43001),
-    (43471, 43471),
-    (43494, 43494),
-    (43632, 43632),
-    (43741, 43741),
-    (43763, 43764),
-    (43868, 43871),
-    (43881, 43881),
-    (65392, 65392),
-    (65438, 65439),
-    (92992, 92995),
-    (94099, 94111),
-    (94176, 94177),
-    (94179, 94179),
-    (123191, 123197),
-    (125259, 125259),
-];
-
-pub const MODIFIER_SYMBOL: &'static [(u32, u32)] = &[
-    (94, 94),
-    (96, 96),
-    (168, 168),
-    (175, 175),
-    (180, 180),
-    (184, 184),
-    (706, 709),
-    (722, 735),
-    (741, 747),
-    (749, 749),
-    (751, 767),
-    (885, 885),
-    (900, 901),
-    (8125, 8125),
-    (8127, 8129),
-    (8141, 8143),
-    (8157, 8159),
-    (8173, 8175),
-    (8189, 8190),
-    (12443, 12444),
-    (42752, 42774),
-    (42784, 42785),
-    (42889, 42890),
-    (43867, 43867),
-    (43882, 43883),
-    (64434, 64449),
-    (65342, 65342),
-    (65344, 65344),
-    (65507, 65507),
-    (127995, 127999),
-];
-
-pub const NONSPACING_MARK: &'static [(u32, u32)] = &[
-    (768, 879),
-    (1155, 1159),
-    (1425, 1469),
-    (1471, 1471),
-    (1473, 1474),
-    (1476, 1477),
-    (1479, 1479),
-    (1552, 1562),
-    (1611, 1631),
-    (1648, 1648),
-    (1750, 1756),
-    (1759, 1764),
-    (1767, 1768),
-    (1770, 1773),
-    (1809, 1809),
-    (1840, 1866),
-    (1958, 1968),
-    (2027, 2035),
-    (2045, 2045),
-    (2070, 2073),
-    (2075, 2083),
-    (2085, 2087),
-    (2089, 2093),
-    (2137, 2139),
-    (2259, 2273),
-    (2275, 2306),
-    (2362, 2362),
-    (2364, 2364),
-    (2369, 2376),
-    (2381, 2381),
-    (2385, 2391),
-    (2402, 2403),
-    (2433, 2433),
-    (2492, 2492),
-    (2497, 2500),
-    (2509, 2509),
-    (2530, 2531),
-    (2558, 2558),
-    (2561, 2562),
-    (2620, 2620),
-    (2625, 2626),
-    (2631, 2632),
-    (2635, 2637),
-    (2641, 2641),
-    (2672, 2673),
-    (2677, 2677),
-    (2689, 2690),
-    (2748, 2748),
-    (2753, 2757),
-    (2759, 2760),
-    (2765, 2765),
-    (2786, 2787),
-    (2810, 2815),
-    (2817, 2817),
-    (2876, 2876),
-    (2879, 2879),
-    (2881, 2884),
-    (2893, 2893),
-    (2901, 2902),
-    (2914, 2915),
-    (2946, 2946),
-    (3008, 3008),
-    (3021, 3021),
-    (3072, 3072),
-    (3076, 3076),
-    (3134, 3136),
-    (3142, 3144),
-    (3146, 3149),
-    (3157, 3158),
-    (3170, 3171),
-    (3201, 3201),
-    (3260, 3260),
-    (3263, 3263),
-    (3270, 3270),
-    (3276, 3277),
-    (3298, 3299),
-    (3328, 3329),
-    (3387, 3388),
-    (3393, 3396),
-    (3405, 3405),
-    (3426, 3427),
-    (3457, 3457),
-    (3530, 3530),
-    (3538, 3540),
-    (3542, 3542),
-    (3633, 3633),
-    (3636, 3642),
-    (3655, 3662),
-    (3761, 3761),
-    (3764, 3772),
-    (3784, 3789),
-    (3864, 3865),
-    (3893, 3893),
-    (3895, 3895),
-    (3897, 3897),
-    (3953, 3966),
-    (3968, 3972),
-    (3974, 3975),
-    (3981, 3991),
-    (3993, 4028),
-    (4038, 4038),
-    (4141, 4144),
-    (4146, 4151),
-    (4153, 4154),
-    (4157, 4158),
-    (4184, 4185),
-    (4190, 4192),
-    (4209, 4212),
-    (4226, 4226),
-    (4229, 4230),
-    (4237, 4237),
-    (4253, 4253),
-    (4957, 4959),
-    (5906, 5908),
-    (5938, 5940),
-    (5970, 5971),
-    (6002, 6003),
-    (6068, 6069),
-    (6071, 6077),
-    (6086, 6086),
-    (6089, 6099),
-    (6109, 6109),
-    (6155, 6157),
-    (6277, 6278),
-    (6313, 6313),
-    (6432, 6434),
-    (6439, 6440),
-    (6450, 6450),
-    (6457, 6459),
-    (6679, 6680),
-    (6683, 6683),
-    (6742, 6742),
-    (6744, 6750),
-    (6752, 6752),
-    (6754, 6754),
-    (6757, 6764),
-    (6771, 6780),
-    (6783, 6783),
-    (6832, 6845),
-    (6847, 6848),
-    (6912, 6915),
-    (6964, 6964),
-    (6966, 6970),
-    (6972, 6972),
-    (6978, 6978),
-    (7019, 7027),
-    (7040, 7041),
-    (7074, 7077),
-    (7080, 7081),
-    (7083, 7085),
-    (7142, 7142),
-    (7144, 7145),
-    (7149, 7149),
-    (7151, 7153),
-    (7212, 7219),
-    (7222, 7223),
-    (7376, 7378),
-    (7380, 7392),
-    (7394, 7400),
-    (7405, 7405),
-    (7412, 7412),
-    (7416, 7417),
-    (7616, 7673),
-    (7675, 7679),
-    (8400, 8412),
-    (8417, 8417),
-    (8421, 8432),
-    (11503, 11505),
-    (11647, 11647),
-    (11744, 11775),
-    (12330, 12333),
-    (12441, 12442),
-    (42607, 42607),
-    (42612, 42621),
-    (42654, 42655),
-    (42736, 42737),
-    (43010, 43010),
-    (43014, 43014),
-    (43019, 43019),
-    (43045, 43046),
-    (43052, 43052),
-    (43204, 43205),
-    (43232, 43249),
-    (43263, 43263),
-    (43302, 43309),
-    (43335, 43345),
-    (43392, 43394),
-    (43443, 43443),
-    (43446, 43449),
-    (43452, 43453),
-    (43493, 43493),
-    (43561, 43566),
-    (43569, 43570),
-    (43573, 43574),
-    (43587, 43587),
-    (43596, 43596),
-    (43644, 43644),
-    (43696, 43696),
-    (43698, 43700),
-    (43703, 43704),
-    (43710, 43711),
-    (43713, 43713),
-    (43756, 43757),
-    (43766, 43766),
-    (44005, 44005),
-    (44008, 44008),
-    (44013, 44013),
-    (64286, 64286),
-    (65024, 65039),
-    (65056, 65071),
-    (66045, 66045),
-    (66272, 66272),
-    (66422, 66426),
-    (68097, 68099),
-    (68101, 68102),
-    (68108, 68111),
-    (68152, 68154),
-    (68159, 68159),
-    (68325, 68326),
-    (68900, 68903),
-    (69291, 69292),
-    (69446, 69456),
-    (69633, 69633),
-    (69688, 69702),
-    (69759, 69761),
-    (69811, 69814),
-    (69817, 69818),
-    (69888, 69890),
-    (69927, 69931),
-    (69933, 69940),
-    (70003, 70003),
-    (70016, 70017),
-    (70070, 70078),
-    (70089, 70092),
-    (70095, 70095),
-    (70191, 70193),
-    (70196, 70196),
-    (70198, 70199),
-    (70206, 70206),
-    (70367, 70367),
-    (70371, 70378),
-    (70400, 70401),
-    (70459, 70460),
-    (70464, 70464),
-    (70502, 70508),
-    (70512, 70516),
-    (70712, 70719),
-    (70722, 70724),
-    (70726, 70726),
-    (70750, 70750),
-    (70835, 70840),
-    (70842, 70842),
-    (70847, 70848),
-    (70850, 70851),
-    (71090, 71093),
-    (71100, 71101),
-    (71103, 71104),
-    (71132, 71133),
-    (71219, 71226),
-    (71229, 71229),
-    (71231, 71232),
-    (71339, 71339),
-    (71341, 71341),
-    (71344, 71349),
-    (71351, 71351),
-    (71453, 71455),
-    (71458, 71461),
-    (71463, 71467),
-    (71727, 71735),
-    (71737, 71738),
-    (71995, 71996),
-    (71998, 71998),
-    (72003, 72003),
-    (72148, 72151),
-    (72154, 72155),
-    (72160, 72160),
-    (72193, 72202),
-    (72243, 72248),
-    (72251, 72254),
-    (72263, 72263),
-    (72273, 72278),
-    (72281, 72283),
-    (72330, 72342),
-    (72344, 72345),
-    (72752, 72758),
-    (72760, 72765),
-    (72767, 72767),
-    (72850, 72871),
-    (72874, 72880),
-    (72882, 72883),
-    (72885, 72886),
-    (73009, 73014),
-    (73018, 73018),
-    (73020, 73021),
-    (73023, 73029),
-    (73031, 73031),
-    (73104, 73105),
-    (73109, 73109),
-    (73111, 73111),
-    (73459, 73460),
-    (92912, 92916),
-    (92976, 92982),
-    (94031, 94031),
-    (94095, 94098),
-    (94180, 94180),
-    (113821, 113822),
-    (119143, 119145),
-    (119163, 119170),
-    (119173, 119179),
-    (119210, 119213),
-    (119362, 119364),
-    (121344, 121398),
-    (121403, 121452),
-    (121461, 121461),
-    (121476, 121476),
-    (121499, 121503),
-    (121505, 121519),
-    (122880, 122886),
-    (122888, 122904),
-    (122907, 122913),
-    (122915, 122916),
-    (122918, 122922),
-    (123184, 123190),
-    (123628, 123631),
-    (125136, 125142),
-    (125252, 125258),
-    (917760, 917999),
-];
-
-pub const NUMBER: &'static [(u32, u32)] = &[
-    (48, 57),
-    (178, 179),
-    (185, 185),
-    (188, 190),
-    (1632, 1641),
-    (1776, 1785),
-    (1984, 1993),
-    (2406, 2415),
-    (2534, 2543),
-    (2548, 2553),
-    (2662, 2671),
-    (2790, 2799),
-    (2918, 2927),
-    (2930, 2935),
-    (3046, 3058),
-    (3174, 3183),
-    (3192, 3198),
-    (3302, 3311),
-    (3416, 3422),
-    (3430, 3448),
-    (3558, 3567),
-    (3664, 3673),
-    (3792, 3801),
-    (3872, 3891),
-    (4160, 4169),
-    (4240, 4249),
-    (4969, 4988),
-    (5870, 5872),
-    (6112, 6121),
-    (6128, 6137),
-    (6160, 6169),
-    (6470, 6479),
-    (6608, 6618),
-    (6784, 6793),
-    (6800, 6809),
-    (6992, 7001),
-    (7088, 7097),
-    (7232, 7241),
-    (7248, 7257),
-    (8304, 8304),
-    (8308, 8313),
-    (8320, 8329),
-    (8528, 8578),
-    (8581, 8585),
-    (9312, 9371),
-    (9450, 9471),
-    (10102, 10131),
-    (11517, 11517),
-    (12295, 12295),
-    (12321, 12329),
-    (12344, 12346),
-    (12690, 12693),
-    (12832, 12841),
-    (12872, 12879),
-    (12881, 12895),
-    (12928, 12937),
-    (12977, 12991),
-    (42528, 42537),
-    (42726, 42735),
-    (43056, 43061),
-    (43216, 43225),
-    (43264, 43273),
-    (43472, 43481),
-    (43504, 43513),
-    (43600, 43609),
-    (44016, 44025),
-    (65296, 65305),
-    (65799, 65843),
-    (65856, 65912),
-    (65930, 65931),
-    (66273, 66299),
-    (66336, 66339),
-    (66369, 66369),
-    (66378, 66378),
-    (66513, 66517),
-    (66720, 66729),
-    (67672, 67679),
-    (67705, 67711),
-    (67751, 67759),
-    (67835, 67839),
-    (67862, 67867),
-    (68028, 68029),
-    (68032, 68047),
-    (68050, 68095),
-    (68160, 68168),
-    (68221, 68222),
-    (68253, 68255),
-    (68331, 68335),
-    (68440, 68447),
-    (68472, 68479),
-    (68521, 68527),
-    (68858, 68863),
-    (68912, 68921),
-    (69216, 69246),
-    (69405, 69414),
-    (69457, 69460),
-    (69573, 69579),
-    (69714, 69743),
-    (69872, 69881),
-    (69942, 69951),
-    (70096, 70105),
-    (70113, 70132),
-    (70384, 70393),
-    (70736, 70745),
-    (70864, 70873),
-    (71248, 71257),
-    (71360, 71369),
-    (71472, 71483),
-    (71904, 71922),
-    (72016, 72025),
-    (72784, 72812),
-    (73040, 73049),
-    (73120, 73129),
-    (73664, 73684),
-    (74752, 74862),
-    (92768, 92777),
-    (93008, 93017),
-    (93019, 93025),
-    (93824, 93846),
-    (119520, 119539),
-    (119648, 119672),
-    (120782, 120831),
-    (123200, 123209),
-    (123632, 123641),
-    (125127, 125135),
-    (125264, 125273),
-    (126065, 126123),
-    (126125, 126127),
-    (126129, 126132),
-    (126209, 126253),
-    (126255, 126269),
-    (127232, 127244),
-    (130032, 130041),
-];
-
-pub const OPEN_PUNCTUATION: &'static [(u32, u32)] = &[
-    (40, 40),
-    (91, 91),
-    (123, 123),
-    (3898, 3898),
-    (3900, 3900),
-    (5787, 5787),
-    (8218, 8218),
-    (8222, 8222),
-    (8261, 8261),
-    (8317, 8317),
-    (8333, 8333),
-    (8968, 8968),
-    (8970, 8970),
-    (9001, 9001),
-    (10088, 10088),
-    (10090, 10090),
-    (10092, 10092),
-    (10094, 10094),
-    (10096, 10096),
-    (10098, 10098),
-    (10100, 10100),
-    (10181, 10181),
-    (10214, 10214),
-    (10216, 10216),
-    (10218, 10218),
-    (10220, 10220),
-    (10222, 10222),
-    (10627, 10627),
-    (10629, 10629),
-    (10631, 10631),
-    (10633, 10633),
-    (10635, 10635),
-    (10637, 10637),
-    (10639, 10639),
-    (10641, 10641),
-    (10643, 10643),
-    (10645, 10645),
-    (10647, 10647),
-    (10712, 10712),
-    (10714, 10714),
-    (10748, 10748),
-    (11810, 11810),
-    (11812, 11812),
-    (11814, 11814),
-    (11816, 11816),
-    (11842, 11842),
-    (12296, 12296),
-    (12298, 12298),
-    (12300, 12300),
-    (12302, 12302),
-    (12304, 12304),
-    (12308, 12308),
-    (12310, 12310),
-    (12312, 12312),
-    (12314, 12314),
-    (12317, 12317),
-    (64831, 64831),
-    (65047, 65047),
-    (65077, 65077),
-    (65079, 65079),
-    (65081, 65081),
-    (65083, 65083),
-    (65085, 65085),
-    (65087, 65087),
-    (65089, 65089),
-    (65091, 65091),
-    (65095, 65095),
-    (65113, 65113),
-    (65115, 65115),
-    (65117, 65117),
-    (65288, 65288),
-    (65339, 65339),
-    (65371, 65371),
-    (65375, 65375),
-    (65378, 65378),
-];
-
-pub const OTHER: &'static [(u32, u32)] = &[
-    (0, 31),
-    (127, 159),
-    (173, 173),
-    (888, 889),
-    (896, 899),
-    (907, 907),
-    (909, 909),
-    (930, 930),
-    (1328, 1328),
-    (1367, 1368),
-    (1419, 1420),
-    (1424, 1424),
-    (1480, 1487),
-    (1515, 1518),
-    (1525, 1541),
-    (1564, 1565),
-    (1757, 1757),
-    (1806, 1807),
-    (1867, 1868),
-    (1970, 1983),
-    (2043, 2044),
-    (2094, 2095),
-    (2111, 2111),
-    (2140, 2141),
-    (2143, 2143),
-    (2155, 2207),
-    (2229, 2229),
-    (2248, 2258),
-    (2274, 2274),
-    (2436, 2436),
-    (2445, 2446),
-    (2449, 2450),
-    (2473, 2473),
-    (2481, 2481),
-    (2483, 2485),
-    (2490, 2491),
-    (2501, 2502),
-    (2505, 2506),
-    (2511, 2518),
-    (2520, 2523),
-    (2526, 2526),
-    (2532, 2533),
-    (2559, 2560),
-    (2564, 2564),
-    (2571, 2574),
-    (2577, 2578),
-    (2601, 2601),
-    (2609, 2609),
-    (2612, 2612),
-    (2615, 2615),
-    (2618, 2619),
-    (2621, 2621),
-    (2627, 2630),
-    (2633, 2634),
-    (2638, 2640),
-    (2642, 2648),
-    (2653, 2653),
-    (2655, 2661),
-    (2679, 2688),
-    (2692, 2692),
-    (2702, 2702),
-    (2706, 2706),
-    (2729, 2729),
-    (2737, 2737),
-    (2740, 2740),
-    (2746, 2747),
-    (2758, 2758),
-    (2762, 2762),
-    (2766, 2767),
-    (2769, 2783),
-    (2788, 2789),
-    (2802, 2808),
-    (2816, 2816),
-    (2820, 2820),
-    (2829, 2830),
-    (2833, 2834),
-    (2857, 2857),
-    (2865, 2865),
-    (2868, 2868),
-    (2874, 2875),
-    (2885, 2886),
-    (2889, 2890),
-    (2894, 2900),
-    (2904, 2907),
-    (2910, 2910),
-    (2916, 2917),
-    (2936, 2945),
-    (2948, 2948),
-    (2955, 2957),
-    (2961, 2961),
-    (2966, 2968),
-    (2971, 2971),
-    (2973, 2973),
-    (2976, 2978),
-    (2981, 2983),
-    (2987, 2989),
-    (3002, 3005),
-    (3011, 3013),
-    (3017, 3017),
-    (3022, 3023),
-    (3025, 3030),
-    (3032, 3045),
-    (3067, 3071),
-    (3085, 3085),
-    (3089, 3089),
-    (3113, 3113),
-    (3130, 3132),
-    (3141, 3141),
-    (3145, 3145),
-    (3150, 3156),
-    (3159, 3159),
-    (3163, 3167),
-    (3172, 3173),
-    (3184, 3190),
-    (3213, 3213),
-    (3217, 3217),
-    (3241, 3241),
-    (3252, 3252),
-    (3258, 3259),
-    (3269, 3269),
-    (3273, 3273),
-    (3278, 3284),
-    (3287, 3293),
-    (3295, 3295),
-    (3300, 3301),
-    (3312, 3312),
-    (3315, 3327),
-    (3341, 3341),
-    (3345, 3345),
-    (3397, 3397),
-    (3401, 3401),
-    (3408, 3411),
-    (3428, 3429),
-    (3456, 3456),
-    (3460, 3460),
-    (3479, 3481),
-    (3506, 3506),
-    (3516, 3516),
-    (3518, 3519),
-    (3527, 3529),
-    (3531, 3534),
-    (3541, 3541),
-    (3543, 3543),
-    (3552, 3557),
-    (3568, 3569),
-    (3573, 3584),
-    (3643, 3646),
-    (3676, 3712),
-    (3715, 3715),
-    (3717, 3717),
-    (3723, 3723),
-    (3748, 3748),
-    (3750, 3750),
-    (3774, 3775),
-    (3781, 3781),
-    (3783, 3783),
-    (3790, 3791),
-    (3802, 3803),
-    (3808, 3839),
-    (3912, 3912),
-    (3949, 3952),
-    (3992, 3992),
-    (4029, 4029),
-    (4045, 4045),
-    (4059, 4095),
-    (4294, 4294),
-    (4296, 4300),
-    (4302, 4303),
-    (4681, 4681),
-    (4686, 4687),
-    (4695, 4695),
-    (4697, 4697),
-    (4702, 4703),
-    (4745, 4745),
-    (4750, 4751),
-    (4785, 4785),
-    (4790, 4791),
-    (4799, 4799),
-    (4801, 4801),
-    (4806, 4807),
-    (4823, 4823),
-    (4881, 4881),
-    (4886, 4887),
-    (4955, 4956),
-    (4989, 4991),
-    (5018, 5023),
-    (5110, 5111),
-    (5118, 5119),
-    (5789, 5791),
-    (5881, 5887),
-    (5901, 5901),
-    (5909, 5919),
-    (5943, 5951),
-    (5972, 5983),
-    (5997, 5997),
-    (6001, 6001),
-    (6004, 6015),
-    (6110, 6111),
-    (6122, 6127),
-    (6138, 6143),
-    (6158, 6159),
-    (6170, 6175),
-    (6265, 6271),
-    (6315, 6319),
-    (6390, 6399),
-    (6431, 6431),
-    (6444, 6447),
-    (6460, 6463),
-    (6465, 6467),
-    (6510, 6511),
-    (6517, 6527),
-    (6572, 6575),
-    (6602, 6607),
-    (6619, 6621),
-    (6684, 6685),
-    (6751, 6751),
-    (6781, 6782),
-    (6794, 6799),
-    (6810, 6815),
-    (6830, 6831),
-    (6849, 6911),
-    (6988, 6991),
-    (7037, 7039),
-    (7156, 7163),
-    (7224, 7226),
-    (7242, 7244),
-    (7305, 7311),
-    (7355, 7356),
-    (7368, 7375),
-    (7419, 7423),
-    (7674, 7674),
-    (7958, 7959),
-    (7966, 7967),
-    (8006, 8007),
-    (8014, 8015),
-    (8024, 8024),
-    (8026, 8026),
-    (8028, 8028),
-    (8030, 8030),
-    (8062, 8063),
-    (8117, 8117),
-    (8133, 8133),
-    (8148, 8149),
-    (8156, 8156),
-    (8176, 8177),
-    (8181, 8181),
-    (8191, 8191),
-    (8203, 8207),
-    (8234, 8238),
-    (8288, 8303),
-    (8306, 8307),
-    (8335, 8335),
-    (8349, 8351),
-    (8384, 8399),
-    (8433, 8447),
-    (8588, 8591),
-    (9255, 9279),
-    (9291, 9311),
-    (11124, 11125),
-    (11158, 11158),
-    (11311, 11311),
-    (11359, 11359),
-    (11508, 11512),
-    (11558, 11558),
-    (11560, 11564),
-    (11566, 11567),
-    (11624, 11630),
-    (11633, 11646),
-    (11671, 11679),
-    (11687, 11687),
-    (11695, 11695),
-    (11703, 11703),
-    (11711, 11711),
-    (11719, 11719),
-    (11727, 11727),
-    (11735, 11735),
-    (11743, 11743),
-    (11859, 11903),
-    (11930, 11930),
-    (12020, 12031),
-    (12246, 12271),
-    (12284, 12287),
-    (12352, 12352),
-    (12439, 12440),
-    (12544, 12548),
-    (12592, 12592),
-    (12687, 12687),
-    (12772, 12783),
-    (12831, 12831),
-    (40957, 40959),
-    (42125, 42127),
-    (42183, 42191),
-    (42540, 42559),
-    (42744, 42751),
-    (42944, 42945),
-    (42955, 42996),
-    (43053, 43055),
-    (43066, 43071),
-    (43128, 43135),
-    (43206, 43213),
-    (43226, 43231),
-    (43348, 43358),
-    (43389, 43391),
-    (43470, 43470),
-    (43482, 43485),
-    (43519, 43519),
-    (43575, 43583),
-    (43598, 43599),
-    (43610, 43611),
-    (43715, 43738),
-    (43767, 43776),
-    (43783, 43784),
-    (43791, 43792),
-    (43799, 43807),
-    (43815, 43815),
-    (43823, 43823),
-    (43884, 43887),
-    (44014, 44015),
-    (44026, 44031),
-    (55204, 55215),
-    (55239, 55242),
-    (55292, 63743),
-    (64110, 64111),
-    (64218, 64255),
-    (64263, 64274),
-    (64280, 64284),
-    (64311, 64311),
-    (64317, 64317),
-    (64319, 64319),
-    (64322, 64322),
-    (64325, 64325),
-    (64450, 64466),
-    (64832, 64847),
-    (64912, 64913),
-    (64968, 65007),
-    (65022, 65023),
-    (65050, 65055),
-    (65107, 65107),
-    (65127, 65127),
-    (65132, 65135),
-    (65141, 65141),
-    (65277, 65280),
-    (65471, 65473),
-    (65480, 65481),
-    (65488, 65489),
-    (65496, 65497),
-    (65501, 65503),
-    (65511, 65511),
-    (65519, 65531),
-    (65534, 65535),
-    (65548, 65548),
-    (65575, 65575),
-    (65595, 65595),
-    (65598, 65598),
-    (65614, 65615),
-    (65630, 65663),
-    (65787, 65791),
-    (65795, 65798),
-    (65844, 65846),
-    (65935, 65935),
-    (65949, 65951),
-    (65953, 65999),
-    (66046, 66175),
-    (66205, 66207),
-    (66257, 66271),
-    (66300, 66303),
-    (66340, 66348),
-    (66379, 66383),
-    (66427, 66431),
-    (66462, 66462),
-    (66500, 66503),
-    (66518, 66559),
-    (66718, 66719),
-    (66730, 66735),
-    (66772, 66775),
-    (66812, 66815),
-    (66856, 66863),
-    (66916, 66926),
-    (66928, 67071),
-    (67383, 67391),
-    (67414, 67423),
-    (67432, 67583),
-    (67590, 67591),
-    (67593, 67593),
-    (67638, 67638),
-    (67641, 67643),
-    (67645, 67646),
-    (67670, 67670),
-    (67743, 67750),
-    (67760, 67807),
-    (67827, 67827),
-    (67830, 67834),
-    (67868, 67870),
-    (67898, 67902),
-    (67904, 67967),
-    (68024, 68027),
-    (68048, 68049),
-    (68100, 68100),
-    (68103, 68107),
-    (68116, 68116),
-    (68120, 68120),
-    (68150, 68151),
-    (68155, 68158),
-    (68169, 68175),
-    (68185, 68191),
-    (68256, 68287),
-    (68327, 68330),
-    (68343, 68351),
-    (68406, 68408),
-    (68438, 68439),
-    (68467, 68471),
-    (68498, 68504),
-    (68509, 68520),
-    (68528, 68607),
-    (68681, 68735),
-    (68787, 68799),
-    (68851, 68857),
-    (68904, 68911),
-    (68922, 69215),
-    (69247, 69247),
-    (69290, 69290),
-    (69294, 69295),
-    (69298, 69375),
-    (69416, 69423),
-    (69466, 69551),
-    (69580, 69599),
-    (69623, 69631),
-    (69710, 69713),
-    (69744, 69758),
-    (69821, 69821),
-    (69826, 69839),
-    (69865, 69871),
-    (69882, 69887),
-    (69941, 69941),
-    (69960, 69967),
-    (70007, 70015),
-    (70112, 70112),
-    (70133, 70143),
-    (70162, 70162),
-    (70207, 70271),
-    (70279, 70279),
-    (70281, 70281),
-    (70286, 70286),
-    (70302, 70302),
-    (70314, 70319),
-    (70379, 70383),
-    (70394, 70399),
-    (70404, 70404),
-    (70413, 70414),
-    (70417, 70418),
-    (70441, 70441),
-    (70449, 70449),
-    (70452, 70452),
-    (70458, 70458),
-    (70469, 70470),
-    (70473, 70474),
-    (70478, 70479),
-    (70481, 70486),
-    (70488, 70492),
-    (70500, 70501),
-    (70509, 70511),
-    (70517, 70655),
-    (70748, 70748),
-    (70754, 70783),
-    (70856, 70863),
-    (70874, 71039),
-    (71094, 71095),
-    (71134, 71167),
-    (71237, 71247),
-    (71258, 71263),
-    (71277, 71295),
-    (71353, 71359),
-    (71370, 71423),
-    (71451, 71452),
-    (71468, 71471),
-    (71488, 71679),
-    (71740, 71839),
-    (71923, 71934),
-    (71943, 71944),
-    (71946, 71947),
-    (71956, 71956),
-    (71959, 71959),
-    (71990, 71990),
-    (71993, 71994),
-    (72007, 72015),
-    (72026, 72095),
-    (72104, 72105),
-    (72152, 72153),
-    (72165, 72191),
-    (72264, 72271),
-    (72355, 72383),
-    (72441, 72703),
-    (72713, 72713),
-    (72759, 72759),
-    (72774, 72783),
-    (72813, 72815),
-    (72848, 72849),
-    (72872, 72872),
-    (72887, 72959),
-    (72967, 72967),
-    (72970, 72970),
-    (73015, 73017),
-    (73019, 73019),
-    (73022, 73022),
-    (73032, 73039),
-    (73050, 73055),
-    (73062, 73062),
-    (73065, 73065),
-    (73103, 73103),
-    (73106, 73106),
-    (73113, 73119),
-    (73130, 73439),
-    (73465, 73647),
-    (73649, 73663),
-    (73714, 73726),
-    (74650, 74751),
-    (74863, 74863),
-    (74869, 74879),
-    (75076, 77823),
-    (78895, 82943),
-    (83527, 92159),
-    (92729, 92735),
-    (92767, 92767),
-    (92778, 92781),
-    (92784, 92879),
-    (92910, 92911),
-    (92918, 92927),
-    (92998, 93007),
-    (93018, 93018),
-    (93026, 93026),
-    (93048, 93052),
-    (93072, 93759),
-    (93851, 93951),
-    (94027, 94030),
-    (94088, 94094),
-    (94112, 94175),
-    (94181, 94191),
-    (94194, 94207),
-    (100344, 100351),
-    (101590, 101631),
-    (101641, 110591),
-    (110879, 110927),
-    (110931, 110947),
-    (110952, 110959),
-    (111356, 113663),
-    (113771, 113775),
-    (113789, 113791),
-    (113801, 113807),
-    (113818, 113819),
-    (113824, 118783),
-    (119030, 119039),
-    (119079, 119080),
-    (119155, 119162),
-    (119273, 119295),
-    (119366, 119519),
-    (119540, 119551),
-    (119639, 119647),
-    (119673, 119807),
-    (119893, 119893),
-    (119965, 119965),
-    (119968, 119969),
-    (119971, 119972),
-    (119975, 119976),
-    (119981, 119981),
-    (119994, 119994),
-    (119996, 119996),
-    (120004, 120004),
-    (120070, 120070),
-    (120075, 120076),
-    (120085, 120085),
-    (120093, 120093),
-    (120122, 120122),
-    (120127, 120127),
-    (120133, 120133),
-    (120135, 120137),
-    (120145, 120145),
-    (120486, 120487),
-    (120780, 120781),
-    (121484, 121498),
-    (121504, 121504),
-    (121520, 122879),
-    (122887, 122887),
-    (122905, 122906),
-    (122914, 122914),
-    (122917, 122917),
-    (122923, 123135),
-    (123181, 123183),
-    (123198, 123199),
-    (123210, 123213),
-    (123216, 123583),
-    (123642, 123646),
-    (123648, 124927),
-    (125125, 125126),
-    (125143, 125183),
-    (125260, 125263),
-    (125274, 125277),
-    (125280, 126064),
-    (126133, 126208),
-    (126270, 126463),
-    (126468, 126468),
-    (126496, 126496),
-    (126499, 126499),
-    (126501, 126502),
-    (126504, 126504),
-    (126515, 126515),
-    (126520, 126520),
-    (126522, 126522),
-    (126524, 126529),
-    (126531, 126534),
-    (126536, 126536),
-    (126538, 126538),
-    (126540, 126540),
-    (126544, 126544),
-    (126547, 126547),
-    (126549, 126550),
-    (126552, 126552),
-    (126554, 126554),
-    (126556, 126556),
-    (126558, 126558),
-    (126560, 126560),
-    (126563, 126563),
-    (126565, 126566),
-    (126571, 126571),
-    (126579, 126579),
-    (126584, 126584),
-    (126589, 126589),
-    (126591, 126591),
-    (126602, 126602),
-    (126620, 126624),
-    (126628, 126628),
-    (126634, 126634),
-    (126652, 126703),
-    (126706, 126975),
-    (127020, 127023),
-    (127124, 127135),
-    (127151, 127152),
-    (127168, 127168),
-    (127184, 127184),
-    (127222, 127231),
-    (127406, 127461),
-    (127491, 127503),
-    (127548, 127551),
-    (127561, 127567),
-    (127570, 127583),
-    (127590, 127743),
-    (128728, 128735),
-    (128749, 128751),
-    (128765, 128767),
-    (128884, 128895),
-    (128985, 128991),
-    (129004, 129023),
-    (129036, 129039),
-    (129096, 129103),
-    (129114, 129119),
-    (129160, 129167),
-    (129198, 129199),
-    (129202, 129279),
-    (129401, 129401),
-    (129484, 129484),
-    (129620, 129631),
-    (129646, 129647),
-    (129653, 129655),
-    (129659, 129663),
-    (129671, 129679),
-    (129705, 129711),
-    (129719, 129727),
-    (129731, 129743),
-    (129751, 129791),
-    (129939, 129939),
-    (129995, 130031),
-    (130042, 131071),
-    (173790, 173823),
-    (177973, 177983),
-    (178206, 178207),
-    (183970, 183983),
-    (191457, 194559),
-    (195102, 196607),
-    (201547, 917759),
-    (918000, 1114111),
-];
-
-pub const OTHER_LETTER: &'static [(u32, u32)] = &[
-    (170, 170),
-    (186, 186),
-    (443, 443),
-    (448, 451),
-    (660, 660),
-    (1488, 1514),
-    (1519, 1522),
-    (1568, 1599),
-    (1601, 1610),
-    (1646, 1647),
-    (1649, 1747),
-    (1749, 1749),
-    (1774, 1775),
-    (1786, 1788),
-    (1791, 1791),
-    (1808, 1808),
-    (1810, 1839),
-    (1869, 1957),
-    (1969, 1969),
-    (1994, 2026),
-    (2048, 2069),
-    (2112, 2136),
-    (2144, 2154),
-    (2208, 2228),
-    (2230, 2247),
-    (2308, 2361),
-    (2365, 2365),
-    (2384, 2384),
-    (2392, 2401),
-    (2418, 2432),
-    (2437, 2444),
-    (2447, 2448),
-    (2451, 2472),
-    (2474, 2480),
-    (2482, 2482),
-    (2486, 2489),
-    (2493, 2493),
-    (2510, 2510),
-    (2524, 2525),
-    (2527, 2529),
-    (2544, 2545),
-    (2556, 2556),
-    (2565, 2570),
-    (2575, 2576),
-    (2579, 2600),
-    (2602, 2608),
-    (2610, 2611),
-    (2613, 2614),
-    (2616, 2617),
-    (2649, 2652),
-    (2654, 2654),
-    (2674, 2676),
-    (2693, 2701),
-    (2703, 2705),
-    (2707, 2728),
-    (2730, 2736),
-    (2738, 2739),
-    (2741, 2745),
-    (2749, 2749),
-    (2768, 2768),
-    (2784, 2785),
-    (2809, 2809),
-    (2821, 2828),
-    (2831, 2832),
-    (2835, 2856),
-    (2858, 2864),
-    (2866, 2867),
-    (2869, 2873),
-    (2877, 2877),
-    (2908, 2909),
-    (2911, 2913),
-    (2929, 2929),
-    (2947, 2947),
-    (2949, 2954),
-    (2958, 2960),
-    (2962, 2965),
-    (2969, 2970),
-    (2972, 2972),
-    (2974, 2975),
-    (2979, 2980),
-    (2984, 2986),
-    (2990, 3001),
-    (3024, 3024),
-    (3077, 3084),
-    (3086, 3088),
-    (3090, 3112),
-    (3114, 3129),
-    (3133, 3133),
-    (3160, 3162),
-    (3168, 3169),
-    (3200, 3200),
-    (3205, 3212),
-    (3214, 3216),
-    (3218, 3240),
-    (3242, 3251),
-    (3253, 3257),
-    (3261, 3261),
-    (3294, 3294),
-    (3296, 3297),
-    (3313, 3314),
-    (3332, 3340),
-    (3342, 3344),
-    (3346, 3386),
-    (3389, 3389),
-    (3406, 3406),
-    (3412, 3414),
-    (3423, 3425),
-    (3450, 3455),
-    (3461, 3478),
-    (3482, 3505),
-    (3507, 3515),
-    (3517, 3517),
-    (3520, 3526),
-    (3585, 3632),
-    (3634, 3635),
-    (3648, 3653),
-    (3713, 3714),
-    (3716, 3716),
-    (3718, 3722),
-    (3724, 3747),
-    (3749, 3749),
-    (3751, 3760),
-    (3762, 3763),
-    (3773, 3773),
-    (3776, 3780),
-    (3804, 3807),
-    (3840, 3840),
-    (3904, 3911),
-    (3913, 3948),
-    (3976, 3980),
-    (4096, 4138),
-    (4159, 4159),
-    (4176, 4181),
-    (4186, 4189),
-    (4193, 4193),
-    (4197, 4198),
-    (4206, 4208),
-    (4213, 4225),
-    (4238, 4238),
-    (4352, 4680),
-    (4682, 4685),
-    (4688, 4694),
-    (4696, 4696),
-    (4698, 4701),
-    (4704, 4744),
-    (4746, 4749),
-    (4752, 4784),
-    (4786, 4789),
-    (4792, 4798),
-    (4800, 4800),
-    (4802, 4805),
-    (4808, 4822),
-    (4824, 4880),
-    (4882, 4885),
-    (4888, 4954),
-    (4992, 5007),
-    (5121, 5740),
-    (5743, 5759),
-    (5761, 5786),
-    (5792, 5866),
-    (5873, 5880),
-    (5888, 5900),
-    (5902, 5905),
-    (5920, 5937),
-    (5952, 5969),
-    (5984, 5996),
-    (5998, 6000),
-    (6016, 6067),
-    (6108, 6108),
-    (6176, 6210),
-    (6212, 6264),
-    (6272, 6276),
-    (6279, 6312),
-    (6314, 6314),
-    (6320, 6389),
-    (6400, 6430),
-    (6480, 6509),
-    (6512, 6516),
-    (6528, 6571),
-    (6576, 6601),
-    (6656, 6678),
-    (6688, 6740),
-    (6917, 6963),
-    (6981, 6987),
-    (7043, 7072),
-    (7086, 7087),
-    (7098, 7141),
-    (7168, 7203),
-    (7245, 7247),
-    (7258, 7287),
-    (7401, 7404),
-    (7406, 7411),
-    (7413, 7414),
-    (7418, 7418),
-    (8501, 8504),
-    (11568, 11623),
-    (11648, 11670),
-    (11680, 11686),
-    (11688, 11694),
-    (11696, 11702),
-    (11704, 11710),
-    (11712, 11718),
-    (11720, 11726),
-    (11728, 11734),
-    (11736, 11742),
-    (12294, 12294),
-    (12348, 12348),
-    (12353, 12438),
-    (12447, 12447),
-    (12449, 12538),
-    (12543, 12543),
-    (12549, 12591),
-    (12593, 12686),
-    (12704, 12735),
-    (12784, 12799),
-    (13312, 19903),
-    (19968, 40956),
-    (40960, 40980),
-    (40982, 42124),
-    (42192, 42231),
-    (42240, 42507),
-    (42512, 42527),
-    (42538, 42539),
-    (42606, 42606),
-    (42656, 42725),
-    (42895, 42895),
-    (42999, 42999),
-    (43003, 43009),
-    (43011, 43013),
-    (43015, 43018),
-    (43020, 43042),
-    (43072, 43123),
-    (43138, 43187),
-    (43250, 43255),
-    (43259, 43259),
-    (43261, 43262),
-    (43274, 43301),
-    (43312, 43334),
-    (43360, 43388),
-    (43396, 43442),
-    (43488, 43492),
-    (43495, 43503),
-    (43514, 43518),
-    (43520, 43560),
-    (43584, 43586),
-    (43588, 43595),
-    (43616, 43631),
-    (43633, 43638),
-    (43642, 43642),
-    (43646, 43695),
-    (43697, 43697),
-    (43701, 43702),
-    (43705, 43709),
-    (43712, 43712),
-    (43714, 43714),
-    (43739, 43740),
-    (43744, 43754),
-    (43762, 43762),
-    (43777, 43782),
-    (43785, 43790),
-    (43793, 43798),
-    (43808, 43814),
-    (43816, 43822),
-    (43968, 44002),
-    (44032, 55203),
-    (55216, 55238),
-    (55243, 55291),
-    (63744, 64109),
-    (64112, 64217),
-    (64285, 64285),
-    (64287, 64296),
-    (64298, 64310),
-    (64312, 64316),
-    (64318, 64318),
-    (64320, 64321),
-    (64323, 64324),
-    (64326, 64433),
-    (64467, 64829),
-    (64848, 64911),
-    (64914, 64967),
-    (65008, 65019),
-    (65136, 65140),
-    (65142, 65276),
-    (65382, 65391),
-    (65393, 65437),
-    (65440, 65470),
-    (65474, 65479),
-    (65482, 65487),
-    (65490, 65495),
-    (65498, 65500),
-    (65536, 65547),
-    (65549, 65574),
-    (65576, 65594),
-    (65596, 65597),
-    (65599, 65613),
-    (65616, 65629),
-    (65664, 65786),
-    (66176, 66204),
-    (66208, 66256),
-    (66304, 66335),
-    (66349, 66368),
-    (66370, 66377),
-    (66384, 66421),
-    (66432, 66461),
-    (66464, 66499),
-    (66504, 66511),
-    (66640, 66717),
-    (66816, 66855),
-    (66864, 66915),
-    (67072, 67382),
-    (67392, 67413),
-    (67424, 67431),
-    (67584, 67589),
-    (67592, 67592),
-    (67594, 67637),
-    (67639, 67640),
-    (67644, 67644),
-    (67647, 67669),
-    (67680, 67702),
-    (67712, 67742),
-    (67808, 67826),
-    (67828, 67829),
-    (67840, 67861),
-    (67872, 67897),
-    (67968, 68023),
-    (68030, 68031),
-    (68096, 68096),
-    (68112, 68115),
-    (68117, 68119),
-    (68121, 68149),
-    (68192, 68220),
-    (68224, 68252),
-    (68288, 68295),
-    (68297, 68324),
-    (68352, 68405),
-    (68416, 68437),
-    (68448, 68466),
-    (68480, 68497),
-    (68608, 68680),
-    (68864, 68899),
-    (69248, 69289),
-    (69296, 69297),
-    (69376, 69404),
-    (69415, 69415),
-    (69424, 69445),
-    (69552, 69572),
-    (69600, 69622),
-    (69635, 69687),
-    (69763, 69807),
-    (69840, 69864),
-    (69891, 69926),
-    (69956, 69956),
-    (69959, 69959),
-    (69968, 70002),
-    (70006, 70006),
-    (70019, 70066),
-    (70081, 70084),
-    (70106, 70106),
-    (70108, 70108),
-    (70144, 70161),
-    (70163, 70187),
-    (70272, 70278),
-    (70280, 70280),
-    (70282, 70285),
-    (70287, 70301),
-    (70303, 70312),
-    (70320, 70366),
-    (70405, 70412),
-    (70415, 70416),
-    (70419, 70440),
-    (70442, 70448),
-    (70450, 70451),
-    (70453, 70457),
-    (70461, 70461),
-    (70480, 70480),
-    (70493, 70497),
-    (70656, 70708),
-    (70727, 70730),
-    (70751, 70753),
-    (70784, 70831),
-    (70852, 70853),
-    (70855, 70855),
-    (71040, 71086),
-    (71128, 71131),
-    (71168, 71215),
-    (71236, 71236),
-    (71296, 71338),
-    (71352, 71352),
-    (71424, 71450),
-    (71680, 71723),
-    (71935, 71942),
-    (71945, 71945),
-    (71948, 71955),
-    (71957, 71958),
-    (71960, 71983),
-    (71999, 71999),
-    (72001, 72001),
-    (72096, 72103),
-    (72106, 72144),
-    (72161, 72161),
-    (72163, 72163),
-    (72192, 72192),
-    (72203, 72242),
-    (72250, 72250),
-    (72272, 72272),
-    (72284, 72329),
-    (72349, 72349),
-    (72384, 72440),
-    (72704, 72712),
-    (72714, 72750),
-    (72768, 72768),
-    (72818, 72847),
-    (72960, 72966),
-    (72968, 72969),
-    (72971, 73008),
-    (73030, 73030),
-    (73056, 73061),
-    (73063, 73064),
-    (73066, 73097),
-    (73112, 73112),
-    (73440, 73458),
-    (73648, 73648),
-    (73728, 74649),
-    (74880, 75075),
-    (77824, 78894),
-    (82944, 83526),
-    (92160, 92728),
-    (92736, 92766),
-    (92880, 92909),
-    (92928, 92975),
-    (93027, 93047),
-    (93053, 93071),
-    (93952, 94026),
-    (94032, 94032),
-    (94208, 100343),
-    (100352, 101589),
-    (101632, 101640),
-    (110592, 110878),
-    (110928, 110930),
-    (110948, 110951),
-    (110960, 111355),
-    (113664, 113770),
-    (113776, 113788),
-    (113792, 113800),
-    (113808, 113817),
-    (123136, 123180),
-    (123214, 123214),
-    (123584, 123627),
-    (124928, 125124),
-    (126464, 126467),
-    (126469, 126495),
-    (126497, 126498),
-    (126500, 126500),
-    (126503, 126503),
-    (126505, 126514),
-    (126516, 126519),
-    (126521, 126521),
-    (126523, 126523),
-    (126530, 126530),
-    (126535, 126535),
-    (126537, 126537),
-    (126539, 126539),
-    (126541, 126543),
-    (126545, 126546),
-    (126548, 126548),
-    (126551, 126551),
-    (126553, 126553),
-    (126555, 126555),
-    (126557, 126557),
-    (126559, 126559),
-    (126561, 126562),
-    (126564, 126564),
-    (126567, 126570),
-    (126572, 126578),
-    (126580, 126583),
-    (126585, 126588),
-    (126590, 126590),
-    (126592, 126601),
-    (126603, 126619),
-    (126625, 126627),
-    (126629, 126633),
-    (126635, 126651),
-    (131072, 173789),
-    (173824, 177972),
-    (177984, 178205),
-    (178208, 183969),
-    (183984, 191456),
-    (194560, 195101),
-    (196608, 201546),
-];
-
-pub const OTHER_NUMBER: &'static [(u32, u32)] = &[
-    (178, 179),
-    (185, 185),
-    (188, 190),
-    (2548, 2553),
-    (2930, 2935),
-    (3056, 3058),
-    (3192, 3198),
-    (3416, 3422),
-    (3440, 3448),
-    (3882, 3891),
-    (4969, 4988),
-    (6128, 6137),
-    (6618, 6618),
-    (8304, 8304),
-    (8308, 8313),
-    (8320, 8329),
-    (8528, 8543),
-    (8585, 8585),
-    (9312, 9371),
-    (9450, 9471),
-    (10102, 10131),
-    (11517, 11517),
-    (12690, 12693),
-    (12832, 12841),
-    (12872, 12879),
-    (12881, 12895),
-    (12928, 12937),
-    (12977, 12991),
-    (43056, 43061),
-    (65799, 65843),
-    (65909, 65912),
-    (65930, 65931),
-    (66273, 66299),
-    (66336, 66339),
-    (67672, 67679),
-    (67705, 67711),
-    (67751, 67759),
-    (67835, 67839),
-    (67862, 67867),
-    (68028, 68029),
-    (68032, 68047),
-    (68050, 68095),
-    (68160, 68168),
-    (68221, 68222),
-    (68253, 68255),
-    (68331, 68335),
-    (68440, 68447),
-    (68472, 68479),
-    (68521, 68527),
-    (68858, 68863),
-    (69216, 69246),
-    (69405, 69414),
-    (69457, 69460),
-    (69573, 69579),
-    (69714, 69733),
-    (70113, 70132),
-    (71482, 71483),
-    (71914, 71922),
-    (72794, 72812),
-    (73664, 73684),
-    (93019, 93025),
-    (93824, 93846),
-    (119520, 119539),
-    (119648, 119672),
-    (125127, 125135),
-    (126065, 126123),
-    (126125, 126127),
-    (126129, 126132),
-    (126209, 126253),
-    (126255, 126269),
-    (127232, 127244),
-];
-
-pub const OTHER_PUNCTUATION: &'static [(u32, u32)] = &[
-    (33, 35),
-    (37, 39),
-    (42, 42),
-    (44, 44),
-    (46, 47),
-    (58, 59),
-    (63, 64),
-    (92, 92),
-    (161, 161),
-    (167, 167),
-    (182, 183),
-    (191, 191),
-    (894, 894),
-    (903, 903),
-    (1370, 1375),
-    (1417, 1417),
-    (1472, 1472),
-    (1475, 1475),
-    (1478, 1478),
-    (1523, 1524),
-    (1545, 1546),
-    (1548, 1549),
-    (1563, 1563),
-    (1566, 1567),
-    (1642, 1645),
-    (1748, 1748),
-    (1792, 1805),
-    (2039, 2041),
-    (2096, 2110),
-    (2142, 2142),
-    (2404, 2405),
-    (2416, 2416),
-    (2557, 2557),
-    (2678, 2678),
-    (2800, 2800),
-    (3191, 3191),
-    (3204, 3204),
-    (3572, 3572),
-    (3663, 3663),
-    (3674, 3675),
-    (3844, 3858),
-    (3860, 3860),
-    (3973, 3973),
-    (4048, 4052),
-    (4057, 4058),
-    (4170, 4175),
-    (4347, 4347),
-    (4960, 4968),
-    (5742, 5742),
-    (5867, 5869),
-    (5941, 5942),
-    (6100, 6102),
-    (6104, 6106),
-    (6144, 6149),
-    (6151, 6154),
-    (6468, 6469),
-    (6686, 6687),
-    (6816, 6822),
-    (6824, 6829),
-    (7002, 7008),
-    (7164, 7167),
-    (7227, 7231),
-    (7294, 7295),
-    (7360, 7367),
-    (7379, 7379),
-    (8214, 8215),
-    (8224, 8231),
-    (8240, 8248),
-    (8251, 8254),
-    (8257, 8259),
-    (8263, 8273),
-    (8275, 8275),
-    (8277, 8286),
-    (11513, 11516),
-    (11518, 11519),
-    (11632, 11632),
-    (11776, 11777),
-    (11782, 11784),
-    (11787, 11787),
-    (11790, 11798),
-    (11800, 11801),
-    (11803, 11803),
-    (11806, 11807),
-    (11818, 11822),
-    (11824, 11833),
-    (11836, 11839),
-    (11841, 11841),
-    (11843, 11855),
-    (11858, 11858),
-    (12289, 12291),
-    (12349, 12349),
-    (12539, 12539),
-    (42238, 42239),
-    (42509, 42511),
-    (42611, 42611),
-    (42622, 42622),
-    (42738, 42743),
-    (43124, 43127),
-    (43214, 43215),
-    (43256, 43258),
-    (43260, 43260),
-    (43310, 43311),
-    (43359, 43359),
-    (43457, 43469),
-    (43486, 43487),
-    (43612, 43615),
-    (43742, 43743),
-    (43760, 43761),
-    (44011, 44011),
-    (65040, 65046),
-    (65049, 65049),
-    (65072, 65072),
-    (65093, 65094),
-    (65097, 65100),
-    (65104, 65106),
-    (65108, 65111),
-    (65119, 65121),
-    (65128, 65128),
-    (65130, 65131),
-    (65281, 65283),
-    (65285, 65287),
-    (65290, 65290),
-    (65292, 65292),
-    (65294, 65295),
-    (65306, 65307),
-    (65311, 65312),
-    (65340, 65340),
-    (65377, 65377),
-    (65380, 65381),
-    (65792, 65794),
-    (66463, 66463),
-    (66512, 66512),
-    (66927, 66927),
-    (67671, 67671),
-    (67871, 67871),
-    (67903, 67903),
-    (68176, 68184),
-    (68223, 68223),
-    (68336, 68342),
-    (68409, 68415),
-    (68505, 68508),
-    (69461, 69465),
-    (69703, 69709),
-    (69819, 69820),
-    (69822, 69825),
-    (69952, 69955),
-    (70004, 70005),
-    (70085, 70088),
-    (70093, 70093),
-    (70107, 70107),
-    (70109, 70111),
-    (70200, 70205),
-    (70313, 70313),
-    (70731, 70735),
-    (70746, 70747),
-    (70749, 70749),
-    (70854, 70854),
-    (71105, 71127),
-    (71233, 71235),
-    (71264, 71276),
-    (71484, 71486),
-    (71739, 71739),
-    (72004, 72006),
-    (72162, 72162),
-    (72255, 72262),
-    (72346, 72348),
-    (72350, 72354),
-    (72769, 72773),
-    (72816, 72817),
-    (73463, 73464),
-    (73727, 73727),
-    (74864, 74868),
-    (92782, 92783),
-    (92917, 92917),
-    (92983, 92987),
-    (92996, 92996),
-    (93847, 93850),
-    (94178, 94178),
-    (113823, 113823),
-    (121479, 121483),
-    (125278, 125279),
-];
-
-pub const OTHER_SYMBOL: &'static [(u32, u32)] = &[
-    (166, 166),
-    (169, 169),
-    (174, 174),
-    (176, 176),
-    (1154, 1154),
-    (1421, 1422),
-    (1550, 1551),
-    (1758, 1758),
-    (1769, 1769),
-    (1789, 1790),
-    (2038, 2038),
-    (2554, 2554),
-    (2928, 2928),
-    (3059, 3064),
-    (3066, 3066),
-    (3199, 3199),
-    (3407, 3407),
-    (3449, 3449),
-    (3841, 3843),
-    (3859, 3859),
-    (3861, 3863),
-    (3866, 3871),
-    (3892, 3892),
-    (3894, 3894),
-    (3896, 3896),
-    (4030, 4037),
-    (4039, 4044),
-    (4046, 4047),
-    (4053, 4056),
-    (4254, 4255),
-    (5008, 5017),
-    (5741, 5741),
-    (6464, 6464),
-    (6622, 6655),
-    (7009, 7018),
-    (7028, 7036),
-    (8448, 8449),
-    (8451, 8454),
-    (8456, 8457),
-    (8468, 8468),
-    (8470, 8471),
-    (8478, 8483),
-    (8485, 8485),
-    (8487, 8487),
-    (8489, 8489),
-    (8494, 8494),
-    (8506, 8507),
-    (8522, 8522),
-    (8524, 8525),
-    (8527, 8527),
-    (8586, 8587),
-    (8597, 8601),
-    (8604, 8607),
-    (8609, 8610),
-    (8612, 8613),
-    (8615, 8621),
-    (8623, 8653),
-    (8656, 8657),
-    (8659, 8659),
-    (8661, 8691),
-    (8960, 8967),
-    (8972, 8991),
-    (8994, 9000),
-    (9003, 9083),
-    (9085, 9114),
-    (9140, 9179),
-    (9186, 9254),
-    (9280, 9290),
-    (9372, 9449),
-    (9472, 9654),
-    (9656, 9664),
-    (9666, 9719),
-    (9728, 9838),
-    (9840, 10087),
-    (10132, 10175),
-    (10240, 10495),
-    (11008, 11055),
-    (11077, 11078),
-    (11085, 11123),
-    (11126, 11157),
-    (11159, 11263),
-    (11493, 11498),
-    (11856, 11857),
-    (11904, 11929),
-    (11931, 12019),
-    (12032, 12245),
-    (12272, 12283),
-    (12292, 12292),
-    (12306, 12307),
-    (12320, 12320),
-    (12342, 12343),
-    (12350, 12351),
-    (12688, 12689),
-    (12694, 12703),
-    (12736, 12771),
-    (12800, 12830),
-    (12842, 12871),
-    (12880, 12880),
-    (12896, 12927),
-    (12938, 12976),
-    (12992, 13311),
-    (19904, 19967),
-    (42128, 42182),
-    (43048, 43051),
-    (43062, 43063),
-    (43065, 43065),
-    (43639, 43641),
-    (65021, 65021),
-    (65508, 65508),
-    (65512, 65512),
-    (65517, 65518),
-    (65532, 65533),
-    (65847, 65855),
-    (65913, 65929),
-    (65932, 65934),
-    (65936, 65948),
-    (65952, 65952),
-    (66000, 66044),
-    (67703, 67704),
-    (68296, 68296),
-    (71487, 71487),
-    (73685, 73692),
-    (73697, 73713),
-    (92988, 92991),
-    (92997, 92997),
-    (113820, 113820),
-    (118784, 119029),
-    (119040, 119078),
-    (119081, 119140),
-    (119146, 119148),
-    (119171, 119172),
-    (119180, 119209),
-    (119214, 119272),
-    (119296, 119361),
-    (119365, 119365),
-    (119552, 119638),
-    (120832, 121343),
-    (121399, 121402),
-    (121453, 121460),
-    (121462, 121475),
-    (121477, 121478),
-    (123215, 123215),
-    (126124, 126124),
-    (126254, 126254),
-    (126976, 127019),
-    (127024, 127123),
-    (127136, 127150),
-    (127153, 127167),
-    (127169, 127183),
-    (127185, 127221),
-    (127245, 127405),
-    (127462, 127490),
-    (127504, 127547),
-    (127552, 127560),
-    (127568, 127569),
-    (127584, 127589),
-    (127744, 127994),
-    (128000, 128727),
-    (128736, 128748),
-    (128752, 128764),
-    (128768, 128883),
-    (128896, 128984),
-    (128992, 129003),
-    (129024, 129035),
-    (129040, 129095),
-    (129104, 129113),
-    (129120, 129159),
-    (129168, 129197),
-    (129200, 129201),
-    (129280, 129400),
-    (129402, 129483),
-    (129485, 129619),
-    (129632, 129645),
-    (129648, 129652),
-    (129656, 129658),
-    (129664, 129670),
-    (129680, 129704),
-    (129712, 129718),
-    (129728, 129730),
-    (129744, 129750),
-    (129792, 129938),
-    (129940, 129994),
-];
-
-pub const PARAGRAPH_SEPARATOR: &'static [(u32, u32)] = &[(8233, 8233)];
-
-pub const PRIVATE_USE: &'static [(u32, u32)] =
-    &[(57344, 63743), (983040, 1048573), (1048576, 1114109)];
-
-pub const PUNCTUATION: &'static [(u32, u32)] = &[
-    (33, 35),
-    (37, 42),
-    (44, 47),
-    (58, 59),
-    (63, 64),
-    (91, 93),
-    (95, 95),
-    (123, 123),
-    (125, 125),
-    (161, 161),
-    (167, 167),
-    (171, 171),
-    (182, 183),
-    (187, 187),
-    (191, 191),
-    (894, 894),
-    (903, 903),
-    (1370, 1375),
-    (1417, 1418),
-    (1470, 1470),
-    (1472, 1472),
-    (1475, 1475),
-    (1478, 1478),
-    (1523, 1524),
-    (1545, 1546),
-    (1548, 1549),
-    (1563, 1563),
-    (1566, 1567),
-    (1642, 1645),
-    (1748, 1748),
-    (1792, 1805),
-    (2039, 2041),
-    (2096, 2110),
-    (2142, 2142),
-    (2404, 2405),
-    (2416, 2416),
-    (2557, 2557),
-    (2678, 2678),
-    (2800, 2800),
-    (3191, 3191),
-    (3204, 3204),
-    (3572, 3572),
-    (3663, 3663),
-    (3674, 3675),
-    (3844, 3858),
-    (3860, 3860),
-    (3898, 3901),
-    (3973, 3973),
-    (4048, 4052),
-    (4057, 4058),
-    (4170, 4175),
-    (4347, 4347),
-    (4960, 4968),
-    (5120, 5120),
-    (5742, 5742),
-    (5787, 5788),
-    (5867, 5869),
-    (5941, 5942),
-    (6100, 6102),
-    (6104, 6106),
-    (6144, 6154),
-    (6468, 6469),
-    (6686, 6687),
-    (6816, 6822),
-    (6824, 6829),
-    (7002, 7008),
-    (7164, 7167),
-    (7227, 7231),
-    (7294, 7295),
-    (7360, 7367),
-    (7379, 7379),
-    (8208, 8231),
-    (8240, 8259),
-    (8261, 8273),
-    (8275, 8286),
-    (8317, 8318),
-    (8333, 8334),
-    (8968, 8971),
-    (9001, 9002),
-    (10088, 10101),
-    (10181, 10182),
-    (10214, 10223),
-    (10627, 10648),
-    (10712, 10715),
-    (10748, 10749),
-    (11513, 11516),
-    (11518, 11519),
-    (11632, 11632),
-    (11776, 11822),
-    (11824, 11855),
-    (11858, 11858),
-    (12289, 12291),
-    (12296, 12305),
-    (12308, 12319),
-    (12336, 12336),
-    (12349, 12349),
-    (12448, 12448),
-    (12539, 12539),
-    (42238, 42239),
-    (42509, 42511),
-    (42611, 42611),
-    (42622, 42622),
-    (42738, 42743),
-    (43124, 43127),
-    (43214, 43215),
-    (43256, 43258),
-    (43260, 43260),
-    (43310, 43311),
-    (43359, 43359),
-    (43457, 43469),
-    (43486, 43487),
-    (43612, 43615),
-    (43742, 43743),
-    (43760, 43761),
-    (44011, 44011),
-    (64830, 64831),
-    (65040, 65049),
-    (65072, 65106),
-    (65108, 65121),
-    (65123, 65123),
-    (65128, 65128),
-    (65130, 65131),
-    (65281, 65283),
-    (65285, 65290),
-    (65292, 65295),
-    (65306, 65307),
-    (65311, 65312),
-    (65339, 65341),
-    (65343, 65343),
-    (65371, 65371),
-    (65373, 65373),
-    (65375, 65381),
-    (65792, 65794),
-    (66463, 66463),
-    (66512, 66512),
-    (66927, 66927),
-    (67671, 67671),
-    (67871, 67871),
-    (67903, 67903),
-    (68176, 68184),
-    (68223, 68223),
-    (68336, 68342),
-    (68409, 68415),
-    (68505, 68508),
-    (69293, 69293),
-    (69461, 69465),
-    (69703, 69709),
-    (69819, 69820),
-    (69822, 69825),
-    (69952, 69955),
-    (70004, 70005),
-    (70085, 70088),
-    (70093, 70093),
-    (70107, 70107),
-    (70109, 70111),
-    (70200, 70205),
-    (70313, 70313),
-    (70731, 70735),
-    (70746, 70747),
-    (70749, 70749),
-    (70854, 70854),
-    (71105, 71127),
-    (71233, 71235),
-    (71264, 71276),
-    (71484, 71486),
-    (71739, 71739),
-    (72004, 72006),
-    (72162, 72162),
-    (72255, 72262),
-    (72346, 72348),
-    (72350, 72354),
-    (72769, 72773),
-    (72816, 72817),
-    (73463, 73464),
-    (73727, 73727),
-    (74864, 74868),
-    (92782, 92783),
-    (92917, 92917),
-    (92983, 92987),
-    (92996, 92996),
-    (93847, 93850),
-    (94178, 94178),
-    (113823, 113823),
-    (121479, 121483),
-    (125278, 125279),
-];
-
-pub const SEPARATOR: &'static [(u32, u32)] = &[
-    (32, 32),
-    (160, 160),
-    (5760, 5760),
-    (8192, 8202),
-    (8232, 8233),
-    (8239, 8239),
-    (8287, 8287),
-    (12288, 12288),
-];
-
-pub const SPACE_SEPARATOR: &'static [(u32, u32)] = &[
-    (32, 32),
-    (160, 160),
-    (5760, 5760),
-    (8192, 8202),
-    (8239, 8239),
-    (8287, 8287),
-    (12288, 12288),
-];
-
-pub const SPACING_MARK: &'static [(u32, u32)] = &[
-    (2307, 2307),
-    (2363, 2363),
-    (2366, 2368),
-    (2377, 2380),
-    (2382, 2383),
-    (2434, 2435),
-    (2494, 2496),
-    (2503, 2504),
-    (2507, 2508),
-    (2519, 2519),
-    (2563, 2563),
-    (2622, 2624),
-    (2691, 2691),
-    (2750, 2752),
-    (2761, 2761),
-    (2763, 2764),
-    (2818, 2819),
-    (2878, 2878),
-    (2880, 2880),
-    (2887, 2888),
-    (2891, 2892),
-    (2903, 2903),
-    (3006, 3007),
-    (3009, 3010),
-    (3014, 3016),
-    (3018, 3020),
-    (3031, 3031),
-    (3073, 3075),
-    (3137, 3140),
-    (3202, 3203),
-    (3262, 3262),
-    (3264, 3268),
-    (3271, 3272),
-    (3274, 3275),
-    (3285, 3286),
-    (3330, 3331),
-    (3390, 3392),
-    (3398, 3400),
-    (3402, 3404),
-    (3415, 3415),
-    (3458, 3459),
-    (3535, 3537),
-    (3544, 3551),
-    (3570, 3571),
-    (3902, 3903),
-    (3967, 3967),
-    (4139, 4140),
-    (4145, 4145),
-    (4152, 4152),
-    (4155, 4156),
-    (4182, 4183),
-    (4194, 4196),
-    (4199, 4205),
-    (4227, 4228),
-    (4231, 4236),
-    (4239, 4239),
-    (4250, 4252),
-    (6070, 6070),
-    (6078, 6085),
-    (6087, 6088),
-    (6435, 6438),
-    (6441, 6443),
-    (6448, 6449),
-    (6451, 6456),
-    (6681, 6682),
-    (6741, 6741),
-    (6743, 6743),
-    (6753, 6753),
-    (6755, 6756),
-    (6765, 6770),
-    (6916, 6916),
-    (6965, 6965),
-    (6971, 6971),
-    (6973, 6977),
-    (6979, 6980),
-    (7042, 7042),
-    (7073, 7073),
-    (7078, 7079),
-    (7082, 7082),
-    (7143, 7143),
-    (7146, 7148),
-    (7150, 7150),
-    (7154, 7155),
-    (7204, 7211),
-    (7220, 7221),
-    (7393, 7393),
-    (7415, 7415),
-    (12334, 12335),
-    (43043, 43044),
-    (43047, 43047),
-    (43136, 43137),
-    (43188, 43203),
-    (43346, 43347),
-    (43395, 43395),
-    (43444, 43445),
-    (43450, 43451),
-    (43454, 43456),
-    (43567, 43568),
-    (43571, 43572),
-    (43597, 43597),
-    (43643, 43643),
-    (43645, 43645),
-    (43755, 43755),
-    (43758, 43759),
-    (43765, 43765),
-    (44003, 44004),
-    (44006, 44007),
-    (44009, 44010),
-    (44012, 44012),
-    (69632, 69632),
-    (69634, 69634),
-    (69762, 69762),
-    (69808, 69810),
-    (69815, 69816),
-    (69932, 69932),
-    (69957, 69958),
-    (70018, 70018),
-    (70067, 70069),
-    (70079, 70080),
-    (70094, 70094),
-    (70188, 70190),
-    (70194, 70195),
-    (70197, 70197),
-    (70368, 70370),
-    (70402, 70403),
-    (70462, 70463),
-    (70465, 70468),
-    (70471, 70472),
-    (70475, 70477),
-    (70487, 70487),
-    (70498, 70499),
-    (70709, 70711),
-    (70720, 70721),
-    (70725, 70725),
-    (70832, 70834),
-    (70841, 70841),
-    (70843, 70846),
-    (70849, 70849),
-    (71087, 71089),
-    (71096, 71099),
-    (71102, 71102),
-    (71216, 71218),
-    (71227, 71228),
-    (71230, 71230),
-    (71340, 71340),
-    (71342, 71343),
-    (71350, 71350),
-    (71456, 71457),
-    (71462, 71462),
-    (71724, 71726),
-    (71736, 71736),
-    (71984, 71989),
-    (71991, 71992),
-    (71997, 71997),
-    (72000, 72000),
-    (72002, 72002),
-    (72145, 72147),
-    (72156, 72159),
-    (72164, 72164),
-    (72249, 72249),
-    (72279, 72280),
-    (72343, 72343),
-    (72751, 72751),
-    (72766, 72766),
-    (72873, 72873),
-    (72881, 72881),
-    (72884, 72884),
-    (73098, 73102),
-    (73107, 73108),
-    (73110, 73110),
-    (73461, 73462),
-    (94033, 94087),
-    (94192, 94193),
-    (119141, 119142),
-    (119149, 119154),
-];
-
-pub const SURROGATE: &'static [(u32, u32)] = &[(55296, 57343)];
-
-pub const SYMBOL: &'static [(u32, u32)] = &[
-    (36, 36),
-    (43, 43),
-    (60, 62),
-    (94, 94),
-    (96, 96),
-    (124, 124),
-    (126, 126),
-    (162, 166),
-    (168, 169),
-    (172, 172),
-    (174, 177),
-    (180, 180),
-    (184, 184),
-    (215, 215),
-    (247, 247),
-    (706, 709),
-    (722, 735),
-    (741, 747),
-    (749, 749),
-    (751, 767),
-    (885, 885),
-    (900, 901),
-    (1014, 1014),
-    (1154, 1154),
-    (1421, 1423),
-    (1542, 1544),
-    (1547, 1547),
-    (1550, 1551),
-    (1758, 1758),
-    (1769, 1769),
-    (1789, 1790),
-    (2038, 2038),
-    (2046, 2047),
-    (2546, 2547),
-    (2554, 2555),
-    (2801, 2801),
-    (2928, 2928),
-    (3059, 3066),
-    (3199, 3199),
-    (3407, 3407),
-    (3449, 3449),
-    (3647, 3647),
-    (3841, 3843),
-    (3859, 3859),
-    (3861, 3863),
-    (3866, 3871),
-    (3892, 3892),
-    (3894, 3894),
-    (3896, 3896),
-    (4030, 4037),
-    (4039, 4044),
-    (4046, 4047),
-    (4053, 4056),
-    (4254, 4255),
-    (5008, 5017),
-    (5741, 5741),
-    (6107, 6107),
-    (6464, 6464),
-    (6622, 6655),
-    (7009, 7018),
-    (7028, 7036),
-    (8125, 8125),
-    (8127, 8129),
-    (8141, 8143),
-    (8157, 8159),
-    (8173, 8175),
-    (8189, 8190),
-    (8260, 8260),
-    (8274, 8274),
-    (8314, 8316),
-    (8330, 8332),
-    (8352, 8383),
-    (8448, 8449),
-    (8451, 8454),
-    (8456, 8457),
-    (8468, 8468),
-    (8470, 8472),
-    (8478, 8483),
-    (8485, 8485),
-    (8487, 8487),
-    (8489, 8489),
-    (8494, 8494),
-    (8506, 8507),
-    (8512, 8516),
-    (8522, 8525),
-    (8527, 8527),
-    (8586, 8587),
-    (8592, 8967),
-    (8972, 9000),
-    (9003, 9254),
-    (9280, 9290),
-    (9372, 9449),
-    (9472, 10087),
-    (10132, 10180),
-    (10183, 10213),
-    (10224, 10626),
-    (10649, 10711),
-    (10716, 10747),
-    (10750, 11123),
-    (11126, 11157),
-    (11159, 11263),
-    (11493, 11498),
-    (11856, 11857),
-    (11904, 11929),
-    (11931, 12019),
-    (12032, 12245),
-    (12272, 12283),
-    (12292, 12292),
-    (12306, 12307),
-    (12320, 12320),
-    (12342, 12343),
-    (12350, 12351),
-    (12443, 12444),
-    (12688, 12689),
-    (12694, 12703),
-    (12736, 12771),
-    (12800, 12830),
-    (12842, 12871),
-    (12880, 12880),
-    (12896, 12927),
-    (12938, 12976),
-    (12992, 13311),
-    (19904, 19967),
-    (42128, 42182),
-    (42752, 42774),
-    (42784, 42785),
-    (42889, 42890),
-    (43048, 43051),
-    (43062, 43065),
-    (43639, 43641),
-    (43867, 43867),
-    (43882, 43883),
-    (64297, 64297),
-    (64434, 64449),
-    (65020, 65021),
-    (65122, 65122),
-    (65124, 65126),
-    (65129, 65129),
-    (65284, 65284),
-    (65291, 65291),
-    (65308, 65310),
-    (65342, 65342),
-    (65344, 65344),
-    (65372, 65372),
-    (65374, 65374),
-    (65504, 65510),
-    (65512, 65518),
-    (65532, 65533),
-    (65847, 65855),
-    (65913, 65929),
-    (65932, 65934),
-    (65936, 65948),
-    (65952, 65952),
-    (66000, 66044),
-    (67703, 67704),
-    (68296, 68296),
-    (71487, 71487),
-    (73685, 73713),
-    (92988, 92991),
-    (92997, 92997),
-    (113820, 113820),
-    (118784, 119029),
-    (119040, 119078),
-    (119081, 119140),
-    (119146, 119148),
-    (119171, 119172),
-    (119180, 119209),
-    (119214, 119272),
-    (119296, 119361),
-    (119365, 119365),
-    (119552, 119638),
-    (120513, 120513),
-    (120539, 120539),
-    (120571, 120571),
-    (120597, 120597),
-    (120629, 120629),
-    (120655, 120655),
-    (120687, 120687),
-    (120713, 120713),
-    (120745, 120745),
-    (120771, 120771),
-    (120832, 121343),
-    (121399, 121402),
-    (121453, 121460),
-    (121462, 121475),
-    (121477, 121478),
-    (123215, 123215),
-    (123647, 123647),
-    (126124, 126124),
-    (126128, 126128),
-    (126254, 126254),
-    (126704, 126705),
-    (126976, 127019),
-    (127024, 127123),
-    (127136, 127150),
-    (127153, 127167),
-    (127169, 127183),
-    (127185, 127221),
-    (127245, 127405),
-    (127462, 127490),
-    (127504, 127547),
-    (127552, 127560),
-    (127568, 127569),
-    (127584, 127589),
-    (127744, 128727),
-    (128736, 128748),
-    (128752, 128764),
-    (128768, 128883),
-    (128896, 128984),
-    (128992, 129003),
-    (129024, 129035),
-    (129040, 129095),
-    (129104, 129113),
-    (129120, 129159),
-    (129168, 129197),
-    (129200, 129201),
-    (129280, 129400),
-    (129402, 129483),
-    (129485, 129619),
-    (129632, 129645),
-    (129648, 129652),
-    (129656, 129658),
-    (129664, 129670),
-    (129680, 129704),
-    (129712, 129718),
-    (129728, 129730),
-    (129744, 129750),
-    (129792, 129938),
-    (129940, 129994),
-];
-
-pub const TITLECASE_LETTER: &'static [(u32, u32)] = &[
-    (453, 453),
-    (456, 456),
-    (459, 459),
-    (498, 498),
-    (8072, 8079),
-    (8088, 8095),
-    (8104, 8111),
-    (8124, 8124),
-    (8140, 8140),
-    (8188, 8188),
-];
-
-pub const UNASSIGNED: &'static [(u32, u32)] = &[
-    (888, 889),
-    (896, 899),
-    (907, 907),
-    (909, 909),
-    (930, 930),
-    (1328, 1328),
-    (1367, 1368),
-    (1419, 1420),
-    (1424, 1424),
-    (1480, 1487),
-    (1515, 1518),
-    (1525, 1535),
-    (1565, 1565),
-    (1806, 1806),
-    (1867, 1868),
-    (1970, 1983),
-    (2043, 2044),
-    (2094, 2095),
-    (2111, 2111),
-    (2140, 2141),
-    (2143, 2143),
-    (2155, 2207),
-    (2229, 2229),
-    (2248, 2258),
-    (2436, 2436),
-    (2445, 2446),
-    (2449, 2450),
-    (2473, 2473),
-    (2481, 2481),
-    (2483, 2485),
-    (2490, 2491),
-    (2501, 2502),
-    (2505, 2506),
-    (2511, 2518),
-    (2520, 2523),
-    (2526, 2526),
-    (2532, 2533),
-    (2559, 2560),
-    (2564, 2564),
-    (2571, 2574),
-    (2577, 2578),
-    (2601, 2601),
-    (2609, 2609),
-    (2612, 2612),
-    (2615, 2615),
-    (2618, 2619),
-    (2621, 2621),
-    (2627, 2630),
-    (2633, 2634),
-    (2638, 2640),
-    (2642, 2648),
-    (2653, 2653),
-    (2655, 2661),
-    (2679, 2688),
-    (2692, 2692),
-    (2702, 2702),
-    (2706, 2706),
-    (2729, 2729),
-    (2737, 2737),
-    (2740, 2740),
-    (2746, 2747),
-    (2758, 2758),
-    (2762, 2762),
-    (2766, 2767),
-    (2769, 2783),
-    (2788, 2789),
-    (2802, 2808),
-    (2816, 2816),
-    (2820, 2820),
-    (2829, 2830),
-    (2833, 2834),
-    (2857, 2857),
-    (2865, 2865),
-    (2868, 2868),
-    (2874, 2875),
-    (2885, 2886),
-    (2889, 2890),
-    (2894, 2900),
-    (2904, 2907),
-    (2910, 2910),
-    (2916, 2917),
-    (2936, 2945),
-    (2948, 2948),
-    (2955, 2957),
-    (2961, 2961),
-    (2966, 2968),
-    (2971, 2971),
-    (2973, 2973),
-    (2976, 2978),
-    (2981, 2983),
-    (2987, 2989),
-    (3002, 3005),
-    (3011, 3013),
-    (3017, 3017),
-    (3022, 3023),
-    (3025, 3030),
-    (3032, 3045),
-    (3067, 3071),
-    (3085, 3085),
-    (3089, 3089),
-    (3113, 3113),
-    (3130, 3132),
-    (3141, 3141),
-    (3145, 3145),
-    (3150, 3156),
-    (3159, 3159),
-    (3163, 3167),
-    (3172, 3173),
-    (3184, 3190),
-    (3213, 3213),
-    (3217, 3217),
-    (3241, 3241),
-    (3252, 3252),
-    (3258, 3259),
-    (3269, 3269),
-    (3273, 3273),
-    (3278, 3284),
-    (3287, 3293),
-    (3295, 3295),
-    (3300, 3301),
-    (3312, 3312),
-    (3315, 3327),
-    (3341, 3341),
-    (3345, 3345),
-    (3397, 3397),
-    (3401, 3401),
-    (3408, 3411),
-    (3428, 3429),
-    (3456, 3456),
-    (3460, 3460),
-    (3479, 3481),
-    (3506, 3506),
-    (3516, 3516),
-    (3518, 3519),
-    (3527, 3529),
-    (3531, 3534),
-    (3541, 3541),
-    (3543, 3543),
-    (3552, 3557),
-    (3568, 3569),
-    (3573, 3584),
-    (3643, 3646),
-    (3676, 3712),
-    (3715, 3715),
-    (3717, 3717),
-    (3723, 3723),
-    (3748, 3748),
-    (3750, 3750),
-    (3774, 3775),
-    (3781, 3781),
-    (3783, 3783),
-    (3790, 3791),
-    (3802, 3803),
-    (3808, 3839),
-    (3912, 3912),
-    (3949, 3952),
-    (3992, 3992),
-    (4029, 4029),
-    (4045, 4045),
-    (4059, 4095),
-    (4294, 4294),
-    (4296, 4300),
-    (4302, 4303),
-    (4681, 4681),
-    (4686, 4687),
-    (4695, 4695),
-    (4697, 4697),
-    (4702, 4703),
-    (4745, 4745),
-    (4750, 4751),
-    (4785, 4785),
-    (4790, 4791),
-    (4799, 4799),
-    (4801, 4801),
-    (4806, 4807),
-    (4823, 4823),
-    (4881, 4881),
-    (4886, 4887),
-    (4955, 4956),
-    (4989, 4991),
-    (5018, 5023),
-    (5110, 5111),
-    (5118, 5119),
-    (5789, 5791),
-    (5881, 5887),
-    (5901, 5901),
-    (5909, 5919),
-    (5943, 5951),
-    (5972, 5983),
-    (5997, 5997),
-    (6001, 6001),
-    (6004, 6015),
-    (6110, 6111),
-    (6122, 6127),
-    (6138, 6143),
-    (6159, 6159),
-    (6170, 6175),
-    (6265, 6271),
-    (6315, 6319),
-    (6390, 6399),
-    (6431, 6431),
-    (6444, 6447),
-    (6460, 6463),
-    (6465, 6467),
-    (6510, 6511),
-    (6517, 6527),
-    (6572, 6575),
-    (6602, 6607),
-    (6619, 6621),
-    (6684, 6685),
-    (6751, 6751),
-    (6781, 6782),
-    (6794, 6799),
-    (6810, 6815),
-    (6830, 6831),
-    (6849, 6911),
-    (6988, 6991),
-    (7037, 7039),
-    (7156, 7163),
-    (7224, 7226),
-    (7242, 7244),
-    (7305, 7311),
-    (7355, 7356),
-    (7368, 7375),
-    (7419, 7423),
-    (7674, 7674),
-    (7958, 7959),
-    (7966, 7967),
-    (8006, 8007),
-    (8014, 8015),
-    (8024, 8024),
-    (8026, 8026),
-    (8028, 8028),
-    (8030, 8030),
-    (8062, 8063),
-    (8117, 8117),
-    (8133, 8133),
-    (8148, 8149),
-    (8156, 8156),
-    (8176, 8177),
-    (8181, 8181),
-    (8191, 8191),
-    (8293, 8293),
-    (8306, 8307),
-    (8335, 8335),
-    (8349, 8351),
-    (8384, 8399),
-    (8433, 8447),
-    (8588, 8591),
-    (9255, 9279),
-    (9291, 9311),
-    (11124, 11125),
-    (11158, 11158),
-    (11311, 11311),
-    (11359, 11359),
-    (11508, 11512),
-    (11558, 11558),
-    (11560, 11564),
-    (11566, 11567),
-    (11624, 11630),
-    (11633, 11646),
-    (11671, 11679),
-    (11687, 11687),
-    (11695, 11695),
-    (11703, 11703),
-    (11711, 11711),
-    (11719, 11719),
-    (11727, 11727),
-    (11735, 11735),
-    (11743, 11743),
-    (11859, 11903),
-    (11930, 11930),
-    (12020, 12031),
-    (12246, 12271),
-    (12284, 12287),
-    (12352, 12352),
-    (12439, 12440),
-    (12544, 12548),
-    (12592, 12592),
-    (12687, 12687),
-    (12772, 12783),
-    (12831, 12831),
-    (40957, 40959),
-    (42125, 42127),
-    (42183, 42191),
-    (42540, 42559),
-    (42744, 42751),
-    (42944, 42945),
-    (42955, 42996),
-    (43053, 43055),
-    (43066, 43071),
-    (43128, 43135),
-    (43206, 43213),
-    (43226, 43231),
-    (43348, 43358),
-    (43389, 43391),
-    (43470, 43470),
-    (43482, 43485),
-    (43519, 43519),
-    (43575, 43583),
-    (43598, 43599),
-    (43610, 43611),
-    (43715, 43738),
-    (43767, 43776),
-    (43783, 43784),
-    (43791, 43792),
-    (43799, 43807),
-    (43815, 43815),
-    (43823, 43823),
-    (43884, 43887),
-    (44014, 44015),
-    (44026, 44031),
-    (55204, 55215),
-    (55239, 55242),
-    (55292, 55295),
-    (64110, 64111),
-    (64218, 64255),
-    (64263, 64274),
-    (64280, 64284),
-    (64311, 64311),
-    (64317, 64317),
-    (64319, 64319),
-    (64322, 64322),
-    (64325, 64325),
-    (64450, 64466),
-    (64832, 64847),
-    (64912, 64913),
-    (64968, 65007),
-    (65022, 65023),
-    (65050, 65055),
-    (65107, 65107),
-    (65127, 65127),
-    (65132, 65135),
-    (65141, 65141),
-    (65277, 65278),
-    (65280, 65280),
-    (65471, 65473),
-    (65480, 65481),
-    (65488, 65489),
-    (65496, 65497),
-    (65501, 65503),
-    (65511, 65511),
-    (65519, 65528),
-    (65534, 65535),
-    (65548, 65548),
-    (65575, 65575),
-    (65595, 65595),
-    (65598, 65598),
-    (65614, 65615),
-    (65630, 65663),
-    (65787, 65791),
-    (65795, 65798),
-    (65844, 65846),
-    (65935, 65935),
-    (65949, 65951),
-    (65953, 65999),
-    (66046, 66175),
-    (66205, 66207),
-    (66257, 66271),
-    (66300, 66303),
-    (66340, 66348),
-    (66379, 66383),
-    (66427, 66431),
-    (66462, 66462),
-    (66500, 66503),
-    (66518, 66559),
-    (66718, 66719),
-    (66730, 66735),
-    (66772, 66775),
-    (66812, 66815),
-    (66856, 66863),
-    (66916, 66926),
-    (66928, 67071),
-    (67383, 67391),
-    (67414, 67423),
-    (67432, 67583),
-    (67590, 67591),
-    (67593, 67593),
-    (67638, 67638),
-    (67641, 67643),
-    (67645, 67646),
-    (67670, 67670),
-    (67743, 67750),
-    (67760, 67807),
-    (67827, 67827),
-    (67830, 67834),
-    (67868, 67870),
-    (67898, 67902),
-    (67904, 67967),
-    (68024, 68027),
-    (68048, 68049),
-    (68100, 68100),
-    (68103, 68107),
-    (68116, 68116),
-    (68120, 68120),
-    (68150, 68151),
-    (68155, 68158),
-    (68169, 68175),
-    (68185, 68191),
-    (68256, 68287),
-    (68327, 68330),
-    (68343, 68351),
-    (68406, 68408),
-    (68438, 68439),
-    (68467, 68471),
-    (68498, 68504),
-    (68509, 68520),
-    (68528, 68607),
-    (68681, 68735),
-    (68787, 68799),
-    (68851, 68857),
-    (68904, 68911),
-    (68922, 69215),
-    (69247, 69247),
-    (69290, 69290),
-    (69294, 69295),
-    (69298, 69375),
-    (69416, 69423),
-    (69466, 69551),
-    (69580, 69599),
-    (69623, 69631),
-    (69710, 69713),
-    (69744, 69758),
-    (69826, 69836),
-    (69838, 69839),
-    (69865, 69871),
-    (69882, 69887),
-    (69941, 69941),
-    (69960, 69967),
-    (70007, 70015),
-    (70112, 70112),
-    (70133, 70143),
-    (70162, 70162),
-    (70207, 70271),
-    (70279, 70279),
-    (70281, 70281),
-    (70286, 70286),
-    (70302, 70302),
-    (70314, 70319),
-    (70379, 70383),
-    (70394, 70399),
-    (70404, 70404),
-    (70413, 70414),
-    (70417, 70418),
-    (70441, 70441),
-    (70449, 70449),
-    (70452, 70452),
-    (70458, 70458),
-    (70469, 70470),
-    (70473, 70474),
-    (70478, 70479),
-    (70481, 70486),
-    (70488, 70492),
-    (70500, 70501),
-    (70509, 70511),
-    (70517, 70655),
-    (70748, 70748),
-    (70754, 70783),
-    (70856, 70863),
-    (70874, 71039),
-    (71094, 71095),
-    (71134, 71167),
-    (71237, 71247),
-    (71258, 71263),
-    (71277, 71295),
-    (71353, 71359),
-    (71370, 71423),
-    (71451, 71452),
-    (71468, 71471),
-    (71488, 71679),
-    (71740, 71839),
-    (71923, 71934),
-    (71943, 71944),
-    (71946, 71947),
-    (71956, 71956),
-    (71959, 71959),
-    (71990, 71990),
-    (71993, 71994),
-    (72007, 72015),
-    (72026, 72095),
-    (72104, 72105),
-    (72152, 72153),
-    (72165, 72191),
-    (72264, 72271),
-    (72355, 72383),
-    (72441, 72703),
-    (72713, 72713),
-    (72759, 72759),
-    (72774, 72783),
-    (72813, 72815),
-    (72848, 72849),
-    (72872, 72872),
-    (72887, 72959),
-    (72967, 72967),
-    (72970, 72970),
-    (73015, 73017),
-    (73019, 73019),
-    (73022, 73022),
-    (73032, 73039),
-    (73050, 73055),
-    (73062, 73062),
-    (73065, 73065),
-    (73103, 73103),
-    (73106, 73106),
-    (73113, 73119),
-    (73130, 73439),
-    (73465, 73647),
-    (73649, 73663),
-    (73714, 73726),
-    (74650, 74751),
-    (74863, 74863),
-    (74869, 74879),
-    (75076, 77823),
-    (78895, 78895),
-    (78905, 82943),
-    (83527, 92159),
-    (92729, 92735),
-    (92767, 92767),
-    (92778, 92781),
-    (92784, 92879),
-    (92910, 92911),
-    (92918, 92927),
-    (92998, 93007),
-    (93018, 93018),
-    (93026, 93026),
-    (93048, 93052),
-    (93072, 93759),
-    (93851, 93951),
-    (94027, 94030),
-    (94088, 94094),
-    (94112, 94175),
-    (94181, 94191),
-    (94194, 94207),
-    (100344, 100351),
-    (101590, 101631),
-    (101641, 110591),
-    (110879, 110927),
-    (110931, 110947),
-    (110952, 110959),
-    (111356, 113663),
-    (113771, 113775),
-    (113789, 113791),
-    (113801, 113807),
-    (113818, 113819),
-    (113828, 118783),
-    (119030, 119039),
-    (119079, 119080),
-    (119273, 119295),
-    (119366, 119519),
-    (119540, 119551),
-    (119639, 119647),
-    (119673, 119807),
-    (119893, 119893),
-    (119965, 119965),
-    (119968, 119969),
-    (119971, 119972),
-    (119975, 119976),
-    (119981, 119981),
-    (119994, 119994),
-    (119996, 119996),
-    (120004, 120004),
-    (120070, 120070),
-    (120075, 120076),
-    (120085, 120085),
-    (120093, 120093),
-    (120122, 120122),
-    (120127, 120127),
-    (120133, 120133),
-    (120135, 120137),
-    (120145, 120145),
-    (120486, 120487),
-    (120780, 120781),
-    (121484, 121498),
-    (121504, 121504),
-    (121520, 122879),
-    (122887, 122887),
-    (122905, 122906),
-    (122914, 122914),
-    (122917, 122917),
-    (122923, 123135),
-    (123181, 123183),
-    (123198, 123199),
-    (123210, 123213),
-    (123216, 123583),
-    (123642, 123646),
-    (123648, 124927),
-    (125125, 125126),
-    (125143, 125183),
-    (125260, 125263),
-    (125274, 125277),
-    (125280, 126064),
-    (126133, 126208),
-    (126270, 126463),
-    (126468, 126468),
-    (126496, 126496),
-    (126499, 126499),
-    (126501, 126502),
-    (126504, 126504),
-    (126515, 126515),
-    (126520, 126520),
-    (126522, 126522),
-    (126524, 126529),
-    (126531, 126534),
-    (126536, 126536),
-    (126538, 126538),
-    (126540, 126540),
-    (126544, 126544),
-    (126547, 126547),
-    (126549, 126550),
-    (126552, 126552),
-    (126554, 126554),
-    (126556, 126556),
-    (126558, 126558),
-    (126560, 126560),
-    (126563, 126563),
-    (126565, 126566),
-    (126571, 126571),
-    (126579, 126579),
-    (126584, 126584),
-    (126589, 126589),
-    (126591, 126591),
-    (126602, 126602),
-    (126620, 126624),
-    (126628, 126628),
-    (126634, 126634),
-    (126652, 126703),
-    (126706, 126975),
-    (127020, 127023),
-    (127124, 127135),
-    (127151, 127152),
-    (127168, 127168),
-    (127184, 127184),
-    (127222, 127231),
-    (127406, 127461),
-    (127491, 127503),
-    (127548, 127551),
-    (127561, 127567),
-    (127570, 127583),
-    (127590, 127743),
-    (128728, 128735),
-    (128749, 128751),
-    (128765, 128767),
-    (128884, 128895),
-    (128985, 128991),
-    (129004, 129023),
-    (129036, 129039),
-    (129096, 129103),
-    (129114, 129119),
-    (129160, 129167),
-    (129198, 129199),
-    (129202, 129279),
-    (129401, 129401),
-    (129484, 129484),
-    (129620, 129631),
-    (129646, 129647),
-    (129653, 129655),
-    (129659, 129663),
-    (129671, 129679),
-    (129705, 129711),
-    (129719, 129727),
-    (129731, 129743),
-    (129751, 129791),
-    (129939, 129939),
-    (129995, 130031),
-    (130042, 131071),
-    (173790, 173823),
-    (177973, 177983),
-    (178206, 178207),
-    (183970, 183983),
-    (191457, 194559),
-    (195102, 196607),
-    (201547, 917504),
-    (917506, 917535),
-    (917632, 917759),
-    (918000, 983039),
-    (1048574, 1048575),
-    (1114110, 1114111),
-];
-
-pub const UPPERCASE_LETTER: &'static [(u32, u32)] = &[
-    (65, 90),
-    (192, 214),
-    (216, 222),
-    (256, 256),
-    (258, 258),
-    (260, 260),
-    (262, 262),
-    (264, 264),
-    (266, 266),
-    (268, 268),
-    (270, 270),
-    (272, 272),
-    (274, 274),
-    (276, 276),
-    (278, 278),
-    (280, 280),
-    (282, 282),
-    (284, 284),
-    (286, 286),
-    (288, 288),
-    (290, 290),
-    (292, 292),
-    (294, 294),
-    (296, 296),
-    (298, 298),
-    (300, 300),
-    (302, 302),
-    (304, 304),
-    (306, 306),
-    (308, 308),
-    (310, 310),
-    (313, 313),
-    (315, 315),
-    (317, 317),
-    (319, 319),
-    (321, 321),
-    (323, 323),
-    (325, 325),
-    (327, 327),
-    (330, 330),
-    (332, 332),
-    (334, 334),
-    (336, 336),
-    (338, 338),
-    (340, 340),
-    (342, 342),
-    (344, 344),
-    (346, 346),
-    (348, 348),
-    (350, 350),
-    (352, 352),
-    (354, 354),
-    (356, 356),
-    (358, 358),
-    (360, 360),
-    (362, 362),
-    (364, 364),
-    (366, 366),
-    (368, 368),
-    (370, 370),
-    (372, 372),
-    (374, 374),
-    (376, 377),
-    (379, 379),
-    (381, 381),
-    (385, 386),
-    (388, 388),
-    (390, 391),
-    (393, 395),
-    (398, 401),
-    (403, 404),
-    (406, 408),
-    (412, 413),
-    (415, 416),
-    (418, 418),
-    (420, 420),
-    (422, 423),
-    (425, 425),
-    (428, 428),
-    (430, 431),
-    (433, 435),
-    (437, 437),
-    (439, 440),
-    (444, 444),
-    (452, 452),
-    (455, 455),
-    (458, 458),
-    (461, 461),
-    (463, 463),
-    (465, 465),
-    (467, 467),
-    (469, 469),
-    (471, 471),
-    (473, 473),
-    (475, 475),
-    (478, 478),
-    (480, 480),
-    (482, 482),
-    (484, 484),
-    (486, 486),
-    (488, 488),
-    (490, 490),
-    (492, 492),
-    (494, 494),
-    (497, 497),
-    (500, 500),
-    (502, 504),
-    (506, 506),
-    (508, 508),
-    (510, 510),
-    (512, 512),
-    (514, 514),
-    (516, 516),
-    (518, 518),
-    (520, 520),
-    (522, 522),
-    (524, 524),
-    (526, 526),
-    (528, 528),
-    (530, 530),
-    (532, 532),
-    (534, 534),
-    (536, 536),
-    (538, 538),
-    (540, 540),
-    (542, 542),
-    (544, 544),
-    (546, 546),
-    (548, 548),
-    (550, 550),
-    (552, 552),
-    (554, 554),
-    (556, 556),
-    (558, 558),
-    (560, 560),
-    (562, 562),
-    (570, 571),
-    (573, 574),
-    (577, 577),
-    (579, 582),
-    (584, 584),
-    (586, 586),
-    (588, 588),
-    (590, 590),
-    (880, 880),
-    (882, 882),
-    (886, 886),
-    (895, 895),
-    (902, 902),
-    (904, 906),
-    (908, 908),
-    (910, 911),
-    (913, 929),
-    (931, 939),
-    (975, 975),
-    (978, 980),
-    (984, 984),
-    (986, 986),
-    (988, 988),
-    (990, 990),
-    (992, 992),
-    (994, 994),
-    (996, 996),
-    (998, 998),
-    (1000, 1000),
-    (1002, 1002),
-    (1004, 1004),
-    (1006, 1006),
-    (1012, 1012),
-    (1015, 1015),
-    (1017, 1018),
-    (1021, 1071),
-    (1120, 1120),
-    (1122, 1122),
-    (1124, 1124),
-    (1126, 1126),
-    (1128, 1128),
-    (1130, 1130),
-    (1132, 1132),
-    (1134, 1134),
-    (1136, 1136),
-    (1138, 1138),
-    (1140, 1140),
-    (1142, 1142),
-    (1144, 1144),
-    (1146, 1146),
-    (1148, 1148),
-    (1150, 1150),
-    (1152, 1152),
-    (1162, 1162),
-    (1164, 1164),
-    (1166, 1166),
-    (1168, 1168),
-    (1170, 1170),
-    (1172, 1172),
-    (1174, 1174),
-    (1176, 1176),
-    (1178, 1178),
-    (1180, 1180),
-    (1182, 1182),
-    (1184, 1184),
-    (1186, 1186),
-    (1188, 1188),
-    (1190, 1190),
-    (1192, 1192),
-    (1194, 1194),
-    (1196, 1196),
-    (1198, 1198),
-    (1200, 1200),
-    (1202, 1202),
-    (1204, 1204),
-    (1206, 1206),
-    (1208, 1208),
-    (1210, 1210),
-    (1212, 1212),
-    (1214, 1214),
-    (1216, 1217),
-    (1219, 1219),
-    (1221, 1221),
-    (1223, 1223),
-    (1225, 1225),
-    (1227, 1227),
-    (1229, 1229),
-    (1232, 1232),
-    (1234, 1234),
-    (1236, 1236),
-    (1238, 1238),
-    (1240, 1240),
-    (1242, 1242),
-    (1244, 1244),
-    (1246, 1246),
-    (1248, 1248),
-    (1250, 1250),
-    (1252, 1252),
-    (1254, 1254),
-    (1256, 1256),
-    (1258, 1258),
-    (1260, 1260),
-    (1262, 1262),
-    (1264, 1264),
-    (1266, 1266),
-    (1268, 1268),
-    (1270, 1270),
-    (1272, 1272),
-    (1274, 1274),
-    (1276, 1276),
-    (1278, 1278),
-    (1280, 1280),
-    (1282, 1282),
-    (1284, 1284),
-    (1286, 1286),
-    (1288, 1288),
-    (1290, 1290),
-    (1292, 1292),
-    (1294, 1294),
-    (1296, 1296),
-    (1298, 1298),
-    (1300, 1300),
-    (1302, 1302),
-    (1304, 1304),
-    (1306, 1306),
-    (1308, 1308),
-    (1310, 1310),
-    (1312, 1312),
-    (1314, 1314),
-    (1316, 1316),
-    (1318, 1318),
-    (1320, 1320),
-    (1322, 1322),
-    (1324, 1324),
-    (1326, 1326),
-    (1329, 1366),
-    (4256, 4293),
-    (4295, 4295),
-    (4301, 4301),
-    (5024, 5109),
-    (7312, 7354),
-    (7357, 7359),
-    (7680, 7680),
-    (7682, 7682),
-    (7684, 7684),
-    (7686, 7686),
-    (7688, 7688),
-    (7690, 7690),
-    (7692, 7692),
-    (7694, 7694),
-    (7696, 7696),
-    (7698, 7698),
-    (7700, 7700),
-    (7702, 7702),
-    (7704, 7704),
-    (7706, 7706),
-    (7708, 7708),
-    (7710, 7710),
-    (7712, 7712),
-    (7714, 7714),
-    (7716, 7716),
-    (7718, 7718),
-    (7720, 7720),
-    (7722, 7722),
-    (7724, 7724),
-    (7726, 7726),
-    (7728, 7728),
-    (7730, 7730),
-    (7732, 7732),
-    (7734, 7734),
-    (7736, 7736),
-    (7738, 7738),
-    (7740, 7740),
-    (7742, 7742),
-    (7744, 7744),
-    (7746, 7746),
-    (7748, 7748),
-    (7750, 7750),
-    (7752, 7752),
-    (7754, 7754),
-    (7756, 7756),
-    (7758, 7758),
-    (7760, 7760),
-    (7762, 7762),
-    (7764, 7764),
-    (7766, 7766),
-    (7768, 7768),
-    (7770, 7770),
-    (7772, 7772),
-    (7774, 7774),
-    (7776, 7776),
-    (7778, 7778),
-    (7780, 7780),
-    (7782, 7782),
-    (7784, 7784),
-    (7786, 7786),
-    (7788, 7788),
-    (7790, 7790),
-    (7792, 7792),
-    (7794, 7794),
-    (7796, 7796),
-    (7798, 7798),
-    (7800, 7800),
-    (7802, 7802),
-    (7804, 7804),
-    (7806, 7806),
-    (7808, 7808),
-    (7810, 7810),
-    (7812, 7812),
-    (7814, 7814),
-    (7816, 7816),
-    (7818, 7818),
-    (7820, 7820),
-    (7822, 7822),
-    (7824, 7824),
-    (7826, 7826),
-    (7828, 7828),
-    (7838, 7838),
-    (7840, 7840),
-    (7842, 7842),
-    (7844, 7844),
-    (7846, 7846),
-    (7848, 7848),
-    (7850, 7850),
-    (7852, 7852),
-    (7854, 7854),
-    (7856, 7856),
-    (7858, 7858),
-    (7860, 7860),
-    (7862, 7862),
-    (7864, 7864),
-    (7866, 7866),
-    (7868, 7868),
-    (7870, 7870),
-    (7872, 7872),
-    (7874, 7874),
-    (7876, 7876),
-    (7878, 7878),
-    (7880, 7880),
-    (7882, 7882),
-    (7884, 7884),
-    (7886, 7886),
-    (7888, 7888),
-    (7890, 7890),
-    (7892, 7892),
-    (7894, 7894),
-    (7896, 7896),
-    (7898, 7898),
-    (7900, 7900),
-    (7902, 7902),
-    (7904, 7904),
-    (7906, 7906),
-    (7908, 7908),
-    (7910, 7910),
-    (7912, 7912),
-    (7914, 7914),
-    (7916, 7916),
-    (7918, 7918),
-    (7920, 7920),
-    (7922, 7922),
-    (7924, 7924),
-    (7926, 7926),
-    (7928, 7928),
-    (7930, 7930),
-    (7932, 7932),
-    (7934, 7934),
-    (7944, 7951),
-    (7960, 7965),
-    (7976, 7983),
-    (7992, 7999),
-    (8008, 8013),
-    (8025, 8025),
-    (8027, 8027),
-    (8029, 8029),
-    (8031, 8031),
-    (8040, 8047),
-    (8120, 8123),
-    (8136, 8139),
-    (8152, 8155),
-    (8168, 8172),
-    (8184, 8187),
-    (8450, 8450),
-    (8455, 8455),
-    (8459, 8461),
-    (8464, 8466),
-    (8469, 8469),
-    (8473, 8477),
-    (8484, 8484),
-    (8486, 8486),
-    (8488, 8488),
-    (8490, 8493),
-    (8496, 8499),
-    (8510, 8511),
-    (8517, 8517),
-    (8579, 8579),
-    (11264, 11310),
-    (11360, 11360),
-    (11362, 11364),
-    (11367, 11367),
-    (11369, 11369),
-    (11371, 11371),
-    (11373, 11376),
-    (11378, 11378),
-    (11381, 11381),
-    (11390, 11392),
-    (11394, 11394),
-    (11396, 11396),
-    (11398, 11398),
-    (11400, 11400),
-    (11402, 11402),
-    (11404, 11404),
-    (11406, 11406),
-    (11408, 11408),
-    (11410, 11410),
-    (11412, 11412),
-    (11414, 11414),
-    (11416, 11416),
-    (11418, 11418),
-    (11420, 11420),
-    (11422, 11422),
-    (11424, 11424),
-    (11426, 11426),
-    (11428, 11428),
-    (11430, 11430),
-    (11432, 11432),
-    (11434, 11434),
-    (11436, 11436),
-    (11438, 11438),
-    (11440, 11440),
-    (11442, 11442),
-    (11444, 11444),
-    (11446, 11446),
-    (11448, 11448),
-    (11450, 11450),
-    (11452, 11452),
-    (11454, 11454),
-    (11456, 11456),
-    (11458, 11458),
-    (11460, 11460),
-    (11462, 11462),
-    (11464, 11464),
-    (11466, 11466),
-    (11468, 11468),
-    (11470, 11470),
-    (11472, 11472),
-    (11474, 11474),
-    (11476, 11476),
-    (11478, 11478),
-    (11480, 11480),
-    (11482, 11482),
-    (11484, 11484),
-    (11486, 11486),
-    (11488, 11488),
-    (11490, 11490),
-    (11499, 11499),
-    (11501, 11501),
-    (11506, 11506),
-    (42560, 42560),
-    (42562, 42562),
-    (42564, 42564),
-    (42566, 42566),
-    (42568, 42568),
-    (42570, 42570),
-    (42572, 42572),
-    (42574, 42574),
-    (42576, 42576),
-    (42578, 42578),
-    (42580, 42580),
-    (42582, 42582),
-    (42584, 42584),
-    (42586, 42586),
-    (42588, 42588),
-    (42590, 42590),
-    (42592, 42592),
-    (42594, 42594),
-    (42596, 42596),
-    (42598, 42598),
-    (42600, 42600),
-    (42602, 42602),
-    (42604, 42604),
-    (42624, 42624),
-    (42626, 42626),
-    (42628, 42628),
-    (42630, 42630),
-    (42632, 42632),
-    (42634, 42634),
-    (42636, 42636),
-    (42638, 42638),
-    (42640, 42640),
-    (42642, 42642),
-    (42644, 42644),
-    (42646, 42646),
-    (42648, 42648),
-    (42650, 42650),
-    (42786, 42786),
-    (42788, 42788),
-    (42790, 42790),
-    (42792, 42792),
-    (42794, 42794),
-    (42796, 42796),
-    (42798, 42798),
-    (42802, 42802),
-    (42804, 42804),
-    (42806, 42806),
-    (42808, 42808),
-    (42810, 42810),
-    (42812, 42812),
-    (42814, 42814),
-    (42816, 42816),
-    (42818, 42818),
-    (42820, 42820),
-    (42822, 42822),
-    (42824, 42824),
-    (42826, 42826),
-    (42828, 42828),
-    (42830, 42830),
-    (42832, 42832),
-    (42834, 42834),
-    (42836, 42836),
-    (42838, 42838),
-    (42840, 42840),
-    (42842, 42842),
-    (42844, 42844),
-    (42846, 42846),
-    (42848, 42848),
-    (42850, 42850),
-    (42852, 42852),
-    (42854, 42854),
-    (42856, 42856),
-    (42858, 42858),
-    (42860, 42860),
-    (42862, 42862),
-    (42873, 42873),
-    (42875, 42875),
-    (42877, 42878),
-    (42880, 42880),
-    (42882, 42882),
-    (42884, 42884),
-    (42886, 42886),
-    (42891, 42891),
-    (42893, 42893),
-    (42896, 42896),
-    (42898, 42898),
-    (42902, 42902),
-    (42904, 42904),
-    (42906, 42906),
-    (42908, 42908),
-    (42910, 42910),
-    (42912, 42912),
-    (42914, 42914),
-    (42916, 42916),
-    (42918, 42918),
-    (42920, 42920),
-    (42922, 42926),
-    (42928, 42932),
-    (42934, 42934),
-    (42936, 42936),
-    (42938, 42938),
-    (42940, 42940),
-    (42942, 42942),
-    (42946, 42946),
-    (42948, 42951),
-    (42953, 42953),
-    (42997, 42997),
-    (65313, 65338),
-    (66560, 66599),
-    (66736, 66771),
-    (68736, 68786),
-    (71840, 71871),
-    (93760, 93791),
-    (119808, 119833),
-    (119860, 119885),
-    (119912, 119937),
-    (119964, 119964),
-    (119966, 119967),
-    (119970, 119970),
-    (119973, 119974),
-    (119977, 119980),
-    (119982, 119989),
-    (120016, 120041),
-    (120068, 120069),
-    (120071, 120074),
-    (120077, 120084),
-    (120086, 120092),
-    (120120, 120121),
-    (120123, 120126),
-    (120128, 120132),
-    (120134, 120134),
-    (120138, 120144),
-    (120172, 120197),
-    (120224, 120249),
-    (120276, 120301),
-    (120328, 120353),
-    (120380, 120405),
-    (120432, 120457),
-    (120488, 120512),
-    (120546, 120570),
-    (120604, 120628),
-    (120662, 120686),
-    (120720, 120744),
-    (120778, 120778),
-    (125184, 125217),
-];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-/*!
-The ucd-trie crate provides a compressed trie set specifically tailored for
-Unicode codepoints. The principle use case for such a trie is to represent
-properties defined by Unicode that correspond to sets of Unicode codepoints.
-(These properties are formally called boolean properties or "single valued"
-properties. See
-[UTR#23 S3.3](http://www.unicode.org/reports/tr23/#PropertyTypeDefinitions)
-for more details.)
-
-This crate has two principle types: `TrieSetOwned` and `TrieSetSlice`,
-corresponding to a similar split as there is between `Vec<T>` and `&[T]`.
-`TrieSetOwned` is the only way to construct a trie from a set of Unicode
-codepoints.
-
-The intended use of this library is to embed a static instance of
-`TrieSetSlice` into your source code, and then use its methods as defined in
-this crate to test membership. (The `ucd-generate` tool can likely generate
-this code for you.)
-
-Finally, while this crate uses the standard library by default, it provides
-`no_std` functionality by disabling the `std` feature. When `no_std` is
-enabled, then `TrieSetOwned` is not provided. Instead, only `TrieSetSlice` is
-provided, which means `no_std` crates can still embed tries into their code.
-*/
-
-#![deny(missing_docs)]
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use core::fmt;
-
-#[cfg(feature = "std")]
-pub use crate::owned::{Error, Result, TrieSetOwned};
-
-#[cfg(test)]
-#[allow(dead_code)]
-mod general_category;
-#[cfg(feature = "std")]
-mod owned;
-
-const CHUNK_SIZE: usize = 64;
-
-/// A type alias for `TrieSetSlice<'static>`.
-pub type TrieSet = TrieSetSlice<'static>;
-
-/// A borrowed trie set.
-#[derive(Clone, Copy)]
-pub struct TrieSetSlice<'a> {
-    /// first tree, one level
-    #[doc(hidden)]
-    pub tree1_level1: &'a [u64],
-    /// second tree, first level
-    #[doc(hidden)]
-    pub tree2_level1: &'a [u8],
-    /// second tree, second level
-    #[doc(hidden)]
-    pub tree2_level2: &'a [u64],
-    /// third tree, first level
-    #[doc(hidden)]
-    pub tree3_level1: &'a [u8],
-    /// third tree, second level
-    #[doc(hidden)]
-    pub tree3_level2: &'a [u8],
-    /// third tree, third level
-    #[doc(hidden)]
-    pub tree3_level3: &'a [u64],
-}
-
-impl<'a> fmt::Debug for TrieSetSlice<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "TrieSetSlice(...)")
-    }
-}
-
-impl<'a> TrieSetSlice<'a> {
-    /// Returns true if and only if the given Unicode scalar value is in this
-    /// set.
-    pub fn contains_char(&self, c: char) -> bool {
-        self.contains(c as usize)
-    }
-
-    /// Returns true if and only if the given codepoint is in this set.
-    ///
-    /// If the given value exceeds the codepoint range (i.e., it's greater
-    /// than `0x10FFFF`), then this returns false.
-    pub fn contains_u32(&self, cp: u32) -> bool {
-        if cp > 0x10FFFF {
-            return false;
-        }
-        self.contains(cp as usize)
-    }
-
-    #[inline(always)]
-    fn contains(&self, cp: usize) -> bool {
-        if cp < 0x800 {
-            self.chunk_contains(cp, self.tree1_level1[cp >> 6])
-        } else if cp < 0x10000 {
-            let leaf = match self.tree2_level1.get((cp >> 6) - 0x20) {
-                None => return false,
-                Some(&leaf) => leaf,
-            };
-            self.chunk_contains(cp, self.tree2_level2[leaf as usize])
-        } else {
-            let child = match self.tree3_level1.get((cp >> 12) - 0x10) {
-                None => return false,
-                Some(&child) => child,
-            };
-            let i = ((child as usize) * CHUNK_SIZE) + ((cp >> 6) & 0b111111);
-            let leaf = self.tree3_level2[i];
-            self.chunk_contains(cp, self.tree3_level3[leaf as usize])
-        }
-    }
-
-    #[inline(always)]
-    fn chunk_contains(&self, cp: usize, chunk: u64) -> bool {
-        ((chunk >> (cp & 0b111111)) & 1) == 1
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/src/owned.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/src/owned.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ucd-trie/src/owned.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ucd-trie/src/owned.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,371 +0,0 @@
-use std::borrow::Borrow;
-use std::collections::HashMap;
-use std::error;
-use std::fmt;
-use std::io;
-use std::result;
-
-use super::{TrieSetSlice, CHUNK_SIZE};
-
-// This implementation was pretty much cribbed from raphlinus' contribution
-// to the standard library: https://github.com/rust-lang/rust/pull/33098/files
-//
-// The fundamental principle guiding this implementation is to take advantage
-// of the fact that similar Unicode codepoints are often grouped together, and
-// that most boolean Unicode properties are quite sparse over the entire space
-// of Unicode codepoints.
-//
-// To do this, we represent sets using something like a trie (which gives us
-// prefix compression). The "final" states of the trie are embedded in leaves
-// or "chunks," where each chunk is a 64 bit integer. Each bit position of the
-// integer corresponds to whether a particular codepoint is in the set or not.
-// These chunks are not just a compact representation of the final states of
-// the trie, but are also a form of suffix compression. In particular, if
-// multiple ranges of 64 contiguous codepoints map have the same set membership
-// ordering, then they all map to the exact same chunk in the trie.
-//
-// We organize this structure by partitioning the space of Unicode codepoints
-// into three disjoint sets. The first set corresponds to codepoints
-// [0, 0x800), the second [0x800, 0x1000) and the third [0x10000, 0x110000).
-// These partitions conveniently correspond to the space of 1 or 2 byte UTF-8
-// encoded codepoints, 3 byte UTF-8 encoded codepoints and 4 byte UTF-8 encoded
-// codepoints, respectively.
-//
-// Each partition has its own tree with its own root. The first partition is
-// the simplest, since the tree is completely flat. In particular, to determine
-// the set membership of a Unicode codepoint (that is less than `0x800`), we
-// do the following (where `cp` is the codepoint we're testing):
-//
-//     let chunk_address = cp >> 6;
-//     let chunk_bit = cp & 0b111111;
-//     let chunk = tree1[cp >> 6];
-//     let is_member = 1 == ((chunk >> chunk_bit) & 1);
-//
-// We do something similar for the second partition:
-//
-//     // we subtract 0x20 since (0x800 >> 6) == 0x20.
-//     let child_address = (cp >> 6) - 0x20;
-//     let chunk_address = tree2_level1[child_address];
-//     let chunk_bit = cp & 0b111111;
-//     let chunk = tree2_level2[chunk_address];
-//     let is_member = 1 == ((chunk >> chunk_bit) & 1);
-//
-// And so on for the third partition.
-//
-// Note that as a special case, if the second or third partitions are empty,
-// then the trie will store empty slices for those levels. The `contains`
-// check knows to return `false` in those cases.
-
-const CHUNKS: usize = 0x110000 / CHUNK_SIZE;
-
-/// A type alias that maps to `std::result::Result<T, ucd_trie::Error>`.
-pub type Result<T> = result::Result<T, Error>;
-
-/// An error that can occur during construction of a trie.
-#[derive(Clone, Debug)]
-pub enum Error {
-    /// This error is returned when an invalid codepoint is given to
-    /// `TrieSetOwned::from_codepoints`. An invalid codepoint is a `u32` that
-    /// is greater than `0x10FFFF`.
-    InvalidCodepoint(u32),
-    /// This error is returned when a set of Unicode codepoints could not be
-    /// sufficiently compressed into the trie provided by this crate. There is
-    /// no work-around for this error at this time.
-    GaveUp,
-}
-
-impl error::Error for Error {}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match *self {
-            Error::InvalidCodepoint(cp) => write!(
-                f,
-                "could not construct trie set containing an \
-                 invalid Unicode codepoint: 0x{:X}",
-                cp
-            ),
-            Error::GaveUp => {
-                write!(f, "could not compress codepoint set into a trie")
-            }
-        }
-    }
-}
-
-impl From<Error> for io::Error {
-    fn from(err: Error) -> io::Error {
-        io::Error::new(io::ErrorKind::Other, err)
-    }
-}
-
-/// An owned trie set.
-#[derive(Clone)]
-pub struct TrieSetOwned {
-    tree1_level1: Vec<u64>,
-    tree2_level1: Vec<u8>,
-    tree2_level2: Vec<u64>,
-    tree3_level1: Vec<u8>,
-    tree3_level2: Vec<u8>,
-    tree3_level3: Vec<u64>,
-}
-
-impl fmt::Debug for TrieSetOwned {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "TrieSetOwned(...)")
-    }
-}
-
-impl TrieSetOwned {
-    fn new(all: &[bool]) -> Result<TrieSetOwned> {
-        let mut bitvectors = Vec::with_capacity(CHUNKS);
-        for i in 0..CHUNKS {
-            let mut bitvector = 0u64;
-            for j in 0..CHUNK_SIZE {
-                if all[i * CHUNK_SIZE + j] {
-                    bitvector |= 1 << j;
-                }
-            }
-            bitvectors.push(bitvector);
-        }
-
-        let tree1_level1 =
-            bitvectors.iter().cloned().take(0x800 / CHUNK_SIZE).collect();
-
-        let (mut tree2_level1, mut tree2_level2) = compress_postfix_leaves(
-            &bitvectors[0x800 / CHUNK_SIZE..0x10000 / CHUNK_SIZE],
-        )?;
-        if tree2_level2.len() == 1 && tree2_level2[0] == 0 {
-            tree2_level1.clear();
-            tree2_level2.clear();
-        }
-
-        let (mid, mut tree3_level3) = compress_postfix_leaves(
-            &bitvectors[0x10000 / CHUNK_SIZE..0x110000 / CHUNK_SIZE],
-        )?;
-        let (mut tree3_level1, mut tree3_level2) =
-            compress_postfix_mid(&mid, 64)?;
-        if tree3_level3.len() == 1 && tree3_level3[0] == 0 {
-            tree3_level1.clear();
-            tree3_level2.clear();
-            tree3_level3.clear();
-        }
-
-        Ok(TrieSetOwned {
-            tree1_level1,
-            tree2_level1,
-            tree2_level2,
-            tree3_level1,
-            tree3_level2,
-            tree3_level3,
-        })
-    }
-
-    /// Create a new trie set from a set of Unicode scalar values.
-    ///
-    /// This returns an error if a set could not be sufficiently compressed to
-    /// fit into a trie.
-    pub fn from_scalars<I, C>(scalars: I) -> Result<TrieSetOwned>
-    where
-        I: IntoIterator<Item = C>,
-        C: Borrow<char>,
-    {
-        let mut all = vec![false; 0x110000];
-        for s in scalars {
-            all[*s.borrow() as usize] = true;
-        }
-        TrieSetOwned::new(&all)
-    }
-
-    /// Create a new trie set from a set of Unicode scalar values.
-    ///
-    /// This returns an error if a set could not be sufficiently compressed to
-    /// fit into a trie. This also returns an error if any of the given
-    /// codepoints are greater than `0x10FFFF`.
-    pub fn from_codepoints<I, C>(codepoints: I) -> Result<TrieSetOwned>
-    where
-        I: IntoIterator<Item = C>,
-        C: Borrow<u32>,
-    {
-        let mut all = vec![false; 0x110000];
-        for cp in codepoints {
-            let cp = *cp.borrow();
-            if cp > 0x10FFFF {
-                return Err(Error::InvalidCodepoint(cp));
-            }
-            all[cp as usize] = true;
-        }
-        TrieSetOwned::new(&all)
-    }
-
-    /// Return this set as a slice.
-    #[inline(always)]
-    pub fn as_slice(&self) -> TrieSetSlice<'_> {
-        TrieSetSlice {
-            tree1_level1: &self.tree1_level1,
-            tree2_level1: &self.tree2_level1,
-            tree2_level2: &self.tree2_level2,
-            tree3_level1: &self.tree3_level1,
-            tree3_level2: &self.tree3_level2,
-            tree3_level3: &self.tree3_level3,
-        }
-    }
-
-    /// Returns true if and only if the given Unicode scalar value is in this
-    /// set.
-    pub fn contains_char(&self, c: char) -> bool {
-        self.as_slice().contains_char(c)
-    }
-
-    /// Returns true if and only if the given codepoint is in this set.
-    ///
-    /// If the given value exceeds the codepoint range (i.e., it's greater
-    /// than `0x10FFFF`), then this returns false.
-    pub fn contains_u32(&self, cp: u32) -> bool {
-        self.as_slice().contains_u32(cp)
-    }
-}
-
-fn compress_postfix_leaves(chunks: &[u64]) -> Result<(Vec<u8>, Vec<u64>)> {
-    let mut root = vec![];
-    let mut children = vec![];
-    let mut bychild = HashMap::new();
-    for &chunk in chunks {
-        if !bychild.contains_key(&chunk) {
-            let start = bychild.len();
-            if start > ::std::u8::MAX as usize {
-                return Err(Error::GaveUp);
-            }
-            bychild.insert(chunk, start as u8);
-            children.push(chunk);
-        }
-        root.push(bychild[&chunk]);
-    }
-    Ok((root, children))
-}
-
-fn compress_postfix_mid(
-    chunks: &[u8],
-    chunk_size: usize,
-) -> Result<(Vec<u8>, Vec<u8>)> {
-    let mut root = vec![];
-    let mut children = vec![];
-    let mut bychild = HashMap::new();
-    for i in 0..(chunks.len() / chunk_size) {
-        let chunk = &chunks[i * chunk_size..(i + 1) * chunk_size];
-        if !bychild.contains_key(chunk) {
-            let start = bychild.len();
-            if start > ::std::u8::MAX as usize {
-                return Err(Error::GaveUp);
-            }
-            bychild.insert(chunk, start as u8);
-            children.extend(chunk);
-        }
-        root.push(bychild[chunk]);
-    }
-    Ok((root, children))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::TrieSetOwned;
-    use crate::general_category;
-    use std::collections::HashSet;
-
-    fn mk(scalars: &[char]) -> TrieSetOwned {
-        TrieSetOwned::from_scalars(scalars).unwrap()
-    }
-
-    fn ranges_to_set(ranges: &[(u32, u32)]) -> Vec<u32> {
-        let mut set = vec![];
-        for &(start, end) in ranges {
-            for cp in start..end + 1 {
-                set.push(cp);
-            }
-        }
-        set
-    }
-
-    #[test]
-    fn set1() {
-        let set = mk(&['a']);
-        assert!(set.contains_char('a'));
-        assert!(!set.contains_char('b'));
-        assert!(!set.contains_char('β'));
-        assert!(!set.contains_char('☃'));
-        assert!(!set.contains_char('😼'));
-    }
-
-    #[test]
-    fn set_combined() {
-        let set = mk(&['a', 'b', 'β', '☃', '😼']);
-        assert!(set.contains_char('a'));
-        assert!(set.contains_char('b'));
-        assert!(set.contains_char('β'));
-        assert!(set.contains_char('☃'));
-        assert!(set.contains_char('😼'));
-
-        assert!(!set.contains_char('c'));
-        assert!(!set.contains_char('θ'));
-        assert!(!set.contains_char('⛇'));
-        assert!(!set.contains_char('�'));
-    }
-
-    // Basic tests on all of the general category sets. We check that
-    // membership is correct on every Unicode codepoint... because we can.
-
-    macro_rules! category_test {
-        ($name:ident, $ranges:ident) => {
-            #[test]
-            fn $name() {
-                let set = ranges_to_set(general_category::$ranges);
-                let hashset: HashSet<u32> = set.iter().cloned().collect();
-                let trie = TrieSetOwned::from_codepoints(&set).unwrap();
-                for cp in 0..0x110000 {
-                    assert!(trie.contains_u32(cp) == hashset.contains(&cp));
-                }
-                // Test that an invalid codepoint is treated correctly.
-                assert!(!trie.contains_u32(0x110000));
-                assert!(!hashset.contains(&0x110000));
-            }
-        };
-    }
-
-    category_test!(gencat_cased_letter, CASED_LETTER);
-    category_test!(gencat_close_punctuation, CLOSE_PUNCTUATION);
-    category_test!(gencat_connector_punctuation, CONNECTOR_PUNCTUATION);
-    category_test!(gencat_control, CONTROL);
-    category_test!(gencat_currency_symbol, CURRENCY_SYMBOL);
-    category_test!(gencat_dash_punctuation, DASH_PUNCTUATION);
-    category_test!(gencat_decimal_number, DECIMAL_NUMBER);
-    category_test!(gencat_enclosing_mark, ENCLOSING_MARK);
-    category_test!(gencat_final_punctuation, FINAL_PUNCTUATION);
-    category_test!(gencat_format, FORMAT);
-    category_test!(gencat_initial_punctuation, INITIAL_PUNCTUATION);
-    category_test!(gencat_letter, LETTER);
-    category_test!(gencat_letter_number, LETTER_NUMBER);
-    category_test!(gencat_line_separator, LINE_SEPARATOR);
-    category_test!(gencat_lowercase_letter, LOWERCASE_LETTER);
-    category_test!(gencat_math_symbol, MATH_SYMBOL);
-    category_test!(gencat_mark, MARK);
-    category_test!(gencat_modifier_letter, MODIFIER_LETTER);
-    category_test!(gencat_modifier_symbol, MODIFIER_SYMBOL);
-    category_test!(gencat_nonspacing_mark, NONSPACING_MARK);
-    category_test!(gencat_number, NUMBER);
-    category_test!(gencat_open_punctuation, OPEN_PUNCTUATION);
-    category_test!(gencat_other, OTHER);
-    category_test!(gencat_other_letter, OTHER_LETTER);
-    category_test!(gencat_other_number, OTHER_NUMBER);
-    category_test!(gencat_other_punctuation, OTHER_PUNCTUATION);
-    category_test!(gencat_other_symbol, OTHER_SYMBOL);
-    category_test!(gencat_paragraph_separator, PARAGRAPH_SEPARATOR);
-    category_test!(gencat_private_use, PRIVATE_USE);
-    category_test!(gencat_punctuation, PUNCTUATION);
-    category_test!(gencat_separator, SEPARATOR);
-    category_test!(gencat_space_separator, SPACE_SEPARATOR);
-    category_test!(gencat_spacing_mark, SPACING_MARK);
-    category_test!(gencat_surrogate, SURROGATE);
-    category_test!(gencat_symbol, SYMBOL);
-    category_test!(gencat_titlecase_letter, TITLECASE_LETTER);
-    category_test!(gencat_unassigned, UNASSIGNED);
-    category_test!(gencat_uppercase_letter, UPPERCASE_LETTER);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-extern crate version_check as rustc;
-
-fn main() {
-    if is_rustc_at_least("1.5.0") {
-        println!("cargo:rustc-cfg=__unicase__iter_cmp");
-    }
-
-    if is_rustc_at_least("1.13.0") {
-        println!("cargo:rustc-cfg=__unicase__default_hasher");
-    }
-
-    if is_rustc_at_least("1.31.0") {
-        println!("cargo:rustc-cfg=__unicase__const_fns");
-    }
-
-    if is_rustc_at_least("1.36.0") {
-        println!("cargo:rustc-cfg=__unicase__core_and_alloc");
-    }
-}
-
-fn is_rustc_at_least(v: &str) -> bool {
-    rustc::is_min_version(v).unwrap_or(true)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"9d53be46ab942ae4b7684d673c9d910f492f923e582ae9b27f721e2b57e3874f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"b6f96c1e11a9adb0a60ff1fa3da58bf89296ba8269b50fd330c610e3dfedb4dc","README.md":"779866876776401c3bdd80f23e02131fa1484b21e9ec56408534c97f5cafca1c","build.rs":"18352be12daf69f90a317a479badfa0c2feb508a717a93d0abe3d07c37f1c9f4","src/ascii.rs":"37690625c90dbcd442ac7027c9a4298c1258368b437882036520a966675f62ad","src/lib.rs":"89ea45853f3aa797ba9aa7c856e6d93b674b7d93623fa304f292ddcc61fd0390","src/unicode/map.rs":"3679235bfd5ff68b0a0040bfe687fda231b1934762158bc52e6b58e2a1fcc6cb","src/unicode/mod.rs":"d6183755af22f1f74c63b27ae2b779071030f70358923b4c73010276e492d16b"},"package":"50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "unicase"
-version = "2.6.0"
-authors = ["Sean McArthur <sean@seanmonstar.com>"]
-build = "build.rs"
-exclude = ["scripts/*"]
-description = "A case-insensitive wrapper around strings."
-documentation = "https://docs.rs/unicase"
-readme = "README.md"
-keywords = ["lowercase", "case", "case-insensitive", "case-folding", "no_std"]
-categories = ["internationalization", "text-processing", "no-std"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/seanmonstar/unicase"
-[build-dependencies.version_check]
-version = "0.9"
-
-[features]
-nightly = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-Copyright (c) 2014-2017 Sean McArthur
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# unicase
-
-[![Build Status](https://travis-ci.org/seanmonstar/unicase.svg?branch=master)](https://travis-ci.org/seanmonstar/unicase)
-
-[Documentation](https://docs.rs/unicase)
-
-Compare strings when case is not important (using Unicode Case-folding).
-
-```rust
-// ignore ASCII case
-let a = UniCase::new("foobar");
-let b = UniCase::new("FOOBAR");
-
-assert_eq!(a, b);
-
-// using unicode case-folding
-let c = UniCase::new("Maße")
-let d = UniCase::new("MASSE");
-assert_eq!(c, d);
-```
-
-## License
-
-Licensed under either of
-
-- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://apache.org/licenses/LICENSE-2.0)
-- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/src/ascii.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/src/ascii.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/src/ascii.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/src/ascii.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-use alloc::string::String;
-#[cfg(__unicase__iter_cmp)]
-use core::cmp::Ordering;
-use core::fmt;
-use core::hash::{Hash, Hasher};
-use core::ops::{Deref, DerefMut};
-use core::str::FromStr;
-#[cfg(not(__unicase__core_and_alloc))]
-#[allow(deprecated, unused)]
-use std::ascii::AsciiExt;
-
-use super::{Ascii, Encoding, UniCase};
-
-impl<S> Ascii<S> {
-    #[inline]
-    #[cfg(__unicase__const_fns)]
-    pub const fn new(s: S) -> Ascii<S> {
-        Ascii(s)
-    }
-
-    /// Construct a new `Ascii`.
-    ///
-    /// For Rust versions >= 1.31, this is a `const fn`.
-    #[inline]
-    #[cfg(not(__unicase__const_fns))]
-    pub fn new(s: S) -> Ascii<S> {
-        Ascii(s)
-    }
-
-    #[cfg(__unicase_const_fns)]
-    pub const fn into_unicase(self) -> UniCase<S> {
-        UniCase(Encoding::Ascii(self))
-    }
-
-    #[cfg(not(__unicase_const_fns))]
-    pub fn into_unicase(self) -> UniCase<S> {
-        UniCase(Encoding::Ascii(self))
-    }
-
-    #[inline]
-    pub fn into_inner(self) -> S {
-        self.0
-    }
-}
-
-impl<S> Deref for Ascii<S> {
-    type Target = S;
-    #[inline]
-    fn deref<'a>(&'a self) -> &'a S {
-        &self.0
-    }
-}
-
-impl<S> DerefMut for Ascii<S> {
-    #[inline]
-    fn deref_mut<'a>(&'a mut self) -> &'a mut S {
-        &mut self.0
-    }
-}
-
-#[cfg(__unicase__iter_cmp)]
-impl<T: AsRef<str>> PartialOrd for Ascii<T> {
-    #[inline]
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-#[cfg(__unicase__iter_cmp)]
-impl<T: AsRef<str>> Ord for Ascii<T> {
-    #[inline]
-    fn cmp(&self, other: &Self) -> Ordering {
-        let self_chars = self.as_ref().chars().map(|c| c.to_ascii_lowercase());
-        let other_chars = other.as_ref().chars().map(|c| c.to_ascii_lowercase());
-        self_chars.cmp(other_chars)
-    }
-}
-
-impl<S: AsRef<str>> AsRef<str> for Ascii<S> {
-    #[inline]
-    fn as_ref(&self) -> &str {
-        self.0.as_ref()
-    }
-
-}
-
-impl<S: fmt::Display> fmt::Display for Ascii<S> {
-    #[inline]
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Display::fmt(&self.0, fmt)
-    }
-}
-
-impl<S1: AsRef<str>> PartialEq<Ascii<S1>> for String {
-    #[inline]
-    fn eq(&self, other: &Ascii<S1>) -> bool {
-        other == self
-    }
-}
-
-impl<'a, S1: AsRef<str>> PartialEq<Ascii<S1>> for &'a str {
-    #[inline]
-    fn eq(&self, other: &Ascii<S1>) -> bool {
-        other == self
-    }
-}
-
-impl<S1: AsRef<str>, S2: AsRef<str>> PartialEq<S2> for Ascii<S1> {
-    #[inline]
-    fn eq(&self, other: &S2) -> bool {
-        self.as_ref().eq_ignore_ascii_case(other.as_ref())
-    }
-}
-
-impl<S: AsRef<str>> Eq for Ascii<S> {}
-
-impl<S: FromStr> FromStr for Ascii<S> {
-    type Err = <S as FromStr>::Err;
-    fn from_str(s: &str) -> Result<Ascii<S>, <S as FromStr>::Err> {
-        s.parse().map(Ascii)
-    }
-}
-
-impl<S: AsRef<str>> Hash for Ascii<S> {
-    #[inline]
-    fn hash<H: Hasher>(&self, hasher: &mut H) {
-        for byte in self.as_ref().bytes().map(|b| b.to_ascii_lowercase()) {
-            hasher.write_u8(byte);
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use ::Ascii;
-    use std::hash::{Hash, Hasher};
-    #[cfg(not(__unicase__default_hasher))]
-    use std::hash::SipHasher as DefaultHasher;
-    #[cfg(__unicase__default_hasher)]
-    use std::collections::hash_map::DefaultHasher;
-
-    fn hash<T: Hash>(t: &T) -> u64 {
-        let mut s = DefaultHasher::new();
-        t.hash(&mut s);
-        s.finish()
-    }
-
-    #[test]
-    fn test_case_insensitive() {
-        let a = Ascii("foobar");
-        let b = Ascii("FOOBAR");
-
-        assert_eq!(a, b);
-        assert_eq!(hash(&a), hash(&b));
-
-        assert_eq!(a, "fooBar");
-        assert_eq!("fooBar", a);
-        assert_eq!(String::from("fooBar"), a);
-        assert_eq!(a, String::from("fooBar"));
-    }
-
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_ascii_eq(b: &mut ::test::Bencher) {
-        b.bytes = b"foobar".len() as u64;
-        b.iter(|| assert_eq!(Ascii("foobar"), Ascii("FOOBAR")));
-    }
-
-    #[cfg(__unicase__iter_cmp)]
-    #[test]
-    fn test_case_cmp() {
-        assert!(Ascii("foobar") == Ascii("FOOBAR"));
-        assert!(Ascii("a") < Ascii("B"));
-
-        assert!(Ascii("A") < Ascii("b"));
-        assert!(Ascii("aa") > Ascii("a"));
-
-        assert!(Ascii("a") < Ascii("aa"));
-        assert!(Ascii("a") < Ascii("AA"));
-    }
-
-    #[cfg(__unicase__const_fns)]
-    #[test]
-    fn test_ascii_new_const() {
-        const _ASCII: Ascii<&'static str> = Ascii::new("");
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,465 +0,0 @@
-#![cfg_attr(test, deny(missing_docs))]
-#![cfg_attr(test, deny(warnings))]
-#![doc(html_root_url = "https://docs.rs/unicase/2.6.0")]
-#![cfg_attr(feature = "nightly", feature(test))]
-#![cfg_attr(
-    all(
-        __unicase__core_and_alloc,
-        not(test),
-    ),
-    no_std,
-)]
-
-//! # UniCase
-//!
-//! UniCase provides a way of specifying strings that are case-insensitive.
-//!
-//! UniCase supports full [Unicode case
-//! folding](https://www.w3.org/International/wiki/Case_folding). It can also
-//! utilize faster ASCII case comparisons, if both strings are ASCII.
-//!
-//! Using the `UniCase::new()` constructor will check the string to see if it
-//! is all ASCII. When a `UniCase` is compared against another, if both are
-//! ASCII, it will use the faster comparison.
-//!
-//! There also exists the `Ascii` type in this crate, which will always assume
-//! to use the ASCII case comparisons, if the encoding is already known.
-//!
-//! ## Example
-//!
-//! ```rust
-//! use unicase::UniCase;
-//!
-//! let a = UniCase::new("Maße");
-//! let b = UniCase::new("MASSE");
-//! let c = UniCase::new("mase");
-//!
-//! assert_eq!(a, b);
-//! assert!(b != c);
-//! ```
-//!
-//! ## Ascii
-//!
-//! ```rust
-//! use unicase::Ascii;
-//!
-//! let a = Ascii::new("foobar");
-//! let b = Ascii::new("FoObAr");
-//!
-//! assert_eq!(a, b);
-//! ```
-
-#[cfg(feature = "nightly")]
-extern crate test;
-
-#[cfg(all(__unicase__core_and_alloc, not(test)))]
-extern crate alloc;
-#[cfg(all(__unicase__core_and_alloc, not(test)))]
-use alloc::string::String;
-
-#[cfg(not(all(__unicase__core_and_alloc, not(test))))]
-extern crate std as alloc;
-#[cfg(not(all(__unicase__core_and_alloc, not(test))))]
-extern crate std as core;
-
-use alloc::borrow::Cow;
-#[cfg(__unicase__iter_cmp)]
-use core::cmp::Ordering;
-use core::fmt;
-use core::hash::{Hash, Hasher};
-use core::ops::{Deref, DerefMut};
-use core::str::FromStr;
-
-use self::unicode::Unicode;
-
-mod ascii;
-mod unicode;
-
-/// Case Insensitive wrapper of strings.
-#[derive(Clone, Copy)]
-pub struct UniCase<S>(Encoding<S>);
-
-/// Case Insensitive wrapper of Ascii strings.
-#[derive(Clone, Copy, Debug, Default)]
-pub struct Ascii<S>(S);
-
-/// Compare two string-like types for case-less equality, using unicode folding.
-///
-/// Equivalent to `UniCase::new(left) == UniCase::new(right)`.
-///
-/// Note: This will perform a scan for ASCII characters before doing the
-/// the comparison. See `UniCase` for more information.
-#[inline]
-pub fn eq<S: AsRef<str> + ?Sized>(left: &S, right: &S) -> bool {
-    UniCase::new(left) == UniCase::new(right)
-}
-
-/// Compare two string-like types for case-less equality, ignoring ASCII case.
-///
-/// Equivalent to `Ascii::new(left) == Ascii::new(right)`.
-#[inline]
-pub fn eq_ascii<S: AsRef<str> + ?Sized>(left: &S, right: &S) -> bool {
-    Ascii(left) == Ascii(right)
-}
-
-#[derive(Clone, Copy, Debug)]
-enum Encoding<S> {
-    Ascii(Ascii<S>),
-    Unicode(Unicode<S>),
-}
-
-macro_rules! inner {
-
-    (mut $e:expr) => ({
-        match &mut $e {
-            &mut Encoding::Ascii(ref mut s) => &mut s.0,
-            &mut Encoding::Unicode(ref mut s) => &mut s.0,
-        }
-    });
-    ($e:expr) => ({
-        match &$e {
-            &Encoding::Ascii(ref s) => &s.0,
-            &Encoding::Unicode(ref s) => &s.0,
-        }
-    });
-}
-
-impl<S: AsRef<str> + Default> Default for UniCase<S> {
-    fn default() -> Self {
-        Self::new(Default::default())
-    }
-}
-
-impl<S: AsRef<str>> UniCase<S> {
-    /// Creates a new `UniCase`.
-    ///
-    /// Note: This scans the text to determine if it is all ASCII or not.
-    pub fn new(s: S) -> UniCase<S> {
-        #[cfg(not(__unicase__core_and_alloc))]
-        #[allow(deprecated, unused)]
-        use std::ascii::AsciiExt;
-
-        if s.as_ref().is_ascii() {
-            UniCase(Encoding::Ascii(Ascii(s)))
-        } else {
-            UniCase(Encoding::Unicode(Unicode(s)))
-        }
-    }
-}
-
-impl<S> UniCase<S> {
-    /// Creates a new `UniCase`, skipping the ASCII check.
-    #[cfg(__unicase__const_fns)]
-    pub const fn unicode(s: S) -> UniCase<S> {
-        UniCase(Encoding::Unicode(Unicode(s)))
-    }
-
-    /// Creates a new `UniCase`, skipping the ASCII check.
-    ///
-    /// For Rust versions >= 1.31, this is a `const fn`.
-    #[cfg(not(__unicase__const_fns))]
-    pub fn unicode(s: S) -> UniCase<S> {
-        UniCase(Encoding::Unicode(Unicode(s)))
-    }
-
-    /// Creates a new `UniCase` which performs only ASCII case folding.
-    #[cfg(__unicase__const_fns)]
-    pub const fn ascii(s: S) -> UniCase<S> {
-        UniCase(Encoding::Ascii(Ascii(s)))
-    }
-
-    /// Creates a new `UniCase` which performs only ASCII case folding.
-    ///
-    /// For Rust versions >= 1.31, this is a `const fn`.
-    #[cfg(not(__unicase__const_fns))]
-    pub fn ascii(s: S) -> UniCase<S> {
-        UniCase(Encoding::Ascii(Ascii(s)))
-    }
-
-    /// Return `true` if this instance will only perform ASCII case folding.
-    pub fn is_ascii(&self) -> bool {
-        match self.0 {
-            Encoding::Ascii(_) => true,
-            Encoding::Unicode(_) => false,
-        }
-    }
-
-    /// Unwraps the inner value held by this `UniCase`.
-    #[inline]
-    pub fn into_inner(self) -> S {
-        match self.0 {
-            Encoding::Ascii(s) => s.0,
-            Encoding::Unicode(s) => s.0,
-        }
-    }
-}
-
-impl<S> Deref for UniCase<S> {
-    type Target = S;
-    #[inline]
-    fn deref<'a>(&'a self) -> &'a S {
-        inner!(self.0)
-    }
-}
-
-impl<S> DerefMut for UniCase<S> {
-    #[inline]
-    fn deref_mut<'a>(&'a mut self) -> &'a mut S {
-        inner!(mut self.0)
-    }
-}
-
-impl<S: AsRef<str>> AsRef<str> for UniCase<S> {
-    #[inline]
-    fn as_ref(&self) -> &str {
-        inner!(self.0).as_ref()
-    }
-
-}
-
-impl<S: fmt::Debug> fmt::Debug for UniCase<S> {
-    #[inline]
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(inner!(self.0), fmt)
-    }
-}
-
-impl<S: fmt::Display> fmt::Display for UniCase<S> {
-    #[inline]
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Display::fmt(inner!(self.0), fmt)
-    }
-}
-
-
-impl<S1: AsRef<str>, S2: AsRef<str>> PartialEq<UniCase<S2>> for UniCase<S1> {
-    #[inline]
-    fn eq(&self, other: &UniCase<S2>) -> bool {
-        match (&self.0, &other.0) {
-            (&Encoding::Ascii(ref x), &Encoding::Ascii(ref y)) => x == y,
-            (&Encoding::Unicode(ref x), &Encoding::Unicode(ref y)) => x == y,
-            (&Encoding::Ascii(ref x), &Encoding::Unicode(ref y)) => &Unicode(x.as_ref()) == y,
-            (&Encoding::Unicode(ref x), &Encoding::Ascii(ref y)) => x == &Unicode(y.as_ref()),
-        }
-    }
-}
-
-impl<S: AsRef<str>> Eq for UniCase<S> {}
-
-impl<S: AsRef<str>> Hash for UniCase<S> {
-    #[inline]
-    fn hash<H: Hasher>(&self, hasher: &mut H) {
-        match self.0 {
-            Encoding::Ascii(ref s) => s.hash(hasher),
-            Encoding::Unicode(ref s) => s.hash(hasher)
-        }
-    }
-}
-
-impl<S> From<Ascii<S>> for UniCase<S> {
-    fn from(ascii: Ascii<S>) -> Self {
-        UniCase(Encoding::Ascii(ascii))
-    }
-}
-
-macro_rules! from_impl {
-    ($from:ty => $to:ty; $by:ident) => (
-        impl<'a> From<$from> for UniCase<$to> {
-            fn from(s: $from) -> Self {
-                UniCase::unicode(s.$by())
-            }
-        }
-    );
-    ($from:ty => $to:ty) => ( from_impl!($from => $to; into); )
-}
-
-macro_rules! into_impl {
-    ($to:ty) => (
-        impl<'a> Into<$to> for UniCase<$to> {
-            fn into(self) -> $to {
-                self.into_inner()
-            }
-        }
-    );
-}
-
-impl<S: AsRef<str>> From<S> for UniCase<S> {
-    fn from(s: S) -> Self {
-        UniCase::unicode(s)
-    }
-}
-
-from_impl!(&'a str => Cow<'a, str>);
-from_impl!(String => Cow<'a, str>);
-from_impl!(&'a str => String);
-from_impl!(Cow<'a, str> => String; into_owned);
-from_impl!(&'a String => &'a str; as_ref);
-
-into_impl!(&'a str);
-into_impl!(String);
-into_impl!(Cow<'a, str>);
-
-#[cfg(__unicase__iter_cmp)]
-impl<T: AsRef<str>> PartialOrd for UniCase<T> {
-    #[inline]
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-#[cfg(__unicase__iter_cmp)]
-impl<T: AsRef<str>> Ord for UniCase<T> {
-    #[inline]
-    fn cmp(&self, other: &Self) -> Ordering {
-        match (&self.0, &other.0) {
-            (&Encoding::Ascii(ref x), &Encoding::Ascii(ref y)) => x.cmp(y),
-            (&Encoding::Unicode(ref x), &Encoding::Unicode(ref y)) => x.cmp(y),
-            (&Encoding::Ascii(ref x), &Encoding::Unicode(ref y)) => Unicode(x.as_ref()).cmp(&Unicode(y.0.as_ref())),
-            (&Encoding::Unicode(ref x), &Encoding::Ascii(ref y)) => Unicode(x.0.as_ref()).cmp(&Unicode(y.as_ref())),
-        }
-    }
-}
-
-
-
-impl<S: FromStr + AsRef<str>> FromStr for UniCase<S> {
-    type Err = <S as FromStr>::Err;
-    fn from_str(s: &str) -> Result<UniCase<S>, Self::Err> {
-        s.parse().map(UniCase::new)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::UniCase;
-    use std::hash::{Hash, Hasher};
-    #[cfg(not(__unicase__default_hasher))]
-    use std::hash::SipHasher as DefaultHasher;
-    #[cfg(__unicase__default_hasher)]
-    use std::collections::hash_map::DefaultHasher;
-
-    fn hash<T: Hash>(t: &T) -> u64 {
-        let mut s = DefaultHasher::new();
-        t.hash(&mut s);
-        s.finish()
-    }
-
-    #[test]
-    fn test_copy_for_refs() {
-        fn foo<T>(_: UniCase<T>) {}
-
-        let a = UniCase::new("foobar");
-        foo(a);
-        foo(a);
-    }
-
-    #[test]
-    fn test_eq_ascii() {
-        let a = UniCase::new("foobar");
-        let b = UniCase::new("FOOBAR");
-        let c = UniCase::ascii("FoObAr");
-
-        assert_eq!(a, b);
-        assert_eq!(b, a);
-        assert_eq!(a, c);
-        assert_eq!(c, a);
-        assert_eq!(hash(&a), hash(&b));
-        assert_eq!(hash(&a), hash(&c));
-        assert!(a.is_ascii());
-        assert!(b.is_ascii());
-        assert!(c.is_ascii());
-    }
-
-
-    #[test]
-    fn test_eq_unicode() {
-        let a = UniCase::new("στιγμας");
-        let b = UniCase::new("στιγμασ");
-        assert_eq!(a, b);
-        assert_eq!(b, a);
-        assert_eq!(hash(&a), hash(&b));
-    }
-
-    #[test]
-    fn test_eq_unicode_left_is_substring() {
-        // https://github.com/seanmonstar/unicase/issues/38
-        let a = UniCase::unicode("foo");
-        let b = UniCase::unicode("foobar");
-
-        assert!(a != b);
-        assert!(b != a);
-    }
-
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_unicase_ascii(b: &mut ::test::Bencher) {
-        b.bytes = b"foobar".len() as u64;
-        let x = UniCase::new("foobar");
-        let y = UniCase::new("FOOBAR");
-        b.iter(|| assert_eq!(x, y));
-    }
-
-    #[cfg(feature = "nightly")]
-    static SUBJECT: &'static [u8] = b"ffoo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz oo bar baz quux herp derp";
-
-    #[cfg(feature = "nightly")]
-    #[inline(never)]
-    fn is_ascii(bytes: &[u8]) -> bool {
-        #[allow(unused, deprecated)]
-        use std::ascii::AsciiExt;
-        bytes.is_ascii()
-    }
-
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_is_ascii(b: &mut ::test::Bencher) {
-        b.iter(|| assert!(is_ascii(SUBJECT)));
-    }
-
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_is_utf8(b: &mut ::test::Bencher) {
-        b.iter(|| assert!(::std::str::from_utf8(SUBJECT).is_ok()));
-    }
-
-    #[cfg(__unicase__iter_cmp)]
-    #[test]
-    fn test_case_cmp() {
-        assert!(UniCase::new("a") < UniCase::new("B"));
-
-        assert!(UniCase::new("A") < UniCase::new("b"));
-        assert!(UniCase::new("aa") > UniCase::new("a"));
-
-        assert!(UniCase::new("a") < UniCase::new("aa"));
-        assert!(UniCase::new("a") < UniCase::new("AA"));
-    }
-
-    #[test]
-    fn test_from_impls() {
-        let view: &'static str = "foobar";
-        let _: UniCase<&'static str> = view.into();
-        let _: UniCase<&str> = view.into();
-        let _: UniCase<String> = view.into();
-
-        let owned: String = view.to_owned();
-        let _: UniCase<&str> = (&owned).into();
-        let _: UniCase<String> = owned.into();
-    }
-
-    #[test]
-    fn test_into_impls() {
-        let view: UniCase<&'static str> = UniCase::new("foobar");
-        let _: &'static str = view.into();
-        let _: &str = view.into();
-
-        let owned: UniCase<String> = "foobar".into();
-        let _: String = owned.clone().into();
-        let _: &str = owned.as_ref();
-    }
-
-    #[cfg(__unicase__const_fns)]
-    #[test]
-    fn test_unicase_unicode_const() {
-        const _UNICASE: UniCase<&'static str> = UniCase::unicode("");
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/src/unicode/map.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/src/unicode/map.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/src/unicode/map.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/src/unicode/map.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1995 +0,0 @@
-// Generated by scripts/mapgen.py
-// 2019-08-31
-
-use super::fold::Fold;
-
-use core::char;
-pub fn lookup(orig: char) -> Fold {
-    // The code below is is intended to reduce the binary size from that of a simple 1:1 lookup table.
-    // It exploits two facts:
-    // 1. Many of the mappings form ranges mapped to other ranges.
-    //    To benefit from this, we match on ranges instead of single numbers.
-    //    Alone, this decreases the binary size but results in performance regression over the simple 1:1 lookup.
-    // 2. Most of the mappings are from relatively small chars (0 - 0x2CFF).
-    //    To benefit from this, we use a jump table based on the high byte for this range.
-    //    This more than recovers the performance regression from exploting fact #1, at least in the tested benchmark.
-    let from = orig as u32;
-    if from <= 0x2CFF {
-        let from = from as u16;
-        let high_byte = (from >> 8) as u8;
-        let low_byte = (from & 0xff) as u8;
-        let single_char: u16 = match high_byte {
-            0x00 => {
-                match low_byte {
-                    x @ _ if 0x41 <= x && x <= 0x5a  => from.wrapping_add(0x0020),
-                    0xb5 => 0x03bc,
-                    x @ _ if 0xc0 <= x && x <= 0xd6  => from.wrapping_add(0x0020),
-                    x @ _ if 0xd8 <= x && x <= 0xde  => from.wrapping_add(0x0020),
-                    0xdf => return Fold::Two('\u{0073}', '\u{0073}',),
-                    _ => from
-                }
-            }
-            0x01 => {
-                match low_byte {
-                    x @ _ if x <= 0x2e  => (from | 1),
-                    0x30 => return Fold::Two('\u{0069}', '\u{0307}',),
-                    x @ _ if 0x32 <= x && x <= 0x36  => (from | 1),
-                    x @ _ if 0x39 <= x && x <= 0x47  => ((from+1) & !1),
-                    0x49 => return Fold::Two('\u{02bc}', '\u{006e}',),
-                    x @ _ if 0x4a <= x && x <= 0x76  => (from | 1),
-                    0x78 => 0x00ff,
-                    x @ _ if 0x79 <= x && x <= 0x7d  => ((from+1) & !1),
-                    0x7f => 0x0073,
-                    0x81 => 0x0253,
-                    x @ _ if 0x82 <= x && x <= 0x84  => (from | 1),
-                    0x86 => 0x0254,
-                    0x87 => 0x0188,
-                    x @ _ if 0x89 <= x && x <= 0x8a  => from.wrapping_add(0x00cd),
-                    0x8b => 0x018c,
-                    0x8e => 0x01dd,
-                    0x8f => 0x0259,
-                    0x90 => 0x025b,
-                    0x91 => 0x0192,
-                    0x93 => 0x0260,
-                    0x94 => 0x0263,
-                    0x96 => 0x0269,
-                    0x97 => 0x0268,
-                    0x98 => 0x0199,
-                    0x9c => 0x026f,
-                    0x9d => 0x0272,
-                    0x9f => 0x0275,
-                    x @ _ if 0xa0 <= x && x <= 0xa4  => (from | 1),
-                    0xa6 => 0x0280,
-                    0xa7 => 0x01a8,
-                    0xa9 => 0x0283,
-                    0xac => 0x01ad,
-                    0xae => 0x0288,
-                    0xaf => 0x01b0,
-                    x @ _ if 0xb1 <= x && x <= 0xb2  => from.wrapping_add(0x00d9),
-                    x @ _ if 0xb3 <= x && x <= 0xb5  => ((from+1) & !1),
-                    0xb7 => 0x0292,
-                    0xb8 => 0x01b9,
-                    0xbc => 0x01bd,
-                    0xc4 => 0x01c6,
-                    0xc5 => 0x01c6,
-                    0xc7 => 0x01c9,
-                    0xc8 => 0x01c9,
-                    0xca => 0x01cc,
-                    x @ _ if 0xcb <= x && x <= 0xdb  => ((from+1) & !1),
-                    x @ _ if 0xde <= x && x <= 0xee  => (from | 1),
-                    0xf0 => return Fold::Two('\u{006a}', '\u{030c}',),
-                    0xf1 => 0x01f3,
-                    x @ _ if 0xf2 <= x && x <= 0xf4  => (from | 1),
-                    0xf6 => 0x0195,
-                    0xf7 => 0x01bf,
-                    x @ _ if 0xf8 <= x  => (from | 1),
-                    _ => from
-                }
-            }
-            0x02 => {
-                match low_byte {
-                    x @ _ if x <= 0x1e  => (from | 1),
-                    0x20 => 0x019e,
-                    x @ _ if 0x22 <= x && x <= 0x32  => (from | 1),
-                    0x3a => 0x2c65,
-                    0x3b => 0x023c,
-                    0x3d => 0x019a,
-                    0x3e => 0x2c66,
-                    0x41 => 0x0242,
-                    0x43 => 0x0180,
-                    0x44 => 0x0289,
-                    0x45 => 0x028c,
-                    x @ _ if 0x46 <= x && x <= 0x4e  => (from | 1),
-                    _ => from
-                }
-            }
-            0x03 => {
-                match low_byte {
-                    0x45 => 0x03b9,
-                    x @ _ if 0x70 <= x && x <= 0x72  => (from | 1),
-                    0x76 => 0x0377,
-                    0x7f => 0x03f3,
-                    0x86 => 0x03ac,
-                    x @ _ if 0x88 <= x && x <= 0x8a  => from.wrapping_add(0x0025),
-                    0x8c => 0x03cc,
-                    x @ _ if 0x8e <= x && x <= 0x8f  => from.wrapping_add(0x003f),
-                    0x90 => return Fold::Three('\u{03b9}', '\u{0308}', '\u{0301}',),
-                    x @ _ if 0x91 <= x && x <= 0xa1  => from.wrapping_add(0x0020),
-                    x @ _ if 0xa3 <= x && x <= 0xab  => from.wrapping_add(0x0020),
-                    0xb0 => return Fold::Three('\u{03c5}', '\u{0308}', '\u{0301}',),
-                    0xc2 => 0x03c3,
-                    0xcf => 0x03d7,
-                    0xd0 => 0x03b2,
-                    0xd1 => 0x03b8,
-                    0xd5 => 0x03c6,
-                    0xd6 => 0x03c0,
-                    x @ _ if 0xd8 <= x && x <= 0xee  => (from | 1),
-                    0xf0 => 0x03ba,
-                    0xf1 => 0x03c1,
-                    0xf4 => 0x03b8,
-                    0xf5 => 0x03b5,
-                    0xf7 => 0x03f8,
-                    0xf9 => 0x03f2,
-                    0xfa => 0x03fb,
-                    x @ _ if 0xfd <= x  => from.wrapping_sub(0x0082),
-                    _ => from
-                }
-            }
-            0x04 => {
-                match low_byte {
-                    x @ _ if x <= 0x0f  => from.wrapping_add(0x0050),
-                    x @ _ if 0x10 <= x && x <= 0x2f  => from.wrapping_add(0x0020),
-                    x @ _ if 0x60 <= x && x <= 0x80  => (from | 1),
-                    x @ _ if 0x8a <= x && x <= 0xbe  => (from | 1),
-                    0xc0 => 0x04cf,
-                    x @ _ if 0xc1 <= x && x <= 0xcd  => ((from+1) & !1),
-                    x @ _ if 0xd0 <= x  => (from | 1),
-                    _ => from
-                }
-            }
-            0x05 => {
-                match low_byte {
-                    x @ _ if x <= 0x2e  => (from | 1),
-                    x @ _ if 0x31 <= x && x <= 0x56  => from.wrapping_add(0x0030),
-                    0x87 => return Fold::Two('\u{0565}', '\u{0582}',),
-                    _ => from
-                }
-            }
-            0x06 => {
-                from
-            }
-            0x07 => {
-                from
-            }
-            0x08 => {
-                from
-            }
-            0x09 => {
-                from
-            }
-            0x0a => {
-                from
-            }
-            0x0b => {
-                from
-            }
-            0x0c => {
-                from
-            }
-            0x0d => {
-                from
-            }
-            0x0e => {
-                from
-            }
-            0x0f => {
-                from
-            }
-            0x10 => {
-                match low_byte {
-                    x @ _ if 0xa0 <= x && x <= 0xc5  => from.wrapping_add(0x1c60),
-                    0xc7 => 0x2d27,
-                    0xcd => 0x2d2d,
-                    _ => from
-                }
-            }
-            0x11 => {
-                from
-            }
-            0x12 => {
-                from
-            }
-            0x13 => {
-                match low_byte {
-                    x @ _ if 0xf8 <= x && x <= 0xfd  => from.wrapping_sub(0x0008),
-                    _ => from
-                }
-            }
-            0x14 => {
-                from
-            }
-            0x15 => {
-                from
-            }
-            0x16 => {
-                from
-            }
-            0x17 => {
-                from
-            }
-            0x18 => {
-                from
-            }
-            0x19 => {
-                from
-            }
-            0x1a => {
-                from
-            }
-            0x1b => {
-                from
-            }
-            0x1c => {
-                match low_byte {
-                    0x80 => 0x0432,
-                    0x81 => 0x0434,
-                    0x82 => 0x043e,
-                    x @ _ if 0x83 <= x && x <= 0x84  => from.wrapping_sub(0x1842),
-                    0x85 => 0x0442,
-                    0x86 => 0x044a,
-                    0x87 => 0x0463,
-                    0x88 => 0xa64b,
-                    x @ _ if 0x90 <= x && x <= 0xba  => from.wrapping_sub(0x0bc0),
-                    x @ _ if 0xbd <= x && x <= 0xbf  => from.wrapping_sub(0x0bc0),
-                    _ => from
-                }
-            }
-            0x1d => {
-                from
-            }
-            0x1e => {
-                match low_byte {
-                    x @ _ if x <= 0x94  => (from | 1),
-                    0x96 => return Fold::Two('\u{0068}', '\u{0331}',),
-                    0x97 => return Fold::Two('\u{0074}', '\u{0308}',),
-                    0x98 => return Fold::Two('\u{0077}', '\u{030a}',),
-                    0x99 => return Fold::Two('\u{0079}', '\u{030a}',),
-                    0x9a => return Fold::Two('\u{0061}', '\u{02be}',),
-                    0x9b => 0x1e61,
-                    0x9e => return Fold::Two('\u{0073}', '\u{0073}',),
-                    x @ _ if 0xa0 <= x && x <= 0xfe  => (from | 1),
-                    _ => from
-                }
-            }
-            0x1f => {
-                match low_byte {
-                    x @ _ if 0x08 <= x && x <= 0x0f  => from.wrapping_sub(0x0008),
-                    x @ _ if 0x18 <= x && x <= 0x1d  => from.wrapping_sub(0x0008),
-                    x @ _ if 0x28 <= x && x <= 0x2f  => from.wrapping_sub(0x0008),
-                    x @ _ if 0x38 <= x && x <= 0x3f  => from.wrapping_sub(0x0008),
-                    x @ _ if 0x48 <= x && x <= 0x4d  => from.wrapping_sub(0x0008),
-                    0x50 => return Fold::Two('\u{03c5}', '\u{0313}',),
-                    0x52 => return Fold::Three('\u{03c5}', '\u{0313}', '\u{0300}',),
-                    0x54 => return Fold::Three('\u{03c5}', '\u{0313}', '\u{0301}',),
-                    0x56 => return Fold::Three('\u{03c5}', '\u{0313}', '\u{0342}',),
-                    x @ _ if 0x59 <= x && x <= 0x5f  => if (from & 1) == 1 { from.wrapping_sub(0x0008) } else { from },
-                    x @ _ if 0x68 <= x && x <= 0x6f  => from.wrapping_sub(0x0008),
-                    0x80 => return Fold::Two('\u{1f00}', '\u{03b9}',),
-                    0x81 => return Fold::Two('\u{1f01}', '\u{03b9}',),
-                    0x82 => return Fold::Two('\u{1f02}', '\u{03b9}',),
-                    0x83 => return Fold::Two('\u{1f03}', '\u{03b9}',),
-                    0x84 => return Fold::Two('\u{1f04}', '\u{03b9}',),
-                    0x85 => return Fold::Two('\u{1f05}', '\u{03b9}',),
-                    0x86 => return Fold::Two('\u{1f06}', '\u{03b9}',),
-                    0x87 => return Fold::Two('\u{1f07}', '\u{03b9}',),
-                    0x88 => return Fold::Two('\u{1f00}', '\u{03b9}',),
-                    0x89 => return Fold::Two('\u{1f01}', '\u{03b9}',),
-                    0x8a => return Fold::Two('\u{1f02}', '\u{03b9}',),
-                    0x8b => return Fold::Two('\u{1f03}', '\u{03b9}',),
-                    0x8c => return Fold::Two('\u{1f04}', '\u{03b9}',),
-                    0x8d => return Fold::Two('\u{1f05}', '\u{03b9}',),
-                    0x8e => return Fold::Two('\u{1f06}', '\u{03b9}',),
-                    0x8f => return Fold::Two('\u{1f07}', '\u{03b9}',),
-                    0x90 => return Fold::Two('\u{1f20}', '\u{03b9}',),
-                    0x91 => return Fold::Two('\u{1f21}', '\u{03b9}',),
-                    0x92 => return Fold::Two('\u{1f22}', '\u{03b9}',),
-                    0x93 => return Fold::Two('\u{1f23}', '\u{03b9}',),
-                    0x94 => return Fold::Two('\u{1f24}', '\u{03b9}',),
-                    0x95 => return Fold::Two('\u{1f25}', '\u{03b9}',),
-                    0x96 => return Fold::Two('\u{1f26}', '\u{03b9}',),
-                    0x97 => return Fold::Two('\u{1f27}', '\u{03b9}',),
-                    0x98 => return Fold::Two('\u{1f20}', '\u{03b9}',),
-                    0x99 => return Fold::Two('\u{1f21}', '\u{03b9}',),
-                    0x9a => return Fold::Two('\u{1f22}', '\u{03b9}',),
-                    0x9b => return Fold::Two('\u{1f23}', '\u{03b9}',),
-                    0x9c => return Fold::Two('\u{1f24}', '\u{03b9}',),
-                    0x9d => return Fold::Two('\u{1f25}', '\u{03b9}',),
-                    0x9e => return Fold::Two('\u{1f26}', '\u{03b9}',),
-                    0x9f => return Fold::Two('\u{1f27}', '\u{03b9}',),
-                    0xa0 => return Fold::Two('\u{1f60}', '\u{03b9}',),
-                    0xa1 => return Fold::Two('\u{1f61}', '\u{03b9}',),
-                    0xa2 => return Fold::Two('\u{1f62}', '\u{03b9}',),
-                    0xa3 => return Fold::Two('\u{1f63}', '\u{03b9}',),
-                    0xa4 => return Fold::Two('\u{1f64}', '\u{03b9}',),
-                    0xa5 => return Fold::Two('\u{1f65}', '\u{03b9}',),
-                    0xa6 => return Fold::Two('\u{1f66}', '\u{03b9}',),
-                    0xa7 => return Fold::Two('\u{1f67}', '\u{03b9}',),
-                    0xa8 => return Fold::Two('\u{1f60}', '\u{03b9}',),
-                    0xa9 => return Fold::Two('\u{1f61}', '\u{03b9}',),
-                    0xaa => return Fold::Two('\u{1f62}', '\u{03b9}',),
-                    0xab => return Fold::Two('\u{1f63}', '\u{03b9}',),
-                    0xac => return Fold::Two('\u{1f64}', '\u{03b9}',),
-                    0xad => return Fold::Two('\u{1f65}', '\u{03b9}',),
-                    0xae => return Fold::Two('\u{1f66}', '\u{03b9}',),
-                    0xaf => return Fold::Two('\u{1f67}', '\u{03b9}',),
-                    0xb2 => return Fold::Two('\u{1f70}', '\u{03b9}',),
-                    0xb3 => return Fold::Two('\u{03b1}', '\u{03b9}',),
-                    0xb4 => return Fold::Two('\u{03ac}', '\u{03b9}',),
-                    0xb6 => return Fold::Two('\u{03b1}', '\u{0342}',),
-                    0xb7 => return Fold::Three('\u{03b1}', '\u{0342}', '\u{03b9}',),
-                    x @ _ if 0xb8 <= x && x <= 0xb9  => from.wrapping_sub(0x0008),
-                    x @ _ if 0xba <= x && x <= 0xbb  => from.wrapping_sub(0x004a),
-                    0xbc => return Fold::Two('\u{03b1}', '\u{03b9}',),
-                    0xbe => 0x03b9,
-                    0xc2 => return Fold::Two('\u{1f74}', '\u{03b9}',),
-                    0xc3 => return Fold::Two('\u{03b7}', '\u{03b9}',),
-                    0xc4 => return Fold::Two('\u{03ae}', '\u{03b9}',),
-                    0xc6 => return Fold::Two('\u{03b7}', '\u{0342}',),
-                    0xc7 => return Fold::Three('\u{03b7}', '\u{0342}', '\u{03b9}',),
-                    x @ _ if 0xc8 <= x && x <= 0xcb  => from.wrapping_sub(0x0056),
-                    0xcc => return Fold::Two('\u{03b7}', '\u{03b9}',),
-                    0xd2 => return Fold::Three('\u{03b9}', '\u{0308}', '\u{0300}',),
-                    0xd3 => return Fold::Three('\u{03b9}', '\u{0308}', '\u{0301}',),
-                    0xd6 => return Fold::Two('\u{03b9}', '\u{0342}',),
-                    0xd7 => return Fold::Three('\u{03b9}', '\u{0308}', '\u{0342}',),
-                    x @ _ if 0xd8 <= x && x <= 0xd9  => from.wrapping_sub(0x0008),
-                    x @ _ if 0xda <= x && x <= 0xdb  => from.wrapping_sub(0x0064),
-                    0xe2 => return Fold::Three('\u{03c5}', '\u{0308}', '\u{0300}',),
-                    0xe3 => return Fold::Three('\u{03c5}', '\u{0308}', '\u{0301}',),
-                    0xe4 => return Fold::Two('\u{03c1}', '\u{0313}',),
-                    0xe6 => return Fold::Two('\u{03c5}', '\u{0342}',),
-                    0xe7 => return Fold::Three('\u{03c5}', '\u{0308}', '\u{0342}',),
-                    x @ _ if 0xe8 <= x && x <= 0xe9  => from.wrapping_sub(0x0008),
-                    x @ _ if 0xea <= x && x <= 0xeb  => from.wrapping_sub(0x0070),
-                    0xec => 0x1fe5,
-                    0xf2 => return Fold::Two('\u{1f7c}', '\u{03b9}',),
-                    0xf3 => return Fold::Two('\u{03c9}', '\u{03b9}',),
-                    0xf4 => return Fold::Two('\u{03ce}', '\u{03b9}',),
-                    0xf6 => return Fold::Two('\u{03c9}', '\u{0342}',),
-                    0xf7 => return Fold::Three('\u{03c9}', '\u{0342}', '\u{03b9}',),
-                    x @ _ if 0xf8 <= x && x <= 0xf9  => from.wrapping_sub(0x0080),
-                    x @ _ if 0xfa <= x && x <= 0xfb  => from.wrapping_sub(0x007e),
-                    0xfc => return Fold::Two('\u{03c9}', '\u{03b9}',),
-                    _ => from
-                }
-            }
-            0x20 => {
-                from
-            }
-            0x21 => {
-                match low_byte {
-                    0x26 => 0x03c9,
-                    0x2a => 0x006b,
-                    0x2b => 0x00e5,
-                    0x32 => 0x214e,
-                    x @ _ if 0x60 <= x && x <= 0x6f  => from.wrapping_add(0x0010),
-                    0x83 => 0x2184,
-                    _ => from
-                }
-            }
-            0x22 => {
-                from
-            }
-            0x23 => {
-                from
-            }
-            0x24 => {
-                match low_byte {
-                    x @ _ if 0xb6 <= x && x <= 0xcf  => from.wrapping_add(0x001a),
-                    _ => from
-                }
-            }
-            0x25 => {
-                from
-            }
-            0x26 => {
-                from
-            }
-            0x27 => {
-                from
-            }
-            0x28 => {
-                from
-            }
-            0x29 => {
-                from
-            }
-            0x2a => {
-                from
-            }
-            0x2b => {
-                from
-            }
-            0x2c => {
-                match low_byte {
-                    x @ _ if x <= 0x2e  => from.wrapping_add(0x0030),
-                    0x60 => 0x2c61,
-                    0x62 => 0x026b,
-                    0x63 => 0x1d7d,
-                    0x64 => 0x027d,
-                    x @ _ if 0x67 <= x && x <= 0x6b  => ((from+1) & !1),
-                    0x6d => 0x0251,
-                    0x6e => 0x0271,
-                    0x6f => 0x0250,
-                    0x70 => 0x0252,
-                    0x72 => 0x2c73,
-                    0x75 => 0x2c76,
-                    x @ _ if 0x7e <= x && x <= 0x7f  => from.wrapping_sub(0x2a3f),
-                    x @ _ if 0x80 <= x && x <= 0xe2  => (from | 1),
-                    x @ _ if 0xeb <= x && x <= 0xed  => ((from+1) & !1),
-                    0xf2 => 0x2cf3,
-                    _ => from
-                }
-            }
-            _ => from 
-        };
-        Fold::One( char::from_u32(single_char as u32).unwrap_or(orig) )
-    } else {
-        let single_char: u32 = match from {
-            x @ _ if 0xa640 <= x && x <= 0xa66c  => (from | 1),
-            x @ _ if 0xa680 <= x && x <= 0xa69a  => (from | 1),
-            x @ _ if 0xa722 <= x && x <= 0xa72e  => (from | 1),
-            x @ _ if 0xa732 <= x && x <= 0xa76e  => (from | 1),
-            x @ _ if 0xa779 <= x && x <= 0xa77b  => ((from+1) & !1),
-            0xa77d => 0x1d79,
-            x @ _ if 0xa77e <= x && x <= 0xa786  => (from | 1),
-            0xa78b => 0xa78c,
-            0xa78d => 0x0265,
-            x @ _ if 0xa790 <= x && x <= 0xa792  => (from | 1),
-            x @ _ if 0xa796 <= x && x <= 0xa7a8  => (from | 1),
-            0xa7aa => 0x0266,
-            0xa7ab => 0x025c,
-            0xa7ac => 0x0261,
-            0xa7ad => 0x026c,
-            0xa7ae => 0x026a,
-            0xa7b0 => 0x029e,
-            0xa7b1 => 0x0287,
-            0xa7b2 => 0x029d,
-            0xa7b3 => 0xab53,
-            x @ _ if 0xa7b4 <= x && x <= 0xa7be  => (from | 1),
-            0xa7c2 => 0xa7c3,
-            0xa7c4 => 0xa794,
-            0xa7c5 => 0x0282,
-            0xa7c6 => 0x1d8e,
-            x @ _ if 0xab70 <= x && x <= 0xabbf  => from.wrapping_sub(0x97d0),
-            0xfb00 => return Fold::Two('\u{0066}', '\u{0066}',),
-            0xfb01 => return Fold::Two('\u{0066}', '\u{0069}',),
-            0xfb02 => return Fold::Two('\u{0066}', '\u{006c}',),
-            0xfb03 => return Fold::Three('\u{0066}', '\u{0066}', '\u{0069}',),
-            0xfb04 => return Fold::Three('\u{0066}', '\u{0066}', '\u{006c}',),
-            0xfb05 => return Fold::Two('\u{0073}', '\u{0074}',),
-            0xfb06 => return Fold::Two('\u{0073}', '\u{0074}',),
-            0xfb13 => return Fold::Two('\u{0574}', '\u{0576}',),
-            0xfb14 => return Fold::Two('\u{0574}', '\u{0565}',),
-            0xfb15 => return Fold::Two('\u{0574}', '\u{056b}',),
-            0xfb16 => return Fold::Two('\u{057e}', '\u{0576}',),
-            0xfb17 => return Fold::Two('\u{0574}', '\u{056d}',),
-            x @ _ if 0xff21 <= x && x <= 0xff3a  => from.wrapping_add(0x0020),
-            x @ _ if 0x10400 <= x && x <= 0x10427  => from.wrapping_add(0x0028),
-            x @ _ if 0x104b0 <= x && x <= 0x104d3  => from.wrapping_add(0x0028),
-            x @ _ if 0x10c80 <= x && x <= 0x10cb2  => from.wrapping_add(0x0040),
-            x @ _ if 0x118a0 <= x && x <= 0x118bf  => from.wrapping_add(0x0020),
-            x @ _ if 0x16e40 <= x && x <= 0x16e5f  => from.wrapping_add(0x0020),
-            x @ _ if 0x1e900 <= x && x <= 0x1e921  => from.wrapping_add(0x0022),
-            _ => from
-        };
-        Fold::One( char::from_u32(single_char).unwrap_or(orig) )
-    }
-}
-
-#[test]
-fn lookup_consistency() {
-    fn lookup_naive(orig: char) -> Fold {
-        let single_char = match orig as u32 {
-            0x0041 => 0x0061,
-            0x0042 => 0x0062,
-            0x0043 => 0x0063,
-            0x0044 => 0x0064,
-            0x0045 => 0x0065,
-            0x0046 => 0x0066,
-            0x0047 => 0x0067,
-            0x0048 => 0x0068,
-            0x0049 => 0x0069,
-            0x004a => 0x006a,
-            0x004b => 0x006b,
-            0x004c => 0x006c,
-            0x004d => 0x006d,
-            0x004e => 0x006e,
-            0x004f => 0x006f,
-            0x0050 => 0x0070,
-            0x0051 => 0x0071,
-            0x0052 => 0x0072,
-            0x0053 => 0x0073,
-            0x0054 => 0x0074,
-            0x0055 => 0x0075,
-            0x0056 => 0x0076,
-            0x0057 => 0x0077,
-            0x0058 => 0x0078,
-            0x0059 => 0x0079,
-            0x005a => 0x007a,
-            0x00b5 => 0x03bc,
-            0x00c0 => 0x00e0,
-            0x00c1 => 0x00e1,
-            0x00c2 => 0x00e2,
-            0x00c3 => 0x00e3,
-            0x00c4 => 0x00e4,
-            0x00c5 => 0x00e5,
-            0x00c6 => 0x00e6,
-            0x00c7 => 0x00e7,
-            0x00c8 => 0x00e8,
-            0x00c9 => 0x00e9,
-            0x00ca => 0x00ea,
-            0x00cb => 0x00eb,
-            0x00cc => 0x00ec,
-            0x00cd => 0x00ed,
-            0x00ce => 0x00ee,
-            0x00cf => 0x00ef,
-            0x00d0 => 0x00f0,
-            0x00d1 => 0x00f1,
-            0x00d2 => 0x00f2,
-            0x00d3 => 0x00f3,
-            0x00d4 => 0x00f4,
-            0x00d5 => 0x00f5,
-            0x00d6 => 0x00f6,
-            0x00d8 => 0x00f8,
-            0x00d9 => 0x00f9,
-            0x00da => 0x00fa,
-            0x00db => 0x00fb,
-            0x00dc => 0x00fc,
-            0x00dd => 0x00fd,
-            0x00de => 0x00fe,
-            0x00df => return Fold::Two('\u{0073}', '\u{0073}',),
-            0x0100 => 0x0101,
-            0x0102 => 0x0103,
-            0x0104 => 0x0105,
-            0x0106 => 0x0107,
-            0x0108 => 0x0109,
-            0x010a => 0x010b,
-            0x010c => 0x010d,
-            0x010e => 0x010f,
-            0x0110 => 0x0111,
-            0x0112 => 0x0113,
-            0x0114 => 0x0115,
-            0x0116 => 0x0117,
-            0x0118 => 0x0119,
-            0x011a => 0x011b,
-            0x011c => 0x011d,
-            0x011e => 0x011f,
-            0x0120 => 0x0121,
-            0x0122 => 0x0123,
-            0x0124 => 0x0125,
-            0x0126 => 0x0127,
-            0x0128 => 0x0129,
-            0x012a => 0x012b,
-            0x012c => 0x012d,
-            0x012e => 0x012f,
-            0x0130 => return Fold::Two('\u{0069}', '\u{0307}',),
-            0x0132 => 0x0133,
-            0x0134 => 0x0135,
-            0x0136 => 0x0137,
-            0x0139 => 0x013a,
-            0x013b => 0x013c,
-            0x013d => 0x013e,
-            0x013f => 0x0140,
-            0x0141 => 0x0142,
-            0x0143 => 0x0144,
-            0x0145 => 0x0146,
-            0x0147 => 0x0148,
-            0x0149 => return Fold::Two('\u{02bc}', '\u{006e}',),
-            0x014a => 0x014b,
-            0x014c => 0x014d,
-            0x014e => 0x014f,
-            0x0150 => 0x0151,
-            0x0152 => 0x0153,
-            0x0154 => 0x0155,
-            0x0156 => 0x0157,
-            0x0158 => 0x0159,
-            0x015a => 0x015b,
-            0x015c => 0x015d,
-            0x015e => 0x015f,
-            0x0160 => 0x0161,
-            0x0162 => 0x0163,
-            0x0164 => 0x0165,
-            0x0166 => 0x0167,
-            0x0168 => 0x0169,
-            0x016a => 0x016b,
-            0x016c => 0x016d,
-            0x016e => 0x016f,
-            0x0170 => 0x0171,
-            0x0172 => 0x0173,
-            0x0174 => 0x0175,
-            0x0176 => 0x0177,
-            0x0178 => 0x00ff,
-            0x0179 => 0x017a,
-            0x017b => 0x017c,
-            0x017d => 0x017e,
-            0x017f => 0x0073,
-            0x0181 => 0x0253,
-            0x0182 => 0x0183,
-            0x0184 => 0x0185,
-            0x0186 => 0x0254,
-            0x0187 => 0x0188,
-            0x0189 => 0x0256,
-            0x018a => 0x0257,
-            0x018b => 0x018c,
-            0x018e => 0x01dd,
-            0x018f => 0x0259,
-            0x0190 => 0x025b,
-            0x0191 => 0x0192,
-            0x0193 => 0x0260,
-            0x0194 => 0x0263,
-            0x0196 => 0x0269,
-            0x0197 => 0x0268,
-            0x0198 => 0x0199,
-            0x019c => 0x026f,
-            0x019d => 0x0272,
-            0x019f => 0x0275,
-            0x01a0 => 0x01a1,
-            0x01a2 => 0x01a3,
-            0x01a4 => 0x01a5,
-            0x01a6 => 0x0280,
-            0x01a7 => 0x01a8,
-            0x01a9 => 0x0283,
-            0x01ac => 0x01ad,
-            0x01ae => 0x0288,
-            0x01af => 0x01b0,
-            0x01b1 => 0x028a,
-            0x01b2 => 0x028b,
-            0x01b3 => 0x01b4,
-            0x01b5 => 0x01b6,
-            0x01b7 => 0x0292,
-            0x01b8 => 0x01b9,
-            0x01bc => 0x01bd,
-            0x01c4 => 0x01c6,
-            0x01c5 => 0x01c6,
-            0x01c7 => 0x01c9,
-            0x01c8 => 0x01c9,
-            0x01ca => 0x01cc,
-            0x01cb => 0x01cc,
-            0x01cd => 0x01ce,
-            0x01cf => 0x01d0,
-            0x01d1 => 0x01d2,
-            0x01d3 => 0x01d4,
-            0x01d5 => 0x01d6,
-            0x01d7 => 0x01d8,
-            0x01d9 => 0x01da,
-            0x01db => 0x01dc,
-            0x01de => 0x01df,
-            0x01e0 => 0x01e1,
-            0x01e2 => 0x01e3,
-            0x01e4 => 0x01e5,
-            0x01e6 => 0x01e7,
-            0x01e8 => 0x01e9,
-            0x01ea => 0x01eb,
-            0x01ec => 0x01ed,
-            0x01ee => 0x01ef,
-            0x01f0 => return Fold::Two('\u{006a}', '\u{030c}',),
-            0x01f1 => 0x01f3,
-            0x01f2 => 0x01f3,
-            0x01f4 => 0x01f5,
-            0x01f6 => 0x0195,
-            0x01f7 => 0x01bf,
-            0x01f8 => 0x01f9,
-            0x01fa => 0x01fb,
-            0x01fc => 0x01fd,
-            0x01fe => 0x01ff,
-            0x0200 => 0x0201,
-            0x0202 => 0x0203,
-            0x0204 => 0x0205,
-            0x0206 => 0x0207,
-            0x0208 => 0x0209,
-            0x020a => 0x020b,
-            0x020c => 0x020d,
-            0x020e => 0x020f,
-            0x0210 => 0x0211,
-            0x0212 => 0x0213,
-            0x0214 => 0x0215,
-            0x0216 => 0x0217,
-            0x0218 => 0x0219,
-            0x021a => 0x021b,
-            0x021c => 0x021d,
-            0x021e => 0x021f,
-            0x0220 => 0x019e,
-            0x0222 => 0x0223,
-            0x0224 => 0x0225,
-            0x0226 => 0x0227,
-            0x0228 => 0x0229,
-            0x022a => 0x022b,
-            0x022c => 0x022d,
-            0x022e => 0x022f,
-            0x0230 => 0x0231,
-            0x0232 => 0x0233,
-            0x023a => 0x2c65,
-            0x023b => 0x023c,
-            0x023d => 0x019a,
-            0x023e => 0x2c66,
-            0x0241 => 0x0242,
-            0x0243 => 0x0180,
-            0x0244 => 0x0289,
-            0x0245 => 0x028c,
-            0x0246 => 0x0247,
-            0x0248 => 0x0249,
-            0x024a => 0x024b,
-            0x024c => 0x024d,
-            0x024e => 0x024f,
-            0x0345 => 0x03b9,
-            0x0370 => 0x0371,
-            0x0372 => 0x0373,
-            0x0376 => 0x0377,
-            0x037f => 0x03f3,
-            0x0386 => 0x03ac,
-            0x0388 => 0x03ad,
-            0x0389 => 0x03ae,
-            0x038a => 0x03af,
-            0x038c => 0x03cc,
-            0x038e => 0x03cd,
-            0x038f => 0x03ce,
-            0x0390 => return Fold::Three('\u{03b9}', '\u{0308}', '\u{0301}',),
-            0x0391 => 0x03b1,
-            0x0392 => 0x03b2,
-            0x0393 => 0x03b3,
-            0x0394 => 0x03b4,
-            0x0395 => 0x03b5,
-            0x0396 => 0x03b6,
-            0x0397 => 0x03b7,
-            0x0398 => 0x03b8,
-            0x0399 => 0x03b9,
-            0x039a => 0x03ba,
-            0x039b => 0x03bb,
-            0x039c => 0x03bc,
-            0x039d => 0x03bd,
-            0x039e => 0x03be,
-            0x039f => 0x03bf,
-            0x03a0 => 0x03c0,
-            0x03a1 => 0x03c1,
-            0x03a3 => 0x03c3,
-            0x03a4 => 0x03c4,
-            0x03a5 => 0x03c5,
-            0x03a6 => 0x03c6,
-            0x03a7 => 0x03c7,
-            0x03a8 => 0x03c8,
-            0x03a9 => 0x03c9,
-            0x03aa => 0x03ca,
-            0x03ab => 0x03cb,
-            0x03b0 => return Fold::Three('\u{03c5}', '\u{0308}', '\u{0301}',),
-            0x03c2 => 0x03c3,
-            0x03cf => 0x03d7,
-            0x03d0 => 0x03b2,
-            0x03d1 => 0x03b8,
-            0x03d5 => 0x03c6,
-            0x03d6 => 0x03c0,
-            0x03d8 => 0x03d9,
-            0x03da => 0x03db,
-            0x03dc => 0x03dd,
-            0x03de => 0x03df,
-            0x03e0 => 0x03e1,
-            0x03e2 => 0x03e3,
-            0x03e4 => 0x03e5,
-            0x03e6 => 0x03e7,
-            0x03e8 => 0x03e9,
-            0x03ea => 0x03eb,
-            0x03ec => 0x03ed,
-            0x03ee => 0x03ef,
-            0x03f0 => 0x03ba,
-            0x03f1 => 0x03c1,
-            0x03f4 => 0x03b8,
-            0x03f5 => 0x03b5,
-            0x03f7 => 0x03f8,
-            0x03f9 => 0x03f2,
-            0x03fa => 0x03fb,
-            0x03fd => 0x037b,
-            0x03fe => 0x037c,
-            0x03ff => 0x037d,
-            0x0400 => 0x0450,
-            0x0401 => 0x0451,
-            0x0402 => 0x0452,
-            0x0403 => 0x0453,
-            0x0404 => 0x0454,
-            0x0405 => 0x0455,
-            0x0406 => 0x0456,
-            0x0407 => 0x0457,
-            0x0408 => 0x0458,
-            0x0409 => 0x0459,
-            0x040a => 0x045a,
-            0x040b => 0x045b,
-            0x040c => 0x045c,
-            0x040d => 0x045d,
-            0x040e => 0x045e,
-            0x040f => 0x045f,
-            0x0410 => 0x0430,
-            0x0411 => 0x0431,
-            0x0412 => 0x0432,
-            0x0413 => 0x0433,
-            0x0414 => 0x0434,
-            0x0415 => 0x0435,
-            0x0416 => 0x0436,
-            0x0417 => 0x0437,
-            0x0418 => 0x0438,
-            0x0419 => 0x0439,
-            0x041a => 0x043a,
-            0x041b => 0x043b,
-            0x041c => 0x043c,
-            0x041d => 0x043d,
-            0x041e => 0x043e,
-            0x041f => 0x043f,
-            0x0420 => 0x0440,
-            0x0421 => 0x0441,
-            0x0422 => 0x0442,
-            0x0423 => 0x0443,
-            0x0424 => 0x0444,
-            0x0425 => 0x0445,
-            0x0426 => 0x0446,
-            0x0427 => 0x0447,
-            0x0428 => 0x0448,
-            0x0429 => 0x0449,
-            0x042a => 0x044a,
-            0x042b => 0x044b,
-            0x042c => 0x044c,
-            0x042d => 0x044d,
-            0x042e => 0x044e,
-            0x042f => 0x044f,
-            0x0460 => 0x0461,
-            0x0462 => 0x0463,
-            0x0464 => 0x0465,
-            0x0466 => 0x0467,
-            0x0468 => 0x0469,
-            0x046a => 0x046b,
-            0x046c => 0x046d,
-            0x046e => 0x046f,
-            0x0470 => 0x0471,
-            0x0472 => 0x0473,
-            0x0474 => 0x0475,
-            0x0476 => 0x0477,
-            0x0478 => 0x0479,
-            0x047a => 0x047b,
-            0x047c => 0x047d,
-            0x047e => 0x047f,
-            0x0480 => 0x0481,
-            0x048a => 0x048b,
-            0x048c => 0x048d,
-            0x048e => 0x048f,
-            0x0490 => 0x0491,
-            0x0492 => 0x0493,
-            0x0494 => 0x0495,
-            0x0496 => 0x0497,
-            0x0498 => 0x0499,
-            0x049a => 0x049b,
-            0x049c => 0x049d,
-            0x049e => 0x049f,
-            0x04a0 => 0x04a1,
-            0x04a2 => 0x04a3,
-            0x04a4 => 0x04a5,
-            0x04a6 => 0x04a7,
-            0x04a8 => 0x04a9,
-            0x04aa => 0x04ab,
-            0x04ac => 0x04ad,
-            0x04ae => 0x04af,
-            0x04b0 => 0x04b1,
-            0x04b2 => 0x04b3,
-            0x04b4 => 0x04b5,
-            0x04b6 => 0x04b7,
-            0x04b8 => 0x04b9,
-            0x04ba => 0x04bb,
-            0x04bc => 0x04bd,
-            0x04be => 0x04bf,
-            0x04c0 => 0x04cf,
-            0x04c1 => 0x04c2,
-            0x04c3 => 0x04c4,
-            0x04c5 => 0x04c6,
-            0x04c7 => 0x04c8,
-            0x04c9 => 0x04ca,
-            0x04cb => 0x04cc,
-            0x04cd => 0x04ce,
-            0x04d0 => 0x04d1,
-            0x04d2 => 0x04d3,
-            0x04d4 => 0x04d5,
-            0x04d6 => 0x04d7,
-            0x04d8 => 0x04d9,
-            0x04da => 0x04db,
-            0x04dc => 0x04dd,
-            0x04de => 0x04df,
-            0x04e0 => 0x04e1,
-            0x04e2 => 0x04e3,
-            0x04e4 => 0x04e5,
-            0x04e6 => 0x04e7,
-            0x04e8 => 0x04e9,
-            0x04ea => 0x04eb,
-            0x04ec => 0x04ed,
-            0x04ee => 0x04ef,
-            0x04f0 => 0x04f1,
-            0x04f2 => 0x04f3,
-            0x04f4 => 0x04f5,
-            0x04f6 => 0x04f7,
-            0x04f8 => 0x04f9,
-            0x04fa => 0x04fb,
-            0x04fc => 0x04fd,
-            0x04fe => 0x04ff,
-            0x0500 => 0x0501,
-            0x0502 => 0x0503,
-            0x0504 => 0x0505,
-            0x0506 => 0x0507,
-            0x0508 => 0x0509,
-            0x050a => 0x050b,
-            0x050c => 0x050d,
-            0x050e => 0x050f,
-            0x0510 => 0x0511,
-            0x0512 => 0x0513,
-            0x0514 => 0x0515,
-            0x0516 => 0x0517,
-            0x0518 => 0x0519,
-            0x051a => 0x051b,
-            0x051c => 0x051d,
-            0x051e => 0x051f,
-            0x0520 => 0x0521,
-            0x0522 => 0x0523,
-            0x0524 => 0x0525,
-            0x0526 => 0x0527,
-            0x0528 => 0x0529,
-            0x052a => 0x052b,
-            0x052c => 0x052d,
-            0x052e => 0x052f,
-            0x0531 => 0x0561,
-            0x0532 => 0x0562,
-            0x0533 => 0x0563,
-            0x0534 => 0x0564,
-            0x0535 => 0x0565,
-            0x0536 => 0x0566,
-            0x0537 => 0x0567,
-            0x0538 => 0x0568,
-            0x0539 => 0x0569,
-            0x053a => 0x056a,
-            0x053b => 0x056b,
-            0x053c => 0x056c,
-            0x053d => 0x056d,
-            0x053e => 0x056e,
-            0x053f => 0x056f,
-            0x0540 => 0x0570,
-            0x0541 => 0x0571,
-            0x0542 => 0x0572,
-            0x0543 => 0x0573,
-            0x0544 => 0x0574,
-            0x0545 => 0x0575,
-            0x0546 => 0x0576,
-            0x0547 => 0x0577,
-            0x0548 => 0x0578,
-            0x0549 => 0x0579,
-            0x054a => 0x057a,
-            0x054b => 0x057b,
-            0x054c => 0x057c,
-            0x054d => 0x057d,
-            0x054e => 0x057e,
-            0x054f => 0x057f,
-            0x0550 => 0x0580,
-            0x0551 => 0x0581,
-            0x0552 => 0x0582,
-            0x0553 => 0x0583,
-            0x0554 => 0x0584,
-            0x0555 => 0x0585,
-            0x0556 => 0x0586,
-            0x0587 => return Fold::Two('\u{0565}', '\u{0582}',),
-            0x10a0 => 0x2d00,
-            0x10a1 => 0x2d01,
-            0x10a2 => 0x2d02,
-            0x10a3 => 0x2d03,
-            0x10a4 => 0x2d04,
-            0x10a5 => 0x2d05,
-            0x10a6 => 0x2d06,
-            0x10a7 => 0x2d07,
-            0x10a8 => 0x2d08,
-            0x10a9 => 0x2d09,
-            0x10aa => 0x2d0a,
-            0x10ab => 0x2d0b,
-            0x10ac => 0x2d0c,
-            0x10ad => 0x2d0d,
-            0x10ae => 0x2d0e,
-            0x10af => 0x2d0f,
-            0x10b0 => 0x2d10,
-            0x10b1 => 0x2d11,
-            0x10b2 => 0x2d12,
-            0x10b3 => 0x2d13,
-            0x10b4 => 0x2d14,
-            0x10b5 => 0x2d15,
-            0x10b6 => 0x2d16,
-            0x10b7 => 0x2d17,
-            0x10b8 => 0x2d18,
-            0x10b9 => 0x2d19,
-            0x10ba => 0x2d1a,
-            0x10bb => 0x2d1b,
-            0x10bc => 0x2d1c,
-            0x10bd => 0x2d1d,
-            0x10be => 0x2d1e,
-            0x10bf => 0x2d1f,
-            0x10c0 => 0x2d20,
-            0x10c1 => 0x2d21,
-            0x10c2 => 0x2d22,
-            0x10c3 => 0x2d23,
-            0x10c4 => 0x2d24,
-            0x10c5 => 0x2d25,
-            0x10c7 => 0x2d27,
-            0x10cd => 0x2d2d,
-            0x13f8 => 0x13f0,
-            0x13f9 => 0x13f1,
-            0x13fa => 0x13f2,
-            0x13fb => 0x13f3,
-            0x13fc => 0x13f4,
-            0x13fd => 0x13f5,
-            0x1c80 => 0x0432,
-            0x1c81 => 0x0434,
-            0x1c82 => 0x043e,
-            0x1c83 => 0x0441,
-            0x1c84 => 0x0442,
-            0x1c85 => 0x0442,
-            0x1c86 => 0x044a,
-            0x1c87 => 0x0463,
-            0x1c88 => 0xa64b,
-            0x1c90 => 0x10d0,
-            0x1c91 => 0x10d1,
-            0x1c92 => 0x10d2,
-            0x1c93 => 0x10d3,
-            0x1c94 => 0x10d4,
-            0x1c95 => 0x10d5,
-            0x1c96 => 0x10d6,
-            0x1c97 => 0x10d7,
-            0x1c98 => 0x10d8,
-            0x1c99 => 0x10d9,
-            0x1c9a => 0x10da,
-            0x1c9b => 0x10db,
-            0x1c9c => 0x10dc,
-            0x1c9d => 0x10dd,
-            0x1c9e => 0x10de,
-            0x1c9f => 0x10df,
-            0x1ca0 => 0x10e0,
-            0x1ca1 => 0x10e1,
-            0x1ca2 => 0x10e2,
-            0x1ca3 => 0x10e3,
-            0x1ca4 => 0x10e4,
-            0x1ca5 => 0x10e5,
-            0x1ca6 => 0x10e6,
-            0x1ca7 => 0x10e7,
-            0x1ca8 => 0x10e8,
-            0x1ca9 => 0x10e9,
-            0x1caa => 0x10ea,
-            0x1cab => 0x10eb,
-            0x1cac => 0x10ec,
-            0x1cad => 0x10ed,
-            0x1cae => 0x10ee,
-            0x1caf => 0x10ef,
-            0x1cb0 => 0x10f0,
-            0x1cb1 => 0x10f1,
-            0x1cb2 => 0x10f2,
-            0x1cb3 => 0x10f3,
-            0x1cb4 => 0x10f4,
-            0x1cb5 => 0x10f5,
-            0x1cb6 => 0x10f6,
-            0x1cb7 => 0x10f7,
-            0x1cb8 => 0x10f8,
-            0x1cb9 => 0x10f9,
-            0x1cba => 0x10fa,
-            0x1cbd => 0x10fd,
-            0x1cbe => 0x10fe,
-            0x1cbf => 0x10ff,
-            0x1e00 => 0x1e01,
-            0x1e02 => 0x1e03,
-            0x1e04 => 0x1e05,
-            0x1e06 => 0x1e07,
-            0x1e08 => 0x1e09,
-            0x1e0a => 0x1e0b,
-            0x1e0c => 0x1e0d,
-            0x1e0e => 0x1e0f,
-            0x1e10 => 0x1e11,
-            0x1e12 => 0x1e13,
-            0x1e14 => 0x1e15,
-            0x1e16 => 0x1e17,
-            0x1e18 => 0x1e19,
-            0x1e1a => 0x1e1b,
-            0x1e1c => 0x1e1d,
-            0x1e1e => 0x1e1f,
-            0x1e20 => 0x1e21,
-            0x1e22 => 0x1e23,
-            0x1e24 => 0x1e25,
-            0x1e26 => 0x1e27,
-            0x1e28 => 0x1e29,
-            0x1e2a => 0x1e2b,
-            0x1e2c => 0x1e2d,
-            0x1e2e => 0x1e2f,
-            0x1e30 => 0x1e31,
-            0x1e32 => 0x1e33,
-            0x1e34 => 0x1e35,
-            0x1e36 => 0x1e37,
-            0x1e38 => 0x1e39,
-            0x1e3a => 0x1e3b,
-            0x1e3c => 0x1e3d,
-            0x1e3e => 0x1e3f,
-            0x1e40 => 0x1e41,
-            0x1e42 => 0x1e43,
-            0x1e44 => 0x1e45,
-            0x1e46 => 0x1e47,
-            0x1e48 => 0x1e49,
-            0x1e4a => 0x1e4b,
-            0x1e4c => 0x1e4d,
-            0x1e4e => 0x1e4f,
-            0x1e50 => 0x1e51,
-            0x1e52 => 0x1e53,
-            0x1e54 => 0x1e55,
-            0x1e56 => 0x1e57,
-            0x1e58 => 0x1e59,
-            0x1e5a => 0x1e5b,
-            0x1e5c => 0x1e5d,
-            0x1e5e => 0x1e5f,
-            0x1e60 => 0x1e61,
-            0x1e62 => 0x1e63,
-            0x1e64 => 0x1e65,
-            0x1e66 => 0x1e67,
-            0x1e68 => 0x1e69,
-            0x1e6a => 0x1e6b,
-            0x1e6c => 0x1e6d,
-            0x1e6e => 0x1e6f,
-            0x1e70 => 0x1e71,
-            0x1e72 => 0x1e73,
-            0x1e74 => 0x1e75,
-            0x1e76 => 0x1e77,
-            0x1e78 => 0x1e79,
-            0x1e7a => 0x1e7b,
-            0x1e7c => 0x1e7d,
-            0x1e7e => 0x1e7f,
-            0x1e80 => 0x1e81,
-            0x1e82 => 0x1e83,
-            0x1e84 => 0x1e85,
-            0x1e86 => 0x1e87,
-            0x1e88 => 0x1e89,
-            0x1e8a => 0x1e8b,
-            0x1e8c => 0x1e8d,
-            0x1e8e => 0x1e8f,
-            0x1e90 => 0x1e91,
-            0x1e92 => 0x1e93,
-            0x1e94 => 0x1e95,
-            0x1e96 => return Fold::Two('\u{0068}', '\u{0331}',),
-            0x1e97 => return Fold::Two('\u{0074}', '\u{0308}',),
-            0x1e98 => return Fold::Two('\u{0077}', '\u{030a}',),
-            0x1e99 => return Fold::Two('\u{0079}', '\u{030a}',),
-            0x1e9a => return Fold::Two('\u{0061}', '\u{02be}',),
-            0x1e9b => 0x1e61,
-            0x1e9e => return Fold::Two('\u{0073}', '\u{0073}',),
-            0x1ea0 => 0x1ea1,
-            0x1ea2 => 0x1ea3,
-            0x1ea4 => 0x1ea5,
-            0x1ea6 => 0x1ea7,
-            0x1ea8 => 0x1ea9,
-            0x1eaa => 0x1eab,
-            0x1eac => 0x1ead,
-            0x1eae => 0x1eaf,
-            0x1eb0 => 0x1eb1,
-            0x1eb2 => 0x1eb3,
-            0x1eb4 => 0x1eb5,
-            0x1eb6 => 0x1eb7,
-            0x1eb8 => 0x1eb9,
-            0x1eba => 0x1ebb,
-            0x1ebc => 0x1ebd,
-            0x1ebe => 0x1ebf,
-            0x1ec0 => 0x1ec1,
-            0x1ec2 => 0x1ec3,
-            0x1ec4 => 0x1ec5,
-            0x1ec6 => 0x1ec7,
-            0x1ec8 => 0x1ec9,
-            0x1eca => 0x1ecb,
-            0x1ecc => 0x1ecd,
-            0x1ece => 0x1ecf,
-            0x1ed0 => 0x1ed1,
-            0x1ed2 => 0x1ed3,
-            0x1ed4 => 0x1ed5,
-            0x1ed6 => 0x1ed7,
-            0x1ed8 => 0x1ed9,
-            0x1eda => 0x1edb,
-            0x1edc => 0x1edd,
-            0x1ede => 0x1edf,
-            0x1ee0 => 0x1ee1,
-            0x1ee2 => 0x1ee3,
-            0x1ee4 => 0x1ee5,
-            0x1ee6 => 0x1ee7,
-            0x1ee8 => 0x1ee9,
-            0x1eea => 0x1eeb,
-            0x1eec => 0x1eed,
-            0x1eee => 0x1eef,
-            0x1ef0 => 0x1ef1,
-            0x1ef2 => 0x1ef3,
-            0x1ef4 => 0x1ef5,
-            0x1ef6 => 0x1ef7,
-            0x1ef8 => 0x1ef9,
-            0x1efa => 0x1efb,
-            0x1efc => 0x1efd,
-            0x1efe => 0x1eff,
-            0x1f08 => 0x1f00,
-            0x1f09 => 0x1f01,
-            0x1f0a => 0x1f02,
-            0x1f0b => 0x1f03,
-            0x1f0c => 0x1f04,
-            0x1f0d => 0x1f05,
-            0x1f0e => 0x1f06,
-            0x1f0f => 0x1f07,
-            0x1f18 => 0x1f10,
-            0x1f19 => 0x1f11,
-            0x1f1a => 0x1f12,
-            0x1f1b => 0x1f13,
-            0x1f1c => 0x1f14,
-            0x1f1d => 0x1f15,
-            0x1f28 => 0x1f20,
-            0x1f29 => 0x1f21,
-            0x1f2a => 0x1f22,
-            0x1f2b => 0x1f23,
-            0x1f2c => 0x1f24,
-            0x1f2d => 0x1f25,
-            0x1f2e => 0x1f26,
-            0x1f2f => 0x1f27,
-            0x1f38 => 0x1f30,
-            0x1f39 => 0x1f31,
-            0x1f3a => 0x1f32,
-            0x1f3b => 0x1f33,
-            0x1f3c => 0x1f34,
-            0x1f3d => 0x1f35,
-            0x1f3e => 0x1f36,
-            0x1f3f => 0x1f37,
-            0x1f48 => 0x1f40,
-            0x1f49 => 0x1f41,
-            0x1f4a => 0x1f42,
-            0x1f4b => 0x1f43,
-            0x1f4c => 0x1f44,
-            0x1f4d => 0x1f45,
-            0x1f50 => return Fold::Two('\u{03c5}', '\u{0313}',),
-            0x1f52 => return Fold::Three('\u{03c5}', '\u{0313}', '\u{0300}',),
-            0x1f54 => return Fold::Three('\u{03c5}', '\u{0313}', '\u{0301}',),
-            0x1f56 => return Fold::Three('\u{03c5}', '\u{0313}', '\u{0342}',),
-            0x1f59 => 0x1f51,
-            0x1f5b => 0x1f53,
-            0x1f5d => 0x1f55,
-            0x1f5f => 0x1f57,
-            0x1f68 => 0x1f60,
-            0x1f69 => 0x1f61,
-            0x1f6a => 0x1f62,
-            0x1f6b => 0x1f63,
-            0x1f6c => 0x1f64,
-            0x1f6d => 0x1f65,
-            0x1f6e => 0x1f66,
-            0x1f6f => 0x1f67,
-            0x1f80 => return Fold::Two('\u{1f00}', '\u{03b9}',),
-            0x1f81 => return Fold::Two('\u{1f01}', '\u{03b9}',),
-            0x1f82 => return Fold::Two('\u{1f02}', '\u{03b9}',),
-            0x1f83 => return Fold::Two('\u{1f03}', '\u{03b9}',),
-            0x1f84 => return Fold::Two('\u{1f04}', '\u{03b9}',),
-            0x1f85 => return Fold::Two('\u{1f05}', '\u{03b9}',),
-            0x1f86 => return Fold::Two('\u{1f06}', '\u{03b9}',),
-            0x1f87 => return Fold::Two('\u{1f07}', '\u{03b9}',),
-            0x1f88 => return Fold::Two('\u{1f00}', '\u{03b9}',),
-            0x1f89 => return Fold::Two('\u{1f01}', '\u{03b9}',),
-            0x1f8a => return Fold::Two('\u{1f02}', '\u{03b9}',),
-            0x1f8b => return Fold::Two('\u{1f03}', '\u{03b9}',),
-            0x1f8c => return Fold::Two('\u{1f04}', '\u{03b9}',),
-            0x1f8d => return Fold::Two('\u{1f05}', '\u{03b9}',),
-            0x1f8e => return Fold::Two('\u{1f06}', '\u{03b9}',),
-            0x1f8f => return Fold::Two('\u{1f07}', '\u{03b9}',),
-            0x1f90 => return Fold::Two('\u{1f20}', '\u{03b9}',),
-            0x1f91 => return Fold::Two('\u{1f21}', '\u{03b9}',),
-            0x1f92 => return Fold::Two('\u{1f22}', '\u{03b9}',),
-            0x1f93 => return Fold::Two('\u{1f23}', '\u{03b9}',),
-            0x1f94 => return Fold::Two('\u{1f24}', '\u{03b9}',),
-            0x1f95 => return Fold::Two('\u{1f25}', '\u{03b9}',),
-            0x1f96 => return Fold::Two('\u{1f26}', '\u{03b9}',),
-            0x1f97 => return Fold::Two('\u{1f27}', '\u{03b9}',),
-            0x1f98 => return Fold::Two('\u{1f20}', '\u{03b9}',),
-            0x1f99 => return Fold::Two('\u{1f21}', '\u{03b9}',),
-            0x1f9a => return Fold::Two('\u{1f22}', '\u{03b9}',),
-            0x1f9b => return Fold::Two('\u{1f23}', '\u{03b9}',),
-            0x1f9c => return Fold::Two('\u{1f24}', '\u{03b9}',),
-            0x1f9d => return Fold::Two('\u{1f25}', '\u{03b9}',),
-            0x1f9e => return Fold::Two('\u{1f26}', '\u{03b9}',),
-            0x1f9f => return Fold::Two('\u{1f27}', '\u{03b9}',),
-            0x1fa0 => return Fold::Two('\u{1f60}', '\u{03b9}',),
-            0x1fa1 => return Fold::Two('\u{1f61}', '\u{03b9}',),
-            0x1fa2 => return Fold::Two('\u{1f62}', '\u{03b9}',),
-            0x1fa3 => return Fold::Two('\u{1f63}', '\u{03b9}',),
-            0x1fa4 => return Fold::Two('\u{1f64}', '\u{03b9}',),
-            0x1fa5 => return Fold::Two('\u{1f65}', '\u{03b9}',),
-            0x1fa6 => return Fold::Two('\u{1f66}', '\u{03b9}',),
-            0x1fa7 => return Fold::Two('\u{1f67}', '\u{03b9}',),
-            0x1fa8 => return Fold::Two('\u{1f60}', '\u{03b9}',),
-            0x1fa9 => return Fold::Two('\u{1f61}', '\u{03b9}',),
-            0x1faa => return Fold::Two('\u{1f62}', '\u{03b9}',),
-            0x1fab => return Fold::Two('\u{1f63}', '\u{03b9}',),
-            0x1fac => return Fold::Two('\u{1f64}', '\u{03b9}',),
-            0x1fad => return Fold::Two('\u{1f65}', '\u{03b9}',),
-            0x1fae => return Fold::Two('\u{1f66}', '\u{03b9}',),
-            0x1faf => return Fold::Two('\u{1f67}', '\u{03b9}',),
-            0x1fb2 => return Fold::Two('\u{1f70}', '\u{03b9}',),
-            0x1fb3 => return Fold::Two('\u{03b1}', '\u{03b9}',),
-            0x1fb4 => return Fold::Two('\u{03ac}', '\u{03b9}',),
-            0x1fb6 => return Fold::Two('\u{03b1}', '\u{0342}',),
-            0x1fb7 => return Fold::Three('\u{03b1}', '\u{0342}', '\u{03b9}',),
-            0x1fb8 => 0x1fb0,
-            0x1fb9 => 0x1fb1,
-            0x1fba => 0x1f70,
-            0x1fbb => 0x1f71,
-            0x1fbc => return Fold::Two('\u{03b1}', '\u{03b9}',),
-            0x1fbe => 0x03b9,
-            0x1fc2 => return Fold::Two('\u{1f74}', '\u{03b9}',),
-            0x1fc3 => return Fold::Two('\u{03b7}', '\u{03b9}',),
-            0x1fc4 => return Fold::Two('\u{03ae}', '\u{03b9}',),
-            0x1fc6 => return Fold::Two('\u{03b7}', '\u{0342}',),
-            0x1fc7 => return Fold::Three('\u{03b7}', '\u{0342}', '\u{03b9}',),
-            0x1fc8 => 0x1f72,
-            0x1fc9 => 0x1f73,
-            0x1fca => 0x1f74,
-            0x1fcb => 0x1f75,
-            0x1fcc => return Fold::Two('\u{03b7}', '\u{03b9}',),
-            0x1fd2 => return Fold::Three('\u{03b9}', '\u{0308}', '\u{0300}',),
-            0x1fd3 => return Fold::Three('\u{03b9}', '\u{0308}', '\u{0301}',),
-            0x1fd6 => return Fold::Two('\u{03b9}', '\u{0342}',),
-            0x1fd7 => return Fold::Three('\u{03b9}', '\u{0308}', '\u{0342}',),
-            0x1fd8 => 0x1fd0,
-            0x1fd9 => 0x1fd1,
-            0x1fda => 0x1f76,
-            0x1fdb => 0x1f77,
-            0x1fe2 => return Fold::Three('\u{03c5}', '\u{0308}', '\u{0300}',),
-            0x1fe3 => return Fold::Three('\u{03c5}', '\u{0308}', '\u{0301}',),
-            0x1fe4 => return Fold::Two('\u{03c1}', '\u{0313}',),
-            0x1fe6 => return Fold::Two('\u{03c5}', '\u{0342}',),
-            0x1fe7 => return Fold::Three('\u{03c5}', '\u{0308}', '\u{0342}',),
-            0x1fe8 => 0x1fe0,
-            0x1fe9 => 0x1fe1,
-            0x1fea => 0x1f7a,
-            0x1feb => 0x1f7b,
-            0x1fec => 0x1fe5,
-            0x1ff2 => return Fold::Two('\u{1f7c}', '\u{03b9}',),
-            0x1ff3 => return Fold::Two('\u{03c9}', '\u{03b9}',),
-            0x1ff4 => return Fold::Two('\u{03ce}', '\u{03b9}',),
-            0x1ff6 => return Fold::Two('\u{03c9}', '\u{0342}',),
-            0x1ff7 => return Fold::Three('\u{03c9}', '\u{0342}', '\u{03b9}',),
-            0x1ff8 => 0x1f78,
-            0x1ff9 => 0x1f79,
-            0x1ffa => 0x1f7c,
-            0x1ffb => 0x1f7d,
-            0x1ffc => return Fold::Two('\u{03c9}', '\u{03b9}',),
-            0x2126 => 0x03c9,
-            0x212a => 0x006b,
-            0x212b => 0x00e5,
-            0x2132 => 0x214e,
-            0x2160 => 0x2170,
-            0x2161 => 0x2171,
-            0x2162 => 0x2172,
-            0x2163 => 0x2173,
-            0x2164 => 0x2174,
-            0x2165 => 0x2175,
-            0x2166 => 0x2176,
-            0x2167 => 0x2177,
-            0x2168 => 0x2178,
-            0x2169 => 0x2179,
-            0x216a => 0x217a,
-            0x216b => 0x217b,
-            0x216c => 0x217c,
-            0x216d => 0x217d,
-            0x216e => 0x217e,
-            0x216f => 0x217f,
-            0x2183 => 0x2184,
-            0x24b6 => 0x24d0,
-            0x24b7 => 0x24d1,
-            0x24b8 => 0x24d2,
-            0x24b9 => 0x24d3,
-            0x24ba => 0x24d4,
-            0x24bb => 0x24d5,
-            0x24bc => 0x24d6,
-            0x24bd => 0x24d7,
-            0x24be => 0x24d8,
-            0x24bf => 0x24d9,
-            0x24c0 => 0x24da,
-            0x24c1 => 0x24db,
-            0x24c2 => 0x24dc,
-            0x24c3 => 0x24dd,
-            0x24c4 => 0x24de,
-            0x24c5 => 0x24df,
-            0x24c6 => 0x24e0,
-            0x24c7 => 0x24e1,
-            0x24c8 => 0x24e2,
-            0x24c9 => 0x24e3,
-            0x24ca => 0x24e4,
-            0x24cb => 0x24e5,
-            0x24cc => 0x24e6,
-            0x24cd => 0x24e7,
-            0x24ce => 0x24e8,
-            0x24cf => 0x24e9,
-            0x2c00 => 0x2c30,
-            0x2c01 => 0x2c31,
-            0x2c02 => 0x2c32,
-            0x2c03 => 0x2c33,
-            0x2c04 => 0x2c34,
-            0x2c05 => 0x2c35,
-            0x2c06 => 0x2c36,
-            0x2c07 => 0x2c37,
-            0x2c08 => 0x2c38,
-            0x2c09 => 0x2c39,
-            0x2c0a => 0x2c3a,
-            0x2c0b => 0x2c3b,
-            0x2c0c => 0x2c3c,
-            0x2c0d => 0x2c3d,
-            0x2c0e => 0x2c3e,
-            0x2c0f => 0x2c3f,
-            0x2c10 => 0x2c40,
-            0x2c11 => 0x2c41,
-            0x2c12 => 0x2c42,
-            0x2c13 => 0x2c43,
-            0x2c14 => 0x2c44,
-            0x2c15 => 0x2c45,
-            0x2c16 => 0x2c46,
-            0x2c17 => 0x2c47,
-            0x2c18 => 0x2c48,
-            0x2c19 => 0x2c49,
-            0x2c1a => 0x2c4a,
-            0x2c1b => 0x2c4b,
-            0x2c1c => 0x2c4c,
-            0x2c1d => 0x2c4d,
-            0x2c1e => 0x2c4e,
-            0x2c1f => 0x2c4f,
-            0x2c20 => 0x2c50,
-            0x2c21 => 0x2c51,
-            0x2c22 => 0x2c52,
-            0x2c23 => 0x2c53,
-            0x2c24 => 0x2c54,
-            0x2c25 => 0x2c55,
-            0x2c26 => 0x2c56,
-            0x2c27 => 0x2c57,
-            0x2c28 => 0x2c58,
-            0x2c29 => 0x2c59,
-            0x2c2a => 0x2c5a,
-            0x2c2b => 0x2c5b,
-            0x2c2c => 0x2c5c,
-            0x2c2d => 0x2c5d,
-            0x2c2e => 0x2c5e,
-            0x2c60 => 0x2c61,
-            0x2c62 => 0x026b,
-            0x2c63 => 0x1d7d,
-            0x2c64 => 0x027d,
-            0x2c67 => 0x2c68,
-            0x2c69 => 0x2c6a,
-            0x2c6b => 0x2c6c,
-            0x2c6d => 0x0251,
-            0x2c6e => 0x0271,
-            0x2c6f => 0x0250,
-            0x2c70 => 0x0252,
-            0x2c72 => 0x2c73,
-            0x2c75 => 0x2c76,
-            0x2c7e => 0x023f,
-            0x2c7f => 0x0240,
-            0x2c80 => 0x2c81,
-            0x2c82 => 0x2c83,
-            0x2c84 => 0x2c85,
-            0x2c86 => 0x2c87,
-            0x2c88 => 0x2c89,
-            0x2c8a => 0x2c8b,
-            0x2c8c => 0x2c8d,
-            0x2c8e => 0x2c8f,
-            0x2c90 => 0x2c91,
-            0x2c92 => 0x2c93,
-            0x2c94 => 0x2c95,
-            0x2c96 => 0x2c97,
-            0x2c98 => 0x2c99,
-            0x2c9a => 0x2c9b,
-            0x2c9c => 0x2c9d,
-            0x2c9e => 0x2c9f,
-            0x2ca0 => 0x2ca1,
-            0x2ca2 => 0x2ca3,
-            0x2ca4 => 0x2ca5,
-            0x2ca6 => 0x2ca7,
-            0x2ca8 => 0x2ca9,
-            0x2caa => 0x2cab,
-            0x2cac => 0x2cad,
-            0x2cae => 0x2caf,
-            0x2cb0 => 0x2cb1,
-            0x2cb2 => 0x2cb3,
-            0x2cb4 => 0x2cb5,
-            0x2cb6 => 0x2cb7,
-            0x2cb8 => 0x2cb9,
-            0x2cba => 0x2cbb,
-            0x2cbc => 0x2cbd,
-            0x2cbe => 0x2cbf,
-            0x2cc0 => 0x2cc1,
-            0x2cc2 => 0x2cc3,
-            0x2cc4 => 0x2cc5,
-            0x2cc6 => 0x2cc7,
-            0x2cc8 => 0x2cc9,
-            0x2cca => 0x2ccb,
-            0x2ccc => 0x2ccd,
-            0x2cce => 0x2ccf,
-            0x2cd0 => 0x2cd1,
-            0x2cd2 => 0x2cd3,
-            0x2cd4 => 0x2cd5,
-            0x2cd6 => 0x2cd7,
-            0x2cd8 => 0x2cd9,
-            0x2cda => 0x2cdb,
-            0x2cdc => 0x2cdd,
-            0x2cde => 0x2cdf,
-            0x2ce0 => 0x2ce1,
-            0x2ce2 => 0x2ce3,
-            0x2ceb => 0x2cec,
-            0x2ced => 0x2cee,
-            0x2cf2 => 0x2cf3,
-            0xa640 => 0xa641,
-            0xa642 => 0xa643,
-            0xa644 => 0xa645,
-            0xa646 => 0xa647,
-            0xa648 => 0xa649,
-            0xa64a => 0xa64b,
-            0xa64c => 0xa64d,
-            0xa64e => 0xa64f,
-            0xa650 => 0xa651,
-            0xa652 => 0xa653,
-            0xa654 => 0xa655,
-            0xa656 => 0xa657,
-            0xa658 => 0xa659,
-            0xa65a => 0xa65b,
-            0xa65c => 0xa65d,
-            0xa65e => 0xa65f,
-            0xa660 => 0xa661,
-            0xa662 => 0xa663,
-            0xa664 => 0xa665,
-            0xa666 => 0xa667,
-            0xa668 => 0xa669,
-            0xa66a => 0xa66b,
-            0xa66c => 0xa66d,
-            0xa680 => 0xa681,
-            0xa682 => 0xa683,
-            0xa684 => 0xa685,
-            0xa686 => 0xa687,
-            0xa688 => 0xa689,
-            0xa68a => 0xa68b,
-            0xa68c => 0xa68d,
-            0xa68e => 0xa68f,
-            0xa690 => 0xa691,
-            0xa692 => 0xa693,
-            0xa694 => 0xa695,
-            0xa696 => 0xa697,
-            0xa698 => 0xa699,
-            0xa69a => 0xa69b,
-            0xa722 => 0xa723,
-            0xa724 => 0xa725,
-            0xa726 => 0xa727,
-            0xa728 => 0xa729,
-            0xa72a => 0xa72b,
-            0xa72c => 0xa72d,
-            0xa72e => 0xa72f,
-            0xa732 => 0xa733,
-            0xa734 => 0xa735,
-            0xa736 => 0xa737,
-            0xa738 => 0xa739,
-            0xa73a => 0xa73b,
-            0xa73c => 0xa73d,
-            0xa73e => 0xa73f,
-            0xa740 => 0xa741,
-            0xa742 => 0xa743,
-            0xa744 => 0xa745,
-            0xa746 => 0xa747,
-            0xa748 => 0xa749,
-            0xa74a => 0xa74b,
-            0xa74c => 0xa74d,
-            0xa74e => 0xa74f,
-            0xa750 => 0xa751,
-            0xa752 => 0xa753,
-            0xa754 => 0xa755,
-            0xa756 => 0xa757,
-            0xa758 => 0xa759,
-            0xa75a => 0xa75b,
-            0xa75c => 0xa75d,
-            0xa75e => 0xa75f,
-            0xa760 => 0xa761,
-            0xa762 => 0xa763,
-            0xa764 => 0xa765,
-            0xa766 => 0xa767,
-            0xa768 => 0xa769,
-            0xa76a => 0xa76b,
-            0xa76c => 0xa76d,
-            0xa76e => 0xa76f,
-            0xa779 => 0xa77a,
-            0xa77b => 0xa77c,
-            0xa77d => 0x1d79,
-            0xa77e => 0xa77f,
-            0xa780 => 0xa781,
-            0xa782 => 0xa783,
-            0xa784 => 0xa785,
-            0xa786 => 0xa787,
-            0xa78b => 0xa78c,
-            0xa78d => 0x0265,
-            0xa790 => 0xa791,
-            0xa792 => 0xa793,
-            0xa796 => 0xa797,
-            0xa798 => 0xa799,
-            0xa79a => 0xa79b,
-            0xa79c => 0xa79d,
-            0xa79e => 0xa79f,
-            0xa7a0 => 0xa7a1,
-            0xa7a2 => 0xa7a3,
-            0xa7a4 => 0xa7a5,
-            0xa7a6 => 0xa7a7,
-            0xa7a8 => 0xa7a9,
-            0xa7aa => 0x0266,
-            0xa7ab => 0x025c,
-            0xa7ac => 0x0261,
-            0xa7ad => 0x026c,
-            0xa7ae => 0x026a,
-            0xa7b0 => 0x029e,
-            0xa7b1 => 0x0287,
-            0xa7b2 => 0x029d,
-            0xa7b3 => 0xab53,
-            0xa7b4 => 0xa7b5,
-            0xa7b6 => 0xa7b7,
-            0xa7b8 => 0xa7b9,
-            0xa7ba => 0xa7bb,
-            0xa7bc => 0xa7bd,
-            0xa7be => 0xa7bf,
-            0xa7c2 => 0xa7c3,
-            0xa7c4 => 0xa794,
-            0xa7c5 => 0x0282,
-            0xa7c6 => 0x1d8e,
-            0xab70 => 0x13a0,
-            0xab71 => 0x13a1,
-            0xab72 => 0x13a2,
-            0xab73 => 0x13a3,
-            0xab74 => 0x13a4,
-            0xab75 => 0x13a5,
-            0xab76 => 0x13a6,
-            0xab77 => 0x13a7,
-            0xab78 => 0x13a8,
-            0xab79 => 0x13a9,
-            0xab7a => 0x13aa,
-            0xab7b => 0x13ab,
-            0xab7c => 0x13ac,
-            0xab7d => 0x13ad,
-            0xab7e => 0x13ae,
-            0xab7f => 0x13af,
-            0xab80 => 0x13b0,
-            0xab81 => 0x13b1,
-            0xab82 => 0x13b2,
-            0xab83 => 0x13b3,
-            0xab84 => 0x13b4,
-            0xab85 => 0x13b5,
-            0xab86 => 0x13b6,
-            0xab87 => 0x13b7,
-            0xab88 => 0x13b8,
-            0xab89 => 0x13b9,
-            0xab8a => 0x13ba,
-            0xab8b => 0x13bb,
-            0xab8c => 0x13bc,
-            0xab8d => 0x13bd,
-            0xab8e => 0x13be,
-            0xab8f => 0x13bf,
-            0xab90 => 0x13c0,
-            0xab91 => 0x13c1,
-            0xab92 => 0x13c2,
-            0xab93 => 0x13c3,
-            0xab94 => 0x13c4,
-            0xab95 => 0x13c5,
-            0xab96 => 0x13c6,
-            0xab97 => 0x13c7,
-            0xab98 => 0x13c8,
-            0xab99 => 0x13c9,
-            0xab9a => 0x13ca,
-            0xab9b => 0x13cb,
-            0xab9c => 0x13cc,
-            0xab9d => 0x13cd,
-            0xab9e => 0x13ce,
-            0xab9f => 0x13cf,
-            0xaba0 => 0x13d0,
-            0xaba1 => 0x13d1,
-            0xaba2 => 0x13d2,
-            0xaba3 => 0x13d3,
-            0xaba4 => 0x13d4,
-            0xaba5 => 0x13d5,
-            0xaba6 => 0x13d6,
-            0xaba7 => 0x13d7,
-            0xaba8 => 0x13d8,
-            0xaba9 => 0x13d9,
-            0xabaa => 0x13da,
-            0xabab => 0x13db,
-            0xabac => 0x13dc,
-            0xabad => 0x13dd,
-            0xabae => 0x13de,
-            0xabaf => 0x13df,
-            0xabb0 => 0x13e0,
-            0xabb1 => 0x13e1,
-            0xabb2 => 0x13e2,
-            0xabb3 => 0x13e3,
-            0xabb4 => 0x13e4,
-            0xabb5 => 0x13e5,
-            0xabb6 => 0x13e6,
-            0xabb7 => 0x13e7,
-            0xabb8 => 0x13e8,
-            0xabb9 => 0x13e9,
-            0xabba => 0x13ea,
-            0xabbb => 0x13eb,
-            0xabbc => 0x13ec,
-            0xabbd => 0x13ed,
-            0xabbe => 0x13ee,
-            0xabbf => 0x13ef,
-            0xfb00 => return Fold::Two('\u{0066}', '\u{0066}',),
-            0xfb01 => return Fold::Two('\u{0066}', '\u{0069}',),
-            0xfb02 => return Fold::Two('\u{0066}', '\u{006c}',),
-            0xfb03 => return Fold::Three('\u{0066}', '\u{0066}', '\u{0069}',),
-            0xfb04 => return Fold::Three('\u{0066}', '\u{0066}', '\u{006c}',),
-            0xfb05 => return Fold::Two('\u{0073}', '\u{0074}',),
-            0xfb06 => return Fold::Two('\u{0073}', '\u{0074}',),
-            0xfb13 => return Fold::Two('\u{0574}', '\u{0576}',),
-            0xfb14 => return Fold::Two('\u{0574}', '\u{0565}',),
-            0xfb15 => return Fold::Two('\u{0574}', '\u{056b}',),
-            0xfb16 => return Fold::Two('\u{057e}', '\u{0576}',),
-            0xfb17 => return Fold::Two('\u{0574}', '\u{056d}',),
-            0xff21 => 0xff41,
-            0xff22 => 0xff42,
-            0xff23 => 0xff43,
-            0xff24 => 0xff44,
-            0xff25 => 0xff45,
-            0xff26 => 0xff46,
-            0xff27 => 0xff47,
-            0xff28 => 0xff48,
-            0xff29 => 0xff49,
-            0xff2a => 0xff4a,
-            0xff2b => 0xff4b,
-            0xff2c => 0xff4c,
-            0xff2d => 0xff4d,
-            0xff2e => 0xff4e,
-            0xff2f => 0xff4f,
-            0xff30 => 0xff50,
-            0xff31 => 0xff51,
-            0xff32 => 0xff52,
-            0xff33 => 0xff53,
-            0xff34 => 0xff54,
-            0xff35 => 0xff55,
-            0xff36 => 0xff56,
-            0xff37 => 0xff57,
-            0xff38 => 0xff58,
-            0xff39 => 0xff59,
-            0xff3a => 0xff5a,
-            0x10400 => 0x10428,
-            0x10401 => 0x10429,
-            0x10402 => 0x1042a,
-            0x10403 => 0x1042b,
-            0x10404 => 0x1042c,
-            0x10405 => 0x1042d,
-            0x10406 => 0x1042e,
-            0x10407 => 0x1042f,
-            0x10408 => 0x10430,
-            0x10409 => 0x10431,
-            0x1040a => 0x10432,
-            0x1040b => 0x10433,
-            0x1040c => 0x10434,
-            0x1040d => 0x10435,
-            0x1040e => 0x10436,
-            0x1040f => 0x10437,
-            0x10410 => 0x10438,
-            0x10411 => 0x10439,
-            0x10412 => 0x1043a,
-            0x10413 => 0x1043b,
-            0x10414 => 0x1043c,
-            0x10415 => 0x1043d,
-            0x10416 => 0x1043e,
-            0x10417 => 0x1043f,
-            0x10418 => 0x10440,
-            0x10419 => 0x10441,
-            0x1041a => 0x10442,
-            0x1041b => 0x10443,
-            0x1041c => 0x10444,
-            0x1041d => 0x10445,
-            0x1041e => 0x10446,
-            0x1041f => 0x10447,
-            0x10420 => 0x10448,
-            0x10421 => 0x10449,
-            0x10422 => 0x1044a,
-            0x10423 => 0x1044b,
-            0x10424 => 0x1044c,
-            0x10425 => 0x1044d,
-            0x10426 => 0x1044e,
-            0x10427 => 0x1044f,
-            0x104b0 => 0x104d8,
-            0x104b1 => 0x104d9,
-            0x104b2 => 0x104da,
-            0x104b3 => 0x104db,
-            0x104b4 => 0x104dc,
-            0x104b5 => 0x104dd,
-            0x104b6 => 0x104de,
-            0x104b7 => 0x104df,
-            0x104b8 => 0x104e0,
-            0x104b9 => 0x104e1,
-            0x104ba => 0x104e2,
-            0x104bb => 0x104e3,
-            0x104bc => 0x104e4,
-            0x104bd => 0x104e5,
-            0x104be => 0x104e6,
-            0x104bf => 0x104e7,
-            0x104c0 => 0x104e8,
-            0x104c1 => 0x104e9,
-            0x104c2 => 0x104ea,
-            0x104c3 => 0x104eb,
-            0x104c4 => 0x104ec,
-            0x104c5 => 0x104ed,
-            0x104c6 => 0x104ee,
-            0x104c7 => 0x104ef,
-            0x104c8 => 0x104f0,
-            0x104c9 => 0x104f1,
-            0x104ca => 0x104f2,
-            0x104cb => 0x104f3,
-            0x104cc => 0x104f4,
-            0x104cd => 0x104f5,
-            0x104ce => 0x104f6,
-            0x104cf => 0x104f7,
-            0x104d0 => 0x104f8,
-            0x104d1 => 0x104f9,
-            0x104d2 => 0x104fa,
-            0x104d3 => 0x104fb,
-            0x10c80 => 0x10cc0,
-            0x10c81 => 0x10cc1,
-            0x10c82 => 0x10cc2,
-            0x10c83 => 0x10cc3,
-            0x10c84 => 0x10cc4,
-            0x10c85 => 0x10cc5,
-            0x10c86 => 0x10cc6,
-            0x10c87 => 0x10cc7,
-            0x10c88 => 0x10cc8,
-            0x10c89 => 0x10cc9,
-            0x10c8a => 0x10cca,
-            0x10c8b => 0x10ccb,
-            0x10c8c => 0x10ccc,
-            0x10c8d => 0x10ccd,
-            0x10c8e => 0x10cce,
-            0x10c8f => 0x10ccf,
-            0x10c90 => 0x10cd0,
-            0x10c91 => 0x10cd1,
-            0x10c92 => 0x10cd2,
-            0x10c93 => 0x10cd3,
-            0x10c94 => 0x10cd4,
-            0x10c95 => 0x10cd5,
-            0x10c96 => 0x10cd6,
-            0x10c97 => 0x10cd7,
-            0x10c98 => 0x10cd8,
-            0x10c99 => 0x10cd9,
-            0x10c9a => 0x10cda,
-            0x10c9b => 0x10cdb,
-            0x10c9c => 0x10cdc,
-            0x10c9d => 0x10cdd,
-            0x10c9e => 0x10cde,
-            0x10c9f => 0x10cdf,
-            0x10ca0 => 0x10ce0,
-            0x10ca1 => 0x10ce1,
-            0x10ca2 => 0x10ce2,
-            0x10ca3 => 0x10ce3,
-            0x10ca4 => 0x10ce4,
-            0x10ca5 => 0x10ce5,
-            0x10ca6 => 0x10ce6,
-            0x10ca7 => 0x10ce7,
-            0x10ca8 => 0x10ce8,
-            0x10ca9 => 0x10ce9,
-            0x10caa => 0x10cea,
-            0x10cab => 0x10ceb,
-            0x10cac => 0x10cec,
-            0x10cad => 0x10ced,
-            0x10cae => 0x10cee,
-            0x10caf => 0x10cef,
-            0x10cb0 => 0x10cf0,
-            0x10cb1 => 0x10cf1,
-            0x10cb2 => 0x10cf2,
-            0x118a0 => 0x118c0,
-            0x118a1 => 0x118c1,
-            0x118a2 => 0x118c2,
-            0x118a3 => 0x118c3,
-            0x118a4 => 0x118c4,
-            0x118a5 => 0x118c5,
-            0x118a6 => 0x118c6,
-            0x118a7 => 0x118c7,
-            0x118a8 => 0x118c8,
-            0x118a9 => 0x118c9,
-            0x118aa => 0x118ca,
-            0x118ab => 0x118cb,
-            0x118ac => 0x118cc,
-            0x118ad => 0x118cd,
-            0x118ae => 0x118ce,
-            0x118af => 0x118cf,
-            0x118b0 => 0x118d0,
-            0x118b1 => 0x118d1,
-            0x118b2 => 0x118d2,
-            0x118b3 => 0x118d3,
-            0x118b4 => 0x118d4,
-            0x118b5 => 0x118d5,
-            0x118b6 => 0x118d6,
-            0x118b7 => 0x118d7,
-            0x118b8 => 0x118d8,
-            0x118b9 => 0x118d9,
-            0x118ba => 0x118da,
-            0x118bb => 0x118db,
-            0x118bc => 0x118dc,
-            0x118bd => 0x118dd,
-            0x118be => 0x118de,
-            0x118bf => 0x118df,
-            0x16e40 => 0x16e60,
-            0x16e41 => 0x16e61,
-            0x16e42 => 0x16e62,
-            0x16e43 => 0x16e63,
-            0x16e44 => 0x16e64,
-            0x16e45 => 0x16e65,
-            0x16e46 => 0x16e66,
-            0x16e47 => 0x16e67,
-            0x16e48 => 0x16e68,
-            0x16e49 => 0x16e69,
-            0x16e4a => 0x16e6a,
-            0x16e4b => 0x16e6b,
-            0x16e4c => 0x16e6c,
-            0x16e4d => 0x16e6d,
-            0x16e4e => 0x16e6e,
-            0x16e4f => 0x16e6f,
-            0x16e50 => 0x16e70,
-            0x16e51 => 0x16e71,
-            0x16e52 => 0x16e72,
-            0x16e53 => 0x16e73,
-            0x16e54 => 0x16e74,
-            0x16e55 => 0x16e75,
-            0x16e56 => 0x16e76,
-            0x16e57 => 0x16e77,
-            0x16e58 => 0x16e78,
-            0x16e59 => 0x16e79,
-            0x16e5a => 0x16e7a,
-            0x16e5b => 0x16e7b,
-            0x16e5c => 0x16e7c,
-            0x16e5d => 0x16e7d,
-            0x16e5e => 0x16e7e,
-            0x16e5f => 0x16e7f,
-            0x1e900 => 0x1e922,
-            0x1e901 => 0x1e923,
-            0x1e902 => 0x1e924,
-            0x1e903 => 0x1e925,
-            0x1e904 => 0x1e926,
-            0x1e905 => 0x1e927,
-            0x1e906 => 0x1e928,
-            0x1e907 => 0x1e929,
-            0x1e908 => 0x1e92a,
-            0x1e909 => 0x1e92b,
-            0x1e90a => 0x1e92c,
-            0x1e90b => 0x1e92d,
-            0x1e90c => 0x1e92e,
-            0x1e90d => 0x1e92f,
-            0x1e90e => 0x1e930,
-            0x1e90f => 0x1e931,
-            0x1e910 => 0x1e932,
-            0x1e911 => 0x1e933,
-            0x1e912 => 0x1e934,
-            0x1e913 => 0x1e935,
-            0x1e914 => 0x1e936,
-            0x1e915 => 0x1e937,
-            0x1e916 => 0x1e938,
-            0x1e917 => 0x1e939,
-            0x1e918 => 0x1e93a,
-            0x1e919 => 0x1e93b,
-            0x1e91a => 0x1e93c,
-            0x1e91b => 0x1e93d,
-            0x1e91c => 0x1e93e,
-            0x1e91d => 0x1e93f,
-            0x1e91e => 0x1e940,
-            0x1e91f => 0x1e941,
-            0x1e920 => 0x1e942,
-            0x1e921 => 0x1e943,
-            _ => orig as u32
-        };
-        Fold::One( char::from_u32(single_char).unwrap() )
-    }
-    
-    for c_index in 0..126217 {
-        if let Some(c) = char::from_u32(c_index) {
-            let reference: Vec<char> = lookup_naive(c).collect();
-            let actual: Vec<char> = lookup(c).collect();
-            if actual != reference {
-                assert!(false, "case-folding {:?} (#0x{:04x}) failed: Expected {:?}, got {:?}", c, c_index, reference, actual);
-            }
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/src/unicode/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/src/unicode/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicase/src/unicode/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicase/src/unicode/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-#[cfg(__unicase__iter_cmp)]
-use core::cmp::Ordering;
-use core::hash::{Hash, Hasher};
-
-use self::map::lookup;
-mod map;
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct Unicode<S>(pub S);
-
-impl<S1: AsRef<str>, S2: AsRef<str>> PartialEq<Unicode<S2>> for Unicode<S1> {
-    #[inline]
-    fn eq(&self, other: &Unicode<S2>) -> bool {
-        let mut left = self.0.as_ref().chars().flat_map(lookup);
-        let mut right = other.0.as_ref().chars().flat_map(lookup);
-
-        // inline Iterator::eq since not added until Rust 1.5
-        loop {
-            let x = match left.next() {
-                None => return right.next().is_none(),
-                Some(val) => val,
-            };
-
-            let y = match right.next() {
-                None => return false,
-                Some(val) => val,
-            };
-
-            if x != y {
-                return false;
-            }
-        }
-    }
-}
-
-impl<S: AsRef<str>> Eq for Unicode<S> {}
-
-#[cfg(__unicase__iter_cmp)]
-impl<T: AsRef<str>> PartialOrd for Unicode<T> {
-    #[inline]
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-#[cfg(__unicase__iter_cmp)]
-impl<T: AsRef<str>> Ord for Unicode<T> {
-    #[inline]
-    fn cmp(&self, other: &Self) -> Ordering {
-        let self_chars = self.0.as_ref().chars().flat_map(lookup);
-        let other_chars = other.0.as_ref().chars().flat_map(lookup);
-        self_chars.cmp(other_chars)
-    }
-}
-
-impl<S: AsRef<str>> Hash for Unicode<S> {
-    #[inline]
-    fn hash<H: Hasher>(&self, hasher: &mut H) {
-        let mut buf = [0; 4];
-        for c in self.0.as_ref().chars().flat_map(|c| lookup(c)) {
-            let len = char_to_utf8(c, &mut buf);
-            hasher.write(&buf[..len])
-        }
-    }
-}
-
-#[inline]
-fn char_to_utf8(c: char, dst: &mut [u8; 4]) -> usize {
-    const TAG_CONT: u8    = 0b1000_0000;
-    const TAG_TWO_B: u8   = 0b1100_0000;
-    const TAG_THREE_B: u8 = 0b1110_0000;
-    const TAG_FOUR_B: u8  = 0b1111_0000;
-
-    let code = c as u32;
-    if code <= 0x7F {
-        dst[0] = code as u8;
-        1
-    } else if code <= 0x7FF {
-        dst[0] = (code >> 6 & 0x1F) as u8 | TAG_TWO_B;
-        dst[1] = (code & 0x3F) as u8 | TAG_CONT;
-        2
-    } else if code <= 0xFFFF {
-        dst[0] = (code >> 12 & 0x0F) as u8 | TAG_THREE_B;
-        dst[1] = (code >>  6 & 0x3F) as u8 | TAG_CONT;
-        dst[2] = (code & 0x3F) as u8 | TAG_CONT;
-        3
-    } else {
-        dst[0] = (code >> 18 & 0x07) as u8 | TAG_FOUR_B;
-        dst[1] = (code >> 12 & 0x3F) as u8 | TAG_CONT;
-        dst[2] = (code >>  6 & 0x3F) as u8 | TAG_CONT;
-        dst[3] = (code & 0x3F) as u8 | TAG_CONT;
-        4
-    }
-}
-
-// internal mod so that the enum can be 'pub'
-// thanks privacy-checker :___(
-mod fold {
-    #[derive(Clone, Copy)]
-    pub enum Fold {
-        Zero,
-        One(char),
-        Two(char, char),
-        Three(char, char, char),
-    }
-
-    impl Iterator for Fold {
-        type Item = char;
-        #[inline]
-        fn next(&mut self) -> Option<char> {
-            match *self {
-                Fold::Zero => None,
-                Fold::One(one) => {
-                    *self = Fold::Zero;
-                    Some(one)
-                },
-                Fold::Two(one, two) => {
-                    *self = Fold::One(two);
-                    Some(one)
-                },
-                Fold::Three(one, two, three) => {
-                    *self = Fold::Two(one, two);
-                    Some(three)
-                }
-            }
-        }
-
-        #[inline]
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            match *self {
-                Fold::Zero => (0, Some(0)),
-                Fold::One(..) => (1, Some(1)),
-                Fold::Two(..) => (2, Some(2)),
-                Fold::Three(..) => (3, Some(3))
-            }
-        }
-
-    }
-    impl From<(char,)> for Fold {
-        #[inline]
-        fn from((one,): (char,)) -> Fold {
-            Fold::One(one)
-        }
-    }
-
-    impl From<(char, char)> for Fold {
-        #[inline]
-        fn from((one, two): (char, char)) -> Fold {
-            Fold::Two(one, two)
-        }
-    }
-
-    impl From<(char, char, char)> for Fold {
-        #[inline]
-        fn from((one, two, three): (char, char, char)) -> Fold {
-            Fold::Three(one, two, three)
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Unicode;
-
-    macro_rules! eq {
-        ($left:expr, $right:expr) => ({
-            assert_eq!(Unicode($left), Unicode($right));
-        });
-    }
-
-    #[test]
-    fn test_ascii_folding() {
-        eq!("foo bar", "FoO BAR");
-    }
-
-    #[test]
-    fn test_simple_case_folding() {
-        eq!("στιγμας", "στιγμασ");
-    }
-
-    #[test]
-    fn test_full_case_folding() {
-        eq!("flour", "flour");
-        eq!("Maße", "MASSE");
-        eq!("ᾲ στο διάολο", "ὰι στο διάολο");
-    }
-
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_ascii_folding(b: &mut ::test::Bencher) {
-        b.bytes = b"foo bar".len() as u64;
-        b.iter(|| eq!("foo bar", "FoO BAR"));
-    }
-
-    #[cfg(feature = "nightly")]
-    #[bench]
-    fn bench_simple_case_folding(b: &mut ::test::Bencher) {
-        b.bytes = "στιγμας".len() as u64;
-        b.iter(|| eq!("στιγμας", "στιγμασ"));
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"AUTHORS":"1ff3a7c8519b29544bb28ba9b1e7502df0cb764051fb9a1172e60006aa2b8dcc","COPYRIGHT":"edb20b474f6cbd4f4db066b54a9e0f687d0009d309412a63431189b59b8e2a07","Cargo.toml":"4f2ad9af370a75060a68d930ce56613b7a3dc47a33bd22d0a3e43118f0d62172","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"bec1ce7b4dd0873f67e5b3f615453557403caaa385d01a53e2de0201e4b19fa2","src/char_data/mod.rs":"400505d0c7f9f201403e828181dde79648f412c0f72aa4ced76c1b91fcdd087c","src/char_data/tables.rs":"a27f625544bc49817b02b78cf55997a73d27dc4d616724aa96f70128b9629b23","src/deprecated.rs":"314c68b009ed66989bd233dc3d07ac0eea1327ec4fe6ee9cb41c26c3dcf05d97","src/explicit.rs":"fdf07374d0a5825bc9d6e616be10b57cc0b159d39590d86409da6df50b6a2ee7","src/format_chars.rs":"678399fec3f4bfaf4093f38cfdb8956288313386dc3511dab9fb58164e8dc01b","src/implicit.rs":"bd324d5f4814610b18851ad2981b8a18b04c3817bb8492b4346e15cb712daf3c","src/level.rs":"d31289f55b65602863c16bce37e370ff6ca8fa8cee344787e06acf215d29a77a","src/lib.rs":"b32ad80998b7cd11bf2edca7a5eca81cc8d4a33656758751ec4958c74649e029","src/prepare.rs":"a9f7db29099fb557dfec56fbb5b24d031a5ee0b9b3fb9a73a3a92e3fe1ebd051"},"package":"49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"}
\ No newline at end of file
+{"files":{"AUTHORS":"1ff3a7c8519b29544bb28ba9b1e7502df0cb764051fb9a1172e60006aa2b8dcc","COPYRIGHT":"edb20b474f6cbd4f4db066b54a9e0f687d0009d309412a63431189b59b8e2a07","Cargo.toml":"8475e307214518bf8a2a3f1e6f8c172631f55287902ebba6781dcdfea6f6138f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"70f94b408efa530b77b82b6aedfb35801ae62fca8bb80b12d81b7f70450297c0","src/char_data/mod.rs":"84c30d5e3f92aefa29143bf426284ec8fbb0de065cbe080cdb5ed49905f2b055","src/char_data/tables.rs":"a27f625544bc49817b02b78cf55997a73d27dc4d616724aa96f70128b9629b23","src/deprecated.rs":"ae5a384d534d9cc3aa17db276eba631b8b95f50121a5e2f527daf7d67490334a","src/explicit.rs":"a5da86526a77d49e0377332f5c840ef3d0088ae5f1db1196edbec5445b55fb7f","src/format_chars.rs":"678399fec3f4bfaf4093f38cfdb8956288313386dc3511dab9fb58164e8dc01b","src/implicit.rs":"9280aab98d22daf8ab44665d906a2e0831dbfe7810bb66d89fbf1bd91fe6be20","src/level.rs":"53bca436ea235aab5850817c615ad685bf059d9c40d2b52729ffdcd897136cfe","src/lib.rs":"df214814a4d0e7be0600a91426333c025f8c293f6a8c714688a014bb3b2a7289","src/prepare.rs":"6c58beef882b2d5c5bf2fe22e12cbccb5a4592f82272e8bce3ddedf005ee1149"},"package":"246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -11,39 +11,46 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.6"
 authors = ["The Servo Project Developers"]
 exclude = ["benches/**", "data/**", "examples/**", "tests/**", "tools/**"]
 description = "Implementation of the Unicode Bidirectional Algorithm"
-documentation = "http://doc.servo.org/unicode_bidi/"
+documentation = "https://docs.rs/unicode-bidi/"
+readme = "README.md"
 keywords = ["rtl", "unicode", "text", "layout", "bidi"]
+categories = ["no-std", "encoding", "text-processing"]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/unicode-bidi"
 
 [lib]
 name = "unicode_bidi"
 [dependencies.flame]
-version = "0.1"
+version = "0.2"
 optional = true
 
 [dependencies.flamer]
-version = "0.1"
+version = "0.4"
 optional = true
 
 [dependencies.serde]
 version = ">=0.8, <2.0"
 features = ["derive"]
 optional = true
-
-[dependencies.matches]
-version = "0.1"
+default-features = false
 [dev-dependencies.serde_test]
 version = ">=0.8, <2.0"
 
 [features]
-with_serde = ["serde"]
+bench_it = []
+default = ["std"]
 flame_it = ["flame", "flamer"]
+std = []
 unstable = []
-default = []
-bench_it = []
+with_serde = ["serde"]
+[badges.appveyor]
+repository = "servo/unicode-bidi"
+
+[badges.travis-ci]
+repository = "servo/unicode-bidi"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
 of mixed right-to-left and left-to-right text.  It is written in safe Rust,
 compatible with the current stable release.
 
-[Documentation](http://doc.servo.org/unicode_bidi/)
+[Documentation](https://docs.rs/unicode-bidi/)
 
 [![Travis-CI](https://travis-ci.org/servo/unicode-bidi.svg?branch=master)](https://travis-ci.org/servo/unicode-bidi)
 [![AppVeyor](https://img.shields.io/appveyor/ci/servo/unicode-bidi/master.svg)](https://ci.appveyor.com/project/servo/unicode-bidi)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/char_data/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/char_data/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/char_data/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/char_data/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,11 +13,11 @@
 
 pub use self::tables::{BidiClass, UNICODE_VERSION};
 
-use std::cmp::Ordering::{Equal, Less, Greater};
-use std::char;
+use core::cmp::Ordering::{Equal, Less, Greater};
+use core::char;
 
 use self::tables::bidi_class_table;
-use BidiClass::*;
+use crate::BidiClass::*;
 
 /// Find the `BidiClass` of a single char.
 pub fn bidi_class(c: char) -> BidiClass {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/deprecated.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/deprecated.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/deprecated.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/deprecated.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,8 +9,7 @@
 
 //! This module holds deprecated assets only.
 
-// Doesn't worth updating API here
-#![cfg_attr(feature="cargo-clippy", allow(needless_pass_by_value))]
+use alloc::vec::Vec;
 
 use super::*;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/explicit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/explicit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/explicit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/explicit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,16 +11,16 @@
 //!
 //! <http://www.unicode.org/reports/tr9/#Explicit_Levels_and_Directions>
 
-use super::char_data::{BidiClass, is_rtl};
-use super::level::Level;
+use alloc::vec::Vec;
 
-use BidiClass::*;
+use super::char_data::{BidiClass::{self, *}, is_rtl};
+use super::level::Level;
 
 /// Compute explicit embedding levels for one paragraph of text (X1-X8).
 ///
 /// `processing_classes[i]` must contain the `BidiClass` of the char at byte index `i`,
 /// for each char in `text`.
-#[cfg_attr(feature = "flame_it", flame)]
+#[cfg_attr(feature = "flame_it", flamer::flame)]
 pub fn compute(
     text: &str,
     para_level: Level,
@@ -46,7 +46,10 @@
                 let last_level = stack.last().level;
 
                 // X5a-X5c: Isolate initiators get the level of the last entry on the stack.
-                let is_isolate = matches!(original_classes[i], RLI | LRI | FSI);
+                let is_isolate = match original_classes[i] {
+                    RLI | LRI | FSI => true,
+                    _ => false,
+                };
                 if is_isolate {
                     levels[i] = last_level;
                     match stack.last().status {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/implicit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/implicit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/implicit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/implicit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,18 +9,17 @@
 
 //! 3.3.4 - 3.3.6. Resolve implicit levels and types.
 
-use std::cmp::max;
+use core::cmp::max;
+use alloc::vec::Vec;
 
-use super::char_data::BidiClass;
+use super::char_data::BidiClass::{self, *};
 use super::prepare::{IsolatingRunSequence, LevelRun, not_removed_by_x9, removed_by_x9};
 use super::level::Level;
 
-use BidiClass::*;
-
 /// 3.3.4 Resolving Weak Types
 ///
 /// <http://www.unicode.org/reports/tr9/#Resolving_Weak_Types>
-#[cfg_attr(feature = "flame_it", flame)]
+#[cfg_attr(feature = "flame_it", flamer::flame)]
 pub fn resolve_weak(sequence: &IsolatingRunSequence, processing_classes: &mut [BidiClass]) {
     // FIXME (#8): This function applies steps W1-W6 in a single pass.  This can produce
     // incorrect results in cases where a "later" rule changes the value of `prev_class` seen
@@ -135,7 +134,7 @@
 /// 3.3.5 Resolving Neutral Types
 ///
 /// <http://www.unicode.org/reports/tr9/#Resolving_Neutral_Types>
-#[cfg_attr(feature = "flame_it", flame)]
+#[cfg_attr(feature = "flame_it", flamer::flame)]
 pub fn resolve_neutral(
     sequence: &IsolatingRunSequence,
     levels: &[Level],
@@ -200,7 +199,7 @@
 /// Returns the maximum embedding level in the paragraph.
 ///
 /// <http://www.unicode.org/reports/tr9/#Resolving_Implicit_Levels>
-#[cfg_attr(feature = "flame_it", flame)]
+#[cfg_attr(feature = "flame_it", flamer::flame)]
 pub fn resolve_levels(original_classes: &[BidiClass], levels: &mut [Level]) -> Level {
     let mut max_level = Level::ltr();
 
@@ -224,5 +223,8 @@
 /// <http://www.unicode.org/reports/tr9/#NI>
 #[allow(non_snake_case)]
 fn is_NI(class: BidiClass) -> bool {
-    matches!(class, B | S | WS | ON | FSI | LRI | RLI | PDI)
+    match class {
+        B | S | WS | ON | FSI | LRI | RLI | PDI => true,
+        _ => false,
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/level.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/level.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/level.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/level.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,9 @@
 //!
 //! <http://www.unicode.org/reports/tr9/#BD2>
 
-use std::convert::{From, Into};
+use alloc::vec::Vec;
+use core::convert::{From, Into};
+use alloc::string::{String, ToString};
 
 use super::char_data::BidiClass;
 
@@ -28,7 +30,7 @@
 ///
 /// <http://www.unicode.org/reports/tr9/#BD2>
 #[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Level(u8);
 
 pub const LTR_LEVEL: Level = Level(0);
@@ -328,7 +330,8 @@
     #[test]
     fn test_into() {
         let level = Level::rtl();
-        assert_eq!(1u8, level.into());
+        let number: u8 = level.into();
+        assert_eq!(1u8, number);
     }
 
     #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -53,27 +53,23 @@
 //! ]);
 //! ```
 //!
+//! # Features
+//!
+//! - `std`: Enabled by default, but can be disabled to make `unicode_bidi`
+//!   `#![no_std]` + `alloc` compatible.
+//! - `serde`: Adds [`serde::Serialize`] and [`serde::Deserialize`]
+//!   implementations to relevant types.
+//!
 //! [tr9]: <http://www.unicode.org/reports/tr9/>
 
 #![forbid(unsafe_code)]
 
-#![cfg_attr(feature="flame_it", feature(plugin, custom_attribute))]
-#![cfg_attr(feature="flame_it", plugin(flamer))]
-
-
+#![no_std]
+// We need to link to std to make doc tests work on older Rust versions
+#![cfg(feature = "std")]
+extern crate std;
 #[macro_use]
-extern crate matches;
-
-#[cfg(feature = "serde")]
-#[macro_use]
-extern crate serde;
-
-#[cfg(all(feature = "serde", test))]
-extern crate serde_test;
-
-#[cfg(feature = "flame_it")]
-extern crate flame;
-
+extern crate alloc;
 
 pub mod deprecated;
 pub mod format_chars;
@@ -84,18 +80,19 @@
 mod implicit;
 mod prepare;
 
-pub use char_data::{BidiClass, bidi_class, UNICODE_VERSION};
-pub use level::{Level, LTR_LEVEL, RTL_LEVEL};
-pub use prepare::LevelRun;
-
-use std::borrow::Cow;
-use std::cmp::{max, min};
-use std::iter::repeat;
-use std::ops::Range;
-
-use BidiClass::*;
-use format_chars as chars;
+pub use crate::char_data::{BidiClass, bidi_class, UNICODE_VERSION};
+pub use crate::level::{Level, LTR_LEVEL, RTL_LEVEL};
+pub use crate::prepare::LevelRun;
+
+use alloc::borrow::Cow;
+use alloc::vec::Vec;
+use alloc::string::String;
+use core::cmp::{max, min};
+use core::iter::repeat;
+use core::ops::Range;
 
+use crate::BidiClass::*;
+use crate::format_chars as chars;
 
 /// Bidi information about a single paragraph
 #[derive(Debug, PartialEq)]
@@ -135,8 +132,8 @@
     /// Also sets the class for each First Strong Isolate initiator (FSI) to LRI or RLI if a strong
     /// character is found before the matching PDI.  If no strong character is found, the class will
     /// remain FSI, and it's up to later stages to treat these as LRI when needed.
-    #[cfg_attr(feature = "flame_it", flame)]
-    pub fn new(text: &str, default_para_level: Option<Level>) -> InitialInfo {
+    #[cfg_attr(feature = "flame_it", flamer::flame)]
+    pub fn new(text: &str, default_para_level: Option<Level>) -> InitialInfo<'_> {
         let mut original_classes = Vec::with_capacity(text.len());
 
         // The stack contains the starting byte index for each nested isolate we're inside.
@@ -261,8 +258,8 @@
     /// text that is entirely LTR.  See the `nsBidi` class from Gecko for comparison.
     ///
     /// TODO: Support auto-RTL base direction
-    #[cfg_attr(feature = "flame_it", flame)]
-    pub fn new(text: &str, default_para_level: Option<Level>) -> BidiInfo {
+    #[cfg_attr(feature = "flame_it", flamer::flame)]
+    pub fn new(text: &str, default_para_level: Option<Level>) -> BidiInfo<'_> {
         let InitialInfo {
             original_classes,
             paragraphs,
@@ -309,15 +306,15 @@
 
     /// Re-order a line based on resolved levels and return only the embedding levels, one `Level`
     /// per *byte*.
-    #[cfg_attr(feature = "flame_it", flame)]
+    #[cfg_attr(feature = "flame_it", flamer::flame)]
     pub fn reordered_levels(&self, para: &ParagraphInfo, line: Range<usize>) -> Vec<Level> {
-        let (levels, _) = self.visual_runs(para, line.clone());
+        let (levels, _) = self.visual_runs(para, line);
         levels
     }
 
     /// Re-order a line based on resolved levels and return only the embedding levels, one `Level`
     /// per *character*.
-    #[cfg_attr(feature = "flame_it", flame)]
+    #[cfg_attr(feature = "flame_it", flamer::flame)]
     pub fn reordered_levels_per_char(
         &self,
         para: &ParagraphInfo,
@@ -329,13 +326,13 @@
 
 
     /// Re-order a line based on resolved levels and return the line in display order.
-    #[cfg_attr(feature = "flame_it", flame)]
+    #[cfg_attr(feature = "flame_it", flamer::flame)]
     pub fn reorder_line(&self, para: &ParagraphInfo, line: Range<usize>) -> Cow<'text, str> {
         let (levels, runs) = self.visual_runs(para, line.clone());
 
         // If all isolating run sequences are LTR, no reordering is needed
         if runs.iter().all(|run| levels[run.start].is_ltr()) {
-            return self.text[line.clone()].into();
+            return self.text[line].into();
         }
 
         let mut result = String::with_capacity(line.len());
@@ -354,7 +351,7 @@
     /// `line` is a range of bytes indices within `levels`.
     ///
     /// <http://www.unicode.org/reports/tr9/#Reordering_Resolved_Levels>
-    #[cfg_attr(feature = "flame_it", flame)]
+    #[cfg_attr(feature = "flame_it", flamer::flame)]
     pub fn visual_runs(
         &self,
         para: &ParagraphInfo,
@@ -364,6 +361,8 @@
         assert!(line.end <= self.levels.len());
 
         let mut levels = self.levels.clone();
+        let line_classes = &self.original_classes[line.clone()];
+        let line_levels = &mut levels[line.clone()];
 
         // Reset some whitespace chars to paragraph level.
         // <http://www.unicode.org/reports/tr9/#L1>
@@ -371,7 +370,7 @@
         let mut reset_from: Option<usize> = Some(0);
         let mut reset_to: Option<usize> = None;
         for (i, c) in line_str.char_indices() {
-            match self.original_classes[i] {
+            match line_classes[i] {
                 // Ignored by X9
                 RLE | LRE | RLO | LRO | PDF | BN => {}
                 // Segment separator, Paragraph separator
@@ -393,18 +392,16 @@
                 }
             }
             if let (Some(from), Some(to)) = (reset_from, reset_to) {
-                #[cfg_attr(feature = "cargo-clippy", allow(needless_range_loop))]
-                for j in from..to {
-                    levels[j] = para.level;
+                for level in &mut line_levels[from..to] {
+                    *level = para.level;
                 }
                 reset_from = None;
                 reset_to = None;
             }
         }
         if let Some(from) = reset_from {
-            #[cfg_attr(feature = "cargo-clippy", allow(needless_range_loop))]
-            for j in from..line_str.len() {
-                levels[j] = para.level;
+            for level in &mut line_levels[from..] {
+                *level = para.level;
             }
         }
 
@@ -479,7 +476,7 @@
 ///
 /// The levels assigned to these characters are not specified by the algorithm.  This function
 /// assigns each one the level of the previous character, to avoid breaking level runs.
-#[cfg_attr(feature = "flame_it", flame)]
+#[cfg_attr(feature = "flame_it", flamer::flame)]
 fn assign_levels_to_removed_chars(para_level: Level, classes: &[BidiClass], levels: &mut [Level]) {
     for i in 0..levels.len() {
         if prepare::removed_by_x9(classes[i]) {
@@ -674,7 +671,7 @@
             }
         );
 
-        /// BidiTest:69635 (AL ET EN)
+        // BidiTest:69635 (AL ET EN)
         let bidi_info = BidiInfo::new("\u{060B}\u{20CF}\u{06F9}", None);
         assert_eq!(bidi_info.original_classes, vec![AL, AL, ET, ET, ET, EN, EN]);
     }
@@ -703,7 +700,7 @@
         assert_eq!(BidiInfo::new("�בּג\n123", None).has_rtl(), true);
     }
 
-    fn reorder_paras(text: &str) -> Vec<Cow<str>> {
+    fn reorder_paras(text: &str) -> Vec<Cow<'_, str>> {
         let bidi_info = BidiInfo::new(text, None);
         bidi_info
             .paragraphs
@@ -714,22 +711,22 @@
 
     #[test]
     fn test_reorder_line() {
-        /// Bidi_Class: L L L B L L L B L L L
+        // Bidi_Class: L L L B L L L B L L L
         assert_eq!(
             reorder_paras("abc\ndef\nghi"),
             vec!["abc\n", "def\n", "ghi"]
         );
 
-        /// Bidi_Class: L L EN B L L EN B L L EN
+        // Bidi_Class: L L EN B L L EN B L L EN
         assert_eq!(
             reorder_paras("ab1\nde2\ngh3"),
             vec!["ab1\n", "de2\n", "gh3"]
         );
 
-        /// Bidi_Class: L L L B AL AL AL
+        // Bidi_Class: L L L B AL AL AL
         assert_eq!(reorder_paras("abc\nابج"), vec!["abc\n", "جبا"]);
 
-        /// Bidi_Class: AL AL AL B L L L
+        // Bidi_Class: AL AL AL B L L L
         assert_eq!(reorder_paras("ابج\nabc"), vec!["\nجبا", "abc"]);
 
         assert_eq!(reorder_paras("1.-2"), vec!["1.-2"]);
@@ -812,7 +809,7 @@
     #[test]
     fn test_reordered_levels() {
 
-        /// BidiTest:946 (LRI PDI)
+        // BidiTest:946 (LRI PDI)
         let text = "\u{2067}\u{2069}";
         assert_eq!(
             reordered_levels_for_paras(text),
@@ -823,6 +820,13 @@
             vec![Level::vec(&[0, 0])]
         );
 
+        let text = "aa טֶ";
+        let bidi_info = BidiInfo::new(text, None);
+        assert_eq!(
+            bidi_info.reordered_levels(&bidi_info.paragraphs[0], 3..7),
+            Level::vec(&[0, 0, 0, 1, 1, 1, 1]),
+        )
+
         /* TODO
         /// BidiTest:69635 (AL ET EN)
         let text = "\u{060B}\u{20CF}\u{06F9}";
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/prepare.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/prepare.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-bidi/src/prepare.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-bidi/src/prepare.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,14 +11,13 @@
 //!
 //! <http://www.unicode.org/reports/tr9/#Preparations_for_Implicit_Processing>
 
-use std::cmp::max;
-use std::ops::Range;
+use core::cmp::max;
+use core::ops::Range;
+use alloc::vec::Vec;
 
-use super::char_data::BidiClass;
+use super::BidiClass::{self, *};
 use super::level::Level;
 
-use BidiClass::*;
-
 /// A maximal substring of characters with the same embedding level.
 ///
 /// Represented as a range of byte indices.
@@ -41,7 +40,7 @@
 /// whose matching PDI is the first character of the next level run in the sequence.
 ///
 /// Note: This function does *not* return the sequences in order by their first characters.
-#[cfg_attr(feature = "flame_it", flame)]
+#[cfg_attr(feature = "flame_it", flamer::flame)]
 pub fn isolating_run_sequences(
     para_level: Level,
     original_classes: &[BidiClass],
@@ -74,7 +73,7 @@
 
         sequence.push(run);
 
-        if matches!(end_class, RLI | LRI | FSI) {
+        if let RLI | LRI | FSI = end_class {
             // Resume this sequence after the isolate.
             stack.push(sequence);
         } else {
@@ -114,7 +113,7 @@
             };
 
             // Get the level of the next non-removed char after the runs.
-            let succ_level = if matches!(original_classes[end_of_seq - 1], RLI | LRI | FSI) {
+            let succ_level = if let RLI | LRI | FSI = original_classes[end_of_seq - 1] {
                 para_level
             } else {
                 match original_classes[end_of_seq..].iter().position(
@@ -164,7 +163,10 @@
 ///
 /// <http://www.unicode.org/reports/tr9/#X9>
 pub fn removed_by_x9(class: BidiClass) -> bool {
-    matches!(class, RLE | LRE | RLO | LRO | PDF | BN)
+    match class {
+        RLE | LRE | RLO | LRO | PDF | BN => true,
+        _ => false,
+    }
 }
 
 // For use as a predicate for `position` / `rposition`
@@ -186,7 +188,7 @@
     }
 
     // From <http://www.unicode.org/reports/tr9/#BD13>
-    #[cfg_attr(rustfmt, rustfmt_skip)]
+    #[rustfmt::skip]
     #[test]
     fn test_isolating_run_sequences() {
 
@@ -231,7 +233,7 @@
     }
 
     // From <http://www.unicode.org/reports/tr9/#X10>
-    #[cfg_attr(rustfmt, rustfmt_skip)]
+    #[rustfmt::skip]
     #[test]
     fn test_isolating_run_sequences_sos_and_eos() {
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"a66e297908e9d2ed7eb9c1d1b9035764b2cdbd8e30f5d88ac91d1923806b3dee","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"a068614cf58d3ae4d95d1fd10e96c8db8a2fa3c863833db765a2e490a9ec228c","benches/bench.rs":"827e5343b059a732904be29717c2797203bfd0a633edf08042afea65372a3e2c","scripts/unicode.py":"f91580185aaae204679afa51fc36792d32bea69870a48ed5f6d6aabe0cd8bc0e","src/__test_api.rs":"78e21bfa0b98894f545c8ed3e31cec20d7a48951a7f3ed69a6130c4b3d463aee","src/decompose.rs":"c0eb774843a545356e63bbcd7fb926f80d3c97ef4601ca3701fc34154f2e9905","src/lib.rs":"559d7f0c6adec647981c34a2630abe7573252239702e84fda5cadcc9e196b92b","src/lookups.rs":"ea57b62da71574f8716aaec7f5c6765b2201a1fde30f4ac2f56afeddd1e85fa0","src/no_std_prelude.rs":"602e81e67b8952b6571826f431e3b6787be3073bc10f38a0d3374278f81a6a1f","src/normalize.rs":"8b76a87c3eb3e9b38e5a245ff7bbf0c8d3837b9a646a29178dd48a9d4263fa84","src/perfect_hash.rs":"400c84e2f467f61bd55d55d08672da6a9ad7a57c938ce5d0c701a6994b1b273b","src/quick_check.rs":"9756312d75fc31b67fca954e44a4812945a7e436b03ba18b9a2441f6de570f6f","src/recompose.rs":"a6228ad7561a5c7a1ef1d510159bdde1eea8a161007c80e470432e9b844d5536","src/stream_safe.rs":"34df53904c417ab493c2eb83b9e83de2529ed5d3e1704d48c713a72e800d5fc8","src/tables.rs":"fda786487c6a59ca14ed5eca4817ecc09a7144db965c284ea0d5560fcaa02c85","src/test.rs":"0def2cb0a013fba29938262b3cd3533fbb10eacaf6bcd82eef1f91759fe0a2eb"},"package":"a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"}
\ No newline at end of file
+{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"34370ae727c107ec51fd6809e01ff76220a1bcc2b849b8d277bf9c7bf1875abd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"80e4415e2f0941aac11b7e5c1db946d00139db2f1a67774fcd0c0bfde52217fe","benches/bench.rs":"827e5343b059a732904be29717c2797203bfd0a633edf08042afea65372a3e2c","scripts/unicode.py":"c00cb48507e4564a2dcf17a95a5fb1206830f748a8444d296f95b5d2dd09b72c","src/__test_api.rs":"78e21bfa0b98894f545c8ed3e31cec20d7a48951a7f3ed69a6130c4b3d463aee","src/decompose.rs":"c0eb774843a545356e63bbcd7fb926f80d3c97ef4601ca3701fc34154f2e9905","src/lib.rs":"3eaa16b8b4d2d8e15d38b56760fb432ec7665e22360fd4c587c9b724486ba90e","src/lookups.rs":"ca7022bf19a82108df1f5bd78c7fc30806f931d932a65538be818caaa5f7049d","src/no_std_prelude.rs":"602e81e67b8952b6571826f431e3b6787be3073bc10f38a0d3374278f81a6a1f","src/normalize.rs":"de2670b4437d335d42884af844a750f70e541467ecd34077dfe032103cb9b041","src/perfect_hash.rs":"400c84e2f467f61bd55d55d08672da6a9ad7a57c938ce5d0c701a6994b1b273b","src/quick_check.rs":"9756312d75fc31b67fca954e44a4812945a7e436b03ba18b9a2441f6de570f6f","src/recompose.rs":"a6228ad7561a5c7a1ef1d510159bdde1eea8a161007c80e470432e9b844d5536","src/replace.rs":"b24c904f3e00851a78820e30ddfa4ff10c795f8925fd0ee7f5870f31fdfa770b","src/stream_safe.rs":"383d71f0da401af8e735877e43855c7e16cb06deb2263539cdec2a407dbe257d","src/tables.rs":"d24cf5a2a6d5059543b39eec6806c93fa8c314b52b251ddd354affcf91ef7f0b","src/test.rs":"0def2cb0a013fba29938262b3cd3533fbb10eacaf6bcd82eef1f91759fe0a2eb"},"package":"d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "unicode-normalization"
-version = "0.1.16"
+version = "0.1.19"
 authors = ["kwantam <kwantam@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>"]
 exclude = ["target/*", "Cargo.lock", "scripts/tmp", "*.txt", "tests/*"]
 description = "This crate provides functions for normalization of\nUnicode strings, including Canonical and Compatible\nDecomposition and Recomposition, as described in\nUnicode Standard Annex #15.\n"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -31,7 +31,7 @@
 
 ```toml
 [dependencies]
-unicode-normalization = "0.1.16"
+unicode-normalization = "0.1.19"
 ```
 
 ## `no_std` + `alloc` support
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/scripts/unicode.py thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/scripts/unicode.py
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/scripts/unicode.py	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/scripts/unicode.py	2021-12-09 12:01:26.000000000 +0000
@@ -14,9 +14,10 @@
 # - DerivedNormalizationProps.txt
 # - NormalizationTest.txt
 # - UnicodeData.txt
+# - StandardizedVariants.txt
 #
 # Since this should not require frequent updates, we just store this
-# out-of-line and check the unicode.rs file into git.
+# out-of-line and check the tables.rs and normalization_tests.rs files into git.
 import collections
 import urllib.request
 
@@ -57,6 +58,11 @@
     'Cc': ['C'], 'Cf': ['C'], 'Cs': ['C'], 'Co': ['C'], 'Cn': ['C'],
 }
 
+# Constants from Unicode 9.0.0 Section 3.12 Conjoining Jamo Behavior
+# http://www.unicode.org/versions/Unicode9.0.0/ch03.pdf#M9.32468.Heading.310.Combining.Jamo.Behavior
+S_BASE, L_COUNT, V_COUNT, T_COUNT = 0xAC00, 19, 21, 28
+S_COUNT = L_COUNT * V_COUNT * T_COUNT
+
 class UnicodeData(object):
     def __init__(self):
         self._load_unicode_data()
@@ -66,6 +72,9 @@
         self.canon_comp = self._compute_canonical_comp()
         self.canon_fully_decomp, self.compat_fully_decomp = self._compute_fully_decomposed()
 
+        self.cjk_compat_variants_fully_decomp = {}
+        self._load_cjk_compat_ideograph_variants()
+
         def stats(name, table):
             count = sum(len(v) for v in table.values())
             print("%s: %d chars => %d decomposed chars" % (name, len(table), count))
@@ -75,6 +84,7 @@
         stats("Compatible decomp", self.compat_decomp)
         stats("Canonical fully decomp", self.canon_fully_decomp)
         stats("Compatible fully decomp", self.compat_fully_decomp)
+        stats("CJK Compat Variants fully decomp", self.cjk_compat_variants_fully_decomp)
 
         self.ss_leading, self.ss_trailing = self._compute_stream_safe_tables()
 
@@ -83,18 +93,27 @@
         return resp.read().decode('utf-8')
 
     def _load_unicode_data(self):
+        self.name_to_char_int = {}
         self.combining_classes = {}
         self.compat_decomp = {}
         self.canon_decomp = {}
         self.general_category_mark = []
+        self.general_category_public_assigned = []
+
+        assigned_start = 0;
+        prev_char_int = -1;
+        prev_name = "";
 
         for line in self._fetch("UnicodeData.txt").splitlines():
             # See ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
             pieces = line.split(';')
             assert len(pieces) == 15
-            char, category, cc, decomp = pieces[0], pieces[2], pieces[3], pieces[5]
+            char, name, category, cc, decomp = pieces[0], pieces[1], pieces[2], pieces[3], pieces[5]
             char_int = int(char, 16)
 
+            name = pieces[1].strip()
+            self.name_to_char_int[name] = char_int
+
             if cc != '0':
                 self.combining_classes[char_int] = cc
 
@@ -106,6 +125,51 @@
             if category == 'M' or 'M' in expanded_categories.get(category, []):
                 self.general_category_mark.append(char_int)
 
+            assert category != 'Cn', "Unexpected: Unassigned codepoint in UnicodeData.txt"
+            if category not in ['Co', 'Cs']:
+                if char_int != prev_char_int + 1 and not is_first_and_last(prev_name, name):
+                    self.general_category_public_assigned.append((assigned_start, prev_char_int))
+                    assigned_start = char_int
+                prev_char_int = char_int
+                prev_name = name;
+
+        self.general_category_public_assigned.append((assigned_start, prev_char_int))
+
+    def _load_cjk_compat_ideograph_variants(self):
+        for line in self._fetch("StandardizedVariants.txt").splitlines():
+            strip_comments = line.split('#', 1)[0].strip()
+            if not strip_comments:
+                continue
+
+            variation_sequence, description, differences = strip_comments.split(';')
+            description = description.strip()
+
+            # Don't use variations that only apply in particular shaping environments.
+            if differences:
+                continue
+
+            # Look for entries where the description field is a codepoint name.
+            if description not in self.name_to_char_int:
+                continue
+
+            # Only consider the CJK Compatibility Ideographs.
+            if not description.startswith('CJK COMPATIBILITY IDEOGRAPH-'):
+                continue
+
+            char_int = self.name_to_char_int[description]
+
+            assert not char_int in self.combining_classes, "Unexpected: CJK compat variant with a combining class"
+            assert not char_int in self.compat_decomp, "Unexpected: CJK compat variant and compatibility decomposition"
+            assert len(self.canon_decomp[char_int]) == 1, "Unexpected: CJK compat variant and non-singleton canonical decomposition"
+            # If we ever need to handle Hangul here, we'll need to handle it separately.
+            assert not (S_BASE <= char_int < S_BASE + S_COUNT)
+
+            cjk_compat_variant_parts = [int(c, 16) for c in variation_sequence.split()]
+            for c in cjk_compat_variant_parts:
+                assert not c in self.canon_decomp, "Unexpected: CJK compat variant is unnormalized (canon)"
+                assert not c in self.compat_decomp, "Unexpected: CJK compat variant is unnormalized (compat)"
+            self.cjk_compat_variants_fully_decomp[char_int] = cjk_compat_variant_parts
+
     def _load_norm_props(self):
         props = collections.defaultdict(list)
 
@@ -178,11 +242,6 @@
         The upshot is that decomposition code is very simple and easy to inline
         at mild code size cost.
         """
-        # Constants from Unicode 9.0.0 Section 3.12 Conjoining Jamo Behavior
-        # http://www.unicode.org/versions/Unicode9.0.0/ch03.pdf#M9.32468.Heading.310.Combining.Jamo.Behavior
-        S_BASE, L_COUNT, V_COUNT, T_COUNT = 0xAC00, 19, 21, 28
-        S_COUNT = L_COUNT * V_COUNT * T_COUNT
-
         def _decompose(char_int, compatible):
             # 7-bit ASCII never decomposes
             if char_int <= 0x7f:
@@ -286,6 +345,15 @@
 
 hexify = lambda c: '{:04X}'.format(c)
 
+# Test whether `first` and `last` are corresponding "<..., First>" and
+# "<..., Last>" markers.
+def is_first_and_last(first, last):
+    if not first.startswith('<') or not first.endswith(', First>'):
+        return False
+    if not last.startswith('<') or not last.endswith(', Last>'):
+        return False
+    return first[1:-8] == last[1:-7]
+
 def gen_mph_data(name, d, kv_type, kv_callback):
     (salt, keys) = minimal_perfect_hash(d)
     out.write("pub(crate) const %s_SALT: &[u16] = &[\n" % name.upper())
@@ -320,8 +388,8 @@
     out.write("    }\n")
     out.write("}\n")
 
-def gen_decomposition_tables(canon_decomp, compat_decomp, out):
-    tables = [(canon_decomp, 'canonical'), (compat_decomp, 'compatibility')]
+def gen_decomposition_tables(canon_decomp, compat_decomp, cjk_compat_variants_decomp, out):
+    tables = [(canon_decomp, 'canonical'), (compat_decomp, 'compatibility'), (cjk_compat_variants_decomp, 'cjk_compat_variants')]
     for table, name in tables:
         gen_mph_data(name + '_decomposed', table, "(u32, &'static [char])",
             lambda k: "(0x{:x}, &[{}])".format(k,
@@ -374,6 +442,30 @@
     gen_mph_data('combining_mark', general_category_mark, 'u32',
         lambda k: '0x{:04x}'.format(k))
 
+def gen_public_assigned(general_category_public_assigned, out):
+    # This could be done as a hash but the table is somewhat small.
+    out.write("#[inline]\n")
+    out.write("pub fn is_public_assigned(c: char) -> bool {\n")
+    out.write("    match c {\n")
+
+    start = True
+    for first, last in general_category_public_assigned:
+        if start:
+            out.write("        ")
+            start = False
+        else:
+            out.write("        | ")
+        if first == last:
+            out.write("'\\u{%s}'\n" % hexify(first))
+        else:
+            out.write("'\\u{%s}'..='\\u{%s}'\n" % (hexify(first), hexify(last)))
+    out.write("        => true,\n")
+
+    out.write("        _ => false,\n")
+    out.write("    }\n")
+    out.write("}\n")
+    out.write("\n")
+
 def gen_stream_safe(leading, trailing, out):
     # This could be done as a hash but the table is very small.
     out.write("#[inline]\n")
@@ -491,11 +583,14 @@
         gen_composition_table(data.canon_comp, out)
         out.write("\n")
 
-        gen_decomposition_tables(data.canon_fully_decomp, data.compat_fully_decomp, out)
+        gen_decomposition_tables(data.canon_fully_decomp, data.compat_fully_decomp, data.cjk_compat_variants_fully_decomp, out)
 
         gen_combining_mark(data.general_category_mark, out)
         out.write("\n")
 
+        gen_public_assigned(data.general_category_public_assigned, out)
+        out.write("\n")
+
         gen_nfc_qc(data.norm_props, out)
         out.write("\n")
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! unicode-normalization = "0.1.8"
+//! unicode-normalization = "0.1.19"
 //! ```
 
 #![deny(missing_docs, unsafe_code)]
@@ -59,6 +59,7 @@
     IsNormalized,
 };
 pub use crate::recompose::Recompositions;
+pub use crate::replace::Replacements;
 pub use crate::stream_safe::StreamSafe;
 pub use crate::tables::UNICODE_VERSION;
 use core::str::Chars;
@@ -71,6 +72,7 @@
 mod perfect_hash;
 mod quick_check;
 mod recompose;
+mod replace;
 mod stream_safe;
 
 #[rustfmt::skip]
@@ -83,9 +85,16 @@
 
 /// Methods for composing and decomposing characters.
 pub mod char {
-    pub use crate::normalize::{compose, decompose_canonical, decompose_compatible};
+    pub use crate::normalize::{
+        compose, decompose_canonical, decompose_cjk_compat_variants, decompose_compatible,
+    };
 
     pub use crate::lookups::{canonical_combining_class, is_combining_mark};
+
+    /// Return whether the given character is assigned (`General_Category` != `Unassigned`)
+    /// and not Private-Use (`General_Category` != `Private_Use`), in the supported version
+    /// of Unicode.
+    pub use crate::tables::is_public_assigned;
 }
 
 /// Methods for iterating over strings while applying Unicode normalizations
@@ -108,6 +117,18 @@
     /// (compatibility decomposition followed by canonical composition).
     fn nfkc(self) -> Recompositions<I>;
 
+    /// A transformation which replaces CJK Compatibility Ideograph codepoints
+    /// with normal forms using Standardized Variation Sequences. This is not
+    /// part of the canonical or compatibility decomposition algorithms, but
+    /// performing it before those algorithms produces normalized output which
+    /// better preserves the intent of the original text.
+    ///
+    /// Note that many systems today ignore variation selectors, so these
+    /// may not immediately help text display as intended, but they at
+    /// least preserve the information in a standardized form, giving
+    /// implementations the option to recognize them.
+    fn cjk_compat_variants(self) -> Replacements<I>;
+
     /// An Iterator over the string with Conjoining Grapheme Joiner characters
     /// inserted according to the Stream-Safe Text Process (UAX15-D4)
     fn stream_safe(self) -> StreamSafe<I>;
@@ -135,6 +156,11 @@
     }
 
     #[inline]
+    fn cjk_compat_variants(self) -> Replacements<Chars<'a>> {
+        replace::new_cjk_compat_variants(self.chars())
+    }
+
+    #[inline]
     fn stream_safe(self) -> StreamSafe<Chars<'a>> {
         StreamSafe::new(self.chars())
     }
@@ -162,6 +188,11 @@
     }
 
     #[inline]
+    fn cjk_compat_variants(self) -> Replacements<I> {
+        replace::new_cjk_compat_variants(self)
+    }
+
+    #[inline]
     fn stream_safe(self) -> StreamSafe<I> {
         StreamSafe::new(self)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/lookups.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/lookups.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/lookups.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/lookups.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,6 +64,17 @@
     )
 }
 
+pub(crate) fn cjk_compat_variants_fully_decomposed(c: char) -> Option<&'static [char]> {
+    mph_lookup(
+        c.into(),
+        CJK_COMPAT_VARIANTS_DECOMPOSED_SALT,
+        CJK_COMPAT_VARIANTS_DECOMPOSED_KV,
+        pair_lookup_fk,
+        pair_lookup_fv_opt,
+        None,
+    )
+}
+
 /// Return whether the given character is a combining mark (`General_Category=Mark`)
 pub fn is_combining_mark(c: char) -> bool {
     mph_lookup(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/normalize.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/normalize.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/normalize.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/normalize.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,8 @@
 
 //! Functions for computing canonical and compatible decompositions for Unicode characters.
 use crate::lookups::{
-    canonical_fully_decomposed, compatibility_fully_decomposed, composition_table,
+    canonical_fully_decomposed, cjk_compat_variants_fully_decomposed,
+    compatibility_fully_decomposed, composition_table,
 };
 
 use core::{char, ops::FnMut};
@@ -36,6 +37,39 @@
     decompose(c, decompose_char, emit_char)
 }
 
+/// Compute standard-variation decomposition for character.
+///
+/// [Standardized Variation Sequences] are used instead of the standard canonical
+/// decompositions, notably for CJK codepoints with singleton canonical decompositions,
+/// to avoid losing information. See the
+/// [Unicode Variation Sequence FAQ](http://unicode.org/faq/vs.html) and the
+/// "Other Enhancements" section of the
+/// [Unicode 6.3 Release Summary](https://www.unicode.org/versions/Unicode6.3.0/#Summary)
+/// for more information.
+#[inline]
+pub fn decompose_cjk_compat_variants<F>(c: char, mut emit_char: F)
+where
+    F: FnMut(char),
+{
+    // 7-bit ASCII never decomposes
+    if c <= '\x7f' {
+        emit_char(c);
+        return;
+    }
+
+    // Don't perform decomposition for Hangul
+
+    if let Some(decomposed) = cjk_compat_variants_fully_decomposed(c) {
+        for &d in decomposed {
+            emit_char(d);
+        }
+        return;
+    }
+
+    // Finally bottom out.
+    emit_char(c);
+}
+
 #[inline]
 fn decompose<D, F>(c: char, decompose_char: D, mut emit_char: F)
 where
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/replace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/replace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/replace.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/replace.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,61 @@
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+use core::fmt::{self, Write};
+use tinyvec::ArrayVec;
+
+/// External iterator for replacements for a string's characters.
+#[derive(Clone)]
+pub struct Replacements<I> {
+    iter: I,
+    // At this time, the longest replacement sequence has length 2, so we just
+    // need buffer space for 1 codepoint.
+    buffer: Option<char>,
+}
+
+#[inline]
+pub fn new_cjk_compat_variants<I: Iterator<Item = char>>(iter: I) -> Replacements<I> {
+    Replacements { iter, buffer: None }
+}
+
+impl<I: Iterator<Item = char>> Iterator for Replacements<I> {
+    type Item = char;
+
+    #[inline]
+    fn next(&mut self) -> Option<char> {
+        if let Some(c) = self.buffer.take() {
+            return Some(c);
+        }
+
+        match self.iter.next() {
+            Some(ch) => {
+                // At this time, the longest replacement sequence has length 2.
+                let mut buffer = ArrayVec::<[char; 2]>::new();
+                super::char::decompose_cjk_compat_variants(ch, |d| buffer.push(d));
+                self.buffer = buffer.get(1).copied();
+                Some(buffer[0])
+            }
+            None => None,
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let (lower, _) = self.iter.size_hint();
+        (lower, None)
+    }
+}
+
+impl<I: Iterator<Item = char> + Clone> fmt::Display for Replacements<I> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        for c in self.clone() {
+            f.write_char(c)?;
+        }
+        Ok(())
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/stream_safe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/stream_safe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/stream_safe.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/stream_safe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -32,25 +32,26 @@
 
     #[inline]
     fn next(&mut self) -> Option<char> {
-        if let Some(ch) = self.buffer.take() {
-            return Some(ch);
-        }
-        let next_ch = match self.iter.next() {
+        let next_ch = match self.buffer.take().or_else(|| self.iter.next()) {
             None => return None,
             Some(c) => c,
         };
         let d = classify_nonstarters(next_ch);
         if self.nonstarter_count + d.leading_nonstarters > MAX_NONSTARTERS {
+            // Since we're emitting a CGJ, the suffix of the emitted string in NFKD has no trailing
+            // nonstarters, so we can reset the counter to zero. Put `next_ch` back into the
+            // iterator (via `self.buffer`), and we'll reclassify it next iteration.
+            self.nonstarter_count = 0;
             self.buffer = Some(next_ch);
-            self.nonstarter_count = d.decomposition_len;
             return Some(COMBINING_GRAPHEME_JOINER);
         }
 
-        // No starters in the decomposition, so keep accumulating
+        // Is the character all nonstarters in NFKD? If so, increment our counter of contiguous
+        // nonstarters in NKFD.
         if d.leading_nonstarters == d.decomposition_len {
             self.nonstarter_count += d.decomposition_len;
         }
-        // Otherwise, restart the nonstarter counter.
+        // Otherwise, reset the counter to the decomposition's number of trailing nonstarters.
         else {
             self.nonstarter_count = d.trailing_nonstarters;
         }
@@ -132,6 +133,13 @@
     }
 
     #[test]
+    fn test_all_nonstarters() {
+        let s = "\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}";
+        let expected = "\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{034F}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}\u{300}";
+        assert_eq!(stream_safe(s), expected);
+    }
+
+    #[test]
     fn test_classify_nonstarters() {
         // Highest character in the `compat_fully_decomp` table is 2FA1D
         for ch in 0..0x2FA1E {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/tables.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/tables.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-normalization/src/tables.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-normalization/src/tables.rs	2021-12-09 12:01:26.000000000 +0000
@@ -15161,6 +15161,2015 @@
     (0x2106, &['\u{0063}', '\u{002F}', '\u{0075}']),
 ];
 
+pub(crate) const CJK_COMPAT_VARIANTS_DECOMPOSED_SALT: &[u16] = &[
+    0x5,
+    0x0,
+    0x0,
+    0x0,
+    0x162,
+    0x14,
+    0xb6,
+    0x0,
+    0x183,
+    0xd,
+    0x0,
+    0x0,
+    0x35,
+    0x11,
+    0x7,
+    0x0,
+    0x1c,
+    0x0,
+    0x1,
+    0x0,
+    0xd3,
+    0xb,
+    0xa,
+    0xe1,
+    0x0,
+    0x0,
+    0x0,
+    0x48,
+    0x72,
+    0xc7,
+    0x2,
+    0x21,
+    0x15,
+    0x2c,
+    0x0,
+    0x0,
+    0x0,
+    0x5,
+    0x1f,
+    0x8,
+    0x7,
+    0x0,
+    0x4,
+    0x0,
+    0x7,
+    0x10,
+    0x0,
+    0x0,
+    0x0,
+    0x4e,
+    0x0,
+    0x6,
+    0x0,
+    0x11,
+    0x14,
+    0x4,
+    0x1a,
+    0x2,
+    0x58,
+    0x0,
+    0x17,
+    0x0,
+    0x0,
+    0x0,
+    0x4,
+    0x0,
+    0x1,
+    0x0,
+    0x1,
+    0x0,
+    0x4,
+    0x6,
+    0x16,
+    0x20,
+    0x4,
+    0x0,
+    0x1e,
+    0x30,
+    0x0,
+    0x24,
+    0x1a,
+    0x17,
+    0x0,
+    0xa0,
+    0x29,
+    0x34,
+    0x2,
+    0x0,
+    0x4,
+    0x0,
+    0x23,
+    0x29,
+    0x21,
+    0x0,
+    0x0,
+    0xb,
+    0x0,
+    0x20,
+    0x1,
+    0x7,
+    0x8,
+    0x9,
+    0x8,
+    0x0,
+    0x1,
+    0x0,
+    0x1,
+    0x4,
+    0x3,
+    0x1d,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x29,
+    0xd,
+    0x7,
+    0x0,
+    0x0,
+    0x2,
+    0xe,
+    0x9,
+    0x4,
+    0xc,
+    0x1,
+    0x13,
+    0x5,
+    0x6,
+    0x5,
+    0x1,
+    0x9,
+    0x1,
+    0xa,
+    0x2,
+    0x0,
+    0x8,
+    0x29,
+    0x0,
+    0x8,
+    0x2,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xd,
+    0x0,
+    0x9,
+    0x10,
+    0xf,
+    0x0,
+    0x11,
+    0xf,
+    0x0,
+    0x8,
+    0x1,
+    0x1,
+    0x5,
+    0x0,
+    0x1,
+    0x26,
+    0x5,
+    0x39,
+    0x8,
+    0x1,
+    0x17,
+    0xd,
+    0x4,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xe,
+    0x0,
+    0x5,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x4,
+    0x0,
+    0x1,
+    0x2,
+    0x4,
+    0x3,
+    0x35,
+    0x1,
+    0x2,
+    0x1,
+    0x7,
+    0x0,
+    0x0,
+    0x3,
+    0x2,
+    0x11,
+    0x0,
+    0xd,
+    0x3,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x4,
+    0x5,
+    0x0,
+    0xe,
+    0x0,
+    0x0,
+    0x3,
+    0x6,
+    0x2,
+    0xb,
+    0x2,
+    0x1,
+    0x3,
+    0x12,
+    0xb,
+    0x0,
+    0x0,
+    0x0,
+    0x2,
+    0xb,
+    0x1,
+    0x4,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x2f,
+    0x1,
+    0x13,
+    0xb,
+    0x4,
+    0x2,
+    0x4,
+    0x4,
+    0x0,
+    0xb,
+    0x4,
+    0x0,
+    0xb,
+    0x4,
+    0xd,
+    0xc,
+    0x0,
+    0x1e,
+    0x0,
+    0x21,
+    0xd,
+    0x2,
+    0x7,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x2,
+    0x0,
+    0x20,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x1f,
+    0x1,
+    0x2,
+    0x0,
+    0x0,
+    0x5,
+    0x0,
+    0x0,
+    0x4,
+    0x0,
+    0x11,
+    0x2,
+    0x8,
+    0x7,
+    0x0,
+    0x0,
+    0xc,
+    0x3,
+    0x0,
+    0x4,
+    0xe,
+    0x23,
+    0x4,
+    0x1,
+    0x0,
+    0x2,
+    0x0,
+    0x4,
+    0x8,
+    0x10,
+    0x2,
+    0x0,
+    0x13,
+    0xd,
+    0x0,
+    0xb,
+    0x9,
+    0x6,
+    0x0,
+    0x0,
+    0x9,
+    0xc,
+    0xa,
+    0x4,
+    0x1a,
+    0x3,
+    0x1,
+    0x3,
+    0x0,
+    0x1,
+    0x0,
+    0x6,
+    0x3,
+    0xa,
+    0x0,
+    0xa,
+    0x6,
+    0x8,
+    0x8,
+    0x3,
+    0x19,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xc,
+    0x5,
+    0x0,
+    0x5,
+    0x1,
+    0x0,
+    0x2,
+    0x0,
+    0x8,
+    0x0,
+    0xc,
+    0x0,
+    0x2,
+    0x0,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x4,
+    0x2,
+    0x15,
+    0x0,
+    0x4,
+    0x1,
+    0x12,
+    0x4,
+    0x3,
+    0xc,
+    0x4,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x3,
+    0x0,
+    0x5,
+    0x2,
+    0x0,
+    0x1,
+    0x2,
+    0x1,
+    0x10,
+    0x4,
+    0x0,
+    0x5,
+    0x2,
+    0x1,
+    0x6,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xa,
+    0x8,
+    0x2,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x4,
+    0x4,
+    0xc,
+    0x2,
+    0x0,
+    0x6,
+    0x3,
+    0x3,
+    0xf,
+    0x0,
+    0x3,
+    0x5,
+    0x1,
+    0x0,
+    0x0,
+    0x8,
+    0x0,
+    0x2,
+    0x4,
+    0x2,
+    0x13,
+    0x0,
+    0x0,
+    0x0,
+    0xa,
+    0x6,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0xa,
+    0x0,
+    0x5,
+    0x0,
+    0x5,
+    0x0,
+    0x6,
+    0x0,
+    0x1,
+    0x1,
+    0x5,
+    0x1,
+    0xa,
+    0x9,
+    0x5,
+    0x1,
+    0x0,
+    0x7,
+    0x1,
+    0x1,
+    0x7,
+    0x1,
+    0x1f,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x2,
+    0x11,
+    0x5,
+    0x3,
+    0x5,
+    0x3,
+    0x1,
+    0x1,
+    0x0,
+    0x4,
+    0x1,
+    0x4,
+    0x1,
+    0x8,
+    0x0,
+    0x19,
+    0x0,
+    0x4,
+    0x3,
+    0x5,
+    0x6,
+    0x0,
+    0x11,
+    0xe,
+    0x5,
+    0x1,
+    0x0,
+    0x1a,
+    0x4,
+    0x0,
+    0x3,
+    0x0,
+    0x0,
+    0x5,
+    0x0,
+    0x0,
+    0x1,
+    0x17,
+    0x0,
+    0x6,
+    0x3,
+    0xf,
+    0x1,
+    0x6,
+    0x9,
+    0x0,
+    0x5,
+    0x0,
+    0x3,
+    0x1,
+    0x17,
+    0x7,
+    0x0,
+    0x2,
+    0x5,
+    0x3,
+    0x2,
+    0x0,
+    0x7,
+    0x1,
+    0x0,
+    0x4,
+    0x0,
+    0x0,
+    0x5,
+    0x15,
+    0x4,
+    0x0,
+    0x3,
+    0x1,
+    0x3,
+    0x7,
+    0x0,
+    0x0,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x9,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x9,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x3,
+    0x0,
+    0x0,
+    0x3,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x3,
+    0x8,
+    0x0,
+    0x2,
+    0x2,
+    0x3,
+    0x5,
+    0x0,
+    0x0,
+    0x0,
+    0x8,
+    0x3,
+    0x2,
+    0x0,
+    0x9,
+    0x4,
+    0x0,
+    0x6,
+    0xf,
+    0x1,
+    0x0,
+    0x0,
+    0x4,
+    0x2,
+    0x2,
+    0x4,
+    0x4,
+    0xd,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x0,
+    0x2,
+    0x5,
+    0x0,
+    0x0,
+    0xc,
+    0x4,
+    0x9,
+    0x2,
+    0x8,
+    0x1,
+    0x0,
+    0x5,
+    0x4,
+    0x1,
+    0x2,
+    0x1,
+    0x5,
+    0x2,
+    0xb,
+    0x4,
+    0xd,
+    0x4,
+    0x0,
+    0x1,
+    0x18,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x3,
+    0x0,
+    0x2,
+    0xa,
+    0x2,
+    0x4,
+    0x4,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x0,
+    0xc,
+    0x1,
+    0xc,
+    0x1,
+    0x9,
+    0xb,
+    0x0,
+    0x1,
+    0x0,
+    0x2,
+    0x0,
+    0x5,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x7,
+    0x2,
+    0x0,
+    0x6,
+    0x4,
+    0xa,
+    0x1,
+    0x1,
+    0x5,
+    0x2,
+    0x6,
+    0x4,
+    0x3,
+    0xd,
+    0x2,
+    0x2,
+    0x0,
+    0x1,
+    0x2,
+    0x3,
+    0x2,
+    0x0,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x2,
+    0x0,
+    0x1,
+    0x0,
+    0x0,
+    0x3,
+    0x2,
+    0x0,
+    0x5,
+    0x2,
+    0x5,
+    0x2,
+    0x1,
+    0x4,
+    0x1,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x7,
+    0x2,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x0,
+    0x2,
+    0x0,
+    0x0,
+    0x4,
+    0x8,
+    0x0,
+    0x3,
+    0x2,
+    0x2,
+    0x2,
+    0x2,
+    0x4,
+    0x1,
+    0x4,
+    0x2,
+    0x0,
+    0x1,
+    0x4,
+    0x1,
+    0x1,
+    0x2,
+    0x0,
+    0x0,
+    0xc,
+    0x0,
+    0x1,
+    0x2,
+    0x0,
+    0x6,
+    0x2,
+    0x0,
+    0x0,
+    0x8,
+    0x1,
+    0x9,
+    0x1,
+    0x3,
+    0x0,
+    0x4,
+    0x1,
+    0x0,
+    0x6,
+    0x0,
+    0x3,
+    0x7,
+    0x0,
+    0x0,
+    0x2,
+    0x1,
+    0x0,
+    0x3,
+    0x2,
+    0x0,
+    0x2,
+    0x7,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x5,
+    0x3,
+    0x1,
+    0x3,
+    0x0,
+    0x5,
+    0x0,
+    0x1,
+    0x0,
+    0x3,
+    0x1,
+    0x1,
+    0x2,
+    0x3,
+    0x0,
+    0x2,
+    0x3,
+    0x0,
+    0x0,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x0,
+    0x4,
+    0x3,
+    0x2,
+    0x4,
+    0x3,
+    0x5,
+    0x2,
+    0x0,
+    0x0,
+    0x1,
+    0x3,
+    0x2,
+    0x0,
+    0x0,
+    0x4,
+    0x3,
+    0x0,
+    0x1,
+    0x6,
+    0x1,
+    0x4,
+    0x0,
+    0x2,
+    0x2,
+    0x1,
+    0x0,
+    0xd,
+    0x1,
+    0x0,
+    0x0,
+    0x1,
+    0x0,
+    0x2,
+    0x3,
+    0x8,
+    0x5,
+    0x7,
+    0x6,
+    0x0,
+    0x1,
+    0x6,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x2,
+    0x0,
+    0x1,
+    0x0,
+    0x0,
+    0x1,
+    0x1,
+    0x2,
+    0x4,
+    0x2,
+    0x1,
+    0x1,
+    0x2,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x5,
+    0x1,
+    0x0,
+    0x2,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x4,
+    0x0,
+    0x2,
+    0x0,
+    0x1,
+    0x3,
+    0x3,
+    0x1,
+    0x0,
+    0x4,
+    0x0,
+    0x1,
+    0x1,
+    0x1,
+    0x1,
+    0x1,
+    0x4,
+    0x0,
+    0x0,
+    0x3,
+    0x1,
+    0x3,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x1,
+    0x2,
+    0x0,
+    0x0,
+    0x1,
+    0x3,
+    0x2,
+    0x1,
+    0x2,
+    0x1,
+    0x9,
+    0x1,
+    0x0,
+    0x1,
+    0x3,
+    0x4,
+    0x0,
+    0x0,
+    0x0,
+    0x2,
+    0x0,
+    0x3,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x0,
+    0x2,
+    0x1,
+    0x4,
+    0x1,
+    0x1,
+    0x1,
+    0x2,
+    0x1,
+    0x6,
+    0x1,
+    0x1,
+    0x2,
+    0x1,
+    0x0,
+    0x0,
+    0x0,
+    0x3,
+    0x1,
+    0x0,
+    0x5,
+    0x1,
+];
+pub(crate) const CJK_COMPAT_VARIANTS_DECOMPOSED_KV: &[(u32, &'static [char])] = &[
+    (0xfa08, &['\u{884C}', '\u{FE00}']),
+    (0x2f825, &['\u{52C7}', '\u{FE01}']),
+    (0x2f838, &['\u{20B63}', '\u{FE00}']),
+    (0x2f95b, &['\u{7A4F}', '\u{FE00}']),
+    (0x2f8fb, &['\u{23CBC}', '\u{FE00}']),
+    (0x2f83a, &['\u{53F1}', '\u{FE00}']),
+    (0x2f8a7, &['\u{614C}', '\u{FE00}']),
+    (0x2f856, &['\u{5832}', '\u{FE00}']),
+    (0x2f810, &['\u{5164}', '\u{FE00}']),
+    (0xfa8b, &['\u{61F2}', '\u{FE01}']),
+    (0xfa7a, &['\u{5599}', '\u{FE00}']),
+    (0x2f9ef, &['\u{4995}', '\u{FE00}']),
+    (0x2f959, &['\u{7A40}', '\u{FE01}']),
+    (0xf9c8, &['\u{677B}', '\u{FE00}']),
+    (0xf9c4, &['\u{9F8D}', '\u{FE00}']),
+    (0x2f833, &['\u{537F}', '\u{FE02}']),
+    (0xf96c, &['\u{585E}', '\u{FE00}']),
+    (0xf9a1, &['\u{8AAA}', '\u{FE01}']),
+    (0xf906, &['\u{53E5}', '\u{FE00}']),
+    (0x2fa01, &['\u{295B6}', '\u{FE00}']),
+    (0xf94c, &['\u{6A13}', '\u{FE00}']),
+    (0xf90f, &['\u{7F85}', '\u{FE00}']),
+    (0x2f8dd, &['\u{233C3}', '\u{FE00}']),
+    (0xfa55, &['\u{7A81}', '\u{FE00}']),
+    (0x2f860, &['\u{216A8}', '\u{FE00}']),
+    (0x2f999, &['\u{831D}', '\u{FE00}']),
+    (0xfabc, &['\u{8B01}', '\u{FE01}']),
+    (0x2f9b9, &['\u{870E}', '\u{FE00}']),
+    (0xf943, &['\u{5F04}', '\u{FE00}']),
+    (0x2f952, &['\u{25626}', '\u{FE00}']),
+    (0x2f8f1, &['\u{6B54}', '\u{FE00}']),
+    (0xf99c, &['\u{5217}', '\u{FE00}']),
+    (0xf969, &['\u{6578}', '\u{FE00}']),
+    (0xf98d, &['\u{8F62}', '\u{FE00}']),
+    (0xfa7f, &['\u{5954}', '\u{FE00}']),
+    (0x2f9d6, &['\u{8D1B}', '\u{FE00}']),
+    (0x2f81b, &['\u{51B5}', '\u{FE01}']),
+    (0xfa9d, &['\u{77A7}', '\u{FE00}']),
+    (0x2f8e4, &['\u{688E}', '\u{FE00}']),
+    (0xfa94, &['\u{6756}', '\u{FE00}']),
+    (0x2f890, &['\u{5EFE}', '\u{FE00}']),
+    (0xf93d, &['\u{7DA0}', '\u{FE00}']),
+    (0x2f924, &['\u{7280}', '\u{FE00}']),
+    (0x2f983, &['\u{8103}', '\u{FE00}']),
+    (0xfa2f, &['\u{96B7}', '\u{FE00}']),
+    (0x2f891, &['\u{22331}', '\u{FE00}']),
+    (0x2f934, &['\u{7524}', '\u{FE00}']),
+    (0x2f835, &['\u{7070}', '\u{FE00}']),
+    (0x2f899, &['\u{5F62}', '\u{FE00}']),
+    (0x2f8ae, &['\u{61AF}', '\u{FE00}']),
+    (0xf9d6, &['\u{6DEA}', '\u{FE00}']),
+    (0x2f9a0, &['\u{8353}', '\u{FE00}']),
+    (0xfac2, &['\u{8F38}', '\u{FE00}']),
+    (0x2f851, &['\u{58EE}', '\u{FE00}']),
+    (0x2f804, &['\u{4F60}', '\u{FE00}']),
+    (0x2f90d, &['\u{23ED1}', '\u{FE00}']),
+    (0xf95e, &['\u{4E39}', '\u{FE00}']),
+    (0x2f8da, &['\u{6721}', '\u{FE00}']),
+    (0x2f885, &['\u{5E28}', '\u{FE00}']),
+    (0x2f96a, &['\u{7D00}', '\u{FE00}']),
+    (0xf907, &['\u{9F9C}', '\u{FE00}']),
+    (0xf9f9, &['\u{7C92}', '\u{FE00}']),
+    (0xf94b, &['\u{5C62}', '\u{FE00}']),
+    (0x2f915, &['\u{701B}', '\u{FE00}']),
+    (0xf9f1, &['\u{96A3}', '\u{FE00}']),
+    (0x2f86d, &['\u{5BC3}', '\u{FE00}']),
+    (0x2f921, &['\u{7235}', '\u{FE01}']),
+    (0xfa96, &['\u{6BBA}', '\u{FE01}']),
+    (0xf9e0, &['\u{6613}', '\u{FE00}']),
+    (0xf921, &['\u{5D50}', '\u{FE00}']),
+    (0x2f99f, &['\u{8457}', '\u{FE01}']),
+    (0x2f8b2, &['\u{6210}', '\u{FE00}']),
+    (0xfab1, &['\u{7F3E}', '\u{FE00}']),
+    (0xfa6c, &['\u{242EE}', '\u{FE00}']),
+    (0x2f819, &['\u{4ECC}', '\u{FE00}']),
+    (0x2f910, &['\u{23F5E}', '\u{FE00}']),
+    (0x2f8dc, &['\u{6753}', '\u{FE00}']),
+    (0x2f9d3, &['\u{27CA8}', '\u{FE00}']),
+    (0x2f8a3, &['\u{6094}', '\u{FE01}']),
+    (0xf915, &['\u{6D1B}', '\u{FE00}']),
+    (0x2f88a, &['\u{387C}', '\u{FE00}']),
+    (0xf9f6, &['\u{81E8}', '\u{FE00}']),
+    (0x2f9f1, &['\u{28D77}', '\u{FE00}']),
+    (0xf98e, &['\u{5E74}', '\u{FE00}']),
+    (0xfad5, &['\u{25249}', '\u{FE00}']),
+    (0xf93b, &['\u{788C}', '\u{FE00}']),
+    (0x2f91e, &['\u{719C}', '\u{FE00}']),
+    (0xf9eb, &['\u{533F}', '\u{FE00}']),
+    (0xfa42, &['\u{65E2}', '\u{FE00}']),
+    (0x2f958, &['\u{412F}', '\u{FE00}']),
+    (0xfa19, &['\u{795E}', '\u{FE00}']),
+    (0xfaaa, &['\u{7740}', '\u{FE00}']),
+    (0x2f949, &['\u{4039}', '\u{FE01}']),
+    (0x2f978, &['\u{7F95}', '\u{FE00}']),
+    (0x2f8a9, &['\u{614C}', '\u{FE01}']),
+    (0x2f90a, &['\u{3D33}', '\u{FE00}']),
+    (0x2f89a, &['\u{5F6B}', '\u{FE00}']),
+    (0x2f8b5, &['\u{62B1}', '\u{FE00}']),
+    (0x2f94c, &['\u{4096}', '\u{FE00}']),
+    (0xfa43, &['\u{6691}', '\u{FE00}']),
+    (0xf997, &['\u{806F}', '\u{FE00}']),
+    (0x2f8ba, &['\u{62FC}', '\u{FE00}']),
+    (0xfa00, &['\u{5207}', '\u{FE00}']),
+    (0xfac3, &['\u{9072}', '\u{FE00}']),
+    (0x2f948, &['\u{774A}', '\u{FE01}']),
+    (0x2f9f4, &['\u{5DB2}', '\u{FE00}']),
+    (0xfa99, &['\u{6ECB}', '\u{FE00}']),
+    (0x2f976, &['\u{7F7A}', '\u{FE00}']),
+    (0xf978, &['\u{5169}', '\u{FE00}']),
+    (0x2f8fe, &['\u{6C67}', '\u{FE00}']),
+    (0x2f8e3, &['\u{2346D}', '\u{FE00}']),
+    (0xf919, &['\u{916A}', '\u{FE00}']),
+    (0x2f8ef, &['\u{6B21}', '\u{FE00}']),
+    (0xf939, &['\u{9B6F}', '\u{FE00}']),
+    (0x2f8c9, &['\u{656C}', '\u{FE00}']),
+    (0x2f844, &['\u{5563}', '\u{FE00}']),
+    (0xfabb, &['\u{8ACB}', '\u{FE00}']),
+    (0x2f9c4, &['\u{8863}', '\u{FE00}']),
+    (0x2f984, &['\u{440B}', '\u{FE00}']),
+    (0x2f802, &['\u{4E41}', '\u{FE00}']),
+    (0xfa15, &['\u{51DE}', '\u{FE00}']),
+    (0xf9be, &['\u{6599}', '\u{FE00}']),
+    (0xf942, &['\u{58DF}', '\u{FE00}']),
+    (0x2f852, &['\u{57CE}', '\u{FE00}']),
+    (0xfaae, &['\u{7C7B}', '\u{FE00}']),
+    (0x2fa17, &['\u{9EF9}', '\u{FE00}']),
+    (0x2f92d, &['\u{3EB8}', '\u{FE01}']),
+    (0x2f83f, &['\u{5468}', '\u{FE00}']),
+    (0xf90c, &['\u{5948}', '\u{FE00}']),
+    (0xf931, &['\u{6AD3}', '\u{FE00}']),
+    (0xf9c1, &['\u{7642}', '\u{FE00}']),
+    (0x2f873, &['\u{5C06}', '\u{FE00}']),
+    (0x2f965, &['\u{25C80}', '\u{FE00}']),
+    (0xf902, &['\u{8ECA}', '\u{FE00}']),
+    (0x2f805, &['\u{4FAE}', '\u{FE01}']),
+    (0x2f8ca, &['\u{2300A}', '\u{FE00}']),
+    (0xf9c7, &['\u{5289}', '\u{FE00}']),
+    (0x2f8f4, &['\u{6B9F}', '\u{FE00}']),
+    (0xfa0d, &['\u{55C0}', '\u{FE00}']),
+    (0xfa5c, &['\u{81ED}', '\u{FE00}']),
+    (0xfa4c, &['\u{793E}', '\u{FE00}']),
+    (0x2f865, &['\u{59D8}', '\u{FE00}']),
+    (0x2f876, &['\u{3781}', '\u{FE00}']),
+    (0x2f9d7, &['\u{8D77}', '\u{FE00}']),
+    (0xf975, &['\u{63A0}', '\u{FE00}']),
+    (0x2f9bb, &['\u{8779}', '\u{FE01}']),
+    (0x2f9d2, &['\u{8C55}', '\u{FE00}']),
+    (0xf9ed, &['\u{541D}', '\u{FE00}']),
+    (0x2f9b4, &['\u{865C}', '\u{FE01}']),
+    (0xfa6d, &['\u{8218}', '\u{FE00}']),
+    (0xf9e5, &['\u{75E2}', '\u{FE00}']),
+    (0x2f8d8, &['\u{6717}', '\u{FE02}']),
+    (0x2f93d, &['\u{25044}', '\u{FE00}']),
+    (0xfa03, &['\u{7CD6}', '\u{FE00}']),
+    (0xf9a0, &['\u{88C2}', '\u{FE00}']),
+    (0x2fa12, &['\u{2A105}', '\u{FE00}']),
+    (0xfa63, &['\u{8B39}', '\u{FE00}']),
+    (0xf920, &['\u{9E1E}', '\u{FE00}']),
+    (0xf91f, &['\u{862D}', '\u{FE00}']),
+    (0x2f97d, &['\u{8060}', '\u{FE00}']),
+    (0xf990, &['\u{6200}', '\u{FE00}']),
+    (0xfa57, &['\u{7DF4}', '\u{FE01}']),
+    (0x2f975, &['\u{262D9}', '\u{FE00}']),
+    (0xfad8, &['\u{9F43}', '\u{FE00}']),
+    (0xfab3, &['\u{8352}', '\u{FE00}']),
+    (0x2f9f3, &['\u{96C3}', '\u{FE00}']),
+    (0xf9fb, &['\u{7099}', '\u{FE00}']),
+    (0xf918, &['\u{843D}', '\u{FE00}']),
+    (0x2f8c3, &['\u{6469}', '\u{FE00}']),
+    (0xf9ca, &['\u{6D41}', '\u{FE00}']),
+    (0xf952, &['\u{52D2}', '\u{FE00}']),
+    (0x2fa0b, &['\u{9C40}', '\u{FE00}']),
+    (0x2f941, &['\u{250F3}', '\u{FE00}']),
+    (0x2f862, &['\u{59EC}', '\u{FE00}']),
+    (0x2f8ff, &['\u{6D16}', '\u{FE00}']),
+    (0x2f85d, &['\u{591A}', '\u{FE00}']),
+    (0xf9d9, &['\u{6144}', '\u{FE00}']),
+    (0x2f855, &['\u{578B}', '\u{FE00}']),
+    (0x2f98f, &['\u{8291}', '\u{FE00}']),
+    (0xf9d4, &['\u{502B}', '\u{FE00}']),
+    (0xf99e, &['\u{54BD}', '\u{FE00}']),
+    (0x2f850, &['\u{5207}', '\u{FE01}']),
+    (0xfa22, &['\u{8AF8}', '\u{FE00}']),
+    (0x2f94f, &['\u{788C}', '\u{FE01}']),
+    (0xfaa9, &['\u{774A}', '\u{FE00}']),
+    (0xfa71, &['\u{51B5}', '\u{FE00}']),
+    (0xf95d, &['\u{8AFE}', '\u{FE00}']),
+    (0x2f8bd, &['\u{63E4}', '\u{FE00}']),
+    (0x2fa02, &['\u{98E2}', '\u{FE00}']),
+    (0x2f93f, &['\u{4008}', '\u{FE00}']),
+    (0x2f808, &['\u{507A}', '\u{FE00}']),
+    (0x2f950, &['\u{78CC}', '\u{FE01}']),
+    (0x2f933, &['\u{3F1B}', '\u{FE00}']),
+    (0x2f853, &['\u{57F4}', '\u{FE00}']),
+    (0x2f8f0, &['\u{238A7}', '\u{FE00}']),
+    (0xf967, &['\u{4E0D}', '\u{FE00}']),
+    (0xfa16, &['\u{732A}', '\u{FE00}']),
+    (0xfaa6, &['\u{76CA}', '\u{FE01}']),
+    (0x2f8b3, &['\u{621B}', '\u{FE00}']),
+    (0x2f9f7, &['\u{2921A}', '\u{FE00}']),
+    (0xf986, &['\u{95AD}', '\u{FE00}']),
+    (0x2f99d, &['\u{83BD}', '\u{FE00}']),
+    (0x2f9b8, &['\u{8688}', '\u{FE00}']),
+    (0xf998, &['\u{8F26}', '\u{FE00}']),
+    (0x2f82b, &['\u{5317}', '\u{FE01}']),
+    (0x2f872, &['\u{5BFF}', '\u{FE00}']),
+    (0xfab9, &['\u{8ABF}', '\u{FE00}']),
+    (0xfa9b, &['\u{701E}', '\u{FE00}']),
+    (0xf9b0, &['\u{8046}', '\u{FE00}']),
+    (0xf98b, &['\u{66C6}', '\u{FE00}']),
+    (0xfad1, &['\u{233D5}', '\u{FE00}']),
+    (0xf917, &['\u{73DE}', '\u{FE00}']),
+    (0x2f989, &['\u{23393}', '\u{FE00}']),
+    (0x2f866, &['\u{5A66}', '\u{FE00}']),
+    (0xf932, &['\u{7210}', '\u{FE00}']),
+    (0x2fa0e, &['\u{4CED}', '\u{FE00}']),
+    (0xfa07, &['\u{8F3B}', '\u{FE00}']),
+    (0xf9bd, &['\u{5C3F}', '\u{FE00}']),
+    (0x2f88c, &['\u{5EB3}', '\u{FE00}']),
+    (0xfa56, &['\u{7BC0}', '\u{FE00}']),
+    (0xfa64, &['\u{8CD3}', '\u{FE00}']),
+    (0xfa04, &['\u{5B85}', '\u{FE00}']),
+    (0xfa9e, &['\u{7235}', '\u{FE00}']),
+    (0x2f9e0, &['\u{285D2}', '\u{FE00}']),
+    (0x2f89d, &['\u{5FCD}', '\u{FE00}']),
+    (0x2f9ee, &['\u{958B}', '\u{FE00}']),
+    (0xf9db, &['\u{7387}', '\u{FE01}']),
+    (0xf923, &['\u{85CD}', '\u{FE00}']),
+    (0x2f841, &['\u{54F6}', '\u{FE00}']),
+    (0x2f81a, &['\u{51AC}', '\u{FE00}']),
+    (0xf911, &['\u{87BA}', '\u{FE00}']),
+    (0xfaad, &['\u{7BC0}', '\u{FE01}']),
+    (0xfac1, &['\u{8D08}', '\u{FE01}']),
+    (0x2f928, &['\u{737A}', '\u{FE00}']),
+    (0x2f935, &['\u{24C36}', '\u{FE00}']),
+    (0x2f8d5, &['\u{669C}', '\u{FE00}']),
+    (0xf92e, &['\u{51B7}', '\u{FE00}']),
+    (0xfa59, &['\u{7E41}', '\u{FE00}']),
+    (0x2f96b, &['\u{25F86}', '\u{FE00}']),
+    (0x2f8b9, &['\u{633D}', '\u{FE00}']),
+    (0x2f877, &['\u{5C60}', '\u{FE00}']),
+    (0x2fa00, &['\u{9829}', '\u{FE00}']),
+    (0xfa05, &['\u{6D1E}', '\u{FE00}']),
+    (0xf9e8, &['\u{88E1}', '\u{FE00}']),
+    (0x2f8c6, &['\u{6477}', '\u{FE00}']),
+    (0xf97a, &['\u{6881}', '\u{FE00}']),
+    (0x2f9ea, &['\u{927C}', '\u{FE00}']),
+    (0xf944, &['\u{7C60}', '\u{FE00}']),
+    (0x2f8c4, &['\u{647E}', '\u{FE00}']),
+    (0x2f9cd, &['\u{46BE}', '\u{FE00}']),
+    (0x2f8e5, &['\u{681F}', '\u{FE00}']),
+    (0x2f9d9, &['\u{20804}', '\u{FE00}']),
+    (0x2f980, &['\u{2335F}', '\u{FE00}']),
+    (0x2f9a8, &['\u{84F1}', '\u{FE00}']),
+    (0x2f92f, &['\u{745C}', '\u{FE00}']),
+    (0x2f951, &['\u{40E3}', '\u{FE00}']),
+    (0x2f9f9, &['\u{4A76}', '\u{FE00}']),
+    (0xfab4, &['\u{83EF}', '\u{FE00}']),
+    (0xf985, &['\u{792A}', '\u{FE00}']),
+    (0x2f829, &['\u{5305}', '\u{FE00}']),
+    (0x2f8a2, &['\u{391C}', '\u{FE00}']),
+    (0x2f9c3, &['\u{8860}', '\u{FE00}']),
+    (0x2f936, &['\u{753E}', '\u{FE00}']),
+    (0x2f9af, &['\u{4561}', '\u{FE00}']),
+    (0xfa77, &['\u{52FA}', '\u{FE00}']),
+    (0xf956, &['\u{7A1C}', '\u{FE00}']),
+    (0xfa5f, &['\u{8457}', '\u{FE00}']),
+    (0x2f93b, &['\u{24FA1}', '\u{FE00}']),
+    (0xf914, &['\u{6A02}', '\u{FE00}']),
+    (0x2f994, &['\u{82B3}', '\u{FE00}']),
+    (0x2f91b, &['\u{20525}', '\u{FE00}']),
+    (0x2f880, &['\u{5D7C}', '\u{FE00}']),
+    (0x2f956, &['\u{798F}', '\u{FE01}']),
+    (0xf958, &['\u{83F1}', '\u{FE00}']),
+    (0x2f99b, &['\u{83AD}', '\u{FE00}']),
+    (0x2fa06, &['\u{99C2}', '\u{FE00}']),
+    (0xfabf, &['\u{8B39}', '\u{FE01}']),
+    (0x2f8b6, &['\u{62D4}', '\u{FE00}']),
+    (0x2f8a0, &['\u{6081}', '\u{FE00}']),
+    (0xfa87, &['\u{614E}', '\u{FE00}']),
+    (0x2f8ea, &['\u{69EA}', '\u{FE00}']),
+    (0x2f867, &['\u{36EE}', '\u{FE00}']),
+    (0xf97d, &['\u{8AD2}', '\u{FE00}']),
+    (0xf968, &['\u{6CCC}', '\u{FE00}']),
+    (0xfa5a, &['\u{7F72}', '\u{FE00}']),
+    (0xf97b, &['\u{7CE7}', '\u{FE00}']),
+    (0x2fa10, &['\u{2A0CE}', '\u{FE00}']),
+    (0xfa2b, &['\u{98FC}', '\u{FE00}']),
+    (0xfa75, &['\u{5180}', '\u{FE00}']),
+    (0xf94d, &['\u{6DDA}', '\u{FE00}']),
+    (0xfad4, &['\u{4039}', '\u{FE00}']),
+    (0x2f8cc, &['\u{66F8}', '\u{FE00}']),
+    (0xfa8a, &['\u{6160}', '\u{FE00}']),
+    (0xf9f4, &['\u{6797}', '\u{FE00}']),
+    (0xfac6, &['\u{967C}', '\u{FE00}']),
+    (0xfa9c, &['\u{716E}', '\u{FE01}']),
+    (0xfa10, &['\u{585A}', '\u{FE00}']),
+    (0xf9e2, &['\u{68A8}', '\u{FE00}']),
+    (0xf947, &['\u{78CA}', '\u{FE00}']),
+    (0xf941, &['\u{8AD6}', '\u{FE00}']),
+    (0xfa4e, &['\u{7948}', '\u{FE00}']),
+    (0x2f9da, &['\u{8DCB}', '\u{FE00}']),
+    (0x2f893, &['\u{8201}', '\u{FE00}']),
+    (0xf96f, &['\u{8AAA}', '\u{FE00}']),
+    (0xf983, &['\u{65C5}', '\u{FE00}']),
+    (0xf9f5, &['\u{6DCB}', '\u{FE00}']),
+    (0xf962, &['\u{7570}', '\u{FE00}']),
+    (0x2f968, &['\u{7CE8}', '\u{FE00}']),
+    (0x2f923, &['\u{24608}', '\u{FE00}']),
+    (0x2fa18, &['\u{9EFE}', '\u{FE00}']),
+    (0x2f930, &['\u{7471}', '\u{FE01}']),
+    (0xfa90, &['\u{6556}', '\u{FE00}']),
+    (0xfa54, &['\u{7A40}', '\u{FE00}']),
+    (0xf9d8, &['\u{5F8B}', '\u{FE00}']),
+    (0x2f9e4, &['\u{9111}', '\u{FE00}']),
+    (0x2fa05, &['\u{99A7}', '\u{FE00}']),
+    (0x2f964, &['\u{4227}', '\u{FE00}']),
+    (0xf99f, &['\u{70C8}', '\u{FE00}']),
+    (0x2f94b, &['\u{4046}', '\u{FE00}']),
+    (0x2f9a9, &['\u{84F3}', '\u{FE00}']),
+    (0xfa0c, &['\u{5140}', '\u{FE00}']),
+    (0x2f986, &['\u{5AB5}', '\u{FE00}']),
+    (0xfa85, &['\u{5FAD}', '\u{FE00}']),
+    (0x2f95f, &['\u{7AEE}', '\u{FE00}']),
+    (0xf9f8, &['\u{7B20}', '\u{FE00}']),
+    (0xf9b4, &['\u{9818}', '\u{FE00}']),
+    (0x2f82e, &['\u{535A}', '\u{FE00}']),
+    (0xfad9, &['\u{9F8E}', '\u{FE00}']),
+    (0x2f937, &['\u{24C92}', '\u{FE00}']),
+    (0xf9cf, &['\u{7D10}', '\u{FE00}']),
+    (0xfaa1, &['\u{7471}', '\u{FE00}']),
+    (0x2f917, &['\u{704A}', '\u{FE00}']),
+    (0xfaa5, &['\u{761F}', '\u{FE00}']),
+    (0xfa3b, &['\u{5C64}', '\u{FE00}']),
+    (0x2f88d, &['\u{5EB6}', '\u{FE00}']),
+    (0x2f906, &['\u{23D1E}', '\u{FE00}']),
+    (0x2f901, &['\u{6D77}', '\u{FE01}']),
+    (0x2f97a, &['\u{8005}', '\u{FE02}']),
+    (0xfa60, &['\u{8910}', '\u{FE00}']),
+    (0x2f92c, &['\u{3EB8}', '\u{FE00}']),
+    (0x2f80a, &['\u{50E7}', '\u{FE01}']),
+    (0x2f99a, &['\u{8363}', '\u{FE00}']),
+    (0x2fa13, &['\u{2A20E}', '\u{FE00}']),
+    (0x2f938, &['\u{7570}', '\u{FE01}']),
+    (0x2f813, &['\u{34B9}', '\u{FE00}']),
+    (0x2f831, &['\u{537F}', '\u{FE00}']),
+    (0xfa1c, &['\u{9756}', '\u{FE00}']),
+    (0xfacc, &['\u{983B}', '\u{FE01}']),
+    (0xfa5e, &['\u{8279}', '\u{FE01}']),
+    (0x2f995, &['\u{82BD}', '\u{FE00}']),
+    (0x2f8d3, &['\u{5195}', '\u{FE00}']),
+    (0xfacd, &['\u{9B12}', '\u{FE00}']),
+    (0x2f81d, &['\u{51F5}', '\u{FE00}']),
+    (0x2f97b, &['\u{264DA}', '\u{FE00}']),
+    (0xfa3a, &['\u{58A8}', '\u{FE00}']),
+    (0xf9c6, &['\u{962E}', '\u{FE00}']),
+    (0xfabd, &['\u{8AFE}', '\u{FE01}']),
+    (0xf92d, &['\u{4F86}', '\u{FE00}']),
+    (0xf99b, &['\u{934A}', '\u{FE00}']),
+    (0xf91d, &['\u{6B04}', '\u{FE00}']),
+    (0x2f84d, &['\u{5717}', '\u{FE00}']),
+    (0x2f8ad, &['\u{61A4}', '\u{FE00}']),
+    (0xf9d3, &['\u{9678}', '\u{FE00}']),
+    (0x2f843, &['\u{5553}', '\u{FE00}']),
+    (0xf97c, &['\u{826F}', '\u{FE00}']),
+    (0xfa30, &['\u{4FAE}', '\u{FE00}']),
+    (0x2f858, &['\u{58AC}', '\u{FE00}']),
+    (0x2f8a5, &['\u{60C7}', '\u{FE00}']),
+    (0x2f988, &['\u{267B5}', '\u{FE00}']),
+    (0x2f9e1, &['\u{285ED}', '\u{FE00}']),
+    (0xfa74, &['\u{5145}', '\u{FE00}']),
+    (0x2f882, &['\u{5DE2}', '\u{FE00}']),
+    (0x2f879, &['\u{5CC0}', '\u{FE00}']),
+    (0x2f8b7, &['\u{6350}', '\u{FE00}']),
+    (0xf940, &['\u{9E7F}', '\u{FE00}']),
+    (0x2f9e5, &['\u{2872E}', '\u{FE00}']),
+    (0x2f9cf, &['\u{8AA0}', '\u{FE00}']),
+    (0xfa8e, &['\u{641C}', '\u{FE00}']),
+    (0x2f90c, &['\u{6EC7}', '\u{FE00}']),
+    (0x2f985, &['\u{813E}', '\u{FE00}']),
+    (0x2f849, &['\u{55B3}', '\u{FE00}']),
+    (0x2f960, &['\u{4202}', '\u{FE00}']),
+    (0x2f8c2, &['\u{3A2E}', '\u{FE00}']),
+    (0x2f85f, &['\u{5962}', '\u{FE00}']),
+    (0x2f916, &['\u{3D96}', '\u{FE00}']),
+    (0xf9fa, &['\u{72C0}', '\u{FE00}']),
+    (0x2f824, &['\u{3515}', '\u{FE00}']),
+    (0xf936, &['\u{865C}', '\u{FE00}']),
+    (0x2f94a, &['\u{778B}', '\u{FE00}']),
+    (0x2f80e, &['\u{514D}', '\u{FE01}']),
+    (0x2f913, &['\u{7039}', '\u{FE00}']),
+    (0x2f94d, &['\u{2541D}', '\u{FE00}']),
+    (0xf999, &['\u{84EE}', '\u{FE00}']),
+    (0x2f979, &['\u{7FFA}', '\u{FE00}']),
+    (0x2f926, &['\u{24735}', '\u{FE00}']),
+    (0xf9ea, &['\u{96E2}', '\u{FE00}']),
+    (0xfa3f, &['\u{618E}', '\u{FE00}']),
+    (0x2f83b, &['\u{5406}', '\u{FE00}']),
+    (0xfa5b, &['\u{8005}', '\u{FE00}']),
+    (0xfa93, &['\u{671B}', '\u{FE00}']),
+    (0xf913, &['\u{908F}', '\u{FE00}']),
+    (0xf98c, &['\u{6B77}', '\u{FE00}']),
+    (0x2f8c0, &['\u{63C5}', '\u{FE00}']),
+    (0xfad7, &['\u{27ED3}', '\u{FE00}']),
+    (0xf98a, &['\u{529B}', '\u{FE00}']),
+    (0xfa26, &['\u{90FD}', '\u{FE00}']),
+    (0xfabe, &['\u{8AED}', '\u{FE00}']),
+    (0x2f977, &['\u{2633E}', '\u{FE00}']),
+    (0xf954, &['\u{51DC}', '\u{FE00}']),
+    (0xf91a, &['\u{99F1}', '\u{FE00}']),
+    (0x2f8cd, &['\u{6649}', '\u{FE00}']),
+    (0x2f8a4, &['\u{226D4}', '\u{FE00}']),
+    (0xfa84, &['\u{5F69}', '\u{FE00}']),
+    (0x2f85e, &['\u{5922}', '\u{FE00}']),
+    (0xfa9f, &['\u{72AF}', '\u{FE00}']),
+    (0xf9b1, &['\u{9234}', '\u{FE00}']),
+    (0x2f9ca, &['\u{34BB}', '\u{FE00}']),
+    (0xfac4, &['\u{9199}', '\u{FE00}']),
+    (0xf927, &['\u{881F}', '\u{FE00}']),
+    (0xfa01, &['\u{5EA6}', '\u{FE00}']),
+    (0xf929, &['\u{6717}', '\u{FE00}']),
+    (0xf9f3, &['\u{9E9F}', '\u{FE00}']),
+    (0x2f9e6, &['\u{911B}', '\u{FE00}']),
+    (0xfa70, &['\u{4E26}', '\u{FE00}']),
+    (0x2f820, &['\u{523B}', '\u{FE00}']),
+    (0xf9a9, &['\u{56F9}', '\u{FE00}']),
+    (0x2f9bf, &['\u{45D7}', '\u{FE00}']),
+    (0x2f922, &['\u{7250}', '\u{FE00}']),
+    (0x2f9de, &['\u{8ED4}', '\u{FE00}']),
+    (0x2f8ec, &['\u{236A3}', '\u{FE00}']),
+    (0xf9b5, &['\u{4F8B}', '\u{FE00}']),
+    (0x2f9b7, &['\u{86A9}', '\u{FE00}']),
+    (0x2f981, &['\u{43D5}', '\u{FE00}']),
+    (0xfa31, &['\u{50E7}', '\u{FE00}']),
+    (0x2f9c1, &['\u{8801}', '\u{FE00}']),
+    (0x2f874, &['\u{5F53}', '\u{FE00}']),
+    (0xf9d0, &['\u{985E}', '\u{FE00}']),
+    (0xf94a, &['\u{58D8}', '\u{FE00}']),
+    (0x2f998, &['\u{82E5}', '\u{FE01}']),
+    (0x2f91c, &['\u{7145}', '\u{FE00}']),
+    (0x2f9df, &['\u{8F38}', '\u{FE01}']),
+    (0x2f859, &['\u{214E4}', '\u{FE00}']),
+    (0x2f883, &['\u{382F}', '\u{FE00}']),
+    (0xf9cc, &['\u{7409}', '\u{FE00}']),
+    (0x2f9b5, &['\u{8667}', '\u{FE00}']),
+    (0x2f970, &['\u{7E45}', '\u{FE00}']),
+    (0x2f814, &['\u{5167}', '\u{FE00}']),
+    (0x2f9ff, &['\u{980B}', '\u{FE02}']),
+    (0x2f84c, &['\u{5606}', '\u{FE01}']),
+    (0x2f9a4, &['\u{26C36}', '\u{FE00}']),
+    (0x2f966, &['\u{7CD2}', '\u{FE00}']),
+    (0xfa1e, &['\u{7FBD}', '\u{FE00}']),
+    (0x2fa0c, &['\u{9CFD}', '\u{FE00}']),
+    (0x2f863, &['\u{5A1B}', '\u{FE00}']),
+    (0xfaa2, &['\u{7506}', '\u{FE00}']),
+    (0x2f91a, &['\u{70AD}', '\u{FE00}']),
+    (0x2f8f8, &['\u{21D0B}', '\u{FE00}']),
+    (0x2f8a6, &['\u{6148}', '\u{FE00}']),
+    (0x2f895, &['\u{5F22}', '\u{FE01}']),
+    (0xf90b, &['\u{5587}', '\u{FE00}']),
+    (0x2f993, &['\u{82B1}', '\u{FE00}']),
+    (0x2f8be, &['\u{22BF1}', '\u{FE00}']),
+    (0xf948, &['\u{8CC2}', '\u{FE00}']),
+    (0x2f80d, &['\u{2063A}', '\u{FE00}']),
+    (0x2f81f, &['\u{34DF}', '\u{FE00}']),
+    (0xf9e4, &['\u{7406}', '\u{FE00}']),
+    (0x2f823, &['\u{5277}', '\u{FE00}']),
+    (0x2f9fa, &['\u{97E0}', '\u{FE00}']),
+    (0x2f8fa, &['\u{6C4E}', '\u{FE00}']),
+    (0xfa6a, &['\u{983B}', '\u{FE00}']),
+    (0x2f9f0, &['\u{95B7}', '\u{FE00}']),
+    (0x2f967, &['\u{42A0}', '\u{FE00}']),
+    (0xfa8f, &['\u{6452}', '\u{FE00}']),
+    (0xfa06, &['\u{66B4}', '\u{FE00}']),
+    (0xf982, &['\u{5EEC}', '\u{FE00}']),
+    (0xf989, &['\u{9ECE}', '\u{FE00}']),
+    (0x2f990, &['\u{828B}', '\u{FE00}']),
+    (0xfac9, &['\u{97DB}', '\u{FE00}']),
+    (0x2f8ed, &['\u{6ADB}', '\u{FE00}']),
+    (0x2f822, &['\u{5272}', '\u{FE00}']),
+    (0xf9cb, &['\u{6E9C}', '\u{FE00}']),
+    (0xfa4d, &['\u{7949}', '\u{FE00}']),
+    (0x2f944, &['\u{25133}', '\u{FE00}']),
+    (0x2f9e8, &['\u{92D7}', '\u{FE00}']),
+    (0x2f8d2, &['\u{5192}', '\u{FE00}']),
+    (0x2f97c, &['\u{26523}', '\u{FE00}']),
+    (0xfa68, &['\u{96E3}', '\u{FE00}']),
+    (0xfa53, &['\u{798E}', '\u{FE00}']),
+    (0x2f8f5, &['\u{6BBA}', '\u{FE02}']),
+    (0x2f945, &['\u{771E}', '\u{FE00}']),
+    (0xfa95, &['\u{6B79}', '\u{FE00}']),
+    (0xfa2e, &['\u{90DE}', '\u{FE00}']),
+    (0xf91b, &['\u{4E82}', '\u{FE00}']),
+    (0x2f837, &['\u{53DF}', '\u{FE00}']),
+    (0x2f894, &['\u{5F22}', '\u{FE00}']),
+    (0x2fa09, &['\u{29B30}', '\u{FE00}']),
+    (0x2f974, &['\u{4359}', '\u{FE00}']),
+    (0xf9ba, &['\u{4E86}', '\u{FE00}']),
+    (0x2f80b, &['\u{50CF}', '\u{FE00}']),
+    (0xfaca, &['\u{97FF}', '\u{FE01}']),
+    (0x2f969, &['\u{7CE3}', '\u{FE00}']),
+    (0x2f8b1, &['\u{61F6}', '\u{FE01}']),
+    (0x2f8d1, &['\u{3AE4}', '\u{FE00}']),
+    (0x2f91d, &['\u{24263}', '\u{FE00}']),
+    (0x2f9d4, &['\u{8CAB}', '\u{FE00}']),
+    (0x2fa15, &['\u{9EBB}', '\u{FE00}']),
+    (0x2f954, &['\u{2569A}', '\u{FE00}']),
+    (0xfa81, &['\u{5B28}', '\u{FE00}']),
+    (0x2f9a5, &['\u{26D6B}', '\u{FE00}']),
+    (0x2f90f, &['\u{6F6E}', '\u{FE00}']),
+    (0xf92a, &['\u{6D6A}', '\u{FE00}']),
+    (0x2fa19, &['\u{9F05}', '\u{FE00}']),
+    (0x2f943, &['\u{25119}', '\u{FE00}']),
+    (0x2f947, &['\u{771F}', '\u{FE01}']),
+    (0x2fa0a, &['\u{9B12}', '\u{FE01}']),
+    (0x2f963, &['\u{7BC9}', '\u{FE00}']),
+    (0xf9bb, &['\u{50DA}', '\u{FE00}']),
+    (0x2f8ac, &['\u{61B2}', '\u{FE00}']),
+    (0xf9c5, &['\u{6688}', '\u{FE00}']),
+    (0x2f97e, &['\u{265A8}', '\u{FE00}']),
+    (0x2f889, &['\u{22183}', '\u{FE00}']),
+    (0x2f8e9, &['\u{69A3}', '\u{FE00}']),
+    (0xf9da, &['\u{6817}', '\u{FE00}']),
+    (0xface, &['\u{9F9C}', '\u{FE02}']),
+    (0x2f920, &['\u{7228}', '\u{FE00}']),
+    (0xf951, &['\u{964B}', '\u{FE00}']),
+    (0xf9bc, &['\u{5BEE}', '\u{FE00}']),
+    (0x2f940, &['\u{76F4}', '\u{FE01}']),
+    (0x2f84e, &['\u{5651}', '\u{FE00}']),
+    (0xfa48, &['\u{716E}', '\u{FE00}']),
+    (0x2fa08, &['\u{4BCE}', '\u{FE00}']),
+    (0xf9e6, &['\u{7F79}', '\u{FE00}']),
+    (0x2f8c8, &['\u{654F}', '\u{FE01}']),
+    (0xf912, &['\u{88F8}', '\u{FE00}']),
+    (0x2f8f7, &['\u{23A8D}', '\u{FE00}']),
+    (0x2f904, &['\u{6D78}', '\u{FE00}']),
+    (0xfa76, &['\u{52C7}', '\u{FE00}']),
+    (0x2f8e8, &['\u{6942}', '\u{FE00}']),
+    (0x2f9e2, &['\u{9094}', '\u{FE00}']),
+    (0xf903, &['\u{8CC8}', '\u{FE00}']),
+    (0xfa9a, &['\u{6F22}', '\u{FE01}']),
+    (0xf996, &['\u{7DF4}', '\u{FE00}']),
+    (0x2f8db, &['\u{675E}', '\u{FE00}']),
+    (0xfa4a, &['\u{7422}', '\u{FE00}']),
+    (0xfa6b, &['\u{6075}', '\u{FE00}']),
+    (0x2f8fd, &['\u{6CCD}', '\u{FE00}']),
+    (0xfa79, &['\u{5555}', '\u{FE00}']),
+    (0xf987, &['\u{9A6A}', '\u{FE00}']),
+    (0x2f8f2, &['\u{3C4E}', '\u{FE00}']),
+    (0xf90d, &['\u{61F6}', '\u{FE00}']),
+    (0xf922, &['\u{6FEB}', '\u{FE00}']),
+    (0xfa88, &['\u{6108}', '\u{FE00}']),
+    (0xf91c, &['\u{5375}', '\u{FE00}']),
+    (0x2f870, &['\u{5BF3}', '\u{FE00}']),
+    (0x2f9ac, &['\u{8564}', '\u{FE00}']),
+    (0x2f839, &['\u{53EB}', '\u{FE00}']),
+    (0x2fa03, &['\u{4B33}', '\u{FE00}']),
+    (0x2f854, &['\u{580D}', '\u{FE00}']),
+    (0x2f92a, &['\u{3EAC}', '\u{FE00}']),
+    (0xfa35, &['\u{5351}', '\u{FE00}']),
+    (0x2f9e7, &['\u{9238}', '\u{FE00}']),
+    (0x2f9a6, &['\u{26CD5}', '\u{FE00}']),
+    (0xfaaf, &['\u{7D5B}', '\u{FE00}']),
+    (0x2f911, &['\u{23F8E}', '\u{FE00}']),
+    (0x2f95d, &['\u{25AA7}', '\u{FE00}']),
+    (0x2f89c, &['\u{5F9A}', '\u{FE00}']),
+    (0xfa45, &['\u{6D77}', '\u{FE00}']),
+    (0xfa1b, &['\u{798F}', '\u{FE00}']),
+    (0xfa3d, &['\u{6094}', '\u{FE00}']),
+    (0xf980, &['\u{5442}', '\u{FE00}']),
+    (0xfa8c, &['\u{6234}', '\u{FE00}']),
+    (0x2f9e9, &['\u{92D8}', '\u{FE00}']),
+    (0x2f9f8, &['\u{4A6E}', '\u{FE00}']),
+    (0x2f902, &['\u{6D41}', '\u{FE02}']),
+    (0x2fa1d, &['\u{2A600}', '\u{FE00}']),
+    (0xfab6, &['\u{8941}', '\u{FE00}']),
+    (0xf995, &['\u{79CA}', '\u{FE00}']),
+    (0x2f832, &['\u{537F}', '\u{FE01}']),
+    (0x2f955, &['\u{256C5}', '\u{FE00}']),
+    (0x2f8fc, &['\u{6CBF}', '\u{FE00}']),
+    (0x2f875, &['\u{5C22}', '\u{FE00}']),
+    (0x2f82a, &['\u{5306}', '\u{FE00}']),
+    (0x2f811, &['\u{5177}', '\u{FE00}']),
+    (0x2f868, &['\u{36FC}', '\u{FE00}']),
+    (0x2f925, &['\u{7295}', '\u{FE00}']),
+    (0xfa20, &['\u{8612}', '\u{FE00}']),
+    (0x2f83e, &['\u{5448}', '\u{FE00}']),
+    (0xf9af, &['\u{7F9A}', '\u{FE00}']),
+    (0x2f997, &['\u{26B3C}', '\u{FE00}']),
+    (0x2f9ec, &['\u{9415}', '\u{FE00}']),
+    (0xf9ab, &['\u{5DBA}', '\u{FE00}']),
+    (0xf935, &['\u{8606}', '\u{FE00}']),
+    (0xfa80, &['\u{5A62}', '\u{FE00}']),
+    (0x2f95c, &['\u{2597C}', '\u{FE00}']),
+    (0xfa92, &['\u{6717}', '\u{FE01}']),
+    (0xf95b, &['\u{62CF}', '\u{FE00}']),
+    (0xf93e, &['\u{83C9}', '\u{FE00}']),
+    (0xf9de, &['\u{540F}', '\u{FE00}']),
+    (0xf9f0, &['\u{85FA}', '\u{FE00}']),
+    (0x2f847, &['\u{5599}', '\u{FE01}']),
+    (0xfa98, &['\u{6EDB}', '\u{FE00}']),
+    (0xf90e, &['\u{7669}', '\u{FE00}']),
+    (0xfa4f, &['\u{7950}', '\u{FE00}']),
+    (0xfaa4, &['\u{761D}', '\u{FE00}']),
+    (0x2f9c0, &['\u{87E1}', '\u{FE00}']),
+    (0x2f8bf, &['\u{6422}', '\u{FE00}']),
+    (0xfa62, &['\u{8B01}', '\u{FE00}']),
+    (0xf9b6, &['\u{79AE}', '\u{FE00}']),
+    (0x2f826, &['\u{52C9}', '\u{FE01}']),
+    (0xf9c9, &['\u{67F3}', '\u{FE00}']),
+    (0x2f992, &['\u{52B3}', '\u{FE00}']),
+    (0x2f8e1, &['\u{6852}', '\u{FE00}']),
+    (0xf959, &['\u{9675}', '\u{FE00}']),
+    (0x2f892, &['\u{22331}', '\u{FE01}']),
+    (0xfa18, &['\u{793C}', '\u{FE00}']),
+    (0x2f87d, &['\u{21DE6}', '\u{FE00}']),
+    (0xf970, &['\u{6BBA}', '\u{FE00}']),
+    (0x2f92b, &['\u{73A5}', '\u{FE00}']),
+    (0x2fa04, &['\u{9929}', '\u{FE00}']),
+    (0xfa89, &['\u{618E}', '\u{FE01}']),
+    (0x2f9e3, &['\u{90F1}', '\u{FE00}']),
+    (0x2f9c2, &['\u{45F9}', '\u{FE00}']),
+    (0xfacb, &['\u{980B}', '\u{FE00}']),
+    (0x2f9c8, &['\u{4635}', '\u{FE00}']),
+    (0x2f908, &['\u{6E2F}', '\u{FE00}']),
+    (0x2f86f, &['\u{5BE7}', '\u{FE02}']),
+    (0x2f98a, &['\u{2339C}', '\u{FE00}']),
+    (0xf9a8, &['\u{4EE4}', '\u{FE00}']),
+    (0x2f8c7, &['\u{3A6C}', '\u{FE00}']),
+    (0x2fa16, &['\u{4D56}', '\u{FE00}']),
+    (0xfa4b, &['\u{7891}', '\u{FE00}']),
+    (0x2f878, &['\u{5C6E}', '\u{FE01}']),
+    (0x2f8bb, &['\u{6368}', '\u{FE00}']),
+    (0x2f816, &['\u{2054B}', '\u{FE00}']),
+    (0x2f86a, &['\u{5B3E}', '\u{FE00}']),
+    (0xf9c3, &['\u{907C}', '\u{FE00}']),
+    (0xf945, &['\u{807E}', '\u{FE00}']),
+    (0x2f9fe, &['\u{980B}', '\u{FE01}']),
+    (0xfa86, &['\u{60D8}', '\u{FE00}']),
+    (0x2f82c, &['\u{5349}', '\u{FE00}']),
+    (0xf988, &['\u{9E97}', '\u{FE00}']),
+    (0xfac5, &['\u{9276}', '\u{FE00}']),
+    (0xfa66, &['\u{8FB6}', '\u{FE00}']),
+    (0x2f840, &['\u{54A2}', '\u{FE00}']),
+    (0xf9ee, &['\u{71D0}', '\u{FE00}']),
+    (0x2f830, &['\u{537D}', '\u{FE00}']),
+    (0x2f914, &['\u{701E}', '\u{FE01}']),
+    (0x2f942, &['\u{250F2}', '\u{FE00}']),
+    (0xfaa3, &['\u{753B}', '\u{FE00}']),
+    (0xf974, &['\u{82E5}', '\u{FE00}']),
+    (0x2f807, &['\u{5002}', '\u{FE00}']),
+    (0x2f905, &['\u{6D85}', '\u{FE00}']),
+    (0x2f9b2, &['\u{456B}', '\u{FE00}']),
+    (0x2f887, &['\u{5E69}', '\u{FE00}']),
+    (0x2f912, &['\u{6FC6}', '\u{FE00}']),
+    (0xf9ae, &['\u{7469}', '\u{FE00}']),
+    (0xf96a, &['\u{7D22}', '\u{FE00}']),
+    (0xf9b7, &['\u{91B4}', '\u{FE00}']),
+    (0x2f932, &['\u{74CA}', '\u{FE00}']),
+    (0x2f98d, &['\u{8F9E}', '\u{FE00}']),
+    (0xfa25, &['\u{9038}', '\u{FE00}']),
+    (0xf993, &['\u{7149}', '\u{FE00}']),
+    (0x2f9f5, &['\u{9723}', '\u{FE00}']),
+    (0xf9df, &['\u{5C65}', '\u{FE00}']),
+    (0x2f9c7, &['\u{88DE}', '\u{FE00}']),
+    (0x2f996, &['\u{82E6}', '\u{FE00}']),
+    (0x2f842, &['\u{5510}', '\u{FE00}']),
+    (0x2f869, &['\u{5B08}', '\u{FE00}']),
+    (0x2f861, &['\u{216EA}', '\u{FE00}']),
+    (0x2f8af, &['\u{61DE}', '\u{FE00}']),
+    (0x2f8c5, &['\u{649D}', '\u{FE00}']),
+    (0x2f962, &['\u{7BC6}', '\u{FE00}']),
+    (0x2f98b, &['\u{8201}', '\u{FE01}']),
+    (0x2f9a1, &['\u{83CA}', '\u{FE00}']),
+    (0xfad2, &['\u{3B9D}', '\u{FE00}']),
+    (0x2f9ae, &['\u{455D}', '\u{FE00}']),
+    (0x2f8bc, &['\u{6383}', '\u{FE00}']),
+    (0xf9b3, &['\u{9748}', '\u{FE00}']),
+    (0x2f88f, &['\u{2A392}', '\u{FE00}']),
+    (0xf965, &['\u{4FBF}', '\u{FE00}']),
+    (0x2f953, &['\u{7956}', '\u{FE01}']),
+    (0x2f84b, &['\u{5716}', '\u{FE00}']),
+    (0x2f90b, &['\u{6ECB}', '\u{FE01}']),
+    (0x2f834, &['\u{20A2C}', '\u{FE00}']),
+    (0xfa2d, &['\u{9DB4}', '\u{FE00}']),
+    (0x2f8e6, &['\u{6914}', '\u{FE00}']),
+    (0xf971, &['\u{8FB0}', '\u{FE00}']),
+    (0x2fa1c, &['\u{9F3B}', '\u{FE00}']),
+    (0xfa61, &['\u{8996}', '\u{FE00}']),
+    (0x2f98e, &['\u{446B}', '\u{FE00}']),
+    (0x2f9c9, &['\u{88FA}', '\u{FE00}']),
+    (0xfa0b, &['\u{5ED3}', '\u{FE00}']),
+    (0x2f86b, &['\u{5B3E}', '\u{FE01}']),
+    (0xf949, &['\u{96F7}', '\u{FE00}']),
+    (0xfac7, &['\u{96E3}', '\u{FE01}']),
+    (0xf96e, &['\u{8449}', '\u{FE00}']),
+    (0xf966, &['\u{5FA9}', '\u{FE00}']),
+    (0xf955, &['\u{51CC}', '\u{FE00}']),
+    (0x2f8d0, &['\u{3B08}', '\u{FE00}']),
+    (0x2f93a, &['\u{7610}', '\u{FE00}']),
+    (0xf9ff, &['\u{523A}', '\u{FE00}']),
+    (0xfac8, &['\u{9756}', '\u{FE01}']),
+    (0xf93c, &['\u{797F}', '\u{FE00}']),
+    (0x2f845, &['\u{5584}', '\u{FE00}']),
+    (0x2f9ce, &['\u{46C7}', '\u{FE00}']),
+    (0xfad6, &['\u{25CD0}', '\u{FE00}']),
+    (0x2f95a, &['\u{7A4A}', '\u{FE00}']),
+    (0xf9e9, &['\u{91CC}', '\u{FE00}']),
+    (0x2f91f, &['\u{243AB}', '\u{FE00}']),
+    (0xf950, &['\u{7E37}', '\u{FE00}']),
+    (0x2f8c1, &['\u{63A9}', '\u{FE00}']),
+    (0x2f9ad, &['\u{26F2C}', '\u{FE00}']),
+    (0x2f97f, &['\u{8070}', '\u{FE00}']),
+    (0xfa83, &['\u{5ED9}', '\u{FE00}']),
+    (0x2f82d, &['\u{5351}', '\u{FE01}']),
+    (0x2f8df, &['\u{67FA}', '\u{FE00}']),
+    (0x2f87c, &['\u{5D43}', '\u{FE00}']),
+    (0xfa58, &['\u{7E09}', '\u{FE00}']),
+    (0x2f846, &['\u{5584}', '\u{FE01}']),
+    (0xfa37, &['\u{5606}', '\u{FE00}']),
+    (0xfa78, &['\u{559D}', '\u{FE01}']),
+    (0x2f9f6, &['\u{29145}', '\u{FE00}']),
+    (0x2f99e, &['\u{83E7}', '\u{FE00}']),
+    (0xfad3, &['\u{4018}', '\u{FE00}']),
+    (0xfad0, &['\u{22844}', '\u{FE00}']),
+    (0xf9d5, &['\u{5D19}', '\u{FE00}']),
+    (0xfab7, &['\u{8986}', '\u{FE00}']),
+    (0xfa09, &['\u{964D}', '\u{FE00}']),
+    (0x2f8ce, &['\u{3B19}', '\u{FE00}']),
+    (0xf957, &['\u{7DBE}', '\u{FE00}']),
+    (0xf991, &['\u{649A}', '\u{FE00}']),
+    (0xfab8, &['\u{8996}', '\u{FE01}']),
+    (0x2f8eb, &['\u{6AA8}', '\u{FE00}']),
+    (0x2f9b1, &['\u{270D2}', '\u{FE00}']),
+    (0xfa2a, &['\u{98EF}', '\u{FE00}']),
+    (0x2f93c, &['\u{24FB8}', '\u{FE00}']),
+    (0xfa72, &['\u{5168}', '\u{FE00}']),
+    (0x2f96f, &['\u{7E02}', '\u{FE00}']),
+    (0x2f8d6, &['\u{80AD}', '\u{FE00}']),
+    (0x2f886, &['\u{5E3D}', '\u{FE00}']),
+    (0xf9fd, &['\u{4EC0}', '\u{FE00}']),
+    (0xf9c0, &['\u{71CE}', '\u{FE00}']),
+    (0x2f9be, &['\u{8786}', '\u{FE00}']),
+    (0xf9b8, &['\u{96B8}', '\u{FE00}']),
+    (0x2f81e, &['\u{5203}', '\u{FE00}']),
+    (0xf900, &['\u{8C48}', '\u{FE00}']),
+    (0x2f98c, &['\u{8204}', '\u{FE00}']),
+    (0x2f93e, &['\u{3FFC}', '\u{FE00}']),
+    (0xfaa0, &['\u{732A}', '\u{FE01}']),
+    (0x2f8f3, &['\u{6B72}', '\u{FE00}']),
+    (0xf961, &['\u{7387}', '\u{FE00}']),
+    (0x2f83d, &['\u{5438}', '\u{FE00}']),
+    (0x2f8f6, &['\u{6BBB}', '\u{FE00}']),
+    (0xf9d2, &['\u{622E}', '\u{FE00}']),
+    (0x2f84a, &['\u{55C2}', '\u{FE00}']),
+    (0xf9e1, &['\u{674E}', '\u{FE00}']),
+    (0xfa7c, &['\u{585A}', '\u{FE01}']),
+    (0x2f9aa, &['\u{8516}', '\u{FE00}']),
+    (0xfa51, &['\u{795D}', '\u{FE00}']),
+    (0x2f8b8, &['\u{22B0C}', '\u{FE00}']),
+    (0x2f931, &['\u{7485}', '\u{FE00}']),
+    (0xfa7e, &['\u{5944}', '\u{FE00}']),
+    (0xf9a6, &['\u{7C3E}', '\u{FE00}']),
+    (0xf976, &['\u{7565}', '\u{FE00}']),
+    (0xfa97, &['\u{6D41}', '\u{FE01}']),
+    (0x2f8e7, &['\u{3B9D}', '\u{FE01}']),
+    (0x2f88b, &['\u{5EB0}', '\u{FE00}']),
+    (0x2f9c6, &['\u{88D7}', '\u{FE00}']),
+    (0x2f8d9, &['\u{671B}', '\u{FE01}']),
+    (0xfa52, &['\u{798D}', '\u{FE00}']),
+    (0x2fa0d, &['\u{4CCE}', '\u{FE00}']),
+    (0x2f900, &['\u{6D3E}', '\u{FE00}']),
+    (0x2f836, &['\u{53CA}', '\u{FE00}']),
+    (0xf9ad, &['\u{73B2}', '\u{FE00}']),
+    (0xf934, &['\u{8001}', '\u{FE00}']),
+    (0xfab0, &['\u{7DF4}', '\u{FE02}']),
+    (0x2f809, &['\u{5099}', '\u{FE00}']),
+    (0x2f9f2, &['\u{49E6}', '\u{FE00}']),
+    (0x2f86c, &['\u{219C8}', '\u{FE00}']),
+    (0xf9fc, &['\u{8B58}', '\u{FE00}']),
+    (0x2f95e, &['\u{25AA7}', '\u{FE01}']),
+    (0xf9a3, &['\u{5FF5}', '\u{FE00}']),
+    (0x2f971, &['\u{4334}', '\u{FE00}']),
+    (0x2f89b, &['\u{38E3}', '\u{FE00}']),
+    (0xf977, &['\u{4EAE}', '\u{FE00}']),
+    (0xfa1a, &['\u{7965}', '\u{FE00}']),
+    (0xfa3c, &['\u{5C6E}', '\u{FE00}']),
+    (0x2f9bd, &['\u{876B}', '\u{FE00}']),
+    (0xf928, &['\u{5ECA}', '\u{FE00}']),
+    (0x2f864, &['\u{5A27}', '\u{FE00}']),
+    (0x2f9d1, &['\u{8B8A}', '\u{FE01}']),
+    (0x2f982, &['\u{80B2}', '\u{FE00}']),
+    (0xf9dc, &['\u{9686}', '\u{FE00}']),
+    (0x2f972, &['\u{26228}', '\u{FE00}']),
+    (0x2f8cb, &['\u{65E3}', '\u{FE00}']),
+    (0xf960, &['\u{6012}', '\u{FE00}']),
+    (0xf992, &['\u{6F23}', '\u{FE00}']),
+    (0x2f8b4, &['\u{625D}', '\u{FE00}']),
+    (0x2f803, &['\u{20122}', '\u{FE00}']),
+    (0x2f818, &['\u{51A4}', '\u{FE00}']),
+    (0xf9f7, &['\u{7ACB}', '\u{FE00}']),
+    (0x2f827, &['\u{52E4}', '\u{FE01}']),
+    (0x2f9fb, &['\u{2940A}', '\u{FE00}']),
+    (0x2f987, &['\u{267A7}', '\u{FE00}']),
+    (0xfaab, &['\u{78CC}', '\u{FE00}']),
+    (0xfa39, &['\u{5840}', '\u{FE00}']),
+    (0x2fa07, &['\u{99FE}', '\u{FE00}']),
+    (0xf9b9, &['\u{60E1}', '\u{FE00}']),
+    (0x2f86e, &['\u{5BD8}', '\u{FE00}']),
+    (0x2f8e0, &['\u{6785}', '\u{FE00}']),
+    (0xfaa7, &['\u{76DB}', '\u{FE00}']),
+    (0x2f8a8, &['\u{614E}', '\u{FE01}']),
+    (0xfa0a, &['\u{898B}', '\u{FE00}']),
+    (0x2fa14, &['\u{2A291}', '\u{FE00}']),
+    (0x2f888, &['\u{3862}', '\u{FE00}']),
+    (0x2f9a2, &['\u{83CC}', '\u{FE00}']),
+    (0x2f848, &['\u{55AB}', '\u{FE00}']),
+    (0xfaa8, &['\u{76F4}', '\u{FE00}']),
+    (0xfa67, &['\u{9038}', '\u{FE01}']),
+    (0xf946, &['\u{7262}', '\u{FE00}']),
+    (0x2f946, &['\u{771F}', '\u{FE00}']),
+    (0xfa7d, &['\u{58B3}', '\u{FE00}']),
+    (0xfa1d, &['\u{7CBE}', '\u{FE00}']),
+    (0x2fa11, &['\u{4CF8}', '\u{FE00}']),
+    (0xfa2c, &['\u{9928}', '\u{FE00}']),
+    (0xf924, &['\u{8964}', '\u{FE00}']),
+    (0x2f96e, &['\u{7DC7}', '\u{FE00}']),
+    (0xf96d, &['\u{7701}', '\u{FE00}']),
+    (0xf95a, &['\u{8B80}', '\u{FE00}']),
+    (0x2f85c, &['\u{5906}', '\u{FE00}']),
+    (0xf92b, &['\u{72FC}', '\u{FE00}']),
+    (0xfac0, &['\u{8B8A}', '\u{FE00}']),
+    (0xfa8d, &['\u{63C4}', '\u{FE00}']),
+    (0x2f9d8, &['\u{27F2F}', '\u{FE00}']),
+    (0xf938, &['\u{9732}', '\u{FE00}']),
+    (0x2f821, &['\u{5246}', '\u{FE00}']),
+    (0xf9aa, &['\u{5BE7}', '\u{FE01}']),
+    (0xf9ce, &['\u{786B}', '\u{FE00}']),
+    (0xfa47, &['\u{6F22}', '\u{FE00}']),
+    (0x2f8aa, &['\u{617A}', '\u{FE00}']),
+    (0x2f918, &['\u{707D}', '\u{FE00}']),
+    (0x2f8ee, &['\u{3C18}', '\u{FE00}']),
+    (0xf96b, &['\u{53C3}', '\u{FE00}']),
+    (0xf909, &['\u{5951}', '\u{FE00}']),
+    (0x2f87f, &['\u{5D6B}', '\u{FE00}']),
+    (0xf908, &['\u{9F9C}', '\u{FE01}']),
+    (0xfa5d, &['\u{8279}', '\u{FE00}']),
+    (0xf9ac, &['\u{601C}', '\u{FE00}']),
+    (0x2f896, &['\u{38C7}', '\u{FE00}']),
+    (0x2f9b0, &['\u{26FB1}', '\u{FE00}']),
+    (0xf9a7, &['\u{7375}', '\u{FE00}']),
+    (0xf99d, &['\u{52A3}', '\u{FE00}']),
+    (0x2f957, &['\u{79EB}', '\u{FE00}']),
+    (0xf905, &['\u{4E32}', '\u{FE00}']),
+    (0x2f9bc, &['\u{8728}', '\u{FE00}']),
+    (0x2f8f9, &['\u{23AFA}', '\u{FE00}']),
+    (0x2f8b0, &['\u{61F2}', '\u{FE02}']),
+    (0x2f881, &['\u{5DE1}', '\u{FE00}']),
+    (0x2fa1b, &['\u{9F16}', '\u{FE00}']),
+    (0x2f9dd, &['\u{208DE}', '\u{FE00}']),
+    (0x2f9ed, &['\u{28BFA}', '\u{FE00}']),
+    (0x2f871, &['\u{21B18}', '\u{FE00}']),
+    (0x2f8ab, &['\u{618E}', '\u{FE02}']),
+    (0x2f812, &['\u{2051C}', '\u{FE00}']),
+    (0xf933, &['\u{76E7}', '\u{FE00}']),
+    (0xf9f2, &['\u{9C57}', '\u{FE00}']),
+    (0xf984, &['\u{6FFE}', '\u{FE00}']),
+    (0x2f90e, &['\u{6DF9}', '\u{FE00}']),
+    (0xfab2, &['\u{8005}', '\u{FE01}']),
+    (0xfa32, &['\u{514D}', '\u{FE00}']),
+    (0x2f96d, &['\u{4301}', '\u{FE00}']),
+    (0x2f9a7, &['\u{452B}', '\u{FE00}']),
+    (0xf94f, &['\u{7D2F}', '\u{FE00}']),
+    (0x2fa0f, &['\u{9D67}', '\u{FE00}']),
+    (0xf925, &['\u{62C9}', '\u{FE00}']),
+    (0xfa91, &['\u{6674}', '\u{FE01}']),
+    (0xf972, &['\u{6C88}', '\u{FE00}']),
+    (0xf90a, &['\u{91D1}', '\u{FE00}']),
+    (0xfa02, &['\u{62D3}', '\u{FE00}']),
+    (0xf92f, &['\u{52DE}', '\u{FE00}']),
+    (0xf9dd, &['\u{5229}', '\u{FE00}']),
+    (0xfa17, &['\u{76CA}', '\u{FE00}']),
+    (0xf93f, &['\u{9304}', '\u{FE00}']),
+    (0x2f898, &['\u{261DA}', '\u{FE00}']),
+    (0x2f907, &['\u{6D34}', '\u{FE00}']),
+    (0xf9ec, &['\u{6EBA}', '\u{FE00}']),
+    (0xf9e3, &['\u{6CE5}', '\u{FE00}']),
+    (0xfab5, &['\u{8779}', '\u{FE00}']),
+    (0xfa40, &['\u{61F2}', '\u{FE00}']),
+    (0x2f815, &['\u{518D}', '\u{FE00}']),
+    (0x2f9db, &['\u{8DBC}', '\u{FE00}']),
+    (0xf91e, &['\u{721B}', '\u{FE00}']),
+    (0xf92c, &['\u{90CE}', '\u{FE00}']),
+    (0x2f884, &['\u{5DFD}', '\u{FE00}']),
+    (0xfa46, &['\u{6E1A}', '\u{FE00}']),
+    (0x2f9b3, &['\u{8650}', '\u{FE00}']),
+    (0x2f85b, &['\u{58F7}', '\u{FE00}']),
+    (0xf9cd, &['\u{7559}', '\u{FE00}']),
+    (0xf93a, &['\u{9DFA}', '\u{FE00}']),
+    (0xf97e, &['\u{91CF}', '\u{FE00}']),
+    (0xfa3e, &['\u{6168}', '\u{FE00}']),
+    (0x2f9eb, &['\u{93F9}', '\u{FE00}']),
+    (0x2f8e2, &['\u{6885}', '\u{FE01}']),
+    (0x2f9b6, &['\u{8669}', '\u{FE00}']),
+    (0xf916, &['\u{70D9}', '\u{FE00}']),
+    (0x2f8de, &['\u{3B49}', '\u{FE00}']),
+    (0xf98f, &['\u{6190}', '\u{FE00}']),
+    (0xfa12, &['\u{6674}', '\u{FE00}']),
+    (0xfa44, &['\u{6885}', '\u{FE00}']),
+    (0xf981, &['\u{5973}', '\u{FE00}']),
+    (0x2f9dc, &['\u{8DF0}', '\u{FE00}']),
+    (0xf95c, &['\u{6A02}', '\u{FE01}']),
+    (0xf937, &['\u{8DEF}', '\u{FE00}']),
+    (0x2f87a, &['\u{5C8D}', '\u{FE00}']),
+    (0x2f903, &['\u{6D69}', '\u{FE00}']),
+    (0x2f9c5, &['\u{27667}', '\u{FE00}']),
+    (0x2f8cf, &['\u{6691}', '\u{FE01}']),
+    (0x2f909, &['\u{6E6E}', '\u{FE00}']),
+    (0x2f991, &['\u{829D}', '\u{FE00}']),
+    (0xfa65, &['\u{8D08}', '\u{FE00}']),
+    (0xfa73, &['\u{4F80}', '\u{FE00}']),
+    (0x2f88e, &['\u{5ECA}', '\u{FE01}']),
+    (0xf9ef, &['\u{7498}', '\u{FE00}']),
+    (0x2f9cb, &['\u{278AE}', '\u{FE00}']),
+    (0x2f9a3, &['\u{83DC}', '\u{FE00}']),
+    (0x2f99c, &['\u{8323}', '\u{FE00}']),
+    (0x2f919, &['\u{7077}', '\u{FE00}']),
+    (0x2f857, &['\u{5831}', '\u{FE00}']),
+    (0x2f96c, &['\u{7D63}', '\u{FE00}']),
+    (0x2f800, &['\u{4E3D}', '\u{FE00}']),
+    (0x2fa1a, &['\u{9F0F}', '\u{FE00}']),
+    (0xf97f, &['\u{52F5}', '\u{FE00}']),
+    (0xfaba, &['\u{8AF8}', '\u{FE01}']),
+    (0xfa82, &['\u{5ED2}', '\u{FE00}']),
+    (0x2f92e, &['\u{7447}', '\u{FE00}']),
+    (0xf9fe, &['\u{8336}', '\u{FE00}']),
+    (0xf994, &['\u{7489}', '\u{FE00}']),
+    (0x2f83c, &['\u{549E}', '\u{FE00}']),
+    (0xfa50, &['\u{7956}', '\u{FE00}']),
+    (0x2f817, &['\u{5197}', '\u{FE00}']),
+    (0xfa38, &['\u{5668}', '\u{FE00}']),
+    (0xfa69, &['\u{97FF}', '\u{FE00}']),
+    (0xfaac, &['\u{7AB1}', '\u{FE00}']),
+    (0xf901, &['\u{66F4}', '\u{FE00}']),
+    (0xfa33, &['\u{52C9}', '\u{FE00}']),
+    (0xf9bf, &['\u{6A02}', '\u{FE02}']),
+    (0xf9d1, &['\u{516D}', '\u{FE00}']),
+    (0xf95f, &['\u{5BE7}', '\u{FE00}']),
+    (0x2f82f, &['\u{5373}', '\u{FE00}']),
+    (0xf9a4, &['\u{637B}', '\u{FE00}']),
+    (0x2f89e, &['\u{5FD7}', '\u{FE00}']),
+    (0x2f801, &['\u{4E38}', '\u{FE00}']),
+    (0x2f84f, &['\u{5674}', '\u{FE00}']),
+    (0x2f961, &['\u{25BAB}', '\u{FE00}']),
+    (0x2f87e, &['\u{5D6E}', '\u{FE00}']),
+    (0x2f9d5, &['\u{8CC1}', '\u{FE00}']),
+    (0xf9e7, &['\u{88CF}', '\u{FE00}']),
+    (0xf973, &['\u{62FE}', '\u{FE00}']),
+    (0xf9c2, &['\u{84FC}', '\u{FE00}']),
+    (0x2f9d0, &['\u{8AED}', '\u{FE01}']),
+    (0xf9a5, &['\u{6BAE}', '\u{FE00}']),
+    (0x2f80c, &['\u{349E}', '\u{FE00}']),
+    (0xf930, &['\u{64C4}', '\u{FE00}']),
+    (0x2f8a1, &['\u{393A}', '\u{FE00}']),
+    (0x2f828, &['\u{52FA}', '\u{FE01}']),
+    (0x2f89f, &['\u{5FF9}', '\u{FE00}']),
+    (0xf964, &['\u{78FB}', '\u{FE00}']),
+    (0xf94e, &['\u{6F0F}', '\u{FE00}']),
+    (0x2f8d7, &['\u{43D9}', '\u{FE00}']),
+    (0x2f806, &['\u{4FBB}', '\u{FE00}']),
+    (0x2f9cc, &['\u{27966}', '\u{FE00}']),
+    (0x2f94e, &['\u{784E}', '\u{FE00}']),
+    (0x2f929, &['\u{738B}', '\u{FE00}']),
+    (0xfa34, &['\u{52E4}', '\u{FE00}']),
+    (0x2f939, &['\u{2219F}', '\u{FE00}']),
+    (0xf910, &['\u{863F}', '\u{FE00}']),
+    (0xf926, &['\u{81D8}', '\u{FE00}']),
+    (0xf9a2, &['\u{5EC9}', '\u{FE00}']),
+    (0xfa49, &['\u{722B}', '\u{FE00}']),
+    (0xf953, &['\u{808B}', '\u{FE00}']),
+    (0x2f80f, &['\u{5154}', '\u{FE00}']),
+    (0xf963, &['\u{5317}', '\u{FE00}']),
+    (0x2f8d4, &['\u{6700}', '\u{FE00}']),
+    (0xf9b2, &['\u{96F6}', '\u{FE00}']),
+    (0x2f973, &['\u{26247}', '\u{FE00}']),
+    (0x2f897, &['\u{232B8}', '\u{FE00}']),
+    (0x2f9fc, &['\u{4AB2}', '\u{FE00}']),
+    (0xf99a, &['\u{9023}', '\u{FE00}']),
+    (0x2f85a, &['\u{58F2}', '\u{FE00}']),
+    (0xfacf, &['\u{2284A}', '\u{FE00}']),
+    (0x2f9ab, &['\u{273CA}', '\u{FE00}']),
+    (0x2f927, &['\u{24814}', '\u{FE00}']),
+    (0x2f9fd, &['\u{29496}', '\u{FE00}']),
+    (0xfa36, &['\u{559D}', '\u{FE00}']),
+    (0xf904, &['\u{6ED1}', '\u{FE00}']),
+    (0x2f81c, &['\u{291DF}', '\u{FE00}']),
+    (0xfa7b, &['\u{55E2}', '\u{FE00}']),
+    (0xfa41, &['\u{654F}', '\u{FE00}']),
+    (0x2f87b, &['\u{21DE4}', '\u{FE00}']),
+    (0x2f9ba, &['\u{86E2}', '\u{FE00}']),
+    (0xf979, &['\u{51C9}', '\u{FE00}']),
+    (0xf9d7, &['\u{8F2A}', '\u{FE00}']),
+];
+
 pub(crate) const COMBINING_MARK_SALT: &[u16] = &[
     0x0,
     0x10,
@@ -19758,6 +21767,690 @@
 
 
 #[inline]
+pub fn is_public_assigned(c: char) -> bool {
+    match c {
+        '\u{0000}'..='\u{0377}'
+        | '\u{037A}'..='\u{037F}'
+        | '\u{0384}'..='\u{038A}'
+        | '\u{038C}'
+        | '\u{038E}'..='\u{03A1}'
+        | '\u{03A3}'..='\u{052F}'
+        | '\u{0531}'..='\u{0556}'
+        | '\u{0559}'..='\u{058A}'
+        | '\u{058D}'..='\u{058F}'
+        | '\u{0591}'..='\u{05C7}'
+        | '\u{05D0}'..='\u{05EA}'
+        | '\u{05EF}'..='\u{05F4}'
+        | '\u{0600}'..='\u{061C}'
+        | '\u{061E}'..='\u{070D}'
+        | '\u{070F}'..='\u{074A}'
+        | '\u{074D}'..='\u{07B1}'
+        | '\u{07C0}'..='\u{07FA}'
+        | '\u{07FD}'..='\u{082D}'
+        | '\u{0830}'..='\u{083E}'
+        | '\u{0840}'..='\u{085B}'
+        | '\u{085E}'
+        | '\u{0860}'..='\u{086A}'
+        | '\u{08A0}'..='\u{08B4}'
+        | '\u{08B6}'..='\u{08C7}'
+        | '\u{08D3}'..='\u{0983}'
+        | '\u{0985}'..='\u{098C}'
+        | '\u{098F}'..='\u{0990}'
+        | '\u{0993}'..='\u{09A8}'
+        | '\u{09AA}'..='\u{09B0}'
+        | '\u{09B2}'
+        | '\u{09B6}'..='\u{09B9}'
+        | '\u{09BC}'..='\u{09C4}'
+        | '\u{09C7}'..='\u{09C8}'
+        | '\u{09CB}'..='\u{09CE}'
+        | '\u{09D7}'
+        | '\u{09DC}'..='\u{09DD}'
+        | '\u{09DF}'..='\u{09E3}'
+        | '\u{09E6}'..='\u{09FE}'
+        | '\u{0A01}'..='\u{0A03}'
+        | '\u{0A05}'..='\u{0A0A}'
+        | '\u{0A0F}'..='\u{0A10}'
+        | '\u{0A13}'..='\u{0A28}'
+        | '\u{0A2A}'..='\u{0A30}'
+        | '\u{0A32}'..='\u{0A33}'
+        | '\u{0A35}'..='\u{0A36}'
+        | '\u{0A38}'..='\u{0A39}'
+        | '\u{0A3C}'
+        | '\u{0A3E}'..='\u{0A42}'
+        | '\u{0A47}'..='\u{0A48}'
+        | '\u{0A4B}'..='\u{0A4D}'
+        | '\u{0A51}'
+        | '\u{0A59}'..='\u{0A5C}'
+        | '\u{0A5E}'
+        | '\u{0A66}'..='\u{0A76}'
+        | '\u{0A81}'..='\u{0A83}'
+        | '\u{0A85}'..='\u{0A8D}'
+        | '\u{0A8F}'..='\u{0A91}'
+        | '\u{0A93}'..='\u{0AA8}'
+        | '\u{0AAA}'..='\u{0AB0}'
+        | '\u{0AB2}'..='\u{0AB3}'
+        | '\u{0AB5}'..='\u{0AB9}'
+        | '\u{0ABC}'..='\u{0AC5}'
+        | '\u{0AC7}'..='\u{0AC9}'
+        | '\u{0ACB}'..='\u{0ACD}'
+        | '\u{0AD0}'
+        | '\u{0AE0}'..='\u{0AE3}'
+        | '\u{0AE6}'..='\u{0AF1}'
+        | '\u{0AF9}'..='\u{0AFF}'
+        | '\u{0B01}'..='\u{0B03}'
+        | '\u{0B05}'..='\u{0B0C}'
+        | '\u{0B0F}'..='\u{0B10}'
+        | '\u{0B13}'..='\u{0B28}'
+        | '\u{0B2A}'..='\u{0B30}'
+        | '\u{0B32}'..='\u{0B33}'
+        | '\u{0B35}'..='\u{0B39}'
+        | '\u{0B3C}'..='\u{0B44}'
+        | '\u{0B47}'..='\u{0B48}'
+        | '\u{0B4B}'..='\u{0B4D}'
+        | '\u{0B55}'..='\u{0B57}'
+        | '\u{0B5C}'..='\u{0B5D}'
+        | '\u{0B5F}'..='\u{0B63}'
+        | '\u{0B66}'..='\u{0B77}'
+        | '\u{0B82}'..='\u{0B83}'
+        | '\u{0B85}'..='\u{0B8A}'
+        | '\u{0B8E}'..='\u{0B90}'
+        | '\u{0B92}'..='\u{0B95}'
+        | '\u{0B99}'..='\u{0B9A}'
+        | '\u{0B9C}'
+        | '\u{0B9E}'..='\u{0B9F}'
+        | '\u{0BA3}'..='\u{0BA4}'
+        | '\u{0BA8}'..='\u{0BAA}'
+        | '\u{0BAE}'..='\u{0BB9}'
+        | '\u{0BBE}'..='\u{0BC2}'
+        | '\u{0BC6}'..='\u{0BC8}'
+        | '\u{0BCA}'..='\u{0BCD}'
+        | '\u{0BD0}'
+        | '\u{0BD7}'
+        | '\u{0BE6}'..='\u{0BFA}'
+        | '\u{0C00}'..='\u{0C0C}'
+        | '\u{0C0E}'..='\u{0C10}'
+        | '\u{0C12}'..='\u{0C28}'
+        | '\u{0C2A}'..='\u{0C39}'
+        | '\u{0C3D}'..='\u{0C44}'
+        | '\u{0C46}'..='\u{0C48}'
+        | '\u{0C4A}'..='\u{0C4D}'
+        | '\u{0C55}'..='\u{0C56}'
+        | '\u{0C58}'..='\u{0C5A}'
+        | '\u{0C60}'..='\u{0C63}'
+        | '\u{0C66}'..='\u{0C6F}'
+        | '\u{0C77}'..='\u{0C8C}'
+        | '\u{0C8E}'..='\u{0C90}'
+        | '\u{0C92}'..='\u{0CA8}'
+        | '\u{0CAA}'..='\u{0CB3}'
+        | '\u{0CB5}'..='\u{0CB9}'
+        | '\u{0CBC}'..='\u{0CC4}'
+        | '\u{0CC6}'..='\u{0CC8}'
+        | '\u{0CCA}'..='\u{0CCD}'
+        | '\u{0CD5}'..='\u{0CD6}'
+        | '\u{0CDE}'
+        | '\u{0CE0}'..='\u{0CE3}'
+        | '\u{0CE6}'..='\u{0CEF}'
+        | '\u{0CF1}'..='\u{0CF2}'
+        | '\u{0D00}'..='\u{0D0C}'
+        | '\u{0D0E}'..='\u{0D10}'
+        | '\u{0D12}'..='\u{0D44}'
+        | '\u{0D46}'..='\u{0D48}'
+        | '\u{0D4A}'..='\u{0D4F}'
+        | '\u{0D54}'..='\u{0D63}'
+        | '\u{0D66}'..='\u{0D7F}'
+        | '\u{0D81}'..='\u{0D83}'
+        | '\u{0D85}'..='\u{0D96}'
+        | '\u{0D9A}'..='\u{0DB1}'
+        | '\u{0DB3}'..='\u{0DBB}'
+        | '\u{0DBD}'
+        | '\u{0DC0}'..='\u{0DC6}'
+        | '\u{0DCA}'
+        | '\u{0DCF}'..='\u{0DD4}'
+        | '\u{0DD6}'
+        | '\u{0DD8}'..='\u{0DDF}'
+        | '\u{0DE6}'..='\u{0DEF}'
+        | '\u{0DF2}'..='\u{0DF4}'
+        | '\u{0E01}'..='\u{0E3A}'
+        | '\u{0E3F}'..='\u{0E5B}'
+        | '\u{0E81}'..='\u{0E82}'
+        | '\u{0E84}'
+        | '\u{0E86}'..='\u{0E8A}'
+        | '\u{0E8C}'..='\u{0EA3}'
+        | '\u{0EA5}'
+        | '\u{0EA7}'..='\u{0EBD}'
+        | '\u{0EC0}'..='\u{0EC4}'
+        | '\u{0EC6}'
+        | '\u{0EC8}'..='\u{0ECD}'
+        | '\u{0ED0}'..='\u{0ED9}'
+        | '\u{0EDC}'..='\u{0EDF}'
+        | '\u{0F00}'..='\u{0F47}'
+        | '\u{0F49}'..='\u{0F6C}'
+        | '\u{0F71}'..='\u{0F97}'
+        | '\u{0F99}'..='\u{0FBC}'
+        | '\u{0FBE}'..='\u{0FCC}'
+        | '\u{0FCE}'..='\u{0FDA}'
+        | '\u{1000}'..='\u{10C5}'
+        | '\u{10C7}'
+        | '\u{10CD}'
+        | '\u{10D0}'..='\u{1248}'
+        | '\u{124A}'..='\u{124D}'
+        | '\u{1250}'..='\u{1256}'
+        | '\u{1258}'
+        | '\u{125A}'..='\u{125D}'
+        | '\u{1260}'..='\u{1288}'
+        | '\u{128A}'..='\u{128D}'
+        | '\u{1290}'..='\u{12B0}'
+        | '\u{12B2}'..='\u{12B5}'
+        | '\u{12B8}'..='\u{12BE}'
+        | '\u{12C0}'
+        | '\u{12C2}'..='\u{12C5}'
+        | '\u{12C8}'..='\u{12D6}'
+        | '\u{12D8}'..='\u{1310}'
+        | '\u{1312}'..='\u{1315}'
+        | '\u{1318}'..='\u{135A}'
+        | '\u{135D}'..='\u{137C}'
+        | '\u{1380}'..='\u{1399}'
+        | '\u{13A0}'..='\u{13F5}'
+        | '\u{13F8}'..='\u{13FD}'
+        | '\u{1400}'..='\u{169C}'
+        | '\u{16A0}'..='\u{16F8}'
+        | '\u{1700}'..='\u{170C}'
+        | '\u{170E}'..='\u{1714}'
+        | '\u{1720}'..='\u{1736}'
+        | '\u{1740}'..='\u{1753}'
+        | '\u{1760}'..='\u{176C}'
+        | '\u{176E}'..='\u{1770}'
+        | '\u{1772}'..='\u{1773}'
+        | '\u{1780}'..='\u{17DD}'
+        | '\u{17E0}'..='\u{17E9}'
+        | '\u{17F0}'..='\u{17F9}'
+        | '\u{1800}'..='\u{180E}'
+        | '\u{1810}'..='\u{1819}'
+        | '\u{1820}'..='\u{1878}'
+        | '\u{1880}'..='\u{18AA}'
+        | '\u{18B0}'..='\u{18F5}'
+        | '\u{1900}'..='\u{191E}'
+        | '\u{1920}'..='\u{192B}'
+        | '\u{1930}'..='\u{193B}'
+        | '\u{1940}'
+        | '\u{1944}'..='\u{196D}'
+        | '\u{1970}'..='\u{1974}'
+        | '\u{1980}'..='\u{19AB}'
+        | '\u{19B0}'..='\u{19C9}'
+        | '\u{19D0}'..='\u{19DA}'
+        | '\u{19DE}'..='\u{1A1B}'
+        | '\u{1A1E}'..='\u{1A5E}'
+        | '\u{1A60}'..='\u{1A7C}'
+        | '\u{1A7F}'..='\u{1A89}'
+        | '\u{1A90}'..='\u{1A99}'
+        | '\u{1AA0}'..='\u{1AAD}'
+        | '\u{1AB0}'..='\u{1AC0}'
+        | '\u{1B00}'..='\u{1B4B}'
+        | '\u{1B50}'..='\u{1B7C}'
+        | '\u{1B80}'..='\u{1BF3}'
+        | '\u{1BFC}'..='\u{1C37}'
+        | '\u{1C3B}'..='\u{1C49}'
+        | '\u{1C4D}'..='\u{1C88}'
+        | '\u{1C90}'..='\u{1CBA}'
+        | '\u{1CBD}'..='\u{1CC7}'
+        | '\u{1CD0}'..='\u{1CFA}'
+        | '\u{1D00}'..='\u{1DF9}'
+        | '\u{1DFB}'..='\u{1F15}'
+        | '\u{1F18}'..='\u{1F1D}'
+        | '\u{1F20}'..='\u{1F45}'
+        | '\u{1F48}'..='\u{1F4D}'
+        | '\u{1F50}'..='\u{1F57}'
+        | '\u{1F59}'
+        | '\u{1F5B}'
+        | '\u{1F5D}'
+        | '\u{1F5F}'..='\u{1F7D}'
+        | '\u{1F80}'..='\u{1FB4}'
+        | '\u{1FB6}'..='\u{1FC4}'
+        | '\u{1FC6}'..='\u{1FD3}'
+        | '\u{1FD6}'..='\u{1FDB}'
+        | '\u{1FDD}'..='\u{1FEF}'
+        | '\u{1FF2}'..='\u{1FF4}'
+        | '\u{1FF6}'..='\u{1FFE}'
+        | '\u{2000}'..='\u{2064}'
+        | '\u{2066}'..='\u{2071}'
+        | '\u{2074}'..='\u{208E}'
+        | '\u{2090}'..='\u{209C}'
+        | '\u{20A0}'..='\u{20BF}'
+        | '\u{20D0}'..='\u{20F0}'
+        | '\u{2100}'..='\u{218B}'
+        | '\u{2190}'..='\u{2426}'
+        | '\u{2440}'..='\u{244A}'
+        | '\u{2460}'..='\u{2B73}'
+        | '\u{2B76}'..='\u{2B95}'
+        | '\u{2B97}'..='\u{2C2E}'
+        | '\u{2C30}'..='\u{2C5E}'
+        | '\u{2C60}'..='\u{2CF3}'
+        | '\u{2CF9}'..='\u{2D25}'
+        | '\u{2D27}'
+        | '\u{2D2D}'
+        | '\u{2D30}'..='\u{2D67}'
+        | '\u{2D6F}'..='\u{2D70}'
+        | '\u{2D7F}'..='\u{2D96}'
+        | '\u{2DA0}'..='\u{2DA6}'
+        | '\u{2DA8}'..='\u{2DAE}'
+        | '\u{2DB0}'..='\u{2DB6}'
+        | '\u{2DB8}'..='\u{2DBE}'
+        | '\u{2DC0}'..='\u{2DC6}'
+        | '\u{2DC8}'..='\u{2DCE}'
+        | '\u{2DD0}'..='\u{2DD6}'
+        | '\u{2DD8}'..='\u{2DDE}'
+        | '\u{2DE0}'..='\u{2E52}'
+        | '\u{2E80}'..='\u{2E99}'
+        | '\u{2E9B}'..='\u{2EF3}'
+        | '\u{2F00}'..='\u{2FD5}'
+        | '\u{2FF0}'..='\u{2FFB}'
+        | '\u{3000}'..='\u{303F}'
+        | '\u{3041}'..='\u{3096}'
+        | '\u{3099}'..='\u{30FF}'
+        | '\u{3105}'..='\u{312F}'
+        | '\u{3131}'..='\u{318E}'
+        | '\u{3190}'..='\u{31E3}'
+        | '\u{31F0}'..='\u{321E}'
+        | '\u{3220}'..='\u{9FFC}'
+        | '\u{A000}'..='\u{A48C}'
+        | '\u{A490}'..='\u{A4C6}'
+        | '\u{A4D0}'..='\u{A62B}'
+        | '\u{A640}'..='\u{A6F7}'
+        | '\u{A700}'..='\u{A7BF}'
+        | '\u{A7C2}'..='\u{A7CA}'
+        | '\u{A7F5}'..='\u{A82C}'
+        | '\u{A830}'..='\u{A839}'
+        | '\u{A840}'..='\u{A877}'
+        | '\u{A880}'..='\u{A8C5}'
+        | '\u{A8CE}'..='\u{A8D9}'
+        | '\u{A8E0}'..='\u{A953}'
+        | '\u{A95F}'..='\u{A97C}'
+        | '\u{A980}'..='\u{A9CD}'
+        | '\u{A9CF}'..='\u{A9D9}'
+        | '\u{A9DE}'..='\u{A9FE}'
+        | '\u{AA00}'..='\u{AA36}'
+        | '\u{AA40}'..='\u{AA4D}'
+        | '\u{AA50}'..='\u{AA59}'
+        | '\u{AA5C}'..='\u{AAC2}'
+        | '\u{AADB}'..='\u{AAF6}'
+        | '\u{AB01}'..='\u{AB06}'
+        | '\u{AB09}'..='\u{AB0E}'
+        | '\u{AB11}'..='\u{AB16}'
+        | '\u{AB20}'..='\u{AB26}'
+        | '\u{AB28}'..='\u{AB2E}'
+        | '\u{AB30}'..='\u{AB6B}'
+        | '\u{AB70}'..='\u{ABED}'
+        | '\u{ABF0}'..='\u{ABF9}'
+        | '\u{AC00}'..='\u{D7A3}'
+        | '\u{D7B0}'..='\u{D7C6}'
+        | '\u{D7CB}'..='\u{D7FB}'
+        | '\u{F900}'..='\u{FA6D}'
+        | '\u{FA70}'..='\u{FAD9}'
+        | '\u{FB00}'..='\u{FB06}'
+        | '\u{FB13}'..='\u{FB17}'
+        | '\u{FB1D}'..='\u{FB36}'
+        | '\u{FB38}'..='\u{FB3C}'
+        | '\u{FB3E}'
+        | '\u{FB40}'..='\u{FB41}'
+        | '\u{FB43}'..='\u{FB44}'
+        | '\u{FB46}'..='\u{FBC1}'
+        | '\u{FBD3}'..='\u{FD3F}'
+        | '\u{FD50}'..='\u{FD8F}'
+        | '\u{FD92}'..='\u{FDC7}'
+        | '\u{FDF0}'..='\u{FDFD}'
+        | '\u{FE00}'..='\u{FE19}'
+        | '\u{FE20}'..='\u{FE52}'
+        | '\u{FE54}'..='\u{FE66}'
+        | '\u{FE68}'..='\u{FE6B}'
+        | '\u{FE70}'..='\u{FE74}'
+        | '\u{FE76}'..='\u{FEFC}'
+        | '\u{FEFF}'
+        | '\u{FF01}'..='\u{FFBE}'
+        | '\u{FFC2}'..='\u{FFC7}'
+        | '\u{FFCA}'..='\u{FFCF}'
+        | '\u{FFD2}'..='\u{FFD7}'
+        | '\u{FFDA}'..='\u{FFDC}'
+        | '\u{FFE0}'..='\u{FFE6}'
+        | '\u{FFE8}'..='\u{FFEE}'
+        | '\u{FFF9}'..='\u{FFFD}'
+        | '\u{10000}'..='\u{1000B}'
+        | '\u{1000D}'..='\u{10026}'
+        | '\u{10028}'..='\u{1003A}'
+        | '\u{1003C}'..='\u{1003D}'
+        | '\u{1003F}'..='\u{1004D}'
+        | '\u{10050}'..='\u{1005D}'
+        | '\u{10080}'..='\u{100FA}'
+        | '\u{10100}'..='\u{10102}'
+        | '\u{10107}'..='\u{10133}'
+        | '\u{10137}'..='\u{1018E}'
+        | '\u{10190}'..='\u{1019C}'
+        | '\u{101A0}'
+        | '\u{101D0}'..='\u{101FD}'
+        | '\u{10280}'..='\u{1029C}'
+        | '\u{102A0}'..='\u{102D0}'
+        | '\u{102E0}'..='\u{102FB}'
+        | '\u{10300}'..='\u{10323}'
+        | '\u{1032D}'..='\u{1034A}'
+        | '\u{10350}'..='\u{1037A}'
+        | '\u{10380}'..='\u{1039D}'
+        | '\u{1039F}'..='\u{103C3}'
+        | '\u{103C8}'..='\u{103D5}'
+        | '\u{10400}'..='\u{1049D}'
+        | '\u{104A0}'..='\u{104A9}'
+        | '\u{104B0}'..='\u{104D3}'
+        | '\u{104D8}'..='\u{104FB}'
+        | '\u{10500}'..='\u{10527}'
+        | '\u{10530}'..='\u{10563}'
+        | '\u{1056F}'
+        | '\u{10600}'..='\u{10736}'
+        | '\u{10740}'..='\u{10755}'
+        | '\u{10760}'..='\u{10767}'
+        | '\u{10800}'..='\u{10805}'
+        | '\u{10808}'
+        | '\u{1080A}'..='\u{10835}'
+        | '\u{10837}'..='\u{10838}'
+        | '\u{1083C}'
+        | '\u{1083F}'..='\u{10855}'
+        | '\u{10857}'..='\u{1089E}'
+        | '\u{108A7}'..='\u{108AF}'
+        | '\u{108E0}'..='\u{108F2}'
+        | '\u{108F4}'..='\u{108F5}'
+        | '\u{108FB}'..='\u{1091B}'
+        | '\u{1091F}'..='\u{10939}'
+        | '\u{1093F}'
+        | '\u{10980}'..='\u{109B7}'
+        | '\u{109BC}'..='\u{109CF}'
+        | '\u{109D2}'..='\u{10A03}'
+        | '\u{10A05}'..='\u{10A06}'
+        | '\u{10A0C}'..='\u{10A13}'
+        | '\u{10A15}'..='\u{10A17}'
+        | '\u{10A19}'..='\u{10A35}'
+        | '\u{10A38}'..='\u{10A3A}'
+        | '\u{10A3F}'..='\u{10A48}'
+        | '\u{10A50}'..='\u{10A58}'
+        | '\u{10A60}'..='\u{10A9F}'
+        | '\u{10AC0}'..='\u{10AE6}'
+        | '\u{10AEB}'..='\u{10AF6}'
+        | '\u{10B00}'..='\u{10B35}'
+        | '\u{10B39}'..='\u{10B55}'
+        | '\u{10B58}'..='\u{10B72}'
+        | '\u{10B78}'..='\u{10B91}'
+        | '\u{10B99}'..='\u{10B9C}'
+        | '\u{10BA9}'..='\u{10BAF}'
+        | '\u{10C00}'..='\u{10C48}'
+        | '\u{10C80}'..='\u{10CB2}'
+        | '\u{10CC0}'..='\u{10CF2}'
+        | '\u{10CFA}'..='\u{10D27}'
+        | '\u{10D30}'..='\u{10D39}'
+        | '\u{10E60}'..='\u{10E7E}'
+        | '\u{10E80}'..='\u{10EA9}'
+        | '\u{10EAB}'..='\u{10EAD}'
+        | '\u{10EB0}'..='\u{10EB1}'
+        | '\u{10F00}'..='\u{10F27}'
+        | '\u{10F30}'..='\u{10F59}'
+        | '\u{10FB0}'..='\u{10FCB}'
+        | '\u{10FE0}'..='\u{10FF6}'
+        | '\u{11000}'..='\u{1104D}'
+        | '\u{11052}'..='\u{1106F}'
+        | '\u{1107F}'..='\u{110C1}'
+        | '\u{110CD}'
+        | '\u{110D0}'..='\u{110E8}'
+        | '\u{110F0}'..='\u{110F9}'
+        | '\u{11100}'..='\u{11134}'
+        | '\u{11136}'..='\u{11147}'
+        | '\u{11150}'..='\u{11176}'
+        | '\u{11180}'..='\u{111DF}'
+        | '\u{111E1}'..='\u{111F4}'
+        | '\u{11200}'..='\u{11211}'
+        | '\u{11213}'..='\u{1123E}'
+        | '\u{11280}'..='\u{11286}'
+        | '\u{11288}'
+        | '\u{1128A}'..='\u{1128D}'
+        | '\u{1128F}'..='\u{1129D}'
+        | '\u{1129F}'..='\u{112A9}'
+        | '\u{112B0}'..='\u{112EA}'
+        | '\u{112F0}'..='\u{112F9}'
+        | '\u{11300}'..='\u{11303}'
+        | '\u{11305}'..='\u{1130C}'
+        | '\u{1130F}'..='\u{11310}'
+        | '\u{11313}'..='\u{11328}'
+        | '\u{1132A}'..='\u{11330}'
+        | '\u{11332}'..='\u{11333}'
+        | '\u{11335}'..='\u{11339}'
+        | '\u{1133B}'..='\u{11344}'
+        | '\u{11347}'..='\u{11348}'
+        | '\u{1134B}'..='\u{1134D}'
+        | '\u{11350}'
+        | '\u{11357}'
+        | '\u{1135D}'..='\u{11363}'
+        | '\u{11366}'..='\u{1136C}'
+        | '\u{11370}'..='\u{11374}'
+        | '\u{11400}'..='\u{1145B}'
+        | '\u{1145D}'..='\u{11461}'
+        | '\u{11480}'..='\u{114C7}'
+        | '\u{114D0}'..='\u{114D9}'
+        | '\u{11580}'..='\u{115B5}'
+        | '\u{115B8}'..='\u{115DD}'
+        | '\u{11600}'..='\u{11644}'
+        | '\u{11650}'..='\u{11659}'
+        | '\u{11660}'..='\u{1166C}'
+        | '\u{11680}'..='\u{116B8}'
+        | '\u{116C0}'..='\u{116C9}'
+        | '\u{11700}'..='\u{1171A}'
+        | '\u{1171D}'..='\u{1172B}'
+        | '\u{11730}'..='\u{1173F}'
+        | '\u{11800}'..='\u{1183B}'
+        | '\u{118A0}'..='\u{118F2}'
+        | '\u{118FF}'..='\u{11906}'
+        | '\u{11909}'
+        | '\u{1190C}'..='\u{11913}'
+        | '\u{11915}'..='\u{11916}'
+        | '\u{11918}'..='\u{11935}'
+        | '\u{11937}'..='\u{11938}'
+        | '\u{1193B}'..='\u{11946}'
+        | '\u{11950}'..='\u{11959}'
+        | '\u{119A0}'..='\u{119A7}'
+        | '\u{119AA}'..='\u{119D7}'
+        | '\u{119DA}'..='\u{119E4}'
+        | '\u{11A00}'..='\u{11A47}'
+        | '\u{11A50}'..='\u{11AA2}'
+        | '\u{11AC0}'..='\u{11AF8}'
+        | '\u{11C00}'..='\u{11C08}'
+        | '\u{11C0A}'..='\u{11C36}'
+        | '\u{11C38}'..='\u{11C45}'
+        | '\u{11C50}'..='\u{11C6C}'
+        | '\u{11C70}'..='\u{11C8F}'
+        | '\u{11C92}'..='\u{11CA7}'
+        | '\u{11CA9}'..='\u{11CB6}'
+        | '\u{11D00}'..='\u{11D06}'
+        | '\u{11D08}'..='\u{11D09}'
+        | '\u{11D0B}'..='\u{11D36}'
+        | '\u{11D3A}'
+        | '\u{11D3C}'..='\u{11D3D}'
+        | '\u{11D3F}'..='\u{11D47}'
+        | '\u{11D50}'..='\u{11D59}'
+        | '\u{11D60}'..='\u{11D65}'
+        | '\u{11D67}'..='\u{11D68}'
+        | '\u{11D6A}'..='\u{11D8E}'
+        | '\u{11D90}'..='\u{11D91}'
+        | '\u{11D93}'..='\u{11D98}'
+        | '\u{11DA0}'..='\u{11DA9}'
+        | '\u{11EE0}'..='\u{11EF8}'
+        | '\u{11FB0}'
+        | '\u{11FC0}'..='\u{11FF1}'
+        | '\u{11FFF}'..='\u{12399}'
+        | '\u{12400}'..='\u{1246E}'
+        | '\u{12470}'..='\u{12474}'
+        | '\u{12480}'..='\u{12543}'
+        | '\u{13000}'..='\u{1342E}'
+        | '\u{13430}'..='\u{13438}'
+        | '\u{14400}'..='\u{14646}'
+        | '\u{16800}'..='\u{16A38}'
+        | '\u{16A40}'..='\u{16A5E}'
+        | '\u{16A60}'..='\u{16A69}'
+        | '\u{16A6E}'..='\u{16A6F}'
+        | '\u{16AD0}'..='\u{16AED}'
+        | '\u{16AF0}'..='\u{16AF5}'
+        | '\u{16B00}'..='\u{16B45}'
+        | '\u{16B50}'..='\u{16B59}'
+        | '\u{16B5B}'..='\u{16B61}'
+        | '\u{16B63}'..='\u{16B77}'
+        | '\u{16B7D}'..='\u{16B8F}'
+        | '\u{16E40}'..='\u{16E9A}'
+        | '\u{16F00}'..='\u{16F4A}'
+        | '\u{16F4F}'..='\u{16F87}'
+        | '\u{16F8F}'..='\u{16F9F}'
+        | '\u{16FE0}'..='\u{16FE4}'
+        | '\u{16FF0}'..='\u{16FF1}'
+        | '\u{17000}'..='\u{187F7}'
+        | '\u{18800}'..='\u{18CD5}'
+        | '\u{18D00}'..='\u{18D08}'
+        | '\u{1B000}'..='\u{1B11E}'
+        | '\u{1B150}'..='\u{1B152}'
+        | '\u{1B164}'..='\u{1B167}'
+        | '\u{1B170}'..='\u{1B2FB}'
+        | '\u{1BC00}'..='\u{1BC6A}'
+        | '\u{1BC70}'..='\u{1BC7C}'
+        | '\u{1BC80}'..='\u{1BC88}'
+        | '\u{1BC90}'..='\u{1BC99}'
+        | '\u{1BC9C}'..='\u{1BCA3}'
+        | '\u{1D000}'..='\u{1D0F5}'
+        | '\u{1D100}'..='\u{1D126}'
+        | '\u{1D129}'..='\u{1D1E8}'
+        | '\u{1D200}'..='\u{1D245}'
+        | '\u{1D2E0}'..='\u{1D2F3}'
+        | '\u{1D300}'..='\u{1D356}'
+        | '\u{1D360}'..='\u{1D378}'
+        | '\u{1D400}'..='\u{1D454}'
+        | '\u{1D456}'..='\u{1D49C}'
+        | '\u{1D49E}'..='\u{1D49F}'
+        | '\u{1D4A2}'
+        | '\u{1D4A5}'..='\u{1D4A6}'
+        | '\u{1D4A9}'..='\u{1D4AC}'
+        | '\u{1D4AE}'..='\u{1D4B9}'
+        | '\u{1D4BB}'
+        | '\u{1D4BD}'..='\u{1D4C3}'
+        | '\u{1D4C5}'..='\u{1D505}'
+        | '\u{1D507}'..='\u{1D50A}'
+        | '\u{1D50D}'..='\u{1D514}'
+        | '\u{1D516}'..='\u{1D51C}'
+        | '\u{1D51E}'..='\u{1D539}'
+        | '\u{1D53B}'..='\u{1D53E}'
+        | '\u{1D540}'..='\u{1D544}'
+        | '\u{1D546}'
+        | '\u{1D54A}'..='\u{1D550}'
+        | '\u{1D552}'..='\u{1D6A5}'
+        | '\u{1D6A8}'..='\u{1D7CB}'
+        | '\u{1D7CE}'..='\u{1DA8B}'
+        | '\u{1DA9B}'..='\u{1DA9F}'
+        | '\u{1DAA1}'..='\u{1DAAF}'
+        | '\u{1E000}'..='\u{1E006}'
+        | '\u{1E008}'..='\u{1E018}'
+        | '\u{1E01B}'..='\u{1E021}'
+        | '\u{1E023}'..='\u{1E024}'
+        | '\u{1E026}'..='\u{1E02A}'
+        | '\u{1E100}'..='\u{1E12C}'
+        | '\u{1E130}'..='\u{1E13D}'
+        | '\u{1E140}'..='\u{1E149}'
+        | '\u{1E14E}'..='\u{1E14F}'
+        | '\u{1E2C0}'..='\u{1E2F9}'
+        | '\u{1E2FF}'
+        | '\u{1E800}'..='\u{1E8C4}'
+        | '\u{1E8C7}'..='\u{1E8D6}'
+        | '\u{1E900}'..='\u{1E94B}'
+        | '\u{1E950}'..='\u{1E959}'
+        | '\u{1E95E}'..='\u{1E95F}'
+        | '\u{1EC71}'..='\u{1ECB4}'
+        | '\u{1ED01}'..='\u{1ED3D}'
+        | '\u{1EE00}'..='\u{1EE03}'
+        | '\u{1EE05}'..='\u{1EE1F}'
+        | '\u{1EE21}'..='\u{1EE22}'
+        | '\u{1EE24}'
+        | '\u{1EE27}'
+        | '\u{1EE29}'..='\u{1EE32}'
+        | '\u{1EE34}'..='\u{1EE37}'
+        | '\u{1EE39}'
+        | '\u{1EE3B}'
+        | '\u{1EE42}'
+        | '\u{1EE47}'
+        | '\u{1EE49}'
+        | '\u{1EE4B}'
+        | '\u{1EE4D}'..='\u{1EE4F}'
+        | '\u{1EE51}'..='\u{1EE52}'
+        | '\u{1EE54}'
+        | '\u{1EE57}'
+        | '\u{1EE59}'
+        | '\u{1EE5B}'
+        | '\u{1EE5D}'
+        | '\u{1EE5F}'
+        | '\u{1EE61}'..='\u{1EE62}'
+        | '\u{1EE64}'
+        | '\u{1EE67}'..='\u{1EE6A}'
+        | '\u{1EE6C}'..='\u{1EE72}'
+        | '\u{1EE74}'..='\u{1EE77}'
+        | '\u{1EE79}'..='\u{1EE7C}'
+        | '\u{1EE7E}'
+        | '\u{1EE80}'..='\u{1EE89}'
+        | '\u{1EE8B}'..='\u{1EE9B}'
+        | '\u{1EEA1}'..='\u{1EEA3}'
+        | '\u{1EEA5}'..='\u{1EEA9}'
+        | '\u{1EEAB}'..='\u{1EEBB}'
+        | '\u{1EEF0}'..='\u{1EEF1}'
+        | '\u{1F000}'..='\u{1F02B}'
+        | '\u{1F030}'..='\u{1F093}'
+        | '\u{1F0A0}'..='\u{1F0AE}'
+        | '\u{1F0B1}'..='\u{1F0BF}'
+        | '\u{1F0C1}'..='\u{1F0CF}'
+        | '\u{1F0D1}'..='\u{1F0F5}'
+        | '\u{1F100}'..='\u{1F1AD}'
+        | '\u{1F1E6}'..='\u{1F202}'
+        | '\u{1F210}'..='\u{1F23B}'
+        | '\u{1F240}'..='\u{1F248}'
+        | '\u{1F250}'..='\u{1F251}'
+        | '\u{1F260}'..='\u{1F265}'
+        | '\u{1F300}'..='\u{1F6D7}'
+        | '\u{1F6E0}'..='\u{1F6EC}'
+        | '\u{1F6F0}'..='\u{1F6FC}'
+        | '\u{1F700}'..='\u{1F773}'
+        | '\u{1F780}'..='\u{1F7D8}'
+        | '\u{1F7E0}'..='\u{1F7EB}'
+        | '\u{1F800}'..='\u{1F80B}'
+        | '\u{1F810}'..='\u{1F847}'
+        | '\u{1F850}'..='\u{1F859}'
+        | '\u{1F860}'..='\u{1F887}'
+        | '\u{1F890}'..='\u{1F8AD}'
+        | '\u{1F8B0}'..='\u{1F8B1}'
+        | '\u{1F900}'..='\u{1F978}'
+        | '\u{1F97A}'..='\u{1F9CB}'
+        | '\u{1F9CD}'..='\u{1FA53}'
+        | '\u{1FA60}'..='\u{1FA6D}'
+        | '\u{1FA70}'..='\u{1FA74}'
+        | '\u{1FA78}'..='\u{1FA7A}'
+        | '\u{1FA80}'..='\u{1FA86}'
+        | '\u{1FA90}'..='\u{1FAA8}'
+        | '\u{1FAB0}'..='\u{1FAB6}'
+        | '\u{1FAC0}'..='\u{1FAC2}'
+        | '\u{1FAD0}'..='\u{1FAD6}'
+        | '\u{1FB00}'..='\u{1FB92}'
+        | '\u{1FB94}'..='\u{1FBCA}'
+        | '\u{1FBF0}'..='\u{1FBF9}'
+        | '\u{20000}'..='\u{2A6DD}'
+        | '\u{2A700}'..='\u{2B734}'
+        | '\u{2B740}'..='\u{2B81D}'
+        | '\u{2B820}'..='\u{2CEA1}'
+        | '\u{2CEB0}'..='\u{2EBE0}'
+        | '\u{2F800}'..='\u{2FA1D}'
+        | '\u{30000}'..='\u{3134A}'
+        | '\u{E0001}'
+        | '\u{E0020}'..='\u{E007F}'
+        | '\u{E0100}'..='\u{E01EF}'
+        => true,
+        _ => false,
+    }
+}
+
+
+#[inline]
 #[allow(ellipsis_inclusive_range_patterns)]
 pub fn qc_nfc(c: char) -> IsNormalized {
     match c {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/benches/graphemes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/benches/graphemes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/benches/graphemes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/benches/graphemes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,55 +1,54 @@
-#[macro_use]
-extern crate bencher;
-extern crate unicode_segmentation;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use unicode_segmentation;
 
-use bencher::Bencher;
-use unicode_segmentation::UnicodeSegmentation;
 use std::fs;
+use unicode_segmentation::UnicodeSegmentation;
 
-fn graphemes(bench: &mut Bencher, path: &str) {
+fn graphemes(c: &mut Criterion, lang: &str, path: &str) {
     let text = fs::read_to_string(path).unwrap();
-    bench.iter(|| {
-        for g in UnicodeSegmentation::graphemes(&*text, true) {
-            bencher::black_box(g);
-        }
-    });
 
-    bench.bytes = text.len() as u64;
+    c.bench_function(&format!("graphemes_{}",lang), |bench| {
+        bench.iter(|| {
+            for g in UnicodeSegmentation::graphemes(black_box(&*text), true) {
+                black_box(g);
+            }
+        })
+    });
 }
 
-fn graphemes_arabic(bench: &mut Bencher) {
-    graphemes(bench, "benches/texts/arabic.txt");
+fn graphemes_arabic(c: &mut Criterion) {
+    graphemes(c, "arabic" ,"benches/texts/arabic.txt");
 }
 
-fn graphemes_english(bench: &mut Bencher) {
-    graphemes(bench, "benches/texts/english.txt");
+fn graphemes_english(c: &mut Criterion) {
+    graphemes(c, "english" ,"benches/texts/english.txt");
 }
 
-fn graphemes_hindi(bench: &mut Bencher) {
-    graphemes(bench, "benches/texts/hindi.txt");
+fn graphemes_hindi(c: &mut Criterion) {
+    graphemes(c, "hindi" ,"benches/texts/hindi.txt");
 }
 
-fn graphemes_japanese(bench: &mut Bencher) {
-    graphemes(bench, "benches/texts/japanese.txt");
+fn graphemes_japanese(c: &mut Criterion) {
+    graphemes(c, "japanese" ,"benches/texts/japanese.txt");
 }
 
-fn graphemes_korean(bench: &mut Bencher) {
-    graphemes(bench, "benches/texts/korean.txt");
+fn graphemes_korean(c: &mut Criterion) {
+    graphemes(c, "korean" ,"benches/texts/korean.txt");
 }
 
-fn graphemes_mandarin(bench: &mut Bencher) {
-    graphemes(bench, "benches/texts/mandarin.txt");
+fn graphemes_mandarin(c: &mut Criterion) {
+    graphemes(c, "mandarin" ,"benches/texts/mandarin.txt");
 }
 
-fn graphemes_russian(bench: &mut Bencher) {
-    graphemes(bench, "benches/texts/russian.txt");
+fn graphemes_russian(c: &mut Criterion) {
+    graphemes(c, "russian" ,"benches/texts/russian.txt");
 }
 
-fn graphemes_source_code(bench: &mut Bencher) {
-    graphemes(bench, "benches/texts/source_code.txt");
+fn graphemes_source_code(c: &mut Criterion) {
+    graphemes(c, "source_code","benches/texts/source_code.txt");
 }
 
-benchmark_group!(
+criterion_group!(
     benches,
     graphemes_arabic,
     graphemes_english,
@@ -61,4 +60,4 @@
     graphemes_source_code,
 );
 
-benchmark_main!(benches);
+criterion_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/benches/unicode_words.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/benches/unicode_words.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/benches/unicode_words.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/benches/unicode_words.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,64 @@
+#[macro_use]
+extern crate bencher;
+extern crate unicode_segmentation;
+
+use bencher::Bencher;
+use unicode_segmentation::UnicodeSegmentation;
+use std::fs;
+
+fn unicode_words(bench: &mut Bencher, path: &str) {
+    let text = fs::read_to_string(path).unwrap();
+    bench.iter(|| {
+        for w in text.unicode_words() {
+            bencher::black_box(w);
+        }
+    });
+
+    bench.bytes = text.len() as u64;
+}
+
+fn unicode_words_arabic(bench: &mut Bencher) {
+    unicode_words(bench, "benches/texts/arabic.txt");
+}
+
+fn unicode_words_english(bench: &mut Bencher) {
+    unicode_words(bench, "benches/texts/english.txt");
+}
+
+fn unicode_words_hindi(bench: &mut Bencher) {
+    unicode_words(bench, "benches/texts/hindi.txt");
+}
+
+fn unicode_words_japanese(bench: &mut Bencher) {
+    unicode_words(bench, "benches/texts/japanese.txt");
+}
+
+fn unicode_words_korean(bench: &mut Bencher) {
+    unicode_words(bench, "benches/texts/korean.txt");
+}
+
+fn unicode_words_mandarin(bench: &mut Bencher) {
+    unicode_words(bench, "benches/texts/mandarin.txt");
+}
+
+fn unicode_words_russian(bench: &mut Bencher) {
+    unicode_words(bench, "benches/texts/russian.txt");
+}
+
+fn unicode_words_source_code(bench: &mut Bencher) {
+    unicode_words(bench, "benches/texts/source_code.txt");
+}
+
+benchmark_group!(
+    benches,
+    unicode_words_arabic,
+    unicode_words_english,
+    unicode_words_hindi,
+    unicode_words_japanese,
+    unicode_words_korean,
+    unicode_words_mandarin,
+    unicode_words_russian,
+    unicode_words_source_code,
+);
+
+benchmark_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/benches/word_bounds.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/benches/word_bounds.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/benches/word_bounds.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/benches/word_bounds.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,64 @@
+#[macro_use]
+extern crate bencher;
+extern crate unicode_segmentation;
+
+use bencher::Bencher;
+use unicode_segmentation::UnicodeSegmentation;
+use std::fs;
+
+fn word_bounds(bench: &mut Bencher, path: &str) {
+    let text = fs::read_to_string(path).unwrap();
+    bench.iter(|| {
+        for w in text.split_word_bounds() {
+            bencher::black_box(w);
+        }
+    });
+
+    bench.bytes = text.len() as u64;
+}
+
+fn word_bounds_arabic(bench: &mut Bencher) {
+    word_bounds(bench, "benches/texts/arabic.txt");
+}
+
+fn word_bounds_english(bench: &mut Bencher) {
+    word_bounds(bench, "benches/texts/english.txt");
+}
+
+fn word_bounds_hindi(bench: &mut Bencher) {
+    word_bounds(bench, "benches/texts/hindi.txt");
+}
+
+fn word_bounds_japanese(bench: &mut Bencher) {
+    word_bounds(bench, "benches/texts/japanese.txt");
+}
+
+fn word_bounds_korean(bench: &mut Bencher) {
+    word_bounds(bench, "benches/texts/korean.txt");
+}
+
+fn word_bounds_mandarin(bench: &mut Bencher) {
+    word_bounds(bench, "benches/texts/mandarin.txt");
+}
+
+fn word_bounds_russian(bench: &mut Bencher) {
+    word_bounds(bench, "benches/texts/russian.txt");
+}
+
+fn word_bounds_source_code(bench: &mut Bencher) {
+    word_bounds(bench, "benches/texts/source_code.txt");
+}
+
+benchmark_group!(
+    benches,
+    word_bounds_arabic,
+    word_bounds_english,
+    word_bounds_hindi,
+    word_bounds_japanese,
+    word_bounds_korean,
+    word_bounds_mandarin,
+    word_bounds_russian,
+    word_bounds_source_code,
+);
+
+benchmark_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"7e287fc35f0e805cd03caf785de11fd8b5fc4aeff93e6f905c11b7195cbbe85d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"3c05436a2c9c04e3ea9692c1e9b189c2977a2e7a4b71c0641ebc8ed620894d28","benches/graphemes.rs":"d555b6e8cdfcb66b4d9ac4b35e250683922a15018fa1cd3a34111d3ee19b4221","scripts/unicode.py":"fa86bbf3dc3e0cc942592152a238305236fb7e96d8c1d5c7739168772d6f43f4","scripts/unicode_gen_breaktests.py":"ee96982d8959bec75c2382233cfca7e239f12a89a1be5fbf942601a215bb9283","src/grapheme.rs":"3e216182f92c2e4ac29ab4013884157bee8fb80ef8968725ae183fc5cfdb944c","src/lib.rs":"84c0b3acfa6527f1212c2a4cbea043d17e46ea7ae4bb1371c8816a843f99f142","src/sentence.rs":"de7968a54c387683a9e8369b6bd91b80752cefb9f772ce308dc7509829624c8b","src/tables.rs":"e5a5c04776f84f109a9005cc59df3709e2f1a3f0f27aa8f947f35aa87b499c91","src/test.rs":"0c9281ed39b4f94c1e4e7093d1342cfa54712c5a679b2fca3ee632b675b35f18","src/testdata.rs":"45f1877163fde1d801b41fcf13d7754437bb0a0f83e4b0b4fa3f37048ed6f12a","src/word.rs":"6166007c32233b52729aa726488878c0b39616aff351686e633ac0001ce52b17"},"package":"bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"}
\ No newline at end of file
+{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"02dd3f5519451193013b5df144d0f99e540112bb33d236fe8b9a036e2a3201c1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"b8e6a4e1d40dde69fba80fa6335c15392d6c99b508f45969fc494cdae4ae73fe","benches/graphemes.rs":"189bb618682c9749e75634d21270fa0983994af94e41f4ba6934aae18029f8f5","benches/unicode_words.rs":"4661395ee20443651d3dd8d8e3a27f12853cfbd69c070479971ecd5a554a9b8d","benches/word_bounds.rs":"c0e88ba4189e18e147f3ca5eb6508ae6d2f150e65fccff1ee6c603df1b4b8680","scripts/unicode.py":"5bc2d5bc88a8b8c43fcb36ad24f9e2fe9d5733fcf827c592c63dac2d2cab8c78","scripts/unicode_gen_breaktests.py":"ee96982d8959bec75c2382233cfca7e239f12a89a1be5fbf942601a215bb9283","src/grapheme.rs":"9ceef75d9213073b09be9a769e4a1f7806d7c3ef7b7983553ec91324570bc3b1","src/lib.rs":"dd4dbcd94a90ec4f5cfceaedf54296530e78c7a9da382b41c801261fa6f3928e","src/sentence.rs":"b83793ff7540a457c49cd1ffd2a2fead4e584e31eac255f832da352d9eda3816","src/tables.rs":"6ddaa67756dbaa666b8704ea5bdeab2aee3a67ca125110bb7fb79d686878ffb2","src/test.rs":"eb63e48b8b594eec8c1ac35ea0a87de4f2dfde157689f2c90e2a63518dbc810a","src/testdata.rs":"45f1877163fde1d801b41fcf13d7754437bb0a0f83e4b0b4fa3f37048ed6f12a","src/word.rs":"b1d837116e6661825256c3722dfbca2e01a949fb19b622fcac713c8a3a8b96e0"},"package":"8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "unicode-segmentation"
-version = "1.7.1"
+version = "1.8.0"
 authors = ["kwantam <kwantam@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>"]
 exclude = ["target/*", "Cargo.lock", "scripts/tmp", "benches/texts/*", "*.txt"]
 description = "This crate provides Grapheme Cluster, Word and Sentence boundaries\naccording to Unicode Standard Annex #29 rules.\n"
@@ -26,8 +27,16 @@
 [[bench]]
 name = "graphemes"
 harness = false
-[dev-dependencies.bencher]
-version = "0.1"
+
+[[bench]]
+name = "unicode_words"
+harness = false
+
+[[bench]]
+name = "word_bounds"
+harness = false
+[dev-dependencies.criterion]
+version = "0.3"
 
 [dev-dependencies.quickcheck]
 version = "0.7"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -38,7 +38,7 @@
 
 ```toml
 [dependencies]
-unicode-segmentation = "1.7.1"
+unicode-segmentation = "1.8.0"
 ```
 
 # Change Log
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/scripts/unicode.py thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/scripts/unicode.py
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/scripts/unicode.py	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/scripts/unicode.py	2021-12-09 12:01:26.000000000 +0000
@@ -229,7 +229,7 @@
     #[inline]
     fn is_alphabetic(c: char) -> bool {
         match c {
-            'a' ... 'z' | 'A' ... 'Z' => true,
+            'a' ..= 'z' | 'A' ..= 'Z' => true,
             c if c > '\x7f' => super::derived_property::Alphabetic(c),
             _ => false,
         }
@@ -238,7 +238,7 @@
     #[inline]
     fn is_numeric(c: char) -> bool {
         match c {
-            '0' ... '9' => true,
+            '0' ..= '9' => true,
             c if c > '\x7f' => super::general_category::N(c),
             _ => false,
         }
@@ -281,7 +281,6 @@
     f.write("""    }
 
     fn bsearch_range_value_table(c: char, r: &'static [(char, char, %sCat)]) -> (u32, u32, %sCat) {
-        use core;
         use core::cmp::Ordering::{Equal, Less, Greater};
         match r.binary_search_by(|&(lo, hi, _)| {
             if lo <= c && c <= hi { Equal }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/grapheme.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/grapheme.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/grapheme.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/grapheme.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
 
 use core::cmp;
 
-use tables::grapheme::GraphemeCat;
+use crate::tables::grapheme::GraphemeCat;
 
 /// External iterator for grapheme clusters and byte offsets.
 ///
@@ -73,7 +73,7 @@
 ///
 /// [`graphemes`]: trait.UnicodeSegmentation.html#tymethod.graphemes
 /// [`UnicodeSegmentation`]: trait.UnicodeSegmentation.html
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Graphemes<'a> {
     string: &'a str,
     cursor: GraphemeCursor,
@@ -148,7 +148,7 @@
 
 // maybe unify with PairResult?
 // An enum describing information about a potential boundary.
-#[derive(PartialEq, Eq, Clone)]
+#[derive(PartialEq, Eq, Clone, Debug)]
 enum GraphemeState {
     // No information is known.
     Unknown,
@@ -165,7 +165,7 @@
 }
 
 /// Cursor-based segmenter for grapheme clusters.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct GraphemeCursor {
     // Current cursor position.
     offset: usize,
@@ -228,8 +228,9 @@
     Emoji,  // a break if preceded by emoji base and (Extend)*
 }
 
+#[inline]
 fn check_pair(before: GraphemeCat, after: GraphemeCat) -> PairResult {
-    use tables::grapheme::GraphemeCat::*;
+    use crate::tables::grapheme::GraphemeCat::*;
     use self::PairResult::*;
     match (before, after) {
         (GC_CR, GC_LF) => NotBreak,  // GB3
@@ -295,8 +296,8 @@
     }
 
     fn grapheme_category(&mut self, ch: char) -> GraphemeCat {
-        use tables::grapheme as gr;
-        use tables::grapheme::GraphemeCat::*;
+        use crate::tables::grapheme as gr;
+        use crate::tables::grapheme::GraphemeCat::*;
 
         if ch <= '\u{7e}' {
             // Special-case optimization for ascii, except U+007F.  This
@@ -387,7 +388,7 @@
     /// assert_eq!(cursor.is_boundary(&flags[8..], 8), Ok(true));
     /// ```
     pub fn provide_context(&mut self, chunk: &str, chunk_start: usize) {
-        use tables::grapheme as gr;
+        use crate::tables::grapheme as gr;
         assert!(chunk_start + chunk.len() == self.pre_context_offset.unwrap());
         self.pre_context_offset = None;
         if self.is_extended && chunk_start + chunk.len() == self.offset {
@@ -407,6 +408,7 @@
         }
     }
 
+    #[inline]
     fn decide(&mut self, is_break: bool) {
         self.state = if is_break {
             GraphemeState::Break
@@ -415,11 +417,13 @@
         };
     }
 
+    #[inline]
     fn decision(&mut self, is_break: bool) -> Result<bool, GraphemeIncomplete> {
         self.decide(is_break);
         Ok(is_break)
     }
 
+    #[inline]
     fn is_boundary_result(&self) -> Result<bool, GraphemeIncomplete> {
         if self.state == GraphemeState::Break {
             Ok(true)
@@ -432,8 +436,9 @@
         }
     }
 
+    #[inline]
     fn handle_regional(&mut self, chunk: &str, chunk_start: usize) {
-        use tables::grapheme as gr;
+        use crate::tables::grapheme as gr;
         let mut ris_count = self.ris_count.unwrap_or(0);
         for ch in chunk.chars().rev() {
             if self.grapheme_category(ch) != gr::GC_Regional_Indicator {
@@ -452,8 +457,9 @@
         self.state = GraphemeState::Regional;
     }
 
+    #[inline]
     fn handle_emoji(&mut self, chunk: &str, chunk_start: usize) {
-        use tables::grapheme as gr;
+        use crate::tables::grapheme as gr;
         let mut iter = chunk.chars().rev();
         if let Some(ch) = iter.next() {
             if self.grapheme_category(ch) != gr::GC_ZWJ {
@@ -482,6 +488,7 @@
         self.state = GraphemeState::Emoji;
     }
 
+    #[inline]
     /// Determine whether the current cursor location is a grapheme cluster boundary.
     /// Only a part of the string need be supplied. If `chunk_start` is nonzero or
     /// the length of `chunk` is not equal to `len` on creation, then this method
@@ -506,7 +513,7 @@
     /// assert_eq!(cursor.is_boundary(flags, 0), Ok(false));
     /// ```
     pub fn is_boundary(&mut self, chunk: &str, chunk_start: usize) -> Result<bool, GraphemeIncomplete> {
-        use tables::grapheme as gr;
+        use crate::tables::grapheme as gr;
         if self.state == GraphemeState::Break {
             return Ok(true)
         }
@@ -563,6 +570,7 @@
         }
     }
 
+    #[inline]
     /// Find the next boundary after the current cursor position. Only a part of
     /// the string need be supplied. If the chunk is incomplete, then this
     /// method might return `GraphemeIncomplete::PreContext` or
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -66,7 +66,7 @@
 pub use grapheme::{Graphemes, GraphemeIndices};
 pub use grapheme::{GraphemeCursor, GraphemeIncomplete};
 pub use tables::UNICODE_VERSION;
-pub use word::{UWordBounds, UWordBoundIndices, UnicodeWords};
+pub use word::{UWordBounds, UWordBoundIndices, UnicodeWords, UnicodeWordIndices};
 pub use sentence::{USentenceBounds, USentenceBoundIndices, UnicodeSentences};
 
 mod grapheme;
@@ -146,6 +146,30 @@
     /// ```
     fn unicode_words<'a>(&'a self) -> UnicodeWords<'a>;
 
+    /// Returns an iterator over the words of `self`, separated on
+    /// [UAX#29 word boundaries](http://www.unicode.org/reports/tr29/#Word_Boundaries), and their
+    /// offsets.
+    ///
+    /// Here, "words" are just those substrings which, after splitting on
+    /// UAX#29 word boundaries, contain any alphanumeric characters. That is, the
+    /// substring must contain at least one character with the
+    /// [Alphabetic](http://unicode.org/reports/tr44/#Alphabetic)
+    /// property, or with
+    /// [General_Category=Number](http://unicode.org/reports/tr44/#General_Category_Values).
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use self::unicode_segmentation::UnicodeSegmentation;
+    /// let uwis = "The quick (\"brown\") fox can't jump 32.3 feet, right?";
+    /// let uwi1 = uwis.unicode_word_indices().collect::<Vec<(usize, &str)>>();
+    /// let b: &[_] = &[(0, "The"), (4, "quick"), (12, "brown"), (20, "fox"), (24, "can't"),
+    ///                 (30, "jump"), (35, "32.3"), (40, "feet"), (46, "right")];
+    ///
+    /// assert_eq!(&uwi1[..], b);
+    /// ```
+    fn unicode_word_indices<'a>(&'a self) -> UnicodeWordIndices<'a>;
+
     /// Returns an iterator over substrings of `self` separated on
     /// [UAX#29 word boundaries](http://www.unicode.org/reports/tr29/#Word_Boundaries).
     ///
@@ -250,6 +274,11 @@
     }
 
     #[inline]
+    fn unicode_word_indices(&self) -> UnicodeWordIndices {
+        word::new_unicode_word_indices(self)
+    }
+
+    #[inline]
     fn split_word_bounds(&self) -> UWordBounds {
         word::new_word_bounds(self)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/sentence.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/sentence.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/sentence.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/sentence.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 
 // All of the logic for forward iteration over sentences
 mod fwd {
-    use tables::sentence::SentenceCat;
+    use crate::tables::sentence::SentenceCat;
     use core::cmp;
 
     // Describe a parsed part of source string as described in this table:
@@ -111,7 +111,7 @@
         if parts[idx] == StatePart::ClosePlus { idx -= 1 }
 
         if parts[idx] == StatePart::ATerm {
-            use tables::sentence as se;
+            use crate::tables::sentence as se;
 
             for next_char in ahead.chars() {
                 //( ¬(OLetter | Upper | Lower | ParaSep | SATerm) )* Lower
@@ -176,7 +176,7 @@
 
         #[inline]
         fn next(&mut self) -> Option<usize> {
-            use tables::sentence as se;
+            use crate::tables::sentence as se;
 
             for next_char in self.string[self.pos..].chars() {
                 let position_before = self.pos;
@@ -331,7 +331,7 @@
 #[inline]
 pub fn new_unicode_sentences<'b>(s: &'b str) -> UnicodeSentences<'b> {
     use super::UnicodeSegmentation;
-    use tables::util::is_alphanumeric;
+    use crate::tables::util::is_alphanumeric;
 
     fn has_alphanumeric(s: &&str) -> bool { s.chars().any(|c| is_alphanumeric(c)) }
     let has_alphanumeric: fn(&&str) -> bool = has_alphanumeric; // coerce to fn pointer
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/tables.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/tables.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/tables.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/tables.rs	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,7 @@
     #[inline]
     fn is_alphabetic(c: char) -> bool {
         match c {
-            'a' ... 'z' | 'A' ... 'Z' => true,
+            'a' ..= 'z' | 'A' ..= 'Z' => true,
             c if c > '' => super::derived_property::Alphabetic(c),
             _ => false,
         }
@@ -39,7 +39,7 @@
     #[inline]
     fn is_numeric(c: char) -> bool {
         match c {
-            '0' ... '9' => true,
+            '0' ..= '9' => true,
             c if c > '' => super::general_category::N(c),
             _ => false,
         }
@@ -352,7 +352,6 @@
     }
 
     fn bsearch_range_value_table(c: char, r: &'static [(char, char, GraphemeCat)]) -> (u32, u32, GraphemeCat) {
-        use core;
         use core::cmp::Ordering::{Equal, Less, Greater};
         match r.binary_search_by(|&(lo, hi, _)| {
             if lo <= c && c <= hi { Equal }
@@ -1003,7 +1002,6 @@
     }
 
     fn bsearch_range_value_table(c: char, r: &'static [(char, char, WordCat)]) -> (u32, u32, WordCat) {
-        use core;
         use core::cmp::Ordering::{Equal, Less, Greater};
         match r.binary_search_by(|&(lo, hi, _)| {
             if lo <= c && c <= hi { Equal }
@@ -1479,7 +1477,6 @@
     }
 
     fn bsearch_range_value_table(c: char, r: &'static [(char, char, EmojiCat)]) -> (u32, u32, EmojiCat) {
-        use core;
         use core::cmp::Ordering::{Equal, Less, Greater};
         match r.binary_search_by(|&(lo, hi, _)| {
             if lo <= c && c <= hi { Equal }
@@ -1583,7 +1580,6 @@
     }
 
     fn bsearch_range_value_table(c: char, r: &'static [(char, char, SentenceCat)]) -> (u32, u32, SentenceCat) {
-        use core;
         use core::cmp::Ordering::{Equal, Less, Greater};
         match r.binary_search_by(|&(lo, hi, _)| {
             if lo <= c && c <= hi { Equal }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/test.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/test.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/test.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/test.rs	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,7 @@
 
 #[test]
 fn test_graphemes() {
-    use testdata::{TEST_SAME, TEST_DIFF};
+    use crate::testdata::{TEST_SAME, TEST_DIFF};
 
     pub const EXTRA_DIFF: &'static [(&'static str,
                                      &'static [&'static str],
@@ -88,7 +88,7 @@
 
 #[test]
 fn test_words() {
-    use testdata::TEST_WORD;
+    use crate::testdata::TEST_WORD;
 
     // Unicode's official tests don't really test longer chains of flag emoji
     // TODO This could be improved with more tests like flag emoji with interspersed Extend chars and ZWJ
@@ -144,7 +144,7 @@
 
 #[test]
 fn test_sentences() {
-    use testdata::TEST_SENTENCE;
+    use crate::testdata::TEST_SENTENCE;
 
     for &(s, w) in TEST_SENTENCE.iter() {
         macro_rules! assert_ {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/word.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/word.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-segmentation/src/word.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-segmentation/src/word.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 use core::cmp;
 use core::iter::Filter;
 
-use tables::word::WordCat;
+use crate::tables::word::WordCat;
 
 /// An iterator over the substrings of a string which, after splitting the string on
 /// [word boundaries](http://www.unicode.org/reports/tr29/#Word_Boundaries),
@@ -40,6 +40,34 @@
     fn next_back(&mut self) -> Option<&'a str> { self.inner.next_back() }
 }
 
+/// An iterator over the substrings of a string which, after splitting the string on
+/// [word boundaries](http://www.unicode.org/reports/tr29/#Word_Boundaries),
+/// contain any characters with the
+/// [Alphabetic](http://unicode.org/reports/tr44/#Alphabetic)
+/// property, or with
+/// [General_Category=Number](http://unicode.org/reports/tr44/#General_Category_Values).
+/// This iterator also provides the byte offsets for each substring.
+///
+/// This struct is created by the [`unicode_word_indices`] method on the [`UnicodeSegmentation`] trait. See
+/// its documentation for more.
+///
+/// [`unicode_word_indices`]: trait.UnicodeSegmentation.html#tymethod.unicode_word_indices
+/// [`UnicodeSegmentation`]: trait.UnicodeSegmentation.html
+pub struct UnicodeWordIndices<'a> {
+    inner: Filter<UWordBoundIndices<'a>, fn(&(usize, &str)) -> bool>,
+}
+
+impl<'a> Iterator for UnicodeWordIndices<'a> {
+    type Item = (usize, &'a str);
+
+    #[inline]
+    fn next(&mut self) -> Option<(usize, &'a str)> { self.inner.next() }
+}
+impl<'a> DoubleEndedIterator for UnicodeWordIndices<'a> {
+    #[inline]
+    fn next_back(&mut self) -> Option<(usize, &'a str)> { self.inner.next_back() }
+}
+
 /// External iterator for a string's
 /// [word boundaries](http://www.unicode.org/reports/tr29/#Word_Boundaries).
 ///
@@ -142,7 +170,7 @@
 }
 
 fn is_emoji(ch: char) -> bool {
-    use tables::emoji;
+    use crate::tables::emoji;
     emoji::emoji_category(ch).2 == emoji::EmojiCat::EC_Extended_Pictographic
 }
 
@@ -159,7 +187,7 @@
     fn next(&mut self) -> Option<&'a str> {
         use self::UWordBoundsState::*;
         use self::FormatExtendType::*;
-        use tables::word as wd;
+        use crate::tables::word as wd;
         if self.string.len() == 0 {
             return None;
         }
@@ -172,14 +200,13 @@
         let mut cat = wd::WC_Any;
         let mut savecat = wd::WC_Any;
 
-        // Whether or not the previous category was ZWJ
-        // ZWJs get collapsed, so this handles precedence of WB3c over WB4
-        let mut prev_zwj;
         // If extend/format/zwj were skipped. Handles precedence of WB3d over WB4
         let mut skipped_format_extend = false;
         for (curr, ch) in self.string.char_indices() {
             idx = curr;
-            prev_zwj = cat == wd::WC_ZWJ;
+            // Whether or not the previous category was ZWJ
+            // ZWJs get collapsed, so this handles precedence of WB3c over WB4
+            let prev_zwj = cat == wd::WC_ZWJ;
             // if there's a category cached, grab it
             cat = match self.cat {
                 None => wd::word_category(ch).2,
@@ -386,7 +413,7 @@
     fn next_back(&mut self) -> Option<&'a str> {
         use self::UWordBoundsState::*;
         use self::FormatExtendType::*;
-        use tables::word as wd;
+        use crate::tables::word as wd;
         if self.string.len() == 0 {
             return None;
         }
@@ -638,7 +665,7 @@
 
     #[inline]
     fn get_next_cat(&self, idx: usize) -> Option<WordCat> {
-        use tables::word as wd;
+        use crate::tables::word as wd;
         let nidx = idx + self.string[idx..].chars().next().unwrap().len_utf8();
         if nidx < self.string.len() {
             let nch = self.string[nidx..].chars().next().unwrap();
@@ -650,7 +677,7 @@
 
     #[inline]
     fn get_prev_cat(&self, idx: usize) -> Option<WordCat> {
-        use tables::word as wd;
+        use crate::tables::word as wd;
         if idx > 0 {
             let nch = self.string[..idx].chars().next_back().unwrap();
             Some(wd::word_category(nch).2)
@@ -671,12 +698,22 @@
 }
 
 #[inline]
+fn has_alphanumeric(s: &&str) -> bool {
+    use crate::tables::util::is_alphanumeric;
+
+    s.chars().any(|c| is_alphanumeric(c))
+}
+
+#[inline]
 pub fn new_unicode_words<'b>(s: &'b str) -> UnicodeWords<'b> {
     use super::UnicodeSegmentation;
-    use tables::util::is_alphanumeric;
-
-    fn has_alphanumeric(s: &&str) -> bool { s.chars().any(|c| is_alphanumeric(c)) }
-    let has_alphanumeric: fn(&&str) -> bool = has_alphanumeric; // coerce to fn pointer
 
     UnicodeWords { inner: s.split_word_bounds().filter(has_alphanumeric) }
 }
+
+#[inline]
+pub fn new_unicode_word_indices<'b>(s: &'b str) -> UnicodeWordIndices<'b> {
+    use super::UnicodeSegmentation;
+
+    UnicodeWordIndices { inner: s.split_word_bound_indices().filter(|(_, c)| has_alphanumeric(c)) }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/benches/xid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/benches/xid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/benches/xid.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/benches/xid.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,60 @@
+extern crate criterion;
+extern crate unicode_xid;
+
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use unicode_xid::UnicodeXID;
+
+fn bench_unicode_xid(c: &mut Criterion) {
+    let unicode_chars = chars(1..0x3000);
+    let ascii_chars = chars(1..0x80);
+
+    let mut group = c.benchmark_group("UnicodeXID");
+    group.throughput(Throughput::Bytes(unicode_chars.len() as u64));
+    group.bench_with_input(
+        BenchmarkId::new("is_xid_start", "unicode"),
+        &unicode_chars,
+        |b, chars| b.iter(|| chars.iter().copied().map(UnicodeXID::is_xid_start).last()),
+    );
+    group.throughput(Throughput::Bytes(ascii_chars.len() as u64));
+    group.bench_with_input(
+        BenchmarkId::new("is_xid_start", "ascii"),
+        &ascii_chars,
+        |b, chars| b.iter(|| chars.iter().copied().map(UnicodeXID::is_xid_start).last()),
+    );
+    group.throughput(Throughput::Bytes(unicode_chars.len() as u64));
+    group.bench_with_input(
+        BenchmarkId::new("is_xid_continue", "unicode"),
+        &unicode_chars,
+        |b, chars| {
+            b.iter(|| {
+                chars
+                    .iter()
+                    .copied()
+                    .map(UnicodeXID::is_xid_continue)
+                    .last()
+            })
+        },
+    );
+    group.throughput(Throughput::Bytes(ascii_chars.len() as u64));
+    group.bench_with_input(
+        BenchmarkId::new("is_xid_continue", "ascii"),
+        &ascii_chars,
+        |b, chars| {
+            b.iter(|| {
+                chars
+                    .iter()
+                    .copied()
+                    .map(UnicodeXID::is_xid_continue)
+                    .last()
+            })
+        },
+    );
+    group.finish();
+}
+
+fn chars(range: std::ops::Range<u32>) -> Vec<char> {
+    range.filter_map(|i| std::char::from_u32(i)).collect()
+}
+
+criterion_group!(benches, bench_unicode_xid);
+criterion_main!(benches);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"d9cc1fe4c99e12646b7b6ec6ff65f9af669e7758db91e860eeb4a4b37c9bc354","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"515d0bdb0feaef0dd3824b3fa8d96943d7e29ccbd358d9b84c47a0af806b5047","src/lib.rs":"85115f433b8074967fb50068d496d4a3acb4dcdd8fe4377b5d28a2101b07a83e","src/tables.rs":"895c4e1199b7987fbf058a4dbd2b1145fa212136d2fc75fd5ac49059192796af","src/tests.rs":"b866f890acd631e667635785c34b1723709f10a9515ca525b41de8a062c7b204","tests/exhaustive_tests.rs":"ec91e9124d61e5b3e2fbbbf37a2fd30d6c7a8fa22639d6720b416d9ebc1007c5"},"package":"f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"}
\ No newline at end of file
+{"files":{"COPYRIGHT":"23860c2a7b5d96b21569afedf033469bab9fe14a1b24a35068b8641c578ce24d","Cargo.toml":"49c1612c2c7e8032afc9ed76331020a1886d11dc9f538400d96efa5359925a2c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"8fde6fcab0ea13c3abffd8a042f286078a7d88b524dd59db3f26889eb470a5a4","benches/xid.rs":"a2986ce1df5d93bff51e73dc234bffb341d4fe5d749247296f02396dde16a72b","src/lib.rs":"3cdd204115af45e9ece70db737d711e1798eac40eaa6cc4e8280bb3342e1408e","src/tables.rs":"895c4e1199b7987fbf058a4dbd2b1145fa212136d2fc75fd5ac49059192796af","src/tests.rs":"b866f890acd631e667635785c34b1723709f10a9515ca525b41de8a062c7b204","tests/exhaustive_tests.rs":"ec91e9124d61e5b3e2fbbbf37a2fd30d6c7a8fa22639d6720b416d9ebc1007c5"},"package":"8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,8 +12,8 @@
 
 [package]
 name = "unicode-xid"
-version = "0.2.1"
-authors = ["erick.tryzelaar <erick.tryzelaar@gmail.com>", "kwantam <kwantam@gmail.com>"]
+version = "0.2.2"
+authors = ["erick.tryzelaar <erick.tryzelaar@gmail.com>", "kwantam <kwantam@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>"]
 exclude = ["/scripts/*", "/.travis.yml"]
 description = "Determine whether characters have the XID_Start\nor XID_Continue properties according to\nUnicode Standard Annex #31.\n"
 homepage = "https://github.com/unicode-rs/unicode-xid"
@@ -23,6 +23,12 @@
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/unicode-rs/unicode-xid"
 
+[[bench]]
+name = "xid"
+harness = false
+[dev-dependencies.criterion]
+version = "0.3"
+
 [features]
 bench = []
 default = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -26,6 +26,15 @@
 
 # changelog
 
+## 0.2.2
+
+- Add an ASCII fast-path
+
+## 0.2.1
+
+- Update to Unicode 13.0.0
+- Speed up lookup
+
 ## 0.2.0
 
 - Update to Unicode 12.1.0.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/unicode-xid/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/unicode-xid/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -74,11 +74,19 @@
 impl UnicodeXID for char {
     #[inline]
     fn is_xid_start(self) -> bool {
-        derived_property::XID_Start(self)
+        // Fast-path for ascii idents
+        ('a' <= self && self <= 'z')
+            || ('A' <= self && self <= 'Z')
+            || (self > '\x7f' && derived_property::XID_Start(self))
     }
 
     #[inline]
     fn is_xid_continue(self) -> bool {
-        derived_property::XID_Continue(self)
+        // Fast-path for ascii idents
+        ('a' <= self && self <= 'z')
+            || ('A' <= self && self <= 'Z')
+            || ('0' <= self && self <= '9')
+            || self == '_'
+            || (self > '\x7f' && derived_property::XID_Continue(self))
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"a902cef5c474f41f0b9e3e6f146a3d47e92b176e998183db96ecae92a9be79b8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","src/host.rs":"05440e5171a90dc1e783b4ecc4844d591a11085f2603c06c7ead253c72bfa602","src/lib.rs":"d1a84d49bef9e5f24dd68a2ec35991394b3b063ffc1ea75cf8ace943818902c5","src/origin.rs":"2b967dd04fa5852b4a89f13cc628f3bfd84d1432e9447b2d3cbc6fee8aba3738","src/parser.rs":"9dc1dd073a63b66038d513913e29de066aa1438b9895ec27e085102a075e522d","src/path_segments.rs":"7c5b357a3b695623b51e2c9f5ae2da550ced09fce8b9e341d02d28c66c0598e3","src/quirks.rs":"7e0656d4e5f455da7e9781ccc378f6322fbfff887fa6e8ca159bfa17fba1e17b","src/slicing.rs":"25425fc5c4100a3a5da49d1e0b497f6536066afcc91c4ba4dff5ace0860acd40"},"package":"5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"}
\ No newline at end of file
+{"files":{"Cargo.toml":"9814ea7672535568bb8c84b23512fe0119f85a14a2cc84d2f7f0b3848c61a65c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","src/host.rs":"88adbe3a8dc691a4e32d7ed664dc7f17f8a1a863ffa4cde4d618032a00ec6653","src/lib.rs":"30372556e2352f93fa56178b85174eb0c3a819e87b12c288b67a101f7535a712","src/origin.rs":"2b967dd04fa5852b4a89f13cc628f3bfd84d1432e9447b2d3cbc6fee8aba3738","src/parser.rs":"eab4f6c7bffc021e9722375447a259683b8257dc6dff784c715032c39d4b4923","src/path_segments.rs":"dd6b637245b2ad77ce96221df3f80c8b4ad858cd52aecc86b97166dec386882a","src/quirks.rs":"8a504a2eeb74429e3282f2628014f3af9a567284c2b08bd0360bfd72d3a17e43","src/slicing.rs":"25425fc5c4100a3a5da49d1e0b497f6536066afcc91c4ba4dff5ace0860acd40","tests/data.rs":"dace394aed466df0e8afea0037bb8c90306d30ce75efdaff39feb00dbd07fa79","tests/setters_tests.json":"486f6d129960d0d0d99b533caf9bef21113b31adcdb83296dfc4a59cd8431715","tests/unit.rs":"61e014d600aa558f4913ac7bc268d652eda67daead72b0b0cf288524b1d71d13","tests/urltestdata.json":"afe55dd9583d125305d31e152478de9cc19801006b413c5f4fb7d430c50b1d11"},"package":"a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,9 +13,9 @@
 [package]
 edition = "2018"
 name = "url"
-version = "2.2.0"
+version = "2.2.2"
 authors = ["The rust-url developers"]
-include = ["src/**/*", "LICENSE-*", "README.md"]
+include = ["src/**/*", "LICENSE-*", "README.md", "tests/**"]
 description = "URL library for Rust, based on the WHATWG URL Standard"
 documentation = "https://docs.rs/url"
 readme = "../README.md"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/host.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/host.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/host.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/host.rs	2021-12-09 12:01:26.000000000 +0000
@@ -38,7 +38,7 @@
 
 /// The host name of an URL.
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Debug, Eq, Ord, PartialOrd, Hash)]
 pub enum Host<S = String> {
     /// A DNS domain name, as '.' dot-separated labels.
     /// Non-ASCII labels are encoded in punycode per IDNA if this is the host of
@@ -172,6 +172,20 @@
     }
 }
 
+impl<S, T> PartialEq<Host<T>> for Host<S>
+where
+    S: PartialEq<T>,
+{
+    fn eq(&self, other: &Host<T>) -> bool {
+        match (self, other) {
+            (Host::Domain(a), Host::Domain(b)) => a == b,
+            (Host::Ipv4(a), Host::Ipv4(b)) => a == b,
+            (Host::Ipv6(a), Host::Ipv6(b)) => a == b,
+            (_, _) => false,
+        }
+    }
+}
+
 fn write_ipv6(addr: &Ipv6Addr, f: &mut Formatter<'_>) -> fmt::Result {
     let segments = addr.segments();
     let (compress_start, compress_end) = longest_zero_sequence(&segments);
@@ -249,11 +263,11 @@
     // So instead we check if the input looks like a real number and only return
     // an error when it's an overflow.
     let valid_number = match r {
-        8 => input.chars().all(|c| c >= '0' && c <= '7'),
-        10 => input.chars().all(|c| c >= '0' && c <= '9'),
-        16 => input
-            .chars()
-            .all(|c| (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')),
+        8 => input.chars().all(|c| ('0'..='7').contains(&c)),
+        10 => input.chars().all(|c| ('0'..='9').contains(&c)),
+        16 => input.chars().all(|c| {
+            ('0'..='9').contains(&c) || ('a'..='f').contains(&c) || ('A'..='F').contains(&c)
+        }),
         _ => false,
     };
 
@@ -288,7 +302,7 @@
     let mut numbers: Vec<u32> = Vec::new();
     let mut overflow = false;
     for part in parts {
-        if part == "" {
+        if part.is_empty() {
             return Ok(None);
         }
         match parse_ipv4number(part) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -73,6 +73,9 @@
 # run().unwrap();
 ```
 
+## Serde
+
+Enable the `serde` feature to include `Deserialize` and `Serialize` implementations for `url::Url`.
 
 # Base URL
 
@@ -103,9 +106,21 @@
 # Ok(())
 # }
 # run().unwrap();
+```
+
+# Feature: `serde`
+
+If you enable the `serde` feature, [`Url`](struct.Url.html) will implement
+[`serde::Serialize`](https://docs.rs/serde/1/serde/trait.Serialize.html) and
+[`serde::Deserialize`](https://docs.rs/serde/1/serde/trait.Deserialize.html).
+See [serde documentation](https://serde.rs) for more information.
+
+```toml
+url = { version = "2", features = ["serde"] }
+```
 */
 
-#![doc(html_root_url = "https://docs.rs/url/2.1.1")]
+#![doc(html_root_url = "https://docs.rs/url/2.2.2")]
 
 #[macro_use]
 extern crate matches;
@@ -119,8 +134,6 @@
 use percent_encoding::{percent_decode, percent_encode, utf8_percent_encode};
 use std::borrow::Borrow;
 use std::cmp;
-#[cfg(feature = "serde")]
-use std::error::Error;
 use std::fmt::{self, Write};
 use std::hash;
 use std::io;
@@ -307,6 +320,8 @@
 
     /// Parse a string as an URL, with this URL as the base URL.
     ///
+    /// The inverse of this is [`make_relative`].
+    ///
     /// Note: a trailing slash is significant.
     /// Without it, the last path component is considered to be a “file� name
     /// to be removed to get at the “directory� that is used as the base:
@@ -336,11 +351,144 @@
     /// with this URL as the base URL, a [`ParseError`] variant will be returned.
     ///
     /// [`ParseError`]: enum.ParseError.html
+    /// [`make_relative`]: #method.make_relative
     #[inline]
     pub fn join(&self, input: &str) -> Result<Url, crate::ParseError> {
         Url::options().base_url(Some(self)).parse(input)
     }
 
+    /// Creates a relative URL if possible, with this URL as the base URL.
+    ///
+    /// This is the inverse of [`join`].
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use url::Url;
+    /// # use url::ParseError;
+    ///
+    /// # fn run() -> Result<(), ParseError> {
+    /// let base = Url::parse("https://example.net/a/b.html")?;
+    /// let url = Url::parse("https://example.net/a/c.png")?;
+    /// let relative = base.make_relative(&url);
+    /// assert_eq!(relative.as_ref().map(|s| s.as_str()), Some("c.png"));
+    ///
+    /// let base = Url::parse("https://example.net/a/b/")?;
+    /// let url = Url::parse("https://example.net/a/b/c.png")?;
+    /// let relative = base.make_relative(&url);
+    /// assert_eq!(relative.as_ref().map(|s| s.as_str()), Some("c.png"));
+    ///
+    /// let base = Url::parse("https://example.net/a/b/")?;
+    /// let url = Url::parse("https://example.net/a/d/c.png")?;
+    /// let relative = base.make_relative(&url);
+    /// assert_eq!(relative.as_ref().map(|s| s.as_str()), Some("../d/c.png"));
+    ///
+    /// let base = Url::parse("https://example.net/a/b.html?c=d")?;
+    /// let url = Url::parse("https://example.net/a/b.html?e=f")?;
+    /// let relative = base.make_relative(&url);
+    /// assert_eq!(relative.as_ref().map(|s| s.as_str()), Some("?e=f"));
+    /// # Ok(())
+    /// # }
+    /// # run().unwrap();
+    /// ```
+    ///
+    /// # Errors
+    ///
+    /// If this URL can't be a base for the given URL, `None` is returned.
+    /// This is for example the case if the scheme, host or port are not the same.
+    ///
+    /// [`join`]: #method.join
+    pub fn make_relative(&self, url: &Url) -> Option<String> {
+        if self.cannot_be_a_base() {
+            return None;
+        }
+
+        // Scheme, host and port need to be the same
+        if self.scheme() != url.scheme() || self.host() != url.host() || self.port() != url.port() {
+            return None;
+        }
+
+        // We ignore username/password at this point
+
+        // The path has to be transformed
+        let mut relative = String::new();
+
+        // Extract the filename of both URIs, these need to be handled separately
+        fn extract_path_filename(s: &str) -> (&str, &str) {
+            let last_slash_idx = s.rfind('/').unwrap_or(0);
+            let (path, filename) = s.split_at(last_slash_idx);
+            if filename.is_empty() {
+                (path, "")
+            } else {
+                (path, &filename[1..])
+            }
+        }
+
+        let (base_path, base_filename) = extract_path_filename(self.path());
+        let (url_path, url_filename) = extract_path_filename(url.path());
+
+        let mut base_path = base_path.split('/').peekable();
+        let mut url_path = url_path.split('/').peekable();
+
+        // Skip over the common prefix
+        while base_path.peek().is_some() && base_path.peek() == url_path.peek() {
+            base_path.next();
+            url_path.next();
+        }
+
+        // Add `..` segments for the remainder of the base path
+        for base_path_segment in base_path {
+            // Skip empty last segments
+            if base_path_segment.is_empty() {
+                break;
+            }
+
+            if !relative.is_empty() {
+                relative.push('/');
+            }
+
+            relative.push_str("..");
+        }
+
+        // Append the remainder of the other URI
+        for url_path_segment in url_path {
+            if !relative.is_empty() {
+                relative.push('/');
+            }
+
+            relative.push_str(url_path_segment);
+        }
+
+        // Add the filename if they are not the same
+        if base_filename != url_filename {
+            // If the URIs filename is empty this means that it was a directory
+            // so we'll have to append a '/'.
+            //
+            // Otherwise append it directly as the new filename.
+            if url_filename.is_empty() {
+                relative.push('/');
+            } else {
+                if !relative.is_empty() {
+                    relative.push('/');
+                }
+                relative.push_str(url_filename);
+            }
+        }
+
+        // Query and fragment are only taken from the other URI
+        if let Some(query) = url.query() {
+            relative.push('?');
+            relative.push_str(query);
+        }
+
+        if let Some(fragment) = url.fragment() {
+            relative.push('#');
+            relative.push_str(fragment);
+        }
+
+        Some(relative)
+    }
+
     /// Return a default `ParseOptions` that can fully configure the URL parser.
     ///
     /// # Examples
@@ -404,14 +552,15 @@
     /// # fn run() -> Result<(), ParseError> {
     /// let url_str = "https://example.net/";
     /// let url = Url::parse(url_str)?;
-    /// assert_eq!(url.into_string(), url_str);
+    /// assert_eq!(String::from(url), url_str);
     /// # Ok(())
     /// # }
     /// # run().unwrap();
     /// ```
     #[inline]
+    #[deprecated(since = "2.3.0", note = "use Into<String>")]
     pub fn into_string(self) -> String {
-        self.serialization
+        self.into()
     }
 
     /// For internal testing, not part of the public API.
@@ -717,8 +866,9 @@
     /// # run().unwrap();
     /// ```
     pub fn username(&self) -> &str {
-        if self.has_authority() {
-            self.slice(self.scheme_end + ("://".len() as u32)..self.username_end)
+        let scheme_separator_len = "://".len() as u32;
+        if self.has_authority() && self.username_end > self.scheme_end + scheme_separator_len {
+            self.slice(self.scheme_end + scheme_separator_len..self.username_end)
         } else {
             ""
         }
@@ -789,7 +939,8 @@
 
     /// Return the string representation of the host (domain or IP address) for this URL, if any.
     ///
-    /// Non-ASCII domains are punycode-encoded per IDNA.
+    /// Non-ASCII domains are punycode-encoded per IDNA if this is the host
+    /// of a special URL, or percent encoded for non-special URLs.
     /// IPv6 addresses are given between `[` and `]` brackets.
     ///
     /// Cannot-be-a-base URLs (typical of `data:` and `mailto:`) and some `file:` URLs
@@ -828,7 +979,8 @@
     }
 
     /// Return the parsed representation of the host for this URL.
-    /// Non-ASCII domain labels are punycode-encoded per IDNA.
+    /// Non-ASCII domain labels are punycode-encoded per IDNA if this is the host
+    /// of a special URL, or percent encoded for non-special URLs.
     ///
     /// Cannot-be-a-base URLs (typical of `data:` and `mailto:`) and some `file:` URLs
     /// don’t have a host.
@@ -867,6 +1019,8 @@
     }
 
     /// If this URL has a host and it is a domain name (not an IP address), return it.
+    /// Non-ASCII domains are punycode-encoded per IDNA if this is the host
+    /// of a special URL, or percent encoded for non-special URLs.
     ///
     /// # Examples
     ///
@@ -1080,6 +1234,7 @@
     /// # }
     /// # run().unwrap();
     /// ```
+    #[allow(clippy::manual_strip)] // introduced in 1.45, MSRV is 1.36
     pub fn path_segments(&self) -> Option<str::Split<'_, char>> {
         let path = self.path();
         if path.starts_with('/') {
@@ -1414,6 +1569,7 @@
     /// Return an object with methods to manipulate this URL’s path segments.
     ///
     /// Return `Err(())` if this URL is cannot-be-a-base.
+    #[allow(clippy::result_unit_err)]
     pub fn path_segments_mut(&mut self) -> Result<PathSegmentsMut<'_>, ()> {
         if self.cannot_be_a_base() {
             Err(())
@@ -1497,6 +1653,7 @@
     /// # }
     /// # run().unwrap();
     /// ```
+    #[allow(clippy::result_unit_err)]
     pub fn set_port(&mut self, mut port: Option<u16>) -> Result<(), ()> {
         // has_host implies !cannot_be_a_base
         if !self.has_host() || self.host() == Some(Host::Domain("")) || self.scheme() == "file" {
@@ -1636,7 +1793,7 @@
         }
 
         if let Some(host) = host {
-            if host == "" && SchemeType::from(self.scheme()).is_special() {
+            if host.is_empty() && SchemeType::from(self.scheme()).is_special() {
                 return Err(ParseError::EmptyHost);
             }
             let mut host_substr = host;
@@ -1767,6 +1924,7 @@
     /// # run().unwrap();
     /// ```
     ///
+    #[allow(clippy::result_unit_err)]
     pub fn set_ip_host(&mut self, address: IpAddr) -> Result<(), ()> {
         if self.cannot_be_a_base() {
             return Err(());
@@ -1806,6 +1964,7 @@
     /// # }
     /// # run().unwrap();
     /// ```
+    #[allow(clippy::result_unit_err)]
     pub fn set_password(&mut self, password: Option<&str>) -> Result<(), ()> {
         // has_host implies !cannot_be_a_base
         if !self.has_host() || self.host() == Some(Host::Domain("")) || self.scheme() == "file" {
@@ -1898,6 +2057,7 @@
     /// # }
     /// # run().unwrap();
     /// ```
+    #[allow(clippy::result_unit_err)]
     pub fn set_username(&mut self, username: &str) -> Result<(), ()> {
         // has_host implies !cannot_be_a_base
         if !self.has_host() || self.host() == Some(Host::Domain("")) || self.scheme() == "file" {
@@ -2059,6 +2219,7 @@
     /// # }
     /// # run().unwrap();
     /// ```
+    #[allow(clippy::result_unit_err, clippy::suspicious_operation_groupings)]
     pub fn set_scheme(&mut self, scheme: &str) -> Result<(), ()> {
         let mut parser = Parser::for_setter(String::new());
         let remaining = parser.parse_scheme(parser::Input::new(scheme))?;
@@ -2138,6 +2299,7 @@
     /// # }
     /// ```
     #[cfg(any(unix, windows, target_os = "redox"))]
+    #[allow(clippy::result_unit_err)]
     pub fn from_file_path<P: AsRef<Path>>(path: P) -> Result<Url, ()> {
         let mut serialization = "file://".to_owned();
         let host_start = serialization.len() as u32;
@@ -2174,6 +2336,7 @@
     /// Note that `std::path` does not consider trailing slashes significant
     /// and usually does not include them (e.g. in `Path::parent()`).
     #[cfg(any(unix, windows, target_os = "redox"))]
+    #[allow(clippy::result_unit_err)]
     pub fn from_directory_path<P: AsRef<Path>>(path: P) -> Result<Url, ()> {
         let mut url = Url::from_file_path(path)?;
         if !url.serialization.ends_with('/') {
@@ -2290,6 +2453,7 @@
     /// for a Windows path, is not UTF-8.)
     #[inline]
     #[cfg(any(unix, windows, target_os = "redox"))]
+    #[allow(clippy::result_unit_err)]
     pub fn to_file_path(&self) -> Result<PathBuf, ()> {
         if let Some(segments) = self.path_segments() {
             let host = match self.host() {
@@ -2347,6 +2511,13 @@
     }
 }
 
+/// String converstion.
+impl From<Url> for String {
+    fn from(value: Url) -> String {
+        value.serialization
+    }
+}
+
 /// Debug the serialization of this URL.
 impl fmt::Debug for Url {
     #[inline]
@@ -2354,6 +2525,9 @@
         formatter
             .debug_struct("Url")
             .field("scheme", &self.scheme())
+            .field("cannot_be_a_base", &self.cannot_be_a_base())
+            .field("username", &self.username())
+            .field("password", &self.password())
             .field("host", &self.host())
             .field("port", &self.port())
             .field("path", &self.path())
@@ -2471,8 +2645,10 @@
             where
                 E: Error,
             {
-                Url::parse(s)
-                    .map_err(|err| Error::invalid_value(Unexpected::Str(s), &err.description()))
+                Url::parse(s).map_err(|err| {
+                    let err_s = format!("{}", err);
+                    Error::invalid_value(Unexpected::Str(s), &err_s.as_str())
+                })
             }
         }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/parser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/parser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -295,17 +295,17 @@
 }
 
 pub trait Pattern {
-    fn split_prefix<'i>(self, input: &mut Input<'i>) -> bool;
+    fn split_prefix(self, input: &mut Input) -> bool;
 }
 
 impl Pattern for char {
-    fn split_prefix<'i>(self, input: &mut Input<'i>) -> bool {
+    fn split_prefix(self, input: &mut Input) -> bool {
         input.next() == Some(self)
     }
 }
 
 impl<'a> Pattern for &'a str {
-    fn split_prefix<'i>(self, input: &mut Input<'i>) -> bool {
+    fn split_prefix(self, input: &mut Input) -> bool {
         for c in self.chars() {
             if input.next() != Some(c) {
                 return false;
@@ -316,7 +316,7 @@
 }
 
 impl<F: FnMut(char) -> bool> Pattern for F {
-    fn split_prefix<'i>(self, input: &mut Input<'i>) -> bool {
+    fn split_prefix(self, input: &mut Input) -> bool {
         input.next().map_or(false, self)
     }
 }
@@ -1071,7 +1071,7 @@
         Ok((has_host, host, remaining))
     }
 
-    pub fn file_host<'i>(input: Input<'i>) -> ParseResult<(bool, String, Input<'i>)> {
+    pub fn file_host(input: Input) -> ParseResult<(bool, String, Input)> {
         // Undo the Input abstraction here to avoid allocating in the common case
         // where the host part of the input does not contain any tab or newline
         let input_str = input.chars.as_str();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/path_segments.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/path_segments.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/path_segments.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/path_segments.rs	2021-12-09 12:01:26.000000000 +0000
@@ -123,6 +123,9 @@
     /// # run().unwrap();
     /// ```
     pub fn pop_if_empty(&mut self) -> &mut Self {
+        if self.after_first_slash >= self.url.serialization.len() {
+            return self;
+        }
         if self.url.serialization[self.after_first_slash..].ends_with('/') {
             self.url.serialization.pop();
         }
@@ -135,6 +138,9 @@
     ///
     /// Returns `&mut Self` so that method calls can be chained.
     pub fn pop(&mut self) -> &mut Self {
+        if self.after_first_slash >= self.url.serialization.len() {
+            return self;
+        }
         let last_slash = self.url.serialization[self.after_first_slash..]
             .rfind('/')
             .unwrap_or(0);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/quirks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/quirks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/src/quirks.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/src/quirks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -56,6 +56,7 @@
 }
 
 /// Setter for https://url.spec.whatwg.org/#dom-url-protocol
+#[allow(clippy::result_unit_err)]
 pub fn set_protocol(url: &mut Url, mut new_protocol: &str) -> Result<(), ()> {
     // The scheme state in the spec ignores everything after the first `:`,
     // but `set_scheme` errors if there is more.
@@ -72,6 +73,7 @@
 }
 
 /// Setter for https://url.spec.whatwg.org/#dom-url-username
+#[allow(clippy::result_unit_err)]
 pub fn set_username(url: &mut Url, new_username: &str) -> Result<(), ()> {
     url.set_username(new_username)
 }
@@ -83,6 +85,7 @@
 }
 
 /// Setter for https://url.spec.whatwg.org/#dom-url-password
+#[allow(clippy::result_unit_err)]
 pub fn set_password(url: &mut Url, new_password: &str) -> Result<(), ()> {
     url.set_password(if new_password.is_empty() {
         None
@@ -98,6 +101,7 @@
 }
 
 /// Setter for https://url.spec.whatwg.org/#dom-url-host
+#[allow(clippy::result_unit_err)]
 pub fn set_host(url: &mut Url, new_host: &str) -> Result<(), ()> {
     // If context object’s url’s cannot-be-a-base-URL flag is set, then return.
     if url.cannot_be_a_base() {
@@ -154,6 +158,7 @@
 }
 
 /// Setter for https://url.spec.whatwg.org/#dom-url-hostname
+#[allow(clippy::result_unit_err)]
 pub fn set_hostname(url: &mut Url, new_hostname: &str) -> Result<(), ()> {
     if url.cannot_be_a_base() {
         return Err(());
@@ -195,6 +200,7 @@
 }
 
 /// Setter for https://url.spec.whatwg.org/#dom-url-port
+#[allow(clippy::result_unit_err)]
 pub fn set_port(url: &mut Url, new_port: &str) -> Result<(), ()> {
     let result;
     {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/tests/data.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/tests/data.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/tests/data.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/tests/data.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,233 @@
+// Copyright 2013-2014 The rust-url developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Data-driven tests
+
+use std::ops::Deref;
+use std::str::FromStr;
+
+use serde_json::Value;
+use url::{quirks, Url};
+
+#[test]
+fn urltestdata() {
+    // Copied form https://github.com/w3c/web-platform-tests/blob/master/url/
+    let mut json = Value::from_str(include_str!("urltestdata.json"))
+        .expect("JSON parse error in urltestdata.json");
+
+    let mut passed = true;
+    for entry in json.as_array_mut().unwrap() {
+        if entry.is_string() {
+            continue; // ignore comments
+        }
+
+        let base = entry.take_string("base");
+        let input = entry.take_string("input");
+        let failure = entry.take_key("failure").is_some();
+
+        let base = match Url::parse(&base) {
+            Ok(base) => base,
+            Err(_) if failure => continue,
+            Err(message) => {
+                eprint_failure(
+                    format!("  failed: error parsing base {:?}: {}", base, message),
+                    &format!("parse base for {:?}", input),
+                    None,
+                );
+                passed = false;
+                continue;
+            }
+        };
+
+        let url = match (base.join(&input), failure) {
+            (Ok(url), false) => url,
+            (Err(_), true) => continue,
+            (Err(message), false) => {
+                eprint_failure(
+                    format!("  failed: {}", message),
+                    &format!("parse URL for {:?}", input),
+                    None,
+                );
+                passed = false;
+                continue;
+            }
+            (Ok(_), true) => {
+                eprint_failure(
+                    format!("  failed: expected parse error for URL {:?}", input),
+                    &format!("parse URL for {:?}", input),
+                    None,
+                );
+                passed = false;
+                continue;
+            }
+        };
+
+        passed &= check_invariants(&url, &format!("invariants for {:?}", input), None);
+
+        for &attr in ATTRIBS {
+            passed &= test_eq_eprint(
+                entry.take_string(attr),
+                get(&url, attr),
+                &format!("{:?} - {}", input, attr),
+                None,
+            );
+        }
+
+        if let Some(expected_origin) = entry.take_key("origin").map(|s| s.string()) {
+            passed &= test_eq_eprint(
+                expected_origin,
+                &quirks::origin(&url),
+                &format!("origin for {:?}", input),
+                None,
+            );
+        }
+    }
+
+    assert!(passed)
+}
+
+#[allow(clippy::option_as_ref_deref)] // introduced in 1.40, MSRV is 1.36
+#[test]
+fn setters_tests() {
+    let mut json = Value::from_str(include_str!("setters_tests.json"))
+        .expect("JSON parse error in setters_tests.json");
+
+    let mut passed = true;
+    for &attr in ATTRIBS {
+        if attr == "href" {
+            continue;
+        }
+
+        let mut tests = json.take_key(attr).unwrap();
+        for mut test in tests.as_array_mut().unwrap().drain(..) {
+            let comment = test.take_key("comment").map(|s| s.string());
+            let href = test.take_string("href");
+            let new_value = test.take_string("new_value");
+            let name = format!("{:?}.{} = {:?}", href, attr, new_value);
+            let mut expected = test.take_key("expected").unwrap();
+
+            let mut url = Url::parse(&href).unwrap();
+            let comment_ref = comment.as_ref().map(|s| s.deref());
+            passed &= check_invariants(&url, &name, comment_ref);
+            let _ = set(&mut url, attr, &new_value);
+
+            for attr in ATTRIBS {
+                if let Some(value) = expected.take_key(attr) {
+                    passed &= test_eq_eprint(value.string(), get(&url, attr), &name, comment_ref);
+                };
+            }
+
+            passed &= check_invariants(&url, &name, comment_ref);
+        }
+    }
+
+    assert!(passed);
+}
+
+fn check_invariants(url: &Url, name: &str, comment: Option<&str>) -> bool {
+    let mut passed = true;
+    if let Err(e) = url.check_invariants() {
+        passed = false;
+        eprint_failure(
+            format!("  failed: invariants checked -> {:?}", e),
+            name,
+            comment,
+        );
+    }
+
+    #[cfg(feature = "serde")]
+    {
+        let bytes = serde_json::to_vec(url).unwrap();
+        let new_url: Url = serde_json::from_slice(&bytes).unwrap();
+        passed &= test_eq_eprint(url.to_string(), &new_url.to_string(), name, comment);
+    }
+
+    passed
+}
+
+trait JsonExt {
+    fn take_key(&mut self, key: &str) -> Option<Value>;
+    fn string(self) -> String;
+    fn take_string(&mut self, key: &str) -> String;
+}
+
+impl JsonExt for Value {
+    fn take_key(&mut self, key: &str) -> Option<Value> {
+        self.as_object_mut().unwrap().remove(key)
+    }
+
+    fn string(self) -> String {
+        if let Value::String(s) = self {
+            s
+        } else {
+            panic!("Not a Value::String")
+        }
+    }
+
+    fn take_string(&mut self, key: &str) -> String {
+        self.take_key(key).unwrap().string()
+    }
+}
+
+fn get<'a>(url: &'a Url, attr: &str) -> &'a str {
+    match attr {
+        "href" => quirks::href(url),
+        "protocol" => quirks::protocol(url),
+        "username" => quirks::username(url),
+        "password" => quirks::password(url),
+        "hostname" => quirks::hostname(url),
+        "host" => quirks::host(url),
+        "port" => quirks::port(url),
+        "pathname" => quirks::pathname(url),
+        "search" => quirks::search(url),
+        "hash" => quirks::hash(url),
+        _ => unreachable!(),
+    }
+}
+
+#[allow(clippy::unit_arg)]
+fn set<'a>(url: &'a mut Url, attr: &str, new: &str) {
+    let _ = match attr {
+        "protocol" => quirks::set_protocol(url, new),
+        "username" => quirks::set_username(url, new),
+        "password" => quirks::set_password(url, new),
+        "hostname" => quirks::set_hostname(url, new),
+        "host" => quirks::set_host(url, new),
+        "port" => quirks::set_port(url, new),
+        "pathname" => Ok(quirks::set_pathname(url, new)),
+        "search" => Ok(quirks::set_search(url, new)),
+        "hash" => Ok(quirks::set_hash(url, new)),
+        _ => unreachable!(),
+    };
+}
+
+fn test_eq_eprint(expected: String, actual: &str, name: &str, comment: Option<&str>) -> bool {
+    if expected == actual {
+        return true;
+    }
+    eprint_failure(
+        format!("expected: {}\n  actual: {}", expected, actual),
+        name,
+        comment,
+    );
+    false
+}
+
+fn eprint_failure(err: String, name: &str, comment: Option<&str>) {
+    eprintln!("    test: {}\n{}", name, err);
+    if let Some(comment) = comment {
+        eprintln!("{}\n", comment);
+    } else {
+        eprintln!();
+    }
+}
+
+const ATTRIBS: &[&str] = &[
+    "href", "protocol", "username", "password", "host", "hostname", "port", "pathname", "search",
+    "hash",
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/tests/setters_tests.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/tests/setters_tests.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/tests/setters_tests.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/tests/setters_tests.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1876 @@
+{
+    "comment": [
+        "AS OF https://github.com/jsdom/whatwg-url/commit/35f04dfd3048cf6362f4398745bb13375c5020c2",
+        "## Tests for setters of https://url.spec.whatwg.org/#urlutils-members",
+        "",
+        "This file contains a JSON object.",
+        "Other than 'comment', each key is an attribute of the `URL` interface",
+        "defined in WHATWG’s URL Standard.",
+        "The values are arrays of test case objects for that attribute.",
+        "",
+        "To run a test case for the attribute `attr`:",
+        "",
+        "* Create a new `URL` object with the value for the 'href' key",
+        "  the constructor single parameter. (Without a base URL.)",
+        "  This must not throw.",
+        "* Set the attribute `attr` to (invoke its setter with)",
+        "  with the value of for 'new_value' key.",
+        "* The value for the 'expected' key is another object.",
+        "  For each `key` / `value` pair of that object,",
+        "  get the attribute `key` (invoke its getter).",
+        "  The returned string must be equal to `value`.",
+        "",
+        "Note: the 'href' setter is already covered by urltestdata.json."
+    ],
+    "protocol": [
+        {
+            "comment": "The empty string is not a valid scheme. Setter leaves the URL unchanged.",
+            "href": "a://example.net",
+            "new_value": "",
+            "expected": {
+                "href": "a://example.net",
+                "protocol": "a:"
+            }
+        },
+        {
+            "href": "a://example.net",
+            "new_value": "b",
+            "expected": {
+                "href": "b://example.net",
+                "protocol": "b:"
+            }
+        },
+        {
+            "href": "javascript:alert(1)",
+            "new_value": "defuse",
+            "expected": {
+                "href": "defuse:alert(1)",
+                "protocol": "defuse:"
+            }
+        },
+        {
+            "comment": "Upper-case ASCII is lower-cased",
+            "href": "a://example.net",
+            "new_value": "B",
+            "expected": {
+                "href": "b://example.net",
+                "protocol": "b:"
+            }
+        },
+        {
+            "comment": "Non-ASCII is rejected",
+            "href": "a://example.net",
+            "new_value": "é",
+            "expected": {
+                "href": "a://example.net",
+                "protocol": "a:"
+            }
+        },
+        {
+            "comment": "No leading digit",
+            "href": "a://example.net",
+            "new_value": "0b",
+            "expected": {
+                "href": "a://example.net",
+                "protocol": "a:"
+            }
+        },
+        {
+            "comment": "No leading punctuation",
+            "href": "a://example.net",
+            "new_value": "+b",
+            "expected": {
+                "href": "a://example.net",
+                "protocol": "a:"
+            }
+        },
+        {
+            "href": "a://example.net",
+            "new_value": "bC0+-.",
+            "expected": {
+                "href": "bc0+-.://example.net",
+                "protocol": "bc0+-.:"
+            }
+        },
+        {
+            "comment": "Only some punctuation is acceptable",
+            "href": "a://example.net",
+            "new_value": "b,c",
+            "expected": {
+                "href": "a://example.net",
+                "protocol": "a:"
+            }
+        },
+        {
+            "comment": "Non-ASCII is rejected",
+            "href": "a://example.net",
+            "new_value": "bé",
+            "expected": {
+                "href": "a://example.net",
+                "protocol": "a:"
+            }
+        },
+        {
+            "comment": "Can’t switch from URL containing username/password/port to file",
+            "href": "http://test@example.net",
+            "new_value": "file",
+            "expected": {
+                "href": "http://test@example.net/",
+                "protocol": "http:"
+            }
+        },
+        {
+            "href": "gopher://example.net:1234",
+            "new_value": "file",
+            "expected": {
+                "href": "gopher://example.net:1234",
+                "protocol": "gopher:"
+            }
+        },
+        {
+            "href": "wss://x:x@example.net:1234",
+            "new_value": "file",
+            "expected": {
+                "href": "wss://x:x@example.net:1234/",
+                "protocol": "wss:"
+            }
+        },
+        {
+            "comment": "Can’t switch from file URL with no host",
+            "href": "file://localhost/",
+            "new_value": "http",
+            "expected": {
+                "href": "file:///",
+                "protocol": "file:"
+            }
+        },
+        {
+            "href": "file:///test",
+            "new_value": "gopher",
+            "expected": {
+                "href": "file:///test",
+                "protocol": "file:"
+            }
+        },
+        {
+            "href": "file:",
+            "new_value": "wss",
+            "expected": {
+                "href": "file:///",
+                "protocol": "file:"
+            }
+        },
+        {
+            "comment": "Can’t switch from special scheme to non-special",
+            "href": "http://example.net",
+            "new_value": "b",
+            "expected": {
+                "href": "http://example.net/",
+                "protocol": "http:"
+            }
+        },
+        {
+            "href": "file://hi/path",
+            "new_value": "s",
+            "expected": {
+                "href": "file://hi/path",
+                "protocol": "file:"
+            }
+        },
+        {
+            "href": "https://example.net",
+            "new_value": "s",
+            "expected": {
+                "href": "https://example.net/",
+                "protocol": "https:"
+            }
+        },
+        {
+            "href": "ftp://example.net",
+            "new_value": "test",
+            "expected": {
+                "href": "ftp://example.net/",
+                "protocol": "ftp:"
+            }
+        },
+        {
+            "comment": "Cannot-be-a-base URL doesn’t have a host, but URL in a special scheme must.",
+            "href": "mailto:me@example.net",
+            "new_value": "http",
+            "expected": {
+                "href": "mailto:me@example.net",
+                "protocol": "mailto:"
+            }
+        },
+        {
+            "comment": "Can’t switch from non-special scheme to special",
+            "href": "ssh://me@example.net",
+            "new_value": "http",
+            "expected": {
+                "href": "ssh://me@example.net",
+                "protocol": "ssh:"
+            }
+        },
+        {
+            "href": "ssh://me@example.net",
+            "new_value": "https",
+            "expected": {
+                "href": "ssh://me@example.net",
+                "protocol": "ssh:"
+            }
+        },
+        {
+            "href": "ssh://me@example.net",
+            "new_value": "file",
+            "expected": {
+                "href": "ssh://me@example.net",
+                "protocol": "ssh:"
+            }
+        },
+        {
+            "href": "ssh://example.net",
+            "new_value": "file",
+            "expected": {
+                "href": "ssh://example.net",
+                "protocol": "ssh:"
+            }
+        },
+        {
+            "href": "nonsense:///test",
+            "new_value": "https",
+            "expected": {
+                "href": "nonsense:///test",
+                "protocol": "nonsense:"
+            }
+        },
+        {
+            "comment": "Stuff after the first ':' is ignored",
+            "href": "http://example.net",
+            "new_value": "https:foo : bar",
+            "expected": {
+                "href": "https://example.net/",
+                "protocol": "https:"
+            }
+        },
+        {
+            "comment": "Stuff after the first ':' is ignored",
+            "href": "data:text/html,<p>Test",
+            "new_value": "view-source+data:foo : bar",
+            "expected": {
+                "href": "view-source+data:text/html,<p>Test",
+                "protocol": "view-source+data:"
+            }
+        },
+        {
+            "comment": "Port is set to null if it is the default for new scheme.",
+            "href": "http://foo.com:443/",
+            "new_value": "https",
+            "expected": {
+                "href": "https://foo.com/",
+                "protocol": "https:",
+                "port": ""
+            }
+        }
+    ],
+    "username": [
+        {
+            "comment": "No host means no username",
+            "href": "file:///home/you/index.html",
+            "new_value": "me",
+            "expected": {
+                "href": "file:///home/you/index.html",
+                "username": ""
+            }
+        },
+        {
+            "comment": "No host means no username",
+            "href": "unix:/run/foo.socket",
+            "new_value": "me",
+            "expected": {
+                "href": "unix:/run/foo.socket",
+                "username": ""
+            }
+        },
+        {
+            "comment": "Cannot-be-a-base means no username",
+            "href": "mailto:you@example.net",
+            "new_value": "me",
+            "expected": {
+                "href": "mailto:you@example.net",
+                "username": ""
+            }
+        },
+        {
+            "href": "javascript:alert(1)",
+            "new_value": "wario",
+            "expected": {
+                "href": "javascript:alert(1)",
+                "username": ""
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "me",
+            "expected": {
+                "href": "http://me@example.net/",
+                "username": "me"
+            }
+        },
+        {
+            "href": "http://:secret@example.net",
+            "new_value": "me",
+            "expected": {
+                "href": "http://me:secret@example.net/",
+                "username": "me"
+            }
+        },
+        {
+            "href": "http://me@example.net",
+            "new_value": "",
+            "expected": {
+                "href": "http://example.net/",
+                "username": ""
+            }
+        },
+        {
+            "href": "http://me:secret@example.net",
+            "new_value": "",
+            "expected": {
+                "href": "http://:secret@example.net/",
+                "username": ""
+            }
+        },
+        {
+            "comment": "UTF-8 percent encoding with the userinfo encode set.",
+            "href": "http://example.net",
+            "new_value": "\u0000\u0001\t\n\r\u001f !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~\u007f\u0080\u0081Éé",
+            "expected": {
+                "href": "http://%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/",
+                "username": "%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9"
+            }
+        },
+        {
+            "comment": "Bytes already percent-encoded are left as-is.",
+            "href": "http://example.net",
+            "new_value": "%c3%89té",
+            "expected": {
+                "href": "http://%c3%89t%C3%A9@example.net/",
+                "username": "%c3%89t%C3%A9"
+            }
+        },
+        {
+            "href": "sc:///",
+            "new_value": "x",
+            "expected": {
+                "href": "sc:///",
+                "username": ""
+            }
+        },
+        {
+            "href": "javascript://x/",
+            "new_value": "wario",
+            "expected": {
+                "href": "javascript://wario@x/",
+                "username": "wario"
+            }
+        },
+        {
+            "href": "file://test/",
+            "new_value": "test",
+            "expected": {
+                "href": "file://test/",
+                "username": ""
+            }
+        }
+    ],
+    "password": [
+        {
+            "comment": "No host means no password",
+            "href": "file:///home/me/index.html",
+            "new_value": "secret",
+            "expected": {
+                "href": "file:///home/me/index.html",
+                "password": ""
+            }
+        },
+        {
+            "comment": "No host means no password",
+            "href": "unix:/run/foo.socket",
+            "new_value": "secret",
+            "expected": {
+                "href": "unix:/run/foo.socket",
+                "password": ""
+            }
+        },
+        {
+            "comment": "Cannot-be-a-base means no password",
+            "href": "mailto:me@example.net",
+            "new_value": "secret",
+            "expected": {
+                "href": "mailto:me@example.net",
+                "password": ""
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "secret",
+            "expected": {
+                "href": "http://:secret@example.net/",
+                "password": "secret"
+            }
+        },
+        {
+            "href": "http://me@example.net",
+            "new_value": "secret",
+            "expected": {
+                "href": "http://me:secret@example.net/",
+                "password": "secret"
+            }
+        },
+        {
+            "href": "http://:secret@example.net",
+            "new_value": "",
+            "expected": {
+                "href": "http://example.net/",
+                "password": ""
+            }
+        },
+        {
+            "href": "http://me:secret@example.net",
+            "new_value": "",
+            "expected": {
+                "href": "http://me@example.net/",
+                "password": ""
+            }
+        },
+        {
+            "comment": "UTF-8 percent encoding with the userinfo encode set.",
+            "href": "http://example.net",
+            "new_value": "\u0000\u0001\t\n\r\u001f !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~\u007f\u0080\u0081Éé",
+            "expected": {
+                "href": "http://:%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/",
+                "password": "%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9"
+            }
+        },
+        {
+            "comment": "Bytes already percent-encoded are left as-is.",
+            "href": "http://example.net",
+            "new_value": "%c3%89té",
+            "expected": {
+                "href": "http://:%c3%89t%C3%A9@example.net/",
+                "password": "%c3%89t%C3%A9"
+            }
+        },
+        {
+            "href": "sc:///",
+            "new_value": "x",
+            "expected": {
+                "href": "sc:///",
+                "password": ""
+            }
+        },
+        {
+            "href": "javascript://x/",
+            "new_value": "bowser",
+            "expected": {
+                "href": "javascript://:bowser@x/",
+                "password": "bowser"
+            }
+        },
+        {
+            "href": "file://test/",
+            "new_value": "test",
+            "expected": {
+                "href": "file://test/",
+                "password": ""
+            }
+        }
+    ],
+    "host": [
+        {
+            "comment": "Non-special scheme",
+            "href": "sc://x/",
+            "new_value": "\u0000",
+            "expected": {
+                "href": "sc://x/",
+                "host": "x",
+                "hostname": "x"
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "\u0009",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "\u000A",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "\u000D",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": " ",
+            "expected": {
+                "href": "sc://x/",
+                "host": "x",
+                "hostname": "x"
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "#",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "/",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "?",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "@",
+            "expected": {
+                "href": "sc://x/",
+                "host": "x",
+                "hostname": "x"
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "ß",
+            "expected": {
+                "href": "sc://%C3%9F/",
+                "host": "%C3%9F",
+                "hostname": "%C3%9F"
+            }
+        },
+        {
+            "comment": "IDNA Nontransitional_Processing",
+            "href": "https://x/",
+            "new_value": "ß",
+            "expected": {
+                "href": "https://xn--zca/",
+                "host": "xn--zca",
+                "hostname": "xn--zca"
+            }
+        },
+        {
+            "comment": "Cannot-be-a-base means no host",
+            "href": "mailto:me@example.net",
+            "new_value": "example.com",
+            "expected": {
+                "href": "mailto:me@example.net",
+                "host": ""
+            }
+        },
+        {
+            "comment": "Cannot-be-a-base means no host",
+            "href": "data:text/plain,Stuff",
+            "new_value": "example.net",
+            "expected": {
+                "href": "data:text/plain,Stuff",
+                "host": ""
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "example.com:8080",
+            "expected": {
+                "href": "http://example.com:8080/",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Port number is unchanged if not specified in the new value",
+            "href": "http://example.net:8080",
+            "new_value": "example.com",
+            "expected": {
+                "href": "http://example.com:8080/",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Port number is unchanged if not specified",
+            "href": "http://example.net:8080",
+            "new_value": "example.com:",
+            "expected": {
+                "href": "http://example.com:8080/",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "The empty host is not valid for special schemes",
+            "href": "http://example.net",
+            "new_value": "",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net"
+            }
+        },
+        {
+            "comment": "The empty host is OK for non-special schemes",
+            "href": "view-source+http://example.net/foo",
+            "new_value": "",
+            "expected": {
+                "href": "view-source+http:///foo",
+                "host": ""
+            }
+        },
+        {
+            "comment": "Path-only URLs can gain a host",
+            "href": "a:/foo",
+            "new_value": "example.net",
+            "expected": {
+                "href": "a://example.net/foo",
+                "host": "example.net"
+            }
+        },
+        {
+            "comment": "IPv4 address syntax is normalized",
+            "href": "http://example.net",
+            "new_value": "0x7F000001:8080",
+            "expected": {
+                "href": "http://127.0.0.1:8080/",
+                "host": "127.0.0.1:8080",
+                "hostname": "127.0.0.1",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "IPv6 address syntax is normalized",
+            "href": "http://example.net",
+            "new_value": "[::0:01]:2",
+            "expected": {
+                "href": "http://[::1]:2/",
+                "host": "[::1]:2",
+                "hostname": "[::1]",
+                "port": "2"
+            }
+        },
+        {
+            "comment": "IPv6 literal address with port, crbug.com/1012416",
+            "href": "http://example.net",
+            "new_value": "[2001:db8::2]:4002",
+            "expected": {
+                "href": "http://[2001:db8::2]:4002/",
+                "host": "[2001:db8::2]:4002",
+                "hostname": "[2001:db8::2]",
+                "port": "4002"
+             }
+        },
+        {
+            "comment": "Default port number is removed",
+            "href": "http://example.net",
+            "new_value": "example.com:80",
+            "expected": {
+                "href": "http://example.com/",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Default port number is removed",
+            "href": "https://example.net",
+            "new_value": "example.com:443",
+            "expected": {
+                "href": "https://example.com/",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Default port number is only removed for the relevant scheme",
+            "href": "https://example.net",
+            "new_value": "example.com:80",
+            "expected": {
+                "href": "https://example.com:80/",
+                "host": "example.com:80",
+                "hostname": "example.com",
+                "port": "80"
+            }
+        },
+        {
+            "comment": "Port number is removed if new port is scheme default and existing URL has a non-default port",
+            "href": "http://example.net:8080",
+            "new_value": "example.com:80",
+            "expected": {
+                "href": "http://example.com/",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a / delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com/stuff",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a / delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com:8080/stuff",
+            "expected": {
+                "href": "http://example.com:8080/path",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Stuff after a ? delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com?stuff",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a ? delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com:8080?stuff",
+            "expected": {
+                "href": "http://example.com:8080/path",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Stuff after a # delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com#stuff",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a # delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com:8080#stuff",
+            "expected": {
+                "href": "http://example.com:8080/path",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Stuff after a \\ delimiter is ignored for special schemes",
+            "href": "http://example.net/path",
+            "new_value": "example.com\\stuff",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a \\ delimiter is ignored for special schemes",
+            "href": "http://example.net/path",
+            "new_value": "example.com:8080\\stuff",
+            "expected": {
+                "href": "http://example.com:8080/path",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "\\ is not a delimiter for non-special schemes, but still forbidden in hosts",
+            "href": "view-source+http://example.net/path",
+            "new_value": "example.com\\stuff",
+            "expected": {
+                "href": "view-source+http://example.net/path",
+                "host": "example.net",
+                "hostname": "example.net",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Anything other than ASCII digit stops the port parser in a setter but is not an error",
+            "href": "view-source+http://example.net/path",
+            "new_value": "example.com:8080stuff2",
+            "expected": {
+                "href": "view-source+http://example.com:8080/path",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Anything other than ASCII digit stops the port parser in a setter but is not an error",
+            "href": "http://example.net/path",
+            "new_value": "example.com:8080stuff2",
+            "expected": {
+                "href": "http://example.com:8080/path",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Anything other than ASCII digit stops the port parser in a setter but is not an error",
+            "href": "http://example.net/path",
+            "new_value": "example.com:8080+2",
+            "expected": {
+                "href": "http://example.com:8080/path",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Port numbers are 16 bit integers",
+            "href": "http://example.net/path",
+            "new_value": "example.com:65535",
+            "expected": {
+                "href": "http://example.com:65535/path",
+                "host": "example.com:65535",
+                "hostname": "example.com",
+                "port": "65535"
+            }
+        },
+        {
+            "comment": "Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though.",
+            "href": "http://example.net/path",
+            "new_value": "example.com:65536",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Broken IPv6",
+            "href": "http://example.net/",
+            "new_value": "[google.com]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "http://example.net/",
+            "new_value": "[::1.2.3.4x]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "http://example.net/",
+            "new_value": "[::1.2.3.]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "http://example.net/",
+            "new_value": "[::1.2.]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "http://example.net/",
+            "new_value": "[::1.]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "file://y/",
+            "new_value": "x:123",
+            "expected": {
+                "href": "file://y/",
+                "host": "y",
+                "hostname": "y",
+                "port": ""
+            }
+        },
+        {
+            "href": "file://y/",
+            "new_value": "loc%41lhost",
+            "expected": {
+                "href": "file:///",
+                "host": "",
+                "hostname": "",
+                "port": ""
+            }
+        },
+        {
+            "href": "sc://test@test/",
+            "new_value": "",
+            "expected": {
+                "href": "sc://test@test/",
+                "host": "test",
+                "hostname": "test",
+                "username": "test"
+            }
+        },
+        {
+            "href": "sc://test:12/",
+            "new_value": "",
+            "expected": {
+                "href": "sc://test:12/",
+                "host": "test:12",
+                "hostname": "test",
+                "port": "12"
+            }
+        }
+    ],
+    "hostname": [
+        {
+            "comment": "Non-special scheme",
+            "href": "sc://x/",
+            "new_value": "\u0000",
+            "expected": {
+                "href": "sc://x/",
+                "host": "x",
+                "hostname": "x"
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "\u0009",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "\u000A",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "\u000D",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": " ",
+            "expected": {
+                "href": "sc://x/",
+                "host": "x",
+                "hostname": "x"
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "#",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "/",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "?",
+            "expected": {
+                "href": "sc:///",
+                "host": "",
+                "hostname": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "@",
+            "expected": {
+                "href": "sc://x/",
+                "host": "x",
+                "hostname": "x"
+            }
+        },
+        {
+            "comment": "Cannot-be-a-base means no host",
+            "href": "mailto:me@example.net",
+            "new_value": "example.com",
+            "expected": {
+                "href": "mailto:me@example.net",
+                "host": ""
+            }
+        },
+        {
+            "comment": "Cannot-be-a-base means no host",
+            "href": "data:text/plain,Stuff",
+            "new_value": "example.net",
+            "expected": {
+                "href": "data:text/plain,Stuff",
+                "host": ""
+            }
+        },
+        {
+            "href": "http://example.net:8080",
+            "new_value": "example.com",
+            "expected": {
+                "href": "http://example.com:8080/",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "The empty host is not valid for special schemes",
+            "href": "http://example.net",
+            "new_value": "",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net"
+            }
+        },
+        {
+            "comment": "The empty host is OK for non-special schemes",
+            "href": "view-source+http://example.net/foo",
+            "new_value": "",
+            "expected": {
+                "href": "view-source+http:///foo",
+                "host": ""
+            }
+        },
+        {
+            "comment": "Path-only URLs can gain a host",
+            "href": "a:/foo",
+            "new_value": "example.net",
+            "expected": {
+                "href": "a://example.net/foo",
+                "host": "example.net"
+            }
+        },
+        {
+            "comment": "IPv4 address syntax is normalized",
+            "href": "http://example.net:8080",
+            "new_value": "0x7F000001",
+            "expected": {
+                "href": "http://127.0.0.1:8080/",
+                "host": "127.0.0.1:8080",
+                "hostname": "127.0.0.1",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "IPv6 address syntax is normalized",
+            "href": "http://example.net",
+            "new_value": "[::0:01]",
+            "expected": {
+                "href": "http://[::1]/",
+                "host": "[::1]",
+                "hostname": "[::1]",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a : delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com:8080",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a : delimiter is ignored",
+            "href": "http://example.net:8080/path",
+            "new_value": "example.com:",
+            "expected": {
+                "href": "http://example.com:8080/path",
+                "host": "example.com:8080",
+                "hostname": "example.com",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Stuff after a / delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com/stuff",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a ? delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com?stuff",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a # delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "example.com#stuff",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Stuff after a \\ delimiter is ignored for special schemes",
+            "href": "http://example.net/path",
+            "new_value": "example.com\\stuff",
+            "expected": {
+                "href": "http://example.com/path",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
+        {
+            "comment": "\\ is not a delimiter for non-special schemes, but still forbidden in hosts",
+            "href": "view-source+http://example.net/path",
+            "new_value": "example.com\\stuff",
+            "expected": {
+                "href": "view-source+http://example.net/path",
+                "host": "example.net",
+                "hostname": "example.net",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Broken IPv6",
+            "href": "http://example.net/",
+            "new_value": "[google.com]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "http://example.net/",
+            "new_value": "[::1.2.3.4x]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "http://example.net/",
+            "new_value": "[::1.2.3.]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "http://example.net/",
+            "new_value": "[::1.2.]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "http://example.net/",
+            "new_value": "[::1.]",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net"
+            }
+        },
+        {
+            "href": "file://y/",
+            "new_value": "x:123",
+            "expected": {
+                "href": "file://y/",
+                "host": "y",
+                "hostname": "y",
+                "port": ""
+            }
+        },
+        {
+            "href": "file://y/",
+            "new_value": "loc%41lhost",
+            "expected": {
+                "href": "file:///",
+                "host": "",
+                "hostname": "",
+                "port": ""
+            }
+        },
+        {
+            "href": "sc://test@test/",
+            "new_value": "",
+            "expected": {
+                "href": "sc://test@test/",
+                "host": "test",
+                "hostname": "test",
+                "username": "test"
+            }
+        },
+        {
+            "href": "sc://test:12/",
+            "new_value": "",
+            "expected": {
+                "href": "sc://test:12/",
+                "host": "test:12",
+                "hostname": "test",
+                "port": "12"
+            }
+        }
+    ],
+    "port": [
+        {
+            "href": "http://example.net",
+            "new_value": "8080",
+            "expected": {
+                "href": "http://example.net:8080/",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Port number is removed if empty is the new value",
+            "href": "http://example.net:8080",
+            "new_value": "",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Default port number is removed",
+            "href": "http://example.net:8080",
+            "new_value": "80",
+            "expected": {
+                "href": "http://example.net/",
+                "host": "example.net",
+                "hostname": "example.net",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Default port number is removed",
+            "href": "https://example.net:4433",
+            "new_value": "443",
+            "expected": {
+                "href": "https://example.net/",
+                "host": "example.net",
+                "hostname": "example.net",
+                "port": ""
+            }
+        },
+        {
+            "comment": "Default port number is only removed for the relevant scheme",
+            "href": "https://example.net",
+            "new_value": "80",
+            "expected": {
+                "href": "https://example.net:80/",
+                "host": "example.net:80",
+                "hostname": "example.net",
+                "port": "80"
+            }
+        },
+        {
+            "comment": "Stuff after a / delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "8080/stuff",
+            "expected": {
+                "href": "http://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Stuff after a ? delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "8080?stuff",
+            "expected": {
+                "href": "http://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Stuff after a # delimiter is ignored",
+            "href": "http://example.net/path",
+            "new_value": "8080#stuff",
+            "expected": {
+                "href": "http://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Stuff after a \\ delimiter is ignored for special schemes",
+            "href": "http://example.net/path",
+            "new_value": "8080\\stuff",
+            "expected": {
+                "href": "http://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Anything other than ASCII digit stops the port parser in a setter but is not an error",
+            "href": "view-source+http://example.net/path",
+            "new_value": "8080stuff2",
+            "expected": {
+                "href": "view-source+http://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Anything other than ASCII digit stops the port parser in a setter but is not an error",
+            "href": "http://example.net/path",
+            "new_value": "8080stuff2",
+            "expected": {
+                "href": "http://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Anything other than ASCII digit stops the port parser in a setter but is not an error",
+            "href": "http://example.net/path",
+            "new_value": "8080+2",
+            "expected": {
+                "href": "http://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Port numbers are 16 bit integers",
+            "href": "http://example.net/path",
+            "new_value": "65535",
+            "expected": {
+                "href": "http://example.net:65535/path",
+                "host": "example.net:65535",
+                "hostname": "example.net",
+                "port": "65535"
+            }
+        },
+        {
+            "comment": "Port numbers are 16 bit integers, overflowing is an error",
+            "href": "http://example.net:8080/path",
+            "new_value": "65536",
+            "expected": {
+                "href": "http://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "comment": "Port numbers are 16 bit integers, overflowing is an error",
+            "href": "non-special://example.net:8080/path",
+            "new_value": "65536",
+            "expected": {
+                "href": "non-special://example.net:8080/path",
+                "host": "example.net:8080",
+                "hostname": "example.net",
+                "port": "8080"
+            }
+        },
+        {
+            "href": "file://test/",
+            "new_value": "12",
+            "expected": {
+                "href": "file://test/",
+                "port": ""
+            }
+        },
+        {
+            "href": "file://localhost/",
+            "new_value": "12",
+            "expected": {
+                "href": "file:///",
+                "port": ""
+            }
+        },
+        {
+            "href": "non-base:value",
+            "new_value": "12",
+            "expected": {
+                "href": "non-base:value",
+                "port": ""
+            }
+        },
+        {
+            "href": "sc:///",
+            "new_value": "12",
+            "expected": {
+                "href": "sc:///",
+                "port": ""
+            }
+        },
+        {
+            "href": "sc://x/",
+            "new_value": "12",
+            "expected": {
+                "href": "sc://x:12/",
+                "port": "12"
+            }
+        },
+        {
+            "href": "javascript://x/",
+            "new_value": "12",
+            "expected": {
+                "href": "javascript://x:12/",
+                "port": "12"
+            }
+        }
+    ],
+    "pathname": [
+        {
+            "comment": "Cannot-be-a-base don’t have a path",
+            "href": "mailto:me@example.net",
+            "new_value": "/foo",
+            "expected": {
+                "href": "mailto:me@example.net",
+                "pathname": "me@example.net"
+            }
+        },
+        {
+            "href": "unix:/run/foo.socket?timeout=10",
+            "new_value": "/var/log/../run/bar.socket",
+            "expected": {
+                "href": "unix:/var/run/bar.socket?timeout=10",
+                "pathname": "/var/run/bar.socket"
+            }
+        },
+        {
+            "href": "https://example.net#nav",
+            "new_value": "home",
+            "expected": {
+                "href": "https://example.net/home#nav",
+                "pathname": "/home"
+            }
+        },
+        {
+            "href": "https://example.net#nav",
+            "new_value": "../home",
+            "expected": {
+                "href": "https://example.net/home#nav",
+                "pathname": "/home"
+            }
+        },
+        {
+            "comment": "\\ is a segment delimiter for 'special' URLs",
+            "href": "http://example.net/home?lang=fr#nav",
+            "new_value": "\\a\\%2E\\b\\%2e.\\c",
+            "expected": {
+                "href": "http://example.net/a/c?lang=fr#nav",
+                "pathname": "/a/c"
+            }
+        },
+        {
+            "comment": "\\ is *not* a segment delimiter for non-'special' URLs",
+            "href": "view-source+http://example.net/home?lang=fr#nav",
+            "new_value": "\\a\\%2E\\b\\%2e.\\c",
+            "expected": {
+                "href": "view-source+http://example.net/\\a\\%2E\\b\\%2e.\\c?lang=fr#nav",
+                "pathname": "/\\a\\%2E\\b\\%2e.\\c"
+            }
+        },
+        {
+            "comment": "UTF-8 percent encoding with the default encode set. Tabs and newlines are removed.",
+            "href": "a:/",
+            "new_value": "\u0000\u0001\t\n\r\u001f !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~\u007f\u0080\u0081Éé",
+            "expected": {
+                "href": "a:/%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E%3F@AZ[\\]^_%60az%7B|%7D~%7F%C2%80%C2%81%C3%89%C3%A9",
+                "pathname": "/%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E%3F@AZ[\\]^_%60az%7B|%7D~%7F%C2%80%C2%81%C3%89%C3%A9"
+            }
+        },
+        {
+            "comment": "Bytes already percent-encoded are left as-is, including %2E outside dotted segments.",
+            "href": "http://example.net",
+            "new_value": "%2e%2E%c3%89té",
+            "expected": {
+                "href": "http://example.net/%2e%2E%c3%89t%C3%A9",
+                "pathname": "/%2e%2E%c3%89t%C3%A9"
+            }
+        },
+        {
+            "comment": "? needs to be encoded",
+            "href": "http://example.net",
+            "new_value": "?",
+            "expected": {
+                "href": "http://example.net/%3F",
+                "pathname": "/%3F"
+            }
+        },
+        {
+            "comment": "# needs to be encoded",
+            "href": "http://example.net",
+            "new_value": "#",
+            "expected": {
+                "href": "http://example.net/%23",
+                "pathname": "/%23"
+            }
+        },
+        {
+            "comment": "? needs to be encoded, non-special scheme",
+            "href": "sc://example.net",
+            "new_value": "?",
+            "expected": {
+                "href": "sc://example.net/%3F",
+                "pathname": "/%3F"
+            }
+        },
+        {
+            "comment": "# needs to be encoded, non-special scheme",
+            "href": "sc://example.net",
+            "new_value": "#",
+            "expected": {
+                "href": "sc://example.net/%23",
+                "pathname": "/%23"
+            }
+        },
+        {
+            "comment": "File URLs and (back)slashes",
+            "href": "file://monkey/",
+            "new_value": "\\\\",
+            "expected": {
+                "href": "file://monkey/",
+                "pathname": "/"
+            }
+        },
+        {
+            "comment": "File URLs and (back)slashes",
+            "href": "file:///unicorn",
+            "new_value": "//\\/",
+            "expected": {
+                "href": "file:///",
+                "pathname": "/"
+            }
+        },
+        {
+            "comment": "File URLs and (back)slashes",
+            "href": "file:///unicorn",
+            "new_value": "//monkey/..//",
+            "expected": {
+                "href": "file:///",
+                "pathname": "/"
+            }
+        }
+    ],
+    "search": [
+        {
+            "href": "https://example.net#nav",
+            "new_value": "lang=fr",
+            "expected": {
+                "href": "https://example.net/?lang=fr#nav",
+                "search": "?lang=fr"
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US#nav",
+            "new_value": "lang=fr",
+            "expected": {
+                "href": "https://example.net/?lang=fr#nav",
+                "search": "?lang=fr"
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US#nav",
+            "new_value": "?lang=fr",
+            "expected": {
+                "href": "https://example.net/?lang=fr#nav",
+                "search": "?lang=fr"
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US#nav",
+            "new_value": "??lang=fr",
+            "expected": {
+                "href": "https://example.net/??lang=fr#nav",
+                "search": "??lang=fr"
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US#nav",
+            "new_value": "?",
+            "expected": {
+                "href": "https://example.net/?#nav",
+                "search": ""
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US#nav",
+            "new_value": "",
+            "expected": {
+                "href": "https://example.net/#nav",
+                "search": ""
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US",
+            "new_value": "",
+            "expected": {
+                "href": "https://example.net/",
+                "search": ""
+            }
+        },
+        {
+            "href": "https://example.net",
+            "new_value": "",
+            "expected": {
+                "href": "https://example.net/",
+                "search": ""
+            }
+        },
+        {
+            "comment": "UTF-8 percent encoding with the query encode set. Tabs and newlines are removed.",
+            "href": "a:/",
+            "new_value": "\u0000\u0001\t\n\r\u001f !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~\u007f\u0080\u0081Éé",
+            "expected": {
+                "href": "a:/?%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9",
+                "search": "?%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9"
+            }
+        },
+        {
+            "comment": "Bytes already percent-encoded are left as-is",
+            "href": "http://example.net",
+            "new_value": "%c3%89té",
+            "expected": {
+                "href": "http://example.net/?%c3%89t%C3%A9",
+                "search": "?%c3%89t%C3%A9"
+            }
+        }
+    ],
+    "hash": [
+        {
+            "href": "https://example.net",
+            "new_value": "main",
+            "expected": {
+                "href": "https://example.net/#main",
+                "hash": "#main"
+            }
+        },
+        {
+            "href": "https://example.net#nav",
+            "new_value": "main",
+            "expected": {
+                "href": "https://example.net/#main",
+                "hash": "#main"
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US",
+            "new_value": "##nav",
+            "expected": {
+                "href": "https://example.net/?lang=en-US##nav",
+                "hash": "##nav"
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US#nav",
+            "new_value": "#main",
+            "expected": {
+                "href": "https://example.net/?lang=en-US#main",
+                "hash": "#main"
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US#nav",
+            "new_value": "#",
+            "expected": {
+                "href": "https://example.net/?lang=en-US#",
+                "hash": ""
+            }
+        },
+        {
+            "href": "https://example.net?lang=en-US#nav",
+            "new_value": "",
+            "expected": {
+                "href": "https://example.net/?lang=en-US",
+                "hash": ""
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo bar",
+            "expected": {
+                "href": "http://example.net/#foo%20bar",
+                "hash": "#foo%20bar"
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo\"bar",
+            "expected": {
+                "href": "http://example.net/#foo%22bar",
+                "hash": "#foo%22bar"
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo<bar",
+            "expected": {
+                "href": "http://example.net/#foo%3Cbar",
+                "hash": "#foo%3Cbar"
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo>bar",
+            "expected": {
+                "href": "http://example.net/#foo%3Ebar",
+                "hash": "#foo%3Ebar"
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo`bar",
+            "expected": {
+                "href": "http://example.net/#foo%60bar",
+                "hash": "#foo%60bar"
+            }
+        },
+        {
+            "comment": "Simple percent-encoding; tabs and newlines are removed",
+            "href": "a:/",
+            "new_value": "\u0000\u0001\t\n\r\u001f !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~\u007f\u0080\u0081Éé",
+            "expected": {
+                "href": "a:/#%00%01%1F%20!%22#$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_%60az{|}~%7F%C2%80%C2%81%C3%89%C3%A9",
+                "hash": "#%00%01%1F%20!%22#$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_%60az{|}~%7F%C2%80%C2%81%C3%89%C3%A9"
+            }
+        },
+        {
+            "comment": "Percent-encode NULLs in fragment",
+            "href": "http://example.net",
+            "new_value": "a\u0000b",
+            "expected": {
+                "href": "http://example.net/#a%00b",
+                "hash": "#a%00b"
+            }
+        },
+        {
+            "comment": "Percent-encode NULLs in fragment",
+            "href": "non-spec:/",
+            "new_value": "a\u0000b",
+            "expected": {
+                "href": "non-spec:/#a%00b",
+                "hash": "#a%00b"
+            }
+        },
+        {
+            "comment": "Bytes already percent-encoded are left as-is",
+            "href": "http://example.net",
+            "new_value": "%c3%89té",
+            "expected": {
+                "href": "http://example.net/#%c3%89t%C3%A9",
+                "hash": "#%c3%89t%C3%A9"
+            }
+        },
+        {
+            "href": "javascript:alert(1)",
+            "new_value": "castle",
+            "expected": {
+                "href": "javascript:alert(1)#castle",
+                "hash": "#castle"
+            }
+        }
+    ]
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/tests/unit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/tests/unit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/tests/unit.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/tests/unit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1118 @@
+// Copyright 2013-2014 The rust-url developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Unit tests
+
+use std::borrow::Cow;
+use std::cell::{Cell, RefCell};
+use std::net::{Ipv4Addr, Ipv6Addr};
+use std::path::{Path, PathBuf};
+use url::{form_urlencoded, Host, Origin, Url};
+
+#[test]
+fn size() {
+    use std::mem::size_of;
+    assert_eq!(size_of::<Url>(), size_of::<Option<Url>>());
+}
+
+#[test]
+fn test_relative() {
+    let base: Url = "sc://%C3%B1".parse().unwrap();
+    let url = base.join("/resources/testharness.js").unwrap();
+    assert_eq!(url.as_str(), "sc://%C3%B1/resources/testharness.js");
+}
+
+#[test]
+fn test_relative_empty() {
+    let base: Url = "sc://%C3%B1".parse().unwrap();
+    let url = base.join("").unwrap();
+    assert_eq!(url.as_str(), "sc://%C3%B1");
+}
+
+#[test]
+fn test_set_empty_host() {
+    let mut base: Url = "moz://foo:bar@servo/baz".parse().unwrap();
+    base.set_username("").unwrap();
+    assert_eq!(base.as_str(), "moz://:bar@servo/baz");
+    base.set_host(None).unwrap();
+    assert_eq!(base.as_str(), "moz:/baz");
+    base.set_host(Some("servo")).unwrap();
+    assert_eq!(base.as_str(), "moz://servo/baz");
+}
+
+#[test]
+fn test_set_empty_hostname() {
+    use url::quirks;
+    let mut base: Url = "moz://foo@servo/baz".parse().unwrap();
+    assert!(
+        quirks::set_hostname(&mut base, "").is_err(),
+        "setting an empty hostname to a url with a username should fail"
+    );
+    base = "moz://:pass@servo/baz".parse().unwrap();
+    assert!(
+        quirks::set_hostname(&mut base, "").is_err(),
+        "setting an empty hostname to a url with a password should fail"
+    );
+    base = "moz://servo/baz".parse().unwrap();
+    quirks::set_hostname(&mut base, "").unwrap();
+    assert_eq!(base.as_str(), "moz:///baz");
+}
+
+macro_rules! assert_from_file_path {
+    ($path: expr) => {
+        assert_from_file_path!($path, $path)
+    };
+    ($path: expr, $url_path: expr) => {{
+        let url = Url::from_file_path(Path::new($path)).unwrap();
+        assert_eq!(url.host(), None);
+        assert_eq!(url.path(), $url_path);
+        assert_eq!(url.to_file_path(), Ok(PathBuf::from($path)));
+    }};
+}
+
+#[test]
+fn new_file_paths() {
+    if cfg!(unix) {
+        assert_eq!(Url::from_file_path(Path::new("relative")), Err(()));
+        assert_eq!(Url::from_file_path(Path::new("../relative")), Err(()));
+    }
+    if cfg!(windows) {
+        assert_eq!(Url::from_file_path(Path::new("relative")), Err(()));
+        assert_eq!(Url::from_file_path(Path::new(r"..\relative")), Err(()));
+        assert_eq!(Url::from_file_path(Path::new(r"\drive-relative")), Err(()));
+        assert_eq!(Url::from_file_path(Path::new(r"\\ucn\")), Err(()));
+    }
+
+    if cfg!(unix) {
+        assert_from_file_path!("/foo/bar");
+        assert_from_file_path!("/foo/ba\0r", "/foo/ba%00r");
+        assert_from_file_path!("/foo/ba%00r", "/foo/ba%2500r");
+    }
+}
+
+#[test]
+#[cfg(unix)]
+fn new_path_bad_utf8() {
+    use std::ffi::OsStr;
+    use std::os::unix::prelude::*;
+
+    let url = Url::from_file_path(Path::new(OsStr::from_bytes(b"/foo/ba\x80r"))).unwrap();
+    let os_str = OsStr::from_bytes(b"/foo/ba\x80r");
+    assert_eq!(url.to_file_path(), Ok(PathBuf::from(os_str)));
+}
+
+#[test]
+fn new_path_windows_fun() {
+    if cfg!(windows) {
+        assert_from_file_path!(r"C:\foo\bar", "/C:/foo/bar");
+        assert_from_file_path!("C:\\foo\\ba\0r", "/C:/foo/ba%00r");
+
+        // Invalid UTF-8
+        assert!(Url::parse("file:///C:/foo/ba%80r")
+            .unwrap()
+            .to_file_path()
+            .is_err());
+
+        // test windows canonicalized path
+        let path = PathBuf::from(r"\\?\C:\foo\bar");
+        assert!(Url::from_file_path(path).is_ok());
+
+        // Percent-encoded drive letter
+        let url = Url::parse("file:///C%3A/foo/bar").unwrap();
+        assert_eq!(url.to_file_path(), Ok(PathBuf::from(r"C:\foo\bar")));
+    }
+}
+
+#[test]
+fn new_directory_paths() {
+    if cfg!(unix) {
+        assert_eq!(Url::from_directory_path(Path::new("relative")), Err(()));
+        assert_eq!(Url::from_directory_path(Path::new("../relative")), Err(()));
+
+        let url = Url::from_directory_path(Path::new("/foo/bar")).unwrap();
+        assert_eq!(url.host(), None);
+        assert_eq!(url.path(), "/foo/bar/");
+    }
+    if cfg!(windows) {
+        assert_eq!(Url::from_directory_path(Path::new("relative")), Err(()));
+        assert_eq!(Url::from_directory_path(Path::new(r"..\relative")), Err(()));
+        assert_eq!(
+            Url::from_directory_path(Path::new(r"\drive-relative")),
+            Err(())
+        );
+        assert_eq!(Url::from_directory_path(Path::new(r"\\ucn\")), Err(()));
+
+        let url = Url::from_directory_path(Path::new(r"C:\foo\bar")).unwrap();
+        assert_eq!(url.host(), None);
+        assert_eq!(url.path(), "/C:/foo/bar/");
+    }
+}
+
+#[test]
+fn path_backslash_fun() {
+    let mut special_url = "http://foobar.com".parse::<Url>().unwrap();
+    special_url.path_segments_mut().unwrap().push("foo\\bar");
+    assert_eq!(special_url.as_str(), "http://foobar.com/foo%5Cbar");
+
+    let mut nonspecial_url = "thing://foobar.com".parse::<Url>().unwrap();
+    nonspecial_url.path_segments_mut().unwrap().push("foo\\bar");
+    assert_eq!(nonspecial_url.as_str(), "thing://foobar.com/foo\\bar");
+}
+
+#[test]
+fn from_str() {
+    assert!("http://testing.com/this".parse::<Url>().is_ok());
+}
+
+#[test]
+fn parse_with_params() {
+    let url = Url::parse_with_params(
+        "http://testing.com/this?dont=clobberme",
+        &[("lang", "rust")],
+    )
+    .unwrap();
+
+    assert_eq!(
+        url.as_str(),
+        "http://testing.com/this?dont=clobberme&lang=rust"
+    );
+}
+
+#[test]
+fn issue_124() {
+    let url: Url = "file:a".parse().unwrap();
+    assert_eq!(url.path(), "/a");
+    let url: Url = "file:...".parse().unwrap();
+    assert_eq!(url.path(), "/...");
+    let url: Url = "file:..".parse().unwrap();
+    assert_eq!(url.path(), "/");
+}
+
+#[test]
+fn test_equality() {
+    use std::collections::hash_map::DefaultHasher;
+    use std::hash::{Hash, Hasher};
+
+    fn check_eq(a: &Url, b: &Url) {
+        assert_eq!(a, b);
+
+        let mut h1 = DefaultHasher::new();
+        a.hash(&mut h1);
+        let mut h2 = DefaultHasher::new();
+        b.hash(&mut h2);
+        assert_eq!(h1.finish(), h2.finish());
+    }
+
+    fn url(s: &str) -> Url {
+        let rv = s.parse().unwrap();
+        check_eq(&rv, &rv);
+        rv
+    }
+
+    // Doesn't care if default port is given.
+    let a: Url = url("https://example.com/");
+    let b: Url = url("https://example.com:443/");
+    check_eq(&a, &b);
+
+    // Different ports
+    let a: Url = url("http://example.com/");
+    let b: Url = url("http://example.com:8080/");
+    assert!(a != b, "{:?} != {:?}", a, b);
+
+    // Different scheme
+    let a: Url = url("http://example.com/");
+    let b: Url = url("https://example.com/");
+    assert_ne!(a, b);
+
+    // Different host
+    let a: Url = url("http://foo.com/");
+    let b: Url = url("http://bar.com/");
+    assert_ne!(a, b);
+
+    // Missing path, automatically substituted. Semantically the same.
+    let a: Url = url("http://foo.com");
+    let b: Url = url("http://foo.com/");
+    check_eq(&a, &b);
+}
+
+#[test]
+fn host() {
+    fn assert_host(input: &str, host: Host<&str>) {
+        assert_eq!(Url::parse(input).unwrap().host(), Some(host));
+    }
+    assert_host("http://www.mozilla.org", Host::Domain("www.mozilla.org"));
+    assert_host(
+        "http://1.35.33.49",
+        Host::Ipv4(Ipv4Addr::new(1, 35, 33, 49)),
+    );
+    assert_host(
+        "http://[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]",
+        Host::Ipv6(Ipv6Addr::new(
+            0x2001, 0x0db8, 0x85a3, 0x08d3, 0x1319, 0x8a2e, 0x0370, 0x7344,
+        )),
+    );
+    assert_host("http://1.35.+33.49", Host::Domain("1.35.+33.49"));
+    assert_host(
+        "http://[::]",
+        Host::Ipv6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)),
+    );
+    assert_host(
+        "http://[::1]",
+        Host::Ipv6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)),
+    );
+    assert_host(
+        "http://0x1.0X23.0x21.061",
+        Host::Ipv4(Ipv4Addr::new(1, 35, 33, 49)),
+    );
+    assert_host("http://0x1232131", Host::Ipv4(Ipv4Addr::new(1, 35, 33, 49)));
+    assert_host("http://111", Host::Ipv4(Ipv4Addr::new(0, 0, 0, 111)));
+    assert_host("http://2..2.3", Host::Domain("2..2.3"));
+    assert!(Url::parse("http://42.0x1232131").is_err());
+    assert!(Url::parse("http://192.168.0.257").is_err());
+
+    assert_eq!(Host::Domain("foo"), Host::Domain("foo").to_owned());
+    assert_ne!(Host::Domain("foo"), Host::Domain("bar").to_owned());
+}
+
+#[test]
+fn host_serialization() {
+    // libstd’s `Display for Ipv6Addr` serializes 0:0:0:0:0:0:_:_ and 0:0:0:0:0:ffff:_:_
+    // using IPv4-like syntax, as suggested in https://tools.ietf.org/html/rfc5952#section-4
+    // but https://url.spec.whatwg.org/#concept-ipv6-serializer specifies not to.
+
+    // Not [::0.0.0.2] / [::ffff:0.0.0.2]
+    assert_eq!(
+        Url::parse("http://[0::2]").unwrap().host_str(),
+        Some("[::2]")
+    );
+    assert_eq!(
+        Url::parse("http://[0::ffff:0:2]").unwrap().host_str(),
+        Some("[::ffff:0:2]")
+    );
+}
+
+#[test]
+fn test_idna() {
+    assert!("http://goșu.ro".parse::<Url>().is_ok());
+    assert_eq!(
+        Url::parse("http://☃.net/").unwrap().host(),
+        Some(Host::Domain("xn--n3h.net"))
+    );
+    assert!("https://r2---sn-huoa-cvhl.googlevideo.com/crossdomain.xml"
+        .parse::<Url>()
+        .is_ok());
+}
+
+#[test]
+fn test_serialization() {
+    let data = [
+        ("http://example.com/", "http://example.com/"),
+        ("http://addslash.com", "http://addslash.com/"),
+        ("http://@emptyuser.com/", "http://emptyuser.com/"),
+        ("http://:@emptypass.com/", "http://emptypass.com/"),
+        ("http://user@user.com/", "http://user@user.com/"),
+        (
+            "http://user:pass@userpass.com/",
+            "http://user:pass@userpass.com/",
+        ),
+        (
+            "http://slashquery.com/path/?q=something",
+            "http://slashquery.com/path/?q=something",
+        ),
+        (
+            "http://noslashquery.com/path?q=something",
+            "http://noslashquery.com/path?q=something",
+        ),
+    ];
+    for &(input, result) in &data {
+        let url = Url::parse(input).unwrap();
+        assert_eq!(url.as_str(), result);
+    }
+}
+
+#[test]
+fn test_form_urlencoded() {
+    let pairs: &[(Cow<'_, str>, Cow<'_, str>)] = &[
+        ("foo".into(), "é&".into()),
+        ("bar".into(), "".into()),
+        ("foo".into(), "#".into()),
+    ];
+    let encoded = form_urlencoded::Serializer::new(String::new())
+        .extend_pairs(pairs)
+        .finish();
+    assert_eq!(encoded, "foo=%C3%A9%26&bar=&foo=%23");
+    assert_eq!(
+        form_urlencoded::parse(encoded.as_bytes()).collect::<Vec<_>>(),
+        pairs.to_vec()
+    );
+}
+
+#[test]
+fn test_form_serialize() {
+    let encoded = form_urlencoded::Serializer::new(String::new())
+        .append_pair("foo", "é&")
+        .append_pair("bar", "")
+        .append_pair("foo", "#")
+        .append_key_only("json")
+        .finish();
+    assert_eq!(encoded, "foo=%C3%A9%26&bar=&foo=%23&json");
+}
+
+#[test]
+fn form_urlencoded_encoding_override() {
+    let encoded = form_urlencoded::Serializer::new(String::new())
+        .encoding_override(Some(&|s| s.as_bytes().to_ascii_uppercase().into()))
+        .append_pair("foo", "bar")
+        .append_key_only("xml")
+        .finish();
+    assert_eq!(encoded, "FOO=BAR&XML");
+}
+
+#[test]
+/// https://github.com/servo/rust-url/issues/61
+fn issue_61() {
+    let mut url = Url::parse("http://mozilla.org").unwrap();
+    url.set_scheme("https").unwrap();
+    assert_eq!(url.port(), None);
+    assert_eq!(url.port_or_known_default(), Some(443));
+    url.check_invariants().unwrap();
+}
+
+#[test]
+#[cfg(not(windows))]
+/// https://github.com/servo/rust-url/issues/197
+fn issue_197() {
+    let mut url = Url::from_file_path("/").expect("Failed to parse path");
+    url.check_invariants().unwrap();
+    assert_eq!(
+        url,
+        Url::parse("file:///").expect("Failed to parse path + protocol")
+    );
+    url.path_segments_mut()
+        .expect("path_segments_mut")
+        .pop_if_empty();
+}
+
+#[test]
+fn issue_241() {
+    Url::parse("mailto:").unwrap().cannot_be_a_base();
+}
+
+#[test]
+/// https://github.com/servo/rust-url/issues/222
+fn append_trailing_slash() {
+    let mut url: Url = "http://localhost:6767/foo/bar?a=b".parse().unwrap();
+    url.check_invariants().unwrap();
+    url.path_segments_mut().unwrap().push("");
+    url.check_invariants().unwrap();
+    assert_eq!(url.to_string(), "http://localhost:6767/foo/bar/?a=b");
+}
+
+#[test]
+/// https://github.com/servo/rust-url/issues/227
+fn extend_query_pairs_then_mutate() {
+    let mut url: Url = "http://localhost:6767/foo/bar".parse().unwrap();
+    url.query_pairs_mut()
+        .extend_pairs(vec![("auth", "my-token")].into_iter());
+    url.check_invariants().unwrap();
+    assert_eq!(
+        url.to_string(),
+        "http://localhost:6767/foo/bar?auth=my-token"
+    );
+    url.path_segments_mut().unwrap().push("some_other_path");
+    url.check_invariants().unwrap();
+    assert_eq!(
+        url.to_string(),
+        "http://localhost:6767/foo/bar/some_other_path?auth=my-token"
+    );
+}
+
+#[test]
+/// https://github.com/servo/rust-url/issues/222
+fn append_empty_segment_then_mutate() {
+    let mut url: Url = "http://localhost:6767/foo/bar?a=b".parse().unwrap();
+    url.check_invariants().unwrap();
+    url.path_segments_mut().unwrap().push("").pop();
+    url.check_invariants().unwrap();
+    assert_eq!(url.to_string(), "http://localhost:6767/foo/bar?a=b");
+}
+
+#[test]
+/// https://github.com/servo/rust-url/issues/243
+fn test_set_host() {
+    let mut url = Url::parse("https://example.net/hello").unwrap();
+    url.set_host(Some("foo.com")).unwrap();
+    assert_eq!(url.as_str(), "https://foo.com/hello");
+    assert!(url.set_host(None).is_err());
+    assert_eq!(url.as_str(), "https://foo.com/hello");
+    assert!(url.set_host(Some("")).is_err());
+    assert_eq!(url.as_str(), "https://foo.com/hello");
+
+    let mut url = Url::parse("foobar://example.net/hello").unwrap();
+    url.set_host(None).unwrap();
+    assert_eq!(url.as_str(), "foobar:/hello");
+
+    let mut url = Url::parse("foo://È™").unwrap();
+    assert_eq!(url.as_str(), "foo://%C8%99");
+    url.set_host(Some("goșu.ro")).unwrap();
+    assert_eq!(url.as_str(), "foo://go%C8%99u.ro");
+}
+
+#[test]
+// https://github.com/servo/rust-url/issues/166
+fn test_leading_dots() {
+    assert_eq!(
+        Host::parse(".org").unwrap(),
+        Host::Domain(".org".to_owned())
+    );
+    assert_eq!(Url::parse("file://./foo").unwrap().domain(), Some("."));
+}
+
+#[test]
+/// https://github.com/servo/rust-url/issues/302
+fn test_origin_hash() {
+    use std::collections::hash_map::DefaultHasher;
+    use std::hash::{Hash, Hasher};
+
+    fn hash<T: Hash>(value: &T) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        value.hash(&mut hasher);
+        hasher.finish()
+    }
+
+    let origin = &Url::parse("http://example.net/").unwrap().origin();
+
+    let origins_to_compare = [
+        Url::parse("http://example.net:80/").unwrap().origin(),
+        Url::parse("http://example.net:81/").unwrap().origin(),
+        Url::parse("http://example.net").unwrap().origin(),
+        Url::parse("http://example.net/hello").unwrap().origin(),
+        Url::parse("https://example.net").unwrap().origin(),
+        Url::parse("ftp://example.net").unwrap().origin(),
+        Url::parse("file://example.net").unwrap().origin(),
+        Url::parse("http://user@example.net/").unwrap().origin(),
+        Url::parse("http://user:pass@example.net/")
+            .unwrap()
+            .origin(),
+    ];
+
+    for origin_to_compare in &origins_to_compare {
+        if origin == origin_to_compare {
+            assert_eq!(hash(origin), hash(origin_to_compare));
+        } else {
+            assert_ne!(hash(origin), hash(origin_to_compare));
+        }
+    }
+
+    let opaque_origin = Url::parse("file://example.net").unwrap().origin();
+    let same_opaque_origin = Url::parse("file://example.net").unwrap().origin();
+    let other_opaque_origin = Url::parse("file://other").unwrap().origin();
+
+    assert_ne!(hash(&opaque_origin), hash(&same_opaque_origin));
+    assert_ne!(hash(&opaque_origin), hash(&other_opaque_origin));
+}
+
+#[test]
+fn test_origin_blob_equality() {
+    let origin = &Url::parse("http://example.net/").unwrap().origin();
+    let blob_origin = &Url::parse("blob:http://example.net/").unwrap().origin();
+
+    assert_eq!(origin, blob_origin);
+}
+
+#[test]
+fn test_origin_opaque() {
+    assert!(!Origin::new_opaque().is_tuple());
+    assert!(!&Url::parse("blob:malformed//").unwrap().origin().is_tuple())
+}
+
+#[test]
+fn test_origin_unicode_serialization() {
+    let data = [
+        ("http://😅.com", "http://😅.com"),
+        ("ftp://😅:🙂@🙂.com", "ftp://🙂.com"),
+        ("https://user@😅.com", "https://😅.com"),
+        ("http://😅.🙂:40", "http://😅.🙂:40"),
+    ];
+    for &(unicode_url, expected_serialization) in &data {
+        let origin = Url::parse(unicode_url).unwrap().origin();
+        assert_eq!(origin.unicode_serialization(), *expected_serialization);
+    }
+
+    let ascii_origins = [
+        Url::parse("http://example.net/").unwrap().origin(),
+        Url::parse("http://example.net:80/").unwrap().origin(),
+        Url::parse("http://example.net:81/").unwrap().origin(),
+        Url::parse("http://example.net").unwrap().origin(),
+        Url::parse("http://example.net/hello").unwrap().origin(),
+        Url::parse("https://example.net").unwrap().origin(),
+        Url::parse("ftp://example.net").unwrap().origin(),
+        Url::parse("file://example.net").unwrap().origin(),
+        Url::parse("http://user@example.net/").unwrap().origin(),
+        Url::parse("http://user:pass@example.net/")
+            .unwrap()
+            .origin(),
+        Url::parse("http://127.0.0.1").unwrap().origin(),
+    ];
+    for ascii_origin in &ascii_origins {
+        assert_eq!(
+            ascii_origin.ascii_serialization(),
+            ascii_origin.unicode_serialization()
+        );
+    }
+}
+
+#[test]
+fn test_socket_addrs() {
+    use std::net::ToSocketAddrs;
+
+    let data = [
+        ("https://127.0.0.1/", "127.0.0.1", 443),
+        ("https://127.0.0.1:9742/", "127.0.0.1", 9742),
+        ("custom-protocol://127.0.0.1:9742/", "127.0.0.1", 9742),
+        ("custom-protocol://127.0.0.1/", "127.0.0.1", 9743),
+        ("https://[::1]/", "::1", 443),
+        ("https://[::1]:9742/", "::1", 9742),
+        ("custom-protocol://[::1]:9742/", "::1", 9742),
+        ("custom-protocol://[::1]/", "::1", 9743),
+        ("https://localhost/", "localhost", 443),
+        ("https://localhost:9742/", "localhost", 9742),
+        ("custom-protocol://localhost:9742/", "localhost", 9742),
+        ("custom-protocol://localhost/", "localhost", 9743),
+    ];
+
+    for (url_string, host, port) in &data {
+        let url = url::Url::parse(url_string).unwrap();
+        let addrs = url
+            .socket_addrs(|| match url.scheme() {
+                "custom-protocol" => Some(9743),
+                _ => None,
+            })
+            .unwrap();
+        assert_eq!(
+            Some(addrs[0]),
+            (*host, *port).to_socket_addrs().unwrap().next()
+        );
+    }
+}
+
+#[test]
+fn test_no_base_url() {
+    let mut no_base_url = Url::parse("mailto:test@example.net").unwrap();
+
+    assert!(no_base_url.cannot_be_a_base());
+    assert!(no_base_url.path_segments().is_none());
+    assert!(no_base_url.path_segments_mut().is_err());
+    assert!(no_base_url.set_host(Some("foo")).is_err());
+    assert!(no_base_url
+        .set_ip_host("127.0.0.1".parse().unwrap())
+        .is_err());
+
+    no_base_url.set_path("/foo");
+    assert_eq!(no_base_url.path(), "%2Ffoo");
+}
+
+#[test]
+fn test_domain() {
+    let url = Url::parse("https://127.0.0.1/").unwrap();
+    assert_eq!(url.domain(), None);
+
+    let url = Url::parse("mailto:test@example.net").unwrap();
+    assert_eq!(url.domain(), None);
+
+    let url = Url::parse("https://example.com/").unwrap();
+    assert_eq!(url.domain(), Some("example.com"));
+}
+
+#[test]
+fn test_query() {
+    let url = Url::parse("https://example.com/products?page=2#fragment").unwrap();
+    assert_eq!(url.query(), Some("page=2"));
+    assert_eq!(
+        url.query_pairs().next(),
+        Some((Cow::Borrowed("page"), Cow::Borrowed("2")))
+    );
+
+    let url = Url::parse("https://example.com/products").unwrap();
+    assert!(url.query().is_none());
+    assert_eq!(url.query_pairs().count(), 0);
+
+    let url = Url::parse("https://example.com/?country=español").unwrap();
+    assert_eq!(url.query(), Some("country=espa%C3%B1ol"));
+    assert_eq!(
+        url.query_pairs().next(),
+        Some((Cow::Borrowed("country"), Cow::Borrowed("español")))
+    );
+
+    let url = Url::parse("https://example.com/products?page=2&sort=desc").unwrap();
+    assert_eq!(url.query(), Some("page=2&sort=desc"));
+    let mut pairs = url.query_pairs();
+    assert_eq!(pairs.count(), 2);
+    assert_eq!(
+        pairs.next(),
+        Some((Cow::Borrowed("page"), Cow::Borrowed("2")))
+    );
+    assert_eq!(
+        pairs.next(),
+        Some((Cow::Borrowed("sort"), Cow::Borrowed("desc")))
+    );
+}
+
+#[test]
+fn test_fragment() {
+    let url = Url::parse("https://example.com/#fragment").unwrap();
+    assert_eq!(url.fragment(), Some("fragment"));
+
+    let url = Url::parse("https://example.com/").unwrap();
+    assert_eq!(url.fragment(), None);
+}
+
+#[test]
+fn test_set_ip_host() {
+    let mut url = Url::parse("http://example.com").unwrap();
+
+    url.set_ip_host("127.0.0.1".parse().unwrap()).unwrap();
+    assert_eq!(url.host_str(), Some("127.0.0.1"));
+
+    url.set_ip_host("::1".parse().unwrap()).unwrap();
+    assert_eq!(url.host_str(), Some("[::1]"));
+}
+
+#[test]
+fn test_set_href() {
+    use url::quirks::set_href;
+
+    let mut url = Url::parse("https://existing.url").unwrap();
+
+    assert!(set_href(&mut url, "mal//formed").is_err());
+
+    assert!(set_href(
+        &mut url,
+        "https://user:pass@domain.com:9742/path/file.ext?key=val&key2=val2#fragment"
+    )
+    .is_ok());
+    assert_eq!(
+        url,
+        Url::parse("https://user:pass@domain.com:9742/path/file.ext?key=val&key2=val2#fragment")
+            .unwrap()
+    );
+}
+
+#[test]
+fn test_domain_encoding_quirks() {
+    use url::quirks::{domain_to_ascii, domain_to_unicode};
+
+    let data = [
+        ("http://example.com", "", ""),
+        ("😅.🙂", "xn--j28h.xn--938h", "😅.🙂"),
+        ("example.com", "example.com", "example.com"),
+        ("mailto:test@example.net", "", ""),
+    ];
+
+    for url in &data {
+        assert_eq!(domain_to_ascii(url.0), url.1);
+        assert_eq!(domain_to_unicode(url.0), url.2);
+    }
+}
+
+#[test]
+fn test_windows_unc_path() {
+    if !cfg!(windows) {
+        return;
+    }
+
+    let url = Url::from_file_path(Path::new(r"\\host\share\path\file.txt")).unwrap();
+    assert_eq!(url.as_str(), "file://host/share/path/file.txt");
+
+    let url = Url::from_file_path(Path::new(r"\\höst\share\path\file.txt")).unwrap();
+    assert_eq!(url.as_str(), "file://xn--hst-sna/share/path/file.txt");
+
+    let url = Url::from_file_path(Path::new(r"\\192.168.0.1\share\path\file.txt")).unwrap();
+    assert_eq!(url.host(), Some(Host::Ipv4(Ipv4Addr::new(192, 168, 0, 1))));
+
+    let path = url.to_file_path().unwrap();
+    assert_eq!(path.to_str(), Some(r"\\192.168.0.1\share\path\file.txt"));
+
+    // Another way to write these:
+    let url = Url::from_file_path(Path::new(r"\\?\UNC\host\share\path\file.txt")).unwrap();
+    assert_eq!(url.as_str(), "file://host/share/path/file.txt");
+
+    // Paths starting with "\\.\" (Local Device Paths) are intentionally not supported.
+    let url = Url::from_file_path(Path::new(r"\\.\some\path\file.txt"));
+    assert!(url.is_err());
+}
+
+#[test]
+fn test_syntax_violation_callback() {
+    use url::SyntaxViolation::*;
+    let violation = Cell::new(None);
+    let url = Url::options()
+        .syntax_violation_callback(Some(&|v| violation.set(Some(v))))
+        .parse("http:////mozilla.org:42")
+        .unwrap();
+    assert_eq!(url.port(), Some(42));
+
+    let v = violation.take().unwrap();
+    assert_eq!(v, ExpectedDoubleSlash);
+    assert_eq!(v.description(), "expected //");
+    assert_eq!(v.to_string(), "expected //");
+}
+
+#[test]
+fn test_syntax_violation_callback_lifetimes() {
+    use url::SyntaxViolation::*;
+    let violation = Cell::new(None);
+    let vfn = |s| violation.set(Some(s));
+
+    let url = Url::options()
+        .syntax_violation_callback(Some(&vfn))
+        .parse("http:////mozilla.org:42")
+        .unwrap();
+    assert_eq!(url.port(), Some(42));
+    assert_eq!(violation.take(), Some(ExpectedDoubleSlash));
+
+    let url = Url::options()
+        .syntax_violation_callback(Some(&vfn))
+        .parse("http://mozilla.org\\path")
+        .unwrap();
+    assert_eq!(url.path(), "/path");
+    assert_eq!(violation.take(), Some(Backslash));
+}
+
+#[test]
+fn test_syntax_violation_callback_types() {
+    use url::SyntaxViolation::*;
+
+    let data = [
+        ("http://mozilla.org/\\foo", Backslash, "backslash"),
+        (" http://mozilla.org", C0SpaceIgnored, "leading or trailing control or space character are ignored in URLs"),
+        ("http://user:pass@mozilla.org", EmbeddedCredentials, "embedding authentication information (username or password) in an URL is not recommended"),
+        ("http:///mozilla.org", ExpectedDoubleSlash, "expected //"),
+        ("file:/foo.txt", ExpectedFileDoubleSlash, "expected // after file:"),
+        ("file://mozilla.org/c:/file.txt", FileWithHostAndWindowsDrive, "file: with host and Windows drive letter"),
+        ("http://mozilla.org/^", NonUrlCodePoint, "non-URL code point"),
+        ("http://mozilla.org/#\00", NullInFragment, "NULL characters are ignored in URL fragment identifiers"),
+        ("http://mozilla.org/%1", PercentDecode, "expected 2 hex digits after %"),
+        ("http://mozilla.org\t/foo", TabOrNewlineIgnored, "tabs or newlines are ignored in URLs"),
+        ("http://user@:pass@mozilla.org", UnencodedAtSign, "unencoded @ sign in username or password")
+    ];
+
+    for test_case in &data {
+        let violation = Cell::new(None);
+        Url::options()
+            .syntax_violation_callback(Some(&|v| violation.set(Some(v))))
+            .parse(test_case.0)
+            .unwrap();
+
+        let v = violation.take();
+        assert_eq!(v, Some(test_case.1));
+        assert_eq!(v.unwrap().description(), test_case.2);
+        assert_eq!(v.unwrap().to_string(), test_case.2);
+    }
+}
+
+#[test]
+fn test_options_reuse() {
+    use url::SyntaxViolation::*;
+    let violations = RefCell::new(Vec::new());
+    let vfn = |v| violations.borrow_mut().push(v);
+
+    let options = Url::options().syntax_violation_callback(Some(&vfn));
+    let url = options.parse("http:////mozilla.org").unwrap();
+
+    let options = options.base_url(Some(&url));
+    let url = options.parse("/sub\\path").unwrap();
+    assert_eq!(url.as_str(), "http://mozilla.org/sub/path");
+    assert_eq!(*violations.borrow(), vec!(ExpectedDoubleSlash, Backslash));
+}
+
+/// https://github.com/servo/rust-url/issues/505
+#[cfg(windows)]
+#[test]
+fn test_url_from_file_path() {
+    use std::path::PathBuf;
+    use url::Url;
+
+    let p = PathBuf::from("c:///");
+    let u = Url::from_file_path(p).unwrap();
+    let path = u.to_file_path().unwrap();
+    assert_eq!("C:\\", path.to_str().unwrap());
+}
+
+/// https://github.com/servo/rust-url/issues/505
+#[cfg(not(windows))]
+#[test]
+fn test_url_from_file_path() {
+    use std::path::PathBuf;
+    use url::Url;
+
+    let p = PathBuf::from("/c:/");
+    let u = Url::from_file_path(p).unwrap();
+    let path = u.to_file_path().unwrap();
+    assert_eq!("/c:/", path.to_str().unwrap());
+}
+
+#[test]
+fn test_non_special_path() {
+    let mut db_url = url::Url::parse("postgres://postgres@localhost/").unwrap();
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost/");
+    db_url.set_path("diesel_foo");
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost/diesel_foo");
+    assert_eq!(db_url.path(), "/diesel_foo");
+}
+
+#[test]
+fn test_non_special_path2() {
+    let mut db_url = url::Url::parse("postgres://postgres@localhost/").unwrap();
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost/");
+    db_url.set_path("");
+    assert_eq!(db_url.path(), "");
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost");
+    db_url.set_path("foo");
+    assert_eq!(db_url.path(), "/foo");
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost/foo");
+    db_url.set_path("/bar");
+    assert_eq!(db_url.path(), "/bar");
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost/bar");
+}
+
+#[test]
+fn test_non_special_path3() {
+    let mut db_url = url::Url::parse("postgres://postgres@localhost/").unwrap();
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost/");
+    db_url.set_path("/");
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost/");
+    assert_eq!(db_url.path(), "/");
+    db_url.set_path("/foo");
+    assert_eq!(db_url.as_str(), "postgres://postgres@localhost/foo");
+    assert_eq!(db_url.path(), "/foo");
+}
+
+#[test]
+fn test_set_scheme_to_file_with_host() {
+    let mut url: Url = "http://localhost:6767/foo/bar".parse().unwrap();
+    let result = url.set_scheme("file");
+    assert_eq!(url.to_string(), "http://localhost:6767/foo/bar");
+    assert_eq!(result, Err(()));
+}
+
+#[test]
+fn no_panic() {
+    let mut url = Url::parse("arhttpsps:/.//eom/dae.com/\\\\t\\:").unwrap();
+    url::quirks::set_hostname(&mut url, "//eom/datcom/\\\\t\\://eom/data.cs").unwrap();
+}
+
+#[test]
+fn pop_if_empty_in_bounds() {
+    let mut url = Url::parse("m://").unwrap();
+    let mut segments = url.path_segments_mut().unwrap();
+    segments.pop_if_empty();
+    segments.pop();
+}
+
+#[test]
+fn test_slicing() {
+    use url::Position::*;
+
+    #[derive(Default)]
+    struct ExpectedSlices<'a> {
+        full: &'a str,
+        scheme: &'a str,
+        username: &'a str,
+        password: &'a str,
+        host: &'a str,
+        port: &'a str,
+        path: &'a str,
+        query: &'a str,
+        fragment: &'a str,
+    }
+
+    let data = [
+        ExpectedSlices {
+            full: "https://user:pass@domain.com:9742/path/file.ext?key=val&key2=val2#fragment",
+            scheme: "https",
+            username: "user",
+            password: "pass",
+            host: "domain.com",
+            port: "9742",
+            path: "/path/file.ext",
+            query: "key=val&key2=val2",
+            fragment: "fragment",
+        },
+        ExpectedSlices {
+            full: "https://domain.com:9742/path/file.ext#fragment",
+            scheme: "https",
+            host: "domain.com",
+            port: "9742",
+            path: "/path/file.ext",
+            fragment: "fragment",
+            ..Default::default()
+        },
+        ExpectedSlices {
+            full: "https://domain.com:9742/path/file.ext",
+            scheme: "https",
+            host: "domain.com",
+            port: "9742",
+            path: "/path/file.ext",
+            ..Default::default()
+        },
+        ExpectedSlices {
+            full: "blob:blob-info",
+            scheme: "blob",
+            path: "blob-info",
+            ..Default::default()
+        },
+    ];
+
+    for expected_slices in &data {
+        let url = Url::parse(expected_slices.full).unwrap();
+        assert_eq!(&url[..], expected_slices.full);
+        assert_eq!(&url[BeforeScheme..AfterScheme], expected_slices.scheme);
+        assert_eq!(
+            &url[BeforeUsername..AfterUsername],
+            expected_slices.username
+        );
+        assert_eq!(
+            &url[BeforePassword..AfterPassword],
+            expected_slices.password
+        );
+        assert_eq!(&url[BeforeHost..AfterHost], expected_slices.host);
+        assert_eq!(&url[BeforePort..AfterPort], expected_slices.port);
+        assert_eq!(&url[BeforePath..AfterPath], expected_slices.path);
+        assert_eq!(&url[BeforeQuery..AfterQuery], expected_slices.query);
+        assert_eq!(
+            &url[BeforeFragment..AfterFragment],
+            expected_slices.fragment
+        );
+        assert_eq!(&url[..AfterFragment], expected_slices.full);
+    }
+}
+
+#[test]
+fn test_make_relative() {
+    let tests = [
+        (
+            "http://127.0.0.1:8080/test",
+            "http://127.0.0.1:8080/test",
+            "",
+        ),
+        (
+            "http://127.0.0.1:8080/test",
+            "http://127.0.0.1:8080/test/",
+            "test/",
+        ),
+        (
+            "http://127.0.0.1:8080/test/",
+            "http://127.0.0.1:8080/test",
+            "../test",
+        ),
+        (
+            "http://127.0.0.1:8080/",
+            "http://127.0.0.1:8080/?foo=bar#123",
+            "?foo=bar#123",
+        ),
+        (
+            "http://127.0.0.1:8080/",
+            "http://127.0.0.1:8080/test/video",
+            "test/video",
+        ),
+        (
+            "http://127.0.0.1:8080/test",
+            "http://127.0.0.1:8080/test/video",
+            "test/video",
+        ),
+        (
+            "http://127.0.0.1:8080/test/",
+            "http://127.0.0.1:8080/test/video",
+            "video",
+        ),
+        (
+            "http://127.0.0.1:8080/test",
+            "http://127.0.0.1:8080/test2/video",
+            "test2/video",
+        ),
+        (
+            "http://127.0.0.1:8080/test/",
+            "http://127.0.0.1:8080/test2/video",
+            "../test2/video",
+        ),
+        (
+            "http://127.0.0.1:8080/test/bla",
+            "http://127.0.0.1:8080/test2/video",
+            "../test2/video",
+        ),
+        (
+            "http://127.0.0.1:8080/test/bla/",
+            "http://127.0.0.1:8080/test2/video",
+            "../../test2/video",
+        ),
+        (
+            "http://127.0.0.1:8080/test/?foo=bar#123",
+            "http://127.0.0.1:8080/test/video",
+            "video",
+        ),
+        (
+            "http://127.0.0.1:8080/test/",
+            "http://127.0.0.1:8080/test/video?baz=meh#456",
+            "video?baz=meh#456",
+        ),
+        (
+            "http://127.0.0.1:8080/test",
+            "http://127.0.0.1:8080/test?baz=meh#456",
+            "?baz=meh#456",
+        ),
+        (
+            "http://127.0.0.1:8080/test/",
+            "http://127.0.0.1:8080/test?baz=meh#456",
+            "../test?baz=meh#456",
+        ),
+        (
+            "http://127.0.0.1:8080/test/",
+            "http://127.0.0.1:8080/test/?baz=meh#456",
+            "?baz=meh#456",
+        ),
+        (
+            "http://127.0.0.1:8080/test/?foo=bar#123",
+            "http://127.0.0.1:8080/test/video?baz=meh#456",
+            "video?baz=meh#456",
+        ),
+    ];
+
+    for (base, uri, relative) in &tests {
+        let base_uri = url::Url::parse(base).unwrap();
+        let relative_uri = url::Url::parse(uri).unwrap();
+        let make_relative = base_uri.make_relative(&relative_uri).unwrap();
+        assert_eq!(
+            make_relative, *relative,
+            "base: {}, uri: {}, relative: {}",
+            base, uri, relative
+        );
+        assert_eq!(
+            base_uri.join(&relative).unwrap().as_str(),
+            *uri,
+            "base: {}, uri: {}, relative: {}",
+            base,
+            uri,
+            relative
+        );
+    }
+
+    let error_tests = [
+        ("http://127.0.0.1:8080/", "https://127.0.0.1:8080/test/"),
+        ("http://127.0.0.1:8080/", "http://127.0.0.1:8081/test/"),
+        ("http://127.0.0.1:8080/", "http://127.0.0.2:8080/test/"),
+        ("mailto:a@example.com", "mailto:b@example.com"),
+    ];
+
+    for (base, uri) in &error_tests {
+        let base_uri = url::Url::parse(base).unwrap();
+        let relative_uri = url::Url::parse(uri).unwrap();
+        let make_relative = base_uri.make_relative(&relative_uri);
+        assert_eq!(make_relative, None, "base: {}, uri: {}", base, uri);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/tests/urltestdata.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/tests/urltestdata.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/url/tests/urltestdata.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/url/tests/urltestdata.json	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6991 @@
+[
+  "# Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/script-tests/segments.js",
+  "# AS OF https://github.com/jsdom/whatwg-url/commit/35f04dfd3048cf6362f4398745bb13375c5020c2",
+  {
+    "input": "http://example\t.\norg",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://user:pass@foo:21/bar;par?b#c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://user:pass@foo:21/bar;par?b#c",
+    "origin": "http://foo:21",
+    "protocol": "http:",
+    "username": "user",
+    "password": "pass",
+    "host": "foo:21",
+    "hostname": "foo",
+    "port": "21",
+    "pathname": "/bar;par",
+    "search": "?b",
+    "hash": "#c"
+  },
+  {
+    "input": "https://test:@test",
+    "base": "about:blank",
+    "href": "https://test@test/",
+    "origin": "https://test",
+    "protocol": "https:",
+    "username": "test",
+    "password": "",
+    "host": "test",
+    "hostname": "test",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https://:@test",
+    "base": "about:blank",
+    "href": "https://test/",
+    "origin": "https://test",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "test",
+    "hostname": "test",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-special://test:@test/x",
+    "base": "about:blank",
+    "href": "non-special://test@test/x",
+    "origin": "null",
+    "protocol": "non-special:",
+    "username": "test",
+    "password": "",
+    "host": "test",
+    "hostname": "test",
+    "port": "",
+    "pathname": "/x",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-special://:@test/x",
+    "base": "about:blank",
+    "href": "non-special://test/x",
+    "origin": "null",
+    "protocol": "non-special:",
+    "username": "",
+    "password": "",
+    "host": "test",
+    "hostname": "test",
+    "port": "",
+    "pathname": "/x",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:foo.com",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/foo.com",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/foo.com",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "\t   :foo.com   \n",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:foo.com",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:foo.com",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": " foo.com  ",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/foo.com",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/foo.com",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "a:\t foo.com",
+    "base": "http://example.org/foo/bar",
+    "href": "a: foo.com",
+    "origin": "null",
+    "protocol": "a:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": " foo.com",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://f:21/ b ? d # e ",
+    "base": "http://example.org/foo/bar",
+    "href": "http://f:21/%20b%20?%20d%20#%20e",
+    "origin": "http://f:21",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "f:21",
+    "hostname": "f",
+    "port": "21",
+    "pathname": "/%20b%20",
+    "search": "?%20d%20",
+    "hash": "#%20e"
+  },
+  {
+    "input": "lolscheme:x x#x x",
+    "base": "about:blank",
+    "href": "lolscheme:x x#x%20x",
+    "protocol": "lolscheme:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "x x",
+    "search": "",
+    "hash": "#x%20x"
+  },
+  {
+    "input": "http://f:/c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://f/c",
+    "origin": "http://f",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "f",
+    "hostname": "f",
+    "port": "",
+    "pathname": "/c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://f:0/c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://f:0/c",
+    "origin": "http://f:0",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "f:0",
+    "hostname": "f",
+    "port": "0",
+    "pathname": "/c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://f:00000000000000/c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://f:0/c",
+    "origin": "http://f:0",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "f:0",
+    "hostname": "f",
+    "port": "0",
+    "pathname": "/c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://f:00000000000000000000080/c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://f/c",
+    "origin": "http://f",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "f",
+    "hostname": "f",
+    "port": "",
+    "pathname": "/c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://f:b/c",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "http://f: /c",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "http://f:\n/c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://f/c",
+    "origin": "http://f",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "f",
+    "hostname": "f",
+    "port": "",
+    "pathname": "/c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://f:fifty-two/c",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "http://f:999999/c",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "non-special://f:999999/c",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "http://f: 21 / b ? d # e ",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "  \t",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ":foo.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:foo.com/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:foo.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ":foo.com\\",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:foo.com/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:foo.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ":",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ":a",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:a",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:a",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ":/",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ":\\",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ":#",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:#",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "#",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar#",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "#/",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar#/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": "#/"
+  },
+  {
+    "input": "#\\",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar#\\",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": "#\\"
+  },
+  {
+    "input": "#;?",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar#;?",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": "#;?"
+  },
+  {
+    "input": "?",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar?",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ":23",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:23",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:23",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/:23",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/:23",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/:23",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "::",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/::",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/::",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "::23",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/::23",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/::23",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "foo://",
+    "base": "http://example.org/foo/bar",
+    "href": "foo://",
+    "origin": "null",
+    "protocol": "foo:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://a:b@c:29/d",
+    "base": "http://example.org/foo/bar",
+    "href": "http://a:b@c:29/d",
+    "origin": "http://c:29",
+    "protocol": "http:",
+    "username": "a",
+    "password": "b",
+    "host": "c:29",
+    "hostname": "c",
+    "port": "29",
+    "pathname": "/d",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http::@c:29",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/:@c:29",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/:@c:29",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://&a:foo(b]c@d:2/",
+    "base": "http://example.org/foo/bar",
+    "href": "http://&a:foo(b%5Dc@d:2/",
+    "origin": "http://d:2",
+    "protocol": "http:",
+    "username": "&a",
+    "password": "foo(b%5Dc",
+    "host": "d:2",
+    "hostname": "d",
+    "port": "2",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://::@c@d:2",
+    "base": "http://example.org/foo/bar",
+    "href": "http://:%3A%40c@d:2/",
+    "origin": "http://d:2",
+    "protocol": "http:",
+    "username": "",
+    "password": "%3A%40c",
+    "host": "d:2",
+    "hostname": "d",
+    "port": "2",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://foo.com:b@d/",
+    "base": "http://example.org/foo/bar",
+    "href": "http://foo.com:b@d/",
+    "origin": "http://d",
+    "protocol": "http:",
+    "username": "foo.com",
+    "password": "b",
+    "host": "d",
+    "hostname": "d",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://foo.com/\\@",
+    "base": "http://example.org/foo/bar",
+    "href": "http://foo.com//@",
+    "origin": "http://foo.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.com",
+    "hostname": "foo.com",
+    "port": "",
+    "pathname": "//@",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:\\\\foo.com\\",
+    "base": "http://example.org/foo/bar",
+    "href": "http://foo.com/",
+    "origin": "http://foo.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.com",
+    "hostname": "foo.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:\\\\a\\b:c\\d@foo.com\\",
+    "base": "http://example.org/foo/bar",
+    "href": "http://a/b:c/d@foo.com/",
+    "origin": "http://a",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "a",
+    "hostname": "a",
+    "port": "",
+    "pathname": "/b:c/d@foo.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "foo:/",
+    "base": "http://example.org/foo/bar",
+    "href": "foo:/",
+    "origin": "null",
+    "protocol": "foo:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "foo:/bar.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "foo:/bar.com/",
+    "origin": "null",
+    "protocol": "foo:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/bar.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "foo://///////",
+    "base": "http://example.org/foo/bar",
+    "href": "foo://///////",
+    "origin": "null",
+    "protocol": "foo:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "///////",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "foo://///////bar.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "foo://///////bar.com/",
+    "origin": "null",
+    "protocol": "foo:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "///////bar.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "foo:////://///",
+    "base": "http://example.org/foo/bar",
+    "href": "foo:////://///",
+    "origin": "null",
+    "protocol": "foo:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//://///",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "c:/foo",
+    "base": "http://example.org/foo/bar",
+    "href": "c:/foo",
+    "origin": "null",
+    "protocol": "c:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "//foo/bar",
+    "base": "http://example.org/foo/bar",
+    "href": "http://foo/bar",
+    "origin": "http://foo",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://foo/path;a??e#f#g",
+    "base": "http://example.org/foo/bar",
+    "href": "http://foo/path;a??e#f#g",
+    "origin": "http://foo",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/path;a",
+    "search": "??e",
+    "hash": "#f#g"
+  },
+  {
+    "input": "http://foo/abcd?efgh?ijkl",
+    "base": "http://example.org/foo/bar",
+    "href": "http://foo/abcd?efgh?ijkl",
+    "origin": "http://foo",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/abcd",
+    "search": "?efgh?ijkl",
+    "hash": ""
+  },
+  {
+    "input": "http://foo/abcd#foo?bar",
+    "base": "http://example.org/foo/bar",
+    "href": "http://foo/abcd#foo?bar",
+    "origin": "http://foo",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/abcd",
+    "search": "",
+    "hash": "#foo?bar"
+  },
+  {
+    "input": "[61:24:74]:98",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/[61:24:74]:98",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/[61:24:74]:98",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:[61:27]/:foo",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/[61:27]/:foo",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/[61:27]/:foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://[1::2]:3:4",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "http://2001::1",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "http://2001::1]",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "http://2001::1]:80",
+    "base": "http://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "http://[2001::1]",
+    "base": "http://example.org/foo/bar",
+    "href": "http://[2001::1]/",
+    "origin": "http://[2001::1]",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "[2001::1]",
+    "hostname": "[2001::1]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://[::127.0.0.1]",
+    "base": "http://example.org/foo/bar",
+    "href": "http://[::7f00:1]/",
+    "origin": "http://[::7f00:1]",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "[::7f00:1]",
+    "hostname": "[::7f00:1]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://[0:0:0:0:0:0:13.1.68.3]",
+    "base": "http://example.org/foo/bar",
+    "href": "http://[::d01:4403]/",
+    "origin": "http://[::d01:4403]",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "[::d01:4403]",
+    "hostname": "[::d01:4403]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://[2001::1]:80",
+    "base": "http://example.org/foo/bar",
+    "href": "http://[2001::1]/",
+    "origin": "http://[2001::1]",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "[2001::1]",
+    "hostname": "[2001::1]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/example.com/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftp:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "ftp://example.com/",
+    "origin": "ftp://example.com",
+    "protocol": "ftp:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "https://example.com/",
+    "origin": "https://example.com",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "madeupscheme:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "madeupscheme:/example.com/",
+    "origin": "null",
+    "protocol": "madeupscheme:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "file:///example.com/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://example:1/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "file://example:test/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "file://example%/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "file://[example]/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "ftps:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "ftps:/example.com/",
+    "origin": "null",
+    "protocol": "ftps:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "gopher:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "gopher:/example.com/",
+    "origin": "null",
+    "protocol": "gopher:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ws:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "ws://example.com/",
+    "origin": "ws://example.com",
+    "protocol": "ws:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wss:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "wss://example.com/",
+    "origin": "wss://example.com",
+    "protocol": "wss:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "data:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "data:/example.com/",
+    "origin": "null",
+    "protocol": "data:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "javascript:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "javascript:/example.com/",
+    "origin": "null",
+    "protocol": "javascript:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "mailto:/example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "mailto:/example.com/",
+    "origin": "null",
+    "protocol": "mailto:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/example.com/",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftp:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "ftp://example.com/",
+    "origin": "ftp://example.com",
+    "protocol": "ftp:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "https://example.com/",
+    "origin": "https://example.com",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "madeupscheme:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "madeupscheme:example.com/",
+    "origin": "null",
+    "protocol": "madeupscheme:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftps:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "ftps:example.com/",
+    "origin": "null",
+    "protocol": "ftps:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "gopher:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "gopher:example.com/",
+    "origin": "null",
+    "protocol": "gopher:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ws:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "ws://example.com/",
+    "origin": "ws://example.com",
+    "protocol": "ws:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wss:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "wss://example.com/",
+    "origin": "wss://example.com",
+    "protocol": "wss:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "data:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "data:example.com/",
+    "origin": "null",
+    "protocol": "data:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "javascript:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "javascript:example.com/",
+    "origin": "null",
+    "protocol": "javascript:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "mailto:example.com/",
+    "base": "http://example.org/foo/bar",
+    "href": "mailto:example.com/",
+    "origin": "null",
+    "protocol": "mailto:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/a/b/c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/a/b/c",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/a/b/c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/a/ /c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/a/%20/c",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/a/%20/c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/a%2fc",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/a%2fc",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/a%2fc",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/a/%2f/c",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/a/%2f/c",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/a/%2f/c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "#β",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar#%CE%B2",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": "#%CE%B2"
+  },
+  {
+    "input": "data:text/html,test#test",
+    "base": "http://example.org/foo/bar",
+    "href": "data:text/html,test#test",
+    "origin": "null",
+    "protocol": "data:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "text/html,test",
+    "search": "",
+    "hash": "#test"
+  },
+  {
+    "input": "tel:1234567890",
+    "base": "http://example.org/foo/bar",
+    "href": "tel:1234567890",
+    "origin": "null",
+    "protocol": "tel:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "1234567890",
+    "search": "",
+    "hash": ""
+  },
+  "# Based on https://felixfbecker.github.io/whatwg-url-custom-host-repro/",
+  {
+    "input": "ssh://example.com/foo/bar.git",
+    "base": "http://example.org/",
+    "href": "ssh://example.com/foo/bar.git",
+    "origin": "null",
+    "protocol": "ssh:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/bar.git",
+    "search": "",
+    "hash": ""
+  },
+  "# Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/file.html",
+  {
+    "input": "file:c:\\foo\\bar.html",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///c:/foo/bar.html",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/c:/foo/bar.html",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "  File:c|////foo\\bar.html",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///c:////foo/bar.html",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/c:////foo/bar.html",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "C|/foo/bar",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///C:/foo/bar",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/C|\\foo\\bar",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///C:/foo/bar",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "//C|/foo/bar",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///C:/foo/bar",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "//server/file",
+    "base": "file:///tmp/mock/path",
+    "href": "file://server/file",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "server",
+    "hostname": "server",
+    "port": "",
+    "pathname": "/file",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "\\\\server\\file",
+    "base": "file:///tmp/mock/path",
+    "href": "file://server/file",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "server",
+    "hostname": "server",
+    "port": "",
+    "pathname": "/file",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/\\server/file",
+    "base": "file:///tmp/mock/path",
+    "href": "file://server/file",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "server",
+    "hostname": "server",
+    "port": "",
+    "pathname": "/file",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///foo/bar.txt",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///foo/bar.txt",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/foo/bar.txt",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///home/me",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///home/me",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/home/me",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "//",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "///",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "///test",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///test",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://test",
+    "base": "file:///tmp/mock/path",
+    "href": "file://test/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "test",
+    "hostname": "test",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://localhost",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://localhost/",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://localhost/test",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///test",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "test",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///tmp/mock/test",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/tmp/mock/test",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:test",
+    "base": "file:///tmp/mock/path",
+    "href": "file:///tmp/mock/test",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/tmp/mock/test",
+    "search": "",
+    "hash": ""
+  },
+  "# Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/script-tests/path.js",
+  {
+    "input": "http://example.com/././foo",
+    "base": "about:blank",
+    "href": "http://example.com/foo",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/./.foo",
+    "base": "about:blank",
+    "href": "http://example.com/.foo",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/.foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/.",
+    "base": "about:blank",
+    "href": "http://example.com/foo/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/./",
+    "base": "about:blank",
+    "href": "http://example.com/foo/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/bar/..",
+    "base": "about:blank",
+    "href": "http://example.com/foo/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/bar/../",
+    "base": "about:blank",
+    "href": "http://example.com/foo/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/..bar",
+    "base": "about:blank",
+    "href": "http://example.com/foo/..bar",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/..bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/bar/../ton",
+    "base": "about:blank",
+    "href": "http://example.com/foo/ton",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/ton",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/bar/../ton/../../a",
+    "base": "about:blank",
+    "href": "http://example.com/a",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/a",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/../../..",
+    "base": "about:blank",
+    "href": "http://example.com/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/../../../ton",
+    "base": "about:blank",
+    "href": "http://example.com/ton",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/ton",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/%2e",
+    "base": "about:blank",
+    "href": "http://example.com/foo/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/%2e%2",
+    "base": "about:blank",
+    "href": "http://example.com/foo/%2e%2",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/%2e%2",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/%2e./%2e%2e/.%2e/%2e.bar",
+    "base": "about:blank",
+    "href": "http://example.com/%2e.bar",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%2e.bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com////../..",
+    "base": "about:blank",
+    "href": "http://example.com//",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "//",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/bar//../..",
+    "base": "about:blank",
+    "href": "http://example.com/foo/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo/bar//..",
+    "base": "about:blank",
+    "href": "http://example.com/foo/bar/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo/bar/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo",
+    "base": "about:blank",
+    "href": "http://example.com/foo",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/%20foo",
+    "base": "about:blank",
+    "href": "http://example.com/%20foo",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%20foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo%",
+    "base": "about:blank",
+    "href": "http://example.com/foo%",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo%",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo%2",
+    "base": "about:blank",
+    "href": "http://example.com/foo%2",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo%2",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo%2zbar",
+    "base": "about:blank",
+    "href": "http://example.com/foo%2zbar",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo%2zbar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo%2©zbar",
+    "base": "about:blank",
+    "href": "http://example.com/foo%2%C3%82%C2%A9zbar",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo%2%C3%82%C2%A9zbar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo%41%7a",
+    "base": "about:blank",
+    "href": "http://example.com/foo%41%7a",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo%41%7a",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo\t\u0091%91",
+    "base": "about:blank",
+    "href": "http://example.com/foo%C2%91%91",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo%C2%91%91",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo%00%51",
+    "base": "about:blank",
+    "href": "http://example.com/foo%00%51",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foo%00%51",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/(%28:%3A%29)",
+    "base": "about:blank",
+    "href": "http://example.com/(%28:%3A%29)",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/(%28:%3A%29)",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/%3A%3a%3C%3c",
+    "base": "about:blank",
+    "href": "http://example.com/%3A%3a%3C%3c",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%3A%3a%3C%3c",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/foo\tbar",
+    "base": "about:blank",
+    "href": "http://example.com/foobar",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/foobar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com\\\\foo\\\\bar",
+    "base": "about:blank",
+    "href": "http://example.com//foo//bar",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "//foo//bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/%7Ffp3%3Eju%3Dduvgw%3Dd",
+    "base": "about:blank",
+    "href": "http://example.com/%7Ffp3%3Eju%3Dduvgw%3Dd",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%7Ffp3%3Eju%3Dduvgw%3Dd",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/@asdf%40",
+    "base": "about:blank",
+    "href": "http://example.com/@asdf%40",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/@asdf%40",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/你好你好",
+    "base": "about:blank",
+    "href": "http://example.com/%E4%BD%A0%E5%A5%BD%E4%BD%A0%E5%A5%BD",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%E4%BD%A0%E5%A5%BD%E4%BD%A0%E5%A5%BD",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/‥/foo",
+    "base": "about:blank",
+    "href": "http://example.com/%E2%80%A5/foo",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%E2%80%A5/foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com//foo",
+    "base": "about:blank",
+    "href": "http://example.com/%EF%BB%BF/foo",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%EF%BB%BF/foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.com/‮/foo/‭/bar",
+    "base": "about:blank",
+    "href": "http://example.com/%E2%80%AE/foo/%E2%80%AD/bar",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%E2%80%AE/foo/%E2%80%AD/bar",
+    "search": "",
+    "hash": ""
+  },
+  "# Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/script-tests/relative.js",
+  {
+    "input": "http://www.google.com/foo?bar=baz#",
+    "base": "about:blank",
+    "href": "http://www.google.com/foo?bar=baz#",
+    "origin": "http://www.google.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.google.com",
+    "hostname": "www.google.com",
+    "port": "",
+    "pathname": "/foo",
+    "search": "?bar=baz",
+    "hash": ""
+  },
+  {
+    "input": "http://www.google.com/foo?bar=baz# »",
+    "base": "about:blank",
+    "href": "http://www.google.com/foo?bar=baz#%20%C2%BB",
+    "origin": "http://www.google.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.google.com",
+    "hostname": "www.google.com",
+    "port": "",
+    "pathname": "/foo",
+    "search": "?bar=baz",
+    "hash": "#%20%C2%BB"
+  },
+  {
+    "input": "data:test# »",
+    "base": "about:blank",
+    "href": "data:test#%20%C2%BB",
+    "origin": "null",
+    "protocol": "data:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "test",
+    "search": "",
+    "hash": "#%20%C2%BB"
+  },
+  {
+    "input": "http://www.google.com",
+    "base": "about:blank",
+    "href": "http://www.google.com/",
+    "origin": "http://www.google.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.google.com",
+    "hostname": "www.google.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://192.0x00A80001",
+    "base": "about:blank",
+    "href": "http://192.168.0.1/",
+    "origin": "http://192.168.0.1",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "192.168.0.1",
+    "hostname": "192.168.0.1",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://www/foo%2Ehtml",
+    "base": "about:blank",
+    "href": "http://www/foo%2Ehtml",
+    "origin": "http://www",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www",
+    "hostname": "www",
+    "port": "",
+    "pathname": "/foo%2Ehtml",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://www/foo/%2E/html",
+    "base": "about:blank",
+    "href": "http://www/foo/html",
+    "origin": "http://www",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www",
+    "hostname": "www",
+    "port": "",
+    "pathname": "/foo/html",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://user:pass@/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://%25DOMAIN:foobar@foodomain.com/",
+    "base": "about:blank",
+    "href": "http://%25DOMAIN:foobar@foodomain.com/",
+    "origin": "http://foodomain.com",
+    "protocol": "http:",
+    "username": "%25DOMAIN",
+    "password": "foobar",
+    "host": "foodomain.com",
+    "hostname": "foodomain.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:\\\\www.google.com\\foo",
+    "base": "about:blank",
+    "href": "http://www.google.com/foo",
+    "origin": "http://www.google.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.google.com",
+    "hostname": "www.google.com",
+    "port": "",
+    "pathname": "/foo",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://foo:80/",
+    "base": "about:blank",
+    "href": "http://foo/",
+    "origin": "http://foo",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://foo:81/",
+    "base": "about:blank",
+    "href": "http://foo:81/",
+    "origin": "http://foo:81",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo:81",
+    "hostname": "foo",
+    "port": "81",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "httpa://foo:80/",
+    "base": "about:blank",
+    "href": "httpa://foo:80/",
+    "origin": "null",
+    "protocol": "httpa:",
+    "username": "",
+    "password": "",
+    "host": "foo:80",
+    "hostname": "foo",
+    "port": "80",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://foo:-80/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://foo:443/",
+    "base": "about:blank",
+    "href": "https://foo/",
+    "origin": "https://foo",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https://foo:80/",
+    "base": "about:blank",
+    "href": "https://foo:80/",
+    "origin": "https://foo:80",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "foo:80",
+    "hostname": "foo",
+    "port": "80",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftp://foo:21/",
+    "base": "about:blank",
+    "href": "ftp://foo/",
+    "origin": "ftp://foo",
+    "protocol": "ftp:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftp://foo:80/",
+    "base": "about:blank",
+    "href": "ftp://foo:80/",
+    "origin": "ftp://foo:80",
+    "protocol": "ftp:",
+    "username": "",
+    "password": "",
+    "host": "foo:80",
+    "hostname": "foo",
+    "port": "80",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "gopher://foo:70/",
+    "base": "about:blank",
+    "href": "gopher://foo:70/",
+    "origin": "null",
+    "protocol": "gopher:",
+    "username": "",
+    "password": "",
+    "host": "foo:70",
+    "hostname": "foo",
+    "port": "70",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "gopher://foo:443/",
+    "base": "about:blank",
+    "href": "gopher://foo:443/",
+    "origin": "null",
+    "protocol": "gopher:",
+    "username": "",
+    "password": "",
+    "host": "foo:443",
+    "hostname": "foo",
+    "port": "443",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ws://foo:80/",
+    "base": "about:blank",
+    "href": "ws://foo/",
+    "origin": "ws://foo",
+    "protocol": "ws:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ws://foo:81/",
+    "base": "about:blank",
+    "href": "ws://foo:81/",
+    "origin": "ws://foo:81",
+    "protocol": "ws:",
+    "username": "",
+    "password": "",
+    "host": "foo:81",
+    "hostname": "foo",
+    "port": "81",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ws://foo:443/",
+    "base": "about:blank",
+    "href": "ws://foo:443/",
+    "origin": "ws://foo:443",
+    "protocol": "ws:",
+    "username": "",
+    "password": "",
+    "host": "foo:443",
+    "hostname": "foo",
+    "port": "443",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ws://foo:815/",
+    "base": "about:blank",
+    "href": "ws://foo:815/",
+    "origin": "ws://foo:815",
+    "protocol": "ws:",
+    "username": "",
+    "password": "",
+    "host": "foo:815",
+    "hostname": "foo",
+    "port": "815",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wss://foo:80/",
+    "base": "about:blank",
+    "href": "wss://foo:80/",
+    "origin": "wss://foo:80",
+    "protocol": "wss:",
+    "username": "",
+    "password": "",
+    "host": "foo:80",
+    "hostname": "foo",
+    "port": "80",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wss://foo:81/",
+    "base": "about:blank",
+    "href": "wss://foo:81/",
+    "origin": "wss://foo:81",
+    "protocol": "wss:",
+    "username": "",
+    "password": "",
+    "host": "foo:81",
+    "hostname": "foo",
+    "port": "81",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wss://foo:443/",
+    "base": "about:blank",
+    "href": "wss://foo/",
+    "origin": "wss://foo",
+    "protocol": "wss:",
+    "username": "",
+    "password": "",
+    "host": "foo",
+    "hostname": "foo",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wss://foo:815/",
+    "base": "about:blank",
+    "href": "wss://foo:815/",
+    "origin": "wss://foo:815",
+    "protocol": "wss:",
+    "username": "",
+    "password": "",
+    "host": "foo:815",
+    "hostname": "foo",
+    "port": "815",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:/example.com/",
+    "base": "about:blank",
+    "href": "http://example.com/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftp:/example.com/",
+    "base": "about:blank",
+    "href": "ftp://example.com/",
+    "origin": "ftp://example.com",
+    "protocol": "ftp:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https:/example.com/",
+    "base": "about:blank",
+    "href": "https://example.com/",
+    "origin": "https://example.com",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "madeupscheme:/example.com/",
+    "base": "about:blank",
+    "href": "madeupscheme:/example.com/",
+    "origin": "null",
+    "protocol": "madeupscheme:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:/example.com/",
+    "base": "about:blank",
+    "href": "file:///example.com/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftps:/example.com/",
+    "base": "about:blank",
+    "href": "ftps:/example.com/",
+    "origin": "null",
+    "protocol": "ftps:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "gopher:/example.com/",
+    "base": "about:blank",
+    "href": "gopher:/example.com/",
+    "origin": "null",
+    "protocol": "gopher:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ws:/example.com/",
+    "base": "about:blank",
+    "href": "ws://example.com/",
+    "origin": "ws://example.com",
+    "protocol": "ws:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wss:/example.com/",
+    "base": "about:blank",
+    "href": "wss://example.com/",
+    "origin": "wss://example.com",
+    "protocol": "wss:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "data:/example.com/",
+    "base": "about:blank",
+    "href": "data:/example.com/",
+    "origin": "null",
+    "protocol": "data:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "javascript:/example.com/",
+    "base": "about:blank",
+    "href": "javascript:/example.com/",
+    "origin": "null",
+    "protocol": "javascript:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "mailto:/example.com/",
+    "base": "about:blank",
+    "href": "mailto:/example.com/",
+    "origin": "null",
+    "protocol": "mailto:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:example.com/",
+    "base": "about:blank",
+    "href": "http://example.com/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftp:example.com/",
+    "base": "about:blank",
+    "href": "ftp://example.com/",
+    "origin": "ftp://example.com",
+    "protocol": "ftp:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https:example.com/",
+    "base": "about:blank",
+    "href": "https://example.com/",
+    "origin": "https://example.com",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "madeupscheme:example.com/",
+    "base": "about:blank",
+    "href": "madeupscheme:example.com/",
+    "origin": "null",
+    "protocol": "madeupscheme:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ftps:example.com/",
+    "base": "about:blank",
+    "href": "ftps:example.com/",
+    "origin": "null",
+    "protocol": "ftps:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "gopher:example.com/",
+    "base": "about:blank",
+    "href": "gopher:example.com/",
+    "origin": "null",
+    "protocol": "gopher:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ws:example.com/",
+    "base": "about:blank",
+    "href": "ws://example.com/",
+    "origin": "ws://example.com",
+    "protocol": "ws:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wss:example.com/",
+    "base": "about:blank",
+    "href": "wss://example.com/",
+    "origin": "wss://example.com",
+    "protocol": "wss:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "data:example.com/",
+    "base": "about:blank",
+    "href": "data:example.com/",
+    "origin": "null",
+    "protocol": "data:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "javascript:example.com/",
+    "base": "about:blank",
+    "href": "javascript:example.com/",
+    "origin": "null",
+    "protocol": "javascript:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "mailto:example.com/",
+    "base": "about:blank",
+    "href": "mailto:example.com/",
+    "origin": "null",
+    "protocol": "mailto:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "example.com/",
+    "search": "",
+    "hash": ""
+  },
+  "# Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/segments-userinfo-vs-host.html",
+  {
+    "input": "http:@www.example.com",
+    "base": "about:blank",
+    "href": "http://www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:/@www.example.com",
+    "base": "about:blank",
+    "href": "http://www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://@www.example.com",
+    "base": "about:blank",
+    "href": "http://www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:a:b@www.example.com",
+    "base": "about:blank",
+    "href": "http://a:b@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "a",
+    "password": "b",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:/a:b@www.example.com",
+    "base": "about:blank",
+    "href": "http://a:b@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "a",
+    "password": "b",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://a:b@www.example.com",
+    "base": "about:blank",
+    "href": "http://a:b@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "a",
+    "password": "b",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://@pple.com",
+    "base": "about:blank",
+    "href": "http://pple.com/",
+    "origin": "http://pple.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "pple.com",
+    "hostname": "pple.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http::b@www.example.com",
+    "base": "about:blank",
+    "href": "http://:b@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "b",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:/:b@www.example.com",
+    "base": "about:blank",
+    "href": "http://:b@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "b",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://:b@www.example.com",
+    "base": "about:blank",
+    "href": "http://:b@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "b",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:/:@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://user@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http:@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http:/@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https:@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http:a:b@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http:/a:b@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://a:b@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http::@/www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http:a:@www.example.com",
+    "base": "about:blank",
+    "href": "http://a@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "a",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:/a:@www.example.com",
+    "base": "about:blank",
+    "href": "http://a@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "a",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://a:@www.example.com",
+    "base": "about:blank",
+    "href": "http://a@www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "a",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://www.@pple.com",
+    "base": "about:blank",
+    "href": "http://www.@pple.com/",
+    "origin": "http://pple.com",
+    "protocol": "http:",
+    "username": "www.",
+    "password": "",
+    "host": "pple.com",
+    "hostname": "pple.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http:@:www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http:/@:www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://@:www.example.com",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://:@www.example.com",
+    "base": "about:blank",
+    "href": "http://www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "# Others",
+  {
+    "input": "/",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/test.txt",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/test.txt",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/test.txt",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": ".",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "..",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "test.txt",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/test.txt",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/test.txt",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "./test.txt",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/test.txt",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/test.txt",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "../test.txt",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/test.txt",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/test.txt",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "../aaa/test.txt",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/aaa/test.txt",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/aaa/test.txt",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "../../test.txt",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/test.txt",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/test.txt",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "中/test.txt",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example.com/%E4%B8%AD/test.txt",
+    "origin": "http://www.example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example.com",
+    "hostname": "www.example.com",
+    "port": "",
+    "pathname": "/%E4%B8%AD/test.txt",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://www.example2.com",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example2.com/",
+    "origin": "http://www.example2.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example2.com",
+    "hostname": "www.example2.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "//www.example2.com",
+    "base": "http://www.example.com/test",
+    "href": "http://www.example2.com/",
+    "origin": "http://www.example2.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.example2.com",
+    "hostname": "www.example2.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:...",
+    "base": "http://www.example.com/test",
+    "href": "file:///...",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/...",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:..",
+    "base": "http://www.example.com/test",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:a",
+    "base": "http://www.example.com/test",
+    "href": "file:///a",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/a",
+    "search": "",
+    "hash": ""
+  },
+  "# Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/host.html",
+  "Basic canonicalization, uppercase should be converted to lowercase",
+  {
+    "input": "http://ExAmPlE.CoM",
+    "base": "http://other.com/",
+    "href": "http://example.com/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example example.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://Goo%20 goo%7C|.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://[]",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://[:]",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "U+3000 is mapped to U+0020 (space) which is disallowed",
+  {
+    "input": "http://GOO\u00a0\u3000goo.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "Other types of space (no-break, zero-width, zero-width-no-break) are name-prepped away to nothing. U+200B, U+2060, and U+FEFF, are ignored",
+  {
+    "input": "http://GOO\u200b\u2060\ufeffgoo.com",
+    "base": "http://other.com/",
+    "href": "http://googoo.com/",
+    "origin": "http://googoo.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "googoo.com",
+    "hostname": "googoo.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "Leading and trailing C0 control or space",
+  {
+    "input": "\u0000\u001b\u0004\u0012 http://example.com/\u001f \u000d ",
+    "base": "about:blank",
+    "href": "http://example.com/",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "Ideographic full stop (full-width period for Chinese, etc.) should be treated as a dot. U+3002 is mapped to U+002E (dot)",
+  {
+    "input": "http://www.foo。bar.com",
+    "base": "http://other.com/",
+    "href": "http://www.foo.bar.com/",
+    "origin": "http://www.foo.bar.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "www.foo.bar.com",
+    "hostname": "www.foo.bar.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "Invalid unicode characters should fail... U+FDD0 is disallowed; %ef%b7%90 is U+FDD0",
+  {
+    "input": "http://\ufdd0zyx.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "This is the same as previous but escaped",
+  {
+    "input": "http://%ef%b7%90zyx.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "U+FFFD",
+  {
+    "input": "https://\ufffd",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://%EF%BF%BD",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://x/\ufffd?\ufffd#\ufffd",
+    "base": "about:blank",
+    "href": "https://x/%EF%BF%BD?%EF%BF%BD#%EF%BF%BD",
+    "origin": "https://x",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "x",
+    "hostname": "x",
+    "port": "",
+    "pathname": "/%EF%BF%BD",
+    "search": "?%EF%BF%BD",
+    "hash": "#%EF%BF%BD"
+  },
+  "Test name prepping, fullwidth input should be converted to ASCII and NOT IDN-ized. This is 'Go' in fullwidth UTF-8/UTF-16.",
+  {
+    "input": "http://Ｇ�.com",
+    "base": "http://other.com/",
+    "href": "http://go.com/",
+    "origin": "http://go.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "go.com",
+    "hostname": "go.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "URL spec forbids the following. https://www.w3.org/Bugs/Public/show_bug.cgi?id=24257",
+  {
+    "input": "http://％４１.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://%ef%bc%85%ef%bc%94%ef%bc%91.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "...%00 in fullwidth should fail (also as escaped UTF-8 input)",
+  {
+    "input": "http://％��.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://%ef%bc%85%ef%bc%90%ef%bc%90.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "Basic IDN support, UTF-8 and UTF-16 input should be converted to IDN",
+  {
+    "input": "http://你好你好",
+    "base": "http://other.com/",
+    "href": "http://xn--6qqa088eba/",
+    "origin": "http://xn--6qqa088eba",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "xn--6qqa088eba",
+    "hostname": "xn--6qqa088eba",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https://faß.ExAmPlE/",
+    "base": "about:blank",
+    "href": "https://xn--fa-hia.example/",
+    "origin": "https://xn--fa-hia.example",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "xn--fa-hia.example",
+    "hostname": "xn--fa-hia.example",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "sc://faß.ExAmPlE/",
+    "base": "about:blank",
+    "href": "sc://fa%C3%9F.ExAmPlE/",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "fa%C3%9F.ExAmPlE",
+    "hostname": "fa%C3%9F.ExAmPlE",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "Invalid escaped characters should fail and the percents should be escaped. https://www.w3.org/Bugs/Public/show_bug.cgi?id=24191",
+  {
+    "input": "http://%zz%66%a.com",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "If we get an invalid character that has been escaped.",
+  {
+    "input": "http://%25",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://hello%00",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "Escaped numbers should be treated like IP addresses if they are.",
+  {
+    "input": "http://%30%78%63%30%2e%30%32%35%30.01",
+    "base": "http://other.com/",
+    "href": "http://192.168.0.1/",
+    "origin": "http://192.168.0.1",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "192.168.0.1",
+    "hostname": "192.168.0.1",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://%30%78%63%30%2e%30%32%35%30.01%2e",
+    "base": "http://other.com/",
+    "href": "http://192.168.0.1/",
+    "origin": "http://192.168.0.1",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "192.168.0.1",
+    "hostname": "192.168.0.1",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://192.168.0.257",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "Invalid escaping in hosts causes failure",
+  {
+    "input": "http://%3g%78%63%30%2e%30%32%35%30%2E.01",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "A space in a host causes failure",
+  {
+    "input": "http://192.168.0.1 hello",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "https://x x:12",
+    "base": "about:blank",
+    "failure": true
+  },
+  "Fullwidth and escaped UTF-8 fullwidth should still be treated as IP",
+  {
+    "input": "http://�Ｘｃ�．�２５�．�１",
+    "base": "http://other.com/",
+    "href": "http://192.168.0.1/",
+    "origin": "http://192.168.0.1",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "192.168.0.1",
+    "hostname": "192.168.0.1",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "Domains with empty labels",
+  {
+    "input": "http://./",
+    "base": "about:blank",
+    "href": "http://./",
+    "origin": "http://.",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": ".",
+    "hostname": ".",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://../",
+    "base": "about:blank",
+    "href": "http://../",
+    "origin": "http://..",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "..",
+    "hostname": "..",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://0..0x300/",
+    "base": "about:blank",
+    "href": "http://0..0x300/",
+    "origin": "http://0..0x300",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "0..0x300",
+    "hostname": "0..0x300",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "Broken IPv6",
+  {
+    "input": "http://[www.google.com]/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://[google.com]",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://[::1.2.3.4x]",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://[::1.2.3.]",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://[::1.2.]",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://[::1.]",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  "Misc Unicode",
+  {
+    "input": "http://foo:💩@example.com/bar",
+    "base": "http://other.com/",
+    "href": "http://foo:%F0%9F%92%A9@example.com/bar",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "foo",
+    "password": "%F0%9F%92%A9",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/bar",
+    "search": "",
+    "hash": ""
+  },
+  "# resolving a fragment against any scheme succeeds",
+  {
+    "input": "#",
+    "base": "test:test",
+    "href": "test:test#",
+    "origin": "null",
+    "protocol": "test:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "test",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "#x",
+    "base": "mailto:x@x.com",
+    "href": "mailto:x@x.com#x",
+    "origin": "null",
+    "protocol": "mailto:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "x@x.com",
+    "search": "",
+    "hash": "#x"
+  },
+  {
+    "input": "#x",
+    "base": "data:,",
+    "href": "data:,#x",
+    "origin": "null",
+    "protocol": "data:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": ",",
+    "search": "",
+    "hash": "#x"
+  },
+  {
+    "input": "#x",
+    "base": "about:blank",
+    "href": "about:blank#x",
+    "origin": "null",
+    "protocol": "about:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "blank",
+    "search": "",
+    "hash": "#x"
+  },
+  {
+    "input": "#",
+    "base": "test:test?test",
+    "href": "test:test?test#",
+    "origin": "null",
+    "protocol": "test:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "test",
+    "search": "?test",
+    "hash": ""
+  },
+  "# multiple @ in authority state",
+  {
+    "input": "https://@test@test@example:800/",
+    "base": "http://doesnotmatter/",
+    "href": "https://%40test%40test@example:800/",
+    "origin": "https://example:800",
+    "protocol": "https:",
+    "username": "%40test%40test",
+    "password": "",
+    "host": "example:800",
+    "hostname": "example",
+    "port": "800",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https://@@@example",
+    "base": "http://doesnotmatter/",
+    "href": "https://%40%40@example/",
+    "origin": "https://example",
+    "protocol": "https:",
+    "username": "%40%40",
+    "password": "",
+    "host": "example",
+    "hostname": "example",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "non-az-09 characters",
+  {
+    "input": "http://`{}:`{}@h/`{}?`{}",
+    "base": "http://doesnotmatter/",
+    "href": "http://%60%7B%7D:%60%7B%7D@h/%60%7B%7D?`{}",
+    "origin": "http://h",
+    "protocol": "http:",
+    "username": "%60%7B%7D",
+    "password": "%60%7B%7D",
+    "host": "h",
+    "hostname": "h",
+    "port": "",
+    "pathname": "/%60%7B%7D",
+    "search": "?`{}",
+    "hash": ""
+  },
+  "byte is ' and url is special",
+  {
+    "input": "http://host/?'",
+    "base": "about:blank",
+    "href": "http://host/?%27",
+    "origin": "http://host",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "host",
+    "hostname": "host",
+    "port": "",
+    "pathname": "/",
+    "search": "?%27",
+    "hash": ""
+  },
+  {
+    "input": "notspecial://host/?'",
+    "base": "about:blank",
+    "href": "notspecial://host/?'",
+    "origin": "null",
+    "protocol": "notspecial:",
+    "username": "",
+    "password": "",
+    "host": "host",
+    "hostname": "host",
+    "port": "",
+    "pathname": "/",
+    "search": "?'",
+    "hash": ""
+  },
+  "# Credentials in base",
+  {
+    "input": "/some/path",
+    "base": "http://user@example.org/smth",
+    "href": "http://user@example.org/some/path",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "user",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/some/path",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "",
+    "base": "http://user:pass@example.org:21/smth",
+    "href": "http://user:pass@example.org:21/smth",
+    "origin": "http://example.org:21",
+    "protocol": "http:",
+    "username": "user",
+    "password": "pass",
+    "host": "example.org:21",
+    "hostname": "example.org",
+    "port": "21",
+    "pathname": "/smth",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/some/path",
+    "base": "http://user:pass@example.org:21/smth",
+    "href": "http://user:pass@example.org:21/some/path",
+    "origin": "http://example.org:21",
+    "protocol": "http:",
+    "username": "user",
+    "password": "pass",
+    "host": "example.org:21",
+    "hostname": "example.org",
+    "port": "21",
+    "pathname": "/some/path",
+    "search": "",
+    "hash": ""
+  },
+  "# a set of tests designed by zcorpan for relative URLs with unknown schemes",
+  {
+    "input": "i",
+    "base": "sc:sd",
+    "failure": true
+  },
+  {
+    "input": "i",
+    "base": "sc:sd/sd",
+    "failure": true
+  },
+  {
+    "input": "i",
+    "base": "sc:/pa/pa",
+    "href": "sc:/pa/i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pa/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "i",
+    "base": "sc://ho/pa",
+    "href": "sc://ho/i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "ho",
+    "hostname": "ho",
+    "port": "",
+    "pathname": "/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "i",
+    "base": "sc:///pa/pa",
+    "href": "sc:///pa/i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pa/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "../i",
+    "base": "sc:sd",
+    "failure": true
+  },
+  {
+    "input": "../i",
+    "base": "sc:sd/sd",
+    "failure": true
+  },
+  {
+    "input": "../i",
+    "base": "sc:/pa/pa",
+    "href": "sc:/i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "../i",
+    "base": "sc://ho/pa",
+    "href": "sc://ho/i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "ho",
+    "hostname": "ho",
+    "port": "",
+    "pathname": "/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "../i",
+    "base": "sc:///pa/pa",
+    "href": "sc:///i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/i",
+    "base": "sc:sd",
+    "failure": true
+  },
+  {
+    "input": "/i",
+    "base": "sc:sd/sd",
+    "failure": true
+  },
+  {
+    "input": "/i",
+    "base": "sc:/pa/pa",
+    "href": "sc:/i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/i",
+    "base": "sc://ho/pa",
+    "href": "sc://ho/i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "ho",
+    "hostname": "ho",
+    "port": "",
+    "pathname": "/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/i",
+    "base": "sc:///pa/pa",
+    "href": "sc:///i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/i",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "?i",
+    "base": "sc:sd",
+    "failure": true
+  },
+  {
+    "input": "?i",
+    "base": "sc:sd/sd",
+    "failure": true
+  },
+  {
+    "input": "?i",
+    "base": "sc:/pa/pa",
+    "href": "sc:/pa/pa?i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pa/pa",
+    "search": "?i",
+    "hash": ""
+  },
+  {
+    "input": "?i",
+    "base": "sc://ho/pa",
+    "href": "sc://ho/pa?i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "ho",
+    "hostname": "ho",
+    "port": "",
+    "pathname": "/pa",
+    "search": "?i",
+    "hash": ""
+  },
+  {
+    "input": "?i",
+    "base": "sc:///pa/pa",
+    "href": "sc:///pa/pa?i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pa/pa",
+    "search": "?i",
+    "hash": ""
+  },
+  {
+    "input": "#i",
+    "base": "sc:sd",
+    "href": "sc:sd#i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "sd",
+    "search": "",
+    "hash": "#i"
+  },
+  {
+    "input": "#i",
+    "base": "sc:sd/sd",
+    "href": "sc:sd/sd#i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "sd/sd",
+    "search": "",
+    "hash": "#i"
+  },
+  {
+    "input": "#i",
+    "base": "sc:/pa/pa",
+    "href": "sc:/pa/pa#i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pa/pa",
+    "search": "",
+    "hash": "#i"
+  },
+  {
+    "input": "#i",
+    "base": "sc://ho/pa",
+    "href": "sc://ho/pa#i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "ho",
+    "hostname": "ho",
+    "port": "",
+    "pathname": "/pa",
+    "search": "",
+    "hash": "#i"
+  },
+  {
+    "input": "#i",
+    "base": "sc:///pa/pa",
+    "href": "sc:///pa/pa#i",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pa/pa",
+    "search": "",
+    "hash": "#i"
+  },
+  "# make sure that relative URL logic works on known typically non-relative schemes too",
+  {
+    "input": "about:/../",
+    "base": "about:blank",
+    "href": "about:/",
+    "origin": "null",
+    "protocol": "about:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "data:/../",
+    "base": "about:blank",
+    "href": "data:/",
+    "origin": "null",
+    "protocol": "data:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "javascript:/../",
+    "base": "about:blank",
+    "href": "javascript:/",
+    "origin": "null",
+    "protocol": "javascript:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "mailto:/../",
+    "base": "about:blank",
+    "href": "mailto:/",
+    "origin": "null",
+    "protocol": "mailto:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "# unknown schemes and their hosts",
+  {
+    "input": "sc://ñ.test/",
+    "base": "about:blank",
+    "href": "sc://%C3%B1.test/",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%C3%B1.test",
+    "hostname": "%C3%B1.test",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "sc://\u0000/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "sc:// /",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "sc://%/",
+    "base": "about:blank",
+    "href": "sc://%/",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%",
+    "hostname": "%",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "sc://@/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "sc://te@s:t@/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "sc://:/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "sc://:12/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "sc://[/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "sc://\\/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "sc://]/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "x",
+    "base": "sc://ñ",
+    "href": "sc://%C3%B1/x",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%C3%B1",
+    "hostname": "%C3%B1",
+    "port": "",
+    "pathname": "/x",
+    "search": "",
+    "hash": ""
+  },
+  "# unknown schemes and backslashes",
+  {
+    "input": "sc:\\../",
+    "base": "about:blank",
+    "href": "sc:\\../",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "\\../",
+    "search": "",
+    "hash": ""
+  },
+  "# unknown scheme with path looking like a password",
+  {
+    "input": "sc::a@example.net",
+    "base": "about:blank",
+    "href": "sc::a@example.net",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": ":a@example.net",
+    "search": "",
+    "hash": ""
+  },
+  "# unknown scheme with bogus percent-encoding",
+  {
+    "input": "wow:%NBD",
+    "base": "about:blank",
+    "href": "wow:%NBD",
+    "origin": "null",
+    "protocol": "wow:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "%NBD",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "wow:%1G",
+    "base": "about:blank",
+    "href": "wow:%1G",
+    "origin": "null",
+    "protocol": "wow:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "%1G",
+    "search": "",
+    "hash": ""
+  },
+  "# unknown scheme with non-URL characters in the path",
+  {
+    "input": "wow:\uFFFF",
+    "base": "about:blank",
+    "href": "wow:%EF%BF%BF",
+    "origin": "null",
+    "protocol": "wow:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "%EF%BF%BF",
+    "search": "",
+    "hash": ""
+  },
+  "Forbidden host code points",
+  {
+    "input": "http://a<b",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://a>b",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://a^b",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "non-special://a<b",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "non-special://a>b",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "non-special://a^b",
+    "base": "about:blank",
+    "failure": true
+  },
+  "Allowed host code points",
+  {
+    "input": "http://\u001F!\"$&'()*+,-.;=_`{|}~/",
+    "base": "about:blank",
+    "href": "http://\u001F!\"$&'()*+,-.;=_`{|}~/",
+    "origin": "http://\u001F!\"$&'()*+,-.;=_`{|}~",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "\u001F!\"$&'()*+,-.;=_`{|}~",
+    "hostname": "\u001F!\"$&'()*+,-.;=_`{|}~",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "sc://\u001F!\"$&'()*+,-.;=_`{|}~/",
+    "base": "about:blank",
+    "href": "sc://%1F!\"$&'()*+,-.;=_`{|}~/",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%1F!\"$&'()*+,-.;=_`{|}~",
+    "hostname": "%1F!\"$&'()*+,-.;=_`{|}~",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "# Hosts and percent-encoding",
+  {
+    "input": "ftp://example.com%80/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "ftp://example.com%A0/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://example.com%80/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://example.com%A0/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "ftp://%e2%98%83",
+    "base": "about:blank",
+    "href": "ftp://xn--n3h/",
+    "origin": "ftp://xn--n3h",
+    "protocol": "ftp:",
+    "username": "",
+    "password": "",
+    "host": "xn--n3h",
+    "hostname": "xn--n3h",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https://%e2%98%83",
+    "base": "about:blank",
+    "href": "https://xn--n3h/",
+    "origin": "https://xn--n3h",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "xn--n3h",
+    "hostname": "xn--n3h",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "# tests from jsdom/whatwg-url designed for code coverage",
+  {
+    "input": "http://127.0.0.1:10100/relative_import.html",
+    "base": "about:blank",
+    "href": "http://127.0.0.1:10100/relative_import.html",
+    "origin": "http://127.0.0.1:10100",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "127.0.0.1:10100",
+    "hostname": "127.0.0.1",
+    "port": "10100",
+    "pathname": "/relative_import.html",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://facebook.com/?foo=%7B%22abc%22",
+    "base": "about:blank",
+    "href": "http://facebook.com/?foo=%7B%22abc%22",
+    "origin": "http://facebook.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "facebook.com",
+    "hostname": "facebook.com",
+    "port": "",
+    "pathname": "/",
+    "search": "?foo=%7B%22abc%22",
+    "hash": ""
+  },
+  {
+    "input": "https://localhost:3000/jqueryui@1.2.3",
+    "base": "about:blank",
+    "href": "https://localhost:3000/jqueryui@1.2.3",
+    "origin": "https://localhost:3000",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "localhost:3000",
+    "hostname": "localhost",
+    "port": "3000",
+    "pathname": "/jqueryui@1.2.3",
+    "search": "",
+    "hash": ""
+  },
+  "# tab/LF/CR",
+  {
+    "input": "h\tt\nt\rp://h\to\ns\rt:9\t0\n0\r0/p\ta\nt\rh?q\tu\ne\rry#f\tr\na\rg",
+    "base": "about:blank",
+    "href": "http://host:9000/path?query#frag",
+    "origin": "http://host:9000",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "host:9000",
+    "hostname": "host",
+    "port": "9000",
+    "pathname": "/path",
+    "search": "?query",
+    "hash": "#frag"
+  },
+  "# Stringification of URL.searchParams",
+  {
+    "input": "?a=b&c=d",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar?a=b&c=d",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "?a=b&c=d",
+    "searchParams": "a=b&c=d",
+    "hash": ""
+  },
+  {
+    "input": "??a=b&c=d",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar??a=b&c=d",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "??a=b&c=d",
+    "searchParams": "%3Fa=b&c=d",
+    "hash": ""
+  },
+  "# Scheme only",
+  {
+    "input": "http:",
+    "base": "http://example.org/foo/bar",
+    "href": "http://example.org/foo/bar",
+    "origin": "http://example.org",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "searchParams": "",
+    "hash": ""
+  },
+  {
+    "input": "http:",
+    "base": "https://example.org/foo/bar",
+    "failure": true
+  },
+  {
+    "input": "sc:",
+    "base": "https://example.org/foo/bar",
+    "href": "sc:",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "",
+    "search": "",
+    "searchParams": "",
+    "hash": ""
+  },
+  "# Percent encoding of fragments",
+  {
+    "input": "http://foo.bar/baz?qux#foo\bbar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%08bar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%08bar"
+  },
+  {
+    "input": "http://foo.bar/baz?qux#foo\"bar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%22bar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%22bar"
+  },
+  {
+    "input": "http://foo.bar/baz?qux#foo<bar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%3Cbar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%3Cbar"
+  },
+  {
+    "input": "http://foo.bar/baz?qux#foo>bar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%3Ebar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%3Ebar"
+  },
+  {
+    "input": "http://foo.bar/baz?qux#foo`bar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%60bar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%60bar"
+  },
+  "# IPv4 parsing (via https://github.com/nodejs/node/pull/10317)",
+  {
+    "input": "http://192.168.257",
+    "base": "http://other.com/",
+    "href": "http://192.168.1.1/",
+    "origin": "http://192.168.1.1",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "192.168.1.1",
+    "hostname": "192.168.1.1",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://192.168.257.com",
+    "base": "http://other.com/",
+    "href": "http://192.168.257.com/",
+    "origin": "http://192.168.257.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "192.168.257.com",
+    "hostname": "192.168.257.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://256",
+    "base": "http://other.com/",
+    "href": "http://0.0.1.0/",
+    "origin": "http://0.0.1.0",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "0.0.1.0",
+    "hostname": "0.0.1.0",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://256.com",
+    "base": "http://other.com/",
+    "href": "http://256.com/",
+    "origin": "http://256.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "256.com",
+    "hostname": "256.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://999999999",
+    "base": "http://other.com/",
+    "href": "http://59.154.201.255/",
+    "origin": "http://59.154.201.255",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "59.154.201.255",
+    "hostname": "59.154.201.255",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://999999999.com",
+    "base": "http://other.com/",
+    "href": "http://999999999.com/",
+    "origin": "http://999999999.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "999999999.com",
+    "hostname": "999999999.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://10000000000",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://10000000000.com",
+    "base": "http://other.com/",
+    "href": "http://10000000000.com/",
+    "origin": "http://10000000000.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "10000000000.com",
+    "hostname": "10000000000.com",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://4294967295",
+    "base": "http://other.com/",
+    "href": "http://255.255.255.255/",
+    "origin": "http://255.255.255.255",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "255.255.255.255",
+    "hostname": "255.255.255.255",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://4294967296",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://0xffffffff",
+    "base": "http://other.com/",
+    "href": "http://255.255.255.255/",
+    "origin": "http://255.255.255.255",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "255.255.255.255",
+    "hostname": "255.255.255.255",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://0xffffffff1",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://256.256.256.256",
+    "base": "http://other.com/",
+    "failure": true
+  },
+  {
+    "input": "http://256.256.256.256.256",
+    "base": "http://other.com/",
+    "href": "http://256.256.256.256.256/",
+    "origin": "http://256.256.256.256.256",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "256.256.256.256.256",
+    "hostname": "256.256.256.256.256",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "https://0x.0x.0",
+    "base": "about:blank",
+    "href": "https://0.0.0.0/",
+    "origin": "https://0.0.0.0",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "0.0.0.0",
+    "hostname": "0.0.0.0",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "More IPv4 parsing (via https://github.com/jsdom/whatwg-url/issues/92)",
+  {
+    "input": "https://0x100000000/test",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://256.0.0.1/test",
+    "base": "about:blank",
+    "failure": true
+  },
+  "# file URLs containing percent-encoded Windows drive letters (shouldn't work)",
+  {
+    "input": "file:///C%3A/",
+    "base": "about:blank",
+    "href": "file:///C%3A/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C%3A/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///C%7C/",
+    "base": "about:blank",
+    "href": "file:///C%7C/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C%7C/",
+    "search": "",
+    "hash": ""
+  },
+  "# file URLs relative to other file URLs (via https://github.com/jsdom/whatwg-url/pull/60)",
+  {
+    "input": "pix/submit.gif",
+    "base": "file:///C:/Users/Domenic/Dropbox/GitHub/tmpvar/jsdom/test/level2/html/files/anchor.html",
+    "href": "file:///C:/Users/Domenic/Dropbox/GitHub/tmpvar/jsdom/test/level2/html/files/pix/submit.gif",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/Users/Domenic/Dropbox/GitHub/tmpvar/jsdom/test/level2/html/files/pix/submit.gif",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "..",
+    "base": "file:///C:/",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "..",
+    "base": "file:///",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "# More file URL tests by zcorpan and annevk",
+  {
+    "input": "/",
+    "base": "file:///C:/a/b",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "//d:",
+    "base": "file:///C:/a/b",
+    "href": "file:///d:",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/d:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "//d:/..",
+    "base": "file:///C:/a/b",
+    "href": "file:///d:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/d:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "..",
+    "base": "file:///ab:/",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "..",
+    "base": "file:///1:/",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "",
+    "base": "file:///test?test#test",
+    "href": "file:///test?test",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "?test",
+    "hash": ""
+  },
+  {
+    "input": "file:",
+    "base": "file:///test?test#test",
+    "href": "file:///test?test",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "?test",
+    "hash": ""
+  },
+  {
+    "input": "?x",
+    "base": "file:///test?test#test",
+    "href": "file:///test?x",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "?x",
+    "hash": ""
+  },
+  {
+    "input": "file:?x",
+    "base": "file:///test?test#test",
+    "href": "file:///test?x",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "?x",
+    "hash": ""
+  },
+  {
+    "input": "#x",
+    "base": "file:///test?test#test",
+    "href": "file:///test?test#x",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "?test",
+    "hash": "#x"
+  },
+  {
+    "input": "file:#x",
+    "base": "file:///test?test#test",
+    "href": "file:///test?test#x",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "?test",
+    "hash": "#x"
+  },
+  "# File URLs and many (back)slashes",
+  {
+    "input": "file:\\\\//",
+    "base": "about:blank",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:\\\\\\\\",
+    "base": "about:blank",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:\\\\\\\\?fox",
+    "base": "about:blank",
+    "href": "file:///?fox",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "?fox",
+    "hash": ""
+  },
+  {
+    "input": "file:\\\\\\\\#guppy",
+    "base": "about:blank",
+    "href": "file:///#guppy",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": "#guppy"
+  },
+  {
+    "input": "file://spider///",
+    "base": "about:blank",
+    "href": "file://spider/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "spider",
+    "hostname": "spider",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:\\\\localhost//",
+    "base": "about:blank",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///localhost//cat",
+    "base": "about:blank",
+    "href": "file:///localhost//cat",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/localhost//cat",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://\\/localhost//cat",
+    "base": "about:blank",
+    "href": "file:///localhost//cat",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/localhost//cat",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://localhost//a//../..//",
+    "base": "about:blank",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/////mouse",
+    "base": "file:///elephant",
+    "href": "file:///mouse",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/mouse",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "\\//pig",
+    "base": "file://lion/",
+    "href": "file:///pig",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pig",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "\\/localhost//pig",
+    "base": "file://lion/",
+    "href": "file:///pig",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pig",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "//localhost//pig",
+    "base": "file://lion/",
+    "href": "file:///pig",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/pig",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/..//localhost//pig",
+    "base": "file://lion/",
+    "href": "file://lion/localhost//pig",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "lion",
+    "hostname": "lion",
+    "port": "",
+    "pathname": "/localhost//pig",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://",
+    "base": "file://ape/",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "# File URLs with non-empty hosts",
+  {
+    "input": "/rooibos",
+    "base": "file://tea/",
+    "href": "file://tea/rooibos",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "tea",
+    "hostname": "tea",
+    "port": "",
+    "pathname": "/rooibos",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/?chai",
+    "base": "file://tea/",
+    "href": "file://tea/?chai",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "tea",
+    "hostname": "tea",
+    "port": "",
+    "pathname": "/",
+    "search": "?chai",
+    "hash": ""
+  },
+  "# Windows drive letter handling with the 'file:' base URL",
+  {
+    "input": "C|",
+    "base": "file://host/dir/file",
+    "href": "file:///C:",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "C|#",
+    "base": "file://host/dir/file",
+    "href": "file:///C:#",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "C|?",
+    "base": "file://host/dir/file",
+    "href": "file:///C:?",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "C|/",
+    "base": "file://host/dir/file",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "C|\n/",
+    "base": "file://host/dir/file",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "C|\\",
+    "base": "file://host/dir/file",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "C",
+    "base": "file://host/dir/file",
+    "href": "file://host/dir/C",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "host",
+    "hostname": "host",
+    "port": "",
+    "pathname": "/dir/C",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "C|a",
+    "base": "file://host/dir/file",
+    "href": "file://host/dir/C|a",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "host",
+    "hostname": "host",
+    "port": "",
+    "pathname": "/dir/C|a",
+    "search": "",
+    "hash": ""
+  },
+  "# Windows drive letter quirk in the file slash state",
+  {
+    "input": "/c:/foo/bar",
+    "base": "file:///c:/baz/qux",
+    "href": "file:///c:/foo/bar",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/c:/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/c|/foo/bar",
+    "base": "file:///c:/baz/qux",
+    "href": "file:///c:/foo/bar",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/c:/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:\\c:\\foo\\bar",
+    "base": "file:///c:/baz/qux",
+    "href": "file:///c:/foo/bar",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/c:/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/c:/foo/bar",
+    "base": "file://host/path",
+    "href": "file:///c:/foo/bar",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/c:/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  "# Windows drive letter quirk with not empty host",
+  {
+    "input": "file://example.net/C:/",
+    "base": "about:blank",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://1.2.3.4/C:/",
+    "base": "about:blank",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://[1::8]/C:/",
+    "base": "about:blank",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  "# Windows drive letter quirk (no host)",
+  {
+    "input": "file:/C|/",
+    "base": "about:blank",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://C|/",
+    "base": "about:blank",
+    "href": "file:///C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  "# file URLs without base URL by Rimas Misevi�ius",
+  {
+    "input": "file:",
+    "base": "about:blank",
+    "href": "file:///",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:?q=v",
+    "base": "about:blank",
+    "href": "file:///?q=v",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "?q=v",
+    "hash": ""
+  },
+  {
+    "input": "file:#frag",
+    "base": "about:blank",
+    "href": "file:///#frag",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": "#frag"
+  },
+  "# file: drive letter cases from https://crbug.com/1078698",
+  {
+    "input": "file:///Y:",
+    "base": "about:blank",
+    "href": "file:///Y:",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/Y:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///Y:/",
+    "base": "about:blank",
+    "href": "file:///Y:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/Y:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///./Y",
+    "base": "about:blank",
+    "href": "file:///Y",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/Y",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///./Y:",
+    "base": "about:blank",
+    "href": "file:///Y:",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/Y:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "\\\\\\.\\Y:",
+    "base": "about:blank",
+    "failure": true
+  },
+  "# file: drive letter cases from https://crbug.com/1078698 but lowercased",
+  {
+    "input": "file:///y:",
+    "base": "about:blank",
+    "href": "file:///y:",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/y:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///y:/",
+    "base": "about:blank",
+    "href": "file:///y:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/y:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///./y",
+    "base": "about:blank",
+    "href": "file:///y",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/y",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file:///./y:",
+    "base": "about:blank",
+    "href": "file:///y:",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/y:",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "\\\\\\.\\y:",
+    "base": "about:blank",
+    "failure": true
+  },
+  "# IPv6 tests",
+  {
+    "input": "http://[1:0::]",
+    "base": "http://example.net/",
+    "href": "http://[1::]/",
+    "origin": "http://[1::]",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "[1::]",
+    "hostname": "[1::]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://[0:1:2:3:4:5:6:7:8]",
+    "base": "http://example.net/",
+    "failure": true
+  },
+  {
+    "input": "https://[0::0::0]",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://[0:.0]",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://[0:0:]",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://[0:1:2:3:4:5:6:7.0.0.0.1]",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://[0:1.00.0.0.0]",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://[0:1.290.0.0.0]",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://[0:1.23.23]",
+    "base": "about:blank",
+    "failure": true
+  },
+  "# Empty host",
+  {
+    "input": "http://?",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "http://#",
+    "base": "about:blank",
+    "failure": true
+  },
+  "Port overflow (2^32 + 81)",
+  {
+    "input": "http://f:4294967377/c",
+    "base": "http://example.org/",
+    "failure": true
+  },
+  "Port overflow (2^64 + 81)",
+  {
+    "input": "http://f:18446744073709551697/c",
+    "base": "http://example.org/",
+    "failure": true
+  },
+  "Port overflow (2^128 + 81)",
+  {
+    "input": "http://f:340282366920938463463374607431768211537/c",
+    "base": "http://example.org/",
+    "failure": true
+  },
+  "# Non-special-URL path tests",
+  {
+    "input": "sc://ñ",
+    "base": "about:blank",
+    "href": "sc://%C3%B1",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%C3%B1",
+    "hostname": "%C3%B1",
+    "port": "",
+    "pathname": "",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "sc://ñ?x",
+    "base": "about:blank",
+    "href": "sc://%C3%B1?x",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%C3%B1",
+    "hostname": "%C3%B1",
+    "port": "",
+    "pathname": "",
+    "search": "?x",
+    "hash": ""
+  },
+  {
+    "input": "sc://ñ#x",
+    "base": "about:blank",
+    "href": "sc://%C3%B1#x",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%C3%B1",
+    "hostname": "%C3%B1",
+    "port": "",
+    "pathname": "",
+    "search": "",
+    "hash": "#x"
+  },
+  {
+    "input": "#x",
+    "base": "sc://ñ",
+    "href": "sc://%C3%B1#x",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%C3%B1",
+    "hostname": "%C3%B1",
+    "port": "",
+    "pathname": "",
+    "search": "",
+    "hash": "#x"
+  },
+  {
+    "input": "?x",
+    "base": "sc://ñ",
+    "href": "sc://%C3%B1?x",
+    "origin": "null",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "%C3%B1",
+    "hostname": "%C3%B1",
+    "port": "",
+    "pathname": "",
+    "search": "?x",
+    "hash": ""
+  },
+  {
+    "input": "sc://?",
+    "base": "about:blank",
+    "href": "sc://?",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "sc://#",
+    "base": "about:blank",
+    "href": "sc://#",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "///",
+    "base": "sc://x/",
+    "href": "sc:///",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "////",
+    "base": "sc://x/",
+    "href": "sc:////",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "////x/",
+    "base": "sc://x/",
+    "href": "sc:////x/",
+    "protocol": "sc:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//x/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "tftp://foobar.com/someconfig;mode=netascii",
+    "base": "about:blank",
+    "href": "tftp://foobar.com/someconfig;mode=netascii",
+    "origin": "null",
+    "protocol": "tftp:",
+    "username": "",
+    "password": "",
+    "host": "foobar.com",
+    "hostname": "foobar.com",
+    "port": "",
+    "pathname": "/someconfig;mode=netascii",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "telnet://user:pass@foobar.com:23/",
+    "base": "about:blank",
+    "href": "telnet://user:pass@foobar.com:23/",
+    "origin": "null",
+    "protocol": "telnet:",
+    "username": "user",
+    "password": "pass",
+    "host": "foobar.com:23",
+    "hostname": "foobar.com",
+    "port": "23",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "ut2004://10.10.10.10:7777/Index.ut2",
+    "base": "about:blank",
+    "href": "ut2004://10.10.10.10:7777/Index.ut2",
+    "origin": "null",
+    "protocol": "ut2004:",
+    "username": "",
+    "password": "",
+    "host": "10.10.10.10:7777",
+    "hostname": "10.10.10.10",
+    "port": "7777",
+    "pathname": "/Index.ut2",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "redis://foo:bar@somehost:6379/0?baz=bam&qux=baz",
+    "base": "about:blank",
+    "href": "redis://foo:bar@somehost:6379/0?baz=bam&qux=baz",
+    "origin": "null",
+    "protocol": "redis:",
+    "username": "foo",
+    "password": "bar",
+    "host": "somehost:6379",
+    "hostname": "somehost",
+    "port": "6379",
+    "pathname": "/0",
+    "search": "?baz=bam&qux=baz",
+    "hash": ""
+  },
+  {
+    "input": "rsync://foo@host:911/sup",
+    "base": "about:blank",
+    "href": "rsync://foo@host:911/sup",
+    "origin": "null",
+    "protocol": "rsync:",
+    "username": "foo",
+    "password": "",
+    "host": "host:911",
+    "hostname": "host",
+    "port": "911",
+    "pathname": "/sup",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "git://github.com/foo/bar.git",
+    "base": "about:blank",
+    "href": "git://github.com/foo/bar.git",
+    "origin": "null",
+    "protocol": "git:",
+    "username": "",
+    "password": "",
+    "host": "github.com",
+    "hostname": "github.com",
+    "port": "",
+    "pathname": "/foo/bar.git",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "irc://myserver.com:6999/channel?passwd",
+    "base": "about:blank",
+    "href": "irc://myserver.com:6999/channel?passwd",
+    "origin": "null",
+    "protocol": "irc:",
+    "username": "",
+    "password": "",
+    "host": "myserver.com:6999",
+    "hostname": "myserver.com",
+    "port": "6999",
+    "pathname": "/channel",
+    "search": "?passwd",
+    "hash": ""
+  },
+  {
+    "input": "dns://fw.example.org:9999/foo.bar.org?type=TXT",
+    "base": "about:blank",
+    "href": "dns://fw.example.org:9999/foo.bar.org?type=TXT",
+    "origin": "null",
+    "protocol": "dns:",
+    "username": "",
+    "password": "",
+    "host": "fw.example.org:9999",
+    "hostname": "fw.example.org",
+    "port": "9999",
+    "pathname": "/foo.bar.org",
+    "search": "?type=TXT",
+    "hash": ""
+  },
+  {
+    "input": "ldap://localhost:389/ou=People,o=JNDITutorial",
+    "base": "about:blank",
+    "href": "ldap://localhost:389/ou=People,o=JNDITutorial",
+    "origin": "null",
+    "protocol": "ldap:",
+    "username": "",
+    "password": "",
+    "host": "localhost:389",
+    "hostname": "localhost",
+    "port": "389",
+    "pathname": "/ou=People,o=JNDITutorial",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "git+https://github.com/foo/bar",
+    "base": "about:blank",
+    "href": "git+https://github.com/foo/bar",
+    "origin": "null",
+    "protocol": "git+https:",
+    "username": "",
+    "password": "",
+    "host": "github.com",
+    "hostname": "github.com",
+    "port": "",
+    "pathname": "/foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "urn:ietf:rfc:2648",
+    "base": "about:blank",
+    "href": "urn:ietf:rfc:2648",
+    "origin": "null",
+    "protocol": "urn:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "ietf:rfc:2648",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "tag:joe@example.org,2001:foo/bar",
+    "base": "about:blank",
+    "href": "tag:joe@example.org,2001:foo/bar",
+    "origin": "null",
+    "protocol": "tag:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "joe@example.org,2001:foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  "# percent encoded hosts in non-special-URLs",
+  {
+    "input": "non-special://%E2%80%A0/",
+    "base": "about:blank",
+    "href": "non-special://%E2%80%A0/",
+    "protocol": "non-special:",
+    "username": "",
+    "password": "",
+    "host": "%E2%80%A0",
+    "hostname": "%E2%80%A0",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-special://H%4fSt/path",
+    "base": "about:blank",
+    "href": "non-special://H%4fSt/path",
+    "protocol": "non-special:",
+    "username": "",
+    "password": "",
+    "host": "H%4fSt",
+    "hostname": "H%4fSt",
+    "port": "",
+    "pathname": "/path",
+    "search": "",
+    "hash": ""
+  },
+  "# IPv6 in non-special-URLs",
+  {
+    "input": "non-special://[1:2:0:0:5:0:0:0]/",
+    "base": "about:blank",
+    "href": "non-special://[1:2:0:0:5::]/",
+    "protocol": "non-special:",
+    "username": "",
+    "password": "",
+    "host": "[1:2:0:0:5::]",
+    "hostname": "[1:2:0:0:5::]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-special://[1:2:0:0:0:0:0:3]/",
+    "base": "about:blank",
+    "href": "non-special://[1:2::3]/",
+    "protocol": "non-special:",
+    "username": "",
+    "password": "",
+    "host": "[1:2::3]",
+    "hostname": "[1:2::3]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-special://[1:2::3]:80/",
+    "base": "about:blank",
+    "href": "non-special://[1:2::3]:80/",
+    "protocol": "non-special:",
+    "username": "",
+    "password": "",
+    "host": "[1:2::3]:80",
+    "hostname": "[1:2::3]",
+    "port": "80",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-special://[:80/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "blob:https://example.com:443/",
+    "base": "about:blank",
+    "href": "blob:https://example.com:443/",
+    "protocol": "blob:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "https://example.com:443/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "blob:d3958f5c-0777-0845-9dcf-2cb28783acaf",
+    "base": "about:blank",
+    "href": "blob:d3958f5c-0777-0845-9dcf-2cb28783acaf",
+    "protocol": "blob:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "d3958f5c-0777-0845-9dcf-2cb28783acaf",
+    "search": "",
+    "hash": ""
+  },
+  "Invalid IPv4 radix digits",
+  {
+    "input": "http://0177.0.0.0189",
+    "base": "about:blank",
+    "href": "http://0177.0.0.0189/",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "0177.0.0.0189",
+    "hostname": "0177.0.0.0189",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://0x7f.0.0.0x7g",
+    "base": "about:blank",
+    "href": "http://0x7f.0.0.0x7g/",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "0x7f.0.0.0x7g",
+    "hostname": "0x7f.0.0.0x7g",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://0X7F.0.0.0X7G",
+    "base": "about:blank",
+    "href": "http://0x7f.0.0.0x7g/",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "0x7f.0.0.0x7g",
+    "hostname": "0x7f.0.0.0x7g",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "Invalid IPv4 portion of IPv6 address",
+  {
+    "input": "http://[::127.0.0.0.1]",
+    "base": "about:blank",
+    "failure": true
+  },
+  "Uncompressed IPv6 addresses with 0",
+  {
+    "input": "http://[0:1:0:1:0:1:0:1]",
+    "base": "about:blank",
+    "href": "http://[0:1:0:1:0:1:0:1]/",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "[0:1:0:1:0:1:0:1]",
+    "hostname": "[0:1:0:1:0:1:0:1]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://[1:0:1:0:1:0:1:0]",
+    "base": "about:blank",
+    "href": "http://[1:0:1:0:1:0:1:0]/",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "[1:0:1:0:1:0:1:0]",
+    "hostname": "[1:0:1:0:1:0:1:0]",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  "Percent-encoded query and fragment",
+  {
+    "input": "http://example.org/test?\u0022",
+    "base": "about:blank",
+    "href": "http://example.org/test?%22",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?%22",
+    "hash": ""
+  },
+  {
+    "input": "http://example.org/test?\u0023",
+    "base": "about:blank",
+    "href": "http://example.org/test?#",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://example.org/test?\u003C",
+    "base": "about:blank",
+    "href": "http://example.org/test?%3C",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?%3C",
+    "hash": ""
+  },
+  {
+    "input": "http://example.org/test?\u003E",
+    "base": "about:blank",
+    "href": "http://example.org/test?%3E",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?%3E",
+    "hash": ""
+  },
+  {
+    "input": "http://example.org/test?\u2323",
+    "base": "about:blank",
+    "href": "http://example.org/test?%E2%8C%A3",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?%E2%8C%A3",
+    "hash": ""
+  },
+  {
+    "input": "http://example.org/test?%23%23",
+    "base": "about:blank",
+    "href": "http://example.org/test?%23%23",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?%23%23",
+    "hash": ""
+  },
+  {
+    "input": "http://example.org/test?%GH",
+    "base": "about:blank",
+    "href": "http://example.org/test?%GH",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?%GH",
+    "hash": ""
+  },
+  {
+    "input": "http://example.org/test?a#%EF",
+    "base": "about:blank",
+    "href": "http://example.org/test?a#%EF",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?a",
+    "hash": "#%EF"
+  },
+  {
+    "input": "http://example.org/test?a#%GH",
+    "base": "about:blank",
+    "href": "http://example.org/test?a#%GH",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?a",
+    "hash": "#%GH"
+  },
+  "URLs that require a non-about:blank base. (Also serve as invalid base tests.)",
+  {
+    "input": "a",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "a/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "a//",
+    "base": "about:blank",
+    "failure": true
+  },
+  "Bases that don't fail to parse but fail to be bases",
+  {
+    "input": "test-a-colon.html",
+    "base": "a:",
+    "failure": true
+  },
+  {
+    "input": "test-a-colon-b.html",
+    "base": "a:b",
+    "failure": true
+  },
+  "Other base URL tests, that must succeed",
+  {
+    "input": "test-a-colon-slash.html",
+    "base": "a:/",
+    "href": "a:/test-a-colon-slash.html",
+    "protocol": "a:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test-a-colon-slash.html",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "test-a-colon-slash-slash.html",
+    "base": "a://",
+    "href": "a:///test-a-colon-slash-slash.html",
+    "protocol": "a:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test-a-colon-slash-slash.html",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "test-a-colon-slash-b.html",
+    "base": "a:/b",
+    "href": "a:/test-a-colon-slash-b.html",
+    "protocol": "a:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test-a-colon-slash-b.html",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "test-a-colon-slash-slash-b.html",
+    "base": "a://b",
+    "href": "a://b/test-a-colon-slash-slash-b.html",
+    "protocol": "a:",
+    "username": "",
+    "password": "",
+    "host": "b",
+    "hostname": "b",
+    "port": "",
+    "pathname": "/test-a-colon-slash-slash-b.html",
+    "search": "",
+    "hash": ""
+  },
+  "Null code point in fragment",
+  {
+    "input": "http://example.org/test?a#b\u0000c",
+    "base": "about:blank",
+    "href": "http://example.org/test?a#b%00c",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?a",
+    "hash": "#b%00c"
+  },
+  {
+    "input": "non-spec://example.org/test?a#b\u0000c",
+    "base": "about:blank",
+    "href": "non-spec://example.org/test?a#b%00c",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/test",
+    "search": "?a",
+    "hash": "#b%00c"
+  },
+  {
+    "input": "non-spec:/test?a#b\u0000c",
+    "base": "about:blank",
+    "href": "non-spec:/test?a#b%00c",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/test",
+    "search": "?a",
+    "hash": "#b%00c"
+  },
+  "First scheme char - not allowed: https://github.com/whatwg/url/issues/464",
+  {
+    "input": "10.0.0.7:8080/foo.html",
+    "base": "file:///some/dir/bar.html",
+    "href": "file:///some/dir/10.0.0.7:8080/foo.html",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/some/dir/10.0.0.7:8080/foo.html",
+    "search": "",
+    "hash": ""
+  },
+  "Subsequent scheme chars - not allowed",
+  {
+    "input": "a!@$*=/foo.html",
+    "base": "file:///some/dir/bar.html",
+    "href": "file:///some/dir/a!@$*=/foo.html",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/some/dir/a!@$*=/foo.html",
+    "search": "",
+    "hash": ""
+  },
+  "First and subsequent scheme chars - allowed",
+  {
+    "input": "a1234567890-+.:foo/bar",
+    "base": "http://example.com/dir/file",
+    "href": "a1234567890-+.:foo/bar",
+    "protocol": "a1234567890-+.:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "foo/bar",
+    "search": "",
+    "hash": ""
+  },
+  "IDNA ignored code points in file URLs hosts",
+  {
+    "input": "file://a\u00ADb/p",
+    "base": "about:blank",
+    "href": "file://ab/p",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "ab",
+    "hostname": "ab",
+    "port": "",
+    "pathname": "/p",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "file://a%C2%ADb/p",
+    "base": "about:blank",
+    "href": "file://ab/p",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "ab",
+    "hostname": "ab",
+    "port": "",
+    "pathname": "/p",
+    "search": "",
+    "hash": ""
+  },
+  "Empty host after the domain to ASCII",
+  {
+    "input": "file://\u00ad/p",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "file://%C2%AD/p",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "file://xn--/p",
+    "base": "about:blank",
+    "failure": true
+  },
+  "https://bugzilla.mozilla.org/show_bug.cgi?id=1647058",
+  {
+    "input": "#link",
+    "base": "https://example.org/##link",
+    "href": "https://example.org/#link",
+    "protocol": "https:",
+    "username": "",
+    "password": "",
+    "host": "example.org",
+    "hostname": "example.org",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": "#link"
+  }
+]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/format_str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/format_str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/format_str.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/format_str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,66 +1,66 @@
-#![feature(test)]
-extern crate test;
-
-use std::io::Write;
-use test::Bencher;
-use uuid::Uuid;
-
-#[bench]
-fn bench_hyphen(b: &mut Bencher) {
-    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
-    b.iter(|| {
-        let mut buffer = [0_u8; 36];
-        write!(&mut buffer as &mut [_], "{:x}", uuid.to_hyphenated()).unwrap();
-        test::black_box(buffer);
-    });
-}
-
-#[bench]
-fn bench_simple(b: &mut Bencher) {
-    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
-    b.iter(|| {
-        let mut buffer = [0_u8; 32];
-        write!(&mut buffer as &mut [_], "{:x}", uuid.to_simple()).unwrap();
-        test::black_box(buffer);
-    })
-}
-
-#[bench]
-fn bench_urn(b: &mut Bencher) {
-    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
-    b.iter(|| {
-        let mut buffer = [0_u8; 36 + 9];
-        write!(&mut buffer as &mut [_], "{:x}", uuid.to_urn()).unwrap();
-        test::black_box(buffer);
-    })
-}
-
-#[bench]
-fn bench_encode_hyphen(b: &mut Bencher) {
-    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
-    b.iter(|| {
-        let mut buffer = [0_u8; 36];
-        uuid.to_hyphenated().encode_lower(&mut buffer);
-        test::black_box(buffer);
-    });
-}
-
-#[bench]
-fn bench_encode_simple(b: &mut Bencher) {
-    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
-    b.iter(|| {
-        let mut buffer = [0_u8; 32];
-        uuid.to_simple().encode_lower(&mut buffer);
-        test::black_box(buffer);
-    })
-}
-
-#[bench]
-fn bench_encode_urn(b: &mut Bencher) {
-    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
-    b.iter(|| {
-        let mut buffer = [0_u8; 36 + 9];
-        uuid.to_urn().encode_lower(&mut buffer);
-        test::black_box(buffer);
-    })
-}
+#![feature(test)]
+extern crate test;
+
+use std::io::Write;
+use test::Bencher;
+use uuid::Uuid;
+
+#[bench]
+fn bench_hyphen(b: &mut Bencher) {
+    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
+    b.iter(|| {
+        let mut buffer = [0_u8; 36];
+        write!(&mut buffer as &mut [_], "{:x}", uuid.to_hyphenated()).unwrap();
+        test::black_box(buffer);
+    });
+}
+
+#[bench]
+fn bench_simple(b: &mut Bencher) {
+    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
+    b.iter(|| {
+        let mut buffer = [0_u8; 32];
+        write!(&mut buffer as &mut [_], "{:x}", uuid.to_simple()).unwrap();
+        test::black_box(buffer);
+    })
+}
+
+#[bench]
+fn bench_urn(b: &mut Bencher) {
+    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
+    b.iter(|| {
+        let mut buffer = [0_u8; 36 + 9];
+        write!(&mut buffer as &mut [_], "{:x}", uuid.to_urn()).unwrap();
+        test::black_box(buffer);
+    })
+}
+
+#[bench]
+fn bench_encode_hyphen(b: &mut Bencher) {
+    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
+    b.iter(|| {
+        let mut buffer = [0_u8; 36];
+        uuid.to_hyphenated().encode_lower(&mut buffer);
+        test::black_box(buffer);
+    });
+}
+
+#[bench]
+fn bench_encode_simple(b: &mut Bencher) {
+    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
+    b.iter(|| {
+        let mut buffer = [0_u8; 32];
+        uuid.to_simple().encode_lower(&mut buffer);
+        test::black_box(buffer);
+    })
+}
+
+#[bench]
+fn bench_encode_urn(b: &mut Bencher) {
+    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
+    b.iter(|| {
+        let mut buffer = [0_u8; 36 + 9];
+        uuid.to_urn().encode_lower(&mut buffer);
+        test::black_box(buffer);
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/invalid_parse_str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/invalid_parse_str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/invalid_parse_str.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/invalid_parse_str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,58 +1,58 @@
-#![feature(test)]
-extern crate test;
-
-use test::Bencher;
-use uuid::Uuid;
-
-#[bench]
-fn bench_parse_invalid_strings(b: &mut Bencher) {
-    b.iter(|| {
-        let _ = Uuid::parse_str("");
-        let _ = Uuid::parse_str("!");
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E45");
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-BBF-329BF39FA1E4");
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-BGBF-329BF39FA1E4");
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BFF329BF39FA1E4");
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa");
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faaXB6BFF329BF39FA1E4");
-        let _ = Uuid::parse_str("F9168C5E-CEB-24fa-eB6BFF32-BF39FA1E4");
-        let _ = Uuid::parse_str("01020304-1112-2122-3132-41424344");
-        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c88");
-        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0cg8");
-        let _ = Uuid::parse_str("67e5504410b1426%9247bb680e5fe0c8");
-
-        // Test error reporting
-        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c");
-        let _ = Uuid::parse_str("67e550X410b1426f9247bb680e5fe0cd");
-        let _ = Uuid::parse_str("67e550-4105b1426f9247bb680e5fe0c");
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF1-02BF39FA1E4");
-    });
-}
-
-#[bench]
-fn bench_parse_invalid_len(b: &mut Bencher) {
-    b.iter(|| {
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-BBF-329BF39FA1E4");
-    })
-}
-
-#[bench]
-fn bench_parse_invalid_character(b: &mut Bencher) {
-    b.iter(|| {
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-BGBF-329BF39FA1E4");
-    })
-}
-
-#[bench]
-fn bench_parse_invalid_group_len(b: &mut Bencher) {
-    b.iter(|| {
-        let _ = Uuid::parse_str("01020304-1112-2122-3132-41424344");
-    });
-}
-
-#[bench]
-fn bench_parse_invalid_groups(b: &mut Bencher) {
-    b.iter(|| {
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BFF329BF39FA1E4");
-    });
-}
+#![feature(test)]
+extern crate test;
+
+use test::Bencher;
+use uuid::Uuid;
+
+#[bench]
+fn bench_parse_invalid_strings(b: &mut Bencher) {
+    b.iter(|| {
+        let _ = Uuid::parse_str("");
+        let _ = Uuid::parse_str("!");
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E45");
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-BBF-329BF39FA1E4");
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-BGBF-329BF39FA1E4");
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BFF329BF39FA1E4");
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa");
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faaXB6BFF329BF39FA1E4");
+        let _ = Uuid::parse_str("F9168C5E-CEB-24fa-eB6BFF32-BF39FA1E4");
+        let _ = Uuid::parse_str("01020304-1112-2122-3132-41424344");
+        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c88");
+        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0cg8");
+        let _ = Uuid::parse_str("67e5504410b1426%9247bb680e5fe0c8");
+
+        // Test error reporting
+        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c");
+        let _ = Uuid::parse_str("67e550X410b1426f9247bb680e5fe0cd");
+        let _ = Uuid::parse_str("67e550-4105b1426f9247bb680e5fe0c");
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF1-02BF39FA1E4");
+    });
+}
+
+#[bench]
+fn bench_parse_invalid_len(b: &mut Bencher) {
+    b.iter(|| {
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-BBF-329BF39FA1E4");
+    })
+}
+
+#[bench]
+fn bench_parse_invalid_character(b: &mut Bencher) {
+    b.iter(|| {
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-BGBF-329BF39FA1E4");
+    })
+}
+
+#[bench]
+fn bench_parse_invalid_group_len(b: &mut Bencher) {
+    b.iter(|| {
+        let _ = Uuid::parse_str("01020304-1112-2122-3132-41424344");
+    });
+}
+
+#[bench]
+fn bench_parse_invalid_groups(b: &mut Bencher) {
+    b.iter(|| {
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BFF329BF39FA1E4");
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-#![feature(test)]
-
-#[cfg(feature = "slog")]
-pub mod slog_support;
+#![feature(test)]
+
+#[cfg(feature = "slog")]
+pub mod slog_support;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/serde_support.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/serde_support.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/serde_support.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/serde_support.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,48 +1,48 @@
-#![cfg(feature = "serde")]
-#![feature(test)]
-
-use bincode;
-use serde_json;
-extern crate test;
-
-use test::Bencher;
-use uuid::Uuid;
-
-#[bench]
-fn bench_json_encode(b: &mut Bencher) {
-    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
-    let mut buffer = [0_u8; 38];
-    b.iter(|| {
-        serde_json::to_writer(&mut buffer as &mut [u8], &uuid).unwrap();
-        test::black_box(buffer);
-    });
-    b.bytes = buffer.len() as u64;
-}
-
-#[bench]
-fn bench_json_decode(b: &mut Bencher) {
-    let s = "\"F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4\"";
-    b.iter(|| serde_json::from_str::<Uuid>(s).unwrap());
-    b.bytes = s.len() as u64;
-}
-
-#[bench]
-fn bench_bincode_encode(b: &mut Bencher) {
-    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
-    let mut buffer = [0_u8; 24];
-    b.iter(|| {
-        bincode::serialize_into(&mut buffer as &mut [u8], &uuid).unwrap();
-        test::black_box(buffer);
-    });
-    b.bytes = buffer.len() as u64;
-}
-
-#[bench]
-fn bench_bincode_decode(b: &mut Bencher) {
-    let bytes = [
-        16, 0, 0, 0, 0, 0, 0, 0, 249, 22, 140, 94, 206, 178, 79, 170, 182, 191,
-        50, 155, 243, 159, 161, 228,
-    ];
-    b.iter(|| bincode::deserialize::<Uuid>(&bytes).unwrap());
-    b.bytes = bytes.len() as u64;
-}
+#![cfg(feature = "serde")]
+#![feature(test)]
+
+use bincode;
+use serde_json;
+extern crate test;
+
+use test::Bencher;
+use uuid::Uuid;
+
+#[bench]
+fn bench_json_encode(b: &mut Bencher) {
+    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
+    let mut buffer = [0_u8; 38];
+    b.iter(|| {
+        serde_json::to_writer(&mut buffer as &mut [u8], &uuid).unwrap();
+        test::black_box(buffer);
+    });
+    b.bytes = buffer.len() as u64;
+}
+
+#[bench]
+fn bench_json_decode(b: &mut Bencher) {
+    let s = "\"F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4\"";
+    b.iter(|| serde_json::from_str::<Uuid>(s).unwrap());
+    b.bytes = s.len() as u64;
+}
+
+#[bench]
+fn bench_bincode_encode(b: &mut Bencher) {
+    let uuid = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").unwrap();
+    let mut buffer = [0_u8; 24];
+    b.iter(|| {
+        bincode::serialize_into(&mut buffer as &mut [u8], &uuid).unwrap();
+        test::black_box(buffer);
+    });
+    b.bytes = buffer.len() as u64;
+}
+
+#[bench]
+fn bench_bincode_decode(b: &mut Bencher) {
+    let bytes = [
+        16, 0, 0, 0, 0, 0, 0, 0, 249, 22, 140, 94, 206, 178, 79, 170, 182, 191,
+        50, 155, 243, 159, 161, 228,
+    ];
+    b.iter(|| bincode::deserialize::<Uuid>(&bytes).unwrap());
+    b.bytes = bytes.len() as u64;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/slog_support/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/slog_support/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/slog_support/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/slog_support/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-pub mod parse_str;
+pub mod parse_str;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/slog_support/parse_str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/slog_support/parse_str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/slog_support/parse_str.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/slog_support/parse_str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,15 +1,15 @@
-extern crate test;
-
-#[bench]
-#[cfg(feature = "slog")]
-pub fn bench_log_discard_kv(b: &mut test::Bencher) {
-    let u1 =
-        uuid::Uuid::parse_str("F9168C5E-CEB2-4FAB-B6BF-329BF39FA1E4").unwrap();
-    let root =
-        slog::Logger::root(::slog::Drain::fuse(::slog::Discard), slog::o!());
-
-    b.iter(|| {
-        #[cfg(feature = "slog")]
-        slog::crit!(root, "test"; "u1" => u1);
-    });
-}
+extern crate test;
+
+#[bench]
+#[cfg(feature = "slog")]
+pub fn bench_log_discard_kv(b: &mut test::Bencher) {
+    let u1 =
+        uuid::Uuid::parse_str("F9168C5E-CEB2-4FAB-B6BF-329BF39FA1E4").unwrap();
+    let root =
+        slog::Logger::root(::slog::Drain::fuse(::slog::Discard), slog::o!());
+
+    b.iter(|| {
+        #[cfg(feature = "slog")]
+        slog::crit!(root, "test"; "u1" => u1);
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/valid_parse_str.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/valid_parse_str.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/benches/valid_parse_str.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/benches/valid_parse_str.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,39 +1,39 @@
-#![feature(test)]
-
-extern crate test;
-
-use test::Bencher;
-use uuid::Uuid;
-
-#[bench]
-fn bench_parse_valid_strings(b: &mut Bencher) {
-    b.iter(|| {
-        // Valid
-        let _ = Uuid::parse_str("00000000000000000000000000000000");
-        let _ = Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8");
-        let _ = Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8");
-        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4");
-        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c8");
-        let _ = Uuid::parse_str("01020304-1112-2122-3132-414243444546");
-        let _ =
-            Uuid::parse_str("urn:uuid:67e55044-10b1-426f-9247-bb680e5fe0c8");
-
-        // Nil
-        let _ = Uuid::parse_str("00000000000000000000000000000000");
-        let _ = Uuid::parse_str("00000000-0000-0000-0000-000000000000");
-    });
-}
-
-#[bench]
-fn bench_valid_hyphenated(b: &mut Bencher) {
-    b.iter(|| {
-        let _ = Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8");
-    });
-}
-
-#[bench]
-fn bench_valid_short(b: &mut Bencher) {
-    b.iter(|| {
-        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c8");
-    });
-}
+#![feature(test)]
+
+extern crate test;
+
+use test::Bencher;
+use uuid::Uuid;
+
+#[bench]
+fn bench_parse_valid_strings(b: &mut Bencher) {
+    b.iter(|| {
+        // Valid
+        let _ = Uuid::parse_str("00000000000000000000000000000000");
+        let _ = Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8");
+        let _ = Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8");
+        let _ = Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4");
+        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c8");
+        let _ = Uuid::parse_str("01020304-1112-2122-3132-414243444546");
+        let _ =
+            Uuid::parse_str("urn:uuid:67e55044-10b1-426f-9247-bb680e5fe0c8");
+
+        // Nil
+        let _ = Uuid::parse_str("00000000000000000000000000000000");
+        let _ = Uuid::parse_str("00000000-0000-0000-0000-000000000000");
+    });
+}
+
+#[bench]
+fn bench_valid_hyphenated(b: &mut Bencher) {
+    b.iter(|| {
+        let _ = Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8");
+    });
+}
+
+#[bench]
+fn bench_valid_short(b: &mut Bencher) {
+    b.iter(|| {
+        let _ = Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c8");
+    });
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CODEOWNERS":"65d3fcb4156a2d5bce80d382a34044753e384d7f1eb71cdc646de400a0b969c8","CODE_OF_CONDUCT.md":"7d9c9062ee835c2dfd348cfddb938c563f3a7b1140dd090444a03ea1d73626b1","CONTRIBUTING.md":"c2b507733d5af2de972d63237a094a135935ad45cc74dedb79c199d841f35a3e","COPYRIGHT":"b4b2c0de2a05de3372d5c828128413ce82bb7dba2272487b7729f09cc3d3519d","Cargo.toml":"94e4df2b560d316a5dbadb38bd95e338d82504f3a7e0d8bf4a98ab33bd12d54b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"436bc5a105d8e57dcd8778730f3754f7bf39c14d2f530e4cde4bd2d17a83ec3d","README.md":"a58d1918e2e0e9d2c5ae50ebc21c79e52227f3e012f45e7932a2c67d554ee641","README.tpl":"5e94c2dfce3f674229cc3326873da36d94f9592a213d7785b3dfbde9b23ca27f","benches/format_str.rs":"d8cbdcc43d5b78f1674cbdfb4ab7917e110e0e92d91eaa1b0419de1fe38cb4a3","benches/invalid_parse_str.rs":"c1ed6e57b6d7078d698e7301cd05f2ce272acea9856bfb43683bec9b8984ff11","benches/mod.rs":"48b2b66f176d37f207336e2eb074d39273376e24dff30bf375491f8a4532219b","benches/serde_support.rs":"4d051017a7de4d54d5afe5cd33ab97fc725a76e21fdea0f3e3b1efd32afc3f16","benches/slog_support/mod.rs":"26031e0f77ff53fbdf85f519c65e3acdde44971841a2a637fa6b2c4ec0d1b13e","benches/slog_support/parse_str.rs":"b520e1f43baedba95d6d60e184dc4300e8c272b2ad4bf779b357c392c3d319e4","benches/valid_parse_str.rs":"4a8c28d721455ecd9de9c780d421740508e456d545a7ca42fda8909ae3ffb110","src/adapter/compact.rs":"018c02bc2b7f34d669eacff6e00c87cb7a73c8498f0a0927b0ac0f6c95cc23f6","src/adapter/mod.rs":"86124a0ac594f46911bf5197dfef0887964760e90136c0effa3656e5dc2179e9","src/builder/error.rs":"ab2d652a5897cf108dedde0de00776140d4eaaaee81922bcf0310edcabbdfdc1","src/builder/mod.rs":"a9a980bc120d39ffddd598259a2e9c32ceb7c8885e948c1efe73d634601e6873","src/error.rs":"3a1a6d9109f526dc10ccc7e63738ec500d0c0a063dd3322413878474a15e5e9f","src/lib.rs":"5b9200da120444062202ef247c087995328efeb9b27ba6dce0f4026ea91fff79","src/parser/error.rs":"ec136a5497017402797784053f127c4812f126a7f43053624446c4deb301b9a8","src/parser/mod.rs":"39605f6897298df0cd1dc543c7bd735eea369936e5d30d908851fab1d5c014dd","src/prelude.rs":"351f692d433ac98164123413fe2b0a37c8781aeb9680fb2bd7108a833b9e0123","src/serde_support.rs":"3b15f0594db978d6b10dcb27ed5c56956207dd682d7d7e02b262e27916c63941","src/slog_support.rs":"88be60521752f0185256815d9a494a1d2a68f2e5f28910da7a753196ff18d4e2","src/test_util.rs":"2a6b9d22241a8ab598adb6d7634f29c5ab8c575e67a89f261eb45c9df322127b","src/v1.rs":"b2427f37f9a7d6afc226b32179ced8a16c239283cfae89b5eb6ac52ca1fddebb","src/v3.rs":"1ed2ed955feab877944b445eed1638050d4e97a49e1f2954d00d5935454f1269","src/v4.rs":"25715d366c8082d59449654ceaad52814ce8c11f991ca3e88b950837da0e73b5","src/v5.rs":"5acae85b24d6bcf368ee09f07d08fc47f44f9cbae83ff49a6dee1bde8a55a20e","src/winapi_support.rs":"c84279fca11326b6dfe3db823c7b054f697bcbcabea9f4dafcaf822620415d70"},"package":"9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"}
\ No newline at end of file
+{"files":{"CODEOWNERS":"2196aad5760b74fc2ccf3450f49a748f0f482fe5119832b3d13e996d674cdb29","CODE_OF_CONDUCT.md":"62180f4ffe379a4599af2912182150a41b7be9e03eed1ac499238da72e2701e9","CONTRIBUTING.md":"51618830985862dea1198da34dc8c67dc6b9daac07d9d22c3d4d7da67b8060f7","COPYRIGHT":"807242105c35b459ada8a1e76a94e017103d230e8e8fefd0bbcee625fb0d816d","Cargo.toml":"028b304fafcc70813ff5a52c0f32fa5184d50a1910daf33b54f69d3e4779b058","LICENSE-APACHE":"7cfd738c53d61c79f07e348f622bf7707c9084237054d37fbe07788a75f5881c","LICENSE-MIT":"dd23b9037fa9f086b90fb5e908f896a3ed2b4a3eca961792ee0caf77444ea587","README.md":"651a0d4ff4db342fa7be7a9e738becaaae29f3d652f41053989b1beb76df7c3a","README.tpl":"6c3c04de0e4e0619218947a64d4de5d0ade44765f0f733c3c68a430465e16e91","benches/format_str.rs":"2c571eaedbfa5070a6e45a79914cfe2ea186a2dc85626cd4c6017dcdd3a84cb9","benches/invalid_parse_str.rs":"551479b152118ea22d657f0d2ef7f681f2331b3c8efb1707ea46adaf1bebd1be","benches/mod.rs":"f26df117229cd7afd7f22f33135aeafc0155154124509fe384e9e509c757d2e0","benches/serde_support.rs":"43cd9e16a250290dfb4857216b33fe16942c158cdaf3519c75fad6efa6cdafe7","benches/slog_support/mod.rs":"633fc467b0d1f65a2da554a39f80ec3a2e807eeed1680dee2bb072026ab2b7df","benches/slog_support/parse_str.rs":"6d14b295d3d09346d3599feb6a04430ddeda7601edc6ba38c778ba53bb294592","benches/valid_parse_str.rs":"d618d789c3e97cdfe47b8b8556bb4f8f578d92fff308ac0713d327d09afd6c56","src/adapter/compact.rs":"228a3606a777b9a28f5692337aed377408a66bc16f1a6acef9a15d32888b5e8b","src/adapter/mod.rs":"c643cee204128de8f5c4c58eb55bd78f571c01bd859cffd967b6026cb0d15ed3","src/builder/error.rs":"fc958714033c976980a133fe41c8625cb17ed05fcb4df4d3ed156019c81cee49","src/builder/mod.rs":"efb1de85c11bd3e9c445eaa8e2a00e3a8895de42e01a18978f5f4bbb671ed924","src/error.rs":"3718c1c61e6b76ddfa1d275fc395c90c5d4fe136ab43aeff2f278be1b239e891","src/lib.rs":"c797f1ddb8efcef25d8a2ec97aac51b722d9b759dbab99eba844197ce80a0fb8","src/parser/error.rs":"a512a659669753ad2e51137ce32dd8ce8173e80212c8f369f1b059aa3dd3ab88","src/parser/mod.rs":"05ce48d001511bec1d565c5a0f3271377d16fc66eda612aeb057a2152edccfcd","src/prelude.rs":"c7ff4039be52af0a4c30700c800c0fa6a67903c5aab039986af74496555f20a5","src/serde_support.rs":"5d8fdf452a7ab64f53ef83542430e4425e5a13092c7f9d9be88f57de84b4ac3c","src/slog_support.rs":"95ad3976f0af9fb1a2e096715336cf2df41c05f4dc7076197412fa91c07ba7e1","src/test_util.rs":"6a62bc3a54bacdd8ff3f078e58cb9498b5c6e2275936a1aaa1ffd81ff9ac616f","src/v1.rs":"e8f8f0e92888399360e046e698b2896642c33631f22ae480c4957675f841c7fe","src/v3.rs":"672db94219fa031c9472698c08c60310b84d860e143398628c3cd72a34e95bc7","src/v4.rs":"fc25658ac4e6701241ef24f1f9d2d47f463837c4269511c0bf805eb87d2c6430","src/v5.rs":"902332bcfa849dfe9474a45983119513162282d36cd7314fa9bd3e67f9fe0ddf","src/winapi_support.rs":"d94c62e1ad11c4e7b6306d4dceaacec40eece8d3c4fb14fda4679d023ff033fb"},"package":"bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "uuid"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["Ashley Mannix<ashleymannix@live.com.au>", "Christopher Armstrong", "Dylan DPC<dylan.dpc@gmail.com>", "Hunar Roop Kahlon<hunar.roop@gmail.com>"]
 exclude = [".github/**", ".travis.yml", "appveyor.yml", "bors.toml"]
 description = "A library to generate and parse UUIDs."
@@ -30,17 +30,16 @@
 
 [package.metadata.playground]
 features = ["serde", "v1", "v3", "v4", "v5"]
-[dependencies.md5]
-version = "0.6"
+[dependencies.getrandom]
+version = "0.2.0"
 optional = true
 
-[dependencies.rand]
+[dependencies.md5]
 version = "0.7"
 optional = true
 
 [dependencies.serde]
 version = "1.0.56"
-features = ["serde_derive"]
 optional = true
 default-features = false
 
@@ -67,12 +66,12 @@
 default = ["std"]
 guid = ["winapi"]
 std = []
-stdweb = ["rand/stdweb"]
+stdweb = ["getrandom", "getrandom/js"]
 v1 = []
 v3 = ["md5"]
-v4 = ["rand"]
+v4 = ["getrandom"]
 v5 = ["sha1"]
-wasm-bindgen = ["rand/wasm-bindgen"]
+wasm-bindgen = ["getrandom", "getrandom/js"]
 [target."cfg(windows)".dependencies.winapi]
 version = "0.3"
 optional = true
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/CODE_OF_CONDUCT.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/CODE_OF_CONDUCT.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/CODE_OF_CONDUCT.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/CODE_OF_CONDUCT.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,77 +1,77 @@
-# Contributor Covenant Code of Conduct
-
-The latest version of the CODE OF CONDUCT can be found [here].
-
-[here]: https://github.com/uuid-rs/conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-education, socio-economic status, nationality, personal appearance, race,
-religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at report@uuid-rs.groups.io. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
+# Contributor Covenant Code of Conduct
+
+The latest version of the CODE OF CONDUCT can be found [here].
+
+[here]: https://github.com/uuid-rs/conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at report@uuid-rs.groups.io. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
 [homepage]: https://www.contributor-covenant.org
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/CODEOWNERS thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/CODEOWNERS
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/CODEOWNERS	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/CODEOWNERS	2021-12-09 12:01:26.000000000 +0000
@@ -1,16 +1,16 @@
-# CI
-.travis.yml     @kinggoesgaming @KodrAus @Dylan-DPC @radix
-appveyor.yml    @kinggoesgaming @KodrAus @Dylan-DPC @radix
-
-# Cargo.toml
-Cargo.toml      @kinggoesgaming @KodrAus @Dylan-DPC @radix
-
-# Rust
-*.rs            @kinggoesgaming @KodrAus @Dylan-DPC @radix
-
-# CODEOWNERS
-CODEOWNERS      @kinggoesgaming @KodrAus @Dylan-DPC @radix
-
-#>> Critical
-# bors.toml file
-bors.toml       @kinggoesgaming @KodrAus @Dylan-DPC @radix
+# CI
+.travis.yml     @kinggoesgaming @KodrAus @Dylan-DPC @radix
+appveyor.yml    @kinggoesgaming @KodrAus @Dylan-DPC @radix
+
+# Cargo.toml
+Cargo.toml      @kinggoesgaming @KodrAus @Dylan-DPC @radix
+
+# Rust
+*.rs            @kinggoesgaming @KodrAus @Dylan-DPC @radix
+
+# CODEOWNERS
+CODEOWNERS      @kinggoesgaming @KodrAus @Dylan-DPC @radix
+
+#>> Critical
+# bors.toml file
+bors.toml       @kinggoesgaming @KodrAus @Dylan-DPC @radix
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/CONTRIBUTING.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/CONTRIBUTING.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/CONTRIBUTING.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/CONTRIBUTING.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,149 +1,149 @@
-Contributing to Uuid
----
-[Contributing to Uuid]: #contributing-to-uuid
-
-Thank you for your interest in contributing to the Uuid Project!
-
-* [Feature Requests](#feature-requests)
-* [Bug Reports](#bug-reports)
-* [Pull Requests](#pull-requests)
-* [Writing Documentation](#writing-documentation)
-* [Issue Triage](#issue-triage)
-* [Out-of-tree Contributions](#out-of-tree-contributions)
-* [Helpful Links](#helpful-links)
-
-For any questions, please make a post on [users.rust-lang.org][u-r-l-o], post
-on [uuid-rs mailing list] or join our [gitter] channel.
-
-> All contributors need to follow our [Code of Conduct].
-
-[Code of Conduct]: CODE_OF_CONDUCT.md
-
-# Feature Requests
-[Feature Requests]: #feature-requests
-
-The `uuid` crate is still in flux. All features desired may not be present. As
-such you are welcome to request for new features. Keep in mind that `uuid` is
-a general purpose library. We want to provide features that most users would
-find useful. As such not every feature may be accepted.
-
-If you have the chance, please [search existing issues], as there is a chance
-that someone has already requested your feature.
-
-File your feature request with a descriptive title, as this helps others find
-your request.
-
-You can request your feature by following [this link][Feature Request Link] and
-filling it in. 
-
-> We welcome pull requests for your own feature requests, provided they have
-been discussed.
-
-[Feature Request Link]: https://github.com/uuid-rs/uuid/issues/new?template=Feature_request.md
-
-# Bug Reports
-[Bug Reports]: #bug-reports
-
-While no one likes bugs, they are an unfortunate reality in software. Remember
-we can't fix bugs we don't know about, so don't be shy about reporting.
-
-If you have the chance, please [search existing issues], as there is a chance
-that someone has already reported your error. This isn't strictly needed, as
-sometimes you might not what exactly you are looking for.
-
-File your issue with a descriptive title, as this helps others find your issue.
-
-Reporting a bug is as easy as following [this link][Bug Report Link] and
-filling it in.
-
-Sometimes a backtrace may be needed. In that case, set `RUST_BACKTRACE`
-environment variable to `1`. For example:
-
-```bash
-$ RUST_BACKTRACE=1 cargo build
-```
-
-> We welcome pull requests for your own bug reports, provided they have been
-discussed.
-
-[Bug Report Link]: https://github.com/uuid-rs/uuid/issues/new?template=Bug_report.md
-
-# Pull Requests
-[Pull Requests]: #pull-requests
-
-Pull requests(PRs) are the primary mechanism we use to change Uuid. GitHub itself
-has some [great documentation] on using the Pull Request feature. We use the
-"fork and pull" model described [here][fnp], where contributors push changes to
-their personal fork and create pull requests to bring those changes into the
-source repository.
-
-Unless the changes are fairly minor (like documentation changes or tiny
-patches), we require PRs to relevant issues.
-
-Please open PRs against branch:
-* `master` when making non-breaking changes 
-* `breaking` when your changes alter the public API in a breaking manner
-
-If the pull request is still a work in progress, prepend`[WIP] ` in your 
-title. `WIP bot` will make sure that the PR doesn't accidentally get merged.
-
-> Uuid Project has a minimum rust version policy. Currently `uuid` should 
-compile with atleast `1.22.0`, and is enforced on our CI builds.
-
-When you feel that the PR is ready, please ping one of the maintainers so
-they can review your changes.
-
-[great documentation]: https://help.github.com/articles/about-pull-requests/
-[fnp]: https://help.github.com/articles/about-collaborative-development-models/
-
-# Writing Documentation
-[Writing Documentation]: #writing-documentation
-
-Documentation is an important part of Uuid. Lackluster or incorrect
-documentation can cause headaches for the users of `uuid`. Therefore,
-improvements to documentation are always welcome.
-
-We follow the documentation style guidelines as given by [RFC 1574].
-
-[RFC 1574]: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md#appendix-a-full-conventions-text
-
-# Issue Triage
-[Issue Triage]: #issue-triage
-
-Sometimes, an issue might stay open even after the relevant bug has been fixed.
-Other times, the bug report may become invalid. Or we may just forget about the
-bug.
-
-You can help to go through old bug reports and check if they are still valid.
-You can follow [this link][lrus] to look for issues like this.
-
-[lrus]: https://github.com/uuid-rs/uuid/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc
-
-# Out-of-tree Contributions
-[Out-of-tree Contributions]: #out-of-tree-contributions
-
-You can contribute to Uuid in other ways:
-
-* Answer questions on [users.rust-lang.org][u-r-l-o], [uuid-rs mailing list] and/or
-[gitter] channel.
-* Find the [crates depending on `uuid`][dependent] and sending PRs to them,
-helping them keep their version of `uuid` up-to-date.
-
-[dependent]: https://crates.io/crates/uuid/reverse_dependencies
-
-# Helpful Links
-[Helpful Links]: #helpful-links
-
-For people new to Uuid, and just starting to contribute, or even for more
-seasoned developers, some useful places to look for information are:
-
-* The Wikipedia entry on [Universally Unique Identifier][wiki-uuid].
-* [RFC 4122] which gives the specification of Uuids.
-
-[wiki-uuid]: https://en.wikipedia.org/wiki/Universally_unique_identifier
-[RFC 4122]: https://www.ietf.org/rfc/rfc4122.txt
-
-[u-r-l-o]: https://users.rust-lang.org
-[uuid-rs mailing list]: https://uuid-rs.groups.io
-[gitter]: https://gitter.im/uuid-rs/Lobby
-[search existing issues]: https://github.com/uuid-rs/uuid/search?q=&type=Issues&utf8=%E2%9C%93
+Contributing to Uuid
+---
+[Contributing to Uuid]: #contributing-to-uuid
+
+Thank you for your interest in contributing to the Uuid Project!
+
+* [Feature Requests](#feature-requests)
+* [Bug Reports](#bug-reports)
+* [Pull Requests](#pull-requests)
+* [Writing Documentation](#writing-documentation)
+* [Issue Triage](#issue-triage)
+* [Out-of-tree Contributions](#out-of-tree-contributions)
+* [Helpful Links](#helpful-links)
+
+For any questions, please make a post on [users.rust-lang.org][u-r-l-o], post
+on [uuid-rs mailing list] or join our [gitter] channel.
+
+> All contributors need to follow our [Code of Conduct].
+
+[Code of Conduct]: CODE_OF_CONDUCT.md
+
+# Feature Requests
+[Feature Requests]: #feature-requests
+
+The `uuid` crate is still in flux. All features desired may not be present. As
+such you are welcome to request for new features. Keep in mind that `uuid` is
+a general purpose library. We want to provide features that most users would
+find useful. As such not every feature may be accepted.
+
+If you have the chance, please [search existing issues], as there is a chance
+that someone has already requested your feature.
+
+File your feature request with a descriptive title, as this helps others find
+your request.
+
+You can request your feature by following [this link][Feature Request Link] and
+filling it in. 
+
+> We welcome pull requests for your own feature requests, provided they have
+been discussed.
+
+[Feature Request Link]: https://github.com/uuid-rs/uuid/issues/new?template=Feature_request.md
+
+# Bug Reports
+[Bug Reports]: #bug-reports
+
+While no one likes bugs, they are an unfortunate reality in software. Remember
+we can't fix bugs we don't know about, so don't be shy about reporting.
+
+If you have the chance, please [search existing issues], as there is a chance
+that someone has already reported your error. This isn't strictly needed, as
+sometimes you might not what exactly you are looking for.
+
+File your issue with a descriptive title, as this helps others find your issue.
+
+Reporting a bug is as easy as following [this link][Bug Report Link] and
+filling it in.
+
+Sometimes a backtrace may be needed. In that case, set `RUST_BACKTRACE`
+environment variable to `1`. For example:
+
+```bash
+$ RUST_BACKTRACE=1 cargo build
+```
+
+> We welcome pull requests for your own bug reports, provided they have been
+discussed.
+
+[Bug Report Link]: https://github.com/uuid-rs/uuid/issues/new?template=Bug_report.md
+
+# Pull Requests
+[Pull Requests]: #pull-requests
+
+Pull requests(PRs) are the primary mechanism we use to change Uuid. GitHub itself
+has some [great documentation] on using the Pull Request feature. We use the
+"fork and pull" model described [here][fnp], where contributors push changes to
+their personal fork and create pull requests to bring those changes into the
+source repository.
+
+Unless the changes are fairly minor (like documentation changes or tiny
+patches), we require PRs to relevant issues.
+
+Please open PRs against branch:
+* `master` when making non-breaking changes 
+* `breaking` when your changes alter the public API in a breaking manner
+
+If the pull request is still a work in progress, prepend`[WIP] ` in your 
+title. `WIP bot` will make sure that the PR doesn't accidentally get merged.
+
+> Uuid Project has a minimum rust version policy. Currently `uuid` should 
+compile with atleast `1.22.0`, and is enforced on our CI builds.
+
+When you feel that the PR is ready, please ping one of the maintainers so
+they can review your changes.
+
+[great documentation]: https://help.github.com/articles/about-pull-requests/
+[fnp]: https://help.github.com/articles/about-collaborative-development-models/
+
+# Writing Documentation
+[Writing Documentation]: #writing-documentation
+
+Documentation is an important part of Uuid. Lackluster or incorrect
+documentation can cause headaches for the users of `uuid`. Therefore,
+improvements to documentation are always welcome.
+
+We follow the documentation style guidelines as given by [RFC 1574].
+
+[RFC 1574]: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md#appendix-a-full-conventions-text
+
+# Issue Triage
+[Issue Triage]: #issue-triage
+
+Sometimes, an issue might stay open even after the relevant bug has been fixed.
+Other times, the bug report may become invalid. Or we may just forget about the
+bug.
+
+You can help to go through old bug reports and check if they are still valid.
+You can follow [this link][lrus] to look for issues like this.
+
+[lrus]: https://github.com/uuid-rs/uuid/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc
+
+# Out-of-tree Contributions
+[Out-of-tree Contributions]: #out-of-tree-contributions
+
+You can contribute to Uuid in other ways:
+
+* Answer questions on [users.rust-lang.org][u-r-l-o], [uuid-rs mailing list] and/or
+[gitter] channel.
+* Find the [crates depending on `uuid`][dependent] and sending PRs to them,
+helping them keep their version of `uuid` up-to-date.
+
+[dependent]: https://crates.io/crates/uuid/reverse_dependencies
+
+# Helpful Links
+[Helpful Links]: #helpful-links
+
+For people new to Uuid, and just starting to contribute, or even for more
+seasoned developers, some useful places to look for information are:
+
+* The Wikipedia entry on [Universally Unique Identifier][wiki-uuid].
+* [RFC 4122] which gives the specification of Uuids.
+
+[wiki-uuid]: https://en.wikipedia.org/wiki/Universally_unique_identifier
+[RFC 4122]: https://www.ietf.org/rfc/rfc4122.txt
+
+[u-r-l-o]: https://users.rust-lang.org
+[uuid-rs mailing list]: https://uuid-rs.groups.io
+[gitter]: https://gitter.im/uuid-rs/Lobby
+[search existing issues]: https://github.com/uuid-rs/uuid/search?q=&type=Issues&utf8=%E2%9C%93
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/COPYRIGHT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/COPYRIGHT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/COPYRIGHT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/COPYRIGHT	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,8 @@
-The Uuid Project is copyright 2013-2014, The Rust Project Developers and
-copyright 2018, The Uuid Developers.
-
-Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-http://www.apache.org/licenses/LICENSE-2.0> or the MIT License <LICENSE-MIT or
-http://opensource.org/licenses/MIT>, at your option. All files in the project
-carrying such notice may not be copied, modified, or distributed except
-according to those terms.
+The Uuid Project is copyright 2013-2014, The Rust Project Developers and
+copyright 2018, The Uuid Developers.
+
+Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+http://www.apache.org/licenses/LICENSE-2.0> or the MIT License <LICENSE-MIT or
+http://opensource.org/licenses/MIT>, at your option. All files in the project
+carrying such notice may not be copied, modified, or distributed except
+according to those terms.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -1,201 +1,201 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,26 @@
-Copyright (c) 2014 The Rust Project Developers
-Copyright (c) 2018 Ashley Mannix, Christopher Armstrong, Dylan DPC, Hunar Roop Kahlon
-
-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.
+Copyright (c) 2014 The Rust Project Developers
+Copyright (c) 2018 Ashley Mannix, Christopher Armstrong, Dylan DPC, Hunar Roop Kahlon
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,135 +1,141 @@
-uuid
----------
-
-[![Latest Version](https://img.shields.io/crates/v/uuid.svg)](https://crates.io/crates/uuid)
-[![Join the chat at https://gitter.im/uuid-rs/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/uuid-rs/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)
-![Minimum rustc version](https://img.shields.io/badge/rustc-1.31.0+-yellow.svg)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/uuid-rs/uuid?branch=master&svg=true)](https://ci.appveyor.com/project/uuid-rs/uuid/branch/master)
-[![Build Status](https://travis-ci.org/uuid-rs/uuid.svg?branch=master)](https://travis-ci.org/uuid-rs/uuid)
-[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/uuid-rs/uuid.svg)](https://isitmaintained.com/project/uuid-rs/uuid "Average time to resolve an issue")
-[![Percentage of issues still open](https://isitmaintained.com/badge/open/uuid-rs/uuid.svg)](https://isitmaintained.com/project/uuid-rs/uuid "Percentage of issues still open")
-
----
-
-Generate and parse UUIDs.
-
-Provides support for Universally Unique Identifiers (UUIDs). A UUID is a
-unique 128-bit number, stored as 16 octets. UUIDs are used to  assign
-unique identifiers to entities without requiring a central allocating
-authority.
-
-They are particularly useful in distributed systems, though can be used in
-disparate areas, such as databases and network protocols.  Typically a UUID
-is displayed in a readable string form as a sequence of hexadecimal digits,
-separated into groups by hyphens.
-
-The uniqueness property is not strictly guaranteed, however for all
-practical purposes, it can be assumed that an unintentional collision would
-be extremely unlikely.
-
-## Dependencies
-
-By default, this crate depends on nothing but `std` and cannot generate
-[`Uuid`]s. You need to enable the following Cargo features to enable
-various pieces of functionality:
-
-* `v1` - adds the `Uuid::new_v1` function and the ability to create a V1
-  using an implementation of `uuid::v1::ClockSequence` (usually
-`uuid::v1::Context`) and a timestamp from `time::timespec`.
-* `v3` - adds the `Uuid::new_v3` function and the ability to create a V3
-  UUID based on the MD5 hash of some data.
-* `v4` - adds the `Uuid::new_v4` function and the ability to randomly
-  generate a `Uuid`.
-* `v5` - adds the `Uuid::new_v5` function and the ability to create a V5
-  UUID based on the SHA1 hash of some data.
-* `serde` - adds the ability to serialize and deserialize a `Uuid` using the
-  `serde` crate.
-
-You need to enable one of the following Cargo features together with
-`v3`, `v4` or `v5` feature if you're targeting `wasm32` architecture:
-
-* `stdweb` - enables support for `OsRng` on `wasm32-unknown-unknown` via
-  `stdweb` combined with `cargo-web`
-* `wasm-bindgen` - `wasm-bindgen` enables support for `OsRng` on
-  `wasm32-unknown-unknown` via [`wasm-bindgen`]
-
-By default, `uuid` can be depended on with:
-
-```toml
-[dependencies]
-uuid = "0.8"
-```
-
-To activate various features, use syntax like:
-
-```toml
-[dependencies]
-uuid = { version = "0.8", features = ["serde", "v4"] }
-```
-
-You can disable default features with:
-
-```toml
-[dependencies]
-uuid = { version = "0.8", default-features = false }
-```
-
-## Examples
-
-To parse a UUID given in the simple format and print it as a urn:
-
-```rust
-use uuid::Uuid;
-
-fn main() {
-    let my_uuid =
-        Uuid::parse_str("936DA01F9ABD4d9d80C702AF85C822A8").unwrap();
-    println!("{}", my_uuid.to_urn());
-}
-```
-
-To create a new random (V4) UUID and print it out in hexadecimal form:
-
-```rust
-// Note that this requires the `v4` feature enabled in the uuid crate.
-
-use uuid::Uuid;
-
-fn main() {
-    let my_uuid = Uuid::new_v4();
-    println!("{}", my_uuid);
-}
-```
-
-## Strings
-
-Examples of string representations:
-
-* simple: `936DA01F9ABD4d9d80C702AF85C822A8`
-* hyphenated: `550e8400-e29b-41d4-a716-446655440000`
-* urn: `urn:uuid:F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4`
-
-## References
-
-* [Wikipedia: Universally Unique Identifier](     http://en.wikipedia.org/wiki/Universally_unique_identifier)
-* [RFC4122: A Universally Unique IDentifier (UUID) URN Namespace](     http://tools.ietf.org/html/rfc4122)
-
-[`wasm-bindgen`]: https://github.com/rustwasm/wasm-bindgen
-
-[`Uuid`]: https://docs.rs/uuid/0.8.1/uuid/struct.Uuid.html
-
----
-# License
-
-Licensed under either of
-
-* Apache License, Version 2.0, (LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0)
-* MIT license (LICENSE-MIT or https://opensource.org/licenses/MIT)
-
-at your option.
-
-## Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
+uuid
+---------
+
+[![Latest Version](https://img.shields.io/crates/v/uuid.svg)](https://crates.io/crates/uuid)
+[![Join the chat at https://gitter.im/uuid-rs/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/uuid-rs/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)
+![Minimum rustc version](https://img.shields.io/badge/rustc-1.34.0+-yellow.svg)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/uuid-rs/uuid?branch=master&svg=true)](https://ci.appveyor.com/project/uuid-rs/uuid/branch/master)
+[![Build Status](https://travis-ci.org/uuid-rs/uuid.svg?branch=master)](https://travis-ci.org/uuid-rs/uuid)
+[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/uuid-rs/uuid.svg)](https://isitmaintained.com/project/uuid-rs/uuid "Average time to resolve an issue")
+[![Percentage of issues still open](https://isitmaintained.com/badge/open/uuid-rs/uuid.svg)](https://isitmaintained.com/project/uuid-rs/uuid "Percentage of issues still open")
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fuuid-rs%2Fuuid.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fuuid-rs%2Fuuid?ref=badge_shield)
+
+---
+
+Generate and parse UUIDs.
+
+Provides support for Universally Unique Identifiers (UUIDs). A UUID is a
+unique 128-bit number, stored as 16 octets. UUIDs are used to  assign
+unique identifiers to entities without requiring a central allocating
+authority.
+
+They are particularly useful in distributed systems, though they can be used in
+disparate areas, such as databases and network protocols.  Typically a UUID
+is displayed in a readable string form as a sequence of hexadecimal digits,
+separated into groups by hyphens.
+
+The uniqueness property is not strictly guaranteed, however for all
+practical purposes, it can be assumed that an unintentional collision would
+be extremely unlikely.
+
+## Dependencies
+
+By default, this crate depends on nothing but `std` and cannot generate
+[`Uuid`]s. You need to enable the following Cargo features to enable
+various pieces of functionality:
+
+* `v1` - adds the `Uuid::new_v1` function and the ability to create a V1
+  using an implementation of `uuid::v1::ClockSequence` (usually
+`uuid::v1::Context`) and a timestamp from `time::timespec`.
+* `v3` - adds the `Uuid::new_v3` function and the ability to create a V3
+  UUID based on the MD5 hash of some data.
+* `v4` - adds the `Uuid::new_v4` function and the ability to randomly
+  generate a `Uuid`.
+* `v5` - adds the `Uuid::new_v5` function and the ability to create a V5
+  UUID based on the SHA1 hash of some data.
+* `serde` - adds the ability to serialize and deserialize a `Uuid` using the
+  `serde` crate.
+
+You need to enable one of the following Cargo features together with
+`v3`, `v4` or `v5` feature if you're targeting `wasm32-unknown-unknown` target:
+
+* `stdweb` - enables support for `OsRng` on `wasm32-unknown-unknown` via
+  `stdweb` combined with `cargo-web`
+* `wasm-bindgen` - `wasm-bindgen` enables support for `OsRng` on
+  `wasm32-unknown-unknown` via [`wasm-bindgen`]
+
+By default, `uuid` can be depended on with:
+
+```toml
+[dependencies]
+uuid = "0.8"
+```
+
+To activate various features, use syntax like:
+
+```toml
+[dependencies]
+uuid = { version = "0.8", features = ["serde", "v4"] }
+```
+
+You can disable default features with:
+
+```toml
+[dependencies]
+uuid = { version = "0.8", default-features = false }
+```
+
+## Examples
+
+To parse a UUID given in the simple format and print it as a urn:
+
+```rust
+use uuid::Uuid;
+
+fn main() -> Result<(), uuid::Error> {
+    let my_uuid =
+        Uuid::parse_str("936DA01F9ABD4d9d80C702AF85C822A8")?;
+    println!("{}", my_uuid.to_urn());
+    Ok(())
+}
+```
+
+To create a new random (V4) UUID and print it out in hexadecimal form:
+
+```rust
+// Note that this requires the `v4` feature enabled in the uuid crate.
+
+use uuid::Uuid;
+
+fn main() {
+    let my_uuid = Uuid::new_v4();
+    println!("{}", my_uuid);
+    Ok(())
+}
+```
+
+## Strings
+
+Examples of string representations:
+
+* simple: `936DA01F9ABD4d9d80C702AF85C822A8`
+* hyphenated: `550e8400-e29b-41d4-a716-446655440000`
+* urn: `urn:uuid:F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4`
+
+## References
+
+* [Wikipedia: Universally Unique Identifier](     http://en.wikipedia.org/wiki/Universally_unique_identifier)
+* [RFC4122: A Universally Unique IDentifier (UUID) URN Namespace](     http://tools.ietf.org/html/rfc4122)
+
+[`wasm-bindgen`]: https://github.com/rustwasm/wasm-bindgen
+
+[`Uuid`]: https://docs.rs/uuid/0.8.2/uuid/struct.Uuid.html
+
+---
+# License
+
+Licensed under either of
+
+* Apache License, Version 2.0, (LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0)
+* MIT license (LICENSE-MIT or https://opensource.org/licenses/MIT)
+
+at your option.
+
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fuuid-rs%2Fuuid.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fuuid-rs%2Fuuid?ref=badge_large)
+
+## Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall
+be dual licensed as above, without any additional terms or conditions.
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/README.tpl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/README.tpl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/README.tpl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/README.tpl	2021-12-09 12:01:26.000000000 +0000
@@ -1,29 +1,29 @@
-{{crate}}
----------
-
-[![Latest Version](https://img.shields.io/crates/v/uuid.svg)](https://crates.io/crates/uuid)
-[![Join the chat at https://gitter.im/uuid-rs/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/uuid-rs/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)
-![Minimum rustc version](https://img.shields.io/badge/rustc-1.31.0+-yellow.svg)
-{{badges}}
-
----
-
-{{readme}}
-
-[`Uuid`]: https://docs.rs/uuid/{{version}}/uuid/struct.Uuid.html
-
----
-# License
-
-Licensed under either of
-
-* Apache License, Version 2.0, (LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0)
-* MIT license (LICENSE-MIT or https://opensource.org/licenses/MIT)
-
-at your option.
-
-## Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
+{{crate}}
+---------
+
+[![Latest Version](https://img.shields.io/crates/v/uuid.svg)](https://crates.io/crates/uuid)
+[![Join the chat at https://gitter.im/uuid-rs/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/uuid-rs/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)
+![Minimum rustc version](https://img.shields.io/badge/rustc-1.34.0+-yellow.svg)
+{{badges}}
+
+---
+
+{{readme}}
+
+[`Uuid`]: https://docs.rs/uuid/{{version}}/uuid/struct.Uuid.html
+
+---
+# License
+
+Licensed under either of
+
+* Apache License, Version 2.0, (LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0)
+* MIT license (LICENSE-MIT or https://opensource.org/licenses/MIT)
+
+at your option.
+
+## Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall
+be dual licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/adapter/compact.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/adapter/compact.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/adapter/compact.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/adapter/compact.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,79 +1,81 @@
-//! Module for use with `#[serde(with = "...")]` to serialize a [`Uuid`]
-//! as a `[u8; 16]`.
-//!
-//! [`Uuid`]: ../../struct.Uuid.html
-
-/// Serializer for a [`Uuid`] into a `[u8; 16]`
-///
-/// [`Uuid`]: ../../struct.Uuid.html
-pub fn serialize<S>(u: &crate::Uuid, serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: serde::Serializer,
-{
-    serde::Serialize::serialize(u.as_bytes(), serializer)
-}
-
-/// Deserializer from a `[u8; 16]` into a [`Uuid`]
-///
-/// [`Uuid`]: ../../struct.Uuid.html
-pub fn deserialize<'de, D>(deserializer: D) -> Result<crate::Uuid, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let bytes: [u8; 16] = serde::Deserialize::deserialize(deserializer)?;
-
-    Ok(crate::Uuid::from_bytes(bytes))
-}
-
-#[cfg(test)]
-mod tests {
-
-    use serde_test;
-
-    #[test]
-    fn test_serialize_compact() {
-        #[derive(serde::Serialize, Debug, serde::Deserialize, PartialEq)]
-        struct UuidContainer {
-            #[serde(with = "super")]
-            u: crate::Uuid,
-        }
-        use serde_test::Configure;
-
-        let uuid_bytes = b"F9168C5E-CEB2-4F";
-        let container = UuidContainer {
-            u: crate::Uuid::from_slice(uuid_bytes).unwrap(),
-        };
-
-        // more complex because of the struct wrapping the actual UUID
-        // serialization
-        serde_test::assert_tokens(
-            &container.compact(),
-            &[
-                serde_test::Token::Struct {
-                    name: "UuidContainer",
-                    len: 1,
-                },
-                serde_test::Token::Str("u"),
-                serde_test::Token::Tuple { len: 16 },
-                serde_test::Token::U8(uuid_bytes[0]),
-                serde_test::Token::U8(uuid_bytes[1]),
-                serde_test::Token::U8(uuid_bytes[2]),
-                serde_test::Token::U8(uuid_bytes[3]),
-                serde_test::Token::U8(uuid_bytes[4]),
-                serde_test::Token::U8(uuid_bytes[5]),
-                serde_test::Token::U8(uuid_bytes[6]),
-                serde_test::Token::U8(uuid_bytes[7]),
-                serde_test::Token::U8(uuid_bytes[8]),
-                serde_test::Token::U8(uuid_bytes[9]),
-                serde_test::Token::U8(uuid_bytes[10]),
-                serde_test::Token::U8(uuid_bytes[11]),
-                serde_test::Token::U8(uuid_bytes[12]),
-                serde_test::Token::U8(uuid_bytes[13]),
-                serde_test::Token::U8(uuid_bytes[14]),
-                serde_test::Token::U8(uuid_bytes[15]),
-                serde_test::Token::TupleEnd,
-                serde_test::Token::StructEnd,
-            ],
-        )
-    }
-}
+//! Module for use with `#[serde(with = "...")]` to serialize a [`Uuid`]
+//! as a `[u8; 16]`.
+//!
+//! [`Uuid`]: ../../struct.Uuid.html
+
+/// Serializer for a [`Uuid`] into a `[u8; 16]`
+///
+/// [`Uuid`]: ../../struct.Uuid.html
+pub fn serialize<S>(u: &crate::Uuid, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    serde::Serialize::serialize(u.as_bytes(), serializer)
+}
+
+/// Deserializer from a `[u8; 16]` into a [`Uuid`]
+///
+/// [`Uuid`]: ../../struct.Uuid.html
+pub fn deserialize<'de, D>(deserializer: D) -> Result<crate::Uuid, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let bytes: [u8; 16] = serde::Deserialize::deserialize(deserializer)?;
+
+    Ok(crate::Uuid::from_bytes(bytes))
+}
+
+#[cfg(test)]
+mod tests {
+
+    use serde_test;
+
+    #[test]
+    fn test_serialize_compact() {
+        #[derive(
+            serde_derive::Serialize, Debug, serde_derive::Deserialize, PartialEq,
+        )]
+        struct UuidContainer {
+            #[serde(with = "super")]
+            u: crate::Uuid,
+        }
+        use serde_test::Configure;
+
+        let uuid_bytes = b"F9168C5E-CEB2-4F";
+        let container = UuidContainer {
+            u: crate::Uuid::from_slice(uuid_bytes).unwrap(),
+        };
+
+        // more complex because of the struct wrapping the actual UUID
+        // serialization
+        serde_test::assert_tokens(
+            &container.compact(),
+            &[
+                serde_test::Token::Struct {
+                    name: "UuidContainer",
+                    len: 1,
+                },
+                serde_test::Token::Str("u"),
+                serde_test::Token::Tuple { len: 16 },
+                serde_test::Token::U8(uuid_bytes[0]),
+                serde_test::Token::U8(uuid_bytes[1]),
+                serde_test::Token::U8(uuid_bytes[2]),
+                serde_test::Token::U8(uuid_bytes[3]),
+                serde_test::Token::U8(uuid_bytes[4]),
+                serde_test::Token::U8(uuid_bytes[5]),
+                serde_test::Token::U8(uuid_bytes[6]),
+                serde_test::Token::U8(uuid_bytes[7]),
+                serde_test::Token::U8(uuid_bytes[8]),
+                serde_test::Token::U8(uuid_bytes[9]),
+                serde_test::Token::U8(uuid_bytes[10]),
+                serde_test::Token::U8(uuid_bytes[11]),
+                serde_test::Token::U8(uuid_bytes[12]),
+                serde_test::Token::U8(uuid_bytes[13]),
+                serde_test::Token::U8(uuid_bytes[14]),
+                serde_test::Token::U8(uuid_bytes[15]),
+                serde_test::Token::TupleEnd,
+                serde_test::Token::StructEnd,
+            ],
+        )
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/adapter/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/adapter/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/adapter/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/adapter/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,978 +1,1027 @@
-// Copyright 2013-2014 The Rust Project Developers.
-// Copyright 2018 The Uuid Project Developers.
-//
-// See the COPYRIGHT file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Adapters for various formats for UUIDs
-
-use crate::prelude::*;
-use crate::std::{fmt, str};
-
-#[cfg(feature = "serde")]
-pub mod compact;
-
-/// An adaptor for formatting an [`Uuid`] as a hyphenated string.
-///
-/// Takes an owned instance of the [`Uuid`].
-///
-/// [`Uuid`]: ../struct.Uuid.html
-#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct Hyphenated(Uuid);
-
-/// An adaptor for formatting an [`Uuid`] as a hyphenated string.
-///
-/// Takes a reference of the [`Uuid`].
-///
-/// [`Uuid`]: ../struct.Uuid.html
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct HyphenatedRef<'a>(&'a Uuid);
-
-/// An adaptor for formatting an [`Uuid`] as a simple string.
-///
-/// Takes an owned instance of the [`Uuid`].
-///
-/// [`Uuid`]: ../struct.Uuid.html
-#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct Simple(Uuid);
-
-/// An adaptor for formatting an [`Uuid`] as a simple string.
-///
-/// Takes a reference of the [`Uuid`].
-///
-/// [`Uuid`]: ../struct.Uuid.html
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct SimpleRef<'a>(&'a Uuid);
-
-/// An adaptor for formatting an [`Uuid`] as a URN string.
-///
-/// Takes an owned instance of the [`Uuid`].
-///
-/// [`Uuid`]: ../struct.Uuid.html
-#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct Urn(Uuid);
-
-/// An adaptor for formatting an [`Uuid`] as a URN string.
-///
-/// Takes a reference of the [`Uuid`].
-///
-/// [`Uuid`]: ../struct.Uuid.html
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct UrnRef<'a>(&'a Uuid);
-
-impl Uuid {
-    /// Get a [`Hyphenated`] formatter.
-    ///
-    /// [`Hyphenated`]: adapter/struct.Hyphenated.html
-    #[inline]
-    pub const fn to_hyphenated(self) -> Hyphenated {
-        Hyphenated::from_uuid(self)
-    }
-
-    /// Get a borrowed [`HyphenatedRef`] formatter.
-    ///
-    /// [`HyphenatedRef`]: adapter/struct.HyphenatedRef.html
-    #[inline]
-    pub const fn to_hyphenated_ref(&self) -> HyphenatedRef<'_> {
-        HyphenatedRef::from_uuid_ref(self)
-    }
-
-    /// Get a [`Simple`] formatter.
-    ///
-    /// [`Simple`]: adapter/struct.Simple.html
-    #[inline]
-    pub const fn to_simple(self) -> Simple {
-        Simple::from_uuid(self)
-    }
-
-    /// Get a borrowed [`SimpleRef`] formatter.
-    ///
-    /// [`SimpleRef`]: adapter/struct.SimpleRef.html
-    #[inline]
-    pub const fn to_simple_ref(&self) -> SimpleRef<'_> {
-        SimpleRef::from_uuid_ref(self)
-    }
-
-    /// Get a [`Urn`] formatter.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    /// [`Urn`]: adapter/struct.Urn.html
-    #[inline]
-    pub const fn to_urn(self) -> Urn {
-        Urn::from_uuid(self)
-    }
-
-    /// Get a borrowed [`UrnRef`] formatter.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    /// [`UrnRef`]: adapter/struct.UrnRef.html
-    #[inline]
-    pub const fn to_urn_ref(&self) -> UrnRef<'_> {
-        UrnRef::from_uuid_ref(self)
-    }
-}
-
-const UPPER: [u8; 16] = [
-    b'0', b'1', b'2', b'3', b'4', b'5', b'6', b'7', b'8', b'9', b'A', b'B',
-    b'C', b'D', b'E', b'F',
-];
-const LOWER: [u8; 16] = [
-    b'0', b'1', b'2', b'3', b'4', b'5', b'6', b'7', b'8', b'9', b'a', b'b',
-    b'c', b'd', b'e', b'f',
-];
-/// The segments of a UUID's [u8; 16] corresponding to each group.
-const BYTE_POSITIONS: [usize; 6] = [0, 4, 6, 8, 10, 16];
-/// The locations that hyphens are written into the buffer, after each
-/// group.
-const HYPHEN_POSITIONS: [usize; 4] = [8, 13, 18, 23];
-
-/// Encodes the `uuid` possibly with hyphens, and possibly in upper
-/// case, to full_buffer[start..] and returns the str sliced from
-/// full_buffer[..start + encoded_length].
-///
-/// The `start` parameter allows writing a prefix (such as
-/// "urn:uuid:") to the buffer that's included in the final encoded
-/// UUID.
-fn encode<'a>(
-    full_buffer: &'a mut [u8],
-    start: usize,
-    uuid: &Uuid,
-    hyphens: bool,
-    upper: bool,
-) -> &'a mut str {
-    let len = if hyphens { 36 } else { 32 };
-
-    {
-        let buffer = &mut full_buffer[start..start + len];
-        let bytes = uuid.as_bytes();
-
-        let hex = if upper { &UPPER } else { &LOWER };
-
-        for group in 0..5 {
-            // If we're writing hyphens, we need to shift the output
-            // location along by how many of them have been written
-            // before this point. That's exactly the (0-indexed) group
-            // number.
-            let hyphens_before = if hyphens { group } else { 0 };
-            for idx in BYTE_POSITIONS[group]..BYTE_POSITIONS[group + 1] {
-                let b = bytes[idx];
-                let out_idx = hyphens_before + 2 * idx;
-
-                buffer[out_idx] = hex[(b >> 4) as usize];
-                buffer[out_idx + 1] = hex[(b & 0b1111) as usize];
-            }
-
-            if group != 4 && hyphens {
-                buffer[HYPHEN_POSITIONS[group]] = b'-';
-            }
-        }
-    }
-
-    str::from_utf8_mut(&mut full_buffer[..start + len])
-        .expect("found non-ASCII output characters while encoding a UUID")
-}
-
-impl Hyphenated {
-    /// The length of a hyphenated [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    pub const LENGTH: usize = 36;
-
-    /// Creates a [`Hyphenated`] from a [`Uuid`].
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    /// [`Hyphenated`]: struct.Hyphenated.html
-    pub const fn from_uuid(uuid: Uuid) -> Self {
-        Hyphenated(uuid)
-    }
-
-    /// Writes the [`Uuid`] as a lower-case hyphenated string to
-    /// `buffer`, and returns the subslice of the buffer that contains the
-    /// encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_hyphenated()
-    ///         .encode_lower(&mut Uuid::encode_buffer()),
-    ///     "936da01f-9abd-4d9d-80c7-02af85c822a8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 40];
-    /// uuid.to_hyphenated().encode_lower(&mut buf);
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"936da01f-9abd-4d9d-80c7-02af85c822a8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        encode(buffer, 0, &self.0, true, false)
-    }
-
-    /// Writes the [`Uuid`] as an upper-case hyphenated string to
-    /// `buffer`, and returns the subslice of the buffer that contains the
-    /// encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_hyphenated()
-    ///         .encode_upper(&mut Uuid::encode_buffer()),
-    ///     "936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 40];
-    /// uuid.to_hyphenated().encode_upper(&mut buf);
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"936DA01F-9ABD-4D9D-80C7-02AF85C822A8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        encode(buffer, 0, &self.0, true, true)
-    }
-}
-
-impl<'a> HyphenatedRef<'a> {
-    /// The length of a hyphenated [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    pub const LENGTH: usize = 36;
-
-    /// Creates a [`HyphenatedRef`] from a [`Uuid`] reference.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    /// [`HyphenatedRef`]: struct.HyphenatedRef.html
-    pub const fn from_uuid_ref(uuid: &'a Uuid) -> Self {
-        HyphenatedRef(uuid)
-    }
-
-    /// Writes the [`Uuid`] as a lower-case hyphenated string to
-    /// `buffer`, and returns the subslice of the buffer that contains the
-    /// encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_hyphenated()
-    ///         .encode_lower(&mut Uuid::encode_buffer()),
-    ///     "936da01f-9abd-4d9d-80c7-02af85c822a8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 40];
-    /// uuid.to_hyphenated().encode_lower(&mut buf);
-    /// assert_eq!(
-    ///     uuid.to_hyphenated().encode_lower(&mut buf),
-    ///     "936da01f-9abd-4d9d-80c7-02af85c822a8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"936da01f-9abd-4d9d-80c7-02af85c822a8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        encode(buffer, 0, self.0, true, false)
-    }
-
-    /// Writes the [`Uuid`] as an upper-case hyphenated string to
-    /// `buffer`, and returns the subslice of the buffer that contains the
-    /// encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_hyphenated()
-    ///         .encode_upper(&mut Uuid::encode_buffer()),
-    ///     "936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 40];
-    /// assert_eq!(
-    ///     uuid.to_hyphenated().encode_upper(&mut buf),
-    ///     "936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"936DA01F-9ABD-4D9D-80C7-02AF85C822A8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        encode(buffer, 0, self.0, true, true)
-    }
-}
-
-impl Simple {
-    /// The length of a simple [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    pub const LENGTH: usize = 32;
-
-    /// Creates a [`Simple`] from a [`Uuid`].
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    /// [`Simple`]: struct.Simple.html
-    pub const fn from_uuid(uuid: Uuid) -> Self {
-        Simple(uuid)
-    }
-
-    /// Writes the [`Uuid`] as a lower-case simple string to `buffer`,
-    /// and returns the subslice of the buffer that contains the encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_lower(&mut Uuid::encode_buffer()),
-    ///     "936da01f9abd4d9d80c702af85c822a8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 36];
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_lower(&mut buf),
-    ///     "936da01f9abd4d9d80c702af85c822a8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"936da01f9abd4d9d80c702af85c822a8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        encode(buffer, 0, &self.0, false, false)
-    }
-
-    /// Writes the [`Uuid`] as an upper-case simple string to `buffer`,
-    /// and returns the subslice of the buffer that contains the encoded UUID.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_upper(&mut Uuid::encode_buffer()),
-    ///     "936DA01F9ABD4D9D80C702AF85C822A8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 36];
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_upper(&mut buf),
-    ///     "936DA01F9ABD4D9D80C702AF85C822A8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"936DA01F9ABD4D9D80C702AF85C822A8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        encode(buffer, 0, &self.0, false, true)
-    }
-}
-
-impl<'a> SimpleRef<'a> {
-    /// The length of a simple [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    pub const LENGTH: usize = 32;
-
-    /// Creates a [`SimpleRef`] from a [`Uuid`] reference.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    /// [`SimpleRef`]: struct.SimpleRef.html
-    pub const fn from_uuid_ref(uuid: &'a Uuid) -> Self {
-        SimpleRef(uuid)
-    }
-
-    /// Writes the [`Uuid`] as a lower-case simple string to `buffer`,
-    /// and returns the subslice of the buffer that contains the encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_lower(&mut Uuid::encode_buffer()),
-    ///     "936da01f9abd4d9d80c702af85c822a8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 36];
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_lower(&mut buf),
-    ///     "936da01f9abd4d9d80c702af85c822a8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"936da01f9abd4d9d80c702af85c822a8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        encode(buffer, 0, self.0, false, false)
-    }
-
-    /// Writes the [`Uuid`] as an upper-case simple string to `buffer`,
-    /// and returns the subslice of the buffer that contains the encoded UUID.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_upper(&mut Uuid::encode_buffer()),
-    ///     "936DA01F9ABD4D9D80C702AF85C822A8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 36];
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_upper(&mut buf),
-    ///     "936DA01F9ABD4D9D80C702AF85C822A8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"936DA01F9ABD4D9D80C702AF85C822A8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        encode(buffer, 0, self.0, false, true)
-    }
-}
-
-impl Urn {
-    /// The length of a URN [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    pub const LENGTH: usize = 45;
-
-    /// Creates a [`Urn`] from a [`Uuid`].
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    /// [`Urn`]: struct.Urn.html
-    pub const fn from_uuid(uuid: Uuid) -> Self {
-        Urn(uuid)
-    }
-
-    /// Writes the [`Uuid`] as a lower-case URN string to
-    /// `buffer`, and returns the subslice of the buffer that contains the
-    /// encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_lower(&mut Uuid::encode_buffer()),
-    ///     "urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 49];
-    /// uuid.to_urn().encode_lower(&mut buf);
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_lower(&mut buf),
-    ///     "urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        buffer[..9].copy_from_slice(b"urn:uuid:");
-        encode(buffer, 9, &self.0, true, false)
-    }
-
-    /// Writes the [`Uuid`] as an upper-case URN string to
-    /// `buffer`, and returns the subslice of the buffer that contains the
-    /// encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_upper(&mut Uuid::encode_buffer()),
-    ///     "urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 49];
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_upper(&mut buf),
-    ///     "urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        buffer[..9].copy_from_slice(b"urn:uuid:");
-        encode(buffer, 9, &self.0, true, true)
-    }
-}
-
-impl<'a> UrnRef<'a> {
-    /// The length of a URN [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    pub const LENGTH: usize = 45;
-
-    /// Creates a [`UrnRef`] from a [`Uuid`] reference.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    /// [`UrnRef`]: struct.UrnRef.html
-    pub const fn from_uuid_ref(uuid: &'a Uuid) -> Self {
-        UrnRef(&uuid)
-    }
-
-    /// Writes the [`Uuid`] as a lower-case URN string to
-    /// `buffer`, and returns the subslice of the buffer that contains the
-    /// encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_lower(&mut Uuid::encode_buffer()),
-    ///     "urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 49];
-    /// uuid.to_urn().encode_lower(&mut buf);
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_lower(&mut buf),
-    ///     "urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        buffer[..9].copy_from_slice(b"urn:uuid:");
-        encode(buffer, 9, self.0, true, false)
-    }
-
-    /// Writes the [`Uuid`] as an upper-case URN string to
-    /// `buffer`, and returns the subslice of the buffer that contains the
-    /// encoded UUID.
-    ///
-    /// This is slightly more efficient than using the formatting
-    /// infrastructure as it avoids virtual calls, and may avoid
-    /// double buffering.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    ///
-    /// # Panics
-    ///
-    /// Panics if the buffer is not large enough: it must have length at least
-    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
-    /// sufficiently-large temporary buffer.
-    ///
-    /// [`LENGTH`]: #associatedconstant.LENGTH
-    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8").unwrap();
-    ///
-    /// // the encoded portion is returned
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_upper(&mut Uuid::encode_buffer()),
-    ///     "urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
-    /// );
-    ///
-    /// // the buffer is mutated directly, and trailing contents remains
-    /// let mut buf = [b'!'; 49];
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_upper(&mut buf),
-    ///     "urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
-    /// );
-    /// assert_eq!(
-    ///     &buf as &[_],
-    ///     b"urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8!!!!" as &[_]
-    /// );
-    /// ```
-    /// */
-    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
-        buffer[..9].copy_from_slice(b"urn:uuid:");
-        encode(buffer, 9, self.0, true, true)
-    }
-}
-
-macro_rules! impl_adapter_traits {
-    ($($T:ident<$($a:lifetime),*>),+) => {$(
-        impl<$($a),*> fmt::Display for $T<$($a),*> {
-            #[inline]
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                fmt::LowerHex::fmt(self, f)
-            }
-        }
-
-        impl<$($a),*> fmt::LowerHex for $T<$($a),*> {
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                // TODO: Self doesn't work https://github.com/rust-lang/rust/issues/52808
-                f.write_str(self.encode_lower(&mut [0; $T::LENGTH]))
-            }
-        }
-
-        impl<$($a),*> fmt::UpperHex for $T<$($a),*> {
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                // TODO: Self doesn't work https://github.com/rust-lang/rust/issues/52808
-                f.write_str(self.encode_upper(&mut [0; $T::LENGTH]))
-            }
-        }
-
-        impl_adapter_from!($T<$($a),*>);
-    )+}
-}
-
-macro_rules! impl_adapter_from {
-    ($T:ident<>) => {
-        impl From<Uuid> for $T {
-            #[inline]
-            fn from(f: Uuid) -> Self {
-                $T::from_uuid(f)
-            }
-        }
-    };
-    ($T:ident<$a:lifetime>) => {
-        impl<$a> From<&$a Uuid> for $T<$a> {
-            #[inline]
-            fn from(f: &$a Uuid) -> Self {
-                $T::from_uuid_ref(f)
-            }
-        }
-    };
-}
-
-impl_adapter_traits! {
-    Hyphenated<>,
-    HyphenatedRef<'a>,
-    Simple<>,
-    SimpleRef<'a>,
-    Urn<>,
-    UrnRef<'a>
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    #[test]
-    fn hyphenated_trailing() {
-        let mut buf = [b'x'; 100];
-        let len = Uuid::nil().to_hyphenated().encode_lower(&mut buf).len();
-        assert_eq!(len, super::Hyphenated::LENGTH);
-        assert!(buf[len..].iter().all(|x| *x == b'x'));
-    }
-
-    #[test]
-    fn hyphenated_ref_trailing() {
-        let mut buf = [b'x'; 100];
-        let len = Uuid::nil().to_hyphenated().encode_lower(&mut buf).len();
-        assert_eq!(len, super::HyphenatedRef::LENGTH);
-        assert!(buf[len..].iter().all(|x| *x == b'x'));
-    }
-
-    #[test]
-    fn simple_trailing() {
-        let mut buf = [b'x'; 100];
-        let len = Uuid::nil().to_simple().encode_lower(&mut buf).len();
-        assert_eq!(len, super::Simple::LENGTH);
-        assert!(buf[len..].iter().all(|x| *x == b'x'));
-    }
-
-    #[test]
-    fn simple_ref_trailing() {
-        let mut buf = [b'x'; 100];
-        let len = Uuid::nil().to_simple().encode_lower(&mut buf).len();
-        assert_eq!(len, super::SimpleRef::LENGTH);
-        assert!(buf[len..].iter().all(|x| *x == b'x'));
-    }
-
-    #[test]
-    fn urn_trailing() {
-        let mut buf = [b'x'; 100];
-        let len = Uuid::nil().to_urn().encode_lower(&mut buf).len();
-        assert_eq!(len, super::Urn::LENGTH);
-        assert!(buf[len..].iter().all(|x| *x == b'x'));
-    }
-
-    #[test]
-    fn urn_ref_trailing() {
-        let mut buf = [b'x'; 100];
-        let len = Uuid::nil().to_urn().encode_lower(&mut buf).len();
-        assert_eq!(len, super::UrnRef::LENGTH);
-        assert!(buf[len..].iter().all(|x| *x == b'x'));
-    }
-
-    #[test]
-    #[should_panic]
-    fn hyphenated_too_small() {
-        Uuid::nil().to_hyphenated().encode_lower(&mut [0; 35]);
-    }
-
-    #[test]
-    #[should_panic]
-    fn hyphenated_ref_too_small() {
-        Uuid::nil().to_hyphenated_ref().encode_lower(&mut [0; 35]);
-    }
-
-    #[test]
-    #[should_panic]
-    fn simple_too_small() {
-        Uuid::nil().to_simple().encode_lower(&mut [0; 31]);
-    }
-    #[test]
-    #[should_panic]
-    fn simple_ref_too_small() {
-        Uuid::nil().to_simple_ref().encode_lower(&mut [0; 31]);
-    }
-    #[test]
-    #[should_panic]
-    fn urn_too_small() {
-        Uuid::nil().to_urn().encode_lower(&mut [0; 44]);
-    }
-    #[test]
-    #[should_panic]
-    fn urn_ref_too_small() {
-        Uuid::nil().to_urn_ref().encode_lower(&mut [0; 44]);
-    }
-}
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Adapters for various formats for UUIDs
+
+use crate::prelude::*;
+use crate::std::{fmt, str};
+
+#[cfg(feature = "serde")]
+pub mod compact;
+
+/// An adaptor for formatting an [`Uuid`] as a hyphenated string.
+///
+/// Takes an owned instance of the [`Uuid`].
+///
+/// [`Uuid`]: ../struct.Uuid.html
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Hyphenated(Uuid);
+
+/// An adaptor for formatting an [`Uuid`] as a hyphenated string.
+///
+/// Takes a reference of the [`Uuid`].
+///
+/// [`Uuid`]: ../struct.Uuid.html
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct HyphenatedRef<'a>(&'a Uuid);
+
+/// An adaptor for formatting an [`Uuid`] as a simple string.
+///
+/// Takes an owned instance of the [`Uuid`].
+///
+/// [`Uuid`]: ../struct.Uuid.html
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Simple(Uuid);
+
+/// An adaptor for formatting an [`Uuid`] as a simple string.
+///
+/// Takes a reference of the [`Uuid`].
+///
+/// [`Uuid`]: ../struct.Uuid.html
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct SimpleRef<'a>(&'a Uuid);
+
+/// An adaptor for formatting an [`Uuid`] as a URN string.
+///
+/// Takes an owned instance of the [`Uuid`].
+///
+/// [`Uuid`]: ../struct.Uuid.html
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Urn(Uuid);
+
+/// An adaptor for formatting an [`Uuid`] as a URN string.
+///
+/// Takes a reference of the [`Uuid`].
+///
+/// [`Uuid`]: ../struct.Uuid.html
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct UrnRef<'a>(&'a Uuid);
+
+impl Uuid {
+    /// Get a [`Hyphenated`] formatter.
+    ///
+    /// [`Hyphenated`]: adapter/struct.Hyphenated.html
+    #[inline]
+    pub const fn to_hyphenated(self) -> Hyphenated {
+        Hyphenated::from_uuid(self)
+    }
+
+    /// Get a borrowed [`HyphenatedRef`] formatter.
+    ///
+    /// [`HyphenatedRef`]: adapter/struct.HyphenatedRef.html
+    #[inline]
+    pub const fn to_hyphenated_ref(&self) -> HyphenatedRef<'_> {
+        HyphenatedRef::from_uuid_ref(self)
+    }
+
+    /// Get a [`Simple`] formatter.
+    ///
+    /// [`Simple`]: adapter/struct.Simple.html
+    #[inline]
+    pub const fn to_simple(self) -> Simple {
+        Simple::from_uuid(self)
+    }
+
+    /// Get a borrowed [`SimpleRef`] formatter.
+    ///
+    /// [`SimpleRef`]: adapter/struct.SimpleRef.html
+    #[inline]
+    pub const fn to_simple_ref(&self) -> SimpleRef<'_> {
+        SimpleRef::from_uuid_ref(self)
+    }
+
+    /// Get a [`Urn`] formatter.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    /// [`Urn`]: adapter/struct.Urn.html
+    #[inline]
+    pub const fn to_urn(self) -> Urn {
+        Urn::from_uuid(self)
+    }
+
+    /// Get a borrowed [`UrnRef`] formatter.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    /// [`UrnRef`]: adapter/struct.UrnRef.html
+    #[inline]
+    pub const fn to_urn_ref(&self) -> UrnRef<'_> {
+        UrnRef::from_uuid_ref(self)
+    }
+}
+
+const UPPER: [u8; 16] = [
+    b'0', b'1', b'2', b'3', b'4', b'5', b'6', b'7', b'8', b'9', b'A', b'B',
+    b'C', b'D', b'E', b'F',
+];
+const LOWER: [u8; 16] = [
+    b'0', b'1', b'2', b'3', b'4', b'5', b'6', b'7', b'8', b'9', b'a', b'b',
+    b'c', b'd', b'e', b'f',
+];
+/// The segments of a UUID's [u8; 16] corresponding to each group.
+const BYTE_POSITIONS: [usize; 6] = [0, 4, 6, 8, 10, 16];
+/// The locations that hyphens are written into the buffer, after each
+/// group.
+const HYPHEN_POSITIONS: [usize; 4] = [8, 13, 18, 23];
+
+/// Encodes the `uuid` possibly with hyphens, and possibly in upper
+/// case, to full_buffer[start..] and returns the str sliced from
+/// full_buffer[..start + encoded_length].
+///
+/// The `start` parameter allows writing a prefix (such as
+/// "urn:uuid:") to the buffer that's included in the final encoded
+/// UUID.
+#[allow(clippy::needless_range_loop)]
+fn encode<'a>(
+    full_buffer: &'a mut [u8],
+    start: usize,
+    uuid: &Uuid,
+    hyphens: bool,
+    upper: bool,
+) -> &'a mut str {
+    let len = if hyphens { 36 } else { 32 };
+
+    {
+        let buffer = &mut full_buffer[start..start + len];
+        let bytes = uuid.as_bytes();
+
+        let hex = if upper { &UPPER } else { &LOWER };
+
+        for group in 0..5 {
+            // If we're writing hyphens, we need to shift the output
+            // location along by how many of them have been written
+            // before this point. That's exactly the (0-indexed) group
+            // number.
+            let hyphens_before = if hyphens { group } else { 0 };
+            for idx in BYTE_POSITIONS[group]..BYTE_POSITIONS[group + 1] {
+                let b = bytes[idx];
+                let out_idx = hyphens_before + 2 * idx;
+
+                buffer[out_idx] = hex[(b >> 4) as usize];
+                buffer[out_idx + 1] = hex[(b & 0b1111) as usize];
+            }
+
+            if group != 4 && hyphens {
+                buffer[HYPHEN_POSITIONS[group]] = b'-';
+            }
+        }
+    }
+
+    str::from_utf8_mut(&mut full_buffer[..start + len])
+        .expect("found non-ASCII output characters while encoding a UUID")
+}
+
+impl Hyphenated {
+    /// The length of a hyphenated [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    pub const LENGTH: usize = 36;
+
+    /// Creates a [`Hyphenated`] from a [`Uuid`].
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    /// [`Hyphenated`]: struct.Hyphenated.html
+    pub const fn from_uuid(uuid: Uuid) -> Self {
+        Hyphenated(uuid)
+    }
+
+    /// Writes the [`Uuid`] as a lower-case hyphenated string to
+    /// `buffer`, and returns the subslice of the buffer that contains the
+    /// encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_hyphenated()
+    ///             .encode_lower(&mut Uuid::encode_buffer()),
+    ///         "936da01f-9abd-4d9d-80c7-02af85c822a8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 40];
+    ///     uuid.to_hyphenated().encode_lower(&mut buf);
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"936da01f-9abd-4d9d-80c7-02af85c822a8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        encode(buffer, 0, &self.0, true, false)
+    }
+
+    /// Writes the [`Uuid`] as an upper-case hyphenated string to
+    /// `buffer`, and returns the subslice of the buffer that contains the
+    /// encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_hyphenated()
+    ///             .encode_upper(&mut Uuid::encode_buffer()),
+    ///         "936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 40];
+    ///     uuid.to_hyphenated().encode_upper(&mut buf);
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"936DA01F-9ABD-4D9D-80C7-02AF85C822A8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        encode(buffer, 0, &self.0, true, true)
+    }
+}
+
+impl<'a> HyphenatedRef<'a> {
+    /// The length of a hyphenated [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    pub const LENGTH: usize = 36;
+
+    /// Creates a [`HyphenatedRef`] from a [`Uuid`] reference.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    /// [`HyphenatedRef`]: struct.HyphenatedRef.html
+    pub const fn from_uuid_ref(uuid: &'a Uuid) -> Self {
+        HyphenatedRef(uuid)
+    }
+
+    /// Writes the [`Uuid`] as a lower-case hyphenated string to
+    /// `buffer`, and returns the subslice of the buffer that contains the
+    /// encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_hyphenated()
+    ///             .encode_lower(&mut Uuid::encode_buffer()),
+    ///         "936da01f-9abd-4d9d-80c7-02af85c822a8"
+    ///     );
+    ///     
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 40];
+    ///     uuid.to_hyphenated().encode_lower(&mut buf);
+    ///     assert_eq!(
+    ///         uuid.to_hyphenated().encode_lower(&mut buf),
+    ///         "936da01f-9abd-4d9d-80c7-02af85c822a8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"936da01f-9abd-4d9d-80c7-02af85c822a8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        encode(buffer, 0, self.0, true, false)
+    }
+
+    /// Writes the [`Uuid`] as an upper-case hyphenated string to
+    /// `buffer`, and returns the subslice of the buffer that contains the
+    /// encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_hyphenated()
+    ///             .encode_upper(&mut Uuid::encode_buffer()),
+    ///         "936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 40];
+    ///     assert_eq!(
+    ///         uuid.to_hyphenated().encode_upper(&mut buf),
+    ///         "936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"936DA01F-9ABD-4D9D-80C7-02AF85C822A8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        encode(buffer, 0, self.0, true, true)
+    }
+}
+
+impl Simple {
+    /// The length of a simple [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    pub const LENGTH: usize = 32;
+
+    /// Creates a [`Simple`] from a [`Uuid`].
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    /// [`Simple`]: struct.Simple.html
+    pub const fn from_uuid(uuid: Uuid) -> Self {
+        Simple(uuid)
+    }
+
+    /// Writes the [`Uuid`] as a lower-case simple string to `buffer`,
+    /// and returns the subslice of the buffer that contains the encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_simple().encode_lower(&mut Uuid::encode_buffer()),
+    ///         "936da01f9abd4d9d80c702af85c822a8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 36];
+    ///     assert_eq!(
+    ///         uuid.to_simple().encode_lower(&mut buf),
+    ///         "936da01f9abd4d9d80c702af85c822a8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"936da01f9abd4d9d80c702af85c822a8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        encode(buffer, 0, &self.0, false, false)
+    }
+
+    /// Writes the [`Uuid`] as an upper-case simple string to `buffer`,
+    /// and returns the subslice of the buffer that contains the encoded UUID.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_simple().encode_upper(&mut Uuid::encode_buffer()),
+    ///         "936DA01F9ABD4D9D80C702AF85C822A8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 36];
+    ///     assert_eq!(
+    ///         uuid.to_simple().encode_upper(&mut buf),
+    ///         "936DA01F9ABD4D9D80C702AF85C822A8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"936DA01F9ABD4D9D80C702AF85C822A8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        encode(buffer, 0, &self.0, false, true)
+    }
+}
+
+impl<'a> SimpleRef<'a> {
+    /// The length of a simple [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    pub const LENGTH: usize = 32;
+
+    /// Creates a [`SimpleRef`] from a [`Uuid`] reference.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    /// [`SimpleRef`]: struct.SimpleRef.html
+    pub const fn from_uuid_ref(uuid: &'a Uuid) -> Self {
+        SimpleRef(uuid)
+    }
+
+    /// Writes the [`Uuid`] as a lower-case simple string to `buffer`,
+    /// and returns the subslice of the buffer that contains the encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_simple().encode_lower(&mut Uuid::encode_buffer()),
+    ///         "936da01f9abd4d9d80c702af85c822a8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 36];
+    ///     assert_eq!(
+    ///         uuid.to_simple().encode_lower(&mut buf),
+    ///         "936da01f9abd4d9d80c702af85c822a8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"936da01f9abd4d9d80c702af85c822a8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        encode(buffer, 0, self.0, false, false)
+    }
+
+    /// Writes the [`Uuid`] as an upper-case simple string to `buffer`,
+    /// and returns the subslice of the buffer that contains the encoded UUID.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_simple().encode_upper(&mut Uuid::encode_buffer()),
+    ///         "936DA01F9ABD4D9D80C702AF85C822A8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 36];
+    ///     assert_eq!(
+    ///         uuid.to_simple().encode_upper(&mut buf),
+    ///         "936DA01F9ABD4D9D80C702AF85C822A8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"936DA01F9ABD4D9D80C702AF85C822A8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        encode(buffer, 0, self.0, false, true)
+    }
+}
+
+impl Urn {
+    /// The length of a URN [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    pub const LENGTH: usize = 45;
+
+    /// Creates a [`Urn`] from a [`Uuid`].
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    /// [`Urn`]: struct.Urn.html
+    pub const fn from_uuid(uuid: Uuid) -> Self {
+        Urn(uuid)
+    }
+
+    /// Writes the [`Uuid`] as a lower-case URN string to
+    /// `buffer`, and returns the subslice of the buffer that contains the
+    /// encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_urn().encode_lower(&mut Uuid::encode_buffer()),
+    ///         "urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 49];
+    ///     uuid.to_urn().encode_lower(&mut buf);
+    ///     assert_eq!(
+    ///         uuid.to_urn().encode_lower(&mut buf),
+    ///         "urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8!!!!" as &[_]
+    ///     );
+    ///     
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        buffer[..9].copy_from_slice(b"urn:uuid:");
+        encode(buffer, 9, &self.0, true, false)
+    }
+
+    /// Writes the [`Uuid`] as an upper-case URN string to
+    /// `buffer`, and returns the subslice of the buffer that contains the
+    /// encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_urn().encode_upper(&mut Uuid::encode_buffer()),
+    ///         "urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 49];
+    ///     assert_eq!(
+    ///         uuid.to_urn().encode_upper(&mut buf),
+    ///         "urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        buffer[..9].copy_from_slice(b"urn:uuid:");
+        encode(buffer, 9, &self.0, true, true)
+    }
+}
+
+impl<'a> UrnRef<'a> {
+    /// The length of a URN [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    pub const LENGTH: usize = 45;
+
+    /// Creates a [`UrnRef`] from a [`Uuid`] reference.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    /// [`UrnRef`]: struct.UrnRef.html
+    pub const fn from_uuid_ref(uuid: &'a Uuid) -> Self {
+        UrnRef(&uuid)
+    }
+
+    /// Writes the [`Uuid`] as a lower-case URN string to
+    /// `buffer`, and returns the subslice of the buffer that contains the
+    /// encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_urn().encode_lower(&mut Uuid::encode_buffer()),
+    ///         "urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 49];
+    ///     uuid.to_urn().encode_lower(&mut buf);
+    ///     assert_eq!(
+    ///         uuid.to_urn().encode_lower(&mut buf),
+    ///         "urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"urn:uuid:936da01f-9abd-4d9d-80c7-02af85c822a8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_lower<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        buffer[..9].copy_from_slice(b"urn:uuid:");
+        encode(buffer, 9, self.0, true, false)
+    }
+
+    /// Writes the [`Uuid`] as an upper-case URN string to
+    /// `buffer`, and returns the subslice of the buffer that contains the
+    /// encoded UUID.
+    ///
+    /// This is slightly more efficient than using the formatting
+    /// infrastructure as it avoids virtual calls, and may avoid
+    /// double buffering.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    ///
+    /// # Panics
+    ///
+    /// Panics if the buffer is not large enough: it must have length at least
+    /// [`LENGTH`]. [`Uuid::encode_buffer`] can be used to get a
+    /// sufficiently-large temporary buffer.
+    ///
+    /// [`LENGTH`]: #associatedconstant.LENGTH
+    /// [`Uuid::encode_buffer`]: ../struct.Uuid.html#method.encode_buffer
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936da01f9abd4d9d80c702af85c822a8")?;
+    ///
+    ///     // the encoded portion is returned
+    ///     assert_eq!(
+    ///         uuid.to_urn().encode_upper(&mut Uuid::encode_buffer()),
+    ///         "urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
+    ///     );
+    ///
+    ///     // the buffer is mutated directly, and trailing contents remains
+    ///     let mut buf = [b'!'; 49];
+    ///     assert_eq!(
+    ///         uuid.to_urn().encode_upper(&mut buf),
+    ///         "urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8"
+    ///     );
+    ///     assert_eq!(
+    ///         &buf as &[_],
+    ///         b"urn:uuid:936DA01F-9ABD-4D9D-80C7-02AF85C822A8!!!!" as &[_]
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    /// */
+    pub fn encode_upper<'buf>(&self, buffer: &'buf mut [u8]) -> &'buf mut str {
+        buffer[..9].copy_from_slice(b"urn:uuid:");
+        encode(buffer, 9, self.0, true, true)
+    }
+}
+
+macro_rules! impl_adapter_traits {
+    ($($T:ident<$($a:lifetime),*>),+) => {$(
+        impl<$($a),*> fmt::Display for $T<$($a),*> {
+            #[inline]
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                fmt::LowerHex::fmt(self, f)
+            }
+        }
+
+        impl<$($a),*> fmt::LowerHex for $T<$($a),*> {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                // TODO: Self doesn't work https://github.com/rust-lang/rust/issues/52808
+                f.write_str(self.encode_lower(&mut [0; $T::LENGTH]))
+            }
+        }
+
+        impl<$($a),*> fmt::UpperHex for $T<$($a),*> {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                // TODO: Self doesn't work https://github.com/rust-lang/rust/issues/52808
+                f.write_str(self.encode_upper(&mut [0; $T::LENGTH]))
+            }
+        }
+
+        impl_adapter_from!($T<$($a),*>);
+    )+}
+}
+
+macro_rules! impl_adapter_from {
+    ($T:ident<>) => {
+        impl From<Uuid> for $T {
+            #[inline]
+            fn from(f: Uuid) -> Self {
+                $T::from_uuid(f)
+            }
+        }
+    };
+    ($T:ident<$a:lifetime>) => {
+        impl<$a> From<&$a Uuid> for $T<$a> {
+            #[inline]
+            fn from(f: &$a Uuid) -> Self {
+                $T::from_uuid_ref(f)
+            }
+        }
+    };
+}
+
+impl_adapter_traits! {
+    Hyphenated<>,
+    HyphenatedRef<'a>,
+    Simple<>,
+    SimpleRef<'a>,
+    Urn<>,
+    UrnRef<'a>
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::prelude::*;
+
+    #[test]
+    fn hyphenated_trailing() {
+        let mut buf = [b'x'; 100];
+        let len = Uuid::nil().to_hyphenated().encode_lower(&mut buf).len();
+        assert_eq!(len, super::Hyphenated::LENGTH);
+        assert!(buf[len..].iter().all(|x| *x == b'x'));
+    }
+
+    #[test]
+    fn hyphenated_ref_trailing() {
+        let mut buf = [b'x'; 100];
+        let len = Uuid::nil().to_hyphenated().encode_lower(&mut buf).len();
+        assert_eq!(len, super::HyphenatedRef::LENGTH);
+        assert!(buf[len..].iter().all(|x| *x == b'x'));
+    }
+
+    #[test]
+    fn simple_trailing() {
+        let mut buf = [b'x'; 100];
+        let len = Uuid::nil().to_simple().encode_lower(&mut buf).len();
+        assert_eq!(len, super::Simple::LENGTH);
+        assert!(buf[len..].iter().all(|x| *x == b'x'));
+    }
+
+    #[test]
+    fn simple_ref_trailing() {
+        let mut buf = [b'x'; 100];
+        let len = Uuid::nil().to_simple().encode_lower(&mut buf).len();
+        assert_eq!(len, super::SimpleRef::LENGTH);
+        assert!(buf[len..].iter().all(|x| *x == b'x'));
+    }
+
+    #[test]
+    fn urn_trailing() {
+        let mut buf = [b'x'; 100];
+        let len = Uuid::nil().to_urn().encode_lower(&mut buf).len();
+        assert_eq!(len, super::Urn::LENGTH);
+        assert!(buf[len..].iter().all(|x| *x == b'x'));
+    }
+
+    #[test]
+    fn urn_ref_trailing() {
+        let mut buf = [b'x'; 100];
+        let len = Uuid::nil().to_urn().encode_lower(&mut buf).len();
+        assert_eq!(len, super::UrnRef::LENGTH);
+        assert!(buf[len..].iter().all(|x| *x == b'x'));
+    }
+
+    #[test]
+    #[should_panic]
+    fn hyphenated_too_small() {
+        Uuid::nil().to_hyphenated().encode_lower(&mut [0; 35]);
+    }
+
+    #[test]
+    #[should_panic]
+    fn hyphenated_ref_too_small() {
+        Uuid::nil().to_hyphenated_ref().encode_lower(&mut [0; 35]);
+    }
+
+    #[test]
+    #[should_panic]
+    fn simple_too_small() {
+        Uuid::nil().to_simple().encode_lower(&mut [0; 31]);
+    }
+    #[test]
+    #[should_panic]
+    fn simple_ref_too_small() {
+        Uuid::nil().to_simple_ref().encode_lower(&mut [0; 31]);
+    }
+    #[test]
+    #[should_panic]
+    fn urn_too_small() {
+        Uuid::nil().to_urn().encode_lower(&mut [0; 44]);
+    }
+    #[test]
+    #[should_panic]
+    fn urn_ref_too_small() {
+        Uuid::nil().to_urn_ref().encode_lower(&mut [0; 44]);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/builder/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/builder/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/builder/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/builder/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,52 +1,52 @@
-use crate::std::fmt;
-
-/// The error that can occur when creating a [`Uuid`].
-///
-/// [`Uuid`]: struct.Uuid.html
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub(crate) struct Error {
-    expected: usize,
-    found: usize,
-}
-
-impl Error {
-    /// The expected number of bytes.
-    #[inline]
-    const fn expected(&self) -> usize {
-        self.expected
-    }
-
-    /// The number of bytes found.
-    #[inline]
-    const fn found(&self) -> usize {
-        self.found
-    }
-
-    /// Create a new [`UuidError`].
-    ///
-    /// [`UuidError`]: struct.UuidError.html
-    #[inline]
-    pub(crate) const fn new(expected: usize, found: usize) -> Self {
-        Error { expected, found }
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "invalid bytes length: expected {}, found {}",
-            self.expected(),
-            self.found()
-        )
-    }
-}
-
-#[cfg(feature = "std")]
-mod std_support {
-    use super::*;
-
-    use crate::std::error;
-
-    impl error::Error for Error {}
-}
+use crate::std::fmt;
+
+/// The error that can occur when creating a [`Uuid`].
+///
+/// [`Uuid`]: struct.Uuid.html
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub(crate) struct Error {
+    expected: usize,
+    found: usize,
+}
+
+impl Error {
+    /// The expected number of bytes.
+    #[inline]
+    const fn expected(&self) -> usize {
+        self.expected
+    }
+
+    /// The number of bytes found.
+    #[inline]
+    const fn found(&self) -> usize {
+        self.found
+    }
+
+    /// Create a new [`UuidError`].
+    ///
+    /// [`UuidError`]: struct.UuidError.html
+    #[inline]
+    pub(crate) const fn new(expected: usize, found: usize) -> Self {
+        Error { expected, found }
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "invalid bytes length: expected {}, found {}",
+            self.expected(),
+            self.found()
+        )
+    }
+}
+
+#[cfg(feature = "std")]
+mod std_support {
+    use super::*;
+
+    use crate::std::error;
+
+    impl error::Error for Error {}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/builder/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/builder/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/builder/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/builder/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,474 +1,473 @@
-// Copyright 2013-2014 The Rust Project Developers.
-// Copyright 2018 The Uuid Project Developers.
-//
-// See the COPYRIGHT file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A Builder type for [`Uuid`]s.
-//!
-//! [`Uuid`]: ../struct.Uuid.html
-
-mod error;
-pub(crate) use self::error::Error;
-
-use crate::prelude::*;
-
-impl Uuid {
-    /// The 'nil UUID'.
-    ///
-    /// The nil UUID is special form of UUID that is specified to have all
-    /// 128 bits set to zero, as defined in [IETF RFC 4122 Section 4.1.7][RFC].
-    ///
-    /// [RFC]: https://tools.ietf.org/html/rfc4122.html#section-4.1.7
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::nil();
-    ///
-    /// assert_eq!(
-    ///     uuid.to_hyphenated().to_string(),
-    ///     "00000000-0000-0000-0000-000000000000"
-    /// );
-    /// ```
-    pub const fn nil() -> Self {
-        Uuid::from_bytes([0; 16])
-    }
-
-    /// Creates a UUID from four field values in big-endian order.
-    ///
-    /// # Errors
-    ///
-    /// This function will return an error if `d4`'s length is not 8 bytes.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let d4 = [12, 3, 9, 56, 54, 43, 8, 9];
-    ///
-    /// let uuid = Uuid::from_fields(42, 12, 5, &d4);
-    /// let uuid = uuid.map(|uuid| uuid.to_hyphenated().to_string());
-    ///
-    /// let expected_uuid =
-    ///     Ok(String::from("0000002a-000c-0005-0c03-0938362b0809"));
-    ///
-    /// assert_eq!(expected_uuid, uuid);
-    /// ```
-    pub fn from_fields(
-        d1: u32,
-        d2: u16,
-        d3: u16,
-        d4: &[u8],
-    ) -> Result<Uuid, crate::Error> {
-        const D4_LEN: usize = 8;
-
-        let len = d4.len();
-
-        if len != D4_LEN {
-            Err(Error::new(D4_LEN, len))?;
-        }
-
-        Ok(Uuid::from_bytes([
-            (d1 >> 24) as u8,
-            (d1 >> 16) as u8,
-            (d1 >> 8) as u8,
-            d1 as u8,
-            (d2 >> 8) as u8,
-            d2 as u8,
-            (d3 >> 8) as u8,
-            d3 as u8,
-            d4[0],
-            d4[1],
-            d4[2],
-            d4[3],
-            d4[4],
-            d4[5],
-            d4[6],
-            d4[7],
-        ]))
-    }
-
-    /// Creates a UUID from four field values in little-endian order.
-    ///
-    /// The bytes in the `d1`, `d2` and `d3` fields will
-    /// be converted into big-endian order.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let d1 = 0xAB3F1097u32;
-    /// let d2 = 0x501Eu16;
-    /// let d3 = 0xB736u16;
-    /// let d4 = [12, 3, 9, 56, 54, 43, 8, 9];
-    ///
-    /// let uuid = Uuid::from_fields_le(d1, d2, d3, &d4);
-    /// let uuid = uuid.map(|uuid| uuid.to_hyphenated().to_string());
-    ///
-    /// let expected_uuid =
-    ///     Ok(String::from("97103fab-1e50-36b7-0c03-0938362b0809"));
-    ///
-    /// assert_eq!(expected_uuid, uuid);
-    /// ```
-    pub fn from_fields_le(
-        d1: u32,
-        d2: u16,
-        d3: u16,
-        d4: &[u8],
-    ) -> Result<Uuid, crate::Error> {
-        const D4_LEN: usize = 8;
-
-        let len = d4.len();
-
-        if len != D4_LEN {
-            Err(Error::new(D4_LEN, len))?;
-        }
-
-        Ok(Uuid::from_bytes([
-            d1 as u8,
-            (d1 >> 8) as u8,
-            (d1 >> 16) as u8,
-            (d1 >> 24) as u8,
-            (d2) as u8,
-            (d2 >> 8) as u8,
-            d3 as u8,
-            (d3 >> 8) as u8,
-            d4[0],
-            d4[1],
-            d4[2],
-            d4[3],
-            d4[4],
-            d4[5],
-            d4[6],
-            d4[7],
-        ]))
-    }
-
-    /// Creates a UUID from a 128bit value in big-endian order.
-    pub const fn from_u128(v: u128) -> Self {
-        Uuid::from_bytes([
-            (v >> 120) as u8,
-            (v >> 112) as u8,
-            (v >> 104) as u8,
-            (v >> 96) as u8,
-            (v >> 88) as u8,
-            (v >> 80) as u8,
-            (v >> 72) as u8,
-            (v >> 64) as u8,
-            (v >> 56) as u8,
-            (v >> 48) as u8,
-            (v >> 40) as u8,
-            (v >> 32) as u8,
-            (v >> 24) as u8,
-            (v >> 16) as u8,
-            (v >> 8) as u8,
-            v as u8,
-        ])
-    }
-
-    /// Creates a UUID from a 128bit value in little-endian order.
-    pub const fn from_u128_le(v: u128) -> Self {
-        Uuid::from_bytes([
-            v as u8,
-            (v >> 8) as u8,
-            (v >> 16) as u8,
-            (v >> 24) as u8,
-            (v >> 32) as u8,
-            (v >> 40) as u8,
-            (v >> 48) as u8,
-            (v >> 56) as u8,
-            (v >> 64) as u8,
-            (v >> 72) as u8,
-            (v >> 80) as u8,
-            (v >> 88) as u8,
-            (v >> 96) as u8,
-            (v >> 104) as u8,
-            (v >> 112) as u8,
-            (v >> 120) as u8,
-        ])
-    }
-
-    /// Creates a UUID using the supplied big-endian bytes.
-    ///
-    /// # Errors
-    ///
-    /// This function will return an error if `b` has any length other than 16.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let bytes = [4, 54, 67, 12, 43, 2, 98, 76, 32, 50, 87, 5, 1, 33, 43, 87];
-    ///
-    /// let uuid = Uuid::from_slice(&bytes);
-    /// let uuid = uuid.map(|uuid| uuid.to_hyphenated().to_string());
-    ///
-    /// let expected_uuid =
-    ///     Ok(String::from("0436430c-2b02-624c-2032-570501212b57"));
-    ///
-    /// assert_eq!(expected_uuid, uuid);
-    /// ```
-    ///
-    /// An incorrect number of bytes:
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let bytes = [4, 54, 67, 12, 43, 2, 98, 76];
-    ///
-    /// let uuid = Uuid::from_slice(&bytes);
-    ///
-    /// assert!(uuid.is_err());
-    /// ```
-    pub fn from_slice(b: &[u8]) -> Result<Uuid, crate::Error> {
-        const BYTES_LEN: usize = 16;
-
-        let len = b.len();
-
-        if len != BYTES_LEN {
-            Err(Error::new(BYTES_LEN, len))?;
-        }
-
-        let mut bytes: Bytes = [0; 16];
-        bytes.copy_from_slice(b);
-        Ok(Uuid::from_bytes(bytes))
-    }
-
-    /// Creates a UUID using the supplied big-endian bytes.
-    pub const fn from_bytes(bytes: Bytes) -> Uuid {
-        Uuid(bytes)
-    }
-}
-
-/// A builder struct for creating a UUID.
-///
-/// # Examples
-///
-/// Creating a v4 UUID from externally generated bytes:
-///
-/// ```
-/// use uuid::{Builder, Variant, Version};
-///
-/// # let rng = || [
-/// #     70, 235, 208, 238, 14, 109, 67, 201, 185, 13, 204, 195, 90,
-/// # 145, 63, 62,
-/// # ];
-/// let random_bytes = rng();
-/// let uuid = Builder::from_bytes(random_bytes)
-///     .set_variant(Variant::RFC4122)
-///     .set_version(Version::Random)
-///     .build();
-/// ```
-#[allow(missing_copy_implementations)]
-#[derive(Debug)]
-pub struct Builder(crate::Bytes);
-
-impl Builder {
-    /// Creates a `Builder` using the supplied big-endian bytes.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// let bytes: uuid::Bytes = [
-    ///     70, 235, 208, 238, 14, 109, 67, 201, 185, 13, 204, 195, 90, 145, 63, 62,
-    /// ];
-    ///
-    /// let mut builder = uuid::Builder::from_bytes(bytes);
-    /// let uuid = builder.build().to_hyphenated().to_string();
-    ///
-    /// let expected_uuid = String::from("46ebd0ee-0e6d-43c9-b90d-ccc35a913f3e");
-    ///
-    /// assert_eq!(expected_uuid, uuid);
-    /// ```
-    ///
-    /// An incorrect number of bytes:
-    ///
-    /// ```compile_fail
-    /// let bytes: uuid::Bytes = [4, 54, 67, 12, 43, 2, 98, 76]; // doesn't compile
-    ///
-    /// let uuid = uuid::Builder::from_bytes(bytes);
-    /// ```
-    pub const fn from_bytes(b: Bytes) -> Self {
-        Builder(b)
-    }
-
-    /// Creates a `Builder` using the supplied big-endian bytes.
-    ///
-    /// # Errors
-    ///
-    /// This function will return an error if `b` has any length other than 16.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// let bytes = [4, 54, 67, 12, 43, 2, 98, 76, 32, 50, 87, 5, 1, 33, 43, 87];
-    ///
-    /// let builder = uuid::Builder::from_slice(&bytes);
-    /// let uuid =
-    ///     builder.map(|mut builder| builder.build().to_hyphenated().to_string());
-    ///
-    /// let expected_uuid =
-    ///     Ok(String::from("0436430c-2b02-624c-2032-570501212b57"));
-    ///
-    /// assert_eq!(expected_uuid, uuid);
-    /// ```
-    ///
-    /// An incorrect number of bytes:
-    ///
-    /// ```
-    /// let bytes = [4, 54, 67, 12, 43, 2, 98, 76];
-    ///
-    /// let builder = uuid::Builder::from_slice(&bytes);
-    ///
-    /// assert!(builder.is_err());
-    /// ```
-    pub fn from_slice(b: &[u8]) -> Result<Self, crate::Error> {
-        const BYTES_LEN: usize = 16;
-
-        let len = b.len();
-
-        if len != BYTES_LEN {
-            Err(Error::new(BYTES_LEN, len))?;
-        }
-
-        let mut bytes: crate::Bytes = [0; 16];
-        bytes.copy_from_slice(b);
-        Ok(Self::from_bytes(bytes))
-    }
-
-    /// Creates a `Builder` from four big-endian field values.
-    ///
-    /// # Errors
-    ///
-    /// This function will return an error if `d4`'s length is not 8 bytes.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// let d4 = [12, 3, 9, 56, 54, 43, 8, 9];
-    ///
-    /// let builder = uuid::Builder::from_fields(42, 12, 5, &d4);
-    /// let uuid =
-    ///     builder.map(|mut builder| builder.build().to_hyphenated().to_string());
-    ///
-    /// let expected_uuid =
-    ///     Ok(String::from("0000002a-000c-0005-0c03-0938362b0809"));
-    ///
-    /// assert_eq!(expected_uuid, uuid);
-    /// ```
-    ///
-    /// An invalid length:
-    ///
-    /// ```
-    /// let d4 = [12];
-    ///
-    /// let builder = uuid::Builder::from_fields(42, 12, 5, &d4);
-    ///
-    /// assert!(builder.is_err());
-    /// ```
-    pub fn from_fields(
-        d1: u32,
-        d2: u16,
-        d3: u16,
-        d4: &[u8],
-    ) -> Result<Self, crate::Error> {
-        Uuid::from_fields(d1, d2, d3, d4).map(|uuid| {
-            let bytes = *uuid.as_bytes();
-
-            Builder::from_bytes(bytes)
-        })
-    }
-
-    /// Creates a `Builder` from a big-endian 128bit value.
-    pub fn from_u128(v: u128) -> Self {
-        Builder::from_bytes(*Uuid::from_u128(v).as_bytes())
-    }
-
-    /// Creates a `Builder` with an initial [`Uuid::nil`].
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// use uuid::Builder;
-    ///
-    /// let mut builder = Builder::nil();
-    ///
-    /// assert_eq!(
-    ///     builder.build().to_hyphenated().to_string(),
-    ///     "00000000-0000-0000-0000-000000000000"
-    /// );
-    /// ```
-    pub const fn nil() -> Self {
-        Builder([0; 16])
-    }
-
-    /// Specifies the variant of the UUID.
-    pub fn set_variant(&mut self, v: crate::Variant) -> &mut Self {
-        let byte = self.0[8];
-
-        self.0[8] = match v {
-            crate::Variant::NCS => byte & 0x7f,
-            crate::Variant::RFC4122 => (byte & 0x3f) | 0x80,
-            crate::Variant::Microsoft => (byte & 0x1f) | 0xc0,
-            crate::Variant::Future => (byte & 0x1f) | 0xe0,
-        };
-
-        self
-    }
-
-    /// Specifies the version number of the UUID.
-    pub fn set_version(&mut self, v: crate::Version) -> &mut Self {
-        self.0[6] = (self.0[6] & 0x0f) | ((v as u8) << 4);
-
-        self
-    }
-
-    /// Hands over the internal constructed [`Uuid`].
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// use uuid::Builder;
-    ///
-    /// let uuid = Builder::nil().build();
-    ///
-    /// assert_eq!(
-    ///     uuid.to_hyphenated().to_string(),
-    ///     "00000000-0000-0000-0000-000000000000"
-    /// );
-    /// ```
-    ///
-    /// [`Uuid`]: struct.Uuid.html
-    pub fn build(&mut self) -> Uuid {
-        let uuid = Uuid::from_bytes(self.0);
-
-        uuid
-    }
-}
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! A Builder type for [`Uuid`]s.
+//!
+//! [`Uuid`]: ../struct.Uuid.html
+
+mod error;
+pub(crate) use self::error::Error;
+
+use crate::prelude::*;
+
+impl Uuid {
+    /// The 'nil UUID'.
+    ///
+    /// The nil UUID is special form of UUID that is specified to have all
+    /// 128 bits set to zero, as defined in [IETF RFC 4122 Section 4.1.7][RFC].
+    ///
+    /// [RFC]: https://tools.ietf.org/html/rfc4122.html#section-4.1.7
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// let uuid = Uuid::nil();
+    ///
+    /// assert_eq!(
+    ///     uuid.to_hyphenated().to_string(),
+    ///     "00000000-0000-0000-0000-000000000000"
+    /// );
+    /// ```
+    pub const fn nil() -> Self {
+        Uuid::from_bytes([0; 16])
+    }
+
+    /// Creates a UUID from four field values in big-endian order.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an error if `d4`'s length is not 8 bytes.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// let d4 = [12, 3, 9, 56, 54, 43, 8, 9];
+    ///
+    /// let uuid = Uuid::from_fields(42, 12, 5, &d4);
+    /// let uuid = uuid.map(|uuid| uuid.to_hyphenated().to_string());
+    ///
+    /// let expected_uuid =
+    ///     Ok(String::from("0000002a-000c-0005-0c03-0938362b0809"));
+    ///
+    /// assert_eq!(expected_uuid, uuid);
+    /// ```
+    pub fn from_fields(
+        d1: u32,
+        d2: u16,
+        d3: u16,
+        d4: &[u8],
+    ) -> Result<Uuid, crate::Error> {
+        const D4_LEN: usize = 8;
+
+        let len = d4.len();
+
+        if len != D4_LEN {
+            Err(Error::new(D4_LEN, len))?;
+        }
+
+        Ok(Uuid::from_bytes([
+            (d1 >> 24) as u8,
+            (d1 >> 16) as u8,
+            (d1 >> 8) as u8,
+            d1 as u8,
+            (d2 >> 8) as u8,
+            d2 as u8,
+            (d3 >> 8) as u8,
+            d3 as u8,
+            d4[0],
+            d4[1],
+            d4[2],
+            d4[3],
+            d4[4],
+            d4[5],
+            d4[6],
+            d4[7],
+        ]))
+    }
+
+    /// Creates a UUID from four field values in little-endian order.
+    ///
+    /// The bytes in the `d1`, `d2` and `d3` fields will
+    /// be converted into big-endian order.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// let d1 = 0xAB3F1097u32;
+    /// let d2 = 0x501Eu16;
+    /// let d3 = 0xB736u16;
+    /// let d4 = [12, 3, 9, 56, 54, 43, 8, 9];
+    ///
+    /// let uuid = Uuid::from_fields_le(d1, d2, d3, &d4);
+    /// let uuid = uuid.map(|uuid| uuid.to_hyphenated().to_string());
+    ///
+    /// let expected_uuid =
+    ///     Ok(String::from("97103fab-1e50-36b7-0c03-0938362b0809"));
+    ///
+    /// assert_eq!(expected_uuid, uuid);
+    /// ```
+    pub fn from_fields_le(
+        d1: u32,
+        d2: u16,
+        d3: u16,
+        d4: &[u8],
+    ) -> Result<Uuid, crate::Error> {
+        const D4_LEN: usize = 8;
+
+        let len = d4.len();
+
+        if len != D4_LEN {
+            Err(Error::new(D4_LEN, len))?;
+        }
+
+        Ok(Uuid::from_bytes([
+            d1 as u8,
+            (d1 >> 8) as u8,
+            (d1 >> 16) as u8,
+            (d1 >> 24) as u8,
+            (d2) as u8,
+            (d2 >> 8) as u8,
+            d3 as u8,
+            (d3 >> 8) as u8,
+            d4[0],
+            d4[1],
+            d4[2],
+            d4[3],
+            d4[4],
+            d4[5],
+            d4[6],
+            d4[7],
+        ]))
+    }
+
+    /// Creates a UUID from a 128bit value in big-endian order.
+    pub const fn from_u128(v: u128) -> Self {
+        Uuid::from_bytes([
+            (v >> 120) as u8,
+            (v >> 112) as u8,
+            (v >> 104) as u8,
+            (v >> 96) as u8,
+            (v >> 88) as u8,
+            (v >> 80) as u8,
+            (v >> 72) as u8,
+            (v >> 64) as u8,
+            (v >> 56) as u8,
+            (v >> 48) as u8,
+            (v >> 40) as u8,
+            (v >> 32) as u8,
+            (v >> 24) as u8,
+            (v >> 16) as u8,
+            (v >> 8) as u8,
+            v as u8,
+        ])
+    }
+
+    /// Creates a UUID from a 128bit value in little-endian order.
+    pub const fn from_u128_le(v: u128) -> Self {
+        Uuid::from_bytes([
+            v as u8,
+            (v >> 8) as u8,
+            (v >> 16) as u8,
+            (v >> 24) as u8,
+            (v >> 32) as u8,
+            (v >> 40) as u8,
+            (v >> 48) as u8,
+            (v >> 56) as u8,
+            (v >> 64) as u8,
+            (v >> 72) as u8,
+            (v >> 80) as u8,
+            (v >> 88) as u8,
+            (v >> 96) as u8,
+            (v >> 104) as u8,
+            (v >> 112) as u8,
+            (v >> 120) as u8,
+        ])
+    }
+
+    /// Creates a UUID using the supplied big-endian bytes.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an error if `b` has any length other than 16.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// let bytes = [4, 54, 67, 12, 43, 2, 98, 76, 32, 50, 87, 5, 1, 33, 43, 87];
+    ///
+    /// let uuid = Uuid::from_slice(&bytes);
+    /// let uuid = uuid.map(|uuid| uuid.to_hyphenated().to_string());
+    ///
+    /// let expected_uuid =
+    ///     Ok(String::from("0436430c-2b02-624c-2032-570501212b57"));
+    ///
+    /// assert_eq!(expected_uuid, uuid);
+    /// ```
+    ///
+    /// An incorrect number of bytes:
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// let bytes = [4, 54, 67, 12, 43, 2, 98, 76];
+    ///
+    /// let uuid = Uuid::from_slice(&bytes);
+    ///
+    /// assert!(uuid.is_err());
+    /// ```
+    pub fn from_slice(b: &[u8]) -> Result<Uuid, crate::Error> {
+        const BYTES_LEN: usize = 16;
+
+        let len = b.len();
+
+        if len != BYTES_LEN {
+            Err(Error::new(BYTES_LEN, len))?;
+        }
+
+        let mut bytes: Bytes = [0; 16];
+        bytes.copy_from_slice(b);
+        Ok(Uuid::from_bytes(bytes))
+    }
+
+    /// Creates a UUID using the supplied big-endian bytes.
+    pub const fn from_bytes(bytes: Bytes) -> Uuid {
+        Uuid(bytes)
+    }
+}
+
+/// A builder struct for creating a UUID.
+///
+/// # Examples
+///
+/// Creating a v4 UUID from externally generated bytes:
+///
+/// ```
+/// use uuid::{Builder, Variant, Version};
+///
+/// # let rng = || [
+/// #     70, 235, 208, 238, 14, 109, 67, 201, 185, 13, 204, 195, 90,
+/// # 145, 63, 62,
+/// # ];
+/// let random_bytes = rng();
+/// let uuid = Builder::from_bytes(random_bytes)
+///     .set_variant(Variant::RFC4122)
+///     .set_version(Version::Random)
+///     .build();
+/// ```
+// TODO: remove in 1.0.0
+#[allow(dead_code)]
+#[deprecated]
+pub type Builder = crate::Builder;
+
+impl crate::Builder {
+    /// Creates a `Builder` using the supplied big-endian bytes.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// let bytes: uuid::Bytes = [
+    ///     70, 235, 208, 238, 14, 109, 67, 201, 185, 13, 204, 195, 90, 145, 63, 62,
+    /// ];
+    ///
+    /// let mut builder = uuid::Builder::from_bytes(bytes);
+    /// let uuid = builder.build().to_hyphenated().to_string();
+    ///
+    /// let expected_uuid = String::from("46ebd0ee-0e6d-43c9-b90d-ccc35a913f3e");
+    ///
+    /// assert_eq!(expected_uuid, uuid);
+    /// ```
+    ///
+    /// An incorrect number of bytes:
+    ///
+    /// ```compile_fail
+    /// let bytes: uuid::Bytes = [4, 54, 67, 12, 43, 2, 98, 76]; // doesn't compile
+    ///
+    /// let uuid = uuid::Builder::from_bytes(bytes);
+    /// ```
+    pub const fn from_bytes(b: Bytes) -> Self {
+        Builder(b)
+    }
+
+    /// Creates a `Builder` using the supplied big-endian bytes.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an error if `b` has any length other than 16.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// let bytes = [4, 54, 67, 12, 43, 2, 98, 76, 32, 50, 87, 5, 1, 33, 43, 87];
+    ///
+    /// let builder = uuid::Builder::from_slice(&bytes);
+    /// let uuid =
+    ///     builder.map(|mut builder| builder.build().to_hyphenated().to_string());
+    ///
+    /// let expected_uuid =
+    ///     Ok(String::from("0436430c-2b02-624c-2032-570501212b57"));
+    ///
+    /// assert_eq!(expected_uuid, uuid);
+    /// ```
+    ///
+    /// An incorrect number of bytes:
+    ///
+    /// ```
+    /// let bytes = [4, 54, 67, 12, 43, 2, 98, 76];
+    ///
+    /// let builder = uuid::Builder::from_slice(&bytes);
+    ///
+    /// assert!(builder.is_err());
+    /// ```
+    pub fn from_slice(b: &[u8]) -> Result<Self, crate::Error> {
+        const BYTES_LEN: usize = 16;
+
+        let len = b.len();
+
+        if len != BYTES_LEN {
+            Err(Error::new(BYTES_LEN, len))?;
+        }
+
+        let mut bytes: crate::Bytes = [0; 16];
+        bytes.copy_from_slice(b);
+        Ok(Self::from_bytes(bytes))
+    }
+
+    /// Creates a `Builder` from four big-endian field values.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an error if `d4`'s length is not 8 bytes.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// let d4 = [12, 3, 9, 56, 54, 43, 8, 9];
+    ///
+    /// let builder = uuid::Builder::from_fields(42, 12, 5, &d4);
+    /// let uuid =
+    ///     builder.map(|mut builder| builder.build().to_hyphenated().to_string());
+    ///
+    /// let expected_uuid =
+    ///     Ok(String::from("0000002a-000c-0005-0c03-0938362b0809"));
+    ///
+    /// assert_eq!(expected_uuid, uuid);
+    /// ```
+    ///
+    /// An invalid length:
+    ///
+    /// ```
+    /// let d4 = [12];
+    ///
+    /// let builder = uuid::Builder::from_fields(42, 12, 5, &d4);
+    ///
+    /// assert!(builder.is_err());
+    /// ```
+    pub fn from_fields(
+        d1: u32,
+        d2: u16,
+        d3: u16,
+        d4: &[u8],
+    ) -> Result<Self, crate::Error> {
+        Uuid::from_fields(d1, d2, d3, d4).map(|uuid| {
+            let bytes = *uuid.as_bytes();
+
+            crate::Builder::from_bytes(bytes)
+        })
+    }
+
+    /// Creates a `Builder` from a big-endian 128bit value.
+    pub fn from_u128(v: u128) -> Self {
+        crate::Builder::from_bytes(*Uuid::from_u128(v).as_bytes())
+    }
+
+    /// Creates a `Builder` with an initial [`Uuid::nil`].
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use uuid::Builder;
+    ///
+    /// let mut builder = Builder::nil();
+    ///
+    /// assert_eq!(
+    ///     builder.build().to_hyphenated().to_string(),
+    ///     "00000000-0000-0000-0000-000000000000"
+    /// );
+    /// ```
+    pub const fn nil() -> Self {
+        Builder([0; 16])
+    }
+
+    /// Specifies the variant of the UUID.
+    pub fn set_variant(&mut self, v: crate::Variant) -> &mut Self {
+        let byte = self.0[8];
+
+        self.0[8] = match v {
+            crate::Variant::NCS => byte & 0x7f,
+            crate::Variant::RFC4122 => (byte & 0x3f) | 0x80,
+            crate::Variant::Microsoft => (byte & 0x1f) | 0xc0,
+            crate::Variant::Future => (byte & 0x1f) | 0xe0,
+        };
+
+        self
+    }
+
+    /// Specifies the version number of the UUID.
+    pub fn set_version(&mut self, v: crate::Version) -> &mut Self {
+        self.0[6] = (self.0[6] & 0x0f) | ((v as u8) << 4);
+
+        self
+    }
+
+    /// Hands over the internal constructed [`Uuid`].
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use uuid::Builder;
+    ///
+    /// let uuid = Builder::nil().build();
+    ///
+    /// assert_eq!(
+    ///     uuid.to_hyphenated().to_string(),
+    ///     "00000000-0000-0000-0000-000000000000"
+    /// );
+    /// ```
+    ///
+    /// [`Uuid`]: struct.Uuid.html
+    pub fn build(&mut self) -> Uuid {
+        Uuid::from_bytes(self.0)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,79 +1,79 @@
-use crate::std::fmt;
-use crate::{builder, parser};
-
-/// A general error that can occur when working with UUIDs.
-// TODO: improve the doc
-// BODY: This detail should be fine for initial merge
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub struct Error(Inner);
-
-// TODO: write tests for Error
-// BODY: not immediately blocking, but should be covered for 1.0
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-enum Inner {
-    /// An error occurred while handling [`Uuid`] bytes.
-    ///
-    /// See [`BytesError`]
-    ///
-    /// [`BytesError`]: struct.BytesError.html
-    /// [`Uuid`]: struct.Uuid.html
-    Build(builder::Error),
-
-    /// An error occurred while parsing a [`Uuid`] string.
-    ///
-    /// See [`parser::ParseError`]
-    ///
-    /// [`parser::ParseError`]: parser/enum.ParseError.html
-    /// [`Uuid`]: struct.Uuid.html
-    Parser(parser::Error),
-}
-
-impl From<builder::Error> for Error {
-    fn from(err: builder::Error) -> Self {
-        Error(Inner::Build(err))
-    }
-}
-
-impl From<parser::Error> for Error {
-    fn from(err: parser::Error) -> Self {
-        Error(Inner::Parser(err))
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self.0 {
-            Inner::Build(ref err) => fmt::Display::fmt(&err, f),
-            Inner::Parser(ref err) => fmt::Display::fmt(&err, f),
-        }
-    }
-}
-
-#[cfg(feature = "std")]
-mod std_support {
-    use super::*;
-    use crate::std::error;
-
-    impl error::Error for Error {
-        fn source(&self) -> Option<&(dyn error::Error + 'static)> {
-            match self.0 {
-                Inner::Build(ref err) => Some(err),
-                Inner::Parser(ref err) => Some(err),
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test_util {
-    use super::*;
-
-    impl Error {
-        pub(crate) fn expect_parser(self) -> parser::Error {
-            match self.0 {
-                Inner::Parser(err) => err,
-                _ => panic!("expected a `parser::Error` variant"),
-            }
-        }
-    }
-}
+use crate::std::fmt;
+use crate::{builder, parser};
+
+/// A general error that can occur when working with UUIDs.
+// TODO: improve the doc
+// BODY: This detail should be fine for initial merge
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub struct Error(Inner);
+
+// TODO: write tests for Error
+// BODY: not immediately blocking, but should be covered for 1.0
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+enum Inner {
+    /// An error occurred while handling [`Uuid`] bytes.
+    ///
+    /// See [`BytesError`]
+    ///
+    /// [`BytesError`]: struct.BytesError.html
+    /// [`Uuid`]: struct.Uuid.html
+    Build(builder::Error),
+
+    /// An error occurred while parsing a [`Uuid`] string.
+    ///
+    /// See [`parser::ParseError`]
+    ///
+    /// [`parser::ParseError`]: parser/enum.ParseError.html
+    /// [`Uuid`]: struct.Uuid.html
+    Parser(parser::Error),
+}
+
+impl From<builder::Error> for Error {
+    fn from(err: builder::Error) -> Self {
+        Error(Inner::Build(err))
+    }
+}
+
+impl From<parser::Error> for Error {
+    fn from(err: parser::Error) -> Self {
+        Error(Inner::Parser(err))
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.0 {
+            Inner::Build(ref err) => fmt::Display::fmt(&err, f),
+            Inner::Parser(ref err) => fmt::Display::fmt(&err, f),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+mod std_support {
+    use super::*;
+    use crate::std::error;
+
+    impl error::Error for Error {
+        fn source(&self) -> Option<&(dyn error::Error + 'static)> {
+            match self.0 {
+                Inner::Build(ref err) => Some(err),
+                Inner::Parser(ref err) => Some(err),
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod test_util {
+    use super::*;
+
+    impl Error {
+        pub(crate) fn expect_parser(self) -> parser::Error {
+            match self.0 {
+                Inner::Parser(err) => err,
+                _ => panic!("expected a `parser::Error` variant"),
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,1030 +1,1070 @@
-// Copyright 2013-2014 The Rust Project Developers.
-// Copyright 2018 The Uuid Project Developers.
-//
-// See the COPYRIGHT file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Generate and parse UUIDs.
-//!
-//! Provides support for Universally Unique Identifiers (UUIDs). A UUID is a
-//! unique 128-bit number, stored as 16 octets. UUIDs are used to  assign
-//! unique identifiers to entities without requiring a central allocating
-//! authority.
-//!
-//! They are particularly useful in distributed systems, though can be used in
-//! disparate areas, such as databases and network protocols.  Typically a UUID
-//! is displayed in a readable string form as a sequence of hexadecimal digits,
-//! separated into groups by hyphens.
-//!
-//! The uniqueness property is not strictly guaranteed, however for all
-//! practical purposes, it can be assumed that an unintentional collision would
-//! be extremely unlikely.
-//!
-//! # Dependencies
-//!
-//! By default, this crate depends on nothing but `std` and cannot generate
-//! UUIDs. You need to enable the following Cargo features to enable
-//! various pieces of functionality:
-//!
-//! * `v1` - adds the [`Uuid::new_v1`] function and the ability to create a V1
-//!   using an implementation of [`v1::ClockSequence`] (usually
-//! [`v1::Context`]) and a timestamp from `time::timespec`.
-//! * `v3` - adds the [`Uuid::new_v3`] function and the ability to create a V3
-//!   UUID based on the MD5 hash of some data.
-//! * `v4` - adds the [`Uuid::new_v4`] function and the ability to randomly
-//!   generate a UUID.
-//! * `v5` - adds the [`Uuid::new_v5`] function and the ability to create a V5
-//!   UUID based on the SHA1 hash of some data.
-//! * `serde` - adds the ability to serialize and deserialize a UUID using the
-//!   `serde` crate.
-//!
-//! You need to enable one of the following Cargo features together with
-//! `v3`, `v4` or `v5` feature if you're targeting `wasm32` architecture:
-//!
-//! * `stdweb` - enables support for `OsRng` on `wasm32-unknown-unknown` via
-//!   [`stdweb`] combined with [`cargo-web`]
-//! * `wasm-bindgen` - enables support for `OsRng` on `wasm32-unknown-unknown`
-//!   via [`wasm-bindgen`]
-//!
-//! By default, `uuid` can be depended on with:
-//!
-//! ```toml
-//! [dependencies]
-//! uuid = "0.8"
-//! ```
-//!
-//! To activate various features, use syntax like:
-//!
-//! ```toml
-//! [dependencies]
-//! uuid = { version = "0.8", features = ["serde", "v4"] }
-//! ```
-//!
-//! You can disable default features with:
-//!
-//! ```toml
-//! [dependencies]
-//! uuid = { version = "0.8", default-features = false }
-//! ```
-//!
-//! # Examples
-//!
-//! To parse a UUID given in the simple format and print it as a urn:
-//!
-//! ```rust
-//! use uuid::Uuid;
-//!
-//! fn main() {
-//!     let my_uuid =
-//!         Uuid::parse_str("936DA01F9ABD4d9d80C702AF85C822A8").unwrap();
-//!     println!("{}", my_uuid.to_urn());
-//! }
-//! ```
-//!
-//! To create a new random (V4) UUID and print it out in hexadecimal form:
-//!
-//! ```ignore,rust
-//! // Note that this requires the `v4` feature enabled in the uuid crate.
-//!
-//! use uuid::Uuid;
-//!
-//! fn main() {
-//!     let my_uuid = Uuid::new_v4();
-//!     println!("{}", my_uuid);
-//! }
-//! ```
-//!
-//! # Strings
-//!
-//! Examples of string representations:
-//!
-//! * simple: `936DA01F9ABD4d9d80C702AF85C822A8`
-//! * hyphenated: `550e8400-e29b-41d4-a716-446655440000`
-//! * urn: `urn:uuid:F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4`
-//!
-//! # References
-//!
-//! * [Wikipedia: Universally Unique
-//!   Identifier](http://en.wikipedia.org/wiki/Universally_unique_identifier)
-//! * [RFC4122: A Universally Unique IDentifier (UUID) URN
-//!   Namespace](http://tools.ietf.org/html/rfc4122)
-//!
-//! [`wasm-bindgen`]: https://crates.io/crates/wasm-bindgen
-//! [`cargo-web`]: https://crates.io/crates/cargo-web
-//! [`stdweb`]: https://crates.io/crates/stdweb
-//! [`Uuid`]: struct.Uuid.html
-//! [`Uuid::new_v1`]: struct.Uuid.html#method.new_v1
-//! [`Uuid::new_v3`]: struct.Uuid.html#method.new_v3
-//! [`Uuid::new_v4`]: struct.Uuid.html#method.new_v4
-//! [`Uuid::new_v5`]: struct.Uuid.html#method.new_v5
-//! [`v1::ClockSequence`]: v1/trait.ClockSequence.html
-//! [`v1::Context`]: v1/struct.Context.html
-
-#![no_std]
-#![deny(missing_debug_implementations, missing_docs)]
-#![doc(
-    html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
-    html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://docs.rs/uuid/0.8.1"
-)]
-
-#[cfg(any(feature = "std", test))]
-#[macro_use]
-extern crate std;
-
-#[cfg(all(not(feature = "std"), not(test)))]
-#[macro_use]
-extern crate core as std;
-
-mod builder;
-mod error;
-mod parser;
-mod prelude;
-
-pub mod adapter;
-#[cfg(feature = "v1")]
-pub mod v1;
-
-#[cfg(feature = "serde")]
-mod serde_support;
-#[cfg(feature = "slog")]
-mod slog_support;
-#[cfg(test)]
-mod test_util;
-#[cfg(all(
-    feature = "v3",
-    any(
-        not(target_arch = "wasm32"),
-        all(
-            target_arch = "wasm32",
-            any(feature = "stdweb", feature = "wasm-bindgen")
-        )
-    )
-))]
-mod v3;
-#[cfg(all(
-    feature = "v4",
-    any(
-        not(target_arch = "wasm32"),
-        all(
-            target_arch = "wasm32",
-            any(feature = "stdweb", feature = "wasm-bindgen")
-        )
-    )
-))]
-mod v4;
-#[cfg(all(
-    feature = "v5",
-    any(
-        not(target_arch = "wasm32"),
-        all(
-            target_arch = "wasm32",
-            any(feature = "stdweb", feature = "wasm-bindgen")
-        )
-    )
-))]
-mod v5;
-#[cfg(all(windows, feature = "winapi"))]
-mod winapi_support;
-
-use crate::std::{fmt, str};
-
-pub use crate::{builder::Builder, error::Error};
-
-/// A 128-bit (16 byte) buffer containing the ID.
-pub type Bytes = [u8; 16];
-
-/// The version of the UUID, denoting the generating algorithm.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Version {
-    /// Special case for `nil` UUID.
-    Nil = 0,
-    /// Version 1: MAC address.
-    Mac,
-    /// Version 2: DCE Security.
-    Dce,
-    /// Version 3: MD5 hash.
-    Md5,
-    /// Version 4: Random.
-    Random,
-    /// Version 5: SHA-1 hash.
-    Sha1,
-}
-
-/// The reserved variants of UUIDs.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Variant {
-    /// Reserved by the NCS for backward compatibility.
-    NCS = 0,
-    /// As described in the RFC4122 Specification (default).
-    RFC4122,
-    /// Reserved by Microsoft for backward compatibility.
-    Microsoft,
-    /// Reserved for future expansion.
-    Future,
-}
-
-/// A Universally Unique Identifier (UUID).
-#[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct Uuid(Bytes);
-
-impl Uuid {
-    /// UUID namespace for Domain Name System (DNS).
-    pub const NAMESPACE_DNS: Self = Uuid([
-        0x6b, 0xa7, 0xb8, 0x10, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0,
-        0x4f, 0xd4, 0x30, 0xc8,
-    ]);
-
-    /// UUID namespace for ISO Object Identifiers (OIDs).
-    pub const NAMESPACE_OID: Self = Uuid([
-        0x6b, 0xa7, 0xb8, 0x12, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0,
-        0x4f, 0xd4, 0x30, 0xc8,
-    ]);
-
-    /// UUID namespace for Uniform Resource Locators (URLs).
-    pub const NAMESPACE_URL: Self = Uuid([
-        0x6b, 0xa7, 0xb8, 0x11, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0,
-        0x4f, 0xd4, 0x30, 0xc8,
-    ]);
-
-    /// UUID namespace for X.500 Distinguished Names (DNs).
-    pub const NAMESPACE_X500: Self = Uuid([
-        0x6b, 0xa7, 0xb8, 0x14, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0,
-        0x4f, 0xd4, 0x30, 0xc8,
-    ]);
-
-    /// Returns the variant of the UUID structure.
-    ///
-    /// This determines the interpretation of the structure of the UUID.
-    /// Currently only the RFC4122 variant is generated by this module.
-    ///
-    /// * [Variant Reference](http://tools.ietf.org/html/rfc4122#section-4.1.1)
-    pub fn get_variant(&self) -> Option<Variant> {
-        match self.as_bytes()[8] {
-            x if x & 0x80 == 0x00 => Some(Variant::NCS),
-            x if x & 0xc0 == 0x80 => Some(Variant::RFC4122),
-            x if x & 0xe0 == 0xc0 => Some(Variant::Microsoft),
-            x if x & 0xe0 == 0xe0 => Some(Variant::Future),
-            _ => None,
-        }
-    }
-
-    /// Returns the version number of the UUID.
-    ///
-    /// This represents the algorithm used to generate the contents.
-    ///
-    /// Currently only the Random (V4) algorithm is supported by this
-    /// module.  There are security and privacy implications for using
-    /// older versions - see [Wikipedia: Universally Unique Identifier](
-    /// http://en.wikipedia.org/wiki/Universally_unique_identifier) for
-    /// details.
-    ///
-    /// * [Version Reference](http://tools.ietf.org/html/rfc4122#section-4.1.3)
-    pub const fn get_version_num(&self) -> usize {
-        (self.as_bytes()[6] >> 4) as usize
-    }
-
-    /// Returns the version of the UUID.
-    ///
-    /// This represents the algorithm used to generate the contents
-    pub fn get_version(&self) -> Option<Version> {
-        let v = self.as_bytes()[6] >> 4;
-        match v {
-            0 if self.is_nil() => Some(Version::Nil),
-            1 => Some(Version::Mac),
-            2 => Some(Version::Dce),
-            3 => Some(Version::Md5),
-            4 => Some(Version::Random),
-            5 => Some(Version::Sha1),
-            _ => None,
-        }
-    }
-
-    /// Returns the four field values of the UUID in big-endian order.
-    ///
-    /// These values can be passed to the `from_fields()` method to get the
-    /// original `Uuid` back.
-    ///
-    /// * The first field value represents the first group of (eight) hex
-    ///   digits, taken as a big-endian `u32` value.  For V1 UUIDs, this field
-    ///   represents the low 32 bits of the timestamp.
-    /// * The second field value represents the second group of (four) hex
-    ///   digits, taken as a big-endian `u16` value.  For V1 UUIDs, this field
-    ///   represents the middle 16 bits of the timestamp.
-    /// * The third field value represents the third group of (four) hex digits,
-    ///   taken as a big-endian `u16` value.  The 4 most significant bits give
-    ///   the UUID version, and for V1 UUIDs, the last 12 bits represent the
-    ///   high 12 bits of the timestamp.
-    /// * The last field value represents the last two groups of four and twelve
-    ///   hex digits, taken in order.  The first 1-3 bits of this indicate the
-    ///   UUID variant, and for V1 UUIDs, the next 13-15 bits indicate the clock
-    ///   sequence and the last 48 bits indicate the node ID.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::nil();
-    /// assert_eq!(uuid.as_fields(), (0, 0, 0, &[0u8; 8]));
-    ///
-    /// let uuid = Uuid::parse_str("936DA01F-9ABD-4D9D-80C7-02AF85C822A8").unwrap();
-    /// assert_eq!(
-    ///     uuid.as_fields(),
-    ///     (
-    ///         0x936DA01F,
-    ///         0x9ABD,
-    ///         0x4D9D,
-    ///         b"\x80\xC7\x02\xAF\x85\xC8\x22\xA8"
-    ///     )
-    /// );
-    /// ```
-    pub fn as_fields(&self) -> (u32, u16, u16, &[u8; 8]) {
-        let d1 = u32::from(self.as_bytes()[0]) << 24
-            | u32::from(self.as_bytes()[1]) << 16
-            | u32::from(self.as_bytes()[2]) << 8
-            | u32::from(self.as_bytes()[3]);
-
-        let d2 =
-            u16::from(self.as_bytes()[4]) << 8 | u16::from(self.as_bytes()[5]);
-
-        let d3 =
-            u16::from(self.as_bytes()[6]) << 8 | u16::from(self.as_bytes()[7]);
-
-        let d4: &[u8; 8] =
-            unsafe { &*(self.as_bytes()[8..16].as_ptr() as *const [u8; 8]) };
-        (d1, d2, d3, d4)
-    }
-
-    /// Returns the four field values of the UUID in little-endian order.
-    ///
-    /// The bytes in the returned integer fields will
-    /// be converted from big-endian order.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01F-9ABD-4D9D-80C7-02AF85C822A8").unwrap();
-    /// assert_eq!(
-    ///     uuid.to_fields_le(),
-    ///     (
-    ///         0x1FA06D93,
-    ///         0xBD9A,
-    ///         0x9D4D,
-    ///         b"\x80\xC7\x02\xAF\x85\xC8\x22\xA8"
-    ///     )
-    /// );
-    /// ```
-    pub fn to_fields_le(&self) -> (u32, u16, u16, &[u8; 8]) {
-        let d1 = u32::from(self.as_bytes()[0])
-            | u32::from(self.as_bytes()[1]) << 8
-            | u32::from(self.as_bytes()[2]) << 16
-            | u32::from(self.as_bytes()[3]) << 24;
-
-        let d2 =
-            u16::from(self.as_bytes()[4]) | u16::from(self.as_bytes()[5]) << 8;
-
-        let d3 =
-            u16::from(self.as_bytes()[6]) | u16::from(self.as_bytes()[7]) << 8;
-
-        let d4: &[u8; 8] =
-            unsafe { &*(self.as_bytes()[8..16].as_ptr() as *const [u8; 8]) };
-        (d1, d2, d3, d4)
-    }
-
-    /// Returns a 128bit value containing the UUID data.
-    ///
-    /// The bytes in the UUID will be packed into a `u128`, like the
-    /// [`Uuid::as_bytes`] method.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01F-9ABD-4D9D-80C7-02AF85C822A8").unwrap();
-    /// assert_eq!(
-    ///     uuid.as_u128(),
-    ///     0x936DA01F9ABD4D9D80C702AF85C822A8,
-    /// )
-    /// ```
-    pub fn as_u128(&self) -> u128 {
-        u128::from(self.as_bytes()[0]) << 120
-            | u128::from(self.as_bytes()[1]) << 112
-            | u128::from(self.as_bytes()[2]) << 104
-            | u128::from(self.as_bytes()[3]) << 96
-            | u128::from(self.as_bytes()[4]) << 88
-            | u128::from(self.as_bytes()[5]) << 80
-            | u128::from(self.as_bytes()[6]) << 72
-            | u128::from(self.as_bytes()[7]) << 64
-            | u128::from(self.as_bytes()[8]) << 56
-            | u128::from(self.as_bytes()[9]) << 48
-            | u128::from(self.as_bytes()[10]) << 40
-            | u128::from(self.as_bytes()[11]) << 32
-            | u128::from(self.as_bytes()[12]) << 24
-            | u128::from(self.as_bytes()[13]) << 16
-            | u128::from(self.as_bytes()[14]) << 8
-            | u128::from(self.as_bytes()[15])
-    }
-
-    /// Returns a 128bit little-endian value containing the UUID data.
-    ///
-    /// The bytes in the UUID will be reversed and packed into a `u128`.
-    /// Note that this will produce a different result than
-    /// [`Uuid::to_fields_le`], because the entire UUID is reversed, rather
-    /// than reversing the individual fields in-place.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::parse_str("936DA01F-9ABD-4D9D-80C7-02AF85C822A8").unwrap();
-    ///
-    /// assert_eq!(
-    ///     uuid.to_u128_le(),
-    ///     0xA822C885AF02C7809D4DBD9A1FA06D93,
-    /// )
-    /// ```
-    pub fn to_u128_le(&self) -> u128 {
-        u128::from(self.as_bytes()[0])
-            | u128::from(self.as_bytes()[1]) << 8
-            | u128::from(self.as_bytes()[2]) << 16
-            | u128::from(self.as_bytes()[3]) << 24
-            | u128::from(self.as_bytes()[4]) << 32
-            | u128::from(self.as_bytes()[5]) << 40
-            | u128::from(self.as_bytes()[6]) << 48
-            | u128::from(self.as_bytes()[7]) << 56
-            | u128::from(self.as_bytes()[8]) << 64
-            | u128::from(self.as_bytes()[9]) << 72
-            | u128::from(self.as_bytes()[10]) << 80
-            | u128::from(self.as_bytes()[11]) << 88
-            | u128::from(self.as_bytes()[12]) << 96
-            | u128::from(self.as_bytes()[13]) << 104
-            | u128::from(self.as_bytes()[14]) << 112
-            | u128::from(self.as_bytes()[15]) << 120
-    }
-
-    /// Returns an array of 16 octets containing the UUID data.
-    pub const fn as_bytes(&self) -> &Bytes {
-        &self.0
-    }
-
-    /// Tests if the UUID is nil.
-    pub fn is_nil(&self) -> bool {
-        self.as_bytes().iter().all(|&b| b == 0)
-    }
-
-    /// A buffer that can be used for `encode_...` calls, that is
-    /// guaranteed to be long enough for any of the adapters.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::nil();
-    ///
-    /// assert_eq!(
-    ///     uuid.to_simple().encode_lower(&mut Uuid::encode_buffer()),
-    ///     "00000000000000000000000000000000"
-    /// );
-    ///
-    /// assert_eq!(
-    ///     uuid.to_hyphenated()
-    ///         .encode_lower(&mut Uuid::encode_buffer()),
-    ///     "00000000-0000-0000-0000-000000000000"
-    /// );
-    ///
-    /// assert_eq!(
-    ///     uuid.to_urn().encode_lower(&mut Uuid::encode_buffer()),
-    ///     "urn:uuid:00000000-0000-0000-0000-000000000000"
-    /// );
-    /// ```
-    pub const fn encode_buffer() -> [u8; adapter::Urn::LENGTH] {
-        [0; adapter::Urn::LENGTH]
-    }
-}
-
-impl fmt::Debug for Uuid {
-    #[inline]
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::LowerHex::fmt(self, f)
-    }
-}
-
-impl fmt::Display for Uuid {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::LowerHex::fmt(self, f)
-    }
-}
-
-impl fmt::Display for Variant {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match *self {
-            Variant::NCS => write!(f, "NCS"),
-            Variant::RFC4122 => write!(f, "RFC4122"),
-            Variant::Microsoft => write!(f, "Microsoft"),
-            Variant::Future => write!(f, "Future"),
-        }
-    }
-}
-
-impl fmt::LowerHex for Uuid {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::LowerHex::fmt(&self.to_hyphenated_ref(), f)
-    }
-}
-
-impl fmt::UpperHex for Uuid {
-    #[inline]
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::UpperHex::fmt(&self.to_hyphenated_ref(), f)
-    }
-}
-
-impl str::FromStr for Uuid {
-    type Err = Error;
-
-    fn from_str(uuid_str: &str) -> Result<Self, Self::Err> {
-        Uuid::parse_str(uuid_str)
-    }
-}
-
-impl Default for Uuid {
-    #[inline]
-    fn default() -> Self {
-        Uuid::nil()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{
-        prelude::*,
-        std::string::{String, ToString},
-        test_util,
-    };
-
-    macro_rules! check {
-        ($buf:ident, $format:expr, $target:expr, $len:expr, $cond:expr) => {
-            $buf.clear();
-            write!($buf, $format, $target).unwrap();
-            assert!($buf.len() == $len);
-            assert!($buf.chars().all($cond), "{}", $buf);
-        };
-    }
-
-    #[test]
-    fn test_uuid_compare() {
-        let uuid1 = test_util::new();
-        let uuid2 = test_util::new2();
-
-        assert_eq!(uuid1, uuid1);
-        assert_eq!(uuid2, uuid2);
-
-        assert_ne!(uuid1, uuid2);
-        assert_ne!(uuid2, uuid1);
-    }
-
-    #[test]
-    fn test_uuid_default() {
-        let default_uuid = Uuid::default();
-        let nil_uuid = Uuid::nil();
-
-        assert_eq!(default_uuid, nil_uuid);
-    }
-
-    #[test]
-    fn test_uuid_display() {
-        use super::fmt::Write;
-
-        let uuid = test_util::new();
-        let s = uuid.to_string();
-        let mut buffer = String::new();
-
-        assert_eq!(s, uuid.to_hyphenated().to_string());
-
-        check!(buffer, "{}", uuid, 36, |c| c.is_lowercase()
-            || c.is_digit(10)
-            || c == '-');
-    }
-
-    #[test]
-    fn test_uuid_lowerhex() {
-        use super::fmt::Write;
-
-        let mut buffer = String::new();
-        let uuid = test_util::new();
-
-        check!(buffer, "{:x}", uuid, 36, |c| c.is_lowercase()
-            || c.is_digit(10)
-            || c == '-');
-    }
-
-    // noinspection RsAssertEqual
-    #[test]
-    fn test_uuid_operator_eq() {
-        let uuid1 = test_util::new();
-        let uuid1_dup = uuid1.clone();
-        let uuid2 = test_util::new2();
-
-        assert!(uuid1 == uuid1);
-        assert!(uuid1 == uuid1_dup);
-        assert!(uuid1_dup == uuid1);
-
-        assert!(uuid1 != uuid2);
-        assert!(uuid2 != uuid1);
-        assert!(uuid1_dup != uuid2);
-        assert!(uuid2 != uuid1_dup);
-    }
-
-    #[test]
-    fn test_uuid_to_string() {
-        use super::fmt::Write;
-
-        let uuid = test_util::new();
-        let s = uuid.to_string();
-        let mut buffer = String::new();
-
-        assert_eq!(s.len(), 36);
-
-        check!(buffer, "{}", s, 36, |c| c.is_lowercase()
-            || c.is_digit(10)
-            || c == '-');
-    }
-
-    #[test]
-    fn test_uuid_upperhex() {
-        use super::fmt::Write;
-
-        let mut buffer = String::new();
-        let uuid = test_util::new();
-
-        check!(buffer, "{:X}", uuid, 36, |c| c.is_uppercase()
-            || c.is_digit(10)
-            || c == '-');
-    }
-
-    #[test]
-    fn test_nil() {
-        let nil = Uuid::nil();
-        let not_nil = test_util::new();
-        let from_bytes = Uuid::from_bytes([
-            4, 54, 67, 12, 43, 2, 2, 76, 32, 50, 87, 5, 1, 33, 43, 87,
-        ]);
-
-        assert_eq!(from_bytes.get_version(), None);
-
-        assert!(nil.is_nil());
-        assert!(!not_nil.is_nil());
-
-        assert_eq!(nil.get_version(), Some(Version::Nil));
-        assert_eq!(not_nil.get_version(), Some(Version::Random))
-    }
-
-    #[test]
-    fn test_predefined_namespaces() {
-        assert_eq!(
-            Uuid::NAMESPACE_DNS.to_hyphenated().to_string(),
-            "6ba7b810-9dad-11d1-80b4-00c04fd430c8"
-        );
-        assert_eq!(
-            Uuid::NAMESPACE_URL.to_hyphenated().to_string(),
-            "6ba7b811-9dad-11d1-80b4-00c04fd430c8"
-        );
-        assert_eq!(
-            Uuid::NAMESPACE_OID.to_hyphenated().to_string(),
-            "6ba7b812-9dad-11d1-80b4-00c04fd430c8"
-        );
-        assert_eq!(
-            Uuid::NAMESPACE_X500.to_hyphenated().to_string(),
-            "6ba7b814-9dad-11d1-80b4-00c04fd430c8"
-        );
-    }
-
-    #[cfg(feature = "v3")]
-    #[test]
-    fn test_get_version_v3() {
-        let uuid =
-            Uuid::new_v3(&Uuid::NAMESPACE_DNS, "rust-lang.org".as_bytes());
-
-        assert_eq!(uuid.get_version().unwrap(), Version::Md5);
-        assert_eq!(uuid.get_version_num(), 3);
-    }
-
-    #[test]
-    fn test_get_variant() {
-        let uuid1 = test_util::new();
-        let uuid2 =
-            Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap();
-        let uuid3 =
-            Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8").unwrap();
-        let uuid4 =
-            Uuid::parse_str("936DA01F9ABD4d9dC0C702AF85C822A8").unwrap();
-        let uuid5 =
-            Uuid::parse_str("F9168C5E-CEB2-4faa-D6BF-329BF39FA1E4").unwrap();
-        let uuid6 =
-            Uuid::parse_str("f81d4fae-7dec-11d0-7765-00a0c91e6bf6").unwrap();
-
-        assert_eq!(uuid1.get_variant().unwrap(), Variant::RFC4122);
-        assert_eq!(uuid2.get_variant().unwrap(), Variant::RFC4122);
-        assert_eq!(uuid3.get_variant().unwrap(), Variant::RFC4122);
-        assert_eq!(uuid4.get_variant().unwrap(), Variant::Microsoft);
-        assert_eq!(uuid5.get_variant().unwrap(), Variant::Microsoft);
-        assert_eq!(uuid6.get_variant().unwrap(), Variant::NCS);
-    }
-
-    #[test]
-    fn test_to_simple_string() {
-        let uuid1 = test_util::new();
-        let s = uuid1.to_simple().to_string();
-
-        assert_eq!(s.len(), 32);
-        assert!(s.chars().all(|c| c.is_digit(16)));
-    }
-
-    #[test]
-    fn test_to_hyphenated_string() {
-        let uuid1 = test_util::new();
-        let s = uuid1.to_hyphenated().to_string();
-
-        assert!(s.len() == 36);
-        assert!(s.chars().all(|c| c.is_digit(16) || c == '-'));
-    }
-
-    #[test]
-    fn test_upper_lower_hex() {
-        use std::fmt::Write;
-
-        let mut buf = String::new();
-        let u = test_util::new();
-
-        macro_rules! check {
-            ($buf:ident, $format:expr, $target:expr, $len:expr, $cond:expr) => {
-                $buf.clear();
-                write!($buf, $format, $target).unwrap();
-                assert!(buf.len() == $len);
-                assert!($buf.chars().all($cond), "{}", $buf);
-            };
-        }
-
-        check!(buf, "{:X}", u, 36, |c| c.is_uppercase()
-            || c.is_digit(10)
-            || c == '-');
-        check!(buf, "{:X}", u.to_hyphenated(), 36, |c| c.is_uppercase()
-            || c.is_digit(10)
-            || c == '-');
-        check!(buf, "{:X}", u.to_simple(), 32, |c| c.is_uppercase()
-            || c.is_digit(10));
-
-        check!(buf, "{:x}", u.to_hyphenated(), 36, |c| c.is_lowercase()
-            || c.is_digit(10)
-            || c == '-');
-        check!(buf, "{:x}", u.to_simple(), 32, |c| c.is_lowercase()
-            || c.is_digit(10));
-    }
-
-    #[test]
-    fn test_to_urn_string() {
-        let uuid1 = test_util::new();
-        let ss = uuid1.to_urn().to_string();
-        let s = &ss[9..];
-
-        assert!(ss.starts_with("urn:uuid:"));
-        assert_eq!(s.len(), 36);
-        assert!(s.chars().all(|c| c.is_digit(16) || c == '-'));
-    }
-
-    #[test]
-    fn test_to_simple_string_matching() {
-        let uuid1 = test_util::new();
-
-        let hs = uuid1.to_hyphenated().to_string();
-        let ss = uuid1.to_simple().to_string();
-
-        let hsn = hs.chars().filter(|&c| c != '-').collect::<String>();
-
-        assert_eq!(hsn, ss);
-    }
-
-    #[test]
-    fn test_string_roundtrip() {
-        let uuid = test_util::new();
-
-        let hs = uuid.to_hyphenated().to_string();
-        let uuid_hs = Uuid::parse_str(&hs).unwrap();
-        assert_eq!(uuid_hs, uuid);
-
-        let ss = uuid.to_string();
-        let uuid_ss = Uuid::parse_str(&ss).unwrap();
-        assert_eq!(uuid_ss, uuid);
-    }
-
-    #[test]
-    fn test_from_fields() {
-        let d1: u32 = 0xa1a2a3a4;
-        let d2: u16 = 0xb1b2;
-        let d3: u16 = 0xc1c2;
-        let d4 = [0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
-
-        let u = Uuid::from_fields(d1, d2, d3, &d4).unwrap();
-
-        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
-        let result = u.to_simple().to_string();
-        assert_eq!(result, expected);
-    }
-
-    #[test]
-    fn test_from_fields_le() {
-        let d1: u32 = 0xa4a3a2a1;
-        let d2: u16 = 0xb2b1;
-        let d3: u16 = 0xc2c1;
-        let d4 = [0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
-
-        let u = Uuid::from_fields_le(d1, d2, d3, &d4).unwrap();
-
-        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
-        let result = u.to_simple().to_string();
-        assert_eq!(result, expected);
-    }
-
-    #[test]
-    fn test_as_fields() {
-        let u = test_util::new();
-        let (d1, d2, d3, d4) = u.as_fields();
-
-        assert_ne!(d1, 0);
-        assert_ne!(d2, 0);
-        assert_ne!(d3, 0);
-        assert_eq!(d4.len(), 8);
-        assert!(!d4.iter().all(|&b| b == 0));
-    }
-
-    #[test]
-    fn test_fields_roundtrip() {
-        let d1_in: u32 = 0xa1a2a3a4;
-        let d2_in: u16 = 0xb1b2;
-        let d3_in: u16 = 0xc1c2;
-        let d4_in = &[0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
-
-        let u = Uuid::from_fields(d1_in, d2_in, d3_in, d4_in).unwrap();
-        let (d1_out, d2_out, d3_out, d4_out) = u.as_fields();
-
-        assert_eq!(d1_in, d1_out);
-        assert_eq!(d2_in, d2_out);
-        assert_eq!(d3_in, d3_out);
-        assert_eq!(d4_in, d4_out);
-    }
-
-    #[test]
-    fn test_fields_le_roundtrip() {
-        let d1_in: u32 = 0xa4a3a2a1;
-        let d2_in: u16 = 0xb2b1;
-        let d3_in: u16 = 0xc2c1;
-        let d4_in = &[0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
-
-        let u = Uuid::from_fields_le(d1_in, d2_in, d3_in, d4_in).unwrap();
-        let (d1_out, d2_out, d3_out, d4_out) = u.to_fields_le();
-
-        assert_eq!(d1_in, d1_out);
-        assert_eq!(d2_in, d2_out);
-        assert_eq!(d3_in, d3_out);
-        assert_eq!(d4_in, d4_out);
-    }
-
-    #[test]
-    fn test_fields_le_are_actually_le() {
-        let d1_in: u32 = 0xa1a2a3a4;
-        let d2_in: u16 = 0xb1b2;
-        let d3_in: u16 = 0xc1c2;
-        let d4_in = &[0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
-
-        let u = Uuid::from_fields(d1_in, d2_in, d3_in, d4_in).unwrap();
-        let (d1_out, d2_out, d3_out, d4_out) = u.to_fields_le();
-
-        assert_eq!(d1_in, d1_out.swap_bytes());
-        assert_eq!(d2_in, d2_out.swap_bytes());
-        assert_eq!(d3_in, d3_out.swap_bytes());
-        assert_eq!(d4_in, d4_out);
-    }
-
-    #[test]
-    fn test_from_u128() {
-        let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8;
-
-        let u = Uuid::from_u128(v_in);
-
-        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
-        let result = u.to_simple().to_string();
-        assert_eq!(result, expected);
-    }
-
-    #[test]
-    fn test_from_u128_le() {
-        let v_in: u128 = 0xd8d7d6d5d4d3d2d1c2c1b2b1a4a3a2a1;
-
-        let u = Uuid::from_u128_le(v_in);
-
-        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
-        let result = u.to_simple().to_string();
-        assert_eq!(result, expected);
-    }
-
-    #[test]
-    fn test_u128_roundtrip() {
-        let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8;
-
-        let u = Uuid::from_u128(v_in);
-        let v_out = u.as_u128();
-
-        assert_eq!(v_in, v_out);
-    }
-
-    #[test]
-    fn test_u128_le_roundtrip() {
-        let v_in: u128 = 0xd8d7d6d5d4d3d2d1c2c1b2b1a4a3a2a1;
-
-        let u = Uuid::from_u128_le(v_in);
-        let v_out = u.to_u128_le();
-
-        assert_eq!(v_in, v_out);
-    }
-
-    #[test]
-    fn test_u128_le_is_actually_le() {
-        let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8;
-
-        let u = Uuid::from_u128(v_in);
-        let v_out = u.to_u128_le();
-
-        assert_eq!(v_in, v_out.swap_bytes());
-    }
-
-    #[test]
-    fn test_from_slice() {
-        let b = [
-            0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3,
-            0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
-        ];
-
-        let u = Uuid::from_slice(&b).unwrap();
-        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
-
-        assert_eq!(u.to_simple().to_string(), expected);
-    }
-
-    #[test]
-    fn test_from_bytes() {
-        let b = [
-            0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3,
-            0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
-        ];
-
-        let u = Uuid::from_bytes(b);
-        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
-
-        assert_eq!(u.to_simple().to_string(), expected);
-    }
-
-    #[test]
-    fn test_as_bytes() {
-        let u = test_util::new();
-        let ub = u.as_bytes();
-
-        assert_eq!(ub.len(), 16);
-        assert!(!ub.iter().all(|&b| b == 0));
-    }
-
-    #[test]
-    fn test_bytes_roundtrip() {
-        let b_in: crate::Bytes = [
-            0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3,
-            0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
-        ];
-
-        let u = Uuid::from_slice(&b_in).unwrap();
-
-        let b_out = u.as_bytes();
-
-        assert_eq!(&b_in, b_out);
-    }
-
-    #[test]
-    fn test_iterbytes_impl_for_uuid() {
-        let mut set = std::collections::HashSet::new();
-        let id1 = test_util::new();
-        let id2 = test_util::new2();
-        set.insert(id1.clone());
-
-        assert!(set.contains(&id1));
-        assert!(!set.contains(&id2));
-    }
-}
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Generate and parse UUIDs.
+//!
+//! Provides support for Universally Unique Identifiers (UUIDs). A UUID is a
+//! unique 128-bit number, stored as 16 octets. UUIDs are used to  assign
+//! unique identifiers to entities without requiring a central allocating
+//! authority.
+//!
+//! They are particularly useful in distributed systems, though can be used in
+//! disparate areas, such as databases and network protocols.  Typically a UUID
+//! is displayed in a readable string form as a sequence of hexadecimal digits,
+//! separated into groups by hyphens.
+//!
+//! The uniqueness property is not strictly guaranteed, however for all
+//! practical purposes, it can be assumed that an unintentional collision would
+//! be extremely unlikely.
+//!
+//! # Dependencies
+//!
+//! By default, this crate depends on nothing but `std` and cannot generate
+//! UUIDs. You need to enable the following Cargo features to enable
+//! various pieces of functionality:
+//!
+//! * `v1` - adds the [`Uuid::new_v1`] function and the ability to create a V1
+//!   using an implementation of [`v1::ClockSequence`] (usually
+//! [`v1::Context`]) and a timestamp from `time::timespec`.
+//! * `v3` - adds the [`Uuid::new_v3`] function and the ability to create a V3
+//!   UUID based on the MD5 hash of some data.
+//! * `v4` - adds the [`Uuid::new_v4`] function and the ability to randomly
+//!   generate a UUID.
+//! * `v5` - adds the [`Uuid::new_v5`] function and the ability to create a V5
+//!   UUID based on the SHA1 hash of some data.
+//! * `serde` - adds the ability to serialize and deserialize a UUID using the
+//!   `serde` crate.
+//!
+//! For WebAssembly, enable one of the following features depending
+//! on your JavaScript interop toolchain of choice:
+//!
+//! * `stdweb` - for [`stdweb`] combined with [`cargo-web`]
+//! * `wasm-bindgen` - for [`wasm-bindgen`]
+//!
+//! By default, `uuid` can be depended on with:
+//!
+//! ```toml
+//! [dependencies]
+//! uuid = "0.8"
+//! ```
+//!
+//! To activate various features, use syntax like:
+//!
+//! ```toml
+//! [dependencies]
+//! uuid = { version = "0.8", features = ["serde", "v4"] }
+//! ```
+//!
+//! You can disable default features with:
+//!
+//! ```toml
+//! [dependencies]
+//! uuid = { version = "0.8", default-features = false }
+//! ```
+//!
+//! # Examples
+//!
+//! To parse a UUID given in the simple format and print it as a urn:
+//!
+//! ```rust
+//! use uuid::Uuid;
+//!
+//! fn main() -> Result<(), uuid::Error> {
+//!     let my_uuid =
+//!         Uuid::parse_str("936DA01F9ABD4d9d80C702AF85C822A8")?;
+//!     println!("{}", my_uuid.to_urn());
+//!     Ok(())
+//! }
+//! ```
+//!
+//! To create a new random (V4) UUID and print it out in hexadecimal form:
+//!
+//! ```ignore,rust
+//! // Note that this requires the `v4` feature enabled in the uuid crate.
+//!
+//! use uuid::Uuid;
+//!
+//! fn main() -> Result<(), Box<dyn std::error::Error>> {
+//!     #[cfg(feature = "v4")] {
+//!         let my_uuid = Uuid::new_v4()?;
+//!         println!("{}", my_uuid);
+//!     }
+//!     Ok(())
+//! }
+//! ```
+//!
+//! # Strings
+//!
+//! Examples of string representations:
+//!
+//! * simple: `936DA01F9ABD4d9d80C702AF85C822A8`
+//! * hyphenated: `550e8400-e29b-41d4-a716-446655440000`
+//! * urn: `urn:uuid:F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4`
+//!
+//! # References
+//!
+//! * [Wikipedia: Universally Unique Identifier](http://en.wikipedia.org/wiki/Universally_unique_identifier)
+//! * [RFC4122: A Universally Unique IDentifier (UUID) URN Namespace](http://tools.ietf.org/html/rfc4122)
+//!
+//! [`wasm-bindgen`]: https://crates.io/crates/wasm-bindgen
+//! [`cargo-web`]: https://crates.io/crates/cargo-web
+//! [`stdweb`]: https://crates.io/crates/stdweb
+//! [`Uuid`]: struct.Uuid.html
+//! [`Uuid::new_v1`]: struct.Uuid.html#method.new_v1
+//! [`Uuid::new_v3`]: struct.Uuid.html#method.new_v3
+//! [`Uuid::new_v4`]: struct.Uuid.html#method.new_v4
+//! [`Uuid::new_v5`]: struct.Uuid.html#method.new_v5
+//! [`v1::ClockSequence`]: v1/trait.ClockSequence.html
+//! [`v1::Context`]: v1/struct.Context.html
+
+#![no_std]
+#![deny(missing_debug_implementations, missing_docs)]
+#![doc(
+    html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
+    html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+    html_root_url = "https://docs.rs/uuid/0.8.2"
+)]
+
+#[cfg(any(feature = "std", test))]
+#[macro_use]
+extern crate std;
+
+#[cfg(all(not(feature = "std"), not(test)))]
+#[macro_use]
+extern crate core as std;
+
+mod builder;
+mod error;
+mod parser;
+mod prelude;
+
+pub mod adapter;
+#[cfg(feature = "v1")]
+pub mod v1;
+
+#[cfg(feature = "serde")]
+mod serde_support;
+#[cfg(feature = "slog")]
+mod slog_support;
+#[cfg(test)]
+mod test_util;
+#[cfg(all(
+    feature = "v3",
+    any(
+        not(target_arch = "wasm32"),
+        target_os = "wasi",
+        all(
+            target_arch = "wasm32",
+            any(feature = "stdweb", feature = "wasm-bindgen")
+        )
+    )
+))]
+mod v3;
+#[cfg(all(
+    feature = "v4",
+    any(
+        not(target_arch = "wasm32"),
+        target_os = "wasi",
+        all(
+            target_arch = "wasm32",
+            any(feature = "stdweb", feature = "wasm-bindgen")
+        )
+    )
+))]
+mod v4;
+#[cfg(all(
+    feature = "v5",
+    any(
+        not(target_arch = "wasm32"),
+        target_os = "wasi",
+        all(
+            target_arch = "wasm32",
+            any(feature = "stdweb", feature = "wasm-bindgen")
+        )
+    )
+))]
+mod v5;
+#[cfg(all(windows, feature = "winapi"))]
+mod winapi_support;
+
+use crate::std::{fmt, str};
+
+pub use crate::error::Error;
+
+/// A builder struct for creating a UUID.
+///
+/// # Examples
+///
+/// Creating a v4 UUID from externally generated bytes:
+///
+/// ```
+/// use uuid::{Builder, Variant, Version};
+///
+/// # let rng = || [
+/// #     70, 235, 208, 238, 14, 109, 67, 201, 185, 13, 204, 195, 90,
+/// # 145, 63, 62,
+/// # ];
+/// let random_bytes = rng();
+/// let uuid = Builder::from_bytes(random_bytes)
+///     .set_variant(Variant::RFC4122)
+///     .set_version(Version::Random)
+///     .build();
+/// ```
+#[allow(missing_copy_implementations)]
+#[derive(Debug)]
+pub struct Builder(Bytes);
+
+/// A 128-bit (16 byte) buffer containing the ID.
+pub type Bytes = [u8; 16];
+
+/// The version of the UUID, denoting the generating algorithm.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Version {
+    /// Special case for `nil` UUID.
+    Nil = 0,
+    /// Version 1: MAC address.
+    Mac,
+    /// Version 2: DCE Security.
+    Dce,
+    /// Version 3: MD5 hash.
+    Md5,
+    /// Version 4: Random.
+    Random,
+    /// Version 5: SHA-1 hash.
+    Sha1,
+}
+
+/// The reserved variants of UUIDs.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Variant {
+    /// Reserved by the NCS for backward compatibility.
+    NCS = 0,
+    /// As described in the RFC4122 Specification (default).
+    RFC4122,
+    /// Reserved by Microsoft for backward compatibility.
+    Microsoft,
+    /// Reserved for future expansion.
+    Future,
+}
+
+/// A Universally Unique Identifier (UUID).
+#[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[repr(transparent)]
+pub struct Uuid(Bytes);
+
+impl Uuid {
+    /// UUID namespace for Domain Name System (DNS).
+    pub const NAMESPACE_DNS: Self = Uuid([
+        0x6b, 0xa7, 0xb8, 0x10, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0,
+        0x4f, 0xd4, 0x30, 0xc8,
+    ]);
+
+    /// UUID namespace for ISO Object Identifiers (OIDs).
+    pub const NAMESPACE_OID: Self = Uuid([
+        0x6b, 0xa7, 0xb8, 0x12, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0,
+        0x4f, 0xd4, 0x30, 0xc8,
+    ]);
+
+    /// UUID namespace for Uniform Resource Locators (URLs).
+    pub const NAMESPACE_URL: Self = Uuid([
+        0x6b, 0xa7, 0xb8, 0x11, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0,
+        0x4f, 0xd4, 0x30, 0xc8,
+    ]);
+
+    /// UUID namespace for X.500 Distinguished Names (DNs).
+    pub const NAMESPACE_X500: Self = Uuid([
+        0x6b, 0xa7, 0xb8, 0x14, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0,
+        0x4f, 0xd4, 0x30, 0xc8,
+    ]);
+
+    /// Returns the variant of the UUID structure.
+    ///
+    /// This determines the interpretation of the structure of the UUID.
+    /// Currently only the RFC4122 variant is generated by this module.
+    ///
+    /// * [Variant Reference](http://tools.ietf.org/html/rfc4122#section-4.1.1)
+    pub fn get_variant(&self) -> Option<Variant> {
+        match self.as_bytes()[8] {
+            x if x & 0x80 == 0x00 => Some(Variant::NCS),
+            x if x & 0xc0 == 0x80 => Some(Variant::RFC4122),
+            x if x & 0xe0 == 0xc0 => Some(Variant::Microsoft),
+            x if x & 0xe0 == 0xe0 => Some(Variant::Future),
+            _ => None,
+        }
+    }
+
+    /// Returns the version number of the UUID.
+    ///
+    /// This represents the algorithm used to generate the contents.
+    ///
+    /// Currently only the Random (V4) algorithm is supported by this
+    /// module.  There are security and privacy implications for using
+    /// older versions - see [Wikipedia: Universally Unique Identifier](
+    /// http://en.wikipedia.org/wiki/Universally_unique_identifier) for
+    /// details.
+    ///
+    /// * [Version Reference](http://tools.ietf.org/html/rfc4122#section-4.1.3)
+    pub const fn get_version_num(&self) -> usize {
+        (self.as_bytes()[6] >> 4) as usize
+    }
+
+    /// Returns the version of the UUID.
+    ///
+    /// This represents the algorithm used to generate the contents
+    pub fn get_version(&self) -> Option<Version> {
+        let v = self.as_bytes()[6] >> 4;
+        match v {
+            0 if self.is_nil() => Some(Version::Nil),
+            1 => Some(Version::Mac),
+            2 => Some(Version::Dce),
+            3 => Some(Version::Md5),
+            4 => Some(Version::Random),
+            5 => Some(Version::Sha1),
+            _ => None,
+        }
+    }
+
+    /// Returns the four field values of the UUID in big-endian order.
+    ///
+    /// These values can be passed to the `from_fields()` method to get the
+    /// original `Uuid` back.
+    ///
+    /// * The first field value represents the first group of (eight) hex
+    ///   digits, taken as a big-endian `u32` value.  For V1 UUIDs, this field
+    ///   represents the low 32 bits of the timestamp.
+    /// * The second field value represents the second group of (four) hex
+    ///   digits, taken as a big-endian `u16` value.  For V1 UUIDs, this field
+    ///   represents the middle 16 bits of the timestamp.
+    /// * The third field value represents the third group of (four) hex digits,
+    ///   taken as a big-endian `u16` value.  The 4 most significant bits give
+    ///   the UUID version, and for V1 UUIDs, the last 12 bits represent the
+    ///   high 12 bits of the timestamp.
+    /// * The last field value represents the last two groups of four and twelve
+    ///   hex digits, taken in order.  The first 1-3 bits of this indicate the
+    ///   UUID variant, and for V1 UUIDs, the next 13-15 bits indicate the clock
+    ///   sequence and the last 48 bits indicate the node ID.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::nil();
+    ///     assert_eq!(uuid.as_fields(), (0, 0, 0, &[0u8; 8]));
+    ///
+    ///     let uuid = Uuid::parse_str("936DA01F-9ABD-4D9D-80C7-02AF85C822A8")?;
+    ///     assert_eq!(
+    ///         uuid.as_fields(),
+    ///         (
+    ///             0x936DA01F,
+    ///             0x9ABD,
+    ///             0x4D9D,
+    ///             b"\x80\xC7\x02\xAF\x85\xC8\x22\xA8"
+    ///         )
+    ///     );
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn as_fields(&self) -> (u32, u16, u16, &[u8; 8]) {
+        let d1 = u32::from(self.as_bytes()[0]) << 24
+            | u32::from(self.as_bytes()[1]) << 16
+            | u32::from(self.as_bytes()[2]) << 8
+            | u32::from(self.as_bytes()[3]);
+
+        let d2 =
+            u16::from(self.as_bytes()[4]) << 8 | u16::from(self.as_bytes()[5]);
+
+        let d3 =
+            u16::from(self.as_bytes()[6]) << 8 | u16::from(self.as_bytes()[7]);
+
+        let d4: &[u8; 8] =
+            unsafe { &*(self.as_bytes()[8..16].as_ptr() as *const [u8; 8]) };
+        (d1, d2, d3, d4)
+    }
+
+    /// Returns the four field values of the UUID in little-endian order.
+    ///
+    /// The bytes in the returned integer fields will
+    /// be converted from big-endian order.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01F-9ABD-4D9D-80C7-02AF85C822A8")?;
+    ///     assert_eq!(
+    ///         uuid.to_fields_le(),
+    ///         (
+    ///             0x1FA06D93,
+    ///             0xBD9A,
+    ///             0x9D4D,
+    ///             b"\x80\xC7\x02\xAF\x85\xC8\x22\xA8"
+    ///         )
+    ///     );
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn to_fields_le(&self) -> (u32, u16, u16, &[u8; 8]) {
+        let d1 = u32::from(self.as_bytes()[0])
+            | u32::from(self.as_bytes()[1]) << 8
+            | u32::from(self.as_bytes()[2]) << 16
+            | u32::from(self.as_bytes()[3]) << 24;
+
+        let d2 =
+            u16::from(self.as_bytes()[4]) | u16::from(self.as_bytes()[5]) << 8;
+
+        let d3 =
+            u16::from(self.as_bytes()[6]) | u16::from(self.as_bytes()[7]) << 8;
+
+        let d4: &[u8; 8] =
+            unsafe { &*(self.as_bytes()[8..16].as_ptr() as *const [u8; 8]) };
+        (d1, d2, d3, d4)
+    }
+
+    /// Returns a 128bit value containing the UUID data.
+    ///
+    /// The bytes in the UUID will be packed into a `u128`, like the
+    /// [`Uuid::as_bytes`] method.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01F-9ABD-4D9D-80C7-02AF85C822A8")?;
+    ///     assert_eq!(
+    ///         uuid.as_u128(),
+    ///         0x936DA01F9ABD4D9D80C702AF85C822A8,
+    ///     );
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn as_u128(&self) -> u128 {
+        u128::from(self.as_bytes()[0]) << 120
+            | u128::from(self.as_bytes()[1]) << 112
+            | u128::from(self.as_bytes()[2]) << 104
+            | u128::from(self.as_bytes()[3]) << 96
+            | u128::from(self.as_bytes()[4]) << 88
+            | u128::from(self.as_bytes()[5]) << 80
+            | u128::from(self.as_bytes()[6]) << 72
+            | u128::from(self.as_bytes()[7]) << 64
+            | u128::from(self.as_bytes()[8]) << 56
+            | u128::from(self.as_bytes()[9]) << 48
+            | u128::from(self.as_bytes()[10]) << 40
+            | u128::from(self.as_bytes()[11]) << 32
+            | u128::from(self.as_bytes()[12]) << 24
+            | u128::from(self.as_bytes()[13]) << 16
+            | u128::from(self.as_bytes()[14]) << 8
+            | u128::from(self.as_bytes()[15])
+    }
+
+    /// Returns a 128bit little-endian value containing the UUID data.
+    ///
+    /// The bytes in the UUID will be reversed and packed into a `u128`.
+    /// Note that this will produce a different result than
+    /// [`Uuid::to_fields_le`], because the entire UUID is reversed, rather
+    /// than reversing the individual fields in-place.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// fn main() -> Result<(), uuid::Error> {
+    ///     let uuid = Uuid::parse_str("936DA01F-9ABD-4D9D-80C7-02AF85C822A8")?;
+    ///
+    ///     assert_eq!(
+    ///         uuid.to_u128_le(),
+    ///         0xA822C885AF02C7809D4DBD9A1FA06D93,
+    ///     );
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn to_u128_le(&self) -> u128 {
+        u128::from(self.as_bytes()[0])
+            | u128::from(self.as_bytes()[1]) << 8
+            | u128::from(self.as_bytes()[2]) << 16
+            | u128::from(self.as_bytes()[3]) << 24
+            | u128::from(self.as_bytes()[4]) << 32
+            | u128::from(self.as_bytes()[5]) << 40
+            | u128::from(self.as_bytes()[6]) << 48
+            | u128::from(self.as_bytes()[7]) << 56
+            | u128::from(self.as_bytes()[8]) << 64
+            | u128::from(self.as_bytes()[9]) << 72
+            | u128::from(self.as_bytes()[10]) << 80
+            | u128::from(self.as_bytes()[11]) << 88
+            | u128::from(self.as_bytes()[12]) << 96
+            | u128::from(self.as_bytes()[13]) << 104
+            | u128::from(self.as_bytes()[14]) << 112
+            | u128::from(self.as_bytes()[15]) << 120
+    }
+
+    /// Returns an array of 16 octets containing the UUID data.
+    pub const fn as_bytes(&self) -> &Bytes {
+        &self.0
+    }
+
+    /// Tests if the UUID is nil.
+    pub fn is_nil(&self) -> bool {
+        self.as_bytes().iter().all(|&b| b == 0)
+    }
+
+    /// A buffer that can be used for `encode_...` calls, that is
+    /// guaranteed to be long enough for any of the adapters.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use uuid::Uuid;
+    ///
+    /// let uuid = Uuid::nil();
+    ///
+    /// assert_eq!(
+    ///     uuid.to_simple().encode_lower(&mut Uuid::encode_buffer()),
+    ///     "00000000000000000000000000000000"
+    /// );
+    ///
+    /// assert_eq!(
+    ///     uuid.to_hyphenated()
+    ///         .encode_lower(&mut Uuid::encode_buffer()),
+    ///     "00000000-0000-0000-0000-000000000000"
+    /// );
+    ///
+    /// assert_eq!(
+    ///     uuid.to_urn().encode_lower(&mut Uuid::encode_buffer()),
+    ///     "urn:uuid:00000000-0000-0000-0000-000000000000"
+    /// );
+    /// ```
+    pub const fn encode_buffer() -> [u8; adapter::Urn::LENGTH] {
+        [0; adapter::Urn::LENGTH]
+    }
+}
+
+impl fmt::Debug for Uuid {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::LowerHex::fmt(self, f)
+    }
+}
+
+impl fmt::Display for Uuid {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::LowerHex::fmt(self, f)
+    }
+}
+
+impl fmt::Display for Variant {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            Variant::NCS => write!(f, "NCS"),
+            Variant::RFC4122 => write!(f, "RFC4122"),
+            Variant::Microsoft => write!(f, "Microsoft"),
+            Variant::Future => write!(f, "Future"),
+        }
+    }
+}
+
+impl fmt::LowerHex for Uuid {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::LowerHex::fmt(&self.to_hyphenated_ref(), f)
+    }
+}
+
+impl fmt::UpperHex for Uuid {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::UpperHex::fmt(&self.to_hyphenated_ref(), f)
+    }
+}
+
+impl str::FromStr for Uuid {
+    type Err = Error;
+
+    fn from_str(uuid_str: &str) -> Result<Self, Self::Err> {
+        Uuid::parse_str(uuid_str)
+    }
+}
+
+impl Default for Uuid {
+    #[inline]
+    fn default() -> Self {
+        Uuid::nil()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        prelude::*,
+        std::string::{String, ToString},
+        test_util,
+    };
+
+    macro_rules! check {
+        ($buf:ident, $format:expr, $target:expr, $len:expr, $cond:expr) => {
+            $buf.clear();
+            write!($buf, $format, $target).unwrap();
+            assert!($buf.len() == $len);
+            assert!($buf.chars().all($cond), "{}", $buf);
+        };
+    }
+
+    #[test]
+    fn test_uuid_compare() {
+        let uuid1 = test_util::new();
+        let uuid2 = test_util::new2();
+
+        assert_eq!(uuid1, uuid1);
+        assert_eq!(uuid2, uuid2);
+
+        assert_ne!(uuid1, uuid2);
+        assert_ne!(uuid2, uuid1);
+    }
+
+    #[test]
+    fn test_uuid_default() {
+        let default_uuid = Uuid::default();
+        let nil_uuid = Uuid::nil();
+
+        assert_eq!(default_uuid, nil_uuid);
+    }
+
+    #[test]
+    fn test_uuid_display() {
+        use super::fmt::Write;
+
+        let uuid = test_util::new();
+        let s = uuid.to_string();
+        let mut buffer = String::new();
+
+        assert_eq!(s, uuid.to_hyphenated().to_string());
+
+        check!(buffer, "{}", uuid, 36, |c| c.is_lowercase()
+            || c.is_digit(10)
+            || c == '-');
+    }
+
+    #[test]
+    fn test_uuid_lowerhex() {
+        use super::fmt::Write;
+
+        let mut buffer = String::new();
+        let uuid = test_util::new();
+
+        check!(buffer, "{:x}", uuid, 36, |c| c.is_lowercase()
+            || c.is_digit(10)
+            || c == '-');
+    }
+
+    // noinspection RsAssertEqual
+    #[test]
+    fn test_uuid_operator_eq() {
+        let uuid1 = test_util::new();
+        let uuid1_dup = uuid1.clone();
+        let uuid2 = test_util::new2();
+
+        assert!(uuid1 == uuid1);
+        assert!(uuid1 == uuid1_dup);
+        assert!(uuid1_dup == uuid1);
+
+        assert!(uuid1 != uuid2);
+        assert!(uuid2 != uuid1);
+        assert!(uuid1_dup != uuid2);
+        assert!(uuid2 != uuid1_dup);
+    }
+
+    #[test]
+    fn test_uuid_to_string() {
+        use super::fmt::Write;
+
+        let uuid = test_util::new();
+        let s = uuid.to_string();
+        let mut buffer = String::new();
+
+        assert_eq!(s.len(), 36);
+
+        check!(buffer, "{}", s, 36, |c| c.is_lowercase()
+            || c.is_digit(10)
+            || c == '-');
+    }
+
+    #[test]
+    fn test_uuid_upperhex() {
+        use super::fmt::Write;
+
+        let mut buffer = String::new();
+        let uuid = test_util::new();
+
+        check!(buffer, "{:X}", uuid, 36, |c| c.is_uppercase()
+            || c.is_digit(10)
+            || c == '-');
+    }
+
+    #[test]
+    fn test_nil() {
+        let nil = Uuid::nil();
+        let not_nil = test_util::new();
+        let from_bytes = Uuid::from_bytes([
+            4, 54, 67, 12, 43, 2, 2, 76, 32, 50, 87, 5, 1, 33, 43, 87,
+        ]);
+
+        assert_eq!(from_bytes.get_version(), None);
+
+        assert!(nil.is_nil());
+        assert!(!not_nil.is_nil());
+
+        assert_eq!(nil.get_version(), Some(Version::Nil));
+        assert_eq!(not_nil.get_version(), Some(Version::Random))
+    }
+
+    #[test]
+    fn test_predefined_namespaces() {
+        assert_eq!(
+            Uuid::NAMESPACE_DNS.to_hyphenated().to_string(),
+            "6ba7b810-9dad-11d1-80b4-00c04fd430c8"
+        );
+        assert_eq!(
+            Uuid::NAMESPACE_URL.to_hyphenated().to_string(),
+            "6ba7b811-9dad-11d1-80b4-00c04fd430c8"
+        );
+        assert_eq!(
+            Uuid::NAMESPACE_OID.to_hyphenated().to_string(),
+            "6ba7b812-9dad-11d1-80b4-00c04fd430c8"
+        );
+        assert_eq!(
+            Uuid::NAMESPACE_X500.to_hyphenated().to_string(),
+            "6ba7b814-9dad-11d1-80b4-00c04fd430c8"
+        );
+    }
+
+    #[cfg(feature = "v3")]
+    #[test]
+    fn test_get_version_v3() {
+        let uuid =
+            Uuid::new_v3(&Uuid::NAMESPACE_DNS, "rust-lang.org".as_bytes());
+
+        assert_eq!(uuid.get_version().unwrap(), Version::Md5);
+        assert_eq!(uuid.get_version_num(), 3);
+    }
+
+    #[test]
+    fn test_get_variant() {
+        let uuid1 = test_util::new();
+        let uuid2 =
+            Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap();
+        let uuid3 =
+            Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8").unwrap();
+        let uuid4 =
+            Uuid::parse_str("936DA01F9ABD4d9dC0C702AF85C822A8").unwrap();
+        let uuid5 =
+            Uuid::parse_str("F9168C5E-CEB2-4faa-D6BF-329BF39FA1E4").unwrap();
+        let uuid6 =
+            Uuid::parse_str("f81d4fae-7dec-11d0-7765-00a0c91e6bf6").unwrap();
+
+        assert_eq!(uuid1.get_variant().unwrap(), Variant::RFC4122);
+        assert_eq!(uuid2.get_variant().unwrap(), Variant::RFC4122);
+        assert_eq!(uuid3.get_variant().unwrap(), Variant::RFC4122);
+        assert_eq!(uuid4.get_variant().unwrap(), Variant::Microsoft);
+        assert_eq!(uuid5.get_variant().unwrap(), Variant::Microsoft);
+        assert_eq!(uuid6.get_variant().unwrap(), Variant::NCS);
+    }
+
+    #[test]
+    fn test_to_simple_string() {
+        let uuid1 = test_util::new();
+        let s = uuid1.to_simple().to_string();
+
+        assert_eq!(s.len(), 32);
+        assert!(s.chars().all(|c| c.is_digit(16)));
+    }
+
+    #[test]
+    fn test_to_hyphenated_string() {
+        let uuid1 = test_util::new();
+        let s = uuid1.to_hyphenated().to_string();
+
+        assert!(s.len() == 36);
+        assert!(s.chars().all(|c| c.is_digit(16) || c == '-'));
+    }
+
+    #[test]
+    fn test_upper_lower_hex() {
+        use std::fmt::Write;
+
+        let mut buf = String::new();
+        let u = test_util::new();
+
+        macro_rules! check {
+            ($buf:ident, $format:expr, $target:expr, $len:expr, $cond:expr) => {
+                $buf.clear();
+                write!($buf, $format, $target).unwrap();
+                assert!(buf.len() == $len);
+                assert!($buf.chars().all($cond), "{}", $buf);
+            };
+        }
+
+        check!(buf, "{:X}", u, 36, |c| c.is_uppercase()
+            || c.is_digit(10)
+            || c == '-');
+        check!(buf, "{:X}", u.to_hyphenated(), 36, |c| c.is_uppercase()
+            || c.is_digit(10)
+            || c == '-');
+        check!(buf, "{:X}", u.to_simple(), 32, |c| c.is_uppercase()
+            || c.is_digit(10));
+
+        check!(buf, "{:x}", u.to_hyphenated(), 36, |c| c.is_lowercase()
+            || c.is_digit(10)
+            || c == '-');
+        check!(buf, "{:x}", u.to_simple(), 32, |c| c.is_lowercase()
+            || c.is_digit(10));
+    }
+
+    #[test]
+    fn test_to_urn_string() {
+        let uuid1 = test_util::new();
+        let ss = uuid1.to_urn().to_string();
+        let s = &ss[9..];
+
+        assert!(ss.starts_with("urn:uuid:"));
+        assert_eq!(s.len(), 36);
+        assert!(s.chars().all(|c| c.is_digit(16) || c == '-'));
+    }
+
+    #[test]
+    fn test_to_simple_string_matching() {
+        let uuid1 = test_util::new();
+
+        let hs = uuid1.to_hyphenated().to_string();
+        let ss = uuid1.to_simple().to_string();
+
+        let hsn = hs.chars().filter(|&c| c != '-').collect::<String>();
+
+        assert_eq!(hsn, ss);
+    }
+
+    #[test]
+    fn test_string_roundtrip() {
+        let uuid = test_util::new();
+
+        let hs = uuid.to_hyphenated().to_string();
+        let uuid_hs = Uuid::parse_str(&hs).unwrap();
+        assert_eq!(uuid_hs, uuid);
+
+        let ss = uuid.to_string();
+        let uuid_ss = Uuid::parse_str(&ss).unwrap();
+        assert_eq!(uuid_ss, uuid);
+    }
+
+    #[test]
+    fn test_from_fields() {
+        let d1: u32 = 0xa1a2a3a4;
+        let d2: u16 = 0xb1b2;
+        let d3: u16 = 0xc1c2;
+        let d4 = [0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
+
+        let u = Uuid::from_fields(d1, d2, d3, &d4).unwrap();
+
+        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
+        let result = u.to_simple().to_string();
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_from_fields_le() {
+        let d1: u32 = 0xa4a3a2a1;
+        let d2: u16 = 0xb2b1;
+        let d3: u16 = 0xc2c1;
+        let d4 = [0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
+
+        let u = Uuid::from_fields_le(d1, d2, d3, &d4).unwrap();
+
+        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
+        let result = u.to_simple().to_string();
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_as_fields() {
+        let u = test_util::new();
+        let (d1, d2, d3, d4) = u.as_fields();
+
+        assert_ne!(d1, 0);
+        assert_ne!(d2, 0);
+        assert_ne!(d3, 0);
+        assert_eq!(d4.len(), 8);
+        assert!(!d4.iter().all(|&b| b == 0));
+    }
+
+    #[test]
+    fn test_fields_roundtrip() {
+        let d1_in: u32 = 0xa1a2a3a4;
+        let d2_in: u16 = 0xb1b2;
+        let d3_in: u16 = 0xc1c2;
+        let d4_in = &[0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
+
+        let u = Uuid::from_fields(d1_in, d2_in, d3_in, d4_in).unwrap();
+        let (d1_out, d2_out, d3_out, d4_out) = u.as_fields();
+
+        assert_eq!(d1_in, d1_out);
+        assert_eq!(d2_in, d2_out);
+        assert_eq!(d3_in, d3_out);
+        assert_eq!(d4_in, d4_out);
+    }
+
+    #[test]
+    fn test_fields_le_roundtrip() {
+        let d1_in: u32 = 0xa4a3a2a1;
+        let d2_in: u16 = 0xb2b1;
+        let d3_in: u16 = 0xc2c1;
+        let d4_in = &[0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
+
+        let u = Uuid::from_fields_le(d1_in, d2_in, d3_in, d4_in).unwrap();
+        let (d1_out, d2_out, d3_out, d4_out) = u.to_fields_le();
+
+        assert_eq!(d1_in, d1_out);
+        assert_eq!(d2_in, d2_out);
+        assert_eq!(d3_in, d3_out);
+        assert_eq!(d4_in, d4_out);
+    }
+
+    #[test]
+    fn test_fields_le_are_actually_le() {
+        let d1_in: u32 = 0xa1a2a3a4;
+        let d2_in: u16 = 0xb1b2;
+        let d3_in: u16 = 0xc1c2;
+        let d4_in = &[0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8];
+
+        let u = Uuid::from_fields(d1_in, d2_in, d3_in, d4_in).unwrap();
+        let (d1_out, d2_out, d3_out, d4_out) = u.to_fields_le();
+
+        assert_eq!(d1_in, d1_out.swap_bytes());
+        assert_eq!(d2_in, d2_out.swap_bytes());
+        assert_eq!(d3_in, d3_out.swap_bytes());
+        assert_eq!(d4_in, d4_out);
+    }
+
+    #[test]
+    fn test_from_u128() {
+        let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8;
+
+        let u = Uuid::from_u128(v_in);
+
+        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
+        let result = u.to_simple().to_string();
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_from_u128_le() {
+        let v_in: u128 = 0xd8d7d6d5d4d3d2d1c2c1b2b1a4a3a2a1;
+
+        let u = Uuid::from_u128_le(v_in);
+
+        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
+        let result = u.to_simple().to_string();
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_u128_roundtrip() {
+        let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8;
+
+        let u = Uuid::from_u128(v_in);
+        let v_out = u.as_u128();
+
+        assert_eq!(v_in, v_out);
+    }
+
+    #[test]
+    fn test_u128_le_roundtrip() {
+        let v_in: u128 = 0xd8d7d6d5d4d3d2d1c2c1b2b1a4a3a2a1;
+
+        let u = Uuid::from_u128_le(v_in);
+        let v_out = u.to_u128_le();
+
+        assert_eq!(v_in, v_out);
+    }
+
+    #[test]
+    fn test_u128_le_is_actually_le() {
+        let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8;
+
+        let u = Uuid::from_u128(v_in);
+        let v_out = u.to_u128_le();
+
+        assert_eq!(v_in, v_out.swap_bytes());
+    }
+
+    #[test]
+    fn test_from_slice() {
+        let b = [
+            0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3,
+            0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
+        ];
+
+        let u = Uuid::from_slice(&b).unwrap();
+        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
+
+        assert_eq!(u.to_simple().to_string(), expected);
+    }
+
+    #[test]
+    fn test_from_bytes() {
+        let b = [
+            0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3,
+            0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
+        ];
+
+        let u = Uuid::from_bytes(b);
+        let expected = "a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
+
+        assert_eq!(u.to_simple().to_string(), expected);
+    }
+
+    #[test]
+    fn test_as_bytes() {
+        let u = test_util::new();
+        let ub = u.as_bytes();
+
+        assert_eq!(ub.len(), 16);
+        assert!(!ub.iter().all(|&b| b == 0));
+    }
+
+    #[test]
+    fn test_bytes_roundtrip() {
+        let b_in: crate::Bytes = [
+            0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3,
+            0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
+        ];
+
+        let u = Uuid::from_slice(&b_in).unwrap();
+
+        let b_out = u.as_bytes();
+
+        assert_eq!(&b_in, b_out);
+    }
+
+    #[test]
+    fn test_iterbytes_impl_for_uuid() {
+        let mut set = std::collections::HashSet::new();
+        let id1 = test_util::new();
+        let id2 = test_util::new2();
+        set.insert(id1.clone());
+
+        assert!(set.contains(&id1));
+        assert!(!set.contains(&id2));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/parser/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/parser/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/parser/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/parser/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,148 +1,149 @@
-use crate::std::fmt;
-
-/// An error that can occur while parsing a [`Uuid`] string.
-///
-/// [`Uuid`]: ../struct.Uuid.html
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub(crate) enum Error {
-    /// Invalid character in the [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    InvalidCharacter {
-        /// The expected characters.
-        expected: &'static str,
-        /// The invalid character found.
-        found: char,
-        /// The invalid character position.
-        index: usize,
-        /// Indicates the [`Uuid`] starts with `urn:uuid:`.
-        ///
-        /// This is a special case for [`Urn`] adapter parsing.
-        ///
-        /// [`Uuid`]: ../Uuid.html
-        urn: UrnPrefix,
-    },
-    /// Invalid number of segments in the [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    InvalidGroupCount {
-        /// The expected number of segments.
-        // TODO: explain multiple segment count.
-        // BODY: Parsers can expect a range of Uuid segment count.
-        //       This needs to be expanded on.
-        expected: ExpectedLength,
-        /// The number of segments found.
-        found: usize,
-    },
-    /// Invalid length of a segment in a [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    InvalidGroupLength {
-        /// The expected length of the segment.
-        expected: ExpectedLength,
-        /// The length of segment found.
-        found: usize,
-        /// The segment with invalid length.
-        group: usize,
-    },
-    /// Invalid length of the [`Uuid`] string.
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    InvalidLength {
-        /// The expected length(s).
-        // TODO: explain multiple lengths.
-        // BODY: Parsers can expect a range of Uuid lenghts.
-        //       This needs to be expanded on.
-        expected: ExpectedLength,
-        /// The invalid length found.
-        found: usize,
-    },
-}
-
-/// The expected length.
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub(crate) enum ExpectedLength {
-    /// Expected any one of the given values.
-    Any(&'static [usize]),
-    /// Expected the given value.
-    Exact(usize),
-}
-
-/// Urn prefix value.
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub(crate) enum UrnPrefix {
-    /// The `urn:uuid:` prefix should optionally provided.
-    Optional,
-}
-
-impl Error {
-    fn _description(&self) -> &str {
-        match *self {
-            Error::InvalidCharacter { .. } => "invalid character",
-            Error::InvalidGroupCount { .. } => "invalid number of groups",
-            Error::InvalidGroupLength { .. } => "invalid group length",
-            Error::InvalidLength { .. } => "invalid length",
-        }
-    }
-}
-
-impl fmt::Display for ExpectedLength {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match *self {
-            ExpectedLength::Any(crits) => write!(f, "one of {:?}", crits),
-            ExpectedLength::Exact(crit) => write!(f, "{}", crit),
-        }
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}: ", self._description())?;
-
-        match *self {
-            Error::InvalidCharacter {
-                expected,
-                found,
-                index,
-                urn,
-            } => {
-                let urn_str = match urn {
-                    UrnPrefix::Optional => {
-                        " an optional prefix of `urn:uuid:` followed by"
-                    }
-                };
-
-                write!(
-                    f,
-                    "expected{} {}, found {} at {}",
-                    urn_str, expected, found, index
-                )
-            }
-            Error::InvalidGroupCount {
-                ref expected,
-                found,
-            } => write!(f, "expected {}, found {}", expected, found),
-            Error::InvalidGroupLength {
-                ref expected,
-                found,
-                group,
-            } => write!(
-                f,
-                "expected {}, found {} in group {}",
-                expected, found, group,
-            ),
-            Error::InvalidLength {
-                ref expected,
-                found,
-            } => write!(f, "expected {}, found {}", expected, found),
-        }
-    }
-}
-
-#[cfg(feature = "std")]
-mod std_support {
-    use super::*;
-    use crate::std::error;
-
-    impl error::Error for Error {}
-}
+use crate::std::fmt;
+
+/// An error that can occur while parsing a [`Uuid`] string.
+///
+/// [`Uuid`]: ../struct.Uuid.html
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[allow(clippy::enum_variant_names)]
+pub(crate) enum Error {
+    /// Invalid character in the [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    InvalidCharacter {
+        /// The expected characters.
+        expected: &'static str,
+        /// The invalid character found.
+        found: char,
+        /// The invalid character position.
+        index: usize,
+        /// Indicates the [`Uuid`] starts with `urn:uuid:`.
+        ///
+        /// This is a special case for [`Urn`] adapter parsing.
+        ///
+        /// [`Uuid`]: ../Uuid.html
+        urn: UrnPrefix,
+    },
+    /// Invalid number of segments in the [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    InvalidGroupCount {
+        /// The expected number of segments.
+        // TODO: explain multiple segment count.
+        // BODY: Parsers can expect a range of Uuid segment count.
+        //       This needs to be expanded on.
+        expected: ExpectedLength,
+        /// The number of segments found.
+        found: usize,
+    },
+    /// Invalid length of a segment in a [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    InvalidGroupLength {
+        /// The expected length of the segment.
+        expected: ExpectedLength,
+        /// The length of segment found.
+        found: usize,
+        /// The segment with invalid length.
+        group: usize,
+    },
+    /// Invalid length of the [`Uuid`] string.
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    InvalidLength {
+        /// The expected length(s).
+        // TODO: explain multiple lengths.
+        // BODY: Parsers can expect a range of Uuid lenghts.
+        //       This needs to be expanded on.
+        expected: ExpectedLength,
+        /// The invalid length found.
+        found: usize,
+    },
+}
+
+/// The expected length.
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub(crate) enum ExpectedLength {
+    /// Expected any one of the given values.
+    Any(&'static [usize]),
+    /// Expected the given value.
+    Exact(usize),
+}
+
+/// Urn prefix value.
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub(crate) enum UrnPrefix {
+    /// The `urn:uuid:` prefix should optionally provided.
+    Optional,
+}
+
+impl Error {
+    fn _description(&self) -> &str {
+        match *self {
+            Error::InvalidCharacter { .. } => "invalid character",
+            Error::InvalidGroupCount { .. } => "invalid number of groups",
+            Error::InvalidGroupLength { .. } => "invalid group length",
+            Error::InvalidLength { .. } => "invalid length",
+        }
+    }
+}
+
+impl fmt::Display for ExpectedLength {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            ExpectedLength::Any(crits) => write!(f, "one of {:?}", crits),
+            ExpectedLength::Exact(crit) => write!(f, "{}", crit),
+        }
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}: ", self._description())?;
+
+        match *self {
+            Error::InvalidCharacter {
+                expected,
+                found,
+                index,
+                urn,
+            } => {
+                let urn_str = match urn {
+                    UrnPrefix::Optional => {
+                        " an optional prefix of `urn:uuid:` followed by"
+                    }
+                };
+
+                write!(
+                    f,
+                    "expected{} {}, found {} at {}",
+                    urn_str, expected, found, index
+                )
+            }
+            Error::InvalidGroupCount {
+                ref expected,
+                found,
+            } => write!(f, "expected {}, found {}", expected, found),
+            Error::InvalidGroupLength {
+                ref expected,
+                found,
+                group,
+            } => write!(
+                f,
+                "expected {}, found {} in group {}",
+                expected, found, group,
+            ),
+            Error::InvalidLength {
+                ref expected,
+                found,
+            } => write!(f, "expected {}, found {}", expected, found),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+mod std_support {
+    use super::*;
+    use crate::std::error;
+
+    impl error::Error for Error {}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/parser/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/parser/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/parser/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/parser/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,447 +1,447 @@
-// Copyright 2013-2014 The Rust Project Developers.
-// Copyright 2018 The Uuid Project Developers.
-//
-// See the COPYRIGHT file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! [`Uuid`] parsing constructs and utilities.
-//!
-//! [`Uuid`]: ../struct.Uuid.html
-
-pub(crate) mod error;
-pub(crate) use self::error::Error;
-
-use crate::{adapter, Uuid};
-
-/// Check if the length matches any of the given criteria lengths.
-fn len_matches_any(len: usize, crits: &[usize]) -> bool {
-    for crit in crits {
-        if len == *crit {
-            return true;
-        }
-    }
-
-    false
-}
-
-/// Check if the length matches any criteria lengths in the given range
-/// (inclusive).
-#[allow(dead_code)]
-fn len_matches_range(len: usize, min: usize, max: usize) -> bool {
-    for crit in min..(max + 1) {
-        if len == crit {
-            return true;
-        }
-    }
-
-    false
-}
-
-// Accumulated length of each hyphenated group in hex digits.
-const ACC_GROUP_LENS: [usize; 5] = [8, 12, 16, 20, 32];
-
-// Length of each hyphenated group in hex digits.
-const GROUP_LENS: [usize; 5] = [8, 4, 4, 4, 12];
-
-impl Uuid {
-    /// Parses a `Uuid` from a string of hexadecimal digits with optional
-    /// hyphens.
-    ///
-    /// Any of the formats generated by this module (simple, hyphenated, urn)
-    /// are supported by this parsing function.
-    pub fn parse_str(mut input: &str) -> Result<Uuid, crate::Error> {
-        // Ensure length is valid for any of the supported formats
-        let len = input.len();
-
-        if len == adapter::Urn::LENGTH && input.starts_with("urn:uuid:") {
-            input = &input[9..];
-        } else if !len_matches_any(
-            len,
-            &[adapter::Hyphenated::LENGTH, adapter::Simple::LENGTH],
-        ) {
-            Err(Error::InvalidLength {
-                expected: error::ExpectedLength::Any(&[
-                    adapter::Hyphenated::LENGTH,
-                    adapter::Simple::LENGTH,
-                ]),
-                found: len,
-            })?;
-        }
-
-        // `digit` counts only hexadecimal digits, `i_char` counts all chars.
-        let mut digit = 0;
-        let mut group = 0;
-        let mut acc = 0;
-        let mut buffer = [0u8; 16];
-
-        for (i_char, chr) in input.bytes().enumerate() {
-            if digit as usize >= adapter::Simple::LENGTH && group != 4 {
-                if group == 0 {
-                    Err(Error::InvalidLength {
-                        expected: error::ExpectedLength::Any(&[
-                            adapter::Hyphenated::LENGTH,
-                            adapter::Simple::LENGTH,
-                        ]),
-                        found: len,
-                    })?;
-                }
-
-                Err(Error::InvalidGroupCount {
-                    expected: error::ExpectedLength::Any(&[1, 5]),
-                    found: group + 1,
-                })?;
-            }
-
-            if digit % 2 == 0 {
-                // First digit of the byte.
-                match chr {
-                    // Calulate upper half.
-                    b'0'..=b'9' => acc = chr - b'0',
-                    b'a'..=b'f' => acc = chr - b'a' + 10,
-                    b'A'..=b'F' => acc = chr - b'A' + 10,
-                    // Found a group delimiter
-                    b'-' => {
-                        // TODO: remove the u8 cast
-                        // BODY: this only needed until we switch to
-                        //       ParseError
-                        if ACC_GROUP_LENS[group] as u8 != digit {
-                            // Calculate how many digits this group consists of
-                            // in the input.
-                            let found = if group > 0 {
-                                // TODO: remove the u8 cast
-                                // BODY: this only needed until we switch to
-                                //       ParseError
-                                digit - ACC_GROUP_LENS[group - 1] as u8
-                            } else {
-                                digit
-                            };
-
-                            Err(Error::InvalidGroupLength {
-                                expected: error::ExpectedLength::Exact(
-                                    GROUP_LENS[group],
-                                ),
-                                found: found as usize,
-                                group,
-                            })?;
-                        }
-                        // Next group, decrement digit, it is incremented again
-                        // at the bottom.
-                        group += 1;
-                        digit -= 1;
-                    }
-                    _ => {
-                        Err(Error::InvalidCharacter {
-                            expected: "0123456789abcdefABCDEF-",
-                            found: input[i_char..].chars().next().unwrap(),
-                            index: i_char,
-                            urn: error::UrnPrefix::Optional,
-                        })?;
-                    }
-                }
-            } else {
-                // Second digit of the byte, shift the upper half.
-                acc *= 16;
-                match chr {
-                    b'0'..=b'9' => acc += chr - b'0',
-                    b'a'..=b'f' => acc += chr - b'a' + 10,
-                    b'A'..=b'F' => acc += chr - b'A' + 10,
-                    b'-' => {
-                        // The byte isn't complete yet.
-                        let found = if group > 0 {
-                            // TODO: remove the u8 cast
-                            // BODY: this only needed until we switch to
-                            //       ParseError
-                            digit - ACC_GROUP_LENS[group - 1] as u8
-                        } else {
-                            digit
-                        };
-
-                        Err(Error::InvalidGroupLength {
-                            expected: error::ExpectedLength::Exact(
-                                GROUP_LENS[group],
-                            ),
-                            found: found as usize,
-                            group,
-                        })?;
-                    }
-                    _ => {
-                        Err(Error::InvalidCharacter {
-                            expected: "0123456789abcdefABCDEF-",
-                            found: input[i_char..].chars().next().unwrap(),
-                            index: i_char,
-                            urn: error::UrnPrefix::Optional,
-                        })?;
-                    }
-                }
-                buffer[(digit / 2) as usize] = acc;
-            }
-            digit += 1;
-        }
-
-        // Now check the last group.
-        // TODO: remove the u8 cast
-        // BODY: this only needed until we switch to
-        //       ParseError
-        if ACC_GROUP_LENS[4] as u8 != digit {
-            Err(Error::InvalidGroupLength {
-                expected: error::ExpectedLength::Exact(GROUP_LENS[4]),
-                found: (digit as usize - ACC_GROUP_LENS[3]),
-                group,
-            })?;
-        }
-
-        Ok(Uuid::from_bytes(buffer))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{adapter, std::string::ToString, test_util};
-
-    #[test]
-    fn test_parse_uuid_v4() {
-        const EXPECTED_UUID_LENGTHS: error::ExpectedLength =
-            error::ExpectedLength::Any(&[
-                adapter::Hyphenated::LENGTH,
-                adapter::Simple::LENGTH,
-            ]);
-
-        const EXPECTED_GROUP_COUNTS: error::ExpectedLength =
-            error::ExpectedLength::Any(&[1, 5]);
-
-        const EXPECTED_CHARS: &'static str = "0123456789abcdefABCDEF-";
-
-        // Invalid
-        assert_eq!(
-            Uuid::parse_str("").map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 0,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("!").map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 1
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E45")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 37,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2-4faa-BBF-329BF39FA1E4")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 35
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2-4faa-BGBF-329BF39FA1E4")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidCharacter {
-                expected: EXPECTED_CHARS,
-                found: 'G',
-                index: 20,
-                urn: error::UrnPrefix::Optional,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2F4faaFB6BFF329BF39FA1E4")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidGroupCount {
-                expected: EXPECTED_GROUP_COUNTS,
-                found: 2
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2-4faaFB6BFF329BF39FA1E4")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidGroupCount {
-                expected: EXPECTED_GROUP_COUNTS,
-                found: 3,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2-4faa-B6BFF329BF39FA1E4")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidGroupCount {
-                expected: EXPECTED_GROUP_COUNTS,
-                found: 4,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2-4faa")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 18,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2-4faaXB6BFF329BF39FA1E4")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidCharacter {
-                expected: EXPECTED_CHARS,
-                found: 'X',
-                index: 18,
-                urn: error::UrnPrefix::Optional,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB-24fa-eB6BFF32-BF39FA1E4")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidGroupLength {
-                expected: error::ExpectedLength::Exact(4),
-                found: 3,
-                group: 1,
-            })
-        );
-        // (group, found, expecting)
-        //
-        assert_eq!(
-            Uuid::parse_str("01020304-1112-2122-3132-41424344")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidGroupLength {
-                expected: error::ExpectedLength::Exact(12),
-                found: 8,
-                group: 4,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 31,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c88")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 33,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("67e5504410b1426f9247bb680e5fe0cg8")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 33,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("67e5504410b1426%9247bb680e5fe0c8")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidCharacter {
-                expected: EXPECTED_CHARS,
-                found: '%',
-                index: 15,
-                urn: error::UrnPrefix::Optional,
-            })
-        );
-
-        assert_eq!(
-            Uuid::parse_str("231231212212423424324323477343246663")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 36,
-            })
-        );
-
-        // Valid
-        assert!(Uuid::parse_str("00000000000000000000000000000000").is_ok());
-        assert!(Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8").is_ok());
-        assert!(Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").is_ok());
-        assert!(Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c8").is_ok());
-        assert!(Uuid::parse_str("01020304-1112-2122-3132-414243444546").is_ok());
-        assert!(Uuid::parse_str(
-            "urn:uuid:67e55044-10b1-426f-9247-bb680e5fe0c8"
-        )
-        .is_ok());
-
-        // Nil
-        let nil = Uuid::nil();
-        assert_eq!(
-            Uuid::parse_str("00000000000000000000000000000000").unwrap(),
-            nil
-        );
-        assert_eq!(
-            Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap(),
-            nil
-        );
-
-        // Round-trip
-        let uuid_orig = test_util::new();
-        let orig_str = uuid_orig.to_string();
-        let uuid_out = Uuid::parse_str(&orig_str).unwrap();
-        assert_eq!(uuid_orig, uuid_out);
-
-        // Test error reporting
-        assert_eq!(
-            Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidLength {
-                expected: EXPECTED_UUID_LENGTHS,
-                found: 31,
-            })
-        );
-        assert_eq!(
-            Uuid::parse_str("67e550X410b1426f9247bb680e5fe0cd")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidCharacter {
-                expected: EXPECTED_CHARS,
-                found: 'X',
-                index: 6,
-                urn: error::UrnPrefix::Optional,
-            })
-        );
-        assert_eq!(
-            Uuid::parse_str("67e550-4105b1426f9247bb680e5fe0c")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidGroupLength {
-                expected: error::ExpectedLength::Exact(8),
-                found: 6,
-                group: 0,
-            })
-        );
-        assert_eq!(
-            Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF1-02BF39FA1E4")
-                .map_err(crate::Error::expect_parser),
-            Err(Error::InvalidGroupLength {
-                expected: error::ExpectedLength::Exact(4),
-                found: 5,
-                group: 3,
-            })
-        );
-    }
-}
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! [`Uuid`] parsing constructs and utilities.
+//!
+//! [`Uuid`]: ../struct.Uuid.html
+
+pub(crate) mod error;
+pub(crate) use self::error::Error;
+
+use crate::{adapter, Uuid};
+
+/// Check if the length matches any of the given criteria lengths.
+fn len_matches_any(len: usize, crits: &[usize]) -> bool {
+    for crit in crits {
+        if len == *crit {
+            return true;
+        }
+    }
+
+    false
+}
+
+/// Check if the length matches any criteria lengths in the given range
+/// (inclusive).
+#[allow(dead_code)]
+fn len_matches_range(len: usize, min: usize, max: usize) -> bool {
+    for crit in min..=max {
+        if len == crit {
+            return true;
+        }
+    }
+
+    false
+}
+
+// Accumulated length of each hyphenated group in hex digits.
+const ACC_GROUP_LENS: [usize; 5] = [8, 12, 16, 20, 32];
+
+// Length of each hyphenated group in hex digits.
+const GROUP_LENS: [usize; 5] = [8, 4, 4, 4, 12];
+
+impl Uuid {
+    /// Parses a `Uuid` from a string of hexadecimal digits with optional
+    /// hyphens.
+    ///
+    /// Any of the formats generated by this module (simple, hyphenated, urn)
+    /// are supported by this parsing function.
+    pub fn parse_str(mut input: &str) -> Result<Uuid, crate::Error> {
+        // Ensure length is valid for any of the supported formats
+        let len = input.len();
+
+        if len == adapter::Urn::LENGTH && input.starts_with("urn:uuid:") {
+            input = &input[9..];
+        } else if !len_matches_any(
+            len,
+            &[adapter::Hyphenated::LENGTH, adapter::Simple::LENGTH],
+        ) {
+            Err(Error::InvalidLength {
+                expected: error::ExpectedLength::Any(&[
+                    adapter::Hyphenated::LENGTH,
+                    adapter::Simple::LENGTH,
+                ]),
+                found: len,
+            })?;
+        }
+
+        // `digit` counts only hexadecimal digits, `i_char` counts all chars.
+        let mut digit = 0;
+        let mut group = 0;
+        let mut acc = 0;
+        let mut buffer = [0u8; 16];
+
+        for (i_char, chr) in input.bytes().enumerate() {
+            if digit as usize >= adapter::Simple::LENGTH && group != 4 {
+                if group == 0 {
+                    Err(Error::InvalidLength {
+                        expected: error::ExpectedLength::Any(&[
+                            adapter::Hyphenated::LENGTH,
+                            adapter::Simple::LENGTH,
+                        ]),
+                        found: len,
+                    })?;
+                }
+
+                Err(Error::InvalidGroupCount {
+                    expected: error::ExpectedLength::Any(&[1, 5]),
+                    found: group + 1,
+                })?;
+            }
+
+            if digit % 2 == 0 {
+                // First digit of the byte.
+                match chr {
+                    // Calulate upper half.
+                    b'0'..=b'9' => acc = chr - b'0',
+                    b'a'..=b'f' => acc = chr - b'a' + 10,
+                    b'A'..=b'F' => acc = chr - b'A' + 10,
+                    // Found a group delimiter
+                    b'-' => {
+                        // TODO: remove the u8 cast
+                        // BODY: this only needed until we switch to
+                        //       ParseError
+                        if ACC_GROUP_LENS[group] as u8 != digit {
+                            // Calculate how many digits this group consists of
+                            // in the input.
+                            let found = if group > 0 {
+                                // TODO: remove the u8 cast
+                                // BODY: this only needed until we switch to
+                                //       ParseError
+                                digit - ACC_GROUP_LENS[group - 1] as u8
+                            } else {
+                                digit
+                            };
+
+                            Err(Error::InvalidGroupLength {
+                                expected: error::ExpectedLength::Exact(
+                                    GROUP_LENS[group],
+                                ),
+                                found: found as usize,
+                                group,
+                            })?;
+                        }
+                        // Next group, decrement digit, it is incremented again
+                        // at the bottom.
+                        group += 1;
+                        digit -= 1;
+                    }
+                    _ => {
+                        Err(Error::InvalidCharacter {
+                            expected: "0123456789abcdefABCDEF-",
+                            found: input[i_char..].chars().next().unwrap(),
+                            index: i_char,
+                            urn: error::UrnPrefix::Optional,
+                        })?;
+                    }
+                }
+            } else {
+                // Second digit of the byte, shift the upper half.
+                acc *= 16;
+                match chr {
+                    b'0'..=b'9' => acc += chr - b'0',
+                    b'a'..=b'f' => acc += chr - b'a' + 10,
+                    b'A'..=b'F' => acc += chr - b'A' + 10,
+                    b'-' => {
+                        // The byte isn't complete yet.
+                        let found = if group > 0 {
+                            // TODO: remove the u8 cast
+                            // BODY: this only needed until we switch to
+                            //       ParseError
+                            digit - ACC_GROUP_LENS[group - 1] as u8
+                        } else {
+                            digit
+                        };
+
+                        Err(Error::InvalidGroupLength {
+                            expected: error::ExpectedLength::Exact(
+                                GROUP_LENS[group],
+                            ),
+                            found: found as usize,
+                            group,
+                        })?;
+                    }
+                    _ => {
+                        Err(Error::InvalidCharacter {
+                            expected: "0123456789abcdefABCDEF-",
+                            found: input[i_char..].chars().next().unwrap(),
+                            index: i_char,
+                            urn: error::UrnPrefix::Optional,
+                        })?;
+                    }
+                }
+                buffer[(digit / 2) as usize] = acc;
+            }
+            digit += 1;
+        }
+
+        // Now check the last group.
+        // TODO: remove the u8 cast
+        // BODY: this only needed until we switch to
+        //       ParseError
+        if ACC_GROUP_LENS[4] as u8 != digit {
+            Err(Error::InvalidGroupLength {
+                expected: error::ExpectedLength::Exact(GROUP_LENS[4]),
+                found: (digit as usize - ACC_GROUP_LENS[3]),
+                group,
+            })?;
+        }
+
+        Ok(Uuid::from_bytes(buffer))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{adapter, std::string::ToString, test_util};
+
+    #[test]
+    fn test_parse_uuid_v4() {
+        const EXPECTED_UUID_LENGTHS: error::ExpectedLength =
+            error::ExpectedLength::Any(&[
+                adapter::Hyphenated::LENGTH,
+                adapter::Simple::LENGTH,
+            ]);
+
+        const EXPECTED_GROUP_COUNTS: error::ExpectedLength =
+            error::ExpectedLength::Any(&[1, 5]);
+
+        const EXPECTED_CHARS: &'static str = "0123456789abcdefABCDEF-";
+
+        // Invalid
+        assert_eq!(
+            Uuid::parse_str("").map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 0,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("!").map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 1
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E45")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 37,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2-4faa-BBF-329BF39FA1E4")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 35
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2-4faa-BGBF-329BF39FA1E4")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidCharacter {
+                expected: EXPECTED_CHARS,
+                found: 'G',
+                index: 20,
+                urn: error::UrnPrefix::Optional,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2F4faaFB6BFF329BF39FA1E4")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidGroupCount {
+                expected: EXPECTED_GROUP_COUNTS,
+                found: 2
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2-4faaFB6BFF329BF39FA1E4")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidGroupCount {
+                expected: EXPECTED_GROUP_COUNTS,
+                found: 3,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2-4faa-B6BFF329BF39FA1E4")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidGroupCount {
+                expected: EXPECTED_GROUP_COUNTS,
+                found: 4,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2-4faa")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 18,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2-4faaXB6BFF329BF39FA1E4")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidCharacter {
+                expected: EXPECTED_CHARS,
+                found: 'X',
+                index: 18,
+                urn: error::UrnPrefix::Optional,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB-24fa-eB6BFF32-BF39FA1E4")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidGroupLength {
+                expected: error::ExpectedLength::Exact(4),
+                found: 3,
+                group: 1,
+            })
+        );
+        // (group, found, expecting)
+        //
+        assert_eq!(
+            Uuid::parse_str("01020304-1112-2122-3132-41424344")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidGroupLength {
+                expected: error::ExpectedLength::Exact(12),
+                found: 8,
+                group: 4,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 31,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c88")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 33,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("67e5504410b1426f9247bb680e5fe0cg8")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 33,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("67e5504410b1426%9247bb680e5fe0c8")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidCharacter {
+                expected: EXPECTED_CHARS,
+                found: '%',
+                index: 15,
+                urn: error::UrnPrefix::Optional,
+            })
+        );
+
+        assert_eq!(
+            Uuid::parse_str("231231212212423424324323477343246663")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 36,
+            })
+        );
+
+        // Valid
+        assert!(Uuid::parse_str("00000000000000000000000000000000").is_ok());
+        assert!(Uuid::parse_str("67e55044-10b1-426f-9247-bb680e5fe0c8").is_ok());
+        assert!(Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4").is_ok());
+        assert!(Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c8").is_ok());
+        assert!(Uuid::parse_str("01020304-1112-2122-3132-414243444546").is_ok());
+        assert!(Uuid::parse_str(
+            "urn:uuid:67e55044-10b1-426f-9247-bb680e5fe0c8"
+        )
+        .is_ok());
+
+        // Nil
+        let nil = Uuid::nil();
+        assert_eq!(
+            Uuid::parse_str("00000000000000000000000000000000").unwrap(),
+            nil
+        );
+        assert_eq!(
+            Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap(),
+            nil
+        );
+
+        // Round-trip
+        let uuid_orig = test_util::new();
+        let orig_str = uuid_orig.to_string();
+        let uuid_out = Uuid::parse_str(&orig_str).unwrap();
+        assert_eq!(uuid_orig, uuid_out);
+
+        // Test error reporting
+        assert_eq!(
+            Uuid::parse_str("67e5504410b1426f9247bb680e5fe0c")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidLength {
+                expected: EXPECTED_UUID_LENGTHS,
+                found: 31,
+            })
+        );
+        assert_eq!(
+            Uuid::parse_str("67e550X410b1426f9247bb680e5fe0cd")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidCharacter {
+                expected: EXPECTED_CHARS,
+                found: 'X',
+                index: 6,
+                urn: error::UrnPrefix::Optional,
+            })
+        );
+        assert_eq!(
+            Uuid::parse_str("67e550-4105b1426f9247bb680e5fe0c")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidGroupLength {
+                expected: error::ExpectedLength::Exact(8),
+                found: 6,
+                group: 0,
+            })
+        );
+        assert_eq!(
+            Uuid::parse_str("F9168C5E-CEB2-4faa-B6BF1-02BF39FA1E4")
+                .map_err(crate::Error::expect_parser),
+            Err(Error::InvalidGroupLength {
+                expected: error::ExpectedLength::Exact(4),
+                found: 5,
+                group: 3,
+            })
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/prelude.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/prelude.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/prelude.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/prelude.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,47 +1,47 @@
-// Copyright 2013-2014 The Rust Project Developers.
-// Copyright 2018 The Uuid Project Developers.
-//
-// See the COPYRIGHT file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The [`uuid`] prelude.
-//!
-//! This module contains the most important items of the [`uuid`] crate.
-//!
-//! To use the prelude, include the following in your crate root:
-//!
-//! ```rust
-//! extern crate uuid;
-//! ```
-//!
-//! # Prelude Contents
-//!
-//! Currently the prelude reexports the following:
-//!
-//! [`uuid`]`::{`[`Error`], [`Uuid`], [`Variant`], [`Version`],
-//! builder::[`Builder`]`}`: The fundamental types used in [`uuid`] crate.
-//!
-//! [`uuid`]: ../index.html
-//! [`Error`]: ../enum.Error.html
-//! [`Uuid`]: ../struct.Uuid.html
-//! [`Variant`]: ../enum.Variant.html
-//! [`Version`]: ../enum.Version.html
-//! [`Builder`]: ../builder/struct.Builder.html
-//!
-#![cfg_attr(feature = "v1",
-doc = "
-[`uuid::v1`]`::{`[`ClockSequence`],[`Context`]`}`: The types useful for
-handling uuid version 1. Requires feature `v1`.
-
-[`uuid::v1`]: ../v1/index.html
-[`Context`]: ../v1/struct.Context.html
-[`ClockSequence`]: ../v1/trait.ClockSequence.html")]
-
-pub use super::{Builder, Bytes, Error, Uuid, Variant, Version};
-#[cfg(feature = "v1")]
-pub use crate::v1::{ClockSequence, Context};
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The [`uuid`] prelude.
+//!
+//! This module contains the most important items of the [`uuid`] crate.
+//!
+//! To use the prelude, include the following in your crate root:
+//!
+//! ```rust
+//! extern crate uuid;
+//! ```
+//!
+//! # Prelude Contents
+//!
+//! Currently the prelude reexports the following:
+//!
+//! [`uuid`]`::{`[`Error`], [`Uuid`], [`Variant`], [`Version`],
+//! builder::[`Builder`]`}`: The fundamental types used in [`uuid`] crate.
+//!
+//! [`uuid`]: ../index.html
+//! [`Error`]: ../enum.Error.html
+//! [`Uuid`]: ../struct.Uuid.html
+//! [`Variant`]: ../enum.Variant.html
+//! [`Version`]: ../enum.Version.html
+//! [`Builder`]: ../builder/struct.Builder.html
+//!
+#![cfg_attr(feature = "v1",
+doc = "
+[`uuid::v1`]`::{`[`ClockSequence`],[`Context`]`}`: The types useful for
+handling uuid version 1. Requires feature `v1`.
+
+[`uuid::v1`]: ../v1/index.html
+[`Context`]: ../v1/struct.Context.html
+[`ClockSequence`]: ../v1/trait.ClockSequence.html")]
+
+pub use super::{Builder, Bytes, Error, Uuid, Variant, Version};
+#[cfg(feature = "v1")]
+pub use crate::v1::{ClockSequence, Context};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/serde_support.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/serde_support.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/serde_support.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/serde_support.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,120 +1,125 @@
-// Copyright 2013-2014 The Rust Project Developers.
-// Copyright 2018 The Uuid Project Developers.
-//
-// See the COPYRIGHT file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::prelude::*;
-use core::fmt;
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
-
-#[cfg(feature = "serde")]
-impl Serialize for Uuid {
-    fn serialize<S: Serializer>(
-        &self,
-        serializer: S,
-    ) -> Result<S::Ok, S::Error> {
-        if serializer.is_human_readable() {
-            serializer
-                .serialize_str(&self.to_hyphenated().encode_lower(&mut [0; 36]))
-        } else {
-            serializer.serialize_bytes(self.as_bytes())
-        }
-    }
-}
-
-#[cfg(feature = "serde")]
-impl<'de> Deserialize<'de> for Uuid {
-    fn deserialize<D: Deserializer<'de>>(
-        deserializer: D,
-    ) -> Result<Self, D::Error> {
-        if deserializer.is_human_readable() {
-            struct UuidStringVisitor;
-
-            impl<'vi> de::Visitor<'vi> for UuidStringVisitor {
-                type Value = Uuid;
-
-                fn expecting(
-                    &self,
-                    formatter: &mut fmt::Formatter<'_>,
-                ) -> fmt::Result {
-                    write!(formatter, "a UUID string")
-                }
-
-                fn visit_str<E: de::Error>(
-                    self,
-                    value: &str,
-                ) -> Result<Uuid, E> {
-                    value.parse::<Uuid>().map_err(E::custom)
-                }
-
-                fn visit_bytes<E: de::Error>(
-                    self,
-                    value: &[u8],
-                ) -> Result<Uuid, E> {
-                    Uuid::from_slice(value).map_err(E::custom)
-                }
-            }
-
-            deserializer.deserialize_str(UuidStringVisitor)
-        } else {
-            struct UuidBytesVisitor;
-
-            impl<'vi> de::Visitor<'vi> for UuidBytesVisitor {
-                type Value = Uuid;
-
-                fn expecting(
-                    &self,
-                    formatter: &mut fmt::Formatter<'_>,
-                ) -> fmt::Result {
-                    write!(formatter, "bytes")
-                }
-
-                fn visit_bytes<E: de::Error>(
-                    self,
-                    value: &[u8],
-                ) -> Result<Uuid, E> {
-                    Uuid::from_slice(value).map_err(E::custom)
-                }
-            }
-
-            deserializer.deserialize_bytes(UuidBytesVisitor)
-        }
-    }
-}
-
-#[cfg(all(test, feature = "serde"))]
-mod serde_tests {
-    use serde_test;
-
-    use crate::prelude::*;
-
-    #[test]
-    fn test_serialize_readable() {
-        use serde_test::Configure;
-
-        let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4";
-        let u = Uuid::parse_str(uuid_str).unwrap();
-        serde_test::assert_tokens(
-            &u.readable(),
-            &[serde_test::Token::Str(uuid_str)],
-        );
-    }
-
-    #[test]
-    fn test_serialize_compact() {
-        use serde_test::Configure;
-
-        let uuid_bytes = b"F9168C5E-CEB2-4F";
-        let u = Uuid::from_slice(uuid_bytes).unwrap();
-        serde_test::assert_tokens(
-            &u.compact(),
-            &[serde_test::Token::Bytes(uuid_bytes)],
-        );
-    }
-}
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::prelude::*;
+use core::fmt;
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+
+impl Serialize for Uuid {
+    fn serialize<S: Serializer>(
+        &self,
+        serializer: S,
+    ) -> Result<S::Ok, S::Error> {
+        if serializer.is_human_readable() {
+            serializer
+                .serialize_str(&self.to_hyphenated().encode_lower(&mut [0; 36]))
+        } else {
+            serializer.serialize_bytes(self.as_bytes())
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for Uuid {
+    fn deserialize<D: Deserializer<'de>>(
+        deserializer: D,
+    ) -> Result<Self, D::Error> {
+        fn de_error<E: de::Error>(e: crate::Error) -> E {
+            E::custom(format_args!("UUID parsing failed: {}", e))
+        }
+
+        if deserializer.is_human_readable() {
+            struct UuidStringVisitor;
+
+            impl<'vi> de::Visitor<'vi> for UuidStringVisitor {
+                type Value = Uuid;
+
+                fn expecting(
+                    &self,
+                    formatter: &mut fmt::Formatter<'_>,
+                ) -> fmt::Result {
+                    write!(formatter, "a UUID string")
+                }
+
+                fn visit_str<E: de::Error>(
+                    self,
+                    value: &str,
+                ) -> Result<Uuid, E> {
+                    value.parse::<Uuid>().map_err(de_error)
+                }
+
+                fn visit_bytes<E: de::Error>(
+                    self,
+                    value: &[u8],
+                ) -> Result<Uuid, E> {
+                    Uuid::from_slice(value).map_err(de_error)
+                }
+            }
+
+            deserializer.deserialize_str(UuidStringVisitor)
+        } else {
+            struct UuidBytesVisitor;
+
+            impl<'vi> de::Visitor<'vi> for UuidBytesVisitor {
+                type Value = Uuid;
+
+                fn expecting(
+                    &self,
+                    formatter: &mut fmt::Formatter<'_>,
+                ) -> fmt::Result {
+                    write!(formatter, "bytes")
+                }
+
+                fn visit_bytes<E: de::Error>(
+                    self,
+                    value: &[u8],
+                ) -> Result<Uuid, E> {
+                    Uuid::from_slice(value).map_err(de_error)
+                }
+            }
+
+            deserializer.deserialize_bytes(UuidBytesVisitor)
+        }
+    }
+}
+
+#[cfg(test)]
+mod serde_tests {
+    use serde_test::{Compact, Configure, Readable, Token};
+
+    use crate::prelude::*;
+
+    #[test]
+    fn test_serialize_readable() {
+        let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4";
+        let u = Uuid::parse_str(uuid_str).unwrap();
+        serde_test::assert_tokens(&u.readable(), &[Token::Str(uuid_str)]);
+    }
+
+    #[test]
+    fn test_serialize_compact() {
+        let uuid_bytes = b"F9168C5E-CEB2-4F";
+        let u = Uuid::from_slice(uuid_bytes).unwrap();
+        serde_test::assert_tokens(&u.compact(), &[Token::Bytes(uuid_bytes)]);
+    }
+
+    #[test]
+    fn test_de_failure() {
+        serde_test::assert_de_tokens_error::<Readable<Uuid>>(
+            &[Token::Str("hello_world")],
+            "UUID parsing failed: invalid length: expected one of [36, 32], found 11",
+        );
+
+        serde_test::assert_de_tokens_error::<Compact<Uuid>>(
+            &[Token::Bytes(b"hello_world")],
+            "UUID parsing failed: invalid bytes length: expected 16, found 11",
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/slog_support.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/slog_support.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/slog_support.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/slog_support.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,39 +1,39 @@
-// Copyright 2013-2014 The Rust Project Developers.
-// Copyright 2018 The Uuid Project Developers.
-//
-// See the COPYRIGHT file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::prelude::*;
-use slog;
-
-impl slog::Value for Uuid {
-    fn serialize(
-        &self,
-        _: &slog::Record<'_>,
-        key: slog::Key,
-        serializer: &mut dyn slog::Serializer,
-    ) -> Result<(), slog::Error> {
-        serializer.emit_arguments(key, &format_args!("{}", self))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    #[test]
-    fn test_slog_kv() {
-        use crate::test_util;
-        use slog;
-        use slog::{crit, Drain};
-
-        let root = slog::Logger::root(slog::Discard.fuse(), slog::o!());
-        let u1 = test_util::new();
-        crit!(root, "test"; "u1" => u1);
-    }
-}
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::prelude::*;
+use slog;
+
+impl slog::Value for Uuid {
+    fn serialize(
+        &self,
+        _: &slog::Record<'_>,
+        key: slog::Key,
+        serializer: &mut dyn slog::Serializer,
+    ) -> Result<(), slog::Error> {
+        serializer.emit_arguments(key, &format_args!("{}", self))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    #[test]
+    fn test_slog_kv() {
+        use crate::test_util;
+        use slog;
+        use slog::{crit, Drain};
+
+        let root = slog::Logger::root(slog::Discard.fuse(), slog::o!());
+        let u1 = test_util::new();
+        crit!(root, "test"; "u1" => u1);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/test_util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/test_util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/test_util.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/test_util.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,26 @@
-// Copyright 2013-2014 The Rust Project Developers.
-// Copyright 2018 The Uuid Project Developers.
-//
-// See the COPYRIGHT file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::prelude::*;
-
-pub const fn new() -> Uuid {
-    Uuid::from_bytes([
-        0xF9, 0x16, 0x8C, 0x5E, 0xCE, 0xB2, 0x4F, 0xAA, 0xB6, 0xBF, 0x32, 0x9B,
-        0xF3, 0x9F, 0xA1, 0xE4,
-    ])
-}
-
-pub const fn new2() -> Uuid {
-    Uuid::from_bytes([
-        0xF9, 0x16, 0x8C, 0x5E, 0xCE, 0xB2, 0x4F, 0xAB, 0xB6, 0xBF, 0x32, 0x9B,
-        0xF3, 0x9F, 0xA1, 0xE4,
-    ])
-}
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::prelude::*;
+
+pub const fn new() -> Uuid {
+    Uuid::from_bytes([
+        0xF9, 0x16, 0x8C, 0x5E, 0xCE, 0xB2, 0x4F, 0xAA, 0xB6, 0xBF, 0x32, 0x9B,
+        0xF3, 0x9F, 0xA1, 0xE4,
+    ])
+}
+
+pub const fn new2() -> Uuid {
+    Uuid::from_bytes([
+        0xF9, 0x16, 0x8C, 0x5E, 0xCE, 0xB2, 0x4F, 0xAB, 0xB6, 0xBF, 0x32, 0x9B,
+        0xF3, 0x9F, 0xA1, 0xE4,
+    ])
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/v1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/v1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/v1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/v1.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,325 +1,326 @@
-//! The implementation for Version 1 UUIDs.
-//!
-//! Note that you need feature `v1` in order to use these features.
-
-use crate::prelude::*;
-use core::sync::atomic;
-
-/// The number of 100 ns ticks between the UUID epoch
-/// `1582-10-15 00:00:00` and the Unix epoch `1970-01-01 00:00:00`.
-const UUID_TICKS_BETWEEN_EPOCHS: u64 = 0x01B2_1DD2_1381_4000;
-
-/// A thread-safe, stateful context for the v1 generator to help ensure
-/// process-wide uniqueness.
-#[derive(Debug)]
-pub struct Context {
-    count: atomic::AtomicUsize,
-}
-
-/// Stores the number of nanoseconds from an epoch and a counter for ensuring
-/// V1 ids generated on the same host are unique.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct Timestamp {
-    ticks: u64,
-    counter: u16,
-}
-
-impl Timestamp {
-    /// Construct a `Timestamp` from its raw component values: an RFC4122
-    /// timestamp and counter.
-    ///
-    /// RFC4122, which defines the V1 UUID, specifies a 60-byte timestamp format
-    /// as the number of 100-nanosecond intervals elapsed since 00:00:00.00,
-    /// 15 Oct 1582, "the date of the Gregorian reform of the Christian
-    /// calendar."
-    ///
-    /// The counter value is used to differentiate between ids generated by
-    /// the same host computer in rapid succession (i.e. with the same observed
-    /// time). See the [`ClockSequence`] trait for a generic interface to any
-    /// counter generators that might be used.
-    ///
-    /// Internally, the timestamp is stored as a `u64`. For this reason, dates
-    /// prior to October 1582 are not supported.
-    ///
-    /// [`ClockSequence`]: trait.ClockSequence.html
-    pub const fn from_rfc4122(ticks: u64, counter: u16) -> Self {
-        Timestamp { ticks, counter }
-    }
-
-    /// Construct a `Timestamp` from a unix timestamp and sequence-generating
-    /// `context`.
-    ///
-    /// A unix timestamp represents the elapsed time since Jan 1 1970. Libc's
-    /// `clock_gettime` and other popular implementations traditionally
-    /// represent this duration as a `timespec`: a struct with `u64` and
-    /// `u32` fields representing the seconds, and "subsecond" or fractional
-    /// nanoseconds elapsed since the timestamp's second began,
-    /// respectively.
-    ///
-    /// This constructs a `Timestamp` from the seconds and fractional
-    /// nanoseconds of a unix timestamp, converting the duration since 1970
-    /// into the number of 100-nanosecond intervals since 00:00:00.00, 15
-    /// Oct 1982 specified by RFC4122 and used internally by `Timestamp`.
-    ///
-    /// The function is not guaranteed to produce monotonically increasing
-    /// values however. There is a slight possibility that two successive
-    /// equal time values could be supplied and the sequence counter wraps back
-    /// over to 0.
-    ///
-    /// If uniqueness and monotonicity is required, the user is responsible for
-    /// ensuring that the time value always increases between calls (including
-    /// between restarts of the process and device).
-    pub fn from_unix(
-        context: impl ClockSequence,
-        seconds: u64,
-        subsec_nanos: u32,
-    ) -> Self {
-        let counter = context.generate_sequence(seconds, subsec_nanos);
-        let ticks = UUID_TICKS_BETWEEN_EPOCHS
-            + seconds * 10_000_000
-            + (subsec_nanos as u64 / 100);
-        Timestamp { ticks, counter }
-    }
-
-    /// Returns the raw RFC4122 timestamp and counter values stored by the
-    /// `Timestamp`.
-    ///
-    /// The timestamp (the first, `u64` element in the tuple) represents the
-    /// number of 100-nanosecond intervals since 00:00:00.00, 15 Oct 1582.
-    /// The counter is used to differentiate between ids generated on the
-    /// same host computer with the same observed time.
-    pub const fn to_rfc4122(&self) -> (u64, u16) {
-        (self.ticks, self.counter)
-    }
-
-    /// Returns the timestamp converted to the seconds and fractional
-    /// nanoseconds since Jan 1 1970.
-    ///
-    /// Internally, the time is stored in 100-nanosecond intervals,
-    /// thus the maximum precision represented by the fractional nanoseconds
-    /// value is less than its unit size (100 ns vs. 1 ns).
-    pub const fn to_unix(&self) -> (u64, u32) {
-        let unix_ticks = self.ticks - UUID_TICKS_BETWEEN_EPOCHS;
-        (
-            unix_ticks / 10_000_000,
-            (unix_ticks % 10_000_000) as u32 * 100,
-        )
-    }
-
-    /// Returns the timestamp converted into nanoseconds elapsed since Jan 1
-    /// 1970. Internally, the time is stored in 100-nanosecond intervals,
-    /// thus the maximum precision represented is less than the units it is
-    /// measured in (100 ns vs. 1 ns). The value returned represents the
-    /// same duration as [`Timestamp::to_unix`]; this provides it in nanosecond
-    /// units for convenience.
-    pub const fn to_unix_nanos(&self) -> u64 {
-        (self.ticks - UUID_TICKS_BETWEEN_EPOCHS) * 100
-    }
-}
-
-/// A trait that abstracts over generation of UUID v1 "Clock Sequence" values.
-pub trait ClockSequence {
-    /// Return a 16-bit number that will be used as the "clock sequence" in
-    /// the UUID. The number must be different if the time has changed since
-    /// the last time a clock sequence was requested.
-    fn generate_sequence(&self, seconds: u64, subsec_nanos: u32) -> u16;
-}
-
-impl<'a, T: ClockSequence + ?Sized> ClockSequence for &'a T {
-    fn generate_sequence(&self, seconds: u64, subsec_nanos: u32) -> u16 {
-        (**self).generate_sequence(seconds, subsec_nanos)
-    }
-}
-
-impl Uuid {
-    /// Create a new UUID (version 1) using a time value + sequence +
-    /// *NodeId*.
-    ///
-    /// When generating [`Timestamp`]s using a [`ClockSequence`], this function
-    /// is only guaranteed to produce unique values if the following conditions
-    /// hold:
-    ///
-    /// 1. The *NodeId* is unique for this process,
-    /// 2. The *Context* is shared across all threads which are generating v1
-    ///    UUIDs,
-    /// 3. The [`ClockSequence`] implementation reliably returns unique
-    ///    clock sequences (this crate provides [`Context`] for this
-    ///    purpose. However you can create your own [`ClockSequence`]
-    ///    implementation, if [`Context`] does not meet your needs).
-    ///
-    /// The NodeID must be exactly 6 bytes long.
-    ///
-    /// Note that usage of this method requires the `v1` feature of this crate
-    /// to be enabled.
-    ///
-    /// # Examples
-    ///
-    /// A UUID can be created from a unix [`Timestamp`] with a
-    /// [`ClockSequence`]:
-    ///
-    /// ```rust
-    /// use uuid::v1::{Timestamp, Context};
-    /// use uuid::Uuid;
-    ///
-    /// let context = Context::new(42);
-    /// let ts = Timestamp::from_unix(&context, 1497624119, 1234);
-    /// let uuid = Uuid::new_v1(ts, &[1, 2, 3, 4, 5, 6]).expect("failed to generate UUID");
-    ///
-    /// assert_eq!(
-    ///     uuid.to_hyphenated().to_string(),
-    ///     "f3b4958c-52a1-11e7-802a-010203040506"
-    /// );
-    /// ```
-    ///
-    /// The timestamp can also be created manually as per RFC4122:
-    ///
-    /// ```
-    /// use uuid::v1::{Timestamp, Context};
-    /// use uuid::Uuid;
-    ///
-    /// let context = Context::new(42);
-    /// let ts = Timestamp::from_rfc4122(1497624119, 0);
-    /// let uuid = Uuid::new_v1(ts, &[1, 2, 3, 4, 5, 6]).expect("failed to generate UUID");
-    ///
-    /// assert_eq!(
-    ///     uuid.to_hyphenated().to_string(),
-    ///     "5943ee37-0000-1000-8000-010203040506"
-    /// );
-    /// ```
-    ///
-    /// [`Timestamp`]: v1/struct.Timestamp.html
-    /// [`ClockSequence`]: v1/struct.ClockSequence.html
-    /// [`Context`]: v1/struct.Context.html
-    pub fn new_v1(ts: Timestamp, node_id: &[u8]) -> Result<Self, crate::Error> {
-        const NODE_ID_LEN: usize = 6;
-
-        let len = node_id.len();
-        if len != NODE_ID_LEN {
-            Err(crate::builder::Error::new(NODE_ID_LEN, len))?;
-        }
-
-        let time_low = (ts.ticks & 0xFFFF_FFFF) as u32;
-        let time_mid = ((ts.ticks >> 32) & 0xFFFF) as u16;
-        let time_high_and_version =
-            (((ts.ticks >> 48) & 0x0FFF) as u16) | (1 << 12);
-
-        let mut d4 = [0; 8];
-
-        {
-            d4[0] = (((ts.counter & 0x3F00) >> 8) as u8) | 0x80;
-            d4[1] = (ts.counter & 0xFF) as u8;
-        }
-
-        d4[2..].copy_from_slice(node_id);
-
-        Uuid::from_fields(time_low, time_mid, time_high_and_version, &d4)
-    }
-
-    /// Returns an optional [`Timestamp`] storing the timestamp and
-    /// counter portion parsed from a V1 UUID.
-    ///
-    /// Returns `None` if the supplied UUID is not V1.
-    ///
-    /// The V1 timestamp format defined in RFC4122 specifies a 60-bit
-    /// integer representing the number of 100-nanosecond intervals
-    /// since 00:00:00.00, 15 Oct 1582.
-    ///
-    /// [`Timestamp`] offers several options for converting the raw RFC4122
-    /// value into more commonly-used formats, such as a unix timestamp.
-    ///
-    /// [`Timestamp`]: v1/struct.Timestamp.html
-    pub fn to_timestamp(&self) -> Option<Timestamp> {
-        if self
-            .get_version()
-            .map(|v| v != Version::Mac)
-            .unwrap_or(true)
-        {
-            return None;
-        }
-
-        let ticks: u64 = u64::from(self.as_bytes()[6] & 0x0F) << 56
-            | u64::from(self.as_bytes()[7]) << 48
-            | u64::from(self.as_bytes()[4]) << 40
-            | u64::from(self.as_bytes()[5]) << 32
-            | u64::from(self.as_bytes()[0]) << 24
-            | u64::from(self.as_bytes()[1]) << 16
-            | u64::from(self.as_bytes()[2]) << 8
-            | u64::from(self.as_bytes()[3]);
-
-        let counter: u16 = u16::from(self.as_bytes()[8] & 0x3F) << 8
-            | u16::from(self.as_bytes()[9]);
-
-        Some(Timestamp::from_rfc4122(ticks, counter))
-    }
-}
-
-impl Context {
-    /// Creates a thread-safe, internally mutable context to help ensure
-    /// uniqueness.
-    ///
-    /// This is a context which can be shared across threads. It maintains an
-    /// internal counter that is incremented at every request, the value ends
-    /// up in the clock_seq portion of the UUID (the fourth group). This
-    /// will improve the probability that the UUID is unique across the
-    /// process.
-    pub const fn new(count: u16) -> Self {
-        Self {
-            count: atomic::AtomicUsize::new(count as usize),
-        }
-    }
-}
-
-impl ClockSequence for Context {
-    fn generate_sequence(&self, _: u64, _: u32) -> u16 {
-        (self.count.fetch_add(1, atomic::Ordering::SeqCst) & 0xffff) as u16
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::std::string::ToString;
-
-    #[test]
-    fn test_new_v1() {
-        let time: u64 = 1_496_854_535;
-        let time_fraction: u32 = 812_946_000;
-        let node = [1, 2, 3, 4, 5, 6];
-        let context = Context::new(0);
-
-        {
-            let uuid = Uuid::new_v1(
-                Timestamp::from_unix(&context, time, time_fraction),
-                &node,
-            )
-            .unwrap();
-
-            assert_eq!(uuid.get_version(), Some(Version::Mac));
-            assert_eq!(uuid.get_variant(), Some(Variant::RFC4122));
-            assert_eq!(
-                uuid.to_hyphenated().to_string(),
-                "20616934-4ba2-11e7-8000-010203040506"
-            );
-
-            let ts = uuid.to_timestamp().unwrap().to_rfc4122();
-
-            assert_eq!(ts.0 - 0x01B2_1DD2_1381_4000, 14_968_545_358_129_460);
-            assert_eq!(ts.1, 0);
-        };
-
-        {
-            let uuid2 = Uuid::new_v1(
-                Timestamp::from_unix(&context, time, time_fraction),
-                &node,
-            )
-            .unwrap();
-
-            assert_eq!(
-                uuid2.to_hyphenated().to_string(),
-                "20616934-4ba2-11e7-8001-010203040506"
-            );
-            assert_eq!(uuid2.to_timestamp().unwrap().to_rfc4122().1, 1)
-        };
-    }
-}
+//! The implementation for Version 1 UUIDs.
+//!
+//! Note that you need feature `v1` in order to use these features.
+
+use crate::prelude::*;
+use core::sync::atomic;
+
+/// The number of 100 ns ticks between the UUID epoch
+/// `1582-10-15 00:00:00` and the Unix epoch `1970-01-01 00:00:00`.
+const UUID_TICKS_BETWEEN_EPOCHS: u64 = 0x01B2_1DD2_1381_4000;
+
+/// A thread-safe, stateful context for the v1 generator to help ensure
+/// process-wide uniqueness.
+#[derive(Debug)]
+pub struct Context {
+    count: atomic::AtomicUsize,
+}
+
+/// Stores the number of nanoseconds from an epoch and a counter for ensuring
+/// V1 ids generated on the same host are unique.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct Timestamp {
+    ticks: u64,
+    counter: u16,
+}
+
+impl Timestamp {
+    /// Construct a `Timestamp` from its raw component values: an RFC4122
+    /// timestamp and counter.
+    ///
+    /// RFC4122, which defines the V1 UUID, specifies a 60-byte timestamp format
+    /// as the number of 100-nanosecond intervals elapsed since 00:00:00.00,
+    /// 15 Oct 1582, "the date of the Gregorian reform of the Christian
+    /// calendar."
+    ///
+    /// The counter value is used to differentiate between ids generated by
+    /// the same host computer in rapid succession (i.e. with the same observed
+    /// time). See the [`ClockSequence`] trait for a generic interface to any
+    /// counter generators that might be used.
+    ///
+    /// Internally, the timestamp is stored as a `u64`. For this reason, dates
+    /// prior to October 1582 are not supported.
+    ///
+    /// [`ClockSequence`]: trait.ClockSequence.html
+    pub const fn from_rfc4122(ticks: u64, counter: u16) -> Self {
+        Timestamp { ticks, counter }
+    }
+
+    /// Construct a `Timestamp` from a unix timestamp and sequence-generating
+    /// `context`.
+    ///
+    /// A unix timestamp represents the elapsed time since Jan 1 1970. Libc's
+    /// `clock_gettime` and other popular implementations traditionally
+    /// represent this duration as a `timespec`: a struct with `u64` and
+    /// `u32` fields representing the seconds, and "subsecond" or fractional
+    /// nanoseconds elapsed since the timestamp's second began,
+    /// respectively.
+    ///
+    /// This constructs a `Timestamp` from the seconds and fractional
+    /// nanoseconds of a unix timestamp, converting the duration since 1970
+    /// into the number of 100-nanosecond intervals since 00:00:00.00, 15
+    /// Oct 1582 specified by RFC4122 and used internally by `Timestamp`.
+    ///
+    /// The function is not guaranteed to produce monotonically increasing
+    /// values however. There is a slight possibility that two successive
+    /// equal time values could be supplied and the sequence counter wraps back
+    /// over to 0.
+    ///
+    /// If uniqueness and monotonicity is required, the user is responsible for
+    /// ensuring that the time value always increases between calls (including
+    /// between restarts of the process and device).
+    pub fn from_unix(
+        context: impl ClockSequence,
+        seconds: u64,
+        subsec_nanos: u32,
+    ) -> Self {
+        let counter = context.generate_sequence(seconds, subsec_nanos);
+        let ticks = UUID_TICKS_BETWEEN_EPOCHS
+            + seconds * 10_000_000
+            + u64::from(subsec_nanos) / 100;
+
+        Timestamp { ticks, counter }
+    }
+
+    /// Returns the raw RFC4122 timestamp and counter values stored by the
+    /// `Timestamp`.
+    ///
+    /// The timestamp (the first, `u64` element in the tuple) represents the
+    /// number of 100-nanosecond intervals since 00:00:00.00, 15 Oct 1582.
+    /// The counter is used to differentiate between ids generated on the
+    /// same host computer with the same observed time.
+    pub const fn to_rfc4122(&self) -> (u64, u16) {
+        (self.ticks, self.counter)
+    }
+
+    /// Returns the timestamp converted to the seconds and fractional
+    /// nanoseconds since Jan 1 1970.
+    ///
+    /// Internally, the time is stored in 100-nanosecond intervals,
+    /// thus the maximum precision represented by the fractional nanoseconds
+    /// value is less than its unit size (100 ns vs. 1 ns).
+    pub const fn to_unix(&self) -> (u64, u32) {
+        (
+            (self.ticks - UUID_TICKS_BETWEEN_EPOCHS) / 10_000_000,
+            ((self.ticks - UUID_TICKS_BETWEEN_EPOCHS) % 10_000_000) as u32
+                * 100,
+        )
+    }
+
+    /// Returns the timestamp converted into nanoseconds elapsed since Jan 1
+    /// 1970. Internally, the time is stored in 100-nanosecond intervals,
+    /// thus the maximum precision represented is less than the units it is
+    /// measured in (100 ns vs. 1 ns). The value returned represents the
+    /// same duration as [`Timestamp::to_unix`]; this provides it in nanosecond
+    /// units for convenience.
+    pub const fn to_unix_nanos(&self) -> u64 {
+        (self.ticks - UUID_TICKS_BETWEEN_EPOCHS) * 100
+    }
+}
+
+/// A trait that abstracts over generation of UUID v1 "Clock Sequence" values.
+pub trait ClockSequence {
+    /// Return a 16-bit number that will be used as the "clock sequence" in
+    /// the UUID. The number must be different if the time has changed since
+    /// the last time a clock sequence was requested.
+    fn generate_sequence(&self, seconds: u64, subsec_nanos: u32) -> u16;
+}
+
+impl<'a, T: ClockSequence + ?Sized> ClockSequence for &'a T {
+    fn generate_sequence(&self, seconds: u64, subsec_nanos: u32) -> u16 {
+        (**self).generate_sequence(seconds, subsec_nanos)
+    }
+}
+
+impl Uuid {
+    /// Create a new UUID (version 1) using a time value + sequence +
+    /// *NodeId*.
+    ///
+    /// When generating [`Timestamp`]s using a [`ClockSequence`], this function
+    /// is only guaranteed to produce unique values if the following conditions
+    /// hold:
+    ///
+    /// 1. The *NodeId* is unique for this process,
+    /// 2. The *Context* is shared across all threads which are generating v1
+    ///    UUIDs,
+    /// 3. The [`ClockSequence`] implementation reliably returns unique
+    ///    clock sequences (this crate provides [`Context`] for this
+    ///    purpose. However you can create your own [`ClockSequence`]
+    ///    implementation, if [`Context`] does not meet your needs).
+    ///
+    /// The NodeID must be exactly 6 bytes long.
+    ///
+    /// Note that usage of this method requires the `v1` feature of this crate
+    /// to be enabled.
+    ///
+    /// # Examples
+    ///
+    /// A UUID can be created from a unix [`Timestamp`] with a
+    /// [`ClockSequence`]:
+    ///
+    /// ```rust
+    /// use uuid::v1::{Timestamp, Context};
+    /// use uuid::Uuid;
+    ///
+    /// let context = Context::new(42);
+    /// let ts = Timestamp::from_unix(&context, 1497624119, 1234);
+    /// let uuid = Uuid::new_v1(ts, &[1, 2, 3, 4, 5, 6]).expect("failed to generate UUID");
+    ///
+    /// assert_eq!(
+    ///     uuid.to_hyphenated().to_string(),
+    ///     "f3b4958c-52a1-11e7-802a-010203040506"
+    /// );
+    /// ```
+    ///
+    /// The timestamp can also be created manually as per RFC4122:
+    ///
+    /// ```
+    /// use uuid::v1::{Timestamp, Context};
+    /// use uuid::Uuid;
+    ///
+    /// let context = Context::new(42);
+    /// let ts = Timestamp::from_rfc4122(1497624119, 0);
+    /// let uuid = Uuid::new_v1(ts, &[1, 2, 3, 4, 5, 6]).expect("failed to generate UUID");
+    ///
+    /// assert_eq!(
+    ///     uuid.to_hyphenated().to_string(),
+    ///     "5943ee37-0000-1000-8000-010203040506"
+    /// );
+    /// ```
+    ///
+    /// [`Timestamp`]: v1/struct.Timestamp.html
+    /// [`ClockSequence`]: v1/struct.ClockSequence.html
+    /// [`Context`]: v1/struct.Context.html
+    pub fn new_v1(ts: Timestamp, node_id: &[u8]) -> Result<Self, crate::Error> {
+        const NODE_ID_LEN: usize = 6;
+
+        let len = node_id.len();
+        if len != NODE_ID_LEN {
+            Err(crate::builder::Error::new(NODE_ID_LEN, len))?;
+        }
+
+        let time_low = (ts.ticks & 0xFFFF_FFFF) as u32;
+        let time_mid = ((ts.ticks >> 32) & 0xFFFF) as u16;
+        let time_high_and_version =
+            (((ts.ticks >> 48) & 0x0FFF) as u16) | (1 << 12);
+
+        let mut d4 = [0; 8];
+
+        {
+            d4[0] = (((ts.counter & 0x3F00) >> 8) as u8) | 0x80;
+            d4[1] = (ts.counter & 0xFF) as u8;
+        }
+
+        d4[2..].copy_from_slice(node_id);
+
+        Uuid::from_fields(time_low, time_mid, time_high_and_version, &d4)
+    }
+
+    /// Returns an optional [`Timestamp`] storing the timestamp and
+    /// counter portion parsed from a V1 UUID.
+    ///
+    /// Returns `None` if the supplied UUID is not V1.
+    ///
+    /// The V1 timestamp format defined in RFC4122 specifies a 60-bit
+    /// integer representing the number of 100-nanosecond intervals
+    /// since 00:00:00.00, 15 Oct 1582.
+    ///
+    /// [`Timestamp`] offers several options for converting the raw RFC4122
+    /// value into more commonly-used formats, such as a unix timestamp.
+    ///
+    /// [`Timestamp`]: v1/struct.Timestamp.html
+    pub fn to_timestamp(&self) -> Option<Timestamp> {
+        if self
+            .get_version()
+            .map(|v| v != Version::Mac)
+            .unwrap_or(true)
+        {
+            return None;
+        }
+
+        let ticks: u64 = u64::from(self.as_bytes()[6] & 0x0F) << 56
+            | u64::from(self.as_bytes()[7]) << 48
+            | u64::from(self.as_bytes()[4]) << 40
+            | u64::from(self.as_bytes()[5]) << 32
+            | u64::from(self.as_bytes()[0]) << 24
+            | u64::from(self.as_bytes()[1]) << 16
+            | u64::from(self.as_bytes()[2]) << 8
+            | u64::from(self.as_bytes()[3]);
+
+        let counter: u16 = u16::from(self.as_bytes()[8] & 0x3F) << 8
+            | u16::from(self.as_bytes()[9]);
+
+        Some(Timestamp::from_rfc4122(ticks, counter))
+    }
+}
+
+impl Context {
+    /// Creates a thread-safe, internally mutable context to help ensure
+    /// uniqueness.
+    ///
+    /// This is a context which can be shared across threads. It maintains an
+    /// internal counter that is incremented at every request, the value ends
+    /// up in the clock_seq portion of the UUID (the fourth group). This
+    /// will improve the probability that the UUID is unique across the
+    /// process.
+    pub const fn new(count: u16) -> Self {
+        Self {
+            count: atomic::AtomicUsize::new(count as usize),
+        }
+    }
+}
+
+impl ClockSequence for Context {
+    fn generate_sequence(&self, _: u64, _: u32) -> u16 {
+        (self.count.fetch_add(1, atomic::Ordering::SeqCst) & 0xffff) as u16
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::std::string::ToString;
+
+    #[test]
+    fn test_new_v1() {
+        let time: u64 = 1_496_854_535;
+        let time_fraction: u32 = 812_946_000;
+        let node = [1, 2, 3, 4, 5, 6];
+        let context = Context::new(0);
+
+        {
+            let uuid = Uuid::new_v1(
+                Timestamp::from_unix(&context, time, time_fraction),
+                &node,
+            )
+            .unwrap();
+
+            assert_eq!(uuid.get_version(), Some(Version::Mac));
+            assert_eq!(uuid.get_variant(), Some(Variant::RFC4122));
+            assert_eq!(
+                uuid.to_hyphenated().to_string(),
+                "20616934-4ba2-11e7-8000-010203040506"
+            );
+
+            let ts = uuid.to_timestamp().unwrap().to_rfc4122();
+
+            assert_eq!(ts.0 - 0x01B2_1DD2_1381_4000, 14_968_545_358_129_460);
+            assert_eq!(ts.1, 0);
+        };
+
+        {
+            let uuid2 = Uuid::new_v1(
+                Timestamp::from_unix(&context, time, time_fraction),
+                &node,
+            )
+            .unwrap();
+
+            assert_eq!(
+                uuid2.to_hyphenated().to_string(),
+                "20616934-4ba2-11e7-8001-010203040506"
+            );
+            assert_eq!(uuid2.to_timestamp().unwrap().to_rfc4122().1, 1)
+        };
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/v3.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/v3.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/v3.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/v3.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,146 +1,146 @@
-use crate::prelude::*;
-use md5;
-
-impl Uuid {
-    /// Creates a UUID using a name from a namespace, based on the MD5
-    /// hash.
-    ///
-    /// A number of namespaces are available as constants in this crate:
-    ///
-    /// * [`NAMESPACE_DNS`]
-    /// * [`NAMESPACE_OID`]
-    /// * [`NAMESPACE_URL`]
-    /// * [`NAMESPACE_X500`]
-    ///
-    /// Note that usage of this method requires the `v3` feature of this crate
-    /// to be enabled.
-    ///
-    /// [`NAMESPACE_DNS`]: ns/const.NAMESPACE_DNS.html
-    /// [`NAMESPACE_OID`]: ns/const.NAMESPACE_OID.html
-    /// [`NAMESPACE_URL`]: ns/const.NAMESPACE_URL.html
-    /// [`NAMESPACE_X500`]: ns/const.NAMESPACE_X500.html
-    pub fn new_v3(namespace: &Uuid, name: &[u8]) -> Uuid {
-        let mut context = md5::Context::new();
-
-        context.consume(namespace.as_bytes());
-        context.consume(name);
-
-        let computed = context.compute();
-        let bytes = computed.into();
-
-        let mut builder = crate::builder::Builder::from_bytes(bytes);
-
-        builder
-            .set_variant(Variant::RFC4122)
-            .set_version(Version::Md5);
-
-        builder.build()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::std::string::ToString;
-
-    static FIXTURE: &'static [(&'static Uuid, &'static str, &'static str)] = &[
-        (
-            &Uuid::NAMESPACE_DNS,
-            "example.org",
-            "04738bdf-b25a-3829-a801-b21a1d25095b",
-        ),
-        (
-            &Uuid::NAMESPACE_DNS,
-            "rust-lang.org",
-            "c6db027c-615c-3b4d-959e-1a917747ca5a",
-        ),
-        (
-            &Uuid::NAMESPACE_DNS,
-            "42",
-            "5aab6e0c-b7d3-379c-92e3-2bfbb5572511",
-        ),
-        (
-            &Uuid::NAMESPACE_DNS,
-            "lorem ipsum",
-            "4f8772e9-b59c-3cc9-91a9-5c823df27281",
-        ),
-        (
-            &Uuid::NAMESPACE_URL,
-            "example.org",
-            "39682ca1-9168-3da2-a1bb-f4dbcde99bf9",
-        ),
-        (
-            &Uuid::NAMESPACE_URL,
-            "rust-lang.org",
-            "7ed45aaf-e75b-3130-8e33-ee4d9253b19f",
-        ),
-        (
-            &Uuid::NAMESPACE_URL,
-            "42",
-            "08998a0c-fcf4-34a9-b444-f2bfc15731dc",
-        ),
-        (
-            &Uuid::NAMESPACE_URL,
-            "lorem ipsum",
-            "e55ad2e6-fb89-34e8-b012-c5dde3cd67f0",
-        ),
-        (
-            &Uuid::NAMESPACE_OID,
-            "example.org",
-            "f14eec63-2812-3110-ad06-1625e5a4a5b2",
-        ),
-        (
-            &Uuid::NAMESPACE_OID,
-            "rust-lang.org",
-            "6506a0ec-4d79-3e18-8c2b-f2b6b34f2b6d",
-        ),
-        (
-            &Uuid::NAMESPACE_OID,
-            "42",
-            "ce6925a5-2cd7-327b-ab1c-4b375ac044e4",
-        ),
-        (
-            &Uuid::NAMESPACE_OID,
-            "lorem ipsum",
-            "5dd8654f-76ba-3d47-bc2e-4d6d3a78cb09",
-        ),
-        (
-            &Uuid::NAMESPACE_X500,
-            "example.org",
-            "64606f3f-bd63-363e-b946-fca13611b6f7",
-        ),
-        (
-            &Uuid::NAMESPACE_X500,
-            "rust-lang.org",
-            "bcee7a9c-52f1-30c6-a3cc-8c72ba634990",
-        ),
-        (
-            &Uuid::NAMESPACE_X500,
-            "42",
-            "c1073fa2-d4a6-3104-b21d-7a6bdcf39a23",
-        ),
-        (
-            &Uuid::NAMESPACE_X500,
-            "lorem ipsum",
-            "02f09a3f-1624-3b1d-8409-44eff7708208",
-        ),
-    ];
-
-    #[test]
-    fn test_new() {
-        for &(ref ns, ref name, _) in FIXTURE {
-            let uuid = Uuid::new_v3(*ns, name.as_bytes());
-            assert_eq!(uuid.get_version().unwrap(), Version::Md5);
-            assert_eq!(uuid.get_variant().unwrap(), Variant::RFC4122);
-        }
-    }
-
-    #[test]
-    fn test_to_hyphenated_string() {
-        for &(ref ns, ref name, ref expected) in FIXTURE {
-            let uuid = Uuid::new_v3(*ns, name.as_bytes());
-            assert_eq!(uuid.to_hyphenated().to_string(), *expected);
-        }
-    }
-}
+use crate::prelude::*;
+use md5;
+
+impl Uuid {
+    /// Creates a UUID using a name from a namespace, based on the MD5
+    /// hash.
+    ///
+    /// A number of namespaces are available as constants in this crate:
+    ///
+    /// * [`NAMESPACE_DNS`]
+    /// * [`NAMESPACE_OID`]
+    /// * [`NAMESPACE_URL`]
+    /// * [`NAMESPACE_X500`]
+    ///
+    /// Note that usage of this method requires the `v3` feature of this crate
+    /// to be enabled.
+    ///
+    /// [`NAMESPACE_DNS`]: #associatedconstant.NAMESPACE_DNS
+    /// [`NAMESPACE_OID`]: #associatedconstant.NAMESPACE_OID
+    /// [`NAMESPACE_URL`]: #associatedconstant.NAMESPACE_URL
+    /// [`NAMESPACE_X500`]: #associatedconstant.NAMESPACE_X500
+    pub fn new_v3(namespace: &Uuid, name: &[u8]) -> Uuid {
+        let mut context = md5::Context::new();
+
+        context.consume(namespace.as_bytes());
+        context.consume(name);
+
+        let computed = context.compute();
+        let bytes = computed.into();
+
+        let mut builder = crate::Builder::from_bytes(bytes);
+
+        builder
+            .set_variant(Variant::RFC4122)
+            .set_version(Version::Md5);
+
+        builder.build()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::std::string::ToString;
+
+    static FIXTURE: &'static [(&'static Uuid, &'static str, &'static str)] = &[
+        (
+            &Uuid::NAMESPACE_DNS,
+            "example.org",
+            "04738bdf-b25a-3829-a801-b21a1d25095b",
+        ),
+        (
+            &Uuid::NAMESPACE_DNS,
+            "rust-lang.org",
+            "c6db027c-615c-3b4d-959e-1a917747ca5a",
+        ),
+        (
+            &Uuid::NAMESPACE_DNS,
+            "42",
+            "5aab6e0c-b7d3-379c-92e3-2bfbb5572511",
+        ),
+        (
+            &Uuid::NAMESPACE_DNS,
+            "lorem ipsum",
+            "4f8772e9-b59c-3cc9-91a9-5c823df27281",
+        ),
+        (
+            &Uuid::NAMESPACE_URL,
+            "example.org",
+            "39682ca1-9168-3da2-a1bb-f4dbcde99bf9",
+        ),
+        (
+            &Uuid::NAMESPACE_URL,
+            "rust-lang.org",
+            "7ed45aaf-e75b-3130-8e33-ee4d9253b19f",
+        ),
+        (
+            &Uuid::NAMESPACE_URL,
+            "42",
+            "08998a0c-fcf4-34a9-b444-f2bfc15731dc",
+        ),
+        (
+            &Uuid::NAMESPACE_URL,
+            "lorem ipsum",
+            "e55ad2e6-fb89-34e8-b012-c5dde3cd67f0",
+        ),
+        (
+            &Uuid::NAMESPACE_OID,
+            "example.org",
+            "f14eec63-2812-3110-ad06-1625e5a4a5b2",
+        ),
+        (
+            &Uuid::NAMESPACE_OID,
+            "rust-lang.org",
+            "6506a0ec-4d79-3e18-8c2b-f2b6b34f2b6d",
+        ),
+        (
+            &Uuid::NAMESPACE_OID,
+            "42",
+            "ce6925a5-2cd7-327b-ab1c-4b375ac044e4",
+        ),
+        (
+            &Uuid::NAMESPACE_OID,
+            "lorem ipsum",
+            "5dd8654f-76ba-3d47-bc2e-4d6d3a78cb09",
+        ),
+        (
+            &Uuid::NAMESPACE_X500,
+            "example.org",
+            "64606f3f-bd63-363e-b946-fca13611b6f7",
+        ),
+        (
+            &Uuid::NAMESPACE_X500,
+            "rust-lang.org",
+            "bcee7a9c-52f1-30c6-a3cc-8c72ba634990",
+        ),
+        (
+            &Uuid::NAMESPACE_X500,
+            "42",
+            "c1073fa2-d4a6-3104-b21d-7a6bdcf39a23",
+        ),
+        (
+            &Uuid::NAMESPACE_X500,
+            "lorem ipsum",
+            "02f09a3f-1624-3b1d-8409-44eff7708208",
+        ),
+    ];
+
+    #[test]
+    fn test_new() {
+        for &(ref ns, ref name, _) in FIXTURE {
+            let uuid = Uuid::new_v3(*ns, name.as_bytes());
+            assert_eq!(uuid.get_version().unwrap(), Version::Md5);
+            assert_eq!(uuid.get_variant().unwrap(), Variant::RFC4122);
+        }
+    }
+
+    #[test]
+    fn test_to_hyphenated_string() {
+        for &(ref ns, ref name, ref expected) in FIXTURE {
+            let uuid = Uuid::new_v3(*ns, name.as_bytes());
+            assert_eq!(uuid.to_hyphenated().to_string(), *expected);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/v4.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/v4.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/v4.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/v4.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,59 +1,60 @@
-use crate::prelude::*;
-use rand;
-
-impl Uuid {
-    /// Creates a random UUID.
-    ///
-    /// This uses the [`rand`] crate's default task RNG as the source of random
-    /// numbers. If you'd like to use a custom generator, don't use this
-    /// method: use the `rand::Rand trait`'s `rand()` method instead.
-    ///
-    /// Note that usage of this method requires the `v4` feature of this crate
-    /// to be enabled.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// use uuid::Uuid;
-    ///
-    /// let uuid = Uuid::new_v4();
-    /// ```
-    ///
-    /// [`rand`]: https://crates.io/crates/rand
-    pub fn new_v4() -> Self {
-        use rand::RngCore;
-
-        let mut rng = rand::thread_rng();
-        let mut bytes = [0; 16];
-
-        rng.fill_bytes(&mut bytes);
-
-        Builder::from_bytes(bytes)
-            .set_variant(Variant::RFC4122)
-            .set_version(Version::Random)
-            .build()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    #[test]
-    fn test_new() {
-        let uuid = Uuid::new_v4();
-
-        assert_eq!(uuid.get_version(), Some(Version::Random));
-        assert_eq!(uuid.get_variant(), Some(Variant::RFC4122));
-    }
-
-    #[test]
-    fn test_get_version() {
-        let uuid = Uuid::new_v4();
-
-        assert_eq!(uuid.get_version(), Some(Version::Random));
-        assert_eq!(uuid.get_version_num(), 4)
-    }
-}
+use crate::prelude::*;
+
+impl Uuid {
+    /// Creates a random UUID.
+    ///
+    /// This uses the [`getrandom`] crate to utilise the operating system's RNG
+    /// as the source of random numbers. If you'd like to use a custom
+    /// generator, don't use this method: generate random bytes using your
+    /// custom generator and pass them to the
+    /// [`uuid::Builder::from_bytes`][from_bytes] function instead.
+    ///
+    /// Note that usage of this method requires the `v4` feature of this crate
+    /// to be enabled.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// use uuid::Uuid;
+    ///
+    /// let uuid = Uuid::new_v4();
+    /// ```
+    ///
+    /// [`getrandom`]: https://crates.io/crates/getrandom
+    /// [from_bytes]: struct.Builder.html#method.from_bytes
+    pub fn new_v4() -> Uuid {
+        let mut bytes = [0u8; 16];
+        getrandom::getrandom(&mut bytes).unwrap_or_else(|err| {
+            // NB: getrandom::Error has no source; this is adequate display
+            panic!("could not retreive random bytes for uuid: {}", err)
+        });
+
+        crate::Builder::from_bytes(bytes)
+            .set_variant(Variant::RFC4122)
+            .set_version(Version::Random)
+            .build()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::prelude::*;
+
+    #[test]
+    fn test_new() {
+        let uuid = Uuid::new_v4();
+
+        assert_eq!(uuid.get_version(), Some(Version::Random));
+        assert_eq!(uuid.get_variant(), Some(Variant::RFC4122));
+    }
+
+    #[test]
+    fn test_get_version() {
+        let uuid = Uuid::new_v4();
+
+        assert_eq!(uuid.get_version(), Some(Version::Random));
+        assert_eq!(uuid.get_version_num(), 4)
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/v5.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/v5.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/v5.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/v5.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,158 +1,158 @@
-use crate::prelude::*;
-use sha1;
-
-impl Uuid {
-    /// Creates a UUID using a name from a namespace, based on the SHA-1 hash.
-    ///
-    /// A number of namespaces are available as constants in this crate:
-    ///
-    /// * [`NAMESPACE_DNS`]
-    /// * [`NAMESPACE_OID`]
-    /// * [`NAMESPACE_URL`]
-    /// * [`NAMESPACE_X500`]
-    ///
-    /// Note that usage of this method requires the `v5` feature of this crate
-    /// to be enabled.
-    ///
-    /// [`NAMESPACE_DNS`]: struct.Uuid.html#associatedconst.NAMESPACE_DNS
-    /// [`NAMESPACE_OID`]: struct.Uuid.html#associatedconst.NAMESPACE_OID
-    /// [`NAMESPACE_URL`]: struct.Uuid.html#associatedconst.NAMESPACE_URL
-    /// [`NAMESPACE_X500`]: struct.Uuid.html#associatedconst.NAMESPACE_X500
-    pub fn new_v5(namespace: &Uuid, name: &[u8]) -> Uuid {
-        let mut hash = sha1::Sha1::new();
-
-        hash.update(namespace.as_bytes());
-        hash.update(name);
-
-        let buffer = hash.digest().bytes();
-
-        let mut bytes = crate::Bytes::default();
-        bytes.copy_from_slice(&buffer[..16]);
-
-        let mut builder = crate::builder::Builder::from_bytes(bytes);
-        builder
-            .set_variant(Variant::RFC4122)
-            .set_version(Version::Sha1);
-
-        builder.build()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::std::string::ToString;
-
-    static FIXTURE: &'static [(&'static Uuid, &'static str, &'static str)] = &[
-        (
-            &Uuid::NAMESPACE_DNS,
-            "example.org",
-            "aad03681-8b63-5304-89e0-8ca8f49461b5",
-        ),
-        (
-            &Uuid::NAMESPACE_DNS,
-            "rust-lang.org",
-            "c66bbb60-d62e-5f17-a399-3a0bd237c503",
-        ),
-        (
-            &Uuid::NAMESPACE_DNS,
-            "42",
-            "7c411b5e-9d3f-50b5-9c28-62096e41c4ed",
-        ),
-        (
-            &Uuid::NAMESPACE_DNS,
-            "lorem ipsum",
-            "97886a05-8a68-5743-ad55-56ab2d61cf7b",
-        ),
-        (
-            &Uuid::NAMESPACE_URL,
-            "example.org",
-            "54a35416-963c-5dd6-a1e2-5ab7bb5bafc7",
-        ),
-        (
-            &Uuid::NAMESPACE_URL,
-            "rust-lang.org",
-            "c48d927f-4122-5413-968c-598b1780e749",
-        ),
-        (
-            &Uuid::NAMESPACE_URL,
-            "42",
-            "5c2b23de-4bad-58ee-a4b3-f22f3b9cfd7d",
-        ),
-        (
-            &Uuid::NAMESPACE_URL,
-            "lorem ipsum",
-            "15c67689-4b85-5253-86b4-49fbb138569f",
-        ),
-        (
-            &Uuid::NAMESPACE_OID,
-            "example.org",
-            "34784df9-b065-5094-92c7-00bb3da97a30",
-        ),
-        (
-            &Uuid::NAMESPACE_OID,
-            "rust-lang.org",
-            "8ef61ecb-977a-5844-ab0f-c25ef9b8d5d6",
-        ),
-        (
-            &Uuid::NAMESPACE_OID,
-            "42",
-            "ba293c61-ad33-57b9-9671-f3319f57d789",
-        ),
-        (
-            &Uuid::NAMESPACE_OID,
-            "lorem ipsum",
-            "6485290d-f79e-5380-9e64-cb4312c7b4a6",
-        ),
-        (
-            &Uuid::NAMESPACE_X500,
-            "example.org",
-            "e3635e86-f82b-5bbc-a54a-da97923e5c76",
-        ),
-        (
-            &Uuid::NAMESPACE_X500,
-            "rust-lang.org",
-            "26c9c3e9-49b7-56da-8b9f-a0fb916a71a3",
-        ),
-        (
-            &Uuid::NAMESPACE_X500,
-            "42",
-            "e4b88014-47c6-5fe0-a195-13710e5f6e27",
-        ),
-        (
-            &Uuid::NAMESPACE_X500,
-            "lorem ipsum",
-            "b11f79a5-1e6d-57ce-a4b5-ba8531ea03d0",
-        ),
-    ];
-
-    #[test]
-    fn test_get_version() {
-        let uuid =
-            Uuid::new_v5(&Uuid::NAMESPACE_DNS, "rust-lang.org".as_bytes());
-
-        assert_eq!(uuid.get_version(), Some(Version::Sha1));
-        assert_eq!(uuid.get_version_num(), 5);
-    }
-
-    #[test]
-    fn test_hyphenated() {
-        for &(ref ns, ref name, ref expected) in FIXTURE {
-            let uuid = Uuid::new_v5(*ns, name.as_bytes());
-
-            assert_eq!(uuid.to_hyphenated().to_string(), *expected)
-        }
-    }
-
-    #[test]
-    fn test_new() {
-        for &(ref ns, ref name, ref u) in FIXTURE {
-            let uuid = Uuid::new_v5(*ns, name.as_bytes());
-
-            assert_eq!(uuid.get_variant(), Some(Variant::RFC4122));
-            assert_eq!(uuid.get_version(), Some(Version::Sha1));
-            assert_eq!(Ok(uuid), u.parse());
-        }
-    }
-}
+use crate::prelude::*;
+use sha1;
+
+impl Uuid {
+    /// Creates a UUID using a name from a namespace, based on the SHA-1 hash.
+    ///
+    /// A number of namespaces are available as constants in this crate:
+    ///
+    /// * [`NAMESPACE_DNS`]
+    /// * [`NAMESPACE_OID`]
+    /// * [`NAMESPACE_URL`]
+    /// * [`NAMESPACE_X500`]
+    ///
+    /// Note that usage of this method requires the `v5` feature of this crate
+    /// to be enabled.
+    ///
+    /// [`NAMESPACE_DNS`]: struct.Uuid.html#associatedconst.NAMESPACE_DNS
+    /// [`NAMESPACE_OID`]: struct.Uuid.html#associatedconst.NAMESPACE_OID
+    /// [`NAMESPACE_URL`]: struct.Uuid.html#associatedconst.NAMESPACE_URL
+    /// [`NAMESPACE_X500`]: struct.Uuid.html#associatedconst.NAMESPACE_X500
+    pub fn new_v5(namespace: &Uuid, name: &[u8]) -> Uuid {
+        let mut hash = sha1::Sha1::new();
+
+        hash.update(namespace.as_bytes());
+        hash.update(name);
+
+        let buffer = hash.digest().bytes();
+
+        let mut bytes = crate::Bytes::default();
+        bytes.copy_from_slice(&buffer[..16]);
+
+        let mut builder = crate::Builder::from_bytes(bytes);
+        builder
+            .set_variant(Variant::RFC4122)
+            .set_version(Version::Sha1);
+
+        builder.build()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::std::string::ToString;
+
+    static FIXTURE: &'static [(&'static Uuid, &'static str, &'static str)] = &[
+        (
+            &Uuid::NAMESPACE_DNS,
+            "example.org",
+            "aad03681-8b63-5304-89e0-8ca8f49461b5",
+        ),
+        (
+            &Uuid::NAMESPACE_DNS,
+            "rust-lang.org",
+            "c66bbb60-d62e-5f17-a399-3a0bd237c503",
+        ),
+        (
+            &Uuid::NAMESPACE_DNS,
+            "42",
+            "7c411b5e-9d3f-50b5-9c28-62096e41c4ed",
+        ),
+        (
+            &Uuid::NAMESPACE_DNS,
+            "lorem ipsum",
+            "97886a05-8a68-5743-ad55-56ab2d61cf7b",
+        ),
+        (
+            &Uuid::NAMESPACE_URL,
+            "example.org",
+            "54a35416-963c-5dd6-a1e2-5ab7bb5bafc7",
+        ),
+        (
+            &Uuid::NAMESPACE_URL,
+            "rust-lang.org",
+            "c48d927f-4122-5413-968c-598b1780e749",
+        ),
+        (
+            &Uuid::NAMESPACE_URL,
+            "42",
+            "5c2b23de-4bad-58ee-a4b3-f22f3b9cfd7d",
+        ),
+        (
+            &Uuid::NAMESPACE_URL,
+            "lorem ipsum",
+            "15c67689-4b85-5253-86b4-49fbb138569f",
+        ),
+        (
+            &Uuid::NAMESPACE_OID,
+            "example.org",
+            "34784df9-b065-5094-92c7-00bb3da97a30",
+        ),
+        (
+            &Uuid::NAMESPACE_OID,
+            "rust-lang.org",
+            "8ef61ecb-977a-5844-ab0f-c25ef9b8d5d6",
+        ),
+        (
+            &Uuid::NAMESPACE_OID,
+            "42",
+            "ba293c61-ad33-57b9-9671-f3319f57d789",
+        ),
+        (
+            &Uuid::NAMESPACE_OID,
+            "lorem ipsum",
+            "6485290d-f79e-5380-9e64-cb4312c7b4a6",
+        ),
+        (
+            &Uuid::NAMESPACE_X500,
+            "example.org",
+            "e3635e86-f82b-5bbc-a54a-da97923e5c76",
+        ),
+        (
+            &Uuid::NAMESPACE_X500,
+            "rust-lang.org",
+            "26c9c3e9-49b7-56da-8b9f-a0fb916a71a3",
+        ),
+        (
+            &Uuid::NAMESPACE_X500,
+            "42",
+            "e4b88014-47c6-5fe0-a195-13710e5f6e27",
+        ),
+        (
+            &Uuid::NAMESPACE_X500,
+            "lorem ipsum",
+            "b11f79a5-1e6d-57ce-a4b5-ba8531ea03d0",
+        ),
+    ];
+
+    #[test]
+    fn test_get_version() {
+        let uuid =
+            Uuid::new_v5(&Uuid::NAMESPACE_DNS, "rust-lang.org".as_bytes());
+
+        assert_eq!(uuid.get_version(), Some(Version::Sha1));
+        assert_eq!(uuid.get_version_num(), 5);
+    }
+
+    #[test]
+    fn test_hyphenated() {
+        for &(ref ns, ref name, ref expected) in FIXTURE {
+            let uuid = Uuid::new_v5(*ns, name.as_bytes());
+
+            assert_eq!(uuid.to_hyphenated().to_string(), *expected)
+        }
+    }
+
+    #[test]
+    fn test_new() {
+        for &(ref ns, ref name, ref u) in FIXTURE {
+            let uuid = Uuid::new_v5(*ns, name.as_bytes());
+
+            assert_eq!(uuid.get_variant(), Some(Variant::RFC4122));
+            assert_eq!(uuid.get_version(), Some(Version::Sha1));
+            assert_eq!(Ok(uuid), u.parse());
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/winapi_support.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/winapi_support.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/uuid/src/winapi_support.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/uuid/src/winapi_support.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,79 +1,79 @@
-use crate::prelude::*;
-use winapi::shared::guiddef;
-
-#[cfg(feature = "guid")]
-impl Uuid {
-    /// Attempts to create a [`Uuid`] from a little endian winapi `GUID`
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    pub fn from_guid(guid: guiddef::GUID) -> Result<Uuid, crate::Error> {
-        Uuid::from_fields_le(
-            guid.Data1 as u32,
-            guid.Data2 as u16,
-            guid.Data3 as u16,
-            &(guid.Data4 as [u8; 8]),
-        )
-    }
-
-    /// Converts a [`Uuid`] into a little endian winapi `GUID`
-    ///
-    /// [`Uuid`]: ../struct.Uuid.html
-    pub fn to_guid(&self) -> guiddef::GUID {
-        let (data1, data2, data3, data4) = self.to_fields_le();
-
-        guiddef::GUID {
-            Data1: data1,
-            Data2: data2,
-            Data3: data3,
-            Data4: *data4,
-        }
-    }
-}
-
-#[cfg(feature = "guid")]
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::std::string::ToString;
-    use winapi::shared::guiddef;
-
-    #[test]
-    fn test_from_guid() {
-        let guid = guiddef::GUID {
-            Data1: 0x4a35229d,
-            Data2: 0x5527,
-            Data3: 0x4f30,
-            Data4: [0x86, 0x47, 0x9d, 0xc5, 0x4e, 0x1e, 0xe1, 0xe8],
-        };
-
-        let uuid = Uuid::from_guid(guid).unwrap();
-        assert_eq!(
-            "9d22354a-2755-304f-8647-9dc54e1ee1e8",
-            uuid.to_hyphenated().to_string()
-        );
-    }
-
-    #[test]
-    fn test_guid_roundtrip() {
-        let guid_in = guiddef::GUID {
-            Data1: 0x4a35229d,
-            Data2: 0x5527,
-            Data3: 0x4f30,
-            Data4: [0x86, 0x47, 0x9d, 0xc5, 0x4e, 0x1e, 0xe1, 0xe8],
-        };
-
-        let uuid = Uuid::from_guid(guid_in).unwrap();
-        let guid_out = uuid.to_guid();
-
-        assert_eq!(
-            (guid_in.Data1, guid_in.Data2, guid_in.Data3, guid_in.Data4),
-            (
-                guid_out.Data1,
-                guid_out.Data2,
-                guid_out.Data3,
-                guid_out.Data4
-            )
-        );
-    }
-}
+use crate::prelude::*;
+use winapi::shared::guiddef;
+
+#[cfg(feature = "guid")]
+impl Uuid {
+    /// Attempts to create a [`Uuid`] from a little endian winapi `GUID`
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    pub fn from_guid(guid: guiddef::GUID) -> Result<Uuid, crate::Error> {
+        Uuid::from_fields_le(
+            guid.Data1 as u32,
+            guid.Data2 as u16,
+            guid.Data3 as u16,
+            &(guid.Data4 as [u8; 8]),
+        )
+    }
+
+    /// Converts a [`Uuid`] into a little endian winapi `GUID`
+    ///
+    /// [`Uuid`]: ../struct.Uuid.html
+    pub fn to_guid(&self) -> guiddef::GUID {
+        let (data1, data2, data3, data4) = self.to_fields_le();
+
+        guiddef::GUID {
+            Data1: data1,
+            Data2: data2,
+            Data3: data3,
+            Data4: *data4,
+        }
+    }
+}
+
+#[cfg(feature = "guid")]
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::std::string::ToString;
+    use winapi::shared::guiddef;
+
+    #[test]
+    fn test_from_guid() {
+        let guid = guiddef::GUID {
+            Data1: 0x4a35229d,
+            Data2: 0x5527,
+            Data3: 0x4f30,
+            Data4: [0x86, 0x47, 0x9d, 0xc5, 0x4e, 0x1e, 0xe1, 0xe8],
+        };
+
+        let uuid = Uuid::from_guid(guid).unwrap();
+        assert_eq!(
+            "9d22354a-2755-304f-8647-9dc54e1ee1e8",
+            uuid.to_hyphenated().to_string()
+        );
+    }
+
+    #[test]
+    fn test_guid_roundtrip() {
+        let guid_in = guiddef::GUID {
+            Data1: 0x4a35229d,
+            Data2: 0x5527,
+            Data3: 0x4f30,
+            Data4: [0x86, 0x47, 0x9d, 0xc5, 0x4e, 0x1e, 0xe1, 0xe8],
+        };
+
+        let uuid = Uuid::from_guid(guid_in).unwrap();
+        let guid_out = uuid.to_guid();
+
+        assert_eq!(
+            (guid_in.Data1, guid_in.Data2, guid_in.Data3, guid_in.Data4),
+            (
+                guid_out.Data1,
+                guid_out.Data2,
+                guid_out.Data3,
+                guid_out.Data4
+            )
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"f4dbde5e19d0568853ec33d815910c92eca78aef1c3226471d30d57a08eb9e0e","src/lib.rs":"794d53bc93e219846410fa000267e586b69ea0d52e2e8ba1d304aa9457fcd3f2"},"package":"b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"96d702cc02f3fb7dfffbaff7dc3da7b1e647188b57164f8eddd468fd8ef3b1de","Cargo.toml":"033f71986b9ec8b8d1fcef7fa8c2c02abafb5655e10b1bbe405b9465e80108b4","LICENSE-APACHE":"60c93a31f490375aadf64098b75f10715010379541021e00261045d7800611d3","LICENSE-MIT":"016d20f335060a70e79d9fcf8dfaa6201114d65d592211f4bdfb8ae9ca2bc1dc","README.md":"37fae13061c8ba97d4d24210da4de4b50f4c7591170314b01e84947f00a1842d","notes.md":"92c9bef3fa3b954f805763e1f6f41cb73717381f33c9817bf67ad78413fa0052","rustfmt.toml":"b66f826d101f64ca121a60ad4a7df9387dd0d0ff9c768c178404d29a5345b576","setup_vcp.sh":"ec7aea336259bd8c9ba05eedd6ec8d2931b631b4f3a457928a750c963762f701","src/lib.rs":"e328540870c53574108da063a67e5ff10256b50a5b36063f0ae2f0bab51a9bc9","test-data/multiline-description/installed/vcpkg/info/graphite2_1.3.10_x86-windows.list":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/multiline-description/installed/vcpkg/updates/status":"df261093768f56af14f0958252d1b6d7040f3aa8822219d5055619d5d734fa01","test-data/no-status/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list":"285a1c0bc2bd69659f5197b0acb0bc595f8ef4cb3f9afb4e73f421bda14054fd","test-data/no-status/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list":"d81624f166a35658972e280dff388116e59a81c649ae4ac060f5aa272dcad7a0","test-data/no-status/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list":"24bed9588f9fc89f50a7a790c9bdc9972ee78990be30e4a25b8bdd91c5f3a12d","test-data/no-status/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list":"9f4203a92aa587ad9153c13ebb7c492b7a77c1307f334853a0cbeec1dfc34965","test-data/no-status/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list":"4c56a359fc8322bb8cb77955cd280a836c663479de8fd9ea0c813d58f3606e96","test-data/no-status/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list":"541af7e82f9a0c402acc8c89b72216a96f3bb7553a0d5a608c908d2870fa03d8","test-data/no-status/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list":"c4cb52f670a367f12a2f930bfb82143f2dd8cbd346daba3a570886e4a26d58ee","test-data/no-status/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list":"7562df82be2b70c12baf76f076db10f07724a8944d40e41c5b63b472b3c282cf","test-data/no-status/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list":"6236be36f263beaf7063f98b69320e8943a4bfe2f7ddf3431912ad34725d4a0b","test-data/no-status/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list":"001abe44817161c948a95db0793015039f2d7d9a6c06fc6e2c082a11adebb22e","test-data/no-status/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list":"2027f6af1a4e76233b8543f94d3d032efff8df85a6f385da00fa3187818e3e2d","test-data/no-status/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list":"b9d48c4fc1150cf02261fde85979170f6ef9b834fc4dcc002e5c73fd3aa02a69","test-data/no-status/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list":"aa92c77b2a4e8773785e2e0a764a651f17b79ec8482b39f5cf97a724a6611cc2","test-data/no-status/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list":"4daa3351489b23e8b6e4d6b05f5ce0ebd6e69d27de8360b8ff7ee80f9db02f88","test-data/no-status/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list":"4d37312db9025e16cbc93190b30af1a1a690e97e160a382efed0e48586c87a19","test-data/no-status/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list":"441765fe7ccf82b94a6356e87f46864d6e735825654f98d47c5a0752c8e41f0c","test-data/no-status/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list":"b7507771296c7a9a1087357e2f1b7bf875a7fa2d88d06f0d76b4e0e212563522","test-data/no-status/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list":"3290f7177acae782a86daee973c9318f853bd548a7484c20d960554f57de04b6","test-data/no-status/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list":"14f79bc105881e526d44f334ce3b378d2173bc9d7ae27bf1bdcd3d53b2e380c4","test-data/no-status/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list":"be694017810bddbc09c0f158ae7efb1fa4513e2115bcaaf1bf5637518f7c25e0","test-data/no-status/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list":"00ba72b897412e72c0a32755410f92307de387dda8e8df0ecdec496547ee0e16","test-data/no-status/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list":"715f3a532969aadff01716512a3730cdf3170b2b391fa08fbbbb11c7dd22f5d6","test-data/no-status/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list":"c4e08900238d804329a2a1b5cb664c7d2ded141780dcf4eb7de25217f7a79936","test-data/no-status/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list":"9a4b8c180a50b1cc35983352d09d6717d76bbb1a2c944f72ae63d5671a1a1743","test-data/no-status/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list":"358bbc71d4e4379863a7249769d12d020c43a03f9cda4cdd538dda477c41439f","test-data/no-status/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list":"c1fd7ab057f83ebe6685fa2b34ea407ea7a162db6ff01ceba8950684c2c2cd9e","test-data/no-status/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list":"3c824f6a87fefcebc008cc945d652e535bf8ce46a15202dbcbcafe396ca9ac4b","test-data/no-status/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list":"eaf3d85ec8e6857e5abf98d329fd05d3580574a8635e1e9da2fd305135cd7474","test-data/no-status/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list":"71530a23b8224b138943713dc9a4c9e26007ebf6d790bdf40ddc5e5f19239fd6","test-data/no-status/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list":"bffacdd10ffd104dfd36a08cca2dde7f6364ce97236859d32a6be1fdb376eaa5","test-data/no-status/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list":"decbe6397bd9d3d2ceb6fd5be70910c519d4d548048fb4379ce5023e69456de2","test-data/no-status/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list":"f6133baea0e06c878f0a5690ba6fc41f79d5185095138741133b3f35d4bb9623","test-data/no-status/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list":"924bed91b79ae299716e7fd3cbbaa3c29f234cd42c572f8c35068ba6eb651663","test-data/no-status/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list":"9fd6c473c9b0c2b166c79d57f5fd30572831d6d40722ec63c206aea9046f085d","test-data/no-status/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list":"6d6599737a0b79ce5636b87396c071f59909c399afdd5ee672a8856e3cb84bd1","test-data/no-status/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list":"7c69eaf1eab899adedfb28f53974022034c0b3335f8a52efdf68bcd18dae1cae","test-data/no-status/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list":"7c043a1178f8131113f8d3c5244cca8d6585481632a5e3347a26f008788277a1","test-data/no-status/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list":"ad67e8c7aafe39edde3e7be325b7f7d66b5bf98a52f71ebb083ea299b9c0a899","test-data/no-status/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list":"320cd917d5f52317ba21036c49e33404ca4e0c9c954dc2430007d5434822edc3","test-data/no-status/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list":"7c5e3e897dd2fb55a10c9c8042e2052b4141c4909385b1979f1d6d57eddc67bb","test-data/no-status/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list":"88f031162b69f05f282aec8798c3de381b1ca369c8471a4903a0429b1ecc5c95","test-data/no-status/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list":"ea50fba742ec58b800cbe8f72b65aa1e494e1bb6f62174aeeacff5ddd5601bef","test-data/no-status/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list":"a0b0801ee4f8c569ce3baa4a31873e13a8665bf50867295be7ca4605bd3f871c","test-data/no-status/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list":"8014eaf3677996f22aaf3a50cf01205e7fd0c4dfd1e59a8f61247cd02fef2675","test-data/no-status/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list":"bb20430c0b4db086c5c61b12f1210c6263e802d0b04408b2541a482b8d6287d5","test-data/no-status/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list":"1757581d36c43e9faa9e7dceaa48269024f816002b36ea2c58b65f08a26765ed","test-data/no-status/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list":"76d9fc8d969c6e419cba3549ecb191eeb84d5bc0ac33a799dcf8406c3f75d0c3","test-data/no-status/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list":"72160f933b8d7b5cc8785d141c52f9121a4d72614dd74602bb9130630c2d7e8f","test-data/no-status/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list":"bf16069646d3ba03076ab97e7bc9dceeb3bfdf718f6cadcc57aecb0ab58ff6d6","test-data/no-status/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list":"3c4bc0a9bf44a1e4d549d69335916425b87ec550fb6c117d560459ca846b44bf","test-data/no-status/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list":"5d2166e06254528e1b09d3a60db149964b10422b73a6cf659312f07ffde5f82a","test-data/no-status/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list":"21e041e33a795e077de29de7e791a9903b43c695c269c1ce4e4b55d9e1d84a2b","test-data/no-status/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list":"daf731d37fdf2b33ec09aa90eb82d1e4c89dbea8a44d8b1275823c62a040a9ad","test-data/no-status/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list":"d89e6f5e1ba6c786f722d11dc01c29d0f15210ab9dad0e36e4f081648adcb7d9","test-data/no-status/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list":"95063fe35ea1488415c22ee53bdda9892b5774a824e036772e7fc1c0b10c43a9","test-data/no-status/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list":"0b1913843daf81cc9f57c39283c635f5f4a6c6f8f30e774268ac1876d35c4a29","test-data/no-status/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list":"be9628576b31f9f840b90f131a6d95dac68d96f9cbd37b6486d822fa383c96c1","test-data/no-status/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list":"60188be064ae425205f548c27c3fbfeb96ceabc0e3d945d05f4565577f701ee6","test-data/no-status/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list":"4b122a363389d571e1e2399fc6fbeb2c2e0091fd3a9e974b17dcaf867e0e3ca3","test-data/no-status/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list":"6728e26bf5044bd46afae85c0625a423fb41be6bae74284acd39ac1d52bd4e73","test-data/no-status/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list":"40aa39eca308c8ae74ad52d58e2b61c900f120fad2ba0437f65e47957a7077c0","test-data/no-status/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list":"e496feb0a6f39dc614390150e2ca239654c24609ff265496a5bf69f6be788302","test-data/no-status/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list":"9fe5dc0b4c2119aa31cb02f149b23a7eda1fc8c390c282ee47d23fe9aab8a364","test-data/no-status/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list":"e4159abf32a06aad4c7345c6ea6bb887bb9e54195a3bb64cf51d3f71a0744424","test-data/no-status/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list":"008a958b11b72216018dc8c6c0c669e183f5cf0a9a96063f28667c8f55d8551e","test-data/no-status/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list":"756de6e839868ef5818150e6fc9f07a8015de0fc2c32f88af23f59de19fc78ed","test-data/no-status/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list":"00a0f40484573b85b73e53228181bccb2cce691cc48a8060ae05182deda6a898","test-data/no-status/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list":"fe54a6f04ea393d12dd1c5beb2c49fd1fd4120bb8bc6a884d40143c643d864ee","test-data/no-status/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list":"06ceb3cb6398b97fc94f1877ae522f8dacabc40ef8d7a74ea624eb0460364a53","test-data/no-status/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list":"d44b06621e3affe8f5090464374878e2d449751f4ba7e49a2fab5bffea8ee72a","test-data/no-status/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list":"2f50196560a0cfaa5bc8a1a3b0d2159608bb1dd078b0561b925eae61716c35cf","test-data/no-status/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list":"7cbacb5bd763fcaf74dbca12fa2700b79206201685b7459583406a0583b1028d","test-data/no-status/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list":"c6be406b9a29c44941626d53f617dc615cb9cc0572157c54980fc4455ef30091","test-data/no-status/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list":"b6fac8b00b9feeac3f3701c8f44cd42bde00d2a0b8846af4464af9249d6d102a","test-data/no-status/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list":"93da5e574846f417c3a6be75e83730c6109e4fa5521162d8d926a9cc0c717021","test-data/no-status/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list":"740d956db6b770544dfc5d43e943f79ea1290259997b50694e41fb6a970a020f","test-data/no-status/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list":"7e33c22639562c0deca07ea24c04c17b64c0423ee8e6e01a56af73d8024464bf","test-data/no-status/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list":"f6c35d80c7d34f43c55e8d784b30f0756fe9d0bf20c156484af8850085dcc608","test-data/no-status/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list":"3881301debeb3efbaf29ff1e853240f71f0ce72b937551f52a08122b5b03ba54","test-data/no-status/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list":"f77f5d29835488969a821c5a4ac1b64d6ee2331ef6fc12ca0f39ddc0b7f3d68d","test-data/no-status/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list":"b4936bf7fb1516e19e7926d4bdc5bcc3cbc69e20cf437762c08240b87867a630","test-data/no-status/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list":"266146aa696501f2d89ad104da167be40db1b038725a74aee4cee394163dbaec","test-data/no-status/installed/vcpkg/info/icu_61.1-1_x64-windows.list":"d99a3870aaf62aaf4e2f3b1f23b9ca15c9dc047751426de8323deddb74601bcc","test-data/no-status/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list":"e8bfac000f63f86c8eb7838371111cde8e8141ea6992783680df1b727d0c2357","test-data/no-status/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list":"750c4e025a9e631f0fbeb11b398f2d5517e0db1b64b0fa24473dd581bc60c4de","test-data/no-status/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list":"fcc2c1c0836bcac1478416f8507bd5b46d0f77d1113ab646dba02265103ac33b","test-data/no-status/installed/vcpkg/info/lz4_1.8.2_x64-windows.list":"e4b71d66138d24f16492bddd056e7295148f3c9fc948c0270b1c68a0b3c489a1","test-data/no-status/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list":"818562a99a6a813462f7bfd5887ff8092cec791d456d1788f6ee75810c180abf","test-data/no-status/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list":"46e161630bb26a6daadcd32e1b326f895aae7509e5e4aa8ab2841e17c09149d4","test-data/no-status/installed/vcpkg/updates/0000000000":"15ea060c6e923d98ca5b8498a98b97de80c2c70c327d8ee7421ba9ade7ff9ca4","test-data/no-status/installed/vcpkg/updates/0000000001":"5a30883381f94d03b6c66858fb89a37316c4774d2aa05d4eeda2d9a045e0bcf9","test-data/no-status/installed/vcpkg/updates/0000000002":"b9bf77f6bddaf2b29a2c61db8c2a293e6acb7ca45912f2ee8e59c163e87b91df","test-data/no-status/installed/vcpkg/updates/0000000003":"c7f0067789985309517cb4046ef1402b54204cb4778003f2c54fb2cbc071f9a2","test-data/no-status/installed/vcpkg/updates/0000000004":"8b576d6b2a05a938b6e7c24431861b422ddac1c300cab892eec2248e6754d3a3","test-data/no-status/installed/vcpkg/updates/0000000005":"a472e93bea9637baec46319260e5172e4ff92197c9ff6031f38688592ff0fca9","test-data/no-status/installed/vcpkg/updates/0000000006":"9114d6a246446c60d722960620b42a5f4ed6f0ffee87a57713ab7895805e5188","test-data/no-status/installed/vcpkg/updates/0000000007":"71878a3a3e99634319170b19afefcdacd205b113172b3d189808110a4370aed0","test-data/no-status/installed/vcpkg/updates/0000000008":"3ee23b799e1e0786abc313c95ad87e20423cbd3b809e690fe43df23ecc5ecea0","test-data/no-status/installed/vcpkg/updates/0000000009":"9cc58947f3b081e0e3df92d9884ef446b69079b2b27b76bcb553440dee6c72e3","test-data/no-status/installed/vcpkg/updates/0000000010":"840e63f4c92f7ac345dd47a0d68a8b3109330d532f8b8c5be680a170e1993d82","test-data/no-status/installed/vcpkg/updates/0000000011":"988184ef4f71d858d80d4fab423ab9074d75cbdfc9322986240f4a42c44b52e6","test-data/no-status/installed/vcpkg/updates/0000000012":"0d23f2238a3fd3ff33cf5f79b0820b5a174d91c7f6d3c71a7c17336ad0202a1b","test-data/no-status/installed/vcpkg/updates/0000000013":"cee1ef8db65d9c409d3dcb51ffbe1502d2145b7c8d3dca3926189aa6d1d2ce82","test-data/no-status/installed/vcpkg/updates/0000000014":"9df022539533692a860578cd35738a0a6bdbf04cc5a0185b957ea766104cbe44","test-data/no-status/installed/vcpkg/updates/0000000015":"bd9f09994afde2cd99e6304bc3f8da28e2ab27d9573f484e78ffc0a3a13f52d9","test-data/no-status/installed/vcpkg/updates/0000000016":"621eb7a388916b1258a765f35b1c44d90f0913422e2ffb7aefd7063239cf70e4","test-data/no-status/installed/vcpkg/updates/0000000017":"2520e5d62a3329458cfc443ae149855636648e035e2e42c05ef5a0435267f95e","test-data/no-status/installed/vcpkg/updates/0000000018":"c7800e464942a9adf4c2d1c5ef9da265ebeae4d7f285ceed8691d0e4861dcd9e","test-data/no-status/installed/vcpkg/updates/0000000019":"044c59b7c655840eb5e6dd439b77f30ee3f2db91bb099185039998fe66278fdd","test-data/no-status/installed/vcpkg/updates/0000000020":"4db4ef7e843c5b11a03803b1fd01a24d0a5a821a33617a6a9b7bb9e4af66aaa4","test-data/no-status/installed/vcpkg/updates/0000000021":"018e6e2aeede20e9bb072427b36ef8f4d738dccf153ab096071de557d0bf4c23","test-data/no-status/installed/vcpkg/updates/0000000022":"ddd2883537b453fc1cd92b8b648af3dd022bbd7d2dd71467f6cf12dcad1aaad0","test-data/no-status/installed/vcpkg/updates/0000000023":"02861cee9f54cea45b02c2b21faec8f64564de4707bbf966c4799fea36035104","test-data/no-status/installed/vcpkg/updates/0000000024":"faa9c38fdac81b101e5972add6b3d947e95aaf0066ae1a8c1a5b4ffe60567bc8","test-data/no-status/installed/vcpkg/updates/0000000025":"eb874feef69a5cb58592b65eb20c6e4568912fb277b1e0cd38a94e083bc97212","test-data/no-status/installed/vcpkg/updates/0000000026":"126a226b5cd0ae3d87146c9a4ccf9539ef35d8240b4fe713e082a344e81e83ed","test-data/no-status/installed/vcpkg/updates/0000000027":"a0fc65965cb2047655684d702a4e401f67c59488430d95ede831fb350a149221","test-data/no-status/installed/vcpkg/updates/0000000028":"66da517d23966444fcf052980d1564713dd7cfecc6e721847f483d295a2a9678","test-data/no-status/installed/vcpkg/updates/0000000029":"4fe81eb0a048f037777aa46d60faf137445abb315f57398bc2fa18226e95fa96","test-data/no-status/installed/vcpkg/updates/0000000030":"6f2f5d366bde34898ada044f7e3026b516b739a9b825826e5683c45f2d1a0d16","test-data/no-status/installed/vcpkg/updates/0000000031":"1d0f1acb429859c8f2766ccea97cf2e1e090eeadfdf41dce6dba33a10cc4ba1a","test-data/no-status/installed/vcpkg/updates/0000000032":"611889c6d5a36886eacc4a9566ae1b7d721982ab7f4080f4240e866b3efe7d7e","test-data/no-status/installed/vcpkg/updates/0000000033":"fcbae418d622bd8dbaad4a2bd2f4a8767d6e98bde635ae77d72bf7a98ab5d90f","test-data/no-status/installed/vcpkg/updates/0000000034":"5b68b1de7b12d82b2f8760442332ccf838c0962be1e5b375d1db0310c9813def","test-data/no-status/installed/vcpkg/updates/0000000035":"f1237fcd42951be9d2d6f925d5e5a771d8fb4e733c71aa46d950b62260eeb1e2","test-data/no-status/installed/vcpkg/updates/0000000036":"e314fa4c290d04bcf740d0e5eac980bf89005835588c07c96cd9d803f6f55bab","test-data/no-status/installed/vcpkg/updates/0000000037":"c4587bf2614e3886819d81990472c55e519aac9571529afd1539045115253d4c","test-data/no-status/installed/vcpkg/updates/0000000038":"e95097f0e4c7fab4b14357fc6ce8575317a99dc751c5027fc838e9ffa52306a4","test-data/no-status/installed/vcpkg/updates/0000000039":"0398d2054c368525a25b55c82ee9ad91c8c86385fd866c465f2bcc95259d655a","test-data/no-status/installed/vcpkg/updates/0000000040":"e39327f59ddbe749daf1e0cc575a6d53a04655fb404f2f428f0d1c1a13c086f3","test-data/no-status/installed/vcpkg/updates/0000000041":"ea5320b574a62b939994a28ad6d2b1b4914e9f11659b98f666d8c6644ef9c22f","test-data/no-status/installed/vcpkg/updates/0000000042":"d2670bbe3f07357939c2948f0b03f495bdcec40138e0453cddf6a32cd541c8b2","test-data/no-status/installed/vcpkg/updates/0000000043":"660b9e39f4c63722cc4467afa1e0625991bc4cd65472cd652d7879e1a592e9e8","test-data/no-status/installed/vcpkg/updates/0000000044":"aa858f82606f14c1e0c0b3dd4cb2f79fcb7ed8baacf7d97e9495ab045b074e84","test-data/no-status/installed/vcpkg/updates/0000000045":"82a7014e3f7bacab2043cc58a04bf1a04badfc7991f37209b779b15896db088a","test-data/no-status/installed/vcpkg/updates/0000000046":"5d358bb6c12ef4c3dd0eb8463b6c8738848f6131213235a658390a3bfc664909","test-data/no-status/installed/vcpkg/updates/0000000047":"4c282132a57fcd2c738d2431c43fea2e78e11e232c8fa70a6953dbdce03b1e29","test-data/no-status/installed/vcpkg/updates/0000000048":"c66991de151aef711518795bd7447d72c8ed771a5ac25b30e9c4846ae78e0082","test-data/no-status/installed/vcpkg/updates/0000000049":"24d426e5c97371577ec6b239af36c6b2bb9badea720a9a5d21782c87b360bfa6","test-data/no-status/installed/vcpkg/updates/0000000050":"b873cf6861d9e377faf622daf7f4094e696180e3fad0e162ca9df109130a7f8c","test-data/no-status/installed/vcpkg/updates/0000000051":"f401e4838408209328515faed75939293abd747b476fd787a17efcfd739bdcd4","test-data/no-status/installed/vcpkg/updates/0000000052":"d0de7ad8827ba01015c5aeecb2c86957e16eca3a7e808ba33891b532d9b6b595","test-data/no-status/installed/vcpkg/updates/0000000053":"40e2a616ec6de7ce18bd3e6b642a57436f6f43c09e534df790b200f8fce08b39","test-data/no-status/installed/vcpkg/updates/0000000054":"9d179dc3ff6a6211b7a3b3f33d10b468e3054b44dcaf23b3a18429f1032180a1","test-data/no-status/installed/vcpkg/updates/0000000055":"6a370e1e51b7464558f3f1095eb6d7ee5b1718776ccaa213f99a503e91895fd0","test-data/no-status/installed/vcpkg/updates/0000000056":"d57a277a0d0fd11686f32dc32dd2d39b8df2b01d4bde39825cc8deb4dcd802e1","test-data/no-status/installed/vcpkg/updates/0000000057":"3a459990e47956e38b15133c9b60d77236709daa3143affbc9a3b1d1a6f02701","test-data/no-status/installed/vcpkg/updates/0000000058":"66924df10fc42b8a2ae602643ebca30e6afa97d6a2f4c6a229dda8efaa5623cb","test-data/no-status/installed/vcpkg/updates/0000000059":"cda672abf1963c288528f50066a4d17235088a0253d7d4009077a4c083a26de7","test-data/no-status/installed/vcpkg/updates/0000000060":"c4af8b734a6caf7c47f49f2ba815d06be0501163598a4ac1f8c172fba20412af","test-data/no-status/installed/vcpkg/updates/0000000061":"bd4415d0d8bb42851bbf0faa7d911d9f5c8e619f62deb4011b7efaf2a4071592","test-data/no-status/installed/vcpkg/updates/0000000062":"c9e7fda9d139412839203e117b23f12ce63facd416be190938e7949cb1de7327","test-data/no-status/installed/vcpkg/updates/0000000063":"1baf5855ce4c2501cfc20555d5b2a4e92ea5ac73c23804017bc08a522ec85238","test-data/no-status/installed/vcpkg/updates/0000000064":"838f3951ddaf85b58566708c021837846e3335b348a29b3d36ec32cb561d281e","test-data/no-status/installed/vcpkg/updates/0000000065":"017ac74fcbef76cc08f01ed7895fc40e37122066df5ff56e74aaa90fb152cf16","test-data/no-status/installed/vcpkg/updates/0000000066":"286ab1f539d8106ecab202354404908e4932530d2437f7df6e71ecfc3c6271f2","test-data/no-status/installed/vcpkg/updates/0000000067":"485ac50a180038108c3571b87a32bceabe7b21be2d776528d87ccc873a7c4d9b","test-data/no-status/installed/vcpkg/updates/0000000068":"c463752df50d8ece1d1589c14c45f3103b9f11a129e882eebd37cf6fa39e3738","test-data/no-status/installed/vcpkg/updates/0000000069":"1dad3c4f2bb35a0196f76060ea486f061aad49086e8e9368942664ebb68702e6","test-data/no-status/installed/vcpkg/updates/0000000070":"4412a51acf15d9934cea5fc94cab1901868ebd7bcd02ad422b2018a19c69bcb8","test-data/no-status/installed/vcpkg/updates/0000000071":"8b65ac68c422b6d6825ae05f07d909bde3cce8490beaedd48db02d775d004eec","test-data/no-status/installed/vcpkg/updates/0000000072":"763ccc322087c0a12a4b3e5c4db763250ee0006c0d381cecb3df548ed2153b81","test-data/no-status/installed/vcpkg/updates/0000000073":"00f1b2a01c0f8415a2517489c237e0413b2635f2c0ab196e48595a519436a11f","test-data/no-status/installed/vcpkg/updates/0000000074":"030d1ae581f5edb612091a8e1ec96efc044813bcf0a3814741f339ba5b9cbf3b","test-data/no-status/installed/vcpkg/updates/0000000075":"76d2477ea52b1fe0659fcb1074ef6969b49362911942844fff8b42c3a158065a","test-data/no-status/installed/vcpkg/updates/0000000076":"032cedb41033666886fab43edee9a5b6340a7f0abe9c48598df543f4bcc16741","test-data/no-status/installed/vcpkg/updates/0000000077":"d0b8dbae7ede92cf1437a3f4b199a3bf1c056a3e01063ecfc5fabfa4c6965435","test-data/no-status/installed/vcpkg/updates/0000000078":"1eddede3ec2ce33890d1daf2289a27aa53b4f1b7e4857a29b1f96d2ba845c493","test-data/no-status/installed/vcpkg/updates/0000000079":"04c242d2c4cb3546fb1b017cc1125fb4a218f555f047c44347b46eb50de1925a","test-data/no-status/installed/vcpkg/updates/0000000080":"48141623c4593fc080a57bc25964d325a8e1396cd1073f8df1740a2c3410560e","test-data/no-status/installed/vcpkg/updates/0000000081":"007eb4f38ce04d68720c823ea01cb85deadb14108cae957236f5b77b739e8663","test-data/no-status/installed/vcpkg/updates/0000000082":"8d683bf2b4cde9511cd81175027882992e9d7dd311a872d0e2300898205cd209","test-data/no-status/installed/vcpkg/updates/0000000083":"2abbdeb12910fbb18e18a7aa519cbc50f99064703f091ec70287b6bf4ffe75f8","test-data/no-status/installed/vcpkg/updates/0000000084":"e3e0f03fbc25317e4840711e00a76df12fa903c147c0696dd4ffb9f37e35c950","test-data/no-status/installed/vcpkg/updates/0000000085":"e9115f192c88aba21d15bed28b8f5cd421e79a6640cdc4c5eda540c07f501d85","test-data/no-status/installed/vcpkg/updates/0000000086":"5cd3c1f69fead38dbe82d7d8fc55fe5300a9a11baceb8d50517833f5ebfaab85","test-data/no-status/installed/vcpkg/updates/0000000087":"094cbc93e4b95f690591961ee204f757cb1078d1d2a0fd696356794b791a19be","test-data/no-status/installed/vcpkg/updates/0000000088":"5d21d9a4c08ce97a98b400626008300aa6f9b2eb568f32c71320b51db999d436","test-data/no-status/installed/vcpkg/updates/0000000089":"0ee67813f693e9af02a15bb1b72a3d2a5af1f4afdd3e1c17ea706dbf69d7c183","test-data/no-status/installed/vcpkg/updates/0000000090":"1f4dfa0a464c94f38976503802234ad226fd33fbfcaf5746dbe3d7a4ad24184d","test-data/no-status/installed/vcpkg/updates/0000000091":"0136164e2b81f4d440673ea6c0af6fe02491d1e7112cabcab8088986eb23c7e2","test-data/no-status/installed/vcpkg/updates/0000000092":"e6cf981ad734cbc52836362935adf41960ec91f979ec5f9838cca7aae950059f","test-data/no-status/installed/vcpkg/updates/0000000093":"f2f06703b68e7e9b782024d5912076885ea4142dce056d0d2a292e512789da91","test-data/no-status/installed/vcpkg/updates/0000000094":"e0ee5e241c6cf1bcc210b24ed4c5f9410f5506f00092c1adcfaaababe48c37e7","test-data/no-status/installed/vcpkg/updates/0000000095":"8b0da43fba74d0deb2c4a9f2c96ce1f5325f2fdfca6f882580775e3518c2abb6","test-data/no-status/installed/vcpkg/updates/0000000096":"0a5c217f134f6c916377667b3780a7c1510e5f52ef8e3676bd1e4ad01ca84b24","test-data/no-status/installed/vcpkg/updates/0000000097":"38bbfc603003410201e0112f68d9d92da1169cff271b95beccfc0ce9a6d6e5ad","test-data/no-status/installed/vcpkg/updates/0000000098":"796d9cbb0e76d19ab72e17b47b36027676d791e7735a96019ed9499b1262561f","test-data/no-status/installed/vcpkg/updates/0000000099":"0a8907371ce1a5821ee71147be4bcf140465c399e6d7e7d294da629b46a58207","test-data/no-status/installed/vcpkg/updates/0000000100":"b1b2b9063159b3b254ef56657a847dea7999ff984f7614e01d1ab9a7152a9f64","test-data/no-status/installed/vcpkg/updates/0000000101":"ed4e3ad24d6bfb5becb4f70b027f603ac1bbd0c7c5443d2934142a529dafa2ad","test-data/no-status/installed/vcpkg/updates/0000000102":"8f1d3689ae659e842d49c073cb74fe2d77c1f8b15c051cba73cf1d7da61d78b2","test-data/no-status/installed/vcpkg/updates/0000000103":"37e6e2386af297fde8f97eaa0e03a3c754639e58d9ed2b215b27e434cd4f577a","test-data/no-status/installed/vcpkg/updates/0000000104":"0d1614649ff7cc509cdfded6f3ef7a5dad757b32925eb0e7b1eb24f1913721ed","test-data/no-status/installed/vcpkg/updates/0000000105":"235398d3ba350a0b2b31b5d268918a0db5f56006351f9c4a9e657b600282fae6","test-data/no-status/installed/vcpkg/updates/0000000106":"a621d67f5d0ff9367fd70ed09280beb4f20d15c6b5dcad92c92e55db8bc8a52a","test-data/no-status/installed/vcpkg/updates/0000000107":"60a3d9247a4c7771caa7a94eebbb0ea033cc489617a182f09234da310335d34f","test-data/no-status/installed/vcpkg/updates/0000000108":"6c3ac393090dbf1f8eca004b33e9ccd1a0691a6e546fc17424f63fce213d273c","test-data/no-status/installed/vcpkg/updates/0000000109":"2b8b64b90af6841ad9ab202532122a8b822d490787b20dbd27a4c4ac1a0b2777","test-data/no-status/installed/vcpkg/updates/0000000110":"7de4fd5bad279ff03dc5945559ad77ce446986ba05a0cc8d8902fc4e0cd232a8","test-data/no-status/installed/vcpkg/updates/0000000111":"938d172d989d8403cee955be30666dffc7e4e11bf9c482f228efd17c1af35aeb","test-data/no-status/installed/vcpkg/updates/0000000112":"f72da20ada0db1e0bf4bc83b71459cdd914d89a3d59bf9a8c7b10faff5ccb5b7","test-data/no-status/installed/vcpkg/updates/0000000113":"d899c4d97ffa8b303c20c885e2bcd9bc9000f1000da0df7b6a8db77d21bd1a61","test-data/no-status/installed/vcpkg/updates/0000000114":"3221611d9c05f74d61ff3191a89f4029f0fe15d1b1f6b17fa475d944782b2206","test-data/no-status/installed/vcpkg/updates/0000000115":"3f0eb57bef30157fe8aa30e1ef3244c47f4081384078ff6549e70883aa572b40","test-data/no-status/installed/vcpkg/updates/0000000116":"be5c2ed2f327eafa25933219feae9600c719fc0b23b2723314572b2ff8a9952c","test-data/no-status/installed/vcpkg/updates/0000000117":"b3c3432d9409f0e3956f2c500750ba9a510d0116096390c5a7dfa6e02bea55a4","test-data/no-status/installed/vcpkg/updates/0000000118":"6e544b34c9db4ad74ff21b2a467adc442669ada0ae01fbe05d364b6d5338b598","test-data/no-status/installed/vcpkg/updates/0000000119":"2db0ff022430cb3c2a9230cbea6046ea49ca90da4e7d6feb8a2314d11ee424ca","test-data/no-status/installed/vcpkg/updates/0000000120":"d499cbc7b9aee21863e73b0d6eb06847e5f063b30a0cf9c8f83da4cd5a7cf28d","test-data/no-status/installed/vcpkg/updates/0000000121":"266596f22b707eb905d4da7ca3e7516f2c0e58e55371fe9080d19d3240f30e9d","test-data/no-status/installed/vcpkg/updates/0000000122":"52ba9dd3b82a4e51723978bc927df6b1ee529fe08b86bff39d2da1053234d979","test-data/no-status/installed/vcpkg/updates/0000000123":"118054aaa8adbd9a3b011ef5e9a5cb68e92756276237ca82641bc3e1becd6b19","test-data/no-status/installed/vcpkg/updates/0000000124":"e357c0255666dc9efbc0d5df2d9663692033d3c2caf8390089ae9b45ef4bb5bf","test-data/no-status/installed/vcpkg/updates/0000000125":"74f69056cc2ea411267d7a9d9a104636ce641fcf45fb90225d2306e519f0b603","test-data/no-status/installed/vcpkg/updates/0000000126":"c53e5956842c53df8c608da6dc78cb94044271f17fcc88c44f160032d28ee351","test-data/no-status/installed/vcpkg/updates/0000000127":"829b52bfb23aba123c6a5367b8b80c5a00741a47a3b7d7ce31f995f80fa96e07","test-data/no-status/installed/vcpkg/updates/0000000128":"f87c1846c4da4c1d8a0e505e49a5bb4cd3be207f369fbc2fd335ac0b407cfb53","test-data/no-status/installed/vcpkg/updates/0000000129":"7025e4c8cce75667b9ffefef4105df24b188c8901c9b9e132466c622e017ef2c","test-data/no-status/installed/vcpkg/updates/0000000130":"31928576e525e30acebb43d14f06e351ea9fbc36aed3de63011507c94c3a7f59","test-data/no-status/installed/vcpkg/updates/0000000131":"d212103e503dec24f636fdc56cadd39fed7271c5fde413640697fac43e3edf30","test-data/no-status/installed/vcpkg/updates/0000000132":"27343c4b328d25ab397a293aa9cb37852e5a7eae2235754eb9a0d78c5f79fda8","test-data/no-status/installed/vcpkg/updates/0000000133":"cfc19e77f636a8f1022241a4aab51c141fd328908bba0cff06330f07437710b4","test-data/no-status/installed/vcpkg/updates/0000000134":"7f9f161183b077b00ab96e08a235c884adc8a7bc2b335726ac43d841bbd3bd39","test-data/no-status/installed/vcpkg/updates/0000000135":"7530d1d77206cb7e41e2eb282593bb67ea5e8072d62f8f59f420498f8a915e75","test-data/no-status/installed/vcpkg/updates/0000000136":"4be68d806cc48fc729851fa586998a88a19ff3426cfc8b9c87509452de614a9a","test-data/no-status/installed/vcpkg/updates/0000000137":"6f235da47ba85ade8fe2264cfa0228f91f919d60078218d3e38a585310489733","test-data/no-status/installed/vcpkg/updates/0000000138":"a74924c34c785792b3fb0672983bf85963d814503c5b9f9e659f8f37f53feb48","test-data/no-status/installed/vcpkg/updates/0000000139":"0a9e011e7c1012e9fe9422b015950b5caedef57a4f370c6976dc5b5efbebd02e","test-data/no-status/installed/vcpkg/updates/0000000140":"021bce66641ca602a73cbdea0e5a485918a6f212bfbb0c0e18bb869920eb08d3","test-data/no-status/installed/vcpkg/updates/0000000141":"985d4fce6fb28b2decf4b9ecd740d2b636653d5210f9d7ada395c1868604202a","test-data/no-status/installed/vcpkg/updates/0000000142":"4fc6a68d16bc8b4f587cb38821482495916e7889e2af2b8b425b5f8decb3fae9","test-data/no-status/installed/vcpkg/updates/0000000143":"92c06a2d59db9fb592ac2f118a3dabf792b80d34baefdc05beb367dbc8a51357","test-data/no-status/installed/vcpkg/updates/0000000144":"fe34caed1a089a00c95c6018c5627b6351f5e408665b33014682c0f845687430","test-data/no-status/installed/vcpkg/updates/0000000145":"2fd2b86880dadd557afd5f2e261a92a7914e9a3afffc737b3969cf44559ba31a","test-data/no-status/installed/vcpkg/updates/0000000146":"f29103764070f769546317568d0e374096552bb5a4d1a5d465a11f0314d4debe","test-data/no-status/installed/vcpkg/updates/0000000147":"b4b2ad943503a0cab1e83d82d6ccfb1f04fe37328b828f60b1fcf26385fbfcc3","test-data/no-status/installed/vcpkg/updates/0000000148":"963fc629e475801275fad8438107c1b800ee88ec251b68693ee804975b123939","test-data/no-status/installed/vcpkg/updates/0000000149":"d0f60e048ee4ff8a1c386b3093f9e73c727a4f87b0bf76ee1db6c23a0f2d530c","test-data/no-status/installed/vcpkg/updates/0000000150":"ddb47d326bde611bf3002006d220f53ab99c41938e75cbaca23ef5732ec06d55","test-data/no-status/installed/vcpkg/updates/0000000151":"813b76932813311b295b5edfebeb01a1d0d264cdfe2bb6aadc33475718bdf63c","test-data/no-status/installed/vcpkg/updates/0000000152":"0e35621c98857d63bae2e0bcef2ddd123ab36e8ab8df834e3bcae17f091f3e5c","test-data/no-status/installed/vcpkg/updates/0000000153":"72e7d02a4d5e166859a681555a21867ad5600fcb4094f246d3288f98a7888d03","test-data/no-status/installed/vcpkg/updates/0000000154":"1f6933e9b989081d08c56f5a6fb87d3bbc60ba92a6fd14a5f5169a2ba67e0970","test-data/no-status/installed/vcpkg/updates/0000000155":"37d4c6a11320cad6a988dd32d34837f7d46f1a21949fcbadfe582afaa8ce4f6f","test-data/no-status/installed/vcpkg/updates/0000000156":"acb7006107ccc64d64ef0fd443bd33466c59c708d003f0c6b317066c1691cc6a","test-data/no-status/installed/vcpkg/updates/0000000157":"0717d0a726d963744dfc833e5d0668bdbcd9315a5b37b9f6400980ba697f4756","test-data/no-status/installed/vcpkg/updates/0000000158":"164206fe2e7ce2af6de12912b881d79d0a68dc0606549162dd2132ea2c82b7fa","test-data/no-status/installed/vcpkg/updates/0000000159":"d5d234c82f11fee89930c5f6a6b74f95122a9a1721b21ce96609ba290f08c2e8","test-data/no-status/installed/vcpkg/updates/0000000160":"3e5afe612d6e3432bc8ce868908f08eea0abe051275bbab880fa925c94981da7","test-data/no-status/installed/vcpkg/updates/0000000161":"7c356aa28879479a47f6acc34f6d013378269a498c6af4c3e5d1d7798e72ea01","test-data/no-status/installed/vcpkg/updates/0000000162":"b15be1615d80317ffcedb167ffd483a338b2c65854292e4e055f48554b7d670f","test-data/no-status/installed/vcpkg/updates/0000000163":"7a2edc574e8804d22873c59bde22d87237670c9ba3c8dc2ca87b54e63749f2c7","test-data/no-status/installed/vcpkg/updates/0000000164":"39d945385138db1e7eae7dda647c5431b09059fcab29b358118c5a0da45468d9","test-data/no-status/installed/vcpkg/updates/0000000165":"9c4895835a8245a5a199e056b4a1cff2e9bd4c9142220856ba0e28cc2f45b231","test-data/no-status/installed/vcpkg/updates/0000000166":"2959140bb3a91ce451627788aa135a97198bce4fa6ce900e8eb8b8cf5f0b9043","test-data/no-status/installed/vcpkg/updates/0000000167":"7506966d576f7af4b1dde2760fddb48164f74c01af56478e46e8379270fcb308","test-data/no-status/installed/vcpkg/updates/0000000168":"25efdf1f6e235401a515760e0b5747c9486fdb3efe37b082f03d8f3cdabe4852","test-data/no-status/installed/vcpkg/updates/0000000169":"a88f9eae6d171a7f34164968a0fc8835f68e62c12c065c9b501fd0a68665a4b1","test-data/no-status/installed/vcpkg/updates/0000000170":"f2a866c7b1e3c541533bdad9c3e284a7749cf2ab6d412b886cde7a28a28b00ea","test-data/no-status/installed/vcpkg/updates/0000000171":"906a7b88f62a2e76c589243edcf14506684d43613216250cb506388a0f300dc9","test-data/no-status/installed/vcpkg/updates/0000000172":"f81db8dc8e1f1ae0853b6c8bdbb265b0de9f2c926c2f4f13095cc8e6be0009b7","test-data/no-status/installed/vcpkg/updates/0000000173":"d80d891d0ae70904f6fbdaf1ffb8fb755acc4ec83091493c03cd83f46089132d","test-data/no-status/installed/vcpkg/updates/0000000174":"086d319ec6dce89c2aa1ca8836e75c0dbf8781add28a149773f37080aa319f27","test-data/no-status/installed/vcpkg/updates/0000000175":"d9ae8f0bc711568859f61be471f59d005adb4afe61e58895ca72b9f9e1173be2","test-data/no-status/installed/vcpkg/updates/0000000176":"94ca7af41fda45cd8cea27b333ee8928564e05dc8fee259cb6a0830f52b30f67","test-data/no-status/installed/vcpkg/updates/0000000177":"008c6648315202f997af546b4fddd1cf0a09993534348addfe6be8d99499da7f","test-data/no-status/installed/x64-windows/bin/boost_atomic-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_chrono-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_container-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_date_time-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_filesystem-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_graph-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_iostreams-vc141-mt-x32-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_locale-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_math_c99-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_math_c99f-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_math_c99l-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_math_tr1-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_math_tr1f-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_math_tr1l-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_prg_exec_monitor-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_random-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_regex-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_serialization-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_system-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_thread-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_timer-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_unit_test_framework-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/boost_wserialization-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/icudt61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/icuin61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/icuio61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/icutu61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/icuuc61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/libbz2.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/libeay32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/libmysql.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/lz4.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/lzma.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/ssleay32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/bin/zlib1.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_atomic-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_chrono-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_container-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_date_time-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_exception-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_filesystem-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_graph-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_iostreams-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_locale-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_math_c99-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_math_c99f-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_math_c99l-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_math_tr1-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_math_tr1f-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_math_tr1l-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_random-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_regex-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_serialization-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_system-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_thread-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_timer-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_unit_test_framework-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/boost_wserialization-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/bz2.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/event.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/event_core.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/event_extra.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/icudt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/icuin.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/icuio.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/icutu.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/icuuc.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/libeay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/libmysql.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/lz4.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/lzma.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/manual-link/boost_prg_exec_monitor-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/manual-link/boost_test_exec_monitor-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/ssleay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/lib/zlib.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/tools/openssl/LIBEAY32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/no-status/installed/x64-windows/tools/openssl/SSLEAY32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/arm64-ios/lib/libbz2.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/arm64-ios/lib/libfreetype.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/arm64-ios/lib/libharfbuzz.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/arm64-ios/lib/libpng16.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/arm64-ios/lib/libz.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows-static.list":"825a476281bd383dbb7402e922c92a4793ca36b78ad33e9457b4229bb4de6e0f","test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list":"285a1c0bc2bd69659f5197b0acb0bc595f8ef4cb3f9afb4e73f421bda14054fd","test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows-static.list":"87686df67e0cd84eeed3818d62f52e5d5642932b32c17b794b768f636feabe39","test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list":"d81624f166a35658972e280dff388116e59a81c649ae4ac060f5aa272dcad7a0","test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows-static.list":"cfc3297083f14f4bac4dad7d01542c9e0e2ba43c3e04cf269356824319c2624d","test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list":"24bed9588f9fc89f50a7a790c9bdc9972ee78990be30e4a25b8bdd91c5f3a12d","test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows-static.list":"b53d5ec56c3ea1970105020ab5083615fc275e6c168e974c85a4f0b9fb169d6d","test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list":"9f4203a92aa587ad9153c13ebb7c492b7a77c1307f334853a0cbeec1dfc34965","test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows-static.list":"c0bb69314baabd6cb98ae6b0793a263f19586e683848d6bbd373caea0202f6c2","test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list":"4c56a359fc8322bb8cb77955cd280a836c663479de8fd9ea0c813d58f3606e96","test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows-static.list":"c4384c170df913d600cf6b75e6a7200e652c5c7619d40220668667313da3826a","test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list":"541af7e82f9a0c402acc8c89b72216a96f3bb7553a0d5a608c908d2870fa03d8","test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows-static.list":"95208747c252b272cb290280793b5f724decb3b74a31c561d67c05d151a92644","test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list":"c4cb52f670a367f12a2f930bfb82143f2dd8cbd346daba3a570886e4a26d58ee","test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows-static.list":"d7dddcc1e67a50cb351115346574058d87774716abd7a83321b07ec8625253fd","test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list":"7562df82be2b70c12baf76f076db10f07724a8944d40e41c5b63b472b3c282cf","test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows-static.list":"732814de4d6717f344f3d02df7a17f146604c6930187ad434661d2a0c2bf8423","test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list":"6236be36f263beaf7063f98b69320e8943a4bfe2f7ddf3431912ad34725d4a0b","test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows-static.list":"b26e4b9f2ba1fa9c35c6cd2521861b67029ad9f100e84ef8f4ca94d524a2b53f","test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list":"001abe44817161c948a95db0793015039f2d7d9a6c06fc6e2c082a11adebb22e","test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows-static.list":"723729ee449265668962d27edd2a31e345fdc54233862f67c0d76451e35faed2","test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list":"2027f6af1a4e76233b8543f94d3d032efff8df85a6f385da00fa3187818e3e2d","test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows-static.list":"021449c2bc40d3a9bb3a8b6e3f6b3d0cfee89f17da45d4563d7c62631782b7cb","test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list":"b9d48c4fc1150cf02261fde85979170f6ef9b834fc4dcc002e5c73fd3aa02a69","test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows-static.list":"76565e099862857536d871c86d9c59552b3fd13f35ee2525714325b6f5e7c687","test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list":"aa92c77b2a4e8773785e2e0a764a651f17b79ec8482b39f5cf97a724a6611cc2","test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows-static.list":"d39241fd47e3cab799c8bb758b062cbec7ab95acd7233d9ae1c33a7f05c39b76","test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list":"4daa3351489b23e8b6e4d6b05f5ce0ebd6e69d27de8360b8ff7ee80f9db02f88","test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows-static.list":"12279574ef541f579ff395df0f3a926c0d79a50daec9fcbc84c787d8a830457e","test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list":"4d37312db9025e16cbc93190b30af1a1a690e97e160a382efed0e48586c87a19","test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows-static.list":"a219ccdbc3a726ff555473286aea2d279e7c4566eb17139f65fa52ee2cd86870","test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list":"441765fe7ccf82b94a6356e87f46864d6e735825654f98d47c5a0752c8e41f0c","test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows-static.list":"5555e1319619a20b72ce692a7bf9d94862eb62cbe90df83a33f66725a554ade6","test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list":"b7507771296c7a9a1087357e2f1b7bf875a7fa2d88d06f0d76b4e0e212563522","test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows-static.list":"840fdf154ac4efb1ae2424834937b4d25b1813b50c81474acb6448e3012f0aa4","test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list":"3290f7177acae782a86daee973c9318f853bd548a7484c20d960554f57de04b6","test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows-static.list":"93d21b5e5f6cafc5c208f4c3e0c841aaaeed25744d7dc6c06e79f91fc911f303","test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list":"14f79bc105881e526d44f334ce3b378d2173bc9d7ae27bf1bdcd3d53b2e380c4","test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows-static.list":"9c8ea4b3a5a317bb422f881bd0163a6439014e113909bde7128caa4093874675","test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list":"be694017810bddbc09c0f158ae7efb1fa4513e2115bcaaf1bf5637518f7c25e0","test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows-static.list":"7b57ddba1eaee272ebd17b668d0880a2e30376e24108b93008c5dcfac03af155","test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list":"00ba72b897412e72c0a32755410f92307de387dda8e8df0ecdec496547ee0e16","test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows-static.list":"1c403b54c4c3ee54adc027b6de575abd3b5b6a5eb44d5794b70ac09bd4e48e86","test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list":"715f3a532969aadff01716512a3730cdf3170b2b391fa08fbbbb11c7dd22f5d6","test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows-static.list":"5213de33e2c7732214978ef853cbb8ba226d01aa0c02c47ccc9378704248394e","test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list":"c4e08900238d804329a2a1b5cb664c7d2ded141780dcf4eb7de25217f7a79936","test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows-static.list":"305e6e2c5d4ae70b9f885846f8090e3d1eb38493bba1b238ea335b250988f27d","test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list":"9a4b8c180a50b1cc35983352d09d6717d76bbb1a2c944f72ae63d5671a1a1743","test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows-static.list":"999b49c2fc56242a1a883946fee029d15aefb55cd401309926900d500b83e575","test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list":"358bbc71d4e4379863a7249769d12d020c43a03f9cda4cdd538dda477c41439f","test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows-static.list":"1512b1f86db01c6fedb018c69cc7805bca3aa52a60ca45d357c1f6e69de0db4d","test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list":"c1fd7ab057f83ebe6685fa2b34ea407ea7a162db6ff01ceba8950684c2c2cd9e","test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows-static.list":"244763c94c065fe124a72d157ac4cc57d84d5a64b2ad9b937e219d4ae7237af0","test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list":"3c824f6a87fefcebc008cc945d652e535bf8ce46a15202dbcbcafe396ca9ac4b","test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows-static.list":"40aa602036101fe8405251d7fec783a6e413f22fb1b347e7c2e5a0ea9287dcf4","test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list":"eaf3d85ec8e6857e5abf98d329fd05d3580574a8635e1e9da2fd305135cd7474","test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows-static.list":"2da80dbe7a260dc2d80ab208fb2626094493d929f2622c0000f2df122549fc3e","test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list":"71530a23b8224b138943713dc9a4c9e26007ebf6d790bdf40ddc5e5f19239fd6","test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows-static.list":"f5ab278e2646616de5eaacdc07bf84de3373f85f370aeeb4097fd3d51d1fe3c2","test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list":"bffacdd10ffd104dfd36a08cca2dde7f6364ce97236859d32a6be1fdb376eaa5","test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows-static.list":"d45945e0ced0d3708b35a1ed0bafb76cb725c9f6fb992931b2191538591db0df","test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list":"decbe6397bd9d3d2ceb6fd5be70910c519d4d548048fb4379ce5023e69456de2","test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows-static.list":"5e7861288e77b408e6ed15b4808b445017d60745f4f2748804e7fec699022191","test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list":"f6133baea0e06c878f0a5690ba6fc41f79d5185095138741133b3f35d4bb9623","test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows-static.list":"bfb508367053d716c4fea14cfb7962d37a366e14ced60e45ffcdf783d45f2099","test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list":"924bed91b79ae299716e7fd3cbbaa3c29f234cd42c572f8c35068ba6eb651663","test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows-static.list":"5c7fb5523fb0f9b5793e7a25982eca69ee63e9ff9b5200e36965410d0e2ef094","test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list":"9fd6c473c9b0c2b166c79d57f5fd30572831d6d40722ec63c206aea9046f085d","test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows-static.list":"053c20ef35221a47105e5f6710791ae38c092e5174b19389bd157ce3b2e3bd14","test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list":"6d6599737a0b79ce5636b87396c071f59909c399afdd5ee672a8856e3cb84bd1","test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows-static.list":"484877da87d879812ff62832cfaa502c5d30c55822731f8a3ddffb7553ee8748","test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list":"7c69eaf1eab899adedfb28f53974022034c0b3335f8a52efdf68bcd18dae1cae","test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows-static.list":"8800fecfedd26763c00498ac3ba27a6026997cf4713c4db26a1dab97ee559a72","test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list":"7c043a1178f8131113f8d3c5244cca8d6585481632a5e3347a26f008788277a1","test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows-static.list":"dbe71c710990e898fd34765f0ded82a2a5675afea8c3ded20afba052796b9a93","test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list":"ad67e8c7aafe39edde3e7be325b7f7d66b5bf98a52f71ebb083ea299b9c0a899","test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows-static.list":"a9dc0c4af951c12648b573ac6ec0928ec3465fd40138b3b45fc20a58c6b8ce64","test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list":"320cd917d5f52317ba21036c49e33404ca4e0c9c954dc2430007d5434822edc3","test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows-static.list":"47533d9703098300f3845f0d583aedbd495737d307aa1d8461941ddd6479d188","test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list":"7c5e3e897dd2fb55a10c9c8042e2052b4141c4909385b1979f1d6d57eddc67bb","test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows-static.list":"c41cf9e1a58e662cda24aae3edc35a2899fecaf5dee74896d8d965971f021dc2","test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list":"88f031162b69f05f282aec8798c3de381b1ca369c8471a4903a0429b1ecc5c95","test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows-static.list":"6ae87fadc3116021280b983c80f350325f1b8757500be73d0781dc44df58ca39","test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list":"ea50fba742ec58b800cbe8f72b65aa1e494e1bb6f62174aeeacff5ddd5601bef","test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows-static.list":"361159642a46cd474002e1f03900db89eeb5121ccf96040648e795bf5ca2eeee","test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list":"a0b0801ee4f8c569ce3baa4a31873e13a8665bf50867295be7ca4605bd3f871c","test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows-static.list":"7bd1b7ea38f12d2a0494bbf71283a0414f0fa3936ef45cda2bfda36a1d33e2ad","test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list":"8014eaf3677996f22aaf3a50cf01205e7fd0c4dfd1e59a8f61247cd02fef2675","test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows-static.list":"33ad65fa4e47cd4ac0ed294f62b7f456e632da9ce9ca22d581dd06fb98c3f529","test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list":"bb20430c0b4db086c5c61b12f1210c6263e802d0b04408b2541a482b8d6287d5","test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows-static.list":"37d097a35cfd49f1c6f66706eefc0e7ca3cd20d21247f45ccd2a936351674ada","test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list":"1757581d36c43e9faa9e7dceaa48269024f816002b36ea2c58b65f08a26765ed","test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows-static.list":"871108bd92fcb44b6cb2f8a66c4679950e1885ed3888e0259d14ae1aa4459f8c","test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list":"76d9fc8d969c6e419cba3549ecb191eeb84d5bc0ac33a799dcf8406c3f75d0c3","test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows-static.list":"c979f80761f3e683b6bac46c01fa65293147346b56be5987775fc8eec920228d","test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list":"72160f933b8d7b5cc8785d141c52f9121a4d72614dd74602bb9130630c2d7e8f","test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows-static.list":"482828734373a96e23b6376e8d54ceffb583c9093563ee64c5a8b454a168f33e","test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list":"bf16069646d3ba03076ab97e7bc9dceeb3bfdf718f6cadcc57aecb0ab58ff6d6","test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows-static.list":"baf8acd5d44868293fe2751c52ec15c672291cb67d51aef6189aab5ced3048e6","test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list":"3c4bc0a9bf44a1e4d549d69335916425b87ec550fb6c117d560459ca846b44bf","test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows-static.list":"aebb9ea2f046c373529844ad1c142572f6ab1c97bf664512bd5d865124e927e5","test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list":"5d2166e06254528e1b09d3a60db149964b10422b73a6cf659312f07ffde5f82a","test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows-static.list":"b0b1e9d61c29d9d1d8d75dd3f4173221d275035222c1f926d9c4b0b3e5a7852c","test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list":"21e041e33a795e077de29de7e791a9903b43c695c269c1ce4e4b55d9e1d84a2b","test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows-static.list":"26f682001db8bc3851647e5ba3d713a0c497bb95f3586e72406860d6e9580ae1","test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list":"daf731d37fdf2b33ec09aa90eb82d1e4c89dbea8a44d8b1275823c62a040a9ad","test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows-static.list":"fcb677b546de9a1df7ff4d415c35f956bcb3422a49d91b84171c3ff80d9f8694","test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list":"d89e6f5e1ba6c786f722d11dc01c29d0f15210ab9dad0e36e4f081648adcb7d9","test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows-static.list":"78063c5b7506f6457e88c2f42c5e419c85c56a1a98e7ec331f95201c9fcd4198","test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list":"95063fe35ea1488415c22ee53bdda9892b5774a824e036772e7fc1c0b10c43a9","test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows-static.list":"7cee8a4c1081e1354986588069e19e2f685e3c67e826dd2cb79b342e71f5b5f3","test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list":"0b1913843daf81cc9f57c39283c635f5f4a6c6f8f30e774268ac1876d35c4a29","test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows-static.list":"64449ac2b16955a54185b6ab7f58a4e1b1fa19545d1ede491e9d32abc0df20df","test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list":"be9628576b31f9f840b90f131a6d95dac68d96f9cbd37b6486d822fa383c96c1","test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows-static.list":"c321574acb847ac7837aa6815c2d6e556a4b91aae85dac5fb4dbbbd04b795b84","test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list":"60188be064ae425205f548c27c3fbfeb96ceabc0e3d945d05f4565577f701ee6","test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows-static.list":"262a7610f1407b9f3e9b79c69959445237277dd1edaba1a4530d3668d9aad2fd","test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list":"4b122a363389d571e1e2399fc6fbeb2c2e0091fd3a9e974b17dcaf867e0e3ca3","test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows-static.list":"19fd89d475bf220a63a5ef78422385b3aee25529fb7eb75086ff6dbb2084220f","test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list":"6728e26bf5044bd46afae85c0625a423fb41be6bae74284acd39ac1d52bd4e73","test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows-static.list":"20b6add3bb32c184cfa193bdb97bd607b038ee5dc6002d35b04e1529dec8638d","test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list":"40aa39eca308c8ae74ad52d58e2b61c900f120fad2ba0437f65e47957a7077c0","test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows-static.list":"4653ae2078c6f8a6d832d95e8daf67d7e3590533c92262d74c543ba60f0780b7","test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list":"e496feb0a6f39dc614390150e2ca239654c24609ff265496a5bf69f6be788302","test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows-static.list":"d2bcedbc537f4859274fa6b5509adee7f90f0af29d5935ef4caf236ad8041aa4","test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list":"9fe5dc0b4c2119aa31cb02f149b23a7eda1fc8c390c282ee47d23fe9aab8a364","test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows-static.list":"ded91748c637377e4e13e4fe30e2b38f7962f510da675dd000d217f6439e3ac4","test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list":"e4159abf32a06aad4c7345c6ea6bb887bb9e54195a3bb64cf51d3f71a0744424","test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows-static.list":"148b2c92570da37cf95bddcff00c9b28d1a449bb6be07bef3e08ac1b9b152cd8","test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list":"008a958b11b72216018dc8c6c0c669e183f5cf0a9a96063f28667c8f55d8551e","test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows-static.list":"f409910a757d30c5aeaae04899615285ffba8dd9816ca366361a6fa892f198b1","test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list":"756de6e839868ef5818150e6fc9f07a8015de0fc2c32f88af23f59de19fc78ed","test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows-static.list":"324abf7c31d25e65fa7196f3e0d28a6341fb7f7584486ada50b2c3937cb7f24a","test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list":"00a0f40484573b85b73e53228181bccb2cce691cc48a8060ae05182deda6a898","test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows-static.list":"780379021619485234f617b53f9bf9eeb71639cab8c78d0cb884a283e156cf01","test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list":"fe54a6f04ea393d12dd1c5beb2c49fd1fd4120bb8bc6a884d40143c643d864ee","test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows-static.list":"3f86f8e01b1ffb222575efe7b3ee346fd6d564cddc4b87260f0d4ebd2f6d9a2c","test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list":"06ceb3cb6398b97fc94f1877ae522f8dacabc40ef8d7a74ea624eb0460364a53","test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows-static.list":"1b7c818da99efce3d8fc7cb75ab8770229b791f6e8ce835616d207f4709a06b2","test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list":"d44b06621e3affe8f5090464374878e2d449751f4ba7e49a2fab5bffea8ee72a","test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows-static.list":"f4aabd6c82931abb299b6322ab714afb4249667eff47df5ee1694e369b60d162","test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list":"2f50196560a0cfaa5bc8a1a3b0d2159608bb1dd078b0561b925eae61716c35cf","test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows-static.list":"f334ed64206484f5d5d88067b19b511b17d7135d09a5b6985b696a934aa8ecf3","test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list":"7cbacb5bd763fcaf74dbca12fa2700b79206201685b7459583406a0583b1028d","test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows-static.list":"f123198f42711fdce7f9a18fc25b9a3a4721e216e6b01c6bc0e5c010aef872ad","test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list":"c6be406b9a29c44941626d53f617dc615cb9cc0572157c54980fc4455ef30091","test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows-static.list":"ae3f9310f27d60637c9fb8a3f121084ca0f745737e5c90a4b8033308f8b85b38","test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list":"b6fac8b00b9feeac3f3701c8f44cd42bde00d2a0b8846af4464af9249d6d102a","test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows-static.list":"9af50f8fc8d929f0de3a5e89cb165900318094f371e45d41902a50c914236630","test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list":"93da5e574846f417c3a6be75e83730c6109e4fa5521162d8d926a9cc0c717021","test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows-static.list":"6ea9e93cea9d9a4fe8181de1a1bb62e8c009f941c9860e922f5cabe83f0a4eed","test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list":"740d956db6b770544dfc5d43e943f79ea1290259997b50694e41fb6a970a020f","test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows-static.list":"0b7fc966a6033f65393cfc604e842efec32cbe69bdbc247d0f6c68f96231d2c3","test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list":"7e33c22639562c0deca07ea24c04c17b64c0423ee8e6e01a56af73d8024464bf","test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows-static.list":"0044a32a7202dbab961a81da014ca400357f9e591ff2022973e7a37c9f77d0bb","test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list":"f6c35d80c7d34f43c55e8d784b30f0756fe9d0bf20c156484af8850085dcc608","test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows-static.list":"f91a4f203f8745660a11c870ca40b0979499875ad4e3fec1583a49c4234178a3","test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list":"3881301debeb3efbaf29ff1e853240f71f0ce72b937551f52a08122b5b03ba54","test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows-static.list":"6353a1e76c6fa19097e4c20fd767296b8afacf5a437321e295b33fdb18298308","test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list":"f77f5d29835488969a821c5a4ac1b64d6ee2331ef6fc12ca0f39ddc0b7f3d68d","test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows-static.list":"2d9a5a21c614c076e8dd185891a3df3bc1dda7a7ce92ae6328c583a44605db23","test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list":"b4936bf7fb1516e19e7926d4bdc5bcc3cbc69e20cf437762c08240b87867a630","test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_arm64-ios.list":"469aa3dd20847ba8e831d430c5f8dceceab3343579410595f9ba8fcd321b6a46","test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-osx.list":"e3cf20c0f763092cc6753c00654ffa55a1001a3bfab2c87a39ed7a30d0f898ba","test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows-static.list":"edfb0a427132bbabd178283c1ab2aff0cb71a46444464eb23ac2acaf7b85595c","test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list":"266146aa696501f2d89ad104da167be40db1b038725a74aee4cee394163dbaec","test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x86-windows.list":"0db3df60bd2afc8ba81f2a16ceae114b8f30b2e7724e998c0bda1275e5c2abb8","test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_arm64-ios.list":"e5ddf36059f6ed95ac73c66dcdedbbf2f86a11b361d955f14258e3640cc88064","test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x64-osx.list":"5cdb39d51882575c49a0537aa549222a0765542080bdd01f17e813956e5634e2","test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x86-windows.list":"ba1518d0a109e5e2649edc17b350022c78d6a7ed92d5a9dcff1d11fedd90a82b","test-data/normalized/installed/vcpkg/info/graphite2_1.3.10_x86-windows.list":"60b6f027e7fd2e0dc3ef8f3172a1c7107a29b5f17f76c7251565f2e569e3ca8c","test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_arm64-ios.list":"8cf01233f9d5b84a86624ed50a0f0a40e413d49746cf8aa5a38243f6c9970106","test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x64-osx.list":"c7863b16f1d707c4c60bbf8fc5e1cf049014ffbea24b1f67a7fa10b734e270e7","test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x86-windows.list":"751ff5d9f9d3080b4c12c99a4a9beb656dd6f37627f6f77f5b822d3f0f583a34","test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows-static.list":"ca1672209a4760d4c3f168b0fc3756370f2e4b797b0964a395b74f3915841dab","test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows.list":"d99a3870aaf62aaf4e2f3b1f23b9ca15c9dc047751426de8323deddb74601bcc","test-data/normalized/installed/vcpkg/info/icu_61.1-1_x86-windows.list":"54d8c5b9c58307710091e05a7a8a7a11e2fa4a98ed100a58c2574cda062af15e","test-data/normalized/installed/vcpkg/info/icu_61.1-2_x64-osx.list":"385392c0b01f01e2f8041c5c721a95eaeb1d654e8c1ce7d55e388782f8b9509a","test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows-static.list":"f2e0a1ed619c04d6e2ce69d8b77be7c04bf85306dff88f3f974b46503ffe336f","test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list":"e8bfac000f63f86c8eb7838371111cde8e8141ea6992783680df1b727d0c2357","test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows-static.list":"519de7d2d5510738e9ea5ffe5cc4f594ab80b840151cf7ba961ac7844930d86a","test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list":"750c4e025a9e631f0fbeb11b398f2d5517e0db1b64b0fa24473dd581bc60c4de","test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows-static.list":"d7437ac98fd39d79430a607aca1cae8cc4d157c03fff3865b159fee1b3685cd4","test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list":"fcc2c1c0836bcac1478416f8507bd5b46d0f77d1113ab646dba02265103ac33b","test-data/normalized/installed/vcpkg/info/libpng_1.6.35_arm64-ios.list":"b6c20ec02c83ce53bd28fd66f23b03642418c01370aef50717d52c8b81ba725e","test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x64-osx.list":"582a9a854687fd083078b606c200b7984552e82335cfc3792840d45f7f3335ec","test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x86-windows.list":"d3f4d930f9d5691b1fa355b4cd6b47f4cefcc4a28855a3e043a5849667bc9b57","test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows-static.list":"5314405707a897ff8e5c6ca1c587b1897ef4902fad953954cec71e1ba05e1098","test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows.list":"e4b71d66138d24f16492bddd056e7295148f3c9fc948c0270b1c68a0b3c489a1","test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows-static.list":"bc267505a39282993e37de20af7c4ef20b2ab7f412ac9203316b48cd4066ff60","test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list":"818562a99a6a813462f7bfd5887ff8092cec791d456d1788f6ee75810c180abf","test-data/normalized/installed/vcpkg/info/ragel_6.10-1_arm64-ios.list":"77751940a40253add47e9de4200783b55ea9f2b7540feb71403426038ffe480e","test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x64-osx.list":"10310f9b481ada6467097d65cf27587b8a3d49ee956dbc8ff8a19f434558fb70","test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x86-windows.list":"1e3cb8016a5b8cca12c6c918e859deee34228f9573b3ba5522115adf28d8bed9","test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_arm64-ios.list":"bec857b6f069b0e084bc0f36e3de47fc0010b10d06d6813adda080b341aea461","test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-osx.list":"f88f54b47bef1966e604ea5974bcc2599a5b066191e85b893e699c2c633f6f7d","test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows-static.list":"035a2fe6f8029ddb72f26e0fa57bf5556eee03875602c7ec80acc4d183cd4257","test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list":"46e161630bb26a6daadcd32e1b326f895aae7509e5e4aa8ab2841e17c09149d4","test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x86-windows.list":"97066dd83a3156270385b876cb379e9fda6b6fb28837cef68d1accf094be03c2","test-data/normalized/installed/vcpkg/updates/status":"e17cec8d087160870ca068d21b4642d87a70a45b903f399dd0e78c0bbb5df81d","test-data/normalized/installed/x64-osx/lib/libbz2.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-osx/lib/libfreetype.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-osx/lib/libharfbuzz.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-osx/lib/libpng16.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-osx/lib/libz.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_atomic-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_chrono-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_container-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_date_time-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_exception-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_filesystem-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_graph-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_iostreams-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_locale-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_math_c99-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_math_c99f-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_math_c99l-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_math_tr1-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_math_tr1f-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_math_tr1l-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_random-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_regex-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_serialization-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_system-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_thread-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_timer-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_unit_test_framework-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/boost_wserialization-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/bz2d.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/event.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/event_core.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/event_extra.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/icudtd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/icuind.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/icuiod.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/icutud.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/icuucd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/libeay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/lz4d.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/lzma.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/manual-link/boost_prg_exec_monitor-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/manual-link/boost_test_exec_monitor-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/mysqlclient.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/ssleay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/debug/lib/zlibd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_atomic-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_chrono-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_container-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_date_time-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_exception-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_filesystem-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_graph-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_iostreams-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_locale-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_math_c99-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_math_c99f-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_math_c99l-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_math_tr1-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_math_tr1f-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_math_tr1l-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_random-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_regex-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_serialization-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_system-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_thread-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_timer-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_unit_test_framework-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/boost_wserialization-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/bz2.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/event.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/event_core.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/event_extra.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/icudt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/icuin.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/icuio.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/icutu.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/icuuc.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/libeay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/lz4.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/lzma.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/manual-link/boost_prg_exec_monitor-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/manual-link/boost_test_exec_monitor-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/mysqlclient.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/ssleay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows-static/lib/zlib.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_atomic-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_chrono-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_container-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_date_time-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_filesystem-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_graph-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_iostreams-vc141-mt-x32-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_locale-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_math_c99-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_math_c99f-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_math_c99l-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_math_tr1-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_math_tr1f-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_math_tr1l-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_prg_exec_monitor-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_random-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_regex-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_serialization-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_system-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_thread-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_timer-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_unit_test_framework-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/boost_wserialization-vc141-mt-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/icudt61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/icuin61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/icuio61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/icutu61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/icuuc61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/libbz2.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/libeay32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/libmysql.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/lz4.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/lzma.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/ssleay32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/bin/zlib1.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_atomic-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_chrono-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_container-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_date_time-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_filesystem-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_graph-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_iostreams-vc141-mt-gd-x32-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_locale-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_math_c99-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_math_c99f-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_math_c99l-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_math_tr1-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_math_tr1f-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_math_tr1l-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_prg_exec_monitor-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_random-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_regex-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_serialization-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_system-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_thread-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_timer-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_unit_test_framework-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/boost_wserialization-vc141-mt-gd-x64-1_67.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/icudtd61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/icuind61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/icuiod61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/icutud61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/icuucd61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/libbz2d.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/libeay32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/libmysql.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/lz4d.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/lzma.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/ssleay32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/bin/zlibd1.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_atomic-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_chrono-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_container-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_date_time-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_exception-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_filesystem-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_graph-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_iostreams-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_locale-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_math_c99-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_math_c99f-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_math_c99l-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_math_tr1-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_math_tr1f-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_math_tr1l-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_random-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_regex-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_serialization-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_system-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_thread-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_timer-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_unit_test_framework-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/boost_wserialization-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/bz2d.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/event.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/event_core.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/event_extra.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/icudtd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/icuind.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/icuiod.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/icutud.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/icuucd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/libeay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/libmysql.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/lz4d.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/lzma.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/manual-link/boost_prg_exec_monitor-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/manual-link/boost_test_exec_monitor-vc140-mt-gd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/ssleay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/debug/lib/zlibd.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_atomic-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_chrono-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_container-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_date_time-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_exception-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_filesystem-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_graph-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_iostreams-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_locale-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_math_c99-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_math_c99f-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_math_c99l-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_math_tr1-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_math_tr1f-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_math_tr1l-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_random-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_regex-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_serialization-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_system-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_thread-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_timer-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_unit_test_framework-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/boost_wserialization-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/bz2.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/event.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/event_core.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/event_extra.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/icudt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/icuin.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/icuio.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/icutu.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/icuuc.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/libeay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/libmysql.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/lz4.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/lzma.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/manual-link/boost_prg_exec_monitor-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/manual-link/boost_test_exec_monitor-vc140-mt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/ssleay32.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/lib/zlib.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/tools/openssl/LIBEAY32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x64-windows/tools/openssl/SSLEAY32.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/freetype.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/graphite2.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/harfbuzz.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/icudt61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/icuin61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/icuio61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/icutu61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/icuuc61.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/libbz2.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/libpng16.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/bin/zlib1.dll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/bz2.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/freetype.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/graphite2.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/harfbuzz.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/icudt.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/icuin.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/icuio.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/icutu.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/icuuc.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/libpng16.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test-data/normalized/installed/x86-windows/lib/zlib.lib":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","tests/README.md":"04b1da88e0eca9cc8181d8f3a3cb9557e05ad70d8b3120a61ec673f5598307e9","tests/run.sh":"180f06cc36ce579f22a2282dbe69fe7538f440a8fceb9d65373be1adf83616b3","tests/vcpkgrs_target.sh":"4f3e1e7d5f2362d03c6d26c0c18c0a04fce4add7f9257f6ee62329e3724c6582"},"package":"accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,11 +12,11 @@
 
 [package]
 name = "vcpkg"
-version = "0.2.11"
+version = "0.2.15"
 authors = ["Jim McGrath <jimmc2@gmail.com>"]
 description = "A library to find native dependencies in a vcpkg tree at build\ntime in order to be used in Cargo build scripts.\n"
 documentation = "https://docs.rs/vcpkg"
-readme = "../README.md"
+readme = "README.md"
 keywords = ["build-dependencies", "windows", "macos", "linux"]
 categories = ["development-tools::build-utils"]
 license = "MIT/Apache-2.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,112 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) as implemented by Cargo.
+
+## [0.2.15] - 2021-06-19
+
+### Changed
+
+- No change in functionality.
+- Small typos corrected.
+
+### Fixed
+
+- Crate text files fixed have proper unix newline termination.
+
+## [0.2.14] - 2021-06-16
+
+### Changed
+
+- No change in functionality.
+- Correct rustc warning regarding ordering of `serde` vs `derive` attributes.
+- Repository refactored from workspace to `vcpkg` being the top-level crate.
+  Ensures test-data, README.md and LICENSE files are packaged by the crate.
+- `cargo-vcpkg` removed from the repo, as it is now homed at mcgoo/cargo-vcpkg
+  as of its `0.1.6` release.
+- Integration tests will now bootstrap vcpkg if required.
+
+## [0.2.13] - 2021-05-21
+
+### Added
+
+- Support building on aarch64-pc-windows-msvc.
+
+## [0.2.12] - 2021-04-16
+
+### Added
+
+- Library link order now respects .pc file specification. Fixes broken linking that may have been observed with some ports.
+
+## [0.2.11] - 2020-12-10
+
+### Added
+
+- @perlmint added support for using custom vcpkg triplets. Thanks!
+- add support for M1/aarch64-apple-darwin/arm64-osx
+
+## [0.2.10] - 2020-06-10
+
+### Added
+
+- add support for "dynamic crt, static everything else" on Windows, using vcpkg triplet x64-windows-static-md.
+
+## [0.2.9] - 2020-05-31
+
+### Added
+
+- add support for `cargo-vcpkg`
+
+## [0.2.8] - 2019-12-01
+
+### Added
+
+- @fungos added the ability to specify the location of a vcpkg tree in code. Thanks!
+
+## [0.2.7] - 2019-06-29
+
+### Added
+
+- Added support for Linux and MacOS.
+
+### Fixed
+
+- If different versions of a port were installed for different triplets in vcpkg, vcpkg-rs would not be able to find the port in
+  some triplets.
+
+## [0.2.6] - 2018-08-21
+
+### Changed
+
+- Extra libraries that are required by optional features will now be linked. For example, if `harfbuzz` is installed with the `icu` feature (making it depend on the `icu` port), libraries from the `icu` port will be linked. Fixes [#7](https://github.com/mcgoo/vcpkg-rs/issues/7)
+
+## [0.2.5] - 2018-08-15
+
+### Changed
+
+- Fix for failure to find packages that have a description that spans multiple lines [#8](https://github.com/mcgoo/vcpkg-rs/issues/8)
+
+## [0.2.4] - 2018-06-14
+
+### Added
+
+- `vcpkg::find_package()` and `vcpkg::Config::find_package()` which follow dependencies and use the correct names for libraries.
+
+### Deprecated
+
+- `vcpkg::probe_package()` and `vcpkg::Config::probe()` are deprecated because they require the filename of the library which can change. Using `vcpkg::find_package()` and `vcpkg::Config::find_package()` will look up the correct names for the DLLs and libraries in the Vcpkg installation.
+
+## [0.2.3] - 2018-04-12
+
+### Changed
+
+- Fix for linking to libraries that contain '.' by @Matrix-Zhang
+
+## [0.2.2] - 2017-06-15
+
+### Added
+
+- This is the initial version
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/LICENSE-APACHE	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,202 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/LICENSE-MIT	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,26 @@
+Copyright (c) 2017 Jim McGrath
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/notes.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/notes.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/notes.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/notes.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,81 @@
+# Notes
+
+## Making a release
+
+1. run vcpkg_cli and test it
+1. run systest\test.cmd
+1. check that everything is committed and work dir is clean
+1. push to master on github
+1. check that github actions ci passes
+1. update changelog, commit and push
+1. update version number in Cargo.toml for the crate to be released
+1. commit
+1. push
+1. wait for the ci to work
+1. create a tag for the right crate like `git tag vcpkg-rs-0.2.3`
+1. cd to the crate dir and run `cargo publish`
+1. git push origin --tags
+
+## Possible future features
+
+- hide or deprecate or note that the lib_name api is not as good as find_package
+
+- make sure the find_package api is first in the docs and mention that it's the best option
+
+- allow specifying a triple to use using an environment variable. this will allow setting up a custom "x64-rust-static" triple that dynamically links to msvcrt, allowing static builds with the default rust.
+
+- add information about target triples and target triple selection being driven by RUSTFLAGS=-Ctarget-feature=+crt-static
+
+- add a note that even rust debug builds are linked against the release version
+  of built libraries
+
+- there is a lib\no_auto_link folder that some packages generate that needs
+  to be added to the link line. this will require finding an example of
+  a library that uses that feature. (boost?)
+
+- vcpkg_cli: make probe failure return a nonzero exit code so the build fails
+
+- remove crate doc info about the libname -> package mapping. (why?)
+
+- look into the possibility of using dotenv to allow setting VCPKG_ROOT
+
+- could run vcpkg and parse it's output to determine what package versions are installed.
+
+- could parse vcpkg's installed files list to guess at the names for libraries and dlls rather than requiring them to be specified.
+
+- could parse vcpkg's installed packages list to determine what other packages we need to link against.
+
+- vcpkg has common include and lib dirs so there is a chance that someone is going to end up picking up a vcpkg lib on their link line in preference to some other version at some point. I believe cmake handles this by using absolute paths for libs wherever possible. if everything below you in the dependency tree is looking in vcpkg then everything will agree.
+
+- vcpkg has a per-package output dir that looks like it would be helpful, but at present it is undocumented and subject to change. (what I read mentioned the possibility of compressing the contents.)
+
+- warn if you use something that looks like a vcpkg triplet in place of a rust triple
+
+- allow specifying of the library to be installed like pkg-config does. (hard in general because there is no specific format for version numbers )
+
+- allow stipulating that a specific feature be installed. at present if a feature is installed any extra libraries it requires will be linked as expected. how should this be? The vcpkg way is to specify it as harfbuzz[graphite2,icu] for example.
+
+- report enabled/available features in the Library returned from find_package
+
+- get information about installed packages by running the vcpkg executable
+
+  - if using json to encode the information, this requires writing a json parser or adding a dependency on serde for anything that transitively depends on vcpkg, which is a lot of stuff, probably only a tiny percentage of which actually uses the vcpkg functionality. otherwise, could invent yet another easy-to-parse custom format.
+  - vcpkg is now available on linux and macos also. a possible use is to build the whole bag of windows dependencies on a windows machine at the point that lld can cross link windows/msvc code.
+
+- add a changelog for vcpkg_cli
+
+- make the breaking change of dropping Rust 1.10 (actually 1.12) compatibility when updating to 0.3
+
+- vcpkg_cli should say if there are other versions of the ports available that do not match what is being looked for
+
+- add some commentary describing the vcpkg target triplets on windows - static vs dynamic crt and the fact that rust prefers something in between - dynamic crt, static libs on top of that.
+
+- vcpkg now has a community supported triplet called x64-windows-static-md which is a match for the default Rust build type on windows - dynamic linking to the c runtime, and static linking to other libraries.
+
+## Creating empty files from list files
+
+```sh
+touch `grep -h \.lib$ vcpkg/info/*x86* | grep -v debug `
+touch `grep -h \.dll$ vcpkg/info/*x86* | grep -v debug `
+```
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+# vcpkg-rs [![Windows](https://github.com/mcgoo/vcpkg-rs/workflows/Windows/badge.svg?branch=master)](https://github.com/mcgoo/vcpkg-rs/actions?query=workflow%3AWindows) [![macOS](https://github.com/mcgoo/vcpkg-rs/workflows/macOS/badge.svg?branch=master)](https://github.com/mcgoo/vcpkg-rs/actions?query=workflow%3AmacOS) [![Linux](https://github.com/mcgoo/vcpkg-rs/workflows/Linux/badge.svg?branch=master)](https://github.com/mcgoo/vcpkg-rs/actions?query=workflow%3ALinux)
+
+[Documentation](https://docs.rs/vcpkg) [Changelog](CHANGELOG.md)
+
+This is a helper for finding libraries in a [Vcpkg](https://github.com/Microsoft/vcpkg) installation from cargo build scripts. It works similarly to [pkg-config](https://github.com/alexcrichton/pkg-config-rs). It works on Windows (MSVC ABI), Linux and MacOS.
+
+## Example
+
+Find the library named `foo` in a [Vcpkg](https://github.com/Microsoft/vcpkg) installation and emit cargo metadata to link it:
+
+```rust
+// build.rs
+fn main() {
+    vcpkg::find_package("foo").unwrap();
+}
+```
+
+See the crate [documentation](https://docs.rs/vcpkg) for more information. See [cargo-vcpkg](https://crates.io/crates/cargo-vcpkg) for a convenient way of creating a vcpkg installation.
+
+## License
+
+See LICENSE-APACHE, and LICENSE-MIT for details.
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/rustfmt.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/rustfmt.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/rustfmt.toml	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,2 @@
+reorder_imports = true
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/setup_vcp.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/setup_vcp.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/setup_vcp.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/setup_vcp.sh	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# This script can be sourced to ensure VCPKG_ROOT points at a bootstrapped vcpkg repository.
+# It will also modify the environment (if sourced) to reflect any overrides in
+# vcpkg triplet used neccesary to match the semantics of vcpkg-rs.
+
+if [ "$VCPKG_ROOT" == "" ]; then
+  echo "VCPKG_ROOT must be set."
+  exit 1
+fi
+
+# Bootstrap ./vcp if it doesn't already exist.
+if [ ! -d "$VCPKG_ROOT" ]; then
+  echo "Bootstrapping ./vcp for systest"
+  pushd ..
+  git clone https://github.com/microsoft/vcpkg.git vcp
+  cd vcp
+  if [ "$OS" == "Windows_NT" ]; then
+    ./bootstrap-vcpkg.bat
+  else
+    ./bootstrap-vcpkg.sh
+  fi
+
+  popd
+fi
+
+# Override triplet used if we are on Windows, as the default there is 32bit
+# dynamic, whereas on 64 bit vcpkg-rs will prefer static with dynamic CRT
+# linking.
+if [ "$OS" == "Windows_NT" -a "$PROCESSOR_ARCHITECTURE" == "AMD64" ] ; then
+  export VCPKG_DEFAULT_TRIPLET=x64-windows-static-md
+fi
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -68,7 +68,7 @@
 //! # Related tools
 //! ## cargo vcpkg
 //! [`cargo vcpkg`](https://crates.io/crates/cargo-vcpkg) can fetch and build a vcpkg installation of
-//! required packages from scratch. It merges package requirements specified in the `Cargo.toml` of 
+//! required packages from scratch. It merges package requirements specified in the `Cargo.toml` of
 //! crates in the dependency tree.  
 //! ## vcpkg_cli
 //! There is also a rudimentary companion crate, `vcpkg_cli` that allows testing of environment
@@ -86,9 +86,11 @@
 //!         cargo:rustc-link-lib=static=mysqlclient
 //! ```
 
-// The CI will test vcpkg-rs on 1.10 because at this point rust-openssl's
-// openssl-sys is backward compatible that far. (Actually, the oldest release
-// crate openssl version 0.10 seems to build against is now Rust 1.24.1?)
+// The CI will test vcpkg-rs on 1.12 because that is how far back vcpkg-rs 0.2 tries to be
+// compatible (was actually 1.10 see #29).  This was originally based on how far back
+// rust-openssl's openssl-sys was backward compatible when this crate originally released.
+//
+// This will likely get bumped by the next major release.
 #![allow(deprecated)]
 #![allow(warnings)]
 
@@ -100,12 +102,13 @@
 use std::ascii::AsciiExt;
 
 use std::collections::BTreeMap;
+use std::collections::HashMap;
 use std::env;
 use std::error;
 use std::ffi::OsStr;
 use std::fmt;
 use std::fs::{self, File};
-use std::io::{BufRead, BufReader};
+use std::io::{BufRead, BufReader, Read};
 use std::path::{Path, PathBuf};
 
 /// Configuration options for finding packages, setting up the tree and emitting metadata to cargo
@@ -387,7 +390,7 @@
     let vcpkg_root = try!(find_vcpkg_root(&cfg));
     try!(validate_vcpkg_root(&vcpkg_root));
 
-    let mut base = vcpkg_root;
+    let mut base = vcpkg_root.clone();
     base.push("installed");
     let status_path = base.join("vcpkg");
 
@@ -396,19 +399,192 @@
     let lib_path = base.join("lib");
     let bin_path = base.join("bin");
     let include_path = base.join("include");
+    let packages_path = vcpkg_root.join("packages");
 
     Ok(VcpkgTarget {
-        vcpkg_triplet: target_triplet.triplet.to_owned(),
         lib_path: lib_path,
         bin_path: bin_path,
         include_path: include_path,
-        is_static: target_triplet.is_static,
         status_path: status_path,
-        lib_suffix: target_triplet.lib_suffix.to_owned(),
-        strip_lib_prefix: target_triplet.strip_lib_prefix,
+        packages_path: packages_path,
+        target_triplet: target_triplet.clone(),
     })
 }
 
+/// Parsed knowledge from a .pc file.
+#[derive(Debug)]
+struct PcFile {
+    /// The pkg-config name of this library.
+    id: String,
+    /// List of libraries found as '-l', translated to a given vcpkg_target. e.g. libbrotlicommon.a
+    libs: Vec<String>,
+    /// List of pkgconfig dependencies, e.g. PcFile::id.
+    deps: Vec<String>,
+}
+impl PcFile {
+    fn parse_pc_file(vcpkg_target: &VcpkgTarget, path: &Path) -> Result<Self, Error> {
+        // Extract the pkg-config name.
+        let id = try!(path
+            .file_stem()
+            .ok_or_else(|| Error::VcpkgInstallation(format!(
+                "pkg-config file {} has bogus name",
+                path.to_string_lossy()
+            ))))
+        .to_string_lossy();
+        // Read through the file and gather what we want.
+        let mut file = try!(File::open(path)
+            .map_err(|_| Error::VcpkgInstallation(format!("Couldn't open {}", path.display()))));
+        let mut pc_file_contents = String::new();
+
+        try!(file
+            .read_to_string(&mut pc_file_contents)
+            .map_err(|_| Error::VcpkgInstallation(format!("Couldn't read {}", path.display()))));
+        PcFile::from_str(&id, &pc_file_contents, &vcpkg_target.target_triplet)
+    }
+    fn from_str(id: &str, s: &str, target_triplet: &TargetTriplet) -> Result<Self, Error> {
+        let mut libs = Vec::new();
+        let mut deps = Vec::new();
+
+        for line in s.lines() {
+            // We could collect a lot of stuff here, but we only care about Requires and Libs for the moment.
+            if line.starts_with("Requires:") {
+                let mut requires_args = line
+                    .split(":")
+                    .skip(1)
+                    .next()
+                    .unwrap_or("")
+                    .split_whitespace()
+                    .flat_map(|e| e.split(","))
+                    .filter(|s| *s != "");
+                while let Some(dep) = requires_args.next() {
+                    // Drop any versioning requirements, we only care about library order and rely upon
+                    // port dependencies to resolve versioning.
+                    if let Some(_) = dep.find(|c| c == '=' || c == '<' || c == '>') {
+                        requires_args.next();
+                        continue;
+                    }
+                    deps.push(dep.to_owned());
+                }
+            } else if line.starts_with("Libs:") {
+                let lib_flags = line
+                    .split(":")
+                    .skip(1)
+                    .next()
+                    .unwrap_or("")
+                    .split_whitespace();
+                for lib_flag in lib_flags {
+                    if lib_flag.starts_with("-l") {
+                        // reconstruct the library name.
+                        let lib = format!(
+                            "{}{}.{}",
+                            if target_triplet.strip_lib_prefix {
+                                "lib"
+                            } else {
+                                ""
+                            },
+                            lib_flag.trim_left_matches("-l"),
+                            target_triplet.lib_suffix
+                        );
+                        libs.push(lib);
+                    }
+                }
+            }
+        }
+
+        Ok(PcFile {
+            id: id.to_string(),
+            libs: libs,
+            deps: deps,
+        })
+    }
+}
+
+/// Collection of PcFile.  Can be built and queried as a set of .pc files.
+#[derive(Debug)]
+struct PcFiles {
+    files: HashMap<String, PcFile>,
+}
+impl PcFiles {
+    fn load_pkgconfig_dir(vcpkg_target: &VcpkgTarget, path: &PathBuf) -> Result<Self, Error> {
+        let mut files = HashMap::new();
+        for dir_entry in try!(path.read_dir().map_err(|e| {
+            Error::VcpkgInstallation(format!(
+                "Missing pkgconfig directory {}: {}",
+                path.to_string_lossy(),
+                e
+            ))
+        })) {
+            let dir_entry = try!(dir_entry.map_err(|e| {
+                Error::VcpkgInstallation(format!(
+                    "Troubling reading pkgconfig dir {}: {}",
+                    path.to_string_lossy(),
+                    e
+                ))
+            }));
+            // Only look at .pc files.
+            if dir_entry.path().extension() != Some(OsStr::new("pc")) {
+                continue;
+            }
+            let pc_file = try!(PcFile::parse_pc_file(vcpkg_target, &dir_entry.path()));
+            files.insert(pc_file.id.to_owned(), pc_file);
+        }
+        Ok(PcFiles { files: files })
+    }
+    /// Use the .pc files as a hint to the library sort order.
+    fn fix_ordering(&self, mut libs: Vec<String>) -> Vec<String> {
+        // Overall heuristic: for each library given as input, identify which PcFile declared it.
+        // Then, looking at that PcFile, check its Requires: (deps), and if the pc file for that
+        // dep is in our set, check if its libraries are in our set of libs.  If so, move it to the
+        // end to ensure it gets linked afterwards.
+
+        // We may need to do this a few times to properly handle the case where A -> (depends on) B
+        // -> C -> D and libraries were originally sorted D, C, B, A.  Avoid recursion so we don't
+        // have to detect potential cycles.
+        for _iter in 0..3 {
+            let mut required_lib_order: Vec<String> = Vec::new();
+            for lib in &libs {
+                required_lib_order.push(lib.to_owned());
+                if let Some(pc_file) = self.locate_pc_file_by_lib(lib) {
+                    // Consider its requirements:
+                    for dep in &pc_file.deps {
+                        // Only consider pkgconfig dependencies we know about.
+                        if let Some(dep_pc_file) = self.files.get(dep) {
+                            // Intra-port library ordering found, pivot any already seen dep_lib to the
+                            // end of the list.
+                            for dep_lib in &dep_pc_file.libs {
+                                if let Some(removed) = remove_item(&mut required_lib_order, dep_lib)
+                                {
+                                    required_lib_order.push(removed);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            // We should always end up with the same number of libraries, only their order should
+            // change.
+            assert_eq!(libs.len(), required_lib_order.len());
+            // Termination:
+            if required_lib_order == libs {
+                // Nothing changed, we're done here.
+                return libs;
+            }
+            libs = required_lib_order;
+        }
+        println!("cargo:warning=vcpkg gave up trying to resolve pkg-config ordering.");
+        libs
+    }
+    /// Locate which PcFile contains this library, if any.
+    fn locate_pc_file_by_lib(&self, lib: &str) -> Option<&PcFile> {
+        for (id, pc_file) in &self.files {
+            if pc_file.libs.contains(&lib.to_owned()) {
+                return Some(pc_file);
+            }
+        }
+        None
+    }
+}
+
 #[derive(Clone, Debug)]
 struct Port {
     // dlls if any
@@ -429,7 +605,7 @@
 ) -> Result<(Vec<String>, Vec<String>), Error> {
     let manifest_file = path.join("info").join(format!(
         "{}_{}_{}.list",
-        port, version, vcpkg_target.vcpkg_triplet
+        port, version, vcpkg_target.target_triplet.triplet
     ));
 
     let mut dlls = Vec::new();
@@ -444,8 +620,8 @@
 
     let file = BufReader::new(&f);
 
-    let dll_prefix = Path::new(&vcpkg_target.vcpkg_triplet).join("bin");
-    let lib_prefix = Path::new(&vcpkg_target.vcpkg_triplet).join("lib");
+    let dll_prefix = Path::new(&vcpkg_target.target_triplet.triplet).join("bin");
+    let lib_prefix = Path::new(&vcpkg_target.target_triplet.triplet).join("lib");
 
     for line in file.lines() {
         let line = line.unwrap();
@@ -461,7 +637,7 @@
                 dll.to_str().map(|s| dlls.push(s.to_owned()));
             }
         } else if let Ok(lib) = file_path.strip_prefix(&lib_prefix) {
-            if lib.extension() == Some(OsStr::new(&vcpkg_target.lib_suffix))
+            if lib.extension() == Some(OsStr::new(&vcpkg_target.target_triplet.lib_suffix))
                 && lib.components().collect::<Vec<_>>().len() == 1
             {
                 if let Some(lib) = vcpkg_target.link_name_for_lib(lib) {
@@ -471,6 +647,18 @@
         }
     }
 
+    // Load .pc files for hints about intra-port library ordering.
+    let pkg_config_prefix = vcpkg_target
+        .packages_path
+        .join(format!("{}_{}", port, vcpkg_target.target_triplet.triplet))
+        .join("lib")
+        .join("pkgconfig");
+    // Try loading the pc files, if they are present. Not all ports have pkgconfig.
+    if let Ok(pc_files) = PcFiles::load_pkgconfig_dir(vcpkg_target, &pkg_config_prefix) {
+        // Use the .pc file data to potentially sort the libs to the correct order.
+        libs = pc_files.fix_ordering(libs);
+    }
+
     Ok((dlls, libs))
 }
 
@@ -578,7 +766,7 @@
     }
 
     for (&(name, arch, feature), current) in &seen_names {
-        if **arch == target.vcpkg_triplet {
+        if **arch == target.target_triplet.triplet {
             let mut deps = if let Some(deps) = current.get("Depends") {
                 deps.split(", ").map(|x| x.to_owned()).collect()
             } else {
@@ -632,24 +820,22 @@
 
 /// paths and triple for the chosen target
 struct VcpkgTarget {
-    vcpkg_triplet: String,
     lib_path: PathBuf,
     bin_path: PathBuf,
     include_path: PathBuf,
 
     // directory containing the status file
     status_path: PathBuf,
+    // directory containing the install files per port.
+    packages_path: PathBuf,
 
-    is_static: bool,
-    lib_suffix: String,
-
-    /// strip 'lib' from library names in linker args?
-    strip_lib_prefix: bool,
+    // target-specific settings.
+    target_triplet: TargetTriplet,
 }
 
 impl VcpkgTarget {
     fn link_name_for_lib(&self, filename: &std::path::Path) -> Option<String> {
-        if self.strip_lib_prefix {
+        if self.target_triplet.strip_lib_prefix {
             filename.to_str().map(|s| s.to_owned())
         // filename
         //     .to_str()
@@ -729,7 +915,7 @@
                 return Err(Error::LibNotFound(format!(
                     "package {} is not installed for vcpkg triplet {}",
                     port_name.to_owned(),
-                    vcpkg_target.vcpkg_triplet
+                    vcpkg_target.target_triplet.triplet
                 )));
             }
 
@@ -797,11 +983,14 @@
         // require explicit opt-in before using dynamically linked
         // variants, otherwise cargo install of various things will
         // stop working if Vcpkg is installed.
-        if !vcpkg_target.is_static && !env::var_os("VCPKGRS_DYNAMIC").is_some() {
+        if !vcpkg_target.target_triplet.is_static && !env::var_os("VCPKGRS_DYNAMIC").is_some() {
             return Err(Error::RequiredEnvMissing("VCPKGRS_DYNAMIC".to_owned()));
         }
 
-        let mut lib = Library::new(vcpkg_target.is_static, &vcpkg_target.vcpkg_triplet);
+        let mut lib = Library::new(
+            vcpkg_target.target_triplet.is_static,
+            &vcpkg_target.target_triplet.triplet,
+        );
 
         if self.emit_includes {
             lib.cargo_metadata.push(format!(
@@ -819,7 +1008,7 @@
                 .expect("failed to convert string type")
         ));
         lib.link_paths.push(vcpkg_target.lib_path.clone());
-        if !vcpkg_target.is_static {
+        if !vcpkg_target.target_triplet.is_static {
             lib.cargo_metadata.push(format!(
                 "cargo:rustc-link-search=native={}",
                 vcpkg_target
@@ -877,7 +1066,7 @@
     /// Specify target triplet. When triplet is not specified, inferred triplet from rust target is used.
     ///
     /// Specifying a triplet using `target_triplet` will override the default triplet for this crate. This
-    /// cannot change the choice of triplet made by other crates, so a safer choice will be to set 
+    /// cannot change the choice of triplet made by other crates, so a safer choice will be to set
     /// `VCPKGRS_TRIPLET` in the environment which will allow all crates to use a consistent set of
     /// external dependencies.
     pub fn target_triplet<S: AsRef<str>>(&mut self, triplet: S) -> &mut Config {
@@ -930,11 +1119,14 @@
         // require explicit opt-in before using dynamically linked
         // variants, otherwise cargo install of various things will
         // stop working if Vcpkg is installed.
-        if !vcpkg_target.is_static && !env::var_os("VCPKGRS_DYNAMIC").is_some() {
+        if !vcpkg_target.target_triplet.is_static && !env::var_os("VCPKGRS_DYNAMIC").is_some() {
             return Err(Error::RequiredEnvMissing("VCPKGRS_DYNAMIC".to_owned()));
         }
 
-        let mut lib = Library::new(vcpkg_target.is_static, &vcpkg_target.vcpkg_triplet);
+        let mut lib = Library::new(
+            vcpkg_target.target_triplet.is_static,
+            &vcpkg_target.target_triplet.triplet,
+        );
 
         if self.emit_includes {
             lib.cargo_metadata.push(format!(
@@ -952,7 +1144,7 @@
                 .expect("failed to convert string type")
         ));
         lib.link_paths.push(vcpkg_target.lib_path.clone());
-        if !vcpkg_target.is_static {
+        if !vcpkg_target.target_triplet.is_static {
             lib.cargo_metadata.push(format!(
                 "cargo:rustc-link-search=native={}",
                 vcpkg_target
@@ -983,7 +1175,7 @@
             // this could use static-nobundle= for static libraries but it is apparently
             // not necessary to make the distinction for windows-msvc.
 
-            let link_name = match vcpkg_target.strip_lib_prefix {
+            let link_name = match vcpkg_target.target_triplet.strip_lib_prefix {
                 true => required_lib.trim_left_matches("lib"),
                 false => required_lib,
             };
@@ -995,7 +1187,7 @@
 
             // verify that the library exists
             let mut lib_location = vcpkg_target.lib_path.clone();
-            lib_location.push(required_lib.clone() + "." + &vcpkg_target.lib_suffix);
+            lib_location.push(required_lib.clone() + "." + &vcpkg_target.target_triplet.lib_suffix);
 
             if !lib_location.exists() {
                 return Err(Error::LibNotFound(lib_location.display().to_string()));
@@ -1003,7 +1195,7 @@
             lib.found_libs.push(lib_location);
         }
 
-        if !vcpkg_target.is_static {
+        if !vcpkg_target.target_triplet.is_static {
             for required_dll in &self.required_dlls {
                 let mut dll_location = vcpkg_target.bin_path.clone();
                 dll_location.push(required_dll.clone() + ".dll");
@@ -1142,14 +1334,14 @@
             is_static: true,
             lib_suffix: "a".into(),
             strip_lib_prefix: true,
-        }) 
+        })
     } else if target == "aarch64-apple-ios" {
-            Ok(TargetTriplet {
-                triplet: "arm64-ios".into(),
-                is_static: true,
-                lib_suffix: "a".into(),
-                strip_lib_prefix: true,
-            })
+        Ok(TargetTriplet {
+            triplet: "arm64-ios".into(),
+            is_static: true,
+            lib_suffix: "a".into(),
+            strip_lib_prefix: true,
+        })
     } else if !target.contains("-pc-windows-msvc") {
         Err(Error::NotMSVC)
     } else if target.starts_with("x86_64-") {
@@ -1175,6 +1367,29 @@
                 strip_lib_prefix: false,
             })
         }
+    } else if target.starts_with("aarch64") {
+        if is_static {
+            Ok(TargetTriplet {
+                triplet: "arm64-windows-static".into(),
+                is_static: true,
+                lib_suffix: "lib".into(),
+                strip_lib_prefix: false,
+            })
+        } else if is_definitely_dynamic {
+            Ok(TargetTriplet {
+                triplet: "arm64-windows".into(),
+                is_static: false,
+                lib_suffix: "lib".into(),
+                strip_lib_prefix: false,
+            })
+        } else {
+            Ok(TargetTriplet {
+                triplet: "arm64-windows-static-md".into(),
+                is_static: true,
+                lib_suffix: "lib".into(),
+                strip_lib_prefix: false,
+            })
+        }
     } else {
         // everything else is x86
         if is_static {
@@ -1433,16 +1648,16 @@
         env::set_var("VCPKGRS_DYNAMIC", "1");
         let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
         env::set_var("OUT_DIR", tmp_dir.path());
-  
+
         let harfbuzz = ::Config::new()
-            // For the sake of testing, force this build to try to 
+            // For the sake of testing, force this build to try to
             // link to the arm64-osx libraries in preference to the
-            // default of arm64-ios. 
-            .target_triplet("x64-osx") 
+            // default of arm64-ios.
+            .target_triplet("x64-osx")
             .find_package("harfbuzz");
         println!("Result with specifying target triplet is {:?}", &harfbuzz);
         let harfbuzz = harfbuzz.unwrap();
-        assert_eq!(harfbuzz.vcpkg_triplet, "x64-osx");        
+        assert_eq!(harfbuzz.vcpkg_triplet, "x64-osx");
         clean_env();
     }
 
@@ -1488,8 +1703,8 @@
         println!("Result with setting VCPKGRS_TRIPLET is {:?}", &harfbuzz);
         assert_eq!(harfbuzz.vcpkg_triplet, "x64-osx");
         clean_env();
-    } 
-    
+    }
+
     // #[test]
     // fn dynamic_build_package_specific_bailout() {
     //     clean_env();
@@ -1522,6 +1737,193 @@
     //     clean_env();
     // }
 
+    #[test]
+    fn pc_files_reordering() {
+        let _g = LOCK.lock();
+        clean_env();
+        env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
+        env::set_var("TARGET", "x86_64-unknown-linux-gnu");
+        // env::set_var("VCPKGRS_DYNAMIC", "1");
+        let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
+        env::set_var("OUT_DIR", tmp_dir.path());
+
+        let target_triplet = msvc_target().unwrap();
+
+        // The brotli use-case.
+        {
+            let mut pc_files = PcFiles {
+                files: HashMap::new(),
+            };
+            pc_files.files.insert(
+                "libbrotlicommon".to_owned(),
+                PcFile::from_str(
+                    "libbrotlicommon",
+                    "Libs: -lbrotlicommon-static\nRequires:",
+                    &target_triplet,
+                )
+                .unwrap(),
+            );
+            pc_files.files.insert(
+                "libbrotlienc".to_owned(),
+                PcFile::from_str(
+                    "libbrotlienc",
+                    "Libs: -lbrotlienc-static\nRequires: libbrotlicommon",
+                    &target_triplet,
+                )
+                .unwrap(),
+            );
+            pc_files.files.insert(
+                "libbrotlidec".to_owned(),
+                PcFile::from_str(
+                    "brotlidec",
+                    "Libs: -lbrotlidec-static\nRequires: libbrotlicommon >= 1.0.9",
+                    &target_triplet,
+                )
+                .unwrap(),
+            );
+            // Note that the input is alphabetically sorted.
+            let input_libs = vec![
+                "libbrotlicommon-static.a".to_owned(),
+                "libbrotlidec-static.a".to_owned(),
+                "libbrotlienc-static.a".to_owned(),
+            ];
+            let output_libs = pc_files.fix_ordering(input_libs);
+            assert_eq!(output_libs[0], "libbrotlidec-static.a");
+            assert_eq!(output_libs[1], "libbrotlienc-static.a");
+            assert_eq!(output_libs[2], "libbrotlicommon-static.a");
+        }
+
+        // Concoct elaborate dependency graph, try all variations of input sort.
+        // Throw some (ignored) version dependencies as well as extra libs not represented in the
+        // pc_files dataset.
+        {
+            let mut pc_files = PcFiles {
+                files: HashMap::new(),
+            };
+            pc_files.files.insert(
+                "libA".to_owned(),
+                PcFile::from_str(
+                    "libA",
+                    "Libs: -lA\n\
+                     Requires:",
+                    &target_triplet,
+                )
+                .unwrap(),
+            );
+            pc_files.files.insert(
+                "libB".to_owned(),
+                PcFile::from_str(
+                    "libB",
+                    "Libs:  -lB -lm -pthread \n\
+                     Requires: libA",
+                    &target_triplet,
+                )
+                .unwrap(),
+            );
+            pc_files.files.insert(
+                "libC".to_owned(),
+                PcFile::from_str(
+                    "libC",
+                    "Libs: -lC -L${libdir}\n\
+                     Requires: libB <=1.0 , libmysql-client = 0.9, ",
+                    &target_triplet,
+                )
+                .unwrap(),
+            );
+            pc_files.files.insert(
+                "libD".to_owned(),
+                PcFile::from_str(
+                    "libD",
+                    "Libs: -Lpath/to/libs -Rplugins -lD\n\
+                     Requires: libpostgres libC",
+                    &target_triplet,
+                )
+                .unwrap(),
+            );
+            let permutations: Vec<Vec<&str>> = vec![
+                vec!["libA.a", "libB.a", "libC.a", "libD.a"],
+                vec!["libA.a", "libB.a", "libD.a", "libC.a"],
+                vec!["libA.a", "libC.a", "libB.a", "libD.a"],
+                vec!["libA.a", "libC.a", "libD.a", "libB.a"],
+                vec!["libA.a", "libD.a", "libB.a", "libC.a"],
+                vec!["libA.a", "libD.a", "libC.a", "libB.a"],
+                //
+                vec!["libB.a", "libA.a", "libC.a", "libD.a"],
+                vec!["libB.a", "libA.a", "libD.a", "libC.a"],
+                vec!["libB.a", "libC.a", "libA.a", "libD.a"],
+                vec!["libB.a", "libC.a", "libD.a", "libA.a"],
+                vec!["libB.a", "libD.a", "libA.a", "libC.a"],
+                vec!["libB.a", "libD.a", "libC.a", "libA.a"],
+                //
+                vec!["libC.a", "libA.a", "libB.a", "libD.a"],
+                vec!["libC.a", "libA.a", "libD.a", "libB.a"],
+                vec!["libC.a", "libB.a", "libA.a", "libD.a"],
+                vec!["libC.a", "libB.a", "libD.a", "libA.a"],
+                vec!["libC.a", "libD.a", "libA.a", "libB.a"],
+                vec!["libC.a", "libD.a", "libB.a", "libA.a"],
+                //
+                vec!["libD.a", "libA.a", "libB.a", "libC.a"],
+                vec!["libD.a", "libA.a", "libC.a", "libB.a"],
+                vec!["libD.a", "libB.a", "libA.a", "libC.a"],
+                vec!["libD.a", "libB.a", "libC.a", "libA.a"],
+                vec!["libD.a", "libC.a", "libA.a", "libB.a"],
+                vec!["libD.a", "libC.a", "libB.a", "libA.a"],
+            ];
+            for permutation in permutations {
+                let input_libs = vec![
+                    permutation[0].to_owned(),
+                    permutation[1].to_owned(),
+                    permutation[2].to_owned(),
+                    permutation[3].to_owned(),
+                ];
+                let output_libs = pc_files.fix_ordering(input_libs);
+                assert_eq!(output_libs.len(), 4);
+                assert_eq!(output_libs[0], "libD.a");
+                assert_eq!(output_libs[1], "libC.a");
+                assert_eq!(output_libs[2], "libB.a");
+                assert_eq!(output_libs[3], "libA.a");
+            }
+        }
+
+        // Test parsing of a couple different Requires: lines.
+        {
+            let pc_file = PcFile::from_str(
+                "test",
+                "Libs: -ltest\n\
+                 Requires: cairo libpng",
+                &target_triplet,
+            )
+            .unwrap();
+            assert_eq!(pc_file.deps, vec!["cairo", "libpng"]);
+            let pc_file = PcFile::from_str(
+                "test",
+                "Libs: -ltest\n\
+                 Requires: cairo xcb >= 1.6 xcb-render >= 1.6",
+                &target_triplet,
+            )
+            .unwrap();
+            assert_eq!(pc_file.deps, vec!["cairo", "xcb", "xcb-render"]);
+            let pc_file = PcFile::from_str(
+                "test",
+                "Libs: -ltest\n\
+                 Requires: glib-2.0, gobject-2.0",
+                &target_triplet,
+            )
+            .unwrap();
+            assert_eq!(pc_file.deps, vec!["glib-2.0", "gobject-2.0"]);
+            let pc_file = PcFile::from_str(
+                "test",
+                "Libs: -ltest\n\
+                 Requires: glib-2.0 >=  2.58.0, gobject-2.0 >=  2.58.0",
+                &target_triplet,
+            )
+            .unwrap();
+            assert_eq!(pc_file.deps, vec!["glib-2.0", "gobject-2.0"]);
+        }
+
+        clean_env();
+    }
+
     fn clean_env() {
         env::remove_var("TARGET");
         env::remove_var("VCPKG_ROOT");
@@ -1537,7 +1939,6 @@
     fn vcpkg_test_tree_loc(name: &str) -> PathBuf {
         let mut path = PathBuf::new();
         path.push(env::var("CARGO_MANIFEST_DIR").unwrap());
-        path.pop();
         path.push("test-data");
         path.push(name);
         path
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/multiline-description/installed/vcpkg/updates/status thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/multiline-description/installed/vcpkg/updates/status
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/multiline-description/installed/vcpkg/updates/status	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/multiline-description/installed/vcpkg/updates/status	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+Package: graphite2
+Version: 1.3.10
+Architecture: x86-windows
+Multi-Arch: same
+Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world.
+  Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications.
+Status: install ok installed
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,98 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/algorithm/
+x64-windows/include/boost/algorithm/algorithm.hpp
+x64-windows/include/boost/algorithm/clamp.hpp
+x64-windows/include/boost/algorithm/cxx11/
+x64-windows/include/boost/algorithm/cxx11/all_of.hpp
+x64-windows/include/boost/algorithm/cxx11/any_of.hpp
+x64-windows/include/boost/algorithm/cxx11/copy_if.hpp
+x64-windows/include/boost/algorithm/cxx11/copy_n.hpp
+x64-windows/include/boost/algorithm/cxx11/find_if_not.hpp
+x64-windows/include/boost/algorithm/cxx11/iota.hpp
+x64-windows/include/boost/algorithm/cxx11/is_partitioned.hpp
+x64-windows/include/boost/algorithm/cxx11/is_permutation.hpp
+x64-windows/include/boost/algorithm/cxx11/is_sorted.hpp
+x64-windows/include/boost/algorithm/cxx11/none_of.hpp
+x64-windows/include/boost/algorithm/cxx11/one_of.hpp
+x64-windows/include/boost/algorithm/cxx11/partition_copy.hpp
+x64-windows/include/boost/algorithm/cxx11/partition_point.hpp
+x64-windows/include/boost/algorithm/cxx14/
+x64-windows/include/boost/algorithm/cxx14/equal.hpp
+x64-windows/include/boost/algorithm/cxx14/is_permutation.hpp
+x64-windows/include/boost/algorithm/cxx14/mismatch.hpp
+x64-windows/include/boost/algorithm/cxx17/
+x64-windows/include/boost/algorithm/cxx17/exclusive_scan.hpp
+x64-windows/include/boost/algorithm/cxx17/for_each_n.hpp
+x64-windows/include/boost/algorithm/cxx17/inclusive_scan.hpp
+x64-windows/include/boost/algorithm/cxx17/reduce.hpp
+x64-windows/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp
+x64-windows/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp
+x64-windows/include/boost/algorithm/cxx17/transform_reduce.hpp
+x64-windows/include/boost/algorithm/gather.hpp
+x64-windows/include/boost/algorithm/hex.hpp
+x64-windows/include/boost/algorithm/is_palindrome.hpp
+x64-windows/include/boost/algorithm/is_partitioned_until.hpp
+x64-windows/include/boost/algorithm/minmax.hpp
+x64-windows/include/boost/algorithm/minmax_element.hpp
+x64-windows/include/boost/algorithm/searching/
+x64-windows/include/boost/algorithm/searching/boyer_moore.hpp
+x64-windows/include/boost/algorithm/searching/boyer_moore_horspool.hpp
+x64-windows/include/boost/algorithm/searching/detail/
+x64-windows/include/boost/algorithm/searching/detail/bm_traits.hpp
+x64-windows/include/boost/algorithm/searching/detail/debugging.hpp
+x64-windows/include/boost/algorithm/searching/knuth_morris_pratt.hpp
+x64-windows/include/boost/algorithm/sort_subrange.hpp
+x64-windows/include/boost/algorithm/string.hpp
+x64-windows/include/boost/algorithm/string/
+x64-windows/include/boost/algorithm/string/case_conv.hpp
+x64-windows/include/boost/algorithm/string/classification.hpp
+x64-windows/include/boost/algorithm/string/compare.hpp
+x64-windows/include/boost/algorithm/string/concept.hpp
+x64-windows/include/boost/algorithm/string/config.hpp
+x64-windows/include/boost/algorithm/string/constants.hpp
+x64-windows/include/boost/algorithm/string/detail/
+x64-windows/include/boost/algorithm/string/detail/case_conv.hpp
+x64-windows/include/boost/algorithm/string/detail/classification.hpp
+x64-windows/include/boost/algorithm/string/detail/find_format.hpp
+x64-windows/include/boost/algorithm/string/detail/find_format_all.hpp
+x64-windows/include/boost/algorithm/string/detail/find_format_store.hpp
+x64-windows/include/boost/algorithm/string/detail/find_iterator.hpp
+x64-windows/include/boost/algorithm/string/detail/finder.hpp
+x64-windows/include/boost/algorithm/string/detail/finder_regex.hpp
+x64-windows/include/boost/algorithm/string/detail/formatter.hpp
+x64-windows/include/boost/algorithm/string/detail/formatter_regex.hpp
+x64-windows/include/boost/algorithm/string/detail/predicate.hpp
+x64-windows/include/boost/algorithm/string/detail/replace_storage.hpp
+x64-windows/include/boost/algorithm/string/detail/sequence.hpp
+x64-windows/include/boost/algorithm/string/detail/trim.hpp
+x64-windows/include/boost/algorithm/string/detail/util.hpp
+x64-windows/include/boost/algorithm/string/erase.hpp
+x64-windows/include/boost/algorithm/string/find.hpp
+x64-windows/include/boost/algorithm/string/find_format.hpp
+x64-windows/include/boost/algorithm/string/find_iterator.hpp
+x64-windows/include/boost/algorithm/string/finder.hpp
+x64-windows/include/boost/algorithm/string/formatter.hpp
+x64-windows/include/boost/algorithm/string/iter_find.hpp
+x64-windows/include/boost/algorithm/string/join.hpp
+x64-windows/include/boost/algorithm/string/predicate.hpp
+x64-windows/include/boost/algorithm/string/predicate_facade.hpp
+x64-windows/include/boost/algorithm/string/regex.hpp
+x64-windows/include/boost/algorithm/string/regex_find_format.hpp
+x64-windows/include/boost/algorithm/string/replace.hpp
+x64-windows/include/boost/algorithm/string/sequence_traits.hpp
+x64-windows/include/boost/algorithm/string/split.hpp
+x64-windows/include/boost/algorithm/string/std/
+x64-windows/include/boost/algorithm/string/std/list_traits.hpp
+x64-windows/include/boost/algorithm/string/std/rope_traits.hpp
+x64-windows/include/boost/algorithm/string/std/slist_traits.hpp
+x64-windows/include/boost/algorithm/string/std/string_traits.hpp
+x64-windows/include/boost/algorithm/string/std_containers_traits.hpp
+x64-windows/include/boost/algorithm/string/trim.hpp
+x64-windows/include/boost/algorithm/string/trim_all.hpp
+x64-windows/include/boost/algorithm/string/yes_no_type.hpp
+x64-windows/include/boost/algorithm/string_regex.hpp
+x64-windows/share/
+x64-windows/share/boost-algorithm/
+x64-windows/share/boost-algorithm/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,98 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/algorithm/
+x64-windows-static/include/boost/algorithm/algorithm.hpp
+x64-windows-static/include/boost/algorithm/clamp.hpp
+x64-windows-static/include/boost/algorithm/cxx11/
+x64-windows-static/include/boost/algorithm/cxx11/all_of.hpp
+x64-windows-static/include/boost/algorithm/cxx11/any_of.hpp
+x64-windows-static/include/boost/algorithm/cxx11/copy_if.hpp
+x64-windows-static/include/boost/algorithm/cxx11/copy_n.hpp
+x64-windows-static/include/boost/algorithm/cxx11/find_if_not.hpp
+x64-windows-static/include/boost/algorithm/cxx11/iota.hpp
+x64-windows-static/include/boost/algorithm/cxx11/is_partitioned.hpp
+x64-windows-static/include/boost/algorithm/cxx11/is_permutation.hpp
+x64-windows-static/include/boost/algorithm/cxx11/is_sorted.hpp
+x64-windows-static/include/boost/algorithm/cxx11/none_of.hpp
+x64-windows-static/include/boost/algorithm/cxx11/one_of.hpp
+x64-windows-static/include/boost/algorithm/cxx11/partition_copy.hpp
+x64-windows-static/include/boost/algorithm/cxx11/partition_point.hpp
+x64-windows-static/include/boost/algorithm/cxx14/
+x64-windows-static/include/boost/algorithm/cxx14/equal.hpp
+x64-windows-static/include/boost/algorithm/cxx14/is_permutation.hpp
+x64-windows-static/include/boost/algorithm/cxx14/mismatch.hpp
+x64-windows-static/include/boost/algorithm/cxx17/
+x64-windows-static/include/boost/algorithm/cxx17/exclusive_scan.hpp
+x64-windows-static/include/boost/algorithm/cxx17/for_each_n.hpp
+x64-windows-static/include/boost/algorithm/cxx17/inclusive_scan.hpp
+x64-windows-static/include/boost/algorithm/cxx17/reduce.hpp
+x64-windows-static/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp
+x64-windows-static/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp
+x64-windows-static/include/boost/algorithm/cxx17/transform_reduce.hpp
+x64-windows-static/include/boost/algorithm/gather.hpp
+x64-windows-static/include/boost/algorithm/hex.hpp
+x64-windows-static/include/boost/algorithm/is_palindrome.hpp
+x64-windows-static/include/boost/algorithm/is_partitioned_until.hpp
+x64-windows-static/include/boost/algorithm/minmax.hpp
+x64-windows-static/include/boost/algorithm/minmax_element.hpp
+x64-windows-static/include/boost/algorithm/searching/
+x64-windows-static/include/boost/algorithm/searching/boyer_moore.hpp
+x64-windows-static/include/boost/algorithm/searching/boyer_moore_horspool.hpp
+x64-windows-static/include/boost/algorithm/searching/detail/
+x64-windows-static/include/boost/algorithm/searching/detail/bm_traits.hpp
+x64-windows-static/include/boost/algorithm/searching/detail/debugging.hpp
+x64-windows-static/include/boost/algorithm/searching/knuth_morris_pratt.hpp
+x64-windows-static/include/boost/algorithm/sort_subrange.hpp
+x64-windows-static/include/boost/algorithm/string.hpp
+x64-windows-static/include/boost/algorithm/string/
+x64-windows-static/include/boost/algorithm/string/case_conv.hpp
+x64-windows-static/include/boost/algorithm/string/classification.hpp
+x64-windows-static/include/boost/algorithm/string/compare.hpp
+x64-windows-static/include/boost/algorithm/string/concept.hpp
+x64-windows-static/include/boost/algorithm/string/config.hpp
+x64-windows-static/include/boost/algorithm/string/constants.hpp
+x64-windows-static/include/boost/algorithm/string/detail/
+x64-windows-static/include/boost/algorithm/string/detail/case_conv.hpp
+x64-windows-static/include/boost/algorithm/string/detail/classification.hpp
+x64-windows-static/include/boost/algorithm/string/detail/find_format.hpp
+x64-windows-static/include/boost/algorithm/string/detail/find_format_all.hpp
+x64-windows-static/include/boost/algorithm/string/detail/find_format_store.hpp
+x64-windows-static/include/boost/algorithm/string/detail/find_iterator.hpp
+x64-windows-static/include/boost/algorithm/string/detail/finder.hpp
+x64-windows-static/include/boost/algorithm/string/detail/finder_regex.hpp
+x64-windows-static/include/boost/algorithm/string/detail/formatter.hpp
+x64-windows-static/include/boost/algorithm/string/detail/formatter_regex.hpp
+x64-windows-static/include/boost/algorithm/string/detail/predicate.hpp
+x64-windows-static/include/boost/algorithm/string/detail/replace_storage.hpp
+x64-windows-static/include/boost/algorithm/string/detail/sequence.hpp
+x64-windows-static/include/boost/algorithm/string/detail/trim.hpp
+x64-windows-static/include/boost/algorithm/string/detail/util.hpp
+x64-windows-static/include/boost/algorithm/string/erase.hpp
+x64-windows-static/include/boost/algorithm/string/find.hpp
+x64-windows-static/include/boost/algorithm/string/find_format.hpp
+x64-windows-static/include/boost/algorithm/string/find_iterator.hpp
+x64-windows-static/include/boost/algorithm/string/finder.hpp
+x64-windows-static/include/boost/algorithm/string/formatter.hpp
+x64-windows-static/include/boost/algorithm/string/iter_find.hpp
+x64-windows-static/include/boost/algorithm/string/join.hpp
+x64-windows-static/include/boost/algorithm/string/predicate.hpp
+x64-windows-static/include/boost/algorithm/string/predicate_facade.hpp
+x64-windows-static/include/boost/algorithm/string/regex.hpp
+x64-windows-static/include/boost/algorithm/string/regex_find_format.hpp
+x64-windows-static/include/boost/algorithm/string/replace.hpp
+x64-windows-static/include/boost/algorithm/string/sequence_traits.hpp
+x64-windows-static/include/boost/algorithm/string/split.hpp
+x64-windows-static/include/boost/algorithm/string/std/
+x64-windows-static/include/boost/algorithm/string/std/list_traits.hpp
+x64-windows-static/include/boost/algorithm/string/std/rope_traits.hpp
+x64-windows-static/include/boost/algorithm/string/std/slist_traits.hpp
+x64-windows-static/include/boost/algorithm/string/std/string_traits.hpp
+x64-windows-static/include/boost/algorithm/string/std_containers_traits.hpp
+x64-windows-static/include/boost/algorithm/string/trim.hpp
+x64-windows-static/include/boost/algorithm/string/trim_all.hpp
+x64-windows-static/include/boost/algorithm/string/yes_no_type.hpp
+x64-windows-static/include/boost/algorithm/string_regex.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-algorithm/
+x64-windows-static/share/boost-algorithm/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/any.hpp
+x64-windows/share/
+x64-windows/share/boost-any/
+x64-windows/share/boost-any/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-any_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/any.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-any/
+x64-windows-static/share/boost-any/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/array.hpp
+x64-windows/share/
+x64-windows/share/boost-array/
+x64-windows/share/boost-array/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-array_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/array.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-array/
+x64-windows-static/share/boost-array/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/assert.hpp
+x64-windows/include/boost/current_function.hpp
+x64-windows/share/
+x64-windows/share/boost-assert/
+x64-windows/share/boost-assert/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-assert_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/assert.hpp
+x64-windows-static/include/boost/current_function.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-assert/
+x64-windows-static/share/boost-assert/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,104 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_atomic-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_atomic-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_atomic-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_atomic-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_atomic-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/atomic.hpp
+x64-windows/include/boost/atomic/
+x64-windows/include/boost/atomic/atomic.hpp
+x64-windows/include/boost/atomic/atomic_flag.hpp
+x64-windows/include/boost/atomic/capabilities.hpp
+x64-windows/include/boost/atomic/detail/
+x64-windows/include/boost/atomic/detail/addressof.hpp
+x64-windows/include/boost/atomic/detail/atomic_flag.hpp
+x64-windows/include/boost/atomic/detail/atomic_template.hpp
+x64-windows/include/boost/atomic/detail/bitwise_cast.hpp
+x64-windows/include/boost/atomic/detail/bitwise_fp_cast.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_alpha.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_arm.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_atomic.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_ppc.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_sparc.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_sync.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_x86.hpp
+x64-windows/include/boost/atomic/detail/caps_linux_arm.hpp
+x64-windows/include/boost/atomic/detail/caps_msvc_arm.hpp
+x64-windows/include/boost/atomic/detail/caps_msvc_x86.hpp
+x64-windows/include/boost/atomic/detail/caps_windows.hpp
+x64-windows/include/boost/atomic/detail/config.hpp
+x64-windows/include/boost/atomic/detail/extra_fp_operations.hpp
+x64-windows/include/boost/atomic/detail/extra_fp_operations_fwd.hpp
+x64-windows/include/boost/atomic/detail/extra_fp_ops_emulated.hpp
+x64-windows/include/boost/atomic/detail/extra_fp_ops_generic.hpp
+x64-windows/include/boost/atomic/detail/extra_operations.hpp
+x64-windows/include/boost/atomic/detail/extra_operations_fwd.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_emulated.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_gcc_arm.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_gcc_ppc.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_gcc_x86.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_generic.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_msvc_arm.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_msvc_x86.hpp
+x64-windows/include/boost/atomic/detail/float_sizes.hpp
+x64-windows/include/boost/atomic/detail/fp_operations.hpp
+x64-windows/include/boost/atomic/detail/fp_operations_fwd.hpp
+x64-windows/include/boost/atomic/detail/fp_ops_emulated.hpp
+x64-windows/include/boost/atomic/detail/fp_ops_generic.hpp
+x64-windows/include/boost/atomic/detail/hwcaps_gcc_arm.hpp
+x64-windows/include/boost/atomic/detail/hwcaps_gcc_ppc.hpp
+x64-windows/include/boost/atomic/detail/hwcaps_gcc_x86.hpp
+x64-windows/include/boost/atomic/detail/int_sizes.hpp
+x64-windows/include/boost/atomic/detail/integral_extend.hpp
+x64-windows/include/boost/atomic/detail/interlocked.hpp
+x64-windows/include/boost/atomic/detail/link.hpp
+x64-windows/include/boost/atomic/detail/lockpool.hpp
+x64-windows/include/boost/atomic/detail/operations.hpp
+x64-windows/include/boost/atomic/detail/operations_fwd.hpp
+x64-windows/include/boost/atomic/detail/operations_lockfree.hpp
+x64-windows/include/boost/atomic/detail/ops_cas_based.hpp
+x64-windows/include/boost/atomic/detail/ops_emulated.hpp
+x64-windows/include/boost/atomic/detail/ops_extending_cas_based.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_alpha.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_arm.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_arm_common.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_atomic.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_ppc.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_ppc_common.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_sparc.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_sync.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_x86.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_x86_dcas.hpp
+x64-windows/include/boost/atomic/detail/ops_linux_arm.hpp
+x64-windows/include/boost/atomic/detail/ops_msvc_arm.hpp
+x64-windows/include/boost/atomic/detail/ops_msvc_common.hpp
+x64-windows/include/boost/atomic/detail/ops_msvc_x86.hpp
+x64-windows/include/boost/atomic/detail/ops_windows.hpp
+x64-windows/include/boost/atomic/detail/pause.hpp
+x64-windows/include/boost/atomic/detail/platform.hpp
+x64-windows/include/boost/atomic/detail/storage_type.hpp
+x64-windows/include/boost/atomic/detail/string_ops.hpp
+x64-windows/include/boost/atomic/detail/type_traits/
+x64-windows/include/boost/atomic/detail/type_traits/conditional.hpp
+x64-windows/include/boost/atomic/detail/type_traits/integral_constant.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_floating_point.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_function.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_iec559.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_integral.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_signed.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_trivially_default_constructible.hpp
+x64-windows/include/boost/atomic/detail/type_traits/make_signed.hpp
+x64-windows/include/boost/atomic/detail/type_traits/make_unsigned.hpp
+x64-windows/include/boost/atomic/fences.hpp
+x64-windows/include/boost/memory_order.hpp
+x64-windows/lib/
+x64-windows/lib/boost_atomic-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-atomic/
+x64-windows/share/boost-atomic/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,98 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_atomic-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/atomic.hpp
+x64-windows-static/include/boost/atomic/
+x64-windows-static/include/boost/atomic/atomic.hpp
+x64-windows-static/include/boost/atomic/atomic_flag.hpp
+x64-windows-static/include/boost/atomic/capabilities.hpp
+x64-windows-static/include/boost/atomic/detail/
+x64-windows-static/include/boost/atomic/detail/addressof.hpp
+x64-windows-static/include/boost/atomic/detail/atomic_flag.hpp
+x64-windows-static/include/boost/atomic/detail/atomic_template.hpp
+x64-windows-static/include/boost/atomic/detail/bitwise_cast.hpp
+x64-windows-static/include/boost/atomic/detail/bitwise_fp_cast.hpp
+x64-windows-static/include/boost/atomic/detail/caps_gcc_alpha.hpp
+x64-windows-static/include/boost/atomic/detail/caps_gcc_arm.hpp
+x64-windows-static/include/boost/atomic/detail/caps_gcc_atomic.hpp
+x64-windows-static/include/boost/atomic/detail/caps_gcc_ppc.hpp
+x64-windows-static/include/boost/atomic/detail/caps_gcc_sparc.hpp
+x64-windows-static/include/boost/atomic/detail/caps_gcc_sync.hpp
+x64-windows-static/include/boost/atomic/detail/caps_gcc_x86.hpp
+x64-windows-static/include/boost/atomic/detail/caps_linux_arm.hpp
+x64-windows-static/include/boost/atomic/detail/caps_msvc_arm.hpp
+x64-windows-static/include/boost/atomic/detail/caps_msvc_x86.hpp
+x64-windows-static/include/boost/atomic/detail/caps_windows.hpp
+x64-windows-static/include/boost/atomic/detail/config.hpp
+x64-windows-static/include/boost/atomic/detail/extra_fp_operations.hpp
+x64-windows-static/include/boost/atomic/detail/extra_fp_operations_fwd.hpp
+x64-windows-static/include/boost/atomic/detail/extra_fp_ops_emulated.hpp
+x64-windows-static/include/boost/atomic/detail/extra_fp_ops_generic.hpp
+x64-windows-static/include/boost/atomic/detail/extra_operations.hpp
+x64-windows-static/include/boost/atomic/detail/extra_operations_fwd.hpp
+x64-windows-static/include/boost/atomic/detail/extra_ops_emulated.hpp
+x64-windows-static/include/boost/atomic/detail/extra_ops_gcc_arm.hpp
+x64-windows-static/include/boost/atomic/detail/extra_ops_gcc_ppc.hpp
+x64-windows-static/include/boost/atomic/detail/extra_ops_gcc_x86.hpp
+x64-windows-static/include/boost/atomic/detail/extra_ops_generic.hpp
+x64-windows-static/include/boost/atomic/detail/extra_ops_msvc_arm.hpp
+x64-windows-static/include/boost/atomic/detail/extra_ops_msvc_x86.hpp
+x64-windows-static/include/boost/atomic/detail/float_sizes.hpp
+x64-windows-static/include/boost/atomic/detail/fp_operations.hpp
+x64-windows-static/include/boost/atomic/detail/fp_operations_fwd.hpp
+x64-windows-static/include/boost/atomic/detail/fp_ops_emulated.hpp
+x64-windows-static/include/boost/atomic/detail/fp_ops_generic.hpp
+x64-windows-static/include/boost/atomic/detail/hwcaps_gcc_arm.hpp
+x64-windows-static/include/boost/atomic/detail/hwcaps_gcc_ppc.hpp
+x64-windows-static/include/boost/atomic/detail/hwcaps_gcc_x86.hpp
+x64-windows-static/include/boost/atomic/detail/int_sizes.hpp
+x64-windows-static/include/boost/atomic/detail/integral_extend.hpp
+x64-windows-static/include/boost/atomic/detail/interlocked.hpp
+x64-windows-static/include/boost/atomic/detail/link.hpp
+x64-windows-static/include/boost/atomic/detail/lockpool.hpp
+x64-windows-static/include/boost/atomic/detail/operations.hpp
+x64-windows-static/include/boost/atomic/detail/operations_fwd.hpp
+x64-windows-static/include/boost/atomic/detail/operations_lockfree.hpp
+x64-windows-static/include/boost/atomic/detail/ops_cas_based.hpp
+x64-windows-static/include/boost/atomic/detail/ops_emulated.hpp
+x64-windows-static/include/boost/atomic/detail/ops_extending_cas_based.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_alpha.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_arm.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_arm_common.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_atomic.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_ppc.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_ppc_common.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_sparc.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_sync.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_x86.hpp
+x64-windows-static/include/boost/atomic/detail/ops_gcc_x86_dcas.hpp
+x64-windows-static/include/boost/atomic/detail/ops_linux_arm.hpp
+x64-windows-static/include/boost/atomic/detail/ops_msvc_arm.hpp
+x64-windows-static/include/boost/atomic/detail/ops_msvc_common.hpp
+x64-windows-static/include/boost/atomic/detail/ops_msvc_x86.hpp
+x64-windows-static/include/boost/atomic/detail/ops_windows.hpp
+x64-windows-static/include/boost/atomic/detail/pause.hpp
+x64-windows-static/include/boost/atomic/detail/platform.hpp
+x64-windows-static/include/boost/atomic/detail/storage_type.hpp
+x64-windows-static/include/boost/atomic/detail/string_ops.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/
+x64-windows-static/include/boost/atomic/detail/type_traits/conditional.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/integral_constant.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/is_floating_point.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/is_function.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/is_iec559.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/is_integral.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/is_signed.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/is_trivially_default_constructible.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/make_signed.hpp
+x64-windows-static/include/boost/atomic/detail/type_traits/make_unsigned.hpp
+x64-windows-static/include/boost/atomic/fences.hpp
+x64-windows-static/include/boost/memory_order.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_atomic-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-atomic/
+x64-windows-static/share/boost-atomic/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,119 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/bimap.hpp
+x64-windows/include/boost/bimap/
+x64-windows/include/boost/bimap/bimap.hpp
+x64-windows/include/boost/bimap/container_adaptor/
+x64-windows/include/boost/bimap/container_adaptor/associative_container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/
+x64-windows/include/boost/bimap/container_adaptor/detail/comparison_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/functor_bag.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/identity_converters.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/key_extractor.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/non_unique_container_helper.hpp
+x64-windows/include/boost/bimap/container_adaptor/list_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/list_map_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/map_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/multimap_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/multiset_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/ordered_associative_container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/sequence_container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/set_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/support/
+x64-windows/include/boost/bimap/container_adaptor/support/iterator_facade_converters.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_associative_container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_map_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_multimap_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_multiset_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_set_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/vector_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/vector_map_adaptor.hpp
+x64-windows/include/boost/bimap/detail/
+x64-windows/include/boost/bimap/detail/bimap_core.hpp
+x64-windows/include/boost/bimap/detail/concept_tags.hpp
+x64-windows/include/boost/bimap/detail/debug/
+x64-windows/include/boost/bimap/detail/debug/static_error.hpp
+x64-windows/include/boost/bimap/detail/generate_index_binder.hpp
+x64-windows/include/boost/bimap/detail/generate_relation_binder.hpp
+x64-windows/include/boost/bimap/detail/generate_view_binder.hpp
+x64-windows/include/boost/bimap/detail/is_set_type_of.hpp
+x64-windows/include/boost/bimap/detail/manage_additional_parameters.hpp
+x64-windows/include/boost/bimap/detail/manage_bimap_key.hpp
+x64-windows/include/boost/bimap/detail/map_view_base.hpp
+x64-windows/include/boost/bimap/detail/map_view_iterator.hpp
+x64-windows/include/boost/bimap/detail/modifier_adaptor.hpp
+x64-windows/include/boost/bimap/detail/non_unique_views_helper.hpp
+x64-windows/include/boost/bimap/detail/set_view_base.hpp
+x64-windows/include/boost/bimap/detail/set_view_iterator.hpp
+x64-windows/include/boost/bimap/detail/test/
+x64-windows/include/boost/bimap/detail/test/check_metadata.hpp
+x64-windows/include/boost/bimap/detail/user_interface_config.hpp
+x64-windows/include/boost/bimap/list_of.hpp
+x64-windows/include/boost/bimap/multiset_of.hpp
+x64-windows/include/boost/bimap/property_map/
+x64-windows/include/boost/bimap/property_map/set_support.hpp
+x64-windows/include/boost/bimap/property_map/unordered_set_support.hpp
+x64-windows/include/boost/bimap/relation/
+x64-windows/include/boost/bimap/relation/detail/
+x64-windows/include/boost/bimap/relation/detail/access_builder.hpp
+x64-windows/include/boost/bimap/relation/detail/metadata_access_builder.hpp
+x64-windows/include/boost/bimap/relation/detail/mutant.hpp
+x64-windows/include/boost/bimap/relation/detail/static_access_builder.hpp
+x64-windows/include/boost/bimap/relation/detail/to_mutable_relation_functor.hpp
+x64-windows/include/boost/bimap/relation/member_at.hpp
+x64-windows/include/boost/bimap/relation/mutant_relation.hpp
+x64-windows/include/boost/bimap/relation/pair_layout.hpp
+x64-windows/include/boost/bimap/relation/structured_pair.hpp
+x64-windows/include/boost/bimap/relation/support/
+x64-windows/include/boost/bimap/relation/support/data_extractor.hpp
+x64-windows/include/boost/bimap/relation/support/get.hpp
+x64-windows/include/boost/bimap/relation/support/get_pair_functor.hpp
+x64-windows/include/boost/bimap/relation/support/is_tag_of_member_at.hpp
+x64-windows/include/boost/bimap/relation/support/member_with_tag.hpp
+x64-windows/include/boost/bimap/relation/support/opposite_tag.hpp
+x64-windows/include/boost/bimap/relation/support/pair_by.hpp
+x64-windows/include/boost/bimap/relation/support/pair_type_by.hpp
+x64-windows/include/boost/bimap/relation/support/value_type_of.hpp
+x64-windows/include/boost/bimap/relation/symmetrical_base.hpp
+x64-windows/include/boost/bimap/set_of.hpp
+x64-windows/include/boost/bimap/support/
+x64-windows/include/boost/bimap/support/data_type_by.hpp
+x64-windows/include/boost/bimap/support/iterator_type_by.hpp
+x64-windows/include/boost/bimap/support/key_type_by.hpp
+x64-windows/include/boost/bimap/support/lambda.hpp
+x64-windows/include/boost/bimap/support/map_by.hpp
+x64-windows/include/boost/bimap/support/map_type_by.hpp
+x64-windows/include/boost/bimap/support/value_type_by.hpp
+x64-windows/include/boost/bimap/tags/
+x64-windows/include/boost/bimap/tags/support/
+x64-windows/include/boost/bimap/tags/support/apply_to_value_type.hpp
+x64-windows/include/boost/bimap/tags/support/default_tagged.hpp
+x64-windows/include/boost/bimap/tags/support/is_tagged.hpp
+x64-windows/include/boost/bimap/tags/support/overwrite_tagged.hpp
+x64-windows/include/boost/bimap/tags/support/tag_of.hpp
+x64-windows/include/boost/bimap/tags/support/value_type_of.hpp
+x64-windows/include/boost/bimap/tags/tagged.hpp
+x64-windows/include/boost/bimap/unconstrained_set_of.hpp
+x64-windows/include/boost/bimap/unordered_multiset_of.hpp
+x64-windows/include/boost/bimap/unordered_set_of.hpp
+x64-windows/include/boost/bimap/vector_of.hpp
+x64-windows/include/boost/bimap/views/
+x64-windows/include/boost/bimap/views/list_map_view.hpp
+x64-windows/include/boost/bimap/views/list_set_view.hpp
+x64-windows/include/boost/bimap/views/map_view.hpp
+x64-windows/include/boost/bimap/views/multimap_view.hpp
+x64-windows/include/boost/bimap/views/multiset_view.hpp
+x64-windows/include/boost/bimap/views/set_view.hpp
+x64-windows/include/boost/bimap/views/unconstrained_map_view.hpp
+x64-windows/include/boost/bimap/views/unconstrained_set_view.hpp
+x64-windows/include/boost/bimap/views/unordered_map_view.hpp
+x64-windows/include/boost/bimap/views/unordered_multimap_view.hpp
+x64-windows/include/boost/bimap/views/unordered_multiset_view.hpp
+x64-windows/include/boost/bimap/views/unordered_set_view.hpp
+x64-windows/include/boost/bimap/views/vector_map_view.hpp
+x64-windows/include/boost/bimap/views/vector_set_view.hpp
+x64-windows/share/
+x64-windows/share/boost-bimap/
+x64-windows/share/boost-bimap/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,119 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/bimap.hpp
+x64-windows-static/include/boost/bimap/
+x64-windows-static/include/boost/bimap/bimap.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/
+x64-windows-static/include/boost/bimap/container_adaptor/associative_container_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/container_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/detail/
+x64-windows-static/include/boost/bimap/container_adaptor/detail/comparison_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/detail/functor_bag.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/detail/identity_converters.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/detail/key_extractor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/detail/non_unique_container_helper.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/list_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/list_map_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/map_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/multimap_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/multiset_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/ordered_associative_container_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/sequence_container_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/set_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/support/
+x64-windows-static/include/boost/bimap/container_adaptor/support/iterator_facade_converters.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/unordered_associative_container_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/unordered_map_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/unordered_multimap_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/unordered_multiset_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/unordered_set_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/vector_adaptor.hpp
+x64-windows-static/include/boost/bimap/container_adaptor/vector_map_adaptor.hpp
+x64-windows-static/include/boost/bimap/detail/
+x64-windows-static/include/boost/bimap/detail/bimap_core.hpp
+x64-windows-static/include/boost/bimap/detail/concept_tags.hpp
+x64-windows-static/include/boost/bimap/detail/debug/
+x64-windows-static/include/boost/bimap/detail/debug/static_error.hpp
+x64-windows-static/include/boost/bimap/detail/generate_index_binder.hpp
+x64-windows-static/include/boost/bimap/detail/generate_relation_binder.hpp
+x64-windows-static/include/boost/bimap/detail/generate_view_binder.hpp
+x64-windows-static/include/boost/bimap/detail/is_set_type_of.hpp
+x64-windows-static/include/boost/bimap/detail/manage_additional_parameters.hpp
+x64-windows-static/include/boost/bimap/detail/manage_bimap_key.hpp
+x64-windows-static/include/boost/bimap/detail/map_view_base.hpp
+x64-windows-static/include/boost/bimap/detail/map_view_iterator.hpp
+x64-windows-static/include/boost/bimap/detail/modifier_adaptor.hpp
+x64-windows-static/include/boost/bimap/detail/non_unique_views_helper.hpp
+x64-windows-static/include/boost/bimap/detail/set_view_base.hpp
+x64-windows-static/include/boost/bimap/detail/set_view_iterator.hpp
+x64-windows-static/include/boost/bimap/detail/test/
+x64-windows-static/include/boost/bimap/detail/test/check_metadata.hpp
+x64-windows-static/include/boost/bimap/detail/user_interface_config.hpp
+x64-windows-static/include/boost/bimap/list_of.hpp
+x64-windows-static/include/boost/bimap/multiset_of.hpp
+x64-windows-static/include/boost/bimap/property_map/
+x64-windows-static/include/boost/bimap/property_map/set_support.hpp
+x64-windows-static/include/boost/bimap/property_map/unordered_set_support.hpp
+x64-windows-static/include/boost/bimap/relation/
+x64-windows-static/include/boost/bimap/relation/detail/
+x64-windows-static/include/boost/bimap/relation/detail/access_builder.hpp
+x64-windows-static/include/boost/bimap/relation/detail/metadata_access_builder.hpp
+x64-windows-static/include/boost/bimap/relation/detail/mutant.hpp
+x64-windows-static/include/boost/bimap/relation/detail/static_access_builder.hpp
+x64-windows-static/include/boost/bimap/relation/detail/to_mutable_relation_functor.hpp
+x64-windows-static/include/boost/bimap/relation/member_at.hpp
+x64-windows-static/include/boost/bimap/relation/mutant_relation.hpp
+x64-windows-static/include/boost/bimap/relation/pair_layout.hpp
+x64-windows-static/include/boost/bimap/relation/structured_pair.hpp
+x64-windows-static/include/boost/bimap/relation/support/
+x64-windows-static/include/boost/bimap/relation/support/data_extractor.hpp
+x64-windows-static/include/boost/bimap/relation/support/get.hpp
+x64-windows-static/include/boost/bimap/relation/support/get_pair_functor.hpp
+x64-windows-static/include/boost/bimap/relation/support/is_tag_of_member_at.hpp
+x64-windows-static/include/boost/bimap/relation/support/member_with_tag.hpp
+x64-windows-static/include/boost/bimap/relation/support/opposite_tag.hpp
+x64-windows-static/include/boost/bimap/relation/support/pair_by.hpp
+x64-windows-static/include/boost/bimap/relation/support/pair_type_by.hpp
+x64-windows-static/include/boost/bimap/relation/support/value_type_of.hpp
+x64-windows-static/include/boost/bimap/relation/symmetrical_base.hpp
+x64-windows-static/include/boost/bimap/set_of.hpp
+x64-windows-static/include/boost/bimap/support/
+x64-windows-static/include/boost/bimap/support/data_type_by.hpp
+x64-windows-static/include/boost/bimap/support/iterator_type_by.hpp
+x64-windows-static/include/boost/bimap/support/key_type_by.hpp
+x64-windows-static/include/boost/bimap/support/lambda.hpp
+x64-windows-static/include/boost/bimap/support/map_by.hpp
+x64-windows-static/include/boost/bimap/support/map_type_by.hpp
+x64-windows-static/include/boost/bimap/support/value_type_by.hpp
+x64-windows-static/include/boost/bimap/tags/
+x64-windows-static/include/boost/bimap/tags/support/
+x64-windows-static/include/boost/bimap/tags/support/apply_to_value_type.hpp
+x64-windows-static/include/boost/bimap/tags/support/default_tagged.hpp
+x64-windows-static/include/boost/bimap/tags/support/is_tagged.hpp
+x64-windows-static/include/boost/bimap/tags/support/overwrite_tagged.hpp
+x64-windows-static/include/boost/bimap/tags/support/tag_of.hpp
+x64-windows-static/include/boost/bimap/tags/support/value_type_of.hpp
+x64-windows-static/include/boost/bimap/tags/tagged.hpp
+x64-windows-static/include/boost/bimap/unconstrained_set_of.hpp
+x64-windows-static/include/boost/bimap/unordered_multiset_of.hpp
+x64-windows-static/include/boost/bimap/unordered_set_of.hpp
+x64-windows-static/include/boost/bimap/vector_of.hpp
+x64-windows-static/include/boost/bimap/views/
+x64-windows-static/include/boost/bimap/views/list_map_view.hpp
+x64-windows-static/include/boost/bimap/views/list_set_view.hpp
+x64-windows-static/include/boost/bimap/views/map_view.hpp
+x64-windows-static/include/boost/bimap/views/multimap_view.hpp
+x64-windows-static/include/boost/bimap/views/multiset_view.hpp
+x64-windows-static/include/boost/bimap/views/set_view.hpp
+x64-windows-static/include/boost/bimap/views/unconstrained_map_view.hpp
+x64-windows-static/include/boost/bimap/views/unconstrained_set_view.hpp
+x64-windows-static/include/boost/bimap/views/unordered_map_view.hpp
+x64-windows-static/include/boost/bimap/views/unordered_multimap_view.hpp
+x64-windows-static/include/boost/bimap/views/unordered_multiset_view.hpp
+x64-windows-static/include/boost/bimap/views/unordered_set_view.hpp
+x64-windows-static/include/boost/bimap/views/vector_map_view.hpp
+x64-windows-static/include/boost/bimap/views/vector_set_view.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-bimap/
+x64-windows-static/share/boost-bimap/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/bind.hpp
+x64-windows/include/boost/bind/
+x64-windows/include/boost/bind/apply.hpp
+x64-windows/include/boost/bind/arg.hpp
+x64-windows/include/boost/bind/bind.hpp
+x64-windows/include/boost/bind/bind_cc.hpp
+x64-windows/include/boost/bind/bind_mf2_cc.hpp
+x64-windows/include/boost/bind/bind_mf_cc.hpp
+x64-windows/include/boost/bind/bind_template.hpp
+x64-windows/include/boost/bind/make_adaptable.hpp
+x64-windows/include/boost/bind/mem_fn.hpp
+x64-windows/include/boost/bind/mem_fn_cc.hpp
+x64-windows/include/boost/bind/mem_fn_template.hpp
+x64-windows/include/boost/bind/mem_fn_vw.hpp
+x64-windows/include/boost/bind/placeholders.hpp
+x64-windows/include/boost/bind/protect.hpp
+x64-windows/include/boost/bind/storage.hpp
+x64-windows/include/boost/is_placeholder.hpp
+x64-windows/include/boost/mem_fn.hpp
+x64-windows/share/
+x64-windows/share/boost-bind/
+x64-windows/share/boost-bind/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-bind_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/bind.hpp
+x64-windows-static/include/boost/bind/
+x64-windows-static/include/boost/bind/apply.hpp
+x64-windows-static/include/boost/bind/arg.hpp
+x64-windows-static/include/boost/bind/bind.hpp
+x64-windows-static/include/boost/bind/bind_cc.hpp
+x64-windows-static/include/boost/bind/bind_mf2_cc.hpp
+x64-windows-static/include/boost/bind/bind_mf_cc.hpp
+x64-windows-static/include/boost/bind/bind_template.hpp
+x64-windows-static/include/boost/bind/make_adaptable.hpp
+x64-windows-static/include/boost/bind/mem_fn.hpp
+x64-windows-static/include/boost/bind/mem_fn_cc.hpp
+x64-windows-static/include/boost/bind/mem_fn_template.hpp
+x64-windows-static/include/boost/bind/mem_fn_vw.hpp
+x64-windows-static/include/boost/bind/placeholders.hpp
+x64-windows-static/include/boost/bind/protect.hpp
+x64-windows-static/include/boost/bind/storage.hpp
+x64-windows-static/include/boost/is_placeholder.hpp
+x64-windows-static/include/boost/mem_fn.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-bind/
+x64-windows-static/share/boost-bind/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1389 @@
+x64-windows/
+x64-windows/share/
+x64-windows/share/boost-build/
+x64-windows/share/boost-build/copyright
+x64-windows/tools/
+x64-windows/tools/boost-build/
+x64-windows/tools/boost-build/.gitattributes
+x64-windows/tools/boost-build/.gitignore
+x64-windows/tools/boost-build/.travis.yml
+x64-windows/tools/boost-build/CONTRIBUTING.rst
+x64-windows/tools/boost-build/Jamroot.jam
+x64-windows/tools/boost-build/README.rst
+x64-windows/tools/boost-build/appveyor.yml
+x64-windows/tools/boost-build/b2.exe
+x64-windows/tools/boost-build/bjam.exe
+x64-windows/tools/boost-build/boost-build.jam
+x64-windows/tools/boost-build/boostcpp.jam
+x64-windows/tools/boost-build/bootstrap.bat
+x64-windows/tools/boost-build/bootstrap.log
+x64-windows/tools/boost-build/bootstrap.sh
+x64-windows/tools/boost-build/bootstrap_vms.com
+x64-windows/tools/boost-build/doc/
+x64-windows/tools/boost-build/doc/bjam.qbk
+x64-windows/tools/boost-build/doc/boost.png
+x64-windows/tools/boost-build/doc/boostbook.css
+x64-windows/tools/boost-build/doc/examples.qbk
+x64-windows/tools/boost-build/doc/history.qbk
+x64-windows/tools/boost-build/doc/images/
+x64-windows/tools/boost-build/doc/images/alert.png
+x64-windows/tools/boost-build/doc/images/blank.png
+x64-windows/tools/boost-build/doc/images/callouts/
+x64-windows/tools/boost-build/doc/images/callouts/1.png
+x64-windows/tools/boost-build/doc/images/callouts/1.svg
+x64-windows/tools/boost-build/doc/images/callouts/10.png
+x64-windows/tools/boost-build/doc/images/callouts/10.svg
+x64-windows/tools/boost-build/doc/images/callouts/11.png
+x64-windows/tools/boost-build/doc/images/callouts/11.svg
+x64-windows/tools/boost-build/doc/images/callouts/12.png
+x64-windows/tools/boost-build/doc/images/callouts/12.svg
+x64-windows/tools/boost-build/doc/images/callouts/13.png
+x64-windows/tools/boost-build/doc/images/callouts/13.svg
+x64-windows/tools/boost-build/doc/images/callouts/14.png
+x64-windows/tools/boost-build/doc/images/callouts/14.svg
+x64-windows/tools/boost-build/doc/images/callouts/15.png
+x64-windows/tools/boost-build/doc/images/callouts/15.svg
+x64-windows/tools/boost-build/doc/images/callouts/16.svg
+x64-windows/tools/boost-build/doc/images/callouts/17.svg
+x64-windows/tools/boost-build/doc/images/callouts/18.svg
+x64-windows/tools/boost-build/doc/images/callouts/19.svg
+x64-windows/tools/boost-build/doc/images/callouts/2.png
+x64-windows/tools/boost-build/doc/images/callouts/2.svg
+x64-windows/tools/boost-build/doc/images/callouts/20.svg
+x64-windows/tools/boost-build/doc/images/callouts/21.svg
+x64-windows/tools/boost-build/doc/images/callouts/22.svg
+x64-windows/tools/boost-build/doc/images/callouts/23.svg
+x64-windows/tools/boost-build/doc/images/callouts/24.svg
+x64-windows/tools/boost-build/doc/images/callouts/25.svg
+x64-windows/tools/boost-build/doc/images/callouts/26.svg
+x64-windows/tools/boost-build/doc/images/callouts/27.svg
+x64-windows/tools/boost-build/doc/images/callouts/28.svg
+x64-windows/tools/boost-build/doc/images/callouts/29.svg
+x64-windows/tools/boost-build/doc/images/callouts/3.png
+x64-windows/tools/boost-build/doc/images/callouts/3.svg
+x64-windows/tools/boost-build/doc/images/callouts/30.svg
+x64-windows/tools/boost-build/doc/images/callouts/4.png
+x64-windows/tools/boost-build/doc/images/callouts/4.svg
+x64-windows/tools/boost-build/doc/images/callouts/5.png
+x64-windows/tools/boost-build/doc/images/callouts/5.svg
+x64-windows/tools/boost-build/doc/images/callouts/6.png
+x64-windows/tools/boost-build/doc/images/callouts/6.svg
+x64-windows/tools/boost-build/doc/images/callouts/7.png
+x64-windows/tools/boost-build/doc/images/callouts/7.svg
+x64-windows/tools/boost-build/doc/images/callouts/8.png
+x64-windows/tools/boost-build/doc/images/callouts/8.svg
+x64-windows/tools/boost-build/doc/images/callouts/9.png
+x64-windows/tools/boost-build/doc/images/callouts/9.svg
+x64-windows/tools/boost-build/doc/images/caution.png
+x64-windows/tools/boost-build/doc/images/caution.svg
+x64-windows/tools/boost-build/doc/images/draft.png
+x64-windows/tools/boost-build/doc/images/home.png
+x64-windows/tools/boost-build/doc/images/home.svg
+x64-windows/tools/boost-build/doc/images/important.png
+x64-windows/tools/boost-build/doc/images/important.svg
+x64-windows/tools/boost-build/doc/images/next.png
+x64-windows/tools/boost-build/doc/images/next.svg
+x64-windows/tools/boost-build/doc/images/next_disabled.png
+x64-windows/tools/boost-build/doc/images/note.png
+x64-windows/tools/boost-build/doc/images/note.svg
+x64-windows/tools/boost-build/doc/images/prev.png
+x64-windows/tools/boost-build/doc/images/prev.svg
+x64-windows/tools/boost-build/doc/images/prev_disabled.png
+x64-windows/tools/boost-build/doc/images/smiley.png
+x64-windows/tools/boost-build/doc/images/tip.png
+x64-windows/tools/boost-build/doc/images/tip.svg
+x64-windows/tools/boost-build/doc/images/toc-blank.png
+x64-windows/tools/boost-build/doc/images/toc-minus.png
+x64-windows/tools/boost-build/doc/images/toc-plus.png
+x64-windows/tools/boost-build/doc/images/up.png
+x64-windows/tools/boost-build/doc/images/up.svg
+x64-windows/tools/boost-build/doc/images/up_disabled.png
+x64-windows/tools/boost-build/doc/images/warning.png
+x64-windows/tools/boost-build/doc/images/warning.svg
+x64-windows/tools/boost-build/doc/jamfile.jam
+x64-windows/tools/boost-build/doc/src/
+x64-windows/tools/boost-build/doc/src/abstract-target.xml
+x64-windows/tools/boost-build/doc/src/architecture.xml
+x64-windows/tools/boost-build/doc/src/basic-target.xml
+x64-windows/tools/boost-build/doc/src/debug.xml
+x64-windows/tools/boost-build/doc/src/extending.xml
+x64-windows/tools/boost-build/doc/src/faq.xml
+x64-windows/tools/boost-build/doc/src/fragments.xml
+x64-windows/tools/boost-build/doc/src/howto.xml
+x64-windows/tools/boost-build/doc/src/install.xml
+x64-windows/tools/boost-build/doc/src/main-target.xml
+x64-windows/tools/boost-build/doc/src/overview.xml
+x64-windows/tools/boost-build/doc/src/path.xml
+x64-windows/tools/boost-build/doc/src/project-target.xml
+x64-windows/tools/boost-build/doc/src/property-set.xml
+x64-windows/tools/boost-build/doc/src/recipes.xml
+x64-windows/tools/boost-build/doc/src/reference.xml
+x64-windows/tools/boost-build/doc/src/regex.xml
+x64-windows/tools/boost-build/doc/src/sequence.xml
+x64-windows/tools/boost-build/doc/src/standalone.xml
+x64-windows/tools/boost-build/doc/src/tasks.xml
+x64-windows/tools/boost-build/doc/src/tools.adoc
+x64-windows/tools/boost-build/doc/src/tutorial.xml
+x64-windows/tools/boost-build/doc/src/type.xml
+x64-windows/tools/boost-build/doc/src/typed-target.xml
+x64-windows/tools/boost-build/doc/src/userman.xml
+x64-windows/tools/boost-build/example/
+x64-windows/tools/boost-build/example/asciidoctor/
+x64-windows/tools/boost-build/example/asciidoctor/example.adoc
+x64-windows/tools/boost-build/example/asciidoctor/example_manpage.adoc
+x64-windows/tools/boost-build/example/asciidoctor/jamroot.jam
+x64-windows/tools/boost-build/example/boost-build.jam
+x64-windows/tools/boost-build/example/built_tool/
+x64-windows/tools/boost-build/example/built_tool/Jamroot.jam
+x64-windows/tools/boost-build/example/built_tool/core/
+x64-windows/tools/boost-build/example/built_tool/core/Jamfile.jam
+x64-windows/tools/boost-build/example/built_tool/core/a.td
+x64-windows/tools/boost-build/example/built_tool/core/core.cpp
+x64-windows/tools/boost-build/example/built_tool/readme.txt
+x64-windows/tools/boost-build/example/built_tool/tblgen/
+x64-windows/tools/boost-build/example/built_tool/tblgen/Jamfile.jam
+x64-windows/tools/boost-build/example/built_tool/tblgen/tblgen.cpp
+x64-windows/tools/boost-build/example/complex-testing/
+x64-windows/tools/boost-build/example/complex-testing/compile-fail.cpp
+x64-windows/tools/boost-build/example/complex-testing/fail.cpp
+x64-windows/tools/boost-build/example/complex-testing/jamroot.jam
+x64-windows/tools/boost-build/example/complex-testing/post.cpp
+x64-windows/tools/boost-build/example/complex-testing/success.cpp
+x64-windows/tools/boost-build/example/customization/
+x64-windows/tools/boost-build/example/customization/class.verbatim
+x64-windows/tools/boost-build/example/customization/codegen.cpp
+x64-windows/tools/boost-build/example/customization/inline_file.py
+x64-windows/tools/boost-build/example/customization/jamroot.jam
+x64-windows/tools/boost-build/example/customization/readme.txt
+x64-windows/tools/boost-build/example/customization/t1.verbatim
+x64-windows/tools/boost-build/example/customization/t2.verbatim
+x64-windows/tools/boost-build/example/customization/usage.verbatim
+x64-windows/tools/boost-build/example/customization/verbatim.jam
+x64-windows/tools/boost-build/example/customization/verbatim.py
+x64-windows/tools/boost-build/example/generate/
+x64-windows/tools/boost-build/example/generate/README.txt
+x64-windows/tools/boost-build/example/generate/a.cpp
+x64-windows/tools/boost-build/example/generate/gen.jam
+x64-windows/tools/boost-build/example/generate/gen.py
+x64-windows/tools/boost-build/example/generate/jamroot.jam
+x64-windows/tools/boost-build/example/generator/
+x64-windows/tools/boost-build/example/generator/README.txt
+x64-windows/tools/boost-build/example/generator/foo.gci
+x64-windows/tools/boost-build/example/generator/jamroot.jam
+x64-windows/tools/boost-build/example/generator/soap.jam
+x64-windows/tools/boost-build/example/gettext/
+x64-windows/tools/boost-build/example/gettext/jamfile.jam
+x64-windows/tools/boost-build/example/gettext/jamroot.jam
+x64-windows/tools/boost-build/example/gettext/main.cpp
+x64-windows/tools/boost-build/example/gettext/readme.txt
+x64-windows/tools/boost-build/example/gettext/russian.po
+x64-windows/tools/boost-build/example/hello/
+x64-windows/tools/boost-build/example/hello/hello.cpp
+x64-windows/tools/boost-build/example/hello/jamroot.jam
+x64-windows/tools/boost-build/example/hello/readme.qbk
+x64-windows/tools/boost-build/example/libraries/
+x64-windows/tools/boost-build/example/libraries/app/
+x64-windows/tools/boost-build/example/libraries/app/app.cpp
+x64-windows/tools/boost-build/example/libraries/app/jamfile.jam
+x64-windows/tools/boost-build/example/libraries/jamroot.jam
+x64-windows/tools/boost-build/example/libraries/util/
+x64-windows/tools/boost-build/example/libraries/util/foo/
+x64-windows/tools/boost-build/example/libraries/util/foo/bar.cpp
+x64-windows/tools/boost-build/example/libraries/util/foo/include/
+x64-windows/tools/boost-build/example/libraries/util/foo/include/lib1.h
+x64-windows/tools/boost-build/example/libraries/util/foo/jamfile.jam
+x64-windows/tools/boost-build/example/make/
+x64-windows/tools/boost-build/example/make/foo.py
+x64-windows/tools/boost-build/example/make/jamroot.jam
+x64-windows/tools/boost-build/example/make/main_cpp.pro
+x64-windows/tools/boost-build/example/make/readme.txt
+x64-windows/tools/boost-build/example/pch/
+x64-windows/tools/boost-build/example/pch/include/
+x64-windows/tools/boost-build/example/pch/include/pch.hpp
+x64-windows/tools/boost-build/example/pch/jamroot.jam
+x64-windows/tools/boost-build/example/pch/source/
+x64-windows/tools/boost-build/example/pch/source/hello_world.cpp
+x64-windows/tools/boost-build/example/python_modules/
+x64-windows/tools/boost-build/example/python_modules/jamroot.jam
+x64-windows/tools/boost-build/example/python_modules/python_helpers.jam
+x64-windows/tools/boost-build/example/python_modules/python_helpers.py
+x64-windows/tools/boost-build/example/python_modules/readme.txt
+x64-windows/tools/boost-build/example/qt/
+x64-windows/tools/boost-build/example/qt/README.txt
+x64-windows/tools/boost-build/example/qt/qt3/
+x64-windows/tools/boost-build/example/qt/qt3/hello/
+x64-windows/tools/boost-build/example/qt/qt3/hello/canvas.cpp
+x64-windows/tools/boost-build/example/qt/qt3/hello/canvas.h
+x64-windows/tools/boost-build/example/qt/qt3/hello/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt3/hello/main.cpp
+x64-windows/tools/boost-build/example/qt/qt3/moccable-cpp/
+x64-windows/tools/boost-build/example/qt/qt3/moccable-cpp/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt3/moccable-cpp/main.cpp
+x64-windows/tools/boost-build/example/qt/qt3/uic/
+x64-windows/tools/boost-build/example/qt/qt3/uic/hello_world_widget.ui
+x64-windows/tools/boost-build/example/qt/qt3/uic/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt3/uic/main.cpp
+x64-windows/tools/boost-build/example/qt/qt4/
+x64-windows/tools/boost-build/example/qt/qt4/hello/
+x64-windows/tools/boost-build/example/qt/qt4/hello/arrow.cpp
+x64-windows/tools/boost-build/example/qt/qt4/hello/arrow.h
+x64-windows/tools/boost-build/example/qt/qt4/hello/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt4/hello/main.cpp
+x64-windows/tools/boost-build/example/qt/qt4/moccable-cpp/
+x64-windows/tools/boost-build/example/qt/qt4/moccable-cpp/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt4/moccable-cpp/main.cpp
+x64-windows/tools/boost-build/example/qt/qt4/uic/
+x64-windows/tools/boost-build/example/qt/qt4/uic/hello_world_widget.ui
+x64-windows/tools/boost-build/example/qt/qt4/uic/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt4/uic/main.cpp
+x64-windows/tools/boost-build/example/sass/
+x64-windows/tools/boost-build/example/sass/importing.scss
+x64-windows/tools/boost-build/example/sass/include/
+x64-windows/tools/boost-build/example/sass/include/foobar.scss
+x64-windows/tools/boost-build/example/sass/jamroot.jam
+x64-windows/tools/boost-build/example/sass/singleton.sass
+x64-windows/tools/boost-build/example/sass/singleton.scss
+x64-windows/tools/boost-build/example/site-config.jam
+x64-windows/tools/boost-build/example/testing/
+x64-windows/tools/boost-build/example/testing/compile-fail.cpp
+x64-windows/tools/boost-build/example/testing/fail.cpp
+x64-windows/tools/boost-build/example/testing/jamroot.jam
+x64-windows/tools/boost-build/example/testing/success.cpp
+x64-windows/tools/boost-build/example/time/
+x64-windows/tools/boost-build/example/time/hello.cpp
+x64-windows/tools/boost-build/example/time/jamroot.jam
+x64-windows/tools/boost-build/example/time/readme.qbk
+x64-windows/tools/boost-build/example/try_compile/
+x64-windows/tools/boost-build/example/try_compile/Jamroot.jam
+x64-windows/tools/boost-build/example/try_compile/foo.cpp
+x64-windows/tools/boost-build/example/try_compile/main.cpp
+x64-windows/tools/boost-build/example/user-config.jam
+x64-windows/tools/boost-build/example/variant/
+x64-windows/tools/boost-build/example/variant/a.cpp
+x64-windows/tools/boost-build/example/variant/jamfile.jam
+x64-windows/tools/boost-build/example/variant/jamroot.jam
+x64-windows/tools/boost-build/example/variant/libs/
+x64-windows/tools/boost-build/example/variant/libs/jamfile.jam
+x64-windows/tools/boost-build/example/variant/libs/l.cpp
+x64-windows/tools/boost-build/example/variant/readme.qbk
+x64-windows/tools/boost-build/index.html
+x64-windows/tools/boost-build/notes/
+x64-windows/tools/boost-build/notes/README.txt
+x64-windows/tools/boost-build/notes/build_dir_option.txt
+x64-windows/tools/boost-build/notes/changes.txt
+x64-windows/tools/boost-build/notes/relative_source_paths.txt
+x64-windows/tools/boost-build/notes/release_procedure.txt
+x64-windows/tools/boost-build/scripts/
+x64-windows/tools/boost-build/scripts/build-docs.sh
+x64-windows/tools/boost-build/scripts/nightly.sh
+x64-windows/tools/boost-build/scripts/roll.sh
+x64-windows/tools/boost-build/scripts/to_merge.sh
+x64-windows/tools/boost-build/src/
+x64-windows/tools/boost-build/src/__init__.py
+x64-windows/tools/boost-build/src/bootstrap.jam
+x64-windows/tools/boost-build/src/build-system.jam
+x64-windows/tools/boost-build/src/build/
+x64-windows/tools/boost-build/src/build/__init__.py
+x64-windows/tools/boost-build/src/build/ac.jam
+x64-windows/tools/boost-build/src/build/alias.jam
+x64-windows/tools/boost-build/src/build/alias.py
+x64-windows/tools/boost-build/src/build/build-request.jam
+x64-windows/tools/boost-build/src/build/build_request.py
+x64-windows/tools/boost-build/src/build/config-cache.jam
+x64-windows/tools/boost-build/src/build/configure.jam
+x64-windows/tools/boost-build/src/build/configure.py
+x64-windows/tools/boost-build/src/build/engine.py
+x64-windows/tools/boost-build/src/build/errors.py
+x64-windows/tools/boost-build/src/build/feature.jam
+x64-windows/tools/boost-build/src/build/feature.py
+x64-windows/tools/boost-build/src/build/generators.jam
+x64-windows/tools/boost-build/src/build/generators.py
+x64-windows/tools/boost-build/src/build/project.jam
+x64-windows/tools/boost-build/src/build/project.py
+x64-windows/tools/boost-build/src/build/property-set.jam
+x64-windows/tools/boost-build/src/build/property.jam
+x64-windows/tools/boost-build/src/build/property.py
+x64-windows/tools/boost-build/src/build/property_set.py
+x64-windows/tools/boost-build/src/build/readme.txt
+x64-windows/tools/boost-build/src/build/scanner.jam
+x64-windows/tools/boost-build/src/build/scanner.py
+x64-windows/tools/boost-build/src/build/targets.jam
+x64-windows/tools/boost-build/src/build/targets.py
+x64-windows/tools/boost-build/src/build/toolset.jam
+x64-windows/tools/boost-build/src/build/toolset.py
+x64-windows/tools/boost-build/src/build/type.jam
+x64-windows/tools/boost-build/src/build/type.py
+x64-windows/tools/boost-build/src/build/version.jam
+x64-windows/tools/boost-build/src/build/version.py
+x64-windows/tools/boost-build/src/build/virtual-target.jam
+x64-windows/tools/boost-build/src/build/virtual_target.py
+x64-windows/tools/boost-build/src/build_system.py
+x64-windows/tools/boost-build/src/contrib/
+x64-windows/tools/boost-build/src/contrib/__init__.py
+x64-windows/tools/boost-build/src/contrib/boost.jam
+x64-windows/tools/boost-build/src/contrib/boost.py
+x64-windows/tools/boost-build/src/contrib/modular.jam
+x64-windows/tools/boost-build/src/contrib/tntnet.jam
+x64-windows/tools/boost-build/src/contrib/wxFormBuilder.jam
+x64-windows/tools/boost-build/src/engine/
+x64-windows/tools/boost-build/src/engine/.gitignore
+x64-windows/tools/boost-build/src/engine/Jambase
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/b2.exe
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/bjam.exe
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/builtins.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/class.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/command.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/compile.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/constants.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/cwd.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/debug.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/debugger.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/execcmd.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/execnt.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/filent.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/filesys.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/frames.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/function.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/glob.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/hash.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/hcache.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/hdrmacro.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/headers.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/jam.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/jambase.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/jamgram.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/lists.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/make.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/make1.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/md5.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/mem.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/modules.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/native.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/object.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/option.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/order.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/output.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/parse.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/path.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/pathnt.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/pathsys.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/property-set.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/regex.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/regexp.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/rules.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/scan.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/search.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/sequence.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/set.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/strings.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/subst.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/timestamp.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/variable.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/w32_getreg.obj
+x64-windows/tools/boost-build/src/engine/boehm_gc/
+x64-windows/tools/boost-build/src/engine/boehm_gc/AmigaOS.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/BCC_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/ChangeLog
+x64-windows/tools/boost-build/src/engine/boehm_gc/EMX_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/MacOS.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/MacProjects.sit.hqx
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/MacOS_Test_config.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/MacOS_config.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/dataend.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/datastart.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.DLLs
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.direct
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.dj
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.in
+x64-windows/tools/boost-build/src/engine/boehm_gc/NT_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/NT_STATIC_THREADS_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/NT_THREADS_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/NT_X64_STATIC_THREADS_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/OS2_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/PCR-Makefile
+x64-windows/tools/boost-build/src/engine/boehm_gc/README.QUICK
+x64-windows/tools/boost-build/src/engine/boehm_gc/SMakefile.amiga
+x64-windows/tools/boost-build/src/engine/boehm_gc/WCC_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/acinclude.m4
+x64-windows/tools/boost-build/src/engine/boehm_gc/aclocal.m4
+x64-windows/tools/boost-build/src/engine/boehm_gc/add_gc_prefix.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/allchblk.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/alloc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/alpha_mach_dep.S
+x64-windows/tools/boost-build/src/engine/boehm_gc/backgraph.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/bdw-gc.pc
+x64-windows/tools/boost-build/src/engine/boehm_gc/bdw-gc.pc.in
+x64-windows/tools/boost-build/src/engine/boehm_gc/blacklst.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/callprocs
+x64-windows/tools/boost-build/src/engine/boehm_gc/checksums.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/compile
+x64-windows/tools/boost-build/src/engine/boehm_gc/config.guess
+x64-windows/tools/boost-build/src/engine/boehm_gc/config.sub
+x64-windows/tools/boost-build/src/engine/boehm_gc/configure
+x64-windows/tools/boost-build/src/engine/boehm_gc/configure.ac
+x64-windows/tools/boost-build/src/engine/boehm_gc/configure.host
+x64-windows/tools/boost-build/src/engine/boehm_gc/configure_atomic_ops.sh
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cord.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cordbscs.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cordprnt.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cordtest.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cordxtra.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_cmds.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_win.ICO
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_win.RC
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_win.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_win.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/darwin_stop_world.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/dbg_mlc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/depcomp
+x64-windows/tools/boost-build/src/engine/boehm_gc/digimars.mak
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.DGUX386
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.Mac
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.MacOSX
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.OS2
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.amiga
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.arm.cross
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.autoconf
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.changes
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.contributors
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.cords
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.darwin
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.dj
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.environment
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.ews4800
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.hp
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.linux
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.macros
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.rs6000
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.sgi
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.solaris2
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.uts
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.win32
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.win64
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/barrett_diagram
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/debugging.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/doc.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/gc.man
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/gcdescr.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/gcinterface.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/leak.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/overview.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/porting.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/scale.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/simple_example.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/tree.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/dyn_load.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/finalize.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/gc.mak
+x64-windows/tools/boost-build/src/engine/boehm_gc/gc_cpp.cc
+x64-windows/tools/boost-build/src/engine/boehm_gc/gc_cpp.cpp
+x64-windows/tools/boost-build/src/engine/boehm_gc/gc_dlopen.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/gcj_mlc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/gcname.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/headers.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/hpux_test_and_clear.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/ia64_save_regs_in_stack.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/if_mach.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/if_not_there.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/cord.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/ec.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_allocator.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_amiga_redirects.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_backptr.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_config_macros.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_cpp.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_gcj.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_inline.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_mark.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_pthread_redirects.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_tiny_fl.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_typed.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/include.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/javaxfc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/leak_detector.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/new_gc_alloc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/cord_pos.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/darwin_semaphore.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/darwin_stop_world.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/dbg_mlc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gc_hdrs.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gc_locks.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gc_pmark.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gc_priv.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gcconfig.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/msvc_dbg.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/pthread_stop_world.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/pthread_support.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/specific.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/thread_local_alloc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/weakpointer.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/install-sh
+x64-windows/tools/boost-build/src/engine/boehm_gc/libtool.m4
+x64-windows/tools/boost-build/src/engine/boehm_gc/ltmain.sh
+x64-windows/tools/boost-build/src/engine/boehm_gc/mach_dep.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/malloc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/mallocx.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/mark.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/mark_rts.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/mips_sgi_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/mips_ultrix_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/misc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/missing
+x64-windows/tools/boost-build/src/engine/boehm_gc/mkinstalldirs
+x64-windows/tools/boost-build/src/engine/boehm_gc/msvc_dbg.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/new_hblk.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/obj_map.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/os_dep.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/pcr_interface.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/pthread_stop_world.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/pthread_support.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/ptr_chck.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/real_malloc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/reclaim.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/rs6000_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/setjmp_t.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/sparc_mach_dep.S
+x64-windows/tools/boost-build/src/engine/boehm_gc/sparc_netbsd_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/sparc_sunos4_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/specific.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/stubborn.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/leak_test.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/middle.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/test.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/test_cpp.cc
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/tests.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/thread_leak_test.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/thread_local_alloc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/threadlibs.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/typd_mlc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/version.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/win32_threads.c
+x64-windows/tools/boost-build/src/engine/boost-jam.spec
+x64-windows/tools/boost-build/src/engine/boost-no-inspect
+x64-windows/tools/boost-build/src/engine/bootstrap/
+x64-windows/tools/boost-build/src/engine/bootstrap/builtins.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/class.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/command.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/compile.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/constants.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/cwd.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/debug.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/execcmd.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/execnt.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/filent.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/filesys.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/frames.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/function.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/glob.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/hash.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/hdrmacro.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/headers.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/jam.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/jam0.exe
+x64-windows/tools/boost-build/src/engine/bootstrap/jam0.ilk
+x64-windows/tools/boost-build/src/engine/bootstrap/jam0.pdb
+x64-windows/tools/boost-build/src/engine/bootstrap/jambase.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/jamgram.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/lists.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/make.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/make1.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/md5.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/modules.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/native.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/object.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/option.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/order.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/output.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/parse.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/path.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/pathnt.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/pathsys.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/property-set.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/regex.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/regexp.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/rules.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/scan.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/search.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/sequence.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/set.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/strings.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/subst.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/timestamp.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/variable.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/vc140.pdb
+x64-windows/tools/boost-build/src/engine/bootstrap/w32_getreg.obj
+x64-windows/tools/boost-build/src/engine/build.bat
+x64-windows/tools/boost-build/src/engine/build.jam
+x64-windows/tools/boost-build/src/engine/build.sh
+x64-windows/tools/boost-build/src/engine/build_vms.com
+x64-windows/tools/boost-build/src/engine/builtins.c
+x64-windows/tools/boost-build/src/engine/builtins.h
+x64-windows/tools/boost-build/src/engine/bump_version.py
+x64-windows/tools/boost-build/src/engine/class.c
+x64-windows/tools/boost-build/src/engine/class.h
+x64-windows/tools/boost-build/src/engine/command.c
+x64-windows/tools/boost-build/src/engine/command.h
+x64-windows/tools/boost-build/src/engine/compile.c
+x64-windows/tools/boost-build/src/engine/compile.h
+x64-windows/tools/boost-build/src/engine/config_toolset.bat
+x64-windows/tools/boost-build/src/engine/constants.c
+x64-windows/tools/boost-build/src/engine/constants.h
+x64-windows/tools/boost-build/src/engine/cwd.c
+x64-windows/tools/boost-build/src/engine/cwd.h
+x64-windows/tools/boost-build/src/engine/debian/
+x64-windows/tools/boost-build/src/engine/debian/changelog
+x64-windows/tools/boost-build/src/engine/debian/copyright
+x64-windows/tools/boost-build/src/engine/debian/jam.man.sgml
+x64-windows/tools/boost-build/src/engine/debian/rules
+x64-windows/tools/boost-build/src/engine/debug.c
+x64-windows/tools/boost-build/src/engine/debug.h
+x64-windows/tools/boost-build/src/engine/debugger.c
+x64-windows/tools/boost-build/src/engine/debugger.h
+x64-windows/tools/boost-build/src/engine/execcmd.c
+x64-windows/tools/boost-build/src/engine/execcmd.h
+x64-windows/tools/boost-build/src/engine/execnt.c
+x64-windows/tools/boost-build/src/engine/execunix.c
+x64-windows/tools/boost-build/src/engine/execvms.c
+x64-windows/tools/boost-build/src/engine/filent.c
+x64-windows/tools/boost-build/src/engine/filesys.c
+x64-windows/tools/boost-build/src/engine/filesys.h
+x64-windows/tools/boost-build/src/engine/fileunix.c
+x64-windows/tools/boost-build/src/engine/filevms.c
+x64-windows/tools/boost-build/src/engine/frames.c
+x64-windows/tools/boost-build/src/engine/frames.h
+x64-windows/tools/boost-build/src/engine/function.c
+x64-windows/tools/boost-build/src/engine/function.h
+x64-windows/tools/boost-build/src/engine/glob.c
+x64-windows/tools/boost-build/src/engine/guess_toolset.bat
+x64-windows/tools/boost-build/src/engine/hash.c
+x64-windows/tools/boost-build/src/engine/hash.h
+x64-windows/tools/boost-build/src/engine/hcache.c
+x64-windows/tools/boost-build/src/engine/hcache.h
+x64-windows/tools/boost-build/src/engine/hdrmacro.c
+x64-windows/tools/boost-build/src/engine/hdrmacro.h
+x64-windows/tools/boost-build/src/engine/headers.c
+x64-windows/tools/boost-build/src/engine/headers.h
+x64-windows/tools/boost-build/src/engine/jam.c
+x64-windows/tools/boost-build/src/engine/jam.h
+x64-windows/tools/boost-build/src/engine/jambase.c
+x64-windows/tools/boost-build/src/engine/jambase.h
+x64-windows/tools/boost-build/src/engine/jamgram.c
+x64-windows/tools/boost-build/src/engine/jamgram.h
+x64-windows/tools/boost-build/src/engine/jamgram.y
+x64-windows/tools/boost-build/src/engine/jamgram.yy
+x64-windows/tools/boost-build/src/engine/jamgramtab.h
+x64-windows/tools/boost-build/src/engine/lists.c
+x64-windows/tools/boost-build/src/engine/lists.h
+x64-windows/tools/boost-build/src/engine/make.c
+x64-windows/tools/boost-build/src/engine/make.h
+x64-windows/tools/boost-build/src/engine/make1.c
+x64-windows/tools/boost-build/src/engine/md5.c
+x64-windows/tools/boost-build/src/engine/md5.h
+x64-windows/tools/boost-build/src/engine/mem.c
+x64-windows/tools/boost-build/src/engine/mem.h
+x64-windows/tools/boost-build/src/engine/mkjambase.c
+x64-windows/tools/boost-build/src/engine/modules.c
+x64-windows/tools/boost-build/src/engine/modules.h
+x64-windows/tools/boost-build/src/engine/modules/
+x64-windows/tools/boost-build/src/engine/modules/order.c
+x64-windows/tools/boost-build/src/engine/modules/path.c
+x64-windows/tools/boost-build/src/engine/modules/property-set.c
+x64-windows/tools/boost-build/src/engine/modules/readme.txt
+x64-windows/tools/boost-build/src/engine/modules/regex.c
+x64-windows/tools/boost-build/src/engine/modules/sequence.c
+x64-windows/tools/boost-build/src/engine/modules/set.c
+x64-windows/tools/boost-build/src/engine/native.c
+x64-windows/tools/boost-build/src/engine/native.h
+x64-windows/tools/boost-build/src/engine/object.c
+x64-windows/tools/boost-build/src/engine/object.h
+x64-windows/tools/boost-build/src/engine/option.c
+x64-windows/tools/boost-build/src/engine/option.h
+x64-windows/tools/boost-build/src/engine/output.c
+x64-windows/tools/boost-build/src/engine/output.h
+x64-windows/tools/boost-build/src/engine/parse.c
+x64-windows/tools/boost-build/src/engine/parse.h
+x64-windows/tools/boost-build/src/engine/patchlevel.h
+x64-windows/tools/boost-build/src/engine/pathnt.c
+x64-windows/tools/boost-build/src/engine/pathsys.c
+x64-windows/tools/boost-build/src/engine/pathsys.h
+x64-windows/tools/boost-build/src/engine/pathunix.c
+x64-windows/tools/boost-build/src/engine/pathvms.c
+x64-windows/tools/boost-build/src/engine/regexp.c
+x64-windows/tools/boost-build/src/engine/regexp.h
+x64-windows/tools/boost-build/src/engine/rules.c
+x64-windows/tools/boost-build/src/engine/rules.h
+x64-windows/tools/boost-build/src/engine/scan.c
+x64-windows/tools/boost-build/src/engine/scan.h
+x64-windows/tools/boost-build/src/engine/search.c
+x64-windows/tools/boost-build/src/engine/search.h
+x64-windows/tools/boost-build/src/engine/strings.c
+x64-windows/tools/boost-build/src/engine/strings.h
+x64-windows/tools/boost-build/src/engine/subst.c
+x64-windows/tools/boost-build/src/engine/subst.h
+x64-windows/tools/boost-build/src/engine/timestamp.c
+x64-windows/tools/boost-build/src/engine/timestamp.h
+x64-windows/tools/boost-build/src/engine/variable.c
+x64-windows/tools/boost-build/src/engine/variable.h
+x64-windows/tools/boost-build/src/engine/vswhere_usability_wrapper.cmd
+x64-windows/tools/boost-build/src/engine/w32_getreg.c
+x64-windows/tools/boost-build/src/engine/yyacc.c
+x64-windows/tools/boost-build/src/exceptions.py
+x64-windows/tools/boost-build/src/kernel/
+x64-windows/tools/boost-build/src/kernel/boost-build.jam
+x64-windows/tools/boost-build/src/kernel/bootstrap.jam
+x64-windows/tools/boost-build/src/kernel/bootstrap.py
+x64-windows/tools/boost-build/src/kernel/class.jam
+x64-windows/tools/boost-build/src/kernel/errors.jam
+x64-windows/tools/boost-build/src/kernel/modules.jam
+x64-windows/tools/boost-build/src/manager.py
+x64-windows/tools/boost-build/src/options/
+x64-windows/tools/boost-build/src/options/help.jam
+x64-windows/tools/boost-build/src/tools/
+x64-windows/tools/boost-build/src/tools/__init__.py
+x64-windows/tools/boost-build/src/tools/acc.jam
+x64-windows/tools/boost-build/src/tools/asciidoctor.jam
+x64-windows/tools/boost-build/src/tools/auto-index.jam
+x64-windows/tools/boost-build/src/tools/bison.jam
+x64-windows/tools/boost-build/src/tools/boostbook-config.jam
+x64-windows/tools/boost-build/src/tools/boostbook.jam
+x64-windows/tools/boost-build/src/tools/borland.jam
+x64-windows/tools/boost-build/src/tools/builtin.jam
+x64-windows/tools/boost-build/src/tools/builtin.py
+x64-windows/tools/boost-build/src/tools/bzip2.jam
+x64-windows/tools/boost-build/src/tools/cast.jam
+x64-windows/tools/boost-build/src/tools/cast.py
+x64-windows/tools/boost-build/src/tools/clang-darwin.jam
+x64-windows/tools/boost-build/src/tools/clang-linux.jam
+x64-windows/tools/boost-build/src/tools/clang-vxworks.jam
+x64-windows/tools/boost-build/src/tools/clang-win.jam
+x64-windows/tools/boost-build/src/tools/clang.jam
+x64-windows/tools/boost-build/src/tools/common.jam
+x64-windows/tools/boost-build/src/tools/common.py
+x64-windows/tools/boost-build/src/tools/como-linux.jam
+x64-windows/tools/boost-build/src/tools/como-win.jam
+x64-windows/tools/boost-build/src/tools/como.jam
+x64-windows/tools/boost-build/src/tools/convert.jam
+x64-windows/tools/boost-build/src/tools/cray.jam
+x64-windows/tools/boost-build/src/tools/cw-config.jam
+x64-windows/tools/boost-build/src/tools/cw.jam
+x64-windows/tools/boost-build/src/tools/cygwin.jam
+x64-windows/tools/boost-build/src/tools/darwin.jam
+x64-windows/tools/boost-build/src/tools/darwin.py
+x64-windows/tools/boost-build/src/tools/diab.jam
+x64-windows/tools/boost-build/src/tools/dmc.jam
+x64-windows/tools/boost-build/src/tools/docutils.jam
+x64-windows/tools/boost-build/src/tools/doxproc.py
+x64-windows/tools/boost-build/src/tools/doxygen-config.jam
+x64-windows/tools/boost-build/src/tools/doxygen.jam
+x64-windows/tools/boost-build/src/tools/doxygen/
+x64-windows/tools/boost-build/src/tools/doxygen/windows-paths-check.doxyfile
+x64-windows/tools/boost-build/src/tools/doxygen/windows-paths-check.hpp
+x64-windows/tools/boost-build/src/tools/emscripten.jam
+x64-windows/tools/boost-build/src/tools/features/
+x64-windows/tools/boost-build/src/tools/features/__init_features__.jam
+x64-windows/tools/boost-build/src/tools/features/address-model-feature.jam
+x64-windows/tools/boost-build/src/tools/features/allow-feature.jam
+x64-windows/tools/boost-build/src/tools/features/architecture-feature.jam
+x64-windows/tools/boost-build/src/tools/features/archiveflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/asmflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/build-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/conditional-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cxx-template-depth-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cxxabi-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cxxflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cxxstd-feature.jam
+x64-windows/tools/boost-build/src/tools/features/debug-feature.jam
+x64-windows/tools/boost-build/src/tools/features/define-feature.jam
+x64-windows/tools/boost-build/src/tools/features/dependency-feature.jam
+x64-windows/tools/boost-build/src/tools/features/dll-feature.jam
+x64-windows/tools/boost-build/src/tools/features/exception-feature.jam
+x64-windows/tools/boost-build/src/tools/features/fflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/file-feature.jam
+x64-windows/tools/boost-build/src/tools/features/find-lib-feature.jam
+x64-windows/tools/boost-build/src/tools/features/flags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/include-feature.jam
+x64-windows/tools/boost-build/src/tools/features/instruction-set-feature.jam
+x64-windows/tools/boost-build/src/tools/features/internal-feature.jam
+x64-windows/tools/boost-build/src/tools/features/library-feature.jam
+x64-windows/tools/boost-build/src/tools/features/link-feature.jam
+x64-windows/tools/boost-build/src/tools/features/linkflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/location-feature.jam
+x64-windows/tools/boost-build/src/tools/features/location-prefix-feature.jam
+x64-windows/tools/boost-build/src/tools/features/name-feature.jam
+x64-windows/tools/boost-build/src/tools/features/objcflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/optimization-feature.jam
+x64-windows/tools/boost-build/src/tools/features/os-feature.jam
+x64-windows/tools/boost-build/src/tools/features/relevant-feature.jam
+x64-windows/tools/boost-build/src/tools/features/rtti-feature.jam
+x64-windows/tools/boost-build/src/tools/features/runtime-feature.jam
+x64-windows/tools/boost-build/src/tools/features/search-feature.jam
+x64-windows/tools/boost-build/src/tools/features/source-feature.jam
+x64-windows/tools/boost-build/src/tools/features/stdlib-feature.jam
+x64-windows/tools/boost-build/src/tools/features/strip-feature.jam
+x64-windows/tools/boost-build/src/tools/features/tag-feature.jam
+x64-windows/tools/boost-build/src/tools/features/threadapi-feature.jam
+x64-windows/tools/boost-build/src/tools/features/threading-feature.jam
+x64-windows/tools/boost-build/src/tools/features/toolset-feature.jam
+x64-windows/tools/boost-build/src/tools/features/user-interface-feature.jam
+x64-windows/tools/boost-build/src/tools/features/variant-feature.jam
+x64-windows/tools/boost-build/src/tools/features/version-feature.jam
+x64-windows/tools/boost-build/src/tools/features/warnings-feature.jam
+x64-windows/tools/boost-build/src/tools/flags.jam
+x64-windows/tools/boost-build/src/tools/fop.jam
+x64-windows/tools/boost-build/src/tools/fortran.jam
+x64-windows/tools/boost-build/src/tools/gcc.jam
+x64-windows/tools/boost-build/src/tools/gcc.py
+x64-windows/tools/boost-build/src/tools/generate.jam
+x64-windows/tools/boost-build/src/tools/generators/
+x64-windows/tools/boost-build/src/tools/generators/__init_generators__.jam
+x64-windows/tools/boost-build/src/tools/generators/archive-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/c-compiling-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/dummy-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/lib-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/linking-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/prebuilt-lib-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/searched-lib-generator.jam
+x64-windows/tools/boost-build/src/tools/gettext.jam
+x64-windows/tools/boost-build/src/tools/gfortran.jam
+x64-windows/tools/boost-build/src/tools/hp_cxx.jam
+x64-windows/tools/boost-build/src/tools/hpfortran.jam
+x64-windows/tools/boost-build/src/tools/ifort.jam
+x64-windows/tools/boost-build/src/tools/intel-darwin.jam
+x64-windows/tools/boost-build/src/tools/intel-linux.jam
+x64-windows/tools/boost-build/src/tools/intel-vxworks.jam
+x64-windows/tools/boost-build/src/tools/intel-win.jam
+x64-windows/tools/boost-build/src/tools/intel.jam
+x64-windows/tools/boost-build/src/tools/lex.jam
+x64-windows/tools/boost-build/src/tools/libjpeg.jam
+x64-windows/tools/boost-build/src/tools/libpng.jam
+x64-windows/tools/boost-build/src/tools/libtiff.jam
+x64-windows/tools/boost-build/src/tools/link.jam
+x64-windows/tools/boost-build/src/tools/lzma.jam
+x64-windows/tools/boost-build/src/tools/make.jam
+x64-windows/tools/boost-build/src/tools/make.py
+x64-windows/tools/boost-build/src/tools/mc.jam
+x64-windows/tools/boost-build/src/tools/mc.py
+x64-windows/tools/boost-build/src/tools/message.jam
+x64-windows/tools/boost-build/src/tools/message.py
+x64-windows/tools/boost-build/src/tools/midl.jam
+x64-windows/tools/boost-build/src/tools/midl.py
+x64-windows/tools/boost-build/src/tools/mipspro.jam
+x64-windows/tools/boost-build/src/tools/mpi.jam
+x64-windows/tools/boost-build/src/tools/msvc-config.jam
+x64-windows/tools/boost-build/src/tools/msvc.jam
+x64-windows/tools/boost-build/src/tools/msvc.py
+x64-windows/tools/boost-build/src/tools/notfile.jam
+x64-windows/tools/boost-build/src/tools/notfile.py
+x64-windows/tools/boost-build/src/tools/package.jam
+x64-windows/tools/boost-build/src/tools/package.py
+x64-windows/tools/boost-build/src/tools/pathscale.jam
+x64-windows/tools/boost-build/src/tools/pch.jam
+x64-windows/tools/boost-build/src/tools/pch.py
+x64-windows/tools/boost-build/src/tools/pgi.jam
+x64-windows/tools/boost-build/src/tools/python-config.jam
+x64-windows/tools/boost-build/src/tools/python.jam
+x64-windows/tools/boost-build/src/tools/qcc.jam
+x64-windows/tools/boost-build/src/tools/qt.jam
+x64-windows/tools/boost-build/src/tools/qt3.jam
+x64-windows/tools/boost-build/src/tools/qt4.jam
+x64-windows/tools/boost-build/src/tools/qt5.jam
+x64-windows/tools/boost-build/src/tools/quickbook-config.jam
+x64-windows/tools/boost-build/src/tools/quickbook.jam
+x64-windows/tools/boost-build/src/tools/rc.jam
+x64-windows/tools/boost-build/src/tools/rc.py
+x64-windows/tools/boost-build/src/tools/sass.jam
+x64-windows/tools/boost-build/src/tools/stage.jam
+x64-windows/tools/boost-build/src/tools/stage.py
+x64-windows/tools/boost-build/src/tools/stlport.jam
+x64-windows/tools/boost-build/src/tools/sun.jam
+x64-windows/tools/boost-build/src/tools/symlink.jam
+x64-windows/tools/boost-build/src/tools/symlink.py
+x64-windows/tools/boost-build/src/tools/testing-aux.jam
+x64-windows/tools/boost-build/src/tools/testing.jam
+x64-windows/tools/boost-build/src/tools/testing.py
+x64-windows/tools/boost-build/src/tools/types/
+x64-windows/tools/boost-build/src/tools/types/__init__.py
+x64-windows/tools/boost-build/src/tools/types/adoc.jam
+x64-windows/tools/boost-build/src/tools/types/asm.jam
+x64-windows/tools/boost-build/src/tools/types/asm.py
+x64-windows/tools/boost-build/src/tools/types/cpp.jam
+x64-windows/tools/boost-build/src/tools/types/cpp.py
+x64-windows/tools/boost-build/src/tools/types/css.jam
+x64-windows/tools/boost-build/src/tools/types/docbook.jam
+x64-windows/tools/boost-build/src/tools/types/exe.jam
+x64-windows/tools/boost-build/src/tools/types/exe.py
+x64-windows/tools/boost-build/src/tools/types/html.jam
+x64-windows/tools/boost-build/src/tools/types/html.py
+x64-windows/tools/boost-build/src/tools/types/lib.jam
+x64-windows/tools/boost-build/src/tools/types/lib.py
+x64-windows/tools/boost-build/src/tools/types/man.jam
+x64-windows/tools/boost-build/src/tools/types/markdown.jam
+x64-windows/tools/boost-build/src/tools/types/markdown.py
+x64-windows/tools/boost-build/src/tools/types/obj.jam
+x64-windows/tools/boost-build/src/tools/types/obj.py
+x64-windows/tools/boost-build/src/tools/types/objc.jam
+x64-windows/tools/boost-build/src/tools/types/pdf.jam
+x64-windows/tools/boost-build/src/tools/types/preprocessed.jam
+x64-windows/tools/boost-build/src/tools/types/preprocessed.py
+x64-windows/tools/boost-build/src/tools/types/qt.jam
+x64-windows/tools/boost-build/src/tools/types/register.jam
+x64-windows/tools/boost-build/src/tools/types/rsp.jam
+x64-windows/tools/boost-build/src/tools/types/rsp.py
+x64-windows/tools/boost-build/src/tools/types/sass-type.jam
+x64-windows/tools/boost-build/src/tools/types/xml.jam
+x64-windows/tools/boost-build/src/tools/unix.jam
+x64-windows/tools/boost-build/src/tools/unix.py
+x64-windows/tools/boost-build/src/tools/vacpp.jam
+x64-windows/tools/boost-build/src/tools/vmsdecc.jam
+x64-windows/tools/boost-build/src/tools/whale.jam
+x64-windows/tools/boost-build/src/tools/xlcpp.jam
+x64-windows/tools/boost-build/src/tools/xlf.jam
+x64-windows/tools/boost-build/src/tools/xsltproc-config.jam
+x64-windows/tools/boost-build/src/tools/xsltproc.jam
+x64-windows/tools/boost-build/src/tools/xsltproc/
+x64-windows/tools/boost-build/src/tools/xsltproc/included.xsl
+x64-windows/tools/boost-build/src/tools/xsltproc/test.xml
+x64-windows/tools/boost-build/src/tools/xsltproc/test.xsl
+x64-windows/tools/boost-build/src/tools/zlib.jam
+x64-windows/tools/boost-build/src/tools/zstd.jam
+x64-windows/tools/boost-build/src/util/
+x64-windows/tools/boost-build/src/util/__init__.py
+x64-windows/tools/boost-build/src/util/assert.jam
+x64-windows/tools/boost-build/src/util/container.jam
+x64-windows/tools/boost-build/src/util/doc.jam
+x64-windows/tools/boost-build/src/util/indirect.jam
+x64-windows/tools/boost-build/src/util/indirect.py
+x64-windows/tools/boost-build/src/util/logger.py
+x64-windows/tools/boost-build/src/util/numbers.jam
+x64-windows/tools/boost-build/src/util/option.jam
+x64-windows/tools/boost-build/src/util/option.py
+x64-windows/tools/boost-build/src/util/order.jam
+x64-windows/tools/boost-build/src/util/order.py
+x64-windows/tools/boost-build/src/util/os.jam
+x64-windows/tools/boost-build/src/util/os_j.py
+x64-windows/tools/boost-build/src/util/param.jam
+x64-windows/tools/boost-build/src/util/path.jam
+x64-windows/tools/boost-build/src/util/path.py
+x64-windows/tools/boost-build/src/util/print.jam
+x64-windows/tools/boost-build/src/util/regex.jam
+x64-windows/tools/boost-build/src/util/regex.py
+x64-windows/tools/boost-build/src/util/sequence.jam
+x64-windows/tools/boost-build/src/util/sequence.py
+x64-windows/tools/boost-build/src/util/set.jam
+x64-windows/tools/boost-build/src/util/set.py
+x64-windows/tools/boost-build/src/util/string.jam
+x64-windows/tools/boost-build/src/util/utility.jam
+x64-windows/tools/boost-build/src/util/utility.py
+x64-windows/tools/boost-build/test/
+x64-windows/tools/boost-build/test/BoostBuild.py
+x64-windows/tools/boost-build/test/Jamfile.jam
+x64-windows/tools/boost-build/test/MockToolset.py
+x64-windows/tools/boost-build/test/TestCmd.py
+x64-windows/tools/boost-build/test/TestToolset.py
+x64-windows/tools/boost-build/test/abs_workdir.py
+x64-windows/tools/boost-build/test/absolute_sources.py
+x64-windows/tools/boost-build/test/alias.py
+x64-windows/tools/boost-build/test/alternatives.py
+x64-windows/tools/boost-build/test/bad_dirname.py
+x64-windows/tools/boost-build/test/boost-build.jam
+x64-windows/tools/boost-build/test/boostbook.py
+x64-windows/tools/boost-build/test/boostbook/
+x64-windows/tools/boost-build/test/boostbook/a.hpp
+x64-windows/tools/boost-build/test/boostbook/docs.xml
+x64-windows/tools/boost-build/test/boostbook/jamroot.jam
+x64-windows/tools/boost-build/test/build_dir.py
+x64-windows/tools/boost-build/test/build_file.py
+x64-windows/tools/boost-build/test/build_hooks.py
+x64-windows/tools/boost-build/test/build_no.py
+x64-windows/tools/boost-build/test/builtin_echo.py
+x64-windows/tools/boost-build/test/builtin_exit.py
+x64-windows/tools/boost-build/test/builtin_glob.py
+x64-windows/tools/boost-build/test/builtin_glob_archive.py
+x64-windows/tools/boost-build/test/builtin_readlink.py
+x64-windows/tools/boost-build/test/builtin_split_by_characters.py
+x64-windows/tools/boost-build/test/bzip2.py
+x64-windows/tools/boost-build/test/c_file.py
+x64-windows/tools/boost-build/test/chain.py
+x64-windows/tools/boost-build/test/clean.py
+x64-windows/tools/boost-build/test/cli_property_expansion.py
+x64-windows/tools/boost-build/test/collect_debug_info.py
+x64-windows/tools/boost-build/test/command_line_properties.py
+x64-windows/tools/boost-build/test/composite.py
+x64-windows/tools/boost-build/test/conditionals.py
+x64-windows/tools/boost-build/test/conditionals2.py
+x64-windows/tools/boost-build/test/conditionals3.py
+x64-windows/tools/boost-build/test/conditionals_multiple.py
+x64-windows/tools/boost-build/test/configuration.py
+x64-windows/tools/boost-build/test/configure.py
+x64-windows/tools/boost-build/test/copy_time.py
+x64-windows/tools/boost-build/test/core-language/
+x64-windows/tools/boost-build/test/core-language/test.jam
+x64-windows/tools/boost-build/test/core_action_output.py
+x64-windows/tools/boost-build/test/core_action_status.py
+x64-windows/tools/boost-build/test/core_actions_quietly.py
+x64-windows/tools/boost-build/test/core_arguments.py
+x64-windows/tools/boost-build/test/core_at_file.py
+x64-windows/tools/boost-build/test/core_bindrule.py
+x64-windows/tools/boost-build/test/core_d12.py
+x64-windows/tools/boost-build/test/core_delete_module.py
+x64-windows/tools/boost-build/test/core_dependencies.py
+x64-windows/tools/boost-build/test/core_fail_expected.py
+x64-windows/tools/boost-build/test/core_import_module.py
+x64-windows/tools/boost-build/test/core_jamshell.py
+x64-windows/tools/boost-build/test/core_language.py
+x64-windows/tools/boost-build/test/core_modifiers.py
+x64-windows/tools/boost-build/test/core_multifile_actions.py
+x64-windows/tools/boost-build/test/core_nt_cmd_line.py
+x64-windows/tools/boost-build/test/core_option_d2.py
+x64-windows/tools/boost-build/test/core_option_l.py
+x64-windows/tools/boost-build/test/core_option_n.py
+x64-windows/tools/boost-build/test/core_parallel_actions.py
+x64-windows/tools/boost-build/test/core_parallel_multifile_actions_1.py
+x64-windows/tools/boost-build/test/core_parallel_multifile_actions_2.py
+x64-windows/tools/boost-build/test/core_scanner.py
+x64-windows/tools/boost-build/test/core_source_line_tracking.py
+x64-windows/tools/boost-build/test/core_typecheck.py
+x64-windows/tools/boost-build/test/core_update_now.py
+x64-windows/tools/boost-build/test/core_variables_in_actions.py
+x64-windows/tools/boost-build/test/core_varnames.py
+x64-windows/tools/boost-build/test/custom_generator.py
+x64-windows/tools/boost-build/test/debugger-mi.py
+x64-windows/tools/boost-build/test/debugger.py
+x64-windows/tools/boost-build/test/default_build.py
+x64-windows/tools/boost-build/test/default_features.py
+x64-windows/tools/boost-build/test/default_toolset.py
+x64-windows/tools/boost-build/test/dependency_property.py
+x64-windows/tools/boost-build/test/dependency_test.py
+x64-windows/tools/boost-build/test/disambiguation.py
+x64-windows/tools/boost-build/test/dll_path.py
+x64-windows/tools/boost-build/test/double_loading.py
+x64-windows/tools/boost-build/test/duplicate.py
+x64-windows/tools/boost-build/test/example_customization.py
+x64-windows/tools/boost-build/test/example_gettext.py
+x64-windows/tools/boost-build/test/example_libraries.py
+x64-windows/tools/boost-build/test/example_make.py
+x64-windows/tools/boost-build/test/example_qt4.py
+x64-windows/tools/boost-build/test/exit_status.py
+x64-windows/tools/boost-build/test/expansion.py
+x64-windows/tools/boost-build/test/explicit.py
+x64-windows/tools/boost-build/test/feature_cxxflags.py
+x64-windows/tools/boost-build/test/feature_implicit_dependency.py
+x64-windows/tools/boost-build/test/feature_relevant.py
+x64-windows/tools/boost-build/test/feature_suppress_import_lib.py
+x64-windows/tools/boost-build/test/file_types.py
+x64-windows/tools/boost-build/test/flags.py
+x64-windows/tools/boost-build/test/gcc_runtime.py
+x64-windows/tools/boost-build/test/generator_selection.py
+x64-windows/tools/boost-build/test/generators_test.py
+x64-windows/tools/boost-build/test/implicit_dependency.py
+x64-windows/tools/boost-build/test/indirect_conditional.py
+x64-windows/tools/boost-build/test/inherit_toolset.py
+x64-windows/tools/boost-build/test/inherited_dependency.py
+x64-windows/tools/boost-build/test/inline.py
+x64-windows/tools/boost-build/test/lib_source_property.py
+x64-windows/tools/boost-build/test/lib_zlib.py
+x64-windows/tools/boost-build/test/libjpeg.py
+x64-windows/tools/boost-build/test/liblzma.py
+x64-windows/tools/boost-build/test/libpng.py
+x64-windows/tools/boost-build/test/library_chain.py
+x64-windows/tools/boost-build/test/library_order.py
+x64-windows/tools/boost-build/test/library_property.py
+x64-windows/tools/boost-build/test/libtiff.py
+x64-windows/tools/boost-build/test/libzstd.py
+x64-windows/tools/boost-build/test/link.py
+x64-windows/tools/boost-build/test/load_dir.py
+x64-windows/tools/boost-build/test/load_order.py
+x64-windows/tools/boost-build/test/loop.py
+x64-windows/tools/boost-build/test/make_rule.py
+x64-windows/tools/boost-build/test/message.py
+x64-windows/tools/boost-build/test/module_actions.py
+x64-windows/tools/boost-build/test/ndebug.py
+x64-windows/tools/boost-build/test/no_type.py
+x64-windows/tools/boost-build/test/notfile.py
+x64-windows/tools/boost-build/test/ordered_include.py
+x64-windows/tools/boost-build/test/ordered_properties.py
+x64-windows/tools/boost-build/test/out_of_tree.py
+x64-windows/tools/boost-build/test/param.py
+x64-windows/tools/boost-build/test/path_features.py
+x64-windows/tools/boost-build/test/pch.py
+x64-windows/tools/boost-build/test/prebuilt.py
+x64-windows/tools/boost-build/test/prebuilt/
+x64-windows/tools/boost-build/test/prebuilt/ext/
+x64-windows/tools/boost-build/test/prebuilt/ext/a.cpp
+x64-windows/tools/boost-build/test/prebuilt/ext/debug/
+x64-windows/tools/boost-build/test/prebuilt/ext/debug/a.h
+x64-windows/tools/boost-build/test/prebuilt/ext/jamfile.jam
+x64-windows/tools/boost-build/test/prebuilt/ext/jamfile2.jam
+x64-windows/tools/boost-build/test/prebuilt/ext/jamfile3.jam
+x64-windows/tools/boost-build/test/prebuilt/ext/jamroot.jam
+x64-windows/tools/boost-build/test/prebuilt/ext/release/
+x64-windows/tools/boost-build/test/prebuilt/ext/release/a.h
+x64-windows/tools/boost-build/test/prebuilt/hello.cpp
+x64-windows/tools/boost-build/test/prebuilt/jamfile.jam
+x64-windows/tools/boost-build/test/prebuilt/jamroot.jam
+x64-windows/tools/boost-build/test/preprocessor.py
+x64-windows/tools/boost-build/test/print.py
+x64-windows/tools/boost-build/test/project-test3/
+x64-windows/tools/boost-build/test/project-test3/a.cpp
+x64-windows/tools/boost-build/test/project-test3/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/jamroot.jam
+x64-windows/tools/boost-build/test/project-test3/lib/
+x64-windows/tools/boost-build/test/project-test3/lib/b.cpp
+x64-windows/tools/boost-build/test/project-test3/lib/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/lib2/
+x64-windows/tools/boost-build/test/project-test3/lib2/c.cpp
+x64-windows/tools/boost-build/test/project-test3/lib2/d.cpp
+x64-windows/tools/boost-build/test/project-test3/lib2/helper/
+x64-windows/tools/boost-build/test/project-test3/lib2/helper/e.cpp
+x64-windows/tools/boost-build/test/project-test3/lib2/helper/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/lib2/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/lib3/
+x64-windows/tools/boost-build/test/project-test3/lib3/f.cpp
+x64-windows/tools/boost-build/test/project-test3/lib3/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/lib3/jamroot.jam
+x64-windows/tools/boost-build/test/project-test3/readme.txt
+x64-windows/tools/boost-build/test/project-test4/
+x64-windows/tools/boost-build/test/project-test4/a.cpp
+x64-windows/tools/boost-build/test/project-test4/a_gcc.cpp
+x64-windows/tools/boost-build/test/project-test4/jamfile.jam
+x64-windows/tools/boost-build/test/project-test4/jamfile3.jam
+x64-windows/tools/boost-build/test/project-test4/jamfile4.jam
+x64-windows/tools/boost-build/test/project-test4/jamfile5.jam
+x64-windows/tools/boost-build/test/project-test4/jamroot.jam
+x64-windows/tools/boost-build/test/project-test4/lib/
+x64-windows/tools/boost-build/test/project-test4/lib/b.cpp
+x64-windows/tools/boost-build/test/project-test4/lib/jamfile.jam
+x64-windows/tools/boost-build/test/project-test4/lib/jamfile1.jam
+x64-windows/tools/boost-build/test/project-test4/lib/jamfile2.jam
+x64-windows/tools/boost-build/test/project-test4/lib/jamfile3.jam
+x64-windows/tools/boost-build/test/project-test4/lib2/
+x64-windows/tools/boost-build/test/project-test4/lib2/jamfile.jam
+x64-windows/tools/boost-build/test/project-test4/lib2/jamfile2.jam
+x64-windows/tools/boost-build/test/project-test4/readme.txt
+x64-windows/tools/boost-build/test/project_dependencies.py
+x64-windows/tools/boost-build/test/project_glob.py
+x64-windows/tools/boost-build/test/project_id.py
+x64-windows/tools/boost-build/test/project_root_constants.py
+x64-windows/tools/boost-build/test/project_root_rule.py
+x64-windows/tools/boost-build/test/project_test3.py
+x64-windows/tools/boost-build/test/project_test4.py
+x64-windows/tools/boost-build/test/property_expansion.py
+x64-windows/tools/boost-build/test/qt4.py
+x64-windows/tools/boost-build/test/qt4/
+x64-windows/tools/boost-build/test/qt4/.gitignore
+x64-windows/tools/boost-build/test/qt4/jamroot.jam
+x64-windows/tools/boost-build/test/qt4/mock.cpp
+x64-windows/tools/boost-build/test/qt4/mock.h
+x64-windows/tools/boost-build/test/qt4/phonon.cpp
+x64-windows/tools/boost-build/test/qt4/qt3support.cpp
+x64-windows/tools/boost-build/test/qt4/qtassistant.cpp
+x64-windows/tools/boost-build/test/qt4/qtcore.cpp
+x64-windows/tools/boost-build/test/qt4/qtcorefail.cpp
+x64-windows/tools/boost-build/test/qt4/qtdeclarative.cpp
+x64-windows/tools/boost-build/test/qt4/qtgui.cpp
+x64-windows/tools/boost-build/test/qt4/qthelp.cpp
+x64-windows/tools/boost-build/test/qt4/qtmultimedia.cpp
+x64-windows/tools/boost-build/test/qt4/qtnetwork.cpp
+x64-windows/tools/boost-build/test/qt4/qtscript.cpp
+x64-windows/tools/boost-build/test/qt4/qtscripttools.cpp
+x64-windows/tools/boost-build/test/qt4/qtsql.cpp
+x64-windows/tools/boost-build/test/qt4/qtsvg.cpp
+x64-windows/tools/boost-build/test/qt4/qttest.cpp
+x64-windows/tools/boost-build/test/qt4/qtwebkit.cpp
+x64-windows/tools/boost-build/test/qt4/qtxml.cpp
+x64-windows/tools/boost-build/test/qt4/qtxmlpatterns.cpp
+x64-windows/tools/boost-build/test/qt4/rcc.cpp
+x64-windows/tools/boost-build/test/qt4/rcc.qrc
+x64-windows/tools/boost-build/test/qt5.py
+x64-windows/tools/boost-build/test/qt5/
+x64-windows/tools/boost-build/test/qt5/.gitignore
+x64-windows/tools/boost-build/test/qt5/jamroot.jam
+x64-windows/tools/boost-build/test/qt5/mock.cpp
+x64-windows/tools/boost-build/test/qt5/mock.h
+x64-windows/tools/boost-build/test/qt5/qt3dcore.cpp
+x64-windows/tools/boost-build/test/qt5/qt3dinput.cpp
+x64-windows/tools/boost-build/test/qt5/qt3dlogic.cpp
+x64-windows/tools/boost-build/test/qt5/qt3drender.cpp
+x64-windows/tools/boost-build/test/qt5/qtassistant.cpp
+x64-windows/tools/boost-build/test/qt5/qtbluetooth.cpp
+x64-windows/tools/boost-build/test/qt5/qtcharts.cpp
+x64-windows/tools/boost-build/test/qt5/qtcore.cpp
+x64-windows/tools/boost-build/test/qt5/qtcorefail.cpp
+x64-windows/tools/boost-build/test/qt5/qtdatavisualization.cpp
+x64-windows/tools/boost-build/test/qt5/qtdeclarative.cpp
+x64-windows/tools/boost-build/test/qt5/qtgamepad.cpp
+x64-windows/tools/boost-build/test/qt5/qthelp.cpp
+x64-windows/tools/boost-build/test/qt5/qtlocation.cpp
+x64-windows/tools/boost-build/test/qt5/qtmultimedia.cpp
+x64-windows/tools/boost-build/test/qt5/qtnetwork.cpp
+x64-windows/tools/boost-build/test/qt5/qtnfc.cpp
+x64-windows/tools/boost-build/test/qt5/qtpositioning.cpp
+x64-windows/tools/boost-build/test/qt5/qtpurchasing.cpp
+x64-windows/tools/boost-build/test/qt5/qtquick.cpp
+x64-windows/tools/boost-build/test/qt5/qtquick.qml
+x64-windows/tools/boost-build/test/qt5/qtscript.cpp
+x64-windows/tools/boost-build/test/qt5/qtscripttools.cpp
+x64-windows/tools/boost-build/test/qt5/qtscxml.cpp
+x64-windows/tools/boost-build/test/qt5/qtserialbus.cpp
+x64-windows/tools/boost-build/test/qt5/qtserialport.cpp
+x64-windows/tools/boost-build/test/qt5/qtsql.cpp
+x64-windows/tools/boost-build/test/qt5/qtsvg.cpp
+x64-windows/tools/boost-build/test/qt5/qttest.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebchannel.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebengine.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebenginewidgets.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebkit.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebkitwidgets.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebsocket.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebsockets.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebview.cpp
+x64-windows/tools/boost-build/test/qt5/qtwidgets.cpp
+x64-windows/tools/boost-build/test/qt5/qtxml.cpp
+x64-windows/tools/boost-build/test/qt5/qtxmlpatterns.cpp
+x64-windows/tools/boost-build/test/qt5/rcc.cpp
+x64-windows/tools/boost-build/test/qt5/rcc.qrc
+x64-windows/tools/boost-build/test/railsys.py
+x64-windows/tools/boost-build/test/railsys/
+x64-windows/tools/boost-build/test/railsys/libx/
+x64-windows/tools/boost-build/test/railsys/libx/include/
+x64-windows/tools/boost-build/test/railsys/libx/include/test_libx.h
+x64-windows/tools/boost-build/test/railsys/libx/jamroot.jam
+x64-windows/tools/boost-build/test/railsys/libx/src/
+x64-windows/tools/boost-build/test/railsys/libx/src/jamfile.jam
+x64-windows/tools/boost-build/test/railsys/libx/src/test_libx.cpp
+x64-windows/tools/boost-build/test/railsys/program/
+x64-windows/tools/boost-build/test/railsys/program/include/
+x64-windows/tools/boost-build/test/railsys/program/include/test_a.h
+x64-windows/tools/boost-build/test/railsys/program/jamfile.jam
+x64-windows/tools/boost-build/test/railsys/program/jamroot.jam
+x64-windows/tools/boost-build/test/railsys/program/liba/
+x64-windows/tools/boost-build/test/railsys/program/liba/jamfile.jam
+x64-windows/tools/boost-build/test/railsys/program/liba/test_a.cpp
+x64-windows/tools/boost-build/test/railsys/program/main/
+x64-windows/tools/boost-build/test/railsys/program/main/jamfile.jam
+x64-windows/tools/boost-build/test/railsys/program/main/main.cpp
+x64-windows/tools/boost-build/test/readme.txt
+x64-windows/tools/boost-build/test/rebuilds.py
+x64-windows/tools/boost-build/test/relative_sources.py
+x64-windows/tools/boost-build/test/remove_requirement.py
+x64-windows/tools/boost-build/test/rescan_header.py
+x64-windows/tools/boost-build/test/resolution.py
+x64-windows/tools/boost-build/test/results-python.txt
+x64-windows/tools/boost-build/test/scanner_causing_rebuilds.py
+x64-windows/tools/boost-build/test/searched_lib.py
+x64-windows/tools/boost-build/test/skipping.py
+x64-windows/tools/boost-build/test/sort_rule.py
+x64-windows/tools/boost-build/test/source_locations.py
+x64-windows/tools/boost-build/test/source_order.py
+x64-windows/tools/boost-build/test/space_in_path.py
+x64-windows/tools/boost-build/test/stage.py
+x64-windows/tools/boost-build/test/standalone.py
+x64-windows/tools/boost-build/test/startup/
+x64-windows/tools/boost-build/test/startup/boost-root/
+x64-windows/tools/boost-build/test/startup/boost-root/boost-build.jam
+x64-windows/tools/boost-build/test/startup/boost-root/build/
+x64-windows/tools/boost-build/test/startup/boost-root/build/boost-build.jam
+x64-windows/tools/boost-build/test/startup/boost-root/build/bootstrap.jam
+x64-windows/tools/boost-build/test/startup/bootstrap-env/
+x64-windows/tools/boost-build/test/startup/bootstrap-env/boost-build.jam
+x64-windows/tools/boost-build/test/startup/bootstrap-explicit/
+x64-windows/tools/boost-build/test/startup/bootstrap-explicit/boost-build.jam
+x64-windows/tools/boost-build/test/startup/bootstrap-implicit/
+x64-windows/tools/boost-build/test/startup/bootstrap-implicit/readme.txt
+x64-windows/tools/boost-build/test/startup/no-bootstrap1/
+x64-windows/tools/boost-build/test/startup/no-bootstrap1/boost-build.jam
+x64-windows/tools/boost-build/test/startup/no-bootstrap1/subdir/
+x64-windows/tools/boost-build/test/startup/no-bootstrap1/subdir/readme.txt
+x64-windows/tools/boost-build/test/startup/no-bootstrap2/
+x64-windows/tools/boost-build/test/startup/no-bootstrap2/boost-build.jam
+x64-windows/tools/boost-build/test/startup/no-bootstrap3/
+x64-windows/tools/boost-build/test/startup/no-bootstrap3/boost-build.jam
+x64-windows/tools/boost-build/test/startup_v2.py
+x64-windows/tools/boost-build/test/static_and_shared_library.py
+x64-windows/tools/boost-build/test/suffix.py
+x64-windows/tools/boost-build/test/symlink.py
+x64-windows/tools/boost-build/test/tag.py
+x64-windows/tools/boost-build/test/template.py
+x64-windows/tools/boost-build/test/test-config-example.jam
+x64-windows/tools/boost-build/test/test.jam
+x64-windows/tools/boost-build/test/test1.py
+x64-windows/tools/boost-build/test/test2.py
+x64-windows/tools/boost-build/test/test2/
+x64-windows/tools/boost-build/test/test2/foo.cpp
+x64-windows/tools/boost-build/test/test2/jamroot.jam
+x64-windows/tools/boost-build/test/test_all.py
+x64-windows/tools/boost-build/test/test_rc.py
+x64-windows/tools/boost-build/test/test_system.html
+x64-windows/tools/boost-build/test/testing.py
+x64-windows/tools/boost-build/test/timedata.py
+x64-windows/tools/boost-build/test/toolset-mock/
+x64-windows/tools/boost-build/test/toolset-mock/Jamroot.jam
+x64-windows/tools/boost-build/test/toolset-mock/lib.cpp
+x64-windows/tools/boost-build/test/toolset-mock/main.cpp
+x64-windows/tools/boost-build/test/toolset-mock/project-config.jam
+x64-windows/tools/boost-build/test/toolset-mock/src/
+x64-windows/tools/boost-build/test/toolset-mock/src/Jamroot.jam
+x64-windows/tools/boost-build/test/toolset-mock/src/MockProgram.py
+x64-windows/tools/boost-build/test/toolset-mock/src/ar.py
+x64-windows/tools/boost-build/test/toolset-mock/src/clang-3.9.0-darwin.py
+x64-windows/tools/boost-build/test/toolset-mock/src/clang-linux-3.9.0.py
+x64-windows/tools/boost-build/test/toolset-mock/src/clang-vxworks-4.0.1.py
+x64-windows/tools/boost-build/test/toolset-mock/src/darwin-4.2.1.py
+x64-windows/tools/boost-build/test/toolset-mock/src/gcc-4.2.1-darwin.py
+x64-windows/tools/boost-build/test/toolset-mock/src/gcc-4.8.3-linux.py
+x64-windows/tools/boost-build/test/toolset-mock/src/intel-darwin-10.2.py
+x64-windows/tools/boost-build/test/toolset-mock/src/ld.py
+x64-windows/tools/boost-build/test/toolset-mock/src/libtool.py
+x64-windows/tools/boost-build/test/toolset-mock/src/mock-program.cpp
+x64-windows/tools/boost-build/test/toolset-mock/src/project-config.jam
+x64-windows/tools/boost-build/test/toolset-mock/src/ranlib.py
+x64-windows/tools/boost-build/test/toolset-mock/src/strip.py
+x64-windows/tools/boost-build/test/toolset-mock/src/verify.py
+x64-windows/tools/boost-build/test/toolset_clang_darwin.py
+x64-windows/tools/boost-build/test/toolset_clang_linux.py
+x64-windows/tools/boost-build/test/toolset_clang_vxworks.py
+x64-windows/tools/boost-build/test/toolset_darwin.py
+x64-windows/tools/boost-build/test/toolset_defaults.py
+x64-windows/tools/boost-build/test/toolset_gcc.py
+x64-windows/tools/boost-build/test/toolset_intel_darwin.py
+x64-windows/tools/boost-build/test/toolset_requirements.py
+x64-windows/tools/boost-build/test/tree.py
+x64-windows/tools/boost-build/test/unit_test.py
+x64-windows/tools/boost-build/test/unit_tests.py
+x64-windows/tools/boost-build/test/unused.py
+x64-windows/tools/boost-build/test/use_requirements.py
+x64-windows/tools/boost-build/test/using.py
+x64-windows/tools/boost-build/test/wrapper.py
+x64-windows/tools/boost-build/test/wrong_project.py
+x64-windows/tools/boost-build/tutorial.html
+x64-windows/tools/boost-build/website/
+x64-windows/tools/boost-build/website/boost.css
+x64-windows/tools/boost-build/website/boost_build.png
+x64-windows/tools/boost-build/website/boost_build.svg
+x64-windows/tools/boost-build/website/bootstrap/
+x64-windows/tools/boost-build/website/bootstrap/css/
+x64-windows/tools/boost-build/website/bootstrap/css/bootstrap-theme.css
+x64-windows/tools/boost-build/website/bootstrap/css/bootstrap-theme.min.css
+x64-windows/tools/boost-build/website/bootstrap/css/bootstrap.css
+x64-windows/tools/boost-build/website/bootstrap/css/bootstrap.min.css
+x64-windows/tools/boost-build/website/bootstrap/fonts/
+x64-windows/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.eot
+x64-windows/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.svg
+x64-windows/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.ttf
+x64-windows/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.woff
+x64-windows/tools/boost-build/website/bootstrap/js/
+x64-windows/tools/boost-build/website/bootstrap/js/bootstrap.js
+x64-windows/tools/boost-build/website/bootstrap/js/bootstrap.min.js
+x64-windows/tools/boost-build/website/index.css
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-build_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1389 @@
+x64-windows-static/
+x64-windows-static/share/
+x64-windows-static/share/boost-build/
+x64-windows-static/share/boost-build/copyright
+x64-windows-static/tools/
+x64-windows-static/tools/boost-build/
+x64-windows-static/tools/boost-build/.gitattributes
+x64-windows-static/tools/boost-build/.gitignore
+x64-windows-static/tools/boost-build/.travis.yml
+x64-windows-static/tools/boost-build/CONTRIBUTING.rst
+x64-windows-static/tools/boost-build/Jamroot.jam
+x64-windows-static/tools/boost-build/README.rst
+x64-windows-static/tools/boost-build/appveyor.yml
+x64-windows-static/tools/boost-build/b2.exe
+x64-windows-static/tools/boost-build/bjam.exe
+x64-windows-static/tools/boost-build/boost-build.jam
+x64-windows-static/tools/boost-build/boostcpp.jam
+x64-windows-static/tools/boost-build/bootstrap.bat
+x64-windows-static/tools/boost-build/bootstrap.log
+x64-windows-static/tools/boost-build/bootstrap.sh
+x64-windows-static/tools/boost-build/bootstrap_vms.com
+x64-windows-static/tools/boost-build/doc/
+x64-windows-static/tools/boost-build/doc/bjam.qbk
+x64-windows-static/tools/boost-build/doc/boost.png
+x64-windows-static/tools/boost-build/doc/boostbook.css
+x64-windows-static/tools/boost-build/doc/examples.qbk
+x64-windows-static/tools/boost-build/doc/history.qbk
+x64-windows-static/tools/boost-build/doc/images/
+x64-windows-static/tools/boost-build/doc/images/alert.png
+x64-windows-static/tools/boost-build/doc/images/blank.png
+x64-windows-static/tools/boost-build/doc/images/callouts/
+x64-windows-static/tools/boost-build/doc/images/callouts/1.png
+x64-windows-static/tools/boost-build/doc/images/callouts/1.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/10.png
+x64-windows-static/tools/boost-build/doc/images/callouts/10.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/11.png
+x64-windows-static/tools/boost-build/doc/images/callouts/11.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/12.png
+x64-windows-static/tools/boost-build/doc/images/callouts/12.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/13.png
+x64-windows-static/tools/boost-build/doc/images/callouts/13.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/14.png
+x64-windows-static/tools/boost-build/doc/images/callouts/14.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/15.png
+x64-windows-static/tools/boost-build/doc/images/callouts/15.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/16.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/17.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/18.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/19.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/2.png
+x64-windows-static/tools/boost-build/doc/images/callouts/2.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/20.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/21.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/22.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/23.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/24.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/25.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/26.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/27.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/28.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/29.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/3.png
+x64-windows-static/tools/boost-build/doc/images/callouts/3.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/30.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/4.png
+x64-windows-static/tools/boost-build/doc/images/callouts/4.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/5.png
+x64-windows-static/tools/boost-build/doc/images/callouts/5.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/6.png
+x64-windows-static/tools/boost-build/doc/images/callouts/6.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/7.png
+x64-windows-static/tools/boost-build/doc/images/callouts/7.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/8.png
+x64-windows-static/tools/boost-build/doc/images/callouts/8.svg
+x64-windows-static/tools/boost-build/doc/images/callouts/9.png
+x64-windows-static/tools/boost-build/doc/images/callouts/9.svg
+x64-windows-static/tools/boost-build/doc/images/caution.png
+x64-windows-static/tools/boost-build/doc/images/caution.svg
+x64-windows-static/tools/boost-build/doc/images/draft.png
+x64-windows-static/tools/boost-build/doc/images/home.png
+x64-windows-static/tools/boost-build/doc/images/home.svg
+x64-windows-static/tools/boost-build/doc/images/important.png
+x64-windows-static/tools/boost-build/doc/images/important.svg
+x64-windows-static/tools/boost-build/doc/images/next.png
+x64-windows-static/tools/boost-build/doc/images/next.svg
+x64-windows-static/tools/boost-build/doc/images/next_disabled.png
+x64-windows-static/tools/boost-build/doc/images/note.png
+x64-windows-static/tools/boost-build/doc/images/note.svg
+x64-windows-static/tools/boost-build/doc/images/prev.png
+x64-windows-static/tools/boost-build/doc/images/prev.svg
+x64-windows-static/tools/boost-build/doc/images/prev_disabled.png
+x64-windows-static/tools/boost-build/doc/images/smiley.png
+x64-windows-static/tools/boost-build/doc/images/tip.png
+x64-windows-static/tools/boost-build/doc/images/tip.svg
+x64-windows-static/tools/boost-build/doc/images/toc-blank.png
+x64-windows-static/tools/boost-build/doc/images/toc-minus.png
+x64-windows-static/tools/boost-build/doc/images/toc-plus.png
+x64-windows-static/tools/boost-build/doc/images/up.png
+x64-windows-static/tools/boost-build/doc/images/up.svg
+x64-windows-static/tools/boost-build/doc/images/up_disabled.png
+x64-windows-static/tools/boost-build/doc/images/warning.png
+x64-windows-static/tools/boost-build/doc/images/warning.svg
+x64-windows-static/tools/boost-build/doc/jamfile.jam
+x64-windows-static/tools/boost-build/doc/src/
+x64-windows-static/tools/boost-build/doc/src/abstract-target.xml
+x64-windows-static/tools/boost-build/doc/src/architecture.xml
+x64-windows-static/tools/boost-build/doc/src/basic-target.xml
+x64-windows-static/tools/boost-build/doc/src/debug.xml
+x64-windows-static/tools/boost-build/doc/src/extending.xml
+x64-windows-static/tools/boost-build/doc/src/faq.xml
+x64-windows-static/tools/boost-build/doc/src/fragments.xml
+x64-windows-static/tools/boost-build/doc/src/howto.xml
+x64-windows-static/tools/boost-build/doc/src/install.xml
+x64-windows-static/tools/boost-build/doc/src/main-target.xml
+x64-windows-static/tools/boost-build/doc/src/overview.xml
+x64-windows-static/tools/boost-build/doc/src/path.xml
+x64-windows-static/tools/boost-build/doc/src/project-target.xml
+x64-windows-static/tools/boost-build/doc/src/property-set.xml
+x64-windows-static/tools/boost-build/doc/src/recipes.xml
+x64-windows-static/tools/boost-build/doc/src/reference.xml
+x64-windows-static/tools/boost-build/doc/src/regex.xml
+x64-windows-static/tools/boost-build/doc/src/sequence.xml
+x64-windows-static/tools/boost-build/doc/src/standalone.xml
+x64-windows-static/tools/boost-build/doc/src/tasks.xml
+x64-windows-static/tools/boost-build/doc/src/tools.adoc
+x64-windows-static/tools/boost-build/doc/src/tutorial.xml
+x64-windows-static/tools/boost-build/doc/src/type.xml
+x64-windows-static/tools/boost-build/doc/src/typed-target.xml
+x64-windows-static/tools/boost-build/doc/src/userman.xml
+x64-windows-static/tools/boost-build/example/
+x64-windows-static/tools/boost-build/example/asciidoctor/
+x64-windows-static/tools/boost-build/example/asciidoctor/example.adoc
+x64-windows-static/tools/boost-build/example/asciidoctor/example_manpage.adoc
+x64-windows-static/tools/boost-build/example/asciidoctor/jamroot.jam
+x64-windows-static/tools/boost-build/example/boost-build.jam
+x64-windows-static/tools/boost-build/example/built_tool/
+x64-windows-static/tools/boost-build/example/built_tool/Jamroot.jam
+x64-windows-static/tools/boost-build/example/built_tool/core/
+x64-windows-static/tools/boost-build/example/built_tool/core/Jamfile.jam
+x64-windows-static/tools/boost-build/example/built_tool/core/a.td
+x64-windows-static/tools/boost-build/example/built_tool/core/core.cpp
+x64-windows-static/tools/boost-build/example/built_tool/readme.txt
+x64-windows-static/tools/boost-build/example/built_tool/tblgen/
+x64-windows-static/tools/boost-build/example/built_tool/tblgen/Jamfile.jam
+x64-windows-static/tools/boost-build/example/built_tool/tblgen/tblgen.cpp
+x64-windows-static/tools/boost-build/example/complex-testing/
+x64-windows-static/tools/boost-build/example/complex-testing/compile-fail.cpp
+x64-windows-static/tools/boost-build/example/complex-testing/fail.cpp
+x64-windows-static/tools/boost-build/example/complex-testing/jamroot.jam
+x64-windows-static/tools/boost-build/example/complex-testing/post.cpp
+x64-windows-static/tools/boost-build/example/complex-testing/success.cpp
+x64-windows-static/tools/boost-build/example/customization/
+x64-windows-static/tools/boost-build/example/customization/class.verbatim
+x64-windows-static/tools/boost-build/example/customization/codegen.cpp
+x64-windows-static/tools/boost-build/example/customization/inline_file.py
+x64-windows-static/tools/boost-build/example/customization/jamroot.jam
+x64-windows-static/tools/boost-build/example/customization/readme.txt
+x64-windows-static/tools/boost-build/example/customization/t1.verbatim
+x64-windows-static/tools/boost-build/example/customization/t2.verbatim
+x64-windows-static/tools/boost-build/example/customization/usage.verbatim
+x64-windows-static/tools/boost-build/example/customization/verbatim.jam
+x64-windows-static/tools/boost-build/example/customization/verbatim.py
+x64-windows-static/tools/boost-build/example/generate/
+x64-windows-static/tools/boost-build/example/generate/README.txt
+x64-windows-static/tools/boost-build/example/generate/a.cpp
+x64-windows-static/tools/boost-build/example/generate/gen.jam
+x64-windows-static/tools/boost-build/example/generate/gen.py
+x64-windows-static/tools/boost-build/example/generate/jamroot.jam
+x64-windows-static/tools/boost-build/example/generator/
+x64-windows-static/tools/boost-build/example/generator/README.txt
+x64-windows-static/tools/boost-build/example/generator/foo.gci
+x64-windows-static/tools/boost-build/example/generator/jamroot.jam
+x64-windows-static/tools/boost-build/example/generator/soap.jam
+x64-windows-static/tools/boost-build/example/gettext/
+x64-windows-static/tools/boost-build/example/gettext/jamfile.jam
+x64-windows-static/tools/boost-build/example/gettext/jamroot.jam
+x64-windows-static/tools/boost-build/example/gettext/main.cpp
+x64-windows-static/tools/boost-build/example/gettext/readme.txt
+x64-windows-static/tools/boost-build/example/gettext/russian.po
+x64-windows-static/tools/boost-build/example/hello/
+x64-windows-static/tools/boost-build/example/hello/hello.cpp
+x64-windows-static/tools/boost-build/example/hello/jamroot.jam
+x64-windows-static/tools/boost-build/example/hello/readme.qbk
+x64-windows-static/tools/boost-build/example/libraries/
+x64-windows-static/tools/boost-build/example/libraries/app/
+x64-windows-static/tools/boost-build/example/libraries/app/app.cpp
+x64-windows-static/tools/boost-build/example/libraries/app/jamfile.jam
+x64-windows-static/tools/boost-build/example/libraries/jamroot.jam
+x64-windows-static/tools/boost-build/example/libraries/util/
+x64-windows-static/tools/boost-build/example/libraries/util/foo/
+x64-windows-static/tools/boost-build/example/libraries/util/foo/bar.cpp
+x64-windows-static/tools/boost-build/example/libraries/util/foo/include/
+x64-windows-static/tools/boost-build/example/libraries/util/foo/include/lib1.h
+x64-windows-static/tools/boost-build/example/libraries/util/foo/jamfile.jam
+x64-windows-static/tools/boost-build/example/make/
+x64-windows-static/tools/boost-build/example/make/foo.py
+x64-windows-static/tools/boost-build/example/make/jamroot.jam
+x64-windows-static/tools/boost-build/example/make/main_cpp.pro
+x64-windows-static/tools/boost-build/example/make/readme.txt
+x64-windows-static/tools/boost-build/example/pch/
+x64-windows-static/tools/boost-build/example/pch/include/
+x64-windows-static/tools/boost-build/example/pch/include/pch.hpp
+x64-windows-static/tools/boost-build/example/pch/jamroot.jam
+x64-windows-static/tools/boost-build/example/pch/source/
+x64-windows-static/tools/boost-build/example/pch/source/hello_world.cpp
+x64-windows-static/tools/boost-build/example/python_modules/
+x64-windows-static/tools/boost-build/example/python_modules/jamroot.jam
+x64-windows-static/tools/boost-build/example/python_modules/python_helpers.jam
+x64-windows-static/tools/boost-build/example/python_modules/python_helpers.py
+x64-windows-static/tools/boost-build/example/python_modules/readme.txt
+x64-windows-static/tools/boost-build/example/qt/
+x64-windows-static/tools/boost-build/example/qt/README.txt
+x64-windows-static/tools/boost-build/example/qt/qt3/
+x64-windows-static/tools/boost-build/example/qt/qt3/hello/
+x64-windows-static/tools/boost-build/example/qt/qt3/hello/canvas.cpp
+x64-windows-static/tools/boost-build/example/qt/qt3/hello/canvas.h
+x64-windows-static/tools/boost-build/example/qt/qt3/hello/jamroot.jam
+x64-windows-static/tools/boost-build/example/qt/qt3/hello/main.cpp
+x64-windows-static/tools/boost-build/example/qt/qt3/moccable-cpp/
+x64-windows-static/tools/boost-build/example/qt/qt3/moccable-cpp/jamroot.jam
+x64-windows-static/tools/boost-build/example/qt/qt3/moccable-cpp/main.cpp
+x64-windows-static/tools/boost-build/example/qt/qt3/uic/
+x64-windows-static/tools/boost-build/example/qt/qt3/uic/hello_world_widget.ui
+x64-windows-static/tools/boost-build/example/qt/qt3/uic/jamroot.jam
+x64-windows-static/tools/boost-build/example/qt/qt3/uic/main.cpp
+x64-windows-static/tools/boost-build/example/qt/qt4/
+x64-windows-static/tools/boost-build/example/qt/qt4/hello/
+x64-windows-static/tools/boost-build/example/qt/qt4/hello/arrow.cpp
+x64-windows-static/tools/boost-build/example/qt/qt4/hello/arrow.h
+x64-windows-static/tools/boost-build/example/qt/qt4/hello/jamroot.jam
+x64-windows-static/tools/boost-build/example/qt/qt4/hello/main.cpp
+x64-windows-static/tools/boost-build/example/qt/qt4/moccable-cpp/
+x64-windows-static/tools/boost-build/example/qt/qt4/moccable-cpp/jamroot.jam
+x64-windows-static/tools/boost-build/example/qt/qt4/moccable-cpp/main.cpp
+x64-windows-static/tools/boost-build/example/qt/qt4/uic/
+x64-windows-static/tools/boost-build/example/qt/qt4/uic/hello_world_widget.ui
+x64-windows-static/tools/boost-build/example/qt/qt4/uic/jamroot.jam
+x64-windows-static/tools/boost-build/example/qt/qt4/uic/main.cpp
+x64-windows-static/tools/boost-build/example/sass/
+x64-windows-static/tools/boost-build/example/sass/importing.scss
+x64-windows-static/tools/boost-build/example/sass/include/
+x64-windows-static/tools/boost-build/example/sass/include/foobar.scss
+x64-windows-static/tools/boost-build/example/sass/jamroot.jam
+x64-windows-static/tools/boost-build/example/sass/singleton.sass
+x64-windows-static/tools/boost-build/example/sass/singleton.scss
+x64-windows-static/tools/boost-build/example/site-config.jam
+x64-windows-static/tools/boost-build/example/testing/
+x64-windows-static/tools/boost-build/example/testing/compile-fail.cpp
+x64-windows-static/tools/boost-build/example/testing/fail.cpp
+x64-windows-static/tools/boost-build/example/testing/jamroot.jam
+x64-windows-static/tools/boost-build/example/testing/success.cpp
+x64-windows-static/tools/boost-build/example/time/
+x64-windows-static/tools/boost-build/example/time/hello.cpp
+x64-windows-static/tools/boost-build/example/time/jamroot.jam
+x64-windows-static/tools/boost-build/example/time/readme.qbk
+x64-windows-static/tools/boost-build/example/try_compile/
+x64-windows-static/tools/boost-build/example/try_compile/Jamroot.jam
+x64-windows-static/tools/boost-build/example/try_compile/foo.cpp
+x64-windows-static/tools/boost-build/example/try_compile/main.cpp
+x64-windows-static/tools/boost-build/example/user-config.jam
+x64-windows-static/tools/boost-build/example/variant/
+x64-windows-static/tools/boost-build/example/variant/a.cpp
+x64-windows-static/tools/boost-build/example/variant/jamfile.jam
+x64-windows-static/tools/boost-build/example/variant/jamroot.jam
+x64-windows-static/tools/boost-build/example/variant/libs/
+x64-windows-static/tools/boost-build/example/variant/libs/jamfile.jam
+x64-windows-static/tools/boost-build/example/variant/libs/l.cpp
+x64-windows-static/tools/boost-build/example/variant/readme.qbk
+x64-windows-static/tools/boost-build/index.html
+x64-windows-static/tools/boost-build/notes/
+x64-windows-static/tools/boost-build/notes/README.txt
+x64-windows-static/tools/boost-build/notes/build_dir_option.txt
+x64-windows-static/tools/boost-build/notes/changes.txt
+x64-windows-static/tools/boost-build/notes/relative_source_paths.txt
+x64-windows-static/tools/boost-build/notes/release_procedure.txt
+x64-windows-static/tools/boost-build/scripts/
+x64-windows-static/tools/boost-build/scripts/build-docs.sh
+x64-windows-static/tools/boost-build/scripts/nightly.sh
+x64-windows-static/tools/boost-build/scripts/roll.sh
+x64-windows-static/tools/boost-build/scripts/to_merge.sh
+x64-windows-static/tools/boost-build/src/
+x64-windows-static/tools/boost-build/src/__init__.py
+x64-windows-static/tools/boost-build/src/bootstrap.jam
+x64-windows-static/tools/boost-build/src/build-system.jam
+x64-windows-static/tools/boost-build/src/build/
+x64-windows-static/tools/boost-build/src/build/__init__.py
+x64-windows-static/tools/boost-build/src/build/ac.jam
+x64-windows-static/tools/boost-build/src/build/alias.jam
+x64-windows-static/tools/boost-build/src/build/alias.py
+x64-windows-static/tools/boost-build/src/build/build-request.jam
+x64-windows-static/tools/boost-build/src/build/build_request.py
+x64-windows-static/tools/boost-build/src/build/config-cache.jam
+x64-windows-static/tools/boost-build/src/build/configure.jam
+x64-windows-static/tools/boost-build/src/build/configure.py
+x64-windows-static/tools/boost-build/src/build/engine.py
+x64-windows-static/tools/boost-build/src/build/errors.py
+x64-windows-static/tools/boost-build/src/build/feature.jam
+x64-windows-static/tools/boost-build/src/build/feature.py
+x64-windows-static/tools/boost-build/src/build/generators.jam
+x64-windows-static/tools/boost-build/src/build/generators.py
+x64-windows-static/tools/boost-build/src/build/project.jam
+x64-windows-static/tools/boost-build/src/build/project.py
+x64-windows-static/tools/boost-build/src/build/property-set.jam
+x64-windows-static/tools/boost-build/src/build/property.jam
+x64-windows-static/tools/boost-build/src/build/property.py
+x64-windows-static/tools/boost-build/src/build/property_set.py
+x64-windows-static/tools/boost-build/src/build/readme.txt
+x64-windows-static/tools/boost-build/src/build/scanner.jam
+x64-windows-static/tools/boost-build/src/build/scanner.py
+x64-windows-static/tools/boost-build/src/build/targets.jam
+x64-windows-static/tools/boost-build/src/build/targets.py
+x64-windows-static/tools/boost-build/src/build/toolset.jam
+x64-windows-static/tools/boost-build/src/build/toolset.py
+x64-windows-static/tools/boost-build/src/build/type.jam
+x64-windows-static/tools/boost-build/src/build/type.py
+x64-windows-static/tools/boost-build/src/build/version.jam
+x64-windows-static/tools/boost-build/src/build/version.py
+x64-windows-static/tools/boost-build/src/build/virtual-target.jam
+x64-windows-static/tools/boost-build/src/build/virtual_target.py
+x64-windows-static/tools/boost-build/src/build_system.py
+x64-windows-static/tools/boost-build/src/contrib/
+x64-windows-static/tools/boost-build/src/contrib/__init__.py
+x64-windows-static/tools/boost-build/src/contrib/boost.jam
+x64-windows-static/tools/boost-build/src/contrib/boost.py
+x64-windows-static/tools/boost-build/src/contrib/modular.jam
+x64-windows-static/tools/boost-build/src/contrib/tntnet.jam
+x64-windows-static/tools/boost-build/src/contrib/wxFormBuilder.jam
+x64-windows-static/tools/boost-build/src/engine/
+x64-windows-static/tools/boost-build/src/engine/.gitignore
+x64-windows-static/tools/boost-build/src/engine/Jambase
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/b2.exe
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/bjam.exe
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/builtins.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/class.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/command.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/compile.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/constants.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/cwd.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/debug.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/debugger.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/execcmd.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/execnt.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/filent.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/filesys.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/frames.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/function.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/glob.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/hash.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/hcache.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/hdrmacro.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/headers.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/jam.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/jambase.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/jamgram.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/lists.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/make.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/make1.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/md5.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/mem.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/modules.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/native.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/object.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/option.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/order.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/output.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/parse.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/path.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/pathnt.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/pathsys.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/property-set.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/regex.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/regexp.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/rules.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/scan.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/search.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/sequence.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/set.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/strings.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/subst.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/timestamp.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/variable.obj
+x64-windows-static/tools/boost-build/src/engine/bin.ntx86_64/w32_getreg.obj
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/AmigaOS.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/BCC_MAKEFILE
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/ChangeLog
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/EMX_MAKEFILE
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/MacOS.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/MacProjects.sit.hqx
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Mac_files/
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Mac_files/MacOS_Test_config.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Mac_files/MacOS_config.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Mac_files/dataend.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Mac_files/datastart.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Makefile.DLLs
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Makefile.am
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Makefile.direct
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Makefile.dj
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/Makefile.in
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/NT_MAKEFILE
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/NT_STATIC_THREADS_MAKEFILE
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/NT_THREADS_MAKEFILE
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/NT_X64_STATIC_THREADS_MAKEFILE
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/OS2_MAKEFILE
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/PCR-Makefile
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/README.QUICK
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/SMakefile.amiga
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/WCC_MAKEFILE
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/acinclude.m4
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/aclocal.m4
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/add_gc_prefix.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/allchblk.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/alloc.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/alpha_mach_dep.S
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/backgraph.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/bdw-gc.pc
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/bdw-gc.pc.in
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/blacklst.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/callprocs
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/checksums.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/compile
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/config.guess
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/config.sub
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/configure
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/configure.ac
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/configure.host
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/configure_atomic_ops.sh
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/cord.am
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/cordbscs.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/cordprnt.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/cordtest.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/cordxtra.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/de.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/de_cmds.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/de_win.ICO
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/de_win.RC
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/de_win.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/cord/de_win.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/darwin_stop_world.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/dbg_mlc.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/depcomp
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/digimars.mak
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.DGUX386
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.Mac
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.MacOSX
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.OS2
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.amiga
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.arm.cross
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.autoconf
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.changes
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.contributors
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.cords
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.darwin
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.dj
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.environment
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.ews4800
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.hp
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.linux
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.macros
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.rs6000
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.sgi
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.solaris2
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.uts
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.win32
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/README.win64
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/barrett_diagram
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/debugging.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/doc.am
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/gc.man
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/gcdescr.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/gcinterface.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/leak.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/overview.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/porting.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/scale.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/simple_example.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/doc/tree.html
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/dyn_load.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/finalize.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/gc.mak
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/gc_cpp.cc
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/gc_cpp.cpp
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/gc_dlopen.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/gcj_mlc.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/gcname.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/headers.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/hpux_test_and_clear.s
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/ia64_save_regs_in_stack.s
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/if_mach.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/if_not_there.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/cord.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/ec.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_allocator.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_amiga_redirects.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_backptr.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_config_macros.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_cpp.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_gcj.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_inline.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_mark.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_pthread_redirects.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_tiny_fl.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/gc_typed.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/include.am
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/javaxfc.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/leak_detector.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/new_gc_alloc.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/cord_pos.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/darwin_semaphore.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/darwin_stop_world.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/dbg_mlc.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/gc_hdrs.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/gc_locks.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/gc_pmark.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/gc_priv.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/gcconfig.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/msvc_dbg.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/pthread_stop_world.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/pthread_support.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/specific.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/private/thread_local_alloc.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/include/weakpointer.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/install-sh
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/libtool.m4
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/ltmain.sh
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/mach_dep.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/malloc.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/mallocx.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/mark.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/mark_rts.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/mips_sgi_mach_dep.s
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/mips_ultrix_mach_dep.s
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/misc.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/missing
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/mkinstalldirs
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/msvc_dbg.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/new_hblk.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/obj_map.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/os_dep.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/pcr_interface.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/pthread_stop_world.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/pthread_support.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/ptr_chck.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/real_malloc.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/reclaim.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/rs6000_mach_dep.s
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/setjmp_t.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/sparc_mach_dep.S
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/sparc_netbsd_mach_dep.s
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/sparc_sunos4_mach_dep.s
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/specific.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/stubborn.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/tests/
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/tests/leak_test.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/tests/middle.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/tests/test.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/tests/test_cpp.cc
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/tests/tests.am
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/tests/thread_leak_test.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/thread_local_alloc.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/threadlibs.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/typd_mlc.c
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/version.h
+x64-windows-static/tools/boost-build/src/engine/boehm_gc/win32_threads.c
+x64-windows-static/tools/boost-build/src/engine/boost-jam.spec
+x64-windows-static/tools/boost-build/src/engine/boost-no-inspect
+x64-windows-static/tools/boost-build/src/engine/bootstrap/
+x64-windows-static/tools/boost-build/src/engine/bootstrap/builtins.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/class.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/command.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/compile.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/constants.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/cwd.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/debug.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/execcmd.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/execnt.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/filent.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/filesys.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/frames.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/function.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/glob.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/hash.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/hdrmacro.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/headers.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/jam.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/jam0.exe
+x64-windows-static/tools/boost-build/src/engine/bootstrap/jam0.ilk
+x64-windows-static/tools/boost-build/src/engine/bootstrap/jam0.pdb
+x64-windows-static/tools/boost-build/src/engine/bootstrap/jambase.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/jamgram.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/lists.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/make.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/make1.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/md5.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/modules.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/native.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/object.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/option.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/order.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/output.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/parse.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/path.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/pathnt.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/pathsys.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/property-set.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/regex.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/regexp.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/rules.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/scan.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/search.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/sequence.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/set.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/strings.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/subst.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/timestamp.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/variable.obj
+x64-windows-static/tools/boost-build/src/engine/bootstrap/vc140.pdb
+x64-windows-static/tools/boost-build/src/engine/bootstrap/w32_getreg.obj
+x64-windows-static/tools/boost-build/src/engine/build.bat
+x64-windows-static/tools/boost-build/src/engine/build.jam
+x64-windows-static/tools/boost-build/src/engine/build.sh
+x64-windows-static/tools/boost-build/src/engine/build_vms.com
+x64-windows-static/tools/boost-build/src/engine/builtins.c
+x64-windows-static/tools/boost-build/src/engine/builtins.h
+x64-windows-static/tools/boost-build/src/engine/bump_version.py
+x64-windows-static/tools/boost-build/src/engine/class.c
+x64-windows-static/tools/boost-build/src/engine/class.h
+x64-windows-static/tools/boost-build/src/engine/command.c
+x64-windows-static/tools/boost-build/src/engine/command.h
+x64-windows-static/tools/boost-build/src/engine/compile.c
+x64-windows-static/tools/boost-build/src/engine/compile.h
+x64-windows-static/tools/boost-build/src/engine/config_toolset.bat
+x64-windows-static/tools/boost-build/src/engine/constants.c
+x64-windows-static/tools/boost-build/src/engine/constants.h
+x64-windows-static/tools/boost-build/src/engine/cwd.c
+x64-windows-static/tools/boost-build/src/engine/cwd.h
+x64-windows-static/tools/boost-build/src/engine/debian/
+x64-windows-static/tools/boost-build/src/engine/debian/changelog
+x64-windows-static/tools/boost-build/src/engine/debian/copyright
+x64-windows-static/tools/boost-build/src/engine/debian/jam.man.sgml
+x64-windows-static/tools/boost-build/src/engine/debian/rules
+x64-windows-static/tools/boost-build/src/engine/debug.c
+x64-windows-static/tools/boost-build/src/engine/debug.h
+x64-windows-static/tools/boost-build/src/engine/debugger.c
+x64-windows-static/tools/boost-build/src/engine/debugger.h
+x64-windows-static/tools/boost-build/src/engine/execcmd.c
+x64-windows-static/tools/boost-build/src/engine/execcmd.h
+x64-windows-static/tools/boost-build/src/engine/execnt.c
+x64-windows-static/tools/boost-build/src/engine/execunix.c
+x64-windows-static/tools/boost-build/src/engine/execvms.c
+x64-windows-static/tools/boost-build/src/engine/filent.c
+x64-windows-static/tools/boost-build/src/engine/filesys.c
+x64-windows-static/tools/boost-build/src/engine/filesys.h
+x64-windows-static/tools/boost-build/src/engine/fileunix.c
+x64-windows-static/tools/boost-build/src/engine/filevms.c
+x64-windows-static/tools/boost-build/src/engine/frames.c
+x64-windows-static/tools/boost-build/src/engine/frames.h
+x64-windows-static/tools/boost-build/src/engine/function.c
+x64-windows-static/tools/boost-build/src/engine/function.h
+x64-windows-static/tools/boost-build/src/engine/glob.c
+x64-windows-static/tools/boost-build/src/engine/guess_toolset.bat
+x64-windows-static/tools/boost-build/src/engine/hash.c
+x64-windows-static/tools/boost-build/src/engine/hash.h
+x64-windows-static/tools/boost-build/src/engine/hcache.c
+x64-windows-static/tools/boost-build/src/engine/hcache.h
+x64-windows-static/tools/boost-build/src/engine/hdrmacro.c
+x64-windows-static/tools/boost-build/src/engine/hdrmacro.h
+x64-windows-static/tools/boost-build/src/engine/headers.c
+x64-windows-static/tools/boost-build/src/engine/headers.h
+x64-windows-static/tools/boost-build/src/engine/jam.c
+x64-windows-static/tools/boost-build/src/engine/jam.h
+x64-windows-static/tools/boost-build/src/engine/jambase.c
+x64-windows-static/tools/boost-build/src/engine/jambase.h
+x64-windows-static/tools/boost-build/src/engine/jamgram.c
+x64-windows-static/tools/boost-build/src/engine/jamgram.h
+x64-windows-static/tools/boost-build/src/engine/jamgram.y
+x64-windows-static/tools/boost-build/src/engine/jamgram.yy
+x64-windows-static/tools/boost-build/src/engine/jamgramtab.h
+x64-windows-static/tools/boost-build/src/engine/lists.c
+x64-windows-static/tools/boost-build/src/engine/lists.h
+x64-windows-static/tools/boost-build/src/engine/make.c
+x64-windows-static/tools/boost-build/src/engine/make.h
+x64-windows-static/tools/boost-build/src/engine/make1.c
+x64-windows-static/tools/boost-build/src/engine/md5.c
+x64-windows-static/tools/boost-build/src/engine/md5.h
+x64-windows-static/tools/boost-build/src/engine/mem.c
+x64-windows-static/tools/boost-build/src/engine/mem.h
+x64-windows-static/tools/boost-build/src/engine/mkjambase.c
+x64-windows-static/tools/boost-build/src/engine/modules.c
+x64-windows-static/tools/boost-build/src/engine/modules.h
+x64-windows-static/tools/boost-build/src/engine/modules/
+x64-windows-static/tools/boost-build/src/engine/modules/order.c
+x64-windows-static/tools/boost-build/src/engine/modules/path.c
+x64-windows-static/tools/boost-build/src/engine/modules/property-set.c
+x64-windows-static/tools/boost-build/src/engine/modules/readme.txt
+x64-windows-static/tools/boost-build/src/engine/modules/regex.c
+x64-windows-static/tools/boost-build/src/engine/modules/sequence.c
+x64-windows-static/tools/boost-build/src/engine/modules/set.c
+x64-windows-static/tools/boost-build/src/engine/native.c
+x64-windows-static/tools/boost-build/src/engine/native.h
+x64-windows-static/tools/boost-build/src/engine/object.c
+x64-windows-static/tools/boost-build/src/engine/object.h
+x64-windows-static/tools/boost-build/src/engine/option.c
+x64-windows-static/tools/boost-build/src/engine/option.h
+x64-windows-static/tools/boost-build/src/engine/output.c
+x64-windows-static/tools/boost-build/src/engine/output.h
+x64-windows-static/tools/boost-build/src/engine/parse.c
+x64-windows-static/tools/boost-build/src/engine/parse.h
+x64-windows-static/tools/boost-build/src/engine/patchlevel.h
+x64-windows-static/tools/boost-build/src/engine/pathnt.c
+x64-windows-static/tools/boost-build/src/engine/pathsys.c
+x64-windows-static/tools/boost-build/src/engine/pathsys.h
+x64-windows-static/tools/boost-build/src/engine/pathunix.c
+x64-windows-static/tools/boost-build/src/engine/pathvms.c
+x64-windows-static/tools/boost-build/src/engine/regexp.c
+x64-windows-static/tools/boost-build/src/engine/regexp.h
+x64-windows-static/tools/boost-build/src/engine/rules.c
+x64-windows-static/tools/boost-build/src/engine/rules.h
+x64-windows-static/tools/boost-build/src/engine/scan.c
+x64-windows-static/tools/boost-build/src/engine/scan.h
+x64-windows-static/tools/boost-build/src/engine/search.c
+x64-windows-static/tools/boost-build/src/engine/search.h
+x64-windows-static/tools/boost-build/src/engine/strings.c
+x64-windows-static/tools/boost-build/src/engine/strings.h
+x64-windows-static/tools/boost-build/src/engine/subst.c
+x64-windows-static/tools/boost-build/src/engine/subst.h
+x64-windows-static/tools/boost-build/src/engine/timestamp.c
+x64-windows-static/tools/boost-build/src/engine/timestamp.h
+x64-windows-static/tools/boost-build/src/engine/variable.c
+x64-windows-static/tools/boost-build/src/engine/variable.h
+x64-windows-static/tools/boost-build/src/engine/vswhere_usability_wrapper.cmd
+x64-windows-static/tools/boost-build/src/engine/w32_getreg.c
+x64-windows-static/tools/boost-build/src/engine/yyacc.c
+x64-windows-static/tools/boost-build/src/exceptions.py
+x64-windows-static/tools/boost-build/src/kernel/
+x64-windows-static/tools/boost-build/src/kernel/boost-build.jam
+x64-windows-static/tools/boost-build/src/kernel/bootstrap.jam
+x64-windows-static/tools/boost-build/src/kernel/bootstrap.py
+x64-windows-static/tools/boost-build/src/kernel/class.jam
+x64-windows-static/tools/boost-build/src/kernel/errors.jam
+x64-windows-static/tools/boost-build/src/kernel/modules.jam
+x64-windows-static/tools/boost-build/src/manager.py
+x64-windows-static/tools/boost-build/src/options/
+x64-windows-static/tools/boost-build/src/options/help.jam
+x64-windows-static/tools/boost-build/src/tools/
+x64-windows-static/tools/boost-build/src/tools/__init__.py
+x64-windows-static/tools/boost-build/src/tools/acc.jam
+x64-windows-static/tools/boost-build/src/tools/asciidoctor.jam
+x64-windows-static/tools/boost-build/src/tools/auto-index.jam
+x64-windows-static/tools/boost-build/src/tools/bison.jam
+x64-windows-static/tools/boost-build/src/tools/boostbook-config.jam
+x64-windows-static/tools/boost-build/src/tools/boostbook.jam
+x64-windows-static/tools/boost-build/src/tools/borland.jam
+x64-windows-static/tools/boost-build/src/tools/builtin.jam
+x64-windows-static/tools/boost-build/src/tools/builtin.py
+x64-windows-static/tools/boost-build/src/tools/bzip2.jam
+x64-windows-static/tools/boost-build/src/tools/cast.jam
+x64-windows-static/tools/boost-build/src/tools/cast.py
+x64-windows-static/tools/boost-build/src/tools/clang-darwin.jam
+x64-windows-static/tools/boost-build/src/tools/clang-linux.jam
+x64-windows-static/tools/boost-build/src/tools/clang-vxworks.jam
+x64-windows-static/tools/boost-build/src/tools/clang-win.jam
+x64-windows-static/tools/boost-build/src/tools/clang.jam
+x64-windows-static/tools/boost-build/src/tools/common.jam
+x64-windows-static/tools/boost-build/src/tools/common.py
+x64-windows-static/tools/boost-build/src/tools/como-linux.jam
+x64-windows-static/tools/boost-build/src/tools/como-win.jam
+x64-windows-static/tools/boost-build/src/tools/como.jam
+x64-windows-static/tools/boost-build/src/tools/convert.jam
+x64-windows-static/tools/boost-build/src/tools/cray.jam
+x64-windows-static/tools/boost-build/src/tools/cw-config.jam
+x64-windows-static/tools/boost-build/src/tools/cw.jam
+x64-windows-static/tools/boost-build/src/tools/cygwin.jam
+x64-windows-static/tools/boost-build/src/tools/darwin.jam
+x64-windows-static/tools/boost-build/src/tools/darwin.py
+x64-windows-static/tools/boost-build/src/tools/diab.jam
+x64-windows-static/tools/boost-build/src/tools/dmc.jam
+x64-windows-static/tools/boost-build/src/tools/docutils.jam
+x64-windows-static/tools/boost-build/src/tools/doxproc.py
+x64-windows-static/tools/boost-build/src/tools/doxygen-config.jam
+x64-windows-static/tools/boost-build/src/tools/doxygen.jam
+x64-windows-static/tools/boost-build/src/tools/doxygen/
+x64-windows-static/tools/boost-build/src/tools/doxygen/windows-paths-check.doxyfile
+x64-windows-static/tools/boost-build/src/tools/doxygen/windows-paths-check.hpp
+x64-windows-static/tools/boost-build/src/tools/emscripten.jam
+x64-windows-static/tools/boost-build/src/tools/features/
+x64-windows-static/tools/boost-build/src/tools/features/__init_features__.jam
+x64-windows-static/tools/boost-build/src/tools/features/address-model-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/allow-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/architecture-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/archiveflags-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/asmflags-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/build-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/cflags-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/conditional-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/cxx-template-depth-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/cxxabi-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/cxxflags-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/cxxstd-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/debug-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/define-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/dependency-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/dll-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/exception-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/fflags-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/file-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/find-lib-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/flags-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/include-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/instruction-set-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/internal-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/library-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/link-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/linkflags-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/location-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/location-prefix-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/name-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/objcflags-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/optimization-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/os-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/relevant-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/rtti-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/runtime-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/search-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/source-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/stdlib-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/strip-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/tag-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/threadapi-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/threading-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/toolset-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/user-interface-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/variant-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/version-feature.jam
+x64-windows-static/tools/boost-build/src/tools/features/warnings-feature.jam
+x64-windows-static/tools/boost-build/src/tools/flags.jam
+x64-windows-static/tools/boost-build/src/tools/fop.jam
+x64-windows-static/tools/boost-build/src/tools/fortran.jam
+x64-windows-static/tools/boost-build/src/tools/gcc.jam
+x64-windows-static/tools/boost-build/src/tools/gcc.py
+x64-windows-static/tools/boost-build/src/tools/generate.jam
+x64-windows-static/tools/boost-build/src/tools/generators/
+x64-windows-static/tools/boost-build/src/tools/generators/__init_generators__.jam
+x64-windows-static/tools/boost-build/src/tools/generators/archive-generator.jam
+x64-windows-static/tools/boost-build/src/tools/generators/c-compiling-generator.jam
+x64-windows-static/tools/boost-build/src/tools/generators/dummy-generator.jam
+x64-windows-static/tools/boost-build/src/tools/generators/lib-generator.jam
+x64-windows-static/tools/boost-build/src/tools/generators/linking-generator.jam
+x64-windows-static/tools/boost-build/src/tools/generators/prebuilt-lib-generator.jam
+x64-windows-static/tools/boost-build/src/tools/generators/searched-lib-generator.jam
+x64-windows-static/tools/boost-build/src/tools/gettext.jam
+x64-windows-static/tools/boost-build/src/tools/gfortran.jam
+x64-windows-static/tools/boost-build/src/tools/hp_cxx.jam
+x64-windows-static/tools/boost-build/src/tools/hpfortran.jam
+x64-windows-static/tools/boost-build/src/tools/ifort.jam
+x64-windows-static/tools/boost-build/src/tools/intel-darwin.jam
+x64-windows-static/tools/boost-build/src/tools/intel-linux.jam
+x64-windows-static/tools/boost-build/src/tools/intel-vxworks.jam
+x64-windows-static/tools/boost-build/src/tools/intel-win.jam
+x64-windows-static/tools/boost-build/src/tools/intel.jam
+x64-windows-static/tools/boost-build/src/tools/lex.jam
+x64-windows-static/tools/boost-build/src/tools/libjpeg.jam
+x64-windows-static/tools/boost-build/src/tools/libpng.jam
+x64-windows-static/tools/boost-build/src/tools/libtiff.jam
+x64-windows-static/tools/boost-build/src/tools/link.jam
+x64-windows-static/tools/boost-build/src/tools/lzma.jam
+x64-windows-static/tools/boost-build/src/tools/make.jam
+x64-windows-static/tools/boost-build/src/tools/make.py
+x64-windows-static/tools/boost-build/src/tools/mc.jam
+x64-windows-static/tools/boost-build/src/tools/mc.py
+x64-windows-static/tools/boost-build/src/tools/message.jam
+x64-windows-static/tools/boost-build/src/tools/message.py
+x64-windows-static/tools/boost-build/src/tools/midl.jam
+x64-windows-static/tools/boost-build/src/tools/midl.py
+x64-windows-static/tools/boost-build/src/tools/mipspro.jam
+x64-windows-static/tools/boost-build/src/tools/mpi.jam
+x64-windows-static/tools/boost-build/src/tools/msvc-config.jam
+x64-windows-static/tools/boost-build/src/tools/msvc.jam
+x64-windows-static/tools/boost-build/src/tools/msvc.py
+x64-windows-static/tools/boost-build/src/tools/notfile.jam
+x64-windows-static/tools/boost-build/src/tools/notfile.py
+x64-windows-static/tools/boost-build/src/tools/package.jam
+x64-windows-static/tools/boost-build/src/tools/package.py
+x64-windows-static/tools/boost-build/src/tools/pathscale.jam
+x64-windows-static/tools/boost-build/src/tools/pch.jam
+x64-windows-static/tools/boost-build/src/tools/pch.py
+x64-windows-static/tools/boost-build/src/tools/pgi.jam
+x64-windows-static/tools/boost-build/src/tools/python-config.jam
+x64-windows-static/tools/boost-build/src/tools/python.jam
+x64-windows-static/tools/boost-build/src/tools/qcc.jam
+x64-windows-static/tools/boost-build/src/tools/qt.jam
+x64-windows-static/tools/boost-build/src/tools/qt3.jam
+x64-windows-static/tools/boost-build/src/tools/qt4.jam
+x64-windows-static/tools/boost-build/src/tools/qt5.jam
+x64-windows-static/tools/boost-build/src/tools/quickbook-config.jam
+x64-windows-static/tools/boost-build/src/tools/quickbook.jam
+x64-windows-static/tools/boost-build/src/tools/rc.jam
+x64-windows-static/tools/boost-build/src/tools/rc.py
+x64-windows-static/tools/boost-build/src/tools/sass.jam
+x64-windows-static/tools/boost-build/src/tools/stage.jam
+x64-windows-static/tools/boost-build/src/tools/stage.py
+x64-windows-static/tools/boost-build/src/tools/stlport.jam
+x64-windows-static/tools/boost-build/src/tools/sun.jam
+x64-windows-static/tools/boost-build/src/tools/symlink.jam
+x64-windows-static/tools/boost-build/src/tools/symlink.py
+x64-windows-static/tools/boost-build/src/tools/testing-aux.jam
+x64-windows-static/tools/boost-build/src/tools/testing.jam
+x64-windows-static/tools/boost-build/src/tools/testing.py
+x64-windows-static/tools/boost-build/src/tools/types/
+x64-windows-static/tools/boost-build/src/tools/types/__init__.py
+x64-windows-static/tools/boost-build/src/tools/types/adoc.jam
+x64-windows-static/tools/boost-build/src/tools/types/asm.jam
+x64-windows-static/tools/boost-build/src/tools/types/asm.py
+x64-windows-static/tools/boost-build/src/tools/types/cpp.jam
+x64-windows-static/tools/boost-build/src/tools/types/cpp.py
+x64-windows-static/tools/boost-build/src/tools/types/css.jam
+x64-windows-static/tools/boost-build/src/tools/types/docbook.jam
+x64-windows-static/tools/boost-build/src/tools/types/exe.jam
+x64-windows-static/tools/boost-build/src/tools/types/exe.py
+x64-windows-static/tools/boost-build/src/tools/types/html.jam
+x64-windows-static/tools/boost-build/src/tools/types/html.py
+x64-windows-static/tools/boost-build/src/tools/types/lib.jam
+x64-windows-static/tools/boost-build/src/tools/types/lib.py
+x64-windows-static/tools/boost-build/src/tools/types/man.jam
+x64-windows-static/tools/boost-build/src/tools/types/markdown.jam
+x64-windows-static/tools/boost-build/src/tools/types/markdown.py
+x64-windows-static/tools/boost-build/src/tools/types/obj.jam
+x64-windows-static/tools/boost-build/src/tools/types/obj.py
+x64-windows-static/tools/boost-build/src/tools/types/objc.jam
+x64-windows-static/tools/boost-build/src/tools/types/pdf.jam
+x64-windows-static/tools/boost-build/src/tools/types/preprocessed.jam
+x64-windows-static/tools/boost-build/src/tools/types/preprocessed.py
+x64-windows-static/tools/boost-build/src/tools/types/qt.jam
+x64-windows-static/tools/boost-build/src/tools/types/register.jam
+x64-windows-static/tools/boost-build/src/tools/types/rsp.jam
+x64-windows-static/tools/boost-build/src/tools/types/rsp.py
+x64-windows-static/tools/boost-build/src/tools/types/sass-type.jam
+x64-windows-static/tools/boost-build/src/tools/types/xml.jam
+x64-windows-static/tools/boost-build/src/tools/unix.jam
+x64-windows-static/tools/boost-build/src/tools/unix.py
+x64-windows-static/tools/boost-build/src/tools/vacpp.jam
+x64-windows-static/tools/boost-build/src/tools/vmsdecc.jam
+x64-windows-static/tools/boost-build/src/tools/whale.jam
+x64-windows-static/tools/boost-build/src/tools/xlcpp.jam
+x64-windows-static/tools/boost-build/src/tools/xlf.jam
+x64-windows-static/tools/boost-build/src/tools/xsltproc-config.jam
+x64-windows-static/tools/boost-build/src/tools/xsltproc.jam
+x64-windows-static/tools/boost-build/src/tools/xsltproc/
+x64-windows-static/tools/boost-build/src/tools/xsltproc/included.xsl
+x64-windows-static/tools/boost-build/src/tools/xsltproc/test.xml
+x64-windows-static/tools/boost-build/src/tools/xsltproc/test.xsl
+x64-windows-static/tools/boost-build/src/tools/zlib.jam
+x64-windows-static/tools/boost-build/src/tools/zstd.jam
+x64-windows-static/tools/boost-build/src/util/
+x64-windows-static/tools/boost-build/src/util/__init__.py
+x64-windows-static/tools/boost-build/src/util/assert.jam
+x64-windows-static/tools/boost-build/src/util/container.jam
+x64-windows-static/tools/boost-build/src/util/doc.jam
+x64-windows-static/tools/boost-build/src/util/indirect.jam
+x64-windows-static/tools/boost-build/src/util/indirect.py
+x64-windows-static/tools/boost-build/src/util/logger.py
+x64-windows-static/tools/boost-build/src/util/numbers.jam
+x64-windows-static/tools/boost-build/src/util/option.jam
+x64-windows-static/tools/boost-build/src/util/option.py
+x64-windows-static/tools/boost-build/src/util/order.jam
+x64-windows-static/tools/boost-build/src/util/order.py
+x64-windows-static/tools/boost-build/src/util/os.jam
+x64-windows-static/tools/boost-build/src/util/os_j.py
+x64-windows-static/tools/boost-build/src/util/param.jam
+x64-windows-static/tools/boost-build/src/util/path.jam
+x64-windows-static/tools/boost-build/src/util/path.py
+x64-windows-static/tools/boost-build/src/util/print.jam
+x64-windows-static/tools/boost-build/src/util/regex.jam
+x64-windows-static/tools/boost-build/src/util/regex.py
+x64-windows-static/tools/boost-build/src/util/sequence.jam
+x64-windows-static/tools/boost-build/src/util/sequence.py
+x64-windows-static/tools/boost-build/src/util/set.jam
+x64-windows-static/tools/boost-build/src/util/set.py
+x64-windows-static/tools/boost-build/src/util/string.jam
+x64-windows-static/tools/boost-build/src/util/utility.jam
+x64-windows-static/tools/boost-build/src/util/utility.py
+x64-windows-static/tools/boost-build/test/
+x64-windows-static/tools/boost-build/test/BoostBuild.py
+x64-windows-static/tools/boost-build/test/Jamfile.jam
+x64-windows-static/tools/boost-build/test/MockToolset.py
+x64-windows-static/tools/boost-build/test/TestCmd.py
+x64-windows-static/tools/boost-build/test/TestToolset.py
+x64-windows-static/tools/boost-build/test/abs_workdir.py
+x64-windows-static/tools/boost-build/test/absolute_sources.py
+x64-windows-static/tools/boost-build/test/alias.py
+x64-windows-static/tools/boost-build/test/alternatives.py
+x64-windows-static/tools/boost-build/test/bad_dirname.py
+x64-windows-static/tools/boost-build/test/boost-build.jam
+x64-windows-static/tools/boost-build/test/boostbook.py
+x64-windows-static/tools/boost-build/test/boostbook/
+x64-windows-static/tools/boost-build/test/boostbook/a.hpp
+x64-windows-static/tools/boost-build/test/boostbook/docs.xml
+x64-windows-static/tools/boost-build/test/boostbook/jamroot.jam
+x64-windows-static/tools/boost-build/test/build_dir.py
+x64-windows-static/tools/boost-build/test/build_file.py
+x64-windows-static/tools/boost-build/test/build_hooks.py
+x64-windows-static/tools/boost-build/test/build_no.py
+x64-windows-static/tools/boost-build/test/builtin_echo.py
+x64-windows-static/tools/boost-build/test/builtin_exit.py
+x64-windows-static/tools/boost-build/test/builtin_glob.py
+x64-windows-static/tools/boost-build/test/builtin_glob_archive.py
+x64-windows-static/tools/boost-build/test/builtin_readlink.py
+x64-windows-static/tools/boost-build/test/builtin_split_by_characters.py
+x64-windows-static/tools/boost-build/test/bzip2.py
+x64-windows-static/tools/boost-build/test/c_file.py
+x64-windows-static/tools/boost-build/test/chain.py
+x64-windows-static/tools/boost-build/test/clean.py
+x64-windows-static/tools/boost-build/test/cli_property_expansion.py
+x64-windows-static/tools/boost-build/test/collect_debug_info.py
+x64-windows-static/tools/boost-build/test/command_line_properties.py
+x64-windows-static/tools/boost-build/test/composite.py
+x64-windows-static/tools/boost-build/test/conditionals.py
+x64-windows-static/tools/boost-build/test/conditionals2.py
+x64-windows-static/tools/boost-build/test/conditionals3.py
+x64-windows-static/tools/boost-build/test/conditionals_multiple.py
+x64-windows-static/tools/boost-build/test/configuration.py
+x64-windows-static/tools/boost-build/test/configure.py
+x64-windows-static/tools/boost-build/test/copy_time.py
+x64-windows-static/tools/boost-build/test/core-language/
+x64-windows-static/tools/boost-build/test/core-language/test.jam
+x64-windows-static/tools/boost-build/test/core_action_output.py
+x64-windows-static/tools/boost-build/test/core_action_status.py
+x64-windows-static/tools/boost-build/test/core_actions_quietly.py
+x64-windows-static/tools/boost-build/test/core_arguments.py
+x64-windows-static/tools/boost-build/test/core_at_file.py
+x64-windows-static/tools/boost-build/test/core_bindrule.py
+x64-windows-static/tools/boost-build/test/core_d12.py
+x64-windows-static/tools/boost-build/test/core_delete_module.py
+x64-windows-static/tools/boost-build/test/core_dependencies.py
+x64-windows-static/tools/boost-build/test/core_fail_expected.py
+x64-windows-static/tools/boost-build/test/core_import_module.py
+x64-windows-static/tools/boost-build/test/core_jamshell.py
+x64-windows-static/tools/boost-build/test/core_language.py
+x64-windows-static/tools/boost-build/test/core_modifiers.py
+x64-windows-static/tools/boost-build/test/core_multifile_actions.py
+x64-windows-static/tools/boost-build/test/core_nt_cmd_line.py
+x64-windows-static/tools/boost-build/test/core_option_d2.py
+x64-windows-static/tools/boost-build/test/core_option_l.py
+x64-windows-static/tools/boost-build/test/core_option_n.py
+x64-windows-static/tools/boost-build/test/core_parallel_actions.py
+x64-windows-static/tools/boost-build/test/core_parallel_multifile_actions_1.py
+x64-windows-static/tools/boost-build/test/core_parallel_multifile_actions_2.py
+x64-windows-static/tools/boost-build/test/core_scanner.py
+x64-windows-static/tools/boost-build/test/core_source_line_tracking.py
+x64-windows-static/tools/boost-build/test/core_typecheck.py
+x64-windows-static/tools/boost-build/test/core_update_now.py
+x64-windows-static/tools/boost-build/test/core_variables_in_actions.py
+x64-windows-static/tools/boost-build/test/core_varnames.py
+x64-windows-static/tools/boost-build/test/custom_generator.py
+x64-windows-static/tools/boost-build/test/debugger-mi.py
+x64-windows-static/tools/boost-build/test/debugger.py
+x64-windows-static/tools/boost-build/test/default_build.py
+x64-windows-static/tools/boost-build/test/default_features.py
+x64-windows-static/tools/boost-build/test/default_toolset.py
+x64-windows-static/tools/boost-build/test/dependency_property.py
+x64-windows-static/tools/boost-build/test/dependency_test.py
+x64-windows-static/tools/boost-build/test/disambiguation.py
+x64-windows-static/tools/boost-build/test/dll_path.py
+x64-windows-static/tools/boost-build/test/double_loading.py
+x64-windows-static/tools/boost-build/test/duplicate.py
+x64-windows-static/tools/boost-build/test/example_customization.py
+x64-windows-static/tools/boost-build/test/example_gettext.py
+x64-windows-static/tools/boost-build/test/example_libraries.py
+x64-windows-static/tools/boost-build/test/example_make.py
+x64-windows-static/tools/boost-build/test/example_qt4.py
+x64-windows-static/tools/boost-build/test/exit_status.py
+x64-windows-static/tools/boost-build/test/expansion.py
+x64-windows-static/tools/boost-build/test/explicit.py
+x64-windows-static/tools/boost-build/test/feature_cxxflags.py
+x64-windows-static/tools/boost-build/test/feature_implicit_dependency.py
+x64-windows-static/tools/boost-build/test/feature_relevant.py
+x64-windows-static/tools/boost-build/test/feature_suppress_import_lib.py
+x64-windows-static/tools/boost-build/test/file_types.py
+x64-windows-static/tools/boost-build/test/flags.py
+x64-windows-static/tools/boost-build/test/gcc_runtime.py
+x64-windows-static/tools/boost-build/test/generator_selection.py
+x64-windows-static/tools/boost-build/test/generators_test.py
+x64-windows-static/tools/boost-build/test/implicit_dependency.py
+x64-windows-static/tools/boost-build/test/indirect_conditional.py
+x64-windows-static/tools/boost-build/test/inherit_toolset.py
+x64-windows-static/tools/boost-build/test/inherited_dependency.py
+x64-windows-static/tools/boost-build/test/inline.py
+x64-windows-static/tools/boost-build/test/lib_source_property.py
+x64-windows-static/tools/boost-build/test/lib_zlib.py
+x64-windows-static/tools/boost-build/test/libjpeg.py
+x64-windows-static/tools/boost-build/test/liblzma.py
+x64-windows-static/tools/boost-build/test/libpng.py
+x64-windows-static/tools/boost-build/test/library_chain.py
+x64-windows-static/tools/boost-build/test/library_order.py
+x64-windows-static/tools/boost-build/test/library_property.py
+x64-windows-static/tools/boost-build/test/libtiff.py
+x64-windows-static/tools/boost-build/test/libzstd.py
+x64-windows-static/tools/boost-build/test/link.py
+x64-windows-static/tools/boost-build/test/load_dir.py
+x64-windows-static/tools/boost-build/test/load_order.py
+x64-windows-static/tools/boost-build/test/loop.py
+x64-windows-static/tools/boost-build/test/make_rule.py
+x64-windows-static/tools/boost-build/test/message.py
+x64-windows-static/tools/boost-build/test/module_actions.py
+x64-windows-static/tools/boost-build/test/ndebug.py
+x64-windows-static/tools/boost-build/test/no_type.py
+x64-windows-static/tools/boost-build/test/notfile.py
+x64-windows-static/tools/boost-build/test/ordered_include.py
+x64-windows-static/tools/boost-build/test/ordered_properties.py
+x64-windows-static/tools/boost-build/test/out_of_tree.py
+x64-windows-static/tools/boost-build/test/param.py
+x64-windows-static/tools/boost-build/test/path_features.py
+x64-windows-static/tools/boost-build/test/pch.py
+x64-windows-static/tools/boost-build/test/prebuilt.py
+x64-windows-static/tools/boost-build/test/prebuilt/
+x64-windows-static/tools/boost-build/test/prebuilt/ext/
+x64-windows-static/tools/boost-build/test/prebuilt/ext/a.cpp
+x64-windows-static/tools/boost-build/test/prebuilt/ext/debug/
+x64-windows-static/tools/boost-build/test/prebuilt/ext/debug/a.h
+x64-windows-static/tools/boost-build/test/prebuilt/ext/jamfile.jam
+x64-windows-static/tools/boost-build/test/prebuilt/ext/jamfile2.jam
+x64-windows-static/tools/boost-build/test/prebuilt/ext/jamfile3.jam
+x64-windows-static/tools/boost-build/test/prebuilt/ext/jamroot.jam
+x64-windows-static/tools/boost-build/test/prebuilt/ext/release/
+x64-windows-static/tools/boost-build/test/prebuilt/ext/release/a.h
+x64-windows-static/tools/boost-build/test/prebuilt/hello.cpp
+x64-windows-static/tools/boost-build/test/prebuilt/jamfile.jam
+x64-windows-static/tools/boost-build/test/prebuilt/jamroot.jam
+x64-windows-static/tools/boost-build/test/preprocessor.py
+x64-windows-static/tools/boost-build/test/print.py
+x64-windows-static/tools/boost-build/test/project-test3/
+x64-windows-static/tools/boost-build/test/project-test3/a.cpp
+x64-windows-static/tools/boost-build/test/project-test3/jamfile.jam
+x64-windows-static/tools/boost-build/test/project-test3/jamroot.jam
+x64-windows-static/tools/boost-build/test/project-test3/lib/
+x64-windows-static/tools/boost-build/test/project-test3/lib/b.cpp
+x64-windows-static/tools/boost-build/test/project-test3/lib/jamfile.jam
+x64-windows-static/tools/boost-build/test/project-test3/lib2/
+x64-windows-static/tools/boost-build/test/project-test3/lib2/c.cpp
+x64-windows-static/tools/boost-build/test/project-test3/lib2/d.cpp
+x64-windows-static/tools/boost-build/test/project-test3/lib2/helper/
+x64-windows-static/tools/boost-build/test/project-test3/lib2/helper/e.cpp
+x64-windows-static/tools/boost-build/test/project-test3/lib2/helper/jamfile.jam
+x64-windows-static/tools/boost-build/test/project-test3/lib2/jamfile.jam
+x64-windows-static/tools/boost-build/test/project-test3/lib3/
+x64-windows-static/tools/boost-build/test/project-test3/lib3/f.cpp
+x64-windows-static/tools/boost-build/test/project-test3/lib3/jamfile.jam
+x64-windows-static/tools/boost-build/test/project-test3/lib3/jamroot.jam
+x64-windows-static/tools/boost-build/test/project-test3/readme.txt
+x64-windows-static/tools/boost-build/test/project-test4/
+x64-windows-static/tools/boost-build/test/project-test4/a.cpp
+x64-windows-static/tools/boost-build/test/project-test4/a_gcc.cpp
+x64-windows-static/tools/boost-build/test/project-test4/jamfile.jam
+x64-windows-static/tools/boost-build/test/project-test4/jamfile3.jam
+x64-windows-static/tools/boost-build/test/project-test4/jamfile4.jam
+x64-windows-static/tools/boost-build/test/project-test4/jamfile5.jam
+x64-windows-static/tools/boost-build/test/project-test4/jamroot.jam
+x64-windows-static/tools/boost-build/test/project-test4/lib/
+x64-windows-static/tools/boost-build/test/project-test4/lib/b.cpp
+x64-windows-static/tools/boost-build/test/project-test4/lib/jamfile.jam
+x64-windows-static/tools/boost-build/test/project-test4/lib/jamfile1.jam
+x64-windows-static/tools/boost-build/test/project-test4/lib/jamfile2.jam
+x64-windows-static/tools/boost-build/test/project-test4/lib/jamfile3.jam
+x64-windows-static/tools/boost-build/test/project-test4/lib2/
+x64-windows-static/tools/boost-build/test/project-test4/lib2/jamfile.jam
+x64-windows-static/tools/boost-build/test/project-test4/lib2/jamfile2.jam
+x64-windows-static/tools/boost-build/test/project-test4/readme.txt
+x64-windows-static/tools/boost-build/test/project_dependencies.py
+x64-windows-static/tools/boost-build/test/project_glob.py
+x64-windows-static/tools/boost-build/test/project_id.py
+x64-windows-static/tools/boost-build/test/project_root_constants.py
+x64-windows-static/tools/boost-build/test/project_root_rule.py
+x64-windows-static/tools/boost-build/test/project_test3.py
+x64-windows-static/tools/boost-build/test/project_test4.py
+x64-windows-static/tools/boost-build/test/property_expansion.py
+x64-windows-static/tools/boost-build/test/qt4.py
+x64-windows-static/tools/boost-build/test/qt4/
+x64-windows-static/tools/boost-build/test/qt4/.gitignore
+x64-windows-static/tools/boost-build/test/qt4/jamroot.jam
+x64-windows-static/tools/boost-build/test/qt4/mock.cpp
+x64-windows-static/tools/boost-build/test/qt4/mock.h
+x64-windows-static/tools/boost-build/test/qt4/phonon.cpp
+x64-windows-static/tools/boost-build/test/qt4/qt3support.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtassistant.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtcore.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtcorefail.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtdeclarative.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtgui.cpp
+x64-windows-static/tools/boost-build/test/qt4/qthelp.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtmultimedia.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtnetwork.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtscript.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtscripttools.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtsql.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtsvg.cpp
+x64-windows-static/tools/boost-build/test/qt4/qttest.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtwebkit.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtxml.cpp
+x64-windows-static/tools/boost-build/test/qt4/qtxmlpatterns.cpp
+x64-windows-static/tools/boost-build/test/qt4/rcc.cpp
+x64-windows-static/tools/boost-build/test/qt4/rcc.qrc
+x64-windows-static/tools/boost-build/test/qt5.py
+x64-windows-static/tools/boost-build/test/qt5/
+x64-windows-static/tools/boost-build/test/qt5/.gitignore
+x64-windows-static/tools/boost-build/test/qt5/jamroot.jam
+x64-windows-static/tools/boost-build/test/qt5/mock.cpp
+x64-windows-static/tools/boost-build/test/qt5/mock.h
+x64-windows-static/tools/boost-build/test/qt5/qt3dcore.cpp
+x64-windows-static/tools/boost-build/test/qt5/qt3dinput.cpp
+x64-windows-static/tools/boost-build/test/qt5/qt3dlogic.cpp
+x64-windows-static/tools/boost-build/test/qt5/qt3drender.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtassistant.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtbluetooth.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtcharts.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtcore.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtcorefail.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtdatavisualization.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtdeclarative.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtgamepad.cpp
+x64-windows-static/tools/boost-build/test/qt5/qthelp.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtlocation.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtmultimedia.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtnetwork.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtnfc.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtpositioning.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtpurchasing.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtquick.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtquick.qml
+x64-windows-static/tools/boost-build/test/qt5/qtscript.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtscripttools.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtscxml.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtserialbus.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtserialport.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtsql.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtsvg.cpp
+x64-windows-static/tools/boost-build/test/qt5/qttest.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwebchannel.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwebengine.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwebenginewidgets.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwebkit.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwebkitwidgets.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwebsocket.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwebsockets.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwebview.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtwidgets.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtxml.cpp
+x64-windows-static/tools/boost-build/test/qt5/qtxmlpatterns.cpp
+x64-windows-static/tools/boost-build/test/qt5/rcc.cpp
+x64-windows-static/tools/boost-build/test/qt5/rcc.qrc
+x64-windows-static/tools/boost-build/test/railsys.py
+x64-windows-static/tools/boost-build/test/railsys/
+x64-windows-static/tools/boost-build/test/railsys/libx/
+x64-windows-static/tools/boost-build/test/railsys/libx/include/
+x64-windows-static/tools/boost-build/test/railsys/libx/include/test_libx.h
+x64-windows-static/tools/boost-build/test/railsys/libx/jamroot.jam
+x64-windows-static/tools/boost-build/test/railsys/libx/src/
+x64-windows-static/tools/boost-build/test/railsys/libx/src/jamfile.jam
+x64-windows-static/tools/boost-build/test/railsys/libx/src/test_libx.cpp
+x64-windows-static/tools/boost-build/test/railsys/program/
+x64-windows-static/tools/boost-build/test/railsys/program/include/
+x64-windows-static/tools/boost-build/test/railsys/program/include/test_a.h
+x64-windows-static/tools/boost-build/test/railsys/program/jamfile.jam
+x64-windows-static/tools/boost-build/test/railsys/program/jamroot.jam
+x64-windows-static/tools/boost-build/test/railsys/program/liba/
+x64-windows-static/tools/boost-build/test/railsys/program/liba/jamfile.jam
+x64-windows-static/tools/boost-build/test/railsys/program/liba/test_a.cpp
+x64-windows-static/tools/boost-build/test/railsys/program/main/
+x64-windows-static/tools/boost-build/test/railsys/program/main/jamfile.jam
+x64-windows-static/tools/boost-build/test/railsys/program/main/main.cpp
+x64-windows-static/tools/boost-build/test/readme.txt
+x64-windows-static/tools/boost-build/test/rebuilds.py
+x64-windows-static/tools/boost-build/test/relative_sources.py
+x64-windows-static/tools/boost-build/test/remove_requirement.py
+x64-windows-static/tools/boost-build/test/rescan_header.py
+x64-windows-static/tools/boost-build/test/resolution.py
+x64-windows-static/tools/boost-build/test/results-python.txt
+x64-windows-static/tools/boost-build/test/scanner_causing_rebuilds.py
+x64-windows-static/tools/boost-build/test/searched_lib.py
+x64-windows-static/tools/boost-build/test/skipping.py
+x64-windows-static/tools/boost-build/test/sort_rule.py
+x64-windows-static/tools/boost-build/test/source_locations.py
+x64-windows-static/tools/boost-build/test/source_order.py
+x64-windows-static/tools/boost-build/test/space_in_path.py
+x64-windows-static/tools/boost-build/test/stage.py
+x64-windows-static/tools/boost-build/test/standalone.py
+x64-windows-static/tools/boost-build/test/startup/
+x64-windows-static/tools/boost-build/test/startup/boost-root/
+x64-windows-static/tools/boost-build/test/startup/boost-root/boost-build.jam
+x64-windows-static/tools/boost-build/test/startup/boost-root/build/
+x64-windows-static/tools/boost-build/test/startup/boost-root/build/boost-build.jam
+x64-windows-static/tools/boost-build/test/startup/boost-root/build/bootstrap.jam
+x64-windows-static/tools/boost-build/test/startup/bootstrap-env/
+x64-windows-static/tools/boost-build/test/startup/bootstrap-env/boost-build.jam
+x64-windows-static/tools/boost-build/test/startup/bootstrap-explicit/
+x64-windows-static/tools/boost-build/test/startup/bootstrap-explicit/boost-build.jam
+x64-windows-static/tools/boost-build/test/startup/bootstrap-implicit/
+x64-windows-static/tools/boost-build/test/startup/bootstrap-implicit/readme.txt
+x64-windows-static/tools/boost-build/test/startup/no-bootstrap1/
+x64-windows-static/tools/boost-build/test/startup/no-bootstrap1/boost-build.jam
+x64-windows-static/tools/boost-build/test/startup/no-bootstrap1/subdir/
+x64-windows-static/tools/boost-build/test/startup/no-bootstrap1/subdir/readme.txt
+x64-windows-static/tools/boost-build/test/startup/no-bootstrap2/
+x64-windows-static/tools/boost-build/test/startup/no-bootstrap2/boost-build.jam
+x64-windows-static/tools/boost-build/test/startup/no-bootstrap3/
+x64-windows-static/tools/boost-build/test/startup/no-bootstrap3/boost-build.jam
+x64-windows-static/tools/boost-build/test/startup_v2.py
+x64-windows-static/tools/boost-build/test/static_and_shared_library.py
+x64-windows-static/tools/boost-build/test/suffix.py
+x64-windows-static/tools/boost-build/test/symlink.py
+x64-windows-static/tools/boost-build/test/tag.py
+x64-windows-static/tools/boost-build/test/template.py
+x64-windows-static/tools/boost-build/test/test-config-example.jam
+x64-windows-static/tools/boost-build/test/test.jam
+x64-windows-static/tools/boost-build/test/test1.py
+x64-windows-static/tools/boost-build/test/test2.py
+x64-windows-static/tools/boost-build/test/test2/
+x64-windows-static/tools/boost-build/test/test2/foo.cpp
+x64-windows-static/tools/boost-build/test/test2/jamroot.jam
+x64-windows-static/tools/boost-build/test/test_all.py
+x64-windows-static/tools/boost-build/test/test_rc.py
+x64-windows-static/tools/boost-build/test/test_system.html
+x64-windows-static/tools/boost-build/test/testing.py
+x64-windows-static/tools/boost-build/test/timedata.py
+x64-windows-static/tools/boost-build/test/toolset-mock/
+x64-windows-static/tools/boost-build/test/toolset-mock/Jamroot.jam
+x64-windows-static/tools/boost-build/test/toolset-mock/lib.cpp
+x64-windows-static/tools/boost-build/test/toolset-mock/main.cpp
+x64-windows-static/tools/boost-build/test/toolset-mock/project-config.jam
+x64-windows-static/tools/boost-build/test/toolset-mock/src/
+x64-windows-static/tools/boost-build/test/toolset-mock/src/Jamroot.jam
+x64-windows-static/tools/boost-build/test/toolset-mock/src/MockProgram.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/ar.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/clang-3.9.0-darwin.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/clang-linux-3.9.0.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/clang-vxworks-4.0.1.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/darwin-4.2.1.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/gcc-4.2.1-darwin.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/gcc-4.8.3-linux.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/intel-darwin-10.2.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/ld.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/libtool.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/mock-program.cpp
+x64-windows-static/tools/boost-build/test/toolset-mock/src/project-config.jam
+x64-windows-static/tools/boost-build/test/toolset-mock/src/ranlib.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/strip.py
+x64-windows-static/tools/boost-build/test/toolset-mock/src/verify.py
+x64-windows-static/tools/boost-build/test/toolset_clang_darwin.py
+x64-windows-static/tools/boost-build/test/toolset_clang_linux.py
+x64-windows-static/tools/boost-build/test/toolset_clang_vxworks.py
+x64-windows-static/tools/boost-build/test/toolset_darwin.py
+x64-windows-static/tools/boost-build/test/toolset_defaults.py
+x64-windows-static/tools/boost-build/test/toolset_gcc.py
+x64-windows-static/tools/boost-build/test/toolset_intel_darwin.py
+x64-windows-static/tools/boost-build/test/toolset_requirements.py
+x64-windows-static/tools/boost-build/test/tree.py
+x64-windows-static/tools/boost-build/test/unit_test.py
+x64-windows-static/tools/boost-build/test/unit_tests.py
+x64-windows-static/tools/boost-build/test/unused.py
+x64-windows-static/tools/boost-build/test/use_requirements.py
+x64-windows-static/tools/boost-build/test/using.py
+x64-windows-static/tools/boost-build/test/wrapper.py
+x64-windows-static/tools/boost-build/test/wrong_project.py
+x64-windows-static/tools/boost-build/tutorial.html
+x64-windows-static/tools/boost-build/website/
+x64-windows-static/tools/boost-build/website/boost.css
+x64-windows-static/tools/boost-build/website/boost_build.png
+x64-windows-static/tools/boost-build/website/boost_build.svg
+x64-windows-static/tools/boost-build/website/bootstrap/
+x64-windows-static/tools/boost-build/website/bootstrap/css/
+x64-windows-static/tools/boost-build/website/bootstrap/css/bootstrap-theme.css
+x64-windows-static/tools/boost-build/website/bootstrap/css/bootstrap-theme.min.css
+x64-windows-static/tools/boost-build/website/bootstrap/css/bootstrap.css
+x64-windows-static/tools/boost-build/website/bootstrap/css/bootstrap.min.css
+x64-windows-static/tools/boost-build/website/bootstrap/fonts/
+x64-windows-static/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.eot
+x64-windows-static/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.svg
+x64-windows-static/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.ttf
+x64-windows-static/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.woff
+x64-windows-static/tools/boost-build/website/bootstrap/js/
+x64-windows-static/tools/boost-build/website/bootstrap/js/bootstrap.js
+x64-windows-static/tools/boost-build/website/bootstrap/js/bootstrap.min.js
+x64-windows-static/tools/boost-build/website/index.css
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,78 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_chrono-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_chrono-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_chrono-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_chrono-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_chrono-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/chrono.hpp
+x64-windows/include/boost/chrono/
+x64-windows/include/boost/chrono/ceil.hpp
+x64-windows/include/boost/chrono/chrono.hpp
+x64-windows/include/boost/chrono/chrono_io.hpp
+x64-windows/include/boost/chrono/clock_string.hpp
+x64-windows/include/boost/chrono/config.hpp
+x64-windows/include/boost/chrono/detail/
+x64-windows/include/boost/chrono/detail/inlined/
+x64-windows/include/boost/chrono/detail/inlined/chrono.hpp
+x64-windows/include/boost/chrono/detail/inlined/mac/
+x64-windows/include/boost/chrono/detail/inlined/mac/chrono.hpp
+x64-windows/include/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/detail/inlined/mac/thread_clock.hpp
+x64-windows/include/boost/chrono/detail/inlined/posix/
+x64-windows/include/boost/chrono/detail/inlined/posix/chrono.hpp
+x64-windows/include/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/detail/inlined/posix/thread_clock.hpp
+x64-windows/include/boost/chrono/detail/inlined/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/detail/inlined/thread_clock.hpp
+x64-windows/include/boost/chrono/detail/inlined/win/
+x64-windows/include/boost/chrono/detail/inlined/win/chrono.hpp
+x64-windows/include/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/detail/inlined/win/thread_clock.hpp
+x64-windows/include/boost/chrono/detail/is_evenly_divisible_by.hpp
+x64-windows/include/boost/chrono/detail/no_warning/
+x64-windows/include/boost/chrono/detail/no_warning/signed_unsigned_cmp.hpp
+x64-windows/include/boost/chrono/detail/scan_keyword.hpp
+x64-windows/include/boost/chrono/detail/static_assert.hpp
+x64-windows/include/boost/chrono/detail/system.hpp
+x64-windows/include/boost/chrono/duration.hpp
+x64-windows/include/boost/chrono/floor.hpp
+x64-windows/include/boost/chrono/include.hpp
+x64-windows/include/boost/chrono/io/
+x64-windows/include/boost/chrono/io/duration_get.hpp
+x64-windows/include/boost/chrono/io/duration_io.hpp
+x64-windows/include/boost/chrono/io/duration_put.hpp
+x64-windows/include/boost/chrono/io/duration_style.hpp
+x64-windows/include/boost/chrono/io/duration_units.hpp
+x64-windows/include/boost/chrono/io/ios_base_state.hpp
+x64-windows/include/boost/chrono/io/time_point_get.hpp
+x64-windows/include/boost/chrono/io/time_point_io.hpp
+x64-windows/include/boost/chrono/io/time_point_put.hpp
+x64-windows/include/boost/chrono/io/time_point_units.hpp
+x64-windows/include/boost/chrono/io/timezone.hpp
+x64-windows/include/boost/chrono/io/utility/
+x64-windows/include/boost/chrono/io/utility/ios_base_state_ptr.hpp
+x64-windows/include/boost/chrono/io/utility/manip_base.hpp
+x64-windows/include/boost/chrono/io/utility/to_string.hpp
+x64-windows/include/boost/chrono/io_v1/
+x64-windows/include/boost/chrono/io_v1/chrono_io.hpp
+x64-windows/include/boost/chrono/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/round.hpp
+x64-windows/include/boost/chrono/system_clocks.hpp
+x64-windows/include/boost/chrono/thread_clock.hpp
+x64-windows/include/boost/chrono/time_point.hpp
+x64-windows/include/boost/chrono/typeof/
+x64-windows/include/boost/chrono/typeof/boost/
+x64-windows/include/boost/chrono/typeof/boost/chrono/
+x64-windows/include/boost/chrono/typeof/boost/chrono/chrono.hpp
+x64-windows/include/boost/chrono/typeof/boost/ratio.hpp
+x64-windows/lib/
+x64-windows/lib/boost_chrono-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-chrono/
+x64-windows/share/boost-chrono/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,72 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_chrono-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/chrono.hpp
+x64-windows-static/include/boost/chrono/
+x64-windows-static/include/boost/chrono/ceil.hpp
+x64-windows-static/include/boost/chrono/chrono.hpp
+x64-windows-static/include/boost/chrono/chrono_io.hpp
+x64-windows-static/include/boost/chrono/clock_string.hpp
+x64-windows-static/include/boost/chrono/config.hpp
+x64-windows-static/include/boost/chrono/detail/
+x64-windows-static/include/boost/chrono/detail/inlined/
+x64-windows-static/include/boost/chrono/detail/inlined/chrono.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/mac/
+x64-windows-static/include/boost/chrono/detail/inlined/mac/chrono.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/mac/thread_clock.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/posix/
+x64-windows-static/include/boost/chrono/detail/inlined/posix/chrono.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/posix/thread_clock.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/process_cpu_clocks.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/thread_clock.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/win/
+x64-windows-static/include/boost/chrono/detail/inlined/win/chrono.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp
+x64-windows-static/include/boost/chrono/detail/inlined/win/thread_clock.hpp
+x64-windows-static/include/boost/chrono/detail/is_evenly_divisible_by.hpp
+x64-windows-static/include/boost/chrono/detail/no_warning/
+x64-windows-static/include/boost/chrono/detail/no_warning/signed_unsigned_cmp.hpp
+x64-windows-static/include/boost/chrono/detail/scan_keyword.hpp
+x64-windows-static/include/boost/chrono/detail/static_assert.hpp
+x64-windows-static/include/boost/chrono/detail/system.hpp
+x64-windows-static/include/boost/chrono/duration.hpp
+x64-windows-static/include/boost/chrono/floor.hpp
+x64-windows-static/include/boost/chrono/include.hpp
+x64-windows-static/include/boost/chrono/io/
+x64-windows-static/include/boost/chrono/io/duration_get.hpp
+x64-windows-static/include/boost/chrono/io/duration_io.hpp
+x64-windows-static/include/boost/chrono/io/duration_put.hpp
+x64-windows-static/include/boost/chrono/io/duration_style.hpp
+x64-windows-static/include/boost/chrono/io/duration_units.hpp
+x64-windows-static/include/boost/chrono/io/ios_base_state.hpp
+x64-windows-static/include/boost/chrono/io/time_point_get.hpp
+x64-windows-static/include/boost/chrono/io/time_point_io.hpp
+x64-windows-static/include/boost/chrono/io/time_point_put.hpp
+x64-windows-static/include/boost/chrono/io/time_point_units.hpp
+x64-windows-static/include/boost/chrono/io/timezone.hpp
+x64-windows-static/include/boost/chrono/io/utility/
+x64-windows-static/include/boost/chrono/io/utility/ios_base_state_ptr.hpp
+x64-windows-static/include/boost/chrono/io/utility/manip_base.hpp
+x64-windows-static/include/boost/chrono/io/utility/to_string.hpp
+x64-windows-static/include/boost/chrono/io_v1/
+x64-windows-static/include/boost/chrono/io_v1/chrono_io.hpp
+x64-windows-static/include/boost/chrono/process_cpu_clocks.hpp
+x64-windows-static/include/boost/chrono/round.hpp
+x64-windows-static/include/boost/chrono/system_clocks.hpp
+x64-windows-static/include/boost/chrono/thread_clock.hpp
+x64-windows-static/include/boost/chrono/time_point.hpp
+x64-windows-static/include/boost/chrono/typeof/
+x64-windows-static/include/boost/chrono/typeof/boost/
+x64-windows-static/include/boost/chrono/typeof/boost/chrono/
+x64-windows-static/include/boost/chrono/typeof/boost/chrono/chrono.hpp
+x64-windows-static/include/boost/chrono/typeof/boost/ratio.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_chrono-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-chrono/
+x64-windows-static/share/boost-chrono/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/compatibility/
+x64-windows/include/boost/compatibility/cpp_c_headers/
+x64-windows/include/boost/compatibility/cpp_c_headers/cassert
+x64-windows/include/boost/compatibility/cpp_c_headers/cctype
+x64-windows/include/boost/compatibility/cpp_c_headers/cerrno
+x64-windows/include/boost/compatibility/cpp_c_headers/cfloat
+x64-windows/include/boost/compatibility/cpp_c_headers/climits
+x64-windows/include/boost/compatibility/cpp_c_headers/clocale
+x64-windows/include/boost/compatibility/cpp_c_headers/cmath
+x64-windows/include/boost/compatibility/cpp_c_headers/csetjmp
+x64-windows/include/boost/compatibility/cpp_c_headers/csignal
+x64-windows/include/boost/compatibility/cpp_c_headers/cstdarg
+x64-windows/include/boost/compatibility/cpp_c_headers/cstddef
+x64-windows/include/boost/compatibility/cpp_c_headers/cstdio
+x64-windows/include/boost/compatibility/cpp_c_headers/cstdlib
+x64-windows/include/boost/compatibility/cpp_c_headers/cstring
+x64-windows/include/boost/compatibility/cpp_c_headers/ctime
+x64-windows/include/boost/compatibility/cpp_c_headers/cwchar
+x64-windows/include/boost/compatibility/cpp_c_headers/cwctype
+x64-windows/share/
+x64-windows/share/boost-compatibility/
+x64-windows/share/boost-compatibility/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/compatibility/
+x64-windows-static/include/boost/compatibility/cpp_c_headers/
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cassert
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cctype
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cerrno
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cfloat
+x64-windows-static/include/boost/compatibility/cpp_c_headers/climits
+x64-windows-static/include/boost/compatibility/cpp_c_headers/clocale
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cmath
+x64-windows-static/include/boost/compatibility/cpp_c_headers/csetjmp
+x64-windows-static/include/boost/compatibility/cpp_c_headers/csignal
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cstdarg
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cstddef
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cstdio
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cstdlib
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cstring
+x64-windows-static/include/boost/compatibility/cpp_c_headers/ctime
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cwchar
+x64-windows-static/include/boost/compatibility/cpp_c_headers/cwctype
+x64-windows-static/share/
+x64-windows-static/share/boost-compatibility/
+x64-windows-static/share/boost-compatibility/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/concept/
+x64-windows/include/boost/concept/assert.hpp
+x64-windows/include/boost/concept/detail/
+x64-windows/include/boost/concept/detail/backward_compatibility.hpp
+x64-windows/include/boost/concept/detail/borland.hpp
+x64-windows/include/boost/concept/detail/concept_def.hpp
+x64-windows/include/boost/concept/detail/concept_undef.hpp
+x64-windows/include/boost/concept/detail/general.hpp
+x64-windows/include/boost/concept/detail/has_constraints.hpp
+x64-windows/include/boost/concept/detail/msvc.hpp
+x64-windows/include/boost/concept/requires.hpp
+x64-windows/include/boost/concept/usage.hpp
+x64-windows/include/boost/concept_archetype.hpp
+x64-windows/include/boost/concept_check.hpp
+x64-windows/include/boost/concept_check/
+x64-windows/include/boost/concept_check/borland.hpp
+x64-windows/include/boost/concept_check/general.hpp
+x64-windows/include/boost/concept_check/has_constraints.hpp
+x64-windows/include/boost/concept_check/msvc.hpp
+x64-windows/share/
+x64-windows/share/boost-concept-check/
+x64-windows/share/boost-concept-check/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/concept/
+x64-windows-static/include/boost/concept/assert.hpp
+x64-windows-static/include/boost/concept/detail/
+x64-windows-static/include/boost/concept/detail/backward_compatibility.hpp
+x64-windows-static/include/boost/concept/detail/borland.hpp
+x64-windows-static/include/boost/concept/detail/concept_def.hpp
+x64-windows-static/include/boost/concept/detail/concept_undef.hpp
+x64-windows-static/include/boost/concept/detail/general.hpp
+x64-windows-static/include/boost/concept/detail/has_constraints.hpp
+x64-windows-static/include/boost/concept/detail/msvc.hpp
+x64-windows-static/include/boost/concept/requires.hpp
+x64-windows-static/include/boost/concept/usage.hpp
+x64-windows-static/include/boost/concept_archetype.hpp
+x64-windows-static/include/boost/concept_check.hpp
+x64-windows-static/include/boost/concept_check/
+x64-windows-static/include/boost/concept_check/borland.hpp
+x64-windows-static/include/boost/concept_check/general.hpp
+x64-windows-static/include/boost/concept_check/has_constraints.hpp
+x64-windows-static/include/boost/concept_check/msvc.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-concept-check/
+x64-windows-static/share/boost-concept-check/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,115 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/config.hpp
+x64-windows/include/boost/config/
+x64-windows/include/boost/config/abi/
+x64-windows/include/boost/config/abi/borland_prefix.hpp
+x64-windows/include/boost/config/abi/borland_suffix.hpp
+x64-windows/include/boost/config/abi/msvc_prefix.hpp
+x64-windows/include/boost/config/abi/msvc_suffix.hpp
+x64-windows/include/boost/config/abi_prefix.hpp
+x64-windows/include/boost/config/abi_suffix.hpp
+x64-windows/include/boost/config/auto_link.hpp
+x64-windows/include/boost/config/compiler/
+x64-windows/include/boost/config/compiler/borland.hpp
+x64-windows/include/boost/config/compiler/clang.hpp
+x64-windows/include/boost/config/compiler/codegear.hpp
+x64-windows/include/boost/config/compiler/comeau.hpp
+x64-windows/include/boost/config/compiler/common_edg.hpp
+x64-windows/include/boost/config/compiler/compaq_cxx.hpp
+x64-windows/include/boost/config/compiler/cray.hpp
+x64-windows/include/boost/config/compiler/diab.hpp
+x64-windows/include/boost/config/compiler/digitalmars.hpp
+x64-windows/include/boost/config/compiler/gcc.hpp
+x64-windows/include/boost/config/compiler/gcc_xml.hpp
+x64-windows/include/boost/config/compiler/greenhills.hpp
+x64-windows/include/boost/config/compiler/hp_acc.hpp
+x64-windows/include/boost/config/compiler/intel.hpp
+x64-windows/include/boost/config/compiler/kai.hpp
+x64-windows/include/boost/config/compiler/metrowerks.hpp
+x64-windows/include/boost/config/compiler/mpw.hpp
+x64-windows/include/boost/config/compiler/nvcc.hpp
+x64-windows/include/boost/config/compiler/pathscale.hpp
+x64-windows/include/boost/config/compiler/pgi.hpp
+x64-windows/include/boost/config/compiler/sgi_mipspro.hpp
+x64-windows/include/boost/config/compiler/sunpro_cc.hpp
+x64-windows/include/boost/config/compiler/vacpp.hpp
+x64-windows/include/boost/config/compiler/visualc.hpp
+x64-windows/include/boost/config/compiler/xlcpp.hpp
+x64-windows/include/boost/config/compiler/xlcpp_zos.hpp
+x64-windows/include/boost/config/detail/
+x64-windows/include/boost/config/detail/posix_features.hpp
+x64-windows/include/boost/config/detail/select_compiler_config.hpp
+x64-windows/include/boost/config/detail/select_platform_config.hpp
+x64-windows/include/boost/config/detail/select_stdlib_config.hpp
+x64-windows/include/boost/config/detail/suffix.hpp
+x64-windows/include/boost/config/header_deprecated.hpp
+x64-windows/include/boost/config/helper_macros.hpp
+x64-windows/include/boost/config/no_tr1/
+x64-windows/include/boost/config/no_tr1/cmath.hpp
+x64-windows/include/boost/config/no_tr1/complex.hpp
+x64-windows/include/boost/config/no_tr1/functional.hpp
+x64-windows/include/boost/config/no_tr1/memory.hpp
+x64-windows/include/boost/config/no_tr1/utility.hpp
+x64-windows/include/boost/config/platform/
+x64-windows/include/boost/config/platform/aix.hpp
+x64-windows/include/boost/config/platform/amigaos.hpp
+x64-windows/include/boost/config/platform/beos.hpp
+x64-windows/include/boost/config/platform/bsd.hpp
+x64-windows/include/boost/config/platform/cloudabi.hpp
+x64-windows/include/boost/config/platform/cray.hpp
+x64-windows/include/boost/config/platform/cygwin.hpp
+x64-windows/include/boost/config/platform/haiku.hpp
+x64-windows/include/boost/config/platform/hpux.hpp
+x64-windows/include/boost/config/platform/irix.hpp
+x64-windows/include/boost/config/platform/linux.hpp
+x64-windows/include/boost/config/platform/macos.hpp
+x64-windows/include/boost/config/platform/qnxnto.hpp
+x64-windows/include/boost/config/platform/solaris.hpp
+x64-windows/include/boost/config/platform/symbian.hpp
+x64-windows/include/boost/config/platform/vms.hpp
+x64-windows/include/boost/config/platform/vxworks.hpp
+x64-windows/include/boost/config/platform/win32.hpp
+x64-windows/include/boost/config/platform/zos.hpp
+x64-windows/include/boost/config/pragma_message.hpp
+x64-windows/include/boost/config/requires_threads.hpp
+x64-windows/include/boost/config/stdlib/
+x64-windows/include/boost/config/stdlib/dinkumware.hpp
+x64-windows/include/boost/config/stdlib/libcomo.hpp
+x64-windows/include/boost/config/stdlib/libcpp.hpp
+x64-windows/include/boost/config/stdlib/libstdcpp3.hpp
+x64-windows/include/boost/config/stdlib/modena.hpp
+x64-windows/include/boost/config/stdlib/msl.hpp
+x64-windows/include/boost/config/stdlib/roguewave.hpp
+x64-windows/include/boost/config/stdlib/sgi.hpp
+x64-windows/include/boost/config/stdlib/stlport.hpp
+x64-windows/include/boost/config/stdlib/vacpp.hpp
+x64-windows/include/boost/config/stdlib/xlcpp_zos.hpp
+x64-windows/include/boost/config/user.hpp
+x64-windows/include/boost/config/warning_disable.hpp
+x64-windows/include/boost/config/workaround.hpp
+x64-windows/include/boost/cstdint.hpp
+x64-windows/include/boost/cxx11_char_types.hpp
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/workaround.hpp
+x64-windows/include/boost/limits.hpp
+x64-windows/include/boost/version.hpp
+x64-windows/share/
+x64-windows/share/boost-config/
+x64-windows/share/boost-config/checks/
+x64-windows/share/boost-config/checks/Jamfile.v2
+x64-windows/share/boost-config/checks/architecture/
+x64-windows/share/boost-config/checks/architecture/.gitignore
+x64-windows/share/boost-config/checks/architecture/32.cpp
+x64-windows/share/boost-config/checks/architecture/64.cpp
+x64-windows/share/boost-config/checks/architecture/Jamroot.jam
+x64-windows/share/boost-config/checks/architecture/arm.cpp
+x64-windows/share/boost-config/checks/architecture/combined.cpp
+x64-windows/share/boost-config/checks/architecture/mips1.cpp
+x64-windows/share/boost-config/checks/architecture/power.cpp
+x64-windows/share/boost-config/checks/architecture/sparc.cpp
+x64-windows/share/boost-config/checks/architecture/x86.cpp
+x64-windows/share/boost-config/checks/config.jam
+x64-windows/share/boost-config/checks/test_case.cpp
+x64-windows/share/boost-config/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-config_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,115 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/config.hpp
+x64-windows-static/include/boost/config/
+x64-windows-static/include/boost/config/abi/
+x64-windows-static/include/boost/config/abi/borland_prefix.hpp
+x64-windows-static/include/boost/config/abi/borland_suffix.hpp
+x64-windows-static/include/boost/config/abi/msvc_prefix.hpp
+x64-windows-static/include/boost/config/abi/msvc_suffix.hpp
+x64-windows-static/include/boost/config/abi_prefix.hpp
+x64-windows-static/include/boost/config/abi_suffix.hpp
+x64-windows-static/include/boost/config/auto_link.hpp
+x64-windows-static/include/boost/config/compiler/
+x64-windows-static/include/boost/config/compiler/borland.hpp
+x64-windows-static/include/boost/config/compiler/clang.hpp
+x64-windows-static/include/boost/config/compiler/codegear.hpp
+x64-windows-static/include/boost/config/compiler/comeau.hpp
+x64-windows-static/include/boost/config/compiler/common_edg.hpp
+x64-windows-static/include/boost/config/compiler/compaq_cxx.hpp
+x64-windows-static/include/boost/config/compiler/cray.hpp
+x64-windows-static/include/boost/config/compiler/diab.hpp
+x64-windows-static/include/boost/config/compiler/digitalmars.hpp
+x64-windows-static/include/boost/config/compiler/gcc.hpp
+x64-windows-static/include/boost/config/compiler/gcc_xml.hpp
+x64-windows-static/include/boost/config/compiler/greenhills.hpp
+x64-windows-static/include/boost/config/compiler/hp_acc.hpp
+x64-windows-static/include/boost/config/compiler/intel.hpp
+x64-windows-static/include/boost/config/compiler/kai.hpp
+x64-windows-static/include/boost/config/compiler/metrowerks.hpp
+x64-windows-static/include/boost/config/compiler/mpw.hpp
+x64-windows-static/include/boost/config/compiler/nvcc.hpp
+x64-windows-static/include/boost/config/compiler/pathscale.hpp
+x64-windows-static/include/boost/config/compiler/pgi.hpp
+x64-windows-static/include/boost/config/compiler/sgi_mipspro.hpp
+x64-windows-static/include/boost/config/compiler/sunpro_cc.hpp
+x64-windows-static/include/boost/config/compiler/vacpp.hpp
+x64-windows-static/include/boost/config/compiler/visualc.hpp
+x64-windows-static/include/boost/config/compiler/xlcpp.hpp
+x64-windows-static/include/boost/config/compiler/xlcpp_zos.hpp
+x64-windows-static/include/boost/config/detail/
+x64-windows-static/include/boost/config/detail/posix_features.hpp
+x64-windows-static/include/boost/config/detail/select_compiler_config.hpp
+x64-windows-static/include/boost/config/detail/select_platform_config.hpp
+x64-windows-static/include/boost/config/detail/select_stdlib_config.hpp
+x64-windows-static/include/boost/config/detail/suffix.hpp
+x64-windows-static/include/boost/config/header_deprecated.hpp
+x64-windows-static/include/boost/config/helper_macros.hpp
+x64-windows-static/include/boost/config/no_tr1/
+x64-windows-static/include/boost/config/no_tr1/cmath.hpp
+x64-windows-static/include/boost/config/no_tr1/complex.hpp
+x64-windows-static/include/boost/config/no_tr1/functional.hpp
+x64-windows-static/include/boost/config/no_tr1/memory.hpp
+x64-windows-static/include/boost/config/no_tr1/utility.hpp
+x64-windows-static/include/boost/config/platform/
+x64-windows-static/include/boost/config/platform/aix.hpp
+x64-windows-static/include/boost/config/platform/amigaos.hpp
+x64-windows-static/include/boost/config/platform/beos.hpp
+x64-windows-static/include/boost/config/platform/bsd.hpp
+x64-windows-static/include/boost/config/platform/cloudabi.hpp
+x64-windows-static/include/boost/config/platform/cray.hpp
+x64-windows-static/include/boost/config/platform/cygwin.hpp
+x64-windows-static/include/boost/config/platform/haiku.hpp
+x64-windows-static/include/boost/config/platform/hpux.hpp
+x64-windows-static/include/boost/config/platform/irix.hpp
+x64-windows-static/include/boost/config/platform/linux.hpp
+x64-windows-static/include/boost/config/platform/macos.hpp
+x64-windows-static/include/boost/config/platform/qnxnto.hpp
+x64-windows-static/include/boost/config/platform/solaris.hpp
+x64-windows-static/include/boost/config/platform/symbian.hpp
+x64-windows-static/include/boost/config/platform/vms.hpp
+x64-windows-static/include/boost/config/platform/vxworks.hpp
+x64-windows-static/include/boost/config/platform/win32.hpp
+x64-windows-static/include/boost/config/platform/zos.hpp
+x64-windows-static/include/boost/config/pragma_message.hpp
+x64-windows-static/include/boost/config/requires_threads.hpp
+x64-windows-static/include/boost/config/stdlib/
+x64-windows-static/include/boost/config/stdlib/dinkumware.hpp
+x64-windows-static/include/boost/config/stdlib/libcomo.hpp
+x64-windows-static/include/boost/config/stdlib/libcpp.hpp
+x64-windows-static/include/boost/config/stdlib/libstdcpp3.hpp
+x64-windows-static/include/boost/config/stdlib/modena.hpp
+x64-windows-static/include/boost/config/stdlib/msl.hpp
+x64-windows-static/include/boost/config/stdlib/roguewave.hpp
+x64-windows-static/include/boost/config/stdlib/sgi.hpp
+x64-windows-static/include/boost/config/stdlib/stlport.hpp
+x64-windows-static/include/boost/config/stdlib/vacpp.hpp
+x64-windows-static/include/boost/config/stdlib/xlcpp_zos.hpp
+x64-windows-static/include/boost/config/user.hpp
+x64-windows-static/include/boost/config/warning_disable.hpp
+x64-windows-static/include/boost/config/workaround.hpp
+x64-windows-static/include/boost/cstdint.hpp
+x64-windows-static/include/boost/cxx11_char_types.hpp
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/workaround.hpp
+x64-windows-static/include/boost/limits.hpp
+x64-windows-static/include/boost/version.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-config/
+x64-windows-static/share/boost-config/checks/
+x64-windows-static/share/boost-config/checks/Jamfile.v2
+x64-windows-static/share/boost-config/checks/architecture/
+x64-windows-static/share/boost-config/checks/architecture/.gitignore
+x64-windows-static/share/boost-config/checks/architecture/32.cpp
+x64-windows-static/share/boost-config/checks/architecture/64.cpp
+x64-windows-static/share/boost-config/checks/architecture/Jamroot.jam
+x64-windows-static/share/boost-config/checks/architecture/arm.cpp
+x64-windows-static/share/boost-config/checks/architecture/combined.cpp
+x64-windows-static/share/boost-config/checks/architecture/mips1.cpp
+x64-windows-static/share/boost-config/checks/architecture/power.cpp
+x64-windows-static/share/boost-config/checks/architecture/sparc.cpp
+x64-windows-static/share/boost-config/checks/architecture/x86.cpp
+x64-windows-static/share/boost-config/checks/config.jam
+x64-windows-static/share/boost-config/checks/test_case.cpp
+x64-windows-static/share/boost-config/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,120 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_container-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_container-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_container-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_container-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_container-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/container/
+x64-windows/include/boost/container/adaptive_pool.hpp
+x64-windows/include/boost/container/allocator.hpp
+x64-windows/include/boost/container/allocator_traits.hpp
+x64-windows/include/boost/container/container_fwd.hpp
+x64-windows/include/boost/container/deque.hpp
+x64-windows/include/boost/container/detail/
+x64-windows/include/boost/container/detail/adaptive_node_pool.hpp
+x64-windows/include/boost/container/detail/adaptive_node_pool_impl.hpp
+x64-windows/include/boost/container/detail/addressof.hpp
+x64-windows/include/boost/container/detail/advanced_insert_int.hpp
+x64-windows/include/boost/container/detail/algorithm.hpp
+x64-windows/include/boost/container/detail/alloc_helpers.hpp
+x64-windows/include/boost/container/detail/alloc_lib.h
+x64-windows/include/boost/container/detail/allocation_type.hpp
+x64-windows/include/boost/container/detail/allocator_version_traits.hpp
+x64-windows/include/boost/container/detail/auto_link.hpp
+x64-windows/include/boost/container/detail/block_list.hpp
+x64-windows/include/boost/container/detail/block_slist.hpp
+x64-windows/include/boost/container/detail/compare_functors.hpp
+x64-windows/include/boost/container/detail/config_begin.hpp
+x64-windows/include/boost/container/detail/config_end.hpp
+x64-windows/include/boost/container/detail/construct_in_place.hpp
+x64-windows/include/boost/container/detail/container_or_allocator_rebind.hpp
+x64-windows/include/boost/container/detail/container_rebind.hpp
+x64-windows/include/boost/container/detail/copy_move_algo.hpp
+x64-windows/include/boost/container/detail/destroyers.hpp
+x64-windows/include/boost/container/detail/dispatch_uses_allocator.hpp
+x64-windows/include/boost/container/detail/dlmalloc.hpp
+x64-windows/include/boost/container/detail/flat_tree.hpp
+x64-windows/include/boost/container/detail/function_detector.hpp
+x64-windows/include/boost/container/detail/is_container.hpp
+x64-windows/include/boost/container/detail/is_contiguous_container.hpp
+x64-windows/include/boost/container/detail/is_sorted.hpp
+x64-windows/include/boost/container/detail/iterator.hpp
+x64-windows/include/boost/container/detail/iterator_to_raw_pointer.hpp
+x64-windows/include/boost/container/detail/iterators.hpp
+x64-windows/include/boost/container/detail/math_functions.hpp
+x64-windows/include/boost/container/detail/min_max.hpp
+x64-windows/include/boost/container/detail/minimal_char_traits_header.hpp
+x64-windows/include/boost/container/detail/mpl.hpp
+x64-windows/include/boost/container/detail/multiallocation_chain.hpp
+x64-windows/include/boost/container/detail/mutex.hpp
+x64-windows/include/boost/container/detail/next_capacity.hpp
+x64-windows/include/boost/container/detail/node_alloc_holder.hpp
+x64-windows/include/boost/container/detail/node_pool.hpp
+x64-windows/include/boost/container/detail/node_pool_impl.hpp
+x64-windows/include/boost/container/detail/pair.hpp
+x64-windows/include/boost/container/detail/pair_key_mapped_of_value.hpp
+x64-windows/include/boost/container/detail/placement_new.hpp
+x64-windows/include/boost/container/detail/pool_common.hpp
+x64-windows/include/boost/container/detail/pool_common_alloc.hpp
+x64-windows/include/boost/container/detail/pool_resource.hpp
+x64-windows/include/boost/container/detail/singleton.hpp
+x64-windows/include/boost/container/detail/std_fwd.hpp
+x64-windows/include/boost/container/detail/transform_iterator.hpp
+x64-windows/include/boost/container/detail/tree.hpp
+x64-windows/include/boost/container/detail/type_traits.hpp
+x64-windows/include/boost/container/detail/value_functors.hpp
+x64-windows/include/boost/container/detail/value_init.hpp
+x64-windows/include/boost/container/detail/variadic_templates_tools.hpp
+x64-windows/include/boost/container/detail/version_type.hpp
+x64-windows/include/boost/container/detail/workaround.hpp
+x64-windows/include/boost/container/flat_map.hpp
+x64-windows/include/boost/container/flat_set.hpp
+x64-windows/include/boost/container/list.hpp
+x64-windows/include/boost/container/map.hpp
+x64-windows/include/boost/container/new_allocator.hpp
+x64-windows/include/boost/container/node_allocator.hpp
+x64-windows/include/boost/container/node_handle.hpp
+x64-windows/include/boost/container/options.hpp
+x64-windows/include/boost/container/pmr/
+x64-windows/include/boost/container/pmr/deque.hpp
+x64-windows/include/boost/container/pmr/flat_map.hpp
+x64-windows/include/boost/container/pmr/flat_set.hpp
+x64-windows/include/boost/container/pmr/global_resource.hpp
+x64-windows/include/boost/container/pmr/list.hpp
+x64-windows/include/boost/container/pmr/map.hpp
+x64-windows/include/boost/container/pmr/memory_resource.hpp
+x64-windows/include/boost/container/pmr/monotonic_buffer_resource.hpp
+x64-windows/include/boost/container/pmr/polymorphic_allocator.hpp
+x64-windows/include/boost/container/pmr/pool_options.hpp
+x64-windows/include/boost/container/pmr/resource_adaptor.hpp
+x64-windows/include/boost/container/pmr/set.hpp
+x64-windows/include/boost/container/pmr/slist.hpp
+x64-windows/include/boost/container/pmr/small_vector.hpp
+x64-windows/include/boost/container/pmr/stable_vector.hpp
+x64-windows/include/boost/container/pmr/string.hpp
+x64-windows/include/boost/container/pmr/synchronized_pool_resource.hpp
+x64-windows/include/boost/container/pmr/unsynchronized_pool_resource.hpp
+x64-windows/include/boost/container/pmr/vector.hpp
+x64-windows/include/boost/container/scoped_allocator.hpp
+x64-windows/include/boost/container/scoped_allocator_fwd.hpp
+x64-windows/include/boost/container/set.hpp
+x64-windows/include/boost/container/slist.hpp
+x64-windows/include/boost/container/small_vector.hpp
+x64-windows/include/boost/container/stable_vector.hpp
+x64-windows/include/boost/container/static_vector.hpp
+x64-windows/include/boost/container/string.hpp
+x64-windows/include/boost/container/throw_exception.hpp
+x64-windows/include/boost/container/uses_allocator.hpp
+x64-windows/include/boost/container/uses_allocator_fwd.hpp
+x64-windows/include/boost/container/vector.hpp
+x64-windows/lib/
+x64-windows/lib/boost_container-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-container/
+x64-windows/share/boost-container/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,114 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_container-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/container/
+x64-windows-static/include/boost/container/adaptive_pool.hpp
+x64-windows-static/include/boost/container/allocator.hpp
+x64-windows-static/include/boost/container/allocator_traits.hpp
+x64-windows-static/include/boost/container/container_fwd.hpp
+x64-windows-static/include/boost/container/deque.hpp
+x64-windows-static/include/boost/container/detail/
+x64-windows-static/include/boost/container/detail/adaptive_node_pool.hpp
+x64-windows-static/include/boost/container/detail/adaptive_node_pool_impl.hpp
+x64-windows-static/include/boost/container/detail/addressof.hpp
+x64-windows-static/include/boost/container/detail/advanced_insert_int.hpp
+x64-windows-static/include/boost/container/detail/algorithm.hpp
+x64-windows-static/include/boost/container/detail/alloc_helpers.hpp
+x64-windows-static/include/boost/container/detail/alloc_lib.h
+x64-windows-static/include/boost/container/detail/allocation_type.hpp
+x64-windows-static/include/boost/container/detail/allocator_version_traits.hpp
+x64-windows-static/include/boost/container/detail/auto_link.hpp
+x64-windows-static/include/boost/container/detail/block_list.hpp
+x64-windows-static/include/boost/container/detail/block_slist.hpp
+x64-windows-static/include/boost/container/detail/compare_functors.hpp
+x64-windows-static/include/boost/container/detail/config_begin.hpp
+x64-windows-static/include/boost/container/detail/config_end.hpp
+x64-windows-static/include/boost/container/detail/construct_in_place.hpp
+x64-windows-static/include/boost/container/detail/container_or_allocator_rebind.hpp
+x64-windows-static/include/boost/container/detail/container_rebind.hpp
+x64-windows-static/include/boost/container/detail/copy_move_algo.hpp
+x64-windows-static/include/boost/container/detail/destroyers.hpp
+x64-windows-static/include/boost/container/detail/dispatch_uses_allocator.hpp
+x64-windows-static/include/boost/container/detail/dlmalloc.hpp
+x64-windows-static/include/boost/container/detail/flat_tree.hpp
+x64-windows-static/include/boost/container/detail/function_detector.hpp
+x64-windows-static/include/boost/container/detail/is_container.hpp
+x64-windows-static/include/boost/container/detail/is_contiguous_container.hpp
+x64-windows-static/include/boost/container/detail/is_sorted.hpp
+x64-windows-static/include/boost/container/detail/iterator.hpp
+x64-windows-static/include/boost/container/detail/iterator_to_raw_pointer.hpp
+x64-windows-static/include/boost/container/detail/iterators.hpp
+x64-windows-static/include/boost/container/detail/math_functions.hpp
+x64-windows-static/include/boost/container/detail/min_max.hpp
+x64-windows-static/include/boost/container/detail/minimal_char_traits_header.hpp
+x64-windows-static/include/boost/container/detail/mpl.hpp
+x64-windows-static/include/boost/container/detail/multiallocation_chain.hpp
+x64-windows-static/include/boost/container/detail/mutex.hpp
+x64-windows-static/include/boost/container/detail/next_capacity.hpp
+x64-windows-static/include/boost/container/detail/node_alloc_holder.hpp
+x64-windows-static/include/boost/container/detail/node_pool.hpp
+x64-windows-static/include/boost/container/detail/node_pool_impl.hpp
+x64-windows-static/include/boost/container/detail/pair.hpp
+x64-windows-static/include/boost/container/detail/pair_key_mapped_of_value.hpp
+x64-windows-static/include/boost/container/detail/placement_new.hpp
+x64-windows-static/include/boost/container/detail/pool_common.hpp
+x64-windows-static/include/boost/container/detail/pool_common_alloc.hpp
+x64-windows-static/include/boost/container/detail/pool_resource.hpp
+x64-windows-static/include/boost/container/detail/singleton.hpp
+x64-windows-static/include/boost/container/detail/std_fwd.hpp
+x64-windows-static/include/boost/container/detail/transform_iterator.hpp
+x64-windows-static/include/boost/container/detail/tree.hpp
+x64-windows-static/include/boost/container/detail/type_traits.hpp
+x64-windows-static/include/boost/container/detail/value_functors.hpp
+x64-windows-static/include/boost/container/detail/value_init.hpp
+x64-windows-static/include/boost/container/detail/variadic_templates_tools.hpp
+x64-windows-static/include/boost/container/detail/version_type.hpp
+x64-windows-static/include/boost/container/detail/workaround.hpp
+x64-windows-static/include/boost/container/flat_map.hpp
+x64-windows-static/include/boost/container/flat_set.hpp
+x64-windows-static/include/boost/container/list.hpp
+x64-windows-static/include/boost/container/map.hpp
+x64-windows-static/include/boost/container/new_allocator.hpp
+x64-windows-static/include/boost/container/node_allocator.hpp
+x64-windows-static/include/boost/container/node_handle.hpp
+x64-windows-static/include/boost/container/options.hpp
+x64-windows-static/include/boost/container/pmr/
+x64-windows-static/include/boost/container/pmr/deque.hpp
+x64-windows-static/include/boost/container/pmr/flat_map.hpp
+x64-windows-static/include/boost/container/pmr/flat_set.hpp
+x64-windows-static/include/boost/container/pmr/global_resource.hpp
+x64-windows-static/include/boost/container/pmr/list.hpp
+x64-windows-static/include/boost/container/pmr/map.hpp
+x64-windows-static/include/boost/container/pmr/memory_resource.hpp
+x64-windows-static/include/boost/container/pmr/monotonic_buffer_resource.hpp
+x64-windows-static/include/boost/container/pmr/polymorphic_allocator.hpp
+x64-windows-static/include/boost/container/pmr/pool_options.hpp
+x64-windows-static/include/boost/container/pmr/resource_adaptor.hpp
+x64-windows-static/include/boost/container/pmr/set.hpp
+x64-windows-static/include/boost/container/pmr/slist.hpp
+x64-windows-static/include/boost/container/pmr/small_vector.hpp
+x64-windows-static/include/boost/container/pmr/stable_vector.hpp
+x64-windows-static/include/boost/container/pmr/string.hpp
+x64-windows-static/include/boost/container/pmr/synchronized_pool_resource.hpp
+x64-windows-static/include/boost/container/pmr/unsynchronized_pool_resource.hpp
+x64-windows-static/include/boost/container/pmr/vector.hpp
+x64-windows-static/include/boost/container/scoped_allocator.hpp
+x64-windows-static/include/boost/container/scoped_allocator_fwd.hpp
+x64-windows-static/include/boost/container/set.hpp
+x64-windows-static/include/boost/container/slist.hpp
+x64-windows-static/include/boost/container/small_vector.hpp
+x64-windows-static/include/boost/container/stable_vector.hpp
+x64-windows-static/include/boost/container/static_vector.hpp
+x64-windows-static/include/boost/container/string.hpp
+x64-windows-static/include/boost/container/throw_exception.hpp
+x64-windows-static/include/boost/container/uses_allocator.hpp
+x64-windows-static/include/boost/container/uses_allocator_fwd.hpp
+x64-windows-static/include/boost/container/vector.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_container-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-container/
+x64-windows-static/share/boost-container/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/container_hash/
+x64-windows/include/boost/container_hash/detail/
+x64-windows/include/boost/container_hash/detail/float_functions.hpp
+x64-windows/include/boost/container_hash/detail/hash_float.hpp
+x64-windows/include/boost/container_hash/detail/limits.hpp
+x64-windows/include/boost/container_hash/extensions.hpp
+x64-windows/include/boost/container_hash/hash.hpp
+x64-windows/include/boost/container_hash/hash_fwd.hpp
+x64-windows/include/boost/functional/
+x64-windows/include/boost/functional/hash.hpp
+x64-windows/include/boost/functional/hash/
+x64-windows/include/boost/functional/hash/extensions.hpp
+x64-windows/include/boost/functional/hash/hash.hpp
+x64-windows/include/boost/functional/hash/hash_fwd.hpp
+x64-windows/include/boost/functional/hash_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-container-hash/
+x64-windows/share/boost-container-hash/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/container_hash/
+x64-windows-static/include/boost/container_hash/detail/
+x64-windows-static/include/boost/container_hash/detail/float_functions.hpp
+x64-windows-static/include/boost/container_hash/detail/hash_float.hpp
+x64-windows-static/include/boost/container_hash/detail/limits.hpp
+x64-windows-static/include/boost/container_hash/extensions.hpp
+x64-windows-static/include/boost/container_hash/hash.hpp
+x64-windows-static/include/boost/container_hash/hash_fwd.hpp
+x64-windows-static/include/boost/functional/
+x64-windows-static/include/boost/functional/hash.hpp
+x64-windows-static/include/boost/functional/hash/
+x64-windows-static/include/boost/functional/hash/extensions.hpp
+x64-windows-static/include/boost/functional/hash/hash.hpp
+x64-windows-static/include/boost/functional/hash/hash_fwd.hpp
+x64-windows-static/include/boost/functional/hash_fwd.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-container-hash/
+x64-windows-static/share/boost-container-hash/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/implicit_cast.hpp
+x64-windows/include/boost/polymorphic_cast.hpp
+x64-windows/include/boost/polymorphic_pointer_cast.hpp
+x64-windows/share/
+x64-windows/share/boost-conversion/
+x64-windows/share/boost-conversion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/implicit_cast.hpp
+x64-windows-static/include/boost/polymorphic_cast.hpp
+x64-windows-static/include/boost/polymorphic_pointer_cast.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-conversion/
+x64-windows-static/share/boost-conversion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/checked_delete.hpp
+x64-windows/include/boost/core/
+x64-windows/include/boost/core/addressof.hpp
+x64-windows/include/boost/core/checked_delete.hpp
+x64-windows/include/boost/core/demangle.hpp
+x64-windows/include/boost/core/enable_if.hpp
+x64-windows/include/boost/core/explicit_operator_bool.hpp
+x64-windows/include/boost/core/ignore_unused.hpp
+x64-windows/include/boost/core/is_same.hpp
+x64-windows/include/boost/core/lightweight_test.hpp
+x64-windows/include/boost/core/lightweight_test_trait.hpp
+x64-windows/include/boost/core/no_exceptions_support.hpp
+x64-windows/include/boost/core/noncopyable.hpp
+x64-windows/include/boost/core/null_deleter.hpp
+x64-windows/include/boost/core/pointer_traits.hpp
+x64-windows/include/boost/core/ref.hpp
+x64-windows/include/boost/core/scoped_enum.hpp
+x64-windows/include/boost/core/swap.hpp
+x64-windows/include/boost/core/typeinfo.hpp
+x64-windows/include/boost/core/underlying_type.hpp
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/iterator.hpp
+x64-windows/include/boost/detail/lightweight_test.hpp
+x64-windows/include/boost/detail/no_exceptions_support.hpp
+x64-windows/include/boost/detail/scoped_enum_emulation.hpp
+x64-windows/include/boost/detail/sp_typeinfo.hpp
+x64-windows/include/boost/get_pointer.hpp
+x64-windows/include/boost/iterator.hpp
+x64-windows/include/boost/non_type.hpp
+x64-windows/include/boost/noncopyable.hpp
+x64-windows/include/boost/ref.hpp
+x64-windows/include/boost/swap.hpp
+x64-windows/include/boost/type.hpp
+x64-windows/include/boost/utility/
+x64-windows/include/boost/utility/addressof.hpp
+x64-windows/include/boost/utility/enable_if.hpp
+x64-windows/include/boost/utility/explicit_operator_bool.hpp
+x64-windows/include/boost/utility/swap.hpp
+x64-windows/include/boost/visit_each.hpp
+x64-windows/share/
+x64-windows/share/boost-core/
+x64-windows/share/boost-core/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-core_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/checked_delete.hpp
+x64-windows-static/include/boost/core/
+x64-windows-static/include/boost/core/addressof.hpp
+x64-windows-static/include/boost/core/checked_delete.hpp
+x64-windows-static/include/boost/core/demangle.hpp
+x64-windows-static/include/boost/core/enable_if.hpp
+x64-windows-static/include/boost/core/explicit_operator_bool.hpp
+x64-windows-static/include/boost/core/ignore_unused.hpp
+x64-windows-static/include/boost/core/is_same.hpp
+x64-windows-static/include/boost/core/lightweight_test.hpp
+x64-windows-static/include/boost/core/lightweight_test_trait.hpp
+x64-windows-static/include/boost/core/no_exceptions_support.hpp
+x64-windows-static/include/boost/core/noncopyable.hpp
+x64-windows-static/include/boost/core/null_deleter.hpp
+x64-windows-static/include/boost/core/pointer_traits.hpp
+x64-windows-static/include/boost/core/ref.hpp
+x64-windows-static/include/boost/core/scoped_enum.hpp
+x64-windows-static/include/boost/core/swap.hpp
+x64-windows-static/include/boost/core/typeinfo.hpp
+x64-windows-static/include/boost/core/underlying_type.hpp
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/iterator.hpp
+x64-windows-static/include/boost/detail/lightweight_test.hpp
+x64-windows-static/include/boost/detail/no_exceptions_support.hpp
+x64-windows-static/include/boost/detail/scoped_enum_emulation.hpp
+x64-windows-static/include/boost/detail/sp_typeinfo.hpp
+x64-windows-static/include/boost/get_pointer.hpp
+x64-windows-static/include/boost/iterator.hpp
+x64-windows-static/include/boost/non_type.hpp
+x64-windows-static/include/boost/noncopyable.hpp
+x64-windows-static/include/boost/ref.hpp
+x64-windows-static/include/boost/swap.hpp
+x64-windows-static/include/boost/type.hpp
+x64-windows-static/include/boost/utility/
+x64-windows-static/include/boost/utility/addressof.hpp
+x64-windows-static/include/boost/utility/enable_if.hpp
+x64-windows-static/include/boost/utility/explicit_operator_bool.hpp
+x64-windows-static/include/boost/utility/swap.hpp
+x64-windows-static/include/boost/visit_each.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-core/
+x64-windows-static/share/boost-core/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,125 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_date_time-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_date_time-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_date_time-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_date_time-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_date_time-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/date_time.hpp
+x64-windows/include/boost/date_time/
+x64-windows/include/boost/date_time/adjust_functors.hpp
+x64-windows/include/boost/date_time/c_local_time_adjustor.hpp
+x64-windows/include/boost/date_time/c_time.hpp
+x64-windows/include/boost/date_time/compiler_config.hpp
+x64-windows/include/boost/date_time/constrained_value.hpp
+x64-windows/include/boost/date_time/date.hpp
+x64-windows/include/boost/date_time/date_clock_device.hpp
+x64-windows/include/boost/date_time/date_defs.hpp
+x64-windows/include/boost/date_time/date_duration.hpp
+x64-windows/include/boost/date_time/date_duration_types.hpp
+x64-windows/include/boost/date_time/date_facet.hpp
+x64-windows/include/boost/date_time/date_format_simple.hpp
+x64-windows/include/boost/date_time/date_formatting.hpp
+x64-windows/include/boost/date_time/date_formatting_limited.hpp
+x64-windows/include/boost/date_time/date_formatting_locales.hpp
+x64-windows/include/boost/date_time/date_generator_formatter.hpp
+x64-windows/include/boost/date_time/date_generator_parser.hpp
+x64-windows/include/boost/date_time/date_generators.hpp
+x64-windows/include/boost/date_time/date_iterator.hpp
+x64-windows/include/boost/date_time/date_names_put.hpp
+x64-windows/include/boost/date_time/date_parsing.hpp
+x64-windows/include/boost/date_time/dst_rules.hpp
+x64-windows/include/boost/date_time/dst_transition_generators.hpp
+x64-windows/include/boost/date_time/filetime_functions.hpp
+x64-windows/include/boost/date_time/format_date_parser.hpp
+x64-windows/include/boost/date_time/gregorian/
+x64-windows/include/boost/date_time/gregorian/conversion.hpp
+x64-windows/include/boost/date_time/gregorian/formatters.hpp
+x64-windows/include/boost/date_time/gregorian/formatters_limited.hpp
+x64-windows/include/boost/date_time/gregorian/greg_calendar.hpp
+x64-windows/include/boost/date_time/gregorian/greg_date.hpp
+x64-windows/include/boost/date_time/gregorian/greg_day.hpp
+x64-windows/include/boost/date_time/gregorian/greg_day_of_year.hpp
+x64-windows/include/boost/date_time/gregorian/greg_duration.hpp
+x64-windows/include/boost/date_time/gregorian/greg_duration_types.hpp
+x64-windows/include/boost/date_time/gregorian/greg_facet.hpp
+x64-windows/include/boost/date_time/gregorian/greg_month.hpp
+x64-windows/include/boost/date_time/gregorian/greg_serialize.hpp
+x64-windows/include/boost/date_time/gregorian/greg_weekday.hpp
+x64-windows/include/boost/date_time/gregorian/greg_year.hpp
+x64-windows/include/boost/date_time/gregorian/greg_ymd.hpp
+x64-windows/include/boost/date_time/gregorian/gregorian.hpp
+x64-windows/include/boost/date_time/gregorian/gregorian_io.hpp
+x64-windows/include/boost/date_time/gregorian/gregorian_types.hpp
+x64-windows/include/boost/date_time/gregorian/parsers.hpp
+x64-windows/include/boost/date_time/gregorian_calendar.hpp
+x64-windows/include/boost/date_time/gregorian_calendar.ipp
+x64-windows/include/boost/date_time/int_adapter.hpp
+x64-windows/include/boost/date_time/iso_format.hpp
+x64-windows/include/boost/date_time/local_time/
+x64-windows/include/boost/date_time/local_time/conversion.hpp
+x64-windows/include/boost/date_time/local_time/custom_time_zone.hpp
+x64-windows/include/boost/date_time/local_time/date_duration_operators.hpp
+x64-windows/include/boost/date_time/local_time/dst_transition_day_rules.hpp
+x64-windows/include/boost/date_time/local_time/local_date_time.hpp
+x64-windows/include/boost/date_time/local_time/local_time.hpp
+x64-windows/include/boost/date_time/local_time/local_time_io.hpp
+x64-windows/include/boost/date_time/local_time/local_time_types.hpp
+x64-windows/include/boost/date_time/local_time/posix_time_zone.hpp
+x64-windows/include/boost/date_time/local_time/tz_database.hpp
+x64-windows/include/boost/date_time/local_time_adjustor.hpp
+x64-windows/include/boost/date_time/local_timezone_defs.hpp
+x64-windows/include/boost/date_time/locale_config.hpp
+x64-windows/include/boost/date_time/microsec_time_clock.hpp
+x64-windows/include/boost/date_time/parse_format_base.hpp
+x64-windows/include/boost/date_time/period.hpp
+x64-windows/include/boost/date_time/period_formatter.hpp
+x64-windows/include/boost/date_time/period_parser.hpp
+x64-windows/include/boost/date_time/posix_time/
+x64-windows/include/boost/date_time/posix_time/conversion.hpp
+x64-windows/include/boost/date_time/posix_time/date_duration_operators.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_config.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_duration.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_io.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_legacy_io.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_system.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_types.hpp
+x64-windows/include/boost/date_time/posix_time/ptime.hpp
+x64-windows/include/boost/date_time/posix_time/time_formatters.hpp
+x64-windows/include/boost/date_time/posix_time/time_formatters_limited.hpp
+x64-windows/include/boost/date_time/posix_time/time_parsers.hpp
+x64-windows/include/boost/date_time/posix_time/time_period.hpp
+x64-windows/include/boost/date_time/posix_time/time_serialize.hpp
+x64-windows/include/boost/date_time/special_defs.hpp
+x64-windows/include/boost/date_time/special_values_formatter.hpp
+x64-windows/include/boost/date_time/special_values_parser.hpp
+x64-windows/include/boost/date_time/string_convert.hpp
+x64-windows/include/boost/date_time/string_parse_tree.hpp
+x64-windows/include/boost/date_time/strings_from_facet.hpp
+x64-windows/include/boost/date_time/time.hpp
+x64-windows/include/boost/date_time/time_clock.hpp
+x64-windows/include/boost/date_time/time_defs.hpp
+x64-windows/include/boost/date_time/time_duration.hpp
+x64-windows/include/boost/date_time/time_facet.hpp
+x64-windows/include/boost/date_time/time_formatting_streams.hpp
+x64-windows/include/boost/date_time/time_iterator.hpp
+x64-windows/include/boost/date_time/time_parsing.hpp
+x64-windows/include/boost/date_time/time_resolution_traits.hpp
+x64-windows/include/boost/date_time/time_system_counted.hpp
+x64-windows/include/boost/date_time/time_system_split.hpp
+x64-windows/include/boost/date_time/time_zone_base.hpp
+x64-windows/include/boost/date_time/time_zone_names.hpp
+x64-windows/include/boost/date_time/tz_db_base.hpp
+x64-windows/include/boost/date_time/wrapping_int.hpp
+x64-windows/include/boost/date_time/year_month_day.hpp
+x64-windows/lib/
+x64-windows/lib/boost_date_time-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-date-time/
+x64-windows/share/boost-date-time/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,119 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_date_time-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/date_time.hpp
+x64-windows-static/include/boost/date_time/
+x64-windows-static/include/boost/date_time/adjust_functors.hpp
+x64-windows-static/include/boost/date_time/c_local_time_adjustor.hpp
+x64-windows-static/include/boost/date_time/c_time.hpp
+x64-windows-static/include/boost/date_time/compiler_config.hpp
+x64-windows-static/include/boost/date_time/constrained_value.hpp
+x64-windows-static/include/boost/date_time/date.hpp
+x64-windows-static/include/boost/date_time/date_clock_device.hpp
+x64-windows-static/include/boost/date_time/date_defs.hpp
+x64-windows-static/include/boost/date_time/date_duration.hpp
+x64-windows-static/include/boost/date_time/date_duration_types.hpp
+x64-windows-static/include/boost/date_time/date_facet.hpp
+x64-windows-static/include/boost/date_time/date_format_simple.hpp
+x64-windows-static/include/boost/date_time/date_formatting.hpp
+x64-windows-static/include/boost/date_time/date_formatting_limited.hpp
+x64-windows-static/include/boost/date_time/date_formatting_locales.hpp
+x64-windows-static/include/boost/date_time/date_generator_formatter.hpp
+x64-windows-static/include/boost/date_time/date_generator_parser.hpp
+x64-windows-static/include/boost/date_time/date_generators.hpp
+x64-windows-static/include/boost/date_time/date_iterator.hpp
+x64-windows-static/include/boost/date_time/date_names_put.hpp
+x64-windows-static/include/boost/date_time/date_parsing.hpp
+x64-windows-static/include/boost/date_time/dst_rules.hpp
+x64-windows-static/include/boost/date_time/dst_transition_generators.hpp
+x64-windows-static/include/boost/date_time/filetime_functions.hpp
+x64-windows-static/include/boost/date_time/format_date_parser.hpp
+x64-windows-static/include/boost/date_time/gregorian/
+x64-windows-static/include/boost/date_time/gregorian/conversion.hpp
+x64-windows-static/include/boost/date_time/gregorian/formatters.hpp
+x64-windows-static/include/boost/date_time/gregorian/formatters_limited.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_calendar.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_date.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_day.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_day_of_year.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_duration.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_duration_types.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_facet.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_month.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_serialize.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_weekday.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_year.hpp
+x64-windows-static/include/boost/date_time/gregorian/greg_ymd.hpp
+x64-windows-static/include/boost/date_time/gregorian/gregorian.hpp
+x64-windows-static/include/boost/date_time/gregorian/gregorian_io.hpp
+x64-windows-static/include/boost/date_time/gregorian/gregorian_types.hpp
+x64-windows-static/include/boost/date_time/gregorian/parsers.hpp
+x64-windows-static/include/boost/date_time/gregorian_calendar.hpp
+x64-windows-static/include/boost/date_time/gregorian_calendar.ipp
+x64-windows-static/include/boost/date_time/int_adapter.hpp
+x64-windows-static/include/boost/date_time/iso_format.hpp
+x64-windows-static/include/boost/date_time/local_time/
+x64-windows-static/include/boost/date_time/local_time/conversion.hpp
+x64-windows-static/include/boost/date_time/local_time/custom_time_zone.hpp
+x64-windows-static/include/boost/date_time/local_time/date_duration_operators.hpp
+x64-windows-static/include/boost/date_time/local_time/dst_transition_day_rules.hpp
+x64-windows-static/include/boost/date_time/local_time/local_date_time.hpp
+x64-windows-static/include/boost/date_time/local_time/local_time.hpp
+x64-windows-static/include/boost/date_time/local_time/local_time_io.hpp
+x64-windows-static/include/boost/date_time/local_time/local_time_types.hpp
+x64-windows-static/include/boost/date_time/local_time/posix_time_zone.hpp
+x64-windows-static/include/boost/date_time/local_time/tz_database.hpp
+x64-windows-static/include/boost/date_time/local_time_adjustor.hpp
+x64-windows-static/include/boost/date_time/local_timezone_defs.hpp
+x64-windows-static/include/boost/date_time/locale_config.hpp
+x64-windows-static/include/boost/date_time/microsec_time_clock.hpp
+x64-windows-static/include/boost/date_time/parse_format_base.hpp
+x64-windows-static/include/boost/date_time/period.hpp
+x64-windows-static/include/boost/date_time/period_formatter.hpp
+x64-windows-static/include/boost/date_time/period_parser.hpp
+x64-windows-static/include/boost/date_time/posix_time/
+x64-windows-static/include/boost/date_time/posix_time/conversion.hpp
+x64-windows-static/include/boost/date_time/posix_time/date_duration_operators.hpp
+x64-windows-static/include/boost/date_time/posix_time/posix_time.hpp
+x64-windows-static/include/boost/date_time/posix_time/posix_time_config.hpp
+x64-windows-static/include/boost/date_time/posix_time/posix_time_duration.hpp
+x64-windows-static/include/boost/date_time/posix_time/posix_time_io.hpp
+x64-windows-static/include/boost/date_time/posix_time/posix_time_legacy_io.hpp
+x64-windows-static/include/boost/date_time/posix_time/posix_time_system.hpp
+x64-windows-static/include/boost/date_time/posix_time/posix_time_types.hpp
+x64-windows-static/include/boost/date_time/posix_time/ptime.hpp
+x64-windows-static/include/boost/date_time/posix_time/time_formatters.hpp
+x64-windows-static/include/boost/date_time/posix_time/time_formatters_limited.hpp
+x64-windows-static/include/boost/date_time/posix_time/time_parsers.hpp
+x64-windows-static/include/boost/date_time/posix_time/time_period.hpp
+x64-windows-static/include/boost/date_time/posix_time/time_serialize.hpp
+x64-windows-static/include/boost/date_time/special_defs.hpp
+x64-windows-static/include/boost/date_time/special_values_formatter.hpp
+x64-windows-static/include/boost/date_time/special_values_parser.hpp
+x64-windows-static/include/boost/date_time/string_convert.hpp
+x64-windows-static/include/boost/date_time/string_parse_tree.hpp
+x64-windows-static/include/boost/date_time/strings_from_facet.hpp
+x64-windows-static/include/boost/date_time/time.hpp
+x64-windows-static/include/boost/date_time/time_clock.hpp
+x64-windows-static/include/boost/date_time/time_defs.hpp
+x64-windows-static/include/boost/date_time/time_duration.hpp
+x64-windows-static/include/boost/date_time/time_facet.hpp
+x64-windows-static/include/boost/date_time/time_formatting_streams.hpp
+x64-windows-static/include/boost/date_time/time_iterator.hpp
+x64-windows-static/include/boost/date_time/time_parsing.hpp
+x64-windows-static/include/boost/date_time/time_resolution_traits.hpp
+x64-windows-static/include/boost/date_time/time_system_counted.hpp
+x64-windows-static/include/boost/date_time/time_system_split.hpp
+x64-windows-static/include/boost/date_time/time_zone_base.hpp
+x64-windows-static/include/boost/date_time/time_zone_names.hpp
+x64-windows-static/include/boost/date_time/tz_db_base.hpp
+x64-windows-static/include/boost/date_time/wrapping_int.hpp
+x64-windows-static/include/boost/date_time/year_month_day.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_date_time-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-date-time/
+x64-windows-static/share/boost-date-time/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/blank.hpp
+x64-windows/include/boost/blank_fwd.hpp
+x64-windows/include/boost/cstdlib.hpp
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/allocator_utilities.hpp
+x64-windows/include/boost/detail/binary_search.hpp
+x64-windows/include/boost/detail/bitmask.hpp
+x64-windows/include/boost/detail/catch_exceptions.hpp
+x64-windows/include/boost/detail/container_fwd.hpp
+x64-windows/include/boost/detail/fenv.hpp
+x64-windows/include/boost/detail/has_default_constructor.hpp
+x64-windows/include/boost/detail/identifier.hpp
+x64-windows/include/boost/detail/indirect_traits.hpp
+x64-windows/include/boost/detail/is_incrementable.hpp
+x64-windows/include/boost/detail/is_sorted.hpp
+x64-windows/include/boost/detail/is_xxx.hpp
+x64-windows/include/boost/detail/lightweight_main.hpp
+x64-windows/include/boost/detail/lightweight_test_report.hpp
+x64-windows/include/boost/detail/named_template_params.hpp
+x64-windows/include/boost/detail/numeric_traits.hpp
+x64-windows/include/boost/detail/reference_content.hpp
+x64-windows/include/boost/detail/select_type.hpp
+x64-windows/include/boost/detail/templated_streams.hpp
+x64-windows/include/boost/detail/utf8_codecvt_facet.hpp
+x64-windows/include/boost/detail/utf8_codecvt_facet.ipp
+x64-windows/share/
+x64-windows/share/boost-detail/
+x64-windows/share/boost-detail/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-detail_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/blank.hpp
+x64-windows-static/include/boost/blank_fwd.hpp
+x64-windows-static/include/boost/cstdlib.hpp
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/allocator_utilities.hpp
+x64-windows-static/include/boost/detail/binary_search.hpp
+x64-windows-static/include/boost/detail/bitmask.hpp
+x64-windows-static/include/boost/detail/catch_exceptions.hpp
+x64-windows-static/include/boost/detail/container_fwd.hpp
+x64-windows-static/include/boost/detail/fenv.hpp
+x64-windows-static/include/boost/detail/has_default_constructor.hpp
+x64-windows-static/include/boost/detail/identifier.hpp
+x64-windows-static/include/boost/detail/indirect_traits.hpp
+x64-windows-static/include/boost/detail/is_incrementable.hpp
+x64-windows-static/include/boost/detail/is_sorted.hpp
+x64-windows-static/include/boost/detail/is_xxx.hpp
+x64-windows-static/include/boost/detail/lightweight_main.hpp
+x64-windows-static/include/boost/detail/lightweight_test_report.hpp
+x64-windows-static/include/boost/detail/named_template_params.hpp
+x64-windows-static/include/boost/detail/numeric_traits.hpp
+x64-windows-static/include/boost/detail/reference_content.hpp
+x64-windows-static/include/boost/detail/select_type.hpp
+x64-windows-static/include/boost/detail/templated_streams.hpp
+x64-windows-static/include/boost/detail/utf8_codecvt_facet.hpp
+x64-windows-static/include/boost/detail/utf8_codecvt_facet.ipp
+x64-windows-static/share/
+x64-windows-static/share/boost-detail/
+x64-windows-static/share/boost-detail/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/endian/
+x64-windows/include/boost/endian/arithmetic.hpp
+x64-windows/include/boost/endian/buffers.hpp
+x64-windows/include/boost/endian/conversion.hpp
+x64-windows/include/boost/endian/detail/
+x64-windows/include/boost/endian/detail/config.hpp
+x64-windows/include/boost/endian/detail/cover_operators.hpp
+x64-windows/include/boost/endian/detail/disable_warnings.hpp
+x64-windows/include/boost/endian/detail/disable_warnings_pop.hpp
+x64-windows/include/boost/endian/detail/intrinsic.hpp
+x64-windows/include/boost/endian/detail/lightweight_test.hpp
+x64-windows/include/boost/endian/endian.hpp
+x64-windows/include/boost/endian/std_pair.hpp
+x64-windows/share/
+x64-windows/share/boost-endian/
+x64-windows/share/boost-endian/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-endian_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/endian/
+x64-windows-static/include/boost/endian/arithmetic.hpp
+x64-windows-static/include/boost/endian/buffers.hpp
+x64-windows-static/include/boost/endian/conversion.hpp
+x64-windows-static/include/boost/endian/detail/
+x64-windows-static/include/boost/endian/detail/config.hpp
+x64-windows-static/include/boost/endian/detail/cover_operators.hpp
+x64-windows-static/include/boost/endian/detail/disable_warnings.hpp
+x64-windows-static/include/boost/endian/detail/disable_warnings_pop.hpp
+x64-windows-static/include/boost/endian/detail/intrinsic.hpp
+x64-windows-static/include/boost/endian/detail/lightweight_test.hpp
+x64-windows-static/include/boost/endian/endian.hpp
+x64-windows-static/include/boost/endian/std_pair.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-endian/
+x64-windows-static/share/boost-endian/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+x64-windows/
+x64-windows/debug/
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_exception-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/exception/
+x64-windows/include/boost/exception/all.hpp
+x64-windows/include/boost/exception/current_exception_cast.hpp
+x64-windows/include/boost/exception/detail/
+x64-windows/include/boost/exception/detail/clone_current_exception.hpp
+x64-windows/include/boost/exception/detail/error_info_impl.hpp
+x64-windows/include/boost/exception/detail/exception_ptr.hpp
+x64-windows/include/boost/exception/detail/is_output_streamable.hpp
+x64-windows/include/boost/exception/detail/object_hex_dump.hpp
+x64-windows/include/boost/exception/detail/shared_ptr.hpp
+x64-windows/include/boost/exception/detail/type_info.hpp
+x64-windows/include/boost/exception/diagnostic_information.hpp
+x64-windows/include/boost/exception/enable_current_exception.hpp
+x64-windows/include/boost/exception/enable_error_info.hpp
+x64-windows/include/boost/exception/errinfo_api_function.hpp
+x64-windows/include/boost/exception/errinfo_at_line.hpp
+x64-windows/include/boost/exception/errinfo_errno.hpp
+x64-windows/include/boost/exception/errinfo_file_handle.hpp
+x64-windows/include/boost/exception/errinfo_file_name.hpp
+x64-windows/include/boost/exception/errinfo_file_open_mode.hpp
+x64-windows/include/boost/exception/errinfo_nested_exception.hpp
+x64-windows/include/boost/exception/errinfo_type_info_name.hpp
+x64-windows/include/boost/exception/error_info.hpp
+x64-windows/include/boost/exception/get_error_info.hpp
+x64-windows/include/boost/exception/info.hpp
+x64-windows/include/boost/exception/info_tuple.hpp
+x64-windows/include/boost/exception/to_string.hpp
+x64-windows/include/boost/exception/to_string_stub.hpp
+x64-windows/include/boost/exception_ptr.hpp
+x64-windows/lib/
+x64-windows/lib/boost_exception-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-exception/
+x64-windows/share/boost-exception/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-exception_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_exception-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/exception/
+x64-windows-static/include/boost/exception/all.hpp
+x64-windows-static/include/boost/exception/current_exception_cast.hpp
+x64-windows-static/include/boost/exception/detail/
+x64-windows-static/include/boost/exception/detail/clone_current_exception.hpp
+x64-windows-static/include/boost/exception/detail/error_info_impl.hpp
+x64-windows-static/include/boost/exception/detail/exception_ptr.hpp
+x64-windows-static/include/boost/exception/detail/is_output_streamable.hpp
+x64-windows-static/include/boost/exception/detail/object_hex_dump.hpp
+x64-windows-static/include/boost/exception/detail/shared_ptr.hpp
+x64-windows-static/include/boost/exception/detail/type_info.hpp
+x64-windows-static/include/boost/exception/diagnostic_information.hpp
+x64-windows-static/include/boost/exception/enable_current_exception.hpp
+x64-windows-static/include/boost/exception/enable_error_info.hpp
+x64-windows-static/include/boost/exception/errinfo_api_function.hpp
+x64-windows-static/include/boost/exception/errinfo_at_line.hpp
+x64-windows-static/include/boost/exception/errinfo_errno.hpp
+x64-windows-static/include/boost/exception/errinfo_file_handle.hpp
+x64-windows-static/include/boost/exception/errinfo_file_name.hpp
+x64-windows-static/include/boost/exception/errinfo_file_open_mode.hpp
+x64-windows-static/include/boost/exception/errinfo_nested_exception.hpp
+x64-windows-static/include/boost/exception/errinfo_type_info_name.hpp
+x64-windows-static/include/boost/exception/error_info.hpp
+x64-windows-static/include/boost/exception/get_error_info.hpp
+x64-windows-static/include/boost/exception/info.hpp
+x64-windows-static/include/boost/exception/info_tuple.hpp
+x64-windows-static/include/boost/exception/to_string.hpp
+x64-windows-static/include/boost/exception/to_string_stub.hpp
+x64-windows-static/include/boost/exception_ptr.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_exception-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-exception/
+x64-windows-static/share/boost-exception/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_filesystem-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_filesystem-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_filesystem-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_filesystem-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_filesystem-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/filesystem.hpp
+x64-windows/include/boost/filesystem/
+x64-windows/include/boost/filesystem/config.hpp
+x64-windows/include/boost/filesystem/convenience.hpp
+x64-windows/include/boost/filesystem/detail/
+x64-windows/include/boost/filesystem/detail/macro_value.hpp
+x64-windows/include/boost/filesystem/detail/utf8_codecvt_facet.hpp
+x64-windows/include/boost/filesystem/exception.hpp
+x64-windows/include/boost/filesystem/fstream.hpp
+x64-windows/include/boost/filesystem/operations.hpp
+x64-windows/include/boost/filesystem/path.hpp
+x64-windows/include/boost/filesystem/path_traits.hpp
+x64-windows/include/boost/filesystem/string_file.hpp
+x64-windows/lib/
+x64-windows/lib/boost_filesystem-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-filesystem/
+x64-windows/share/boost-filesystem/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_filesystem-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/filesystem.hpp
+x64-windows-static/include/boost/filesystem/
+x64-windows-static/include/boost/filesystem/config.hpp
+x64-windows-static/include/boost/filesystem/convenience.hpp
+x64-windows-static/include/boost/filesystem/detail/
+x64-windows-static/include/boost/filesystem/detail/macro_value.hpp
+x64-windows-static/include/boost/filesystem/detail/utf8_codecvt_facet.hpp
+x64-windows-static/include/boost/filesystem/exception.hpp
+x64-windows-static/include/boost/filesystem/fstream.hpp
+x64-windows-static/include/boost/filesystem/operations.hpp
+x64-windows-static/include/boost/filesystem/path.hpp
+x64-windows-static/include/boost/filesystem/path_traits.hpp
+x64-windows-static/include/boost/filesystem/string_file.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_filesystem-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-filesystem/
+x64-windows-static/share/boost-filesystem/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/foreach.hpp
+x64-windows/include/boost/foreach_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-foreach/
+x64-windows/share/boost-foreach/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/foreach.hpp
+x64-windows-static/include/boost/foreach_fwd.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-foreach/
+x64-windows-static/share/boost-foreach/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/format.hpp
+x64-windows/include/boost/format/
+x64-windows/include/boost/format/alt_sstream.hpp
+x64-windows/include/boost/format/alt_sstream_impl.hpp
+x64-windows/include/boost/format/detail/
+x64-windows/include/boost/format/detail/compat_workarounds.hpp
+x64-windows/include/boost/format/detail/config_macros.hpp
+x64-windows/include/boost/format/detail/msvc_disambiguater.hpp
+x64-windows/include/boost/format/detail/unset_macros.hpp
+x64-windows/include/boost/format/detail/workarounds_gcc-2_95.hpp
+x64-windows/include/boost/format/detail/workarounds_stlport.hpp
+x64-windows/include/boost/format/exceptions.hpp
+x64-windows/include/boost/format/feed_args.hpp
+x64-windows/include/boost/format/format_class.hpp
+x64-windows/include/boost/format/format_fwd.hpp
+x64-windows/include/boost/format/format_implementation.hpp
+x64-windows/include/boost/format/free_funcs.hpp
+x64-windows/include/boost/format/group.hpp
+x64-windows/include/boost/format/internals.hpp
+x64-windows/include/boost/format/internals_fwd.hpp
+x64-windows/include/boost/format/parsing.hpp
+x64-windows/share/
+x64-windows/share/boost-format/
+x64-windows/share/boost-format/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-format_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/format.hpp
+x64-windows-static/include/boost/format/
+x64-windows-static/include/boost/format/alt_sstream.hpp
+x64-windows-static/include/boost/format/alt_sstream_impl.hpp
+x64-windows-static/include/boost/format/detail/
+x64-windows-static/include/boost/format/detail/compat_workarounds.hpp
+x64-windows-static/include/boost/format/detail/config_macros.hpp
+x64-windows-static/include/boost/format/detail/msvc_disambiguater.hpp
+x64-windows-static/include/boost/format/detail/unset_macros.hpp
+x64-windows-static/include/boost/format/detail/workarounds_gcc-2_95.hpp
+x64-windows-static/include/boost/format/detail/workarounds_stlport.hpp
+x64-windows-static/include/boost/format/exceptions.hpp
+x64-windows-static/include/boost/format/feed_args.hpp
+x64-windows-static/include/boost/format/format_class.hpp
+x64-windows-static/include/boost/format/format_fwd.hpp
+x64-windows-static/include/boost/format/format_implementation.hpp
+x64-windows-static/include/boost/format/free_funcs.hpp
+x64-windows-static/include/boost/format/group.hpp
+x64-windows-static/include/boost/format/internals.hpp
+x64-windows-static/include/boost/format/internals_fwd.hpp
+x64-windows-static/include/boost/format/parsing.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-format/
+x64-windows-static/share/boost-format/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/function.hpp
+x64-windows/include/boost/function/
+x64-windows/include/boost/function/detail/
+x64-windows/include/boost/function/detail/function_iterate.hpp
+x64-windows/include/boost/function/detail/gen_maybe_include.pl
+x64-windows/include/boost/function/detail/maybe_include.hpp
+x64-windows/include/boost/function/detail/prologue.hpp
+x64-windows/include/boost/function/function0.hpp
+x64-windows/include/boost/function/function1.hpp
+x64-windows/include/boost/function/function10.hpp
+x64-windows/include/boost/function/function2.hpp
+x64-windows/include/boost/function/function3.hpp
+x64-windows/include/boost/function/function4.hpp
+x64-windows/include/boost/function/function5.hpp
+x64-windows/include/boost/function/function6.hpp
+x64-windows/include/boost/function/function7.hpp
+x64-windows/include/boost/function/function8.hpp
+x64-windows/include/boost/function/function9.hpp
+x64-windows/include/boost/function/function_base.hpp
+x64-windows/include/boost/function/function_fwd.hpp
+x64-windows/include/boost/function/function_template.hpp
+x64-windows/include/boost/function/function_typeof.hpp
+x64-windows/include/boost/function/gen_function_N.pl
+x64-windows/include/boost/function_equal.hpp
+x64-windows/share/
+x64-windows/share/boost-function/
+x64-windows/share/boost-function/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/function.hpp
+x64-windows-static/include/boost/function/
+x64-windows-static/include/boost/function/detail/
+x64-windows-static/include/boost/function/detail/function_iterate.hpp
+x64-windows-static/include/boost/function/detail/gen_maybe_include.pl
+x64-windows-static/include/boost/function/detail/maybe_include.hpp
+x64-windows-static/include/boost/function/detail/prologue.hpp
+x64-windows-static/include/boost/function/function0.hpp
+x64-windows-static/include/boost/function/function1.hpp
+x64-windows-static/include/boost/function/function10.hpp
+x64-windows-static/include/boost/function/function2.hpp
+x64-windows-static/include/boost/function/function3.hpp
+x64-windows-static/include/boost/function/function4.hpp
+x64-windows-static/include/boost/function/function5.hpp
+x64-windows-static/include/boost/function/function6.hpp
+x64-windows-static/include/boost/function/function7.hpp
+x64-windows-static/include/boost/function/function8.hpp
+x64-windows-static/include/boost/function/function9.hpp
+x64-windows-static/include/boost/function/function_base.hpp
+x64-windows-static/include/boost/function/function_fwd.hpp
+x64-windows-static/include/boost/function/function_template.hpp
+x64-windows-static/include/boost/function/function_typeof.hpp
+x64-windows-static/include/boost/function/gen_function_N.pl
+x64-windows-static/include/boost/function_equal.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-function/
+x64-windows-static/share/boost-function/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/functional.hpp
+x64-windows/include/boost/functional/
+x64-windows/include/boost/functional/factory.hpp
+x64-windows/include/boost/functional/forward_adapter.hpp
+x64-windows/include/boost/functional/lightweight_forward_adapter.hpp
+x64-windows/include/boost/functional/overloaded_function.hpp
+x64-windows/include/boost/functional/overloaded_function/
+x64-windows/include/boost/functional/overloaded_function/config.hpp
+x64-windows/include/boost/functional/overloaded_function/detail/
+x64-windows/include/boost/functional/overloaded_function/detail/base.hpp
+x64-windows/include/boost/functional/overloaded_function/detail/function_type.hpp
+x64-windows/include/boost/functional/value_factory.hpp
+x64-windows/share/
+x64-windows/share/boost-functional/
+x64-windows/share/boost-functional/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-functional_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/functional.hpp
+x64-windows-static/include/boost/functional/
+x64-windows-static/include/boost/functional/factory.hpp
+x64-windows-static/include/boost/functional/forward_adapter.hpp
+x64-windows-static/include/boost/functional/lightweight_forward_adapter.hpp
+x64-windows-static/include/boost/functional/overloaded_function.hpp
+x64-windows-static/include/boost/functional/overloaded_function/
+x64-windows-static/include/boost/functional/overloaded_function/config.hpp
+x64-windows-static/include/boost/functional/overloaded_function/detail/
+x64-windows-static/include/boost/functional/overloaded_function/detail/base.hpp
+x64-windows-static/include/boost/functional/overloaded_function/detail/function_type.hpp
+x64-windows-static/include/boost/functional/value_factory.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-functional/
+x64-windows-static/share/boost-functional/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/function_types/
+x64-windows/include/boost/function_types/components.hpp
+x64-windows/include/boost/function_types/config/
+x64-windows/include/boost/function_types/config/cc_names.hpp
+x64-windows/include/boost/function_types/config/compiler.hpp
+x64-windows/include/boost/function_types/config/config.hpp
+x64-windows/include/boost/function_types/detail/
+x64-windows/include/boost/function_types/detail/class_transform.hpp
+x64-windows/include/boost/function_types/detail/classifier.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/
+x64-windows/include/boost/function_types/detail/classifier_impl/arity10_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity10_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity20_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity20_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity30_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity30_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity40_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity40_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity50_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity50_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/master.hpp
+x64-windows/include/boost/function_types/detail/components_as_mpl_sequence.hpp
+x64-windows/include/boost/function_types/detail/components_impl/
+x64-windows/include/boost/function_types/detail/components_impl/arity10_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity10_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity20_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity20_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity30_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity30_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity40_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity40_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity50_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity50_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/master.hpp
+x64-windows/include/boost/function_types/detail/cv_traits.hpp
+x64-windows/include/boost/function_types/detail/encoding/
+x64-windows/include/boost/function_types/detail/encoding/aliases_def.hpp
+x64-windows/include/boost/function_types/detail/encoding/aliases_undef.hpp
+x64-windows/include/boost/function_types/detail/encoding/def.hpp
+x64-windows/include/boost/function_types/detail/encoding/undef.hpp
+x64-windows/include/boost/function_types/detail/pp_arity_loop.hpp
+x64-windows/include/boost/function_types/detail/pp_cc_loop/
+x64-windows/include/boost/function_types/detail/pp_cc_loop/master.hpp
+x64-windows/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp
+x64-windows/include/boost/function_types/detail/pp_loop.hpp
+x64-windows/include/boost/function_types/detail/pp_retag_default_cc/
+x64-windows/include/boost/function_types/detail/pp_retag_default_cc/master.hpp
+x64-windows/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp
+x64-windows/include/boost/function_types/detail/pp_tags/
+x64-windows/include/boost/function_types/detail/pp_tags/cc_tag.hpp
+x64-windows/include/boost/function_types/detail/pp_tags/master.hpp
+x64-windows/include/boost/function_types/detail/pp_tags/preprocessed.hpp
+x64-windows/include/boost/function_types/detail/pp_variate_loop/
+x64-windows/include/boost/function_types/detail/pp_variate_loop/master.hpp
+x64-windows/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp
+x64-windows/include/boost/function_types/detail/retag_default_cc.hpp
+x64-windows/include/boost/function_types/detail/synthesize.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity10_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity10_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity20_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity20_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity30_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity30_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity40_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity40_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity50_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity50_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/master.hpp
+x64-windows/include/boost/function_types/detail/to_sequence.hpp
+x64-windows/include/boost/function_types/function_arity.hpp
+x64-windows/include/boost/function_types/function_pointer.hpp
+x64-windows/include/boost/function_types/function_reference.hpp
+x64-windows/include/boost/function_types/function_type.hpp
+x64-windows/include/boost/function_types/is_callable_builtin.hpp
+x64-windows/include/boost/function_types/is_function.hpp
+x64-windows/include/boost/function_types/is_function_pointer.hpp
+x64-windows/include/boost/function_types/is_function_reference.hpp
+x64-windows/include/boost/function_types/is_member_function_pointer.hpp
+x64-windows/include/boost/function_types/is_member_object_pointer.hpp
+x64-windows/include/boost/function_types/is_member_pointer.hpp
+x64-windows/include/boost/function_types/is_nonmember_callable_builtin.hpp
+x64-windows/include/boost/function_types/member_function_pointer.hpp
+x64-windows/include/boost/function_types/member_object_pointer.hpp
+x64-windows/include/boost/function_types/parameter_types.hpp
+x64-windows/include/boost/function_types/property_tags.hpp
+x64-windows/include/boost/function_types/result_type.hpp
+x64-windows/share/
+x64-windows/share/boost-function-types/
+x64-windows/share/boost-function-types/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/function_types/
+x64-windows-static/include/boost/function_types/components.hpp
+x64-windows-static/include/boost/function_types/config/
+x64-windows-static/include/boost/function_types/config/cc_names.hpp
+x64-windows-static/include/boost/function_types/config/compiler.hpp
+x64-windows-static/include/boost/function_types/config/config.hpp
+x64-windows-static/include/boost/function_types/detail/
+x64-windows-static/include/boost/function_types/detail/class_transform.hpp
+x64-windows-static/include/boost/function_types/detail/classifier.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity10_0.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity10_1.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity20_0.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity20_1.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity30_0.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity30_1.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity40_0.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity40_1.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity50_0.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/arity50_1.hpp
+x64-windows-static/include/boost/function_types/detail/classifier_impl/master.hpp
+x64-windows-static/include/boost/function_types/detail/components_as_mpl_sequence.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/
+x64-windows-static/include/boost/function_types/detail/components_impl/arity10_0.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity10_1.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity20_0.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity20_1.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity30_0.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity30_1.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity40_0.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity40_1.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity50_0.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/arity50_1.hpp
+x64-windows-static/include/boost/function_types/detail/components_impl/master.hpp
+x64-windows-static/include/boost/function_types/detail/cv_traits.hpp
+x64-windows-static/include/boost/function_types/detail/encoding/
+x64-windows-static/include/boost/function_types/detail/encoding/aliases_def.hpp
+x64-windows-static/include/boost/function_types/detail/encoding/aliases_undef.hpp
+x64-windows-static/include/boost/function_types/detail/encoding/def.hpp
+x64-windows-static/include/boost/function_types/detail/encoding/undef.hpp
+x64-windows-static/include/boost/function_types/detail/pp_arity_loop.hpp
+x64-windows-static/include/boost/function_types/detail/pp_cc_loop/
+x64-windows-static/include/boost/function_types/detail/pp_cc_loop/master.hpp
+x64-windows-static/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp
+x64-windows-static/include/boost/function_types/detail/pp_loop.hpp
+x64-windows-static/include/boost/function_types/detail/pp_retag_default_cc/
+x64-windows-static/include/boost/function_types/detail/pp_retag_default_cc/master.hpp
+x64-windows-static/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp
+x64-windows-static/include/boost/function_types/detail/pp_tags/
+x64-windows-static/include/boost/function_types/detail/pp_tags/cc_tag.hpp
+x64-windows-static/include/boost/function_types/detail/pp_tags/master.hpp
+x64-windows-static/include/boost/function_types/detail/pp_tags/preprocessed.hpp
+x64-windows-static/include/boost/function_types/detail/pp_variate_loop/
+x64-windows-static/include/boost/function_types/detail/pp_variate_loop/master.hpp
+x64-windows-static/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp
+x64-windows-static/include/boost/function_types/detail/retag_default_cc.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity10_0.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity10_1.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity20_0.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity20_1.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity30_0.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity30_1.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity40_0.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity40_1.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity50_0.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/arity50_1.hpp
+x64-windows-static/include/boost/function_types/detail/synthesize_impl/master.hpp
+x64-windows-static/include/boost/function_types/detail/to_sequence.hpp
+x64-windows-static/include/boost/function_types/function_arity.hpp
+x64-windows-static/include/boost/function_types/function_pointer.hpp
+x64-windows-static/include/boost/function_types/function_reference.hpp
+x64-windows-static/include/boost/function_types/function_type.hpp
+x64-windows-static/include/boost/function_types/is_callable_builtin.hpp
+x64-windows-static/include/boost/function_types/is_function.hpp
+x64-windows-static/include/boost/function_types/is_function_pointer.hpp
+x64-windows-static/include/boost/function_types/is_function_reference.hpp
+x64-windows-static/include/boost/function_types/is_member_function_pointer.hpp
+x64-windows-static/include/boost/function_types/is_member_object_pointer.hpp
+x64-windows-static/include/boost/function_types/is_member_pointer.hpp
+x64-windows-static/include/boost/function_types/is_nonmember_callable_builtin.hpp
+x64-windows-static/include/boost/function_types/member_function_pointer.hpp
+x64-windows-static/include/boost/function_types/member_object_pointer.hpp
+x64-windows-static/include/boost/function_types/parameter_types.hpp
+x64-windows-static/include/boost/function_types/property_tags.hpp
+x64-windows-static/include/boost/function_types/result_type.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-function-types/
+x64-windows-static/share/boost-function-types/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1125 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/fusion/
+x64-windows/include/boost/fusion/adapted.hpp
+x64-windows/include/boost/fusion/adapted/
+x64-windows/include/boost/fusion/adapted/adt.hpp
+x64-windows/include/boost/fusion/adapted/adt/
+x64-windows/include/boost/fusion/adapted/adt/adapt_adt.hpp
+x64-windows/include/boost/fusion/adapted/adt/adapt_adt_named.hpp
+x64-windows/include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp
+x64-windows/include/boost/fusion/adapted/adt/adapt_assoc_adt_named.hpp
+x64-windows/include/boost/fusion/adapted/adt/detail/
+x64-windows/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
+x64-windows/include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp
+x64-windows/include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp
+x64-windows/include/boost/fusion/adapted/adt/detail/extension.hpp
+x64-windows/include/boost/fusion/adapted/array.hpp
+x64-windows/include/boost/fusion/adapted/array/
+x64-windows/include/boost/fusion/adapted/array/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/deref_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/array/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/value_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/
+x64-windows/include/boost/fusion/adapted/boost_array/array_iterator.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/
+x64-windows/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/
+x64-windows/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/build_cons.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/mpl/
+x64-windows/include/boost/fusion/adapted/boost_tuple/mpl/clear.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/mpl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/
+x64-windows/include/boost/fusion/adapted/mpl/detail/
+x64-windows/include/boost/fusion/adapted/mpl/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/mpl_iterator.hpp
+x64-windows/include/boost/fusion/adapted/std_array.hpp
+x64-windows/include/boost/fusion/adapted/std_array/
+x64-windows/include/boost/fusion/adapted/std_array/detail/
+x64-windows/include/boost/fusion/adapted/std_array/detail/array_size.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/std_array_iterator.hpp
+x64-windows/include/boost/fusion/adapted/std_array/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/std_pair.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/mpl/
+x64-windows/include/boost/fusion/adapted/std_tuple/mpl/clear.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/
+x64-windows/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/adapt_assoc_struct_named.hpp
+x64-windows/include/boost/fusion/adapted/struct/adapt_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
+x64-windows/include/boost/fusion/adapted/struct/define_assoc_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/define_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/define_struct_inline.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_auto.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_base.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/define_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/extension.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/namespace.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/preprocessor/
+x64-windows/include/boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/algorithm.hpp
+x64-windows/include/boost/fusion/algorithm/
+x64-windows/include/boost/fusion/algorithm/auxiliary.hpp
+x64-windows/include/boost/fusion/algorithm/auxiliary/
+x64-windows/include/boost/fusion/algorithm/auxiliary/copy.hpp
+x64-windows/include/boost/fusion/algorithm/auxiliary/move.hpp
+x64-windows/include/boost/fusion/algorithm/iteration.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/
+x64-windows/include/boost/fusion/algorithm/iteration/accumulate.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/
+x64-windows/include/boost/fusion/algorithm/iteration/detail/fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/fold_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/for_each.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/iter_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/reverse_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/reverse_iter_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/query.hpp
+x64-windows/include/boost/fusion/algorithm/query/
+x64-windows/include/boost/fusion/algorithm/query/all.hpp
+x64-windows/include/boost/fusion/algorithm/query/any.hpp
+x64-windows/include/boost/fusion/algorithm/query/count.hpp
+x64-windows/include/boost/fusion/algorithm/query/count_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/
+x64-windows/include/boost/fusion/algorithm/query/detail/all.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/any.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/count.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/count_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/find_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/find.hpp
+x64-windows/include/boost/fusion/algorithm/query/find_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/query/find_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/find_if_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/query/none.hpp
+x64-windows/include/boost/fusion/algorithm/transformation.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/
+x64-windows/include/boost/fusion/algorithm/transformation/clear.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip10.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip20.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip30.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip40.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip50.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/replace.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/erase.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/erase_key.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/filter.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/filter_if.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/flatten.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/insert.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/insert_range.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/join.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/pop_back.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/pop_front.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/push_back.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/push_front.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/remove.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/remove_if.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/replace.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/replace_if.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/reverse.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/transform.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/zip.hpp
+x64-windows/include/boost/fusion/container.hpp
+x64-windows/include/boost/fusion/container/
+x64-windows/include/boost/fusion/container/deque.hpp
+x64-windows/include/boost/fusion/container/deque/
+x64-windows/include/boost/fusion/container/deque/back_extended_deque.hpp
+x64-windows/include/boost/fusion/container/deque/convert.hpp
+x64-windows/include/boost/fusion/container/deque/deque.hpp
+x64-windows/include/boost/fusion/container/deque/deque_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/deque_iterator.hpp
+x64-windows/include/boost/fusion/container/deque/detail/
+x64-windows/include/boost/fusion/container/deque/detail/at_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/build_deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_initial_size.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque10.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque20.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque30.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque40.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque50.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size10.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size20.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size30.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size40.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size50.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values10.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values20.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values30.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values40.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values50.hpp
+x64-windows/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
+x64-windows/include/boost/fusion/container/deque/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/keyed_element.hpp
+x64-windows/include/boost/fusion/container/deque/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/deque/front_extended_deque.hpp
+x64-windows/include/boost/fusion/container/generation.hpp
+x64-windows/include/boost/fusion/container/generation/
+x64-windows/include/boost/fusion/container/generation/cons_tie.hpp
+x64-windows/include/boost/fusion/container/generation/deque_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/
+x64-windows/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_list_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_list.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_map.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_set.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_vector.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_vector_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie50.hpp
+x64-windows/include/boost/fusion/container/generation/ignore.hpp
+x64-windows/include/boost/fusion/container/generation/list_tie.hpp
+x64-windows/include/boost/fusion/container/generation/make_cons.hpp
+x64-windows/include/boost/fusion/container/generation/make_deque.hpp
+x64-windows/include/boost/fusion/container/generation/make_list.hpp
+x64-windows/include/boost/fusion/container/generation/make_map.hpp
+x64-windows/include/boost/fusion/container/generation/make_set.hpp
+x64-windows/include/boost/fusion/container/generation/make_vector.hpp
+x64-windows/include/boost/fusion/container/generation/map_tie.hpp
+x64-windows/include/boost/fusion/container/generation/pair_tie.hpp
+x64-windows/include/boost/fusion/container/generation/vector_tie.hpp
+x64-windows/include/boost/fusion/container/list.hpp
+x64-windows/include/boost/fusion/container/list/
+x64-windows/include/boost/fusion/container/list/cons.hpp
+x64-windows/include/boost/fusion/container/list/cons_fwd.hpp
+x64-windows/include/boost/fusion/container/list/cons_iterator.hpp
+x64-windows/include/boost/fusion/container/list/convert.hpp
+x64-windows/include/boost/fusion/container/list/detail/
+x64-windows/include/boost/fusion/container/list/detail/at_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/build_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/
+x64-windows/include/boost/fusion/container/list/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list_to_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list_to_cons_call.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list10.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list10_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list20.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list20_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list30.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list30_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list40.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list40_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list50.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list50_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons10.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons20.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons30.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons40.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons50.hpp
+x64-windows/include/boost/fusion/container/list/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/empty_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/list_to_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/next_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/reverse_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/container/list/list.hpp
+x64-windows/include/boost/fusion/container/list/list_fwd.hpp
+x64-windows/include/boost/fusion/container/list/nil.hpp
+x64-windows/include/boost/fusion/container/map.hpp
+x64-windows/include/boost/fusion/container/map/
+x64-windows/include/boost/fusion/container/map/convert.hpp
+x64-windows/include/boost/fusion/container/map/detail/
+x64-windows/include/boost/fusion/container/map/detail/at_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/at_key_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/build_map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/
+x64-windows/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/begin_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/convert.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/deref_data_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/deref_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/end_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/key_of_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/map_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map10.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map20.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map30.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map40.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map50.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map10.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map10_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map20.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map20_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map30.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map30_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map40.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map40_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map50.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map50_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/value_of_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/map_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/map_index.hpp
+x64-windows/include/boost/fusion/container/map/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
+x64-windows/include/boost/fusion/container/map/map.hpp
+x64-windows/include/boost/fusion/container/map/map_fwd.hpp
+x64-windows/include/boost/fusion/container/map/map_iterator.hpp
+x64-windows/include/boost/fusion/container/set.hpp
+x64-windows/include/boost/fusion/container/set/
+x64-windows/include/boost/fusion/container/set/convert.hpp
+x64-windows/include/boost/fusion/container/set/detail/
+x64-windows/include/boost/fusion/container/set/detail/as_set.hpp
+x64-windows/include/boost/fusion/container/set/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/
+x64-windows/include/boost/fusion/container/set/detail/cpp03/as_set.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set10.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set20.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set30.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set40.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set50.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set10.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set10_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set20.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set20_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set30.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set30_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set40.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set40_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set50.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set50_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/set.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/set_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/set_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/container/set/set.hpp
+x64-windows/include/boost/fusion/container/set/set_fwd.hpp
+x64-windows/include/boost/fusion/container/vector.hpp
+x64-windows/include/boost/fusion/container/vector/
+x64-windows/include/boost/fusion/container/vector/convert.hpp
+x64-windows/include/boost/fusion/container/vector/detail/
+x64-windows/include/boost/fusion/container/vector/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/as_vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/at_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/config.hpp
+x64-windows/include/boost/fusion/container/vector/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/as_vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector10_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector20_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector30_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector40_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector50_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector10_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector20_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector30_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector40_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector50_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector_n.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector_n_chooser.hpp
+x64-windows/include/boost/fusion/container/vector/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/next_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/container/vector/vector.hpp
+x64-windows/include/boost/fusion/container/vector/vector10.hpp
+x64-windows/include/boost/fusion/container/vector/vector20.hpp
+x64-windows/include/boost/fusion/container/vector/vector30.hpp
+x64-windows/include/boost/fusion/container/vector/vector40.hpp
+x64-windows/include/boost/fusion/container/vector/vector50.hpp
+x64-windows/include/boost/fusion/container/vector/vector_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/vector_iterator.hpp
+x64-windows/include/boost/fusion/functional.hpp
+x64-windows/include/boost/fusion/functional/
+x64-windows/include/boost/fusion/functional/adapter.hpp
+x64-windows/include/boost/fusion/functional/adapter/
+x64-windows/include/boost/fusion/functional/adapter/detail/
+x64-windows/include/boost/fusion/functional/adapter/detail/access.hpp
+x64-windows/include/boost/fusion/functional/adapter/fused.hpp
+x64-windows/include/boost/fusion/functional/adapter/fused_function_object.hpp
+x64-windows/include/boost/fusion/functional/adapter/fused_procedure.hpp
+x64-windows/include/boost/fusion/functional/adapter/limits.hpp
+x64-windows/include/boost/fusion/functional/adapter/unfused.hpp
+x64-windows/include/boost/fusion/functional/adapter/unfused_typed.hpp
+x64-windows/include/boost/fusion/functional/generation.hpp
+x64-windows/include/boost/fusion/functional/generation/
+x64-windows/include/boost/fusion/functional/generation/detail/
+x64-windows/include/boost/fusion/functional/generation/detail/gen_make_adapter.hpp
+x64-windows/include/boost/fusion/functional/generation/make_fused.hpp
+x64-windows/include/boost/fusion/functional/generation/make_fused_function_object.hpp
+x64-windows/include/boost/fusion/functional/generation/make_fused_procedure.hpp
+x64-windows/include/boost/fusion/functional/generation/make_unfused.hpp
+x64-windows/include/boost/fusion/functional/invocation.hpp
+x64-windows/include/boost/fusion/functional/invocation/
+x64-windows/include/boost/fusion/functional/invocation/detail/
+x64-windows/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
+x64-windows/include/boost/fusion/functional/invocation/invoke.hpp
+x64-windows/include/boost/fusion/functional/invocation/invoke_function_object.hpp
+x64-windows/include/boost/fusion/functional/invocation/invoke_procedure.hpp
+x64-windows/include/boost/fusion/functional/invocation/limits.hpp
+x64-windows/include/boost/fusion/include/
+x64-windows/include/boost/fusion/include/accumulate.hpp
+x64-windows/include/boost/fusion/include/adapt_adt.hpp
+x64-windows/include/boost/fusion/include/adapt_adt_named.hpp
+x64-windows/include/boost/fusion/include/adapt_assoc_adt.hpp
+x64-windows/include/boost/fusion/include/adapt_assoc_adt_named.hpp
+x64-windows/include/boost/fusion/include/adapt_assoc_struct.hpp
+x64-windows/include/boost/fusion/include/adapt_assoc_struct_named.hpp
+x64-windows/include/boost/fusion/include/adapt_struct.hpp
+x64-windows/include/boost/fusion/include/adapt_struct_named.hpp
+x64-windows/include/boost/fusion/include/adapted.hpp
+x64-windows/include/boost/fusion/include/adapter.hpp
+x64-windows/include/boost/fusion/include/advance.hpp
+x64-windows/include/boost/fusion/include/algorithm.hpp
+x64-windows/include/boost/fusion/include/all.hpp
+x64-windows/include/boost/fusion/include/any.hpp
+x64-windows/include/boost/fusion/include/array.hpp
+x64-windows/include/boost/fusion/include/as_deque.hpp
+x64-windows/include/boost/fusion/include/as_list.hpp
+x64-windows/include/boost/fusion/include/as_map.hpp
+x64-windows/include/boost/fusion/include/as_set.hpp
+x64-windows/include/boost/fusion/include/as_vector.hpp
+x64-windows/include/boost/fusion/include/at.hpp
+x64-windows/include/boost/fusion/include/at_c.hpp
+x64-windows/include/boost/fusion/include/at_key.hpp
+x64-windows/include/boost/fusion/include/auxiliary.hpp
+x64-windows/include/boost/fusion/include/back.hpp
+x64-windows/include/boost/fusion/include/begin.hpp
+x64-windows/include/boost/fusion/include/boost_array.hpp
+x64-windows/include/boost/fusion/include/boost_tuple.hpp
+x64-windows/include/boost/fusion/include/category_of.hpp
+x64-windows/include/boost/fusion/include/clear.hpp
+x64-windows/include/boost/fusion/include/comparison.hpp
+x64-windows/include/boost/fusion/include/cons.hpp
+x64-windows/include/boost/fusion/include/cons_tie.hpp
+x64-windows/include/boost/fusion/include/container.hpp
+x64-windows/include/boost/fusion/include/convert.hpp
+x64-windows/include/boost/fusion/include/copy.hpp
+x64-windows/include/boost/fusion/include/count.hpp
+x64-windows/include/boost/fusion/include/count_if.hpp
+x64-windows/include/boost/fusion/include/deduce.hpp
+x64-windows/include/boost/fusion/include/deduce_sequence.hpp
+x64-windows/include/boost/fusion/include/define_assoc_struct.hpp
+x64-windows/include/boost/fusion/include/define_struct.hpp
+x64-windows/include/boost/fusion/include/define_struct_inline.hpp
+x64-windows/include/boost/fusion/include/deque.hpp
+x64-windows/include/boost/fusion/include/deque_fwd.hpp
+x64-windows/include/boost/fusion/include/deque_tie.hpp
+x64-windows/include/boost/fusion/include/deref.hpp
+x64-windows/include/boost/fusion/include/deref_data.hpp
+x64-windows/include/boost/fusion/include/distance.hpp
+x64-windows/include/boost/fusion/include/empty.hpp
+x64-windows/include/boost/fusion/include/end.hpp
+x64-windows/include/boost/fusion/include/equal_to.hpp
+x64-windows/include/boost/fusion/include/erase.hpp
+x64-windows/include/boost/fusion/include/erase_key.hpp
+x64-windows/include/boost/fusion/include/filter.hpp
+x64-windows/include/boost/fusion/include/filter_if.hpp
+x64-windows/include/boost/fusion/include/filter_view.hpp
+x64-windows/include/boost/fusion/include/find.hpp
+x64-windows/include/boost/fusion/include/find_if.hpp
+x64-windows/include/boost/fusion/include/flatten.hpp
+x64-windows/include/boost/fusion/include/flatten_view.hpp
+x64-windows/include/boost/fusion/include/fold.hpp
+x64-windows/include/boost/fusion/include/for_each.hpp
+x64-windows/include/boost/fusion/include/front.hpp
+x64-windows/include/boost/fusion/include/functional.hpp
+x64-windows/include/boost/fusion/include/fused.hpp
+x64-windows/include/boost/fusion/include/fused_function_object.hpp
+x64-windows/include/boost/fusion/include/fused_procedure.hpp
+x64-windows/include/boost/fusion/include/generation.hpp
+x64-windows/include/boost/fusion/include/greater.hpp
+x64-windows/include/boost/fusion/include/greater_equal.hpp
+x64-windows/include/boost/fusion/include/has_key.hpp
+x64-windows/include/boost/fusion/include/hash.hpp
+x64-windows/include/boost/fusion/include/ignore.hpp
+x64-windows/include/boost/fusion/include/in.hpp
+x64-windows/include/boost/fusion/include/insert.hpp
+x64-windows/include/boost/fusion/include/insert_range.hpp
+x64-windows/include/boost/fusion/include/intrinsic.hpp
+x64-windows/include/boost/fusion/include/invocation.hpp
+x64-windows/include/boost/fusion/include/invoke.hpp
+x64-windows/include/boost/fusion/include/invoke_function_object.hpp
+x64-windows/include/boost/fusion/include/invoke_procedure.hpp
+x64-windows/include/boost/fusion/include/io.hpp
+x64-windows/include/boost/fusion/include/is_iterator.hpp
+x64-windows/include/boost/fusion/include/is_segmented.hpp
+x64-windows/include/boost/fusion/include/is_sequence.hpp
+x64-windows/include/boost/fusion/include/is_view.hpp
+x64-windows/include/boost/fusion/include/iter_fold.hpp
+x64-windows/include/boost/fusion/include/iteration.hpp
+x64-windows/include/boost/fusion/include/iterator.hpp
+x64-windows/include/boost/fusion/include/iterator_adapter.hpp
+x64-windows/include/boost/fusion/include/iterator_base.hpp
+x64-windows/include/boost/fusion/include/iterator_facade.hpp
+x64-windows/include/boost/fusion/include/iterator_range.hpp
+x64-windows/include/boost/fusion/include/join.hpp
+x64-windows/include/boost/fusion/include/joint_view.hpp
+x64-windows/include/boost/fusion/include/key_of.hpp
+x64-windows/include/boost/fusion/include/less.hpp
+x64-windows/include/boost/fusion/include/less_equal.hpp
+x64-windows/include/boost/fusion/include/list.hpp
+x64-windows/include/boost/fusion/include/list_fwd.hpp
+x64-windows/include/boost/fusion/include/list_tie.hpp
+x64-windows/include/boost/fusion/include/make_cons.hpp
+x64-windows/include/boost/fusion/include/make_deque.hpp
+x64-windows/include/boost/fusion/include/make_fused.hpp
+x64-windows/include/boost/fusion/include/make_fused_function_object.hpp
+x64-windows/include/boost/fusion/include/make_fused_procedure.hpp
+x64-windows/include/boost/fusion/include/make_list.hpp
+x64-windows/include/boost/fusion/include/make_map.hpp
+x64-windows/include/boost/fusion/include/make_set.hpp
+x64-windows/include/boost/fusion/include/make_tuple.hpp
+x64-windows/include/boost/fusion/include/make_unfused.hpp
+x64-windows/include/boost/fusion/include/make_vector.hpp
+x64-windows/include/boost/fusion/include/map.hpp
+x64-windows/include/boost/fusion/include/map_fwd.hpp
+x64-windows/include/boost/fusion/include/map_tie.hpp
+x64-windows/include/boost/fusion/include/move.hpp
+x64-windows/include/boost/fusion/include/mpl.hpp
+x64-windows/include/boost/fusion/include/next.hpp
+x64-windows/include/boost/fusion/include/nil.hpp
+x64-windows/include/boost/fusion/include/none.hpp
+x64-windows/include/boost/fusion/include/not_equal_to.hpp
+x64-windows/include/boost/fusion/include/nview.hpp
+x64-windows/include/boost/fusion/include/out.hpp
+x64-windows/include/boost/fusion/include/pair.hpp
+x64-windows/include/boost/fusion/include/pair_tie.hpp
+x64-windows/include/boost/fusion/include/pop_back.hpp
+x64-windows/include/boost/fusion/include/pop_front.hpp
+x64-windows/include/boost/fusion/include/prior.hpp
+x64-windows/include/boost/fusion/include/proxy_type.hpp
+x64-windows/include/boost/fusion/include/push_back.hpp
+x64-windows/include/boost/fusion/include/push_front.hpp
+x64-windows/include/boost/fusion/include/query.hpp
+x64-windows/include/boost/fusion/include/remove.hpp
+x64-windows/include/boost/fusion/include/remove_if.hpp
+x64-windows/include/boost/fusion/include/repetitive_view.hpp
+x64-windows/include/boost/fusion/include/replace.hpp
+x64-windows/include/boost/fusion/include/replace_if.hpp
+x64-windows/include/boost/fusion/include/reverse.hpp
+x64-windows/include/boost/fusion/include/reverse_fold.hpp
+x64-windows/include/boost/fusion/include/reverse_iter_fold.hpp
+x64-windows/include/boost/fusion/include/reverse_view.hpp
+x64-windows/include/boost/fusion/include/segmented_fold_until.hpp
+x64-windows/include/boost/fusion/include/segmented_iterator.hpp
+x64-windows/include/boost/fusion/include/segments.hpp
+x64-windows/include/boost/fusion/include/sequence.hpp
+x64-windows/include/boost/fusion/include/sequence_base.hpp
+x64-windows/include/boost/fusion/include/sequence_facade.hpp
+x64-windows/include/boost/fusion/include/set.hpp
+x64-windows/include/boost/fusion/include/set_fwd.hpp
+x64-windows/include/boost/fusion/include/single_view.hpp
+x64-windows/include/boost/fusion/include/size.hpp
+x64-windows/include/boost/fusion/include/std_array.hpp
+x64-windows/include/boost/fusion/include/std_pair.hpp
+x64-windows/include/boost/fusion/include/std_tuple.hpp
+x64-windows/include/boost/fusion/include/struct.hpp
+x64-windows/include/boost/fusion/include/support.hpp
+x64-windows/include/boost/fusion/include/swap.hpp
+x64-windows/include/boost/fusion/include/tag_of.hpp
+x64-windows/include/boost/fusion/include/tag_of_fwd.hpp
+x64-windows/include/boost/fusion/include/transform.hpp
+x64-windows/include/boost/fusion/include/transform_view.hpp
+x64-windows/include/boost/fusion/include/transformation.hpp
+x64-windows/include/boost/fusion/include/tuple.hpp
+x64-windows/include/boost/fusion/include/tuple_fwd.hpp
+x64-windows/include/boost/fusion/include/tuple_tie.hpp
+x64-windows/include/boost/fusion/include/unfused.hpp
+x64-windows/include/boost/fusion/include/unfused_typed.hpp
+x64-windows/include/boost/fusion/include/unused.hpp
+x64-windows/include/boost/fusion/include/value_at.hpp
+x64-windows/include/boost/fusion/include/value_at_key.hpp
+x64-windows/include/boost/fusion/include/value_of.hpp
+x64-windows/include/boost/fusion/include/value_of_data.hpp
+x64-windows/include/boost/fusion/include/vector.hpp
+x64-windows/include/boost/fusion/include/vector10.hpp
+x64-windows/include/boost/fusion/include/vector20.hpp
+x64-windows/include/boost/fusion/include/vector30.hpp
+x64-windows/include/boost/fusion/include/vector40.hpp
+x64-windows/include/boost/fusion/include/vector50.hpp
+x64-windows/include/boost/fusion/include/vector_fwd.hpp
+x64-windows/include/boost/fusion/include/vector_tie.hpp
+x64-windows/include/boost/fusion/include/view.hpp
+x64-windows/include/boost/fusion/include/void.hpp
+x64-windows/include/boost/fusion/include/zip.hpp
+x64-windows/include/boost/fusion/include/zip_view.hpp
+x64-windows/include/boost/fusion/iterator.hpp
+x64-windows/include/boost/fusion/iterator/
+x64-windows/include/boost/fusion/iterator/advance.hpp
+x64-windows/include/boost/fusion/iterator/basic_iterator.hpp
+x64-windows/include/boost/fusion/iterator/deref.hpp
+x64-windows/include/boost/fusion/iterator/deref_data.hpp
+x64-windows/include/boost/fusion/iterator/detail/
+x64-windows/include/boost/fusion/iterator/detail/adapt_deref_traits.hpp
+x64-windows/include/boost/fusion/iterator/detail/adapt_value_traits.hpp
+x64-windows/include/boost/fusion/iterator/detail/advance.hpp
+x64-windows/include/boost/fusion/iterator/detail/distance.hpp
+x64-windows/include/boost/fusion/iterator/detail/segment_sequence.hpp
+x64-windows/include/boost/fusion/iterator/detail/segmented_equal_to.hpp
+x64-windows/include/boost/fusion/iterator/detail/segmented_iterator.hpp
+x64-windows/include/boost/fusion/iterator/detail/segmented_next_impl.hpp
+x64-windows/include/boost/fusion/iterator/distance.hpp
+x64-windows/include/boost/fusion/iterator/equal_to.hpp
+x64-windows/include/boost/fusion/iterator/iterator_adapter.hpp
+x64-windows/include/boost/fusion/iterator/iterator_facade.hpp
+x64-windows/include/boost/fusion/iterator/key_of.hpp
+x64-windows/include/boost/fusion/iterator/mpl.hpp
+x64-windows/include/boost/fusion/iterator/mpl/
+x64-windows/include/boost/fusion/iterator/mpl/convert_iterator.hpp
+x64-windows/include/boost/fusion/iterator/mpl/fusion_iterator.hpp
+x64-windows/include/boost/fusion/iterator/next.hpp
+x64-windows/include/boost/fusion/iterator/prior.hpp
+x64-windows/include/boost/fusion/iterator/segmented_iterator.hpp
+x64-windows/include/boost/fusion/iterator/value_of.hpp
+x64-windows/include/boost/fusion/iterator/value_of_data.hpp
+x64-windows/include/boost/fusion/mpl.hpp
+x64-windows/include/boost/fusion/mpl/
+x64-windows/include/boost/fusion/mpl/at.hpp
+x64-windows/include/boost/fusion/mpl/back.hpp
+x64-windows/include/boost/fusion/mpl/begin.hpp
+x64-windows/include/boost/fusion/mpl/clear.hpp
+x64-windows/include/boost/fusion/mpl/detail/
+x64-windows/include/boost/fusion/mpl/detail/clear.hpp
+x64-windows/include/boost/fusion/mpl/empty.hpp
+x64-windows/include/boost/fusion/mpl/end.hpp
+x64-windows/include/boost/fusion/mpl/erase.hpp
+x64-windows/include/boost/fusion/mpl/erase_key.hpp
+x64-windows/include/boost/fusion/mpl/front.hpp
+x64-windows/include/boost/fusion/mpl/has_key.hpp
+x64-windows/include/boost/fusion/mpl/insert.hpp
+x64-windows/include/boost/fusion/mpl/insert_range.hpp
+x64-windows/include/boost/fusion/mpl/pop_back.hpp
+x64-windows/include/boost/fusion/mpl/pop_front.hpp
+x64-windows/include/boost/fusion/mpl/push_back.hpp
+x64-windows/include/boost/fusion/mpl/push_front.hpp
+x64-windows/include/boost/fusion/mpl/size.hpp
+x64-windows/include/boost/fusion/sequence.hpp
+x64-windows/include/boost/fusion/sequence/
+x64-windows/include/boost/fusion/sequence/comparison.hpp
+x64-windows/include/boost/fusion/sequence/comparison/
+x64-windows/include/boost/fusion/sequence/comparison/detail/
+x64-windows/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/greater.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/less.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
+x64-windows/include/boost/fusion/sequence/comparison/enable_comparison.hpp
+x64-windows/include/boost/fusion/sequence/comparison/equal_to.hpp
+x64-windows/include/boost/fusion/sequence/comparison/greater.hpp
+x64-windows/include/boost/fusion/sequence/comparison/greater_equal.hpp
+x64-windows/include/boost/fusion/sequence/comparison/less.hpp
+x64-windows/include/boost/fusion/sequence/comparison/less_equal.hpp
+x64-windows/include/boost/fusion/sequence/comparison/not_equal_to.hpp
+x64-windows/include/boost/fusion/sequence/convert.hpp
+x64-windows/include/boost/fusion/sequence/hash.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/
+x64-windows/include/boost/fusion/sequence/intrinsic/at.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/at_c.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/at_key.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/back.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/begin.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/empty.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/end.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/front.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/has_key.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/segments.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/size.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/swap.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/value_at.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic_fwd.hpp
+x64-windows/include/boost/fusion/sequence/io.hpp
+x64-windows/include/boost/fusion/sequence/io/
+x64-windows/include/boost/fusion/sequence/io/detail/
+x64-windows/include/boost/fusion/sequence/io/detail/in.hpp
+x64-windows/include/boost/fusion/sequence/io/detail/manip.hpp
+x64-windows/include/boost/fusion/sequence/io/detail/out.hpp
+x64-windows/include/boost/fusion/sequence/io/in.hpp
+x64-windows/include/boost/fusion/sequence/io/out.hpp
+x64-windows/include/boost/fusion/sequence/sequence_facade.hpp
+x64-windows/include/boost/fusion/support.hpp
+x64-windows/include/boost/fusion/support/
+x64-windows/include/boost/fusion/support/as_const.hpp
+x64-windows/include/boost/fusion/support/category_of.hpp
+x64-windows/include/boost/fusion/support/config.hpp
+x64-windows/include/boost/fusion/support/deduce.hpp
+x64-windows/include/boost/fusion/support/deduce_sequence.hpp
+x64-windows/include/boost/fusion/support/detail/
+x64-windows/include/boost/fusion/support/detail/access.hpp
+x64-windows/include/boost/fusion/support/detail/and.hpp
+x64-windows/include/boost/fusion/support/detail/as_fusion_element.hpp
+x64-windows/include/boost/fusion/support/detail/category_of.hpp
+x64-windows/include/boost/fusion/support/detail/enabler.hpp
+x64-windows/include/boost/fusion/support/detail/index_sequence.hpp
+x64-windows/include/boost/fusion/support/detail/is_mpl_sequence.hpp
+x64-windows/include/boost/fusion/support/detail/is_same_size.hpp
+x64-windows/include/boost/fusion/support/detail/is_view.hpp
+x64-windows/include/boost/fusion/support/detail/mpl_iterator_category.hpp
+x64-windows/include/boost/fusion/support/detail/pp_round.hpp
+x64-windows/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
+x64-windows/include/boost/fusion/support/detail/unknown_key.hpp
+x64-windows/include/boost/fusion/support/is_iterator.hpp
+x64-windows/include/boost/fusion/support/is_segmented.hpp
+x64-windows/include/boost/fusion/support/is_sequence.hpp
+x64-windows/include/boost/fusion/support/is_view.hpp
+x64-windows/include/boost/fusion/support/iterator_base.hpp
+x64-windows/include/boost/fusion/support/pair.hpp
+x64-windows/include/boost/fusion/support/segmented_fold_until.hpp
+x64-windows/include/boost/fusion/support/sequence_base.hpp
+x64-windows/include/boost/fusion/support/tag_of.hpp
+x64-windows/include/boost/fusion/support/tag_of_fwd.hpp
+x64-windows/include/boost/fusion/support/unused.hpp
+x64-windows/include/boost/fusion/support/void.hpp
+x64-windows/include/boost/fusion/tuple.hpp
+x64-windows/include/boost/fusion/tuple/
+x64-windows/include/boost/fusion/tuple/detail/
+x64-windows/include/boost/fusion/tuple/detail/make_tuple.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple10.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple20.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple30.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple40.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple50.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple10.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple10_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple20.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple20_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple30.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple30_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple40.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple40_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple50.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple50_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie10.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie20.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie30.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie40.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie50.hpp
+x64-windows/include/boost/fusion/tuple/detail/tuple.hpp
+x64-windows/include/boost/fusion/tuple/detail/tuple_expand.hpp
+x64-windows/include/boost/fusion/tuple/detail/tuple_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/tuple_tie.hpp
+x64-windows/include/boost/fusion/tuple/make_tuple.hpp
+x64-windows/include/boost/fusion/tuple/tuple.hpp
+x64-windows/include/boost/fusion/tuple/tuple_fwd.hpp
+x64-windows/include/boost/fusion/tuple/tuple_tie.hpp
+x64-windows/include/boost/fusion/view.hpp
+x64-windows/include/boost/fusion/view/
+x64-windows/include/boost/fusion/view/detail/
+x64-windows/include/boost/fusion/view/detail/strictest_traversal.hpp
+x64-windows/include/boost/fusion/view/filter_view.hpp
+x64-windows/include/boost/fusion/view/filter_view/
+x64-windows/include/boost/fusion/view/filter_view/detail/
+x64-windows/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/filter_view.hpp
+x64-windows/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
+x64-windows/include/boost/fusion/view/flatten_view.hpp
+x64-windows/include/boost/fusion/view/flatten_view/
+x64-windows/include/boost/fusion/view/flatten_view/flatten_view.hpp
+x64-windows/include/boost/fusion/view/flatten_view/flatten_view_iterator.hpp
+x64-windows/include/boost/fusion/view/iterator_range.hpp
+x64-windows/include/boost/fusion/view/iterator_range/
+x64-windows/include/boost/fusion/view/iterator_range/detail/
+x64-windows/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/iterator_range.hpp
+x64-windows/include/boost/fusion/view/joint_view.hpp
+x64-windows/include/boost/fusion/view/joint_view/
+x64-windows/include/boost/fusion/view/joint_view/detail/
+x64-windows/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/joint_view.hpp
+x64-windows/include/boost/fusion/view/joint_view/joint_view_fwd.hpp
+x64-windows/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
+x64-windows/include/boost/fusion/view/nview.hpp
+x64-windows/include/boost/fusion/view/nview/
+x64-windows/include/boost/fusion/view/nview/detail/
+x64-windows/include/boost/fusion/view/nview/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/cpp03/
+x64-windows/include/boost/fusion/view/nview/detail/cpp03/nview_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/nview_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/nview/nview.hpp
+x64-windows/include/boost/fusion/view/nview/nview_iterator.hpp
+x64-windows/include/boost/fusion/view/repetitive_view.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/
+x64-windows/include/boost/fusion/view/repetitive_view/detail/
+x64-windows/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/repetitive_view.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
+x64-windows/include/boost/fusion/view/reverse_view.hpp
+x64-windows/include/boost/fusion/view/reverse_view/
+x64-windows/include/boost/fusion/view/reverse_view/detail/
+x64-windows/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/reverse_view.hpp
+x64-windows/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
+x64-windows/include/boost/fusion/view/single_view.hpp
+x64-windows/include/boost/fusion/view/single_view/
+x64-windows/include/boost/fusion/view/single_view/detail/
+x64-windows/include/boost/fusion/view/single_view/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/single_view.hpp
+x64-windows/include/boost/fusion/view/single_view/single_view_iterator.hpp
+x64-windows/include/boost/fusion/view/transform_view.hpp
+x64-windows/include/boost/fusion/view/transform_view/
+x64-windows/include/boost/fusion/view/transform_view/detail/
+x64-windows/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/transform_view.hpp
+x64-windows/include/boost/fusion/view/transform_view/transform_view_fwd.hpp
+x64-windows/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
+x64-windows/include/boost/fusion/view/zip_view.hpp
+x64-windows/include/boost/fusion/view/zip_view/
+x64-windows/include/boost/fusion/view/zip_view/detail/
+x64-windows/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/zip_view.hpp
+x64-windows/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
+x64-windows/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-fusion/
+x64-windows/share/boost-fusion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1125 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/fusion/
+x64-windows-static/include/boost/fusion/adapted.hpp
+x64-windows-static/include/boost/fusion/adapted/
+x64-windows-static/include/boost/fusion/adapted/adt.hpp
+x64-windows-static/include/boost/fusion/adapted/adt/
+x64-windows-static/include/boost/fusion/adapted/adt/adapt_adt.hpp
+x64-windows-static/include/boost/fusion/adapted/adt/adapt_adt_named.hpp
+x64-windows-static/include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp
+x64-windows-static/include/boost/fusion/adapted/adt/adapt_assoc_adt_named.hpp
+x64-windows-static/include/boost/fusion/adapted/adt/detail/
+x64-windows-static/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
+x64-windows-static/include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp
+x64-windows-static/include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp
+x64-windows-static/include/boost/fusion/adapted/adt/detail/extension.hpp
+x64-windows-static/include/boost/fusion/adapted/array.hpp
+x64-windows-static/include/boost/fusion/adapted/array/
+x64-windows-static/include/boost/fusion/adapted/array/at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/begin_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/category_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/deref_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/end_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/is_sequence_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/is_view_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/size_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/tag_of.hpp
+x64-windows-static/include/boost/fusion/adapted/array/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/array/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/
+x64-windows-static/include/boost/fusion/adapted/boost_array/array_iterator.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_array/tag_of.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/build_cons.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/convert_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/mpl/
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/mpl/clear.hpp
+x64-windows-static/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/mpl/mpl_iterator.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/array_size.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/std_array_iterator.hpp
+x64-windows-static/include/boost/fusion/adapted/std_array/tag_of.hpp
+x64-windows-static/include/boost/fusion/adapted/std_pair.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/category_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/is_sequence_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/is_view_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/mpl/
+x64-windows-static/include/boost/fusion/adapted/std_tuple/mpl/clear.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
+x64-windows-static/include/boost/fusion/adapted/std_tuple/tag_of.hpp
+x64-windows-static/include/boost/fusion/adapted/struct.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/
+x64-windows-static/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/adapt_assoc_struct_named.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/adapt_struct.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/define_assoc_struct.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/define_struct.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/define_struct_inline.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/
+x64-windows-static/include/boost/fusion/adapted/struct/detail/adapt_auto.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/adapt_base.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/category_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/define_struct.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/deref_data_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/extension.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/is_sequence_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/is_view_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/key_of_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/namespace.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/preprocessor/
+x64-windows-static/include/boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/value_of_data_impl.hpp
+x64-windows-static/include/boost/fusion/adapted/struct/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/algorithm.hpp
+x64-windows-static/include/boost/fusion/algorithm/
+x64-windows-static/include/boost/fusion/algorithm/auxiliary.hpp
+x64-windows-static/include/boost/fusion/algorithm/auxiliary/
+x64-windows-static/include/boost/fusion/algorithm/auxiliary/copy.hpp
+x64-windows-static/include/boost/fusion/algorithm/auxiliary/move.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/
+x64-windows-static/include/boost/fusion/algorithm/iteration/accumulate.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/preprocessed/
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/fold_fwd.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/for_each.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/iter_fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/reverse_fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/reverse_iter_fold.hpp
+x64-windows-static/include/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp
+x64-windows-static/include/boost/fusion/algorithm/query.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/
+x64-windows-static/include/boost/fusion/algorithm/query/all.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/any.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/count.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/count_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/detail/
+x64-windows-static/include/boost/fusion/algorithm/query/detail/all.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/detail/any.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/detail/count.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/detail/count_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/detail/find_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/find.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/find_fwd.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/find_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/find_if_fwd.hpp
+x64-windows-static/include/boost/fusion/algorithm/query/none.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/
+x64-windows-static/include/boost/fusion/algorithm/transformation/clear.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/preprocessed/
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip10.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip20.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip30.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip40.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip50.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/replace.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/erase.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/erase_key.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/filter.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/filter_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/flatten.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/insert.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/insert_range.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/join.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/pop_back.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/pop_front.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/push_back.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/push_front.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/remove.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/remove_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/replace.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/replace_if.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/reverse.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/transform.hpp
+x64-windows-static/include/boost/fusion/algorithm/transformation/zip.hpp
+x64-windows-static/include/boost/fusion/container.hpp
+x64-windows-static/include/boost/fusion/container/
+x64-windows-static/include/boost/fusion/container/deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/
+x64-windows-static/include/boost/fusion/container/deque/back_extended_deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/convert.hpp
+x64-windows-static/include/boost/fusion/container/deque/deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/deque_fwd.hpp
+x64-windows-static/include/boost/fusion/container/deque/deque_iterator.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/
+x64-windows-static/include/boost/fusion/container/deque/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/build_deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/convert_impl.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/deque_initial_size.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/limits.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque10.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque20.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque30.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque40.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque50.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10_fwd.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20_fwd.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30_fwd.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40_fwd.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50_fwd.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_fwd.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size10.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size20.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size30.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size40.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size50.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values10.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values20.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values30.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values40.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values50.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/is_sequence_impl.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/keyed_element.hpp
+x64-windows-static/include/boost/fusion/container/deque/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/container/deque/front_extended_deque.hpp
+x64-windows-static/include/boost/fusion/container/generation.hpp
+x64-windows-static/include/boost/fusion/container/generation/
+x64-windows-static/include/boost/fusion/container/generation/cons_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/deque_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_list_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_make_list.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_make_map.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_make_set.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_make_vector.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/pp_vector_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/deque_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/deque_tie10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/deque_tie20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/deque_tie30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/deque_tie40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/deque_tie50.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/list_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/list_tie10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/list_tie20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/list_tie30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/list_tie40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/list_tie50.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_deque.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_deque10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_deque20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_deque30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_deque40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_deque50.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_list.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_list10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_list20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_list30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_list40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_list50.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_map.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_map10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_map20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_map30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_map40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_map50.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_set.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_set10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_set20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_set30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_set40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_set50.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_vector.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_vector10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_vector20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_vector30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_vector40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/make_vector50.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/map_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/map_tie10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/map_tie20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/map_tie30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/map_tie40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/map_tie50.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/vector_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/vector_tie10.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/vector_tie20.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/vector_tie30.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/vector_tie40.hpp
+x64-windows-static/include/boost/fusion/container/generation/detail/preprocessed/vector_tie50.hpp
+x64-windows-static/include/boost/fusion/container/generation/ignore.hpp
+x64-windows-static/include/boost/fusion/container/generation/list_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/make_cons.hpp
+x64-windows-static/include/boost/fusion/container/generation/make_deque.hpp
+x64-windows-static/include/boost/fusion/container/generation/make_list.hpp
+x64-windows-static/include/boost/fusion/container/generation/make_map.hpp
+x64-windows-static/include/boost/fusion/container/generation/make_set.hpp
+x64-windows-static/include/boost/fusion/container/generation/make_vector.hpp
+x64-windows-static/include/boost/fusion/container/generation/map_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/pair_tie.hpp
+x64-windows-static/include/boost/fusion/container/generation/vector_tie.hpp
+x64-windows-static/include/boost/fusion/container/list.hpp
+x64-windows-static/include/boost/fusion/container/list/
+x64-windows-static/include/boost/fusion/container/list/cons.hpp
+x64-windows-static/include/boost/fusion/container/list/cons_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/cons_iterator.hpp
+x64-windows-static/include/boost/fusion/container/list/convert.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/
+x64-windows-static/include/boost/fusion/container/list/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/build_cons.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/convert_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/limits.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/list.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/list_forward_ctor.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/list_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/list_to_cons.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/list_to_cons_call.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list10.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list10_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list20.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list20_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list30.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list30_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list40.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list40_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list50.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list50_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons10.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons20.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons30.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons40.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons50.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/empty_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/equal_to_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/list_to_cons.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/reverse_cons.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/container/list/list.hpp
+x64-windows-static/include/boost/fusion/container/list/list_fwd.hpp
+x64-windows-static/include/boost/fusion/container/list/nil.hpp
+x64-windows-static/include/boost/fusion/container/map.hpp
+x64-windows-static/include/boost/fusion/container/map/
+x64-windows-static/include/boost/fusion/container/map/convert.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/
+x64-windows-static/include/boost/fusion/container/map/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/at_key_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/build_map.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/begin_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/convert.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/deref_data_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/deref_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/end_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/key_of_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/limits.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/map.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/map_fwd.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map10.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map20.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map30.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map40.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map50.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map10.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map10_fwd.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map20.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map20_fwd.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map30.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map30_fwd.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map40.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map40_fwd.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map50.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map50_fwd.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/preprocessed/map_fwd.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/value_of_data_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/cpp03/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/map_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/map_index.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
+x64-windows-static/include/boost/fusion/container/map/map.hpp
+x64-windows-static/include/boost/fusion/container/map/map_fwd.hpp
+x64-windows-static/include/boost/fusion/container/map/map_iterator.hpp
+x64-windows-static/include/boost/fusion/container/set.hpp
+x64-windows-static/include/boost/fusion/container/set/
+x64-windows-static/include/boost/fusion/container/set/convert.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/
+x64-windows-static/include/boost/fusion/container/set/detail/as_set.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/convert_impl.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/as_set.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/limits.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set10.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set20.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set30.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set40.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set50.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set10.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set10_fwd.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set20.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set20_fwd.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set30.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set30_fwd.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set40.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set40_fwd.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set50.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set50_fwd.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/preprocessed/set_fwd.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/set.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/set_forward_ctor.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/cpp03/set_fwd.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/deref_data_impl.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/key_of_impl.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/value_of_data_impl.hpp
+x64-windows-static/include/boost/fusion/container/set/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/container/set/set.hpp
+x64-windows-static/include/boost/fusion/container/set/set_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector.hpp
+x64-windows-static/include/boost/fusion/container/vector/
+x64-windows-static/include/boost/fusion/container/vector/convert.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/
+x64-windows-static/include/boost/fusion/container/vector/detail/advance_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/as_vector.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/config.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/convert_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/as_vector.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/limits.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector10.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector20.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector30.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector40.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector50.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector10.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector10_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector20.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector20_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector30.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector30_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector40.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector40_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector50.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector50_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser10.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser20.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser30.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser40.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser50.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector10.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector10_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector20.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector20_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector30.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector30_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector40.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector40_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector50.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector50_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector_forward_ctor.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector_n.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/cpp03/vector_n_chooser.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/distance_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/prior_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/container/vector/vector.hpp
+x64-windows-static/include/boost/fusion/container/vector/vector10.hpp
+x64-windows-static/include/boost/fusion/container/vector/vector20.hpp
+x64-windows-static/include/boost/fusion/container/vector/vector30.hpp
+x64-windows-static/include/boost/fusion/container/vector/vector40.hpp
+x64-windows-static/include/boost/fusion/container/vector/vector50.hpp
+x64-windows-static/include/boost/fusion/container/vector/vector_fwd.hpp
+x64-windows-static/include/boost/fusion/container/vector/vector_iterator.hpp
+x64-windows-static/include/boost/fusion/functional.hpp
+x64-windows-static/include/boost/fusion/functional/
+x64-windows-static/include/boost/fusion/functional/adapter.hpp
+x64-windows-static/include/boost/fusion/functional/adapter/
+x64-windows-static/include/boost/fusion/functional/adapter/detail/
+x64-windows-static/include/boost/fusion/functional/adapter/detail/access.hpp
+x64-windows-static/include/boost/fusion/functional/adapter/fused.hpp
+x64-windows-static/include/boost/fusion/functional/adapter/fused_function_object.hpp
+x64-windows-static/include/boost/fusion/functional/adapter/fused_procedure.hpp
+x64-windows-static/include/boost/fusion/functional/adapter/limits.hpp
+x64-windows-static/include/boost/fusion/functional/adapter/unfused.hpp
+x64-windows-static/include/boost/fusion/functional/adapter/unfused_typed.hpp
+x64-windows-static/include/boost/fusion/functional/generation.hpp
+x64-windows-static/include/boost/fusion/functional/generation/
+x64-windows-static/include/boost/fusion/functional/generation/detail/
+x64-windows-static/include/boost/fusion/functional/generation/detail/gen_make_adapter.hpp
+x64-windows-static/include/boost/fusion/functional/generation/make_fused.hpp
+x64-windows-static/include/boost/fusion/functional/generation/make_fused_function_object.hpp
+x64-windows-static/include/boost/fusion/functional/generation/make_fused_procedure.hpp
+x64-windows-static/include/boost/fusion/functional/generation/make_unfused.hpp
+x64-windows-static/include/boost/fusion/functional/invocation.hpp
+x64-windows-static/include/boost/fusion/functional/invocation/
+x64-windows-static/include/boost/fusion/functional/invocation/detail/
+x64-windows-static/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
+x64-windows-static/include/boost/fusion/functional/invocation/invoke.hpp
+x64-windows-static/include/boost/fusion/functional/invocation/invoke_function_object.hpp
+x64-windows-static/include/boost/fusion/functional/invocation/invoke_procedure.hpp
+x64-windows-static/include/boost/fusion/functional/invocation/limits.hpp
+x64-windows-static/include/boost/fusion/include/
+x64-windows-static/include/boost/fusion/include/accumulate.hpp
+x64-windows-static/include/boost/fusion/include/adapt_adt.hpp
+x64-windows-static/include/boost/fusion/include/adapt_adt_named.hpp
+x64-windows-static/include/boost/fusion/include/adapt_assoc_adt.hpp
+x64-windows-static/include/boost/fusion/include/adapt_assoc_adt_named.hpp
+x64-windows-static/include/boost/fusion/include/adapt_assoc_struct.hpp
+x64-windows-static/include/boost/fusion/include/adapt_assoc_struct_named.hpp
+x64-windows-static/include/boost/fusion/include/adapt_struct.hpp
+x64-windows-static/include/boost/fusion/include/adapt_struct_named.hpp
+x64-windows-static/include/boost/fusion/include/adapted.hpp
+x64-windows-static/include/boost/fusion/include/adapter.hpp
+x64-windows-static/include/boost/fusion/include/advance.hpp
+x64-windows-static/include/boost/fusion/include/algorithm.hpp
+x64-windows-static/include/boost/fusion/include/all.hpp
+x64-windows-static/include/boost/fusion/include/any.hpp
+x64-windows-static/include/boost/fusion/include/array.hpp
+x64-windows-static/include/boost/fusion/include/as_deque.hpp
+x64-windows-static/include/boost/fusion/include/as_list.hpp
+x64-windows-static/include/boost/fusion/include/as_map.hpp
+x64-windows-static/include/boost/fusion/include/as_set.hpp
+x64-windows-static/include/boost/fusion/include/as_vector.hpp
+x64-windows-static/include/boost/fusion/include/at.hpp
+x64-windows-static/include/boost/fusion/include/at_c.hpp
+x64-windows-static/include/boost/fusion/include/at_key.hpp
+x64-windows-static/include/boost/fusion/include/auxiliary.hpp
+x64-windows-static/include/boost/fusion/include/back.hpp
+x64-windows-static/include/boost/fusion/include/begin.hpp
+x64-windows-static/include/boost/fusion/include/boost_array.hpp
+x64-windows-static/include/boost/fusion/include/boost_tuple.hpp
+x64-windows-static/include/boost/fusion/include/category_of.hpp
+x64-windows-static/include/boost/fusion/include/clear.hpp
+x64-windows-static/include/boost/fusion/include/comparison.hpp
+x64-windows-static/include/boost/fusion/include/cons.hpp
+x64-windows-static/include/boost/fusion/include/cons_tie.hpp
+x64-windows-static/include/boost/fusion/include/container.hpp
+x64-windows-static/include/boost/fusion/include/convert.hpp
+x64-windows-static/include/boost/fusion/include/copy.hpp
+x64-windows-static/include/boost/fusion/include/count.hpp
+x64-windows-static/include/boost/fusion/include/count_if.hpp
+x64-windows-static/include/boost/fusion/include/deduce.hpp
+x64-windows-static/include/boost/fusion/include/deduce_sequence.hpp
+x64-windows-static/include/boost/fusion/include/define_assoc_struct.hpp
+x64-windows-static/include/boost/fusion/include/define_struct.hpp
+x64-windows-static/include/boost/fusion/include/define_struct_inline.hpp
+x64-windows-static/include/boost/fusion/include/deque.hpp
+x64-windows-static/include/boost/fusion/include/deque_fwd.hpp
+x64-windows-static/include/boost/fusion/include/deque_tie.hpp
+x64-windows-static/include/boost/fusion/include/deref.hpp
+x64-windows-static/include/boost/fusion/include/deref_data.hpp
+x64-windows-static/include/boost/fusion/include/distance.hpp
+x64-windows-static/include/boost/fusion/include/empty.hpp
+x64-windows-static/include/boost/fusion/include/end.hpp
+x64-windows-static/include/boost/fusion/include/equal_to.hpp
+x64-windows-static/include/boost/fusion/include/erase.hpp
+x64-windows-static/include/boost/fusion/include/erase_key.hpp
+x64-windows-static/include/boost/fusion/include/filter.hpp
+x64-windows-static/include/boost/fusion/include/filter_if.hpp
+x64-windows-static/include/boost/fusion/include/filter_view.hpp
+x64-windows-static/include/boost/fusion/include/find.hpp
+x64-windows-static/include/boost/fusion/include/find_if.hpp
+x64-windows-static/include/boost/fusion/include/flatten.hpp
+x64-windows-static/include/boost/fusion/include/flatten_view.hpp
+x64-windows-static/include/boost/fusion/include/fold.hpp
+x64-windows-static/include/boost/fusion/include/for_each.hpp
+x64-windows-static/include/boost/fusion/include/front.hpp
+x64-windows-static/include/boost/fusion/include/functional.hpp
+x64-windows-static/include/boost/fusion/include/fused.hpp
+x64-windows-static/include/boost/fusion/include/fused_function_object.hpp
+x64-windows-static/include/boost/fusion/include/fused_procedure.hpp
+x64-windows-static/include/boost/fusion/include/generation.hpp
+x64-windows-static/include/boost/fusion/include/greater.hpp
+x64-windows-static/include/boost/fusion/include/greater_equal.hpp
+x64-windows-static/include/boost/fusion/include/has_key.hpp
+x64-windows-static/include/boost/fusion/include/hash.hpp
+x64-windows-static/include/boost/fusion/include/ignore.hpp
+x64-windows-static/include/boost/fusion/include/in.hpp
+x64-windows-static/include/boost/fusion/include/insert.hpp
+x64-windows-static/include/boost/fusion/include/insert_range.hpp
+x64-windows-static/include/boost/fusion/include/intrinsic.hpp
+x64-windows-static/include/boost/fusion/include/invocation.hpp
+x64-windows-static/include/boost/fusion/include/invoke.hpp
+x64-windows-static/include/boost/fusion/include/invoke_function_object.hpp
+x64-windows-static/include/boost/fusion/include/invoke_procedure.hpp
+x64-windows-static/include/boost/fusion/include/io.hpp
+x64-windows-static/include/boost/fusion/include/is_iterator.hpp
+x64-windows-static/include/boost/fusion/include/is_segmented.hpp
+x64-windows-static/include/boost/fusion/include/is_sequence.hpp
+x64-windows-static/include/boost/fusion/include/is_view.hpp
+x64-windows-static/include/boost/fusion/include/iter_fold.hpp
+x64-windows-static/include/boost/fusion/include/iteration.hpp
+x64-windows-static/include/boost/fusion/include/iterator.hpp
+x64-windows-static/include/boost/fusion/include/iterator_adapter.hpp
+x64-windows-static/include/boost/fusion/include/iterator_base.hpp
+x64-windows-static/include/boost/fusion/include/iterator_facade.hpp
+x64-windows-static/include/boost/fusion/include/iterator_range.hpp
+x64-windows-static/include/boost/fusion/include/join.hpp
+x64-windows-static/include/boost/fusion/include/joint_view.hpp
+x64-windows-static/include/boost/fusion/include/key_of.hpp
+x64-windows-static/include/boost/fusion/include/less.hpp
+x64-windows-static/include/boost/fusion/include/less_equal.hpp
+x64-windows-static/include/boost/fusion/include/list.hpp
+x64-windows-static/include/boost/fusion/include/list_fwd.hpp
+x64-windows-static/include/boost/fusion/include/list_tie.hpp
+x64-windows-static/include/boost/fusion/include/make_cons.hpp
+x64-windows-static/include/boost/fusion/include/make_deque.hpp
+x64-windows-static/include/boost/fusion/include/make_fused.hpp
+x64-windows-static/include/boost/fusion/include/make_fused_function_object.hpp
+x64-windows-static/include/boost/fusion/include/make_fused_procedure.hpp
+x64-windows-static/include/boost/fusion/include/make_list.hpp
+x64-windows-static/include/boost/fusion/include/make_map.hpp
+x64-windows-static/include/boost/fusion/include/make_set.hpp
+x64-windows-static/include/boost/fusion/include/make_tuple.hpp
+x64-windows-static/include/boost/fusion/include/make_unfused.hpp
+x64-windows-static/include/boost/fusion/include/make_vector.hpp
+x64-windows-static/include/boost/fusion/include/map.hpp
+x64-windows-static/include/boost/fusion/include/map_fwd.hpp
+x64-windows-static/include/boost/fusion/include/map_tie.hpp
+x64-windows-static/include/boost/fusion/include/move.hpp
+x64-windows-static/include/boost/fusion/include/mpl.hpp
+x64-windows-static/include/boost/fusion/include/next.hpp
+x64-windows-static/include/boost/fusion/include/nil.hpp
+x64-windows-static/include/boost/fusion/include/none.hpp
+x64-windows-static/include/boost/fusion/include/not_equal_to.hpp
+x64-windows-static/include/boost/fusion/include/nview.hpp
+x64-windows-static/include/boost/fusion/include/out.hpp
+x64-windows-static/include/boost/fusion/include/pair.hpp
+x64-windows-static/include/boost/fusion/include/pair_tie.hpp
+x64-windows-static/include/boost/fusion/include/pop_back.hpp
+x64-windows-static/include/boost/fusion/include/pop_front.hpp
+x64-windows-static/include/boost/fusion/include/prior.hpp
+x64-windows-static/include/boost/fusion/include/proxy_type.hpp
+x64-windows-static/include/boost/fusion/include/push_back.hpp
+x64-windows-static/include/boost/fusion/include/push_front.hpp
+x64-windows-static/include/boost/fusion/include/query.hpp
+x64-windows-static/include/boost/fusion/include/remove.hpp
+x64-windows-static/include/boost/fusion/include/remove_if.hpp
+x64-windows-static/include/boost/fusion/include/repetitive_view.hpp
+x64-windows-static/include/boost/fusion/include/replace.hpp
+x64-windows-static/include/boost/fusion/include/replace_if.hpp
+x64-windows-static/include/boost/fusion/include/reverse.hpp
+x64-windows-static/include/boost/fusion/include/reverse_fold.hpp
+x64-windows-static/include/boost/fusion/include/reverse_iter_fold.hpp
+x64-windows-static/include/boost/fusion/include/reverse_view.hpp
+x64-windows-static/include/boost/fusion/include/segmented_fold_until.hpp
+x64-windows-static/include/boost/fusion/include/segmented_iterator.hpp
+x64-windows-static/include/boost/fusion/include/segments.hpp
+x64-windows-static/include/boost/fusion/include/sequence.hpp
+x64-windows-static/include/boost/fusion/include/sequence_base.hpp
+x64-windows-static/include/boost/fusion/include/sequence_facade.hpp
+x64-windows-static/include/boost/fusion/include/set.hpp
+x64-windows-static/include/boost/fusion/include/set_fwd.hpp
+x64-windows-static/include/boost/fusion/include/single_view.hpp
+x64-windows-static/include/boost/fusion/include/size.hpp
+x64-windows-static/include/boost/fusion/include/std_array.hpp
+x64-windows-static/include/boost/fusion/include/std_pair.hpp
+x64-windows-static/include/boost/fusion/include/std_tuple.hpp
+x64-windows-static/include/boost/fusion/include/struct.hpp
+x64-windows-static/include/boost/fusion/include/support.hpp
+x64-windows-static/include/boost/fusion/include/swap.hpp
+x64-windows-static/include/boost/fusion/include/tag_of.hpp
+x64-windows-static/include/boost/fusion/include/tag_of_fwd.hpp
+x64-windows-static/include/boost/fusion/include/transform.hpp
+x64-windows-static/include/boost/fusion/include/transform_view.hpp
+x64-windows-static/include/boost/fusion/include/transformation.hpp
+x64-windows-static/include/boost/fusion/include/tuple.hpp
+x64-windows-static/include/boost/fusion/include/tuple_fwd.hpp
+x64-windows-static/include/boost/fusion/include/tuple_tie.hpp
+x64-windows-static/include/boost/fusion/include/unfused.hpp
+x64-windows-static/include/boost/fusion/include/unfused_typed.hpp
+x64-windows-static/include/boost/fusion/include/unused.hpp
+x64-windows-static/include/boost/fusion/include/value_at.hpp
+x64-windows-static/include/boost/fusion/include/value_at_key.hpp
+x64-windows-static/include/boost/fusion/include/value_of.hpp
+x64-windows-static/include/boost/fusion/include/value_of_data.hpp
+x64-windows-static/include/boost/fusion/include/vector.hpp
+x64-windows-static/include/boost/fusion/include/vector10.hpp
+x64-windows-static/include/boost/fusion/include/vector20.hpp
+x64-windows-static/include/boost/fusion/include/vector30.hpp
+x64-windows-static/include/boost/fusion/include/vector40.hpp
+x64-windows-static/include/boost/fusion/include/vector50.hpp
+x64-windows-static/include/boost/fusion/include/vector_fwd.hpp
+x64-windows-static/include/boost/fusion/include/vector_tie.hpp
+x64-windows-static/include/boost/fusion/include/view.hpp
+x64-windows-static/include/boost/fusion/include/void.hpp
+x64-windows-static/include/boost/fusion/include/zip.hpp
+x64-windows-static/include/boost/fusion/include/zip_view.hpp
+x64-windows-static/include/boost/fusion/iterator.hpp
+x64-windows-static/include/boost/fusion/iterator/
+x64-windows-static/include/boost/fusion/iterator/advance.hpp
+x64-windows-static/include/boost/fusion/iterator/basic_iterator.hpp
+x64-windows-static/include/boost/fusion/iterator/deref.hpp
+x64-windows-static/include/boost/fusion/iterator/deref_data.hpp
+x64-windows-static/include/boost/fusion/iterator/detail/
+x64-windows-static/include/boost/fusion/iterator/detail/adapt_deref_traits.hpp
+x64-windows-static/include/boost/fusion/iterator/detail/adapt_value_traits.hpp
+x64-windows-static/include/boost/fusion/iterator/detail/advance.hpp
+x64-windows-static/include/boost/fusion/iterator/detail/distance.hpp
+x64-windows-static/include/boost/fusion/iterator/detail/segment_sequence.hpp
+x64-windows-static/include/boost/fusion/iterator/detail/segmented_equal_to.hpp
+x64-windows-static/include/boost/fusion/iterator/detail/segmented_iterator.hpp
+x64-windows-static/include/boost/fusion/iterator/detail/segmented_next_impl.hpp
+x64-windows-static/include/boost/fusion/iterator/distance.hpp
+x64-windows-static/include/boost/fusion/iterator/equal_to.hpp
+x64-windows-static/include/boost/fusion/iterator/iterator_adapter.hpp
+x64-windows-static/include/boost/fusion/iterator/iterator_facade.hpp
+x64-windows-static/include/boost/fusion/iterator/key_of.hpp
+x64-windows-static/include/boost/fusion/iterator/mpl.hpp
+x64-windows-static/include/boost/fusion/iterator/mpl/
+x64-windows-static/include/boost/fusion/iterator/mpl/convert_iterator.hpp
+x64-windows-static/include/boost/fusion/iterator/mpl/fusion_iterator.hpp
+x64-windows-static/include/boost/fusion/iterator/next.hpp
+x64-windows-static/include/boost/fusion/iterator/prior.hpp
+x64-windows-static/include/boost/fusion/iterator/segmented_iterator.hpp
+x64-windows-static/include/boost/fusion/iterator/value_of.hpp
+x64-windows-static/include/boost/fusion/iterator/value_of_data.hpp
+x64-windows-static/include/boost/fusion/mpl.hpp
+x64-windows-static/include/boost/fusion/mpl/
+x64-windows-static/include/boost/fusion/mpl/at.hpp
+x64-windows-static/include/boost/fusion/mpl/back.hpp
+x64-windows-static/include/boost/fusion/mpl/begin.hpp
+x64-windows-static/include/boost/fusion/mpl/clear.hpp
+x64-windows-static/include/boost/fusion/mpl/detail/
+x64-windows-static/include/boost/fusion/mpl/detail/clear.hpp
+x64-windows-static/include/boost/fusion/mpl/empty.hpp
+x64-windows-static/include/boost/fusion/mpl/end.hpp
+x64-windows-static/include/boost/fusion/mpl/erase.hpp
+x64-windows-static/include/boost/fusion/mpl/erase_key.hpp
+x64-windows-static/include/boost/fusion/mpl/front.hpp
+x64-windows-static/include/boost/fusion/mpl/has_key.hpp
+x64-windows-static/include/boost/fusion/mpl/insert.hpp
+x64-windows-static/include/boost/fusion/mpl/insert_range.hpp
+x64-windows-static/include/boost/fusion/mpl/pop_back.hpp
+x64-windows-static/include/boost/fusion/mpl/pop_front.hpp
+x64-windows-static/include/boost/fusion/mpl/push_back.hpp
+x64-windows-static/include/boost/fusion/mpl/push_front.hpp
+x64-windows-static/include/boost/fusion/mpl/size.hpp
+x64-windows-static/include/boost/fusion/sequence.hpp
+x64-windows-static/include/boost/fusion/sequence/
+x64-windows-static/include/boost/fusion/sequence/comparison.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/
+x64-windows-static/include/boost/fusion/sequence/comparison/detail/
+x64-windows-static/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/detail/greater.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/detail/less.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/enable_comparison.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/equal_to.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/greater.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/greater_equal.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/less.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/less_equal.hpp
+x64-windows-static/include/boost/fusion/sequence/comparison/not_equal_to.hpp
+x64-windows-static/include/boost/fusion/sequence/convert.hpp
+x64-windows-static/include/boost/fusion/sequence/hash.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/
+x64-windows-static/include/boost/fusion/sequence/intrinsic/at.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/at_c.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/at_key.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/back.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/begin.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/detail/
+x64-windows-static/include/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/empty.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/end.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/front.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/has_key.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/segments.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/size.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/swap.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/value_at.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
+x64-windows-static/include/boost/fusion/sequence/intrinsic_fwd.hpp
+x64-windows-static/include/boost/fusion/sequence/io.hpp
+x64-windows-static/include/boost/fusion/sequence/io/
+x64-windows-static/include/boost/fusion/sequence/io/detail/
+x64-windows-static/include/boost/fusion/sequence/io/detail/in.hpp
+x64-windows-static/include/boost/fusion/sequence/io/detail/manip.hpp
+x64-windows-static/include/boost/fusion/sequence/io/detail/out.hpp
+x64-windows-static/include/boost/fusion/sequence/io/in.hpp
+x64-windows-static/include/boost/fusion/sequence/io/out.hpp
+x64-windows-static/include/boost/fusion/sequence/sequence_facade.hpp
+x64-windows-static/include/boost/fusion/support.hpp
+x64-windows-static/include/boost/fusion/support/
+x64-windows-static/include/boost/fusion/support/as_const.hpp
+x64-windows-static/include/boost/fusion/support/category_of.hpp
+x64-windows-static/include/boost/fusion/support/config.hpp
+x64-windows-static/include/boost/fusion/support/deduce.hpp
+x64-windows-static/include/boost/fusion/support/deduce_sequence.hpp
+x64-windows-static/include/boost/fusion/support/detail/
+x64-windows-static/include/boost/fusion/support/detail/access.hpp
+x64-windows-static/include/boost/fusion/support/detail/and.hpp
+x64-windows-static/include/boost/fusion/support/detail/as_fusion_element.hpp
+x64-windows-static/include/boost/fusion/support/detail/category_of.hpp
+x64-windows-static/include/boost/fusion/support/detail/enabler.hpp
+x64-windows-static/include/boost/fusion/support/detail/index_sequence.hpp
+x64-windows-static/include/boost/fusion/support/detail/is_mpl_sequence.hpp
+x64-windows-static/include/boost/fusion/support/detail/is_same_size.hpp
+x64-windows-static/include/boost/fusion/support/detail/is_view.hpp
+x64-windows-static/include/boost/fusion/support/detail/mpl_iterator_category.hpp
+x64-windows-static/include/boost/fusion/support/detail/pp_round.hpp
+x64-windows-static/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
+x64-windows-static/include/boost/fusion/support/detail/unknown_key.hpp
+x64-windows-static/include/boost/fusion/support/is_iterator.hpp
+x64-windows-static/include/boost/fusion/support/is_segmented.hpp
+x64-windows-static/include/boost/fusion/support/is_sequence.hpp
+x64-windows-static/include/boost/fusion/support/is_view.hpp
+x64-windows-static/include/boost/fusion/support/iterator_base.hpp
+x64-windows-static/include/boost/fusion/support/pair.hpp
+x64-windows-static/include/boost/fusion/support/segmented_fold_until.hpp
+x64-windows-static/include/boost/fusion/support/sequence_base.hpp
+x64-windows-static/include/boost/fusion/support/tag_of.hpp
+x64-windows-static/include/boost/fusion/support/tag_of_fwd.hpp
+x64-windows-static/include/boost/fusion/support/unused.hpp
+x64-windows-static/include/boost/fusion/support/void.hpp
+x64-windows-static/include/boost/fusion/tuple.hpp
+x64-windows-static/include/boost/fusion/tuple/
+x64-windows-static/include/boost/fusion/tuple/detail/
+x64-windows-static/include/boost/fusion/tuple/detail/make_tuple.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/make_tuple.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/make_tuple10.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/make_tuple20.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/make_tuple30.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/make_tuple40.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/make_tuple50.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple10.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple10_fwd.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple20.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple20_fwd.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple30.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple30_fwd.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple40.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple40_fwd.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple50.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple50_fwd.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple_fwd.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple_tie.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple_tie10.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple_tie20.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple_tie30.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple_tie40.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/preprocessed/tuple_tie50.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/tuple.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/tuple_expand.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/tuple_fwd.hpp
+x64-windows-static/include/boost/fusion/tuple/detail/tuple_tie.hpp
+x64-windows-static/include/boost/fusion/tuple/make_tuple.hpp
+x64-windows-static/include/boost/fusion/tuple/tuple.hpp
+x64-windows-static/include/boost/fusion/tuple/tuple_fwd.hpp
+x64-windows-static/include/boost/fusion/tuple/tuple_tie.hpp
+x64-windows-static/include/boost/fusion/view.hpp
+x64-windows-static/include/boost/fusion/view/
+x64-windows-static/include/boost/fusion/view/detail/
+x64-windows-static/include/boost/fusion/view/detail/strictest_traversal.hpp
+x64-windows-static/include/boost/fusion/view/filter_view.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/
+x64-windows-static/include/boost/fusion/view/filter_view/detail/
+x64-windows-static/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/key_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/filter_view.hpp
+x64-windows-static/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
+x64-windows-static/include/boost/fusion/view/flatten_view.hpp
+x64-windows-static/include/boost/fusion/view/flatten_view/
+x64-windows-static/include/boost/fusion/view/flatten_view/flatten_view.hpp
+x64-windows-static/include/boost/fusion/view/flatten_view/flatten_view_iterator.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/view/iterator_range/iterator_range.hpp
+x64-windows-static/include/boost/fusion/view/joint_view.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/
+x64-windows-static/include/boost/fusion/view/joint_view/detail/
+x64-windows-static/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/detail/key_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/joint_view.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/joint_view_fwd.hpp
+x64-windows-static/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
+x64-windows-static/include/boost/fusion/view/nview.hpp
+x64-windows-static/include/boost/fusion/view/nview/
+x64-windows-static/include/boost/fusion/view/nview/detail/
+x64-windows-static/include/boost/fusion/view/nview/detail/advance_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/cpp03/
+x64-windows-static/include/boost/fusion/view/nview/detail/cpp03/nview_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/distance_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/equal_to_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/nview_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/prior_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/nview/nview.hpp
+x64-windows-static/include/boost/fusion/view/nview/nview_iterator.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view/
+x64-windows-static/include/boost/fusion/view/repetitive_view/detail/
+x64-windows-static/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view/repetitive_view.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp
+x64-windows-static/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/key_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/reverse_view.hpp
+x64-windows-static/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
+x64-windows-static/include/boost/fusion/view/single_view.hpp
+x64-windows-static/include/boost/fusion/view/single_view/
+x64-windows-static/include/boost/fusion/view/single_view/detail/
+x64-windows-static/include/boost/fusion/view/single_view/detail/advance_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/distance_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/equal_to_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/prior_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/single_view/single_view.hpp
+x64-windows-static/include/boost/fusion/view/single_view/single_view_iterator.hpp
+x64-windows-static/include/boost/fusion/view/transform_view.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/
+x64-windows-static/include/boost/fusion/view/transform_view/detail/
+x64-windows-static/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/transform_view.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/transform_view_fwd.hpp
+x64-windows-static/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
+x64-windows-static/include/boost/fusion/view/zip_view.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/
+x64-windows-static/include/boost/fusion/view/zip_view/detail/
+x64-windows-static/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/at_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/end_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/next_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/size_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/zip_view.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
+x64-windows-static/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-fusion/
+x64-windows-static/share/boost-fusion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,986 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/geometry.hpp
+x64-windows/include/boost/geometry/
+x64-windows/include/boost/geometry/algorithms/
+x64-windows/include/boost/geometry/algorithms/append.hpp
+x64-windows/include/boost/geometry/algorithms/area.hpp
+x64-windows/include/boost/geometry/algorithms/assign.hpp
+x64-windows/include/boost/geometry/algorithms/buffer.hpp
+x64-windows/include/boost/geometry/algorithms/centroid.hpp
+x64-windows/include/boost/geometry/algorithms/clear.hpp
+x64-windows/include/boost/geometry/algorithms/comparable_distance.hpp
+x64-windows/include/boost/geometry/algorithms/convert.hpp
+x64-windows/include/boost/geometry/algorithms/convex_hull.hpp
+x64-windows/include/boost/geometry/algorithms/correct.hpp
+x64-windows/include/boost/geometry/algorithms/correct_closure.hpp
+x64-windows/include/boost/geometry/algorithms/covered_by.hpp
+x64-windows/include/boost/geometry/algorithms/crosses.hpp
+x64-windows/include/boost/geometry/algorithms/densify.hpp
+x64-windows/include/boost/geometry/algorithms/detail/
+x64-windows/include/boost/geometry/algorithms/detail/as_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/assign_box_corners.hpp
+x64-windows/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/assign_values.hpp
+x64-windows/include/boost/geometry/algorithms/detail/azimuth.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/
+x64-windows/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/parallel_continue.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/turn_in_original_visitor.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp
+x64-windows/include/boost/geometry/algorithms/detail/calculate_null.hpp
+x64-windows/include/boost/geometry/algorithms/detail/calculate_sum.hpp
+x64-windows/include/boost/geometry/algorithms/detail/centroid/
+x64-windows/include/boost/geometry/algorithms/detail/centroid/translating_transformer.hpp
+x64-windows/include/boost/geometry/algorithms/detail/check_iterator_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/closest_feature/
+x64-windows/include/boost/geometry/algorithms/detail/closest_feature/geometry_to_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/closest_feature/point_to_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/closest_feature/range_to_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/comparable_distance/
+x64-windows/include/boost/geometry/algorithms/detail/comparable_distance/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
+x64-windows/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/counting.hpp
+x64-windows/include/boost/geometry/algorithms/detail/course.hpp
+x64-windows/include/boost/geometry/algorithms/detail/covered_by/
+x64-windows/include/boost/geometry/algorithms/detail/covered_by/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/covered_by/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/direction_code.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/multipoint_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/multirange_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/point_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/point_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/
+x64-windows/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/is_comparable.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/iterator_selector.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/linear_or_areal_to_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/linear_to_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/multipoint_to_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/
+x64-windows/include/boost/geometry/algorithms/detail/envelope/box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/initialize.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/intersects_antimeridian.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/multipoint.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/segment.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/transform_units.hpp
+x64-windows/include/boost/geometry/algorithms/detail/equals/
+x64-windows/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
+x64-windows/include/boost/geometry/algorithms/detail/equals/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/equals/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/equals/point_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/
+x64-windows/include/boost/geometry/algorithms/detail/expand/box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/indexed.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/segment.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand_by_epsilon.hpp
+x64-windows/include/boost/geometry/algorithms/detail/extreme_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/for_each_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/get_left_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/get_max_size.hpp
+x64-windows/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
+x64-windows/include/boost/geometry/algorithms/detail/interior_iterator.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersection/
+x64-windows/include/boost/geometry/algorithms/detail/intersection/box_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersection/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersection/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersection/multi.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersects/
+x64-windows/include/boost/geometry/algorithms/detail/intersects/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersects/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/always_simple.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/debug_print_boundary_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/failure_policy.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/debug_complement_graph.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/debug_print_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/debug_validity_phase.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/has_invalid_coordinate.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/is_acceptable_turn.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/ring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/segment.hpp
+x64-windows/include/boost/geometry/algorithms/detail/max_interval_gap.hpp
+x64-windows/include/boost/geometry/algorithms/detail/multi_modify.hpp
+x64-windows/include/boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp
+x64-windows/include/boost/geometry/algorithms/detail/multi_sum.hpp
+x64-windows/include/boost/geometry/algorithms/detail/normalize.hpp
+x64-windows/include/boost/geometry/algorithms/detail/not.hpp
+x64-windows/include/boost/geometry/algorithms/detail/num_distinct_consecutive_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/occupation_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlaps/
+x64-windows/include/boost/geometry/algorithms/detail/overlaps/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlaps/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/
+x64-windows/include/boost/geometry/algorithms/detail/overlay/add_rings.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/check_enrich.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/cluster_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/convert_ring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/do_reverse.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/follow.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_ring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/handle_colocations.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/handle_self_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/is_self_turn.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/less_by_segment_ratio.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/needs_self_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/overlay_type.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/pointlike_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/range_in_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/ring_properties.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/segment_identifier.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traversal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traversal_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/turn_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/visit_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/partition.hpp
+x64-windows/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/point_on_border.hpp
+x64-windows/include/boost/geometry/algorithms/detail/recalculate.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/
+x64-windows/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/de9im.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/multi_point_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/point_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/point_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/relate_impl.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/result.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/topology_check.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relation/
+x64-windows/include/boost/geometry/algorithms/detail/relation/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relation/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/ring_identifier.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sections/
+x64-windows/include/boost/geometry/algorithms/detail/sections/range_by_section.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sections/section_box_policies.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
+x64-windows/include/boost/geometry/algorithms/detail/signed_size_type.hpp
+x64-windows/include/boost/geometry/algorithms/detail/single_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sub_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sweep.hpp
+x64-windows/include/boost/geometry/algorithms/detail/throw_on_empty_input.hpp
+x64-windows/include/boost/geometry/algorithms/detail/touches/
+x64-windows/include/boost/geometry/algorithms/detail/touches/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/touches/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/
+x64-windows/include/boost/geometry/algorithms/detail/turns/compare_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/debug_turn.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/filter_continue_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/print_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/remove_duplicate_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/
+x64-windows/include/boost/geometry/algorithms/detail/within/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/multi_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/point_in_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
+x64-windows/include/boost/geometry/algorithms/difference.hpp
+x64-windows/include/boost/geometry/algorithms/disjoint.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/
+x64-windows/include/boost/geometry/algorithms/dispatch/disjoint.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/distance.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/envelope.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/expand.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/is_simple.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/is_valid.hpp
+x64-windows/include/boost/geometry/algorithms/distance.hpp
+x64-windows/include/boost/geometry/algorithms/envelope.hpp
+x64-windows/include/boost/geometry/algorithms/equals.hpp
+x64-windows/include/boost/geometry/algorithms/expand.hpp
+x64-windows/include/boost/geometry/algorithms/for_each.hpp
+x64-windows/include/boost/geometry/algorithms/intersection.hpp
+x64-windows/include/boost/geometry/algorithms/intersects.hpp
+x64-windows/include/boost/geometry/algorithms/is_convex.hpp
+x64-windows/include/boost/geometry/algorithms/is_empty.hpp
+x64-windows/include/boost/geometry/algorithms/is_simple.hpp
+x64-windows/include/boost/geometry/algorithms/is_valid.hpp
+x64-windows/include/boost/geometry/algorithms/length.hpp
+x64-windows/include/boost/geometry/algorithms/make.hpp
+x64-windows/include/boost/geometry/algorithms/not_implemented.hpp
+x64-windows/include/boost/geometry/algorithms/num_geometries.hpp
+x64-windows/include/boost/geometry/algorithms/num_interior_rings.hpp
+x64-windows/include/boost/geometry/algorithms/num_points.hpp
+x64-windows/include/boost/geometry/algorithms/num_segments.hpp
+x64-windows/include/boost/geometry/algorithms/overlaps.hpp
+x64-windows/include/boost/geometry/algorithms/perimeter.hpp
+x64-windows/include/boost/geometry/algorithms/point_on_surface.hpp
+x64-windows/include/boost/geometry/algorithms/relate.hpp
+x64-windows/include/boost/geometry/algorithms/relation.hpp
+x64-windows/include/boost/geometry/algorithms/remove_spikes.hpp
+x64-windows/include/boost/geometry/algorithms/reverse.hpp
+x64-windows/include/boost/geometry/algorithms/simplify.hpp
+x64-windows/include/boost/geometry/algorithms/sym_difference.hpp
+x64-windows/include/boost/geometry/algorithms/touches.hpp
+x64-windows/include/boost/geometry/algorithms/transform.hpp
+x64-windows/include/boost/geometry/algorithms/union.hpp
+x64-windows/include/boost/geometry/algorithms/unique.hpp
+x64-windows/include/boost/geometry/algorithms/validity_failure_type.hpp
+x64-windows/include/boost/geometry/algorithms/within.hpp
+x64-windows/include/boost/geometry/arithmetic/
+x64-windows/include/boost/geometry/arithmetic/arithmetic.hpp
+x64-windows/include/boost/geometry/arithmetic/cross_product.hpp
+x64-windows/include/boost/geometry/arithmetic/determinant.hpp
+x64-windows/include/boost/geometry/arithmetic/dot_product.hpp
+x64-windows/include/boost/geometry/arithmetic/normalize.hpp
+x64-windows/include/boost/geometry/core/
+x64-windows/include/boost/geometry/core/access.hpp
+x64-windows/include/boost/geometry/core/assert.hpp
+x64-windows/include/boost/geometry/core/closure.hpp
+x64-windows/include/boost/geometry/core/coordinate_dimension.hpp
+x64-windows/include/boost/geometry/core/coordinate_system.hpp
+x64-windows/include/boost/geometry/core/coordinate_type.hpp
+x64-windows/include/boost/geometry/core/cs.hpp
+x64-windows/include/boost/geometry/core/exception.hpp
+x64-windows/include/boost/geometry/core/exterior_ring.hpp
+x64-windows/include/boost/geometry/core/geometry_id.hpp
+x64-windows/include/boost/geometry/core/interior_rings.hpp
+x64-windows/include/boost/geometry/core/interior_type.hpp
+x64-windows/include/boost/geometry/core/is_areal.hpp
+x64-windows/include/boost/geometry/core/mutable_range.hpp
+x64-windows/include/boost/geometry/core/point_order.hpp
+x64-windows/include/boost/geometry/core/point_type.hpp
+x64-windows/include/boost/geometry/core/radian_access.hpp
+x64-windows/include/boost/geometry/core/radius.hpp
+x64-windows/include/boost/geometry/core/reverse_dispatch.hpp
+x64-windows/include/boost/geometry/core/ring_type.hpp
+x64-windows/include/boost/geometry/core/tag.hpp
+x64-windows/include/boost/geometry/core/tag_cast.hpp
+x64-windows/include/boost/geometry/core/tags.hpp
+x64-windows/include/boost/geometry/core/topological_dimension.hpp
+x64-windows/include/boost/geometry/formulas/
+x64-windows/include/boost/geometry/formulas/andoyer_inverse.hpp
+x64-windows/include/boost/geometry/formulas/area_formulas.hpp
+x64-windows/include/boost/geometry/formulas/authalic_radius_sqr.hpp
+x64-windows/include/boost/geometry/formulas/differential_quantities.hpp
+x64-windows/include/boost/geometry/formulas/eccentricity_sqr.hpp
+x64-windows/include/boost/geometry/formulas/elliptic_arc_length.hpp
+x64-windows/include/boost/geometry/formulas/flattening.hpp
+x64-windows/include/boost/geometry/formulas/geographic.hpp
+x64-windows/include/boost/geometry/formulas/gnomonic_intersection.hpp
+x64-windows/include/boost/geometry/formulas/gnomonic_spheroid.hpp
+x64-windows/include/boost/geometry/formulas/mean_radius.hpp
+x64-windows/include/boost/geometry/formulas/result_direct.hpp
+x64-windows/include/boost/geometry/formulas/result_inverse.hpp
+x64-windows/include/boost/geometry/formulas/sjoberg_intersection.hpp
+x64-windows/include/boost/geometry/formulas/spherical.hpp
+x64-windows/include/boost/geometry/formulas/thomas_direct.hpp
+x64-windows/include/boost/geometry/formulas/thomas_inverse.hpp
+x64-windows/include/boost/geometry/formulas/unit_spheroid.hpp
+x64-windows/include/boost/geometry/formulas/vertex_latitude.hpp
+x64-windows/include/boost/geometry/formulas/vertex_longitude.hpp
+x64-windows/include/boost/geometry/formulas/vincenty_direct.hpp
+x64-windows/include/boost/geometry/formulas/vincenty_inverse.hpp
+x64-windows/include/boost/geometry/geometries/
+x64-windows/include/boost/geometry/geometries/adapted/
+x64-windows/include/boost/geometry/geometries/adapted/boost_array.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_fusion.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/box.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/hole_iterator.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/holes_proxy.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/point.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/polygon.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/ring.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/ring_proxy.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/adjacent_filtered.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/filtered.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/reversed.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/sliced.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/strided.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/uniqued.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_tuple.hpp
+x64-windows/include/boost/geometry/geometries/adapted/c_array.hpp
+x64-windows/include/boost/geometry/geometries/adapted/std_array.hpp
+x64-windows/include/boost/geometry/geometries/adapted/std_pair_as_segment.hpp
+x64-windows/include/boost/geometry/geometries/box.hpp
+x64-windows/include/boost/geometry/geometries/concepts/
+x64-windows/include/boost/geometry/geometries/concepts/box_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/check.hpp
+x64-windows/include/boost/geometry/geometries/concepts/linestring_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/multi_linestring_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/multi_point_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/multi_polygon_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/point_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/polygon_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/ring_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/segment_concept.hpp
+x64-windows/include/boost/geometry/geometries/geometries.hpp
+x64-windows/include/boost/geometry/geometries/helper_geometry.hpp
+x64-windows/include/boost/geometry/geometries/linestring.hpp
+x64-windows/include/boost/geometry/geometries/multi_linestring.hpp
+x64-windows/include/boost/geometry/geometries/multi_point.hpp
+x64-windows/include/boost/geometry/geometries/multi_polygon.hpp
+x64-windows/include/boost/geometry/geometries/point.hpp
+x64-windows/include/boost/geometry/geometries/point_xy.hpp
+x64-windows/include/boost/geometry/geometries/pointing_segment.hpp
+x64-windows/include/boost/geometry/geometries/polygon.hpp
+x64-windows/include/boost/geometry/geometries/register/
+x64-windows/include/boost/geometry/geometries/register/box.hpp
+x64-windows/include/boost/geometry/geometries/register/linestring.hpp
+x64-windows/include/boost/geometry/geometries/register/multi_linestring.hpp
+x64-windows/include/boost/geometry/geometries/register/multi_point.hpp
+x64-windows/include/boost/geometry/geometries/register/multi_polygon.hpp
+x64-windows/include/boost/geometry/geometries/register/point.hpp
+x64-windows/include/boost/geometry/geometries/register/ring.hpp
+x64-windows/include/boost/geometry/geometries/register/segment.hpp
+x64-windows/include/boost/geometry/geometries/ring.hpp
+x64-windows/include/boost/geometry/geometries/segment.hpp
+x64-windows/include/boost/geometry/geometries/variant.hpp
+x64-windows/include/boost/geometry/geometry.hpp
+x64-windows/include/boost/geometry/index/
+x64-windows/include/boost/geometry/index/adaptors/
+x64-windows/include/boost/geometry/index/adaptors/query.hpp
+x64-windows/include/boost/geometry/index/detail/
+x64-windows/include/boost/geometry/index/detail/algorithms/
+x64-windows/include/boost/geometry/index/detail/algorithms/bounds.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/content.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/diff_abs.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/is_valid.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/margin.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/nth_element.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/segment_intersection.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/smallest_for_indexable.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/sum_for_indexable.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/union_content.hpp
+x64-windows/include/boost/geometry/index/detail/assert.hpp
+x64-windows/include/boost/geometry/index/detail/bounded_view.hpp
+x64-windows/include/boost/geometry/index/detail/config_begin.hpp
+x64-windows/include/boost/geometry/index/detail/config_end.hpp
+x64-windows/include/boost/geometry/index/detail/distance_predicates.hpp
+x64-windows/include/boost/geometry/index/detail/exception.hpp
+x64-windows/include/boost/geometry/index/detail/is_bounding_geometry.hpp
+x64-windows/include/boost/geometry/index/detail/is_indexable.hpp
+x64-windows/include/boost/geometry/index/detail/meta.hpp
+x64-windows/include/boost/geometry/index/detail/predicates.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/
+x64-windows/include/boost/geometry/index/detail/rtree/adaptors.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/iterators.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/kmeans/
+x64-windows/include/boost/geometry/index/detail/rtree/kmeans/kmeans.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/kmeans/split.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/linear/
+x64-windows/include/boost/geometry/index/detail/rtree/linear/linear.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/
+x64-windows/include/boost/geometry/index/detail/rtree/node/concept.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/node.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/node_elements.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/pairs.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/scoped_deallocator.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/subtree_destroyer.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/variant_static.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/variant_visitor.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/weak_static.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/weak_visitor.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/options.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/pack_create.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/quadratic/
+x64-windows/include/boost/geometry/index/detail/rtree/quadratic/quadratic.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/query_iterators.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/insert.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/rstar.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/are_boxes_ok.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/are_counts_ok.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/print.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/statistics.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/view.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/copy.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/count.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/distance_query.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/insert.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/iterator.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/remove.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
+x64-windows/include/boost/geometry/index/detail/serialization.hpp
+x64-windows/include/boost/geometry/index/detail/tags.hpp
+x64-windows/include/boost/geometry/index/detail/translator.hpp
+x64-windows/include/boost/geometry/index/detail/tuples.hpp
+x64-windows/include/boost/geometry/index/detail/utilities.hpp
+x64-windows/include/boost/geometry/index/detail/varray.hpp
+x64-windows/include/boost/geometry/index/detail/varray_detail.hpp
+x64-windows/include/boost/geometry/index/distance_predicates.hpp
+x64-windows/include/boost/geometry/index/equal_to.hpp
+x64-windows/include/boost/geometry/index/indexable.hpp
+x64-windows/include/boost/geometry/index/inserter.hpp
+x64-windows/include/boost/geometry/index/parameters.hpp
+x64-windows/include/boost/geometry/index/predicates.hpp
+x64-windows/include/boost/geometry/index/rtree.hpp
+x64-windows/include/boost/geometry/io/
+x64-windows/include/boost/geometry/io/dsv/
+x64-windows/include/boost/geometry/io/dsv/write.hpp
+x64-windows/include/boost/geometry/io/io.hpp
+x64-windows/include/boost/geometry/io/svg/
+x64-windows/include/boost/geometry/io/svg/svg_mapper.hpp
+x64-windows/include/boost/geometry/io/svg/write.hpp
+x64-windows/include/boost/geometry/io/svg/write_svg.hpp
+x64-windows/include/boost/geometry/io/svg/write_svg_multi.hpp
+x64-windows/include/boost/geometry/io/wkt/
+x64-windows/include/boost/geometry/io/wkt/detail/
+x64-windows/include/boost/geometry/io/wkt/detail/prefix.hpp
+x64-windows/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
+x64-windows/include/boost/geometry/io/wkt/read.hpp
+x64-windows/include/boost/geometry/io/wkt/stream.hpp
+x64-windows/include/boost/geometry/io/wkt/wkt.hpp
+x64-windows/include/boost/geometry/io/wkt/write.hpp
+x64-windows/include/boost/geometry/iterators/
+x64-windows/include/boost/geometry/iterators/base.hpp
+x64-windows/include/boost/geometry/iterators/closing_iterator.hpp
+x64-windows/include/boost/geometry/iterators/concatenate_iterator.hpp
+x64-windows/include/boost/geometry/iterators/detail/
+x64-windows/include/boost/geometry/iterators/detail/point_iterator/
+x64-windows/include/boost/geometry/iterators/detail/point_iterator/inner_range_type.hpp
+x64-windows/include/boost/geometry/iterators/detail/point_iterator/iterator_type.hpp
+x64-windows/include/boost/geometry/iterators/detail/point_iterator/value_type.hpp
+x64-windows/include/boost/geometry/iterators/detail/segment_iterator/
+x64-windows/include/boost/geometry/iterators/detail/segment_iterator/iterator_type.hpp
+x64-windows/include/boost/geometry/iterators/detail/segment_iterator/range_segment_iterator.hpp
+x64-windows/include/boost/geometry/iterators/detail/segment_iterator/value_type.hpp
+x64-windows/include/boost/geometry/iterators/dispatch/
+x64-windows/include/boost/geometry/iterators/dispatch/point_iterator.hpp
+x64-windows/include/boost/geometry/iterators/dispatch/segment_iterator.hpp
+x64-windows/include/boost/geometry/iterators/ever_circling_iterator.hpp
+x64-windows/include/boost/geometry/iterators/flatten_iterator.hpp
+x64-windows/include/boost/geometry/iterators/has_one_element.hpp
+x64-windows/include/boost/geometry/iterators/point_iterator.hpp
+x64-windows/include/boost/geometry/iterators/point_reverse_iterator.hpp
+x64-windows/include/boost/geometry/iterators/segment_iterator.hpp
+x64-windows/include/boost/geometry/multi/
+x64-windows/include/boost/geometry/multi/algorithms/
+x64-windows/include/boost/geometry/multi/algorithms/append.hpp
+x64-windows/include/boost/geometry/multi/algorithms/area.hpp
+x64-windows/include/boost/geometry/multi/algorithms/centroid.hpp
+x64-windows/include/boost/geometry/multi/algorithms/clear.hpp
+x64-windows/include/boost/geometry/multi/algorithms/convert.hpp
+x64-windows/include/boost/geometry/multi/algorithms/correct.hpp
+x64-windows/include/boost/geometry/multi/algorithms/covered_by.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/
+x64-windows/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/modify.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/sections/
+x64-windows/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
+x64-windows/include/boost/geometry/multi/algorithms/disjoint.hpp
+x64-windows/include/boost/geometry/multi/algorithms/distance.hpp
+x64-windows/include/boost/geometry/multi/algorithms/envelope.hpp
+x64-windows/include/boost/geometry/multi/algorithms/equals.hpp
+x64-windows/include/boost/geometry/multi/algorithms/for_each.hpp
+x64-windows/include/boost/geometry/multi/algorithms/intersection.hpp
+x64-windows/include/boost/geometry/multi/algorithms/length.hpp
+x64-windows/include/boost/geometry/multi/algorithms/num_geometries.hpp
+x64-windows/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
+x64-windows/include/boost/geometry/multi/algorithms/num_points.hpp
+x64-windows/include/boost/geometry/multi/algorithms/perimeter.hpp
+x64-windows/include/boost/geometry/multi/algorithms/remove_spikes.hpp
+x64-windows/include/boost/geometry/multi/algorithms/reverse.hpp
+x64-windows/include/boost/geometry/multi/algorithms/simplify.hpp
+x64-windows/include/boost/geometry/multi/algorithms/transform.hpp
+x64-windows/include/boost/geometry/multi/algorithms/unique.hpp
+x64-windows/include/boost/geometry/multi/algorithms/within.hpp
+x64-windows/include/boost/geometry/multi/core/
+x64-windows/include/boost/geometry/multi/core/closure.hpp
+x64-windows/include/boost/geometry/multi/core/geometry_id.hpp
+x64-windows/include/boost/geometry/multi/core/interior_rings.hpp
+x64-windows/include/boost/geometry/multi/core/is_areal.hpp
+x64-windows/include/boost/geometry/multi/core/point_order.hpp
+x64-windows/include/boost/geometry/multi/core/point_type.hpp
+x64-windows/include/boost/geometry/multi/core/ring_type.hpp
+x64-windows/include/boost/geometry/multi/core/tags.hpp
+x64-windows/include/boost/geometry/multi/core/topological_dimension.hpp
+x64-windows/include/boost/geometry/multi/geometries/
+x64-windows/include/boost/geometry/multi/geometries/concepts/
+x64-windows/include/boost/geometry/multi/geometries/concepts/check.hpp
+x64-windows/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
+x64-windows/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
+x64-windows/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
+x64-windows/include/boost/geometry/multi/geometries/multi_geometries.hpp
+x64-windows/include/boost/geometry/multi/geometries/multi_linestring.hpp
+x64-windows/include/boost/geometry/multi/geometries/multi_point.hpp
+x64-windows/include/boost/geometry/multi/geometries/multi_polygon.hpp
+x64-windows/include/boost/geometry/multi/geometries/register/
+x64-windows/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
+x64-windows/include/boost/geometry/multi/geometries/register/multi_point.hpp
+x64-windows/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
+x64-windows/include/boost/geometry/multi/io/
+x64-windows/include/boost/geometry/multi/io/dsv/
+x64-windows/include/boost/geometry/multi/io/dsv/write.hpp
+x64-windows/include/boost/geometry/multi/io/wkt/
+x64-windows/include/boost/geometry/multi/io/wkt/detail/
+x64-windows/include/boost/geometry/multi/io/wkt/detail/prefix.hpp
+x64-windows/include/boost/geometry/multi/io/wkt/read.hpp
+x64-windows/include/boost/geometry/multi/io/wkt/wkt.hpp
+x64-windows/include/boost/geometry/multi/io/wkt/write.hpp
+x64-windows/include/boost/geometry/multi/multi.hpp
+x64-windows/include/boost/geometry/multi/strategies/
+x64-windows/include/boost/geometry/multi/strategies/cartesian/
+x64-windows/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
+x64-windows/include/boost/geometry/multi/views/
+x64-windows/include/boost/geometry/multi/views/detail/
+x64-windows/include/boost/geometry/multi/views/detail/range_type.hpp
+x64-windows/include/boost/geometry/policies/
+x64-windows/include/boost/geometry/policies/compare.hpp
+x64-windows/include/boost/geometry/policies/disjoint_interrupt_policy.hpp
+x64-windows/include/boost/geometry/policies/is_valid/
+x64-windows/include/boost/geometry/policies/is_valid/default_policy.hpp
+x64-windows/include/boost/geometry/policies/is_valid/failing_reason_policy.hpp
+x64-windows/include/boost/geometry/policies/is_valid/failure_type_policy.hpp
+x64-windows/include/boost/geometry/policies/predicate_based_interrupt_policy.hpp
+x64-windows/include/boost/geometry/policies/relate/
+x64-windows/include/boost/geometry/policies/relate/direction.hpp
+x64-windows/include/boost/geometry/policies/relate/intersection_points.hpp
+x64-windows/include/boost/geometry/policies/relate/intersection_ratios.hpp
+x64-windows/include/boost/geometry/policies/relate/tupled.hpp
+x64-windows/include/boost/geometry/policies/robustness/
+x64-windows/include/boost/geometry/policies/robustness/get_rescale_policy.hpp
+x64-windows/include/boost/geometry/policies/robustness/no_rescale_policy.hpp
+x64-windows/include/boost/geometry/policies/robustness/rescale_policy.hpp
+x64-windows/include/boost/geometry/policies/robustness/robust_point_type.hpp
+x64-windows/include/boost/geometry/policies/robustness/robust_type.hpp
+x64-windows/include/boost/geometry/policies/robustness/segment_ratio.hpp
+x64-windows/include/boost/geometry/policies/robustness/segment_ratio_type.hpp
+x64-windows/include/boost/geometry/srs/
+x64-windows/include/boost/geometry/srs/epsg.hpp
+x64-windows/include/boost/geometry/srs/esri.hpp
+x64-windows/include/boost/geometry/srs/iau2000.hpp
+x64-windows/include/boost/geometry/srs/projection.hpp
+x64-windows/include/boost/geometry/srs/projections/
+x64-windows/include/boost/geometry/srs/projections/code.hpp
+x64-windows/include/boost/geometry/srs/projections/epsg.hpp
+x64-windows/include/boost/geometry/srs/projections/epsg_params.hpp
+x64-windows/include/boost/geometry/srs/projections/epsg_traits.hpp
+x64-windows/include/boost/geometry/srs/projections/esri.hpp
+x64-windows/include/boost/geometry/srs/projections/esri_params.hpp
+x64-windows/include/boost/geometry/srs/projections/esri_traits.hpp
+x64-windows/include/boost/geometry/srs/projections/exception.hpp
+x64-windows/include/boost/geometry/srs/projections/factory.hpp
+x64-windows/include/boost/geometry/srs/projections/iau2000.hpp
+x64-windows/include/boost/geometry/srs/projections/iau2000_params.hpp
+x64-windows/include/boost/geometry/srs/projections/iau2000_traits.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/
+x64-windows/include/boost/geometry/srs/projections/impl/aasincos.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/adjlon.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/base_dynamic.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/base_static.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/dms_parser.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/factory_entry.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/function_overloads.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/geocent.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_auth.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_datum_set.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_datums.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_ell_set.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_ellps.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_fwd.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_gauss.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_init.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_inv.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_mlfn.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_msfn.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_param.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_phi2.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_qsfn.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_strerrno.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_transform.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_tsfn.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_units.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_zpoly1.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/proj_mdist.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/projects.hpp
+x64-windows/include/boost/geometry/srs/projections/invalid_point.hpp
+x64-windows/include/boost/geometry/srs/projections/par4.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/
+x64-windows/include/boost/geometry/srs/projections/proj/aea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/aeqd.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/airy.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/aitoff.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/august.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/bacon.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/bipc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/boggs.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/bonne.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/cass.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/cc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/cea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/chamb.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/collg.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/crast.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/denoy.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck1.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck3.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck4.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck5.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eqc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eqdc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/etmerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/fahey.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/fouc_s.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gall.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/geocent.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/geos.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gins8.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gn_sinu.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gnom.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/goode.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gstmerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/hammer.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/hatano.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/healpix.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/igh.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/imw_p.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/isea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/krovak.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/labrd.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/laea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lagrng.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/larr.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lask.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/latlong.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lcc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lcca.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/loxim.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lsat.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mbt_fps.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mbtfpp.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mbtfpq.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/merc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mill.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mod_ster.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/moll.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/natearth.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nell.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nell_h.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nocol.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nsper.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nzmg.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/ob_tran.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/ocea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/oea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/omerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/ortho.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/poly.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp3.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp4p.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp5.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp6.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/qsc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/robin.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/rouss.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/rpoly.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/sconics.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/somerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/stere.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/sterea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/sts.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/tcc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/tcea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/tmerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/tpeqd.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/urm5.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/urmfps.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/vandg.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/vandg2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/vandg4.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wag2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wag3.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wag7.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wink1.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wink2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj4.hpp
+x64-windows/include/boost/geometry/srs/projections/srid_traits.hpp
+x64-windows/include/boost/geometry/srs/sphere.hpp
+x64-windows/include/boost/geometry/srs/spheroid.hpp
+x64-windows/include/boost/geometry/srs/srs.hpp
+x64-windows/include/boost/geometry/srs/transformation.hpp
+x64-windows/include/boost/geometry/strategies/
+x64-windows/include/boost/geometry/strategies/agnostic/
+x64-windows/include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/point_in_point.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/point_in_poly_oriented_winding.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
+x64-windows/include/boost/geometry/strategies/area.hpp
+x64-windows/include/boost/geometry/strategies/area_result.hpp
+x64-windows/include/boost/geometry/strategies/azimuth.hpp
+x64-windows/include/boost/geometry/strategies/buffer.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/
+x64-windows/include/boost/geometry/strategies/cartesian/area.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/area_surveyor.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/azimuth.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/box_in_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_join_miter.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_point_circle.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_point_square.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_side_straight.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/centroid_average.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/densify.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/envelope_segment.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/intersection.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/point_in_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/point_in_poly_winding.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/side_of_intersection.hpp
+x64-windows/include/boost/geometry/strategies/centroid.hpp
+x64-windows/include/boost/geometry/strategies/comparable_distance_result.hpp
+x64-windows/include/boost/geometry/strategies/compare.hpp
+x64-windows/include/boost/geometry/strategies/concepts/
+x64-windows/include/boost/geometry/strategies/concepts/area_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/centroid_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/convex_hull_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/distance_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/segment_intersect_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/simplify_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/within_concept.hpp
+x64-windows/include/boost/geometry/strategies/convex_hull.hpp
+x64-windows/include/boost/geometry/strategies/covered_by.hpp
+x64-windows/include/boost/geometry/strategies/default_area_result.hpp
+x64-windows/include/boost/geometry/strategies/default_comparable_distance_result.hpp
+x64-windows/include/boost/geometry/strategies/default_distance_result.hpp
+x64-windows/include/boost/geometry/strategies/default_length_result.hpp
+x64-windows/include/boost/geometry/strategies/default_strategy.hpp
+x64-windows/include/boost/geometry/strategies/densify.hpp
+x64-windows/include/boost/geometry/strategies/disjoint.hpp
+x64-windows/include/boost/geometry/strategies/distance.hpp
+x64-windows/include/boost/geometry/strategies/distance_result.hpp
+x64-windows/include/boost/geometry/strategies/envelope.hpp
+x64-windows/include/boost/geometry/strategies/geographic/
+x64-windows/include/boost/geometry/strategies/geographic/area.hpp
+x64-windows/include/boost/geometry/strategies/geographic/azimuth.hpp
+x64-windows/include/boost/geometry/strategies/geographic/densify.hpp
+x64-windows/include/boost/geometry/strategies/geographic/disjoint_segment_box.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_andoyer.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_cross_track.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_cross_track_box_box.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_cross_track_point_box.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_thomas.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_vincenty.hpp
+x64-windows/include/boost/geometry/strategies/geographic/envelope_segment.hpp
+x64-windows/include/boost/geometry/strategies/geographic/intersection.hpp
+x64-windows/include/boost/geometry/strategies/geographic/intersection_elliptic.hpp
+x64-windows/include/boost/geometry/strategies/geographic/mapping_ssf.hpp
+x64-windows/include/boost/geometry/strategies/geographic/parameters.hpp
+x64-windows/include/boost/geometry/strategies/geographic/point_in_poly_winding.hpp
+x64-windows/include/boost/geometry/strategies/geographic/side.hpp
+x64-windows/include/boost/geometry/strategies/geographic/side_andoyer.hpp
+x64-windows/include/boost/geometry/strategies/geographic/side_thomas.hpp
+x64-windows/include/boost/geometry/strategies/geographic/side_vincenty.hpp
+x64-windows/include/boost/geometry/strategies/intersection.hpp
+x64-windows/include/boost/geometry/strategies/intersection_result.hpp
+x64-windows/include/boost/geometry/strategies/intersection_strategies.hpp
+x64-windows/include/boost/geometry/strategies/relate.hpp
+x64-windows/include/boost/geometry/strategies/side.hpp
+x64-windows/include/boost/geometry/strategies/side_info.hpp
+x64-windows/include/boost/geometry/strategies/spherical/
+x64-windows/include/boost/geometry/strategies/spherical/area.hpp
+x64-windows/include/boost/geometry/strategies/spherical/azimuth.hpp
+x64-windows/include/boost/geometry/strategies/spherical/compare.hpp
+x64-windows/include/boost/geometry/strategies/spherical/densify.hpp
+x64-windows/include/boost/geometry/strategies/spherical/disjoint_segment_box.hpp
+x64-windows/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
+x64-windows/include/boost/geometry/strategies/spherical/distance_cross_track_box_box.hpp
+x64-windows/include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp
+x64-windows/include/boost/geometry/strategies/spherical/distance_haversine.hpp
+x64-windows/include/boost/geometry/strategies/spherical/envelope_segment.hpp
+x64-windows/include/boost/geometry/strategies/spherical/get_radius.hpp
+x64-windows/include/boost/geometry/strategies/spherical/intersection.hpp
+x64-windows/include/boost/geometry/strategies/spherical/point_in_poly_winding.hpp
+x64-windows/include/boost/geometry/strategies/spherical/side_by_cross_track.hpp
+x64-windows/include/boost/geometry/strategies/spherical/ssf.hpp
+x64-windows/include/boost/geometry/strategies/strategies.hpp
+x64-windows/include/boost/geometry/strategies/strategy_transform.hpp
+x64-windows/include/boost/geometry/strategies/tags.hpp
+x64-windows/include/boost/geometry/strategies/transform.hpp
+x64-windows/include/boost/geometry/strategies/transform/
+x64-windows/include/boost/geometry/strategies/transform/inverse_transformer.hpp
+x64-windows/include/boost/geometry/strategies/transform/map_transformer.hpp
+x64-windows/include/boost/geometry/strategies/transform/matrix_transformers.hpp
+x64-windows/include/boost/geometry/strategies/transform/srs_transformer.hpp
+x64-windows/include/boost/geometry/strategies/within.hpp
+x64-windows/include/boost/geometry/util/
+x64-windows/include/boost/geometry/util/add_const_if_c.hpp
+x64-windows/include/boost/geometry/util/bare_type.hpp
+x64-windows/include/boost/geometry/util/calculation_type.hpp
+x64-windows/include/boost/geometry/util/closure_as_bool.hpp
+x64-windows/include/boost/geometry/util/combine_if.hpp
+x64-windows/include/boost/geometry/util/compress_variant.hpp
+x64-windows/include/boost/geometry/util/condition.hpp
+x64-windows/include/boost/geometry/util/coordinate_cast.hpp
+x64-windows/include/boost/geometry/util/for_each_coordinate.hpp
+x64-windows/include/boost/geometry/util/has_infinite_coordinate.hpp
+x64-windows/include/boost/geometry/util/has_nan_coordinate.hpp
+x64-windows/include/boost/geometry/util/has_non_finite_coordinate.hpp
+x64-windows/include/boost/geometry/util/math.hpp
+x64-windows/include/boost/geometry/util/normalize_spheroidal_box_coordinates.hpp
+x64-windows/include/boost/geometry/util/normalize_spheroidal_coordinates.hpp
+x64-windows/include/boost/geometry/util/order_as_direction.hpp
+x64-windows/include/boost/geometry/util/parameter_type_of.hpp
+x64-windows/include/boost/geometry/util/promote_floating_point.hpp
+x64-windows/include/boost/geometry/util/promote_integral.hpp
+x64-windows/include/boost/geometry/util/range.hpp
+x64-windows/include/boost/geometry/util/rational.hpp
+x64-windows/include/boost/geometry/util/readme.txt
+x64-windows/include/boost/geometry/util/select_calculation_type.hpp
+x64-windows/include/boost/geometry/util/select_coordinate_type.hpp
+x64-windows/include/boost/geometry/util/select_most_precise.hpp
+x64-windows/include/boost/geometry/util/select_sequence_element.hpp
+x64-windows/include/boost/geometry/util/transform_variant.hpp
+x64-windows/include/boost/geometry/views/
+x64-windows/include/boost/geometry/views/box_view.hpp
+x64-windows/include/boost/geometry/views/closeable_view.hpp
+x64-windows/include/boost/geometry/views/detail/
+x64-windows/include/boost/geometry/views/detail/boundary_view.hpp
+x64-windows/include/boost/geometry/views/detail/boundary_view/
+x64-windows/include/boost/geometry/views/detail/boundary_view/implementation.hpp
+x64-windows/include/boost/geometry/views/detail/boundary_view/interface.hpp
+x64-windows/include/boost/geometry/views/detail/indexed_point_view.hpp
+x64-windows/include/boost/geometry/views/detail/normalized_view.hpp
+x64-windows/include/boost/geometry/views/detail/points_view.hpp
+x64-windows/include/boost/geometry/views/detail/range_type.hpp
+x64-windows/include/boost/geometry/views/detail/two_dimensional_view.hpp
+x64-windows/include/boost/geometry/views/identity_view.hpp
+x64-windows/include/boost/geometry/views/reversible_view.hpp
+x64-windows/include/boost/geometry/views/segment_view.hpp
+x64-windows/share/
+x64-windows/share/boost-geometry/
+x64-windows/share/boost-geometry/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,986 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/geometry.hpp
+x64-windows-static/include/boost/geometry/
+x64-windows-static/include/boost/geometry/algorithms/
+x64-windows-static/include/boost/geometry/algorithms/append.hpp
+x64-windows-static/include/boost/geometry/algorithms/area.hpp
+x64-windows-static/include/boost/geometry/algorithms/assign.hpp
+x64-windows-static/include/boost/geometry/algorithms/buffer.hpp
+x64-windows-static/include/boost/geometry/algorithms/centroid.hpp
+x64-windows-static/include/boost/geometry/algorithms/clear.hpp
+x64-windows-static/include/boost/geometry/algorithms/comparable_distance.hpp
+x64-windows-static/include/boost/geometry/algorithms/convert.hpp
+x64-windows-static/include/boost/geometry/algorithms/convex_hull.hpp
+x64-windows-static/include/boost/geometry/algorithms/correct.hpp
+x64-windows-static/include/boost/geometry/algorithms/correct_closure.hpp
+x64-windows-static/include/boost/geometry/algorithms/covered_by.hpp
+x64-windows-static/include/boost/geometry/algorithms/crosses.hpp
+x64-windows-static/include/boost/geometry/algorithms/densify.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/
+x64-windows-static/include/boost/geometry/algorithms/detail/as_range.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/assign_box_corners.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/assign_values.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/azimuth.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/parallel_continue.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/turn_in_original_visitor.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/calculate_null.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/calculate_sum.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/centroid/
+x64-windows-static/include/boost/geometry/algorithms/detail/centroid/translating_transformer.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/check_iterator_range.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/closest_feature/
+x64-windows-static/include/boost/geometry/algorithms/detail/closest_feature/geometry_to_range.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/closest_feature/point_to_range.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/closest_feature/range_to_range.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/comparable_distance/
+x64-windows-static/include/boost/geometry/algorithms/detail/comparable_distance/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/counting.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/course.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/covered_by/
+x64-windows-static/include/boost/geometry/algorithms/detail/covered_by/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/covered_by/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/direction_code.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/multipoint_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/multirange_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/point_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/point_point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/is_comparable.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/iterator_selector.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/linear_or_areal_to_areal.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/linear_to_linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/multipoint_to_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/initialize.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/intersects_antimeridian.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/multipoint.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/range.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/segment.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/envelope/transform_units.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/equals/
+x64-windows-static/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/equals/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/equals/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/equals/point_point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/expand/
+x64-windows-static/include/boost/geometry/algorithms/detail/expand/box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/expand/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/expand/indexed.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/expand/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/expand/point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/expand/segment.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/expand_by_epsilon.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/extreme_points.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/for_each_range.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/get_left_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/get_max_size.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/interior_iterator.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/intersection/
+x64-windows-static/include/boost/geometry/algorithms/detail/intersection/box_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/intersection/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/intersection/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/intersection/multi.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/intersects/
+x64-windows-static/include/boost/geometry/algorithms/detail/intersects/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/intersects/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/always_simple.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/areal.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/debug_print_boundary_points.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/failure_policy.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/debug_complement_graph.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/debug_print_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/debug_validity_phase.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/has_invalid_coordinate.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/is_acceptable_turn.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/ring.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/is_valid/segment.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/max_interval_gap.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/multi_modify.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/multi_sum.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/normalize.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/not.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/num_distinct_consecutive_points.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/occupation_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlaps/
+x64-windows-static/include/boost/geometry/algorithms/detail/overlaps/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlaps/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/add_rings.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/check_enrich.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/cluster_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/convert_ring.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/do_reverse.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/follow.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_ring.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/handle_colocations.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/handle_self_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/is_self_turn.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/less_by_segment_ratio.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/needs_self_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/overlay_type.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/pointlike_linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/range_in_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/ring_properties.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/segment_identifier.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/traversal.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/traversal_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/turn_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/overlay/visit_info.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/partition.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/point_on_border.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/recalculate.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/de9im.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/multi_point_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/point_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/point_point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/relate_impl.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/result.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/topology_check.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relate/turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relation/
+x64-windows-static/include/boost/geometry/algorithms/detail/relation/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/relation/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/ring_identifier.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/sections/
+x64-windows-static/include/boost/geometry/algorithms/detail/sections/range_by_section.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/sections/section_box_policies.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/signed_size_type.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/single_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/sub_range.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/sweep.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/throw_on_empty_input.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/touches/
+x64-windows-static/include/boost/geometry/algorithms/detail/touches/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/touches/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/turns/
+x64-windows-static/include/boost/geometry/algorithms/detail/turns/compare_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/turns/debug_turn.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/turns/filter_continue_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/turns/print_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/turns/remove_duplicate_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/within/
+x64-windows-static/include/boost/geometry/algorithms/detail/within/implementation.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/within/interface.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/within/multi_point.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/within/point_in_geometry.hpp
+x64-windows-static/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
+x64-windows-static/include/boost/geometry/algorithms/difference.hpp
+x64-windows-static/include/boost/geometry/algorithms/disjoint.hpp
+x64-windows-static/include/boost/geometry/algorithms/dispatch/
+x64-windows-static/include/boost/geometry/algorithms/dispatch/disjoint.hpp
+x64-windows-static/include/boost/geometry/algorithms/dispatch/distance.hpp
+x64-windows-static/include/boost/geometry/algorithms/dispatch/envelope.hpp
+x64-windows-static/include/boost/geometry/algorithms/dispatch/expand.hpp
+x64-windows-static/include/boost/geometry/algorithms/dispatch/is_simple.hpp
+x64-windows-static/include/boost/geometry/algorithms/dispatch/is_valid.hpp
+x64-windows-static/include/boost/geometry/algorithms/distance.hpp
+x64-windows-static/include/boost/geometry/algorithms/envelope.hpp
+x64-windows-static/include/boost/geometry/algorithms/equals.hpp
+x64-windows-static/include/boost/geometry/algorithms/expand.hpp
+x64-windows-static/include/boost/geometry/algorithms/for_each.hpp
+x64-windows-static/include/boost/geometry/algorithms/intersection.hpp
+x64-windows-static/include/boost/geometry/algorithms/intersects.hpp
+x64-windows-static/include/boost/geometry/algorithms/is_convex.hpp
+x64-windows-static/include/boost/geometry/algorithms/is_empty.hpp
+x64-windows-static/include/boost/geometry/algorithms/is_simple.hpp
+x64-windows-static/include/boost/geometry/algorithms/is_valid.hpp
+x64-windows-static/include/boost/geometry/algorithms/length.hpp
+x64-windows-static/include/boost/geometry/algorithms/make.hpp
+x64-windows-static/include/boost/geometry/algorithms/not_implemented.hpp
+x64-windows-static/include/boost/geometry/algorithms/num_geometries.hpp
+x64-windows-static/include/boost/geometry/algorithms/num_interior_rings.hpp
+x64-windows-static/include/boost/geometry/algorithms/num_points.hpp
+x64-windows-static/include/boost/geometry/algorithms/num_segments.hpp
+x64-windows-static/include/boost/geometry/algorithms/overlaps.hpp
+x64-windows-static/include/boost/geometry/algorithms/perimeter.hpp
+x64-windows-static/include/boost/geometry/algorithms/point_on_surface.hpp
+x64-windows-static/include/boost/geometry/algorithms/relate.hpp
+x64-windows-static/include/boost/geometry/algorithms/relation.hpp
+x64-windows-static/include/boost/geometry/algorithms/remove_spikes.hpp
+x64-windows-static/include/boost/geometry/algorithms/reverse.hpp
+x64-windows-static/include/boost/geometry/algorithms/simplify.hpp
+x64-windows-static/include/boost/geometry/algorithms/sym_difference.hpp
+x64-windows-static/include/boost/geometry/algorithms/touches.hpp
+x64-windows-static/include/boost/geometry/algorithms/transform.hpp
+x64-windows-static/include/boost/geometry/algorithms/union.hpp
+x64-windows-static/include/boost/geometry/algorithms/unique.hpp
+x64-windows-static/include/boost/geometry/algorithms/validity_failure_type.hpp
+x64-windows-static/include/boost/geometry/algorithms/within.hpp
+x64-windows-static/include/boost/geometry/arithmetic/
+x64-windows-static/include/boost/geometry/arithmetic/arithmetic.hpp
+x64-windows-static/include/boost/geometry/arithmetic/cross_product.hpp
+x64-windows-static/include/boost/geometry/arithmetic/determinant.hpp
+x64-windows-static/include/boost/geometry/arithmetic/dot_product.hpp
+x64-windows-static/include/boost/geometry/arithmetic/normalize.hpp
+x64-windows-static/include/boost/geometry/core/
+x64-windows-static/include/boost/geometry/core/access.hpp
+x64-windows-static/include/boost/geometry/core/assert.hpp
+x64-windows-static/include/boost/geometry/core/closure.hpp
+x64-windows-static/include/boost/geometry/core/coordinate_dimension.hpp
+x64-windows-static/include/boost/geometry/core/coordinate_system.hpp
+x64-windows-static/include/boost/geometry/core/coordinate_type.hpp
+x64-windows-static/include/boost/geometry/core/cs.hpp
+x64-windows-static/include/boost/geometry/core/exception.hpp
+x64-windows-static/include/boost/geometry/core/exterior_ring.hpp
+x64-windows-static/include/boost/geometry/core/geometry_id.hpp
+x64-windows-static/include/boost/geometry/core/interior_rings.hpp
+x64-windows-static/include/boost/geometry/core/interior_type.hpp
+x64-windows-static/include/boost/geometry/core/is_areal.hpp
+x64-windows-static/include/boost/geometry/core/mutable_range.hpp
+x64-windows-static/include/boost/geometry/core/point_order.hpp
+x64-windows-static/include/boost/geometry/core/point_type.hpp
+x64-windows-static/include/boost/geometry/core/radian_access.hpp
+x64-windows-static/include/boost/geometry/core/radius.hpp
+x64-windows-static/include/boost/geometry/core/reverse_dispatch.hpp
+x64-windows-static/include/boost/geometry/core/ring_type.hpp
+x64-windows-static/include/boost/geometry/core/tag.hpp
+x64-windows-static/include/boost/geometry/core/tag_cast.hpp
+x64-windows-static/include/boost/geometry/core/tags.hpp
+x64-windows-static/include/boost/geometry/core/topological_dimension.hpp
+x64-windows-static/include/boost/geometry/formulas/
+x64-windows-static/include/boost/geometry/formulas/andoyer_inverse.hpp
+x64-windows-static/include/boost/geometry/formulas/area_formulas.hpp
+x64-windows-static/include/boost/geometry/formulas/authalic_radius_sqr.hpp
+x64-windows-static/include/boost/geometry/formulas/differential_quantities.hpp
+x64-windows-static/include/boost/geometry/formulas/eccentricity_sqr.hpp
+x64-windows-static/include/boost/geometry/formulas/elliptic_arc_length.hpp
+x64-windows-static/include/boost/geometry/formulas/flattening.hpp
+x64-windows-static/include/boost/geometry/formulas/geographic.hpp
+x64-windows-static/include/boost/geometry/formulas/gnomonic_intersection.hpp
+x64-windows-static/include/boost/geometry/formulas/gnomonic_spheroid.hpp
+x64-windows-static/include/boost/geometry/formulas/mean_radius.hpp
+x64-windows-static/include/boost/geometry/formulas/result_direct.hpp
+x64-windows-static/include/boost/geometry/formulas/result_inverse.hpp
+x64-windows-static/include/boost/geometry/formulas/sjoberg_intersection.hpp
+x64-windows-static/include/boost/geometry/formulas/spherical.hpp
+x64-windows-static/include/boost/geometry/formulas/thomas_direct.hpp
+x64-windows-static/include/boost/geometry/formulas/thomas_inverse.hpp
+x64-windows-static/include/boost/geometry/formulas/unit_spheroid.hpp
+x64-windows-static/include/boost/geometry/formulas/vertex_latitude.hpp
+x64-windows-static/include/boost/geometry/formulas/vertex_longitude.hpp
+x64-windows-static/include/boost/geometry/formulas/vincenty_direct.hpp
+x64-windows-static/include/boost/geometry/formulas/vincenty_inverse.hpp
+x64-windows-static/include/boost/geometry/geometries/
+x64-windows-static/include/boost/geometry/geometries/adapted/
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_array.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_fusion.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon/
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon/box.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon/hole_iterator.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon/holes_proxy.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon/point.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon/polygon.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon/ring.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_polygon/ring_proxy.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_range/
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_range/adjacent_filtered.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_range/filtered.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_range/reversed.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_range/sliced.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_range/strided.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_range/uniqued.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/boost_tuple.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/c_array.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/std_array.hpp
+x64-windows-static/include/boost/geometry/geometries/adapted/std_pair_as_segment.hpp
+x64-windows-static/include/boost/geometry/geometries/box.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/
+x64-windows-static/include/boost/geometry/geometries/concepts/box_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/check.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/linestring_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/multi_linestring_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/multi_point_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/multi_polygon_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/point_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/polygon_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/ring_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/concepts/segment_concept.hpp
+x64-windows-static/include/boost/geometry/geometries/geometries.hpp
+x64-windows-static/include/boost/geometry/geometries/helper_geometry.hpp
+x64-windows-static/include/boost/geometry/geometries/linestring.hpp
+x64-windows-static/include/boost/geometry/geometries/multi_linestring.hpp
+x64-windows-static/include/boost/geometry/geometries/multi_point.hpp
+x64-windows-static/include/boost/geometry/geometries/multi_polygon.hpp
+x64-windows-static/include/boost/geometry/geometries/point.hpp
+x64-windows-static/include/boost/geometry/geometries/point_xy.hpp
+x64-windows-static/include/boost/geometry/geometries/pointing_segment.hpp
+x64-windows-static/include/boost/geometry/geometries/polygon.hpp
+x64-windows-static/include/boost/geometry/geometries/register/
+x64-windows-static/include/boost/geometry/geometries/register/box.hpp
+x64-windows-static/include/boost/geometry/geometries/register/linestring.hpp
+x64-windows-static/include/boost/geometry/geometries/register/multi_linestring.hpp
+x64-windows-static/include/boost/geometry/geometries/register/multi_point.hpp
+x64-windows-static/include/boost/geometry/geometries/register/multi_polygon.hpp
+x64-windows-static/include/boost/geometry/geometries/register/point.hpp
+x64-windows-static/include/boost/geometry/geometries/register/ring.hpp
+x64-windows-static/include/boost/geometry/geometries/register/segment.hpp
+x64-windows-static/include/boost/geometry/geometries/ring.hpp
+x64-windows-static/include/boost/geometry/geometries/segment.hpp
+x64-windows-static/include/boost/geometry/geometries/variant.hpp
+x64-windows-static/include/boost/geometry/geometry.hpp
+x64-windows-static/include/boost/geometry/index/
+x64-windows-static/include/boost/geometry/index/adaptors/
+x64-windows-static/include/boost/geometry/index/adaptors/query.hpp
+x64-windows-static/include/boost/geometry/index/detail/
+x64-windows-static/include/boost/geometry/index/detail/algorithms/
+x64-windows-static/include/boost/geometry/index/detail/algorithms/bounds.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/content.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/diff_abs.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/is_valid.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/margin.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/nth_element.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/segment_intersection.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/smallest_for_indexable.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/sum_for_indexable.hpp
+x64-windows-static/include/boost/geometry/index/detail/algorithms/union_content.hpp
+x64-windows-static/include/boost/geometry/index/detail/assert.hpp
+x64-windows-static/include/boost/geometry/index/detail/bounded_view.hpp
+x64-windows-static/include/boost/geometry/index/detail/config_begin.hpp
+x64-windows-static/include/boost/geometry/index/detail/config_end.hpp
+x64-windows-static/include/boost/geometry/index/detail/distance_predicates.hpp
+x64-windows-static/include/boost/geometry/index/detail/exception.hpp
+x64-windows-static/include/boost/geometry/index/detail/is_bounding_geometry.hpp
+x64-windows-static/include/boost/geometry/index/detail/is_indexable.hpp
+x64-windows-static/include/boost/geometry/index/detail/meta.hpp
+x64-windows-static/include/boost/geometry/index/detail/predicates.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/
+x64-windows-static/include/boost/geometry/index/detail/rtree/adaptors.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/iterators.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/kmeans/
+x64-windows-static/include/boost/geometry/index/detail/rtree/kmeans/kmeans.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/kmeans/split.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/linear/
+x64-windows-static/include/boost/geometry/index/detail/rtree/linear/linear.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/concept.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/node.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/node_elements.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/pairs.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/scoped_deallocator.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/subtree_destroyer.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/variant_static.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/variant_visitor.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/weak_static.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/node/weak_visitor.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/options.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/pack_create.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/quadratic/
+x64-windows-static/include/boost/geometry/index/detail/rtree/quadratic/quadratic.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/query_iterators.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/rstar/
+x64-windows-static/include/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/rstar/insert.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/rstar/rstar.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/utilities/
+x64-windows-static/include/boost/geometry/index/detail/rtree/utilities/are_boxes_ok.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/utilities/are_counts_ok.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/utilities/print.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/utilities/statistics.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/utilities/view.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/copy.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/count.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/distance_query.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/insert.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/iterator.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/remove.hpp
+x64-windows-static/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
+x64-windows-static/include/boost/geometry/index/detail/serialization.hpp
+x64-windows-static/include/boost/geometry/index/detail/tags.hpp
+x64-windows-static/include/boost/geometry/index/detail/translator.hpp
+x64-windows-static/include/boost/geometry/index/detail/tuples.hpp
+x64-windows-static/include/boost/geometry/index/detail/utilities.hpp
+x64-windows-static/include/boost/geometry/index/detail/varray.hpp
+x64-windows-static/include/boost/geometry/index/detail/varray_detail.hpp
+x64-windows-static/include/boost/geometry/index/distance_predicates.hpp
+x64-windows-static/include/boost/geometry/index/equal_to.hpp
+x64-windows-static/include/boost/geometry/index/indexable.hpp
+x64-windows-static/include/boost/geometry/index/inserter.hpp
+x64-windows-static/include/boost/geometry/index/parameters.hpp
+x64-windows-static/include/boost/geometry/index/predicates.hpp
+x64-windows-static/include/boost/geometry/index/rtree.hpp
+x64-windows-static/include/boost/geometry/io/
+x64-windows-static/include/boost/geometry/io/dsv/
+x64-windows-static/include/boost/geometry/io/dsv/write.hpp
+x64-windows-static/include/boost/geometry/io/io.hpp
+x64-windows-static/include/boost/geometry/io/svg/
+x64-windows-static/include/boost/geometry/io/svg/svg_mapper.hpp
+x64-windows-static/include/boost/geometry/io/svg/write.hpp
+x64-windows-static/include/boost/geometry/io/svg/write_svg.hpp
+x64-windows-static/include/boost/geometry/io/svg/write_svg_multi.hpp
+x64-windows-static/include/boost/geometry/io/wkt/
+x64-windows-static/include/boost/geometry/io/wkt/detail/
+x64-windows-static/include/boost/geometry/io/wkt/detail/prefix.hpp
+x64-windows-static/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
+x64-windows-static/include/boost/geometry/io/wkt/read.hpp
+x64-windows-static/include/boost/geometry/io/wkt/stream.hpp
+x64-windows-static/include/boost/geometry/io/wkt/wkt.hpp
+x64-windows-static/include/boost/geometry/io/wkt/write.hpp
+x64-windows-static/include/boost/geometry/iterators/
+x64-windows-static/include/boost/geometry/iterators/base.hpp
+x64-windows-static/include/boost/geometry/iterators/closing_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/concatenate_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/detail/
+x64-windows-static/include/boost/geometry/iterators/detail/point_iterator/
+x64-windows-static/include/boost/geometry/iterators/detail/point_iterator/inner_range_type.hpp
+x64-windows-static/include/boost/geometry/iterators/detail/point_iterator/iterator_type.hpp
+x64-windows-static/include/boost/geometry/iterators/detail/point_iterator/value_type.hpp
+x64-windows-static/include/boost/geometry/iterators/detail/segment_iterator/
+x64-windows-static/include/boost/geometry/iterators/detail/segment_iterator/iterator_type.hpp
+x64-windows-static/include/boost/geometry/iterators/detail/segment_iterator/range_segment_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/detail/segment_iterator/value_type.hpp
+x64-windows-static/include/boost/geometry/iterators/dispatch/
+x64-windows-static/include/boost/geometry/iterators/dispatch/point_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/dispatch/segment_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/ever_circling_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/flatten_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/has_one_element.hpp
+x64-windows-static/include/boost/geometry/iterators/point_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/point_reverse_iterator.hpp
+x64-windows-static/include/boost/geometry/iterators/segment_iterator.hpp
+x64-windows-static/include/boost/geometry/multi/
+x64-windows-static/include/boost/geometry/multi/algorithms/
+x64-windows-static/include/boost/geometry/multi/algorithms/append.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/area.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/centroid.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/clear.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/convert.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/correct.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/covered_by.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/modify.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/overlay/
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/sections/
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/disjoint.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/distance.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/envelope.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/equals.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/for_each.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/intersection.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/length.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/num_geometries.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/num_points.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/perimeter.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/remove_spikes.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/reverse.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/simplify.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/transform.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/unique.hpp
+x64-windows-static/include/boost/geometry/multi/algorithms/within.hpp
+x64-windows-static/include/boost/geometry/multi/core/
+x64-windows-static/include/boost/geometry/multi/core/closure.hpp
+x64-windows-static/include/boost/geometry/multi/core/geometry_id.hpp
+x64-windows-static/include/boost/geometry/multi/core/interior_rings.hpp
+x64-windows-static/include/boost/geometry/multi/core/is_areal.hpp
+x64-windows-static/include/boost/geometry/multi/core/point_order.hpp
+x64-windows-static/include/boost/geometry/multi/core/point_type.hpp
+x64-windows-static/include/boost/geometry/multi/core/ring_type.hpp
+x64-windows-static/include/boost/geometry/multi/core/tags.hpp
+x64-windows-static/include/boost/geometry/multi/core/topological_dimension.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/
+x64-windows-static/include/boost/geometry/multi/geometries/concepts/
+x64-windows-static/include/boost/geometry/multi/geometries/concepts/check.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/multi_geometries.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/multi_linestring.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/multi_point.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/multi_polygon.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/register/
+x64-windows-static/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/register/multi_point.hpp
+x64-windows-static/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
+x64-windows-static/include/boost/geometry/multi/io/
+x64-windows-static/include/boost/geometry/multi/io/dsv/
+x64-windows-static/include/boost/geometry/multi/io/dsv/write.hpp
+x64-windows-static/include/boost/geometry/multi/io/wkt/
+x64-windows-static/include/boost/geometry/multi/io/wkt/detail/
+x64-windows-static/include/boost/geometry/multi/io/wkt/detail/prefix.hpp
+x64-windows-static/include/boost/geometry/multi/io/wkt/read.hpp
+x64-windows-static/include/boost/geometry/multi/io/wkt/wkt.hpp
+x64-windows-static/include/boost/geometry/multi/io/wkt/write.hpp
+x64-windows-static/include/boost/geometry/multi/multi.hpp
+x64-windows-static/include/boost/geometry/multi/strategies/
+x64-windows-static/include/boost/geometry/multi/strategies/cartesian/
+x64-windows-static/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
+x64-windows-static/include/boost/geometry/multi/views/
+x64-windows-static/include/boost/geometry/multi/views/detail/
+x64-windows-static/include/boost/geometry/multi/views/detail/range_type.hpp
+x64-windows-static/include/boost/geometry/policies/
+x64-windows-static/include/boost/geometry/policies/compare.hpp
+x64-windows-static/include/boost/geometry/policies/disjoint_interrupt_policy.hpp
+x64-windows-static/include/boost/geometry/policies/is_valid/
+x64-windows-static/include/boost/geometry/policies/is_valid/default_policy.hpp
+x64-windows-static/include/boost/geometry/policies/is_valid/failing_reason_policy.hpp
+x64-windows-static/include/boost/geometry/policies/is_valid/failure_type_policy.hpp
+x64-windows-static/include/boost/geometry/policies/predicate_based_interrupt_policy.hpp
+x64-windows-static/include/boost/geometry/policies/relate/
+x64-windows-static/include/boost/geometry/policies/relate/direction.hpp
+x64-windows-static/include/boost/geometry/policies/relate/intersection_points.hpp
+x64-windows-static/include/boost/geometry/policies/relate/intersection_ratios.hpp
+x64-windows-static/include/boost/geometry/policies/relate/tupled.hpp
+x64-windows-static/include/boost/geometry/policies/robustness/
+x64-windows-static/include/boost/geometry/policies/robustness/get_rescale_policy.hpp
+x64-windows-static/include/boost/geometry/policies/robustness/no_rescale_policy.hpp
+x64-windows-static/include/boost/geometry/policies/robustness/rescale_policy.hpp
+x64-windows-static/include/boost/geometry/policies/robustness/robust_point_type.hpp
+x64-windows-static/include/boost/geometry/policies/robustness/robust_type.hpp
+x64-windows-static/include/boost/geometry/policies/robustness/segment_ratio.hpp
+x64-windows-static/include/boost/geometry/policies/robustness/segment_ratio_type.hpp
+x64-windows-static/include/boost/geometry/srs/
+x64-windows-static/include/boost/geometry/srs/epsg.hpp
+x64-windows-static/include/boost/geometry/srs/esri.hpp
+x64-windows-static/include/boost/geometry/srs/iau2000.hpp
+x64-windows-static/include/boost/geometry/srs/projection.hpp
+x64-windows-static/include/boost/geometry/srs/projections/
+x64-windows-static/include/boost/geometry/srs/projections/code.hpp
+x64-windows-static/include/boost/geometry/srs/projections/epsg.hpp
+x64-windows-static/include/boost/geometry/srs/projections/epsg_params.hpp
+x64-windows-static/include/boost/geometry/srs/projections/epsg_traits.hpp
+x64-windows-static/include/boost/geometry/srs/projections/esri.hpp
+x64-windows-static/include/boost/geometry/srs/projections/esri_params.hpp
+x64-windows-static/include/boost/geometry/srs/projections/esri_traits.hpp
+x64-windows-static/include/boost/geometry/srs/projections/exception.hpp
+x64-windows-static/include/boost/geometry/srs/projections/factory.hpp
+x64-windows-static/include/boost/geometry/srs/projections/iau2000.hpp
+x64-windows-static/include/boost/geometry/srs/projections/iau2000_params.hpp
+x64-windows-static/include/boost/geometry/srs/projections/iau2000_traits.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/
+x64-windows-static/include/boost/geometry/srs/projections/impl/aasincos.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/adjlon.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/base_dynamic.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/base_static.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/dms_parser.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/factory_entry.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/function_overloads.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/geocent.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_auth.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_datum_set.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_datums.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_ell_set.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_ellps.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_fwd.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_gauss.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_init.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_inv.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_mlfn.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_msfn.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_param.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_phi2.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_qsfn.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_strerrno.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_transform.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_tsfn.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_units.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/pj_zpoly1.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/proj_mdist.hpp
+x64-windows-static/include/boost/geometry/srs/projections/impl/projects.hpp
+x64-windows-static/include/boost/geometry/srs/projections/invalid_point.hpp
+x64-windows-static/include/boost/geometry/srs/projections/par4.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/
+x64-windows-static/include/boost/geometry/srs/projections/proj/aea.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/aeqd.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/airy.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/aitoff.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/august.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/bacon.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/bipc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/boggs.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/bonne.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/cass.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/cc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/cea.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/chamb.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/collg.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/crast.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/denoy.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/eck1.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/eck2.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/eck3.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/eck4.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/eck5.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/eqc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/eqdc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/etmerc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/fahey.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/fouc_s.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/gall.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/geocent.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/geos.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/gins8.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/gn_sinu.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/gnom.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/goode.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/gstmerc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/hammer.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/hatano.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/healpix.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/igh.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/imw_p.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/isea.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/krovak.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/labrd.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/laea.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/lagrng.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/larr.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/lask.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/latlong.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/lcc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/lcca.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/loxim.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/lsat.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/mbt_fps.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/mbtfpp.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/mbtfpq.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/merc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/mill.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/mod_ster.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/moll.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/natearth.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/nell.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/nell_h.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/nocol.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/nsper.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/nzmg.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/ob_tran.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/ocea.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/oea.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/omerc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/ortho.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/poly.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/putp2.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/putp3.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/putp4p.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/putp5.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/putp6.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/qsc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/robin.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/rouss.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/rpoly.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/sconics.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/somerc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/stere.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/sterea.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/sts.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/tcc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/tcea.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/tmerc.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/tpeqd.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/urm5.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/urmfps.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/vandg.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/vandg2.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/vandg4.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/wag2.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/wag3.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/wag7.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/wink1.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj/wink2.hpp
+x64-windows-static/include/boost/geometry/srs/projections/proj4.hpp
+x64-windows-static/include/boost/geometry/srs/projections/srid_traits.hpp
+x64-windows-static/include/boost/geometry/srs/sphere.hpp
+x64-windows-static/include/boost/geometry/srs/spheroid.hpp
+x64-windows-static/include/boost/geometry/srs/srs.hpp
+x64-windows-static/include/boost/geometry/srs/transformation.hpp
+x64-windows-static/include/boost/geometry/strategies/
+x64-windows-static/include/boost/geometry/strategies/agnostic/
+x64-windows-static/include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp
+x64-windows-static/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp
+x64-windows-static/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp
+x64-windows-static/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
+x64-windows-static/include/boost/geometry/strategies/agnostic/point_in_point.hpp
+x64-windows-static/include/boost/geometry/strategies/agnostic/point_in_poly_oriented_winding.hpp
+x64-windows-static/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
+x64-windows-static/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
+x64-windows-static/include/boost/geometry/strategies/area.hpp
+x64-windows-static/include/boost/geometry/strategies/area_result.hpp
+x64-windows-static/include/boost/geometry/strategies/azimuth.hpp
+x64-windows-static/include/boost/geometry/strategies/buffer.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/
+x64-windows-static/include/boost/geometry/strategies/cartesian/area.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/area_surveyor.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/azimuth.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/box_in_box.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/buffer_join_miter.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/buffer_point_circle.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/buffer_point_square.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/buffer_side_straight.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/centroid_average.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/densify.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/envelope_segment.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/intersection.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/point_in_box.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/point_in_poly_winding.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
+x64-windows-static/include/boost/geometry/strategies/cartesian/side_of_intersection.hpp
+x64-windows-static/include/boost/geometry/strategies/centroid.hpp
+x64-windows-static/include/boost/geometry/strategies/comparable_distance_result.hpp
+x64-windows-static/include/boost/geometry/strategies/compare.hpp
+x64-windows-static/include/boost/geometry/strategies/concepts/
+x64-windows-static/include/boost/geometry/strategies/concepts/area_concept.hpp
+x64-windows-static/include/boost/geometry/strategies/concepts/centroid_concept.hpp
+x64-windows-static/include/boost/geometry/strategies/concepts/convex_hull_concept.hpp
+x64-windows-static/include/boost/geometry/strategies/concepts/distance_concept.hpp
+x64-windows-static/include/boost/geometry/strategies/concepts/segment_intersect_concept.hpp
+x64-windows-static/include/boost/geometry/strategies/concepts/simplify_concept.hpp
+x64-windows-static/include/boost/geometry/strategies/concepts/within_concept.hpp
+x64-windows-static/include/boost/geometry/strategies/convex_hull.hpp
+x64-windows-static/include/boost/geometry/strategies/covered_by.hpp
+x64-windows-static/include/boost/geometry/strategies/default_area_result.hpp
+x64-windows-static/include/boost/geometry/strategies/default_comparable_distance_result.hpp
+x64-windows-static/include/boost/geometry/strategies/default_distance_result.hpp
+x64-windows-static/include/boost/geometry/strategies/default_length_result.hpp
+x64-windows-static/include/boost/geometry/strategies/default_strategy.hpp
+x64-windows-static/include/boost/geometry/strategies/densify.hpp
+x64-windows-static/include/boost/geometry/strategies/disjoint.hpp
+x64-windows-static/include/boost/geometry/strategies/distance.hpp
+x64-windows-static/include/boost/geometry/strategies/distance_result.hpp
+x64-windows-static/include/boost/geometry/strategies/envelope.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/
+x64-windows-static/include/boost/geometry/strategies/geographic/area.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/azimuth.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/densify.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/disjoint_segment_box.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/distance.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/distance_andoyer.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/distance_cross_track.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/distance_cross_track_box_box.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/distance_cross_track_point_box.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/distance_thomas.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/distance_vincenty.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/envelope_segment.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/intersection.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/intersection_elliptic.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/mapping_ssf.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/parameters.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/point_in_poly_winding.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/side.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/side_andoyer.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/side_thomas.hpp
+x64-windows-static/include/boost/geometry/strategies/geographic/side_vincenty.hpp
+x64-windows-static/include/boost/geometry/strategies/intersection.hpp
+x64-windows-static/include/boost/geometry/strategies/intersection_result.hpp
+x64-windows-static/include/boost/geometry/strategies/intersection_strategies.hpp
+x64-windows-static/include/boost/geometry/strategies/relate.hpp
+x64-windows-static/include/boost/geometry/strategies/side.hpp
+x64-windows-static/include/boost/geometry/strategies/side_info.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/
+x64-windows-static/include/boost/geometry/strategies/spherical/area.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/azimuth.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/compare.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/densify.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/disjoint_segment_box.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/distance_cross_track_box_box.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/distance_haversine.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/envelope_segment.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/get_radius.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/intersection.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/point_in_poly_winding.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/side_by_cross_track.hpp
+x64-windows-static/include/boost/geometry/strategies/spherical/ssf.hpp
+x64-windows-static/include/boost/geometry/strategies/strategies.hpp
+x64-windows-static/include/boost/geometry/strategies/strategy_transform.hpp
+x64-windows-static/include/boost/geometry/strategies/tags.hpp
+x64-windows-static/include/boost/geometry/strategies/transform.hpp
+x64-windows-static/include/boost/geometry/strategies/transform/
+x64-windows-static/include/boost/geometry/strategies/transform/inverse_transformer.hpp
+x64-windows-static/include/boost/geometry/strategies/transform/map_transformer.hpp
+x64-windows-static/include/boost/geometry/strategies/transform/matrix_transformers.hpp
+x64-windows-static/include/boost/geometry/strategies/transform/srs_transformer.hpp
+x64-windows-static/include/boost/geometry/strategies/within.hpp
+x64-windows-static/include/boost/geometry/util/
+x64-windows-static/include/boost/geometry/util/add_const_if_c.hpp
+x64-windows-static/include/boost/geometry/util/bare_type.hpp
+x64-windows-static/include/boost/geometry/util/calculation_type.hpp
+x64-windows-static/include/boost/geometry/util/closure_as_bool.hpp
+x64-windows-static/include/boost/geometry/util/combine_if.hpp
+x64-windows-static/include/boost/geometry/util/compress_variant.hpp
+x64-windows-static/include/boost/geometry/util/condition.hpp
+x64-windows-static/include/boost/geometry/util/coordinate_cast.hpp
+x64-windows-static/include/boost/geometry/util/for_each_coordinate.hpp
+x64-windows-static/include/boost/geometry/util/has_infinite_coordinate.hpp
+x64-windows-static/include/boost/geometry/util/has_nan_coordinate.hpp
+x64-windows-static/include/boost/geometry/util/has_non_finite_coordinate.hpp
+x64-windows-static/include/boost/geometry/util/math.hpp
+x64-windows-static/include/boost/geometry/util/normalize_spheroidal_box_coordinates.hpp
+x64-windows-static/include/boost/geometry/util/normalize_spheroidal_coordinates.hpp
+x64-windows-static/include/boost/geometry/util/order_as_direction.hpp
+x64-windows-static/include/boost/geometry/util/parameter_type_of.hpp
+x64-windows-static/include/boost/geometry/util/promote_floating_point.hpp
+x64-windows-static/include/boost/geometry/util/promote_integral.hpp
+x64-windows-static/include/boost/geometry/util/range.hpp
+x64-windows-static/include/boost/geometry/util/rational.hpp
+x64-windows-static/include/boost/geometry/util/readme.txt
+x64-windows-static/include/boost/geometry/util/select_calculation_type.hpp
+x64-windows-static/include/boost/geometry/util/select_coordinate_type.hpp
+x64-windows-static/include/boost/geometry/util/select_most_precise.hpp
+x64-windows-static/include/boost/geometry/util/select_sequence_element.hpp
+x64-windows-static/include/boost/geometry/util/transform_variant.hpp
+x64-windows-static/include/boost/geometry/views/
+x64-windows-static/include/boost/geometry/views/box_view.hpp
+x64-windows-static/include/boost/geometry/views/closeable_view.hpp
+x64-windows-static/include/boost/geometry/views/detail/
+x64-windows-static/include/boost/geometry/views/detail/boundary_view.hpp
+x64-windows-static/include/boost/geometry/views/detail/boundary_view/
+x64-windows-static/include/boost/geometry/views/detail/boundary_view/implementation.hpp
+x64-windows-static/include/boost/geometry/views/detail/boundary_view/interface.hpp
+x64-windows-static/include/boost/geometry/views/detail/indexed_point_view.hpp
+x64-windows-static/include/boost/geometry/views/detail/normalized_view.hpp
+x64-windows-static/include/boost/geometry/views/detail/points_view.hpp
+x64-windows-static/include/boost/geometry/views/detail/range_type.hpp
+x64-windows-static/include/boost/geometry/views/detail/two_dimensional_view.hpp
+x64-windows-static/include/boost/geometry/views/identity_view.hpp
+x64-windows-static/include/boost/geometry/views/reversible_view.hpp
+x64-windows-static/include/boost/geometry/views/segment_view.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-geometry/
+x64-windows-static/share/boost-geometry/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,216 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_graph-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_graph-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_graph-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_graph-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_graph-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/algorithm.hpp
+x64-windows/include/boost/graph/
+x64-windows/include/boost/graph/adj_list_serialize.hpp
+x64-windows/include/boost/graph/adjacency_iterator.hpp
+x64-windows/include/boost/graph/adjacency_list.hpp
+x64-windows/include/boost/graph/adjacency_list_io.hpp
+x64-windows/include/boost/graph/adjacency_matrix.hpp
+x64-windows/include/boost/graph/astar_search.hpp
+x64-windows/include/boost/graph/bandwidth.hpp
+x64-windows/include/boost/graph/bc_clustering.hpp
+x64-windows/include/boost/graph/bellman_ford_shortest_paths.hpp
+x64-windows/include/boost/graph/betweenness_centrality.hpp
+x64-windows/include/boost/graph/biconnected_components.hpp
+x64-windows/include/boost/graph/bipartite.hpp
+x64-windows/include/boost/graph/boyer_myrvold_planar_test.hpp
+x64-windows/include/boost/graph/boykov_kolmogorov_max_flow.hpp
+x64-windows/include/boost/graph/breadth_first_search.hpp
+x64-windows/include/boost/graph/bron_kerbosch_all_cliques.hpp
+x64-windows/include/boost/graph/buffer_concepts.hpp
+x64-windows/include/boost/graph/chrobak_payne_drawing.hpp
+x64-windows/include/boost/graph/circle_layout.hpp
+x64-windows/include/boost/graph/closeness_centrality.hpp
+x64-windows/include/boost/graph/clustering_coefficient.hpp
+x64-windows/include/boost/graph/compressed_sparse_row_graph.hpp
+x64-windows/include/boost/graph/connected_components.hpp
+x64-windows/include/boost/graph/copy.hpp
+x64-windows/include/boost/graph/core_numbers.hpp
+x64-windows/include/boost/graph/create_condensation_graph.hpp
+x64-windows/include/boost/graph/cuthill_mckee_ordering.hpp
+x64-windows/include/boost/graph/cycle_canceling.hpp
+x64-windows/include/boost/graph/dag_shortest_paths.hpp
+x64-windows/include/boost/graph/degree_centrality.hpp
+x64-windows/include/boost/graph/depth_first_search.hpp
+x64-windows/include/boost/graph/detail/
+x64-windows/include/boost/graph/detail/adj_list_edge_iterator.hpp
+x64-windows/include/boost/graph/detail/adjacency_list.hpp
+x64-windows/include/boost/graph/detail/array_binary_tree.hpp
+x64-windows/include/boost/graph/detail/augment.hpp
+x64-windows/include/boost/graph/detail/compressed_sparse_row_struct.hpp
+x64-windows/include/boost/graph/detail/connected_components.hpp
+x64-windows/include/boost/graph/detail/d_ary_heap.hpp
+x64-windows/include/boost/graph/detail/edge.hpp
+x64-windows/include/boost/graph/detail/geodesic.hpp
+x64-windows/include/boost/graph/detail/histogram_sort.hpp
+x64-windows/include/boost/graph/detail/incidence_iterator.hpp
+x64-windows/include/boost/graph/detail/incremental_components.hpp
+x64-windows/include/boost/graph/detail/index.hpp
+x64-windows/include/boost/graph/detail/indexed_properties.hpp
+x64-windows/include/boost/graph/detail/is_distributed_selector.hpp
+x64-windows/include/boost/graph/detail/labeled_graph_traits.hpp
+x64-windows/include/boost/graph/detail/list_base.hpp
+x64-windows/include/boost/graph/detail/permutation.hpp
+x64-windows/include/boost/graph/detail/read_graphviz_new.hpp
+x64-windows/include/boost/graph/detail/read_graphviz_spirit.hpp
+x64-windows/include/boost/graph/detail/self_avoiding_walk.hpp
+x64-windows/include/boost/graph/detail/set_adaptor.hpp
+x64-windows/include/boost/graph/detail/shadow_iterator.hpp
+x64-windows/include/boost/graph/detail/sparse_ordering.hpp
+x64-windows/include/boost/graph/dijkstra_shortest_paths.hpp
+x64-windows/include/boost/graph/dijkstra_shortest_paths_no_color_map.hpp
+x64-windows/include/boost/graph/dimacs.hpp
+x64-windows/include/boost/graph/directed_graph.hpp
+x64-windows/include/boost/graph/dll_import_export.hpp
+x64-windows/include/boost/graph/dominator_tree.hpp
+x64-windows/include/boost/graph/eccentricity.hpp
+x64-windows/include/boost/graph/edge_coloring.hpp
+x64-windows/include/boost/graph/edge_connectivity.hpp
+x64-windows/include/boost/graph/edge_list.hpp
+x64-windows/include/boost/graph/edmonds_karp_max_flow.hpp
+x64-windows/include/boost/graph/edmunds_karp_max_flow.hpp
+x64-windows/include/boost/graph/erdos_renyi_generator.hpp
+x64-windows/include/boost/graph/exception.hpp
+x64-windows/include/boost/graph/exterior_property.hpp
+x64-windows/include/boost/graph/filtered_graph.hpp
+x64-windows/include/boost/graph/find_flow_cost.hpp
+x64-windows/include/boost/graph/floyd_warshall_shortest.hpp
+x64-windows/include/boost/graph/fruchterman_reingold.hpp
+x64-windows/include/boost/graph/geodesic_distance.hpp
+x64-windows/include/boost/graph/graph_archetypes.hpp
+x64-windows/include/boost/graph/graph_as_tree.hpp
+x64-windows/include/boost/graph/graph_concepts.hpp
+x64-windows/include/boost/graph/graph_mutability_traits.hpp
+x64-windows/include/boost/graph/graph_selectors.hpp
+x64-windows/include/boost/graph/graph_stats.hpp
+x64-windows/include/boost/graph/graph_test.hpp
+x64-windows/include/boost/graph/graph_traits.hpp
+x64-windows/include/boost/graph/graph_utility.hpp
+x64-windows/include/boost/graph/graphml.hpp
+x64-windows/include/boost/graph/graphviz.hpp
+x64-windows/include/boost/graph/grid_graph.hpp
+x64-windows/include/boost/graph/gursoy_atun_layout.hpp
+x64-windows/include/boost/graph/hawick_circuits.hpp
+x64-windows/include/boost/graph/howard_cycle_ratio.hpp
+x64-windows/include/boost/graph/incremental_components.hpp
+x64-windows/include/boost/graph/is_kuratowski_subgraph.hpp
+x64-windows/include/boost/graph/is_straight_line_drawing.hpp
+x64-windows/include/boost/graph/isomorphism.hpp
+x64-windows/include/boost/graph/iteration_macros.hpp
+x64-windows/include/boost/graph/iteration_macros_undef.hpp
+x64-windows/include/boost/graph/johnson_all_pairs_shortest.hpp
+x64-windows/include/boost/graph/kamada_kawai_spring_layout.hpp
+x64-windows/include/boost/graph/king_ordering.hpp
+x64-windows/include/boost/graph/kruskal_min_spanning_tree.hpp
+x64-windows/include/boost/graph/labeled_graph.hpp
+x64-windows/include/boost/graph/leda_graph.hpp
+x64-windows/include/boost/graph/lookup_edge.hpp
+x64-windows/include/boost/graph/loop_erased_random_walk.hpp
+x64-windows/include/boost/graph/make_biconnected_planar.hpp
+x64-windows/include/boost/graph/make_connected.hpp
+x64-windows/include/boost/graph/make_maximal_planar.hpp
+x64-windows/include/boost/graph/matrix_as_graph.hpp
+x64-windows/include/boost/graph/max_cardinality_matching.hpp
+x64-windows/include/boost/graph/maximum_adjacency_search.hpp
+x64-windows/include/boost/graph/mcgregor_common_subgraphs.hpp
+x64-windows/include/boost/graph/mesh_graph_generator.hpp
+x64-windows/include/boost/graph/metis.hpp
+x64-windows/include/boost/graph/metric_tsp_approx.hpp
+x64-windows/include/boost/graph/minimum_degree_ordering.hpp
+x64-windows/include/boost/graph/named_function_params.hpp
+x64-windows/include/boost/graph/named_graph.hpp
+x64-windows/include/boost/graph/neighbor_bfs.hpp
+x64-windows/include/boost/graph/numeric_values.hpp
+x64-windows/include/boost/graph/one_bit_color_map.hpp
+x64-windows/include/boost/graph/overloading.hpp
+x64-windows/include/boost/graph/page_rank.hpp
+x64-windows/include/boost/graph/planar_canonical_ordering.hpp
+x64-windows/include/boost/graph/planar_detail/
+x64-windows/include/boost/graph/planar_detail/add_edge_visitors.hpp
+x64-windows/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp
+x64-windows/include/boost/graph/planar_detail/bucket_sort.hpp
+x64-windows/include/boost/graph/planar_detail/face_handles.hpp
+x64-windows/include/boost/graph/planar_detail/face_iterators.hpp
+x64-windows/include/boost/graph/planar_face_traversal.hpp
+x64-windows/include/boost/graph/plod_generator.hpp
+x64-windows/include/boost/graph/point_traits.hpp
+x64-windows/include/boost/graph/prim_minimum_spanning_tree.hpp
+x64-windows/include/boost/graph/profile.hpp
+x64-windows/include/boost/graph/properties.hpp
+x64-windows/include/boost/graph/property_iter_range.hpp
+x64-windows/include/boost/graph/property_maps/
+x64-windows/include/boost/graph/property_maps/constant_property_map.hpp
+x64-windows/include/boost/graph/property_maps/container_property_map.hpp
+x64-windows/include/boost/graph/property_maps/matrix_property_map.hpp
+x64-windows/include/boost/graph/property_maps/null_property_map.hpp
+x64-windows/include/boost/graph/push_relabel_max_flow.hpp
+x64-windows/include/boost/graph/r_c_shortest_paths.hpp
+x64-windows/include/boost/graph/random.hpp
+x64-windows/include/boost/graph/random_layout.hpp
+x64-windows/include/boost/graph/random_spanning_tree.hpp
+x64-windows/include/boost/graph/read_dimacs.hpp
+x64-windows/include/boost/graph/relax.hpp
+x64-windows/include/boost/graph/reverse_graph.hpp
+x64-windows/include/boost/graph/rmat_graph_generator.hpp
+x64-windows/include/boost/graph/sequential_vertex_coloring.hpp
+x64-windows/include/boost/graph/simple_point.hpp
+x64-windows/include/boost/graph/sloan_ordering.hpp
+x64-windows/include/boost/graph/small_world_generator.hpp
+x64-windows/include/boost/graph/smallest_last_ordering.hpp
+x64-windows/include/boost/graph/ssca_graph_generator.hpp
+x64-windows/include/boost/graph/st_connected.hpp
+x64-windows/include/boost/graph/stanford_graph.hpp
+x64-windows/include/boost/graph/stoer_wagner_min_cut.hpp
+x64-windows/include/boost/graph/strong_components.hpp
+x64-windows/include/boost/graph/subgraph.hpp
+x64-windows/include/boost/graph/successive_shortest_path_nonnegative_weights.hpp
+x64-windows/include/boost/graph/tiernan_all_cycles.hpp
+x64-windows/include/boost/graph/topological_sort.hpp
+x64-windows/include/boost/graph/topology.hpp
+x64-windows/include/boost/graph/transitive_closure.hpp
+x64-windows/include/boost/graph/transitive_reduction.hpp
+x64-windows/include/boost/graph/transpose_graph.hpp
+x64-windows/include/boost/graph/tree_traits.hpp
+x64-windows/include/boost/graph/two_bit_color_map.hpp
+x64-windows/include/boost/graph/two_graphs_common_spanning_trees.hpp
+x64-windows/include/boost/graph/undirected_dfs.hpp
+x64-windows/include/boost/graph/undirected_graph.hpp
+x64-windows/include/boost/graph/use_mpi.hpp
+x64-windows/include/boost/graph/vector_as_graph.hpp
+x64-windows/include/boost/graph/vertex_and_edge_range.hpp
+x64-windows/include/boost/graph/vf2_sub_graph_iso.hpp
+x64-windows/include/boost/graph/visitors.hpp
+x64-windows/include/boost/graph/wavefront.hpp
+x64-windows/include/boost/graph/write_dimacs.hpp
+x64-windows/include/boost/pending/
+x64-windows/include/boost/pending/bucket_sorter.hpp
+x64-windows/include/boost/pending/container_traits.hpp
+x64-windows/include/boost/pending/detail/
+x64-windows/include/boost/pending/detail/property.hpp
+x64-windows/include/boost/pending/fenced_priority_queue.hpp
+x64-windows/include/boost/pending/fibonacci_heap.hpp
+x64-windows/include/boost/pending/indirect_cmp.hpp
+x64-windows/include/boost/pending/is_heap.hpp
+x64-windows/include/boost/pending/mutable_heap.hpp
+x64-windows/include/boost/pending/mutable_queue.hpp
+x64-windows/include/boost/pending/property.hpp
+x64-windows/include/boost/pending/queue.hpp
+x64-windows/include/boost/pending/relaxed_heap.hpp
+x64-windows/include/boost/pending/stringtok.hpp
+x64-windows/lib/
+x64-windows/lib/boost_graph-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-graph/
+x64-windows/share/boost-graph/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-graph_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,210 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_graph-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/algorithm.hpp
+x64-windows-static/include/boost/graph/
+x64-windows-static/include/boost/graph/adj_list_serialize.hpp
+x64-windows-static/include/boost/graph/adjacency_iterator.hpp
+x64-windows-static/include/boost/graph/adjacency_list.hpp
+x64-windows-static/include/boost/graph/adjacency_list_io.hpp
+x64-windows-static/include/boost/graph/adjacency_matrix.hpp
+x64-windows-static/include/boost/graph/astar_search.hpp
+x64-windows-static/include/boost/graph/bandwidth.hpp
+x64-windows-static/include/boost/graph/bc_clustering.hpp
+x64-windows-static/include/boost/graph/bellman_ford_shortest_paths.hpp
+x64-windows-static/include/boost/graph/betweenness_centrality.hpp
+x64-windows-static/include/boost/graph/biconnected_components.hpp
+x64-windows-static/include/boost/graph/bipartite.hpp
+x64-windows-static/include/boost/graph/boyer_myrvold_planar_test.hpp
+x64-windows-static/include/boost/graph/boykov_kolmogorov_max_flow.hpp
+x64-windows-static/include/boost/graph/breadth_first_search.hpp
+x64-windows-static/include/boost/graph/bron_kerbosch_all_cliques.hpp
+x64-windows-static/include/boost/graph/buffer_concepts.hpp
+x64-windows-static/include/boost/graph/chrobak_payne_drawing.hpp
+x64-windows-static/include/boost/graph/circle_layout.hpp
+x64-windows-static/include/boost/graph/closeness_centrality.hpp
+x64-windows-static/include/boost/graph/clustering_coefficient.hpp
+x64-windows-static/include/boost/graph/compressed_sparse_row_graph.hpp
+x64-windows-static/include/boost/graph/connected_components.hpp
+x64-windows-static/include/boost/graph/copy.hpp
+x64-windows-static/include/boost/graph/core_numbers.hpp
+x64-windows-static/include/boost/graph/create_condensation_graph.hpp
+x64-windows-static/include/boost/graph/cuthill_mckee_ordering.hpp
+x64-windows-static/include/boost/graph/cycle_canceling.hpp
+x64-windows-static/include/boost/graph/dag_shortest_paths.hpp
+x64-windows-static/include/boost/graph/degree_centrality.hpp
+x64-windows-static/include/boost/graph/depth_first_search.hpp
+x64-windows-static/include/boost/graph/detail/
+x64-windows-static/include/boost/graph/detail/adj_list_edge_iterator.hpp
+x64-windows-static/include/boost/graph/detail/adjacency_list.hpp
+x64-windows-static/include/boost/graph/detail/array_binary_tree.hpp
+x64-windows-static/include/boost/graph/detail/augment.hpp
+x64-windows-static/include/boost/graph/detail/compressed_sparse_row_struct.hpp
+x64-windows-static/include/boost/graph/detail/connected_components.hpp
+x64-windows-static/include/boost/graph/detail/d_ary_heap.hpp
+x64-windows-static/include/boost/graph/detail/edge.hpp
+x64-windows-static/include/boost/graph/detail/geodesic.hpp
+x64-windows-static/include/boost/graph/detail/histogram_sort.hpp
+x64-windows-static/include/boost/graph/detail/incidence_iterator.hpp
+x64-windows-static/include/boost/graph/detail/incremental_components.hpp
+x64-windows-static/include/boost/graph/detail/index.hpp
+x64-windows-static/include/boost/graph/detail/indexed_properties.hpp
+x64-windows-static/include/boost/graph/detail/is_distributed_selector.hpp
+x64-windows-static/include/boost/graph/detail/labeled_graph_traits.hpp
+x64-windows-static/include/boost/graph/detail/list_base.hpp
+x64-windows-static/include/boost/graph/detail/permutation.hpp
+x64-windows-static/include/boost/graph/detail/read_graphviz_new.hpp
+x64-windows-static/include/boost/graph/detail/read_graphviz_spirit.hpp
+x64-windows-static/include/boost/graph/detail/self_avoiding_walk.hpp
+x64-windows-static/include/boost/graph/detail/set_adaptor.hpp
+x64-windows-static/include/boost/graph/detail/shadow_iterator.hpp
+x64-windows-static/include/boost/graph/detail/sparse_ordering.hpp
+x64-windows-static/include/boost/graph/dijkstra_shortest_paths.hpp
+x64-windows-static/include/boost/graph/dijkstra_shortest_paths_no_color_map.hpp
+x64-windows-static/include/boost/graph/dimacs.hpp
+x64-windows-static/include/boost/graph/directed_graph.hpp
+x64-windows-static/include/boost/graph/dll_import_export.hpp
+x64-windows-static/include/boost/graph/dominator_tree.hpp
+x64-windows-static/include/boost/graph/eccentricity.hpp
+x64-windows-static/include/boost/graph/edge_coloring.hpp
+x64-windows-static/include/boost/graph/edge_connectivity.hpp
+x64-windows-static/include/boost/graph/edge_list.hpp
+x64-windows-static/include/boost/graph/edmonds_karp_max_flow.hpp
+x64-windows-static/include/boost/graph/edmunds_karp_max_flow.hpp
+x64-windows-static/include/boost/graph/erdos_renyi_generator.hpp
+x64-windows-static/include/boost/graph/exception.hpp
+x64-windows-static/include/boost/graph/exterior_property.hpp
+x64-windows-static/include/boost/graph/filtered_graph.hpp
+x64-windows-static/include/boost/graph/find_flow_cost.hpp
+x64-windows-static/include/boost/graph/floyd_warshall_shortest.hpp
+x64-windows-static/include/boost/graph/fruchterman_reingold.hpp
+x64-windows-static/include/boost/graph/geodesic_distance.hpp
+x64-windows-static/include/boost/graph/graph_archetypes.hpp
+x64-windows-static/include/boost/graph/graph_as_tree.hpp
+x64-windows-static/include/boost/graph/graph_concepts.hpp
+x64-windows-static/include/boost/graph/graph_mutability_traits.hpp
+x64-windows-static/include/boost/graph/graph_selectors.hpp
+x64-windows-static/include/boost/graph/graph_stats.hpp
+x64-windows-static/include/boost/graph/graph_test.hpp
+x64-windows-static/include/boost/graph/graph_traits.hpp
+x64-windows-static/include/boost/graph/graph_utility.hpp
+x64-windows-static/include/boost/graph/graphml.hpp
+x64-windows-static/include/boost/graph/graphviz.hpp
+x64-windows-static/include/boost/graph/grid_graph.hpp
+x64-windows-static/include/boost/graph/gursoy_atun_layout.hpp
+x64-windows-static/include/boost/graph/hawick_circuits.hpp
+x64-windows-static/include/boost/graph/howard_cycle_ratio.hpp
+x64-windows-static/include/boost/graph/incremental_components.hpp
+x64-windows-static/include/boost/graph/is_kuratowski_subgraph.hpp
+x64-windows-static/include/boost/graph/is_straight_line_drawing.hpp
+x64-windows-static/include/boost/graph/isomorphism.hpp
+x64-windows-static/include/boost/graph/iteration_macros.hpp
+x64-windows-static/include/boost/graph/iteration_macros_undef.hpp
+x64-windows-static/include/boost/graph/johnson_all_pairs_shortest.hpp
+x64-windows-static/include/boost/graph/kamada_kawai_spring_layout.hpp
+x64-windows-static/include/boost/graph/king_ordering.hpp
+x64-windows-static/include/boost/graph/kruskal_min_spanning_tree.hpp
+x64-windows-static/include/boost/graph/labeled_graph.hpp
+x64-windows-static/include/boost/graph/leda_graph.hpp
+x64-windows-static/include/boost/graph/lookup_edge.hpp
+x64-windows-static/include/boost/graph/loop_erased_random_walk.hpp
+x64-windows-static/include/boost/graph/make_biconnected_planar.hpp
+x64-windows-static/include/boost/graph/make_connected.hpp
+x64-windows-static/include/boost/graph/make_maximal_planar.hpp
+x64-windows-static/include/boost/graph/matrix_as_graph.hpp
+x64-windows-static/include/boost/graph/max_cardinality_matching.hpp
+x64-windows-static/include/boost/graph/maximum_adjacency_search.hpp
+x64-windows-static/include/boost/graph/mcgregor_common_subgraphs.hpp
+x64-windows-static/include/boost/graph/mesh_graph_generator.hpp
+x64-windows-static/include/boost/graph/metis.hpp
+x64-windows-static/include/boost/graph/metric_tsp_approx.hpp
+x64-windows-static/include/boost/graph/minimum_degree_ordering.hpp
+x64-windows-static/include/boost/graph/named_function_params.hpp
+x64-windows-static/include/boost/graph/named_graph.hpp
+x64-windows-static/include/boost/graph/neighbor_bfs.hpp
+x64-windows-static/include/boost/graph/numeric_values.hpp
+x64-windows-static/include/boost/graph/one_bit_color_map.hpp
+x64-windows-static/include/boost/graph/overloading.hpp
+x64-windows-static/include/boost/graph/page_rank.hpp
+x64-windows-static/include/boost/graph/planar_canonical_ordering.hpp
+x64-windows-static/include/boost/graph/planar_detail/
+x64-windows-static/include/boost/graph/planar_detail/add_edge_visitors.hpp
+x64-windows-static/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp
+x64-windows-static/include/boost/graph/planar_detail/bucket_sort.hpp
+x64-windows-static/include/boost/graph/planar_detail/face_handles.hpp
+x64-windows-static/include/boost/graph/planar_detail/face_iterators.hpp
+x64-windows-static/include/boost/graph/planar_face_traversal.hpp
+x64-windows-static/include/boost/graph/plod_generator.hpp
+x64-windows-static/include/boost/graph/point_traits.hpp
+x64-windows-static/include/boost/graph/prim_minimum_spanning_tree.hpp
+x64-windows-static/include/boost/graph/profile.hpp
+x64-windows-static/include/boost/graph/properties.hpp
+x64-windows-static/include/boost/graph/property_iter_range.hpp
+x64-windows-static/include/boost/graph/property_maps/
+x64-windows-static/include/boost/graph/property_maps/constant_property_map.hpp
+x64-windows-static/include/boost/graph/property_maps/container_property_map.hpp
+x64-windows-static/include/boost/graph/property_maps/matrix_property_map.hpp
+x64-windows-static/include/boost/graph/property_maps/null_property_map.hpp
+x64-windows-static/include/boost/graph/push_relabel_max_flow.hpp
+x64-windows-static/include/boost/graph/r_c_shortest_paths.hpp
+x64-windows-static/include/boost/graph/random.hpp
+x64-windows-static/include/boost/graph/random_layout.hpp
+x64-windows-static/include/boost/graph/random_spanning_tree.hpp
+x64-windows-static/include/boost/graph/read_dimacs.hpp
+x64-windows-static/include/boost/graph/relax.hpp
+x64-windows-static/include/boost/graph/reverse_graph.hpp
+x64-windows-static/include/boost/graph/rmat_graph_generator.hpp
+x64-windows-static/include/boost/graph/sequential_vertex_coloring.hpp
+x64-windows-static/include/boost/graph/simple_point.hpp
+x64-windows-static/include/boost/graph/sloan_ordering.hpp
+x64-windows-static/include/boost/graph/small_world_generator.hpp
+x64-windows-static/include/boost/graph/smallest_last_ordering.hpp
+x64-windows-static/include/boost/graph/ssca_graph_generator.hpp
+x64-windows-static/include/boost/graph/st_connected.hpp
+x64-windows-static/include/boost/graph/stanford_graph.hpp
+x64-windows-static/include/boost/graph/stoer_wagner_min_cut.hpp
+x64-windows-static/include/boost/graph/strong_components.hpp
+x64-windows-static/include/boost/graph/subgraph.hpp
+x64-windows-static/include/boost/graph/successive_shortest_path_nonnegative_weights.hpp
+x64-windows-static/include/boost/graph/tiernan_all_cycles.hpp
+x64-windows-static/include/boost/graph/topological_sort.hpp
+x64-windows-static/include/boost/graph/topology.hpp
+x64-windows-static/include/boost/graph/transitive_closure.hpp
+x64-windows-static/include/boost/graph/transitive_reduction.hpp
+x64-windows-static/include/boost/graph/transpose_graph.hpp
+x64-windows-static/include/boost/graph/tree_traits.hpp
+x64-windows-static/include/boost/graph/two_bit_color_map.hpp
+x64-windows-static/include/boost/graph/two_graphs_common_spanning_trees.hpp
+x64-windows-static/include/boost/graph/undirected_dfs.hpp
+x64-windows-static/include/boost/graph/undirected_graph.hpp
+x64-windows-static/include/boost/graph/use_mpi.hpp
+x64-windows-static/include/boost/graph/vector_as_graph.hpp
+x64-windows-static/include/boost/graph/vertex_and_edge_range.hpp
+x64-windows-static/include/boost/graph/vf2_sub_graph_iso.hpp
+x64-windows-static/include/boost/graph/visitors.hpp
+x64-windows-static/include/boost/graph/wavefront.hpp
+x64-windows-static/include/boost/graph/write_dimacs.hpp
+x64-windows-static/include/boost/pending/
+x64-windows-static/include/boost/pending/bucket_sorter.hpp
+x64-windows-static/include/boost/pending/container_traits.hpp
+x64-windows-static/include/boost/pending/detail/
+x64-windows-static/include/boost/pending/detail/property.hpp
+x64-windows-static/include/boost/pending/fenced_priority_queue.hpp
+x64-windows-static/include/boost/pending/fibonacci_heap.hpp
+x64-windows-static/include/boost/pending/indirect_cmp.hpp
+x64-windows-static/include/boost/pending/is_heap.hpp
+x64-windows-static/include/boost/pending/mutable_heap.hpp
+x64-windows-static/include/boost/pending/mutable_queue.hpp
+x64-windows-static/include/boost/pending/property.hpp
+x64-windows-static/include/boost/pending/queue.hpp
+x64-windows-static/include/boost/pending/relaxed_heap.hpp
+x64-windows-static/include/boost/pending/stringtok.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_graph-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-graph/
+x64-windows-static/share/boost-graph/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/integer.hpp
+x64-windows/include/boost/integer/
+x64-windows/include/boost/integer/common_factor.hpp
+x64-windows/include/boost/integer/common_factor_ct.hpp
+x64-windows/include/boost/integer/common_factor_rt.hpp
+x64-windows/include/boost/integer/integer_log2.hpp
+x64-windows/include/boost/integer/integer_mask.hpp
+x64-windows/include/boost/integer/static_log2.hpp
+x64-windows/include/boost/integer/static_min_max.hpp
+x64-windows/include/boost/integer_fwd.hpp
+x64-windows/include/boost/integer_traits.hpp
+x64-windows/include/boost/pending/
+x64-windows/include/boost/pending/integer_log2.hpp
+x64-windows/share/
+x64-windows/share/boost-integer/
+x64-windows/share/boost-integer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-integer_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/integer.hpp
+x64-windows-static/include/boost/integer/
+x64-windows-static/include/boost/integer/common_factor.hpp
+x64-windows-static/include/boost/integer/common_factor_ct.hpp
+x64-windows-static/include/boost/integer/common_factor_rt.hpp
+x64-windows-static/include/boost/integer/integer_log2.hpp
+x64-windows-static/include/boost/integer/integer_mask.hpp
+x64-windows-static/include/boost/integer/static_log2.hpp
+x64-windows-static/include/boost/integer/static_min_max.hpp
+x64-windows-static/include/boost/integer_fwd.hpp
+x64-windows-static/include/boost/integer_traits.hpp
+x64-windows-static/include/boost/pending/
+x64-windows-static/include/boost/pending/integer_log2.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-integer/
+x64-windows-static/share/boost-integer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,100 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/intrusive/
+x64-windows/include/boost/intrusive/any_hook.hpp
+x64-windows/include/boost/intrusive/avl_set.hpp
+x64-windows/include/boost/intrusive/avl_set_hook.hpp
+x64-windows/include/boost/intrusive/avltree.hpp
+x64-windows/include/boost/intrusive/avltree_algorithms.hpp
+x64-windows/include/boost/intrusive/bs_set.hpp
+x64-windows/include/boost/intrusive/bs_set_hook.hpp
+x64-windows/include/boost/intrusive/bstree.hpp
+x64-windows/include/boost/intrusive/bstree_algorithms.hpp
+x64-windows/include/boost/intrusive/circular_list_algorithms.hpp
+x64-windows/include/boost/intrusive/circular_slist_algorithms.hpp
+x64-windows/include/boost/intrusive/derivation_value_traits.hpp
+x64-windows/include/boost/intrusive/detail/
+x64-windows/include/boost/intrusive/detail/algo_type.hpp
+x64-windows/include/boost/intrusive/detail/algorithm.hpp
+x64-windows/include/boost/intrusive/detail/any_node_and_algorithms.hpp
+x64-windows/include/boost/intrusive/detail/array_initializer.hpp
+x64-windows/include/boost/intrusive/detail/assert.hpp
+x64-windows/include/boost/intrusive/detail/avltree_node.hpp
+x64-windows/include/boost/intrusive/detail/bstree_algorithms_base.hpp
+x64-windows/include/boost/intrusive/detail/common_slist_algorithms.hpp
+x64-windows/include/boost/intrusive/detail/config_begin.hpp
+x64-windows/include/boost/intrusive/detail/config_end.hpp
+x64-windows/include/boost/intrusive/detail/default_header_holder.hpp
+x64-windows/include/boost/intrusive/detail/ebo_functor_holder.hpp
+x64-windows/include/boost/intrusive/detail/empty_node_checker.hpp
+x64-windows/include/boost/intrusive/detail/equal_to_value.hpp
+x64-windows/include/boost/intrusive/detail/exception_disposer.hpp
+x64-windows/include/boost/intrusive/detail/function_detector.hpp
+x64-windows/include/boost/intrusive/detail/generic_hook.hpp
+x64-windows/include/boost/intrusive/detail/get_value_traits.hpp
+x64-windows/include/boost/intrusive/detail/has_member_function_callable_with.hpp
+x64-windows/include/boost/intrusive/detail/hashtable_node.hpp
+x64-windows/include/boost/intrusive/detail/hook_traits.hpp
+x64-windows/include/boost/intrusive/detail/iiterator.hpp
+x64-windows/include/boost/intrusive/detail/is_stateful_value_traits.hpp
+x64-windows/include/boost/intrusive/detail/iterator.hpp
+x64-windows/include/boost/intrusive/detail/key_nodeptr_comp.hpp
+x64-windows/include/boost/intrusive/detail/list_iterator.hpp
+x64-windows/include/boost/intrusive/detail/list_node.hpp
+x64-windows/include/boost/intrusive/detail/math.hpp
+x64-windows/include/boost/intrusive/detail/minimal_less_equal_header.hpp
+x64-windows/include/boost/intrusive/detail/minimal_pair_header.hpp
+x64-windows/include/boost/intrusive/detail/mpl.hpp
+x64-windows/include/boost/intrusive/detail/node_cloner_disposer.hpp
+x64-windows/include/boost/intrusive/detail/node_holder.hpp
+x64-windows/include/boost/intrusive/detail/node_to_value.hpp
+x64-windows/include/boost/intrusive/detail/parent_from_member.hpp
+x64-windows/include/boost/intrusive/detail/rbtree_node.hpp
+x64-windows/include/boost/intrusive/detail/reverse_iterator.hpp
+x64-windows/include/boost/intrusive/detail/simple_disposers.hpp
+x64-windows/include/boost/intrusive/detail/size_holder.hpp
+x64-windows/include/boost/intrusive/detail/slist_iterator.hpp
+x64-windows/include/boost/intrusive/detail/slist_node.hpp
+x64-windows/include/boost/intrusive/detail/std_fwd.hpp
+x64-windows/include/boost/intrusive/detail/transform_iterator.hpp
+x64-windows/include/boost/intrusive/detail/tree_iterator.hpp
+x64-windows/include/boost/intrusive/detail/tree_node.hpp
+x64-windows/include/boost/intrusive/detail/tree_value_compare.hpp
+x64-windows/include/boost/intrusive/detail/uncast.hpp
+x64-windows/include/boost/intrusive/detail/workaround.hpp
+x64-windows/include/boost/intrusive/hashtable.hpp
+x64-windows/include/boost/intrusive/intrusive_fwd.hpp
+x64-windows/include/boost/intrusive/linear_slist_algorithms.hpp
+x64-windows/include/boost/intrusive/link_mode.hpp
+x64-windows/include/boost/intrusive/list.hpp
+x64-windows/include/boost/intrusive/list_hook.hpp
+x64-windows/include/boost/intrusive/member_value_traits.hpp
+x64-windows/include/boost/intrusive/options.hpp
+x64-windows/include/boost/intrusive/pack_options.hpp
+x64-windows/include/boost/intrusive/parent_from_member.hpp
+x64-windows/include/boost/intrusive/pointer_plus_bits.hpp
+x64-windows/include/boost/intrusive/pointer_rebind.hpp
+x64-windows/include/boost/intrusive/pointer_traits.hpp
+x64-windows/include/boost/intrusive/priority_compare.hpp
+x64-windows/include/boost/intrusive/rbtree.hpp
+x64-windows/include/boost/intrusive/rbtree_algorithms.hpp
+x64-windows/include/boost/intrusive/set.hpp
+x64-windows/include/boost/intrusive/set_hook.hpp
+x64-windows/include/boost/intrusive/sg_set.hpp
+x64-windows/include/boost/intrusive/sgtree.hpp
+x64-windows/include/boost/intrusive/sgtree_algorithms.hpp
+x64-windows/include/boost/intrusive/slist.hpp
+x64-windows/include/boost/intrusive/slist_hook.hpp
+x64-windows/include/boost/intrusive/splay_set.hpp
+x64-windows/include/boost/intrusive/splaytree.hpp
+x64-windows/include/boost/intrusive/splaytree_algorithms.hpp
+x64-windows/include/boost/intrusive/treap.hpp
+x64-windows/include/boost/intrusive/treap_algorithms.hpp
+x64-windows/include/boost/intrusive/treap_set.hpp
+x64-windows/include/boost/intrusive/trivial_value_traits.hpp
+x64-windows/include/boost/intrusive/unordered_set.hpp
+x64-windows/include/boost/intrusive/unordered_set_hook.hpp
+x64-windows/share/
+x64-windows/share/boost-intrusive/
+x64-windows/share/boost-intrusive/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,100 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/intrusive/
+x64-windows-static/include/boost/intrusive/any_hook.hpp
+x64-windows-static/include/boost/intrusive/avl_set.hpp
+x64-windows-static/include/boost/intrusive/avl_set_hook.hpp
+x64-windows-static/include/boost/intrusive/avltree.hpp
+x64-windows-static/include/boost/intrusive/avltree_algorithms.hpp
+x64-windows-static/include/boost/intrusive/bs_set.hpp
+x64-windows-static/include/boost/intrusive/bs_set_hook.hpp
+x64-windows-static/include/boost/intrusive/bstree.hpp
+x64-windows-static/include/boost/intrusive/bstree_algorithms.hpp
+x64-windows-static/include/boost/intrusive/circular_list_algorithms.hpp
+x64-windows-static/include/boost/intrusive/circular_slist_algorithms.hpp
+x64-windows-static/include/boost/intrusive/derivation_value_traits.hpp
+x64-windows-static/include/boost/intrusive/detail/
+x64-windows-static/include/boost/intrusive/detail/algo_type.hpp
+x64-windows-static/include/boost/intrusive/detail/algorithm.hpp
+x64-windows-static/include/boost/intrusive/detail/any_node_and_algorithms.hpp
+x64-windows-static/include/boost/intrusive/detail/array_initializer.hpp
+x64-windows-static/include/boost/intrusive/detail/assert.hpp
+x64-windows-static/include/boost/intrusive/detail/avltree_node.hpp
+x64-windows-static/include/boost/intrusive/detail/bstree_algorithms_base.hpp
+x64-windows-static/include/boost/intrusive/detail/common_slist_algorithms.hpp
+x64-windows-static/include/boost/intrusive/detail/config_begin.hpp
+x64-windows-static/include/boost/intrusive/detail/config_end.hpp
+x64-windows-static/include/boost/intrusive/detail/default_header_holder.hpp
+x64-windows-static/include/boost/intrusive/detail/ebo_functor_holder.hpp
+x64-windows-static/include/boost/intrusive/detail/empty_node_checker.hpp
+x64-windows-static/include/boost/intrusive/detail/equal_to_value.hpp
+x64-windows-static/include/boost/intrusive/detail/exception_disposer.hpp
+x64-windows-static/include/boost/intrusive/detail/function_detector.hpp
+x64-windows-static/include/boost/intrusive/detail/generic_hook.hpp
+x64-windows-static/include/boost/intrusive/detail/get_value_traits.hpp
+x64-windows-static/include/boost/intrusive/detail/has_member_function_callable_with.hpp
+x64-windows-static/include/boost/intrusive/detail/hashtable_node.hpp
+x64-windows-static/include/boost/intrusive/detail/hook_traits.hpp
+x64-windows-static/include/boost/intrusive/detail/iiterator.hpp
+x64-windows-static/include/boost/intrusive/detail/is_stateful_value_traits.hpp
+x64-windows-static/include/boost/intrusive/detail/iterator.hpp
+x64-windows-static/include/boost/intrusive/detail/key_nodeptr_comp.hpp
+x64-windows-static/include/boost/intrusive/detail/list_iterator.hpp
+x64-windows-static/include/boost/intrusive/detail/list_node.hpp
+x64-windows-static/include/boost/intrusive/detail/math.hpp
+x64-windows-static/include/boost/intrusive/detail/minimal_less_equal_header.hpp
+x64-windows-static/include/boost/intrusive/detail/minimal_pair_header.hpp
+x64-windows-static/include/boost/intrusive/detail/mpl.hpp
+x64-windows-static/include/boost/intrusive/detail/node_cloner_disposer.hpp
+x64-windows-static/include/boost/intrusive/detail/node_holder.hpp
+x64-windows-static/include/boost/intrusive/detail/node_to_value.hpp
+x64-windows-static/include/boost/intrusive/detail/parent_from_member.hpp
+x64-windows-static/include/boost/intrusive/detail/rbtree_node.hpp
+x64-windows-static/include/boost/intrusive/detail/reverse_iterator.hpp
+x64-windows-static/include/boost/intrusive/detail/simple_disposers.hpp
+x64-windows-static/include/boost/intrusive/detail/size_holder.hpp
+x64-windows-static/include/boost/intrusive/detail/slist_iterator.hpp
+x64-windows-static/include/boost/intrusive/detail/slist_node.hpp
+x64-windows-static/include/boost/intrusive/detail/std_fwd.hpp
+x64-windows-static/include/boost/intrusive/detail/transform_iterator.hpp
+x64-windows-static/include/boost/intrusive/detail/tree_iterator.hpp
+x64-windows-static/include/boost/intrusive/detail/tree_node.hpp
+x64-windows-static/include/boost/intrusive/detail/tree_value_compare.hpp
+x64-windows-static/include/boost/intrusive/detail/uncast.hpp
+x64-windows-static/include/boost/intrusive/detail/workaround.hpp
+x64-windows-static/include/boost/intrusive/hashtable.hpp
+x64-windows-static/include/boost/intrusive/intrusive_fwd.hpp
+x64-windows-static/include/boost/intrusive/linear_slist_algorithms.hpp
+x64-windows-static/include/boost/intrusive/link_mode.hpp
+x64-windows-static/include/boost/intrusive/list.hpp
+x64-windows-static/include/boost/intrusive/list_hook.hpp
+x64-windows-static/include/boost/intrusive/member_value_traits.hpp
+x64-windows-static/include/boost/intrusive/options.hpp
+x64-windows-static/include/boost/intrusive/pack_options.hpp
+x64-windows-static/include/boost/intrusive/parent_from_member.hpp
+x64-windows-static/include/boost/intrusive/pointer_plus_bits.hpp
+x64-windows-static/include/boost/intrusive/pointer_rebind.hpp
+x64-windows-static/include/boost/intrusive/pointer_traits.hpp
+x64-windows-static/include/boost/intrusive/priority_compare.hpp
+x64-windows-static/include/boost/intrusive/rbtree.hpp
+x64-windows-static/include/boost/intrusive/rbtree_algorithms.hpp
+x64-windows-static/include/boost/intrusive/set.hpp
+x64-windows-static/include/boost/intrusive/set_hook.hpp
+x64-windows-static/include/boost/intrusive/sg_set.hpp
+x64-windows-static/include/boost/intrusive/sgtree.hpp
+x64-windows-static/include/boost/intrusive/sgtree_algorithms.hpp
+x64-windows-static/include/boost/intrusive/slist.hpp
+x64-windows-static/include/boost/intrusive/slist_hook.hpp
+x64-windows-static/include/boost/intrusive/splay_set.hpp
+x64-windows-static/include/boost/intrusive/splaytree.hpp
+x64-windows-static/include/boost/intrusive/splaytree_algorithms.hpp
+x64-windows-static/include/boost/intrusive/treap.hpp
+x64-windows-static/include/boost/intrusive/treap_algorithms.hpp
+x64-windows-static/include/boost/intrusive/treap_set.hpp
+x64-windows-static/include/boost/intrusive/trivial_value_traits.hpp
+x64-windows-static/include/boost/intrusive/unordered_set.hpp
+x64-windows-static/include/boost/intrusive/unordered_set_hook.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-intrusive/
+x64-windows-static/share/boost-intrusive/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/io/
+x64-windows/include/boost/io/detail/
+x64-windows/include/boost/io/detail/quoted_manip.hpp
+x64-windows/include/boost/io/ios_state.hpp
+x64-windows/include/boost/io_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-io/
+x64-windows/share/boost-io/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-io_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/io/
+x64-windows-static/include/boost/io/detail/
+x64-windows-static/include/boost/io/detail/quoted_manip.hpp
+x64-windows-static/include/boost/io/ios_state.hpp
+x64-windows-static/include/boost/io_fwd.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-io/
+x64-windows-static/share/boost-io/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,151 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_iostreams-vc141-mt-x32-1_67.dll
+x64-windows/bin/boost_iostreams-vc141-mt-x32-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_iostreams-vc141-mt-gd-x32-1_67.dll
+x64-windows/debug/bin/boost_iostreams-vc141-mt-gd-x32-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_iostreams-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/iostreams/
+x64-windows/include/boost/iostreams/categories.hpp
+x64-windows/include/boost/iostreams/chain.hpp
+x64-windows/include/boost/iostreams/char_traits.hpp
+x64-windows/include/boost/iostreams/checked_operations.hpp
+x64-windows/include/boost/iostreams/close.hpp
+x64-windows/include/boost/iostreams/code_converter.hpp
+x64-windows/include/boost/iostreams/combine.hpp
+x64-windows/include/boost/iostreams/compose.hpp
+x64-windows/include/boost/iostreams/concepts.hpp
+x64-windows/include/boost/iostreams/constants.hpp
+x64-windows/include/boost/iostreams/copy.hpp
+x64-windows/include/boost/iostreams/detail/
+x64-windows/include/boost/iostreams/detail/absolute_path.hpp
+x64-windows/include/boost/iostreams/detail/access_control.hpp
+x64-windows/include/boost/iostreams/detail/adapter/
+x64-windows/include/boost/iostreams/detail/adapter/concept_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/device_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/direct_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/filter_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/mode_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/non_blocking_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/output_iterator_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/range_adapter.hpp
+x64-windows/include/boost/iostreams/detail/add_facet.hpp
+x64-windows/include/boost/iostreams/detail/bool_trait_def.hpp
+x64-windows/include/boost/iostreams/detail/broken_overload_resolution/
+x64-windows/include/boost/iostreams/detail/broken_overload_resolution/forward.hpp
+x64-windows/include/boost/iostreams/detail/broken_overload_resolution/stream.hpp
+x64-windows/include/boost/iostreams/detail/broken_overload_resolution/stream_buffer.hpp
+x64-windows/include/boost/iostreams/detail/buffer.hpp
+x64-windows/include/boost/iostreams/detail/call_traits.hpp
+x64-windows/include/boost/iostreams/detail/char_traits.hpp
+x64-windows/include/boost/iostreams/detail/codecvt_helper.hpp
+x64-windows/include/boost/iostreams/detail/codecvt_holder.hpp
+x64-windows/include/boost/iostreams/detail/config/
+x64-windows/include/boost/iostreams/detail/config/auto_link.hpp
+x64-windows/include/boost/iostreams/detail/config/bzip2.hpp
+x64-windows/include/boost/iostreams/detail/config/codecvt.hpp
+x64-windows/include/boost/iostreams/detail/config/disable_warnings.hpp
+x64-windows/include/boost/iostreams/detail/config/dyn_link.hpp
+x64-windows/include/boost/iostreams/detail/config/enable_warnings.hpp
+x64-windows/include/boost/iostreams/detail/config/fpos.hpp
+x64-windows/include/boost/iostreams/detail/config/gcc.hpp
+x64-windows/include/boost/iostreams/detail/config/limits.hpp
+x64-windows/include/boost/iostreams/detail/config/overload_resolution.hpp
+x64-windows/include/boost/iostreams/detail/config/rtl.hpp
+x64-windows/include/boost/iostreams/detail/config/unreachable_return.hpp
+x64-windows/include/boost/iostreams/detail/config/wide_streams.hpp
+x64-windows/include/boost/iostreams/detail/config/windows_posix.hpp
+x64-windows/include/boost/iostreams/detail/config/zlib.hpp
+x64-windows/include/boost/iostreams/detail/counted_array.hpp
+x64-windows/include/boost/iostreams/detail/current_directory.hpp
+x64-windows/include/boost/iostreams/detail/default_arg.hpp
+x64-windows/include/boost/iostreams/detail/dispatch.hpp
+x64-windows/include/boost/iostreams/detail/double_object.hpp
+x64-windows/include/boost/iostreams/detail/enable_if_stream.hpp
+x64-windows/include/boost/iostreams/detail/error.hpp
+x64-windows/include/boost/iostreams/detail/execute.hpp
+x64-windows/include/boost/iostreams/detail/file_handle.hpp
+x64-windows/include/boost/iostreams/detail/forward.hpp
+x64-windows/include/boost/iostreams/detail/fstream.hpp
+x64-windows/include/boost/iostreams/detail/functional.hpp
+x64-windows/include/boost/iostreams/detail/ios.hpp
+x64-windows/include/boost/iostreams/detail/iostream.hpp
+x64-windows/include/boost/iostreams/detail/is_dereferenceable.hpp
+x64-windows/include/boost/iostreams/detail/is_iterator_range.hpp
+x64-windows/include/boost/iostreams/detail/newline.hpp
+x64-windows/include/boost/iostreams/detail/optional.hpp
+x64-windows/include/boost/iostreams/detail/param_type.hpp
+x64-windows/include/boost/iostreams/detail/path.hpp
+x64-windows/include/boost/iostreams/detail/push.hpp
+x64-windows/include/boost/iostreams/detail/push_params.hpp
+x64-windows/include/boost/iostreams/detail/resolve.hpp
+x64-windows/include/boost/iostreams/detail/restrict_impl.hpp
+x64-windows/include/boost/iostreams/detail/select.hpp
+x64-windows/include/boost/iostreams/detail/select_by_size.hpp
+x64-windows/include/boost/iostreams/detail/streambuf.hpp
+x64-windows/include/boost/iostreams/detail/streambuf/
+x64-windows/include/boost/iostreams/detail/streambuf/chainbuf.hpp
+x64-windows/include/boost/iostreams/detail/streambuf/direct_streambuf.hpp
+x64-windows/include/boost/iostreams/detail/streambuf/indirect_streambuf.hpp
+x64-windows/include/boost/iostreams/detail/streambuf/linked_streambuf.hpp
+x64-windows/include/boost/iostreams/detail/system_failure.hpp
+x64-windows/include/boost/iostreams/detail/template_params.hpp
+x64-windows/include/boost/iostreams/detail/translate_int_type.hpp
+x64-windows/include/boost/iostreams/detail/wrap_unwrap.hpp
+x64-windows/include/boost/iostreams/device/
+x64-windows/include/boost/iostreams/device/array.hpp
+x64-windows/include/boost/iostreams/device/back_inserter.hpp
+x64-windows/include/boost/iostreams/device/file.hpp
+x64-windows/include/boost/iostreams/device/file_descriptor.hpp
+x64-windows/include/boost/iostreams/device/mapped_file.hpp
+x64-windows/include/boost/iostreams/device/null.hpp
+x64-windows/include/boost/iostreams/filter/
+x64-windows/include/boost/iostreams/filter/aggregate.hpp
+x64-windows/include/boost/iostreams/filter/bzip2.hpp
+x64-windows/include/boost/iostreams/filter/counter.hpp
+x64-windows/include/boost/iostreams/filter/grep.hpp
+x64-windows/include/boost/iostreams/filter/gzip.hpp
+x64-windows/include/boost/iostreams/filter/line.hpp
+x64-windows/include/boost/iostreams/filter/lzma.hpp
+x64-windows/include/boost/iostreams/filter/newline.hpp
+x64-windows/include/boost/iostreams/filter/regex.hpp
+x64-windows/include/boost/iostreams/filter/stdio.hpp
+x64-windows/include/boost/iostreams/filter/symmetric.hpp
+x64-windows/include/boost/iostreams/filter/test.hpp
+x64-windows/include/boost/iostreams/filter/zlib.hpp
+x64-windows/include/boost/iostreams/filtering_stream.hpp
+x64-windows/include/boost/iostreams/filtering_streambuf.hpp
+x64-windows/include/boost/iostreams/flush.hpp
+x64-windows/include/boost/iostreams/get.hpp
+x64-windows/include/boost/iostreams/imbue.hpp
+x64-windows/include/boost/iostreams/input_sequence.hpp
+x64-windows/include/boost/iostreams/invert.hpp
+x64-windows/include/boost/iostreams/operations.hpp
+x64-windows/include/boost/iostreams/operations_fwd.hpp
+x64-windows/include/boost/iostreams/optimal_buffer_size.hpp
+x64-windows/include/boost/iostreams/output_sequence.hpp
+x64-windows/include/boost/iostreams/pipeline.hpp
+x64-windows/include/boost/iostreams/positioning.hpp
+x64-windows/include/boost/iostreams/put.hpp
+x64-windows/include/boost/iostreams/putback.hpp
+x64-windows/include/boost/iostreams/read.hpp
+x64-windows/include/boost/iostreams/restrict.hpp
+x64-windows/include/boost/iostreams/seek.hpp
+x64-windows/include/boost/iostreams/skip.hpp
+x64-windows/include/boost/iostreams/slice.hpp
+x64-windows/include/boost/iostreams/stream.hpp
+x64-windows/include/boost/iostreams/stream_buffer.hpp
+x64-windows/include/boost/iostreams/tee.hpp
+x64-windows/include/boost/iostreams/traits.hpp
+x64-windows/include/boost/iostreams/traits_fwd.hpp
+x64-windows/include/boost/iostreams/write.hpp
+x64-windows/lib/
+x64-windows/lib/boost_iostreams-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-iostreams/
+x64-windows/share/boost-iostreams/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,145 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_iostreams-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/iostreams/
+x64-windows-static/include/boost/iostreams/categories.hpp
+x64-windows-static/include/boost/iostreams/chain.hpp
+x64-windows-static/include/boost/iostreams/char_traits.hpp
+x64-windows-static/include/boost/iostreams/checked_operations.hpp
+x64-windows-static/include/boost/iostreams/close.hpp
+x64-windows-static/include/boost/iostreams/code_converter.hpp
+x64-windows-static/include/boost/iostreams/combine.hpp
+x64-windows-static/include/boost/iostreams/compose.hpp
+x64-windows-static/include/boost/iostreams/concepts.hpp
+x64-windows-static/include/boost/iostreams/constants.hpp
+x64-windows-static/include/boost/iostreams/copy.hpp
+x64-windows-static/include/boost/iostreams/detail/
+x64-windows-static/include/boost/iostreams/detail/absolute_path.hpp
+x64-windows-static/include/boost/iostreams/detail/access_control.hpp
+x64-windows-static/include/boost/iostreams/detail/adapter/
+x64-windows-static/include/boost/iostreams/detail/adapter/concept_adapter.hpp
+x64-windows-static/include/boost/iostreams/detail/adapter/device_adapter.hpp
+x64-windows-static/include/boost/iostreams/detail/adapter/direct_adapter.hpp
+x64-windows-static/include/boost/iostreams/detail/adapter/filter_adapter.hpp
+x64-windows-static/include/boost/iostreams/detail/adapter/mode_adapter.hpp
+x64-windows-static/include/boost/iostreams/detail/adapter/non_blocking_adapter.hpp
+x64-windows-static/include/boost/iostreams/detail/adapter/output_iterator_adapter.hpp
+x64-windows-static/include/boost/iostreams/detail/adapter/range_adapter.hpp
+x64-windows-static/include/boost/iostreams/detail/add_facet.hpp
+x64-windows-static/include/boost/iostreams/detail/bool_trait_def.hpp
+x64-windows-static/include/boost/iostreams/detail/broken_overload_resolution/
+x64-windows-static/include/boost/iostreams/detail/broken_overload_resolution/forward.hpp
+x64-windows-static/include/boost/iostreams/detail/broken_overload_resolution/stream.hpp
+x64-windows-static/include/boost/iostreams/detail/broken_overload_resolution/stream_buffer.hpp
+x64-windows-static/include/boost/iostreams/detail/buffer.hpp
+x64-windows-static/include/boost/iostreams/detail/call_traits.hpp
+x64-windows-static/include/boost/iostreams/detail/char_traits.hpp
+x64-windows-static/include/boost/iostreams/detail/codecvt_helper.hpp
+x64-windows-static/include/boost/iostreams/detail/codecvt_holder.hpp
+x64-windows-static/include/boost/iostreams/detail/config/
+x64-windows-static/include/boost/iostreams/detail/config/auto_link.hpp
+x64-windows-static/include/boost/iostreams/detail/config/bzip2.hpp
+x64-windows-static/include/boost/iostreams/detail/config/codecvt.hpp
+x64-windows-static/include/boost/iostreams/detail/config/disable_warnings.hpp
+x64-windows-static/include/boost/iostreams/detail/config/dyn_link.hpp
+x64-windows-static/include/boost/iostreams/detail/config/enable_warnings.hpp
+x64-windows-static/include/boost/iostreams/detail/config/fpos.hpp
+x64-windows-static/include/boost/iostreams/detail/config/gcc.hpp
+x64-windows-static/include/boost/iostreams/detail/config/limits.hpp
+x64-windows-static/include/boost/iostreams/detail/config/overload_resolution.hpp
+x64-windows-static/include/boost/iostreams/detail/config/rtl.hpp
+x64-windows-static/include/boost/iostreams/detail/config/unreachable_return.hpp
+x64-windows-static/include/boost/iostreams/detail/config/wide_streams.hpp
+x64-windows-static/include/boost/iostreams/detail/config/windows_posix.hpp
+x64-windows-static/include/boost/iostreams/detail/config/zlib.hpp
+x64-windows-static/include/boost/iostreams/detail/counted_array.hpp
+x64-windows-static/include/boost/iostreams/detail/current_directory.hpp
+x64-windows-static/include/boost/iostreams/detail/default_arg.hpp
+x64-windows-static/include/boost/iostreams/detail/dispatch.hpp
+x64-windows-static/include/boost/iostreams/detail/double_object.hpp
+x64-windows-static/include/boost/iostreams/detail/enable_if_stream.hpp
+x64-windows-static/include/boost/iostreams/detail/error.hpp
+x64-windows-static/include/boost/iostreams/detail/execute.hpp
+x64-windows-static/include/boost/iostreams/detail/file_handle.hpp
+x64-windows-static/include/boost/iostreams/detail/forward.hpp
+x64-windows-static/include/boost/iostreams/detail/fstream.hpp
+x64-windows-static/include/boost/iostreams/detail/functional.hpp
+x64-windows-static/include/boost/iostreams/detail/ios.hpp
+x64-windows-static/include/boost/iostreams/detail/iostream.hpp
+x64-windows-static/include/boost/iostreams/detail/is_dereferenceable.hpp
+x64-windows-static/include/boost/iostreams/detail/is_iterator_range.hpp
+x64-windows-static/include/boost/iostreams/detail/newline.hpp
+x64-windows-static/include/boost/iostreams/detail/optional.hpp
+x64-windows-static/include/boost/iostreams/detail/param_type.hpp
+x64-windows-static/include/boost/iostreams/detail/path.hpp
+x64-windows-static/include/boost/iostreams/detail/push.hpp
+x64-windows-static/include/boost/iostreams/detail/push_params.hpp
+x64-windows-static/include/boost/iostreams/detail/resolve.hpp
+x64-windows-static/include/boost/iostreams/detail/restrict_impl.hpp
+x64-windows-static/include/boost/iostreams/detail/select.hpp
+x64-windows-static/include/boost/iostreams/detail/select_by_size.hpp
+x64-windows-static/include/boost/iostreams/detail/streambuf.hpp
+x64-windows-static/include/boost/iostreams/detail/streambuf/
+x64-windows-static/include/boost/iostreams/detail/streambuf/chainbuf.hpp
+x64-windows-static/include/boost/iostreams/detail/streambuf/direct_streambuf.hpp
+x64-windows-static/include/boost/iostreams/detail/streambuf/indirect_streambuf.hpp
+x64-windows-static/include/boost/iostreams/detail/streambuf/linked_streambuf.hpp
+x64-windows-static/include/boost/iostreams/detail/system_failure.hpp
+x64-windows-static/include/boost/iostreams/detail/template_params.hpp
+x64-windows-static/include/boost/iostreams/detail/translate_int_type.hpp
+x64-windows-static/include/boost/iostreams/detail/wrap_unwrap.hpp
+x64-windows-static/include/boost/iostreams/device/
+x64-windows-static/include/boost/iostreams/device/array.hpp
+x64-windows-static/include/boost/iostreams/device/back_inserter.hpp
+x64-windows-static/include/boost/iostreams/device/file.hpp
+x64-windows-static/include/boost/iostreams/device/file_descriptor.hpp
+x64-windows-static/include/boost/iostreams/device/mapped_file.hpp
+x64-windows-static/include/boost/iostreams/device/null.hpp
+x64-windows-static/include/boost/iostreams/filter/
+x64-windows-static/include/boost/iostreams/filter/aggregate.hpp
+x64-windows-static/include/boost/iostreams/filter/bzip2.hpp
+x64-windows-static/include/boost/iostreams/filter/counter.hpp
+x64-windows-static/include/boost/iostreams/filter/grep.hpp
+x64-windows-static/include/boost/iostreams/filter/gzip.hpp
+x64-windows-static/include/boost/iostreams/filter/line.hpp
+x64-windows-static/include/boost/iostreams/filter/lzma.hpp
+x64-windows-static/include/boost/iostreams/filter/newline.hpp
+x64-windows-static/include/boost/iostreams/filter/regex.hpp
+x64-windows-static/include/boost/iostreams/filter/stdio.hpp
+x64-windows-static/include/boost/iostreams/filter/symmetric.hpp
+x64-windows-static/include/boost/iostreams/filter/test.hpp
+x64-windows-static/include/boost/iostreams/filter/zlib.hpp
+x64-windows-static/include/boost/iostreams/filtering_stream.hpp
+x64-windows-static/include/boost/iostreams/filtering_streambuf.hpp
+x64-windows-static/include/boost/iostreams/flush.hpp
+x64-windows-static/include/boost/iostreams/get.hpp
+x64-windows-static/include/boost/iostreams/imbue.hpp
+x64-windows-static/include/boost/iostreams/input_sequence.hpp
+x64-windows-static/include/boost/iostreams/invert.hpp
+x64-windows-static/include/boost/iostreams/operations.hpp
+x64-windows-static/include/boost/iostreams/operations_fwd.hpp
+x64-windows-static/include/boost/iostreams/optimal_buffer_size.hpp
+x64-windows-static/include/boost/iostreams/output_sequence.hpp
+x64-windows-static/include/boost/iostreams/pipeline.hpp
+x64-windows-static/include/boost/iostreams/positioning.hpp
+x64-windows-static/include/boost/iostreams/put.hpp
+x64-windows-static/include/boost/iostreams/putback.hpp
+x64-windows-static/include/boost/iostreams/read.hpp
+x64-windows-static/include/boost/iostreams/restrict.hpp
+x64-windows-static/include/boost/iostreams/seek.hpp
+x64-windows-static/include/boost/iostreams/skip.hpp
+x64-windows-static/include/boost/iostreams/slice.hpp
+x64-windows-static/include/boost/iostreams/stream.hpp
+x64-windows-static/include/boost/iostreams/stream_buffer.hpp
+x64-windows-static/include/boost/iostreams/tee.hpp
+x64-windows-static/include/boost/iostreams/traits.hpp
+x64-windows-static/include/boost/iostreams/traits_fwd.hpp
+x64-windows-static/include/boost/iostreams/write.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_iostreams-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-iostreams/
+x64-windows-static/share/boost-iostreams/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/function_output_iterator.hpp
+x64-windows/include/boost/generator_iterator.hpp
+x64-windows/include/boost/indirect_reference.hpp
+x64-windows/include/boost/iterator/
+x64-windows/include/boost/iterator/advance.hpp
+x64-windows/include/boost/iterator/counting_iterator.hpp
+x64-windows/include/boost/iterator/detail/
+x64-windows/include/boost/iterator/detail/any_conversion_eater.hpp
+x64-windows/include/boost/iterator/detail/config_def.hpp
+x64-windows/include/boost/iterator/detail/config_undef.hpp
+x64-windows/include/boost/iterator/detail/enable_if.hpp
+x64-windows/include/boost/iterator/detail/facade_iterator_category.hpp
+x64-windows/include/boost/iterator/detail/minimum_category.hpp
+x64-windows/include/boost/iterator/distance.hpp
+x64-windows/include/boost/iterator/filter_iterator.hpp
+x64-windows/include/boost/iterator/function_input_iterator.hpp
+x64-windows/include/boost/iterator/function_output_iterator.hpp
+x64-windows/include/boost/iterator/indirect_iterator.hpp
+x64-windows/include/boost/iterator/interoperable.hpp
+x64-windows/include/boost/iterator/is_lvalue_iterator.hpp
+x64-windows/include/boost/iterator/is_readable_iterator.hpp
+x64-windows/include/boost/iterator/iterator_adaptor.hpp
+x64-windows/include/boost/iterator/iterator_archetypes.hpp
+x64-windows/include/boost/iterator/iterator_categories.hpp
+x64-windows/include/boost/iterator/iterator_concepts.hpp
+x64-windows/include/boost/iterator/iterator_facade.hpp
+x64-windows/include/boost/iterator/iterator_traits.hpp
+x64-windows/include/boost/iterator/minimum_category.hpp
+x64-windows/include/boost/iterator/new_iterator_tests.hpp
+x64-windows/include/boost/iterator/permutation_iterator.hpp
+x64-windows/include/boost/iterator/reverse_iterator.hpp
+x64-windows/include/boost/iterator/transform_iterator.hpp
+x64-windows/include/boost/iterator/zip_iterator.hpp
+x64-windows/include/boost/iterator_adaptors.hpp
+x64-windows/include/boost/next_prior.hpp
+x64-windows/include/boost/pending/
+x64-windows/include/boost/pending/detail/
+x64-windows/include/boost/pending/detail/int_iterator.hpp
+x64-windows/include/boost/pending/iterator_adaptors.hpp
+x64-windows/include/boost/pending/iterator_tests.hpp
+x64-windows/include/boost/pointee.hpp
+x64-windows/include/boost/shared_container_iterator.hpp
+x64-windows/share/
+x64-windows/share/boost-iterator/
+x64-windows/share/boost-iterator/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/function_output_iterator.hpp
+x64-windows-static/include/boost/generator_iterator.hpp
+x64-windows-static/include/boost/indirect_reference.hpp
+x64-windows-static/include/boost/iterator/
+x64-windows-static/include/boost/iterator/advance.hpp
+x64-windows-static/include/boost/iterator/counting_iterator.hpp
+x64-windows-static/include/boost/iterator/detail/
+x64-windows-static/include/boost/iterator/detail/any_conversion_eater.hpp
+x64-windows-static/include/boost/iterator/detail/config_def.hpp
+x64-windows-static/include/boost/iterator/detail/config_undef.hpp
+x64-windows-static/include/boost/iterator/detail/enable_if.hpp
+x64-windows-static/include/boost/iterator/detail/facade_iterator_category.hpp
+x64-windows-static/include/boost/iterator/detail/minimum_category.hpp
+x64-windows-static/include/boost/iterator/distance.hpp
+x64-windows-static/include/boost/iterator/filter_iterator.hpp
+x64-windows-static/include/boost/iterator/function_input_iterator.hpp
+x64-windows-static/include/boost/iterator/function_output_iterator.hpp
+x64-windows-static/include/boost/iterator/indirect_iterator.hpp
+x64-windows-static/include/boost/iterator/interoperable.hpp
+x64-windows-static/include/boost/iterator/is_lvalue_iterator.hpp
+x64-windows-static/include/boost/iterator/is_readable_iterator.hpp
+x64-windows-static/include/boost/iterator/iterator_adaptor.hpp
+x64-windows-static/include/boost/iterator/iterator_archetypes.hpp
+x64-windows-static/include/boost/iterator/iterator_categories.hpp
+x64-windows-static/include/boost/iterator/iterator_concepts.hpp
+x64-windows-static/include/boost/iterator/iterator_facade.hpp
+x64-windows-static/include/boost/iterator/iterator_traits.hpp
+x64-windows-static/include/boost/iterator/minimum_category.hpp
+x64-windows-static/include/boost/iterator/new_iterator_tests.hpp
+x64-windows-static/include/boost/iterator/permutation_iterator.hpp
+x64-windows-static/include/boost/iterator/reverse_iterator.hpp
+x64-windows-static/include/boost/iterator/transform_iterator.hpp
+x64-windows-static/include/boost/iterator/zip_iterator.hpp
+x64-windows-static/include/boost/iterator_adaptors.hpp
+x64-windows-static/include/boost/next_prior.hpp
+x64-windows-static/include/boost/pending/
+x64-windows-static/include/boost/pending/detail/
+x64-windows-static/include/boost/pending/detail/int_iterator.hpp
+x64-windows-static/include/boost/pending/iterator_adaptors.hpp
+x64-windows-static/include/boost/pending/iterator_tests.hpp
+x64-windows-static/include/boost/pointee.hpp
+x64-windows-static/include/boost/shared_container_iterator.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-iterator/
+x64-windows-static/share/boost-iterator/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/lambda/
+x64-windows/include/boost/lambda/algorithm.hpp
+x64-windows/include/boost/lambda/bind.hpp
+x64-windows/include/boost/lambda/casts.hpp
+x64-windows/include/boost/lambda/closures.hpp
+x64-windows/include/boost/lambda/construct.hpp
+x64-windows/include/boost/lambda/control_structures.hpp
+x64-windows/include/boost/lambda/core.hpp
+x64-windows/include/boost/lambda/detail/
+x64-windows/include/boost/lambda/detail/actions.hpp
+x64-windows/include/boost/lambda/detail/arity_code.hpp
+x64-windows/include/boost/lambda/detail/bind_functions.hpp
+x64-windows/include/boost/lambda/detail/control_constructs_common.hpp
+x64-windows/include/boost/lambda/detail/function_adaptors.hpp
+x64-windows/include/boost/lambda/detail/is_instance_of.hpp
+x64-windows/include/boost/lambda/detail/lambda_config.hpp
+x64-windows/include/boost/lambda/detail/lambda_functor_base.hpp
+x64-windows/include/boost/lambda/detail/lambda_functors.hpp
+x64-windows/include/boost/lambda/detail/lambda_fwd.hpp
+x64-windows/include/boost/lambda/detail/lambda_traits.hpp
+x64-windows/include/boost/lambda/detail/member_ptr.hpp
+x64-windows/include/boost/lambda/detail/operator_actions.hpp
+x64-windows/include/boost/lambda/detail/operator_lambda_func_base.hpp
+x64-windows/include/boost/lambda/detail/operator_return_type_traits.hpp
+x64-windows/include/boost/lambda/detail/operators.hpp
+x64-windows/include/boost/lambda/detail/ret.hpp
+x64-windows/include/boost/lambda/detail/return_type_traits.hpp
+x64-windows/include/boost/lambda/detail/select_functions.hpp
+x64-windows/include/boost/lambda/detail/suppress_unused.hpp
+x64-windows/include/boost/lambda/exceptions.hpp
+x64-windows/include/boost/lambda/if.hpp
+x64-windows/include/boost/lambda/lambda.hpp
+x64-windows/include/boost/lambda/loops.hpp
+x64-windows/include/boost/lambda/numeric.hpp
+x64-windows/include/boost/lambda/switch.hpp
+x64-windows/share/
+x64-windows/share/boost-lambda/
+x64-windows/share/boost-lambda/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/lambda/
+x64-windows-static/include/boost/lambda/algorithm.hpp
+x64-windows-static/include/boost/lambda/bind.hpp
+x64-windows-static/include/boost/lambda/casts.hpp
+x64-windows-static/include/boost/lambda/closures.hpp
+x64-windows-static/include/boost/lambda/construct.hpp
+x64-windows-static/include/boost/lambda/control_structures.hpp
+x64-windows-static/include/boost/lambda/core.hpp
+x64-windows-static/include/boost/lambda/detail/
+x64-windows-static/include/boost/lambda/detail/actions.hpp
+x64-windows-static/include/boost/lambda/detail/arity_code.hpp
+x64-windows-static/include/boost/lambda/detail/bind_functions.hpp
+x64-windows-static/include/boost/lambda/detail/control_constructs_common.hpp
+x64-windows-static/include/boost/lambda/detail/function_adaptors.hpp
+x64-windows-static/include/boost/lambda/detail/is_instance_of.hpp
+x64-windows-static/include/boost/lambda/detail/lambda_config.hpp
+x64-windows-static/include/boost/lambda/detail/lambda_functor_base.hpp
+x64-windows-static/include/boost/lambda/detail/lambda_functors.hpp
+x64-windows-static/include/boost/lambda/detail/lambda_fwd.hpp
+x64-windows-static/include/boost/lambda/detail/lambda_traits.hpp
+x64-windows-static/include/boost/lambda/detail/member_ptr.hpp
+x64-windows-static/include/boost/lambda/detail/operator_actions.hpp
+x64-windows-static/include/boost/lambda/detail/operator_lambda_func_base.hpp
+x64-windows-static/include/boost/lambda/detail/operator_return_type_traits.hpp
+x64-windows-static/include/boost/lambda/detail/operators.hpp
+x64-windows-static/include/boost/lambda/detail/ret.hpp
+x64-windows-static/include/boost/lambda/detail/return_type_traits.hpp
+x64-windows-static/include/boost/lambda/detail/select_functions.hpp
+x64-windows-static/include/boost/lambda/detail/suppress_unused.hpp
+x64-windows-static/include/boost/lambda/exceptions.hpp
+x64-windows-static/include/boost/lambda/if.hpp
+x64-windows-static/include/boost/lambda/lambda.hpp
+x64-windows-static/include/boost/lambda/loops.hpp
+x64-windows-static/include/boost/lambda/numeric.hpp
+x64-windows-static/include/boost/lambda/switch.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-lambda/
+x64-windows-static/share/boost-lambda/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/basic_pointerbuf.hpp
+x64-windows/include/boost/detail/lcast_precision.hpp
+x64-windows/include/boost/lexical_cast.hpp
+x64-windows/include/boost/lexical_cast/
+x64-windows/include/boost/lexical_cast/bad_lexical_cast.hpp
+x64-windows/include/boost/lexical_cast/detail/
+x64-windows/include/boost/lexical_cast/detail/converter_lexical.hpp
+x64-windows/include/boost/lexical_cast/detail/converter_lexical_streams.hpp
+x64-windows/include/boost/lexical_cast/detail/converter_numeric.hpp
+x64-windows/include/boost/lexical_cast/detail/inf_nan.hpp
+x64-windows/include/boost/lexical_cast/detail/is_character.hpp
+x64-windows/include/boost/lexical_cast/detail/lcast_char_constants.hpp
+x64-windows/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
+x64-windows/include/boost/lexical_cast/detail/widest_char.hpp
+x64-windows/include/boost/lexical_cast/lexical_cast_old.hpp
+x64-windows/include/boost/lexical_cast/try_lexical_convert.hpp
+x64-windows/share/
+x64-windows/share/boost-lexical-cast/
+x64-windows/share/boost-lexical-cast/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/basic_pointerbuf.hpp
+x64-windows-static/include/boost/detail/lcast_precision.hpp
+x64-windows-static/include/boost/lexical_cast.hpp
+x64-windows-static/include/boost/lexical_cast/
+x64-windows-static/include/boost/lexical_cast/bad_lexical_cast.hpp
+x64-windows-static/include/boost/lexical_cast/detail/
+x64-windows-static/include/boost/lexical_cast/detail/converter_lexical.hpp
+x64-windows-static/include/boost/lexical_cast/detail/converter_lexical_streams.hpp
+x64-windows-static/include/boost/lexical_cast/detail/converter_numeric.hpp
+x64-windows-static/include/boost/lexical_cast/detail/inf_nan.hpp
+x64-windows-static/include/boost/lexical_cast/detail/is_character.hpp
+x64-windows-static/include/boost/lexical_cast/detail/lcast_char_constants.hpp
+x64-windows-static/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
+x64-windows-static/include/boost/lexical_cast/detail/widest_char.hpp
+x64-windows-static/include/boost/lexical_cast/lexical_cast_old.hpp
+x64-windows-static/include/boost/lexical_cast/try_lexical_convert.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-lexical-cast/
+x64-windows-static/share/boost-lexical-cast/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_locale-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_locale-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_locale-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_locale-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_locale-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/locale.hpp
+x64-windows/include/boost/locale/
+x64-windows/include/boost/locale/boundary.hpp
+x64-windows/include/boost/locale/boundary/
+x64-windows/include/boost/locale/boundary/boundary_point.hpp
+x64-windows/include/boost/locale/boundary/facets.hpp
+x64-windows/include/boost/locale/boundary/index.hpp
+x64-windows/include/boost/locale/boundary/segment.hpp
+x64-windows/include/boost/locale/boundary/types.hpp
+x64-windows/include/boost/locale/collator.hpp
+x64-windows/include/boost/locale/config.hpp
+x64-windows/include/boost/locale/conversion.hpp
+x64-windows/include/boost/locale/date_time.hpp
+x64-windows/include/boost/locale/date_time_facet.hpp
+x64-windows/include/boost/locale/definitions.hpp
+x64-windows/include/boost/locale/encoding.hpp
+x64-windows/include/boost/locale/encoding_errors.hpp
+x64-windows/include/boost/locale/encoding_utf.hpp
+x64-windows/include/boost/locale/format.hpp
+x64-windows/include/boost/locale/formatting.hpp
+x64-windows/include/boost/locale/generator.hpp
+x64-windows/include/boost/locale/generic_codecvt.hpp
+x64-windows/include/boost/locale/gnu_gettext.hpp
+x64-windows/include/boost/locale/hold_ptr.hpp
+x64-windows/include/boost/locale/info.hpp
+x64-windows/include/boost/locale/localization_backend.hpp
+x64-windows/include/boost/locale/message.hpp
+x64-windows/include/boost/locale/time_zone.hpp
+x64-windows/include/boost/locale/utf.hpp
+x64-windows/include/boost/locale/utf8_codecvt.hpp
+x64-windows/include/boost/locale/util.hpp
+x64-windows/lib/
+x64-windows/lib/boost_locale-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-locale/
+x64-windows/share/boost-locale/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-locale_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_locale-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/locale.hpp
+x64-windows-static/include/boost/locale/
+x64-windows-static/include/boost/locale/boundary.hpp
+x64-windows-static/include/boost/locale/boundary/
+x64-windows-static/include/boost/locale/boundary/boundary_point.hpp
+x64-windows-static/include/boost/locale/boundary/facets.hpp
+x64-windows-static/include/boost/locale/boundary/index.hpp
+x64-windows-static/include/boost/locale/boundary/segment.hpp
+x64-windows-static/include/boost/locale/boundary/types.hpp
+x64-windows-static/include/boost/locale/collator.hpp
+x64-windows-static/include/boost/locale/config.hpp
+x64-windows-static/include/boost/locale/conversion.hpp
+x64-windows-static/include/boost/locale/date_time.hpp
+x64-windows-static/include/boost/locale/date_time_facet.hpp
+x64-windows-static/include/boost/locale/definitions.hpp
+x64-windows-static/include/boost/locale/encoding.hpp
+x64-windows-static/include/boost/locale/encoding_errors.hpp
+x64-windows-static/include/boost/locale/encoding_utf.hpp
+x64-windows-static/include/boost/locale/format.hpp
+x64-windows-static/include/boost/locale/formatting.hpp
+x64-windows-static/include/boost/locale/generator.hpp
+x64-windows-static/include/boost/locale/generic_codecvt.hpp
+x64-windows-static/include/boost/locale/gnu_gettext.hpp
+x64-windows-static/include/boost/locale/hold_ptr.hpp
+x64-windows-static/include/boost/locale/info.hpp
+x64-windows-static/include/boost/locale/localization_backend.hpp
+x64-windows-static/include/boost/locale/message.hpp
+x64-windows-static/include/boost/locale/time_zone.hpp
+x64-windows-static/include/boost/locale/utf.hpp
+x64-windows-static/include/boost/locale/utf8_codecvt.hpp
+x64-windows-static/include/boost/locale/util.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_locale-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-locale/
+x64-windows-static/share/boost-locale/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,398 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_math_c99-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_c99-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_c99f-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_c99f-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_c99l-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_c99l-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_tr1-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_tr1-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_tr1f-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_tr1f-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_tr1l-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_tr1l-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_math_c99-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_c99-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_c99f-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_c99f-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_c99l-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_c99l-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_tr1-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_tr1-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_tr1f-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_tr1f-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_tr1l-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_tr1l-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_math_c99-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_c99f-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_c99l-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_tr1-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_tr1f-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_tr1l-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/cstdfloat.hpp
+x64-windows/include/boost/math/
+x64-windows/include/boost/math/bindings/
+x64-windows/include/boost/math/bindings/detail/
+x64-windows/include/boost/math/bindings/detail/big_digamma.hpp
+x64-windows/include/boost/math/bindings/detail/big_lanczos.hpp
+x64-windows/include/boost/math/bindings/e_float.hpp
+x64-windows/include/boost/math/bindings/mpfr.hpp
+x64-windows/include/boost/math/bindings/mpreal.hpp
+x64-windows/include/boost/math/bindings/rr.hpp
+x64-windows/include/boost/math/common_factor.hpp
+x64-windows/include/boost/math/common_factor_ct.hpp
+x64-windows/include/boost/math/common_factor_rt.hpp
+x64-windows/include/boost/math/complex.hpp
+x64-windows/include/boost/math/complex/
+x64-windows/include/boost/math/complex/acos.hpp
+x64-windows/include/boost/math/complex/acosh.hpp
+x64-windows/include/boost/math/complex/asin.hpp
+x64-windows/include/boost/math/complex/asinh.hpp
+x64-windows/include/boost/math/complex/atan.hpp
+x64-windows/include/boost/math/complex/atanh.hpp
+x64-windows/include/boost/math/complex/details.hpp
+x64-windows/include/boost/math/complex/fabs.hpp
+x64-windows/include/boost/math/concepts/
+x64-windows/include/boost/math/concepts/distributions.hpp
+x64-windows/include/boost/math/concepts/real_concept.hpp
+x64-windows/include/boost/math/concepts/real_type_concept.hpp
+x64-windows/include/boost/math/concepts/std_real_concept.hpp
+x64-windows/include/boost/math/constants/
+x64-windows/include/boost/math/constants/calculate_constants.hpp
+x64-windows/include/boost/math/constants/constants.hpp
+x64-windows/include/boost/math/constants/info.hpp
+x64-windows/include/boost/math/cstdfloat/
+x64-windows/include/boost/math/cstdfloat/cstdfloat_cmath.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_complex.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_complex_std.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_iostream.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_limits.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_types.hpp
+x64-windows/include/boost/math/distributions.hpp
+x64-windows/include/boost/math/distributions/
+x64-windows/include/boost/math/distributions/arcsine.hpp
+x64-windows/include/boost/math/distributions/bernoulli.hpp
+x64-windows/include/boost/math/distributions/beta.hpp
+x64-windows/include/boost/math/distributions/binomial.hpp
+x64-windows/include/boost/math/distributions/cauchy.hpp
+x64-windows/include/boost/math/distributions/chi_squared.hpp
+x64-windows/include/boost/math/distributions/complement.hpp
+x64-windows/include/boost/math/distributions/detail/
+x64-windows/include/boost/math/distributions/detail/common_error_handling.hpp
+x64-windows/include/boost/math/distributions/detail/derived_accessors.hpp
+x64-windows/include/boost/math/distributions/detail/generic_mode.hpp
+x64-windows/include/boost/math/distributions/detail/generic_quantile.hpp
+x64-windows/include/boost/math/distributions/detail/hypergeometric_cdf.hpp
+x64-windows/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
+x64-windows/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
+x64-windows/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
+x64-windows/include/boost/math/distributions/exponential.hpp
+x64-windows/include/boost/math/distributions/extreme_value.hpp
+x64-windows/include/boost/math/distributions/find_location.hpp
+x64-windows/include/boost/math/distributions/find_scale.hpp
+x64-windows/include/boost/math/distributions/fisher_f.hpp
+x64-windows/include/boost/math/distributions/fwd.hpp
+x64-windows/include/boost/math/distributions/gamma.hpp
+x64-windows/include/boost/math/distributions/geometric.hpp
+x64-windows/include/boost/math/distributions/hyperexponential.hpp
+x64-windows/include/boost/math/distributions/hypergeometric.hpp
+x64-windows/include/boost/math/distributions/inverse_chi_squared.hpp
+x64-windows/include/boost/math/distributions/inverse_gamma.hpp
+x64-windows/include/boost/math/distributions/inverse_gaussian.hpp
+x64-windows/include/boost/math/distributions/laplace.hpp
+x64-windows/include/boost/math/distributions/logistic.hpp
+x64-windows/include/boost/math/distributions/lognormal.hpp
+x64-windows/include/boost/math/distributions/negative_binomial.hpp
+x64-windows/include/boost/math/distributions/non_central_beta.hpp
+x64-windows/include/boost/math/distributions/non_central_chi_squared.hpp
+x64-windows/include/boost/math/distributions/non_central_f.hpp
+x64-windows/include/boost/math/distributions/non_central_t.hpp
+x64-windows/include/boost/math/distributions/normal.hpp
+x64-windows/include/boost/math/distributions/pareto.hpp
+x64-windows/include/boost/math/distributions/poisson.hpp
+x64-windows/include/boost/math/distributions/rayleigh.hpp
+x64-windows/include/boost/math/distributions/skew_normal.hpp
+x64-windows/include/boost/math/distributions/students_t.hpp
+x64-windows/include/boost/math/distributions/triangular.hpp
+x64-windows/include/boost/math/distributions/uniform.hpp
+x64-windows/include/boost/math/distributions/weibull.hpp
+x64-windows/include/boost/math/interpolators/
+x64-windows/include/boost/math/interpolators/barycentric_rational.hpp
+x64-windows/include/boost/math/interpolators/cubic_b_spline.hpp
+x64-windows/include/boost/math/interpolators/detail/
+x64-windows/include/boost/math/interpolators/detail/barycentric_rational_detail.hpp
+x64-windows/include/boost/math/interpolators/detail/cubic_b_spline_detail.hpp
+x64-windows/include/boost/math/octonion.hpp
+x64-windows/include/boost/math/policies/
+x64-windows/include/boost/math/policies/error_handling.hpp
+x64-windows/include/boost/math/policies/policy.hpp
+x64-windows/include/boost/math/quadrature/
+x64-windows/include/boost/math/quadrature/detail/
+x64-windows/include/boost/math/quadrature/detail/exp_sinh_detail.hpp
+x64-windows/include/boost/math/quadrature/detail/sinh_sinh_detail.hpp
+x64-windows/include/boost/math/quadrature/detail/tanh_sinh_constants.hpp
+x64-windows/include/boost/math/quadrature/detail/tanh_sinh_detail.hpp
+x64-windows/include/boost/math/quadrature/exp_sinh.hpp
+x64-windows/include/boost/math/quadrature/gauss.hpp
+x64-windows/include/boost/math/quadrature/gauss_kronrod.hpp
+x64-windows/include/boost/math/quadrature/naive_monte_carlo.hpp
+x64-windows/include/boost/math/quadrature/sinh_sinh.hpp
+x64-windows/include/boost/math/quadrature/tanh_sinh.hpp
+x64-windows/include/boost/math/quadrature/trapezoidal.hpp
+x64-windows/include/boost/math/quaternion.hpp
+x64-windows/include/boost/math/special_functions.hpp
+x64-windows/include/boost/math/special_functions/
+x64-windows/include/boost/math/special_functions/acosh.hpp
+x64-windows/include/boost/math/special_functions/airy.hpp
+x64-windows/include/boost/math/special_functions/asinh.hpp
+x64-windows/include/boost/math/special_functions/atanh.hpp
+x64-windows/include/boost/math/special_functions/bernoulli.hpp
+x64-windows/include/boost/math/special_functions/bessel.hpp
+x64-windows/include/boost/math/special_functions/bessel_prime.hpp
+x64-windows/include/boost/math/special_functions/beta.hpp
+x64-windows/include/boost/math/special_functions/binomial.hpp
+x64-windows/include/boost/math/special_functions/cbrt.hpp
+x64-windows/include/boost/math/special_functions/chebyshev.hpp
+x64-windows/include/boost/math/special_functions/chebyshev_transform.hpp
+x64-windows/include/boost/math/special_functions/cos_pi.hpp
+x64-windows/include/boost/math/special_functions/detail/
+x64-windows/include/boost/math/special_functions/detail/airy_ai_bi_zero.hpp
+x64-windows/include/boost/math/special_functions/detail/bernoulli_details.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_derivatives_linear.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_i0.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_i1.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_ik.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_j0.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_j1.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jn.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_asym.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_derivatives_asym.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_derivatives_series.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_series.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_zero.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_k0.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_k1.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_kn.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_y0.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_y1.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_yn.hpp
+x64-windows/include/boost/math/special_functions/detail/erf_inv.hpp
+x64-windows/include/boost/math/special_functions/detail/fp_traits.hpp
+x64-windows/include/boost/math/special_functions/detail/gamma_inva.hpp
+x64-windows/include/boost/math/special_functions/detail/ibeta_inv_ab.hpp
+x64-windows/include/boost/math/special_functions/detail/ibeta_inverse.hpp
+x64-windows/include/boost/math/special_functions/detail/iconv.hpp
+x64-windows/include/boost/math/special_functions/detail/igamma_inverse.hpp
+x64-windows/include/boost/math/special_functions/detail/igamma_large.hpp
+x64-windows/include/boost/math/special_functions/detail/lanczos_sse2.hpp
+x64-windows/include/boost/math/special_functions/detail/lgamma_small.hpp
+x64-windows/include/boost/math/special_functions/detail/polygamma.hpp
+x64-windows/include/boost/math/special_functions/detail/round_fwd.hpp
+x64-windows/include/boost/math/special_functions/detail/t_distribution_inv.hpp
+x64-windows/include/boost/math/special_functions/detail/unchecked_bernoulli.hpp
+x64-windows/include/boost/math/special_functions/detail/unchecked_factorial.hpp
+x64-windows/include/boost/math/special_functions/digamma.hpp
+x64-windows/include/boost/math/special_functions/ellint_1.hpp
+x64-windows/include/boost/math/special_functions/ellint_2.hpp
+x64-windows/include/boost/math/special_functions/ellint_3.hpp
+x64-windows/include/boost/math/special_functions/ellint_d.hpp
+x64-windows/include/boost/math/special_functions/ellint_rc.hpp
+x64-windows/include/boost/math/special_functions/ellint_rd.hpp
+x64-windows/include/boost/math/special_functions/ellint_rf.hpp
+x64-windows/include/boost/math/special_functions/ellint_rg.hpp
+x64-windows/include/boost/math/special_functions/ellint_rj.hpp
+x64-windows/include/boost/math/special_functions/erf.hpp
+x64-windows/include/boost/math/special_functions/expint.hpp
+x64-windows/include/boost/math/special_functions/expm1.hpp
+x64-windows/include/boost/math/special_functions/factorials.hpp
+x64-windows/include/boost/math/special_functions/fpclassify.hpp
+x64-windows/include/boost/math/special_functions/gamma.hpp
+x64-windows/include/boost/math/special_functions/hankel.hpp
+x64-windows/include/boost/math/special_functions/hermite.hpp
+x64-windows/include/boost/math/special_functions/heuman_lambda.hpp
+x64-windows/include/boost/math/special_functions/hypot.hpp
+x64-windows/include/boost/math/special_functions/jacobi_elliptic.hpp
+x64-windows/include/boost/math/special_functions/jacobi_zeta.hpp
+x64-windows/include/boost/math/special_functions/laguerre.hpp
+x64-windows/include/boost/math/special_functions/lanczos.hpp
+x64-windows/include/boost/math/special_functions/legendre.hpp
+x64-windows/include/boost/math/special_functions/legendre_stieltjes.hpp
+x64-windows/include/boost/math/special_functions/log1p.hpp
+x64-windows/include/boost/math/special_functions/math_fwd.hpp
+x64-windows/include/boost/math/special_functions/modf.hpp
+x64-windows/include/boost/math/special_functions/next.hpp
+x64-windows/include/boost/math/special_functions/nonfinite_num_facets.hpp
+x64-windows/include/boost/math/special_functions/owens_t.hpp
+x64-windows/include/boost/math/special_functions/polygamma.hpp
+x64-windows/include/boost/math/special_functions/pow.hpp
+x64-windows/include/boost/math/special_functions/powm1.hpp
+x64-windows/include/boost/math/special_functions/prime.hpp
+x64-windows/include/boost/math/special_functions/relative_difference.hpp
+x64-windows/include/boost/math/special_functions/round.hpp
+x64-windows/include/boost/math/special_functions/sign.hpp
+x64-windows/include/boost/math/special_functions/sin_pi.hpp
+x64-windows/include/boost/math/special_functions/sinc.hpp
+x64-windows/include/boost/math/special_functions/sinhc.hpp
+x64-windows/include/boost/math/special_functions/spherical_harmonic.hpp
+x64-windows/include/boost/math/special_functions/sqrt1pm1.hpp
+x64-windows/include/boost/math/special_functions/trigamma.hpp
+x64-windows/include/boost/math/special_functions/trunc.hpp
+x64-windows/include/boost/math/special_functions/ulp.hpp
+x64-windows/include/boost/math/special_functions/zeta.hpp
+x64-windows/include/boost/math/tools/
+x64-windows/include/boost/math/tools/atomic.hpp
+x64-windows/include/boost/math/tools/big_constant.hpp
+x64-windows/include/boost/math/tools/config.hpp
+x64-windows/include/boost/math/tools/convert_from_string.hpp
+x64-windows/include/boost/math/tools/detail/
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_10.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_11.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_12.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_13.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_14.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_15.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_16.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_17.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_18.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_19.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_2.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_20.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_3.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_4.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_5.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_6.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_7.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_8.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_9.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_10.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_11.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_12.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_13.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_14.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_15.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_16.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_17.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_18.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_19.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_2.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_20.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_3.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_4.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_5.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_6.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_7.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_8.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_9.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_10.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_11.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_12.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_13.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_14.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_15.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_16.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_17.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_18.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_19.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_2.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_20.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_3.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_4.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_5.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_6.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_7.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_8.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_9.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_10.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_11.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_12.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_13.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_14.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_15.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_16.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_17.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_18.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_19.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_2.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_20.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_3.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_4.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_5.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_6.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_7.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_8.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_9.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_10.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_11.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_12.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_13.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_14.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_15.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_16.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_17.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_18.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_19.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_2.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_20.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_3.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_4.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_5.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_6.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_7.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_8.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_9.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_10.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_11.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_12.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_13.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_14.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_15.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_16.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_17.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_18.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_19.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_2.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_20.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_3.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_4.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_5.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_6.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_7.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_8.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_9.hpp
+x64-windows/include/boost/math/tools/fraction.hpp
+x64-windows/include/boost/math/tools/minima.hpp
+x64-windows/include/boost/math/tools/numerical_differentiation.hpp
+x64-windows/include/boost/math/tools/polynomial.hpp
+x64-windows/include/boost/math/tools/polynomial_gcd.hpp
+x64-windows/include/boost/math/tools/precision.hpp
+x64-windows/include/boost/math/tools/promotion.hpp
+x64-windows/include/boost/math/tools/rational.hpp
+x64-windows/include/boost/math/tools/real_cast.hpp
+x64-windows/include/boost/math/tools/roots.hpp
+x64-windows/include/boost/math/tools/series.hpp
+x64-windows/include/boost/math/tools/stats.hpp
+x64-windows/include/boost/math/tools/toms748_solve.hpp
+x64-windows/include/boost/math/tools/traits.hpp
+x64-windows/include/boost/math/tools/tuple.hpp
+x64-windows/include/boost/math/tools/user.hpp
+x64-windows/include/boost/math/tools/workaround.hpp
+x64-windows/include/boost/math/tr1.hpp
+x64-windows/include/boost/math/tr1_c_macros.ipp
+x64-windows/include/boost/math_fwd.hpp
+x64-windows/lib/
+x64-windows/lib/boost_math_c99-vc140-mt.lib
+x64-windows/lib/boost_math_c99f-vc140-mt.lib
+x64-windows/lib/boost_math_c99l-vc140-mt.lib
+x64-windows/lib/boost_math_tr1-vc140-mt.lib
+x64-windows/lib/boost_math_tr1f-vc140-mt.lib
+x64-windows/lib/boost_math_tr1l-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-math/
+x64-windows/share/boost-math/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-math_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,372 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_math_c99-vc140-mt-gd.lib
+x64-windows-static/debug/lib/boost_math_c99f-vc140-mt-gd.lib
+x64-windows-static/debug/lib/boost_math_c99l-vc140-mt-gd.lib
+x64-windows-static/debug/lib/boost_math_tr1-vc140-mt-gd.lib
+x64-windows-static/debug/lib/boost_math_tr1f-vc140-mt-gd.lib
+x64-windows-static/debug/lib/boost_math_tr1l-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/cstdfloat.hpp
+x64-windows-static/include/boost/math/
+x64-windows-static/include/boost/math/bindings/
+x64-windows-static/include/boost/math/bindings/detail/
+x64-windows-static/include/boost/math/bindings/detail/big_digamma.hpp
+x64-windows-static/include/boost/math/bindings/detail/big_lanczos.hpp
+x64-windows-static/include/boost/math/bindings/e_float.hpp
+x64-windows-static/include/boost/math/bindings/mpfr.hpp
+x64-windows-static/include/boost/math/bindings/mpreal.hpp
+x64-windows-static/include/boost/math/bindings/rr.hpp
+x64-windows-static/include/boost/math/common_factor.hpp
+x64-windows-static/include/boost/math/common_factor_ct.hpp
+x64-windows-static/include/boost/math/common_factor_rt.hpp
+x64-windows-static/include/boost/math/complex.hpp
+x64-windows-static/include/boost/math/complex/
+x64-windows-static/include/boost/math/complex/acos.hpp
+x64-windows-static/include/boost/math/complex/acosh.hpp
+x64-windows-static/include/boost/math/complex/asin.hpp
+x64-windows-static/include/boost/math/complex/asinh.hpp
+x64-windows-static/include/boost/math/complex/atan.hpp
+x64-windows-static/include/boost/math/complex/atanh.hpp
+x64-windows-static/include/boost/math/complex/details.hpp
+x64-windows-static/include/boost/math/complex/fabs.hpp
+x64-windows-static/include/boost/math/concepts/
+x64-windows-static/include/boost/math/concepts/distributions.hpp
+x64-windows-static/include/boost/math/concepts/real_concept.hpp
+x64-windows-static/include/boost/math/concepts/real_type_concept.hpp
+x64-windows-static/include/boost/math/concepts/std_real_concept.hpp
+x64-windows-static/include/boost/math/constants/
+x64-windows-static/include/boost/math/constants/calculate_constants.hpp
+x64-windows-static/include/boost/math/constants/constants.hpp
+x64-windows-static/include/boost/math/constants/info.hpp
+x64-windows-static/include/boost/math/cstdfloat/
+x64-windows-static/include/boost/math/cstdfloat/cstdfloat_cmath.hpp
+x64-windows-static/include/boost/math/cstdfloat/cstdfloat_complex.hpp
+x64-windows-static/include/boost/math/cstdfloat/cstdfloat_complex_std.hpp
+x64-windows-static/include/boost/math/cstdfloat/cstdfloat_iostream.hpp
+x64-windows-static/include/boost/math/cstdfloat/cstdfloat_limits.hpp
+x64-windows-static/include/boost/math/cstdfloat/cstdfloat_types.hpp
+x64-windows-static/include/boost/math/distributions.hpp
+x64-windows-static/include/boost/math/distributions/
+x64-windows-static/include/boost/math/distributions/arcsine.hpp
+x64-windows-static/include/boost/math/distributions/bernoulli.hpp
+x64-windows-static/include/boost/math/distributions/beta.hpp
+x64-windows-static/include/boost/math/distributions/binomial.hpp
+x64-windows-static/include/boost/math/distributions/cauchy.hpp
+x64-windows-static/include/boost/math/distributions/chi_squared.hpp
+x64-windows-static/include/boost/math/distributions/complement.hpp
+x64-windows-static/include/boost/math/distributions/detail/
+x64-windows-static/include/boost/math/distributions/detail/common_error_handling.hpp
+x64-windows-static/include/boost/math/distributions/detail/derived_accessors.hpp
+x64-windows-static/include/boost/math/distributions/detail/generic_mode.hpp
+x64-windows-static/include/boost/math/distributions/detail/generic_quantile.hpp
+x64-windows-static/include/boost/math/distributions/detail/hypergeometric_cdf.hpp
+x64-windows-static/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
+x64-windows-static/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
+x64-windows-static/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
+x64-windows-static/include/boost/math/distributions/exponential.hpp
+x64-windows-static/include/boost/math/distributions/extreme_value.hpp
+x64-windows-static/include/boost/math/distributions/find_location.hpp
+x64-windows-static/include/boost/math/distributions/find_scale.hpp
+x64-windows-static/include/boost/math/distributions/fisher_f.hpp
+x64-windows-static/include/boost/math/distributions/fwd.hpp
+x64-windows-static/include/boost/math/distributions/gamma.hpp
+x64-windows-static/include/boost/math/distributions/geometric.hpp
+x64-windows-static/include/boost/math/distributions/hyperexponential.hpp
+x64-windows-static/include/boost/math/distributions/hypergeometric.hpp
+x64-windows-static/include/boost/math/distributions/inverse_chi_squared.hpp
+x64-windows-static/include/boost/math/distributions/inverse_gamma.hpp
+x64-windows-static/include/boost/math/distributions/inverse_gaussian.hpp
+x64-windows-static/include/boost/math/distributions/laplace.hpp
+x64-windows-static/include/boost/math/distributions/logistic.hpp
+x64-windows-static/include/boost/math/distributions/lognormal.hpp
+x64-windows-static/include/boost/math/distributions/negative_binomial.hpp
+x64-windows-static/include/boost/math/distributions/non_central_beta.hpp
+x64-windows-static/include/boost/math/distributions/non_central_chi_squared.hpp
+x64-windows-static/include/boost/math/distributions/non_central_f.hpp
+x64-windows-static/include/boost/math/distributions/non_central_t.hpp
+x64-windows-static/include/boost/math/distributions/normal.hpp
+x64-windows-static/include/boost/math/distributions/pareto.hpp
+x64-windows-static/include/boost/math/distributions/poisson.hpp
+x64-windows-static/include/boost/math/distributions/rayleigh.hpp
+x64-windows-static/include/boost/math/distributions/skew_normal.hpp
+x64-windows-static/include/boost/math/distributions/students_t.hpp
+x64-windows-static/include/boost/math/distributions/triangular.hpp
+x64-windows-static/include/boost/math/distributions/uniform.hpp
+x64-windows-static/include/boost/math/distributions/weibull.hpp
+x64-windows-static/include/boost/math/interpolators/
+x64-windows-static/include/boost/math/interpolators/barycentric_rational.hpp
+x64-windows-static/include/boost/math/interpolators/cubic_b_spline.hpp
+x64-windows-static/include/boost/math/interpolators/detail/
+x64-windows-static/include/boost/math/interpolators/detail/barycentric_rational_detail.hpp
+x64-windows-static/include/boost/math/interpolators/detail/cubic_b_spline_detail.hpp
+x64-windows-static/include/boost/math/octonion.hpp
+x64-windows-static/include/boost/math/policies/
+x64-windows-static/include/boost/math/policies/error_handling.hpp
+x64-windows-static/include/boost/math/policies/policy.hpp
+x64-windows-static/include/boost/math/quadrature/
+x64-windows-static/include/boost/math/quadrature/detail/
+x64-windows-static/include/boost/math/quadrature/detail/exp_sinh_detail.hpp
+x64-windows-static/include/boost/math/quadrature/detail/sinh_sinh_detail.hpp
+x64-windows-static/include/boost/math/quadrature/detail/tanh_sinh_constants.hpp
+x64-windows-static/include/boost/math/quadrature/detail/tanh_sinh_detail.hpp
+x64-windows-static/include/boost/math/quadrature/exp_sinh.hpp
+x64-windows-static/include/boost/math/quadrature/gauss.hpp
+x64-windows-static/include/boost/math/quadrature/gauss_kronrod.hpp
+x64-windows-static/include/boost/math/quadrature/naive_monte_carlo.hpp
+x64-windows-static/include/boost/math/quadrature/sinh_sinh.hpp
+x64-windows-static/include/boost/math/quadrature/tanh_sinh.hpp
+x64-windows-static/include/boost/math/quadrature/trapezoidal.hpp
+x64-windows-static/include/boost/math/quaternion.hpp
+x64-windows-static/include/boost/math/special_functions.hpp
+x64-windows-static/include/boost/math/special_functions/
+x64-windows-static/include/boost/math/special_functions/acosh.hpp
+x64-windows-static/include/boost/math/special_functions/airy.hpp
+x64-windows-static/include/boost/math/special_functions/asinh.hpp
+x64-windows-static/include/boost/math/special_functions/atanh.hpp
+x64-windows-static/include/boost/math/special_functions/bernoulli.hpp
+x64-windows-static/include/boost/math/special_functions/bessel.hpp
+x64-windows-static/include/boost/math/special_functions/bessel_prime.hpp
+x64-windows-static/include/boost/math/special_functions/beta.hpp
+x64-windows-static/include/boost/math/special_functions/binomial.hpp
+x64-windows-static/include/boost/math/special_functions/cbrt.hpp
+x64-windows-static/include/boost/math/special_functions/chebyshev.hpp
+x64-windows-static/include/boost/math/special_functions/chebyshev_transform.hpp
+x64-windows-static/include/boost/math/special_functions/cos_pi.hpp
+x64-windows-static/include/boost/math/special_functions/detail/
+x64-windows-static/include/boost/math/special_functions/detail/airy_ai_bi_zero.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bernoulli_details.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_derivatives_linear.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_i0.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_i1.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_ik.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_j0.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_j1.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_jn.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_jy.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_jy_asym.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_jy_derivatives_asym.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_jy_derivatives_series.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_jy_series.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_jy_zero.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_k0.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_k1.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_kn.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_y0.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_y1.hpp
+x64-windows-static/include/boost/math/special_functions/detail/bessel_yn.hpp
+x64-windows-static/include/boost/math/special_functions/detail/erf_inv.hpp
+x64-windows-static/include/boost/math/special_functions/detail/fp_traits.hpp
+x64-windows-static/include/boost/math/special_functions/detail/gamma_inva.hpp
+x64-windows-static/include/boost/math/special_functions/detail/ibeta_inv_ab.hpp
+x64-windows-static/include/boost/math/special_functions/detail/ibeta_inverse.hpp
+x64-windows-static/include/boost/math/special_functions/detail/iconv.hpp
+x64-windows-static/include/boost/math/special_functions/detail/igamma_inverse.hpp
+x64-windows-static/include/boost/math/special_functions/detail/igamma_large.hpp
+x64-windows-static/include/boost/math/special_functions/detail/lanczos_sse2.hpp
+x64-windows-static/include/boost/math/special_functions/detail/lgamma_small.hpp
+x64-windows-static/include/boost/math/special_functions/detail/polygamma.hpp
+x64-windows-static/include/boost/math/special_functions/detail/round_fwd.hpp
+x64-windows-static/include/boost/math/special_functions/detail/t_distribution_inv.hpp
+x64-windows-static/include/boost/math/special_functions/detail/unchecked_bernoulli.hpp
+x64-windows-static/include/boost/math/special_functions/detail/unchecked_factorial.hpp
+x64-windows-static/include/boost/math/special_functions/digamma.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_1.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_2.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_3.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_d.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_rc.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_rd.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_rf.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_rg.hpp
+x64-windows-static/include/boost/math/special_functions/ellint_rj.hpp
+x64-windows-static/include/boost/math/special_functions/erf.hpp
+x64-windows-static/include/boost/math/special_functions/expint.hpp
+x64-windows-static/include/boost/math/special_functions/expm1.hpp
+x64-windows-static/include/boost/math/special_functions/factorials.hpp
+x64-windows-static/include/boost/math/special_functions/fpclassify.hpp
+x64-windows-static/include/boost/math/special_functions/gamma.hpp
+x64-windows-static/include/boost/math/special_functions/hankel.hpp
+x64-windows-static/include/boost/math/special_functions/hermite.hpp
+x64-windows-static/include/boost/math/special_functions/heuman_lambda.hpp
+x64-windows-static/include/boost/math/special_functions/hypot.hpp
+x64-windows-static/include/boost/math/special_functions/jacobi_elliptic.hpp
+x64-windows-static/include/boost/math/special_functions/jacobi_zeta.hpp
+x64-windows-static/include/boost/math/special_functions/laguerre.hpp
+x64-windows-static/include/boost/math/special_functions/lanczos.hpp
+x64-windows-static/include/boost/math/special_functions/legendre.hpp
+x64-windows-static/include/boost/math/special_functions/legendre_stieltjes.hpp
+x64-windows-static/include/boost/math/special_functions/log1p.hpp
+x64-windows-static/include/boost/math/special_functions/math_fwd.hpp
+x64-windows-static/include/boost/math/special_functions/modf.hpp
+x64-windows-static/include/boost/math/special_functions/next.hpp
+x64-windows-static/include/boost/math/special_functions/nonfinite_num_facets.hpp
+x64-windows-static/include/boost/math/special_functions/owens_t.hpp
+x64-windows-static/include/boost/math/special_functions/polygamma.hpp
+x64-windows-static/include/boost/math/special_functions/pow.hpp
+x64-windows-static/include/boost/math/special_functions/powm1.hpp
+x64-windows-static/include/boost/math/special_functions/prime.hpp
+x64-windows-static/include/boost/math/special_functions/relative_difference.hpp
+x64-windows-static/include/boost/math/special_functions/round.hpp
+x64-windows-static/include/boost/math/special_functions/sign.hpp
+x64-windows-static/include/boost/math/special_functions/sin_pi.hpp
+x64-windows-static/include/boost/math/special_functions/sinc.hpp
+x64-windows-static/include/boost/math/special_functions/sinhc.hpp
+x64-windows-static/include/boost/math/special_functions/spherical_harmonic.hpp
+x64-windows-static/include/boost/math/special_functions/sqrt1pm1.hpp
+x64-windows-static/include/boost/math/special_functions/trigamma.hpp
+x64-windows-static/include/boost/math/special_functions/trunc.hpp
+x64-windows-static/include/boost/math/special_functions/ulp.hpp
+x64-windows-static/include/boost/math/special_functions/zeta.hpp
+x64-windows-static/include/boost/math/tools/
+x64-windows-static/include/boost/math/tools/atomic.hpp
+x64-windows-static/include/boost/math/tools/big_constant.hpp
+x64-windows-static/include/boost/math/tools/config.hpp
+x64-windows-static/include/boost/math/tools/convert_from_string.hpp
+x64-windows-static/include/boost/math/tools/detail/
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_10.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_11.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_12.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_13.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_14.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_15.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_16.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_17.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_18.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_19.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_2.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_20.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_3.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_4.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_5.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_6.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_7.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_8.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner1_9.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_10.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_11.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_12.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_13.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_14.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_15.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_16.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_17.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_18.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_19.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_2.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_20.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_3.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_4.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_5.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_6.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_7.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_8.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner2_9.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_10.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_11.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_12.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_13.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_14.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_15.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_16.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_17.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_18.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_19.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_2.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_20.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_3.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_4.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_5.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_6.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_7.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_8.hpp
+x64-windows-static/include/boost/math/tools/detail/polynomial_horner3_9.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_10.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_11.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_12.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_13.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_14.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_15.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_16.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_17.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_18.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_19.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_2.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_20.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_3.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_4.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_5.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_6.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_7.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_8.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner1_9.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_10.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_11.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_12.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_13.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_14.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_15.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_16.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_17.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_18.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_19.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_2.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_20.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_3.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_4.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_5.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_6.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_7.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_8.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner2_9.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_10.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_11.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_12.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_13.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_14.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_15.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_16.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_17.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_18.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_19.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_2.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_20.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_3.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_4.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_5.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_6.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_7.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_8.hpp
+x64-windows-static/include/boost/math/tools/detail/rational_horner3_9.hpp
+x64-windows-static/include/boost/math/tools/fraction.hpp
+x64-windows-static/include/boost/math/tools/minima.hpp
+x64-windows-static/include/boost/math/tools/numerical_differentiation.hpp
+x64-windows-static/include/boost/math/tools/polynomial.hpp
+x64-windows-static/include/boost/math/tools/polynomial_gcd.hpp
+x64-windows-static/include/boost/math/tools/precision.hpp
+x64-windows-static/include/boost/math/tools/promotion.hpp
+x64-windows-static/include/boost/math/tools/rational.hpp
+x64-windows-static/include/boost/math/tools/real_cast.hpp
+x64-windows-static/include/boost/math/tools/roots.hpp
+x64-windows-static/include/boost/math/tools/series.hpp
+x64-windows-static/include/boost/math/tools/stats.hpp
+x64-windows-static/include/boost/math/tools/toms748_solve.hpp
+x64-windows-static/include/boost/math/tools/traits.hpp
+x64-windows-static/include/boost/math/tools/tuple.hpp
+x64-windows-static/include/boost/math/tools/user.hpp
+x64-windows-static/include/boost/math/tools/workaround.hpp
+x64-windows-static/include/boost/math/tr1.hpp
+x64-windows-static/include/boost/math/tr1_c_macros.ipp
+x64-windows-static/include/boost/math_fwd.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_math_c99-vc140-mt.lib
+x64-windows-static/lib/boost_math_c99f-vc140-mt.lib
+x64-windows-static/lib/boost_math_c99l-vc140-mt.lib
+x64-windows-static/lib/boost_math_tr1-vc140-mt.lib
+x64-windows-static/lib/boost_math_tr1f-vc140-mt.lib
+x64-windows-static/lib/boost_math_tr1l-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-math/
+x64-windows-static/share/boost-math/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows/
+x64-windows/share/
+x64-windows/share/boost-build/
+x64-windows/share/boost-build/CMakeLists.txt
+x64-windows/share/boost-build/Jamroot.jam
+x64-windows/share/boost-build/boost-modular-build.cmake
+x64-windows/share/boost-build/nothing.bat
+x64-windows/share/boost-build/user-config.jam
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows-static/
+x64-windows-static/share/
+x64-windows-static/share/boost-build/
+x64-windows-static/share/boost-build/CMakeLists.txt
+x64-windows-static/share/boost-build/Jamroot.jam
+x64-windows-static/share/boost-build/boost-modular-build.cmake
+x64-windows-static/share/boost-build/nothing.bat
+x64-windows-static/share/boost-build/user-config.jam
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/move/
+x64-windows/include/boost/move/adl_move_swap.hpp
+x64-windows/include/boost/move/algo/
+x64-windows/include/boost/move/algo/adaptive_merge.hpp
+x64-windows/include/boost/move/algo/adaptive_sort.hpp
+x64-windows/include/boost/move/algo/detail/
+x64-windows/include/boost/move/algo/detail/adaptive_sort_merge.hpp
+x64-windows/include/boost/move/algo/detail/basic_op.hpp
+x64-windows/include/boost/move/algo/detail/heap_sort.hpp
+x64-windows/include/boost/move/algo/detail/insertion_sort.hpp
+x64-windows/include/boost/move/algo/detail/is_sorted.hpp
+x64-windows/include/boost/move/algo/detail/merge.hpp
+x64-windows/include/boost/move/algo/detail/merge_sort.hpp
+x64-windows/include/boost/move/algo/detail/pdqsort.hpp
+x64-windows/include/boost/move/algo/detail/set_difference.hpp
+x64-windows/include/boost/move/algo/move.hpp
+x64-windows/include/boost/move/algo/predicate.hpp
+x64-windows/include/boost/move/algo/unique.hpp
+x64-windows/include/boost/move/algorithm.hpp
+x64-windows/include/boost/move/core.hpp
+x64-windows/include/boost/move/default_delete.hpp
+x64-windows/include/boost/move/detail/
+x64-windows/include/boost/move/detail/config_begin.hpp
+x64-windows/include/boost/move/detail/config_end.hpp
+x64-windows/include/boost/move/detail/destruct_n.hpp
+x64-windows/include/boost/move/detail/fwd_macros.hpp
+x64-windows/include/boost/move/detail/iterator_to_raw_pointer.hpp
+x64-windows/include/boost/move/detail/iterator_traits.hpp
+x64-windows/include/boost/move/detail/meta_utils.hpp
+x64-windows/include/boost/move/detail/meta_utils_core.hpp
+x64-windows/include/boost/move/detail/move_helpers.hpp
+x64-windows/include/boost/move/detail/placement_new.hpp
+x64-windows/include/boost/move/detail/pointer_element.hpp
+x64-windows/include/boost/move/detail/reverse_iterator.hpp
+x64-windows/include/boost/move/detail/std_ns_begin.hpp
+x64-windows/include/boost/move/detail/std_ns_end.hpp
+x64-windows/include/boost/move/detail/to_raw_pointer.hpp
+x64-windows/include/boost/move/detail/type_traits.hpp
+x64-windows/include/boost/move/detail/unique_ptr_meta_utils.hpp
+x64-windows/include/boost/move/detail/workaround.hpp
+x64-windows/include/boost/move/iterator.hpp
+x64-windows/include/boost/move/make_unique.hpp
+x64-windows/include/boost/move/move.hpp
+x64-windows/include/boost/move/traits.hpp
+x64-windows/include/boost/move/unique_ptr.hpp
+x64-windows/include/boost/move/utility.hpp
+x64-windows/include/boost/move/utility_core.hpp
+x64-windows/share/
+x64-windows/share/boost-move/
+x64-windows/share/boost-move/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-move_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/move/
+x64-windows-static/include/boost/move/adl_move_swap.hpp
+x64-windows-static/include/boost/move/algo/
+x64-windows-static/include/boost/move/algo/adaptive_merge.hpp
+x64-windows-static/include/boost/move/algo/adaptive_sort.hpp
+x64-windows-static/include/boost/move/algo/detail/
+x64-windows-static/include/boost/move/algo/detail/adaptive_sort_merge.hpp
+x64-windows-static/include/boost/move/algo/detail/basic_op.hpp
+x64-windows-static/include/boost/move/algo/detail/heap_sort.hpp
+x64-windows-static/include/boost/move/algo/detail/insertion_sort.hpp
+x64-windows-static/include/boost/move/algo/detail/is_sorted.hpp
+x64-windows-static/include/boost/move/algo/detail/merge.hpp
+x64-windows-static/include/boost/move/algo/detail/merge_sort.hpp
+x64-windows-static/include/boost/move/algo/detail/pdqsort.hpp
+x64-windows-static/include/boost/move/algo/detail/set_difference.hpp
+x64-windows-static/include/boost/move/algo/move.hpp
+x64-windows-static/include/boost/move/algo/predicate.hpp
+x64-windows-static/include/boost/move/algo/unique.hpp
+x64-windows-static/include/boost/move/algorithm.hpp
+x64-windows-static/include/boost/move/core.hpp
+x64-windows-static/include/boost/move/default_delete.hpp
+x64-windows-static/include/boost/move/detail/
+x64-windows-static/include/boost/move/detail/config_begin.hpp
+x64-windows-static/include/boost/move/detail/config_end.hpp
+x64-windows-static/include/boost/move/detail/destruct_n.hpp
+x64-windows-static/include/boost/move/detail/fwd_macros.hpp
+x64-windows-static/include/boost/move/detail/iterator_to_raw_pointer.hpp
+x64-windows-static/include/boost/move/detail/iterator_traits.hpp
+x64-windows-static/include/boost/move/detail/meta_utils.hpp
+x64-windows-static/include/boost/move/detail/meta_utils_core.hpp
+x64-windows-static/include/boost/move/detail/move_helpers.hpp
+x64-windows-static/include/boost/move/detail/placement_new.hpp
+x64-windows-static/include/boost/move/detail/pointer_element.hpp
+x64-windows-static/include/boost/move/detail/reverse_iterator.hpp
+x64-windows-static/include/boost/move/detail/std_ns_begin.hpp
+x64-windows-static/include/boost/move/detail/std_ns_end.hpp
+x64-windows-static/include/boost/move/detail/to_raw_pointer.hpp
+x64-windows-static/include/boost/move/detail/type_traits.hpp
+x64-windows-static/include/boost/move/detail/unique_ptr_meta_utils.hpp
+x64-windows-static/include/boost/move/detail/workaround.hpp
+x64-windows-static/include/boost/move/iterator.hpp
+x64-windows-static/include/boost/move/make_unique.hpp
+x64-windows-static/include/boost/move/move.hpp
+x64-windows-static/include/boost/move/traits.hpp
+x64-windows-static/include/boost/move/unique_ptr.hpp
+x64-windows-static/include/boost/move/utility.hpp
+x64-windows-static/include/boost/move/utility_core.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-move/
+x64-windows-static/share/boost-move/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1093 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/mpl/
+x64-windows/include/boost/mpl/O1_size.hpp
+x64-windows/include/boost/mpl/O1_size_fwd.hpp
+x64-windows/include/boost/mpl/accumulate.hpp
+x64-windows/include/boost/mpl/advance.hpp
+x64-windows/include/boost/mpl/advance_fwd.hpp
+x64-windows/include/boost/mpl/alias.hpp
+x64-windows/include/boost/mpl/always.hpp
+x64-windows/include/boost/mpl/and.hpp
+x64-windows/include/boost/mpl/apply.hpp
+x64-windows/include/boost/mpl/apply_fwd.hpp
+x64-windows/include/boost/mpl/apply_wrap.hpp
+x64-windows/include/boost/mpl/arg.hpp
+x64-windows/include/boost/mpl/arg_fwd.hpp
+x64-windows/include/boost/mpl/arithmetic.hpp
+x64-windows/include/boost/mpl/as_sequence.hpp
+x64-windows/include/boost/mpl/assert.hpp
+x64-windows/include/boost/mpl/at.hpp
+x64-windows/include/boost/mpl/at_fwd.hpp
+x64-windows/include/boost/mpl/aux_/
+x64-windows/include/boost/mpl/aux_/O1_size_impl.hpp
+x64-windows/include/boost/mpl/aux_/adl_barrier.hpp
+x64-windows/include/boost/mpl/aux_/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/apply_1st.hpp
+x64-windows/include/boost/mpl/aux_/arg_typedef.hpp
+x64-windows/include/boost/mpl/aux_/arithmetic_op.hpp
+x64-windows/include/boost/mpl/aux_/arity.hpp
+x64-windows/include/boost/mpl/aux_/arity_spec.hpp
+x64-windows/include/boost/mpl/aux_/at_impl.hpp
+x64-windows/include/boost/mpl/aux_/back_impl.hpp
+x64-windows/include/boost/mpl/aux_/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/begin_end_impl.hpp
+x64-windows/include/boost/mpl/aux_/clear_impl.hpp
+x64-windows/include/boost/mpl/aux_/common_name_wknd.hpp
+x64-windows/include/boost/mpl/aux_/comparison_op.hpp
+x64-windows/include/boost/mpl/aux_/config/
+x64-windows/include/boost/mpl/aux_/config/adl.hpp
+x64-windows/include/boost/mpl/aux_/config/arrays.hpp
+x64-windows/include/boost/mpl/aux_/config/bcc.hpp
+x64-windows/include/boost/mpl/aux_/config/bind.hpp
+x64-windows/include/boost/mpl/aux_/config/compiler.hpp
+x64-windows/include/boost/mpl/aux_/config/ctps.hpp
+x64-windows/include/boost/mpl/aux_/config/dependent_nttp.hpp
+x64-windows/include/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp
+x64-windows/include/boost/mpl/aux_/config/dtp.hpp
+x64-windows/include/boost/mpl/aux_/config/eti.hpp
+x64-windows/include/boost/mpl/aux_/config/forwarding.hpp
+x64-windows/include/boost/mpl/aux_/config/gcc.hpp
+x64-windows/include/boost/mpl/aux_/config/gpu.hpp
+x64-windows/include/boost/mpl/aux_/config/has_apply.hpp
+x64-windows/include/boost/mpl/aux_/config/has_xxx.hpp
+x64-windows/include/boost/mpl/aux_/config/integral.hpp
+x64-windows/include/boost/mpl/aux_/config/intel.hpp
+x64-windows/include/boost/mpl/aux_/config/lambda.hpp
+x64-windows/include/boost/mpl/aux_/config/msvc.hpp
+x64-windows/include/boost/mpl/aux_/config/msvc_typename.hpp
+x64-windows/include/boost/mpl/aux_/config/nttp.hpp
+x64-windows/include/boost/mpl/aux_/config/operators.hpp
+x64-windows/include/boost/mpl/aux_/config/overload_resolution.hpp
+x64-windows/include/boost/mpl/aux_/config/pp_counter.hpp
+x64-windows/include/boost/mpl/aux_/config/preprocessor.hpp
+x64-windows/include/boost/mpl/aux_/config/static_constant.hpp
+x64-windows/include/boost/mpl/aux_/config/ttp.hpp
+x64-windows/include/boost/mpl/aux_/config/typeof.hpp
+x64-windows/include/boost/mpl/aux_/config/use_preprocessed.hpp
+x64-windows/include/boost/mpl/aux_/config/workaround.hpp
+x64-windows/include/boost/mpl/aux_/contains_impl.hpp
+x64-windows/include/boost/mpl/aux_/count_args.hpp
+x64-windows/include/boost/mpl/aux_/count_impl.hpp
+x64-windows/include/boost/mpl/aux_/empty_impl.hpp
+x64-windows/include/boost/mpl/aux_/erase_impl.hpp
+x64-windows/include/boost/mpl/aux_/erase_key_impl.hpp
+x64-windows/include/boost/mpl/aux_/filter_iter.hpp
+x64-windows/include/boost/mpl/aux_/find_if_pred.hpp
+x64-windows/include/boost/mpl/aux_/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/fold_impl_body.hpp
+x64-windows/include/boost/mpl/aux_/fold_op.hpp
+x64-windows/include/boost/mpl/aux_/fold_pred.hpp
+x64-windows/include/boost/mpl/aux_/front_impl.hpp
+x64-windows/include/boost/mpl/aux_/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/has_apply.hpp
+x64-windows/include/boost/mpl/aux_/has_begin.hpp
+x64-windows/include/boost/mpl/aux_/has_key_impl.hpp
+x64-windows/include/boost/mpl/aux_/has_rebind.hpp
+x64-windows/include/boost/mpl/aux_/has_size.hpp
+x64-windows/include/boost/mpl/aux_/has_tag.hpp
+x64-windows/include/boost/mpl/aux_/has_type.hpp
+x64-windows/include/boost/mpl/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/aux_/insert_impl.hpp
+x64-windows/include/boost/mpl/aux_/insert_range_impl.hpp
+x64-windows/include/boost/mpl/aux_/inserter_algorithm.hpp
+x64-windows/include/boost/mpl/aux_/integral_wrapper.hpp
+x64-windows/include/boost/mpl/aux_/is_msvc_eti_arg.hpp
+x64-windows/include/boost/mpl/aux_/iter_apply.hpp
+x64-windows/include/boost/mpl/aux_/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/iter_push_front.hpp
+x64-windows/include/boost/mpl/aux_/joint_iter.hpp
+x64-windows/include/boost/mpl/aux_/lambda_arity_param.hpp
+x64-windows/include/boost/mpl/aux_/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/lambda_spec.hpp
+x64-windows/include/boost/mpl/aux_/lambda_support.hpp
+x64-windows/include/boost/mpl/aux_/largest_int.hpp
+x64-windows/include/boost/mpl/aux_/logical_op.hpp
+x64-windows/include/boost/mpl/aux_/msvc_dtw.hpp
+x64-windows/include/boost/mpl/aux_/msvc_eti_base.hpp
+x64-windows/include/boost/mpl/aux_/msvc_is_class.hpp
+x64-windows/include/boost/mpl/aux_/msvc_never_true.hpp
+x64-windows/include/boost/mpl/aux_/msvc_type.hpp
+x64-windows/include/boost/mpl/aux_/na.hpp
+x64-windows/include/boost/mpl/aux_/na_assert.hpp
+x64-windows/include/boost/mpl/aux_/na_fwd.hpp
+x64-windows/include/boost/mpl/aux_/na_spec.hpp
+x64-windows/include/boost/mpl/aux_/nested_type_wknd.hpp
+x64-windows/include/boost/mpl/aux_/nttp_decl.hpp
+x64-windows/include/boost/mpl/aux_/numeric_cast_utils.hpp
+x64-windows/include/boost/mpl/aux_/numeric_op.hpp
+x64-windows/include/boost/mpl/aux_/order_impl.hpp
+x64-windows/include/boost/mpl/aux_/overload_names.hpp
+x64-windows/include/boost/mpl/aux_/partition_op.hpp
+x64-windows/include/boost/mpl/aux_/pop_back_impl.hpp
+x64-windows/include/boost/mpl/aux_/pop_front_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/
+x64-windows/include/boost/mpl/aux_/preprocessor/add.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/def_params_tail.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/default_params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/enum.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/ext_params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/filter_params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/is_seq.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/partial_spec_params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/range.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/repeat.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/sub.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/token_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/tuple.hpp
+x64-windows/include/boost/mpl/aux_/ptr_to_ref.hpp
+x64-windows/include/boost/mpl/aux_/push_back_impl.hpp
+x64-windows/include/boost/mpl/aux_/push_front_impl.hpp
+x64-windows/include/boost/mpl/aux_/range_c/
+x64-windows/include/boost/mpl/aux_/range_c/O1_size.hpp
+x64-windows/include/boost/mpl/aux_/range_c/back.hpp
+x64-windows/include/boost/mpl/aux_/range_c/empty.hpp
+x64-windows/include/boost/mpl/aux_/range_c/front.hpp
+x64-windows/include/boost/mpl/aux_/range_c/iterator.hpp
+x64-windows/include/boost/mpl/aux_/range_c/size.hpp
+x64-windows/include/boost/mpl/aux_/range_c/tag.hpp
+x64-windows/include/boost/mpl/aux_/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/reverse_fold_impl_body.hpp
+x64-windows/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/sequence_wrapper.hpp
+x64-windows/include/boost/mpl/aux_/shift_op.hpp
+x64-windows/include/boost/mpl/aux_/single_element_iter.hpp
+x64-windows/include/boost/mpl/aux_/size_impl.hpp
+x64-windows/include/boost/mpl/aux_/sort_impl.hpp
+x64-windows/include/boost/mpl/aux_/static_cast.hpp
+x64-windows/include/boost/mpl/aux_/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/template_arity_fwd.hpp
+x64-windows/include/boost/mpl/aux_/test.hpp
+x64-windows/include/boost/mpl/aux_/test/
+x64-windows/include/boost/mpl/aux_/test/assert.hpp
+x64-windows/include/boost/mpl/aux_/test/data.hpp
+x64-windows/include/boost/mpl/aux_/test/test_case.hpp
+x64-windows/include/boost/mpl/aux_/traits_lambda_spec.hpp
+x64-windows/include/boost/mpl/aux_/transform_iter.hpp
+x64-windows/include/boost/mpl/aux_/type_wrapper.hpp
+x64-windows/include/boost/mpl/aux_/unwrap.hpp
+x64-windows/include/boost/mpl/aux_/value_wknd.hpp
+x64-windows/include/boost/mpl/aux_/yes_no.hpp
+x64-windows/include/boost/mpl/back.hpp
+x64-windows/include/boost/mpl/back_fwd.hpp
+x64-windows/include/boost/mpl/back_inserter.hpp
+x64-windows/include/boost/mpl/base.hpp
+x64-windows/include/boost/mpl/begin.hpp
+x64-windows/include/boost/mpl/begin_end.hpp
+x64-windows/include/boost/mpl/begin_end_fwd.hpp
+x64-windows/include/boost/mpl/bind.hpp
+x64-windows/include/boost/mpl/bind_fwd.hpp
+x64-windows/include/boost/mpl/bitand.hpp
+x64-windows/include/boost/mpl/bitor.hpp
+x64-windows/include/boost/mpl/bitwise.hpp
+x64-windows/include/boost/mpl/bitxor.hpp
+x64-windows/include/boost/mpl/bool.hpp
+x64-windows/include/boost/mpl/bool_fwd.hpp
+x64-windows/include/boost/mpl/char.hpp
+x64-windows/include/boost/mpl/char_fwd.hpp
+x64-windows/include/boost/mpl/clear.hpp
+x64-windows/include/boost/mpl/clear_fwd.hpp
+x64-windows/include/boost/mpl/comparison.hpp
+x64-windows/include/boost/mpl/contains.hpp
+x64-windows/include/boost/mpl/contains_fwd.hpp
+x64-windows/include/boost/mpl/copy.hpp
+x64-windows/include/boost/mpl/copy_if.hpp
+x64-windows/include/boost/mpl/count.hpp
+x64-windows/include/boost/mpl/count_fwd.hpp
+x64-windows/include/boost/mpl/count_if.hpp
+x64-windows/include/boost/mpl/deque.hpp
+x64-windows/include/boost/mpl/deref.hpp
+x64-windows/include/boost/mpl/distance.hpp
+x64-windows/include/boost/mpl/distance_fwd.hpp
+x64-windows/include/boost/mpl/divides.hpp
+x64-windows/include/boost/mpl/empty.hpp
+x64-windows/include/boost/mpl/empty_base.hpp
+x64-windows/include/boost/mpl/empty_fwd.hpp
+x64-windows/include/boost/mpl/empty_sequence.hpp
+x64-windows/include/boost/mpl/end.hpp
+x64-windows/include/boost/mpl/equal.hpp
+x64-windows/include/boost/mpl/equal_to.hpp
+x64-windows/include/boost/mpl/erase.hpp
+x64-windows/include/boost/mpl/erase_fwd.hpp
+x64-windows/include/boost/mpl/erase_key.hpp
+x64-windows/include/boost/mpl/erase_key_fwd.hpp
+x64-windows/include/boost/mpl/eval_if.hpp
+x64-windows/include/boost/mpl/filter_view.hpp
+x64-windows/include/boost/mpl/find.hpp
+x64-windows/include/boost/mpl/find_if.hpp
+x64-windows/include/boost/mpl/fold.hpp
+x64-windows/include/boost/mpl/for_each.hpp
+x64-windows/include/boost/mpl/front.hpp
+x64-windows/include/boost/mpl/front_fwd.hpp
+x64-windows/include/boost/mpl/front_inserter.hpp
+x64-windows/include/boost/mpl/get_tag.hpp
+x64-windows/include/boost/mpl/greater.hpp
+x64-windows/include/boost/mpl/greater_equal.hpp
+x64-windows/include/boost/mpl/has_key.hpp
+x64-windows/include/boost/mpl/has_key_fwd.hpp
+x64-windows/include/boost/mpl/has_xxx.hpp
+x64-windows/include/boost/mpl/identity.hpp
+x64-windows/include/boost/mpl/if.hpp
+x64-windows/include/boost/mpl/index_if.hpp
+x64-windows/include/boost/mpl/index_of.hpp
+x64-windows/include/boost/mpl/inherit.hpp
+x64-windows/include/boost/mpl/inherit_linearly.hpp
+x64-windows/include/boost/mpl/insert.hpp
+x64-windows/include/boost/mpl/insert_fwd.hpp
+x64-windows/include/boost/mpl/insert_range.hpp
+x64-windows/include/boost/mpl/insert_range_fwd.hpp
+x64-windows/include/boost/mpl/inserter.hpp
+x64-windows/include/boost/mpl/int.hpp
+x64-windows/include/boost/mpl/int_fwd.hpp
+x64-windows/include/boost/mpl/integral_c.hpp
+x64-windows/include/boost/mpl/integral_c_fwd.hpp
+x64-windows/include/boost/mpl/integral_c_tag.hpp
+x64-windows/include/boost/mpl/is_placeholder.hpp
+x64-windows/include/boost/mpl/is_sequence.hpp
+x64-windows/include/boost/mpl/iter_fold.hpp
+x64-windows/include/boost/mpl/iter_fold_if.hpp
+x64-windows/include/boost/mpl/iterator_category.hpp
+x64-windows/include/boost/mpl/iterator_range.hpp
+x64-windows/include/boost/mpl/iterator_tags.hpp
+x64-windows/include/boost/mpl/joint_view.hpp
+x64-windows/include/boost/mpl/key_type.hpp
+x64-windows/include/boost/mpl/key_type_fwd.hpp
+x64-windows/include/boost/mpl/lambda.hpp
+x64-windows/include/boost/mpl/lambda_fwd.hpp
+x64-windows/include/boost/mpl/less.hpp
+x64-windows/include/boost/mpl/less_equal.hpp
+x64-windows/include/boost/mpl/limits/
+x64-windows/include/boost/mpl/limits/arity.hpp
+x64-windows/include/boost/mpl/limits/list.hpp
+x64-windows/include/boost/mpl/limits/map.hpp
+x64-windows/include/boost/mpl/limits/set.hpp
+x64-windows/include/boost/mpl/limits/string.hpp
+x64-windows/include/boost/mpl/limits/unrolling.hpp
+x64-windows/include/boost/mpl/limits/vector.hpp
+x64-windows/include/boost/mpl/list.hpp
+x64-windows/include/boost/mpl/list/
+x64-windows/include/boost/mpl/list/aux_/
+x64-windows/include/boost/mpl/list/aux_/O1_size.hpp
+x64-windows/include/boost/mpl/list/aux_/begin_end.hpp
+x64-windows/include/boost/mpl/list/aux_/clear.hpp
+x64-windows/include/boost/mpl/list/aux_/empty.hpp
+x64-windows/include/boost/mpl/list/aux_/front.hpp
+x64-windows/include/boost/mpl/list/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/list/aux_/item.hpp
+x64-windows/include/boost/mpl/list/aux_/iterator.hpp
+x64-windows/include/boost/mpl/list/aux_/numbered.hpp
+x64-windows/include/boost/mpl/list/aux_/numbered_c.hpp
+x64-windows/include/boost/mpl/list/aux_/pop_front.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list10.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list10_c.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list20.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list20_c.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list30.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list30_c.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list40.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list40_c.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list50.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list50_c.hpp
+x64-windows/include/boost/mpl/list/aux_/push_back.hpp
+x64-windows/include/boost/mpl/list/aux_/push_front.hpp
+x64-windows/include/boost/mpl/list/aux_/size.hpp
+x64-windows/include/boost/mpl/list/aux_/tag.hpp
+x64-windows/include/boost/mpl/list/list0.hpp
+x64-windows/include/boost/mpl/list/list0_c.hpp
+x64-windows/include/boost/mpl/list/list10.hpp
+x64-windows/include/boost/mpl/list/list10_c.hpp
+x64-windows/include/boost/mpl/list/list20.hpp
+x64-windows/include/boost/mpl/list/list20_c.hpp
+x64-windows/include/boost/mpl/list/list30.hpp
+x64-windows/include/boost/mpl/list/list30_c.hpp
+x64-windows/include/boost/mpl/list/list40.hpp
+x64-windows/include/boost/mpl/list/list40_c.hpp
+x64-windows/include/boost/mpl/list/list50.hpp
+x64-windows/include/boost/mpl/list/list50_c.hpp
+x64-windows/include/boost/mpl/list_c.hpp
+x64-windows/include/boost/mpl/logical.hpp
+x64-windows/include/boost/mpl/long.hpp
+x64-windows/include/boost/mpl/long_fwd.hpp
+x64-windows/include/boost/mpl/lower_bound.hpp
+x64-windows/include/boost/mpl/map.hpp
+x64-windows/include/boost/mpl/map/
+x64-windows/include/boost/mpl/map/aux_/
+x64-windows/include/boost/mpl/map/aux_/at_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/begin_end_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/clear_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/contains_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/empty_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/erase_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/erase_key_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/has_key_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/map/aux_/insert_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/insert_range_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/item.hpp
+x64-windows/include/boost/mpl/map/aux_/iterator.hpp
+x64-windows/include/boost/mpl/map/aux_/key_type_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/map0.hpp
+x64-windows/include/boost/mpl/map/aux_/numbered.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map10.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map20.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map30.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map40.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map50.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map10.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map20.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map30.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map40.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map50.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map10.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map20.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map30.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map40.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map50.hpp
+x64-windows/include/boost/mpl/map/aux_/size_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/tag.hpp
+x64-windows/include/boost/mpl/map/aux_/value_type_impl.hpp
+x64-windows/include/boost/mpl/map/map0.hpp
+x64-windows/include/boost/mpl/map/map10.hpp
+x64-windows/include/boost/mpl/map/map20.hpp
+x64-windows/include/boost/mpl/map/map30.hpp
+x64-windows/include/boost/mpl/map/map40.hpp
+x64-windows/include/boost/mpl/map/map50.hpp
+x64-windows/include/boost/mpl/math/
+x64-windows/include/boost/mpl/math/fixed_c.hpp
+x64-windows/include/boost/mpl/math/is_even.hpp
+x64-windows/include/boost/mpl/math/rational_c.hpp
+x64-windows/include/boost/mpl/max.hpp
+x64-windows/include/boost/mpl/max_element.hpp
+x64-windows/include/boost/mpl/min.hpp
+x64-windows/include/boost/mpl/min_element.hpp
+x64-windows/include/boost/mpl/min_max.hpp
+x64-windows/include/boost/mpl/minus.hpp
+x64-windows/include/boost/mpl/modulus.hpp
+x64-windows/include/boost/mpl/multiplies.hpp
+x64-windows/include/boost/mpl/multiset/
+x64-windows/include/boost/mpl/multiset/aux_/
+x64-windows/include/boost/mpl/multiset/aux_/count_impl.hpp
+x64-windows/include/boost/mpl/multiset/aux_/insert_impl.hpp
+x64-windows/include/boost/mpl/multiset/aux_/item.hpp
+x64-windows/include/boost/mpl/multiset/aux_/multiset0.hpp
+x64-windows/include/boost/mpl/multiset/aux_/tag.hpp
+x64-windows/include/boost/mpl/multiset/multiset0.hpp
+x64-windows/include/boost/mpl/negate.hpp
+x64-windows/include/boost/mpl/next.hpp
+x64-windows/include/boost/mpl/next_prior.hpp
+x64-windows/include/boost/mpl/not.hpp
+x64-windows/include/boost/mpl/not_equal_to.hpp
+x64-windows/include/boost/mpl/numeric_cast.hpp
+x64-windows/include/boost/mpl/or.hpp
+x64-windows/include/boost/mpl/order.hpp
+x64-windows/include/boost/mpl/order_fwd.hpp
+x64-windows/include/boost/mpl/pair.hpp
+x64-windows/include/boost/mpl/pair_view.hpp
+x64-windows/include/boost/mpl/partition.hpp
+x64-windows/include/boost/mpl/placeholders.hpp
+x64-windows/include/boost/mpl/plus.hpp
+x64-windows/include/boost/mpl/pop_back.hpp
+x64-windows/include/boost/mpl/pop_back_fwd.hpp
+x64-windows/include/boost/mpl/pop_front.hpp
+x64-windows/include/boost/mpl/pop_front_fwd.hpp
+x64-windows/include/boost/mpl/print.hpp
+x64-windows/include/boost/mpl/prior.hpp
+x64-windows/include/boost/mpl/protect.hpp
+x64-windows/include/boost/mpl/push_back.hpp
+x64-windows/include/boost/mpl/push_back_fwd.hpp
+x64-windows/include/boost/mpl/push_front.hpp
+x64-windows/include/boost/mpl/push_front_fwd.hpp
+x64-windows/include/boost/mpl/quote.hpp
+x64-windows/include/boost/mpl/range_c.hpp
+x64-windows/include/boost/mpl/remove.hpp
+x64-windows/include/boost/mpl/remove_if.hpp
+x64-windows/include/boost/mpl/replace.hpp
+x64-windows/include/boost/mpl/replace_if.hpp
+x64-windows/include/boost/mpl/reverse.hpp
+x64-windows/include/boost/mpl/reverse_fold.hpp
+x64-windows/include/boost/mpl/reverse_iter_fold.hpp
+x64-windows/include/boost/mpl/same_as.hpp
+x64-windows/include/boost/mpl/sequence_tag.hpp
+x64-windows/include/boost/mpl/sequence_tag_fwd.hpp
+x64-windows/include/boost/mpl/set.hpp
+x64-windows/include/boost/mpl/set/
+x64-windows/include/boost/mpl/set/aux_/
+x64-windows/include/boost/mpl/set/aux_/at_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/begin_end_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/clear_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/empty_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/erase_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/erase_key_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/has_key_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/set/aux_/insert_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/insert_range_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/item.hpp
+x64-windows/include/boost/mpl/set/aux_/iterator.hpp
+x64-windows/include/boost/mpl/set/aux_/key_type_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/numbered.hpp
+x64-windows/include/boost/mpl/set/aux_/numbered_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set10.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set10_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set20.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set20_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set30.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set30_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set40.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set40_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set50.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set50_c.hpp
+x64-windows/include/boost/mpl/set/aux_/set0.hpp
+x64-windows/include/boost/mpl/set/aux_/size_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/tag.hpp
+x64-windows/include/boost/mpl/set/aux_/value_type_impl.hpp
+x64-windows/include/boost/mpl/set/set0.hpp
+x64-windows/include/boost/mpl/set/set0_c.hpp
+x64-windows/include/boost/mpl/set/set10.hpp
+x64-windows/include/boost/mpl/set/set10_c.hpp
+x64-windows/include/boost/mpl/set/set20.hpp
+x64-windows/include/boost/mpl/set/set20_c.hpp
+x64-windows/include/boost/mpl/set/set30.hpp
+x64-windows/include/boost/mpl/set/set30_c.hpp
+x64-windows/include/boost/mpl/set/set40.hpp
+x64-windows/include/boost/mpl/set/set40_c.hpp
+x64-windows/include/boost/mpl/set/set50.hpp
+x64-windows/include/boost/mpl/set/set50_c.hpp
+x64-windows/include/boost/mpl/set_c.hpp
+x64-windows/include/boost/mpl/shift_left.hpp
+x64-windows/include/boost/mpl/shift_right.hpp
+x64-windows/include/boost/mpl/single_view.hpp
+x64-windows/include/boost/mpl/size.hpp
+x64-windows/include/boost/mpl/size_fwd.hpp
+x64-windows/include/boost/mpl/size_t.hpp
+x64-windows/include/boost/mpl/size_t_fwd.hpp
+x64-windows/include/boost/mpl/sizeof.hpp
+x64-windows/include/boost/mpl/sort.hpp
+x64-windows/include/boost/mpl/stable_partition.hpp
+x64-windows/include/boost/mpl/string.hpp
+x64-windows/include/boost/mpl/switch.hpp
+x64-windows/include/boost/mpl/tag.hpp
+x64-windows/include/boost/mpl/times.hpp
+x64-windows/include/boost/mpl/transform.hpp
+x64-windows/include/boost/mpl/transform_view.hpp
+x64-windows/include/boost/mpl/unique.hpp
+x64-windows/include/boost/mpl/unpack_args.hpp
+x64-windows/include/boost/mpl/upper_bound.hpp
+x64-windows/include/boost/mpl/value_type.hpp
+x64-windows/include/boost/mpl/value_type_fwd.hpp
+x64-windows/include/boost/mpl/vector.hpp
+x64-windows/include/boost/mpl/vector/
+x64-windows/include/boost/mpl/vector/aux_/
+x64-windows/include/boost/mpl/vector/aux_/O1_size.hpp
+x64-windows/include/boost/mpl/vector/aux_/at.hpp
+x64-windows/include/boost/mpl/vector/aux_/back.hpp
+x64-windows/include/boost/mpl/vector/aux_/begin_end.hpp
+x64-windows/include/boost/mpl/vector/aux_/clear.hpp
+x64-windows/include/boost/mpl/vector/aux_/empty.hpp
+x64-windows/include/boost/mpl/vector/aux_/front.hpp
+x64-windows/include/boost/mpl/vector/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/vector/aux_/item.hpp
+x64-windows/include/boost/mpl/vector/aux_/iterator.hpp
+x64-windows/include/boost/mpl/vector/aux_/numbered.hpp
+x64-windows/include/boost/mpl/vector/aux_/numbered_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/pop_back.hpp
+x64-windows/include/boost/mpl/vector/aux_/pop_front.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector10_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector20_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector30.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector30_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector40.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector40_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector50.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector50_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/push_back.hpp
+x64-windows/include/boost/mpl/vector/aux_/push_front.hpp
+x64-windows/include/boost/mpl/vector/aux_/size.hpp
+x64-windows/include/boost/mpl/vector/aux_/tag.hpp
+x64-windows/include/boost/mpl/vector/aux_/vector0.hpp
+x64-windows/include/boost/mpl/vector/vector0.hpp
+x64-windows/include/boost/mpl/vector/vector0_c.hpp
+x64-windows/include/boost/mpl/vector/vector10.hpp
+x64-windows/include/boost/mpl/vector/vector10_c.hpp
+x64-windows/include/boost/mpl/vector/vector20.hpp
+x64-windows/include/boost/mpl/vector/vector20_c.hpp
+x64-windows/include/boost/mpl/vector/vector30.hpp
+x64-windows/include/boost/mpl/vector/vector30_c.hpp
+x64-windows/include/boost/mpl/vector/vector40.hpp
+x64-windows/include/boost/mpl/vector/vector40_c.hpp
+x64-windows/include/boost/mpl/vector/vector50.hpp
+x64-windows/include/boost/mpl/vector/vector50_c.hpp
+x64-windows/include/boost/mpl/vector_c.hpp
+x64-windows/include/boost/mpl/void.hpp
+x64-windows/include/boost/mpl/void_fwd.hpp
+x64-windows/include/boost/mpl/zip_view.hpp
+x64-windows/share/
+x64-windows/share/boost-mpl/
+x64-windows/share/boost-mpl/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1093 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/mpl/
+x64-windows-static/include/boost/mpl/O1_size.hpp
+x64-windows-static/include/boost/mpl/O1_size_fwd.hpp
+x64-windows-static/include/boost/mpl/accumulate.hpp
+x64-windows-static/include/boost/mpl/advance.hpp
+x64-windows-static/include/boost/mpl/advance_fwd.hpp
+x64-windows-static/include/boost/mpl/alias.hpp
+x64-windows-static/include/boost/mpl/always.hpp
+x64-windows-static/include/boost/mpl/and.hpp
+x64-windows-static/include/boost/mpl/apply.hpp
+x64-windows-static/include/boost/mpl/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/arg.hpp
+x64-windows-static/include/boost/mpl/arg_fwd.hpp
+x64-windows-static/include/boost/mpl/arithmetic.hpp
+x64-windows-static/include/boost/mpl/as_sequence.hpp
+x64-windows-static/include/boost/mpl/assert.hpp
+x64-windows-static/include/boost/mpl/at.hpp
+x64-windows-static/include/boost/mpl/at_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/
+x64-windows-static/include/boost/mpl/aux_/O1_size_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/adl_barrier.hpp
+x64-windows-static/include/boost/mpl/aux_/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/apply_1st.hpp
+x64-windows-static/include/boost/mpl/aux_/arg_typedef.hpp
+x64-windows-static/include/boost/mpl/aux_/arithmetic_op.hpp
+x64-windows-static/include/boost/mpl/aux_/arity.hpp
+x64-windows-static/include/boost/mpl/aux_/arity_spec.hpp
+x64-windows-static/include/boost/mpl/aux_/at_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/back_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/begin_end_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/clear_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/common_name_wknd.hpp
+x64-windows-static/include/boost/mpl/aux_/comparison_op.hpp
+x64-windows-static/include/boost/mpl/aux_/config/
+x64-windows-static/include/boost/mpl/aux_/config/adl.hpp
+x64-windows-static/include/boost/mpl/aux_/config/arrays.hpp
+x64-windows-static/include/boost/mpl/aux_/config/bcc.hpp
+x64-windows-static/include/boost/mpl/aux_/config/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/config/compiler.hpp
+x64-windows-static/include/boost/mpl/aux_/config/ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/config/dependent_nttp.hpp
+x64-windows-static/include/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/config/dtp.hpp
+x64-windows-static/include/boost/mpl/aux_/config/eti.hpp
+x64-windows-static/include/boost/mpl/aux_/config/forwarding.hpp
+x64-windows-static/include/boost/mpl/aux_/config/gcc.hpp
+x64-windows-static/include/boost/mpl/aux_/config/gpu.hpp
+x64-windows-static/include/boost/mpl/aux_/config/has_apply.hpp
+x64-windows-static/include/boost/mpl/aux_/config/has_xxx.hpp
+x64-windows-static/include/boost/mpl/aux_/config/integral.hpp
+x64-windows-static/include/boost/mpl/aux_/config/intel.hpp
+x64-windows-static/include/boost/mpl/aux_/config/lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/config/msvc.hpp
+x64-windows-static/include/boost/mpl/aux_/config/msvc_typename.hpp
+x64-windows-static/include/boost/mpl/aux_/config/nttp.hpp
+x64-windows-static/include/boost/mpl/aux_/config/operators.hpp
+x64-windows-static/include/boost/mpl/aux_/config/overload_resolution.hpp
+x64-windows-static/include/boost/mpl/aux_/config/pp_counter.hpp
+x64-windows-static/include/boost/mpl/aux_/config/preprocessor.hpp
+x64-windows-static/include/boost/mpl/aux_/config/static_constant.hpp
+x64-windows-static/include/boost/mpl/aux_/config/ttp.hpp
+x64-windows-static/include/boost/mpl/aux_/config/typeof.hpp
+x64-windows-static/include/boost/mpl/aux_/config/use_preprocessed.hpp
+x64-windows-static/include/boost/mpl/aux_/config/workaround.hpp
+x64-windows-static/include/boost/mpl/aux_/contains_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/count_args.hpp
+x64-windows-static/include/boost/mpl/aux_/count_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/empty_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/erase_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/erase_key_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/filter_iter.hpp
+x64-windows-static/include/boost/mpl/aux_/find_if_pred.hpp
+x64-windows-static/include/boost/mpl/aux_/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/fold_impl_body.hpp
+x64-windows-static/include/boost/mpl/aux_/fold_op.hpp
+x64-windows-static/include/boost/mpl/aux_/fold_pred.hpp
+x64-windows-static/include/boost/mpl/aux_/front_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/has_apply.hpp
+x64-windows-static/include/boost/mpl/aux_/has_begin.hpp
+x64-windows-static/include/boost/mpl/aux_/has_key_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/has_rebind.hpp
+x64-windows-static/include/boost/mpl/aux_/has_size.hpp
+x64-windows-static/include/boost/mpl/aux_/has_tag.hpp
+x64-windows-static/include/boost/mpl/aux_/has_type.hpp
+x64-windows-static/include/boost/mpl/aux_/include_preprocessed.hpp
+x64-windows-static/include/boost/mpl/aux_/insert_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/insert_range_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/inserter_algorithm.hpp
+x64-windows-static/include/boost/mpl/aux_/integral_wrapper.hpp
+x64-windows-static/include/boost/mpl/aux_/is_msvc_eti_arg.hpp
+x64-windows-static/include/boost/mpl/aux_/iter_apply.hpp
+x64-windows-static/include/boost/mpl/aux_/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/iter_push_front.hpp
+x64-windows-static/include/boost/mpl/aux_/joint_iter.hpp
+x64-windows-static/include/boost/mpl/aux_/lambda_arity_param.hpp
+x64-windows-static/include/boost/mpl/aux_/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/lambda_spec.hpp
+x64-windows-static/include/boost/mpl/aux_/lambda_support.hpp
+x64-windows-static/include/boost/mpl/aux_/largest_int.hpp
+x64-windows-static/include/boost/mpl/aux_/logical_op.hpp
+x64-windows-static/include/boost/mpl/aux_/msvc_dtw.hpp
+x64-windows-static/include/boost/mpl/aux_/msvc_eti_base.hpp
+x64-windows-static/include/boost/mpl/aux_/msvc_is_class.hpp
+x64-windows-static/include/boost/mpl/aux_/msvc_never_true.hpp
+x64-windows-static/include/boost/mpl/aux_/msvc_type.hpp
+x64-windows-static/include/boost/mpl/aux_/na.hpp
+x64-windows-static/include/boost/mpl/aux_/na_assert.hpp
+x64-windows-static/include/boost/mpl/aux_/na_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/na_spec.hpp
+x64-windows-static/include/boost/mpl/aux_/nested_type_wknd.hpp
+x64-windows-static/include/boost/mpl/aux_/nttp_decl.hpp
+x64-windows-static/include/boost/mpl/aux_/numeric_cast_utils.hpp
+x64-windows-static/include/boost/mpl/aux_/numeric_op.hpp
+x64-windows-static/include/boost/mpl/aux_/order_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/overload_names.hpp
+x64-windows-static/include/boost/mpl/aux_/partition_op.hpp
+x64-windows-static/include/boost/mpl/aux_/pop_back_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/pop_front_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc551/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/dmc/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/gcc/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/mwcw/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/no_ttp/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/advance_forward.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/and.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/apply.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/arg.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/bind.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/deque.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/divides.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/full_lambda.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/greater.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/inherit.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/iter_fold_if_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/less.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/list.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/list_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/map.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/minus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/or.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/placeholders.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/plus.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/quote.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/set.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/set_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/times.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/vector.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessed/plain/vector_c.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/
+x64-windows-static/include/boost/mpl/aux_/preprocessor/add.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/def_params_tail.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/default_params.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/enum.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/ext_params.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/filter_params.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/is_seq.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/params.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/partial_spec_params.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/range.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/repeat.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/sub.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/token_equal.hpp
+x64-windows-static/include/boost/mpl/aux_/preprocessor/tuple.hpp
+x64-windows-static/include/boost/mpl/aux_/ptr_to_ref.hpp
+x64-windows-static/include/boost/mpl/aux_/push_back_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/push_front_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/range_c/
+x64-windows-static/include/boost/mpl/aux_/range_c/O1_size.hpp
+x64-windows-static/include/boost/mpl/aux_/range_c/back.hpp
+x64-windows-static/include/boost/mpl/aux_/range_c/empty.hpp
+x64-windows-static/include/boost/mpl/aux_/range_c/front.hpp
+x64-windows-static/include/boost/mpl/aux_/range_c/iterator.hpp
+x64-windows-static/include/boost/mpl/aux_/range_c/size.hpp
+x64-windows-static/include/boost/mpl/aux_/range_c/tag.hpp
+x64-windows-static/include/boost/mpl/aux_/reverse_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/reverse_fold_impl_body.hpp
+x64-windows-static/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/sequence_wrapper.hpp
+x64-windows-static/include/boost/mpl/aux_/shift_op.hpp
+x64-windows-static/include/boost/mpl/aux_/single_element_iter.hpp
+x64-windows-static/include/boost/mpl/aux_/size_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/sort_impl.hpp
+x64-windows-static/include/boost/mpl/aux_/static_cast.hpp
+x64-windows-static/include/boost/mpl/aux_/template_arity.hpp
+x64-windows-static/include/boost/mpl/aux_/template_arity_fwd.hpp
+x64-windows-static/include/boost/mpl/aux_/test.hpp
+x64-windows-static/include/boost/mpl/aux_/test/
+x64-windows-static/include/boost/mpl/aux_/test/assert.hpp
+x64-windows-static/include/boost/mpl/aux_/test/data.hpp
+x64-windows-static/include/boost/mpl/aux_/test/test_case.hpp
+x64-windows-static/include/boost/mpl/aux_/traits_lambda_spec.hpp
+x64-windows-static/include/boost/mpl/aux_/transform_iter.hpp
+x64-windows-static/include/boost/mpl/aux_/type_wrapper.hpp
+x64-windows-static/include/boost/mpl/aux_/unwrap.hpp
+x64-windows-static/include/boost/mpl/aux_/value_wknd.hpp
+x64-windows-static/include/boost/mpl/aux_/yes_no.hpp
+x64-windows-static/include/boost/mpl/back.hpp
+x64-windows-static/include/boost/mpl/back_fwd.hpp
+x64-windows-static/include/boost/mpl/back_inserter.hpp
+x64-windows-static/include/boost/mpl/base.hpp
+x64-windows-static/include/boost/mpl/begin.hpp
+x64-windows-static/include/boost/mpl/begin_end.hpp
+x64-windows-static/include/boost/mpl/begin_end_fwd.hpp
+x64-windows-static/include/boost/mpl/bind.hpp
+x64-windows-static/include/boost/mpl/bind_fwd.hpp
+x64-windows-static/include/boost/mpl/bitand.hpp
+x64-windows-static/include/boost/mpl/bitor.hpp
+x64-windows-static/include/boost/mpl/bitwise.hpp
+x64-windows-static/include/boost/mpl/bitxor.hpp
+x64-windows-static/include/boost/mpl/bool.hpp
+x64-windows-static/include/boost/mpl/bool_fwd.hpp
+x64-windows-static/include/boost/mpl/char.hpp
+x64-windows-static/include/boost/mpl/char_fwd.hpp
+x64-windows-static/include/boost/mpl/clear.hpp
+x64-windows-static/include/boost/mpl/clear_fwd.hpp
+x64-windows-static/include/boost/mpl/comparison.hpp
+x64-windows-static/include/boost/mpl/contains.hpp
+x64-windows-static/include/boost/mpl/contains_fwd.hpp
+x64-windows-static/include/boost/mpl/copy.hpp
+x64-windows-static/include/boost/mpl/copy_if.hpp
+x64-windows-static/include/boost/mpl/count.hpp
+x64-windows-static/include/boost/mpl/count_fwd.hpp
+x64-windows-static/include/boost/mpl/count_if.hpp
+x64-windows-static/include/boost/mpl/deque.hpp
+x64-windows-static/include/boost/mpl/deref.hpp
+x64-windows-static/include/boost/mpl/distance.hpp
+x64-windows-static/include/boost/mpl/distance_fwd.hpp
+x64-windows-static/include/boost/mpl/divides.hpp
+x64-windows-static/include/boost/mpl/empty.hpp
+x64-windows-static/include/boost/mpl/empty_base.hpp
+x64-windows-static/include/boost/mpl/empty_fwd.hpp
+x64-windows-static/include/boost/mpl/empty_sequence.hpp
+x64-windows-static/include/boost/mpl/end.hpp
+x64-windows-static/include/boost/mpl/equal.hpp
+x64-windows-static/include/boost/mpl/equal_to.hpp
+x64-windows-static/include/boost/mpl/erase.hpp
+x64-windows-static/include/boost/mpl/erase_fwd.hpp
+x64-windows-static/include/boost/mpl/erase_key.hpp
+x64-windows-static/include/boost/mpl/erase_key_fwd.hpp
+x64-windows-static/include/boost/mpl/eval_if.hpp
+x64-windows-static/include/boost/mpl/filter_view.hpp
+x64-windows-static/include/boost/mpl/find.hpp
+x64-windows-static/include/boost/mpl/find_if.hpp
+x64-windows-static/include/boost/mpl/fold.hpp
+x64-windows-static/include/boost/mpl/for_each.hpp
+x64-windows-static/include/boost/mpl/front.hpp
+x64-windows-static/include/boost/mpl/front_fwd.hpp
+x64-windows-static/include/boost/mpl/front_inserter.hpp
+x64-windows-static/include/boost/mpl/get_tag.hpp
+x64-windows-static/include/boost/mpl/greater.hpp
+x64-windows-static/include/boost/mpl/greater_equal.hpp
+x64-windows-static/include/boost/mpl/has_key.hpp
+x64-windows-static/include/boost/mpl/has_key_fwd.hpp
+x64-windows-static/include/boost/mpl/has_xxx.hpp
+x64-windows-static/include/boost/mpl/identity.hpp
+x64-windows-static/include/boost/mpl/if.hpp
+x64-windows-static/include/boost/mpl/index_if.hpp
+x64-windows-static/include/boost/mpl/index_of.hpp
+x64-windows-static/include/boost/mpl/inherit.hpp
+x64-windows-static/include/boost/mpl/inherit_linearly.hpp
+x64-windows-static/include/boost/mpl/insert.hpp
+x64-windows-static/include/boost/mpl/insert_fwd.hpp
+x64-windows-static/include/boost/mpl/insert_range.hpp
+x64-windows-static/include/boost/mpl/insert_range_fwd.hpp
+x64-windows-static/include/boost/mpl/inserter.hpp
+x64-windows-static/include/boost/mpl/int.hpp
+x64-windows-static/include/boost/mpl/int_fwd.hpp
+x64-windows-static/include/boost/mpl/integral_c.hpp
+x64-windows-static/include/boost/mpl/integral_c_fwd.hpp
+x64-windows-static/include/boost/mpl/integral_c_tag.hpp
+x64-windows-static/include/boost/mpl/is_placeholder.hpp
+x64-windows-static/include/boost/mpl/is_sequence.hpp
+x64-windows-static/include/boost/mpl/iter_fold.hpp
+x64-windows-static/include/boost/mpl/iter_fold_if.hpp
+x64-windows-static/include/boost/mpl/iterator_category.hpp
+x64-windows-static/include/boost/mpl/iterator_range.hpp
+x64-windows-static/include/boost/mpl/iterator_tags.hpp
+x64-windows-static/include/boost/mpl/joint_view.hpp
+x64-windows-static/include/boost/mpl/key_type.hpp
+x64-windows-static/include/boost/mpl/key_type_fwd.hpp
+x64-windows-static/include/boost/mpl/lambda.hpp
+x64-windows-static/include/boost/mpl/lambda_fwd.hpp
+x64-windows-static/include/boost/mpl/less.hpp
+x64-windows-static/include/boost/mpl/less_equal.hpp
+x64-windows-static/include/boost/mpl/limits/
+x64-windows-static/include/boost/mpl/limits/arity.hpp
+x64-windows-static/include/boost/mpl/limits/list.hpp
+x64-windows-static/include/boost/mpl/limits/map.hpp
+x64-windows-static/include/boost/mpl/limits/set.hpp
+x64-windows-static/include/boost/mpl/limits/string.hpp
+x64-windows-static/include/boost/mpl/limits/unrolling.hpp
+x64-windows-static/include/boost/mpl/limits/vector.hpp
+x64-windows-static/include/boost/mpl/list.hpp
+x64-windows-static/include/boost/mpl/list/
+x64-windows-static/include/boost/mpl/list/aux_/
+x64-windows-static/include/boost/mpl/list/aux_/O1_size.hpp
+x64-windows-static/include/boost/mpl/list/aux_/begin_end.hpp
+x64-windows-static/include/boost/mpl/list/aux_/clear.hpp
+x64-windows-static/include/boost/mpl/list/aux_/empty.hpp
+x64-windows-static/include/boost/mpl/list/aux_/front.hpp
+x64-windows-static/include/boost/mpl/list/aux_/include_preprocessed.hpp
+x64-windows-static/include/boost/mpl/list/aux_/item.hpp
+x64-windows-static/include/boost/mpl/list/aux_/iterator.hpp
+x64-windows-static/include/boost/mpl/list/aux_/numbered.hpp
+x64-windows-static/include/boost/mpl/list/aux_/numbered_c.hpp
+x64-windows-static/include/boost/mpl/list/aux_/pop_front.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list10.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list10_c.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list20.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list20_c.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list30.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list30_c.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list40.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list40_c.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list50.hpp
+x64-windows-static/include/boost/mpl/list/aux_/preprocessed/plain/list50_c.hpp
+x64-windows-static/include/boost/mpl/list/aux_/push_back.hpp
+x64-windows-static/include/boost/mpl/list/aux_/push_front.hpp
+x64-windows-static/include/boost/mpl/list/aux_/size.hpp
+x64-windows-static/include/boost/mpl/list/aux_/tag.hpp
+x64-windows-static/include/boost/mpl/list/list0.hpp
+x64-windows-static/include/boost/mpl/list/list0_c.hpp
+x64-windows-static/include/boost/mpl/list/list10.hpp
+x64-windows-static/include/boost/mpl/list/list10_c.hpp
+x64-windows-static/include/boost/mpl/list/list20.hpp
+x64-windows-static/include/boost/mpl/list/list20_c.hpp
+x64-windows-static/include/boost/mpl/list/list30.hpp
+x64-windows-static/include/boost/mpl/list/list30_c.hpp
+x64-windows-static/include/boost/mpl/list/list40.hpp
+x64-windows-static/include/boost/mpl/list/list40_c.hpp
+x64-windows-static/include/boost/mpl/list/list50.hpp
+x64-windows-static/include/boost/mpl/list/list50_c.hpp
+x64-windows-static/include/boost/mpl/list_c.hpp
+x64-windows-static/include/boost/mpl/logical.hpp
+x64-windows-static/include/boost/mpl/long.hpp
+x64-windows-static/include/boost/mpl/long_fwd.hpp
+x64-windows-static/include/boost/mpl/lower_bound.hpp
+x64-windows-static/include/boost/mpl/map.hpp
+x64-windows-static/include/boost/mpl/map/
+x64-windows-static/include/boost/mpl/map/aux_/
+x64-windows-static/include/boost/mpl/map/aux_/at_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/begin_end_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/clear_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/contains_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/empty_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/erase_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/erase_key_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/has_key_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/include_preprocessed.hpp
+x64-windows-static/include/boost/mpl/map/aux_/insert_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/insert_range_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/item.hpp
+x64-windows-static/include/boost/mpl/map/aux_/iterator.hpp
+x64-windows-static/include/boost/mpl/map/aux_/key_type_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/map0.hpp
+x64-windows-static/include/boost/mpl/map/aux_/numbered.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/no_ctps/
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/no_ctps/map10.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/no_ctps/map20.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/no_ctps/map30.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/no_ctps/map40.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/no_ctps/map50.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/plain/
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/plain/map10.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/plain/map20.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/plain/map30.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/plain/map40.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/plain/map50.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/typeof_based/
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/typeof_based/map10.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/typeof_based/map20.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/typeof_based/map30.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/typeof_based/map40.hpp
+x64-windows-static/include/boost/mpl/map/aux_/preprocessed/typeof_based/map50.hpp
+x64-windows-static/include/boost/mpl/map/aux_/size_impl.hpp
+x64-windows-static/include/boost/mpl/map/aux_/tag.hpp
+x64-windows-static/include/boost/mpl/map/aux_/value_type_impl.hpp
+x64-windows-static/include/boost/mpl/map/map0.hpp
+x64-windows-static/include/boost/mpl/map/map10.hpp
+x64-windows-static/include/boost/mpl/map/map20.hpp
+x64-windows-static/include/boost/mpl/map/map30.hpp
+x64-windows-static/include/boost/mpl/map/map40.hpp
+x64-windows-static/include/boost/mpl/map/map50.hpp
+x64-windows-static/include/boost/mpl/math/
+x64-windows-static/include/boost/mpl/math/fixed_c.hpp
+x64-windows-static/include/boost/mpl/math/is_even.hpp
+x64-windows-static/include/boost/mpl/math/rational_c.hpp
+x64-windows-static/include/boost/mpl/max.hpp
+x64-windows-static/include/boost/mpl/max_element.hpp
+x64-windows-static/include/boost/mpl/min.hpp
+x64-windows-static/include/boost/mpl/min_element.hpp
+x64-windows-static/include/boost/mpl/min_max.hpp
+x64-windows-static/include/boost/mpl/minus.hpp
+x64-windows-static/include/boost/mpl/modulus.hpp
+x64-windows-static/include/boost/mpl/multiplies.hpp
+x64-windows-static/include/boost/mpl/multiset/
+x64-windows-static/include/boost/mpl/multiset/aux_/
+x64-windows-static/include/boost/mpl/multiset/aux_/count_impl.hpp
+x64-windows-static/include/boost/mpl/multiset/aux_/insert_impl.hpp
+x64-windows-static/include/boost/mpl/multiset/aux_/item.hpp
+x64-windows-static/include/boost/mpl/multiset/aux_/multiset0.hpp
+x64-windows-static/include/boost/mpl/multiset/aux_/tag.hpp
+x64-windows-static/include/boost/mpl/multiset/multiset0.hpp
+x64-windows-static/include/boost/mpl/negate.hpp
+x64-windows-static/include/boost/mpl/next.hpp
+x64-windows-static/include/boost/mpl/next_prior.hpp
+x64-windows-static/include/boost/mpl/not.hpp
+x64-windows-static/include/boost/mpl/not_equal_to.hpp
+x64-windows-static/include/boost/mpl/numeric_cast.hpp
+x64-windows-static/include/boost/mpl/or.hpp
+x64-windows-static/include/boost/mpl/order.hpp
+x64-windows-static/include/boost/mpl/order_fwd.hpp
+x64-windows-static/include/boost/mpl/pair.hpp
+x64-windows-static/include/boost/mpl/pair_view.hpp
+x64-windows-static/include/boost/mpl/partition.hpp
+x64-windows-static/include/boost/mpl/placeholders.hpp
+x64-windows-static/include/boost/mpl/plus.hpp
+x64-windows-static/include/boost/mpl/pop_back.hpp
+x64-windows-static/include/boost/mpl/pop_back_fwd.hpp
+x64-windows-static/include/boost/mpl/pop_front.hpp
+x64-windows-static/include/boost/mpl/pop_front_fwd.hpp
+x64-windows-static/include/boost/mpl/print.hpp
+x64-windows-static/include/boost/mpl/prior.hpp
+x64-windows-static/include/boost/mpl/protect.hpp
+x64-windows-static/include/boost/mpl/push_back.hpp
+x64-windows-static/include/boost/mpl/push_back_fwd.hpp
+x64-windows-static/include/boost/mpl/push_front.hpp
+x64-windows-static/include/boost/mpl/push_front_fwd.hpp
+x64-windows-static/include/boost/mpl/quote.hpp
+x64-windows-static/include/boost/mpl/range_c.hpp
+x64-windows-static/include/boost/mpl/remove.hpp
+x64-windows-static/include/boost/mpl/remove_if.hpp
+x64-windows-static/include/boost/mpl/replace.hpp
+x64-windows-static/include/boost/mpl/replace_if.hpp
+x64-windows-static/include/boost/mpl/reverse.hpp
+x64-windows-static/include/boost/mpl/reverse_fold.hpp
+x64-windows-static/include/boost/mpl/reverse_iter_fold.hpp
+x64-windows-static/include/boost/mpl/same_as.hpp
+x64-windows-static/include/boost/mpl/sequence_tag.hpp
+x64-windows-static/include/boost/mpl/sequence_tag_fwd.hpp
+x64-windows-static/include/boost/mpl/set.hpp
+x64-windows-static/include/boost/mpl/set/
+x64-windows-static/include/boost/mpl/set/aux_/
+x64-windows-static/include/boost/mpl/set/aux_/at_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/begin_end_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/clear_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/empty_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/erase_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/erase_key_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/has_key_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/include_preprocessed.hpp
+x64-windows-static/include/boost/mpl/set/aux_/insert_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/insert_range_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/item.hpp
+x64-windows-static/include/boost/mpl/set/aux_/iterator.hpp
+x64-windows-static/include/boost/mpl/set/aux_/key_type_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/numbered.hpp
+x64-windows-static/include/boost/mpl/set/aux_/numbered_c.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set10.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set10_c.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set20.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set20_c.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set30.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set30_c.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set40.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set40_c.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set50.hpp
+x64-windows-static/include/boost/mpl/set/aux_/preprocessed/plain/set50_c.hpp
+x64-windows-static/include/boost/mpl/set/aux_/set0.hpp
+x64-windows-static/include/boost/mpl/set/aux_/size_impl.hpp
+x64-windows-static/include/boost/mpl/set/aux_/tag.hpp
+x64-windows-static/include/boost/mpl/set/aux_/value_type_impl.hpp
+x64-windows-static/include/boost/mpl/set/set0.hpp
+x64-windows-static/include/boost/mpl/set/set0_c.hpp
+x64-windows-static/include/boost/mpl/set/set10.hpp
+x64-windows-static/include/boost/mpl/set/set10_c.hpp
+x64-windows-static/include/boost/mpl/set/set20.hpp
+x64-windows-static/include/boost/mpl/set/set20_c.hpp
+x64-windows-static/include/boost/mpl/set/set30.hpp
+x64-windows-static/include/boost/mpl/set/set30_c.hpp
+x64-windows-static/include/boost/mpl/set/set40.hpp
+x64-windows-static/include/boost/mpl/set/set40_c.hpp
+x64-windows-static/include/boost/mpl/set/set50.hpp
+x64-windows-static/include/boost/mpl/set/set50_c.hpp
+x64-windows-static/include/boost/mpl/set_c.hpp
+x64-windows-static/include/boost/mpl/shift_left.hpp
+x64-windows-static/include/boost/mpl/shift_right.hpp
+x64-windows-static/include/boost/mpl/single_view.hpp
+x64-windows-static/include/boost/mpl/size.hpp
+x64-windows-static/include/boost/mpl/size_fwd.hpp
+x64-windows-static/include/boost/mpl/size_t.hpp
+x64-windows-static/include/boost/mpl/size_t_fwd.hpp
+x64-windows-static/include/boost/mpl/sizeof.hpp
+x64-windows-static/include/boost/mpl/sort.hpp
+x64-windows-static/include/boost/mpl/stable_partition.hpp
+x64-windows-static/include/boost/mpl/string.hpp
+x64-windows-static/include/boost/mpl/switch.hpp
+x64-windows-static/include/boost/mpl/tag.hpp
+x64-windows-static/include/boost/mpl/times.hpp
+x64-windows-static/include/boost/mpl/transform.hpp
+x64-windows-static/include/boost/mpl/transform_view.hpp
+x64-windows-static/include/boost/mpl/unique.hpp
+x64-windows-static/include/boost/mpl/unpack_args.hpp
+x64-windows-static/include/boost/mpl/upper_bound.hpp
+x64-windows-static/include/boost/mpl/value_type.hpp
+x64-windows-static/include/boost/mpl/value_type_fwd.hpp
+x64-windows-static/include/boost/mpl/vector.hpp
+x64-windows-static/include/boost/mpl/vector/
+x64-windows-static/include/boost/mpl/vector/aux_/
+x64-windows-static/include/boost/mpl/vector/aux_/O1_size.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/at.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/back.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/begin_end.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/clear.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/empty.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/front.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/include_preprocessed.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/item.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/iterator.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/numbered.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/numbered_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/pop_back.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/pop_front.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector10_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector20_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector30.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector30_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector40.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector40_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector50.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/plain/vector50_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50_c.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/push_back.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/push_front.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/size.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/tag.hpp
+x64-windows-static/include/boost/mpl/vector/aux_/vector0.hpp
+x64-windows-static/include/boost/mpl/vector/vector0.hpp
+x64-windows-static/include/boost/mpl/vector/vector0_c.hpp
+x64-windows-static/include/boost/mpl/vector/vector10.hpp
+x64-windows-static/include/boost/mpl/vector/vector10_c.hpp
+x64-windows-static/include/boost/mpl/vector/vector20.hpp
+x64-windows-static/include/boost/mpl/vector/vector20_c.hpp
+x64-windows-static/include/boost/mpl/vector/vector30.hpp
+x64-windows-static/include/boost/mpl/vector/vector30_c.hpp
+x64-windows-static/include/boost/mpl/vector/vector40.hpp
+x64-windows-static/include/boost/mpl/vector/vector40_c.hpp
+x64-windows-static/include/boost/mpl/vector/vector50.hpp
+x64-windows-static/include/boost/mpl/vector/vector50_c.hpp
+x64-windows-static/include/boost/mpl/vector_c.hpp
+x64-windows-static/include/boost/mpl/void.hpp
+x64-windows-static/include/boost/mpl/void_fwd.hpp
+x64-windows-static/include/boost/mpl/zip_view.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-mpl/
+x64-windows-static/share/boost-mpl/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,83 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/multi_index/
+x64-windows/include/boost/multi_index/composite_key.hpp
+x64-windows/include/boost/multi_index/detail/
+x64-windows/include/boost/multi_index/detail/access_specifier.hpp
+x64-windows/include/boost/multi_index/detail/adl_swap.hpp
+x64-windows/include/boost/multi_index/detail/archive_constructed.hpp
+x64-windows/include/boost/multi_index/detail/auto_space.hpp
+x64-windows/include/boost/multi_index/detail/base_type.hpp
+x64-windows/include/boost/multi_index/detail/bidir_node_iterator.hpp
+x64-windows/include/boost/multi_index/detail/bucket_array.hpp
+x64-windows/include/boost/multi_index/detail/cons_stdtuple.hpp
+x64-windows/include/boost/multi_index/detail/converter.hpp
+x64-windows/include/boost/multi_index/detail/copy_map.hpp
+x64-windows/include/boost/multi_index/detail/do_not_copy_elements_tag.hpp
+x64-windows/include/boost/multi_index/detail/duplicates_iterator.hpp
+x64-windows/include/boost/multi_index/detail/has_tag.hpp
+x64-windows/include/boost/multi_index/detail/hash_index_args.hpp
+x64-windows/include/boost/multi_index/detail/hash_index_iterator.hpp
+x64-windows/include/boost/multi_index/detail/hash_index_node.hpp
+x64-windows/include/boost/multi_index/detail/header_holder.hpp
+x64-windows/include/boost/multi_index/detail/ignore_wstrict_aliasing.hpp
+x64-windows/include/boost/multi_index/detail/index_base.hpp
+x64-windows/include/boost/multi_index/detail/index_loader.hpp
+x64-windows/include/boost/multi_index/detail/index_matcher.hpp
+x64-windows/include/boost/multi_index/detail/index_node_base.hpp
+x64-windows/include/boost/multi_index/detail/index_saver.hpp
+x64-windows/include/boost/multi_index/detail/invariant_assert.hpp
+x64-windows/include/boost/multi_index/detail/is_index_list.hpp
+x64-windows/include/boost/multi_index/detail/is_transparent.hpp
+x64-windows/include/boost/multi_index/detail/iter_adaptor.hpp
+x64-windows/include/boost/multi_index/detail/modify_key_adaptor.hpp
+x64-windows/include/boost/multi_index/detail/no_duplicate_tags.hpp
+x64-windows/include/boost/multi_index/detail/node_type.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_args.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_impl.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_impl_fwd.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_node.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_ops.hpp
+x64-windows/include/boost/multi_index/detail/promotes_arg.hpp
+x64-windows/include/boost/multi_index/detail/raw_ptr.hpp
+x64-windows/include/boost/multi_index/detail/restore_wstrict_aliasing.hpp
+x64-windows/include/boost/multi_index/detail/rnd_index_loader.hpp
+x64-windows/include/boost/multi_index/detail/rnd_index_node.hpp
+x64-windows/include/boost/multi_index/detail/rnd_index_ops.hpp
+x64-windows/include/boost/multi_index/detail/rnd_index_ptr_array.hpp
+x64-windows/include/boost/multi_index/detail/rnd_node_iterator.hpp
+x64-windows/include/boost/multi_index/detail/rnk_index_ops.hpp
+x64-windows/include/boost/multi_index/detail/safe_mode.hpp
+x64-windows/include/boost/multi_index/detail/scope_guard.hpp
+x64-windows/include/boost/multi_index/detail/seq_index_node.hpp
+x64-windows/include/boost/multi_index/detail/seq_index_ops.hpp
+x64-windows/include/boost/multi_index/detail/serialization_version.hpp
+x64-windows/include/boost/multi_index/detail/uintptr_type.hpp
+x64-windows/include/boost/multi_index/detail/unbounded.hpp
+x64-windows/include/boost/multi_index/detail/value_compare.hpp
+x64-windows/include/boost/multi_index/detail/vartempl_support.hpp
+x64-windows/include/boost/multi_index/global_fun.hpp
+x64-windows/include/boost/multi_index/hashed_index.hpp
+x64-windows/include/boost/multi_index/hashed_index_fwd.hpp
+x64-windows/include/boost/multi_index/identity.hpp
+x64-windows/include/boost/multi_index/identity_fwd.hpp
+x64-windows/include/boost/multi_index/indexed_by.hpp
+x64-windows/include/boost/multi_index/key_extractors.hpp
+x64-windows/include/boost/multi_index/mem_fun.hpp
+x64-windows/include/boost/multi_index/member.hpp
+x64-windows/include/boost/multi_index/ordered_index.hpp
+x64-windows/include/boost/multi_index/ordered_index_fwd.hpp
+x64-windows/include/boost/multi_index/random_access_index.hpp
+x64-windows/include/boost/multi_index/random_access_index_fwd.hpp
+x64-windows/include/boost/multi_index/ranked_index.hpp
+x64-windows/include/boost/multi_index/ranked_index_fwd.hpp
+x64-windows/include/boost/multi_index/safe_mode_errors.hpp
+x64-windows/include/boost/multi_index/sequenced_index.hpp
+x64-windows/include/boost/multi_index/sequenced_index_fwd.hpp
+x64-windows/include/boost/multi_index/tag.hpp
+x64-windows/include/boost/multi_index_container.hpp
+x64-windows/include/boost/multi_index_container_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-multi-index/
+x64-windows/share/boost-multi-index/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,83 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/multi_index/
+x64-windows-static/include/boost/multi_index/composite_key.hpp
+x64-windows-static/include/boost/multi_index/detail/
+x64-windows-static/include/boost/multi_index/detail/access_specifier.hpp
+x64-windows-static/include/boost/multi_index/detail/adl_swap.hpp
+x64-windows-static/include/boost/multi_index/detail/archive_constructed.hpp
+x64-windows-static/include/boost/multi_index/detail/auto_space.hpp
+x64-windows-static/include/boost/multi_index/detail/base_type.hpp
+x64-windows-static/include/boost/multi_index/detail/bidir_node_iterator.hpp
+x64-windows-static/include/boost/multi_index/detail/bucket_array.hpp
+x64-windows-static/include/boost/multi_index/detail/cons_stdtuple.hpp
+x64-windows-static/include/boost/multi_index/detail/converter.hpp
+x64-windows-static/include/boost/multi_index/detail/copy_map.hpp
+x64-windows-static/include/boost/multi_index/detail/do_not_copy_elements_tag.hpp
+x64-windows-static/include/boost/multi_index/detail/duplicates_iterator.hpp
+x64-windows-static/include/boost/multi_index/detail/has_tag.hpp
+x64-windows-static/include/boost/multi_index/detail/hash_index_args.hpp
+x64-windows-static/include/boost/multi_index/detail/hash_index_iterator.hpp
+x64-windows-static/include/boost/multi_index/detail/hash_index_node.hpp
+x64-windows-static/include/boost/multi_index/detail/header_holder.hpp
+x64-windows-static/include/boost/multi_index/detail/ignore_wstrict_aliasing.hpp
+x64-windows-static/include/boost/multi_index/detail/index_base.hpp
+x64-windows-static/include/boost/multi_index/detail/index_loader.hpp
+x64-windows-static/include/boost/multi_index/detail/index_matcher.hpp
+x64-windows-static/include/boost/multi_index/detail/index_node_base.hpp
+x64-windows-static/include/boost/multi_index/detail/index_saver.hpp
+x64-windows-static/include/boost/multi_index/detail/invariant_assert.hpp
+x64-windows-static/include/boost/multi_index/detail/is_index_list.hpp
+x64-windows-static/include/boost/multi_index/detail/is_transparent.hpp
+x64-windows-static/include/boost/multi_index/detail/iter_adaptor.hpp
+x64-windows-static/include/boost/multi_index/detail/modify_key_adaptor.hpp
+x64-windows-static/include/boost/multi_index/detail/no_duplicate_tags.hpp
+x64-windows-static/include/boost/multi_index/detail/node_type.hpp
+x64-windows-static/include/boost/multi_index/detail/ord_index_args.hpp
+x64-windows-static/include/boost/multi_index/detail/ord_index_impl.hpp
+x64-windows-static/include/boost/multi_index/detail/ord_index_impl_fwd.hpp
+x64-windows-static/include/boost/multi_index/detail/ord_index_node.hpp
+x64-windows-static/include/boost/multi_index/detail/ord_index_ops.hpp
+x64-windows-static/include/boost/multi_index/detail/promotes_arg.hpp
+x64-windows-static/include/boost/multi_index/detail/raw_ptr.hpp
+x64-windows-static/include/boost/multi_index/detail/restore_wstrict_aliasing.hpp
+x64-windows-static/include/boost/multi_index/detail/rnd_index_loader.hpp
+x64-windows-static/include/boost/multi_index/detail/rnd_index_node.hpp
+x64-windows-static/include/boost/multi_index/detail/rnd_index_ops.hpp
+x64-windows-static/include/boost/multi_index/detail/rnd_index_ptr_array.hpp
+x64-windows-static/include/boost/multi_index/detail/rnd_node_iterator.hpp
+x64-windows-static/include/boost/multi_index/detail/rnk_index_ops.hpp
+x64-windows-static/include/boost/multi_index/detail/safe_mode.hpp
+x64-windows-static/include/boost/multi_index/detail/scope_guard.hpp
+x64-windows-static/include/boost/multi_index/detail/seq_index_node.hpp
+x64-windows-static/include/boost/multi_index/detail/seq_index_ops.hpp
+x64-windows-static/include/boost/multi_index/detail/serialization_version.hpp
+x64-windows-static/include/boost/multi_index/detail/uintptr_type.hpp
+x64-windows-static/include/boost/multi_index/detail/unbounded.hpp
+x64-windows-static/include/boost/multi_index/detail/value_compare.hpp
+x64-windows-static/include/boost/multi_index/detail/vartempl_support.hpp
+x64-windows-static/include/boost/multi_index/global_fun.hpp
+x64-windows-static/include/boost/multi_index/hashed_index.hpp
+x64-windows-static/include/boost/multi_index/hashed_index_fwd.hpp
+x64-windows-static/include/boost/multi_index/identity.hpp
+x64-windows-static/include/boost/multi_index/identity_fwd.hpp
+x64-windows-static/include/boost/multi_index/indexed_by.hpp
+x64-windows-static/include/boost/multi_index/key_extractors.hpp
+x64-windows-static/include/boost/multi_index/mem_fun.hpp
+x64-windows-static/include/boost/multi_index/member.hpp
+x64-windows-static/include/boost/multi_index/ordered_index.hpp
+x64-windows-static/include/boost/multi_index/ordered_index_fwd.hpp
+x64-windows-static/include/boost/multi_index/random_access_index.hpp
+x64-windows-static/include/boost/multi_index/random_access_index_fwd.hpp
+x64-windows-static/include/boost/multi_index/ranked_index.hpp
+x64-windows-static/include/boost/multi_index/ranked_index_fwd.hpp
+x64-windows-static/include/boost/multi_index/safe_mode_errors.hpp
+x64-windows-static/include/boost/multi_index/sequenced_index.hpp
+x64-windows-static/include/boost/multi_index/sequenced_index_fwd.hpp
+x64-windows-static/include/boost/multi_index/tag.hpp
+x64-windows-static/include/boost/multi_index_container.hpp
+x64-windows-static/include/boost/multi_index_container_fwd.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-multi-index/
+x64-windows-static/share/boost-multi-index/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,68 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/multiprecision/
+x64-windows/include/boost/multiprecision/concepts/
+x64-windows/include/boost/multiprecision/concepts/mp_number_archetypes.hpp
+x64-windows/include/boost/multiprecision/cpp_bin_float.hpp
+x64-windows/include/boost/multiprecision/cpp_bin_float/
+x64-windows/include/boost/multiprecision/cpp_bin_float/io.hpp
+x64-windows/include/boost/multiprecision/cpp_bin_float/transcendental.hpp
+x64-windows/include/boost/multiprecision/cpp_dec_float.hpp
+x64-windows/include/boost/multiprecision/cpp_int.hpp
+x64-windows/include/boost/multiprecision/cpp_int/
+x64-windows/include/boost/multiprecision/cpp_int/add.hpp
+x64-windows/include/boost/multiprecision/cpp_int/bitwise.hpp
+x64-windows/include/boost/multiprecision/cpp_int/checked.hpp
+x64-windows/include/boost/multiprecision/cpp_int/comparison.hpp
+x64-windows/include/boost/multiprecision/cpp_int/cpp_int_config.hpp
+x64-windows/include/boost/multiprecision/cpp_int/divide.hpp
+x64-windows/include/boost/multiprecision/cpp_int/import_export.hpp
+x64-windows/include/boost/multiprecision/cpp_int/limits.hpp
+x64-windows/include/boost/multiprecision/cpp_int/literals.hpp
+x64-windows/include/boost/multiprecision/cpp_int/misc.hpp
+x64-windows/include/boost/multiprecision/cpp_int/multiply.hpp
+x64-windows/include/boost/multiprecision/cpp_int/serialize.hpp
+x64-windows/include/boost/multiprecision/cpp_int/value_pack.hpp
+x64-windows/include/boost/multiprecision/debug_adaptor.hpp
+x64-windows/include/boost/multiprecision/detail/
+x64-windows/include/boost/multiprecision/detail/big_lanczos.hpp
+x64-windows/include/boost/multiprecision/detail/bitscan.hpp
+x64-windows/include/boost/multiprecision/detail/default_ops.hpp
+x64-windows/include/boost/multiprecision/detail/digits.hpp
+x64-windows/include/boost/multiprecision/detail/dynamic_array.hpp
+x64-windows/include/boost/multiprecision/detail/et_ops.hpp
+x64-windows/include/boost/multiprecision/detail/float_string_cvt.hpp
+x64-windows/include/boost/multiprecision/detail/functions/
+x64-windows/include/boost/multiprecision/detail/functions/constants.hpp
+x64-windows/include/boost/multiprecision/detail/functions/pow.hpp
+x64-windows/include/boost/multiprecision/detail/functions/trig.hpp
+x64-windows/include/boost/multiprecision/detail/generic_interconvert.hpp
+x64-windows/include/boost/multiprecision/detail/integer_ops.hpp
+x64-windows/include/boost/multiprecision/detail/min_max.hpp
+x64-windows/include/boost/multiprecision/detail/no_et_ops.hpp
+x64-windows/include/boost/multiprecision/detail/number_base.hpp
+x64-windows/include/boost/multiprecision/detail/number_compare.hpp
+x64-windows/include/boost/multiprecision/detail/rebind.hpp
+x64-windows/include/boost/multiprecision/detail/ublas_interop.hpp
+x64-windows/include/boost/multiprecision/detail/utype_helper.hpp
+x64-windows/include/boost/multiprecision/float128.hpp
+x64-windows/include/boost/multiprecision/gmp.hpp
+x64-windows/include/boost/multiprecision/integer.hpp
+x64-windows/include/boost/multiprecision/logged_adaptor.hpp
+x64-windows/include/boost/multiprecision/miller_rabin.hpp
+x64-windows/include/boost/multiprecision/mpfi.hpp
+x64-windows/include/boost/multiprecision/mpfr.hpp
+x64-windows/include/boost/multiprecision/number.hpp
+x64-windows/include/boost/multiprecision/random.hpp
+x64-windows/include/boost/multiprecision/rational_adaptor.hpp
+x64-windows/include/boost/multiprecision/tommath.hpp
+x64-windows/include/boost/multiprecision/traits/
+x64-windows/include/boost/multiprecision/traits/explicit_conversion.hpp
+x64-windows/include/boost/multiprecision/traits/extract_exponent_type.hpp
+x64-windows/include/boost/multiprecision/traits/is_backend.hpp
+x64-windows/include/boost/multiprecision/traits/is_byte_container.hpp
+x64-windows/include/boost/multiprecision/traits/is_restricted_conversion.hpp
+x64-windows/share/
+x64-windows/share/boost-multiprecision/
+x64-windows/share/boost-multiprecision/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,68 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/multiprecision/
+x64-windows-static/include/boost/multiprecision/concepts/
+x64-windows-static/include/boost/multiprecision/concepts/mp_number_archetypes.hpp
+x64-windows-static/include/boost/multiprecision/cpp_bin_float.hpp
+x64-windows-static/include/boost/multiprecision/cpp_bin_float/
+x64-windows-static/include/boost/multiprecision/cpp_bin_float/io.hpp
+x64-windows-static/include/boost/multiprecision/cpp_bin_float/transcendental.hpp
+x64-windows-static/include/boost/multiprecision/cpp_dec_float.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/
+x64-windows-static/include/boost/multiprecision/cpp_int/add.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/bitwise.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/checked.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/comparison.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/cpp_int_config.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/divide.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/import_export.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/limits.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/literals.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/misc.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/multiply.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/serialize.hpp
+x64-windows-static/include/boost/multiprecision/cpp_int/value_pack.hpp
+x64-windows-static/include/boost/multiprecision/debug_adaptor.hpp
+x64-windows-static/include/boost/multiprecision/detail/
+x64-windows-static/include/boost/multiprecision/detail/big_lanczos.hpp
+x64-windows-static/include/boost/multiprecision/detail/bitscan.hpp
+x64-windows-static/include/boost/multiprecision/detail/default_ops.hpp
+x64-windows-static/include/boost/multiprecision/detail/digits.hpp
+x64-windows-static/include/boost/multiprecision/detail/dynamic_array.hpp
+x64-windows-static/include/boost/multiprecision/detail/et_ops.hpp
+x64-windows-static/include/boost/multiprecision/detail/float_string_cvt.hpp
+x64-windows-static/include/boost/multiprecision/detail/functions/
+x64-windows-static/include/boost/multiprecision/detail/functions/constants.hpp
+x64-windows-static/include/boost/multiprecision/detail/functions/pow.hpp
+x64-windows-static/include/boost/multiprecision/detail/functions/trig.hpp
+x64-windows-static/include/boost/multiprecision/detail/generic_interconvert.hpp
+x64-windows-static/include/boost/multiprecision/detail/integer_ops.hpp
+x64-windows-static/include/boost/multiprecision/detail/min_max.hpp
+x64-windows-static/include/boost/multiprecision/detail/no_et_ops.hpp
+x64-windows-static/include/boost/multiprecision/detail/number_base.hpp
+x64-windows-static/include/boost/multiprecision/detail/number_compare.hpp
+x64-windows-static/include/boost/multiprecision/detail/rebind.hpp
+x64-windows-static/include/boost/multiprecision/detail/ublas_interop.hpp
+x64-windows-static/include/boost/multiprecision/detail/utype_helper.hpp
+x64-windows-static/include/boost/multiprecision/float128.hpp
+x64-windows-static/include/boost/multiprecision/gmp.hpp
+x64-windows-static/include/boost/multiprecision/integer.hpp
+x64-windows-static/include/boost/multiprecision/logged_adaptor.hpp
+x64-windows-static/include/boost/multiprecision/miller_rabin.hpp
+x64-windows-static/include/boost/multiprecision/mpfi.hpp
+x64-windows-static/include/boost/multiprecision/mpfr.hpp
+x64-windows-static/include/boost/multiprecision/number.hpp
+x64-windows-static/include/boost/multiprecision/random.hpp
+x64-windows-static/include/boost/multiprecision/rational_adaptor.hpp
+x64-windows-static/include/boost/multiprecision/tommath.hpp
+x64-windows-static/include/boost/multiprecision/traits/
+x64-windows-static/include/boost/multiprecision/traits/explicit_conversion.hpp
+x64-windows-static/include/boost/multiprecision/traits/extract_exponent_type.hpp
+x64-windows-static/include/boost/multiprecision/traits/is_backend.hpp
+x64-windows-static/include/boost/multiprecision/traits/is_byte_container.hpp
+x64-windows-static/include/boost/multiprecision/traits/is_restricted_conversion.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-multiprecision/
+x64-windows-static/share/boost-multiprecision/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/cast.hpp
+x64-windows/include/boost/numeric/
+x64-windows/include/boost/numeric/conversion/
+x64-windows/include/boost/numeric/conversion/bounds.hpp
+x64-windows/include/boost/numeric/conversion/cast.hpp
+x64-windows/include/boost/numeric/conversion/conversion_traits.hpp
+x64-windows/include/boost/numeric/conversion/converter.hpp
+x64-windows/include/boost/numeric/conversion/converter_policies.hpp
+x64-windows/include/boost/numeric/conversion/detail/
+x64-windows/include/boost/numeric/conversion/detail/bounds.hpp
+x64-windows/include/boost/numeric/conversion/detail/conversion_traits.hpp
+x64-windows/include/boost/numeric/conversion/detail/converter.hpp
+x64-windows/include/boost/numeric/conversion/detail/int_float_mixture.hpp
+x64-windows/include/boost/numeric/conversion/detail/is_subranged.hpp
+x64-windows/include/boost/numeric/conversion/detail/meta.hpp
+x64-windows/include/boost/numeric/conversion/detail/numeric_cast_traits.hpp
+x64-windows/include/boost/numeric/conversion/detail/old_numeric_cast.hpp
+x64-windows/include/boost/numeric/conversion/detail/preprocessed/
+x64-windows/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp
+x64-windows/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp
+x64-windows/include/boost/numeric/conversion/detail/sign_mixture.hpp
+x64-windows/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
+x64-windows/include/boost/numeric/conversion/int_float_mixture.hpp
+x64-windows/include/boost/numeric/conversion/int_float_mixture_enum.hpp
+x64-windows/include/boost/numeric/conversion/is_subranged.hpp
+x64-windows/include/boost/numeric/conversion/numeric_cast_traits.hpp
+x64-windows/include/boost/numeric/conversion/sign_mixture.hpp
+x64-windows/include/boost/numeric/conversion/sign_mixture_enum.hpp
+x64-windows/include/boost/numeric/conversion/udt_builtin_mixture.hpp
+x64-windows/include/boost/numeric/conversion/udt_builtin_mixture_enum.hpp
+x64-windows/share/
+x64-windows/share/boost-numeric-conversion/
+x64-windows/share/boost-numeric-conversion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/cast.hpp
+x64-windows-static/include/boost/numeric/
+x64-windows-static/include/boost/numeric/conversion/
+x64-windows-static/include/boost/numeric/conversion/bounds.hpp
+x64-windows-static/include/boost/numeric/conversion/cast.hpp
+x64-windows-static/include/boost/numeric/conversion/conversion_traits.hpp
+x64-windows-static/include/boost/numeric/conversion/converter.hpp
+x64-windows-static/include/boost/numeric/conversion/converter_policies.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/
+x64-windows-static/include/boost/numeric/conversion/detail/bounds.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/conversion_traits.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/converter.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/int_float_mixture.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/is_subranged.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/meta.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/numeric_cast_traits.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/old_numeric_cast.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/preprocessed/
+x64-windows-static/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/sign_mixture.hpp
+x64-windows-static/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
+x64-windows-static/include/boost/numeric/conversion/int_float_mixture.hpp
+x64-windows-static/include/boost/numeric/conversion/int_float_mixture_enum.hpp
+x64-windows-static/include/boost/numeric/conversion/is_subranged.hpp
+x64-windows-static/include/boost/numeric/conversion/numeric_cast_traits.hpp
+x64-windows-static/include/boost/numeric/conversion/sign_mixture.hpp
+x64-windows-static/include/boost/numeric/conversion/sign_mixture_enum.hpp
+x64-windows-static/include/boost/numeric/conversion/udt_builtin_mixture.hpp
+x64-windows-static/include/boost/numeric/conversion/udt_builtin_mixture_enum.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-numeric-conversion/
+x64-windows-static/share/boost-numeric-conversion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/none.hpp
+x64-windows/include/boost/none_t.hpp
+x64-windows/include/boost/optional.hpp
+x64-windows/include/boost/optional/
+x64-windows/include/boost/optional/bad_optional_access.hpp
+x64-windows/include/boost/optional/detail/
+x64-windows/include/boost/optional/detail/experimental_traits.hpp
+x64-windows/include/boost/optional/detail/old_optional_implementation.hpp
+x64-windows/include/boost/optional/detail/optional_aligned_storage.hpp
+x64-windows/include/boost/optional/detail/optional_config.hpp
+x64-windows/include/boost/optional/detail/optional_factory_support.hpp
+x64-windows/include/boost/optional/detail/optional_reference_spec.hpp
+x64-windows/include/boost/optional/detail/optional_relops.hpp
+x64-windows/include/boost/optional/detail/optional_swap.hpp
+x64-windows/include/boost/optional/detail/optional_trivially_copyable_base.hpp
+x64-windows/include/boost/optional/optional.hpp
+x64-windows/include/boost/optional/optional_fwd.hpp
+x64-windows/include/boost/optional/optional_io.hpp
+x64-windows/share/
+x64-windows/share/boost-optional/
+x64-windows/share/boost-optional/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-optional_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/none.hpp
+x64-windows-static/include/boost/none_t.hpp
+x64-windows-static/include/boost/optional.hpp
+x64-windows-static/include/boost/optional/
+x64-windows-static/include/boost/optional/bad_optional_access.hpp
+x64-windows-static/include/boost/optional/detail/
+x64-windows-static/include/boost/optional/detail/experimental_traits.hpp
+x64-windows-static/include/boost/optional/detail/old_optional_implementation.hpp
+x64-windows-static/include/boost/optional/detail/optional_aligned_storage.hpp
+x64-windows-static/include/boost/optional/detail/optional_config.hpp
+x64-windows-static/include/boost/optional/detail/optional_factory_support.hpp
+x64-windows-static/include/boost/optional/detail/optional_reference_spec.hpp
+x64-windows-static/include/boost/optional/detail/optional_relops.hpp
+x64-windows-static/include/boost/optional/detail/optional_swap.hpp
+x64-windows-static/include/boost/optional/detail/optional_trivially_copyable_base.hpp
+x64-windows-static/include/boost/optional/optional.hpp
+x64-windows-static/include/boost/optional/optional_fwd.hpp
+x64-windows-static/include/boost/optional/optional_io.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-optional/
+x64-windows-static/share/boost-optional/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/parameter.hpp
+x64-windows/include/boost/parameter/
+x64-windows/include/boost/parameter/aux_/
+x64-windows/include/boost/parameter/aux_/arg_list.hpp
+x64-windows/include/boost/parameter/aux_/cast.hpp
+x64-windows/include/boost/parameter/aux_/default.hpp
+x64-windows/include/boost/parameter/aux_/is_maybe.hpp
+x64-windows/include/boost/parameter/aux_/maybe.hpp
+x64-windows/include/boost/parameter/aux_/overloads.hpp
+x64-windows/include/boost/parameter/aux_/parameter_requirements.hpp
+x64-windows/include/boost/parameter/aux_/parenthesized_type.hpp
+x64-windows/include/boost/parameter/aux_/preprocessor/
+x64-windows/include/boost/parameter/aux_/preprocessor/flatten.hpp
+x64-windows/include/boost/parameter/aux_/preprocessor/for_each.hpp
+x64-windows/include/boost/parameter/aux_/python/
+x64-windows/include/boost/parameter/aux_/python/invoker.hpp
+x64-windows/include/boost/parameter/aux_/python/invoker_iterate.hpp
+x64-windows/include/boost/parameter/aux_/result_of0.hpp
+x64-windows/include/boost/parameter/aux_/set.hpp
+x64-windows/include/boost/parameter/aux_/tag.hpp
+x64-windows/include/boost/parameter/aux_/tagged_argument.hpp
+x64-windows/include/boost/parameter/aux_/template_keyword.hpp
+x64-windows/include/boost/parameter/aux_/unwrap_cv_reference.hpp
+x64-windows/include/boost/parameter/aux_/void.hpp
+x64-windows/include/boost/parameter/aux_/yesno.hpp
+x64-windows/include/boost/parameter/binding.hpp
+x64-windows/include/boost/parameter/config.hpp
+x64-windows/include/boost/parameter/keyword.hpp
+x64-windows/include/boost/parameter/macros.hpp
+x64-windows/include/boost/parameter/match.hpp
+x64-windows/include/boost/parameter/name.hpp
+x64-windows/include/boost/parameter/parameters.hpp
+x64-windows/include/boost/parameter/preprocessor.hpp
+x64-windows/include/boost/parameter/python.hpp
+x64-windows/include/boost/parameter/value_type.hpp
+x64-windows/share/
+x64-windows/share/boost-parameter/
+x64-windows/share/boost-parameter/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/parameter.hpp
+x64-windows-static/include/boost/parameter/
+x64-windows-static/include/boost/parameter/aux_/
+x64-windows-static/include/boost/parameter/aux_/arg_list.hpp
+x64-windows-static/include/boost/parameter/aux_/cast.hpp
+x64-windows-static/include/boost/parameter/aux_/default.hpp
+x64-windows-static/include/boost/parameter/aux_/is_maybe.hpp
+x64-windows-static/include/boost/parameter/aux_/maybe.hpp
+x64-windows-static/include/boost/parameter/aux_/overloads.hpp
+x64-windows-static/include/boost/parameter/aux_/parameter_requirements.hpp
+x64-windows-static/include/boost/parameter/aux_/parenthesized_type.hpp
+x64-windows-static/include/boost/parameter/aux_/preprocessor/
+x64-windows-static/include/boost/parameter/aux_/preprocessor/flatten.hpp
+x64-windows-static/include/boost/parameter/aux_/preprocessor/for_each.hpp
+x64-windows-static/include/boost/parameter/aux_/python/
+x64-windows-static/include/boost/parameter/aux_/python/invoker.hpp
+x64-windows-static/include/boost/parameter/aux_/python/invoker_iterate.hpp
+x64-windows-static/include/boost/parameter/aux_/result_of0.hpp
+x64-windows-static/include/boost/parameter/aux_/set.hpp
+x64-windows-static/include/boost/parameter/aux_/tag.hpp
+x64-windows-static/include/boost/parameter/aux_/tagged_argument.hpp
+x64-windows-static/include/boost/parameter/aux_/template_keyword.hpp
+x64-windows-static/include/boost/parameter/aux_/unwrap_cv_reference.hpp
+x64-windows-static/include/boost/parameter/aux_/void.hpp
+x64-windows-static/include/boost/parameter/aux_/yesno.hpp
+x64-windows-static/include/boost/parameter/binding.hpp
+x64-windows-static/include/boost/parameter/config.hpp
+x64-windows-static/include/boost/parameter/keyword.hpp
+x64-windows-static/include/boost/parameter/macros.hpp
+x64-windows-static/include/boost/parameter/match.hpp
+x64-windows-static/include/boost/parameter/name.hpp
+x64-windows-static/include/boost/parameter/parameters.hpp
+x64-windows-static/include/boost/parameter/preprocessor.hpp
+x64-windows-static/include/boost/parameter/python.hpp
+x64-windows-static/include/boost/parameter/value_type.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-parameter/
+x64-windows-static/share/boost-parameter/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,393 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/phoenix.hpp
+x64-windows/include/boost/phoenix/
+x64-windows/include/boost/phoenix/bind.hpp
+x64-windows/include/boost/phoenix/bind/
+x64-windows/include/boost/phoenix/bind/bind_function.hpp
+x64-windows/include/boost/phoenix/bind/bind_function_object.hpp
+x64-windows/include/boost/phoenix/bind/bind_member_function.hpp
+x64-windows/include/boost/phoenix/bind/bind_member_variable.hpp
+x64-windows/include/boost/phoenix/bind/detail/
+x64-windows/include/boost/phoenix/bind/detail/cpp03/
+x64-windows/include/boost/phoenix/bind/detail/cpp03/bind_function.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/bind_function_object.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/bind_member_function.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/function_ptr.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/member_function_ptr.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/member_variable.hpp
+x64-windows/include/boost/phoenix/config.hpp
+x64-windows/include/boost/phoenix/core.hpp
+x64-windows/include/boost/phoenix/core/
+x64-windows/include/boost/phoenix/core/actor.hpp
+x64-windows/include/boost/phoenix/core/argument.hpp
+x64-windows/include/boost/phoenix/core/arity.hpp
+x64-windows/include/boost/phoenix/core/as_actor.hpp
+x64-windows/include/boost/phoenix/core/call.hpp
+x64-windows/include/boost/phoenix/core/debug.hpp
+x64-windows/include/boost/phoenix/core/detail/
+x64-windows/include/boost/phoenix/core/detail/argument.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/
+x64-windows/include/boost/phoenix/core/detail/cpp03/actor_operator.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/actor_result_of.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/call.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/expression.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/function_equal.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/function_eval.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/function_eval_expr.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/phx2_result.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_50.hpp
+x64-windows/include/boost/phoenix/core/detail/expression.hpp
+x64-windows/include/boost/phoenix/core/detail/function_eval.hpp
+x64-windows/include/boost/phoenix/core/detail/index_sequence.hpp
+x64-windows/include/boost/phoenix/core/detail/phx2_result.hpp
+x64-windows/include/boost/phoenix/core/domain.hpp
+x64-windows/include/boost/phoenix/core/environment.hpp
+x64-windows/include/boost/phoenix/core/expression.hpp
+x64-windows/include/boost/phoenix/core/function_equal.hpp
+x64-windows/include/boost/phoenix/core/is_actor.hpp
+x64-windows/include/boost/phoenix/core/is_nullary.hpp
+x64-windows/include/boost/phoenix/core/is_value.hpp
+x64-windows/include/boost/phoenix/core/limits.hpp
+x64-windows/include/boost/phoenix/core/meta_grammar.hpp
+x64-windows/include/boost/phoenix/core/nothing.hpp
+x64-windows/include/boost/phoenix/core/reference.hpp
+x64-windows/include/boost/phoenix/core/terminal.hpp
+x64-windows/include/boost/phoenix/core/terminal_fwd.hpp
+x64-windows/include/boost/phoenix/core/v2_eval.hpp
+x64-windows/include/boost/phoenix/core/value.hpp
+x64-windows/include/boost/phoenix/core/visit_each.hpp
+x64-windows/include/boost/phoenix/function.hpp
+x64-windows/include/boost/phoenix/function/
+x64-windows/include/boost/phoenix/function/adapt_callable.hpp
+x64-windows/include/boost/phoenix/function/adapt_function.hpp
+x64-windows/include/boost/phoenix/function/detail/
+x64-windows/include/boost/phoenix/function/detail/cpp03/
+x64-windows/include/boost/phoenix/function/detail/cpp03/function_operator.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_10.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_20.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_30.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_40.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_50.hpp
+x64-windows/include/boost/phoenix/function/function.hpp
+x64-windows/include/boost/phoenix/function/lazy_list.hpp
+x64-windows/include/boost/phoenix/function/lazy_operator.hpp
+x64-windows/include/boost/phoenix/function/lazy_prelude.hpp
+x64-windows/include/boost/phoenix/function/lazy_reuse.hpp
+x64-windows/include/boost/phoenix/function/lazy_signature.hpp
+x64-windows/include/boost/phoenix/function/lazy_smart.hpp
+x64-windows/include/boost/phoenix/fusion.hpp
+x64-windows/include/boost/phoenix/fusion/
+x64-windows/include/boost/phoenix/fusion/at.hpp
+x64-windows/include/boost/phoenix/object.hpp
+x64-windows/include/boost/phoenix/object/
+x64-windows/include/boost/phoenix/object/const_cast.hpp
+x64-windows/include/boost/phoenix/object/construct.hpp
+x64-windows/include/boost/phoenix/object/delete.hpp
+x64-windows/include/boost/phoenix/object/detail/
+x64-windows/include/boost/phoenix/object/detail/cpp03/
+x64-windows/include/boost/phoenix/object/detail/cpp03/construct.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/construct_eval.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/construct_expr.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/new.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/new_eval.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/new_expr.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_50.hpp
+x64-windows/include/boost/phoenix/object/detail/target.hpp
+x64-windows/include/boost/phoenix/object/dynamic_cast.hpp
+x64-windows/include/boost/phoenix/object/new.hpp
+x64-windows/include/boost/phoenix/object/reinterpret_cast.hpp
+x64-windows/include/boost/phoenix/object/static_cast.hpp
+x64-windows/include/boost/phoenix/operator.hpp
+x64-windows/include/boost/phoenix/operator/
+x64-windows/include/boost/phoenix/operator/arithmetic.hpp
+x64-windows/include/boost/phoenix/operator/bitwise.hpp
+x64-windows/include/boost/phoenix/operator/comparison.hpp
+x64-windows/include/boost/phoenix/operator/detail/
+x64-windows/include/boost/phoenix/operator/detail/cpp03/
+x64-windows/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_eval.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_eval_result_of.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_expr.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_gen.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_10.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_20.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_30.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_40.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_50.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_10.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_20.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_30.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_40.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_50.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_10.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_20.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_30.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_40.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_50.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_10.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_20.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_30.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_40.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_50.hpp
+x64-windows/include/boost/phoenix/operator/detail/define_operator.hpp
+x64-windows/include/boost/phoenix/operator/detail/undef_operator.hpp
+x64-windows/include/boost/phoenix/operator/if_else.hpp
+x64-windows/include/boost/phoenix/operator/io.hpp
+x64-windows/include/boost/phoenix/operator/logical.hpp
+x64-windows/include/boost/phoenix/operator/member.hpp
+x64-windows/include/boost/phoenix/operator/self.hpp
+x64-windows/include/boost/phoenix/phoenix.hpp
+x64-windows/include/boost/phoenix/scope.hpp
+x64-windows/include/boost/phoenix/scope/
+x64-windows/include/boost/phoenix/scope/detail/
+x64-windows/include/boost/phoenix/scope/detail/cpp03/
+x64-windows/include/boost/phoenix/scope/detail/cpp03/dynamic.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/lambda.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/local_gen.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_10.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_20.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_30.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_40.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_50.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_10.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_20.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_30.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_40.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_50.hpp
+x64-windows/include/boost/phoenix/scope/detail/local_gen.hpp
+x64-windows/include/boost/phoenix/scope/detail/local_variable.hpp
+x64-windows/include/boost/phoenix/scope/dynamic.hpp
+x64-windows/include/boost/phoenix/scope/lambda.hpp
+x64-windows/include/boost/phoenix/scope/let.hpp
+x64-windows/include/boost/phoenix/scope/local_variable.hpp
+x64-windows/include/boost/phoenix/scope/scoped_environment.hpp
+x64-windows/include/boost/phoenix/scope/this.hpp
+x64-windows/include/boost/phoenix/statement.hpp
+x64-windows/include/boost/phoenix/statement/
+x64-windows/include/boost/phoenix/statement/detail/
+x64-windows/include/boost/phoenix/statement/detail/catch_push_back.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_10.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_20.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_30.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_40.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_50.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_10.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_20.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_30.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_40.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_50.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_10.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_20.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_30.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_40.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_50.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_10.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_20.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_30.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_40.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_50.hpp
+x64-windows/include/boost/phoenix/statement/detail/switch.hpp
+x64-windows/include/boost/phoenix/statement/detail/try_catch_eval.hpp
+x64-windows/include/boost/phoenix/statement/detail/try_catch_expression.hpp
+x64-windows/include/boost/phoenix/statement/do_while.hpp
+x64-windows/include/boost/phoenix/statement/for.hpp
+x64-windows/include/boost/phoenix/statement/if.hpp
+x64-windows/include/boost/phoenix/statement/sequence.hpp
+x64-windows/include/boost/phoenix/statement/switch.hpp
+x64-windows/include/boost/phoenix/statement/throw.hpp
+x64-windows/include/boost/phoenix/statement/try_catch.hpp
+x64-windows/include/boost/phoenix/statement/while.hpp
+x64-windows/include/boost/phoenix/stl.hpp
+x64-windows/include/boost/phoenix/stl/
+x64-windows/include/boost/phoenix/stl/algorithm.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/
+x64-windows/include/boost/phoenix/stl/algorithm/detail/
+x64-windows/include/boost/phoenix/stl/algorithm/detail/begin.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/decay_array.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/end.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_find.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_remove.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_reverse.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_sort.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_unique.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_upper_bound.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_hash_map.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_hash_set.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_list.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_map.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_set.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_unordered_set_or_map.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/iteration.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/querying.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/transformation.hpp
+x64-windows/include/boost/phoenix/stl/cmath.hpp
+x64-windows/include/boost/phoenix/stl/container.hpp
+x64-windows/include/boost/phoenix/stl/container/
+x64-windows/include/boost/phoenix/stl/container/container.hpp
+x64-windows/include/boost/phoenix/stl/container/detail/
+x64-windows/include/boost/phoenix/stl/container/detail/container.hpp
+x64-windows/include/boost/phoenix/support/
+x64-windows/include/boost/phoenix/support/detail/
+x64-windows/include/boost/phoenix/support/detail/iterate.hpp
+x64-windows/include/boost/phoenix/support/detail/iterate_define.hpp
+x64-windows/include/boost/phoenix/support/detail/iterate_undef.hpp
+x64-windows/include/boost/phoenix/support/iterate.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/
+x64-windows/include/boost/phoenix/support/preprocessed/vector.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_10.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_20.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_30.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_40.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_50.hpp
+x64-windows/include/boost/phoenix/support/preprocessor/
+x64-windows/include/boost/phoenix/support/preprocessor/round.hpp
+x64-windows/include/boost/phoenix/support/vector.hpp
+x64-windows/include/boost/phoenix/version.hpp
+x64-windows/share/
+x64-windows/share/boost-phoenix/
+x64-windows/share/boost-phoenix/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,393 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/phoenix.hpp
+x64-windows-static/include/boost/phoenix/
+x64-windows-static/include/boost/phoenix/bind.hpp
+x64-windows-static/include/boost/phoenix/bind/
+x64-windows-static/include/boost/phoenix/bind/bind_function.hpp
+x64-windows-static/include/boost/phoenix/bind/bind_function_object.hpp
+x64-windows-static/include/boost/phoenix/bind/bind_member_function.hpp
+x64-windows-static/include/boost/phoenix/bind/bind_member_variable.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/bind_function.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/bind_function_object.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/bind_member_function.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/function_ptr.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/member_function_ptr.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_10.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_20.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_30.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_40.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_50.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_10.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_20.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_30.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_40.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_50.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_10.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_20.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_30.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_40.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_50.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_10.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_20.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_30.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_40.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_50.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_10.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_20.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_30.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_40.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_50.hpp
+x64-windows-static/include/boost/phoenix/bind/detail/member_variable.hpp
+x64-windows-static/include/boost/phoenix/config.hpp
+x64-windows-static/include/boost/phoenix/core.hpp
+x64-windows-static/include/boost/phoenix/core/
+x64-windows-static/include/boost/phoenix/core/actor.hpp
+x64-windows-static/include/boost/phoenix/core/argument.hpp
+x64-windows-static/include/boost/phoenix/core/arity.hpp
+x64-windows-static/include/boost/phoenix/core/as_actor.hpp
+x64-windows-static/include/boost/phoenix/core/call.hpp
+x64-windows-static/include/boost/phoenix/core/debug.hpp
+x64-windows-static/include/boost/phoenix/core/detail/
+x64-windows-static/include/boost/phoenix/core/detail/argument.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/actor_operator.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/actor_result_of.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/call.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/expression.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/function_equal.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/function_eval.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/function_eval_expr.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/phx2_result.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/call.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/call_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/call_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/call_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/call_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/call_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/expression.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_10.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_20.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_30.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_40.hpp
+x64-windows-static/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_50.hpp
+x64-windows-static/include/boost/phoenix/core/detail/expression.hpp
+x64-windows-static/include/boost/phoenix/core/detail/function_eval.hpp
+x64-windows-static/include/boost/phoenix/core/detail/index_sequence.hpp
+x64-windows-static/include/boost/phoenix/core/detail/phx2_result.hpp
+x64-windows-static/include/boost/phoenix/core/domain.hpp
+x64-windows-static/include/boost/phoenix/core/environment.hpp
+x64-windows-static/include/boost/phoenix/core/expression.hpp
+x64-windows-static/include/boost/phoenix/core/function_equal.hpp
+x64-windows-static/include/boost/phoenix/core/is_actor.hpp
+x64-windows-static/include/boost/phoenix/core/is_nullary.hpp
+x64-windows-static/include/boost/phoenix/core/is_value.hpp
+x64-windows-static/include/boost/phoenix/core/limits.hpp
+x64-windows-static/include/boost/phoenix/core/meta_grammar.hpp
+x64-windows-static/include/boost/phoenix/core/nothing.hpp
+x64-windows-static/include/boost/phoenix/core/reference.hpp
+x64-windows-static/include/boost/phoenix/core/terminal.hpp
+x64-windows-static/include/boost/phoenix/core/terminal_fwd.hpp
+x64-windows-static/include/boost/phoenix/core/v2_eval.hpp
+x64-windows-static/include/boost/phoenix/core/value.hpp
+x64-windows-static/include/boost/phoenix/core/visit_each.hpp
+x64-windows-static/include/boost/phoenix/function.hpp
+x64-windows-static/include/boost/phoenix/function/
+x64-windows-static/include/boost/phoenix/function/adapt_callable.hpp
+x64-windows-static/include/boost/phoenix/function/adapt_function.hpp
+x64-windows-static/include/boost/phoenix/function/detail/
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/function_operator.hpp
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator.hpp
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_10.hpp
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_20.hpp
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_30.hpp
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_40.hpp
+x64-windows-static/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_50.hpp
+x64-windows-static/include/boost/phoenix/function/function.hpp
+x64-windows-static/include/boost/phoenix/function/lazy_list.hpp
+x64-windows-static/include/boost/phoenix/function/lazy_operator.hpp
+x64-windows-static/include/boost/phoenix/function/lazy_prelude.hpp
+x64-windows-static/include/boost/phoenix/function/lazy_reuse.hpp
+x64-windows-static/include/boost/phoenix/function/lazy_signature.hpp
+x64-windows-static/include/boost/phoenix/function/lazy_smart.hpp
+x64-windows-static/include/boost/phoenix/fusion.hpp
+x64-windows-static/include/boost/phoenix/fusion/
+x64-windows-static/include/boost/phoenix/fusion/at.hpp
+x64-windows-static/include/boost/phoenix/object.hpp
+x64-windows-static/include/boost/phoenix/object/
+x64-windows-static/include/boost/phoenix/object/const_cast.hpp
+x64-windows-static/include/boost/phoenix/object/construct.hpp
+x64-windows-static/include/boost/phoenix/object/delete.hpp
+x64-windows-static/include/boost/phoenix/object/detail/
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/construct.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/construct_eval.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/construct_expr.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/new.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/new_eval.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/new_expr.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_10.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_20.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_30.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_40.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_50.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_10.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_20.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_30.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_40.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_50.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_10.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_20.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_30.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_40.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_50.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_10.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_20.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_30.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_40.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_50.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_10.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_20.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_30.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_40.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_50.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_10.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_20.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_30.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_40.hpp
+x64-windows-static/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_50.hpp
+x64-windows-static/include/boost/phoenix/object/detail/target.hpp
+x64-windows-static/include/boost/phoenix/object/dynamic_cast.hpp
+x64-windows-static/include/boost/phoenix/object/new.hpp
+x64-windows-static/include/boost/phoenix/object/reinterpret_cast.hpp
+x64-windows-static/include/boost/phoenix/object/static_cast.hpp
+x64-windows-static/include/boost/phoenix/operator.hpp
+x64-windows-static/include/boost/phoenix/operator/
+x64-windows-static/include/boost/phoenix/operator/arithmetic.hpp
+x64-windows-static/include/boost/phoenix/operator/bitwise.hpp
+x64-windows-static/include/boost/phoenix/operator/comparison.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_eval.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_eval_result_of.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_expr.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_gen.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_10.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_20.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_30.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_40.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_50.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_10.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_20.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_30.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_40.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_50.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_10.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_20.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_30.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_40.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_50.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_10.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_20.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_30.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_40.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_50.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/define_operator.hpp
+x64-windows-static/include/boost/phoenix/operator/detail/undef_operator.hpp
+x64-windows-static/include/boost/phoenix/operator/if_else.hpp
+x64-windows-static/include/boost/phoenix/operator/io.hpp
+x64-windows-static/include/boost/phoenix/operator/logical.hpp
+x64-windows-static/include/boost/phoenix/operator/member.hpp
+x64-windows-static/include/boost/phoenix/operator/self.hpp
+x64-windows-static/include/boost/phoenix/phoenix.hpp
+x64-windows-static/include/boost/phoenix/scope.hpp
+x64-windows-static/include/boost/phoenix/scope/
+x64-windows-static/include/boost/phoenix/scope/detail/
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/dynamic.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/lambda.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/local_gen.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_10.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_20.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_30.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_40.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_50.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_10.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_20.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_30.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_40.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_50.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/local_gen.hpp
+x64-windows-static/include/boost/phoenix/scope/detail/local_variable.hpp
+x64-windows-static/include/boost/phoenix/scope/dynamic.hpp
+x64-windows-static/include/boost/phoenix/scope/lambda.hpp
+x64-windows-static/include/boost/phoenix/scope/let.hpp
+x64-windows-static/include/boost/phoenix/scope/local_variable.hpp
+x64-windows-static/include/boost/phoenix/scope/scoped_environment.hpp
+x64-windows-static/include/boost/phoenix/scope/this.hpp
+x64-windows-static/include/boost/phoenix/statement.hpp
+x64-windows-static/include/boost/phoenix/statement/
+x64-windows-static/include/boost/phoenix/statement/detail/
+x64-windows-static/include/boost/phoenix/statement/detail/catch_push_back.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/catch_push_back.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_10.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_20.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_30.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_40.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_50.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/switch.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/switch_10.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/switch_20.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/switch_30.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/switch_40.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/switch_50.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_10.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_20.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_30.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_40.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_50.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_10.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_20.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_30.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_40.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_50.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/switch.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/try_catch_eval.hpp
+x64-windows-static/include/boost/phoenix/statement/detail/try_catch_expression.hpp
+x64-windows-static/include/boost/phoenix/statement/do_while.hpp
+x64-windows-static/include/boost/phoenix/statement/for.hpp
+x64-windows-static/include/boost/phoenix/statement/if.hpp
+x64-windows-static/include/boost/phoenix/statement/sequence.hpp
+x64-windows-static/include/boost/phoenix/statement/switch.hpp
+x64-windows-static/include/boost/phoenix/statement/throw.hpp
+x64-windows-static/include/boost/phoenix/statement/try_catch.hpp
+x64-windows-static/include/boost/phoenix/statement/while.hpp
+x64-windows-static/include/boost/phoenix/stl.hpp
+x64-windows-static/include/boost/phoenix/stl/
+x64-windows-static/include/boost/phoenix/stl/algorithm.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/begin.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/decay_array.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/end.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_find.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_remove.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_reverse.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_sort.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_unique.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/has_upper_bound.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/is_std_hash_map.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/is_std_hash_set.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/is_std_list.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/is_std_map.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/is_std_set.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/detail/is_unordered_set_or_map.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/iteration.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/querying.hpp
+x64-windows-static/include/boost/phoenix/stl/algorithm/transformation.hpp
+x64-windows-static/include/boost/phoenix/stl/cmath.hpp
+x64-windows-static/include/boost/phoenix/stl/container.hpp
+x64-windows-static/include/boost/phoenix/stl/container/
+x64-windows-static/include/boost/phoenix/stl/container/container.hpp
+x64-windows-static/include/boost/phoenix/stl/container/detail/
+x64-windows-static/include/boost/phoenix/stl/container/detail/container.hpp
+x64-windows-static/include/boost/phoenix/support/
+x64-windows-static/include/boost/phoenix/support/detail/
+x64-windows-static/include/boost/phoenix/support/detail/iterate.hpp
+x64-windows-static/include/boost/phoenix/support/detail/iterate_define.hpp
+x64-windows-static/include/boost/phoenix/support/detail/iterate_undef.hpp
+x64-windows-static/include/boost/phoenix/support/iterate.hpp
+x64-windows-static/include/boost/phoenix/support/preprocessed/
+x64-windows-static/include/boost/phoenix/support/preprocessed/vector.hpp
+x64-windows-static/include/boost/phoenix/support/preprocessed/vector_10.hpp
+x64-windows-static/include/boost/phoenix/support/preprocessed/vector_20.hpp
+x64-windows-static/include/boost/phoenix/support/preprocessed/vector_30.hpp
+x64-windows-static/include/boost/phoenix/support/preprocessed/vector_40.hpp
+x64-windows-static/include/boost/phoenix/support/preprocessed/vector_50.hpp
+x64-windows-static/include/boost/phoenix/support/preprocessor/
+x64-windows-static/include/boost/phoenix/support/preprocessor/round.hpp
+x64-windows-static/include/boost/phoenix/support/vector.hpp
+x64-windows-static/include/boost/phoenix/version.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-phoenix/
+x64-windows-static/share/boost-phoenix/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,71 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/polygon/
+x64-windows/include/boost/polygon/detail/
+x64-windows/include/boost/polygon/detail/boolean_op.hpp
+x64-windows/include/boost/polygon/detail/boolean_op_45.hpp
+x64-windows/include/boost/polygon/detail/iterator_compact_to_points.hpp
+x64-windows/include/boost/polygon/detail/iterator_geometry_to_set.hpp
+x64-windows/include/boost/polygon/detail/iterator_points_to_compact.hpp
+x64-windows/include/boost/polygon/detail/max_cover.hpp
+x64-windows/include/boost/polygon/detail/minkowski.hpp
+x64-windows/include/boost/polygon/detail/polygon_45_formation.hpp
+x64-windows/include/boost/polygon/detail/polygon_45_set_view.hpp
+x64-windows/include/boost/polygon/detail/polygon_45_touch.hpp
+x64-windows/include/boost/polygon/detail/polygon_90_set_view.hpp
+x64-windows/include/boost/polygon/detail/polygon_90_touch.hpp
+x64-windows/include/boost/polygon/detail/polygon_arbitrary_formation.hpp
+x64-windows/include/boost/polygon/detail/polygon_formation.hpp
+x64-windows/include/boost/polygon/detail/polygon_set_view.hpp
+x64-windows/include/boost/polygon/detail/polygon_simplify.hpp
+x64-windows/include/boost/polygon/detail/polygon_sort_adaptor.hpp
+x64-windows/include/boost/polygon/detail/property_merge.hpp
+x64-windows/include/boost/polygon/detail/property_merge_45.hpp
+x64-windows/include/boost/polygon/detail/rectangle_formation.hpp
+x64-windows/include/boost/polygon/detail/scan_arbitrary.hpp
+x64-windows/include/boost/polygon/detail/voronoi_ctypes.hpp
+x64-windows/include/boost/polygon/detail/voronoi_predicates.hpp
+x64-windows/include/boost/polygon/detail/voronoi_robust_fpt.hpp
+x64-windows/include/boost/polygon/detail/voronoi_structures.hpp
+x64-windows/include/boost/polygon/gmp_override.hpp
+x64-windows/include/boost/polygon/gtl.hpp
+x64-windows/include/boost/polygon/interval_concept.hpp
+x64-windows/include/boost/polygon/interval_data.hpp
+x64-windows/include/boost/polygon/interval_traits.hpp
+x64-windows/include/boost/polygon/isotropy.hpp
+x64-windows/include/boost/polygon/point_concept.hpp
+x64-windows/include/boost/polygon/point_data.hpp
+x64-windows/include/boost/polygon/point_traits.hpp
+x64-windows/include/boost/polygon/polygon.hpp
+x64-windows/include/boost/polygon/polygon_45_data.hpp
+x64-windows/include/boost/polygon/polygon_45_set_concept.hpp
+x64-windows/include/boost/polygon/polygon_45_set_data.hpp
+x64-windows/include/boost/polygon/polygon_45_set_traits.hpp
+x64-windows/include/boost/polygon/polygon_45_with_holes_data.hpp
+x64-windows/include/boost/polygon/polygon_90_data.hpp
+x64-windows/include/boost/polygon/polygon_90_set_concept.hpp
+x64-windows/include/boost/polygon/polygon_90_set_data.hpp
+x64-windows/include/boost/polygon/polygon_90_set_traits.hpp
+x64-windows/include/boost/polygon/polygon_90_with_holes_data.hpp
+x64-windows/include/boost/polygon/polygon_data.hpp
+x64-windows/include/boost/polygon/polygon_set_concept.hpp
+x64-windows/include/boost/polygon/polygon_set_data.hpp
+x64-windows/include/boost/polygon/polygon_set_traits.hpp
+x64-windows/include/boost/polygon/polygon_traits.hpp
+x64-windows/include/boost/polygon/polygon_with_holes_data.hpp
+x64-windows/include/boost/polygon/rectangle_concept.hpp
+x64-windows/include/boost/polygon/rectangle_data.hpp
+x64-windows/include/boost/polygon/rectangle_traits.hpp
+x64-windows/include/boost/polygon/segment_concept.hpp
+x64-windows/include/boost/polygon/segment_data.hpp
+x64-windows/include/boost/polygon/segment_traits.hpp
+x64-windows/include/boost/polygon/segment_utils.hpp
+x64-windows/include/boost/polygon/transform.hpp
+x64-windows/include/boost/polygon/voronoi.hpp
+x64-windows/include/boost/polygon/voronoi_builder.hpp
+x64-windows/include/boost/polygon/voronoi_diagram.hpp
+x64-windows/include/boost/polygon/voronoi_geometry_type.hpp
+x64-windows/share/
+x64-windows/share/boost-polygon/
+x64-windows/share/boost-polygon/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,71 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/polygon/
+x64-windows-static/include/boost/polygon/detail/
+x64-windows-static/include/boost/polygon/detail/boolean_op.hpp
+x64-windows-static/include/boost/polygon/detail/boolean_op_45.hpp
+x64-windows-static/include/boost/polygon/detail/iterator_compact_to_points.hpp
+x64-windows-static/include/boost/polygon/detail/iterator_geometry_to_set.hpp
+x64-windows-static/include/boost/polygon/detail/iterator_points_to_compact.hpp
+x64-windows-static/include/boost/polygon/detail/max_cover.hpp
+x64-windows-static/include/boost/polygon/detail/minkowski.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_45_formation.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_45_set_view.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_45_touch.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_90_set_view.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_90_touch.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_arbitrary_formation.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_formation.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_set_view.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_simplify.hpp
+x64-windows-static/include/boost/polygon/detail/polygon_sort_adaptor.hpp
+x64-windows-static/include/boost/polygon/detail/property_merge.hpp
+x64-windows-static/include/boost/polygon/detail/property_merge_45.hpp
+x64-windows-static/include/boost/polygon/detail/rectangle_formation.hpp
+x64-windows-static/include/boost/polygon/detail/scan_arbitrary.hpp
+x64-windows-static/include/boost/polygon/detail/voronoi_ctypes.hpp
+x64-windows-static/include/boost/polygon/detail/voronoi_predicates.hpp
+x64-windows-static/include/boost/polygon/detail/voronoi_robust_fpt.hpp
+x64-windows-static/include/boost/polygon/detail/voronoi_structures.hpp
+x64-windows-static/include/boost/polygon/gmp_override.hpp
+x64-windows-static/include/boost/polygon/gtl.hpp
+x64-windows-static/include/boost/polygon/interval_concept.hpp
+x64-windows-static/include/boost/polygon/interval_data.hpp
+x64-windows-static/include/boost/polygon/interval_traits.hpp
+x64-windows-static/include/boost/polygon/isotropy.hpp
+x64-windows-static/include/boost/polygon/point_concept.hpp
+x64-windows-static/include/boost/polygon/point_data.hpp
+x64-windows-static/include/boost/polygon/point_traits.hpp
+x64-windows-static/include/boost/polygon/polygon.hpp
+x64-windows-static/include/boost/polygon/polygon_45_data.hpp
+x64-windows-static/include/boost/polygon/polygon_45_set_concept.hpp
+x64-windows-static/include/boost/polygon/polygon_45_set_data.hpp
+x64-windows-static/include/boost/polygon/polygon_45_set_traits.hpp
+x64-windows-static/include/boost/polygon/polygon_45_with_holes_data.hpp
+x64-windows-static/include/boost/polygon/polygon_90_data.hpp
+x64-windows-static/include/boost/polygon/polygon_90_set_concept.hpp
+x64-windows-static/include/boost/polygon/polygon_90_set_data.hpp
+x64-windows-static/include/boost/polygon/polygon_90_set_traits.hpp
+x64-windows-static/include/boost/polygon/polygon_90_with_holes_data.hpp
+x64-windows-static/include/boost/polygon/polygon_data.hpp
+x64-windows-static/include/boost/polygon/polygon_set_concept.hpp
+x64-windows-static/include/boost/polygon/polygon_set_data.hpp
+x64-windows-static/include/boost/polygon/polygon_set_traits.hpp
+x64-windows-static/include/boost/polygon/polygon_traits.hpp
+x64-windows-static/include/boost/polygon/polygon_with_holes_data.hpp
+x64-windows-static/include/boost/polygon/rectangle_concept.hpp
+x64-windows-static/include/boost/polygon/rectangle_data.hpp
+x64-windows-static/include/boost/polygon/rectangle_traits.hpp
+x64-windows-static/include/boost/polygon/segment_concept.hpp
+x64-windows-static/include/boost/polygon/segment_data.hpp
+x64-windows-static/include/boost/polygon/segment_traits.hpp
+x64-windows-static/include/boost/polygon/segment_utils.hpp
+x64-windows-static/include/boost/polygon/transform.hpp
+x64-windows-static/include/boost/polygon/voronoi.hpp
+x64-windows-static/include/boost/polygon/voronoi_builder.hpp
+x64-windows-static/include/boost/polygon/voronoi_diagram.hpp
+x64-windows-static/include/boost/polygon/voronoi_geometry_type.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-polygon/
+x64-windows-static/share/boost-polygon/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/pool/
+x64-windows/include/boost/pool/detail/
+x64-windows/include/boost/pool/detail/for.m4
+x64-windows/include/boost/pool/detail/guard.hpp
+x64-windows/include/boost/pool/detail/mutex.hpp
+x64-windows/include/boost/pool/detail/pool_construct.bat
+x64-windows/include/boost/pool/detail/pool_construct.ipp
+x64-windows/include/boost/pool/detail/pool_construct.m4
+x64-windows/include/boost/pool/detail/pool_construct.sh
+x64-windows/include/boost/pool/detail/pool_construct_simple.bat
+x64-windows/include/boost/pool/detail/pool_construct_simple.ipp
+x64-windows/include/boost/pool/detail/pool_construct_simple.m4
+x64-windows/include/boost/pool/detail/pool_construct_simple.sh
+x64-windows/include/boost/pool/object_pool.hpp
+x64-windows/include/boost/pool/pool.hpp
+x64-windows/include/boost/pool/pool_alloc.hpp
+x64-windows/include/boost/pool/poolfwd.hpp
+x64-windows/include/boost/pool/simple_segregated_storage.hpp
+x64-windows/include/boost/pool/singleton_pool.hpp
+x64-windows/share/
+x64-windows/share/boost-pool/
+x64-windows/share/boost-pool/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-pool_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/pool/
+x64-windows-static/include/boost/pool/detail/
+x64-windows-static/include/boost/pool/detail/for.m4
+x64-windows-static/include/boost/pool/detail/guard.hpp
+x64-windows-static/include/boost/pool/detail/mutex.hpp
+x64-windows-static/include/boost/pool/detail/pool_construct.bat
+x64-windows-static/include/boost/pool/detail/pool_construct.ipp
+x64-windows-static/include/boost/pool/detail/pool_construct.m4
+x64-windows-static/include/boost/pool/detail/pool_construct.sh
+x64-windows-static/include/boost/pool/detail/pool_construct_simple.bat
+x64-windows-static/include/boost/pool/detail/pool_construct_simple.ipp
+x64-windows-static/include/boost/pool/detail/pool_construct_simple.m4
+x64-windows-static/include/boost/pool/detail/pool_construct_simple.sh
+x64-windows-static/include/boost/pool/object_pool.hpp
+x64-windows-static/include/boost/pool/pool.hpp
+x64-windows-static/include/boost/pool/pool_alloc.hpp
+x64-windows-static/include/boost/pool/poolfwd.hpp
+x64-windows-static/include/boost/pool/simple_segregated_storage.hpp
+x64-windows-static/include/boost/pool/singleton_pool.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-pool/
+x64-windows-static/share/boost-pool/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,176 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/endian.hpp
+x64-windows/include/boost/predef.h
+x64-windows/include/boost/predef/
+x64-windows/include/boost/predef/architecture.h
+x64-windows/include/boost/predef/architecture/
+x64-windows/include/boost/predef/architecture/alpha.h
+x64-windows/include/boost/predef/architecture/arm.h
+x64-windows/include/boost/predef/architecture/blackfin.h
+x64-windows/include/boost/predef/architecture/convex.h
+x64-windows/include/boost/predef/architecture/ia64.h
+x64-windows/include/boost/predef/architecture/m68k.h
+x64-windows/include/boost/predef/architecture/mips.h
+x64-windows/include/boost/predef/architecture/parisc.h
+x64-windows/include/boost/predef/architecture/ppc.h
+x64-windows/include/boost/predef/architecture/pyramid.h
+x64-windows/include/boost/predef/architecture/rs6k.h
+x64-windows/include/boost/predef/architecture/sparc.h
+x64-windows/include/boost/predef/architecture/superh.h
+x64-windows/include/boost/predef/architecture/sys370.h
+x64-windows/include/boost/predef/architecture/sys390.h
+x64-windows/include/boost/predef/architecture/x86.h
+x64-windows/include/boost/predef/architecture/x86/
+x64-windows/include/boost/predef/architecture/x86/32.h
+x64-windows/include/boost/predef/architecture/x86/64.h
+x64-windows/include/boost/predef/architecture/z.h
+x64-windows/include/boost/predef/compiler.h
+x64-windows/include/boost/predef/compiler/
+x64-windows/include/boost/predef/compiler/borland.h
+x64-windows/include/boost/predef/compiler/clang.h
+x64-windows/include/boost/predef/compiler/comeau.h
+x64-windows/include/boost/predef/compiler/compaq.h
+x64-windows/include/boost/predef/compiler/diab.h
+x64-windows/include/boost/predef/compiler/digitalmars.h
+x64-windows/include/boost/predef/compiler/dignus.h
+x64-windows/include/boost/predef/compiler/edg.h
+x64-windows/include/boost/predef/compiler/ekopath.h
+x64-windows/include/boost/predef/compiler/gcc.h
+x64-windows/include/boost/predef/compiler/gcc_xml.h
+x64-windows/include/boost/predef/compiler/greenhills.h
+x64-windows/include/boost/predef/compiler/hp_acc.h
+x64-windows/include/boost/predef/compiler/iar.h
+x64-windows/include/boost/predef/compiler/ibm.h
+x64-windows/include/boost/predef/compiler/intel.h
+x64-windows/include/boost/predef/compiler/kai.h
+x64-windows/include/boost/predef/compiler/llvm.h
+x64-windows/include/boost/predef/compiler/metaware.h
+x64-windows/include/boost/predef/compiler/metrowerks.h
+x64-windows/include/boost/predef/compiler/microtec.h
+x64-windows/include/boost/predef/compiler/mpw.h
+x64-windows/include/boost/predef/compiler/palm.h
+x64-windows/include/boost/predef/compiler/pgi.h
+x64-windows/include/boost/predef/compiler/sgi_mipspro.h
+x64-windows/include/boost/predef/compiler/sunpro.h
+x64-windows/include/boost/predef/compiler/tendra.h
+x64-windows/include/boost/predef/compiler/visualc.h
+x64-windows/include/boost/predef/compiler/watcom.h
+x64-windows/include/boost/predef/detail/
+x64-windows/include/boost/predef/detail/_cassert.h
+x64-windows/include/boost/predef/detail/_exception.h
+x64-windows/include/boost/predef/detail/comp_detected.h
+x64-windows/include/boost/predef/detail/endian_compat.h
+x64-windows/include/boost/predef/detail/os_detected.h
+x64-windows/include/boost/predef/detail/platform_detected.h
+x64-windows/include/boost/predef/detail/test.h
+x64-windows/include/boost/predef/detail/test_def.h
+x64-windows/include/boost/predef/hardware.h
+x64-windows/include/boost/predef/hardware/
+x64-windows/include/boost/predef/hardware/simd.h
+x64-windows/include/boost/predef/hardware/simd/
+x64-windows/include/boost/predef/hardware/simd/arm.h
+x64-windows/include/boost/predef/hardware/simd/arm/
+x64-windows/include/boost/predef/hardware/simd/arm/versions.h
+x64-windows/include/boost/predef/hardware/simd/ppc.h
+x64-windows/include/boost/predef/hardware/simd/ppc/
+x64-windows/include/boost/predef/hardware/simd/ppc/versions.h
+x64-windows/include/boost/predef/hardware/simd/x86.h
+x64-windows/include/boost/predef/hardware/simd/x86/
+x64-windows/include/boost/predef/hardware/simd/x86/versions.h
+x64-windows/include/boost/predef/hardware/simd/x86_amd.h
+x64-windows/include/boost/predef/hardware/simd/x86_amd/
+x64-windows/include/boost/predef/hardware/simd/x86_amd/versions.h
+x64-windows/include/boost/predef/language.h
+x64-windows/include/boost/predef/language/
+x64-windows/include/boost/predef/language/objc.h
+x64-windows/include/boost/predef/language/stdc.h
+x64-windows/include/boost/predef/language/stdcpp.h
+x64-windows/include/boost/predef/library.h
+x64-windows/include/boost/predef/library/
+x64-windows/include/boost/predef/library/c.h
+x64-windows/include/boost/predef/library/c/
+x64-windows/include/boost/predef/library/c/_prefix.h
+x64-windows/include/boost/predef/library/c/cloudabi.h
+x64-windows/include/boost/predef/library/c/gnu.h
+x64-windows/include/boost/predef/library/c/uc.h
+x64-windows/include/boost/predef/library/c/vms.h
+x64-windows/include/boost/predef/library/c/zos.h
+x64-windows/include/boost/predef/library/std.h
+x64-windows/include/boost/predef/library/std/
+x64-windows/include/boost/predef/library/std/_prefix.h
+x64-windows/include/boost/predef/library/std/cxx.h
+x64-windows/include/boost/predef/library/std/dinkumware.h
+x64-windows/include/boost/predef/library/std/libcomo.h
+x64-windows/include/boost/predef/library/std/modena.h
+x64-windows/include/boost/predef/library/std/msl.h
+x64-windows/include/boost/predef/library/std/roguewave.h
+x64-windows/include/boost/predef/library/std/sgi.h
+x64-windows/include/boost/predef/library/std/stdcpp3.h
+x64-windows/include/boost/predef/library/std/stlport.h
+x64-windows/include/boost/predef/library/std/vacpp.h
+x64-windows/include/boost/predef/make.h
+x64-windows/include/boost/predef/os.h
+x64-windows/include/boost/predef/os/
+x64-windows/include/boost/predef/os/aix.h
+x64-windows/include/boost/predef/os/amigaos.h
+x64-windows/include/boost/predef/os/android.h
+x64-windows/include/boost/predef/os/beos.h
+x64-windows/include/boost/predef/os/bsd.h
+x64-windows/include/boost/predef/os/bsd/
+x64-windows/include/boost/predef/os/bsd/bsdi.h
+x64-windows/include/boost/predef/os/bsd/dragonfly.h
+x64-windows/include/boost/predef/os/bsd/free.h
+x64-windows/include/boost/predef/os/bsd/net.h
+x64-windows/include/boost/predef/os/bsd/open.h
+x64-windows/include/boost/predef/os/cygwin.h
+x64-windows/include/boost/predef/os/haiku.h
+x64-windows/include/boost/predef/os/hpux.h
+x64-windows/include/boost/predef/os/ios.h
+x64-windows/include/boost/predef/os/irix.h
+x64-windows/include/boost/predef/os/linux.h
+x64-windows/include/boost/predef/os/macos.h
+x64-windows/include/boost/predef/os/os400.h
+x64-windows/include/boost/predef/os/qnxnto.h
+x64-windows/include/boost/predef/os/solaris.h
+x64-windows/include/boost/predef/os/unix.h
+x64-windows/include/boost/predef/os/vms.h
+x64-windows/include/boost/predef/os/windows.h
+x64-windows/include/boost/predef/other.h
+x64-windows/include/boost/predef/other/
+x64-windows/include/boost/predef/other/endian.h
+x64-windows/include/boost/predef/other/workaround.h
+x64-windows/include/boost/predef/platform.h
+x64-windows/include/boost/predef/platform/
+x64-windows/include/boost/predef/platform/cloudabi.h
+x64-windows/include/boost/predef/platform/ios.h
+x64-windows/include/boost/predef/platform/mingw.h
+x64-windows/include/boost/predef/platform/mingw32.h
+x64-windows/include/boost/predef/platform/mingw64.h
+x64-windows/include/boost/predef/platform/windows_desktop.h
+x64-windows/include/boost/predef/platform/windows_phone.h
+x64-windows/include/boost/predef/platform/windows_runtime.h
+x64-windows/include/boost/predef/platform/windows_server.h
+x64-windows/include/boost/predef/platform/windows_store.h
+x64-windows/include/boost/predef/platform/windows_system.h
+x64-windows/include/boost/predef/platform/windows_uwp.h
+x64-windows/include/boost/predef/version.h
+x64-windows/include/boost/predef/version_number.h
+x64-windows/share/
+x64-windows/share/boost-predef/
+x64-windows/share/boost-predef/check/
+x64-windows/share/boost-predef/check/build.jam
+x64-windows/share/boost-predef/check/predef.jam
+x64-windows/share/boost-predef/check/predef_check.h
+x64-windows/share/boost-predef/check/predef_check_as_c.c
+x64-windows/share/boost-predef/check/predef_check_as_cpp.cpp
+x64-windows/share/boost-predef/check/predef_check_as_objc.m
+x64-windows/share/boost-predef/check/predef_check_as_objcpp.mm
+x64-windows/share/boost-predef/check/predef_check_cc.h
+x64-windows/share/boost-predef/check/predef_check_cc_as_c.c
+x64-windows/share/boost-predef/check/predef_check_cc_as_cpp.cpp
+x64-windows/share/boost-predef/check/predef_check_cc_as_objc.m
+x64-windows/share/boost-predef/check/predef_check_cc_as_objcpp.mm
+x64-windows/share/boost-predef/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-predef_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,176 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/endian.hpp
+x64-windows-static/include/boost/predef.h
+x64-windows-static/include/boost/predef/
+x64-windows-static/include/boost/predef/architecture.h
+x64-windows-static/include/boost/predef/architecture/
+x64-windows-static/include/boost/predef/architecture/alpha.h
+x64-windows-static/include/boost/predef/architecture/arm.h
+x64-windows-static/include/boost/predef/architecture/blackfin.h
+x64-windows-static/include/boost/predef/architecture/convex.h
+x64-windows-static/include/boost/predef/architecture/ia64.h
+x64-windows-static/include/boost/predef/architecture/m68k.h
+x64-windows-static/include/boost/predef/architecture/mips.h
+x64-windows-static/include/boost/predef/architecture/parisc.h
+x64-windows-static/include/boost/predef/architecture/ppc.h
+x64-windows-static/include/boost/predef/architecture/pyramid.h
+x64-windows-static/include/boost/predef/architecture/rs6k.h
+x64-windows-static/include/boost/predef/architecture/sparc.h
+x64-windows-static/include/boost/predef/architecture/superh.h
+x64-windows-static/include/boost/predef/architecture/sys370.h
+x64-windows-static/include/boost/predef/architecture/sys390.h
+x64-windows-static/include/boost/predef/architecture/x86.h
+x64-windows-static/include/boost/predef/architecture/x86/
+x64-windows-static/include/boost/predef/architecture/x86/32.h
+x64-windows-static/include/boost/predef/architecture/x86/64.h
+x64-windows-static/include/boost/predef/architecture/z.h
+x64-windows-static/include/boost/predef/compiler.h
+x64-windows-static/include/boost/predef/compiler/
+x64-windows-static/include/boost/predef/compiler/borland.h
+x64-windows-static/include/boost/predef/compiler/clang.h
+x64-windows-static/include/boost/predef/compiler/comeau.h
+x64-windows-static/include/boost/predef/compiler/compaq.h
+x64-windows-static/include/boost/predef/compiler/diab.h
+x64-windows-static/include/boost/predef/compiler/digitalmars.h
+x64-windows-static/include/boost/predef/compiler/dignus.h
+x64-windows-static/include/boost/predef/compiler/edg.h
+x64-windows-static/include/boost/predef/compiler/ekopath.h
+x64-windows-static/include/boost/predef/compiler/gcc.h
+x64-windows-static/include/boost/predef/compiler/gcc_xml.h
+x64-windows-static/include/boost/predef/compiler/greenhills.h
+x64-windows-static/include/boost/predef/compiler/hp_acc.h
+x64-windows-static/include/boost/predef/compiler/iar.h
+x64-windows-static/include/boost/predef/compiler/ibm.h
+x64-windows-static/include/boost/predef/compiler/intel.h
+x64-windows-static/include/boost/predef/compiler/kai.h
+x64-windows-static/include/boost/predef/compiler/llvm.h
+x64-windows-static/include/boost/predef/compiler/metaware.h
+x64-windows-static/include/boost/predef/compiler/metrowerks.h
+x64-windows-static/include/boost/predef/compiler/microtec.h
+x64-windows-static/include/boost/predef/compiler/mpw.h
+x64-windows-static/include/boost/predef/compiler/palm.h
+x64-windows-static/include/boost/predef/compiler/pgi.h
+x64-windows-static/include/boost/predef/compiler/sgi_mipspro.h
+x64-windows-static/include/boost/predef/compiler/sunpro.h
+x64-windows-static/include/boost/predef/compiler/tendra.h
+x64-windows-static/include/boost/predef/compiler/visualc.h
+x64-windows-static/include/boost/predef/compiler/watcom.h
+x64-windows-static/include/boost/predef/detail/
+x64-windows-static/include/boost/predef/detail/_cassert.h
+x64-windows-static/include/boost/predef/detail/_exception.h
+x64-windows-static/include/boost/predef/detail/comp_detected.h
+x64-windows-static/include/boost/predef/detail/endian_compat.h
+x64-windows-static/include/boost/predef/detail/os_detected.h
+x64-windows-static/include/boost/predef/detail/platform_detected.h
+x64-windows-static/include/boost/predef/detail/test.h
+x64-windows-static/include/boost/predef/detail/test_def.h
+x64-windows-static/include/boost/predef/hardware.h
+x64-windows-static/include/boost/predef/hardware/
+x64-windows-static/include/boost/predef/hardware/simd.h
+x64-windows-static/include/boost/predef/hardware/simd/
+x64-windows-static/include/boost/predef/hardware/simd/arm.h
+x64-windows-static/include/boost/predef/hardware/simd/arm/
+x64-windows-static/include/boost/predef/hardware/simd/arm/versions.h
+x64-windows-static/include/boost/predef/hardware/simd/ppc.h
+x64-windows-static/include/boost/predef/hardware/simd/ppc/
+x64-windows-static/include/boost/predef/hardware/simd/ppc/versions.h
+x64-windows-static/include/boost/predef/hardware/simd/x86.h
+x64-windows-static/include/boost/predef/hardware/simd/x86/
+x64-windows-static/include/boost/predef/hardware/simd/x86/versions.h
+x64-windows-static/include/boost/predef/hardware/simd/x86_amd.h
+x64-windows-static/include/boost/predef/hardware/simd/x86_amd/
+x64-windows-static/include/boost/predef/hardware/simd/x86_amd/versions.h
+x64-windows-static/include/boost/predef/language.h
+x64-windows-static/include/boost/predef/language/
+x64-windows-static/include/boost/predef/language/objc.h
+x64-windows-static/include/boost/predef/language/stdc.h
+x64-windows-static/include/boost/predef/language/stdcpp.h
+x64-windows-static/include/boost/predef/library.h
+x64-windows-static/include/boost/predef/library/
+x64-windows-static/include/boost/predef/library/c.h
+x64-windows-static/include/boost/predef/library/c/
+x64-windows-static/include/boost/predef/library/c/_prefix.h
+x64-windows-static/include/boost/predef/library/c/cloudabi.h
+x64-windows-static/include/boost/predef/library/c/gnu.h
+x64-windows-static/include/boost/predef/library/c/uc.h
+x64-windows-static/include/boost/predef/library/c/vms.h
+x64-windows-static/include/boost/predef/library/c/zos.h
+x64-windows-static/include/boost/predef/library/std.h
+x64-windows-static/include/boost/predef/library/std/
+x64-windows-static/include/boost/predef/library/std/_prefix.h
+x64-windows-static/include/boost/predef/library/std/cxx.h
+x64-windows-static/include/boost/predef/library/std/dinkumware.h
+x64-windows-static/include/boost/predef/library/std/libcomo.h
+x64-windows-static/include/boost/predef/library/std/modena.h
+x64-windows-static/include/boost/predef/library/std/msl.h
+x64-windows-static/include/boost/predef/library/std/roguewave.h
+x64-windows-static/include/boost/predef/library/std/sgi.h
+x64-windows-static/include/boost/predef/library/std/stdcpp3.h
+x64-windows-static/include/boost/predef/library/std/stlport.h
+x64-windows-static/include/boost/predef/library/std/vacpp.h
+x64-windows-static/include/boost/predef/make.h
+x64-windows-static/include/boost/predef/os.h
+x64-windows-static/include/boost/predef/os/
+x64-windows-static/include/boost/predef/os/aix.h
+x64-windows-static/include/boost/predef/os/amigaos.h
+x64-windows-static/include/boost/predef/os/android.h
+x64-windows-static/include/boost/predef/os/beos.h
+x64-windows-static/include/boost/predef/os/bsd.h
+x64-windows-static/include/boost/predef/os/bsd/
+x64-windows-static/include/boost/predef/os/bsd/bsdi.h
+x64-windows-static/include/boost/predef/os/bsd/dragonfly.h
+x64-windows-static/include/boost/predef/os/bsd/free.h
+x64-windows-static/include/boost/predef/os/bsd/net.h
+x64-windows-static/include/boost/predef/os/bsd/open.h
+x64-windows-static/include/boost/predef/os/cygwin.h
+x64-windows-static/include/boost/predef/os/haiku.h
+x64-windows-static/include/boost/predef/os/hpux.h
+x64-windows-static/include/boost/predef/os/ios.h
+x64-windows-static/include/boost/predef/os/irix.h
+x64-windows-static/include/boost/predef/os/linux.h
+x64-windows-static/include/boost/predef/os/macos.h
+x64-windows-static/include/boost/predef/os/os400.h
+x64-windows-static/include/boost/predef/os/qnxnto.h
+x64-windows-static/include/boost/predef/os/solaris.h
+x64-windows-static/include/boost/predef/os/unix.h
+x64-windows-static/include/boost/predef/os/vms.h
+x64-windows-static/include/boost/predef/os/windows.h
+x64-windows-static/include/boost/predef/other.h
+x64-windows-static/include/boost/predef/other/
+x64-windows-static/include/boost/predef/other/endian.h
+x64-windows-static/include/boost/predef/other/workaround.h
+x64-windows-static/include/boost/predef/platform.h
+x64-windows-static/include/boost/predef/platform/
+x64-windows-static/include/boost/predef/platform/cloudabi.h
+x64-windows-static/include/boost/predef/platform/ios.h
+x64-windows-static/include/boost/predef/platform/mingw.h
+x64-windows-static/include/boost/predef/platform/mingw32.h
+x64-windows-static/include/boost/predef/platform/mingw64.h
+x64-windows-static/include/boost/predef/platform/windows_desktop.h
+x64-windows-static/include/boost/predef/platform/windows_phone.h
+x64-windows-static/include/boost/predef/platform/windows_runtime.h
+x64-windows-static/include/boost/predef/platform/windows_server.h
+x64-windows-static/include/boost/predef/platform/windows_store.h
+x64-windows-static/include/boost/predef/platform/windows_system.h
+x64-windows-static/include/boost/predef/platform/windows_uwp.h
+x64-windows-static/include/boost/predef/version.h
+x64-windows-static/include/boost/predef/version_number.h
+x64-windows-static/share/
+x64-windows-static/share/boost-predef/
+x64-windows-static/share/boost-predef/check/
+x64-windows-static/share/boost-predef/check/build.jam
+x64-windows-static/share/boost-predef/check/predef.jam
+x64-windows-static/share/boost-predef/check/predef_check.h
+x64-windows-static/share/boost-predef/check/predef_check_as_c.c
+x64-windows-static/share/boost-predef/check/predef_check_as_cpp.cpp
+x64-windows-static/share/boost-predef/check/predef_check_as_objc.m
+x64-windows-static/share/boost-predef/check/predef_check_as_objcpp.mm
+x64-windows-static/share/boost-predef/check/predef_check_cc.h
+x64-windows-static/share/boost-predef/check/predef_check_cc_as_c.c
+x64-windows-static/share/boost-predef/check/predef_check_cc_as_cpp.cpp
+x64-windows-static/share/boost-predef/check/predef_check_cc_as_objc.m
+x64-windows-static/share/boost-predef/check/predef_check_cc_as_objcpp.mm
+x64-windows-static/share/boost-predef/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,318 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/preprocessor.hpp
+x64-windows/include/boost/preprocessor/
+x64-windows/include/boost/preprocessor/arithmetic.hpp
+x64-windows/include/boost/preprocessor/arithmetic/
+x64-windows/include/boost/preprocessor/arithmetic/add.hpp
+x64-windows/include/boost/preprocessor/arithmetic/dec.hpp
+x64-windows/include/boost/preprocessor/arithmetic/detail/
+x64-windows/include/boost/preprocessor/arithmetic/detail/div_base.hpp
+x64-windows/include/boost/preprocessor/arithmetic/div.hpp
+x64-windows/include/boost/preprocessor/arithmetic/inc.hpp
+x64-windows/include/boost/preprocessor/arithmetic/mod.hpp
+x64-windows/include/boost/preprocessor/arithmetic/mul.hpp
+x64-windows/include/boost/preprocessor/arithmetic/sub.hpp
+x64-windows/include/boost/preprocessor/array.hpp
+x64-windows/include/boost/preprocessor/array/
+x64-windows/include/boost/preprocessor/array/data.hpp
+x64-windows/include/boost/preprocessor/array/detail/
+x64-windows/include/boost/preprocessor/array/detail/get_data.hpp
+x64-windows/include/boost/preprocessor/array/elem.hpp
+x64-windows/include/boost/preprocessor/array/enum.hpp
+x64-windows/include/boost/preprocessor/array/insert.hpp
+x64-windows/include/boost/preprocessor/array/pop_back.hpp
+x64-windows/include/boost/preprocessor/array/pop_front.hpp
+x64-windows/include/boost/preprocessor/array/push_back.hpp
+x64-windows/include/boost/preprocessor/array/push_front.hpp
+x64-windows/include/boost/preprocessor/array/remove.hpp
+x64-windows/include/boost/preprocessor/array/replace.hpp
+x64-windows/include/boost/preprocessor/array/reverse.hpp
+x64-windows/include/boost/preprocessor/array/size.hpp
+x64-windows/include/boost/preprocessor/array/to_list.hpp
+x64-windows/include/boost/preprocessor/array/to_seq.hpp
+x64-windows/include/boost/preprocessor/array/to_tuple.hpp
+x64-windows/include/boost/preprocessor/assert_msg.hpp
+x64-windows/include/boost/preprocessor/cat.hpp
+x64-windows/include/boost/preprocessor/comma.hpp
+x64-windows/include/boost/preprocessor/comma_if.hpp
+x64-windows/include/boost/preprocessor/comparison.hpp
+x64-windows/include/boost/preprocessor/comparison/
+x64-windows/include/boost/preprocessor/comparison/equal.hpp
+x64-windows/include/boost/preprocessor/comparison/greater.hpp
+x64-windows/include/boost/preprocessor/comparison/greater_equal.hpp
+x64-windows/include/boost/preprocessor/comparison/less.hpp
+x64-windows/include/boost/preprocessor/comparison/less_equal.hpp
+x64-windows/include/boost/preprocessor/comparison/not_equal.hpp
+x64-windows/include/boost/preprocessor/config/
+x64-windows/include/boost/preprocessor/config/config.hpp
+x64-windows/include/boost/preprocessor/config/limits.hpp
+x64-windows/include/boost/preprocessor/control.hpp
+x64-windows/include/boost/preprocessor/control/
+x64-windows/include/boost/preprocessor/control/deduce_d.hpp
+x64-windows/include/boost/preprocessor/control/detail/
+x64-windows/include/boost/preprocessor/control/detail/dmc/
+x64-windows/include/boost/preprocessor/control/detail/dmc/while.hpp
+x64-windows/include/boost/preprocessor/control/detail/edg/
+x64-windows/include/boost/preprocessor/control/detail/edg/while.hpp
+x64-windows/include/boost/preprocessor/control/detail/msvc/
+x64-windows/include/boost/preprocessor/control/detail/msvc/while.hpp
+x64-windows/include/boost/preprocessor/control/detail/while.hpp
+x64-windows/include/boost/preprocessor/control/expr_if.hpp
+x64-windows/include/boost/preprocessor/control/expr_iif.hpp
+x64-windows/include/boost/preprocessor/control/if.hpp
+x64-windows/include/boost/preprocessor/control/iif.hpp
+x64-windows/include/boost/preprocessor/control/while.hpp
+x64-windows/include/boost/preprocessor/debug.hpp
+x64-windows/include/boost/preprocessor/debug/
+x64-windows/include/boost/preprocessor/debug/assert.hpp
+x64-windows/include/boost/preprocessor/debug/error.hpp
+x64-windows/include/boost/preprocessor/debug/line.hpp
+x64-windows/include/boost/preprocessor/dec.hpp
+x64-windows/include/boost/preprocessor/detail/
+x64-windows/include/boost/preprocessor/detail/auto_rec.hpp
+x64-windows/include/boost/preprocessor/detail/check.hpp
+x64-windows/include/boost/preprocessor/detail/dmc/
+x64-windows/include/boost/preprocessor/detail/dmc/auto_rec.hpp
+x64-windows/include/boost/preprocessor/detail/is_binary.hpp
+x64-windows/include/boost/preprocessor/detail/is_nullary.hpp
+x64-windows/include/boost/preprocessor/detail/is_unary.hpp
+x64-windows/include/boost/preprocessor/detail/null.hpp
+x64-windows/include/boost/preprocessor/detail/split.hpp
+x64-windows/include/boost/preprocessor/empty.hpp
+x64-windows/include/boost/preprocessor/enum.hpp
+x64-windows/include/boost/preprocessor/enum_params.hpp
+x64-windows/include/boost/preprocessor/enum_params_with_a_default.hpp
+x64-windows/include/boost/preprocessor/enum_params_with_defaults.hpp
+x64-windows/include/boost/preprocessor/enum_shifted.hpp
+x64-windows/include/boost/preprocessor/enum_shifted_params.hpp
+x64-windows/include/boost/preprocessor/expand.hpp
+x64-windows/include/boost/preprocessor/expr_if.hpp
+x64-windows/include/boost/preprocessor/facilities.hpp
+x64-windows/include/boost/preprocessor/facilities/
+x64-windows/include/boost/preprocessor/facilities/apply.hpp
+x64-windows/include/boost/preprocessor/facilities/detail/
+x64-windows/include/boost/preprocessor/facilities/detail/is_empty.hpp
+x64-windows/include/boost/preprocessor/facilities/empty.hpp
+x64-windows/include/boost/preprocessor/facilities/expand.hpp
+x64-windows/include/boost/preprocessor/facilities/identity.hpp
+x64-windows/include/boost/preprocessor/facilities/intercept.hpp
+x64-windows/include/boost/preprocessor/facilities/is_1.hpp
+x64-windows/include/boost/preprocessor/facilities/is_empty.hpp
+x64-windows/include/boost/preprocessor/facilities/is_empty_or_1.hpp
+x64-windows/include/boost/preprocessor/facilities/is_empty_variadic.hpp
+x64-windows/include/boost/preprocessor/facilities/overload.hpp
+x64-windows/include/boost/preprocessor/for.hpp
+x64-windows/include/boost/preprocessor/identity.hpp
+x64-windows/include/boost/preprocessor/if.hpp
+x64-windows/include/boost/preprocessor/inc.hpp
+x64-windows/include/boost/preprocessor/iterate.hpp
+x64-windows/include/boost/preprocessor/iteration.hpp
+x64-windows/include/boost/preprocessor/iteration/
+x64-windows/include/boost/preprocessor/iteration/detail/
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower1.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower2.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower3.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower4.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower5.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper1.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper2.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper3.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper4.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper5.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/finish.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward1.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward2.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward3.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward4.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward5.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse1.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse2.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse3.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse4.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse5.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/local.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/rlocal.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/self.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/start.hpp
+x64-windows/include/boost/preprocessor/iteration/iterate.hpp
+x64-windows/include/boost/preprocessor/iteration/local.hpp
+x64-windows/include/boost/preprocessor/iteration/self.hpp
+x64-windows/include/boost/preprocessor/library.hpp
+x64-windows/include/boost/preprocessor/limits.hpp
+x64-windows/include/boost/preprocessor/list.hpp
+x64-windows/include/boost/preprocessor/list/
+x64-windows/include/boost/preprocessor/list/adt.hpp
+x64-windows/include/boost/preprocessor/list/append.hpp
+x64-windows/include/boost/preprocessor/list/at.hpp
+x64-windows/include/boost/preprocessor/list/cat.hpp
+x64-windows/include/boost/preprocessor/list/detail/
+x64-windows/include/boost/preprocessor/list/detail/dmc/
+x64-windows/include/boost/preprocessor/list/detail/dmc/fold_left.hpp
+x64-windows/include/boost/preprocessor/list/detail/edg/
+x64-windows/include/boost/preprocessor/list/detail/edg/fold_left.hpp
+x64-windows/include/boost/preprocessor/list/detail/edg/fold_right.hpp
+x64-windows/include/boost/preprocessor/list/detail/fold_left.hpp
+x64-windows/include/boost/preprocessor/list/detail/fold_right.hpp
+x64-windows/include/boost/preprocessor/list/enum.hpp
+x64-windows/include/boost/preprocessor/list/filter.hpp
+x64-windows/include/boost/preprocessor/list/first_n.hpp
+x64-windows/include/boost/preprocessor/list/fold_left.hpp
+x64-windows/include/boost/preprocessor/list/fold_right.hpp
+x64-windows/include/boost/preprocessor/list/for_each.hpp
+x64-windows/include/boost/preprocessor/list/for_each_i.hpp
+x64-windows/include/boost/preprocessor/list/for_each_product.hpp
+x64-windows/include/boost/preprocessor/list/rest_n.hpp
+x64-windows/include/boost/preprocessor/list/reverse.hpp
+x64-windows/include/boost/preprocessor/list/size.hpp
+x64-windows/include/boost/preprocessor/list/to_array.hpp
+x64-windows/include/boost/preprocessor/list/to_seq.hpp
+x64-windows/include/boost/preprocessor/list/to_tuple.hpp
+x64-windows/include/boost/preprocessor/list/transform.hpp
+x64-windows/include/boost/preprocessor/logical.hpp
+x64-windows/include/boost/preprocessor/logical/
+x64-windows/include/boost/preprocessor/logical/and.hpp
+x64-windows/include/boost/preprocessor/logical/bitand.hpp
+x64-windows/include/boost/preprocessor/logical/bitnor.hpp
+x64-windows/include/boost/preprocessor/logical/bitor.hpp
+x64-windows/include/boost/preprocessor/logical/bitxor.hpp
+x64-windows/include/boost/preprocessor/logical/bool.hpp
+x64-windows/include/boost/preprocessor/logical/compl.hpp
+x64-windows/include/boost/preprocessor/logical/nor.hpp
+x64-windows/include/boost/preprocessor/logical/not.hpp
+x64-windows/include/boost/preprocessor/logical/or.hpp
+x64-windows/include/boost/preprocessor/logical/xor.hpp
+x64-windows/include/boost/preprocessor/max.hpp
+x64-windows/include/boost/preprocessor/min.hpp
+x64-windows/include/boost/preprocessor/punctuation.hpp
+x64-windows/include/boost/preprocessor/punctuation/
+x64-windows/include/boost/preprocessor/punctuation/comma.hpp
+x64-windows/include/boost/preprocessor/punctuation/comma_if.hpp
+x64-windows/include/boost/preprocessor/punctuation/detail/
+x64-windows/include/boost/preprocessor/punctuation/detail/is_begin_parens.hpp
+x64-windows/include/boost/preprocessor/punctuation/is_begin_parens.hpp
+x64-windows/include/boost/preprocessor/punctuation/paren.hpp
+x64-windows/include/boost/preprocessor/punctuation/paren_if.hpp
+x64-windows/include/boost/preprocessor/punctuation/remove_parens.hpp
+x64-windows/include/boost/preprocessor/repeat.hpp
+x64-windows/include/boost/preprocessor/repeat_2nd.hpp
+x64-windows/include/boost/preprocessor/repeat_3rd.hpp
+x64-windows/include/boost/preprocessor/repeat_from_to.hpp
+x64-windows/include/boost/preprocessor/repeat_from_to_2nd.hpp
+x64-windows/include/boost/preprocessor/repeat_from_to_3rd.hpp
+x64-windows/include/boost/preprocessor/repetition.hpp
+x64-windows/include/boost/preprocessor/repetition/
+x64-windows/include/boost/preprocessor/repetition/deduce_r.hpp
+x64-windows/include/boost/preprocessor/repetition/deduce_z.hpp
+x64-windows/include/boost/preprocessor/repetition/detail/
+x64-windows/include/boost/preprocessor/repetition/detail/dmc/
+x64-windows/include/boost/preprocessor/repetition/detail/dmc/for.hpp
+x64-windows/include/boost/preprocessor/repetition/detail/edg/
+x64-windows/include/boost/preprocessor/repetition/detail/edg/for.hpp
+x64-windows/include/boost/preprocessor/repetition/detail/for.hpp
+x64-windows/include/boost/preprocessor/repetition/detail/msvc/
+x64-windows/include/boost/preprocessor/repetition/detail/msvc/for.hpp
+x64-windows/include/boost/preprocessor/repetition/enum.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_binary_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_params_with_a_default.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_params_with_defaults.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_shifted.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_shifted_binary_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_shifted_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_trailing.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_trailing_binary_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_trailing_params.hpp
+x64-windows/include/boost/preprocessor/repetition/for.hpp
+x64-windows/include/boost/preprocessor/repetition/repeat.hpp
+x64-windows/include/boost/preprocessor/repetition/repeat_from_to.hpp
+x64-windows/include/boost/preprocessor/selection.hpp
+x64-windows/include/boost/preprocessor/selection/
+x64-windows/include/boost/preprocessor/selection/max.hpp
+x64-windows/include/boost/preprocessor/selection/min.hpp
+x64-windows/include/boost/preprocessor/seq.hpp
+x64-windows/include/boost/preprocessor/seq/
+x64-windows/include/boost/preprocessor/seq/cat.hpp
+x64-windows/include/boost/preprocessor/seq/detail/
+x64-windows/include/boost/preprocessor/seq/detail/binary_transform.hpp
+x64-windows/include/boost/preprocessor/seq/detail/is_empty.hpp
+x64-windows/include/boost/preprocessor/seq/detail/split.hpp
+x64-windows/include/boost/preprocessor/seq/detail/to_list_msvc.hpp
+x64-windows/include/boost/preprocessor/seq/elem.hpp
+x64-windows/include/boost/preprocessor/seq/enum.hpp
+x64-windows/include/boost/preprocessor/seq/filter.hpp
+x64-windows/include/boost/preprocessor/seq/first_n.hpp
+x64-windows/include/boost/preprocessor/seq/fold_left.hpp
+x64-windows/include/boost/preprocessor/seq/fold_right.hpp
+x64-windows/include/boost/preprocessor/seq/for_each.hpp
+x64-windows/include/boost/preprocessor/seq/for_each_i.hpp
+x64-windows/include/boost/preprocessor/seq/for_each_product.hpp
+x64-windows/include/boost/preprocessor/seq/insert.hpp
+x64-windows/include/boost/preprocessor/seq/pop_back.hpp
+x64-windows/include/boost/preprocessor/seq/pop_front.hpp
+x64-windows/include/boost/preprocessor/seq/push_back.hpp
+x64-windows/include/boost/preprocessor/seq/push_front.hpp
+x64-windows/include/boost/preprocessor/seq/remove.hpp
+x64-windows/include/boost/preprocessor/seq/replace.hpp
+x64-windows/include/boost/preprocessor/seq/rest_n.hpp
+x64-windows/include/boost/preprocessor/seq/reverse.hpp
+x64-windows/include/boost/preprocessor/seq/seq.hpp
+x64-windows/include/boost/preprocessor/seq/size.hpp
+x64-windows/include/boost/preprocessor/seq/subseq.hpp
+x64-windows/include/boost/preprocessor/seq/to_array.hpp
+x64-windows/include/boost/preprocessor/seq/to_list.hpp
+x64-windows/include/boost/preprocessor/seq/to_tuple.hpp
+x64-windows/include/boost/preprocessor/seq/transform.hpp
+x64-windows/include/boost/preprocessor/seq/variadic_seq_to_seq.hpp
+x64-windows/include/boost/preprocessor/slot.hpp
+x64-windows/include/boost/preprocessor/slot/
+x64-windows/include/boost/preprocessor/slot/counter.hpp
+x64-windows/include/boost/preprocessor/slot/detail/
+x64-windows/include/boost/preprocessor/slot/detail/counter.hpp
+x64-windows/include/boost/preprocessor/slot/detail/def.hpp
+x64-windows/include/boost/preprocessor/slot/detail/shared.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot1.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot2.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot3.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot4.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot5.hpp
+x64-windows/include/boost/preprocessor/slot/slot.hpp
+x64-windows/include/boost/preprocessor/stringize.hpp
+x64-windows/include/boost/preprocessor/tuple.hpp
+x64-windows/include/boost/preprocessor/tuple/
+x64-windows/include/boost/preprocessor/tuple/detail/
+x64-windows/include/boost/preprocessor/tuple/detail/is_single_return.hpp
+x64-windows/include/boost/preprocessor/tuple/eat.hpp
+x64-windows/include/boost/preprocessor/tuple/elem.hpp
+x64-windows/include/boost/preprocessor/tuple/enum.hpp
+x64-windows/include/boost/preprocessor/tuple/insert.hpp
+x64-windows/include/boost/preprocessor/tuple/pop_back.hpp
+x64-windows/include/boost/preprocessor/tuple/pop_front.hpp
+x64-windows/include/boost/preprocessor/tuple/push_back.hpp
+x64-windows/include/boost/preprocessor/tuple/push_front.hpp
+x64-windows/include/boost/preprocessor/tuple/rem.hpp
+x64-windows/include/boost/preprocessor/tuple/remove.hpp
+x64-windows/include/boost/preprocessor/tuple/replace.hpp
+x64-windows/include/boost/preprocessor/tuple/reverse.hpp
+x64-windows/include/boost/preprocessor/tuple/size.hpp
+x64-windows/include/boost/preprocessor/tuple/to_array.hpp
+x64-windows/include/boost/preprocessor/tuple/to_list.hpp
+x64-windows/include/boost/preprocessor/tuple/to_seq.hpp
+x64-windows/include/boost/preprocessor/variadic.hpp
+x64-windows/include/boost/preprocessor/variadic/
+x64-windows/include/boost/preprocessor/variadic/detail/
+x64-windows/include/boost/preprocessor/variadic/detail/is_single_return.hpp
+x64-windows/include/boost/preprocessor/variadic/elem.hpp
+x64-windows/include/boost/preprocessor/variadic/size.hpp
+x64-windows/include/boost/preprocessor/variadic/to_array.hpp
+x64-windows/include/boost/preprocessor/variadic/to_list.hpp
+x64-windows/include/boost/preprocessor/variadic/to_seq.hpp
+x64-windows/include/boost/preprocessor/variadic/to_tuple.hpp
+x64-windows/include/boost/preprocessor/while.hpp
+x64-windows/include/boost/preprocessor/wstringize.hpp
+x64-windows/share/
+x64-windows/share/boost-preprocessor/
+x64-windows/share/boost-preprocessor/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,318 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/preprocessor.hpp
+x64-windows-static/include/boost/preprocessor/
+x64-windows-static/include/boost/preprocessor/arithmetic.hpp
+x64-windows-static/include/boost/preprocessor/arithmetic/
+x64-windows-static/include/boost/preprocessor/arithmetic/add.hpp
+x64-windows-static/include/boost/preprocessor/arithmetic/dec.hpp
+x64-windows-static/include/boost/preprocessor/arithmetic/detail/
+x64-windows-static/include/boost/preprocessor/arithmetic/detail/div_base.hpp
+x64-windows-static/include/boost/preprocessor/arithmetic/div.hpp
+x64-windows-static/include/boost/preprocessor/arithmetic/inc.hpp
+x64-windows-static/include/boost/preprocessor/arithmetic/mod.hpp
+x64-windows-static/include/boost/preprocessor/arithmetic/mul.hpp
+x64-windows-static/include/boost/preprocessor/arithmetic/sub.hpp
+x64-windows-static/include/boost/preprocessor/array.hpp
+x64-windows-static/include/boost/preprocessor/array/
+x64-windows-static/include/boost/preprocessor/array/data.hpp
+x64-windows-static/include/boost/preprocessor/array/detail/
+x64-windows-static/include/boost/preprocessor/array/detail/get_data.hpp
+x64-windows-static/include/boost/preprocessor/array/elem.hpp
+x64-windows-static/include/boost/preprocessor/array/enum.hpp
+x64-windows-static/include/boost/preprocessor/array/insert.hpp
+x64-windows-static/include/boost/preprocessor/array/pop_back.hpp
+x64-windows-static/include/boost/preprocessor/array/pop_front.hpp
+x64-windows-static/include/boost/preprocessor/array/push_back.hpp
+x64-windows-static/include/boost/preprocessor/array/push_front.hpp
+x64-windows-static/include/boost/preprocessor/array/remove.hpp
+x64-windows-static/include/boost/preprocessor/array/replace.hpp
+x64-windows-static/include/boost/preprocessor/array/reverse.hpp
+x64-windows-static/include/boost/preprocessor/array/size.hpp
+x64-windows-static/include/boost/preprocessor/array/to_list.hpp
+x64-windows-static/include/boost/preprocessor/array/to_seq.hpp
+x64-windows-static/include/boost/preprocessor/array/to_tuple.hpp
+x64-windows-static/include/boost/preprocessor/assert_msg.hpp
+x64-windows-static/include/boost/preprocessor/cat.hpp
+x64-windows-static/include/boost/preprocessor/comma.hpp
+x64-windows-static/include/boost/preprocessor/comma_if.hpp
+x64-windows-static/include/boost/preprocessor/comparison.hpp
+x64-windows-static/include/boost/preprocessor/comparison/
+x64-windows-static/include/boost/preprocessor/comparison/equal.hpp
+x64-windows-static/include/boost/preprocessor/comparison/greater.hpp
+x64-windows-static/include/boost/preprocessor/comparison/greater_equal.hpp
+x64-windows-static/include/boost/preprocessor/comparison/less.hpp
+x64-windows-static/include/boost/preprocessor/comparison/less_equal.hpp
+x64-windows-static/include/boost/preprocessor/comparison/not_equal.hpp
+x64-windows-static/include/boost/preprocessor/config/
+x64-windows-static/include/boost/preprocessor/config/config.hpp
+x64-windows-static/include/boost/preprocessor/config/limits.hpp
+x64-windows-static/include/boost/preprocessor/control.hpp
+x64-windows-static/include/boost/preprocessor/control/
+x64-windows-static/include/boost/preprocessor/control/deduce_d.hpp
+x64-windows-static/include/boost/preprocessor/control/detail/
+x64-windows-static/include/boost/preprocessor/control/detail/dmc/
+x64-windows-static/include/boost/preprocessor/control/detail/dmc/while.hpp
+x64-windows-static/include/boost/preprocessor/control/detail/edg/
+x64-windows-static/include/boost/preprocessor/control/detail/edg/while.hpp
+x64-windows-static/include/boost/preprocessor/control/detail/msvc/
+x64-windows-static/include/boost/preprocessor/control/detail/msvc/while.hpp
+x64-windows-static/include/boost/preprocessor/control/detail/while.hpp
+x64-windows-static/include/boost/preprocessor/control/expr_if.hpp
+x64-windows-static/include/boost/preprocessor/control/expr_iif.hpp
+x64-windows-static/include/boost/preprocessor/control/if.hpp
+x64-windows-static/include/boost/preprocessor/control/iif.hpp
+x64-windows-static/include/boost/preprocessor/control/while.hpp
+x64-windows-static/include/boost/preprocessor/debug.hpp
+x64-windows-static/include/boost/preprocessor/debug/
+x64-windows-static/include/boost/preprocessor/debug/assert.hpp
+x64-windows-static/include/boost/preprocessor/debug/error.hpp
+x64-windows-static/include/boost/preprocessor/debug/line.hpp
+x64-windows-static/include/boost/preprocessor/dec.hpp
+x64-windows-static/include/boost/preprocessor/detail/
+x64-windows-static/include/boost/preprocessor/detail/auto_rec.hpp
+x64-windows-static/include/boost/preprocessor/detail/check.hpp
+x64-windows-static/include/boost/preprocessor/detail/dmc/
+x64-windows-static/include/boost/preprocessor/detail/dmc/auto_rec.hpp
+x64-windows-static/include/boost/preprocessor/detail/is_binary.hpp
+x64-windows-static/include/boost/preprocessor/detail/is_nullary.hpp
+x64-windows-static/include/boost/preprocessor/detail/is_unary.hpp
+x64-windows-static/include/boost/preprocessor/detail/null.hpp
+x64-windows-static/include/boost/preprocessor/detail/split.hpp
+x64-windows-static/include/boost/preprocessor/empty.hpp
+x64-windows-static/include/boost/preprocessor/enum.hpp
+x64-windows-static/include/boost/preprocessor/enum_params.hpp
+x64-windows-static/include/boost/preprocessor/enum_params_with_a_default.hpp
+x64-windows-static/include/boost/preprocessor/enum_params_with_defaults.hpp
+x64-windows-static/include/boost/preprocessor/enum_shifted.hpp
+x64-windows-static/include/boost/preprocessor/enum_shifted_params.hpp
+x64-windows-static/include/boost/preprocessor/expand.hpp
+x64-windows-static/include/boost/preprocessor/expr_if.hpp
+x64-windows-static/include/boost/preprocessor/facilities.hpp
+x64-windows-static/include/boost/preprocessor/facilities/
+x64-windows-static/include/boost/preprocessor/facilities/apply.hpp
+x64-windows-static/include/boost/preprocessor/facilities/detail/
+x64-windows-static/include/boost/preprocessor/facilities/detail/is_empty.hpp
+x64-windows-static/include/boost/preprocessor/facilities/empty.hpp
+x64-windows-static/include/boost/preprocessor/facilities/expand.hpp
+x64-windows-static/include/boost/preprocessor/facilities/identity.hpp
+x64-windows-static/include/boost/preprocessor/facilities/intercept.hpp
+x64-windows-static/include/boost/preprocessor/facilities/is_1.hpp
+x64-windows-static/include/boost/preprocessor/facilities/is_empty.hpp
+x64-windows-static/include/boost/preprocessor/facilities/is_empty_or_1.hpp
+x64-windows-static/include/boost/preprocessor/facilities/is_empty_variadic.hpp
+x64-windows-static/include/boost/preprocessor/facilities/overload.hpp
+x64-windows-static/include/boost/preprocessor/for.hpp
+x64-windows-static/include/boost/preprocessor/identity.hpp
+x64-windows-static/include/boost/preprocessor/if.hpp
+x64-windows-static/include/boost/preprocessor/inc.hpp
+x64-windows-static/include/boost/preprocessor/iterate.hpp
+x64-windows-static/include/boost/preprocessor/iteration.hpp
+x64-windows-static/include/boost/preprocessor/iteration/
+x64-windows-static/include/boost/preprocessor/iteration/detail/
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/lower1.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/lower2.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/lower3.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/lower4.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/lower5.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/upper1.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/upper2.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/upper3.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/upper4.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/bounds/upper5.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/finish.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/forward1.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/forward2.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/forward3.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/forward4.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/forward5.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/reverse1.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/reverse2.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/reverse3.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/reverse4.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/iter/reverse5.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/local.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/rlocal.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/self.hpp
+x64-windows-static/include/boost/preprocessor/iteration/detail/start.hpp
+x64-windows-static/include/boost/preprocessor/iteration/iterate.hpp
+x64-windows-static/include/boost/preprocessor/iteration/local.hpp
+x64-windows-static/include/boost/preprocessor/iteration/self.hpp
+x64-windows-static/include/boost/preprocessor/library.hpp
+x64-windows-static/include/boost/preprocessor/limits.hpp
+x64-windows-static/include/boost/preprocessor/list.hpp
+x64-windows-static/include/boost/preprocessor/list/
+x64-windows-static/include/boost/preprocessor/list/adt.hpp
+x64-windows-static/include/boost/preprocessor/list/append.hpp
+x64-windows-static/include/boost/preprocessor/list/at.hpp
+x64-windows-static/include/boost/preprocessor/list/cat.hpp
+x64-windows-static/include/boost/preprocessor/list/detail/
+x64-windows-static/include/boost/preprocessor/list/detail/dmc/
+x64-windows-static/include/boost/preprocessor/list/detail/dmc/fold_left.hpp
+x64-windows-static/include/boost/preprocessor/list/detail/edg/
+x64-windows-static/include/boost/preprocessor/list/detail/edg/fold_left.hpp
+x64-windows-static/include/boost/preprocessor/list/detail/edg/fold_right.hpp
+x64-windows-static/include/boost/preprocessor/list/detail/fold_left.hpp
+x64-windows-static/include/boost/preprocessor/list/detail/fold_right.hpp
+x64-windows-static/include/boost/preprocessor/list/enum.hpp
+x64-windows-static/include/boost/preprocessor/list/filter.hpp
+x64-windows-static/include/boost/preprocessor/list/first_n.hpp
+x64-windows-static/include/boost/preprocessor/list/fold_left.hpp
+x64-windows-static/include/boost/preprocessor/list/fold_right.hpp
+x64-windows-static/include/boost/preprocessor/list/for_each.hpp
+x64-windows-static/include/boost/preprocessor/list/for_each_i.hpp
+x64-windows-static/include/boost/preprocessor/list/for_each_product.hpp
+x64-windows-static/include/boost/preprocessor/list/rest_n.hpp
+x64-windows-static/include/boost/preprocessor/list/reverse.hpp
+x64-windows-static/include/boost/preprocessor/list/size.hpp
+x64-windows-static/include/boost/preprocessor/list/to_array.hpp
+x64-windows-static/include/boost/preprocessor/list/to_seq.hpp
+x64-windows-static/include/boost/preprocessor/list/to_tuple.hpp
+x64-windows-static/include/boost/preprocessor/list/transform.hpp
+x64-windows-static/include/boost/preprocessor/logical.hpp
+x64-windows-static/include/boost/preprocessor/logical/
+x64-windows-static/include/boost/preprocessor/logical/and.hpp
+x64-windows-static/include/boost/preprocessor/logical/bitand.hpp
+x64-windows-static/include/boost/preprocessor/logical/bitnor.hpp
+x64-windows-static/include/boost/preprocessor/logical/bitor.hpp
+x64-windows-static/include/boost/preprocessor/logical/bitxor.hpp
+x64-windows-static/include/boost/preprocessor/logical/bool.hpp
+x64-windows-static/include/boost/preprocessor/logical/compl.hpp
+x64-windows-static/include/boost/preprocessor/logical/nor.hpp
+x64-windows-static/include/boost/preprocessor/logical/not.hpp
+x64-windows-static/include/boost/preprocessor/logical/or.hpp
+x64-windows-static/include/boost/preprocessor/logical/xor.hpp
+x64-windows-static/include/boost/preprocessor/max.hpp
+x64-windows-static/include/boost/preprocessor/min.hpp
+x64-windows-static/include/boost/preprocessor/punctuation.hpp
+x64-windows-static/include/boost/preprocessor/punctuation/
+x64-windows-static/include/boost/preprocessor/punctuation/comma.hpp
+x64-windows-static/include/boost/preprocessor/punctuation/comma_if.hpp
+x64-windows-static/include/boost/preprocessor/punctuation/detail/
+x64-windows-static/include/boost/preprocessor/punctuation/detail/is_begin_parens.hpp
+x64-windows-static/include/boost/preprocessor/punctuation/is_begin_parens.hpp
+x64-windows-static/include/boost/preprocessor/punctuation/paren.hpp
+x64-windows-static/include/boost/preprocessor/punctuation/paren_if.hpp
+x64-windows-static/include/boost/preprocessor/punctuation/remove_parens.hpp
+x64-windows-static/include/boost/preprocessor/repeat.hpp
+x64-windows-static/include/boost/preprocessor/repeat_2nd.hpp
+x64-windows-static/include/boost/preprocessor/repeat_3rd.hpp
+x64-windows-static/include/boost/preprocessor/repeat_from_to.hpp
+x64-windows-static/include/boost/preprocessor/repeat_from_to_2nd.hpp
+x64-windows-static/include/boost/preprocessor/repeat_from_to_3rd.hpp
+x64-windows-static/include/boost/preprocessor/repetition.hpp
+x64-windows-static/include/boost/preprocessor/repetition/
+x64-windows-static/include/boost/preprocessor/repetition/deduce_r.hpp
+x64-windows-static/include/boost/preprocessor/repetition/deduce_z.hpp
+x64-windows-static/include/boost/preprocessor/repetition/detail/
+x64-windows-static/include/boost/preprocessor/repetition/detail/dmc/
+x64-windows-static/include/boost/preprocessor/repetition/detail/dmc/for.hpp
+x64-windows-static/include/boost/preprocessor/repetition/detail/edg/
+x64-windows-static/include/boost/preprocessor/repetition/detail/edg/for.hpp
+x64-windows-static/include/boost/preprocessor/repetition/detail/for.hpp
+x64-windows-static/include/boost/preprocessor/repetition/detail/msvc/
+x64-windows-static/include/boost/preprocessor/repetition/detail/msvc/for.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_binary_params.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_params.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_params_with_a_default.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_params_with_defaults.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_shifted.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_shifted_binary_params.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_shifted_params.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_trailing.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_trailing_binary_params.hpp
+x64-windows-static/include/boost/preprocessor/repetition/enum_trailing_params.hpp
+x64-windows-static/include/boost/preprocessor/repetition/for.hpp
+x64-windows-static/include/boost/preprocessor/repetition/repeat.hpp
+x64-windows-static/include/boost/preprocessor/repetition/repeat_from_to.hpp
+x64-windows-static/include/boost/preprocessor/selection.hpp
+x64-windows-static/include/boost/preprocessor/selection/
+x64-windows-static/include/boost/preprocessor/selection/max.hpp
+x64-windows-static/include/boost/preprocessor/selection/min.hpp
+x64-windows-static/include/boost/preprocessor/seq.hpp
+x64-windows-static/include/boost/preprocessor/seq/
+x64-windows-static/include/boost/preprocessor/seq/cat.hpp
+x64-windows-static/include/boost/preprocessor/seq/detail/
+x64-windows-static/include/boost/preprocessor/seq/detail/binary_transform.hpp
+x64-windows-static/include/boost/preprocessor/seq/detail/is_empty.hpp
+x64-windows-static/include/boost/preprocessor/seq/detail/split.hpp
+x64-windows-static/include/boost/preprocessor/seq/detail/to_list_msvc.hpp
+x64-windows-static/include/boost/preprocessor/seq/elem.hpp
+x64-windows-static/include/boost/preprocessor/seq/enum.hpp
+x64-windows-static/include/boost/preprocessor/seq/filter.hpp
+x64-windows-static/include/boost/preprocessor/seq/first_n.hpp
+x64-windows-static/include/boost/preprocessor/seq/fold_left.hpp
+x64-windows-static/include/boost/preprocessor/seq/fold_right.hpp
+x64-windows-static/include/boost/preprocessor/seq/for_each.hpp
+x64-windows-static/include/boost/preprocessor/seq/for_each_i.hpp
+x64-windows-static/include/boost/preprocessor/seq/for_each_product.hpp
+x64-windows-static/include/boost/preprocessor/seq/insert.hpp
+x64-windows-static/include/boost/preprocessor/seq/pop_back.hpp
+x64-windows-static/include/boost/preprocessor/seq/pop_front.hpp
+x64-windows-static/include/boost/preprocessor/seq/push_back.hpp
+x64-windows-static/include/boost/preprocessor/seq/push_front.hpp
+x64-windows-static/include/boost/preprocessor/seq/remove.hpp
+x64-windows-static/include/boost/preprocessor/seq/replace.hpp
+x64-windows-static/include/boost/preprocessor/seq/rest_n.hpp
+x64-windows-static/include/boost/preprocessor/seq/reverse.hpp
+x64-windows-static/include/boost/preprocessor/seq/seq.hpp
+x64-windows-static/include/boost/preprocessor/seq/size.hpp
+x64-windows-static/include/boost/preprocessor/seq/subseq.hpp
+x64-windows-static/include/boost/preprocessor/seq/to_array.hpp
+x64-windows-static/include/boost/preprocessor/seq/to_list.hpp
+x64-windows-static/include/boost/preprocessor/seq/to_tuple.hpp
+x64-windows-static/include/boost/preprocessor/seq/transform.hpp
+x64-windows-static/include/boost/preprocessor/seq/variadic_seq_to_seq.hpp
+x64-windows-static/include/boost/preprocessor/slot.hpp
+x64-windows-static/include/boost/preprocessor/slot/
+x64-windows-static/include/boost/preprocessor/slot/counter.hpp
+x64-windows-static/include/boost/preprocessor/slot/detail/
+x64-windows-static/include/boost/preprocessor/slot/detail/counter.hpp
+x64-windows-static/include/boost/preprocessor/slot/detail/def.hpp
+x64-windows-static/include/boost/preprocessor/slot/detail/shared.hpp
+x64-windows-static/include/boost/preprocessor/slot/detail/slot1.hpp
+x64-windows-static/include/boost/preprocessor/slot/detail/slot2.hpp
+x64-windows-static/include/boost/preprocessor/slot/detail/slot3.hpp
+x64-windows-static/include/boost/preprocessor/slot/detail/slot4.hpp
+x64-windows-static/include/boost/preprocessor/slot/detail/slot5.hpp
+x64-windows-static/include/boost/preprocessor/slot/slot.hpp
+x64-windows-static/include/boost/preprocessor/stringize.hpp
+x64-windows-static/include/boost/preprocessor/tuple.hpp
+x64-windows-static/include/boost/preprocessor/tuple/
+x64-windows-static/include/boost/preprocessor/tuple/detail/
+x64-windows-static/include/boost/preprocessor/tuple/detail/is_single_return.hpp
+x64-windows-static/include/boost/preprocessor/tuple/eat.hpp
+x64-windows-static/include/boost/preprocessor/tuple/elem.hpp
+x64-windows-static/include/boost/preprocessor/tuple/enum.hpp
+x64-windows-static/include/boost/preprocessor/tuple/insert.hpp
+x64-windows-static/include/boost/preprocessor/tuple/pop_back.hpp
+x64-windows-static/include/boost/preprocessor/tuple/pop_front.hpp
+x64-windows-static/include/boost/preprocessor/tuple/push_back.hpp
+x64-windows-static/include/boost/preprocessor/tuple/push_front.hpp
+x64-windows-static/include/boost/preprocessor/tuple/rem.hpp
+x64-windows-static/include/boost/preprocessor/tuple/remove.hpp
+x64-windows-static/include/boost/preprocessor/tuple/replace.hpp
+x64-windows-static/include/boost/preprocessor/tuple/reverse.hpp
+x64-windows-static/include/boost/preprocessor/tuple/size.hpp
+x64-windows-static/include/boost/preprocessor/tuple/to_array.hpp
+x64-windows-static/include/boost/preprocessor/tuple/to_list.hpp
+x64-windows-static/include/boost/preprocessor/tuple/to_seq.hpp
+x64-windows-static/include/boost/preprocessor/variadic.hpp
+x64-windows-static/include/boost/preprocessor/variadic/
+x64-windows-static/include/boost/preprocessor/variadic/detail/
+x64-windows-static/include/boost/preprocessor/variadic/detail/is_single_return.hpp
+x64-windows-static/include/boost/preprocessor/variadic/elem.hpp
+x64-windows-static/include/boost/preprocessor/variadic/size.hpp
+x64-windows-static/include/boost/preprocessor/variadic/to_array.hpp
+x64-windows-static/include/boost/preprocessor/variadic/to_list.hpp
+x64-windows-static/include/boost/preprocessor/variadic/to_seq.hpp
+x64-windows-static/include/boost/preprocessor/variadic/to_tuple.hpp
+x64-windows-static/include/boost/preprocessor/while.hpp
+x64-windows-static/include/boost/preprocessor/wstringize.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-preprocessor/
+x64-windows-static/share/boost-preprocessor/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/property_map/
+x64-windows/include/boost/property_map/compose_property_map.hpp
+x64-windows/include/boost/property_map/dynamic_property_map.hpp
+x64-windows/include/boost/property_map/function_property_map.hpp
+x64-windows/include/boost/property_map/parallel/
+x64-windows/include/boost/property_map/parallel/basic_reduce.hpp
+x64-windows/include/boost/property_map/parallel/caching_property_map.hpp
+x64-windows/include/boost/property_map/parallel/detail/
+x64-windows/include/boost/property_map/parallel/detail/untracked_pair.hpp
+x64-windows/include/boost/property_map/parallel/distributed_property_map.hpp
+x64-windows/include/boost/property_map/parallel/global_index_map.hpp
+x64-windows/include/boost/property_map/parallel/impl/
+x64-windows/include/boost/property_map/parallel/impl/distributed_property_map.ipp
+x64-windows/include/boost/property_map/parallel/local_property_map.hpp
+x64-windows/include/boost/property_map/parallel/parallel_property_maps.hpp
+x64-windows/include/boost/property_map/parallel/process_group.hpp
+x64-windows/include/boost/property_map/parallel/simple_trigger.hpp
+x64-windows/include/boost/property_map/parallel/unsafe_serialize.hpp
+x64-windows/include/boost/property_map/parallel/vector_property_map.hpp
+x64-windows/include/boost/property_map/property_map.hpp
+x64-windows/include/boost/property_map/property_map_iterator.hpp
+x64-windows/include/boost/property_map/shared_array_property_map.hpp
+x64-windows/include/boost/property_map/transform_value_property_map.hpp
+x64-windows/include/boost/property_map/vector_property_map.hpp
+x64-windows/share/
+x64-windows/share/boost-property-map/
+x64-windows/share/boost-property-map/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/property_map/
+x64-windows-static/include/boost/property_map/compose_property_map.hpp
+x64-windows-static/include/boost/property_map/dynamic_property_map.hpp
+x64-windows-static/include/boost/property_map/function_property_map.hpp
+x64-windows-static/include/boost/property_map/parallel/
+x64-windows-static/include/boost/property_map/parallel/basic_reduce.hpp
+x64-windows-static/include/boost/property_map/parallel/caching_property_map.hpp
+x64-windows-static/include/boost/property_map/parallel/detail/
+x64-windows-static/include/boost/property_map/parallel/detail/untracked_pair.hpp
+x64-windows-static/include/boost/property_map/parallel/distributed_property_map.hpp
+x64-windows-static/include/boost/property_map/parallel/global_index_map.hpp
+x64-windows-static/include/boost/property_map/parallel/impl/
+x64-windows-static/include/boost/property_map/parallel/impl/distributed_property_map.ipp
+x64-windows-static/include/boost/property_map/parallel/local_property_map.hpp
+x64-windows-static/include/boost/property_map/parallel/parallel_property_maps.hpp
+x64-windows-static/include/boost/property_map/parallel/process_group.hpp
+x64-windows-static/include/boost/property_map/parallel/simple_trigger.hpp
+x64-windows-static/include/boost/property_map/parallel/unsafe_serialize.hpp
+x64-windows-static/include/boost/property_map/parallel/vector_property_map.hpp
+x64-windows-static/include/boost/property_map/property_map.hpp
+x64-windows-static/include/boost/property_map/property_map_iterator.hpp
+x64-windows-static/include/boost/property_map/shared_array_property_map.hpp
+x64-windows-static/include/boost/property_map/transform_value_property_map.hpp
+x64-windows-static/include/boost/property_map/vector_property_map.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-property-map/
+x64-windows-static/share/boost-property-map/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/property_tree/
+x64-windows/include/boost/property_tree/detail/
+x64-windows/include/boost/property_tree/detail/exception_implementation.hpp
+x64-windows/include/boost/property_tree/detail/file_parser_error.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_error.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_read.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_utils.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_write.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_writer_settings.hpp
+x64-windows/include/boost/property_tree/detail/ptree_implementation.hpp
+x64-windows/include/boost/property_tree/detail/ptree_utils.hpp
+x64-windows/include/boost/property_tree/detail/rapidxml.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_error.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_flags.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_read_rapidxml.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_utils.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_write.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_writer_settings.hpp
+x64-windows/include/boost/property_tree/exceptions.hpp
+x64-windows/include/boost/property_tree/id_translator.hpp
+x64-windows/include/boost/property_tree/info_parser.hpp
+x64-windows/include/boost/property_tree/ini_parser.hpp
+x64-windows/include/boost/property_tree/json_parser.hpp
+x64-windows/include/boost/property_tree/json_parser/
+x64-windows/include/boost/property_tree/json_parser/detail/
+x64-windows/include/boost/property_tree/json_parser/detail/narrow_encoding.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/parser.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/read.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/standard_callbacks.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/wide_encoding.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/write.hpp
+x64-windows/include/boost/property_tree/json_parser/error.hpp
+x64-windows/include/boost/property_tree/ptree.hpp
+x64-windows/include/boost/property_tree/ptree_fwd.hpp
+x64-windows/include/boost/property_tree/ptree_serialization.hpp
+x64-windows/include/boost/property_tree/stream_translator.hpp
+x64-windows/include/boost/property_tree/string_path.hpp
+x64-windows/include/boost/property_tree/xml_parser.hpp
+x64-windows/share/
+x64-windows/share/boost-property-tree/
+x64-windows/share/boost-property-tree/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/property_tree/
+x64-windows-static/include/boost/property_tree/detail/
+x64-windows-static/include/boost/property_tree/detail/exception_implementation.hpp
+x64-windows-static/include/boost/property_tree/detail/file_parser_error.hpp
+x64-windows-static/include/boost/property_tree/detail/info_parser_error.hpp
+x64-windows-static/include/boost/property_tree/detail/info_parser_read.hpp
+x64-windows-static/include/boost/property_tree/detail/info_parser_utils.hpp
+x64-windows-static/include/boost/property_tree/detail/info_parser_write.hpp
+x64-windows-static/include/boost/property_tree/detail/info_parser_writer_settings.hpp
+x64-windows-static/include/boost/property_tree/detail/ptree_implementation.hpp
+x64-windows-static/include/boost/property_tree/detail/ptree_utils.hpp
+x64-windows-static/include/boost/property_tree/detail/rapidxml.hpp
+x64-windows-static/include/boost/property_tree/detail/xml_parser_error.hpp
+x64-windows-static/include/boost/property_tree/detail/xml_parser_flags.hpp
+x64-windows-static/include/boost/property_tree/detail/xml_parser_read_rapidxml.hpp
+x64-windows-static/include/boost/property_tree/detail/xml_parser_utils.hpp
+x64-windows-static/include/boost/property_tree/detail/xml_parser_write.hpp
+x64-windows-static/include/boost/property_tree/detail/xml_parser_writer_settings.hpp
+x64-windows-static/include/boost/property_tree/exceptions.hpp
+x64-windows-static/include/boost/property_tree/id_translator.hpp
+x64-windows-static/include/boost/property_tree/info_parser.hpp
+x64-windows-static/include/boost/property_tree/ini_parser.hpp
+x64-windows-static/include/boost/property_tree/json_parser.hpp
+x64-windows-static/include/boost/property_tree/json_parser/
+x64-windows-static/include/boost/property_tree/json_parser/detail/
+x64-windows-static/include/boost/property_tree/json_parser/detail/narrow_encoding.hpp
+x64-windows-static/include/boost/property_tree/json_parser/detail/parser.hpp
+x64-windows-static/include/boost/property_tree/json_parser/detail/read.hpp
+x64-windows-static/include/boost/property_tree/json_parser/detail/standard_callbacks.hpp
+x64-windows-static/include/boost/property_tree/json_parser/detail/wide_encoding.hpp
+x64-windows-static/include/boost/property_tree/json_parser/detail/write.hpp
+x64-windows-static/include/boost/property_tree/json_parser/error.hpp
+x64-windows-static/include/boost/property_tree/ptree.hpp
+x64-windows-static/include/boost/property_tree/ptree_fwd.hpp
+x64-windows-static/include/boost/property_tree/ptree_serialization.hpp
+x64-windows-static/include/boost/property_tree/stream_translator.hpp
+x64-windows-static/include/boost/property_tree/string_path.hpp
+x64-windows-static/include/boost/property_tree/xml_parser.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-property-tree/
+x64-windows-static/share/boost-property-tree/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,169 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/proto/
+x64-windows/include/boost/proto/args.hpp
+x64-windows/include/boost/proto/context.hpp
+x64-windows/include/boost/proto/context/
+x64-windows/include/boost/proto/context/callable.hpp
+x64-windows/include/boost/proto/context/default.hpp
+x64-windows/include/boost/proto/context/detail/
+x64-windows/include/boost/proto/context/detail/callable_eval.hpp
+x64-windows/include/boost/proto/context/detail/default_eval.hpp
+x64-windows/include/boost/proto/context/detail/null_eval.hpp
+x64-windows/include/boost/proto/context/detail/preprocessed/
+x64-windows/include/boost/proto/context/detail/preprocessed/callable_eval.hpp
+x64-windows/include/boost/proto/context/detail/preprocessed/default_eval.hpp
+x64-windows/include/boost/proto/context/detail/preprocessed/null_eval.hpp
+x64-windows/include/boost/proto/context/null.hpp
+x64-windows/include/boost/proto/core.hpp
+x64-windows/include/boost/proto/debug.hpp
+x64-windows/include/boost/proto/deep_copy.hpp
+x64-windows/include/boost/proto/detail/
+x64-windows/include/boost/proto/detail/and_n.hpp
+x64-windows/include/boost/proto/detail/any.hpp
+x64-windows/include/boost/proto/detail/args.hpp
+x64-windows/include/boost/proto/detail/as_expr.hpp
+x64-windows/include/boost/proto/detail/as_lvalue.hpp
+x64-windows/include/boost/proto/detail/basic_expr.hpp
+x64-windows/include/boost/proto/detail/class_member_traits.hpp
+x64-windows/include/boost/proto/detail/decltype.hpp
+x64-windows/include/boost/proto/detail/deduce_domain.hpp
+x64-windows/include/boost/proto/detail/deduce_domain_n.hpp
+x64-windows/include/boost/proto/detail/deep_copy.hpp
+x64-windows/include/boost/proto/detail/deprecated.hpp
+x64-windows/include/boost/proto/detail/dont_care.hpp
+x64-windows/include/boost/proto/detail/expr.hpp
+x64-windows/include/boost/proto/detail/expr_funop.hpp
+x64-windows/include/boost/proto/detail/extends_funop.hpp
+x64-windows/include/boost/proto/detail/extends_funop_const.hpp
+x64-windows/include/boost/proto/detail/funop.hpp
+x64-windows/include/boost/proto/detail/generate_by_value.hpp
+x64-windows/include/boost/proto/detail/ignore_unused.hpp
+x64-windows/include/boost/proto/detail/is_noncopyable.hpp
+x64-windows/include/boost/proto/detail/lambda_matches.hpp
+x64-windows/include/boost/proto/detail/local.hpp
+x64-windows/include/boost/proto/detail/make_expr.hpp
+x64-windows/include/boost/proto/detail/make_expr_.hpp
+x64-windows/include/boost/proto/detail/make_expr_funop.hpp
+x64-windows/include/boost/proto/detail/matches_.hpp
+x64-windows/include/boost/proto/detail/memfun_funop.hpp
+x64-windows/include/boost/proto/detail/or_n.hpp
+x64-windows/include/boost/proto/detail/poly_function.hpp
+x64-windows/include/boost/proto/detail/poly_function_funop.hpp
+x64-windows/include/boost/proto/detail/poly_function_traits.hpp
+x64-windows/include/boost/proto/detail/preprocessed/
+x64-windows/include/boost/proto/detail/preprocessed/and_n.hpp
+x64-windows/include/boost/proto/detail/preprocessed/args.hpp
+x64-windows/include/boost/proto/detail/preprocessed/basic_expr.hpp
+x64-windows/include/boost/proto/detail/preprocessed/class_member_traits.hpp
+x64-windows/include/boost/proto/detail/preprocessed/deduce_domain_n.hpp
+x64-windows/include/boost/proto/detail/preprocessed/deep_copy.hpp
+x64-windows/include/boost/proto/detail/preprocessed/expr.hpp
+x64-windows/include/boost/proto/detail/preprocessed/expr_variadic.hpp
+x64-windows/include/boost/proto/detail/preprocessed/extends_funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/extends_funop_const.hpp
+x64-windows/include/boost/proto/detail/preprocessed/funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/generate_by_value.hpp
+x64-windows/include/boost/proto/detail/preprocessed/lambda_matches.hpp
+x64-windows/include/boost/proto/detail/preprocessed/make_expr.hpp
+x64-windows/include/boost/proto/detail/preprocessed/make_expr_.hpp
+x64-windows/include/boost/proto/detail/preprocessed/make_expr_funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/matches_.hpp
+x64-windows/include/boost/proto/detail/preprocessed/memfun_funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/or_n.hpp
+x64-windows/include/boost/proto/detail/preprocessed/poly_function_funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/poly_function_traits.hpp
+x64-windows/include/boost/proto/detail/preprocessed/template_arity_helper.hpp
+x64-windows/include/boost/proto/detail/preprocessed/traits.hpp
+x64-windows/include/boost/proto/detail/preprocessed/unpack_expr_.hpp
+x64-windows/include/boost/proto/detail/preprocessed/vararg_matches_impl.hpp
+x64-windows/include/boost/proto/detail/remove_typename.hpp
+x64-windows/include/boost/proto/detail/static_const.hpp
+x64-windows/include/boost/proto/detail/template_arity.hpp
+x64-windows/include/boost/proto/detail/template_arity_helper.hpp
+x64-windows/include/boost/proto/detail/traits.hpp
+x64-windows/include/boost/proto/detail/unpack_expr_.hpp
+x64-windows/include/boost/proto/detail/vararg_matches_impl.hpp
+x64-windows/include/boost/proto/domain.hpp
+x64-windows/include/boost/proto/eval.hpp
+x64-windows/include/boost/proto/expr.hpp
+x64-windows/include/boost/proto/extends.hpp
+x64-windows/include/boost/proto/functional.hpp
+x64-windows/include/boost/proto/functional/
+x64-windows/include/boost/proto/functional/fusion.hpp
+x64-windows/include/boost/proto/functional/fusion/
+x64-windows/include/boost/proto/functional/fusion/at.hpp
+x64-windows/include/boost/proto/functional/fusion/pop_back.hpp
+x64-windows/include/boost/proto/functional/fusion/pop_front.hpp
+x64-windows/include/boost/proto/functional/fusion/push_back.hpp
+x64-windows/include/boost/proto/functional/fusion/push_front.hpp
+x64-windows/include/boost/proto/functional/fusion/reverse.hpp
+x64-windows/include/boost/proto/functional/range.hpp
+x64-windows/include/boost/proto/functional/range/
+x64-windows/include/boost/proto/functional/range/begin.hpp
+x64-windows/include/boost/proto/functional/range/empty.hpp
+x64-windows/include/boost/proto/functional/range/end.hpp
+x64-windows/include/boost/proto/functional/range/rbegin.hpp
+x64-windows/include/boost/proto/functional/range/rend.hpp
+x64-windows/include/boost/proto/functional/range/size.hpp
+x64-windows/include/boost/proto/functional/std.hpp
+x64-windows/include/boost/proto/functional/std/
+x64-windows/include/boost/proto/functional/std/iterator.hpp
+x64-windows/include/boost/proto/functional/std/utility.hpp
+x64-windows/include/boost/proto/fusion.hpp
+x64-windows/include/boost/proto/generate.hpp
+x64-windows/include/boost/proto/literal.hpp
+x64-windows/include/boost/proto/make_expr.hpp
+x64-windows/include/boost/proto/matches.hpp
+x64-windows/include/boost/proto/operators.hpp
+x64-windows/include/boost/proto/proto.hpp
+x64-windows/include/boost/proto/proto_fwd.hpp
+x64-windows/include/boost/proto/proto_typeof.hpp
+x64-windows/include/boost/proto/repeat.hpp
+x64-windows/include/boost/proto/tags.hpp
+x64-windows/include/boost/proto/traits.hpp
+x64-windows/include/boost/proto/transform.hpp
+x64-windows/include/boost/proto/transform/
+x64-windows/include/boost/proto/transform/arg.hpp
+x64-windows/include/boost/proto/transform/call.hpp
+x64-windows/include/boost/proto/transform/default.hpp
+x64-windows/include/boost/proto/transform/detail/
+x64-windows/include/boost/proto/transform/detail/call.hpp
+x64-windows/include/boost/proto/transform/detail/construct_funop.hpp
+x64-windows/include/boost/proto/transform/detail/construct_pod_funop.hpp
+x64-windows/include/boost/proto/transform/detail/default_function_impl.hpp
+x64-windows/include/boost/proto/transform/detail/expand_pack.hpp
+x64-windows/include/boost/proto/transform/detail/fold_impl.hpp
+x64-windows/include/boost/proto/transform/detail/lazy.hpp
+x64-windows/include/boost/proto/transform/detail/make.hpp
+x64-windows/include/boost/proto/transform/detail/make_gcc_workaround.hpp
+x64-windows/include/boost/proto/transform/detail/pack.hpp
+x64-windows/include/boost/proto/transform/detail/pack_impl.hpp
+x64-windows/include/boost/proto/transform/detail/pass_through_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/
+x64-windows/include/boost/proto/transform/detail/preprocessed/call.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/construct_funop.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/construct_pod_funop.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/default_function_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/expand_pack.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/fold_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/lazy.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/make.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/make_gcc_workaround.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/pack_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/pass_through_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/when.hpp
+x64-windows/include/boost/proto/transform/detail/when.hpp
+x64-windows/include/boost/proto/transform/env.hpp
+x64-windows/include/boost/proto/transform/fold.hpp
+x64-windows/include/boost/proto/transform/fold_tree.hpp
+x64-windows/include/boost/proto/transform/impl.hpp
+x64-windows/include/boost/proto/transform/integral_c.hpp
+x64-windows/include/boost/proto/transform/lazy.hpp
+x64-windows/include/boost/proto/transform/make.hpp
+x64-windows/include/boost/proto/transform/pass_through.hpp
+x64-windows/include/boost/proto/transform/when.hpp
+x64-windows/share/
+x64-windows/share/boost-proto/
+x64-windows/share/boost-proto/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-proto_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,169 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/proto/
+x64-windows-static/include/boost/proto/args.hpp
+x64-windows-static/include/boost/proto/context.hpp
+x64-windows-static/include/boost/proto/context/
+x64-windows-static/include/boost/proto/context/callable.hpp
+x64-windows-static/include/boost/proto/context/default.hpp
+x64-windows-static/include/boost/proto/context/detail/
+x64-windows-static/include/boost/proto/context/detail/callable_eval.hpp
+x64-windows-static/include/boost/proto/context/detail/default_eval.hpp
+x64-windows-static/include/boost/proto/context/detail/null_eval.hpp
+x64-windows-static/include/boost/proto/context/detail/preprocessed/
+x64-windows-static/include/boost/proto/context/detail/preprocessed/callable_eval.hpp
+x64-windows-static/include/boost/proto/context/detail/preprocessed/default_eval.hpp
+x64-windows-static/include/boost/proto/context/detail/preprocessed/null_eval.hpp
+x64-windows-static/include/boost/proto/context/null.hpp
+x64-windows-static/include/boost/proto/core.hpp
+x64-windows-static/include/boost/proto/debug.hpp
+x64-windows-static/include/boost/proto/deep_copy.hpp
+x64-windows-static/include/boost/proto/detail/
+x64-windows-static/include/boost/proto/detail/and_n.hpp
+x64-windows-static/include/boost/proto/detail/any.hpp
+x64-windows-static/include/boost/proto/detail/args.hpp
+x64-windows-static/include/boost/proto/detail/as_expr.hpp
+x64-windows-static/include/boost/proto/detail/as_lvalue.hpp
+x64-windows-static/include/boost/proto/detail/basic_expr.hpp
+x64-windows-static/include/boost/proto/detail/class_member_traits.hpp
+x64-windows-static/include/boost/proto/detail/decltype.hpp
+x64-windows-static/include/boost/proto/detail/deduce_domain.hpp
+x64-windows-static/include/boost/proto/detail/deduce_domain_n.hpp
+x64-windows-static/include/boost/proto/detail/deep_copy.hpp
+x64-windows-static/include/boost/proto/detail/deprecated.hpp
+x64-windows-static/include/boost/proto/detail/dont_care.hpp
+x64-windows-static/include/boost/proto/detail/expr.hpp
+x64-windows-static/include/boost/proto/detail/expr_funop.hpp
+x64-windows-static/include/boost/proto/detail/extends_funop.hpp
+x64-windows-static/include/boost/proto/detail/extends_funop_const.hpp
+x64-windows-static/include/boost/proto/detail/funop.hpp
+x64-windows-static/include/boost/proto/detail/generate_by_value.hpp
+x64-windows-static/include/boost/proto/detail/ignore_unused.hpp
+x64-windows-static/include/boost/proto/detail/is_noncopyable.hpp
+x64-windows-static/include/boost/proto/detail/lambda_matches.hpp
+x64-windows-static/include/boost/proto/detail/local.hpp
+x64-windows-static/include/boost/proto/detail/make_expr.hpp
+x64-windows-static/include/boost/proto/detail/make_expr_.hpp
+x64-windows-static/include/boost/proto/detail/make_expr_funop.hpp
+x64-windows-static/include/boost/proto/detail/matches_.hpp
+x64-windows-static/include/boost/proto/detail/memfun_funop.hpp
+x64-windows-static/include/boost/proto/detail/or_n.hpp
+x64-windows-static/include/boost/proto/detail/poly_function.hpp
+x64-windows-static/include/boost/proto/detail/poly_function_funop.hpp
+x64-windows-static/include/boost/proto/detail/poly_function_traits.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/
+x64-windows-static/include/boost/proto/detail/preprocessed/and_n.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/args.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/basic_expr.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/class_member_traits.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/deduce_domain_n.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/deep_copy.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/expr.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/expr_variadic.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/extends_funop.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/extends_funop_const.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/funop.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/generate_by_value.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/lambda_matches.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/make_expr.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/make_expr_.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/make_expr_funop.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/matches_.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/memfun_funop.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/or_n.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/poly_function_funop.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/poly_function_traits.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/template_arity_helper.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/traits.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/unpack_expr_.hpp
+x64-windows-static/include/boost/proto/detail/preprocessed/vararg_matches_impl.hpp
+x64-windows-static/include/boost/proto/detail/remove_typename.hpp
+x64-windows-static/include/boost/proto/detail/static_const.hpp
+x64-windows-static/include/boost/proto/detail/template_arity.hpp
+x64-windows-static/include/boost/proto/detail/template_arity_helper.hpp
+x64-windows-static/include/boost/proto/detail/traits.hpp
+x64-windows-static/include/boost/proto/detail/unpack_expr_.hpp
+x64-windows-static/include/boost/proto/detail/vararg_matches_impl.hpp
+x64-windows-static/include/boost/proto/domain.hpp
+x64-windows-static/include/boost/proto/eval.hpp
+x64-windows-static/include/boost/proto/expr.hpp
+x64-windows-static/include/boost/proto/extends.hpp
+x64-windows-static/include/boost/proto/functional.hpp
+x64-windows-static/include/boost/proto/functional/
+x64-windows-static/include/boost/proto/functional/fusion.hpp
+x64-windows-static/include/boost/proto/functional/fusion/
+x64-windows-static/include/boost/proto/functional/fusion/at.hpp
+x64-windows-static/include/boost/proto/functional/fusion/pop_back.hpp
+x64-windows-static/include/boost/proto/functional/fusion/pop_front.hpp
+x64-windows-static/include/boost/proto/functional/fusion/push_back.hpp
+x64-windows-static/include/boost/proto/functional/fusion/push_front.hpp
+x64-windows-static/include/boost/proto/functional/fusion/reverse.hpp
+x64-windows-static/include/boost/proto/functional/range.hpp
+x64-windows-static/include/boost/proto/functional/range/
+x64-windows-static/include/boost/proto/functional/range/begin.hpp
+x64-windows-static/include/boost/proto/functional/range/empty.hpp
+x64-windows-static/include/boost/proto/functional/range/end.hpp
+x64-windows-static/include/boost/proto/functional/range/rbegin.hpp
+x64-windows-static/include/boost/proto/functional/range/rend.hpp
+x64-windows-static/include/boost/proto/functional/range/size.hpp
+x64-windows-static/include/boost/proto/functional/std.hpp
+x64-windows-static/include/boost/proto/functional/std/
+x64-windows-static/include/boost/proto/functional/std/iterator.hpp
+x64-windows-static/include/boost/proto/functional/std/utility.hpp
+x64-windows-static/include/boost/proto/fusion.hpp
+x64-windows-static/include/boost/proto/generate.hpp
+x64-windows-static/include/boost/proto/literal.hpp
+x64-windows-static/include/boost/proto/make_expr.hpp
+x64-windows-static/include/boost/proto/matches.hpp
+x64-windows-static/include/boost/proto/operators.hpp
+x64-windows-static/include/boost/proto/proto.hpp
+x64-windows-static/include/boost/proto/proto_fwd.hpp
+x64-windows-static/include/boost/proto/proto_typeof.hpp
+x64-windows-static/include/boost/proto/repeat.hpp
+x64-windows-static/include/boost/proto/tags.hpp
+x64-windows-static/include/boost/proto/traits.hpp
+x64-windows-static/include/boost/proto/transform.hpp
+x64-windows-static/include/boost/proto/transform/
+x64-windows-static/include/boost/proto/transform/arg.hpp
+x64-windows-static/include/boost/proto/transform/call.hpp
+x64-windows-static/include/boost/proto/transform/default.hpp
+x64-windows-static/include/boost/proto/transform/detail/
+x64-windows-static/include/boost/proto/transform/detail/call.hpp
+x64-windows-static/include/boost/proto/transform/detail/construct_funop.hpp
+x64-windows-static/include/boost/proto/transform/detail/construct_pod_funop.hpp
+x64-windows-static/include/boost/proto/transform/detail/default_function_impl.hpp
+x64-windows-static/include/boost/proto/transform/detail/expand_pack.hpp
+x64-windows-static/include/boost/proto/transform/detail/fold_impl.hpp
+x64-windows-static/include/boost/proto/transform/detail/lazy.hpp
+x64-windows-static/include/boost/proto/transform/detail/make.hpp
+x64-windows-static/include/boost/proto/transform/detail/make_gcc_workaround.hpp
+x64-windows-static/include/boost/proto/transform/detail/pack.hpp
+x64-windows-static/include/boost/proto/transform/detail/pack_impl.hpp
+x64-windows-static/include/boost/proto/transform/detail/pass_through_impl.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/call.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/construct_funop.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/construct_pod_funop.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/default_function_impl.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/expand_pack.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/fold_impl.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/lazy.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/make.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/make_gcc_workaround.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/pack_impl.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/pass_through_impl.hpp
+x64-windows-static/include/boost/proto/transform/detail/preprocessed/when.hpp
+x64-windows-static/include/boost/proto/transform/detail/when.hpp
+x64-windows-static/include/boost/proto/transform/env.hpp
+x64-windows-static/include/boost/proto/transform/fold.hpp
+x64-windows-static/include/boost/proto/transform/fold_tree.hpp
+x64-windows-static/include/boost/proto/transform/impl.hpp
+x64-windows-static/include/boost/proto/transform/integral_c.hpp
+x64-windows-static/include/boost/proto/transform/lazy.hpp
+x64-windows-static/include/boost/proto/transform/make.hpp
+x64-windows-static/include/boost/proto/transform/pass_through.hpp
+x64-windows-static/include/boost/proto/transform/when.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-proto/
+x64-windows-static/share/boost-proto/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,87 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/qvm/
+x64-windows/include/boost/qvm/all.hpp
+x64-windows/include/boost/qvm/assert.hpp
+x64-windows/include/boost/qvm/deduce_mat.hpp
+x64-windows/include/boost/qvm/deduce_quat.hpp
+x64-windows/include/boost/qvm/deduce_scalar.hpp
+x64-windows/include/boost/qvm/deduce_vec.hpp
+x64-windows/include/boost/qvm/detail/
+x64-windows/include/boost/qvm/detail/cofactor_impl.hpp
+x64-windows/include/boost/qvm/detail/determinant_impl.hpp
+x64-windows/include/boost/qvm/detail/mat_assign.hpp
+x64-windows/include/boost/qvm/detail/quat_assign.hpp
+x64-windows/include/boost/qvm/detail/remove_const.hpp
+x64-windows/include/boost/qvm/detail/swizzle_traits.hpp
+x64-windows/include/boost/qvm/detail/transp_impl.hpp
+x64-windows/include/boost/qvm/detail/vec_assign.hpp
+x64-windows/include/boost/qvm/enable_if.hpp
+x64-windows/include/boost/qvm/error.hpp
+x64-windows/include/boost/qvm/gen/
+x64-windows/include/boost/qvm/gen/mat_assign2.hpp
+x64-windows/include/boost/qvm/gen/mat_assign3.hpp
+x64-windows/include/boost/qvm/gen/mat_assign4.hpp
+x64-windows/include/boost/qvm/gen/mat_operations2.hpp
+x64-windows/include/boost/qvm/gen/mat_operations3.hpp
+x64-windows/include/boost/qvm/gen/mat_operations4.hpp
+x64-windows/include/boost/qvm/gen/swizzle2.hpp
+x64-windows/include/boost/qvm/gen/swizzle3.hpp
+x64-windows/include/boost/qvm/gen/swizzle4.hpp
+x64-windows/include/boost/qvm/gen/vec_assign2.hpp
+x64-windows/include/boost/qvm/gen/vec_assign3.hpp
+x64-windows/include/boost/qvm/gen/vec_assign4.hpp
+x64-windows/include/boost/qvm/gen/vec_mat_operations2.hpp
+x64-windows/include/boost/qvm/gen/vec_mat_operations3.hpp
+x64-windows/include/boost/qvm/gen/vec_mat_operations4.hpp
+x64-windows/include/boost/qvm/gen/vec_operations2.hpp
+x64-windows/include/boost/qvm/gen/vec_operations3.hpp
+x64-windows/include/boost/qvm/gen/vec_operations4.hpp
+x64-windows/include/boost/qvm/inline.hpp
+x64-windows/include/boost/qvm/map.hpp
+x64-windows/include/boost/qvm/map_mat_mat.hpp
+x64-windows/include/boost/qvm/map_mat_vec.hpp
+x64-windows/include/boost/qvm/map_vec_mat.hpp
+x64-windows/include/boost/qvm/mat.hpp
+x64-windows/include/boost/qvm/mat_access.hpp
+x64-windows/include/boost/qvm/mat_operations.hpp
+x64-windows/include/boost/qvm/mat_operations2.hpp
+x64-windows/include/boost/qvm/mat_operations3.hpp
+x64-windows/include/boost/qvm/mat_operations4.hpp
+x64-windows/include/boost/qvm/mat_traits.hpp
+x64-windows/include/boost/qvm/mat_traits_array.hpp
+x64-windows/include/boost/qvm/mat_traits_defaults.hpp
+x64-windows/include/boost/qvm/math.hpp
+x64-windows/include/boost/qvm/operations.hpp
+x64-windows/include/boost/qvm/quat.hpp
+x64-windows/include/boost/qvm/quat_access.hpp
+x64-windows/include/boost/qvm/quat_operations.hpp
+x64-windows/include/boost/qvm/quat_traits.hpp
+x64-windows/include/boost/qvm/quat_traits_array.hpp
+x64-windows/include/boost/qvm/quat_traits_defaults.hpp
+x64-windows/include/boost/qvm/quat_vec_operations.hpp
+x64-windows/include/boost/qvm/scalar_traits.hpp
+x64-windows/include/boost/qvm/static_assert.hpp
+x64-windows/include/boost/qvm/swizzle.hpp
+x64-windows/include/boost/qvm/swizzle2.hpp
+x64-windows/include/boost/qvm/swizzle3.hpp
+x64-windows/include/boost/qvm/swizzle4.hpp
+x64-windows/include/boost/qvm/throw_exception.hpp
+x64-windows/include/boost/qvm/to_string.hpp
+x64-windows/include/boost/qvm/vec.hpp
+x64-windows/include/boost/qvm/vec_access.hpp
+x64-windows/include/boost/qvm/vec_mat_operations.hpp
+x64-windows/include/boost/qvm/vec_mat_operations2.hpp
+x64-windows/include/boost/qvm/vec_mat_operations3.hpp
+x64-windows/include/boost/qvm/vec_mat_operations4.hpp
+x64-windows/include/boost/qvm/vec_operations.hpp
+x64-windows/include/boost/qvm/vec_operations2.hpp
+x64-windows/include/boost/qvm/vec_operations3.hpp
+x64-windows/include/boost/qvm/vec_operations4.hpp
+x64-windows/include/boost/qvm/vec_traits.hpp
+x64-windows/include/boost/qvm/vec_traits_array.hpp
+x64-windows/include/boost/qvm/vec_traits_defaults.hpp
+x64-windows/share/
+x64-windows/share/boost-qvm/
+x64-windows/share/boost-qvm/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,87 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/qvm/
+x64-windows-static/include/boost/qvm/all.hpp
+x64-windows-static/include/boost/qvm/assert.hpp
+x64-windows-static/include/boost/qvm/deduce_mat.hpp
+x64-windows-static/include/boost/qvm/deduce_quat.hpp
+x64-windows-static/include/boost/qvm/deduce_scalar.hpp
+x64-windows-static/include/boost/qvm/deduce_vec.hpp
+x64-windows-static/include/boost/qvm/detail/
+x64-windows-static/include/boost/qvm/detail/cofactor_impl.hpp
+x64-windows-static/include/boost/qvm/detail/determinant_impl.hpp
+x64-windows-static/include/boost/qvm/detail/mat_assign.hpp
+x64-windows-static/include/boost/qvm/detail/quat_assign.hpp
+x64-windows-static/include/boost/qvm/detail/remove_const.hpp
+x64-windows-static/include/boost/qvm/detail/swizzle_traits.hpp
+x64-windows-static/include/boost/qvm/detail/transp_impl.hpp
+x64-windows-static/include/boost/qvm/detail/vec_assign.hpp
+x64-windows-static/include/boost/qvm/enable_if.hpp
+x64-windows-static/include/boost/qvm/error.hpp
+x64-windows-static/include/boost/qvm/gen/
+x64-windows-static/include/boost/qvm/gen/mat_assign2.hpp
+x64-windows-static/include/boost/qvm/gen/mat_assign3.hpp
+x64-windows-static/include/boost/qvm/gen/mat_assign4.hpp
+x64-windows-static/include/boost/qvm/gen/mat_operations2.hpp
+x64-windows-static/include/boost/qvm/gen/mat_operations3.hpp
+x64-windows-static/include/boost/qvm/gen/mat_operations4.hpp
+x64-windows-static/include/boost/qvm/gen/swizzle2.hpp
+x64-windows-static/include/boost/qvm/gen/swizzle3.hpp
+x64-windows-static/include/boost/qvm/gen/swizzle4.hpp
+x64-windows-static/include/boost/qvm/gen/vec_assign2.hpp
+x64-windows-static/include/boost/qvm/gen/vec_assign3.hpp
+x64-windows-static/include/boost/qvm/gen/vec_assign4.hpp
+x64-windows-static/include/boost/qvm/gen/vec_mat_operations2.hpp
+x64-windows-static/include/boost/qvm/gen/vec_mat_operations3.hpp
+x64-windows-static/include/boost/qvm/gen/vec_mat_operations4.hpp
+x64-windows-static/include/boost/qvm/gen/vec_operations2.hpp
+x64-windows-static/include/boost/qvm/gen/vec_operations3.hpp
+x64-windows-static/include/boost/qvm/gen/vec_operations4.hpp
+x64-windows-static/include/boost/qvm/inline.hpp
+x64-windows-static/include/boost/qvm/map.hpp
+x64-windows-static/include/boost/qvm/map_mat_mat.hpp
+x64-windows-static/include/boost/qvm/map_mat_vec.hpp
+x64-windows-static/include/boost/qvm/map_vec_mat.hpp
+x64-windows-static/include/boost/qvm/mat.hpp
+x64-windows-static/include/boost/qvm/mat_access.hpp
+x64-windows-static/include/boost/qvm/mat_operations.hpp
+x64-windows-static/include/boost/qvm/mat_operations2.hpp
+x64-windows-static/include/boost/qvm/mat_operations3.hpp
+x64-windows-static/include/boost/qvm/mat_operations4.hpp
+x64-windows-static/include/boost/qvm/mat_traits.hpp
+x64-windows-static/include/boost/qvm/mat_traits_array.hpp
+x64-windows-static/include/boost/qvm/mat_traits_defaults.hpp
+x64-windows-static/include/boost/qvm/math.hpp
+x64-windows-static/include/boost/qvm/operations.hpp
+x64-windows-static/include/boost/qvm/quat.hpp
+x64-windows-static/include/boost/qvm/quat_access.hpp
+x64-windows-static/include/boost/qvm/quat_operations.hpp
+x64-windows-static/include/boost/qvm/quat_traits.hpp
+x64-windows-static/include/boost/qvm/quat_traits_array.hpp
+x64-windows-static/include/boost/qvm/quat_traits_defaults.hpp
+x64-windows-static/include/boost/qvm/quat_vec_operations.hpp
+x64-windows-static/include/boost/qvm/scalar_traits.hpp
+x64-windows-static/include/boost/qvm/static_assert.hpp
+x64-windows-static/include/boost/qvm/swizzle.hpp
+x64-windows-static/include/boost/qvm/swizzle2.hpp
+x64-windows-static/include/boost/qvm/swizzle3.hpp
+x64-windows-static/include/boost/qvm/swizzle4.hpp
+x64-windows-static/include/boost/qvm/throw_exception.hpp
+x64-windows-static/include/boost/qvm/to_string.hpp
+x64-windows-static/include/boost/qvm/vec.hpp
+x64-windows-static/include/boost/qvm/vec_access.hpp
+x64-windows-static/include/boost/qvm/vec_mat_operations.hpp
+x64-windows-static/include/boost/qvm/vec_mat_operations2.hpp
+x64-windows-static/include/boost/qvm/vec_mat_operations3.hpp
+x64-windows-static/include/boost/qvm/vec_mat_operations4.hpp
+x64-windows-static/include/boost/qvm/vec_operations.hpp
+x64-windows-static/include/boost/qvm/vec_operations2.hpp
+x64-windows-static/include/boost/qvm/vec_operations3.hpp
+x64-windows-static/include/boost/qvm/vec_operations4.hpp
+x64-windows-static/include/boost/qvm/vec_traits.hpp
+x64-windows-static/include/boost/qvm/vec_traits_array.hpp
+x64-windows-static/include/boost/qvm/vec_traits_defaults.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-qvm/
+x64-windows-static/share/boost-qvm/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,90 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_random-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_random-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_random-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_random-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_random-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/nondet_random.hpp
+x64-windows/include/boost/random.hpp
+x64-windows/include/boost/random/
+x64-windows/include/boost/random/additive_combine.hpp
+x64-windows/include/boost/random/bernoulli_distribution.hpp
+x64-windows/include/boost/random/beta_distribution.hpp
+x64-windows/include/boost/random/binomial_distribution.hpp
+x64-windows/include/boost/random/cauchy_distribution.hpp
+x64-windows/include/boost/random/chi_squared_distribution.hpp
+x64-windows/include/boost/random/detail/
+x64-windows/include/boost/random/detail/auto_link.hpp
+x64-windows/include/boost/random/detail/config.hpp
+x64-windows/include/boost/random/detail/const_mod.hpp
+x64-windows/include/boost/random/detail/disable_warnings.hpp
+x64-windows/include/boost/random/detail/enable_warnings.hpp
+x64-windows/include/boost/random/detail/generator_bits.hpp
+x64-windows/include/boost/random/detail/generator_seed_seq.hpp
+x64-windows/include/boost/random/detail/int_float_pair.hpp
+x64-windows/include/boost/random/detail/integer_log2.hpp
+x64-windows/include/boost/random/detail/iterator_mixin.hpp
+x64-windows/include/boost/random/detail/large_arithmetic.hpp
+x64-windows/include/boost/random/detail/operators.hpp
+x64-windows/include/boost/random/detail/polynomial.hpp
+x64-windows/include/boost/random/detail/ptr_helper.hpp
+x64-windows/include/boost/random/detail/seed.hpp
+x64-windows/include/boost/random/detail/seed_impl.hpp
+x64-windows/include/boost/random/detail/signed_unsigned_tools.hpp
+x64-windows/include/boost/random/detail/uniform_int_float.hpp
+x64-windows/include/boost/random/detail/vector_io.hpp
+x64-windows/include/boost/random/discard_block.hpp
+x64-windows/include/boost/random/discrete_distribution.hpp
+x64-windows/include/boost/random/exponential_distribution.hpp
+x64-windows/include/boost/random/extreme_value_distribution.hpp
+x64-windows/include/boost/random/fisher_f_distribution.hpp
+x64-windows/include/boost/random/gamma_distribution.hpp
+x64-windows/include/boost/random/generate_canonical.hpp
+x64-windows/include/boost/random/geometric_distribution.hpp
+x64-windows/include/boost/random/hyperexponential_distribution.hpp
+x64-windows/include/boost/random/independent_bits.hpp
+x64-windows/include/boost/random/inversive_congruential.hpp
+x64-windows/include/boost/random/lagged_fibonacci.hpp
+x64-windows/include/boost/random/laplace_distribution.hpp
+x64-windows/include/boost/random/linear_congruential.hpp
+x64-windows/include/boost/random/linear_feedback_shift.hpp
+x64-windows/include/boost/random/lognormal_distribution.hpp
+x64-windows/include/boost/random/mersenne_twister.hpp
+x64-windows/include/boost/random/negative_binomial_distribution.hpp
+x64-windows/include/boost/random/non_central_chi_squared_distribution.hpp
+x64-windows/include/boost/random/normal_distribution.hpp
+x64-windows/include/boost/random/piecewise_constant_distribution.hpp
+x64-windows/include/boost/random/piecewise_linear_distribution.hpp
+x64-windows/include/boost/random/poisson_distribution.hpp
+x64-windows/include/boost/random/random_device.hpp
+x64-windows/include/boost/random/random_number_generator.hpp
+x64-windows/include/boost/random/ranlux.hpp
+x64-windows/include/boost/random/seed_seq.hpp
+x64-windows/include/boost/random/shuffle_order.hpp
+x64-windows/include/boost/random/shuffle_output.hpp
+x64-windows/include/boost/random/student_t_distribution.hpp
+x64-windows/include/boost/random/subtract_with_carry.hpp
+x64-windows/include/boost/random/taus88.hpp
+x64-windows/include/boost/random/traits.hpp
+x64-windows/include/boost/random/triangle_distribution.hpp
+x64-windows/include/boost/random/uniform_01.hpp
+x64-windows/include/boost/random/uniform_int.hpp
+x64-windows/include/boost/random/uniform_int_distribution.hpp
+x64-windows/include/boost/random/uniform_on_sphere.hpp
+x64-windows/include/boost/random/uniform_real.hpp
+x64-windows/include/boost/random/uniform_real_distribution.hpp
+x64-windows/include/boost/random/uniform_smallint.hpp
+x64-windows/include/boost/random/variate_generator.hpp
+x64-windows/include/boost/random/weibull_distribution.hpp
+x64-windows/include/boost/random/xor_combine.hpp
+x64-windows/lib/
+x64-windows/lib/boost_random-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-random/
+x64-windows/share/boost-random/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-random_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,84 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_random-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/nondet_random.hpp
+x64-windows-static/include/boost/random.hpp
+x64-windows-static/include/boost/random/
+x64-windows-static/include/boost/random/additive_combine.hpp
+x64-windows-static/include/boost/random/bernoulli_distribution.hpp
+x64-windows-static/include/boost/random/beta_distribution.hpp
+x64-windows-static/include/boost/random/binomial_distribution.hpp
+x64-windows-static/include/boost/random/cauchy_distribution.hpp
+x64-windows-static/include/boost/random/chi_squared_distribution.hpp
+x64-windows-static/include/boost/random/detail/
+x64-windows-static/include/boost/random/detail/auto_link.hpp
+x64-windows-static/include/boost/random/detail/config.hpp
+x64-windows-static/include/boost/random/detail/const_mod.hpp
+x64-windows-static/include/boost/random/detail/disable_warnings.hpp
+x64-windows-static/include/boost/random/detail/enable_warnings.hpp
+x64-windows-static/include/boost/random/detail/generator_bits.hpp
+x64-windows-static/include/boost/random/detail/generator_seed_seq.hpp
+x64-windows-static/include/boost/random/detail/int_float_pair.hpp
+x64-windows-static/include/boost/random/detail/integer_log2.hpp
+x64-windows-static/include/boost/random/detail/iterator_mixin.hpp
+x64-windows-static/include/boost/random/detail/large_arithmetic.hpp
+x64-windows-static/include/boost/random/detail/operators.hpp
+x64-windows-static/include/boost/random/detail/polynomial.hpp
+x64-windows-static/include/boost/random/detail/ptr_helper.hpp
+x64-windows-static/include/boost/random/detail/seed.hpp
+x64-windows-static/include/boost/random/detail/seed_impl.hpp
+x64-windows-static/include/boost/random/detail/signed_unsigned_tools.hpp
+x64-windows-static/include/boost/random/detail/uniform_int_float.hpp
+x64-windows-static/include/boost/random/detail/vector_io.hpp
+x64-windows-static/include/boost/random/discard_block.hpp
+x64-windows-static/include/boost/random/discrete_distribution.hpp
+x64-windows-static/include/boost/random/exponential_distribution.hpp
+x64-windows-static/include/boost/random/extreme_value_distribution.hpp
+x64-windows-static/include/boost/random/fisher_f_distribution.hpp
+x64-windows-static/include/boost/random/gamma_distribution.hpp
+x64-windows-static/include/boost/random/generate_canonical.hpp
+x64-windows-static/include/boost/random/geometric_distribution.hpp
+x64-windows-static/include/boost/random/hyperexponential_distribution.hpp
+x64-windows-static/include/boost/random/independent_bits.hpp
+x64-windows-static/include/boost/random/inversive_congruential.hpp
+x64-windows-static/include/boost/random/lagged_fibonacci.hpp
+x64-windows-static/include/boost/random/laplace_distribution.hpp
+x64-windows-static/include/boost/random/linear_congruential.hpp
+x64-windows-static/include/boost/random/linear_feedback_shift.hpp
+x64-windows-static/include/boost/random/lognormal_distribution.hpp
+x64-windows-static/include/boost/random/mersenne_twister.hpp
+x64-windows-static/include/boost/random/negative_binomial_distribution.hpp
+x64-windows-static/include/boost/random/non_central_chi_squared_distribution.hpp
+x64-windows-static/include/boost/random/normal_distribution.hpp
+x64-windows-static/include/boost/random/piecewise_constant_distribution.hpp
+x64-windows-static/include/boost/random/piecewise_linear_distribution.hpp
+x64-windows-static/include/boost/random/poisson_distribution.hpp
+x64-windows-static/include/boost/random/random_device.hpp
+x64-windows-static/include/boost/random/random_number_generator.hpp
+x64-windows-static/include/boost/random/ranlux.hpp
+x64-windows-static/include/boost/random/seed_seq.hpp
+x64-windows-static/include/boost/random/shuffle_order.hpp
+x64-windows-static/include/boost/random/shuffle_output.hpp
+x64-windows-static/include/boost/random/student_t_distribution.hpp
+x64-windows-static/include/boost/random/subtract_with_carry.hpp
+x64-windows-static/include/boost/random/taus88.hpp
+x64-windows-static/include/boost/random/traits.hpp
+x64-windows-static/include/boost/random/triangle_distribution.hpp
+x64-windows-static/include/boost/random/uniform_01.hpp
+x64-windows-static/include/boost/random/uniform_int.hpp
+x64-windows-static/include/boost/random/uniform_int_distribution.hpp
+x64-windows-static/include/boost/random/uniform_on_sphere.hpp
+x64-windows-static/include/boost/random/uniform_real.hpp
+x64-windows-static/include/boost/random/uniform_real_distribution.hpp
+x64-windows-static/include/boost/random/uniform_smallint.hpp
+x64-windows-static/include/boost/random/variate_generator.hpp
+x64-windows-static/include/boost/random/weibull_distribution.hpp
+x64-windows-static/include/boost/random/xor_combine.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_random-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-random/
+x64-windows-static/share/boost-random/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,173 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/range.hpp
+x64-windows/include/boost/range/
+x64-windows/include/boost/range/adaptor/
+x64-windows/include/boost/range/adaptor/adjacent_filtered.hpp
+x64-windows/include/boost/range/adaptor/argument_fwd.hpp
+x64-windows/include/boost/range/adaptor/copied.hpp
+x64-windows/include/boost/range/adaptor/define_adaptor.hpp
+x64-windows/include/boost/range/adaptor/filtered.hpp
+x64-windows/include/boost/range/adaptor/formatted.hpp
+x64-windows/include/boost/range/adaptor/indexed.hpp
+x64-windows/include/boost/range/adaptor/indirected.hpp
+x64-windows/include/boost/range/adaptor/map.hpp
+x64-windows/include/boost/range/adaptor/replaced.hpp
+x64-windows/include/boost/range/adaptor/replaced_if.hpp
+x64-windows/include/boost/range/adaptor/reversed.hpp
+x64-windows/include/boost/range/adaptor/sliced.hpp
+x64-windows/include/boost/range/adaptor/strided.hpp
+x64-windows/include/boost/range/adaptor/tokenized.hpp
+x64-windows/include/boost/range/adaptor/transformed.hpp
+x64-windows/include/boost/range/adaptor/type_erased.hpp
+x64-windows/include/boost/range/adaptor/uniqued.hpp
+x64-windows/include/boost/range/adaptors.hpp
+x64-windows/include/boost/range/algorithm.hpp
+x64-windows/include/boost/range/algorithm/
+x64-windows/include/boost/range/algorithm/adjacent_find.hpp
+x64-windows/include/boost/range/algorithm/binary_search.hpp
+x64-windows/include/boost/range/algorithm/copy.hpp
+x64-windows/include/boost/range/algorithm/copy_backward.hpp
+x64-windows/include/boost/range/algorithm/count.hpp
+x64-windows/include/boost/range/algorithm/count_if.hpp
+x64-windows/include/boost/range/algorithm/equal.hpp
+x64-windows/include/boost/range/algorithm/equal_range.hpp
+x64-windows/include/boost/range/algorithm/fill.hpp
+x64-windows/include/boost/range/algorithm/fill_n.hpp
+x64-windows/include/boost/range/algorithm/find.hpp
+x64-windows/include/boost/range/algorithm/find_end.hpp
+x64-windows/include/boost/range/algorithm/find_first_of.hpp
+x64-windows/include/boost/range/algorithm/find_if.hpp
+x64-windows/include/boost/range/algorithm/for_each.hpp
+x64-windows/include/boost/range/algorithm/generate.hpp
+x64-windows/include/boost/range/algorithm/heap_algorithm.hpp
+x64-windows/include/boost/range/algorithm/inplace_merge.hpp
+x64-windows/include/boost/range/algorithm/lexicographical_compare.hpp
+x64-windows/include/boost/range/algorithm/lower_bound.hpp
+x64-windows/include/boost/range/algorithm/max_element.hpp
+x64-windows/include/boost/range/algorithm/merge.hpp
+x64-windows/include/boost/range/algorithm/min_element.hpp
+x64-windows/include/boost/range/algorithm/mismatch.hpp
+x64-windows/include/boost/range/algorithm/nth_element.hpp
+x64-windows/include/boost/range/algorithm/partial_sort.hpp
+x64-windows/include/boost/range/algorithm/partial_sort_copy.hpp
+x64-windows/include/boost/range/algorithm/partition.hpp
+x64-windows/include/boost/range/algorithm/permutation.hpp
+x64-windows/include/boost/range/algorithm/random_shuffle.hpp
+x64-windows/include/boost/range/algorithm/remove.hpp
+x64-windows/include/boost/range/algorithm/remove_copy.hpp
+x64-windows/include/boost/range/algorithm/remove_copy_if.hpp
+x64-windows/include/boost/range/algorithm/remove_if.hpp
+x64-windows/include/boost/range/algorithm/replace.hpp
+x64-windows/include/boost/range/algorithm/replace_copy.hpp
+x64-windows/include/boost/range/algorithm/replace_copy_if.hpp
+x64-windows/include/boost/range/algorithm/replace_if.hpp
+x64-windows/include/boost/range/algorithm/reverse.hpp
+x64-windows/include/boost/range/algorithm/reverse_copy.hpp
+x64-windows/include/boost/range/algorithm/rotate.hpp
+x64-windows/include/boost/range/algorithm/rotate_copy.hpp
+x64-windows/include/boost/range/algorithm/search.hpp
+x64-windows/include/boost/range/algorithm/search_n.hpp
+x64-windows/include/boost/range/algorithm/set_algorithm.hpp
+x64-windows/include/boost/range/algorithm/sort.hpp
+x64-windows/include/boost/range/algorithm/stable_partition.hpp
+x64-windows/include/boost/range/algorithm/stable_sort.hpp
+x64-windows/include/boost/range/algorithm/swap_ranges.hpp
+x64-windows/include/boost/range/algorithm/transform.hpp
+x64-windows/include/boost/range/algorithm/unique.hpp
+x64-windows/include/boost/range/algorithm/unique_copy.hpp
+x64-windows/include/boost/range/algorithm/upper_bound.hpp
+x64-windows/include/boost/range/algorithm_ext.hpp
+x64-windows/include/boost/range/algorithm_ext/
+x64-windows/include/boost/range/algorithm_ext/copy_n.hpp
+x64-windows/include/boost/range/algorithm_ext/erase.hpp
+x64-windows/include/boost/range/algorithm_ext/for_each.hpp
+x64-windows/include/boost/range/algorithm_ext/insert.hpp
+x64-windows/include/boost/range/algorithm_ext/iota.hpp
+x64-windows/include/boost/range/algorithm_ext/is_sorted.hpp
+x64-windows/include/boost/range/algorithm_ext/overwrite.hpp
+x64-windows/include/boost/range/algorithm_ext/push_back.hpp
+x64-windows/include/boost/range/algorithm_ext/push_front.hpp
+x64-windows/include/boost/range/any_range.hpp
+x64-windows/include/boost/range/as_array.hpp
+x64-windows/include/boost/range/as_literal.hpp
+x64-windows/include/boost/range/atl.hpp
+x64-windows/include/boost/range/begin.hpp
+x64-windows/include/boost/range/category.hpp
+x64-windows/include/boost/range/combine.hpp
+x64-windows/include/boost/range/concepts.hpp
+x64-windows/include/boost/range/config.hpp
+x64-windows/include/boost/range/const_iterator.hpp
+x64-windows/include/boost/range/const_reverse_iterator.hpp
+x64-windows/include/boost/range/counting_range.hpp
+x64-windows/include/boost/range/detail/
+x64-windows/include/boost/range/detail/any_iterator.hpp
+x64-windows/include/boost/range/detail/any_iterator_buffer.hpp
+x64-windows/include/boost/range/detail/any_iterator_interface.hpp
+x64-windows/include/boost/range/detail/any_iterator_wrapper.hpp
+x64-windows/include/boost/range/detail/as_literal.hpp
+x64-windows/include/boost/range/detail/begin.hpp
+x64-windows/include/boost/range/detail/collection_traits.hpp
+x64-windows/include/boost/range/detail/collection_traits_detail.hpp
+x64-windows/include/boost/range/detail/combine_cxx03.hpp
+x64-windows/include/boost/range/detail/combine_cxx11.hpp
+x64-windows/include/boost/range/detail/combine_no_rvalue.hpp
+x64-windows/include/boost/range/detail/combine_rvalue.hpp
+x64-windows/include/boost/range/detail/common.hpp
+x64-windows/include/boost/range/detail/default_constructible_unary_fn.hpp
+x64-windows/include/boost/range/detail/demote_iterator_traversal_tag.hpp
+x64-windows/include/boost/range/detail/detail_str.hpp
+x64-windows/include/boost/range/detail/difference_type.hpp
+x64-windows/include/boost/range/detail/empty.hpp
+x64-windows/include/boost/range/detail/end.hpp
+x64-windows/include/boost/range/detail/extract_optional_type.hpp
+x64-windows/include/boost/range/detail/has_member_size.hpp
+x64-windows/include/boost/range/detail/implementation_help.hpp
+x64-windows/include/boost/range/detail/join_iterator.hpp
+x64-windows/include/boost/range/detail/microsoft.hpp
+x64-windows/include/boost/range/detail/misc_concept.hpp
+x64-windows/include/boost/range/detail/msvc_has_iterator_workaround.hpp
+x64-windows/include/boost/range/detail/range_return.hpp
+x64-windows/include/boost/range/detail/remove_extent.hpp
+x64-windows/include/boost/range/detail/safe_bool.hpp
+x64-windows/include/boost/range/detail/sfinae.hpp
+x64-windows/include/boost/range/detail/size_type.hpp
+x64-windows/include/boost/range/detail/sizer.hpp
+x64-windows/include/boost/range/detail/str_types.hpp
+x64-windows/include/boost/range/detail/value_type.hpp
+x64-windows/include/boost/range/difference_type.hpp
+x64-windows/include/boost/range/distance.hpp
+x64-windows/include/boost/range/empty.hpp
+x64-windows/include/boost/range/end.hpp
+x64-windows/include/boost/range/functions.hpp
+x64-windows/include/boost/range/has_range_iterator.hpp
+x64-windows/include/boost/range/irange.hpp
+x64-windows/include/boost/range/istream_range.hpp
+x64-windows/include/boost/range/iterator.hpp
+x64-windows/include/boost/range/iterator_range.hpp
+x64-windows/include/boost/range/iterator_range_core.hpp
+x64-windows/include/boost/range/iterator_range_hash.hpp
+x64-windows/include/boost/range/iterator_range_io.hpp
+x64-windows/include/boost/range/join.hpp
+x64-windows/include/boost/range/metafunctions.hpp
+x64-windows/include/boost/range/mfc.hpp
+x64-windows/include/boost/range/mfc_map.hpp
+x64-windows/include/boost/range/mutable_iterator.hpp
+x64-windows/include/boost/range/numeric.hpp
+x64-windows/include/boost/range/pointer.hpp
+x64-windows/include/boost/range/range_fwd.hpp
+x64-windows/include/boost/range/rbegin.hpp
+x64-windows/include/boost/range/reference.hpp
+x64-windows/include/boost/range/rend.hpp
+x64-windows/include/boost/range/result_iterator.hpp
+x64-windows/include/boost/range/reverse_iterator.hpp
+x64-windows/include/boost/range/reverse_result_iterator.hpp
+x64-windows/include/boost/range/size.hpp
+x64-windows/include/boost/range/size_type.hpp
+x64-windows/include/boost/range/sub_range.hpp
+x64-windows/include/boost/range/traversal.hpp
+x64-windows/include/boost/range/value_type.hpp
+x64-windows/share/
+x64-windows/share/boost-range/
+x64-windows/share/boost-range/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-range_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,173 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/range.hpp
+x64-windows-static/include/boost/range/
+x64-windows-static/include/boost/range/adaptor/
+x64-windows-static/include/boost/range/adaptor/adjacent_filtered.hpp
+x64-windows-static/include/boost/range/adaptor/argument_fwd.hpp
+x64-windows-static/include/boost/range/adaptor/copied.hpp
+x64-windows-static/include/boost/range/adaptor/define_adaptor.hpp
+x64-windows-static/include/boost/range/adaptor/filtered.hpp
+x64-windows-static/include/boost/range/adaptor/formatted.hpp
+x64-windows-static/include/boost/range/adaptor/indexed.hpp
+x64-windows-static/include/boost/range/adaptor/indirected.hpp
+x64-windows-static/include/boost/range/adaptor/map.hpp
+x64-windows-static/include/boost/range/adaptor/replaced.hpp
+x64-windows-static/include/boost/range/adaptor/replaced_if.hpp
+x64-windows-static/include/boost/range/adaptor/reversed.hpp
+x64-windows-static/include/boost/range/adaptor/sliced.hpp
+x64-windows-static/include/boost/range/adaptor/strided.hpp
+x64-windows-static/include/boost/range/adaptor/tokenized.hpp
+x64-windows-static/include/boost/range/adaptor/transformed.hpp
+x64-windows-static/include/boost/range/adaptor/type_erased.hpp
+x64-windows-static/include/boost/range/adaptor/uniqued.hpp
+x64-windows-static/include/boost/range/adaptors.hpp
+x64-windows-static/include/boost/range/algorithm.hpp
+x64-windows-static/include/boost/range/algorithm/
+x64-windows-static/include/boost/range/algorithm/adjacent_find.hpp
+x64-windows-static/include/boost/range/algorithm/binary_search.hpp
+x64-windows-static/include/boost/range/algorithm/copy.hpp
+x64-windows-static/include/boost/range/algorithm/copy_backward.hpp
+x64-windows-static/include/boost/range/algorithm/count.hpp
+x64-windows-static/include/boost/range/algorithm/count_if.hpp
+x64-windows-static/include/boost/range/algorithm/equal.hpp
+x64-windows-static/include/boost/range/algorithm/equal_range.hpp
+x64-windows-static/include/boost/range/algorithm/fill.hpp
+x64-windows-static/include/boost/range/algorithm/fill_n.hpp
+x64-windows-static/include/boost/range/algorithm/find.hpp
+x64-windows-static/include/boost/range/algorithm/find_end.hpp
+x64-windows-static/include/boost/range/algorithm/find_first_of.hpp
+x64-windows-static/include/boost/range/algorithm/find_if.hpp
+x64-windows-static/include/boost/range/algorithm/for_each.hpp
+x64-windows-static/include/boost/range/algorithm/generate.hpp
+x64-windows-static/include/boost/range/algorithm/heap_algorithm.hpp
+x64-windows-static/include/boost/range/algorithm/inplace_merge.hpp
+x64-windows-static/include/boost/range/algorithm/lexicographical_compare.hpp
+x64-windows-static/include/boost/range/algorithm/lower_bound.hpp
+x64-windows-static/include/boost/range/algorithm/max_element.hpp
+x64-windows-static/include/boost/range/algorithm/merge.hpp
+x64-windows-static/include/boost/range/algorithm/min_element.hpp
+x64-windows-static/include/boost/range/algorithm/mismatch.hpp
+x64-windows-static/include/boost/range/algorithm/nth_element.hpp
+x64-windows-static/include/boost/range/algorithm/partial_sort.hpp
+x64-windows-static/include/boost/range/algorithm/partial_sort_copy.hpp
+x64-windows-static/include/boost/range/algorithm/partition.hpp
+x64-windows-static/include/boost/range/algorithm/permutation.hpp
+x64-windows-static/include/boost/range/algorithm/random_shuffle.hpp
+x64-windows-static/include/boost/range/algorithm/remove.hpp
+x64-windows-static/include/boost/range/algorithm/remove_copy.hpp
+x64-windows-static/include/boost/range/algorithm/remove_copy_if.hpp
+x64-windows-static/include/boost/range/algorithm/remove_if.hpp
+x64-windows-static/include/boost/range/algorithm/replace.hpp
+x64-windows-static/include/boost/range/algorithm/replace_copy.hpp
+x64-windows-static/include/boost/range/algorithm/replace_copy_if.hpp
+x64-windows-static/include/boost/range/algorithm/replace_if.hpp
+x64-windows-static/include/boost/range/algorithm/reverse.hpp
+x64-windows-static/include/boost/range/algorithm/reverse_copy.hpp
+x64-windows-static/include/boost/range/algorithm/rotate.hpp
+x64-windows-static/include/boost/range/algorithm/rotate_copy.hpp
+x64-windows-static/include/boost/range/algorithm/search.hpp
+x64-windows-static/include/boost/range/algorithm/search_n.hpp
+x64-windows-static/include/boost/range/algorithm/set_algorithm.hpp
+x64-windows-static/include/boost/range/algorithm/sort.hpp
+x64-windows-static/include/boost/range/algorithm/stable_partition.hpp
+x64-windows-static/include/boost/range/algorithm/stable_sort.hpp
+x64-windows-static/include/boost/range/algorithm/swap_ranges.hpp
+x64-windows-static/include/boost/range/algorithm/transform.hpp
+x64-windows-static/include/boost/range/algorithm/unique.hpp
+x64-windows-static/include/boost/range/algorithm/unique_copy.hpp
+x64-windows-static/include/boost/range/algorithm/upper_bound.hpp
+x64-windows-static/include/boost/range/algorithm_ext.hpp
+x64-windows-static/include/boost/range/algorithm_ext/
+x64-windows-static/include/boost/range/algorithm_ext/copy_n.hpp
+x64-windows-static/include/boost/range/algorithm_ext/erase.hpp
+x64-windows-static/include/boost/range/algorithm_ext/for_each.hpp
+x64-windows-static/include/boost/range/algorithm_ext/insert.hpp
+x64-windows-static/include/boost/range/algorithm_ext/iota.hpp
+x64-windows-static/include/boost/range/algorithm_ext/is_sorted.hpp
+x64-windows-static/include/boost/range/algorithm_ext/overwrite.hpp
+x64-windows-static/include/boost/range/algorithm_ext/push_back.hpp
+x64-windows-static/include/boost/range/algorithm_ext/push_front.hpp
+x64-windows-static/include/boost/range/any_range.hpp
+x64-windows-static/include/boost/range/as_array.hpp
+x64-windows-static/include/boost/range/as_literal.hpp
+x64-windows-static/include/boost/range/atl.hpp
+x64-windows-static/include/boost/range/begin.hpp
+x64-windows-static/include/boost/range/category.hpp
+x64-windows-static/include/boost/range/combine.hpp
+x64-windows-static/include/boost/range/concepts.hpp
+x64-windows-static/include/boost/range/config.hpp
+x64-windows-static/include/boost/range/const_iterator.hpp
+x64-windows-static/include/boost/range/const_reverse_iterator.hpp
+x64-windows-static/include/boost/range/counting_range.hpp
+x64-windows-static/include/boost/range/detail/
+x64-windows-static/include/boost/range/detail/any_iterator.hpp
+x64-windows-static/include/boost/range/detail/any_iterator_buffer.hpp
+x64-windows-static/include/boost/range/detail/any_iterator_interface.hpp
+x64-windows-static/include/boost/range/detail/any_iterator_wrapper.hpp
+x64-windows-static/include/boost/range/detail/as_literal.hpp
+x64-windows-static/include/boost/range/detail/begin.hpp
+x64-windows-static/include/boost/range/detail/collection_traits.hpp
+x64-windows-static/include/boost/range/detail/collection_traits_detail.hpp
+x64-windows-static/include/boost/range/detail/combine_cxx03.hpp
+x64-windows-static/include/boost/range/detail/combine_cxx11.hpp
+x64-windows-static/include/boost/range/detail/combine_no_rvalue.hpp
+x64-windows-static/include/boost/range/detail/combine_rvalue.hpp
+x64-windows-static/include/boost/range/detail/common.hpp
+x64-windows-static/include/boost/range/detail/default_constructible_unary_fn.hpp
+x64-windows-static/include/boost/range/detail/demote_iterator_traversal_tag.hpp
+x64-windows-static/include/boost/range/detail/detail_str.hpp
+x64-windows-static/include/boost/range/detail/difference_type.hpp
+x64-windows-static/include/boost/range/detail/empty.hpp
+x64-windows-static/include/boost/range/detail/end.hpp
+x64-windows-static/include/boost/range/detail/extract_optional_type.hpp
+x64-windows-static/include/boost/range/detail/has_member_size.hpp
+x64-windows-static/include/boost/range/detail/implementation_help.hpp
+x64-windows-static/include/boost/range/detail/join_iterator.hpp
+x64-windows-static/include/boost/range/detail/microsoft.hpp
+x64-windows-static/include/boost/range/detail/misc_concept.hpp
+x64-windows-static/include/boost/range/detail/msvc_has_iterator_workaround.hpp
+x64-windows-static/include/boost/range/detail/range_return.hpp
+x64-windows-static/include/boost/range/detail/remove_extent.hpp
+x64-windows-static/include/boost/range/detail/safe_bool.hpp
+x64-windows-static/include/boost/range/detail/sfinae.hpp
+x64-windows-static/include/boost/range/detail/size_type.hpp
+x64-windows-static/include/boost/range/detail/sizer.hpp
+x64-windows-static/include/boost/range/detail/str_types.hpp
+x64-windows-static/include/boost/range/detail/value_type.hpp
+x64-windows-static/include/boost/range/difference_type.hpp
+x64-windows-static/include/boost/range/distance.hpp
+x64-windows-static/include/boost/range/empty.hpp
+x64-windows-static/include/boost/range/end.hpp
+x64-windows-static/include/boost/range/functions.hpp
+x64-windows-static/include/boost/range/has_range_iterator.hpp
+x64-windows-static/include/boost/range/irange.hpp
+x64-windows-static/include/boost/range/istream_range.hpp
+x64-windows-static/include/boost/range/iterator.hpp
+x64-windows-static/include/boost/range/iterator_range.hpp
+x64-windows-static/include/boost/range/iterator_range_core.hpp
+x64-windows-static/include/boost/range/iterator_range_hash.hpp
+x64-windows-static/include/boost/range/iterator_range_io.hpp
+x64-windows-static/include/boost/range/join.hpp
+x64-windows-static/include/boost/range/metafunctions.hpp
+x64-windows-static/include/boost/range/mfc.hpp
+x64-windows-static/include/boost/range/mfc_map.hpp
+x64-windows-static/include/boost/range/mutable_iterator.hpp
+x64-windows-static/include/boost/range/numeric.hpp
+x64-windows-static/include/boost/range/pointer.hpp
+x64-windows-static/include/boost/range/range_fwd.hpp
+x64-windows-static/include/boost/range/rbegin.hpp
+x64-windows-static/include/boost/range/reference.hpp
+x64-windows-static/include/boost/range/rend.hpp
+x64-windows-static/include/boost/range/result_iterator.hpp
+x64-windows-static/include/boost/range/reverse_iterator.hpp
+x64-windows-static/include/boost/range/reverse_result_iterator.hpp
+x64-windows-static/include/boost/range/size.hpp
+x64-windows-static/include/boost/range/size_type.hpp
+x64-windows-static/include/boost/range/sub_range.hpp
+x64-windows-static/include/boost/range/traversal.hpp
+x64-windows-static/include/boost/range/value_type.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-range/
+x64-windows-static/share/boost-range/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/ratio.hpp
+x64-windows/include/boost/ratio/
+x64-windows/include/boost/ratio/config.hpp
+x64-windows/include/boost/ratio/detail/
+x64-windows/include/boost/ratio/detail/mpl/
+x64-windows/include/boost/ratio/detail/mpl/abs.hpp
+x64-windows/include/boost/ratio/detail/mpl/gcd.hpp
+x64-windows/include/boost/ratio/detail/mpl/lcm.hpp
+x64-windows/include/boost/ratio/detail/mpl/sign.hpp
+x64-windows/include/boost/ratio/detail/overflow_helpers.hpp
+x64-windows/include/boost/ratio/detail/ratio_io.hpp
+x64-windows/include/boost/ratio/include.hpp
+x64-windows/include/boost/ratio/mpl/
+x64-windows/include/boost/ratio/mpl/abs.hpp
+x64-windows/include/boost/ratio/mpl/arithmetic.hpp
+x64-windows/include/boost/ratio/mpl/comparison.hpp
+x64-windows/include/boost/ratio/mpl/divides.hpp
+x64-windows/include/boost/ratio/mpl/equal_to.hpp
+x64-windows/include/boost/ratio/mpl/gcd.hpp
+x64-windows/include/boost/ratio/mpl/greater.hpp
+x64-windows/include/boost/ratio/mpl/greater_equal.hpp
+x64-windows/include/boost/ratio/mpl/lcm.hpp
+x64-windows/include/boost/ratio/mpl/less.hpp
+x64-windows/include/boost/ratio/mpl/less_equal.hpp
+x64-windows/include/boost/ratio/mpl/minus.hpp
+x64-windows/include/boost/ratio/mpl/negate.hpp
+x64-windows/include/boost/ratio/mpl/not_equal_to.hpp
+x64-windows/include/boost/ratio/mpl/numeric_cast.hpp
+x64-windows/include/boost/ratio/mpl/plus.hpp
+x64-windows/include/boost/ratio/mpl/rational_c_tag.hpp
+x64-windows/include/boost/ratio/mpl/rational_constant.hpp
+x64-windows/include/boost/ratio/mpl/sign.hpp
+x64-windows/include/boost/ratio/mpl/times.hpp
+x64-windows/include/boost/ratio/ratio.hpp
+x64-windows/include/boost/ratio/ratio_fwd.hpp
+x64-windows/include/boost/ratio/ratio_io.hpp
+x64-windows/share/
+x64-windows/share/boost-ratio/
+x64-windows/share/boost-ratio/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/ratio.hpp
+x64-windows-static/include/boost/ratio/
+x64-windows-static/include/boost/ratio/config.hpp
+x64-windows-static/include/boost/ratio/detail/
+x64-windows-static/include/boost/ratio/detail/mpl/
+x64-windows-static/include/boost/ratio/detail/mpl/abs.hpp
+x64-windows-static/include/boost/ratio/detail/mpl/gcd.hpp
+x64-windows-static/include/boost/ratio/detail/mpl/lcm.hpp
+x64-windows-static/include/boost/ratio/detail/mpl/sign.hpp
+x64-windows-static/include/boost/ratio/detail/overflow_helpers.hpp
+x64-windows-static/include/boost/ratio/detail/ratio_io.hpp
+x64-windows-static/include/boost/ratio/include.hpp
+x64-windows-static/include/boost/ratio/mpl/
+x64-windows-static/include/boost/ratio/mpl/abs.hpp
+x64-windows-static/include/boost/ratio/mpl/arithmetic.hpp
+x64-windows-static/include/boost/ratio/mpl/comparison.hpp
+x64-windows-static/include/boost/ratio/mpl/divides.hpp
+x64-windows-static/include/boost/ratio/mpl/equal_to.hpp
+x64-windows-static/include/boost/ratio/mpl/gcd.hpp
+x64-windows-static/include/boost/ratio/mpl/greater.hpp
+x64-windows-static/include/boost/ratio/mpl/greater_equal.hpp
+x64-windows-static/include/boost/ratio/mpl/lcm.hpp
+x64-windows-static/include/boost/ratio/mpl/less.hpp
+x64-windows-static/include/boost/ratio/mpl/less_equal.hpp
+x64-windows-static/include/boost/ratio/mpl/minus.hpp
+x64-windows-static/include/boost/ratio/mpl/negate.hpp
+x64-windows-static/include/boost/ratio/mpl/not_equal_to.hpp
+x64-windows-static/include/boost/ratio/mpl/numeric_cast.hpp
+x64-windows-static/include/boost/ratio/mpl/plus.hpp
+x64-windows-static/include/boost/ratio/mpl/rational_c_tag.hpp
+x64-windows-static/include/boost/ratio/mpl/rational_constant.hpp
+x64-windows-static/include/boost/ratio/mpl/sign.hpp
+x64-windows-static/include/boost/ratio/mpl/times.hpp
+x64-windows-static/include/boost/ratio/ratio.hpp
+x64-windows-static/include/boost/ratio/ratio_fwd.hpp
+x64-windows-static/include/boost/ratio/ratio_io.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-ratio/
+x64-windows-static/share/boost-ratio/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/rational.hpp
+x64-windows/share/
+x64-windows/share/boost-rational/
+x64-windows/share/boost-rational/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-rational_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/rational.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-rational/
+x64-windows-static/share/boost-rational/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,80 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_regex-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_regex-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_regex-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_regex-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_regex-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/cregex.hpp
+x64-windows/include/boost/regex.h
+x64-windows/include/boost/regex.hpp
+x64-windows/include/boost/regex/
+x64-windows/include/boost/regex/concepts.hpp
+x64-windows/include/boost/regex/config.hpp
+x64-windows/include/boost/regex/config/
+x64-windows/include/boost/regex/config/borland.hpp
+x64-windows/include/boost/regex/config/cwchar.hpp
+x64-windows/include/boost/regex/icu.hpp
+x64-windows/include/boost/regex/mfc.hpp
+x64-windows/include/boost/regex/pattern_except.hpp
+x64-windows/include/boost/regex/pending/
+x64-windows/include/boost/regex/pending/object_cache.hpp
+x64-windows/include/boost/regex/pending/static_mutex.hpp
+x64-windows/include/boost/regex/pending/unicode_iterator.hpp
+x64-windows/include/boost/regex/regex_traits.hpp
+x64-windows/include/boost/regex/user.hpp
+x64-windows/include/boost/regex/v4/
+x64-windows/include/boost/regex/v4/basic_regex.hpp
+x64-windows/include/boost/regex/v4/basic_regex_creator.hpp
+x64-windows/include/boost/regex/v4/basic_regex_parser.hpp
+x64-windows/include/boost/regex/v4/c_regex_traits.hpp
+x64-windows/include/boost/regex/v4/char_regex_traits.hpp
+x64-windows/include/boost/regex/v4/cpp_regex_traits.hpp
+x64-windows/include/boost/regex/v4/cregex.hpp
+x64-windows/include/boost/regex/v4/error_type.hpp
+x64-windows/include/boost/regex/v4/fileiter.hpp
+x64-windows/include/boost/regex/v4/instances.hpp
+x64-windows/include/boost/regex/v4/iterator_category.hpp
+x64-windows/include/boost/regex/v4/iterator_traits.hpp
+x64-windows/include/boost/regex/v4/match_flags.hpp
+x64-windows/include/boost/regex/v4/match_results.hpp
+x64-windows/include/boost/regex/v4/mem_block_cache.hpp
+x64-windows/include/boost/regex/v4/perl_matcher.hpp
+x64-windows/include/boost/regex/v4/perl_matcher_common.hpp
+x64-windows/include/boost/regex/v4/perl_matcher_non_recursive.hpp
+x64-windows/include/boost/regex/v4/perl_matcher_recursive.hpp
+x64-windows/include/boost/regex/v4/primary_transform.hpp
+x64-windows/include/boost/regex/v4/protected_call.hpp
+x64-windows/include/boost/regex/v4/regbase.hpp
+x64-windows/include/boost/regex/v4/regex.hpp
+x64-windows/include/boost/regex/v4/regex_format.hpp
+x64-windows/include/boost/regex/v4/regex_fwd.hpp
+x64-windows/include/boost/regex/v4/regex_grep.hpp
+x64-windows/include/boost/regex/v4/regex_iterator.hpp
+x64-windows/include/boost/regex/v4/regex_match.hpp
+x64-windows/include/boost/regex/v4/regex_merge.hpp
+x64-windows/include/boost/regex/v4/regex_raw_buffer.hpp
+x64-windows/include/boost/regex/v4/regex_replace.hpp
+x64-windows/include/boost/regex/v4/regex_search.hpp
+x64-windows/include/boost/regex/v4/regex_split.hpp
+x64-windows/include/boost/regex/v4/regex_token_iterator.hpp
+x64-windows/include/boost/regex/v4/regex_traits.hpp
+x64-windows/include/boost/regex/v4/regex_traits_defaults.hpp
+x64-windows/include/boost/regex/v4/regex_workaround.hpp
+x64-windows/include/boost/regex/v4/states.hpp
+x64-windows/include/boost/regex/v4/sub_match.hpp
+x64-windows/include/boost/regex/v4/syntax_type.hpp
+x64-windows/include/boost/regex/v4/u32regex_iterator.hpp
+x64-windows/include/boost/regex/v4/u32regex_token_iterator.hpp
+x64-windows/include/boost/regex/v4/w32_regex_traits.hpp
+x64-windows/include/boost/regex_fwd.hpp
+x64-windows/lib/
+x64-windows/lib/boost_regex-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-regex/
+x64-windows/share/boost-regex/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-regex_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,74 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_regex-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/cregex.hpp
+x64-windows-static/include/boost/regex.h
+x64-windows-static/include/boost/regex.hpp
+x64-windows-static/include/boost/regex/
+x64-windows-static/include/boost/regex/concepts.hpp
+x64-windows-static/include/boost/regex/config.hpp
+x64-windows-static/include/boost/regex/config/
+x64-windows-static/include/boost/regex/config/borland.hpp
+x64-windows-static/include/boost/regex/config/cwchar.hpp
+x64-windows-static/include/boost/regex/icu.hpp
+x64-windows-static/include/boost/regex/mfc.hpp
+x64-windows-static/include/boost/regex/pattern_except.hpp
+x64-windows-static/include/boost/regex/pending/
+x64-windows-static/include/boost/regex/pending/object_cache.hpp
+x64-windows-static/include/boost/regex/pending/static_mutex.hpp
+x64-windows-static/include/boost/regex/pending/unicode_iterator.hpp
+x64-windows-static/include/boost/regex/regex_traits.hpp
+x64-windows-static/include/boost/regex/user.hpp
+x64-windows-static/include/boost/regex/v4/
+x64-windows-static/include/boost/regex/v4/basic_regex.hpp
+x64-windows-static/include/boost/regex/v4/basic_regex_creator.hpp
+x64-windows-static/include/boost/regex/v4/basic_regex_parser.hpp
+x64-windows-static/include/boost/regex/v4/c_regex_traits.hpp
+x64-windows-static/include/boost/regex/v4/char_regex_traits.hpp
+x64-windows-static/include/boost/regex/v4/cpp_regex_traits.hpp
+x64-windows-static/include/boost/regex/v4/cregex.hpp
+x64-windows-static/include/boost/regex/v4/error_type.hpp
+x64-windows-static/include/boost/regex/v4/fileiter.hpp
+x64-windows-static/include/boost/regex/v4/instances.hpp
+x64-windows-static/include/boost/regex/v4/iterator_category.hpp
+x64-windows-static/include/boost/regex/v4/iterator_traits.hpp
+x64-windows-static/include/boost/regex/v4/match_flags.hpp
+x64-windows-static/include/boost/regex/v4/match_results.hpp
+x64-windows-static/include/boost/regex/v4/mem_block_cache.hpp
+x64-windows-static/include/boost/regex/v4/perl_matcher.hpp
+x64-windows-static/include/boost/regex/v4/perl_matcher_common.hpp
+x64-windows-static/include/boost/regex/v4/perl_matcher_non_recursive.hpp
+x64-windows-static/include/boost/regex/v4/perl_matcher_recursive.hpp
+x64-windows-static/include/boost/regex/v4/primary_transform.hpp
+x64-windows-static/include/boost/regex/v4/protected_call.hpp
+x64-windows-static/include/boost/regex/v4/regbase.hpp
+x64-windows-static/include/boost/regex/v4/regex.hpp
+x64-windows-static/include/boost/regex/v4/regex_format.hpp
+x64-windows-static/include/boost/regex/v4/regex_fwd.hpp
+x64-windows-static/include/boost/regex/v4/regex_grep.hpp
+x64-windows-static/include/boost/regex/v4/regex_iterator.hpp
+x64-windows-static/include/boost/regex/v4/regex_match.hpp
+x64-windows-static/include/boost/regex/v4/regex_merge.hpp
+x64-windows-static/include/boost/regex/v4/regex_raw_buffer.hpp
+x64-windows-static/include/boost/regex/v4/regex_replace.hpp
+x64-windows-static/include/boost/regex/v4/regex_search.hpp
+x64-windows-static/include/boost/regex/v4/regex_split.hpp
+x64-windows-static/include/boost/regex/v4/regex_token_iterator.hpp
+x64-windows-static/include/boost/regex/v4/regex_traits.hpp
+x64-windows-static/include/boost/regex/v4/regex_traits_defaults.hpp
+x64-windows-static/include/boost/regex/v4/regex_workaround.hpp
+x64-windows-static/include/boost/regex/v4/states.hpp
+x64-windows-static/include/boost/regex/v4/sub_match.hpp
+x64-windows-static/include/boost/regex/v4/syntax_type.hpp
+x64-windows-static/include/boost/regex/v4/u32regex_iterator.hpp
+x64-windows-static/include/boost/regex/v4/u32regex_token_iterator.hpp
+x64-windows-static/include/boost/regex/v4/w32_regex_traits.hpp
+x64-windows-static/include/boost/regex_fwd.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_regex-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-regex/
+x64-windows-static/share/boost-regex/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,220 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_serialization-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_serialization-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_wserialization-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_wserialization-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_serialization-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_serialization-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_wserialization-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_wserialization-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_serialization-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_wserialization-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/archive/
+x64-windows/include/boost/archive/archive_exception.hpp
+x64-windows/include/boost/archive/basic_archive.hpp
+x64-windows/include/boost/archive/basic_binary_iarchive.hpp
+x64-windows/include/boost/archive/basic_binary_iprimitive.hpp
+x64-windows/include/boost/archive/basic_binary_oarchive.hpp
+x64-windows/include/boost/archive/basic_binary_oprimitive.hpp
+x64-windows/include/boost/archive/basic_streambuf_locale_saver.hpp
+x64-windows/include/boost/archive/basic_text_iarchive.hpp
+x64-windows/include/boost/archive/basic_text_iprimitive.hpp
+x64-windows/include/boost/archive/basic_text_oarchive.hpp
+x64-windows/include/boost/archive/basic_text_oprimitive.hpp
+x64-windows/include/boost/archive/basic_xml_archive.hpp
+x64-windows/include/boost/archive/basic_xml_iarchive.hpp
+x64-windows/include/boost/archive/basic_xml_oarchive.hpp
+x64-windows/include/boost/archive/binary_iarchive.hpp
+x64-windows/include/boost/archive/binary_iarchive_impl.hpp
+x64-windows/include/boost/archive/binary_oarchive.hpp
+x64-windows/include/boost/archive/binary_oarchive_impl.hpp
+x64-windows/include/boost/archive/binary_wiarchive.hpp
+x64-windows/include/boost/archive/binary_woarchive.hpp
+x64-windows/include/boost/archive/codecvt_null.hpp
+x64-windows/include/boost/archive/detail/
+x64-windows/include/boost/archive/detail/abi_prefix.hpp
+x64-windows/include/boost/archive/detail/abi_suffix.hpp
+x64-windows/include/boost/archive/detail/archive_serializer_map.hpp
+x64-windows/include/boost/archive/detail/auto_link_archive.hpp
+x64-windows/include/boost/archive/detail/auto_link_warchive.hpp
+x64-windows/include/boost/archive/detail/basic_iarchive.hpp
+x64-windows/include/boost/archive/detail/basic_iserializer.hpp
+x64-windows/include/boost/archive/detail/basic_oarchive.hpp
+x64-windows/include/boost/archive/detail/basic_oserializer.hpp
+x64-windows/include/boost/archive/detail/basic_pointer_iserializer.hpp
+x64-windows/include/boost/archive/detail/basic_pointer_oserializer.hpp
+x64-windows/include/boost/archive/detail/basic_serializer.hpp
+x64-windows/include/boost/archive/detail/basic_serializer_map.hpp
+x64-windows/include/boost/archive/detail/check.hpp
+x64-windows/include/boost/archive/detail/common_iarchive.hpp
+x64-windows/include/boost/archive/detail/common_oarchive.hpp
+x64-windows/include/boost/archive/detail/decl.hpp
+x64-windows/include/boost/archive/detail/helper_collection.hpp
+x64-windows/include/boost/archive/detail/interface_iarchive.hpp
+x64-windows/include/boost/archive/detail/interface_oarchive.hpp
+x64-windows/include/boost/archive/detail/iserializer.hpp
+x64-windows/include/boost/archive/detail/oserializer.hpp
+x64-windows/include/boost/archive/detail/polymorphic_iarchive_route.hpp
+x64-windows/include/boost/archive/detail/polymorphic_oarchive_route.hpp
+x64-windows/include/boost/archive/detail/register_archive.hpp
+x64-windows/include/boost/archive/detail/utf8_codecvt_facet.hpp
+x64-windows/include/boost/archive/dinkumware.hpp
+x64-windows/include/boost/archive/impl/
+x64-windows/include/boost/archive/impl/archive_serializer_map.ipp
+x64-windows/include/boost/archive/impl/basic_binary_iarchive.ipp
+x64-windows/include/boost/archive/impl/basic_binary_iprimitive.ipp
+x64-windows/include/boost/archive/impl/basic_binary_oarchive.ipp
+x64-windows/include/boost/archive/impl/basic_binary_oprimitive.ipp
+x64-windows/include/boost/archive/impl/basic_text_iarchive.ipp
+x64-windows/include/boost/archive/impl/basic_text_iprimitive.ipp
+x64-windows/include/boost/archive/impl/basic_text_oarchive.ipp
+x64-windows/include/boost/archive/impl/basic_text_oprimitive.ipp
+x64-windows/include/boost/archive/impl/basic_xml_grammar.hpp
+x64-windows/include/boost/archive/impl/basic_xml_iarchive.ipp
+x64-windows/include/boost/archive/impl/basic_xml_oarchive.ipp
+x64-windows/include/boost/archive/impl/text_iarchive_impl.ipp
+x64-windows/include/boost/archive/impl/text_oarchive_impl.ipp
+x64-windows/include/boost/archive/impl/text_wiarchive_impl.ipp
+x64-windows/include/boost/archive/impl/text_woarchive_impl.ipp
+x64-windows/include/boost/archive/impl/xml_iarchive_impl.ipp
+x64-windows/include/boost/archive/impl/xml_oarchive_impl.ipp
+x64-windows/include/boost/archive/impl/xml_wiarchive_impl.ipp
+x64-windows/include/boost/archive/impl/xml_woarchive_impl.ipp
+x64-windows/include/boost/archive/iterators/
+x64-windows/include/boost/archive/iterators/base64_exception.hpp
+x64-windows/include/boost/archive/iterators/base64_from_binary.hpp
+x64-windows/include/boost/archive/iterators/binary_from_base64.hpp
+x64-windows/include/boost/archive/iterators/dataflow.hpp
+x64-windows/include/boost/archive/iterators/dataflow_exception.hpp
+x64-windows/include/boost/archive/iterators/escape.hpp
+x64-windows/include/boost/archive/iterators/insert_linebreaks.hpp
+x64-windows/include/boost/archive/iterators/istream_iterator.hpp
+x64-windows/include/boost/archive/iterators/mb_from_wchar.hpp
+x64-windows/include/boost/archive/iterators/ostream_iterator.hpp
+x64-windows/include/boost/archive/iterators/remove_whitespace.hpp
+x64-windows/include/boost/archive/iterators/transform_width.hpp
+x64-windows/include/boost/archive/iterators/unescape.hpp
+x64-windows/include/boost/archive/iterators/wchar_from_mb.hpp
+x64-windows/include/boost/archive/iterators/xml_escape.hpp
+x64-windows/include/boost/archive/iterators/xml_unescape.hpp
+x64-windows/include/boost/archive/iterators/xml_unescape_exception.hpp
+x64-windows/include/boost/archive/polymorphic_binary_iarchive.hpp
+x64-windows/include/boost/archive/polymorphic_binary_oarchive.hpp
+x64-windows/include/boost/archive/polymorphic_iarchive.hpp
+x64-windows/include/boost/archive/polymorphic_oarchive.hpp
+x64-windows/include/boost/archive/polymorphic_text_iarchive.hpp
+x64-windows/include/boost/archive/polymorphic_text_oarchive.hpp
+x64-windows/include/boost/archive/polymorphic_text_wiarchive.hpp
+x64-windows/include/boost/archive/polymorphic_text_woarchive.hpp
+x64-windows/include/boost/archive/polymorphic_xml_iarchive.hpp
+x64-windows/include/boost/archive/polymorphic_xml_oarchive.hpp
+x64-windows/include/boost/archive/polymorphic_xml_wiarchive.hpp
+x64-windows/include/boost/archive/polymorphic_xml_woarchive.hpp
+x64-windows/include/boost/archive/text_iarchive.hpp
+x64-windows/include/boost/archive/text_oarchive.hpp
+x64-windows/include/boost/archive/text_wiarchive.hpp
+x64-windows/include/boost/archive/text_woarchive.hpp
+x64-windows/include/boost/archive/tmpdir.hpp
+x64-windows/include/boost/archive/wcslen.hpp
+x64-windows/include/boost/archive/xml_archive_exception.hpp
+x64-windows/include/boost/archive/xml_iarchive.hpp
+x64-windows/include/boost/archive/xml_oarchive.hpp
+x64-windows/include/boost/archive/xml_wiarchive.hpp
+x64-windows/include/boost/archive/xml_woarchive.hpp
+x64-windows/include/boost/serialization/
+x64-windows/include/boost/serialization/access.hpp
+x64-windows/include/boost/serialization/archive_input_unordered_map.hpp
+x64-windows/include/boost/serialization/archive_input_unordered_set.hpp
+x64-windows/include/boost/serialization/array.hpp
+x64-windows/include/boost/serialization/array_optimization.hpp
+x64-windows/include/boost/serialization/array_wrapper.hpp
+x64-windows/include/boost/serialization/assume_abstract.hpp
+x64-windows/include/boost/serialization/base_object.hpp
+x64-windows/include/boost/serialization/binary_object.hpp
+x64-windows/include/boost/serialization/bitset.hpp
+x64-windows/include/boost/serialization/boost_array.hpp
+x64-windows/include/boost/serialization/boost_unordered_map.hpp
+x64-windows/include/boost/serialization/boost_unordered_set.hpp
+x64-windows/include/boost/serialization/collection_size_type.hpp
+x64-windows/include/boost/serialization/collection_traits.hpp
+x64-windows/include/boost/serialization/collections_load_imp.hpp
+x64-windows/include/boost/serialization/collections_save_imp.hpp
+x64-windows/include/boost/serialization/complex.hpp
+x64-windows/include/boost/serialization/config.hpp
+x64-windows/include/boost/serialization/deque.hpp
+x64-windows/include/boost/serialization/detail/
+x64-windows/include/boost/serialization/detail/is_default_constructible.hpp
+x64-windows/include/boost/serialization/detail/shared_count_132.hpp
+x64-windows/include/boost/serialization/detail/shared_ptr_132.hpp
+x64-windows/include/boost/serialization/detail/shared_ptr_nmt_132.hpp
+x64-windows/include/boost/serialization/detail/stack_constructor.hpp
+x64-windows/include/boost/serialization/ephemeral.hpp
+x64-windows/include/boost/serialization/export.hpp
+x64-windows/include/boost/serialization/extended_type_info.hpp
+x64-windows/include/boost/serialization/extended_type_info_no_rtti.hpp
+x64-windows/include/boost/serialization/extended_type_info_typeid.hpp
+x64-windows/include/boost/serialization/factory.hpp
+x64-windows/include/boost/serialization/force_include.hpp
+x64-windows/include/boost/serialization/forward_list.hpp
+x64-windows/include/boost/serialization/hash_collections_load_imp.hpp
+x64-windows/include/boost/serialization/hash_collections_save_imp.hpp
+x64-windows/include/boost/serialization/hash_map.hpp
+x64-windows/include/boost/serialization/hash_set.hpp
+x64-windows/include/boost/serialization/is_bitwise_serializable.hpp
+x64-windows/include/boost/serialization/item_version_type.hpp
+x64-windows/include/boost/serialization/level.hpp
+x64-windows/include/boost/serialization/level_enum.hpp
+x64-windows/include/boost/serialization/list.hpp
+x64-windows/include/boost/serialization/map.hpp
+x64-windows/include/boost/serialization/nvp.hpp
+x64-windows/include/boost/serialization/optional.hpp
+x64-windows/include/boost/serialization/priority_queue.hpp
+x64-windows/include/boost/serialization/queue.hpp
+x64-windows/include/boost/serialization/scoped_ptr.hpp
+x64-windows/include/boost/serialization/serialization.hpp
+x64-windows/include/boost/serialization/set.hpp
+x64-windows/include/boost/serialization/shared_ptr.hpp
+x64-windows/include/boost/serialization/shared_ptr_132.hpp
+x64-windows/include/boost/serialization/shared_ptr_helper.hpp
+x64-windows/include/boost/serialization/singleton.hpp
+x64-windows/include/boost/serialization/slist.hpp
+x64-windows/include/boost/serialization/smart_cast.hpp
+x64-windows/include/boost/serialization/split_free.hpp
+x64-windows/include/boost/serialization/split_member.hpp
+x64-windows/include/boost/serialization/stack.hpp
+x64-windows/include/boost/serialization/state_saver.hpp
+x64-windows/include/boost/serialization/static_warning.hpp
+x64-windows/include/boost/serialization/string.hpp
+x64-windows/include/boost/serialization/strong_typedef.hpp
+x64-windows/include/boost/serialization/throw_exception.hpp
+x64-windows/include/boost/serialization/tracking.hpp
+x64-windows/include/boost/serialization/tracking_enum.hpp
+x64-windows/include/boost/serialization/traits.hpp
+x64-windows/include/boost/serialization/type_info_implementation.hpp
+x64-windows/include/boost/serialization/unique_ptr.hpp
+x64-windows/include/boost/serialization/unordered_collections_load_imp.hpp
+x64-windows/include/boost/serialization/unordered_collections_save_imp.hpp
+x64-windows/include/boost/serialization/unordered_map.hpp
+x64-windows/include/boost/serialization/unordered_set.hpp
+x64-windows/include/boost/serialization/utility.hpp
+x64-windows/include/boost/serialization/valarray.hpp
+x64-windows/include/boost/serialization/variant.hpp
+x64-windows/include/boost/serialization/vector.hpp
+x64-windows/include/boost/serialization/vector_135.hpp
+x64-windows/include/boost/serialization/version.hpp
+x64-windows/include/boost/serialization/void_cast.hpp
+x64-windows/include/boost/serialization/void_cast_fwd.hpp
+x64-windows/include/boost/serialization/weak_ptr.hpp
+x64-windows/include/boost/serialization/wrapper.hpp
+x64-windows/lib/
+x64-windows/lib/boost_serialization-vc140-mt.lib
+x64-windows/lib/boost_wserialization-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-serialization/
+x64-windows/share/boost-serialization/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,210 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_serialization-vc140-mt-gd.lib
+x64-windows-static/debug/lib/boost_wserialization-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/archive/
+x64-windows-static/include/boost/archive/archive_exception.hpp
+x64-windows-static/include/boost/archive/basic_archive.hpp
+x64-windows-static/include/boost/archive/basic_binary_iarchive.hpp
+x64-windows-static/include/boost/archive/basic_binary_iprimitive.hpp
+x64-windows-static/include/boost/archive/basic_binary_oarchive.hpp
+x64-windows-static/include/boost/archive/basic_binary_oprimitive.hpp
+x64-windows-static/include/boost/archive/basic_streambuf_locale_saver.hpp
+x64-windows-static/include/boost/archive/basic_text_iarchive.hpp
+x64-windows-static/include/boost/archive/basic_text_iprimitive.hpp
+x64-windows-static/include/boost/archive/basic_text_oarchive.hpp
+x64-windows-static/include/boost/archive/basic_text_oprimitive.hpp
+x64-windows-static/include/boost/archive/basic_xml_archive.hpp
+x64-windows-static/include/boost/archive/basic_xml_iarchive.hpp
+x64-windows-static/include/boost/archive/basic_xml_oarchive.hpp
+x64-windows-static/include/boost/archive/binary_iarchive.hpp
+x64-windows-static/include/boost/archive/binary_iarchive_impl.hpp
+x64-windows-static/include/boost/archive/binary_oarchive.hpp
+x64-windows-static/include/boost/archive/binary_oarchive_impl.hpp
+x64-windows-static/include/boost/archive/binary_wiarchive.hpp
+x64-windows-static/include/boost/archive/binary_woarchive.hpp
+x64-windows-static/include/boost/archive/codecvt_null.hpp
+x64-windows-static/include/boost/archive/detail/
+x64-windows-static/include/boost/archive/detail/abi_prefix.hpp
+x64-windows-static/include/boost/archive/detail/abi_suffix.hpp
+x64-windows-static/include/boost/archive/detail/archive_serializer_map.hpp
+x64-windows-static/include/boost/archive/detail/auto_link_archive.hpp
+x64-windows-static/include/boost/archive/detail/auto_link_warchive.hpp
+x64-windows-static/include/boost/archive/detail/basic_iarchive.hpp
+x64-windows-static/include/boost/archive/detail/basic_iserializer.hpp
+x64-windows-static/include/boost/archive/detail/basic_oarchive.hpp
+x64-windows-static/include/boost/archive/detail/basic_oserializer.hpp
+x64-windows-static/include/boost/archive/detail/basic_pointer_iserializer.hpp
+x64-windows-static/include/boost/archive/detail/basic_pointer_oserializer.hpp
+x64-windows-static/include/boost/archive/detail/basic_serializer.hpp
+x64-windows-static/include/boost/archive/detail/basic_serializer_map.hpp
+x64-windows-static/include/boost/archive/detail/check.hpp
+x64-windows-static/include/boost/archive/detail/common_iarchive.hpp
+x64-windows-static/include/boost/archive/detail/common_oarchive.hpp
+x64-windows-static/include/boost/archive/detail/decl.hpp
+x64-windows-static/include/boost/archive/detail/helper_collection.hpp
+x64-windows-static/include/boost/archive/detail/interface_iarchive.hpp
+x64-windows-static/include/boost/archive/detail/interface_oarchive.hpp
+x64-windows-static/include/boost/archive/detail/iserializer.hpp
+x64-windows-static/include/boost/archive/detail/oserializer.hpp
+x64-windows-static/include/boost/archive/detail/polymorphic_iarchive_route.hpp
+x64-windows-static/include/boost/archive/detail/polymorphic_oarchive_route.hpp
+x64-windows-static/include/boost/archive/detail/register_archive.hpp
+x64-windows-static/include/boost/archive/detail/utf8_codecvt_facet.hpp
+x64-windows-static/include/boost/archive/dinkumware.hpp
+x64-windows-static/include/boost/archive/impl/
+x64-windows-static/include/boost/archive/impl/archive_serializer_map.ipp
+x64-windows-static/include/boost/archive/impl/basic_binary_iarchive.ipp
+x64-windows-static/include/boost/archive/impl/basic_binary_iprimitive.ipp
+x64-windows-static/include/boost/archive/impl/basic_binary_oarchive.ipp
+x64-windows-static/include/boost/archive/impl/basic_binary_oprimitive.ipp
+x64-windows-static/include/boost/archive/impl/basic_text_iarchive.ipp
+x64-windows-static/include/boost/archive/impl/basic_text_iprimitive.ipp
+x64-windows-static/include/boost/archive/impl/basic_text_oarchive.ipp
+x64-windows-static/include/boost/archive/impl/basic_text_oprimitive.ipp
+x64-windows-static/include/boost/archive/impl/basic_xml_grammar.hpp
+x64-windows-static/include/boost/archive/impl/basic_xml_iarchive.ipp
+x64-windows-static/include/boost/archive/impl/basic_xml_oarchive.ipp
+x64-windows-static/include/boost/archive/impl/text_iarchive_impl.ipp
+x64-windows-static/include/boost/archive/impl/text_oarchive_impl.ipp
+x64-windows-static/include/boost/archive/impl/text_wiarchive_impl.ipp
+x64-windows-static/include/boost/archive/impl/text_woarchive_impl.ipp
+x64-windows-static/include/boost/archive/impl/xml_iarchive_impl.ipp
+x64-windows-static/include/boost/archive/impl/xml_oarchive_impl.ipp
+x64-windows-static/include/boost/archive/impl/xml_wiarchive_impl.ipp
+x64-windows-static/include/boost/archive/impl/xml_woarchive_impl.ipp
+x64-windows-static/include/boost/archive/iterators/
+x64-windows-static/include/boost/archive/iterators/base64_exception.hpp
+x64-windows-static/include/boost/archive/iterators/base64_from_binary.hpp
+x64-windows-static/include/boost/archive/iterators/binary_from_base64.hpp
+x64-windows-static/include/boost/archive/iterators/dataflow.hpp
+x64-windows-static/include/boost/archive/iterators/dataflow_exception.hpp
+x64-windows-static/include/boost/archive/iterators/escape.hpp
+x64-windows-static/include/boost/archive/iterators/insert_linebreaks.hpp
+x64-windows-static/include/boost/archive/iterators/istream_iterator.hpp
+x64-windows-static/include/boost/archive/iterators/mb_from_wchar.hpp
+x64-windows-static/include/boost/archive/iterators/ostream_iterator.hpp
+x64-windows-static/include/boost/archive/iterators/remove_whitespace.hpp
+x64-windows-static/include/boost/archive/iterators/transform_width.hpp
+x64-windows-static/include/boost/archive/iterators/unescape.hpp
+x64-windows-static/include/boost/archive/iterators/wchar_from_mb.hpp
+x64-windows-static/include/boost/archive/iterators/xml_escape.hpp
+x64-windows-static/include/boost/archive/iterators/xml_unescape.hpp
+x64-windows-static/include/boost/archive/iterators/xml_unescape_exception.hpp
+x64-windows-static/include/boost/archive/polymorphic_binary_iarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_binary_oarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_iarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_oarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_text_iarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_text_oarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_text_wiarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_text_woarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_xml_iarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_xml_oarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_xml_wiarchive.hpp
+x64-windows-static/include/boost/archive/polymorphic_xml_woarchive.hpp
+x64-windows-static/include/boost/archive/text_iarchive.hpp
+x64-windows-static/include/boost/archive/text_oarchive.hpp
+x64-windows-static/include/boost/archive/text_wiarchive.hpp
+x64-windows-static/include/boost/archive/text_woarchive.hpp
+x64-windows-static/include/boost/archive/tmpdir.hpp
+x64-windows-static/include/boost/archive/wcslen.hpp
+x64-windows-static/include/boost/archive/xml_archive_exception.hpp
+x64-windows-static/include/boost/archive/xml_iarchive.hpp
+x64-windows-static/include/boost/archive/xml_oarchive.hpp
+x64-windows-static/include/boost/archive/xml_wiarchive.hpp
+x64-windows-static/include/boost/archive/xml_woarchive.hpp
+x64-windows-static/include/boost/serialization/
+x64-windows-static/include/boost/serialization/access.hpp
+x64-windows-static/include/boost/serialization/archive_input_unordered_map.hpp
+x64-windows-static/include/boost/serialization/archive_input_unordered_set.hpp
+x64-windows-static/include/boost/serialization/array.hpp
+x64-windows-static/include/boost/serialization/array_optimization.hpp
+x64-windows-static/include/boost/serialization/array_wrapper.hpp
+x64-windows-static/include/boost/serialization/assume_abstract.hpp
+x64-windows-static/include/boost/serialization/base_object.hpp
+x64-windows-static/include/boost/serialization/binary_object.hpp
+x64-windows-static/include/boost/serialization/bitset.hpp
+x64-windows-static/include/boost/serialization/boost_array.hpp
+x64-windows-static/include/boost/serialization/boost_unordered_map.hpp
+x64-windows-static/include/boost/serialization/boost_unordered_set.hpp
+x64-windows-static/include/boost/serialization/collection_size_type.hpp
+x64-windows-static/include/boost/serialization/collection_traits.hpp
+x64-windows-static/include/boost/serialization/collections_load_imp.hpp
+x64-windows-static/include/boost/serialization/collections_save_imp.hpp
+x64-windows-static/include/boost/serialization/complex.hpp
+x64-windows-static/include/boost/serialization/config.hpp
+x64-windows-static/include/boost/serialization/deque.hpp
+x64-windows-static/include/boost/serialization/detail/
+x64-windows-static/include/boost/serialization/detail/is_default_constructible.hpp
+x64-windows-static/include/boost/serialization/detail/shared_count_132.hpp
+x64-windows-static/include/boost/serialization/detail/shared_ptr_132.hpp
+x64-windows-static/include/boost/serialization/detail/shared_ptr_nmt_132.hpp
+x64-windows-static/include/boost/serialization/detail/stack_constructor.hpp
+x64-windows-static/include/boost/serialization/ephemeral.hpp
+x64-windows-static/include/boost/serialization/export.hpp
+x64-windows-static/include/boost/serialization/extended_type_info.hpp
+x64-windows-static/include/boost/serialization/extended_type_info_no_rtti.hpp
+x64-windows-static/include/boost/serialization/extended_type_info_typeid.hpp
+x64-windows-static/include/boost/serialization/factory.hpp
+x64-windows-static/include/boost/serialization/force_include.hpp
+x64-windows-static/include/boost/serialization/forward_list.hpp
+x64-windows-static/include/boost/serialization/hash_collections_load_imp.hpp
+x64-windows-static/include/boost/serialization/hash_collections_save_imp.hpp
+x64-windows-static/include/boost/serialization/hash_map.hpp
+x64-windows-static/include/boost/serialization/hash_set.hpp
+x64-windows-static/include/boost/serialization/is_bitwise_serializable.hpp
+x64-windows-static/include/boost/serialization/item_version_type.hpp
+x64-windows-static/include/boost/serialization/level.hpp
+x64-windows-static/include/boost/serialization/level_enum.hpp
+x64-windows-static/include/boost/serialization/list.hpp
+x64-windows-static/include/boost/serialization/map.hpp
+x64-windows-static/include/boost/serialization/nvp.hpp
+x64-windows-static/include/boost/serialization/optional.hpp
+x64-windows-static/include/boost/serialization/priority_queue.hpp
+x64-windows-static/include/boost/serialization/queue.hpp
+x64-windows-static/include/boost/serialization/scoped_ptr.hpp
+x64-windows-static/include/boost/serialization/serialization.hpp
+x64-windows-static/include/boost/serialization/set.hpp
+x64-windows-static/include/boost/serialization/shared_ptr.hpp
+x64-windows-static/include/boost/serialization/shared_ptr_132.hpp
+x64-windows-static/include/boost/serialization/shared_ptr_helper.hpp
+x64-windows-static/include/boost/serialization/singleton.hpp
+x64-windows-static/include/boost/serialization/slist.hpp
+x64-windows-static/include/boost/serialization/smart_cast.hpp
+x64-windows-static/include/boost/serialization/split_free.hpp
+x64-windows-static/include/boost/serialization/split_member.hpp
+x64-windows-static/include/boost/serialization/stack.hpp
+x64-windows-static/include/boost/serialization/state_saver.hpp
+x64-windows-static/include/boost/serialization/static_warning.hpp
+x64-windows-static/include/boost/serialization/string.hpp
+x64-windows-static/include/boost/serialization/strong_typedef.hpp
+x64-windows-static/include/boost/serialization/throw_exception.hpp
+x64-windows-static/include/boost/serialization/tracking.hpp
+x64-windows-static/include/boost/serialization/tracking_enum.hpp
+x64-windows-static/include/boost/serialization/traits.hpp
+x64-windows-static/include/boost/serialization/type_info_implementation.hpp
+x64-windows-static/include/boost/serialization/unique_ptr.hpp
+x64-windows-static/include/boost/serialization/unordered_collections_load_imp.hpp
+x64-windows-static/include/boost/serialization/unordered_collections_save_imp.hpp
+x64-windows-static/include/boost/serialization/unordered_map.hpp
+x64-windows-static/include/boost/serialization/unordered_set.hpp
+x64-windows-static/include/boost/serialization/utility.hpp
+x64-windows-static/include/boost/serialization/valarray.hpp
+x64-windows-static/include/boost/serialization/variant.hpp
+x64-windows-static/include/boost/serialization/vector.hpp
+x64-windows-static/include/boost/serialization/vector_135.hpp
+x64-windows-static/include/boost/serialization/version.hpp
+x64-windows-static/include/boost/serialization/void_cast.hpp
+x64-windows-static/include/boost/serialization/void_cast_fwd.hpp
+x64-windows-static/include/boost/serialization/weak_ptr.hpp
+x64-windows-static/include/boost/serialization/wrapper.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_serialization-vc140-mt.lib
+x64-windows-static/lib/boost_wserialization-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-serialization/
+x64-windows-static/share/boost-serialization/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,103 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/atomic_count.hpp
+x64-windows/include/boost/detail/lightweight_mutex.hpp
+x64-windows/include/boost/detail/lightweight_thread.hpp
+x64-windows/include/boost/detail/quick_allocator.hpp
+x64-windows/include/boost/enable_shared_from_this.hpp
+x64-windows/include/boost/intrusive_ptr.hpp
+x64-windows/include/boost/make_shared.hpp
+x64-windows/include/boost/make_unique.hpp
+x64-windows/include/boost/pointer_cast.hpp
+x64-windows/include/boost/pointer_to_other.hpp
+x64-windows/include/boost/scoped_array.hpp
+x64-windows/include/boost/scoped_ptr.hpp
+x64-windows/include/boost/shared_array.hpp
+x64-windows/include/boost/shared_ptr.hpp
+x64-windows/include/boost/smart_ptr.hpp
+x64-windows/include/boost/smart_ptr/
+x64-windows/include/boost/smart_ptr/allocate_local_shared_array.hpp
+x64-windows/include/boost/smart_ptr/allocate_shared_array.hpp
+x64-windows/include/boost/smart_ptr/atomic_shared_ptr.hpp
+x64-windows/include/boost/smart_ptr/bad_weak_ptr.hpp
+x64-windows/include/boost/smart_ptr/detail/
+x64-windows/include/boost/smart_ptr/detail/atomic_count.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_gcc.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_nt.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_pt.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_solaris.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_spin.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_std_atomic.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_sync.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_win32.hpp
+x64-windows/include/boost/smart_ptr/detail/lightweight_mutex.hpp
+x64-windows/include/boost/smart_ptr/detail/local_counted_base.hpp
+x64-windows/include/boost/smart_ptr/detail/local_sp_deleter.hpp
+x64-windows/include/boost/smart_ptr/detail/lwm_nop.hpp
+x64-windows/include/boost/smart_ptr/detail/lwm_pthreads.hpp
+x64-windows/include/boost/smart_ptr/detail/lwm_win32_cs.hpp
+x64-windows/include/boost/smart_ptr/detail/operator_bool.hpp
+x64-windows/include/boost/smart_ptr/detail/quick_allocator.hpp
+x64-windows/include/boost/smart_ptr/detail/shared_count.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_convertible.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_aix.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_pt.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_solaris.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_spin.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_sync.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_impl.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_disable_deprecated.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_forward.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_has_sync.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_interlocked.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_noexcept.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_nullptr_t.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_nt.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_pool.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_pt.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_sync.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_w32.hpp
+x64-windows/include/boost/smart_ptr/detail/yield_k.hpp
+x64-windows/include/boost/smart_ptr/enable_shared_from_raw.hpp
+x64-windows/include/boost/smart_ptr/enable_shared_from_this.hpp
+x64-windows/include/boost/smart_ptr/intrusive_ptr.hpp
+x64-windows/include/boost/smart_ptr/intrusive_ref_counter.hpp
+x64-windows/include/boost/smart_ptr/local_shared_ptr.hpp
+x64-windows/include/boost/smart_ptr/make_local_shared.hpp
+x64-windows/include/boost/smart_ptr/make_local_shared_array.hpp
+x64-windows/include/boost/smart_ptr/make_local_shared_object.hpp
+x64-windows/include/boost/smart_ptr/make_shared.hpp
+x64-windows/include/boost/smart_ptr/make_shared_array.hpp
+x64-windows/include/boost/smart_ptr/make_shared_object.hpp
+x64-windows/include/boost/smart_ptr/make_unique.hpp
+x64-windows/include/boost/smart_ptr/owner_less.hpp
+x64-windows/include/boost/smart_ptr/scoped_array.hpp
+x64-windows/include/boost/smart_ptr/scoped_ptr.hpp
+x64-windows/include/boost/smart_ptr/shared_array.hpp
+x64-windows/include/boost/smart_ptr/shared_ptr.hpp
+x64-windows/include/boost/smart_ptr/weak_ptr.hpp
+x64-windows/include/boost/weak_ptr.hpp
+x64-windows/share/
+x64-windows/share/boost-smart-ptr/
+x64-windows/share/boost-smart-ptr/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,103 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/atomic_count.hpp
+x64-windows-static/include/boost/detail/lightweight_mutex.hpp
+x64-windows-static/include/boost/detail/lightweight_thread.hpp
+x64-windows-static/include/boost/detail/quick_allocator.hpp
+x64-windows-static/include/boost/enable_shared_from_this.hpp
+x64-windows-static/include/boost/intrusive_ptr.hpp
+x64-windows-static/include/boost/make_shared.hpp
+x64-windows-static/include/boost/make_unique.hpp
+x64-windows-static/include/boost/pointer_cast.hpp
+x64-windows-static/include/boost/pointer_to_other.hpp
+x64-windows-static/include/boost/scoped_array.hpp
+x64-windows-static/include/boost/scoped_ptr.hpp
+x64-windows-static/include/boost/shared_array.hpp
+x64-windows-static/include/boost/shared_ptr.hpp
+x64-windows-static/include/boost/smart_ptr.hpp
+x64-windows-static/include/boost/smart_ptr/
+x64-windows-static/include/boost/smart_ptr/allocate_local_shared_array.hpp
+x64-windows-static/include/boost/smart_ptr/allocate_shared_array.hpp
+x64-windows-static/include/boost/smart_ptr/atomic_shared_ptr.hpp
+x64-windows-static/include/boost/smart_ptr/bad_weak_ptr.hpp
+x64-windows-static/include/boost/smart_ptr/detail/
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_gcc.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_nt.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_pt.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_solaris.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_spin.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_std_atomic.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_sync.hpp
+x64-windows-static/include/boost/smart_ptr/detail/atomic_count_win32.hpp
+x64-windows-static/include/boost/smart_ptr/detail/lightweight_mutex.hpp
+x64-windows-static/include/boost/smart_ptr/detail/local_counted_base.hpp
+x64-windows-static/include/boost/smart_ptr/detail/local_sp_deleter.hpp
+x64-windows-static/include/boost/smart_ptr/detail/lwm_nop.hpp
+x64-windows-static/include/boost/smart_ptr/detail/lwm_pthreads.hpp
+x64-windows-static/include/boost/smart_ptr/detail/lwm_win32_cs.hpp
+x64-windows-static/include/boost/smart_ptr/detail/operator_bool.hpp
+x64-windows-static/include/boost/smart_ptr/detail/quick_allocator.hpp
+x64-windows-static/include/boost/smart_ptr/detail/shared_count.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_convertible.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_aix.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_pt.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_solaris.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_spin.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_sync.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_counted_impl.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_disable_deprecated.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_forward.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_has_sync.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_interlocked.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_noexcept.hpp
+x64-windows-static/include/boost/smart_ptr/detail/sp_nullptr_t.hpp
+x64-windows-static/include/boost/smart_ptr/detail/spinlock.hpp
+x64-windows-static/include/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
+x64-windows-static/include/boost/smart_ptr/detail/spinlock_nt.hpp
+x64-windows-static/include/boost/smart_ptr/detail/spinlock_pool.hpp
+x64-windows-static/include/boost/smart_ptr/detail/spinlock_pt.hpp
+x64-windows-static/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp
+x64-windows-static/include/boost/smart_ptr/detail/spinlock_sync.hpp
+x64-windows-static/include/boost/smart_ptr/detail/spinlock_w32.hpp
+x64-windows-static/include/boost/smart_ptr/detail/yield_k.hpp
+x64-windows-static/include/boost/smart_ptr/enable_shared_from_raw.hpp
+x64-windows-static/include/boost/smart_ptr/enable_shared_from_this.hpp
+x64-windows-static/include/boost/smart_ptr/intrusive_ptr.hpp
+x64-windows-static/include/boost/smart_ptr/intrusive_ref_counter.hpp
+x64-windows-static/include/boost/smart_ptr/local_shared_ptr.hpp
+x64-windows-static/include/boost/smart_ptr/make_local_shared.hpp
+x64-windows-static/include/boost/smart_ptr/make_local_shared_array.hpp
+x64-windows-static/include/boost/smart_ptr/make_local_shared_object.hpp
+x64-windows-static/include/boost/smart_ptr/make_shared.hpp
+x64-windows-static/include/boost/smart_ptr/make_shared_array.hpp
+x64-windows-static/include/boost/smart_ptr/make_shared_object.hpp
+x64-windows-static/include/boost/smart_ptr/make_unique.hpp
+x64-windows-static/include/boost/smart_ptr/owner_less.hpp
+x64-windows-static/include/boost/smart_ptr/scoped_array.hpp
+x64-windows-static/include/boost/smart_ptr/scoped_ptr.hpp
+x64-windows-static/include/boost/smart_ptr/shared_array.hpp
+x64-windows-static/include/boost/smart_ptr/shared_ptr.hpp
+x64-windows-static/include/boost/smart_ptr/weak_ptr.hpp
+x64-windows-static/include/boost/weak_ptr.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-smart-ptr/
+x64-windows-static/share/boost-smart-ptr/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1207 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/spirit.hpp
+x64-windows/include/boost/spirit/
+x64-windows/include/boost/spirit/home/
+x64-windows/include/boost/spirit/home/classic.hpp
+x64-windows/include/boost/spirit/home/classic/
+x64-windows/include/boost/spirit/home/classic/actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/
+x64-windows/include/boost/spirit/home/classic/actor/assign_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/assign_key_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/clear_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/decrement_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/erase_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/increment_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/insert_at_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/insert_key_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/push_back_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/push_front_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_value_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/swap_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/attribute.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/
+x64-windows/include/boost/spirit/home/classic/attribute/closure.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/closure_context.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/closure_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/parametric.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/core.hpp
+x64-windows/include/boost/spirit/home/classic/core/
+x64-windows/include/boost/spirit/home/classic/core/assert.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/
+x64-windows/include/boost/spirit/home/classic/core/composite/actions.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/alternative.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/composite.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/difference.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/directives.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/epsilon.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/exclusive_or.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/alternative.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/difference.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/directives.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/exclusive_or.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/intersection.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/kleene_star.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/list.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/optional.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/positive.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/sequence.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/sequential_and.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/sequential_or.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/intersection.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/kleene_star.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/list.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/no_actions.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/operators.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/optional.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/positive.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/sequence.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/sequential_and.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/sequential_or.hpp
+x64-windows/include/boost/spirit/home/classic/core/config.hpp
+x64-windows/include/boost/spirit/home/classic/core/impl/
+x64-windows/include/boost/spirit/home/classic/core/impl/match.ipp
+x64-windows/include/boost/spirit/home/classic/core/impl/match_attr_traits.ipp
+x64-windows/include/boost/spirit/home/classic/core/impl/parser.ipp
+x64-windows/include/boost/spirit/home/classic/core/match.hpp
+x64-windows/include/boost/spirit/home/classic/core/nil.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/grammar.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/static.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/subrule.ipp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/parser_context.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/rule.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/subrule.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/subrule_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/core/parser.hpp
+x64-windows/include/boost/spirit/home/classic/core/primitives/
+x64-windows/include/boost/spirit/home/classic/core/primitives/impl/
+x64-windows/include/boost/spirit/home/classic/core/primitives/impl/numerics.ipp
+x64-windows/include/boost/spirit/home/classic/core/primitives/impl/primitives.ipp
+x64-windows/include/boost/spirit/home/classic/core/primitives/numerics.hpp
+x64-windows/include/boost/spirit/home/classic/core/primitives/numerics_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/core/primitives/primitives.hpp
+x64-windows/include/boost/spirit/home/classic/core/safe_bool.hpp
+x64-windows/include/boost/spirit/home/classic/core/scanner/
+x64-windows/include/boost/spirit/home/classic/core/scanner/impl/
+x64-windows/include/boost/spirit/home/classic/core/scanner/impl/skipper.ipp
+x64-windows/include/boost/spirit/home/classic/core/scanner/scanner.hpp
+x64-windows/include/boost/spirit/home/classic/core/scanner/scanner_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/core/scanner/skipper.hpp
+x64-windows/include/boost/spirit/home/classic/core/scanner/skipper_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/core/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/debug.hpp
+x64-windows/include/boost/spirit/home/classic/debug/
+x64-windows/include/boost/spirit/home/classic/debug/debug_node.hpp
+x64-windows/include/boost/spirit/home/classic/debug/impl/
+x64-windows/include/boost/spirit/home/classic/debug/impl/parser_names.ipp
+x64-windows/include/boost/spirit/home/classic/debug/minimal.hpp
+x64-windows/include/boost/spirit/home/classic/debug/parser_names.hpp
+x64-windows/include/boost/spirit/home/classic/debug/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/
+x64-windows/include/boost/spirit/home/classic/dynamic/for.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/if.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/impl/
+x64-windows/include/boost/spirit/home/classic/dynamic/impl/conditions.ipp
+x64-windows/include/boost/spirit/home/classic/dynamic/impl/select.ipp
+x64-windows/include/boost/spirit/home/classic/dynamic/impl/switch.ipp
+x64-windows/include/boost/spirit/home/classic/dynamic/lazy.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/rule_alias.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/select.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/stored_rule.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/switch.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/while.hpp
+x64-windows/include/boost/spirit/home/classic/error_handling.hpp
+x64-windows/include/boost/spirit/home/classic/error_handling/
+x64-windows/include/boost/spirit/home/classic/error_handling/exceptions.hpp
+x64-windows/include/boost/spirit/home/classic/error_handling/exceptions_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/error_handling/impl/
+x64-windows/include/boost/spirit/home/classic/error_handling/impl/exceptions.ipp
+x64-windows/include/boost/spirit/home/classic/error_handling/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/iterator.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/
+x64-windows/include/boost/spirit/home/classic/iterator/file_iterator.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/file_iterator_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/fixed_size_queue.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/impl/
+x64-windows/include/boost/spirit/home/classic/iterator/impl/file_iterator.ipp
+x64-windows/include/boost/spirit/home/classic/iterator/impl/position_iterator.ipp
+x64-windows/include/boost/spirit/home/classic/iterator/multi_pass.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/multi_pass_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/position_iterator.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/position_iterator_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/meta.hpp
+x64-windows/include/boost/spirit/home/classic/meta/
+x64-windows/include/boost/spirit/home/classic/meta/as_parser.hpp
+x64-windows/include/boost/spirit/home/classic/meta/fundamental.hpp
+x64-windows/include/boost/spirit/home/classic/meta/impl/
+x64-windows/include/boost/spirit/home/classic/meta/impl/fundamental.ipp
+x64-windows/include/boost/spirit/home/classic/meta/impl/parser_traits.ipp
+x64-windows/include/boost/spirit/home/classic/meta/impl/refactoring.ipp
+x64-windows/include/boost/spirit/home/classic/meta/impl/traverse.ipp
+x64-windows/include/boost/spirit/home/classic/meta/parser_traits.hpp
+x64-windows/include/boost/spirit/home/classic/meta/refactoring.hpp
+x64-windows/include/boost/spirit/home/classic/meta/traverse.hpp
+x64-windows/include/boost/spirit/home/classic/namespace.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/
+x64-windows/include/boost/spirit/home/classic/phoenix/actor.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/binders.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/casts.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/closures.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/composite.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/functions.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/new.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/operators.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/primitives.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/special_ops.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/statements.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/tuple_helpers.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/tuples.hpp
+x64-windows/include/boost/spirit/home/classic/symbols.hpp
+x64-windows/include/boost/spirit/home/classic/symbols/
+x64-windows/include/boost/spirit/home/classic/symbols/impl/
+x64-windows/include/boost/spirit/home/classic/symbols/impl/symbols.ipp
+x64-windows/include/boost/spirit/home/classic/symbols/impl/tst.ipp
+x64-windows/include/boost/spirit/home/classic/symbols/symbols.hpp
+x64-windows/include/boost/spirit/home/classic/symbols/symbols_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/symbols/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/tree/
+x64-windows/include/boost/spirit/home/classic/tree/ast.hpp
+x64-windows/include/boost/spirit/home/classic/tree/ast_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/tree/common.hpp
+x64-windows/include/boost/spirit/home/classic/tree/common_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/tree/impl/
+x64-windows/include/boost/spirit/home/classic/tree/impl/parse_tree_utils.ipp
+x64-windows/include/boost/spirit/home/classic/tree/impl/tree_to_xml.ipp
+x64-windows/include/boost/spirit/home/classic/tree/parse_tree.hpp
+x64-windows/include/boost/spirit/home/classic/tree/parse_tree_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/tree/parse_tree_utils.hpp
+x64-windows/include/boost/spirit/home/classic/tree/parsetree.dtd
+x64-windows/include/boost/spirit/home/classic/tree/tree_to_xml.hpp
+x64-windows/include/boost/spirit/home/classic/tree/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/utility.hpp
+x64-windows/include/boost/spirit/home/classic/utility/
+x64-windows/include/boost/spirit/home/classic/utility/chset.hpp
+x64-windows/include/boost/spirit/home/classic/utility/chset_operators.hpp
+x64-windows/include/boost/spirit/home/classic/utility/confix.hpp
+x64-windows/include/boost/spirit/home/classic/utility/confix_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/distinct.hpp
+x64-windows/include/boost/spirit/home/classic/utility/distinct_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/escape_char.hpp
+x64-windows/include/boost/spirit/home/classic/utility/escape_char_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/flush_multi_pass.hpp
+x64-windows/include/boost/spirit/home/classic/utility/functor_parser.hpp
+x64-windows/include/boost/spirit/home/classic/utility/grammar_def.hpp
+x64-windows/include/boost/spirit/home/classic/utility/grammar_def_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/impl/
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/basic_chset.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/range_run.hpp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/range_run.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset_operators.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/confix.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/escape_char.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/lists.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/regex.ipp
+x64-windows/include/boost/spirit/home/classic/utility/lists.hpp
+x64-windows/include/boost/spirit/home/classic/utility/lists_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/loops.hpp
+x64-windows/include/boost/spirit/home/classic/utility/regex.hpp
+x64-windows/include/boost/spirit/home/classic/utility/rule_parser.hpp
+x64-windows/include/boost/spirit/home/classic/utility/scoped_lock.hpp
+x64-windows/include/boost/spirit/home/classic/utility/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/version.hpp
+x64-windows/include/boost/spirit/home/karma.hpp
+x64-windows/include/boost/spirit/home/karma/
+x64-windows/include/boost/spirit/home/karma/action.hpp
+x64-windows/include/boost/spirit/home/karma/action/
+x64-windows/include/boost/spirit/home/karma/action/action.hpp
+x64-windows/include/boost/spirit/home/karma/auto.hpp
+x64-windows/include/boost/spirit/home/karma/auto/
+x64-windows/include/boost/spirit/home/karma/auto/auto.hpp
+x64-windows/include/boost/spirit/home/karma/auto/create_generator.hpp
+x64-windows/include/boost/spirit/home/karma/auto/meta_create.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary/
+x64-windows/include/boost/spirit/home/karma/auxiliary/attr_cast.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary/eol.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary/eps.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary/lazy.hpp
+x64-windows/include/boost/spirit/home/karma/binary.hpp
+x64-windows/include/boost/spirit/home/karma/binary/
+x64-windows/include/boost/spirit/home/karma/binary/binary.hpp
+x64-windows/include/boost/spirit/home/karma/binary/padding.hpp
+x64-windows/include/boost/spirit/home/karma/char.hpp
+x64-windows/include/boost/spirit/home/karma/char/
+x64-windows/include/boost/spirit/home/karma/char/char.hpp
+x64-windows/include/boost/spirit/home/karma/char/char_class.hpp
+x64-windows/include/boost/spirit/home/karma/char/char_generator.hpp
+x64-windows/include/boost/spirit/home/karma/delimit_flag.hpp
+x64-windows/include/boost/spirit/home/karma/delimit_out.hpp
+x64-windows/include/boost/spirit/home/karma/detail/
+x64-windows/include/boost/spirit/home/karma/detail/alternative_function.hpp
+x64-windows/include/boost/spirit/home/karma/detail/as.hpp
+x64-windows/include/boost/spirit/home/karma/detail/attributes.hpp
+x64-windows/include/boost/spirit/home/karma/detail/default_width.hpp
+x64-windows/include/boost/spirit/home/karma/detail/enable_lit.hpp
+x64-windows/include/boost/spirit/home/karma/detail/extract_from.hpp
+x64-windows/include/boost/spirit/home/karma/detail/fail_function.hpp
+x64-windows/include/boost/spirit/home/karma/detail/generate.hpp
+x64-windows/include/boost/spirit/home/karma/detail/generate_auto.hpp
+x64-windows/include/boost/spirit/home/karma/detail/generate_to.hpp
+x64-windows/include/boost/spirit/home/karma/detail/get_casetag.hpp
+x64-windows/include/boost/spirit/home/karma/detail/get_stricttag.hpp
+x64-windows/include/boost/spirit/home/karma/detail/indirect_iterator.hpp
+x64-windows/include/boost/spirit/home/karma/detail/output_iterator.hpp
+x64-windows/include/boost/spirit/home/karma/detail/pass_container.hpp
+x64-windows/include/boost/spirit/home/karma/detail/string_compare.hpp
+x64-windows/include/boost/spirit/home/karma/detail/string_generate.hpp
+x64-windows/include/boost/spirit/home/karma/detail/unused_delimiter.hpp
+x64-windows/include/boost/spirit/home/karma/directive.hpp
+x64-windows/include/boost/spirit/home/karma/directive/
+x64-windows/include/boost/spirit/home/karma/directive/as.hpp
+x64-windows/include/boost/spirit/home/karma/directive/buffer.hpp
+x64-windows/include/boost/spirit/home/karma/directive/center_alignment.hpp
+x64-windows/include/boost/spirit/home/karma/directive/columns.hpp
+x64-windows/include/boost/spirit/home/karma/directive/delimit.hpp
+x64-windows/include/boost/spirit/home/karma/directive/duplicate.hpp
+x64-windows/include/boost/spirit/home/karma/directive/encoding.hpp
+x64-windows/include/boost/spirit/home/karma/directive/left_alignment.hpp
+x64-windows/include/boost/spirit/home/karma/directive/maxwidth.hpp
+x64-windows/include/boost/spirit/home/karma/directive/no_delimit.hpp
+x64-windows/include/boost/spirit/home/karma/directive/omit.hpp
+x64-windows/include/boost/spirit/home/karma/directive/repeat.hpp
+x64-windows/include/boost/spirit/home/karma/directive/right_alignment.hpp
+x64-windows/include/boost/spirit/home/karma/directive/strict_relaxed.hpp
+x64-windows/include/boost/spirit/home/karma/directive/upper_lower_case.hpp
+x64-windows/include/boost/spirit/home/karma/directive/verbatim.hpp
+x64-windows/include/boost/spirit/home/karma/domain.hpp
+x64-windows/include/boost/spirit/home/karma/format.hpp
+x64-windows/include/boost/spirit/home/karma/format_auto.hpp
+x64-windows/include/boost/spirit/home/karma/generate.hpp
+x64-windows/include/boost/spirit/home/karma/generate_attr.hpp
+x64-windows/include/boost/spirit/home/karma/generator.hpp
+x64-windows/include/boost/spirit/home/karma/meta_compiler.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/
+x64-windows/include/boost/spirit/home/karma/nonterminal/debug_handler.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/debug_handler_state.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/detail/
+x64-windows/include/boost/spirit/home/karma/nonterminal/detail/fcall.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/detail/generator_binder.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/grammar.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/nonterminal_fwd.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/rule.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/simple_trace.hpp
+x64-windows/include/boost/spirit/home/karma/numeric.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/
+x64-windows/include/boost/spirit/home/karma/numeric/bool.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/bool_policies.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/detail/
+x64-windows/include/boost/spirit/home/karma/numeric/detail/bool_utils.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/detail/real_utils.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/int.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/real.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/real_policies.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/uint.hpp
+x64-windows/include/boost/spirit/home/karma/operator.hpp
+x64-windows/include/boost/spirit/home/karma/operator/
+x64-windows/include/boost/spirit/home/karma/operator/alternative.hpp
+x64-windows/include/boost/spirit/home/karma/operator/and_predicate.hpp
+x64-windows/include/boost/spirit/home/karma/operator/kleene.hpp
+x64-windows/include/boost/spirit/home/karma/operator/list.hpp
+x64-windows/include/boost/spirit/home/karma/operator/not_predicate.hpp
+x64-windows/include/boost/spirit/home/karma/operator/optional.hpp
+x64-windows/include/boost/spirit/home/karma/operator/plus.hpp
+x64-windows/include/boost/spirit/home/karma/operator/sequence.hpp
+x64-windows/include/boost/spirit/home/karma/phoenix_attributes.hpp
+x64-windows/include/boost/spirit/home/karma/reference.hpp
+x64-windows/include/boost/spirit/home/karma/stream.hpp
+x64-windows/include/boost/spirit/home/karma/stream/
+x64-windows/include/boost/spirit/home/karma/stream/detail/
+x64-windows/include/boost/spirit/home/karma/stream/detail/format_manip.hpp
+x64-windows/include/boost/spirit/home/karma/stream/detail/format_manip_auto.hpp
+x64-windows/include/boost/spirit/home/karma/stream/detail/iterator_sink.hpp
+x64-windows/include/boost/spirit/home/karma/stream/format_manip.hpp
+x64-windows/include/boost/spirit/home/karma/stream/format_manip_attr.hpp
+x64-windows/include/boost/spirit/home/karma/stream/ostream_iterator.hpp
+x64-windows/include/boost/spirit/home/karma/stream/stream.hpp
+x64-windows/include/boost/spirit/home/karma/string.hpp
+x64-windows/include/boost/spirit/home/karma/string/
+x64-windows/include/boost/spirit/home/karma/string/lit.hpp
+x64-windows/include/boost/spirit/home/karma/string/symbols.hpp
+x64-windows/include/boost/spirit/home/karma/what.hpp
+x64-windows/include/boost/spirit/home/lex.hpp
+x64-windows/include/boost/spirit/home/lex/
+x64-windows/include/boost/spirit/home/lex/argument.hpp
+x64-windows/include/boost/spirit/home/lex/argument_phoenix.hpp
+x64-windows/include/boost/spirit/home/lex/detail/
+x64-windows/include/boost/spirit/home/lex/detail/sequence_function.hpp
+x64-windows/include/boost/spirit/home/lex/domain.hpp
+x64-windows/include/boost/spirit/home/lex/lexer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/
+x64-windows/include/boost/spirit/home/lex/lexer/action.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/char_token_def.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/functor.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/generate_static.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/iterator.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/position_token.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/semantic_action_data.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/static_version.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/token.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/pass_flags.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/sequence.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/string_token_def.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/support_functions.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/support_functions_expression.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/terminals.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/token_def.hpp
+x64-windows/include/boost/spirit/home/lex/lexer_lexertl.hpp
+x64-windows/include/boost/spirit/home/lex/lexer_static_lexertl.hpp
+x64-windows/include/boost/spirit/home/lex/lexer_type.hpp
+x64-windows/include/boost/spirit/home/lex/meta_compiler.hpp
+x64-windows/include/boost/spirit/home/lex/primitives.hpp
+x64-windows/include/boost/spirit/home/lex/qi.hpp
+x64-windows/include/boost/spirit/home/lex/qi/
+x64-windows/include/boost/spirit/home/lex/qi/in_state.hpp
+x64-windows/include/boost/spirit/home/lex/qi/plain_raw_token.hpp
+x64-windows/include/boost/spirit/home/lex/qi/plain_token.hpp
+x64-windows/include/boost/spirit/home/lex/qi/plain_tokenid.hpp
+x64-windows/include/boost/spirit/home/lex/qi/plain_tokenid_mask.hpp
+x64-windows/include/boost/spirit/home/lex/qi/state_switcher.hpp
+x64-windows/include/boost/spirit/home/lex/reference.hpp
+x64-windows/include/boost/spirit/home/lex/tokenize_and_parse.hpp
+x64-windows/include/boost/spirit/home/lex/tokenize_and_parse_attr.hpp
+x64-windows/include/boost/spirit/home/qi.hpp
+x64-windows/include/boost/spirit/home/qi/
+x64-windows/include/boost/spirit/home/qi/action.hpp
+x64-windows/include/boost/spirit/home/qi/action/
+x64-windows/include/boost/spirit/home/qi/action/action.hpp
+x64-windows/include/boost/spirit/home/qi/auto.hpp
+x64-windows/include/boost/spirit/home/qi/auto/
+x64-windows/include/boost/spirit/home/qi/auto/auto.hpp
+x64-windows/include/boost/spirit/home/qi/auto/create_parser.hpp
+x64-windows/include/boost/spirit/home/qi/auto/meta_create.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/
+x64-windows/include/boost/spirit/home/qi/auxiliary/attr.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/attr_cast.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/eoi.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/eol.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/eps.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/lazy.hpp
+x64-windows/include/boost/spirit/home/qi/binary.hpp
+x64-windows/include/boost/spirit/home/qi/binary/
+x64-windows/include/boost/spirit/home/qi/binary/binary.hpp
+x64-windows/include/boost/spirit/home/qi/char.hpp
+x64-windows/include/boost/spirit/home/qi/char/
+x64-windows/include/boost/spirit/home/qi/char/char.hpp
+x64-windows/include/boost/spirit/home/qi/char/char_class.hpp
+x64-windows/include/boost/spirit/home/qi/char/char_parser.hpp
+x64-windows/include/boost/spirit/home/qi/copy.hpp
+x64-windows/include/boost/spirit/home/qi/detail/
+x64-windows/include/boost/spirit/home/qi/detail/alternative_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/assign_to.hpp
+x64-windows/include/boost/spirit/home/qi/detail/attributes.hpp
+x64-windows/include/boost/spirit/home/qi/detail/construct.hpp
+x64-windows/include/boost/spirit/home/qi/detail/enable_lit.hpp
+x64-windows/include/boost/spirit/home/qi/detail/expect_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/expectation_failure.hpp
+x64-windows/include/boost/spirit/home/qi/detail/fail_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/parse.hpp
+x64-windows/include/boost/spirit/home/qi/detail/parse_auto.hpp
+x64-windows/include/boost/spirit/home/qi/detail/pass_container.hpp
+x64-windows/include/boost/spirit/home/qi/detail/pass_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/permute_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/string_parse.hpp
+x64-windows/include/boost/spirit/home/qi/detail/unused_skipper.hpp
+x64-windows/include/boost/spirit/home/qi/directive.hpp
+x64-windows/include/boost/spirit/home/qi/directive/
+x64-windows/include/boost/spirit/home/qi/directive/as.hpp
+x64-windows/include/boost/spirit/home/qi/directive/encoding.hpp
+x64-windows/include/boost/spirit/home/qi/directive/expect.hpp
+x64-windows/include/boost/spirit/home/qi/directive/hold.hpp
+x64-windows/include/boost/spirit/home/qi/directive/lexeme.hpp
+x64-windows/include/boost/spirit/home/qi/directive/matches.hpp
+x64-windows/include/boost/spirit/home/qi/directive/no_case.hpp
+x64-windows/include/boost/spirit/home/qi/directive/no_skip.hpp
+x64-windows/include/boost/spirit/home/qi/directive/omit.hpp
+x64-windows/include/boost/spirit/home/qi/directive/raw.hpp
+x64-windows/include/boost/spirit/home/qi/directive/repeat.hpp
+x64-windows/include/boost/spirit/home/qi/directive/skip.hpp
+x64-windows/include/boost/spirit/home/qi/domain.hpp
+x64-windows/include/boost/spirit/home/qi/match.hpp
+x64-windows/include/boost/spirit/home/qi/match_auto.hpp
+x64-windows/include/boost/spirit/home/qi/meta_compiler.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/
+x64-windows/include/boost/spirit/home/qi/nonterminal/debug_handler.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/debug_handler_state.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/detail/
+x64-windows/include/boost/spirit/home/qi/nonterminal/detail/fcall.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/detail/parser_binder.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/error_handler.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/grammar.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/nonterminal_fwd.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/rule.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/simple_trace.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/success_handler.hpp
+x64-windows/include/boost/spirit/home/qi/numeric.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/
+x64-windows/include/boost/spirit/home/qi/numeric/bool.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/bool_policies.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/detail/
+x64-windows/include/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/detail/real_impl.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/int.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/numeric_utils.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/real.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/real_policies.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/uint.hpp
+x64-windows/include/boost/spirit/home/qi/operator.hpp
+x64-windows/include/boost/spirit/home/qi/operator/
+x64-windows/include/boost/spirit/home/qi/operator/alternative.hpp
+x64-windows/include/boost/spirit/home/qi/operator/and_predicate.hpp
+x64-windows/include/boost/spirit/home/qi/operator/difference.hpp
+x64-windows/include/boost/spirit/home/qi/operator/expect.hpp
+x64-windows/include/boost/spirit/home/qi/operator/kleene.hpp
+x64-windows/include/boost/spirit/home/qi/operator/list.hpp
+x64-windows/include/boost/spirit/home/qi/operator/not_predicate.hpp
+x64-windows/include/boost/spirit/home/qi/operator/optional.hpp
+x64-windows/include/boost/spirit/home/qi/operator/permutation.hpp
+x64-windows/include/boost/spirit/home/qi/operator/plus.hpp
+x64-windows/include/boost/spirit/home/qi/operator/sequence.hpp
+x64-windows/include/boost/spirit/home/qi/operator/sequence_base.hpp
+x64-windows/include/boost/spirit/home/qi/operator/sequential_or.hpp
+x64-windows/include/boost/spirit/home/qi/parse.hpp
+x64-windows/include/boost/spirit/home/qi/parse_attr.hpp
+x64-windows/include/boost/spirit/home/qi/parser.hpp
+x64-windows/include/boost/spirit/home/qi/reference.hpp
+x64-windows/include/boost/spirit/home/qi/skip_flag.hpp
+x64-windows/include/boost/spirit/home/qi/skip_over.hpp
+x64-windows/include/boost/spirit/home/qi/stream.hpp
+x64-windows/include/boost/spirit/home/qi/stream/
+x64-windows/include/boost/spirit/home/qi/stream/detail/
+x64-windows/include/boost/spirit/home/qi/stream/detail/iterator_source.hpp
+x64-windows/include/boost/spirit/home/qi/stream/detail/match_manip.hpp
+x64-windows/include/boost/spirit/home/qi/stream/detail/match_manip_auto.hpp
+x64-windows/include/boost/spirit/home/qi/stream/match_manip.hpp
+x64-windows/include/boost/spirit/home/qi/stream/match_manip_attr.hpp
+x64-windows/include/boost/spirit/home/qi/stream/stream.hpp
+x64-windows/include/boost/spirit/home/qi/string.hpp
+x64-windows/include/boost/spirit/home/qi/string/
+x64-windows/include/boost/spirit/home/qi/string/detail/
+x64-windows/include/boost/spirit/home/qi/string/detail/tst.hpp
+x64-windows/include/boost/spirit/home/qi/string/lit.hpp
+x64-windows/include/boost/spirit/home/qi/string/symbols.hpp
+x64-windows/include/boost/spirit/home/qi/string/tst.hpp
+x64-windows/include/boost/spirit/home/qi/string/tst_map.hpp
+x64-windows/include/boost/spirit/home/qi/what.hpp
+x64-windows/include/boost/spirit/home/support.hpp
+x64-windows/include/boost/spirit/home/support/
+x64-windows/include/boost/spirit/home/support/action_dispatch.hpp
+x64-windows/include/boost/spirit/home/support/adapt_adt_attributes.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/
+x64-windows/include/boost/spirit/home/support/algorithm/any.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_if.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_if_ns.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_if_ns_so.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_ns.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_ns_so.hpp
+x64-windows/include/boost/spirit/home/support/argument.hpp
+x64-windows/include/boost/spirit/home/support/argument_expression.hpp
+x64-windows/include/boost/spirit/home/support/assert_msg.hpp
+x64-windows/include/boost/spirit/home/support/attributes.hpp
+x64-windows/include/boost/spirit/home/support/attributes_fwd.hpp
+x64-windows/include/boost/spirit/home/support/auto.hpp
+x64-windows/include/boost/spirit/home/support/auto/
+x64-windows/include/boost/spirit/home/support/auto/meta_create.hpp
+x64-windows/include/boost/spirit/home/support/auxiliary/
+x64-windows/include/boost/spirit/home/support/auxiliary/attr_cast.hpp
+x64-windows/include/boost/spirit/home/support/char_class.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/
+x64-windows/include/boost/spirit/home/support/char_encoding/ascii.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/iso8859_1.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/standard.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/standard_wide.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/DerivedCoreProperties.txt
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/PropList.txt
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/Scripts.txt
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/UnicodeData.txt
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/category_table.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/lowercase_table.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/query.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/script_table.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/uppercase_table.hpp
+x64-windows/include/boost/spirit/home/support/char_set/
+x64-windows/include/boost/spirit/home/support/char_set/basic_chset.hpp
+x64-windows/include/boost/spirit/home/support/char_set/range.hpp
+x64-windows/include/boost/spirit/home/support/char_set/range_functions.hpp
+x64-windows/include/boost/spirit/home/support/char_set/range_run.hpp
+x64-windows/include/boost/spirit/home/support/char_set/range_run_impl.hpp
+x64-windows/include/boost/spirit/home/support/common_terminals.hpp
+x64-windows/include/boost/spirit/home/support/container.hpp
+x64-windows/include/boost/spirit/home/support/context.hpp
+x64-windows/include/boost/spirit/home/support/detail/
+x64-windows/include/boost/spirit/home/support/detail/as_variant.hpp
+x64-windows/include/boost/spirit/home/support/detail/endian.hpp
+x64-windows/include/boost/spirit/home/support/detail/endian/
+x64-windows/include/boost/spirit/home/support/detail/endian/cover_operators.hpp
+x64-windows/include/boost/spirit/home/support/detail/endian/endian.hpp
+x64-windows/include/boost/spirit/home/support/detail/get_encoding.hpp
+x64-windows/include/boost/spirit/home/support/detail/hold_any.hpp
+x64-windows/include/boost/spirit/home/support/detail/is_spirit_tag.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/
+x64-windows/include/boost/spirit/home/support/detail/lexer/char_traits.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/consts.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/containers/
+x64-windows/include/boost/spirit/home/support/detail/lexer/containers/ptr_list.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/conversion/
+x64-windows/include/boost/spirit/home/support/detail/lexer/conversion/char_state_machine.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/debug.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/file_input.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/generate_cpp.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/generate_re2c.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/generator.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/input.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/internals.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/parser.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_helper.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_state.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/end_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/iteration_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/leaf_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/selection_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/sequence_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/partition/
+x64-windows/include/boost/spirit/home/support/detail/lexer/partition/charset.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/partition/equivset.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/rules.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/runtime_error.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/serialise.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/size_t.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/state_machine.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/string_token.hpp
+x64-windows/include/boost/spirit/home/support/detail/make_cons.hpp
+x64-windows/include/boost/spirit/home/support/detail/make_vector.hpp
+x64-windows/include/boost/spirit/home/support/detail/math/
+x64-windows/include/boost/spirit/home/support/detail/math/detail/
+x64-windows/include/boost/spirit/home/support/detail/math/detail/fp_traits.hpp
+x64-windows/include/boost/spirit/home/support/detail/math/fpclassify.hpp
+x64-windows/include/boost/spirit/home/support/detail/math/signbit.hpp
+x64-windows/include/boost/spirit/home/support/detail/pow10.hpp
+x64-windows/include/boost/spirit/home/support/detail/scoped_enum_emulation.hpp
+x64-windows/include/boost/spirit/home/support/detail/sign.hpp
+x64-windows/include/boost/spirit/home/support/detail/what_function.hpp
+x64-windows/include/boost/spirit/home/support/extended_variant.hpp
+x64-windows/include/boost/spirit/home/support/handles_container.hpp
+x64-windows/include/boost/spirit/home/support/has_semantic_action.hpp
+x64-windows/include/boost/spirit/home/support/info.hpp
+x64-windows/include/boost/spirit/home/support/iterators/
+x64-windows/include/boost/spirit/home/support/iterators/detail/
+x64-windows/include/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/buffering_input_iterator_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/combine_policies.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/first_owner_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/fixed_size_queue.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/functor_input_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/istream_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/lex_input_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/multi_pass.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/no_check_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/ref_counted_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/istream_iterator.hpp
+x64-windows/include/boost/spirit/home/support/iterators/line_pos_iterator.hpp
+x64-windows/include/boost/spirit/home/support/iterators/look_ahead.hpp
+x64-windows/include/boost/spirit/home/support/iterators/multi_pass.hpp
+x64-windows/include/boost/spirit/home/support/iterators/multi_pass_fwd.hpp
+x64-windows/include/boost/spirit/home/support/iterators/ostream_iterator.hpp
+x64-windows/include/boost/spirit/home/support/lazy.hpp
+x64-windows/include/boost/spirit/home/support/limits.hpp
+x64-windows/include/boost/spirit/home/support/make_component.hpp
+x64-windows/include/boost/spirit/home/support/meta_compiler.hpp
+x64-windows/include/boost/spirit/home/support/modify.hpp
+x64-windows/include/boost/spirit/home/support/multi_pass.hpp
+x64-windows/include/boost/spirit/home/support/multi_pass_wrapper.hpp
+x64-windows/include/boost/spirit/home/support/nonterminal/
+x64-windows/include/boost/spirit/home/support/nonterminal/expand_arg.hpp
+x64-windows/include/boost/spirit/home/support/nonterminal/extract_param.hpp
+x64-windows/include/boost/spirit/home/support/nonterminal/locals.hpp
+x64-windows/include/boost/spirit/home/support/numeric_traits.hpp
+x64-windows/include/boost/spirit/home/support/sequence_base_id.hpp
+x64-windows/include/boost/spirit/home/support/string_traits.hpp
+x64-windows/include/boost/spirit/home/support/terminal.hpp
+x64-windows/include/boost/spirit/home/support/terminal_expression.hpp
+x64-windows/include/boost/spirit/home/support/unused.hpp
+x64-windows/include/boost/spirit/home/support/utf8.hpp
+x64-windows/include/boost/spirit/home/support/utree.hpp
+x64-windows/include/boost/spirit/home/support/utree/
+x64-windows/include/boost/spirit/home/support/utree/detail/
+x64-windows/include/boost/spirit/home/support/utree/detail/utree_detail1.hpp
+x64-windows/include/boost/spirit/home/support/utree/detail/utree_detail2.hpp
+x64-windows/include/boost/spirit/home/support/utree/operators.hpp
+x64-windows/include/boost/spirit/home/support/utree/utree.hpp
+x64-windows/include/boost/spirit/home/support/utree/utree_traits.hpp
+x64-windows/include/boost/spirit/home/support/utree/utree_traits_fwd.hpp
+x64-windows/include/boost/spirit/home/x3.hpp
+x64-windows/include/boost/spirit/home/x3/
+x64-windows/include/boost/spirit/home/x3/auxiliary.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/
+x64-windows/include/boost/spirit/home/x3/auxiliary/any_parser.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/attr.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/eoi.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/eol.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/eps.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/guard.hpp
+x64-windows/include/boost/spirit/home/x3/binary.hpp
+x64-windows/include/boost/spirit/home/x3/binary/
+x64-windows/include/boost/spirit/home/x3/binary/binary.hpp
+x64-windows/include/boost/spirit/home/x3/char.hpp
+x64-windows/include/boost/spirit/home/x3/char/
+x64-windows/include/boost/spirit/home/x3/char/any_char.hpp
+x64-windows/include/boost/spirit/home/x3/char/char.hpp
+x64-windows/include/boost/spirit/home/x3/char/char_class.hpp
+x64-windows/include/boost/spirit/home/x3/char/char_class_tags.hpp
+x64-windows/include/boost/spirit/home/x3/char/char_parser.hpp
+x64-windows/include/boost/spirit/home/x3/char/char_set.hpp
+x64-windows/include/boost/spirit/home/x3/char/detail/
+x64-windows/include/boost/spirit/home/x3/char/detail/cast_char.hpp
+x64-windows/include/boost/spirit/home/x3/char/literal_char.hpp
+x64-windows/include/boost/spirit/home/x3/char/negated_char_parser.hpp
+x64-windows/include/boost/spirit/home/x3/char/unicode.hpp
+x64-windows/include/boost/spirit/home/x3/core.hpp
+x64-windows/include/boost/spirit/home/x3/core/
+x64-windows/include/boost/spirit/home/x3/core/action.hpp
+x64-windows/include/boost/spirit/home/x3/core/call.hpp
+x64-windows/include/boost/spirit/home/x3/core/detail/
+x64-windows/include/boost/spirit/home/x3/core/detail/parse_into_container.hpp
+x64-windows/include/boost/spirit/home/x3/core/parse.hpp
+x64-windows/include/boost/spirit/home/x3/core/parser.hpp
+x64-windows/include/boost/spirit/home/x3/core/proxy.hpp
+x64-windows/include/boost/spirit/home/x3/core/skip_over.hpp
+x64-windows/include/boost/spirit/home/x3/directive.hpp
+x64-windows/include/boost/spirit/home/x3/directive/
+x64-windows/include/boost/spirit/home/x3/directive/confix.hpp
+x64-windows/include/boost/spirit/home/x3/directive/expect.hpp
+x64-windows/include/boost/spirit/home/x3/directive/lexeme.hpp
+x64-windows/include/boost/spirit/home/x3/directive/matches.hpp
+x64-windows/include/boost/spirit/home/x3/directive/no_case.hpp
+x64-windows/include/boost/spirit/home/x3/directive/no_skip.hpp
+x64-windows/include/boost/spirit/home/x3/directive/omit.hpp
+x64-windows/include/boost/spirit/home/x3/directive/raw.hpp
+x64-windows/include/boost/spirit/home/x3/directive/repeat.hpp
+x64-windows/include/boost/spirit/home/x3/directive/seek.hpp
+x64-windows/include/boost/spirit/home/x3/directive/skip.hpp
+x64-windows/include/boost/spirit/home/x3/directive/with.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/
+x64-windows/include/boost/spirit/home/x3/nonterminal/debug_handler_state.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/detail/
+x64-windows/include/boost/spirit/home/x3/nonterminal/detail/rule.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/detail/transform_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/rule.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/simple_trace.hpp
+x64-windows/include/boost/spirit/home/x3/numeric.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/
+x64-windows/include/boost/spirit/home/x3/numeric/bool.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/bool_policies.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/int.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/real.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/real_policies.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/uint.hpp
+x64-windows/include/boost/spirit/home/x3/operator.hpp
+x64-windows/include/boost/spirit/home/x3/operator/
+x64-windows/include/boost/spirit/home/x3/operator/alternative.hpp
+x64-windows/include/boost/spirit/home/x3/operator/and_predicate.hpp
+x64-windows/include/boost/spirit/home/x3/operator/detail/
+x64-windows/include/boost/spirit/home/x3/operator/detail/alternative.hpp
+x64-windows/include/boost/spirit/home/x3/operator/detail/sequence.hpp
+x64-windows/include/boost/spirit/home/x3/operator/difference.hpp
+x64-windows/include/boost/spirit/home/x3/operator/kleene.hpp
+x64-windows/include/boost/spirit/home/x3/operator/list.hpp
+x64-windows/include/boost/spirit/home/x3/operator/not_predicate.hpp
+x64-windows/include/boost/spirit/home/x3/operator/optional.hpp
+x64-windows/include/boost/spirit/home/x3/operator/plus.hpp
+x64-windows/include/boost/spirit/home/x3/operator/sequence.hpp
+x64-windows/include/boost/spirit/home/x3/string.hpp
+x64-windows/include/boost/spirit/home/x3/string/
+x64-windows/include/boost/spirit/home/x3/string/detail/
+x64-windows/include/boost/spirit/home/x3/string/detail/no_case_string_parse.hpp
+x64-windows/include/boost/spirit/home/x3/string/detail/string_parse.hpp
+x64-windows/include/boost/spirit/home/x3/string/detail/tst.hpp
+x64-windows/include/boost/spirit/home/x3/string/literal_string.hpp
+x64-windows/include/boost/spirit/home/x3/string/symbols.hpp
+x64-windows/include/boost/spirit/home/x3/string/tst.hpp
+x64-windows/include/boost/spirit/home/x3/string/tst_map.hpp
+x64-windows/include/boost/spirit/home/x3/support/
+x64-windows/include/boost/spirit/home/x3/support/ast/
+x64-windows/include/boost/spirit/home/x3/support/ast/position_tagged.hpp
+x64-windows/include/boost/spirit/home/x3/support/ast/variant.hpp
+x64-windows/include/boost/spirit/home/x3/support/context.hpp
+x64-windows/include/boost/spirit/home/x3/support/no_case.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/detail/
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/detail/extract_int.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/extract_int.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/extract_real.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/pow10.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/sign.hpp
+x64-windows/include/boost/spirit/home/x3/support/subcontext.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/
+x64-windows/include/boost/spirit/home/x3/support/traits/attribute_category.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/attribute_of.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/attribute_type.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/container_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/handles_container.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/has_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/is_parser.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/is_range.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/is_substitute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/is_variant.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/make_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/move_to.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/numeric_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/optional_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/print_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/print_token.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/string_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/transform_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/tuple_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/value_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/variant_find_substitute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/variant_has_substitute.hpp
+x64-windows/include/boost/spirit/home/x3/support/unused.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/
+x64-windows/include/boost/spirit/home/x3/support/utility/annotate_on_success.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/error_reporting.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/is_callable.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/lambda_visitor.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/sfinae.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/testing.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/unrefcv.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/utf8.hpp
+x64-windows/include/boost/spirit/home/x3/version.hpp
+x64-windows/include/boost/spirit/include/
+x64-windows/include/boost/spirit/include/classic.hpp
+x64-windows/include/boost/spirit/include/classic_actions.hpp
+x64-windows/include/boost/spirit/include/classic_actor.hpp
+x64-windows/include/boost/spirit/include/classic_alternative.hpp
+x64-windows/include/boost/spirit/include/classic_as_parser.hpp
+x64-windows/include/boost/spirit/include/classic_assert.hpp
+x64-windows/include/boost/spirit/include/classic_assign_actor.hpp
+x64-windows/include/boost/spirit/include/classic_assign_key_actor.hpp
+x64-windows/include/boost/spirit/include/classic_ast.hpp
+x64-windows/include/boost/spirit/include/classic_ast_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_attribute.hpp
+x64-windows/include/boost/spirit/include/classic_basic_chset.hpp
+x64-windows/include/boost/spirit/include/classic_chset.hpp
+x64-windows/include/boost/spirit/include/classic_chset_operators.hpp
+x64-windows/include/boost/spirit/include/classic_clear_actor.hpp
+x64-windows/include/boost/spirit/include/classic_closure.hpp
+x64-windows/include/boost/spirit/include/classic_closure_context.hpp
+x64-windows/include/boost/spirit/include/classic_closure_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_common.hpp
+x64-windows/include/boost/spirit/include/classic_common_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_composite.hpp
+x64-windows/include/boost/spirit/include/classic_config.hpp
+x64-windows/include/boost/spirit/include/classic_confix.hpp
+x64-windows/include/boost/spirit/include/classic_confix_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_core.hpp
+x64-windows/include/boost/spirit/include/classic_debug.hpp
+x64-windows/include/boost/spirit/include/classic_debug_node.hpp
+x64-windows/include/boost/spirit/include/classic_decrement_actor.hpp
+x64-windows/include/boost/spirit/include/classic_difference.hpp
+x64-windows/include/boost/spirit/include/classic_directives.hpp
+x64-windows/include/boost/spirit/include/classic_distinct.hpp
+x64-windows/include/boost/spirit/include/classic_distinct_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_dynamic.hpp
+x64-windows/include/boost/spirit/include/classic_epsilon.hpp
+x64-windows/include/boost/spirit/include/classic_erase_actor.hpp
+x64-windows/include/boost/spirit/include/classic_error_handling.hpp
+x64-windows/include/boost/spirit/include/classic_escape_char.hpp
+x64-windows/include/boost/spirit/include/classic_escape_char_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_exceptions.hpp
+x64-windows/include/boost/spirit/include/classic_exceptions_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_exclusive_or.hpp
+x64-windows/include/boost/spirit/include/classic_file_iterator.hpp
+x64-windows/include/boost/spirit/include/classic_file_iterator_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_fixed_size_queue.hpp
+x64-windows/include/boost/spirit/include/classic_flush_multi_pass.hpp
+x64-windows/include/boost/spirit/include/classic_for.hpp
+x64-windows/include/boost/spirit/include/classic_functor_parser.hpp
+x64-windows/include/boost/spirit/include/classic_fundamental.hpp
+x64-windows/include/boost/spirit/include/classic_grammar.hpp
+x64-windows/include/boost/spirit/include/classic_grammar_def.hpp
+x64-windows/include/boost/spirit/include/classic_grammar_def_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_if.hpp
+x64-windows/include/boost/spirit/include/classic_increment_actor.hpp
+x64-windows/include/boost/spirit/include/classic_insert_at_actor.hpp
+x64-windows/include/boost/spirit/include/classic_insert_key_actor.hpp
+x64-windows/include/boost/spirit/include/classic_intersection.hpp
+x64-windows/include/boost/spirit/include/classic_iterator.hpp
+x64-windows/include/boost/spirit/include/classic_kleene_star.hpp
+x64-windows/include/boost/spirit/include/classic_lazy.hpp
+x64-windows/include/boost/spirit/include/classic_list.hpp
+x64-windows/include/boost/spirit/include/classic_lists.hpp
+x64-windows/include/boost/spirit/include/classic_lists_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_loops.hpp
+x64-windows/include/boost/spirit/include/classic_match.hpp
+x64-windows/include/boost/spirit/include/classic_meta.hpp
+x64-windows/include/boost/spirit/include/classic_minimal.hpp
+x64-windows/include/boost/spirit/include/classic_multi_pass.hpp
+x64-windows/include/boost/spirit/include/classic_multi_pass_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_nil.hpp
+x64-windows/include/boost/spirit/include/classic_no_actions.hpp
+x64-windows/include/boost/spirit/include/classic_numerics.hpp
+x64-windows/include/boost/spirit/include/classic_numerics_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_operators.hpp
+x64-windows/include/boost/spirit/include/classic_optional.hpp
+x64-windows/include/boost/spirit/include/classic_parametric.hpp
+x64-windows/include/boost/spirit/include/classic_parse_tree.hpp
+x64-windows/include/boost/spirit/include/classic_parse_tree_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_parse_tree_utils.hpp
+x64-windows/include/boost/spirit/include/classic_parser.hpp
+x64-windows/include/boost/spirit/include/classic_parser_context.hpp
+x64-windows/include/boost/spirit/include/classic_parser_id.hpp
+x64-windows/include/boost/spirit/include/classic_parser_names.hpp
+x64-windows/include/boost/spirit/include/classic_parser_traits.hpp
+x64-windows/include/boost/spirit/include/classic_position_iterator.hpp
+x64-windows/include/boost/spirit/include/classic_position_iterator_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_positive.hpp
+x64-windows/include/boost/spirit/include/classic_primitives.hpp
+x64-windows/include/boost/spirit/include/classic_push_back_actor.hpp
+x64-windows/include/boost/spirit/include/classic_push_front_actor.hpp
+x64-windows/include/boost/spirit/include/classic_range_run.hpp
+x64-windows/include/boost/spirit/include/classic_ref_actor.hpp
+x64-windows/include/boost/spirit/include/classic_ref_const_ref_actor.hpp
+x64-windows/include/boost/spirit/include/classic_ref_const_ref_const_ref_a.hpp
+x64-windows/include/boost/spirit/include/classic_ref_const_ref_value_actor.hpp
+x64-windows/include/boost/spirit/include/classic_ref_value_actor.hpp
+x64-windows/include/boost/spirit/include/classic_refactoring.hpp
+x64-windows/include/boost/spirit/include/classic_regex.hpp
+x64-windows/include/boost/spirit/include/classic_rule.hpp
+x64-windows/include/boost/spirit/include/classic_rule_alias.hpp
+x64-windows/include/boost/spirit/include/classic_rule_parser.hpp
+x64-windows/include/boost/spirit/include/classic_safe_bool.hpp
+x64-windows/include/boost/spirit/include/classic_scanner.hpp
+x64-windows/include/boost/spirit/include/classic_scanner_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_scoped_lock.hpp
+x64-windows/include/boost/spirit/include/classic_select.hpp
+x64-windows/include/boost/spirit/include/classic_sequence.hpp
+x64-windows/include/boost/spirit/include/classic_sequential_and.hpp
+x64-windows/include/boost/spirit/include/classic_sequential_or.hpp
+x64-windows/include/boost/spirit/include/classic_skipper.hpp
+x64-windows/include/boost/spirit/include/classic_skipper_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_spirit.hpp
+x64-windows/include/boost/spirit/include/classic_static.hpp
+x64-windows/include/boost/spirit/include/classic_stored_rule.hpp
+x64-windows/include/boost/spirit/include/classic_stored_rule_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_subrule.hpp
+x64-windows/include/boost/spirit/include/classic_subrule_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_swap_actor.hpp
+x64-windows/include/boost/spirit/include/classic_switch.hpp
+x64-windows/include/boost/spirit/include/classic_symbols.hpp
+x64-windows/include/boost/spirit/include/classic_symbols_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_traverse.hpp
+x64-windows/include/boost/spirit/include/classic_tree_to_xml.hpp
+x64-windows/include/boost/spirit/include/classic_typeof.hpp
+x64-windows/include/boost/spirit/include/classic_utility.hpp
+x64-windows/include/boost/spirit/include/classic_version.hpp
+x64-windows/include/boost/spirit/include/classic_while.hpp
+x64-windows/include/boost/spirit/include/karma.hpp
+x64-windows/include/boost/spirit/include/karma_action.hpp
+x64-windows/include/boost/spirit/include/karma_alternative.hpp
+x64-windows/include/boost/spirit/include/karma_and_predicate.hpp
+x64-windows/include/boost/spirit/include/karma_as.hpp
+x64-windows/include/boost/spirit/include/karma_attr_cast.hpp
+x64-windows/include/boost/spirit/include/karma_auto.hpp
+x64-windows/include/boost/spirit/include/karma_auxiliary.hpp
+x64-windows/include/boost/spirit/include/karma_binary.hpp
+x64-windows/include/boost/spirit/include/karma_bool.hpp
+x64-windows/include/boost/spirit/include/karma_buffer.hpp
+x64-windows/include/boost/spirit/include/karma_center_alignment.hpp
+x64-windows/include/boost/spirit/include/karma_char.hpp
+x64-windows/include/boost/spirit/include/karma_char_.hpp
+x64-windows/include/boost/spirit/include/karma_char_class.hpp
+x64-windows/include/boost/spirit/include/karma_columns.hpp
+x64-windows/include/boost/spirit/include/karma_delimit.hpp
+x64-windows/include/boost/spirit/include/karma_directive.hpp
+x64-windows/include/boost/spirit/include/karma_domain.hpp
+x64-windows/include/boost/spirit/include/karma_duplicate.hpp
+x64-windows/include/boost/spirit/include/karma_eol.hpp
+x64-windows/include/boost/spirit/include/karma_eps.hpp
+x64-windows/include/boost/spirit/include/karma_format.hpp
+x64-windows/include/boost/spirit/include/karma_format_attr.hpp
+x64-windows/include/boost/spirit/include/karma_format_auto.hpp
+x64-windows/include/boost/spirit/include/karma_generate.hpp
+x64-windows/include/boost/spirit/include/karma_generate_attr.hpp
+x64-windows/include/boost/spirit/include/karma_generate_auto.hpp
+x64-windows/include/boost/spirit/include/karma_grammar.hpp
+x64-windows/include/boost/spirit/include/karma_int.hpp
+x64-windows/include/boost/spirit/include/karma_kleene.hpp
+x64-windows/include/boost/spirit/include/karma_lazy.hpp
+x64-windows/include/boost/spirit/include/karma_left_alignment.hpp
+x64-windows/include/boost/spirit/include/karma_list.hpp
+x64-windows/include/boost/spirit/include/karma_maxwidth.hpp
+x64-windows/include/boost/spirit/include/karma_no_delimit.hpp
+x64-windows/include/boost/spirit/include/karma_nonterminal.hpp
+x64-windows/include/boost/spirit/include/karma_not_predicate.hpp
+x64-windows/include/boost/spirit/include/karma_numeric.hpp
+x64-windows/include/boost/spirit/include/karma_omit.hpp
+x64-windows/include/boost/spirit/include/karma_operator.hpp
+x64-windows/include/boost/spirit/include/karma_optional.hpp
+x64-windows/include/boost/spirit/include/karma_phoenix_attributes.hpp
+x64-windows/include/boost/spirit/include/karma_plus.hpp
+x64-windows/include/boost/spirit/include/karma_real.hpp
+x64-windows/include/boost/spirit/include/karma_repeat.hpp
+x64-windows/include/boost/spirit/include/karma_right_alignment.hpp
+x64-windows/include/boost/spirit/include/karma_rule.hpp
+x64-windows/include/boost/spirit/include/karma_sequence.hpp
+x64-windows/include/boost/spirit/include/karma_stream.hpp
+x64-windows/include/boost/spirit/include/karma_strict_relaxed.hpp
+x64-windows/include/boost/spirit/include/karma_string.hpp
+x64-windows/include/boost/spirit/include/karma_symbols.hpp
+x64-windows/include/boost/spirit/include/karma_uint.hpp
+x64-windows/include/boost/spirit/include/karma_upper_lower_case.hpp
+x64-windows/include/boost/spirit/include/karma_verbatim.hpp
+x64-windows/include/boost/spirit/include/karma_what.hpp
+x64-windows/include/boost/spirit/include/lex.hpp
+x64-windows/include/boost/spirit/include/lex_char_token_def.hpp
+x64-windows/include/boost/spirit/include/lex_domain.hpp
+x64-windows/include/boost/spirit/include/lex_generate_static_lexertl.hpp
+x64-windows/include/boost/spirit/include/lex_lexer.hpp
+x64-windows/include/boost/spirit/include/lex_lexertl.hpp
+x64-windows/include/boost/spirit/include/lex_lexertl_position_token.hpp
+x64-windows/include/boost/spirit/include/lex_lexertl_token.hpp
+x64-windows/include/boost/spirit/include/lex_plain_token.hpp
+x64-windows/include/boost/spirit/include/lex_primitives.hpp
+x64-windows/include/boost/spirit/include/lex_static_lexertl.hpp
+x64-windows/include/boost/spirit/include/lex_tokenize_and_parse.hpp
+x64-windows/include/boost/spirit/include/lex_tokenize_and_parse_attr.hpp
+x64-windows/include/boost/spirit/include/phoenix.hpp
+x64-windows/include/boost/spirit/include/phoenix1.hpp
+x64-windows/include/boost/spirit/include/phoenix1_actor.hpp
+x64-windows/include/boost/spirit/include/phoenix1_binders.hpp
+x64-windows/include/boost/spirit/include/phoenix1_casts.hpp
+x64-windows/include/boost/spirit/include/phoenix1_closures.hpp
+x64-windows/include/boost/spirit/include/phoenix1_composite.hpp
+x64-windows/include/boost/spirit/include/phoenix1_functions.hpp
+x64-windows/include/boost/spirit/include/phoenix1_new.hpp
+x64-windows/include/boost/spirit/include/phoenix1_operators.hpp
+x64-windows/include/boost/spirit/include/phoenix1_primitives.hpp
+x64-windows/include/boost/spirit/include/phoenix1_special_ops.hpp
+x64-windows/include/boost/spirit/include/phoenix1_statements.hpp
+x64-windows/include/boost/spirit/include/phoenix1_tuple_helpers.hpp
+x64-windows/include/boost/spirit/include/phoenix1_tuples.hpp
+x64-windows/include/boost/spirit/include/phoenix_algorithm.hpp
+x64-windows/include/boost/spirit/include/phoenix_bind.hpp
+x64-windows/include/boost/spirit/include/phoenix_container.hpp
+x64-windows/include/boost/spirit/include/phoenix_core.hpp
+x64-windows/include/boost/spirit/include/phoenix_function.hpp
+x64-windows/include/boost/spirit/include/phoenix_fusion.hpp
+x64-windows/include/boost/spirit/include/phoenix_limits.hpp
+x64-windows/include/boost/spirit/include/phoenix_object.hpp
+x64-windows/include/boost/spirit/include/phoenix_operator.hpp
+x64-windows/include/boost/spirit/include/phoenix_scope.hpp
+x64-windows/include/boost/spirit/include/phoenix_statement.hpp
+x64-windows/include/boost/spirit/include/phoenix_stl.hpp
+x64-windows/include/boost/spirit/include/phoenix_version.hpp
+x64-windows/include/boost/spirit/include/qi.hpp
+x64-windows/include/boost/spirit/include/qi_action.hpp
+x64-windows/include/boost/spirit/include/qi_alternative.hpp
+x64-windows/include/boost/spirit/include/qi_and_predicate.hpp
+x64-windows/include/boost/spirit/include/qi_as.hpp
+x64-windows/include/boost/spirit/include/qi_as_string.hpp
+x64-windows/include/boost/spirit/include/qi_attr.hpp
+x64-windows/include/boost/spirit/include/qi_attr_cast.hpp
+x64-windows/include/boost/spirit/include/qi_auto.hpp
+x64-windows/include/boost/spirit/include/qi_auxiliary.hpp
+x64-windows/include/boost/spirit/include/qi_binary.hpp
+x64-windows/include/boost/spirit/include/qi_bool.hpp
+x64-windows/include/boost/spirit/include/qi_char.hpp
+x64-windows/include/boost/spirit/include/qi_char_.hpp
+x64-windows/include/boost/spirit/include/qi_char_class.hpp
+x64-windows/include/boost/spirit/include/qi_copy.hpp
+x64-windows/include/boost/spirit/include/qi_core.hpp
+x64-windows/include/boost/spirit/include/qi_difference.hpp
+x64-windows/include/boost/spirit/include/qi_directive.hpp
+x64-windows/include/boost/spirit/include/qi_domain.hpp
+x64-windows/include/boost/spirit/include/qi_eoi.hpp
+x64-windows/include/boost/spirit/include/qi_eol.hpp
+x64-windows/include/boost/spirit/include/qi_eps.hpp
+x64-windows/include/boost/spirit/include/qi_expect.hpp
+x64-windows/include/boost/spirit/include/qi_grammar.hpp
+x64-windows/include/boost/spirit/include/qi_hold.hpp
+x64-windows/include/boost/spirit/include/qi_int.hpp
+x64-windows/include/boost/spirit/include/qi_kleene.hpp
+x64-windows/include/boost/spirit/include/qi_lazy.hpp
+x64-windows/include/boost/spirit/include/qi_lexeme.hpp
+x64-windows/include/boost/spirit/include/qi_list.hpp
+x64-windows/include/boost/spirit/include/qi_lit.hpp
+x64-windows/include/boost/spirit/include/qi_match.hpp
+x64-windows/include/boost/spirit/include/qi_match_attr.hpp
+x64-windows/include/boost/spirit/include/qi_match_auto.hpp
+x64-windows/include/boost/spirit/include/qi_matches.hpp
+x64-windows/include/boost/spirit/include/qi_no_case.hpp
+x64-windows/include/boost/spirit/include/qi_no_skip.hpp
+x64-windows/include/boost/spirit/include/qi_nonterminal.hpp
+x64-windows/include/boost/spirit/include/qi_not_predicate.hpp
+x64-windows/include/boost/spirit/include/qi_numeric.hpp
+x64-windows/include/boost/spirit/include/qi_omit.hpp
+x64-windows/include/boost/spirit/include/qi_operator.hpp
+x64-windows/include/boost/spirit/include/qi_optional.hpp
+x64-windows/include/boost/spirit/include/qi_parse.hpp
+x64-windows/include/boost/spirit/include/qi_parse_attr.hpp
+x64-windows/include/boost/spirit/include/qi_parse_auto.hpp
+x64-windows/include/boost/spirit/include/qi_permutation.hpp
+x64-windows/include/boost/spirit/include/qi_plus.hpp
+x64-windows/include/boost/spirit/include/qi_raw.hpp
+x64-windows/include/boost/spirit/include/qi_real.hpp
+x64-windows/include/boost/spirit/include/qi_repeat.hpp
+x64-windows/include/boost/spirit/include/qi_rule.hpp
+x64-windows/include/boost/spirit/include/qi_sequence.hpp
+x64-windows/include/boost/spirit/include/qi_sequential_or.hpp
+x64-windows/include/boost/spirit/include/qi_skip.hpp
+x64-windows/include/boost/spirit/include/qi_stream.hpp
+x64-windows/include/boost/spirit/include/qi_string.hpp
+x64-windows/include/boost/spirit/include/qi_symbols.hpp
+x64-windows/include/boost/spirit/include/qi_uint.hpp
+x64-windows/include/boost/spirit/include/qi_what.hpp
+x64-windows/include/boost/spirit/include/support.hpp
+x64-windows/include/boost/spirit/include/support_adapt_adt_attributes.hpp
+x64-windows/include/boost/spirit/include/support_any.hpp
+x64-windows/include/boost/spirit/include/support_any_if.hpp
+x64-windows/include/boost/spirit/include/support_any_if_ns.hpp
+x64-windows/include/boost/spirit/include/support_any_if_ns_so.hpp
+x64-windows/include/boost/spirit/include/support_any_ns.hpp
+x64-windows/include/boost/spirit/include/support_any_ns_so.hpp
+x64-windows/include/boost/spirit/include/support_argument.hpp
+x64-windows/include/boost/spirit/include/support_ascii.hpp
+x64-windows/include/boost/spirit/include/support_attributes.hpp
+x64-windows/include/boost/spirit/include/support_attributes_fwd.hpp
+x64-windows/include/boost/spirit/include/support_auto.hpp
+x64-windows/include/boost/spirit/include/support_char_class.hpp
+x64-windows/include/boost/spirit/include/support_container.hpp
+x64-windows/include/boost/spirit/include/support_extended_variant.hpp
+x64-windows/include/boost/spirit/include/support_info.hpp
+x64-windows/include/boost/spirit/include/support_iso8859_1.hpp
+x64-windows/include/boost/spirit/include/support_istream_iterator.hpp
+x64-windows/include/boost/spirit/include/support_line_pos_iterator.hpp
+x64-windows/include/boost/spirit/include/support_locals.hpp
+x64-windows/include/boost/spirit/include/support_look_ahead.hpp
+x64-windows/include/boost/spirit/include/support_modify.hpp
+x64-windows/include/boost/spirit/include/support_multi_pass.hpp
+x64-windows/include/boost/spirit/include/support_multi_pass_fwd.hpp
+x64-windows/include/boost/spirit/include/support_ostream_iterator.hpp
+x64-windows/include/boost/spirit/include/support_standard.hpp
+x64-windows/include/boost/spirit/include/support_standard_wide.hpp
+x64-windows/include/boost/spirit/include/support_string_traits.hpp
+x64-windows/include/boost/spirit/include/support_unused.hpp
+x64-windows/include/boost/spirit/include/support_utree.hpp
+x64-windows/include/boost/spirit/include/version.hpp
+x64-windows/include/boost/spirit/repository/
+x64-windows/include/boost/spirit/repository/home/
+x64-windows/include/boost/spirit/repository/home/karma.hpp
+x64-windows/include/boost/spirit/repository/home/karma/
+x64-windows/include/boost/spirit/repository/home/karma/directive.hpp
+x64-windows/include/boost/spirit/repository/home/karma/directive/
+x64-windows/include/boost/spirit/repository/home/karma/directive/confix.hpp
+x64-windows/include/boost/spirit/repository/home/karma/nonterminal.hpp
+x64-windows/include/boost/spirit/repository/home/karma/nonterminal/
+x64-windows/include/boost/spirit/repository/home/karma/nonterminal/subrule.hpp
+x64-windows/include/boost/spirit/repository/home/qi.hpp
+x64-windows/include/boost/spirit/repository/home/qi/
+x64-windows/include/boost/spirit/repository/home/qi/directive.hpp
+x64-windows/include/boost/spirit/repository/home/qi/directive/
+x64-windows/include/boost/spirit/repository/home/qi/directive/confix.hpp
+x64-windows/include/boost/spirit/repository/home/qi/directive/distinct.hpp
+x64-windows/include/boost/spirit/repository/home/qi/directive/kwd.hpp
+x64-windows/include/boost/spirit/repository/home/qi/directive/seek.hpp
+x64-windows/include/boost/spirit/repository/home/qi/nonterminal.hpp
+x64-windows/include/boost/spirit/repository/home/qi/nonterminal/
+x64-windows/include/boost/spirit/repository/home/qi/nonterminal/subrule.hpp
+x64-windows/include/boost/spirit/repository/home/qi/operator.hpp
+x64-windows/include/boost/spirit/repository/home/qi/operator/
+x64-windows/include/boost/spirit/repository/home/qi/operator/detail/
+x64-windows/include/boost/spirit/repository/home/qi/operator/detail/keywords.hpp
+x64-windows/include/boost/spirit/repository/home/qi/operator/keywords.hpp
+x64-windows/include/boost/spirit/repository/home/qi/primitive.hpp
+x64-windows/include/boost/spirit/repository/home/qi/primitive/
+x64-windows/include/boost/spirit/repository/home/qi/primitive/advance.hpp
+x64-windows/include/boost/spirit/repository/home/qi/primitive/flush_multi_pass.hpp
+x64-windows/include/boost/spirit/repository/home/qi/primitive/iter_pos.hpp
+x64-windows/include/boost/spirit/repository/home/support/
+x64-windows/include/boost/spirit/repository/home/support/confix.hpp
+x64-windows/include/boost/spirit/repository/home/support/distinct.hpp
+x64-windows/include/boost/spirit/repository/home/support/flush_multi_pass.hpp
+x64-windows/include/boost/spirit/repository/home/support/kwd.hpp
+x64-windows/include/boost/spirit/repository/home/support/seek.hpp
+x64-windows/include/boost/spirit/repository/home/support/subrule_context.hpp
+x64-windows/include/boost/spirit/repository/include/
+x64-windows/include/boost/spirit/repository/include/karma.hpp
+x64-windows/include/boost/spirit/repository/include/karma_confix.hpp
+x64-windows/include/boost/spirit/repository/include/karma_directive.hpp
+x64-windows/include/boost/spirit/repository/include/karma_nonterminal.hpp
+x64-windows/include/boost/spirit/repository/include/karma_subrule.hpp
+x64-windows/include/boost/spirit/repository/include/qi.hpp
+x64-windows/include/boost/spirit/repository/include/qi_advance.hpp
+x64-windows/include/boost/spirit/repository/include/qi_confix.hpp
+x64-windows/include/boost/spirit/repository/include/qi_directive.hpp
+x64-windows/include/boost/spirit/repository/include/qi_distinct.hpp
+x64-windows/include/boost/spirit/repository/include/qi_flush_multi_pass.hpp
+x64-windows/include/boost/spirit/repository/include/qi_iter_pos.hpp
+x64-windows/include/boost/spirit/repository/include/qi_keywords.hpp
+x64-windows/include/boost/spirit/repository/include/qi_kwd.hpp
+x64-windows/include/boost/spirit/repository/include/qi_nonterminal.hpp
+x64-windows/include/boost/spirit/repository/include/qi_primitive.hpp
+x64-windows/include/boost/spirit/repository/include/qi_seek.hpp
+x64-windows/include/boost/spirit/repository/include/qi_subrule.hpp
+x64-windows/include/boost/spirit/version.hpp
+x64-windows/share/
+x64-windows/share/boost-spirit/
+x64-windows/share/boost-spirit/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1207 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/spirit.hpp
+x64-windows-static/include/boost/spirit/
+x64-windows-static/include/boost/spirit/home/
+x64-windows-static/include/boost/spirit/home/classic.hpp
+x64-windows-static/include/boost/spirit/home/classic/
+x64-windows-static/include/boost/spirit/home/classic/actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/
+x64-windows-static/include/boost/spirit/home/classic/actor/assign_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/assign_key_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/clear_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/decrement_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/erase_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/increment_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/insert_at_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/insert_key_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/push_back_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/push_front_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/ref_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/ref_value_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/swap_actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/actor/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/attribute.hpp
+x64-windows-static/include/boost/spirit/home/classic/attribute/
+x64-windows-static/include/boost/spirit/home/classic/attribute/closure.hpp
+x64-windows-static/include/boost/spirit/home/classic/attribute/closure_context.hpp
+x64-windows-static/include/boost/spirit/home/classic/attribute/closure_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/attribute/parametric.hpp
+x64-windows-static/include/boost/spirit/home/classic/attribute/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/core.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/
+x64-windows-static/include/boost/spirit/home/classic/core/assert.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/
+x64-windows-static/include/boost/spirit/home/classic/core/composite/actions.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/alternative.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/composite.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/difference.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/directives.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/epsilon.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/exclusive_or.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/alternative.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/difference.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/directives.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/exclusive_or.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/intersection.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/kleene_star.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/list.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/optional.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/positive.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/sequence.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/sequential_and.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/impl/sequential_or.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/intersection.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/kleene_star.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/list.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/no_actions.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/operators.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/optional.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/positive.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/sequence.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/sequential_and.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/composite/sequential_or.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/config.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/impl/
+x64-windows-static/include/boost/spirit/home/classic/core/impl/match.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/impl/match_attr_traits.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/impl/parser.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/match.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/nil.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/grammar.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/impl/
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/impl/static.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/impl/subrule.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/parser_context.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/rule.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/subrule.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/non_terminal/subrule_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/parser.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/primitives/
+x64-windows-static/include/boost/spirit/home/classic/core/primitives/impl/
+x64-windows-static/include/boost/spirit/home/classic/core/primitives/impl/numerics.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/primitives/impl/primitives.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/primitives/numerics.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/primitives/numerics_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/primitives/primitives.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/safe_bool.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/scanner/
+x64-windows-static/include/boost/spirit/home/classic/core/scanner/impl/
+x64-windows-static/include/boost/spirit/home/classic/core/scanner/impl/skipper.ipp
+x64-windows-static/include/boost/spirit/home/classic/core/scanner/scanner.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/scanner/scanner_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/scanner/skipper.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/scanner/skipper_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/core/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/debug.hpp
+x64-windows-static/include/boost/spirit/home/classic/debug/
+x64-windows-static/include/boost/spirit/home/classic/debug/debug_node.hpp
+x64-windows-static/include/boost/spirit/home/classic/debug/impl/
+x64-windows-static/include/boost/spirit/home/classic/debug/impl/parser_names.ipp
+x64-windows-static/include/boost/spirit/home/classic/debug/minimal.hpp
+x64-windows-static/include/boost/spirit/home/classic/debug/parser_names.hpp
+x64-windows-static/include/boost/spirit/home/classic/debug/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/
+x64-windows-static/include/boost/spirit/home/classic/dynamic/for.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/if.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/impl/
+x64-windows-static/include/boost/spirit/home/classic/dynamic/impl/conditions.ipp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/impl/select.ipp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/impl/switch.ipp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/lazy.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/rule_alias.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/select.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/stored_rule.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/switch.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/dynamic/while.hpp
+x64-windows-static/include/boost/spirit/home/classic/error_handling.hpp
+x64-windows-static/include/boost/spirit/home/classic/error_handling/
+x64-windows-static/include/boost/spirit/home/classic/error_handling/exceptions.hpp
+x64-windows-static/include/boost/spirit/home/classic/error_handling/exceptions_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/error_handling/impl/
+x64-windows-static/include/boost/spirit/home/classic/error_handling/impl/exceptions.ipp
+x64-windows-static/include/boost/spirit/home/classic/error_handling/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator/
+x64-windows-static/include/boost/spirit/home/classic/iterator/file_iterator.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator/file_iterator_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator/fixed_size_queue.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator/impl/
+x64-windows-static/include/boost/spirit/home/classic/iterator/impl/file_iterator.ipp
+x64-windows-static/include/boost/spirit/home/classic/iterator/impl/position_iterator.ipp
+x64-windows-static/include/boost/spirit/home/classic/iterator/multi_pass.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator/multi_pass_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator/position_iterator.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator/position_iterator_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/iterator/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/meta.hpp
+x64-windows-static/include/boost/spirit/home/classic/meta/
+x64-windows-static/include/boost/spirit/home/classic/meta/as_parser.hpp
+x64-windows-static/include/boost/spirit/home/classic/meta/fundamental.hpp
+x64-windows-static/include/boost/spirit/home/classic/meta/impl/
+x64-windows-static/include/boost/spirit/home/classic/meta/impl/fundamental.ipp
+x64-windows-static/include/boost/spirit/home/classic/meta/impl/parser_traits.ipp
+x64-windows-static/include/boost/spirit/home/classic/meta/impl/refactoring.ipp
+x64-windows-static/include/boost/spirit/home/classic/meta/impl/traverse.ipp
+x64-windows-static/include/boost/spirit/home/classic/meta/parser_traits.hpp
+x64-windows-static/include/boost/spirit/home/classic/meta/refactoring.hpp
+x64-windows-static/include/boost/spirit/home/classic/meta/traverse.hpp
+x64-windows-static/include/boost/spirit/home/classic/namespace.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/
+x64-windows-static/include/boost/spirit/home/classic/phoenix/actor.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/binders.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/casts.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/closures.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/composite.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/functions.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/new.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/operators.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/primitives.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/special_ops.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/statements.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/tuple_helpers.hpp
+x64-windows-static/include/boost/spirit/home/classic/phoenix/tuples.hpp
+x64-windows-static/include/boost/spirit/home/classic/symbols.hpp
+x64-windows-static/include/boost/spirit/home/classic/symbols/
+x64-windows-static/include/boost/spirit/home/classic/symbols/impl/
+x64-windows-static/include/boost/spirit/home/classic/symbols/impl/symbols.ipp
+x64-windows-static/include/boost/spirit/home/classic/symbols/impl/tst.ipp
+x64-windows-static/include/boost/spirit/home/classic/symbols/symbols.hpp
+x64-windows-static/include/boost/spirit/home/classic/symbols/symbols_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/symbols/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/
+x64-windows-static/include/boost/spirit/home/classic/tree/ast.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/ast_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/common.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/common_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/impl/
+x64-windows-static/include/boost/spirit/home/classic/tree/impl/parse_tree_utils.ipp
+x64-windows-static/include/boost/spirit/home/classic/tree/impl/tree_to_xml.ipp
+x64-windows-static/include/boost/spirit/home/classic/tree/parse_tree.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/parse_tree_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/parse_tree_utils.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/parsetree.dtd
+x64-windows-static/include/boost/spirit/home/classic/tree/tree_to_xml.hpp
+x64-windows-static/include/boost/spirit/home/classic/tree/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/
+x64-windows-static/include/boost/spirit/home/classic/utility/chset.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/chset_operators.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/confix.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/confix_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/distinct.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/distinct_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/escape_char.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/escape_char_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/flush_multi_pass.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/functor_parser.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/grammar_def.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/grammar_def_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/chset.ipp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/chset/
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/chset/basic_chset.ipp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/chset/range_run.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/chset/range_run.ipp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/chset_operators.ipp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/confix.ipp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/escape_char.ipp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/lists.ipp
+x64-windows-static/include/boost/spirit/home/classic/utility/impl/regex.ipp
+x64-windows-static/include/boost/spirit/home/classic/utility/lists.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/lists_fwd.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/loops.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/regex.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/rule_parser.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/scoped_lock.hpp
+x64-windows-static/include/boost/spirit/home/classic/utility/typeof.hpp
+x64-windows-static/include/boost/spirit/home/classic/version.hpp
+x64-windows-static/include/boost/spirit/home/karma.hpp
+x64-windows-static/include/boost/spirit/home/karma/
+x64-windows-static/include/boost/spirit/home/karma/action.hpp
+x64-windows-static/include/boost/spirit/home/karma/action/
+x64-windows-static/include/boost/spirit/home/karma/action/action.hpp
+x64-windows-static/include/boost/spirit/home/karma/auto.hpp
+x64-windows-static/include/boost/spirit/home/karma/auto/
+x64-windows-static/include/boost/spirit/home/karma/auto/auto.hpp
+x64-windows-static/include/boost/spirit/home/karma/auto/create_generator.hpp
+x64-windows-static/include/boost/spirit/home/karma/auto/meta_create.hpp
+x64-windows-static/include/boost/spirit/home/karma/auxiliary.hpp
+x64-windows-static/include/boost/spirit/home/karma/auxiliary/
+x64-windows-static/include/boost/spirit/home/karma/auxiliary/attr_cast.hpp
+x64-windows-static/include/boost/spirit/home/karma/auxiliary/eol.hpp
+x64-windows-static/include/boost/spirit/home/karma/auxiliary/eps.hpp
+x64-windows-static/include/boost/spirit/home/karma/auxiliary/lazy.hpp
+x64-windows-static/include/boost/spirit/home/karma/binary.hpp
+x64-windows-static/include/boost/spirit/home/karma/binary/
+x64-windows-static/include/boost/spirit/home/karma/binary/binary.hpp
+x64-windows-static/include/boost/spirit/home/karma/binary/padding.hpp
+x64-windows-static/include/boost/spirit/home/karma/char.hpp
+x64-windows-static/include/boost/spirit/home/karma/char/
+x64-windows-static/include/boost/spirit/home/karma/char/char.hpp
+x64-windows-static/include/boost/spirit/home/karma/char/char_class.hpp
+x64-windows-static/include/boost/spirit/home/karma/char/char_generator.hpp
+x64-windows-static/include/boost/spirit/home/karma/delimit_flag.hpp
+x64-windows-static/include/boost/spirit/home/karma/delimit_out.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/
+x64-windows-static/include/boost/spirit/home/karma/detail/alternative_function.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/as.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/attributes.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/default_width.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/enable_lit.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/extract_from.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/fail_function.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/generate.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/generate_auto.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/generate_to.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/get_casetag.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/get_stricttag.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/indirect_iterator.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/output_iterator.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/pass_container.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/string_compare.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/string_generate.hpp
+x64-windows-static/include/boost/spirit/home/karma/detail/unused_delimiter.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/
+x64-windows-static/include/boost/spirit/home/karma/directive/as.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/buffer.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/center_alignment.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/columns.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/delimit.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/duplicate.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/encoding.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/left_alignment.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/maxwidth.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/no_delimit.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/omit.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/repeat.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/right_alignment.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/strict_relaxed.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/upper_lower_case.hpp
+x64-windows-static/include/boost/spirit/home/karma/directive/verbatim.hpp
+x64-windows-static/include/boost/spirit/home/karma/domain.hpp
+x64-windows-static/include/boost/spirit/home/karma/format.hpp
+x64-windows-static/include/boost/spirit/home/karma/format_auto.hpp
+x64-windows-static/include/boost/spirit/home/karma/generate.hpp
+x64-windows-static/include/boost/spirit/home/karma/generate_attr.hpp
+x64-windows-static/include/boost/spirit/home/karma/generator.hpp
+x64-windows-static/include/boost/spirit/home/karma/meta_compiler.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/debug_handler.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/debug_handler_state.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/detail/
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/detail/fcall.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/detail/generator_binder.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/grammar.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/nonterminal_fwd.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/rule.hpp
+x64-windows-static/include/boost/spirit/home/karma/nonterminal/simple_trace.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/
+x64-windows-static/include/boost/spirit/home/karma/numeric/bool.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/bool_policies.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/detail/
+x64-windows-static/include/boost/spirit/home/karma/numeric/detail/bool_utils.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/detail/real_utils.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/int.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/real.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/real_policies.hpp
+x64-windows-static/include/boost/spirit/home/karma/numeric/uint.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator/
+x64-windows-static/include/boost/spirit/home/karma/operator/alternative.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator/and_predicate.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator/kleene.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator/list.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator/not_predicate.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator/optional.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator/plus.hpp
+x64-windows-static/include/boost/spirit/home/karma/operator/sequence.hpp
+x64-windows-static/include/boost/spirit/home/karma/phoenix_attributes.hpp
+x64-windows-static/include/boost/spirit/home/karma/reference.hpp
+x64-windows-static/include/boost/spirit/home/karma/stream.hpp
+x64-windows-static/include/boost/spirit/home/karma/stream/
+x64-windows-static/include/boost/spirit/home/karma/stream/detail/
+x64-windows-static/include/boost/spirit/home/karma/stream/detail/format_manip.hpp
+x64-windows-static/include/boost/spirit/home/karma/stream/detail/format_manip_auto.hpp
+x64-windows-static/include/boost/spirit/home/karma/stream/detail/iterator_sink.hpp
+x64-windows-static/include/boost/spirit/home/karma/stream/format_manip.hpp
+x64-windows-static/include/boost/spirit/home/karma/stream/format_manip_attr.hpp
+x64-windows-static/include/boost/spirit/home/karma/stream/ostream_iterator.hpp
+x64-windows-static/include/boost/spirit/home/karma/stream/stream.hpp
+x64-windows-static/include/boost/spirit/home/karma/string.hpp
+x64-windows-static/include/boost/spirit/home/karma/string/
+x64-windows-static/include/boost/spirit/home/karma/string/lit.hpp
+x64-windows-static/include/boost/spirit/home/karma/string/symbols.hpp
+x64-windows-static/include/boost/spirit/home/karma/what.hpp
+x64-windows-static/include/boost/spirit/home/lex.hpp
+x64-windows-static/include/boost/spirit/home/lex/
+x64-windows-static/include/boost/spirit/home/lex/argument.hpp
+x64-windows-static/include/boost/spirit/home/lex/argument_phoenix.hpp
+x64-windows-static/include/boost/spirit/home/lex/detail/
+x64-windows-static/include/boost/spirit/home/lex/detail/sequence_function.hpp
+x64-windows-static/include/boost/spirit/home/lex/domain.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/
+x64-windows-static/include/boost/spirit/home/lex/lexer/action.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/char_token_def.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexer.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/functor.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/generate_static.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/iterator.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/position_token.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/semantic_action_data.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/static_version.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/token.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/pass_flags.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/sequence.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/string_token_def.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/support_functions.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/support_functions_expression.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/terminals.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer/token_def.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer_lexertl.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer_static_lexertl.hpp
+x64-windows-static/include/boost/spirit/home/lex/lexer_type.hpp
+x64-windows-static/include/boost/spirit/home/lex/meta_compiler.hpp
+x64-windows-static/include/boost/spirit/home/lex/primitives.hpp
+x64-windows-static/include/boost/spirit/home/lex/qi.hpp
+x64-windows-static/include/boost/spirit/home/lex/qi/
+x64-windows-static/include/boost/spirit/home/lex/qi/in_state.hpp
+x64-windows-static/include/boost/spirit/home/lex/qi/plain_raw_token.hpp
+x64-windows-static/include/boost/spirit/home/lex/qi/plain_token.hpp
+x64-windows-static/include/boost/spirit/home/lex/qi/plain_tokenid.hpp
+x64-windows-static/include/boost/spirit/home/lex/qi/plain_tokenid_mask.hpp
+x64-windows-static/include/boost/spirit/home/lex/qi/state_switcher.hpp
+x64-windows-static/include/boost/spirit/home/lex/reference.hpp
+x64-windows-static/include/boost/spirit/home/lex/tokenize_and_parse.hpp
+x64-windows-static/include/boost/spirit/home/lex/tokenize_and_parse_attr.hpp
+x64-windows-static/include/boost/spirit/home/qi.hpp
+x64-windows-static/include/boost/spirit/home/qi/
+x64-windows-static/include/boost/spirit/home/qi/action.hpp
+x64-windows-static/include/boost/spirit/home/qi/action/
+x64-windows-static/include/boost/spirit/home/qi/action/action.hpp
+x64-windows-static/include/boost/spirit/home/qi/auto.hpp
+x64-windows-static/include/boost/spirit/home/qi/auto/
+x64-windows-static/include/boost/spirit/home/qi/auto/auto.hpp
+x64-windows-static/include/boost/spirit/home/qi/auto/create_parser.hpp
+x64-windows-static/include/boost/spirit/home/qi/auto/meta_create.hpp
+x64-windows-static/include/boost/spirit/home/qi/auxiliary.hpp
+x64-windows-static/include/boost/spirit/home/qi/auxiliary/
+x64-windows-static/include/boost/spirit/home/qi/auxiliary/attr.hpp
+x64-windows-static/include/boost/spirit/home/qi/auxiliary/attr_cast.hpp
+x64-windows-static/include/boost/spirit/home/qi/auxiliary/eoi.hpp
+x64-windows-static/include/boost/spirit/home/qi/auxiliary/eol.hpp
+x64-windows-static/include/boost/spirit/home/qi/auxiliary/eps.hpp
+x64-windows-static/include/boost/spirit/home/qi/auxiliary/lazy.hpp
+x64-windows-static/include/boost/spirit/home/qi/binary.hpp
+x64-windows-static/include/boost/spirit/home/qi/binary/
+x64-windows-static/include/boost/spirit/home/qi/binary/binary.hpp
+x64-windows-static/include/boost/spirit/home/qi/char.hpp
+x64-windows-static/include/boost/spirit/home/qi/char/
+x64-windows-static/include/boost/spirit/home/qi/char/char.hpp
+x64-windows-static/include/boost/spirit/home/qi/char/char_class.hpp
+x64-windows-static/include/boost/spirit/home/qi/char/char_parser.hpp
+x64-windows-static/include/boost/spirit/home/qi/copy.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/
+x64-windows-static/include/boost/spirit/home/qi/detail/alternative_function.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/assign_to.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/attributes.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/construct.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/enable_lit.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/expect_function.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/expectation_failure.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/fail_function.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/parse.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/parse_auto.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/pass_container.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/pass_function.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/permute_function.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/string_parse.hpp
+x64-windows-static/include/boost/spirit/home/qi/detail/unused_skipper.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/
+x64-windows-static/include/boost/spirit/home/qi/directive/as.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/encoding.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/expect.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/hold.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/lexeme.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/matches.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/no_case.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/no_skip.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/omit.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/raw.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/repeat.hpp
+x64-windows-static/include/boost/spirit/home/qi/directive/skip.hpp
+x64-windows-static/include/boost/spirit/home/qi/domain.hpp
+x64-windows-static/include/boost/spirit/home/qi/match.hpp
+x64-windows-static/include/boost/spirit/home/qi/match_auto.hpp
+x64-windows-static/include/boost/spirit/home/qi/meta_compiler.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/debug_handler.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/debug_handler_state.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/detail/
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/detail/fcall.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/detail/parser_binder.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/error_handler.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/grammar.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/nonterminal_fwd.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/rule.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/simple_trace.hpp
+x64-windows-static/include/boost/spirit/home/qi/nonterminal/success_handler.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/
+x64-windows-static/include/boost/spirit/home/qi/numeric/bool.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/bool_policies.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/detail/
+x64-windows-static/include/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/detail/real_impl.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/int.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/numeric_utils.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/real.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/real_policies.hpp
+x64-windows-static/include/boost/spirit/home/qi/numeric/uint.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/
+x64-windows-static/include/boost/spirit/home/qi/operator/alternative.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/and_predicate.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/difference.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/expect.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/kleene.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/list.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/not_predicate.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/optional.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/permutation.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/plus.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/sequence.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/sequence_base.hpp
+x64-windows-static/include/boost/spirit/home/qi/operator/sequential_or.hpp
+x64-windows-static/include/boost/spirit/home/qi/parse.hpp
+x64-windows-static/include/boost/spirit/home/qi/parse_attr.hpp
+x64-windows-static/include/boost/spirit/home/qi/parser.hpp
+x64-windows-static/include/boost/spirit/home/qi/reference.hpp
+x64-windows-static/include/boost/spirit/home/qi/skip_flag.hpp
+x64-windows-static/include/boost/spirit/home/qi/skip_over.hpp
+x64-windows-static/include/boost/spirit/home/qi/stream.hpp
+x64-windows-static/include/boost/spirit/home/qi/stream/
+x64-windows-static/include/boost/spirit/home/qi/stream/detail/
+x64-windows-static/include/boost/spirit/home/qi/stream/detail/iterator_source.hpp
+x64-windows-static/include/boost/spirit/home/qi/stream/detail/match_manip.hpp
+x64-windows-static/include/boost/spirit/home/qi/stream/detail/match_manip_auto.hpp
+x64-windows-static/include/boost/spirit/home/qi/stream/match_manip.hpp
+x64-windows-static/include/boost/spirit/home/qi/stream/match_manip_attr.hpp
+x64-windows-static/include/boost/spirit/home/qi/stream/stream.hpp
+x64-windows-static/include/boost/spirit/home/qi/string.hpp
+x64-windows-static/include/boost/spirit/home/qi/string/
+x64-windows-static/include/boost/spirit/home/qi/string/detail/
+x64-windows-static/include/boost/spirit/home/qi/string/detail/tst.hpp
+x64-windows-static/include/boost/spirit/home/qi/string/lit.hpp
+x64-windows-static/include/boost/spirit/home/qi/string/symbols.hpp
+x64-windows-static/include/boost/spirit/home/qi/string/tst.hpp
+x64-windows-static/include/boost/spirit/home/qi/string/tst_map.hpp
+x64-windows-static/include/boost/spirit/home/qi/what.hpp
+x64-windows-static/include/boost/spirit/home/support.hpp
+x64-windows-static/include/boost/spirit/home/support/
+x64-windows-static/include/boost/spirit/home/support/action_dispatch.hpp
+x64-windows-static/include/boost/spirit/home/support/adapt_adt_attributes.hpp
+x64-windows-static/include/boost/spirit/home/support/algorithm/
+x64-windows-static/include/boost/spirit/home/support/algorithm/any.hpp
+x64-windows-static/include/boost/spirit/home/support/algorithm/any_if.hpp
+x64-windows-static/include/boost/spirit/home/support/algorithm/any_if_ns.hpp
+x64-windows-static/include/boost/spirit/home/support/algorithm/any_if_ns_so.hpp
+x64-windows-static/include/boost/spirit/home/support/algorithm/any_ns.hpp
+x64-windows-static/include/boost/spirit/home/support/algorithm/any_ns_so.hpp
+x64-windows-static/include/boost/spirit/home/support/argument.hpp
+x64-windows-static/include/boost/spirit/home/support/argument_expression.hpp
+x64-windows-static/include/boost/spirit/home/support/assert_msg.hpp
+x64-windows-static/include/boost/spirit/home/support/attributes.hpp
+x64-windows-static/include/boost/spirit/home/support/attributes_fwd.hpp
+x64-windows-static/include/boost/spirit/home/support/auto.hpp
+x64-windows-static/include/boost/spirit/home/support/auto/
+x64-windows-static/include/boost/spirit/home/support/auto/meta_create.hpp
+x64-windows-static/include/boost/spirit/home/support/auxiliary/
+x64-windows-static/include/boost/spirit/home/support/auxiliary/attr_cast.hpp
+x64-windows-static/include/boost/spirit/home/support/char_class.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/
+x64-windows-static/include/boost/spirit/home/support/char_encoding/ascii.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/iso8859_1.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/standard.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/standard_wide.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/DerivedCoreProperties.txt
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/PropList.txt
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/Scripts.txt
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/UnicodeData.txt
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/category_table.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/lowercase_table.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/query.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/script_table.hpp
+x64-windows-static/include/boost/spirit/home/support/char_encoding/unicode/uppercase_table.hpp
+x64-windows-static/include/boost/spirit/home/support/char_set/
+x64-windows-static/include/boost/spirit/home/support/char_set/basic_chset.hpp
+x64-windows-static/include/boost/spirit/home/support/char_set/range.hpp
+x64-windows-static/include/boost/spirit/home/support/char_set/range_functions.hpp
+x64-windows-static/include/boost/spirit/home/support/char_set/range_run.hpp
+x64-windows-static/include/boost/spirit/home/support/char_set/range_run_impl.hpp
+x64-windows-static/include/boost/spirit/home/support/common_terminals.hpp
+x64-windows-static/include/boost/spirit/home/support/container.hpp
+x64-windows-static/include/boost/spirit/home/support/context.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/
+x64-windows-static/include/boost/spirit/home/support/detail/as_variant.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/endian.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/endian/
+x64-windows-static/include/boost/spirit/home/support/detail/endian/cover_operators.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/endian/endian.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/get_encoding.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/hold_any.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/is_spirit_tag.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/char_traits.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/consts.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/containers/
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/containers/ptr_list.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/conversion/
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/conversion/char_state_machine.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/debug.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/file_input.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/generate_cpp.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/generate_re2c.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/generator.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/input.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/internals.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/parser.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_helper.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_state.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tree/
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tree/end_node.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tree/iteration_node.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tree/leaf_node.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tree/selection_node.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/parser/tree/sequence_node.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/partition/
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/partition/charset.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/partition/equivset.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/rules.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/runtime_error.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/serialise.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/size_t.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/state_machine.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/lexer/string_token.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/make_cons.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/make_vector.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/math/
+x64-windows-static/include/boost/spirit/home/support/detail/math/detail/
+x64-windows-static/include/boost/spirit/home/support/detail/math/detail/fp_traits.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/math/fpclassify.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/math/signbit.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/pow10.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/scoped_enum_emulation.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/sign.hpp
+x64-windows-static/include/boost/spirit/home/support/detail/what_function.hpp
+x64-windows-static/include/boost/spirit/home/support/extended_variant.hpp
+x64-windows-static/include/boost/spirit/home/support/handles_container.hpp
+x64-windows-static/include/boost/spirit/home/support/has_semantic_action.hpp
+x64-windows-static/include/boost/spirit/home/support/info.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/buffering_input_iterator_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/combine_policies.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/first_owner_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/fixed_size_queue.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/functor_input_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/istream_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/lex_input_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/multi_pass.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/no_check_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/ref_counted_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/istream_iterator.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/line_pos_iterator.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/look_ahead.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/multi_pass.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/multi_pass_fwd.hpp
+x64-windows-static/include/boost/spirit/home/support/iterators/ostream_iterator.hpp
+x64-windows-static/include/boost/spirit/home/support/lazy.hpp
+x64-windows-static/include/boost/spirit/home/support/limits.hpp
+x64-windows-static/include/boost/spirit/home/support/make_component.hpp
+x64-windows-static/include/boost/spirit/home/support/meta_compiler.hpp
+x64-windows-static/include/boost/spirit/home/support/modify.hpp
+x64-windows-static/include/boost/spirit/home/support/multi_pass.hpp
+x64-windows-static/include/boost/spirit/home/support/multi_pass_wrapper.hpp
+x64-windows-static/include/boost/spirit/home/support/nonterminal/
+x64-windows-static/include/boost/spirit/home/support/nonterminal/expand_arg.hpp
+x64-windows-static/include/boost/spirit/home/support/nonterminal/extract_param.hpp
+x64-windows-static/include/boost/spirit/home/support/nonterminal/locals.hpp
+x64-windows-static/include/boost/spirit/home/support/numeric_traits.hpp
+x64-windows-static/include/boost/spirit/home/support/sequence_base_id.hpp
+x64-windows-static/include/boost/spirit/home/support/string_traits.hpp
+x64-windows-static/include/boost/spirit/home/support/terminal.hpp
+x64-windows-static/include/boost/spirit/home/support/terminal_expression.hpp
+x64-windows-static/include/boost/spirit/home/support/unused.hpp
+x64-windows-static/include/boost/spirit/home/support/utf8.hpp
+x64-windows-static/include/boost/spirit/home/support/utree.hpp
+x64-windows-static/include/boost/spirit/home/support/utree/
+x64-windows-static/include/boost/spirit/home/support/utree/detail/
+x64-windows-static/include/boost/spirit/home/support/utree/detail/utree_detail1.hpp
+x64-windows-static/include/boost/spirit/home/support/utree/detail/utree_detail2.hpp
+x64-windows-static/include/boost/spirit/home/support/utree/operators.hpp
+x64-windows-static/include/boost/spirit/home/support/utree/utree.hpp
+x64-windows-static/include/boost/spirit/home/support/utree/utree_traits.hpp
+x64-windows-static/include/boost/spirit/home/support/utree/utree_traits_fwd.hpp
+x64-windows-static/include/boost/spirit/home/x3.hpp
+x64-windows-static/include/boost/spirit/home/x3/
+x64-windows-static/include/boost/spirit/home/x3/auxiliary.hpp
+x64-windows-static/include/boost/spirit/home/x3/auxiliary/
+x64-windows-static/include/boost/spirit/home/x3/auxiliary/any_parser.hpp
+x64-windows-static/include/boost/spirit/home/x3/auxiliary/attr.hpp
+x64-windows-static/include/boost/spirit/home/x3/auxiliary/eoi.hpp
+x64-windows-static/include/boost/spirit/home/x3/auxiliary/eol.hpp
+x64-windows-static/include/boost/spirit/home/x3/auxiliary/eps.hpp
+x64-windows-static/include/boost/spirit/home/x3/auxiliary/guard.hpp
+x64-windows-static/include/boost/spirit/home/x3/binary.hpp
+x64-windows-static/include/boost/spirit/home/x3/binary/
+x64-windows-static/include/boost/spirit/home/x3/binary/binary.hpp
+x64-windows-static/include/boost/spirit/home/x3/char.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/
+x64-windows-static/include/boost/spirit/home/x3/char/any_char.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/char.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/char_class.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/char_class_tags.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/char_parser.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/char_set.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/detail/
+x64-windows-static/include/boost/spirit/home/x3/char/detail/cast_char.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/literal_char.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/negated_char_parser.hpp
+x64-windows-static/include/boost/spirit/home/x3/char/unicode.hpp
+x64-windows-static/include/boost/spirit/home/x3/core.hpp
+x64-windows-static/include/boost/spirit/home/x3/core/
+x64-windows-static/include/boost/spirit/home/x3/core/action.hpp
+x64-windows-static/include/boost/spirit/home/x3/core/call.hpp
+x64-windows-static/include/boost/spirit/home/x3/core/detail/
+x64-windows-static/include/boost/spirit/home/x3/core/detail/parse_into_container.hpp
+x64-windows-static/include/boost/spirit/home/x3/core/parse.hpp
+x64-windows-static/include/boost/spirit/home/x3/core/parser.hpp
+x64-windows-static/include/boost/spirit/home/x3/core/proxy.hpp
+x64-windows-static/include/boost/spirit/home/x3/core/skip_over.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/
+x64-windows-static/include/boost/spirit/home/x3/directive/confix.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/expect.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/lexeme.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/matches.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/no_case.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/no_skip.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/omit.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/raw.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/repeat.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/seek.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/skip.hpp
+x64-windows-static/include/boost/spirit/home/x3/directive/with.hpp
+x64-windows-static/include/boost/spirit/home/x3/nonterminal.hpp
+x64-windows-static/include/boost/spirit/home/x3/nonterminal/
+x64-windows-static/include/boost/spirit/home/x3/nonterminal/debug_handler_state.hpp
+x64-windows-static/include/boost/spirit/home/x3/nonterminal/detail/
+x64-windows-static/include/boost/spirit/home/x3/nonterminal/detail/rule.hpp
+x64-windows-static/include/boost/spirit/home/x3/nonterminal/detail/transform_attribute.hpp
+x64-windows-static/include/boost/spirit/home/x3/nonterminal/rule.hpp
+x64-windows-static/include/boost/spirit/home/x3/nonterminal/simple_trace.hpp
+x64-windows-static/include/boost/spirit/home/x3/numeric.hpp
+x64-windows-static/include/boost/spirit/home/x3/numeric/
+x64-windows-static/include/boost/spirit/home/x3/numeric/bool.hpp
+x64-windows-static/include/boost/spirit/home/x3/numeric/bool_policies.hpp
+x64-windows-static/include/boost/spirit/home/x3/numeric/int.hpp
+x64-windows-static/include/boost/spirit/home/x3/numeric/real.hpp
+x64-windows-static/include/boost/spirit/home/x3/numeric/real_policies.hpp
+x64-windows-static/include/boost/spirit/home/x3/numeric/uint.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/
+x64-windows-static/include/boost/spirit/home/x3/operator/alternative.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/and_predicate.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/detail/
+x64-windows-static/include/boost/spirit/home/x3/operator/detail/alternative.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/detail/sequence.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/difference.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/kleene.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/list.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/not_predicate.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/optional.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/plus.hpp
+x64-windows-static/include/boost/spirit/home/x3/operator/sequence.hpp
+x64-windows-static/include/boost/spirit/home/x3/string.hpp
+x64-windows-static/include/boost/spirit/home/x3/string/
+x64-windows-static/include/boost/spirit/home/x3/string/detail/
+x64-windows-static/include/boost/spirit/home/x3/string/detail/no_case_string_parse.hpp
+x64-windows-static/include/boost/spirit/home/x3/string/detail/string_parse.hpp
+x64-windows-static/include/boost/spirit/home/x3/string/detail/tst.hpp
+x64-windows-static/include/boost/spirit/home/x3/string/literal_string.hpp
+x64-windows-static/include/boost/spirit/home/x3/string/symbols.hpp
+x64-windows-static/include/boost/spirit/home/x3/string/tst.hpp
+x64-windows-static/include/boost/spirit/home/x3/string/tst_map.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/
+x64-windows-static/include/boost/spirit/home/x3/support/ast/
+x64-windows-static/include/boost/spirit/home/x3/support/ast/position_tagged.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/ast/variant.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/context.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/no_case.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/numeric_utils/
+x64-windows-static/include/boost/spirit/home/x3/support/numeric_utils/detail/
+x64-windows-static/include/boost/spirit/home/x3/support/numeric_utils/detail/extract_int.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/numeric_utils/extract_int.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/numeric_utils/extract_real.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/numeric_utils/pow10.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/numeric_utils/sign.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/subcontext.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/
+x64-windows-static/include/boost/spirit/home/x3/support/traits/attribute_category.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/attribute_of.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/attribute_type.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/container_traits.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/handles_container.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/has_attribute.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/is_parser.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/is_range.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/is_substitute.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/is_variant.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/make_attribute.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/move_to.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/numeric_traits.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/optional_traits.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/print_attribute.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/print_token.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/string_traits.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/transform_attribute.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/tuple_traits.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/value_traits.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/variant_find_substitute.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/traits/variant_has_substitute.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/unused.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/utility/
+x64-windows-static/include/boost/spirit/home/x3/support/utility/annotate_on_success.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/utility/error_reporting.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/utility/is_callable.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/utility/lambda_visitor.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/utility/sfinae.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/utility/testing.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/utility/unrefcv.hpp
+x64-windows-static/include/boost/spirit/home/x3/support/utility/utf8.hpp
+x64-windows-static/include/boost/spirit/home/x3/version.hpp
+x64-windows-static/include/boost/spirit/include/
+x64-windows-static/include/boost/spirit/include/classic.hpp
+x64-windows-static/include/boost/spirit/include/classic_actions.hpp
+x64-windows-static/include/boost/spirit/include/classic_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_alternative.hpp
+x64-windows-static/include/boost/spirit/include/classic_as_parser.hpp
+x64-windows-static/include/boost/spirit/include/classic_assert.hpp
+x64-windows-static/include/boost/spirit/include/classic_assign_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_assign_key_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_ast.hpp
+x64-windows-static/include/boost/spirit/include/classic_ast_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_attribute.hpp
+x64-windows-static/include/boost/spirit/include/classic_basic_chset.hpp
+x64-windows-static/include/boost/spirit/include/classic_chset.hpp
+x64-windows-static/include/boost/spirit/include/classic_chset_operators.hpp
+x64-windows-static/include/boost/spirit/include/classic_clear_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_closure.hpp
+x64-windows-static/include/boost/spirit/include/classic_closure_context.hpp
+x64-windows-static/include/boost/spirit/include/classic_closure_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_common.hpp
+x64-windows-static/include/boost/spirit/include/classic_common_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_composite.hpp
+x64-windows-static/include/boost/spirit/include/classic_config.hpp
+x64-windows-static/include/boost/spirit/include/classic_confix.hpp
+x64-windows-static/include/boost/spirit/include/classic_confix_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_core.hpp
+x64-windows-static/include/boost/spirit/include/classic_debug.hpp
+x64-windows-static/include/boost/spirit/include/classic_debug_node.hpp
+x64-windows-static/include/boost/spirit/include/classic_decrement_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_difference.hpp
+x64-windows-static/include/boost/spirit/include/classic_directives.hpp
+x64-windows-static/include/boost/spirit/include/classic_distinct.hpp
+x64-windows-static/include/boost/spirit/include/classic_distinct_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_dynamic.hpp
+x64-windows-static/include/boost/spirit/include/classic_epsilon.hpp
+x64-windows-static/include/boost/spirit/include/classic_erase_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_error_handling.hpp
+x64-windows-static/include/boost/spirit/include/classic_escape_char.hpp
+x64-windows-static/include/boost/spirit/include/classic_escape_char_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_exceptions.hpp
+x64-windows-static/include/boost/spirit/include/classic_exceptions_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_exclusive_or.hpp
+x64-windows-static/include/boost/spirit/include/classic_file_iterator.hpp
+x64-windows-static/include/boost/spirit/include/classic_file_iterator_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_fixed_size_queue.hpp
+x64-windows-static/include/boost/spirit/include/classic_flush_multi_pass.hpp
+x64-windows-static/include/boost/spirit/include/classic_for.hpp
+x64-windows-static/include/boost/spirit/include/classic_functor_parser.hpp
+x64-windows-static/include/boost/spirit/include/classic_fundamental.hpp
+x64-windows-static/include/boost/spirit/include/classic_grammar.hpp
+x64-windows-static/include/boost/spirit/include/classic_grammar_def.hpp
+x64-windows-static/include/boost/spirit/include/classic_grammar_def_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_if.hpp
+x64-windows-static/include/boost/spirit/include/classic_increment_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_insert_at_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_insert_key_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_intersection.hpp
+x64-windows-static/include/boost/spirit/include/classic_iterator.hpp
+x64-windows-static/include/boost/spirit/include/classic_kleene_star.hpp
+x64-windows-static/include/boost/spirit/include/classic_lazy.hpp
+x64-windows-static/include/boost/spirit/include/classic_list.hpp
+x64-windows-static/include/boost/spirit/include/classic_lists.hpp
+x64-windows-static/include/boost/spirit/include/classic_lists_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_loops.hpp
+x64-windows-static/include/boost/spirit/include/classic_match.hpp
+x64-windows-static/include/boost/spirit/include/classic_meta.hpp
+x64-windows-static/include/boost/spirit/include/classic_minimal.hpp
+x64-windows-static/include/boost/spirit/include/classic_multi_pass.hpp
+x64-windows-static/include/boost/spirit/include/classic_multi_pass_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_nil.hpp
+x64-windows-static/include/boost/spirit/include/classic_no_actions.hpp
+x64-windows-static/include/boost/spirit/include/classic_numerics.hpp
+x64-windows-static/include/boost/spirit/include/classic_numerics_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_operators.hpp
+x64-windows-static/include/boost/spirit/include/classic_optional.hpp
+x64-windows-static/include/boost/spirit/include/classic_parametric.hpp
+x64-windows-static/include/boost/spirit/include/classic_parse_tree.hpp
+x64-windows-static/include/boost/spirit/include/classic_parse_tree_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_parse_tree_utils.hpp
+x64-windows-static/include/boost/spirit/include/classic_parser.hpp
+x64-windows-static/include/boost/spirit/include/classic_parser_context.hpp
+x64-windows-static/include/boost/spirit/include/classic_parser_id.hpp
+x64-windows-static/include/boost/spirit/include/classic_parser_names.hpp
+x64-windows-static/include/boost/spirit/include/classic_parser_traits.hpp
+x64-windows-static/include/boost/spirit/include/classic_position_iterator.hpp
+x64-windows-static/include/boost/spirit/include/classic_position_iterator_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_positive.hpp
+x64-windows-static/include/boost/spirit/include/classic_primitives.hpp
+x64-windows-static/include/boost/spirit/include/classic_push_back_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_push_front_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_range_run.hpp
+x64-windows-static/include/boost/spirit/include/classic_ref_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_ref_const_ref_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_ref_const_ref_const_ref_a.hpp
+x64-windows-static/include/boost/spirit/include/classic_ref_const_ref_value_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_ref_value_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_refactoring.hpp
+x64-windows-static/include/boost/spirit/include/classic_regex.hpp
+x64-windows-static/include/boost/spirit/include/classic_rule.hpp
+x64-windows-static/include/boost/spirit/include/classic_rule_alias.hpp
+x64-windows-static/include/boost/spirit/include/classic_rule_parser.hpp
+x64-windows-static/include/boost/spirit/include/classic_safe_bool.hpp
+x64-windows-static/include/boost/spirit/include/classic_scanner.hpp
+x64-windows-static/include/boost/spirit/include/classic_scanner_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_scoped_lock.hpp
+x64-windows-static/include/boost/spirit/include/classic_select.hpp
+x64-windows-static/include/boost/spirit/include/classic_sequence.hpp
+x64-windows-static/include/boost/spirit/include/classic_sequential_and.hpp
+x64-windows-static/include/boost/spirit/include/classic_sequential_or.hpp
+x64-windows-static/include/boost/spirit/include/classic_skipper.hpp
+x64-windows-static/include/boost/spirit/include/classic_skipper_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_spirit.hpp
+x64-windows-static/include/boost/spirit/include/classic_static.hpp
+x64-windows-static/include/boost/spirit/include/classic_stored_rule.hpp
+x64-windows-static/include/boost/spirit/include/classic_stored_rule_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_subrule.hpp
+x64-windows-static/include/boost/spirit/include/classic_subrule_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_swap_actor.hpp
+x64-windows-static/include/boost/spirit/include/classic_switch.hpp
+x64-windows-static/include/boost/spirit/include/classic_symbols.hpp
+x64-windows-static/include/boost/spirit/include/classic_symbols_fwd.hpp
+x64-windows-static/include/boost/spirit/include/classic_traverse.hpp
+x64-windows-static/include/boost/spirit/include/classic_tree_to_xml.hpp
+x64-windows-static/include/boost/spirit/include/classic_typeof.hpp
+x64-windows-static/include/boost/spirit/include/classic_utility.hpp
+x64-windows-static/include/boost/spirit/include/classic_version.hpp
+x64-windows-static/include/boost/spirit/include/classic_while.hpp
+x64-windows-static/include/boost/spirit/include/karma.hpp
+x64-windows-static/include/boost/spirit/include/karma_action.hpp
+x64-windows-static/include/boost/spirit/include/karma_alternative.hpp
+x64-windows-static/include/boost/spirit/include/karma_and_predicate.hpp
+x64-windows-static/include/boost/spirit/include/karma_as.hpp
+x64-windows-static/include/boost/spirit/include/karma_attr_cast.hpp
+x64-windows-static/include/boost/spirit/include/karma_auto.hpp
+x64-windows-static/include/boost/spirit/include/karma_auxiliary.hpp
+x64-windows-static/include/boost/spirit/include/karma_binary.hpp
+x64-windows-static/include/boost/spirit/include/karma_bool.hpp
+x64-windows-static/include/boost/spirit/include/karma_buffer.hpp
+x64-windows-static/include/boost/spirit/include/karma_center_alignment.hpp
+x64-windows-static/include/boost/spirit/include/karma_char.hpp
+x64-windows-static/include/boost/spirit/include/karma_char_.hpp
+x64-windows-static/include/boost/spirit/include/karma_char_class.hpp
+x64-windows-static/include/boost/spirit/include/karma_columns.hpp
+x64-windows-static/include/boost/spirit/include/karma_delimit.hpp
+x64-windows-static/include/boost/spirit/include/karma_directive.hpp
+x64-windows-static/include/boost/spirit/include/karma_domain.hpp
+x64-windows-static/include/boost/spirit/include/karma_duplicate.hpp
+x64-windows-static/include/boost/spirit/include/karma_eol.hpp
+x64-windows-static/include/boost/spirit/include/karma_eps.hpp
+x64-windows-static/include/boost/spirit/include/karma_format.hpp
+x64-windows-static/include/boost/spirit/include/karma_format_attr.hpp
+x64-windows-static/include/boost/spirit/include/karma_format_auto.hpp
+x64-windows-static/include/boost/spirit/include/karma_generate.hpp
+x64-windows-static/include/boost/spirit/include/karma_generate_attr.hpp
+x64-windows-static/include/boost/spirit/include/karma_generate_auto.hpp
+x64-windows-static/include/boost/spirit/include/karma_grammar.hpp
+x64-windows-static/include/boost/spirit/include/karma_int.hpp
+x64-windows-static/include/boost/spirit/include/karma_kleene.hpp
+x64-windows-static/include/boost/spirit/include/karma_lazy.hpp
+x64-windows-static/include/boost/spirit/include/karma_left_alignment.hpp
+x64-windows-static/include/boost/spirit/include/karma_list.hpp
+x64-windows-static/include/boost/spirit/include/karma_maxwidth.hpp
+x64-windows-static/include/boost/spirit/include/karma_no_delimit.hpp
+x64-windows-static/include/boost/spirit/include/karma_nonterminal.hpp
+x64-windows-static/include/boost/spirit/include/karma_not_predicate.hpp
+x64-windows-static/include/boost/spirit/include/karma_numeric.hpp
+x64-windows-static/include/boost/spirit/include/karma_omit.hpp
+x64-windows-static/include/boost/spirit/include/karma_operator.hpp
+x64-windows-static/include/boost/spirit/include/karma_optional.hpp
+x64-windows-static/include/boost/spirit/include/karma_phoenix_attributes.hpp
+x64-windows-static/include/boost/spirit/include/karma_plus.hpp
+x64-windows-static/include/boost/spirit/include/karma_real.hpp
+x64-windows-static/include/boost/spirit/include/karma_repeat.hpp
+x64-windows-static/include/boost/spirit/include/karma_right_alignment.hpp
+x64-windows-static/include/boost/spirit/include/karma_rule.hpp
+x64-windows-static/include/boost/spirit/include/karma_sequence.hpp
+x64-windows-static/include/boost/spirit/include/karma_stream.hpp
+x64-windows-static/include/boost/spirit/include/karma_strict_relaxed.hpp
+x64-windows-static/include/boost/spirit/include/karma_string.hpp
+x64-windows-static/include/boost/spirit/include/karma_symbols.hpp
+x64-windows-static/include/boost/spirit/include/karma_uint.hpp
+x64-windows-static/include/boost/spirit/include/karma_upper_lower_case.hpp
+x64-windows-static/include/boost/spirit/include/karma_verbatim.hpp
+x64-windows-static/include/boost/spirit/include/karma_what.hpp
+x64-windows-static/include/boost/spirit/include/lex.hpp
+x64-windows-static/include/boost/spirit/include/lex_char_token_def.hpp
+x64-windows-static/include/boost/spirit/include/lex_domain.hpp
+x64-windows-static/include/boost/spirit/include/lex_generate_static_lexertl.hpp
+x64-windows-static/include/boost/spirit/include/lex_lexer.hpp
+x64-windows-static/include/boost/spirit/include/lex_lexertl.hpp
+x64-windows-static/include/boost/spirit/include/lex_lexertl_position_token.hpp
+x64-windows-static/include/boost/spirit/include/lex_lexertl_token.hpp
+x64-windows-static/include/boost/spirit/include/lex_plain_token.hpp
+x64-windows-static/include/boost/spirit/include/lex_primitives.hpp
+x64-windows-static/include/boost/spirit/include/lex_static_lexertl.hpp
+x64-windows-static/include/boost/spirit/include/lex_tokenize_and_parse.hpp
+x64-windows-static/include/boost/spirit/include/lex_tokenize_and_parse_attr.hpp
+x64-windows-static/include/boost/spirit/include/phoenix.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_actor.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_binders.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_casts.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_closures.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_composite.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_functions.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_new.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_operators.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_primitives.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_special_ops.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_statements.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_tuple_helpers.hpp
+x64-windows-static/include/boost/spirit/include/phoenix1_tuples.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_algorithm.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_bind.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_container.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_core.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_function.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_fusion.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_limits.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_object.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_operator.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_scope.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_statement.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_stl.hpp
+x64-windows-static/include/boost/spirit/include/phoenix_version.hpp
+x64-windows-static/include/boost/spirit/include/qi.hpp
+x64-windows-static/include/boost/spirit/include/qi_action.hpp
+x64-windows-static/include/boost/spirit/include/qi_alternative.hpp
+x64-windows-static/include/boost/spirit/include/qi_and_predicate.hpp
+x64-windows-static/include/boost/spirit/include/qi_as.hpp
+x64-windows-static/include/boost/spirit/include/qi_as_string.hpp
+x64-windows-static/include/boost/spirit/include/qi_attr.hpp
+x64-windows-static/include/boost/spirit/include/qi_attr_cast.hpp
+x64-windows-static/include/boost/spirit/include/qi_auto.hpp
+x64-windows-static/include/boost/spirit/include/qi_auxiliary.hpp
+x64-windows-static/include/boost/spirit/include/qi_binary.hpp
+x64-windows-static/include/boost/spirit/include/qi_bool.hpp
+x64-windows-static/include/boost/spirit/include/qi_char.hpp
+x64-windows-static/include/boost/spirit/include/qi_char_.hpp
+x64-windows-static/include/boost/spirit/include/qi_char_class.hpp
+x64-windows-static/include/boost/spirit/include/qi_copy.hpp
+x64-windows-static/include/boost/spirit/include/qi_core.hpp
+x64-windows-static/include/boost/spirit/include/qi_difference.hpp
+x64-windows-static/include/boost/spirit/include/qi_directive.hpp
+x64-windows-static/include/boost/spirit/include/qi_domain.hpp
+x64-windows-static/include/boost/spirit/include/qi_eoi.hpp
+x64-windows-static/include/boost/spirit/include/qi_eol.hpp
+x64-windows-static/include/boost/spirit/include/qi_eps.hpp
+x64-windows-static/include/boost/spirit/include/qi_expect.hpp
+x64-windows-static/include/boost/spirit/include/qi_grammar.hpp
+x64-windows-static/include/boost/spirit/include/qi_hold.hpp
+x64-windows-static/include/boost/spirit/include/qi_int.hpp
+x64-windows-static/include/boost/spirit/include/qi_kleene.hpp
+x64-windows-static/include/boost/spirit/include/qi_lazy.hpp
+x64-windows-static/include/boost/spirit/include/qi_lexeme.hpp
+x64-windows-static/include/boost/spirit/include/qi_list.hpp
+x64-windows-static/include/boost/spirit/include/qi_lit.hpp
+x64-windows-static/include/boost/spirit/include/qi_match.hpp
+x64-windows-static/include/boost/spirit/include/qi_match_attr.hpp
+x64-windows-static/include/boost/spirit/include/qi_match_auto.hpp
+x64-windows-static/include/boost/spirit/include/qi_matches.hpp
+x64-windows-static/include/boost/spirit/include/qi_no_case.hpp
+x64-windows-static/include/boost/spirit/include/qi_no_skip.hpp
+x64-windows-static/include/boost/spirit/include/qi_nonterminal.hpp
+x64-windows-static/include/boost/spirit/include/qi_not_predicate.hpp
+x64-windows-static/include/boost/spirit/include/qi_numeric.hpp
+x64-windows-static/include/boost/spirit/include/qi_omit.hpp
+x64-windows-static/include/boost/spirit/include/qi_operator.hpp
+x64-windows-static/include/boost/spirit/include/qi_optional.hpp
+x64-windows-static/include/boost/spirit/include/qi_parse.hpp
+x64-windows-static/include/boost/spirit/include/qi_parse_attr.hpp
+x64-windows-static/include/boost/spirit/include/qi_parse_auto.hpp
+x64-windows-static/include/boost/spirit/include/qi_permutation.hpp
+x64-windows-static/include/boost/spirit/include/qi_plus.hpp
+x64-windows-static/include/boost/spirit/include/qi_raw.hpp
+x64-windows-static/include/boost/spirit/include/qi_real.hpp
+x64-windows-static/include/boost/spirit/include/qi_repeat.hpp
+x64-windows-static/include/boost/spirit/include/qi_rule.hpp
+x64-windows-static/include/boost/spirit/include/qi_sequence.hpp
+x64-windows-static/include/boost/spirit/include/qi_sequential_or.hpp
+x64-windows-static/include/boost/spirit/include/qi_skip.hpp
+x64-windows-static/include/boost/spirit/include/qi_stream.hpp
+x64-windows-static/include/boost/spirit/include/qi_string.hpp
+x64-windows-static/include/boost/spirit/include/qi_symbols.hpp
+x64-windows-static/include/boost/spirit/include/qi_uint.hpp
+x64-windows-static/include/boost/spirit/include/qi_what.hpp
+x64-windows-static/include/boost/spirit/include/support.hpp
+x64-windows-static/include/boost/spirit/include/support_adapt_adt_attributes.hpp
+x64-windows-static/include/boost/spirit/include/support_any.hpp
+x64-windows-static/include/boost/spirit/include/support_any_if.hpp
+x64-windows-static/include/boost/spirit/include/support_any_if_ns.hpp
+x64-windows-static/include/boost/spirit/include/support_any_if_ns_so.hpp
+x64-windows-static/include/boost/spirit/include/support_any_ns.hpp
+x64-windows-static/include/boost/spirit/include/support_any_ns_so.hpp
+x64-windows-static/include/boost/spirit/include/support_argument.hpp
+x64-windows-static/include/boost/spirit/include/support_ascii.hpp
+x64-windows-static/include/boost/spirit/include/support_attributes.hpp
+x64-windows-static/include/boost/spirit/include/support_attributes_fwd.hpp
+x64-windows-static/include/boost/spirit/include/support_auto.hpp
+x64-windows-static/include/boost/spirit/include/support_char_class.hpp
+x64-windows-static/include/boost/spirit/include/support_container.hpp
+x64-windows-static/include/boost/spirit/include/support_extended_variant.hpp
+x64-windows-static/include/boost/spirit/include/support_info.hpp
+x64-windows-static/include/boost/spirit/include/support_iso8859_1.hpp
+x64-windows-static/include/boost/spirit/include/support_istream_iterator.hpp
+x64-windows-static/include/boost/spirit/include/support_line_pos_iterator.hpp
+x64-windows-static/include/boost/spirit/include/support_locals.hpp
+x64-windows-static/include/boost/spirit/include/support_look_ahead.hpp
+x64-windows-static/include/boost/spirit/include/support_modify.hpp
+x64-windows-static/include/boost/spirit/include/support_multi_pass.hpp
+x64-windows-static/include/boost/spirit/include/support_multi_pass_fwd.hpp
+x64-windows-static/include/boost/spirit/include/support_ostream_iterator.hpp
+x64-windows-static/include/boost/spirit/include/support_standard.hpp
+x64-windows-static/include/boost/spirit/include/support_standard_wide.hpp
+x64-windows-static/include/boost/spirit/include/support_string_traits.hpp
+x64-windows-static/include/boost/spirit/include/support_unused.hpp
+x64-windows-static/include/boost/spirit/include/support_utree.hpp
+x64-windows-static/include/boost/spirit/include/version.hpp
+x64-windows-static/include/boost/spirit/repository/
+x64-windows-static/include/boost/spirit/repository/home/
+x64-windows-static/include/boost/spirit/repository/home/karma.hpp
+x64-windows-static/include/boost/spirit/repository/home/karma/
+x64-windows-static/include/boost/spirit/repository/home/karma/directive.hpp
+x64-windows-static/include/boost/spirit/repository/home/karma/directive/
+x64-windows-static/include/boost/spirit/repository/home/karma/directive/confix.hpp
+x64-windows-static/include/boost/spirit/repository/home/karma/nonterminal.hpp
+x64-windows-static/include/boost/spirit/repository/home/karma/nonterminal/
+x64-windows-static/include/boost/spirit/repository/home/karma/nonterminal/subrule.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/
+x64-windows-static/include/boost/spirit/repository/home/qi/directive.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/directive/
+x64-windows-static/include/boost/spirit/repository/home/qi/directive/confix.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/directive/distinct.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/directive/kwd.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/directive/seek.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/nonterminal.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/nonterminal/
+x64-windows-static/include/boost/spirit/repository/home/qi/nonterminal/subrule.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/operator.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/operator/
+x64-windows-static/include/boost/spirit/repository/home/qi/operator/detail/
+x64-windows-static/include/boost/spirit/repository/home/qi/operator/detail/keywords.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/operator/keywords.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/primitive.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/primitive/
+x64-windows-static/include/boost/spirit/repository/home/qi/primitive/advance.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/primitive/flush_multi_pass.hpp
+x64-windows-static/include/boost/spirit/repository/home/qi/primitive/iter_pos.hpp
+x64-windows-static/include/boost/spirit/repository/home/support/
+x64-windows-static/include/boost/spirit/repository/home/support/confix.hpp
+x64-windows-static/include/boost/spirit/repository/home/support/distinct.hpp
+x64-windows-static/include/boost/spirit/repository/home/support/flush_multi_pass.hpp
+x64-windows-static/include/boost/spirit/repository/home/support/kwd.hpp
+x64-windows-static/include/boost/spirit/repository/home/support/seek.hpp
+x64-windows-static/include/boost/spirit/repository/home/support/subrule_context.hpp
+x64-windows-static/include/boost/spirit/repository/include/
+x64-windows-static/include/boost/spirit/repository/include/karma.hpp
+x64-windows-static/include/boost/spirit/repository/include/karma_confix.hpp
+x64-windows-static/include/boost/spirit/repository/include/karma_directive.hpp
+x64-windows-static/include/boost/spirit/repository/include/karma_nonterminal.hpp
+x64-windows-static/include/boost/spirit/repository/include/karma_subrule.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_advance.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_confix.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_directive.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_distinct.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_flush_multi_pass.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_iter_pos.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_keywords.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_kwd.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_nonterminal.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_primitive.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_seek.hpp
+x64-windows-static/include/boost/spirit/repository/include/qi_subrule.hpp
+x64-windows-static/include/boost/spirit/version.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-spirit/
+x64-windows-static/share/boost-spirit/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/static_assert.hpp
+x64-windows/share/
+x64-windows/share/boost-static-assert/
+x64-windows/share/boost-static-assert/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/static_assert.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-static-assert/
+x64-windows-static/share/boost-static-assert/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,29 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_system-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_system-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_system-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_system-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_system-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/cerrno.hpp
+x64-windows/include/boost/system/
+x64-windows/include/boost/system/api_config.hpp
+x64-windows/include/boost/system/config.hpp
+x64-windows/include/boost/system/cygwin_error.hpp
+x64-windows/include/boost/system/detail/
+x64-windows/include/boost/system/detail/error_code.ipp
+x64-windows/include/boost/system/detail/local_free_on_destruction.hpp
+x64-windows/include/boost/system/error_code.hpp
+x64-windows/include/boost/system/linux_error.hpp
+x64-windows/include/boost/system/system_error.hpp
+x64-windows/include/boost/system/windows_error.hpp
+x64-windows/lib/
+x64-windows/lib/boost_system-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-system/
+x64-windows/share/boost-system/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-system_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_system-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/cerrno.hpp
+x64-windows-static/include/boost/system/
+x64-windows-static/include/boost/system/api_config.hpp
+x64-windows-static/include/boost/system/config.hpp
+x64-windows-static/include/boost/system/cygwin_error.hpp
+x64-windows-static/include/boost/system/detail/
+x64-windows-static/include/boost/system/detail/error_code.ipp
+x64-windows-static/include/boost/system/detail/local_free_on_destruction.hpp
+x64-windows-static/include/boost/system/error_code.hpp
+x64-windows-static/include/boost/system/linux_error.hpp
+x64-windows-static/include/boost/system/system_error.hpp
+x64-windows-static/include/boost/system/windows_error.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_system-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-system/
+x64-windows-static/share/boost-system/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,195 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_prg_exec_monitor-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_prg_exec_monitor-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_unit_test_framework-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_unit_test_framework-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_prg_exec_monitor-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_prg_exec_monitor-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_unit_test_framework-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_unit_test_framework-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_unit_test_framework-vc140-mt-gd.lib
+x64-windows/debug/lib/manual-link/
+x64-windows/debug/lib/manual-link/boost_prg_exec_monitor-vc140-mt-gd.lib
+x64-windows/debug/lib/manual-link/boost_test_exec_monitor-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/test/
+x64-windows/include/boost/test/auto_unit_test.hpp
+x64-windows/include/boost/test/data/
+x64-windows/include/boost/test/data/config.hpp
+x64-windows/include/boost/test/data/dataset.hpp
+x64-windows/include/boost/test/data/for_each_sample.hpp
+x64-windows/include/boost/test/data/generators.hpp
+x64-windows/include/boost/test/data/index_sequence.hpp
+x64-windows/include/boost/test/data/monomorphic.hpp
+x64-windows/include/boost/test/data/monomorphic/
+x64-windows/include/boost/test/data/monomorphic/array.hpp
+x64-windows/include/boost/test/data/monomorphic/collection.hpp
+x64-windows/include/boost/test/data/monomorphic/fwd.hpp
+x64-windows/include/boost/test/data/monomorphic/generate.hpp
+x64-windows/include/boost/test/data/monomorphic/generators.hpp
+x64-windows/include/boost/test/data/monomorphic/generators/
+x64-windows/include/boost/test/data/monomorphic/generators/keywords.hpp
+x64-windows/include/boost/test/data/monomorphic/generators/random.hpp
+x64-windows/include/boost/test/data/monomorphic/generators/xrange.hpp
+x64-windows/include/boost/test/data/monomorphic/grid.hpp
+x64-windows/include/boost/test/data/monomorphic/initializer_list.hpp
+x64-windows/include/boost/test/data/monomorphic/join.hpp
+x64-windows/include/boost/test/data/monomorphic/sample_merge.hpp
+x64-windows/include/boost/test/data/monomorphic/singleton.hpp
+x64-windows/include/boost/test/data/monomorphic/zip.hpp
+x64-windows/include/boost/test/data/size.hpp
+x64-windows/include/boost/test/data/test_case.hpp
+x64-windows/include/boost/test/debug.hpp
+x64-windows/include/boost/test/debug_config.hpp
+x64-windows/include/boost/test/detail/
+x64-windows/include/boost/test/detail/config.hpp
+x64-windows/include/boost/test/detail/enable_warnings.hpp
+x64-windows/include/boost/test/detail/fwd_decl.hpp
+x64-windows/include/boost/test/detail/global_typedef.hpp
+x64-windows/include/boost/test/detail/log_level.hpp
+x64-windows/include/boost/test/detail/pp_variadic.hpp
+x64-windows/include/boost/test/detail/suppress_warnings.hpp
+x64-windows/include/boost/test/detail/throw_exception.hpp
+x64-windows/include/boost/test/detail/workaround.hpp
+x64-windows/include/boost/test/execution_monitor.hpp
+x64-windows/include/boost/test/floating_point_comparison.hpp
+x64-windows/include/boost/test/framework.hpp
+x64-windows/include/boost/test/impl/
+x64-windows/include/boost/test/impl/compiler_log_formatter.ipp
+x64-windows/include/boost/test/impl/cpp_main.ipp
+x64-windows/include/boost/test/impl/debug.ipp
+x64-windows/include/boost/test/impl/decorator.ipp
+x64-windows/include/boost/test/impl/execution_monitor.ipp
+x64-windows/include/boost/test/impl/framework.ipp
+x64-windows/include/boost/test/impl/junit_log_formatter.ipp
+x64-windows/include/boost/test/impl/plain_report_formatter.ipp
+x64-windows/include/boost/test/impl/progress_monitor.ipp
+x64-windows/include/boost/test/impl/results_collector.ipp
+x64-windows/include/boost/test/impl/results_reporter.ipp
+x64-windows/include/boost/test/impl/test_framework_init_observer.ipp
+x64-windows/include/boost/test/impl/test_main.ipp
+x64-windows/include/boost/test/impl/test_tools.ipp
+x64-windows/include/boost/test/impl/test_tree.ipp
+x64-windows/include/boost/test/impl/unit_test_log.ipp
+x64-windows/include/boost/test/impl/unit_test_main.ipp
+x64-windows/include/boost/test/impl/unit_test_monitor.ipp
+x64-windows/include/boost/test/impl/unit_test_parameters.ipp
+x64-windows/include/boost/test/impl/xml_log_formatter.ipp
+x64-windows/include/boost/test/impl/xml_report_formatter.ipp
+x64-windows/include/boost/test/included/
+x64-windows/include/boost/test/included/execution_monitor.hpp
+x64-windows/include/boost/test/included/prg_exec_monitor.hpp
+x64-windows/include/boost/test/included/test_exec_monitor.hpp
+x64-windows/include/boost/test/included/unit_test.hpp
+x64-windows/include/boost/test/included/unit_test_framework.hpp
+x64-windows/include/boost/test/minimal.hpp
+x64-windows/include/boost/test/output/
+x64-windows/include/boost/test/output/compiler_log_formatter.hpp
+x64-windows/include/boost/test/output/junit_log_formatter.hpp
+x64-windows/include/boost/test/output/plain_report_formatter.hpp
+x64-windows/include/boost/test/output/xml_log_formatter.hpp
+x64-windows/include/boost/test/output/xml_report_formatter.hpp
+x64-windows/include/boost/test/output_test_stream.hpp
+x64-windows/include/boost/test/parameterized_test.hpp
+x64-windows/include/boost/test/predicate_result.hpp
+x64-windows/include/boost/test/prg_exec_monitor.hpp
+x64-windows/include/boost/test/progress_monitor.hpp
+x64-windows/include/boost/test/results_collector.hpp
+x64-windows/include/boost/test/results_reporter.hpp
+x64-windows/include/boost/test/test_case_template.hpp
+x64-windows/include/boost/test/test_exec_monitor.hpp
+x64-windows/include/boost/test/test_framework_init_observer.hpp
+x64-windows/include/boost/test/test_tools.hpp
+x64-windows/include/boost/test/tools/
+x64-windows/include/boost/test/tools/assertion.hpp
+x64-windows/include/boost/test/tools/assertion_result.hpp
+x64-windows/include/boost/test/tools/collection_comparison_op.hpp
+x64-windows/include/boost/test/tools/context.hpp
+x64-windows/include/boost/test/tools/cstring_comparison_op.hpp
+x64-windows/include/boost/test/tools/detail/
+x64-windows/include/boost/test/tools/detail/bitwise_manip.hpp
+x64-windows/include/boost/test/tools/detail/expression_holder.hpp
+x64-windows/include/boost/test/tools/detail/fwd.hpp
+x64-windows/include/boost/test/tools/detail/indirections.hpp
+x64-windows/include/boost/test/tools/detail/it_pair.hpp
+x64-windows/include/boost/test/tools/detail/lexicographic_manip.hpp
+x64-windows/include/boost/test/tools/detail/per_element_manip.hpp
+x64-windows/include/boost/test/tools/detail/print_helper.hpp
+x64-windows/include/boost/test/tools/detail/tolerance_manip.hpp
+x64-windows/include/boost/test/tools/floating_point_comparison.hpp
+x64-windows/include/boost/test/tools/fpc_op.hpp
+x64-windows/include/boost/test/tools/fpc_tolerance.hpp
+x64-windows/include/boost/test/tools/interface.hpp
+x64-windows/include/boost/test/tools/old/
+x64-windows/include/boost/test/tools/old/impl.hpp
+x64-windows/include/boost/test/tools/old/interface.hpp
+x64-windows/include/boost/test/tools/output_test_stream.hpp
+x64-windows/include/boost/test/tree/
+x64-windows/include/boost/test/tree/auto_registration.hpp
+x64-windows/include/boost/test/tree/decorator.hpp
+x64-windows/include/boost/test/tree/fixture.hpp
+x64-windows/include/boost/test/tree/global_fixture.hpp
+x64-windows/include/boost/test/tree/observer.hpp
+x64-windows/include/boost/test/tree/test_case_counter.hpp
+x64-windows/include/boost/test/tree/test_case_template.hpp
+x64-windows/include/boost/test/tree/test_unit.hpp
+x64-windows/include/boost/test/tree/traverse.hpp
+x64-windows/include/boost/test/tree/visitor.hpp
+x64-windows/include/boost/test/unit_test.hpp
+x64-windows/include/boost/test/unit_test_log.hpp
+x64-windows/include/boost/test/unit_test_log_formatter.hpp
+x64-windows/include/boost/test/unit_test_monitor.hpp
+x64-windows/include/boost/test/unit_test_parameters.hpp
+x64-windows/include/boost/test/unit_test_suite.hpp
+x64-windows/include/boost/test/utils/
+x64-windows/include/boost/test/utils/algorithm.hpp
+x64-windows/include/boost/test/utils/assign_op.hpp
+x64-windows/include/boost/test/utils/basic_cstring/
+x64-windows/include/boost/test/utils/basic_cstring/basic_cstring.hpp
+x64-windows/include/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp
+x64-windows/include/boost/test/utils/basic_cstring/bcs_char_traits.hpp
+x64-windows/include/boost/test/utils/basic_cstring/compare.hpp
+x64-windows/include/boost/test/utils/basic_cstring/io.hpp
+x64-windows/include/boost/test/utils/class_properties.hpp
+x64-windows/include/boost/test/utils/custom_manip.hpp
+x64-windows/include/boost/test/utils/foreach.hpp
+x64-windows/include/boost/test/utils/is_cstring.hpp
+x64-windows/include/boost/test/utils/is_forward_iterable.hpp
+x64-windows/include/boost/test/utils/iterator/
+x64-windows/include/boost/test/utils/iterator/input_iterator_facade.hpp
+x64-windows/include/boost/test/utils/iterator/token_iterator.hpp
+x64-windows/include/boost/test/utils/lazy_ostream.hpp
+x64-windows/include/boost/test/utils/named_params.hpp
+x64-windows/include/boost/test/utils/nullstream.hpp
+x64-windows/include/boost/test/utils/rtti.hpp
+x64-windows/include/boost/test/utils/runtime/
+x64-windows/include/boost/test/utils/runtime/argument.hpp
+x64-windows/include/boost/test/utils/runtime/argument_factory.hpp
+x64-windows/include/boost/test/utils/runtime/cla/
+x64-windows/include/boost/test/utils/runtime/cla/argv_traverser.hpp
+x64-windows/include/boost/test/utils/runtime/cla/parser.hpp
+x64-windows/include/boost/test/utils/runtime/env/
+x64-windows/include/boost/test/utils/runtime/env/fetch.hpp
+x64-windows/include/boost/test/utils/runtime/errors.hpp
+x64-windows/include/boost/test/utils/runtime/finalize.hpp
+x64-windows/include/boost/test/utils/runtime/fwd.hpp
+x64-windows/include/boost/test/utils/runtime/modifier.hpp
+x64-windows/include/boost/test/utils/runtime/parameter.hpp
+x64-windows/include/boost/test/utils/setcolor.hpp
+x64-windows/include/boost/test/utils/string_cast.hpp
+x64-windows/include/boost/test/utils/trivial_singleton.hpp
+x64-windows/include/boost/test/utils/wrap_stringstream.hpp
+x64-windows/include/boost/test/utils/xml_printer.hpp
+x64-windows/lib/
+x64-windows/lib/boost_unit_test_framework-vc140-mt.lib
+x64-windows/lib/manual-link/
+x64-windows/lib/manual-link/boost_prg_exec_monitor-vc140-mt.lib
+x64-windows/lib/manual-link/boost_test_exec_monitor-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-test/
+x64-windows/share/boost-test/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,185 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_unit_test_framework-vc140-mt-gd.lib
+x64-windows-static/debug/lib/manual-link/
+x64-windows-static/debug/lib/manual-link/boost_prg_exec_monitor-vc140-mt-gd.lib
+x64-windows-static/debug/lib/manual-link/boost_test_exec_monitor-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/test/
+x64-windows-static/include/boost/test/auto_unit_test.hpp
+x64-windows-static/include/boost/test/data/
+x64-windows-static/include/boost/test/data/config.hpp
+x64-windows-static/include/boost/test/data/dataset.hpp
+x64-windows-static/include/boost/test/data/for_each_sample.hpp
+x64-windows-static/include/boost/test/data/generators.hpp
+x64-windows-static/include/boost/test/data/index_sequence.hpp
+x64-windows-static/include/boost/test/data/monomorphic.hpp
+x64-windows-static/include/boost/test/data/monomorphic/
+x64-windows-static/include/boost/test/data/monomorphic/array.hpp
+x64-windows-static/include/boost/test/data/monomorphic/collection.hpp
+x64-windows-static/include/boost/test/data/monomorphic/fwd.hpp
+x64-windows-static/include/boost/test/data/monomorphic/generate.hpp
+x64-windows-static/include/boost/test/data/monomorphic/generators.hpp
+x64-windows-static/include/boost/test/data/monomorphic/generators/
+x64-windows-static/include/boost/test/data/monomorphic/generators/keywords.hpp
+x64-windows-static/include/boost/test/data/monomorphic/generators/random.hpp
+x64-windows-static/include/boost/test/data/monomorphic/generators/xrange.hpp
+x64-windows-static/include/boost/test/data/monomorphic/grid.hpp
+x64-windows-static/include/boost/test/data/monomorphic/initializer_list.hpp
+x64-windows-static/include/boost/test/data/monomorphic/join.hpp
+x64-windows-static/include/boost/test/data/monomorphic/sample_merge.hpp
+x64-windows-static/include/boost/test/data/monomorphic/singleton.hpp
+x64-windows-static/include/boost/test/data/monomorphic/zip.hpp
+x64-windows-static/include/boost/test/data/size.hpp
+x64-windows-static/include/boost/test/data/test_case.hpp
+x64-windows-static/include/boost/test/debug.hpp
+x64-windows-static/include/boost/test/debug_config.hpp
+x64-windows-static/include/boost/test/detail/
+x64-windows-static/include/boost/test/detail/config.hpp
+x64-windows-static/include/boost/test/detail/enable_warnings.hpp
+x64-windows-static/include/boost/test/detail/fwd_decl.hpp
+x64-windows-static/include/boost/test/detail/global_typedef.hpp
+x64-windows-static/include/boost/test/detail/log_level.hpp
+x64-windows-static/include/boost/test/detail/pp_variadic.hpp
+x64-windows-static/include/boost/test/detail/suppress_warnings.hpp
+x64-windows-static/include/boost/test/detail/throw_exception.hpp
+x64-windows-static/include/boost/test/detail/workaround.hpp
+x64-windows-static/include/boost/test/execution_monitor.hpp
+x64-windows-static/include/boost/test/floating_point_comparison.hpp
+x64-windows-static/include/boost/test/framework.hpp
+x64-windows-static/include/boost/test/impl/
+x64-windows-static/include/boost/test/impl/compiler_log_formatter.ipp
+x64-windows-static/include/boost/test/impl/cpp_main.ipp
+x64-windows-static/include/boost/test/impl/debug.ipp
+x64-windows-static/include/boost/test/impl/decorator.ipp
+x64-windows-static/include/boost/test/impl/execution_monitor.ipp
+x64-windows-static/include/boost/test/impl/framework.ipp
+x64-windows-static/include/boost/test/impl/junit_log_formatter.ipp
+x64-windows-static/include/boost/test/impl/plain_report_formatter.ipp
+x64-windows-static/include/boost/test/impl/progress_monitor.ipp
+x64-windows-static/include/boost/test/impl/results_collector.ipp
+x64-windows-static/include/boost/test/impl/results_reporter.ipp
+x64-windows-static/include/boost/test/impl/test_framework_init_observer.ipp
+x64-windows-static/include/boost/test/impl/test_main.ipp
+x64-windows-static/include/boost/test/impl/test_tools.ipp
+x64-windows-static/include/boost/test/impl/test_tree.ipp
+x64-windows-static/include/boost/test/impl/unit_test_log.ipp
+x64-windows-static/include/boost/test/impl/unit_test_main.ipp
+x64-windows-static/include/boost/test/impl/unit_test_monitor.ipp
+x64-windows-static/include/boost/test/impl/unit_test_parameters.ipp
+x64-windows-static/include/boost/test/impl/xml_log_formatter.ipp
+x64-windows-static/include/boost/test/impl/xml_report_formatter.ipp
+x64-windows-static/include/boost/test/included/
+x64-windows-static/include/boost/test/included/execution_monitor.hpp
+x64-windows-static/include/boost/test/included/prg_exec_monitor.hpp
+x64-windows-static/include/boost/test/included/test_exec_monitor.hpp
+x64-windows-static/include/boost/test/included/unit_test.hpp
+x64-windows-static/include/boost/test/included/unit_test_framework.hpp
+x64-windows-static/include/boost/test/minimal.hpp
+x64-windows-static/include/boost/test/output/
+x64-windows-static/include/boost/test/output/compiler_log_formatter.hpp
+x64-windows-static/include/boost/test/output/junit_log_formatter.hpp
+x64-windows-static/include/boost/test/output/plain_report_formatter.hpp
+x64-windows-static/include/boost/test/output/xml_log_formatter.hpp
+x64-windows-static/include/boost/test/output/xml_report_formatter.hpp
+x64-windows-static/include/boost/test/output_test_stream.hpp
+x64-windows-static/include/boost/test/parameterized_test.hpp
+x64-windows-static/include/boost/test/predicate_result.hpp
+x64-windows-static/include/boost/test/prg_exec_monitor.hpp
+x64-windows-static/include/boost/test/progress_monitor.hpp
+x64-windows-static/include/boost/test/results_collector.hpp
+x64-windows-static/include/boost/test/results_reporter.hpp
+x64-windows-static/include/boost/test/test_case_template.hpp
+x64-windows-static/include/boost/test/test_exec_monitor.hpp
+x64-windows-static/include/boost/test/test_framework_init_observer.hpp
+x64-windows-static/include/boost/test/test_tools.hpp
+x64-windows-static/include/boost/test/tools/
+x64-windows-static/include/boost/test/tools/assertion.hpp
+x64-windows-static/include/boost/test/tools/assertion_result.hpp
+x64-windows-static/include/boost/test/tools/collection_comparison_op.hpp
+x64-windows-static/include/boost/test/tools/context.hpp
+x64-windows-static/include/boost/test/tools/cstring_comparison_op.hpp
+x64-windows-static/include/boost/test/tools/detail/
+x64-windows-static/include/boost/test/tools/detail/bitwise_manip.hpp
+x64-windows-static/include/boost/test/tools/detail/expression_holder.hpp
+x64-windows-static/include/boost/test/tools/detail/fwd.hpp
+x64-windows-static/include/boost/test/tools/detail/indirections.hpp
+x64-windows-static/include/boost/test/tools/detail/it_pair.hpp
+x64-windows-static/include/boost/test/tools/detail/lexicographic_manip.hpp
+x64-windows-static/include/boost/test/tools/detail/per_element_manip.hpp
+x64-windows-static/include/boost/test/tools/detail/print_helper.hpp
+x64-windows-static/include/boost/test/tools/detail/tolerance_manip.hpp
+x64-windows-static/include/boost/test/tools/floating_point_comparison.hpp
+x64-windows-static/include/boost/test/tools/fpc_op.hpp
+x64-windows-static/include/boost/test/tools/fpc_tolerance.hpp
+x64-windows-static/include/boost/test/tools/interface.hpp
+x64-windows-static/include/boost/test/tools/old/
+x64-windows-static/include/boost/test/tools/old/impl.hpp
+x64-windows-static/include/boost/test/tools/old/interface.hpp
+x64-windows-static/include/boost/test/tools/output_test_stream.hpp
+x64-windows-static/include/boost/test/tree/
+x64-windows-static/include/boost/test/tree/auto_registration.hpp
+x64-windows-static/include/boost/test/tree/decorator.hpp
+x64-windows-static/include/boost/test/tree/fixture.hpp
+x64-windows-static/include/boost/test/tree/global_fixture.hpp
+x64-windows-static/include/boost/test/tree/observer.hpp
+x64-windows-static/include/boost/test/tree/test_case_counter.hpp
+x64-windows-static/include/boost/test/tree/test_case_template.hpp
+x64-windows-static/include/boost/test/tree/test_unit.hpp
+x64-windows-static/include/boost/test/tree/traverse.hpp
+x64-windows-static/include/boost/test/tree/visitor.hpp
+x64-windows-static/include/boost/test/unit_test.hpp
+x64-windows-static/include/boost/test/unit_test_log.hpp
+x64-windows-static/include/boost/test/unit_test_log_formatter.hpp
+x64-windows-static/include/boost/test/unit_test_monitor.hpp
+x64-windows-static/include/boost/test/unit_test_parameters.hpp
+x64-windows-static/include/boost/test/unit_test_suite.hpp
+x64-windows-static/include/boost/test/utils/
+x64-windows-static/include/boost/test/utils/algorithm.hpp
+x64-windows-static/include/boost/test/utils/assign_op.hpp
+x64-windows-static/include/boost/test/utils/basic_cstring/
+x64-windows-static/include/boost/test/utils/basic_cstring/basic_cstring.hpp
+x64-windows-static/include/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp
+x64-windows-static/include/boost/test/utils/basic_cstring/bcs_char_traits.hpp
+x64-windows-static/include/boost/test/utils/basic_cstring/compare.hpp
+x64-windows-static/include/boost/test/utils/basic_cstring/io.hpp
+x64-windows-static/include/boost/test/utils/class_properties.hpp
+x64-windows-static/include/boost/test/utils/custom_manip.hpp
+x64-windows-static/include/boost/test/utils/foreach.hpp
+x64-windows-static/include/boost/test/utils/is_cstring.hpp
+x64-windows-static/include/boost/test/utils/is_forward_iterable.hpp
+x64-windows-static/include/boost/test/utils/iterator/
+x64-windows-static/include/boost/test/utils/iterator/input_iterator_facade.hpp
+x64-windows-static/include/boost/test/utils/iterator/token_iterator.hpp
+x64-windows-static/include/boost/test/utils/lazy_ostream.hpp
+x64-windows-static/include/boost/test/utils/named_params.hpp
+x64-windows-static/include/boost/test/utils/nullstream.hpp
+x64-windows-static/include/boost/test/utils/rtti.hpp
+x64-windows-static/include/boost/test/utils/runtime/
+x64-windows-static/include/boost/test/utils/runtime/argument.hpp
+x64-windows-static/include/boost/test/utils/runtime/argument_factory.hpp
+x64-windows-static/include/boost/test/utils/runtime/cla/
+x64-windows-static/include/boost/test/utils/runtime/cla/argv_traverser.hpp
+x64-windows-static/include/boost/test/utils/runtime/cla/parser.hpp
+x64-windows-static/include/boost/test/utils/runtime/env/
+x64-windows-static/include/boost/test/utils/runtime/env/fetch.hpp
+x64-windows-static/include/boost/test/utils/runtime/errors.hpp
+x64-windows-static/include/boost/test/utils/runtime/finalize.hpp
+x64-windows-static/include/boost/test/utils/runtime/fwd.hpp
+x64-windows-static/include/boost/test/utils/runtime/modifier.hpp
+x64-windows-static/include/boost/test/utils/runtime/parameter.hpp
+x64-windows-static/include/boost/test/utils/setcolor.hpp
+x64-windows-static/include/boost/test/utils/string_cast.hpp
+x64-windows-static/include/boost/test/utils/trivial_singleton.hpp
+x64-windows-static/include/boost/test/utils/wrap_stringstream.hpp
+x64-windows-static/include/boost/test/utils/xml_printer.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_unit_test_framework-vc140-mt.lib
+x64-windows-static/lib/manual-link/
+x64-windows-static/lib/manual-link/boost_prg_exec_monitor-vc140-mt.lib
+x64-windows-static/lib/manual-link/boost_test_exec_monitor-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-test/
+x64-windows-static/share/boost-test/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,197 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_thread-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_thread-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_thread-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_thread-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_thread-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/thread.hpp
+x64-windows/include/boost/thread/
+x64-windows/include/boost/thread/barrier.hpp
+x64-windows/include/boost/thread/caller_context.hpp
+x64-windows/include/boost/thread/completion_latch.hpp
+x64-windows/include/boost/thread/concurrent_queues/
+x64-windows/include/boost/thread/concurrent_queues/deque_adaptor.hpp
+x64-windows/include/boost/thread/concurrent_queues/deque_base.hpp
+x64-windows/include/boost/thread/concurrent_queues/deque_views.hpp
+x64-windows/include/boost/thread/concurrent_queues/detail/
+x64-windows/include/boost/thread/concurrent_queues/detail/sync_deque_base.hpp
+x64-windows/include/boost/thread/concurrent_queues/detail/sync_queue_base.hpp
+x64-windows/include/boost/thread/concurrent_queues/queue_adaptor.hpp
+x64-windows/include/boost/thread/concurrent_queues/queue_base.hpp
+x64-windows/include/boost/thread/concurrent_queues/queue_op_status.hpp
+x64-windows/include/boost/thread/concurrent_queues/queue_views.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_bounded_queue.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_deque.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_priority_queue.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_queue.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_timed_queue.hpp
+x64-windows/include/boost/thread/condition.hpp
+x64-windows/include/boost/thread/condition_variable.hpp
+x64-windows/include/boost/thread/csbl/
+x64-windows/include/boost/thread/csbl/deque.hpp
+x64-windows/include/boost/thread/csbl/devector.hpp
+x64-windows/include/boost/thread/csbl/functional.hpp
+x64-windows/include/boost/thread/csbl/list.hpp
+x64-windows/include/boost/thread/csbl/memory.hpp
+x64-windows/include/boost/thread/csbl/memory/
+x64-windows/include/boost/thread/csbl/memory/allocator_arg.hpp
+x64-windows/include/boost/thread/csbl/memory/allocator_traits.hpp
+x64-windows/include/boost/thread/csbl/memory/config.hpp
+x64-windows/include/boost/thread/csbl/memory/default_delete.hpp
+x64-windows/include/boost/thread/csbl/memory/pointer_traits.hpp
+x64-windows/include/boost/thread/csbl/memory/scoped_allocator.hpp
+x64-windows/include/boost/thread/csbl/memory/shared_ptr.hpp
+x64-windows/include/boost/thread/csbl/memory/unique_ptr.hpp
+x64-windows/include/boost/thread/csbl/queue.hpp
+x64-windows/include/boost/thread/csbl/tuple.hpp
+x64-windows/include/boost/thread/csbl/vector.hpp
+x64-windows/include/boost/thread/cv_status.hpp
+x64-windows/include/boost/thread/detail/
+x64-windows/include/boost/thread/detail/atomic_redef_macros.hpp
+x64-windows/include/boost/thread/detail/atomic_undef_macros.hpp
+x64-windows/include/boost/thread/detail/config.hpp
+x64-windows/include/boost/thread/detail/counter.hpp
+x64-windows/include/boost/thread/detail/delete.hpp
+x64-windows/include/boost/thread/detail/force_cast.hpp
+x64-windows/include/boost/thread/detail/function_wrapper.hpp
+x64-windows/include/boost/thread/detail/invoke.hpp
+x64-windows/include/boost/thread/detail/invoker.hpp
+x64-windows/include/boost/thread/detail/is_convertible.hpp
+x64-windows/include/boost/thread/detail/lockable_wrapper.hpp
+x64-windows/include/boost/thread/detail/log.hpp
+x64-windows/include/boost/thread/detail/make_tuple_indices.hpp
+x64-windows/include/boost/thread/detail/memory.hpp
+x64-windows/include/boost/thread/detail/move.hpp
+x64-windows/include/boost/thread/detail/nullary_function.hpp
+x64-windows/include/boost/thread/detail/platform.hpp
+x64-windows/include/boost/thread/detail/platform_time.hpp
+x64-windows/include/boost/thread/detail/singleton.hpp
+x64-windows/include/boost/thread/detail/thread.hpp
+x64-windows/include/boost/thread/detail/thread_group.hpp
+x64-windows/include/boost/thread/detail/thread_heap_alloc.hpp
+x64-windows/include/boost/thread/detail/thread_interruption.hpp
+x64-windows/include/boost/thread/detail/tss_hooks.hpp
+x64-windows/include/boost/thread/detail/variadic_footer.hpp
+x64-windows/include/boost/thread/detail/variadic_header.hpp
+x64-windows/include/boost/thread/exceptional_ptr.hpp
+x64-windows/include/boost/thread/exceptions.hpp
+x64-windows/include/boost/thread/executor.hpp
+x64-windows/include/boost/thread/executors/
+x64-windows/include/boost/thread/executors/basic_thread_pool.hpp
+x64-windows/include/boost/thread/executors/detail/
+x64-windows/include/boost/thread/executors/detail/priority_executor_base.hpp
+x64-windows/include/boost/thread/executors/detail/scheduled_executor_base.hpp
+x64-windows/include/boost/thread/executors/executor.hpp
+x64-windows/include/boost/thread/executors/executor_adaptor.hpp
+x64-windows/include/boost/thread/executors/generic_executor_ref.hpp
+x64-windows/include/boost/thread/executors/inline_executor.hpp
+x64-windows/include/boost/thread/executors/loop_executor.hpp
+x64-windows/include/boost/thread/executors/scheduled_thread_pool.hpp
+x64-windows/include/boost/thread/executors/scheduler.hpp
+x64-windows/include/boost/thread/executors/scheduling_adaptor.hpp
+x64-windows/include/boost/thread/executors/serial_executor.hpp
+x64-windows/include/boost/thread/executors/serial_executor_cont.hpp
+x64-windows/include/boost/thread/executors/thread_executor.hpp
+x64-windows/include/boost/thread/executors/work.hpp
+x64-windows/include/boost/thread/experimental/
+x64-windows/include/boost/thread/experimental/config/
+x64-windows/include/boost/thread/experimental/config/inline_namespace.hpp
+x64-windows/include/boost/thread/experimental/exception_list.hpp
+x64-windows/include/boost/thread/experimental/parallel/
+x64-windows/include/boost/thread/experimental/parallel/v1/
+x64-windows/include/boost/thread/experimental/parallel/v1/exception_list.hpp
+x64-windows/include/boost/thread/experimental/parallel/v1/inline_namespace.hpp
+x64-windows/include/boost/thread/experimental/parallel/v2/
+x64-windows/include/boost/thread/experimental/parallel/v2/inline_namespace.hpp
+x64-windows/include/boost/thread/experimental/parallel/v2/task_region.hpp
+x64-windows/include/boost/thread/experimental/task_region.hpp
+x64-windows/include/boost/thread/externally_locked.hpp
+x64-windows/include/boost/thread/externally_locked_stream.hpp
+x64-windows/include/boost/thread/future.hpp
+x64-windows/include/boost/thread/futures/
+x64-windows/include/boost/thread/futures/future_error.hpp
+x64-windows/include/boost/thread/futures/future_error_code.hpp
+x64-windows/include/boost/thread/futures/future_status.hpp
+x64-windows/include/boost/thread/futures/is_future_type.hpp
+x64-windows/include/boost/thread/futures/launch.hpp
+x64-windows/include/boost/thread/futures/wait_for_all.hpp
+x64-windows/include/boost/thread/futures/wait_for_any.hpp
+x64-windows/include/boost/thread/is_locked_by_this_thread.hpp
+x64-windows/include/boost/thread/latch.hpp
+x64-windows/include/boost/thread/lock_algorithms.hpp
+x64-windows/include/boost/thread/lock_concepts.hpp
+x64-windows/include/boost/thread/lock_factories.hpp
+x64-windows/include/boost/thread/lock_guard.hpp
+x64-windows/include/boost/thread/lock_options.hpp
+x64-windows/include/boost/thread/lock_traits.hpp
+x64-windows/include/boost/thread/lock_types.hpp
+x64-windows/include/boost/thread/lockable_adapter.hpp
+x64-windows/include/boost/thread/lockable_concepts.hpp
+x64-windows/include/boost/thread/lockable_traits.hpp
+x64-windows/include/boost/thread/locks.hpp
+x64-windows/include/boost/thread/mutex.hpp
+x64-windows/include/boost/thread/null_mutex.hpp
+x64-windows/include/boost/thread/once.hpp
+x64-windows/include/boost/thread/ostream_buffer.hpp
+x64-windows/include/boost/thread/poly_lockable.hpp
+x64-windows/include/boost/thread/poly_lockable_adapter.hpp
+x64-windows/include/boost/thread/poly_shared_lockable.hpp
+x64-windows/include/boost/thread/poly_shared_lockable_adapter.hpp
+x64-windows/include/boost/thread/pthread/
+x64-windows/include/boost/thread/pthread/condition_variable.hpp
+x64-windows/include/boost/thread/pthread/condition_variable_fwd.hpp
+x64-windows/include/boost/thread/pthread/mutex.hpp
+x64-windows/include/boost/thread/pthread/once.hpp
+x64-windows/include/boost/thread/pthread/once_atomic.hpp
+x64-windows/include/boost/thread/pthread/pthread_helpers.hpp
+x64-windows/include/boost/thread/pthread/pthread_mutex_scoped_lock.hpp
+x64-windows/include/boost/thread/pthread/recursive_mutex.hpp
+x64-windows/include/boost/thread/pthread/shared_mutex.hpp
+x64-windows/include/boost/thread/pthread/thread_data.hpp
+x64-windows/include/boost/thread/pthread/thread_heap_alloc.hpp
+x64-windows/include/boost/thread/recursive_mutex.hpp
+x64-windows/include/boost/thread/reverse_lock.hpp
+x64-windows/include/boost/thread/scoped_thread.hpp
+x64-windows/include/boost/thread/shared_lock_guard.hpp
+x64-windows/include/boost/thread/shared_mutex.hpp
+x64-windows/include/boost/thread/strict_lock.hpp
+x64-windows/include/boost/thread/sync_bounded_queue.hpp
+x64-windows/include/boost/thread/sync_queue.hpp
+x64-windows/include/boost/thread/synchronized_value.hpp
+x64-windows/include/boost/thread/testable_mutex.hpp
+x64-windows/include/boost/thread/thread.hpp
+x64-windows/include/boost/thread/thread_functors.hpp
+x64-windows/include/boost/thread/thread_guard.hpp
+x64-windows/include/boost/thread/thread_only.hpp
+x64-windows/include/boost/thread/thread_pool.hpp
+x64-windows/include/boost/thread/thread_time.hpp
+x64-windows/include/boost/thread/tss.hpp
+x64-windows/include/boost/thread/user_scheduler.hpp
+x64-windows/include/boost/thread/v2/
+x64-windows/include/boost/thread/v2/shared_mutex.hpp
+x64-windows/include/boost/thread/win32/
+x64-windows/include/boost/thread/win32/basic_recursive_mutex.hpp
+x64-windows/include/boost/thread/win32/basic_timed_mutex.hpp
+x64-windows/include/boost/thread/win32/condition_variable.hpp
+x64-windows/include/boost/thread/win32/interlocked_read.hpp
+x64-windows/include/boost/thread/win32/mfc_thread_init.hpp
+x64-windows/include/boost/thread/win32/mutex.hpp
+x64-windows/include/boost/thread/win32/once.hpp
+x64-windows/include/boost/thread/win32/recursive_mutex.hpp
+x64-windows/include/boost/thread/win32/shared_mutex.hpp
+x64-windows/include/boost/thread/win32/thread_data.hpp
+x64-windows/include/boost/thread/win32/thread_heap_alloc.hpp
+x64-windows/include/boost/thread/win32/thread_primitives.hpp
+x64-windows/include/boost/thread/with_lock_guard.hpp
+x64-windows/include/boost/thread/xtime.hpp
+x64-windows/lib/
+x64-windows/lib/boost_thread-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-thread/
+x64-windows/share/boost-thread/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-thread_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,191 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_thread-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/thread.hpp
+x64-windows-static/include/boost/thread/
+x64-windows-static/include/boost/thread/barrier.hpp
+x64-windows-static/include/boost/thread/caller_context.hpp
+x64-windows-static/include/boost/thread/completion_latch.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/
+x64-windows-static/include/boost/thread/concurrent_queues/deque_adaptor.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/deque_base.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/deque_views.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/detail/
+x64-windows-static/include/boost/thread/concurrent_queues/detail/sync_deque_base.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/detail/sync_queue_base.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/queue_adaptor.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/queue_base.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/queue_op_status.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/queue_views.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/sync_bounded_queue.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/sync_deque.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/sync_priority_queue.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/sync_queue.hpp
+x64-windows-static/include/boost/thread/concurrent_queues/sync_timed_queue.hpp
+x64-windows-static/include/boost/thread/condition.hpp
+x64-windows-static/include/boost/thread/condition_variable.hpp
+x64-windows-static/include/boost/thread/csbl/
+x64-windows-static/include/boost/thread/csbl/deque.hpp
+x64-windows-static/include/boost/thread/csbl/devector.hpp
+x64-windows-static/include/boost/thread/csbl/functional.hpp
+x64-windows-static/include/boost/thread/csbl/list.hpp
+x64-windows-static/include/boost/thread/csbl/memory.hpp
+x64-windows-static/include/boost/thread/csbl/memory/
+x64-windows-static/include/boost/thread/csbl/memory/allocator_arg.hpp
+x64-windows-static/include/boost/thread/csbl/memory/allocator_traits.hpp
+x64-windows-static/include/boost/thread/csbl/memory/config.hpp
+x64-windows-static/include/boost/thread/csbl/memory/default_delete.hpp
+x64-windows-static/include/boost/thread/csbl/memory/pointer_traits.hpp
+x64-windows-static/include/boost/thread/csbl/memory/scoped_allocator.hpp
+x64-windows-static/include/boost/thread/csbl/memory/shared_ptr.hpp
+x64-windows-static/include/boost/thread/csbl/memory/unique_ptr.hpp
+x64-windows-static/include/boost/thread/csbl/queue.hpp
+x64-windows-static/include/boost/thread/csbl/tuple.hpp
+x64-windows-static/include/boost/thread/csbl/vector.hpp
+x64-windows-static/include/boost/thread/cv_status.hpp
+x64-windows-static/include/boost/thread/detail/
+x64-windows-static/include/boost/thread/detail/atomic_redef_macros.hpp
+x64-windows-static/include/boost/thread/detail/atomic_undef_macros.hpp
+x64-windows-static/include/boost/thread/detail/config.hpp
+x64-windows-static/include/boost/thread/detail/counter.hpp
+x64-windows-static/include/boost/thread/detail/delete.hpp
+x64-windows-static/include/boost/thread/detail/force_cast.hpp
+x64-windows-static/include/boost/thread/detail/function_wrapper.hpp
+x64-windows-static/include/boost/thread/detail/invoke.hpp
+x64-windows-static/include/boost/thread/detail/invoker.hpp
+x64-windows-static/include/boost/thread/detail/is_convertible.hpp
+x64-windows-static/include/boost/thread/detail/lockable_wrapper.hpp
+x64-windows-static/include/boost/thread/detail/log.hpp
+x64-windows-static/include/boost/thread/detail/make_tuple_indices.hpp
+x64-windows-static/include/boost/thread/detail/memory.hpp
+x64-windows-static/include/boost/thread/detail/move.hpp
+x64-windows-static/include/boost/thread/detail/nullary_function.hpp
+x64-windows-static/include/boost/thread/detail/platform.hpp
+x64-windows-static/include/boost/thread/detail/platform_time.hpp
+x64-windows-static/include/boost/thread/detail/singleton.hpp
+x64-windows-static/include/boost/thread/detail/thread.hpp
+x64-windows-static/include/boost/thread/detail/thread_group.hpp
+x64-windows-static/include/boost/thread/detail/thread_heap_alloc.hpp
+x64-windows-static/include/boost/thread/detail/thread_interruption.hpp
+x64-windows-static/include/boost/thread/detail/tss_hooks.hpp
+x64-windows-static/include/boost/thread/detail/variadic_footer.hpp
+x64-windows-static/include/boost/thread/detail/variadic_header.hpp
+x64-windows-static/include/boost/thread/exceptional_ptr.hpp
+x64-windows-static/include/boost/thread/exceptions.hpp
+x64-windows-static/include/boost/thread/executor.hpp
+x64-windows-static/include/boost/thread/executors/
+x64-windows-static/include/boost/thread/executors/basic_thread_pool.hpp
+x64-windows-static/include/boost/thread/executors/detail/
+x64-windows-static/include/boost/thread/executors/detail/priority_executor_base.hpp
+x64-windows-static/include/boost/thread/executors/detail/scheduled_executor_base.hpp
+x64-windows-static/include/boost/thread/executors/executor.hpp
+x64-windows-static/include/boost/thread/executors/executor_adaptor.hpp
+x64-windows-static/include/boost/thread/executors/generic_executor_ref.hpp
+x64-windows-static/include/boost/thread/executors/inline_executor.hpp
+x64-windows-static/include/boost/thread/executors/loop_executor.hpp
+x64-windows-static/include/boost/thread/executors/scheduled_thread_pool.hpp
+x64-windows-static/include/boost/thread/executors/scheduler.hpp
+x64-windows-static/include/boost/thread/executors/scheduling_adaptor.hpp
+x64-windows-static/include/boost/thread/executors/serial_executor.hpp
+x64-windows-static/include/boost/thread/executors/serial_executor_cont.hpp
+x64-windows-static/include/boost/thread/executors/thread_executor.hpp
+x64-windows-static/include/boost/thread/executors/work.hpp
+x64-windows-static/include/boost/thread/experimental/
+x64-windows-static/include/boost/thread/experimental/config/
+x64-windows-static/include/boost/thread/experimental/config/inline_namespace.hpp
+x64-windows-static/include/boost/thread/experimental/exception_list.hpp
+x64-windows-static/include/boost/thread/experimental/parallel/
+x64-windows-static/include/boost/thread/experimental/parallel/v1/
+x64-windows-static/include/boost/thread/experimental/parallel/v1/exception_list.hpp
+x64-windows-static/include/boost/thread/experimental/parallel/v1/inline_namespace.hpp
+x64-windows-static/include/boost/thread/experimental/parallel/v2/
+x64-windows-static/include/boost/thread/experimental/parallel/v2/inline_namespace.hpp
+x64-windows-static/include/boost/thread/experimental/parallel/v2/task_region.hpp
+x64-windows-static/include/boost/thread/experimental/task_region.hpp
+x64-windows-static/include/boost/thread/externally_locked.hpp
+x64-windows-static/include/boost/thread/externally_locked_stream.hpp
+x64-windows-static/include/boost/thread/future.hpp
+x64-windows-static/include/boost/thread/futures/
+x64-windows-static/include/boost/thread/futures/future_error.hpp
+x64-windows-static/include/boost/thread/futures/future_error_code.hpp
+x64-windows-static/include/boost/thread/futures/future_status.hpp
+x64-windows-static/include/boost/thread/futures/is_future_type.hpp
+x64-windows-static/include/boost/thread/futures/launch.hpp
+x64-windows-static/include/boost/thread/futures/wait_for_all.hpp
+x64-windows-static/include/boost/thread/futures/wait_for_any.hpp
+x64-windows-static/include/boost/thread/is_locked_by_this_thread.hpp
+x64-windows-static/include/boost/thread/latch.hpp
+x64-windows-static/include/boost/thread/lock_algorithms.hpp
+x64-windows-static/include/boost/thread/lock_concepts.hpp
+x64-windows-static/include/boost/thread/lock_factories.hpp
+x64-windows-static/include/boost/thread/lock_guard.hpp
+x64-windows-static/include/boost/thread/lock_options.hpp
+x64-windows-static/include/boost/thread/lock_traits.hpp
+x64-windows-static/include/boost/thread/lock_types.hpp
+x64-windows-static/include/boost/thread/lockable_adapter.hpp
+x64-windows-static/include/boost/thread/lockable_concepts.hpp
+x64-windows-static/include/boost/thread/lockable_traits.hpp
+x64-windows-static/include/boost/thread/locks.hpp
+x64-windows-static/include/boost/thread/mutex.hpp
+x64-windows-static/include/boost/thread/null_mutex.hpp
+x64-windows-static/include/boost/thread/once.hpp
+x64-windows-static/include/boost/thread/ostream_buffer.hpp
+x64-windows-static/include/boost/thread/poly_lockable.hpp
+x64-windows-static/include/boost/thread/poly_lockable_adapter.hpp
+x64-windows-static/include/boost/thread/poly_shared_lockable.hpp
+x64-windows-static/include/boost/thread/poly_shared_lockable_adapter.hpp
+x64-windows-static/include/boost/thread/pthread/
+x64-windows-static/include/boost/thread/pthread/condition_variable.hpp
+x64-windows-static/include/boost/thread/pthread/condition_variable_fwd.hpp
+x64-windows-static/include/boost/thread/pthread/mutex.hpp
+x64-windows-static/include/boost/thread/pthread/once.hpp
+x64-windows-static/include/boost/thread/pthread/once_atomic.hpp
+x64-windows-static/include/boost/thread/pthread/pthread_helpers.hpp
+x64-windows-static/include/boost/thread/pthread/pthread_mutex_scoped_lock.hpp
+x64-windows-static/include/boost/thread/pthread/recursive_mutex.hpp
+x64-windows-static/include/boost/thread/pthread/shared_mutex.hpp
+x64-windows-static/include/boost/thread/pthread/thread_data.hpp
+x64-windows-static/include/boost/thread/pthread/thread_heap_alloc.hpp
+x64-windows-static/include/boost/thread/recursive_mutex.hpp
+x64-windows-static/include/boost/thread/reverse_lock.hpp
+x64-windows-static/include/boost/thread/scoped_thread.hpp
+x64-windows-static/include/boost/thread/shared_lock_guard.hpp
+x64-windows-static/include/boost/thread/shared_mutex.hpp
+x64-windows-static/include/boost/thread/strict_lock.hpp
+x64-windows-static/include/boost/thread/sync_bounded_queue.hpp
+x64-windows-static/include/boost/thread/sync_queue.hpp
+x64-windows-static/include/boost/thread/synchronized_value.hpp
+x64-windows-static/include/boost/thread/testable_mutex.hpp
+x64-windows-static/include/boost/thread/thread.hpp
+x64-windows-static/include/boost/thread/thread_functors.hpp
+x64-windows-static/include/boost/thread/thread_guard.hpp
+x64-windows-static/include/boost/thread/thread_only.hpp
+x64-windows-static/include/boost/thread/thread_pool.hpp
+x64-windows-static/include/boost/thread/thread_time.hpp
+x64-windows-static/include/boost/thread/tss.hpp
+x64-windows-static/include/boost/thread/user_scheduler.hpp
+x64-windows-static/include/boost/thread/v2/
+x64-windows-static/include/boost/thread/v2/shared_mutex.hpp
+x64-windows-static/include/boost/thread/win32/
+x64-windows-static/include/boost/thread/win32/basic_recursive_mutex.hpp
+x64-windows-static/include/boost/thread/win32/basic_timed_mutex.hpp
+x64-windows-static/include/boost/thread/win32/condition_variable.hpp
+x64-windows-static/include/boost/thread/win32/interlocked_read.hpp
+x64-windows-static/include/boost/thread/win32/mfc_thread_init.hpp
+x64-windows-static/include/boost/thread/win32/mutex.hpp
+x64-windows-static/include/boost/thread/win32/once.hpp
+x64-windows-static/include/boost/thread/win32/recursive_mutex.hpp
+x64-windows-static/include/boost/thread/win32/shared_mutex.hpp
+x64-windows-static/include/boost/thread/win32/thread_data.hpp
+x64-windows-static/include/boost/thread/win32/thread_heap_alloc.hpp
+x64-windows-static/include/boost/thread/win32/thread_primitives.hpp
+x64-windows-static/include/boost/thread/with_lock_guard.hpp
+x64-windows-static/include/boost/thread/xtime.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_thread-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-thread/
+x64-windows-static/share/boost-thread/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/exception/
+x64-windows/include/boost/exception/exception.hpp
+x64-windows/include/boost/throw_exception.hpp
+x64-windows/share/
+x64-windows/share/boost-throw-exception/
+x64-windows/share/boost-throw-exception/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/exception/
+x64-windows-static/include/boost/exception/exception.hpp
+x64-windows-static/include/boost/throw_exception.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-throw-exception/
+x64-windows-static/share/boost-throw-exception/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_timer-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_timer-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_timer-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_timer-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_timer-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/progress.hpp
+x64-windows/include/boost/timer.hpp
+x64-windows/include/boost/timer/
+x64-windows/include/boost/timer/config.hpp
+x64-windows/include/boost/timer/timer.hpp
+x64-windows/lib/
+x64-windows/lib/boost_timer-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-timer/
+x64-windows/share/boost-timer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-timer_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/boost_timer-vc140-mt-gd.lib
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/progress.hpp
+x64-windows-static/include/boost/timer.hpp
+x64-windows-static/include/boost/timer/
+x64-windows-static/include/boost/timer/config.hpp
+x64-windows-static/include/boost/timer/timer.hpp
+x64-windows-static/lib/
+x64-windows-static/lib/boost_timer-vc140-mt.lib
+x64-windows-static/share/
+x64-windows-static/share/boost-timer/
+x64-windows-static/share/boost-timer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/token_functions.hpp
+x64-windows/include/boost/token_iterator.hpp
+x64-windows/include/boost/tokenizer.hpp
+x64-windows/share/
+x64-windows/share/boost-tokenizer/
+x64-windows/share/boost-tokenizer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/token_functions.hpp
+x64-windows-static/include/boost/token_iterator.hpp
+x64-windows-static/include/boost/tokenizer.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-tokenizer/
+x64-windows-static/share/boost-tokenizer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/tti/
+x64-windows/include/boost/tti/detail/
+x64-windows/include/boost/tti/detail/dcomp_mem_fun.hpp
+x64-windows/include/boost/tti/detail/ddata.hpp
+x64-windows/include/boost/tti/detail/ddeftype.hpp
+x64-windows/include/boost/tti/detail/dftclass.hpp
+x64-windows/include/boost/tti/detail/dfunction.hpp
+x64-windows/include/boost/tti/detail/dlambda.hpp
+x64-windows/include/boost/tti/detail/dmem_data.hpp
+x64-windows/include/boost/tti/detail/dmem_fun.hpp
+x64-windows/include/boost/tti/detail/dmem_type.hpp
+x64-windows/include/boost/tti/detail/dmetafunc.hpp
+x64-windows/include/boost/tti/detail/dnotype.hpp
+x64-windows/include/boost/tti/detail/dnullptr.hpp
+x64-windows/include/boost/tti/detail/dplaceholder.hpp
+x64-windows/include/boost/tti/detail/dptmf.hpp
+x64-windows/include/boost/tti/detail/dstatic_mem_data.hpp
+x64-windows/include/boost/tti/detail/dstatic_mem_fun.hpp
+x64-windows/include/boost/tti/detail/dtclass.hpp
+x64-windows/include/boost/tti/detail/dtemplate.hpp
+x64-windows/include/boost/tti/detail/dtemplate_params.hpp
+x64-windows/include/boost/tti/detail/dtfunction.hpp
+x64-windows/include/boost/tti/detail/dtype.hpp
+x64-windows/include/boost/tti/detail/dvm_template_params.hpp
+x64-windows/include/boost/tti/gen/
+x64-windows/include/boost/tti/gen/has_data_gen.hpp
+x64-windows/include/boost/tti/gen/has_function_gen.hpp
+x64-windows/include/boost/tti/gen/has_member_data_gen.hpp
+x64-windows/include/boost/tti/gen/has_member_function_gen.hpp
+x64-windows/include/boost/tti/gen/has_static_member_data_gen.hpp
+x64-windows/include/boost/tti/gen/has_static_member_function_gen.hpp
+x64-windows/include/boost/tti/gen/has_template_gen.hpp
+x64-windows/include/boost/tti/gen/has_type_gen.hpp
+x64-windows/include/boost/tti/gen/member_type_gen.hpp
+x64-windows/include/boost/tti/gen/namespace_gen.hpp
+x64-windows/include/boost/tti/has_data.hpp
+x64-windows/include/boost/tti/has_function.hpp
+x64-windows/include/boost/tti/has_member_data.hpp
+x64-windows/include/boost/tti/has_member_function.hpp
+x64-windows/include/boost/tti/has_static_member_data.hpp
+x64-windows/include/boost/tti/has_static_member_function.hpp
+x64-windows/include/boost/tti/has_template.hpp
+x64-windows/include/boost/tti/has_type.hpp
+x64-windows/include/boost/tti/member_type.hpp
+x64-windows/include/boost/tti/tti.hpp
+x64-windows/share/
+x64-windows/share/boost-tti/
+x64-windows/share/boost-tti/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tti_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/tti/
+x64-windows-static/include/boost/tti/detail/
+x64-windows-static/include/boost/tti/detail/dcomp_mem_fun.hpp
+x64-windows-static/include/boost/tti/detail/ddata.hpp
+x64-windows-static/include/boost/tti/detail/ddeftype.hpp
+x64-windows-static/include/boost/tti/detail/dftclass.hpp
+x64-windows-static/include/boost/tti/detail/dfunction.hpp
+x64-windows-static/include/boost/tti/detail/dlambda.hpp
+x64-windows-static/include/boost/tti/detail/dmem_data.hpp
+x64-windows-static/include/boost/tti/detail/dmem_fun.hpp
+x64-windows-static/include/boost/tti/detail/dmem_type.hpp
+x64-windows-static/include/boost/tti/detail/dmetafunc.hpp
+x64-windows-static/include/boost/tti/detail/dnotype.hpp
+x64-windows-static/include/boost/tti/detail/dnullptr.hpp
+x64-windows-static/include/boost/tti/detail/dplaceholder.hpp
+x64-windows-static/include/boost/tti/detail/dptmf.hpp
+x64-windows-static/include/boost/tti/detail/dstatic_mem_data.hpp
+x64-windows-static/include/boost/tti/detail/dstatic_mem_fun.hpp
+x64-windows-static/include/boost/tti/detail/dtclass.hpp
+x64-windows-static/include/boost/tti/detail/dtemplate.hpp
+x64-windows-static/include/boost/tti/detail/dtemplate_params.hpp
+x64-windows-static/include/boost/tti/detail/dtfunction.hpp
+x64-windows-static/include/boost/tti/detail/dtype.hpp
+x64-windows-static/include/boost/tti/detail/dvm_template_params.hpp
+x64-windows-static/include/boost/tti/gen/
+x64-windows-static/include/boost/tti/gen/has_data_gen.hpp
+x64-windows-static/include/boost/tti/gen/has_function_gen.hpp
+x64-windows-static/include/boost/tti/gen/has_member_data_gen.hpp
+x64-windows-static/include/boost/tti/gen/has_member_function_gen.hpp
+x64-windows-static/include/boost/tti/gen/has_static_member_data_gen.hpp
+x64-windows-static/include/boost/tti/gen/has_static_member_function_gen.hpp
+x64-windows-static/include/boost/tti/gen/has_template_gen.hpp
+x64-windows-static/include/boost/tti/gen/has_type_gen.hpp
+x64-windows-static/include/boost/tti/gen/member_type_gen.hpp
+x64-windows-static/include/boost/tti/gen/namespace_gen.hpp
+x64-windows-static/include/boost/tti/has_data.hpp
+x64-windows-static/include/boost/tti/has_function.hpp
+x64-windows-static/include/boost/tti/has_member_data.hpp
+x64-windows-static/include/boost/tti/has_member_function.hpp
+x64-windows-static/include/boost/tti/has_static_member_data.hpp
+x64-windows-static/include/boost/tti/has_static_member_function.hpp
+x64-windows-static/include/boost/tti/has_template.hpp
+x64-windows-static/include/boost/tti/has_type.hpp
+x64-windows-static/include/boost/tti/member_type.hpp
+x64-windows-static/include/boost/tti/tti.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-tti/
+x64-windows-static/share/boost-tti/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,12 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/tuple/
+x64-windows/include/boost/tuple/detail/
+x64-windows/include/boost/tuple/detail/tuple_basic.hpp
+x64-windows/include/boost/tuple/tuple.hpp
+x64-windows/include/boost/tuple/tuple_comparison.hpp
+x64-windows/include/boost/tuple/tuple_io.hpp
+x64-windows/share/
+x64-windows/share/boost-tuple/
+x64-windows/share/boost-tuple/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,12 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/tuple/
+x64-windows-static/include/boost/tuple/detail/
+x64-windows-static/include/boost/tuple/detail/tuple_basic.hpp
+x64-windows-static/include/boost/tuple/tuple.hpp
+x64-windows-static/include/boost/tuple/tuple_comparison.hpp
+x64-windows-static/include/boost/tuple/tuple_io.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-tuple/
+x64-windows-static/share/boost-tuple/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/type_index.hpp
+x64-windows/include/boost/type_index/
+x64-windows/include/boost/type_index/ctti_type_index.hpp
+x64-windows/include/boost/type_index/detail/
+x64-windows/include/boost/type_index/detail/compile_time_type_info.hpp
+x64-windows/include/boost/type_index/detail/ctti_register_class.hpp
+x64-windows/include/boost/type_index/detail/stl_register_class.hpp
+x64-windows/include/boost/type_index/runtime_cast.hpp
+x64-windows/include/boost/type_index/runtime_cast/
+x64-windows/include/boost/type_index/runtime_cast/boost_shared_ptr_cast.hpp
+x64-windows/include/boost/type_index/runtime_cast/detail/
+x64-windows/include/boost/type_index/runtime_cast/detail/runtime_cast_impl.hpp
+x64-windows/include/boost/type_index/runtime_cast/pointer_cast.hpp
+x64-windows/include/boost/type_index/runtime_cast/reference_cast.hpp
+x64-windows/include/boost/type_index/runtime_cast/register_runtime_class.hpp
+x64-windows/include/boost/type_index/runtime_cast/std_shared_ptr_cast.hpp
+x64-windows/include/boost/type_index/stl_type_index.hpp
+x64-windows/include/boost/type_index/type_index_facade.hpp
+x64-windows/share/
+x64-windows/share/boost-type-index/
+x64-windows/share/boost-type-index/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/type_index.hpp
+x64-windows-static/include/boost/type_index/
+x64-windows-static/include/boost/type_index/ctti_type_index.hpp
+x64-windows-static/include/boost/type_index/detail/
+x64-windows-static/include/boost/type_index/detail/compile_time_type_info.hpp
+x64-windows-static/include/boost/type_index/detail/ctti_register_class.hpp
+x64-windows-static/include/boost/type_index/detail/stl_register_class.hpp
+x64-windows-static/include/boost/type_index/runtime_cast.hpp
+x64-windows-static/include/boost/type_index/runtime_cast/
+x64-windows-static/include/boost/type_index/runtime_cast/boost_shared_ptr_cast.hpp
+x64-windows-static/include/boost/type_index/runtime_cast/detail/
+x64-windows-static/include/boost/type_index/runtime_cast/detail/runtime_cast_impl.hpp
+x64-windows-static/include/boost/type_index/runtime_cast/pointer_cast.hpp
+x64-windows-static/include/boost/type_index/runtime_cast/reference_cast.hpp
+x64-windows-static/include/boost/type_index/runtime_cast/register_runtime_class.hpp
+x64-windows-static/include/boost/type_index/runtime_cast/std_shared_ptr_cast.hpp
+x64-windows-static/include/boost/type_index/stl_type_index.hpp
+x64-windows-static/include/boost/type_index/type_index_facade.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-type-index/
+x64-windows-static/share/boost-type-index/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,60 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/typeof/
+x64-windows/include/boost/typeof/decltype.hpp
+x64-windows/include/boost/typeof/dmc/
+x64-windows/include/boost/typeof/dmc/typeof_impl.hpp
+x64-windows/include/boost/typeof/encode_decode.hpp
+x64-windows/include/boost/typeof/encode_decode_params.hpp
+x64-windows/include/boost/typeof/incr_registration_group.hpp
+x64-windows/include/boost/typeof/int_encoding.hpp
+x64-windows/include/boost/typeof/integral_template_param.hpp
+x64-windows/include/boost/typeof/message.hpp
+x64-windows/include/boost/typeof/modifiers.hpp
+x64-windows/include/boost/typeof/msvc/
+x64-windows/include/boost/typeof/msvc/typeof_impl.hpp
+x64-windows/include/boost/typeof/native.hpp
+x64-windows/include/boost/typeof/pointers_data_members.hpp
+x64-windows/include/boost/typeof/register_functions.hpp
+x64-windows/include/boost/typeof/register_functions_iterate.hpp
+x64-windows/include/boost/typeof/register_fundamental.hpp
+x64-windows/include/boost/typeof/register_mem_functions.hpp
+x64-windows/include/boost/typeof/std/
+x64-windows/include/boost/typeof/std/bitset.hpp
+x64-windows/include/boost/typeof/std/complex.hpp
+x64-windows/include/boost/typeof/std/deque.hpp
+x64-windows/include/boost/typeof/std/fstream.hpp
+x64-windows/include/boost/typeof/std/functional.hpp
+x64-windows/include/boost/typeof/std/iostream.hpp
+x64-windows/include/boost/typeof/std/istream.hpp
+x64-windows/include/boost/typeof/std/iterator.hpp
+x64-windows/include/boost/typeof/std/list.hpp
+x64-windows/include/boost/typeof/std/locale.hpp
+x64-windows/include/boost/typeof/std/map.hpp
+x64-windows/include/boost/typeof/std/memory.hpp
+x64-windows/include/boost/typeof/std/ostream.hpp
+x64-windows/include/boost/typeof/std/queue.hpp
+x64-windows/include/boost/typeof/std/set.hpp
+x64-windows/include/boost/typeof/std/sstream.hpp
+x64-windows/include/boost/typeof/std/stack.hpp
+x64-windows/include/boost/typeof/std/streambuf.hpp
+x64-windows/include/boost/typeof/std/string.hpp
+x64-windows/include/boost/typeof/std/utility.hpp
+x64-windows/include/boost/typeof/std/valarray.hpp
+x64-windows/include/boost/typeof/std/vector.hpp
+x64-windows/include/boost/typeof/template_encoding.hpp
+x64-windows/include/boost/typeof/template_template_param.hpp
+x64-windows/include/boost/typeof/type_encoding.hpp
+x64-windows/include/boost/typeof/type_template_param.hpp
+x64-windows/include/boost/typeof/typeof.hpp
+x64-windows/include/boost/typeof/typeof_impl.hpp
+x64-windows/include/boost/typeof/unsupported.hpp
+x64-windows/include/boost/typeof/vector.hpp
+x64-windows/include/boost/typeof/vector100.hpp
+x64-windows/include/boost/typeof/vector150.hpp
+x64-windows/include/boost/typeof/vector200.hpp
+x64-windows/include/boost/typeof/vector50.hpp
+x64-windows/share/
+x64-windows/share/boost-typeof/
+x64-windows/share/boost-typeof/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,60 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/typeof/
+x64-windows-static/include/boost/typeof/decltype.hpp
+x64-windows-static/include/boost/typeof/dmc/
+x64-windows-static/include/boost/typeof/dmc/typeof_impl.hpp
+x64-windows-static/include/boost/typeof/encode_decode.hpp
+x64-windows-static/include/boost/typeof/encode_decode_params.hpp
+x64-windows-static/include/boost/typeof/incr_registration_group.hpp
+x64-windows-static/include/boost/typeof/int_encoding.hpp
+x64-windows-static/include/boost/typeof/integral_template_param.hpp
+x64-windows-static/include/boost/typeof/message.hpp
+x64-windows-static/include/boost/typeof/modifiers.hpp
+x64-windows-static/include/boost/typeof/msvc/
+x64-windows-static/include/boost/typeof/msvc/typeof_impl.hpp
+x64-windows-static/include/boost/typeof/native.hpp
+x64-windows-static/include/boost/typeof/pointers_data_members.hpp
+x64-windows-static/include/boost/typeof/register_functions.hpp
+x64-windows-static/include/boost/typeof/register_functions_iterate.hpp
+x64-windows-static/include/boost/typeof/register_fundamental.hpp
+x64-windows-static/include/boost/typeof/register_mem_functions.hpp
+x64-windows-static/include/boost/typeof/std/
+x64-windows-static/include/boost/typeof/std/bitset.hpp
+x64-windows-static/include/boost/typeof/std/complex.hpp
+x64-windows-static/include/boost/typeof/std/deque.hpp
+x64-windows-static/include/boost/typeof/std/fstream.hpp
+x64-windows-static/include/boost/typeof/std/functional.hpp
+x64-windows-static/include/boost/typeof/std/iostream.hpp
+x64-windows-static/include/boost/typeof/std/istream.hpp
+x64-windows-static/include/boost/typeof/std/iterator.hpp
+x64-windows-static/include/boost/typeof/std/list.hpp
+x64-windows-static/include/boost/typeof/std/locale.hpp
+x64-windows-static/include/boost/typeof/std/map.hpp
+x64-windows-static/include/boost/typeof/std/memory.hpp
+x64-windows-static/include/boost/typeof/std/ostream.hpp
+x64-windows-static/include/boost/typeof/std/queue.hpp
+x64-windows-static/include/boost/typeof/std/set.hpp
+x64-windows-static/include/boost/typeof/std/sstream.hpp
+x64-windows-static/include/boost/typeof/std/stack.hpp
+x64-windows-static/include/boost/typeof/std/streambuf.hpp
+x64-windows-static/include/boost/typeof/std/string.hpp
+x64-windows-static/include/boost/typeof/std/utility.hpp
+x64-windows-static/include/boost/typeof/std/valarray.hpp
+x64-windows-static/include/boost/typeof/std/vector.hpp
+x64-windows-static/include/boost/typeof/template_encoding.hpp
+x64-windows-static/include/boost/typeof/template_template_param.hpp
+x64-windows-static/include/boost/typeof/type_encoding.hpp
+x64-windows-static/include/boost/typeof/type_template_param.hpp
+x64-windows-static/include/boost/typeof/typeof.hpp
+x64-windows-static/include/boost/typeof/typeof_impl.hpp
+x64-windows-static/include/boost/typeof/unsupported.hpp
+x64-windows-static/include/boost/typeof/vector.hpp
+x64-windows-static/include/boost/typeof/vector100.hpp
+x64-windows-static/include/boost/typeof/vector150.hpp
+x64-windows-static/include/boost/typeof/vector200.hpp
+x64-windows-static/include/boost/typeof/vector50.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-typeof/
+x64-windows-static/share/boost-typeof/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,190 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/aligned_storage.hpp
+x64-windows/include/boost/type_traits.hpp
+x64-windows/include/boost/type_traits/
+x64-windows/include/boost/type_traits/add_const.hpp
+x64-windows/include/boost/type_traits/add_cv.hpp
+x64-windows/include/boost/type_traits/add_lvalue_reference.hpp
+x64-windows/include/boost/type_traits/add_pointer.hpp
+x64-windows/include/boost/type_traits/add_reference.hpp
+x64-windows/include/boost/type_traits/add_rvalue_reference.hpp
+x64-windows/include/boost/type_traits/add_volatile.hpp
+x64-windows/include/boost/type_traits/aligned_storage.hpp
+x64-windows/include/boost/type_traits/alignment_of.hpp
+x64-windows/include/boost/type_traits/alignment_traits.hpp
+x64-windows/include/boost/type_traits/arithmetic_traits.hpp
+x64-windows/include/boost/type_traits/array_traits.hpp
+x64-windows/include/boost/type_traits/broken_compiler_spec.hpp
+x64-windows/include/boost/type_traits/common_type.hpp
+x64-windows/include/boost/type_traits/composite_traits.hpp
+x64-windows/include/boost/type_traits/conditional.hpp
+x64-windows/include/boost/type_traits/config.hpp
+x64-windows/include/boost/type_traits/conversion_traits.hpp
+x64-windows/include/boost/type_traits/copy_cv.hpp
+x64-windows/include/boost/type_traits/cv_traits.hpp
+x64-windows/include/boost/type_traits/decay.hpp
+x64-windows/include/boost/type_traits/declval.hpp
+x64-windows/include/boost/type_traits/detail/
+x64-windows/include/boost/type_traits/detail/bool_trait_def.hpp
+x64-windows/include/boost/type_traits/detail/bool_trait_undef.hpp
+x64-windows/include/boost/type_traits/detail/common_arithmetic_type.hpp
+x64-windows/include/boost/type_traits/detail/common_type_impl.hpp
+x64-windows/include/boost/type_traits/detail/composite_member_pointer_type.hpp
+x64-windows/include/boost/type_traits/detail/composite_pointer_type.hpp
+x64-windows/include/boost/type_traits/detail/config.hpp
+x64-windows/include/boost/type_traits/detail/detector.hpp
+x64-windows/include/boost/type_traits/detail/has_binary_operator.hpp
+x64-windows/include/boost/type_traits/detail/has_postfix_operator.hpp
+x64-windows/include/boost/type_traits/detail/has_prefix_operator.hpp
+x64-windows/include/boost/type_traits/detail/ice_and.hpp
+x64-windows/include/boost/type_traits/detail/ice_eq.hpp
+x64-windows/include/boost/type_traits/detail/ice_not.hpp
+x64-windows/include/boost/type_traits/detail/ice_or.hpp
+x64-windows/include/boost/type_traits/detail/is_function_ptr_helper.hpp
+x64-windows/include/boost/type_traits/detail/is_function_ptr_tester.hpp
+x64-windows/include/boost/type_traits/detail/is_likely_lambda.hpp
+x64-windows/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp
+x64-windows/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp
+x64-windows/include/boost/type_traits/detail/mp_defer.hpp
+x64-windows/include/boost/type_traits/detail/template_arity_spec.hpp
+x64-windows/include/boost/type_traits/detail/yes_no_type.hpp
+x64-windows/include/boost/type_traits/detected.hpp
+x64-windows/include/boost/type_traits/detected_or.hpp
+x64-windows/include/boost/type_traits/extent.hpp
+x64-windows/include/boost/type_traits/floating_point_promotion.hpp
+x64-windows/include/boost/type_traits/function_traits.hpp
+x64-windows/include/boost/type_traits/has_bit_and.hpp
+x64-windows/include/boost/type_traits/has_bit_and_assign.hpp
+x64-windows/include/boost/type_traits/has_bit_or.hpp
+x64-windows/include/boost/type_traits/has_bit_or_assign.hpp
+x64-windows/include/boost/type_traits/has_bit_xor.hpp
+x64-windows/include/boost/type_traits/has_bit_xor_assign.hpp
+x64-windows/include/boost/type_traits/has_complement.hpp
+x64-windows/include/boost/type_traits/has_dereference.hpp
+x64-windows/include/boost/type_traits/has_divides.hpp
+x64-windows/include/boost/type_traits/has_divides_assign.hpp
+x64-windows/include/boost/type_traits/has_equal_to.hpp
+x64-windows/include/boost/type_traits/has_greater.hpp
+x64-windows/include/boost/type_traits/has_greater_equal.hpp
+x64-windows/include/boost/type_traits/has_left_shift.hpp
+x64-windows/include/boost/type_traits/has_left_shift_assign.hpp
+x64-windows/include/boost/type_traits/has_less.hpp
+x64-windows/include/boost/type_traits/has_less_equal.hpp
+x64-windows/include/boost/type_traits/has_logical_and.hpp
+x64-windows/include/boost/type_traits/has_logical_not.hpp
+x64-windows/include/boost/type_traits/has_logical_or.hpp
+x64-windows/include/boost/type_traits/has_minus.hpp
+x64-windows/include/boost/type_traits/has_minus_assign.hpp
+x64-windows/include/boost/type_traits/has_modulus.hpp
+x64-windows/include/boost/type_traits/has_modulus_assign.hpp
+x64-windows/include/boost/type_traits/has_multiplies.hpp
+x64-windows/include/boost/type_traits/has_multiplies_assign.hpp
+x64-windows/include/boost/type_traits/has_negate.hpp
+x64-windows/include/boost/type_traits/has_new_operator.hpp
+x64-windows/include/boost/type_traits/has_not_equal_to.hpp
+x64-windows/include/boost/type_traits/has_nothrow_assign.hpp
+x64-windows/include/boost/type_traits/has_nothrow_constructor.hpp
+x64-windows/include/boost/type_traits/has_nothrow_copy.hpp
+x64-windows/include/boost/type_traits/has_nothrow_destructor.hpp
+x64-windows/include/boost/type_traits/has_operator.hpp
+x64-windows/include/boost/type_traits/has_plus.hpp
+x64-windows/include/boost/type_traits/has_plus_assign.hpp
+x64-windows/include/boost/type_traits/has_post_decrement.hpp
+x64-windows/include/boost/type_traits/has_post_increment.hpp
+x64-windows/include/boost/type_traits/has_pre_decrement.hpp
+x64-windows/include/boost/type_traits/has_pre_increment.hpp
+x64-windows/include/boost/type_traits/has_right_shift.hpp
+x64-windows/include/boost/type_traits/has_right_shift_assign.hpp
+x64-windows/include/boost/type_traits/has_trivial_assign.hpp
+x64-windows/include/boost/type_traits/has_trivial_constructor.hpp
+x64-windows/include/boost/type_traits/has_trivial_copy.hpp
+x64-windows/include/boost/type_traits/has_trivial_destructor.hpp
+x64-windows/include/boost/type_traits/has_trivial_move_assign.hpp
+x64-windows/include/boost/type_traits/has_trivial_move_constructor.hpp
+x64-windows/include/boost/type_traits/has_unary_minus.hpp
+x64-windows/include/boost/type_traits/has_unary_plus.hpp
+x64-windows/include/boost/type_traits/has_virtual_destructor.hpp
+x64-windows/include/boost/type_traits/ice.hpp
+x64-windows/include/boost/type_traits/integral_constant.hpp
+x64-windows/include/boost/type_traits/integral_promotion.hpp
+x64-windows/include/boost/type_traits/intrinsics.hpp
+x64-windows/include/boost/type_traits/is_abstract.hpp
+x64-windows/include/boost/type_traits/is_arithmetic.hpp
+x64-windows/include/boost/type_traits/is_array.hpp
+x64-windows/include/boost/type_traits/is_assignable.hpp
+x64-windows/include/boost/type_traits/is_base_and_derived.hpp
+x64-windows/include/boost/type_traits/is_base_of.hpp
+x64-windows/include/boost/type_traits/is_base_of_tr1.hpp
+x64-windows/include/boost/type_traits/is_class.hpp
+x64-windows/include/boost/type_traits/is_complete.hpp
+x64-windows/include/boost/type_traits/is_complex.hpp
+x64-windows/include/boost/type_traits/is_compound.hpp
+x64-windows/include/boost/type_traits/is_const.hpp
+x64-windows/include/boost/type_traits/is_constructible.hpp
+x64-windows/include/boost/type_traits/is_convertible.hpp
+x64-windows/include/boost/type_traits/is_copy_assignable.hpp
+x64-windows/include/boost/type_traits/is_copy_constructible.hpp
+x64-windows/include/boost/type_traits/is_default_constructible.hpp
+x64-windows/include/boost/type_traits/is_destructible.hpp
+x64-windows/include/boost/type_traits/is_detected.hpp
+x64-windows/include/boost/type_traits/is_detected_convertible.hpp
+x64-windows/include/boost/type_traits/is_detected_exact.hpp
+x64-windows/include/boost/type_traits/is_empty.hpp
+x64-windows/include/boost/type_traits/is_enum.hpp
+x64-windows/include/boost/type_traits/is_final.hpp
+x64-windows/include/boost/type_traits/is_float.hpp
+x64-windows/include/boost/type_traits/is_floating_point.hpp
+x64-windows/include/boost/type_traits/is_function.hpp
+x64-windows/include/boost/type_traits/is_fundamental.hpp
+x64-windows/include/boost/type_traits/is_integral.hpp
+x64-windows/include/boost/type_traits/is_list_constructible.hpp
+x64-windows/include/boost/type_traits/is_lvalue_reference.hpp
+x64-windows/include/boost/type_traits/is_member_function_pointer.hpp
+x64-windows/include/boost/type_traits/is_member_object_pointer.hpp
+x64-windows/include/boost/type_traits/is_member_pointer.hpp
+x64-windows/include/boost/type_traits/is_nothrow_move_assignable.hpp
+x64-windows/include/boost/type_traits/is_nothrow_move_constructible.hpp
+x64-windows/include/boost/type_traits/is_nothrow_swappable.hpp
+x64-windows/include/boost/type_traits/is_object.hpp
+x64-windows/include/boost/type_traits/is_pod.hpp
+x64-windows/include/boost/type_traits/is_pointer.hpp
+x64-windows/include/boost/type_traits/is_polymorphic.hpp
+x64-windows/include/boost/type_traits/is_reference.hpp
+x64-windows/include/boost/type_traits/is_rvalue_reference.hpp
+x64-windows/include/boost/type_traits/is_same.hpp
+x64-windows/include/boost/type_traits/is_scalar.hpp
+x64-windows/include/boost/type_traits/is_signed.hpp
+x64-windows/include/boost/type_traits/is_stateless.hpp
+x64-windows/include/boost/type_traits/is_union.hpp
+x64-windows/include/boost/type_traits/is_unsigned.hpp
+x64-windows/include/boost/type_traits/is_virtual_base_of.hpp
+x64-windows/include/boost/type_traits/is_void.hpp
+x64-windows/include/boost/type_traits/is_volatile.hpp
+x64-windows/include/boost/type_traits/make_signed.hpp
+x64-windows/include/boost/type_traits/make_unsigned.hpp
+x64-windows/include/boost/type_traits/make_void.hpp
+x64-windows/include/boost/type_traits/nonesuch.hpp
+x64-windows/include/boost/type_traits/object_traits.hpp
+x64-windows/include/boost/type_traits/promote.hpp
+x64-windows/include/boost/type_traits/rank.hpp
+x64-windows/include/boost/type_traits/reference_traits.hpp
+x64-windows/include/boost/type_traits/remove_all_extents.hpp
+x64-windows/include/boost/type_traits/remove_bounds.hpp
+x64-windows/include/boost/type_traits/remove_const.hpp
+x64-windows/include/boost/type_traits/remove_cv.hpp
+x64-windows/include/boost/type_traits/remove_cv_ref.hpp
+x64-windows/include/boost/type_traits/remove_extent.hpp
+x64-windows/include/boost/type_traits/remove_pointer.hpp
+x64-windows/include/boost/type_traits/remove_reference.hpp
+x64-windows/include/boost/type_traits/remove_volatile.hpp
+x64-windows/include/boost/type_traits/same_traits.hpp
+x64-windows/include/boost/type_traits/transform_traits.hpp
+x64-windows/include/boost/type_traits/type_identity.hpp
+x64-windows/include/boost/type_traits/type_with_alignment.hpp
+x64-windows/include/boost/utility/
+x64-windows/include/boost/utility/declval.hpp
+x64-windows/share/
+x64-windows/share/boost-type-traits/
+x64-windows/share/boost-type-traits/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,190 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/aligned_storage.hpp
+x64-windows-static/include/boost/type_traits.hpp
+x64-windows-static/include/boost/type_traits/
+x64-windows-static/include/boost/type_traits/add_const.hpp
+x64-windows-static/include/boost/type_traits/add_cv.hpp
+x64-windows-static/include/boost/type_traits/add_lvalue_reference.hpp
+x64-windows-static/include/boost/type_traits/add_pointer.hpp
+x64-windows-static/include/boost/type_traits/add_reference.hpp
+x64-windows-static/include/boost/type_traits/add_rvalue_reference.hpp
+x64-windows-static/include/boost/type_traits/add_volatile.hpp
+x64-windows-static/include/boost/type_traits/aligned_storage.hpp
+x64-windows-static/include/boost/type_traits/alignment_of.hpp
+x64-windows-static/include/boost/type_traits/alignment_traits.hpp
+x64-windows-static/include/boost/type_traits/arithmetic_traits.hpp
+x64-windows-static/include/boost/type_traits/array_traits.hpp
+x64-windows-static/include/boost/type_traits/broken_compiler_spec.hpp
+x64-windows-static/include/boost/type_traits/common_type.hpp
+x64-windows-static/include/boost/type_traits/composite_traits.hpp
+x64-windows-static/include/boost/type_traits/conditional.hpp
+x64-windows-static/include/boost/type_traits/config.hpp
+x64-windows-static/include/boost/type_traits/conversion_traits.hpp
+x64-windows-static/include/boost/type_traits/copy_cv.hpp
+x64-windows-static/include/boost/type_traits/cv_traits.hpp
+x64-windows-static/include/boost/type_traits/decay.hpp
+x64-windows-static/include/boost/type_traits/declval.hpp
+x64-windows-static/include/boost/type_traits/detail/
+x64-windows-static/include/boost/type_traits/detail/bool_trait_def.hpp
+x64-windows-static/include/boost/type_traits/detail/bool_trait_undef.hpp
+x64-windows-static/include/boost/type_traits/detail/common_arithmetic_type.hpp
+x64-windows-static/include/boost/type_traits/detail/common_type_impl.hpp
+x64-windows-static/include/boost/type_traits/detail/composite_member_pointer_type.hpp
+x64-windows-static/include/boost/type_traits/detail/composite_pointer_type.hpp
+x64-windows-static/include/boost/type_traits/detail/config.hpp
+x64-windows-static/include/boost/type_traits/detail/detector.hpp
+x64-windows-static/include/boost/type_traits/detail/has_binary_operator.hpp
+x64-windows-static/include/boost/type_traits/detail/has_postfix_operator.hpp
+x64-windows-static/include/boost/type_traits/detail/has_prefix_operator.hpp
+x64-windows-static/include/boost/type_traits/detail/ice_and.hpp
+x64-windows-static/include/boost/type_traits/detail/ice_eq.hpp
+x64-windows-static/include/boost/type_traits/detail/ice_not.hpp
+x64-windows-static/include/boost/type_traits/detail/ice_or.hpp
+x64-windows-static/include/boost/type_traits/detail/is_function_ptr_helper.hpp
+x64-windows-static/include/boost/type_traits/detail/is_function_ptr_tester.hpp
+x64-windows-static/include/boost/type_traits/detail/is_likely_lambda.hpp
+x64-windows-static/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp
+x64-windows-static/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp
+x64-windows-static/include/boost/type_traits/detail/mp_defer.hpp
+x64-windows-static/include/boost/type_traits/detail/template_arity_spec.hpp
+x64-windows-static/include/boost/type_traits/detail/yes_no_type.hpp
+x64-windows-static/include/boost/type_traits/detected.hpp
+x64-windows-static/include/boost/type_traits/detected_or.hpp
+x64-windows-static/include/boost/type_traits/extent.hpp
+x64-windows-static/include/boost/type_traits/floating_point_promotion.hpp
+x64-windows-static/include/boost/type_traits/function_traits.hpp
+x64-windows-static/include/boost/type_traits/has_bit_and.hpp
+x64-windows-static/include/boost/type_traits/has_bit_and_assign.hpp
+x64-windows-static/include/boost/type_traits/has_bit_or.hpp
+x64-windows-static/include/boost/type_traits/has_bit_or_assign.hpp
+x64-windows-static/include/boost/type_traits/has_bit_xor.hpp
+x64-windows-static/include/boost/type_traits/has_bit_xor_assign.hpp
+x64-windows-static/include/boost/type_traits/has_complement.hpp
+x64-windows-static/include/boost/type_traits/has_dereference.hpp
+x64-windows-static/include/boost/type_traits/has_divides.hpp
+x64-windows-static/include/boost/type_traits/has_divides_assign.hpp
+x64-windows-static/include/boost/type_traits/has_equal_to.hpp
+x64-windows-static/include/boost/type_traits/has_greater.hpp
+x64-windows-static/include/boost/type_traits/has_greater_equal.hpp
+x64-windows-static/include/boost/type_traits/has_left_shift.hpp
+x64-windows-static/include/boost/type_traits/has_left_shift_assign.hpp
+x64-windows-static/include/boost/type_traits/has_less.hpp
+x64-windows-static/include/boost/type_traits/has_less_equal.hpp
+x64-windows-static/include/boost/type_traits/has_logical_and.hpp
+x64-windows-static/include/boost/type_traits/has_logical_not.hpp
+x64-windows-static/include/boost/type_traits/has_logical_or.hpp
+x64-windows-static/include/boost/type_traits/has_minus.hpp
+x64-windows-static/include/boost/type_traits/has_minus_assign.hpp
+x64-windows-static/include/boost/type_traits/has_modulus.hpp
+x64-windows-static/include/boost/type_traits/has_modulus_assign.hpp
+x64-windows-static/include/boost/type_traits/has_multiplies.hpp
+x64-windows-static/include/boost/type_traits/has_multiplies_assign.hpp
+x64-windows-static/include/boost/type_traits/has_negate.hpp
+x64-windows-static/include/boost/type_traits/has_new_operator.hpp
+x64-windows-static/include/boost/type_traits/has_not_equal_to.hpp
+x64-windows-static/include/boost/type_traits/has_nothrow_assign.hpp
+x64-windows-static/include/boost/type_traits/has_nothrow_constructor.hpp
+x64-windows-static/include/boost/type_traits/has_nothrow_copy.hpp
+x64-windows-static/include/boost/type_traits/has_nothrow_destructor.hpp
+x64-windows-static/include/boost/type_traits/has_operator.hpp
+x64-windows-static/include/boost/type_traits/has_plus.hpp
+x64-windows-static/include/boost/type_traits/has_plus_assign.hpp
+x64-windows-static/include/boost/type_traits/has_post_decrement.hpp
+x64-windows-static/include/boost/type_traits/has_post_increment.hpp
+x64-windows-static/include/boost/type_traits/has_pre_decrement.hpp
+x64-windows-static/include/boost/type_traits/has_pre_increment.hpp
+x64-windows-static/include/boost/type_traits/has_right_shift.hpp
+x64-windows-static/include/boost/type_traits/has_right_shift_assign.hpp
+x64-windows-static/include/boost/type_traits/has_trivial_assign.hpp
+x64-windows-static/include/boost/type_traits/has_trivial_constructor.hpp
+x64-windows-static/include/boost/type_traits/has_trivial_copy.hpp
+x64-windows-static/include/boost/type_traits/has_trivial_destructor.hpp
+x64-windows-static/include/boost/type_traits/has_trivial_move_assign.hpp
+x64-windows-static/include/boost/type_traits/has_trivial_move_constructor.hpp
+x64-windows-static/include/boost/type_traits/has_unary_minus.hpp
+x64-windows-static/include/boost/type_traits/has_unary_plus.hpp
+x64-windows-static/include/boost/type_traits/has_virtual_destructor.hpp
+x64-windows-static/include/boost/type_traits/ice.hpp
+x64-windows-static/include/boost/type_traits/integral_constant.hpp
+x64-windows-static/include/boost/type_traits/integral_promotion.hpp
+x64-windows-static/include/boost/type_traits/intrinsics.hpp
+x64-windows-static/include/boost/type_traits/is_abstract.hpp
+x64-windows-static/include/boost/type_traits/is_arithmetic.hpp
+x64-windows-static/include/boost/type_traits/is_array.hpp
+x64-windows-static/include/boost/type_traits/is_assignable.hpp
+x64-windows-static/include/boost/type_traits/is_base_and_derived.hpp
+x64-windows-static/include/boost/type_traits/is_base_of.hpp
+x64-windows-static/include/boost/type_traits/is_base_of_tr1.hpp
+x64-windows-static/include/boost/type_traits/is_class.hpp
+x64-windows-static/include/boost/type_traits/is_complete.hpp
+x64-windows-static/include/boost/type_traits/is_complex.hpp
+x64-windows-static/include/boost/type_traits/is_compound.hpp
+x64-windows-static/include/boost/type_traits/is_const.hpp
+x64-windows-static/include/boost/type_traits/is_constructible.hpp
+x64-windows-static/include/boost/type_traits/is_convertible.hpp
+x64-windows-static/include/boost/type_traits/is_copy_assignable.hpp
+x64-windows-static/include/boost/type_traits/is_copy_constructible.hpp
+x64-windows-static/include/boost/type_traits/is_default_constructible.hpp
+x64-windows-static/include/boost/type_traits/is_destructible.hpp
+x64-windows-static/include/boost/type_traits/is_detected.hpp
+x64-windows-static/include/boost/type_traits/is_detected_convertible.hpp
+x64-windows-static/include/boost/type_traits/is_detected_exact.hpp
+x64-windows-static/include/boost/type_traits/is_empty.hpp
+x64-windows-static/include/boost/type_traits/is_enum.hpp
+x64-windows-static/include/boost/type_traits/is_final.hpp
+x64-windows-static/include/boost/type_traits/is_float.hpp
+x64-windows-static/include/boost/type_traits/is_floating_point.hpp
+x64-windows-static/include/boost/type_traits/is_function.hpp
+x64-windows-static/include/boost/type_traits/is_fundamental.hpp
+x64-windows-static/include/boost/type_traits/is_integral.hpp
+x64-windows-static/include/boost/type_traits/is_list_constructible.hpp
+x64-windows-static/include/boost/type_traits/is_lvalue_reference.hpp
+x64-windows-static/include/boost/type_traits/is_member_function_pointer.hpp
+x64-windows-static/include/boost/type_traits/is_member_object_pointer.hpp
+x64-windows-static/include/boost/type_traits/is_member_pointer.hpp
+x64-windows-static/include/boost/type_traits/is_nothrow_move_assignable.hpp
+x64-windows-static/include/boost/type_traits/is_nothrow_move_constructible.hpp
+x64-windows-static/include/boost/type_traits/is_nothrow_swappable.hpp
+x64-windows-static/include/boost/type_traits/is_object.hpp
+x64-windows-static/include/boost/type_traits/is_pod.hpp
+x64-windows-static/include/boost/type_traits/is_pointer.hpp
+x64-windows-static/include/boost/type_traits/is_polymorphic.hpp
+x64-windows-static/include/boost/type_traits/is_reference.hpp
+x64-windows-static/include/boost/type_traits/is_rvalue_reference.hpp
+x64-windows-static/include/boost/type_traits/is_same.hpp
+x64-windows-static/include/boost/type_traits/is_scalar.hpp
+x64-windows-static/include/boost/type_traits/is_signed.hpp
+x64-windows-static/include/boost/type_traits/is_stateless.hpp
+x64-windows-static/include/boost/type_traits/is_union.hpp
+x64-windows-static/include/boost/type_traits/is_unsigned.hpp
+x64-windows-static/include/boost/type_traits/is_virtual_base_of.hpp
+x64-windows-static/include/boost/type_traits/is_void.hpp
+x64-windows-static/include/boost/type_traits/is_volatile.hpp
+x64-windows-static/include/boost/type_traits/make_signed.hpp
+x64-windows-static/include/boost/type_traits/make_unsigned.hpp
+x64-windows-static/include/boost/type_traits/make_void.hpp
+x64-windows-static/include/boost/type_traits/nonesuch.hpp
+x64-windows-static/include/boost/type_traits/object_traits.hpp
+x64-windows-static/include/boost/type_traits/promote.hpp
+x64-windows-static/include/boost/type_traits/rank.hpp
+x64-windows-static/include/boost/type_traits/reference_traits.hpp
+x64-windows-static/include/boost/type_traits/remove_all_extents.hpp
+x64-windows-static/include/boost/type_traits/remove_bounds.hpp
+x64-windows-static/include/boost/type_traits/remove_const.hpp
+x64-windows-static/include/boost/type_traits/remove_cv.hpp
+x64-windows-static/include/boost/type_traits/remove_cv_ref.hpp
+x64-windows-static/include/boost/type_traits/remove_extent.hpp
+x64-windows-static/include/boost/type_traits/remove_pointer.hpp
+x64-windows-static/include/boost/type_traits/remove_reference.hpp
+x64-windows-static/include/boost/type_traits/remove_volatile.hpp
+x64-windows-static/include/boost/type_traits/same_traits.hpp
+x64-windows-static/include/boost/type_traits/transform_traits.hpp
+x64-windows-static/include/boost/type_traits/type_identity.hpp
+x64-windows-static/include/boost/type_traits/type_with_alignment.hpp
+x64-windows-static/include/boost/utility/
+x64-windows-static/include/boost/utility/declval.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-type-traits/
+x64-windows-static/share/boost-type-traits/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/unordered/
+x64-windows/include/boost/unordered/detail/
+x64-windows/include/boost/unordered/detail/fwd.hpp
+x64-windows/include/boost/unordered/detail/implementation.hpp
+x64-windows/include/boost/unordered/detail/map.hpp
+x64-windows/include/boost/unordered/detail/set.hpp
+x64-windows/include/boost/unordered/unordered_map.hpp
+x64-windows/include/boost/unordered/unordered_map_fwd.hpp
+x64-windows/include/boost/unordered/unordered_set.hpp
+x64-windows/include/boost/unordered/unordered_set_fwd.hpp
+x64-windows/include/boost/unordered_map.hpp
+x64-windows/include/boost/unordered_set.hpp
+x64-windows/share/
+x64-windows/share/boost-unordered/
+x64-windows/share/boost-unordered/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/unordered/
+x64-windows-static/include/boost/unordered/detail/
+x64-windows-static/include/boost/unordered/detail/fwd.hpp
+x64-windows-static/include/boost/unordered/detail/implementation.hpp
+x64-windows-static/include/boost/unordered/detail/map.hpp
+x64-windows-static/include/boost/unordered/detail/set.hpp
+x64-windows-static/include/boost/unordered/unordered_map.hpp
+x64-windows-static/include/boost/unordered/unordered_map_fwd.hpp
+x64-windows-static/include/boost/unordered/unordered_set.hpp
+x64-windows-static/include/boost/unordered/unordered_set_fwd.hpp
+x64-windows-static/include/boost/unordered_map.hpp
+x64-windows-static/include/boost/unordered_set.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-unordered/
+x64-windows-static/share/boost-unordered/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/call_traits.hpp
+x64-windows/include/boost/compressed_pair.hpp
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/call_traits.hpp
+x64-windows/include/boost/detail/compressed_pair.hpp
+x64-windows/include/boost/detail/ob_compressed_pair.hpp
+x64-windows/include/boost/operators.hpp
+x64-windows/include/boost/operators_v1.hpp
+x64-windows/include/boost/utility.hpp
+x64-windows/include/boost/utility/
+x64-windows/include/boost/utility/base_from_member.hpp
+x64-windows/include/boost/utility/binary.hpp
+x64-windows/include/boost/utility/compare_pointees.hpp
+x64-windows/include/boost/utility/detail/
+x64-windows/include/boost/utility/detail/in_place_factory_prefix.hpp
+x64-windows/include/boost/utility/detail/in_place_factory_suffix.hpp
+x64-windows/include/boost/utility/detail/minstd_rand.hpp
+x64-windows/include/boost/utility/detail/result_of_iterate.hpp
+x64-windows/include/boost/utility/identity_type.hpp
+x64-windows/include/boost/utility/in_place_factory.hpp
+x64-windows/include/boost/utility/result_of.hpp
+x64-windows/include/boost/utility/string_ref.hpp
+x64-windows/include/boost/utility/string_ref_fwd.hpp
+x64-windows/include/boost/utility/string_view.hpp
+x64-windows/include/boost/utility/string_view_fwd.hpp
+x64-windows/include/boost/utility/typed_in_place_factory.hpp
+x64-windows/include/boost/utility/value_init.hpp
+x64-windows/share/
+x64-windows/share/boost-utility/
+x64-windows/share/boost-utility/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-utility_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/call_traits.hpp
+x64-windows-static/include/boost/compressed_pair.hpp
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/call_traits.hpp
+x64-windows-static/include/boost/detail/compressed_pair.hpp
+x64-windows-static/include/boost/detail/ob_compressed_pair.hpp
+x64-windows-static/include/boost/operators.hpp
+x64-windows-static/include/boost/operators_v1.hpp
+x64-windows-static/include/boost/utility.hpp
+x64-windows-static/include/boost/utility/
+x64-windows-static/include/boost/utility/base_from_member.hpp
+x64-windows-static/include/boost/utility/binary.hpp
+x64-windows-static/include/boost/utility/compare_pointees.hpp
+x64-windows-static/include/boost/utility/detail/
+x64-windows-static/include/boost/utility/detail/in_place_factory_prefix.hpp
+x64-windows-static/include/boost/utility/detail/in_place_factory_suffix.hpp
+x64-windows-static/include/boost/utility/detail/minstd_rand.hpp
+x64-windows-static/include/boost/utility/detail/result_of_iterate.hpp
+x64-windows-static/include/boost/utility/identity_type.hpp
+x64-windows-static/include/boost/utility/in_place_factory.hpp
+x64-windows-static/include/boost/utility/result_of.hpp
+x64-windows-static/include/boost/utility/string_ref.hpp
+x64-windows-static/include/boost/utility/string_ref_fwd.hpp
+x64-windows-static/include/boost/utility/string_view.hpp
+x64-windows-static/include/boost/utility/string_view_fwd.hpp
+x64-windows-static/include/boost/utility/typed_in_place_factory.hpp
+x64-windows-static/include/boost/utility/value_init.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-utility/
+x64-windows-static/share/boost-utility/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/variant.hpp
+x64-windows/include/boost/variant/
+x64-windows/include/boost/variant/apply_visitor.hpp
+x64-windows/include/boost/variant/bad_visit.hpp
+x64-windows/include/boost/variant/detail/
+x64-windows/include/boost/variant/detail/apply_visitor_binary.hpp
+x64-windows/include/boost/variant/detail/apply_visitor_delayed.hpp
+x64-windows/include/boost/variant/detail/apply_visitor_unary.hpp
+x64-windows/include/boost/variant/detail/backup_holder.hpp
+x64-windows/include/boost/variant/detail/cast_storage.hpp
+x64-windows/include/boost/variant/detail/config.hpp
+x64-windows/include/boost/variant/detail/element_index.hpp
+x64-windows/include/boost/variant/detail/enable_recursive.hpp
+x64-windows/include/boost/variant/detail/enable_recursive_fwd.hpp
+x64-windows/include/boost/variant/detail/forced_return.hpp
+x64-windows/include/boost/variant/detail/generic_result_type.hpp
+x64-windows/include/boost/variant/detail/has_result_type.hpp
+x64-windows/include/boost/variant/detail/hash_variant.hpp
+x64-windows/include/boost/variant/detail/initializer.hpp
+x64-windows/include/boost/variant/detail/make_variant_list.hpp
+x64-windows/include/boost/variant/detail/move.hpp
+x64-windows/include/boost/variant/detail/multivisitors_cpp11_based.hpp
+x64-windows/include/boost/variant/detail/multivisitors_cpp14_based.hpp
+x64-windows/include/boost/variant/detail/multivisitors_preprocessor_based.hpp
+x64-windows/include/boost/variant/detail/over_sequence.hpp
+x64-windows/include/boost/variant/detail/substitute.hpp
+x64-windows/include/boost/variant/detail/substitute_fwd.hpp
+x64-windows/include/boost/variant/detail/variant_io.hpp
+x64-windows/include/boost/variant/detail/visitation_impl.hpp
+x64-windows/include/boost/variant/get.hpp
+x64-windows/include/boost/variant/multivisitors.hpp
+x64-windows/include/boost/variant/polymorphic_get.hpp
+x64-windows/include/boost/variant/recursive_variant.hpp
+x64-windows/include/boost/variant/recursive_wrapper.hpp
+x64-windows/include/boost/variant/recursive_wrapper_fwd.hpp
+x64-windows/include/boost/variant/static_visitor.hpp
+x64-windows/include/boost/variant/variant.hpp
+x64-windows/include/boost/variant/variant_fwd.hpp
+x64-windows/include/boost/variant/visitor_ptr.hpp
+x64-windows/share/
+x64-windows/share/boost-variant/
+x64-windows/share/boost-variant/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-variant_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/variant.hpp
+x64-windows-static/include/boost/variant/
+x64-windows-static/include/boost/variant/apply_visitor.hpp
+x64-windows-static/include/boost/variant/bad_visit.hpp
+x64-windows-static/include/boost/variant/detail/
+x64-windows-static/include/boost/variant/detail/apply_visitor_binary.hpp
+x64-windows-static/include/boost/variant/detail/apply_visitor_delayed.hpp
+x64-windows-static/include/boost/variant/detail/apply_visitor_unary.hpp
+x64-windows-static/include/boost/variant/detail/backup_holder.hpp
+x64-windows-static/include/boost/variant/detail/cast_storage.hpp
+x64-windows-static/include/boost/variant/detail/config.hpp
+x64-windows-static/include/boost/variant/detail/element_index.hpp
+x64-windows-static/include/boost/variant/detail/enable_recursive.hpp
+x64-windows-static/include/boost/variant/detail/enable_recursive_fwd.hpp
+x64-windows-static/include/boost/variant/detail/forced_return.hpp
+x64-windows-static/include/boost/variant/detail/generic_result_type.hpp
+x64-windows-static/include/boost/variant/detail/has_result_type.hpp
+x64-windows-static/include/boost/variant/detail/hash_variant.hpp
+x64-windows-static/include/boost/variant/detail/initializer.hpp
+x64-windows-static/include/boost/variant/detail/make_variant_list.hpp
+x64-windows-static/include/boost/variant/detail/move.hpp
+x64-windows-static/include/boost/variant/detail/multivisitors_cpp11_based.hpp
+x64-windows-static/include/boost/variant/detail/multivisitors_cpp14_based.hpp
+x64-windows-static/include/boost/variant/detail/multivisitors_preprocessor_based.hpp
+x64-windows-static/include/boost/variant/detail/over_sequence.hpp
+x64-windows-static/include/boost/variant/detail/substitute.hpp
+x64-windows-static/include/boost/variant/detail/substitute_fwd.hpp
+x64-windows-static/include/boost/variant/detail/variant_io.hpp
+x64-windows-static/include/boost/variant/detail/visitation_impl.hpp
+x64-windows-static/include/boost/variant/get.hpp
+x64-windows-static/include/boost/variant/multivisitors.hpp
+x64-windows-static/include/boost/variant/polymorphic_get.hpp
+x64-windows-static/include/boost/variant/recursive_variant.hpp
+x64-windows-static/include/boost/variant/recursive_wrapper.hpp
+x64-windows-static/include/boost/variant/recursive_wrapper_fwd.hpp
+x64-windows-static/include/boost/variant/static_visitor.hpp
+x64-windows-static/include/boost/variant/variant.hpp
+x64-windows-static/include/boost/variant/variant_fwd.hpp
+x64-windows-static/include/boost/variant/visitor_ptr.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-variant/
+x64-windows-static/share/boost-variant/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,4 @@
+x64-windows/
+x64-windows/share/
+x64-windows/share/boost-vcpkg-helpers/
+x64-windows/share/boost-vcpkg-helpers/boost-modular-headers.cmake
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,4 @@
+x64-windows-static/
+x64-windows-static/share/
+x64-windows-static/share/boost-vcpkg-helpers/
+x64-windows-static/share/boost-vcpkg-helpers/boost-modular-headers.cmake
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,126 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/interlocked.hpp
+x64-windows/include/boost/detail/winapi/
+x64-windows/include/boost/detail/winapi/access_rights.hpp
+x64-windows/include/boost/detail/winapi/apc.hpp
+x64-windows/include/boost/detail/winapi/basic_types.hpp
+x64-windows/include/boost/detail/winapi/bcrypt.hpp
+x64-windows/include/boost/detail/winapi/character_code_conversion.hpp
+x64-windows/include/boost/detail/winapi/condition_variable.hpp
+x64-windows/include/boost/detail/winapi/config.hpp
+x64-windows/include/boost/detail/winapi/critical_section.hpp
+x64-windows/include/boost/detail/winapi/crypt.hpp
+x64-windows/include/boost/detail/winapi/dbghelp.hpp
+x64-windows/include/boost/detail/winapi/debugapi.hpp
+x64-windows/include/boost/detail/winapi/detail/
+x64-windows/include/boost/detail/winapi/detail/deprecated_namespace.hpp
+x64-windows/include/boost/detail/winapi/directory_management.hpp
+x64-windows/include/boost/detail/winapi/dll.hpp
+x64-windows/include/boost/detail/winapi/environment.hpp
+x64-windows/include/boost/detail/winapi/error_codes.hpp
+x64-windows/include/boost/detail/winapi/error_handling.hpp
+x64-windows/include/boost/detail/winapi/event.hpp
+x64-windows/include/boost/detail/winapi/file_management.hpp
+x64-windows/include/boost/detail/winapi/file_mapping.hpp
+x64-windows/include/boost/detail/winapi/get_current_process.hpp
+x64-windows/include/boost/detail/winapi/get_current_process_id.hpp
+x64-windows/include/boost/detail/winapi/get_current_thread.hpp
+x64-windows/include/boost/detail/winapi/get_current_thread_id.hpp
+x64-windows/include/boost/detail/winapi/get_last_error.hpp
+x64-windows/include/boost/detail/winapi/get_process_times.hpp
+x64-windows/include/boost/detail/winapi/get_system_directory.hpp
+x64-windows/include/boost/detail/winapi/get_thread_times.hpp
+x64-windows/include/boost/detail/winapi/handle_info.hpp
+x64-windows/include/boost/detail/winapi/handles.hpp
+x64-windows/include/boost/detail/winapi/heap_memory.hpp
+x64-windows/include/boost/detail/winapi/init_once.hpp
+x64-windows/include/boost/detail/winapi/jobs.hpp
+x64-windows/include/boost/detail/winapi/limits.hpp
+x64-windows/include/boost/detail/winapi/local_memory.hpp
+x64-windows/include/boost/detail/winapi/memory.hpp
+x64-windows/include/boost/detail/winapi/mutex.hpp
+x64-windows/include/boost/detail/winapi/overlapped.hpp
+x64-windows/include/boost/detail/winapi/page_protection_flags.hpp
+x64-windows/include/boost/detail/winapi/pipes.hpp
+x64-windows/include/boost/detail/winapi/priority_class.hpp
+x64-windows/include/boost/detail/winapi/process.hpp
+x64-windows/include/boost/detail/winapi/security.hpp
+x64-windows/include/boost/detail/winapi/semaphore.hpp
+x64-windows/include/boost/detail/winapi/shell.hpp
+x64-windows/include/boost/detail/winapi/show_window.hpp
+x64-windows/include/boost/detail/winapi/srw_lock.hpp
+x64-windows/include/boost/detail/winapi/stack_backtrace.hpp
+x64-windows/include/boost/detail/winapi/synchronization.hpp
+x64-windows/include/boost/detail/winapi/system.hpp
+x64-windows/include/boost/detail/winapi/thread.hpp
+x64-windows/include/boost/detail/winapi/thread_pool.hpp
+x64-windows/include/boost/detail/winapi/time.hpp
+x64-windows/include/boost/detail/winapi/timers.hpp
+x64-windows/include/boost/detail/winapi/tls.hpp
+x64-windows/include/boost/detail/winapi/wait.hpp
+x64-windows/include/boost/detail/winapi/waitable_timer.hpp
+x64-windows/include/boost/winapi/
+x64-windows/include/boost/winapi/access_rights.hpp
+x64-windows/include/boost/winapi/apc.hpp
+x64-windows/include/boost/winapi/basic_types.hpp
+x64-windows/include/boost/winapi/bcrypt.hpp
+x64-windows/include/boost/winapi/character_code_conversion.hpp
+x64-windows/include/boost/winapi/condition_variable.hpp
+x64-windows/include/boost/winapi/config.hpp
+x64-windows/include/boost/winapi/critical_section.hpp
+x64-windows/include/boost/winapi/crypt.hpp
+x64-windows/include/boost/winapi/dbghelp.hpp
+x64-windows/include/boost/winapi/debugapi.hpp
+x64-windows/include/boost/winapi/detail/
+x64-windows/include/boost/winapi/detail/cast_ptr.hpp
+x64-windows/include/boost/winapi/directory_management.hpp
+x64-windows/include/boost/winapi/dll.hpp
+x64-windows/include/boost/winapi/environment.hpp
+x64-windows/include/boost/winapi/error_codes.hpp
+x64-windows/include/boost/winapi/error_handling.hpp
+x64-windows/include/boost/winapi/event.hpp
+x64-windows/include/boost/winapi/file_management.hpp
+x64-windows/include/boost/winapi/file_mapping.hpp
+x64-windows/include/boost/winapi/get_current_process.hpp
+x64-windows/include/boost/winapi/get_current_process_id.hpp
+x64-windows/include/boost/winapi/get_current_thread.hpp
+x64-windows/include/boost/winapi/get_current_thread_id.hpp
+x64-windows/include/boost/winapi/get_last_error.hpp
+x64-windows/include/boost/winapi/get_process_times.hpp
+x64-windows/include/boost/winapi/get_system_directory.hpp
+x64-windows/include/boost/winapi/get_thread_times.hpp
+x64-windows/include/boost/winapi/handle_info.hpp
+x64-windows/include/boost/winapi/handles.hpp
+x64-windows/include/boost/winapi/heap_memory.hpp
+x64-windows/include/boost/winapi/init_once.hpp
+x64-windows/include/boost/winapi/jobs.hpp
+x64-windows/include/boost/winapi/limits.hpp
+x64-windows/include/boost/winapi/local_memory.hpp
+x64-windows/include/boost/winapi/memory.hpp
+x64-windows/include/boost/winapi/mutex.hpp
+x64-windows/include/boost/winapi/overlapped.hpp
+x64-windows/include/boost/winapi/page_protection_flags.hpp
+x64-windows/include/boost/winapi/pipes.hpp
+x64-windows/include/boost/winapi/priority_class.hpp
+x64-windows/include/boost/winapi/process.hpp
+x64-windows/include/boost/winapi/security.hpp
+x64-windows/include/boost/winapi/semaphore.hpp
+x64-windows/include/boost/winapi/shell.hpp
+x64-windows/include/boost/winapi/show_window.hpp
+x64-windows/include/boost/winapi/srw_lock.hpp
+x64-windows/include/boost/winapi/stack_backtrace.hpp
+x64-windows/include/boost/winapi/synchronization.hpp
+x64-windows/include/boost/winapi/system.hpp
+x64-windows/include/boost/winapi/thread.hpp
+x64-windows/include/boost/winapi/thread_pool.hpp
+x64-windows/include/boost/winapi/time.hpp
+x64-windows/include/boost/winapi/timers.hpp
+x64-windows/include/boost/winapi/tls.hpp
+x64-windows/include/boost/winapi/wait.hpp
+x64-windows/include/boost/winapi/waitable_timer.hpp
+x64-windows/share/
+x64-windows/share/boost-winapi/
+x64-windows/share/boost-winapi/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,126 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/detail/
+x64-windows-static/include/boost/detail/interlocked.hpp
+x64-windows-static/include/boost/detail/winapi/
+x64-windows-static/include/boost/detail/winapi/access_rights.hpp
+x64-windows-static/include/boost/detail/winapi/apc.hpp
+x64-windows-static/include/boost/detail/winapi/basic_types.hpp
+x64-windows-static/include/boost/detail/winapi/bcrypt.hpp
+x64-windows-static/include/boost/detail/winapi/character_code_conversion.hpp
+x64-windows-static/include/boost/detail/winapi/condition_variable.hpp
+x64-windows-static/include/boost/detail/winapi/config.hpp
+x64-windows-static/include/boost/detail/winapi/critical_section.hpp
+x64-windows-static/include/boost/detail/winapi/crypt.hpp
+x64-windows-static/include/boost/detail/winapi/dbghelp.hpp
+x64-windows-static/include/boost/detail/winapi/debugapi.hpp
+x64-windows-static/include/boost/detail/winapi/detail/
+x64-windows-static/include/boost/detail/winapi/detail/deprecated_namespace.hpp
+x64-windows-static/include/boost/detail/winapi/directory_management.hpp
+x64-windows-static/include/boost/detail/winapi/dll.hpp
+x64-windows-static/include/boost/detail/winapi/environment.hpp
+x64-windows-static/include/boost/detail/winapi/error_codes.hpp
+x64-windows-static/include/boost/detail/winapi/error_handling.hpp
+x64-windows-static/include/boost/detail/winapi/event.hpp
+x64-windows-static/include/boost/detail/winapi/file_management.hpp
+x64-windows-static/include/boost/detail/winapi/file_mapping.hpp
+x64-windows-static/include/boost/detail/winapi/get_current_process.hpp
+x64-windows-static/include/boost/detail/winapi/get_current_process_id.hpp
+x64-windows-static/include/boost/detail/winapi/get_current_thread.hpp
+x64-windows-static/include/boost/detail/winapi/get_current_thread_id.hpp
+x64-windows-static/include/boost/detail/winapi/get_last_error.hpp
+x64-windows-static/include/boost/detail/winapi/get_process_times.hpp
+x64-windows-static/include/boost/detail/winapi/get_system_directory.hpp
+x64-windows-static/include/boost/detail/winapi/get_thread_times.hpp
+x64-windows-static/include/boost/detail/winapi/handle_info.hpp
+x64-windows-static/include/boost/detail/winapi/handles.hpp
+x64-windows-static/include/boost/detail/winapi/heap_memory.hpp
+x64-windows-static/include/boost/detail/winapi/init_once.hpp
+x64-windows-static/include/boost/detail/winapi/jobs.hpp
+x64-windows-static/include/boost/detail/winapi/limits.hpp
+x64-windows-static/include/boost/detail/winapi/local_memory.hpp
+x64-windows-static/include/boost/detail/winapi/memory.hpp
+x64-windows-static/include/boost/detail/winapi/mutex.hpp
+x64-windows-static/include/boost/detail/winapi/overlapped.hpp
+x64-windows-static/include/boost/detail/winapi/page_protection_flags.hpp
+x64-windows-static/include/boost/detail/winapi/pipes.hpp
+x64-windows-static/include/boost/detail/winapi/priority_class.hpp
+x64-windows-static/include/boost/detail/winapi/process.hpp
+x64-windows-static/include/boost/detail/winapi/security.hpp
+x64-windows-static/include/boost/detail/winapi/semaphore.hpp
+x64-windows-static/include/boost/detail/winapi/shell.hpp
+x64-windows-static/include/boost/detail/winapi/show_window.hpp
+x64-windows-static/include/boost/detail/winapi/srw_lock.hpp
+x64-windows-static/include/boost/detail/winapi/stack_backtrace.hpp
+x64-windows-static/include/boost/detail/winapi/synchronization.hpp
+x64-windows-static/include/boost/detail/winapi/system.hpp
+x64-windows-static/include/boost/detail/winapi/thread.hpp
+x64-windows-static/include/boost/detail/winapi/thread_pool.hpp
+x64-windows-static/include/boost/detail/winapi/time.hpp
+x64-windows-static/include/boost/detail/winapi/timers.hpp
+x64-windows-static/include/boost/detail/winapi/tls.hpp
+x64-windows-static/include/boost/detail/winapi/wait.hpp
+x64-windows-static/include/boost/detail/winapi/waitable_timer.hpp
+x64-windows-static/include/boost/winapi/
+x64-windows-static/include/boost/winapi/access_rights.hpp
+x64-windows-static/include/boost/winapi/apc.hpp
+x64-windows-static/include/boost/winapi/basic_types.hpp
+x64-windows-static/include/boost/winapi/bcrypt.hpp
+x64-windows-static/include/boost/winapi/character_code_conversion.hpp
+x64-windows-static/include/boost/winapi/condition_variable.hpp
+x64-windows-static/include/boost/winapi/config.hpp
+x64-windows-static/include/boost/winapi/critical_section.hpp
+x64-windows-static/include/boost/winapi/crypt.hpp
+x64-windows-static/include/boost/winapi/dbghelp.hpp
+x64-windows-static/include/boost/winapi/debugapi.hpp
+x64-windows-static/include/boost/winapi/detail/
+x64-windows-static/include/boost/winapi/detail/cast_ptr.hpp
+x64-windows-static/include/boost/winapi/directory_management.hpp
+x64-windows-static/include/boost/winapi/dll.hpp
+x64-windows-static/include/boost/winapi/environment.hpp
+x64-windows-static/include/boost/winapi/error_codes.hpp
+x64-windows-static/include/boost/winapi/error_handling.hpp
+x64-windows-static/include/boost/winapi/event.hpp
+x64-windows-static/include/boost/winapi/file_management.hpp
+x64-windows-static/include/boost/winapi/file_mapping.hpp
+x64-windows-static/include/boost/winapi/get_current_process.hpp
+x64-windows-static/include/boost/winapi/get_current_process_id.hpp
+x64-windows-static/include/boost/winapi/get_current_thread.hpp
+x64-windows-static/include/boost/winapi/get_current_thread_id.hpp
+x64-windows-static/include/boost/winapi/get_last_error.hpp
+x64-windows-static/include/boost/winapi/get_process_times.hpp
+x64-windows-static/include/boost/winapi/get_system_directory.hpp
+x64-windows-static/include/boost/winapi/get_thread_times.hpp
+x64-windows-static/include/boost/winapi/handle_info.hpp
+x64-windows-static/include/boost/winapi/handles.hpp
+x64-windows-static/include/boost/winapi/heap_memory.hpp
+x64-windows-static/include/boost/winapi/init_once.hpp
+x64-windows-static/include/boost/winapi/jobs.hpp
+x64-windows-static/include/boost/winapi/limits.hpp
+x64-windows-static/include/boost/winapi/local_memory.hpp
+x64-windows-static/include/boost/winapi/memory.hpp
+x64-windows-static/include/boost/winapi/mutex.hpp
+x64-windows-static/include/boost/winapi/overlapped.hpp
+x64-windows-static/include/boost/winapi/page_protection_flags.hpp
+x64-windows-static/include/boost/winapi/pipes.hpp
+x64-windows-static/include/boost/winapi/priority_class.hpp
+x64-windows-static/include/boost/winapi/process.hpp
+x64-windows-static/include/boost/winapi/security.hpp
+x64-windows-static/include/boost/winapi/semaphore.hpp
+x64-windows-static/include/boost/winapi/shell.hpp
+x64-windows-static/include/boost/winapi/show_window.hpp
+x64-windows-static/include/boost/winapi/srw_lock.hpp
+x64-windows-static/include/boost/winapi/stack_backtrace.hpp
+x64-windows-static/include/boost/winapi/synchronization.hpp
+x64-windows-static/include/boost/winapi/system.hpp
+x64-windows-static/include/boost/winapi/thread.hpp
+x64-windows-static/include/boost/winapi/thread_pool.hpp
+x64-windows-static/include/boost/winapi/time.hpp
+x64-windows-static/include/boost/winapi/timers.hpp
+x64-windows-static/include/boost/winapi/tls.hpp
+x64-windows-static/include/boost/winapi/wait.hpp
+x64-windows-static/include/boost/winapi/waitable_timer.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-winapi/
+x64-windows-static/share/boost-winapi/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,141 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/xpressive/
+x64-windows/include/boost/xpressive/basic_regex.hpp
+x64-windows/include/boost/xpressive/detail/
+x64-windows/include/boost/xpressive/detail/core/
+x64-windows/include/boost/xpressive/detail/core/access.hpp
+x64-windows/include/boost/xpressive/detail/core/action.hpp
+x64-windows/include/boost/xpressive/detail/core/adaptor.hpp
+x64-windows/include/boost/xpressive/detail/core/finder.hpp
+x64-windows/include/boost/xpressive/detail/core/flow_control.hpp
+x64-windows/include/boost/xpressive/detail/core/icase.hpp
+x64-windows/include/boost/xpressive/detail/core/linker.hpp
+x64-windows/include/boost/xpressive/detail/core/list.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/
+x64-windows/include/boost/xpressive/detail/core/matcher/action_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/alternate_end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/alternate_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/any_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_bol_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_bos_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_eol_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_eos_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_line_base.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_word_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/attr_begin_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/attr_end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/attr_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/charset_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/epsilon_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/keeper_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/literal_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/logical_newline_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/lookahead_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/lookbehind_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/mark_begin_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/mark_end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/mark_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/optional_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/posix_charset_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/predicate_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/range_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/regex_byref_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/regex_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/repeat_begin_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/repeat_end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/set_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/string_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/true_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matchers.hpp
+x64-windows/include/boost/xpressive/detail/core/optimize.hpp
+x64-windows/include/boost/xpressive/detail/core/peeker.hpp
+x64-windows/include/boost/xpressive/detail/core/quant_style.hpp
+x64-windows/include/boost/xpressive/detail/core/regex_domain.hpp
+x64-windows/include/boost/xpressive/detail/core/regex_impl.hpp
+x64-windows/include/boost/xpressive/detail/core/results_cache.hpp
+x64-windows/include/boost/xpressive/detail/core/state.hpp
+x64-windows/include/boost/xpressive/detail/core/sub_match_impl.hpp
+x64-windows/include/boost/xpressive/detail/core/sub_match_vector.hpp
+x64-windows/include/boost/xpressive/detail/detail_fwd.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/
+x64-windows/include/boost/xpressive/detail/dynamic/dynamic.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/matchable.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/parse_charset.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/parser.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/parser_enum.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/parser_traits.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/sequence.hpp
+x64-windows/include/boost/xpressive/detail/static/
+x64-windows/include/boost/xpressive/detail/static/compile.hpp
+x64-windows/include/boost/xpressive/detail/static/grammar.hpp
+x64-windows/include/boost/xpressive/detail/static/is_pure.hpp
+x64-windows/include/boost/xpressive/detail/static/modifier.hpp
+x64-windows/include/boost/xpressive/detail/static/placeholders.hpp
+x64-windows/include/boost/xpressive/detail/static/static.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/
+x64-windows/include/boost/xpressive/detail/static/transforms/as_action.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_alternate.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_independent.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_inverse.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_marker.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_matcher.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_modifier.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_quantifier.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_sequence.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_set.hpp
+x64-windows/include/boost/xpressive/detail/static/transmogrify.hpp
+x64-windows/include/boost/xpressive/detail/static/type_traits.hpp
+x64-windows/include/boost/xpressive/detail/static/visitor.hpp
+x64-windows/include/boost/xpressive/detail/static/width_of.hpp
+x64-windows/include/boost/xpressive/detail/utility/
+x64-windows/include/boost/xpressive/detail/utility/algorithm.hpp
+x64-windows/include/boost/xpressive/detail/utility/any.hpp
+x64-windows/include/boost/xpressive/detail/utility/boyer_moore.hpp
+x64-windows/include/boost/xpressive/detail/utility/chset/
+x64-windows/include/boost/xpressive/detail/utility/chset/basic_chset.hpp
+x64-windows/include/boost/xpressive/detail/utility/chset/basic_chset.ipp
+x64-windows/include/boost/xpressive/detail/utility/chset/chset.hpp
+x64-windows/include/boost/xpressive/detail/utility/chset/range_run.hpp
+x64-windows/include/boost/xpressive/detail/utility/chset/range_run.ipp
+x64-windows/include/boost/xpressive/detail/utility/cons.hpp
+x64-windows/include/boost/xpressive/detail/utility/counted_base.hpp
+x64-windows/include/boost/xpressive/detail/utility/dont_care.hpp
+x64-windows/include/boost/xpressive/detail/utility/hash_peek_bitset.hpp
+x64-windows/include/boost/xpressive/detail/utility/ignore_unused.hpp
+x64-windows/include/boost/xpressive/detail/utility/literals.hpp
+x64-windows/include/boost/xpressive/detail/utility/never_true.hpp
+x64-windows/include/boost/xpressive/detail/utility/save_restore.hpp
+x64-windows/include/boost/xpressive/detail/utility/sequence_stack.hpp
+x64-windows/include/boost/xpressive/detail/utility/symbols.hpp
+x64-windows/include/boost/xpressive/detail/utility/tracking_ptr.hpp
+x64-windows/include/boost/xpressive/detail/utility/traits_utils.hpp
+x64-windows/include/boost/xpressive/detail/utility/width.hpp
+x64-windows/include/boost/xpressive/match_results.hpp
+x64-windows/include/boost/xpressive/regex_actions.hpp
+x64-windows/include/boost/xpressive/regex_algorithms.hpp
+x64-windows/include/boost/xpressive/regex_compiler.hpp
+x64-windows/include/boost/xpressive/regex_constants.hpp
+x64-windows/include/boost/xpressive/regex_error.hpp
+x64-windows/include/boost/xpressive/regex_iterator.hpp
+x64-windows/include/boost/xpressive/regex_primitives.hpp
+x64-windows/include/boost/xpressive/regex_token_iterator.hpp
+x64-windows/include/boost/xpressive/regex_traits.hpp
+x64-windows/include/boost/xpressive/sub_match.hpp
+x64-windows/include/boost/xpressive/traits/
+x64-windows/include/boost/xpressive/traits/c_regex_traits.hpp
+x64-windows/include/boost/xpressive/traits/cpp_regex_traits.hpp
+x64-windows/include/boost/xpressive/traits/detail/
+x64-windows/include/boost/xpressive/traits/detail/c_ctype.hpp
+x64-windows/include/boost/xpressive/traits/null_regex_traits.hpp
+x64-windows/include/boost/xpressive/xpressive.hpp
+x64-windows/include/boost/xpressive/xpressive_dynamic.hpp
+x64-windows/include/boost/xpressive/xpressive_fwd.hpp
+x64-windows/include/boost/xpressive/xpressive_static.hpp
+x64-windows/include/boost/xpressive/xpressive_typeof.hpp
+x64-windows/share/
+x64-windows/share/boost-xpressive/
+x64-windows/share/boost-xpressive/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,141 @@
+x64-windows-static/
+x64-windows-static/include/
+x64-windows-static/include/boost/
+x64-windows-static/include/boost/xpressive/
+x64-windows-static/include/boost/xpressive/basic_regex.hpp
+x64-windows-static/include/boost/xpressive/detail/
+x64-windows-static/include/boost/xpressive/detail/core/
+x64-windows-static/include/boost/xpressive/detail/core/access.hpp
+x64-windows-static/include/boost/xpressive/detail/core/action.hpp
+x64-windows-static/include/boost/xpressive/detail/core/adaptor.hpp
+x64-windows-static/include/boost/xpressive/detail/core/finder.hpp
+x64-windows-static/include/boost/xpressive/detail/core/flow_control.hpp
+x64-windows-static/include/boost/xpressive/detail/core/icase.hpp
+x64-windows-static/include/boost/xpressive/detail/core/linker.hpp
+x64-windows-static/include/boost/xpressive/detail/core/list.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/
+x64-windows-static/include/boost/xpressive/detail/core/matcher/action_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/alternate_end_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/alternate_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/any_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/assert_bol_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/assert_bos_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/assert_eol_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/assert_eos_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/assert_line_base.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/assert_word_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/attr_begin_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/attr_end_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/attr_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/charset_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/end_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/epsilon_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/keeper_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/literal_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/logical_newline_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/lookahead_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/lookbehind_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/mark_begin_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/mark_end_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/mark_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/optional_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/posix_charset_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/predicate_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/range_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/regex_byref_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/regex_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/repeat_begin_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/repeat_end_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/set_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/string_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matcher/true_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/core/matchers.hpp
+x64-windows-static/include/boost/xpressive/detail/core/optimize.hpp
+x64-windows-static/include/boost/xpressive/detail/core/peeker.hpp
+x64-windows-static/include/boost/xpressive/detail/core/quant_style.hpp
+x64-windows-static/include/boost/xpressive/detail/core/regex_domain.hpp
+x64-windows-static/include/boost/xpressive/detail/core/regex_impl.hpp
+x64-windows-static/include/boost/xpressive/detail/core/results_cache.hpp
+x64-windows-static/include/boost/xpressive/detail/core/state.hpp
+x64-windows-static/include/boost/xpressive/detail/core/sub_match_impl.hpp
+x64-windows-static/include/boost/xpressive/detail/core/sub_match_vector.hpp
+x64-windows-static/include/boost/xpressive/detail/detail_fwd.hpp
+x64-windows-static/include/boost/xpressive/detail/dynamic/
+x64-windows-static/include/boost/xpressive/detail/dynamic/dynamic.hpp
+x64-windows-static/include/boost/xpressive/detail/dynamic/matchable.hpp
+x64-windows-static/include/boost/xpressive/detail/dynamic/parse_charset.hpp
+x64-windows-static/include/boost/xpressive/detail/dynamic/parser.hpp
+x64-windows-static/include/boost/xpressive/detail/dynamic/parser_enum.hpp
+x64-windows-static/include/boost/xpressive/detail/dynamic/parser_traits.hpp
+x64-windows-static/include/boost/xpressive/detail/dynamic/sequence.hpp
+x64-windows-static/include/boost/xpressive/detail/static/
+x64-windows-static/include/boost/xpressive/detail/static/compile.hpp
+x64-windows-static/include/boost/xpressive/detail/static/grammar.hpp
+x64-windows-static/include/boost/xpressive/detail/static/is_pure.hpp
+x64-windows-static/include/boost/xpressive/detail/static/modifier.hpp
+x64-windows-static/include/boost/xpressive/detail/static/placeholders.hpp
+x64-windows-static/include/boost/xpressive/detail/static/static.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_action.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_alternate.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_independent.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_inverse.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_marker.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_matcher.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_modifier.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_quantifier.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_sequence.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transforms/as_set.hpp
+x64-windows-static/include/boost/xpressive/detail/static/transmogrify.hpp
+x64-windows-static/include/boost/xpressive/detail/static/type_traits.hpp
+x64-windows-static/include/boost/xpressive/detail/static/visitor.hpp
+x64-windows-static/include/boost/xpressive/detail/static/width_of.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/
+x64-windows-static/include/boost/xpressive/detail/utility/algorithm.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/any.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/boyer_moore.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/chset/
+x64-windows-static/include/boost/xpressive/detail/utility/chset/basic_chset.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/chset/basic_chset.ipp
+x64-windows-static/include/boost/xpressive/detail/utility/chset/chset.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/chset/range_run.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/chset/range_run.ipp
+x64-windows-static/include/boost/xpressive/detail/utility/cons.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/counted_base.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/dont_care.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/hash_peek_bitset.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/ignore_unused.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/literals.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/never_true.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/save_restore.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/sequence_stack.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/symbols.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/tracking_ptr.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/traits_utils.hpp
+x64-windows-static/include/boost/xpressive/detail/utility/width.hpp
+x64-windows-static/include/boost/xpressive/match_results.hpp
+x64-windows-static/include/boost/xpressive/regex_actions.hpp
+x64-windows-static/include/boost/xpressive/regex_algorithms.hpp
+x64-windows-static/include/boost/xpressive/regex_compiler.hpp
+x64-windows-static/include/boost/xpressive/regex_constants.hpp
+x64-windows-static/include/boost/xpressive/regex_error.hpp
+x64-windows-static/include/boost/xpressive/regex_iterator.hpp
+x64-windows-static/include/boost/xpressive/regex_primitives.hpp
+x64-windows-static/include/boost/xpressive/regex_token_iterator.hpp
+x64-windows-static/include/boost/xpressive/regex_traits.hpp
+x64-windows-static/include/boost/xpressive/sub_match.hpp
+x64-windows-static/include/boost/xpressive/traits/
+x64-windows-static/include/boost/xpressive/traits/c_regex_traits.hpp
+x64-windows-static/include/boost/xpressive/traits/cpp_regex_traits.hpp
+x64-windows-static/include/boost/xpressive/traits/detail/
+x64-windows-static/include/boost/xpressive/traits/detail/c_ctype.hpp
+x64-windows-static/include/boost/xpressive/traits/null_regex_traits.hpp
+x64-windows-static/include/boost/xpressive/xpressive.hpp
+x64-windows-static/include/boost/xpressive/xpressive_dynamic.hpp
+x64-windows-static/include/boost/xpressive/xpressive_fwd.hpp
+x64-windows-static/include/boost/xpressive/xpressive_static.hpp
+x64-windows-static/include/boost/xpressive/xpressive_typeof.hpp
+x64-windows-static/share/
+x64-windows-static/share/boost-xpressive/
+x64-windows-static/share/boost-xpressive/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_arm64-ios.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_arm64-ios.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_arm64-ios.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_arm64-ios.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+arm64-ios/
+arm64-ios/debug/
+arm64-ios/debug/lib/
+arm64-ios/debug/lib/libbz2d.a
+arm64-ios/include/
+arm64-ios/include/bzlib.h
+arm64-ios/lib/
+arm64-ios/lib/libbz2.a
+arm64-ios/share/
+arm64-ios/share/bzip2/
+arm64-ios/share/bzip2/copyright
+arm64-ios/share/bzip2/usage
+arm64-ios/tools/
+arm64-ios/tools/bzip2
+arm64-ios/tools/bzip2recover
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-osx.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-osx.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-osx.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-osx.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+x64-osx/
+x64-osx/debug/
+x64-osx/debug/lib/
+x64-osx/debug/lib/libbz2d.a
+x64-osx/include/
+x64-osx/include/bzlib.h
+x64-osx/lib/
+x64-osx/lib/libbz2.a
+x64-osx/share/
+x64-osx/share/bzip2/
+x64-osx/share/bzip2/copyright
+x64-osx/share/bzip2/usage
+x64-osx/tools/
+x64-osx/tools/bzip2
+x64-osx/tools/bzip2recover
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/libbz2.dll
+x64-windows/bin/libbz2.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/libbz2d.dll
+x64-windows/debug/bin/libbz2d.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/bz2d.lib
+x64-windows/include/
+x64-windows/include/bzlib.h
+x64-windows/lib/
+x64-windows/lib/bz2.lib
+x64-windows/share/
+x64-windows/share/bzip2/
+x64-windows/share/bzip2/copyright
+x64-windows/share/bzip2/usage
+x64-windows/tools/
+x64-windows/tools/bzip2.exe
+x64-windows/tools/bzip2recover.exe
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/bz2d.lib
+x64-windows-static/include/
+x64-windows-static/include/bzlib.h
+x64-windows-static/lib/
+x64-windows-static/lib/bz2.lib
+x64-windows-static/share/
+x64-windows-static/share/bzip2/
+x64-windows-static/share/bzip2/copyright
+x64-windows-static/share/bzip2/usage
+x64-windows-static/tools/
+x64-windows-static/tools/bzip2.exe
+x64-windows-static/tools/bzip2recover.exe
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x86-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x86-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x86-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/bzip2_1.0.6-2_x86-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+x86-windows/
+x86-windows/bin/
+x86-windows/bin/libbz2.dll
+x86-windows/bin/libbz2.pdb
+x86-windows/debug/
+x86-windows/debug/bin/
+x86-windows/debug/bin/libbz2d.dll
+x86-windows/debug/bin/libbz2d.pdb
+x86-windows/debug/lib/
+x86-windows/debug/lib/bz2d.lib
+x86-windows/include/
+x86-windows/include/bzlib.h
+x86-windows/lib/
+x86-windows/lib/bz2.lib
+x86-windows/share/
+x86-windows/share/bzip2/
+x86-windows/share/bzip2/copyright
+x86-windows/share/bzip2/usage
+x86-windows/tools/
+x86-windows/tools/bzip2.exe
+x86-windows/tools/bzip2recover.exe
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_arm64-ios.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_arm64-ios.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_arm64-ios.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_arm64-ios.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,71 @@
+arm64-ios/
+arm64-ios/debug/
+arm64-ios/debug/lib/
+arm64-ios/debug/lib/libfreetyped.a
+arm64-ios/include/
+arm64-ios/include/freetype/
+arm64-ios/include/freetype/config/
+arm64-ios/include/freetype/config/ftconfig.h
+arm64-ios/include/freetype/config/ftheader.h
+arm64-ios/include/freetype/config/ftmodule.h
+arm64-ios/include/freetype/config/ftoption.h
+arm64-ios/include/freetype/config/ftstdlib.h
+arm64-ios/include/freetype/freetype.h
+arm64-ios/include/freetype/ftadvanc.h
+arm64-ios/include/freetype/ftautoh.h
+arm64-ios/include/freetype/ftbbox.h
+arm64-ios/include/freetype/ftbdf.h
+arm64-ios/include/freetype/ftbitmap.h
+arm64-ios/include/freetype/ftbzip2.h
+arm64-ios/include/freetype/ftcache.h
+arm64-ios/include/freetype/ftcffdrv.h
+arm64-ios/include/freetype/ftchapters.h
+arm64-ios/include/freetype/ftcid.h
+arm64-ios/include/freetype/fterrdef.h
+arm64-ios/include/freetype/fterrors.h
+arm64-ios/include/freetype/ftfntfmt.h
+arm64-ios/include/freetype/ftgasp.h
+arm64-ios/include/freetype/ftglyph.h
+arm64-ios/include/freetype/ftgxval.h
+arm64-ios/include/freetype/ftgzip.h
+arm64-ios/include/freetype/ftimage.h
+arm64-ios/include/freetype/ftincrem.h
+arm64-ios/include/freetype/ftlcdfil.h
+arm64-ios/include/freetype/ftlist.h
+arm64-ios/include/freetype/ftlzw.h
+arm64-ios/include/freetype/ftmac.h
+arm64-ios/include/freetype/ftmm.h
+arm64-ios/include/freetype/ftmodapi.h
+arm64-ios/include/freetype/ftmoderr.h
+arm64-ios/include/freetype/ftotval.h
+arm64-ios/include/freetype/ftoutln.h
+arm64-ios/include/freetype/ftpcfdrv.h
+arm64-ios/include/freetype/ftpfr.h
+arm64-ios/include/freetype/ftrender.h
+arm64-ios/include/freetype/ftsizes.h
+arm64-ios/include/freetype/ftsnames.h
+arm64-ios/include/freetype/ftstroke.h
+arm64-ios/include/freetype/ftsynth.h
+arm64-ios/include/freetype/ftsystem.h
+arm64-ios/include/freetype/fttrigon.h
+arm64-ios/include/freetype/ftttdrv.h
+arm64-ios/include/freetype/fttypes.h
+arm64-ios/include/freetype/ftwinfnt.h
+arm64-ios/include/freetype/t1tables.h
+arm64-ios/include/freetype/ttnameid.h
+arm64-ios/include/freetype/tttables.h
+arm64-ios/include/freetype/tttags.h
+arm64-ios/include/freetype/ttunpat.h
+arm64-ios/include/ft2build.h
+arm64-ios/lib/
+arm64-ios/lib/libfreetype.a
+arm64-ios/share/
+arm64-ios/share/freetype/
+arm64-ios/share/freetype/FTL.TXT
+arm64-ios/share/freetype/GPLv2.TXT
+arm64-ios/share/freetype/copyright
+arm64-ios/share/freetype/freetype-config-debug.cmake
+arm64-ios/share/freetype/freetype-config-release.cmake
+arm64-ios/share/freetype/freetype-config.cmake
+arm64-ios/share/freetype/usage
+arm64-ios/share/freetype/vcpkg-cmake-wrapper.cmake
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x64-osx.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x64-osx.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x64-osx.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x64-osx.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,71 @@
+x64-osx/
+x64-osx/debug/
+x64-osx/debug/lib/
+x64-osx/debug/lib/libfreetyped.a
+x64-osx/include/
+x64-osx/include/freetype/
+x64-osx/include/freetype/config/
+x64-osx/include/freetype/config/ftconfig.h
+x64-osx/include/freetype/config/ftheader.h
+x64-osx/include/freetype/config/ftmodule.h
+x64-osx/include/freetype/config/ftoption.h
+x64-osx/include/freetype/config/ftstdlib.h
+x64-osx/include/freetype/freetype.h
+x64-osx/include/freetype/ftadvanc.h
+x64-osx/include/freetype/ftautoh.h
+x64-osx/include/freetype/ftbbox.h
+x64-osx/include/freetype/ftbdf.h
+x64-osx/include/freetype/ftbitmap.h
+x64-osx/include/freetype/ftbzip2.h
+x64-osx/include/freetype/ftcache.h
+x64-osx/include/freetype/ftcffdrv.h
+x64-osx/include/freetype/ftchapters.h
+x64-osx/include/freetype/ftcid.h
+x64-osx/include/freetype/fterrdef.h
+x64-osx/include/freetype/fterrors.h
+x64-osx/include/freetype/ftfntfmt.h
+x64-osx/include/freetype/ftgasp.h
+x64-osx/include/freetype/ftglyph.h
+x64-osx/include/freetype/ftgxval.h
+x64-osx/include/freetype/ftgzip.h
+x64-osx/include/freetype/ftimage.h
+x64-osx/include/freetype/ftincrem.h
+x64-osx/include/freetype/ftlcdfil.h
+x64-osx/include/freetype/ftlist.h
+x64-osx/include/freetype/ftlzw.h
+x64-osx/include/freetype/ftmac.h
+x64-osx/include/freetype/ftmm.h
+x64-osx/include/freetype/ftmodapi.h
+x64-osx/include/freetype/ftmoderr.h
+x64-osx/include/freetype/ftotval.h
+x64-osx/include/freetype/ftoutln.h
+x64-osx/include/freetype/ftpcfdrv.h
+x64-osx/include/freetype/ftpfr.h
+x64-osx/include/freetype/ftrender.h
+x64-osx/include/freetype/ftsizes.h
+x64-osx/include/freetype/ftsnames.h
+x64-osx/include/freetype/ftstroke.h
+x64-osx/include/freetype/ftsynth.h
+x64-osx/include/freetype/ftsystem.h
+x64-osx/include/freetype/fttrigon.h
+x64-osx/include/freetype/ftttdrv.h
+x64-osx/include/freetype/fttypes.h
+x64-osx/include/freetype/ftwinfnt.h
+x64-osx/include/freetype/t1tables.h
+x64-osx/include/freetype/ttnameid.h
+x64-osx/include/freetype/tttables.h
+x64-osx/include/freetype/tttags.h
+x64-osx/include/freetype/ttunpat.h
+x64-osx/include/ft2build.h
+x64-osx/lib/
+x64-osx/lib/libfreetype.a
+x64-osx/share/
+x64-osx/share/freetype/
+x64-osx/share/freetype/FTL.TXT
+x64-osx/share/freetype/GPLv2.TXT
+x64-osx/share/freetype/copyright
+x64-osx/share/freetype/freetype-config-debug.cmake
+x64-osx/share/freetype/freetype-config-release.cmake
+x64-osx/share/freetype/freetype-config.cmake
+x64-osx/share/freetype/usage
+x64-osx/share/freetype/vcpkg-cmake-wrapper.cmake
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x86-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x86-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x86-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/freetype_2.8.1-3_x86-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,76 @@
+x86-windows/
+x86-windows/bin/
+x86-windows/bin/freetype.dll
+x86-windows/bin/freetype.pdb
+x86-windows/debug/
+x86-windows/debug/bin/
+x86-windows/debug/bin/freetyped.dll
+x86-windows/debug/bin/freetyped.pdb
+x86-windows/debug/lib/
+x86-windows/debug/lib/freetyped.lib
+x86-windows/include/
+x86-windows/include/freetype/
+x86-windows/include/freetype/config/
+x86-windows/include/freetype/config/ftconfig.h
+x86-windows/include/freetype/config/ftheader.h
+x86-windows/include/freetype/config/ftmodule.h
+x86-windows/include/freetype/config/ftoption.h
+x86-windows/include/freetype/config/ftstdlib.h
+x86-windows/include/freetype/freetype.h
+x86-windows/include/freetype/ftadvanc.h
+x86-windows/include/freetype/ftautoh.h
+x86-windows/include/freetype/ftbbox.h
+x86-windows/include/freetype/ftbdf.h
+x86-windows/include/freetype/ftbitmap.h
+x86-windows/include/freetype/ftbzip2.h
+x86-windows/include/freetype/ftcache.h
+x86-windows/include/freetype/ftcffdrv.h
+x86-windows/include/freetype/ftchapters.h
+x86-windows/include/freetype/ftcid.h
+x86-windows/include/freetype/fterrdef.h
+x86-windows/include/freetype/fterrors.h
+x86-windows/include/freetype/ftfntfmt.h
+x86-windows/include/freetype/ftgasp.h
+x86-windows/include/freetype/ftglyph.h
+x86-windows/include/freetype/ftgxval.h
+x86-windows/include/freetype/ftgzip.h
+x86-windows/include/freetype/ftimage.h
+x86-windows/include/freetype/ftincrem.h
+x86-windows/include/freetype/ftlcdfil.h
+x86-windows/include/freetype/ftlist.h
+x86-windows/include/freetype/ftlzw.h
+x86-windows/include/freetype/ftmac.h
+x86-windows/include/freetype/ftmm.h
+x86-windows/include/freetype/ftmodapi.h
+x86-windows/include/freetype/ftmoderr.h
+x86-windows/include/freetype/ftotval.h
+x86-windows/include/freetype/ftoutln.h
+x86-windows/include/freetype/ftpcfdrv.h
+x86-windows/include/freetype/ftpfr.h
+x86-windows/include/freetype/ftrender.h
+x86-windows/include/freetype/ftsizes.h
+x86-windows/include/freetype/ftsnames.h
+x86-windows/include/freetype/ftstroke.h
+x86-windows/include/freetype/ftsynth.h
+x86-windows/include/freetype/ftsystem.h
+x86-windows/include/freetype/fttrigon.h
+x86-windows/include/freetype/ftttdrv.h
+x86-windows/include/freetype/fttypes.h
+x86-windows/include/freetype/ftwinfnt.h
+x86-windows/include/freetype/t1tables.h
+x86-windows/include/freetype/ttnameid.h
+x86-windows/include/freetype/tttables.h
+x86-windows/include/freetype/tttags.h
+x86-windows/include/freetype/ttunpat.h
+x86-windows/include/ft2build.h
+x86-windows/lib/
+x86-windows/lib/freetype.lib
+x86-windows/share/
+x86-windows/share/freetype/
+x86-windows/share/freetype/FTL.TXT
+x86-windows/share/freetype/GPLv2.TXT
+x86-windows/share/freetype/copyright
+x86-windows/share/freetype/freetype-config-debug.cmake
+x86-windows/share/freetype/freetype-config-release.cmake
+x86-windows/share/freetype/freetype-config.cmake
+x86-windows/share/freetype/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/graphite2_1.3.10_x86-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/graphite2_1.3.10_x86-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/graphite2_1.3.10_x86-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/graphite2_1.3.10_x86-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,29 @@
+x86-windows/
+x86-windows/bin/
+x86-windows/bin/graphite2.dll
+x86-windows/bin/graphite2.pdb
+x86-windows/debug/
+x86-windows/debug/bin/
+x86-windows/debug/bin/graphite2.dll
+x86-windows/debug/bin/graphite2.pdb
+x86-windows/debug/lib/
+x86-windows/debug/lib/graphite2.lib
+x86-windows/debug/lib/pkgconfig/
+x86-windows/debug/lib/pkgconfig/graphite2.pc
+x86-windows/include/
+x86-windows/include/graphite2/
+x86-windows/include/graphite2/Font.h
+x86-windows/include/graphite2/Log.h
+x86-windows/include/graphite2/Segment.h
+x86-windows/include/graphite2/Types.h
+x86-windows/lib/
+x86-windows/lib/graphite2.lib
+x86-windows/lib/pkgconfig/
+x86-windows/lib/pkgconfig/graphite2.pc
+x86-windows/share/
+x86-windows/share/graphite2/
+x86-windows/share/graphite2/LICENSE
+x86-windows/share/graphite2/copyright
+x86-windows/share/graphite2/graphite2-debug.cmake
+x86-windows/share/graphite2/graphite2-release.cmake
+x86-windows/share/graphite2/graphite2.cmake
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_arm64-ios.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_arm64-ios.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_arm64-ios.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_arm64-ios.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+arm64-ios/
+arm64-ios/debug/
+arm64-ios/debug/lib/
+arm64-ios/debug/lib/libharfbuzz.a
+arm64-ios/include/
+arm64-ios/include/harfbuzz/
+arm64-ios/include/harfbuzz/hb-blob.h
+arm64-ios/include/harfbuzz/hb-buffer.h
+arm64-ios/include/harfbuzz/hb-common.h
+arm64-ios/include/harfbuzz/hb-coretext.h
+arm64-ios/include/harfbuzz/hb-deprecated.h
+arm64-ios/include/harfbuzz/hb-face.h
+arm64-ios/include/harfbuzz/hb-font.h
+arm64-ios/include/harfbuzz/hb-ft.h
+arm64-ios/include/harfbuzz/hb-map.h
+arm64-ios/include/harfbuzz/hb-ot-font.h
+arm64-ios/include/harfbuzz/hb-ot-layout.h
+arm64-ios/include/harfbuzz/hb-ot-math.h
+arm64-ios/include/harfbuzz/hb-ot-shape.h
+arm64-ios/include/harfbuzz/hb-ot-tag.h
+arm64-ios/include/harfbuzz/hb-ot-var.h
+arm64-ios/include/harfbuzz/hb-ot.h
+arm64-ios/include/harfbuzz/hb-set.h
+arm64-ios/include/harfbuzz/hb-shape-plan.h
+arm64-ios/include/harfbuzz/hb-shape.h
+arm64-ios/include/harfbuzz/hb-unicode.h
+arm64-ios/include/harfbuzz/hb-version.h
+arm64-ios/include/harfbuzz/hb.h
+arm64-ios/lib/
+arm64-ios/lib/libharfbuzz.a
+arm64-ios/share/
+arm64-ios/share/harfbuzz/
+arm64-ios/share/harfbuzz/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x64-osx.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x64-osx.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x64-osx.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x64-osx.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+x64-osx/
+x64-osx/debug/
+x64-osx/debug/lib/
+x64-osx/debug/lib/libharfbuzz.a
+x64-osx/include/
+x64-osx/include/harfbuzz/
+x64-osx/include/harfbuzz/hb-blob.h
+x64-osx/include/harfbuzz/hb-buffer.h
+x64-osx/include/harfbuzz/hb-common.h
+x64-osx/include/harfbuzz/hb-coretext.h
+x64-osx/include/harfbuzz/hb-deprecated.h
+x64-osx/include/harfbuzz/hb-face.h
+x64-osx/include/harfbuzz/hb-font.h
+x64-osx/include/harfbuzz/hb-ft.h
+x64-osx/include/harfbuzz/hb-map.h
+x64-osx/include/harfbuzz/hb-ot-font.h
+x64-osx/include/harfbuzz/hb-ot-layout.h
+x64-osx/include/harfbuzz/hb-ot-math.h
+x64-osx/include/harfbuzz/hb-ot-shape.h
+x64-osx/include/harfbuzz/hb-ot-tag.h
+x64-osx/include/harfbuzz/hb-ot-var.h
+x64-osx/include/harfbuzz/hb-ot.h
+x64-osx/include/harfbuzz/hb-set.h
+x64-osx/include/harfbuzz/hb-shape-plan.h
+x64-osx/include/harfbuzz/hb-shape.h
+x64-osx/include/harfbuzz/hb-unicode.h
+x64-osx/include/harfbuzz/hb-version.h
+x64-osx/include/harfbuzz/hb.h
+x64-osx/lib/
+x64-osx/lib/libharfbuzz.a
+x64-osx/share/
+x64-osx/share/harfbuzz/
+x64-osx/share/harfbuzz/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x86-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x86-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x86-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/harfbuzz_1.8.4_x86-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,39 @@
+x86-windows/
+x86-windows/bin/
+x86-windows/bin/harfbuzz.dll
+x86-windows/bin/harfbuzz.pdb
+x86-windows/debug/
+x86-windows/debug/bin/
+x86-windows/debug/bin/harfbuzz.dll
+x86-windows/debug/bin/harfbuzz.pdb
+x86-windows/debug/lib/
+x86-windows/debug/lib/harfbuzz.lib
+x86-windows/include/
+x86-windows/include/harfbuzz/
+x86-windows/include/harfbuzz/hb-blob.h
+x86-windows/include/harfbuzz/hb-buffer.h
+x86-windows/include/harfbuzz/hb-common.h
+x86-windows/include/harfbuzz/hb-deprecated.h
+x86-windows/include/harfbuzz/hb-face.h
+x86-windows/include/harfbuzz/hb-font.h
+x86-windows/include/harfbuzz/hb-ft.h
+x86-windows/include/harfbuzz/hb-icu.h
+x86-windows/include/harfbuzz/hb-map.h
+x86-windows/include/harfbuzz/hb-ot-font.h
+x86-windows/include/harfbuzz/hb-ot-layout.h
+x86-windows/include/harfbuzz/hb-ot-math.h
+x86-windows/include/harfbuzz/hb-ot-shape.h
+x86-windows/include/harfbuzz/hb-ot-tag.h
+x86-windows/include/harfbuzz/hb-ot-var.h
+x86-windows/include/harfbuzz/hb-ot.h
+x86-windows/include/harfbuzz/hb-set.h
+x86-windows/include/harfbuzz/hb-shape-plan.h
+x86-windows/include/harfbuzz/hb-shape.h
+x86-windows/include/harfbuzz/hb-unicode.h
+x86-windows/include/harfbuzz/hb-version.h
+x86-windows/include/harfbuzz/hb.h
+x86-windows/lib/
+x86-windows/lib/harfbuzz.lib
+x86-windows/share/
+x86-windows/share/harfbuzz/
+x86-windows/share/harfbuzz/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,217 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/icudt61.dll
+x64-windows/bin/icuin61.dll
+x64-windows/bin/icuin61.pdb
+x64-windows/bin/icuio61.dll
+x64-windows/bin/icuio61.pdb
+x64-windows/bin/icutu61.dll
+x64-windows/bin/icutu61.pdb
+x64-windows/bin/icuuc61.dll
+x64-windows/bin/icuuc61.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/icudtd61.dll
+x64-windows/debug/bin/icuind61.dll
+x64-windows/debug/bin/icuind61.pdb
+x64-windows/debug/bin/icuiod61.dll
+x64-windows/debug/bin/icuiod61.pdb
+x64-windows/debug/bin/icutud61.dll
+x64-windows/debug/bin/icutud61.pdb
+x64-windows/debug/bin/icuucd61.dll
+x64-windows/debug/bin/icuucd61.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/icudtd.lib
+x64-windows/debug/lib/icuind.lib
+x64-windows/debug/lib/icuiod.lib
+x64-windows/debug/lib/icutud.lib
+x64-windows/debug/lib/icuucd.lib
+x64-windows/include/
+x64-windows/include/unicode/
+x64-windows/include/unicode/alphaindex.h
+x64-windows/include/unicode/appendable.h
+x64-windows/include/unicode/basictz.h
+x64-windows/include/unicode/brkiter.h
+x64-windows/include/unicode/bytestream.h
+x64-windows/include/unicode/bytestrie.h
+x64-windows/include/unicode/bytestriebuilder.h
+x64-windows/include/unicode/calendar.h
+x64-windows/include/unicode/caniter.h
+x64-windows/include/unicode/casemap.h
+x64-windows/include/unicode/char16ptr.h
+x64-windows/include/unicode/chariter.h
+x64-windows/include/unicode/choicfmt.h
+x64-windows/include/unicode/coleitr.h
+x64-windows/include/unicode/coll.h
+x64-windows/include/unicode/compactdecimalformat.h
+x64-windows/include/unicode/curramt.h
+x64-windows/include/unicode/currpinf.h
+x64-windows/include/unicode/currunit.h
+x64-windows/include/unicode/datefmt.h
+x64-windows/include/unicode/dbbi.h
+x64-windows/include/unicode/dcfmtsym.h
+x64-windows/include/unicode/decimfmt.h
+x64-windows/include/unicode/docmain.h
+x64-windows/include/unicode/dtfmtsym.h
+x64-windows/include/unicode/dtintrv.h
+x64-windows/include/unicode/dtitvfmt.h
+x64-windows/include/unicode/dtitvinf.h
+x64-windows/include/unicode/dtptngen.h
+x64-windows/include/unicode/dtrule.h
+x64-windows/include/unicode/edits.h
+x64-windows/include/unicode/enumset.h
+x64-windows/include/unicode/errorcode.h
+x64-windows/include/unicode/fieldpos.h
+x64-windows/include/unicode/filteredbrk.h
+x64-windows/include/unicode/fmtable.h
+x64-windows/include/unicode/format.h
+x64-windows/include/unicode/fpositer.h
+x64-windows/include/unicode/gender.h
+x64-windows/include/unicode/gregocal.h
+x64-windows/include/unicode/icudataver.h
+x64-windows/include/unicode/icuplug.h
+x64-windows/include/unicode/idna.h
+x64-windows/include/unicode/listformatter.h
+x64-windows/include/unicode/localpointer.h
+x64-windows/include/unicode/locdspnm.h
+x64-windows/include/unicode/locid.h
+x64-windows/include/unicode/measfmt.h
+x64-windows/include/unicode/measunit.h
+x64-windows/include/unicode/measure.h
+x64-windows/include/unicode/messagepattern.h
+x64-windows/include/unicode/msgfmt.h
+x64-windows/include/unicode/normalizer2.h
+x64-windows/include/unicode/normlzr.h
+x64-windows/include/unicode/nounit.h
+x64-windows/include/unicode/numberformatter.h
+x64-windows/include/unicode/numfmt.h
+x64-windows/include/unicode/numsys.h
+x64-windows/include/unicode/parseerr.h
+x64-windows/include/unicode/parsepos.h
+x64-windows/include/unicode/platform.h
+x64-windows/include/unicode/plurfmt.h
+x64-windows/include/unicode/plurrule.h
+x64-windows/include/unicode/ptypes.h
+x64-windows/include/unicode/putil.h
+x64-windows/include/unicode/rbbi.h
+x64-windows/include/unicode/rbnf.h
+x64-windows/include/unicode/rbtz.h
+x64-windows/include/unicode/regex.h
+x64-windows/include/unicode/region.h
+x64-windows/include/unicode/reldatefmt.h
+x64-windows/include/unicode/rep.h
+x64-windows/include/unicode/resbund.h
+x64-windows/include/unicode/schriter.h
+x64-windows/include/unicode/scientificnumberformatter.h
+x64-windows/include/unicode/search.h
+x64-windows/include/unicode/selfmt.h
+x64-windows/include/unicode/simpleformatter.h
+x64-windows/include/unicode/simpletz.h
+x64-windows/include/unicode/smpdtfmt.h
+x64-windows/include/unicode/sortkey.h
+x64-windows/include/unicode/std_string.h
+x64-windows/include/unicode/strenum.h
+x64-windows/include/unicode/stringoptions.h
+x64-windows/include/unicode/stringpiece.h
+x64-windows/include/unicode/stringtriebuilder.h
+x64-windows/include/unicode/stsearch.h
+x64-windows/include/unicode/symtable.h
+x64-windows/include/unicode/tblcoll.h
+x64-windows/include/unicode/timezone.h
+x64-windows/include/unicode/tmunit.h
+x64-windows/include/unicode/tmutamt.h
+x64-windows/include/unicode/tmutfmt.h
+x64-windows/include/unicode/translit.h
+x64-windows/include/unicode/tzfmt.h
+x64-windows/include/unicode/tznames.h
+x64-windows/include/unicode/tzrule.h
+x64-windows/include/unicode/tztrans.h
+x64-windows/include/unicode/ubidi.h
+x64-windows/include/unicode/ubiditransform.h
+x64-windows/include/unicode/ubrk.h
+x64-windows/include/unicode/ucal.h
+x64-windows/include/unicode/ucasemap.h
+x64-windows/include/unicode/ucat.h
+x64-windows/include/unicode/uchar.h
+x64-windows/include/unicode/ucharstrie.h
+x64-windows/include/unicode/ucharstriebuilder.h
+x64-windows/include/unicode/uchriter.h
+x64-windows/include/unicode/uclean.h
+x64-windows/include/unicode/ucnv.h
+x64-windows/include/unicode/ucnv_cb.h
+x64-windows/include/unicode/ucnv_err.h
+x64-windows/include/unicode/ucnvsel.h
+x64-windows/include/unicode/ucol.h
+x64-windows/include/unicode/ucoleitr.h
+x64-windows/include/unicode/uconfig.h
+x64-windows/include/unicode/ucsdet.h
+x64-windows/include/unicode/ucurr.h
+x64-windows/include/unicode/udat.h
+x64-windows/include/unicode/udata.h
+x64-windows/include/unicode/udateintervalformat.h
+x64-windows/include/unicode/udatpg.h
+x64-windows/include/unicode/udisplaycontext.h
+x64-windows/include/unicode/uenum.h
+x64-windows/include/unicode/ufieldpositer.h
+x64-windows/include/unicode/uformattable.h
+x64-windows/include/unicode/ugender.h
+x64-windows/include/unicode/uidna.h
+x64-windows/include/unicode/uiter.h
+x64-windows/include/unicode/uldnames.h
+x64-windows/include/unicode/ulistformatter.h
+x64-windows/include/unicode/uloc.h
+x64-windows/include/unicode/ulocdata.h
+x64-windows/include/unicode/umachine.h
+x64-windows/include/unicode/umisc.h
+x64-windows/include/unicode/umsg.h
+x64-windows/include/unicode/unifilt.h
+x64-windows/include/unicode/unifunct.h
+x64-windows/include/unicode/unimatch.h
+x64-windows/include/unicode/unirepl.h
+x64-windows/include/unicode/uniset.h
+x64-windows/include/unicode/unistr.h
+x64-windows/include/unicode/unorm.h
+x64-windows/include/unicode/unorm2.h
+x64-windows/include/unicode/unum.h
+x64-windows/include/unicode/unumsys.h
+x64-windows/include/unicode/uobject.h
+x64-windows/include/unicode/upluralrules.h
+x64-windows/include/unicode/uregex.h
+x64-windows/include/unicode/uregion.h
+x64-windows/include/unicode/ureldatefmt.h
+x64-windows/include/unicode/urename.h
+x64-windows/include/unicode/urep.h
+x64-windows/include/unicode/ures.h
+x64-windows/include/unicode/uscript.h
+x64-windows/include/unicode/usearch.h
+x64-windows/include/unicode/uset.h
+x64-windows/include/unicode/usetiter.h
+x64-windows/include/unicode/ushape.h
+x64-windows/include/unicode/uspoof.h
+x64-windows/include/unicode/usprep.h
+x64-windows/include/unicode/ustdio.h
+x64-windows/include/unicode/ustream.h
+x64-windows/include/unicode/ustring.h
+x64-windows/include/unicode/ustringtrie.h
+x64-windows/include/unicode/utext.h
+x64-windows/include/unicode/utf.h
+x64-windows/include/unicode/utf16.h
+x64-windows/include/unicode/utf32.h
+x64-windows/include/unicode/utf8.h
+x64-windows/include/unicode/utf_old.h
+x64-windows/include/unicode/utmscale.h
+x64-windows/include/unicode/utrace.h
+x64-windows/include/unicode/utrans.h
+x64-windows/include/unicode/utypes.h
+x64-windows/include/unicode/uvernum.h
+x64-windows/include/unicode/uversion.h
+x64-windows/include/unicode/vtzone.h
+x64-windows/lib/
+x64-windows/lib/icudt.lib
+x64-windows/lib/icuin.lib
+x64-windows/lib/icuio.lib
+x64-windows/lib/icutu.lib
+x64-windows/lib/icuuc.lib
+x64-windows/share/
+x64-windows/share/icu/
+x64-windows/share/icu/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,197 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/icudtd.lib
+x64-windows-static/debug/lib/icuind.lib
+x64-windows-static/debug/lib/icuiod.lib
+x64-windows-static/debug/lib/icutud.lib
+x64-windows-static/debug/lib/icuucd.lib
+x64-windows-static/include/
+x64-windows-static/include/unicode/
+x64-windows-static/include/unicode/alphaindex.h
+x64-windows-static/include/unicode/appendable.h
+x64-windows-static/include/unicode/basictz.h
+x64-windows-static/include/unicode/brkiter.h
+x64-windows-static/include/unicode/bytestream.h
+x64-windows-static/include/unicode/bytestrie.h
+x64-windows-static/include/unicode/bytestriebuilder.h
+x64-windows-static/include/unicode/calendar.h
+x64-windows-static/include/unicode/caniter.h
+x64-windows-static/include/unicode/casemap.h
+x64-windows-static/include/unicode/char16ptr.h
+x64-windows-static/include/unicode/chariter.h
+x64-windows-static/include/unicode/choicfmt.h
+x64-windows-static/include/unicode/coleitr.h
+x64-windows-static/include/unicode/coll.h
+x64-windows-static/include/unicode/compactdecimalformat.h
+x64-windows-static/include/unicode/curramt.h
+x64-windows-static/include/unicode/currpinf.h
+x64-windows-static/include/unicode/currunit.h
+x64-windows-static/include/unicode/datefmt.h
+x64-windows-static/include/unicode/dbbi.h
+x64-windows-static/include/unicode/dcfmtsym.h
+x64-windows-static/include/unicode/decimfmt.h
+x64-windows-static/include/unicode/docmain.h
+x64-windows-static/include/unicode/dtfmtsym.h
+x64-windows-static/include/unicode/dtintrv.h
+x64-windows-static/include/unicode/dtitvfmt.h
+x64-windows-static/include/unicode/dtitvinf.h
+x64-windows-static/include/unicode/dtptngen.h
+x64-windows-static/include/unicode/dtrule.h
+x64-windows-static/include/unicode/edits.h
+x64-windows-static/include/unicode/enumset.h
+x64-windows-static/include/unicode/errorcode.h
+x64-windows-static/include/unicode/fieldpos.h
+x64-windows-static/include/unicode/filteredbrk.h
+x64-windows-static/include/unicode/fmtable.h
+x64-windows-static/include/unicode/format.h
+x64-windows-static/include/unicode/fpositer.h
+x64-windows-static/include/unicode/gender.h
+x64-windows-static/include/unicode/gregocal.h
+x64-windows-static/include/unicode/icudataver.h
+x64-windows-static/include/unicode/icuplug.h
+x64-windows-static/include/unicode/idna.h
+x64-windows-static/include/unicode/listformatter.h
+x64-windows-static/include/unicode/localpointer.h
+x64-windows-static/include/unicode/locdspnm.h
+x64-windows-static/include/unicode/locid.h
+x64-windows-static/include/unicode/measfmt.h
+x64-windows-static/include/unicode/measunit.h
+x64-windows-static/include/unicode/measure.h
+x64-windows-static/include/unicode/messagepattern.h
+x64-windows-static/include/unicode/msgfmt.h
+x64-windows-static/include/unicode/normalizer2.h
+x64-windows-static/include/unicode/normlzr.h
+x64-windows-static/include/unicode/nounit.h
+x64-windows-static/include/unicode/numberformatter.h
+x64-windows-static/include/unicode/numfmt.h
+x64-windows-static/include/unicode/numsys.h
+x64-windows-static/include/unicode/parseerr.h
+x64-windows-static/include/unicode/parsepos.h
+x64-windows-static/include/unicode/platform.h
+x64-windows-static/include/unicode/plurfmt.h
+x64-windows-static/include/unicode/plurrule.h
+x64-windows-static/include/unicode/ptypes.h
+x64-windows-static/include/unicode/putil.h
+x64-windows-static/include/unicode/rbbi.h
+x64-windows-static/include/unicode/rbnf.h
+x64-windows-static/include/unicode/rbtz.h
+x64-windows-static/include/unicode/regex.h
+x64-windows-static/include/unicode/region.h
+x64-windows-static/include/unicode/reldatefmt.h
+x64-windows-static/include/unicode/rep.h
+x64-windows-static/include/unicode/resbund.h
+x64-windows-static/include/unicode/schriter.h
+x64-windows-static/include/unicode/scientificnumberformatter.h
+x64-windows-static/include/unicode/search.h
+x64-windows-static/include/unicode/selfmt.h
+x64-windows-static/include/unicode/simpleformatter.h
+x64-windows-static/include/unicode/simpletz.h
+x64-windows-static/include/unicode/smpdtfmt.h
+x64-windows-static/include/unicode/sortkey.h
+x64-windows-static/include/unicode/std_string.h
+x64-windows-static/include/unicode/strenum.h
+x64-windows-static/include/unicode/stringoptions.h
+x64-windows-static/include/unicode/stringpiece.h
+x64-windows-static/include/unicode/stringtriebuilder.h
+x64-windows-static/include/unicode/stsearch.h
+x64-windows-static/include/unicode/symtable.h
+x64-windows-static/include/unicode/tblcoll.h
+x64-windows-static/include/unicode/timezone.h
+x64-windows-static/include/unicode/tmunit.h
+x64-windows-static/include/unicode/tmutamt.h
+x64-windows-static/include/unicode/tmutfmt.h
+x64-windows-static/include/unicode/translit.h
+x64-windows-static/include/unicode/tzfmt.h
+x64-windows-static/include/unicode/tznames.h
+x64-windows-static/include/unicode/tzrule.h
+x64-windows-static/include/unicode/tztrans.h
+x64-windows-static/include/unicode/ubidi.h
+x64-windows-static/include/unicode/ubiditransform.h
+x64-windows-static/include/unicode/ubrk.h
+x64-windows-static/include/unicode/ucal.h
+x64-windows-static/include/unicode/ucasemap.h
+x64-windows-static/include/unicode/ucat.h
+x64-windows-static/include/unicode/uchar.h
+x64-windows-static/include/unicode/ucharstrie.h
+x64-windows-static/include/unicode/ucharstriebuilder.h
+x64-windows-static/include/unicode/uchriter.h
+x64-windows-static/include/unicode/uclean.h
+x64-windows-static/include/unicode/ucnv.h
+x64-windows-static/include/unicode/ucnv_cb.h
+x64-windows-static/include/unicode/ucnv_err.h
+x64-windows-static/include/unicode/ucnvsel.h
+x64-windows-static/include/unicode/ucol.h
+x64-windows-static/include/unicode/ucoleitr.h
+x64-windows-static/include/unicode/uconfig.h
+x64-windows-static/include/unicode/ucsdet.h
+x64-windows-static/include/unicode/ucurr.h
+x64-windows-static/include/unicode/udat.h
+x64-windows-static/include/unicode/udata.h
+x64-windows-static/include/unicode/udateintervalformat.h
+x64-windows-static/include/unicode/udatpg.h
+x64-windows-static/include/unicode/udisplaycontext.h
+x64-windows-static/include/unicode/uenum.h
+x64-windows-static/include/unicode/ufieldpositer.h
+x64-windows-static/include/unicode/uformattable.h
+x64-windows-static/include/unicode/ugender.h
+x64-windows-static/include/unicode/uidna.h
+x64-windows-static/include/unicode/uiter.h
+x64-windows-static/include/unicode/uldnames.h
+x64-windows-static/include/unicode/ulistformatter.h
+x64-windows-static/include/unicode/uloc.h
+x64-windows-static/include/unicode/ulocdata.h
+x64-windows-static/include/unicode/umachine.h
+x64-windows-static/include/unicode/umisc.h
+x64-windows-static/include/unicode/umsg.h
+x64-windows-static/include/unicode/unifilt.h
+x64-windows-static/include/unicode/unifunct.h
+x64-windows-static/include/unicode/unimatch.h
+x64-windows-static/include/unicode/unirepl.h
+x64-windows-static/include/unicode/uniset.h
+x64-windows-static/include/unicode/unistr.h
+x64-windows-static/include/unicode/unorm.h
+x64-windows-static/include/unicode/unorm2.h
+x64-windows-static/include/unicode/unum.h
+x64-windows-static/include/unicode/unumsys.h
+x64-windows-static/include/unicode/uobject.h
+x64-windows-static/include/unicode/upluralrules.h
+x64-windows-static/include/unicode/uregex.h
+x64-windows-static/include/unicode/uregion.h
+x64-windows-static/include/unicode/ureldatefmt.h
+x64-windows-static/include/unicode/urename.h
+x64-windows-static/include/unicode/urep.h
+x64-windows-static/include/unicode/ures.h
+x64-windows-static/include/unicode/uscript.h
+x64-windows-static/include/unicode/usearch.h
+x64-windows-static/include/unicode/uset.h
+x64-windows-static/include/unicode/usetiter.h
+x64-windows-static/include/unicode/ushape.h
+x64-windows-static/include/unicode/uspoof.h
+x64-windows-static/include/unicode/usprep.h
+x64-windows-static/include/unicode/ustdio.h
+x64-windows-static/include/unicode/ustream.h
+x64-windows-static/include/unicode/ustring.h
+x64-windows-static/include/unicode/ustringtrie.h
+x64-windows-static/include/unicode/utext.h
+x64-windows-static/include/unicode/utf.h
+x64-windows-static/include/unicode/utf16.h
+x64-windows-static/include/unicode/utf32.h
+x64-windows-static/include/unicode/utf8.h
+x64-windows-static/include/unicode/utf_old.h
+x64-windows-static/include/unicode/utmscale.h
+x64-windows-static/include/unicode/utrace.h
+x64-windows-static/include/unicode/utrans.h
+x64-windows-static/include/unicode/utypes.h
+x64-windows-static/include/unicode/uvernum.h
+x64-windows-static/include/unicode/uversion.h
+x64-windows-static/include/unicode/vtzone.h
+x64-windows-static/lib/
+x64-windows-static/lib/icudt.lib
+x64-windows-static/lib/icuin.lib
+x64-windows-static/lib/icuio.lib
+x64-windows-static/lib/icutu.lib
+x64-windows-static/lib/icuuc.lib
+x64-windows-static/share/
+x64-windows-static/share/icu/
+x64-windows-static/share/icu/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x86-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x86-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x86-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-1_x86-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,217 @@
+x86-windows/
+x86-windows/bin/
+x86-windows/bin/icudt61.dll
+x86-windows/bin/icuin61.dll
+x86-windows/bin/icuin61.pdb
+x86-windows/bin/icuio61.dll
+x86-windows/bin/icuio61.pdb
+x86-windows/bin/icutu61.dll
+x86-windows/bin/icutu61.pdb
+x86-windows/bin/icuuc61.dll
+x86-windows/bin/icuuc61.pdb
+x86-windows/debug/
+x86-windows/debug/bin/
+x86-windows/debug/bin/icudtd61.dll
+x86-windows/debug/bin/icuind61.dll
+x86-windows/debug/bin/icuind61.pdb
+x86-windows/debug/bin/icuiod61.dll
+x86-windows/debug/bin/icuiod61.pdb
+x86-windows/debug/bin/icutud61.dll
+x86-windows/debug/bin/icutud61.pdb
+x86-windows/debug/bin/icuucd61.dll
+x86-windows/debug/bin/icuucd61.pdb
+x86-windows/debug/lib/
+x86-windows/debug/lib/icudtd.lib
+x86-windows/debug/lib/icuind.lib
+x86-windows/debug/lib/icuiod.lib
+x86-windows/debug/lib/icutud.lib
+x86-windows/debug/lib/icuucd.lib
+x86-windows/include/
+x86-windows/include/unicode/
+x86-windows/include/unicode/alphaindex.h
+x86-windows/include/unicode/appendable.h
+x86-windows/include/unicode/basictz.h
+x86-windows/include/unicode/brkiter.h
+x86-windows/include/unicode/bytestream.h
+x86-windows/include/unicode/bytestrie.h
+x86-windows/include/unicode/bytestriebuilder.h
+x86-windows/include/unicode/calendar.h
+x86-windows/include/unicode/caniter.h
+x86-windows/include/unicode/casemap.h
+x86-windows/include/unicode/char16ptr.h
+x86-windows/include/unicode/chariter.h
+x86-windows/include/unicode/choicfmt.h
+x86-windows/include/unicode/coleitr.h
+x86-windows/include/unicode/coll.h
+x86-windows/include/unicode/compactdecimalformat.h
+x86-windows/include/unicode/curramt.h
+x86-windows/include/unicode/currpinf.h
+x86-windows/include/unicode/currunit.h
+x86-windows/include/unicode/datefmt.h
+x86-windows/include/unicode/dbbi.h
+x86-windows/include/unicode/dcfmtsym.h
+x86-windows/include/unicode/decimfmt.h
+x86-windows/include/unicode/docmain.h
+x86-windows/include/unicode/dtfmtsym.h
+x86-windows/include/unicode/dtintrv.h
+x86-windows/include/unicode/dtitvfmt.h
+x86-windows/include/unicode/dtitvinf.h
+x86-windows/include/unicode/dtptngen.h
+x86-windows/include/unicode/dtrule.h
+x86-windows/include/unicode/edits.h
+x86-windows/include/unicode/enumset.h
+x86-windows/include/unicode/errorcode.h
+x86-windows/include/unicode/fieldpos.h
+x86-windows/include/unicode/filteredbrk.h
+x86-windows/include/unicode/fmtable.h
+x86-windows/include/unicode/format.h
+x86-windows/include/unicode/fpositer.h
+x86-windows/include/unicode/gender.h
+x86-windows/include/unicode/gregocal.h
+x86-windows/include/unicode/icudataver.h
+x86-windows/include/unicode/icuplug.h
+x86-windows/include/unicode/idna.h
+x86-windows/include/unicode/listformatter.h
+x86-windows/include/unicode/localpointer.h
+x86-windows/include/unicode/locdspnm.h
+x86-windows/include/unicode/locid.h
+x86-windows/include/unicode/measfmt.h
+x86-windows/include/unicode/measunit.h
+x86-windows/include/unicode/measure.h
+x86-windows/include/unicode/messagepattern.h
+x86-windows/include/unicode/msgfmt.h
+x86-windows/include/unicode/normalizer2.h
+x86-windows/include/unicode/normlzr.h
+x86-windows/include/unicode/nounit.h
+x86-windows/include/unicode/numberformatter.h
+x86-windows/include/unicode/numfmt.h
+x86-windows/include/unicode/numsys.h
+x86-windows/include/unicode/parseerr.h
+x86-windows/include/unicode/parsepos.h
+x86-windows/include/unicode/platform.h
+x86-windows/include/unicode/plurfmt.h
+x86-windows/include/unicode/plurrule.h
+x86-windows/include/unicode/ptypes.h
+x86-windows/include/unicode/putil.h
+x86-windows/include/unicode/rbbi.h
+x86-windows/include/unicode/rbnf.h
+x86-windows/include/unicode/rbtz.h
+x86-windows/include/unicode/regex.h
+x86-windows/include/unicode/region.h
+x86-windows/include/unicode/reldatefmt.h
+x86-windows/include/unicode/rep.h
+x86-windows/include/unicode/resbund.h
+x86-windows/include/unicode/schriter.h
+x86-windows/include/unicode/scientificnumberformatter.h
+x86-windows/include/unicode/search.h
+x86-windows/include/unicode/selfmt.h
+x86-windows/include/unicode/simpleformatter.h
+x86-windows/include/unicode/simpletz.h
+x86-windows/include/unicode/smpdtfmt.h
+x86-windows/include/unicode/sortkey.h
+x86-windows/include/unicode/std_string.h
+x86-windows/include/unicode/strenum.h
+x86-windows/include/unicode/stringoptions.h
+x86-windows/include/unicode/stringpiece.h
+x86-windows/include/unicode/stringtriebuilder.h
+x86-windows/include/unicode/stsearch.h
+x86-windows/include/unicode/symtable.h
+x86-windows/include/unicode/tblcoll.h
+x86-windows/include/unicode/timezone.h
+x86-windows/include/unicode/tmunit.h
+x86-windows/include/unicode/tmutamt.h
+x86-windows/include/unicode/tmutfmt.h
+x86-windows/include/unicode/translit.h
+x86-windows/include/unicode/tzfmt.h
+x86-windows/include/unicode/tznames.h
+x86-windows/include/unicode/tzrule.h
+x86-windows/include/unicode/tztrans.h
+x86-windows/include/unicode/ubidi.h
+x86-windows/include/unicode/ubiditransform.h
+x86-windows/include/unicode/ubrk.h
+x86-windows/include/unicode/ucal.h
+x86-windows/include/unicode/ucasemap.h
+x86-windows/include/unicode/ucat.h
+x86-windows/include/unicode/uchar.h
+x86-windows/include/unicode/ucharstrie.h
+x86-windows/include/unicode/ucharstriebuilder.h
+x86-windows/include/unicode/uchriter.h
+x86-windows/include/unicode/uclean.h
+x86-windows/include/unicode/ucnv.h
+x86-windows/include/unicode/ucnv_cb.h
+x86-windows/include/unicode/ucnv_err.h
+x86-windows/include/unicode/ucnvsel.h
+x86-windows/include/unicode/ucol.h
+x86-windows/include/unicode/ucoleitr.h
+x86-windows/include/unicode/uconfig.h
+x86-windows/include/unicode/ucsdet.h
+x86-windows/include/unicode/ucurr.h
+x86-windows/include/unicode/udat.h
+x86-windows/include/unicode/udata.h
+x86-windows/include/unicode/udateintervalformat.h
+x86-windows/include/unicode/udatpg.h
+x86-windows/include/unicode/udisplaycontext.h
+x86-windows/include/unicode/uenum.h
+x86-windows/include/unicode/ufieldpositer.h
+x86-windows/include/unicode/uformattable.h
+x86-windows/include/unicode/ugender.h
+x86-windows/include/unicode/uidna.h
+x86-windows/include/unicode/uiter.h
+x86-windows/include/unicode/uldnames.h
+x86-windows/include/unicode/ulistformatter.h
+x86-windows/include/unicode/uloc.h
+x86-windows/include/unicode/ulocdata.h
+x86-windows/include/unicode/umachine.h
+x86-windows/include/unicode/umisc.h
+x86-windows/include/unicode/umsg.h
+x86-windows/include/unicode/unifilt.h
+x86-windows/include/unicode/unifunct.h
+x86-windows/include/unicode/unimatch.h
+x86-windows/include/unicode/unirepl.h
+x86-windows/include/unicode/uniset.h
+x86-windows/include/unicode/unistr.h
+x86-windows/include/unicode/unorm.h
+x86-windows/include/unicode/unorm2.h
+x86-windows/include/unicode/unum.h
+x86-windows/include/unicode/unumsys.h
+x86-windows/include/unicode/uobject.h
+x86-windows/include/unicode/upluralrules.h
+x86-windows/include/unicode/uregex.h
+x86-windows/include/unicode/uregion.h
+x86-windows/include/unicode/ureldatefmt.h
+x86-windows/include/unicode/urename.h
+x86-windows/include/unicode/urep.h
+x86-windows/include/unicode/ures.h
+x86-windows/include/unicode/uscript.h
+x86-windows/include/unicode/usearch.h
+x86-windows/include/unicode/uset.h
+x86-windows/include/unicode/usetiter.h
+x86-windows/include/unicode/ushape.h
+x86-windows/include/unicode/uspoof.h
+x86-windows/include/unicode/usprep.h
+x86-windows/include/unicode/ustdio.h
+x86-windows/include/unicode/ustream.h
+x86-windows/include/unicode/ustring.h
+x86-windows/include/unicode/ustringtrie.h
+x86-windows/include/unicode/utext.h
+x86-windows/include/unicode/utf.h
+x86-windows/include/unicode/utf16.h
+x86-windows/include/unicode/utf32.h
+x86-windows/include/unicode/utf8.h
+x86-windows/include/unicode/utf_old.h
+x86-windows/include/unicode/utmscale.h
+x86-windows/include/unicode/utrace.h
+x86-windows/include/unicode/utrans.h
+x86-windows/include/unicode/utypes.h
+x86-windows/include/unicode/uvernum.h
+x86-windows/include/unicode/uversion.h
+x86-windows/include/unicode/vtzone.h
+x86-windows/lib/
+x86-windows/lib/icudt.lib
+x86-windows/lib/icuin.lib
+x86-windows/lib/icuio.lib
+x86-windows/lib/icutu.lib
+x86-windows/lib/icuuc.lib
+x86-windows/share/
+x86-windows/share/icu/
+x86-windows/share/icu/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-2_x64-osx.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-2_x64-osx.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-2_x64-osx.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/icu_61.1-2_x64-osx.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,216 @@
+x64-osx/
+x64-osx/debug/
+x64-osx/debug/lib/
+x64-osx/debug/lib/icu/
+x64-osx/debug/lib/icu/61.1/
+x64-osx/debug/lib/icu/61.1/Makefile.inc
+x64-osx/debug/lib/icu/61.1/pkgdata.inc
+x64-osx/debug/lib/icu/Makefile.inc
+x64-osx/debug/lib/icu/current/
+x64-osx/debug/lib/icu/pkgdata.inc
+x64-osx/debug/lib/libicudata.a
+x64-osx/debug/lib/libicui18n.a
+x64-osx/debug/lib/libicuio.a
+x64-osx/debug/lib/libicutu.a
+x64-osx/debug/lib/libicuuc.a
+x64-osx/debug/sbin/
+x64-osx/debug/sbin/genccode
+x64-osx/debug/sbin/gencmn
+x64-osx/debug/sbin/gennorm2
+x64-osx/debug/sbin/gensprep
+x64-osx/debug/sbin/icupkg
+x64-osx/include/
+x64-osx/include/unicode/
+x64-osx/include/unicode/alphaindex.h
+x64-osx/include/unicode/appendable.h
+x64-osx/include/unicode/basictz.h
+x64-osx/include/unicode/brkiter.h
+x64-osx/include/unicode/bytestream.h
+x64-osx/include/unicode/bytestrie.h
+x64-osx/include/unicode/bytestriebuilder.h
+x64-osx/include/unicode/calendar.h
+x64-osx/include/unicode/caniter.h
+x64-osx/include/unicode/casemap.h
+x64-osx/include/unicode/char16ptr.h
+x64-osx/include/unicode/chariter.h
+x64-osx/include/unicode/choicfmt.h
+x64-osx/include/unicode/coleitr.h
+x64-osx/include/unicode/coll.h
+x64-osx/include/unicode/compactdecimalformat.h
+x64-osx/include/unicode/curramt.h
+x64-osx/include/unicode/currpinf.h
+x64-osx/include/unicode/currunit.h
+x64-osx/include/unicode/datefmt.h
+x64-osx/include/unicode/dbbi.h
+x64-osx/include/unicode/dcfmtsym.h
+x64-osx/include/unicode/decimfmt.h
+x64-osx/include/unicode/docmain.h
+x64-osx/include/unicode/dtfmtsym.h
+x64-osx/include/unicode/dtintrv.h
+x64-osx/include/unicode/dtitvfmt.h
+x64-osx/include/unicode/dtitvinf.h
+x64-osx/include/unicode/dtptngen.h
+x64-osx/include/unicode/dtrule.h
+x64-osx/include/unicode/edits.h
+x64-osx/include/unicode/enumset.h
+x64-osx/include/unicode/errorcode.h
+x64-osx/include/unicode/fieldpos.h
+x64-osx/include/unicode/filteredbrk.h
+x64-osx/include/unicode/fmtable.h
+x64-osx/include/unicode/format.h
+x64-osx/include/unicode/fpositer.h
+x64-osx/include/unicode/gender.h
+x64-osx/include/unicode/gregocal.h
+x64-osx/include/unicode/icudataver.h
+x64-osx/include/unicode/icuplug.h
+x64-osx/include/unicode/idna.h
+x64-osx/include/unicode/listformatter.h
+x64-osx/include/unicode/localpointer.h
+x64-osx/include/unicode/locdspnm.h
+x64-osx/include/unicode/locid.h
+x64-osx/include/unicode/measfmt.h
+x64-osx/include/unicode/measunit.h
+x64-osx/include/unicode/measure.h
+x64-osx/include/unicode/messagepattern.h
+x64-osx/include/unicode/msgfmt.h
+x64-osx/include/unicode/normalizer2.h
+x64-osx/include/unicode/normlzr.h
+x64-osx/include/unicode/nounit.h
+x64-osx/include/unicode/numberformatter.h
+x64-osx/include/unicode/numfmt.h
+x64-osx/include/unicode/numsys.h
+x64-osx/include/unicode/parseerr.h
+x64-osx/include/unicode/parsepos.h
+x64-osx/include/unicode/platform.h
+x64-osx/include/unicode/plurfmt.h
+x64-osx/include/unicode/plurrule.h
+x64-osx/include/unicode/ptypes.h
+x64-osx/include/unicode/putil.h
+x64-osx/include/unicode/rbbi.h
+x64-osx/include/unicode/rbnf.h
+x64-osx/include/unicode/rbtz.h
+x64-osx/include/unicode/regex.h
+x64-osx/include/unicode/region.h
+x64-osx/include/unicode/reldatefmt.h
+x64-osx/include/unicode/rep.h
+x64-osx/include/unicode/resbund.h
+x64-osx/include/unicode/schriter.h
+x64-osx/include/unicode/scientificnumberformatter.h
+x64-osx/include/unicode/search.h
+x64-osx/include/unicode/selfmt.h
+x64-osx/include/unicode/simpleformatter.h
+x64-osx/include/unicode/simpletz.h
+x64-osx/include/unicode/smpdtfmt.h
+x64-osx/include/unicode/sortkey.h
+x64-osx/include/unicode/std_string.h
+x64-osx/include/unicode/strenum.h
+x64-osx/include/unicode/stringoptions.h
+x64-osx/include/unicode/stringpiece.h
+x64-osx/include/unicode/stringtriebuilder.h
+x64-osx/include/unicode/stsearch.h
+x64-osx/include/unicode/symtable.h
+x64-osx/include/unicode/tblcoll.h
+x64-osx/include/unicode/timezone.h
+x64-osx/include/unicode/tmunit.h
+x64-osx/include/unicode/tmutamt.h
+x64-osx/include/unicode/tmutfmt.h
+x64-osx/include/unicode/translit.h
+x64-osx/include/unicode/tzfmt.h
+x64-osx/include/unicode/tznames.h
+x64-osx/include/unicode/tzrule.h
+x64-osx/include/unicode/tztrans.h
+x64-osx/include/unicode/ubidi.h
+x64-osx/include/unicode/ubiditransform.h
+x64-osx/include/unicode/ubrk.h
+x64-osx/include/unicode/ucal.h
+x64-osx/include/unicode/ucasemap.h
+x64-osx/include/unicode/ucat.h
+x64-osx/include/unicode/uchar.h
+x64-osx/include/unicode/ucharstrie.h
+x64-osx/include/unicode/ucharstriebuilder.h
+x64-osx/include/unicode/uchriter.h
+x64-osx/include/unicode/uclean.h
+x64-osx/include/unicode/ucnv.h
+x64-osx/include/unicode/ucnv_cb.h
+x64-osx/include/unicode/ucnv_err.h
+x64-osx/include/unicode/ucnvsel.h
+x64-osx/include/unicode/ucol.h
+x64-osx/include/unicode/ucoleitr.h
+x64-osx/include/unicode/uconfig.h
+x64-osx/include/unicode/ucsdet.h
+x64-osx/include/unicode/ucurr.h
+x64-osx/include/unicode/udat.h
+x64-osx/include/unicode/udata.h
+x64-osx/include/unicode/udateintervalformat.h
+x64-osx/include/unicode/udatpg.h
+x64-osx/include/unicode/udisplaycontext.h
+x64-osx/include/unicode/uenum.h
+x64-osx/include/unicode/ufieldpositer.h
+x64-osx/include/unicode/uformattable.h
+x64-osx/include/unicode/ugender.h
+x64-osx/include/unicode/uidna.h
+x64-osx/include/unicode/uiter.h
+x64-osx/include/unicode/uldnames.h
+x64-osx/include/unicode/ulistformatter.h
+x64-osx/include/unicode/uloc.h
+x64-osx/include/unicode/ulocdata.h
+x64-osx/include/unicode/umachine.h
+x64-osx/include/unicode/umisc.h
+x64-osx/include/unicode/umsg.h
+x64-osx/include/unicode/unifilt.h
+x64-osx/include/unicode/unifunct.h
+x64-osx/include/unicode/unimatch.h
+x64-osx/include/unicode/unirepl.h
+x64-osx/include/unicode/uniset.h
+x64-osx/include/unicode/unistr.h
+x64-osx/include/unicode/unorm.h
+x64-osx/include/unicode/unorm2.h
+x64-osx/include/unicode/unum.h
+x64-osx/include/unicode/unumsys.h
+x64-osx/include/unicode/uobject.h
+x64-osx/include/unicode/upluralrules.h
+x64-osx/include/unicode/uregex.h
+x64-osx/include/unicode/uregion.h
+x64-osx/include/unicode/ureldatefmt.h
+x64-osx/include/unicode/urename.h
+x64-osx/include/unicode/urep.h
+x64-osx/include/unicode/ures.h
+x64-osx/include/unicode/uscript.h
+x64-osx/include/unicode/usearch.h
+x64-osx/include/unicode/uset.h
+x64-osx/include/unicode/usetiter.h
+x64-osx/include/unicode/ushape.h
+x64-osx/include/unicode/uspoof.h
+x64-osx/include/unicode/usprep.h
+x64-osx/include/unicode/ustdio.h
+x64-osx/include/unicode/ustream.h
+x64-osx/include/unicode/ustring.h
+x64-osx/include/unicode/ustringtrie.h
+x64-osx/include/unicode/utext.h
+x64-osx/include/unicode/utf.h
+x64-osx/include/unicode/utf16.h
+x64-osx/include/unicode/utf32.h
+x64-osx/include/unicode/utf8.h
+x64-osx/include/unicode/utf_old.h
+x64-osx/include/unicode/utmscale.h
+x64-osx/include/unicode/utrace.h
+x64-osx/include/unicode/utrans.h
+x64-osx/include/unicode/utypes.h
+x64-osx/include/unicode/uvernum.h
+x64-osx/include/unicode/uversion.h
+x64-osx/include/unicode/vtzone.h
+x64-osx/lib/
+x64-osx/lib/libicudata.a
+x64-osx/lib/libicui18n.a
+x64-osx/lib/libicuio.a
+x64-osx/lib/libicutu.a
+x64-osx/lib/libicuuc.a
+x64-osx/sbin/
+x64-osx/sbin/genccode
+x64-osx/sbin/gencmn
+x64-osx/sbin/gennorm2
+x64-osx/sbin/gensprep
+x64-osx/sbin/icupkg
+x64-osx/share/
+x64-osx/share/icu/
+x64-osx/share/icu/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+x64-windows/
+x64-windows/debug/
+x64-windows/debug/lib/
+x64-windows/debug/lib/event.lib
+x64-windows/debug/lib/event_core.lib
+x64-windows/debug/lib/event_extra.lib
+x64-windows/include/
+x64-windows/include/evdns.h
+x64-windows/include/event.h
+x64-windows/include/event2/
+x64-windows/include/event2/buffer.h
+x64-windows/include/event2/buffer_compat.h
+x64-windows/include/event2/bufferevent.h
+x64-windows/include/event2/bufferevent_compat.h
+x64-windows/include/event2/bufferevent_ssl.h
+x64-windows/include/event2/bufferevent_struct.h
+x64-windows/include/event2/dns.h
+x64-windows/include/event2/dns_compat.h
+x64-windows/include/event2/dns_struct.h
+x64-windows/include/event2/event-config.h
+x64-windows/include/event2/event.h
+x64-windows/include/event2/event_compat.h
+x64-windows/include/event2/event_struct.h
+x64-windows/include/event2/http.h
+x64-windows/include/event2/http_compat.h
+x64-windows/include/event2/http_struct.h
+x64-windows/include/event2/keyvalq_struct.h
+x64-windows/include/event2/listener.h
+x64-windows/include/event2/rpc.h
+x64-windows/include/event2/rpc_compat.h
+x64-windows/include/event2/rpc_struct.h
+x64-windows/include/event2/tag.h
+x64-windows/include/event2/tag_compat.h
+x64-windows/include/event2/thread.h
+x64-windows/include/event2/util.h
+x64-windows/include/event2/visibility.h
+x64-windows/include/evhttp.h
+x64-windows/include/evrpc.h
+x64-windows/include/evutil.h
+x64-windows/lib/
+x64-windows/lib/event.lib
+x64-windows/lib/event_core.lib
+x64-windows/lib/event_extra.lib
+x64-windows/share/
+x64-windows/share/libevent/
+x64-windows/share/libevent/LibeventConfig.cmake
+x64-windows/share/libevent/LibeventConfigVersion.cmake
+x64-windows/share/libevent/LibeventTargets-debug.cmake
+x64-windows/share/libevent/LibeventTargets-release.cmake
+x64-windows/share/libevent/LibeventTargets.cmake
+x64-windows/share/libevent/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libevent_2.1.8-3_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/event.lib
+x64-windows-static/debug/lib/event_core.lib
+x64-windows-static/debug/lib/event_extra.lib
+x64-windows-static/include/
+x64-windows-static/include/evdns.h
+x64-windows-static/include/event.h
+x64-windows-static/include/event2/
+x64-windows-static/include/event2/buffer.h
+x64-windows-static/include/event2/buffer_compat.h
+x64-windows-static/include/event2/bufferevent.h
+x64-windows-static/include/event2/bufferevent_compat.h
+x64-windows-static/include/event2/bufferevent_ssl.h
+x64-windows-static/include/event2/bufferevent_struct.h
+x64-windows-static/include/event2/dns.h
+x64-windows-static/include/event2/dns_compat.h
+x64-windows-static/include/event2/dns_struct.h
+x64-windows-static/include/event2/event-config.h
+x64-windows-static/include/event2/event.h
+x64-windows-static/include/event2/event_compat.h
+x64-windows-static/include/event2/event_struct.h
+x64-windows-static/include/event2/http.h
+x64-windows-static/include/event2/http_compat.h
+x64-windows-static/include/event2/http_struct.h
+x64-windows-static/include/event2/keyvalq_struct.h
+x64-windows-static/include/event2/listener.h
+x64-windows-static/include/event2/rpc.h
+x64-windows-static/include/event2/rpc_compat.h
+x64-windows-static/include/event2/rpc_struct.h
+x64-windows-static/include/event2/tag.h
+x64-windows-static/include/event2/tag_compat.h
+x64-windows-static/include/event2/thread.h
+x64-windows-static/include/event2/util.h
+x64-windows-static/include/event2/visibility.h
+x64-windows-static/include/evhttp.h
+x64-windows-static/include/evrpc.h
+x64-windows-static/include/evutil.h
+x64-windows-static/lib/
+x64-windows-static/lib/event.lib
+x64-windows-static/lib/event_core.lib
+x64-windows-static/lib/event_extra.lib
+x64-windows-static/share/
+x64-windows-static/share/libevent/
+x64-windows-static/share/libevent/LibeventConfig.cmake
+x64-windows-static/share/libevent/LibeventConfigVersion.cmake
+x64-windows-static/share/libevent/LibeventTargets-debug.cmake
+x64-windows-static/share/libevent/LibeventTargets-release.cmake
+x64-windows-static/share/libevent/LibeventTargets.cmake
+x64-windows-static/share/libevent/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/lzma.dll
+x64-windows/bin/lzma.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/lzma.dll
+x64-windows/debug/bin/lzma.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/lzma.lib
+x64-windows/include/
+x64-windows/include/lzma.h
+x64-windows/include/lzma/
+x64-windows/include/lzma/base.h
+x64-windows/include/lzma/bcj.h
+x64-windows/include/lzma/block.h
+x64-windows/include/lzma/check.h
+x64-windows/include/lzma/container.h
+x64-windows/include/lzma/delta.h
+x64-windows/include/lzma/filter.h
+x64-windows/include/lzma/hardware.h
+x64-windows/include/lzma/index.h
+x64-windows/include/lzma/index_hash.h
+x64-windows/include/lzma/lzma12.h
+x64-windows/include/lzma/stream_flags.h
+x64-windows/include/lzma/version.h
+x64-windows/include/lzma/vli.h
+x64-windows/lib/
+x64-windows/lib/lzma.lib
+x64-windows/share/
+x64-windows/share/liblzma/
+x64-windows/share/liblzma/copyright
+x64-windows/share/liblzma/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/lzma.lib
+x64-windows-static/include/
+x64-windows-static/include/lzma.h
+x64-windows-static/include/lzma/
+x64-windows-static/include/lzma/base.h
+x64-windows-static/include/lzma/bcj.h
+x64-windows-static/include/lzma/block.h
+x64-windows-static/include/lzma/check.h
+x64-windows-static/include/lzma/container.h
+x64-windows-static/include/lzma/delta.h
+x64-windows-static/include/lzma/filter.h
+x64-windows-static/include/lzma/hardware.h
+x64-windows-static/include/lzma/index.h
+x64-windows-static/include/lzma/index_hash.h
+x64-windows-static/include/lzma/lzma12.h
+x64-windows-static/include/lzma/stream_flags.h
+x64-windows-static/include/lzma/version.h
+x64-windows-static/include/lzma/vli.h
+x64-windows-static/lib/
+x64-windows-static/lib/lzma.lib
+x64-windows-static/share/
+x64-windows-static/share/liblzma/
+x64-windows-static/share/liblzma/copyright
+x64-windows-static/share/liblzma/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/libmysql.dll
+x64-windows/bin/libmysql.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/libmysql.dll
+x64-windows/debug/bin/libmysql.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/libmysql.lib
+x64-windows/include/
+x64-windows/include/mysql/
+x64-windows/include/mysql/binary_log_types.h
+x64-windows/include/mysql/errmsg.h
+x64-windows/include/mysql/mem_root_fwd.h
+x64-windows/include/mysql/my_command.h
+x64-windows/include/mysql/my_list.h
+x64-windows/include/mysql/mysql.h
+x64-windows/include/mysql/mysql/
+x64-windows/include/mysql/mysql/client_plugin.h
+x64-windows/include/mysql/mysql/plugin_auth_common.h
+x64-windows/include/mysql/mysql/udf_registration_types.h
+x64-windows/include/mysql/mysql_com.h
+x64-windows/include/mysql/mysql_time.h
+x64-windows/include/mysql/mysql_version.h
+x64-windows/include/mysql/mysqld_error.h
+x64-windows/lib/
+x64-windows/lib/libmysql.lib
+x64-windows/share/
+x64-windows/share/libmysql/
+x64-windows/share/libmysql/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/mysqlclient.lib
+x64-windows-static/include/
+x64-windows-static/include/mysql/
+x64-windows-static/include/mysql/binary_log_types.h
+x64-windows-static/include/mysql/errmsg.h
+x64-windows-static/include/mysql/mem_root_fwd.h
+x64-windows-static/include/mysql/my_command.h
+x64-windows-static/include/mysql/my_list.h
+x64-windows-static/include/mysql/mysql.h
+x64-windows-static/include/mysql/mysql/
+x64-windows-static/include/mysql/mysql/client_plugin.h
+x64-windows-static/include/mysql/mysql/plugin_auth_common.h
+x64-windows-static/include/mysql/mysql/udf_registration_types.h
+x64-windows-static/include/mysql/mysql_com.h
+x64-windows-static/include/mysql/mysql_time.h
+x64-windows-static/include/mysql/mysql_version.h
+x64-windows-static/include/mysql/mysqld_error.h
+x64-windows-static/lib/
+x64-windows-static/lib/mysqlclient.lib
+x64-windows-static/share/
+x64-windows-static/share/libmysql/
+x64-windows-static/share/libmysql/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_arm64-ios.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_arm64-ios.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_arm64-ios.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_arm64-ios.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+arm64-ios/
+arm64-ios/debug/
+arm64-ios/debug/lib/
+arm64-ios/debug/lib/libpng16d.a
+arm64-ios/include/
+arm64-ios/include/libpng16/
+arm64-ios/include/libpng16/png.h
+arm64-ios/include/libpng16/pngconf.h
+arm64-ios/include/libpng16/pnglibconf.h
+arm64-ios/include/png.h
+arm64-ios/include/pngconf.h
+arm64-ios/include/pnglibconf.h
+arm64-ios/lib/
+arm64-ios/lib/libpng16.a
+arm64-ios/share/
+arm64-ios/share/libpng/
+arm64-ios/share/libpng/copyright
+arm64-ios/share/libpng/usage
+arm64-ios/share/png/
+arm64-ios/share/png/vcpkg-cmake-wrapper.cmake
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x64-osx.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x64-osx.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x64-osx.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x64-osx.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+x64-osx/
+x64-osx/debug/
+x64-osx/debug/lib/
+x64-osx/debug/lib/libpng16d.a
+x64-osx/include/
+x64-osx/include/libpng16/
+x64-osx/include/libpng16/png.h
+x64-osx/include/libpng16/pngconf.h
+x64-osx/include/libpng16/pnglibconf.h
+x64-osx/include/png.h
+x64-osx/include/pngconf.h
+x64-osx/include/pnglibconf.h
+x64-osx/lib/
+x64-osx/lib/libpng16.a
+x64-osx/share/
+x64-osx/share/libpng/
+x64-osx/share/libpng/copyright
+x64-osx/share/libpng/usage
+x64-osx/share/png/
+x64-osx/share/png/vcpkg-cmake-wrapper.cmake
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x86-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x86-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x86-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/libpng_1.6.35_x86-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+x86-windows/
+x86-windows/bin/
+x86-windows/bin/libpng16.dll
+x86-windows/bin/libpng16.pdb
+x86-windows/debug/
+x86-windows/debug/bin/
+x86-windows/debug/bin/libpng16d.dll
+x86-windows/debug/bin/libpng16d.pdb
+x86-windows/debug/lib/
+x86-windows/debug/lib/libpng16d.lib
+x86-windows/include/
+x86-windows/include/libpng16/
+x86-windows/include/libpng16/png.h
+x86-windows/include/libpng16/pngconf.h
+x86-windows/include/libpng16/pnglibconf.h
+x86-windows/include/png.h
+x86-windows/include/pngconf.h
+x86-windows/include/pnglibconf.h
+x86-windows/lib/
+x86-windows/lib/libpng16.lib
+x86-windows/share/
+x86-windows/share/libpng/
+x86-windows/share/libpng/copyright
+x86-windows/share/libpng/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/lz4.dll
+x64-windows/bin/lz4.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/lz4d.dll
+x64-windows/debug/bin/lz4d.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/lz4d.lib
+x64-windows/include/
+x64-windows/include/lz4.h
+x64-windows/include/lz4frame.h
+x64-windows/include/lz4hc.h
+x64-windows/lib/
+x64-windows/lib/lz4.lib
+x64-windows/share/
+x64-windows/share/lz4/
+x64-windows/share/lz4/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/lz4_1.8.2_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/lz4d.lib
+x64-windows-static/include/
+x64-windows-static/include/lz4.h
+x64-windows-static/include/lz4frame.h
+x64-windows-static/include/lz4hc.h
+x64-windows-static/lib/
+x64-windows-static/lib/lz4.lib
+x64-windows-static/share/
+x64-windows-static/share/lz4/
+x64-windows-static/share/lz4/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,105 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/libeay32.dll
+x64-windows/bin/libeay32.pdb
+x64-windows/bin/ssleay32.dll
+x64-windows/bin/ssleay32.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/libeay32.dll
+x64-windows/debug/bin/libeay32.pdb
+x64-windows/debug/bin/ssleay32.dll
+x64-windows/debug/bin/ssleay32.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/libeay32.lib
+x64-windows/debug/lib/ssleay32.lib
+x64-windows/include/
+x64-windows/include/openssl/
+x64-windows/include/openssl/aes.h
+x64-windows/include/openssl/applink.c
+x64-windows/include/openssl/asn1.h
+x64-windows/include/openssl/asn1_mac.h
+x64-windows/include/openssl/asn1t.h
+x64-windows/include/openssl/bio.h
+x64-windows/include/openssl/blowfish.h
+x64-windows/include/openssl/bn.h
+x64-windows/include/openssl/buffer.h
+x64-windows/include/openssl/camellia.h
+x64-windows/include/openssl/cast.h
+x64-windows/include/openssl/cmac.h
+x64-windows/include/openssl/cms.h
+x64-windows/include/openssl/comp.h
+x64-windows/include/openssl/conf.h
+x64-windows/include/openssl/conf_api.h
+x64-windows/include/openssl/crypto.h
+x64-windows/include/openssl/des.h
+x64-windows/include/openssl/des_old.h
+x64-windows/include/openssl/dh.h
+x64-windows/include/openssl/dsa.h
+x64-windows/include/openssl/dso.h
+x64-windows/include/openssl/dtls1.h
+x64-windows/include/openssl/e_os2.h
+x64-windows/include/openssl/ebcdic.h
+x64-windows/include/openssl/ec.h
+x64-windows/include/openssl/ecdh.h
+x64-windows/include/openssl/ecdsa.h
+x64-windows/include/openssl/engine.h
+x64-windows/include/openssl/err.h
+x64-windows/include/openssl/evp.h
+x64-windows/include/openssl/hmac.h
+x64-windows/include/openssl/idea.h
+x64-windows/include/openssl/krb5_asn.h
+x64-windows/include/openssl/kssl.h
+x64-windows/include/openssl/lhash.h
+x64-windows/include/openssl/md4.h
+x64-windows/include/openssl/md5.h
+x64-windows/include/openssl/mdc2.h
+x64-windows/include/openssl/modes.h
+x64-windows/include/openssl/obj_mac.h
+x64-windows/include/openssl/objects.h
+x64-windows/include/openssl/ocsp.h
+x64-windows/include/openssl/opensslconf.h
+x64-windows/include/openssl/opensslv.h
+x64-windows/include/openssl/ossl_typ.h
+x64-windows/include/openssl/pem.h
+x64-windows/include/openssl/pem2.h
+x64-windows/include/openssl/pkcs12.h
+x64-windows/include/openssl/pkcs7.h
+x64-windows/include/openssl/pqueue.h
+x64-windows/include/openssl/rand.h
+x64-windows/include/openssl/rc2.h
+x64-windows/include/openssl/rc4.h
+x64-windows/include/openssl/ripemd.h
+x64-windows/include/openssl/rsa.h
+x64-windows/include/openssl/safestack.h
+x64-windows/include/openssl/seed.h
+x64-windows/include/openssl/sha.h
+x64-windows/include/openssl/srp.h
+x64-windows/include/openssl/srtp.h
+x64-windows/include/openssl/ssl.h
+x64-windows/include/openssl/ssl2.h
+x64-windows/include/openssl/ssl23.h
+x64-windows/include/openssl/ssl3.h
+x64-windows/include/openssl/stack.h
+x64-windows/include/openssl/symhacks.h
+x64-windows/include/openssl/tls1.h
+x64-windows/include/openssl/ts.h
+x64-windows/include/openssl/txt_db.h
+x64-windows/include/openssl/ui.h
+x64-windows/include/openssl/ui_compat.h
+x64-windows/include/openssl/whrlpool.h
+x64-windows/include/openssl/x509.h
+x64-windows/include/openssl/x509_vfy.h
+x64-windows/include/openssl/x509v3.h
+x64-windows/lib/
+x64-windows/lib/libeay32.lib
+x64-windows/lib/ssleay32.lib
+x64-windows/share/
+x64-windows/share/openssl/
+x64-windows/share/openssl/copyright
+x64-windows/share/openssl/usage
+x64-windows/tools/
+x64-windows/tools/openssl/
+x64-windows/tools/openssl/LIBEAY32.dll
+x64-windows/tools/openssl/SSLEAY32.dll
+x64-windows/tools/openssl/openssl.exe
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,92 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/libeay32.lib
+x64-windows-static/debug/lib/ssleay32.lib
+x64-windows-static/include/
+x64-windows-static/include/openssl/
+x64-windows-static/include/openssl/aes.h
+x64-windows-static/include/openssl/asn1.h
+x64-windows-static/include/openssl/asn1_mac.h
+x64-windows-static/include/openssl/asn1t.h
+x64-windows-static/include/openssl/bio.h
+x64-windows-static/include/openssl/blowfish.h
+x64-windows-static/include/openssl/bn.h
+x64-windows-static/include/openssl/buffer.h
+x64-windows-static/include/openssl/camellia.h
+x64-windows-static/include/openssl/cast.h
+x64-windows-static/include/openssl/cmac.h
+x64-windows-static/include/openssl/cms.h
+x64-windows-static/include/openssl/comp.h
+x64-windows-static/include/openssl/conf.h
+x64-windows-static/include/openssl/conf_api.h
+x64-windows-static/include/openssl/crypto.h
+x64-windows-static/include/openssl/des.h
+x64-windows-static/include/openssl/des_old.h
+x64-windows-static/include/openssl/dh.h
+x64-windows-static/include/openssl/dsa.h
+x64-windows-static/include/openssl/dso.h
+x64-windows-static/include/openssl/dtls1.h
+x64-windows-static/include/openssl/e_os2.h
+x64-windows-static/include/openssl/ebcdic.h
+x64-windows-static/include/openssl/ec.h
+x64-windows-static/include/openssl/ecdh.h
+x64-windows-static/include/openssl/ecdsa.h
+x64-windows-static/include/openssl/engine.h
+x64-windows-static/include/openssl/err.h
+x64-windows-static/include/openssl/evp.h
+x64-windows-static/include/openssl/hmac.h
+x64-windows-static/include/openssl/idea.h
+x64-windows-static/include/openssl/krb5_asn.h
+x64-windows-static/include/openssl/kssl.h
+x64-windows-static/include/openssl/lhash.h
+x64-windows-static/include/openssl/md4.h
+x64-windows-static/include/openssl/md5.h
+x64-windows-static/include/openssl/mdc2.h
+x64-windows-static/include/openssl/modes.h
+x64-windows-static/include/openssl/obj_mac.h
+x64-windows-static/include/openssl/objects.h
+x64-windows-static/include/openssl/ocsp.h
+x64-windows-static/include/openssl/opensslconf.h
+x64-windows-static/include/openssl/opensslv.h
+x64-windows-static/include/openssl/ossl_typ.h
+x64-windows-static/include/openssl/pem.h
+x64-windows-static/include/openssl/pem2.h
+x64-windows-static/include/openssl/pkcs12.h
+x64-windows-static/include/openssl/pkcs7.h
+x64-windows-static/include/openssl/pqueue.h
+x64-windows-static/include/openssl/rand.h
+x64-windows-static/include/openssl/rc2.h
+x64-windows-static/include/openssl/rc4.h
+x64-windows-static/include/openssl/ripemd.h
+x64-windows-static/include/openssl/rsa.h
+x64-windows-static/include/openssl/safestack.h
+x64-windows-static/include/openssl/seed.h
+x64-windows-static/include/openssl/sha.h
+x64-windows-static/include/openssl/srp.h
+x64-windows-static/include/openssl/srtp.h
+x64-windows-static/include/openssl/ssl.h
+x64-windows-static/include/openssl/ssl2.h
+x64-windows-static/include/openssl/ssl23.h
+x64-windows-static/include/openssl/ssl3.h
+x64-windows-static/include/openssl/stack.h
+x64-windows-static/include/openssl/symhacks.h
+x64-windows-static/include/openssl/tls1.h
+x64-windows-static/include/openssl/ts.h
+x64-windows-static/include/openssl/txt_db.h
+x64-windows-static/include/openssl/ui.h
+x64-windows-static/include/openssl/ui_compat.h
+x64-windows-static/include/openssl/whrlpool.h
+x64-windows-static/include/openssl/x509.h
+x64-windows-static/include/openssl/x509_vfy.h
+x64-windows-static/include/openssl/x509v3.h
+x64-windows-static/lib/
+x64-windows-static/lib/libeay32.lib
+x64-windows-static/lib/ssleay32.lib
+x64-windows-static/share/
+x64-windows-static/share/openssl/
+x64-windows-static/share/openssl/copyright
+x64-windows-static/share/openssl/usage
+x64-windows-static/tools/
+x64-windows-static/tools/openssl/
+x64-windows-static/tools/openssl/openssl.exe
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_arm64-ios.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_arm64-ios.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_arm64-ios.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_arm64-ios.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+arm64-ios/
+arm64-ios/share/
+arm64-ios/share/ragel/
+arm64-ios/share/ragel/copyright
+arm64-ios/tools/
+arm64-ios/tools/ragel
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x64-osx.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x64-osx.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x64-osx.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x64-osx.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+x64-osx/
+x64-osx/share/
+x64-osx/share/ragel/
+x64-osx/share/ragel/copyright
+x64-osx/tools/
+x64-osx/tools/ragel
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x86-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x86-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x86-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/ragel_6.10-1_x86-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+x86-windows/
+x86-windows/share/
+x86-windows/share/ragel/
+x86-windows/share/ragel/copyright
+x86-windows/tools/
+x86-windows/tools/ragel.exe
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_arm64-ios.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_arm64-ios.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_arm64-ios.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_arm64-ios.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+arm64-ios/
+arm64-ios/debug/
+arm64-ios/debug/lib/
+arm64-ios/debug/lib/libz.a
+arm64-ios/include/
+arm64-ios/include/zconf.h
+arm64-ios/include/zlib.h
+arm64-ios/lib/
+arm64-ios/lib/libz.a
+arm64-ios/share/
+arm64-ios/share/zlib/
+arm64-ios/share/zlib/copyright
+arm64-ios/share/zlib/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-osx.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-osx.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-osx.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-osx.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+x64-osx/
+x64-osx/debug/
+x64-osx/debug/lib/
+x64-osx/debug/lib/libz.a
+x64-osx/include/
+x64-osx/include/zconf.h
+x64-osx/include/zlib.h
+x64-osx/lib/
+x64-osx/lib/libz.a
+x64-osx/share/
+x64-osx/share/zlib/
+x64-osx/share/zlib/copyright
+x64-osx/share/zlib/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/zlib.pdb
+x64-windows/bin/zlib1.dll
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/zlibd.pdb
+x64-windows/debug/bin/zlibd1.dll
+x64-windows/debug/lib/
+x64-windows/debug/lib/zlibd.lib
+x64-windows/include/
+x64-windows/include/zconf.h
+x64-windows/include/zlib.h
+x64-windows/lib/
+x64-windows/lib/zlib.lib
+x64-windows/share/
+x64-windows/share/zlib/
+x64-windows/share/zlib/copyright
+x64-windows/share/zlib/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows-static.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows-static.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows-static.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x64-windows-static.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,13 @@
+x64-windows-static/
+x64-windows-static/debug/
+x64-windows-static/debug/lib/
+x64-windows-static/debug/lib/zlibd.lib
+x64-windows-static/include/
+x64-windows-static/include/zconf.h
+x64-windows-static/include/zlib.h
+x64-windows-static/lib/
+x64-windows-static/lib/zlib.lib
+x64-windows-static/share/
+x64-windows-static/share/zlib/
+x64-windows-static/share/zlib/copyright
+x64-windows-static/share/zlib/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x86-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x86-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x86-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/info/zlib_1.2.11-3_x86-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x86-windows/
+x86-windows/bin/
+x86-windows/bin/zlib.pdb
+x86-windows/bin/zlib1.dll
+x86-windows/debug/
+x86-windows/debug/bin/
+x86-windows/debug/bin/zlibd.pdb
+x86-windows/debug/bin/zlibd1.dll
+x86-windows/debug/lib/
+x86-windows/debug/lib/zlibd.lib
+x86-windows/include/
+x86-windows/include/zconf.h
+x86-windows/include/zlib.h
+x86-windows/lib/
+x86-windows/lib/zlib.lib
+x86-windows/share/
+x86-windows/share/zlib/
+x86-windows/share/zlib/copyright
+x86-windows/share/zlib/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/updates/status thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/updates/status
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/updates/status	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/normalized/installed/vcpkg/updates/status	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1574 @@
+Package: openssl
+Version: 1.0.2o-3
+Architecture: x64-windows
+Multi-Arch: same
+Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
+Status: install ok installed
+
+Package: liblzma
+Version: 5.2.3-2
+Architecture: x64-windows
+Multi-Arch: same
+Description: Compression library with an API similar to that of zlib.
+Status: install ok installed
+
+Package: icu
+Version: 61.1-1
+Architecture: x64-windows
+Multi-Arch: same
+Description: Mature and widely used Unicode and localization library.
+Status: install ok installed
+
+Package: zlib
+Version: 1.2.11-3
+Architecture: x64-windows
+Multi-Arch: same
+Description: A compression library
+Status: install ok installed
+
+Package: libevent
+Version: 2.1.8-3
+Depends: openssl
+Architecture: x64-windows
+Multi-Arch: same
+Description: An event notification library
+Status: install ok installed
+
+Package: lz4
+Version: 1.8.2
+Architecture: x64-windows
+Multi-Arch: same
+Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
+Status: install ok installed
+
+Package: boost-vcpkg-helpers
+Version: 4
+Architecture: x64-windows
+Multi-Arch: same
+Description: a set of vcpkg-internal scripts used to modularize boost
+Status: install ok installed
+
+Package: boost-config
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost config module
+Status: install ok installed
+
+Package: boost-assert
+Version: 1.67.0
+Depends: boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost assert module
+Status: install ok installed
+
+Package: boost-compatibility
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost compatibility module
+Status: install ok installed
+
+Package: boost-detail
+Version: 1.67.0
+Depends: boost-compatibility, boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost detail module
+Status: install ok installed
+
+Package: boost-throw-exception
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost throw_exception module
+Status: install ok installed
+
+Package: boost-core
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost core module
+Status: install ok installed
+
+Package: boost-static-assert
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost static_assert module
+Status: install ok installed
+
+Package: boost-integer
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost integer module
+Status: install ok installed
+
+Package: boost-move
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-detail, boost-integer, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost move module
+Status: install ok installed
+
+Package: boost-preprocessor
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost preprocessor module
+Status: install ok installed
+
+Package: boost-predef
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost predef module
+Status: install ok installed
+
+Package: boost-type-traits
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost type_traits module
+Status: install ok installed
+
+Package: boost-mpl
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost mpl module
+Status: install ok installed
+
+Package: boost-utility
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost utility module
+Status: install ok installed
+
+Package: boost-optional
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost optional module
+Status: install ok installed
+
+Package: boost-modular-build-helper
+Version: 2018-05-14
+Architecture: x64-windows
+Multi-Arch: same
+Status: install ok installed
+
+Package: boost-winapi
+Version: 1.67.0
+Depends: boost-config, boost-integer, boost-predef, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost winapi module
+Status: install ok installed
+
+Package: boost-build
+Version: 1.67.0
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost.Build
+Status: install ok installed
+
+Package: boost-system
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-integer, boost-modular-build-helper, boost-predef, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost system module
+Status: install ok installed
+
+Package: boost-concept-check
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost concept_check module
+Status: install ok installed
+
+Package: boost-array
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost array module
+Status: install ok installed
+
+Package: boost-smart-ptr
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost smart_ptr module
+Status: install ok installed
+
+Package: boost-tuple
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tuple module
+Status: install ok installed
+
+Package: boost-exception
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost exception module
+Status: install ok installed
+
+Package: boost-bind
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost bind module
+Status: install ok installed
+
+Package: boost-typeof
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost typeof module
+Status: install ok installed
+
+Package: boost-container-hash
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost container_hash module
+Status: install ok installed
+
+Package: boost-type-index
+Version: 1.67.0
+Depends: boost-config, boost-container-hash, boost-core, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost type_index module
+Status: install ok installed
+
+Package: boost-function
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-mpl, boost-preprocessor, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost function module
+Status: install ok installed
+
+Package: boost-functional
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost functional module
+Status: install ok installed
+
+Package: boost-function-types
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost function_types module
+Status: install ok installed
+
+Package: boost-fusion
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-functional, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost fusion module
+Status: install ok installed
+
+Package: boost-iterator
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost iterator module
+Status: install ok installed
+
+Package: boost-regex
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost regex module
+Status: install ok installed
+
+Package: boost-range
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost range module
+Status: install ok installed
+
+Package: boost-intrusive
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-functional, boost-move, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost intrusive module
+Status: install ok installed
+
+Package: boost-container
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-functional, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost container module
+Status: install ok installed
+
+Package: boost-unordered
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost unordered module
+Status: install ok installed
+
+Package: boost-algorithm
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost algorithm module
+Status: install ok installed
+
+Package: boost-atomic
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost atomic module
+Status: install ok installed
+
+Package: boost-lambda
+Version: 1.67.0
+Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost lambda module
+Status: install ok installed
+
+Package: boost-numeric-conversion
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost numeric_conversion module
+Status: install ok installed
+
+Package: boost-lexical-cast
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-mpl, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost lexical_cast module
+Status: install ok installed
+
+Package: boost-math
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost math module
+Status: install ok installed
+
+Package: boost-polygon
+Version: 1.67.0
+Depends: boost-config, boost-integer, boost-mpl, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost polygon module
+Status: install ok installed
+
+Package: boost-io
+Version: 1.67.0
+Depends: boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost io module
+Status: install ok installed
+
+Package: boost-random
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost random module
+Status: install ok installed
+
+Package: boost-rational
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost rational module
+Status: install ok installed
+
+Package: boost-multiprecision
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-config, boost-detail, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost multiprecision module
+Status: install ok installed
+
+Package: boost-qvm
+Version: 1.67.0
+Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost qvm module
+Status: install ok installed
+
+Package: boost-endian
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost endian module
+Status: install ok installed
+
+Package: bzip2
+Version: 1.0.6-2
+Architecture: x64-windows
+Multi-Arch: same
+Description: High-quality data compressor.
+Status: install ok installed
+
+Package: boost-iostreams
+Version: 1.67.0-1
+Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, zlib, liblzma
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost iostreams module
+Status: install ok installed
+
+Package: boost-ratio
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost ratio module
+Status: install ok installed
+
+Package: boost-chrono
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost chrono module
+Status: install ok installed
+
+Package: boost-tokenizer
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tokenizer module
+Status: install ok installed
+
+Package: boost-date-time
+Version: 1.67.0
+Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost date_time module
+Status: install ok installed
+
+Package: boost-thread
+Version: 1.67.0
+Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-functional, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost thread module
+Status: install ok installed
+
+Package: boost-locale
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost locale module
+Status: install ok installed
+
+Package: boost-filesystem
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-range, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost filesystem module
+Status: install ok installed
+
+Package: boost-foreach
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost foreach module
+Status: install ok installed
+
+Package: boost-proto
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost proto module
+Status: install ok installed
+
+Package: boost-phoenix
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost phoenix module
+Status: install ok installed
+
+Package: boost-pool
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost pool module
+Status: install ok installed
+
+Package: boost-tti
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tti module
+Status: install ok installed
+
+Package: boost-variant
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost variant module
+Status: install ok installed
+
+Package: boost-spirit
+Version: 1.67.0
+Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem, boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams, boost-iterator, boost-lexical-cast, boost-locale, boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost spirit module
+Status: install ok installed
+
+Package: boost-serialization
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost serialization module
+Status: install ok installed
+
+Package: boost-geometry
+Version: 1.67.0
+Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost geometry module
+Status: install ok installed
+
+Package: boost-any
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost any module
+Status: install ok installed
+
+Package: boost-multi-index
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost multi_index module
+Status: install ok installed
+
+Package: boost-property-map
+Version: 1.67.0
+Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost property_map module
+Status: install ok installed
+
+Package: boost-bimap
+Version: 1.67.0
+Depends: boost-concept-check, boost-config, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost bimap module
+Status: install ok installed
+
+Package: boost-format
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost format module
+Status: install ok installed
+
+Package: boost-property-tree
+Version: 1.67.0
+Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost property_tree module
+Status: install ok installed
+
+Package: boost-conversion
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost conversion module
+Status: install ok installed
+
+Package: boost-parameter
+Version: 1.67.0
+Depends: boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost parameter module
+Status: install ok installed
+
+Package: boost-timer
+Version: 1.67.0
+Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost timer module
+Status: install ok installed
+
+Package: boost-test
+Version: 1.67.0-2
+Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost test module
+Status: install ok installed
+
+Package: boost-xpressive
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost xpressive module
+Status: install ok installed
+
+Package: boost-graph
+Version: 1.67.0
+Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-functional, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test, boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost graph module
+Status: install ok installed
+
+Package: libmysql
+Version: 8.0.4-2
+Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
+Architecture: x64-windows
+Multi-Arch: same
+Description: A MySQL client library for C development.
+Status: install ok installed
+
+Package: boost-vcpkg-helpers
+Version: 4
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: a set of vcpkg-internal scripts used to modularize boost
+Status: install ok installed
+
+Package: boost-config
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost config module
+Status: install ok installed
+
+Package: boost-compatibility
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost compatibility module
+Status: install ok installed
+
+Package: boost-detail
+Version: 1.67.0
+Depends: boost-compatibility, boost-config, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost detail module
+Status: install ok installed
+
+Package: boost-modular-build-helper
+Version: 2018-05-14
+Architecture: x64-windows-static
+Multi-Arch: same
+Status: install ok installed
+
+Package: boost-assert
+Version: 1.67.0
+Depends: boost-config, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost assert module
+Status: install ok installed
+
+Package: boost-throw-exception
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost throw_exception module
+Status: install ok installed
+
+Package: boost-core
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost core module
+Status: install ok installed
+
+Package: boost-preprocessor
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost preprocessor module
+Status: install ok installed
+
+Package: boost-static-assert
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost static_assert module
+Status: install ok installed
+
+Package: boost-integer
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost integer module
+Status: install ok installed
+
+Package: boost-type-traits
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost type_traits module
+Status: install ok installed
+
+Package: boost-utility
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost utility module
+Status: install ok installed
+
+Package: boost-predef
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost predef module
+Status: install ok installed
+
+Package: boost-winapi
+Version: 1.67.0
+Depends: boost-config, boost-integer, boost-predef, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost winapi module
+Status: install ok installed
+
+Package: boost-build
+Version: 1.67.0
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost.Build
+Status: install ok installed
+
+Package: boost-system
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-integer, boost-modular-build-helper, boost-predef, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost system module
+Status: install ok installed
+
+Package: boost-move
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-detail, boost-integer, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost move module
+Status: install ok installed
+
+Package: liblzma
+Version: 5.2.3-2
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Compression library with an API similar to that of zlib.
+Status: install ok installed
+
+Package: boost-mpl
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost mpl module
+Status: install ok installed
+
+Package: boost-concept-check
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost concept_check module
+Status: install ok installed
+
+Package: boost-array
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost array module
+Status: install ok installed
+
+Package: boost-smart-ptr
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost smart_ptr module
+Status: install ok installed
+
+Package: boost-tuple
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost tuple module
+Status: install ok installed
+
+Package: boost-exception
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost exception module
+Status: install ok installed
+
+Package: boost-bind
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost bind module
+Status: install ok installed
+
+Package: boost-typeof
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost typeof module
+Status: install ok installed
+
+Package: boost-container-hash
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost container_hash module
+Status: install ok installed
+
+Package: boost-type-index
+Version: 1.67.0
+Depends: boost-config, boost-container-hash, boost-core, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost type_index module
+Status: install ok installed
+
+Package: boost-function
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-mpl, boost-preprocessor, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost function module
+Status: install ok installed
+
+Package: boost-functional
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost functional module
+Status: install ok installed
+
+Package: boost-function-types
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost function_types module
+Status: install ok installed
+
+Package: boost-fusion
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-functional, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost fusion module
+Status: install ok installed
+
+Package: boost-optional
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost optional module
+Status: install ok installed
+
+Package: boost-iterator
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost iterator module
+Status: install ok installed
+
+Package: boost-regex
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost regex module
+Status: install ok installed
+
+Package: boost-range
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost range module
+Status: install ok installed
+
+Package: boost-intrusive
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-functional, boost-move, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost intrusive module
+Status: install ok installed
+
+Package: boost-container
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-functional, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost container module
+Status: install ok installed
+
+Package: boost-unordered
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost unordered module
+Status: install ok installed
+
+Package: boost-algorithm
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost algorithm module
+Status: install ok installed
+
+Package: icu
+Version: 61.1-1
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Mature and widely used Unicode and localization library.
+Status: install ok installed
+
+Package: boost-atomic
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost atomic module
+Status: install ok installed
+
+Package: boost-lambda
+Version: 1.67.0
+Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost lambda module
+Status: install ok installed
+
+Package: boost-numeric-conversion
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost numeric_conversion module
+Status: install ok installed
+
+Package: boost-lexical-cast
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-mpl, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost lexical_cast module
+Status: install ok installed
+
+Package: boost-math
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost math module
+Status: install ok installed
+
+Package: boost-polygon
+Version: 1.67.0
+Depends: boost-config, boost-integer, boost-mpl, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost polygon module
+Status: install ok installed
+
+Package: boost-io
+Version: 1.67.0
+Depends: boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost io module
+Status: install ok installed
+
+Package: boost-random
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost random module
+Status: install ok installed
+
+Package: boost-rational
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost rational module
+Status: install ok installed
+
+Package: boost-multiprecision
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-config, boost-detail, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost multiprecision module
+Status: install ok installed
+
+Package: boost-qvm
+Version: 1.67.0
+Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost qvm module
+Status: install ok installed
+
+Package: boost-endian
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost endian module
+Status: install ok installed
+
+Package: bzip2
+Version: 1.0.6-2
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: High-quality data compressor.
+Status: install ok installed
+
+Package: zlib
+Version: 1.2.11-3
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: A compression library
+Status: install ok installed
+
+Package: boost-iostreams
+Version: 1.67.0-1
+Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, zlib, liblzma
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost iostreams module
+Status: install ok installed
+
+Package: boost-ratio
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost ratio module
+Status: install ok installed
+
+Package: boost-chrono
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost chrono module
+Status: install ok installed
+
+Package: boost-tokenizer
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost tokenizer module
+Status: install ok installed
+
+Package: boost-date-time
+Version: 1.67.0
+Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost date_time module
+Status: install ok installed
+
+Package: boost-thread
+Version: 1.67.0
+Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-functional, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost thread module
+Status: install ok installed
+
+Package: boost-locale
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost locale module
+Status: install ok installed
+
+Package: boost-filesystem
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-range, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost filesystem module
+Status: install ok installed
+
+Package: boost-foreach
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost foreach module
+Status: install ok installed
+
+Package: boost-proto
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost proto module
+Status: install ok installed
+
+Package: boost-phoenix
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost phoenix module
+Status: install ok installed
+
+Package: boost-pool
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost pool module
+Status: install ok installed
+
+Package: boost-tti
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost tti module
+Status: install ok installed
+
+Package: boost-variant
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost variant module
+Status: install ok installed
+
+Package: boost-spirit
+Version: 1.67.0
+Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem, boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams, boost-iterator, boost-lexical-cast, boost-locale, boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost spirit module
+Status: install ok installed
+
+Package: boost-serialization
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost serialization module
+Status: install ok installed
+
+Package: boost-geometry
+Version: 1.67.0
+Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost geometry module
+Status: install ok installed
+
+Package: openssl
+Version: 1.0.2o-3
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
+Status: install ok installed
+
+Package: boost-any
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost any module
+Status: install ok installed
+
+Package: boost-multi-index
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost multi_index module
+Status: install ok installed
+
+Package: boost-property-map
+Version: 1.67.0
+Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost property_map module
+Status: install ok installed
+
+Package: boost-bimap
+Version: 1.67.0
+Depends: boost-concept-check, boost-config, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost bimap module
+Status: install ok installed
+
+Package: boost-format
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost format module
+Status: install ok installed
+
+Package: boost-property-tree
+Version: 1.67.0
+Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost property_tree module
+Status: install ok installed
+
+Package: boost-conversion
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost conversion module
+Status: install ok installed
+
+Package: boost-parameter
+Version: 1.67.0
+Depends: boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost parameter module
+Status: install ok installed
+
+Package: boost-timer
+Version: 1.67.0
+Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost timer module
+Status: install ok installed
+
+Package: boost-test
+Version: 1.67.0-2
+Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost test module
+Status: install ok installed
+
+Package: boost-xpressive
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost xpressive module
+Status: install ok installed
+
+Package: boost-graph
+Version: 1.67.0
+Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-functional, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test, boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Boost graph module
+Status: install ok installed
+
+Package: libevent
+Version: 2.1.8-3
+Depends: openssl
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: An event notification library
+Status: install ok installed
+
+Package: lz4
+Version: 1.8.2
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
+Status: install ok installed
+
+Package: libmysql
+Version: 8.0.4-2
+Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
+Architecture: x64-windows-static
+Multi-Arch: same
+Description: A MySQL client library for C development.
+Status: install ok installed
+
+Package: zlib
+Version: 1.2.11-3
+Architecture: x86-windows
+Multi-Arch: same
+Description: A compression library
+Status: install ok installed
+
+Package: bzip2
+Version: 1.0.6-2
+Architecture: x86-windows
+Multi-Arch: same
+Description: High-quality data compressor.
+Status: install ok installed
+
+Package: libpng
+Version: 1.6.35
+Depends: zlib
+Architecture: x86-windows
+Multi-Arch: same
+Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
+Status: install ok installed
+
+Package: freetype
+Version: 2.8.1-3
+Depends: zlib, bzip2, libpng
+Architecture: x86-windows
+Multi-Arch: same
+Description: A library to render fonts.
+Status: install ok installed
+
+Package: ragel
+Version: 6.10-1
+Architecture: x86-windows
+Multi-Arch: same
+Description: Ragel State Machine Compiler
+Status: install ok installed
+
+Package: harfbuzz
+Version: 1.8.4
+Depends: freetype, ragel
+Architecture: x86-windows
+Multi-Arch: same
+Description: HarfBuzz OpenType text shaping engine
+Status: install ok installed
+
+Package: harfbuzz
+Feature: ucdn
+Architecture: x86-windows
+Multi-Arch: same
+Description: Builtin (UCDN) Unicode callbacks support
+Status: install ok installed
+
+Package: icu
+Version: 61.1-1
+Architecture: x86-windows
+Multi-Arch: same
+Description: Mature and widely used Unicode and localization library.
+Status: install ok installed
+
+Package: harfbuzz
+Feature: icu
+Depends: icu
+Architecture: x86-windows
+Multi-Arch: same
+Description: icu support for harfbuzz
+Status: install ok installed
+
+Package: ragel
+Version: 6.10-1
+Architecture: x64-osx
+Multi-Arch: same
+Description: Ragel State Machine Compiler
+Status: install ok installed
+
+Package: zlib
+Version: 1.2.11-3
+Architecture: x64-osx
+Multi-Arch: same
+Description: A compression library
+Status: install ok installed
+
+Package: libpng
+Version: 1.6.35
+Depends: zlib
+Architecture: x64-osx
+Multi-Arch: same
+Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
+Status: install ok installed
+
+Package: bzip2
+Version: 1.0.6-2
+Architecture: x64-osx
+Multi-Arch: same
+Description: High-quality data compressor.
+Status: install ok installed
+
+Package: freetype
+Version: 2.8.1-3
+Depends: zlib, bzip2, libpng
+Architecture: x64-osx
+Multi-Arch: same
+Description: A library to render fonts.
+Status: install ok installed
+
+Package: harfbuzz
+Version: 1.8.4
+Depends: freetype, ragel
+Architecture: x64-osx
+Multi-Arch: same
+Description: HarfBuzz OpenType text shaping engine
+Status: install ok installed
+
+Package: harfbuzz
+Feature: ucdn
+Architecture: x64-osx
+Multi-Arch: same
+Description: Builtin (UCDN) Unicode callbacks support
+Status: install ok installed
+
+Package: ragel
+Version: 6.10-1
+Architecture: arm64-ios
+Multi-Arch: same
+Description: Ragel State Machine Compiler
+Status: install ok installed
+
+Package: zlib
+Version: 1.2.11-3
+Architecture: arm64-ios
+Multi-Arch: same
+Description: A compression library
+Status: install ok installed
+
+Package: libpng
+Version: 1.6.35
+Depends: zlib
+Architecture: arm64-ios
+Multi-Arch: same
+Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
+Status: install ok installed
+
+Package: bzip2
+Version: 1.0.6-2
+Architecture: arm64-ios
+Multi-Arch: same
+Description: High-quality data compressor.
+Status: install ok installed
+
+Package: freetype
+Version: 2.8.1-3
+Depends: zlib, bzip2, libpng
+Architecture: arm64-ios
+Multi-Arch: same
+Description: A library to render fonts.
+Status: install ok installed
+
+Package: harfbuzz
+Version: 1.8.4
+Depends: freetype, ragel
+Architecture: arm64-ios
+Multi-Arch: same
+Description: HarfBuzz OpenType text shaping engine
+Status: install ok installed
+
+Package: harfbuzz
+Feature: ucdn
+Architecture: arm64-ios
+Multi-Arch: same
+Description: Builtin (UCDN) Unicode callbacks support
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-algorithm_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,98 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/algorithm/
+x64-windows/include/boost/algorithm/algorithm.hpp
+x64-windows/include/boost/algorithm/clamp.hpp
+x64-windows/include/boost/algorithm/cxx11/
+x64-windows/include/boost/algorithm/cxx11/all_of.hpp
+x64-windows/include/boost/algorithm/cxx11/any_of.hpp
+x64-windows/include/boost/algorithm/cxx11/copy_if.hpp
+x64-windows/include/boost/algorithm/cxx11/copy_n.hpp
+x64-windows/include/boost/algorithm/cxx11/find_if_not.hpp
+x64-windows/include/boost/algorithm/cxx11/iota.hpp
+x64-windows/include/boost/algorithm/cxx11/is_partitioned.hpp
+x64-windows/include/boost/algorithm/cxx11/is_permutation.hpp
+x64-windows/include/boost/algorithm/cxx11/is_sorted.hpp
+x64-windows/include/boost/algorithm/cxx11/none_of.hpp
+x64-windows/include/boost/algorithm/cxx11/one_of.hpp
+x64-windows/include/boost/algorithm/cxx11/partition_copy.hpp
+x64-windows/include/boost/algorithm/cxx11/partition_point.hpp
+x64-windows/include/boost/algorithm/cxx14/
+x64-windows/include/boost/algorithm/cxx14/equal.hpp
+x64-windows/include/boost/algorithm/cxx14/is_permutation.hpp
+x64-windows/include/boost/algorithm/cxx14/mismatch.hpp
+x64-windows/include/boost/algorithm/cxx17/
+x64-windows/include/boost/algorithm/cxx17/exclusive_scan.hpp
+x64-windows/include/boost/algorithm/cxx17/for_each_n.hpp
+x64-windows/include/boost/algorithm/cxx17/inclusive_scan.hpp
+x64-windows/include/boost/algorithm/cxx17/reduce.hpp
+x64-windows/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp
+x64-windows/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp
+x64-windows/include/boost/algorithm/cxx17/transform_reduce.hpp
+x64-windows/include/boost/algorithm/gather.hpp
+x64-windows/include/boost/algorithm/hex.hpp
+x64-windows/include/boost/algorithm/is_palindrome.hpp
+x64-windows/include/boost/algorithm/is_partitioned_until.hpp
+x64-windows/include/boost/algorithm/minmax.hpp
+x64-windows/include/boost/algorithm/minmax_element.hpp
+x64-windows/include/boost/algorithm/searching/
+x64-windows/include/boost/algorithm/searching/boyer_moore.hpp
+x64-windows/include/boost/algorithm/searching/boyer_moore_horspool.hpp
+x64-windows/include/boost/algorithm/searching/detail/
+x64-windows/include/boost/algorithm/searching/detail/bm_traits.hpp
+x64-windows/include/boost/algorithm/searching/detail/debugging.hpp
+x64-windows/include/boost/algorithm/searching/knuth_morris_pratt.hpp
+x64-windows/include/boost/algorithm/sort_subrange.hpp
+x64-windows/include/boost/algorithm/string.hpp
+x64-windows/include/boost/algorithm/string/
+x64-windows/include/boost/algorithm/string/case_conv.hpp
+x64-windows/include/boost/algorithm/string/classification.hpp
+x64-windows/include/boost/algorithm/string/compare.hpp
+x64-windows/include/boost/algorithm/string/concept.hpp
+x64-windows/include/boost/algorithm/string/config.hpp
+x64-windows/include/boost/algorithm/string/constants.hpp
+x64-windows/include/boost/algorithm/string/detail/
+x64-windows/include/boost/algorithm/string/detail/case_conv.hpp
+x64-windows/include/boost/algorithm/string/detail/classification.hpp
+x64-windows/include/boost/algorithm/string/detail/find_format.hpp
+x64-windows/include/boost/algorithm/string/detail/find_format_all.hpp
+x64-windows/include/boost/algorithm/string/detail/find_format_store.hpp
+x64-windows/include/boost/algorithm/string/detail/find_iterator.hpp
+x64-windows/include/boost/algorithm/string/detail/finder.hpp
+x64-windows/include/boost/algorithm/string/detail/finder_regex.hpp
+x64-windows/include/boost/algorithm/string/detail/formatter.hpp
+x64-windows/include/boost/algorithm/string/detail/formatter_regex.hpp
+x64-windows/include/boost/algorithm/string/detail/predicate.hpp
+x64-windows/include/boost/algorithm/string/detail/replace_storage.hpp
+x64-windows/include/boost/algorithm/string/detail/sequence.hpp
+x64-windows/include/boost/algorithm/string/detail/trim.hpp
+x64-windows/include/boost/algorithm/string/detail/util.hpp
+x64-windows/include/boost/algorithm/string/erase.hpp
+x64-windows/include/boost/algorithm/string/find.hpp
+x64-windows/include/boost/algorithm/string/find_format.hpp
+x64-windows/include/boost/algorithm/string/find_iterator.hpp
+x64-windows/include/boost/algorithm/string/finder.hpp
+x64-windows/include/boost/algorithm/string/formatter.hpp
+x64-windows/include/boost/algorithm/string/iter_find.hpp
+x64-windows/include/boost/algorithm/string/join.hpp
+x64-windows/include/boost/algorithm/string/predicate.hpp
+x64-windows/include/boost/algorithm/string/predicate_facade.hpp
+x64-windows/include/boost/algorithm/string/regex.hpp
+x64-windows/include/boost/algorithm/string/regex_find_format.hpp
+x64-windows/include/boost/algorithm/string/replace.hpp
+x64-windows/include/boost/algorithm/string/sequence_traits.hpp
+x64-windows/include/boost/algorithm/string/split.hpp
+x64-windows/include/boost/algorithm/string/std/
+x64-windows/include/boost/algorithm/string/std/list_traits.hpp
+x64-windows/include/boost/algorithm/string/std/rope_traits.hpp
+x64-windows/include/boost/algorithm/string/std/slist_traits.hpp
+x64-windows/include/boost/algorithm/string/std/string_traits.hpp
+x64-windows/include/boost/algorithm/string/std_containers_traits.hpp
+x64-windows/include/boost/algorithm/string/trim.hpp
+x64-windows/include/boost/algorithm/string/trim_all.hpp
+x64-windows/include/boost/algorithm/string/yes_no_type.hpp
+x64-windows/include/boost/algorithm/string_regex.hpp
+x64-windows/share/
+x64-windows/share/boost-algorithm/
+x64-windows/share/boost-algorithm/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-any_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/any.hpp
+x64-windows/share/
+x64-windows/share/boost-any/
+x64-windows/share/boost-any/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-array_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/array.hpp
+x64-windows/share/
+x64-windows/share/boost-array/
+x64-windows/share/boost-array/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-assert_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/assert.hpp
+x64-windows/include/boost/current_function.hpp
+x64-windows/share/
+x64-windows/share/boost-assert/
+x64-windows/share/boost-assert/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-atomic_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,104 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_atomic-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_atomic-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_atomic-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_atomic-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_atomic-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/atomic.hpp
+x64-windows/include/boost/atomic/
+x64-windows/include/boost/atomic/atomic.hpp
+x64-windows/include/boost/atomic/atomic_flag.hpp
+x64-windows/include/boost/atomic/capabilities.hpp
+x64-windows/include/boost/atomic/detail/
+x64-windows/include/boost/atomic/detail/addressof.hpp
+x64-windows/include/boost/atomic/detail/atomic_flag.hpp
+x64-windows/include/boost/atomic/detail/atomic_template.hpp
+x64-windows/include/boost/atomic/detail/bitwise_cast.hpp
+x64-windows/include/boost/atomic/detail/bitwise_fp_cast.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_alpha.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_arm.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_atomic.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_ppc.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_sparc.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_sync.hpp
+x64-windows/include/boost/atomic/detail/caps_gcc_x86.hpp
+x64-windows/include/boost/atomic/detail/caps_linux_arm.hpp
+x64-windows/include/boost/atomic/detail/caps_msvc_arm.hpp
+x64-windows/include/boost/atomic/detail/caps_msvc_x86.hpp
+x64-windows/include/boost/atomic/detail/caps_windows.hpp
+x64-windows/include/boost/atomic/detail/config.hpp
+x64-windows/include/boost/atomic/detail/extra_fp_operations.hpp
+x64-windows/include/boost/atomic/detail/extra_fp_operations_fwd.hpp
+x64-windows/include/boost/atomic/detail/extra_fp_ops_emulated.hpp
+x64-windows/include/boost/atomic/detail/extra_fp_ops_generic.hpp
+x64-windows/include/boost/atomic/detail/extra_operations.hpp
+x64-windows/include/boost/atomic/detail/extra_operations_fwd.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_emulated.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_gcc_arm.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_gcc_ppc.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_gcc_x86.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_generic.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_msvc_arm.hpp
+x64-windows/include/boost/atomic/detail/extra_ops_msvc_x86.hpp
+x64-windows/include/boost/atomic/detail/float_sizes.hpp
+x64-windows/include/boost/atomic/detail/fp_operations.hpp
+x64-windows/include/boost/atomic/detail/fp_operations_fwd.hpp
+x64-windows/include/boost/atomic/detail/fp_ops_emulated.hpp
+x64-windows/include/boost/atomic/detail/fp_ops_generic.hpp
+x64-windows/include/boost/atomic/detail/hwcaps_gcc_arm.hpp
+x64-windows/include/boost/atomic/detail/hwcaps_gcc_ppc.hpp
+x64-windows/include/boost/atomic/detail/hwcaps_gcc_x86.hpp
+x64-windows/include/boost/atomic/detail/int_sizes.hpp
+x64-windows/include/boost/atomic/detail/integral_extend.hpp
+x64-windows/include/boost/atomic/detail/interlocked.hpp
+x64-windows/include/boost/atomic/detail/link.hpp
+x64-windows/include/boost/atomic/detail/lockpool.hpp
+x64-windows/include/boost/atomic/detail/operations.hpp
+x64-windows/include/boost/atomic/detail/operations_fwd.hpp
+x64-windows/include/boost/atomic/detail/operations_lockfree.hpp
+x64-windows/include/boost/atomic/detail/ops_cas_based.hpp
+x64-windows/include/boost/atomic/detail/ops_emulated.hpp
+x64-windows/include/boost/atomic/detail/ops_extending_cas_based.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_alpha.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_arm.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_arm_common.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_atomic.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_ppc.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_ppc_common.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_sparc.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_sync.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_x86.hpp
+x64-windows/include/boost/atomic/detail/ops_gcc_x86_dcas.hpp
+x64-windows/include/boost/atomic/detail/ops_linux_arm.hpp
+x64-windows/include/boost/atomic/detail/ops_msvc_arm.hpp
+x64-windows/include/boost/atomic/detail/ops_msvc_common.hpp
+x64-windows/include/boost/atomic/detail/ops_msvc_x86.hpp
+x64-windows/include/boost/atomic/detail/ops_windows.hpp
+x64-windows/include/boost/atomic/detail/pause.hpp
+x64-windows/include/boost/atomic/detail/platform.hpp
+x64-windows/include/boost/atomic/detail/storage_type.hpp
+x64-windows/include/boost/atomic/detail/string_ops.hpp
+x64-windows/include/boost/atomic/detail/type_traits/
+x64-windows/include/boost/atomic/detail/type_traits/conditional.hpp
+x64-windows/include/boost/atomic/detail/type_traits/integral_constant.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_floating_point.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_function.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_iec559.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_integral.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_signed.hpp
+x64-windows/include/boost/atomic/detail/type_traits/is_trivially_default_constructible.hpp
+x64-windows/include/boost/atomic/detail/type_traits/make_signed.hpp
+x64-windows/include/boost/atomic/detail/type_traits/make_unsigned.hpp
+x64-windows/include/boost/atomic/fences.hpp
+x64-windows/include/boost/memory_order.hpp
+x64-windows/lib/
+x64-windows/lib/boost_atomic-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-atomic/
+x64-windows/share/boost-atomic/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-bimap_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,119 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/bimap.hpp
+x64-windows/include/boost/bimap/
+x64-windows/include/boost/bimap/bimap.hpp
+x64-windows/include/boost/bimap/container_adaptor/
+x64-windows/include/boost/bimap/container_adaptor/associative_container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/
+x64-windows/include/boost/bimap/container_adaptor/detail/comparison_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/functor_bag.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/identity_converters.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/key_extractor.hpp
+x64-windows/include/boost/bimap/container_adaptor/detail/non_unique_container_helper.hpp
+x64-windows/include/boost/bimap/container_adaptor/list_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/list_map_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/map_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/multimap_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/multiset_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/ordered_associative_container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/sequence_container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/set_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/support/
+x64-windows/include/boost/bimap/container_adaptor/support/iterator_facade_converters.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_associative_container_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_map_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_multimap_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_multiset_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/unordered_set_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/vector_adaptor.hpp
+x64-windows/include/boost/bimap/container_adaptor/vector_map_adaptor.hpp
+x64-windows/include/boost/bimap/detail/
+x64-windows/include/boost/bimap/detail/bimap_core.hpp
+x64-windows/include/boost/bimap/detail/concept_tags.hpp
+x64-windows/include/boost/bimap/detail/debug/
+x64-windows/include/boost/bimap/detail/debug/static_error.hpp
+x64-windows/include/boost/bimap/detail/generate_index_binder.hpp
+x64-windows/include/boost/bimap/detail/generate_relation_binder.hpp
+x64-windows/include/boost/bimap/detail/generate_view_binder.hpp
+x64-windows/include/boost/bimap/detail/is_set_type_of.hpp
+x64-windows/include/boost/bimap/detail/manage_additional_parameters.hpp
+x64-windows/include/boost/bimap/detail/manage_bimap_key.hpp
+x64-windows/include/boost/bimap/detail/map_view_base.hpp
+x64-windows/include/boost/bimap/detail/map_view_iterator.hpp
+x64-windows/include/boost/bimap/detail/modifier_adaptor.hpp
+x64-windows/include/boost/bimap/detail/non_unique_views_helper.hpp
+x64-windows/include/boost/bimap/detail/set_view_base.hpp
+x64-windows/include/boost/bimap/detail/set_view_iterator.hpp
+x64-windows/include/boost/bimap/detail/test/
+x64-windows/include/boost/bimap/detail/test/check_metadata.hpp
+x64-windows/include/boost/bimap/detail/user_interface_config.hpp
+x64-windows/include/boost/bimap/list_of.hpp
+x64-windows/include/boost/bimap/multiset_of.hpp
+x64-windows/include/boost/bimap/property_map/
+x64-windows/include/boost/bimap/property_map/set_support.hpp
+x64-windows/include/boost/bimap/property_map/unordered_set_support.hpp
+x64-windows/include/boost/bimap/relation/
+x64-windows/include/boost/bimap/relation/detail/
+x64-windows/include/boost/bimap/relation/detail/access_builder.hpp
+x64-windows/include/boost/bimap/relation/detail/metadata_access_builder.hpp
+x64-windows/include/boost/bimap/relation/detail/mutant.hpp
+x64-windows/include/boost/bimap/relation/detail/static_access_builder.hpp
+x64-windows/include/boost/bimap/relation/detail/to_mutable_relation_functor.hpp
+x64-windows/include/boost/bimap/relation/member_at.hpp
+x64-windows/include/boost/bimap/relation/mutant_relation.hpp
+x64-windows/include/boost/bimap/relation/pair_layout.hpp
+x64-windows/include/boost/bimap/relation/structured_pair.hpp
+x64-windows/include/boost/bimap/relation/support/
+x64-windows/include/boost/bimap/relation/support/data_extractor.hpp
+x64-windows/include/boost/bimap/relation/support/get.hpp
+x64-windows/include/boost/bimap/relation/support/get_pair_functor.hpp
+x64-windows/include/boost/bimap/relation/support/is_tag_of_member_at.hpp
+x64-windows/include/boost/bimap/relation/support/member_with_tag.hpp
+x64-windows/include/boost/bimap/relation/support/opposite_tag.hpp
+x64-windows/include/boost/bimap/relation/support/pair_by.hpp
+x64-windows/include/boost/bimap/relation/support/pair_type_by.hpp
+x64-windows/include/boost/bimap/relation/support/value_type_of.hpp
+x64-windows/include/boost/bimap/relation/symmetrical_base.hpp
+x64-windows/include/boost/bimap/set_of.hpp
+x64-windows/include/boost/bimap/support/
+x64-windows/include/boost/bimap/support/data_type_by.hpp
+x64-windows/include/boost/bimap/support/iterator_type_by.hpp
+x64-windows/include/boost/bimap/support/key_type_by.hpp
+x64-windows/include/boost/bimap/support/lambda.hpp
+x64-windows/include/boost/bimap/support/map_by.hpp
+x64-windows/include/boost/bimap/support/map_type_by.hpp
+x64-windows/include/boost/bimap/support/value_type_by.hpp
+x64-windows/include/boost/bimap/tags/
+x64-windows/include/boost/bimap/tags/support/
+x64-windows/include/boost/bimap/tags/support/apply_to_value_type.hpp
+x64-windows/include/boost/bimap/tags/support/default_tagged.hpp
+x64-windows/include/boost/bimap/tags/support/is_tagged.hpp
+x64-windows/include/boost/bimap/tags/support/overwrite_tagged.hpp
+x64-windows/include/boost/bimap/tags/support/tag_of.hpp
+x64-windows/include/boost/bimap/tags/support/value_type_of.hpp
+x64-windows/include/boost/bimap/tags/tagged.hpp
+x64-windows/include/boost/bimap/unconstrained_set_of.hpp
+x64-windows/include/boost/bimap/unordered_multiset_of.hpp
+x64-windows/include/boost/bimap/unordered_set_of.hpp
+x64-windows/include/boost/bimap/vector_of.hpp
+x64-windows/include/boost/bimap/views/
+x64-windows/include/boost/bimap/views/list_map_view.hpp
+x64-windows/include/boost/bimap/views/list_set_view.hpp
+x64-windows/include/boost/bimap/views/map_view.hpp
+x64-windows/include/boost/bimap/views/multimap_view.hpp
+x64-windows/include/boost/bimap/views/multiset_view.hpp
+x64-windows/include/boost/bimap/views/set_view.hpp
+x64-windows/include/boost/bimap/views/unconstrained_map_view.hpp
+x64-windows/include/boost/bimap/views/unconstrained_set_view.hpp
+x64-windows/include/boost/bimap/views/unordered_map_view.hpp
+x64-windows/include/boost/bimap/views/unordered_multimap_view.hpp
+x64-windows/include/boost/bimap/views/unordered_multiset_view.hpp
+x64-windows/include/boost/bimap/views/unordered_set_view.hpp
+x64-windows/include/boost/bimap/views/vector_map_view.hpp
+x64-windows/include/boost/bimap/views/vector_set_view.hpp
+x64-windows/share/
+x64-windows/share/boost-bimap/
+x64-windows/share/boost-bimap/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-bind_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/bind.hpp
+x64-windows/include/boost/bind/
+x64-windows/include/boost/bind/apply.hpp
+x64-windows/include/boost/bind/arg.hpp
+x64-windows/include/boost/bind/bind.hpp
+x64-windows/include/boost/bind/bind_cc.hpp
+x64-windows/include/boost/bind/bind_mf2_cc.hpp
+x64-windows/include/boost/bind/bind_mf_cc.hpp
+x64-windows/include/boost/bind/bind_template.hpp
+x64-windows/include/boost/bind/make_adaptable.hpp
+x64-windows/include/boost/bind/mem_fn.hpp
+x64-windows/include/boost/bind/mem_fn_cc.hpp
+x64-windows/include/boost/bind/mem_fn_template.hpp
+x64-windows/include/boost/bind/mem_fn_vw.hpp
+x64-windows/include/boost/bind/placeholders.hpp
+x64-windows/include/boost/bind/protect.hpp
+x64-windows/include/boost/bind/storage.hpp
+x64-windows/include/boost/is_placeholder.hpp
+x64-windows/include/boost/mem_fn.hpp
+x64-windows/share/
+x64-windows/share/boost-bind/
+x64-windows/share/boost-bind/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-build_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1389 @@
+x64-windows/
+x64-windows/share/
+x64-windows/share/boost-build/
+x64-windows/share/boost-build/copyright
+x64-windows/tools/
+x64-windows/tools/boost-build/
+x64-windows/tools/boost-build/.gitattributes
+x64-windows/tools/boost-build/.gitignore
+x64-windows/tools/boost-build/.travis.yml
+x64-windows/tools/boost-build/CONTRIBUTING.rst
+x64-windows/tools/boost-build/Jamroot.jam
+x64-windows/tools/boost-build/README.rst
+x64-windows/tools/boost-build/appveyor.yml
+x64-windows/tools/boost-build/b2.exe
+x64-windows/tools/boost-build/bjam.exe
+x64-windows/tools/boost-build/boost-build.jam
+x64-windows/tools/boost-build/boostcpp.jam
+x64-windows/tools/boost-build/bootstrap.bat
+x64-windows/tools/boost-build/bootstrap.log
+x64-windows/tools/boost-build/bootstrap.sh
+x64-windows/tools/boost-build/bootstrap_vms.com
+x64-windows/tools/boost-build/doc/
+x64-windows/tools/boost-build/doc/bjam.qbk
+x64-windows/tools/boost-build/doc/boost.png
+x64-windows/tools/boost-build/doc/boostbook.css
+x64-windows/tools/boost-build/doc/examples.qbk
+x64-windows/tools/boost-build/doc/history.qbk
+x64-windows/tools/boost-build/doc/images/
+x64-windows/tools/boost-build/doc/images/alert.png
+x64-windows/tools/boost-build/doc/images/blank.png
+x64-windows/tools/boost-build/doc/images/callouts/
+x64-windows/tools/boost-build/doc/images/callouts/1.png
+x64-windows/tools/boost-build/doc/images/callouts/1.svg
+x64-windows/tools/boost-build/doc/images/callouts/10.png
+x64-windows/tools/boost-build/doc/images/callouts/10.svg
+x64-windows/tools/boost-build/doc/images/callouts/11.png
+x64-windows/tools/boost-build/doc/images/callouts/11.svg
+x64-windows/tools/boost-build/doc/images/callouts/12.png
+x64-windows/tools/boost-build/doc/images/callouts/12.svg
+x64-windows/tools/boost-build/doc/images/callouts/13.png
+x64-windows/tools/boost-build/doc/images/callouts/13.svg
+x64-windows/tools/boost-build/doc/images/callouts/14.png
+x64-windows/tools/boost-build/doc/images/callouts/14.svg
+x64-windows/tools/boost-build/doc/images/callouts/15.png
+x64-windows/tools/boost-build/doc/images/callouts/15.svg
+x64-windows/tools/boost-build/doc/images/callouts/16.svg
+x64-windows/tools/boost-build/doc/images/callouts/17.svg
+x64-windows/tools/boost-build/doc/images/callouts/18.svg
+x64-windows/tools/boost-build/doc/images/callouts/19.svg
+x64-windows/tools/boost-build/doc/images/callouts/2.png
+x64-windows/tools/boost-build/doc/images/callouts/2.svg
+x64-windows/tools/boost-build/doc/images/callouts/20.svg
+x64-windows/tools/boost-build/doc/images/callouts/21.svg
+x64-windows/tools/boost-build/doc/images/callouts/22.svg
+x64-windows/tools/boost-build/doc/images/callouts/23.svg
+x64-windows/tools/boost-build/doc/images/callouts/24.svg
+x64-windows/tools/boost-build/doc/images/callouts/25.svg
+x64-windows/tools/boost-build/doc/images/callouts/26.svg
+x64-windows/tools/boost-build/doc/images/callouts/27.svg
+x64-windows/tools/boost-build/doc/images/callouts/28.svg
+x64-windows/tools/boost-build/doc/images/callouts/29.svg
+x64-windows/tools/boost-build/doc/images/callouts/3.png
+x64-windows/tools/boost-build/doc/images/callouts/3.svg
+x64-windows/tools/boost-build/doc/images/callouts/30.svg
+x64-windows/tools/boost-build/doc/images/callouts/4.png
+x64-windows/tools/boost-build/doc/images/callouts/4.svg
+x64-windows/tools/boost-build/doc/images/callouts/5.png
+x64-windows/tools/boost-build/doc/images/callouts/5.svg
+x64-windows/tools/boost-build/doc/images/callouts/6.png
+x64-windows/tools/boost-build/doc/images/callouts/6.svg
+x64-windows/tools/boost-build/doc/images/callouts/7.png
+x64-windows/tools/boost-build/doc/images/callouts/7.svg
+x64-windows/tools/boost-build/doc/images/callouts/8.png
+x64-windows/tools/boost-build/doc/images/callouts/8.svg
+x64-windows/tools/boost-build/doc/images/callouts/9.png
+x64-windows/tools/boost-build/doc/images/callouts/9.svg
+x64-windows/tools/boost-build/doc/images/caution.png
+x64-windows/tools/boost-build/doc/images/caution.svg
+x64-windows/tools/boost-build/doc/images/draft.png
+x64-windows/tools/boost-build/doc/images/home.png
+x64-windows/tools/boost-build/doc/images/home.svg
+x64-windows/tools/boost-build/doc/images/important.png
+x64-windows/tools/boost-build/doc/images/important.svg
+x64-windows/tools/boost-build/doc/images/next.png
+x64-windows/tools/boost-build/doc/images/next.svg
+x64-windows/tools/boost-build/doc/images/next_disabled.png
+x64-windows/tools/boost-build/doc/images/note.png
+x64-windows/tools/boost-build/doc/images/note.svg
+x64-windows/tools/boost-build/doc/images/prev.png
+x64-windows/tools/boost-build/doc/images/prev.svg
+x64-windows/tools/boost-build/doc/images/prev_disabled.png
+x64-windows/tools/boost-build/doc/images/smiley.png
+x64-windows/tools/boost-build/doc/images/tip.png
+x64-windows/tools/boost-build/doc/images/tip.svg
+x64-windows/tools/boost-build/doc/images/toc-blank.png
+x64-windows/tools/boost-build/doc/images/toc-minus.png
+x64-windows/tools/boost-build/doc/images/toc-plus.png
+x64-windows/tools/boost-build/doc/images/up.png
+x64-windows/tools/boost-build/doc/images/up.svg
+x64-windows/tools/boost-build/doc/images/up_disabled.png
+x64-windows/tools/boost-build/doc/images/warning.png
+x64-windows/tools/boost-build/doc/images/warning.svg
+x64-windows/tools/boost-build/doc/jamfile.jam
+x64-windows/tools/boost-build/doc/src/
+x64-windows/tools/boost-build/doc/src/abstract-target.xml
+x64-windows/tools/boost-build/doc/src/architecture.xml
+x64-windows/tools/boost-build/doc/src/basic-target.xml
+x64-windows/tools/boost-build/doc/src/debug.xml
+x64-windows/tools/boost-build/doc/src/extending.xml
+x64-windows/tools/boost-build/doc/src/faq.xml
+x64-windows/tools/boost-build/doc/src/fragments.xml
+x64-windows/tools/boost-build/doc/src/howto.xml
+x64-windows/tools/boost-build/doc/src/install.xml
+x64-windows/tools/boost-build/doc/src/main-target.xml
+x64-windows/tools/boost-build/doc/src/overview.xml
+x64-windows/tools/boost-build/doc/src/path.xml
+x64-windows/tools/boost-build/doc/src/project-target.xml
+x64-windows/tools/boost-build/doc/src/property-set.xml
+x64-windows/tools/boost-build/doc/src/recipes.xml
+x64-windows/tools/boost-build/doc/src/reference.xml
+x64-windows/tools/boost-build/doc/src/regex.xml
+x64-windows/tools/boost-build/doc/src/sequence.xml
+x64-windows/tools/boost-build/doc/src/standalone.xml
+x64-windows/tools/boost-build/doc/src/tasks.xml
+x64-windows/tools/boost-build/doc/src/tools.adoc
+x64-windows/tools/boost-build/doc/src/tutorial.xml
+x64-windows/tools/boost-build/doc/src/type.xml
+x64-windows/tools/boost-build/doc/src/typed-target.xml
+x64-windows/tools/boost-build/doc/src/userman.xml
+x64-windows/tools/boost-build/example/
+x64-windows/tools/boost-build/example/asciidoctor/
+x64-windows/tools/boost-build/example/asciidoctor/example.adoc
+x64-windows/tools/boost-build/example/asciidoctor/example_manpage.adoc
+x64-windows/tools/boost-build/example/asciidoctor/jamroot.jam
+x64-windows/tools/boost-build/example/boost-build.jam
+x64-windows/tools/boost-build/example/built_tool/
+x64-windows/tools/boost-build/example/built_tool/Jamroot.jam
+x64-windows/tools/boost-build/example/built_tool/core/
+x64-windows/tools/boost-build/example/built_tool/core/Jamfile.jam
+x64-windows/tools/boost-build/example/built_tool/core/a.td
+x64-windows/tools/boost-build/example/built_tool/core/core.cpp
+x64-windows/tools/boost-build/example/built_tool/readme.txt
+x64-windows/tools/boost-build/example/built_tool/tblgen/
+x64-windows/tools/boost-build/example/built_tool/tblgen/Jamfile.jam
+x64-windows/tools/boost-build/example/built_tool/tblgen/tblgen.cpp
+x64-windows/tools/boost-build/example/complex-testing/
+x64-windows/tools/boost-build/example/complex-testing/compile-fail.cpp
+x64-windows/tools/boost-build/example/complex-testing/fail.cpp
+x64-windows/tools/boost-build/example/complex-testing/jamroot.jam
+x64-windows/tools/boost-build/example/complex-testing/post.cpp
+x64-windows/tools/boost-build/example/complex-testing/success.cpp
+x64-windows/tools/boost-build/example/customization/
+x64-windows/tools/boost-build/example/customization/class.verbatim
+x64-windows/tools/boost-build/example/customization/codegen.cpp
+x64-windows/tools/boost-build/example/customization/inline_file.py
+x64-windows/tools/boost-build/example/customization/jamroot.jam
+x64-windows/tools/boost-build/example/customization/readme.txt
+x64-windows/tools/boost-build/example/customization/t1.verbatim
+x64-windows/tools/boost-build/example/customization/t2.verbatim
+x64-windows/tools/boost-build/example/customization/usage.verbatim
+x64-windows/tools/boost-build/example/customization/verbatim.jam
+x64-windows/tools/boost-build/example/customization/verbatim.py
+x64-windows/tools/boost-build/example/generate/
+x64-windows/tools/boost-build/example/generate/README.txt
+x64-windows/tools/boost-build/example/generate/a.cpp
+x64-windows/tools/boost-build/example/generate/gen.jam
+x64-windows/tools/boost-build/example/generate/gen.py
+x64-windows/tools/boost-build/example/generate/jamroot.jam
+x64-windows/tools/boost-build/example/generator/
+x64-windows/tools/boost-build/example/generator/README.txt
+x64-windows/tools/boost-build/example/generator/foo.gci
+x64-windows/tools/boost-build/example/generator/jamroot.jam
+x64-windows/tools/boost-build/example/generator/soap.jam
+x64-windows/tools/boost-build/example/gettext/
+x64-windows/tools/boost-build/example/gettext/jamfile.jam
+x64-windows/tools/boost-build/example/gettext/jamroot.jam
+x64-windows/tools/boost-build/example/gettext/main.cpp
+x64-windows/tools/boost-build/example/gettext/readme.txt
+x64-windows/tools/boost-build/example/gettext/russian.po
+x64-windows/tools/boost-build/example/hello/
+x64-windows/tools/boost-build/example/hello/hello.cpp
+x64-windows/tools/boost-build/example/hello/jamroot.jam
+x64-windows/tools/boost-build/example/hello/readme.qbk
+x64-windows/tools/boost-build/example/libraries/
+x64-windows/tools/boost-build/example/libraries/app/
+x64-windows/tools/boost-build/example/libraries/app/app.cpp
+x64-windows/tools/boost-build/example/libraries/app/jamfile.jam
+x64-windows/tools/boost-build/example/libraries/jamroot.jam
+x64-windows/tools/boost-build/example/libraries/util/
+x64-windows/tools/boost-build/example/libraries/util/foo/
+x64-windows/tools/boost-build/example/libraries/util/foo/bar.cpp
+x64-windows/tools/boost-build/example/libraries/util/foo/include/
+x64-windows/tools/boost-build/example/libraries/util/foo/include/lib1.h
+x64-windows/tools/boost-build/example/libraries/util/foo/jamfile.jam
+x64-windows/tools/boost-build/example/make/
+x64-windows/tools/boost-build/example/make/foo.py
+x64-windows/tools/boost-build/example/make/jamroot.jam
+x64-windows/tools/boost-build/example/make/main_cpp.pro
+x64-windows/tools/boost-build/example/make/readme.txt
+x64-windows/tools/boost-build/example/pch/
+x64-windows/tools/boost-build/example/pch/include/
+x64-windows/tools/boost-build/example/pch/include/pch.hpp
+x64-windows/tools/boost-build/example/pch/jamroot.jam
+x64-windows/tools/boost-build/example/pch/source/
+x64-windows/tools/boost-build/example/pch/source/hello_world.cpp
+x64-windows/tools/boost-build/example/python_modules/
+x64-windows/tools/boost-build/example/python_modules/jamroot.jam
+x64-windows/tools/boost-build/example/python_modules/python_helpers.jam
+x64-windows/tools/boost-build/example/python_modules/python_helpers.py
+x64-windows/tools/boost-build/example/python_modules/readme.txt
+x64-windows/tools/boost-build/example/qt/
+x64-windows/tools/boost-build/example/qt/README.txt
+x64-windows/tools/boost-build/example/qt/qt3/
+x64-windows/tools/boost-build/example/qt/qt3/hello/
+x64-windows/tools/boost-build/example/qt/qt3/hello/canvas.cpp
+x64-windows/tools/boost-build/example/qt/qt3/hello/canvas.h
+x64-windows/tools/boost-build/example/qt/qt3/hello/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt3/hello/main.cpp
+x64-windows/tools/boost-build/example/qt/qt3/moccable-cpp/
+x64-windows/tools/boost-build/example/qt/qt3/moccable-cpp/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt3/moccable-cpp/main.cpp
+x64-windows/tools/boost-build/example/qt/qt3/uic/
+x64-windows/tools/boost-build/example/qt/qt3/uic/hello_world_widget.ui
+x64-windows/tools/boost-build/example/qt/qt3/uic/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt3/uic/main.cpp
+x64-windows/tools/boost-build/example/qt/qt4/
+x64-windows/tools/boost-build/example/qt/qt4/hello/
+x64-windows/tools/boost-build/example/qt/qt4/hello/arrow.cpp
+x64-windows/tools/boost-build/example/qt/qt4/hello/arrow.h
+x64-windows/tools/boost-build/example/qt/qt4/hello/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt4/hello/main.cpp
+x64-windows/tools/boost-build/example/qt/qt4/moccable-cpp/
+x64-windows/tools/boost-build/example/qt/qt4/moccable-cpp/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt4/moccable-cpp/main.cpp
+x64-windows/tools/boost-build/example/qt/qt4/uic/
+x64-windows/tools/boost-build/example/qt/qt4/uic/hello_world_widget.ui
+x64-windows/tools/boost-build/example/qt/qt4/uic/jamroot.jam
+x64-windows/tools/boost-build/example/qt/qt4/uic/main.cpp
+x64-windows/tools/boost-build/example/sass/
+x64-windows/tools/boost-build/example/sass/importing.scss
+x64-windows/tools/boost-build/example/sass/include/
+x64-windows/tools/boost-build/example/sass/include/foobar.scss
+x64-windows/tools/boost-build/example/sass/jamroot.jam
+x64-windows/tools/boost-build/example/sass/singleton.sass
+x64-windows/tools/boost-build/example/sass/singleton.scss
+x64-windows/tools/boost-build/example/site-config.jam
+x64-windows/tools/boost-build/example/testing/
+x64-windows/tools/boost-build/example/testing/compile-fail.cpp
+x64-windows/tools/boost-build/example/testing/fail.cpp
+x64-windows/tools/boost-build/example/testing/jamroot.jam
+x64-windows/tools/boost-build/example/testing/success.cpp
+x64-windows/tools/boost-build/example/time/
+x64-windows/tools/boost-build/example/time/hello.cpp
+x64-windows/tools/boost-build/example/time/jamroot.jam
+x64-windows/tools/boost-build/example/time/readme.qbk
+x64-windows/tools/boost-build/example/try_compile/
+x64-windows/tools/boost-build/example/try_compile/Jamroot.jam
+x64-windows/tools/boost-build/example/try_compile/foo.cpp
+x64-windows/tools/boost-build/example/try_compile/main.cpp
+x64-windows/tools/boost-build/example/user-config.jam
+x64-windows/tools/boost-build/example/variant/
+x64-windows/tools/boost-build/example/variant/a.cpp
+x64-windows/tools/boost-build/example/variant/jamfile.jam
+x64-windows/tools/boost-build/example/variant/jamroot.jam
+x64-windows/tools/boost-build/example/variant/libs/
+x64-windows/tools/boost-build/example/variant/libs/jamfile.jam
+x64-windows/tools/boost-build/example/variant/libs/l.cpp
+x64-windows/tools/boost-build/example/variant/readme.qbk
+x64-windows/tools/boost-build/index.html
+x64-windows/tools/boost-build/notes/
+x64-windows/tools/boost-build/notes/README.txt
+x64-windows/tools/boost-build/notes/build_dir_option.txt
+x64-windows/tools/boost-build/notes/changes.txt
+x64-windows/tools/boost-build/notes/relative_source_paths.txt
+x64-windows/tools/boost-build/notes/release_procedure.txt
+x64-windows/tools/boost-build/scripts/
+x64-windows/tools/boost-build/scripts/build-docs.sh
+x64-windows/tools/boost-build/scripts/nightly.sh
+x64-windows/tools/boost-build/scripts/roll.sh
+x64-windows/tools/boost-build/scripts/to_merge.sh
+x64-windows/tools/boost-build/src/
+x64-windows/tools/boost-build/src/__init__.py
+x64-windows/tools/boost-build/src/bootstrap.jam
+x64-windows/tools/boost-build/src/build-system.jam
+x64-windows/tools/boost-build/src/build/
+x64-windows/tools/boost-build/src/build/__init__.py
+x64-windows/tools/boost-build/src/build/ac.jam
+x64-windows/tools/boost-build/src/build/alias.jam
+x64-windows/tools/boost-build/src/build/alias.py
+x64-windows/tools/boost-build/src/build/build-request.jam
+x64-windows/tools/boost-build/src/build/build_request.py
+x64-windows/tools/boost-build/src/build/config-cache.jam
+x64-windows/tools/boost-build/src/build/configure.jam
+x64-windows/tools/boost-build/src/build/configure.py
+x64-windows/tools/boost-build/src/build/engine.py
+x64-windows/tools/boost-build/src/build/errors.py
+x64-windows/tools/boost-build/src/build/feature.jam
+x64-windows/tools/boost-build/src/build/feature.py
+x64-windows/tools/boost-build/src/build/generators.jam
+x64-windows/tools/boost-build/src/build/generators.py
+x64-windows/tools/boost-build/src/build/project.jam
+x64-windows/tools/boost-build/src/build/project.py
+x64-windows/tools/boost-build/src/build/property-set.jam
+x64-windows/tools/boost-build/src/build/property.jam
+x64-windows/tools/boost-build/src/build/property.py
+x64-windows/tools/boost-build/src/build/property_set.py
+x64-windows/tools/boost-build/src/build/readme.txt
+x64-windows/tools/boost-build/src/build/scanner.jam
+x64-windows/tools/boost-build/src/build/scanner.py
+x64-windows/tools/boost-build/src/build/targets.jam
+x64-windows/tools/boost-build/src/build/targets.py
+x64-windows/tools/boost-build/src/build/toolset.jam
+x64-windows/tools/boost-build/src/build/toolset.py
+x64-windows/tools/boost-build/src/build/type.jam
+x64-windows/tools/boost-build/src/build/type.py
+x64-windows/tools/boost-build/src/build/version.jam
+x64-windows/tools/boost-build/src/build/version.py
+x64-windows/tools/boost-build/src/build/virtual-target.jam
+x64-windows/tools/boost-build/src/build/virtual_target.py
+x64-windows/tools/boost-build/src/build_system.py
+x64-windows/tools/boost-build/src/contrib/
+x64-windows/tools/boost-build/src/contrib/__init__.py
+x64-windows/tools/boost-build/src/contrib/boost.jam
+x64-windows/tools/boost-build/src/contrib/boost.py
+x64-windows/tools/boost-build/src/contrib/modular.jam
+x64-windows/tools/boost-build/src/contrib/tntnet.jam
+x64-windows/tools/boost-build/src/contrib/wxFormBuilder.jam
+x64-windows/tools/boost-build/src/engine/
+x64-windows/tools/boost-build/src/engine/.gitignore
+x64-windows/tools/boost-build/src/engine/Jambase
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/b2.exe
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/bjam.exe
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/builtins.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/class.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/command.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/compile.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/constants.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/cwd.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/debug.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/debugger.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/execcmd.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/execnt.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/filent.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/filesys.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/frames.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/function.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/glob.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/hash.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/hcache.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/hdrmacro.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/headers.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/jam.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/jambase.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/jamgram.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/lists.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/make.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/make1.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/md5.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/mem.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/modules.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/native.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/object.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/option.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/order.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/output.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/parse.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/path.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/pathnt.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/pathsys.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/property-set.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/regex.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/regexp.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/rules.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/scan.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/search.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/sequence.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/set.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/strings.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/subst.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/timestamp.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/variable.obj
+x64-windows/tools/boost-build/src/engine/bin.ntx86_64/w32_getreg.obj
+x64-windows/tools/boost-build/src/engine/boehm_gc/
+x64-windows/tools/boost-build/src/engine/boehm_gc/AmigaOS.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/BCC_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/ChangeLog
+x64-windows/tools/boost-build/src/engine/boehm_gc/EMX_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/MacOS.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/MacProjects.sit.hqx
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/MacOS_Test_config.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/MacOS_config.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/dataend.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/Mac_files/datastart.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.DLLs
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.direct
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.dj
+x64-windows/tools/boost-build/src/engine/boehm_gc/Makefile.in
+x64-windows/tools/boost-build/src/engine/boehm_gc/NT_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/NT_STATIC_THREADS_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/NT_THREADS_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/NT_X64_STATIC_THREADS_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/OS2_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/PCR-Makefile
+x64-windows/tools/boost-build/src/engine/boehm_gc/README.QUICK
+x64-windows/tools/boost-build/src/engine/boehm_gc/SMakefile.amiga
+x64-windows/tools/boost-build/src/engine/boehm_gc/WCC_MAKEFILE
+x64-windows/tools/boost-build/src/engine/boehm_gc/acinclude.m4
+x64-windows/tools/boost-build/src/engine/boehm_gc/aclocal.m4
+x64-windows/tools/boost-build/src/engine/boehm_gc/add_gc_prefix.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/allchblk.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/alloc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/alpha_mach_dep.S
+x64-windows/tools/boost-build/src/engine/boehm_gc/backgraph.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/bdw-gc.pc
+x64-windows/tools/boost-build/src/engine/boehm_gc/bdw-gc.pc.in
+x64-windows/tools/boost-build/src/engine/boehm_gc/blacklst.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/callprocs
+x64-windows/tools/boost-build/src/engine/boehm_gc/checksums.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/compile
+x64-windows/tools/boost-build/src/engine/boehm_gc/config.guess
+x64-windows/tools/boost-build/src/engine/boehm_gc/config.sub
+x64-windows/tools/boost-build/src/engine/boehm_gc/configure
+x64-windows/tools/boost-build/src/engine/boehm_gc/configure.ac
+x64-windows/tools/boost-build/src/engine/boehm_gc/configure.host
+x64-windows/tools/boost-build/src/engine/boehm_gc/configure_atomic_ops.sh
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cord.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cordbscs.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cordprnt.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cordtest.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/cordxtra.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_cmds.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_win.ICO
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_win.RC
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_win.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/cord/de_win.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/darwin_stop_world.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/dbg_mlc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/depcomp
+x64-windows/tools/boost-build/src/engine/boehm_gc/digimars.mak
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.DGUX386
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.Mac
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.MacOSX
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.OS2
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.amiga
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.arm.cross
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.autoconf
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.changes
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.contributors
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.cords
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.darwin
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.dj
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.environment
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.ews4800
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.hp
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.linux
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.macros
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.rs6000
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.sgi
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.solaris2
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.uts
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.win32
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/README.win64
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/barrett_diagram
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/debugging.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/doc.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/gc.man
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/gcdescr.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/gcinterface.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/leak.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/overview.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/porting.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/scale.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/simple_example.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/doc/tree.html
+x64-windows/tools/boost-build/src/engine/boehm_gc/dyn_load.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/finalize.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/gc.mak
+x64-windows/tools/boost-build/src/engine/boehm_gc/gc_cpp.cc
+x64-windows/tools/boost-build/src/engine/boehm_gc/gc_cpp.cpp
+x64-windows/tools/boost-build/src/engine/boehm_gc/gc_dlopen.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/gcj_mlc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/gcname.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/headers.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/hpux_test_and_clear.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/ia64_save_regs_in_stack.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/if_mach.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/if_not_there.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/cord.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/ec.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_allocator.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_amiga_redirects.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_backptr.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_config_macros.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_cpp.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_gcj.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_inline.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_mark.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_pthread_redirects.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_tiny_fl.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/gc_typed.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/include.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/javaxfc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/leak_detector.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/new_gc_alloc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/cord_pos.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/darwin_semaphore.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/darwin_stop_world.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/dbg_mlc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gc_hdrs.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gc_locks.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gc_pmark.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gc_priv.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/gcconfig.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/msvc_dbg.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/pthread_stop_world.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/pthread_support.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/specific.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/private/thread_local_alloc.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/include/weakpointer.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/install-sh
+x64-windows/tools/boost-build/src/engine/boehm_gc/libtool.m4
+x64-windows/tools/boost-build/src/engine/boehm_gc/ltmain.sh
+x64-windows/tools/boost-build/src/engine/boehm_gc/mach_dep.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/malloc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/mallocx.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/mark.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/mark_rts.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/mips_sgi_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/mips_ultrix_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/misc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/missing
+x64-windows/tools/boost-build/src/engine/boehm_gc/mkinstalldirs
+x64-windows/tools/boost-build/src/engine/boehm_gc/msvc_dbg.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/new_hblk.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/obj_map.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/os_dep.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/pcr_interface.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/pthread_stop_world.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/pthread_support.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/ptr_chck.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/real_malloc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/reclaim.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/rs6000_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/setjmp_t.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/sparc_mach_dep.S
+x64-windows/tools/boost-build/src/engine/boehm_gc/sparc_netbsd_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/sparc_sunos4_mach_dep.s
+x64-windows/tools/boost-build/src/engine/boehm_gc/specific.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/stubborn.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/leak_test.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/middle.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/test.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/test_cpp.cc
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/tests.am
+x64-windows/tools/boost-build/src/engine/boehm_gc/tests/thread_leak_test.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/thread_local_alloc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/threadlibs.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/typd_mlc.c
+x64-windows/tools/boost-build/src/engine/boehm_gc/version.h
+x64-windows/tools/boost-build/src/engine/boehm_gc/win32_threads.c
+x64-windows/tools/boost-build/src/engine/boost-jam.spec
+x64-windows/tools/boost-build/src/engine/boost-no-inspect
+x64-windows/tools/boost-build/src/engine/bootstrap/
+x64-windows/tools/boost-build/src/engine/bootstrap/builtins.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/class.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/command.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/compile.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/constants.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/cwd.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/debug.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/execcmd.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/execnt.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/filent.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/filesys.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/frames.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/function.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/glob.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/hash.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/hdrmacro.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/headers.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/jam.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/jam0.exe
+x64-windows/tools/boost-build/src/engine/bootstrap/jam0.ilk
+x64-windows/tools/boost-build/src/engine/bootstrap/jam0.pdb
+x64-windows/tools/boost-build/src/engine/bootstrap/jambase.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/jamgram.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/lists.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/make.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/make1.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/md5.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/modules.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/native.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/object.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/option.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/order.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/output.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/parse.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/path.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/pathnt.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/pathsys.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/property-set.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/regex.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/regexp.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/rules.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/scan.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/search.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/sequence.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/set.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/strings.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/subst.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/timestamp.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/variable.obj
+x64-windows/tools/boost-build/src/engine/bootstrap/vc140.pdb
+x64-windows/tools/boost-build/src/engine/bootstrap/w32_getreg.obj
+x64-windows/tools/boost-build/src/engine/build.bat
+x64-windows/tools/boost-build/src/engine/build.jam
+x64-windows/tools/boost-build/src/engine/build.sh
+x64-windows/tools/boost-build/src/engine/build_vms.com
+x64-windows/tools/boost-build/src/engine/builtins.c
+x64-windows/tools/boost-build/src/engine/builtins.h
+x64-windows/tools/boost-build/src/engine/bump_version.py
+x64-windows/tools/boost-build/src/engine/class.c
+x64-windows/tools/boost-build/src/engine/class.h
+x64-windows/tools/boost-build/src/engine/command.c
+x64-windows/tools/boost-build/src/engine/command.h
+x64-windows/tools/boost-build/src/engine/compile.c
+x64-windows/tools/boost-build/src/engine/compile.h
+x64-windows/tools/boost-build/src/engine/config_toolset.bat
+x64-windows/tools/boost-build/src/engine/constants.c
+x64-windows/tools/boost-build/src/engine/constants.h
+x64-windows/tools/boost-build/src/engine/cwd.c
+x64-windows/tools/boost-build/src/engine/cwd.h
+x64-windows/tools/boost-build/src/engine/debian/
+x64-windows/tools/boost-build/src/engine/debian/changelog
+x64-windows/tools/boost-build/src/engine/debian/copyright
+x64-windows/tools/boost-build/src/engine/debian/jam.man.sgml
+x64-windows/tools/boost-build/src/engine/debian/rules
+x64-windows/tools/boost-build/src/engine/debug.c
+x64-windows/tools/boost-build/src/engine/debug.h
+x64-windows/tools/boost-build/src/engine/debugger.c
+x64-windows/tools/boost-build/src/engine/debugger.h
+x64-windows/tools/boost-build/src/engine/execcmd.c
+x64-windows/tools/boost-build/src/engine/execcmd.h
+x64-windows/tools/boost-build/src/engine/execnt.c
+x64-windows/tools/boost-build/src/engine/execunix.c
+x64-windows/tools/boost-build/src/engine/execvms.c
+x64-windows/tools/boost-build/src/engine/filent.c
+x64-windows/tools/boost-build/src/engine/filesys.c
+x64-windows/tools/boost-build/src/engine/filesys.h
+x64-windows/tools/boost-build/src/engine/fileunix.c
+x64-windows/tools/boost-build/src/engine/filevms.c
+x64-windows/tools/boost-build/src/engine/frames.c
+x64-windows/tools/boost-build/src/engine/frames.h
+x64-windows/tools/boost-build/src/engine/function.c
+x64-windows/tools/boost-build/src/engine/function.h
+x64-windows/tools/boost-build/src/engine/glob.c
+x64-windows/tools/boost-build/src/engine/guess_toolset.bat
+x64-windows/tools/boost-build/src/engine/hash.c
+x64-windows/tools/boost-build/src/engine/hash.h
+x64-windows/tools/boost-build/src/engine/hcache.c
+x64-windows/tools/boost-build/src/engine/hcache.h
+x64-windows/tools/boost-build/src/engine/hdrmacro.c
+x64-windows/tools/boost-build/src/engine/hdrmacro.h
+x64-windows/tools/boost-build/src/engine/headers.c
+x64-windows/tools/boost-build/src/engine/headers.h
+x64-windows/tools/boost-build/src/engine/jam.c
+x64-windows/tools/boost-build/src/engine/jam.h
+x64-windows/tools/boost-build/src/engine/jambase.c
+x64-windows/tools/boost-build/src/engine/jambase.h
+x64-windows/tools/boost-build/src/engine/jamgram.c
+x64-windows/tools/boost-build/src/engine/jamgram.h
+x64-windows/tools/boost-build/src/engine/jamgram.y
+x64-windows/tools/boost-build/src/engine/jamgram.yy
+x64-windows/tools/boost-build/src/engine/jamgramtab.h
+x64-windows/tools/boost-build/src/engine/lists.c
+x64-windows/tools/boost-build/src/engine/lists.h
+x64-windows/tools/boost-build/src/engine/make.c
+x64-windows/tools/boost-build/src/engine/make.h
+x64-windows/tools/boost-build/src/engine/make1.c
+x64-windows/tools/boost-build/src/engine/md5.c
+x64-windows/tools/boost-build/src/engine/md5.h
+x64-windows/tools/boost-build/src/engine/mem.c
+x64-windows/tools/boost-build/src/engine/mem.h
+x64-windows/tools/boost-build/src/engine/mkjambase.c
+x64-windows/tools/boost-build/src/engine/modules.c
+x64-windows/tools/boost-build/src/engine/modules.h
+x64-windows/tools/boost-build/src/engine/modules/
+x64-windows/tools/boost-build/src/engine/modules/order.c
+x64-windows/tools/boost-build/src/engine/modules/path.c
+x64-windows/tools/boost-build/src/engine/modules/property-set.c
+x64-windows/tools/boost-build/src/engine/modules/readme.txt
+x64-windows/tools/boost-build/src/engine/modules/regex.c
+x64-windows/tools/boost-build/src/engine/modules/sequence.c
+x64-windows/tools/boost-build/src/engine/modules/set.c
+x64-windows/tools/boost-build/src/engine/native.c
+x64-windows/tools/boost-build/src/engine/native.h
+x64-windows/tools/boost-build/src/engine/object.c
+x64-windows/tools/boost-build/src/engine/object.h
+x64-windows/tools/boost-build/src/engine/option.c
+x64-windows/tools/boost-build/src/engine/option.h
+x64-windows/tools/boost-build/src/engine/output.c
+x64-windows/tools/boost-build/src/engine/output.h
+x64-windows/tools/boost-build/src/engine/parse.c
+x64-windows/tools/boost-build/src/engine/parse.h
+x64-windows/tools/boost-build/src/engine/patchlevel.h
+x64-windows/tools/boost-build/src/engine/pathnt.c
+x64-windows/tools/boost-build/src/engine/pathsys.c
+x64-windows/tools/boost-build/src/engine/pathsys.h
+x64-windows/tools/boost-build/src/engine/pathunix.c
+x64-windows/tools/boost-build/src/engine/pathvms.c
+x64-windows/tools/boost-build/src/engine/regexp.c
+x64-windows/tools/boost-build/src/engine/regexp.h
+x64-windows/tools/boost-build/src/engine/rules.c
+x64-windows/tools/boost-build/src/engine/rules.h
+x64-windows/tools/boost-build/src/engine/scan.c
+x64-windows/tools/boost-build/src/engine/scan.h
+x64-windows/tools/boost-build/src/engine/search.c
+x64-windows/tools/boost-build/src/engine/search.h
+x64-windows/tools/boost-build/src/engine/strings.c
+x64-windows/tools/boost-build/src/engine/strings.h
+x64-windows/tools/boost-build/src/engine/subst.c
+x64-windows/tools/boost-build/src/engine/subst.h
+x64-windows/tools/boost-build/src/engine/timestamp.c
+x64-windows/tools/boost-build/src/engine/timestamp.h
+x64-windows/tools/boost-build/src/engine/variable.c
+x64-windows/tools/boost-build/src/engine/variable.h
+x64-windows/tools/boost-build/src/engine/vswhere_usability_wrapper.cmd
+x64-windows/tools/boost-build/src/engine/w32_getreg.c
+x64-windows/tools/boost-build/src/engine/yyacc.c
+x64-windows/tools/boost-build/src/exceptions.py
+x64-windows/tools/boost-build/src/kernel/
+x64-windows/tools/boost-build/src/kernel/boost-build.jam
+x64-windows/tools/boost-build/src/kernel/bootstrap.jam
+x64-windows/tools/boost-build/src/kernel/bootstrap.py
+x64-windows/tools/boost-build/src/kernel/class.jam
+x64-windows/tools/boost-build/src/kernel/errors.jam
+x64-windows/tools/boost-build/src/kernel/modules.jam
+x64-windows/tools/boost-build/src/manager.py
+x64-windows/tools/boost-build/src/options/
+x64-windows/tools/boost-build/src/options/help.jam
+x64-windows/tools/boost-build/src/tools/
+x64-windows/tools/boost-build/src/tools/__init__.py
+x64-windows/tools/boost-build/src/tools/acc.jam
+x64-windows/tools/boost-build/src/tools/asciidoctor.jam
+x64-windows/tools/boost-build/src/tools/auto-index.jam
+x64-windows/tools/boost-build/src/tools/bison.jam
+x64-windows/tools/boost-build/src/tools/boostbook-config.jam
+x64-windows/tools/boost-build/src/tools/boostbook.jam
+x64-windows/tools/boost-build/src/tools/borland.jam
+x64-windows/tools/boost-build/src/tools/builtin.jam
+x64-windows/tools/boost-build/src/tools/builtin.py
+x64-windows/tools/boost-build/src/tools/bzip2.jam
+x64-windows/tools/boost-build/src/tools/cast.jam
+x64-windows/tools/boost-build/src/tools/cast.py
+x64-windows/tools/boost-build/src/tools/clang-darwin.jam
+x64-windows/tools/boost-build/src/tools/clang-linux.jam
+x64-windows/tools/boost-build/src/tools/clang-vxworks.jam
+x64-windows/tools/boost-build/src/tools/clang-win.jam
+x64-windows/tools/boost-build/src/tools/clang.jam
+x64-windows/tools/boost-build/src/tools/common.jam
+x64-windows/tools/boost-build/src/tools/common.py
+x64-windows/tools/boost-build/src/tools/como-linux.jam
+x64-windows/tools/boost-build/src/tools/como-win.jam
+x64-windows/tools/boost-build/src/tools/como.jam
+x64-windows/tools/boost-build/src/tools/convert.jam
+x64-windows/tools/boost-build/src/tools/cray.jam
+x64-windows/tools/boost-build/src/tools/cw-config.jam
+x64-windows/tools/boost-build/src/tools/cw.jam
+x64-windows/tools/boost-build/src/tools/cygwin.jam
+x64-windows/tools/boost-build/src/tools/darwin.jam
+x64-windows/tools/boost-build/src/tools/darwin.py
+x64-windows/tools/boost-build/src/tools/diab.jam
+x64-windows/tools/boost-build/src/tools/dmc.jam
+x64-windows/tools/boost-build/src/tools/docutils.jam
+x64-windows/tools/boost-build/src/tools/doxproc.py
+x64-windows/tools/boost-build/src/tools/doxygen-config.jam
+x64-windows/tools/boost-build/src/tools/doxygen.jam
+x64-windows/tools/boost-build/src/tools/doxygen/
+x64-windows/tools/boost-build/src/tools/doxygen/windows-paths-check.doxyfile
+x64-windows/tools/boost-build/src/tools/doxygen/windows-paths-check.hpp
+x64-windows/tools/boost-build/src/tools/emscripten.jam
+x64-windows/tools/boost-build/src/tools/features/
+x64-windows/tools/boost-build/src/tools/features/__init_features__.jam
+x64-windows/tools/boost-build/src/tools/features/address-model-feature.jam
+x64-windows/tools/boost-build/src/tools/features/allow-feature.jam
+x64-windows/tools/boost-build/src/tools/features/architecture-feature.jam
+x64-windows/tools/boost-build/src/tools/features/archiveflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/asmflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/build-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/conditional-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cxx-template-depth-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cxxabi-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cxxflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/cxxstd-feature.jam
+x64-windows/tools/boost-build/src/tools/features/debug-feature.jam
+x64-windows/tools/boost-build/src/tools/features/define-feature.jam
+x64-windows/tools/boost-build/src/tools/features/dependency-feature.jam
+x64-windows/tools/boost-build/src/tools/features/dll-feature.jam
+x64-windows/tools/boost-build/src/tools/features/exception-feature.jam
+x64-windows/tools/boost-build/src/tools/features/fflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/file-feature.jam
+x64-windows/tools/boost-build/src/tools/features/find-lib-feature.jam
+x64-windows/tools/boost-build/src/tools/features/flags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/include-feature.jam
+x64-windows/tools/boost-build/src/tools/features/instruction-set-feature.jam
+x64-windows/tools/boost-build/src/tools/features/internal-feature.jam
+x64-windows/tools/boost-build/src/tools/features/library-feature.jam
+x64-windows/tools/boost-build/src/tools/features/link-feature.jam
+x64-windows/tools/boost-build/src/tools/features/linkflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/location-feature.jam
+x64-windows/tools/boost-build/src/tools/features/location-prefix-feature.jam
+x64-windows/tools/boost-build/src/tools/features/name-feature.jam
+x64-windows/tools/boost-build/src/tools/features/objcflags-feature.jam
+x64-windows/tools/boost-build/src/tools/features/optimization-feature.jam
+x64-windows/tools/boost-build/src/tools/features/os-feature.jam
+x64-windows/tools/boost-build/src/tools/features/relevant-feature.jam
+x64-windows/tools/boost-build/src/tools/features/rtti-feature.jam
+x64-windows/tools/boost-build/src/tools/features/runtime-feature.jam
+x64-windows/tools/boost-build/src/tools/features/search-feature.jam
+x64-windows/tools/boost-build/src/tools/features/source-feature.jam
+x64-windows/tools/boost-build/src/tools/features/stdlib-feature.jam
+x64-windows/tools/boost-build/src/tools/features/strip-feature.jam
+x64-windows/tools/boost-build/src/tools/features/tag-feature.jam
+x64-windows/tools/boost-build/src/tools/features/threadapi-feature.jam
+x64-windows/tools/boost-build/src/tools/features/threading-feature.jam
+x64-windows/tools/boost-build/src/tools/features/toolset-feature.jam
+x64-windows/tools/boost-build/src/tools/features/user-interface-feature.jam
+x64-windows/tools/boost-build/src/tools/features/variant-feature.jam
+x64-windows/tools/boost-build/src/tools/features/version-feature.jam
+x64-windows/tools/boost-build/src/tools/features/warnings-feature.jam
+x64-windows/tools/boost-build/src/tools/flags.jam
+x64-windows/tools/boost-build/src/tools/fop.jam
+x64-windows/tools/boost-build/src/tools/fortran.jam
+x64-windows/tools/boost-build/src/tools/gcc.jam
+x64-windows/tools/boost-build/src/tools/gcc.py
+x64-windows/tools/boost-build/src/tools/generate.jam
+x64-windows/tools/boost-build/src/tools/generators/
+x64-windows/tools/boost-build/src/tools/generators/__init_generators__.jam
+x64-windows/tools/boost-build/src/tools/generators/archive-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/c-compiling-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/dummy-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/lib-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/linking-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/prebuilt-lib-generator.jam
+x64-windows/tools/boost-build/src/tools/generators/searched-lib-generator.jam
+x64-windows/tools/boost-build/src/tools/gettext.jam
+x64-windows/tools/boost-build/src/tools/gfortran.jam
+x64-windows/tools/boost-build/src/tools/hp_cxx.jam
+x64-windows/tools/boost-build/src/tools/hpfortran.jam
+x64-windows/tools/boost-build/src/tools/ifort.jam
+x64-windows/tools/boost-build/src/tools/intel-darwin.jam
+x64-windows/tools/boost-build/src/tools/intel-linux.jam
+x64-windows/tools/boost-build/src/tools/intel-vxworks.jam
+x64-windows/tools/boost-build/src/tools/intel-win.jam
+x64-windows/tools/boost-build/src/tools/intel.jam
+x64-windows/tools/boost-build/src/tools/lex.jam
+x64-windows/tools/boost-build/src/tools/libjpeg.jam
+x64-windows/tools/boost-build/src/tools/libpng.jam
+x64-windows/tools/boost-build/src/tools/libtiff.jam
+x64-windows/tools/boost-build/src/tools/link.jam
+x64-windows/tools/boost-build/src/tools/lzma.jam
+x64-windows/tools/boost-build/src/tools/make.jam
+x64-windows/tools/boost-build/src/tools/make.py
+x64-windows/tools/boost-build/src/tools/mc.jam
+x64-windows/tools/boost-build/src/tools/mc.py
+x64-windows/tools/boost-build/src/tools/message.jam
+x64-windows/tools/boost-build/src/tools/message.py
+x64-windows/tools/boost-build/src/tools/midl.jam
+x64-windows/tools/boost-build/src/tools/midl.py
+x64-windows/tools/boost-build/src/tools/mipspro.jam
+x64-windows/tools/boost-build/src/tools/mpi.jam
+x64-windows/tools/boost-build/src/tools/msvc-config.jam
+x64-windows/tools/boost-build/src/tools/msvc.jam
+x64-windows/tools/boost-build/src/tools/msvc.py
+x64-windows/tools/boost-build/src/tools/notfile.jam
+x64-windows/tools/boost-build/src/tools/notfile.py
+x64-windows/tools/boost-build/src/tools/package.jam
+x64-windows/tools/boost-build/src/tools/package.py
+x64-windows/tools/boost-build/src/tools/pathscale.jam
+x64-windows/tools/boost-build/src/tools/pch.jam
+x64-windows/tools/boost-build/src/tools/pch.py
+x64-windows/tools/boost-build/src/tools/pgi.jam
+x64-windows/tools/boost-build/src/tools/python-config.jam
+x64-windows/tools/boost-build/src/tools/python.jam
+x64-windows/tools/boost-build/src/tools/qcc.jam
+x64-windows/tools/boost-build/src/tools/qt.jam
+x64-windows/tools/boost-build/src/tools/qt3.jam
+x64-windows/tools/boost-build/src/tools/qt4.jam
+x64-windows/tools/boost-build/src/tools/qt5.jam
+x64-windows/tools/boost-build/src/tools/quickbook-config.jam
+x64-windows/tools/boost-build/src/tools/quickbook.jam
+x64-windows/tools/boost-build/src/tools/rc.jam
+x64-windows/tools/boost-build/src/tools/rc.py
+x64-windows/tools/boost-build/src/tools/sass.jam
+x64-windows/tools/boost-build/src/tools/stage.jam
+x64-windows/tools/boost-build/src/tools/stage.py
+x64-windows/tools/boost-build/src/tools/stlport.jam
+x64-windows/tools/boost-build/src/tools/sun.jam
+x64-windows/tools/boost-build/src/tools/symlink.jam
+x64-windows/tools/boost-build/src/tools/symlink.py
+x64-windows/tools/boost-build/src/tools/testing-aux.jam
+x64-windows/tools/boost-build/src/tools/testing.jam
+x64-windows/tools/boost-build/src/tools/testing.py
+x64-windows/tools/boost-build/src/tools/types/
+x64-windows/tools/boost-build/src/tools/types/__init__.py
+x64-windows/tools/boost-build/src/tools/types/adoc.jam
+x64-windows/tools/boost-build/src/tools/types/asm.jam
+x64-windows/tools/boost-build/src/tools/types/asm.py
+x64-windows/tools/boost-build/src/tools/types/cpp.jam
+x64-windows/tools/boost-build/src/tools/types/cpp.py
+x64-windows/tools/boost-build/src/tools/types/css.jam
+x64-windows/tools/boost-build/src/tools/types/docbook.jam
+x64-windows/tools/boost-build/src/tools/types/exe.jam
+x64-windows/tools/boost-build/src/tools/types/exe.py
+x64-windows/tools/boost-build/src/tools/types/html.jam
+x64-windows/tools/boost-build/src/tools/types/html.py
+x64-windows/tools/boost-build/src/tools/types/lib.jam
+x64-windows/tools/boost-build/src/tools/types/lib.py
+x64-windows/tools/boost-build/src/tools/types/man.jam
+x64-windows/tools/boost-build/src/tools/types/markdown.jam
+x64-windows/tools/boost-build/src/tools/types/markdown.py
+x64-windows/tools/boost-build/src/tools/types/obj.jam
+x64-windows/tools/boost-build/src/tools/types/obj.py
+x64-windows/tools/boost-build/src/tools/types/objc.jam
+x64-windows/tools/boost-build/src/tools/types/pdf.jam
+x64-windows/tools/boost-build/src/tools/types/preprocessed.jam
+x64-windows/tools/boost-build/src/tools/types/preprocessed.py
+x64-windows/tools/boost-build/src/tools/types/qt.jam
+x64-windows/tools/boost-build/src/tools/types/register.jam
+x64-windows/tools/boost-build/src/tools/types/rsp.jam
+x64-windows/tools/boost-build/src/tools/types/rsp.py
+x64-windows/tools/boost-build/src/tools/types/sass-type.jam
+x64-windows/tools/boost-build/src/tools/types/xml.jam
+x64-windows/tools/boost-build/src/tools/unix.jam
+x64-windows/tools/boost-build/src/tools/unix.py
+x64-windows/tools/boost-build/src/tools/vacpp.jam
+x64-windows/tools/boost-build/src/tools/vmsdecc.jam
+x64-windows/tools/boost-build/src/tools/whale.jam
+x64-windows/tools/boost-build/src/tools/xlcpp.jam
+x64-windows/tools/boost-build/src/tools/xlf.jam
+x64-windows/tools/boost-build/src/tools/xsltproc-config.jam
+x64-windows/tools/boost-build/src/tools/xsltproc.jam
+x64-windows/tools/boost-build/src/tools/xsltproc/
+x64-windows/tools/boost-build/src/tools/xsltproc/included.xsl
+x64-windows/tools/boost-build/src/tools/xsltproc/test.xml
+x64-windows/tools/boost-build/src/tools/xsltproc/test.xsl
+x64-windows/tools/boost-build/src/tools/zlib.jam
+x64-windows/tools/boost-build/src/tools/zstd.jam
+x64-windows/tools/boost-build/src/util/
+x64-windows/tools/boost-build/src/util/__init__.py
+x64-windows/tools/boost-build/src/util/assert.jam
+x64-windows/tools/boost-build/src/util/container.jam
+x64-windows/tools/boost-build/src/util/doc.jam
+x64-windows/tools/boost-build/src/util/indirect.jam
+x64-windows/tools/boost-build/src/util/indirect.py
+x64-windows/tools/boost-build/src/util/logger.py
+x64-windows/tools/boost-build/src/util/numbers.jam
+x64-windows/tools/boost-build/src/util/option.jam
+x64-windows/tools/boost-build/src/util/option.py
+x64-windows/tools/boost-build/src/util/order.jam
+x64-windows/tools/boost-build/src/util/order.py
+x64-windows/tools/boost-build/src/util/os.jam
+x64-windows/tools/boost-build/src/util/os_j.py
+x64-windows/tools/boost-build/src/util/param.jam
+x64-windows/tools/boost-build/src/util/path.jam
+x64-windows/tools/boost-build/src/util/path.py
+x64-windows/tools/boost-build/src/util/print.jam
+x64-windows/tools/boost-build/src/util/regex.jam
+x64-windows/tools/boost-build/src/util/regex.py
+x64-windows/tools/boost-build/src/util/sequence.jam
+x64-windows/tools/boost-build/src/util/sequence.py
+x64-windows/tools/boost-build/src/util/set.jam
+x64-windows/tools/boost-build/src/util/set.py
+x64-windows/tools/boost-build/src/util/string.jam
+x64-windows/tools/boost-build/src/util/utility.jam
+x64-windows/tools/boost-build/src/util/utility.py
+x64-windows/tools/boost-build/test/
+x64-windows/tools/boost-build/test/BoostBuild.py
+x64-windows/tools/boost-build/test/Jamfile.jam
+x64-windows/tools/boost-build/test/MockToolset.py
+x64-windows/tools/boost-build/test/TestCmd.py
+x64-windows/tools/boost-build/test/TestToolset.py
+x64-windows/tools/boost-build/test/abs_workdir.py
+x64-windows/tools/boost-build/test/absolute_sources.py
+x64-windows/tools/boost-build/test/alias.py
+x64-windows/tools/boost-build/test/alternatives.py
+x64-windows/tools/boost-build/test/bad_dirname.py
+x64-windows/tools/boost-build/test/boost-build.jam
+x64-windows/tools/boost-build/test/boostbook.py
+x64-windows/tools/boost-build/test/boostbook/
+x64-windows/tools/boost-build/test/boostbook/a.hpp
+x64-windows/tools/boost-build/test/boostbook/docs.xml
+x64-windows/tools/boost-build/test/boostbook/jamroot.jam
+x64-windows/tools/boost-build/test/build_dir.py
+x64-windows/tools/boost-build/test/build_file.py
+x64-windows/tools/boost-build/test/build_hooks.py
+x64-windows/tools/boost-build/test/build_no.py
+x64-windows/tools/boost-build/test/builtin_echo.py
+x64-windows/tools/boost-build/test/builtin_exit.py
+x64-windows/tools/boost-build/test/builtin_glob.py
+x64-windows/tools/boost-build/test/builtin_glob_archive.py
+x64-windows/tools/boost-build/test/builtin_readlink.py
+x64-windows/tools/boost-build/test/builtin_split_by_characters.py
+x64-windows/tools/boost-build/test/bzip2.py
+x64-windows/tools/boost-build/test/c_file.py
+x64-windows/tools/boost-build/test/chain.py
+x64-windows/tools/boost-build/test/clean.py
+x64-windows/tools/boost-build/test/cli_property_expansion.py
+x64-windows/tools/boost-build/test/collect_debug_info.py
+x64-windows/tools/boost-build/test/command_line_properties.py
+x64-windows/tools/boost-build/test/composite.py
+x64-windows/tools/boost-build/test/conditionals.py
+x64-windows/tools/boost-build/test/conditionals2.py
+x64-windows/tools/boost-build/test/conditionals3.py
+x64-windows/tools/boost-build/test/conditionals_multiple.py
+x64-windows/tools/boost-build/test/configuration.py
+x64-windows/tools/boost-build/test/configure.py
+x64-windows/tools/boost-build/test/copy_time.py
+x64-windows/tools/boost-build/test/core-language/
+x64-windows/tools/boost-build/test/core-language/test.jam
+x64-windows/tools/boost-build/test/core_action_output.py
+x64-windows/tools/boost-build/test/core_action_status.py
+x64-windows/tools/boost-build/test/core_actions_quietly.py
+x64-windows/tools/boost-build/test/core_arguments.py
+x64-windows/tools/boost-build/test/core_at_file.py
+x64-windows/tools/boost-build/test/core_bindrule.py
+x64-windows/tools/boost-build/test/core_d12.py
+x64-windows/tools/boost-build/test/core_delete_module.py
+x64-windows/tools/boost-build/test/core_dependencies.py
+x64-windows/tools/boost-build/test/core_fail_expected.py
+x64-windows/tools/boost-build/test/core_import_module.py
+x64-windows/tools/boost-build/test/core_jamshell.py
+x64-windows/tools/boost-build/test/core_language.py
+x64-windows/tools/boost-build/test/core_modifiers.py
+x64-windows/tools/boost-build/test/core_multifile_actions.py
+x64-windows/tools/boost-build/test/core_nt_cmd_line.py
+x64-windows/tools/boost-build/test/core_option_d2.py
+x64-windows/tools/boost-build/test/core_option_l.py
+x64-windows/tools/boost-build/test/core_option_n.py
+x64-windows/tools/boost-build/test/core_parallel_actions.py
+x64-windows/tools/boost-build/test/core_parallel_multifile_actions_1.py
+x64-windows/tools/boost-build/test/core_parallel_multifile_actions_2.py
+x64-windows/tools/boost-build/test/core_scanner.py
+x64-windows/tools/boost-build/test/core_source_line_tracking.py
+x64-windows/tools/boost-build/test/core_typecheck.py
+x64-windows/tools/boost-build/test/core_update_now.py
+x64-windows/tools/boost-build/test/core_variables_in_actions.py
+x64-windows/tools/boost-build/test/core_varnames.py
+x64-windows/tools/boost-build/test/custom_generator.py
+x64-windows/tools/boost-build/test/debugger-mi.py
+x64-windows/tools/boost-build/test/debugger.py
+x64-windows/tools/boost-build/test/default_build.py
+x64-windows/tools/boost-build/test/default_features.py
+x64-windows/tools/boost-build/test/default_toolset.py
+x64-windows/tools/boost-build/test/dependency_property.py
+x64-windows/tools/boost-build/test/dependency_test.py
+x64-windows/tools/boost-build/test/disambiguation.py
+x64-windows/tools/boost-build/test/dll_path.py
+x64-windows/tools/boost-build/test/double_loading.py
+x64-windows/tools/boost-build/test/duplicate.py
+x64-windows/tools/boost-build/test/example_customization.py
+x64-windows/tools/boost-build/test/example_gettext.py
+x64-windows/tools/boost-build/test/example_libraries.py
+x64-windows/tools/boost-build/test/example_make.py
+x64-windows/tools/boost-build/test/example_qt4.py
+x64-windows/tools/boost-build/test/exit_status.py
+x64-windows/tools/boost-build/test/expansion.py
+x64-windows/tools/boost-build/test/explicit.py
+x64-windows/tools/boost-build/test/feature_cxxflags.py
+x64-windows/tools/boost-build/test/feature_implicit_dependency.py
+x64-windows/tools/boost-build/test/feature_relevant.py
+x64-windows/tools/boost-build/test/feature_suppress_import_lib.py
+x64-windows/tools/boost-build/test/file_types.py
+x64-windows/tools/boost-build/test/flags.py
+x64-windows/tools/boost-build/test/gcc_runtime.py
+x64-windows/tools/boost-build/test/generator_selection.py
+x64-windows/tools/boost-build/test/generators_test.py
+x64-windows/tools/boost-build/test/implicit_dependency.py
+x64-windows/tools/boost-build/test/indirect_conditional.py
+x64-windows/tools/boost-build/test/inherit_toolset.py
+x64-windows/tools/boost-build/test/inherited_dependency.py
+x64-windows/tools/boost-build/test/inline.py
+x64-windows/tools/boost-build/test/lib_source_property.py
+x64-windows/tools/boost-build/test/lib_zlib.py
+x64-windows/tools/boost-build/test/libjpeg.py
+x64-windows/tools/boost-build/test/liblzma.py
+x64-windows/tools/boost-build/test/libpng.py
+x64-windows/tools/boost-build/test/library_chain.py
+x64-windows/tools/boost-build/test/library_order.py
+x64-windows/tools/boost-build/test/library_property.py
+x64-windows/tools/boost-build/test/libtiff.py
+x64-windows/tools/boost-build/test/libzstd.py
+x64-windows/tools/boost-build/test/link.py
+x64-windows/tools/boost-build/test/load_dir.py
+x64-windows/tools/boost-build/test/load_order.py
+x64-windows/tools/boost-build/test/loop.py
+x64-windows/tools/boost-build/test/make_rule.py
+x64-windows/tools/boost-build/test/message.py
+x64-windows/tools/boost-build/test/module_actions.py
+x64-windows/tools/boost-build/test/ndebug.py
+x64-windows/tools/boost-build/test/no_type.py
+x64-windows/tools/boost-build/test/notfile.py
+x64-windows/tools/boost-build/test/ordered_include.py
+x64-windows/tools/boost-build/test/ordered_properties.py
+x64-windows/tools/boost-build/test/out_of_tree.py
+x64-windows/tools/boost-build/test/param.py
+x64-windows/tools/boost-build/test/path_features.py
+x64-windows/tools/boost-build/test/pch.py
+x64-windows/tools/boost-build/test/prebuilt.py
+x64-windows/tools/boost-build/test/prebuilt/
+x64-windows/tools/boost-build/test/prebuilt/ext/
+x64-windows/tools/boost-build/test/prebuilt/ext/a.cpp
+x64-windows/tools/boost-build/test/prebuilt/ext/debug/
+x64-windows/tools/boost-build/test/prebuilt/ext/debug/a.h
+x64-windows/tools/boost-build/test/prebuilt/ext/jamfile.jam
+x64-windows/tools/boost-build/test/prebuilt/ext/jamfile2.jam
+x64-windows/tools/boost-build/test/prebuilt/ext/jamfile3.jam
+x64-windows/tools/boost-build/test/prebuilt/ext/jamroot.jam
+x64-windows/tools/boost-build/test/prebuilt/ext/release/
+x64-windows/tools/boost-build/test/prebuilt/ext/release/a.h
+x64-windows/tools/boost-build/test/prebuilt/hello.cpp
+x64-windows/tools/boost-build/test/prebuilt/jamfile.jam
+x64-windows/tools/boost-build/test/prebuilt/jamroot.jam
+x64-windows/tools/boost-build/test/preprocessor.py
+x64-windows/tools/boost-build/test/print.py
+x64-windows/tools/boost-build/test/project-test3/
+x64-windows/tools/boost-build/test/project-test3/a.cpp
+x64-windows/tools/boost-build/test/project-test3/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/jamroot.jam
+x64-windows/tools/boost-build/test/project-test3/lib/
+x64-windows/tools/boost-build/test/project-test3/lib/b.cpp
+x64-windows/tools/boost-build/test/project-test3/lib/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/lib2/
+x64-windows/tools/boost-build/test/project-test3/lib2/c.cpp
+x64-windows/tools/boost-build/test/project-test3/lib2/d.cpp
+x64-windows/tools/boost-build/test/project-test3/lib2/helper/
+x64-windows/tools/boost-build/test/project-test3/lib2/helper/e.cpp
+x64-windows/tools/boost-build/test/project-test3/lib2/helper/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/lib2/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/lib3/
+x64-windows/tools/boost-build/test/project-test3/lib3/f.cpp
+x64-windows/tools/boost-build/test/project-test3/lib3/jamfile.jam
+x64-windows/tools/boost-build/test/project-test3/lib3/jamroot.jam
+x64-windows/tools/boost-build/test/project-test3/readme.txt
+x64-windows/tools/boost-build/test/project-test4/
+x64-windows/tools/boost-build/test/project-test4/a.cpp
+x64-windows/tools/boost-build/test/project-test4/a_gcc.cpp
+x64-windows/tools/boost-build/test/project-test4/jamfile.jam
+x64-windows/tools/boost-build/test/project-test4/jamfile3.jam
+x64-windows/tools/boost-build/test/project-test4/jamfile4.jam
+x64-windows/tools/boost-build/test/project-test4/jamfile5.jam
+x64-windows/tools/boost-build/test/project-test4/jamroot.jam
+x64-windows/tools/boost-build/test/project-test4/lib/
+x64-windows/tools/boost-build/test/project-test4/lib/b.cpp
+x64-windows/tools/boost-build/test/project-test4/lib/jamfile.jam
+x64-windows/tools/boost-build/test/project-test4/lib/jamfile1.jam
+x64-windows/tools/boost-build/test/project-test4/lib/jamfile2.jam
+x64-windows/tools/boost-build/test/project-test4/lib/jamfile3.jam
+x64-windows/tools/boost-build/test/project-test4/lib2/
+x64-windows/tools/boost-build/test/project-test4/lib2/jamfile.jam
+x64-windows/tools/boost-build/test/project-test4/lib2/jamfile2.jam
+x64-windows/tools/boost-build/test/project-test4/readme.txt
+x64-windows/tools/boost-build/test/project_dependencies.py
+x64-windows/tools/boost-build/test/project_glob.py
+x64-windows/tools/boost-build/test/project_id.py
+x64-windows/tools/boost-build/test/project_root_constants.py
+x64-windows/tools/boost-build/test/project_root_rule.py
+x64-windows/tools/boost-build/test/project_test3.py
+x64-windows/tools/boost-build/test/project_test4.py
+x64-windows/tools/boost-build/test/property_expansion.py
+x64-windows/tools/boost-build/test/qt4.py
+x64-windows/tools/boost-build/test/qt4/
+x64-windows/tools/boost-build/test/qt4/.gitignore
+x64-windows/tools/boost-build/test/qt4/jamroot.jam
+x64-windows/tools/boost-build/test/qt4/mock.cpp
+x64-windows/tools/boost-build/test/qt4/mock.h
+x64-windows/tools/boost-build/test/qt4/phonon.cpp
+x64-windows/tools/boost-build/test/qt4/qt3support.cpp
+x64-windows/tools/boost-build/test/qt4/qtassistant.cpp
+x64-windows/tools/boost-build/test/qt4/qtcore.cpp
+x64-windows/tools/boost-build/test/qt4/qtcorefail.cpp
+x64-windows/tools/boost-build/test/qt4/qtdeclarative.cpp
+x64-windows/tools/boost-build/test/qt4/qtgui.cpp
+x64-windows/tools/boost-build/test/qt4/qthelp.cpp
+x64-windows/tools/boost-build/test/qt4/qtmultimedia.cpp
+x64-windows/tools/boost-build/test/qt4/qtnetwork.cpp
+x64-windows/tools/boost-build/test/qt4/qtscript.cpp
+x64-windows/tools/boost-build/test/qt4/qtscripttools.cpp
+x64-windows/tools/boost-build/test/qt4/qtsql.cpp
+x64-windows/tools/boost-build/test/qt4/qtsvg.cpp
+x64-windows/tools/boost-build/test/qt4/qttest.cpp
+x64-windows/tools/boost-build/test/qt4/qtwebkit.cpp
+x64-windows/tools/boost-build/test/qt4/qtxml.cpp
+x64-windows/tools/boost-build/test/qt4/qtxmlpatterns.cpp
+x64-windows/tools/boost-build/test/qt4/rcc.cpp
+x64-windows/tools/boost-build/test/qt4/rcc.qrc
+x64-windows/tools/boost-build/test/qt5.py
+x64-windows/tools/boost-build/test/qt5/
+x64-windows/tools/boost-build/test/qt5/.gitignore
+x64-windows/tools/boost-build/test/qt5/jamroot.jam
+x64-windows/tools/boost-build/test/qt5/mock.cpp
+x64-windows/tools/boost-build/test/qt5/mock.h
+x64-windows/tools/boost-build/test/qt5/qt3dcore.cpp
+x64-windows/tools/boost-build/test/qt5/qt3dinput.cpp
+x64-windows/tools/boost-build/test/qt5/qt3dlogic.cpp
+x64-windows/tools/boost-build/test/qt5/qt3drender.cpp
+x64-windows/tools/boost-build/test/qt5/qtassistant.cpp
+x64-windows/tools/boost-build/test/qt5/qtbluetooth.cpp
+x64-windows/tools/boost-build/test/qt5/qtcharts.cpp
+x64-windows/tools/boost-build/test/qt5/qtcore.cpp
+x64-windows/tools/boost-build/test/qt5/qtcorefail.cpp
+x64-windows/tools/boost-build/test/qt5/qtdatavisualization.cpp
+x64-windows/tools/boost-build/test/qt5/qtdeclarative.cpp
+x64-windows/tools/boost-build/test/qt5/qtgamepad.cpp
+x64-windows/tools/boost-build/test/qt5/qthelp.cpp
+x64-windows/tools/boost-build/test/qt5/qtlocation.cpp
+x64-windows/tools/boost-build/test/qt5/qtmultimedia.cpp
+x64-windows/tools/boost-build/test/qt5/qtnetwork.cpp
+x64-windows/tools/boost-build/test/qt5/qtnfc.cpp
+x64-windows/tools/boost-build/test/qt5/qtpositioning.cpp
+x64-windows/tools/boost-build/test/qt5/qtpurchasing.cpp
+x64-windows/tools/boost-build/test/qt5/qtquick.cpp
+x64-windows/tools/boost-build/test/qt5/qtquick.qml
+x64-windows/tools/boost-build/test/qt5/qtscript.cpp
+x64-windows/tools/boost-build/test/qt5/qtscripttools.cpp
+x64-windows/tools/boost-build/test/qt5/qtscxml.cpp
+x64-windows/tools/boost-build/test/qt5/qtserialbus.cpp
+x64-windows/tools/boost-build/test/qt5/qtserialport.cpp
+x64-windows/tools/boost-build/test/qt5/qtsql.cpp
+x64-windows/tools/boost-build/test/qt5/qtsvg.cpp
+x64-windows/tools/boost-build/test/qt5/qttest.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebchannel.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebengine.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebenginewidgets.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebkit.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebkitwidgets.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebsocket.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebsockets.cpp
+x64-windows/tools/boost-build/test/qt5/qtwebview.cpp
+x64-windows/tools/boost-build/test/qt5/qtwidgets.cpp
+x64-windows/tools/boost-build/test/qt5/qtxml.cpp
+x64-windows/tools/boost-build/test/qt5/qtxmlpatterns.cpp
+x64-windows/tools/boost-build/test/qt5/rcc.cpp
+x64-windows/tools/boost-build/test/qt5/rcc.qrc
+x64-windows/tools/boost-build/test/railsys.py
+x64-windows/tools/boost-build/test/railsys/
+x64-windows/tools/boost-build/test/railsys/libx/
+x64-windows/tools/boost-build/test/railsys/libx/include/
+x64-windows/tools/boost-build/test/railsys/libx/include/test_libx.h
+x64-windows/tools/boost-build/test/railsys/libx/jamroot.jam
+x64-windows/tools/boost-build/test/railsys/libx/src/
+x64-windows/tools/boost-build/test/railsys/libx/src/jamfile.jam
+x64-windows/tools/boost-build/test/railsys/libx/src/test_libx.cpp
+x64-windows/tools/boost-build/test/railsys/program/
+x64-windows/tools/boost-build/test/railsys/program/include/
+x64-windows/tools/boost-build/test/railsys/program/include/test_a.h
+x64-windows/tools/boost-build/test/railsys/program/jamfile.jam
+x64-windows/tools/boost-build/test/railsys/program/jamroot.jam
+x64-windows/tools/boost-build/test/railsys/program/liba/
+x64-windows/tools/boost-build/test/railsys/program/liba/jamfile.jam
+x64-windows/tools/boost-build/test/railsys/program/liba/test_a.cpp
+x64-windows/tools/boost-build/test/railsys/program/main/
+x64-windows/tools/boost-build/test/railsys/program/main/jamfile.jam
+x64-windows/tools/boost-build/test/railsys/program/main/main.cpp
+x64-windows/tools/boost-build/test/readme.txt
+x64-windows/tools/boost-build/test/rebuilds.py
+x64-windows/tools/boost-build/test/relative_sources.py
+x64-windows/tools/boost-build/test/remove_requirement.py
+x64-windows/tools/boost-build/test/rescan_header.py
+x64-windows/tools/boost-build/test/resolution.py
+x64-windows/tools/boost-build/test/results-python.txt
+x64-windows/tools/boost-build/test/scanner_causing_rebuilds.py
+x64-windows/tools/boost-build/test/searched_lib.py
+x64-windows/tools/boost-build/test/skipping.py
+x64-windows/tools/boost-build/test/sort_rule.py
+x64-windows/tools/boost-build/test/source_locations.py
+x64-windows/tools/boost-build/test/source_order.py
+x64-windows/tools/boost-build/test/space_in_path.py
+x64-windows/tools/boost-build/test/stage.py
+x64-windows/tools/boost-build/test/standalone.py
+x64-windows/tools/boost-build/test/startup/
+x64-windows/tools/boost-build/test/startup/boost-root/
+x64-windows/tools/boost-build/test/startup/boost-root/boost-build.jam
+x64-windows/tools/boost-build/test/startup/boost-root/build/
+x64-windows/tools/boost-build/test/startup/boost-root/build/boost-build.jam
+x64-windows/tools/boost-build/test/startup/boost-root/build/bootstrap.jam
+x64-windows/tools/boost-build/test/startup/bootstrap-env/
+x64-windows/tools/boost-build/test/startup/bootstrap-env/boost-build.jam
+x64-windows/tools/boost-build/test/startup/bootstrap-explicit/
+x64-windows/tools/boost-build/test/startup/bootstrap-explicit/boost-build.jam
+x64-windows/tools/boost-build/test/startup/bootstrap-implicit/
+x64-windows/tools/boost-build/test/startup/bootstrap-implicit/readme.txt
+x64-windows/tools/boost-build/test/startup/no-bootstrap1/
+x64-windows/tools/boost-build/test/startup/no-bootstrap1/boost-build.jam
+x64-windows/tools/boost-build/test/startup/no-bootstrap1/subdir/
+x64-windows/tools/boost-build/test/startup/no-bootstrap1/subdir/readme.txt
+x64-windows/tools/boost-build/test/startup/no-bootstrap2/
+x64-windows/tools/boost-build/test/startup/no-bootstrap2/boost-build.jam
+x64-windows/tools/boost-build/test/startup/no-bootstrap3/
+x64-windows/tools/boost-build/test/startup/no-bootstrap3/boost-build.jam
+x64-windows/tools/boost-build/test/startup_v2.py
+x64-windows/tools/boost-build/test/static_and_shared_library.py
+x64-windows/tools/boost-build/test/suffix.py
+x64-windows/tools/boost-build/test/symlink.py
+x64-windows/tools/boost-build/test/tag.py
+x64-windows/tools/boost-build/test/template.py
+x64-windows/tools/boost-build/test/test-config-example.jam
+x64-windows/tools/boost-build/test/test.jam
+x64-windows/tools/boost-build/test/test1.py
+x64-windows/tools/boost-build/test/test2.py
+x64-windows/tools/boost-build/test/test2/
+x64-windows/tools/boost-build/test/test2/foo.cpp
+x64-windows/tools/boost-build/test/test2/jamroot.jam
+x64-windows/tools/boost-build/test/test_all.py
+x64-windows/tools/boost-build/test/test_rc.py
+x64-windows/tools/boost-build/test/test_system.html
+x64-windows/tools/boost-build/test/testing.py
+x64-windows/tools/boost-build/test/timedata.py
+x64-windows/tools/boost-build/test/toolset-mock/
+x64-windows/tools/boost-build/test/toolset-mock/Jamroot.jam
+x64-windows/tools/boost-build/test/toolset-mock/lib.cpp
+x64-windows/tools/boost-build/test/toolset-mock/main.cpp
+x64-windows/tools/boost-build/test/toolset-mock/project-config.jam
+x64-windows/tools/boost-build/test/toolset-mock/src/
+x64-windows/tools/boost-build/test/toolset-mock/src/Jamroot.jam
+x64-windows/tools/boost-build/test/toolset-mock/src/MockProgram.py
+x64-windows/tools/boost-build/test/toolset-mock/src/ar.py
+x64-windows/tools/boost-build/test/toolset-mock/src/clang-3.9.0-darwin.py
+x64-windows/tools/boost-build/test/toolset-mock/src/clang-linux-3.9.0.py
+x64-windows/tools/boost-build/test/toolset-mock/src/clang-vxworks-4.0.1.py
+x64-windows/tools/boost-build/test/toolset-mock/src/darwin-4.2.1.py
+x64-windows/tools/boost-build/test/toolset-mock/src/gcc-4.2.1-darwin.py
+x64-windows/tools/boost-build/test/toolset-mock/src/gcc-4.8.3-linux.py
+x64-windows/tools/boost-build/test/toolset-mock/src/intel-darwin-10.2.py
+x64-windows/tools/boost-build/test/toolset-mock/src/ld.py
+x64-windows/tools/boost-build/test/toolset-mock/src/libtool.py
+x64-windows/tools/boost-build/test/toolset-mock/src/mock-program.cpp
+x64-windows/tools/boost-build/test/toolset-mock/src/project-config.jam
+x64-windows/tools/boost-build/test/toolset-mock/src/ranlib.py
+x64-windows/tools/boost-build/test/toolset-mock/src/strip.py
+x64-windows/tools/boost-build/test/toolset-mock/src/verify.py
+x64-windows/tools/boost-build/test/toolset_clang_darwin.py
+x64-windows/tools/boost-build/test/toolset_clang_linux.py
+x64-windows/tools/boost-build/test/toolset_clang_vxworks.py
+x64-windows/tools/boost-build/test/toolset_darwin.py
+x64-windows/tools/boost-build/test/toolset_defaults.py
+x64-windows/tools/boost-build/test/toolset_gcc.py
+x64-windows/tools/boost-build/test/toolset_intel_darwin.py
+x64-windows/tools/boost-build/test/toolset_requirements.py
+x64-windows/tools/boost-build/test/tree.py
+x64-windows/tools/boost-build/test/unit_test.py
+x64-windows/tools/boost-build/test/unit_tests.py
+x64-windows/tools/boost-build/test/unused.py
+x64-windows/tools/boost-build/test/use_requirements.py
+x64-windows/tools/boost-build/test/using.py
+x64-windows/tools/boost-build/test/wrapper.py
+x64-windows/tools/boost-build/test/wrong_project.py
+x64-windows/tools/boost-build/tutorial.html
+x64-windows/tools/boost-build/website/
+x64-windows/tools/boost-build/website/boost.css
+x64-windows/tools/boost-build/website/boost_build.png
+x64-windows/tools/boost-build/website/boost_build.svg
+x64-windows/tools/boost-build/website/bootstrap/
+x64-windows/tools/boost-build/website/bootstrap/css/
+x64-windows/tools/boost-build/website/bootstrap/css/bootstrap-theme.css
+x64-windows/tools/boost-build/website/bootstrap/css/bootstrap-theme.min.css
+x64-windows/tools/boost-build/website/bootstrap/css/bootstrap.css
+x64-windows/tools/boost-build/website/bootstrap/css/bootstrap.min.css
+x64-windows/tools/boost-build/website/bootstrap/fonts/
+x64-windows/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.eot
+x64-windows/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.svg
+x64-windows/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.ttf
+x64-windows/tools/boost-build/website/bootstrap/fonts/glyphicons-halflings-regular.woff
+x64-windows/tools/boost-build/website/bootstrap/js/
+x64-windows/tools/boost-build/website/bootstrap/js/bootstrap.js
+x64-windows/tools/boost-build/website/bootstrap/js/bootstrap.min.js
+x64-windows/tools/boost-build/website/index.css
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-chrono_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,78 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_chrono-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_chrono-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_chrono-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_chrono-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_chrono-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/chrono.hpp
+x64-windows/include/boost/chrono/
+x64-windows/include/boost/chrono/ceil.hpp
+x64-windows/include/boost/chrono/chrono.hpp
+x64-windows/include/boost/chrono/chrono_io.hpp
+x64-windows/include/boost/chrono/clock_string.hpp
+x64-windows/include/boost/chrono/config.hpp
+x64-windows/include/boost/chrono/detail/
+x64-windows/include/boost/chrono/detail/inlined/
+x64-windows/include/boost/chrono/detail/inlined/chrono.hpp
+x64-windows/include/boost/chrono/detail/inlined/mac/
+x64-windows/include/boost/chrono/detail/inlined/mac/chrono.hpp
+x64-windows/include/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/detail/inlined/mac/thread_clock.hpp
+x64-windows/include/boost/chrono/detail/inlined/posix/
+x64-windows/include/boost/chrono/detail/inlined/posix/chrono.hpp
+x64-windows/include/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/detail/inlined/posix/thread_clock.hpp
+x64-windows/include/boost/chrono/detail/inlined/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/detail/inlined/thread_clock.hpp
+x64-windows/include/boost/chrono/detail/inlined/win/
+x64-windows/include/boost/chrono/detail/inlined/win/chrono.hpp
+x64-windows/include/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/detail/inlined/win/thread_clock.hpp
+x64-windows/include/boost/chrono/detail/is_evenly_divisible_by.hpp
+x64-windows/include/boost/chrono/detail/no_warning/
+x64-windows/include/boost/chrono/detail/no_warning/signed_unsigned_cmp.hpp
+x64-windows/include/boost/chrono/detail/scan_keyword.hpp
+x64-windows/include/boost/chrono/detail/static_assert.hpp
+x64-windows/include/boost/chrono/detail/system.hpp
+x64-windows/include/boost/chrono/duration.hpp
+x64-windows/include/boost/chrono/floor.hpp
+x64-windows/include/boost/chrono/include.hpp
+x64-windows/include/boost/chrono/io/
+x64-windows/include/boost/chrono/io/duration_get.hpp
+x64-windows/include/boost/chrono/io/duration_io.hpp
+x64-windows/include/boost/chrono/io/duration_put.hpp
+x64-windows/include/boost/chrono/io/duration_style.hpp
+x64-windows/include/boost/chrono/io/duration_units.hpp
+x64-windows/include/boost/chrono/io/ios_base_state.hpp
+x64-windows/include/boost/chrono/io/time_point_get.hpp
+x64-windows/include/boost/chrono/io/time_point_io.hpp
+x64-windows/include/boost/chrono/io/time_point_put.hpp
+x64-windows/include/boost/chrono/io/time_point_units.hpp
+x64-windows/include/boost/chrono/io/timezone.hpp
+x64-windows/include/boost/chrono/io/utility/
+x64-windows/include/boost/chrono/io/utility/ios_base_state_ptr.hpp
+x64-windows/include/boost/chrono/io/utility/manip_base.hpp
+x64-windows/include/boost/chrono/io/utility/to_string.hpp
+x64-windows/include/boost/chrono/io_v1/
+x64-windows/include/boost/chrono/io_v1/chrono_io.hpp
+x64-windows/include/boost/chrono/process_cpu_clocks.hpp
+x64-windows/include/boost/chrono/round.hpp
+x64-windows/include/boost/chrono/system_clocks.hpp
+x64-windows/include/boost/chrono/thread_clock.hpp
+x64-windows/include/boost/chrono/time_point.hpp
+x64-windows/include/boost/chrono/typeof/
+x64-windows/include/boost/chrono/typeof/boost/
+x64-windows/include/boost/chrono/typeof/boost/chrono/
+x64-windows/include/boost/chrono/typeof/boost/chrono/chrono.hpp
+x64-windows/include/boost/chrono/typeof/boost/ratio.hpp
+x64-windows/lib/
+x64-windows/lib/boost_chrono-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-chrono/
+x64-windows/share/boost-chrono/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-compatibility_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/compatibility/
+x64-windows/include/boost/compatibility/cpp_c_headers/
+x64-windows/include/boost/compatibility/cpp_c_headers/cassert
+x64-windows/include/boost/compatibility/cpp_c_headers/cctype
+x64-windows/include/boost/compatibility/cpp_c_headers/cerrno
+x64-windows/include/boost/compatibility/cpp_c_headers/cfloat
+x64-windows/include/boost/compatibility/cpp_c_headers/climits
+x64-windows/include/boost/compatibility/cpp_c_headers/clocale
+x64-windows/include/boost/compatibility/cpp_c_headers/cmath
+x64-windows/include/boost/compatibility/cpp_c_headers/csetjmp
+x64-windows/include/boost/compatibility/cpp_c_headers/csignal
+x64-windows/include/boost/compatibility/cpp_c_headers/cstdarg
+x64-windows/include/boost/compatibility/cpp_c_headers/cstddef
+x64-windows/include/boost/compatibility/cpp_c_headers/cstdio
+x64-windows/include/boost/compatibility/cpp_c_headers/cstdlib
+x64-windows/include/boost/compatibility/cpp_c_headers/cstring
+x64-windows/include/boost/compatibility/cpp_c_headers/ctime
+x64-windows/include/boost/compatibility/cpp_c_headers/cwchar
+x64-windows/include/boost/compatibility/cpp_c_headers/cwctype
+x64-windows/share/
+x64-windows/share/boost-compatibility/
+x64-windows/share/boost-compatibility/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-concept-check_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/concept/
+x64-windows/include/boost/concept/assert.hpp
+x64-windows/include/boost/concept/detail/
+x64-windows/include/boost/concept/detail/backward_compatibility.hpp
+x64-windows/include/boost/concept/detail/borland.hpp
+x64-windows/include/boost/concept/detail/concept_def.hpp
+x64-windows/include/boost/concept/detail/concept_undef.hpp
+x64-windows/include/boost/concept/detail/general.hpp
+x64-windows/include/boost/concept/detail/has_constraints.hpp
+x64-windows/include/boost/concept/detail/msvc.hpp
+x64-windows/include/boost/concept/requires.hpp
+x64-windows/include/boost/concept/usage.hpp
+x64-windows/include/boost/concept_archetype.hpp
+x64-windows/include/boost/concept_check.hpp
+x64-windows/include/boost/concept_check/
+x64-windows/include/boost/concept_check/borland.hpp
+x64-windows/include/boost/concept_check/general.hpp
+x64-windows/include/boost/concept_check/has_constraints.hpp
+x64-windows/include/boost/concept_check/msvc.hpp
+x64-windows/share/
+x64-windows/share/boost-concept-check/
+x64-windows/share/boost-concept-check/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-config_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,115 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/config.hpp
+x64-windows/include/boost/config/
+x64-windows/include/boost/config/abi/
+x64-windows/include/boost/config/abi/borland_prefix.hpp
+x64-windows/include/boost/config/abi/borland_suffix.hpp
+x64-windows/include/boost/config/abi/msvc_prefix.hpp
+x64-windows/include/boost/config/abi/msvc_suffix.hpp
+x64-windows/include/boost/config/abi_prefix.hpp
+x64-windows/include/boost/config/abi_suffix.hpp
+x64-windows/include/boost/config/auto_link.hpp
+x64-windows/include/boost/config/compiler/
+x64-windows/include/boost/config/compiler/borland.hpp
+x64-windows/include/boost/config/compiler/clang.hpp
+x64-windows/include/boost/config/compiler/codegear.hpp
+x64-windows/include/boost/config/compiler/comeau.hpp
+x64-windows/include/boost/config/compiler/common_edg.hpp
+x64-windows/include/boost/config/compiler/compaq_cxx.hpp
+x64-windows/include/boost/config/compiler/cray.hpp
+x64-windows/include/boost/config/compiler/diab.hpp
+x64-windows/include/boost/config/compiler/digitalmars.hpp
+x64-windows/include/boost/config/compiler/gcc.hpp
+x64-windows/include/boost/config/compiler/gcc_xml.hpp
+x64-windows/include/boost/config/compiler/greenhills.hpp
+x64-windows/include/boost/config/compiler/hp_acc.hpp
+x64-windows/include/boost/config/compiler/intel.hpp
+x64-windows/include/boost/config/compiler/kai.hpp
+x64-windows/include/boost/config/compiler/metrowerks.hpp
+x64-windows/include/boost/config/compiler/mpw.hpp
+x64-windows/include/boost/config/compiler/nvcc.hpp
+x64-windows/include/boost/config/compiler/pathscale.hpp
+x64-windows/include/boost/config/compiler/pgi.hpp
+x64-windows/include/boost/config/compiler/sgi_mipspro.hpp
+x64-windows/include/boost/config/compiler/sunpro_cc.hpp
+x64-windows/include/boost/config/compiler/vacpp.hpp
+x64-windows/include/boost/config/compiler/visualc.hpp
+x64-windows/include/boost/config/compiler/xlcpp.hpp
+x64-windows/include/boost/config/compiler/xlcpp_zos.hpp
+x64-windows/include/boost/config/detail/
+x64-windows/include/boost/config/detail/posix_features.hpp
+x64-windows/include/boost/config/detail/select_compiler_config.hpp
+x64-windows/include/boost/config/detail/select_platform_config.hpp
+x64-windows/include/boost/config/detail/select_stdlib_config.hpp
+x64-windows/include/boost/config/detail/suffix.hpp
+x64-windows/include/boost/config/header_deprecated.hpp
+x64-windows/include/boost/config/helper_macros.hpp
+x64-windows/include/boost/config/no_tr1/
+x64-windows/include/boost/config/no_tr1/cmath.hpp
+x64-windows/include/boost/config/no_tr1/complex.hpp
+x64-windows/include/boost/config/no_tr1/functional.hpp
+x64-windows/include/boost/config/no_tr1/memory.hpp
+x64-windows/include/boost/config/no_tr1/utility.hpp
+x64-windows/include/boost/config/platform/
+x64-windows/include/boost/config/platform/aix.hpp
+x64-windows/include/boost/config/platform/amigaos.hpp
+x64-windows/include/boost/config/platform/beos.hpp
+x64-windows/include/boost/config/platform/bsd.hpp
+x64-windows/include/boost/config/platform/cloudabi.hpp
+x64-windows/include/boost/config/platform/cray.hpp
+x64-windows/include/boost/config/platform/cygwin.hpp
+x64-windows/include/boost/config/platform/haiku.hpp
+x64-windows/include/boost/config/platform/hpux.hpp
+x64-windows/include/boost/config/platform/irix.hpp
+x64-windows/include/boost/config/platform/linux.hpp
+x64-windows/include/boost/config/platform/macos.hpp
+x64-windows/include/boost/config/platform/qnxnto.hpp
+x64-windows/include/boost/config/platform/solaris.hpp
+x64-windows/include/boost/config/platform/symbian.hpp
+x64-windows/include/boost/config/platform/vms.hpp
+x64-windows/include/boost/config/platform/vxworks.hpp
+x64-windows/include/boost/config/platform/win32.hpp
+x64-windows/include/boost/config/platform/zos.hpp
+x64-windows/include/boost/config/pragma_message.hpp
+x64-windows/include/boost/config/requires_threads.hpp
+x64-windows/include/boost/config/stdlib/
+x64-windows/include/boost/config/stdlib/dinkumware.hpp
+x64-windows/include/boost/config/stdlib/libcomo.hpp
+x64-windows/include/boost/config/stdlib/libcpp.hpp
+x64-windows/include/boost/config/stdlib/libstdcpp3.hpp
+x64-windows/include/boost/config/stdlib/modena.hpp
+x64-windows/include/boost/config/stdlib/msl.hpp
+x64-windows/include/boost/config/stdlib/roguewave.hpp
+x64-windows/include/boost/config/stdlib/sgi.hpp
+x64-windows/include/boost/config/stdlib/stlport.hpp
+x64-windows/include/boost/config/stdlib/vacpp.hpp
+x64-windows/include/boost/config/stdlib/xlcpp_zos.hpp
+x64-windows/include/boost/config/user.hpp
+x64-windows/include/boost/config/warning_disable.hpp
+x64-windows/include/boost/config/workaround.hpp
+x64-windows/include/boost/cstdint.hpp
+x64-windows/include/boost/cxx11_char_types.hpp
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/workaround.hpp
+x64-windows/include/boost/limits.hpp
+x64-windows/include/boost/version.hpp
+x64-windows/share/
+x64-windows/share/boost-config/
+x64-windows/share/boost-config/checks/
+x64-windows/share/boost-config/checks/Jamfile.v2
+x64-windows/share/boost-config/checks/architecture/
+x64-windows/share/boost-config/checks/architecture/.gitignore
+x64-windows/share/boost-config/checks/architecture/32.cpp
+x64-windows/share/boost-config/checks/architecture/64.cpp
+x64-windows/share/boost-config/checks/architecture/Jamroot.jam
+x64-windows/share/boost-config/checks/architecture/arm.cpp
+x64-windows/share/boost-config/checks/architecture/combined.cpp
+x64-windows/share/boost-config/checks/architecture/mips1.cpp
+x64-windows/share/boost-config/checks/architecture/power.cpp
+x64-windows/share/boost-config/checks/architecture/sparc.cpp
+x64-windows/share/boost-config/checks/architecture/x86.cpp
+x64-windows/share/boost-config/checks/config.jam
+x64-windows/share/boost-config/checks/test_case.cpp
+x64-windows/share/boost-config/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-container_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,120 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_container-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_container-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_container-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_container-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_container-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/container/
+x64-windows/include/boost/container/adaptive_pool.hpp
+x64-windows/include/boost/container/allocator.hpp
+x64-windows/include/boost/container/allocator_traits.hpp
+x64-windows/include/boost/container/container_fwd.hpp
+x64-windows/include/boost/container/deque.hpp
+x64-windows/include/boost/container/detail/
+x64-windows/include/boost/container/detail/adaptive_node_pool.hpp
+x64-windows/include/boost/container/detail/adaptive_node_pool_impl.hpp
+x64-windows/include/boost/container/detail/addressof.hpp
+x64-windows/include/boost/container/detail/advanced_insert_int.hpp
+x64-windows/include/boost/container/detail/algorithm.hpp
+x64-windows/include/boost/container/detail/alloc_helpers.hpp
+x64-windows/include/boost/container/detail/alloc_lib.h
+x64-windows/include/boost/container/detail/allocation_type.hpp
+x64-windows/include/boost/container/detail/allocator_version_traits.hpp
+x64-windows/include/boost/container/detail/auto_link.hpp
+x64-windows/include/boost/container/detail/block_list.hpp
+x64-windows/include/boost/container/detail/block_slist.hpp
+x64-windows/include/boost/container/detail/compare_functors.hpp
+x64-windows/include/boost/container/detail/config_begin.hpp
+x64-windows/include/boost/container/detail/config_end.hpp
+x64-windows/include/boost/container/detail/construct_in_place.hpp
+x64-windows/include/boost/container/detail/container_or_allocator_rebind.hpp
+x64-windows/include/boost/container/detail/container_rebind.hpp
+x64-windows/include/boost/container/detail/copy_move_algo.hpp
+x64-windows/include/boost/container/detail/destroyers.hpp
+x64-windows/include/boost/container/detail/dispatch_uses_allocator.hpp
+x64-windows/include/boost/container/detail/dlmalloc.hpp
+x64-windows/include/boost/container/detail/flat_tree.hpp
+x64-windows/include/boost/container/detail/function_detector.hpp
+x64-windows/include/boost/container/detail/is_container.hpp
+x64-windows/include/boost/container/detail/is_contiguous_container.hpp
+x64-windows/include/boost/container/detail/is_sorted.hpp
+x64-windows/include/boost/container/detail/iterator.hpp
+x64-windows/include/boost/container/detail/iterator_to_raw_pointer.hpp
+x64-windows/include/boost/container/detail/iterators.hpp
+x64-windows/include/boost/container/detail/math_functions.hpp
+x64-windows/include/boost/container/detail/min_max.hpp
+x64-windows/include/boost/container/detail/minimal_char_traits_header.hpp
+x64-windows/include/boost/container/detail/mpl.hpp
+x64-windows/include/boost/container/detail/multiallocation_chain.hpp
+x64-windows/include/boost/container/detail/mutex.hpp
+x64-windows/include/boost/container/detail/next_capacity.hpp
+x64-windows/include/boost/container/detail/node_alloc_holder.hpp
+x64-windows/include/boost/container/detail/node_pool.hpp
+x64-windows/include/boost/container/detail/node_pool_impl.hpp
+x64-windows/include/boost/container/detail/pair.hpp
+x64-windows/include/boost/container/detail/pair_key_mapped_of_value.hpp
+x64-windows/include/boost/container/detail/placement_new.hpp
+x64-windows/include/boost/container/detail/pool_common.hpp
+x64-windows/include/boost/container/detail/pool_common_alloc.hpp
+x64-windows/include/boost/container/detail/pool_resource.hpp
+x64-windows/include/boost/container/detail/singleton.hpp
+x64-windows/include/boost/container/detail/std_fwd.hpp
+x64-windows/include/boost/container/detail/transform_iterator.hpp
+x64-windows/include/boost/container/detail/tree.hpp
+x64-windows/include/boost/container/detail/type_traits.hpp
+x64-windows/include/boost/container/detail/value_functors.hpp
+x64-windows/include/boost/container/detail/value_init.hpp
+x64-windows/include/boost/container/detail/variadic_templates_tools.hpp
+x64-windows/include/boost/container/detail/version_type.hpp
+x64-windows/include/boost/container/detail/workaround.hpp
+x64-windows/include/boost/container/flat_map.hpp
+x64-windows/include/boost/container/flat_set.hpp
+x64-windows/include/boost/container/list.hpp
+x64-windows/include/boost/container/map.hpp
+x64-windows/include/boost/container/new_allocator.hpp
+x64-windows/include/boost/container/node_allocator.hpp
+x64-windows/include/boost/container/node_handle.hpp
+x64-windows/include/boost/container/options.hpp
+x64-windows/include/boost/container/pmr/
+x64-windows/include/boost/container/pmr/deque.hpp
+x64-windows/include/boost/container/pmr/flat_map.hpp
+x64-windows/include/boost/container/pmr/flat_set.hpp
+x64-windows/include/boost/container/pmr/global_resource.hpp
+x64-windows/include/boost/container/pmr/list.hpp
+x64-windows/include/boost/container/pmr/map.hpp
+x64-windows/include/boost/container/pmr/memory_resource.hpp
+x64-windows/include/boost/container/pmr/monotonic_buffer_resource.hpp
+x64-windows/include/boost/container/pmr/polymorphic_allocator.hpp
+x64-windows/include/boost/container/pmr/pool_options.hpp
+x64-windows/include/boost/container/pmr/resource_adaptor.hpp
+x64-windows/include/boost/container/pmr/set.hpp
+x64-windows/include/boost/container/pmr/slist.hpp
+x64-windows/include/boost/container/pmr/small_vector.hpp
+x64-windows/include/boost/container/pmr/stable_vector.hpp
+x64-windows/include/boost/container/pmr/string.hpp
+x64-windows/include/boost/container/pmr/synchronized_pool_resource.hpp
+x64-windows/include/boost/container/pmr/unsynchronized_pool_resource.hpp
+x64-windows/include/boost/container/pmr/vector.hpp
+x64-windows/include/boost/container/scoped_allocator.hpp
+x64-windows/include/boost/container/scoped_allocator_fwd.hpp
+x64-windows/include/boost/container/set.hpp
+x64-windows/include/boost/container/slist.hpp
+x64-windows/include/boost/container/small_vector.hpp
+x64-windows/include/boost/container/stable_vector.hpp
+x64-windows/include/boost/container/static_vector.hpp
+x64-windows/include/boost/container/string.hpp
+x64-windows/include/boost/container/throw_exception.hpp
+x64-windows/include/boost/container/uses_allocator.hpp
+x64-windows/include/boost/container/uses_allocator_fwd.hpp
+x64-windows/include/boost/container/vector.hpp
+x64-windows/lib/
+x64-windows/lib/boost_container-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-container/
+x64-windows/share/boost-container/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-container-hash_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/container_hash/
+x64-windows/include/boost/container_hash/detail/
+x64-windows/include/boost/container_hash/detail/float_functions.hpp
+x64-windows/include/boost/container_hash/detail/hash_float.hpp
+x64-windows/include/boost/container_hash/detail/limits.hpp
+x64-windows/include/boost/container_hash/extensions.hpp
+x64-windows/include/boost/container_hash/hash.hpp
+x64-windows/include/boost/container_hash/hash_fwd.hpp
+x64-windows/include/boost/functional/
+x64-windows/include/boost/functional/hash.hpp
+x64-windows/include/boost/functional/hash/
+x64-windows/include/boost/functional/hash/extensions.hpp
+x64-windows/include/boost/functional/hash/hash.hpp
+x64-windows/include/boost/functional/hash/hash_fwd.hpp
+x64-windows/include/boost/functional/hash_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-container-hash/
+x64-windows/share/boost-container-hash/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-conversion_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/implicit_cast.hpp
+x64-windows/include/boost/polymorphic_cast.hpp
+x64-windows/include/boost/polymorphic_pointer_cast.hpp
+x64-windows/share/
+x64-windows/share/boost-conversion/
+x64-windows/share/boost-conversion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-core_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/checked_delete.hpp
+x64-windows/include/boost/core/
+x64-windows/include/boost/core/addressof.hpp
+x64-windows/include/boost/core/checked_delete.hpp
+x64-windows/include/boost/core/demangle.hpp
+x64-windows/include/boost/core/enable_if.hpp
+x64-windows/include/boost/core/explicit_operator_bool.hpp
+x64-windows/include/boost/core/ignore_unused.hpp
+x64-windows/include/boost/core/is_same.hpp
+x64-windows/include/boost/core/lightweight_test.hpp
+x64-windows/include/boost/core/lightweight_test_trait.hpp
+x64-windows/include/boost/core/no_exceptions_support.hpp
+x64-windows/include/boost/core/noncopyable.hpp
+x64-windows/include/boost/core/null_deleter.hpp
+x64-windows/include/boost/core/pointer_traits.hpp
+x64-windows/include/boost/core/ref.hpp
+x64-windows/include/boost/core/scoped_enum.hpp
+x64-windows/include/boost/core/swap.hpp
+x64-windows/include/boost/core/typeinfo.hpp
+x64-windows/include/boost/core/underlying_type.hpp
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/iterator.hpp
+x64-windows/include/boost/detail/lightweight_test.hpp
+x64-windows/include/boost/detail/no_exceptions_support.hpp
+x64-windows/include/boost/detail/scoped_enum_emulation.hpp
+x64-windows/include/boost/detail/sp_typeinfo.hpp
+x64-windows/include/boost/get_pointer.hpp
+x64-windows/include/boost/iterator.hpp
+x64-windows/include/boost/non_type.hpp
+x64-windows/include/boost/noncopyable.hpp
+x64-windows/include/boost/ref.hpp
+x64-windows/include/boost/swap.hpp
+x64-windows/include/boost/type.hpp
+x64-windows/include/boost/utility/
+x64-windows/include/boost/utility/addressof.hpp
+x64-windows/include/boost/utility/enable_if.hpp
+x64-windows/include/boost/utility/explicit_operator_bool.hpp
+x64-windows/include/boost/utility/swap.hpp
+x64-windows/include/boost/visit_each.hpp
+x64-windows/share/
+x64-windows/share/boost-core/
+x64-windows/share/boost-core/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-date-time_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,125 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_date_time-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_date_time-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_date_time-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_date_time-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_date_time-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/date_time.hpp
+x64-windows/include/boost/date_time/
+x64-windows/include/boost/date_time/adjust_functors.hpp
+x64-windows/include/boost/date_time/c_local_time_adjustor.hpp
+x64-windows/include/boost/date_time/c_time.hpp
+x64-windows/include/boost/date_time/compiler_config.hpp
+x64-windows/include/boost/date_time/constrained_value.hpp
+x64-windows/include/boost/date_time/date.hpp
+x64-windows/include/boost/date_time/date_clock_device.hpp
+x64-windows/include/boost/date_time/date_defs.hpp
+x64-windows/include/boost/date_time/date_duration.hpp
+x64-windows/include/boost/date_time/date_duration_types.hpp
+x64-windows/include/boost/date_time/date_facet.hpp
+x64-windows/include/boost/date_time/date_format_simple.hpp
+x64-windows/include/boost/date_time/date_formatting.hpp
+x64-windows/include/boost/date_time/date_formatting_limited.hpp
+x64-windows/include/boost/date_time/date_formatting_locales.hpp
+x64-windows/include/boost/date_time/date_generator_formatter.hpp
+x64-windows/include/boost/date_time/date_generator_parser.hpp
+x64-windows/include/boost/date_time/date_generators.hpp
+x64-windows/include/boost/date_time/date_iterator.hpp
+x64-windows/include/boost/date_time/date_names_put.hpp
+x64-windows/include/boost/date_time/date_parsing.hpp
+x64-windows/include/boost/date_time/dst_rules.hpp
+x64-windows/include/boost/date_time/dst_transition_generators.hpp
+x64-windows/include/boost/date_time/filetime_functions.hpp
+x64-windows/include/boost/date_time/format_date_parser.hpp
+x64-windows/include/boost/date_time/gregorian/
+x64-windows/include/boost/date_time/gregorian/conversion.hpp
+x64-windows/include/boost/date_time/gregorian/formatters.hpp
+x64-windows/include/boost/date_time/gregorian/formatters_limited.hpp
+x64-windows/include/boost/date_time/gregorian/greg_calendar.hpp
+x64-windows/include/boost/date_time/gregorian/greg_date.hpp
+x64-windows/include/boost/date_time/gregorian/greg_day.hpp
+x64-windows/include/boost/date_time/gregorian/greg_day_of_year.hpp
+x64-windows/include/boost/date_time/gregorian/greg_duration.hpp
+x64-windows/include/boost/date_time/gregorian/greg_duration_types.hpp
+x64-windows/include/boost/date_time/gregorian/greg_facet.hpp
+x64-windows/include/boost/date_time/gregorian/greg_month.hpp
+x64-windows/include/boost/date_time/gregorian/greg_serialize.hpp
+x64-windows/include/boost/date_time/gregorian/greg_weekday.hpp
+x64-windows/include/boost/date_time/gregorian/greg_year.hpp
+x64-windows/include/boost/date_time/gregorian/greg_ymd.hpp
+x64-windows/include/boost/date_time/gregorian/gregorian.hpp
+x64-windows/include/boost/date_time/gregorian/gregorian_io.hpp
+x64-windows/include/boost/date_time/gregorian/gregorian_types.hpp
+x64-windows/include/boost/date_time/gregorian/parsers.hpp
+x64-windows/include/boost/date_time/gregorian_calendar.hpp
+x64-windows/include/boost/date_time/gregorian_calendar.ipp
+x64-windows/include/boost/date_time/int_adapter.hpp
+x64-windows/include/boost/date_time/iso_format.hpp
+x64-windows/include/boost/date_time/local_time/
+x64-windows/include/boost/date_time/local_time/conversion.hpp
+x64-windows/include/boost/date_time/local_time/custom_time_zone.hpp
+x64-windows/include/boost/date_time/local_time/date_duration_operators.hpp
+x64-windows/include/boost/date_time/local_time/dst_transition_day_rules.hpp
+x64-windows/include/boost/date_time/local_time/local_date_time.hpp
+x64-windows/include/boost/date_time/local_time/local_time.hpp
+x64-windows/include/boost/date_time/local_time/local_time_io.hpp
+x64-windows/include/boost/date_time/local_time/local_time_types.hpp
+x64-windows/include/boost/date_time/local_time/posix_time_zone.hpp
+x64-windows/include/boost/date_time/local_time/tz_database.hpp
+x64-windows/include/boost/date_time/local_time_adjustor.hpp
+x64-windows/include/boost/date_time/local_timezone_defs.hpp
+x64-windows/include/boost/date_time/locale_config.hpp
+x64-windows/include/boost/date_time/microsec_time_clock.hpp
+x64-windows/include/boost/date_time/parse_format_base.hpp
+x64-windows/include/boost/date_time/period.hpp
+x64-windows/include/boost/date_time/period_formatter.hpp
+x64-windows/include/boost/date_time/period_parser.hpp
+x64-windows/include/boost/date_time/posix_time/
+x64-windows/include/boost/date_time/posix_time/conversion.hpp
+x64-windows/include/boost/date_time/posix_time/date_duration_operators.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_config.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_duration.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_io.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_legacy_io.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_system.hpp
+x64-windows/include/boost/date_time/posix_time/posix_time_types.hpp
+x64-windows/include/boost/date_time/posix_time/ptime.hpp
+x64-windows/include/boost/date_time/posix_time/time_formatters.hpp
+x64-windows/include/boost/date_time/posix_time/time_formatters_limited.hpp
+x64-windows/include/boost/date_time/posix_time/time_parsers.hpp
+x64-windows/include/boost/date_time/posix_time/time_period.hpp
+x64-windows/include/boost/date_time/posix_time/time_serialize.hpp
+x64-windows/include/boost/date_time/special_defs.hpp
+x64-windows/include/boost/date_time/special_values_formatter.hpp
+x64-windows/include/boost/date_time/special_values_parser.hpp
+x64-windows/include/boost/date_time/string_convert.hpp
+x64-windows/include/boost/date_time/string_parse_tree.hpp
+x64-windows/include/boost/date_time/strings_from_facet.hpp
+x64-windows/include/boost/date_time/time.hpp
+x64-windows/include/boost/date_time/time_clock.hpp
+x64-windows/include/boost/date_time/time_defs.hpp
+x64-windows/include/boost/date_time/time_duration.hpp
+x64-windows/include/boost/date_time/time_facet.hpp
+x64-windows/include/boost/date_time/time_formatting_streams.hpp
+x64-windows/include/boost/date_time/time_iterator.hpp
+x64-windows/include/boost/date_time/time_parsing.hpp
+x64-windows/include/boost/date_time/time_resolution_traits.hpp
+x64-windows/include/boost/date_time/time_system_counted.hpp
+x64-windows/include/boost/date_time/time_system_split.hpp
+x64-windows/include/boost/date_time/time_zone_base.hpp
+x64-windows/include/boost/date_time/time_zone_names.hpp
+x64-windows/include/boost/date_time/tz_db_base.hpp
+x64-windows/include/boost/date_time/wrapping_int.hpp
+x64-windows/include/boost/date_time/year_month_day.hpp
+x64-windows/lib/
+x64-windows/lib/boost_date_time-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-date-time/
+x64-windows/share/boost-date-time/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-detail_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/blank.hpp
+x64-windows/include/boost/blank_fwd.hpp
+x64-windows/include/boost/cstdlib.hpp
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/allocator_utilities.hpp
+x64-windows/include/boost/detail/binary_search.hpp
+x64-windows/include/boost/detail/bitmask.hpp
+x64-windows/include/boost/detail/catch_exceptions.hpp
+x64-windows/include/boost/detail/container_fwd.hpp
+x64-windows/include/boost/detail/fenv.hpp
+x64-windows/include/boost/detail/has_default_constructor.hpp
+x64-windows/include/boost/detail/identifier.hpp
+x64-windows/include/boost/detail/indirect_traits.hpp
+x64-windows/include/boost/detail/is_incrementable.hpp
+x64-windows/include/boost/detail/is_sorted.hpp
+x64-windows/include/boost/detail/is_xxx.hpp
+x64-windows/include/boost/detail/lightweight_main.hpp
+x64-windows/include/boost/detail/lightweight_test_report.hpp
+x64-windows/include/boost/detail/named_template_params.hpp
+x64-windows/include/boost/detail/numeric_traits.hpp
+x64-windows/include/boost/detail/reference_content.hpp
+x64-windows/include/boost/detail/select_type.hpp
+x64-windows/include/boost/detail/templated_streams.hpp
+x64-windows/include/boost/detail/utf8_codecvt_facet.hpp
+x64-windows/include/boost/detail/utf8_codecvt_facet.ipp
+x64-windows/share/
+x64-windows/share/boost-detail/
+x64-windows/share/boost-detail/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-endian_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/endian/
+x64-windows/include/boost/endian/arithmetic.hpp
+x64-windows/include/boost/endian/buffers.hpp
+x64-windows/include/boost/endian/conversion.hpp
+x64-windows/include/boost/endian/detail/
+x64-windows/include/boost/endian/detail/config.hpp
+x64-windows/include/boost/endian/detail/cover_operators.hpp
+x64-windows/include/boost/endian/detail/disable_warnings.hpp
+x64-windows/include/boost/endian/detail/disable_warnings_pop.hpp
+x64-windows/include/boost/endian/detail/intrinsic.hpp
+x64-windows/include/boost/endian/detail/lightweight_test.hpp
+x64-windows/include/boost/endian/endian.hpp
+x64-windows/include/boost/endian/std_pair.hpp
+x64-windows/share/
+x64-windows/share/boost-endian/
+x64-windows/share/boost-endian/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-exception_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+x64-windows/
+x64-windows/debug/
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_exception-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/exception/
+x64-windows/include/boost/exception/all.hpp
+x64-windows/include/boost/exception/current_exception_cast.hpp
+x64-windows/include/boost/exception/detail/
+x64-windows/include/boost/exception/detail/clone_current_exception.hpp
+x64-windows/include/boost/exception/detail/error_info_impl.hpp
+x64-windows/include/boost/exception/detail/exception_ptr.hpp
+x64-windows/include/boost/exception/detail/is_output_streamable.hpp
+x64-windows/include/boost/exception/detail/object_hex_dump.hpp
+x64-windows/include/boost/exception/detail/shared_ptr.hpp
+x64-windows/include/boost/exception/detail/type_info.hpp
+x64-windows/include/boost/exception/diagnostic_information.hpp
+x64-windows/include/boost/exception/enable_current_exception.hpp
+x64-windows/include/boost/exception/enable_error_info.hpp
+x64-windows/include/boost/exception/errinfo_api_function.hpp
+x64-windows/include/boost/exception/errinfo_at_line.hpp
+x64-windows/include/boost/exception/errinfo_errno.hpp
+x64-windows/include/boost/exception/errinfo_file_handle.hpp
+x64-windows/include/boost/exception/errinfo_file_name.hpp
+x64-windows/include/boost/exception/errinfo_file_open_mode.hpp
+x64-windows/include/boost/exception/errinfo_nested_exception.hpp
+x64-windows/include/boost/exception/errinfo_type_info_name.hpp
+x64-windows/include/boost/exception/error_info.hpp
+x64-windows/include/boost/exception/get_error_info.hpp
+x64-windows/include/boost/exception/info.hpp
+x64-windows/include/boost/exception/info_tuple.hpp
+x64-windows/include/boost/exception/to_string.hpp
+x64-windows/include/boost/exception/to_string_stub.hpp
+x64-windows/include/boost/exception_ptr.hpp
+x64-windows/lib/
+x64-windows/lib/boost_exception-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-exception/
+x64-windows/share/boost-exception/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-filesystem_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_filesystem-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_filesystem-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_filesystem-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_filesystem-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_filesystem-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/filesystem.hpp
+x64-windows/include/boost/filesystem/
+x64-windows/include/boost/filesystem/config.hpp
+x64-windows/include/boost/filesystem/convenience.hpp
+x64-windows/include/boost/filesystem/detail/
+x64-windows/include/boost/filesystem/detail/macro_value.hpp
+x64-windows/include/boost/filesystem/detail/utf8_codecvt_facet.hpp
+x64-windows/include/boost/filesystem/exception.hpp
+x64-windows/include/boost/filesystem/fstream.hpp
+x64-windows/include/boost/filesystem/operations.hpp
+x64-windows/include/boost/filesystem/path.hpp
+x64-windows/include/boost/filesystem/path_traits.hpp
+x64-windows/include/boost/filesystem/string_file.hpp
+x64-windows/lib/
+x64-windows/lib/boost_filesystem-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-filesystem/
+x64-windows/share/boost-filesystem/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-foreach_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/foreach.hpp
+x64-windows/include/boost/foreach_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-foreach/
+x64-windows/share/boost-foreach/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-format_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,27 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/format.hpp
+x64-windows/include/boost/format/
+x64-windows/include/boost/format/alt_sstream.hpp
+x64-windows/include/boost/format/alt_sstream_impl.hpp
+x64-windows/include/boost/format/detail/
+x64-windows/include/boost/format/detail/compat_workarounds.hpp
+x64-windows/include/boost/format/detail/config_macros.hpp
+x64-windows/include/boost/format/detail/msvc_disambiguater.hpp
+x64-windows/include/boost/format/detail/unset_macros.hpp
+x64-windows/include/boost/format/detail/workarounds_gcc-2_95.hpp
+x64-windows/include/boost/format/detail/workarounds_stlport.hpp
+x64-windows/include/boost/format/exceptions.hpp
+x64-windows/include/boost/format/feed_args.hpp
+x64-windows/include/boost/format/format_class.hpp
+x64-windows/include/boost/format/format_fwd.hpp
+x64-windows/include/boost/format/format_implementation.hpp
+x64-windows/include/boost/format/free_funcs.hpp
+x64-windows/include/boost/format/group.hpp
+x64-windows/include/boost/format/internals.hpp
+x64-windows/include/boost/format/internals_fwd.hpp
+x64-windows/include/boost/format/parsing.hpp
+x64-windows/share/
+x64-windows/share/boost-format/
+x64-windows/share/boost-format/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-function_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/function.hpp
+x64-windows/include/boost/function/
+x64-windows/include/boost/function/detail/
+x64-windows/include/boost/function/detail/function_iterate.hpp
+x64-windows/include/boost/function/detail/gen_maybe_include.pl
+x64-windows/include/boost/function/detail/maybe_include.hpp
+x64-windows/include/boost/function/detail/prologue.hpp
+x64-windows/include/boost/function/function0.hpp
+x64-windows/include/boost/function/function1.hpp
+x64-windows/include/boost/function/function10.hpp
+x64-windows/include/boost/function/function2.hpp
+x64-windows/include/boost/function/function3.hpp
+x64-windows/include/boost/function/function4.hpp
+x64-windows/include/boost/function/function5.hpp
+x64-windows/include/boost/function/function6.hpp
+x64-windows/include/boost/function/function7.hpp
+x64-windows/include/boost/function/function8.hpp
+x64-windows/include/boost/function/function9.hpp
+x64-windows/include/boost/function/function_base.hpp
+x64-windows/include/boost/function/function_fwd.hpp
+x64-windows/include/boost/function/function_template.hpp
+x64-windows/include/boost/function/function_typeof.hpp
+x64-windows/include/boost/function/gen_function_N.pl
+x64-windows/include/boost/function_equal.hpp
+x64-windows/share/
+x64-windows/share/boost-function/
+x64-windows/share/boost-function/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-functional_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/functional.hpp
+x64-windows/include/boost/functional/
+x64-windows/include/boost/functional/factory.hpp
+x64-windows/include/boost/functional/forward_adapter.hpp
+x64-windows/include/boost/functional/lightweight_forward_adapter.hpp
+x64-windows/include/boost/functional/overloaded_function.hpp
+x64-windows/include/boost/functional/overloaded_function/
+x64-windows/include/boost/functional/overloaded_function/config.hpp
+x64-windows/include/boost/functional/overloaded_function/detail/
+x64-windows/include/boost/functional/overloaded_function/detail/base.hpp
+x64-windows/include/boost/functional/overloaded_function/detail/function_type.hpp
+x64-windows/include/boost/functional/value_factory.hpp
+x64-windows/share/
+x64-windows/share/boost-functional/
+x64-windows/share/boost-functional/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-function-types_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/function_types/
+x64-windows/include/boost/function_types/components.hpp
+x64-windows/include/boost/function_types/config/
+x64-windows/include/boost/function_types/config/cc_names.hpp
+x64-windows/include/boost/function_types/config/compiler.hpp
+x64-windows/include/boost/function_types/config/config.hpp
+x64-windows/include/boost/function_types/detail/
+x64-windows/include/boost/function_types/detail/class_transform.hpp
+x64-windows/include/boost/function_types/detail/classifier.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/
+x64-windows/include/boost/function_types/detail/classifier_impl/arity10_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity10_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity20_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity20_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity30_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity30_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity40_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity40_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity50_0.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/arity50_1.hpp
+x64-windows/include/boost/function_types/detail/classifier_impl/master.hpp
+x64-windows/include/boost/function_types/detail/components_as_mpl_sequence.hpp
+x64-windows/include/boost/function_types/detail/components_impl/
+x64-windows/include/boost/function_types/detail/components_impl/arity10_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity10_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity20_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity20_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity30_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity30_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity40_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity40_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity50_0.hpp
+x64-windows/include/boost/function_types/detail/components_impl/arity50_1.hpp
+x64-windows/include/boost/function_types/detail/components_impl/master.hpp
+x64-windows/include/boost/function_types/detail/cv_traits.hpp
+x64-windows/include/boost/function_types/detail/encoding/
+x64-windows/include/boost/function_types/detail/encoding/aliases_def.hpp
+x64-windows/include/boost/function_types/detail/encoding/aliases_undef.hpp
+x64-windows/include/boost/function_types/detail/encoding/def.hpp
+x64-windows/include/boost/function_types/detail/encoding/undef.hpp
+x64-windows/include/boost/function_types/detail/pp_arity_loop.hpp
+x64-windows/include/boost/function_types/detail/pp_cc_loop/
+x64-windows/include/boost/function_types/detail/pp_cc_loop/master.hpp
+x64-windows/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp
+x64-windows/include/boost/function_types/detail/pp_loop.hpp
+x64-windows/include/boost/function_types/detail/pp_retag_default_cc/
+x64-windows/include/boost/function_types/detail/pp_retag_default_cc/master.hpp
+x64-windows/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp
+x64-windows/include/boost/function_types/detail/pp_tags/
+x64-windows/include/boost/function_types/detail/pp_tags/cc_tag.hpp
+x64-windows/include/boost/function_types/detail/pp_tags/master.hpp
+x64-windows/include/boost/function_types/detail/pp_tags/preprocessed.hpp
+x64-windows/include/boost/function_types/detail/pp_variate_loop/
+x64-windows/include/boost/function_types/detail/pp_variate_loop/master.hpp
+x64-windows/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp
+x64-windows/include/boost/function_types/detail/retag_default_cc.hpp
+x64-windows/include/boost/function_types/detail/synthesize.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity10_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity10_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity20_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity20_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity30_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity30_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity40_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity40_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity50_0.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/arity50_1.hpp
+x64-windows/include/boost/function_types/detail/synthesize_impl/master.hpp
+x64-windows/include/boost/function_types/detail/to_sequence.hpp
+x64-windows/include/boost/function_types/function_arity.hpp
+x64-windows/include/boost/function_types/function_pointer.hpp
+x64-windows/include/boost/function_types/function_reference.hpp
+x64-windows/include/boost/function_types/function_type.hpp
+x64-windows/include/boost/function_types/is_callable_builtin.hpp
+x64-windows/include/boost/function_types/is_function.hpp
+x64-windows/include/boost/function_types/is_function_pointer.hpp
+x64-windows/include/boost/function_types/is_function_reference.hpp
+x64-windows/include/boost/function_types/is_member_function_pointer.hpp
+x64-windows/include/boost/function_types/is_member_object_pointer.hpp
+x64-windows/include/boost/function_types/is_member_pointer.hpp
+x64-windows/include/boost/function_types/is_nonmember_callable_builtin.hpp
+x64-windows/include/boost/function_types/member_function_pointer.hpp
+x64-windows/include/boost/function_types/member_object_pointer.hpp
+x64-windows/include/boost/function_types/parameter_types.hpp
+x64-windows/include/boost/function_types/property_tags.hpp
+x64-windows/include/boost/function_types/result_type.hpp
+x64-windows/share/
+x64-windows/share/boost-function-types/
+x64-windows/share/boost-function-types/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-fusion_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1125 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/fusion/
+x64-windows/include/boost/fusion/adapted.hpp
+x64-windows/include/boost/fusion/adapted/
+x64-windows/include/boost/fusion/adapted/adt.hpp
+x64-windows/include/boost/fusion/adapted/adt/
+x64-windows/include/boost/fusion/adapted/adt/adapt_adt.hpp
+x64-windows/include/boost/fusion/adapted/adt/adapt_adt_named.hpp
+x64-windows/include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp
+x64-windows/include/boost/fusion/adapted/adt/adapt_assoc_adt_named.hpp
+x64-windows/include/boost/fusion/adapted/adt/detail/
+x64-windows/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
+x64-windows/include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp
+x64-windows/include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp
+x64-windows/include/boost/fusion/adapted/adt/detail/extension.hpp
+x64-windows/include/boost/fusion/adapted/array.hpp
+x64-windows/include/boost/fusion/adapted/array/
+x64-windows/include/boost/fusion/adapted/array/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/deref_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/array/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/array/value_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/
+x64-windows/include/boost/fusion/adapted/boost_array/array_iterator.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/
+x64-windows/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_array/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/
+x64-windows/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/build_cons.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/mpl/
+x64-windows/include/boost/fusion/adapted/boost_tuple/mpl/clear.hpp
+x64-windows/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/mpl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/
+x64-windows/include/boost/fusion/adapted/mpl/detail/
+x64-windows/include/boost/fusion/adapted/mpl/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/mpl/mpl_iterator.hpp
+x64-windows/include/boost/fusion/adapted/std_array.hpp
+x64-windows/include/boost/fusion/adapted/std_array/
+x64-windows/include/boost/fusion/adapted/std_array/detail/
+x64-windows/include/boost/fusion/adapted/std_array/detail/array_size.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_array/std_array_iterator.hpp
+x64-windows/include/boost/fusion/adapted/std_array/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/std_pair.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/mpl/
+x64-windows/include/boost/fusion/adapted/std_tuple/mpl/clear.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
+x64-windows/include/boost/fusion/adapted/std_tuple/tag_of.hpp
+x64-windows/include/boost/fusion/adapted/struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/
+x64-windows/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/adapt_assoc_struct_named.hpp
+x64-windows/include/boost/fusion/adapted/struct/adapt_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
+x64-windows/include/boost/fusion/adapted/struct/define_assoc_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/define_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/define_struct_inline.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_auto.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_base.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/at_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/category_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/define_struct.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/end_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/extension.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/is_view_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/namespace.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/preprocessor/
+x64-windows/include/boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/size_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/adapted/struct/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/algorithm.hpp
+x64-windows/include/boost/fusion/algorithm/
+x64-windows/include/boost/fusion/algorithm/auxiliary.hpp
+x64-windows/include/boost/fusion/algorithm/auxiliary/
+x64-windows/include/boost/fusion/algorithm/auxiliary/copy.hpp
+x64-windows/include/boost/fusion/algorithm/auxiliary/move.hpp
+x64-windows/include/boost/fusion/algorithm/iteration.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/
+x64-windows/include/boost/fusion/algorithm/iteration/accumulate.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/
+x64-windows/include/boost/fusion/algorithm/iteration/detail/fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/fold_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/for_each.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/iter_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/reverse_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/reverse_iter_fold.hpp
+x64-windows/include/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/query.hpp
+x64-windows/include/boost/fusion/algorithm/query/
+x64-windows/include/boost/fusion/algorithm/query/all.hpp
+x64-windows/include/boost/fusion/algorithm/query/any.hpp
+x64-windows/include/boost/fusion/algorithm/query/count.hpp
+x64-windows/include/boost/fusion/algorithm/query/count_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/
+x64-windows/include/boost/fusion/algorithm/query/detail/all.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/any.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/count.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/count_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/find_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
+x64-windows/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/find.hpp
+x64-windows/include/boost/fusion/algorithm/query/find_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/query/find_if.hpp
+x64-windows/include/boost/fusion/algorithm/query/find_if_fwd.hpp
+x64-windows/include/boost/fusion/algorithm/query/none.hpp
+x64-windows/include/boost/fusion/algorithm/transformation.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/
+x64-windows/include/boost/fusion/algorithm/transformation/clear.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip10.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip20.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip30.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip40.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/preprocessed/zip50.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/replace.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/erase.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/erase_key.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/filter.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/filter_if.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/flatten.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/insert.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/insert_range.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/join.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/pop_back.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/pop_front.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/push_back.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/push_front.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/remove.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/remove_if.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/replace.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/replace_if.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/reverse.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/transform.hpp
+x64-windows/include/boost/fusion/algorithm/transformation/zip.hpp
+x64-windows/include/boost/fusion/container.hpp
+x64-windows/include/boost/fusion/container/
+x64-windows/include/boost/fusion/container/deque.hpp
+x64-windows/include/boost/fusion/container/deque/
+x64-windows/include/boost/fusion/container/deque/back_extended_deque.hpp
+x64-windows/include/boost/fusion/container/deque/convert.hpp
+x64-windows/include/boost/fusion/container/deque/deque.hpp
+x64-windows/include/boost/fusion/container/deque/deque_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/deque_iterator.hpp
+x64-windows/include/boost/fusion/container/deque/detail/
+x64-windows/include/boost/fusion/container/deque/detail/at_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/build_deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_initial_size.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque10.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque20.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque30.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque40.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque50.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_fwd.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size10.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size20.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size30.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size40.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_initial_size50.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values10.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values20.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values30.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values40.hpp
+x64-windows/include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_keyed_values50.hpp
+x64-windows/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
+x64-windows/include/boost/fusion/container/deque/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/is_sequence_impl.hpp
+x64-windows/include/boost/fusion/container/deque/detail/keyed_element.hpp
+x64-windows/include/boost/fusion/container/deque/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/deque/front_extended_deque.hpp
+x64-windows/include/boost/fusion/container/generation.hpp
+x64-windows/include/boost/fusion/container/generation/
+x64-windows/include/boost/fusion/container/generation/cons_tie.hpp
+x64-windows/include/boost/fusion/container/generation/deque_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/
+x64-windows/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_list_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_list.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_map.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_set.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_make_vector.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/pp_vector_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/deque_tie50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/list_tie50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_deque50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_list50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_map50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_set50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/make_vector50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/map_tie50.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie10.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie20.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie30.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie40.hpp
+x64-windows/include/boost/fusion/container/generation/detail/preprocessed/vector_tie50.hpp
+x64-windows/include/boost/fusion/container/generation/ignore.hpp
+x64-windows/include/boost/fusion/container/generation/list_tie.hpp
+x64-windows/include/boost/fusion/container/generation/make_cons.hpp
+x64-windows/include/boost/fusion/container/generation/make_deque.hpp
+x64-windows/include/boost/fusion/container/generation/make_list.hpp
+x64-windows/include/boost/fusion/container/generation/make_map.hpp
+x64-windows/include/boost/fusion/container/generation/make_set.hpp
+x64-windows/include/boost/fusion/container/generation/make_vector.hpp
+x64-windows/include/boost/fusion/container/generation/map_tie.hpp
+x64-windows/include/boost/fusion/container/generation/pair_tie.hpp
+x64-windows/include/boost/fusion/container/generation/vector_tie.hpp
+x64-windows/include/boost/fusion/container/list.hpp
+x64-windows/include/boost/fusion/container/list/
+x64-windows/include/boost/fusion/container/list/cons.hpp
+x64-windows/include/boost/fusion/container/list/cons_fwd.hpp
+x64-windows/include/boost/fusion/container/list/cons_iterator.hpp
+x64-windows/include/boost/fusion/container/list/convert.hpp
+x64-windows/include/boost/fusion/container/list/detail/
+x64-windows/include/boost/fusion/container/list/detail/at_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/build_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/
+x64-windows/include/boost/fusion/container/list/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list_to_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/list_to_cons_call.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list10.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list10_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list20.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list20_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list30.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list30_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list40.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list40_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list50.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list50_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_fwd.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons10.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons20.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons30.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons40.hpp
+x64-windows/include/boost/fusion/container/list/detail/cpp03/preprocessed/list_to_cons50.hpp
+x64-windows/include/boost/fusion/container/list/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/empty_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/list_to_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/next_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/reverse_cons.hpp
+x64-windows/include/boost/fusion/container/list/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/list/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/container/list/list.hpp
+x64-windows/include/boost/fusion/container/list/list_fwd.hpp
+x64-windows/include/boost/fusion/container/list/nil.hpp
+x64-windows/include/boost/fusion/container/map.hpp
+x64-windows/include/boost/fusion/container/map/
+x64-windows/include/boost/fusion/container/map/convert.hpp
+x64-windows/include/boost/fusion/container/map/detail/
+x64-windows/include/boost/fusion/container/map/detail/at_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/at_key_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/build_map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/
+x64-windows/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/begin_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/convert.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/deref_data_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/deref_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/end_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/key_of_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/map_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map10.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map20.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map30.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map40.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map50.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map10.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map10_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map20.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map20_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map30.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map30_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map40.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map40_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map50.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map50_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/preprocessed/map_fwd.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/cpp03/value_of_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/map_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/map_index.hpp
+x64-windows/include/boost/fusion/container/map/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
+x64-windows/include/boost/fusion/container/map/map.hpp
+x64-windows/include/boost/fusion/container/map/map_fwd.hpp
+x64-windows/include/boost/fusion/container/map/map_iterator.hpp
+x64-windows/include/boost/fusion/container/set.hpp
+x64-windows/include/boost/fusion/container/set/
+x64-windows/include/boost/fusion/container/set/convert.hpp
+x64-windows/include/boost/fusion/container/set/detail/
+x64-windows/include/boost/fusion/container/set/detail/as_set.hpp
+x64-windows/include/boost/fusion/container/set/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/
+x64-windows/include/boost/fusion/container/set/detail/cpp03/as_set.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set10.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set20.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set30.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set40.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/as_set50.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set10.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set10_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set20.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set20_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set30.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set30_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set40.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set40_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set50.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set50_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/preprocessed/set_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/set.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/set_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/set/detail/cpp03/set_fwd.hpp
+x64-windows/include/boost/fusion/container/set/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/container/set/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/container/set/set.hpp
+x64-windows/include/boost/fusion/container/set/set_fwd.hpp
+x64-windows/include/boost/fusion/container/vector.hpp
+x64-windows/include/boost/fusion/container/vector/
+x64-windows/include/boost/fusion/container/vector/convert.hpp
+x64-windows/include/boost/fusion/container/vector/detail/
+x64-windows/include/boost/fusion/container/vector/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/as_vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/at_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/config.hpp
+x64-windows/include/boost/fusion/container/vector/detail/convert_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/as_vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/limits.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/as_vector50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector10_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector20_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector30_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector40_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector50_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_chooser50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vector_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector10.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector10_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector20.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector20_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector30.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector30_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector40.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector40_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector50.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector50_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector_forward_ctor.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector_n.hpp
+x64-windows/include/boost/fusion/container/vector/detail/cpp03/vector_n_chooser.hpp
+x64-windows/include/boost/fusion/container/vector/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/end_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/next_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/container/vector/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/container/vector/vector.hpp
+x64-windows/include/boost/fusion/container/vector/vector10.hpp
+x64-windows/include/boost/fusion/container/vector/vector20.hpp
+x64-windows/include/boost/fusion/container/vector/vector30.hpp
+x64-windows/include/boost/fusion/container/vector/vector40.hpp
+x64-windows/include/boost/fusion/container/vector/vector50.hpp
+x64-windows/include/boost/fusion/container/vector/vector_fwd.hpp
+x64-windows/include/boost/fusion/container/vector/vector_iterator.hpp
+x64-windows/include/boost/fusion/functional.hpp
+x64-windows/include/boost/fusion/functional/
+x64-windows/include/boost/fusion/functional/adapter.hpp
+x64-windows/include/boost/fusion/functional/adapter/
+x64-windows/include/boost/fusion/functional/adapter/detail/
+x64-windows/include/boost/fusion/functional/adapter/detail/access.hpp
+x64-windows/include/boost/fusion/functional/adapter/fused.hpp
+x64-windows/include/boost/fusion/functional/adapter/fused_function_object.hpp
+x64-windows/include/boost/fusion/functional/adapter/fused_procedure.hpp
+x64-windows/include/boost/fusion/functional/adapter/limits.hpp
+x64-windows/include/boost/fusion/functional/adapter/unfused.hpp
+x64-windows/include/boost/fusion/functional/adapter/unfused_typed.hpp
+x64-windows/include/boost/fusion/functional/generation.hpp
+x64-windows/include/boost/fusion/functional/generation/
+x64-windows/include/boost/fusion/functional/generation/detail/
+x64-windows/include/boost/fusion/functional/generation/detail/gen_make_adapter.hpp
+x64-windows/include/boost/fusion/functional/generation/make_fused.hpp
+x64-windows/include/boost/fusion/functional/generation/make_fused_function_object.hpp
+x64-windows/include/boost/fusion/functional/generation/make_fused_procedure.hpp
+x64-windows/include/boost/fusion/functional/generation/make_unfused.hpp
+x64-windows/include/boost/fusion/functional/invocation.hpp
+x64-windows/include/boost/fusion/functional/invocation/
+x64-windows/include/boost/fusion/functional/invocation/detail/
+x64-windows/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
+x64-windows/include/boost/fusion/functional/invocation/invoke.hpp
+x64-windows/include/boost/fusion/functional/invocation/invoke_function_object.hpp
+x64-windows/include/boost/fusion/functional/invocation/invoke_procedure.hpp
+x64-windows/include/boost/fusion/functional/invocation/limits.hpp
+x64-windows/include/boost/fusion/include/
+x64-windows/include/boost/fusion/include/accumulate.hpp
+x64-windows/include/boost/fusion/include/adapt_adt.hpp
+x64-windows/include/boost/fusion/include/adapt_adt_named.hpp
+x64-windows/include/boost/fusion/include/adapt_assoc_adt.hpp
+x64-windows/include/boost/fusion/include/adapt_assoc_adt_named.hpp
+x64-windows/include/boost/fusion/include/adapt_assoc_struct.hpp
+x64-windows/include/boost/fusion/include/adapt_assoc_struct_named.hpp
+x64-windows/include/boost/fusion/include/adapt_struct.hpp
+x64-windows/include/boost/fusion/include/adapt_struct_named.hpp
+x64-windows/include/boost/fusion/include/adapted.hpp
+x64-windows/include/boost/fusion/include/adapter.hpp
+x64-windows/include/boost/fusion/include/advance.hpp
+x64-windows/include/boost/fusion/include/algorithm.hpp
+x64-windows/include/boost/fusion/include/all.hpp
+x64-windows/include/boost/fusion/include/any.hpp
+x64-windows/include/boost/fusion/include/array.hpp
+x64-windows/include/boost/fusion/include/as_deque.hpp
+x64-windows/include/boost/fusion/include/as_list.hpp
+x64-windows/include/boost/fusion/include/as_map.hpp
+x64-windows/include/boost/fusion/include/as_set.hpp
+x64-windows/include/boost/fusion/include/as_vector.hpp
+x64-windows/include/boost/fusion/include/at.hpp
+x64-windows/include/boost/fusion/include/at_c.hpp
+x64-windows/include/boost/fusion/include/at_key.hpp
+x64-windows/include/boost/fusion/include/auxiliary.hpp
+x64-windows/include/boost/fusion/include/back.hpp
+x64-windows/include/boost/fusion/include/begin.hpp
+x64-windows/include/boost/fusion/include/boost_array.hpp
+x64-windows/include/boost/fusion/include/boost_tuple.hpp
+x64-windows/include/boost/fusion/include/category_of.hpp
+x64-windows/include/boost/fusion/include/clear.hpp
+x64-windows/include/boost/fusion/include/comparison.hpp
+x64-windows/include/boost/fusion/include/cons.hpp
+x64-windows/include/boost/fusion/include/cons_tie.hpp
+x64-windows/include/boost/fusion/include/container.hpp
+x64-windows/include/boost/fusion/include/convert.hpp
+x64-windows/include/boost/fusion/include/copy.hpp
+x64-windows/include/boost/fusion/include/count.hpp
+x64-windows/include/boost/fusion/include/count_if.hpp
+x64-windows/include/boost/fusion/include/deduce.hpp
+x64-windows/include/boost/fusion/include/deduce_sequence.hpp
+x64-windows/include/boost/fusion/include/define_assoc_struct.hpp
+x64-windows/include/boost/fusion/include/define_struct.hpp
+x64-windows/include/boost/fusion/include/define_struct_inline.hpp
+x64-windows/include/boost/fusion/include/deque.hpp
+x64-windows/include/boost/fusion/include/deque_fwd.hpp
+x64-windows/include/boost/fusion/include/deque_tie.hpp
+x64-windows/include/boost/fusion/include/deref.hpp
+x64-windows/include/boost/fusion/include/deref_data.hpp
+x64-windows/include/boost/fusion/include/distance.hpp
+x64-windows/include/boost/fusion/include/empty.hpp
+x64-windows/include/boost/fusion/include/end.hpp
+x64-windows/include/boost/fusion/include/equal_to.hpp
+x64-windows/include/boost/fusion/include/erase.hpp
+x64-windows/include/boost/fusion/include/erase_key.hpp
+x64-windows/include/boost/fusion/include/filter.hpp
+x64-windows/include/boost/fusion/include/filter_if.hpp
+x64-windows/include/boost/fusion/include/filter_view.hpp
+x64-windows/include/boost/fusion/include/find.hpp
+x64-windows/include/boost/fusion/include/find_if.hpp
+x64-windows/include/boost/fusion/include/flatten.hpp
+x64-windows/include/boost/fusion/include/flatten_view.hpp
+x64-windows/include/boost/fusion/include/fold.hpp
+x64-windows/include/boost/fusion/include/for_each.hpp
+x64-windows/include/boost/fusion/include/front.hpp
+x64-windows/include/boost/fusion/include/functional.hpp
+x64-windows/include/boost/fusion/include/fused.hpp
+x64-windows/include/boost/fusion/include/fused_function_object.hpp
+x64-windows/include/boost/fusion/include/fused_procedure.hpp
+x64-windows/include/boost/fusion/include/generation.hpp
+x64-windows/include/boost/fusion/include/greater.hpp
+x64-windows/include/boost/fusion/include/greater_equal.hpp
+x64-windows/include/boost/fusion/include/has_key.hpp
+x64-windows/include/boost/fusion/include/hash.hpp
+x64-windows/include/boost/fusion/include/ignore.hpp
+x64-windows/include/boost/fusion/include/in.hpp
+x64-windows/include/boost/fusion/include/insert.hpp
+x64-windows/include/boost/fusion/include/insert_range.hpp
+x64-windows/include/boost/fusion/include/intrinsic.hpp
+x64-windows/include/boost/fusion/include/invocation.hpp
+x64-windows/include/boost/fusion/include/invoke.hpp
+x64-windows/include/boost/fusion/include/invoke_function_object.hpp
+x64-windows/include/boost/fusion/include/invoke_procedure.hpp
+x64-windows/include/boost/fusion/include/io.hpp
+x64-windows/include/boost/fusion/include/is_iterator.hpp
+x64-windows/include/boost/fusion/include/is_segmented.hpp
+x64-windows/include/boost/fusion/include/is_sequence.hpp
+x64-windows/include/boost/fusion/include/is_view.hpp
+x64-windows/include/boost/fusion/include/iter_fold.hpp
+x64-windows/include/boost/fusion/include/iteration.hpp
+x64-windows/include/boost/fusion/include/iterator.hpp
+x64-windows/include/boost/fusion/include/iterator_adapter.hpp
+x64-windows/include/boost/fusion/include/iterator_base.hpp
+x64-windows/include/boost/fusion/include/iterator_facade.hpp
+x64-windows/include/boost/fusion/include/iterator_range.hpp
+x64-windows/include/boost/fusion/include/join.hpp
+x64-windows/include/boost/fusion/include/joint_view.hpp
+x64-windows/include/boost/fusion/include/key_of.hpp
+x64-windows/include/boost/fusion/include/less.hpp
+x64-windows/include/boost/fusion/include/less_equal.hpp
+x64-windows/include/boost/fusion/include/list.hpp
+x64-windows/include/boost/fusion/include/list_fwd.hpp
+x64-windows/include/boost/fusion/include/list_tie.hpp
+x64-windows/include/boost/fusion/include/make_cons.hpp
+x64-windows/include/boost/fusion/include/make_deque.hpp
+x64-windows/include/boost/fusion/include/make_fused.hpp
+x64-windows/include/boost/fusion/include/make_fused_function_object.hpp
+x64-windows/include/boost/fusion/include/make_fused_procedure.hpp
+x64-windows/include/boost/fusion/include/make_list.hpp
+x64-windows/include/boost/fusion/include/make_map.hpp
+x64-windows/include/boost/fusion/include/make_set.hpp
+x64-windows/include/boost/fusion/include/make_tuple.hpp
+x64-windows/include/boost/fusion/include/make_unfused.hpp
+x64-windows/include/boost/fusion/include/make_vector.hpp
+x64-windows/include/boost/fusion/include/map.hpp
+x64-windows/include/boost/fusion/include/map_fwd.hpp
+x64-windows/include/boost/fusion/include/map_tie.hpp
+x64-windows/include/boost/fusion/include/move.hpp
+x64-windows/include/boost/fusion/include/mpl.hpp
+x64-windows/include/boost/fusion/include/next.hpp
+x64-windows/include/boost/fusion/include/nil.hpp
+x64-windows/include/boost/fusion/include/none.hpp
+x64-windows/include/boost/fusion/include/not_equal_to.hpp
+x64-windows/include/boost/fusion/include/nview.hpp
+x64-windows/include/boost/fusion/include/out.hpp
+x64-windows/include/boost/fusion/include/pair.hpp
+x64-windows/include/boost/fusion/include/pair_tie.hpp
+x64-windows/include/boost/fusion/include/pop_back.hpp
+x64-windows/include/boost/fusion/include/pop_front.hpp
+x64-windows/include/boost/fusion/include/prior.hpp
+x64-windows/include/boost/fusion/include/proxy_type.hpp
+x64-windows/include/boost/fusion/include/push_back.hpp
+x64-windows/include/boost/fusion/include/push_front.hpp
+x64-windows/include/boost/fusion/include/query.hpp
+x64-windows/include/boost/fusion/include/remove.hpp
+x64-windows/include/boost/fusion/include/remove_if.hpp
+x64-windows/include/boost/fusion/include/repetitive_view.hpp
+x64-windows/include/boost/fusion/include/replace.hpp
+x64-windows/include/boost/fusion/include/replace_if.hpp
+x64-windows/include/boost/fusion/include/reverse.hpp
+x64-windows/include/boost/fusion/include/reverse_fold.hpp
+x64-windows/include/boost/fusion/include/reverse_iter_fold.hpp
+x64-windows/include/boost/fusion/include/reverse_view.hpp
+x64-windows/include/boost/fusion/include/segmented_fold_until.hpp
+x64-windows/include/boost/fusion/include/segmented_iterator.hpp
+x64-windows/include/boost/fusion/include/segments.hpp
+x64-windows/include/boost/fusion/include/sequence.hpp
+x64-windows/include/boost/fusion/include/sequence_base.hpp
+x64-windows/include/boost/fusion/include/sequence_facade.hpp
+x64-windows/include/boost/fusion/include/set.hpp
+x64-windows/include/boost/fusion/include/set_fwd.hpp
+x64-windows/include/boost/fusion/include/single_view.hpp
+x64-windows/include/boost/fusion/include/size.hpp
+x64-windows/include/boost/fusion/include/std_array.hpp
+x64-windows/include/boost/fusion/include/std_pair.hpp
+x64-windows/include/boost/fusion/include/std_tuple.hpp
+x64-windows/include/boost/fusion/include/struct.hpp
+x64-windows/include/boost/fusion/include/support.hpp
+x64-windows/include/boost/fusion/include/swap.hpp
+x64-windows/include/boost/fusion/include/tag_of.hpp
+x64-windows/include/boost/fusion/include/tag_of_fwd.hpp
+x64-windows/include/boost/fusion/include/transform.hpp
+x64-windows/include/boost/fusion/include/transform_view.hpp
+x64-windows/include/boost/fusion/include/transformation.hpp
+x64-windows/include/boost/fusion/include/tuple.hpp
+x64-windows/include/boost/fusion/include/tuple_fwd.hpp
+x64-windows/include/boost/fusion/include/tuple_tie.hpp
+x64-windows/include/boost/fusion/include/unfused.hpp
+x64-windows/include/boost/fusion/include/unfused_typed.hpp
+x64-windows/include/boost/fusion/include/unused.hpp
+x64-windows/include/boost/fusion/include/value_at.hpp
+x64-windows/include/boost/fusion/include/value_at_key.hpp
+x64-windows/include/boost/fusion/include/value_of.hpp
+x64-windows/include/boost/fusion/include/value_of_data.hpp
+x64-windows/include/boost/fusion/include/vector.hpp
+x64-windows/include/boost/fusion/include/vector10.hpp
+x64-windows/include/boost/fusion/include/vector20.hpp
+x64-windows/include/boost/fusion/include/vector30.hpp
+x64-windows/include/boost/fusion/include/vector40.hpp
+x64-windows/include/boost/fusion/include/vector50.hpp
+x64-windows/include/boost/fusion/include/vector_fwd.hpp
+x64-windows/include/boost/fusion/include/vector_tie.hpp
+x64-windows/include/boost/fusion/include/view.hpp
+x64-windows/include/boost/fusion/include/void.hpp
+x64-windows/include/boost/fusion/include/zip.hpp
+x64-windows/include/boost/fusion/include/zip_view.hpp
+x64-windows/include/boost/fusion/iterator.hpp
+x64-windows/include/boost/fusion/iterator/
+x64-windows/include/boost/fusion/iterator/advance.hpp
+x64-windows/include/boost/fusion/iterator/basic_iterator.hpp
+x64-windows/include/boost/fusion/iterator/deref.hpp
+x64-windows/include/boost/fusion/iterator/deref_data.hpp
+x64-windows/include/boost/fusion/iterator/detail/
+x64-windows/include/boost/fusion/iterator/detail/adapt_deref_traits.hpp
+x64-windows/include/boost/fusion/iterator/detail/adapt_value_traits.hpp
+x64-windows/include/boost/fusion/iterator/detail/advance.hpp
+x64-windows/include/boost/fusion/iterator/detail/distance.hpp
+x64-windows/include/boost/fusion/iterator/detail/segment_sequence.hpp
+x64-windows/include/boost/fusion/iterator/detail/segmented_equal_to.hpp
+x64-windows/include/boost/fusion/iterator/detail/segmented_iterator.hpp
+x64-windows/include/boost/fusion/iterator/detail/segmented_next_impl.hpp
+x64-windows/include/boost/fusion/iterator/distance.hpp
+x64-windows/include/boost/fusion/iterator/equal_to.hpp
+x64-windows/include/boost/fusion/iterator/iterator_adapter.hpp
+x64-windows/include/boost/fusion/iterator/iterator_facade.hpp
+x64-windows/include/boost/fusion/iterator/key_of.hpp
+x64-windows/include/boost/fusion/iterator/mpl.hpp
+x64-windows/include/boost/fusion/iterator/mpl/
+x64-windows/include/boost/fusion/iterator/mpl/convert_iterator.hpp
+x64-windows/include/boost/fusion/iterator/mpl/fusion_iterator.hpp
+x64-windows/include/boost/fusion/iterator/next.hpp
+x64-windows/include/boost/fusion/iterator/prior.hpp
+x64-windows/include/boost/fusion/iterator/segmented_iterator.hpp
+x64-windows/include/boost/fusion/iterator/value_of.hpp
+x64-windows/include/boost/fusion/iterator/value_of_data.hpp
+x64-windows/include/boost/fusion/mpl.hpp
+x64-windows/include/boost/fusion/mpl/
+x64-windows/include/boost/fusion/mpl/at.hpp
+x64-windows/include/boost/fusion/mpl/back.hpp
+x64-windows/include/boost/fusion/mpl/begin.hpp
+x64-windows/include/boost/fusion/mpl/clear.hpp
+x64-windows/include/boost/fusion/mpl/detail/
+x64-windows/include/boost/fusion/mpl/detail/clear.hpp
+x64-windows/include/boost/fusion/mpl/empty.hpp
+x64-windows/include/boost/fusion/mpl/end.hpp
+x64-windows/include/boost/fusion/mpl/erase.hpp
+x64-windows/include/boost/fusion/mpl/erase_key.hpp
+x64-windows/include/boost/fusion/mpl/front.hpp
+x64-windows/include/boost/fusion/mpl/has_key.hpp
+x64-windows/include/boost/fusion/mpl/insert.hpp
+x64-windows/include/boost/fusion/mpl/insert_range.hpp
+x64-windows/include/boost/fusion/mpl/pop_back.hpp
+x64-windows/include/boost/fusion/mpl/pop_front.hpp
+x64-windows/include/boost/fusion/mpl/push_back.hpp
+x64-windows/include/boost/fusion/mpl/push_front.hpp
+x64-windows/include/boost/fusion/mpl/size.hpp
+x64-windows/include/boost/fusion/sequence.hpp
+x64-windows/include/boost/fusion/sequence/
+x64-windows/include/boost/fusion/sequence/comparison.hpp
+x64-windows/include/boost/fusion/sequence/comparison/
+x64-windows/include/boost/fusion/sequence/comparison/detail/
+x64-windows/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/greater.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/less.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
+x64-windows/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
+x64-windows/include/boost/fusion/sequence/comparison/enable_comparison.hpp
+x64-windows/include/boost/fusion/sequence/comparison/equal_to.hpp
+x64-windows/include/boost/fusion/sequence/comparison/greater.hpp
+x64-windows/include/boost/fusion/sequence/comparison/greater_equal.hpp
+x64-windows/include/boost/fusion/sequence/comparison/less.hpp
+x64-windows/include/boost/fusion/sequence/comparison/less_equal.hpp
+x64-windows/include/boost/fusion/sequence/comparison/not_equal_to.hpp
+x64-windows/include/boost/fusion/sequence/convert.hpp
+x64-windows/include/boost/fusion/sequence/hash.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/
+x64-windows/include/boost/fusion/sequence/intrinsic/at.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/at_c.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/at_key.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/back.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/begin.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/empty.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/end.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/front.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/has_key.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/segments.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/size.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/swap.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/value_at.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
+x64-windows/include/boost/fusion/sequence/intrinsic_fwd.hpp
+x64-windows/include/boost/fusion/sequence/io.hpp
+x64-windows/include/boost/fusion/sequence/io/
+x64-windows/include/boost/fusion/sequence/io/detail/
+x64-windows/include/boost/fusion/sequence/io/detail/in.hpp
+x64-windows/include/boost/fusion/sequence/io/detail/manip.hpp
+x64-windows/include/boost/fusion/sequence/io/detail/out.hpp
+x64-windows/include/boost/fusion/sequence/io/in.hpp
+x64-windows/include/boost/fusion/sequence/io/out.hpp
+x64-windows/include/boost/fusion/sequence/sequence_facade.hpp
+x64-windows/include/boost/fusion/support.hpp
+x64-windows/include/boost/fusion/support/
+x64-windows/include/boost/fusion/support/as_const.hpp
+x64-windows/include/boost/fusion/support/category_of.hpp
+x64-windows/include/boost/fusion/support/config.hpp
+x64-windows/include/boost/fusion/support/deduce.hpp
+x64-windows/include/boost/fusion/support/deduce_sequence.hpp
+x64-windows/include/boost/fusion/support/detail/
+x64-windows/include/boost/fusion/support/detail/access.hpp
+x64-windows/include/boost/fusion/support/detail/and.hpp
+x64-windows/include/boost/fusion/support/detail/as_fusion_element.hpp
+x64-windows/include/boost/fusion/support/detail/category_of.hpp
+x64-windows/include/boost/fusion/support/detail/enabler.hpp
+x64-windows/include/boost/fusion/support/detail/index_sequence.hpp
+x64-windows/include/boost/fusion/support/detail/is_mpl_sequence.hpp
+x64-windows/include/boost/fusion/support/detail/is_same_size.hpp
+x64-windows/include/boost/fusion/support/detail/is_view.hpp
+x64-windows/include/boost/fusion/support/detail/mpl_iterator_category.hpp
+x64-windows/include/boost/fusion/support/detail/pp_round.hpp
+x64-windows/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
+x64-windows/include/boost/fusion/support/detail/unknown_key.hpp
+x64-windows/include/boost/fusion/support/is_iterator.hpp
+x64-windows/include/boost/fusion/support/is_segmented.hpp
+x64-windows/include/boost/fusion/support/is_sequence.hpp
+x64-windows/include/boost/fusion/support/is_view.hpp
+x64-windows/include/boost/fusion/support/iterator_base.hpp
+x64-windows/include/boost/fusion/support/pair.hpp
+x64-windows/include/boost/fusion/support/segmented_fold_until.hpp
+x64-windows/include/boost/fusion/support/sequence_base.hpp
+x64-windows/include/boost/fusion/support/tag_of.hpp
+x64-windows/include/boost/fusion/support/tag_of_fwd.hpp
+x64-windows/include/boost/fusion/support/unused.hpp
+x64-windows/include/boost/fusion/support/void.hpp
+x64-windows/include/boost/fusion/tuple.hpp
+x64-windows/include/boost/fusion/tuple/
+x64-windows/include/boost/fusion/tuple/detail/
+x64-windows/include/boost/fusion/tuple/detail/make_tuple.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple10.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple20.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple30.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple40.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/make_tuple50.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple10.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple10_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple20.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple20_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple30.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple30_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple40.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple40_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple50.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple50_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie10.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie20.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie30.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie40.hpp
+x64-windows/include/boost/fusion/tuple/detail/preprocessed/tuple_tie50.hpp
+x64-windows/include/boost/fusion/tuple/detail/tuple.hpp
+x64-windows/include/boost/fusion/tuple/detail/tuple_expand.hpp
+x64-windows/include/boost/fusion/tuple/detail/tuple_fwd.hpp
+x64-windows/include/boost/fusion/tuple/detail/tuple_tie.hpp
+x64-windows/include/boost/fusion/tuple/make_tuple.hpp
+x64-windows/include/boost/fusion/tuple/tuple.hpp
+x64-windows/include/boost/fusion/tuple/tuple_fwd.hpp
+x64-windows/include/boost/fusion/tuple/tuple_tie.hpp
+x64-windows/include/boost/fusion/view.hpp
+x64-windows/include/boost/fusion/view/
+x64-windows/include/boost/fusion/view/detail/
+x64-windows/include/boost/fusion/view/detail/strictest_traversal.hpp
+x64-windows/include/boost/fusion/view/filter_view.hpp
+x64-windows/include/boost/fusion/view/filter_view/
+x64-windows/include/boost/fusion/view/filter_view/detail/
+x64-windows/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/filter_view/filter_view.hpp
+x64-windows/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
+x64-windows/include/boost/fusion/view/flatten_view.hpp
+x64-windows/include/boost/fusion/view/flatten_view/
+x64-windows/include/boost/fusion/view/flatten_view/flatten_view.hpp
+x64-windows/include/boost/fusion/view/flatten_view/flatten_view_iterator.hpp
+x64-windows/include/boost/fusion/view/iterator_range.hpp
+x64-windows/include/boost/fusion/view/iterator_range/
+x64-windows/include/boost/fusion/view/iterator_range/detail/
+x64-windows/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/iterator_range/iterator_range.hpp
+x64-windows/include/boost/fusion/view/joint_view.hpp
+x64-windows/include/boost/fusion/view/joint_view/
+x64-windows/include/boost/fusion/view/joint_view/detail/
+x64-windows/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/joint_view/joint_view.hpp
+x64-windows/include/boost/fusion/view/joint_view/joint_view_fwd.hpp
+x64-windows/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
+x64-windows/include/boost/fusion/view/nview.hpp
+x64-windows/include/boost/fusion/view/nview/
+x64-windows/include/boost/fusion/view/nview/detail/
+x64-windows/include/boost/fusion/view/nview/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/cpp03/
+x64-windows/include/boost/fusion/view/nview/detail/cpp03/nview_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/nview_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/nview/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/nview/nview.hpp
+x64-windows/include/boost/fusion/view/nview/nview_iterator.hpp
+x64-windows/include/boost/fusion/view/repetitive_view.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/
+x64-windows/include/boost/fusion/view/repetitive_view/detail/
+x64-windows/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/repetitive_view.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp
+x64-windows/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
+x64-windows/include/boost/fusion/view/reverse_view.hpp
+x64-windows/include/boost/fusion/view/reverse_view/
+x64-windows/include/boost/fusion/view/reverse_view/detail/
+x64-windows/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/key_of_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/reverse_view/reverse_view.hpp
+x64-windows/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
+x64-windows/include/boost/fusion/view/single_view.hpp
+x64-windows/include/boost/fusion/view/single_view/
+x64-windows/include/boost/fusion/view/single_view/detail/
+x64-windows/include/boost/fusion/view/single_view/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/single_view/single_view.hpp
+x64-windows/include/boost/fusion/view/single_view/single_view_iterator.hpp
+x64-windows/include/boost/fusion/view/transform_view.hpp
+x64-windows/include/boost/fusion/view/transform_view/
+x64-windows/include/boost/fusion/view/transform_view/detail/
+x64-windows/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/transform_view/transform_view.hpp
+x64-windows/include/boost/fusion/view/transform_view/transform_view_fwd.hpp
+x64-windows/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
+x64-windows/include/boost/fusion/view/zip_view.hpp
+x64-windows/include/boost/fusion/view/zip_view/
+x64-windows/include/boost/fusion/view/zip_view/detail/
+x64-windows/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/at_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/end_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/next_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/size_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
+x64-windows/include/boost/fusion/view/zip_view/zip_view.hpp
+x64-windows/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
+x64-windows/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-fusion/
+x64-windows/share/boost-fusion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-geometry_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,986 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/geometry.hpp
+x64-windows/include/boost/geometry/
+x64-windows/include/boost/geometry/algorithms/
+x64-windows/include/boost/geometry/algorithms/append.hpp
+x64-windows/include/boost/geometry/algorithms/area.hpp
+x64-windows/include/boost/geometry/algorithms/assign.hpp
+x64-windows/include/boost/geometry/algorithms/buffer.hpp
+x64-windows/include/boost/geometry/algorithms/centroid.hpp
+x64-windows/include/boost/geometry/algorithms/clear.hpp
+x64-windows/include/boost/geometry/algorithms/comparable_distance.hpp
+x64-windows/include/boost/geometry/algorithms/convert.hpp
+x64-windows/include/boost/geometry/algorithms/convex_hull.hpp
+x64-windows/include/boost/geometry/algorithms/correct.hpp
+x64-windows/include/boost/geometry/algorithms/correct_closure.hpp
+x64-windows/include/boost/geometry/algorithms/covered_by.hpp
+x64-windows/include/boost/geometry/algorithms/crosses.hpp
+x64-windows/include/boost/geometry/algorithms/densify.hpp
+x64-windows/include/boost/geometry/algorithms/detail/
+x64-windows/include/boost/geometry/algorithms/detail/as_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/assign_box_corners.hpp
+x64-windows/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/assign_values.hpp
+x64-windows/include/boost/geometry/algorithms/detail/azimuth.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/
+x64-windows/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/parallel_continue.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/turn_in_original_visitor.hpp
+x64-windows/include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp
+x64-windows/include/boost/geometry/algorithms/detail/calculate_null.hpp
+x64-windows/include/boost/geometry/algorithms/detail/calculate_sum.hpp
+x64-windows/include/boost/geometry/algorithms/detail/centroid/
+x64-windows/include/boost/geometry/algorithms/detail/centroid/translating_transformer.hpp
+x64-windows/include/boost/geometry/algorithms/detail/check_iterator_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/closest_feature/
+x64-windows/include/boost/geometry/algorithms/detail/closest_feature/geometry_to_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/closest_feature/point_to_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/closest_feature/range_to_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/comparable_distance/
+x64-windows/include/boost/geometry/algorithms/detail/comparable_distance/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
+x64-windows/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/counting.hpp
+x64-windows/include/boost/geometry/algorithms/detail/course.hpp
+x64-windows/include/boost/geometry/algorithms/detail/covered_by/
+x64-windows/include/boost/geometry/algorithms/detail/covered_by/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/covered_by/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/direction_code.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/multipoint_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/multirange_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/point_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/point_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/
+x64-windows/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/is_comparable.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/iterator_selector.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/linear_or_areal_to_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/linear_to_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/multipoint_to_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/
+x64-windows/include/boost/geometry/algorithms/detail/envelope/box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/initialize.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/intersects_antimeridian.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/multipoint.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/segment.hpp
+x64-windows/include/boost/geometry/algorithms/detail/envelope/transform_units.hpp
+x64-windows/include/boost/geometry/algorithms/detail/equals/
+x64-windows/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
+x64-windows/include/boost/geometry/algorithms/detail/equals/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/equals/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/equals/point_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/
+x64-windows/include/boost/geometry/algorithms/detail/expand/box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/indexed.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand/segment.hpp
+x64-windows/include/boost/geometry/algorithms/detail/expand_by_epsilon.hpp
+x64-windows/include/boost/geometry/algorithms/detail/extreme_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/for_each_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/get_left_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/get_max_size.hpp
+x64-windows/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
+x64-windows/include/boost/geometry/algorithms/detail/interior_iterator.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersection/
+x64-windows/include/boost/geometry/algorithms/detail/intersection/box_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersection/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersection/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersection/multi.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersects/
+x64-windows/include/boost/geometry/algorithms/detail/intersects/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/intersects/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/always_simple.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/debug_print_boundary_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/failure_policy.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/debug_complement_graph.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/debug_print_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/debug_validity_phase.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/has_invalid_coordinate.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/is_acceptable_turn.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/ring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/is_valid/segment.hpp
+x64-windows/include/boost/geometry/algorithms/detail/max_interval_gap.hpp
+x64-windows/include/boost/geometry/algorithms/detail/multi_modify.hpp
+x64-windows/include/boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp
+x64-windows/include/boost/geometry/algorithms/detail/multi_sum.hpp
+x64-windows/include/boost/geometry/algorithms/detail/normalize.hpp
+x64-windows/include/boost/geometry/algorithms/detail/not.hpp
+x64-windows/include/boost/geometry/algorithms/detail/num_distinct_consecutive_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/occupation_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlaps/
+x64-windows/include/boost/geometry/algorithms/detail/overlaps/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlaps/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/
+x64-windows/include/boost/geometry/algorithms/detail/overlay/add_rings.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/check_enrich.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/cluster_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/convert_ring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/do_reverse.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/follow.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_ring.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/handle_colocations.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/handle_self_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/is_self_turn.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/less_by_segment_ratio.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/needs_self_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/overlay_type.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/pointlike_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/range_in_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/ring_properties.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/segment_identifier.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traversal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traversal_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/turn_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/overlay/visit_info.hpp
+x64-windows/include/boost/geometry/algorithms/detail/partition.hpp
+x64-windows/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/point_on_border.hpp
+x64-windows/include/boost/geometry/algorithms/detail/recalculate.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/
+x64-windows/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/de9im.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/multi_point_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/point_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/point_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/relate_impl.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/result.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/topology_check.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relate/turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relation/
+x64-windows/include/boost/geometry/algorithms/detail/relation/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/relation/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/ring_identifier.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sections/
+x64-windows/include/boost/geometry/algorithms/detail/sections/range_by_section.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sections/section_box_policies.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
+x64-windows/include/boost/geometry/algorithms/detail/signed_size_type.hpp
+x64-windows/include/boost/geometry/algorithms/detail/single_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sub_range.hpp
+x64-windows/include/boost/geometry/algorithms/detail/sweep.hpp
+x64-windows/include/boost/geometry/algorithms/detail/throw_on_empty_input.hpp
+x64-windows/include/boost/geometry/algorithms/detail/touches/
+x64-windows/include/boost/geometry/algorithms/detail/touches/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/touches/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/
+x64-windows/include/boost/geometry/algorithms/detail/turns/compare_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/debug_turn.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/filter_continue_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/print_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/turns/remove_duplicate_turns.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/
+x64-windows/include/boost/geometry/algorithms/detail/within/implementation.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/interface.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/multi_point.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/point_in_geometry.hpp
+x64-windows/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
+x64-windows/include/boost/geometry/algorithms/difference.hpp
+x64-windows/include/boost/geometry/algorithms/disjoint.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/
+x64-windows/include/boost/geometry/algorithms/dispatch/disjoint.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/distance.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/envelope.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/expand.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/is_simple.hpp
+x64-windows/include/boost/geometry/algorithms/dispatch/is_valid.hpp
+x64-windows/include/boost/geometry/algorithms/distance.hpp
+x64-windows/include/boost/geometry/algorithms/envelope.hpp
+x64-windows/include/boost/geometry/algorithms/equals.hpp
+x64-windows/include/boost/geometry/algorithms/expand.hpp
+x64-windows/include/boost/geometry/algorithms/for_each.hpp
+x64-windows/include/boost/geometry/algorithms/intersection.hpp
+x64-windows/include/boost/geometry/algorithms/intersects.hpp
+x64-windows/include/boost/geometry/algorithms/is_convex.hpp
+x64-windows/include/boost/geometry/algorithms/is_empty.hpp
+x64-windows/include/boost/geometry/algorithms/is_simple.hpp
+x64-windows/include/boost/geometry/algorithms/is_valid.hpp
+x64-windows/include/boost/geometry/algorithms/length.hpp
+x64-windows/include/boost/geometry/algorithms/make.hpp
+x64-windows/include/boost/geometry/algorithms/not_implemented.hpp
+x64-windows/include/boost/geometry/algorithms/num_geometries.hpp
+x64-windows/include/boost/geometry/algorithms/num_interior_rings.hpp
+x64-windows/include/boost/geometry/algorithms/num_points.hpp
+x64-windows/include/boost/geometry/algorithms/num_segments.hpp
+x64-windows/include/boost/geometry/algorithms/overlaps.hpp
+x64-windows/include/boost/geometry/algorithms/perimeter.hpp
+x64-windows/include/boost/geometry/algorithms/point_on_surface.hpp
+x64-windows/include/boost/geometry/algorithms/relate.hpp
+x64-windows/include/boost/geometry/algorithms/relation.hpp
+x64-windows/include/boost/geometry/algorithms/remove_spikes.hpp
+x64-windows/include/boost/geometry/algorithms/reverse.hpp
+x64-windows/include/boost/geometry/algorithms/simplify.hpp
+x64-windows/include/boost/geometry/algorithms/sym_difference.hpp
+x64-windows/include/boost/geometry/algorithms/touches.hpp
+x64-windows/include/boost/geometry/algorithms/transform.hpp
+x64-windows/include/boost/geometry/algorithms/union.hpp
+x64-windows/include/boost/geometry/algorithms/unique.hpp
+x64-windows/include/boost/geometry/algorithms/validity_failure_type.hpp
+x64-windows/include/boost/geometry/algorithms/within.hpp
+x64-windows/include/boost/geometry/arithmetic/
+x64-windows/include/boost/geometry/arithmetic/arithmetic.hpp
+x64-windows/include/boost/geometry/arithmetic/cross_product.hpp
+x64-windows/include/boost/geometry/arithmetic/determinant.hpp
+x64-windows/include/boost/geometry/arithmetic/dot_product.hpp
+x64-windows/include/boost/geometry/arithmetic/normalize.hpp
+x64-windows/include/boost/geometry/core/
+x64-windows/include/boost/geometry/core/access.hpp
+x64-windows/include/boost/geometry/core/assert.hpp
+x64-windows/include/boost/geometry/core/closure.hpp
+x64-windows/include/boost/geometry/core/coordinate_dimension.hpp
+x64-windows/include/boost/geometry/core/coordinate_system.hpp
+x64-windows/include/boost/geometry/core/coordinate_type.hpp
+x64-windows/include/boost/geometry/core/cs.hpp
+x64-windows/include/boost/geometry/core/exception.hpp
+x64-windows/include/boost/geometry/core/exterior_ring.hpp
+x64-windows/include/boost/geometry/core/geometry_id.hpp
+x64-windows/include/boost/geometry/core/interior_rings.hpp
+x64-windows/include/boost/geometry/core/interior_type.hpp
+x64-windows/include/boost/geometry/core/is_areal.hpp
+x64-windows/include/boost/geometry/core/mutable_range.hpp
+x64-windows/include/boost/geometry/core/point_order.hpp
+x64-windows/include/boost/geometry/core/point_type.hpp
+x64-windows/include/boost/geometry/core/radian_access.hpp
+x64-windows/include/boost/geometry/core/radius.hpp
+x64-windows/include/boost/geometry/core/reverse_dispatch.hpp
+x64-windows/include/boost/geometry/core/ring_type.hpp
+x64-windows/include/boost/geometry/core/tag.hpp
+x64-windows/include/boost/geometry/core/tag_cast.hpp
+x64-windows/include/boost/geometry/core/tags.hpp
+x64-windows/include/boost/geometry/core/topological_dimension.hpp
+x64-windows/include/boost/geometry/formulas/
+x64-windows/include/boost/geometry/formulas/andoyer_inverse.hpp
+x64-windows/include/boost/geometry/formulas/area_formulas.hpp
+x64-windows/include/boost/geometry/formulas/authalic_radius_sqr.hpp
+x64-windows/include/boost/geometry/formulas/differential_quantities.hpp
+x64-windows/include/boost/geometry/formulas/eccentricity_sqr.hpp
+x64-windows/include/boost/geometry/formulas/elliptic_arc_length.hpp
+x64-windows/include/boost/geometry/formulas/flattening.hpp
+x64-windows/include/boost/geometry/formulas/geographic.hpp
+x64-windows/include/boost/geometry/formulas/gnomonic_intersection.hpp
+x64-windows/include/boost/geometry/formulas/gnomonic_spheroid.hpp
+x64-windows/include/boost/geometry/formulas/mean_radius.hpp
+x64-windows/include/boost/geometry/formulas/result_direct.hpp
+x64-windows/include/boost/geometry/formulas/result_inverse.hpp
+x64-windows/include/boost/geometry/formulas/sjoberg_intersection.hpp
+x64-windows/include/boost/geometry/formulas/spherical.hpp
+x64-windows/include/boost/geometry/formulas/thomas_direct.hpp
+x64-windows/include/boost/geometry/formulas/thomas_inverse.hpp
+x64-windows/include/boost/geometry/formulas/unit_spheroid.hpp
+x64-windows/include/boost/geometry/formulas/vertex_latitude.hpp
+x64-windows/include/boost/geometry/formulas/vertex_longitude.hpp
+x64-windows/include/boost/geometry/formulas/vincenty_direct.hpp
+x64-windows/include/boost/geometry/formulas/vincenty_inverse.hpp
+x64-windows/include/boost/geometry/geometries/
+x64-windows/include/boost/geometry/geometries/adapted/
+x64-windows/include/boost/geometry/geometries/adapted/boost_array.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_fusion.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/box.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/hole_iterator.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/holes_proxy.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/point.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/polygon.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/ring.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_polygon/ring_proxy.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/adjacent_filtered.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/filtered.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/reversed.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/sliced.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/strided.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_range/uniqued.hpp
+x64-windows/include/boost/geometry/geometries/adapted/boost_tuple.hpp
+x64-windows/include/boost/geometry/geometries/adapted/c_array.hpp
+x64-windows/include/boost/geometry/geometries/adapted/std_array.hpp
+x64-windows/include/boost/geometry/geometries/adapted/std_pair_as_segment.hpp
+x64-windows/include/boost/geometry/geometries/box.hpp
+x64-windows/include/boost/geometry/geometries/concepts/
+x64-windows/include/boost/geometry/geometries/concepts/box_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/check.hpp
+x64-windows/include/boost/geometry/geometries/concepts/linestring_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/multi_linestring_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/multi_point_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/multi_polygon_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/point_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/polygon_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/ring_concept.hpp
+x64-windows/include/boost/geometry/geometries/concepts/segment_concept.hpp
+x64-windows/include/boost/geometry/geometries/geometries.hpp
+x64-windows/include/boost/geometry/geometries/helper_geometry.hpp
+x64-windows/include/boost/geometry/geometries/linestring.hpp
+x64-windows/include/boost/geometry/geometries/multi_linestring.hpp
+x64-windows/include/boost/geometry/geometries/multi_point.hpp
+x64-windows/include/boost/geometry/geometries/multi_polygon.hpp
+x64-windows/include/boost/geometry/geometries/point.hpp
+x64-windows/include/boost/geometry/geometries/point_xy.hpp
+x64-windows/include/boost/geometry/geometries/pointing_segment.hpp
+x64-windows/include/boost/geometry/geometries/polygon.hpp
+x64-windows/include/boost/geometry/geometries/register/
+x64-windows/include/boost/geometry/geometries/register/box.hpp
+x64-windows/include/boost/geometry/geometries/register/linestring.hpp
+x64-windows/include/boost/geometry/geometries/register/multi_linestring.hpp
+x64-windows/include/boost/geometry/geometries/register/multi_point.hpp
+x64-windows/include/boost/geometry/geometries/register/multi_polygon.hpp
+x64-windows/include/boost/geometry/geometries/register/point.hpp
+x64-windows/include/boost/geometry/geometries/register/ring.hpp
+x64-windows/include/boost/geometry/geometries/register/segment.hpp
+x64-windows/include/boost/geometry/geometries/ring.hpp
+x64-windows/include/boost/geometry/geometries/segment.hpp
+x64-windows/include/boost/geometry/geometries/variant.hpp
+x64-windows/include/boost/geometry/geometry.hpp
+x64-windows/include/boost/geometry/index/
+x64-windows/include/boost/geometry/index/adaptors/
+x64-windows/include/boost/geometry/index/adaptors/query.hpp
+x64-windows/include/boost/geometry/index/detail/
+x64-windows/include/boost/geometry/index/detail/algorithms/
+x64-windows/include/boost/geometry/index/detail/algorithms/bounds.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/content.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/diff_abs.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/is_valid.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/margin.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/nth_element.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/segment_intersection.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/smallest_for_indexable.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/sum_for_indexable.hpp
+x64-windows/include/boost/geometry/index/detail/algorithms/union_content.hpp
+x64-windows/include/boost/geometry/index/detail/assert.hpp
+x64-windows/include/boost/geometry/index/detail/bounded_view.hpp
+x64-windows/include/boost/geometry/index/detail/config_begin.hpp
+x64-windows/include/boost/geometry/index/detail/config_end.hpp
+x64-windows/include/boost/geometry/index/detail/distance_predicates.hpp
+x64-windows/include/boost/geometry/index/detail/exception.hpp
+x64-windows/include/boost/geometry/index/detail/is_bounding_geometry.hpp
+x64-windows/include/boost/geometry/index/detail/is_indexable.hpp
+x64-windows/include/boost/geometry/index/detail/meta.hpp
+x64-windows/include/boost/geometry/index/detail/predicates.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/
+x64-windows/include/boost/geometry/index/detail/rtree/adaptors.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/iterators.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/kmeans/
+x64-windows/include/boost/geometry/index/detail/rtree/kmeans/kmeans.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/kmeans/split.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/linear/
+x64-windows/include/boost/geometry/index/detail/rtree/linear/linear.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/
+x64-windows/include/boost/geometry/index/detail/rtree/node/concept.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/node.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/node_elements.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/pairs.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/scoped_deallocator.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/subtree_destroyer.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/variant_static.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/variant_visitor.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/weak_static.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/node/weak_visitor.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/options.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/pack_create.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/quadratic/
+x64-windows/include/boost/geometry/index/detail/rtree/quadratic/quadratic.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/query_iterators.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/insert.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/rstar/rstar.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/are_boxes_ok.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/are_counts_ok.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/print.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/statistics.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/utilities/view.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/copy.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/count.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/distance_query.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/insert.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/iterator.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/remove.hpp
+x64-windows/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
+x64-windows/include/boost/geometry/index/detail/serialization.hpp
+x64-windows/include/boost/geometry/index/detail/tags.hpp
+x64-windows/include/boost/geometry/index/detail/translator.hpp
+x64-windows/include/boost/geometry/index/detail/tuples.hpp
+x64-windows/include/boost/geometry/index/detail/utilities.hpp
+x64-windows/include/boost/geometry/index/detail/varray.hpp
+x64-windows/include/boost/geometry/index/detail/varray_detail.hpp
+x64-windows/include/boost/geometry/index/distance_predicates.hpp
+x64-windows/include/boost/geometry/index/equal_to.hpp
+x64-windows/include/boost/geometry/index/indexable.hpp
+x64-windows/include/boost/geometry/index/inserter.hpp
+x64-windows/include/boost/geometry/index/parameters.hpp
+x64-windows/include/boost/geometry/index/predicates.hpp
+x64-windows/include/boost/geometry/index/rtree.hpp
+x64-windows/include/boost/geometry/io/
+x64-windows/include/boost/geometry/io/dsv/
+x64-windows/include/boost/geometry/io/dsv/write.hpp
+x64-windows/include/boost/geometry/io/io.hpp
+x64-windows/include/boost/geometry/io/svg/
+x64-windows/include/boost/geometry/io/svg/svg_mapper.hpp
+x64-windows/include/boost/geometry/io/svg/write.hpp
+x64-windows/include/boost/geometry/io/svg/write_svg.hpp
+x64-windows/include/boost/geometry/io/svg/write_svg_multi.hpp
+x64-windows/include/boost/geometry/io/wkt/
+x64-windows/include/boost/geometry/io/wkt/detail/
+x64-windows/include/boost/geometry/io/wkt/detail/prefix.hpp
+x64-windows/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
+x64-windows/include/boost/geometry/io/wkt/read.hpp
+x64-windows/include/boost/geometry/io/wkt/stream.hpp
+x64-windows/include/boost/geometry/io/wkt/wkt.hpp
+x64-windows/include/boost/geometry/io/wkt/write.hpp
+x64-windows/include/boost/geometry/iterators/
+x64-windows/include/boost/geometry/iterators/base.hpp
+x64-windows/include/boost/geometry/iterators/closing_iterator.hpp
+x64-windows/include/boost/geometry/iterators/concatenate_iterator.hpp
+x64-windows/include/boost/geometry/iterators/detail/
+x64-windows/include/boost/geometry/iterators/detail/point_iterator/
+x64-windows/include/boost/geometry/iterators/detail/point_iterator/inner_range_type.hpp
+x64-windows/include/boost/geometry/iterators/detail/point_iterator/iterator_type.hpp
+x64-windows/include/boost/geometry/iterators/detail/point_iterator/value_type.hpp
+x64-windows/include/boost/geometry/iterators/detail/segment_iterator/
+x64-windows/include/boost/geometry/iterators/detail/segment_iterator/iterator_type.hpp
+x64-windows/include/boost/geometry/iterators/detail/segment_iterator/range_segment_iterator.hpp
+x64-windows/include/boost/geometry/iterators/detail/segment_iterator/value_type.hpp
+x64-windows/include/boost/geometry/iterators/dispatch/
+x64-windows/include/boost/geometry/iterators/dispatch/point_iterator.hpp
+x64-windows/include/boost/geometry/iterators/dispatch/segment_iterator.hpp
+x64-windows/include/boost/geometry/iterators/ever_circling_iterator.hpp
+x64-windows/include/boost/geometry/iterators/flatten_iterator.hpp
+x64-windows/include/boost/geometry/iterators/has_one_element.hpp
+x64-windows/include/boost/geometry/iterators/point_iterator.hpp
+x64-windows/include/boost/geometry/iterators/point_reverse_iterator.hpp
+x64-windows/include/boost/geometry/iterators/segment_iterator.hpp
+x64-windows/include/boost/geometry/multi/
+x64-windows/include/boost/geometry/multi/algorithms/
+x64-windows/include/boost/geometry/multi/algorithms/append.hpp
+x64-windows/include/boost/geometry/multi/algorithms/area.hpp
+x64-windows/include/boost/geometry/multi/algorithms/centroid.hpp
+x64-windows/include/boost/geometry/multi/algorithms/clear.hpp
+x64-windows/include/boost/geometry/multi/algorithms/convert.hpp
+x64-windows/include/boost/geometry/multi/algorithms/correct.hpp
+x64-windows/include/boost/geometry/multi/algorithms/covered_by.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/
+x64-windows/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/modify.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/sections/
+x64-windows/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
+x64-windows/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
+x64-windows/include/boost/geometry/multi/algorithms/disjoint.hpp
+x64-windows/include/boost/geometry/multi/algorithms/distance.hpp
+x64-windows/include/boost/geometry/multi/algorithms/envelope.hpp
+x64-windows/include/boost/geometry/multi/algorithms/equals.hpp
+x64-windows/include/boost/geometry/multi/algorithms/for_each.hpp
+x64-windows/include/boost/geometry/multi/algorithms/intersection.hpp
+x64-windows/include/boost/geometry/multi/algorithms/length.hpp
+x64-windows/include/boost/geometry/multi/algorithms/num_geometries.hpp
+x64-windows/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
+x64-windows/include/boost/geometry/multi/algorithms/num_points.hpp
+x64-windows/include/boost/geometry/multi/algorithms/perimeter.hpp
+x64-windows/include/boost/geometry/multi/algorithms/remove_spikes.hpp
+x64-windows/include/boost/geometry/multi/algorithms/reverse.hpp
+x64-windows/include/boost/geometry/multi/algorithms/simplify.hpp
+x64-windows/include/boost/geometry/multi/algorithms/transform.hpp
+x64-windows/include/boost/geometry/multi/algorithms/unique.hpp
+x64-windows/include/boost/geometry/multi/algorithms/within.hpp
+x64-windows/include/boost/geometry/multi/core/
+x64-windows/include/boost/geometry/multi/core/closure.hpp
+x64-windows/include/boost/geometry/multi/core/geometry_id.hpp
+x64-windows/include/boost/geometry/multi/core/interior_rings.hpp
+x64-windows/include/boost/geometry/multi/core/is_areal.hpp
+x64-windows/include/boost/geometry/multi/core/point_order.hpp
+x64-windows/include/boost/geometry/multi/core/point_type.hpp
+x64-windows/include/boost/geometry/multi/core/ring_type.hpp
+x64-windows/include/boost/geometry/multi/core/tags.hpp
+x64-windows/include/boost/geometry/multi/core/topological_dimension.hpp
+x64-windows/include/boost/geometry/multi/geometries/
+x64-windows/include/boost/geometry/multi/geometries/concepts/
+x64-windows/include/boost/geometry/multi/geometries/concepts/check.hpp
+x64-windows/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
+x64-windows/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
+x64-windows/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
+x64-windows/include/boost/geometry/multi/geometries/multi_geometries.hpp
+x64-windows/include/boost/geometry/multi/geometries/multi_linestring.hpp
+x64-windows/include/boost/geometry/multi/geometries/multi_point.hpp
+x64-windows/include/boost/geometry/multi/geometries/multi_polygon.hpp
+x64-windows/include/boost/geometry/multi/geometries/register/
+x64-windows/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
+x64-windows/include/boost/geometry/multi/geometries/register/multi_point.hpp
+x64-windows/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
+x64-windows/include/boost/geometry/multi/io/
+x64-windows/include/boost/geometry/multi/io/dsv/
+x64-windows/include/boost/geometry/multi/io/dsv/write.hpp
+x64-windows/include/boost/geometry/multi/io/wkt/
+x64-windows/include/boost/geometry/multi/io/wkt/detail/
+x64-windows/include/boost/geometry/multi/io/wkt/detail/prefix.hpp
+x64-windows/include/boost/geometry/multi/io/wkt/read.hpp
+x64-windows/include/boost/geometry/multi/io/wkt/wkt.hpp
+x64-windows/include/boost/geometry/multi/io/wkt/write.hpp
+x64-windows/include/boost/geometry/multi/multi.hpp
+x64-windows/include/boost/geometry/multi/strategies/
+x64-windows/include/boost/geometry/multi/strategies/cartesian/
+x64-windows/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
+x64-windows/include/boost/geometry/multi/views/
+x64-windows/include/boost/geometry/multi/views/detail/
+x64-windows/include/boost/geometry/multi/views/detail/range_type.hpp
+x64-windows/include/boost/geometry/policies/
+x64-windows/include/boost/geometry/policies/compare.hpp
+x64-windows/include/boost/geometry/policies/disjoint_interrupt_policy.hpp
+x64-windows/include/boost/geometry/policies/is_valid/
+x64-windows/include/boost/geometry/policies/is_valid/default_policy.hpp
+x64-windows/include/boost/geometry/policies/is_valid/failing_reason_policy.hpp
+x64-windows/include/boost/geometry/policies/is_valid/failure_type_policy.hpp
+x64-windows/include/boost/geometry/policies/predicate_based_interrupt_policy.hpp
+x64-windows/include/boost/geometry/policies/relate/
+x64-windows/include/boost/geometry/policies/relate/direction.hpp
+x64-windows/include/boost/geometry/policies/relate/intersection_points.hpp
+x64-windows/include/boost/geometry/policies/relate/intersection_ratios.hpp
+x64-windows/include/boost/geometry/policies/relate/tupled.hpp
+x64-windows/include/boost/geometry/policies/robustness/
+x64-windows/include/boost/geometry/policies/robustness/get_rescale_policy.hpp
+x64-windows/include/boost/geometry/policies/robustness/no_rescale_policy.hpp
+x64-windows/include/boost/geometry/policies/robustness/rescale_policy.hpp
+x64-windows/include/boost/geometry/policies/robustness/robust_point_type.hpp
+x64-windows/include/boost/geometry/policies/robustness/robust_type.hpp
+x64-windows/include/boost/geometry/policies/robustness/segment_ratio.hpp
+x64-windows/include/boost/geometry/policies/robustness/segment_ratio_type.hpp
+x64-windows/include/boost/geometry/srs/
+x64-windows/include/boost/geometry/srs/epsg.hpp
+x64-windows/include/boost/geometry/srs/esri.hpp
+x64-windows/include/boost/geometry/srs/iau2000.hpp
+x64-windows/include/boost/geometry/srs/projection.hpp
+x64-windows/include/boost/geometry/srs/projections/
+x64-windows/include/boost/geometry/srs/projections/code.hpp
+x64-windows/include/boost/geometry/srs/projections/epsg.hpp
+x64-windows/include/boost/geometry/srs/projections/epsg_params.hpp
+x64-windows/include/boost/geometry/srs/projections/epsg_traits.hpp
+x64-windows/include/boost/geometry/srs/projections/esri.hpp
+x64-windows/include/boost/geometry/srs/projections/esri_params.hpp
+x64-windows/include/boost/geometry/srs/projections/esri_traits.hpp
+x64-windows/include/boost/geometry/srs/projections/exception.hpp
+x64-windows/include/boost/geometry/srs/projections/factory.hpp
+x64-windows/include/boost/geometry/srs/projections/iau2000.hpp
+x64-windows/include/boost/geometry/srs/projections/iau2000_params.hpp
+x64-windows/include/boost/geometry/srs/projections/iau2000_traits.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/
+x64-windows/include/boost/geometry/srs/projections/impl/aasincos.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/adjlon.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/base_dynamic.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/base_static.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/dms_parser.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/factory_entry.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/function_overloads.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/geocent.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_auth.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_datum_set.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_datums.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_ell_set.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_ellps.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_fwd.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_gauss.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_init.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_inv.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_mlfn.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_msfn.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_param.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_phi2.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_qsfn.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_strerrno.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_transform.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_tsfn.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_units.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/pj_zpoly1.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/proj_mdist.hpp
+x64-windows/include/boost/geometry/srs/projections/impl/projects.hpp
+x64-windows/include/boost/geometry/srs/projections/invalid_point.hpp
+x64-windows/include/boost/geometry/srs/projections/par4.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/
+x64-windows/include/boost/geometry/srs/projections/proj/aea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/aeqd.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/airy.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/aitoff.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/august.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/bacon.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/bipc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/boggs.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/bonne.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/cass.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/cc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/cea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/chamb.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/collg.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/crast.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/denoy.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck1.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck3.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck4.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eck5.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eqc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/eqdc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/etmerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/fahey.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/fouc_s.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gall.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/geocent.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/geos.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gins8.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gn_sinu.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gnom.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/goode.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/gstmerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/hammer.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/hatano.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/healpix.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/igh.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/imw_p.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/isea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/krovak.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/labrd.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/laea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lagrng.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/larr.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lask.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/latlong.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lcc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lcca.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/loxim.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/lsat.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mbt_fps.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mbtfpp.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mbtfpq.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/merc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mill.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/mod_ster.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/moll.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/natearth.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nell.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nell_h.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nocol.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nsper.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/nzmg.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/ob_tran.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/ocea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/oea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/omerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/ortho.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/poly.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp3.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp4p.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp5.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/putp6.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/qsc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/robin.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/rouss.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/rpoly.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/sconics.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/somerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/stere.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/sterea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/sts.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/tcc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/tcea.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/tmerc.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/tpeqd.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/urm5.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/urmfps.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/vandg.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/vandg2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/vandg4.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wag2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wag3.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wag7.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wink1.hpp
+x64-windows/include/boost/geometry/srs/projections/proj/wink2.hpp
+x64-windows/include/boost/geometry/srs/projections/proj4.hpp
+x64-windows/include/boost/geometry/srs/projections/srid_traits.hpp
+x64-windows/include/boost/geometry/srs/sphere.hpp
+x64-windows/include/boost/geometry/srs/spheroid.hpp
+x64-windows/include/boost/geometry/srs/srs.hpp
+x64-windows/include/boost/geometry/srs/transformation.hpp
+x64-windows/include/boost/geometry/strategies/
+x64-windows/include/boost/geometry/strategies/agnostic/
+x64-windows/include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/point_in_point.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/point_in_poly_oriented_winding.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
+x64-windows/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
+x64-windows/include/boost/geometry/strategies/area.hpp
+x64-windows/include/boost/geometry/strategies/area_result.hpp
+x64-windows/include/boost/geometry/strategies/azimuth.hpp
+x64-windows/include/boost/geometry/strategies/buffer.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/
+x64-windows/include/boost/geometry/strategies/cartesian/area.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/area_surveyor.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/azimuth.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/box_in_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_join_miter.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_point_circle.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_point_square.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/buffer_side_straight.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/centroid_average.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/densify.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/envelope_segment.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/intersection.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/point_in_box.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/point_in_poly_winding.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
+x64-windows/include/boost/geometry/strategies/cartesian/side_of_intersection.hpp
+x64-windows/include/boost/geometry/strategies/centroid.hpp
+x64-windows/include/boost/geometry/strategies/comparable_distance_result.hpp
+x64-windows/include/boost/geometry/strategies/compare.hpp
+x64-windows/include/boost/geometry/strategies/concepts/
+x64-windows/include/boost/geometry/strategies/concepts/area_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/centroid_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/convex_hull_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/distance_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/segment_intersect_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/simplify_concept.hpp
+x64-windows/include/boost/geometry/strategies/concepts/within_concept.hpp
+x64-windows/include/boost/geometry/strategies/convex_hull.hpp
+x64-windows/include/boost/geometry/strategies/covered_by.hpp
+x64-windows/include/boost/geometry/strategies/default_area_result.hpp
+x64-windows/include/boost/geometry/strategies/default_comparable_distance_result.hpp
+x64-windows/include/boost/geometry/strategies/default_distance_result.hpp
+x64-windows/include/boost/geometry/strategies/default_length_result.hpp
+x64-windows/include/boost/geometry/strategies/default_strategy.hpp
+x64-windows/include/boost/geometry/strategies/densify.hpp
+x64-windows/include/boost/geometry/strategies/disjoint.hpp
+x64-windows/include/boost/geometry/strategies/distance.hpp
+x64-windows/include/boost/geometry/strategies/distance_result.hpp
+x64-windows/include/boost/geometry/strategies/envelope.hpp
+x64-windows/include/boost/geometry/strategies/geographic/
+x64-windows/include/boost/geometry/strategies/geographic/area.hpp
+x64-windows/include/boost/geometry/strategies/geographic/azimuth.hpp
+x64-windows/include/boost/geometry/strategies/geographic/densify.hpp
+x64-windows/include/boost/geometry/strategies/geographic/disjoint_segment_box.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_andoyer.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_cross_track.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_cross_track_box_box.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_cross_track_point_box.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_thomas.hpp
+x64-windows/include/boost/geometry/strategies/geographic/distance_vincenty.hpp
+x64-windows/include/boost/geometry/strategies/geographic/envelope_segment.hpp
+x64-windows/include/boost/geometry/strategies/geographic/intersection.hpp
+x64-windows/include/boost/geometry/strategies/geographic/intersection_elliptic.hpp
+x64-windows/include/boost/geometry/strategies/geographic/mapping_ssf.hpp
+x64-windows/include/boost/geometry/strategies/geographic/parameters.hpp
+x64-windows/include/boost/geometry/strategies/geographic/point_in_poly_winding.hpp
+x64-windows/include/boost/geometry/strategies/geographic/side.hpp
+x64-windows/include/boost/geometry/strategies/geographic/side_andoyer.hpp
+x64-windows/include/boost/geometry/strategies/geographic/side_thomas.hpp
+x64-windows/include/boost/geometry/strategies/geographic/side_vincenty.hpp
+x64-windows/include/boost/geometry/strategies/intersection.hpp
+x64-windows/include/boost/geometry/strategies/intersection_result.hpp
+x64-windows/include/boost/geometry/strategies/intersection_strategies.hpp
+x64-windows/include/boost/geometry/strategies/relate.hpp
+x64-windows/include/boost/geometry/strategies/side.hpp
+x64-windows/include/boost/geometry/strategies/side_info.hpp
+x64-windows/include/boost/geometry/strategies/spherical/
+x64-windows/include/boost/geometry/strategies/spherical/area.hpp
+x64-windows/include/boost/geometry/strategies/spherical/azimuth.hpp
+x64-windows/include/boost/geometry/strategies/spherical/compare.hpp
+x64-windows/include/boost/geometry/strategies/spherical/densify.hpp
+x64-windows/include/boost/geometry/strategies/spherical/disjoint_segment_box.hpp
+x64-windows/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
+x64-windows/include/boost/geometry/strategies/spherical/distance_cross_track_box_box.hpp
+x64-windows/include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp
+x64-windows/include/boost/geometry/strategies/spherical/distance_haversine.hpp
+x64-windows/include/boost/geometry/strategies/spherical/envelope_segment.hpp
+x64-windows/include/boost/geometry/strategies/spherical/get_radius.hpp
+x64-windows/include/boost/geometry/strategies/spherical/intersection.hpp
+x64-windows/include/boost/geometry/strategies/spherical/point_in_poly_winding.hpp
+x64-windows/include/boost/geometry/strategies/spherical/side_by_cross_track.hpp
+x64-windows/include/boost/geometry/strategies/spherical/ssf.hpp
+x64-windows/include/boost/geometry/strategies/strategies.hpp
+x64-windows/include/boost/geometry/strategies/strategy_transform.hpp
+x64-windows/include/boost/geometry/strategies/tags.hpp
+x64-windows/include/boost/geometry/strategies/transform.hpp
+x64-windows/include/boost/geometry/strategies/transform/
+x64-windows/include/boost/geometry/strategies/transform/inverse_transformer.hpp
+x64-windows/include/boost/geometry/strategies/transform/map_transformer.hpp
+x64-windows/include/boost/geometry/strategies/transform/matrix_transformers.hpp
+x64-windows/include/boost/geometry/strategies/transform/srs_transformer.hpp
+x64-windows/include/boost/geometry/strategies/within.hpp
+x64-windows/include/boost/geometry/util/
+x64-windows/include/boost/geometry/util/add_const_if_c.hpp
+x64-windows/include/boost/geometry/util/bare_type.hpp
+x64-windows/include/boost/geometry/util/calculation_type.hpp
+x64-windows/include/boost/geometry/util/closure_as_bool.hpp
+x64-windows/include/boost/geometry/util/combine_if.hpp
+x64-windows/include/boost/geometry/util/compress_variant.hpp
+x64-windows/include/boost/geometry/util/condition.hpp
+x64-windows/include/boost/geometry/util/coordinate_cast.hpp
+x64-windows/include/boost/geometry/util/for_each_coordinate.hpp
+x64-windows/include/boost/geometry/util/has_infinite_coordinate.hpp
+x64-windows/include/boost/geometry/util/has_nan_coordinate.hpp
+x64-windows/include/boost/geometry/util/has_non_finite_coordinate.hpp
+x64-windows/include/boost/geometry/util/math.hpp
+x64-windows/include/boost/geometry/util/normalize_spheroidal_box_coordinates.hpp
+x64-windows/include/boost/geometry/util/normalize_spheroidal_coordinates.hpp
+x64-windows/include/boost/geometry/util/order_as_direction.hpp
+x64-windows/include/boost/geometry/util/parameter_type_of.hpp
+x64-windows/include/boost/geometry/util/promote_floating_point.hpp
+x64-windows/include/boost/geometry/util/promote_integral.hpp
+x64-windows/include/boost/geometry/util/range.hpp
+x64-windows/include/boost/geometry/util/rational.hpp
+x64-windows/include/boost/geometry/util/readme.txt
+x64-windows/include/boost/geometry/util/select_calculation_type.hpp
+x64-windows/include/boost/geometry/util/select_coordinate_type.hpp
+x64-windows/include/boost/geometry/util/select_most_precise.hpp
+x64-windows/include/boost/geometry/util/select_sequence_element.hpp
+x64-windows/include/boost/geometry/util/transform_variant.hpp
+x64-windows/include/boost/geometry/views/
+x64-windows/include/boost/geometry/views/box_view.hpp
+x64-windows/include/boost/geometry/views/closeable_view.hpp
+x64-windows/include/boost/geometry/views/detail/
+x64-windows/include/boost/geometry/views/detail/boundary_view.hpp
+x64-windows/include/boost/geometry/views/detail/boundary_view/
+x64-windows/include/boost/geometry/views/detail/boundary_view/implementation.hpp
+x64-windows/include/boost/geometry/views/detail/boundary_view/interface.hpp
+x64-windows/include/boost/geometry/views/detail/indexed_point_view.hpp
+x64-windows/include/boost/geometry/views/detail/normalized_view.hpp
+x64-windows/include/boost/geometry/views/detail/points_view.hpp
+x64-windows/include/boost/geometry/views/detail/range_type.hpp
+x64-windows/include/boost/geometry/views/detail/two_dimensional_view.hpp
+x64-windows/include/boost/geometry/views/identity_view.hpp
+x64-windows/include/boost/geometry/views/reversible_view.hpp
+x64-windows/include/boost/geometry/views/segment_view.hpp
+x64-windows/share/
+x64-windows/share/boost-geometry/
+x64-windows/share/boost-geometry/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-graph_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,216 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_graph-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_graph-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_graph-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_graph-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_graph-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/algorithm.hpp
+x64-windows/include/boost/graph/
+x64-windows/include/boost/graph/adj_list_serialize.hpp
+x64-windows/include/boost/graph/adjacency_iterator.hpp
+x64-windows/include/boost/graph/adjacency_list.hpp
+x64-windows/include/boost/graph/adjacency_list_io.hpp
+x64-windows/include/boost/graph/adjacency_matrix.hpp
+x64-windows/include/boost/graph/astar_search.hpp
+x64-windows/include/boost/graph/bandwidth.hpp
+x64-windows/include/boost/graph/bc_clustering.hpp
+x64-windows/include/boost/graph/bellman_ford_shortest_paths.hpp
+x64-windows/include/boost/graph/betweenness_centrality.hpp
+x64-windows/include/boost/graph/biconnected_components.hpp
+x64-windows/include/boost/graph/bipartite.hpp
+x64-windows/include/boost/graph/boyer_myrvold_planar_test.hpp
+x64-windows/include/boost/graph/boykov_kolmogorov_max_flow.hpp
+x64-windows/include/boost/graph/breadth_first_search.hpp
+x64-windows/include/boost/graph/bron_kerbosch_all_cliques.hpp
+x64-windows/include/boost/graph/buffer_concepts.hpp
+x64-windows/include/boost/graph/chrobak_payne_drawing.hpp
+x64-windows/include/boost/graph/circle_layout.hpp
+x64-windows/include/boost/graph/closeness_centrality.hpp
+x64-windows/include/boost/graph/clustering_coefficient.hpp
+x64-windows/include/boost/graph/compressed_sparse_row_graph.hpp
+x64-windows/include/boost/graph/connected_components.hpp
+x64-windows/include/boost/graph/copy.hpp
+x64-windows/include/boost/graph/core_numbers.hpp
+x64-windows/include/boost/graph/create_condensation_graph.hpp
+x64-windows/include/boost/graph/cuthill_mckee_ordering.hpp
+x64-windows/include/boost/graph/cycle_canceling.hpp
+x64-windows/include/boost/graph/dag_shortest_paths.hpp
+x64-windows/include/boost/graph/degree_centrality.hpp
+x64-windows/include/boost/graph/depth_first_search.hpp
+x64-windows/include/boost/graph/detail/
+x64-windows/include/boost/graph/detail/adj_list_edge_iterator.hpp
+x64-windows/include/boost/graph/detail/adjacency_list.hpp
+x64-windows/include/boost/graph/detail/array_binary_tree.hpp
+x64-windows/include/boost/graph/detail/augment.hpp
+x64-windows/include/boost/graph/detail/compressed_sparse_row_struct.hpp
+x64-windows/include/boost/graph/detail/connected_components.hpp
+x64-windows/include/boost/graph/detail/d_ary_heap.hpp
+x64-windows/include/boost/graph/detail/edge.hpp
+x64-windows/include/boost/graph/detail/geodesic.hpp
+x64-windows/include/boost/graph/detail/histogram_sort.hpp
+x64-windows/include/boost/graph/detail/incidence_iterator.hpp
+x64-windows/include/boost/graph/detail/incremental_components.hpp
+x64-windows/include/boost/graph/detail/index.hpp
+x64-windows/include/boost/graph/detail/indexed_properties.hpp
+x64-windows/include/boost/graph/detail/is_distributed_selector.hpp
+x64-windows/include/boost/graph/detail/labeled_graph_traits.hpp
+x64-windows/include/boost/graph/detail/list_base.hpp
+x64-windows/include/boost/graph/detail/permutation.hpp
+x64-windows/include/boost/graph/detail/read_graphviz_new.hpp
+x64-windows/include/boost/graph/detail/read_graphviz_spirit.hpp
+x64-windows/include/boost/graph/detail/self_avoiding_walk.hpp
+x64-windows/include/boost/graph/detail/set_adaptor.hpp
+x64-windows/include/boost/graph/detail/shadow_iterator.hpp
+x64-windows/include/boost/graph/detail/sparse_ordering.hpp
+x64-windows/include/boost/graph/dijkstra_shortest_paths.hpp
+x64-windows/include/boost/graph/dijkstra_shortest_paths_no_color_map.hpp
+x64-windows/include/boost/graph/dimacs.hpp
+x64-windows/include/boost/graph/directed_graph.hpp
+x64-windows/include/boost/graph/dll_import_export.hpp
+x64-windows/include/boost/graph/dominator_tree.hpp
+x64-windows/include/boost/graph/eccentricity.hpp
+x64-windows/include/boost/graph/edge_coloring.hpp
+x64-windows/include/boost/graph/edge_connectivity.hpp
+x64-windows/include/boost/graph/edge_list.hpp
+x64-windows/include/boost/graph/edmonds_karp_max_flow.hpp
+x64-windows/include/boost/graph/edmunds_karp_max_flow.hpp
+x64-windows/include/boost/graph/erdos_renyi_generator.hpp
+x64-windows/include/boost/graph/exception.hpp
+x64-windows/include/boost/graph/exterior_property.hpp
+x64-windows/include/boost/graph/filtered_graph.hpp
+x64-windows/include/boost/graph/find_flow_cost.hpp
+x64-windows/include/boost/graph/floyd_warshall_shortest.hpp
+x64-windows/include/boost/graph/fruchterman_reingold.hpp
+x64-windows/include/boost/graph/geodesic_distance.hpp
+x64-windows/include/boost/graph/graph_archetypes.hpp
+x64-windows/include/boost/graph/graph_as_tree.hpp
+x64-windows/include/boost/graph/graph_concepts.hpp
+x64-windows/include/boost/graph/graph_mutability_traits.hpp
+x64-windows/include/boost/graph/graph_selectors.hpp
+x64-windows/include/boost/graph/graph_stats.hpp
+x64-windows/include/boost/graph/graph_test.hpp
+x64-windows/include/boost/graph/graph_traits.hpp
+x64-windows/include/boost/graph/graph_utility.hpp
+x64-windows/include/boost/graph/graphml.hpp
+x64-windows/include/boost/graph/graphviz.hpp
+x64-windows/include/boost/graph/grid_graph.hpp
+x64-windows/include/boost/graph/gursoy_atun_layout.hpp
+x64-windows/include/boost/graph/hawick_circuits.hpp
+x64-windows/include/boost/graph/howard_cycle_ratio.hpp
+x64-windows/include/boost/graph/incremental_components.hpp
+x64-windows/include/boost/graph/is_kuratowski_subgraph.hpp
+x64-windows/include/boost/graph/is_straight_line_drawing.hpp
+x64-windows/include/boost/graph/isomorphism.hpp
+x64-windows/include/boost/graph/iteration_macros.hpp
+x64-windows/include/boost/graph/iteration_macros_undef.hpp
+x64-windows/include/boost/graph/johnson_all_pairs_shortest.hpp
+x64-windows/include/boost/graph/kamada_kawai_spring_layout.hpp
+x64-windows/include/boost/graph/king_ordering.hpp
+x64-windows/include/boost/graph/kruskal_min_spanning_tree.hpp
+x64-windows/include/boost/graph/labeled_graph.hpp
+x64-windows/include/boost/graph/leda_graph.hpp
+x64-windows/include/boost/graph/lookup_edge.hpp
+x64-windows/include/boost/graph/loop_erased_random_walk.hpp
+x64-windows/include/boost/graph/make_biconnected_planar.hpp
+x64-windows/include/boost/graph/make_connected.hpp
+x64-windows/include/boost/graph/make_maximal_planar.hpp
+x64-windows/include/boost/graph/matrix_as_graph.hpp
+x64-windows/include/boost/graph/max_cardinality_matching.hpp
+x64-windows/include/boost/graph/maximum_adjacency_search.hpp
+x64-windows/include/boost/graph/mcgregor_common_subgraphs.hpp
+x64-windows/include/boost/graph/mesh_graph_generator.hpp
+x64-windows/include/boost/graph/metis.hpp
+x64-windows/include/boost/graph/metric_tsp_approx.hpp
+x64-windows/include/boost/graph/minimum_degree_ordering.hpp
+x64-windows/include/boost/graph/named_function_params.hpp
+x64-windows/include/boost/graph/named_graph.hpp
+x64-windows/include/boost/graph/neighbor_bfs.hpp
+x64-windows/include/boost/graph/numeric_values.hpp
+x64-windows/include/boost/graph/one_bit_color_map.hpp
+x64-windows/include/boost/graph/overloading.hpp
+x64-windows/include/boost/graph/page_rank.hpp
+x64-windows/include/boost/graph/planar_canonical_ordering.hpp
+x64-windows/include/boost/graph/planar_detail/
+x64-windows/include/boost/graph/planar_detail/add_edge_visitors.hpp
+x64-windows/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp
+x64-windows/include/boost/graph/planar_detail/bucket_sort.hpp
+x64-windows/include/boost/graph/planar_detail/face_handles.hpp
+x64-windows/include/boost/graph/planar_detail/face_iterators.hpp
+x64-windows/include/boost/graph/planar_face_traversal.hpp
+x64-windows/include/boost/graph/plod_generator.hpp
+x64-windows/include/boost/graph/point_traits.hpp
+x64-windows/include/boost/graph/prim_minimum_spanning_tree.hpp
+x64-windows/include/boost/graph/profile.hpp
+x64-windows/include/boost/graph/properties.hpp
+x64-windows/include/boost/graph/property_iter_range.hpp
+x64-windows/include/boost/graph/property_maps/
+x64-windows/include/boost/graph/property_maps/constant_property_map.hpp
+x64-windows/include/boost/graph/property_maps/container_property_map.hpp
+x64-windows/include/boost/graph/property_maps/matrix_property_map.hpp
+x64-windows/include/boost/graph/property_maps/null_property_map.hpp
+x64-windows/include/boost/graph/push_relabel_max_flow.hpp
+x64-windows/include/boost/graph/r_c_shortest_paths.hpp
+x64-windows/include/boost/graph/random.hpp
+x64-windows/include/boost/graph/random_layout.hpp
+x64-windows/include/boost/graph/random_spanning_tree.hpp
+x64-windows/include/boost/graph/read_dimacs.hpp
+x64-windows/include/boost/graph/relax.hpp
+x64-windows/include/boost/graph/reverse_graph.hpp
+x64-windows/include/boost/graph/rmat_graph_generator.hpp
+x64-windows/include/boost/graph/sequential_vertex_coloring.hpp
+x64-windows/include/boost/graph/simple_point.hpp
+x64-windows/include/boost/graph/sloan_ordering.hpp
+x64-windows/include/boost/graph/small_world_generator.hpp
+x64-windows/include/boost/graph/smallest_last_ordering.hpp
+x64-windows/include/boost/graph/ssca_graph_generator.hpp
+x64-windows/include/boost/graph/st_connected.hpp
+x64-windows/include/boost/graph/stanford_graph.hpp
+x64-windows/include/boost/graph/stoer_wagner_min_cut.hpp
+x64-windows/include/boost/graph/strong_components.hpp
+x64-windows/include/boost/graph/subgraph.hpp
+x64-windows/include/boost/graph/successive_shortest_path_nonnegative_weights.hpp
+x64-windows/include/boost/graph/tiernan_all_cycles.hpp
+x64-windows/include/boost/graph/topological_sort.hpp
+x64-windows/include/boost/graph/topology.hpp
+x64-windows/include/boost/graph/transitive_closure.hpp
+x64-windows/include/boost/graph/transitive_reduction.hpp
+x64-windows/include/boost/graph/transpose_graph.hpp
+x64-windows/include/boost/graph/tree_traits.hpp
+x64-windows/include/boost/graph/two_bit_color_map.hpp
+x64-windows/include/boost/graph/two_graphs_common_spanning_trees.hpp
+x64-windows/include/boost/graph/undirected_dfs.hpp
+x64-windows/include/boost/graph/undirected_graph.hpp
+x64-windows/include/boost/graph/use_mpi.hpp
+x64-windows/include/boost/graph/vector_as_graph.hpp
+x64-windows/include/boost/graph/vertex_and_edge_range.hpp
+x64-windows/include/boost/graph/vf2_sub_graph_iso.hpp
+x64-windows/include/boost/graph/visitors.hpp
+x64-windows/include/boost/graph/wavefront.hpp
+x64-windows/include/boost/graph/write_dimacs.hpp
+x64-windows/include/boost/pending/
+x64-windows/include/boost/pending/bucket_sorter.hpp
+x64-windows/include/boost/pending/container_traits.hpp
+x64-windows/include/boost/pending/detail/
+x64-windows/include/boost/pending/detail/property.hpp
+x64-windows/include/boost/pending/fenced_priority_queue.hpp
+x64-windows/include/boost/pending/fibonacci_heap.hpp
+x64-windows/include/boost/pending/indirect_cmp.hpp
+x64-windows/include/boost/pending/is_heap.hpp
+x64-windows/include/boost/pending/mutable_heap.hpp
+x64-windows/include/boost/pending/mutable_queue.hpp
+x64-windows/include/boost/pending/property.hpp
+x64-windows/include/boost/pending/queue.hpp
+x64-windows/include/boost/pending/relaxed_heap.hpp
+x64-windows/include/boost/pending/stringtok.hpp
+x64-windows/lib/
+x64-windows/lib/boost_graph-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-graph/
+x64-windows/share/boost-graph/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-integer_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/integer.hpp
+x64-windows/include/boost/integer/
+x64-windows/include/boost/integer/common_factor.hpp
+x64-windows/include/boost/integer/common_factor_ct.hpp
+x64-windows/include/boost/integer/common_factor_rt.hpp
+x64-windows/include/boost/integer/integer_log2.hpp
+x64-windows/include/boost/integer/integer_mask.hpp
+x64-windows/include/boost/integer/static_log2.hpp
+x64-windows/include/boost/integer/static_min_max.hpp
+x64-windows/include/boost/integer_fwd.hpp
+x64-windows/include/boost/integer_traits.hpp
+x64-windows/include/boost/pending/
+x64-windows/include/boost/pending/integer_log2.hpp
+x64-windows/share/
+x64-windows/share/boost-integer/
+x64-windows/share/boost-integer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-intrusive_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,100 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/intrusive/
+x64-windows/include/boost/intrusive/any_hook.hpp
+x64-windows/include/boost/intrusive/avl_set.hpp
+x64-windows/include/boost/intrusive/avl_set_hook.hpp
+x64-windows/include/boost/intrusive/avltree.hpp
+x64-windows/include/boost/intrusive/avltree_algorithms.hpp
+x64-windows/include/boost/intrusive/bs_set.hpp
+x64-windows/include/boost/intrusive/bs_set_hook.hpp
+x64-windows/include/boost/intrusive/bstree.hpp
+x64-windows/include/boost/intrusive/bstree_algorithms.hpp
+x64-windows/include/boost/intrusive/circular_list_algorithms.hpp
+x64-windows/include/boost/intrusive/circular_slist_algorithms.hpp
+x64-windows/include/boost/intrusive/derivation_value_traits.hpp
+x64-windows/include/boost/intrusive/detail/
+x64-windows/include/boost/intrusive/detail/algo_type.hpp
+x64-windows/include/boost/intrusive/detail/algorithm.hpp
+x64-windows/include/boost/intrusive/detail/any_node_and_algorithms.hpp
+x64-windows/include/boost/intrusive/detail/array_initializer.hpp
+x64-windows/include/boost/intrusive/detail/assert.hpp
+x64-windows/include/boost/intrusive/detail/avltree_node.hpp
+x64-windows/include/boost/intrusive/detail/bstree_algorithms_base.hpp
+x64-windows/include/boost/intrusive/detail/common_slist_algorithms.hpp
+x64-windows/include/boost/intrusive/detail/config_begin.hpp
+x64-windows/include/boost/intrusive/detail/config_end.hpp
+x64-windows/include/boost/intrusive/detail/default_header_holder.hpp
+x64-windows/include/boost/intrusive/detail/ebo_functor_holder.hpp
+x64-windows/include/boost/intrusive/detail/empty_node_checker.hpp
+x64-windows/include/boost/intrusive/detail/equal_to_value.hpp
+x64-windows/include/boost/intrusive/detail/exception_disposer.hpp
+x64-windows/include/boost/intrusive/detail/function_detector.hpp
+x64-windows/include/boost/intrusive/detail/generic_hook.hpp
+x64-windows/include/boost/intrusive/detail/get_value_traits.hpp
+x64-windows/include/boost/intrusive/detail/has_member_function_callable_with.hpp
+x64-windows/include/boost/intrusive/detail/hashtable_node.hpp
+x64-windows/include/boost/intrusive/detail/hook_traits.hpp
+x64-windows/include/boost/intrusive/detail/iiterator.hpp
+x64-windows/include/boost/intrusive/detail/is_stateful_value_traits.hpp
+x64-windows/include/boost/intrusive/detail/iterator.hpp
+x64-windows/include/boost/intrusive/detail/key_nodeptr_comp.hpp
+x64-windows/include/boost/intrusive/detail/list_iterator.hpp
+x64-windows/include/boost/intrusive/detail/list_node.hpp
+x64-windows/include/boost/intrusive/detail/math.hpp
+x64-windows/include/boost/intrusive/detail/minimal_less_equal_header.hpp
+x64-windows/include/boost/intrusive/detail/minimal_pair_header.hpp
+x64-windows/include/boost/intrusive/detail/mpl.hpp
+x64-windows/include/boost/intrusive/detail/node_cloner_disposer.hpp
+x64-windows/include/boost/intrusive/detail/node_holder.hpp
+x64-windows/include/boost/intrusive/detail/node_to_value.hpp
+x64-windows/include/boost/intrusive/detail/parent_from_member.hpp
+x64-windows/include/boost/intrusive/detail/rbtree_node.hpp
+x64-windows/include/boost/intrusive/detail/reverse_iterator.hpp
+x64-windows/include/boost/intrusive/detail/simple_disposers.hpp
+x64-windows/include/boost/intrusive/detail/size_holder.hpp
+x64-windows/include/boost/intrusive/detail/slist_iterator.hpp
+x64-windows/include/boost/intrusive/detail/slist_node.hpp
+x64-windows/include/boost/intrusive/detail/std_fwd.hpp
+x64-windows/include/boost/intrusive/detail/transform_iterator.hpp
+x64-windows/include/boost/intrusive/detail/tree_iterator.hpp
+x64-windows/include/boost/intrusive/detail/tree_node.hpp
+x64-windows/include/boost/intrusive/detail/tree_value_compare.hpp
+x64-windows/include/boost/intrusive/detail/uncast.hpp
+x64-windows/include/boost/intrusive/detail/workaround.hpp
+x64-windows/include/boost/intrusive/hashtable.hpp
+x64-windows/include/boost/intrusive/intrusive_fwd.hpp
+x64-windows/include/boost/intrusive/linear_slist_algorithms.hpp
+x64-windows/include/boost/intrusive/link_mode.hpp
+x64-windows/include/boost/intrusive/list.hpp
+x64-windows/include/boost/intrusive/list_hook.hpp
+x64-windows/include/boost/intrusive/member_value_traits.hpp
+x64-windows/include/boost/intrusive/options.hpp
+x64-windows/include/boost/intrusive/pack_options.hpp
+x64-windows/include/boost/intrusive/parent_from_member.hpp
+x64-windows/include/boost/intrusive/pointer_plus_bits.hpp
+x64-windows/include/boost/intrusive/pointer_rebind.hpp
+x64-windows/include/boost/intrusive/pointer_traits.hpp
+x64-windows/include/boost/intrusive/priority_compare.hpp
+x64-windows/include/boost/intrusive/rbtree.hpp
+x64-windows/include/boost/intrusive/rbtree_algorithms.hpp
+x64-windows/include/boost/intrusive/set.hpp
+x64-windows/include/boost/intrusive/set_hook.hpp
+x64-windows/include/boost/intrusive/sg_set.hpp
+x64-windows/include/boost/intrusive/sgtree.hpp
+x64-windows/include/boost/intrusive/sgtree_algorithms.hpp
+x64-windows/include/boost/intrusive/slist.hpp
+x64-windows/include/boost/intrusive/slist_hook.hpp
+x64-windows/include/boost/intrusive/splay_set.hpp
+x64-windows/include/boost/intrusive/splaytree.hpp
+x64-windows/include/boost/intrusive/splaytree_algorithms.hpp
+x64-windows/include/boost/intrusive/treap.hpp
+x64-windows/include/boost/intrusive/treap_algorithms.hpp
+x64-windows/include/boost/intrusive/treap_set.hpp
+x64-windows/include/boost/intrusive/trivial_value_traits.hpp
+x64-windows/include/boost/intrusive/unordered_set.hpp
+x64-windows/include/boost/intrusive/unordered_set_hook.hpp
+x64-windows/share/
+x64-windows/share/boost-intrusive/
+x64-windows/share/boost-intrusive/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-io_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/io/
+x64-windows/include/boost/io/detail/
+x64-windows/include/boost/io/detail/quoted_manip.hpp
+x64-windows/include/boost/io/ios_state.hpp
+x64-windows/include/boost/io_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-io/
+x64-windows/share/boost-io/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-iostreams_1.67.0-1_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,151 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_iostreams-vc141-mt-x32-1_67.dll
+x64-windows/bin/boost_iostreams-vc141-mt-x32-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_iostreams-vc141-mt-gd-x32-1_67.dll
+x64-windows/debug/bin/boost_iostreams-vc141-mt-gd-x32-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_iostreams-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/iostreams/
+x64-windows/include/boost/iostreams/categories.hpp
+x64-windows/include/boost/iostreams/chain.hpp
+x64-windows/include/boost/iostreams/char_traits.hpp
+x64-windows/include/boost/iostreams/checked_operations.hpp
+x64-windows/include/boost/iostreams/close.hpp
+x64-windows/include/boost/iostreams/code_converter.hpp
+x64-windows/include/boost/iostreams/combine.hpp
+x64-windows/include/boost/iostreams/compose.hpp
+x64-windows/include/boost/iostreams/concepts.hpp
+x64-windows/include/boost/iostreams/constants.hpp
+x64-windows/include/boost/iostreams/copy.hpp
+x64-windows/include/boost/iostreams/detail/
+x64-windows/include/boost/iostreams/detail/absolute_path.hpp
+x64-windows/include/boost/iostreams/detail/access_control.hpp
+x64-windows/include/boost/iostreams/detail/adapter/
+x64-windows/include/boost/iostreams/detail/adapter/concept_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/device_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/direct_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/filter_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/mode_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/non_blocking_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/output_iterator_adapter.hpp
+x64-windows/include/boost/iostreams/detail/adapter/range_adapter.hpp
+x64-windows/include/boost/iostreams/detail/add_facet.hpp
+x64-windows/include/boost/iostreams/detail/bool_trait_def.hpp
+x64-windows/include/boost/iostreams/detail/broken_overload_resolution/
+x64-windows/include/boost/iostreams/detail/broken_overload_resolution/forward.hpp
+x64-windows/include/boost/iostreams/detail/broken_overload_resolution/stream.hpp
+x64-windows/include/boost/iostreams/detail/broken_overload_resolution/stream_buffer.hpp
+x64-windows/include/boost/iostreams/detail/buffer.hpp
+x64-windows/include/boost/iostreams/detail/call_traits.hpp
+x64-windows/include/boost/iostreams/detail/char_traits.hpp
+x64-windows/include/boost/iostreams/detail/codecvt_helper.hpp
+x64-windows/include/boost/iostreams/detail/codecvt_holder.hpp
+x64-windows/include/boost/iostreams/detail/config/
+x64-windows/include/boost/iostreams/detail/config/auto_link.hpp
+x64-windows/include/boost/iostreams/detail/config/bzip2.hpp
+x64-windows/include/boost/iostreams/detail/config/codecvt.hpp
+x64-windows/include/boost/iostreams/detail/config/disable_warnings.hpp
+x64-windows/include/boost/iostreams/detail/config/dyn_link.hpp
+x64-windows/include/boost/iostreams/detail/config/enable_warnings.hpp
+x64-windows/include/boost/iostreams/detail/config/fpos.hpp
+x64-windows/include/boost/iostreams/detail/config/gcc.hpp
+x64-windows/include/boost/iostreams/detail/config/limits.hpp
+x64-windows/include/boost/iostreams/detail/config/overload_resolution.hpp
+x64-windows/include/boost/iostreams/detail/config/rtl.hpp
+x64-windows/include/boost/iostreams/detail/config/unreachable_return.hpp
+x64-windows/include/boost/iostreams/detail/config/wide_streams.hpp
+x64-windows/include/boost/iostreams/detail/config/windows_posix.hpp
+x64-windows/include/boost/iostreams/detail/config/zlib.hpp
+x64-windows/include/boost/iostreams/detail/counted_array.hpp
+x64-windows/include/boost/iostreams/detail/current_directory.hpp
+x64-windows/include/boost/iostreams/detail/default_arg.hpp
+x64-windows/include/boost/iostreams/detail/dispatch.hpp
+x64-windows/include/boost/iostreams/detail/double_object.hpp
+x64-windows/include/boost/iostreams/detail/enable_if_stream.hpp
+x64-windows/include/boost/iostreams/detail/error.hpp
+x64-windows/include/boost/iostreams/detail/execute.hpp
+x64-windows/include/boost/iostreams/detail/file_handle.hpp
+x64-windows/include/boost/iostreams/detail/forward.hpp
+x64-windows/include/boost/iostreams/detail/fstream.hpp
+x64-windows/include/boost/iostreams/detail/functional.hpp
+x64-windows/include/boost/iostreams/detail/ios.hpp
+x64-windows/include/boost/iostreams/detail/iostream.hpp
+x64-windows/include/boost/iostreams/detail/is_dereferenceable.hpp
+x64-windows/include/boost/iostreams/detail/is_iterator_range.hpp
+x64-windows/include/boost/iostreams/detail/newline.hpp
+x64-windows/include/boost/iostreams/detail/optional.hpp
+x64-windows/include/boost/iostreams/detail/param_type.hpp
+x64-windows/include/boost/iostreams/detail/path.hpp
+x64-windows/include/boost/iostreams/detail/push.hpp
+x64-windows/include/boost/iostreams/detail/push_params.hpp
+x64-windows/include/boost/iostreams/detail/resolve.hpp
+x64-windows/include/boost/iostreams/detail/restrict_impl.hpp
+x64-windows/include/boost/iostreams/detail/select.hpp
+x64-windows/include/boost/iostreams/detail/select_by_size.hpp
+x64-windows/include/boost/iostreams/detail/streambuf.hpp
+x64-windows/include/boost/iostreams/detail/streambuf/
+x64-windows/include/boost/iostreams/detail/streambuf/chainbuf.hpp
+x64-windows/include/boost/iostreams/detail/streambuf/direct_streambuf.hpp
+x64-windows/include/boost/iostreams/detail/streambuf/indirect_streambuf.hpp
+x64-windows/include/boost/iostreams/detail/streambuf/linked_streambuf.hpp
+x64-windows/include/boost/iostreams/detail/system_failure.hpp
+x64-windows/include/boost/iostreams/detail/template_params.hpp
+x64-windows/include/boost/iostreams/detail/translate_int_type.hpp
+x64-windows/include/boost/iostreams/detail/wrap_unwrap.hpp
+x64-windows/include/boost/iostreams/device/
+x64-windows/include/boost/iostreams/device/array.hpp
+x64-windows/include/boost/iostreams/device/back_inserter.hpp
+x64-windows/include/boost/iostreams/device/file.hpp
+x64-windows/include/boost/iostreams/device/file_descriptor.hpp
+x64-windows/include/boost/iostreams/device/mapped_file.hpp
+x64-windows/include/boost/iostreams/device/null.hpp
+x64-windows/include/boost/iostreams/filter/
+x64-windows/include/boost/iostreams/filter/aggregate.hpp
+x64-windows/include/boost/iostreams/filter/bzip2.hpp
+x64-windows/include/boost/iostreams/filter/counter.hpp
+x64-windows/include/boost/iostreams/filter/grep.hpp
+x64-windows/include/boost/iostreams/filter/gzip.hpp
+x64-windows/include/boost/iostreams/filter/line.hpp
+x64-windows/include/boost/iostreams/filter/lzma.hpp
+x64-windows/include/boost/iostreams/filter/newline.hpp
+x64-windows/include/boost/iostreams/filter/regex.hpp
+x64-windows/include/boost/iostreams/filter/stdio.hpp
+x64-windows/include/boost/iostreams/filter/symmetric.hpp
+x64-windows/include/boost/iostreams/filter/test.hpp
+x64-windows/include/boost/iostreams/filter/zlib.hpp
+x64-windows/include/boost/iostreams/filtering_stream.hpp
+x64-windows/include/boost/iostreams/filtering_streambuf.hpp
+x64-windows/include/boost/iostreams/flush.hpp
+x64-windows/include/boost/iostreams/get.hpp
+x64-windows/include/boost/iostreams/imbue.hpp
+x64-windows/include/boost/iostreams/input_sequence.hpp
+x64-windows/include/boost/iostreams/invert.hpp
+x64-windows/include/boost/iostreams/operations.hpp
+x64-windows/include/boost/iostreams/operations_fwd.hpp
+x64-windows/include/boost/iostreams/optimal_buffer_size.hpp
+x64-windows/include/boost/iostreams/output_sequence.hpp
+x64-windows/include/boost/iostreams/pipeline.hpp
+x64-windows/include/boost/iostreams/positioning.hpp
+x64-windows/include/boost/iostreams/put.hpp
+x64-windows/include/boost/iostreams/putback.hpp
+x64-windows/include/boost/iostreams/read.hpp
+x64-windows/include/boost/iostreams/restrict.hpp
+x64-windows/include/boost/iostreams/seek.hpp
+x64-windows/include/boost/iostreams/skip.hpp
+x64-windows/include/boost/iostreams/slice.hpp
+x64-windows/include/boost/iostreams/stream.hpp
+x64-windows/include/boost/iostreams/stream_buffer.hpp
+x64-windows/include/boost/iostreams/tee.hpp
+x64-windows/include/boost/iostreams/traits.hpp
+x64-windows/include/boost/iostreams/traits_fwd.hpp
+x64-windows/include/boost/iostreams/write.hpp
+x64-windows/lib/
+x64-windows/lib/boost_iostreams-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-iostreams/
+x64-windows/share/boost-iostreams/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-iterator_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/function_output_iterator.hpp
+x64-windows/include/boost/generator_iterator.hpp
+x64-windows/include/boost/indirect_reference.hpp
+x64-windows/include/boost/iterator/
+x64-windows/include/boost/iterator/advance.hpp
+x64-windows/include/boost/iterator/counting_iterator.hpp
+x64-windows/include/boost/iterator/detail/
+x64-windows/include/boost/iterator/detail/any_conversion_eater.hpp
+x64-windows/include/boost/iterator/detail/config_def.hpp
+x64-windows/include/boost/iterator/detail/config_undef.hpp
+x64-windows/include/boost/iterator/detail/enable_if.hpp
+x64-windows/include/boost/iterator/detail/facade_iterator_category.hpp
+x64-windows/include/boost/iterator/detail/minimum_category.hpp
+x64-windows/include/boost/iterator/distance.hpp
+x64-windows/include/boost/iterator/filter_iterator.hpp
+x64-windows/include/boost/iterator/function_input_iterator.hpp
+x64-windows/include/boost/iterator/function_output_iterator.hpp
+x64-windows/include/boost/iterator/indirect_iterator.hpp
+x64-windows/include/boost/iterator/interoperable.hpp
+x64-windows/include/boost/iterator/is_lvalue_iterator.hpp
+x64-windows/include/boost/iterator/is_readable_iterator.hpp
+x64-windows/include/boost/iterator/iterator_adaptor.hpp
+x64-windows/include/boost/iterator/iterator_archetypes.hpp
+x64-windows/include/boost/iterator/iterator_categories.hpp
+x64-windows/include/boost/iterator/iterator_concepts.hpp
+x64-windows/include/boost/iterator/iterator_facade.hpp
+x64-windows/include/boost/iterator/iterator_traits.hpp
+x64-windows/include/boost/iterator/minimum_category.hpp
+x64-windows/include/boost/iterator/new_iterator_tests.hpp
+x64-windows/include/boost/iterator/permutation_iterator.hpp
+x64-windows/include/boost/iterator/reverse_iterator.hpp
+x64-windows/include/boost/iterator/transform_iterator.hpp
+x64-windows/include/boost/iterator/zip_iterator.hpp
+x64-windows/include/boost/iterator_adaptors.hpp
+x64-windows/include/boost/next_prior.hpp
+x64-windows/include/boost/pending/
+x64-windows/include/boost/pending/detail/
+x64-windows/include/boost/pending/detail/int_iterator.hpp
+x64-windows/include/boost/pending/iterator_adaptors.hpp
+x64-windows/include/boost/pending/iterator_tests.hpp
+x64-windows/include/boost/pointee.hpp
+x64-windows/include/boost/shared_container_iterator.hpp
+x64-windows/share/
+x64-windows/share/boost-iterator/
+x64-windows/share/boost-iterator/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-lambda_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/lambda/
+x64-windows/include/boost/lambda/algorithm.hpp
+x64-windows/include/boost/lambda/bind.hpp
+x64-windows/include/boost/lambda/casts.hpp
+x64-windows/include/boost/lambda/closures.hpp
+x64-windows/include/boost/lambda/construct.hpp
+x64-windows/include/boost/lambda/control_structures.hpp
+x64-windows/include/boost/lambda/core.hpp
+x64-windows/include/boost/lambda/detail/
+x64-windows/include/boost/lambda/detail/actions.hpp
+x64-windows/include/boost/lambda/detail/arity_code.hpp
+x64-windows/include/boost/lambda/detail/bind_functions.hpp
+x64-windows/include/boost/lambda/detail/control_constructs_common.hpp
+x64-windows/include/boost/lambda/detail/function_adaptors.hpp
+x64-windows/include/boost/lambda/detail/is_instance_of.hpp
+x64-windows/include/boost/lambda/detail/lambda_config.hpp
+x64-windows/include/boost/lambda/detail/lambda_functor_base.hpp
+x64-windows/include/boost/lambda/detail/lambda_functors.hpp
+x64-windows/include/boost/lambda/detail/lambda_fwd.hpp
+x64-windows/include/boost/lambda/detail/lambda_traits.hpp
+x64-windows/include/boost/lambda/detail/member_ptr.hpp
+x64-windows/include/boost/lambda/detail/operator_actions.hpp
+x64-windows/include/boost/lambda/detail/operator_lambda_func_base.hpp
+x64-windows/include/boost/lambda/detail/operator_return_type_traits.hpp
+x64-windows/include/boost/lambda/detail/operators.hpp
+x64-windows/include/boost/lambda/detail/ret.hpp
+x64-windows/include/boost/lambda/detail/return_type_traits.hpp
+x64-windows/include/boost/lambda/detail/select_functions.hpp
+x64-windows/include/boost/lambda/detail/suppress_unused.hpp
+x64-windows/include/boost/lambda/exceptions.hpp
+x64-windows/include/boost/lambda/if.hpp
+x64-windows/include/boost/lambda/lambda.hpp
+x64-windows/include/boost/lambda/loops.hpp
+x64-windows/include/boost/lambda/numeric.hpp
+x64-windows/include/boost/lambda/switch.hpp
+x64-windows/share/
+x64-windows/share/boost-lambda/
+x64-windows/share/boost-lambda/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-lexical-cast_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/basic_pointerbuf.hpp
+x64-windows/include/boost/detail/lcast_precision.hpp
+x64-windows/include/boost/lexical_cast.hpp
+x64-windows/include/boost/lexical_cast/
+x64-windows/include/boost/lexical_cast/bad_lexical_cast.hpp
+x64-windows/include/boost/lexical_cast/detail/
+x64-windows/include/boost/lexical_cast/detail/converter_lexical.hpp
+x64-windows/include/boost/lexical_cast/detail/converter_lexical_streams.hpp
+x64-windows/include/boost/lexical_cast/detail/converter_numeric.hpp
+x64-windows/include/boost/lexical_cast/detail/inf_nan.hpp
+x64-windows/include/boost/lexical_cast/detail/is_character.hpp
+x64-windows/include/boost/lexical_cast/detail/lcast_char_constants.hpp
+x64-windows/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
+x64-windows/include/boost/lexical_cast/detail/widest_char.hpp
+x64-windows/include/boost/lexical_cast/lexical_cast_old.hpp
+x64-windows/include/boost/lexical_cast/try_lexical_convert.hpp
+x64-windows/share/
+x64-windows/share/boost-lexical-cast/
+x64-windows/share/boost-lexical-cast/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-locale_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,48 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_locale-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_locale-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_locale-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_locale-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_locale-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/locale.hpp
+x64-windows/include/boost/locale/
+x64-windows/include/boost/locale/boundary.hpp
+x64-windows/include/boost/locale/boundary/
+x64-windows/include/boost/locale/boundary/boundary_point.hpp
+x64-windows/include/boost/locale/boundary/facets.hpp
+x64-windows/include/boost/locale/boundary/index.hpp
+x64-windows/include/boost/locale/boundary/segment.hpp
+x64-windows/include/boost/locale/boundary/types.hpp
+x64-windows/include/boost/locale/collator.hpp
+x64-windows/include/boost/locale/config.hpp
+x64-windows/include/boost/locale/conversion.hpp
+x64-windows/include/boost/locale/date_time.hpp
+x64-windows/include/boost/locale/date_time_facet.hpp
+x64-windows/include/boost/locale/definitions.hpp
+x64-windows/include/boost/locale/encoding.hpp
+x64-windows/include/boost/locale/encoding_errors.hpp
+x64-windows/include/boost/locale/encoding_utf.hpp
+x64-windows/include/boost/locale/format.hpp
+x64-windows/include/boost/locale/formatting.hpp
+x64-windows/include/boost/locale/generator.hpp
+x64-windows/include/boost/locale/generic_codecvt.hpp
+x64-windows/include/boost/locale/gnu_gettext.hpp
+x64-windows/include/boost/locale/hold_ptr.hpp
+x64-windows/include/boost/locale/info.hpp
+x64-windows/include/boost/locale/localization_backend.hpp
+x64-windows/include/boost/locale/message.hpp
+x64-windows/include/boost/locale/time_zone.hpp
+x64-windows/include/boost/locale/utf.hpp
+x64-windows/include/boost/locale/utf8_codecvt.hpp
+x64-windows/include/boost/locale/util.hpp
+x64-windows/lib/
+x64-windows/lib/boost_locale-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-locale/
+x64-windows/share/boost-locale/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-math_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,398 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_math_c99-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_c99-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_c99f-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_c99f-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_c99l-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_c99l-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_tr1-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_tr1-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_tr1f-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_tr1f-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_math_tr1l-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_math_tr1l-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_math_c99-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_c99-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_c99f-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_c99f-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_c99l-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_c99l-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_tr1-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_tr1-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_tr1f-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_tr1f-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_math_tr1l-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_math_tr1l-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_math_c99-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_c99f-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_c99l-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_tr1-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_tr1f-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_math_tr1l-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/cstdfloat.hpp
+x64-windows/include/boost/math/
+x64-windows/include/boost/math/bindings/
+x64-windows/include/boost/math/bindings/detail/
+x64-windows/include/boost/math/bindings/detail/big_digamma.hpp
+x64-windows/include/boost/math/bindings/detail/big_lanczos.hpp
+x64-windows/include/boost/math/bindings/e_float.hpp
+x64-windows/include/boost/math/bindings/mpfr.hpp
+x64-windows/include/boost/math/bindings/mpreal.hpp
+x64-windows/include/boost/math/bindings/rr.hpp
+x64-windows/include/boost/math/common_factor.hpp
+x64-windows/include/boost/math/common_factor_ct.hpp
+x64-windows/include/boost/math/common_factor_rt.hpp
+x64-windows/include/boost/math/complex.hpp
+x64-windows/include/boost/math/complex/
+x64-windows/include/boost/math/complex/acos.hpp
+x64-windows/include/boost/math/complex/acosh.hpp
+x64-windows/include/boost/math/complex/asin.hpp
+x64-windows/include/boost/math/complex/asinh.hpp
+x64-windows/include/boost/math/complex/atan.hpp
+x64-windows/include/boost/math/complex/atanh.hpp
+x64-windows/include/boost/math/complex/details.hpp
+x64-windows/include/boost/math/complex/fabs.hpp
+x64-windows/include/boost/math/concepts/
+x64-windows/include/boost/math/concepts/distributions.hpp
+x64-windows/include/boost/math/concepts/real_concept.hpp
+x64-windows/include/boost/math/concepts/real_type_concept.hpp
+x64-windows/include/boost/math/concepts/std_real_concept.hpp
+x64-windows/include/boost/math/constants/
+x64-windows/include/boost/math/constants/calculate_constants.hpp
+x64-windows/include/boost/math/constants/constants.hpp
+x64-windows/include/boost/math/constants/info.hpp
+x64-windows/include/boost/math/cstdfloat/
+x64-windows/include/boost/math/cstdfloat/cstdfloat_cmath.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_complex.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_complex_std.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_iostream.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_limits.hpp
+x64-windows/include/boost/math/cstdfloat/cstdfloat_types.hpp
+x64-windows/include/boost/math/distributions.hpp
+x64-windows/include/boost/math/distributions/
+x64-windows/include/boost/math/distributions/arcsine.hpp
+x64-windows/include/boost/math/distributions/bernoulli.hpp
+x64-windows/include/boost/math/distributions/beta.hpp
+x64-windows/include/boost/math/distributions/binomial.hpp
+x64-windows/include/boost/math/distributions/cauchy.hpp
+x64-windows/include/boost/math/distributions/chi_squared.hpp
+x64-windows/include/boost/math/distributions/complement.hpp
+x64-windows/include/boost/math/distributions/detail/
+x64-windows/include/boost/math/distributions/detail/common_error_handling.hpp
+x64-windows/include/boost/math/distributions/detail/derived_accessors.hpp
+x64-windows/include/boost/math/distributions/detail/generic_mode.hpp
+x64-windows/include/boost/math/distributions/detail/generic_quantile.hpp
+x64-windows/include/boost/math/distributions/detail/hypergeometric_cdf.hpp
+x64-windows/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
+x64-windows/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
+x64-windows/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
+x64-windows/include/boost/math/distributions/exponential.hpp
+x64-windows/include/boost/math/distributions/extreme_value.hpp
+x64-windows/include/boost/math/distributions/find_location.hpp
+x64-windows/include/boost/math/distributions/find_scale.hpp
+x64-windows/include/boost/math/distributions/fisher_f.hpp
+x64-windows/include/boost/math/distributions/fwd.hpp
+x64-windows/include/boost/math/distributions/gamma.hpp
+x64-windows/include/boost/math/distributions/geometric.hpp
+x64-windows/include/boost/math/distributions/hyperexponential.hpp
+x64-windows/include/boost/math/distributions/hypergeometric.hpp
+x64-windows/include/boost/math/distributions/inverse_chi_squared.hpp
+x64-windows/include/boost/math/distributions/inverse_gamma.hpp
+x64-windows/include/boost/math/distributions/inverse_gaussian.hpp
+x64-windows/include/boost/math/distributions/laplace.hpp
+x64-windows/include/boost/math/distributions/logistic.hpp
+x64-windows/include/boost/math/distributions/lognormal.hpp
+x64-windows/include/boost/math/distributions/negative_binomial.hpp
+x64-windows/include/boost/math/distributions/non_central_beta.hpp
+x64-windows/include/boost/math/distributions/non_central_chi_squared.hpp
+x64-windows/include/boost/math/distributions/non_central_f.hpp
+x64-windows/include/boost/math/distributions/non_central_t.hpp
+x64-windows/include/boost/math/distributions/normal.hpp
+x64-windows/include/boost/math/distributions/pareto.hpp
+x64-windows/include/boost/math/distributions/poisson.hpp
+x64-windows/include/boost/math/distributions/rayleigh.hpp
+x64-windows/include/boost/math/distributions/skew_normal.hpp
+x64-windows/include/boost/math/distributions/students_t.hpp
+x64-windows/include/boost/math/distributions/triangular.hpp
+x64-windows/include/boost/math/distributions/uniform.hpp
+x64-windows/include/boost/math/distributions/weibull.hpp
+x64-windows/include/boost/math/interpolators/
+x64-windows/include/boost/math/interpolators/barycentric_rational.hpp
+x64-windows/include/boost/math/interpolators/cubic_b_spline.hpp
+x64-windows/include/boost/math/interpolators/detail/
+x64-windows/include/boost/math/interpolators/detail/barycentric_rational_detail.hpp
+x64-windows/include/boost/math/interpolators/detail/cubic_b_spline_detail.hpp
+x64-windows/include/boost/math/octonion.hpp
+x64-windows/include/boost/math/policies/
+x64-windows/include/boost/math/policies/error_handling.hpp
+x64-windows/include/boost/math/policies/policy.hpp
+x64-windows/include/boost/math/quadrature/
+x64-windows/include/boost/math/quadrature/detail/
+x64-windows/include/boost/math/quadrature/detail/exp_sinh_detail.hpp
+x64-windows/include/boost/math/quadrature/detail/sinh_sinh_detail.hpp
+x64-windows/include/boost/math/quadrature/detail/tanh_sinh_constants.hpp
+x64-windows/include/boost/math/quadrature/detail/tanh_sinh_detail.hpp
+x64-windows/include/boost/math/quadrature/exp_sinh.hpp
+x64-windows/include/boost/math/quadrature/gauss.hpp
+x64-windows/include/boost/math/quadrature/gauss_kronrod.hpp
+x64-windows/include/boost/math/quadrature/naive_monte_carlo.hpp
+x64-windows/include/boost/math/quadrature/sinh_sinh.hpp
+x64-windows/include/boost/math/quadrature/tanh_sinh.hpp
+x64-windows/include/boost/math/quadrature/trapezoidal.hpp
+x64-windows/include/boost/math/quaternion.hpp
+x64-windows/include/boost/math/special_functions.hpp
+x64-windows/include/boost/math/special_functions/
+x64-windows/include/boost/math/special_functions/acosh.hpp
+x64-windows/include/boost/math/special_functions/airy.hpp
+x64-windows/include/boost/math/special_functions/asinh.hpp
+x64-windows/include/boost/math/special_functions/atanh.hpp
+x64-windows/include/boost/math/special_functions/bernoulli.hpp
+x64-windows/include/boost/math/special_functions/bessel.hpp
+x64-windows/include/boost/math/special_functions/bessel_prime.hpp
+x64-windows/include/boost/math/special_functions/beta.hpp
+x64-windows/include/boost/math/special_functions/binomial.hpp
+x64-windows/include/boost/math/special_functions/cbrt.hpp
+x64-windows/include/boost/math/special_functions/chebyshev.hpp
+x64-windows/include/boost/math/special_functions/chebyshev_transform.hpp
+x64-windows/include/boost/math/special_functions/cos_pi.hpp
+x64-windows/include/boost/math/special_functions/detail/
+x64-windows/include/boost/math/special_functions/detail/airy_ai_bi_zero.hpp
+x64-windows/include/boost/math/special_functions/detail/bernoulli_details.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_derivatives_linear.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_i0.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_i1.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_ik.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_j0.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_j1.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jn.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_asym.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_derivatives_asym.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_derivatives_series.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_series.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_jy_zero.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_k0.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_k1.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_kn.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_y0.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_y1.hpp
+x64-windows/include/boost/math/special_functions/detail/bessel_yn.hpp
+x64-windows/include/boost/math/special_functions/detail/erf_inv.hpp
+x64-windows/include/boost/math/special_functions/detail/fp_traits.hpp
+x64-windows/include/boost/math/special_functions/detail/gamma_inva.hpp
+x64-windows/include/boost/math/special_functions/detail/ibeta_inv_ab.hpp
+x64-windows/include/boost/math/special_functions/detail/ibeta_inverse.hpp
+x64-windows/include/boost/math/special_functions/detail/iconv.hpp
+x64-windows/include/boost/math/special_functions/detail/igamma_inverse.hpp
+x64-windows/include/boost/math/special_functions/detail/igamma_large.hpp
+x64-windows/include/boost/math/special_functions/detail/lanczos_sse2.hpp
+x64-windows/include/boost/math/special_functions/detail/lgamma_small.hpp
+x64-windows/include/boost/math/special_functions/detail/polygamma.hpp
+x64-windows/include/boost/math/special_functions/detail/round_fwd.hpp
+x64-windows/include/boost/math/special_functions/detail/t_distribution_inv.hpp
+x64-windows/include/boost/math/special_functions/detail/unchecked_bernoulli.hpp
+x64-windows/include/boost/math/special_functions/detail/unchecked_factorial.hpp
+x64-windows/include/boost/math/special_functions/digamma.hpp
+x64-windows/include/boost/math/special_functions/ellint_1.hpp
+x64-windows/include/boost/math/special_functions/ellint_2.hpp
+x64-windows/include/boost/math/special_functions/ellint_3.hpp
+x64-windows/include/boost/math/special_functions/ellint_d.hpp
+x64-windows/include/boost/math/special_functions/ellint_rc.hpp
+x64-windows/include/boost/math/special_functions/ellint_rd.hpp
+x64-windows/include/boost/math/special_functions/ellint_rf.hpp
+x64-windows/include/boost/math/special_functions/ellint_rg.hpp
+x64-windows/include/boost/math/special_functions/ellint_rj.hpp
+x64-windows/include/boost/math/special_functions/erf.hpp
+x64-windows/include/boost/math/special_functions/expint.hpp
+x64-windows/include/boost/math/special_functions/expm1.hpp
+x64-windows/include/boost/math/special_functions/factorials.hpp
+x64-windows/include/boost/math/special_functions/fpclassify.hpp
+x64-windows/include/boost/math/special_functions/gamma.hpp
+x64-windows/include/boost/math/special_functions/hankel.hpp
+x64-windows/include/boost/math/special_functions/hermite.hpp
+x64-windows/include/boost/math/special_functions/heuman_lambda.hpp
+x64-windows/include/boost/math/special_functions/hypot.hpp
+x64-windows/include/boost/math/special_functions/jacobi_elliptic.hpp
+x64-windows/include/boost/math/special_functions/jacobi_zeta.hpp
+x64-windows/include/boost/math/special_functions/laguerre.hpp
+x64-windows/include/boost/math/special_functions/lanczos.hpp
+x64-windows/include/boost/math/special_functions/legendre.hpp
+x64-windows/include/boost/math/special_functions/legendre_stieltjes.hpp
+x64-windows/include/boost/math/special_functions/log1p.hpp
+x64-windows/include/boost/math/special_functions/math_fwd.hpp
+x64-windows/include/boost/math/special_functions/modf.hpp
+x64-windows/include/boost/math/special_functions/next.hpp
+x64-windows/include/boost/math/special_functions/nonfinite_num_facets.hpp
+x64-windows/include/boost/math/special_functions/owens_t.hpp
+x64-windows/include/boost/math/special_functions/polygamma.hpp
+x64-windows/include/boost/math/special_functions/pow.hpp
+x64-windows/include/boost/math/special_functions/powm1.hpp
+x64-windows/include/boost/math/special_functions/prime.hpp
+x64-windows/include/boost/math/special_functions/relative_difference.hpp
+x64-windows/include/boost/math/special_functions/round.hpp
+x64-windows/include/boost/math/special_functions/sign.hpp
+x64-windows/include/boost/math/special_functions/sin_pi.hpp
+x64-windows/include/boost/math/special_functions/sinc.hpp
+x64-windows/include/boost/math/special_functions/sinhc.hpp
+x64-windows/include/boost/math/special_functions/spherical_harmonic.hpp
+x64-windows/include/boost/math/special_functions/sqrt1pm1.hpp
+x64-windows/include/boost/math/special_functions/trigamma.hpp
+x64-windows/include/boost/math/special_functions/trunc.hpp
+x64-windows/include/boost/math/special_functions/ulp.hpp
+x64-windows/include/boost/math/special_functions/zeta.hpp
+x64-windows/include/boost/math/tools/
+x64-windows/include/boost/math/tools/atomic.hpp
+x64-windows/include/boost/math/tools/big_constant.hpp
+x64-windows/include/boost/math/tools/config.hpp
+x64-windows/include/boost/math/tools/convert_from_string.hpp
+x64-windows/include/boost/math/tools/detail/
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_10.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_11.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_12.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_13.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_14.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_15.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_16.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_17.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_18.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_19.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_2.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_20.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_3.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_4.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_5.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_6.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_7.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_8.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner1_9.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_10.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_11.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_12.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_13.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_14.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_15.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_16.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_17.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_18.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_19.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_2.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_20.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_3.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_4.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_5.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_6.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_7.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_8.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner2_9.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_10.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_11.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_12.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_13.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_14.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_15.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_16.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_17.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_18.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_19.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_2.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_20.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_3.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_4.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_5.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_6.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_7.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_8.hpp
+x64-windows/include/boost/math/tools/detail/polynomial_horner3_9.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_10.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_11.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_12.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_13.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_14.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_15.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_16.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_17.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_18.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_19.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_2.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_20.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_3.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_4.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_5.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_6.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_7.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_8.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner1_9.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_10.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_11.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_12.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_13.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_14.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_15.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_16.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_17.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_18.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_19.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_2.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_20.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_3.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_4.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_5.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_6.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_7.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_8.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner2_9.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_10.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_11.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_12.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_13.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_14.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_15.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_16.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_17.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_18.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_19.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_2.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_20.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_3.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_4.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_5.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_6.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_7.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_8.hpp
+x64-windows/include/boost/math/tools/detail/rational_horner3_9.hpp
+x64-windows/include/boost/math/tools/fraction.hpp
+x64-windows/include/boost/math/tools/minima.hpp
+x64-windows/include/boost/math/tools/numerical_differentiation.hpp
+x64-windows/include/boost/math/tools/polynomial.hpp
+x64-windows/include/boost/math/tools/polynomial_gcd.hpp
+x64-windows/include/boost/math/tools/precision.hpp
+x64-windows/include/boost/math/tools/promotion.hpp
+x64-windows/include/boost/math/tools/rational.hpp
+x64-windows/include/boost/math/tools/real_cast.hpp
+x64-windows/include/boost/math/tools/roots.hpp
+x64-windows/include/boost/math/tools/series.hpp
+x64-windows/include/boost/math/tools/stats.hpp
+x64-windows/include/boost/math/tools/toms748_solve.hpp
+x64-windows/include/boost/math/tools/traits.hpp
+x64-windows/include/boost/math/tools/tuple.hpp
+x64-windows/include/boost/math/tools/user.hpp
+x64-windows/include/boost/math/tools/workaround.hpp
+x64-windows/include/boost/math/tr1.hpp
+x64-windows/include/boost/math/tr1_c_macros.ipp
+x64-windows/include/boost/math_fwd.hpp
+x64-windows/lib/
+x64-windows/lib/boost_math_c99-vc140-mt.lib
+x64-windows/lib/boost_math_c99f-vc140-mt.lib
+x64-windows/lib/boost_math_c99l-vc140-mt.lib
+x64-windows/lib/boost_math_tr1-vc140-mt.lib
+x64-windows/lib/boost_math_tr1f-vc140-mt.lib
+x64-windows/lib/boost_math_tr1l-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-math/
+x64-windows/share/boost-math/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-modular-build-helper_2018-05-14_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,8 @@
+x64-windows/
+x64-windows/share/
+x64-windows/share/boost-build/
+x64-windows/share/boost-build/CMakeLists.txt
+x64-windows/share/boost-build/Jamroot.jam
+x64-windows/share/boost-build/boost-modular-build.cmake
+x64-windows/share/boost-build/nothing.bat
+x64-windows/share/boost-build/user-config.jam
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-move_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/move/
+x64-windows/include/boost/move/adl_move_swap.hpp
+x64-windows/include/boost/move/algo/
+x64-windows/include/boost/move/algo/adaptive_merge.hpp
+x64-windows/include/boost/move/algo/adaptive_sort.hpp
+x64-windows/include/boost/move/algo/detail/
+x64-windows/include/boost/move/algo/detail/adaptive_sort_merge.hpp
+x64-windows/include/boost/move/algo/detail/basic_op.hpp
+x64-windows/include/boost/move/algo/detail/heap_sort.hpp
+x64-windows/include/boost/move/algo/detail/insertion_sort.hpp
+x64-windows/include/boost/move/algo/detail/is_sorted.hpp
+x64-windows/include/boost/move/algo/detail/merge.hpp
+x64-windows/include/boost/move/algo/detail/merge_sort.hpp
+x64-windows/include/boost/move/algo/detail/pdqsort.hpp
+x64-windows/include/boost/move/algo/detail/set_difference.hpp
+x64-windows/include/boost/move/algo/move.hpp
+x64-windows/include/boost/move/algo/predicate.hpp
+x64-windows/include/boost/move/algo/unique.hpp
+x64-windows/include/boost/move/algorithm.hpp
+x64-windows/include/boost/move/core.hpp
+x64-windows/include/boost/move/default_delete.hpp
+x64-windows/include/boost/move/detail/
+x64-windows/include/boost/move/detail/config_begin.hpp
+x64-windows/include/boost/move/detail/config_end.hpp
+x64-windows/include/boost/move/detail/destruct_n.hpp
+x64-windows/include/boost/move/detail/fwd_macros.hpp
+x64-windows/include/boost/move/detail/iterator_to_raw_pointer.hpp
+x64-windows/include/boost/move/detail/iterator_traits.hpp
+x64-windows/include/boost/move/detail/meta_utils.hpp
+x64-windows/include/boost/move/detail/meta_utils_core.hpp
+x64-windows/include/boost/move/detail/move_helpers.hpp
+x64-windows/include/boost/move/detail/placement_new.hpp
+x64-windows/include/boost/move/detail/pointer_element.hpp
+x64-windows/include/boost/move/detail/reverse_iterator.hpp
+x64-windows/include/boost/move/detail/std_ns_begin.hpp
+x64-windows/include/boost/move/detail/std_ns_end.hpp
+x64-windows/include/boost/move/detail/to_raw_pointer.hpp
+x64-windows/include/boost/move/detail/type_traits.hpp
+x64-windows/include/boost/move/detail/unique_ptr_meta_utils.hpp
+x64-windows/include/boost/move/detail/workaround.hpp
+x64-windows/include/boost/move/iterator.hpp
+x64-windows/include/boost/move/make_unique.hpp
+x64-windows/include/boost/move/move.hpp
+x64-windows/include/boost/move/traits.hpp
+x64-windows/include/boost/move/unique_ptr.hpp
+x64-windows/include/boost/move/utility.hpp
+x64-windows/include/boost/move/utility_core.hpp
+x64-windows/share/
+x64-windows/share/boost-move/
+x64-windows/share/boost-move/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-mpl_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1093 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/mpl/
+x64-windows/include/boost/mpl/O1_size.hpp
+x64-windows/include/boost/mpl/O1_size_fwd.hpp
+x64-windows/include/boost/mpl/accumulate.hpp
+x64-windows/include/boost/mpl/advance.hpp
+x64-windows/include/boost/mpl/advance_fwd.hpp
+x64-windows/include/boost/mpl/alias.hpp
+x64-windows/include/boost/mpl/always.hpp
+x64-windows/include/boost/mpl/and.hpp
+x64-windows/include/boost/mpl/apply.hpp
+x64-windows/include/boost/mpl/apply_fwd.hpp
+x64-windows/include/boost/mpl/apply_wrap.hpp
+x64-windows/include/boost/mpl/arg.hpp
+x64-windows/include/boost/mpl/arg_fwd.hpp
+x64-windows/include/boost/mpl/arithmetic.hpp
+x64-windows/include/boost/mpl/as_sequence.hpp
+x64-windows/include/boost/mpl/assert.hpp
+x64-windows/include/boost/mpl/at.hpp
+x64-windows/include/boost/mpl/at_fwd.hpp
+x64-windows/include/boost/mpl/aux_/
+x64-windows/include/boost/mpl/aux_/O1_size_impl.hpp
+x64-windows/include/boost/mpl/aux_/adl_barrier.hpp
+x64-windows/include/boost/mpl/aux_/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/apply_1st.hpp
+x64-windows/include/boost/mpl/aux_/arg_typedef.hpp
+x64-windows/include/boost/mpl/aux_/arithmetic_op.hpp
+x64-windows/include/boost/mpl/aux_/arity.hpp
+x64-windows/include/boost/mpl/aux_/arity_spec.hpp
+x64-windows/include/boost/mpl/aux_/at_impl.hpp
+x64-windows/include/boost/mpl/aux_/back_impl.hpp
+x64-windows/include/boost/mpl/aux_/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/begin_end_impl.hpp
+x64-windows/include/boost/mpl/aux_/clear_impl.hpp
+x64-windows/include/boost/mpl/aux_/common_name_wknd.hpp
+x64-windows/include/boost/mpl/aux_/comparison_op.hpp
+x64-windows/include/boost/mpl/aux_/config/
+x64-windows/include/boost/mpl/aux_/config/adl.hpp
+x64-windows/include/boost/mpl/aux_/config/arrays.hpp
+x64-windows/include/boost/mpl/aux_/config/bcc.hpp
+x64-windows/include/boost/mpl/aux_/config/bind.hpp
+x64-windows/include/boost/mpl/aux_/config/compiler.hpp
+x64-windows/include/boost/mpl/aux_/config/ctps.hpp
+x64-windows/include/boost/mpl/aux_/config/dependent_nttp.hpp
+x64-windows/include/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp
+x64-windows/include/boost/mpl/aux_/config/dtp.hpp
+x64-windows/include/boost/mpl/aux_/config/eti.hpp
+x64-windows/include/boost/mpl/aux_/config/forwarding.hpp
+x64-windows/include/boost/mpl/aux_/config/gcc.hpp
+x64-windows/include/boost/mpl/aux_/config/gpu.hpp
+x64-windows/include/boost/mpl/aux_/config/has_apply.hpp
+x64-windows/include/boost/mpl/aux_/config/has_xxx.hpp
+x64-windows/include/boost/mpl/aux_/config/integral.hpp
+x64-windows/include/boost/mpl/aux_/config/intel.hpp
+x64-windows/include/boost/mpl/aux_/config/lambda.hpp
+x64-windows/include/boost/mpl/aux_/config/msvc.hpp
+x64-windows/include/boost/mpl/aux_/config/msvc_typename.hpp
+x64-windows/include/boost/mpl/aux_/config/nttp.hpp
+x64-windows/include/boost/mpl/aux_/config/operators.hpp
+x64-windows/include/boost/mpl/aux_/config/overload_resolution.hpp
+x64-windows/include/boost/mpl/aux_/config/pp_counter.hpp
+x64-windows/include/boost/mpl/aux_/config/preprocessor.hpp
+x64-windows/include/boost/mpl/aux_/config/static_constant.hpp
+x64-windows/include/boost/mpl/aux_/config/ttp.hpp
+x64-windows/include/boost/mpl/aux_/config/typeof.hpp
+x64-windows/include/boost/mpl/aux_/config/use_preprocessed.hpp
+x64-windows/include/boost/mpl/aux_/config/workaround.hpp
+x64-windows/include/boost/mpl/aux_/contains_impl.hpp
+x64-windows/include/boost/mpl/aux_/count_args.hpp
+x64-windows/include/boost/mpl/aux_/count_impl.hpp
+x64-windows/include/boost/mpl/aux_/empty_impl.hpp
+x64-windows/include/boost/mpl/aux_/erase_impl.hpp
+x64-windows/include/boost/mpl/aux_/erase_key_impl.hpp
+x64-windows/include/boost/mpl/aux_/filter_iter.hpp
+x64-windows/include/boost/mpl/aux_/find_if_pred.hpp
+x64-windows/include/boost/mpl/aux_/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/fold_impl_body.hpp
+x64-windows/include/boost/mpl/aux_/fold_op.hpp
+x64-windows/include/boost/mpl/aux_/fold_pred.hpp
+x64-windows/include/boost/mpl/aux_/front_impl.hpp
+x64-windows/include/boost/mpl/aux_/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/has_apply.hpp
+x64-windows/include/boost/mpl/aux_/has_begin.hpp
+x64-windows/include/boost/mpl/aux_/has_key_impl.hpp
+x64-windows/include/boost/mpl/aux_/has_rebind.hpp
+x64-windows/include/boost/mpl/aux_/has_size.hpp
+x64-windows/include/boost/mpl/aux_/has_tag.hpp
+x64-windows/include/boost/mpl/aux_/has_type.hpp
+x64-windows/include/boost/mpl/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/aux_/insert_impl.hpp
+x64-windows/include/boost/mpl/aux_/insert_range_impl.hpp
+x64-windows/include/boost/mpl/aux_/inserter_algorithm.hpp
+x64-windows/include/boost/mpl/aux_/integral_wrapper.hpp
+x64-windows/include/boost/mpl/aux_/is_msvc_eti_arg.hpp
+x64-windows/include/boost/mpl/aux_/iter_apply.hpp
+x64-windows/include/boost/mpl/aux_/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/iter_push_front.hpp
+x64-windows/include/boost/mpl/aux_/joint_iter.hpp
+x64-windows/include/boost/mpl/aux_/lambda_arity_param.hpp
+x64-windows/include/boost/mpl/aux_/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/lambda_spec.hpp
+x64-windows/include/boost/mpl/aux_/lambda_support.hpp
+x64-windows/include/boost/mpl/aux_/largest_int.hpp
+x64-windows/include/boost/mpl/aux_/logical_op.hpp
+x64-windows/include/boost/mpl/aux_/msvc_dtw.hpp
+x64-windows/include/boost/mpl/aux_/msvc_eti_base.hpp
+x64-windows/include/boost/mpl/aux_/msvc_is_class.hpp
+x64-windows/include/boost/mpl/aux_/msvc_never_true.hpp
+x64-windows/include/boost/mpl/aux_/msvc_type.hpp
+x64-windows/include/boost/mpl/aux_/na.hpp
+x64-windows/include/boost/mpl/aux_/na_assert.hpp
+x64-windows/include/boost/mpl/aux_/na_fwd.hpp
+x64-windows/include/boost/mpl/aux_/na_spec.hpp
+x64-windows/include/boost/mpl/aux_/nested_type_wknd.hpp
+x64-windows/include/boost/mpl/aux_/nttp_decl.hpp
+x64-windows/include/boost/mpl/aux_/numeric_cast_utils.hpp
+x64-windows/include/boost/mpl/aux_/numeric_op.hpp
+x64-windows/include/boost/mpl/aux_/order_impl.hpp
+x64-windows/include/boost/mpl/aux_/overload_names.hpp
+x64-windows/include/boost/mpl/aux_/partition_op.hpp
+x64-windows/include/boost/mpl/aux_/pop_back_impl.hpp
+x64-windows/include/boost/mpl/aux_/pop_front_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc551/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/dmc/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/gcc/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/mwcw/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/no_ttp/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/advance_forward.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/and.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/apply.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/arg.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bind.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/deque.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/divides.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/full_lambda.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/greater.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/inherit.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/iter_fold_if_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/less.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/list.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/list_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/map.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/minus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/or.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/placeholders.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/plus.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/quote.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/set.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/set_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/times.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/vector.hpp
+x64-windows/include/boost/mpl/aux_/preprocessed/plain/vector_c.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/
+x64-windows/include/boost/mpl/aux_/preprocessor/add.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/def_params_tail.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/default_params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/enum.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/ext_params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/filter_params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/is_seq.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/partial_spec_params.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/range.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/repeat.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/sub.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/token_equal.hpp
+x64-windows/include/boost/mpl/aux_/preprocessor/tuple.hpp
+x64-windows/include/boost/mpl/aux_/ptr_to_ref.hpp
+x64-windows/include/boost/mpl/aux_/push_back_impl.hpp
+x64-windows/include/boost/mpl/aux_/push_front_impl.hpp
+x64-windows/include/boost/mpl/aux_/range_c/
+x64-windows/include/boost/mpl/aux_/range_c/O1_size.hpp
+x64-windows/include/boost/mpl/aux_/range_c/back.hpp
+x64-windows/include/boost/mpl/aux_/range_c/empty.hpp
+x64-windows/include/boost/mpl/aux_/range_c/front.hpp
+x64-windows/include/boost/mpl/aux_/range_c/iterator.hpp
+x64-windows/include/boost/mpl/aux_/range_c/size.hpp
+x64-windows/include/boost/mpl/aux_/range_c/tag.hpp
+x64-windows/include/boost/mpl/aux_/reverse_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/reverse_fold_impl_body.hpp
+x64-windows/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp
+x64-windows/include/boost/mpl/aux_/sequence_wrapper.hpp
+x64-windows/include/boost/mpl/aux_/shift_op.hpp
+x64-windows/include/boost/mpl/aux_/single_element_iter.hpp
+x64-windows/include/boost/mpl/aux_/size_impl.hpp
+x64-windows/include/boost/mpl/aux_/sort_impl.hpp
+x64-windows/include/boost/mpl/aux_/static_cast.hpp
+x64-windows/include/boost/mpl/aux_/template_arity.hpp
+x64-windows/include/boost/mpl/aux_/template_arity_fwd.hpp
+x64-windows/include/boost/mpl/aux_/test.hpp
+x64-windows/include/boost/mpl/aux_/test/
+x64-windows/include/boost/mpl/aux_/test/assert.hpp
+x64-windows/include/boost/mpl/aux_/test/data.hpp
+x64-windows/include/boost/mpl/aux_/test/test_case.hpp
+x64-windows/include/boost/mpl/aux_/traits_lambda_spec.hpp
+x64-windows/include/boost/mpl/aux_/transform_iter.hpp
+x64-windows/include/boost/mpl/aux_/type_wrapper.hpp
+x64-windows/include/boost/mpl/aux_/unwrap.hpp
+x64-windows/include/boost/mpl/aux_/value_wknd.hpp
+x64-windows/include/boost/mpl/aux_/yes_no.hpp
+x64-windows/include/boost/mpl/back.hpp
+x64-windows/include/boost/mpl/back_fwd.hpp
+x64-windows/include/boost/mpl/back_inserter.hpp
+x64-windows/include/boost/mpl/base.hpp
+x64-windows/include/boost/mpl/begin.hpp
+x64-windows/include/boost/mpl/begin_end.hpp
+x64-windows/include/boost/mpl/begin_end_fwd.hpp
+x64-windows/include/boost/mpl/bind.hpp
+x64-windows/include/boost/mpl/bind_fwd.hpp
+x64-windows/include/boost/mpl/bitand.hpp
+x64-windows/include/boost/mpl/bitor.hpp
+x64-windows/include/boost/mpl/bitwise.hpp
+x64-windows/include/boost/mpl/bitxor.hpp
+x64-windows/include/boost/mpl/bool.hpp
+x64-windows/include/boost/mpl/bool_fwd.hpp
+x64-windows/include/boost/mpl/char.hpp
+x64-windows/include/boost/mpl/char_fwd.hpp
+x64-windows/include/boost/mpl/clear.hpp
+x64-windows/include/boost/mpl/clear_fwd.hpp
+x64-windows/include/boost/mpl/comparison.hpp
+x64-windows/include/boost/mpl/contains.hpp
+x64-windows/include/boost/mpl/contains_fwd.hpp
+x64-windows/include/boost/mpl/copy.hpp
+x64-windows/include/boost/mpl/copy_if.hpp
+x64-windows/include/boost/mpl/count.hpp
+x64-windows/include/boost/mpl/count_fwd.hpp
+x64-windows/include/boost/mpl/count_if.hpp
+x64-windows/include/boost/mpl/deque.hpp
+x64-windows/include/boost/mpl/deref.hpp
+x64-windows/include/boost/mpl/distance.hpp
+x64-windows/include/boost/mpl/distance_fwd.hpp
+x64-windows/include/boost/mpl/divides.hpp
+x64-windows/include/boost/mpl/empty.hpp
+x64-windows/include/boost/mpl/empty_base.hpp
+x64-windows/include/boost/mpl/empty_fwd.hpp
+x64-windows/include/boost/mpl/empty_sequence.hpp
+x64-windows/include/boost/mpl/end.hpp
+x64-windows/include/boost/mpl/equal.hpp
+x64-windows/include/boost/mpl/equal_to.hpp
+x64-windows/include/boost/mpl/erase.hpp
+x64-windows/include/boost/mpl/erase_fwd.hpp
+x64-windows/include/boost/mpl/erase_key.hpp
+x64-windows/include/boost/mpl/erase_key_fwd.hpp
+x64-windows/include/boost/mpl/eval_if.hpp
+x64-windows/include/boost/mpl/filter_view.hpp
+x64-windows/include/boost/mpl/find.hpp
+x64-windows/include/boost/mpl/find_if.hpp
+x64-windows/include/boost/mpl/fold.hpp
+x64-windows/include/boost/mpl/for_each.hpp
+x64-windows/include/boost/mpl/front.hpp
+x64-windows/include/boost/mpl/front_fwd.hpp
+x64-windows/include/boost/mpl/front_inserter.hpp
+x64-windows/include/boost/mpl/get_tag.hpp
+x64-windows/include/boost/mpl/greater.hpp
+x64-windows/include/boost/mpl/greater_equal.hpp
+x64-windows/include/boost/mpl/has_key.hpp
+x64-windows/include/boost/mpl/has_key_fwd.hpp
+x64-windows/include/boost/mpl/has_xxx.hpp
+x64-windows/include/boost/mpl/identity.hpp
+x64-windows/include/boost/mpl/if.hpp
+x64-windows/include/boost/mpl/index_if.hpp
+x64-windows/include/boost/mpl/index_of.hpp
+x64-windows/include/boost/mpl/inherit.hpp
+x64-windows/include/boost/mpl/inherit_linearly.hpp
+x64-windows/include/boost/mpl/insert.hpp
+x64-windows/include/boost/mpl/insert_fwd.hpp
+x64-windows/include/boost/mpl/insert_range.hpp
+x64-windows/include/boost/mpl/insert_range_fwd.hpp
+x64-windows/include/boost/mpl/inserter.hpp
+x64-windows/include/boost/mpl/int.hpp
+x64-windows/include/boost/mpl/int_fwd.hpp
+x64-windows/include/boost/mpl/integral_c.hpp
+x64-windows/include/boost/mpl/integral_c_fwd.hpp
+x64-windows/include/boost/mpl/integral_c_tag.hpp
+x64-windows/include/boost/mpl/is_placeholder.hpp
+x64-windows/include/boost/mpl/is_sequence.hpp
+x64-windows/include/boost/mpl/iter_fold.hpp
+x64-windows/include/boost/mpl/iter_fold_if.hpp
+x64-windows/include/boost/mpl/iterator_category.hpp
+x64-windows/include/boost/mpl/iterator_range.hpp
+x64-windows/include/boost/mpl/iterator_tags.hpp
+x64-windows/include/boost/mpl/joint_view.hpp
+x64-windows/include/boost/mpl/key_type.hpp
+x64-windows/include/boost/mpl/key_type_fwd.hpp
+x64-windows/include/boost/mpl/lambda.hpp
+x64-windows/include/boost/mpl/lambda_fwd.hpp
+x64-windows/include/boost/mpl/less.hpp
+x64-windows/include/boost/mpl/less_equal.hpp
+x64-windows/include/boost/mpl/limits/
+x64-windows/include/boost/mpl/limits/arity.hpp
+x64-windows/include/boost/mpl/limits/list.hpp
+x64-windows/include/boost/mpl/limits/map.hpp
+x64-windows/include/boost/mpl/limits/set.hpp
+x64-windows/include/boost/mpl/limits/string.hpp
+x64-windows/include/boost/mpl/limits/unrolling.hpp
+x64-windows/include/boost/mpl/limits/vector.hpp
+x64-windows/include/boost/mpl/list.hpp
+x64-windows/include/boost/mpl/list/
+x64-windows/include/boost/mpl/list/aux_/
+x64-windows/include/boost/mpl/list/aux_/O1_size.hpp
+x64-windows/include/boost/mpl/list/aux_/begin_end.hpp
+x64-windows/include/boost/mpl/list/aux_/clear.hpp
+x64-windows/include/boost/mpl/list/aux_/empty.hpp
+x64-windows/include/boost/mpl/list/aux_/front.hpp
+x64-windows/include/boost/mpl/list/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/list/aux_/item.hpp
+x64-windows/include/boost/mpl/list/aux_/iterator.hpp
+x64-windows/include/boost/mpl/list/aux_/numbered.hpp
+x64-windows/include/boost/mpl/list/aux_/numbered_c.hpp
+x64-windows/include/boost/mpl/list/aux_/pop_front.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list10.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list10_c.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list20.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list20_c.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list30.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list30_c.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list40.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list40_c.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list50.hpp
+x64-windows/include/boost/mpl/list/aux_/preprocessed/plain/list50_c.hpp
+x64-windows/include/boost/mpl/list/aux_/push_back.hpp
+x64-windows/include/boost/mpl/list/aux_/push_front.hpp
+x64-windows/include/boost/mpl/list/aux_/size.hpp
+x64-windows/include/boost/mpl/list/aux_/tag.hpp
+x64-windows/include/boost/mpl/list/list0.hpp
+x64-windows/include/boost/mpl/list/list0_c.hpp
+x64-windows/include/boost/mpl/list/list10.hpp
+x64-windows/include/boost/mpl/list/list10_c.hpp
+x64-windows/include/boost/mpl/list/list20.hpp
+x64-windows/include/boost/mpl/list/list20_c.hpp
+x64-windows/include/boost/mpl/list/list30.hpp
+x64-windows/include/boost/mpl/list/list30_c.hpp
+x64-windows/include/boost/mpl/list/list40.hpp
+x64-windows/include/boost/mpl/list/list40_c.hpp
+x64-windows/include/boost/mpl/list/list50.hpp
+x64-windows/include/boost/mpl/list/list50_c.hpp
+x64-windows/include/boost/mpl/list_c.hpp
+x64-windows/include/boost/mpl/logical.hpp
+x64-windows/include/boost/mpl/long.hpp
+x64-windows/include/boost/mpl/long_fwd.hpp
+x64-windows/include/boost/mpl/lower_bound.hpp
+x64-windows/include/boost/mpl/map.hpp
+x64-windows/include/boost/mpl/map/
+x64-windows/include/boost/mpl/map/aux_/
+x64-windows/include/boost/mpl/map/aux_/at_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/begin_end_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/clear_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/contains_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/empty_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/erase_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/erase_key_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/has_key_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/map/aux_/insert_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/insert_range_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/item.hpp
+x64-windows/include/boost/mpl/map/aux_/iterator.hpp
+x64-windows/include/boost/mpl/map/aux_/key_type_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/map0.hpp
+x64-windows/include/boost/mpl/map/aux_/numbered.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map10.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map20.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map30.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map40.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/no_ctps/map50.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map10.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map20.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map30.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map40.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/plain/map50.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map10.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map20.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map30.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map40.hpp
+x64-windows/include/boost/mpl/map/aux_/preprocessed/typeof_based/map50.hpp
+x64-windows/include/boost/mpl/map/aux_/size_impl.hpp
+x64-windows/include/boost/mpl/map/aux_/tag.hpp
+x64-windows/include/boost/mpl/map/aux_/value_type_impl.hpp
+x64-windows/include/boost/mpl/map/map0.hpp
+x64-windows/include/boost/mpl/map/map10.hpp
+x64-windows/include/boost/mpl/map/map20.hpp
+x64-windows/include/boost/mpl/map/map30.hpp
+x64-windows/include/boost/mpl/map/map40.hpp
+x64-windows/include/boost/mpl/map/map50.hpp
+x64-windows/include/boost/mpl/math/
+x64-windows/include/boost/mpl/math/fixed_c.hpp
+x64-windows/include/boost/mpl/math/is_even.hpp
+x64-windows/include/boost/mpl/math/rational_c.hpp
+x64-windows/include/boost/mpl/max.hpp
+x64-windows/include/boost/mpl/max_element.hpp
+x64-windows/include/boost/mpl/min.hpp
+x64-windows/include/boost/mpl/min_element.hpp
+x64-windows/include/boost/mpl/min_max.hpp
+x64-windows/include/boost/mpl/minus.hpp
+x64-windows/include/boost/mpl/modulus.hpp
+x64-windows/include/boost/mpl/multiplies.hpp
+x64-windows/include/boost/mpl/multiset/
+x64-windows/include/boost/mpl/multiset/aux_/
+x64-windows/include/boost/mpl/multiset/aux_/count_impl.hpp
+x64-windows/include/boost/mpl/multiset/aux_/insert_impl.hpp
+x64-windows/include/boost/mpl/multiset/aux_/item.hpp
+x64-windows/include/boost/mpl/multiset/aux_/multiset0.hpp
+x64-windows/include/boost/mpl/multiset/aux_/tag.hpp
+x64-windows/include/boost/mpl/multiset/multiset0.hpp
+x64-windows/include/boost/mpl/negate.hpp
+x64-windows/include/boost/mpl/next.hpp
+x64-windows/include/boost/mpl/next_prior.hpp
+x64-windows/include/boost/mpl/not.hpp
+x64-windows/include/boost/mpl/not_equal_to.hpp
+x64-windows/include/boost/mpl/numeric_cast.hpp
+x64-windows/include/boost/mpl/or.hpp
+x64-windows/include/boost/mpl/order.hpp
+x64-windows/include/boost/mpl/order_fwd.hpp
+x64-windows/include/boost/mpl/pair.hpp
+x64-windows/include/boost/mpl/pair_view.hpp
+x64-windows/include/boost/mpl/partition.hpp
+x64-windows/include/boost/mpl/placeholders.hpp
+x64-windows/include/boost/mpl/plus.hpp
+x64-windows/include/boost/mpl/pop_back.hpp
+x64-windows/include/boost/mpl/pop_back_fwd.hpp
+x64-windows/include/boost/mpl/pop_front.hpp
+x64-windows/include/boost/mpl/pop_front_fwd.hpp
+x64-windows/include/boost/mpl/print.hpp
+x64-windows/include/boost/mpl/prior.hpp
+x64-windows/include/boost/mpl/protect.hpp
+x64-windows/include/boost/mpl/push_back.hpp
+x64-windows/include/boost/mpl/push_back_fwd.hpp
+x64-windows/include/boost/mpl/push_front.hpp
+x64-windows/include/boost/mpl/push_front_fwd.hpp
+x64-windows/include/boost/mpl/quote.hpp
+x64-windows/include/boost/mpl/range_c.hpp
+x64-windows/include/boost/mpl/remove.hpp
+x64-windows/include/boost/mpl/remove_if.hpp
+x64-windows/include/boost/mpl/replace.hpp
+x64-windows/include/boost/mpl/replace_if.hpp
+x64-windows/include/boost/mpl/reverse.hpp
+x64-windows/include/boost/mpl/reverse_fold.hpp
+x64-windows/include/boost/mpl/reverse_iter_fold.hpp
+x64-windows/include/boost/mpl/same_as.hpp
+x64-windows/include/boost/mpl/sequence_tag.hpp
+x64-windows/include/boost/mpl/sequence_tag_fwd.hpp
+x64-windows/include/boost/mpl/set.hpp
+x64-windows/include/boost/mpl/set/
+x64-windows/include/boost/mpl/set/aux_/
+x64-windows/include/boost/mpl/set/aux_/at_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/begin_end_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/clear_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/empty_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/erase_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/erase_key_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/has_key_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/set/aux_/insert_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/insert_range_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/item.hpp
+x64-windows/include/boost/mpl/set/aux_/iterator.hpp
+x64-windows/include/boost/mpl/set/aux_/key_type_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/numbered.hpp
+x64-windows/include/boost/mpl/set/aux_/numbered_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set10.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set10_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set20.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set20_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set30.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set30_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set40.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set40_c.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set50.hpp
+x64-windows/include/boost/mpl/set/aux_/preprocessed/plain/set50_c.hpp
+x64-windows/include/boost/mpl/set/aux_/set0.hpp
+x64-windows/include/boost/mpl/set/aux_/size_impl.hpp
+x64-windows/include/boost/mpl/set/aux_/tag.hpp
+x64-windows/include/boost/mpl/set/aux_/value_type_impl.hpp
+x64-windows/include/boost/mpl/set/set0.hpp
+x64-windows/include/boost/mpl/set/set0_c.hpp
+x64-windows/include/boost/mpl/set/set10.hpp
+x64-windows/include/boost/mpl/set/set10_c.hpp
+x64-windows/include/boost/mpl/set/set20.hpp
+x64-windows/include/boost/mpl/set/set20_c.hpp
+x64-windows/include/boost/mpl/set/set30.hpp
+x64-windows/include/boost/mpl/set/set30_c.hpp
+x64-windows/include/boost/mpl/set/set40.hpp
+x64-windows/include/boost/mpl/set/set40_c.hpp
+x64-windows/include/boost/mpl/set/set50.hpp
+x64-windows/include/boost/mpl/set/set50_c.hpp
+x64-windows/include/boost/mpl/set_c.hpp
+x64-windows/include/boost/mpl/shift_left.hpp
+x64-windows/include/boost/mpl/shift_right.hpp
+x64-windows/include/boost/mpl/single_view.hpp
+x64-windows/include/boost/mpl/size.hpp
+x64-windows/include/boost/mpl/size_fwd.hpp
+x64-windows/include/boost/mpl/size_t.hpp
+x64-windows/include/boost/mpl/size_t_fwd.hpp
+x64-windows/include/boost/mpl/sizeof.hpp
+x64-windows/include/boost/mpl/sort.hpp
+x64-windows/include/boost/mpl/stable_partition.hpp
+x64-windows/include/boost/mpl/string.hpp
+x64-windows/include/boost/mpl/switch.hpp
+x64-windows/include/boost/mpl/tag.hpp
+x64-windows/include/boost/mpl/times.hpp
+x64-windows/include/boost/mpl/transform.hpp
+x64-windows/include/boost/mpl/transform_view.hpp
+x64-windows/include/boost/mpl/unique.hpp
+x64-windows/include/boost/mpl/unpack_args.hpp
+x64-windows/include/boost/mpl/upper_bound.hpp
+x64-windows/include/boost/mpl/value_type.hpp
+x64-windows/include/boost/mpl/value_type_fwd.hpp
+x64-windows/include/boost/mpl/vector.hpp
+x64-windows/include/boost/mpl/vector/
+x64-windows/include/boost/mpl/vector/aux_/
+x64-windows/include/boost/mpl/vector/aux_/O1_size.hpp
+x64-windows/include/boost/mpl/vector/aux_/at.hpp
+x64-windows/include/boost/mpl/vector/aux_/back.hpp
+x64-windows/include/boost/mpl/vector/aux_/begin_end.hpp
+x64-windows/include/boost/mpl/vector/aux_/clear.hpp
+x64-windows/include/boost/mpl/vector/aux_/empty.hpp
+x64-windows/include/boost/mpl/vector/aux_/front.hpp
+x64-windows/include/boost/mpl/vector/aux_/include_preprocessed.hpp
+x64-windows/include/boost/mpl/vector/aux_/item.hpp
+x64-windows/include/boost/mpl/vector/aux_/iterator.hpp
+x64-windows/include/boost/mpl/vector/aux_/numbered.hpp
+x64-windows/include/boost/mpl/vector/aux_/numbered_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/pop_back.hpp
+x64-windows/include/boost/mpl/vector/aux_/pop_front.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector10_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector20_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector30.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector30_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector40.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector40_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector50.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/plain/vector50_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50.hpp
+x64-windows/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50_c.hpp
+x64-windows/include/boost/mpl/vector/aux_/push_back.hpp
+x64-windows/include/boost/mpl/vector/aux_/push_front.hpp
+x64-windows/include/boost/mpl/vector/aux_/size.hpp
+x64-windows/include/boost/mpl/vector/aux_/tag.hpp
+x64-windows/include/boost/mpl/vector/aux_/vector0.hpp
+x64-windows/include/boost/mpl/vector/vector0.hpp
+x64-windows/include/boost/mpl/vector/vector0_c.hpp
+x64-windows/include/boost/mpl/vector/vector10.hpp
+x64-windows/include/boost/mpl/vector/vector10_c.hpp
+x64-windows/include/boost/mpl/vector/vector20.hpp
+x64-windows/include/boost/mpl/vector/vector20_c.hpp
+x64-windows/include/boost/mpl/vector/vector30.hpp
+x64-windows/include/boost/mpl/vector/vector30_c.hpp
+x64-windows/include/boost/mpl/vector/vector40.hpp
+x64-windows/include/boost/mpl/vector/vector40_c.hpp
+x64-windows/include/boost/mpl/vector/vector50.hpp
+x64-windows/include/boost/mpl/vector/vector50_c.hpp
+x64-windows/include/boost/mpl/vector_c.hpp
+x64-windows/include/boost/mpl/void.hpp
+x64-windows/include/boost/mpl/void_fwd.hpp
+x64-windows/include/boost/mpl/zip_view.hpp
+x64-windows/share/
+x64-windows/share/boost-mpl/
+x64-windows/share/boost-mpl/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-multi-index_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,83 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/multi_index/
+x64-windows/include/boost/multi_index/composite_key.hpp
+x64-windows/include/boost/multi_index/detail/
+x64-windows/include/boost/multi_index/detail/access_specifier.hpp
+x64-windows/include/boost/multi_index/detail/adl_swap.hpp
+x64-windows/include/boost/multi_index/detail/archive_constructed.hpp
+x64-windows/include/boost/multi_index/detail/auto_space.hpp
+x64-windows/include/boost/multi_index/detail/base_type.hpp
+x64-windows/include/boost/multi_index/detail/bidir_node_iterator.hpp
+x64-windows/include/boost/multi_index/detail/bucket_array.hpp
+x64-windows/include/boost/multi_index/detail/cons_stdtuple.hpp
+x64-windows/include/boost/multi_index/detail/converter.hpp
+x64-windows/include/boost/multi_index/detail/copy_map.hpp
+x64-windows/include/boost/multi_index/detail/do_not_copy_elements_tag.hpp
+x64-windows/include/boost/multi_index/detail/duplicates_iterator.hpp
+x64-windows/include/boost/multi_index/detail/has_tag.hpp
+x64-windows/include/boost/multi_index/detail/hash_index_args.hpp
+x64-windows/include/boost/multi_index/detail/hash_index_iterator.hpp
+x64-windows/include/boost/multi_index/detail/hash_index_node.hpp
+x64-windows/include/boost/multi_index/detail/header_holder.hpp
+x64-windows/include/boost/multi_index/detail/ignore_wstrict_aliasing.hpp
+x64-windows/include/boost/multi_index/detail/index_base.hpp
+x64-windows/include/boost/multi_index/detail/index_loader.hpp
+x64-windows/include/boost/multi_index/detail/index_matcher.hpp
+x64-windows/include/boost/multi_index/detail/index_node_base.hpp
+x64-windows/include/boost/multi_index/detail/index_saver.hpp
+x64-windows/include/boost/multi_index/detail/invariant_assert.hpp
+x64-windows/include/boost/multi_index/detail/is_index_list.hpp
+x64-windows/include/boost/multi_index/detail/is_transparent.hpp
+x64-windows/include/boost/multi_index/detail/iter_adaptor.hpp
+x64-windows/include/boost/multi_index/detail/modify_key_adaptor.hpp
+x64-windows/include/boost/multi_index/detail/no_duplicate_tags.hpp
+x64-windows/include/boost/multi_index/detail/node_type.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_args.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_impl.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_impl_fwd.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_node.hpp
+x64-windows/include/boost/multi_index/detail/ord_index_ops.hpp
+x64-windows/include/boost/multi_index/detail/promotes_arg.hpp
+x64-windows/include/boost/multi_index/detail/raw_ptr.hpp
+x64-windows/include/boost/multi_index/detail/restore_wstrict_aliasing.hpp
+x64-windows/include/boost/multi_index/detail/rnd_index_loader.hpp
+x64-windows/include/boost/multi_index/detail/rnd_index_node.hpp
+x64-windows/include/boost/multi_index/detail/rnd_index_ops.hpp
+x64-windows/include/boost/multi_index/detail/rnd_index_ptr_array.hpp
+x64-windows/include/boost/multi_index/detail/rnd_node_iterator.hpp
+x64-windows/include/boost/multi_index/detail/rnk_index_ops.hpp
+x64-windows/include/boost/multi_index/detail/safe_mode.hpp
+x64-windows/include/boost/multi_index/detail/scope_guard.hpp
+x64-windows/include/boost/multi_index/detail/seq_index_node.hpp
+x64-windows/include/boost/multi_index/detail/seq_index_ops.hpp
+x64-windows/include/boost/multi_index/detail/serialization_version.hpp
+x64-windows/include/boost/multi_index/detail/uintptr_type.hpp
+x64-windows/include/boost/multi_index/detail/unbounded.hpp
+x64-windows/include/boost/multi_index/detail/value_compare.hpp
+x64-windows/include/boost/multi_index/detail/vartempl_support.hpp
+x64-windows/include/boost/multi_index/global_fun.hpp
+x64-windows/include/boost/multi_index/hashed_index.hpp
+x64-windows/include/boost/multi_index/hashed_index_fwd.hpp
+x64-windows/include/boost/multi_index/identity.hpp
+x64-windows/include/boost/multi_index/identity_fwd.hpp
+x64-windows/include/boost/multi_index/indexed_by.hpp
+x64-windows/include/boost/multi_index/key_extractors.hpp
+x64-windows/include/boost/multi_index/mem_fun.hpp
+x64-windows/include/boost/multi_index/member.hpp
+x64-windows/include/boost/multi_index/ordered_index.hpp
+x64-windows/include/boost/multi_index/ordered_index_fwd.hpp
+x64-windows/include/boost/multi_index/random_access_index.hpp
+x64-windows/include/boost/multi_index/random_access_index_fwd.hpp
+x64-windows/include/boost/multi_index/ranked_index.hpp
+x64-windows/include/boost/multi_index/ranked_index_fwd.hpp
+x64-windows/include/boost/multi_index/safe_mode_errors.hpp
+x64-windows/include/boost/multi_index/sequenced_index.hpp
+x64-windows/include/boost/multi_index/sequenced_index_fwd.hpp
+x64-windows/include/boost/multi_index/tag.hpp
+x64-windows/include/boost/multi_index_container.hpp
+x64-windows/include/boost/multi_index_container_fwd.hpp
+x64-windows/share/
+x64-windows/share/boost-multi-index/
+x64-windows/share/boost-multi-index/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-multiprecision_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,68 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/multiprecision/
+x64-windows/include/boost/multiprecision/concepts/
+x64-windows/include/boost/multiprecision/concepts/mp_number_archetypes.hpp
+x64-windows/include/boost/multiprecision/cpp_bin_float.hpp
+x64-windows/include/boost/multiprecision/cpp_bin_float/
+x64-windows/include/boost/multiprecision/cpp_bin_float/io.hpp
+x64-windows/include/boost/multiprecision/cpp_bin_float/transcendental.hpp
+x64-windows/include/boost/multiprecision/cpp_dec_float.hpp
+x64-windows/include/boost/multiprecision/cpp_int.hpp
+x64-windows/include/boost/multiprecision/cpp_int/
+x64-windows/include/boost/multiprecision/cpp_int/add.hpp
+x64-windows/include/boost/multiprecision/cpp_int/bitwise.hpp
+x64-windows/include/boost/multiprecision/cpp_int/checked.hpp
+x64-windows/include/boost/multiprecision/cpp_int/comparison.hpp
+x64-windows/include/boost/multiprecision/cpp_int/cpp_int_config.hpp
+x64-windows/include/boost/multiprecision/cpp_int/divide.hpp
+x64-windows/include/boost/multiprecision/cpp_int/import_export.hpp
+x64-windows/include/boost/multiprecision/cpp_int/limits.hpp
+x64-windows/include/boost/multiprecision/cpp_int/literals.hpp
+x64-windows/include/boost/multiprecision/cpp_int/misc.hpp
+x64-windows/include/boost/multiprecision/cpp_int/multiply.hpp
+x64-windows/include/boost/multiprecision/cpp_int/serialize.hpp
+x64-windows/include/boost/multiprecision/cpp_int/value_pack.hpp
+x64-windows/include/boost/multiprecision/debug_adaptor.hpp
+x64-windows/include/boost/multiprecision/detail/
+x64-windows/include/boost/multiprecision/detail/big_lanczos.hpp
+x64-windows/include/boost/multiprecision/detail/bitscan.hpp
+x64-windows/include/boost/multiprecision/detail/default_ops.hpp
+x64-windows/include/boost/multiprecision/detail/digits.hpp
+x64-windows/include/boost/multiprecision/detail/dynamic_array.hpp
+x64-windows/include/boost/multiprecision/detail/et_ops.hpp
+x64-windows/include/boost/multiprecision/detail/float_string_cvt.hpp
+x64-windows/include/boost/multiprecision/detail/functions/
+x64-windows/include/boost/multiprecision/detail/functions/constants.hpp
+x64-windows/include/boost/multiprecision/detail/functions/pow.hpp
+x64-windows/include/boost/multiprecision/detail/functions/trig.hpp
+x64-windows/include/boost/multiprecision/detail/generic_interconvert.hpp
+x64-windows/include/boost/multiprecision/detail/integer_ops.hpp
+x64-windows/include/boost/multiprecision/detail/min_max.hpp
+x64-windows/include/boost/multiprecision/detail/no_et_ops.hpp
+x64-windows/include/boost/multiprecision/detail/number_base.hpp
+x64-windows/include/boost/multiprecision/detail/number_compare.hpp
+x64-windows/include/boost/multiprecision/detail/rebind.hpp
+x64-windows/include/boost/multiprecision/detail/ublas_interop.hpp
+x64-windows/include/boost/multiprecision/detail/utype_helper.hpp
+x64-windows/include/boost/multiprecision/float128.hpp
+x64-windows/include/boost/multiprecision/gmp.hpp
+x64-windows/include/boost/multiprecision/integer.hpp
+x64-windows/include/boost/multiprecision/logged_adaptor.hpp
+x64-windows/include/boost/multiprecision/miller_rabin.hpp
+x64-windows/include/boost/multiprecision/mpfi.hpp
+x64-windows/include/boost/multiprecision/mpfr.hpp
+x64-windows/include/boost/multiprecision/number.hpp
+x64-windows/include/boost/multiprecision/random.hpp
+x64-windows/include/boost/multiprecision/rational_adaptor.hpp
+x64-windows/include/boost/multiprecision/tommath.hpp
+x64-windows/include/boost/multiprecision/traits/
+x64-windows/include/boost/multiprecision/traits/explicit_conversion.hpp
+x64-windows/include/boost/multiprecision/traits/extract_exponent_type.hpp
+x64-windows/include/boost/multiprecision/traits/is_backend.hpp
+x64-windows/include/boost/multiprecision/traits/is_byte_container.hpp
+x64-windows/include/boost/multiprecision/traits/is_restricted_conversion.hpp
+x64-windows/share/
+x64-windows/share/boost-multiprecision/
+x64-windows/share/boost-multiprecision/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-numeric-conversion_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/cast.hpp
+x64-windows/include/boost/numeric/
+x64-windows/include/boost/numeric/conversion/
+x64-windows/include/boost/numeric/conversion/bounds.hpp
+x64-windows/include/boost/numeric/conversion/cast.hpp
+x64-windows/include/boost/numeric/conversion/conversion_traits.hpp
+x64-windows/include/boost/numeric/conversion/converter.hpp
+x64-windows/include/boost/numeric/conversion/converter_policies.hpp
+x64-windows/include/boost/numeric/conversion/detail/
+x64-windows/include/boost/numeric/conversion/detail/bounds.hpp
+x64-windows/include/boost/numeric/conversion/detail/conversion_traits.hpp
+x64-windows/include/boost/numeric/conversion/detail/converter.hpp
+x64-windows/include/boost/numeric/conversion/detail/int_float_mixture.hpp
+x64-windows/include/boost/numeric/conversion/detail/is_subranged.hpp
+x64-windows/include/boost/numeric/conversion/detail/meta.hpp
+x64-windows/include/boost/numeric/conversion/detail/numeric_cast_traits.hpp
+x64-windows/include/boost/numeric/conversion/detail/old_numeric_cast.hpp
+x64-windows/include/boost/numeric/conversion/detail/preprocessed/
+x64-windows/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp
+x64-windows/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp
+x64-windows/include/boost/numeric/conversion/detail/sign_mixture.hpp
+x64-windows/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
+x64-windows/include/boost/numeric/conversion/int_float_mixture.hpp
+x64-windows/include/boost/numeric/conversion/int_float_mixture_enum.hpp
+x64-windows/include/boost/numeric/conversion/is_subranged.hpp
+x64-windows/include/boost/numeric/conversion/numeric_cast_traits.hpp
+x64-windows/include/boost/numeric/conversion/sign_mixture.hpp
+x64-windows/include/boost/numeric/conversion/sign_mixture_enum.hpp
+x64-windows/include/boost/numeric/conversion/udt_builtin_mixture.hpp
+x64-windows/include/boost/numeric/conversion/udt_builtin_mixture_enum.hpp
+x64-windows/share/
+x64-windows/share/boost-numeric-conversion/
+x64-windows/share/boost-numeric-conversion/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-optional_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/none.hpp
+x64-windows/include/boost/none_t.hpp
+x64-windows/include/boost/optional.hpp
+x64-windows/include/boost/optional/
+x64-windows/include/boost/optional/bad_optional_access.hpp
+x64-windows/include/boost/optional/detail/
+x64-windows/include/boost/optional/detail/experimental_traits.hpp
+x64-windows/include/boost/optional/detail/old_optional_implementation.hpp
+x64-windows/include/boost/optional/detail/optional_aligned_storage.hpp
+x64-windows/include/boost/optional/detail/optional_config.hpp
+x64-windows/include/boost/optional/detail/optional_factory_support.hpp
+x64-windows/include/boost/optional/detail/optional_reference_spec.hpp
+x64-windows/include/boost/optional/detail/optional_relops.hpp
+x64-windows/include/boost/optional/detail/optional_swap.hpp
+x64-windows/include/boost/optional/detail/optional_trivially_copyable_base.hpp
+x64-windows/include/boost/optional/optional.hpp
+x64-windows/include/boost/optional/optional_fwd.hpp
+x64-windows/include/boost/optional/optional_io.hpp
+x64-windows/share/
+x64-windows/share/boost-optional/
+x64-windows/share/boost-optional/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-parameter_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/parameter.hpp
+x64-windows/include/boost/parameter/
+x64-windows/include/boost/parameter/aux_/
+x64-windows/include/boost/parameter/aux_/arg_list.hpp
+x64-windows/include/boost/parameter/aux_/cast.hpp
+x64-windows/include/boost/parameter/aux_/default.hpp
+x64-windows/include/boost/parameter/aux_/is_maybe.hpp
+x64-windows/include/boost/parameter/aux_/maybe.hpp
+x64-windows/include/boost/parameter/aux_/overloads.hpp
+x64-windows/include/boost/parameter/aux_/parameter_requirements.hpp
+x64-windows/include/boost/parameter/aux_/parenthesized_type.hpp
+x64-windows/include/boost/parameter/aux_/preprocessor/
+x64-windows/include/boost/parameter/aux_/preprocessor/flatten.hpp
+x64-windows/include/boost/parameter/aux_/preprocessor/for_each.hpp
+x64-windows/include/boost/parameter/aux_/python/
+x64-windows/include/boost/parameter/aux_/python/invoker.hpp
+x64-windows/include/boost/parameter/aux_/python/invoker_iterate.hpp
+x64-windows/include/boost/parameter/aux_/result_of0.hpp
+x64-windows/include/boost/parameter/aux_/set.hpp
+x64-windows/include/boost/parameter/aux_/tag.hpp
+x64-windows/include/boost/parameter/aux_/tagged_argument.hpp
+x64-windows/include/boost/parameter/aux_/template_keyword.hpp
+x64-windows/include/boost/parameter/aux_/unwrap_cv_reference.hpp
+x64-windows/include/boost/parameter/aux_/void.hpp
+x64-windows/include/boost/parameter/aux_/yesno.hpp
+x64-windows/include/boost/parameter/binding.hpp
+x64-windows/include/boost/parameter/config.hpp
+x64-windows/include/boost/parameter/keyword.hpp
+x64-windows/include/boost/parameter/macros.hpp
+x64-windows/include/boost/parameter/match.hpp
+x64-windows/include/boost/parameter/name.hpp
+x64-windows/include/boost/parameter/parameters.hpp
+x64-windows/include/boost/parameter/preprocessor.hpp
+x64-windows/include/boost/parameter/python.hpp
+x64-windows/include/boost/parameter/value_type.hpp
+x64-windows/share/
+x64-windows/share/boost-parameter/
+x64-windows/share/boost-parameter/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-phoenix_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,393 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/phoenix.hpp
+x64-windows/include/boost/phoenix/
+x64-windows/include/boost/phoenix/bind.hpp
+x64-windows/include/boost/phoenix/bind/
+x64-windows/include/boost/phoenix/bind/bind_function.hpp
+x64-windows/include/boost/phoenix/bind/bind_function_object.hpp
+x64-windows/include/boost/phoenix/bind/bind_member_function.hpp
+x64-windows/include/boost/phoenix/bind/bind_member_variable.hpp
+x64-windows/include/boost/phoenix/bind/detail/
+x64-windows/include/boost/phoenix/bind/detail/cpp03/
+x64-windows/include/boost/phoenix/bind/detail/cpp03/bind_function.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/bind_function_object.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/bind_member_function.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/function_ptr.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/member_function_ptr.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_function_object_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/bind_member_function_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/function_ptr_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_10.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_20.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_30.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_40.hpp
+x64-windows/include/boost/phoenix/bind/detail/cpp03/preprocessed/member_function_ptr_50.hpp
+x64-windows/include/boost/phoenix/bind/detail/member_variable.hpp
+x64-windows/include/boost/phoenix/config.hpp
+x64-windows/include/boost/phoenix/core.hpp
+x64-windows/include/boost/phoenix/core/
+x64-windows/include/boost/phoenix/core/actor.hpp
+x64-windows/include/boost/phoenix/core/argument.hpp
+x64-windows/include/boost/phoenix/core/arity.hpp
+x64-windows/include/boost/phoenix/core/as_actor.hpp
+x64-windows/include/boost/phoenix/core/call.hpp
+x64-windows/include/boost/phoenix/core/debug.hpp
+x64-windows/include/boost/phoenix/core/detail/
+x64-windows/include/boost/phoenix/core/detail/argument.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/
+x64-windows/include/boost/phoenix/core/detail/cpp03/actor_operator.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/actor_result_of.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/call.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/expression.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/function_equal.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/function_eval.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/function_eval_expr.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/phx2_result.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/call_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_50.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_10.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_20.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_30.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_40.hpp
+x64-windows/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_50.hpp
+x64-windows/include/boost/phoenix/core/detail/expression.hpp
+x64-windows/include/boost/phoenix/core/detail/function_eval.hpp
+x64-windows/include/boost/phoenix/core/detail/index_sequence.hpp
+x64-windows/include/boost/phoenix/core/detail/phx2_result.hpp
+x64-windows/include/boost/phoenix/core/domain.hpp
+x64-windows/include/boost/phoenix/core/environment.hpp
+x64-windows/include/boost/phoenix/core/expression.hpp
+x64-windows/include/boost/phoenix/core/function_equal.hpp
+x64-windows/include/boost/phoenix/core/is_actor.hpp
+x64-windows/include/boost/phoenix/core/is_nullary.hpp
+x64-windows/include/boost/phoenix/core/is_value.hpp
+x64-windows/include/boost/phoenix/core/limits.hpp
+x64-windows/include/boost/phoenix/core/meta_grammar.hpp
+x64-windows/include/boost/phoenix/core/nothing.hpp
+x64-windows/include/boost/phoenix/core/reference.hpp
+x64-windows/include/boost/phoenix/core/terminal.hpp
+x64-windows/include/boost/phoenix/core/terminal_fwd.hpp
+x64-windows/include/boost/phoenix/core/v2_eval.hpp
+x64-windows/include/boost/phoenix/core/value.hpp
+x64-windows/include/boost/phoenix/core/visit_each.hpp
+x64-windows/include/boost/phoenix/function.hpp
+x64-windows/include/boost/phoenix/function/
+x64-windows/include/boost/phoenix/function/adapt_callable.hpp
+x64-windows/include/boost/phoenix/function/adapt_function.hpp
+x64-windows/include/boost/phoenix/function/detail/
+x64-windows/include/boost/phoenix/function/detail/cpp03/
+x64-windows/include/boost/phoenix/function/detail/cpp03/function_operator.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_10.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_20.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_30.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_40.hpp
+x64-windows/include/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_50.hpp
+x64-windows/include/boost/phoenix/function/function.hpp
+x64-windows/include/boost/phoenix/function/lazy_list.hpp
+x64-windows/include/boost/phoenix/function/lazy_operator.hpp
+x64-windows/include/boost/phoenix/function/lazy_prelude.hpp
+x64-windows/include/boost/phoenix/function/lazy_reuse.hpp
+x64-windows/include/boost/phoenix/function/lazy_signature.hpp
+x64-windows/include/boost/phoenix/function/lazy_smart.hpp
+x64-windows/include/boost/phoenix/fusion.hpp
+x64-windows/include/boost/phoenix/fusion/
+x64-windows/include/boost/phoenix/fusion/at.hpp
+x64-windows/include/boost/phoenix/object.hpp
+x64-windows/include/boost/phoenix/object/
+x64-windows/include/boost/phoenix/object/const_cast.hpp
+x64-windows/include/boost/phoenix/object/construct.hpp
+x64-windows/include/boost/phoenix/object/delete.hpp
+x64-windows/include/boost/phoenix/object/detail/
+x64-windows/include/boost/phoenix/object/detail/cpp03/
+x64-windows/include/boost/phoenix/object/detail/cpp03/construct.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/construct_eval.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/construct_expr.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/new.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/new_eval.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/new_expr.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_eval_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/construct_expr_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_eval_50.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_10.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_20.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_30.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_40.hpp
+x64-windows/include/boost/phoenix/object/detail/cpp03/preprocessed/new_expr_50.hpp
+x64-windows/include/boost/phoenix/object/detail/target.hpp
+x64-windows/include/boost/phoenix/object/dynamic_cast.hpp
+x64-windows/include/boost/phoenix/object/new.hpp
+x64-windows/include/boost/phoenix/object/reinterpret_cast.hpp
+x64-windows/include/boost/phoenix/object/static_cast.hpp
+x64-windows/include/boost/phoenix/operator.hpp
+x64-windows/include/boost/phoenix/operator/
+x64-windows/include/boost/phoenix/operator/arithmetic.hpp
+x64-windows/include/boost/phoenix/operator/bitwise.hpp
+x64-windows/include/boost/phoenix/operator/comparison.hpp
+x64-windows/include/boost/phoenix/operator/detail/
+x64-windows/include/boost/phoenix/operator/detail/cpp03/
+x64-windows/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_eval.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_eval_result_of.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_expr.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/mem_fun_ptr_gen.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_10.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_20.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_30.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_40.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_50.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_10.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_20.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_30.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_40.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_50.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_10.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_20.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_30.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_40.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_50.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_10.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_20.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_30.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_40.hpp
+x64-windows/include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_gen_50.hpp
+x64-windows/include/boost/phoenix/operator/detail/define_operator.hpp
+x64-windows/include/boost/phoenix/operator/detail/undef_operator.hpp
+x64-windows/include/boost/phoenix/operator/if_else.hpp
+x64-windows/include/boost/phoenix/operator/io.hpp
+x64-windows/include/boost/phoenix/operator/logical.hpp
+x64-windows/include/boost/phoenix/operator/member.hpp
+x64-windows/include/boost/phoenix/operator/self.hpp
+x64-windows/include/boost/phoenix/phoenix.hpp
+x64-windows/include/boost/phoenix/scope.hpp
+x64-windows/include/boost/phoenix/scope/
+x64-windows/include/boost/phoenix/scope/detail/
+x64-windows/include/boost/phoenix/scope/detail/cpp03/
+x64-windows/include/boost/phoenix/scope/detail/cpp03/dynamic.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/lambda.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/local_gen.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_10.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_20.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_30.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_40.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/dynamic_50.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_10.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_20.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_30.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_40.hpp
+x64-windows/include/boost/phoenix/scope/detail/cpp03/preprocessed/lambda_50.hpp
+x64-windows/include/boost/phoenix/scope/detail/local_gen.hpp
+x64-windows/include/boost/phoenix/scope/detail/local_variable.hpp
+x64-windows/include/boost/phoenix/scope/dynamic.hpp
+x64-windows/include/boost/phoenix/scope/lambda.hpp
+x64-windows/include/boost/phoenix/scope/let.hpp
+x64-windows/include/boost/phoenix/scope/local_variable.hpp
+x64-windows/include/boost/phoenix/scope/scoped_environment.hpp
+x64-windows/include/boost/phoenix/scope/this.hpp
+x64-windows/include/boost/phoenix/statement.hpp
+x64-windows/include/boost/phoenix/statement/
+x64-windows/include/boost/phoenix/statement/detail/
+x64-windows/include/boost/phoenix/statement/detail/catch_push_back.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_10.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_20.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_30.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_40.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/catch_push_back_50.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_10.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_20.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_30.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_40.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/switch_50.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_10.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_20.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_30.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_40.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_eval_50.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_10.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_20.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_30.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_40.hpp
+x64-windows/include/boost/phoenix/statement/detail/preprocessed/try_catch_expression_50.hpp
+x64-windows/include/boost/phoenix/statement/detail/switch.hpp
+x64-windows/include/boost/phoenix/statement/detail/try_catch_eval.hpp
+x64-windows/include/boost/phoenix/statement/detail/try_catch_expression.hpp
+x64-windows/include/boost/phoenix/statement/do_while.hpp
+x64-windows/include/boost/phoenix/statement/for.hpp
+x64-windows/include/boost/phoenix/statement/if.hpp
+x64-windows/include/boost/phoenix/statement/sequence.hpp
+x64-windows/include/boost/phoenix/statement/switch.hpp
+x64-windows/include/boost/phoenix/statement/throw.hpp
+x64-windows/include/boost/phoenix/statement/try_catch.hpp
+x64-windows/include/boost/phoenix/statement/while.hpp
+x64-windows/include/boost/phoenix/stl.hpp
+x64-windows/include/boost/phoenix/stl/
+x64-windows/include/boost/phoenix/stl/algorithm.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/
+x64-windows/include/boost/phoenix/stl/algorithm/detail/
+x64-windows/include/boost/phoenix/stl/algorithm/detail/begin.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/decay_array.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/end.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_find.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_remove.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_reverse.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_sort.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_unique.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/has_upper_bound.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_hash_map.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_hash_set.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_list.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_map.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_std_set.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/detail/is_unordered_set_or_map.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/iteration.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/querying.hpp
+x64-windows/include/boost/phoenix/stl/algorithm/transformation.hpp
+x64-windows/include/boost/phoenix/stl/cmath.hpp
+x64-windows/include/boost/phoenix/stl/container.hpp
+x64-windows/include/boost/phoenix/stl/container/
+x64-windows/include/boost/phoenix/stl/container/container.hpp
+x64-windows/include/boost/phoenix/stl/container/detail/
+x64-windows/include/boost/phoenix/stl/container/detail/container.hpp
+x64-windows/include/boost/phoenix/support/
+x64-windows/include/boost/phoenix/support/detail/
+x64-windows/include/boost/phoenix/support/detail/iterate.hpp
+x64-windows/include/boost/phoenix/support/detail/iterate_define.hpp
+x64-windows/include/boost/phoenix/support/detail/iterate_undef.hpp
+x64-windows/include/boost/phoenix/support/iterate.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/
+x64-windows/include/boost/phoenix/support/preprocessed/vector.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_10.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_20.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_30.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_40.hpp
+x64-windows/include/boost/phoenix/support/preprocessed/vector_50.hpp
+x64-windows/include/boost/phoenix/support/preprocessor/
+x64-windows/include/boost/phoenix/support/preprocessor/round.hpp
+x64-windows/include/boost/phoenix/support/vector.hpp
+x64-windows/include/boost/phoenix/version.hpp
+x64-windows/share/
+x64-windows/share/boost-phoenix/
+x64-windows/share/boost-phoenix/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-polygon_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,71 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/polygon/
+x64-windows/include/boost/polygon/detail/
+x64-windows/include/boost/polygon/detail/boolean_op.hpp
+x64-windows/include/boost/polygon/detail/boolean_op_45.hpp
+x64-windows/include/boost/polygon/detail/iterator_compact_to_points.hpp
+x64-windows/include/boost/polygon/detail/iterator_geometry_to_set.hpp
+x64-windows/include/boost/polygon/detail/iterator_points_to_compact.hpp
+x64-windows/include/boost/polygon/detail/max_cover.hpp
+x64-windows/include/boost/polygon/detail/minkowski.hpp
+x64-windows/include/boost/polygon/detail/polygon_45_formation.hpp
+x64-windows/include/boost/polygon/detail/polygon_45_set_view.hpp
+x64-windows/include/boost/polygon/detail/polygon_45_touch.hpp
+x64-windows/include/boost/polygon/detail/polygon_90_set_view.hpp
+x64-windows/include/boost/polygon/detail/polygon_90_touch.hpp
+x64-windows/include/boost/polygon/detail/polygon_arbitrary_formation.hpp
+x64-windows/include/boost/polygon/detail/polygon_formation.hpp
+x64-windows/include/boost/polygon/detail/polygon_set_view.hpp
+x64-windows/include/boost/polygon/detail/polygon_simplify.hpp
+x64-windows/include/boost/polygon/detail/polygon_sort_adaptor.hpp
+x64-windows/include/boost/polygon/detail/property_merge.hpp
+x64-windows/include/boost/polygon/detail/property_merge_45.hpp
+x64-windows/include/boost/polygon/detail/rectangle_formation.hpp
+x64-windows/include/boost/polygon/detail/scan_arbitrary.hpp
+x64-windows/include/boost/polygon/detail/voronoi_ctypes.hpp
+x64-windows/include/boost/polygon/detail/voronoi_predicates.hpp
+x64-windows/include/boost/polygon/detail/voronoi_robust_fpt.hpp
+x64-windows/include/boost/polygon/detail/voronoi_structures.hpp
+x64-windows/include/boost/polygon/gmp_override.hpp
+x64-windows/include/boost/polygon/gtl.hpp
+x64-windows/include/boost/polygon/interval_concept.hpp
+x64-windows/include/boost/polygon/interval_data.hpp
+x64-windows/include/boost/polygon/interval_traits.hpp
+x64-windows/include/boost/polygon/isotropy.hpp
+x64-windows/include/boost/polygon/point_concept.hpp
+x64-windows/include/boost/polygon/point_data.hpp
+x64-windows/include/boost/polygon/point_traits.hpp
+x64-windows/include/boost/polygon/polygon.hpp
+x64-windows/include/boost/polygon/polygon_45_data.hpp
+x64-windows/include/boost/polygon/polygon_45_set_concept.hpp
+x64-windows/include/boost/polygon/polygon_45_set_data.hpp
+x64-windows/include/boost/polygon/polygon_45_set_traits.hpp
+x64-windows/include/boost/polygon/polygon_45_with_holes_data.hpp
+x64-windows/include/boost/polygon/polygon_90_data.hpp
+x64-windows/include/boost/polygon/polygon_90_set_concept.hpp
+x64-windows/include/boost/polygon/polygon_90_set_data.hpp
+x64-windows/include/boost/polygon/polygon_90_set_traits.hpp
+x64-windows/include/boost/polygon/polygon_90_with_holes_data.hpp
+x64-windows/include/boost/polygon/polygon_data.hpp
+x64-windows/include/boost/polygon/polygon_set_concept.hpp
+x64-windows/include/boost/polygon/polygon_set_data.hpp
+x64-windows/include/boost/polygon/polygon_set_traits.hpp
+x64-windows/include/boost/polygon/polygon_traits.hpp
+x64-windows/include/boost/polygon/polygon_with_holes_data.hpp
+x64-windows/include/boost/polygon/rectangle_concept.hpp
+x64-windows/include/boost/polygon/rectangle_data.hpp
+x64-windows/include/boost/polygon/rectangle_traits.hpp
+x64-windows/include/boost/polygon/segment_concept.hpp
+x64-windows/include/boost/polygon/segment_data.hpp
+x64-windows/include/boost/polygon/segment_traits.hpp
+x64-windows/include/boost/polygon/segment_utils.hpp
+x64-windows/include/boost/polygon/transform.hpp
+x64-windows/include/boost/polygon/voronoi.hpp
+x64-windows/include/boost/polygon/voronoi_builder.hpp
+x64-windows/include/boost/polygon/voronoi_diagram.hpp
+x64-windows/include/boost/polygon/voronoi_geometry_type.hpp
+x64-windows/share/
+x64-windows/share/boost-polygon/
+x64-windows/share/boost-polygon/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-pool_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,25 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/pool/
+x64-windows/include/boost/pool/detail/
+x64-windows/include/boost/pool/detail/for.m4
+x64-windows/include/boost/pool/detail/guard.hpp
+x64-windows/include/boost/pool/detail/mutex.hpp
+x64-windows/include/boost/pool/detail/pool_construct.bat
+x64-windows/include/boost/pool/detail/pool_construct.ipp
+x64-windows/include/boost/pool/detail/pool_construct.m4
+x64-windows/include/boost/pool/detail/pool_construct.sh
+x64-windows/include/boost/pool/detail/pool_construct_simple.bat
+x64-windows/include/boost/pool/detail/pool_construct_simple.ipp
+x64-windows/include/boost/pool/detail/pool_construct_simple.m4
+x64-windows/include/boost/pool/detail/pool_construct_simple.sh
+x64-windows/include/boost/pool/object_pool.hpp
+x64-windows/include/boost/pool/pool.hpp
+x64-windows/include/boost/pool/pool_alloc.hpp
+x64-windows/include/boost/pool/poolfwd.hpp
+x64-windows/include/boost/pool/simple_segregated_storage.hpp
+x64-windows/include/boost/pool/singleton_pool.hpp
+x64-windows/share/
+x64-windows/share/boost-pool/
+x64-windows/share/boost-pool/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-predef_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,176 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/endian.hpp
+x64-windows/include/boost/predef.h
+x64-windows/include/boost/predef/
+x64-windows/include/boost/predef/architecture.h
+x64-windows/include/boost/predef/architecture/
+x64-windows/include/boost/predef/architecture/alpha.h
+x64-windows/include/boost/predef/architecture/arm.h
+x64-windows/include/boost/predef/architecture/blackfin.h
+x64-windows/include/boost/predef/architecture/convex.h
+x64-windows/include/boost/predef/architecture/ia64.h
+x64-windows/include/boost/predef/architecture/m68k.h
+x64-windows/include/boost/predef/architecture/mips.h
+x64-windows/include/boost/predef/architecture/parisc.h
+x64-windows/include/boost/predef/architecture/ppc.h
+x64-windows/include/boost/predef/architecture/pyramid.h
+x64-windows/include/boost/predef/architecture/rs6k.h
+x64-windows/include/boost/predef/architecture/sparc.h
+x64-windows/include/boost/predef/architecture/superh.h
+x64-windows/include/boost/predef/architecture/sys370.h
+x64-windows/include/boost/predef/architecture/sys390.h
+x64-windows/include/boost/predef/architecture/x86.h
+x64-windows/include/boost/predef/architecture/x86/
+x64-windows/include/boost/predef/architecture/x86/32.h
+x64-windows/include/boost/predef/architecture/x86/64.h
+x64-windows/include/boost/predef/architecture/z.h
+x64-windows/include/boost/predef/compiler.h
+x64-windows/include/boost/predef/compiler/
+x64-windows/include/boost/predef/compiler/borland.h
+x64-windows/include/boost/predef/compiler/clang.h
+x64-windows/include/boost/predef/compiler/comeau.h
+x64-windows/include/boost/predef/compiler/compaq.h
+x64-windows/include/boost/predef/compiler/diab.h
+x64-windows/include/boost/predef/compiler/digitalmars.h
+x64-windows/include/boost/predef/compiler/dignus.h
+x64-windows/include/boost/predef/compiler/edg.h
+x64-windows/include/boost/predef/compiler/ekopath.h
+x64-windows/include/boost/predef/compiler/gcc.h
+x64-windows/include/boost/predef/compiler/gcc_xml.h
+x64-windows/include/boost/predef/compiler/greenhills.h
+x64-windows/include/boost/predef/compiler/hp_acc.h
+x64-windows/include/boost/predef/compiler/iar.h
+x64-windows/include/boost/predef/compiler/ibm.h
+x64-windows/include/boost/predef/compiler/intel.h
+x64-windows/include/boost/predef/compiler/kai.h
+x64-windows/include/boost/predef/compiler/llvm.h
+x64-windows/include/boost/predef/compiler/metaware.h
+x64-windows/include/boost/predef/compiler/metrowerks.h
+x64-windows/include/boost/predef/compiler/microtec.h
+x64-windows/include/boost/predef/compiler/mpw.h
+x64-windows/include/boost/predef/compiler/palm.h
+x64-windows/include/boost/predef/compiler/pgi.h
+x64-windows/include/boost/predef/compiler/sgi_mipspro.h
+x64-windows/include/boost/predef/compiler/sunpro.h
+x64-windows/include/boost/predef/compiler/tendra.h
+x64-windows/include/boost/predef/compiler/visualc.h
+x64-windows/include/boost/predef/compiler/watcom.h
+x64-windows/include/boost/predef/detail/
+x64-windows/include/boost/predef/detail/_cassert.h
+x64-windows/include/boost/predef/detail/_exception.h
+x64-windows/include/boost/predef/detail/comp_detected.h
+x64-windows/include/boost/predef/detail/endian_compat.h
+x64-windows/include/boost/predef/detail/os_detected.h
+x64-windows/include/boost/predef/detail/platform_detected.h
+x64-windows/include/boost/predef/detail/test.h
+x64-windows/include/boost/predef/detail/test_def.h
+x64-windows/include/boost/predef/hardware.h
+x64-windows/include/boost/predef/hardware/
+x64-windows/include/boost/predef/hardware/simd.h
+x64-windows/include/boost/predef/hardware/simd/
+x64-windows/include/boost/predef/hardware/simd/arm.h
+x64-windows/include/boost/predef/hardware/simd/arm/
+x64-windows/include/boost/predef/hardware/simd/arm/versions.h
+x64-windows/include/boost/predef/hardware/simd/ppc.h
+x64-windows/include/boost/predef/hardware/simd/ppc/
+x64-windows/include/boost/predef/hardware/simd/ppc/versions.h
+x64-windows/include/boost/predef/hardware/simd/x86.h
+x64-windows/include/boost/predef/hardware/simd/x86/
+x64-windows/include/boost/predef/hardware/simd/x86/versions.h
+x64-windows/include/boost/predef/hardware/simd/x86_amd.h
+x64-windows/include/boost/predef/hardware/simd/x86_amd/
+x64-windows/include/boost/predef/hardware/simd/x86_amd/versions.h
+x64-windows/include/boost/predef/language.h
+x64-windows/include/boost/predef/language/
+x64-windows/include/boost/predef/language/objc.h
+x64-windows/include/boost/predef/language/stdc.h
+x64-windows/include/boost/predef/language/stdcpp.h
+x64-windows/include/boost/predef/library.h
+x64-windows/include/boost/predef/library/
+x64-windows/include/boost/predef/library/c.h
+x64-windows/include/boost/predef/library/c/
+x64-windows/include/boost/predef/library/c/_prefix.h
+x64-windows/include/boost/predef/library/c/cloudabi.h
+x64-windows/include/boost/predef/library/c/gnu.h
+x64-windows/include/boost/predef/library/c/uc.h
+x64-windows/include/boost/predef/library/c/vms.h
+x64-windows/include/boost/predef/library/c/zos.h
+x64-windows/include/boost/predef/library/std.h
+x64-windows/include/boost/predef/library/std/
+x64-windows/include/boost/predef/library/std/_prefix.h
+x64-windows/include/boost/predef/library/std/cxx.h
+x64-windows/include/boost/predef/library/std/dinkumware.h
+x64-windows/include/boost/predef/library/std/libcomo.h
+x64-windows/include/boost/predef/library/std/modena.h
+x64-windows/include/boost/predef/library/std/msl.h
+x64-windows/include/boost/predef/library/std/roguewave.h
+x64-windows/include/boost/predef/library/std/sgi.h
+x64-windows/include/boost/predef/library/std/stdcpp3.h
+x64-windows/include/boost/predef/library/std/stlport.h
+x64-windows/include/boost/predef/library/std/vacpp.h
+x64-windows/include/boost/predef/make.h
+x64-windows/include/boost/predef/os.h
+x64-windows/include/boost/predef/os/
+x64-windows/include/boost/predef/os/aix.h
+x64-windows/include/boost/predef/os/amigaos.h
+x64-windows/include/boost/predef/os/android.h
+x64-windows/include/boost/predef/os/beos.h
+x64-windows/include/boost/predef/os/bsd.h
+x64-windows/include/boost/predef/os/bsd/
+x64-windows/include/boost/predef/os/bsd/bsdi.h
+x64-windows/include/boost/predef/os/bsd/dragonfly.h
+x64-windows/include/boost/predef/os/bsd/free.h
+x64-windows/include/boost/predef/os/bsd/net.h
+x64-windows/include/boost/predef/os/bsd/open.h
+x64-windows/include/boost/predef/os/cygwin.h
+x64-windows/include/boost/predef/os/haiku.h
+x64-windows/include/boost/predef/os/hpux.h
+x64-windows/include/boost/predef/os/ios.h
+x64-windows/include/boost/predef/os/irix.h
+x64-windows/include/boost/predef/os/linux.h
+x64-windows/include/boost/predef/os/macos.h
+x64-windows/include/boost/predef/os/os400.h
+x64-windows/include/boost/predef/os/qnxnto.h
+x64-windows/include/boost/predef/os/solaris.h
+x64-windows/include/boost/predef/os/unix.h
+x64-windows/include/boost/predef/os/vms.h
+x64-windows/include/boost/predef/os/windows.h
+x64-windows/include/boost/predef/other.h
+x64-windows/include/boost/predef/other/
+x64-windows/include/boost/predef/other/endian.h
+x64-windows/include/boost/predef/other/workaround.h
+x64-windows/include/boost/predef/platform.h
+x64-windows/include/boost/predef/platform/
+x64-windows/include/boost/predef/platform/cloudabi.h
+x64-windows/include/boost/predef/platform/ios.h
+x64-windows/include/boost/predef/platform/mingw.h
+x64-windows/include/boost/predef/platform/mingw32.h
+x64-windows/include/boost/predef/platform/mingw64.h
+x64-windows/include/boost/predef/platform/windows_desktop.h
+x64-windows/include/boost/predef/platform/windows_phone.h
+x64-windows/include/boost/predef/platform/windows_runtime.h
+x64-windows/include/boost/predef/platform/windows_server.h
+x64-windows/include/boost/predef/platform/windows_store.h
+x64-windows/include/boost/predef/platform/windows_system.h
+x64-windows/include/boost/predef/platform/windows_uwp.h
+x64-windows/include/boost/predef/version.h
+x64-windows/include/boost/predef/version_number.h
+x64-windows/share/
+x64-windows/share/boost-predef/
+x64-windows/share/boost-predef/check/
+x64-windows/share/boost-predef/check/build.jam
+x64-windows/share/boost-predef/check/predef.jam
+x64-windows/share/boost-predef/check/predef_check.h
+x64-windows/share/boost-predef/check/predef_check_as_c.c
+x64-windows/share/boost-predef/check/predef_check_as_cpp.cpp
+x64-windows/share/boost-predef/check/predef_check_as_objc.m
+x64-windows/share/boost-predef/check/predef_check_as_objcpp.mm
+x64-windows/share/boost-predef/check/predef_check_cc.h
+x64-windows/share/boost-predef/check/predef_check_cc_as_c.c
+x64-windows/share/boost-predef/check/predef_check_cc_as_cpp.cpp
+x64-windows/share/boost-predef/check/predef_check_cc_as_objc.m
+x64-windows/share/boost-predef/check/predef_check_cc_as_objcpp.mm
+x64-windows/share/boost-predef/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-preprocessor_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,318 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/preprocessor.hpp
+x64-windows/include/boost/preprocessor/
+x64-windows/include/boost/preprocessor/arithmetic.hpp
+x64-windows/include/boost/preprocessor/arithmetic/
+x64-windows/include/boost/preprocessor/arithmetic/add.hpp
+x64-windows/include/boost/preprocessor/arithmetic/dec.hpp
+x64-windows/include/boost/preprocessor/arithmetic/detail/
+x64-windows/include/boost/preprocessor/arithmetic/detail/div_base.hpp
+x64-windows/include/boost/preprocessor/arithmetic/div.hpp
+x64-windows/include/boost/preprocessor/arithmetic/inc.hpp
+x64-windows/include/boost/preprocessor/arithmetic/mod.hpp
+x64-windows/include/boost/preprocessor/arithmetic/mul.hpp
+x64-windows/include/boost/preprocessor/arithmetic/sub.hpp
+x64-windows/include/boost/preprocessor/array.hpp
+x64-windows/include/boost/preprocessor/array/
+x64-windows/include/boost/preprocessor/array/data.hpp
+x64-windows/include/boost/preprocessor/array/detail/
+x64-windows/include/boost/preprocessor/array/detail/get_data.hpp
+x64-windows/include/boost/preprocessor/array/elem.hpp
+x64-windows/include/boost/preprocessor/array/enum.hpp
+x64-windows/include/boost/preprocessor/array/insert.hpp
+x64-windows/include/boost/preprocessor/array/pop_back.hpp
+x64-windows/include/boost/preprocessor/array/pop_front.hpp
+x64-windows/include/boost/preprocessor/array/push_back.hpp
+x64-windows/include/boost/preprocessor/array/push_front.hpp
+x64-windows/include/boost/preprocessor/array/remove.hpp
+x64-windows/include/boost/preprocessor/array/replace.hpp
+x64-windows/include/boost/preprocessor/array/reverse.hpp
+x64-windows/include/boost/preprocessor/array/size.hpp
+x64-windows/include/boost/preprocessor/array/to_list.hpp
+x64-windows/include/boost/preprocessor/array/to_seq.hpp
+x64-windows/include/boost/preprocessor/array/to_tuple.hpp
+x64-windows/include/boost/preprocessor/assert_msg.hpp
+x64-windows/include/boost/preprocessor/cat.hpp
+x64-windows/include/boost/preprocessor/comma.hpp
+x64-windows/include/boost/preprocessor/comma_if.hpp
+x64-windows/include/boost/preprocessor/comparison.hpp
+x64-windows/include/boost/preprocessor/comparison/
+x64-windows/include/boost/preprocessor/comparison/equal.hpp
+x64-windows/include/boost/preprocessor/comparison/greater.hpp
+x64-windows/include/boost/preprocessor/comparison/greater_equal.hpp
+x64-windows/include/boost/preprocessor/comparison/less.hpp
+x64-windows/include/boost/preprocessor/comparison/less_equal.hpp
+x64-windows/include/boost/preprocessor/comparison/not_equal.hpp
+x64-windows/include/boost/preprocessor/config/
+x64-windows/include/boost/preprocessor/config/config.hpp
+x64-windows/include/boost/preprocessor/config/limits.hpp
+x64-windows/include/boost/preprocessor/control.hpp
+x64-windows/include/boost/preprocessor/control/
+x64-windows/include/boost/preprocessor/control/deduce_d.hpp
+x64-windows/include/boost/preprocessor/control/detail/
+x64-windows/include/boost/preprocessor/control/detail/dmc/
+x64-windows/include/boost/preprocessor/control/detail/dmc/while.hpp
+x64-windows/include/boost/preprocessor/control/detail/edg/
+x64-windows/include/boost/preprocessor/control/detail/edg/while.hpp
+x64-windows/include/boost/preprocessor/control/detail/msvc/
+x64-windows/include/boost/preprocessor/control/detail/msvc/while.hpp
+x64-windows/include/boost/preprocessor/control/detail/while.hpp
+x64-windows/include/boost/preprocessor/control/expr_if.hpp
+x64-windows/include/boost/preprocessor/control/expr_iif.hpp
+x64-windows/include/boost/preprocessor/control/if.hpp
+x64-windows/include/boost/preprocessor/control/iif.hpp
+x64-windows/include/boost/preprocessor/control/while.hpp
+x64-windows/include/boost/preprocessor/debug.hpp
+x64-windows/include/boost/preprocessor/debug/
+x64-windows/include/boost/preprocessor/debug/assert.hpp
+x64-windows/include/boost/preprocessor/debug/error.hpp
+x64-windows/include/boost/preprocessor/debug/line.hpp
+x64-windows/include/boost/preprocessor/dec.hpp
+x64-windows/include/boost/preprocessor/detail/
+x64-windows/include/boost/preprocessor/detail/auto_rec.hpp
+x64-windows/include/boost/preprocessor/detail/check.hpp
+x64-windows/include/boost/preprocessor/detail/dmc/
+x64-windows/include/boost/preprocessor/detail/dmc/auto_rec.hpp
+x64-windows/include/boost/preprocessor/detail/is_binary.hpp
+x64-windows/include/boost/preprocessor/detail/is_nullary.hpp
+x64-windows/include/boost/preprocessor/detail/is_unary.hpp
+x64-windows/include/boost/preprocessor/detail/null.hpp
+x64-windows/include/boost/preprocessor/detail/split.hpp
+x64-windows/include/boost/preprocessor/empty.hpp
+x64-windows/include/boost/preprocessor/enum.hpp
+x64-windows/include/boost/preprocessor/enum_params.hpp
+x64-windows/include/boost/preprocessor/enum_params_with_a_default.hpp
+x64-windows/include/boost/preprocessor/enum_params_with_defaults.hpp
+x64-windows/include/boost/preprocessor/enum_shifted.hpp
+x64-windows/include/boost/preprocessor/enum_shifted_params.hpp
+x64-windows/include/boost/preprocessor/expand.hpp
+x64-windows/include/boost/preprocessor/expr_if.hpp
+x64-windows/include/boost/preprocessor/facilities.hpp
+x64-windows/include/boost/preprocessor/facilities/
+x64-windows/include/boost/preprocessor/facilities/apply.hpp
+x64-windows/include/boost/preprocessor/facilities/detail/
+x64-windows/include/boost/preprocessor/facilities/detail/is_empty.hpp
+x64-windows/include/boost/preprocessor/facilities/empty.hpp
+x64-windows/include/boost/preprocessor/facilities/expand.hpp
+x64-windows/include/boost/preprocessor/facilities/identity.hpp
+x64-windows/include/boost/preprocessor/facilities/intercept.hpp
+x64-windows/include/boost/preprocessor/facilities/is_1.hpp
+x64-windows/include/boost/preprocessor/facilities/is_empty.hpp
+x64-windows/include/boost/preprocessor/facilities/is_empty_or_1.hpp
+x64-windows/include/boost/preprocessor/facilities/is_empty_variadic.hpp
+x64-windows/include/boost/preprocessor/facilities/overload.hpp
+x64-windows/include/boost/preprocessor/for.hpp
+x64-windows/include/boost/preprocessor/identity.hpp
+x64-windows/include/boost/preprocessor/if.hpp
+x64-windows/include/boost/preprocessor/inc.hpp
+x64-windows/include/boost/preprocessor/iterate.hpp
+x64-windows/include/boost/preprocessor/iteration.hpp
+x64-windows/include/boost/preprocessor/iteration/
+x64-windows/include/boost/preprocessor/iteration/detail/
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower1.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower2.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower3.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower4.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/lower5.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper1.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper2.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper3.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper4.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/bounds/upper5.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/finish.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward1.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward2.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward3.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward4.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/forward5.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse1.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse2.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse3.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse4.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/iter/reverse5.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/local.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/rlocal.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/self.hpp
+x64-windows/include/boost/preprocessor/iteration/detail/start.hpp
+x64-windows/include/boost/preprocessor/iteration/iterate.hpp
+x64-windows/include/boost/preprocessor/iteration/local.hpp
+x64-windows/include/boost/preprocessor/iteration/self.hpp
+x64-windows/include/boost/preprocessor/library.hpp
+x64-windows/include/boost/preprocessor/limits.hpp
+x64-windows/include/boost/preprocessor/list.hpp
+x64-windows/include/boost/preprocessor/list/
+x64-windows/include/boost/preprocessor/list/adt.hpp
+x64-windows/include/boost/preprocessor/list/append.hpp
+x64-windows/include/boost/preprocessor/list/at.hpp
+x64-windows/include/boost/preprocessor/list/cat.hpp
+x64-windows/include/boost/preprocessor/list/detail/
+x64-windows/include/boost/preprocessor/list/detail/dmc/
+x64-windows/include/boost/preprocessor/list/detail/dmc/fold_left.hpp
+x64-windows/include/boost/preprocessor/list/detail/edg/
+x64-windows/include/boost/preprocessor/list/detail/edg/fold_left.hpp
+x64-windows/include/boost/preprocessor/list/detail/edg/fold_right.hpp
+x64-windows/include/boost/preprocessor/list/detail/fold_left.hpp
+x64-windows/include/boost/preprocessor/list/detail/fold_right.hpp
+x64-windows/include/boost/preprocessor/list/enum.hpp
+x64-windows/include/boost/preprocessor/list/filter.hpp
+x64-windows/include/boost/preprocessor/list/first_n.hpp
+x64-windows/include/boost/preprocessor/list/fold_left.hpp
+x64-windows/include/boost/preprocessor/list/fold_right.hpp
+x64-windows/include/boost/preprocessor/list/for_each.hpp
+x64-windows/include/boost/preprocessor/list/for_each_i.hpp
+x64-windows/include/boost/preprocessor/list/for_each_product.hpp
+x64-windows/include/boost/preprocessor/list/rest_n.hpp
+x64-windows/include/boost/preprocessor/list/reverse.hpp
+x64-windows/include/boost/preprocessor/list/size.hpp
+x64-windows/include/boost/preprocessor/list/to_array.hpp
+x64-windows/include/boost/preprocessor/list/to_seq.hpp
+x64-windows/include/boost/preprocessor/list/to_tuple.hpp
+x64-windows/include/boost/preprocessor/list/transform.hpp
+x64-windows/include/boost/preprocessor/logical.hpp
+x64-windows/include/boost/preprocessor/logical/
+x64-windows/include/boost/preprocessor/logical/and.hpp
+x64-windows/include/boost/preprocessor/logical/bitand.hpp
+x64-windows/include/boost/preprocessor/logical/bitnor.hpp
+x64-windows/include/boost/preprocessor/logical/bitor.hpp
+x64-windows/include/boost/preprocessor/logical/bitxor.hpp
+x64-windows/include/boost/preprocessor/logical/bool.hpp
+x64-windows/include/boost/preprocessor/logical/compl.hpp
+x64-windows/include/boost/preprocessor/logical/nor.hpp
+x64-windows/include/boost/preprocessor/logical/not.hpp
+x64-windows/include/boost/preprocessor/logical/or.hpp
+x64-windows/include/boost/preprocessor/logical/xor.hpp
+x64-windows/include/boost/preprocessor/max.hpp
+x64-windows/include/boost/preprocessor/min.hpp
+x64-windows/include/boost/preprocessor/punctuation.hpp
+x64-windows/include/boost/preprocessor/punctuation/
+x64-windows/include/boost/preprocessor/punctuation/comma.hpp
+x64-windows/include/boost/preprocessor/punctuation/comma_if.hpp
+x64-windows/include/boost/preprocessor/punctuation/detail/
+x64-windows/include/boost/preprocessor/punctuation/detail/is_begin_parens.hpp
+x64-windows/include/boost/preprocessor/punctuation/is_begin_parens.hpp
+x64-windows/include/boost/preprocessor/punctuation/paren.hpp
+x64-windows/include/boost/preprocessor/punctuation/paren_if.hpp
+x64-windows/include/boost/preprocessor/punctuation/remove_parens.hpp
+x64-windows/include/boost/preprocessor/repeat.hpp
+x64-windows/include/boost/preprocessor/repeat_2nd.hpp
+x64-windows/include/boost/preprocessor/repeat_3rd.hpp
+x64-windows/include/boost/preprocessor/repeat_from_to.hpp
+x64-windows/include/boost/preprocessor/repeat_from_to_2nd.hpp
+x64-windows/include/boost/preprocessor/repeat_from_to_3rd.hpp
+x64-windows/include/boost/preprocessor/repetition.hpp
+x64-windows/include/boost/preprocessor/repetition/
+x64-windows/include/boost/preprocessor/repetition/deduce_r.hpp
+x64-windows/include/boost/preprocessor/repetition/deduce_z.hpp
+x64-windows/include/boost/preprocessor/repetition/detail/
+x64-windows/include/boost/preprocessor/repetition/detail/dmc/
+x64-windows/include/boost/preprocessor/repetition/detail/dmc/for.hpp
+x64-windows/include/boost/preprocessor/repetition/detail/edg/
+x64-windows/include/boost/preprocessor/repetition/detail/edg/for.hpp
+x64-windows/include/boost/preprocessor/repetition/detail/for.hpp
+x64-windows/include/boost/preprocessor/repetition/detail/msvc/
+x64-windows/include/boost/preprocessor/repetition/detail/msvc/for.hpp
+x64-windows/include/boost/preprocessor/repetition/enum.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_binary_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_params_with_a_default.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_params_with_defaults.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_shifted.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_shifted_binary_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_shifted_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_trailing.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_trailing_binary_params.hpp
+x64-windows/include/boost/preprocessor/repetition/enum_trailing_params.hpp
+x64-windows/include/boost/preprocessor/repetition/for.hpp
+x64-windows/include/boost/preprocessor/repetition/repeat.hpp
+x64-windows/include/boost/preprocessor/repetition/repeat_from_to.hpp
+x64-windows/include/boost/preprocessor/selection.hpp
+x64-windows/include/boost/preprocessor/selection/
+x64-windows/include/boost/preprocessor/selection/max.hpp
+x64-windows/include/boost/preprocessor/selection/min.hpp
+x64-windows/include/boost/preprocessor/seq.hpp
+x64-windows/include/boost/preprocessor/seq/
+x64-windows/include/boost/preprocessor/seq/cat.hpp
+x64-windows/include/boost/preprocessor/seq/detail/
+x64-windows/include/boost/preprocessor/seq/detail/binary_transform.hpp
+x64-windows/include/boost/preprocessor/seq/detail/is_empty.hpp
+x64-windows/include/boost/preprocessor/seq/detail/split.hpp
+x64-windows/include/boost/preprocessor/seq/detail/to_list_msvc.hpp
+x64-windows/include/boost/preprocessor/seq/elem.hpp
+x64-windows/include/boost/preprocessor/seq/enum.hpp
+x64-windows/include/boost/preprocessor/seq/filter.hpp
+x64-windows/include/boost/preprocessor/seq/first_n.hpp
+x64-windows/include/boost/preprocessor/seq/fold_left.hpp
+x64-windows/include/boost/preprocessor/seq/fold_right.hpp
+x64-windows/include/boost/preprocessor/seq/for_each.hpp
+x64-windows/include/boost/preprocessor/seq/for_each_i.hpp
+x64-windows/include/boost/preprocessor/seq/for_each_product.hpp
+x64-windows/include/boost/preprocessor/seq/insert.hpp
+x64-windows/include/boost/preprocessor/seq/pop_back.hpp
+x64-windows/include/boost/preprocessor/seq/pop_front.hpp
+x64-windows/include/boost/preprocessor/seq/push_back.hpp
+x64-windows/include/boost/preprocessor/seq/push_front.hpp
+x64-windows/include/boost/preprocessor/seq/remove.hpp
+x64-windows/include/boost/preprocessor/seq/replace.hpp
+x64-windows/include/boost/preprocessor/seq/rest_n.hpp
+x64-windows/include/boost/preprocessor/seq/reverse.hpp
+x64-windows/include/boost/preprocessor/seq/seq.hpp
+x64-windows/include/boost/preprocessor/seq/size.hpp
+x64-windows/include/boost/preprocessor/seq/subseq.hpp
+x64-windows/include/boost/preprocessor/seq/to_array.hpp
+x64-windows/include/boost/preprocessor/seq/to_list.hpp
+x64-windows/include/boost/preprocessor/seq/to_tuple.hpp
+x64-windows/include/boost/preprocessor/seq/transform.hpp
+x64-windows/include/boost/preprocessor/seq/variadic_seq_to_seq.hpp
+x64-windows/include/boost/preprocessor/slot.hpp
+x64-windows/include/boost/preprocessor/slot/
+x64-windows/include/boost/preprocessor/slot/counter.hpp
+x64-windows/include/boost/preprocessor/slot/detail/
+x64-windows/include/boost/preprocessor/slot/detail/counter.hpp
+x64-windows/include/boost/preprocessor/slot/detail/def.hpp
+x64-windows/include/boost/preprocessor/slot/detail/shared.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot1.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot2.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot3.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot4.hpp
+x64-windows/include/boost/preprocessor/slot/detail/slot5.hpp
+x64-windows/include/boost/preprocessor/slot/slot.hpp
+x64-windows/include/boost/preprocessor/stringize.hpp
+x64-windows/include/boost/preprocessor/tuple.hpp
+x64-windows/include/boost/preprocessor/tuple/
+x64-windows/include/boost/preprocessor/tuple/detail/
+x64-windows/include/boost/preprocessor/tuple/detail/is_single_return.hpp
+x64-windows/include/boost/preprocessor/tuple/eat.hpp
+x64-windows/include/boost/preprocessor/tuple/elem.hpp
+x64-windows/include/boost/preprocessor/tuple/enum.hpp
+x64-windows/include/boost/preprocessor/tuple/insert.hpp
+x64-windows/include/boost/preprocessor/tuple/pop_back.hpp
+x64-windows/include/boost/preprocessor/tuple/pop_front.hpp
+x64-windows/include/boost/preprocessor/tuple/push_back.hpp
+x64-windows/include/boost/preprocessor/tuple/push_front.hpp
+x64-windows/include/boost/preprocessor/tuple/rem.hpp
+x64-windows/include/boost/preprocessor/tuple/remove.hpp
+x64-windows/include/boost/preprocessor/tuple/replace.hpp
+x64-windows/include/boost/preprocessor/tuple/reverse.hpp
+x64-windows/include/boost/preprocessor/tuple/size.hpp
+x64-windows/include/boost/preprocessor/tuple/to_array.hpp
+x64-windows/include/boost/preprocessor/tuple/to_list.hpp
+x64-windows/include/boost/preprocessor/tuple/to_seq.hpp
+x64-windows/include/boost/preprocessor/variadic.hpp
+x64-windows/include/boost/preprocessor/variadic/
+x64-windows/include/boost/preprocessor/variadic/detail/
+x64-windows/include/boost/preprocessor/variadic/detail/is_single_return.hpp
+x64-windows/include/boost/preprocessor/variadic/elem.hpp
+x64-windows/include/boost/preprocessor/variadic/size.hpp
+x64-windows/include/boost/preprocessor/variadic/to_array.hpp
+x64-windows/include/boost/preprocessor/variadic/to_list.hpp
+x64-windows/include/boost/preprocessor/variadic/to_seq.hpp
+x64-windows/include/boost/preprocessor/variadic/to_tuple.hpp
+x64-windows/include/boost/preprocessor/while.hpp
+x64-windows/include/boost/preprocessor/wstringize.hpp
+x64-windows/share/
+x64-windows/share/boost-preprocessor/
+x64-windows/share/boost-preprocessor/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-property-map_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/property_map/
+x64-windows/include/boost/property_map/compose_property_map.hpp
+x64-windows/include/boost/property_map/dynamic_property_map.hpp
+x64-windows/include/boost/property_map/function_property_map.hpp
+x64-windows/include/boost/property_map/parallel/
+x64-windows/include/boost/property_map/parallel/basic_reduce.hpp
+x64-windows/include/boost/property_map/parallel/caching_property_map.hpp
+x64-windows/include/boost/property_map/parallel/detail/
+x64-windows/include/boost/property_map/parallel/detail/untracked_pair.hpp
+x64-windows/include/boost/property_map/parallel/distributed_property_map.hpp
+x64-windows/include/boost/property_map/parallel/global_index_map.hpp
+x64-windows/include/boost/property_map/parallel/impl/
+x64-windows/include/boost/property_map/parallel/impl/distributed_property_map.ipp
+x64-windows/include/boost/property_map/parallel/local_property_map.hpp
+x64-windows/include/boost/property_map/parallel/parallel_property_maps.hpp
+x64-windows/include/boost/property_map/parallel/process_group.hpp
+x64-windows/include/boost/property_map/parallel/simple_trigger.hpp
+x64-windows/include/boost/property_map/parallel/unsafe_serialize.hpp
+x64-windows/include/boost/property_map/parallel/vector_property_map.hpp
+x64-windows/include/boost/property_map/property_map.hpp
+x64-windows/include/boost/property_map/property_map_iterator.hpp
+x64-windows/include/boost/property_map/shared_array_property_map.hpp
+x64-windows/include/boost/property_map/transform_value_property_map.hpp
+x64-windows/include/boost/property_map/vector_property_map.hpp
+x64-windows/share/
+x64-windows/share/boost-property-map/
+x64-windows/share/boost-property-map/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-property-tree_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/property_tree/
+x64-windows/include/boost/property_tree/detail/
+x64-windows/include/boost/property_tree/detail/exception_implementation.hpp
+x64-windows/include/boost/property_tree/detail/file_parser_error.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_error.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_read.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_utils.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_write.hpp
+x64-windows/include/boost/property_tree/detail/info_parser_writer_settings.hpp
+x64-windows/include/boost/property_tree/detail/ptree_implementation.hpp
+x64-windows/include/boost/property_tree/detail/ptree_utils.hpp
+x64-windows/include/boost/property_tree/detail/rapidxml.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_error.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_flags.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_read_rapidxml.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_utils.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_write.hpp
+x64-windows/include/boost/property_tree/detail/xml_parser_writer_settings.hpp
+x64-windows/include/boost/property_tree/exceptions.hpp
+x64-windows/include/boost/property_tree/id_translator.hpp
+x64-windows/include/boost/property_tree/info_parser.hpp
+x64-windows/include/boost/property_tree/ini_parser.hpp
+x64-windows/include/boost/property_tree/json_parser.hpp
+x64-windows/include/boost/property_tree/json_parser/
+x64-windows/include/boost/property_tree/json_parser/detail/
+x64-windows/include/boost/property_tree/json_parser/detail/narrow_encoding.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/parser.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/read.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/standard_callbacks.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/wide_encoding.hpp
+x64-windows/include/boost/property_tree/json_parser/detail/write.hpp
+x64-windows/include/boost/property_tree/json_parser/error.hpp
+x64-windows/include/boost/property_tree/ptree.hpp
+x64-windows/include/boost/property_tree/ptree_fwd.hpp
+x64-windows/include/boost/property_tree/ptree_serialization.hpp
+x64-windows/include/boost/property_tree/stream_translator.hpp
+x64-windows/include/boost/property_tree/string_path.hpp
+x64-windows/include/boost/property_tree/xml_parser.hpp
+x64-windows/share/
+x64-windows/share/boost-property-tree/
+x64-windows/share/boost-property-tree/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-proto_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,169 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/proto/
+x64-windows/include/boost/proto/args.hpp
+x64-windows/include/boost/proto/context.hpp
+x64-windows/include/boost/proto/context/
+x64-windows/include/boost/proto/context/callable.hpp
+x64-windows/include/boost/proto/context/default.hpp
+x64-windows/include/boost/proto/context/detail/
+x64-windows/include/boost/proto/context/detail/callable_eval.hpp
+x64-windows/include/boost/proto/context/detail/default_eval.hpp
+x64-windows/include/boost/proto/context/detail/null_eval.hpp
+x64-windows/include/boost/proto/context/detail/preprocessed/
+x64-windows/include/boost/proto/context/detail/preprocessed/callable_eval.hpp
+x64-windows/include/boost/proto/context/detail/preprocessed/default_eval.hpp
+x64-windows/include/boost/proto/context/detail/preprocessed/null_eval.hpp
+x64-windows/include/boost/proto/context/null.hpp
+x64-windows/include/boost/proto/core.hpp
+x64-windows/include/boost/proto/debug.hpp
+x64-windows/include/boost/proto/deep_copy.hpp
+x64-windows/include/boost/proto/detail/
+x64-windows/include/boost/proto/detail/and_n.hpp
+x64-windows/include/boost/proto/detail/any.hpp
+x64-windows/include/boost/proto/detail/args.hpp
+x64-windows/include/boost/proto/detail/as_expr.hpp
+x64-windows/include/boost/proto/detail/as_lvalue.hpp
+x64-windows/include/boost/proto/detail/basic_expr.hpp
+x64-windows/include/boost/proto/detail/class_member_traits.hpp
+x64-windows/include/boost/proto/detail/decltype.hpp
+x64-windows/include/boost/proto/detail/deduce_domain.hpp
+x64-windows/include/boost/proto/detail/deduce_domain_n.hpp
+x64-windows/include/boost/proto/detail/deep_copy.hpp
+x64-windows/include/boost/proto/detail/deprecated.hpp
+x64-windows/include/boost/proto/detail/dont_care.hpp
+x64-windows/include/boost/proto/detail/expr.hpp
+x64-windows/include/boost/proto/detail/expr_funop.hpp
+x64-windows/include/boost/proto/detail/extends_funop.hpp
+x64-windows/include/boost/proto/detail/extends_funop_const.hpp
+x64-windows/include/boost/proto/detail/funop.hpp
+x64-windows/include/boost/proto/detail/generate_by_value.hpp
+x64-windows/include/boost/proto/detail/ignore_unused.hpp
+x64-windows/include/boost/proto/detail/is_noncopyable.hpp
+x64-windows/include/boost/proto/detail/lambda_matches.hpp
+x64-windows/include/boost/proto/detail/local.hpp
+x64-windows/include/boost/proto/detail/make_expr.hpp
+x64-windows/include/boost/proto/detail/make_expr_.hpp
+x64-windows/include/boost/proto/detail/make_expr_funop.hpp
+x64-windows/include/boost/proto/detail/matches_.hpp
+x64-windows/include/boost/proto/detail/memfun_funop.hpp
+x64-windows/include/boost/proto/detail/or_n.hpp
+x64-windows/include/boost/proto/detail/poly_function.hpp
+x64-windows/include/boost/proto/detail/poly_function_funop.hpp
+x64-windows/include/boost/proto/detail/poly_function_traits.hpp
+x64-windows/include/boost/proto/detail/preprocessed/
+x64-windows/include/boost/proto/detail/preprocessed/and_n.hpp
+x64-windows/include/boost/proto/detail/preprocessed/args.hpp
+x64-windows/include/boost/proto/detail/preprocessed/basic_expr.hpp
+x64-windows/include/boost/proto/detail/preprocessed/class_member_traits.hpp
+x64-windows/include/boost/proto/detail/preprocessed/deduce_domain_n.hpp
+x64-windows/include/boost/proto/detail/preprocessed/deep_copy.hpp
+x64-windows/include/boost/proto/detail/preprocessed/expr.hpp
+x64-windows/include/boost/proto/detail/preprocessed/expr_variadic.hpp
+x64-windows/include/boost/proto/detail/preprocessed/extends_funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/extends_funop_const.hpp
+x64-windows/include/boost/proto/detail/preprocessed/funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/generate_by_value.hpp
+x64-windows/include/boost/proto/detail/preprocessed/lambda_matches.hpp
+x64-windows/include/boost/proto/detail/preprocessed/make_expr.hpp
+x64-windows/include/boost/proto/detail/preprocessed/make_expr_.hpp
+x64-windows/include/boost/proto/detail/preprocessed/make_expr_funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/matches_.hpp
+x64-windows/include/boost/proto/detail/preprocessed/memfun_funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/or_n.hpp
+x64-windows/include/boost/proto/detail/preprocessed/poly_function_funop.hpp
+x64-windows/include/boost/proto/detail/preprocessed/poly_function_traits.hpp
+x64-windows/include/boost/proto/detail/preprocessed/template_arity_helper.hpp
+x64-windows/include/boost/proto/detail/preprocessed/traits.hpp
+x64-windows/include/boost/proto/detail/preprocessed/unpack_expr_.hpp
+x64-windows/include/boost/proto/detail/preprocessed/vararg_matches_impl.hpp
+x64-windows/include/boost/proto/detail/remove_typename.hpp
+x64-windows/include/boost/proto/detail/static_const.hpp
+x64-windows/include/boost/proto/detail/template_arity.hpp
+x64-windows/include/boost/proto/detail/template_arity_helper.hpp
+x64-windows/include/boost/proto/detail/traits.hpp
+x64-windows/include/boost/proto/detail/unpack_expr_.hpp
+x64-windows/include/boost/proto/detail/vararg_matches_impl.hpp
+x64-windows/include/boost/proto/domain.hpp
+x64-windows/include/boost/proto/eval.hpp
+x64-windows/include/boost/proto/expr.hpp
+x64-windows/include/boost/proto/extends.hpp
+x64-windows/include/boost/proto/functional.hpp
+x64-windows/include/boost/proto/functional/
+x64-windows/include/boost/proto/functional/fusion.hpp
+x64-windows/include/boost/proto/functional/fusion/
+x64-windows/include/boost/proto/functional/fusion/at.hpp
+x64-windows/include/boost/proto/functional/fusion/pop_back.hpp
+x64-windows/include/boost/proto/functional/fusion/pop_front.hpp
+x64-windows/include/boost/proto/functional/fusion/push_back.hpp
+x64-windows/include/boost/proto/functional/fusion/push_front.hpp
+x64-windows/include/boost/proto/functional/fusion/reverse.hpp
+x64-windows/include/boost/proto/functional/range.hpp
+x64-windows/include/boost/proto/functional/range/
+x64-windows/include/boost/proto/functional/range/begin.hpp
+x64-windows/include/boost/proto/functional/range/empty.hpp
+x64-windows/include/boost/proto/functional/range/end.hpp
+x64-windows/include/boost/proto/functional/range/rbegin.hpp
+x64-windows/include/boost/proto/functional/range/rend.hpp
+x64-windows/include/boost/proto/functional/range/size.hpp
+x64-windows/include/boost/proto/functional/std.hpp
+x64-windows/include/boost/proto/functional/std/
+x64-windows/include/boost/proto/functional/std/iterator.hpp
+x64-windows/include/boost/proto/functional/std/utility.hpp
+x64-windows/include/boost/proto/fusion.hpp
+x64-windows/include/boost/proto/generate.hpp
+x64-windows/include/boost/proto/literal.hpp
+x64-windows/include/boost/proto/make_expr.hpp
+x64-windows/include/boost/proto/matches.hpp
+x64-windows/include/boost/proto/operators.hpp
+x64-windows/include/boost/proto/proto.hpp
+x64-windows/include/boost/proto/proto_fwd.hpp
+x64-windows/include/boost/proto/proto_typeof.hpp
+x64-windows/include/boost/proto/repeat.hpp
+x64-windows/include/boost/proto/tags.hpp
+x64-windows/include/boost/proto/traits.hpp
+x64-windows/include/boost/proto/transform.hpp
+x64-windows/include/boost/proto/transform/
+x64-windows/include/boost/proto/transform/arg.hpp
+x64-windows/include/boost/proto/transform/call.hpp
+x64-windows/include/boost/proto/transform/default.hpp
+x64-windows/include/boost/proto/transform/detail/
+x64-windows/include/boost/proto/transform/detail/call.hpp
+x64-windows/include/boost/proto/transform/detail/construct_funop.hpp
+x64-windows/include/boost/proto/transform/detail/construct_pod_funop.hpp
+x64-windows/include/boost/proto/transform/detail/default_function_impl.hpp
+x64-windows/include/boost/proto/transform/detail/expand_pack.hpp
+x64-windows/include/boost/proto/transform/detail/fold_impl.hpp
+x64-windows/include/boost/proto/transform/detail/lazy.hpp
+x64-windows/include/boost/proto/transform/detail/make.hpp
+x64-windows/include/boost/proto/transform/detail/make_gcc_workaround.hpp
+x64-windows/include/boost/proto/transform/detail/pack.hpp
+x64-windows/include/boost/proto/transform/detail/pack_impl.hpp
+x64-windows/include/boost/proto/transform/detail/pass_through_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/
+x64-windows/include/boost/proto/transform/detail/preprocessed/call.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/construct_funop.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/construct_pod_funop.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/default_function_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/expand_pack.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/fold_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/lazy.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/make.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/make_gcc_workaround.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/pack_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/pass_through_impl.hpp
+x64-windows/include/boost/proto/transform/detail/preprocessed/when.hpp
+x64-windows/include/boost/proto/transform/detail/when.hpp
+x64-windows/include/boost/proto/transform/env.hpp
+x64-windows/include/boost/proto/transform/fold.hpp
+x64-windows/include/boost/proto/transform/fold_tree.hpp
+x64-windows/include/boost/proto/transform/impl.hpp
+x64-windows/include/boost/proto/transform/integral_c.hpp
+x64-windows/include/boost/proto/transform/lazy.hpp
+x64-windows/include/boost/proto/transform/make.hpp
+x64-windows/include/boost/proto/transform/pass_through.hpp
+x64-windows/include/boost/proto/transform/when.hpp
+x64-windows/share/
+x64-windows/share/boost-proto/
+x64-windows/share/boost-proto/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-qvm_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,87 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/qvm/
+x64-windows/include/boost/qvm/all.hpp
+x64-windows/include/boost/qvm/assert.hpp
+x64-windows/include/boost/qvm/deduce_mat.hpp
+x64-windows/include/boost/qvm/deduce_quat.hpp
+x64-windows/include/boost/qvm/deduce_scalar.hpp
+x64-windows/include/boost/qvm/deduce_vec.hpp
+x64-windows/include/boost/qvm/detail/
+x64-windows/include/boost/qvm/detail/cofactor_impl.hpp
+x64-windows/include/boost/qvm/detail/determinant_impl.hpp
+x64-windows/include/boost/qvm/detail/mat_assign.hpp
+x64-windows/include/boost/qvm/detail/quat_assign.hpp
+x64-windows/include/boost/qvm/detail/remove_const.hpp
+x64-windows/include/boost/qvm/detail/swizzle_traits.hpp
+x64-windows/include/boost/qvm/detail/transp_impl.hpp
+x64-windows/include/boost/qvm/detail/vec_assign.hpp
+x64-windows/include/boost/qvm/enable_if.hpp
+x64-windows/include/boost/qvm/error.hpp
+x64-windows/include/boost/qvm/gen/
+x64-windows/include/boost/qvm/gen/mat_assign2.hpp
+x64-windows/include/boost/qvm/gen/mat_assign3.hpp
+x64-windows/include/boost/qvm/gen/mat_assign4.hpp
+x64-windows/include/boost/qvm/gen/mat_operations2.hpp
+x64-windows/include/boost/qvm/gen/mat_operations3.hpp
+x64-windows/include/boost/qvm/gen/mat_operations4.hpp
+x64-windows/include/boost/qvm/gen/swizzle2.hpp
+x64-windows/include/boost/qvm/gen/swizzle3.hpp
+x64-windows/include/boost/qvm/gen/swizzle4.hpp
+x64-windows/include/boost/qvm/gen/vec_assign2.hpp
+x64-windows/include/boost/qvm/gen/vec_assign3.hpp
+x64-windows/include/boost/qvm/gen/vec_assign4.hpp
+x64-windows/include/boost/qvm/gen/vec_mat_operations2.hpp
+x64-windows/include/boost/qvm/gen/vec_mat_operations3.hpp
+x64-windows/include/boost/qvm/gen/vec_mat_operations4.hpp
+x64-windows/include/boost/qvm/gen/vec_operations2.hpp
+x64-windows/include/boost/qvm/gen/vec_operations3.hpp
+x64-windows/include/boost/qvm/gen/vec_operations4.hpp
+x64-windows/include/boost/qvm/inline.hpp
+x64-windows/include/boost/qvm/map.hpp
+x64-windows/include/boost/qvm/map_mat_mat.hpp
+x64-windows/include/boost/qvm/map_mat_vec.hpp
+x64-windows/include/boost/qvm/map_vec_mat.hpp
+x64-windows/include/boost/qvm/mat.hpp
+x64-windows/include/boost/qvm/mat_access.hpp
+x64-windows/include/boost/qvm/mat_operations.hpp
+x64-windows/include/boost/qvm/mat_operations2.hpp
+x64-windows/include/boost/qvm/mat_operations3.hpp
+x64-windows/include/boost/qvm/mat_operations4.hpp
+x64-windows/include/boost/qvm/mat_traits.hpp
+x64-windows/include/boost/qvm/mat_traits_array.hpp
+x64-windows/include/boost/qvm/mat_traits_defaults.hpp
+x64-windows/include/boost/qvm/math.hpp
+x64-windows/include/boost/qvm/operations.hpp
+x64-windows/include/boost/qvm/quat.hpp
+x64-windows/include/boost/qvm/quat_access.hpp
+x64-windows/include/boost/qvm/quat_operations.hpp
+x64-windows/include/boost/qvm/quat_traits.hpp
+x64-windows/include/boost/qvm/quat_traits_array.hpp
+x64-windows/include/boost/qvm/quat_traits_defaults.hpp
+x64-windows/include/boost/qvm/quat_vec_operations.hpp
+x64-windows/include/boost/qvm/scalar_traits.hpp
+x64-windows/include/boost/qvm/static_assert.hpp
+x64-windows/include/boost/qvm/swizzle.hpp
+x64-windows/include/boost/qvm/swizzle2.hpp
+x64-windows/include/boost/qvm/swizzle3.hpp
+x64-windows/include/boost/qvm/swizzle4.hpp
+x64-windows/include/boost/qvm/throw_exception.hpp
+x64-windows/include/boost/qvm/to_string.hpp
+x64-windows/include/boost/qvm/vec.hpp
+x64-windows/include/boost/qvm/vec_access.hpp
+x64-windows/include/boost/qvm/vec_mat_operations.hpp
+x64-windows/include/boost/qvm/vec_mat_operations2.hpp
+x64-windows/include/boost/qvm/vec_mat_operations3.hpp
+x64-windows/include/boost/qvm/vec_mat_operations4.hpp
+x64-windows/include/boost/qvm/vec_operations.hpp
+x64-windows/include/boost/qvm/vec_operations2.hpp
+x64-windows/include/boost/qvm/vec_operations3.hpp
+x64-windows/include/boost/qvm/vec_operations4.hpp
+x64-windows/include/boost/qvm/vec_traits.hpp
+x64-windows/include/boost/qvm/vec_traits_array.hpp
+x64-windows/include/boost/qvm/vec_traits_defaults.hpp
+x64-windows/share/
+x64-windows/share/boost-qvm/
+x64-windows/share/boost-qvm/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-random_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,90 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_random-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_random-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_random-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_random-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_random-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/nondet_random.hpp
+x64-windows/include/boost/random.hpp
+x64-windows/include/boost/random/
+x64-windows/include/boost/random/additive_combine.hpp
+x64-windows/include/boost/random/bernoulli_distribution.hpp
+x64-windows/include/boost/random/beta_distribution.hpp
+x64-windows/include/boost/random/binomial_distribution.hpp
+x64-windows/include/boost/random/cauchy_distribution.hpp
+x64-windows/include/boost/random/chi_squared_distribution.hpp
+x64-windows/include/boost/random/detail/
+x64-windows/include/boost/random/detail/auto_link.hpp
+x64-windows/include/boost/random/detail/config.hpp
+x64-windows/include/boost/random/detail/const_mod.hpp
+x64-windows/include/boost/random/detail/disable_warnings.hpp
+x64-windows/include/boost/random/detail/enable_warnings.hpp
+x64-windows/include/boost/random/detail/generator_bits.hpp
+x64-windows/include/boost/random/detail/generator_seed_seq.hpp
+x64-windows/include/boost/random/detail/int_float_pair.hpp
+x64-windows/include/boost/random/detail/integer_log2.hpp
+x64-windows/include/boost/random/detail/iterator_mixin.hpp
+x64-windows/include/boost/random/detail/large_arithmetic.hpp
+x64-windows/include/boost/random/detail/operators.hpp
+x64-windows/include/boost/random/detail/polynomial.hpp
+x64-windows/include/boost/random/detail/ptr_helper.hpp
+x64-windows/include/boost/random/detail/seed.hpp
+x64-windows/include/boost/random/detail/seed_impl.hpp
+x64-windows/include/boost/random/detail/signed_unsigned_tools.hpp
+x64-windows/include/boost/random/detail/uniform_int_float.hpp
+x64-windows/include/boost/random/detail/vector_io.hpp
+x64-windows/include/boost/random/discard_block.hpp
+x64-windows/include/boost/random/discrete_distribution.hpp
+x64-windows/include/boost/random/exponential_distribution.hpp
+x64-windows/include/boost/random/extreme_value_distribution.hpp
+x64-windows/include/boost/random/fisher_f_distribution.hpp
+x64-windows/include/boost/random/gamma_distribution.hpp
+x64-windows/include/boost/random/generate_canonical.hpp
+x64-windows/include/boost/random/geometric_distribution.hpp
+x64-windows/include/boost/random/hyperexponential_distribution.hpp
+x64-windows/include/boost/random/independent_bits.hpp
+x64-windows/include/boost/random/inversive_congruential.hpp
+x64-windows/include/boost/random/lagged_fibonacci.hpp
+x64-windows/include/boost/random/laplace_distribution.hpp
+x64-windows/include/boost/random/linear_congruential.hpp
+x64-windows/include/boost/random/linear_feedback_shift.hpp
+x64-windows/include/boost/random/lognormal_distribution.hpp
+x64-windows/include/boost/random/mersenne_twister.hpp
+x64-windows/include/boost/random/negative_binomial_distribution.hpp
+x64-windows/include/boost/random/non_central_chi_squared_distribution.hpp
+x64-windows/include/boost/random/normal_distribution.hpp
+x64-windows/include/boost/random/piecewise_constant_distribution.hpp
+x64-windows/include/boost/random/piecewise_linear_distribution.hpp
+x64-windows/include/boost/random/poisson_distribution.hpp
+x64-windows/include/boost/random/random_device.hpp
+x64-windows/include/boost/random/random_number_generator.hpp
+x64-windows/include/boost/random/ranlux.hpp
+x64-windows/include/boost/random/seed_seq.hpp
+x64-windows/include/boost/random/shuffle_order.hpp
+x64-windows/include/boost/random/shuffle_output.hpp
+x64-windows/include/boost/random/student_t_distribution.hpp
+x64-windows/include/boost/random/subtract_with_carry.hpp
+x64-windows/include/boost/random/taus88.hpp
+x64-windows/include/boost/random/traits.hpp
+x64-windows/include/boost/random/triangle_distribution.hpp
+x64-windows/include/boost/random/uniform_01.hpp
+x64-windows/include/boost/random/uniform_int.hpp
+x64-windows/include/boost/random/uniform_int_distribution.hpp
+x64-windows/include/boost/random/uniform_on_sphere.hpp
+x64-windows/include/boost/random/uniform_real.hpp
+x64-windows/include/boost/random/uniform_real_distribution.hpp
+x64-windows/include/boost/random/uniform_smallint.hpp
+x64-windows/include/boost/random/variate_generator.hpp
+x64-windows/include/boost/random/weibull_distribution.hpp
+x64-windows/include/boost/random/xor_combine.hpp
+x64-windows/lib/
+x64-windows/lib/boost_random-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-random/
+x64-windows/share/boost-random/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-range_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,173 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/range.hpp
+x64-windows/include/boost/range/
+x64-windows/include/boost/range/adaptor/
+x64-windows/include/boost/range/adaptor/adjacent_filtered.hpp
+x64-windows/include/boost/range/adaptor/argument_fwd.hpp
+x64-windows/include/boost/range/adaptor/copied.hpp
+x64-windows/include/boost/range/adaptor/define_adaptor.hpp
+x64-windows/include/boost/range/adaptor/filtered.hpp
+x64-windows/include/boost/range/adaptor/formatted.hpp
+x64-windows/include/boost/range/adaptor/indexed.hpp
+x64-windows/include/boost/range/adaptor/indirected.hpp
+x64-windows/include/boost/range/adaptor/map.hpp
+x64-windows/include/boost/range/adaptor/replaced.hpp
+x64-windows/include/boost/range/adaptor/replaced_if.hpp
+x64-windows/include/boost/range/adaptor/reversed.hpp
+x64-windows/include/boost/range/adaptor/sliced.hpp
+x64-windows/include/boost/range/adaptor/strided.hpp
+x64-windows/include/boost/range/adaptor/tokenized.hpp
+x64-windows/include/boost/range/adaptor/transformed.hpp
+x64-windows/include/boost/range/adaptor/type_erased.hpp
+x64-windows/include/boost/range/adaptor/uniqued.hpp
+x64-windows/include/boost/range/adaptors.hpp
+x64-windows/include/boost/range/algorithm.hpp
+x64-windows/include/boost/range/algorithm/
+x64-windows/include/boost/range/algorithm/adjacent_find.hpp
+x64-windows/include/boost/range/algorithm/binary_search.hpp
+x64-windows/include/boost/range/algorithm/copy.hpp
+x64-windows/include/boost/range/algorithm/copy_backward.hpp
+x64-windows/include/boost/range/algorithm/count.hpp
+x64-windows/include/boost/range/algorithm/count_if.hpp
+x64-windows/include/boost/range/algorithm/equal.hpp
+x64-windows/include/boost/range/algorithm/equal_range.hpp
+x64-windows/include/boost/range/algorithm/fill.hpp
+x64-windows/include/boost/range/algorithm/fill_n.hpp
+x64-windows/include/boost/range/algorithm/find.hpp
+x64-windows/include/boost/range/algorithm/find_end.hpp
+x64-windows/include/boost/range/algorithm/find_first_of.hpp
+x64-windows/include/boost/range/algorithm/find_if.hpp
+x64-windows/include/boost/range/algorithm/for_each.hpp
+x64-windows/include/boost/range/algorithm/generate.hpp
+x64-windows/include/boost/range/algorithm/heap_algorithm.hpp
+x64-windows/include/boost/range/algorithm/inplace_merge.hpp
+x64-windows/include/boost/range/algorithm/lexicographical_compare.hpp
+x64-windows/include/boost/range/algorithm/lower_bound.hpp
+x64-windows/include/boost/range/algorithm/max_element.hpp
+x64-windows/include/boost/range/algorithm/merge.hpp
+x64-windows/include/boost/range/algorithm/min_element.hpp
+x64-windows/include/boost/range/algorithm/mismatch.hpp
+x64-windows/include/boost/range/algorithm/nth_element.hpp
+x64-windows/include/boost/range/algorithm/partial_sort.hpp
+x64-windows/include/boost/range/algorithm/partial_sort_copy.hpp
+x64-windows/include/boost/range/algorithm/partition.hpp
+x64-windows/include/boost/range/algorithm/permutation.hpp
+x64-windows/include/boost/range/algorithm/random_shuffle.hpp
+x64-windows/include/boost/range/algorithm/remove.hpp
+x64-windows/include/boost/range/algorithm/remove_copy.hpp
+x64-windows/include/boost/range/algorithm/remove_copy_if.hpp
+x64-windows/include/boost/range/algorithm/remove_if.hpp
+x64-windows/include/boost/range/algorithm/replace.hpp
+x64-windows/include/boost/range/algorithm/replace_copy.hpp
+x64-windows/include/boost/range/algorithm/replace_copy_if.hpp
+x64-windows/include/boost/range/algorithm/replace_if.hpp
+x64-windows/include/boost/range/algorithm/reverse.hpp
+x64-windows/include/boost/range/algorithm/reverse_copy.hpp
+x64-windows/include/boost/range/algorithm/rotate.hpp
+x64-windows/include/boost/range/algorithm/rotate_copy.hpp
+x64-windows/include/boost/range/algorithm/search.hpp
+x64-windows/include/boost/range/algorithm/search_n.hpp
+x64-windows/include/boost/range/algorithm/set_algorithm.hpp
+x64-windows/include/boost/range/algorithm/sort.hpp
+x64-windows/include/boost/range/algorithm/stable_partition.hpp
+x64-windows/include/boost/range/algorithm/stable_sort.hpp
+x64-windows/include/boost/range/algorithm/swap_ranges.hpp
+x64-windows/include/boost/range/algorithm/transform.hpp
+x64-windows/include/boost/range/algorithm/unique.hpp
+x64-windows/include/boost/range/algorithm/unique_copy.hpp
+x64-windows/include/boost/range/algorithm/upper_bound.hpp
+x64-windows/include/boost/range/algorithm_ext.hpp
+x64-windows/include/boost/range/algorithm_ext/
+x64-windows/include/boost/range/algorithm_ext/copy_n.hpp
+x64-windows/include/boost/range/algorithm_ext/erase.hpp
+x64-windows/include/boost/range/algorithm_ext/for_each.hpp
+x64-windows/include/boost/range/algorithm_ext/insert.hpp
+x64-windows/include/boost/range/algorithm_ext/iota.hpp
+x64-windows/include/boost/range/algorithm_ext/is_sorted.hpp
+x64-windows/include/boost/range/algorithm_ext/overwrite.hpp
+x64-windows/include/boost/range/algorithm_ext/push_back.hpp
+x64-windows/include/boost/range/algorithm_ext/push_front.hpp
+x64-windows/include/boost/range/any_range.hpp
+x64-windows/include/boost/range/as_array.hpp
+x64-windows/include/boost/range/as_literal.hpp
+x64-windows/include/boost/range/atl.hpp
+x64-windows/include/boost/range/begin.hpp
+x64-windows/include/boost/range/category.hpp
+x64-windows/include/boost/range/combine.hpp
+x64-windows/include/boost/range/concepts.hpp
+x64-windows/include/boost/range/config.hpp
+x64-windows/include/boost/range/const_iterator.hpp
+x64-windows/include/boost/range/const_reverse_iterator.hpp
+x64-windows/include/boost/range/counting_range.hpp
+x64-windows/include/boost/range/detail/
+x64-windows/include/boost/range/detail/any_iterator.hpp
+x64-windows/include/boost/range/detail/any_iterator_buffer.hpp
+x64-windows/include/boost/range/detail/any_iterator_interface.hpp
+x64-windows/include/boost/range/detail/any_iterator_wrapper.hpp
+x64-windows/include/boost/range/detail/as_literal.hpp
+x64-windows/include/boost/range/detail/begin.hpp
+x64-windows/include/boost/range/detail/collection_traits.hpp
+x64-windows/include/boost/range/detail/collection_traits_detail.hpp
+x64-windows/include/boost/range/detail/combine_cxx03.hpp
+x64-windows/include/boost/range/detail/combine_cxx11.hpp
+x64-windows/include/boost/range/detail/combine_no_rvalue.hpp
+x64-windows/include/boost/range/detail/combine_rvalue.hpp
+x64-windows/include/boost/range/detail/common.hpp
+x64-windows/include/boost/range/detail/default_constructible_unary_fn.hpp
+x64-windows/include/boost/range/detail/demote_iterator_traversal_tag.hpp
+x64-windows/include/boost/range/detail/detail_str.hpp
+x64-windows/include/boost/range/detail/difference_type.hpp
+x64-windows/include/boost/range/detail/empty.hpp
+x64-windows/include/boost/range/detail/end.hpp
+x64-windows/include/boost/range/detail/extract_optional_type.hpp
+x64-windows/include/boost/range/detail/has_member_size.hpp
+x64-windows/include/boost/range/detail/implementation_help.hpp
+x64-windows/include/boost/range/detail/join_iterator.hpp
+x64-windows/include/boost/range/detail/microsoft.hpp
+x64-windows/include/boost/range/detail/misc_concept.hpp
+x64-windows/include/boost/range/detail/msvc_has_iterator_workaround.hpp
+x64-windows/include/boost/range/detail/range_return.hpp
+x64-windows/include/boost/range/detail/remove_extent.hpp
+x64-windows/include/boost/range/detail/safe_bool.hpp
+x64-windows/include/boost/range/detail/sfinae.hpp
+x64-windows/include/boost/range/detail/size_type.hpp
+x64-windows/include/boost/range/detail/sizer.hpp
+x64-windows/include/boost/range/detail/str_types.hpp
+x64-windows/include/boost/range/detail/value_type.hpp
+x64-windows/include/boost/range/difference_type.hpp
+x64-windows/include/boost/range/distance.hpp
+x64-windows/include/boost/range/empty.hpp
+x64-windows/include/boost/range/end.hpp
+x64-windows/include/boost/range/functions.hpp
+x64-windows/include/boost/range/has_range_iterator.hpp
+x64-windows/include/boost/range/irange.hpp
+x64-windows/include/boost/range/istream_range.hpp
+x64-windows/include/boost/range/iterator.hpp
+x64-windows/include/boost/range/iterator_range.hpp
+x64-windows/include/boost/range/iterator_range_core.hpp
+x64-windows/include/boost/range/iterator_range_hash.hpp
+x64-windows/include/boost/range/iterator_range_io.hpp
+x64-windows/include/boost/range/join.hpp
+x64-windows/include/boost/range/metafunctions.hpp
+x64-windows/include/boost/range/mfc.hpp
+x64-windows/include/boost/range/mfc_map.hpp
+x64-windows/include/boost/range/mutable_iterator.hpp
+x64-windows/include/boost/range/numeric.hpp
+x64-windows/include/boost/range/pointer.hpp
+x64-windows/include/boost/range/range_fwd.hpp
+x64-windows/include/boost/range/rbegin.hpp
+x64-windows/include/boost/range/reference.hpp
+x64-windows/include/boost/range/rend.hpp
+x64-windows/include/boost/range/result_iterator.hpp
+x64-windows/include/boost/range/reverse_iterator.hpp
+x64-windows/include/boost/range/reverse_result_iterator.hpp
+x64-windows/include/boost/range/size.hpp
+x64-windows/include/boost/range/size_type.hpp
+x64-windows/include/boost/range/sub_range.hpp
+x64-windows/include/boost/range/traversal.hpp
+x64-windows/include/boost/range/value_type.hpp
+x64-windows/share/
+x64-windows/share/boost-range/
+x64-windows/share/boost-range/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-ratio_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,42 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/ratio.hpp
+x64-windows/include/boost/ratio/
+x64-windows/include/boost/ratio/config.hpp
+x64-windows/include/boost/ratio/detail/
+x64-windows/include/boost/ratio/detail/mpl/
+x64-windows/include/boost/ratio/detail/mpl/abs.hpp
+x64-windows/include/boost/ratio/detail/mpl/gcd.hpp
+x64-windows/include/boost/ratio/detail/mpl/lcm.hpp
+x64-windows/include/boost/ratio/detail/mpl/sign.hpp
+x64-windows/include/boost/ratio/detail/overflow_helpers.hpp
+x64-windows/include/boost/ratio/detail/ratio_io.hpp
+x64-windows/include/boost/ratio/include.hpp
+x64-windows/include/boost/ratio/mpl/
+x64-windows/include/boost/ratio/mpl/abs.hpp
+x64-windows/include/boost/ratio/mpl/arithmetic.hpp
+x64-windows/include/boost/ratio/mpl/comparison.hpp
+x64-windows/include/boost/ratio/mpl/divides.hpp
+x64-windows/include/boost/ratio/mpl/equal_to.hpp
+x64-windows/include/boost/ratio/mpl/gcd.hpp
+x64-windows/include/boost/ratio/mpl/greater.hpp
+x64-windows/include/boost/ratio/mpl/greater_equal.hpp
+x64-windows/include/boost/ratio/mpl/lcm.hpp
+x64-windows/include/boost/ratio/mpl/less.hpp
+x64-windows/include/boost/ratio/mpl/less_equal.hpp
+x64-windows/include/boost/ratio/mpl/minus.hpp
+x64-windows/include/boost/ratio/mpl/negate.hpp
+x64-windows/include/boost/ratio/mpl/not_equal_to.hpp
+x64-windows/include/boost/ratio/mpl/numeric_cast.hpp
+x64-windows/include/boost/ratio/mpl/plus.hpp
+x64-windows/include/boost/ratio/mpl/rational_c_tag.hpp
+x64-windows/include/boost/ratio/mpl/rational_constant.hpp
+x64-windows/include/boost/ratio/mpl/sign.hpp
+x64-windows/include/boost/ratio/mpl/times.hpp
+x64-windows/include/boost/ratio/ratio.hpp
+x64-windows/include/boost/ratio/ratio_fwd.hpp
+x64-windows/include/boost/ratio/ratio_io.hpp
+x64-windows/share/
+x64-windows/share/boost-ratio/
+x64-windows/share/boost-ratio/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-rational_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/rational.hpp
+x64-windows/share/
+x64-windows/share/boost-rational/
+x64-windows/share/boost-rational/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-regex_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,80 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_regex-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_regex-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_regex-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_regex-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_regex-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/cregex.hpp
+x64-windows/include/boost/regex.h
+x64-windows/include/boost/regex.hpp
+x64-windows/include/boost/regex/
+x64-windows/include/boost/regex/concepts.hpp
+x64-windows/include/boost/regex/config.hpp
+x64-windows/include/boost/regex/config/
+x64-windows/include/boost/regex/config/borland.hpp
+x64-windows/include/boost/regex/config/cwchar.hpp
+x64-windows/include/boost/regex/icu.hpp
+x64-windows/include/boost/regex/mfc.hpp
+x64-windows/include/boost/regex/pattern_except.hpp
+x64-windows/include/boost/regex/pending/
+x64-windows/include/boost/regex/pending/object_cache.hpp
+x64-windows/include/boost/regex/pending/static_mutex.hpp
+x64-windows/include/boost/regex/pending/unicode_iterator.hpp
+x64-windows/include/boost/regex/regex_traits.hpp
+x64-windows/include/boost/regex/user.hpp
+x64-windows/include/boost/regex/v4/
+x64-windows/include/boost/regex/v4/basic_regex.hpp
+x64-windows/include/boost/regex/v4/basic_regex_creator.hpp
+x64-windows/include/boost/regex/v4/basic_regex_parser.hpp
+x64-windows/include/boost/regex/v4/c_regex_traits.hpp
+x64-windows/include/boost/regex/v4/char_regex_traits.hpp
+x64-windows/include/boost/regex/v4/cpp_regex_traits.hpp
+x64-windows/include/boost/regex/v4/cregex.hpp
+x64-windows/include/boost/regex/v4/error_type.hpp
+x64-windows/include/boost/regex/v4/fileiter.hpp
+x64-windows/include/boost/regex/v4/instances.hpp
+x64-windows/include/boost/regex/v4/iterator_category.hpp
+x64-windows/include/boost/regex/v4/iterator_traits.hpp
+x64-windows/include/boost/regex/v4/match_flags.hpp
+x64-windows/include/boost/regex/v4/match_results.hpp
+x64-windows/include/boost/regex/v4/mem_block_cache.hpp
+x64-windows/include/boost/regex/v4/perl_matcher.hpp
+x64-windows/include/boost/regex/v4/perl_matcher_common.hpp
+x64-windows/include/boost/regex/v4/perl_matcher_non_recursive.hpp
+x64-windows/include/boost/regex/v4/perl_matcher_recursive.hpp
+x64-windows/include/boost/regex/v4/primary_transform.hpp
+x64-windows/include/boost/regex/v4/protected_call.hpp
+x64-windows/include/boost/regex/v4/regbase.hpp
+x64-windows/include/boost/regex/v4/regex.hpp
+x64-windows/include/boost/regex/v4/regex_format.hpp
+x64-windows/include/boost/regex/v4/regex_fwd.hpp
+x64-windows/include/boost/regex/v4/regex_grep.hpp
+x64-windows/include/boost/regex/v4/regex_iterator.hpp
+x64-windows/include/boost/regex/v4/regex_match.hpp
+x64-windows/include/boost/regex/v4/regex_merge.hpp
+x64-windows/include/boost/regex/v4/regex_raw_buffer.hpp
+x64-windows/include/boost/regex/v4/regex_replace.hpp
+x64-windows/include/boost/regex/v4/regex_search.hpp
+x64-windows/include/boost/regex/v4/regex_split.hpp
+x64-windows/include/boost/regex/v4/regex_token_iterator.hpp
+x64-windows/include/boost/regex/v4/regex_traits.hpp
+x64-windows/include/boost/regex/v4/regex_traits_defaults.hpp
+x64-windows/include/boost/regex/v4/regex_workaround.hpp
+x64-windows/include/boost/regex/v4/states.hpp
+x64-windows/include/boost/regex/v4/sub_match.hpp
+x64-windows/include/boost/regex/v4/syntax_type.hpp
+x64-windows/include/boost/regex/v4/u32regex_iterator.hpp
+x64-windows/include/boost/regex/v4/u32regex_token_iterator.hpp
+x64-windows/include/boost/regex/v4/w32_regex_traits.hpp
+x64-windows/include/boost/regex_fwd.hpp
+x64-windows/lib/
+x64-windows/lib/boost_regex-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-regex/
+x64-windows/share/boost-regex/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-serialization_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,220 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_serialization-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_serialization-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_wserialization-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_wserialization-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_serialization-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_serialization-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_wserialization-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_wserialization-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_serialization-vc140-mt-gd.lib
+x64-windows/debug/lib/boost_wserialization-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/archive/
+x64-windows/include/boost/archive/archive_exception.hpp
+x64-windows/include/boost/archive/basic_archive.hpp
+x64-windows/include/boost/archive/basic_binary_iarchive.hpp
+x64-windows/include/boost/archive/basic_binary_iprimitive.hpp
+x64-windows/include/boost/archive/basic_binary_oarchive.hpp
+x64-windows/include/boost/archive/basic_binary_oprimitive.hpp
+x64-windows/include/boost/archive/basic_streambuf_locale_saver.hpp
+x64-windows/include/boost/archive/basic_text_iarchive.hpp
+x64-windows/include/boost/archive/basic_text_iprimitive.hpp
+x64-windows/include/boost/archive/basic_text_oarchive.hpp
+x64-windows/include/boost/archive/basic_text_oprimitive.hpp
+x64-windows/include/boost/archive/basic_xml_archive.hpp
+x64-windows/include/boost/archive/basic_xml_iarchive.hpp
+x64-windows/include/boost/archive/basic_xml_oarchive.hpp
+x64-windows/include/boost/archive/binary_iarchive.hpp
+x64-windows/include/boost/archive/binary_iarchive_impl.hpp
+x64-windows/include/boost/archive/binary_oarchive.hpp
+x64-windows/include/boost/archive/binary_oarchive_impl.hpp
+x64-windows/include/boost/archive/binary_wiarchive.hpp
+x64-windows/include/boost/archive/binary_woarchive.hpp
+x64-windows/include/boost/archive/codecvt_null.hpp
+x64-windows/include/boost/archive/detail/
+x64-windows/include/boost/archive/detail/abi_prefix.hpp
+x64-windows/include/boost/archive/detail/abi_suffix.hpp
+x64-windows/include/boost/archive/detail/archive_serializer_map.hpp
+x64-windows/include/boost/archive/detail/auto_link_archive.hpp
+x64-windows/include/boost/archive/detail/auto_link_warchive.hpp
+x64-windows/include/boost/archive/detail/basic_iarchive.hpp
+x64-windows/include/boost/archive/detail/basic_iserializer.hpp
+x64-windows/include/boost/archive/detail/basic_oarchive.hpp
+x64-windows/include/boost/archive/detail/basic_oserializer.hpp
+x64-windows/include/boost/archive/detail/basic_pointer_iserializer.hpp
+x64-windows/include/boost/archive/detail/basic_pointer_oserializer.hpp
+x64-windows/include/boost/archive/detail/basic_serializer.hpp
+x64-windows/include/boost/archive/detail/basic_serializer_map.hpp
+x64-windows/include/boost/archive/detail/check.hpp
+x64-windows/include/boost/archive/detail/common_iarchive.hpp
+x64-windows/include/boost/archive/detail/common_oarchive.hpp
+x64-windows/include/boost/archive/detail/decl.hpp
+x64-windows/include/boost/archive/detail/helper_collection.hpp
+x64-windows/include/boost/archive/detail/interface_iarchive.hpp
+x64-windows/include/boost/archive/detail/interface_oarchive.hpp
+x64-windows/include/boost/archive/detail/iserializer.hpp
+x64-windows/include/boost/archive/detail/oserializer.hpp
+x64-windows/include/boost/archive/detail/polymorphic_iarchive_route.hpp
+x64-windows/include/boost/archive/detail/polymorphic_oarchive_route.hpp
+x64-windows/include/boost/archive/detail/register_archive.hpp
+x64-windows/include/boost/archive/detail/utf8_codecvt_facet.hpp
+x64-windows/include/boost/archive/dinkumware.hpp
+x64-windows/include/boost/archive/impl/
+x64-windows/include/boost/archive/impl/archive_serializer_map.ipp
+x64-windows/include/boost/archive/impl/basic_binary_iarchive.ipp
+x64-windows/include/boost/archive/impl/basic_binary_iprimitive.ipp
+x64-windows/include/boost/archive/impl/basic_binary_oarchive.ipp
+x64-windows/include/boost/archive/impl/basic_binary_oprimitive.ipp
+x64-windows/include/boost/archive/impl/basic_text_iarchive.ipp
+x64-windows/include/boost/archive/impl/basic_text_iprimitive.ipp
+x64-windows/include/boost/archive/impl/basic_text_oarchive.ipp
+x64-windows/include/boost/archive/impl/basic_text_oprimitive.ipp
+x64-windows/include/boost/archive/impl/basic_xml_grammar.hpp
+x64-windows/include/boost/archive/impl/basic_xml_iarchive.ipp
+x64-windows/include/boost/archive/impl/basic_xml_oarchive.ipp
+x64-windows/include/boost/archive/impl/text_iarchive_impl.ipp
+x64-windows/include/boost/archive/impl/text_oarchive_impl.ipp
+x64-windows/include/boost/archive/impl/text_wiarchive_impl.ipp
+x64-windows/include/boost/archive/impl/text_woarchive_impl.ipp
+x64-windows/include/boost/archive/impl/xml_iarchive_impl.ipp
+x64-windows/include/boost/archive/impl/xml_oarchive_impl.ipp
+x64-windows/include/boost/archive/impl/xml_wiarchive_impl.ipp
+x64-windows/include/boost/archive/impl/xml_woarchive_impl.ipp
+x64-windows/include/boost/archive/iterators/
+x64-windows/include/boost/archive/iterators/base64_exception.hpp
+x64-windows/include/boost/archive/iterators/base64_from_binary.hpp
+x64-windows/include/boost/archive/iterators/binary_from_base64.hpp
+x64-windows/include/boost/archive/iterators/dataflow.hpp
+x64-windows/include/boost/archive/iterators/dataflow_exception.hpp
+x64-windows/include/boost/archive/iterators/escape.hpp
+x64-windows/include/boost/archive/iterators/insert_linebreaks.hpp
+x64-windows/include/boost/archive/iterators/istream_iterator.hpp
+x64-windows/include/boost/archive/iterators/mb_from_wchar.hpp
+x64-windows/include/boost/archive/iterators/ostream_iterator.hpp
+x64-windows/include/boost/archive/iterators/remove_whitespace.hpp
+x64-windows/include/boost/archive/iterators/transform_width.hpp
+x64-windows/include/boost/archive/iterators/unescape.hpp
+x64-windows/include/boost/archive/iterators/wchar_from_mb.hpp
+x64-windows/include/boost/archive/iterators/xml_escape.hpp
+x64-windows/include/boost/archive/iterators/xml_unescape.hpp
+x64-windows/include/boost/archive/iterators/xml_unescape_exception.hpp
+x64-windows/include/boost/archive/polymorphic_binary_iarchive.hpp
+x64-windows/include/boost/archive/polymorphic_binary_oarchive.hpp
+x64-windows/include/boost/archive/polymorphic_iarchive.hpp
+x64-windows/include/boost/archive/polymorphic_oarchive.hpp
+x64-windows/include/boost/archive/polymorphic_text_iarchive.hpp
+x64-windows/include/boost/archive/polymorphic_text_oarchive.hpp
+x64-windows/include/boost/archive/polymorphic_text_wiarchive.hpp
+x64-windows/include/boost/archive/polymorphic_text_woarchive.hpp
+x64-windows/include/boost/archive/polymorphic_xml_iarchive.hpp
+x64-windows/include/boost/archive/polymorphic_xml_oarchive.hpp
+x64-windows/include/boost/archive/polymorphic_xml_wiarchive.hpp
+x64-windows/include/boost/archive/polymorphic_xml_woarchive.hpp
+x64-windows/include/boost/archive/text_iarchive.hpp
+x64-windows/include/boost/archive/text_oarchive.hpp
+x64-windows/include/boost/archive/text_wiarchive.hpp
+x64-windows/include/boost/archive/text_woarchive.hpp
+x64-windows/include/boost/archive/tmpdir.hpp
+x64-windows/include/boost/archive/wcslen.hpp
+x64-windows/include/boost/archive/xml_archive_exception.hpp
+x64-windows/include/boost/archive/xml_iarchive.hpp
+x64-windows/include/boost/archive/xml_oarchive.hpp
+x64-windows/include/boost/archive/xml_wiarchive.hpp
+x64-windows/include/boost/archive/xml_woarchive.hpp
+x64-windows/include/boost/serialization/
+x64-windows/include/boost/serialization/access.hpp
+x64-windows/include/boost/serialization/archive_input_unordered_map.hpp
+x64-windows/include/boost/serialization/archive_input_unordered_set.hpp
+x64-windows/include/boost/serialization/array.hpp
+x64-windows/include/boost/serialization/array_optimization.hpp
+x64-windows/include/boost/serialization/array_wrapper.hpp
+x64-windows/include/boost/serialization/assume_abstract.hpp
+x64-windows/include/boost/serialization/base_object.hpp
+x64-windows/include/boost/serialization/binary_object.hpp
+x64-windows/include/boost/serialization/bitset.hpp
+x64-windows/include/boost/serialization/boost_array.hpp
+x64-windows/include/boost/serialization/boost_unordered_map.hpp
+x64-windows/include/boost/serialization/boost_unordered_set.hpp
+x64-windows/include/boost/serialization/collection_size_type.hpp
+x64-windows/include/boost/serialization/collection_traits.hpp
+x64-windows/include/boost/serialization/collections_load_imp.hpp
+x64-windows/include/boost/serialization/collections_save_imp.hpp
+x64-windows/include/boost/serialization/complex.hpp
+x64-windows/include/boost/serialization/config.hpp
+x64-windows/include/boost/serialization/deque.hpp
+x64-windows/include/boost/serialization/detail/
+x64-windows/include/boost/serialization/detail/is_default_constructible.hpp
+x64-windows/include/boost/serialization/detail/shared_count_132.hpp
+x64-windows/include/boost/serialization/detail/shared_ptr_132.hpp
+x64-windows/include/boost/serialization/detail/shared_ptr_nmt_132.hpp
+x64-windows/include/boost/serialization/detail/stack_constructor.hpp
+x64-windows/include/boost/serialization/ephemeral.hpp
+x64-windows/include/boost/serialization/export.hpp
+x64-windows/include/boost/serialization/extended_type_info.hpp
+x64-windows/include/boost/serialization/extended_type_info_no_rtti.hpp
+x64-windows/include/boost/serialization/extended_type_info_typeid.hpp
+x64-windows/include/boost/serialization/factory.hpp
+x64-windows/include/boost/serialization/force_include.hpp
+x64-windows/include/boost/serialization/forward_list.hpp
+x64-windows/include/boost/serialization/hash_collections_load_imp.hpp
+x64-windows/include/boost/serialization/hash_collections_save_imp.hpp
+x64-windows/include/boost/serialization/hash_map.hpp
+x64-windows/include/boost/serialization/hash_set.hpp
+x64-windows/include/boost/serialization/is_bitwise_serializable.hpp
+x64-windows/include/boost/serialization/item_version_type.hpp
+x64-windows/include/boost/serialization/level.hpp
+x64-windows/include/boost/serialization/level_enum.hpp
+x64-windows/include/boost/serialization/list.hpp
+x64-windows/include/boost/serialization/map.hpp
+x64-windows/include/boost/serialization/nvp.hpp
+x64-windows/include/boost/serialization/optional.hpp
+x64-windows/include/boost/serialization/priority_queue.hpp
+x64-windows/include/boost/serialization/queue.hpp
+x64-windows/include/boost/serialization/scoped_ptr.hpp
+x64-windows/include/boost/serialization/serialization.hpp
+x64-windows/include/boost/serialization/set.hpp
+x64-windows/include/boost/serialization/shared_ptr.hpp
+x64-windows/include/boost/serialization/shared_ptr_132.hpp
+x64-windows/include/boost/serialization/shared_ptr_helper.hpp
+x64-windows/include/boost/serialization/singleton.hpp
+x64-windows/include/boost/serialization/slist.hpp
+x64-windows/include/boost/serialization/smart_cast.hpp
+x64-windows/include/boost/serialization/split_free.hpp
+x64-windows/include/boost/serialization/split_member.hpp
+x64-windows/include/boost/serialization/stack.hpp
+x64-windows/include/boost/serialization/state_saver.hpp
+x64-windows/include/boost/serialization/static_warning.hpp
+x64-windows/include/boost/serialization/string.hpp
+x64-windows/include/boost/serialization/strong_typedef.hpp
+x64-windows/include/boost/serialization/throw_exception.hpp
+x64-windows/include/boost/serialization/tracking.hpp
+x64-windows/include/boost/serialization/tracking_enum.hpp
+x64-windows/include/boost/serialization/traits.hpp
+x64-windows/include/boost/serialization/type_info_implementation.hpp
+x64-windows/include/boost/serialization/unique_ptr.hpp
+x64-windows/include/boost/serialization/unordered_collections_load_imp.hpp
+x64-windows/include/boost/serialization/unordered_collections_save_imp.hpp
+x64-windows/include/boost/serialization/unordered_map.hpp
+x64-windows/include/boost/serialization/unordered_set.hpp
+x64-windows/include/boost/serialization/utility.hpp
+x64-windows/include/boost/serialization/valarray.hpp
+x64-windows/include/boost/serialization/variant.hpp
+x64-windows/include/boost/serialization/vector.hpp
+x64-windows/include/boost/serialization/vector_135.hpp
+x64-windows/include/boost/serialization/version.hpp
+x64-windows/include/boost/serialization/void_cast.hpp
+x64-windows/include/boost/serialization/void_cast_fwd.hpp
+x64-windows/include/boost/serialization/weak_ptr.hpp
+x64-windows/include/boost/serialization/wrapper.hpp
+x64-windows/lib/
+x64-windows/lib/boost_serialization-vc140-mt.lib
+x64-windows/lib/boost_wserialization-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-serialization/
+x64-windows/share/boost-serialization/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-smart-ptr_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,103 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/atomic_count.hpp
+x64-windows/include/boost/detail/lightweight_mutex.hpp
+x64-windows/include/boost/detail/lightweight_thread.hpp
+x64-windows/include/boost/detail/quick_allocator.hpp
+x64-windows/include/boost/enable_shared_from_this.hpp
+x64-windows/include/boost/intrusive_ptr.hpp
+x64-windows/include/boost/make_shared.hpp
+x64-windows/include/boost/make_unique.hpp
+x64-windows/include/boost/pointer_cast.hpp
+x64-windows/include/boost/pointer_to_other.hpp
+x64-windows/include/boost/scoped_array.hpp
+x64-windows/include/boost/scoped_ptr.hpp
+x64-windows/include/boost/shared_array.hpp
+x64-windows/include/boost/shared_ptr.hpp
+x64-windows/include/boost/smart_ptr.hpp
+x64-windows/include/boost/smart_ptr/
+x64-windows/include/boost/smart_ptr/allocate_local_shared_array.hpp
+x64-windows/include/boost/smart_ptr/allocate_shared_array.hpp
+x64-windows/include/boost/smart_ptr/atomic_shared_ptr.hpp
+x64-windows/include/boost/smart_ptr/bad_weak_ptr.hpp
+x64-windows/include/boost/smart_ptr/detail/
+x64-windows/include/boost/smart_ptr/detail/atomic_count.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_gcc.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_nt.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_pt.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_solaris.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_spin.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_std_atomic.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_sync.hpp
+x64-windows/include/boost/smart_ptr/detail/atomic_count_win32.hpp
+x64-windows/include/boost/smart_ptr/detail/lightweight_mutex.hpp
+x64-windows/include/boost/smart_ptr/detail/local_counted_base.hpp
+x64-windows/include/boost/smart_ptr/detail/local_sp_deleter.hpp
+x64-windows/include/boost/smart_ptr/detail/lwm_nop.hpp
+x64-windows/include/boost/smart_ptr/detail/lwm_pthreads.hpp
+x64-windows/include/boost/smart_ptr/detail/lwm_win32_cs.hpp
+x64-windows/include/boost/smart_ptr/detail/operator_bool.hpp
+x64-windows/include/boost/smart_ptr/detail/quick_allocator.hpp
+x64-windows/include/boost/smart_ptr/detail/shared_count.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_convertible.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_aix.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_pt.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_solaris.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_spin.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_sync.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_counted_impl.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_disable_deprecated.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_forward.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_has_sync.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_interlocked.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_noexcept.hpp
+x64-windows/include/boost/smart_ptr/detail/sp_nullptr_t.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_nt.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_pool.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_pt.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_sync.hpp
+x64-windows/include/boost/smart_ptr/detail/spinlock_w32.hpp
+x64-windows/include/boost/smart_ptr/detail/yield_k.hpp
+x64-windows/include/boost/smart_ptr/enable_shared_from_raw.hpp
+x64-windows/include/boost/smart_ptr/enable_shared_from_this.hpp
+x64-windows/include/boost/smart_ptr/intrusive_ptr.hpp
+x64-windows/include/boost/smart_ptr/intrusive_ref_counter.hpp
+x64-windows/include/boost/smart_ptr/local_shared_ptr.hpp
+x64-windows/include/boost/smart_ptr/make_local_shared.hpp
+x64-windows/include/boost/smart_ptr/make_local_shared_array.hpp
+x64-windows/include/boost/smart_ptr/make_local_shared_object.hpp
+x64-windows/include/boost/smart_ptr/make_shared.hpp
+x64-windows/include/boost/smart_ptr/make_shared_array.hpp
+x64-windows/include/boost/smart_ptr/make_shared_object.hpp
+x64-windows/include/boost/smart_ptr/make_unique.hpp
+x64-windows/include/boost/smart_ptr/owner_less.hpp
+x64-windows/include/boost/smart_ptr/scoped_array.hpp
+x64-windows/include/boost/smart_ptr/scoped_ptr.hpp
+x64-windows/include/boost/smart_ptr/shared_array.hpp
+x64-windows/include/boost/smart_ptr/shared_ptr.hpp
+x64-windows/include/boost/smart_ptr/weak_ptr.hpp
+x64-windows/include/boost/weak_ptr.hpp
+x64-windows/share/
+x64-windows/share/boost-smart-ptr/
+x64-windows/share/boost-smart-ptr/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-spirit_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,1207 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/spirit.hpp
+x64-windows/include/boost/spirit/
+x64-windows/include/boost/spirit/home/
+x64-windows/include/boost/spirit/home/classic.hpp
+x64-windows/include/boost/spirit/home/classic/
+x64-windows/include/boost/spirit/home/classic/actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/
+x64-windows/include/boost/spirit/home/classic/actor/assign_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/assign_key_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/clear_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/decrement_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/erase_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/increment_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/insert_at_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/insert_key_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/push_back_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/push_front_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_const_ref_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_const_ref_const_ref_a.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_const_ref_value_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/ref_value_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/swap_actor.hpp
+x64-windows/include/boost/spirit/home/classic/actor/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/attribute.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/
+x64-windows/include/boost/spirit/home/classic/attribute/closure.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/closure_context.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/closure_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/parametric.hpp
+x64-windows/include/boost/spirit/home/classic/attribute/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/core.hpp
+x64-windows/include/boost/spirit/home/classic/core/
+x64-windows/include/boost/spirit/home/classic/core/assert.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/
+x64-windows/include/boost/spirit/home/classic/core/composite/actions.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/alternative.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/composite.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/difference.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/directives.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/epsilon.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/exclusive_or.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/alternative.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/difference.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/directives.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/exclusive_or.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/intersection.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/kleene_star.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/list.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/optional.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/positive.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/sequence.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/sequential_and.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/impl/sequential_or.ipp
+x64-windows/include/boost/spirit/home/classic/core/composite/intersection.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/kleene_star.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/list.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/no_actions.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/operators.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/optional.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/positive.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/sequence.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/sequential_and.hpp
+x64-windows/include/boost/spirit/home/classic/core/composite/sequential_or.hpp
+x64-windows/include/boost/spirit/home/classic/core/config.hpp
+x64-windows/include/boost/spirit/home/classic/core/impl/
+x64-windows/include/boost/spirit/home/classic/core/impl/match.ipp
+x64-windows/include/boost/spirit/home/classic/core/impl/match_attr_traits.ipp
+x64-windows/include/boost/spirit/home/classic/core/impl/parser.ipp
+x64-windows/include/boost/spirit/home/classic/core/match.hpp
+x64-windows/include/boost/spirit/home/classic/core/nil.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/grammar.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/static.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/impl/subrule.ipp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/parser_context.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/rule.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/subrule.hpp
+x64-windows/include/boost/spirit/home/classic/core/non_terminal/subrule_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/core/parser.hpp
+x64-windows/include/boost/spirit/home/classic/core/primitives/
+x64-windows/include/boost/spirit/home/classic/core/primitives/impl/
+x64-windows/include/boost/spirit/home/classic/core/primitives/impl/numerics.ipp
+x64-windows/include/boost/spirit/home/classic/core/primitives/impl/primitives.ipp
+x64-windows/include/boost/spirit/home/classic/core/primitives/numerics.hpp
+x64-windows/include/boost/spirit/home/classic/core/primitives/numerics_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/core/primitives/primitives.hpp
+x64-windows/include/boost/spirit/home/classic/core/safe_bool.hpp
+x64-windows/include/boost/spirit/home/classic/core/scanner/
+x64-windows/include/boost/spirit/home/classic/core/scanner/impl/
+x64-windows/include/boost/spirit/home/classic/core/scanner/impl/skipper.ipp
+x64-windows/include/boost/spirit/home/classic/core/scanner/scanner.hpp
+x64-windows/include/boost/spirit/home/classic/core/scanner/scanner_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/core/scanner/skipper.hpp
+x64-windows/include/boost/spirit/home/classic/core/scanner/skipper_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/core/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/debug.hpp
+x64-windows/include/boost/spirit/home/classic/debug/
+x64-windows/include/boost/spirit/home/classic/debug/debug_node.hpp
+x64-windows/include/boost/spirit/home/classic/debug/impl/
+x64-windows/include/boost/spirit/home/classic/debug/impl/parser_names.ipp
+x64-windows/include/boost/spirit/home/classic/debug/minimal.hpp
+x64-windows/include/boost/spirit/home/classic/debug/parser_names.hpp
+x64-windows/include/boost/spirit/home/classic/debug/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/
+x64-windows/include/boost/spirit/home/classic/dynamic/for.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/if.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/impl/
+x64-windows/include/boost/spirit/home/classic/dynamic/impl/conditions.ipp
+x64-windows/include/boost/spirit/home/classic/dynamic/impl/select.ipp
+x64-windows/include/boost/spirit/home/classic/dynamic/impl/switch.ipp
+x64-windows/include/boost/spirit/home/classic/dynamic/lazy.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/rule_alias.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/select.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/stored_rule.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/stored_rule_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/switch.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/dynamic/while.hpp
+x64-windows/include/boost/spirit/home/classic/error_handling.hpp
+x64-windows/include/boost/spirit/home/classic/error_handling/
+x64-windows/include/boost/spirit/home/classic/error_handling/exceptions.hpp
+x64-windows/include/boost/spirit/home/classic/error_handling/exceptions_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/error_handling/impl/
+x64-windows/include/boost/spirit/home/classic/error_handling/impl/exceptions.ipp
+x64-windows/include/boost/spirit/home/classic/error_handling/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/iterator.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/
+x64-windows/include/boost/spirit/home/classic/iterator/file_iterator.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/file_iterator_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/fixed_size_queue.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/impl/
+x64-windows/include/boost/spirit/home/classic/iterator/impl/file_iterator.ipp
+x64-windows/include/boost/spirit/home/classic/iterator/impl/position_iterator.ipp
+x64-windows/include/boost/spirit/home/classic/iterator/multi_pass.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/multi_pass_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/position_iterator.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/position_iterator_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/iterator/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/meta.hpp
+x64-windows/include/boost/spirit/home/classic/meta/
+x64-windows/include/boost/spirit/home/classic/meta/as_parser.hpp
+x64-windows/include/boost/spirit/home/classic/meta/fundamental.hpp
+x64-windows/include/boost/spirit/home/classic/meta/impl/
+x64-windows/include/boost/spirit/home/classic/meta/impl/fundamental.ipp
+x64-windows/include/boost/spirit/home/classic/meta/impl/parser_traits.ipp
+x64-windows/include/boost/spirit/home/classic/meta/impl/refactoring.ipp
+x64-windows/include/boost/spirit/home/classic/meta/impl/traverse.ipp
+x64-windows/include/boost/spirit/home/classic/meta/parser_traits.hpp
+x64-windows/include/boost/spirit/home/classic/meta/refactoring.hpp
+x64-windows/include/boost/spirit/home/classic/meta/traverse.hpp
+x64-windows/include/boost/spirit/home/classic/namespace.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/
+x64-windows/include/boost/spirit/home/classic/phoenix/actor.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/binders.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/casts.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/closures.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/composite.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/functions.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/new.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/operators.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/primitives.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/special_ops.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/statements.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/tuple_helpers.hpp
+x64-windows/include/boost/spirit/home/classic/phoenix/tuples.hpp
+x64-windows/include/boost/spirit/home/classic/symbols.hpp
+x64-windows/include/boost/spirit/home/classic/symbols/
+x64-windows/include/boost/spirit/home/classic/symbols/impl/
+x64-windows/include/boost/spirit/home/classic/symbols/impl/symbols.ipp
+x64-windows/include/boost/spirit/home/classic/symbols/impl/tst.ipp
+x64-windows/include/boost/spirit/home/classic/symbols/symbols.hpp
+x64-windows/include/boost/spirit/home/classic/symbols/symbols_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/symbols/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/tree/
+x64-windows/include/boost/spirit/home/classic/tree/ast.hpp
+x64-windows/include/boost/spirit/home/classic/tree/ast_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/tree/common.hpp
+x64-windows/include/boost/spirit/home/classic/tree/common_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/tree/impl/
+x64-windows/include/boost/spirit/home/classic/tree/impl/parse_tree_utils.ipp
+x64-windows/include/boost/spirit/home/classic/tree/impl/tree_to_xml.ipp
+x64-windows/include/boost/spirit/home/classic/tree/parse_tree.hpp
+x64-windows/include/boost/spirit/home/classic/tree/parse_tree_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/tree/parse_tree_utils.hpp
+x64-windows/include/boost/spirit/home/classic/tree/parsetree.dtd
+x64-windows/include/boost/spirit/home/classic/tree/tree_to_xml.hpp
+x64-windows/include/boost/spirit/home/classic/tree/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/utility.hpp
+x64-windows/include/boost/spirit/home/classic/utility/
+x64-windows/include/boost/spirit/home/classic/utility/chset.hpp
+x64-windows/include/boost/spirit/home/classic/utility/chset_operators.hpp
+x64-windows/include/boost/spirit/home/classic/utility/confix.hpp
+x64-windows/include/boost/spirit/home/classic/utility/confix_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/distinct.hpp
+x64-windows/include/boost/spirit/home/classic/utility/distinct_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/escape_char.hpp
+x64-windows/include/boost/spirit/home/classic/utility/escape_char_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/flush_multi_pass.hpp
+x64-windows/include/boost/spirit/home/classic/utility/functor_parser.hpp
+x64-windows/include/boost/spirit/home/classic/utility/grammar_def.hpp
+x64-windows/include/boost/spirit/home/classic/utility/grammar_def_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/impl/
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/basic_chset.hpp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/basic_chset.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/range_run.hpp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset/range_run.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/chset_operators.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/confix.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/escape_char.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/lists.ipp
+x64-windows/include/boost/spirit/home/classic/utility/impl/regex.ipp
+x64-windows/include/boost/spirit/home/classic/utility/lists.hpp
+x64-windows/include/boost/spirit/home/classic/utility/lists_fwd.hpp
+x64-windows/include/boost/spirit/home/classic/utility/loops.hpp
+x64-windows/include/boost/spirit/home/classic/utility/regex.hpp
+x64-windows/include/boost/spirit/home/classic/utility/rule_parser.hpp
+x64-windows/include/boost/spirit/home/classic/utility/scoped_lock.hpp
+x64-windows/include/boost/spirit/home/classic/utility/typeof.hpp
+x64-windows/include/boost/spirit/home/classic/version.hpp
+x64-windows/include/boost/spirit/home/karma.hpp
+x64-windows/include/boost/spirit/home/karma/
+x64-windows/include/boost/spirit/home/karma/action.hpp
+x64-windows/include/boost/spirit/home/karma/action/
+x64-windows/include/boost/spirit/home/karma/action/action.hpp
+x64-windows/include/boost/spirit/home/karma/auto.hpp
+x64-windows/include/boost/spirit/home/karma/auto/
+x64-windows/include/boost/spirit/home/karma/auto/auto.hpp
+x64-windows/include/boost/spirit/home/karma/auto/create_generator.hpp
+x64-windows/include/boost/spirit/home/karma/auto/meta_create.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary/
+x64-windows/include/boost/spirit/home/karma/auxiliary/attr_cast.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary/eol.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary/eps.hpp
+x64-windows/include/boost/spirit/home/karma/auxiliary/lazy.hpp
+x64-windows/include/boost/spirit/home/karma/binary.hpp
+x64-windows/include/boost/spirit/home/karma/binary/
+x64-windows/include/boost/spirit/home/karma/binary/binary.hpp
+x64-windows/include/boost/spirit/home/karma/binary/padding.hpp
+x64-windows/include/boost/spirit/home/karma/char.hpp
+x64-windows/include/boost/spirit/home/karma/char/
+x64-windows/include/boost/spirit/home/karma/char/char.hpp
+x64-windows/include/boost/spirit/home/karma/char/char_class.hpp
+x64-windows/include/boost/spirit/home/karma/char/char_generator.hpp
+x64-windows/include/boost/spirit/home/karma/delimit_flag.hpp
+x64-windows/include/boost/spirit/home/karma/delimit_out.hpp
+x64-windows/include/boost/spirit/home/karma/detail/
+x64-windows/include/boost/spirit/home/karma/detail/alternative_function.hpp
+x64-windows/include/boost/spirit/home/karma/detail/as.hpp
+x64-windows/include/boost/spirit/home/karma/detail/attributes.hpp
+x64-windows/include/boost/spirit/home/karma/detail/default_width.hpp
+x64-windows/include/boost/spirit/home/karma/detail/enable_lit.hpp
+x64-windows/include/boost/spirit/home/karma/detail/extract_from.hpp
+x64-windows/include/boost/spirit/home/karma/detail/fail_function.hpp
+x64-windows/include/boost/spirit/home/karma/detail/generate.hpp
+x64-windows/include/boost/spirit/home/karma/detail/generate_auto.hpp
+x64-windows/include/boost/spirit/home/karma/detail/generate_to.hpp
+x64-windows/include/boost/spirit/home/karma/detail/get_casetag.hpp
+x64-windows/include/boost/spirit/home/karma/detail/get_stricttag.hpp
+x64-windows/include/boost/spirit/home/karma/detail/indirect_iterator.hpp
+x64-windows/include/boost/spirit/home/karma/detail/output_iterator.hpp
+x64-windows/include/boost/spirit/home/karma/detail/pass_container.hpp
+x64-windows/include/boost/spirit/home/karma/detail/string_compare.hpp
+x64-windows/include/boost/spirit/home/karma/detail/string_generate.hpp
+x64-windows/include/boost/spirit/home/karma/detail/unused_delimiter.hpp
+x64-windows/include/boost/spirit/home/karma/directive.hpp
+x64-windows/include/boost/spirit/home/karma/directive/
+x64-windows/include/boost/spirit/home/karma/directive/as.hpp
+x64-windows/include/boost/spirit/home/karma/directive/buffer.hpp
+x64-windows/include/boost/spirit/home/karma/directive/center_alignment.hpp
+x64-windows/include/boost/spirit/home/karma/directive/columns.hpp
+x64-windows/include/boost/spirit/home/karma/directive/delimit.hpp
+x64-windows/include/boost/spirit/home/karma/directive/duplicate.hpp
+x64-windows/include/boost/spirit/home/karma/directive/encoding.hpp
+x64-windows/include/boost/spirit/home/karma/directive/left_alignment.hpp
+x64-windows/include/boost/spirit/home/karma/directive/maxwidth.hpp
+x64-windows/include/boost/spirit/home/karma/directive/no_delimit.hpp
+x64-windows/include/boost/spirit/home/karma/directive/omit.hpp
+x64-windows/include/boost/spirit/home/karma/directive/repeat.hpp
+x64-windows/include/boost/spirit/home/karma/directive/right_alignment.hpp
+x64-windows/include/boost/spirit/home/karma/directive/strict_relaxed.hpp
+x64-windows/include/boost/spirit/home/karma/directive/upper_lower_case.hpp
+x64-windows/include/boost/spirit/home/karma/directive/verbatim.hpp
+x64-windows/include/boost/spirit/home/karma/domain.hpp
+x64-windows/include/boost/spirit/home/karma/format.hpp
+x64-windows/include/boost/spirit/home/karma/format_auto.hpp
+x64-windows/include/boost/spirit/home/karma/generate.hpp
+x64-windows/include/boost/spirit/home/karma/generate_attr.hpp
+x64-windows/include/boost/spirit/home/karma/generator.hpp
+x64-windows/include/boost/spirit/home/karma/meta_compiler.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/
+x64-windows/include/boost/spirit/home/karma/nonterminal/debug_handler.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/debug_handler_state.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/detail/
+x64-windows/include/boost/spirit/home/karma/nonterminal/detail/fcall.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/detail/generator_binder.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/grammar.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/nonterminal_fwd.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/rule.hpp
+x64-windows/include/boost/spirit/home/karma/nonterminal/simple_trace.hpp
+x64-windows/include/boost/spirit/home/karma/numeric.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/
+x64-windows/include/boost/spirit/home/karma/numeric/bool.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/bool_policies.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/detail/
+x64-windows/include/boost/spirit/home/karma/numeric/detail/bool_utils.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/detail/real_utils.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/int.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/real.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/real_policies.hpp
+x64-windows/include/boost/spirit/home/karma/numeric/uint.hpp
+x64-windows/include/boost/spirit/home/karma/operator.hpp
+x64-windows/include/boost/spirit/home/karma/operator/
+x64-windows/include/boost/spirit/home/karma/operator/alternative.hpp
+x64-windows/include/boost/spirit/home/karma/operator/and_predicate.hpp
+x64-windows/include/boost/spirit/home/karma/operator/kleene.hpp
+x64-windows/include/boost/spirit/home/karma/operator/list.hpp
+x64-windows/include/boost/spirit/home/karma/operator/not_predicate.hpp
+x64-windows/include/boost/spirit/home/karma/operator/optional.hpp
+x64-windows/include/boost/spirit/home/karma/operator/plus.hpp
+x64-windows/include/boost/spirit/home/karma/operator/sequence.hpp
+x64-windows/include/boost/spirit/home/karma/phoenix_attributes.hpp
+x64-windows/include/boost/spirit/home/karma/reference.hpp
+x64-windows/include/boost/spirit/home/karma/stream.hpp
+x64-windows/include/boost/spirit/home/karma/stream/
+x64-windows/include/boost/spirit/home/karma/stream/detail/
+x64-windows/include/boost/spirit/home/karma/stream/detail/format_manip.hpp
+x64-windows/include/boost/spirit/home/karma/stream/detail/format_manip_auto.hpp
+x64-windows/include/boost/spirit/home/karma/stream/detail/iterator_sink.hpp
+x64-windows/include/boost/spirit/home/karma/stream/format_manip.hpp
+x64-windows/include/boost/spirit/home/karma/stream/format_manip_attr.hpp
+x64-windows/include/boost/spirit/home/karma/stream/ostream_iterator.hpp
+x64-windows/include/boost/spirit/home/karma/stream/stream.hpp
+x64-windows/include/boost/spirit/home/karma/string.hpp
+x64-windows/include/boost/spirit/home/karma/string/
+x64-windows/include/boost/spirit/home/karma/string/lit.hpp
+x64-windows/include/boost/spirit/home/karma/string/symbols.hpp
+x64-windows/include/boost/spirit/home/karma/what.hpp
+x64-windows/include/boost/spirit/home/lex.hpp
+x64-windows/include/boost/spirit/home/lex/
+x64-windows/include/boost/spirit/home/lex/argument.hpp
+x64-windows/include/boost/spirit/home/lex/argument_phoenix.hpp
+x64-windows/include/boost/spirit/home/lex/detail/
+x64-windows/include/boost/spirit/home/lex/detail/sequence_function.hpp
+x64-windows/include/boost/spirit/home/lex/domain.hpp
+x64-windows/include/boost/spirit/home/lex/lexer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/
+x64-windows/include/boost/spirit/home/lex/lexer/action.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/char_token_def.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/functor.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/generate_static.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/iterator.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/position_token.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/semantic_action_data.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/static_version.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/token.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/pass_flags.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/sequence.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/string_token_def.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/support_functions.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/support_functions_expression.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/terminals.hpp
+x64-windows/include/boost/spirit/home/lex/lexer/token_def.hpp
+x64-windows/include/boost/spirit/home/lex/lexer_lexertl.hpp
+x64-windows/include/boost/spirit/home/lex/lexer_static_lexertl.hpp
+x64-windows/include/boost/spirit/home/lex/lexer_type.hpp
+x64-windows/include/boost/spirit/home/lex/meta_compiler.hpp
+x64-windows/include/boost/spirit/home/lex/primitives.hpp
+x64-windows/include/boost/spirit/home/lex/qi.hpp
+x64-windows/include/boost/spirit/home/lex/qi/
+x64-windows/include/boost/spirit/home/lex/qi/in_state.hpp
+x64-windows/include/boost/spirit/home/lex/qi/plain_raw_token.hpp
+x64-windows/include/boost/spirit/home/lex/qi/plain_token.hpp
+x64-windows/include/boost/spirit/home/lex/qi/plain_tokenid.hpp
+x64-windows/include/boost/spirit/home/lex/qi/plain_tokenid_mask.hpp
+x64-windows/include/boost/spirit/home/lex/qi/state_switcher.hpp
+x64-windows/include/boost/spirit/home/lex/reference.hpp
+x64-windows/include/boost/spirit/home/lex/tokenize_and_parse.hpp
+x64-windows/include/boost/spirit/home/lex/tokenize_and_parse_attr.hpp
+x64-windows/include/boost/spirit/home/qi.hpp
+x64-windows/include/boost/spirit/home/qi/
+x64-windows/include/boost/spirit/home/qi/action.hpp
+x64-windows/include/boost/spirit/home/qi/action/
+x64-windows/include/boost/spirit/home/qi/action/action.hpp
+x64-windows/include/boost/spirit/home/qi/auto.hpp
+x64-windows/include/boost/spirit/home/qi/auto/
+x64-windows/include/boost/spirit/home/qi/auto/auto.hpp
+x64-windows/include/boost/spirit/home/qi/auto/create_parser.hpp
+x64-windows/include/boost/spirit/home/qi/auto/meta_create.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/
+x64-windows/include/boost/spirit/home/qi/auxiliary/attr.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/attr_cast.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/eoi.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/eol.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/eps.hpp
+x64-windows/include/boost/spirit/home/qi/auxiliary/lazy.hpp
+x64-windows/include/boost/spirit/home/qi/binary.hpp
+x64-windows/include/boost/spirit/home/qi/binary/
+x64-windows/include/boost/spirit/home/qi/binary/binary.hpp
+x64-windows/include/boost/spirit/home/qi/char.hpp
+x64-windows/include/boost/spirit/home/qi/char/
+x64-windows/include/boost/spirit/home/qi/char/char.hpp
+x64-windows/include/boost/spirit/home/qi/char/char_class.hpp
+x64-windows/include/boost/spirit/home/qi/char/char_parser.hpp
+x64-windows/include/boost/spirit/home/qi/copy.hpp
+x64-windows/include/boost/spirit/home/qi/detail/
+x64-windows/include/boost/spirit/home/qi/detail/alternative_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/assign_to.hpp
+x64-windows/include/boost/spirit/home/qi/detail/attributes.hpp
+x64-windows/include/boost/spirit/home/qi/detail/construct.hpp
+x64-windows/include/boost/spirit/home/qi/detail/enable_lit.hpp
+x64-windows/include/boost/spirit/home/qi/detail/expect_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/expectation_failure.hpp
+x64-windows/include/boost/spirit/home/qi/detail/fail_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/parse.hpp
+x64-windows/include/boost/spirit/home/qi/detail/parse_auto.hpp
+x64-windows/include/boost/spirit/home/qi/detail/pass_container.hpp
+x64-windows/include/boost/spirit/home/qi/detail/pass_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/permute_function.hpp
+x64-windows/include/boost/spirit/home/qi/detail/string_parse.hpp
+x64-windows/include/boost/spirit/home/qi/detail/unused_skipper.hpp
+x64-windows/include/boost/spirit/home/qi/directive.hpp
+x64-windows/include/boost/spirit/home/qi/directive/
+x64-windows/include/boost/spirit/home/qi/directive/as.hpp
+x64-windows/include/boost/spirit/home/qi/directive/encoding.hpp
+x64-windows/include/boost/spirit/home/qi/directive/expect.hpp
+x64-windows/include/boost/spirit/home/qi/directive/hold.hpp
+x64-windows/include/boost/spirit/home/qi/directive/lexeme.hpp
+x64-windows/include/boost/spirit/home/qi/directive/matches.hpp
+x64-windows/include/boost/spirit/home/qi/directive/no_case.hpp
+x64-windows/include/boost/spirit/home/qi/directive/no_skip.hpp
+x64-windows/include/boost/spirit/home/qi/directive/omit.hpp
+x64-windows/include/boost/spirit/home/qi/directive/raw.hpp
+x64-windows/include/boost/spirit/home/qi/directive/repeat.hpp
+x64-windows/include/boost/spirit/home/qi/directive/skip.hpp
+x64-windows/include/boost/spirit/home/qi/domain.hpp
+x64-windows/include/boost/spirit/home/qi/match.hpp
+x64-windows/include/boost/spirit/home/qi/match_auto.hpp
+x64-windows/include/boost/spirit/home/qi/meta_compiler.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/
+x64-windows/include/boost/spirit/home/qi/nonterminal/debug_handler.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/debug_handler_state.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/detail/
+x64-windows/include/boost/spirit/home/qi/nonterminal/detail/fcall.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/detail/parser_binder.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/error_handler.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/grammar.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/nonterminal_fwd.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/rule.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/simple_trace.hpp
+x64-windows/include/boost/spirit/home/qi/nonterminal/success_handler.hpp
+x64-windows/include/boost/spirit/home/qi/numeric.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/
+x64-windows/include/boost/spirit/home/qi/numeric/bool.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/bool_policies.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/detail/
+x64-windows/include/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/detail/real_impl.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/int.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/numeric_utils.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/real.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/real_policies.hpp
+x64-windows/include/boost/spirit/home/qi/numeric/uint.hpp
+x64-windows/include/boost/spirit/home/qi/operator.hpp
+x64-windows/include/boost/spirit/home/qi/operator/
+x64-windows/include/boost/spirit/home/qi/operator/alternative.hpp
+x64-windows/include/boost/spirit/home/qi/operator/and_predicate.hpp
+x64-windows/include/boost/spirit/home/qi/operator/difference.hpp
+x64-windows/include/boost/spirit/home/qi/operator/expect.hpp
+x64-windows/include/boost/spirit/home/qi/operator/kleene.hpp
+x64-windows/include/boost/spirit/home/qi/operator/list.hpp
+x64-windows/include/boost/spirit/home/qi/operator/not_predicate.hpp
+x64-windows/include/boost/spirit/home/qi/operator/optional.hpp
+x64-windows/include/boost/spirit/home/qi/operator/permutation.hpp
+x64-windows/include/boost/spirit/home/qi/operator/plus.hpp
+x64-windows/include/boost/spirit/home/qi/operator/sequence.hpp
+x64-windows/include/boost/spirit/home/qi/operator/sequence_base.hpp
+x64-windows/include/boost/spirit/home/qi/operator/sequential_or.hpp
+x64-windows/include/boost/spirit/home/qi/parse.hpp
+x64-windows/include/boost/spirit/home/qi/parse_attr.hpp
+x64-windows/include/boost/spirit/home/qi/parser.hpp
+x64-windows/include/boost/spirit/home/qi/reference.hpp
+x64-windows/include/boost/spirit/home/qi/skip_flag.hpp
+x64-windows/include/boost/spirit/home/qi/skip_over.hpp
+x64-windows/include/boost/spirit/home/qi/stream.hpp
+x64-windows/include/boost/spirit/home/qi/stream/
+x64-windows/include/boost/spirit/home/qi/stream/detail/
+x64-windows/include/boost/spirit/home/qi/stream/detail/iterator_source.hpp
+x64-windows/include/boost/spirit/home/qi/stream/detail/match_manip.hpp
+x64-windows/include/boost/spirit/home/qi/stream/detail/match_manip_auto.hpp
+x64-windows/include/boost/spirit/home/qi/stream/match_manip.hpp
+x64-windows/include/boost/spirit/home/qi/stream/match_manip_attr.hpp
+x64-windows/include/boost/spirit/home/qi/stream/stream.hpp
+x64-windows/include/boost/spirit/home/qi/string.hpp
+x64-windows/include/boost/spirit/home/qi/string/
+x64-windows/include/boost/spirit/home/qi/string/detail/
+x64-windows/include/boost/spirit/home/qi/string/detail/tst.hpp
+x64-windows/include/boost/spirit/home/qi/string/lit.hpp
+x64-windows/include/boost/spirit/home/qi/string/symbols.hpp
+x64-windows/include/boost/spirit/home/qi/string/tst.hpp
+x64-windows/include/boost/spirit/home/qi/string/tst_map.hpp
+x64-windows/include/boost/spirit/home/qi/what.hpp
+x64-windows/include/boost/spirit/home/support.hpp
+x64-windows/include/boost/spirit/home/support/
+x64-windows/include/boost/spirit/home/support/action_dispatch.hpp
+x64-windows/include/boost/spirit/home/support/adapt_adt_attributes.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/
+x64-windows/include/boost/spirit/home/support/algorithm/any.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_if.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_if_ns.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_if_ns_so.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_ns.hpp
+x64-windows/include/boost/spirit/home/support/algorithm/any_ns_so.hpp
+x64-windows/include/boost/spirit/home/support/argument.hpp
+x64-windows/include/boost/spirit/home/support/argument_expression.hpp
+x64-windows/include/boost/spirit/home/support/assert_msg.hpp
+x64-windows/include/boost/spirit/home/support/attributes.hpp
+x64-windows/include/boost/spirit/home/support/attributes_fwd.hpp
+x64-windows/include/boost/spirit/home/support/auto.hpp
+x64-windows/include/boost/spirit/home/support/auto/
+x64-windows/include/boost/spirit/home/support/auto/meta_create.hpp
+x64-windows/include/boost/spirit/home/support/auxiliary/
+x64-windows/include/boost/spirit/home/support/auxiliary/attr_cast.hpp
+x64-windows/include/boost/spirit/home/support/char_class.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/
+x64-windows/include/boost/spirit/home/support/char_encoding/ascii.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/iso8859_1.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/standard.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/standard_wide.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/DerivedCoreProperties.txt
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/PropList.txt
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/Scripts.txt
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/UnicodeData.txt
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/category_table.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/lowercase_table.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/query.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/script_table.hpp
+x64-windows/include/boost/spirit/home/support/char_encoding/unicode/uppercase_table.hpp
+x64-windows/include/boost/spirit/home/support/char_set/
+x64-windows/include/boost/spirit/home/support/char_set/basic_chset.hpp
+x64-windows/include/boost/spirit/home/support/char_set/range.hpp
+x64-windows/include/boost/spirit/home/support/char_set/range_functions.hpp
+x64-windows/include/boost/spirit/home/support/char_set/range_run.hpp
+x64-windows/include/boost/spirit/home/support/char_set/range_run_impl.hpp
+x64-windows/include/boost/spirit/home/support/common_terminals.hpp
+x64-windows/include/boost/spirit/home/support/container.hpp
+x64-windows/include/boost/spirit/home/support/context.hpp
+x64-windows/include/boost/spirit/home/support/detail/
+x64-windows/include/boost/spirit/home/support/detail/as_variant.hpp
+x64-windows/include/boost/spirit/home/support/detail/endian.hpp
+x64-windows/include/boost/spirit/home/support/detail/endian/
+x64-windows/include/boost/spirit/home/support/detail/endian/cover_operators.hpp
+x64-windows/include/boost/spirit/home/support/detail/endian/endian.hpp
+x64-windows/include/boost/spirit/home/support/detail/get_encoding.hpp
+x64-windows/include/boost/spirit/home/support/detail/hold_any.hpp
+x64-windows/include/boost/spirit/home/support/detail/is_spirit_tag.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/
+x64-windows/include/boost/spirit/home/support/detail/lexer/char_traits.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/consts.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/containers/
+x64-windows/include/boost/spirit/home/support/detail/lexer/containers/ptr_list.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/conversion/
+x64-windows/include/boost/spirit/home/support/detail/lexer/conversion/char_state_machine.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/debug.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/file_input.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/generate_cpp.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/generate_re2c.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/generator.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/input.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/internals.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/parser.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_helper.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_state.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/end_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/iteration_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/leaf_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/selection_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/parser/tree/sequence_node.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/partition/
+x64-windows/include/boost/spirit/home/support/detail/lexer/partition/charset.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/partition/equivset.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/rules.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/runtime_error.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/serialise.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/size_t.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/state_machine.hpp
+x64-windows/include/boost/spirit/home/support/detail/lexer/string_token.hpp
+x64-windows/include/boost/spirit/home/support/detail/make_cons.hpp
+x64-windows/include/boost/spirit/home/support/detail/make_vector.hpp
+x64-windows/include/boost/spirit/home/support/detail/math/
+x64-windows/include/boost/spirit/home/support/detail/math/detail/
+x64-windows/include/boost/spirit/home/support/detail/math/detail/fp_traits.hpp
+x64-windows/include/boost/spirit/home/support/detail/math/fpclassify.hpp
+x64-windows/include/boost/spirit/home/support/detail/math/signbit.hpp
+x64-windows/include/boost/spirit/home/support/detail/pow10.hpp
+x64-windows/include/boost/spirit/home/support/detail/scoped_enum_emulation.hpp
+x64-windows/include/boost/spirit/home/support/detail/sign.hpp
+x64-windows/include/boost/spirit/home/support/detail/what_function.hpp
+x64-windows/include/boost/spirit/home/support/extended_variant.hpp
+x64-windows/include/boost/spirit/home/support/handles_container.hpp
+x64-windows/include/boost/spirit/home/support/has_semantic_action.hpp
+x64-windows/include/boost/spirit/home/support/info.hpp
+x64-windows/include/boost/spirit/home/support/iterators/
+x64-windows/include/boost/spirit/home/support/iterators/detail/
+x64-windows/include/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/buffering_input_iterator_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/combine_policies.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/first_owner_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/fixed_size_queue.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/functor_input_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/istream_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/lex_input_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/multi_pass.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/no_check_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/ref_counted_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp
+x64-windows/include/boost/spirit/home/support/iterators/istream_iterator.hpp
+x64-windows/include/boost/spirit/home/support/iterators/line_pos_iterator.hpp
+x64-windows/include/boost/spirit/home/support/iterators/look_ahead.hpp
+x64-windows/include/boost/spirit/home/support/iterators/multi_pass.hpp
+x64-windows/include/boost/spirit/home/support/iterators/multi_pass_fwd.hpp
+x64-windows/include/boost/spirit/home/support/iterators/ostream_iterator.hpp
+x64-windows/include/boost/spirit/home/support/lazy.hpp
+x64-windows/include/boost/spirit/home/support/limits.hpp
+x64-windows/include/boost/spirit/home/support/make_component.hpp
+x64-windows/include/boost/spirit/home/support/meta_compiler.hpp
+x64-windows/include/boost/spirit/home/support/modify.hpp
+x64-windows/include/boost/spirit/home/support/multi_pass.hpp
+x64-windows/include/boost/spirit/home/support/multi_pass_wrapper.hpp
+x64-windows/include/boost/spirit/home/support/nonterminal/
+x64-windows/include/boost/spirit/home/support/nonterminal/expand_arg.hpp
+x64-windows/include/boost/spirit/home/support/nonterminal/extract_param.hpp
+x64-windows/include/boost/spirit/home/support/nonterminal/locals.hpp
+x64-windows/include/boost/spirit/home/support/numeric_traits.hpp
+x64-windows/include/boost/spirit/home/support/sequence_base_id.hpp
+x64-windows/include/boost/spirit/home/support/string_traits.hpp
+x64-windows/include/boost/spirit/home/support/terminal.hpp
+x64-windows/include/boost/spirit/home/support/terminal_expression.hpp
+x64-windows/include/boost/spirit/home/support/unused.hpp
+x64-windows/include/boost/spirit/home/support/utf8.hpp
+x64-windows/include/boost/spirit/home/support/utree.hpp
+x64-windows/include/boost/spirit/home/support/utree/
+x64-windows/include/boost/spirit/home/support/utree/detail/
+x64-windows/include/boost/spirit/home/support/utree/detail/utree_detail1.hpp
+x64-windows/include/boost/spirit/home/support/utree/detail/utree_detail2.hpp
+x64-windows/include/boost/spirit/home/support/utree/operators.hpp
+x64-windows/include/boost/spirit/home/support/utree/utree.hpp
+x64-windows/include/boost/spirit/home/support/utree/utree_traits.hpp
+x64-windows/include/boost/spirit/home/support/utree/utree_traits_fwd.hpp
+x64-windows/include/boost/spirit/home/x3.hpp
+x64-windows/include/boost/spirit/home/x3/
+x64-windows/include/boost/spirit/home/x3/auxiliary.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/
+x64-windows/include/boost/spirit/home/x3/auxiliary/any_parser.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/attr.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/eoi.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/eol.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/eps.hpp
+x64-windows/include/boost/spirit/home/x3/auxiliary/guard.hpp
+x64-windows/include/boost/spirit/home/x3/binary.hpp
+x64-windows/include/boost/spirit/home/x3/binary/
+x64-windows/include/boost/spirit/home/x3/binary/binary.hpp
+x64-windows/include/boost/spirit/home/x3/char.hpp
+x64-windows/include/boost/spirit/home/x3/char/
+x64-windows/include/boost/spirit/home/x3/char/any_char.hpp
+x64-windows/include/boost/spirit/home/x3/char/char.hpp
+x64-windows/include/boost/spirit/home/x3/char/char_class.hpp
+x64-windows/include/boost/spirit/home/x3/char/char_class_tags.hpp
+x64-windows/include/boost/spirit/home/x3/char/char_parser.hpp
+x64-windows/include/boost/spirit/home/x3/char/char_set.hpp
+x64-windows/include/boost/spirit/home/x3/char/detail/
+x64-windows/include/boost/spirit/home/x3/char/detail/cast_char.hpp
+x64-windows/include/boost/spirit/home/x3/char/literal_char.hpp
+x64-windows/include/boost/spirit/home/x3/char/negated_char_parser.hpp
+x64-windows/include/boost/spirit/home/x3/char/unicode.hpp
+x64-windows/include/boost/spirit/home/x3/core.hpp
+x64-windows/include/boost/spirit/home/x3/core/
+x64-windows/include/boost/spirit/home/x3/core/action.hpp
+x64-windows/include/boost/spirit/home/x3/core/call.hpp
+x64-windows/include/boost/spirit/home/x3/core/detail/
+x64-windows/include/boost/spirit/home/x3/core/detail/parse_into_container.hpp
+x64-windows/include/boost/spirit/home/x3/core/parse.hpp
+x64-windows/include/boost/spirit/home/x3/core/parser.hpp
+x64-windows/include/boost/spirit/home/x3/core/proxy.hpp
+x64-windows/include/boost/spirit/home/x3/core/skip_over.hpp
+x64-windows/include/boost/spirit/home/x3/directive.hpp
+x64-windows/include/boost/spirit/home/x3/directive/
+x64-windows/include/boost/spirit/home/x3/directive/confix.hpp
+x64-windows/include/boost/spirit/home/x3/directive/expect.hpp
+x64-windows/include/boost/spirit/home/x3/directive/lexeme.hpp
+x64-windows/include/boost/spirit/home/x3/directive/matches.hpp
+x64-windows/include/boost/spirit/home/x3/directive/no_case.hpp
+x64-windows/include/boost/spirit/home/x3/directive/no_skip.hpp
+x64-windows/include/boost/spirit/home/x3/directive/omit.hpp
+x64-windows/include/boost/spirit/home/x3/directive/raw.hpp
+x64-windows/include/boost/spirit/home/x3/directive/repeat.hpp
+x64-windows/include/boost/spirit/home/x3/directive/seek.hpp
+x64-windows/include/boost/spirit/home/x3/directive/skip.hpp
+x64-windows/include/boost/spirit/home/x3/directive/with.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/
+x64-windows/include/boost/spirit/home/x3/nonterminal/debug_handler_state.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/detail/
+x64-windows/include/boost/spirit/home/x3/nonterminal/detail/rule.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/detail/transform_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/rule.hpp
+x64-windows/include/boost/spirit/home/x3/nonterminal/simple_trace.hpp
+x64-windows/include/boost/spirit/home/x3/numeric.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/
+x64-windows/include/boost/spirit/home/x3/numeric/bool.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/bool_policies.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/int.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/real.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/real_policies.hpp
+x64-windows/include/boost/spirit/home/x3/numeric/uint.hpp
+x64-windows/include/boost/spirit/home/x3/operator.hpp
+x64-windows/include/boost/spirit/home/x3/operator/
+x64-windows/include/boost/spirit/home/x3/operator/alternative.hpp
+x64-windows/include/boost/spirit/home/x3/operator/and_predicate.hpp
+x64-windows/include/boost/spirit/home/x3/operator/detail/
+x64-windows/include/boost/spirit/home/x3/operator/detail/alternative.hpp
+x64-windows/include/boost/spirit/home/x3/operator/detail/sequence.hpp
+x64-windows/include/boost/spirit/home/x3/operator/difference.hpp
+x64-windows/include/boost/spirit/home/x3/operator/kleene.hpp
+x64-windows/include/boost/spirit/home/x3/operator/list.hpp
+x64-windows/include/boost/spirit/home/x3/operator/not_predicate.hpp
+x64-windows/include/boost/spirit/home/x3/operator/optional.hpp
+x64-windows/include/boost/spirit/home/x3/operator/plus.hpp
+x64-windows/include/boost/spirit/home/x3/operator/sequence.hpp
+x64-windows/include/boost/spirit/home/x3/string.hpp
+x64-windows/include/boost/spirit/home/x3/string/
+x64-windows/include/boost/spirit/home/x3/string/detail/
+x64-windows/include/boost/spirit/home/x3/string/detail/no_case_string_parse.hpp
+x64-windows/include/boost/spirit/home/x3/string/detail/string_parse.hpp
+x64-windows/include/boost/spirit/home/x3/string/detail/tst.hpp
+x64-windows/include/boost/spirit/home/x3/string/literal_string.hpp
+x64-windows/include/boost/spirit/home/x3/string/symbols.hpp
+x64-windows/include/boost/spirit/home/x3/string/tst.hpp
+x64-windows/include/boost/spirit/home/x3/string/tst_map.hpp
+x64-windows/include/boost/spirit/home/x3/support/
+x64-windows/include/boost/spirit/home/x3/support/ast/
+x64-windows/include/boost/spirit/home/x3/support/ast/position_tagged.hpp
+x64-windows/include/boost/spirit/home/x3/support/ast/variant.hpp
+x64-windows/include/boost/spirit/home/x3/support/context.hpp
+x64-windows/include/boost/spirit/home/x3/support/no_case.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/detail/
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/detail/extract_int.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/extract_int.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/extract_real.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/pow10.hpp
+x64-windows/include/boost/spirit/home/x3/support/numeric_utils/sign.hpp
+x64-windows/include/boost/spirit/home/x3/support/subcontext.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/
+x64-windows/include/boost/spirit/home/x3/support/traits/attribute_category.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/attribute_of.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/attribute_type.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/container_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/handles_container.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/has_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/is_parser.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/is_range.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/is_substitute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/is_variant.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/make_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/move_to.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/numeric_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/optional_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/print_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/print_token.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/string_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/transform_attribute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/tuple_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/value_traits.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/variant_find_substitute.hpp
+x64-windows/include/boost/spirit/home/x3/support/traits/variant_has_substitute.hpp
+x64-windows/include/boost/spirit/home/x3/support/unused.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/
+x64-windows/include/boost/spirit/home/x3/support/utility/annotate_on_success.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/error_reporting.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/is_callable.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/lambda_visitor.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/sfinae.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/testing.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/unrefcv.hpp
+x64-windows/include/boost/spirit/home/x3/support/utility/utf8.hpp
+x64-windows/include/boost/spirit/home/x3/version.hpp
+x64-windows/include/boost/spirit/include/
+x64-windows/include/boost/spirit/include/classic.hpp
+x64-windows/include/boost/spirit/include/classic_actions.hpp
+x64-windows/include/boost/spirit/include/classic_actor.hpp
+x64-windows/include/boost/spirit/include/classic_alternative.hpp
+x64-windows/include/boost/spirit/include/classic_as_parser.hpp
+x64-windows/include/boost/spirit/include/classic_assert.hpp
+x64-windows/include/boost/spirit/include/classic_assign_actor.hpp
+x64-windows/include/boost/spirit/include/classic_assign_key_actor.hpp
+x64-windows/include/boost/spirit/include/classic_ast.hpp
+x64-windows/include/boost/spirit/include/classic_ast_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_attribute.hpp
+x64-windows/include/boost/spirit/include/classic_basic_chset.hpp
+x64-windows/include/boost/spirit/include/classic_chset.hpp
+x64-windows/include/boost/spirit/include/classic_chset_operators.hpp
+x64-windows/include/boost/spirit/include/classic_clear_actor.hpp
+x64-windows/include/boost/spirit/include/classic_closure.hpp
+x64-windows/include/boost/spirit/include/classic_closure_context.hpp
+x64-windows/include/boost/spirit/include/classic_closure_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_common.hpp
+x64-windows/include/boost/spirit/include/classic_common_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_composite.hpp
+x64-windows/include/boost/spirit/include/classic_config.hpp
+x64-windows/include/boost/spirit/include/classic_confix.hpp
+x64-windows/include/boost/spirit/include/classic_confix_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_core.hpp
+x64-windows/include/boost/spirit/include/classic_debug.hpp
+x64-windows/include/boost/spirit/include/classic_debug_node.hpp
+x64-windows/include/boost/spirit/include/classic_decrement_actor.hpp
+x64-windows/include/boost/spirit/include/classic_difference.hpp
+x64-windows/include/boost/spirit/include/classic_directives.hpp
+x64-windows/include/boost/spirit/include/classic_distinct.hpp
+x64-windows/include/boost/spirit/include/classic_distinct_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_dynamic.hpp
+x64-windows/include/boost/spirit/include/classic_epsilon.hpp
+x64-windows/include/boost/spirit/include/classic_erase_actor.hpp
+x64-windows/include/boost/spirit/include/classic_error_handling.hpp
+x64-windows/include/boost/spirit/include/classic_escape_char.hpp
+x64-windows/include/boost/spirit/include/classic_escape_char_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_exceptions.hpp
+x64-windows/include/boost/spirit/include/classic_exceptions_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_exclusive_or.hpp
+x64-windows/include/boost/spirit/include/classic_file_iterator.hpp
+x64-windows/include/boost/spirit/include/classic_file_iterator_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_fixed_size_queue.hpp
+x64-windows/include/boost/spirit/include/classic_flush_multi_pass.hpp
+x64-windows/include/boost/spirit/include/classic_for.hpp
+x64-windows/include/boost/spirit/include/classic_functor_parser.hpp
+x64-windows/include/boost/spirit/include/classic_fundamental.hpp
+x64-windows/include/boost/spirit/include/classic_grammar.hpp
+x64-windows/include/boost/spirit/include/classic_grammar_def.hpp
+x64-windows/include/boost/spirit/include/classic_grammar_def_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_if.hpp
+x64-windows/include/boost/spirit/include/classic_increment_actor.hpp
+x64-windows/include/boost/spirit/include/classic_insert_at_actor.hpp
+x64-windows/include/boost/spirit/include/classic_insert_key_actor.hpp
+x64-windows/include/boost/spirit/include/classic_intersection.hpp
+x64-windows/include/boost/spirit/include/classic_iterator.hpp
+x64-windows/include/boost/spirit/include/classic_kleene_star.hpp
+x64-windows/include/boost/spirit/include/classic_lazy.hpp
+x64-windows/include/boost/spirit/include/classic_list.hpp
+x64-windows/include/boost/spirit/include/classic_lists.hpp
+x64-windows/include/boost/spirit/include/classic_lists_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_loops.hpp
+x64-windows/include/boost/spirit/include/classic_match.hpp
+x64-windows/include/boost/spirit/include/classic_meta.hpp
+x64-windows/include/boost/spirit/include/classic_minimal.hpp
+x64-windows/include/boost/spirit/include/classic_multi_pass.hpp
+x64-windows/include/boost/spirit/include/classic_multi_pass_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_nil.hpp
+x64-windows/include/boost/spirit/include/classic_no_actions.hpp
+x64-windows/include/boost/spirit/include/classic_numerics.hpp
+x64-windows/include/boost/spirit/include/classic_numerics_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_operators.hpp
+x64-windows/include/boost/spirit/include/classic_optional.hpp
+x64-windows/include/boost/spirit/include/classic_parametric.hpp
+x64-windows/include/boost/spirit/include/classic_parse_tree.hpp
+x64-windows/include/boost/spirit/include/classic_parse_tree_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_parse_tree_utils.hpp
+x64-windows/include/boost/spirit/include/classic_parser.hpp
+x64-windows/include/boost/spirit/include/classic_parser_context.hpp
+x64-windows/include/boost/spirit/include/classic_parser_id.hpp
+x64-windows/include/boost/spirit/include/classic_parser_names.hpp
+x64-windows/include/boost/spirit/include/classic_parser_traits.hpp
+x64-windows/include/boost/spirit/include/classic_position_iterator.hpp
+x64-windows/include/boost/spirit/include/classic_position_iterator_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_positive.hpp
+x64-windows/include/boost/spirit/include/classic_primitives.hpp
+x64-windows/include/boost/spirit/include/classic_push_back_actor.hpp
+x64-windows/include/boost/spirit/include/classic_push_front_actor.hpp
+x64-windows/include/boost/spirit/include/classic_range_run.hpp
+x64-windows/include/boost/spirit/include/classic_ref_actor.hpp
+x64-windows/include/boost/spirit/include/classic_ref_const_ref_actor.hpp
+x64-windows/include/boost/spirit/include/classic_ref_const_ref_const_ref_a.hpp
+x64-windows/include/boost/spirit/include/classic_ref_const_ref_value_actor.hpp
+x64-windows/include/boost/spirit/include/classic_ref_value_actor.hpp
+x64-windows/include/boost/spirit/include/classic_refactoring.hpp
+x64-windows/include/boost/spirit/include/classic_regex.hpp
+x64-windows/include/boost/spirit/include/classic_rule.hpp
+x64-windows/include/boost/spirit/include/classic_rule_alias.hpp
+x64-windows/include/boost/spirit/include/classic_rule_parser.hpp
+x64-windows/include/boost/spirit/include/classic_safe_bool.hpp
+x64-windows/include/boost/spirit/include/classic_scanner.hpp
+x64-windows/include/boost/spirit/include/classic_scanner_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_scoped_lock.hpp
+x64-windows/include/boost/spirit/include/classic_select.hpp
+x64-windows/include/boost/spirit/include/classic_sequence.hpp
+x64-windows/include/boost/spirit/include/classic_sequential_and.hpp
+x64-windows/include/boost/spirit/include/classic_sequential_or.hpp
+x64-windows/include/boost/spirit/include/classic_skipper.hpp
+x64-windows/include/boost/spirit/include/classic_skipper_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_spirit.hpp
+x64-windows/include/boost/spirit/include/classic_static.hpp
+x64-windows/include/boost/spirit/include/classic_stored_rule.hpp
+x64-windows/include/boost/spirit/include/classic_stored_rule_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_subrule.hpp
+x64-windows/include/boost/spirit/include/classic_subrule_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_swap_actor.hpp
+x64-windows/include/boost/spirit/include/classic_switch.hpp
+x64-windows/include/boost/spirit/include/classic_symbols.hpp
+x64-windows/include/boost/spirit/include/classic_symbols_fwd.hpp
+x64-windows/include/boost/spirit/include/classic_traverse.hpp
+x64-windows/include/boost/spirit/include/classic_tree_to_xml.hpp
+x64-windows/include/boost/spirit/include/classic_typeof.hpp
+x64-windows/include/boost/spirit/include/classic_utility.hpp
+x64-windows/include/boost/spirit/include/classic_version.hpp
+x64-windows/include/boost/spirit/include/classic_while.hpp
+x64-windows/include/boost/spirit/include/karma.hpp
+x64-windows/include/boost/spirit/include/karma_action.hpp
+x64-windows/include/boost/spirit/include/karma_alternative.hpp
+x64-windows/include/boost/spirit/include/karma_and_predicate.hpp
+x64-windows/include/boost/spirit/include/karma_as.hpp
+x64-windows/include/boost/spirit/include/karma_attr_cast.hpp
+x64-windows/include/boost/spirit/include/karma_auto.hpp
+x64-windows/include/boost/spirit/include/karma_auxiliary.hpp
+x64-windows/include/boost/spirit/include/karma_binary.hpp
+x64-windows/include/boost/spirit/include/karma_bool.hpp
+x64-windows/include/boost/spirit/include/karma_buffer.hpp
+x64-windows/include/boost/spirit/include/karma_center_alignment.hpp
+x64-windows/include/boost/spirit/include/karma_char.hpp
+x64-windows/include/boost/spirit/include/karma_char_.hpp
+x64-windows/include/boost/spirit/include/karma_char_class.hpp
+x64-windows/include/boost/spirit/include/karma_columns.hpp
+x64-windows/include/boost/spirit/include/karma_delimit.hpp
+x64-windows/include/boost/spirit/include/karma_directive.hpp
+x64-windows/include/boost/spirit/include/karma_domain.hpp
+x64-windows/include/boost/spirit/include/karma_duplicate.hpp
+x64-windows/include/boost/spirit/include/karma_eol.hpp
+x64-windows/include/boost/spirit/include/karma_eps.hpp
+x64-windows/include/boost/spirit/include/karma_format.hpp
+x64-windows/include/boost/spirit/include/karma_format_attr.hpp
+x64-windows/include/boost/spirit/include/karma_format_auto.hpp
+x64-windows/include/boost/spirit/include/karma_generate.hpp
+x64-windows/include/boost/spirit/include/karma_generate_attr.hpp
+x64-windows/include/boost/spirit/include/karma_generate_auto.hpp
+x64-windows/include/boost/spirit/include/karma_grammar.hpp
+x64-windows/include/boost/spirit/include/karma_int.hpp
+x64-windows/include/boost/spirit/include/karma_kleene.hpp
+x64-windows/include/boost/spirit/include/karma_lazy.hpp
+x64-windows/include/boost/spirit/include/karma_left_alignment.hpp
+x64-windows/include/boost/spirit/include/karma_list.hpp
+x64-windows/include/boost/spirit/include/karma_maxwidth.hpp
+x64-windows/include/boost/spirit/include/karma_no_delimit.hpp
+x64-windows/include/boost/spirit/include/karma_nonterminal.hpp
+x64-windows/include/boost/spirit/include/karma_not_predicate.hpp
+x64-windows/include/boost/spirit/include/karma_numeric.hpp
+x64-windows/include/boost/spirit/include/karma_omit.hpp
+x64-windows/include/boost/spirit/include/karma_operator.hpp
+x64-windows/include/boost/spirit/include/karma_optional.hpp
+x64-windows/include/boost/spirit/include/karma_phoenix_attributes.hpp
+x64-windows/include/boost/spirit/include/karma_plus.hpp
+x64-windows/include/boost/spirit/include/karma_real.hpp
+x64-windows/include/boost/spirit/include/karma_repeat.hpp
+x64-windows/include/boost/spirit/include/karma_right_alignment.hpp
+x64-windows/include/boost/spirit/include/karma_rule.hpp
+x64-windows/include/boost/spirit/include/karma_sequence.hpp
+x64-windows/include/boost/spirit/include/karma_stream.hpp
+x64-windows/include/boost/spirit/include/karma_strict_relaxed.hpp
+x64-windows/include/boost/spirit/include/karma_string.hpp
+x64-windows/include/boost/spirit/include/karma_symbols.hpp
+x64-windows/include/boost/spirit/include/karma_uint.hpp
+x64-windows/include/boost/spirit/include/karma_upper_lower_case.hpp
+x64-windows/include/boost/spirit/include/karma_verbatim.hpp
+x64-windows/include/boost/spirit/include/karma_what.hpp
+x64-windows/include/boost/spirit/include/lex.hpp
+x64-windows/include/boost/spirit/include/lex_char_token_def.hpp
+x64-windows/include/boost/spirit/include/lex_domain.hpp
+x64-windows/include/boost/spirit/include/lex_generate_static_lexertl.hpp
+x64-windows/include/boost/spirit/include/lex_lexer.hpp
+x64-windows/include/boost/spirit/include/lex_lexertl.hpp
+x64-windows/include/boost/spirit/include/lex_lexertl_position_token.hpp
+x64-windows/include/boost/spirit/include/lex_lexertl_token.hpp
+x64-windows/include/boost/spirit/include/lex_plain_token.hpp
+x64-windows/include/boost/spirit/include/lex_primitives.hpp
+x64-windows/include/boost/spirit/include/lex_static_lexertl.hpp
+x64-windows/include/boost/spirit/include/lex_tokenize_and_parse.hpp
+x64-windows/include/boost/spirit/include/lex_tokenize_and_parse_attr.hpp
+x64-windows/include/boost/spirit/include/phoenix.hpp
+x64-windows/include/boost/spirit/include/phoenix1.hpp
+x64-windows/include/boost/spirit/include/phoenix1_actor.hpp
+x64-windows/include/boost/spirit/include/phoenix1_binders.hpp
+x64-windows/include/boost/spirit/include/phoenix1_casts.hpp
+x64-windows/include/boost/spirit/include/phoenix1_closures.hpp
+x64-windows/include/boost/spirit/include/phoenix1_composite.hpp
+x64-windows/include/boost/spirit/include/phoenix1_functions.hpp
+x64-windows/include/boost/spirit/include/phoenix1_new.hpp
+x64-windows/include/boost/spirit/include/phoenix1_operators.hpp
+x64-windows/include/boost/spirit/include/phoenix1_primitives.hpp
+x64-windows/include/boost/spirit/include/phoenix1_special_ops.hpp
+x64-windows/include/boost/spirit/include/phoenix1_statements.hpp
+x64-windows/include/boost/spirit/include/phoenix1_tuple_helpers.hpp
+x64-windows/include/boost/spirit/include/phoenix1_tuples.hpp
+x64-windows/include/boost/spirit/include/phoenix_algorithm.hpp
+x64-windows/include/boost/spirit/include/phoenix_bind.hpp
+x64-windows/include/boost/spirit/include/phoenix_container.hpp
+x64-windows/include/boost/spirit/include/phoenix_core.hpp
+x64-windows/include/boost/spirit/include/phoenix_function.hpp
+x64-windows/include/boost/spirit/include/phoenix_fusion.hpp
+x64-windows/include/boost/spirit/include/phoenix_limits.hpp
+x64-windows/include/boost/spirit/include/phoenix_object.hpp
+x64-windows/include/boost/spirit/include/phoenix_operator.hpp
+x64-windows/include/boost/spirit/include/phoenix_scope.hpp
+x64-windows/include/boost/spirit/include/phoenix_statement.hpp
+x64-windows/include/boost/spirit/include/phoenix_stl.hpp
+x64-windows/include/boost/spirit/include/phoenix_version.hpp
+x64-windows/include/boost/spirit/include/qi.hpp
+x64-windows/include/boost/spirit/include/qi_action.hpp
+x64-windows/include/boost/spirit/include/qi_alternative.hpp
+x64-windows/include/boost/spirit/include/qi_and_predicate.hpp
+x64-windows/include/boost/spirit/include/qi_as.hpp
+x64-windows/include/boost/spirit/include/qi_as_string.hpp
+x64-windows/include/boost/spirit/include/qi_attr.hpp
+x64-windows/include/boost/spirit/include/qi_attr_cast.hpp
+x64-windows/include/boost/spirit/include/qi_auto.hpp
+x64-windows/include/boost/spirit/include/qi_auxiliary.hpp
+x64-windows/include/boost/spirit/include/qi_binary.hpp
+x64-windows/include/boost/spirit/include/qi_bool.hpp
+x64-windows/include/boost/spirit/include/qi_char.hpp
+x64-windows/include/boost/spirit/include/qi_char_.hpp
+x64-windows/include/boost/spirit/include/qi_char_class.hpp
+x64-windows/include/boost/spirit/include/qi_copy.hpp
+x64-windows/include/boost/spirit/include/qi_core.hpp
+x64-windows/include/boost/spirit/include/qi_difference.hpp
+x64-windows/include/boost/spirit/include/qi_directive.hpp
+x64-windows/include/boost/spirit/include/qi_domain.hpp
+x64-windows/include/boost/spirit/include/qi_eoi.hpp
+x64-windows/include/boost/spirit/include/qi_eol.hpp
+x64-windows/include/boost/spirit/include/qi_eps.hpp
+x64-windows/include/boost/spirit/include/qi_expect.hpp
+x64-windows/include/boost/spirit/include/qi_grammar.hpp
+x64-windows/include/boost/spirit/include/qi_hold.hpp
+x64-windows/include/boost/spirit/include/qi_int.hpp
+x64-windows/include/boost/spirit/include/qi_kleene.hpp
+x64-windows/include/boost/spirit/include/qi_lazy.hpp
+x64-windows/include/boost/spirit/include/qi_lexeme.hpp
+x64-windows/include/boost/spirit/include/qi_list.hpp
+x64-windows/include/boost/spirit/include/qi_lit.hpp
+x64-windows/include/boost/spirit/include/qi_match.hpp
+x64-windows/include/boost/spirit/include/qi_match_attr.hpp
+x64-windows/include/boost/spirit/include/qi_match_auto.hpp
+x64-windows/include/boost/spirit/include/qi_matches.hpp
+x64-windows/include/boost/spirit/include/qi_no_case.hpp
+x64-windows/include/boost/spirit/include/qi_no_skip.hpp
+x64-windows/include/boost/spirit/include/qi_nonterminal.hpp
+x64-windows/include/boost/spirit/include/qi_not_predicate.hpp
+x64-windows/include/boost/spirit/include/qi_numeric.hpp
+x64-windows/include/boost/spirit/include/qi_omit.hpp
+x64-windows/include/boost/spirit/include/qi_operator.hpp
+x64-windows/include/boost/spirit/include/qi_optional.hpp
+x64-windows/include/boost/spirit/include/qi_parse.hpp
+x64-windows/include/boost/spirit/include/qi_parse_attr.hpp
+x64-windows/include/boost/spirit/include/qi_parse_auto.hpp
+x64-windows/include/boost/spirit/include/qi_permutation.hpp
+x64-windows/include/boost/spirit/include/qi_plus.hpp
+x64-windows/include/boost/spirit/include/qi_raw.hpp
+x64-windows/include/boost/spirit/include/qi_real.hpp
+x64-windows/include/boost/spirit/include/qi_repeat.hpp
+x64-windows/include/boost/spirit/include/qi_rule.hpp
+x64-windows/include/boost/spirit/include/qi_sequence.hpp
+x64-windows/include/boost/spirit/include/qi_sequential_or.hpp
+x64-windows/include/boost/spirit/include/qi_skip.hpp
+x64-windows/include/boost/spirit/include/qi_stream.hpp
+x64-windows/include/boost/spirit/include/qi_string.hpp
+x64-windows/include/boost/spirit/include/qi_symbols.hpp
+x64-windows/include/boost/spirit/include/qi_uint.hpp
+x64-windows/include/boost/spirit/include/qi_what.hpp
+x64-windows/include/boost/spirit/include/support.hpp
+x64-windows/include/boost/spirit/include/support_adapt_adt_attributes.hpp
+x64-windows/include/boost/spirit/include/support_any.hpp
+x64-windows/include/boost/spirit/include/support_any_if.hpp
+x64-windows/include/boost/spirit/include/support_any_if_ns.hpp
+x64-windows/include/boost/spirit/include/support_any_if_ns_so.hpp
+x64-windows/include/boost/spirit/include/support_any_ns.hpp
+x64-windows/include/boost/spirit/include/support_any_ns_so.hpp
+x64-windows/include/boost/spirit/include/support_argument.hpp
+x64-windows/include/boost/spirit/include/support_ascii.hpp
+x64-windows/include/boost/spirit/include/support_attributes.hpp
+x64-windows/include/boost/spirit/include/support_attributes_fwd.hpp
+x64-windows/include/boost/spirit/include/support_auto.hpp
+x64-windows/include/boost/spirit/include/support_char_class.hpp
+x64-windows/include/boost/spirit/include/support_container.hpp
+x64-windows/include/boost/spirit/include/support_extended_variant.hpp
+x64-windows/include/boost/spirit/include/support_info.hpp
+x64-windows/include/boost/spirit/include/support_iso8859_1.hpp
+x64-windows/include/boost/spirit/include/support_istream_iterator.hpp
+x64-windows/include/boost/spirit/include/support_line_pos_iterator.hpp
+x64-windows/include/boost/spirit/include/support_locals.hpp
+x64-windows/include/boost/spirit/include/support_look_ahead.hpp
+x64-windows/include/boost/spirit/include/support_modify.hpp
+x64-windows/include/boost/spirit/include/support_multi_pass.hpp
+x64-windows/include/boost/spirit/include/support_multi_pass_fwd.hpp
+x64-windows/include/boost/spirit/include/support_ostream_iterator.hpp
+x64-windows/include/boost/spirit/include/support_standard.hpp
+x64-windows/include/boost/spirit/include/support_standard_wide.hpp
+x64-windows/include/boost/spirit/include/support_string_traits.hpp
+x64-windows/include/boost/spirit/include/support_unused.hpp
+x64-windows/include/boost/spirit/include/support_utree.hpp
+x64-windows/include/boost/spirit/include/version.hpp
+x64-windows/include/boost/spirit/repository/
+x64-windows/include/boost/spirit/repository/home/
+x64-windows/include/boost/spirit/repository/home/karma.hpp
+x64-windows/include/boost/spirit/repository/home/karma/
+x64-windows/include/boost/spirit/repository/home/karma/directive.hpp
+x64-windows/include/boost/spirit/repository/home/karma/directive/
+x64-windows/include/boost/spirit/repository/home/karma/directive/confix.hpp
+x64-windows/include/boost/spirit/repository/home/karma/nonterminal.hpp
+x64-windows/include/boost/spirit/repository/home/karma/nonterminal/
+x64-windows/include/boost/spirit/repository/home/karma/nonterminal/subrule.hpp
+x64-windows/include/boost/spirit/repository/home/qi.hpp
+x64-windows/include/boost/spirit/repository/home/qi/
+x64-windows/include/boost/spirit/repository/home/qi/directive.hpp
+x64-windows/include/boost/spirit/repository/home/qi/directive/
+x64-windows/include/boost/spirit/repository/home/qi/directive/confix.hpp
+x64-windows/include/boost/spirit/repository/home/qi/directive/distinct.hpp
+x64-windows/include/boost/spirit/repository/home/qi/directive/kwd.hpp
+x64-windows/include/boost/spirit/repository/home/qi/directive/seek.hpp
+x64-windows/include/boost/spirit/repository/home/qi/nonterminal.hpp
+x64-windows/include/boost/spirit/repository/home/qi/nonterminal/
+x64-windows/include/boost/spirit/repository/home/qi/nonterminal/subrule.hpp
+x64-windows/include/boost/spirit/repository/home/qi/operator.hpp
+x64-windows/include/boost/spirit/repository/home/qi/operator/
+x64-windows/include/boost/spirit/repository/home/qi/operator/detail/
+x64-windows/include/boost/spirit/repository/home/qi/operator/detail/keywords.hpp
+x64-windows/include/boost/spirit/repository/home/qi/operator/keywords.hpp
+x64-windows/include/boost/spirit/repository/home/qi/primitive.hpp
+x64-windows/include/boost/spirit/repository/home/qi/primitive/
+x64-windows/include/boost/spirit/repository/home/qi/primitive/advance.hpp
+x64-windows/include/boost/spirit/repository/home/qi/primitive/flush_multi_pass.hpp
+x64-windows/include/boost/spirit/repository/home/qi/primitive/iter_pos.hpp
+x64-windows/include/boost/spirit/repository/home/support/
+x64-windows/include/boost/spirit/repository/home/support/confix.hpp
+x64-windows/include/boost/spirit/repository/home/support/distinct.hpp
+x64-windows/include/boost/spirit/repository/home/support/flush_multi_pass.hpp
+x64-windows/include/boost/spirit/repository/home/support/kwd.hpp
+x64-windows/include/boost/spirit/repository/home/support/seek.hpp
+x64-windows/include/boost/spirit/repository/home/support/subrule_context.hpp
+x64-windows/include/boost/spirit/repository/include/
+x64-windows/include/boost/spirit/repository/include/karma.hpp
+x64-windows/include/boost/spirit/repository/include/karma_confix.hpp
+x64-windows/include/boost/spirit/repository/include/karma_directive.hpp
+x64-windows/include/boost/spirit/repository/include/karma_nonterminal.hpp
+x64-windows/include/boost/spirit/repository/include/karma_subrule.hpp
+x64-windows/include/boost/spirit/repository/include/qi.hpp
+x64-windows/include/boost/spirit/repository/include/qi_advance.hpp
+x64-windows/include/boost/spirit/repository/include/qi_confix.hpp
+x64-windows/include/boost/spirit/repository/include/qi_directive.hpp
+x64-windows/include/boost/spirit/repository/include/qi_distinct.hpp
+x64-windows/include/boost/spirit/repository/include/qi_flush_multi_pass.hpp
+x64-windows/include/boost/spirit/repository/include/qi_iter_pos.hpp
+x64-windows/include/boost/spirit/repository/include/qi_keywords.hpp
+x64-windows/include/boost/spirit/repository/include/qi_kwd.hpp
+x64-windows/include/boost/spirit/repository/include/qi_nonterminal.hpp
+x64-windows/include/boost/spirit/repository/include/qi_primitive.hpp
+x64-windows/include/boost/spirit/repository/include/qi_seek.hpp
+x64-windows/include/boost/spirit/repository/include/qi_subrule.hpp
+x64-windows/include/boost/spirit/version.hpp
+x64-windows/share/
+x64-windows/share/boost-spirit/
+x64-windows/share/boost-spirit/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-static-assert_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/static_assert.hpp
+x64-windows/share/
+x64-windows/share/boost-static-assert/
+x64-windows/share/boost-static-assert/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-system_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,29 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_system-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_system-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_system-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_system-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_system-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/cerrno.hpp
+x64-windows/include/boost/system/
+x64-windows/include/boost/system/api_config.hpp
+x64-windows/include/boost/system/config.hpp
+x64-windows/include/boost/system/cygwin_error.hpp
+x64-windows/include/boost/system/detail/
+x64-windows/include/boost/system/detail/error_code.ipp
+x64-windows/include/boost/system/detail/local_free_on_destruction.hpp
+x64-windows/include/boost/system/error_code.hpp
+x64-windows/include/boost/system/linux_error.hpp
+x64-windows/include/boost/system/system_error.hpp
+x64-windows/include/boost/system/windows_error.hpp
+x64-windows/lib/
+x64-windows/lib/boost_system-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-system/
+x64-windows/share/boost-system/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-test_1.67.0-2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,195 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_prg_exec_monitor-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_prg_exec_monitor-vc141-mt-x64-1_67.pdb
+x64-windows/bin/boost_unit_test_framework-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_unit_test_framework-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_prg_exec_monitor-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_prg_exec_monitor-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/bin/boost_unit_test_framework-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_unit_test_framework-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_unit_test_framework-vc140-mt-gd.lib
+x64-windows/debug/lib/manual-link/
+x64-windows/debug/lib/manual-link/boost_prg_exec_monitor-vc140-mt-gd.lib
+x64-windows/debug/lib/manual-link/boost_test_exec_monitor-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/test/
+x64-windows/include/boost/test/auto_unit_test.hpp
+x64-windows/include/boost/test/data/
+x64-windows/include/boost/test/data/config.hpp
+x64-windows/include/boost/test/data/dataset.hpp
+x64-windows/include/boost/test/data/for_each_sample.hpp
+x64-windows/include/boost/test/data/generators.hpp
+x64-windows/include/boost/test/data/index_sequence.hpp
+x64-windows/include/boost/test/data/monomorphic.hpp
+x64-windows/include/boost/test/data/monomorphic/
+x64-windows/include/boost/test/data/monomorphic/array.hpp
+x64-windows/include/boost/test/data/monomorphic/collection.hpp
+x64-windows/include/boost/test/data/monomorphic/fwd.hpp
+x64-windows/include/boost/test/data/monomorphic/generate.hpp
+x64-windows/include/boost/test/data/monomorphic/generators.hpp
+x64-windows/include/boost/test/data/monomorphic/generators/
+x64-windows/include/boost/test/data/monomorphic/generators/keywords.hpp
+x64-windows/include/boost/test/data/monomorphic/generators/random.hpp
+x64-windows/include/boost/test/data/monomorphic/generators/xrange.hpp
+x64-windows/include/boost/test/data/monomorphic/grid.hpp
+x64-windows/include/boost/test/data/monomorphic/initializer_list.hpp
+x64-windows/include/boost/test/data/monomorphic/join.hpp
+x64-windows/include/boost/test/data/monomorphic/sample_merge.hpp
+x64-windows/include/boost/test/data/monomorphic/singleton.hpp
+x64-windows/include/boost/test/data/monomorphic/zip.hpp
+x64-windows/include/boost/test/data/size.hpp
+x64-windows/include/boost/test/data/test_case.hpp
+x64-windows/include/boost/test/debug.hpp
+x64-windows/include/boost/test/debug_config.hpp
+x64-windows/include/boost/test/detail/
+x64-windows/include/boost/test/detail/config.hpp
+x64-windows/include/boost/test/detail/enable_warnings.hpp
+x64-windows/include/boost/test/detail/fwd_decl.hpp
+x64-windows/include/boost/test/detail/global_typedef.hpp
+x64-windows/include/boost/test/detail/log_level.hpp
+x64-windows/include/boost/test/detail/pp_variadic.hpp
+x64-windows/include/boost/test/detail/suppress_warnings.hpp
+x64-windows/include/boost/test/detail/throw_exception.hpp
+x64-windows/include/boost/test/detail/workaround.hpp
+x64-windows/include/boost/test/execution_monitor.hpp
+x64-windows/include/boost/test/floating_point_comparison.hpp
+x64-windows/include/boost/test/framework.hpp
+x64-windows/include/boost/test/impl/
+x64-windows/include/boost/test/impl/compiler_log_formatter.ipp
+x64-windows/include/boost/test/impl/cpp_main.ipp
+x64-windows/include/boost/test/impl/debug.ipp
+x64-windows/include/boost/test/impl/decorator.ipp
+x64-windows/include/boost/test/impl/execution_monitor.ipp
+x64-windows/include/boost/test/impl/framework.ipp
+x64-windows/include/boost/test/impl/junit_log_formatter.ipp
+x64-windows/include/boost/test/impl/plain_report_formatter.ipp
+x64-windows/include/boost/test/impl/progress_monitor.ipp
+x64-windows/include/boost/test/impl/results_collector.ipp
+x64-windows/include/boost/test/impl/results_reporter.ipp
+x64-windows/include/boost/test/impl/test_framework_init_observer.ipp
+x64-windows/include/boost/test/impl/test_main.ipp
+x64-windows/include/boost/test/impl/test_tools.ipp
+x64-windows/include/boost/test/impl/test_tree.ipp
+x64-windows/include/boost/test/impl/unit_test_log.ipp
+x64-windows/include/boost/test/impl/unit_test_main.ipp
+x64-windows/include/boost/test/impl/unit_test_monitor.ipp
+x64-windows/include/boost/test/impl/unit_test_parameters.ipp
+x64-windows/include/boost/test/impl/xml_log_formatter.ipp
+x64-windows/include/boost/test/impl/xml_report_formatter.ipp
+x64-windows/include/boost/test/included/
+x64-windows/include/boost/test/included/execution_monitor.hpp
+x64-windows/include/boost/test/included/prg_exec_monitor.hpp
+x64-windows/include/boost/test/included/test_exec_monitor.hpp
+x64-windows/include/boost/test/included/unit_test.hpp
+x64-windows/include/boost/test/included/unit_test_framework.hpp
+x64-windows/include/boost/test/minimal.hpp
+x64-windows/include/boost/test/output/
+x64-windows/include/boost/test/output/compiler_log_formatter.hpp
+x64-windows/include/boost/test/output/junit_log_formatter.hpp
+x64-windows/include/boost/test/output/plain_report_formatter.hpp
+x64-windows/include/boost/test/output/xml_log_formatter.hpp
+x64-windows/include/boost/test/output/xml_report_formatter.hpp
+x64-windows/include/boost/test/output_test_stream.hpp
+x64-windows/include/boost/test/parameterized_test.hpp
+x64-windows/include/boost/test/predicate_result.hpp
+x64-windows/include/boost/test/prg_exec_monitor.hpp
+x64-windows/include/boost/test/progress_monitor.hpp
+x64-windows/include/boost/test/results_collector.hpp
+x64-windows/include/boost/test/results_reporter.hpp
+x64-windows/include/boost/test/test_case_template.hpp
+x64-windows/include/boost/test/test_exec_monitor.hpp
+x64-windows/include/boost/test/test_framework_init_observer.hpp
+x64-windows/include/boost/test/test_tools.hpp
+x64-windows/include/boost/test/tools/
+x64-windows/include/boost/test/tools/assertion.hpp
+x64-windows/include/boost/test/tools/assertion_result.hpp
+x64-windows/include/boost/test/tools/collection_comparison_op.hpp
+x64-windows/include/boost/test/tools/context.hpp
+x64-windows/include/boost/test/tools/cstring_comparison_op.hpp
+x64-windows/include/boost/test/tools/detail/
+x64-windows/include/boost/test/tools/detail/bitwise_manip.hpp
+x64-windows/include/boost/test/tools/detail/expression_holder.hpp
+x64-windows/include/boost/test/tools/detail/fwd.hpp
+x64-windows/include/boost/test/tools/detail/indirections.hpp
+x64-windows/include/boost/test/tools/detail/it_pair.hpp
+x64-windows/include/boost/test/tools/detail/lexicographic_manip.hpp
+x64-windows/include/boost/test/tools/detail/per_element_manip.hpp
+x64-windows/include/boost/test/tools/detail/print_helper.hpp
+x64-windows/include/boost/test/tools/detail/tolerance_manip.hpp
+x64-windows/include/boost/test/tools/floating_point_comparison.hpp
+x64-windows/include/boost/test/tools/fpc_op.hpp
+x64-windows/include/boost/test/tools/fpc_tolerance.hpp
+x64-windows/include/boost/test/tools/interface.hpp
+x64-windows/include/boost/test/tools/old/
+x64-windows/include/boost/test/tools/old/impl.hpp
+x64-windows/include/boost/test/tools/old/interface.hpp
+x64-windows/include/boost/test/tools/output_test_stream.hpp
+x64-windows/include/boost/test/tree/
+x64-windows/include/boost/test/tree/auto_registration.hpp
+x64-windows/include/boost/test/tree/decorator.hpp
+x64-windows/include/boost/test/tree/fixture.hpp
+x64-windows/include/boost/test/tree/global_fixture.hpp
+x64-windows/include/boost/test/tree/observer.hpp
+x64-windows/include/boost/test/tree/test_case_counter.hpp
+x64-windows/include/boost/test/tree/test_case_template.hpp
+x64-windows/include/boost/test/tree/test_unit.hpp
+x64-windows/include/boost/test/tree/traverse.hpp
+x64-windows/include/boost/test/tree/visitor.hpp
+x64-windows/include/boost/test/unit_test.hpp
+x64-windows/include/boost/test/unit_test_log.hpp
+x64-windows/include/boost/test/unit_test_log_formatter.hpp
+x64-windows/include/boost/test/unit_test_monitor.hpp
+x64-windows/include/boost/test/unit_test_parameters.hpp
+x64-windows/include/boost/test/unit_test_suite.hpp
+x64-windows/include/boost/test/utils/
+x64-windows/include/boost/test/utils/algorithm.hpp
+x64-windows/include/boost/test/utils/assign_op.hpp
+x64-windows/include/boost/test/utils/basic_cstring/
+x64-windows/include/boost/test/utils/basic_cstring/basic_cstring.hpp
+x64-windows/include/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp
+x64-windows/include/boost/test/utils/basic_cstring/bcs_char_traits.hpp
+x64-windows/include/boost/test/utils/basic_cstring/compare.hpp
+x64-windows/include/boost/test/utils/basic_cstring/io.hpp
+x64-windows/include/boost/test/utils/class_properties.hpp
+x64-windows/include/boost/test/utils/custom_manip.hpp
+x64-windows/include/boost/test/utils/foreach.hpp
+x64-windows/include/boost/test/utils/is_cstring.hpp
+x64-windows/include/boost/test/utils/is_forward_iterable.hpp
+x64-windows/include/boost/test/utils/iterator/
+x64-windows/include/boost/test/utils/iterator/input_iterator_facade.hpp
+x64-windows/include/boost/test/utils/iterator/token_iterator.hpp
+x64-windows/include/boost/test/utils/lazy_ostream.hpp
+x64-windows/include/boost/test/utils/named_params.hpp
+x64-windows/include/boost/test/utils/nullstream.hpp
+x64-windows/include/boost/test/utils/rtti.hpp
+x64-windows/include/boost/test/utils/runtime/
+x64-windows/include/boost/test/utils/runtime/argument.hpp
+x64-windows/include/boost/test/utils/runtime/argument_factory.hpp
+x64-windows/include/boost/test/utils/runtime/cla/
+x64-windows/include/boost/test/utils/runtime/cla/argv_traverser.hpp
+x64-windows/include/boost/test/utils/runtime/cla/parser.hpp
+x64-windows/include/boost/test/utils/runtime/env/
+x64-windows/include/boost/test/utils/runtime/env/fetch.hpp
+x64-windows/include/boost/test/utils/runtime/errors.hpp
+x64-windows/include/boost/test/utils/runtime/finalize.hpp
+x64-windows/include/boost/test/utils/runtime/fwd.hpp
+x64-windows/include/boost/test/utils/runtime/modifier.hpp
+x64-windows/include/boost/test/utils/runtime/parameter.hpp
+x64-windows/include/boost/test/utils/setcolor.hpp
+x64-windows/include/boost/test/utils/string_cast.hpp
+x64-windows/include/boost/test/utils/trivial_singleton.hpp
+x64-windows/include/boost/test/utils/wrap_stringstream.hpp
+x64-windows/include/boost/test/utils/xml_printer.hpp
+x64-windows/lib/
+x64-windows/lib/boost_unit_test_framework-vc140-mt.lib
+x64-windows/lib/manual-link/
+x64-windows/lib/manual-link/boost_prg_exec_monitor-vc140-mt.lib
+x64-windows/lib/manual-link/boost_test_exec_monitor-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-test/
+x64-windows/share/boost-test/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-thread_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,197 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_thread-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_thread-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_thread-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_thread-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_thread-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/thread.hpp
+x64-windows/include/boost/thread/
+x64-windows/include/boost/thread/barrier.hpp
+x64-windows/include/boost/thread/caller_context.hpp
+x64-windows/include/boost/thread/completion_latch.hpp
+x64-windows/include/boost/thread/concurrent_queues/
+x64-windows/include/boost/thread/concurrent_queues/deque_adaptor.hpp
+x64-windows/include/boost/thread/concurrent_queues/deque_base.hpp
+x64-windows/include/boost/thread/concurrent_queues/deque_views.hpp
+x64-windows/include/boost/thread/concurrent_queues/detail/
+x64-windows/include/boost/thread/concurrent_queues/detail/sync_deque_base.hpp
+x64-windows/include/boost/thread/concurrent_queues/detail/sync_queue_base.hpp
+x64-windows/include/boost/thread/concurrent_queues/queue_adaptor.hpp
+x64-windows/include/boost/thread/concurrent_queues/queue_base.hpp
+x64-windows/include/boost/thread/concurrent_queues/queue_op_status.hpp
+x64-windows/include/boost/thread/concurrent_queues/queue_views.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_bounded_queue.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_deque.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_priority_queue.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_queue.hpp
+x64-windows/include/boost/thread/concurrent_queues/sync_timed_queue.hpp
+x64-windows/include/boost/thread/condition.hpp
+x64-windows/include/boost/thread/condition_variable.hpp
+x64-windows/include/boost/thread/csbl/
+x64-windows/include/boost/thread/csbl/deque.hpp
+x64-windows/include/boost/thread/csbl/devector.hpp
+x64-windows/include/boost/thread/csbl/functional.hpp
+x64-windows/include/boost/thread/csbl/list.hpp
+x64-windows/include/boost/thread/csbl/memory.hpp
+x64-windows/include/boost/thread/csbl/memory/
+x64-windows/include/boost/thread/csbl/memory/allocator_arg.hpp
+x64-windows/include/boost/thread/csbl/memory/allocator_traits.hpp
+x64-windows/include/boost/thread/csbl/memory/config.hpp
+x64-windows/include/boost/thread/csbl/memory/default_delete.hpp
+x64-windows/include/boost/thread/csbl/memory/pointer_traits.hpp
+x64-windows/include/boost/thread/csbl/memory/scoped_allocator.hpp
+x64-windows/include/boost/thread/csbl/memory/shared_ptr.hpp
+x64-windows/include/boost/thread/csbl/memory/unique_ptr.hpp
+x64-windows/include/boost/thread/csbl/queue.hpp
+x64-windows/include/boost/thread/csbl/tuple.hpp
+x64-windows/include/boost/thread/csbl/vector.hpp
+x64-windows/include/boost/thread/cv_status.hpp
+x64-windows/include/boost/thread/detail/
+x64-windows/include/boost/thread/detail/atomic_redef_macros.hpp
+x64-windows/include/boost/thread/detail/atomic_undef_macros.hpp
+x64-windows/include/boost/thread/detail/config.hpp
+x64-windows/include/boost/thread/detail/counter.hpp
+x64-windows/include/boost/thread/detail/delete.hpp
+x64-windows/include/boost/thread/detail/force_cast.hpp
+x64-windows/include/boost/thread/detail/function_wrapper.hpp
+x64-windows/include/boost/thread/detail/invoke.hpp
+x64-windows/include/boost/thread/detail/invoker.hpp
+x64-windows/include/boost/thread/detail/is_convertible.hpp
+x64-windows/include/boost/thread/detail/lockable_wrapper.hpp
+x64-windows/include/boost/thread/detail/log.hpp
+x64-windows/include/boost/thread/detail/make_tuple_indices.hpp
+x64-windows/include/boost/thread/detail/memory.hpp
+x64-windows/include/boost/thread/detail/move.hpp
+x64-windows/include/boost/thread/detail/nullary_function.hpp
+x64-windows/include/boost/thread/detail/platform.hpp
+x64-windows/include/boost/thread/detail/platform_time.hpp
+x64-windows/include/boost/thread/detail/singleton.hpp
+x64-windows/include/boost/thread/detail/thread.hpp
+x64-windows/include/boost/thread/detail/thread_group.hpp
+x64-windows/include/boost/thread/detail/thread_heap_alloc.hpp
+x64-windows/include/boost/thread/detail/thread_interruption.hpp
+x64-windows/include/boost/thread/detail/tss_hooks.hpp
+x64-windows/include/boost/thread/detail/variadic_footer.hpp
+x64-windows/include/boost/thread/detail/variadic_header.hpp
+x64-windows/include/boost/thread/exceptional_ptr.hpp
+x64-windows/include/boost/thread/exceptions.hpp
+x64-windows/include/boost/thread/executor.hpp
+x64-windows/include/boost/thread/executors/
+x64-windows/include/boost/thread/executors/basic_thread_pool.hpp
+x64-windows/include/boost/thread/executors/detail/
+x64-windows/include/boost/thread/executors/detail/priority_executor_base.hpp
+x64-windows/include/boost/thread/executors/detail/scheduled_executor_base.hpp
+x64-windows/include/boost/thread/executors/executor.hpp
+x64-windows/include/boost/thread/executors/executor_adaptor.hpp
+x64-windows/include/boost/thread/executors/generic_executor_ref.hpp
+x64-windows/include/boost/thread/executors/inline_executor.hpp
+x64-windows/include/boost/thread/executors/loop_executor.hpp
+x64-windows/include/boost/thread/executors/scheduled_thread_pool.hpp
+x64-windows/include/boost/thread/executors/scheduler.hpp
+x64-windows/include/boost/thread/executors/scheduling_adaptor.hpp
+x64-windows/include/boost/thread/executors/serial_executor.hpp
+x64-windows/include/boost/thread/executors/serial_executor_cont.hpp
+x64-windows/include/boost/thread/executors/thread_executor.hpp
+x64-windows/include/boost/thread/executors/work.hpp
+x64-windows/include/boost/thread/experimental/
+x64-windows/include/boost/thread/experimental/config/
+x64-windows/include/boost/thread/experimental/config/inline_namespace.hpp
+x64-windows/include/boost/thread/experimental/exception_list.hpp
+x64-windows/include/boost/thread/experimental/parallel/
+x64-windows/include/boost/thread/experimental/parallel/v1/
+x64-windows/include/boost/thread/experimental/parallel/v1/exception_list.hpp
+x64-windows/include/boost/thread/experimental/parallel/v1/inline_namespace.hpp
+x64-windows/include/boost/thread/experimental/parallel/v2/
+x64-windows/include/boost/thread/experimental/parallel/v2/inline_namespace.hpp
+x64-windows/include/boost/thread/experimental/parallel/v2/task_region.hpp
+x64-windows/include/boost/thread/experimental/task_region.hpp
+x64-windows/include/boost/thread/externally_locked.hpp
+x64-windows/include/boost/thread/externally_locked_stream.hpp
+x64-windows/include/boost/thread/future.hpp
+x64-windows/include/boost/thread/futures/
+x64-windows/include/boost/thread/futures/future_error.hpp
+x64-windows/include/boost/thread/futures/future_error_code.hpp
+x64-windows/include/boost/thread/futures/future_status.hpp
+x64-windows/include/boost/thread/futures/is_future_type.hpp
+x64-windows/include/boost/thread/futures/launch.hpp
+x64-windows/include/boost/thread/futures/wait_for_all.hpp
+x64-windows/include/boost/thread/futures/wait_for_any.hpp
+x64-windows/include/boost/thread/is_locked_by_this_thread.hpp
+x64-windows/include/boost/thread/latch.hpp
+x64-windows/include/boost/thread/lock_algorithms.hpp
+x64-windows/include/boost/thread/lock_concepts.hpp
+x64-windows/include/boost/thread/lock_factories.hpp
+x64-windows/include/boost/thread/lock_guard.hpp
+x64-windows/include/boost/thread/lock_options.hpp
+x64-windows/include/boost/thread/lock_traits.hpp
+x64-windows/include/boost/thread/lock_types.hpp
+x64-windows/include/boost/thread/lockable_adapter.hpp
+x64-windows/include/boost/thread/lockable_concepts.hpp
+x64-windows/include/boost/thread/lockable_traits.hpp
+x64-windows/include/boost/thread/locks.hpp
+x64-windows/include/boost/thread/mutex.hpp
+x64-windows/include/boost/thread/null_mutex.hpp
+x64-windows/include/boost/thread/once.hpp
+x64-windows/include/boost/thread/ostream_buffer.hpp
+x64-windows/include/boost/thread/poly_lockable.hpp
+x64-windows/include/boost/thread/poly_lockable_adapter.hpp
+x64-windows/include/boost/thread/poly_shared_lockable.hpp
+x64-windows/include/boost/thread/poly_shared_lockable_adapter.hpp
+x64-windows/include/boost/thread/pthread/
+x64-windows/include/boost/thread/pthread/condition_variable.hpp
+x64-windows/include/boost/thread/pthread/condition_variable_fwd.hpp
+x64-windows/include/boost/thread/pthread/mutex.hpp
+x64-windows/include/boost/thread/pthread/once.hpp
+x64-windows/include/boost/thread/pthread/once_atomic.hpp
+x64-windows/include/boost/thread/pthread/pthread_helpers.hpp
+x64-windows/include/boost/thread/pthread/pthread_mutex_scoped_lock.hpp
+x64-windows/include/boost/thread/pthread/recursive_mutex.hpp
+x64-windows/include/boost/thread/pthread/shared_mutex.hpp
+x64-windows/include/boost/thread/pthread/thread_data.hpp
+x64-windows/include/boost/thread/pthread/thread_heap_alloc.hpp
+x64-windows/include/boost/thread/recursive_mutex.hpp
+x64-windows/include/boost/thread/reverse_lock.hpp
+x64-windows/include/boost/thread/scoped_thread.hpp
+x64-windows/include/boost/thread/shared_lock_guard.hpp
+x64-windows/include/boost/thread/shared_mutex.hpp
+x64-windows/include/boost/thread/strict_lock.hpp
+x64-windows/include/boost/thread/sync_bounded_queue.hpp
+x64-windows/include/boost/thread/sync_queue.hpp
+x64-windows/include/boost/thread/synchronized_value.hpp
+x64-windows/include/boost/thread/testable_mutex.hpp
+x64-windows/include/boost/thread/thread.hpp
+x64-windows/include/boost/thread/thread_functors.hpp
+x64-windows/include/boost/thread/thread_guard.hpp
+x64-windows/include/boost/thread/thread_only.hpp
+x64-windows/include/boost/thread/thread_pool.hpp
+x64-windows/include/boost/thread/thread_time.hpp
+x64-windows/include/boost/thread/tss.hpp
+x64-windows/include/boost/thread/user_scheduler.hpp
+x64-windows/include/boost/thread/v2/
+x64-windows/include/boost/thread/v2/shared_mutex.hpp
+x64-windows/include/boost/thread/win32/
+x64-windows/include/boost/thread/win32/basic_recursive_mutex.hpp
+x64-windows/include/boost/thread/win32/basic_timed_mutex.hpp
+x64-windows/include/boost/thread/win32/condition_variable.hpp
+x64-windows/include/boost/thread/win32/interlocked_read.hpp
+x64-windows/include/boost/thread/win32/mfc_thread_init.hpp
+x64-windows/include/boost/thread/win32/mutex.hpp
+x64-windows/include/boost/thread/win32/once.hpp
+x64-windows/include/boost/thread/win32/recursive_mutex.hpp
+x64-windows/include/boost/thread/win32/shared_mutex.hpp
+x64-windows/include/boost/thread/win32/thread_data.hpp
+x64-windows/include/boost/thread/win32/thread_heap_alloc.hpp
+x64-windows/include/boost/thread/win32/thread_primitives.hpp
+x64-windows/include/boost/thread/with_lock_guard.hpp
+x64-windows/include/boost/thread/xtime.hpp
+x64-windows/lib/
+x64-windows/lib/boost_thread-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-thread/
+x64-windows/share/boost-thread/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-throw-exception_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/exception/
+x64-windows/include/boost/exception/exception.hpp
+x64-windows/include/boost/throw_exception.hpp
+x64-windows/share/
+x64-windows/share/boost-throw-exception/
+x64-windows/share/boost-throw-exception/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-timer_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/boost_timer-vc141-mt-x64-1_67.dll
+x64-windows/bin/boost_timer-vc141-mt-x64-1_67.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/boost_timer-vc141-mt-gd-x64-1_67.dll
+x64-windows/debug/bin/boost_timer-vc141-mt-gd-x64-1_67.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/boost_timer-vc140-mt-gd.lib
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/progress.hpp
+x64-windows/include/boost/timer.hpp
+x64-windows/include/boost/timer/
+x64-windows/include/boost/timer/config.hpp
+x64-windows/include/boost/timer/timer.hpp
+x64-windows/lib/
+x64-windows/lib/boost_timer-vc140-mt.lib
+x64-windows/share/
+x64-windows/share/boost-timer/
+x64-windows/share/boost-timer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tokenizer_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,9 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/token_functions.hpp
+x64-windows/include/boost/token_iterator.hpp
+x64-windows/include/boost/tokenizer.hpp
+x64-windows/share/
+x64-windows/share/boost-tokenizer/
+x64-windows/share/boost-tokenizer/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tti_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/tti/
+x64-windows/include/boost/tti/detail/
+x64-windows/include/boost/tti/detail/dcomp_mem_fun.hpp
+x64-windows/include/boost/tti/detail/ddata.hpp
+x64-windows/include/boost/tti/detail/ddeftype.hpp
+x64-windows/include/boost/tti/detail/dftclass.hpp
+x64-windows/include/boost/tti/detail/dfunction.hpp
+x64-windows/include/boost/tti/detail/dlambda.hpp
+x64-windows/include/boost/tti/detail/dmem_data.hpp
+x64-windows/include/boost/tti/detail/dmem_fun.hpp
+x64-windows/include/boost/tti/detail/dmem_type.hpp
+x64-windows/include/boost/tti/detail/dmetafunc.hpp
+x64-windows/include/boost/tti/detail/dnotype.hpp
+x64-windows/include/boost/tti/detail/dnullptr.hpp
+x64-windows/include/boost/tti/detail/dplaceholder.hpp
+x64-windows/include/boost/tti/detail/dptmf.hpp
+x64-windows/include/boost/tti/detail/dstatic_mem_data.hpp
+x64-windows/include/boost/tti/detail/dstatic_mem_fun.hpp
+x64-windows/include/boost/tti/detail/dtclass.hpp
+x64-windows/include/boost/tti/detail/dtemplate.hpp
+x64-windows/include/boost/tti/detail/dtemplate_params.hpp
+x64-windows/include/boost/tti/detail/dtfunction.hpp
+x64-windows/include/boost/tti/detail/dtype.hpp
+x64-windows/include/boost/tti/detail/dvm_template_params.hpp
+x64-windows/include/boost/tti/gen/
+x64-windows/include/boost/tti/gen/has_data_gen.hpp
+x64-windows/include/boost/tti/gen/has_function_gen.hpp
+x64-windows/include/boost/tti/gen/has_member_data_gen.hpp
+x64-windows/include/boost/tti/gen/has_member_function_gen.hpp
+x64-windows/include/boost/tti/gen/has_static_member_data_gen.hpp
+x64-windows/include/boost/tti/gen/has_static_member_function_gen.hpp
+x64-windows/include/boost/tti/gen/has_template_gen.hpp
+x64-windows/include/boost/tti/gen/has_type_gen.hpp
+x64-windows/include/boost/tti/gen/member_type_gen.hpp
+x64-windows/include/boost/tti/gen/namespace_gen.hpp
+x64-windows/include/boost/tti/has_data.hpp
+x64-windows/include/boost/tti/has_function.hpp
+x64-windows/include/boost/tti/has_member_data.hpp
+x64-windows/include/boost/tti/has_member_function.hpp
+x64-windows/include/boost/tti/has_static_member_data.hpp
+x64-windows/include/boost/tti/has_static_member_function.hpp
+x64-windows/include/boost/tti/has_template.hpp
+x64-windows/include/boost/tti/has_type.hpp
+x64-windows/include/boost/tti/member_type.hpp
+x64-windows/include/boost/tti/tti.hpp
+x64-windows/share/
+x64-windows/share/boost-tti/
+x64-windows/share/boost-tti/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-tuple_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,12 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/tuple/
+x64-windows/include/boost/tuple/detail/
+x64-windows/include/boost/tuple/detail/tuple_basic.hpp
+x64-windows/include/boost/tuple/tuple.hpp
+x64-windows/include/boost/tuple/tuple_comparison.hpp
+x64-windows/include/boost/tuple/tuple_io.hpp
+x64-windows/share/
+x64-windows/share/boost-tuple/
+x64-windows/share/boost-tuple/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-type-index_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/type_index.hpp
+x64-windows/include/boost/type_index/
+x64-windows/include/boost/type_index/ctti_type_index.hpp
+x64-windows/include/boost/type_index/detail/
+x64-windows/include/boost/type_index/detail/compile_time_type_info.hpp
+x64-windows/include/boost/type_index/detail/ctti_register_class.hpp
+x64-windows/include/boost/type_index/detail/stl_register_class.hpp
+x64-windows/include/boost/type_index/runtime_cast.hpp
+x64-windows/include/boost/type_index/runtime_cast/
+x64-windows/include/boost/type_index/runtime_cast/boost_shared_ptr_cast.hpp
+x64-windows/include/boost/type_index/runtime_cast/detail/
+x64-windows/include/boost/type_index/runtime_cast/detail/runtime_cast_impl.hpp
+x64-windows/include/boost/type_index/runtime_cast/pointer_cast.hpp
+x64-windows/include/boost/type_index/runtime_cast/reference_cast.hpp
+x64-windows/include/boost/type_index/runtime_cast/register_runtime_class.hpp
+x64-windows/include/boost/type_index/runtime_cast/std_shared_ptr_cast.hpp
+x64-windows/include/boost/type_index/stl_type_index.hpp
+x64-windows/include/boost/type_index/type_index_facade.hpp
+x64-windows/share/
+x64-windows/share/boost-type-index/
+x64-windows/share/boost-type-index/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-typeof_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,60 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/typeof/
+x64-windows/include/boost/typeof/decltype.hpp
+x64-windows/include/boost/typeof/dmc/
+x64-windows/include/boost/typeof/dmc/typeof_impl.hpp
+x64-windows/include/boost/typeof/encode_decode.hpp
+x64-windows/include/boost/typeof/encode_decode_params.hpp
+x64-windows/include/boost/typeof/incr_registration_group.hpp
+x64-windows/include/boost/typeof/int_encoding.hpp
+x64-windows/include/boost/typeof/integral_template_param.hpp
+x64-windows/include/boost/typeof/message.hpp
+x64-windows/include/boost/typeof/modifiers.hpp
+x64-windows/include/boost/typeof/msvc/
+x64-windows/include/boost/typeof/msvc/typeof_impl.hpp
+x64-windows/include/boost/typeof/native.hpp
+x64-windows/include/boost/typeof/pointers_data_members.hpp
+x64-windows/include/boost/typeof/register_functions.hpp
+x64-windows/include/boost/typeof/register_functions_iterate.hpp
+x64-windows/include/boost/typeof/register_fundamental.hpp
+x64-windows/include/boost/typeof/register_mem_functions.hpp
+x64-windows/include/boost/typeof/std/
+x64-windows/include/boost/typeof/std/bitset.hpp
+x64-windows/include/boost/typeof/std/complex.hpp
+x64-windows/include/boost/typeof/std/deque.hpp
+x64-windows/include/boost/typeof/std/fstream.hpp
+x64-windows/include/boost/typeof/std/functional.hpp
+x64-windows/include/boost/typeof/std/iostream.hpp
+x64-windows/include/boost/typeof/std/istream.hpp
+x64-windows/include/boost/typeof/std/iterator.hpp
+x64-windows/include/boost/typeof/std/list.hpp
+x64-windows/include/boost/typeof/std/locale.hpp
+x64-windows/include/boost/typeof/std/map.hpp
+x64-windows/include/boost/typeof/std/memory.hpp
+x64-windows/include/boost/typeof/std/ostream.hpp
+x64-windows/include/boost/typeof/std/queue.hpp
+x64-windows/include/boost/typeof/std/set.hpp
+x64-windows/include/boost/typeof/std/sstream.hpp
+x64-windows/include/boost/typeof/std/stack.hpp
+x64-windows/include/boost/typeof/std/streambuf.hpp
+x64-windows/include/boost/typeof/std/string.hpp
+x64-windows/include/boost/typeof/std/utility.hpp
+x64-windows/include/boost/typeof/std/valarray.hpp
+x64-windows/include/boost/typeof/std/vector.hpp
+x64-windows/include/boost/typeof/template_encoding.hpp
+x64-windows/include/boost/typeof/template_template_param.hpp
+x64-windows/include/boost/typeof/type_encoding.hpp
+x64-windows/include/boost/typeof/type_template_param.hpp
+x64-windows/include/boost/typeof/typeof.hpp
+x64-windows/include/boost/typeof/typeof_impl.hpp
+x64-windows/include/boost/typeof/unsupported.hpp
+x64-windows/include/boost/typeof/vector.hpp
+x64-windows/include/boost/typeof/vector100.hpp
+x64-windows/include/boost/typeof/vector150.hpp
+x64-windows/include/boost/typeof/vector200.hpp
+x64-windows/include/boost/typeof/vector50.hpp
+x64-windows/share/
+x64-windows/share/boost-typeof/
+x64-windows/share/boost-typeof/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-type-traits_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,190 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/aligned_storage.hpp
+x64-windows/include/boost/type_traits.hpp
+x64-windows/include/boost/type_traits/
+x64-windows/include/boost/type_traits/add_const.hpp
+x64-windows/include/boost/type_traits/add_cv.hpp
+x64-windows/include/boost/type_traits/add_lvalue_reference.hpp
+x64-windows/include/boost/type_traits/add_pointer.hpp
+x64-windows/include/boost/type_traits/add_reference.hpp
+x64-windows/include/boost/type_traits/add_rvalue_reference.hpp
+x64-windows/include/boost/type_traits/add_volatile.hpp
+x64-windows/include/boost/type_traits/aligned_storage.hpp
+x64-windows/include/boost/type_traits/alignment_of.hpp
+x64-windows/include/boost/type_traits/alignment_traits.hpp
+x64-windows/include/boost/type_traits/arithmetic_traits.hpp
+x64-windows/include/boost/type_traits/array_traits.hpp
+x64-windows/include/boost/type_traits/broken_compiler_spec.hpp
+x64-windows/include/boost/type_traits/common_type.hpp
+x64-windows/include/boost/type_traits/composite_traits.hpp
+x64-windows/include/boost/type_traits/conditional.hpp
+x64-windows/include/boost/type_traits/config.hpp
+x64-windows/include/boost/type_traits/conversion_traits.hpp
+x64-windows/include/boost/type_traits/copy_cv.hpp
+x64-windows/include/boost/type_traits/cv_traits.hpp
+x64-windows/include/boost/type_traits/decay.hpp
+x64-windows/include/boost/type_traits/declval.hpp
+x64-windows/include/boost/type_traits/detail/
+x64-windows/include/boost/type_traits/detail/bool_trait_def.hpp
+x64-windows/include/boost/type_traits/detail/bool_trait_undef.hpp
+x64-windows/include/boost/type_traits/detail/common_arithmetic_type.hpp
+x64-windows/include/boost/type_traits/detail/common_type_impl.hpp
+x64-windows/include/boost/type_traits/detail/composite_member_pointer_type.hpp
+x64-windows/include/boost/type_traits/detail/composite_pointer_type.hpp
+x64-windows/include/boost/type_traits/detail/config.hpp
+x64-windows/include/boost/type_traits/detail/detector.hpp
+x64-windows/include/boost/type_traits/detail/has_binary_operator.hpp
+x64-windows/include/boost/type_traits/detail/has_postfix_operator.hpp
+x64-windows/include/boost/type_traits/detail/has_prefix_operator.hpp
+x64-windows/include/boost/type_traits/detail/ice_and.hpp
+x64-windows/include/boost/type_traits/detail/ice_eq.hpp
+x64-windows/include/boost/type_traits/detail/ice_not.hpp
+x64-windows/include/boost/type_traits/detail/ice_or.hpp
+x64-windows/include/boost/type_traits/detail/is_function_ptr_helper.hpp
+x64-windows/include/boost/type_traits/detail/is_function_ptr_tester.hpp
+x64-windows/include/boost/type_traits/detail/is_likely_lambda.hpp
+x64-windows/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp
+x64-windows/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp
+x64-windows/include/boost/type_traits/detail/mp_defer.hpp
+x64-windows/include/boost/type_traits/detail/template_arity_spec.hpp
+x64-windows/include/boost/type_traits/detail/yes_no_type.hpp
+x64-windows/include/boost/type_traits/detected.hpp
+x64-windows/include/boost/type_traits/detected_or.hpp
+x64-windows/include/boost/type_traits/extent.hpp
+x64-windows/include/boost/type_traits/floating_point_promotion.hpp
+x64-windows/include/boost/type_traits/function_traits.hpp
+x64-windows/include/boost/type_traits/has_bit_and.hpp
+x64-windows/include/boost/type_traits/has_bit_and_assign.hpp
+x64-windows/include/boost/type_traits/has_bit_or.hpp
+x64-windows/include/boost/type_traits/has_bit_or_assign.hpp
+x64-windows/include/boost/type_traits/has_bit_xor.hpp
+x64-windows/include/boost/type_traits/has_bit_xor_assign.hpp
+x64-windows/include/boost/type_traits/has_complement.hpp
+x64-windows/include/boost/type_traits/has_dereference.hpp
+x64-windows/include/boost/type_traits/has_divides.hpp
+x64-windows/include/boost/type_traits/has_divides_assign.hpp
+x64-windows/include/boost/type_traits/has_equal_to.hpp
+x64-windows/include/boost/type_traits/has_greater.hpp
+x64-windows/include/boost/type_traits/has_greater_equal.hpp
+x64-windows/include/boost/type_traits/has_left_shift.hpp
+x64-windows/include/boost/type_traits/has_left_shift_assign.hpp
+x64-windows/include/boost/type_traits/has_less.hpp
+x64-windows/include/boost/type_traits/has_less_equal.hpp
+x64-windows/include/boost/type_traits/has_logical_and.hpp
+x64-windows/include/boost/type_traits/has_logical_not.hpp
+x64-windows/include/boost/type_traits/has_logical_or.hpp
+x64-windows/include/boost/type_traits/has_minus.hpp
+x64-windows/include/boost/type_traits/has_minus_assign.hpp
+x64-windows/include/boost/type_traits/has_modulus.hpp
+x64-windows/include/boost/type_traits/has_modulus_assign.hpp
+x64-windows/include/boost/type_traits/has_multiplies.hpp
+x64-windows/include/boost/type_traits/has_multiplies_assign.hpp
+x64-windows/include/boost/type_traits/has_negate.hpp
+x64-windows/include/boost/type_traits/has_new_operator.hpp
+x64-windows/include/boost/type_traits/has_not_equal_to.hpp
+x64-windows/include/boost/type_traits/has_nothrow_assign.hpp
+x64-windows/include/boost/type_traits/has_nothrow_constructor.hpp
+x64-windows/include/boost/type_traits/has_nothrow_copy.hpp
+x64-windows/include/boost/type_traits/has_nothrow_destructor.hpp
+x64-windows/include/boost/type_traits/has_operator.hpp
+x64-windows/include/boost/type_traits/has_plus.hpp
+x64-windows/include/boost/type_traits/has_plus_assign.hpp
+x64-windows/include/boost/type_traits/has_post_decrement.hpp
+x64-windows/include/boost/type_traits/has_post_increment.hpp
+x64-windows/include/boost/type_traits/has_pre_decrement.hpp
+x64-windows/include/boost/type_traits/has_pre_increment.hpp
+x64-windows/include/boost/type_traits/has_right_shift.hpp
+x64-windows/include/boost/type_traits/has_right_shift_assign.hpp
+x64-windows/include/boost/type_traits/has_trivial_assign.hpp
+x64-windows/include/boost/type_traits/has_trivial_constructor.hpp
+x64-windows/include/boost/type_traits/has_trivial_copy.hpp
+x64-windows/include/boost/type_traits/has_trivial_destructor.hpp
+x64-windows/include/boost/type_traits/has_trivial_move_assign.hpp
+x64-windows/include/boost/type_traits/has_trivial_move_constructor.hpp
+x64-windows/include/boost/type_traits/has_unary_minus.hpp
+x64-windows/include/boost/type_traits/has_unary_plus.hpp
+x64-windows/include/boost/type_traits/has_virtual_destructor.hpp
+x64-windows/include/boost/type_traits/ice.hpp
+x64-windows/include/boost/type_traits/integral_constant.hpp
+x64-windows/include/boost/type_traits/integral_promotion.hpp
+x64-windows/include/boost/type_traits/intrinsics.hpp
+x64-windows/include/boost/type_traits/is_abstract.hpp
+x64-windows/include/boost/type_traits/is_arithmetic.hpp
+x64-windows/include/boost/type_traits/is_array.hpp
+x64-windows/include/boost/type_traits/is_assignable.hpp
+x64-windows/include/boost/type_traits/is_base_and_derived.hpp
+x64-windows/include/boost/type_traits/is_base_of.hpp
+x64-windows/include/boost/type_traits/is_base_of_tr1.hpp
+x64-windows/include/boost/type_traits/is_class.hpp
+x64-windows/include/boost/type_traits/is_complete.hpp
+x64-windows/include/boost/type_traits/is_complex.hpp
+x64-windows/include/boost/type_traits/is_compound.hpp
+x64-windows/include/boost/type_traits/is_const.hpp
+x64-windows/include/boost/type_traits/is_constructible.hpp
+x64-windows/include/boost/type_traits/is_convertible.hpp
+x64-windows/include/boost/type_traits/is_copy_assignable.hpp
+x64-windows/include/boost/type_traits/is_copy_constructible.hpp
+x64-windows/include/boost/type_traits/is_default_constructible.hpp
+x64-windows/include/boost/type_traits/is_destructible.hpp
+x64-windows/include/boost/type_traits/is_detected.hpp
+x64-windows/include/boost/type_traits/is_detected_convertible.hpp
+x64-windows/include/boost/type_traits/is_detected_exact.hpp
+x64-windows/include/boost/type_traits/is_empty.hpp
+x64-windows/include/boost/type_traits/is_enum.hpp
+x64-windows/include/boost/type_traits/is_final.hpp
+x64-windows/include/boost/type_traits/is_float.hpp
+x64-windows/include/boost/type_traits/is_floating_point.hpp
+x64-windows/include/boost/type_traits/is_function.hpp
+x64-windows/include/boost/type_traits/is_fundamental.hpp
+x64-windows/include/boost/type_traits/is_integral.hpp
+x64-windows/include/boost/type_traits/is_list_constructible.hpp
+x64-windows/include/boost/type_traits/is_lvalue_reference.hpp
+x64-windows/include/boost/type_traits/is_member_function_pointer.hpp
+x64-windows/include/boost/type_traits/is_member_object_pointer.hpp
+x64-windows/include/boost/type_traits/is_member_pointer.hpp
+x64-windows/include/boost/type_traits/is_nothrow_move_assignable.hpp
+x64-windows/include/boost/type_traits/is_nothrow_move_constructible.hpp
+x64-windows/include/boost/type_traits/is_nothrow_swappable.hpp
+x64-windows/include/boost/type_traits/is_object.hpp
+x64-windows/include/boost/type_traits/is_pod.hpp
+x64-windows/include/boost/type_traits/is_pointer.hpp
+x64-windows/include/boost/type_traits/is_polymorphic.hpp
+x64-windows/include/boost/type_traits/is_reference.hpp
+x64-windows/include/boost/type_traits/is_rvalue_reference.hpp
+x64-windows/include/boost/type_traits/is_same.hpp
+x64-windows/include/boost/type_traits/is_scalar.hpp
+x64-windows/include/boost/type_traits/is_signed.hpp
+x64-windows/include/boost/type_traits/is_stateless.hpp
+x64-windows/include/boost/type_traits/is_union.hpp
+x64-windows/include/boost/type_traits/is_unsigned.hpp
+x64-windows/include/boost/type_traits/is_virtual_base_of.hpp
+x64-windows/include/boost/type_traits/is_void.hpp
+x64-windows/include/boost/type_traits/is_volatile.hpp
+x64-windows/include/boost/type_traits/make_signed.hpp
+x64-windows/include/boost/type_traits/make_unsigned.hpp
+x64-windows/include/boost/type_traits/make_void.hpp
+x64-windows/include/boost/type_traits/nonesuch.hpp
+x64-windows/include/boost/type_traits/object_traits.hpp
+x64-windows/include/boost/type_traits/promote.hpp
+x64-windows/include/boost/type_traits/rank.hpp
+x64-windows/include/boost/type_traits/reference_traits.hpp
+x64-windows/include/boost/type_traits/remove_all_extents.hpp
+x64-windows/include/boost/type_traits/remove_bounds.hpp
+x64-windows/include/boost/type_traits/remove_const.hpp
+x64-windows/include/boost/type_traits/remove_cv.hpp
+x64-windows/include/boost/type_traits/remove_cv_ref.hpp
+x64-windows/include/boost/type_traits/remove_extent.hpp
+x64-windows/include/boost/type_traits/remove_pointer.hpp
+x64-windows/include/boost/type_traits/remove_reference.hpp
+x64-windows/include/boost/type_traits/remove_volatile.hpp
+x64-windows/include/boost/type_traits/same_traits.hpp
+x64-windows/include/boost/type_traits/transform_traits.hpp
+x64-windows/include/boost/type_traits/type_identity.hpp
+x64-windows/include/boost/type_traits/type_with_alignment.hpp
+x64-windows/include/boost/utility/
+x64-windows/include/boost/utility/declval.hpp
+x64-windows/share/
+x64-windows/share/boost-type-traits/
+x64-windows/share/boost-type-traits/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-unordered_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/unordered/
+x64-windows/include/boost/unordered/detail/
+x64-windows/include/boost/unordered/detail/fwd.hpp
+x64-windows/include/boost/unordered/detail/implementation.hpp
+x64-windows/include/boost/unordered/detail/map.hpp
+x64-windows/include/boost/unordered/detail/set.hpp
+x64-windows/include/boost/unordered/unordered_map.hpp
+x64-windows/include/boost/unordered/unordered_map_fwd.hpp
+x64-windows/include/boost/unordered/unordered_set.hpp
+x64-windows/include/boost/unordered/unordered_set_fwd.hpp
+x64-windows/include/boost/unordered_map.hpp
+x64-windows/include/boost/unordered_set.hpp
+x64-windows/share/
+x64-windows/share/boost-unordered/
+x64-windows/share/boost-unordered/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-utility_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/call_traits.hpp
+x64-windows/include/boost/compressed_pair.hpp
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/call_traits.hpp
+x64-windows/include/boost/detail/compressed_pair.hpp
+x64-windows/include/boost/detail/ob_compressed_pair.hpp
+x64-windows/include/boost/operators.hpp
+x64-windows/include/boost/operators_v1.hpp
+x64-windows/include/boost/utility.hpp
+x64-windows/include/boost/utility/
+x64-windows/include/boost/utility/base_from_member.hpp
+x64-windows/include/boost/utility/binary.hpp
+x64-windows/include/boost/utility/compare_pointees.hpp
+x64-windows/include/boost/utility/detail/
+x64-windows/include/boost/utility/detail/in_place_factory_prefix.hpp
+x64-windows/include/boost/utility/detail/in_place_factory_suffix.hpp
+x64-windows/include/boost/utility/detail/minstd_rand.hpp
+x64-windows/include/boost/utility/detail/result_of_iterate.hpp
+x64-windows/include/boost/utility/identity_type.hpp
+x64-windows/include/boost/utility/in_place_factory.hpp
+x64-windows/include/boost/utility/result_of.hpp
+x64-windows/include/boost/utility/string_ref.hpp
+x64-windows/include/boost/utility/string_ref_fwd.hpp
+x64-windows/include/boost/utility/string_view.hpp
+x64-windows/include/boost/utility/string_view_fwd.hpp
+x64-windows/include/boost/utility/typed_in_place_factory.hpp
+x64-windows/include/boost/utility/value_init.hpp
+x64-windows/share/
+x64-windows/share/boost-utility/
+x64-windows/share/boost-utility/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-variant_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,45 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/variant.hpp
+x64-windows/include/boost/variant/
+x64-windows/include/boost/variant/apply_visitor.hpp
+x64-windows/include/boost/variant/bad_visit.hpp
+x64-windows/include/boost/variant/detail/
+x64-windows/include/boost/variant/detail/apply_visitor_binary.hpp
+x64-windows/include/boost/variant/detail/apply_visitor_delayed.hpp
+x64-windows/include/boost/variant/detail/apply_visitor_unary.hpp
+x64-windows/include/boost/variant/detail/backup_holder.hpp
+x64-windows/include/boost/variant/detail/cast_storage.hpp
+x64-windows/include/boost/variant/detail/config.hpp
+x64-windows/include/boost/variant/detail/element_index.hpp
+x64-windows/include/boost/variant/detail/enable_recursive.hpp
+x64-windows/include/boost/variant/detail/enable_recursive_fwd.hpp
+x64-windows/include/boost/variant/detail/forced_return.hpp
+x64-windows/include/boost/variant/detail/generic_result_type.hpp
+x64-windows/include/boost/variant/detail/has_result_type.hpp
+x64-windows/include/boost/variant/detail/hash_variant.hpp
+x64-windows/include/boost/variant/detail/initializer.hpp
+x64-windows/include/boost/variant/detail/make_variant_list.hpp
+x64-windows/include/boost/variant/detail/move.hpp
+x64-windows/include/boost/variant/detail/multivisitors_cpp11_based.hpp
+x64-windows/include/boost/variant/detail/multivisitors_cpp14_based.hpp
+x64-windows/include/boost/variant/detail/multivisitors_preprocessor_based.hpp
+x64-windows/include/boost/variant/detail/over_sequence.hpp
+x64-windows/include/boost/variant/detail/substitute.hpp
+x64-windows/include/boost/variant/detail/substitute_fwd.hpp
+x64-windows/include/boost/variant/detail/variant_io.hpp
+x64-windows/include/boost/variant/detail/visitation_impl.hpp
+x64-windows/include/boost/variant/get.hpp
+x64-windows/include/boost/variant/multivisitors.hpp
+x64-windows/include/boost/variant/polymorphic_get.hpp
+x64-windows/include/boost/variant/recursive_variant.hpp
+x64-windows/include/boost/variant/recursive_wrapper.hpp
+x64-windows/include/boost/variant/recursive_wrapper_fwd.hpp
+x64-windows/include/boost/variant/static_visitor.hpp
+x64-windows/include/boost/variant/variant.hpp
+x64-windows/include/boost/variant/variant_fwd.hpp
+x64-windows/include/boost/variant/visitor_ptr.hpp
+x64-windows/share/
+x64-windows/share/boost-variant/
+x64-windows/share/boost-variant/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-vcpkg-helpers_4_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,4 @@
+x64-windows/
+x64-windows/share/
+x64-windows/share/boost-vcpkg-helpers/
+x64-windows/share/boost-vcpkg-helpers/boost-modular-headers.cmake
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-winapi_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,126 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/detail/
+x64-windows/include/boost/detail/interlocked.hpp
+x64-windows/include/boost/detail/winapi/
+x64-windows/include/boost/detail/winapi/access_rights.hpp
+x64-windows/include/boost/detail/winapi/apc.hpp
+x64-windows/include/boost/detail/winapi/basic_types.hpp
+x64-windows/include/boost/detail/winapi/bcrypt.hpp
+x64-windows/include/boost/detail/winapi/character_code_conversion.hpp
+x64-windows/include/boost/detail/winapi/condition_variable.hpp
+x64-windows/include/boost/detail/winapi/config.hpp
+x64-windows/include/boost/detail/winapi/critical_section.hpp
+x64-windows/include/boost/detail/winapi/crypt.hpp
+x64-windows/include/boost/detail/winapi/dbghelp.hpp
+x64-windows/include/boost/detail/winapi/debugapi.hpp
+x64-windows/include/boost/detail/winapi/detail/
+x64-windows/include/boost/detail/winapi/detail/deprecated_namespace.hpp
+x64-windows/include/boost/detail/winapi/directory_management.hpp
+x64-windows/include/boost/detail/winapi/dll.hpp
+x64-windows/include/boost/detail/winapi/environment.hpp
+x64-windows/include/boost/detail/winapi/error_codes.hpp
+x64-windows/include/boost/detail/winapi/error_handling.hpp
+x64-windows/include/boost/detail/winapi/event.hpp
+x64-windows/include/boost/detail/winapi/file_management.hpp
+x64-windows/include/boost/detail/winapi/file_mapping.hpp
+x64-windows/include/boost/detail/winapi/get_current_process.hpp
+x64-windows/include/boost/detail/winapi/get_current_process_id.hpp
+x64-windows/include/boost/detail/winapi/get_current_thread.hpp
+x64-windows/include/boost/detail/winapi/get_current_thread_id.hpp
+x64-windows/include/boost/detail/winapi/get_last_error.hpp
+x64-windows/include/boost/detail/winapi/get_process_times.hpp
+x64-windows/include/boost/detail/winapi/get_system_directory.hpp
+x64-windows/include/boost/detail/winapi/get_thread_times.hpp
+x64-windows/include/boost/detail/winapi/handle_info.hpp
+x64-windows/include/boost/detail/winapi/handles.hpp
+x64-windows/include/boost/detail/winapi/heap_memory.hpp
+x64-windows/include/boost/detail/winapi/init_once.hpp
+x64-windows/include/boost/detail/winapi/jobs.hpp
+x64-windows/include/boost/detail/winapi/limits.hpp
+x64-windows/include/boost/detail/winapi/local_memory.hpp
+x64-windows/include/boost/detail/winapi/memory.hpp
+x64-windows/include/boost/detail/winapi/mutex.hpp
+x64-windows/include/boost/detail/winapi/overlapped.hpp
+x64-windows/include/boost/detail/winapi/page_protection_flags.hpp
+x64-windows/include/boost/detail/winapi/pipes.hpp
+x64-windows/include/boost/detail/winapi/priority_class.hpp
+x64-windows/include/boost/detail/winapi/process.hpp
+x64-windows/include/boost/detail/winapi/security.hpp
+x64-windows/include/boost/detail/winapi/semaphore.hpp
+x64-windows/include/boost/detail/winapi/shell.hpp
+x64-windows/include/boost/detail/winapi/show_window.hpp
+x64-windows/include/boost/detail/winapi/srw_lock.hpp
+x64-windows/include/boost/detail/winapi/stack_backtrace.hpp
+x64-windows/include/boost/detail/winapi/synchronization.hpp
+x64-windows/include/boost/detail/winapi/system.hpp
+x64-windows/include/boost/detail/winapi/thread.hpp
+x64-windows/include/boost/detail/winapi/thread_pool.hpp
+x64-windows/include/boost/detail/winapi/time.hpp
+x64-windows/include/boost/detail/winapi/timers.hpp
+x64-windows/include/boost/detail/winapi/tls.hpp
+x64-windows/include/boost/detail/winapi/wait.hpp
+x64-windows/include/boost/detail/winapi/waitable_timer.hpp
+x64-windows/include/boost/winapi/
+x64-windows/include/boost/winapi/access_rights.hpp
+x64-windows/include/boost/winapi/apc.hpp
+x64-windows/include/boost/winapi/basic_types.hpp
+x64-windows/include/boost/winapi/bcrypt.hpp
+x64-windows/include/boost/winapi/character_code_conversion.hpp
+x64-windows/include/boost/winapi/condition_variable.hpp
+x64-windows/include/boost/winapi/config.hpp
+x64-windows/include/boost/winapi/critical_section.hpp
+x64-windows/include/boost/winapi/crypt.hpp
+x64-windows/include/boost/winapi/dbghelp.hpp
+x64-windows/include/boost/winapi/debugapi.hpp
+x64-windows/include/boost/winapi/detail/
+x64-windows/include/boost/winapi/detail/cast_ptr.hpp
+x64-windows/include/boost/winapi/directory_management.hpp
+x64-windows/include/boost/winapi/dll.hpp
+x64-windows/include/boost/winapi/environment.hpp
+x64-windows/include/boost/winapi/error_codes.hpp
+x64-windows/include/boost/winapi/error_handling.hpp
+x64-windows/include/boost/winapi/event.hpp
+x64-windows/include/boost/winapi/file_management.hpp
+x64-windows/include/boost/winapi/file_mapping.hpp
+x64-windows/include/boost/winapi/get_current_process.hpp
+x64-windows/include/boost/winapi/get_current_process_id.hpp
+x64-windows/include/boost/winapi/get_current_thread.hpp
+x64-windows/include/boost/winapi/get_current_thread_id.hpp
+x64-windows/include/boost/winapi/get_last_error.hpp
+x64-windows/include/boost/winapi/get_process_times.hpp
+x64-windows/include/boost/winapi/get_system_directory.hpp
+x64-windows/include/boost/winapi/get_thread_times.hpp
+x64-windows/include/boost/winapi/handle_info.hpp
+x64-windows/include/boost/winapi/handles.hpp
+x64-windows/include/boost/winapi/heap_memory.hpp
+x64-windows/include/boost/winapi/init_once.hpp
+x64-windows/include/boost/winapi/jobs.hpp
+x64-windows/include/boost/winapi/limits.hpp
+x64-windows/include/boost/winapi/local_memory.hpp
+x64-windows/include/boost/winapi/memory.hpp
+x64-windows/include/boost/winapi/mutex.hpp
+x64-windows/include/boost/winapi/overlapped.hpp
+x64-windows/include/boost/winapi/page_protection_flags.hpp
+x64-windows/include/boost/winapi/pipes.hpp
+x64-windows/include/boost/winapi/priority_class.hpp
+x64-windows/include/boost/winapi/process.hpp
+x64-windows/include/boost/winapi/security.hpp
+x64-windows/include/boost/winapi/semaphore.hpp
+x64-windows/include/boost/winapi/shell.hpp
+x64-windows/include/boost/winapi/show_window.hpp
+x64-windows/include/boost/winapi/srw_lock.hpp
+x64-windows/include/boost/winapi/stack_backtrace.hpp
+x64-windows/include/boost/winapi/synchronization.hpp
+x64-windows/include/boost/winapi/system.hpp
+x64-windows/include/boost/winapi/thread.hpp
+x64-windows/include/boost/winapi/thread_pool.hpp
+x64-windows/include/boost/winapi/time.hpp
+x64-windows/include/boost/winapi/timers.hpp
+x64-windows/include/boost/winapi/tls.hpp
+x64-windows/include/boost/winapi/wait.hpp
+x64-windows/include/boost/winapi/waitable_timer.hpp
+x64-windows/share/
+x64-windows/share/boost-winapi/
+x64-windows/share/boost-winapi/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/boost-xpressive_1.67.0_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,141 @@
+x64-windows/
+x64-windows/include/
+x64-windows/include/boost/
+x64-windows/include/boost/xpressive/
+x64-windows/include/boost/xpressive/basic_regex.hpp
+x64-windows/include/boost/xpressive/detail/
+x64-windows/include/boost/xpressive/detail/core/
+x64-windows/include/boost/xpressive/detail/core/access.hpp
+x64-windows/include/boost/xpressive/detail/core/action.hpp
+x64-windows/include/boost/xpressive/detail/core/adaptor.hpp
+x64-windows/include/boost/xpressive/detail/core/finder.hpp
+x64-windows/include/boost/xpressive/detail/core/flow_control.hpp
+x64-windows/include/boost/xpressive/detail/core/icase.hpp
+x64-windows/include/boost/xpressive/detail/core/linker.hpp
+x64-windows/include/boost/xpressive/detail/core/list.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/
+x64-windows/include/boost/xpressive/detail/core/matcher/action_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/alternate_end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/alternate_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/any_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_bol_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_bos_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_eol_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_eos_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_line_base.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/assert_word_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/attr_begin_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/attr_end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/attr_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/charset_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/epsilon_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/keeper_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/literal_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/logical_newline_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/lookahead_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/lookbehind_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/mark_begin_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/mark_end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/mark_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/optional_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/posix_charset_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/predicate_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/range_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/regex_byref_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/regex_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/repeat_begin_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/repeat_end_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/set_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/string_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matcher/true_matcher.hpp
+x64-windows/include/boost/xpressive/detail/core/matchers.hpp
+x64-windows/include/boost/xpressive/detail/core/optimize.hpp
+x64-windows/include/boost/xpressive/detail/core/peeker.hpp
+x64-windows/include/boost/xpressive/detail/core/quant_style.hpp
+x64-windows/include/boost/xpressive/detail/core/regex_domain.hpp
+x64-windows/include/boost/xpressive/detail/core/regex_impl.hpp
+x64-windows/include/boost/xpressive/detail/core/results_cache.hpp
+x64-windows/include/boost/xpressive/detail/core/state.hpp
+x64-windows/include/boost/xpressive/detail/core/sub_match_impl.hpp
+x64-windows/include/boost/xpressive/detail/core/sub_match_vector.hpp
+x64-windows/include/boost/xpressive/detail/detail_fwd.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/
+x64-windows/include/boost/xpressive/detail/dynamic/dynamic.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/matchable.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/parse_charset.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/parser.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/parser_enum.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/parser_traits.hpp
+x64-windows/include/boost/xpressive/detail/dynamic/sequence.hpp
+x64-windows/include/boost/xpressive/detail/static/
+x64-windows/include/boost/xpressive/detail/static/compile.hpp
+x64-windows/include/boost/xpressive/detail/static/grammar.hpp
+x64-windows/include/boost/xpressive/detail/static/is_pure.hpp
+x64-windows/include/boost/xpressive/detail/static/modifier.hpp
+x64-windows/include/boost/xpressive/detail/static/placeholders.hpp
+x64-windows/include/boost/xpressive/detail/static/static.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/
+x64-windows/include/boost/xpressive/detail/static/transforms/as_action.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_alternate.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_independent.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_inverse.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_marker.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_matcher.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_modifier.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_quantifier.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_sequence.hpp
+x64-windows/include/boost/xpressive/detail/static/transforms/as_set.hpp
+x64-windows/include/boost/xpressive/detail/static/transmogrify.hpp
+x64-windows/include/boost/xpressive/detail/static/type_traits.hpp
+x64-windows/include/boost/xpressive/detail/static/visitor.hpp
+x64-windows/include/boost/xpressive/detail/static/width_of.hpp
+x64-windows/include/boost/xpressive/detail/utility/
+x64-windows/include/boost/xpressive/detail/utility/algorithm.hpp
+x64-windows/include/boost/xpressive/detail/utility/any.hpp
+x64-windows/include/boost/xpressive/detail/utility/boyer_moore.hpp
+x64-windows/include/boost/xpressive/detail/utility/chset/
+x64-windows/include/boost/xpressive/detail/utility/chset/basic_chset.hpp
+x64-windows/include/boost/xpressive/detail/utility/chset/basic_chset.ipp
+x64-windows/include/boost/xpressive/detail/utility/chset/chset.hpp
+x64-windows/include/boost/xpressive/detail/utility/chset/range_run.hpp
+x64-windows/include/boost/xpressive/detail/utility/chset/range_run.ipp
+x64-windows/include/boost/xpressive/detail/utility/cons.hpp
+x64-windows/include/boost/xpressive/detail/utility/counted_base.hpp
+x64-windows/include/boost/xpressive/detail/utility/dont_care.hpp
+x64-windows/include/boost/xpressive/detail/utility/hash_peek_bitset.hpp
+x64-windows/include/boost/xpressive/detail/utility/ignore_unused.hpp
+x64-windows/include/boost/xpressive/detail/utility/literals.hpp
+x64-windows/include/boost/xpressive/detail/utility/never_true.hpp
+x64-windows/include/boost/xpressive/detail/utility/save_restore.hpp
+x64-windows/include/boost/xpressive/detail/utility/sequence_stack.hpp
+x64-windows/include/boost/xpressive/detail/utility/symbols.hpp
+x64-windows/include/boost/xpressive/detail/utility/tracking_ptr.hpp
+x64-windows/include/boost/xpressive/detail/utility/traits_utils.hpp
+x64-windows/include/boost/xpressive/detail/utility/width.hpp
+x64-windows/include/boost/xpressive/match_results.hpp
+x64-windows/include/boost/xpressive/regex_actions.hpp
+x64-windows/include/boost/xpressive/regex_algorithms.hpp
+x64-windows/include/boost/xpressive/regex_compiler.hpp
+x64-windows/include/boost/xpressive/regex_constants.hpp
+x64-windows/include/boost/xpressive/regex_error.hpp
+x64-windows/include/boost/xpressive/regex_iterator.hpp
+x64-windows/include/boost/xpressive/regex_primitives.hpp
+x64-windows/include/boost/xpressive/regex_token_iterator.hpp
+x64-windows/include/boost/xpressive/regex_traits.hpp
+x64-windows/include/boost/xpressive/sub_match.hpp
+x64-windows/include/boost/xpressive/traits/
+x64-windows/include/boost/xpressive/traits/c_regex_traits.hpp
+x64-windows/include/boost/xpressive/traits/cpp_regex_traits.hpp
+x64-windows/include/boost/xpressive/traits/detail/
+x64-windows/include/boost/xpressive/traits/detail/c_ctype.hpp
+x64-windows/include/boost/xpressive/traits/null_regex_traits.hpp
+x64-windows/include/boost/xpressive/xpressive.hpp
+x64-windows/include/boost/xpressive/xpressive_dynamic.hpp
+x64-windows/include/boost/xpressive/xpressive_fwd.hpp
+x64-windows/include/boost/xpressive/xpressive_static.hpp
+x64-windows/include/boost/xpressive/xpressive_typeof.hpp
+x64-windows/share/
+x64-windows/share/boost-xpressive/
+x64-windows/share/boost-xpressive/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/bzip2_1.0.6-2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,21 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/libbz2.dll
+x64-windows/bin/libbz2.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/libbz2d.dll
+x64-windows/debug/bin/libbz2d.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/bz2d.lib
+x64-windows/include/
+x64-windows/include/bzlib.h
+x64-windows/lib/
+x64-windows/lib/bz2.lib
+x64-windows/share/
+x64-windows/share/bzip2/
+x64-windows/share/bzip2/copyright
+x64-windows/share/bzip2/usage
+x64-windows/tools/
+x64-windows/tools/bzip2.exe
+x64-windows/tools/bzip2recover.exe
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/icu_61.1-1_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/icu_61.1-1_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/icu_61.1-1_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/icu_61.1-1_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,217 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/icudt61.dll
+x64-windows/bin/icuin61.dll
+x64-windows/bin/icuin61.pdb
+x64-windows/bin/icuio61.dll
+x64-windows/bin/icuio61.pdb
+x64-windows/bin/icutu61.dll
+x64-windows/bin/icutu61.pdb
+x64-windows/bin/icuuc61.dll
+x64-windows/bin/icuuc61.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/icudtd61.dll
+x64-windows/debug/bin/icuind61.dll
+x64-windows/debug/bin/icuind61.pdb
+x64-windows/debug/bin/icuiod61.dll
+x64-windows/debug/bin/icuiod61.pdb
+x64-windows/debug/bin/icutud61.dll
+x64-windows/debug/bin/icutud61.pdb
+x64-windows/debug/bin/icuucd61.dll
+x64-windows/debug/bin/icuucd61.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/icudtd.lib
+x64-windows/debug/lib/icuind.lib
+x64-windows/debug/lib/icuiod.lib
+x64-windows/debug/lib/icutud.lib
+x64-windows/debug/lib/icuucd.lib
+x64-windows/include/
+x64-windows/include/unicode/
+x64-windows/include/unicode/alphaindex.h
+x64-windows/include/unicode/appendable.h
+x64-windows/include/unicode/basictz.h
+x64-windows/include/unicode/brkiter.h
+x64-windows/include/unicode/bytestream.h
+x64-windows/include/unicode/bytestrie.h
+x64-windows/include/unicode/bytestriebuilder.h
+x64-windows/include/unicode/calendar.h
+x64-windows/include/unicode/caniter.h
+x64-windows/include/unicode/casemap.h
+x64-windows/include/unicode/char16ptr.h
+x64-windows/include/unicode/chariter.h
+x64-windows/include/unicode/choicfmt.h
+x64-windows/include/unicode/coleitr.h
+x64-windows/include/unicode/coll.h
+x64-windows/include/unicode/compactdecimalformat.h
+x64-windows/include/unicode/curramt.h
+x64-windows/include/unicode/currpinf.h
+x64-windows/include/unicode/currunit.h
+x64-windows/include/unicode/datefmt.h
+x64-windows/include/unicode/dbbi.h
+x64-windows/include/unicode/dcfmtsym.h
+x64-windows/include/unicode/decimfmt.h
+x64-windows/include/unicode/docmain.h
+x64-windows/include/unicode/dtfmtsym.h
+x64-windows/include/unicode/dtintrv.h
+x64-windows/include/unicode/dtitvfmt.h
+x64-windows/include/unicode/dtitvinf.h
+x64-windows/include/unicode/dtptngen.h
+x64-windows/include/unicode/dtrule.h
+x64-windows/include/unicode/edits.h
+x64-windows/include/unicode/enumset.h
+x64-windows/include/unicode/errorcode.h
+x64-windows/include/unicode/fieldpos.h
+x64-windows/include/unicode/filteredbrk.h
+x64-windows/include/unicode/fmtable.h
+x64-windows/include/unicode/format.h
+x64-windows/include/unicode/fpositer.h
+x64-windows/include/unicode/gender.h
+x64-windows/include/unicode/gregocal.h
+x64-windows/include/unicode/icudataver.h
+x64-windows/include/unicode/icuplug.h
+x64-windows/include/unicode/idna.h
+x64-windows/include/unicode/listformatter.h
+x64-windows/include/unicode/localpointer.h
+x64-windows/include/unicode/locdspnm.h
+x64-windows/include/unicode/locid.h
+x64-windows/include/unicode/measfmt.h
+x64-windows/include/unicode/measunit.h
+x64-windows/include/unicode/measure.h
+x64-windows/include/unicode/messagepattern.h
+x64-windows/include/unicode/msgfmt.h
+x64-windows/include/unicode/normalizer2.h
+x64-windows/include/unicode/normlzr.h
+x64-windows/include/unicode/nounit.h
+x64-windows/include/unicode/numberformatter.h
+x64-windows/include/unicode/numfmt.h
+x64-windows/include/unicode/numsys.h
+x64-windows/include/unicode/parseerr.h
+x64-windows/include/unicode/parsepos.h
+x64-windows/include/unicode/platform.h
+x64-windows/include/unicode/plurfmt.h
+x64-windows/include/unicode/plurrule.h
+x64-windows/include/unicode/ptypes.h
+x64-windows/include/unicode/putil.h
+x64-windows/include/unicode/rbbi.h
+x64-windows/include/unicode/rbnf.h
+x64-windows/include/unicode/rbtz.h
+x64-windows/include/unicode/regex.h
+x64-windows/include/unicode/region.h
+x64-windows/include/unicode/reldatefmt.h
+x64-windows/include/unicode/rep.h
+x64-windows/include/unicode/resbund.h
+x64-windows/include/unicode/schriter.h
+x64-windows/include/unicode/scientificnumberformatter.h
+x64-windows/include/unicode/search.h
+x64-windows/include/unicode/selfmt.h
+x64-windows/include/unicode/simpleformatter.h
+x64-windows/include/unicode/simpletz.h
+x64-windows/include/unicode/smpdtfmt.h
+x64-windows/include/unicode/sortkey.h
+x64-windows/include/unicode/std_string.h
+x64-windows/include/unicode/strenum.h
+x64-windows/include/unicode/stringoptions.h
+x64-windows/include/unicode/stringpiece.h
+x64-windows/include/unicode/stringtriebuilder.h
+x64-windows/include/unicode/stsearch.h
+x64-windows/include/unicode/symtable.h
+x64-windows/include/unicode/tblcoll.h
+x64-windows/include/unicode/timezone.h
+x64-windows/include/unicode/tmunit.h
+x64-windows/include/unicode/tmutamt.h
+x64-windows/include/unicode/tmutfmt.h
+x64-windows/include/unicode/translit.h
+x64-windows/include/unicode/tzfmt.h
+x64-windows/include/unicode/tznames.h
+x64-windows/include/unicode/tzrule.h
+x64-windows/include/unicode/tztrans.h
+x64-windows/include/unicode/ubidi.h
+x64-windows/include/unicode/ubiditransform.h
+x64-windows/include/unicode/ubrk.h
+x64-windows/include/unicode/ucal.h
+x64-windows/include/unicode/ucasemap.h
+x64-windows/include/unicode/ucat.h
+x64-windows/include/unicode/uchar.h
+x64-windows/include/unicode/ucharstrie.h
+x64-windows/include/unicode/ucharstriebuilder.h
+x64-windows/include/unicode/uchriter.h
+x64-windows/include/unicode/uclean.h
+x64-windows/include/unicode/ucnv.h
+x64-windows/include/unicode/ucnv_cb.h
+x64-windows/include/unicode/ucnv_err.h
+x64-windows/include/unicode/ucnvsel.h
+x64-windows/include/unicode/ucol.h
+x64-windows/include/unicode/ucoleitr.h
+x64-windows/include/unicode/uconfig.h
+x64-windows/include/unicode/ucsdet.h
+x64-windows/include/unicode/ucurr.h
+x64-windows/include/unicode/udat.h
+x64-windows/include/unicode/udata.h
+x64-windows/include/unicode/udateintervalformat.h
+x64-windows/include/unicode/udatpg.h
+x64-windows/include/unicode/udisplaycontext.h
+x64-windows/include/unicode/uenum.h
+x64-windows/include/unicode/ufieldpositer.h
+x64-windows/include/unicode/uformattable.h
+x64-windows/include/unicode/ugender.h
+x64-windows/include/unicode/uidna.h
+x64-windows/include/unicode/uiter.h
+x64-windows/include/unicode/uldnames.h
+x64-windows/include/unicode/ulistformatter.h
+x64-windows/include/unicode/uloc.h
+x64-windows/include/unicode/ulocdata.h
+x64-windows/include/unicode/umachine.h
+x64-windows/include/unicode/umisc.h
+x64-windows/include/unicode/umsg.h
+x64-windows/include/unicode/unifilt.h
+x64-windows/include/unicode/unifunct.h
+x64-windows/include/unicode/unimatch.h
+x64-windows/include/unicode/unirepl.h
+x64-windows/include/unicode/uniset.h
+x64-windows/include/unicode/unistr.h
+x64-windows/include/unicode/unorm.h
+x64-windows/include/unicode/unorm2.h
+x64-windows/include/unicode/unum.h
+x64-windows/include/unicode/unumsys.h
+x64-windows/include/unicode/uobject.h
+x64-windows/include/unicode/upluralrules.h
+x64-windows/include/unicode/uregex.h
+x64-windows/include/unicode/uregion.h
+x64-windows/include/unicode/ureldatefmt.h
+x64-windows/include/unicode/urename.h
+x64-windows/include/unicode/urep.h
+x64-windows/include/unicode/ures.h
+x64-windows/include/unicode/uscript.h
+x64-windows/include/unicode/usearch.h
+x64-windows/include/unicode/uset.h
+x64-windows/include/unicode/usetiter.h
+x64-windows/include/unicode/ushape.h
+x64-windows/include/unicode/uspoof.h
+x64-windows/include/unicode/usprep.h
+x64-windows/include/unicode/ustdio.h
+x64-windows/include/unicode/ustream.h
+x64-windows/include/unicode/ustring.h
+x64-windows/include/unicode/ustringtrie.h
+x64-windows/include/unicode/utext.h
+x64-windows/include/unicode/utf.h
+x64-windows/include/unicode/utf16.h
+x64-windows/include/unicode/utf32.h
+x64-windows/include/unicode/utf8.h
+x64-windows/include/unicode/utf_old.h
+x64-windows/include/unicode/utmscale.h
+x64-windows/include/unicode/utrace.h
+x64-windows/include/unicode/utrans.h
+x64-windows/include/unicode/utypes.h
+x64-windows/include/unicode/uvernum.h
+x64-windows/include/unicode/uversion.h
+x64-windows/include/unicode/vtzone.h
+x64-windows/lib/
+x64-windows/lib/icudt.lib
+x64-windows/lib/icuin.lib
+x64-windows/lib/icuio.lib
+x64-windows/lib/icutu.lib
+x64-windows/lib/icuuc.lib
+x64-windows/share/
+x64-windows/share/icu/
+x64-windows/share/icu/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/libevent_2.1.8-3_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,51 @@
+x64-windows/
+x64-windows/debug/
+x64-windows/debug/lib/
+x64-windows/debug/lib/event.lib
+x64-windows/debug/lib/event_core.lib
+x64-windows/debug/lib/event_extra.lib
+x64-windows/include/
+x64-windows/include/evdns.h
+x64-windows/include/event.h
+x64-windows/include/event2/
+x64-windows/include/event2/buffer.h
+x64-windows/include/event2/buffer_compat.h
+x64-windows/include/event2/bufferevent.h
+x64-windows/include/event2/bufferevent_compat.h
+x64-windows/include/event2/bufferevent_ssl.h
+x64-windows/include/event2/bufferevent_struct.h
+x64-windows/include/event2/dns.h
+x64-windows/include/event2/dns_compat.h
+x64-windows/include/event2/dns_struct.h
+x64-windows/include/event2/event-config.h
+x64-windows/include/event2/event.h
+x64-windows/include/event2/event_compat.h
+x64-windows/include/event2/event_struct.h
+x64-windows/include/event2/http.h
+x64-windows/include/event2/http_compat.h
+x64-windows/include/event2/http_struct.h
+x64-windows/include/event2/keyvalq_struct.h
+x64-windows/include/event2/listener.h
+x64-windows/include/event2/rpc.h
+x64-windows/include/event2/rpc_compat.h
+x64-windows/include/event2/rpc_struct.h
+x64-windows/include/event2/tag.h
+x64-windows/include/event2/tag_compat.h
+x64-windows/include/event2/thread.h
+x64-windows/include/event2/util.h
+x64-windows/include/event2/visibility.h
+x64-windows/include/evhttp.h
+x64-windows/include/evrpc.h
+x64-windows/include/evutil.h
+x64-windows/lib/
+x64-windows/lib/event.lib
+x64-windows/lib/event_core.lib
+x64-windows/lib/event_extra.lib
+x64-windows/share/
+x64-windows/share/libevent/
+x64-windows/share/libevent/LibeventConfig.cmake
+x64-windows/share/libevent/LibeventConfigVersion.cmake
+x64-windows/share/libevent/LibeventTargets-debug.cmake
+x64-windows/share/libevent/LibeventTargets-release.cmake
+x64-windows/share/libevent/LibeventTargets.cmake
+x64-windows/share/libevent/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/liblzma_5.2.3-2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,33 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/lzma.dll
+x64-windows/bin/lzma.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/lzma.dll
+x64-windows/debug/bin/lzma.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/lzma.lib
+x64-windows/include/
+x64-windows/include/lzma.h
+x64-windows/include/lzma/
+x64-windows/include/lzma/base.h
+x64-windows/include/lzma/bcj.h
+x64-windows/include/lzma/block.h
+x64-windows/include/lzma/check.h
+x64-windows/include/lzma/container.h
+x64-windows/include/lzma/delta.h
+x64-windows/include/lzma/filter.h
+x64-windows/include/lzma/hardware.h
+x64-windows/include/lzma/index.h
+x64-windows/include/lzma/index_hash.h
+x64-windows/include/lzma/lzma12.h
+x64-windows/include/lzma/stream_flags.h
+x64-windows/include/lzma/version.h
+x64-windows/include/lzma/vli.h
+x64-windows/lib/
+x64-windows/lib/lzma.lib
+x64-windows/share/
+x64-windows/share/liblzma/
+x64-windows/share/liblzma/copyright
+x64-windows/share/liblzma/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/libmysql_8.0.4-2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,31 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/libmysql.dll
+x64-windows/bin/libmysql.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/libmysql.dll
+x64-windows/debug/bin/libmysql.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/libmysql.lib
+x64-windows/include/
+x64-windows/include/mysql/
+x64-windows/include/mysql/binary_log_types.h
+x64-windows/include/mysql/errmsg.h
+x64-windows/include/mysql/mem_root_fwd.h
+x64-windows/include/mysql/my_command.h
+x64-windows/include/mysql/my_list.h
+x64-windows/include/mysql/mysql.h
+x64-windows/include/mysql/mysql/
+x64-windows/include/mysql/mysql/client_plugin.h
+x64-windows/include/mysql/mysql/plugin_auth_common.h
+x64-windows/include/mysql/mysql/udf_registration_types.h
+x64-windows/include/mysql/mysql_com.h
+x64-windows/include/mysql/mysql_time.h
+x64-windows/include/mysql/mysql_version.h
+x64-windows/include/mysql/mysqld_error.h
+x64-windows/lib/
+x64-windows/lib/libmysql.lib
+x64-windows/share/
+x64-windows/share/libmysql/
+x64-windows/share/libmysql/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/lz4_1.8.2_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/lz4_1.8.2_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/lz4_1.8.2_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/lz4_1.8.2_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/lz4.dll
+x64-windows/bin/lz4.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/lz4d.dll
+x64-windows/debug/bin/lz4d.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/lz4d.lib
+x64-windows/include/
+x64-windows/include/lz4.h
+x64-windows/include/lz4frame.h
+x64-windows/include/lz4hc.h
+x64-windows/lib/
+x64-windows/lib/lz4.lib
+x64-windows/share/
+x64-windows/share/lz4/
+x64-windows/share/lz4/copyright
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/openssl_1.0.2o-3_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,105 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/libeay32.dll
+x64-windows/bin/libeay32.pdb
+x64-windows/bin/ssleay32.dll
+x64-windows/bin/ssleay32.pdb
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/libeay32.dll
+x64-windows/debug/bin/libeay32.pdb
+x64-windows/debug/bin/ssleay32.dll
+x64-windows/debug/bin/ssleay32.pdb
+x64-windows/debug/lib/
+x64-windows/debug/lib/libeay32.lib
+x64-windows/debug/lib/ssleay32.lib
+x64-windows/include/
+x64-windows/include/openssl/
+x64-windows/include/openssl/aes.h
+x64-windows/include/openssl/applink.c
+x64-windows/include/openssl/asn1.h
+x64-windows/include/openssl/asn1_mac.h
+x64-windows/include/openssl/asn1t.h
+x64-windows/include/openssl/bio.h
+x64-windows/include/openssl/blowfish.h
+x64-windows/include/openssl/bn.h
+x64-windows/include/openssl/buffer.h
+x64-windows/include/openssl/camellia.h
+x64-windows/include/openssl/cast.h
+x64-windows/include/openssl/cmac.h
+x64-windows/include/openssl/cms.h
+x64-windows/include/openssl/comp.h
+x64-windows/include/openssl/conf.h
+x64-windows/include/openssl/conf_api.h
+x64-windows/include/openssl/crypto.h
+x64-windows/include/openssl/des.h
+x64-windows/include/openssl/des_old.h
+x64-windows/include/openssl/dh.h
+x64-windows/include/openssl/dsa.h
+x64-windows/include/openssl/dso.h
+x64-windows/include/openssl/dtls1.h
+x64-windows/include/openssl/e_os2.h
+x64-windows/include/openssl/ebcdic.h
+x64-windows/include/openssl/ec.h
+x64-windows/include/openssl/ecdh.h
+x64-windows/include/openssl/ecdsa.h
+x64-windows/include/openssl/engine.h
+x64-windows/include/openssl/err.h
+x64-windows/include/openssl/evp.h
+x64-windows/include/openssl/hmac.h
+x64-windows/include/openssl/idea.h
+x64-windows/include/openssl/krb5_asn.h
+x64-windows/include/openssl/kssl.h
+x64-windows/include/openssl/lhash.h
+x64-windows/include/openssl/md4.h
+x64-windows/include/openssl/md5.h
+x64-windows/include/openssl/mdc2.h
+x64-windows/include/openssl/modes.h
+x64-windows/include/openssl/obj_mac.h
+x64-windows/include/openssl/objects.h
+x64-windows/include/openssl/ocsp.h
+x64-windows/include/openssl/opensslconf.h
+x64-windows/include/openssl/opensslv.h
+x64-windows/include/openssl/ossl_typ.h
+x64-windows/include/openssl/pem.h
+x64-windows/include/openssl/pem2.h
+x64-windows/include/openssl/pkcs12.h
+x64-windows/include/openssl/pkcs7.h
+x64-windows/include/openssl/pqueue.h
+x64-windows/include/openssl/rand.h
+x64-windows/include/openssl/rc2.h
+x64-windows/include/openssl/rc4.h
+x64-windows/include/openssl/ripemd.h
+x64-windows/include/openssl/rsa.h
+x64-windows/include/openssl/safestack.h
+x64-windows/include/openssl/seed.h
+x64-windows/include/openssl/sha.h
+x64-windows/include/openssl/srp.h
+x64-windows/include/openssl/srtp.h
+x64-windows/include/openssl/ssl.h
+x64-windows/include/openssl/ssl2.h
+x64-windows/include/openssl/ssl23.h
+x64-windows/include/openssl/ssl3.h
+x64-windows/include/openssl/stack.h
+x64-windows/include/openssl/symhacks.h
+x64-windows/include/openssl/tls1.h
+x64-windows/include/openssl/ts.h
+x64-windows/include/openssl/txt_db.h
+x64-windows/include/openssl/ui.h
+x64-windows/include/openssl/ui_compat.h
+x64-windows/include/openssl/whrlpool.h
+x64-windows/include/openssl/x509.h
+x64-windows/include/openssl/x509_vfy.h
+x64-windows/include/openssl/x509v3.h
+x64-windows/lib/
+x64-windows/lib/libeay32.lib
+x64-windows/lib/ssleay32.lib
+x64-windows/share/
+x64-windows/share/openssl/
+x64-windows/share/openssl/copyright
+x64-windows/share/openssl/usage
+x64-windows/tools/
+x64-windows/tools/openssl/
+x64-windows/tools/openssl/LIBEAY32.dll
+x64-windows/tools/openssl/SSLEAY32.dll
+x64-windows/tools/openssl/openssl.exe
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/info/zlib_1.2.11-3_x64-windows.list	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+x64-windows/
+x64-windows/bin/
+x64-windows/bin/zlib.pdb
+x64-windows/bin/zlib1.dll
+x64-windows/debug/
+x64-windows/debug/bin/
+x64-windows/debug/bin/zlibd.pdb
+x64-windows/debug/bin/zlibd1.dll
+x64-windows/debug/lib/
+x64-windows/debug/lib/zlibd.lib
+x64-windows/include/
+x64-windows/include/zconf.h
+x64-windows/include/zlib.h
+x64-windows/lib/
+x64-windows/lib/zlib.lib
+x64-windows/share/
+x64-windows/share/zlib/
+x64-windows/share/zlib/copyright
+x64-windows/share/zlib/usage
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000000 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000000
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000000	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000000	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: boost-vcpkg-helpers
+Version: 4
+Architecture: x64-windows
+Multi-Arch: same
+Description: a set of vcpkg-internal scripts used to modularize boost
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000001 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000001
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000001	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000001	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: boost-vcpkg-helpers
+Version: 4
+Architecture: x64-windows
+Multi-Arch: same
+Description: a set of vcpkg-internal scripts used to modularize boost
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000002 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000002
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000002	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000002	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-config
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost config module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000003 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000003
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000003	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000003	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-config
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost config module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000004 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000004
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000004	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000004	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-compatibility
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost compatibility module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000005 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000005
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000005	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000005	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-compatibility
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost compatibility module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000006 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000006
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000006	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000006	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-detail
+Version: 1.67.0
+Depends: boost-compatibility, boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost detail module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000007 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000007
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000007	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000007	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-detail
+Version: 1.67.0
+Depends: boost-compatibility, boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost detail module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000008 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000008
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000008	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000008	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5 @@
+Package: boost-modular-build-helper
+Version: 2018-05-14
+Architecture: x64-windows
+Multi-Arch: same
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000009 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000009
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000009	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000009	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5 @@
+Package: boost-modular-build-helper
+Version: 2018-05-14
+Architecture: x64-windows
+Multi-Arch: same
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000010 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000010
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000010	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000010	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-assert
+Version: 1.67.0
+Depends: boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost assert module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000011 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000011
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000011	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000011	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-assert
+Version: 1.67.0
+Depends: boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost assert module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000012 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000012
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000012	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000012	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-throw-exception
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost throw_exception module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000013 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000013
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000013	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000013	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-throw-exception
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost throw_exception module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000014 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000014
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000014	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000014	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-core
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost core module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000015 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000015
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000015	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000015	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-core
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost core module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000016 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000016
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000016	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000016	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-preprocessor
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost preprocessor module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000017 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000017
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000017	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000017	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-preprocessor
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost preprocessor module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000018 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000018
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000018	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000018	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-static-assert
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost static_assert module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000019 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000019
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000019	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000019	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-static-assert
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost static_assert module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000020 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000020
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000020	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000020	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-integer
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost integer module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000021 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000021
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000021	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000021	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-integer
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost integer module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000022 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000022
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000022	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000022	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-type-traits
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost type_traits module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000023 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000023
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000023	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000023	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-type-traits
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost type_traits module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000024 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000024
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000024	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000024	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-utility
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost utility module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000025 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000025
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000025	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000025	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-utility
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost utility module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000026 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000026
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000026	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000026	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-predef
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost predef module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000027 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000027
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000027	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000027	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-predef
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost predef module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000028 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000028
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000028	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000028	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-winapi
+Version: 1.67.0
+Depends: boost-config, boost-integer, boost-predef, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost winapi module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000029 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000029
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000029	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000029	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-winapi
+Version: 1.67.0
+Depends: boost-config, boost-integer, boost-predef, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost winapi module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000030 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000030
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000030	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000030	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: boost-build
+Version: 1.67.0
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost.Build
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000031 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000031
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000031	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000031	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: boost-build
+Version: 1.67.0
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost.Build
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000032 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000032
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000032	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000032	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-system
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-integer, boost-modular-build-helper, boost-predef, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost system module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000033 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000033
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000033	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000033	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-system
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-integer, boost-modular-build-helper, boost-predef, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost system module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000034 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000034
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000034	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000034	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-move
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-detail, boost-integer, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost move module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000035 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000035
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000035	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000035	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-move
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-detail, boost-integer, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost move module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000036 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000036
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000036	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000036	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: liblzma
+Version: 5.2.3-2
+Architecture: x64-windows
+Multi-Arch: same
+Description: Compression library with an API similar to that of zlib.
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000037 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000037
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000037	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000037	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: liblzma
+Version: 5.2.3-2
+Architecture: x64-windows
+Multi-Arch: same
+Description: Compression library with an API similar to that of zlib.
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000038 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000038
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000038	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000038	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-mpl
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost mpl module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000039 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000039
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000039	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000039	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-mpl
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost mpl module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000040 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000040
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000040	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000040	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-concept-check
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost concept_check module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000041 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000041
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000041	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000041	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-concept-check
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost concept_check module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000042 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000042
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000042	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000042	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-array
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost array module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000043 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000043
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000043	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000043	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-array
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost array module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000044 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000044
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000044	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000044	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-smart-ptr
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost smart_ptr module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000045 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000045
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000045	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000045	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-smart-ptr
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost smart_ptr module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000046 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000046
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000046	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000046	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-tuple
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tuple module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000047 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000047
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000047	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000047	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-tuple
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tuple module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000048 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000048
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000048	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000048	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-exception
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost exception module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000049 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000049
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000049	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000049	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-exception
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost exception module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000050 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000050
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000050	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000050	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-bind
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost bind module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000051 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000051
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000051	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000051	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-bind
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost bind module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000052 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000052
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000052	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000052	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-typeof
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost typeof module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000053 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000053
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000053	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000053	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-typeof
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost typeof module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000054 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000054
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000054	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000054	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-container-hash
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost container_hash module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000055 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000055
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000055	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000055	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-container-hash
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost container_hash module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000056 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000056
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000056	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000056	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-type-index
+Version: 1.67.0
+Depends: boost-config, boost-container-hash, boost-core, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost type_index module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000057 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000057
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000057	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000057	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-type-index
+Version: 1.67.0
+Depends: boost-config, boost-container-hash, boost-core, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost type_index module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000058 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000058
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000058	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000058	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-function
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-mpl, boost-preprocessor, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost function module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000059 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000059
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000059	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000059	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-function
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-mpl, boost-preprocessor, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost function module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000060 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000060
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000060	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000060	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-functional
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost functional module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000061 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000061
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000061	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000061	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-functional
+Version: 1.67.0
+Depends: boost-config, boost-mpl, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost functional module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000062 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000062
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000062	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000062	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-function-types
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost function_types module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000063 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000063
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000063	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000063	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-function-types
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost function_types module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000064 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000064
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000064	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000064	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-fusion
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-functional, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost fusion module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000065 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000065
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000065	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000065	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-fusion
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-functional, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost fusion module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000066 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000066
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000066	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000066	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-optional
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost optional module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000067 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000067
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000067	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000067	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-optional
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost optional module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000068 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000068
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000068	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000068	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-iterator
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost iterator module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000069 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000069
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000069	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000069	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-iterator
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost iterator module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000070 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000070
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000070	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000070	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-regex
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost regex module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000071 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000071
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000071	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000071	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-regex
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost regex module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000072 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000072
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000072	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000072	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-range
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost range module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000073 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000073
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000073	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000073	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-range
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost range module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000074 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000074
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000074	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000074	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-intrusive
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-functional, boost-move, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost intrusive module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000075 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000075
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000075	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000075	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-intrusive
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-functional, boost-move, boost-static-assert, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost intrusive module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000076 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000076
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000076	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000076	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-container
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-functional, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost container module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000077 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000077
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000077	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000077	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-container
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-core, boost-functional, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost container module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000078 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000078
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000078	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000078	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-unordered
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost unordered module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000079 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000079
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000079	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000079	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-unordered
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost unordered module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000080 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000080
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000080	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000080	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-algorithm
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost algorithm module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000081 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000081
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000081	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000081	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-algorithm
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost algorithm module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000082 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000082
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000082	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000082	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: icu
+Version: 61.1-1
+Architecture: x64-windows
+Multi-Arch: same
+Description: Mature and widely used Unicode and localization library.
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000083 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000083
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000083	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000083	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: icu
+Version: 61.1-1
+Architecture: x64-windows
+Multi-Arch: same
+Description: Mature and widely used Unicode and localization library.
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000084 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000084
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000084	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000084	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-atomic
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost atomic module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000085 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000085
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000085	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000085	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-atomic
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost atomic module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000086 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000086
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000086	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000086	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-lambda
+Version: 1.67.0
+Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost lambda module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000087 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000087
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000087	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000087	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-lambda
+Version: 1.67.0
+Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost lambda module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000088 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000088
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000088	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000088	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-numeric-conversion
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost numeric_conversion module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000089 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000089
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000089	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000089	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-numeric-conversion
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost numeric_conversion module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000090 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000090
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000090	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000090	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-lexical-cast
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-mpl, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost lexical_cast module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000091 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000091
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000091	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000091	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-lexical-cast
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-mpl, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost lexical_cast module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000092 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000092
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000092	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000092	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-math
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost math module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000093 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000093
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000093	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000093	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-math
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost math module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000094 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000094
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000094	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000094	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-polygon
+Version: 1.67.0
+Depends: boost-config, boost-integer, boost-mpl, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost polygon module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000095 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000095
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000095	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000095	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-polygon
+Version: 1.67.0
+Depends: boost-config, boost-integer, boost-mpl, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost polygon module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000096 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000096
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000096	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000096	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-io
+Version: 1.67.0
+Depends: boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost io module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000097 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000097
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000097	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000097	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-io
+Version: 1.67.0
+Depends: boost-detail, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost io module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000098 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000098
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000098	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000098	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-random
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost random module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000099 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000099
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000099	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000099	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-random
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost random module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000100 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000100
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000100	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000100	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-rational
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost rational module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000101 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000101
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000101	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000101	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-rational
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost rational module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000102 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000102
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000102	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000102	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-multiprecision
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-config, boost-detail, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost multiprecision module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000103 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000103
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000103	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000103	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-multiprecision
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-config, boost-detail, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost multiprecision module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000104 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000104
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000104	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000104	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-qvm
+Version: 1.67.0
+Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost qvm module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000105 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000105
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000105	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000105	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-qvm
+Version: 1.67.0
+Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost qvm module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000106 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000106
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000106	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000106	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-endian
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost endian module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000107 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000107
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000107	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000107	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-endian
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost endian module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000108 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000108
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000108	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000108	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: bzip2
+Version: 1.0.6-2
+Architecture: x64-windows
+Multi-Arch: same
+Description: High-quality data compressor.
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000109 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000109
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000109	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000109	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: bzip2
+Version: 1.0.6-2
+Architecture: x64-windows
+Multi-Arch: same
+Description: High-quality data compressor.
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000110 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000110
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000110	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000110	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: zlib
+Version: 1.2.11-3
+Architecture: x64-windows
+Multi-Arch: same
+Description: A compression library
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000111 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000111
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000111	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000111	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: zlib
+Version: 1.2.11-3
+Architecture: x64-windows
+Multi-Arch: same
+Description: A compression library
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000112 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000112
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000112	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000112	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-iostreams
+Version: 1.67.0-1
+Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, zlib, liblzma
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost iostreams module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000113 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000113
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000113	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000113	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-iostreams
+Version: 1.67.0-1
+Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, zlib, liblzma
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost iostreams module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000114 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000114
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000114	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000114	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-ratio
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost ratio module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000115 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000115
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000115	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000115	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-ratio
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost ratio module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000116 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000116
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000116	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000116	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-chrono
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost chrono module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000117 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000117
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000117	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000117	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-chrono
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost chrono module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000118 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000118
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000118	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000118	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-tokenizer
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tokenizer module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000119 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000119
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000119	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000119	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-tokenizer
+Version: 1.67.0
+Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tokenizer module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000120 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000120
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000120	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000120	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-date-time
+Version: 1.67.0
+Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost date_time module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000121 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000121
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000121	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000121	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-date-time
+Version: 1.67.0
+Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost date_time module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000122 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000122
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000122	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000122	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-thread
+Version: 1.67.0
+Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-functional, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost thread module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000123 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000123
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000123	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000123	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-thread
+Version: 1.67.0
+Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-functional, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost thread module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000124 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000124
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000124	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000124	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-locale
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost locale module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000125 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000125
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000125	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000125	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-locale
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost locale module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000126 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000126
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000126	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000126	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-filesystem
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-range, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost filesystem module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000127 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000127
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000127	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000127	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-filesystem
+Version: 1.67.0
+Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-range, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost filesystem module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000128 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000128
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000128	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000128	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-foreach
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost foreach module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000129 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000129
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000129	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000129	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-foreach
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost foreach module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000130 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000130
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000130	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000130	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-proto
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost proto module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000131 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000131
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000131	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000131	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-proto
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost proto module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000132 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000132
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000132	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000132	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-phoenix
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost phoenix module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000133 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000133
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000133	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000133	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-phoenix
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost phoenix module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000134 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000134
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000134	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000134	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-pool
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost pool module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000135 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000135
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000135	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000135	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-pool
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost pool module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000136 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000136
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000136	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000136	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-tti
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tti module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000137 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000137
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000137	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000137	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-tti
+Version: 1.67.0
+Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost tti module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000138 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000138
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000138	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000138	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-variant
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost variant module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000139 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000139
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000139	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000139	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-variant
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost variant module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000140 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000140
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000140	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000140	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-spirit
+Version: 1.67.0
+Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem, boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams, boost-iterator, boost-lexical-cast, boost-locale, boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost spirit module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000141 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000141
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000141	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000141	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-spirit
+Version: 1.67.0
+Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem, boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams, boost-iterator, boost-lexical-cast, boost-locale, boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost spirit module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000142 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000142
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000142	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000142	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-serialization
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost serialization module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000143 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000143
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000143	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000143	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-serialization
+Version: 1.67.0
+Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost serialization module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000144 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000144
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000144	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000144	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-geometry
+Version: 1.67.0
+Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost geometry module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000145 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000145
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000145	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000145	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-geometry
+Version: 1.67.0
+Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost geometry module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000146 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000146
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000146	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000146	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: openssl
+Version: 1.0.2o-3
+Architecture: x64-windows
+Multi-Arch: same
+Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000147 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000147
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000147	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000147	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: openssl
+Version: 1.0.2o-3
+Architecture: x64-windows
+Multi-Arch: same
+Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000148 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000148
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000148	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000148	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-any
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost any module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000149 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000149
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000149	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000149	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-any
+Version: 1.67.0
+Depends: boost-config, boost-core, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost any module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000150 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000150
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000150	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000150	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-multi-index
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost multi_index module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000151 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000151
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000151	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000151	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-multi-index
+Version: 1.67.0
+Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost multi_index module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000152 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000152
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000152	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000152	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-property-map
+Version: 1.67.0
+Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost property_map module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000153 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000153
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000153	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000153	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-property-map
+Version: 1.67.0
+Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost property_map module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000154 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000154
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000154	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000154	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-bimap
+Version: 1.67.0
+Depends: boost-concept-check, boost-config, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost bimap module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000155 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000155
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000155	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000155	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-bimap
+Version: 1.67.0
+Depends: boost-concept-check, boost-config, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost bimap module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000156 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000156
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000156	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000156	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-format
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost format module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000157 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000157
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000157	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000157	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-format
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost format module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000158 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000158
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000158	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000158	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-property-tree
+Version: 1.67.0
+Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost property_tree module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000159 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000159
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000159	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000159	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-property-tree
+Version: 1.67.0
+Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost property_tree module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000160 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000160
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000160	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000160	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-conversion
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost conversion module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000161 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000161
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000161	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000161	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-conversion
+Version: 1.67.0
+Depends: boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost conversion module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000162 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000162
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000162	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000162	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-parameter
+Version: 1.67.0
+Depends: boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost parameter module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000163 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000163
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000163	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000163	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-parameter
+Version: 1.67.0
+Depends: boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost parameter module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000164 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000164
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000164	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000164	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-timer
+Version: 1.67.0
+Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost timer module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000165 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000165
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000165	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000165	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-timer
+Version: 1.67.0
+Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost timer module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000166 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000166
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000166	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000166	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-test
+Version: 1.67.0-2
+Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost test module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000167 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000167
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000167	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000167	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-test
+Version: 1.67.0-2
+Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost test module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000168 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000168
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000168	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000168	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-xpressive
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost xpressive module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000169 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000169
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000169	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000169	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-xpressive
+Version: 1.67.0
+Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost xpressive module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000170 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000170
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000170	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000170	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-graph
+Version: 1.67.0
+Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-functional, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test, boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost graph module
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000171 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000171
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000171	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000171	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: boost-graph
+Version: 1.67.0
+Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-functional, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test, boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive
+Architecture: x64-windows
+Multi-Arch: same
+Description: Boost graph module
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000172 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000172
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000172	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000172	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: libevent
+Version: 2.1.8-3
+Depends: openssl
+Architecture: x64-windows
+Multi-Arch: same
+Description: An event notification library
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000173 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000173
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000173	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000173	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: libevent
+Version: 2.1.8-3
+Depends: openssl
+Architecture: x64-windows
+Multi-Arch: same
+Description: An event notification library
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000174 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000174
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000174	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000174	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: lz4
+Version: 1.8.2
+Architecture: x64-windows
+Multi-Arch: same
+Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000175 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000175
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000175	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000175	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,6 @@
+Package: lz4
+Version: 1.8.2
+Architecture: x64-windows
+Multi-Arch: same
+Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000176 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000176
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000176	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000176	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: libmysql
+Version: 8.0.4-2
+Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
+Architecture: x64-windows
+Multi-Arch: same
+Description: A MySQL client library for C development.
+Status: install ok half-installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000177 thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000177
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000177	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/0000000177	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,7 @@
+Package: libmysql
+Version: 8.0.4-2
+Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
+Architecture: x64-windows
+Multi-Arch: same
+Description: A MySQL client library for C development.
+Status: install ok installed
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/tests/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/tests/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/tests/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/tests/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,5 @@
+# individual library tests
+
+These tests should have the same name as the vcpkg port. They are intended to use to verify that building/linking/running is possible on each platform. 
+
+The systests are intended to test that the current version of the vcpkg build helper will work with published versions of the most common -sys crates. 
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/tests/run.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/tests/run.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/tests/run.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/tests/run.sh	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -ex
+
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPTDIR
+
+export VCPKG_ROOT=$SCRIPTDIR/../vcp
+
+source ../setup_vcp.sh
+
+for port in harfbuzz ; do
+    # check that the port fails before it is installed
+    $VCPKG_ROOT/vcpkg remove $port  || true
+    cargo clean --manifest-path $port/Cargo.toml
+    cargo run --manifest-path $port/Cargo.toml && exit 2
+    echo THIS FAILURE IS EXPECTED
+    echo This is to ensure that we are not spuriously succeeding because the libraries already exist somewhere on the build machine.
+    $VCPKG_ROOT/vcpkg install $port
+    cargo run --manifest-path $port/Cargo.toml
+done
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/tests/vcpkgrs_target.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/tests/vcpkgrs_target.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/vcpkg/tests/vcpkgrs_target.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/vcpkg/tests/vcpkgrs_target.sh	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -ex
+
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPTDIR
+
+export VCPKG_ROOT=$SCRIPTDIR/../vcp
+export VCPKGRS_TRIPLET=test-triplet
+export VCPKG_DEFAULT_TRIPLET=test-triplet
+
+cp $VCPKG_ROOT/triplets/x64-linux.cmake $VCPKG_ROOT/triplets/test-triplet.cmake
+for port in harfbuzz ; do
+    # check that the port fails before it is installed
+    $VCPKG_ROOT/vcpkg remove --no-binarycaching $port  || true
+    cargo clean --manifest-path $port/Cargo.toml
+    cargo run --manifest-path $port/Cargo.toml && exit 2
+    echo THIS FAILURE IS EXPECTED
+    echo This is to ensure that we are not spuriously succeeding because the libraries already exist somewhere on the build machine.
+    # disable binary caching because it breaks this build as of vcpkg 53e6588 (since vcpkg 52a9d9a)
+    $VCPKG_ROOT/vcpkg install --no-binarycaching $port
+    cargo run --manifest-path $port/Cargo.toml
+done
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/version_check/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/version_check/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/version_check/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/version_check/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"d4b465b354ce74e417516ecc4d14e9551ff99fe116a2296db459dff725881801","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"b7e650f3fce5c53249d1cdc608b54df156a97edd636cf9d23498d0cfe7aec63e","README.md":"d45a7a97623a56bf9cb7766976c3807312f7d4ac0cfaf4563ff76bc4d6ad1835","src/channel.rs":"f916ece9beeb7f3d512b423ae6da05d45f284bf42ddf7c14f80b77398d52dac7","src/date.rs":"d31e158a2b49f81da512150c5c93194655dac4114825e285fe2f688c09b001a4","src/lib.rs":"a15eb43cec1acfb0db42e8f93bdf70246ebceb1684ac39496bd28184722e4480","src/version.rs":"81503116d2d65968edeec37a0e9797a569ac5cafec13ca61bd631b11948ab7ac"},"package":"b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"}
\ No newline at end of file
+{"files":{"Cargo.toml":"cdbd085c15dcc87659d93787caa5faf9017be5fd8538c7813ccd0bb3284485d6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"b7e650f3fce5c53249d1cdc608b54df156a97edd636cf9d23498d0cfe7aec63e","README.md":"d45a7a97623a56bf9cb7766976c3807312f7d4ac0cfaf4563ff76bc4d6ad1835","src/channel.rs":"f916ece9beeb7f3d512b423ae6da05d45f284bf42ddf7c14f80b77398d52dac7","src/date.rs":"d31e158a2b49f81da512150c5c93194655dac4114825e285fe2f688c09b001a4","src/lib.rs":"61e2d430a282d6fb26e709d7c5d94fe16f62d210efce9d2e3e3092b71eacb639","src/version.rs":"81503116d2d65968edeec37a0e9797a569ac5cafec13ca61bd631b11948ab7ac"},"package":"5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/version_check/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/version_check/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/version_check/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/version_check/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
 authors = ["Sergio Benitez <sb@sergio.bz>"]
 description = "Tiny crate to check the version of the installed/running rustc."
 documentation = "https://docs.rs/version_check/"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/version_check/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/version_check/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/version_check/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/version_check/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -93,13 +93,33 @@
     (version.map(|s| s.to_string()), date.map(|s| s.to_string()))
 }
 
+/// Parses (version, date) as available from rustc verbose version output.
+fn version_and_date_from_rustc_verbose_version(s: &str) -> (Option<String>, Option<String>) {
+    let (mut version, mut date) = (None, None);
+    for line in s.lines() {
+        let split = |s: &str| s.splitn(2, ":").nth(1).map(|s| s.trim().to_string());
+        match line.trim().split(" ").nth(0) {
+            Some("rustc") => {
+                let (v, d) = version_and_date_from_rustc_version(line);
+                version = version.or(v);
+                date = date.or(d);
+            },
+            Some("release:") => version = split(line),
+            Some("commit-date:") if line.ends_with("unknown") => date = None,
+            Some("commit-date:") => date = split(line),
+            _ => continue
+        }
+    }
+
+    (version, date)
+}
+
 /// Returns (version, date) as available from `rustc --version`.
 fn get_version_and_date() -> Option<(Option<String>, Option<String>)> {
-    env::var("RUSTC").ok()
-        .and_then(|rustc| Command::new(rustc).arg("--version").output().ok())
-        .or_else(|| Command::new("rustc").arg("--version").output().ok())
+    let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".to_string());
+    Command::new(rustc).arg("--verbose").arg("--version").output().ok()
         .and_then(|output| String::from_utf8(output.stdout).ok())
-        .map(|s| version_and_date_from_rustc_version(&s))
+        .map(|s| version_and_date_from_rustc_verbose_version(&s))
 }
 
 /// Reads the triple of [`Version`], [`Channel`], and [`Date`] of the installed
@@ -237,52 +257,112 @@
 #[cfg(test)]
 mod tests {
     use super::version_and_date_from_rustc_version;
+    use super::version_and_date_from_rustc_verbose_version;
 
     macro_rules! check_parse {
-        ($s:expr => $v:expr, $d:expr) => (
-            if let (Some(v), d) = version_and_date_from_rustc_version($s) {
+        (@ $f:expr, $s:expr => $v:expr, $d:expr) => ({
+            if let (Some(v), d) = $f($s) {
                 let e_d: Option<&str> = $d.into();
                 assert_eq!((v, d), ($v.into(), e_d.map(|s| s.into())));
             } else {
                 panic!("{:?} didn't parse for version testing.", $s);
             }
-        )
+        });
+        ($f:expr, $s:expr => $v:expr, $d:expr) => ({
+            let warn = "warning: invalid logging spec 'warning', ignoring it";
+            let warn2 = "warning: sorry, something went wrong :(sad)";
+            check_parse!(@ $f, $s => $v, $d);
+            check_parse!(@ $f, &format!("{}\n{}", warn, $s) => $v, $d);
+            check_parse!(@ $f, &format!("{}\n{}", warn2, $s) => $v, $d);
+            check_parse!(@ $f, &format!("{}\n{}\n{}", warn, warn2, $s) => $v, $d);
+            check_parse!(@ $f, &format!("{}\n{}\n{}", warn2, warn, $s) => $v, $d);
+        })
+    }
+
+    macro_rules! check_terse_parse {
+        ($($s:expr => $v:expr, $d:expr,)+) => {$(
+            check_parse!(version_and_date_from_rustc_version, $s => $v, $d);
+        )+}
+    }
+
+    macro_rules! check_verbose_parse {
+        ($($s:expr => $v:expr, $d:expr,)+) => {$(
+            check_parse!(version_and_date_from_rustc_verbose_version, $s => $v, $d);
+        )+}
     }
 
     #[test]
     fn test_version_parse() {
-        check_parse!("rustc 1.18.0" => "1.18.0", None);
-        check_parse!("rustc 1.8.0" => "1.8.0", None);
-        check_parse!("rustc 1.20.0-nightly" => "1.20.0-nightly", None);
-        check_parse!("rustc 1.20" => "1.20", None);
-        check_parse!("rustc 1.3" => "1.3", None);
-        check_parse!("rustc 1" => "1", None);
-        check_parse!("rustc 1.5.1-beta" => "1.5.1-beta", None);
-
-        // Because of 1.0.0, we can't use Option<T>: From<T>.
-        check_parse!("rustc 1.20.0 (2017-07-09)"
-                     => "1.20.0", Some("2017-07-09"));
-
-        check_parse!("rustc 1.20.0-dev (2017-07-09)"
-                     => "1.20.0-dev", Some("2017-07-09"));
-
-        check_parse!("rustc 1.20.0-nightly (d84693b93 2017-07-09)"
-                       => "1.20.0-nightly", Some("2017-07-09"));
-
-        check_parse!("rustc 1.20.0 (d84693b93 2017-07-09)"
-                       => "1.20.0", Some("2017-07-09"));
-
-        check_parse!("warning: invalid logging spec 'warning', ignoring it
-                      rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
-                      => "1.30.0-nightly", Some("2018-09-20"));
-
-        check_parse!("warning: invalid logging spec 'warning', ignoring it\n
-                      rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
-                      => "1.30.0-nightly", Some("2018-09-20"));
-
-        check_parse!("warning: invalid logging spec 'warning', ignoring it
-                      warning: something else went wrong
-                      rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
-                      => "1.30.0-nightly", Some("2018-09-20"));
+        check_terse_parse! {
+            "rustc 1.18.0" => "1.18.0", None,
+            "rustc 1.8.0" => "1.8.0", None,
+            "rustc 1.20.0-nightly" => "1.20.0-nightly", None,
+            "rustc 1.20" => "1.20", None,
+            "rustc 1.3" => "1.3", None,
+            "rustc 1" => "1", None,
+            "rustc 1.5.1-beta" => "1.5.1-beta", None,
+            "rustc 1.20.0 (2017-07-09)" => "1.20.0", Some("2017-07-09"),
+            "rustc 1.20.0-dev (2017-07-09)" => "1.20.0-dev", Some("2017-07-09"),
+            "rustc 1.20.0-nightly (d84693b93 2017-07-09)" => "1.20.0-nightly", Some("2017-07-09"),
+            "rustc 1.20.0 (d84693b93 2017-07-09)" => "1.20.0", Some("2017-07-09"),
+            "rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)" => "1.30.0-nightly", Some("2018-09-20"),
+        };
+    }
+
+    #[test]
+    fn test_verbose_version_parse() {
+        check_verbose_parse! {
+            "rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)\n\
+                binary: rustc\n\
+                commit-hash: a59de37e99060162a2674e3ff45409ac73595c0e\n\
+                commit-date: 2015-05-13\n\
+                build-date: 2015-05-14\n\
+                host: x86_64-unknown-linux-gnu\n\
+                release: 1.0.0" => "1.0.0", Some("2015-05-13"),
+
+            "rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)\n\
+                commit-hash: a59de37e99060162a2674e3ff45409ac73595c0e\n\
+                commit-date: 2015-05-13\n\
+                build-date: 2015-05-14\n\
+                host: x86_64-unknown-linux-gnu\n\
+                release: 1.0.0" => "1.0.0", Some("2015-05-13"),
+
+            "rustc 1.50.0 (cb75ad5db 2021-02-10)\n\
+                binary: rustc\n\
+                commit-hash: cb75ad5db02783e8b0222fee363c5f63f7e2cf5b\n\
+                commit-date: 2021-02-10\n\
+                host: x86_64-unknown-linux-gnu\n\
+                release: 1.50.0" => "1.50.0", Some("2021-02-10"),
+
+            "rustc 1.52.0-nightly (234781afe 2021-03-07)\n\
+                binary: rustc\n\
+                commit-hash: 234781afe33d3f339b002f85f948046d8476cfc9\n\
+                commit-date: 2021-03-07\n\
+                host: x86_64-unknown-linux-gnu\n\
+                release: 1.52.0-nightly\n\
+                LLVM version: 12.0.0" => "1.52.0-nightly", Some("2021-03-07"),
+
+            "rustc 1.41.1\n\
+                binary: rustc\n\
+                commit-hash: unknown\n\
+                commit-date: unknown\n\
+                host: x86_64-unknown-linux-gnu\n\
+                release: 1.41.1\n\
+                LLVM version: 7.0" => "1.41.1", None,
+
+            "rustc 1.49.0\n\
+                binary: rustc\n\
+                commit-hash: unknown\n\
+                commit-date: unknown\n\
+                host: x86_64-unknown-linux-gnu\n\
+                release: 1.49.0" => "1.49.0", None,
+
+            "rustc 1.50.0 (Fedora 1.50.0-1.fc33)\n\
+                binary: rustc\n\
+                commit-hash: unknown\n\
+                commit-date: unknown\n\
+                host: x86_64-unknown-linux-gnu\n\
+                release: 1.50.0" => "1.50.0", None,
+        };
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"408ad6ace05055d4defe923c3cb5bb44f3a72af29a07aaa18cbdc386a371d40f","CONTRIBUTING.md":"b65d1661871f8bae9fb0000560cf28a37949c7da4c50d4762666410892e01118","Cargo.lock":"dae3d44facfbadbd41bdb49d23cbc3d8da453c65278c3cf5ca45e9a98effc1b0","Cargo.toml":"5c9e5188e27df3cdb6e9410b9eed549440029d0c4ddf7829b5afa733a9c2db09","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"77674336af8ded214dc3ae07da631c7dd35cc8205f39298474ba98a889e57272","README.md":"4478ac6f470bda9a8b3da003a6ecfb81faccc947b38447741733baf403809d0e","benches/benches.rs":"772a5ed772daf8712972be9f0a37699613e2ced09281f2ea7f91d041566d7d75","benches/fixtures/dodrio-todomvc.wasm":"c96827fdf045bdd33b20b59cad115da0844481e234d461146c527271ed381324","examples/build-wasm-from-scratch.rs":"d8e074d37dfb11051d2a5a94d96d9b044d3b3a0015f2ef591ca516390b0a5ca8","examples/parse.rs":"54f06215b4e548e17ea0d94af4f584b53a2d48b997f919f974db188e433b5e58","examples/round-trip.rs":"4d3d984976543b61ba9a959b90b409ac619ddd456f1c9d294151d4e7abbb02a4","publish.sh":"6ef2966b8bcdef4ffd98d3e7c23b17dc8f569388ab31f413ce019f815d13d0c2","src/arena_set.rs":"033661706956fa1b55d5196bb26fa917acf20f74dbc9cde35dc70235b633d3d4","src/dot.rs":"a5e6313694d42599800a93af61923f8bd115749108a56df7bcb61e5fa607f5db","src/emit.rs":"dc1656e3a8026c179a7b472053ef2bdb39d4c3ebfeadeb1339a7fde8045c23b3","src/encode.rs":"b4a3be18307949bb45190ad69658ce85618cd20efc2f8aeb14fc4a72f705c2e1","src/error.rs":"261dc782c6a43808c10bd9c316de1283371eb64a798cc2be400de2f6b303c191","src/function_builder.rs":"506a224ba22dc1b3b36fae0584c16df8a166ea88d3ffdc6117cea2b97be6c3f4","src/init_expr.rs":"7fc919e5d613b6a2bb1be92e6f50538a40105a0ad94caa8f1336287edbde4b26","src/ir/mod.rs":"2b7cf4023c8492eec6368806a1b45c4c0599029f546fa7d53b24f5e8d34f54b2","src/ir/traversals.rs":"5fd181da7088909ef3d78dd6441d2e9bd8abcc4aec83a78abb6ee076004b5026","src/lib.rs":"e8c17010de4cc17ecfc07e9560dbdc0e72ed5a67a44a73e02c8d57a64e903547","src/map.rs":"aedc30645cc1a644bd8d451194f405fad04c5964134e8a2d477b1b3d1af07edf","src/module/config.rs":"9507f793907e1c201587896bea71341893efeb09885159d477ba7df2d4f959c4","src/module/custom.rs":"8e4b91355282e583cc30e24702b0d0058e2269e4157dfdb6eb2e70b17d6b1d1f","src/module/data.rs":"a5ebfac223d584abf7feed0d2c23b3a64eb9af3b99a2cf317929f207d8e9e617","src/module/elements.rs":"4f6f4be6262d285f1ab0f78d0e49de0fdb74faa55ef5714946645f7e9d3a94f9","src/module/exports.rs":"0768909e0767b3ea299ba4c88c086203582219a65115b2af19a4ce0b32384588","src/module/functions/local_function/context.rs":"5e461d03a47de79e08507d164e665321040198a887fab910e7bfdac8fe55fd24","src/module/functions/local_function/emit.rs":"e0dae7bb63aebc0bb799bb509bacb710914d1cbd55fff8e9c0002bad35cc1708","src/module/functions/local_function/mod.rs":"528f0c2f19b000efc7567a8e6ba647c385feef68fed371b20d213e4f08a1d9ae","src/module/functions/mod.rs":"ebadb716030fce154be3904f689e64af7cb5e8a4bec41b5c131cfd892e5bf469","src/module/globals.rs":"c669ac961423121877b8f600148b44d7734d7fd19609a4beb1718214a59fb41f","src/module/imports.rs":"fba34241bcc3294068f30e709a5b86a8c1fe0b387bf3cd19b9a9971b2832db4a","src/module/locals.rs":"96fcae00bb53585e6ae691fc01bcf83eccf5ecefc14d23e2d8a34391437fbf37","src/module/memories.rs":"6cdd5b12fa79e8c85829176918644f25c722dee450c24f8f523de2cd8b49743a","src/module/mod.rs":"37c43b9289fea7b9c3796bde1059eed25bc149207605f58a0df808843ca3785b","src/module/producers.rs":"a22dc545342222c914fda6ff9ecaeb1327f6085f6c995c98591cb317a516d447","src/module/tables.rs":"e3ee7f2953974b32dcb3a8fa356b7a9e32ce2f1c785f8e2976e65e4ccc641d97","src/module/types.rs":"f5fd7a4030af59137294b4571fe2c5390ad0e783554747f890faf369990aa058","src/parse.rs":"b9f4cb75b1842330de629371505c6279b74fe66c2053fc15c2b7a3124b2d5c6a","src/passes/gc.rs":"06d386911ce7d55c2bec2119598edfd20a329ec834a6a1da8589c0a62821f3fb","src/passes/mod.rs":"2d7fa7e80eb0dc097cc3cf679e6b141690215db71f5f2a25cb061f3857b967cb","src/passes/used.rs":"93859002c737eb2b00978fce7a2bff7dd9c63d2e3e4076b6574246102fb9dbdf","src/passes/validate.rs":"df9acbfafe33eb2349bcfe767aa14234160ee0591e080c0c846e4ad1b3412c2b","src/tombstone_arena.rs":"8afe86dddd77a3736cb7d1725de4cc29183a67503bad3de8272c7b6808c2b84c","src/ty.rs":"9ef13f901c60f5bea4ffb96033ff3df9e9c20e713d0f89fcd28f7ad3b3fef559"},"package":"4d470d0583e65f4cab21a1ff3c1ba3dd23ae49e68f516f0afceaeb001b32af39"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"408ad6ace05055d4defe923c3cb5bb44f3a72af29a07aaa18cbdc386a371d40f","CONTRIBUTING.md":"b65d1661871f8bae9fb0000560cf28a37949c7da4c50d4762666410892e01118","Cargo.lock":"0782b056d9afe58e971a46b8139dad6db2cc088543960f34c711a0444095b10b","Cargo.toml":"e72238a7ca380cad549c027ffd49130dc7fd57008a48d181faa2a33443a1b1f6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"77674336af8ded214dc3ae07da631c7dd35cc8205f39298474ba98a889e57272","README.md":"4478ac6f470bda9a8b3da003a6ecfb81faccc947b38447741733baf403809d0e","benches/benches.rs":"772a5ed772daf8712972be9f0a37699613e2ced09281f2ea7f91d041566d7d75","benches/fixtures/dodrio-todomvc.wasm":"c96827fdf045bdd33b20b59cad115da0844481e234d461146c527271ed381324","examples/build-wasm-from-scratch.rs":"d8e074d37dfb11051d2a5a94d96d9b044d3b3a0015f2ef591ca516390b0a5ca8","examples/parse.rs":"54f06215b4e548e17ea0d94af4f584b53a2d48b997f919f974db188e433b5e58","examples/round-trip.rs":"4d3d984976543b61ba9a959b90b409ac619ddd456f1c9d294151d4e7abbb02a4","publish.sh":"6ef2966b8bcdef4ffd98d3e7c23b17dc8f569388ab31f413ce019f815d13d0c2","src/arena_set.rs":"033661706956fa1b55d5196bb26fa917acf20f74dbc9cde35dc70235b633d3d4","src/dot.rs":"a5e6313694d42599800a93af61923f8bd115749108a56df7bcb61e5fa607f5db","src/emit.rs":"dc1656e3a8026c179a7b472053ef2bdb39d4c3ebfeadeb1339a7fde8045c23b3","src/encode.rs":"b4a3be18307949bb45190ad69658ce85618cd20efc2f8aeb14fc4a72f705c2e1","src/error.rs":"261dc782c6a43808c10bd9c316de1283371eb64a798cc2be400de2f6b303c191","src/function_builder.rs":"506a224ba22dc1b3b36fae0584c16df8a166ea88d3ffdc6117cea2b97be6c3f4","src/init_expr.rs":"7fc919e5d613b6a2bb1be92e6f50538a40105a0ad94caa8f1336287edbde4b26","src/ir/mod.rs":"35f88a14d10724ed7e8c07f9acde3d1611c2c46ad1efcd17846da7e5644efd61","src/ir/traversals.rs":"5fd181da7088909ef3d78dd6441d2e9bd8abcc4aec83a78abb6ee076004b5026","src/lib.rs":"e8c17010de4cc17ecfc07e9560dbdc0e72ed5a67a44a73e02c8d57a64e903547","src/map.rs":"aedc30645cc1a644bd8d451194f405fad04c5964134e8a2d477b1b3d1af07edf","src/module/config.rs":"9507f793907e1c201587896bea71341893efeb09885159d477ba7df2d4f959c4","src/module/custom.rs":"8e4b91355282e583cc30e24702b0d0058e2269e4157dfdb6eb2e70b17d6b1d1f","src/module/data.rs":"a5ebfac223d584abf7feed0d2c23b3a64eb9af3b99a2cf317929f207d8e9e617","src/module/elements.rs":"4f6f4be6262d285f1ab0f78d0e49de0fdb74faa55ef5714946645f7e9d3a94f9","src/module/exports.rs":"34578b23937feb6d0c46a1d81a9ef567d65e55b5f7f34018c80301596cd25097","src/module/functions/local_function/context.rs":"5e461d03a47de79e08507d164e665321040198a887fab910e7bfdac8fe55fd24","src/module/functions/local_function/emit.rs":"14af9e15ecb88f5c07f28061d9f3921dbfa2d1bca72d635ce098b564ba83be48","src/module/functions/local_function/mod.rs":"c004b7a3755497b8efb10eef1bc3e322d27173b88150b993e8344ac23e36da20","src/module/functions/mod.rs":"c7724486ff144c4933ce249646f4d571a53c7b97169f3871681538c47aa4eeee","src/module/globals.rs":"c669ac961423121877b8f600148b44d7734d7fd19609a4beb1718214a59fb41f","src/module/imports.rs":"380be6bf69291a8c452f15fefb70342d74639adeabc198c1b78bfe9ae16a86ed","src/module/locals.rs":"96fcae00bb53585e6ae691fc01bcf83eccf5ecefc14d23e2d8a34391437fbf37","src/module/memories.rs":"ac4d2c19443ca86ca12299e2e1ccb36189dfd1fb123f5953dae71aa2339a8c2a","src/module/mod.rs":"d54f93d3fb11c20f28dae7bb4983076f9bac755764170dd905c69f139bb870bd","src/module/producers.rs":"a22dc545342222c914fda6ff9ecaeb1327f6085f6c995c98591cb317a516d447","src/module/tables.rs":"e3ee7f2953974b32dcb3a8fa356b7a9e32ce2f1c785f8e2976e65e4ccc641d97","src/module/types.rs":"f5fd7a4030af59137294b4571fe2c5390ad0e783554747f890faf369990aa058","src/parse.rs":"b9f4cb75b1842330de629371505c6279b74fe66c2053fc15c2b7a3124b2d5c6a","src/passes/gc.rs":"06d386911ce7d55c2bec2119598edfd20a329ec834a6a1da8589c0a62821f3fb","src/passes/mod.rs":"0b07db05177b922018b126a5849109ba771e547c5d014fee7d12d07def0e7496","src/passes/used.rs":"93859002c737eb2b00978fce7a2bff7dd9c63d2e3e4076b6574246102fb9dbdf","src/tombstone_arena.rs":"8afe86dddd77a3736cb7d1725de4cc29183a67503bad3de8272c7b6808c2b84c","src/ty.rs":"9ef13f901c60f5bea4ffb96033ff3df9e9c20e713d0f89fcd28f7ad3b3fef559"},"package":"4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -2,18 +2,18 @@
 # It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.31"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
+checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
 
 [[package]]
 name = "atty"
@@ -28,9 +28,9 @@
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "bitflags"
@@ -40,9 +40,9 @@
 
 [[package]]
 name = "bstr"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
 dependencies = [
  "lazy_static",
  "memchr",
@@ -52,15 +52,15 @@
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cast"
@@ -73,15 +73,15 @@
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "2.33.1"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
  "bitflags",
  "textwrap",
@@ -90,16 +90,16 @@
 
 [[package]]
 name = "criterion"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
+checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
 dependencies = [
  "atty",
  "cast",
  "clap",
  "criterion-plot",
  "csv",
- "itertools",
+ "itertools 0.10.0",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -121,51 +121,48 @@
 checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
 dependencies = [
  "cast",
- "itertools",
+ "itertools 0.9.0",
 ]
 
 [[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
+name = "crossbeam-channel"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
 dependencies = [
- "crossbeam-epoch",
+ "cfg-if",
  "crossbeam-utils",
- "maybe-uninit",
 ]
 
 [[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
+name = "crossbeam-deque"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
- "autocfg",
  "cfg-if",
+ "crossbeam-epoch",
  "crossbeam-utils",
- "lazy_static",
- "maybe-uninit",
- "memoffset",
- "scopeguard",
 ]
 
 [[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
+name = "crossbeam-epoch"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
- "maybe-uninit",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.7.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
 dependencies = [
  "autocfg",
  "cfg-if",
@@ -174,9 +171,9 @@
 
 [[package]]
 name = "csv"
-version = "1.1.3"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
+checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
 dependencies = [
  "bstr",
  "csv-core",
@@ -196,15 +193,15 @@
 
 [[package]]
 name = "either"
-version = "1.5.3"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "env_logger"
-version = "0.7.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
 dependencies = [
  "atty",
  "humantime",
@@ -215,36 +212,33 @@
 
 [[package]]
 name = "half"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
+checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
 
 [[package]]
 name = "heck"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
 dependencies = [
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "humantime"
-version = "1.3.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "id-arena"
@@ -265,16 +259,25 @@
 ]
 
 [[package]]
+name = "itertools"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
+dependencies = [
+ "either",
+]
+
+[[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "js-sys"
-version = "0.3.41"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4b9172132a62451e56142bff9afc91c8e4a4500aa5b847da36815b63bfda916"
+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -293,45 +296,39 @@
 
 [[package]]
 name = "libc"
-version = "0.2.72"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
+checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714"
 
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memoffset"
-version = "0.5.5"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
+checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
 ]
@@ -348,51 +345,61 @@
 
 [[package]]
 name = "oorandom"
-version = "11.1.2"
+version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "plotters"
-version = "0.2.15"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
+checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
 dependencies = [
- "js-sys",
  "num-traits",
+ "plotters-backend",
+ "plotters-svg",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.18"
+name = "plotters-backend"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
 dependencies = [
- "unicode-xid",
+ "plotters-backend",
 ]
 
 [[package]]
-name = "quick-error"
-version = "1.2.3"
+name = "proc-macro2"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.3.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
  "autocfg",
  "crossbeam-deque",
@@ -402,12 +409,12 @@
 
 [[package]]
 name = "rayon-core"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
+ "crossbeam-channel",
  "crossbeam-deque",
- "crossbeam-queue",
  "crossbeam-utils",
  "lazy_static",
  "num_cpus",
@@ -415,14 +422,13 @@
 
 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
@@ -436,9 +442,9 @@
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
 
 [[package]]
 name = "rustc_version"
@@ -487,9 +493,9 @@
 
 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
 
 [[package]]
 name = "serde_cbor"
@@ -503,9 +509,9 @@
 
 [[package]]
 name = "serde_derive"
-version = "1.0.114"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -514,9 +520,9 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.56"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
 dependencies = [
  "itoa",
  "ryu",
@@ -525,9 +531,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.34"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b"
+checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -536,9 +542,9 @@
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
  "winapi-util",
 ]
@@ -553,19 +559,10 @@
 ]
 
 [[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
 name = "tinytemplate"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
 dependencies = [
  "serde",
  "serde_json",
@@ -573,9 +570,9 @@
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
 
 [[package]]
 name = "unicode-width"
@@ -591,9 +588,9 @@
 
 [[package]]
 name = "walkdir"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
 dependencies = [
  "same-file",
  "winapi",
@@ -602,7 +599,7 @@
 
 [[package]]
 name = "walrus"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "criterion",
@@ -617,9 +614,9 @@
 
 [[package]]
 name = "walrus-macro"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c2bb690b44cb1b0fdcc54d4998d21f8bdaf706b93775425e440b174f39ad16"
+checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -629,9 +626,9 @@
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.64"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a634620115e4a229108b71bde263bb4220c483b3f07f5ba514ee8d15064c4c2"
+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -639,9 +636,9 @@
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.64"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df"
+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -654,9 +651,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.64"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcfd5ef6eec85623b4c6e844293d4516470d8f19cd72d0d12246017eb9060b8"
+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -664,9 +661,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.64"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9adff9ee0e94b926ca81b57f57f86d5545cdcb1d259e21ec9bdd95b901754c75"
+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -677,21 +674,21 @@
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.64"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7b90ea6c632dd06fd765d44542e234d5e63d9bb917ecd64d79778a13bd79ae"
+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
 
 [[package]]
 name = "wasmparser"
-version = "0.59.0"
+version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9"
+checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"
 
 [[package]]
 name = "web-sys"
-version = "0.3.41"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "863539788676619aac1a23e2df3655e96b32b0e05eb72ca34ba045ad573c625d"
+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "walrus"
-version = "0.18.0"
+version = "0.19.0"
 authors = ["Nick Fitzgerald <fitzgen@gmail.com>"]
 description = "A library for performing WebAssembly transformations\n"
 homepage = "https://github.com/rustwasm/walrus"
@@ -48,15 +48,15 @@
 optional = true
 
 [dependencies.walrus-macro]
-version = "=0.18.0"
+version = "=0.19.0"
 
 [dependencies.wasmparser]
-version = "0.59.0"
+version = "0.77.0"
 [dev-dependencies.criterion]
 version = "0.3.0"
 
 [dev-dependencies.env_logger]
-version = "0.7.0"
+version = "0.8.1"
 
 [features]
 parallel = ["rayon", "id-arena/rayon"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/ir/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/ir/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/ir/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/ir/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -539,11 +539,11 @@
     /// `v128.bitselect`
     V128Bitselect {},
 
-    /// `v128.swizzle`
-    V128Swizzle {},
+    /// `i8x16.swizzle`
+    I8x16Swizzle {},
 
-    /// `v128.shuffle`
-    V128Shuffle {
+    /// `i8x16.shuffle`
+    I8x16Shuffle {
         /// The indices that are used to create the final vector of this
         /// instruction
         #[walrus(skip_visit)]
@@ -772,6 +772,13 @@
     I32x4GeS,
     I32x4GeU,
 
+    I64x2Eq,
+    I64x2Ne,
+    I64x2LtS,
+    I64x2GtS,
+    I64x2LeS,
+    I64x2GeS,
+
     F32x4Eq,
     F32x4Ne,
     F32x4Lt,
@@ -795,20 +802,20 @@
     I8x16ShrS,
     I8x16ShrU,
     I8x16Add,
-    I8x16AddSaturateS,
-    I8x16AddSaturateU,
+    I8x16AddSatS,
+    I8x16AddSatU,
     I8x16Sub,
-    I8x16SubSaturateS,
-    I8x16SubSaturateU,
+    I8x16SubSatS,
+    I8x16SubSatU,
     I16x8Shl,
     I16x8ShrS,
     I16x8ShrU,
     I16x8Add,
-    I16x8AddSaturateS,
-    I16x8AddSaturateU,
+    I16x8AddSatS,
+    I16x8AddSatU,
     I16x8Sub,
-    I16x8SubSaturateS,
-    I16x8SubSaturateU,
+    I16x8SubSatS,
+    I16x8SubSatU,
     I16x8Mul,
     I32x4Shl,
     I32x4ShrS,
@@ -829,12 +836,16 @@
     F32x4Div,
     F32x4Min,
     F32x4Max,
+    F32x4PMin,
+    F32x4PMax,
     F64x2Add,
     F64x2Sub,
     F64x2Mul,
     F64x2Div,
     F64x2Min,
     F64x2Max,
+    F64x2PMin,
+    F64x2PMax,
 
     I8x16NarrowI16x8S,
     I8x16NarrowI16x8U,
@@ -855,6 +866,22 @@
     I32x4MinU,
     I32x4MaxS,
     I32x4MaxU,
+
+    I32x4DotI16x8S,
+
+    I16x8Q15MulrSatS,
+    I16x8ExtMulLowI8x16S,
+    I16x8ExtMulHighI8x16S,
+    I16x8ExtMulLowI8x16U,
+    I16x8ExtMulHighI8x16U,
+    I32x4ExtMulLowI16x8S,
+    I32x4ExtMulHighI16x8S,
+    I32x4ExtMulLowI16x8U,
+    I32x4ExtMulHighI16x8U,
+    I64x2ExtMulLowI32x4S,
+    I64x2ExtMulHighI32x4S,
+    I64x2ExtMulLowI32x4U,
+    I64x2ExtMulHighI32x4U,
 }
 
 /// Possible unary operations in wasm
@@ -937,30 +964,55 @@
     F64x2ExtractLane { idx: u8 },
 
     V128Not,
+    V128AnyTrue,
 
     I8x16Abs,
+    I8x16Popcnt,
     I8x16Neg,
-    I8x16AnyTrue,
     I8x16AllTrue,
     I8x16Bitmask,
     I16x8Abs,
     I16x8Neg,
-    I16x8AnyTrue,
     I16x8AllTrue,
     I16x8Bitmask,
     I32x4Abs,
     I32x4Neg,
-    I32x4AnyTrue,
     I32x4AllTrue,
     I32x4Bitmask,
+    I64x2Abs,
     I64x2Neg,
+    I64x2AllTrue,
+    I64x2Bitmask,
 
     F32x4Abs,
     F32x4Neg,
     F32x4Sqrt,
+    F32x4Ceil,
+    F32x4Floor,
+    F32x4Trunc,
+    F32x4Nearest,
     F64x2Abs,
     F64x2Neg,
     F64x2Sqrt,
+    F64x2Ceil,
+    F64x2Floor,
+    F64x2Trunc,
+    F64x2Nearest,
+
+    I16x8ExtAddPairwiseI8x16S,
+    I16x8ExtAddPairwiseI8x16U,
+    I32x4ExtAddPairwiseI16x8S,
+    I32x4ExtAddPairwiseI16x8U,
+    I64x2ExtendLowI32x4S,
+    I64x2ExtendHighI32x4S,
+    I64x2ExtendLowI32x4U,
+    I64x2ExtendHighI32x4U,
+    I32x4TruncSatF64x2SZero,
+    I32x4TruncSatF64x2UZero,
+    F64x2ConvertLowI32x4S,
+    F64x2ConvertLowI32x4U,
+    F32x4DemoteF64x2Zero,
+    F64x2PromoteLowF32x4,
 
     I32x4TruncSatF32x4S,
     I32x4TruncSatF32x4U,
@@ -1014,12 +1066,24 @@
     Splat16,
     Splat32,
     Splat64,
-    I16x8Load8x8S,
-    I16x8Load8x8U,
-    I32x4Load16x4S,
-    I32x4Load16x4U,
-    I64x2Load32x2S,
-    I64x2Load32x2U,
+
+    V128Load8x8S,
+    V128Load8x8U,
+    V128Load16x4S,
+    V128Load16x4U,
+    V128Load32x2S,
+    V128Load32x2U,
+    V128Load32Zero,
+    V128Load64Zero,
+
+    V128Load8Lane(u8),
+    V128Load16Lane(u8),
+    V128Load32Lane(u8),
+    V128Load64Lane(u8),
+    V128Store8Lane(u8),
+    V128Store16Lane(u8),
+    V128Store32Lane(u8),
+    V128Store64Lane(u8),
 }
 
 /// The kinds of extended loads which can happen
@@ -1212,8 +1276,8 @@
             | Instr::RefIsNull(..)
             | Instr::RefFunc(..)
             | Instr::V128Bitselect(..)
-            | Instr::V128Swizzle(..)
-            | Instr::V128Shuffle(..)
+            | Instr::I8x16Swizzle(..)
+            | Instr::I8x16Shuffle(..)
             | Instr::LoadSimd(..)
             | Instr::AtomicFence(..)
             | Instr::TableInit(..)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/exports.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/exports.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/exports.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/exports.rs	2021-12-09 12:01:26.000000000 +0000
@@ -145,6 +145,9 @@
                 Type | Module | Instance => {
                     unimplemented!("module linking not supported");
                 }
+                Event => {
+                    unimplemented!("exception handling not supported");
+                }
             };
             self.exports.arena.alloc_with_id(|id| Export {
                 id,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/functions/local_function/emit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/functions/local_function/emit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/functions/local_function/emit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/functions/local_function/emit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -261,12 +261,12 @@
                     F64Max => self.encoder.byte(0xa5),
                     F64Copysign => self.encoder.byte(0xa6),
 
-                    I8x16ReplaceLane { idx } => self.encoder.raw(&[0xfd, 0x17, idx]),
-                    I16x8ReplaceLane { idx } => self.encoder.raw(&[0xfd, 0x1a, idx]),
-                    I32x4ReplaceLane { idx } => self.encoder.raw(&[0xfd, 0x1c, idx]),
-                    I64x2ReplaceLane { idx } => self.encoder.raw(&[0xfd, 0x1e, idx]),
-                    F32x4ReplaceLane { idx } => self.encoder.raw(&[0xfd, 0x20, idx]),
-                    F64x2ReplaceLane { idx } => self.encoder.raw(&[0xfd, 0x22, idx]),
+                    I8x16ReplaceLane { idx } => self.encoder.raw(&[0xfd, 23, idx]),
+                    I16x8ReplaceLane { idx } => self.encoder.raw(&[0xfd, 26, idx]),
+                    I32x4ReplaceLane { idx } => self.encoder.raw(&[0xfd, 28, idx]),
+                    I64x2ReplaceLane { idx } => self.encoder.raw(&[0xfd, 30, idx]),
+                    F32x4ReplaceLane { idx } => self.encoder.raw(&[0xfd, 32, idx]),
+                    F64x2ReplaceLane { idx } => self.encoder.raw(&[0xfd, 34, idx]),
 
                     I8x16Eq => self.simd(0x23),
                     I8x16Ne => self.simd(0x24),
@@ -301,6 +301,13 @@
                     I32x4GeS => self.simd(0x3f),
                     I32x4GeU => self.simd(0x40),
 
+                    I64x2Eq => self.simd(214),
+                    I64x2Ne => self.simd(215),
+                    I64x2LtS => self.simd(216),
+                    I64x2GtS => self.simd(217),
+                    I64x2LeS => self.simd(218),
+                    I64x2GeS => self.simd(219),
+
                     F32x4Eq => self.simd(0x41),
                     F32x4Ne => self.simd(0x42),
                     F32x4Lt => self.simd(0x43),
@@ -326,11 +333,11 @@
                     I8x16ShrS => self.simd(0x6c),
                     I8x16ShrU => self.simd(0x6d),
                     I8x16Add => self.simd(0x6e),
-                    I8x16AddSaturateS => self.simd(0x6f),
-                    I8x16AddSaturateU => self.simd(0x70),
+                    I8x16AddSatS => self.simd(0x6f),
+                    I8x16AddSatU => self.simd(0x70),
                     I8x16Sub => self.simd(0x71),
-                    I8x16SubSaturateS => self.simd(0x72),
-                    I8x16SubSaturateU => self.simd(0x73),
+                    I8x16SubSatS => self.simd(0x72),
+                    I8x16SubSatU => self.simd(0x73),
                     I8x16MinS => self.simd(0x76),
                     I8x16MinU => self.simd(0x77),
                     I8x16MaxS => self.simd(0x78),
@@ -343,11 +350,11 @@
                     I16x8ShrS => self.simd(0x8c),
                     I16x8ShrU => self.simd(0x8d),
                     I16x8Add => self.simd(0x8e),
-                    I16x8AddSaturateS => self.simd(0x8f),
-                    I16x8AddSaturateU => self.simd(0x90),
+                    I16x8AddSatS => self.simd(0x8f),
+                    I16x8AddSatU => self.simd(0x90),
                     I16x8Sub => self.simd(0x91),
-                    I16x8SubSaturateS => self.simd(0x92),
-                    I16x8SubSaturateU => self.simd(0x93),
+                    I16x8SubSatS => self.simd(0x92),
+                    I16x8SubSatU => self.simd(0x93),
                     I16x8Mul => self.simd(0x95),
                     I16x8MinS => self.simd(0x96),
                     I16x8MinU => self.simd(0x97),
@@ -379,6 +386,8 @@
                     F32x4Div => self.simd(0xe7),
                     F32x4Min => self.simd(0xe8),
                     F32x4Max => self.simd(0xe9),
+                    F32x4PMin => self.simd(0xea),
+                    F32x4PMax => self.simd(0xeb),
 
                     F64x2Add => self.simd(0xf0),
                     F64x2Sub => self.simd(0xf1),
@@ -386,6 +395,24 @@
                     F64x2Div => self.simd(0xf3),
                     F64x2Min => self.simd(0xf4),
                     F64x2Max => self.simd(0xf5),
+                    F64x2PMin => self.simd(0xf6),
+                    F64x2PMax => self.simd(0xf7),
+
+                    I32x4DotI16x8S => self.simd(0xba),
+
+                    I16x8Q15MulrSatS => self.simd(130),
+                    I16x8ExtMulLowI8x16S => self.simd(156),
+                    I16x8ExtMulHighI8x16S => self.simd(157),
+                    I16x8ExtMulLowI8x16U => self.simd(158),
+                    I16x8ExtMulHighI8x16U => self.simd(159),
+                    I32x4ExtMulLowI16x8S => self.simd(188),
+                    I32x4ExtMulHighI16x8S => self.simd(189),
+                    I32x4ExtMulLowI16x8U => self.simd(190),
+                    I32x4ExtMulHighI16x8U => self.simd(191),
+                    I64x2ExtMulLowI32x4S => self.simd(220),
+                    I64x2ExtMulHighI32x4S => self.simd(221),
+                    I64x2ExtMulLowI32x4U => self.simd(222),
+                    I64x2ExtMulHighI32x4U => self.simd(223),
                 }
             }
 
@@ -453,57 +480,58 @@
                     I64Extend16S => self.encoder.byte(0xc3),
                     I64Extend32S => self.encoder.byte(0xc4),
 
-                    I8x16Splat => self.simd(0x0f),
-                    I16x8Splat => self.simd(0x10),
-                    I32x4Splat => self.simd(0x11),
-                    I64x2Splat => self.simd(0x12),
-                    F32x4Splat => self.simd(0x13),
-                    F64x2Splat => self.simd(0x14),
+                    I8x16Splat => self.simd(15),
+                    I16x8Splat => self.simd(16),
+                    I32x4Splat => self.simd(17),
+                    I64x2Splat => self.simd(18),
+                    F32x4Splat => self.simd(19),
+                    F64x2Splat => self.simd(20),
                     I8x16ExtractLaneS { idx } => {
-                        self.simd(0x15);
+                        self.simd(21);
                         self.encoder.byte(idx);
                     }
                     I8x16ExtractLaneU { idx } => {
-                        self.simd(0x16);
+                        self.simd(22);
                         self.encoder.byte(idx);
                     }
                     I16x8ExtractLaneS { idx } => {
-                        self.simd(0x18);
+                        self.simd(24);
                         self.encoder.byte(idx);
                     }
                     I16x8ExtractLaneU { idx } => {
-                        self.simd(0x19);
+                        self.simd(25);
                         self.encoder.byte(idx);
                     }
                     I32x4ExtractLane { idx } => {
-                        self.simd(0x1b);
+                        self.simd(27);
                         self.encoder.byte(idx);
                     }
                     I64x2ExtractLane { idx } => {
-                        self.simd(0x1d);
+                        self.simd(29);
                         self.encoder.byte(idx);
                     }
                     F32x4ExtractLane { idx } => {
-                        self.simd(0x1f);
+                        self.simd(31);
                         self.encoder.byte(idx);
                     }
                     F64x2ExtractLane { idx } => {
-                        self.simd(0x21);
+                        self.simd(33);
                         self.encoder.byte(idx);
                     }
 
                     V128Not => self.simd(0x4d),
 
+                    V128AnyTrue => self.simd(0x53),
+
                     I8x16Abs => self.simd(0x60),
+                    I8x16Popcnt => self.simd(98),
                     I8x16Neg => self.simd(0x61),
-                    I8x16AnyTrue => self.simd(0x62),
-                    I8x16AllTrue => self.simd(0x63),
+                    I8x16AllTrue => self.simd(99),
                     I8x16Bitmask => self.simd(0x64),
 
                     I16x8Abs => self.simd(0x80),
                     I16x8Neg => self.simd(0x81),
-                    I16x8AnyTrue => self.simd(0x82),
-                    I16x8AllTrue => self.simd(0x83),
+                    I16x8AllTrue => self.simd(131),
                     I16x8Bitmask => self.simd(0x84),
                     I16x8WidenLowI8x16S => self.simd(0x87),
                     I16x8WidenHighI8x16S => self.simd(0x88),
@@ -512,28 +540,38 @@
 
                     I32x4Abs => self.simd(0xa0),
                     I32x4Neg => self.simd(0xa1),
-                    I32x4AnyTrue => self.simd(0xa2),
-                    I32x4AllTrue => self.simd(0xa3),
+                    I32x4AllTrue => self.simd(163),
                     I32x4Bitmask => self.simd(0xa4),
                     I32x4WidenLowI16x8S => self.simd(0xa7),
                     I32x4WidenHighI16x8S => self.simd(0xa8),
                     I32x4WidenLowI16x8U => self.simd(0xa9),
                     I32x4WidenHighI16x8U => self.simd(0xaa),
 
-                    I64x2Neg => self.simd(0xc1),
-
-                    F32x4Abs => self.simd(0xe0),
-                    F32x4Neg => self.simd(0xe1),
-                    F32x4Sqrt => self.simd(0xe3),
-
-                    F64x2Abs => self.simd(0xec),
-                    F64x2Neg => self.simd(0xed),
-                    F64x2Sqrt => self.simd(0xef),
-
-                    I32x4TruncSatF32x4S => self.simd(0xf8),
-                    I32x4TruncSatF32x4U => self.simd(0xf9),
-                    F32x4ConvertI32x4S => self.simd(0xfa),
-                    F32x4ConvertI32x4U => self.simd(0xfb),
+                    I64x2Abs => self.simd(192),
+                    I64x2Neg => self.simd(193),
+                    I64x2AllTrue => self.simd(195),
+                    I64x2Bitmask => self.simd(196),
+
+                    F32x4Abs => self.simd(224),
+                    F32x4Neg => self.simd(225),
+                    F32x4Sqrt => self.simd(227),
+                    F32x4Ceil => self.simd(103),
+                    F32x4Floor => self.simd(104),
+                    F32x4Trunc => self.simd(105),
+                    F32x4Nearest => self.simd(106),
+
+                    F64x2Abs => self.simd(236),
+                    F64x2Neg => self.simd(237),
+                    F64x2Sqrt => self.simd(239),
+                    F64x2Ceil => self.simd(116),
+                    F64x2Floor => self.simd(117),
+                    F64x2Trunc => self.simd(122),
+                    F64x2Nearest => self.simd(148),
+
+                    I32x4TruncSatF32x4S => self.simd(248),
+                    I32x4TruncSatF32x4U => self.simd(249),
+                    F32x4ConvertI32x4S => self.simd(250),
+                    F32x4ConvertI32x4U => self.simd(251),
 
                     I32TruncSSatF32 => self.encoder.raw(&[0xfc, 0x00]),
                     I32TruncUSatF32 => self.encoder.raw(&[0xfc, 0x01]),
@@ -543,6 +581,21 @@
                     I64TruncUSatF32 => self.encoder.raw(&[0xfc, 0x05]),
                     I64TruncSSatF64 => self.encoder.raw(&[0xfc, 0x06]),
                     I64TruncUSatF64 => self.encoder.raw(&[0xfc, 0x07]),
+
+                    I16x8ExtAddPairwiseI8x16S => self.simd(124),
+                    I16x8ExtAddPairwiseI8x16U => self.simd(125),
+                    I32x4ExtAddPairwiseI16x8S => self.simd(126),
+                    I32x4ExtAddPairwiseI16x8U => self.simd(127),
+                    I64x2ExtendLowI32x4S => self.simd(199),
+                    I64x2ExtendHighI32x4S => self.simd(200),
+                    I64x2ExtendLowI32x4U => self.simd(201),
+                    I64x2ExtendHighI32x4U => self.simd(202),
+                    I32x4TruncSatF64x2SZero => self.simd(252),
+                    I32x4TruncSatF64x2UZero => self.simd(253),
+                    F64x2ConvertLowI32x4S => self.simd(254),
+                    F64x2ConvertLowI32x4U => self.simd(255),
+                    F32x4DemoteF64x2Zero => self.simd(94),
+                    F64x2PromoteLowF32x4 => self.simd(95),
                 }
             }
 
@@ -629,7 +682,7 @@
                     I64 { atomic: true } => self.encoder.raw(&[0xfe, 0x11]), // i64.atomic.load
                     F32 => self.encoder.byte(0x2a),                   // f32.load
                     F64 => self.encoder.byte(0x2b),                   // f64.load
-                    V128 => self.simd(0x00),
+                    V128 => self.simd(0),
                     I32_8 { kind: SignExtend } => self.encoder.byte(0x2c),
                     I32_8 { kind: ZeroExtend } => self.encoder.byte(0x2d),
                     I32_8 {
@@ -668,7 +721,7 @@
                     I64 { atomic: true } => self.encoder.raw(&[0xfe, 0x18]), // i64.atomic.store
                     F32 => self.encoder.byte(0x38),                   // f32.store
                     F64 => self.encoder.byte(0x39),                   // f64.store
-                    V128 => self.simd(0x0b),                          // v128.store
+                    V128 => self.simd(11),                            // v128.store
                     I32_8 { atomic: false } => self.encoder.byte(0x3a), // i32.store8
                     I32_8 { atomic: true } => self.encoder.raw(&[0xfe, 0x19]), // i32.atomic.store8
                     I32_16 { atomic: false } => self.encoder.byte(0x3b), // i32.store16
@@ -817,27 +870,48 @@
             V128Bitselect(_) => {
                 self.simd(0x52);
             }
-            V128Shuffle(e) => {
-                self.simd(0x0d);
+            I8x16Shuffle(e) => {
+                self.simd(13);
                 self.encoder.raw(&e.indices);
             }
-            V128Swizzle(_) => {
-                self.simd(0x0e);
+            I8x16Swizzle(_) => {
+                self.simd(14);
             }
             LoadSimd(e) => {
                 match e.kind {
-                    LoadSimdKind::I16x8Load8x8S => self.simd(0x01),
-                    LoadSimdKind::I16x8Load8x8U => self.simd(0x02),
-                    LoadSimdKind::I32x4Load16x4S => self.simd(0x03),
-                    LoadSimdKind::I32x4Load16x4U => self.simd(0x04),
-                    LoadSimdKind::I64x2Load32x2S => self.simd(0x05),
-                    LoadSimdKind::I64x2Load32x2U => self.simd(0x06),
-                    LoadSimdKind::Splat8 => self.simd(0x07),
-                    LoadSimdKind::Splat16 => self.simd(0x08),
-                    LoadSimdKind::Splat32 => self.simd(0x09),
-                    LoadSimdKind::Splat64 => self.simd(0x0a),
+                    LoadSimdKind::V128Load8x8S => self.simd(1),
+                    LoadSimdKind::V128Load8x8U => self.simd(2),
+                    LoadSimdKind::V128Load16x4S => self.simd(3),
+                    LoadSimdKind::V128Load16x4U => self.simd(4),
+                    LoadSimdKind::V128Load32x2S => self.simd(5),
+                    LoadSimdKind::V128Load32x2U => self.simd(6),
+                    LoadSimdKind::Splat8 => self.simd(7),
+                    LoadSimdKind::Splat16 => self.simd(8),
+                    LoadSimdKind::Splat32 => self.simd(9),
+                    LoadSimdKind::Splat64 => self.simd(10),
+                    LoadSimdKind::V128Load32Zero => self.simd(92),
+                    LoadSimdKind::V128Load64Zero => self.simd(93),
+                    LoadSimdKind::V128Load8Lane(_) => self.simd(84),
+                    LoadSimdKind::V128Load16Lane(_) => self.simd(85),
+                    LoadSimdKind::V128Load32Lane(_) => self.simd(86),
+                    LoadSimdKind::V128Load64Lane(_) => self.simd(87),
+                    LoadSimdKind::V128Store8Lane(_) => self.simd(88),
+                    LoadSimdKind::V128Store16Lane(_) => self.simd(89),
+                    LoadSimdKind::V128Store32Lane(_) => self.simd(90),
+                    LoadSimdKind::V128Store64Lane(_) => self.simd(91),
                 }
                 self.memarg(e.memory, &e.arg);
+                match e.kind {
+                    LoadSimdKind::V128Load8Lane(l)
+                    | LoadSimdKind::V128Load16Lane(l)
+                    | LoadSimdKind::V128Load32Lane(l)
+                    | LoadSimdKind::V128Load64Lane(l)
+                    | LoadSimdKind::V128Store8Lane(l)
+                    | LoadSimdKind::V128Store16Lane(l)
+                    | LoadSimdKind::V128Store32Lane(l)
+                    | LoadSimdKind::V128Store64Lane(l) => self.encoder.byte(l),
+                    _ => {}
+                }
             }
             TableInit(e) => {
                 self.encoder.raw(&[0xfc, 0x0c]);
@@ -877,9 +951,18 @@
     }
 
     fn memarg(&mut self, id: MemoryId, arg: &MemArg) {
-        assert_eq!(self.indices.get_memory_index(id), 0);
-        self.encoder.u32(arg.align.trailing_zeros());
-        self.encoder.u32(arg.offset);
+        let mem_index = self.indices.get_memory_index(id);
+        if mem_index == 0 {
+            self.encoder.u32(arg.align.trailing_zeros());
+            self.encoder.u32(arg.offset);
+        } else {
+            assert!(arg.align.trailing_zeros() < (1 << 6), "alignment too large");
+            let multi_memory_flag = 1 << 6;
+            let flags = arg.align.trailing_zeros() | multi_memory_flag;
+            self.encoder.u32(flags);
+            self.encoder.u32(arg.offset);
+            self.encoder.u32(mem_index);
+        };
     }
 
     fn simd(&mut self, opcode: u32) {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/functions/local_function/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/functions/local_function/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/functions/local_function/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/functions/local_function/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -9,9 +9,9 @@
 use crate::ir::*;
 use crate::map::{IdHashMap, IdHashSet};
 use crate::parse::IndicesToIds;
-use crate::{Data, DataId, FunctionBuilder, FunctionId, Module, Result, TypeId, ValType};
+use crate::{Data, DataId, FunctionBuilder, FunctionId, MemoryId, Module, Result, TypeId, ValType};
 use std::collections::BTreeMap;
-use wasmparser::Operator;
+use wasmparser::{FuncValidator, Operator, ValidatorResources};
 
 /// A function defined locally within the wasm module.
 #[derive(Debug)]
@@ -42,9 +42,9 @@
         id: FunctionId,
         ty: TypeId,
         args: Vec<LocalId>,
-        mut body: wasmparser::OperatorsReader,
+        mut body: wasmparser::BinaryReader<'_>,
         on_instr_pos: Option<&(dyn Fn(&usize) -> InstrLocId + Sync + Send + 'static)>,
-        mut validator: wasmparser::FuncValidator,
+        mut validator: FuncValidator<ValidatorResources>,
     ) -> Result<LocalFunction> {
         let mut func = LocalFunction {
             builder: FunctionBuilder::without_entry(ty),
@@ -64,7 +64,8 @@
         let entry = ctx.push_control_with_ty(BlockKind::FunctionEntry, ty);
         ctx.func.builder.entry = Some(entry);
         while !body.eof() {
-            let (inst, pos) = body.read_with_offset()?;
+            let pos = body.original_position();
+            let inst = body.read_operator()?;
             let loc = if let Some(ref on_instr_pos) = on_instr_pos {
                 on_instr_pos(&pos)
             } else {
@@ -73,7 +74,7 @@
             validator.op(pos, &inst)?;
             append_instruction(&mut ctx, inst, loc);
         }
-        validator.finish()?;
+        validator.finish(body.original_position())?;
 
         debug_assert!(ctx.controls.is_empty());
 
@@ -300,28 +301,29 @@
         ctx.alloc_instr(Binop { op }, loc);
     };
 
-    let mem_arg = |arg: &wasmparser::MemoryImmediate| -> MemArg {
-        MemArg {
-            align: 1 << (arg.flags as i32),
-            offset: arg.offset,
-        }
-    };
+    let mem_arg =
+        |ctx: &mut ValidationContext, arg: &wasmparser::MemoryImmediate| -> (MemoryId, MemArg) {
+            (
+                ctx.indices.get_memory(arg.memory).unwrap(),
+                MemArg {
+                    align: 1 << (arg.align as i32),
+                    offset: arg.offset,
+                },
+            )
+        };
 
     let load = |ctx: &mut ValidationContext, arg, kind| {
-        let memory = ctx.indices.get_memory(0).unwrap();
-        let arg = mem_arg(&arg);
+        let (memory, arg) = mem_arg(ctx, &arg);
         ctx.alloc_instr(Load { arg, kind, memory }, loc);
     };
 
     let store = |ctx: &mut ValidationContext, arg, kind| {
-        let memory = ctx.indices.get_memory(0).unwrap();
-        let arg = mem_arg(&arg);
+        let (memory, arg) = mem_arg(ctx, &arg);
         ctx.alloc_instr(Store { arg, kind, memory }, loc);
     };
 
     let atomicrmw = |ctx: &mut ValidationContext, arg, op, width| {
-        let memory = ctx.indices.get_memory(0).unwrap();
-        let arg = mem_arg(&arg);
+        let (memory, arg) = mem_arg(ctx, &arg);
         ctx.alloc_instr(
             AtomicRmw {
                 arg,
@@ -334,14 +336,12 @@
     };
 
     let cmpxchg = |ctx: &mut ValidationContext, arg, width| {
-        let memory = ctx.indices.get_memory(0).unwrap();
-        let arg = mem_arg(&arg);
+        let (memory, arg) = mem_arg(ctx, &arg);
         ctx.alloc_instr(Cmpxchg { arg, memory, width }, loc);
     };
 
     let load_simd = |ctx: &mut ValidationContext, arg, kind| {
-        let memory = ctx.indices.get_memory(0).unwrap();
-        let arg = mem_arg(&arg);
+        let (memory, arg) = mem_arg(ctx, &arg);
         ctx.alloc_instr(LoadSimd { memory, arg, kind }, loc);
     };
     match inst {
@@ -644,29 +644,36 @@
 
         Operator::BrTable { table } => {
             let mut blocks = Vec::with_capacity(table.len());
-            let (labels, default) = table.read_table().unwrap();
-            let default = ctx.control(default as usize).unwrap();
-
-            let default = default.block;
-            for label in labels.iter() {
-                let control = ctx.control(*label as usize).unwrap();
-                blocks.push(control.block);
+            let mut default = None;
+            for pair in table.targets() {
+                let (target, is_default) = pair.unwrap();
+                let control = ctx.control(target as usize).unwrap();
+                if is_default {
+                    default = Some(control.block);
+                } else {
+                    blocks.push(control.block);
+                }
             }
-            let blocks = blocks.into_boxed_slice();
-            ctx.alloc_instr(BrTable { blocks, default }, loc);
+            ctx.alloc_instr(
+                BrTable {
+                    blocks: blocks.into(),
+                    default: default.unwrap(),
+                },
+                loc,
+            );
             ctx.unreachable();
         }
 
-        Operator::MemorySize { reserved: _ } => {
-            let memory = ctx.indices.get_memory(0).unwrap();
+        Operator::MemorySize { mem, .. } => {
+            let memory = ctx.indices.get_memory(mem).unwrap();
             ctx.alloc_instr(MemorySize { memory }, loc);
         }
-        Operator::MemoryGrow { reserved: _ } => {
-            let memory = ctx.indices.get_memory(0).unwrap();
+        Operator::MemoryGrow { mem, .. } => {
+            let memory = ctx.indices.get_memory(mem).unwrap();
             ctx.alloc_instr(MemoryGrow { memory }, loc);
         }
-        Operator::MemoryInit { segment } => {
-            let memory = ctx.indices.get_memory(0).unwrap();
+        Operator::MemoryInit { segment, mem } => {
+            let memory = ctx.indices.get_memory(mem).unwrap();
             let data = ctx.indices.get_data(segment).unwrap();
             ctx.alloc_instr(MemoryInit { memory, data }, loc);
         }
@@ -674,18 +681,13 @@
             let data = ctx.indices.get_data(segment).unwrap();
             ctx.alloc_instr(DataDrop { data }, loc);
         }
-        Operator::MemoryCopy => {
-            let memory = ctx.indices.get_memory(0).unwrap();
-            ctx.alloc_instr(
-                MemoryCopy {
-                    src: memory,
-                    dst: memory,
-                },
-                loc,
-            );
+        Operator::MemoryCopy { src, dst } => {
+            let src = ctx.indices.get_memory(src).unwrap();
+            let dst = ctx.indices.get_memory(dst).unwrap();
+            ctx.alloc_instr(MemoryCopy { src, dst }, loc);
         }
-        Operator::MemoryFill => {
-            let memory = ctx.indices.get_memory(0).unwrap();
+        Operator::MemoryFill { mem } => {
+            let memory = ctx.indices.get_memory(mem).unwrap();
             ctx.alloc_instr(MemoryFill { memory }, loc);
         }
 
@@ -929,27 +931,22 @@
         Operator::I64AtomicRmw32CmpxchgU { memarg } => {
             cmpxchg(ctx, memarg, AtomicWidth::I64_32);
         }
-        Operator::AtomicNotify { ref memarg } => {
-            let memory = ctx.indices.get_memory(0).unwrap();
-            ctx.alloc_instr(
-                AtomicNotify {
-                    memory,
-                    arg: mem_arg(memarg),
-                },
-                loc,
-            );
+        Operator::MemoryAtomicNotify { ref memarg } => {
+            let (memory, arg) = mem_arg(ctx, memarg);
+            ctx.alloc_instr(AtomicNotify { memory, arg }, loc);
         }
-        Operator::I32AtomicWait { ref memarg } | Operator::I64AtomicWait { ref memarg } => {
+        Operator::MemoryAtomicWait32 { ref memarg }
+        | Operator::MemoryAtomicWait64 { ref memarg } => {
             let sixty_four = match inst {
-                Operator::I32AtomicWait { .. } => false,
+                Operator::MemoryAtomicWait32 { .. } => false,
                 _ => true,
             };
-            let memory = ctx.indices.get_memory(0).unwrap();
+            let (memory, arg) = mem_arg(ctx, memarg);
             ctx.alloc_instr(
                 AtomicWait {
                     sixty_four,
                     memory,
-                    arg: mem_arg(memarg),
+                    arg,
                 },
                 loc,
             );
@@ -987,12 +984,12 @@
             ctx.alloc_instr(RefFunc { func }, loc);
         }
 
-        Operator::V8x16Swizzle => {
-            ctx.alloc_instr(V128Swizzle {}, loc);
+        Operator::I8x16Swizzle => {
+            ctx.alloc_instr(I8x16Swizzle {}, loc);
         }
 
-        Operator::V8x16Shuffle { lanes } => {
-            ctx.alloc_instr(V128Shuffle { indices: lanes }, loc);
+        Operator::I8x16Shuffle { lanes } => {
+            ctx.alloc_instr(I8x16Shuffle { indices: lanes }, loc);
         }
 
         Operator::I8x16Splat => unop(ctx, UnaryOp::I8x16Splat),
@@ -1046,6 +1043,12 @@
         Operator::I32x4LeU => binop(ctx, BinaryOp::I32x4LeU),
         Operator::I32x4GeS => binop(ctx, BinaryOp::I32x4GeS),
         Operator::I32x4GeU => binop(ctx, BinaryOp::I32x4GeU),
+        Operator::I64x2Eq => binop(ctx, BinaryOp::I64x2Eq),
+        Operator::I64x2Ne => binop(ctx, BinaryOp::I64x2Ne),
+        Operator::I64x2LtS => binop(ctx, BinaryOp::I64x2LtS),
+        Operator::I64x2GtS => binop(ctx, BinaryOp::I64x2GtS),
+        Operator::I64x2LeS => binop(ctx, BinaryOp::I64x2LeS),
+        Operator::I64x2GeS => binop(ctx, BinaryOp::I64x2GeS),
         Operator::F32x4Eq => binop(ctx, BinaryOp::F32x4Eq),
         Operator::F32x4Ne => binop(ctx, BinaryOp::F32x4Ne),
         Operator::F32x4Lt => binop(ctx, BinaryOp::F32x4Lt),
@@ -1060,6 +1063,7 @@
         Operator::F64x2Ge => binop(ctx, BinaryOp::F64x2Ge),
 
         Operator::V128Not => unop(ctx, UnaryOp::V128Not),
+        Operator::V128AnyTrue => unop(ctx, UnaryOp::V128AnyTrue),
         Operator::V128And => binop(ctx, BinaryOp::V128And),
         Operator::V128AndNot => binop(ctx, BinaryOp::V128AndNot),
         Operator::V128Or => binop(ctx, BinaryOp::V128Or),
@@ -1068,37 +1072,35 @@
         Operator::V128Bitselect => ctx.alloc_instr(V128Bitselect {}, loc),
 
         Operator::I8x16Abs => unop(ctx, UnaryOp::I8x16Abs),
+        Operator::I8x16Popcnt => unop(ctx, UnaryOp::I8x16Popcnt),
         Operator::I8x16Neg => unop(ctx, UnaryOp::I8x16Neg),
-        Operator::I8x16AnyTrue => unop(ctx, UnaryOp::I8x16AnyTrue),
         Operator::I8x16AllTrue => unop(ctx, UnaryOp::I8x16AllTrue),
         Operator::I8x16Shl => binop(ctx, BinaryOp::I8x16Shl),
         Operator::I8x16ShrS => binop(ctx, BinaryOp::I8x16ShrS),
         Operator::I8x16ShrU => binop(ctx, BinaryOp::I8x16ShrU),
         Operator::I8x16Add => binop(ctx, BinaryOp::I8x16Add),
-        Operator::I8x16AddSaturateS => binop(ctx, BinaryOp::I8x16AddSaturateS),
-        Operator::I8x16AddSaturateU => binop(ctx, BinaryOp::I8x16AddSaturateU),
+        Operator::I8x16AddSatS => binop(ctx, BinaryOp::I8x16AddSatS),
+        Operator::I8x16AddSatU => binop(ctx, BinaryOp::I8x16AddSatU),
         Operator::I8x16Sub => binop(ctx, BinaryOp::I8x16Sub),
-        Operator::I8x16SubSaturateS => binop(ctx, BinaryOp::I8x16SubSaturateS),
-        Operator::I8x16SubSaturateU => binop(ctx, BinaryOp::I8x16SubSaturateU),
+        Operator::I8x16SubSatS => binop(ctx, BinaryOp::I8x16SubSatS),
+        Operator::I8x16SubSatU => binop(ctx, BinaryOp::I8x16SubSatU),
 
         Operator::I16x8Abs => unop(ctx, UnaryOp::I16x8Abs),
         Operator::I16x8Neg => unop(ctx, UnaryOp::I16x8Neg),
-        Operator::I16x8AnyTrue => unop(ctx, UnaryOp::I16x8AnyTrue),
         Operator::I16x8AllTrue => unop(ctx, UnaryOp::I16x8AllTrue),
         Operator::I16x8Shl => binop(ctx, BinaryOp::I16x8Shl),
         Operator::I16x8ShrS => binop(ctx, BinaryOp::I16x8ShrS),
         Operator::I16x8ShrU => binop(ctx, BinaryOp::I16x8ShrU),
         Operator::I16x8Add => binop(ctx, BinaryOp::I16x8Add),
-        Operator::I16x8AddSaturateS => binop(ctx, BinaryOp::I16x8AddSaturateS),
-        Operator::I16x8AddSaturateU => binop(ctx, BinaryOp::I16x8AddSaturateU),
+        Operator::I16x8AddSatS => binop(ctx, BinaryOp::I16x8AddSatS),
+        Operator::I16x8AddSatU => binop(ctx, BinaryOp::I16x8AddSatU),
         Operator::I16x8Sub => binop(ctx, BinaryOp::I16x8Sub),
-        Operator::I16x8SubSaturateS => binop(ctx, BinaryOp::I16x8SubSaturateS),
-        Operator::I16x8SubSaturateU => binop(ctx, BinaryOp::I16x8SubSaturateU),
+        Operator::I16x8SubSatS => binop(ctx, BinaryOp::I16x8SubSatS),
+        Operator::I16x8SubSatU => binop(ctx, BinaryOp::I16x8SubSatU),
         Operator::I16x8Mul => binop(ctx, BinaryOp::I16x8Mul),
 
         Operator::I32x4Abs => unop(ctx, UnaryOp::I32x4Abs),
         Operator::I32x4Neg => unop(ctx, UnaryOp::I32x4Neg),
-        Operator::I32x4AnyTrue => unop(ctx, UnaryOp::I32x4AnyTrue),
         Operator::I32x4AllTrue => unop(ctx, UnaryOp::I32x4AllTrue),
         Operator::I32x4Shl => binop(ctx, BinaryOp::I32x4Shl),
         Operator::I32x4ShrS => binop(ctx, BinaryOp::I32x4ShrS),
@@ -1107,6 +1109,8 @@
         Operator::I32x4Sub => binop(ctx, BinaryOp::I32x4Sub),
         Operator::I32x4Mul => binop(ctx, BinaryOp::I32x4Mul),
 
+        Operator::I64x2Abs => unop(ctx, UnaryOp::I64x2Abs),
+        Operator::I64x2AllTrue => unop(ctx, UnaryOp::I64x2AllTrue),
         Operator::I64x2Neg => unop(ctx, UnaryOp::I64x2Neg),
         Operator::I64x2Shl => binop(ctx, BinaryOp::I64x2Shl),
         Operator::I64x2ShrS => binop(ctx, BinaryOp::I64x2ShrS),
@@ -1124,6 +1128,41 @@
         Operator::F32x4Div => binop(ctx, BinaryOp::F32x4Div),
         Operator::F32x4Min => binop(ctx, BinaryOp::F32x4Min),
         Operator::F32x4Max => binop(ctx, BinaryOp::F32x4Max),
+        Operator::F32x4Ceil => unop(ctx, UnaryOp::F32x4Ceil),
+        Operator::F32x4Floor => unop(ctx, UnaryOp::F32x4Floor),
+        Operator::F32x4Trunc => unop(ctx, UnaryOp::F32x4Trunc),
+        Operator::F32x4Nearest => unop(ctx, UnaryOp::F32x4Nearest),
+        Operator::F32x4PMin => binop(ctx, BinaryOp::F32x4PMin),
+        Operator::F32x4PMax => binop(ctx, BinaryOp::F32x4PMax),
+
+        Operator::I16x8ExtAddPairwiseI8x16S => unop(ctx, UnaryOp::I16x8ExtAddPairwiseI8x16S),
+        Operator::I16x8ExtAddPairwiseI8x16U => unop(ctx, UnaryOp::I16x8ExtAddPairwiseI8x16U),
+        Operator::I32x4ExtAddPairwiseI16x8S => unop(ctx, UnaryOp::I32x4ExtAddPairwiseI16x8S),
+        Operator::I32x4ExtAddPairwiseI16x8U => unop(ctx, UnaryOp::I32x4ExtAddPairwiseI16x8U),
+        Operator::I64x2ExtendLowI32x4S => unop(ctx, UnaryOp::I64x2ExtendLowI32x4S),
+        Operator::I64x2ExtendHighI32x4S => unop(ctx, UnaryOp::I64x2ExtendHighI32x4S),
+        Operator::I64x2ExtendLowI32x4U => unop(ctx, UnaryOp::I64x2ExtendLowI32x4U),
+        Operator::I64x2ExtendHighI32x4U => unop(ctx, UnaryOp::I64x2ExtendHighI32x4U),
+        Operator::I32x4TruncSatF64x2SZero => unop(ctx, UnaryOp::I32x4TruncSatF64x2SZero),
+        Operator::I32x4TruncSatF64x2UZero => unop(ctx, UnaryOp::I32x4TruncSatF64x2UZero),
+        Operator::F64x2ConvertLowI32x4S => unop(ctx, UnaryOp::F64x2ConvertLowI32x4S),
+        Operator::F64x2ConvertLowI32x4U => unop(ctx, UnaryOp::F64x2ConvertLowI32x4U),
+        Operator::F32x4DemoteF64x2Zero => unop(ctx, UnaryOp::F32x4DemoteF64x2Zero),
+        Operator::F64x2PromoteLowF32x4 => unop(ctx, UnaryOp::F64x2PromoteLowF32x4),
+
+        Operator::I16x8Q15MulrSatS => binop(ctx, BinaryOp::I16x8Q15MulrSatS),
+        Operator::I16x8ExtMulLowI8x16S => binop(ctx, BinaryOp::I16x8ExtMulLowI8x16S),
+        Operator::I16x8ExtMulHighI8x16S => binop(ctx, BinaryOp::I16x8ExtMulHighI8x16S),
+        Operator::I16x8ExtMulLowI8x16U => binop(ctx, BinaryOp::I16x8ExtMulLowI8x16U),
+        Operator::I16x8ExtMulHighI8x16U => binop(ctx, BinaryOp::I16x8ExtMulHighI8x16U),
+        Operator::I32x4ExtMulLowI16x8S => binop(ctx, BinaryOp::I32x4ExtMulLowI16x8S),
+        Operator::I32x4ExtMulHighI16x8S => binop(ctx, BinaryOp::I32x4ExtMulHighI16x8S),
+        Operator::I32x4ExtMulLowI16x8U => binop(ctx, BinaryOp::I32x4ExtMulLowI16x8U),
+        Operator::I32x4ExtMulHighI16x8U => binop(ctx, BinaryOp::I32x4ExtMulHighI16x8U),
+        Operator::I64x2ExtMulLowI32x4S => binop(ctx, BinaryOp::I64x2ExtMulLowI32x4S),
+        Operator::I64x2ExtMulHighI32x4S => binop(ctx, BinaryOp::I64x2ExtMulHighI32x4S),
+        Operator::I64x2ExtMulLowI32x4U => binop(ctx, BinaryOp::I64x2ExtMulLowI32x4U),
+        Operator::I64x2ExtMulHighI32x4U => binop(ctx, BinaryOp::I64x2ExtMulHighI32x4U),
 
         Operator::F64x2Abs => unop(ctx, UnaryOp::F64x2Abs),
         Operator::F64x2Neg => unop(ctx, UnaryOp::F64x2Neg),
@@ -1134,6 +1173,12 @@
         Operator::F64x2Div => binop(ctx, BinaryOp::F64x2Div),
         Operator::F64x2Min => binop(ctx, BinaryOp::F64x2Min),
         Operator::F64x2Max => binop(ctx, BinaryOp::F64x2Max),
+        Operator::F64x2Ceil => unop(ctx, UnaryOp::F64x2Ceil),
+        Operator::F64x2Floor => unop(ctx, UnaryOp::F64x2Floor),
+        Operator::F64x2Trunc => unop(ctx, UnaryOp::F64x2Trunc),
+        Operator::F64x2Nearest => unop(ctx, UnaryOp::F64x2Nearest),
+        Operator::F64x2PMin => binop(ctx, BinaryOp::F64x2PMin),
+        Operator::F64x2PMax => binop(ctx, BinaryOp::F64x2PMax),
 
         Operator::I32x4TruncSatF32x4S => unop(ctx, UnaryOp::I32x4TruncSatF32x4S),
         Operator::I32x4TruncSatF32x4U => unop(ctx, UnaryOp::I32x4TruncSatF32x4U),
@@ -1149,29 +1194,55 @@
         Operator::I64TruncSatF64S => unop(ctx, UnaryOp::I64TruncSSatF64),
         Operator::I64TruncSatF64U => unop(ctx, UnaryOp::I64TruncUSatF64),
 
-        Operator::V8x16LoadSplat { memarg } => load_simd(ctx, memarg, LoadSimdKind::Splat8),
-        Operator::V16x8LoadSplat { memarg } => load_simd(ctx, memarg, LoadSimdKind::Splat16),
-        Operator::V32x4LoadSplat { memarg } => load_simd(ctx, memarg, LoadSimdKind::Splat32),
-        Operator::V64x2LoadSplat { memarg } => load_simd(ctx, memarg, LoadSimdKind::Splat64),
+        Operator::V128Load8Splat { memarg } => load_simd(ctx, memarg, LoadSimdKind::Splat8),
+        Operator::V128Load16Splat { memarg } => load_simd(ctx, memarg, LoadSimdKind::Splat16),
+        Operator::V128Load32Splat { memarg } => load_simd(ctx, memarg, LoadSimdKind::Splat32),
+        Operator::V128Load64Splat { memarg } => load_simd(ctx, memarg, LoadSimdKind::Splat64),
+        Operator::V128Load32Zero { memarg } => load_simd(ctx, memarg, LoadSimdKind::V128Load32Zero),
+        Operator::V128Load64Zero { memarg } => load_simd(ctx, memarg, LoadSimdKind::V128Load64Zero),
 
+        Operator::V128Load8Lane { memarg, lane } => {
+            load_simd(ctx, memarg, LoadSimdKind::V128Load8Lane(lane))
+        }
+        Operator::V128Load16Lane { memarg, lane } => {
+            load_simd(ctx, memarg, LoadSimdKind::V128Load16Lane(lane))
+        }
+        Operator::V128Load32Lane { memarg, lane } => {
+            load_simd(ctx, memarg, LoadSimdKind::V128Load32Lane(lane))
+        }
+        Operator::V128Load64Lane { memarg, lane } => {
+            load_simd(ctx, memarg, LoadSimdKind::V128Load64Lane(lane))
+        }
+        Operator::V128Store8Lane { memarg, lane } => {
+            load_simd(ctx, memarg, LoadSimdKind::V128Store8Lane(lane))
+        }
+        Operator::V128Store16Lane { memarg, lane } => {
+            load_simd(ctx, memarg, LoadSimdKind::V128Store16Lane(lane))
+        }
+        Operator::V128Store32Lane { memarg, lane } => {
+            load_simd(ctx, memarg, LoadSimdKind::V128Store32Lane(lane))
+        }
+        Operator::V128Store64Lane { memarg, lane } => {
+            load_simd(ctx, memarg, LoadSimdKind::V128Store64Lane(lane))
+        }
         Operator::I8x16NarrowI16x8S => binop(ctx, BinaryOp::I8x16NarrowI16x8S),
         Operator::I8x16NarrowI16x8U => binop(ctx, BinaryOp::I8x16NarrowI16x8U),
         Operator::I16x8NarrowI32x4S => binop(ctx, BinaryOp::I16x8NarrowI32x4S),
         Operator::I16x8NarrowI32x4U => binop(ctx, BinaryOp::I16x8NarrowI32x4U),
-        Operator::I16x8WidenLowI8x16S => unop(ctx, UnaryOp::I16x8WidenLowI8x16S),
-        Operator::I16x8WidenLowI8x16U => unop(ctx, UnaryOp::I16x8WidenLowI8x16U),
-        Operator::I16x8WidenHighI8x16S => unop(ctx, UnaryOp::I16x8WidenHighI8x16S),
-        Operator::I16x8WidenHighI8x16U => unop(ctx, UnaryOp::I16x8WidenHighI8x16U),
-        Operator::I32x4WidenLowI16x8S => unop(ctx, UnaryOp::I32x4WidenLowI16x8S),
-        Operator::I32x4WidenLowI16x8U => unop(ctx, UnaryOp::I32x4WidenLowI16x8U),
-        Operator::I32x4WidenHighI16x8S => unop(ctx, UnaryOp::I32x4WidenHighI16x8S),
-        Operator::I32x4WidenHighI16x8U => unop(ctx, UnaryOp::I32x4WidenHighI16x8U),
-        Operator::I16x8Load8x8S { memarg } => load_simd(ctx, memarg, LoadSimdKind::I16x8Load8x8S),
-        Operator::I16x8Load8x8U { memarg } => load_simd(ctx, memarg, LoadSimdKind::I16x8Load8x8U),
-        Operator::I32x4Load16x4S { memarg } => load_simd(ctx, memarg, LoadSimdKind::I32x4Load16x4S),
-        Operator::I32x4Load16x4U { memarg } => load_simd(ctx, memarg, LoadSimdKind::I32x4Load16x4U),
-        Operator::I64x2Load32x2S { memarg } => load_simd(ctx, memarg, LoadSimdKind::I64x2Load32x2S),
-        Operator::I64x2Load32x2U { memarg } => load_simd(ctx, memarg, LoadSimdKind::I64x2Load32x2U),
+        Operator::I16x8ExtendLowI8x16S => unop(ctx, UnaryOp::I16x8WidenLowI8x16S),
+        Operator::I16x8ExtendLowI8x16U => unop(ctx, UnaryOp::I16x8WidenLowI8x16U),
+        Operator::I16x8ExtendHighI8x16S => unop(ctx, UnaryOp::I16x8WidenHighI8x16S),
+        Operator::I16x8ExtendHighI8x16U => unop(ctx, UnaryOp::I16x8WidenHighI8x16U),
+        Operator::I32x4ExtendLowI16x8S => unop(ctx, UnaryOp::I32x4WidenLowI16x8S),
+        Operator::I32x4ExtendLowI16x8U => unop(ctx, UnaryOp::I32x4WidenLowI16x8U),
+        Operator::I32x4ExtendHighI16x8S => unop(ctx, UnaryOp::I32x4WidenHighI16x8S),
+        Operator::I32x4ExtendHighI16x8U => unop(ctx, UnaryOp::I32x4WidenHighI16x8U),
+        Operator::V128Load8x8S { memarg } => load_simd(ctx, memarg, LoadSimdKind::V128Load8x8S),
+        Operator::V128Load8x8U { memarg } => load_simd(ctx, memarg, LoadSimdKind::V128Load8x8U),
+        Operator::V128Load16x4S { memarg } => load_simd(ctx, memarg, LoadSimdKind::V128Load16x4S),
+        Operator::V128Load16x4U { memarg } => load_simd(ctx, memarg, LoadSimdKind::V128Load16x4U),
+        Operator::V128Load32x2S { memarg } => load_simd(ctx, memarg, LoadSimdKind::V128Load32x2S),
+        Operator::V128Load32x2U { memarg } => load_simd(ctx, memarg, LoadSimdKind::V128Load32x2U),
         Operator::I8x16RoundingAverageU => binop(ctx, BinaryOp::I8x16RoundingAverageU),
         Operator::I16x8RoundingAverageU => binop(ctx, BinaryOp::I16x8RoundingAverageU),
 
@@ -1191,6 +1262,9 @@
         Operator::I8x16Bitmask => unop(ctx, UnaryOp::I8x16Bitmask),
         Operator::I16x8Bitmask => unop(ctx, UnaryOp::I16x8Bitmask),
         Operator::I32x4Bitmask => unop(ctx, UnaryOp::I32x4Bitmask),
+        Operator::I64x2Bitmask => unop(ctx, UnaryOp::I64x2Bitmask),
+
+        Operator::I32x4DotI16x8S => binop(ctx, BinaryOp::I32x4DotI16x8S),
 
         Operator::TableCopy {
             src_table,
@@ -1212,8 +1286,16 @@
             ctx.alloc_instr(ElemDrop { elem }, loc);
         }
 
-        Operator::ReturnCall { .. } | Operator::ReturnCallIndirect { .. } => {
-            unimplemented!("not supported");
+        Operator::ReturnCall { .. }
+        | Operator::ReturnCallIndirect { .. }
+        | Operator::Try { ty: _ }
+        | Operator::Catch { index: _ }
+        | Operator::Throw { index: _ }
+        | Operator::Rethrow { relative_depth: _ }
+        | Operator::Unwind
+        | Operator::Delegate { relative_depth: _ }
+        | Operator::CatchAll => {
+            unimplemented!("not supported")
         }
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/functions/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/functions/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/functions/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/functions/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 use crate::ty::TypeId;
 use crate::ty::ValType;
 use std::cmp;
-use wasmparser::{FuncValidator, FunctionBody, OperatorsReader};
+use wasmparser::{FuncValidator, FunctionBody, ValidatorResources};
 
 #[cfg(feature = "parallel")]
 use rayon::prelude::*;
@@ -323,7 +323,7 @@
     /// Add the locally defined functions in the wasm module to this instance.
     pub(crate) fn parse_local_functions(
         &mut self,
-        functions: Vec<(FunctionBody<'_>, FuncValidator, OperatorsReader<'_>)>,
+        functions: Vec<(FunctionBody<'_>, FuncValidator<ValidatorResources>)>,
         indices: &mut IndicesToIds,
         on_instr_pos: Option<&(dyn Fn(&usize) -> InstrLocId + Sync + Send + 'static)>,
     ) -> Result<()> {
@@ -335,7 +335,7 @@
         // This is pretty tough to parallelize, but we can look into it later if
         // necessary and it's a bottleneck!
         let mut bodies = Vec::with_capacity(functions.len());
-        for (i, (body, validator, ops)) in functions.into_iter().enumerate() {
+        for (i, (body, mut validator)) in functions.into_iter().enumerate() {
             let index = (num_imports + i) as u32;
             let id = indices.get_func(index)?;
             let ty = match self.funcs.arena[id].kind {
@@ -365,8 +365,12 @@
             self.types.add_entry_ty(&results);
 
             // Next up comes all the locals of the function.
-            for local in body.get_locals_reader()? {
-                let (count, ty) = local?;
+            let mut reader = body.get_binary_reader();
+            for _ in 0..reader.read_var_u32()? {
+                let pos = reader.original_position();
+                let count = reader.read_var_u32()?;
+                let ty = reader.read_type()?;
+                validator.define_locals(pos, count, ty)?;
                 let ty = ValType::parse(&ty)?;
                 for _ in 0..count {
                     let local_id = self.locals.add(ty);
@@ -378,7 +382,7 @@
                 }
             }
 
-            bodies.push((id, ops, args, ty, validator));
+            bodies.push((id, reader, args, ty, validator));
         }
 
         // Wasm modules can often have a lot of functions and this operation can
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/imports.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/imports.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/imports.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/imports.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,6 +5,7 @@
 use crate::tombstone_arena::{Id, Tombstone, TombstoneArena};
 use crate::{FunctionId, GlobalId, MemoryId, Result, TableId};
 use crate::{Module, TypeId, ValType};
+use anyhow::bail;
 
 /// The id of an import.
 pub type ImportId = Id<Import>;
@@ -136,12 +137,18 @@
                     ids.push_table(id.0);
                 }
                 wasmparser::ImportSectionEntryType::Memory(m) => {
+                    let (shared, limits) = match m {
+                        wasmparser::MemoryType::M32 { shared, limits } => (shared, limits),
+                        wasmparser::MemoryType::M64 { .. } => {
+                            bail!("64-bit memories not supported")
+                        }
+                    };
                     let id = self.add_import_memory(
                         entry.module,
                         entry.field.expect("module linking not supported"),
-                        m.shared,
-                        m.limits.initial,
-                        m.limits.maximum,
+                        shared,
+                        limits.initial,
+                        limits.maximum,
                     );
                     ids.push_memory(id.0);
                 }
@@ -158,6 +165,9 @@
                 | wasmparser::ImportSectionEntryType::Instance(_) => {
                     unimplemented!("module linking not implemented");
                 }
+                wasmparser::ImportSectionEntryType::Event(_) => {
+                    unimplemented!("exception handling not implemented")
+                }
             }
         }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/memories.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/memories.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/memories.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/memories.rs	2021-12-09 12:01:26.000000000 +0000
@@ -5,6 +5,7 @@
 use crate::parse::IndicesToIds;
 use crate::tombstone_arena::{Id, Tombstone, TombstoneArena};
 use crate::{Data, ImportId, Module, Result};
+use anyhow::bail;
 
 /// The id of a memory.
 pub type MemoryId = Id<Memory>;
@@ -133,10 +134,13 @@
     ) -> Result<()> {
         log::debug!("parse memory section");
         for m in section {
-            let m = m?;
+            let (shared, limits) = match m? {
+                wasmparser::MemoryType::M32 { shared, limits } => (shared, limits),
+                wasmparser::MemoryType::M64 { .. } => bail!("64-bit memories not supported"),
+            };
             let id = self
                 .memories
-                .add_local(m.shared, m.limits.initial, m.limits.maximum);
+                .add_local(shared, limits.initial, limits.maximum);
             ids.push_memory(id);
         }
         Ok(())
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/module/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/module/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -36,11 +36,11 @@
 pub use crate::module::tables::{ModuleTables, Table, TableId};
 pub use crate::module::types::ModuleTypes;
 use crate::parse::IndicesToIds;
-use anyhow::Context;
+use anyhow::{bail, Context};
 use std::fs;
 use std::mem;
 use std::path::Path;
-use wasmparser::{Parser, Payload, Validator};
+use wasmparser::{Parser, Payload, Validator, WasmFeatures};
 
 pub use self::config::ModuleConfig;
 
@@ -117,15 +117,15 @@
         ret.config = config.clone();
         let mut indices = IndicesToIds::default();
         let mut validator = Validator::new();
-        validator.wasm_multi_value(true);
-        if !config.only_stable_features {
-            validator
-                .wasm_reference_types(true)
-                .wasm_multi_value(true)
-                .wasm_bulk_memory(true)
-                .wasm_simd(true)
-                .wasm_threads(true);
-        }
+        validator.wasm_features(WasmFeatures {
+            reference_types: !config.only_stable_features,
+            multi_value: true,
+            bulk_memory: !config.only_stable_features,
+            simd: !config.only_stable_features,
+            threads: !config.only_stable_features,
+            multi_memory: !config.only_stable_features,
+            ..WasmFeatures::default()
+        });
 
         let mut local_functions = Vec::new();
 
@@ -200,13 +200,14 @@
                     validator.code_section_start(count, &range)?;
                 }
                 Payload::CodeSectionEntry(body) => {
-                    let (validator, ops) = validator.code_section_entry(&body)?;
-                    local_functions.push((body, validator, ops));
+                    let validator = validator.code_section_entry()?;
+                    local_functions.push((body, validator));
                 }
                 Payload::CustomSection {
                     name,
                     data,
                     data_offset,
+                    range: _range,
                 } => {
                     let result = match name {
                         "producers" => wasmparser::ProducersSectionReader::new(data, data_offset)
@@ -235,24 +236,36 @@
 
                 Payload::End => validator.end()?,
 
-                // the module linking proposal is not implemented yet
+                // the module linking proposal is not implemented yet.
                 Payload::AliasSection(s) => {
                     validator.alias_section(&s)?;
-                    unreachable!()
+                    bail!("not supported yet");
                 }
                 Payload::InstanceSection(s) => {
                     validator.instance_section(&s)?;
-                    unreachable!()
+                    bail!("not supported yet");
                 }
-                Payload::ModuleSection(s) => {
-                    validator.module_section(&s)?;
-                    unreachable!()
+                Payload::ModuleSectionEntry {
+                    parser: _,
+                    range: _,
+                } => {
+                    validator.module_section_entry();
+                    bail!("not supported yet");
                 }
-                Payload::ModuleCodeSectionStart { count, range, .. } => {
-                    validator.module_code_section_start(count, &range)?;
-                    unreachable!()
+                Payload::ModuleSectionStart {
+                    count,
+                    range,
+                    size: _,
+                } => {
+                    validator.module_section_start(count, &range)?;
+                    bail!("not supported yet");
+                }
+
+                // exception handling is not implemented yet.
+                Payload::EventSection(reader) => {
+                    validator.event_section(&reader)?;
+                    bail!("not supported yet");
                 }
-                Payload::ModuleCodeSectionEntry { .. } => unreachable!(),
             }
         }
 
@@ -266,11 +279,6 @@
         ret.producers
             .add_processed_by("walrus", env!("CARGO_PKG_VERSION"));
 
-        // TODO: probably run this in a different location
-        if !ret.config.skip_strict_validate {
-            crate::passes::validate::run(&ret)?;
-        }
-
         if let Some(on_parse) = &config.on_parse {
             on_parse(&mut ret, &indices)?;
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/passes/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/passes/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/passes/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/passes/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -2,5 +2,4 @@
 
 pub mod gc;
 mod used;
-pub mod validate;
 pub use self::used::Roots;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/passes/validate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/passes/validate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus/src/passes/validate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus/src/passes/validate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,267 +0,0 @@
-//! Validation of a wasm module
-//!
-//! Currently only does some basic sanity checks, but it's intended that
-//! eventually this is a full typechecking pass!
-
-use crate::ir::*;
-use crate::ValType;
-use crate::{ElementKind, Function, FunctionId, FunctionKind, InitExpr, Result};
-use crate::{Global, GlobalKind, Memory, MemoryId, Module, Table};
-use anyhow::{anyhow, bail, Context};
-use std::collections::HashSet;
-
-#[cfg(feature = "parallel")]
-use rayon::prelude::*;
-
-/// Validate a wasm module, returning an error if it fails to validate.
-pub fn run(module: &Module) -> Result<()> {
-    log::debug!("validating module");
-
-    if module.config.only_stable_features {
-        if module.tables.iter().count() > 1 {
-            bail!("multiple tables not allowed in the wasm spec yet");
-        }
-        if module.memories.iter().count() > 1 {
-            bail!("multiple memories not allowed in the wasm spec yet");
-        }
-    }
-
-    for memory in module.memories.iter() {
-        validate_memory(memory)?;
-    }
-    for table in module.tables.iter() {
-        validate_table(table)?;
-    }
-    let mut defined_funcs = HashSet::new();
-    for element in module.elements.iter() {
-        if let ElementKind::Declared = element.kind {
-            defined_funcs.extend(element.members.iter().cloned().filter_map(|x| x));
-        }
-    }
-    for global in module.globals.iter() {
-        validate_global(module, global, &defined_funcs)?;
-    }
-    validate_exports(module)?;
-
-    // Validate the start function, if present, has the correct signature
-    if let Some(start) = module.start {
-        let ty = module.funcs.get(start).ty();
-        let ty = module.types.get(ty);
-        if ty.results().len() > 0 || ty.params().len() > 0 {
-            bail!("start function must take no arguments and return nothing");
-        }
-    }
-
-    // Validate each function in the module, collecting errors and returning
-    // them all at once if there are any.
-    let funcs = &module.funcs;
-    let errs = maybe_parallel!(funcs.(iter | par_iter))
-        .map(|function| {
-            let mut errs = Vec::new();
-            let local = match &function.kind {
-                FunctionKind::Local(local) => local,
-                _ => return Vec::new(),
-            };
-            let mut cx = Validate {
-                errs: &mut errs,
-                function,
-                module,
-                defined_funcs: &defined_funcs,
-            };
-            dfs_in_order(&mut cx, local, local.entry_block());
-            errs
-        })
-        .collect::<Vec<_>>();
-    if errs.iter().all(|e| e.is_empty()) {
-        return Ok(());
-    }
-
-    let mut msg = format!("errors validating module:\n");
-    for error in errs.into_iter().flat_map(|v| v) {
-        msg.push_str(&format!("  * {}\n", error));
-        for cause in error.chain() {
-            msg.push_str(&format!("    * {}\n", cause));
-        }
-    }
-    bail!("{}", msg)
-}
-
-fn validate_memory(m: &Memory) -> Result<()> {
-    if m.shared && m.maximum.is_none() {
-        bail!("shared memories must have a maximum size");
-    }
-    validate_limits(m.initial, m.maximum, u32::from(u16::max_value()) + 1)
-        .context("when validating a memory")?;
-    Ok(())
-}
-
-fn validate_table(t: &Table) -> Result<()> {
-    validate_limits(t.initial, t.maximum, u32::max_value()).context("when validating a table")?;
-    Ok(())
-}
-
-fn validate_limits(initial: u32, maximum: Option<u32>, k: u32) -> Result<()> {
-    match (initial, maximum) {
-        (min, Some(max)) if max < min || max > k => {
-            bail!("invalid limits: min = {}, max = {}; k = {}", min, max, k)
-        }
-        (min, _) => {
-            if min <= k {
-                Ok(())
-            } else {
-                bail!("invalid limits: min = {}, k = {}", min, k)
-            }
-        }
-    }
-}
-
-fn validate_exports(module: &Module) -> Result<()> {
-    // All exported names must be unique, so if there's any duplicate-named
-    // exports then we generate an error
-    let mut exports = HashSet::new();
-    for export in module.exports.iter() {
-        if !exports.insert(&export.name) {
-            bail!("duplicate export of `{}`", export.name)
-        }
-    }
-    Ok(())
-}
-
-fn validate_global(
-    module: &Module,
-    global: &Global,
-    defined_funcs: &HashSet<FunctionId>,
-) -> Result<()> {
-    match global.kind {
-        GlobalKind::Import(_) => return Ok(()),
-        GlobalKind::Local(InitExpr::Value(value)) => {
-            validate_value(value, global.ty).context("invalid type on global")?;
-        }
-        GlobalKind::Local(InitExpr::Global(other)) => {
-            let other = module.globals.get(other);
-            match other.kind {
-                GlobalKind::Import(_) => {}
-                GlobalKind::Local(_) => {
-                    bail!("initializer for local global must be imported global");
-                }
-            }
-            if other.ty != global.ty {
-                bail!("locally defined global does not match type of import");
-            }
-        }
-        GlobalKind::Local(InitExpr::RefNull(ty)) => {
-            if global.ty != ty {
-                bail!("invalid type on global");
-            }
-        }
-        GlobalKind::Local(InitExpr::RefFunc(idx)) => {
-            if ValType::Funcref != global.ty {
-                bail!("invalid type on global");
-            }
-            if !defined_funcs.contains(&idx) {
-                bail!("referenced function in global not declared in element segment");
-            }
-        }
-    }
-    Ok(())
-}
-
-fn validate_value(value: Value, ty: ValType) -> Result<()> {
-    match (value, ty) {
-        (Value::I32(_), ValType::I32) => {}
-        (Value::I64(_), ValType::I64) => {}
-        (Value::F32(_), ValType::F32) => {}
-        (Value::F64(_), ValType::F64) => {}
-        (Value::V128(_), ValType::V128) => {}
-        _ => bail!("mismatched types in value"),
-    }
-    Ok(())
-}
-
-struct Validate<'a> {
-    errs: &'a mut Vec<anyhow::Error>,
-    function: &'a Function,
-    module: &'a Module,
-    defined_funcs: &'a HashSet<FunctionId>,
-}
-
-impl Validate<'_> {
-    fn memarg(&mut self, arg: &MemArg, width: u32) {
-        // The alignment of a memory operation must be less than or equal to the
-        // width of the memory operation, currently wasm doesn't allow
-        // over-aligned memory ops.
-        if arg.align > width {
-            self.err("memory operation with alignment greater than natural size");
-        }
-    }
-
-    fn require_shared(&mut self, m: MemoryId) {
-        let mem = self.module.memories.get(m);
-        if !mem.shared {
-            self.err("atomic operations require a shared memory");
-        }
-    }
-
-    fn require_atomic(&mut self, m: MemoryId, arg: &MemArg, width: u32) {
-        self.require_shared(m);
-        if arg.align != width {
-            self.err("alignment for atomics must be same as natural width");
-        }
-    }
-
-    fn err(&mut self, msg: &str) {
-        let mut err = anyhow!("{}", msg);
-        if let Some(name) = &self.function.name {
-            err = err.context(format!("in function {}", name)).into();
-        }
-        self.errs.push(err);
-    }
-}
-
-impl<'a> Visitor<'a> for Validate<'a> {
-    fn visit_load(&mut self, e: &Load) {
-        if e.kind.atomic() {
-            self.require_atomic(e.memory, &e.arg, e.kind.width());
-        } else {
-            self.memarg(&e.arg, e.kind.width());
-        }
-    }
-
-    fn visit_store(&mut self, e: &Store) {
-        if e.kind.atomic() {
-            self.require_atomic(e.memory, &e.arg, e.kind.width());
-        } else {
-            self.memarg(&e.arg, e.kind.width());
-        }
-    }
-
-    fn visit_atomic_rmw(&mut self, e: &AtomicRmw) {
-        self.require_atomic(e.memory, &e.arg, e.width.bytes());
-    }
-
-    fn visit_cmpxchg(&mut self, e: &Cmpxchg) {
-        self.require_atomic(e.memory, &e.arg, e.width.bytes());
-    }
-
-    fn visit_atomic_notify(&mut self, e: &AtomicNotify) {
-        self.require_shared(e.memory);
-        // TODO: should alignment or things be validated?
-    }
-
-    fn visit_atomic_wait(&mut self, e: &AtomicWait) {
-        let width = if e.sixty_four { 8 } else { 4 };
-        self.require_atomic(e.memory, &e.arg, width);
-    }
-
-    fn visit_global_set(&mut self, e: &GlobalSet) {
-        if !self.module.globals.get(e.global).mutable {
-            self.err("cannot mutate immutable global");
-        }
-    }
-
-    fn visit_ref_func(&mut self, e: &RefFunc) {
-        if !self.defined_funcs.contains(&e.func) {
-            self.err("referenced function not declared in element segment");
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus-macro/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus-macro/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus-macro/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus-macro/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"6aa45a62a0d11823ffb5bdeaf050d8120c41a3c69f96cc410200ed045c740ffd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"77674336af8ded214dc3ae07da631c7dd35cc8205f39298474ba98a889e57272","src/lib.rs":"cb75506693613bcc6d90c9ea0789df19cad057787169eae0215b6679cc802de6"},"package":"d7c2bb690b44cb1b0fdcc54d4998d21f8bdaf706b93775425e440b174f39ad16"}
\ No newline at end of file
+{"files":{"Cargo.toml":"f1fbae9a67f3495751c440b457ea84f4f960946c83e75f6eaaccbff53264338b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"77674336af8ded214dc3ae07da631c7dd35cc8205f39298474ba98a889e57272","src/lib.rs":"cb75506693613bcc6d90c9ea0789df19cad057787169eae0215b6679cc802de6"},"package":"0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus-macro/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus-macro/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/walrus-macro/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/walrus-macro/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "walrus-macro"
-version = "0.18.0"
+version = "0.19.0"
 authors = ["Nick Fitzgerald <fitzgen@gmail.com>"]
 description = "Internal macros used by the `walrus` crate, not for public consumption.\n"
 homepage = "https://github.com/rustwasm/walrus"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CODE_OF_CONDUCT.md":"a13aaaf393818bd91207c618724d3fb74944ca5161201822a84af951bcf655ef","CONTRIBUTING.md":"2c908a3e263dc35dfed131c02ff907cd72fafb2c2096e4ba9b1e0cbb7a1b76df","Cargo.toml":"0507b220e56fe90becc31c95576b3c42f05b6453659af34e43eaab219274a14b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"9412b3834687f28f0fae01a6e45b1309733ac92dcf04ef3ef36a823e76a6fed2","SECURITY.md":"4d75afb09dd28eb5982e3a1f768ee398d90204669ceef3240a16b31dcf04148a","src/error.rs":"96818880fab83125079842e35aacb49333ac66699e223f896699e4fdb88b99e8","src/lib.rs":"ce2e7ee6a6e4d5900f3835568b168afc70870d601b2bb94f1a6b9ddd2f046c3a","src/lib_generated.rs":"352b56bdb0f87dc18592a2241b312710c8326a415c2b3e3e7af26a8e36c2d303"},"package":"1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"}
\ No newline at end of file
+{"files":{"CODE_OF_CONDUCT.md":"a13aaaf393818bd91207c618724d3fb74944ca5161201822a84af951bcf655ef","CONTRIBUTING.md":"2c908a3e263dc35dfed131c02ff907cd72fafb2c2096e4ba9b1e0cbb7a1b76df","Cargo.toml":"946b521f577983feb92abbad62bd85932fe4fe26b7a61dcaba4030d242667885","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"c021f687a5a61d9c308581401e7aa4454585a30c418abdd02e3a1ef71daa035f","SECURITY.md":"4d75afb09dd28eb5982e3a1f768ee398d90204669ceef3240a16b31dcf04148a","src/error.rs":"270ec14e103130ac5981997ddfa616851cb596fecd48ea7212a7a59dcb110c7f","src/lib.rs":"ce2e7ee6a6e4d5900f3835568b168afc70870d601b2bb94f1a6b9ddd2f046c3a","src/lib_generated.rs":"f92f8c522904454c5909843bc2db4c34af48ca2eae8634cc77dc51d89fa5eae2"},"package":"fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 authors = ["The Cranelift Project Developers"]
 description = "Experimental WASI API bindings for Rust"
 documentation = "https://docs.rs/wasi"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -64,6 +64,24 @@
 Hello, World!
 ```
 
+# Development
+
+The bulk of the `wasi` crate is generated by the `witx-bindgen` tool, which lives at
+`crates/witx-bindgen` and is part of the cargo workspace.
+
+The `src/lib_generated.rs` file can be re-generated with the following
+command:
+
+```
+cargo run -p witx-bindgen -- crates/witx-bindgen/WASI/phases/snapshot/witx/wasi_snapshot_preview1.witx > src/lib_generated.rs
+```
+
+Note that this uses the WASI standard repository as a submodule. If you do not
+have this submodule present in your source tree, run:
+```
+git submodule update --init
+```
+
 # License
 
 This project is licensed under the Apache 2.0 license with the LLVM exception.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/src/error.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,7 +29,7 @@
         write!(
             f,
             "{} (error {})",
-            super::strerror(self.code.get()),
+            super::errno_name(self.code.get()),
             self.code
         )?;
         Ok(())
@@ -40,7 +40,8 @@
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Error")
             .field("code", &self.code)
-            .field("message", &super::strerror(self.code.get()))
+            .field("name", &super::errno_name(self.code.get()))
+            .field("message", &super::errno_docs(self.code.get()))
             .finish()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/src/lib_generated.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/src/lib_generated.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi/src/lib_generated.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi/src/lib_generated.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 // This file is automatically generated, DO NOT EDIT
 //
-// To regenerate this file run the `crates/generate-raw` command
+// To regenerate this file run the `crates/witx-bindgen` command
 
 use core::mem::MaybeUninit;
 
@@ -177,7 +177,89 @@
 pub const ERRNO_XDEV: Errno = 75;
 /// Extension: Capabilities insufficient.
 pub const ERRNO_NOTCAPABLE: Errno = 76;
-pub(crate) fn strerror(code: u16) -> &'static str {
+pub fn errno_name(code: u16) -> &'static str {
+    match code {
+        ERRNO_SUCCESS => "SUCCESS",
+        ERRNO_2BIG => "2BIG",
+        ERRNO_ACCES => "ACCES",
+        ERRNO_ADDRINUSE => "ADDRINUSE",
+        ERRNO_ADDRNOTAVAIL => "ADDRNOTAVAIL",
+        ERRNO_AFNOSUPPORT => "AFNOSUPPORT",
+        ERRNO_AGAIN => "AGAIN",
+        ERRNO_ALREADY => "ALREADY",
+        ERRNO_BADF => "BADF",
+        ERRNO_BADMSG => "BADMSG",
+        ERRNO_BUSY => "BUSY",
+        ERRNO_CANCELED => "CANCELED",
+        ERRNO_CHILD => "CHILD",
+        ERRNO_CONNABORTED => "CONNABORTED",
+        ERRNO_CONNREFUSED => "CONNREFUSED",
+        ERRNO_CONNRESET => "CONNRESET",
+        ERRNO_DEADLK => "DEADLK",
+        ERRNO_DESTADDRREQ => "DESTADDRREQ",
+        ERRNO_DOM => "DOM",
+        ERRNO_DQUOT => "DQUOT",
+        ERRNO_EXIST => "EXIST",
+        ERRNO_FAULT => "FAULT",
+        ERRNO_FBIG => "FBIG",
+        ERRNO_HOSTUNREACH => "HOSTUNREACH",
+        ERRNO_IDRM => "IDRM",
+        ERRNO_ILSEQ => "ILSEQ",
+        ERRNO_INPROGRESS => "INPROGRESS",
+        ERRNO_INTR => "INTR",
+        ERRNO_INVAL => "INVAL",
+        ERRNO_IO => "IO",
+        ERRNO_ISCONN => "ISCONN",
+        ERRNO_ISDIR => "ISDIR",
+        ERRNO_LOOP => "LOOP",
+        ERRNO_MFILE => "MFILE",
+        ERRNO_MLINK => "MLINK",
+        ERRNO_MSGSIZE => "MSGSIZE",
+        ERRNO_MULTIHOP => "MULTIHOP",
+        ERRNO_NAMETOOLONG => "NAMETOOLONG",
+        ERRNO_NETDOWN => "NETDOWN",
+        ERRNO_NETRESET => "NETRESET",
+        ERRNO_NETUNREACH => "NETUNREACH",
+        ERRNO_NFILE => "NFILE",
+        ERRNO_NOBUFS => "NOBUFS",
+        ERRNO_NODEV => "NODEV",
+        ERRNO_NOENT => "NOENT",
+        ERRNO_NOEXEC => "NOEXEC",
+        ERRNO_NOLCK => "NOLCK",
+        ERRNO_NOLINK => "NOLINK",
+        ERRNO_NOMEM => "NOMEM",
+        ERRNO_NOMSG => "NOMSG",
+        ERRNO_NOPROTOOPT => "NOPROTOOPT",
+        ERRNO_NOSPC => "NOSPC",
+        ERRNO_NOSYS => "NOSYS",
+        ERRNO_NOTCONN => "NOTCONN",
+        ERRNO_NOTDIR => "NOTDIR",
+        ERRNO_NOTEMPTY => "NOTEMPTY",
+        ERRNO_NOTRECOVERABLE => "NOTRECOVERABLE",
+        ERRNO_NOTSOCK => "NOTSOCK",
+        ERRNO_NOTSUP => "NOTSUP",
+        ERRNO_NOTTY => "NOTTY",
+        ERRNO_NXIO => "NXIO",
+        ERRNO_OVERFLOW => "OVERFLOW",
+        ERRNO_OWNERDEAD => "OWNERDEAD",
+        ERRNO_PERM => "PERM",
+        ERRNO_PIPE => "PIPE",
+        ERRNO_PROTO => "PROTO",
+        ERRNO_PROTONOSUPPORT => "PROTONOSUPPORT",
+        ERRNO_PROTOTYPE => "PROTOTYPE",
+        ERRNO_RANGE => "RANGE",
+        ERRNO_ROFS => "ROFS",
+        ERRNO_SPIPE => "SPIPE",
+        ERRNO_SRCH => "SRCH",
+        ERRNO_STALE => "STALE",
+        ERRNO_TIMEDOUT => "TIMEDOUT",
+        ERRNO_TXTBSY => "TXTBSY",
+        ERRNO_XDEV => "XDEV",
+        ERRNO_NOTCAPABLE => "NOTCAPABLE",
+        _ => "Unknown error.",
+    }
+}
+pub fn errno_docs(code: u16) -> &'static str {
     match code {
         ERRNO_SUCCESS => "No error occurred. System call completed successfully.",
         ERRNO_2BIG => "Argument list too long.",
@@ -955,7 +1037,7 @@
 /// ## Return
 ///
 /// * `nread` - The number of bytes read.
-pub unsafe fn fd_pread(fd: Fd, iovs: IovecArray, offset: Filesize) -> Result<Size> {
+pub unsafe fn fd_pread(fd: Fd, iovs: IovecArray<'_>, offset: Filesize) -> Result<Size> {
     let mut nread = MaybeUninit::uninit();
     let rc =
         wasi_snapshot_preview1::fd_pread(fd, iovs.as_ptr(), iovs.len(), offset, nread.as_mut_ptr());
@@ -1006,7 +1088,7 @@
 /// ## Return
 ///
 /// * `nwritten` - The number of bytes written.
-pub unsafe fn fd_pwrite(fd: Fd, iovs: CiovecArray, offset: Filesize) -> Result<Size> {
+pub unsafe fn fd_pwrite(fd: Fd, iovs: CiovecArray<'_>, offset: Filesize) -> Result<Size> {
     let mut nwritten = MaybeUninit::uninit();
     let rc = wasi_snapshot_preview1::fd_pwrite(
         fd,
@@ -1032,7 +1114,7 @@
 /// ## Return
 ///
 /// * `nread` - The number of bytes read.
-pub unsafe fn fd_read(fd: Fd, iovs: IovecArray) -> Result<Size> {
+pub unsafe fn fd_read(fd: Fd, iovs: IovecArray<'_>) -> Result<Size> {
     let mut nread = MaybeUninit::uninit();
     let rc = wasi_snapshot_preview1::fd_read(fd, iovs.as_ptr(), iovs.len(), nread.as_mut_ptr());
     if let Some(err) = Error::from_raw_error(rc) {
@@ -1044,8 +1126,8 @@
 
 /// Read directory entries from a directory.
 /// When successful, the contents of the output buffer consist of a sequence of
-/// directory entries. Each directory entry consists of a dirent_t object,
-/// followed by dirent_t::d_namlen bytes holding the name of the directory
+/// directory entries. Each directory entry consists of a `dirent` object,
+/// followed by `dirent::d_namlen` bytes holding the name of the directory
 /// entry.
 /// This function fills the output buffer as much as possible, potentially
 /// truncating the last directory entry. This allows the caller to grow its
@@ -1149,7 +1231,7 @@
 /// ## Return
 ///
 /// * `nwritten` - The number of bytes written.
-pub unsafe fn fd_write(fd: Fd, iovs: CiovecArray) -> Result<Size> {
+pub unsafe fn fd_write(fd: Fd, iovs: CiovecArray<'_>) -> Result<Size> {
     let mut nwritten = MaybeUninit::uninit();
     let rc = wasi_snapshot_preview1::fd_write(fd, iovs.as_ptr(), iovs.len(), nwritten.as_mut_ptr());
     if let Some(err) = Error::from_raw_error(rc) {
@@ -1298,7 +1380,7 @@
     path: &str,
     oflags: Oflags,
     fs_rights_base: Rights,
-    fs_rights_inherting: Rights,
+    fs_rights_inheriting: Rights,
     fdflags: Fdflags,
 ) -> Result<Fd> {
     let mut opened_fd = MaybeUninit::uninit();
@@ -1309,7 +1391,7 @@
         path.len(),
         oflags,
         fs_rights_base,
-        fs_rights_inherting,
+        fs_rights_inheriting,
         fdflags,
         opened_fd.as_mut_ptr(),
     );
@@ -1520,7 +1602,11 @@
 ///
 /// * `ro_datalen` - Number of bytes stored in ri_data.
 /// * `ro_flags` - Message flags.
-pub unsafe fn sock_recv(fd: Fd, ri_data: IovecArray, ri_flags: Riflags) -> Result<(Size, Roflags)> {
+pub unsafe fn sock_recv(
+    fd: Fd,
+    ri_data: IovecArray<'_>,
+    ri_flags: Riflags,
+) -> Result<(Size, Roflags)> {
     let mut ro_datalen = MaybeUninit::uninit();
     let mut ro_flags = MaybeUninit::uninit();
     let rc = wasi_snapshot_preview1::sock_recv(
@@ -1550,7 +1636,7 @@
 /// ## Return
 ///
 /// * `so_datalen` - Number of bytes transmitted.
-pub unsafe fn sock_send(fd: Fd, si_data: CiovecArray, si_flags: Siflags) -> Result<Size> {
+pub unsafe fn sock_send(fd: Fd, si_data: CiovecArray<'_>, si_flags: Siflags) -> Result<Size> {
     let mut so_datalen = MaybeUninit::uninit();
     let rc = wasi_snapshot_preview1::sock_send(
         fd,
@@ -1668,8 +1754,8 @@
         pub fn fd_read(fd: Fd, iovs_ptr: *const Iovec, iovs_len: usize, nread: *mut Size) -> Errno;
         /// Read directory entries from a directory.
         /// When successful, the contents of the output buffer consist of a sequence of
-        /// directory entries. Each directory entry consists of a dirent_t object,
-        /// followed by dirent_t::d_namlen bytes holding the name of the directory
+        /// directory entries. Each directory entry consists of a `dirent` object,
+        /// followed by `dirent::d_namlen` bytes holding the name of the directory
         /// entry.
         /// This function fills the output buffer as much as possible, potentially
         /// truncating the last directory entry. This allows the caller to grow its
@@ -1761,7 +1847,7 @@
             path_len: usize,
             oflags: Oflags,
             fs_rights_base: Rights,
-            fs_rights_inherting: Rights,
+            fs_rights_inheriting: Rights,
             fdflags: Fdflags,
             opened_fd: *mut Fd,
         ) -> Errno;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CODE_OF_CONDUCT.md":"a13aaaf393818bd91207c618724d3fb74944ca5161201822a84af951bcf655ef","CONTRIBUTING.md":"2c908a3e263dc35dfed131c02ff907cd72fafb2c2096e4ba9b1e0cbb7a1b76df","Cargo.toml":"2ecba6e9e633226bc0a26ca5dd580c97c510be660fa348cea248125d90e85bf2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"9412b3834687f28f0fae01a6e45b1309733ac92dcf04ef3ef36a823e76a6fed2","SECURITY.md":"4d75afb09dd28eb5982e3a1f768ee398d90204669ceef3240a16b31dcf04148a","old-bitflags.patch":"6a35cdbe866fbb51608195b74f0e6c0d37201ed933e473588cc2ab6211916b40","src/error.rs":"96818880fab83125079842e35aacb49333ac66699e223f896699e4fdb88b99e8","src/lib.rs":"7bfc4ffb02d1abfe25f3682affa3a50ca1e7b9d67a478a3d0f2e7788aeaab2b4","src/lib_generated.rs":"7983898c5fc69db19047cf5c3da5ed615b68859094cad8de9a3bc63d1a28de15"},"package":"cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-authors = ["The Cranelift Project Developers"]
-description = "Experimental WASI API bindings for Rust"
-documentation = "https://docs.rs/wasi"
-readme = "README.md"
-keywords = ["webassembly", "wasm"]
-categories = ["no-std", "wasm"]
-license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
-repository = "https://github.com/bytecodealliance/wasi"
-[dependencies.compiler_builtins]
-version = "0.1"
-optional = true
-
-[dependencies.core]
-version = "1.0"
-optional = true
-package = "rustc-std-workspace-core"
-
-[dependencies.rustc-std-workspace-alloc]
-version = "1.0"
-optional = true
-
-[features]
-default = ["std"]
-rustc-dep-of-std = ["compiler_builtins", "core", "rustc-std-workspace-alloc"]
-std = []
-[badges.maintenance]
-status = "experimental"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/CODE_OF_CONDUCT.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/CODE_OF_CONDUCT.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/CODE_OF_CONDUCT.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/CODE_OF_CONDUCT.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-*Note*: this Code of Conduct pertains to individuals' behavior. Please also see the [Organizational Code of Conduct][OCoC].
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Bytecode Alliance CoC team at [report@bytecodealliance.org](mailto:report@bytecodealliance.org). The CoC team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The CoC team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the Bytecode Alliance's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[OCoC]: ORG_CODE_OF_CONDUCT.md
-[homepage]: https://www.contributor-covenant.org
-[version]: https://www.contributor-covenant.org/version/1/4/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/CONTRIBUTING.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/CONTRIBUTING.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/CONTRIBUTING.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-# Contributing to wasi-core
-
-wasi-core follows the same development style as Cranelift, so checkout
-[Cranelift's CONTRIBUTING.md]. Of course, for wasi-core-specific issues, please
-use the [wasi-core issue tracker].
-
-[Cranelift's CONTRIBUTING.md]: https://github.com/CraneStation/cranelift/blob/master/CONTRIBUTING.md
-[wasi-core issue tracker]: https://github.com/CraneStation/wasi-core/issues/new
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-APACHE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-APACHE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-APACHE	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-Apache-2.0_WITH_LLVM-exception thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-Apache-2.0_WITH_LLVM-exception
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-Apache-2.0_WITH_LLVM-exception	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-Apache-2.0_WITH_LLVM-exception	1970-01-01 00:00:00.000000000 +0000
@@ -1,220 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
---- LLVM Exceptions to the Apache 2.0 License ----
-
-As an exception, if, as a result of your compiling your source code, portions
-of this Software are embedded into an Object form of such source code, you
-may redistribute such embedded portions in such Object form without complying
-with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
-
-In addition, if you combine or link compiled forms of this Software with
-software that is licensed under the GPLv2 ("Combined Software") and if a
-court of competent jurisdiction determines that the patent provision (Section
-3), the indemnity provision (Section 9) or other Section of the License
-conflicts with the conditions of the GPLv2, you may retroactively and
-prospectively choose to deem waived or otherwise exclude such Section(s) of
-the License, but only in their entirety and only with respect to the Combined
-Software.
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-MIT thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-MIT
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-MIT	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/old-bitflags.patch thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/old-bitflags.patch
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/old-bitflags.patch	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/old-bitflags.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,570 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 47ecced..ec6e7c9 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -12,6 +12,7 @@ readme = "README.md"
- documentation = "https://docs.rs/wasi"
- 
- [dependencies]
-+bitflags = "1.1.0"
- 
- [badges]
- maintenance = { status = "experimental" }
-diff --git a/src/lib.rs b/src/lib.rs
-index 42e13ea..03d3d19 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -13,4 +13,7 @@
- )]
- #![no_std]
- 
-+#[macro_use]
-+extern crate bitflags;
-+
- pub mod wasi_unstable;
-diff --git a/src/wasi_unstable/mod.rs b/src/wasi_unstable/mod.rs
-index 4703cc9..b3fd897 100644
---- a/src/wasi_unstable/mod.rs
-+++ b/src/wasi_unstable/mod.rs
-@@ -19,27 +19,18 @@ pub type Clockid = __wasi_clockid_t;
- pub type Device = __wasi_device_t;
- pub type Dircookie = __wasi_dircookie_t;
- pub type Errno = __wasi_errno_t;
--pub type Eventrwflags = __wasi_eventrwflags_t;
- pub type Eventtype = __wasi_eventtype_t;
- pub type Exitcode = __wasi_exitcode_t;
- pub type Fd = __wasi_fd_t;
--pub type Fdflags = __wasi_fdflags_t;
- pub type Filedelta = __wasi_filedelta_t;
- pub type Filesize = __wasi_filesize_t;
- pub type Filetype = __wasi_filetype_t;
--pub type Fstflags = __wasi_fstflags_t;
- pub type Inode = __wasi_inode_t;
- pub type Linkcount = __wasi_linkcount_t;
--pub type Lookupflags = __wasi_lookupflags_t;
--pub type Oflags = __wasi_oflags_t;
- pub type Preopentype = __wasi_preopentype_t;
--pub type Riflags = __wasi_riflags_t;
--pub type Rights = __wasi_rights_t;
- pub type Roflags = __wasi_roflags_t;
--pub type Sdflags = __wasi_sdflags_t;
- pub type Siflags = __wasi_siflags_t;
- pub type Signal = __wasi_signal_t;
--pub type Subclockflags = __wasi_subclockflags_t;
- pub type Timestamp = __wasi_timestamp_t;
- pub type Userdata = __wasi_userdata_t;
- pub type Whence = __wasi_whence_t;
-@@ -52,189 +43,231 @@ pub type Subscription = __wasi_subscription_t;
- pub type Event = __wasi_event_t;
- pub type Prestat = __wasi_prestat_t;
- 
--pub const ADVICE_NORMAL: u8 = __WASI_ADVICE_NORMAL;
--pub const ADVICE_SEQUENTIAL: u8 = __WASI_ADVICE_SEQUENTIAL;
--pub const ADVICE_RANDOM: u8 = __WASI_ADVICE_RANDOM;
--pub const ADVICE_WILLNEED: u8 = __WASI_ADVICE_WILLNEED;
--pub const ADVICE_DONTNEED: u8 = __WASI_ADVICE_DONTNEED;
--pub const ADVICE_NOREUSE: u8 = __WASI_ADVICE_NOREUSE;
--pub const CLOCK_REALTIME: u32 = __WASI_CLOCK_REALTIME;
--pub const CLOCK_MONOTONIC: u32 = __WASI_CLOCK_MONOTONIC;
--pub const CLOCK_PROCESS_CPUTIME_ID: u32 = __WASI_CLOCK_PROCESS_CPUTIME_ID;
--pub const CLOCK_THREAD_CPUTIME_ID: u32 = __WASI_CLOCK_THREAD_CPUTIME_ID;
--pub const DIRCOOKIE_START: u64 = __WASI_DIRCOOKIE_START;
--pub const ESUCCESS: u16 = __WASI_ESUCCESS;
--pub const E2BIG: u16 = __WASI_E2BIG;
--pub const EACCES: u16 = __WASI_EACCES;
--pub const EADDRINUSE: u16 = __WASI_EADDRINUSE;
--pub const EADDRNOTAVAIL: u16 = __WASI_EADDRNOTAVAIL;
--pub const EAFNOSUPPORT: u16 = __WASI_EAFNOSUPPORT;
--pub const EAGAIN: u16 = __WASI_EAGAIN;
--pub const EALREADY: u16 = __WASI_EALREADY;
--pub const EBADF: u16 = __WASI_EBADF;
--pub const EBADMSG: u16 = __WASI_EBADMSG;
--pub const EBUSY: u16 = __WASI_EBUSY;
--pub const ECANCELED: u16 = __WASI_ECANCELED;
--pub const ECHILD: u16 = __WASI_ECHILD;
--pub const ECONNABORTED: u16 = __WASI_ECONNABORTED;
--pub const ECONNREFUSED: u16 = __WASI_ECONNREFUSED;
--pub const ECONNRESET: u16 = __WASI_ECONNRESET;
--pub const EDEADLK: u16 = __WASI_EDEADLK;
--pub const EDESTADDRREQ: u16 = __WASI_EDESTADDRREQ;
--pub const EDOM: u16 = __WASI_EDOM;
--pub const EDQUOT: u16 = __WASI_EDQUOT;
--pub const EEXIST: u16 = __WASI_EEXIST;
--pub const EFAULT: u16 = __WASI_EFAULT;
--pub const EFBIG: u16 = __WASI_EFBIG;
--pub const EHOSTUNREACH: u16 = __WASI_EHOSTUNREACH;
--pub const EIDRM: u16 = __WASI_EIDRM;
--pub const EILSEQ: u16 = __WASI_EILSEQ;
--pub const EINPROGRESS: u16 = __WASI_EINPROGRESS;
--pub const EINTR: u16 = __WASI_EINTR;
--pub const EINVAL: u16 = __WASI_EINVAL;
--pub const EIO: u16 = __WASI_EIO;
--pub const EISCONN: u16 = __WASI_EISCONN;
--pub const EISDIR: u16 = __WASI_EISDIR;
--pub const ELOOP: u16 = __WASI_ELOOP;
--pub const EMFILE: u16 = __WASI_EMFILE;
--pub const EMLINK: u16 = __WASI_EMLINK;
--pub const EMSGSIZE: u16 = __WASI_EMSGSIZE;
--pub const EMULTIHOP: u16 = __WASI_EMULTIHOP;
--pub const ENAMETOOLONG: u16 = __WASI_ENAMETOOLONG;
--pub const ENETDOWN: u16 = __WASI_ENETDOWN;
--pub const ENETRESET: u16 = __WASI_ENETRESET;
--pub const ENETUNREACH: u16 = __WASI_ENETUNREACH;
--pub const ENFILE: u16 = __WASI_ENFILE;
--pub const ENOBUFS: u16 = __WASI_ENOBUFS;
--pub const ENODEV: u16 = __WASI_ENODEV;
--pub const ENOENT: u16 = __WASI_ENOENT;
--pub const ENOEXEC: u16 = __WASI_ENOEXEC;
--pub const ENOLCK: u16 = __WASI_ENOLCK;
--pub const ENOLINK: u16 = __WASI_ENOLINK;
--pub const ENOMEM: u16 = __WASI_ENOMEM;
--pub const ENOMSG: u16 = __WASI_ENOMSG;
--pub const ENOPROTOOPT: u16 = __WASI_ENOPROTOOPT;
--pub const ENOSPC: u16 = __WASI_ENOSPC;
--pub const ENOSYS: u16 = __WASI_ENOSYS;
--pub const ENOTCONN: u16 = __WASI_ENOTCONN;
--pub const ENOTDIR: u16 = __WASI_ENOTDIR;
--pub const ENOTEMPTY: u16 = __WASI_ENOTEMPTY;
--pub const ENOTRECOVERABLE: u16 = __WASI_ENOTRECOVERABLE;
--pub const ENOTSOCK: u16 = __WASI_ENOTSOCK;
--pub const ENOTSUP: u16 = __WASI_ENOTSUP;
--pub const ENOTTY: u16 = __WASI_ENOTTY;
--pub const ENXIO: u16 = __WASI_ENXIO;
--pub const EOVERFLOW: u16 = __WASI_EOVERFLOW;
--pub const EOWNERDEAD: u16 = __WASI_EOWNERDEAD;
--pub const EPERM: u16 = __WASI_EPERM;
--pub const EPIPE: u16 = __WASI_EPIPE;
--pub const EPROTO: u16 = __WASI_EPROTO;
--pub const EPROTONOSUPPORT: u16 = __WASI_EPROTONOSUPPORT;
--pub const EPROTOTYPE: u16 = __WASI_EPROTOTYPE;
--pub const ERANGE: u16 = __WASI_ERANGE;
--pub const EROFS: u16 = __WASI_EROFS;
--pub const ESPIPE: u16 = __WASI_ESPIPE;
--pub const ESRCH: u16 = __WASI_ESRCH;
--pub const ESTALE: u16 = __WASI_ESTALE;
--pub const ETIMEDOUT: u16 = __WASI_ETIMEDOUT;
--pub const ETXTBSY: u16 = __WASI_ETXTBSY;
--pub const EXDEV: u16 = __WASI_EXDEV;
--pub const ENOTCAPABLE: u16 = __WASI_ENOTCAPABLE;
--pub const EVENT_FD_READWRITE_HANGUP: u16 = __WASI_EVENT_FD_READWRITE_HANGUP;
--pub const EVENTTYPE_CLOCK: u8 = __WASI_EVENTTYPE_CLOCK;
--pub const EVENTTYPE_FD_READ: u8 = __WASI_EVENTTYPE_FD_READ;
--pub const EVENTTYPE_FD_WRITE: u8 = __WASI_EVENTTYPE_FD_WRITE;
--pub const FDFLAG_APPEND: u16 = __WASI_FDFLAG_APPEND;
--pub const FDFLAG_DSYNC: u16 = __WASI_FDFLAG_DSYNC;
--pub const FDFLAG_NONBLOCK: u16 = __WASI_FDFLAG_NONBLOCK;
--pub const FDFLAG_RSYNC: u16 = __WASI_FDFLAG_RSYNC;
--pub const FDFLAG_SYNC: u16 = __WASI_FDFLAG_SYNC;
--pub const FILETYPE_UNKNOWN: u8 = __WASI_FILETYPE_UNKNOWN;
--pub const FILETYPE_BLOCK_DEVICE: u8 = __WASI_FILETYPE_BLOCK_DEVICE;
--pub const FILETYPE_CHARACTER_DEVICE: u8 = __WASI_FILETYPE_CHARACTER_DEVICE;
--pub const FILETYPE_DIRECTORY: u8 = __WASI_FILETYPE_DIRECTORY;
--pub const FILETYPE_REGULAR_FILE: u8 = __WASI_FILETYPE_REGULAR_FILE;
--pub const FILETYPE_SOCKET_DGRAM: u8 = __WASI_FILETYPE_SOCKET_DGRAM;
--pub const FILETYPE_SOCKET_STREAM: u8 = __WASI_FILETYPE_SOCKET_STREAM;
--pub const FILETYPE_SYMBOLIC_LINK: u8 = __WASI_FILETYPE_SYMBOLIC_LINK;
--pub const FILESTAT_SET_ATIM: u16 = __WASI_FILESTAT_SET_ATIM;
--pub const FILESTAT_SET_ATIM_NOW: u16 = __WASI_FILESTAT_SET_ATIM_NOW;
--pub const FILESTAT_SET_MTIM: u16 = __WASI_FILESTAT_SET_MTIM;
--pub const FILESTAT_SET_MTIM_NOW: u16 = __WASI_FILESTAT_SET_MTIM_NOW;
--pub const LOOKUP_SYMLINK_FOLLOW: u32 = __WASI_LOOKUP_SYMLINK_FOLLOW;
--pub const O_CREAT: u16 = __WASI_O_CREAT;
--pub const O_DIRECTORY: u16 = __WASI_O_DIRECTORY;
--pub const O_EXCL: u16 = __WASI_O_EXCL;
--pub const O_TRUNC: u16 = __WASI_O_TRUNC;
--pub const PREOPENTYPE_DIR: u8 = __WASI_PREOPENTYPE_DIR;
--pub const SOCK_RECV_PEEK: u16 = __WASI_SOCK_RECV_PEEK;
--pub const SOCK_RECV_WAITALL: u16 = __WASI_SOCK_RECV_WAITALL;
--pub const RIGHT_FD_DATASYNC: u64 = __WASI_RIGHT_FD_DATASYNC;
--pub const RIGHT_FD_READ: u64 = __WASI_RIGHT_FD_READ;
--pub const RIGHT_FD_SEEK: u64 = __WASI_RIGHT_FD_SEEK;
--pub const RIGHT_FD_FDSTAT_SET_FLAGS: u64 = __WASI_RIGHT_FD_FDSTAT_SET_FLAGS;
--pub const RIGHT_FD_SYNC: u64 = __WASI_RIGHT_FD_SYNC;
--pub const RIGHT_FD_TELL: u64 = __WASI_RIGHT_FD_TELL;
--pub const RIGHT_FD_WRITE: u64 = __WASI_RIGHT_FD_WRITE;
--pub const RIGHT_FD_ADVISE: u64 = __WASI_RIGHT_FD_ADVISE;
--pub const RIGHT_FD_ALLOCATE: u64 = __WASI_RIGHT_FD_ALLOCATE;
--pub const RIGHT_PATH_CREATE_DIRECTORY: u64 = __WASI_RIGHT_PATH_CREATE_DIRECTORY;
--pub const RIGHT_PATH_CREATE_FILE: u64 = __WASI_RIGHT_PATH_CREATE_FILE;
--pub const RIGHT_PATH_LINK_SOURCE: u64 = __WASI_RIGHT_PATH_LINK_SOURCE;
--pub const RIGHT_PATH_LINK_TARGET: u64 = __WASI_RIGHT_PATH_LINK_TARGET;
--pub const RIGHT_PATH_OPEN: u64 = __WASI_RIGHT_PATH_OPEN;
--pub const RIGHT_FD_READDIR: u64 = __WASI_RIGHT_FD_READDIR;
--pub const RIGHT_PATH_READLINK: u64 = __WASI_RIGHT_PATH_READLINK;
--pub const RIGHT_PATH_RENAME_SOURCE: u64 = __WASI_RIGHT_PATH_RENAME_SOURCE;
--pub const RIGHT_PATH_RENAME_TARGET: u64 = __WASI_RIGHT_PATH_RENAME_TARGET;
--pub const RIGHT_PATH_FILESTAT_GET: u64 = __WASI_RIGHT_PATH_FILESTAT_GET;
--pub const RIGHT_PATH_FILESTAT_SET_SIZE: u64 = __WASI_RIGHT_PATH_FILESTAT_SET_SIZE;
--pub const RIGHT_PATH_FILESTAT_SET_TIMES: u64 = __WASI_RIGHT_PATH_FILESTAT_SET_TIMES;
--pub const RIGHT_FD_FILESTAT_GET: u64 = __WASI_RIGHT_FD_FILESTAT_GET;
--pub const RIGHT_FD_FILESTAT_SET_SIZE: u64 = __WASI_RIGHT_FD_FILESTAT_SET_SIZE;
--pub const RIGHT_FD_FILESTAT_SET_TIMES: u64 = __WASI_RIGHT_FD_FILESTAT_SET_TIMES;
--pub const RIGHT_PATH_SYMLINK: u64 = __WASI_RIGHT_PATH_SYMLINK;
--pub const RIGHT_PATH_REMOVE_DIRECTORY: u64 = __WASI_RIGHT_PATH_REMOVE_DIRECTORY;
--pub const RIGHT_PATH_UNLINK_FILE: u64 = __WASI_RIGHT_PATH_UNLINK_FILE;
--pub const RIGHT_POLL_FD_READWRITE: u64 = __WASI_RIGHT_POLL_FD_READWRITE;
--pub const RIGHT_SOCK_SHUTDOWN: u64 = __WASI_RIGHT_SOCK_SHUTDOWN;
--pub const SOCK_RECV_DATA_TRUNCATED: u16 = __WASI_SOCK_RECV_DATA_TRUNCATED;
--pub const SHUT_RD: u8 = __WASI_SHUT_RD;
--pub const SHUT_WR: u8 = __WASI_SHUT_WR;
--pub const SIGHUP: u8 = __WASI_SIGHUP;
--pub const SIGINT: u8 = __WASI_SIGINT;
--pub const SIGQUIT: u8 = __WASI_SIGQUIT;
--pub const SIGILL: u8 = __WASI_SIGILL;
--pub const SIGTRAP: u8 = __WASI_SIGTRAP;
--pub const SIGABRT: u8 = __WASI_SIGABRT;
--pub const SIGBUS: u8 = __WASI_SIGBUS;
--pub const SIGFPE: u8 = __WASI_SIGFPE;
--pub const SIGKILL: u8 = __WASI_SIGKILL;
--pub const SIGUSR1: u8 = __WASI_SIGUSR1;
--pub const SIGSEGV: u8 = __WASI_SIGSEGV;
--pub const SIGUSR2: u8 = __WASI_SIGUSR2;
--pub const SIGPIPE: u8 = __WASI_SIGPIPE;
--pub const SIGALRM: u8 = __WASI_SIGALRM;
--pub const SIGTERM: u8 = __WASI_SIGTERM;
--pub const SIGCHLD: u8 = __WASI_SIGCHLD;
--pub const SIGCONT: u8 = __WASI_SIGCONT;
--pub const SIGSTOP: u8 = __WASI_SIGSTOP;
--pub const SIGTSTP: u8 = __WASI_SIGTSTP;
--pub const SIGTTIN: u8 = __WASI_SIGTTIN;
--pub const SIGTTOU: u8 = __WASI_SIGTTOU;
--pub const SIGURG: u8 = __WASI_SIGURG;
--pub const SIGXCPU: u8 = __WASI_SIGXCPU;
--pub const SIGXFSZ: u8 = __WASI_SIGXFSZ;
--pub const SIGVTALRM: u8 = __WASI_SIGVTALRM;
--pub const SIGPROF: u8 = __WASI_SIGPROF;
--pub const SIGWINCH: u8 = __WASI_SIGWINCH;
--pub const SIGPOLL: u8 = __WASI_SIGPOLL;
--pub const SIGPWR: u8 = __WASI_SIGPWR;
--pub const SIGSYS: u8 = __WASI_SIGSYS;
--pub const SUBSCRIPTION_CLOCK_ABSTIME: u16 = __WASI_SUBSCRIPTION_CLOCK_ABSTIME;
--pub const WHENCE_CUR: u8 = __WASI_WHENCE_CUR;
--pub const WHENCE_END: u8 = __WASI_WHENCE_END;
--pub const WHENCE_SET: u8 = __WASI_WHENCE_SET;
-+pub const ADVICE_NORMAL: Advice = __WASI_ADVICE_NORMAL;
-+pub const ADVICE_SEQUENTIAL: Advice = __WASI_ADVICE_SEQUENTIAL;
-+pub const ADVICE_RANDOM: Advice = __WASI_ADVICE_RANDOM;
-+pub const ADVICE_WILLNEED: Advice = __WASI_ADVICE_WILLNEED;
-+pub const ADVICE_DONTNEED: Advice = __WASI_ADVICE_DONTNEED;
-+pub const ADVICE_NOREUSE: Advice = __WASI_ADVICE_NOREUSE;
-+pub const CLOCK_REALTIME: Clockid = __WASI_CLOCK_REALTIME;
-+pub const CLOCK_MONOTONIC: Clockid = __WASI_CLOCK_MONOTONIC;
-+pub const CLOCK_PROCESS_CPUTIME_ID: Clockid = __WASI_CLOCK_PROCESS_CPUTIME_ID;
-+pub const CLOCK_THREAD_CPUTIME_ID: Clockid = __WASI_CLOCK_THREAD_CPUTIME_ID;
-+pub const DIRCOOKIE_START: Dircookie = __WASI_DIRCOOKIE_START;
-+pub const ESUCCESS: Errno = __WASI_ESUCCESS;
-+pub const E2BIG: Errno = __WASI_E2BIG;
-+pub const EACCES: Errno = __WASI_EACCES;
-+pub const EADDRINUSE: Errno = __WASI_EADDRINUSE;
-+pub const EADDRNOTAVAIL: Errno = __WASI_EADDRNOTAVAIL;
-+pub const EAFNOSUPPORT: Errno = __WASI_EAFNOSUPPORT;
-+pub const EAGAIN: Errno = __WASI_EAGAIN;
-+pub const EALREADY: Errno = __WASI_EALREADY;
-+pub const EBADF: Errno = __WASI_EBADF;
-+pub const EBADMSG: Errno = __WASI_EBADMSG;
-+pub const EBUSY: Errno = __WASI_EBUSY;
-+pub const ECANCELED: Errno = __WASI_ECANCELED;
-+pub const ECHILD: Errno = __WASI_ECHILD;
-+pub const ECONNABORTED: Errno = __WASI_ECONNABORTED;
-+pub const ECONNREFUSED: Errno = __WASI_ECONNREFUSED;
-+pub const ECONNRESET: Errno = __WASI_ECONNRESET;
-+pub const EDEADLK: Errno = __WASI_EDEADLK;
-+pub const EDESTADDRREQ: Errno = __WASI_EDESTADDRREQ;
-+pub const EDOM: Errno = __WASI_EDOM;
-+pub const EDQUOT: Errno = __WASI_EDQUOT;
-+pub const EEXIST: Errno = __WASI_EEXIST;
-+pub const EFAULT: Errno = __WASI_EFAULT;
-+pub const EFBIG: Errno = __WASI_EFBIG;
-+pub const EHOSTUNREACH: Errno = __WASI_EHOSTUNREACH;
-+pub const EIDRM: Errno = __WASI_EIDRM;
-+pub const EILSEQ: Errno = __WASI_EILSEQ;
-+pub const EINPROGRESS: Errno = __WASI_EINPROGRESS;
-+pub const EINTR: Errno = __WASI_EINTR;
-+pub const EINVAL: Errno = __WASI_EINVAL;
-+pub const EIO: Errno = __WASI_EIO;
-+pub const EISCONN: Errno = __WASI_EISCONN;
-+pub const EISDIR: Errno = __WASI_EISDIR;
-+pub const ELOOP: Errno = __WASI_ELOOP;
-+pub const EMFILE: Errno = __WASI_EMFILE;
-+pub const EMLINK: Errno = __WASI_EMLINK;
-+pub const EMSGSIZE: Errno = __WASI_EMSGSIZE;
-+pub const EMULTIHOP: Errno = __WASI_EMULTIHOP;
-+pub const ENAMETOOLONG: Errno = __WASI_ENAMETOOLONG;
-+pub const ENETDOWN: Errno = __WASI_ENETDOWN;
-+pub const ENETRESET: Errno = __WASI_ENETRESET;
-+pub const ENETUNREACH: Errno = __WASI_ENETUNREACH;
-+pub const ENFILE: Errno = __WASI_ENFILE;
-+pub const ENOBUFS: Errno = __WASI_ENOBUFS;
-+pub const ENODEV: Errno = __WASI_ENODEV;
-+pub const ENOENT: Errno = __WASI_ENOENT;
-+pub const ENOEXEC: Errno = __WASI_ENOEXEC;
-+pub const ENOLCK: Errno = __WASI_ENOLCK;
-+pub const ENOLINK: Errno = __WASI_ENOLINK;
-+pub const ENOMEM: Errno = __WASI_ENOMEM;
-+pub const ENOMSG: Errno = __WASI_ENOMSG;
-+pub const ENOPROTOOPT: Errno = __WASI_ENOPROTOOPT;
-+pub const ENOSPC: Errno = __WASI_ENOSPC;
-+pub const ENOSYS: Errno = __WASI_ENOSYS;
-+pub const ENOTCONN: Errno = __WASI_ENOTCONN;
-+pub const ENOTDIR: Errno = __WASI_ENOTDIR;
-+pub const ENOTEMPTY: Errno = __WASI_ENOTEMPTY;
-+pub const ENOTRECOVERABLE: Errno = __WASI_ENOTRECOVERABLE;
-+pub const ENOTSOCK: Errno = __WASI_ENOTSOCK;
-+pub const ENOTSUP: Errno = __WASI_ENOTSUP;
-+pub const ENOTTY: Errno = __WASI_ENOTTY;
-+pub const ENXIO: Errno = __WASI_ENXIO;
-+pub const EOVERFLOW: Errno = __WASI_EOVERFLOW;
-+pub const EOWNERDEAD: Errno = __WASI_EOWNERDEAD;
-+pub const EPERM: Errno = __WASI_EPERM;
-+pub const EPIPE: Errno = __WASI_EPIPE;
-+pub const EPROTO: Errno = __WASI_EPROTO;
-+pub const EPROTONOSUPPORT: Errno = __WASI_EPROTONOSUPPORT;
-+pub const EPROTOTYPE: Errno = __WASI_EPROTOTYPE;
-+pub const ERANGE: Errno = __WASI_ERANGE;
-+pub const EROFS: Errno = __WASI_EROFS;
-+pub const ESPIPE: Errno = __WASI_ESPIPE;
-+pub const ESRCH: Errno = __WASI_ESRCH;
-+pub const ESTALE: Errno = __WASI_ESTALE;
-+pub const ETIMEDOUT: Errno = __WASI_ETIMEDOUT;
-+pub const ETXTBSY: Errno = __WASI_ETXTBSY;
-+pub const EXDEV: Errno = __WASI_EXDEV;
-+pub const ENOTCAPABLE: Errno = __WASI_ENOTCAPABLE;
-+pub const EVENTTYPE_CLOCK: Eventtype = __WASI_EVENTTYPE_CLOCK;
-+pub const EVENTTYPE_FD_READ: Eventtype = __WASI_EVENTTYPE_FD_READ;
-+pub const EVENTTYPE_FD_WRITE: Eventtype = __WASI_EVENTTYPE_FD_WRITE;
-+pub const FILETYPE_UNKNOWN: Filetype = __WASI_FILETYPE_UNKNOWN;
-+pub const FILETYPE_BLOCK_DEVICE: Filetype = __WASI_FILETYPE_BLOCK_DEVICE;
-+pub const FILETYPE_CHARACTER_DEVICE: Filetype = __WASI_FILETYPE_CHARACTER_DEVICE;
-+pub const FILETYPE_DIRECTORY: Filetype = __WASI_FILETYPE_DIRECTORY;
-+pub const FILETYPE_REGULAR_FILE: Filetype = __WASI_FILETYPE_REGULAR_FILE;
-+pub const FILETYPE_SOCKET_DGRAM: Filetype = __WASI_FILETYPE_SOCKET_DGRAM;
-+pub const FILETYPE_SOCKET_STREAM: Filetype = __WASI_FILETYPE_SOCKET_STREAM;
-+pub const FILETYPE_SYMBOLIC_LINK: Filetype = __WASI_FILETYPE_SYMBOLIC_LINK;
-+pub const PREOPENTYPE_DIR: Preopentype = __WASI_PREOPENTYPE_DIR;
-+pub const SIGHUP: Signal = __WASI_SIGHUP;
-+pub const SIGINT: Signal = __WASI_SIGINT;
-+pub const SIGQUIT: Signal = __WASI_SIGQUIT;
-+pub const SIGILL: Signal = __WASI_SIGILL;
-+pub const SIGTRAP: Signal = __WASI_SIGTRAP;
-+pub const SIGABRT: Signal = __WASI_SIGABRT;
-+pub const SIGBUS: Signal = __WASI_SIGBUS;
-+pub const SIGFPE: Signal = __WASI_SIGFPE;
-+pub const SIGKILL: Signal = __WASI_SIGKILL;
-+pub const SIGUSR1: Signal = __WASI_SIGUSR1;
-+pub const SIGSEGV: Signal = __WASI_SIGSEGV;
-+pub const SIGUSR2: Signal = __WASI_SIGUSR2;
-+pub const SIGPIPE: Signal = __WASI_SIGPIPE;
-+pub const SIGALRM: Signal = __WASI_SIGALRM;
-+pub const SIGTERM: Signal = __WASI_SIGTERM;
-+pub const SIGCHLD: Signal = __WASI_SIGCHLD;
-+pub const SIGCONT: Signal = __WASI_SIGCONT;
-+pub const SIGSTOP: Signal = __WASI_SIGSTOP;
-+pub const SIGTSTP: Signal = __WASI_SIGTSTP;
-+pub const SIGTTIN: Signal = __WASI_SIGTTIN;
-+pub const SIGTTOU: Signal = __WASI_SIGTTOU;
-+pub const SIGURG: Signal = __WASI_SIGURG;
-+pub const SIGXCPU: Signal = __WASI_SIGXCPU;
-+pub const SIGXFSZ: Signal = __WASI_SIGXFSZ;
-+pub const SIGVTALRM: Signal = __WASI_SIGVTALRM;
-+pub const SIGPROF: Signal = __WASI_SIGPROF;
-+pub const SIGWINCH: Signal = __WASI_SIGWINCH;
-+pub const SIGPOLL: Signal = __WASI_SIGPOLL;
-+pub const SIGPWR: Signal = __WASI_SIGPWR;
-+pub const SIGSYS: Signal = __WASI_SIGSYS;
-+pub const SOCK_RECV_DATA_TRUNCATED: Roflags = __WASI_SOCK_RECV_DATA_TRUNCATED;
-+
-+bitflags! {
-+    pub struct Sdflags: __wasi_sdflags_t {
-+        const SHUT_RD = __WASI_SHUT_RD;
-+        const SHUT_WR = __WASI_SHUT_WR;
-+    }
-+}
-+
-+bitflags! {
-+    pub struct Riflags: __wasi_riflags_t {
-+        const PEEK = __WASI_SOCK_RECV_PEEK;
-+        const WAITALL = __WASI_SOCK_RECV_WAITALL;
-+    }
-+}
-+
-+bitflags! {
-+    pub struct Eventrwflags: __wasi_eventrwflags_t {
-+        const FD_READWRITE_HANGUP = __WASI_EVENT_FD_READWRITE_HANGUP;
-+    }
-+}
-+
-+bitflags! {
-+    pub struct Subclockflags: __wasi_subclockflags_t {
-+        const SUBSCRIPTION_CLOCK_ABSTIME = __WASI_SUBSCRIPTION_CLOCK_ABSTIME;
-+    }
-+}
-+
-+bitflags! {
-+    pub struct Oflags: __wasi_oflags_t {
-+        const CREAT = __WASI_O_CREAT;
-+        const DIRECTORY = __WASI_O_DIRECTORY;
-+        const EXCL = __WASI_O_EXCL;
-+        const TRUNC = __WASI_O_TRUNC;
-+    }
-+}
-+
-+bitflags! {
-+    pub struct Fdflags: __wasi_fdflags_t {
-+        const APPEND = __WASI_FDFLAG_APPEND;
-+        const DSYNC = __WASI_FDFLAG_DSYNC;
-+        const NONBLOCK = __WASI_FDFLAG_NONBLOCK;
-+        const RSYNC = __WASI_FDFLAG_RSYNC;
-+        const SYNC = __WASI_FDFLAG_SYNC;
-+    }
-+}
-+
-+bitflags! {
-+    pub struct Lookupflags: __wasi_lookupflags_t {
-+        const SYMLINK_FOLLOW = __WASI_LOOKUP_SYMLINK_FOLLOW;
-+    }
-+}
-+
-+bitflags! {
-+    pub struct Rights: __wasi_rights_t {
-+        const FD_DATASYNC = __WASI_RIGHT_FD_DATASYNC;
-+        const FD_READ = __WASI_RIGHT_FD_READ;
-+        const FD_SEEK = __WASI_RIGHT_FD_SEEK;
-+        const FD_FDSTAT_SET_FLAGS = __WASI_RIGHT_FD_FDSTAT_SET_FLAGS;
-+        const FD_SYNC = __WASI_RIGHT_FD_SYNC;
-+        const FD_TELL = __WASI_RIGHT_FD_TELL;
-+        const FD_WRITE = __WASI_RIGHT_FD_WRITE;
-+        const FD_ADVISE = __WASI_RIGHT_FD_ADVISE;
-+        const FD_ALLOCATE = __WASI_RIGHT_FD_ALLOCATE;
-+        const PATH_CREATE_DIRECTORY = __WASI_RIGHT_PATH_CREATE_DIRECTORY;
-+        const PATH_CREATE_FILE = __WASI_RIGHT_PATH_CREATE_FILE;
-+        const PATH_LINK_SOURCE = __WASI_RIGHT_PATH_LINK_SOURCE;
-+        const PATH_LINK_TARGET = __WASI_RIGHT_PATH_LINK_TARGET;
-+        const PATH_OPEN = __WASI_RIGHT_PATH_OPEN;
-+        const FD_READDIR = __WASI_RIGHT_FD_READDIR;
-+        const PATH_READLINK = __WASI_RIGHT_PATH_READLINK;
-+        const PATH_RENAME_SOURCE = __WASI_RIGHT_PATH_RENAME_SOURCE;
-+        const PATH_RENAME_TARGET = __WASI_RIGHT_PATH_RENAME_TARGET;
-+        const PATH_FILESTAT_GET = __WASI_RIGHT_PATH_FILESTAT_GET;
-+        const PATH_FILESTAT_SET_SIZE = __WASI_RIGHT_PATH_FILESTAT_SET_SIZE;
-+        const PATH_FILESTAT_SET_TIMES = __WASI_RIGHT_PATH_FILESTAT_SET_TIMES;
-+        const FD_FILESTAT_GET = __WASI_RIGHT_FD_FILESTAT_GET;
-+        const FD_FILESTAT_SET_SIZE = __WASI_RIGHT_FD_FILESTAT_SET_SIZE;
-+        const FD_FILESTAT_SET_TIMES = __WASI_RIGHT_FD_FILESTAT_SET_TIMES;
-+        const PATH_SYMLINK = __WASI_RIGHT_PATH_SYMLINK;
-+        const PATH_REMOVE_DIRECTORY = __WASI_RIGHT_PATH_REMOVE_DIRECTORY;
-+        const PATH_UNLINK_FILE = __WASI_RIGHT_PATH_UNLINK_FILE;
-+        const POLL_FD_READWRITE = __WASI_RIGHT_POLL_FD_READWRITE;
-+        const SOCK_SHUTDOWN = __WASI_RIGHT_SOCK_SHUTDOWN;
-+    }
-+}
-+
-+bitflags! {
-+    pub struct Fstflags: __wasi_fstflags_t {
-+        const SET_ATIM = __WASI_FILESTAT_SET_ATIM;
-+        const SET_ATIM_NOW = __WASI_FILESTAT_SET_ATIM_NOW;
-+        const SET_MTIM = __WASI_FILESTAT_SET_MTIM;
-+        const SET_MTIM_NOW = __WASI_FILESTAT_SET_MTIM_NOW;
-+    }
-+}
- 
- pub fn clock_res_get(clock_id: Clockid) -> (Errno, Timestamp) {
-     let mut resolution = MaybeUninit::<Timestamp>::uninit();
-@@ -333,11 +366,11 @@ pub fn fd_fdstat_get(fd: Fd) -> (Errno, Fdstat) {
- }
- 
- pub fn fd_fdstat_set_flags(fd: Fd, flags: Fdflags) -> Errno {
--    unsafe { __wasi_fd_fdstat_set_flags(fd, flags) }
-+    unsafe { __wasi_fd_fdstat_set_flags(fd, flags.bits()) }
- }
- 
- pub fn fd_fdstat_set_rights(fd: Fd, fs_rights_base: Rights, fs_rights_inheriting: Rights) -> Errno {
--    unsafe { __wasi_fd_fdstat_set_rights(fd, fs_rights_base, fs_rights_inheriting) }
-+    unsafe { __wasi_fd_fdstat_set_rights(fd, fs_rights_base.bits(), fs_rights_inheriting.bits()) }
- }
- 
- pub fn fd_sync(fd: Fd) -> Errno {
-@@ -376,7 +409,7 @@ pub fn path_link(
-     unsafe {
-         __wasi_path_link(
-             old_fd,
--            old_flags,
-+            old_flags.bits(),
-             old_path.as_ptr(),
-             old_path.len(),
-             new_fd,
-@@ -400,13 +433,13 @@ pub fn path_open(
-         (
-             __wasi_path_open(
-                 dirfd,
--                dirflags,
-+                dirflags.bits(),
-                 path.as_ptr(),
-                 path.len(),
--                oflags,
--                fs_rights_base,
--                fs_rights_inheriting,
--                fs_flags,
-+                oflags.bits(),
-+                fs_rights_base.bits(),
-+                fs_rights_inheriting.bits(),
-+                fs_flags.bits(),
-                 fd.as_mut_ptr(),
-             ),
-             fd.assume_init(),
-@@ -476,7 +509,7 @@ pub fn fd_filestat_set_times(
-     st_mtim: Timestamp,
-     fstflags: Fstflags,
- ) -> Errno {
--    unsafe { __wasi_fd_filestat_set_times(fd, st_atim, st_mtim, fstflags) }
-+    unsafe { __wasi_fd_filestat_set_times(fd, st_atim, st_mtim, fstflags.bits()) }
- }
- 
- pub fn fd_filestat_set_size(fd: Fd, st_size: Filesize) -> Errno {
-@@ -487,7 +520,13 @@ pub fn path_filestat_get(fd: Fd, flags: Lookupflags, path: &[u8]) -> (Errno, Fil
-     let mut buf = MaybeUninit::<Filestat>::uninit();
-     unsafe {
-         (
--            __wasi_path_filestat_get(fd, flags, path.as_ptr(), path.len(), buf.as_mut_ptr()),
-+            __wasi_path_filestat_get(
-+                fd,
-+                flags.bits(),
-+                path.as_ptr(),
-+                path.len(),
-+                buf.as_mut_ptr(),
-+            ),
-             buf.assume_init(),
-         )
-     }
-@@ -504,12 +543,12 @@ pub fn path_filestat_set_times(
-     unsafe {
-         __wasi_path_filestat_set_times(
-             fd,
--            flags,
-+            flags.bits(),
-             path.as_ptr(),
-             path.len(),
-             st_atim,
-             st_mtim,
--            fstflags,
-+            fstflags.bits(),
-         )
-     }
- }
-@@ -567,7 +606,7 @@ pub fn sock_recv(sock: Fd, ri_data: &[Iovec], ri_flags: Riflags) -> (Errno, usiz
-                 sock,
-                 ri_data.as_ptr(),
-                 ri_data.len(),
--                ri_flags,
-+                ri_flags.bits(),
-                 ro_datalen.as_mut_ptr(),
-                 ro_flags.as_mut_ptr(),
-             ),
-@@ -594,7 +633,7 @@ pub fn sock_send(sock: Fd, si_data: &[Ciovec], si_flags: Siflags) -> (Errno, usi
- }
- 
- pub fn sock_shutdown(sock: Fd, how: Sdflags) -> Errno {
--    unsafe { __wasi_sock_shutdown(sock, how) }
-+    unsafe { __wasi_sock_shutdown(sock, how.bits()) }
- }
- 
- pub fn sched_yield() -> Errno {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/ORG_CODE_OF_CONDUCT.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/ORG_CODE_OF_CONDUCT.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/ORG_CODE_OF_CONDUCT.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/ORG_CODE_OF_CONDUCT.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +0,0 @@
-# Bytecode Alliance Organizational Code of Conduct (OCoC)
-
-*Note*: this Code of Conduct pertains to organizations' behavior. Please also see the [Individual Code of Conduct](CODE_OF_CONDUCT.md).
-
-## Preamble
-
-The Bytecode Alliance (BA) welcomes involvement from organizations,
-including commercial organizations.  This document is an
-*organizational* code of conduct, intended particularly to provide
-guidance to commercial organizations.  It is distinct from the
-[Individual Code of Conduct (ICoC)](CODE_OF_CONDUCT.md), and does not 
-replace the ICoC. This OCoC applies to any group of people acting in 
-concert as a BA member or as a participant in BA activities, whether 
-or not that group is formally incorporated in some jurisdiction.
-
-The code of conduct described below is not a set of rigid rules, and
-we did not write it to encompass every conceivable scenario that might
-arise.  For example, it is theoretically possible there would be times
-when asserting patents is in the best interest of the BA community as
-a whole.  In such instances, consult with the BA, strive for
-consensus, and interpret these rules with an intent that is generous
-to the community the BA serves.
-
-While we may revise these guidelines from time to time based on
-real-world experience, overall they are based on a simple principle:
-
-*Bytecode Alliance members should observe the distinction between
- public community functions and private functions — especially
- commercial ones — and should ensure that the latter support, or at
- least do not harm, the former.*
-
-## Guidelines
-
- * **Do not cause confusion about Wasm standards or interoperability.** 
- 
-   Having an interoperable WebAssembly core is a high priority for
-   the BA, and members should strive to preserve that core.  It is fine
-   to develop additional non-standard features or APIs, but they
-   should always be clearly distinguished from the core interoperable
-   Wasm.
- 
-   Treat the WebAssembly name and any BA-associated names with
-   respect, and follow BA trademark and branding guidelines.  If you
-   distribute a customized version of software originally produced by
-   the BA, or if you build a product or service using BA-derived
-   software, use names that clearly distinguish your work from the
-   original.  (You should still provide proper attribution to the
-   original, of course, wherever such attribution would normally be
-   given.)
-     
-   Further, do not use the WebAssembly name or BA-associated names in
-   other public namespaces in ways that could cause confusion, e.g.,
-   in company names, names of commercial service offerings, domain
-   names, publicly-visible social media accounts or online service
-   accounts, etc.  It may sometimes be reasonable, however, to
-   register such a name in a new namespace and then immediately donate
-   control of that account to the BA, because that would help the project
-   maintain its identity.
-
-   For further guidance, see the BA Trademark and Branding Policy
-   [TODO: create policy, then insert link].
-     
- * **Do not restrict contributors.** If your company requires
-   employees or contractors to sign non-compete agreements, those
-   agreements must not prevent people from participating in the BA or
-   contributing to related projects.
-
-   This does not mean that all non-compete agreements are incompatible
-   with this code of conduct.  For example, a company may restrict an
-   employee's ability to solicit the company's customers.  However, an
-   agreement must not block any form of technical or social
-   participation in BA activities, including but not limited to the
-   implementation of particular features.
-
-   The accumulation of experience and expertise in individual persons,
-   who are ultimately free to direct their energy and attention as
-   they decide, is one of the most important drivers of progress in
-   open source projects.  A company that limits this freedom may hinder
-   the success of the BA's efforts.
-
- * **Do not use patents as offensive weapons.** If any BA participant
-   prevents the adoption or development of BA technologies by
-   asserting its patents, that undermines the purpose of the
-   coalition.  The collaboration fostered by the BA cannot include
-   members who act to undermine its work.
- 
- * **Practice responsible disclosure** for security vulnerabilities.
-   Use designated, non-public reporting channels to disclose technical
-   vulnerabilities, and give the project a reasonable period to
-   respond, remediate, and patch.  [TODO: optionally include the
-   security vulnerability reporting URL here.]
-
-   Vulnerability reporters may patch their company's own offerings, as
-   long as that patching does not significantly delay the reporting of
-   the vulnerability.  Vulnerability information should never be used
-   for unilateral commercial advantage.  Vendors may legitimately
-   compete on the speed and reliability with which they deploy
-   security fixes, but withholding vulnerability information damages
-   everyone in the long run by risking harm to the BA project's
-   reputation and to the security of all users.
-
- * **Respect the letter and spirit of open source practice.** While
-     there is not space to list here all possible aspects of standard
-     open source practice, some examples will help show what we mean:
-
-   * Abide by all applicable open source license terms.  Do not engage
-     in copyright violation or misattribution of any kind.
-
-   * Do not claim others' ideas or designs as your own.
-
-   * When others engage in publicly visible work (e.g., an upcoming
-     demo that is coordinated in a public issue tracker), do not
-     unilaterally announce early releases or early demonstrations of
-     that work ahead of their schedule in order to secure private
-     advantage (such as marketplace advantage) for yourself.
-
-   The BA reserves the right to determine what constitutes good open
-   source practices and to take action as it deems appropriate to
-   encourage, and if necessary enforce, such practices.
-
-## Enforcement
-
-Instances of organizational behavior in violation of the OCoC may 
-be reported by contacting the Bytecode Alliance CoC team at 
-[report@bytecodealliance.org](mailto:report@bytecodealliance.org). The 
-CoC team will review and investigate all complaints, and will respond 
-in a way that it deems appropriate to the circumstances. The CoC team 
-is obligated to maintain confidentiality with regard to the reporter of 
-an incident. Further details of specific enforcement policies may be 
-posted separately.
-
-When the BA deems an organization in violation of this OCoC, the BA
-will, at its sole discretion, determine what action to take.  The BA
-will decide what type, degree, and duration of corrective action is
-needed, if any, before a violating organization can be considered for
-membership (if it was not already a member) or can have its membership
-reinstated (if it was a member and the BA canceled its membership due
-to the violation).
-
-In practice, the BA's first approach will be to start a conversation,
-with punitive enforcement used only as a last resort.  Violations
-often turn out to be unintentional and swiftly correctable with all
-parties acting in good faith.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-<div align="center">
-  <h1><code>wasi</code></h1>
-
-<strong>A <a href="https://bytecodealliance.org/">Bytecode Alliance</a> project</strong>
-
-  <p>
-    <strong>WASI API Bindings for Rust</strong>
-  </p>
-
-  <p>
-    <a href="https://crates.io/crates/wasi"><img src="https://img.shields.io/crates/v/wasi.svg?style=flat-square" alt="Crates.io version" /></a>
-    <a href="https://crates.io/crates/wasi"><img src="https://img.shields.io/crates/d/wasi.svg?style=flat-square" alt="Download" /></a>
-    <a href="https://docs.rs/wasi/"><img src="https://img.shields.io/badge/docs-latest-blue.svg?style=flat-square" alt="docs.rs docs" /></a>
-  </p>
-</div>
-
-This crate contains API bindings for [WASI](https://github.com/WebAssembly/WASI)
-system calls in Rust, and currently reflects the `wasi_snapshot_preview1`
-module. This crate is quite low-level and provides conceptually a "system call"
-interface. In most settings, it's better to use the Rust standard library, which
-has WASI support.
-
-The `wasi` crate is also entirely procedurally generated from the `*.witx` files
-describing the WASI apis. While some conveniences are provided the bindings here
-are intentionally low-level!
-
-# Usage
-
-First you can depend on this crate via `Cargo.toml`:
-
-```toml
-[dependencies]
-wasi = "0.8.0"
-```
-
-Next you can use the APIs in the root of the module like so:
-
-```rust
-fn main() {
-    let stdout = 1;
-    let message = "Hello, World!\n";
-    let data = [wasi::Ciovec {
-        buf: message.as_ptr(),
-        buf_len: message.len(),
-    }];
-    wasi::fd_write(stdout, &data).unwrap();
-}
-```
-
-Next you can use a tool like [`cargo
-wasi`](https://github.com/bytecodealliance/cargo-wasi) to compile and run your
-project:
-
-To compile Rust projects to wasm using WASI, use the `wasm32-wasi` target,
-like this:
-
-```
-$ cargo wasi run
-   Compiling wasi v0.8.0+wasi-snapshot-preview1
-   Compiling wut v0.1.0 (/code)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.34s
-     Running `/.cargo/bin/cargo-wasi target/wasm32-wasi/debug/wut.wasm`
-     Running `target/wasm32-wasi/debug/wut.wasm`
-Hello, World!
-```
-
-# License
-
-This project is licensed under the Apache 2.0 license with the LLVM exception.
-See [LICENSE](LICENSE) for more details.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in this project by you, as defined in the Apache-2.0 license,
-shall be licensed as above, without any additional terms or conditions.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/SECURITY.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/SECURITY.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/SECURITY.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/SECURITY.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Security Policy
-
-Building secure foundations for software development is at the core of what we do in the Bytecode Alliance. Contributions of external security researchers are a vital part of that.
-
-## Scope
-
-If you believe you've found a security issue in any website, service, or software owned or operated by the Bytecode Alliance, we encourage you to notify us.
-
-## How to Submit a Report
-
-To submit a vulnerability report to the Bytecode Alliance, please contact us at [security@bytecodealliance.org](mailto:security@bytecodealliance.org). Your submission will be reviewed and validated by a member of our security team.
-
-## Safe Harbor
-
-The Bytecode Alliance supports safe harbor for security researchers who:
-
-*   Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our services.
-*   Only interact with accounts you own or with explicit permission of the account holder. If you do encounter Personally Identifiable Information (PII) contact us immediately, do not proceed with access, and immediately purge any local information.
-*   Provide us with a reasonable amount of time to resolve vulnerabilities prior to any disclosure to the public or a third-party.
-
-We will consider activities conducted consistent with this policy to constitute "authorized" conduct and will not pursue civil action or initiate a complaint to law enforcement. We will help to the extent we can if legal action is initiated by a third party against you.
-
-Please submit a report to us before engaging in conduct that may be inconsistent with or unaddressed by this policy.
-
-## Preferences
-
-*   Please provide detailed reports with reproducible steps and a clearly defined impact.
-*   Submit one vulnerability per report.
-*   Social engineering (e.g. phishing, vishing, smishing) is prohibited.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/error.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/error.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-use super::Errno;
-use core::fmt;
-use core::num::NonZeroU16;
-
-/// A raw error returned by wasi APIs, internally containing a 16-bit error
-/// code.
-#[derive(Copy, Clone, PartialEq, Eq, Ord, PartialOrd)]
-pub struct Error {
-    code: NonZeroU16,
-}
-
-impl Error {
-    /// Constructs a new error from a raw error code, returning `None` if the
-    /// error code is zero (which means success).
-    pub fn from_raw_error(error: Errno) -> Option<Error> {
-        Some(Error {
-            code: NonZeroU16::new(error)?,
-        })
-    }
-
-    /// Returns the raw error code that this error represents.
-    pub fn raw_error(&self) -> u16 {
-        self.code.get()
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{} (error {})",
-            super::strerror(self.code.get()),
-            self.code
-        )?;
-        Ok(())
-    }
-}
-
-impl fmt::Debug for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Error")
-            .field("code", &self.code)
-            .field("message", &super::strerror(self.code.get()))
-            .finish()
-    }
-}
-
-#[cfg(feature = "std")]
-extern crate std;
-#[cfg(feature = "std")]
-impl std::error::Error for Error {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/lib_generated.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/lib_generated.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/lib_generated.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/lib_generated.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1853 +0,0 @@
-// This file is automatically generated, DO NOT EDIT
-//
-// To regenerate this file run the `crates/generate-raw` command
-
-use core::mem::MaybeUninit;
-
-pub use crate::error::Error;
-pub type Result<T, E = Error> = core::result::Result<T, E>;
-pub type Size = usize;
-pub type Filesize = u64;
-pub type Timestamp = u64;
-pub type Clockid = u32;
-/// The clock measuring real time. Time value zero corresponds with
-/// 1970-01-01T00:00:00Z.
-pub const CLOCKID_REALTIME: Clockid = 0;
-/// The store-wide monotonic clock, which is defined as a clock measuring
-/// real time, whose value cannot be adjusted and which cannot have negative
-/// clock jumps. The epoch of this clock is undefined. The absolute time
-/// value of this clock therefore has no meaning.
-pub const CLOCKID_MONOTONIC: Clockid = 1;
-/// The CPU-time clock associated with the current process.
-pub const CLOCKID_PROCESS_CPUTIME_ID: Clockid = 2;
-/// The CPU-time clock associated with the current thread.
-pub const CLOCKID_THREAD_CPUTIME_ID: Clockid = 3;
-pub type Errno = u16;
-/// No error occurred. System call completed successfully.
-pub const ERRNO_SUCCESS: Errno = 0;
-/// Argument list too long.
-pub const ERRNO_2BIG: Errno = 1;
-/// Permission denied.
-pub const ERRNO_ACCES: Errno = 2;
-/// Address in use.
-pub const ERRNO_ADDRINUSE: Errno = 3;
-/// Address not available.
-pub const ERRNO_ADDRNOTAVAIL: Errno = 4;
-/// Address family not supported.
-pub const ERRNO_AFNOSUPPORT: Errno = 5;
-/// Resource unavailable, or operation would block.
-pub const ERRNO_AGAIN: Errno = 6;
-/// Connection already in progress.
-pub const ERRNO_ALREADY: Errno = 7;
-/// Bad file descriptor.
-pub const ERRNO_BADF: Errno = 8;
-/// Bad message.
-pub const ERRNO_BADMSG: Errno = 9;
-/// Device or resource busy.
-pub const ERRNO_BUSY: Errno = 10;
-/// Operation canceled.
-pub const ERRNO_CANCELED: Errno = 11;
-/// No child processes.
-pub const ERRNO_CHILD: Errno = 12;
-/// Connection aborted.
-pub const ERRNO_CONNABORTED: Errno = 13;
-/// Connection refused.
-pub const ERRNO_CONNREFUSED: Errno = 14;
-/// Connection reset.
-pub const ERRNO_CONNRESET: Errno = 15;
-/// Resource deadlock would occur.
-pub const ERRNO_DEADLK: Errno = 16;
-/// Destination address required.
-pub const ERRNO_DESTADDRREQ: Errno = 17;
-/// Mathematics argument out of domain of function.
-pub const ERRNO_DOM: Errno = 18;
-/// Reserved.
-pub const ERRNO_DQUOT: Errno = 19;
-/// File exists.
-pub const ERRNO_EXIST: Errno = 20;
-/// Bad address.
-pub const ERRNO_FAULT: Errno = 21;
-/// File too large.
-pub const ERRNO_FBIG: Errno = 22;
-/// Host is unreachable.
-pub const ERRNO_HOSTUNREACH: Errno = 23;
-/// Identifier removed.
-pub const ERRNO_IDRM: Errno = 24;
-/// Illegal byte sequence.
-pub const ERRNO_ILSEQ: Errno = 25;
-/// Operation in progress.
-pub const ERRNO_INPROGRESS: Errno = 26;
-/// Interrupted function.
-pub const ERRNO_INTR: Errno = 27;
-/// Invalid argument.
-pub const ERRNO_INVAL: Errno = 28;
-/// I/O error.
-pub const ERRNO_IO: Errno = 29;
-/// Socket is connected.
-pub const ERRNO_ISCONN: Errno = 30;
-/// Is a directory.
-pub const ERRNO_ISDIR: Errno = 31;
-/// Too many levels of symbolic links.
-pub const ERRNO_LOOP: Errno = 32;
-/// File descriptor value too large.
-pub const ERRNO_MFILE: Errno = 33;
-/// Too many links.
-pub const ERRNO_MLINK: Errno = 34;
-/// Message too large.
-pub const ERRNO_MSGSIZE: Errno = 35;
-/// Reserved.
-pub const ERRNO_MULTIHOP: Errno = 36;
-/// Filename too long.
-pub const ERRNO_NAMETOOLONG: Errno = 37;
-/// Network is down.
-pub const ERRNO_NETDOWN: Errno = 38;
-/// Connection aborted by network.
-pub const ERRNO_NETRESET: Errno = 39;
-/// Network unreachable.
-pub const ERRNO_NETUNREACH: Errno = 40;
-/// Too many files open in system.
-pub const ERRNO_NFILE: Errno = 41;
-/// No buffer space available.
-pub const ERRNO_NOBUFS: Errno = 42;
-/// No such device.
-pub const ERRNO_NODEV: Errno = 43;
-/// No such file or directory.
-pub const ERRNO_NOENT: Errno = 44;
-/// Executable file format error.
-pub const ERRNO_NOEXEC: Errno = 45;
-/// No locks available.
-pub const ERRNO_NOLCK: Errno = 46;
-/// Reserved.
-pub const ERRNO_NOLINK: Errno = 47;
-/// Not enough space.
-pub const ERRNO_NOMEM: Errno = 48;
-/// No message of the desired type.
-pub const ERRNO_NOMSG: Errno = 49;
-/// Protocol not available.
-pub const ERRNO_NOPROTOOPT: Errno = 50;
-/// No space left on device.
-pub const ERRNO_NOSPC: Errno = 51;
-/// Function not supported.
-pub const ERRNO_NOSYS: Errno = 52;
-/// The socket is not connected.
-pub const ERRNO_NOTCONN: Errno = 53;
-/// Not a directory or a symbolic link to a directory.
-pub const ERRNO_NOTDIR: Errno = 54;
-/// Directory not empty.
-pub const ERRNO_NOTEMPTY: Errno = 55;
-/// State not recoverable.
-pub const ERRNO_NOTRECOVERABLE: Errno = 56;
-/// Not a socket.
-pub const ERRNO_NOTSOCK: Errno = 57;
-/// Not supported, or operation not supported on socket.
-pub const ERRNO_NOTSUP: Errno = 58;
-/// Inappropriate I/O control operation.
-pub const ERRNO_NOTTY: Errno = 59;
-/// No such device or address.
-pub const ERRNO_NXIO: Errno = 60;
-/// Value too large to be stored in data type.
-pub const ERRNO_OVERFLOW: Errno = 61;
-/// Previous owner died.
-pub const ERRNO_OWNERDEAD: Errno = 62;
-/// Operation not permitted.
-pub const ERRNO_PERM: Errno = 63;
-/// Broken pipe.
-pub const ERRNO_PIPE: Errno = 64;
-/// Protocol error.
-pub const ERRNO_PROTO: Errno = 65;
-/// Protocol not supported.
-pub const ERRNO_PROTONOSUPPORT: Errno = 66;
-/// Protocol wrong type for socket.
-pub const ERRNO_PROTOTYPE: Errno = 67;
-/// Result too large.
-pub const ERRNO_RANGE: Errno = 68;
-/// Read-only file system.
-pub const ERRNO_ROFS: Errno = 69;
-/// Invalid seek.
-pub const ERRNO_SPIPE: Errno = 70;
-/// No such process.
-pub const ERRNO_SRCH: Errno = 71;
-/// Reserved.
-pub const ERRNO_STALE: Errno = 72;
-/// Connection timed out.
-pub const ERRNO_TIMEDOUT: Errno = 73;
-/// Text file busy.
-pub const ERRNO_TXTBSY: Errno = 74;
-/// Cross-device link.
-pub const ERRNO_XDEV: Errno = 75;
-/// Extension: Capabilities insufficient.
-pub const ERRNO_NOTCAPABLE: Errno = 76;
-pub(crate) fn strerror(code: u16) -> &'static str {
-    match code {
-        ERRNO_SUCCESS => "No error occurred. System call completed successfully.",
-        ERRNO_2BIG => "Argument list too long.",
-        ERRNO_ACCES => "Permission denied.",
-        ERRNO_ADDRINUSE => "Address in use.",
-        ERRNO_ADDRNOTAVAIL => "Address not available.",
-        ERRNO_AFNOSUPPORT => "Address family not supported.",
-        ERRNO_AGAIN => "Resource unavailable, or operation would block.",
-        ERRNO_ALREADY => "Connection already in progress.",
-        ERRNO_BADF => "Bad file descriptor.",
-        ERRNO_BADMSG => "Bad message.",
-        ERRNO_BUSY => "Device or resource busy.",
-        ERRNO_CANCELED => "Operation canceled.",
-        ERRNO_CHILD => "No child processes.",
-        ERRNO_CONNABORTED => "Connection aborted.",
-        ERRNO_CONNREFUSED => "Connection refused.",
-        ERRNO_CONNRESET => "Connection reset.",
-        ERRNO_DEADLK => "Resource deadlock would occur.",
-        ERRNO_DESTADDRREQ => "Destination address required.",
-        ERRNO_DOM => "Mathematics argument out of domain of function.",
-        ERRNO_DQUOT => "Reserved.",
-        ERRNO_EXIST => "File exists.",
-        ERRNO_FAULT => "Bad address.",
-        ERRNO_FBIG => "File too large.",
-        ERRNO_HOSTUNREACH => "Host is unreachable.",
-        ERRNO_IDRM => "Identifier removed.",
-        ERRNO_ILSEQ => "Illegal byte sequence.",
-        ERRNO_INPROGRESS => "Operation in progress.",
-        ERRNO_INTR => "Interrupted function.",
-        ERRNO_INVAL => "Invalid argument.",
-        ERRNO_IO => "I/O error.",
-        ERRNO_ISCONN => "Socket is connected.",
-        ERRNO_ISDIR => "Is a directory.",
-        ERRNO_LOOP => "Too many levels of symbolic links.",
-        ERRNO_MFILE => "File descriptor value too large.",
-        ERRNO_MLINK => "Too many links.",
-        ERRNO_MSGSIZE => "Message too large.",
-        ERRNO_MULTIHOP => "Reserved.",
-        ERRNO_NAMETOOLONG => "Filename too long.",
-        ERRNO_NETDOWN => "Network is down.",
-        ERRNO_NETRESET => "Connection aborted by network.",
-        ERRNO_NETUNREACH => "Network unreachable.",
-        ERRNO_NFILE => "Too many files open in system.",
-        ERRNO_NOBUFS => "No buffer space available.",
-        ERRNO_NODEV => "No such device.",
-        ERRNO_NOENT => "No such file or directory.",
-        ERRNO_NOEXEC => "Executable file format error.",
-        ERRNO_NOLCK => "No locks available.",
-        ERRNO_NOLINK => "Reserved.",
-        ERRNO_NOMEM => "Not enough space.",
-        ERRNO_NOMSG => "No message of the desired type.",
-        ERRNO_NOPROTOOPT => "Protocol not available.",
-        ERRNO_NOSPC => "No space left on device.",
-        ERRNO_NOSYS => "Function not supported.",
-        ERRNO_NOTCONN => "The socket is not connected.",
-        ERRNO_NOTDIR => "Not a directory or a symbolic link to a directory.",
-        ERRNO_NOTEMPTY => "Directory not empty.",
-        ERRNO_NOTRECOVERABLE => "State not recoverable.",
-        ERRNO_NOTSOCK => "Not a socket.",
-        ERRNO_NOTSUP => "Not supported, or operation not supported on socket.",
-        ERRNO_NOTTY => "Inappropriate I/O control operation.",
-        ERRNO_NXIO => "No such device or address.",
-        ERRNO_OVERFLOW => "Value too large to be stored in data type.",
-        ERRNO_OWNERDEAD => "Previous owner died.",
-        ERRNO_PERM => "Operation not permitted.",
-        ERRNO_PIPE => "Broken pipe.",
-        ERRNO_PROTO => "Protocol error.",
-        ERRNO_PROTONOSUPPORT => "Protocol not supported.",
-        ERRNO_PROTOTYPE => "Protocol wrong type for socket.",
-        ERRNO_RANGE => "Result too large.",
-        ERRNO_ROFS => "Read-only file system.",
-        ERRNO_SPIPE => "Invalid seek.",
-        ERRNO_SRCH => "No such process.",
-        ERRNO_STALE => "Reserved.",
-        ERRNO_TIMEDOUT => "Connection timed out.",
-        ERRNO_TXTBSY => "Text file busy.",
-        ERRNO_XDEV => "Cross-device link.",
-        ERRNO_NOTCAPABLE => "Extension: Capabilities insufficient.",
-        _ => "Unknown error.",
-    }
-}
-pub type Rights = u64;
-/// The right to invoke `fd_datasync`.
-/// If `path_open` is set, includes the right to invoke
-/// `path_open` with `fdflag::dsync`.
-pub const RIGHTS_FD_DATASYNC: Rights = 0x1;
-/// The right to invoke `fd_read` and `sock_recv`.
-/// If `rights::fd_seek` is set, includes the right to invoke `fd_pread`.
-pub const RIGHTS_FD_READ: Rights = 0x2;
-/// The right to invoke `fd_seek`. This flag implies `rights::fd_tell`.
-pub const RIGHTS_FD_SEEK: Rights = 0x4;
-/// The right to invoke `fd_fdstat_set_flags`.
-pub const RIGHTS_FD_FDSTAT_SET_FLAGS: Rights = 0x8;
-/// The right to invoke `fd_sync`.
-/// If `path_open` is set, includes the right to invoke
-/// `path_open` with `fdflag::rsync` and `fdflag::dsync`.
-pub const RIGHTS_FD_SYNC: Rights = 0x10;
-/// The right to invoke `fd_seek` in such a way that the file offset
-/// remains unaltered (i.e., `WHENCE_CUR` with offset zero), or to
-/// invoke `fd_tell`.
-pub const RIGHTS_FD_TELL: Rights = 0x20;
-/// The right to invoke `fd_write` and `sock_send`.
-/// If `rights::fd_seek` is set, includes the right to invoke `fd_pwrite`.
-pub const RIGHTS_FD_WRITE: Rights = 0x40;
-/// The right to invoke `fd_advise`.
-pub const RIGHTS_FD_ADVISE: Rights = 0x80;
-/// The right to invoke `fd_allocate`.
-pub const RIGHTS_FD_ALLOCATE: Rights = 0x100;
-/// The right to invoke `path_create_directory`.
-pub const RIGHTS_PATH_CREATE_DIRECTORY: Rights = 0x200;
-/// If `path_open` is set, the right to invoke `path_open` with `oflags::creat`.
-pub const RIGHTS_PATH_CREATE_FILE: Rights = 0x400;
-/// The right to invoke `path_link` with the file descriptor as the
-/// source directory.
-pub const RIGHTS_PATH_LINK_SOURCE: Rights = 0x800;
-/// The right to invoke `path_link` with the file descriptor as the
-/// target directory.
-pub const RIGHTS_PATH_LINK_TARGET: Rights = 0x1000;
-/// The right to invoke `path_open`.
-pub const RIGHTS_PATH_OPEN: Rights = 0x2000;
-/// The right to invoke `fd_readdir`.
-pub const RIGHTS_FD_READDIR: Rights = 0x4000;
-/// The right to invoke `path_readlink`.
-pub const RIGHTS_PATH_READLINK: Rights = 0x8000;
-/// The right to invoke `path_rename` with the file descriptor as the source directory.
-pub const RIGHTS_PATH_RENAME_SOURCE: Rights = 0x10000;
-/// The right to invoke `path_rename` with the file descriptor as the target directory.
-pub const RIGHTS_PATH_RENAME_TARGET: Rights = 0x20000;
-/// The right to invoke `path_filestat_get`.
-pub const RIGHTS_PATH_FILESTAT_GET: Rights = 0x40000;
-/// The right to change a file's size (there is no `path_filestat_set_size`).
-/// If `path_open` is set, includes the right to invoke `path_open` with `oflags::trunc`.
-pub const RIGHTS_PATH_FILESTAT_SET_SIZE: Rights = 0x80000;
-/// The right to invoke `path_filestat_set_times`.
-pub const RIGHTS_PATH_FILESTAT_SET_TIMES: Rights = 0x100000;
-/// The right to invoke `fd_filestat_get`.
-pub const RIGHTS_FD_FILESTAT_GET: Rights = 0x200000;
-/// The right to invoke `fd_filestat_set_size`.
-pub const RIGHTS_FD_FILESTAT_SET_SIZE: Rights = 0x400000;
-/// The right to invoke `fd_filestat_set_times`.
-pub const RIGHTS_FD_FILESTAT_SET_TIMES: Rights = 0x800000;
-/// The right to invoke `path_symlink`.
-pub const RIGHTS_PATH_SYMLINK: Rights = 0x1000000;
-/// The right to invoke `path_remove_directory`.
-pub const RIGHTS_PATH_REMOVE_DIRECTORY: Rights = 0x2000000;
-/// The right to invoke `path_unlink_file`.
-pub const RIGHTS_PATH_UNLINK_FILE: Rights = 0x4000000;
-/// If `rights::fd_read` is set, includes the right to invoke `poll_oneoff` to subscribe to `eventtype::fd_read`.
-/// If `rights::fd_write` is set, includes the right to invoke `poll_oneoff` to subscribe to `eventtype::fd_write`.
-pub const RIGHTS_POLL_FD_READWRITE: Rights = 0x8000000;
-/// The right to invoke `sock_shutdown`.
-pub const RIGHTS_SOCK_SHUTDOWN: Rights = 0x10000000;
-pub type Fd = u32;
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct Iovec {
-    /// The address of the buffer to be filled.
-    pub buf: *mut u8,
-    /// The length of the buffer to be filled.
-    pub buf_len: Size,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct Ciovec {
-    /// The address of the buffer to be written.
-    pub buf: *const u8,
-    /// The length of the buffer to be written.
-    pub buf_len: Size,
-}
-pub type IovecArray<'a> = &'a [Iovec];
-pub type CiovecArray<'a> = &'a [Ciovec];
-pub type Filedelta = i64;
-pub type Whence = u8;
-/// Seek relative to start-of-file.
-pub const WHENCE_SET: Whence = 0;
-/// Seek relative to current position.
-pub const WHENCE_CUR: Whence = 1;
-/// Seek relative to end-of-file.
-pub const WHENCE_END: Whence = 2;
-pub type Dircookie = u64;
-pub type Dirnamlen = u32;
-pub type Inode = u64;
-pub type Filetype = u8;
-/// The type of the file descriptor or file is unknown or is different from any of the other types specified.
-pub const FILETYPE_UNKNOWN: Filetype = 0;
-/// The file descriptor or file refers to a block device inode.
-pub const FILETYPE_BLOCK_DEVICE: Filetype = 1;
-/// The file descriptor or file refers to a character device inode.
-pub const FILETYPE_CHARACTER_DEVICE: Filetype = 2;
-/// The file descriptor or file refers to a directory inode.
-pub const FILETYPE_DIRECTORY: Filetype = 3;
-/// The file descriptor or file refers to a regular file inode.
-pub const FILETYPE_REGULAR_FILE: Filetype = 4;
-/// The file descriptor or file refers to a datagram socket.
-pub const FILETYPE_SOCKET_DGRAM: Filetype = 5;
-/// The file descriptor or file refers to a byte-stream socket.
-pub const FILETYPE_SOCKET_STREAM: Filetype = 6;
-/// The file refers to a symbolic link inode.
-pub const FILETYPE_SYMBOLIC_LINK: Filetype = 7;
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct Dirent {
-    /// The offset of the next directory entry stored in this directory.
-    pub d_next: Dircookie,
-    /// The serial number of the file referred to by this directory entry.
-    pub d_ino: Inode,
-    /// The length of the name of the directory entry.
-    pub d_namlen: Dirnamlen,
-    /// The type of the file referred to by this directory entry.
-    pub d_type: Filetype,
-}
-pub type Advice = u8;
-/// The application has no advice to give on its behavior with respect to the specified data.
-pub const ADVICE_NORMAL: Advice = 0;
-/// The application expects to access the specified data sequentially from lower offsets to higher offsets.
-pub const ADVICE_SEQUENTIAL: Advice = 1;
-/// The application expects to access the specified data in a random order.
-pub const ADVICE_RANDOM: Advice = 2;
-/// The application expects to access the specified data in the near future.
-pub const ADVICE_WILLNEED: Advice = 3;
-/// The application expects that it will not access the specified data in the near future.
-pub const ADVICE_DONTNEED: Advice = 4;
-/// The application expects to access the specified data once and then not reuse it thereafter.
-pub const ADVICE_NOREUSE: Advice = 5;
-pub type Fdflags = u16;
-/// Append mode: Data written to the file is always appended to the file's end.
-pub const FDFLAGS_APPEND: Fdflags = 0x1;
-/// Write according to synchronized I/O data integrity completion. Only the data stored in the file is synchronized.
-pub const FDFLAGS_DSYNC: Fdflags = 0x2;
-/// Non-blocking mode.
-pub const FDFLAGS_NONBLOCK: Fdflags = 0x4;
-/// Synchronized read I/O operations.
-pub const FDFLAGS_RSYNC: Fdflags = 0x8;
-/// Write according to synchronized I/O file integrity completion. In
-/// addition to synchronizing the data stored in the file, the implementation
-/// may also synchronously update the file's metadata.
-pub const FDFLAGS_SYNC: Fdflags = 0x10;
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct Fdstat {
-    /// File type.
-    pub fs_filetype: Filetype,
-    /// File descriptor flags.
-    pub fs_flags: Fdflags,
-    /// Rights that apply to this file descriptor.
-    pub fs_rights_base: Rights,
-    /// Maximum set of rights that may be installed on new file descriptors that
-    /// are created through this file descriptor, e.g., through `path_open`.
-    pub fs_rights_inheriting: Rights,
-}
-pub type Device = u64;
-pub type Fstflags = u16;
-/// Adjust the last data access timestamp to the value stored in `filestat::st_atim`.
-pub const FSTFLAGS_ATIM: Fstflags = 0x1;
-/// Adjust the last data access timestamp to the time of clock `clock::realtime`.
-pub const FSTFLAGS_ATIM_NOW: Fstflags = 0x2;
-/// Adjust the last data modification timestamp to the value stored in `filestat::st_mtim`.
-pub const FSTFLAGS_MTIM: Fstflags = 0x4;
-/// Adjust the last data modification timestamp to the time of clock `clock::realtime`.
-pub const FSTFLAGS_MTIM_NOW: Fstflags = 0x8;
-pub type Lookupflags = u32;
-/// As long as the resolved path corresponds to a symbolic link, it is expanded.
-pub const LOOKUPFLAGS_SYMLINK_FOLLOW: Lookupflags = 0x1;
-pub type Oflags = u16;
-/// Create file if it does not exist.
-pub const OFLAGS_CREAT: Oflags = 0x1;
-/// Fail if not a directory.
-pub const OFLAGS_DIRECTORY: Oflags = 0x2;
-/// Fail if file already exists.
-pub const OFLAGS_EXCL: Oflags = 0x4;
-/// Truncate file to size 0.
-pub const OFLAGS_TRUNC: Oflags = 0x8;
-pub type Linkcount = u64;
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct Filestat {
-    /// Device ID of device containing the file.
-    pub dev: Device,
-    /// File serial number.
-    pub ino: Inode,
-    /// File type.
-    pub filetype: Filetype,
-    /// Number of hard links to the file.
-    pub nlink: Linkcount,
-    /// For regular files, the file size in bytes. For symbolic links, the length in bytes of the pathname contained in the symbolic link.
-    pub size: Filesize,
-    /// Last data access timestamp.
-    pub atim: Timestamp,
-    /// Last data modification timestamp.
-    pub mtim: Timestamp,
-    /// Last file status change timestamp.
-    pub ctim: Timestamp,
-}
-pub type Userdata = u64;
-pub type Eventtype = u8;
-/// The time value of clock `subscription::u.clock.clock_id` has
-/// reached timestamp `subscription::u.clock.timeout`.
-pub const EVENTTYPE_CLOCK: Eventtype = 0;
-/// File descriptor `subscription::u.fd_readwrite.fd` has data
-/// available for reading. This event always triggers for regular files.
-pub const EVENTTYPE_FD_READ: Eventtype = 1;
-/// File descriptor `subscription::u.fd_readwrite.fd` has capacity
-/// available for writing. This event always triggers for regular files.
-pub const EVENTTYPE_FD_WRITE: Eventtype = 2;
-pub type Eventrwflags = u16;
-/// The peer of this socket has closed or disconnected.
-pub const EVENTRWFLAGS_FD_READWRITE_HANGUP: Eventrwflags = 0x1;
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct EventFdReadwrite {
-    /// The number of bytes available for reading or writing.
-    pub nbytes: Filesize,
-    /// The state of the file descriptor.
-    pub flags: Eventrwflags,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union EventU {
-    /// When type is `eventtype::fd_read` or `eventtype::fd_write`:
-    pub fd_readwrite: EventFdReadwrite,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct Event {
-    /// User-provided value that got attached to `subscription::userdata`.
-    pub userdata: Userdata,
-    /// If non-zero, an error that occurred while processing the subscription request.
-    pub error: Errno,
-    /// The type of the event that occurred.
-    pub r#type: Eventtype,
-    /// The contents of the event.
-    pub u: EventU,
-}
-pub type Subclockflags = u16;
-/// If set, treat the timestamp provided in
-/// `subscription::u.clock.timeout` as an absolute timestamp of clock
-/// `subscription::u.clock.clock_id.` If clear, treat the timestamp
-/// provided in `subscription::u.clock.timeout` relative to the
-/// current time value of clock `subscription::u.clock.clock_id.`
-pub const SUBCLOCKFLAGS_SUBSCRIPTION_CLOCK_ABSTIME: Subclockflags = 0x1;
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct SubscriptionClock {
-    /// The clock against which to compare the timestamp.
-    pub id: Clockid,
-    /// The absolute or relative timestamp.
-    pub timeout: Timestamp,
-    /// The amount of time that the implementation may wait additionally
-    /// to coalesce with other events.
-    pub precision: Timestamp,
-    /// Flags specifying whether the timeout is absolute or relative
-    pub flags: Subclockflags,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct SubscriptionFdReadwrite {
-    /// The file descriptor on which to wait for it to become ready for reading or writing.
-    pub file_descriptor: Fd,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union SubscriptionU {
-    /// When type is `eventtype::clock`:
-    pub clock: SubscriptionClock,
-    /// When type is `eventtype::fd_read` or `eventtype::fd_write`:
-    pub fd_readwrite: SubscriptionFdReadwrite,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct Subscription {
-    /// User-provided value that is attached to the subscription in the
-    /// implementation and returned through `event::userdata`.
-    pub userdata: Userdata,
-    /// The type of the event to which to subscribe.
-    pub r#type: Eventtype,
-    /// The contents of the subscription.
-    pub u: SubscriptionU,
-}
-pub type Exitcode = u32;
-pub type Signal = u8;
-/// No signal. Note that POSIX has special semantics for `kill(pid, 0)`,
-/// so this value is reserved.
-pub const SIGNAL_NONE: Signal = 0;
-/// Hangup.
-/// Action: Terminates the process.
-pub const SIGNAL_HUP: Signal = 1;
-/// Terminate interrupt signal.
-/// Action: Terminates the process.
-pub const SIGNAL_INT: Signal = 2;
-/// Terminal quit signal.
-/// Action: Terminates the process.
-pub const SIGNAL_QUIT: Signal = 3;
-/// Illegal instruction.
-/// Action: Terminates the process.
-pub const SIGNAL_ILL: Signal = 4;
-/// Trace/breakpoint trap.
-/// Action: Terminates the process.
-pub const SIGNAL_TRAP: Signal = 5;
-/// Process abort signal.
-/// Action: Terminates the process.
-pub const SIGNAL_ABRT: Signal = 6;
-/// Access to an undefined portion of a memory object.
-/// Action: Terminates the process.
-pub const SIGNAL_BUS: Signal = 7;
-/// Erroneous arithmetic operation.
-/// Action: Terminates the process.
-pub const SIGNAL_FPE: Signal = 8;
-/// Kill.
-/// Action: Terminates the process.
-pub const SIGNAL_KILL: Signal = 9;
-/// User-defined signal 1.
-/// Action: Terminates the process.
-pub const SIGNAL_USR1: Signal = 10;
-/// Invalid memory reference.
-/// Action: Terminates the process.
-pub const SIGNAL_SEGV: Signal = 11;
-/// User-defined signal 2.
-/// Action: Terminates the process.
-pub const SIGNAL_USR2: Signal = 12;
-/// Write on a pipe with no one to read it.
-/// Action: Ignored.
-pub const SIGNAL_PIPE: Signal = 13;
-/// Alarm clock.
-/// Action: Terminates the process.
-pub const SIGNAL_ALRM: Signal = 14;
-/// Termination signal.
-/// Action: Terminates the process.
-pub const SIGNAL_TERM: Signal = 15;
-/// Child process terminated, stopped, or continued.
-/// Action: Ignored.
-pub const SIGNAL_CHLD: Signal = 16;
-/// Continue executing, if stopped.
-/// Action: Continues executing, if stopped.
-pub const SIGNAL_CONT: Signal = 17;
-/// Stop executing.
-/// Action: Stops executing.
-pub const SIGNAL_STOP: Signal = 18;
-/// Terminal stop signal.
-/// Action: Stops executing.
-pub const SIGNAL_TSTP: Signal = 19;
-/// Background process attempting read.
-/// Action: Stops executing.
-pub const SIGNAL_TTIN: Signal = 20;
-/// Background process attempting write.
-/// Action: Stops executing.
-pub const SIGNAL_TTOU: Signal = 21;
-/// High bandwidth data is available at a socket.
-/// Action: Ignored.
-pub const SIGNAL_URG: Signal = 22;
-/// CPU time limit exceeded.
-/// Action: Terminates the process.
-pub const SIGNAL_XCPU: Signal = 23;
-/// File size limit exceeded.
-/// Action: Terminates the process.
-pub const SIGNAL_XFSZ: Signal = 24;
-/// Virtual timer expired.
-/// Action: Terminates the process.
-pub const SIGNAL_VTALRM: Signal = 25;
-/// Profiling timer expired.
-/// Action: Terminates the process.
-pub const SIGNAL_PROF: Signal = 26;
-/// Window changed.
-/// Action: Ignored.
-pub const SIGNAL_WINCH: Signal = 27;
-/// I/O possible.
-/// Action: Terminates the process.
-pub const SIGNAL_POLL: Signal = 28;
-/// Power failure.
-/// Action: Terminates the process.
-pub const SIGNAL_PWR: Signal = 29;
-/// Bad system call.
-/// Action: Terminates the process.
-pub const SIGNAL_SYS: Signal = 30;
-pub type Riflags = u16;
-/// Returns the message without removing it from the socket's receive queue.
-pub const RIFLAGS_RECV_PEEK: Riflags = 0x1;
-/// On byte-stream sockets, block until the full amount of data can be returned.
-pub const RIFLAGS_RECV_WAITALL: Riflags = 0x2;
-pub type Roflags = u16;
-/// Returned by `sock_recv`: Message data has been truncated.
-pub const ROFLAGS_RECV_DATA_TRUNCATED: Roflags = 0x1;
-pub type Siflags = u16;
-pub type Sdflags = u8;
-/// Disables further receive operations.
-pub const SDFLAGS_RD: Sdflags = 0x1;
-/// Disables further send operations.
-pub const SDFLAGS_WR: Sdflags = 0x2;
-pub type Preopentype = u8;
-/// A pre-opened directory.
-pub const PREOPENTYPE_DIR: Preopentype = 0;
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct PrestatDir {
-    /// The length of the directory name for use with `fd_prestat_dir_name`.
-    pub pr_name_len: Size,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union PrestatU {
-    /// When type is `preopentype::dir`:
-    pub dir: PrestatDir,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct Prestat {
-    /// The type of the pre-opened capability.
-    pub pr_type: Preopentype,
-    /// The contents of the information.
-    pub u: PrestatU,
-}
-/// Read command-line argument data.
-/// The size of the array should match that returned by `wasi_args_sizes_get()`
-pub unsafe fn args_get(argv: *mut *mut u8, argv_buf: *mut u8) -> Result<()> {
-    let rc = wasi_snapshot_preview1::args_get(argv, argv_buf);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Return command-line argument data sizes.
-///
-/// ## Return
-///
-/// * `argc` - The number of arguments.
-/// * `argv_buf_size` - The size of the argument string data.
-pub unsafe fn args_sizes_get() -> Result<(Size, Size)> {
-    let mut argc = MaybeUninit::uninit();
-    let mut argv_buf_size = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::args_sizes_get(argc.as_mut_ptr(), argv_buf_size.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok((argc.assume_init(), argv_buf_size.assume_init()))
-    }
-}
-
-/// Read environment variable data.
-/// The sizes of the buffers should match that returned by `environ.sizes_get()`.
-pub unsafe fn environ_get(environ: *mut *mut u8, environ_buf: *mut u8) -> Result<()> {
-    let rc = wasi_snapshot_preview1::environ_get(environ, environ_buf);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Return command-line argument data sizes.
-///
-/// ## Return
-///
-/// * `argc` - The number of arguments.
-/// * `argv_buf_size` - The size of the argument string data.
-pub unsafe fn environ_sizes_get() -> Result<(Size, Size)> {
-    let mut argc = MaybeUninit::uninit();
-    let mut argv_buf_size = MaybeUninit::uninit();
-    let rc =
-        wasi_snapshot_preview1::environ_sizes_get(argc.as_mut_ptr(), argv_buf_size.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok((argc.assume_init(), argv_buf_size.assume_init()))
-    }
-}
-
-/// Return the resolution of a clock.
-/// Implementations are required to provide a non-zero value for supported clocks. For unsupported clocks, return `WASI_EINVAL`
-/// Note: This is similar to `clock_getres` in POSIX.
-///
-/// ## Parameters
-///
-/// * `id` - The clock for which to return the resolution.
-///
-/// ## Return
-///
-/// * `resolution` - The resolution of the clock.
-pub unsafe fn clock_res_get(id: Clockid) -> Result<Timestamp> {
-    let mut resolution = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::clock_res_get(id, resolution.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(resolution.assume_init())
-    }
-}
-
-/// Return the time value of a clock.
-/// Note: This is similar to `clock_gettime` in POSIX.
-///
-/// ## Parameters
-///
-/// * `id` - The clock for which to return the time.
-/// * `precision` - The maximum lag (exclusive) that the returned time value may have, compared to its actual value.
-///
-/// ## Return
-///
-/// * `time` - The time value of the clock.
-pub unsafe fn clock_time_get(id: Clockid, precision: Timestamp) -> Result<Timestamp> {
-    let mut time = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::clock_time_get(id, precision, time.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(time.assume_init())
-    }
-}
-
-/// Provide file advisory information on a file descriptor.
-/// Note: This is similar to `posix_fadvise` in POSIX.
-///
-/// ## Parameters
-///
-/// * `offset` - The offset within the file to which the advisory applies.
-/// * `len` - The length of the region to which the advisory applies.
-/// * `advice` - The advice.
-pub unsafe fn fd_advise(fd: Fd, offset: Filesize, len: Filesize, advice: Advice) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_advise(fd, offset, len, advice);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Force the allocation of space in a file.
-/// Note: This is similar to `posix_fallocate` in POSIX.
-///
-/// ## Parameters
-///
-/// * `offset` - The offset at which to start the allocation.
-/// * `len` - The length of the area that is allocated.
-pub unsafe fn fd_allocate(fd: Fd, offset: Filesize, len: Filesize) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_allocate(fd, offset, len);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Close a file descriptor.
-/// Note: This is similar to `close` in POSIX.
-pub unsafe fn fd_close(fd: Fd) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_close(fd);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Synchronize the data of a file to disk.
-/// Note: This is similar to `fdatasync` in POSIX.
-pub unsafe fn fd_datasync(fd: Fd) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_datasync(fd);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Get the attributes of a file descriptor.
-/// Note: This returns similar flags to `fsync(fd, F_GETFL)` in POSIX, as well as additional fields.
-///
-/// ## Return
-///
-/// * `stat` - The buffer where the file descriptor's attributes are stored.
-pub unsafe fn fd_fdstat_get(fd: Fd) -> Result<Fdstat> {
-    let mut stat = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_fdstat_get(fd, stat.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(stat.assume_init())
-    }
-}
-
-/// Adjust the flags associated with a file descriptor.
-/// Note: This is similar to `fcntl(fd, F_SETFL, flags)` in POSIX.
-///
-/// ## Parameters
-///
-/// * `flags` - The desired values of the file descriptor flags.
-pub unsafe fn fd_fdstat_set_flags(fd: Fd, flags: Fdflags) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_fdstat_set_flags(fd, flags);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Adjust the rights associated with a file descriptor.
-/// This can only be used to remove rights, and returns `ENOTCAPABLE` if called in a way that would attempt to add rights
-///
-/// ## Parameters
-///
-/// * `fs_rights_base` - The desired rights of the file descriptor.
-pub unsafe fn fd_fdstat_set_rights(
-    fd: Fd,
-    fs_rights_base: Rights,
-    fs_rights_inheriting: Rights,
-) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_fdstat_set_rights(fd, fs_rights_base, fs_rights_inheriting);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Return the attributes of an open file.
-///
-/// ## Return
-///
-/// * `buf` - The buffer where the file's attributes are stored.
-pub unsafe fn fd_filestat_get(fd: Fd) -> Result<Filestat> {
-    let mut buf = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_filestat_get(fd, buf.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(buf.assume_init())
-    }
-}
-
-/// Adjust the size of an open file. If this increases the file's size, the extra bytes are filled with zeros.
-/// Note: This is similar to `ftruncate` in POSIX.
-///
-/// ## Parameters
-///
-/// * `size` - The desired file size.
-pub unsafe fn fd_filestat_set_size(fd: Fd, size: Filesize) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_filestat_set_size(fd, size);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Adjust the timestamps of an open file or directory.
-/// Note: This is similar to `futimens` in POSIX.
-///
-/// ## Parameters
-///
-/// * `atim` - The desired values of the data access timestamp.
-/// * `mtim` - The desired values of the data modification timestamp.
-/// * `fst_flags` - A bitmask indicating which timestamps to adjust.
-pub unsafe fn fd_filestat_set_times(
-    fd: Fd,
-    atim: Timestamp,
-    mtim: Timestamp,
-    fst_flags: Fstflags,
-) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_filestat_set_times(fd, atim, mtim, fst_flags);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Read from a file descriptor, without using and updating the file descriptor's offset.
-/// Note: This is similar to `preadv` in POSIX.
-///
-/// ## Parameters
-///
-/// * `iovs` - List of scatter/gather vectors in which to store data.
-/// * `offset` - The offset within the file at which to read.
-///
-/// ## Return
-///
-/// * `nread` - The number of bytes read.
-pub unsafe fn fd_pread(fd: Fd, iovs: IovecArray, offset: Filesize) -> Result<Size> {
-    let mut nread = MaybeUninit::uninit();
-    let rc =
-        wasi_snapshot_preview1::fd_pread(fd, iovs.as_ptr(), iovs.len(), offset, nread.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(nread.assume_init())
-    }
-}
-
-/// Return a description of the given preopened file descriptor.
-///
-/// ## Return
-///
-/// * `buf` - The buffer where the description is stored.
-pub unsafe fn fd_prestat_get(fd: Fd) -> Result<Prestat> {
-    let mut buf = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_prestat_get(fd, buf.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(buf.assume_init())
-    }
-}
-
-/// Return a description of the given preopened file descriptor.
-///
-/// ## Parameters
-///
-/// * `path` - A buffer into which to write the preopened directory name.
-pub unsafe fn fd_prestat_dir_name(fd: Fd, path: *mut u8, path_len: Size) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_prestat_dir_name(fd, path, path_len);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Write to a file descriptor, without using and updating the file descriptor's offset.
-/// Note: This is similar to `pwritev` in POSIX.
-///
-/// ## Parameters
-///
-/// * `iovs` - List of scatter/gather vectors from which to retrieve data.
-/// * `offset` - The offset within the file at which to write.
-///
-/// ## Return
-///
-/// * `nwritten` - The number of bytes written.
-pub unsafe fn fd_pwrite(fd: Fd, iovs: CiovecArray, offset: Filesize) -> Result<Size> {
-    let mut nwritten = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_pwrite(
-        fd,
-        iovs.as_ptr(),
-        iovs.len(),
-        offset,
-        nwritten.as_mut_ptr(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(nwritten.assume_init())
-    }
-}
-
-/// Read from a file descriptor.
-/// Note: This is similar to `readv` in POSIX.
-///
-/// ## Parameters
-///
-/// * `iovs` - List of scatter/gather vectors to which to store data.
-///
-/// ## Return
-///
-/// * `nread` - The number of bytes read.
-pub unsafe fn fd_read(fd: Fd, iovs: IovecArray) -> Result<Size> {
-    let mut nread = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_read(fd, iovs.as_ptr(), iovs.len(), nread.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(nread.assume_init())
-    }
-}
-
-/// Read directory entries from a directory.
-/// When successful, the contents of the output buffer consist of a sequence of
-/// directory entries. Each directory entry consists of a dirent_t object,
-/// followed by dirent_t::d_namlen bytes holding the name of the directory
-/// entry.
-/// This function fills the output buffer as much as possible, potentially
-/// truncating the last directory entry. This allows the caller to grow its
-/// read buffer size in case it's too small to fit a single large directory
-/// entry, or skip the oversized directory entry.
-///
-/// ## Parameters
-///
-/// * `buf` - The buffer where directory entries are stored
-/// * `cookie` - The location within the directory to start reading
-///
-/// ## Return
-///
-/// * `bufused` - The number of bytes stored in the read buffer. If less than the size of the read buffer, the end of the directory has been reached.
-pub unsafe fn fd_readdir(fd: Fd, buf: *mut u8, buf_len: Size, cookie: Dircookie) -> Result<Size> {
-    let mut bufused = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_readdir(fd, buf, buf_len, cookie, bufused.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(bufused.assume_init())
-    }
-}
-
-/// Atomically replace a file descriptor by renumbering another file descriptor.
-/// Due to the strong focus on thread safety, this environment does not provide
-/// a mechanism to duplicate or renumber a file descriptor to an arbitrary
-/// number, like `dup2()`. This would be prone to race conditions, as an actual
-/// file descriptor with the same number could be allocated by a different
-/// thread at the same time.
-/// This function provides a way to atomically renumber file descriptors, which
-/// would disappear if `dup2()` were to be removed entirely.
-///
-/// ## Parameters
-///
-/// * `to` - The file descriptor to overwrite.
-pub unsafe fn fd_renumber(fd: Fd, to: Fd) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_renumber(fd, to);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Move the offset of a file descriptor.
-/// Note: This is similar to `lseek` in POSIX.
-///
-/// ## Parameters
-///
-/// * `offset` - The number of bytes to move.
-/// * `whence` - The base from which the offset is relative.
-///
-/// ## Return
-///
-/// * `newoffset` - The new offset of the file descriptor, relative to the start of the file.
-pub unsafe fn fd_seek(fd: Fd, offset: Filedelta, whence: Whence) -> Result<Filesize> {
-    let mut newoffset = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_seek(fd, offset, whence, newoffset.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(newoffset.assume_init())
-    }
-}
-
-/// Synchronize the data and metadata of a file to disk.
-/// Note: This is similar to `fsync` in POSIX.
-pub unsafe fn fd_sync(fd: Fd) -> Result<()> {
-    let rc = wasi_snapshot_preview1::fd_sync(fd);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Return the current offset of a file descriptor.
-/// Note: This is similar to `lseek(fd, 0, SEEK_CUR)` in POSIX.
-///
-/// ## Return
-///
-/// * `offset` - The current offset of the file descriptor, relative to the start of the file.
-pub unsafe fn fd_tell(fd: Fd) -> Result<Filesize> {
-    let mut offset = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_tell(fd, offset.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(offset.assume_init())
-    }
-}
-
-/// Write to a file descriptor.
-/// Note: This is similar to `writev` in POSIX.
-///
-/// ## Parameters
-///
-/// * `iovs` - List of scatter/gather vectors from which to retrieve data.
-///
-/// ## Return
-///
-/// * `nwritten` - The number of bytes written.
-pub unsafe fn fd_write(fd: Fd, iovs: CiovecArray) -> Result<Size> {
-    let mut nwritten = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::fd_write(fd, iovs.as_ptr(), iovs.len(), nwritten.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(nwritten.assume_init())
-    }
-}
-
-/// Create a directory.
-/// Note: This is similar to `mkdirat` in POSIX.
-///
-/// ## Parameters
-///
-/// * `path` - The path at which to create the directory.
-pub unsafe fn path_create_directory(fd: Fd, path: &str) -> Result<()> {
-    let rc = wasi_snapshot_preview1::path_create_directory(fd, path.as_ptr(), path.len());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Return the attributes of a file or directory.
-/// Note: This is similar to `stat` in POSIX.
-///
-/// ## Parameters
-///
-/// * `flags` - Flags determining the method of how the path is resolved.
-/// * `path` - The path of the file or directory to inspect.
-///
-/// ## Return
-///
-/// * `buf` - The buffer where the file's attributes are stored.
-pub unsafe fn path_filestat_get(fd: Fd, flags: Lookupflags, path: &str) -> Result<Filestat> {
-    let mut buf = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::path_filestat_get(
-        fd,
-        flags,
-        path.as_ptr(),
-        path.len(),
-        buf.as_mut_ptr(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(buf.assume_init())
-    }
-}
-
-/// Adjust the timestamps of a file or directory.
-/// Note: This is similar to `utimensat` in POSIX.
-///
-/// ## Parameters
-///
-/// * `flags` - Flags determining the method of how the path is resolved.
-/// * `path` - The path of the file or directory to operate on.
-/// * `atim` - The desired values of the data access timestamp.
-/// * `mtim` - The desired values of the data modification timestamp.
-/// * `fst_flags` - A bitmask indicating which timestamps to adjust.
-pub unsafe fn path_filestat_set_times(
-    fd: Fd,
-    flags: Lookupflags,
-    path: &str,
-    atim: Timestamp,
-    mtim: Timestamp,
-    fst_flags: Fstflags,
-) -> Result<()> {
-    let rc = wasi_snapshot_preview1::path_filestat_set_times(
-        fd,
-        flags,
-        path.as_ptr(),
-        path.len(),
-        atim,
-        mtim,
-        fst_flags,
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Create a hard link.
-/// Note: This is similar to `linkat` in POSIX.
-///
-/// ## Parameters
-///
-/// * `old_flags` - Flags determining the method of how the path is resolved.
-/// * `old_path` - The source path from which to link.
-/// * `new_fd` - The working directory at which the resolution of the new path starts.
-/// * `new_path` - The destination path at which to create the hard link.
-pub unsafe fn path_link(
-    old_fd: Fd,
-    old_flags: Lookupflags,
-    old_path: &str,
-    new_fd: Fd,
-    new_path: &str,
-) -> Result<()> {
-    let rc = wasi_snapshot_preview1::path_link(
-        old_fd,
-        old_flags,
-        old_path.as_ptr(),
-        old_path.len(),
-        new_fd,
-        new_path.as_ptr(),
-        new_path.len(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Open a file or directory.
-/// The returned file descriptor is not guaranteed to be the lowest-numbered
-/// file descriptor not currently open; it is randomized to prevent
-/// applications from depending on making assumptions about indexes, since this
-/// is error-prone in multi-threaded contexts. The returned file descriptor is
-/// guaranteed to be less than 2**31.
-/// Note: This is similar to `openat` in POSIX.
-///
-/// ## Parameters
-///
-/// * `dirflags` - Flags determining the method of how the path is resolved.
-/// * `path` - The relative path of the file or directory to open, relative to the
-///   `dirfd` directory.
-/// * `oflags` - The method by which to open the file.
-/// * `fs_rights_base` - The initial rights of the newly created file descriptor. The
-///   implementation is allowed to return a file descriptor with fewer rights
-///   than specified, if and only if those rights do not apply to the type of
-///   file being opened.
-///   The *base* rights are rights that will apply to operations using the file
-///   descriptor itself, while the *inheriting* rights are rights that apply to
-///   file descriptors derived from it.
-///
-/// ## Return
-///
-/// * `opened_fd` - The file descriptor of the file that has been opened.
-pub unsafe fn path_open(
-    fd: Fd,
-    dirflags: Lookupflags,
-    path: &str,
-    oflags: Oflags,
-    fs_rights_base: Rights,
-    fs_rights_inherting: Rights,
-    fdflags: Fdflags,
-) -> Result<Fd> {
-    let mut opened_fd = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::path_open(
-        fd,
-        dirflags,
-        path.as_ptr(),
-        path.len(),
-        oflags,
-        fs_rights_base,
-        fs_rights_inherting,
-        fdflags,
-        opened_fd.as_mut_ptr(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(opened_fd.assume_init())
-    }
-}
-
-/// Read the contents of a symbolic link.
-/// Note: This is similar to `readlinkat` in POSIX.
-///
-/// ## Parameters
-///
-/// * `path` - The path of the symbolic link from which to read.
-/// * `buf` - The buffer to which to write the contents of the symbolic link.
-///
-/// ## Return
-///
-/// * `bufused` - The number of bytes placed in the buffer.
-pub unsafe fn path_readlink(fd: Fd, path: &str, buf: *mut u8, buf_len: Size) -> Result<Size> {
-    let mut bufused = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::path_readlink(
-        fd,
-        path.as_ptr(),
-        path.len(),
-        buf,
-        buf_len,
-        bufused.as_mut_ptr(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(bufused.assume_init())
-    }
-}
-
-/// Remove a directory.
-/// Return `ENOTEMPTY` if the directory is not empty.
-/// Note: This is similar to `unlinkat(fd, path, AT_REMOVEDIR)` in POSIX.
-///
-/// ## Parameters
-///
-/// * `path` - The path to a directory to remove.
-pub unsafe fn path_remove_directory(fd: Fd, path: &str) -> Result<()> {
-    let rc = wasi_snapshot_preview1::path_remove_directory(fd, path.as_ptr(), path.len());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Rename a file or directory.
-/// Note: This is similar to `renameat` in POSIX.
-///
-/// ## Parameters
-///
-/// * `old_path` - The source path of the file or directory to rename.
-/// * `new_fd` - The working directory at which the resolution of the new path starts.
-/// * `new_path` - The destination path to which to rename the file or directory.
-pub unsafe fn path_rename(fd: Fd, old_path: &str, new_fd: Fd, new_path: &str) -> Result<()> {
-    let rc = wasi_snapshot_preview1::path_rename(
-        fd,
-        old_path.as_ptr(),
-        old_path.len(),
-        new_fd,
-        new_path.as_ptr(),
-        new_path.len(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Create a symbolic link.
-/// Note: This is similar to `symlinkat` in POSIX.
-///
-/// ## Parameters
-///
-/// * `old_path` - The contents of the symbolic link.
-/// * `new_path` - The destination path at which to create the symbolic link.
-pub unsafe fn path_symlink(old_path: &str, fd: Fd, new_path: &str) -> Result<()> {
-    let rc = wasi_snapshot_preview1::path_symlink(
-        old_path.as_ptr(),
-        old_path.len(),
-        fd,
-        new_path.as_ptr(),
-        new_path.len(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Unlink a file.
-/// Return `EISDIR` if the path refers to a directory.
-/// Note: This is similar to `unlinkat(fd, path, 0)` in POSIX.
-///
-/// ## Parameters
-///
-/// * `path` - The path to a file to unlink.
-pub unsafe fn path_unlink_file(fd: Fd, path: &str) -> Result<()> {
-    let rc = wasi_snapshot_preview1::path_unlink_file(fd, path.as_ptr(), path.len());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Concurrently poll for the occurrence of a set of events.
-///
-/// ## Parameters
-///
-/// * `r#in` - The events to which to subscribe.
-/// * `out` - The events that have occurred.
-/// * `nsubscriptions` - Both the number of subscriptions and events.
-///
-/// ## Return
-///
-/// * `nevents` - The number of events stored.
-pub unsafe fn poll_oneoff(
-    r#in: *const Subscription,
-    out: *mut Event,
-    nsubscriptions: Size,
-) -> Result<Size> {
-    let mut nevents = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::poll_oneoff(r#in, out, nsubscriptions, nevents.as_mut_ptr());
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(nevents.assume_init())
-    }
-}
-
-/// Terminate the process normally. An exit code of 0 indicates successful
-/// termination of the program. The meanings of other values is dependent on
-/// the environment.
-///
-/// ## Parameters
-///
-/// * `rval` - The exit code returned by the process.
-pub unsafe fn proc_exit(rval: Exitcode) {
-    wasi_snapshot_preview1::proc_exit(rval);
-}
-
-/// Send a signal to the process of the calling thread.
-/// Note: This is similar to `raise` in POSIX.
-///
-/// ## Parameters
-///
-/// * `sig` - The signal condition to trigger.
-pub unsafe fn proc_raise(sig: Signal) -> Result<()> {
-    let rc = wasi_snapshot_preview1::proc_raise(sig);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Temporarily yield execution of the calling thread.
-/// Note: This is similar to `sched_yield` in POSIX.
-pub unsafe fn sched_yield() -> Result<()> {
-    let rc = wasi_snapshot_preview1::sched_yield();
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Write high-quality random data into a buffer.
-/// This function blocks when the implementation is unable to immediately
-/// provide sufficient high-quality random data.
-/// This function may execute slowly, so when large mounts of random data are
-/// required, it's advisable to use this function to seed a pseudo-random
-/// number generator, rather than to provide the random data directly.
-///
-/// ## Parameters
-///
-/// * `buf` - The buffer to fill with random data.
-pub unsafe fn random_get(buf: *mut u8, buf_len: Size) -> Result<()> {
-    let rc = wasi_snapshot_preview1::random_get(buf, buf_len);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-/// Receive a message from a socket.
-/// Note: This is similar to `recv` in POSIX, though it also supports reading
-/// the data into multiple buffers in the manner of `readv`.
-///
-/// ## Parameters
-///
-/// * `ri_data` - List of scatter/gather vectors to which to store data.
-/// * `ri_flags` - Message flags.
-///
-/// ## Return
-///
-/// * `ro_datalen` - Number of bytes stored in ri_data.
-/// * `ro_flags` - Message flags.
-pub unsafe fn sock_recv(fd: Fd, ri_data: IovecArray, ri_flags: Riflags) -> Result<(Size, Roflags)> {
-    let mut ro_datalen = MaybeUninit::uninit();
-    let mut ro_flags = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::sock_recv(
-        fd,
-        ri_data.as_ptr(),
-        ri_data.len(),
-        ri_flags,
-        ro_datalen.as_mut_ptr(),
-        ro_flags.as_mut_ptr(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok((ro_datalen.assume_init(), ro_flags.assume_init()))
-    }
-}
-
-/// Send a message on a socket.
-/// Note: This is similar to `send` in POSIX, though it also supports writing
-/// the data from multiple buffers in the manner of `writev`.
-///
-/// ## Parameters
-///
-/// * `si_data` - List of scatter/gather vectors to which to retrieve data
-/// * `si_flags` - Message flags.
-///
-/// ## Return
-///
-/// * `so_datalen` - Number of bytes transmitted.
-pub unsafe fn sock_send(fd: Fd, si_data: CiovecArray, si_flags: Siflags) -> Result<Size> {
-    let mut so_datalen = MaybeUninit::uninit();
-    let rc = wasi_snapshot_preview1::sock_send(
-        fd,
-        si_data.as_ptr(),
-        si_data.len(),
-        si_flags,
-        so_datalen.as_mut_ptr(),
-    );
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(so_datalen.assume_init())
-    }
-}
-
-/// Shut down socket send and receive channels.
-/// Note: This is similar to `shutdown` in POSIX.
-///
-/// ## Parameters
-///
-/// * `how` - Which channels on the socket to shut down.
-pub unsafe fn sock_shutdown(fd: Fd, how: Sdflags) -> Result<()> {
-    let rc = wasi_snapshot_preview1::sock_shutdown(fd, how);
-    if let Some(err) = Error::from_raw_error(rc) {
-        Err(err)
-    } else {
-        Ok(())
-    }
-}
-
-pub mod wasi_snapshot_preview1 {
-    use super::*;
-    #[link(wasm_import_module = "wasi_snapshot_preview1")]
-    extern "C" {
-        /// Read command-line argument data.
-        /// The size of the array should match that returned by `wasi_args_sizes_get()`
-        pub fn args_get(argv: *mut *mut u8, argv_buf: *mut u8) -> Errno;
-        /// Return command-line argument data sizes.
-        pub fn args_sizes_get(argc: *mut Size, argv_buf_size: *mut Size) -> Errno;
-        /// Read environment variable data.
-        /// The sizes of the buffers should match that returned by `environ.sizes_get()`.
-        pub fn environ_get(environ: *mut *mut u8, environ_buf: *mut u8) -> Errno;
-        /// Return command-line argument data sizes.
-        pub fn environ_sizes_get(argc: *mut Size, argv_buf_size: *mut Size) -> Errno;
-        /// Return the resolution of a clock.
-        /// Implementations are required to provide a non-zero value for supported clocks. For unsupported clocks, return `WASI_EINVAL`
-        /// Note: This is similar to `clock_getres` in POSIX.
-        pub fn clock_res_get(id: Clockid, resolution: *mut Timestamp) -> Errno;
-        /// Return the time value of a clock.
-        /// Note: This is similar to `clock_gettime` in POSIX.
-        pub fn clock_time_get(id: Clockid, precision: Timestamp, time: *mut Timestamp) -> Errno;
-        /// Provide file advisory information on a file descriptor.
-        /// Note: This is similar to `posix_fadvise` in POSIX.
-        pub fn fd_advise(fd: Fd, offset: Filesize, len: Filesize, advice: Advice) -> Errno;
-        /// Force the allocation of space in a file.
-        /// Note: This is similar to `posix_fallocate` in POSIX.
-        pub fn fd_allocate(fd: Fd, offset: Filesize, len: Filesize) -> Errno;
-        /// Close a file descriptor.
-        /// Note: This is similar to `close` in POSIX.
-        pub fn fd_close(fd: Fd) -> Errno;
-        /// Synchronize the data of a file to disk.
-        /// Note: This is similar to `fdatasync` in POSIX.
-        pub fn fd_datasync(fd: Fd) -> Errno;
-        /// Get the attributes of a file descriptor.
-        /// Note: This returns similar flags to `fsync(fd, F_GETFL)` in POSIX, as well as additional fields.
-        pub fn fd_fdstat_get(fd: Fd, stat: *mut Fdstat) -> Errno;
-        /// Adjust the flags associated with a file descriptor.
-        /// Note: This is similar to `fcntl(fd, F_SETFL, flags)` in POSIX.
-        pub fn fd_fdstat_set_flags(fd: Fd, flags: Fdflags) -> Errno;
-        /// Adjust the rights associated with a file descriptor.
-        /// This can only be used to remove rights, and returns `ENOTCAPABLE` if called in a way that would attempt to add rights
-        pub fn fd_fdstat_set_rights(
-            fd: Fd,
-            fs_rights_base: Rights,
-            fs_rights_inheriting: Rights,
-        ) -> Errno;
-        /// Return the attributes of an open file.
-        pub fn fd_filestat_get(fd: Fd, buf: *mut Filestat) -> Errno;
-        /// Adjust the size of an open file. If this increases the file's size, the extra bytes are filled with zeros.
-        /// Note: This is similar to `ftruncate` in POSIX.
-        pub fn fd_filestat_set_size(fd: Fd, size: Filesize) -> Errno;
-        /// Adjust the timestamps of an open file or directory.
-        /// Note: This is similar to `futimens` in POSIX.
-        pub fn fd_filestat_set_times(
-            fd: Fd,
-            atim: Timestamp,
-            mtim: Timestamp,
-            fst_flags: Fstflags,
-        ) -> Errno;
-        /// Read from a file descriptor, without using and updating the file descriptor's offset.
-        /// Note: This is similar to `preadv` in POSIX.
-        pub fn fd_pread(
-            fd: Fd,
-            iovs_ptr: *const Iovec,
-            iovs_len: usize,
-            offset: Filesize,
-            nread: *mut Size,
-        ) -> Errno;
-        /// Return a description of the given preopened file descriptor.
-        pub fn fd_prestat_get(fd: Fd, buf: *mut Prestat) -> Errno;
-        /// Return a description of the given preopened file descriptor.
-        pub fn fd_prestat_dir_name(fd: Fd, path: *mut u8, path_len: Size) -> Errno;
-        /// Write to a file descriptor, without using and updating the file descriptor's offset.
-        /// Note: This is similar to `pwritev` in POSIX.
-        pub fn fd_pwrite(
-            fd: Fd,
-            iovs_ptr: *const Ciovec,
-            iovs_len: usize,
-            offset: Filesize,
-            nwritten: *mut Size,
-        ) -> Errno;
-        /// Read from a file descriptor.
-        /// Note: This is similar to `readv` in POSIX.
-        pub fn fd_read(fd: Fd, iovs_ptr: *const Iovec, iovs_len: usize, nread: *mut Size) -> Errno;
-        /// Read directory entries from a directory.
-        /// When successful, the contents of the output buffer consist of a sequence of
-        /// directory entries. Each directory entry consists of a dirent_t object,
-        /// followed by dirent_t::d_namlen bytes holding the name of the directory
-        /// entry.
-        /// This function fills the output buffer as much as possible, potentially
-        /// truncating the last directory entry. This allows the caller to grow its
-        /// read buffer size in case it's too small to fit a single large directory
-        /// entry, or skip the oversized directory entry.
-        pub fn fd_readdir(
-            fd: Fd,
-            buf: *mut u8,
-            buf_len: Size,
-            cookie: Dircookie,
-            bufused: *mut Size,
-        ) -> Errno;
-        /// Atomically replace a file descriptor by renumbering another file descriptor.
-        /// Due to the strong focus on thread safety, this environment does not provide
-        /// a mechanism to duplicate or renumber a file descriptor to an arbitrary
-        /// number, like `dup2()`. This would be prone to race conditions, as an actual
-        /// file descriptor with the same number could be allocated by a different
-        /// thread at the same time.
-        /// This function provides a way to atomically renumber file descriptors, which
-        /// would disappear if `dup2()` were to be removed entirely.
-        pub fn fd_renumber(fd: Fd, to: Fd) -> Errno;
-        /// Move the offset of a file descriptor.
-        /// Note: This is similar to `lseek` in POSIX.
-        pub fn fd_seek(
-            fd: Fd,
-            offset: Filedelta,
-            whence: Whence,
-            newoffset: *mut Filesize,
-        ) -> Errno;
-        /// Synchronize the data and metadata of a file to disk.
-        /// Note: This is similar to `fsync` in POSIX.
-        pub fn fd_sync(fd: Fd) -> Errno;
-        /// Return the current offset of a file descriptor.
-        /// Note: This is similar to `lseek(fd, 0, SEEK_CUR)` in POSIX.
-        pub fn fd_tell(fd: Fd, offset: *mut Filesize) -> Errno;
-        /// Write to a file descriptor.
-        /// Note: This is similar to `writev` in POSIX.
-        pub fn fd_write(
-            fd: Fd,
-            iovs_ptr: *const Ciovec,
-            iovs_len: usize,
-            nwritten: *mut Size,
-        ) -> Errno;
-        /// Create a directory.
-        /// Note: This is similar to `mkdirat` in POSIX.
-        pub fn path_create_directory(fd: Fd, path_ptr: *const u8, path_len: usize) -> Errno;
-        /// Return the attributes of a file or directory.
-        /// Note: This is similar to `stat` in POSIX.
-        pub fn path_filestat_get(
-            fd: Fd,
-            flags: Lookupflags,
-            path_ptr: *const u8,
-            path_len: usize,
-            buf: *mut Filestat,
-        ) -> Errno;
-        /// Adjust the timestamps of a file or directory.
-        /// Note: This is similar to `utimensat` in POSIX.
-        pub fn path_filestat_set_times(
-            fd: Fd,
-            flags: Lookupflags,
-            path_ptr: *const u8,
-            path_len: usize,
-            atim: Timestamp,
-            mtim: Timestamp,
-            fst_flags: Fstflags,
-        ) -> Errno;
-        /// Create a hard link.
-        /// Note: This is similar to `linkat` in POSIX.
-        pub fn path_link(
-            old_fd: Fd,
-            old_flags: Lookupflags,
-            old_path_ptr: *const u8,
-            old_path_len: usize,
-            new_fd: Fd,
-            new_path_ptr: *const u8,
-            new_path_len: usize,
-        ) -> Errno;
-        /// Open a file or directory.
-        /// The returned file descriptor is not guaranteed to be the lowest-numbered
-        /// file descriptor not currently open; it is randomized to prevent
-        /// applications from depending on making assumptions about indexes, since this
-        /// is error-prone in multi-threaded contexts. The returned file descriptor is
-        /// guaranteed to be less than 2**31.
-        /// Note: This is similar to `openat` in POSIX.
-        pub fn path_open(
-            fd: Fd,
-            dirflags: Lookupflags,
-            path_ptr: *const u8,
-            path_len: usize,
-            oflags: Oflags,
-            fs_rights_base: Rights,
-            fs_rights_inherting: Rights,
-            fdflags: Fdflags,
-            opened_fd: *mut Fd,
-        ) -> Errno;
-        /// Read the contents of a symbolic link.
-        /// Note: This is similar to `readlinkat` in POSIX.
-        pub fn path_readlink(
-            fd: Fd,
-            path_ptr: *const u8,
-            path_len: usize,
-            buf: *mut u8,
-            buf_len: Size,
-            bufused: *mut Size,
-        ) -> Errno;
-        /// Remove a directory.
-        /// Return `ENOTEMPTY` if the directory is not empty.
-        /// Note: This is similar to `unlinkat(fd, path, AT_REMOVEDIR)` in POSIX.
-        pub fn path_remove_directory(fd: Fd, path_ptr: *const u8, path_len: usize) -> Errno;
-        /// Rename a file or directory.
-        /// Note: This is similar to `renameat` in POSIX.
-        pub fn path_rename(
-            fd: Fd,
-            old_path_ptr: *const u8,
-            old_path_len: usize,
-            new_fd: Fd,
-            new_path_ptr: *const u8,
-            new_path_len: usize,
-        ) -> Errno;
-        /// Create a symbolic link.
-        /// Note: This is similar to `symlinkat` in POSIX.
-        pub fn path_symlink(
-            old_path_ptr: *const u8,
-            old_path_len: usize,
-            fd: Fd,
-            new_path_ptr: *const u8,
-            new_path_len: usize,
-        ) -> Errno;
-        /// Unlink a file.
-        /// Return `EISDIR` if the path refers to a directory.
-        /// Note: This is similar to `unlinkat(fd, path, 0)` in POSIX.
-        pub fn path_unlink_file(fd: Fd, path_ptr: *const u8, path_len: usize) -> Errno;
-        /// Concurrently poll for the occurrence of a set of events.
-        pub fn poll_oneoff(
-            r#in: *const Subscription,
-            out: *mut Event,
-            nsubscriptions: Size,
-            nevents: *mut Size,
-        ) -> Errno;
-        /// Terminate the process normally. An exit code of 0 indicates successful
-        /// termination of the program. The meanings of other values is dependent on
-        /// the environment.
-        pub fn proc_exit(rval: Exitcode) -> !;
-        /// Send a signal to the process of the calling thread.
-        /// Note: This is similar to `raise` in POSIX.
-        pub fn proc_raise(sig: Signal) -> Errno;
-        /// Temporarily yield execution of the calling thread.
-        /// Note: This is similar to `sched_yield` in POSIX.
-        pub fn sched_yield() -> Errno;
-        /// Write high-quality random data into a buffer.
-        /// This function blocks when the implementation is unable to immediately
-        /// provide sufficient high-quality random data.
-        /// This function may execute slowly, so when large mounts of random data are
-        /// required, it's advisable to use this function to seed a pseudo-random
-        /// number generator, rather than to provide the random data directly.
-        pub fn random_get(buf: *mut u8, buf_len: Size) -> Errno;
-        /// Receive a message from a socket.
-        /// Note: This is similar to `recv` in POSIX, though it also supports reading
-        /// the data into multiple buffers in the manner of `readv`.
-        pub fn sock_recv(
-            fd: Fd,
-            ri_data_ptr: *const Iovec,
-            ri_data_len: usize,
-            ri_flags: Riflags,
-            ro_datalen: *mut Size,
-            ro_flags: *mut Roflags,
-        ) -> Errno;
-        /// Send a message on a socket.
-        /// Note: This is similar to `send` in POSIX, though it also supports writing
-        /// the data from multiple buffers in the manner of `writev`.
-        pub fn sock_send(
-            fd: Fd,
-            si_data_ptr: *const Ciovec,
-            si_data_len: usize,
-            si_flags: Siflags,
-            so_datalen: *mut Size,
-        ) -> Errno;
-        /// Shut down socket send and receive channels.
-        /// Note: This is similar to `shutdown` in POSIX.
-        pub fn sock_shutdown(fd: Fd, how: Sdflags) -> Errno;
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasi-0.9.0+wasi-snapshot-preview1/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-//! Raw API bindings to the WebAssembly System Interface (WASI)
-//!
-//! This crate provides Rust API bindings to WASI APIs. All WASI APIs are
-//! exported from this crate and provided with the appropriate type signatures.
-//! This crate is entirely procedurally generated from the `*.witx` files that
-//! describe the WASI API.
-//!
-//! # WASI API Version
-//!
-//! The WASI API is evolving over time. It is both gaining new features as well
-//! as tweaking the ABI of existing features. As a result it's important to
-//! understand what version of this crate you're using and how it relates to
-//! the WASI version of the spec.
-//!
-//! The WASI specification is organized into phases where there is a snapshot
-//! at any one point in time describing the current state of the specification.
-//! This crate implements a particular snapshot. You can find the snapshot
-//! version implemented in this crate in the build metadata of the crate
-//! version number. For example something like `0.9.0+wasi-snapshot-preview1`
-//! means that this crate's own personal version is 0.9.0 and it implements the
-//! `wasi-snapshot-preview1` snapshot. A major release of this crate (i.e.
-//! bumping the "0.9.0") is expected whenever the generated code changes
-//! or a new WASI snapshot is used.
-//!
-//! # Crate Features
-//!
-//! This crate supports one feature, `std`, which implements the standard
-//! `Error` trait for the exported [`Error`] type in this crate. This is
-//! enabled by default but can be disabled to make the library `no_std`
-//! compatible.
-
-#![no_std]
-
-mod error;
-mod lib_generated;
-pub use lib_generated::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/azure-pipelines.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/azure-pipelines.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/azure-pipelines.yml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/azure-pipelines.yml	2021-12-09 12:01:26.000000000 +0000
@@ -11,6 +11,12 @@
       - template: ci/azure-install-rust.yml
       - script: cargo fmt --all -- --check
 
+  - job: cargo_check
+    displayName: "Run cargo check"
+    steps:
+      - template: ci/azure-install-rust.yml
+      - script: cargo check --all
+
   - job: test_wasm_bindgen
     displayName: "Run wasm-bindgen crate tests (unix)"
     steps:
@@ -87,7 +93,7 @@
     steps:
       - template: ci/azure-install-rust.yml
         parameters:
-          toolchain: nightly
+          toolchain: nightly-2021-05-09
       - template: ci/azure-install-node.yml
       - script: cargo test --target wasm32-unknown-unknown --features nightly --test wasm
 
@@ -131,7 +137,7 @@
     displayName: "Verify that web-sys is compiled correctly"
     steps:
       - template: ci/azure-install-rust.yml
-      - script: cd crates/web-sys && cargo run --release --package wasm-bindgen-webidl webidls src/features
+      - script: cd crates/web-sys && cargo run --release --package wasm-bindgen-webidl -- webidls src/features
       - script: git diff --exit-code
 
   - job: test_js_sys
@@ -178,7 +184,7 @@
       - script: mv _package.json package.json && npm install && rm package.json
         displayName: "run npm install"
       - script: |
-          for dir in `ls examples | grep -v README | grep -v asm.js | grep -v raytrace | grep -v without-a-bundler | grep -v websockets | grep -v webxr | grep -v deno`; do
+          for dir in `ls examples | grep -v README | grep -v asm.js | grep -v raytrace | grep -v without-a-bundler | grep -v wasm-in-web-worker | grep -v websockets | grep -v webxr | grep -v deno`; do
             (cd examples/$dir &&
             ln -fs ../../node_modules . &&
             npm run build -- --output-path $BUILD_ARTIFACTSTAGINGDIRECTORY/exbuild/$dir) || exit 1;
@@ -204,7 +210,7 @@
     steps:
       - template: ci/azure-install-rust.yml
         parameters:
-          toolchain: nightly-2020-08-27
+          toolchain: nightly-2021-05-09
       - script: rustup component add rust-src
         displayName: "install rust-src"
       - script: |
@@ -226,7 +232,7 @@
         displayName: "add target"
       - script: cargo build --manifest-path benchmarks/Cargo.toml --release --target wasm32-unknown-unknown
         displayName: "build benchmarks"
-      - script: cargo run -p wasm-bindgen-cli target/wasm32-unknown-unknown/release/wasm_bindgen_benchmark.wasm --out-dir benchmarks/pkg --target web
+      - script: cargo run -p wasm-bindgen-cli -- target/wasm32-unknown-unknown/release/wasm_bindgen_benchmark.wasm --out-dir benchmarks/pkg --target web
         displayName: "run wasm-bindgen"
       - task: PublishPipelineArtifact@0
         inputs:
@@ -287,7 +293,7 @@
           curl -L https://github.com/rust-lang-nursery/mdBook/releases/download/v0.3.0/mdbook-v0.3.0-x86_64-unknown-linux-gnu.tar.gz | tar xzf -
           echo "##vso[task.prependpath]$PWD"
         displayName: "Install mdbook"
-      - script: (cd guide && mv _theme theme && mdbook build)
+      - script: (cd guide && mdbook build)
       - task: PublishPipelineArtifact@0
         inputs:
           artifactName: doc_book
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"06d27794b727f8aa2f5733a45f1ac0497bcfcb2e315694b5b0d5317d06d4ee58","CONTRIBUTING.md":"aa138d76f5cb25bba1a6942a230373aaed6be73c619f945cc4657e13ba69f897","Cargo.toml":"34db41c69f2c5ced0f15814ad355fb2a567b832f97ed8e63fe09b895da46f5e6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"8e0075aceb58e5db84b7debf46f7a3fde437573f46fe9aad6421a3a081575cbe","_package.json":"d04520431717a75aa812eb4a7c88bbcff81cc57f5f039e1619e46227c87b69f1","azure-pipelines.yml":"b9ce72dcf9fef8db306551216f7ee607655e5d49fbb8aab9248ee9ac8d0990c4","build.rs":"95d57e593c411b82bf88819765d6422db2a65c1bf489b63f87e0aefeb721fc41","ci/azure-create-tarball.yml":"8e2cce86aa435e5c7a3157ac823a0504a3e5eef7874374a54a5e4dca5ec1020b","ci/azure-install-deno.yml":"ceedb00ee1e42881ad13b867f944ce30c795484e0b853d520d4bf98b6927c211","ci/azure-install-geckodriver.yml":"99ef5b459727286633b4f8316efce8efd33c772bac04bdc3622cc4c1ab5ddffc","ci/azure-install-node.yml":"10613bf7526a4657cbdb427d651562eb6311d54c7cd0ad73d312ac678e4a42cf","ci/azure-install-rust.yml":"86b468f1ae456075aba36fb1d4b2a350f8ac007e7dbef1823d6eede0e5552f2f","ci/azure-install-sccache.yml":"23ae4e3719ec41cd30e1a6d7d3cf9d6dffee79738ac47fd8093d9f052187bbe4","ci/azure-install-wasm-pack.yml":"1011ee0fdf9cb0bf573ffe1732d20f677bbbe2c00bf9ea87a94bc144522652c6","examples/README.md":"e5396e95d8130948e48b767ab505c46bc69f6ff3ebfe0d9709068cf42c250818","examples/import_js/README.md":"bb53d4a264e9a084effdc7a22ca7d5acca0207b411478b98782d881b7fcade51","examples/import_js/index.html":"f4825d155bfe0059aa182a506d6d076d1ba5f118e46365ac902b12f27a6c8c0d","examples/import_js/index.js":"d425b7b0636dc5c5046bc96e6bfe6ef3bb1503fa91c54f40ecb457a1b060ee5c","examples/import_js/package.json":"da910711f9bf3b26c748bbdb55bae122213ac273c49c7ec9bf1196fa58be8e6d","examples/import_js/webpack.config.js":"61ba2304a8e12c77eea472480f812e46b3796de686bf1fb08ec717b39cbc934e","guide/_theme/header.hbs":"a94999e7983c474807b9686d5b698a332fbfac2effacee10f06707bf7cebf27a","guide/book.toml":"d8cae5ae5fbeaab5b6852c64b975d37f51592a8e9eedba22c898672d9b11e9be","guide/src/SUMMARY.md":"01dce175c99749d6ade8c6996a0aab998c3e8637c9c9803ad7b1db4ab149beb7","guide/src/_headers":"401cee68df5967f0aa509a1b978a83f06e8e830deca1433964703e7a1ac2c646","guide/src/contributing/design/describe.md":"3186f9795be894708788e50d2ee745b9bd73bc94fb3dce67f3f1fd5e7fbd3659","guide/src/contributing/design/exporting-rust-struct.md":"02a4463173d1934daa96578e44647624bd11eb6b14ca5781d06f83cc16deba2b","guide/src/contributing/design/exporting-rust.md":"4dd822967bf2fc111ad69c1dc4619715b692349208e8780dd8f54b571fb57e2e","guide/src/contributing/design/importing-js-struct.md":"848d0b144b28a5ae1ca3760438e71b938cfb2ee350f5b902fd08c38a0a64e27b","guide/src/contributing/design/importing-js.md":"c949c8921c213ba21b08f705d4611304acba47b68c35484fe968a80194f3a9ab","guide/src/contributing/design/index.md":"3bcd35bfadc3fa81d26dcac23f2e2ab5c3e2874cb6a88d0d892c5effe535fb04","guide/src/contributing/design/js-objects-in-rust.md":"0a18922b509ed8a6cc6724b81af6e6d469b75b3796dba770949a8b59d8067455","guide/src/contributing/design/rust-type-conversions.md":"4170d0eb463c63d4a241b99f8f5738a359308a344dc2deeebc9f6a9478d7386d","guide/src/contributing/index.md":"e5115ccd2403b929d65acb9626bff8d66e10d1eb625a023ea017f2271a3e49c6","guide/src/contributing/js-sys/adding-more-apis.md":"d6626d530fa5b73f045a20bf123d5e261ac2ca3bd64cbb80b655612f9b9a6276","guide/src/contributing/js-sys/index.md":"9c0864ca52e8699148e789c2a6ba2d3044ba2358d7106a1b7fd725d3720dbb54","guide/src/contributing/js-sys/testing.md":"d1f613c88793ffce61b2d77aa40e3a91a1de3c73ab9f8eaedfc39da16c93ad07","guide/src/contributing/publishing.md":"012c31c7037ca084d0c2a65c2dfc0be6fcbe5c118307e9efbb4f6f781ae48e43","guide/src/contributing/team.md":"a3f993cb1afeee767e85077d135b1ea08850c433a69c436ebe6b7a48124ed945","guide/src/contributing/testing.md":"b6d45f2a177525e1fd9b7c8a0d47f0bc156a9327795bcb4d96716851f94ff2db","guide/src/contributing/web-sys/index.md":"6b4d5e00cbbcaab29295a3bd60e90b7f72b118758966622a307d9222488707c1","guide/src/contributing/web-sys/logging.md":"ee960ec9adc174183fb349acdbf5fc647b6f9a290022be9b118b9de37b8b5687","guide/src/contributing/web-sys/overview.md":"e6179317f75aa8e836e3c803f5d814e87119763709eea47b04cebc86c089d80a","guide/src/contributing/web-sys/supporting-more-web-apis.md":"f9025557f50a0d4361f8602752a827c18d92faefa09866225a2ae87ba44943c3","guide/src/contributing/web-sys/testing.md":"77f8e4b45bd0e27676dd503474bc32f91672b23c6ab7127a4f5b828dc8ea40e4","guide/src/examples/2d-canvas.md":"44a0eb82ec3398ee63a6df5aab103f1b002082eac2d129f656d8519cbc0829e7","guide/src/examples/2d-canvas.png":"b202cd79b20c00d49c40d71225eefea99306015858a432ceb7592d53c15300f7","guide/src/examples/add.md":"8dac740d6a4c499d868c29d8426d113da9cdd6ef22bf8084b8cf8c1de513b09c","guide/src/examples/char.md":"93f94a1b670322d0dc21b46d749909c414f9f254e2dd97afd8afe8cb0e5ab908","guide/src/examples/closures.md":"669dfc47a670271d7ce7a3bd2c08620b698b01ea8b2a7b1cc2047a77e7617130","guide/src/examples/console-log.md":"6552f4d766291cddc0eade75e4f64de9f10e00b89a0bedb1b15dcf7baa90b6e0","guide/src/examples/dom.md":"44ad74370b3727ec98f958273c639e767f2ae5b75e96ef53e74be1833a630272","guide/src/examples/fetch.md":"0a519315f50bf9e695dff6dc6899f0b8784f62b0ed18b5e85d99808bf111425f","guide/src/examples/hello-world.md":"2687677493080354ed7f17d32dd71e2baea8949604ef2f4ccf92dd43d9e64c67","guide/src/examples/import-js.md":"0480a6aa32b1fdc1347cb3d0c4f2a006caeb33c75ed21eb78ad800f012cbc2c6","guide/src/examples/index.md":"4e629f42d7bfb52bc35856b6e21c3aa7433563482697212d7b54f1bf619b56ed","guide/src/examples/julia.md":"0cd4ae1de24d657d7869c984dec61cc8b796621365be633212bdb2a6d57ce727","guide/src/examples/paint.md":"06c6c04f121080e0e5600b4ad300df9e93b5d4b6342f42c421e6dec1f2955ced","guide/src/examples/performance.md":"de888713cf0a047bd4a28a1ca890be51d99b6aaabc9a2b134280b768a7148377","guide/src/examples/raytrace.md":"e4bc7b6ffbec0486e83ccdd02db8da9b430da17e7b2c898f4ae72be55a449a13","guide/src/examples/request-animation-frame.md":"26eef6b203acc0b2667d9c4380c39a44eb4b97991efeded9ca32cc9ab454e993","guide/src/examples/todomvc.md":"b872c5631eae969368d147342fca16dadb6f0412f8922230c27271370e9d3d97","guide/src/examples/wasm-in-wasm.md":"5439a690e7107736e6f8b92e475f0a45e83ab9a1e5a0fe02e8f6dd93372590c6","guide/src/examples/wasm2js.md":"48f953dfa1b17b68e5d983231e991797e32e9bc22b9c3db72c2d055e08449a00","guide/src/examples/weather_report.md":"184bf64d58820b032a80c738050e7b2cd0042eb722f61c7e8a3c531239f72db2","guide/src/examples/web-audio.md":"32bb18c9e4f167614ce3fb61d1d04265449f88da40949834b50baf9e37063fbd","guide/src/examples/webgl.md":"15570a0a081c2301981a1fbca0bd39dfcf35221c64ddfb8e8f4477660658cb08","guide/src/examples/webrtc_datachannel.md":"47b06b1b00c41f048fad3c2206399cae2d8dbd90b6d83953c138826f11677eb5","guide/src/examples/websockets.md":"704f9d5c1d13426e6e64e132cb0204be3c10a54dbfa5f1c834adc4efb4a1b8d2","guide/src/examples/without-a-bundler.md":"fe0e38f351bbdac3cef7863858100a1d3cdc3daf572fc9e54ba4a8ada0577667","guide/src/introduction.md":"057e81f8f62d8647e51d1269bdb5788654be2e22fea23d155ec5a15bbf8bae1d","guide/src/reference/accessing-properties-of-untyped-js-values.md":"a91e3eb706ddd15628072978906e2faca31560de616c0630316d9f6eff6b55bf","guide/src/reference/arbitrary-data-with-serde.md":"1c76d778bff4feeab43d3e0a783ef2f9fba25fb799847c199a4dc4ed7226894e","guide/src/reference/attributes/index.md":"12b57ebbd0c9ba42d9f10d752c9943d9beec90d659d1b1ff9e9bfea02572a2c8","guide/src/reference/attributes/on-js-imports/catch.md":"da230e6986ca29f1e82313b82275ab9c3b2144906271cf82b27772541d781d84","guide/src/reference/attributes/on-js-imports/constructor.md":"89f8be11c567b4611c84209b34351238553d5360d7f7665ea25332e1544c5b99","guide/src/reference/attributes/on-js-imports/extends.md":"84ece37398ba0df66f890982315f082c52b5f027e03c20527755abe610c2567c","guide/src/reference/attributes/on-js-imports/final.md":"f8a551231fd67b0c450d7e1b00ec42bf42a85184e2f9e66bbe540f6d461dadb6","guide/src/reference/attributes/on-js-imports/getter-and-setter.md":"27f3c2738688a43e611524e5e3ab7174a1993026a69098b75780a388aeb5e745","guide/src/reference/attributes/on-js-imports/index.md":"2219a4514fe9597cbbe6c46014b57c38f1e85f3d0775a8a7880f50858cb13633","guide/src/reference/attributes/on-js-imports/indexing-getter-setter-deleter.md":"11d5c03f922294894fe0147fae96e04b26a5adb36ce91296e52729a9fe5931c2","guide/src/reference/attributes/on-js-imports/js_class.md":"d51c5f05b71bbf6b6ec8e0c36314ae299fd7eb07be989e721b79b599405b3486","guide/src/reference/attributes/on-js-imports/js_name.md":"ddefa4133b95c80b9c0c81337f416f9842b53b4ec471b41756a9e425cdc68f07","guide/src/reference/attributes/on-js-imports/js_namespace.md":"e523dffa8b3110f1a17390d6bcc6c9c41c23e0a1e549f68a0aaec153ee2d228d","guide/src/reference/attributes/on-js-imports/method.md":"d54246efce5d7a104702439ba509bcc5bfbb0b57253edebdb696617daca80bcd","guide/src/reference/attributes/on-js-imports/module.md":"b47cd5ccbb69955f1d47101accc96fcd562abecbf7e34826f7f3c585d6b9dad0","guide/src/reference/attributes/on-js-imports/raw_module.md":"f363e5f3bc401b7e350eeec49cffde85dfb2346d597f38d98993fe5bfb9ff649","guide/src/reference/attributes/on-js-imports/static_method_of.md":"d5a5d9623ee55097f26e190b478e75f2e7d2ffc30e51ec647f39933d3d4e3b18","guide/src/reference/attributes/on-js-imports/structural.md":"364e01a5792029e9a5fa582375736efcee006352834ee273d218da89b77dd8bf","guide/src/reference/attributes/on-js-imports/typescript_type.md":"9cae454e9134ca1d14e2af3c732f370335332c615bf03ac49e525ff6f1877cbc","guide/src/reference/attributes/on-js-imports/variadic.md":"4d06bcf7538f97e5d5509bc34b2c0948286cf81fddcfda75e11ce386d323bb63","guide/src/reference/attributes/on-js-imports/vendor_prefix.md":"47a8d47e0cd745cca697f6d944e145f02695ca422255c3d6e1c9b2b719994b1b","guide/src/reference/attributes/on-rust-exports/constructor.md":"d3878fdb36174e5662ccfdf0fb027ef8175a7f8ca14ccca875217e03f5d5be1d","guide/src/reference/attributes/on-rust-exports/getter-and-setter.md":"464a2d41a791bd8ba5a8b1c4aa64b2f865c42b98a2d1289bb65e766e98a1b56a","guide/src/reference/attributes/on-rust-exports/index.md":"9fe778a0dd013a874db484cb22b1d9867bfe6d69cfbbe5cfeaa8ab78cf19daab","guide/src/reference/attributes/on-rust-exports/inspectable.md":"52fbcfdb83c426430a95692d566a4709255e25b24be5704d7378a4196a8c5908","guide/src/reference/attributes/on-rust-exports/js_class.md":"f4c0d8e8021001578f7d300e88c438d1a7806c17cc0d8acc3b4134922a75affc","guide/src/reference/attributes/on-rust-exports/js_name.md":"77f035b6391b9e44f254a411ba18687c5fa6110e276be73b5ea347701c8dad42","guide/src/reference/attributes/on-rust-exports/readonly.md":"a5da847ad36557f03b1c79a83d14c219dce914021266133c204260bc041b9b89","guide/src/reference/attributes/on-rust-exports/skip.md":"b9972241b8d473d1a46ef3c2861065ca296cdc923883c404f19f1d859bf914a6","guide/src/reference/attributes/on-rust-exports/skip_typescript.md":"1622c29b0d93a884bd0b5b2a62107a594e2919758c80592566e7786efe788b89","guide/src/reference/attributes/on-rust-exports/start.md":"00acf5bcc40abea6ba89a20dab20e2cb17396ce07fc75d15bba0351dd9b7de81","guide/src/reference/attributes/on-rust-exports/typescript_custom_section.md":"9b96a30f81dd5e218953b85d823e429356723e8a6cd8aff3be0869b10d849a0a","guide/src/reference/attributes/on-rust-exports/typescript_type.md":"86eb29f89467c742fded3935b4422422c7e4a76a0bed952e2c526dc993165c72","guide/src/reference/browser-support.md":"620f890700a27b9face8bab816e786271c02e3f92fce3c87b04ff6e45172e632","guide/src/reference/cli.md":"df0dc0b4f4034da730c887847d09e4871a1831b0a76e664f11c1f2ef776cce08","guide/src/reference/deployment.md":"1e4ea7ae7e6c89ad22566b0eec034a629fb332db6c352f671c5fc6afa7d0a9fd","guide/src/reference/index.md":"c603c3a7f265afb7c7b5eb391b32f6115f8842f3f422fd3730be4f90c4796bc4","guide/src/reference/iterating-over-js-values.md":"ec00f09516eb7de98bf7296f44b6aa9ceee3fae1dcdb7cdf8f36963d45b7ebeb","guide/src/reference/js-promises-and-rust-futures.md":"5f0c0b990f5b55c8d9485f7cc66a617f79cc232705562f306af97785c7ed1f79","guide/src/reference/js-snippets.md":"dff5adcbf66f06322e606c672ef070c2a0375f1ae592ca8a9da36a50324735cc","guide/src/reference/optimize-size.md":"c10abc1ea0902c9a57b74808bcf75bf092c0c2bb4082962b85d18df7593602c1","guide/src/reference/passing-rust-closures-to-js.md":"aa18f75ffd4b7779a2699b1bf969245ec0e1a70b24abe61e8877c2eb65f6ef60","guide/src/reference/receiving-js-closures-in-rust.md":"fc9c80ba5e1a5f243a66f68caba27e8103652aeac3765a9fad2d0e16113fede3","guide/src/reference/reference-types.md":"91d178b7fe2ec82eec4d8926a08b39ac16898172d6f65aee84347c6918033c67","guide/src/reference/rust-targets.md":"467d5cf7eaa1d4b89f9f5b2248cdd1a10340ca1db263ffff5c483ce10dcfbf54","guide/src/reference/types.md":"859123f51fa932fa37d7e47cd5c46956929793bd3accea050d3be516080ed78f","guide/src/reference/types/bool.md":"e954d93ec5096837d4dd2db3f23e71c14483279e347ca8908ecb49aded6e497a","guide/src/reference/types/boxed-jsvalue-slice.md":"e5008b10252697316f0a7a0cce06373c021589bdbee1c3f67baea8f274a19e03","guide/src/reference/types/boxed-number-slices.md":"1a217a68ff549f4208f99863d6616521c9d466542c1156bcc2be7d3a73e4edd4","guide/src/reference/types/char.md":"01f2f7bdb25a9a52edd93dcbbca6a29269a8d5adf6cb94dcadea29a7aace22f4","guide/src/reference/types/exported-rust-types.md":"d783b4d4bbcb046b62a912302d344cc5a0022e2119abe560fd1bf8437a6b6cfa","guide/src/reference/types/imported-js-types.md":"e12807f46bb55f4ad9dfde4cd683b3e7f9ee79302e5a0250ef24a52bd7ef71a3","guide/src/reference/types/jsvalue.md":"46d74da47f8a517249de4dd096351c10d658d9c3535950a34c1fc5d5b42eb2f7","guide/src/reference/types/number-slices.md":"f380258fc058527c7dd6f49664a4e9dff69f0b03d626071aeb61efefb2a0b646","guide/src/reference/types/numbers.md":"cce95c07be08c1f16327fd4c7e79b7c480db9cc95e2b07514d31e51bd6122101","guide/src/reference/types/pointers.md":"3710b736f790a97a325b1883d5fa8104c16365446ef702e9dd29bda74699043e","guide/src/reference/types/result.md":"0a13ebc421285ff20fade7b897b79a7baf17dd2f7d50d8b47bd9813068bdc6eb","guide/src/reference/types/str.md":"6cc086b02ae3d3565678e69d91dbf105f1f310009097a37fad4c812e25d4b7c0","guide/src/reference/types/string.md":"9e42298135e0aec11bb924e3a2b5002335cfe290240b48db12dc981156177cd0","guide/src/reference/weak-references.md":"09cb9c4e19304db30f163974860b3c027e681fe260769453074c7ecf15afa61a","guide/src/reference/working-with-duck-typed-interfaces.md":"a23f1f98019fed2060e1fbce954ec457e77a3a17524f34ca861d256d2ad4b6ef","guide/src/wasm-bindgen-test/asynchronous-tests.md":"7dfdc35e62c8a5be55d83e28ea2f4cf153b87150bd82f3ce27c7ce4613ecc919","guide/src/wasm-bindgen-test/browsers.md":"d8619911d57d56eb027cb040f3456a55d0f14f670c50e4eb2e58c1331206dde4","guide/src/wasm-bindgen-test/continuous-integration.md":"5865990ef231b3c99a9c1bc18f7b7f054a29b77ac7b671fcf1cd6bb4f4304ae8","guide/src/wasm-bindgen-test/index.md":"64fbcd222c3c597109d2717a3574abf2041ff325c26ee07d58c4cd7ba1c1f8ad","guide/src/wasm-bindgen-test/usage.md":"a1da64eaaf8fe9bea366724e08a4ba63dc984f86a28cc393fe00dc394ab244d6","guide/src/web-sys/cargo-features.md":"0e50067a7a46cee3d1b21a2690aabc539379cb1452de377ebaa0eaa4e5e587b2","guide/src/web-sys/function-overloads.md":"90a08bb955f7c79e573f83c31d5e7431ae1e3ad7001792ff8ff52e4299364fcd","guide/src/web-sys/index.md":"345499d0840fd23a2e5eb5ac497665decbb3f836fe9f4f88301ae4b5fbd8d44f","guide/src/web-sys/inheritance.md":"8f18af20b930497e2fae4a266dd27e317d1ea3510266c21b32f351354b495ff2","guide/src/web-sys/type-translations.md":"687ef5e4a3961fddcb94d24f69abec0ea64f6df306f4593974b69589215980b1","guide/src/web-sys/unstable-apis.md":"e74c3e72136d6906dd60258a27f34e1ea4612e7c8e95662596475dc557151cfb","guide/src/web-sys/using-web-sys.md":"523e16af6e27703a4a0582568bc97710350222af20801907268d2d8c197fb667","publish.rs":"29a5316fb8b45712611bb77203640c3dcfef57838c2bb67031b8589fc02286a5","releases/friends.sh":"f896ccdcb8445d29ed6dd0d9a360f94d4f33af2f1cc9965e7bb38b156c45949d","releases/release-announcement-template.md":"fcb3c75cdb8d5d6ce8a198f5570c967313f751d1eef0790b34a518772b2e8a38","src/cache/intern.rs":"b78abd7502ad069bbeb61073d1972c717a469849222037565b50514192c187a9","src/cache/mod.rs":"8989143b55160dbc142cb20c6e066cf0a3f70d6c97fbc9aa0fac59bd62bd865b","src/cast.rs":"1b5bc35d55bcee4e281ca5d0323a84c7f393c0c6235876d8e3056c9d85acc5af","src/closure.rs":"8a831abe7de9bb3913c0aa9b52a1a61dbb0b9331a10f82d2625b2a59a97979aa","src/convert/closures.rs":"0a7a8d4e8dfc662aa6612ded8e336e2eaafc17d06bde7016ab37555431f51196","src/convert/impls.rs":"0cdd24de9d3a3d2f147dda9eeacf429bca06ba541e52c2de2cfbe218e51cb271","src/convert/mod.rs":"566ffd1f546afdb8d24c6c0d6faa00a28596a67ca6f2f39e9485add54400443c","src/convert/slices.rs":"7e34ea5ed87e63387b1084c864ee30b7c1064047f93f691f6b0c1d38a3034a63","src/convert/traits.rs":"3fb24549cc21c2964997c6fc39b88f1d7d6bf6deb1e3cf6341a7e07a406b5d01","src/describe.rs":"3d3674447a9020042a477c2bbce99269b48cb22f72b286a794e77fe0a3354233","src/externref.rs":"cc1883fd0e0a2c64421fd12326908c0fd9aa73bba618c89cf17cc2efacd3fe70","src/lib.rs":"221c32714865ccdd39b64c552c43e98b66723492e8e453fddbc8c034a70d7479","tests/headless/externref_heap_live_count.rs":"41b2758762c91bd2d05995b1b8989651a6bf2e586ffad5597ff63f6d2dc6d755","tests/headless/main.js":"6de0a19b91330e9bc68334c4f1fa11c1cd6bf273f5ea3e470933ad800c962679","tests/headless/main.rs":"d86245fdd476cb6c275c0649d76fd348ab55b7952ece325c1ed4ec00051a1f73","tests/headless/modules.js":"a407c81d2670309ed484adf98a2e522f6ea031b1286416eb7bf184df7433d5da","tests/headless/modules.rs":"74f77f88bb5280862c06087d78c48ba930736e58db9a1e6c80450bb0e032b789","tests/headless/snippets.rs":"baf9d3c68e1b567fcba4e073cc0d24a8f039955e10dd1275e4a389574ff556d7","tests/headless/snippets1.js":"8bd0c367fdbc61f509728255750094bb36200a1aea74079611ad7cfa9c5f3f28","tests/headless/strings.js":"fca2d7a1afae31663607f956134a4f447aaee0f85d828addc3c4c1440f2e18e5","tests/headless/strings.rs":"4a64d8a4f9329a282d0f87408c0645ded71a7d023eaad40a32eaf60886a08375","tests/must_use.rs":"cae67a8740cd2c969a6b33316cd5036639048d9bbfecf55a5f45faaa624de1d0","tests/non_wasm.rs":"fbc7f10d3604f3c867f031cd218c2b29af2b42b1225495837ad5560878930ab9","tests/std-crate-no-std-dep.rs":"47f0e32bad7b9b11ca77d66d904eb3408c3528732899479039fb6db4c6e9ed9e","tests/unwrap_throw.rs":"79f05fa37249cea08689592d53d856019a90fd1b72c41413f7fcda5cf5913356","tests/wasm/api.js":"0f2038b83f3038d5fa6a4c889b7ae39471c763d77cba73ff7d2a211315fdb150","tests/wasm/api.rs":"415a752b1836e3784f73f684d32b4ae1ffd001f122c713d1affe426bb57bfe67","tests/wasm/arg_names.js":"0d7de3801257e18756a974bdd2950d2fb06755f7c0d1c681e03b56d97e828e34","tests/wasm/arg_names.rs":"decd8f71a58ebf662a586b7f19e41f6666782df0da74a8a2c69b7a504661dd79","tests/wasm/char.js":"6f307035f2689f0827726503f201f8fd591100ff051a55bda23ddcaeaa2902f1","tests/wasm/char.rs":"44dc134f9057e6c91da32c7fdba5ba10785507ced161c07267548ee08308e6c0","tests/wasm/classes.js":"6fa16e7e29d07c473d96caefb86a262207336288dc8047471e5be67b89871bb5","tests/wasm/classes.rs":"5755f49f40472c0feabdfac626759fe5670f0094fe3361491b8848f1f19286b6","tests/wasm/closures.js":"d42c37d6bdd1af6a345b39211289a936d6358d224cc32a23bd700dc853a885da","tests/wasm/closures.rs":"9e47bf12f036169a7144e02ab58877353f37877820fc8ea989952e18b08c5d43","tests/wasm/comments.js":"2c3bf2e79ecc33f0fba33d13a91a1ae9390f9f7a466af8eb215636662e20462a","tests/wasm/comments.rs":"5a0068fe3e214c07da92a46b6e45a2771fbd8e04f14cb7802f32082b87a459a0","tests/wasm/duplicate_deps.js":"2226e4f65525c545ab45109879b16b2a92341b440178e75d3a9efb3ed10f7b03","tests/wasm/duplicate_deps.rs":"3a91569e54f56e178dc164f2d2b8537ec6a10b3161c23e1cc8e552805cd868f4","tests/wasm/duplicates.rs":"a2b4a7960e8a7c9b3fda943e8aadb7cbc0ba8fa1a6956baf40ba2f129bd591ee","tests/wasm/duplicates_a.js":"d3d685e95a54b911c2b9a64f7c0f245e3e492491368355044ae2cd12c3332044","tests/wasm/duplicates_b.js":"cd6c87905a5c5514239bba52a03e6c151d79a57a477f52a073b61ef18c98f642","tests/wasm/duplicates_c.js":"93399409996d182b5fe02548d3c5c3e1681939629e0261d6f19f8c1ee3b08dfc","tests/wasm/enums.js":"7b37ce390aba76477e4d54c5214624cfc5eec49e0f88ef6f535f06f23527864f","tests/wasm/enums.rs":"1537fda37a051340722c29cb5aadc9e1819a2e609f2569ca4fd972308d03fc7f","tests/wasm/final.js":"cfa7c496291f08b98f0406190ee4deaab9ade890d65ada4c223a76135e66f619","tests/wasm/final.rs":"25b0a85e87686e3f7a7a44e3ac25402d504eec7f9813a74ffd63c5f4428ee0ff","tests/wasm/futures.js":"a3cc2a94bae02441a1fa1c4defa78b5a00cb7943b42b6c284496013c17ff3008","tests/wasm/futures.rs":"64b3569b60423465a552fd05f62080063b808761a7794714f9be2391b662cadc","tests/wasm/getters_and_setters.js":"f47937a52d49bce9fa8e7c73653bf25732807097c19f439898b387189aea7bc8","tests/wasm/getters_and_setters.rs":"acd4b4fed47a8be83e6972ce51ae7f988117a6cb45e47af4109b983216ed5843","tests/wasm/import_class.js":"16e8269479a1354598901f38bd3ec4ee2a8847df59932b55999e9923e369db03","tests/wasm/import_class.rs":"5ce1419eb5342d377578ea1eac60fe31502f32eb8579625496cc4883e5210daf","tests/wasm/imports.js":"0d38ba5259f2dd19575394400ba0cbf9ef7a5f3e61ea19d43b87f46b52065391","tests/wasm/imports.rs":"2c544ff24a55d85f9cf53f38574b128dcb9cec52a213b2a1682023718d10b748","tests/wasm/imports_2.js":"ab251fc0a0a1921c60d316160bc120fd97da3c3753804174cfda2f08ff43208d","tests/wasm/js_objects.js":"962db96335b8600678f733ab2469bb6d28db025179940502133801ae2cc0c3e8","tests/wasm/js_objects.rs":"9941fd49a0a87680c28aea008460e37293d1451cbfd12410f6ff0f8b7bc92434","tests/wasm/jscast.js":"d678058645d2d370c45ec5fd5bc9b94612b1e70035a9e0f524c134369f06fe1d","tests/wasm/jscast.rs":"f9abd0442be8f5b28e135c7d6a671a65939d0ff0ba993537c06b2be968145bcd","tests/wasm/main.rs":"626f65c3b1ba673341df8a926df202453e867ef9f56648abe45034ff8c829ab4","tests/wasm/math.js":"9deb196ab7ad3d5d1f98d7d0b6ee60cb125212a4a1281ba0141cc3713fdea892","tests/wasm/math.rs":"be9000d84c6b6b091455e3b20ee7f5a88dbcfc0d38db97fad3dd167970c4b4a3","tests/wasm/no_shims.rs":"83636fee1ae0ae5b98d76b7f62f637824e77edd7a55fb27749b1a88b3910d6f6","tests/wasm/node.js":"ec3a9500773c7f07a7bcf002e23aa3848be5208147c3d750281a1e1f6d899af1","tests/wasm/node.rs":"fe140900d7048353ce0e518a1e67dedb1928f0cf34c02514498184fd8aef10cc","tests/wasm/option.js":"0d0cba722045698e9621f2565acf854bf3085c8739622798085aaa6b58e3edbe","tests/wasm/option.rs":"d82123f7349e22873e636341a52e99e256213e77d4d7ab8450ba6379be2128b7","tests/wasm/optional_primitives.js":"37484639631e1c50bdc055a08babff18d4be9f7a9291f0f3395e1a7c519e5cac","tests/wasm/optional_primitives.rs":"502803cf27b78dd8a6c1d75ae954b71cc017f803486867a87c0474e5d53a6567","tests/wasm/rethrow.js":"0a495a8d1b735277e18cc3fc3edf8bd2a72586441d3884134182e5052786ab84","tests/wasm/rethrow.rs":"59dcf192c9e85b0d98031c135d2aa2eda4902a2bc5b740a9ddf1e75dc9cdd23e","tests/wasm/simple.js":"3890fa19585d031821e8db80de06593e8e5ce83c9ba8214fe1cef319e9c14fbb","tests/wasm/simple.rs":"5487804ed159538fa8722444c9c2db8929b6056692ae67991d72489f90194849","tests/wasm/slice.js":"2e3c42c6ebeb832f42e99e4f251817bd13083eff0b7c45c46fb4d7ab2aa740cd","tests/wasm/slice.rs":"511eb693d0ac56bde149c37039fb207ee4f0b1b92db2a809306f5ac80d578dbd","tests/wasm/structural.js":"ac504a1dbb7222c70270530a284eec56ace0bc47b95e8f9331f4b2df1d28c3f9","tests/wasm/structural.rs":"dda0e9cea09b94dd84ae39d6cf0949aa305062b7a466fdcb53370f5ee9e3dff5","tests/wasm/truthy_falsy.rs":"b54206b376f7413c9cce1792df65f57ed1e97660b4be8d9486e9c6af00f6893f","tests/wasm/u64.js":"bb78df1d7f3ea5939d622517f54b39e8d6ed901c3f706c744306c8a9fd9f35d7","tests/wasm/u64.rs":"430ed26db8bef1988debb23f6b508b951dbfd2b1a6ad9ac00c2d3386c747c733","tests/wasm/validate_prt.js":"a726a85f4805648d9e69c804a266bbedaed942228a1b3a46274a91bcb83eafe9","tests/wasm/validate_prt.rs":"cea3db07f10d2bf057af99b90655179371bccf1db67e7364d476b00ecbf24a93","tests/wasm/variadic.js":"30d3bb656c0eb29b69c7e653f3201b5210b8a78e962b4678336c4d9889182adb","tests/wasm/variadic.rs":"9ad5dcc8129e634452b7b40c6696d42211149bbd9d7cc6fc1eb98a9f3b21b81b","tests/wasm/vendor_prefix.js":"1424c7fea77fea13179a50030afeffdf4b277dcb6d7b1e5ce3eea681ec2c47f4","tests/wasm/vendor_prefix.rs":"59393b2098bfa76c0abbe1de26734c3fe7dd573af74ce87bd41e528b77c2d614"},"package":"3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"7a3e2f3ea06a84b1736dd26ab0ce01ab30f0812670af04ead74adc36891b9115","CONTRIBUTING.md":"aa138d76f5cb25bba1a6942a230373aaed6be73c619f945cc4657e13ba69f897","Cargo.toml":"923104efe4c0b33845014d21a8675d0b4d611b443b565c070ffdd39ae4da6467","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"8e0075aceb58e5db84b7debf46f7a3fde437573f46fe9aad6421a3a081575cbe","_package.json":"64c943903ffc064a2c5506e46fce690d7f566589d0d8e71804ec1638d1aabad5","azure-pipelines.yml":"18a6d0d6e61d119e84a1b45e5a5ec9858940342d226e26185baf8fd10f0d9d6c","build.rs":"95d57e593c411b82bf88819765d6422db2a65c1bf489b63f87e0aefeb721fc41","ci/azure-create-tarball.yml":"8e2cce86aa435e5c7a3157ac823a0504a3e5eef7874374a54a5e4dca5ec1020b","ci/azure-install-deno.yml":"ceedb00ee1e42881ad13b867f944ce30c795484e0b853d520d4bf98b6927c211","ci/azure-install-geckodriver.yml":"99ef5b459727286633b4f8316efce8efd33c772bac04bdc3622cc4c1ab5ddffc","ci/azure-install-node.yml":"10613bf7526a4657cbdb427d651562eb6311d54c7cd0ad73d312ac678e4a42cf","ci/azure-install-rust.yml":"86b468f1ae456075aba36fb1d4b2a350f8ac007e7dbef1823d6eede0e5552f2f","ci/azure-install-sccache.yml":"23ae4e3719ec41cd30e1a6d7d3cf9d6dffee79738ac47fd8093d9f052187bbe4","ci/azure-install-wasm-pack.yml":"1011ee0fdf9cb0bf573ffe1732d20f677bbbe2c00bf9ea87a94bc144522652c6","examples/README.md":"e5396e95d8130948e48b767ab505c46bc69f6ff3ebfe0d9709068cf42c250818","examples/import_js/README.md":"bb53d4a264e9a084effdc7a22ca7d5acca0207b411478b98782d881b7fcade51","examples/import_js/index.html":"f4825d155bfe0059aa182a506d6d076d1ba5f118e46365ac902b12f27a6c8c0d","examples/import_js/index.js":"d425b7b0636dc5c5046bc96e6bfe6ef3bb1503fa91c54f40ecb457a1b060ee5c","examples/import_js/package.json":"bbbfbfa1a62779e38ba30c920d27aefaaf10bf6add3a89a65b7d2b093c1fe017","examples/import_js/webpack.config.js":"fc314556d2f0c6266cde7c47afaceebe474be97c0401985a23d822ad9dd0105a","guide/book.toml":"d8cae5ae5fbeaab5b6852c64b975d37f51592a8e9eedba22c898672d9b11e9be","guide/src/SUMMARY.md":"6106bc9c192c9b2b95a34b09bd67a014894073ff74567161a090eb3a46193a72","guide/src/_headers":"401cee68df5967f0aa509a1b978a83f06e8e830deca1433964703e7a1ac2c646","guide/src/contributing/design/describe.md":"3186f9795be894708788e50d2ee745b9bd73bc94fb3dce67f3f1fd5e7fbd3659","guide/src/contributing/design/exporting-rust-struct.md":"02a4463173d1934daa96578e44647624bd11eb6b14ca5781d06f83cc16deba2b","guide/src/contributing/design/exporting-rust.md":"4dd822967bf2fc111ad69c1dc4619715b692349208e8780dd8f54b571fb57e2e","guide/src/contributing/design/importing-js-struct.md":"848d0b144b28a5ae1ca3760438e71b938cfb2ee350f5b902fd08c38a0a64e27b","guide/src/contributing/design/importing-js.md":"c949c8921c213ba21b08f705d4611304acba47b68c35484fe968a80194f3a9ab","guide/src/contributing/design/index.md":"3bcd35bfadc3fa81d26dcac23f2e2ab5c3e2874cb6a88d0d892c5effe535fb04","guide/src/contributing/design/js-objects-in-rust.md":"0a18922b509ed8a6cc6724b81af6e6d469b75b3796dba770949a8b59d8067455","guide/src/contributing/design/rust-type-conversions.md":"4170d0eb463c63d4a241b99f8f5738a359308a344dc2deeebc9f6a9478d7386d","guide/src/contributing/index.md":"e5115ccd2403b929d65acb9626bff8d66e10d1eb625a023ea017f2271a3e49c6","guide/src/contributing/js-sys/adding-more-apis.md":"d6626d530fa5b73f045a20bf123d5e261ac2ca3bd64cbb80b655612f9b9a6276","guide/src/contributing/js-sys/index.md":"9c0864ca52e8699148e789c2a6ba2d3044ba2358d7106a1b7fd725d3720dbb54","guide/src/contributing/js-sys/testing.md":"d1f613c88793ffce61b2d77aa40e3a91a1de3c73ab9f8eaedfc39da16c93ad07","guide/src/contributing/publishing.md":"012c31c7037ca084d0c2a65c2dfc0be6fcbe5c118307e9efbb4f6f781ae48e43","guide/src/contributing/team.md":"a3f993cb1afeee767e85077d135b1ea08850c433a69c436ebe6b7a48124ed945","guide/src/contributing/testing.md":"b6d45f2a177525e1fd9b7c8a0d47f0bc156a9327795bcb4d96716851f94ff2db","guide/src/contributing/web-sys/index.md":"6b4d5e00cbbcaab29295a3bd60e90b7f72b118758966622a307d9222488707c1","guide/src/contributing/web-sys/logging.md":"ee960ec9adc174183fb349acdbf5fc647b6f9a290022be9b118b9de37b8b5687","guide/src/contributing/web-sys/overview.md":"e6179317f75aa8e836e3c803f5d814e87119763709eea47b04cebc86c089d80a","guide/src/contributing/web-sys/supporting-more-web-apis.md":"984efae9c4241a105a1f5d6574cff7202f378c90ac648c4da815d97517da2b28","guide/src/contributing/web-sys/testing.md":"77f8e4b45bd0e27676dd503474bc32f91672b23c6ab7127a4f5b828dc8ea40e4","guide/src/examples/2d-canvas.md":"44a0eb82ec3398ee63a6df5aab103f1b002082eac2d129f656d8519cbc0829e7","guide/src/examples/2d-canvas.png":"b202cd79b20c00d49c40d71225eefea99306015858a432ceb7592d53c15300f7","guide/src/examples/add.md":"8dac740d6a4c499d868c29d8426d113da9cdd6ef22bf8084b8cf8c1de513b09c","guide/src/examples/char.md":"93f94a1b670322d0dc21b46d749909c414f9f254e2dd97afd8afe8cb0e5ab908","guide/src/examples/closures.md":"669dfc47a670271d7ce7a3bd2c08620b698b01ea8b2a7b1cc2047a77e7617130","guide/src/examples/console-log.md":"6552f4d766291cddc0eade75e4f64de9f10e00b89a0bedb1b15dcf7baa90b6e0","guide/src/examples/dom.md":"44ad74370b3727ec98f958273c639e767f2ae5b75e96ef53e74be1833a630272","guide/src/examples/fetch.md":"0a519315f50bf9e695dff6dc6899f0b8784f62b0ed18b5e85d99808bf111425f","guide/src/examples/hello-world.md":"2687677493080354ed7f17d32dd71e2baea8949604ef2f4ccf92dd43d9e64c67","guide/src/examples/import-js.md":"0480a6aa32b1fdc1347cb3d0c4f2a006caeb33c75ed21eb78ad800f012cbc2c6","guide/src/examples/index.md":"4e629f42d7bfb52bc35856b6e21c3aa7433563482697212d7b54f1bf619b56ed","guide/src/examples/julia.md":"0cd4ae1de24d657d7869c984dec61cc8b796621365be633212bdb2a6d57ce727","guide/src/examples/paint.md":"06c6c04f121080e0e5600b4ad300df9e93b5d4b6342f42c421e6dec1f2955ced","guide/src/examples/performance.md":"de888713cf0a047bd4a28a1ca890be51d99b6aaabc9a2b134280b768a7148377","guide/src/examples/raytrace.md":"e4bc7b6ffbec0486e83ccdd02db8da9b430da17e7b2c898f4ae72be55a449a13","guide/src/examples/request-animation-frame.md":"26eef6b203acc0b2667d9c4380c39a44eb4b97991efeded9ca32cc9ab454e993","guide/src/examples/todomvc.md":"b872c5631eae969368d147342fca16dadb6f0412f8922230c27271370e9d3d97","guide/src/examples/wasm-in-wasm.md":"5439a690e7107736e6f8b92e475f0a45e83ab9a1e5a0fe02e8f6dd93372590c6","guide/src/examples/wasm-in-web-worker.md":"b65ddc4b5b89c4c6c0cafeb3dd2b54e0240eae1a72697bb56e4ab3c6cc2c9a53","guide/src/examples/wasm2js.md":"48f953dfa1b17b68e5d983231e991797e32e9bc22b9c3db72c2d055e08449a00","guide/src/examples/weather_report.md":"184bf64d58820b032a80c738050e7b2cd0042eb722f61c7e8a3c531239f72db2","guide/src/examples/web-audio.md":"32bb18c9e4f167614ce3fb61d1d04265449f88da40949834b50baf9e37063fbd","guide/src/examples/webgl.md":"15570a0a081c2301981a1fbca0bd39dfcf35221c64ddfb8e8f4477660658cb08","guide/src/examples/webrtc_datachannel.md":"47b06b1b00c41f048fad3c2206399cae2d8dbd90b6d83953c138826f11677eb5","guide/src/examples/websockets.md":"704f9d5c1d13426e6e64e132cb0204be3c10a54dbfa5f1c834adc4efb4a1b8d2","guide/src/examples/without-a-bundler.md":"6f94c2b33511b91a990c76577d8e10858b8d15f5147fc6c54fc7d5086e0381f2","guide/src/introduction.md":"057e81f8f62d8647e51d1269bdb5788654be2e22fea23d155ec5a15bbf8bae1d","guide/src/reference/accessing-properties-of-untyped-js-values.md":"a91e3eb706ddd15628072978906e2faca31560de616c0630316d9f6eff6b55bf","guide/src/reference/arbitrary-data-with-serde.md":"1c76d778bff4feeab43d3e0a783ef2f9fba25fb799847c199a4dc4ed7226894e","guide/src/reference/attributes/index.md":"12b57ebbd0c9ba42d9f10d752c9943d9beec90d659d1b1ff9e9bfea02572a2c8","guide/src/reference/attributes/on-js-imports/catch.md":"da230e6986ca29f1e82313b82275ab9c3b2144906271cf82b27772541d781d84","guide/src/reference/attributes/on-js-imports/constructor.md":"89f8be11c567b4611c84209b34351238553d5360d7f7665ea25332e1544c5b99","guide/src/reference/attributes/on-js-imports/extends.md":"84ece37398ba0df66f890982315f082c52b5f027e03c20527755abe610c2567c","guide/src/reference/attributes/on-js-imports/final.md":"8d32d5053e9c1bc5df6fa7fe286a378895e47dea5ca067c8dddf99efe0aa5172","guide/src/reference/attributes/on-js-imports/getter-and-setter.md":"27f3c2738688a43e611524e5e3ab7174a1993026a69098b75780a388aeb5e745","guide/src/reference/attributes/on-js-imports/index.md":"2219a4514fe9597cbbe6c46014b57c38f1e85f3d0775a8a7880f50858cb13633","guide/src/reference/attributes/on-js-imports/indexing-getter-setter-deleter.md":"11d5c03f922294894fe0147fae96e04b26a5adb36ce91296e52729a9fe5931c2","guide/src/reference/attributes/on-js-imports/js_class.md":"d51c5f05b71bbf6b6ec8e0c36314ae299fd7eb07be989e721b79b599405b3486","guide/src/reference/attributes/on-js-imports/js_name.md":"c210e954752c1c3d75fddfd1a8b7e50fb3bc77bf125bec59d177f16041b5f629","guide/src/reference/attributes/on-js-imports/js_namespace.md":"e523dffa8b3110f1a17390d6bcc6c9c41c23e0a1e549f68a0aaec153ee2d228d","guide/src/reference/attributes/on-js-imports/method.md":"d54246efce5d7a104702439ba509bcc5bfbb0b57253edebdb696617daca80bcd","guide/src/reference/attributes/on-js-imports/module.md":"b47cd5ccbb69955f1d47101accc96fcd562abecbf7e34826f7f3c585d6b9dad0","guide/src/reference/attributes/on-js-imports/no_deref.md":"7d58bb3b6f768e38b949727abd1ee621ad09ebc537f83a8a20d0eeddf3771b95","guide/src/reference/attributes/on-js-imports/raw_module.md":"f363e5f3bc401b7e350eeec49cffde85dfb2346d597f38d98993fe5bfb9ff649","guide/src/reference/attributes/on-js-imports/static_method_of.md":"d5a5d9623ee55097f26e190b478e75f2e7d2ffc30e51ec647f39933d3d4e3b18","guide/src/reference/attributes/on-js-imports/structural.md":"364e01a5792029e9a5fa582375736efcee006352834ee273d218da89b77dd8bf","guide/src/reference/attributes/on-js-imports/typescript_type.md":"9cae454e9134ca1d14e2af3c732f370335332c615bf03ac49e525ff6f1877cbc","guide/src/reference/attributes/on-js-imports/variadic.md":"4d06bcf7538f97e5d5509bc34b2c0948286cf81fddcfda75e11ce386d323bb63","guide/src/reference/attributes/on-js-imports/vendor_prefix.md":"47a8d47e0cd745cca697f6d944e145f02695ca422255c3d6e1c9b2b719994b1b","guide/src/reference/attributes/on-rust-exports/constructor.md":"d3878fdb36174e5662ccfdf0fb027ef8175a7f8ca14ccca875217e03f5d5be1d","guide/src/reference/attributes/on-rust-exports/getter-and-setter.md":"464a2d41a791bd8ba5a8b1c4aa64b2f865c42b98a2d1289bb65e766e98a1b56a","guide/src/reference/attributes/on-rust-exports/getter_with_clone.md":"11a04dba4d66c19be0e234014d21ccf9cd0b76169b723e90ceb81d719478f283","guide/src/reference/attributes/on-rust-exports/index.md":"9fe778a0dd013a874db484cb22b1d9867bfe6d69cfbbe5cfeaa8ab78cf19daab","guide/src/reference/attributes/on-rust-exports/inspectable.md":"52fbcfdb83c426430a95692d566a4709255e25b24be5704d7378a4196a8c5908","guide/src/reference/attributes/on-rust-exports/js_class.md":"f4c0d8e8021001578f7d300e88c438d1a7806c17cc0d8acc3b4134922a75affc","guide/src/reference/attributes/on-rust-exports/js_name.md":"77f035b6391b9e44f254a411ba18687c5fa6110e276be73b5ea347701c8dad42","guide/src/reference/attributes/on-rust-exports/readonly.md":"a5da847ad36557f03b1c79a83d14c219dce914021266133c204260bc041b9b89","guide/src/reference/attributes/on-rust-exports/skip.md":"b9972241b8d473d1a46ef3c2861065ca296cdc923883c404f19f1d859bf914a6","guide/src/reference/attributes/on-rust-exports/skip_typescript.md":"1622c29b0d93a884bd0b5b2a62107a594e2919758c80592566e7786efe788b89","guide/src/reference/attributes/on-rust-exports/start.md":"00acf5bcc40abea6ba89a20dab20e2cb17396ce07fc75d15bba0351dd9b7de81","guide/src/reference/attributes/on-rust-exports/typescript_custom_section.md":"9b96a30f81dd5e218953b85d823e429356723e8a6cd8aff3be0869b10d849a0a","guide/src/reference/attributes/on-rust-exports/typescript_type.md":"86eb29f89467c742fded3935b4422422c7e4a76a0bed952e2c526dc993165c72","guide/src/reference/browser-support.md":"aac94e3609d89a23dc274756be11cf2a87409070fae30a161cc61230dbfabd22","guide/src/reference/cli.md":"5a3fe5530842b32ec949568e923afd15adfede266f20863c1f69e45a2c02742c","guide/src/reference/deployment.md":"0e03b847ffc4adcd9285cf5c8cbbd3917898e763b985a65a73893bd7c2ebe430","guide/src/reference/index.md":"c603c3a7f265afb7c7b5eb391b32f6115f8842f3f422fd3730be4f90c4796bc4","guide/src/reference/iterating-over-js-values.md":"ec00f09516eb7de98bf7296f44b6aa9ceee3fae1dcdb7cdf8f36963d45b7ebeb","guide/src/reference/js-promises-and-rust-futures.md":"5f0c0b990f5b55c8d9485f7cc66a617f79cc232705562f306af97785c7ed1f79","guide/src/reference/js-snippets.md":"dff5adcbf66f06322e606c672ef070c2a0375f1ae592ca8a9da36a50324735cc","guide/src/reference/optimize-size.md":"c10abc1ea0902c9a57b74808bcf75bf092c0c2bb4082962b85d18df7593602c1","guide/src/reference/passing-rust-closures-to-js.md":"aa18f75ffd4b7779a2699b1bf969245ec0e1a70b24abe61e8877c2eb65f6ef60","guide/src/reference/receiving-js-closures-in-rust.md":"fc9c80ba5e1a5f243a66f68caba27e8103652aeac3765a9fad2d0e16113fede3","guide/src/reference/reference-types.md":"91d178b7fe2ec82eec4d8926a08b39ac16898172d6f65aee84347c6918033c67","guide/src/reference/rust-targets.md":"467d5cf7eaa1d4b89f9f5b2248cdd1a10340ca1db263ffff5c483ce10dcfbf54","guide/src/reference/types.md":"859123f51fa932fa37d7e47cd5c46956929793bd3accea050d3be516080ed78f","guide/src/reference/types/bool.md":"e954d93ec5096837d4dd2db3f23e71c14483279e347ca8908ecb49aded6e497a","guide/src/reference/types/boxed-jsvalue-slice.md":"634e51ce92770e6078ca3303be946272af3f092f2703c90601ed8f9092c69a53","guide/src/reference/types/boxed-number-slices.md":"1a217a68ff549f4208f99863d6616521c9d466542c1156bcc2be7d3a73e4edd4","guide/src/reference/types/char.md":"01f2f7bdb25a9a52edd93dcbbca6a29269a8d5adf6cb94dcadea29a7aace22f4","guide/src/reference/types/exported-rust-types.md":"d783b4d4bbcb046b62a912302d344cc5a0022e2119abe560fd1bf8437a6b6cfa","guide/src/reference/types/imported-js-types.md":"e12807f46bb55f4ad9dfde4cd683b3e7f9ee79302e5a0250ef24a52bd7ef71a3","guide/src/reference/types/jsvalue.md":"46d74da47f8a517249de4dd096351c10d658d9c3535950a34c1fc5d5b42eb2f7","guide/src/reference/types/number-slices.md":"f380258fc058527c7dd6f49664a4e9dff69f0b03d626071aeb61efefb2a0b646","guide/src/reference/types/numbers.md":"cce95c07be08c1f16327fd4c7e79b7c480db9cc95e2b07514d31e51bd6122101","guide/src/reference/types/pointers.md":"3710b736f790a97a325b1883d5fa8104c16365446ef702e9dd29bda74699043e","guide/src/reference/types/result.md":"0a13ebc421285ff20fade7b897b79a7baf17dd2f7d50d8b47bd9813068bdc6eb","guide/src/reference/types/str.md":"6cc086b02ae3d3565678e69d91dbf105f1f310009097a37fad4c812e25d4b7c0","guide/src/reference/types/string.md":"9e42298135e0aec11bb924e3a2b5002335cfe290240b48db12dc981156177cd0","guide/src/reference/weak-references.md":"8dc6ca26c478fceff12e374e11e2f01fdf5b6a88b7302d449d4336859f4efe8a","guide/src/reference/working-with-duck-typed-interfaces.md":"a23f1f98019fed2060e1fbce954ec457e77a3a17524f34ca861d256d2ad4b6ef","guide/src/wasm-bindgen-test/asynchronous-tests.md":"c24c381b719b4bd7b0c181da1db59170e822c142eb22f95c4a6eeb8fd36df3ab","guide/src/wasm-bindgen-test/browsers.md":"d8619911d57d56eb027cb040f3456a55d0f14f670c50e4eb2e58c1331206dde4","guide/src/wasm-bindgen-test/continuous-integration.md":"5865990ef231b3c99a9c1bc18f7b7f054a29b77ac7b671fcf1cd6bb4f4304ae8","guide/src/wasm-bindgen-test/index.md":"64fbcd222c3c597109d2717a3574abf2041ff325c26ee07d58c4cd7ba1c1f8ad","guide/src/wasm-bindgen-test/usage.md":"a1da64eaaf8fe9bea366724e08a4ba63dc984f86a28cc393fe00dc394ab244d6","guide/src/web-sys/cargo-features.md":"0e50067a7a46cee3d1b21a2690aabc539379cb1452de377ebaa0eaa4e5e587b2","guide/src/web-sys/function-overloads.md":"90a08bb955f7c79e573f83c31d5e7431ae1e3ad7001792ff8ff52e4299364fcd","guide/src/web-sys/index.md":"345499d0840fd23a2e5eb5ac497665decbb3f836fe9f4f88301ae4b5fbd8d44f","guide/src/web-sys/inheritance.md":"8f18af20b930497e2fae4a266dd27e317d1ea3510266c21b32f351354b495ff2","guide/src/web-sys/type-translations.md":"687ef5e4a3961fddcb94d24f69abec0ea64f6df306f4593974b69589215980b1","guide/src/web-sys/unstable-apis.md":"e74c3e72136d6906dd60258a27f34e1ea4612e7c8e95662596475dc557151cfb","guide/src/web-sys/using-web-sys.md":"523e16af6e27703a4a0582568bc97710350222af20801907268d2d8c197fb667","publish.rs":"29a5316fb8b45712611bb77203640c3dcfef57838c2bb67031b8589fc02286a5","releases/friends.sh":"f896ccdcb8445d29ed6dd0d9a360f94d4f33af2f1cc9965e7bb38b156c45949d","releases/release-announcement-template.md":"fcb3c75cdb8d5d6ce8a198f5570c967313f751d1eef0790b34a518772b2e8a38","src/cache/intern.rs":"b78abd7502ad069bbeb61073d1972c717a469849222037565b50514192c187a9","src/cache/mod.rs":"8989143b55160dbc142cb20c6e066cf0a3f70d6c97fbc9aa0fac59bd62bd865b","src/cast.rs":"2f0da7db7bce114d3763a67a3221c40807f6174c7da9584c5db3d255a3967ff8","src/closure.rs":"8a831abe7de9bb3913c0aa9b52a1a61dbb0b9331a10f82d2625b2a59a97979aa","src/convert/closures.rs":"0a7a8d4e8dfc662aa6612ded8e336e2eaafc17d06bde7016ab37555431f51196","src/convert/impls.rs":"0cdd24de9d3a3d2f147dda9eeacf429bca06ba541e52c2de2cfbe218e51cb271","src/convert/mod.rs":"566ffd1f546afdb8d24c6c0d6faa00a28596a67ca6f2f39e9485add54400443c","src/convert/slices.rs":"3a6bdd428d8b844eb81f4682d462a322d9e28a6b780aa9cb44ac823b0fa9d28a","src/convert/traits.rs":"3fb24549cc21c2964997c6fc39b88f1d7d6bf6deb1e3cf6341a7e07a406b5d01","src/describe.rs":"3d3674447a9020042a477c2bbce99269b48cb22f72b286a794e77fe0a3354233","src/externref.rs":"cc1883fd0e0a2c64421fd12326908c0fd9aa73bba618c89cf17cc2efacd3fe70","src/lib.rs":"69e9a62ff428bad1c06da447977b0d96f640894fe39f1b76fffbd6d790e30718","tests/headless/externref_heap_live_count.rs":"41b2758762c91bd2d05995b1b8989651a6bf2e586ffad5597ff63f6d2dc6d755","tests/headless/main.js":"6de0a19b91330e9bc68334c4f1fa11c1cd6bf273f5ea3e470933ad800c962679","tests/headless/main.rs":"d86245fdd476cb6c275c0649d76fd348ab55b7952ece325c1ed4ec00051a1f73","tests/headless/modules.js":"a407c81d2670309ed484adf98a2e522f6ea031b1286416eb7bf184df7433d5da","tests/headless/modules.rs":"74f77f88bb5280862c06087d78c48ba930736e58db9a1e6c80450bb0e032b789","tests/headless/snippets.rs":"baf9d3c68e1b567fcba4e073cc0d24a8f039955e10dd1275e4a389574ff556d7","tests/headless/snippets1.js":"8bd0c367fdbc61f509728255750094bb36200a1aea74079611ad7cfa9c5f3f28","tests/headless/strings.js":"fca2d7a1afae31663607f956134a4f447aaee0f85d828addc3c4c1440f2e18e5","tests/headless/strings.rs":"4a64d8a4f9329a282d0f87408c0645ded71a7d023eaad40a32eaf60886a08375","tests/must_use.rs":"cae67a8740cd2c969a6b33316cd5036639048d9bbfecf55a5f45faaa624de1d0","tests/non_wasm.rs":"fbc7f10d3604f3c867f031cd218c2b29af2b42b1225495837ad5560878930ab9","tests/std-crate-no-std-dep.rs":"47f0e32bad7b9b11ca77d66d904eb3408c3528732899479039fb6db4c6e9ed9e","tests/unwrap_throw.rs":"79f05fa37249cea08689592d53d856019a90fd1b72c41413f7fcda5cf5913356","tests/wasm/api.js":"0f2038b83f3038d5fa6a4c889b7ae39471c763d77cba73ff7d2a211315fdb150","tests/wasm/api.rs":"415a752b1836e3784f73f684d32b4ae1ffd001f122c713d1affe426bb57bfe67","tests/wasm/arg_names.js":"0d7de3801257e18756a974bdd2950d2fb06755f7c0d1c681e03b56d97e828e34","tests/wasm/arg_names.rs":"decd8f71a58ebf662a586b7f19e41f6666782df0da74a8a2c69b7a504661dd79","tests/wasm/char.js":"6f307035f2689f0827726503f201f8fd591100ff051a55bda23ddcaeaa2902f1","tests/wasm/char.rs":"44dc134f9057e6c91da32c7fdba5ba10785507ced161c07267548ee08308e6c0","tests/wasm/classes.js":"62e5b31ca25d1a9678f85f0c4aff8380c5d1a8d4a7ddfea01abc1adbb8b3c880","tests/wasm/classes.rs":"5a0267be5cf432f892e8e24f1f6558ddbe9a88298096ffd82998348e852062f3","tests/wasm/closures.js":"d42c37d6bdd1af6a345b39211289a936d6358d224cc32a23bd700dc853a885da","tests/wasm/closures.rs":"9e47bf12f036169a7144e02ab58877353f37877820fc8ea989952e18b08c5d43","tests/wasm/comments.js":"2c3bf2e79ecc33f0fba33d13a91a1ae9390f9f7a466af8eb215636662e20462a","tests/wasm/comments.rs":"5a0068fe3e214c07da92a46b6e45a2771fbd8e04f14cb7802f32082b87a459a0","tests/wasm/duplicate_deps.js":"2226e4f65525c545ab45109879b16b2a92341b440178e75d3a9efb3ed10f7b03","tests/wasm/duplicate_deps.rs":"3a91569e54f56e178dc164f2d2b8537ec6a10b3161c23e1cc8e552805cd868f4","tests/wasm/duplicates.rs":"a2b4a7960e8a7c9b3fda943e8aadb7cbc0ba8fa1a6956baf40ba2f129bd591ee","tests/wasm/duplicates_a.js":"d3d685e95a54b911c2b9a64f7c0f245e3e492491368355044ae2cd12c3332044","tests/wasm/duplicates_b.js":"cd6c87905a5c5514239bba52a03e6c151d79a57a477f52a073b61ef18c98f642","tests/wasm/duplicates_c.js":"93399409996d182b5fe02548d3c5c3e1681939629e0261d6f19f8c1ee3b08dfc","tests/wasm/enums.js":"7b37ce390aba76477e4d54c5214624cfc5eec49e0f88ef6f535f06f23527864f","tests/wasm/enums.rs":"1537fda37a051340722c29cb5aadc9e1819a2e609f2569ca4fd972308d03fc7f","tests/wasm/final.js":"cfa7c496291f08b98f0406190ee4deaab9ade890d65ada4c223a76135e66f619","tests/wasm/final.rs":"25b0a85e87686e3f7a7a44e3ac25402d504eec7f9813a74ffd63c5f4428ee0ff","tests/wasm/futures.js":"a3cc2a94bae02441a1fa1c4defa78b5a00cb7943b42b6c284496013c17ff3008","tests/wasm/futures.rs":"64b3569b60423465a552fd05f62080063b808761a7794714f9be2391b662cadc","tests/wasm/getters_and_setters.js":"f47937a52d49bce9fa8e7c73653bf25732807097c19f439898b387189aea7bc8","tests/wasm/getters_and_setters.rs":"acd4b4fed47a8be83e6972ce51ae7f988117a6cb45e47af4109b983216ed5843","tests/wasm/import_class.js":"16e8269479a1354598901f38bd3ec4ee2a8847df59932b55999e9923e369db03","tests/wasm/import_class.rs":"5ce1419eb5342d377578ea1eac60fe31502f32eb8579625496cc4883e5210daf","tests/wasm/imports.js":"0d38ba5259f2dd19575394400ba0cbf9ef7a5f3e61ea19d43b87f46b52065391","tests/wasm/imports.rs":"2c544ff24a55d85f9cf53f38574b128dcb9cec52a213b2a1682023718d10b748","tests/wasm/imports_2.js":"ab251fc0a0a1921c60d316160bc120fd97da3c3753804174cfda2f08ff43208d","tests/wasm/js_objects.js":"a2be00dab58716e4cbbaeba4da8512ba924c39d3f1cb405ba769ab8a780ed7fc","tests/wasm/js_objects.rs":"86725cea9aec227e562409b9f3f96ff70cf57f21eb4ccdbe96de7ec64504244e","tests/wasm/jscast.js":"d678058645d2d370c45ec5fd5bc9b94612b1e70035a9e0f524c134369f06fe1d","tests/wasm/jscast.rs":"f9abd0442be8f5b28e135c7d6a671a65939d0ff0ba993537c06b2be968145bcd","tests/wasm/main.rs":"626f65c3b1ba673341df8a926df202453e867ef9f56648abe45034ff8c829ab4","tests/wasm/math.js":"9deb196ab7ad3d5d1f98d7d0b6ee60cb125212a4a1281ba0141cc3713fdea892","tests/wasm/math.rs":"be9000d84c6b6b091455e3b20ee7f5a88dbcfc0d38db97fad3dd167970c4b4a3","tests/wasm/no_shims.rs":"83636fee1ae0ae5b98d76b7f62f637824e77edd7a55fb27749b1a88b3910d6f6","tests/wasm/node.js":"ec3a9500773c7f07a7bcf002e23aa3848be5208147c3d750281a1e1f6d899af1","tests/wasm/node.rs":"fe140900d7048353ce0e518a1e67dedb1928f0cf34c02514498184fd8aef10cc","tests/wasm/option.js":"0d0cba722045698e9621f2565acf854bf3085c8739622798085aaa6b58e3edbe","tests/wasm/option.rs":"d82123f7349e22873e636341a52e99e256213e77d4d7ab8450ba6379be2128b7","tests/wasm/optional_primitives.js":"37484639631e1c50bdc055a08babff18d4be9f7a9291f0f3395e1a7c519e5cac","tests/wasm/optional_primitives.rs":"502803cf27b78dd8a6c1d75ae954b71cc017f803486867a87c0474e5d53a6567","tests/wasm/rethrow.js":"0a495a8d1b735277e18cc3fc3edf8bd2a72586441d3884134182e5052786ab84","tests/wasm/rethrow.rs":"59dcf192c9e85b0d98031c135d2aa2eda4902a2bc5b740a9ddf1e75dc9cdd23e","tests/wasm/simple.js":"3890fa19585d031821e8db80de06593e8e5ce83c9ba8214fe1cef319e9c14fbb","tests/wasm/simple.rs":"5487804ed159538fa8722444c9c2db8929b6056692ae67991d72489f90194849","tests/wasm/slice.js":"2e3c42c6ebeb832f42e99e4f251817bd13083eff0b7c45c46fb4d7ab2aa740cd","tests/wasm/slice.rs":"511eb693d0ac56bde149c37039fb207ee4f0b1b92db2a809306f5ac80d578dbd","tests/wasm/structural.js":"ac504a1dbb7222c70270530a284eec56ace0bc47b95e8f9331f4b2df1d28c3f9","tests/wasm/structural.rs":"dda0e9cea09b94dd84ae39d6cf0949aa305062b7a466fdcb53370f5ee9e3dff5","tests/wasm/truthy_falsy.rs":"b54206b376f7413c9cce1792df65f57ed1e97660b4be8d9486e9c6af00f6893f","tests/wasm/u64.js":"bb78df1d7f3ea5939d622517f54b39e8d6ed901c3f706c744306c8a9fd9f35d7","tests/wasm/u64.rs":"430ed26db8bef1988debb23f6b508b951dbfd2b1a6ad9ac00c2d3386c747c733","tests/wasm/validate_prt.js":"a726a85f4805648d9e69c804a266bbedaed942228a1b3a46274a91bcb83eafe9","tests/wasm/validate_prt.rs":"cea3db07f10d2bf057af99b90655179371bccf1db67e7364d476b00ecbf24a93","tests/wasm/variadic.js":"30d3bb656c0eb29b69c7e653f3201b5210b8a78e962b4678336c4d9889182adb","tests/wasm/variadic.rs":"1cabd34ad64475cc705853a2b9a8f619f6aed6ee3f3d8179793f8198df1ac178","tests/wasm/vendor_prefix.js":"1424c7fea77fea13179a50030afeffdf4b277dcb6d7b1e5ce3eea681ec2c47f4","tests/wasm/vendor_prefix.rs":"eabd627e14e09ec637d7e7a5b0bccced7e3370203351e4ce8610a5c66fac502b"},"package":"8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "wasm-bindgen"
-version = "0.2.69"
+version = "0.2.76"
 authors = ["The wasm-bindgen Developers"]
 description = "Easy support for interacting between JS and Rust.\n"
 homepage = "https://rustwasm.github.io/"
@@ -39,7 +39,7 @@
 optional = true
 
 [dependencies.wasm-bindgen-macro]
-version = "=0.2.69"
+version = "=0.2.76"
 
 [features]
 default = ["spans", "std"]
@@ -51,16 +51,16 @@
 strict-macro = ["wasm-bindgen-macro/strict-macro"]
 xxx_debug_only_print_generated_code = ["wasm-bindgen-macro/xxx_debug_only_print_generated_code"]
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.js-sys]
-version = "0.3.46"
+version = "0.3.53"
 
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.serde_derive]
 version = "1.0"
 
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-futures]
-version = "=0.4.19"
+version = "=0.4.26"
 
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
-version = "=0.3.19"
+version = "=0.3.26"
 
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test-crate-a]
 version = "0.1"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/CHANGELOG.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/CHANGELOG.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/CHANGELOG.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/CHANGELOG.md	2021-12-09 12:01:26.000000000 +0000
@@ -2,6 +2,62 @@
 
 --------------------------------------------------------------------------------
 
+## 0.2.76
+
+Released 2021-08-19.
+
+[changes](https://github.com/rustwasm/wasm-bindgen/compare/0.2.75...0.2.76)
+
+--------------------------------------------------------------------------------
+
+## 0.2.75
+
+Released 2021-08-02.
+
+[changes](https://github.com/rustwasm/wasm-bindgen/compare/0.2.74...0.2.75)
+
+--------------------------------------------------------------------------------
+
+## 0.2.74
+
+Released 2021-05-10.
+
+[changes](https://github.com/rustwasm/wasm-bindgen/compare/0.2.73...0.2.74)
+
+--------------------------------------------------------------------------------
+
+## 0.2.73
+
+Released 2021-03-29.
+
+[changes](https://github.com/rustwasm/wasm-bindgen/compare/0.2.72...0.2.73)
+
+--------------------------------------------------------------------------------
+
+## 0.2.72
+
+Released 2021-03-18.
+
+[changes](https://github.com/rustwasm/wasm-bindgen/compare/0.2.71...0.2.72)
+
+--------------------------------------------------------------------------------
+
+## 0.2.71
+
+Released 2021-02-26.
+
+[changes](https://github.com/rustwasm/wasm-bindgen/compare/0.2.70...0.2.71)
+
+--------------------------------------------------------------------------------
+
+## 0.2.70
+
+Released 2021-01-25.
+
+[changes](https://github.com/rustwasm/wasm-bindgen/compare/0.2.69...0.2.70)
+
+--------------------------------------------------------------------------------
+
 ## 0.2.69
 
 Released 2020-11-30.
@@ -883,8 +939,7 @@
 
 ### Added
 
-* Initial support for transitive NPM dependencies has been added, although
-  support has not fully landed in `wasm-pack` yet so it's not 100% integrated.
+* Initial support for transitive NPM dependencies has been added.
   [#1305](https://github.com/rustwasm/wasm-bindgen/pull/1305)
 
 * The `constructor` property of `Object` is now bound in `js-sys`.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/examples/import_js/package.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/examples/import_js/package.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/examples/import_js/package.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/examples/import_js/package.json	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
 {
   "scripts": {
     "build": "webpack",
-    "serve": "webpack-dev-server"
+    "serve" : "webpack serve"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "1.0.1",
+    "@wasm-tool/wasm-pack-plugin": "1.5.0",
     "text-encoding": "^0.7.0",
-    "html-webpack-plugin": "^3.2.0",
-    "webpack": "^4.29.4",
-    "webpack-cli": "^3.1.1",
-    "webpack-dev-server": "^3.1.0"
+    "html-webpack-plugin": "^5.3.2",
+    "webpack": "^5.49.0",
+    "webpack-cli": "^4.7.2",
+    "webpack-dev-server": "^3.11.2"
   }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/examples/import_js/webpack.config.js thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/examples/import_js/webpack.config.js
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/examples/import_js/webpack.config.js	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/examples/import_js/webpack.config.js	2021-12-09 12:01:26.000000000 +0000
@@ -23,5 +23,8 @@
           TextEncoder: ['text-encoding', 'TextEncoder']
         })
     ],
-    mode: 'development'
+    mode: 'development',
+    experiments: {
+        asyncWebAssembly: true
+   }
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/contributing/web-sys/supporting-more-web-apis.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/contributing/web-sys/supporting-more-web-apis.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/contributing/web-sys/supporting-more-web-apis.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/contributing/web-sys/supporting-more-web-apis.md	2021-12-09 12:01:26.000000000 +0000
@@ -33,7 +33,7 @@
 
    ```sh
    cd crates/web-sys
-   cargo run --release --package wasm-bindgen-webidl webidls src/features
+   cargo run --release --package wasm-bindgen-webidl -- webidls src/features
    ```
 
    You can then use `git diff` to ensure the bindings look correct.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/examples/wasm-in-web-worker.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/examples/wasm-in-web-worker.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/examples/wasm-in-web-worker.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/examples/wasm-in-web-worker.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,71 @@
+# WASM in Web Worker
+
+[View full source code][code]
+
+[code]: https://github.com/rustwasm/wasm-bindgen/tree/master/examples/wasm-in-web-worker
+
+A simple example of parallel execution by spawning a web worker with `web_sys`,
+loading WASM code in the web worker and interacting between the main thread and
+the worker.
+
+## Building & compatibility
+
+At the time of this writing, only Chrome supports modules in web workers, e.g.
+Firefox does not. To have compatibility across browsers, the whole example is
+set up without relying on ES modules as target. Therefore we have to build
+with `--target no-modules`. The full command can be found in `build.sh`.
+
+## `Cargo.toml`
+
+The `Cargo.toml` enables features necessary to work with the DOM, log output to
+the JS console, creating a worker and reacting to message events.
+
+```toml
+{{#include ../../../examples/wasm-in-web-worker/Cargo.toml}}
+```
+
+## `src/lib.rs`
+
+Creates a struct `NumberEval` with methods to act as stateful object in the
+worker and function `startup` to be launched in the main thread. Also includes
+internal helper functions `setup_input_oninput_callback` to attach a
+`wasm_bindgen::Closure` as callback to the `oninput` event of the input field
+and `get_on_msg_callback` to create a `wasm_bindgen::Closure` which is triggered
+when the worker returns a message.
+
+```rust
+{{#include ../../../examples/wasm-in-web-worker/src/lib.rs}}
+```
+
+## `index.html`
+
+Includes the input element `#inputNumber` to type a number into and a HTML
+element `#resultField` were the result of the evaluation even/odd is written to.
+Since we require to build with `--target no-modules` to be able to load WASM
+code in in the worker across browsers, the `index.html` also includes loading
+both `wasm_in_web_worker.js` and `index.js`.
+
+```html
+{{#include ../../../examples/wasm-in-web-worker/www/index.html}}
+```
+
+## `index.js`
+
+Loads our WASM file asynchronously and calls the entry point `startup` of the
+main thread which will create a worker.
+
+```js
+{{#include ../../../examples/wasm-in-web-worker/www/index.js}}
+```
+
+## `worker.js`
+
+Loads our WASM file by first importing `wasm_bindgen` via
+`importScripts('./pkg/wasm_in_web_worker.js')` and then awaiting the Promise
+returned by `wasm_bindgen(...)`. Creates a new object to do the background
+calculation and bind a method of the object to the `onmessage` callback of the
+worker.
+
+```js
+{{#include ../../../examples/wasm-in-web-worker/www/worker.js}}
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/examples/without-a-bundler.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/examples/without-a-bundler.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/examples/without-a-bundler.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/examples/without-a-bundler.md	2021-12-09 12:01:26.000000000 +0000
@@ -29,9 +29,9 @@
 
 ## Using the older `--target no-modules`
 
-[View full source code][code]
+[View full source code][code-no-modules]
 
-[code]: https://github.com/rustwasm/wasm-bindgen/tree/master/examples/without-a-bundler-no-modules
+[code-no-modules]: https://github.com/rustwasm/wasm-bindgen/tree/master/examples/without-a-bundler-no-modules
 
 The older version of using `wasm-bindgen` without a bundler is to use the
 `--target no-modules` flag to the `wasm-bindgen` CLI.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/final.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/final.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/final.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/final.md	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,9 @@
 imports to call the imported function. Notably a function imported by `final`
 never changes after it was imported, whereas a function imported by default (or
 with `structural`) is subject to runtime lookup rules such as walking the
-prototype chain of an object.
+prototype chain of an object. Note that `final` is not suitable for accessing
+data descriptor properties of JS objects; to accomplish this, use the `structural`
+attribute.
 
 [host-bindings]: https://github.com/WebAssembly/host-bindings
 [reference-types]: https://github.com/WebAssembly/reference-types
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/js_name.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/js_name.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/js_name.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/js_name.md	2021-12-09 12:01:26.000000000 +0000
@@ -58,4 +58,30 @@
 }
 ```
 
+The `js_name` attribute can also be used in situations where a JavaScript module uses 
+`export default`. In this case, setting the `js_name` attribute to "default" on the 
+`type` declaration, and the [`js_class` attribute][jsclass] to "default" on any methods 
+on the exported object will generate the correct imports.
+
+
+For example, a module that would be imported directly in JavaScript:
+
+```javascript
+import Foo from "bar";
+
+let f = new Foo();
+```
+
+Could be accessed using this definition in Rust:
+
+```rust
+#[wasm_bindgen(module = "bar")]
+extern "C" {
+    #[wasm_bindgen(js_name = default)
+    type Foo;
+    #[wasm_bindgen(constructor, js_class = default)]
+    pub fn new() -> Foo;
+}
+```
+
 [jsclass]: js_class.html
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/no_deref.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/no_deref.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/no_deref.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-js-imports/no_deref.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,24 @@
+# `no_deref`
+
+The `no_deref` attribute can be used to say that no `Deref` impl should be
+generated for an imported type. If this attribute is not present, a `Deref` impl
+will be generated with a `Target` of the type's first `extends` attribute, or
+`Target = JsValue` if there are no `extends` attributes.
+
+```rust
+#[wasm_bindgen]
+extern "C" {
+    type Foo;
+
+    #[wasm_bindgen(method)]
+    fn baz(this: &Foo)
+
+    #[wasm_bindgen(extends = Foo, no_deref)]
+    type Bar;
+}
+
+fn do_stuff(bar: &Bar) {
+    bar.baz() // Does not compile
+}
+
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-rust-exports/getter_with_clone.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-rust-exports/getter_with_clone.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-rust-exports/getter_with_clone.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/attributes/on-rust-exports/getter_with_clone.md	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+# `getter_with_clone`
+
+By default, Rust exports exposed to JavaScript will generate getters that require fields to implement `Copy`. The `getter_with_clone` attribute can be used to generate getters that require `Clone` instead. This attribute can be applied per struct or per field. For example:
+
+```rust
+#[wasm_bindgen]
+pub struct Foo {
+    #[wasm_bindgen(getter_with_clone)]
+    pub bar: String,
+}
+
+#[wasm_bindgen(getter_with_clone)]
+pub struct Foo {
+    pub bar: String,
+    pub baz: String,
+}
+```
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/browser-support.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/browser-support.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/browser-support.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/browser-support.md	2021-12-09 12:01:26.000000000 +0000
@@ -19,10 +19,11 @@
   an example of doing this too](../examples/wasm2js.html)). Note
   that at this time no bundler will do this by default, but we'd love to
   document plugins which do this if you are aware of one!
-
-* **Edge** - the `TextEncoder` and `TextDecoder` APIs are not currently
-  available in Edge which `wasm-bindgen` uses to encode/decode strings between
-  JS and Rust. You can polyfill this with at least one of two strategies:
+  
+* **Edge before 79+** - the `TextEncoder` and `TextDecoder` APIs, which
+  `wasm-bindgen` uses to encode/decode strings between JS and Rust, were not
+  available before version 79. You can polyfill this with at least one of two
+  strategies:
 
   1. If using a bundler, you can likely configure the bundler to polyfill these
      types by default. For example if you're using Webpack you can use the
@@ -31,7 +32,6 @@
 
      ```js
      const webpack = require('webpack');
-
      module.exports = {
          plugins: [
              new webpack.ProvidePlugin({
@@ -39,7 +39,6 @@
                TextEncoder: ['text-encoding', 'TextEncoder']
              })
          ]
-
          // ... other configuration options
      };
      ```
@@ -58,10 +57,9 @@
   forbids the usage of 64-bit integers (Rust types `i64` and `u64`) in
   exported/imported functions. When using `wasm-bindgen`, however, `u64` is
   allowed! The reason for this is that it's translated to the `BigInt` type in
-  JS. The `BigInt` class, however, is only currently supported in Chrome 67+ and
-  Firefox 68+ (as of the time of this writing) and isn't supported in Edge or
-  Safari, for example. For more, up-to-date details, see [`BigInt` on Can I
-  use...][ciu_bigint].
+  JS. The `BigInt` class is supported by all major browsers starting in the 
+  following versions: Chrome 67+, Firefox 68+, Edge 79+, and Safari 14+.
+
 
 If you find other incompatibilities please report them to us! We'd love to
 either keep this list up-to-date or fix the underlying bugs :)
@@ -72,4 +70,3 @@
 [`text-encoding`]: https://www.npmjs.com/package/text-encoding
 [soq]: https://stackoverflow.com/questions/40662142/polyfill-for-textdecoder/46549188#46549188
 [mdntepi]: https://developer.mozilla.org/en-US/docs/Web/API/TextEncoder#Polyfill
-[ciu_bigint]: https://caniuse.com/#feat=bigint
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/cli.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/cli.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/cli.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/cli.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,34 +4,11 @@
 tweak the JavaScript that is generated. The most up-to-date set of flags can
 always be listed via `wasm-bindgen --help`.
 
-> Note: usually, one should use a [`wasm-pack`-based workflow][wasm-pack] rather
-> than running the `wasm-bindgen` command line tool by hand.
-
-[wasm-pack]: https://github.com/rustwasm/wasm-pack
-
 ## Installation
 
-The recommend way to install the `wasm-bindgen` command line tool is with the
-`wasm-pack` installer described
-[here](https://rustwasm.github.io/wasm-pack/installer/). After installing
-`wasm-pack`, you are ready to build project invoking `wasm-pack build`.
-This command installs apropriate version of the `wasm-bindgen` command-line
-tool. The version of `wasm-bindgen` installed by `wasm-pack` is not available
- to be used directly via command line.
-
-It is not recommended to install `wasm-bindgen-cli` as its version must match
-_exactly_ the version of `wasm-bindgen` that is specified in the project's
-cargo.lock file. Using `wasm-pack` for building simplifies the build process
-as `wasm-pack` ensures that the proper version of `wasm-bindgen` command-line
-tool is used. That means that `wasm-pack` may install many different versions
-of `wasm-bindgen`, but during the build `wasm-pack` will always make sure to
-use the correct one.
-
-Note: if, for any reason, you decide to use wasm-bindgen directly (this is
-not recommended!) you will have to manually take care of using exactly the
-same version of wasm-bindgen command-line tool (wasm-bindgen-cli) that
-matches the version of wasm-bingden in cargo.lock.
-
+```
+cargo install -f wasm-bindgen-cli
+```
 
 ## Usage
 
@@ -118,3 +95,7 @@
 the WebAssembly binary will use `externref` when importing and exporting
 functions that work with `JsValue`. For more information see the [documentation
 about reference types](./reference-types.md).
+
+### `--omit-default-module-path`
+
+Don't add WebAssembly fallback imports in generated JavaScript.
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/deployment.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/deployment.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/deployment.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/deployment.md	2021-12-09 12:01:26.000000000 +0000
@@ -6,8 +6,7 @@
 to update this if it's out of date!
 
 The methods of deployment and integration here are primarily tied to the
-`--target` flag. Note that the `--target` flag of `wasm-pack` and `wasm-bindgen`
-should behave the same way in this respect. The values possible here are:
+`--target` flag.
 
 | Value           | Summary                                                    |
 |-----------------|------------------------------------------------------------|
@@ -55,8 +54,7 @@
 `--target web` flag. You can check out a [full example][nomex] in the
 documentation, but the highlights of this output are:
 
-* When compiling you'll pass `--target web` to `wasm-pack` (or `wasm-bindgen`
-  directly).
+* When compiling you'll pass `--target web` to `wasm-bindgen`
 * The output can natively be included on a web page, and doesn't require any
   further postprocessing. The output is included as an ES module.
 * The `--target web` mode is not able to use NPM dependencies.
@@ -79,8 +77,7 @@
 **`--target nodejs`**
 
 If you're deploying WebAssembly into Node.js (perhaps as an alternative to a
-native module), then you'll want to pass the `--target nodejs` flag to
-`wasm-pack` or `wasm-bindgen`.
+native module), then you'll want to pass the `--target nodejs` flag to `wasm-bindgen`.
 
 Like the "without a bundler" strategy, this method of deployment does not
 require any further postprocessing. The generated JS shims can be `require`'d
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/types/boxed-jsvalue-slice.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/types/boxed-jsvalue-slice.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/types/boxed-jsvalue-slice.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/types/boxed-jsvalue-slice.md	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,8 @@
 |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
 | Yes | No | No | Yes | Yes | Yes | A JavaScript `Array` object |
 
+Boxed slices of imported JS types and exported Rust types are also supported. `Vec<T>` is supported wherever `Box<[T]>` is.
+
 ## Example Rust Usage
 
 ```rust
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/weak-references.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/weak-references.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/weak-references.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/reference/weak-references.md	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,6 @@
 # Support for Weak References
 
-By default wasm-bindgen does not uses the [TC39 weak references
+By default wasm-bindgen does not use the [TC39 weak references
 proposal](https://github.com/tc39/proposal-weakrefs). This proposal just
 advanced to stage 4 at the time of this writing, but it will still stake some
 time for support to percolate into all the major browsers.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/SUMMARY.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/SUMMARY.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/SUMMARY.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/SUMMARY.md	2021-12-09 12:01:26.000000000 +0000
@@ -25,6 +25,7 @@
   - [web-sys: WebRTC DataChannel](./examples/webrtc_datachannel.md)
   - [web-sys: `requestAnimationFrame`](./examples/request-animation-frame.md)
   - [web-sys: A Simple Paint Program](./examples/paint.md)
+  - [web-sys: WASM in Web Worker](./examples/wasm-in-web-worker.md)
   - [Parallel Raytracing](./examples/raytrace.md)
   - [web-sys: A TODO MVC App](./examples/todomvc.md)
 - [Reference](./reference/index.md)
@@ -86,6 +87,7 @@
       - [`inspectable`](./reference/attributes/on-rust-exports/inspectable.md)
       - [`skip_typescript`](./reference/attributes/on-rust-exports/skip_typescript.md)
       - [`typescript_type`](./reference/attributes/on-rust-exports/typescript_type.md)
+      - [`getter_with_clone`](./reference/attributes/on-rust-exports/getter_with_clone.md)
 
 - [`web-sys`](./web-sys/index.md)
   - [Using `web-sys`](./web-sys/using-web-sys.md)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/wasm-bindgen-test/asynchronous-tests.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/wasm-bindgen-test/asynchronous-tests.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/src/wasm-bindgen-test/asynchronous-tests.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/src/wasm-bindgen-test/asynchronous-tests.md	2021-12-09 12:01:26.000000000 +0000
@@ -27,8 +27,7 @@
 ## Rust compiler compatibility
 
 Note that `async` functions are only supported in stable from Rust 1.39.0 and
-beyond. As of the time of this writing (2019-09-05) this is the Nightly channel
-of Rust.
+beyond.
 
 If you're using the `futures` crate from crates.io in its 0.1 version then
 you'll want to use the `0.3.*` version of `wasm-bindgen-futures` and the `0.2.8`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/_theme/header.hbs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/_theme/header.hbs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/guide/_theme/header.hbs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/guide/_theme/header.hbs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<style>
-  header.warning {
-    background-color: rgb(242, 222, 222);
-    border-bottom-color: rgb(238, 211, 215);
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-bottom-style: solid;
-    border-bottom-width: 0.666667px;
-    border-image-outset: 0 0 0 0;
-    border-image-repeat: stretch stretch;
-    border-image-slice: 100% 100% 100% 100%;
-    border-image-source: none;
-    border-image-width: 1 1 1 1;
-    border-left-color: rgb(238, 211, 215);
-    border-left-style: solid;
-    border-left-width: 0.666667px;
-    border-right-color: rgb(238, 211, 215);
-    border-right-style: solid;
-    border-right-width: 0.666667px;
-    border-top-color: rgb(238, 211, 215);
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    border-top-style: solid;
-    border-top-width: 0.666667px;
-    color: rgb(185, 74, 72);
-    margin-bottom: 0px;
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-top: 30px;
-    padding-bottom: 8px;
-    padding-left: 14px;
-    padding-right: 35px;
-    padding-top: 8px;
-    text-align: center;
-  }
-</style>
-<header class='warning'>
-  This is the <strong>unpublished</strong> documentation of
-  <code>wasm-bindgen</code>, the published documentation is available
-  <a href="https://rustwasm.github.io/docs/wasm-bindgen/">
-    on the main Rust and WebAssembly documentation site
-  </a>. Features documented here may not be available in released versions of
-  <code>wasm-bindgen</code>.
-</header>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/_package.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/_package.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/_package.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/_package.json	2021-12-09 12:01:26.000000000 +0000
@@ -1,14 +1,14 @@
 {
   "scripts": {
-    "build": "webpack -p",
-    "serve": "webpack-dev-server -p"
+    "build": "webpack",
+    "serve": "webpack serve"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "1.0.1",
-    "html-webpack-plugin": "^3.2.0",
+    "@wasm-tool/wasm-pack-plugin": "1.5.0",
+    "html-webpack-plugin": "^5.3.2",
     "text-encoding": "^0.7.0",
-    "webpack": "^4.29.4",
-    "webpack-cli": "^3.1.1",
-    "webpack-dev-server": "^3.1.0"
+    "webpack": "^5.49.0",
+    "webpack-cli": "^4.7.2",
+    "webpack-dev-server": "^3.11.2"
   }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/src/cast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/src/cast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/src/cast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/src/cast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,4 +1,4 @@
-use crate::JsValue;
+use crate::{describe::WasmDescribe, JsValue};
 
 /// A trait for checked and unchecked casting between JS types.
 ///
@@ -154,3 +154,7 @@
     /// won't need to call this.
     fn unchecked_from_js_ref(val: &JsValue) -> &Self;
 }
+
+/// Trait implemented for wrappers around `JsValue`s generated by `#[wasm_bindgen]`.
+#[doc(hidden)]
+pub trait JsObject: JsCast + WasmDescribe {}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/src/convert/slices.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/src/convert/slices.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/src/convert/slices.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/src/convert/slices.rs	2021-12-09 12:01:26.000000000 +0000
@@ -4,6 +4,7 @@
 use core::slice;
 use core::str;
 
+use crate::cast::JsObject;
 use crate::convert::OptionIntoWasmAbi;
 use crate::convert::{FromWasmAbi, IntoWasmAbi, RefFromWasmAbi, RefMutFromWasmAbi, WasmAbi};
 use cfg_if::cfg_if;
@@ -270,4 +271,41 @@
         #[inline]
         fn is_none(slice: &WasmSlice) -> bool { slice.ptr == 0 }
     }
+
+    impl<T> IntoWasmAbi for Box<[T]> where T: JsObject {
+        type Abi = WasmSlice;
+
+        #[inline]
+        fn into_abi(self) -> WasmSlice {
+            let ptr = self.as_ptr();
+            let len = self.len();
+            mem::forget(self);
+            WasmSlice {
+                ptr: ptr.into_abi(),
+                len: len as u32,
+            }
+        }
+    }
+
+    impl<T> OptionIntoWasmAbi for Box<[T]> where T: JsObject {
+        #[inline]
+        fn none() -> WasmSlice { null_slice() }
+    }
+
+    impl<T> FromWasmAbi for Box<[T]> where T: JsObject {
+        type Abi = WasmSlice;
+
+        #[inline]
+        unsafe fn from_abi(js: WasmSlice) -> Self {
+            let ptr = <*mut JsValue>::from_abi(js.ptr);
+            let len = js.len as usize;
+            let vec: Vec<T> = Vec::from_raw_parts(ptr, len, len).drain(..).map(|js_value| T::unchecked_from_js(js_value)).collect();
+            return vec.into_boxed_slice();
+        }
+    }
+
+    impl<T> OptionFromWasmAbi for Box<[T]> where T: JsObject {
+        #[inline]
+        fn is_none(slice: &WasmSlice) -> bool { slice.ptr == 0 }
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -62,7 +62,7 @@
 pub mod describe;
 
 mod cast;
-pub use crate::cast::JsCast;
+pub use crate::cast::{JsCast, JsObject};
 
 if_std! {
     extern crate std;
@@ -570,6 +570,12 @@
     }
 }
 
+impl Default for JsValue {
+    fn default() -> Self {
+        Self::UNDEFINED
+    }
+}
+
 /// Wrapper type for imported statics.
 ///
 /// This type is used whenever a `static` is imported from a JS module, for
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/classes.js thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/classes.js
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/classes.js	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/classes.js	2021-12-09 12:01:26.000000000 +0000
@@ -112,6 +112,18 @@
     assert.strictEqual(a.skipped, undefined);
 };
 
+exports.js_getter_with_clone = () => {
+    const a = wasm.GetterWithCloneStruct.new();
+    assert.strictEqual(a.a, '');
+    a.a = 'foo';
+    assert.strictEqual(a.a, 'foo');
+
+    const b = wasm.GetterWithCloneStructField.new();
+    assert.strictEqual(b.a, '');
+    b.a = 'foo';
+    assert.strictEqual(b.a, 'foo');
+};
+
 exports.js_using_self = () => {
     wasm.UseSelf.new().free();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/classes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/classes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/classes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/classes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,6 +16,7 @@
     fn js_constructors();
     fn js_empty_structs();
     fn js_public_fields();
+    fn js_getter_with_clone();
     fn js_using_self();
     fn js_readonly_fields();
     fn js_double_consume();
@@ -288,6 +289,38 @@
     }
 }
 
+#[wasm_bindgen_test]
+fn getter_with_clone() {
+    js_getter_with_clone();
+}
+
+#[wasm_bindgen(getter_with_clone)]
+#[derive(Default)]
+pub struct GetterWithCloneStruct {
+    pub a: String,
+}
+
+#[wasm_bindgen]
+impl GetterWithCloneStruct {
+    pub fn new() -> GetterWithCloneStruct {
+        GetterWithCloneStruct::default()
+    }
+}
+
+#[wasm_bindgen]
+#[derive(Default)]
+pub struct GetterWithCloneStructField {
+    #[wasm_bindgen(getter_with_clone)]
+    pub a: String,
+}
+
+#[wasm_bindgen]
+impl GetterWithCloneStructField {
+    pub fn new() -> GetterWithCloneStructField {
+        GetterWithCloneStructField::default()
+    }
+}
+
 #[wasm_bindgen_test]
 fn using_self() {
     js_using_self();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/js_objects.js thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/js_objects.js
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/js_objects.js	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/js_objects.js	2021-12-09 12:01:26.000000000 +0000
@@ -83,6 +83,18 @@
     assert.deepStrictEqual(wasm.another_vector_return_get_array(), [1, 2, 3, 4, 5, 6]);
 };
 
+exports.returning_vector_string_foo = () => {
+    return "This is the mostest awesomest string that can possibly exist.";
+};
+
+exports.js_returning_vector_string = () => {
+    assert.strictEqual(wasm.returning_vector_string_bar().length, 10);
+};
+
+exports.js_another_vector_string_return = () => {
+    assert.deepStrictEqual(wasm.another_vector_string_return_get_array(), ["1", "2", "3", "4", "5", "6"]);
+};
+
 exports.verify_serde = function(a) {
   assert.deepStrictEqual(a, {
     a: 0,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/js_objects.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/js_objects.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/js_objects.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/js_objects.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,3 +1,4 @@
+use js_sys::JsString;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_test::*;
 
@@ -24,8 +25,12 @@
 
     fn returning_vector_foo() -> JsValue;
     fn js_returning_vector();
-
     fn js_another_vector_return();
+
+    fn returning_vector_string_foo() -> JsString;
+    fn js_returning_vector_string();
+    fn js_another_vector_string_return();
+
     fn verify_serde(val: JsValue) -> JsValue;
 }
 
@@ -107,6 +112,37 @@
     js_another_vector_return();
 }
 
+#[wasm_bindgen]
+pub fn returning_vector_string_bar() -> Vec<JsString> {
+    let mut res = Vec::new();
+    for _ in 0..10 {
+        res.push(returning_vector_string_foo())
+    }
+    res
+}
+
+#[wasm_bindgen_test]
+fn returning_vector_string() {
+    js_returning_vector_string();
+}
+
+#[wasm_bindgen]
+pub fn another_vector_string_return_get_array() -> Vec<JsString> {
+    vec![
+        "1".into(),
+        "2".into(),
+        "3".into(),
+        "4".into(),
+        "5".into(),
+        "6".into(),
+    ]
+}
+
+#[wasm_bindgen_test]
+fn another_vector_string_return() {
+    js_another_vector_string_return();
+}
+
 #[cfg(feature = "serde-serialize")]
 #[wasm_bindgen_test]
 fn serde() {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/variadic.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/variadic.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/variadic.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/variadic.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,9 +37,9 @@
     //                          rest: Vec<String>) -> String;
     #[wasm_bindgen(variadic)]
     fn variadic_sum_rest_vec(first: u8, second: u8, rest: Vec<u8>) -> u8;
-//#[wasm_bindgen(variadic)]
-//fn variadic_compare_pairs(first: JsValue, second: JsValue, rest: &[JsValue]);
-//TODO imported type
+    //#[wasm_bindgen(variadic)]
+    //fn variadic_compare_pairs(first: JsValue, second: JsValue, rest: &[JsValue]);
+    //TODO imported type
 }
 
 // ints
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/vendor_prefix.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/vendor_prefix.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/vendor_prefix.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen/tests/wasm/vendor_prefix.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,6 +28,13 @@
     fn new() -> MySpecialApi3;
     #[wasm_bindgen(method)]
     fn foo(this: &MySpecialApi3) -> u32;
+
+    // This API does not exist at all;
+    // test that Rust gets a chance to catch the error (#2437)
+    #[wasm_bindgen(vendor_prefix = a, vendor_prefix = b)]
+    type MyMissingApi;
+    #[wasm_bindgen(constructor, catch)]
+    fn new() -> Result<MyMissingApi, JsValue>;
 }
 
 #[wasm_bindgen_test]
@@ -37,4 +44,5 @@
     assert_eq!(MySpecialApi::new().foo(), 123);
     assert_eq!(MySpecialApi2::new().foo(), 124);
     assert_eq!(MySpecialApi3::new().foo(), 125);
+    assert!(MyMissingApi::new().is_err());
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-backend/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-backend/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-backend/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-backend/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"01f87c3a2a16f9136fa49af1104577f7b830f5dde8aba550eff34d73d0d2b04f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","src/ast.rs":"1499cdf9717a22de7c88f565cfdc82f5ccd16c2c3f023e845f49afe662333832","src/codegen.rs":"891d2a479d6834a9ced6bf65e374e3bb2dbab91f54ee3f113b73d0b0820caf04","src/encode.rs":"4b32f458dfbce7df1806f4c1e8dc54e5a3f9a6e45a380b80d51a1d11bf78d6cc","src/error.rs":"ecb3e0a2abdce0c9c5bb8a68c0e001a328ed85608bcf4ccb9215088d1f81a9c2","src/lib.rs":"14ade320b537315ec4c575f9f3c7a35ff4e9385114c4c26a35b2ee270a897cb4","src/util.rs":"f8aeb61bc15a2ae934d6d9f7db4b911fb5dc2679790d8d5261754c0cba706e8b"},"package":"1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"}
\ No newline at end of file
+{"files":{"Cargo.toml":"05f05aef38524bf06281a7aecb3540d8c49ae5bf44580dd8676d7ec865d98412","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","src/ast.rs":"92434ccf117adab6063aa679ea923826ed87e254781fe0c22fee9f54353b4aad","src/codegen.rs":"b426f16065744aff82b476e773f0e89658e2e4e6d3732ad95a9fe9357a58c07b","src/encode.rs":"4b32f458dfbce7df1806f4c1e8dc54e5a3f9a6e45a380b80d51a1d11bf78d6cc","src/error.rs":"ecb3e0a2abdce0c9c5bb8a68c0e001a328ed85608bcf4ccb9215088d1f81a9c2","src/lib.rs":"14ade320b537315ec4c575f9f3c7a35ff4e9385114c4c26a35b2ee270a897cb4","src/util.rs":"f8aeb61bc15a2ae934d6d9f7db4b911fb5dc2679790d8d5261754c0cba706e8b"},"package":"cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-backend/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-backend/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-backend/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-backend/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "wasm-bindgen-backend"
-version = "0.2.69"
+version = "0.2.76"
 authors = ["The wasm-bindgen Developers"]
 description = "Backend code generation of the wasm-bindgen tool\n"
 homepage = "https://rustwasm.github.io/wasm-bindgen/"
@@ -24,7 +24,7 @@
 version = "3.0.0"
 
 [dependencies.lazy_static]
-version = "1.0.0"
+version = "1.0.2"
 
 [dependencies.log]
 version = "0.4"
@@ -40,7 +40,7 @@
 features = ["full"]
 
 [dependencies.wasm-bindgen-shared]
-version = "=0.2.69"
+version = "=0.2.76"
 
 [features]
 extra-traits = ["syn/extra-traits"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-backend/src/ast.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-backend/src/ast.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-backend/src/ast.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-backend/src/ast.rs	2021-12-09 12:01:26.000000000 +0000
@@ -261,6 +261,8 @@
     pub extends: Vec<syn::Path>,
     /// A custom prefix to add and attempt to fall back to, if the type isn't found
     pub vendor_prefixes: Vec<Ident>,
+    /// If present, don't generate a `Deref` impl
+    pub no_deref: bool,
 }
 
 /// The metadata for an Enum being imported
@@ -343,6 +345,8 @@
     pub comments: Vec<String>,
     /// Whether to generate a typescript definition for this field
     pub generate_typescript: bool,
+    /// Whether to use .clone() in the auto-generated getter for this field
+    pub getter_with_clone: bool,
 }
 
 /// Information about an Enum being exported
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-backend/src/codegen.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-backend/src/codegen.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-backend/src/codegen.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-backend/src/codegen.rs	2021-12-09 12:01:26.000000000 +0000
@@ -274,8 +274,19 @@
         let getter = &self.getter;
         let setter = &self.setter;
 
-        let assert_copy = quote! { assert_copy::<#ty>() };
-        let assert_copy = respan(assert_copy, ty);
+        let maybe_assert_copy = if self.getter_with_clone {
+            quote! {}
+        } else {
+            quote! { assert_copy::<#ty>() }
+        };
+        let maybe_assert_copy = respan(maybe_assert_copy, ty);
+
+        let maybe_clone = if self.getter_with_clone {
+            quote! { .clone() }
+        } else {
+            quote! {}
+        };
+
         (quote! {
             #[doc(hidden)]
             #[allow(clippy::all)]
@@ -287,11 +298,11 @@
                 use wasm_bindgen::convert::IntoWasmAbi;
 
                 fn assert_copy<T: Copy>(){}
-                #assert_copy;
+                #maybe_assert_copy;
 
                 let js = js as *mut WasmRefCell<#struct_name>;
                 assert_not_null(js);
-                let val = (*js).borrow().#rust_name;
+                let val = (*js).borrow().#rust_name#maybe_clone;
                 <#ty as IntoWasmAbi>::into_abi(val)
             }
         })
@@ -607,6 +618,8 @@
             }
         });
 
+        let no_deref = self.no_deref;
+
         (quote! {
             #[allow(bad_style)]
             #(#attrs)*
@@ -624,7 +637,7 @@
                 use wasm_bindgen::convert::{OptionIntoWasmAbi, OptionFromWasmAbi};
                 use wasm_bindgen::convert::RefFromWasmAbi;
                 use wasm_bindgen::describe::WasmDescribe;
-                use wasm_bindgen::{JsValue, JsCast};
+                use wasm_bindgen::{JsValue, JsCast, JsObject};
                 use wasm_bindgen::__rt::core;
 
                 impl WasmDescribe for #rust_name {
@@ -633,15 +646,6 @@
                     }
                 }
 
-                impl core::ops::Deref for #rust_name {
-                    type Target = #internal_obj;
-
-                    #[inline]
-                    fn deref(&self) -> &#internal_obj {
-                        &self.obj
-                    }
-                }
-
                 impl IntoWasmAbi for #rust_name {
                     type Abi = <JsValue as IntoWasmAbi>::Abi;
 
@@ -761,11 +765,28 @@
                     }
                 }
 
+                impl JsObject for #rust_name {}
+
                 ()
             };
         })
         .to_tokens(tokens);
 
+        if !no_deref {
+            (quote! {
+                #[allow(clippy::all)]
+                impl core::ops::Deref for #rust_name {
+                    type Target = #internal_obj;
+
+                    #[inline]
+                    fn deref(&self) -> &#internal_obj {
+                        &self.obj
+                    }
+                }
+            })
+            .to_tokens(tokens);
+        }
+
         for superclass in self.extends.iter() {
             (quote! {
                 #[allow(clippy::all)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"3303302baf3387c3101b4087a806d9981f2dddb4ff3d527dfb236cb6917e5903","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"c7daaf1674c7d93e33c798e27d6b87c6e70d6e64e031def063be7b858b9815a3","src/lib.rs":"b324d3a88b643ca05f421834d0ae162f10f3f8ae9134f2711cfa2de7e77a1f5b","src/queue.rs":"43ebf7a5af8e417860a7d9a9c1b87d8e82d7251d779cc148a46ac5fd4436c815","src/task/multithread.rs":"c6809155b7155326ec526bab92c620b799e25f384c17c9af0ea19e10481c925d","src/task/singlethread.rs":"98caaeeb7cb5e2f5e46dcf8fd0bc009b490691d1b3ed4484d457e0479834d071","src/task/wait_async_polyfill.rs":"236ecf5e866203ccca49a4551f04f4abbcf530c36b13aee70206e2cf4f907b1c","tests/tests.rs":"faf7c0ca792ca0e52ffce1275c779605279c128efbcee49661acc1c6290a64c0"},"package":"1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"}
\ No newline at end of file
+{"files":{"Cargo.toml":"bd2ab3e719c1aa9dbf137c68fd26741fc2bc0e91ca7030d8d188d60cff49e900","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"85d37419c6d458e5076b37ed6f06471491b1b16b29dc1e37972117ed2818652d","src/lib.rs":"6c3a7fb9a25793434861f66bab405b5f446407a2b46055bb45bf87b7593a262e","src/queue.rs":"43ebf7a5af8e417860a7d9a9c1b87d8e82d7251d779cc148a46ac5fd4436c815","src/stream.rs":"a4ae374c3807d9e4a1a3362652a12d3a3a3080cfc53fedbfa032e547cb3bf0e4","src/task/multithread.rs":"c6809155b7155326ec526bab92c620b799e25f384c17c9af0ea19e10481c925d","src/task/singlethread.rs":"98caaeeb7cb5e2f5e46dcf8fd0bc009b490691d1b3ed4484d457e0479834d071","src/task/wait_async_polyfill.rs":"236ecf5e866203ccca49a4551f04f4abbcf530c36b13aee70206e2cf4f907b1c","tests/tests.rs":"ebfbfc840367e13f0469c5b1a630ff25d4f7c2924cb1e1b304e775d78a85e503"},"package":"95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "wasm-bindgen-futures"
-version = "0.4.19"
+version = "0.4.26"
 authors = ["The wasm-bindgen Developers"]
 description = "Bridging the gap between Rust Futures and JavaScript Promises"
 homepage = "https://rustwasm.github.io/wasm-bindgen/"
@@ -24,16 +24,28 @@
 [dependencies.cfg-if]
 version = "1.0.0"
 
+[dependencies.futures-core]
+version = "0.3.8"
+optional = true
+default-features = false
+
 [dependencies.js-sys]
-version = "0.3.46"
+version = "0.3.53"
 
 [dependencies.wasm-bindgen]
-version = "0.2.69"
+version = "0.2.76"
+
+[features]
+futures-core-03-stream = ["futures-core"]
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.futures-channel-preview]
 version = "0.3.0-alpha.18"
 
+[target."cfg(target_arch = \"wasm32\")".dev-dependencies.futures-lite]
+version = "1.11.3"
+default-features = false
+
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
-version = "0.3.19"
+version = "0.3.26"
 [target."cfg(target_feature = \"atomics\")".dependencies.web-sys]
 version = "0.3.24"
 features = ["MessageEvent", "Worker"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/README.md	2021-12-09 12:01:26.000000000 +0000
@@ -8,6 +8,9 @@
 1. From a JavaScript `Promise` into a Rust `Future`.
 2. From a Rust `Future` into a JavaScript `Promise`.
 
+Additionally under the feature flag `futures-core-03-stream` there is experimental 
+support for `AsyncIterator` to `Stream` conversion.
+
 See the [API documentation][docs] for more info.
 
 [docs]: https://rustwasm.github.io/wasm-bindgen/api/wasm_bindgen_futures/
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -43,6 +43,8 @@
 use wasm_bindgen::prelude::*;
 
 mod queue;
+#[cfg(feature = "futures-core-03-stream")]
+pub mod stream;
 
 mod task {
     use cfg_if::cfg_if;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/src/stream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/src/stream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/src/stream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/src/stream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,81 @@
+//! Converting JavaScript `AsyncIterator`s to Rust `Stream`s.
+//!
+//! Analogous to the promise to future convertion, this module allows the
+//! turing objects implementing the async iterator protocol into `Stream`s
+//! that produce values that can be awaited from.
+//!
+
+use crate::JsFuture;
+use core::future::Future;
+use core::pin::Pin;
+use core::task::{Context, Poll};
+use futures_core::stream::Stream;
+use js_sys::{AsyncIterator, IteratorNext};
+use wasm_bindgen::{prelude::*, JsCast};
+
+/// A `Stream` that yields values from an underlying `AsyncIterator`.
+pub struct JsStream {
+    iter: AsyncIterator,
+    next: Option<JsFuture>,
+    done: bool,
+}
+
+impl JsStream {
+    fn next_future(&self) -> Result<JsFuture, JsValue> {
+        self.iter.next().map(JsFuture::from)
+    }
+}
+
+impl From<AsyncIterator> for JsStream {
+    fn from(iter: AsyncIterator) -> Self {
+        JsStream {
+            iter,
+            next: None,
+            done: false,
+        }
+    }
+}
+
+impl Stream for JsStream {
+    type Item = Result<JsValue, JsValue>;
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
+        if self.done {
+            return Poll::Ready(None);
+        }
+
+        let future = match self.next.as_mut() {
+            Some(val) => val,
+            None => match self.next_future() {
+                Ok(val) => {
+                    self.next = Some(val);
+                    self.next.as_mut().unwrap()
+                }
+                Err(e) => {
+                    self.done = true;
+                    return Poll::Ready(Some(Err(e)));
+                }
+            },
+        };
+
+        match Pin::new(future).poll(cx) {
+            Poll::Ready(res) => match res {
+                Ok(iter_next) => {
+                    let next = iter_next.unchecked_into::<IteratorNext>();
+                    if next.done() {
+                        self.done = true;
+                        Poll::Ready(None)
+                    } else {
+                        self.next.take();
+                        Poll::Ready(Some(Ok(next.value())))
+                    }
+                }
+                Err(e) => {
+                    self.done = true;
+                    Poll::Ready(Some(Err(e)))
+                }
+            },
+            Poll::Pending => Poll::Pending,
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/tests/tests.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/tests/tests.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-futures/tests/tests.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-futures/tests/tests.rs	2021-12-09 12:01:26.000000000 +0000
@@ -88,3 +88,26 @@
     a.await.unwrap();
     b.await.unwrap();
 }
+
+#[cfg(feature = "futures-core-03-stream")]
+#[wasm_bindgen_test]
+async fn can_use_an_async_iterable_as_stream() {
+    use futures_lite::stream::StreamExt;
+    use wasm_bindgen::JsCast;
+    use wasm_bindgen_futures::stream::JsStream;
+
+    let async_iter = js_sys::Function::new_no_args(
+        "return async function*() { 
+            yield 42;
+            yield 24;
+        }()",
+    )
+    .call0(&JsValue::undefined())
+    .unwrap()
+    .unchecked_into::<js_sys::AsyncIterator>();
+
+    let mut stream = JsStream::from(async_iter);
+    assert_eq!(stream.next().await, Some(Ok(JsValue::from(42))));
+    assert_eq!(stream.next().await, Some(Ok(JsValue::from(24))));
+    assert_eq!(stream.next().await, None);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"c5bf8c9f6d1e291ebe3e9be973adacf26ea8febfc7d89edb9c38fadf069fa7ed","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"ef5ffff199bf75993b81c3c1de8dbe19babb22b89170763323fa11a85c62f045","src/lib.rs":"2b63b3cf46acde23d9822773c231c110ffa1edf9697e308c90d2eb1bb41464f4","tests/ui.rs":"aed1b0f4e8c99b06657c54f3a74de4b3535ce567fb20e4d2fc6911b361c3d934","ui-tests/async-errors.rs":"f3ab249b3741b38c6213651a5cd36f8b9873bad34bd49d13b780d21bed47272b","ui-tests/async-errors.stderr":"7eacaf1922f5aa7f0014d62c70051c63c9da2a5409aa11532c3fd3f76f112bca","ui-tests/attribute-fails-to-parse.rs":"c21c2a250534ca7e80fc462804efc0db8a71b6b0cdb0c57c5cab444d081f68de","ui-tests/attribute-fails-to-parse.stderr":"3bc77befbbe7e2d0744dd81067a75cb70c3f2d8bd9c60ec5bcb2dfb65fc1a593","ui-tests/bad-signatures.rs":"96b53e9327cc75747510b548b97cff86429532d5cdf65cc991211bca5646abc2","ui-tests/bad-signatures.stderr":"931e934ccbc43e4cee41a46ecaa3953c3ccdef69450519a838b9af428f75fa72","ui-tests/import-local.rs":"783ef9ebb792111ec7fd335cbc4f684381609c86c0af660fd5ab35cf04cacbf4","ui-tests/import-local.stderr":"6e90ad05c3783d7c69ff4e156458c63ee45ceb7ea8ebc38e1ca52e7f46e8bcf8","ui-tests/invalid-attr.rs":"603cf0bcb95a42a35e535a7d9577dc8c5e6175af4cd27d83fdf77cd6b67acf48","ui-tests/invalid-attr.stderr":"e1fd9450e16f1d672cb708bcbaf99a07f916c48d3e961c1dd1e92bd835d3ec53","ui-tests/invalid-enums.rs":"bf473e1bbafbcde82c946311e824d97bd1f941cfc5c1495025d8a7a513b90a19","ui-tests/invalid-enums.stderr":"870314f90c7989b2991b43d4e0364f28959062bd574c8e01380b4f9b893bf26b","ui-tests/invalid-imports.rs":"452e9df87229ebea5442f384b0bd27a2c082d731a3b99fc7617e9a583392cf3a","ui-tests/invalid-imports.stderr":"4f59f109ec9d5acacf5f22f1467dca7d81e6dbabde95e7bd025ef330c275774a","ui-tests/invalid-items.rs":"d75ae9c39762385b801da03813702632184f1c2943bb9b8a2dc4f31622347a81","ui-tests/invalid-items.stderr":"a5388df9fb9b3579c718aac1822bf4d3f8e950144c4443cc72050043ba7189fb","ui-tests/invalid-methods.rs":"6193a66f05f07c391178e9eae1c9f2d4c12d686ef06cf8c24113cdda77328f37","ui-tests/invalid-methods.stderr":"ca8c1c46495ec07eda4d957e0d5a144f276f7ab40f10d59c528919aa1d6e8811","ui-tests/invalid-setter.rs":"db9666df889b58246a51ebc7d753e41ac4382475257a589499a4e886e6fbc45f","ui-tests/invalid-setter.stderr":"d1629836ec39727bfa4737538e9f991cda6fbaeb1c0f8c878cb13757e66daac5","ui-tests/missing-catch.rs":"705bf784db641b30131510b5c47192014e19aeeeb6f73ede1d5356ad2c29915c","ui-tests/missing-catch.stderr":"70e31867dbbe6fae5d7aa591f8c9be60d0af178a373f6169f542e462b26d9fa8","ui-tests/non-public-function.rs":"0fe075b32c211870bcde0f7dce0eceaffb61a4f8a6ffbd90946a59d7d220343c","ui-tests/non-public-function.stderr":"c9f6f5123b6c3462b8952d6e468ed13c566635d4939b98c9098d2a713f5aa2df","ui-tests/pub-not-copy.rs":"1e50f0b63a6e6363b0926cf947b0492a9803ddb35370f32e733a32506df9b556","ui-tests/pub-not-copy.stderr":"c16d6f00dff2d71f3610d85aa43e46e0e3c4fac7b2522bd7f730d592baf0ec22","ui-tests/start-function.rs":"479cb4389545ccf7c155677fe629c135e3374a3f622aab3c17a4db63abca1a55","ui-tests/start-function.stderr":"5dfbe5d462d588dcf844444258cc0a1edac248e177d161715e22f8d3aa70cfaa","ui-tests/structural-and-final.rs":"1571b078a9d0be6c96ab97be10f1bf369dbb740f04fa312834f49a64130f8d30","ui-tests/structural-and-final.stderr":"cf21dec2851d3f667b93a317ba9e4657a623c49e8b779ea64669452297ba0a17","ui-tests/traits-not-implemented.rs":"3445e15b9c61f84a1f8d703a3a4fe2d2e2d85960ff6b2ac718644d97bf1564e1","ui-tests/traits-not-implemented.stderr":"e9ed8f2c74f6ffdfe1993e997ae5fcbd98143c022dfd5311d4724c420f068db8","ui-tests/unknown-type-in-import.rs":"7fbc95bb82d0d60568b8daf27236418219c57447d1dc2e2e384e5f907bac3e3e","ui-tests/unknown-type-in-import.stderr":"2d213673be2dfcb6b56b9efacea9e968c5ae4faab9fabd6c5c66495008d5fe20","ui-tests/unused-attributes.rs":"1ec5e1df4bbd764edeb3d69871ed4cc25b455c85f4dc55aeb60b12efcff876a4","ui-tests/unused-attributes.stderr":"1256b19f74116873be5032021afa3a73d69c3c130994300bf6f9189071b531e1","ui-tests/update-all-references.sh":"8b8dbf31e7ada1314956db7a20ab14b13af3ae246a6295afdc7dc96af8ec3773","ui-tests/update-references.sh":"65375c25981646e08e8589449a06be4505b1a2c9e10d35f650be4b1b495dff22"},"package":"7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"}
\ No newline at end of file
+{"files":{"Cargo.toml":"aeb503fb9ccdd416745463e091c2f933230b59fac85d3e0d09cf7d1f80219e9c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"ef5ffff199bf75993b81c3c1de8dbe19babb22b89170763323fa11a85c62f045","src/lib.rs":"2b63b3cf46acde23d9822773c231c110ffa1edf9697e308c90d2eb1bb41464f4","tests/ui.rs":"aed1b0f4e8c99b06657c54f3a74de4b3535ce567fb20e4d2fc6911b361c3d934","ui-tests/async-errors.rs":"f3ab249b3741b38c6213651a5cd36f8b9873bad34bd49d13b780d21bed47272b","ui-tests/async-errors.stderr":"334aa6c7d523af12eaef72a766c9573ee9b8039d930f9e4c6f790c9eacaf6d6a","ui-tests/attribute-fails-to-parse.rs":"c21c2a250534ca7e80fc462804efc0db8a71b6b0cdb0c57c5cab444d081f68de","ui-tests/attribute-fails-to-parse.stderr":"3bc77befbbe7e2d0744dd81067a75cb70c3f2d8bd9c60ec5bcb2dfb65fc1a593","ui-tests/bad-signatures.rs":"96b53e9327cc75747510b548b97cff86429532d5cdf65cc991211bca5646abc2","ui-tests/bad-signatures.stderr":"931e934ccbc43e4cee41a46ecaa3953c3ccdef69450519a838b9af428f75fa72","ui-tests/import-local.rs":"783ef9ebb792111ec7fd335cbc4f684381609c86c0af660fd5ab35cf04cacbf4","ui-tests/import-local.stderr":"6e90ad05c3783d7c69ff4e156458c63ee45ceb7ea8ebc38e1ca52e7f46e8bcf8","ui-tests/invalid-attr.rs":"603cf0bcb95a42a35e535a7d9577dc8c5e6175af4cd27d83fdf77cd6b67acf48","ui-tests/invalid-attr.stderr":"e1fd9450e16f1d672cb708bcbaf99a07f916c48d3e961c1dd1e92bd835d3ec53","ui-tests/invalid-enums.rs":"bf473e1bbafbcde82c946311e824d97bd1f941cfc5c1495025d8a7a513b90a19","ui-tests/invalid-enums.stderr":"ecd549ab69e7d7d645922857e2a83b7171f97a276afeb9f113407a4181b2b9e2","ui-tests/invalid-imports.rs":"452e9df87229ebea5442f384b0bd27a2c082d731a3b99fc7617e9a583392cf3a","ui-tests/invalid-imports.stderr":"4f59f109ec9d5acacf5f22f1467dca7d81e6dbabde95e7bd025ef330c275774a","ui-tests/invalid-items.rs":"d75ae9c39762385b801da03813702632184f1c2943bb9b8a2dc4f31622347a81","ui-tests/invalid-items.stderr":"a5388df9fb9b3579c718aac1822bf4d3f8e950144c4443cc72050043ba7189fb","ui-tests/invalid-methods.rs":"6193a66f05f07c391178e9eae1c9f2d4c12d686ef06cf8c24113cdda77328f37","ui-tests/invalid-methods.stderr":"ca8c1c46495ec07eda4d957e0d5a144f276f7ab40f10d59c528919aa1d6e8811","ui-tests/invalid-setter.rs":"db9666df889b58246a51ebc7d753e41ac4382475257a589499a4e886e6fbc45f","ui-tests/invalid-setter.stderr":"d1629836ec39727bfa4737538e9f991cda6fbaeb1c0f8c878cb13757e66daac5","ui-tests/missing-catch.rs":"705bf784db641b30131510b5c47192014e19aeeeb6f73ede1d5356ad2c29915c","ui-tests/missing-catch.stderr":"7a20ff397d3e93aafc4d5b17ca9229943ce3dfe4757e5aecc007cd17439d764c","ui-tests/non-public-function.rs":"0fe075b32c211870bcde0f7dce0eceaffb61a4f8a6ffbd90946a59d7d220343c","ui-tests/non-public-function.stderr":"c9f6f5123b6c3462b8952d6e468ed13c566635d4939b98c9098d2a713f5aa2df","ui-tests/pub-not-copy.rs":"1e50f0b63a6e6363b0926cf947b0492a9803ddb35370f32e733a32506df9b556","ui-tests/pub-not-copy.stderr":"c16d6f00dff2d71f3610d85aa43e46e0e3c4fac7b2522bd7f730d592baf0ec22","ui-tests/start-function.rs":"479cb4389545ccf7c155677fe629c135e3374a3f622aab3c17a4db63abca1a55","ui-tests/start-function.stderr":"8c5c9a5ee07b0d925fd6b457d75418442fe33fff891c1c105dd855cb0f358bc2","ui-tests/structural-and-final.rs":"1571b078a9d0be6c96ab97be10f1bf369dbb740f04fa312834f49a64130f8d30","ui-tests/structural-and-final.stderr":"cf21dec2851d3f667b93a317ba9e4657a623c49e8b779ea64669452297ba0a17","ui-tests/traits-not-implemented.rs":"3445e15b9c61f84a1f8d703a3a4fe2d2e2d85960ff6b2ac718644d97bf1564e1","ui-tests/traits-not-implemented.stderr":"e9ed8f2c74f6ffdfe1993e997ae5fcbd98143c022dfd5311d4724c420f068db8","ui-tests/unknown-type-in-import.rs":"7fbc95bb82d0d60568b8daf27236418219c57447d1dc2e2e384e5f907bac3e3e","ui-tests/unknown-type-in-import.stderr":"2d213673be2dfcb6b56b9efacea9e968c5ae4faab9fabd6c5c66495008d5fe20","ui-tests/unused-attributes.rs":"1ec5e1df4bbd764edeb3d69871ed4cc25b455c85f4dc55aeb60b12efcff876a4","ui-tests/unused-attributes.stderr":"1256b19f74116873be5032021afa3a73d69c3c130994300bf6f9189071b531e1","ui-tests/update-all-references.sh":"8b8dbf31e7ada1314956db7a20ab14b13af3ae246a6295afdc7dc96af8ec3773","ui-tests/update-references.sh":"65375c25981646e08e8589449a06be4505b1a2c9e10d35f650be4b1b495dff22"},"package":"44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "wasm-bindgen-macro"
-version = "0.2.69"
+version = "0.2.76"
 authors = ["The wasm-bindgen Developers"]
 description = "Definition of the `#[wasm_bindgen]` attribute, an internal dependency\n"
 homepage = "https://rustwasm.github.io/wasm-bindgen/"
@@ -27,16 +27,16 @@
 version = "1.0"
 
 [dependencies.wasm-bindgen-macro-support]
-version = "=0.2.69"
+version = "=0.2.76"
 [dev-dependencies.trybuild]
 version = "1.0"
 
 [dev-dependencies.wasm-bindgen]
-version = "0.2.69"
+version = "0.2.76"
 features = ["strict-macro"]
 
 [dev-dependencies.wasm-bindgen-futures]
-version = "0.4.19"
+version = "0.4.26"
 
 [features]
 spans = ["wasm-bindgen-macro-support/spans"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/async-errors.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/async-errors.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/async-errors.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/async-errors.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -1,26 +1,26 @@
-error[E0277]: the trait bound `std::result::Result<(), ()>: IntoJsResult` is not satisfied
+error[E0277]: the trait bound `Result<(), ()>: IntoJsResult` is not satisfied
   --> $DIR/async-errors.rs:30:1
    |
 30 | #[wasm_bindgen]
-   | ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `std::result::Result<(), ()>`
+   | ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `Result<(), ()>`
    |
    = help: the following implementations were found:
-             <std::result::Result<(), E> as IntoJsResult>
-             <std::result::Result<T, E> as IntoJsResult>
+             <Result<(), E> as IntoJsResult>
+             <Result<T, E> as IntoJsResult>
    = note: required by `into_js_result`
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `std::result::Result<(), BadType>: IntoJsResult` is not satisfied
+error[E0277]: the trait bound `Result<(), BadType>: IntoJsResult` is not satisfied
   --> $DIR/async-errors.rs:32:1
    |
 32 | #[wasm_bindgen]
-   | ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `std::result::Result<(), BadType>`
+   | ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `Result<(), BadType>`
    |
    = help: the following implementations were found:
-             <std::result::Result<(), E> as IntoJsResult>
-             <std::result::Result<T, E> as IntoJsResult>
+             <Result<(), E> as IntoJsResult>
+             <Result<T, E> as IntoJsResult>
    = note: required by `into_js_result`
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `wasm_bindgen::JsValue: From<BadType>` is not satisfied
   --> $DIR/async-errors.rs:34:1
@@ -33,20 +33,20 @@
              <wasm_bindgen::JsValue as From<&'a T>>
              <wasm_bindgen::JsValue as From<&'a str>>
              <wasm_bindgen::JsValue as From<MyType>>
-           and 62 others
+           and 63 others
    = note: required because of the requirements on the impl of `Into<wasm_bindgen::JsValue>` for `BadType`
    = note: required because of the requirements on the impl of `IntoJsResult` for `BadType`
    = note: required by `into_js_result`
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `std::result::Result<BadType, wasm_bindgen::JsValue>: IntoJsResult` is not satisfied
+error[E0277]: the trait bound `Result<BadType, wasm_bindgen::JsValue>: IntoJsResult` is not satisfied
   --> $DIR/async-errors.rs:36:1
    |
 36 | #[wasm_bindgen]
-   | ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `std::result::Result<BadType, wasm_bindgen::JsValue>`
+   | ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `Result<BadType, wasm_bindgen::JsValue>`
    |
    = help: the following implementations were found:
-             <std::result::Result<(), E> as IntoJsResult>
-             <std::result::Result<T, E> as IntoJsResult>
+             <Result<(), E> as IntoJsResult>
+             <Result<T, E> as IntoJsResult>
    = note: required by `into_js_result`
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/invalid-enums.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/invalid-enums.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/invalid-enums.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/invalid-enums.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
 8 |     D(u32),
   |      ^^^^^
 
-error: enums with #[wasm_bidngen] may only have number literal values
+error: enums with #[wasm_bindgen] may only have number literal values
   --> $DIR/invalid-enums.rs:13:9
    |
 13 |     X = 1 + 3,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/missing-catch.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/missing-catch.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/missing-catch.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/missing-catch.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
-error[E0277]: the trait bound `std::result::Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>: FromWasmAbi` is not satisfied
+error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>: FromWasmAbi` is not satisfied
  --> $DIR/missing-catch.rs:6:9
   |
 6 |     pub fn foo() -> Result<JsValue, JsValue>;
-  |            ^^^ the trait `FromWasmAbi` is not implemented for `std::result::Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
+  |            ^^^ the trait `FromWasmAbi` is not implemented for `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/start-function.stderr thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/start-function.stderr
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/start-function.stderr	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro/ui-tests/start-function.stderr	2021-12-09 12:01:26.000000000 +0000
@@ -10,46 +10,46 @@
 10 | pub fn foo3<T>() {}
    |            ^^^
 
-error[E0277]: the trait bound `std::result::Result<wasm_bindgen::JsValue, ()>: wasm_bindgen::__rt::Start` is not satisfied
+error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, ()>: wasm_bindgen::__rt::Start` is not satisfied
   --> $DIR/start-function.rs:15:1
    |
 15 | #[wasm_bindgen(start)]
-   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `std::result::Result<wasm_bindgen::JsValue, ()>`
+   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `Result<wasm_bindgen::JsValue, ()>`
    |
    = help: the following implementations were found:
-             <std::result::Result<(), E> as wasm_bindgen::__rt::Start>
+             <Result<(), E> as wasm_bindgen::__rt::Start>
    = note: required by `start`
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `std::result::Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>: wasm_bindgen::__rt::Start` is not satisfied
+error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>: wasm_bindgen::__rt::Start` is not satisfied
   --> $DIR/start-function.rs:18:1
    |
 18 | #[wasm_bindgen(start)]
-   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `std::result::Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
+   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
    |
    = help: the following implementations were found:
-             <std::result::Result<(), E> as wasm_bindgen::__rt::Start>
+             <Result<(), E> as wasm_bindgen::__rt::Start>
    = note: required by `start`
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `std::result::Result<wasm_bindgen::JsValue, ()>: wasm_bindgen::__rt::Start` is not satisfied
+error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, ()>: wasm_bindgen::__rt::Start` is not satisfied
   --> $DIR/start-function.rs:27:1
    |
 27 | #[wasm_bindgen(start)]
-   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `std::result::Result<wasm_bindgen::JsValue, ()>`
+   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `Result<wasm_bindgen::JsValue, ()>`
    |
    = help: the following implementations were found:
-             <std::result::Result<(), E> as wasm_bindgen::__rt::Start>
+             <Result<(), E> as wasm_bindgen::__rt::Start>
    = note: required by `start`
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `std::result::Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>: wasm_bindgen::__rt::Start` is not satisfied
+error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>: wasm_bindgen::__rt::Start` is not satisfied
   --> $DIR/start-function.rs:30:1
    |
 30 | #[wasm_bindgen(start)]
-   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `std::result::Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
+   | ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
    |
    = help: the following implementations were found:
-             <std::result::Result<(), E> as wasm_bindgen::__rt::Start>
+             <Result<(), E> as wasm_bindgen::__rt::Start>
    = note: required by `start`
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro-support/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro-support/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro-support/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro-support/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"66f60260a04e4cb05249615c8e1bb4c7c0e878b1e0b34521dea2959ee5103c56","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","src/lib.rs":"478b94322d1e7c128a9c109627dd9658cc40b7f9350d05ef672cb5bf5b6bd1ff","src/parser.rs":"da084ed2691e49cd2f7204d8247965f1a32c253e1f0a5783190fffd503bbda23"},"package":"b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"}
\ No newline at end of file
+{"files":{"Cargo.toml":"c0e29a3088fe76463c270aec58019758c21cd679bbacb8f546059dc30b1cdef0","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","src/lib.rs":"478b94322d1e7c128a9c109627dd9658cc40b7f9350d05ef672cb5bf5b6bd1ff","src/parser.rs":"94299016f0b3b7eaf426c461a77994692cf6ebcf46a43bb7c01f1951aac09e3a"},"package":"0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro-support/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro-support/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro-support/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro-support/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "wasm-bindgen-macro-support"
-version = "0.2.69"
+version = "0.2.76"
 authors = ["The wasm-bindgen Developers"]
 description = "The part of the implementation of the `#[wasm_bindgen]` attribute that is not in the shared backend crate\n"
 homepage = "https://rustwasm.github.io/wasm-bindgen/"
@@ -27,14 +27,14 @@
 version = "1.0"
 
 [dependencies.syn]
-version = "1.0.27"
+version = "1.0.67"
 features = ["visit", "full"]
 
 [dependencies.wasm-bindgen-backend]
-version = "=0.2.69"
+version = "=0.2.76"
 
 [dependencies.wasm-bindgen-shared]
-version = "=0.2.69"
+version = "=0.2.76"
 
 [features]
 extra-traits = ["syn/extra-traits"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro-support/src/parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro-support/src/parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-macro-support/src/parser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-macro-support/src/parser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -52,6 +52,7 @@
             (inspectable, Inspectable(Span)),
             (is_type_of, IsTypeOf(Span, syn::Expr)),
             (extends, Extends(Span, syn::Path)),
+            (no_deref, NoDeref(Span)),
             (vendor_prefix, VendorPrefix(Span, Ident)),
             (variadic, Variadic(Span)),
             (typescript_custom_section, TypescriptCustomSection(Span)),
@@ -59,6 +60,7 @@
             (start, Start(Span)),
             (skip, Skip(Span)),
             (typescript_type, TypeScriptType(Span, String, Span)),
+            (getter_with_clone, GetterWithClone(Span)),
 
             // For testing purposes only.
             (assert_no_shim, AssertNoShim(Span)),
@@ -299,7 +301,6 @@
 
             (@parser $variant:ident(Span, Vec<String>, Vec<Span>)) => ({
                 input.parse::<Token![=]>()?;
-                let input_before_parse = input.fork();
                 let (vals, spans) = match input.parse::<syn::ExprArray>() {
                     Ok(exprs) => {
                         let mut vals = vec![];
@@ -320,7 +321,7 @@
                         (vals, spans)
                     },
                     Err(_) => {
-                        let ident = input_before_parse.parse::<AnyIdent>()?.0;
+                        let ident = input.parse::<AnyIdent>()?.0;
                         (vec![ident.to_string()], vec![ident.span()])
                     }
                 };
@@ -375,6 +376,7 @@
             .map(|s| s.0.to_string())
             .unwrap_or(self.ident.to_string());
         let is_inspectable = attrs.inspectable().is_some();
+        let getter_with_clone = attrs.getter_with_clone().is_some();
         for (i, field) in self.fields.iter_mut().enumerate() {
             match field.vis {
                 syn::Visibility::Public(..) => {}
@@ -411,6 +413,7 @@
                 setter: Ident::new(&setter, Span::call_site()),
                 comments,
                 generate_typescript: attrs.skip_typescript().is_none(),
+                getter_with_clone: getter_with_clone || attrs.getter_with_clone().is_some(),
             });
             attrs.check_used()?;
         }
@@ -436,6 +439,14 @@
     ty
 }
 
+fn get_expr(mut expr: &syn::Expr) -> &syn::Expr {
+    while let syn::Expr::Group(g) = expr {
+        expr = &g.expr;
+    }
+
+    expr
+}
+
 impl<'a> ConvertToAst<(BindgenAttrs, &'a ast::ImportModule)> for syn::ForeignItemFn {
     type Target = ast::ImportKind;
 
@@ -602,6 +613,7 @@
         let shim = format!("__wbg_instanceof_{}_{}", self.ident, ShortHash(&self.ident));
         let mut extends = Vec::new();
         let mut vendor_prefixes = Vec::new();
+        let no_deref = attrs.no_deref().is_some();
         for (used, attr) in attrs.attrs.iter() {
             match attr {
                 BindgenAttr::Extends(_, e) => {
@@ -627,6 +639,7 @@
             js_name,
             extends,
             vendor_prefixes,
+            no_deref,
         }))
     }
 }
@@ -1074,24 +1087,24 @@
             _ => bail_span!(v.fields, "only C-Style enums allowed with #[wasm_bindgen]"),
         }
 
-        match &v.discriminant {
-            Some((
-                _,
-                syn::Expr::Lit(syn::ExprLit {
-                    attrs: _,
-                    lit: syn::Lit::Str(str_lit),
-                }),
-            )) => {
+        let (_, expr) = match &v.discriminant {
+            Some(pair) => pair,
+            None => {
+                bail_span!(v, "all variants must have a value");
+            }
+        };
+        match get_expr(expr) {
+            syn::Expr::Lit(syn::ExprLit {
+                attrs: _,
+                lit: syn::Lit::Str(str_lit),
+            }) => {
                 variants.push(v.ident.clone());
                 variant_values.push(str_lit.value());
             }
-            Some((_, expr)) => bail_span!(
+            expr => bail_span!(
                 expr,
-                "enums with #[wasm_bidngen] cannot mix string and non-string values",
+                "enums with #[wasm_bindgen] cannot mix string and non-string values",
             ),
-            None => {
-                bail_span!(v, "all variants must have a value");
-            }
         }
     }
 
@@ -1122,18 +1135,17 @@
         let generate_typescript = opts.skip_typescript().is_none();
 
         // Check if the first value is a string literal
-        match self.variants[0].discriminant {
-            Some((
-                _,
+        if let Some((_, expr)) = &self.variants[0].discriminant {
+            match get_expr(expr) {
                 syn::Expr::Lit(syn::ExprLit {
                     attrs: _,
                     lit: syn::Lit::Str(_),
-                }),
-            )) => {
-                opts.check_used()?;
-                return import_enum(self, program);
+                }) => {
+                    opts.check_used()?;
+                    return import_enum(self, program);
+                }
+                _ => {}
             }
-            _ => {}
         }
         let js_name = opts
             .js_name()
@@ -1169,28 +1181,27 @@
                 }
 
                 let value = match &v.discriminant {
-                    Some((
-                        _,
+                    Some((_, expr)) => match get_expr(expr) {
                         syn::Expr::Lit(syn::ExprLit {
                             attrs: _,
                             lit: syn::Lit::Int(int_lit),
-                        }),
-                    )) => match int_lit.base10_digits().parse::<u32>() {
-                        Ok(v) => v,
-                        Err(_) => {
-                            bail_span!(
-                                int_lit,
-                                "enums with #[wasm_bindgen] can only support \
+                        }) => match int_lit.base10_digits().parse::<u32>() {
+                            Ok(v) => v,
+                            Err(_) => {
+                                bail_span!(
+                                    int_lit,
+                                    "enums with #[wasm_bindgen] can only support \
                                  numbers that can be represented as u32"
-                            );
-                        }
+                                );
+                            }
+                        },
+                        expr => bail_span!(
+                            expr,
+                            "enums with #[wasm_bindgen] may only have \
+                             number literal values",
+                        ),
                     },
                     None => i as u32,
-                    Some((_, expr)) => bail_span!(
-                        expr,
-                        "enums with #[wasm_bidngen] may only have \
-                         number literal values",
-                    ),
                 };
 
                 let comments = extract_doc_comments(&v.attrs);
@@ -1242,15 +1253,15 @@
             bail_span!(self, "#[wasm_bindgen] will not work on constants unless you are defining a #[wasm_bindgen(typescript_custom_section)].");
         }
 
-        match *self.expr {
+        match get_expr(&self.expr) {
             syn::Expr::Lit(syn::ExprLit {
                 lit: syn::Lit::Str(litstr),
                 ..
             }) => {
                 program.typescript_custom_sections.push(litstr.value());
             }
-            _ => {
-                bail_span!(self, "Expected a string literal to be used with #[wasm_bindgen(typescript_custom_section)].");
+            expr => {
+                bail_span!(expr, "Expected a string literal to be used with #[wasm_bindgen(typescript_custom_section)].");
             }
         }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/build.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/build.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,6 +1,12 @@
+use std::collections::hash_map::DefaultHasher;
+use std::env;
+use std::hash::Hasher;
+use std::path::PathBuf;
 use std::process::Command;
 
 fn main() {
+    set_schema_version_env_var();
+
     let rev = Command::new("git")
         .arg("rev-parse")
         .arg("HEAD")
@@ -14,3 +20,16 @@
         }
     }
 }
+
+fn set_schema_version_env_var() {
+    let cargo_manifest_dir = env::var("CARGO_MANIFEST_DIR").expect(
+        "The `CARGO_MANIFEST_DIR` environment variable is needed to locate the schema file",
+    );
+    let schema_file = PathBuf::from(cargo_manifest_dir).join("src/lib.rs");
+    let schema_file = std::fs::read(schema_file).unwrap();
+
+    let mut hasher = DefaultHasher::new();
+    hasher.write(&schema_file);
+
+    println!("cargo:rustc-env=SCHEMA_FILE_HASH={}", hasher.finish());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"c15040f405197914da41a378d439d2cd9cb3e32ff4e84e01a13919124ec00be3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","build.rs":"721643b8b86df2848821fb684b6e9f1a39e6f0884620d54ab07dff72f8916b26","src/lib.rs":"e413bc3fc6849c06b6702260ae770bed4ae9ba7890da54fc518f4cbc73669dfa"},"package":"7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"}
\ No newline at end of file
+{"files":{"Cargo.toml":"c437b4faa8cb86b9325c4e751c87223d09ed32f05965a911dd0d8cca13e85626","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","build.rs":"1945abcbf05206be9463f60094b4363079f284781ed009feadb0137953826c26","src/lib.rs":"2069d86728236dcb321f08243205d254a3e172c41df50fa55709435209ad6550","src/schema_hash_approval.rs":"1e9d30322269b02866db474c2d4f9694b527b735343a728966989856b1b7f483"},"package":"acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "wasm-bindgen-shared"
-version = "0.2.69"
+version = "0.2.76"
 authors = ["The wasm-bindgen Developers"]
 links = "wasm_bindgen"
 description = "Shared support between wasm-bindgen and wasm-bindgen cli, an internal\ndependency.\n"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,8 +1,12 @@
 #![doc(html_root_url = "https://docs.rs/wasm-bindgen-shared/0.2")]
 
-// The schema is so unstable right now we just force it to change whenever this
-// package's version changes, which happens on all publishes.
-pub const SCHEMA_VERSION: &str = env!("CARGO_PKG_VERSION");
+#[cfg(test)]
+mod schema_hash_approval;
+
+// This gets changed whenever our schema changes.
+// At this time versions of wasm-bindgen and wasm-bindgen-cli are required to have the exact same
+// SCHEMA_VERSION in order to work together.
+pub const SCHEMA_VERSION: &str = "0.2.74";
 
 #[macro_export]
 macro_rules! shared_api {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/src/schema_hash_approval.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/src/schema_hash_approval.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasm-bindgen-shared/src/schema_hash_approval.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasm-bindgen-shared/src/schema_hash_approval.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+// Whenever the lib.rs changes, the SCHEMA_FILE_HASH environment variable will change and the
+// schema_version test below will fail.
+// Proceed as follows:
+//
+// If the schema in this library has changed then:
+//  1. Change this APPROVED_SCHEMA_FILE_HASH to the new hash.
+//
+// If the schema in this library has changed then:
+//  1. Bump the version in `crates/shared/Cargo.toml`
+//  2. Change the `SCHEMA_VERSION` in this library to this new Cargo.toml version
+const APPROVED_SCHEMA_FILE_HASH: &'static str = "12458387802132375736";
+
+#[test]
+fn schema_version() {
+    assert_eq!(env!("SCHEMA_FILE_HASH"), APPROVED_SCHEMA_FILE_HASH)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/benches/benchmark.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/benches/benchmark.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/benches/benchmark.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/benches/benchmark.rs	2021-12-09 12:01:26.000000000 +0000
@@ -104,11 +104,6 @@
                     }
                 }
             }
-            ModuleSection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
             FunctionSection(s) => {
                 for item in s {
                     item?;
@@ -179,8 +174,8 @@
             | UnknownSection { .. }
             | CustomSection { .. }
             | CodeSectionStart { .. }
-            | ModuleCodeSectionStart { .. }
-            | ModuleCodeSectionEntry { .. }
+            | ModuleSectionStart { .. }
+            | ModuleSectionEntry { .. }
             | End => {}
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"13638423e956d001def013944c6d11bbc53e5daf55c2a4802d582a3cf38d143f","Cargo.toml":"3734a110b9af2fb7bc017abd80feb1195f8e50e832e86e7803171cde85bd9cda","README.md":"1c3b4f8db61a673ee2f7dc66118b1008ce8d1a7d0f5197fbe87f1271b23de3bd","benches/benchmark.rs":"e77ea9813f92a9ba8c63f524c2ba18c3b8a45151cf680e161740aaebd9456e56","compare-with-main.sh":"6feeddbc1d4446c8ee98057dd4befb72d2c1784373819936165e9de280545f76","examples/simple.rs":"606072a46c5c80df29da3ecd98a989feb1289243550033cd3c3e1df6045ce8ce","src/binary_reader.rs":"6da4caf3785625c0b43135f680ca0d3bc9a0923775a9a6b7c305b47dd148f6bf","src/lib.rs":"372776c7339cc879ba2a1109e4692d09441dd6832955ed48aed1806b135b72a4","src/limits.rs":"630dc0cd133198e2a843718af303e1f29903aa490230f803b26344c26b3a31a1","src/module_resources.rs":"8d4bc965c11d3d2adfe2162cc81ceb075ac2a73da8a77ce25f154af3449a79c9","src/operators_validator.rs":"19ee184abcfb644d60be09768b09846241d616efea595dd4d042f06341675bdd","src/parser.rs":"8993a073c90afbd20e2e776ca7b134f9ab7d4ee42a8a76d2b84371ba65dbf77b","src/primitives.rs":"60f6b43be6d23bec3fb32e767b318c4cb014e2b8ca5c6ae7650d9cec60d50c8c","src/readers/alias_section.rs":"ef6556c3e300549958010aba9f1a0f6852c80ceddc763b4c11463d97234488b3","src/readers/code_section.rs":"d7d8be8f8bf158dac6ba7ee1d6583ea386e440f728a1f6ce1aa2e91352f884f4","src/readers/data_section.rs":"d919a22ebc44c53ca434df6c1d16efc8e126e7b55ed99691d5ae73c10bfadfff","src/readers/element_section.rs":"f168a3cb02439aeaa81621525e2747d3bc4743fac2237dcdf8658b67e010ca08","src/readers/event_section.rs":"3848772ed4e0ca7886d92bf02102f71141af41cb660eba5c0107db2423aeb8d0","src/readers/export_section.rs":"3fe296f1789e789009a79115052194a1352d947f2a8830945d6b7d9983bb8579","src/readers/function_section.rs":"5467d7a375c22a4cc225819212e616f275ef01516f185b346eae2ffbb5c53cb3","src/readers/global_section.rs":"359450911ac662503f90288798baec2415df6d3b80990a7b75794683df7894b8","src/readers/import_section.rs":"80906451f78c64d31a76772d97c96d18d208eeabaaaf82372b0567a8991795c1","src/readers/init_expr.rs":"7020c80013dad4518a5f969c3ab4d624b46d778f03e632871cf343964f63441c","src/readers/instance_section.rs":"0f6cc9ed6bb6520493090eff5bbd6a9030ba1432206799b7dfed0b9285bafd73","src/readers/linking_section.rs":"db3091a48827a5b035e2f79f40f7ed9a7ea10acd4db6ab2bbd01e17a65a4265e","src/readers/memory_section.rs":"67d8457d3167b39fc9ae2c04f3c3e28bc10be97bbdaccd681675fb8d3eba2bd3","src/readers/mod.rs":"84217cb663c9872e34ce70d79a36439c80927ef35cf3f76f1ea9f28b0c4ab360","src/readers/module_code_section.rs":"806eea527c84570ca6c5b8ca556f95727edae7da29e4f384b067113231b8e5f5","src/readers/module_section.rs":"6e28be8f1f4d2f1a9470ec356c46a76c2f21916143a1f0e245b96d2272d0301e","src/readers/name_section.rs":"60d4aa007cfdc16eedc1b4cb0bee560f6eebd82aaa81e9be9c844e515b16e445","src/readers/operators.rs":"3800f0321a776ddc5e8fb030828e4f2a65ebafa4b7f0808774384559ddfe49ea","src/readers/producers_section.rs":"77f93449e4bdcd61e4c79e47a685742f49cd5dac837ba002bce14120f14c9470","src/readers/reloc_section.rs":"e48e6acaa5145d6fbe1d74eb406ee59c43235faa47fbf0b07288504e60573a5e","src/readers/section_reader.rs":"e99763ce9c48994fd1e92f011a449936c4206a5c91d50fa580d003b6cc824ec5","src/readers/table_section.rs":"5d94185f68c4c7526a8836a2ebdb5b20fe754af58b68d2d0eb8fea62b7e6fe71","src/readers/type_section.rs":"87a54d238bf900aac0d0508e5c644d71b1e591df99367587feb68146a25a5a61","src/validator.rs":"32220c874299dfdc1913d0996df8818a54e685bbfeebb35cb3ab96dae57fd454","src/validator/func.rs":"ed93410b8572a39449a682f4d9c13530a8806cffc51fa4b904b89a72fa89dfed"},"package":"29a00e14eed9c2ecbbdbdd4fb284f49d21b6808965de24769a6379a13ec47d4c"}
\ No newline at end of file
+{"files":{"Cargo.lock":"ead50118dc13ab5c5f5aa3b4405ae251dc1011fb6a6319fc4d2e9196fafae5d3","Cargo.toml":"362f357f95dbca6294ea013615d8b81be4d7569b8d961cb287cb810247c49a1f","README.md":"1c3b4f8db61a673ee2f7dc66118b1008ce8d1a7d0f5197fbe87f1271b23de3bd","benches/benchmark.rs":"e416b75903112d91fa303e2a9cabe16dd14fa83c0f1dcf6872fd4e304ffc7772","compare-with-main.sh":"6feeddbc1d4446c8ee98057dd4befb72d2c1784373819936165e9de280545f76","examples/simple.rs":"606072a46c5c80df29da3ecd98a989feb1289243550033cd3c3e1df6045ce8ce","src/binary_reader.rs":"e4fddd19b55bcda0b2e704c6b9de1311a26167290035cd834f4f03995c753db1","src/lib.rs":"372776c7339cc879ba2a1109e4692d09441dd6832955ed48aed1806b135b72a4","src/limits.rs":"f66a16a5a479d38d5109b2e7504b72a85bb2e0ea6f5a6b6b76f9533cf5595f46","src/module_resources.rs":"6ce6a03976a634a2e80c4e1248e0bf1d157ae6429d17e0f05356b2a9785c6841","src/operators_validator.rs":"bd537a3bd065a310d5aa91b4a3565ad968651116822f9e023403c1d1659f639e","src/parser.rs":"ec1f3b40322126c6ea38d3dea484a5f754978dfdfd8f8db62c4bb1ff9cfaa4e3","src/primitives.rs":"2bde51dc0db105c8845158f1a3cabd228ab3c9b05f4c828faa007030dba7848c","src/readers/alias_section.rs":"e1506269616c28cc8c644ba4637e49bfbbaf50091b70fe7a809ad41ea12d5d13","src/readers/code_section.rs":"d7d8be8f8bf158dac6ba7ee1d6583ea386e440f728a1f6ce1aa2e91352f884f4","src/readers/data_section.rs":"be92b58b09823574b83fbdb9b9fd32ff57fa054c842b5c24861672caf4726061","src/readers/element_section.rs":"f168a3cb02439aeaa81621525e2747d3bc4743fac2237dcdf8658b67e010ca08","src/readers/event_section.rs":"3848772ed4e0ca7886d92bf02102f71141af41cb660eba5c0107db2423aeb8d0","src/readers/export_section.rs":"3fe296f1789e789009a79115052194a1352d947f2a8830945d6b7d9983bb8579","src/readers/function_section.rs":"5467d7a375c22a4cc225819212e616f275ef01516f185b346eae2ffbb5c53cb3","src/readers/global_section.rs":"359450911ac662503f90288798baec2415df6d3b80990a7b75794683df7894b8","src/readers/import_section.rs":"80906451f78c64d31a76772d97c96d18d208eeabaaaf82372b0567a8991795c1","src/readers/init_expr.rs":"7020c80013dad4518a5f969c3ab4d624b46d778f03e632871cf343964f63441c","src/readers/instance_section.rs":"f74a5d96c851e94b3fbdf507c631cfed5d07528455470815b405dc5cbb05455d","src/readers/linking_section.rs":"db3091a48827a5b035e2f79f40f7ed9a7ea10acd4db6ab2bbd01e17a65a4265e","src/readers/memory_section.rs":"67d8457d3167b39fc9ae2c04f3c3e28bc10be97bbdaccd681675fb8d3eba2bd3","src/readers/mod.rs":"fb788013f1cb28419f44dd9ab111c09b76ef060e053ed5d72e6b05663fd02ec9","src/readers/module_code_section.rs":"8c7be8afdfde8e5feffc0d13a8319eb7de459077369a863cee984aa91957f361","src/readers/module_section.rs":"75b9564a135aac154e7f31fba8023438f7a7babb8a426ec0d8b1d894c64ac960","src/readers/name_section.rs":"60d4aa007cfdc16eedc1b4cb0bee560f6eebd82aaa81e9be9c844e515b16e445","src/readers/operators.rs":"3800f0321a776ddc5e8fb030828e4f2a65ebafa4b7f0808774384559ddfe49ea","src/readers/producers_section.rs":"77f93449e4bdcd61e4c79e47a685742f49cd5dac837ba002bce14120f14c9470","src/readers/reloc_section.rs":"e48e6acaa5145d6fbe1d74eb406ee59c43235faa47fbf0b07288504e60573a5e","src/readers/section_reader.rs":"e99763ce9c48994fd1e92f011a449936c4206a5c91d50fa580d003b6cc824ec5","src/readers/table_section.rs":"5d94185f68c4c7526a8836a2ebdb5b20fe754af58b68d2d0eb8fea62b7e6fe71","src/readers/type_section.rs":"87a54d238bf900aac0d0508e5c644d71b1e591df99367587feb68146a25a5a61","src/validator.rs":"2d66d7775074ff78aed4544c869b7647b61c1dc1412f5d7f1286e613bcec5341","src/validator/func.rs":"077d50113587d7ef066acfc23611c89e24776f9d3d4e5c4d980cb54ec84acf56"},"package":"b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/Cargo.lock	2021-12-09 12:01:26.000000000 +0000
@@ -2,9 +2,9 @@
 # It is not intended for manual editing.
 [[package]]
 name = "anyhow"
-version = "1.0.34"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
+checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767"
 
 [[package]]
 name = "atty"
@@ -31,9 +31,9 @@
 
 [[package]]
 name = "bstr"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
 dependencies = [
  "lazy_static",
  "memchr",
@@ -43,15 +43,15 @@
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cast"
@@ -64,12 +64,6 @@
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
@@ -86,23 +80,17 @@
 ]
 
 [[package]]
-name = "const_fn"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
-
-[[package]]
 name = "criterion"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
+checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
 dependencies = [
  "atty",
  "cast",
  "clap",
  "criterion-plot",
  "csv",
- "itertools",
+ "itertools 0.10.0",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -124,7 +112,7 @@
 checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
 dependencies = [
  "cast",
- "itertools",
+ "itertools 0.9.0",
 ]
 
 [[package]]
@@ -133,7 +121,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
@@ -143,19 +131,18 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
 dependencies = [
- "cfg-if 1.0.0",
- "const_fn",
+ "cfg-if",
  "crossbeam-utils",
  "lazy_static",
  "memoffset",
@@ -164,21 +151,20 @@
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
 dependencies = [
  "autocfg",
- "cfg-if 1.0.0",
- "const_fn",
+ "cfg-if",
  "lazy_static",
 ]
 
 [[package]]
 name = "csv"
-version = "1.1.4"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4666154fd004af3fd6f1da2e81a96fd5a81927fe8ddb6ecc79e2aa6e138b54"
+checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
 dependencies = [
  "bstr",
  "csv-core",
@@ -213,15 +199,15 @@
 
 [[package]]
 name = "half"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
+checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
  "libc",
 ]
@@ -236,16 +222,25 @@
 ]
 
 [[package]]
+name = "itertools"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
+dependencies = [
+ "either",
+]
+
+[[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "js-sys"
-version = "0.3.45"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
+checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -258,17 +253,17 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
 ]
 
 [[package]]
@@ -279,9 +274,9 @@
 
 [[package]]
 name = "memoffset"
-version = "0.5.6"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
 dependencies = [
  "autocfg",
 ]
@@ -307,23 +302,39 @@
 
 [[package]]
 name = "oorandom"
-version = "11.1.2"
+version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "plotters"
-version = "0.2.15"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
+checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
 dependencies = [
- "js-sys",
  "num-traits",
+ "plotters-backend",
+ "plotters-svg",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
+name = "plotters-backend"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
 name = "proc-macro2"
 version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -334,9 +345,9 @@
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
@@ -368,9 +379,9 @@
 
 [[package]]
 name = "regex"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
 dependencies = [
  "regex-syntax",
 ]
@@ -386,9 +397,9 @@
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
 
 [[package]]
 name = "rustc_version"
@@ -437,9 +448,9 @@
 
 [[package]]
 name = "serde"
-version = "1.0.117"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
 
 [[package]]
 name = "serde_cbor"
@@ -453,9 +464,9 @@
 
 [[package]]
 name = "serde_derive"
-version = "1.0.117"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -464,9 +475,9 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.59"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
 dependencies = [
  "itoa",
  "ryu",
@@ -475,9 +486,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.48"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
+checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -495,9 +506,9 @@
 
 [[package]]
 name = "tinytemplate"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
 dependencies = [
  "serde",
  "serde_json",
@@ -517,9 +528,9 @@
 
 [[package]]
 name = "walkdir"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
 dependencies = [
  "same-file",
  "winapi",
@@ -528,19 +539,19 @@
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.68"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
+checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.68"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
+checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -553,9 +564,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.68"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
+checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -563,9 +574,9 @@
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.68"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
+checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -576,13 +587,13 @@
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.68"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
+checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa"
 
 [[package]]
 name = "wasmparser"
-version = "0.68.0"
+version = "0.77.0"
 dependencies = [
  "anyhow",
  "criterion",
@@ -592,9 +603,9 @@
 
 [[package]]
 name = "web-sys"
-version = "0.3.45"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d"
+checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "wasmparser"
-version = "0.68.0"
+version = "0.77.0"
 authors = ["Yury Delendik <ydelendik@mozilla.com>"]
 description = "A simple event-driven library for parsing WebAssembly binary files.\n"
 homepage = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/binary_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/binary_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/binary_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/binary_reader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -274,17 +274,17 @@
 
     pub(crate) fn read_import(&mut self) -> Result<Import<'a>> {
         let module = self.read_string()?;
+        let field = self.read_string()?;
 
         // For the `field`, figure out if we're the experimental encoding of
         // single-level imports for the module linking proposal (a single-byte
         // string which is 0xc0, which is invalid utf-8) or if we have a second
         // level of import.
-        let mut clone = self.clone();
-        let field = if clone.read_var_u32()? == 1 && clone.read_u8()? == 0xc0 {
-            *self = clone;
+        let field = if field.is_empty() && self.buffer.get(self.position) == Some(&0xff) {
+            self.position += 1;
             None
         } else {
-            Some(self.read_string()?)
+            Some(field)
         };
 
         let ty = self.read_import_desc()?;
@@ -450,10 +450,10 @@
             11 => Ok(SectionCode::Data),
             12 => Ok(SectionCode::DataCount),
             13 => Ok(SectionCode::Event),
-            100 => Ok(SectionCode::Module),
-            101 => Ok(SectionCode::Instance),
-            102 => Ok(SectionCode::Alias),
-            103 => Ok(SectionCode::ModuleCode),
+            14 => Ok(SectionCode::Module),
+            15 => Ok(SectionCode::Instance),
+            16 => Ok(SectionCode::Alias),
+            17 => Ok(SectionCode::ModuleCode),
             _ => Err(BinaryReaderError::new("Invalid section code", offset)),
         }
     }
@@ -680,7 +680,7 @@
         let len = self.read_var_u32()? as usize;
         if len > MAX_WASM_STRING_SIZE {
             return Err(BinaryReaderError::new(
-                "string size in out of bounds",
+                "string size out of bounds",
                 self.original_position() - 1,
             ));
         }
@@ -829,7 +829,7 @@
         let len = self.read_var_u32()? as usize;
         if len > MAX_WASM_STRING_SIZE {
             return Err(BinaryReaderError::new(
-                "string size in out of bounds",
+                "string size out of bounds",
                 self.original_position() - 1,
             ));
         }
@@ -1101,15 +1101,16 @@
             0x06 => Operator::Try {
                 ty: self.read_blocktype()?,
             },
-            0x07 => Operator::Catch,
+            0x07 => Operator::Catch {
+                index: self.read_var_u32()?,
+            },
             0x08 => Operator::Throw {
                 index: self.read_var_u32()?,
             },
-            0x09 => Operator::Rethrow,
-            0x0a => Operator::BrOnExn {
+            0x09 => Operator::Rethrow {
                 relative_depth: self.read_var_u32()?,
-                index: self.read_var_u32()?,
             },
+            0x0a => Operator::Unwind,
             0x0b => Operator::End,
             0x0c => Operator::Br {
                 relative_depth: self.read_var_u32()?,
@@ -1135,6 +1136,10 @@
                 index: self.read_var_u32()?,
                 table_index: self.read_var_u32()?,
             },
+            0x18 => Operator::Delegate {
+                relative_depth: self.read_var_u32()?,
+            },
+            0x19 => Operator::CatchAll,
             0x1a => Operator::Drop,
             0x1b => Operator::Select,
             0x1c => {
@@ -1644,13 +1649,58 @@
             0x50 => Operator::V128Or,
             0x51 => Operator::V128Xor,
             0x52 => Operator::V128Bitselect,
+            0x53 => Operator::V128AnyTrue,
+            0x54 => Operator::V128Load8Lane {
+                memarg: self.read_memarg()?,
+                lane: self.read_lane_index(16)?,
+            },
+            0x55 => Operator::V128Load16Lane {
+                memarg: self.read_memarg()?,
+                lane: self.read_lane_index(8)?,
+            },
+            0x56 => Operator::V128Load32Lane {
+                memarg: self.read_memarg()?,
+                lane: self.read_lane_index(4)?,
+            },
+            0x57 => Operator::V128Load64Lane {
+                memarg: self.read_memarg()?,
+                lane: self.read_lane_index(2)?,
+            },
+            0x58 => Operator::V128Store8Lane {
+                memarg: self.read_memarg()?,
+                lane: self.read_lane_index(16)?,
+            },
+            0x59 => Operator::V128Store16Lane {
+                memarg: self.read_memarg()?,
+                lane: self.read_lane_index(8)?,
+            },
+            0x5a => Operator::V128Store32Lane {
+                memarg: self.read_memarg()?,
+                lane: self.read_lane_index(4)?,
+            },
+            0x5b => Operator::V128Store64Lane {
+                memarg: self.read_memarg()?,
+                lane: self.read_lane_index(2)?,
+            },
+            0x5c => Operator::V128Load32Zero {
+                memarg: self.read_memarg_of_align(2)?,
+            },
+            0x5d => Operator::V128Load64Zero {
+                memarg: self.read_memarg_of_align(3)?,
+            },
+            0x5e => Operator::F32x4DemoteF64x2Zero,
+            0x5f => Operator::F64x2PromoteLowF32x4,
             0x60 => Operator::I8x16Abs,
             0x61 => Operator::I8x16Neg,
-            0x62 => Operator::I8x16AnyTrue,
+            0x62 => Operator::I8x16Popcnt,
             0x63 => Operator::I8x16AllTrue,
             0x64 => Operator::I8x16Bitmask,
             0x65 => Operator::I8x16NarrowI16x8S,
             0x66 => Operator::I8x16NarrowI16x8U,
+            0x67 => Operator::F32x4Ceil,
+            0x68 => Operator::F32x4Floor,
+            0x69 => Operator::F32x4Trunc,
+            0x6a => Operator::F32x4Nearest,
             0x6b => Operator::I8x16Shl,
             0x6c => Operator::I8x16ShrS,
             0x6d => Operator::I8x16ShrU,
@@ -1660,22 +1710,29 @@
             0x71 => Operator::I8x16Sub,
             0x72 => Operator::I8x16SubSatS,
             0x73 => Operator::I8x16SubSatU,
+            0x74 => Operator::F64x2Ceil,
+            0x75 => Operator::F64x2Floor,
             0x76 => Operator::I8x16MinS,
             0x77 => Operator::I8x16MinU,
             0x78 => Operator::I8x16MaxS,
             0x79 => Operator::I8x16MaxU,
+            0x7a => Operator::F64x2Trunc,
             0x7b => Operator::I8x16RoundingAverageU,
+            0x7c => Operator::I16x8ExtAddPairwiseI8x16S,
+            0x7d => Operator::I16x8ExtAddPairwiseI8x16U,
+            0x7e => Operator::I32x4ExtAddPairwiseI16x8S,
+            0x7f => Operator::I32x4ExtAddPairwiseI16x8U,
             0x80 => Operator::I16x8Abs,
             0x81 => Operator::I16x8Neg,
-            0x82 => Operator::I16x8AnyTrue,
+            0x82 => Operator::I16x8Q15MulrSatS,
             0x83 => Operator::I16x8AllTrue,
             0x84 => Operator::I16x8Bitmask,
             0x85 => Operator::I16x8NarrowI32x4S,
             0x86 => Operator::I16x8NarrowI32x4U,
-            0x87 => Operator::I16x8WidenLowI8x16S,
-            0x88 => Operator::I16x8WidenHighI8x16S,
-            0x89 => Operator::I16x8WidenLowI8x16U,
-            0x8a => Operator::I16x8WidenHighI8x16U,
+            0x87 => Operator::I16x8ExtendLowI8x16S,
+            0x88 => Operator::I16x8ExtendHighI8x16S,
+            0x89 => Operator::I16x8ExtendLowI8x16U,
+            0x8a => Operator::I16x8ExtendHighI8x16U,
             0x8b => Operator::I16x8Shl,
             0x8c => Operator::I16x8ShrS,
             0x8d => Operator::I16x8ShrU,
@@ -1685,21 +1742,25 @@
             0x91 => Operator::I16x8Sub,
             0x92 => Operator::I16x8SubSatS,
             0x93 => Operator::I16x8SubSatU,
+            0x94 => Operator::F64x2Nearest,
             0x95 => Operator::I16x8Mul,
             0x96 => Operator::I16x8MinS,
             0x97 => Operator::I16x8MinU,
             0x98 => Operator::I16x8MaxS,
             0x99 => Operator::I16x8MaxU,
             0x9b => Operator::I16x8RoundingAverageU,
+            0x9c => Operator::I16x8ExtMulLowI8x16S,
+            0x9d => Operator::I16x8ExtMulHighI8x16S,
+            0x9e => Operator::I16x8ExtMulLowI8x16U,
+            0x9f => Operator::I16x8ExtMulHighI8x16U,
             0xa0 => Operator::I32x4Abs,
             0xa1 => Operator::I32x4Neg,
-            0xa2 => Operator::I32x4AnyTrue,
             0xa3 => Operator::I32x4AllTrue,
             0xa4 => Operator::I32x4Bitmask,
-            0xa7 => Operator::I32x4WidenLowI16x8S,
-            0xa8 => Operator::I32x4WidenHighI16x8S,
-            0xa9 => Operator::I32x4WidenLowI16x8U,
-            0xaa => Operator::I32x4WidenHighI16x8U,
+            0xa7 => Operator::I32x4ExtendLowI16x8S,
+            0xa8 => Operator::I32x4ExtendHighI16x8S,
+            0xa9 => Operator::I32x4ExtendLowI16x8U,
+            0xaa => Operator::I32x4ExtendHighI16x8U,
             0xab => Operator::I32x4Shl,
             0xac => Operator::I32x4ShrS,
             0xad => Operator::I32x4ShrU,
@@ -1711,21 +1772,34 @@
             0xb8 => Operator::I32x4MaxS,
             0xb9 => Operator::I32x4MaxU,
             0xba => Operator::I32x4DotI16x8S,
+            0xbc => Operator::I32x4ExtMulLowI16x8S,
+            0xbd => Operator::I32x4ExtMulHighI16x8S,
+            0xbe => Operator::I32x4ExtMulLowI16x8U,
+            0xbf => Operator::I32x4ExtMulHighI16x8U,
+            0xc0 => Operator::I64x2Abs,
             0xc1 => Operator::I64x2Neg,
+            0xc3 => Operator::I64x2AllTrue,
+            0xc4 => Operator::I64x2Bitmask,
+            0xc7 => Operator::I64x2ExtendLowI32x4S,
+            0xc8 => Operator::I64x2ExtendHighI32x4S,
+            0xc9 => Operator::I64x2ExtendLowI32x4U,
+            0xca => Operator::I64x2ExtendHighI32x4U,
             0xcb => Operator::I64x2Shl,
             0xcc => Operator::I64x2ShrS,
             0xcd => Operator::I64x2ShrU,
             0xce => Operator::I64x2Add,
             0xd1 => Operator::I64x2Sub,
             0xd5 => Operator::I64x2Mul,
-            0xd8 => Operator::F32x4Ceil,
-            0xd9 => Operator::F32x4Floor,
-            0xda => Operator::F32x4Trunc,
-            0xdb => Operator::F32x4Nearest,
-            0xdc => Operator::F64x2Ceil,
-            0xdd => Operator::F64x2Floor,
-            0xde => Operator::F64x2Trunc,
-            0xdf => Operator::F64x2Nearest,
+            0xd6 => Operator::I64x2Eq,
+            0xd7 => Operator::I64x2Ne,
+            0xd8 => Operator::I64x2LtS,
+            0xd9 => Operator::I64x2GtS,
+            0xda => Operator::I64x2LeS,
+            0xdb => Operator::I64x2GeS,
+            0xdc => Operator::I64x2ExtMulLowI32x4S,
+            0xdd => Operator::I64x2ExtMulHighI32x4S,
+            0xde => Operator::I64x2ExtMulLowI32x4U,
+            0xdf => Operator::I64x2ExtMulHighI32x4U,
             0xe0 => Operator::F32x4Abs,
             0xe1 => Operator::F32x4Neg,
             0xe3 => Operator::F32x4Sqrt,
@@ -1752,12 +1826,11 @@
             0xf9 => Operator::I32x4TruncSatF32x4U,
             0xfa => Operator::F32x4ConvertI32x4S,
             0xfb => Operator::F32x4ConvertI32x4U,
-            0xfc => Operator::V128Load32Zero {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0xfd => Operator::V128Load64Zero {
-                memarg: self.read_memarg_of_align(3)?,
-            },
+            0xfc => Operator::I32x4TruncSatF64x2SZero,
+            0xfd => Operator::I32x4TruncSatF64x2UZero,
+            0xfe => Operator::F64x2ConvertLowI32x4S,
+            0xff => Operator::F64x2ConvertLowI32x4U,
+
             _ => {
                 return Err(BinaryReaderError::new(
                     format!("Unknown 0xfd subopcode: 0x{:x}", code),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/limits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/limits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/limits.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/limits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -36,3 +36,4 @@
 pub const MAX_WASM_MODULES: usize = 1_000;
 pub const MAX_WASM_INSTANCES: usize = 1_000;
 pub const MAX_WASM_EVENTS: usize = 1_000_000;
+pub const MAX_TYPE_SIZE: u32 = 100_000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/module_resources.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/module_resources.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/module_resources.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/module_resources.rs	2021-12-09 12:01:26.000000000 +0000
@@ -202,6 +202,8 @@
     fn table_at(&self, at: u32) -> Option<TableType>;
     /// Returns the linear memory at given index.
     fn memory_at(&self, at: u32) -> Option<MemoryType>;
+    /// Returns the event at given index.
+    fn event_at(&self, at: u32) -> Option<&Self::FuncType>;
     /// Returns the global variable at given index.
     fn global_at(&self, at: u32) -> Option<GlobalType>;
     /// Returns the `FuncType` associated with the given type index.
@@ -232,6 +234,9 @@
     fn memory_at(&self, at: u32) -> Option<MemoryType> {
         T::memory_at(self, at)
     }
+    fn event_at(&self, at: u32) -> Option<&Self::FuncType> {
+        T::event_at(self, at)
+    }
     fn global_at(&self, at: u32) -> Option<GlobalType> {
         T::global_at(self, at)
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/operators_validator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/operators_validator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/operators_validator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/operators_validator.rs	2021-12-09 12:01:26.000000000 +0000
@@ -112,6 +112,8 @@
     Loop,
     Try,
     Catch,
+    CatchAll,
+    Unwind,
 }
 
 impl OperatorValidator {
@@ -286,7 +288,12 @@
         // Read the expected type and expected height of the operand stack the
         // end of the frame.
         let frame = self.control.last().unwrap();
-        let ty = frame.block_type;
+        // The end of an `unwind` should check against the empty block type.
+        let ty = if frame.kind == FrameKind::Unwind {
+            TypeOrFuncType::Type(Type::EmptyBlockType)
+        } else {
+            frame.block_type
+        };
         let height = frame.height;
 
         // Pop all the result types, in reverse order, from the operand stack.
@@ -416,10 +423,10 @@
 
     fn check_shared_memarg_wo_align(
         &self,
-        _: MemoryImmediate,
+        memarg: MemoryImmediate,
         resources: impl WasmModuleResources,
     ) -> OperatorValidatorResult<Type> {
-        self.check_memory_index(0, resources)
+        self.check_memory_index(memarg.memory, resources)
     }
 
     fn check_simd_lane_index(&self, index: SIMDLaneIndex, max: u8) -> OperatorValidatorResult<()> {
@@ -499,10 +506,19 @@
         table_index: u32,
         resources: &impl WasmModuleResources,
     ) -> OperatorValidatorResult<()> {
-        if resources.table_at(table_index).is_none() {
-            return Err(OperatorValidatorError::new(
-                "unknown table: table index out of bounds",
-            ));
+        match resources.table_at(table_index) {
+            None => {
+                return Err(OperatorValidatorError::new(
+                    "unknown table: table index out of bounds",
+                ));
+            }
+            Some(tab) => {
+                if tab.element_type != Type::FuncRef {
+                    return Err(OperatorValidatorError::new(
+                        "indirect calls must go through a table of funcref",
+                    ));
+                }
+            }
         }
         let ty = func_type_at(&resources, index)?;
         self.pop_operand(Some(Type::I32))?;
@@ -570,7 +586,7 @@
                 if frame.kind != FrameKind::If {
                     bail_op_err!("else found outside of an `if` block");
                 }
-                self.push_ctrl(FrameKind::Else, frame.block_type, resources)?;
+                self.push_ctrl(FrameKind::Else, frame.block_type, resources)?
             }
             Operator::Try { ty } => {
                 self.check_exceptions_enabled()?;
@@ -580,10 +596,10 @@
                 }
                 self.push_ctrl(FrameKind::Try, ty, resources)?;
             }
-            Operator::Catch => {
+            Operator::Catch { index } => {
                 self.check_exceptions_enabled()?;
                 let frame = self.pop_ctrl(resources)?;
-                if frame.kind != FrameKind::Try {
+                if frame.kind != FrameKind::Try && frame.kind != FrameKind::Catch {
                     bail_op_err!("catch found outside of an `try` block");
                 }
                 // Start a new frame and push `exnref` value.
@@ -593,12 +609,16 @@
                     height: self.operands.len(),
                     unreachable: false,
                 });
-                self.push_operand(Type::ExnRef)?;
+                // Push exception argument types.
+                let ty = event_at(&resources, index)?;
+                for ty in ty.inputs() {
+                    self.push_operand(ty)?;
+                }
             }
             Operator::Throw { index } => {
                 self.check_exceptions_enabled()?;
                 // Check values associated with the exception.
-                let ty = func_type_at(&resources, index)?;
+                let ty = event_at(&resources, index)?;
                 for ty in ty.inputs().rev() {
                     self.pop_operand(Some(ty))?;
                 }
@@ -607,24 +627,63 @@
                 }
                 self.unreachable();
             }
-            Operator::Rethrow => {
+            Operator::Rethrow { relative_depth } => {
                 self.check_exceptions_enabled()?;
-                self.pop_operand(Some(Type::ExnRef))?;
+                // This is not a jump, but we need to check that the `rethrow`
+                // targets an actual `catch` to get the exception.
+                let (_, kind) = self.jump(relative_depth)?;
+                if kind != FrameKind::Catch && kind != FrameKind::CatchAll {
+                    bail_op_err!("rethrow target was not a `catch` block");
+                }
                 self.unreachable();
             }
-            Operator::BrOnExn {
-                relative_depth,
-                index,
-            } => {
+            Operator::Unwind => {
                 self.check_exceptions_enabled()?;
-                let (ty, kind) = self.jump(relative_depth)?;
-                self.pop_operand(Some(Type::ExnRef))?;
-                // Check the exception's argument values with target block's.
-                let exn_args = func_type_at(&resources, index)?;
-                if Iterator::ne(exn_args.inputs(), label_types(ty, resources, kind)?) {
-                    bail_op_err!("target block types do not match");
+                // Switch from `try` to an `unwind` frame.
+                let frame = self.pop_ctrl(resources)?;
+                if frame.kind != FrameKind::Try {
+                    bail_op_err!("unwind found outside of an `try` block");
+                }
+                self.control.push(Frame {
+                    kind: FrameKind::Unwind,
+                    block_type: frame.block_type,
+                    height: self.operands.len(),
+                    unreachable: false,
+                });
+            }
+            Operator::Delegate { relative_depth } => {
+                self.check_exceptions_enabled()?;
+                let frame = self.pop_ctrl(resources)?;
+                if frame.kind != FrameKind::Try {
+                    bail_op_err!("delegate found outside of an `try` block");
+                }
+                // This operation is not a jump, but we need to check the
+                // depth for validity and that it targets a `try`.
+                let (_, kind) = self.jump(relative_depth)?;
+                if kind != FrameKind::Try
+                    && (kind != FrameKind::Block
+                        || self.control.len() != relative_depth as usize + 1)
+                {
+                    bail_op_err!("must delegate to a try block or caller");
+                }
+                for ty in results(frame.block_type, resources)? {
+                    self.push_operand(ty)?;
+                }
+            }
+            Operator::CatchAll => {
+                self.check_exceptions_enabled()?;
+                let frame = self.pop_ctrl(resources)?;
+                if frame.kind == FrameKind::CatchAll {
+                    bail_op_err!("only one catch_all allowed per `try` block");
+                } else if frame.kind != FrameKind::Try && frame.kind != FrameKind::Catch {
+                    bail_op_err!("catch_all found outside of a `try` block");
                 }
-                self.push_operand(Type::ExnRef)?;
+                self.control.push(Frame {
+                    kind: FrameKind::CatchAll,
+                    block_type: frame.block_type,
+                    height: self.operands.len(),
+                    unreachable: false,
+                });
             }
             Operator::End => {
                 let mut frame = self.pop_ctrl(resources)?;
@@ -1516,6 +1575,12 @@
             | Operator::I32x4LeU
             | Operator::I32x4GeS
             | Operator::I32x4GeU
+            | Operator::I64x2Eq
+            | Operator::I64x2Ne
+            | Operator::I64x2LtS
+            | Operator::I64x2GtS
+            | Operator::I64x2LeS
+            | Operator::I64x2GeS
             | Operator::V128And
             | Operator::V128AndNot
             | Operator::V128Or
@@ -1557,7 +1622,20 @@
             | Operator::I8x16NarrowI16x8S
             | Operator::I8x16NarrowI16x8U
             | Operator::I16x8NarrowI32x4S
-            | Operator::I16x8NarrowI32x4U => {
+            | Operator::I16x8NarrowI32x4U
+            | Operator::I16x8ExtMulLowI8x16S
+            | Operator::I16x8ExtMulHighI8x16S
+            | Operator::I16x8ExtMulLowI8x16U
+            | Operator::I16x8ExtMulHighI8x16U
+            | Operator::I32x4ExtMulLowI16x8S
+            | Operator::I32x4ExtMulHighI16x8S
+            | Operator::I32x4ExtMulLowI16x8U
+            | Operator::I32x4ExtMulHighI16x8U
+            | Operator::I64x2ExtMulLowI32x4S
+            | Operator::I64x2ExtMulHighI32x4S
+            | Operator::I64x2ExtMulLowI32x4U
+            | Operator::I64x2ExtMulHighI32x4U
+            | Operator::I16x8Q15MulrSatS => {
                 self.check_simd_enabled()?;
                 self.pop_operand(Some(Type::V128))?;
                 self.pop_operand(Some(Type::V128))?;
@@ -1577,6 +1655,12 @@
             | Operator::F64x2Abs
             | Operator::F64x2Neg
             | Operator::F64x2Sqrt
+            | Operator::F32x4DemoteF64x2Zero
+            | Operator::F64x2PromoteLowF32x4
+            | Operator::F64x2ConvertLowI32x4S
+            | Operator::F64x2ConvertLowI32x4U
+            | Operator::I32x4TruncSatF64x2SZero
+            | Operator::I32x4TruncSatF64x2UZero
             | Operator::F32x4ConvertI32x4S
             | Operator::F32x4ConvertI32x4U => {
                 self.check_non_deterministic_enabled()?;
@@ -1587,21 +1671,31 @@
             Operator::V128Not
             | Operator::I8x16Abs
             | Operator::I8x16Neg
+            | Operator::I8x16Popcnt
             | Operator::I16x8Abs
             | Operator::I16x8Neg
             | Operator::I32x4Abs
             | Operator::I32x4Neg
+            | Operator::I64x2Abs
             | Operator::I64x2Neg
             | Operator::I32x4TruncSatF32x4S
             | Operator::I32x4TruncSatF32x4U
-            | Operator::I16x8WidenLowI8x16S
-            | Operator::I16x8WidenHighI8x16S
-            | Operator::I16x8WidenLowI8x16U
-            | Operator::I16x8WidenHighI8x16U
-            | Operator::I32x4WidenLowI16x8S
-            | Operator::I32x4WidenHighI16x8S
-            | Operator::I32x4WidenLowI16x8U
-            | Operator::I32x4WidenHighI16x8U => {
+            | Operator::I16x8ExtendLowI8x16S
+            | Operator::I16x8ExtendHighI8x16S
+            | Operator::I16x8ExtendLowI8x16U
+            | Operator::I16x8ExtendHighI8x16U
+            | Operator::I32x4ExtendLowI16x8S
+            | Operator::I32x4ExtendHighI16x8S
+            | Operator::I32x4ExtendLowI16x8U
+            | Operator::I32x4ExtendHighI16x8U
+            | Operator::I64x2ExtendLowI32x4S
+            | Operator::I64x2ExtendHighI32x4S
+            | Operator::I64x2ExtendLowI32x4U
+            | Operator::I64x2ExtendHighI32x4U
+            | Operator::I16x8ExtAddPairwiseI8x16S
+            | Operator::I16x8ExtAddPairwiseI8x16U
+            | Operator::I32x4ExtAddPairwiseI16x8S
+            | Operator::I32x4ExtAddPairwiseI16x8U => {
                 self.check_simd_enabled()?;
                 self.pop_operand(Some(Type::V128))?;
                 self.push_operand(Type::V128)?;
@@ -1613,15 +1707,15 @@
                 self.pop_operand(Some(Type::V128))?;
                 self.push_operand(Type::V128)?;
             }
-            Operator::I8x16AnyTrue
+            Operator::V128AnyTrue
             | Operator::I8x16AllTrue
             | Operator::I8x16Bitmask
-            | Operator::I16x8AnyTrue
             | Operator::I16x8AllTrue
             | Operator::I16x8Bitmask
-            | Operator::I32x4AnyTrue
             | Operator::I32x4AllTrue
-            | Operator::I32x4Bitmask => {
+            | Operator::I32x4Bitmask
+            | Operator::I64x2AllTrue
+            | Operator::I64x2Bitmask => {
                 self.check_simd_enabled()?;
                 self.pop_operand(Some(Type::V128))?;
                 self.push_operand(Type::I32)?;
@@ -1689,7 +1783,66 @@
                 self.pop_operand(Some(idx))?;
                 self.push_operand(Type::V128)?;
             }
-
+            Operator::V128Load8Lane { memarg, lane } => {
+                self.check_simd_enabled()?;
+                let idx = self.check_memarg(memarg, 0, resources)?;
+                self.check_simd_lane_index(lane, 16)?;
+                self.pop_operand(Some(Type::V128))?;
+                self.pop_operand(Some(idx))?;
+                self.push_operand(Type::V128)?;
+            }
+            Operator::V128Load16Lane { memarg, lane } => {
+                self.check_simd_enabled()?;
+                let idx = self.check_memarg(memarg, 1, resources)?;
+                self.check_simd_lane_index(lane, 8)?;
+                self.pop_operand(Some(Type::V128))?;
+                self.pop_operand(Some(idx))?;
+                self.push_operand(Type::V128)?;
+            }
+            Operator::V128Load32Lane { memarg, lane } => {
+                self.check_simd_enabled()?;
+                let idx = self.check_memarg(memarg, 2, resources)?;
+                self.check_simd_lane_index(lane, 4)?;
+                self.pop_operand(Some(Type::V128))?;
+                self.pop_operand(Some(idx))?;
+                self.push_operand(Type::V128)?;
+            }
+            Operator::V128Load64Lane { memarg, lane } => {
+                self.check_simd_enabled()?;
+                let idx = self.check_memarg(memarg, 3, resources)?;
+                self.check_simd_lane_index(lane, 2)?;
+                self.pop_operand(Some(Type::V128))?;
+                self.pop_operand(Some(idx))?;
+                self.push_operand(Type::V128)?;
+            }
+            Operator::V128Store8Lane { memarg, lane } => {
+                self.check_simd_enabled()?;
+                let idx = self.check_memarg(memarg, 0, resources)?;
+                self.check_simd_lane_index(lane, 16)?;
+                self.pop_operand(Some(Type::V128))?;
+                self.pop_operand(Some(idx))?;
+            }
+            Operator::V128Store16Lane { memarg, lane } => {
+                self.check_simd_enabled()?;
+                let idx = self.check_memarg(memarg, 1, resources)?;
+                self.check_simd_lane_index(lane, 8)?;
+                self.pop_operand(Some(Type::V128))?;
+                self.pop_operand(Some(idx))?;
+            }
+            Operator::V128Store32Lane { memarg, lane } => {
+                self.check_simd_enabled()?;
+                let idx = self.check_memarg(memarg, 2, resources)?;
+                self.check_simd_lane_index(lane, 4)?;
+                self.pop_operand(Some(Type::V128))?;
+                self.pop_operand(Some(idx))?;
+            }
+            Operator::V128Store64Lane { memarg, lane } => {
+                self.check_simd_enabled()?;
+                let idx = self.check_memarg(memarg, 3, resources)?;
+                self.check_simd_lane_index(lane, 2)?;
+                self.pop_operand(Some(Type::V128))?;
+                self.pop_operand(Some(idx))?;
+            }
             Operator::MemoryInit { mem, segment } => {
                 self.check_bulk_memory_enabled()?;
                 let ty = self.check_memory_index(mem, resources)?;
@@ -1842,6 +1995,15 @@
         .ok_or_else(|| OperatorValidatorError::new("unknown type: type index out of bounds"))
 }
 
+fn event_at<T: WasmModuleResources>(
+    resources: &T,
+    at: u32,
+) -> OperatorValidatorResult<&T::FuncType> {
+    resources
+        .event_at(at)
+        .ok_or_else(|| OperatorValidatorError::new("unknown event: event index out of bounds"))
+}
+
 enum Either<A, B> {
     A(A),
     B(B),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/parser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/parser.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,5 +1,5 @@
 use crate::EventSectionReader;
-use crate::{AliasSectionReader, InstanceSectionReader, ModuleSectionReader};
+use crate::{AliasSectionReader, InstanceSectionReader};
 use crate::{BinaryReader, BinaryReaderError, FunctionBody, Range, Result};
 use crate::{DataSectionReader, ElementSectionReader, ExportSectionReader};
 use crate::{FunctionSectionReader, ImportSectionReader, TypeSectionReader};
@@ -29,7 +29,7 @@
     ModuleHeader,
     SectionStart,
     FunctionBody { remaining: u32, len: u32 },
-    ModuleCode { remaining: u32, len: u32 },
+    Module { remaining: u32, len: u32 },
 }
 
 /// A successful return payload from [`Parser::parse`].
@@ -100,9 +100,6 @@
     /// An instance section was received, and the provided reader can be used to
     /// parse the contents of the instance section.
     InstanceSection(crate::InstanceSectionReader<'a>),
-    /// A module section was received, and the provided reader can be used to
-    /// parse the contents of the module section.
-    ModuleSection(crate::ModuleSectionReader<'a>),
     /// A function section was received, and the provided reader can be used to
     /// parse the contents of the function section.
     FunctionSection(crate::FunctionSectionReader<'a>),
@@ -150,10 +147,14 @@
         /// The name of the custom section.
         name: &'a str,
         /// The offset, relative to the start of the original module, that the
-        /// payload for this custom section starts at.
+        /// `data` payload for this custom section starts at.
         data_offset: usize,
         /// The actual contents of the custom section.
         data: &'a [u8],
+        /// The range of bytes that specify this whole custom section (including
+        /// both the name of this custom section and its data) specified in
+        /// offsets relative to the start of the byte stream.
+        range: Range,
     },
 
     /// Indicator of the start of the code section.
@@ -194,8 +195,8 @@
     ///
     /// This behaves the same as the `CodeSectionStart` payload being returned.
     /// You're guaranteed the next `count` items will be of type
-    /// `ModuleCodeSectionEntry`.
-    ModuleCodeSectionStart {
+    /// `ModuleSectionEntry`.
+    ModuleSectionStart {
         /// The number of inline modules in this section.
         count: u32,
         /// The range of bytes that represent this section, specified in
@@ -208,7 +209,7 @@
     /// An entry of the module code section, a module, was parsed.
     ///
     /// This variant is special in that it returns a sub-`Parser`. Upon
-    /// receiving a `ModuleCodeSectionEntry` it is expected that the returned
+    /// receiving a `ModuleSectionEntry` it is expected that the returned
     /// `Parser` will be used instead of the parent `Parser` until the parse has
     /// finished. You'll need to feed data into the `Parser` returned until it
     /// returns `Payload::End`. After that you'll switch back to the parent
@@ -216,7 +217,7 @@
     ///
     /// Note that binaries will not be parsed correctly if you feed the data for
     /// a nested module into the parent [`Parser`].
-    ModuleCodeSectionEntry {
+    ModuleSectionEntry {
         /// The parser to use to parse the contents of the nested submodule.
         /// This parser should be used until it reports `End`.
         parser: Parser,
@@ -342,7 +343,6 @@
     ///             ImportSection(_) => { /* ... */ }
     ///             AliasSection(_) => { /* ... */ }
     ///             InstanceSection(_) => { /* ... */ }
-    ///             ModuleSection(_) => { /* ... */ }
     ///             FunctionSection(_) => { /* ... */ }
     ///             TableSection(_) => { /* ... */ }
     ///             MemorySection(_) => { /* ... */ }
@@ -366,8 +366,8 @@
     ///
     ///             // When parsing nested modules we need to switch which
     ///             // `Parser` we're using.
-    ///             ModuleCodeSectionStart { .. } => { /* ... */ }
-    ///             ModuleCodeSectionEntry { parser: subparser, .. } => {
+    ///             ModuleSectionStart { .. } => { /* ... */ }
+    ///             ModuleSectionEntry { parser: subparser, .. } => {
     ///                 stack.push(parser);
     ///                 parser = subparser;
     ///             }
@@ -486,6 +486,11 @@
 
                 match id {
                     0 => {
+                        let start = reader.original_position();
+                        let range = Range {
+                            start,
+                            end: reader.original_position() + len as usize,
+                        };
                         let mut content = subreader(reader, len)?;
                         // Note that if this fails we can't read any more bytes,
                         // so clear the "we'd succeed if we got this many more
@@ -495,6 +500,7 @@
                             name,
                             data_offset: content.original_position(),
                             data: content.remaining_buffer(),
+                            range,
                         })
                     }
                     1 => section(reader, len, TypeSectionReader::new, TypeSection),
@@ -532,26 +538,25 @@
                         Ok(DataCountSection { count, range })
                     }
                     13 => section(reader, len, EventSectionReader::new, EventSection),
-                    100 => section(reader, len, ModuleSectionReader::new, ModuleSection),
-                    101 => section(reader, len, InstanceSectionReader::new, InstanceSection),
-                    102 => section(reader, len, AliasSectionReader::new, AliasSection),
-                    103 => {
+                    14 => {
                         let start = reader.original_position();
                         let count = delimited(reader, &mut len, |r| r.read_var_u32())?;
                         let range = Range {
                             start,
                             end: reader.original_position() + len as usize,
                         };
-                        self.state = State::ModuleCode {
+                        self.state = State::Module {
                             remaining: count,
                             len,
                         };
-                        Ok(ModuleCodeSectionStart {
+                        Ok(ModuleSectionStart {
                             count,
                             range,
                             size: len,
                         })
                     }
+                    15 => section(reader, len, InstanceSectionReader::new, InstanceSection),
+                    16 => section(reader, len, AliasSectionReader::new, AliasSection),
                     id => {
                         let offset = reader.original_position();
                         let contents = reader.read_bytes(len as usize)?;
@@ -575,7 +580,7 @@
                 remaining: 0,
                 len: 0,
             }
-            | State::ModuleCode {
+            | State::Module {
                 remaining: 0,
                 len: 0,
             } => {
@@ -585,7 +590,7 @@
 
             // ... otherwise trailing bytes with no remaining entries in these
             // sections indicates an error.
-            State::FunctionBody { remaining: 0, len } | State::ModuleCode { remaining: 0, len } => {
+            State::FunctionBody { remaining: 0, len } | State::Module { remaining: 0, len } => {
                 debug_assert!(len > 0);
                 let offset = reader.original_position();
                 Err(BinaryReaderError::new(
@@ -647,7 +652,7 @@
             // update `max_size` we do that inline. Note that this will get
             // further tweaked after we return with the bytes we read specifying
             // the size of the module itself.
-            State::ModuleCode { remaining, mut len } => {
+            State::Module { remaining, mut len } => {
                 let size = delimited(reader, &mut len, |r| r.read_var_u32())?;
                 match len.checked_sub(size) {
                     Some(i) => len = i,
@@ -658,7 +663,7 @@
                         ));
                     }
                 }
-                self.state = State::ModuleCode {
+                self.state = State::Module {
                     remaining: remaining - 1,
                     len,
                 };
@@ -670,7 +675,7 @@
                 self.offset += u64::from(size);
                 let mut parser = Parser::new(usize_to_u64(reader.original_position()));
                 parser.max_size = size.into();
-                Ok(ModuleCodeSectionEntry { parser, range })
+                Ok(ModuleSectionEntry { parser, range })
             }
         }
     }
@@ -681,7 +686,7 @@
     /// This function will parse the `data` provided as a WebAssembly module,
     /// assuming that `data` represents the entire WebAssembly module.
     ///
-    /// Note that when this function yields `ModuleCodeSectionEntry`
+    /// Note that when this function yields `ModuleSectionEntry`
     /// no action needs to be taken with the returned parser. The parser will be
     /// automatically switched to internally and more payloads will continue to
     /// get returned.
@@ -723,7 +728,7 @@
                 //
                 // Afterwards we turn the loop again to recurse in parsing the
                 // nested module.
-                Payload::ModuleCodeSectionEntry { parser, range: _ } => {
+                Payload::ModuleSectionEntry { parser, range: _ } => {
                     stack.push(cur.clone());
                     cur = parser.clone();
                 }
@@ -738,11 +743,11 @@
     /// Skip parsing the code or module code section entirely.
     ///
     /// This function can be used to indicate, after receiving
-    /// `CodeSectionStart` or `ModuleCodeSectionStart`, that the section
+    /// `CodeSectionStart` or `ModuleSectionStart`, that the section
     /// will not be parsed.
     ///
     /// The caller will be responsible for skipping `size` bytes (found in the
-    /// `CodeSectionStart` or `ModuleCodeSectionStart` payload). Bytes should
+    /// `CodeSectionStart` or `ModuleSectionStart` payload). Bytes should
     /// only be fed into `parse` after the `size` bytes have been skipped.
     ///
     /// # Panics
@@ -791,9 +796,7 @@
     /// ```
     pub fn skip_section(&mut self) {
         let skip = match self.state {
-            State::FunctionBody { remaining: _, len } | State::ModuleCode { remaining: _, len } => {
-                len
-            }
+            State::FunctionBody { remaining: _, len } | State::Module { remaining: _, len } => len,
             _ => panic!("wrong state to call `skip_section`"),
         };
         self.offset += u64::from(skip);
@@ -893,10 +896,12 @@
                 name,
                 data_offset,
                 data: _,
+                range,
             } => f
                 .debug_struct("CustomSection")
                 .field("name", name)
                 .field("data_offset", data_offset)
+                .field("range", range)
                 .field("data", &"...")
                 .finish(),
             Version { num, range } => f
@@ -908,7 +913,6 @@
             ImportSection(_) => f.debug_tuple("ImportSection").field(&"...").finish(),
             AliasSection(_) => f.debug_tuple("AliasSection").field(&"...").finish(),
             InstanceSection(_) => f.debug_tuple("InstanceSection").field(&"...").finish(),
-            ModuleSection(_) => f.debug_tuple("ModuleSection").field(&"...").finish(),
             FunctionSection(_) => f.debug_tuple("FunctionSection").field(&"...").finish(),
             TableSection(_) => f.debug_tuple("TableSection").field(&"...").finish(),
             MemorySection(_) => f.debug_tuple("MemorySection").field(&"...").finish(),
@@ -934,14 +938,14 @@
                 .field("size", size)
                 .finish(),
             CodeSectionEntry(_) => f.debug_tuple("CodeSectionEntry").field(&"...").finish(),
-            ModuleCodeSectionStart { count, range, size } => f
-                .debug_struct("ModuleCodeSectionStart")
+            ModuleSectionStart { count, range, size } => f
+                .debug_struct("ModuleSectionStart")
                 .field("count", count)
                 .field("range", range)
                 .field("size", size)
                 .finish(),
-            ModuleCodeSectionEntry { parser: _, range } => f
-                .debug_struct("ModuleCodeSectionEntry")
+            ModuleSectionEntry { parser: _, range } => f
+                .debug_struct("ModuleSectionEntry")
                 .field("range", range)
                 .finish(),
             UnknownSection { id, range, .. } => f
@@ -1097,6 +1101,7 @@
                     name: "",
                     data_offset: 11,
                     data: b"",
+                    range: Range { start: 10, end: 11 },
                 },
             }),
         );
@@ -1108,6 +1113,7 @@
                     name: "a",
                     data_offset: 12,
                     data: b"",
+                    range: Range { start: 10, end: 12 },
                 },
             }),
         );
@@ -1119,6 +1125,7 @@
                     name: "",
                     data_offset: 11,
                     data: b"a",
+                    range: Range { start: 10, end: 12 },
                 },
             }),
         );
@@ -1237,24 +1244,24 @@
     #[test]
     fn module_code_errors() {
         // no bytes to say size of section
-        assert!(parser_after_header().parse(&[103], true).is_err());
+        assert!(parser_after_header().parse(&[14], true).is_err());
         // section must start with a u32
-        assert!(parser_after_header().parse(&[103, 0], true).is_err());
+        assert!(parser_after_header().parse(&[14, 0], true).is_err());
         // EOF before we finish reading the section
-        assert!(parser_after_header().parse(&[103, 1], true).is_err());
+        assert!(parser_after_header().parse(&[14, 1], true).is_err());
     }
 
     #[test]
     fn module_code_one() {
         let mut p = parser_after_header();
-        assert_matches!(p.parse(&[103], false), Ok(Chunk::NeedMoreData(1)));
-        assert_matches!(p.parse(&[103, 9], false), Ok(Chunk::NeedMoreData(1)));
+        assert_matches!(p.parse(&[14], false), Ok(Chunk::NeedMoreData(1)));
+        assert_matches!(p.parse(&[14, 9], false), Ok(Chunk::NeedMoreData(1)));
         // Module code section, 10 bytes large, one module.
         assert_matches!(
-            p.parse(&[103, 10, 1], false),
+            p.parse(&[14, 10, 1], false),
             Ok(Chunk::Parsed {
                 consumed: 3,
-                payload: Payload::ModuleCodeSectionStart { count: 1, .. },
+                payload: Payload::ModuleSectionStart { count: 1, .. },
             })
         );
         // Declare an empty module, which will be 8 bytes large for the header.
@@ -1262,7 +1269,7 @@
         let mut sub = match p.parse(&[8], false) {
             Ok(Chunk::Parsed {
                 consumed: 1,
-                payload: Payload::ModuleCodeSectionEntry { parser, .. },
+                payload: Payload::ModuleSectionEntry { parser, .. },
             }) => parser,
             other => panic!("bad parse {:?}", other),
         };
@@ -1307,10 +1314,10 @@
         // Module code section, 12 bytes large, one module. This leaves 11 bytes
         // of payload for the module definition itself.
         assert_matches!(
-            p.parse(&[103, 12, 1], false),
+            p.parse(&[14, 12, 1], false),
             Ok(Chunk::Parsed {
                 consumed: 3,
-                payload: Payload::ModuleCodeSectionStart { count: 1, .. },
+                payload: Payload::ModuleSectionStart { count: 1, .. },
             })
         );
         // Use one byte to say we're a 10 byte module, which fits exactly within
@@ -1318,7 +1325,7 @@
         let mut sub = match p.parse(&[10], false) {
             Ok(Chunk::Parsed {
                 consumed: 1,
-                payload: Payload::ModuleCodeSectionEntry { parser, .. },
+                payload: Payload::ModuleSectionEntry { parser, .. },
             }) => parser,
             other => panic!("bad parse {:?}", other),
         };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/primitives.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/primitives.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/primitives.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/primitives.rs	2021-12-09 12:01:26.000000000 +0000
@@ -342,64 +342,174 @@
 pub enum Operator<'a> {
     Unreachable,
     Nop,
-    Block { ty: TypeOrFuncType },
-    Loop { ty: TypeOrFuncType },
-    If { ty: TypeOrFuncType },
+    Block {
+        ty: TypeOrFuncType,
+    },
+    Loop {
+        ty: TypeOrFuncType,
+    },
+    If {
+        ty: TypeOrFuncType,
+    },
     Else,
-    Try { ty: TypeOrFuncType },
-    Catch,
-    Throw { index: u32 },
-    Rethrow,
-    BrOnExn { relative_depth: u32, index: u32 },
+    Try {
+        ty: TypeOrFuncType,
+    },
+    Catch {
+        index: u32,
+    },
+    Throw {
+        index: u32,
+    },
+    Rethrow {
+        relative_depth: u32,
+    },
+    Unwind,
     End,
-    Br { relative_depth: u32 },
-    BrIf { relative_depth: u32 },
-    BrTable { table: BrTable<'a> },
+    Br {
+        relative_depth: u32,
+    },
+    BrIf {
+        relative_depth: u32,
+    },
+    BrTable {
+        table: BrTable<'a>,
+    },
     Return,
-    Call { function_index: u32 },
-    CallIndirect { index: u32, table_index: u32 },
-    ReturnCall { function_index: u32 },
-    ReturnCallIndirect { index: u32, table_index: u32 },
+    Call {
+        function_index: u32,
+    },
+    CallIndirect {
+        index: u32,
+        table_index: u32,
+    },
+    ReturnCall {
+        function_index: u32,
+    },
+    ReturnCallIndirect {
+        index: u32,
+        table_index: u32,
+    },
+    Delegate {
+        relative_depth: u32,
+    },
+    CatchAll,
     Drop,
     Select,
-    TypedSelect { ty: Type },
-    LocalGet { local_index: u32 },
-    LocalSet { local_index: u32 },
-    LocalTee { local_index: u32 },
-    GlobalGet { global_index: u32 },
-    GlobalSet { global_index: u32 },
-    I32Load { memarg: MemoryImmediate },
-    I64Load { memarg: MemoryImmediate },
-    F32Load { memarg: MemoryImmediate },
-    F64Load { memarg: MemoryImmediate },
-    I32Load8S { memarg: MemoryImmediate },
-    I32Load8U { memarg: MemoryImmediate },
-    I32Load16S { memarg: MemoryImmediate },
-    I32Load16U { memarg: MemoryImmediate },
-    I64Load8S { memarg: MemoryImmediate },
-    I64Load8U { memarg: MemoryImmediate },
-    I64Load16S { memarg: MemoryImmediate },
-    I64Load16U { memarg: MemoryImmediate },
-    I64Load32S { memarg: MemoryImmediate },
-    I64Load32U { memarg: MemoryImmediate },
-    I32Store { memarg: MemoryImmediate },
-    I64Store { memarg: MemoryImmediate },
-    F32Store { memarg: MemoryImmediate },
-    F64Store { memarg: MemoryImmediate },
-    I32Store8 { memarg: MemoryImmediate },
-    I32Store16 { memarg: MemoryImmediate },
-    I64Store8 { memarg: MemoryImmediate },
-    I64Store16 { memarg: MemoryImmediate },
-    I64Store32 { memarg: MemoryImmediate },
-    MemorySize { mem: u32, mem_byte: u8 },
-    MemoryGrow { mem: u32, mem_byte: u8 },
-    I32Const { value: i32 },
-    I64Const { value: i64 },
-    F32Const { value: Ieee32 },
-    F64Const { value: Ieee64 },
-    RefNull { ty: Type },
+    TypedSelect {
+        ty: Type,
+    },
+    LocalGet {
+        local_index: u32,
+    },
+    LocalSet {
+        local_index: u32,
+    },
+    LocalTee {
+        local_index: u32,
+    },
+    GlobalGet {
+        global_index: u32,
+    },
+    GlobalSet {
+        global_index: u32,
+    },
+    I32Load {
+        memarg: MemoryImmediate,
+    },
+    I64Load {
+        memarg: MemoryImmediate,
+    },
+    F32Load {
+        memarg: MemoryImmediate,
+    },
+    F64Load {
+        memarg: MemoryImmediate,
+    },
+    I32Load8S {
+        memarg: MemoryImmediate,
+    },
+    I32Load8U {
+        memarg: MemoryImmediate,
+    },
+    I32Load16S {
+        memarg: MemoryImmediate,
+    },
+    I32Load16U {
+        memarg: MemoryImmediate,
+    },
+    I64Load8S {
+        memarg: MemoryImmediate,
+    },
+    I64Load8U {
+        memarg: MemoryImmediate,
+    },
+    I64Load16S {
+        memarg: MemoryImmediate,
+    },
+    I64Load16U {
+        memarg: MemoryImmediate,
+    },
+    I64Load32S {
+        memarg: MemoryImmediate,
+    },
+    I64Load32U {
+        memarg: MemoryImmediate,
+    },
+    I32Store {
+        memarg: MemoryImmediate,
+    },
+    I64Store {
+        memarg: MemoryImmediate,
+    },
+    F32Store {
+        memarg: MemoryImmediate,
+    },
+    F64Store {
+        memarg: MemoryImmediate,
+    },
+    I32Store8 {
+        memarg: MemoryImmediate,
+    },
+    I32Store16 {
+        memarg: MemoryImmediate,
+    },
+    I64Store8 {
+        memarg: MemoryImmediate,
+    },
+    I64Store16 {
+        memarg: MemoryImmediate,
+    },
+    I64Store32 {
+        memarg: MemoryImmediate,
+    },
+    MemorySize {
+        mem: u32,
+        mem_byte: u8,
+    },
+    MemoryGrow {
+        mem: u32,
+        mem_byte: u8,
+    },
+    I32Const {
+        value: i32,
+    },
+    I64Const {
+        value: i64,
+    },
+    F32Const {
+        value: Ieee32,
+    },
+    F64Const {
+        value: Ieee64,
+    },
+    RefNull {
+        ty: Type,
+    },
     RefIsNull,
-    RefFunc { function_index: u32 },
+    RefFunc {
+        function_index: u32,
+    },
     I32Eqz,
     I32Eq,
     I32Ne,
@@ -542,114 +652,382 @@
 
     // 0xFC operators
     // bulk memory https://github.com/WebAssembly/bulk-memory-operations/blob/master/proposals/bulk-memory-operations/Overview.md
-    MemoryInit { segment: u32, mem: u32 },
-    DataDrop { segment: u32 },
-    MemoryCopy { src: u32, dst: u32 },
-    MemoryFill { mem: u32 },
-    TableInit { segment: u32, table: u32 },
-    ElemDrop { segment: u32 },
-    TableCopy { dst_table: u32, src_table: u32 },
-    TableFill { table: u32 },
-    TableGet { table: u32 },
-    TableSet { table: u32 },
-    TableGrow { table: u32 },
-    TableSize { table: u32 },
+    MemoryInit {
+        segment: u32,
+        mem: u32,
+    },
+    DataDrop {
+        segment: u32,
+    },
+    MemoryCopy {
+        src: u32,
+        dst: u32,
+    },
+    MemoryFill {
+        mem: u32,
+    },
+    TableInit {
+        segment: u32,
+        table: u32,
+    },
+    ElemDrop {
+        segment: u32,
+    },
+    TableCopy {
+        dst_table: u32,
+        src_table: u32,
+    },
+    TableFill {
+        table: u32,
+    },
+    TableGet {
+        table: u32,
+    },
+    TableSet {
+        table: u32,
+    },
+    TableGrow {
+        table: u32,
+    },
+    TableSize {
+        table: u32,
+    },
 
     // 0xFE operators
     // https://github.com/WebAssembly/threads/blob/master/proposals/threads/Overview.md
-    MemoryAtomicNotify { memarg: MemoryImmediate },
-    MemoryAtomicWait32 { memarg: MemoryImmediate },
-    MemoryAtomicWait64 { memarg: MemoryImmediate },
-    AtomicFence { flags: u8 },
-    I32AtomicLoad { memarg: MemoryImmediate },
-    I64AtomicLoad { memarg: MemoryImmediate },
-    I32AtomicLoad8U { memarg: MemoryImmediate },
-    I32AtomicLoad16U { memarg: MemoryImmediate },
-    I64AtomicLoad8U { memarg: MemoryImmediate },
-    I64AtomicLoad16U { memarg: MemoryImmediate },
-    I64AtomicLoad32U { memarg: MemoryImmediate },
-    I32AtomicStore { memarg: MemoryImmediate },
-    I64AtomicStore { memarg: MemoryImmediate },
-    I32AtomicStore8 { memarg: MemoryImmediate },
-    I32AtomicStore16 { memarg: MemoryImmediate },
-    I64AtomicStore8 { memarg: MemoryImmediate },
-    I64AtomicStore16 { memarg: MemoryImmediate },
-    I64AtomicStore32 { memarg: MemoryImmediate },
-    I32AtomicRmwAdd { memarg: MemoryImmediate },
-    I64AtomicRmwAdd { memarg: MemoryImmediate },
-    I32AtomicRmw8AddU { memarg: MemoryImmediate },
-    I32AtomicRmw16AddU { memarg: MemoryImmediate },
-    I64AtomicRmw8AddU { memarg: MemoryImmediate },
-    I64AtomicRmw16AddU { memarg: MemoryImmediate },
-    I64AtomicRmw32AddU { memarg: MemoryImmediate },
-    I32AtomicRmwSub { memarg: MemoryImmediate },
-    I64AtomicRmwSub { memarg: MemoryImmediate },
-    I32AtomicRmw8SubU { memarg: MemoryImmediate },
-    I32AtomicRmw16SubU { memarg: MemoryImmediate },
-    I64AtomicRmw8SubU { memarg: MemoryImmediate },
-    I64AtomicRmw16SubU { memarg: MemoryImmediate },
-    I64AtomicRmw32SubU { memarg: MemoryImmediate },
-    I32AtomicRmwAnd { memarg: MemoryImmediate },
-    I64AtomicRmwAnd { memarg: MemoryImmediate },
-    I32AtomicRmw8AndU { memarg: MemoryImmediate },
-    I32AtomicRmw16AndU { memarg: MemoryImmediate },
-    I64AtomicRmw8AndU { memarg: MemoryImmediate },
-    I64AtomicRmw16AndU { memarg: MemoryImmediate },
-    I64AtomicRmw32AndU { memarg: MemoryImmediate },
-    I32AtomicRmwOr { memarg: MemoryImmediate },
-    I64AtomicRmwOr { memarg: MemoryImmediate },
-    I32AtomicRmw8OrU { memarg: MemoryImmediate },
-    I32AtomicRmw16OrU { memarg: MemoryImmediate },
-    I64AtomicRmw8OrU { memarg: MemoryImmediate },
-    I64AtomicRmw16OrU { memarg: MemoryImmediate },
-    I64AtomicRmw32OrU { memarg: MemoryImmediate },
-    I32AtomicRmwXor { memarg: MemoryImmediate },
-    I64AtomicRmwXor { memarg: MemoryImmediate },
-    I32AtomicRmw8XorU { memarg: MemoryImmediate },
-    I32AtomicRmw16XorU { memarg: MemoryImmediate },
-    I64AtomicRmw8XorU { memarg: MemoryImmediate },
-    I64AtomicRmw16XorU { memarg: MemoryImmediate },
-    I64AtomicRmw32XorU { memarg: MemoryImmediate },
-    I32AtomicRmwXchg { memarg: MemoryImmediate },
-    I64AtomicRmwXchg { memarg: MemoryImmediate },
-    I32AtomicRmw8XchgU { memarg: MemoryImmediate },
-    I32AtomicRmw16XchgU { memarg: MemoryImmediate },
-    I64AtomicRmw8XchgU { memarg: MemoryImmediate },
-    I64AtomicRmw16XchgU { memarg: MemoryImmediate },
-    I64AtomicRmw32XchgU { memarg: MemoryImmediate },
-    I32AtomicRmwCmpxchg { memarg: MemoryImmediate },
-    I64AtomicRmwCmpxchg { memarg: MemoryImmediate },
-    I32AtomicRmw8CmpxchgU { memarg: MemoryImmediate },
-    I32AtomicRmw16CmpxchgU { memarg: MemoryImmediate },
-    I64AtomicRmw8CmpxchgU { memarg: MemoryImmediate },
-    I64AtomicRmw16CmpxchgU { memarg: MemoryImmediate },
-    I64AtomicRmw32CmpxchgU { memarg: MemoryImmediate },
+    MemoryAtomicNotify {
+        memarg: MemoryImmediate,
+    },
+    MemoryAtomicWait32 {
+        memarg: MemoryImmediate,
+    },
+    MemoryAtomicWait64 {
+        memarg: MemoryImmediate,
+    },
+    AtomicFence {
+        flags: u8,
+    },
+    I32AtomicLoad {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicLoad {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicLoad8U {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicLoad16U {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicLoad8U {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicLoad16U {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicLoad32U {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicStore {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicStore {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicStore8 {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicStore16 {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicStore8 {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicStore16 {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicStore32 {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmwAdd {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmwAdd {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw8AddU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw16AddU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw8AddU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw16AddU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw32AddU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmwSub {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmwSub {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw8SubU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw16SubU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw8SubU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw16SubU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw32SubU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmwAnd {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmwAnd {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw8AndU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw16AndU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw8AndU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw16AndU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw32AndU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmwOr {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmwOr {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw8OrU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw16OrU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw8OrU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw16OrU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw32OrU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmwXor {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmwXor {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw8XorU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw16XorU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw8XorU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw16XorU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw32XorU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmwXchg {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmwXchg {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw8XchgU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw16XchgU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw8XchgU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw16XchgU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw32XchgU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmwCmpxchg {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmwCmpxchg {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw8CmpxchgU {
+        memarg: MemoryImmediate,
+    },
+    I32AtomicRmw16CmpxchgU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw8CmpxchgU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw16CmpxchgU {
+        memarg: MemoryImmediate,
+    },
+    I64AtomicRmw32CmpxchgU {
+        memarg: MemoryImmediate,
+    },
 
     // 0xFD operators
-    // SIMD https://github.com/WebAssembly/simd/blob/master/proposals/simd/BinarySIMD.md
-    V128Load { memarg: MemoryImmediate },
-    V128Store { memarg: MemoryImmediate },
-    V128Const { value: V128 },
+    // SIMD https://webassembly.github.io/simd/core/binary/instructions.html
+    V128Load {
+        memarg: MemoryImmediate,
+    },
+    V128Load8x8S {
+        memarg: MemoryImmediate,
+    },
+    V128Load8x8U {
+        memarg: MemoryImmediate,
+    },
+    V128Load16x4S {
+        memarg: MemoryImmediate,
+    },
+    V128Load16x4U {
+        memarg: MemoryImmediate,
+    },
+    V128Load32x2S {
+        memarg: MemoryImmediate,
+    },
+    V128Load32x2U {
+        memarg: MemoryImmediate,
+    },
+    V128Load8Splat {
+        memarg: MemoryImmediate,
+    },
+    V128Load16Splat {
+        memarg: MemoryImmediate,
+    },
+    V128Load32Splat {
+        memarg: MemoryImmediate,
+    },
+    V128Load64Splat {
+        memarg: MemoryImmediate,
+    },
+    V128Load32Zero {
+        memarg: MemoryImmediate,
+    },
+    V128Load64Zero {
+        memarg: MemoryImmediate,
+    },
+    V128Store {
+        memarg: MemoryImmediate,
+    },
+    V128Load8Lane {
+        memarg: MemoryImmediate,
+        lane: SIMDLaneIndex,
+    },
+    V128Load16Lane {
+        memarg: MemoryImmediate,
+        lane: SIMDLaneIndex,
+    },
+    V128Load32Lane {
+        memarg: MemoryImmediate,
+        lane: SIMDLaneIndex,
+    },
+    V128Load64Lane {
+        memarg: MemoryImmediate,
+        lane: SIMDLaneIndex,
+    },
+    V128Store8Lane {
+        memarg: MemoryImmediate,
+        lane: SIMDLaneIndex,
+    },
+    V128Store16Lane {
+        memarg: MemoryImmediate,
+        lane: SIMDLaneIndex,
+    },
+    V128Store32Lane {
+        memarg: MemoryImmediate,
+        lane: SIMDLaneIndex,
+    },
+    V128Store64Lane {
+        memarg: MemoryImmediate,
+        lane: SIMDLaneIndex,
+    },
+    V128Const {
+        value: V128,
+    },
+    I8x16Shuffle {
+        lanes: [SIMDLaneIndex; 16],
+    },
+    I8x16ExtractLaneS {
+        lane: SIMDLaneIndex,
+    },
+    I8x16ExtractLaneU {
+        lane: SIMDLaneIndex,
+    },
+    I8x16ReplaceLane {
+        lane: SIMDLaneIndex,
+    },
+    I16x8ExtractLaneS {
+        lane: SIMDLaneIndex,
+    },
+    I16x8ExtractLaneU {
+        lane: SIMDLaneIndex,
+    },
+    I16x8ReplaceLane {
+        lane: SIMDLaneIndex,
+    },
+    I32x4ExtractLane {
+        lane: SIMDLaneIndex,
+    },
+    I32x4ReplaceLane {
+        lane: SIMDLaneIndex,
+    },
+    I64x2ExtractLane {
+        lane: SIMDLaneIndex,
+    },
+    I64x2ReplaceLane {
+        lane: SIMDLaneIndex,
+    },
+    F32x4ExtractLane {
+        lane: SIMDLaneIndex,
+    },
+    F32x4ReplaceLane {
+        lane: SIMDLaneIndex,
+    },
+    F64x2ExtractLane {
+        lane: SIMDLaneIndex,
+    },
+    F64x2ReplaceLane {
+        lane: SIMDLaneIndex,
+    },
+    I8x16Swizzle,
     I8x16Splat,
-    I8x16ExtractLaneS { lane: SIMDLaneIndex },
-    I8x16ExtractLaneU { lane: SIMDLaneIndex },
-    I8x16ReplaceLane { lane: SIMDLaneIndex },
     I16x8Splat,
-    I16x8ExtractLaneS { lane: SIMDLaneIndex },
-    I16x8ExtractLaneU { lane: SIMDLaneIndex },
-    I16x8ReplaceLane { lane: SIMDLaneIndex },
     I32x4Splat,
-    I32x4ExtractLane { lane: SIMDLaneIndex },
-    I32x4ReplaceLane { lane: SIMDLaneIndex },
     I64x2Splat,
-    I64x2ExtractLane { lane: SIMDLaneIndex },
-    I64x2ReplaceLane { lane: SIMDLaneIndex },
     F32x4Splat,
-    F32x4ExtractLane { lane: SIMDLaneIndex },
-    F32x4ReplaceLane { lane: SIMDLaneIndex },
     F64x2Splat,
-    F64x2ExtractLane { lane: SIMDLaneIndex },
-    F64x2ReplaceLane { lane: SIMDLaneIndex },
     I8x16Eq,
     I8x16Ne,
     I8x16LtS,
@@ -680,6 +1058,12 @@
     I32x4LeU,
     I32x4GeS,
     I32x4GeU,
+    I64x2Eq,
+    I64x2Ne,
+    I64x2LtS,
+    I64x2GtS,
+    I64x2LeS,
+    I64x2GeS,
     F32x4Eq,
     F32x4Ne,
     F32x4Lt,
@@ -698,11 +1082,14 @@
     V128Or,
     V128Xor,
     V128Bitselect,
+    V128AnyTrue,
     I8x16Abs,
     I8x16Neg,
-    I8x16AnyTrue,
+    I8x16Popcnt,
     I8x16AllTrue,
     I8x16Bitmask,
+    I8x16NarrowI16x8S,
+    I8x16NarrowI16x8U,
     I8x16Shl,
     I8x16ShrS,
     I8x16ShrU,
@@ -716,11 +1103,20 @@
     I8x16MinU,
     I8x16MaxS,
     I8x16MaxU,
+    I8x16RoundingAverageU,
+    I16x8ExtAddPairwiseI8x16S,
+    I16x8ExtAddPairwiseI8x16U,
     I16x8Abs,
     I16x8Neg,
-    I16x8AnyTrue,
+    I16x8Q15MulrSatS,
     I16x8AllTrue,
     I16x8Bitmask,
+    I16x8NarrowI32x4S,
+    I16x8NarrowI32x4U,
+    I16x8ExtendLowI8x16S,
+    I16x8ExtendHighI8x16S,
+    I16x8ExtendLowI8x16U,
+    I16x8ExtendHighI8x16U,
     I16x8Shl,
     I16x8ShrS,
     I16x8ShrU,
@@ -735,11 +1131,21 @@
     I16x8MinU,
     I16x8MaxS,
     I16x8MaxU,
+    I16x8RoundingAverageU,
+    I16x8ExtMulLowI8x16S,
+    I16x8ExtMulHighI8x16S,
+    I16x8ExtMulLowI8x16U,
+    I16x8ExtMulHighI8x16U,
+    I32x4ExtAddPairwiseI16x8S,
+    I32x4ExtAddPairwiseI16x8U,
     I32x4Abs,
     I32x4Neg,
-    I32x4AnyTrue,
     I32x4AllTrue,
     I32x4Bitmask,
+    I32x4ExtendLowI16x8S,
+    I32x4ExtendHighI16x8S,
+    I32x4ExtendLowI16x8U,
+    I32x4ExtendHighI16x8U,
     I32x4Shl,
     I32x4ShrS,
     I32x4ShrU,
@@ -751,21 +1157,32 @@
     I32x4MaxS,
     I32x4MaxU,
     I32x4DotI16x8S,
+    I32x4ExtMulLowI16x8S,
+    I32x4ExtMulHighI16x8S,
+    I32x4ExtMulLowI16x8U,
+    I32x4ExtMulHighI16x8U,
+    I64x2Abs,
     I64x2Neg,
+    I64x2AllTrue,
+    I64x2Bitmask,
+    I64x2ExtendLowI32x4S,
+    I64x2ExtendHighI32x4S,
+    I64x2ExtendLowI32x4U,
+    I64x2ExtendHighI32x4U,
     I64x2Shl,
     I64x2ShrS,
     I64x2ShrU,
     I64x2Add,
     I64x2Sub,
     I64x2Mul,
+    I64x2ExtMulLowI32x4S,
+    I64x2ExtMulHighI32x4S,
+    I64x2ExtMulLowI32x4U,
+    I64x2ExtMulHighI32x4U,
     F32x4Ceil,
     F32x4Floor,
     F32x4Trunc,
     F32x4Nearest,
-    F64x2Ceil,
-    F64x2Floor,
-    F64x2Trunc,
-    F64x2Nearest,
     F32x4Abs,
     F32x4Neg,
     F32x4Sqrt,
@@ -777,6 +1194,10 @@
     F32x4Max,
     F32x4PMin,
     F32x4PMax,
+    F64x2Ceil,
+    F64x2Floor,
+    F64x2Trunc,
+    F64x2Nearest,
     F64x2Abs,
     F64x2Neg,
     F64x2Sqrt,
@@ -792,32 +1213,10 @@
     I32x4TruncSatF32x4U,
     F32x4ConvertI32x4S,
     F32x4ConvertI32x4U,
-    I8x16Swizzle,
-    I8x16Shuffle { lanes: [SIMDLaneIndex; 16] },
-    V128Load8Splat { memarg: MemoryImmediate },
-    V128Load16Splat { memarg: MemoryImmediate },
-    V128Load32Splat { memarg: MemoryImmediate },
-    V128Load32Zero { memarg: MemoryImmediate },
-    V128Load64Splat { memarg: MemoryImmediate },
-    V128Load64Zero { memarg: MemoryImmediate },
-    I8x16NarrowI16x8S,
-    I8x16NarrowI16x8U,
-    I16x8NarrowI32x4S,
-    I16x8NarrowI32x4U,
-    I16x8WidenLowI8x16S,
-    I16x8WidenHighI8x16S,
-    I16x8WidenLowI8x16U,
-    I16x8WidenHighI8x16U,
-    I32x4WidenLowI16x8S,
-    I32x4WidenHighI16x8S,
-    I32x4WidenLowI16x8U,
-    I32x4WidenHighI16x8U,
-    V128Load8x8S { memarg: MemoryImmediate },
-    V128Load8x8U { memarg: MemoryImmediate },
-    V128Load16x4S { memarg: MemoryImmediate },
-    V128Load16x4U { memarg: MemoryImmediate },
-    V128Load32x2S { memarg: MemoryImmediate },
-    V128Load32x2U { memarg: MemoryImmediate },
-    I8x16RoundingAverageU,
-    I16x8RoundingAverageU,
+    I32x4TruncSatF64x2SZero,
+    I32x4TruncSatF64x2UZero,
+    F64x2ConvertLowI32x4S,
+    F64x2ConvertLowI32x4U,
+    F32x4DemoteF64x2Zero,
+    F64x2PromoteLowF32x4,
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/alias_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/alias_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/alias_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/alias_section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,16 +10,20 @@
 }
 
 #[derive(Debug)]
-pub struct Alias {
-    pub instance: AliasedInstance,
-    pub kind: ExternalKind,
-    pub index: u32,
-}
-
-#[derive(Debug)]
-pub enum AliasedInstance {
-    Parent,
-    Child(u32),
+pub enum Alias<'a> {
+    OuterType {
+        relative_depth: u32,
+        index: u32,
+    },
+    OuterModule {
+        relative_depth: u32,
+        index: u32,
+    },
+    InstanceExport {
+        instance: u32,
+        kind: ExternalKind,
+        export: &'a str,
+    },
 }
 
 impl<'a> AliasSectionReader<'a> {
@@ -37,26 +41,44 @@
         self.count
     }
 
-    pub fn read(&mut self) -> Result<Alias> {
-        Ok(Alias {
-            instance: match self.reader.read_u8()? {
-                0x00 => AliasedInstance::Child(self.reader.read_var_u32()?),
-                0x01 => AliasedInstance::Parent,
-                _ => {
-                    return Err(BinaryReaderError::new(
-                        "invalid byte in alias",
-                        self.original_position() - 1,
-                    ))
-                }
+    pub fn read(&mut self) -> Result<Alias<'a>> {
+        Ok(match self.reader.read_u8()? {
+            0x00 => Alias::InstanceExport {
+                instance: self.reader.read_var_u32()?,
+                kind: self.reader.read_external_kind()?,
+                export: self.reader.read_string()?,
             },
-            kind: self.reader.read_external_kind()?,
-            index: self.reader.read_var_u32()?,
+            0x01 => {
+                let relative_depth = self.reader.read_var_u32()?;
+                match self.reader.read_external_kind()? {
+                    ExternalKind::Type => Alias::OuterType {
+                        relative_depth,
+                        index: self.reader.read_var_u32()?,
+                    },
+                    ExternalKind::Module => Alias::OuterModule {
+                        relative_depth,
+                        index: self.reader.read_var_u32()?,
+                    },
+                    _ => {
+                        return Err(BinaryReaderError::new(
+                            "invalid external kind in alias",
+                            self.original_position() - 1,
+                        ))
+                    }
+                }
+            }
+            _ => {
+                return Err(BinaryReaderError::new(
+                    "invalid byte in alias",
+                    self.original_position() - 1,
+                ))
+            }
         })
     }
 }
 
 impl<'a> SectionReader for AliasSectionReader<'a> {
-    type Item = Alias;
+    type Item = Alias<'a>;
 
     fn read(&mut self) -> Result<Self::Item> {
         AliasSectionReader::read(self)
@@ -79,7 +101,7 @@
 }
 
 impl<'a> IntoIterator for AliasSectionReader<'a> {
-    type Item = Result<Alias>;
+    type Item = Result<Alias<'a>>;
     type IntoIter = SectionIteratorLimited<AliasSectionReader<'a>>;
 
     fn into_iter(self) -> Self::IntoIter {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/data_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/data_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/data_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/data_section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,13 +37,18 @@
 pub struct DataSectionReader<'a> {
     reader: BinaryReader<'a>,
     count: u32,
+    forbid_bulk_memory: bool,
 }
 
 impl<'a> DataSectionReader<'a> {
     pub fn new(data: &'a [u8], offset: usize) -> Result<DataSectionReader<'a>> {
         let mut reader = BinaryReader::new_with_offset(data, offset);
         let count = reader.read_var_u32()?;
-        Ok(DataSectionReader { reader, count })
+        Ok(DataSectionReader {
+            reader,
+            count,
+            forbid_bulk_memory: false,
+        })
     }
 
     pub fn original_position(&self) -> usize {
@@ -54,6 +59,10 @@
         self.count
     }
 
+    pub fn forbid_bulk_memory(&mut self, forbid: bool) {
+        self.forbid_bulk_memory = forbid;
+    }
+
     fn verify_data_end(&self, end: usize) -> Result<()> {
         if self.reader.buffer.len() < end {
             return Err(BinaryReaderError::new(
@@ -87,11 +96,12 @@
         'a: 'b,
     {
         let flags = self.reader.read_var_u32()?;
-        let kind = if flags == 1 {
+        let kind = if !self.forbid_bulk_memory && flags == 1 {
             DataKind::Passive
         } else {
             let memory_index = match flags {
                 0 => 0,
+                _ if self.forbid_bulk_memory => flags,
                 2 => self.reader.read_var_u32()?,
                 _ => {
                     return Err(BinaryReaderError::new(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/instance_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/instance_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/instance_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/instance_section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -29,13 +29,15 @@
             &self.reader.buffer[self.reader.position..],
             self.original_position(),
         )?;
-        self.reader.skip_bytes(1)?;
-        self.reader.skip_var_32()?;
-        let count = self.reader.read_var_u32()?;
-        for _ in 0..count {
-            self.reader.skip_bytes(1)?;
-            self.reader.skip_var_32()?;
+
+        // FIXME(#188): should probably figure out a different API for
+        // wasmparser such that we don't have to read instances to skip them
+        // here.
+        let mut args = instance.args()?;
+        for _ in 0..args.get_count() {
+            args.read()?;
         }
+        self.reader = args.reader;
         Ok(instance)
     }
 }
@@ -72,6 +74,7 @@
     }
 }
 
+#[derive(Clone)]
 pub struct Instance<'a> {
     reader: BinaryReader<'a>,
     module: u32,
@@ -116,21 +119,30 @@
     remaining: u32,
 }
 
+#[derive(Debug)]
+pub struct InstanceArg<'a> {
+    pub name: &'a str,
+    pub kind: ExternalKind,
+    pub index: u32,
+}
+
 impl<'a> InstanceArgsReader<'a> {
     pub fn original_position(&self) -> usize {
         self.reader.original_position()
     }
 
-    pub fn read(&mut self) -> Result<(ExternalKind, u32)> {
-        let kind = self.reader.read_external_kind()?;
-        let index = self.reader.read_var_u32()?;
+    pub fn read(&mut self) -> Result<InstanceArg<'a>> {
         self.remaining -= 1;
-        Ok((kind, index))
+        Ok(InstanceArg {
+            name: self.reader.read_string()?,
+            kind: self.reader.read_external_kind()?,
+            index: self.reader.read_var_u32()?,
+        })
     }
 }
 
 impl<'a> SectionReader for InstanceArgsReader<'a> {
-    type Item = (ExternalKind, u32);
+    type Item = InstanceArg<'a>;
 
     fn read(&mut self) -> Result<Self::Item> {
         InstanceArgsReader::read(self)
@@ -153,7 +165,7 @@
 }
 
 impl<'a> IntoIterator for InstanceArgsReader<'a> {
-    type Item = Result<(ExternalKind, u32)>;
+    type Item = Result<InstanceArg<'a>>;
     type IntoIter = SectionIteratorLimited<InstanceArgsReader<'a>>;
 
     fn into_iter(self) -> Self::IntoIter {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -31,7 +31,6 @@
 pub use self::instance_section::*;
 pub use self::linking_section::*;
 pub use self::memory_section::*;
-pub use self::module_code_section::*;
 pub use self::module_section::*;
 pub use self::name_section::*;
 pub use self::operators::*;
@@ -54,7 +53,6 @@
 mod instance_section;
 mod linking_section;
 mod memory_section;
-mod module_code_section;
 mod module_section;
 mod name_section;
 mod operators;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/module_code_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/module_code_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/module_code_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/module_code_section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -86,7 +86,7 @@
 }
 
 impl<'a> ModuleCode<'a> {
-    pub fn raw_bytes(&self) -> (usize, &[u8]) {
+    pub fn raw_bytes(&self) -> (usize, &'a [u8]) {
         (self.reader.original_position(), self.reader.buffer)
     }
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/module_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/module_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/readers/module_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/readers/module_section.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1,13 +1,18 @@
-use super::{
-    BinaryReader, Range, Result, SectionIteratorLimited, SectionReader, SectionWithLimitedItems,
+use crate::{
+    BinaryReader, BinaryReaderError, Range, Result, SectionIteratorLimited, SectionReader,
+    SectionWithLimitedItems,
 };
 
-#[derive(Clone)]
 pub struct ModuleSectionReader<'a> {
     reader: BinaryReader<'a>,
     count: u32,
 }
 
+#[derive(Debug)]
+pub struct NestedModule<'a> {
+    reader: BinaryReader<'a>,
+}
+
 impl<'a> ModuleSectionReader<'a> {
     pub fn new(data: &'a [u8], offset: usize) -> Result<ModuleSectionReader<'a>> {
         let mut reader = BinaryReader::new_with_offset(data, offset);
@@ -23,13 +28,33 @@
         self.count
     }
 
-    pub fn read(&mut self) -> Result<u32> {
-        self.reader.read_var_u32()
+    fn verify_module_end(&self, end: usize) -> Result<()> {
+        if self.reader.buffer.len() < end {
+            return Err(BinaryReaderError::new(
+                "module body extends past end of the module code section",
+                self.reader.original_offset + self.reader.buffer.len(),
+            ));
+        }
+        Ok(())
+    }
+
+    pub fn read(&mut self) -> Result<NestedModule<'a>> {
+        let size = self.reader.read_var_u32()? as usize;
+        let module_start = self.reader.position;
+        let module_end = module_start + size;
+        self.verify_module_end(module_end)?;
+        self.reader.skip_to(module_end);
+        Ok(NestedModule {
+            reader: BinaryReader::new_with_offset(
+                &self.reader.buffer[module_start..module_end],
+                self.reader.original_offset + module_start,
+            ),
+        })
     }
 }
 
 impl<'a> SectionReader for ModuleSectionReader<'a> {
-    type Item = u32;
+    type Item = NestedModule<'a>;
 
     fn read(&mut self) -> Result<Self::Item> {
         ModuleSectionReader::read(self)
@@ -52,10 +77,20 @@
 }
 
 impl<'a> IntoIterator for ModuleSectionReader<'a> {
-    type Item = Result<u32>;
+    type Item = Result<NestedModule<'a>>;
     type IntoIter = SectionIteratorLimited<ModuleSectionReader<'a>>;
 
     fn into_iter(self) -> Self::IntoIter {
         SectionIteratorLimited::new(self)
     }
 }
+
+impl<'a> NestedModule<'a> {
+    pub fn raw_bytes(&self) -> (usize, &'a [u8]) {
+        (self.reader.original_position(), self.reader.buffer)
+    }
+
+    pub fn original_position(&self) -> usize {
+        self.reader.original_position()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/validator/func.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/validator/func.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/validator/func.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/validator/func.rs	2021-12-09 12:01:26.000000000 +0000
@@ -130,6 +130,9 @@
         fn memory_at(&self, _at: u32) -> Option<crate::MemoryType> {
             todo!()
         }
+        fn event_at(&self, _at: u32) -> Option<&Self::FuncType> {
+            todo!()
+        }
         fn global_at(&self, _at: u32) -> Option<crate::GlobalType> {
             todo!()
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/validator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/validator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser/src/validator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser/src/validator.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,11 +16,11 @@
 use crate::limits::*;
 use crate::ResizableLimits64;
 use crate::WasmModuleResources;
-use crate::{Alias, AliasedInstance, ExternalKind, Import, ImportSectionEntryType};
+use crate::{Alias, ExternalKind, Import, ImportSectionEntryType};
 use crate::{BinaryReaderError, EventType, GlobalType, MemoryType, Range, Result, TableType, Type};
 use crate::{DataKind, ElementItem, ElementKind, InitExpr, Instance, Operator};
-use crate::{Export, ExportType, FunctionBody, Parser, Payload};
 use crate::{FuncType, ResizableLimits, SectionReader, SectionWithLimitedItems};
+use crate::{FunctionBody, Parser, Payload};
 use std::collections::{HashMap, HashSet};
 use std::mem;
 use std::sync::Arc;
@@ -76,6 +76,28 @@
 /// [core]: https://webassembly.github.io/spec/core/valid/index.html
 #[derive(Default)]
 pub struct Validator {
+    /// The current module that we're validating.
+    cur: Module,
+
+    /// With module linking this is the list of parent modules to this module,
+    /// sorted from oldest to most recent.
+    parents: Vec<Module>,
+
+    /// This is the global list of all types shared by this validator which all
+    /// modules will reference.
+    types: SnapshotList<TypeDef>,
+
+    /// Enabled WebAssembly feature flags, dictating what's valid and what
+    /// isn't.
+    features: WasmFeatures,
+
+    /// The current byte-level offset in the wasm binary. This is updated to
+    /// produce error messages in `create_error`.
+    offset: usize,
+}
+
+#[derive(Default)]
+struct Module {
     /// Internal state that is incrementally built-up for the module being
     /// validate. This houses type information for all wasm items, like
     /// functions. Note that this starts out as a solely owned `Arc<T>` so we can
@@ -83,81 +105,71 @@
     /// mutated to we can clone it cheaply and hand it to sub-validators.
     state: arc::MaybeOwned<ModuleState>,
 
-    /// Enabled WebAssembly feature flags, dictating what's valid and what
-    /// isn't.
-    features: WasmFeatures,
-
     /// Where we are, order-wise, in the wasm binary.
     order: Order,
 
-    /// The current byte-level offset in the wasm binary. This is updated to
-    /// produce error messages in `create_error`.
-    offset: usize,
-
     /// The number of data segments we ended up finding in this module, or 0 if
     /// they either weren't present or none were found.
     data_found: u32,
 
     /// The number of functions we expect to be defined in the code section, or
     /// basically the length of the function section if it was found. The next
-    /// index is where we are, in the function index space, for the next entry
-    /// in the code section (used to figure out what type is next for the
-    /// function being validated.
+    /// index is where we are, in the code section index space, for the next
+    /// entry in the code section (used to figure out what type is next for the
+    /// function being validated).
     expected_code_bodies: Option<u32>,
     code_section_index: usize,
-
-    /// Similar to code bodies above, but for module bodies instead.
-    expected_modules: Option<u32>,
-    module_code_section_index: usize,
-
-    /// If this validator is for a nested module then this keeps track of the
-    /// type of the module that we're matching against. The `expected_type` is
-    /// an entry in our parent's type index space, and the two positional
-    /// indices keep track of where we are in matching against imports/exports.
-    ///
-    /// Note that the exact algorithm for how it's determine that a submodule
-    /// matches its declare type is a bit up for debate. For now we go for 1:1
-    /// "everything must be equal" matching. This is the subject of
-    /// WebAssembly/module-linking#7, though.
-    expected_type: Option<Def<u32>>,
-    expected_import_pos: usize,
-    expected_export_pos: usize,
 }
 
 #[derive(Default)]
 struct ModuleState {
-    depth: usize,
-    types: Vec<ValidatedType>,
-    tables: Vec<Def<TableType>>,
+    /// This is a snapshot of `validator.types` when it is created. This is not
+    /// initially filled in but once everything in a module except the code
+    /// section has been parsed then this will be filled in.
+    ///
+    /// Note that this `ModuleState` will be a separately-owned structure living
+    /// in each function's validator. This is done to allow parallel validation
+    /// of functions while the main module is possibly still being parsed.
+    all_types: Option<Arc<SnapshotList<TypeDef>>>,
+
+    types: Vec<usize>, // pointer into `validator.types`
+    tables: Vec<TableType>,
     memories: Vec<MemoryType>,
-    events: Vec<EventType>,
-    globals: Vec<Def<GlobalType>>,
+    globals: Vec<GlobalType>,
     element_types: Vec<Type>,
     data_count: Option<u32>,
-    func_type_indices: Vec<Def<u32>>,
-    module_type_indices: Vec<Def<u32>>,
-    instance_type_indices: Vec<Def<InstanceDef>>,
+    code_type_indexes: Vec<u32>, // pointer into `types` above
+    func_types: Vec<usize>,      // pointer into `validator.types`
+    events: Vec<usize>,          // pointer into `validator.types`
+    submodules: Vec<usize>,      // pointer into `validator.types`
+    instances: Vec<usize>,       // pointer into `validator.types`
     function_references: HashSet<u32>,
-    parent: Option<Arc<ModuleState>>,
+
+    // This is populated when we hit the export section
+    exports: NameSet,
+
+    // This is populated as we visit import sections, which might be
+    // incrementally in the face of a module-linking-using module.
+    imports: NameSet,
 }
 
 /// Flags for features that are enabled for validation.
 #[derive(Hash, Debug, Copy, Clone)]
 pub struct WasmFeatures {
-    /// The WebAssembly reference types proposal
+    /// The WebAssembly reference types proposal (enabled by default)
     pub reference_types: bool,
+    /// The WebAssembly multi-value proposal (enabled by default)
+    pub multi_value: bool,
+    /// The WebAssembly bulk memory operations proposal (enabled by default)
+    pub bulk_memory: bool,
     /// The WebAssembly module linking proposal
     pub module_linking: bool,
     /// The WebAssembly SIMD proposal
     pub simd: bool,
-    /// The WebAssembly multi-value proposal (enabled by default)
-    pub multi_value: bool,
     /// The WebAssembly threads proposal
     pub threads: bool,
     /// The WebAssembly tail-call proposal
     pub tail_call: bool,
-    /// The WebAssembly bulk memory operations proposal
-    pub bulk_memory: bool,
     /// Whether or not only deterministic instructions are allowed
     pub deterministic_only: bool,
     /// The WebAssembly multi memory proposal
@@ -172,19 +184,19 @@
     fn default() -> WasmFeatures {
         WasmFeatures {
             // off-by-default features
-            reference_types: false,
             module_linking: false,
             simd: false,
             threads: false,
             tail_call: false,
-            bulk_memory: false,
             multi_memory: false,
             exceptions: false,
             memory64: false,
             deterministic_only: cfg!(feature = "deterministic"),
 
             // on-by-default features
+            bulk_memory: true,
             multi_value: true,
+            reference_types: true,
         }
     }
 }
@@ -205,7 +217,6 @@
     Start,
     Element,
     DataCount,
-    ModuleCode,
     Code,
     Data,
 }
@@ -216,44 +227,56 @@
     }
 }
 
-enum InstanceDef {
-    Imported { type_idx: u32 },
-    Instantiated { module_idx: u32 },
-}
-
-enum ValidatedType {
-    Def(TypeDef),
-    Alias(Def<u32>),
-}
-
 enum TypeDef {
     Func(FuncType),
     Module(ModuleType),
     Instance(InstanceType),
 }
 
-struct ModuleType {
-    imports: Vec<(String, Option<String>, ImportSectionEntryType)>,
-    exports: Vec<(String, ImportSectionEntryType)>,
+impl TypeDef {
+    fn unwrap_func(&self) -> &FuncType {
+        match self {
+            TypeDef::Func(f) => f,
+            _ => panic!("not a function type"),
+        }
+    }
+
+    fn unwrap_module(&self) -> &ModuleType {
+        match self {
+            TypeDef::Module(f) => f,
+            _ => panic!("not a module type"),
+        }
+    }
+
+    fn unwrap_instance(&self) -> &InstanceType {
+        match self {
+            TypeDef::Instance(f) => f,
+            _ => panic!("not an instance type"),
+        }
+    }
 }
 
-struct InstanceType {
-    exports: Vec<(String, ImportSectionEntryType)>,
+struct ModuleType {
+    type_size: u32,
+    imports: HashMap<String, EntityType>,
+    exports: HashMap<String, EntityType>,
 }
 
-fn to_import(item: &(String, Option<String>, ImportSectionEntryType)) -> Import<'_> {
-    Import {
-        module: &item.0,
-        field: item.1.as_deref(),
-        ty: item.2,
-    }
+#[derive(Default)]
+struct InstanceType {
+    type_size: u32,
+    exports: HashMap<String, EntityType>,
 }
 
-fn to_export(item: &(String, ImportSectionEntryType)) -> ExportType<'_> {
-    ExportType {
-        name: &item.0,
-        ty: item.1,
-    }
+#[derive(Clone)]
+enum EntityType {
+    Global(GlobalType),
+    Memory(MemoryType),
+    Table(TableType),
+    Func(usize),     // pointer into `validator.types`
+    Module(usize),   // pointer into `validator.types`
+    Instance(usize), // pointer into `validator.types`
+    Event(usize),    // pointer into `validator.types`
 }
 
 /// Possible return values from [`Validator::payload`].
@@ -262,12 +285,9 @@
     Ok,
     /// The payload validated, but it started a nested module.
     ///
-    /// This result indicates that the current validator needs to be saved until
-    /// later. The returned parser and validator should be used instead.
-    Push(Parser, Validator),
-    /// The payload validated, and the current validator is finished. The last
-    /// validator that was in use should be popped off the stack to resume.
-    Pop,
+    /// This result indicates that the specified parser should be used instead
+    /// of the currently-used parser until this returned one ends.
+    Submodule(Parser),
     /// A function was found to be validate.
     Func(FuncValidator<ValidatorResources>, FunctionBody<'a>),
 }
@@ -295,19 +315,11 @@
     /// validated. Parse and validation errors will be returned through
     /// `Err(_)`, and otherwise a successful validation means `Ok(())` is
     /// returned.
-    pub fn validate_all(self, bytes: &[u8]) -> Result<()> {
+    pub fn validate_all(&mut self, bytes: &[u8]) -> Result<()> {
         let mut functions_to_validate = Vec::new();
-        let mut stack = Vec::new();
-        let mut cur = self;
         for payload in Parser::new(0).parse_all(bytes) {
-            match cur.payload(&payload?)? {
-                ValidPayload::Ok => {}
-                ValidPayload::Pop => cur = stack.pop().unwrap(),
-                ValidPayload::Push(_parser, validator) => {
-                    stack.push(cur);
-                    cur = validator
-                }
-                ValidPayload::Func(validator, ops) => functions_to_validate.push((validator, ops)),
+            if let ValidPayload::Func(a, b) = self.payload(&payload?)? {
+                functions_to_validate.push((a, b));
             }
         }
 
@@ -338,7 +350,6 @@
             ImportSection(s) => self.import_section(s)?,
             AliasSection(s) => self.alias_section(s)?,
             InstanceSection(s) => self.instance_section(s)?,
-            ModuleSection(s) => self.module_section(s)?,
             FunctionSection(s) => self.function_section(s)?,
             TableSection(s) => self.table_section(s)?,
             MemorySection(s) => self.memory_section(s)?,
@@ -357,26 +368,19 @@
                 let func_validator = self.code_section_entry()?;
                 return Ok(ValidPayload::Func(func_validator, body.clone()));
             }
-            ModuleCodeSectionStart {
+            ModuleSectionStart {
                 count,
                 range,
                 size: _,
-            } => self.module_code_section_start(*count, range)?,
+            } => self.module_section_start(*count, range)?,
             DataSection(s) => self.data_section(s)?,
-            End => {
-                self.end()?;
-                return Ok(if self.state.depth > 0 {
-                    ValidPayload::Pop
-                } else {
-                    ValidPayload::Ok
-                });
-            }
+            End => self.end()?,
 
             CustomSection { .. } => {} // no validation for custom sections
             UnknownSection { id, range, .. } => self.unknown_section(*id, range)?,
-            ModuleCodeSectionEntry { parser, range: _ } => {
-                let subvalidator = self.module_code_section_entry();
-                return Ok(ValidPayload::Push(parser.clone(), subvalidator));
+            ModuleSectionEntry { parser, .. } => {
+                self.module_section_entry();
+                return Ok(ValidPayload::Submodule(parser.clone()));
             }
         }
         Ok(ValidPayload::Ok)
@@ -389,10 +393,10 @@
     /// Validates [`Payload::Version`](crate::Payload)
     pub fn version(&mut self, num: u32, range: &Range) -> Result<()> {
         self.offset = range.start;
-        if self.order != Order::Initial {
+        if self.cur.order != Order::Initial {
             return self.create_error("wasm version header out of order");
         }
-        self.order = Order::AfterHeader;
+        self.cur.order = Order::AfterHeader;
         if num != 1 {
             return self.create_error("bad wasm file version");
         }
@@ -400,7 +404,7 @@
     }
 
     fn update_order(&mut self, order: Order) -> Result<()> {
-        let prev = mem::replace(&mut self.order, order);
+        let prev = mem::replace(&mut self.cur.order, order);
         // If the previous section came before this section, then that's always
         // valid.
         if prev < order {
@@ -408,7 +412,7 @@
         }
         // ... otherwise if this is a repeated section then only the "module
         // linking header" is allows to have repeats
-        if prev == self.order && self.order == Order::ModuleLinkingHeader {
+        if prev == self.cur.order && self.cur.order == Order::ModuleLinkingHeader {
             return Ok(());
         }
         self.create_error("section out of order")
@@ -422,91 +426,90 @@
         }
     }
 
-    fn get_type<'me>(&'me self, idx: Def<u32>) -> Result<Def<&'me TypeDef>> {
-        match self.state.get_type(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error("unknown type: type index out of bounds"),
-        }
-    }
-
-    fn get_table<'me>(&'me self, idx: Def<u32>) -> Result<&'me Def<TableType>> {
-        match self.state.get_table(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error("unknown table: table index out of bounds"),
+    fn get_type(&self, idx: u32) -> Result<&TypeDef> {
+        match self.cur.state.types.get(idx as usize) {
+            Some(t) => Ok(&self.types[*t]),
+            None => self.create_error(format!("unknown type {}: type index out of bounds", idx)),
         }
     }
 
-    fn get_memory<'me>(&'me self, idx: Def<u32>) -> Result<&'me MemoryType> {
-        match self.state.get_memory(idx) {
+    fn get_table(&self, idx: u32) -> Result<&TableType> {
+        match self.cur.state.tables.get(idx as usize) {
             Some(t) => Ok(t),
-            None => self.create_error("unknown memory: memory index out of bounds"),
+            None => self.create_error(format!("unknown table {}: table index out of bounds", idx)),
         }
     }
 
-    fn get_event<'me>(&'me self, idx: Def<u32>) -> Result<&'me EventType> {
-        match self.state.get_event(idx) {
+    fn get_memory(&self, idx: u32) -> Result<&MemoryType> {
+        match self.cur.state.memories.get(idx as usize) {
             Some(t) => Ok(t),
-            None => self.create_error("unknown event: event index out of bounds"),
+            None => self.create_error(format!(
+                "unknown memory {}: memory index out of bounds",
+                idx,
+            )),
         }
     }
 
-    fn get_global<'me>(&'me self, idx: Def<u32>) -> Result<&'me Def<GlobalType>> {
-        match self.state.get_global(idx) {
+    fn get_global(&self, idx: u32) -> Result<&GlobalType> {
+        match self.cur.state.globals.get(idx as usize) {
             Some(t) => Ok(t),
-            None => self.create_error("unknown global: global index out of bounds"),
+            None => self.create_error(format!(
+                "unknown global {}: global index out of bounds",
+                idx,
+            )),
         }
     }
 
-    fn get_func_type_index<'me>(&'me self, idx: Def<u32>) -> Result<Def<u32>> {
-        match self.state.get_func_type_index(idx) {
-            Some(t) => Ok(t),
+    fn get_func_type(&self, func_idx: u32) -> Result<&FuncType> {
+        match self.cur.state.func_types.get(func_idx as usize) {
+            Some(t) => Ok(self.types[*t].unwrap_func()),
             None => self.create_error(format!(
                 "unknown function {}: func index out of bounds",
-                idx.item
+                func_idx,
             )),
         }
     }
 
-    fn get_module_type_index<'me>(&'me self, idx: Def<u32>) -> Result<Def<u32>> {
-        match self.state.get_module_type_index(idx) {
-            Some(t) => Ok(t),
+    fn get_module_type(&self, module_idx: u32) -> Result<&ModuleType> {
+        match self.cur.state.submodules.get(module_idx as usize) {
+            Some(t) => Ok(self.types[*t].unwrap_module()),
             None => self.create_error("unknown module: module index out of bounds"),
         }
     }
 
-    fn get_instance_def<'me>(&'me self, idx: Def<u32>) -> Result<&'me Def<InstanceDef>> {
-        match self.state.get_instance_def(idx) {
-            Some(t) => Ok(t),
+    fn get_instance_type(&self, instance_idx: u32) -> Result<&InstanceType> {
+        match self.cur.state.instances.get(instance_idx as usize) {
+            Some(t) => Ok(self.types[*t].unwrap_instance()),
             None => self.create_error("unknown instance: instance index out of bounds"),
         }
     }
 
-    fn func_type_at<'me>(&'me self, type_index: Def<u32>) -> Result<Def<&'me FuncType>> {
+    fn func_type_at(&self, type_index: u32) -> Result<&FuncType> {
         let def = self.get_type(type_index)?;
-        match &def.item {
-            TypeDef::Func(item) => Ok(def.with(item)),
+        match def {
+            TypeDef::Func(item) => Ok(item),
             _ => self.create_error("type index is not a function"),
         }
     }
 
-    fn module_type_at<'me>(&'me self, type_index: Def<u32>) -> Result<Def<&'me ModuleType>> {
+    fn module_type_at(&self, type_index: u32) -> Result<&ModuleType> {
         if !self.features.module_linking {
             return self.create_error("module linking proposal not enabled");
         }
         let ty = self.get_type(type_index)?;
-        match &ty.item {
-            TypeDef::Module(item) => Ok(ty.with(item)),
+        match ty {
+            TypeDef::Module(item) => Ok(item),
             _ => self.create_error("type index is not a module"),
         }
     }
 
-    fn instance_type_at<'me>(&'me self, type_index: Def<u32>) -> Result<Def<&'me InstanceType>> {
+    fn instance_type_at(&self, type_index: u32) -> Result<&InstanceType> {
         if !self.features.module_linking {
             return self.create_error("module linking proposal not enabled");
         }
-        let def = self.get_type(type_index)?;
-        match &def.item {
-            TypeDef::Instance(item) => Ok(def.with(item)),
+        let ty = self.get_type(type_index)?;
+        match ty {
+            TypeDef::Instance(item) => Ok(item),
             _ => self.create_error("type index is not an instance"),
         }
     }
@@ -553,7 +556,7 @@
     pub fn type_section(&mut self, section: &crate::TypeSectionReader<'_>) -> Result<()> {
         let order = self.header_order(Order::Type);
         self.check_max(
-            self.state.types.len(),
+            self.cur.state.types.len(),
             section.get_count(),
             MAX_WASM_TYPES,
             "types",
@@ -577,49 +580,51 @@
                 if !self.features.module_linking {
                     return self.create_error("module linking proposal not enabled");
                 }
-                let imports = t
-                    .imports
-                    .iter()
-                    .map(|i| {
-                        self.import_entry_type(&i.ty)?;
-                        Ok((i.module.to_string(), i.field.map(|i| i.to_string()), i.ty))
-                    })
-                    .collect::<Result<_>>()?;
-                let mut names = HashSet::new();
-                let exports = t
-                    .exports
-                    .iter()
-                    .map(|e| {
-                        if !names.insert(e.name) {
-                            return self.create_error("duplicate export name");
-                        }
-                        self.import_entry_type(&e.ty)?;
-                        Ok((e.name.to_string(), e.ty))
-                    })
-                    .collect::<Result<_>>()?;
-                TypeDef::Module(ModuleType { imports, exports })
+                let mut imports = NameSet::default();
+                for i in t.imports.iter() {
+                    let ty = self.import_entry_type(&i.ty)?;
+                    imports.push(
+                        self.offset,
+                        i.module,
+                        i.field,
+                        ty,
+                        &mut self.types,
+                        "import",
+                    )?;
+                }
+
+                let mut exports = NameSet::default();
+                for e in t.exports.iter() {
+                    let ty = self.import_entry_type(&e.ty)?;
+                    exports.push(self.offset, e.name, None, ty, &mut self.types, "export")?;
+                }
+                TypeDef::Module(ModuleType {
+                    type_size: combine_type_sizes(
+                        self.offset,
+                        imports.type_size,
+                        exports.type_size,
+                    )?,
+                    imports: imports.set,
+                    exports: exports.set,
+                })
             }
             crate::TypeDef::Instance(t) => {
                 if !self.features.module_linking {
                     return self.create_error("module linking proposal not enabled");
                 }
-                let mut names = HashSet::new();
-                let exports = t
-                    .exports
-                    .iter()
-                    .map(|e| {
-                        if !names.insert(e.name) {
-                            return self.create_error("duplicate export name");
-                        }
-                        self.import_entry_type(&e.ty)?;
-                        Ok((e.name.to_string(), e.ty))
-                    })
-                    .collect::<Result<_>>()?;
-                TypeDef::Instance(InstanceType { exports })
+                let mut exports = NameSet::default();
+                for e in t.exports.iter() {
+                    let ty = self.import_entry_type(&e.ty)?;
+                    exports.push(self.offset, e.name, None, ty, &mut self.types, "export")?;
+                }
+                TypeDef::Instance(InstanceType {
+                    type_size: exports.type_size,
+                    exports: exports.set,
+                })
             }
         };
-        let def = ValidatedType::Def(def);
-        self.state.assert_mut().types.push(def);
+        self.cur.state.assert_mut().types.push(self.types.len());
+        self.types.push(def);
         Ok(())
     }
 
@@ -630,23 +635,41 @@
         }
     }
 
-    fn import_entry_type(&self, import_type: &ImportSectionEntryType) -> Result<()> {
+    fn import_entry_type(&self, import_type: &ImportSectionEntryType) -> Result<EntityType> {
         match import_type {
             ImportSectionEntryType::Function(type_index) => {
-                self.func_type_at(self.state.def(*type_index))?;
-                Ok(())
+                self.func_type_at(*type_index)?;
+                Ok(EntityType::Func(self.cur.state.types[*type_index as usize]))
+            }
+            ImportSectionEntryType::Table(t) => {
+                self.table_type(t)?;
+                Ok(EntityType::Table(t.clone()))
+            }
+            ImportSectionEntryType::Memory(t) => {
+                self.memory_type(t)?;
+                Ok(EntityType::Memory(t.clone()))
+            }
+            ImportSectionEntryType::Event(t) => {
+                self.event_type(t)?;
+                Ok(EntityType::Event(
+                    self.cur.state.types[t.type_index as usize],
+                ))
+            }
+            ImportSectionEntryType::Global(t) => {
+                self.global_type(t)?;
+                Ok(EntityType::Global(t.clone()))
             }
-            ImportSectionEntryType::Table(t) => self.table_type(t),
-            ImportSectionEntryType::Memory(t) => self.memory_type(t),
-            ImportSectionEntryType::Event(t) => self.event_type(t),
-            ImportSectionEntryType::Global(t) => self.global_type(t),
             ImportSectionEntryType::Module(type_index) => {
-                self.module_type_at(self.state.def(*type_index))?;
-                Ok(())
+                self.module_type_at(*type_index)?;
+                Ok(EntityType::Module(
+                    self.cur.state.types[*type_index as usize],
+                ))
             }
             ImportSectionEntryType::Instance(type_index) => {
-                self.instance_type_at(self.state.def(*type_index))?;
-                Ok(())
+                self.instance_type_at(*type_index)?;
+                Ok(EntityType::Instance(
+                    self.cur.state.types[*type_index as usize],
+                ))
             }
         }
     }
@@ -718,8 +741,8 @@
     }
 
     fn event_type(&self, ty: &EventType) -> Result<()> {
-        let def = self.func_type_at(self.state.def(ty.type_index))?;
-        if def.item.returns.len() > 0 {
+        let ty = self.func_type_at(ty.type_index)?;
+        if ty.returns.len() > 0 {
             return self.create_error("invalid result arity for exception type");
         }
         Ok(())
@@ -750,79 +773,113 @@
     /// Validates [`Payload::ImportSection`](crate::Payload)
     pub fn import_section(&mut self, section: &crate::ImportSectionReader<'_>) -> Result<()> {
         let order = self.header_order(Order::Import);
-        self.section(order, section, |me, item| me.import(item))
+        self.section(order, section, |me, item| me.import(item))?;
+
+        // Clear the list of implicit imports after the import section is
+        // finished since later import sections cannot append further to the
+        // pseudo-instances defined in this import section.
+        self.cur.state.assert_mut().imports.implicit.drain();
+        Ok(())
     }
 
     fn import(&mut self, entry: Import<'_>) -> Result<()> {
         if !self.features.module_linking && entry.field.is_none() {
             return self.create_error("module linking proposal is not enabled");
         }
-        self.import_entry_type(&entry.ty)?;
+        let ty = self.import_entry_type(&entry.ty)?;
+        let state = self.cur.state.assert_mut();
+
+        // Build up a map of what this module imports, for when this module is a
+        // nested module it'll be needed to infer the type signature of the
+        // nested module. Note that this does not happen unless the module
+        // linking proposal is enabled.
+        //
+        // This is a breaking change! This will disallow multiple imports that
+        // import from the same item twice. We can't turn module linking
+        // on-by-default as-is without some sort of recourse for consumers that
+        // want to backwards-compatibly parse older modules still. Unclear how
+        // to do this.
+        if self.features.module_linking {
+            let implicit_instance_type = state.imports.push(
+                self.offset,
+                entry.module,
+                entry.field,
+                ty,
+                &mut self.types,
+                "import",
+            )?;
+            if let Some(idx) = implicit_instance_type {
+                state.instances.push(idx);
+            }
+        }
         let (len, max, desc) = match entry.ty {
             ImportSectionEntryType::Function(type_index) => {
-                let def = self.state.def(type_index);
-                let state = self.state.assert_mut();
-                state.func_type_indices.push(def);
-                (state.func_type_indices.len(), MAX_WASM_FUNCTIONS, "funcs")
+                let ty = state.types[type_index as usize];
+                state.func_types.push(ty);
+                (state.func_types.len(), MAX_WASM_FUNCTIONS, "funcs")
             }
             ImportSectionEntryType::Table(ty) => {
-                let def = self.state.def(ty);
-                let state = self.state.assert_mut();
-                state.tables.push(def);
+                state.tables.push(ty);
                 (state.tables.len(), self.max_tables(), "tables")
             }
             ImportSectionEntryType::Memory(ty) => {
-                let state = self.state.assert_mut();
                 state.memories.push(ty);
                 (state.memories.len(), self.max_memories(), "memories")
             }
             ImportSectionEntryType::Event(ty) => {
-                let state = self.state.assert_mut();
+                let ty = state.types[ty.type_index as usize];
                 state.events.push(ty);
                 (state.events.len(), MAX_WASM_EVENTS, "events")
             }
             ImportSectionEntryType::Global(ty) => {
-                let def = self.state.def(ty);
-                let state = self.state.assert_mut();
-                state.globals.push(def);
+                state.globals.push(ty);
                 (state.globals.len(), MAX_WASM_GLOBALS, "globals")
             }
             ImportSectionEntryType::Instance(type_idx) => {
-                let def = self.state.def(InstanceDef::Imported { type_idx });
-                let state = self.state.assert_mut();
-                state.instance_type_indices.push(def);
-                (
-                    state.instance_type_indices.len(),
-                    MAX_WASM_INSTANCES,
-                    "instances",
-                )
+                let index = state.types[type_idx as usize];
+                state.instances.push(index);
+                (state.instances.len(), MAX_WASM_INSTANCES, "instances")
             }
             ImportSectionEntryType::Module(type_index) => {
-                let def = self.state.def(type_index);
-                let state = self.state.assert_mut();
-                state.module_type_indices.push(def);
-                (state.module_type_indices.len(), MAX_WASM_MODULES, "modules")
+                let index = state.types[type_index as usize];
+                state.submodules.push(index);
+                (state.submodules.len(), MAX_WASM_MODULES, "modules")
             }
         };
         self.check_max(len, 0, max, desc)?;
+        Ok(())
+    }
 
-        if let Some(ty) = self.expected_type {
-            let idx = self.expected_import_pos;
-            self.expected_import_pos += 1;
-            let module_ty = self.module_type_at(ty)?;
-            let equal = match module_ty.item.imports.get(idx) {
-                Some(import) => {
-                    self.imports_equal(self.state.def(entry), module_ty.with(to_import(import)))
-                }
-                None => false,
-            };
-            if !equal {
-                return self.create_error("inline module type does not match declared type");
-            }
+    /// Validates [`Payload::ModuleSectionStart`](crate::Payload)
+    pub fn module_section_start(&mut self, count: u32, range: &Range) -> Result<()> {
+        drop(count);
+        if !self.features.module_linking {
+            return self.create_error("module linking proposal not enabled");
         }
+        self.offset = range.start;
+        self.update_order(Order::ModuleLinkingHeader)?;
+        self.check_max(
+            self.cur.state.submodules.len(),
+            count,
+            MAX_WASM_MODULES,
+            "modules",
+        )?;
         Ok(())
     }
 
+    /// Validates [`Payload::ModuleSectionEntry`](crate::Payload).
+    ///
+    /// Note that this does not actually perform any validation itself. The
+    /// `ModuleSectionEntry` payload is associated with a sub-parser for the
+    /// sub-module, and it's expected that the events from the [`Parser`]
+    /// are fed into this validator.
+    pub fn module_section_entry(&mut self) {
+        // Start a new module...
+        let prev = mem::replace(&mut self.cur, Module::default());
+        // ... and record the current module as its parent.
+        self.parents.push(prev);
+    }
+
     /// Validates [`Payload::AliasSection`](crate::Payload)
     pub fn alias_section(&mut self, section: &crate::AliasSectionReader<'_>) -> Result<()> {
         if !self.features.module_linking {
@@ -832,113 +889,102 @@
     }
 
     fn alias(&mut self, alias: Alias) -> Result<()> {
-        match alias.instance {
-            AliasedInstance::Child(instance_idx) => {
-                let ty = self.get_instance_def(self.state.def(instance_idx))?;
-                let exports = match ty.item {
-                    InstanceDef::Imported { type_idx } => {
-                        let ty = self.instance_type_at(ty.with(type_idx))?;
-                        ty.map(|t| &t.exports)
-                    }
-                    InstanceDef::Instantiated { module_idx } => {
-                        let ty = self.get_module_type_index(ty.with(module_idx))?;
-                        let ty = self.module_type_at(ty)?;
-                        ty.map(|t| &t.exports)
-                    }
-                };
-                let export = match exports.item.get(alias.index as usize) {
+        match alias {
+            Alias::InstanceExport {
+                instance,
+                kind,
+                export,
+            } => {
+                let ty = self.get_instance_type(instance)?;
+                let export = match ty.exports.get(export) {
                     Some(e) => e,
                     None => {
-                        return self.create_error("aliased export index out of bounds");
+                        return self.create_error(format!(
+                            "aliased name `{}` does not exist in instance",
+                            export
+                        ));
                     }
                 };
-                match (export.1, alias.kind) {
-                    (ImportSectionEntryType::Function(ty), ExternalKind::Function) => {
-                        let def = exports.with(ty);
-                        self.state.assert_mut().func_type_indices.push(def);
-                    }
-                    (ImportSectionEntryType::Table(ty), ExternalKind::Table) => {
-                        let def = exports.with(ty);
-                        self.state.assert_mut().tables.push(def);
-                    }
-                    (ImportSectionEntryType::Memory(ty), ExternalKind::Memory) => {
-                        self.state.assert_mut().memories.push(ty);
-                    }
-                    (ImportSectionEntryType::Event(ty), ExternalKind::Event) => {
-                        self.state.assert_mut().events.push(ty);
-                    }
-                    (ImportSectionEntryType::Global(ty), ExternalKind::Global) => {
-                        let def = exports.with(ty);
-                        self.state.assert_mut().globals.push(def);
-                    }
-                    (ImportSectionEntryType::Instance(ty), ExternalKind::Instance) => {
-                        let def = exports.with(InstanceDef::Imported { type_idx: ty });
-                        self.state.assert_mut().instance_type_indices.push(def);
-                    }
-                    (ImportSectionEntryType::Module(ty), ExternalKind::Module) => {
-                        let def = exports.with(ty);
-                        self.state.assert_mut().module_type_indices.push(def);
+                match (export, kind) {
+                    (EntityType::Func(ty), ExternalKind::Function) => {
+                        let ty = *ty;
+                        self.cur.state.assert_mut().func_types.push(ty);
+                    }
+                    (EntityType::Table(ty), ExternalKind::Table) => {
+                        let ty = ty.clone();
+                        self.cur.state.assert_mut().tables.push(ty);
+                    }
+                    (EntityType::Memory(ty), ExternalKind::Memory) => {
+                        let ty = ty.clone();
+                        self.cur.state.assert_mut().memories.push(ty);
+                    }
+                    (EntityType::Event(ty), ExternalKind::Event) => {
+                        let ty = *ty;
+                        self.cur.state.assert_mut().events.push(ty);
+                    }
+                    (EntityType::Global(ty), ExternalKind::Global) => {
+                        let ty = ty.clone();
+                        self.cur.state.assert_mut().globals.push(ty);
+                    }
+                    (EntityType::Instance(ty), ExternalKind::Instance) => {
+                        let ty = *ty;
+                        self.cur.state.assert_mut().instances.push(ty);
+                    }
+                    (EntityType::Module(ty), ExternalKind::Module) => {
+                        let ty = *ty;
+                        self.cur.state.assert_mut().submodules.push(ty);
                     }
                     _ => return self.create_error("alias kind mismatch with export kind"),
                 }
             }
-            AliasedInstance::Parent => {
-                let idx = match self.state.depth.checked_sub(1) {
-                    None => return self.create_error("no parent module to alias from"),
-                    Some(depth) => Def {
-                        depth,
-                        item: alias.index,
-                    },
+            Alias::OuterType {
+                relative_depth,
+                index,
+            } => {
+                let i = self
+                    .parents
+                    .len()
+                    .checked_sub(relative_depth as usize)
+                    .and_then(|i| i.checked_sub(1))
+                    .ok_or_else(|| {
+                        BinaryReaderError::new("relative depth too large", self.offset)
+                    })?;
+                let ty = match self.parents[i].state.types.get(index as usize) {
+                    Some(m) => *m,
+                    None => return self.create_error("alias to type not defined in parent yet"),
                 };
-                match alias.kind {
-                    ExternalKind::Module => {
-                        let ty = self.get_module_type_index(idx)?;
-                        self.state.assert_mut().module_type_indices.push(ty);
-                    }
-                    ExternalKind::Type => {
-                        // make sure this type actually exists, then push it as
-                        // ourselve aliasing that type.
-                        self.get_type(idx)?;
-                        self.state
-                            .assert_mut()
-                            .types
-                            .push(ValidatedType::Alias(idx));
-                    }
-                    _ => return self.create_error("only parent types/modules can be aliased"),
-                }
+                self.cur.state.assert_mut().types.push(ty);
+            }
+            Alias::OuterModule {
+                relative_depth,
+                index,
+            } => {
+                let i = self
+                    .parents
+                    .len()
+                    .checked_sub(relative_depth as usize)
+                    .and_then(|i| i.checked_sub(1))
+                    .ok_or_else(|| {
+                        BinaryReaderError::new("relative depth too large", self.offset)
+                    })?;
+                let module = match self.parents[i].state.submodules.get(index as usize) {
+                    Some(m) => *m,
+                    None => return self.create_error("alias to module not defined in parent yet"),
+                };
+                self.cur.state.assert_mut().submodules.push(module);
             }
         }
 
         Ok(())
     }
 
-    /// Validates [`Payload::ModuleSection`](crate::Payload)
-    pub fn module_section(&mut self, section: &crate::ModuleSectionReader<'_>) -> Result<()> {
-        if !self.features.module_linking {
-            return self.create_error("module linking proposal not enabled");
-        }
-        self.check_max(
-            self.state.module_type_indices.len(),
-            section.get_count(),
-            MAX_WASM_MODULES,
-            "modules",
-        )?;
-        self.expected_modules = Some(section.get_count() + self.expected_modules.unwrap_or(0));
-        self.section(Order::ModuleLinkingHeader, section, |me, type_index| {
-            let type_index = me.state.def(type_index);
-            me.module_type_at(type_index)?;
-            me.state.assert_mut().module_type_indices.push(type_index);
-            Ok(())
-        })
-    }
-
     /// Validates [`Payload::InstanceSection`](crate::Payload)
     pub fn instance_section(&mut self, section: &crate::InstanceSectionReader<'_>) -> Result<()> {
         if !self.features.module_linking {
             return self.create_error("module linking proposal not enabled");
         }
         self.check_max(
-            self.state.instance_type_indices.len(),
+            self.cur.state.instances.len(),
             section.get_count(),
             MAX_WASM_INSTANCES,
             "instances",
@@ -950,227 +996,166 @@
         // Fetch the type of the instantiated module so we can typecheck all of
         // the import items.
         let module_idx = instance.module();
-        let module_ty = self.get_module_type_index(self.state.def(module_idx))?;
-        let ty = self.module_type_at(module_ty)?;
 
-        // Make sure the right number of imports are provided
-        let mut args = instance.args()?;
-        if args.get_count() as usize != ty.item.imports.len() {
-            return self.create_error("wrong number of imports provided");
-        }
-
-        // Now pairwise match each import against the expected type, making sure
-        // that the provided type is a subtype of the expected type.
-        for import_ty in ty.item.imports.iter() {
-            let (kind, index) = args.read()?;
-            let index = self.state.def(index);
-            let actual = match kind {
-                ExternalKind::Function => self
-                    .get_func_type_index(index)?
-                    .map(ImportSectionEntryType::Function),
-                ExternalKind::Table => self.get_table(index)?.map(ImportSectionEntryType::Table),
-                ExternalKind::Memory => self
-                    .state
-                    .def(ImportSectionEntryType::Memory(*self.get_memory(index)?)),
-                ExternalKind::Event => self
-                    .state
-                    .def(ImportSectionEntryType::Event(*self.get_event(index)?)),
-                ExternalKind::Global => self.get_global(index)?.map(ImportSectionEntryType::Global),
-                ExternalKind::Module => self
-                    .get_module_type_index(index)?
-                    .map(ImportSectionEntryType::Module),
-                ExternalKind::Instance => {
-                    let def = self.get_instance_def(index)?;
-                    match def.item {
-                        InstanceDef::Imported { type_idx } => {
-                            def.with(ImportSectionEntryType::Instance(type_idx))
-                        }
-                        InstanceDef::Instantiated { module_idx } => {
-                            let expected = match import_ty.2 {
-                                ImportSectionEntryType::Instance(idx) => ty.with(idx),
-                                _ => {
-                                    return self
-                                        .create_error("wrong kind of item used for instantiate")
-                                }
-                            };
-                            let expected = self.instance_type_at(expected)?;
-                            let module_idx = def.with(module_idx);
-                            let actual = self.get_module_type_index(module_idx)?;
-                            let actual = self.module_type_at(actual)?;
-                            self.check_export_sets_match(
-                                expected.map(|m| &*m.exports),
-                                actual.map(|m| &*m.exports),
-                            )?;
-                            continue;
-                        }
-                    }
-                }
-                ExternalKind::Type => return self.create_error("cannot export types"),
-            };
-            let item = actual.item;
-            self.check_imports_match(ty.with(&import_ty.2), actual.map(|_| &item))?;
-        }
-        args.ensure_end()?;
-
-        let def = self.state.def(InstanceDef::Instantiated { module_idx });
-        self.state.assert_mut().instance_type_indices.push(def);
+        // Build up the set of what we're providing as imports.
+        let mut set = NameSet::default();
+        for arg in instance.args()? {
+            let arg = arg?;
+            let ty = self.check_external_kind("instance argument", arg.kind, arg.index)?;
+            set.push(self.offset, arg.name, None, ty, &mut self.types, "arg")?;
+        }
+
+        // Check our provided `set` to ensure it's a subtype of the expected set
+        // of imports from the module's import types.
+        let ty = self.get_module_type(module_idx)?;
+        self.check_type_sets_match(&set.set, &ty.imports, "import")?;
+
+        // Create a synthetic type declaration for this instance's type and
+        // record its type in the global type list. We might not have another
+        // `TypeDef::Instance` to point to if the module was locally declared.
+        //
+        // Note that the predicted size of this type is inflated due to
+        // accounting for the imports on the original module, but that should be
+        // ok for now since it's only used to limit the size of larger types.
+        let instance_ty = InstanceType {
+            type_size: ty.type_size,
+            exports: ty.exports.clone(),
+        };
+        self.cur.state.assert_mut().instances.push(self.types.len());
+        self.types.push(TypeDef::Instance(instance_ty));
         Ok(())
     }
 
     // Note that this function is basically implementing
     // https://webassembly.github.io/spec/core/exec/modules.html#import-matching
-    fn check_imports_match(
-        &self,
-        expected: Def<&ImportSectionEntryType>,
-        actual: Def<&ImportSectionEntryType>,
-    ) -> Result<()> {
+    fn check_subtypes(&self, a: &EntityType, b: &EntityType) -> Result<()> {
         macro_rules! limits_match {
-            ($expected:expr, $actual:expr) => {{
-                let expected = $expected;
-                let actual = $actual;
-                actual.initial >= expected.initial
-                    && match expected.maximum {
-                        Some(expected_max) => match actual.maximum {
-                            Some(actual_max) => actual_max <= expected_max,
+            ($a:expr, $b:expr) => {{
+                let a = $a;
+                let b = $b;
+                a.initial >= b.initial
+                    && match b.maximum {
+                        Some(b_max) => match a.maximum {
+                            Some(a_max) => a_max <= b_max,
                             None => false,
                         },
                         None => true,
                     }
             }};
         }
-        match (expected.item, actual.item) {
-            (
-                ImportSectionEntryType::Function(expected_idx),
-                ImportSectionEntryType::Function(actual_idx),
-            ) => {
-                let expected = self.func_type_at(expected.map(|_| *expected_idx))?;
-                let actual = self.func_type_at(actual.map(|_| *actual_idx))?;
-                if actual.item == expected.item {
-                    return Ok(());
-                }
-                self.create_error("function provided for instantiation has wrong type")
-            }
-            (ImportSectionEntryType::Table(expected), ImportSectionEntryType::Table(actual)) => {
-                if expected.element_type == actual.element_type
-                    && limits_match!(&expected.limits, &actual.limits)
-                {
-                    return Ok(());
-                }
-                self.create_error("table provided for instantiation has wrong type")
-            }
-            (ImportSectionEntryType::Memory(expected), ImportSectionEntryType::Memory(actual)) => {
-                match (expected, actual) {
-                    (
-                        MemoryType::M32 {
-                            limits: a,
-                            shared: ash,
-                        },
-                        MemoryType::M32 {
-                            limits: b,
-                            shared: bsh,
-                        },
-                    ) => {
-                        if limits_match!(a, b) && ash == bsh {
-                            return Ok(());
-                        }
-                    }
-                    (
-                        MemoryType::M64 {
-                            limits: a,
-                            shared: ash,
-                        },
-                        MemoryType::M64 {
-                            limits: b,
-                            shared: bsh,
-                        },
-                    ) => {
-                        if limits_match!(a, b) && ash == bsh {
-                            return Ok(());
-                        }
-                    }
-                    _ => {}
+        match a {
+            EntityType::Global(a) => {
+                let b = match b {
+                    EntityType::Global(b) => b,
+                    _ => return self.create_error("item type mismatch"),
+                };
+                if a == b {
+                    Ok(())
+                } else {
+                    self.create_error("global type mismatch")
+                }
+            }
+            EntityType::Table(a) => {
+                let b = match b {
+                    EntityType::Table(b) => b,
+                    _ => return self.create_error("item type mismatch"),
+                };
+                if a.element_type == b.element_type && limits_match!(&a.limits, &b.limits) {
+                    Ok(())
+                } else {
+                    self.create_error("table type mismatch")
+                }
+            }
+            EntityType::Func(a) => {
+                let b = match b {
+                    EntityType::Func(b) => b,
+                    _ => return self.create_error("item type mismatch"),
+                };
+                if self.types[*a].unwrap_func() == self.types[*b].unwrap_func() {
+                    Ok(())
+                } else {
+                    self.create_error("func type mismatch")
+                }
+            }
+            EntityType::Event(a) => {
+                let b = match b {
+                    EntityType::Event(b) => b,
+                    _ => return self.create_error("item type mismatch"),
+                };
+                if self.types[*a].unwrap_func() == self.types[*b].unwrap_func() {
+                    Ok(())
+                } else {
+                    self.create_error("event type mismatch")
+                }
+            }
+            EntityType::Memory(MemoryType::M32 { limits, shared }) => {
+                let (b_limits, b_shared) = match b {
+                    EntityType::Memory(MemoryType::M32 { limits, shared }) => (limits, shared),
+                    _ => return self.create_error("item type mismatch"),
+                };
+                if limits_match!(limits, b_limits) && shared == b_shared {
+                    Ok(())
+                } else {
+                    self.create_error("memory type mismatch")
+                }
+            }
+            EntityType::Memory(MemoryType::M64 { limits, shared }) => {
+                let (b_limits, b_shared) = match b {
+                    EntityType::Memory(MemoryType::M64 { limits, shared }) => (limits, shared),
+                    _ => return self.create_error("item type mismatch"),
+                };
+                if limits_match!(limits, b_limits) && shared == b_shared {
+                    Ok(())
+                } else {
+                    self.create_error("memory type mismatch")
                 }
-                self.create_error("memory provided for instantiation has wrong type")
             }
-            (ImportSectionEntryType::Event(et), ImportSectionEntryType::Event(at)) => {
-                let expected = self.func_type_at(expected.map(|_| et.type_index))?;
-                let actual = self.func_type_at(actual.map(|_| at.type_index))?;
-                if actual.item == expected.item {
-                    return Ok(());
-                }
-                self.create_error("event provided for instantiation has wrong type")
-            }
-            (ImportSectionEntryType::Global(expected), ImportSectionEntryType::Global(actual)) => {
-                if expected == actual {
-                    return Ok(());
-                }
-                self.create_error("global provided for instantiation has wrong type")
-            }
-            (
-                ImportSectionEntryType::Instance(expected_idx),
-                ImportSectionEntryType::Instance(actual_idx),
-            ) => {
-                let expected = self.instance_type_at(expected.map(|_| *expected_idx))?;
-                let actual = self.instance_type_at(actual.map(|_| *actual_idx))?;
-                self.check_export_sets_match(
-                    expected.map(|i| &*i.exports),
-                    actual.map(|i| &*i.exports),
-                )?;
+            EntityType::Instance(a) => {
+                let b = match b {
+                    EntityType::Instance(b) => b,
+                    _ => return self.create_error("item type mismatch"),
+                };
+                let a = self.types[*a].unwrap_instance();
+                let b = self.types[*b].unwrap_instance();
+                self.check_type_sets_match(&a.exports, &b.exports, "export")?;
                 Ok(())
             }
-            (
-                ImportSectionEntryType::Module(expected_idx),
-                ImportSectionEntryType::Module(actual_idx),
-            ) => {
-                let expected = self.module_type_at(expected.map(|_| *expected_idx))?;
-                let actual = self.module_type_at(actual.map(|_| *actual_idx))?;
-                if expected.item.imports.len() != actual.item.imports.len() {
-                    return self.create_error("mismatched number of module imports");
-                }
-                for (a, b) in expected.item.imports.iter().zip(actual.item.imports.iter()) {
-                    self.check_imports_match(expected.map(|_| &a.2), actual.map(|_| &b.2))?;
-                }
-                self.check_export_sets_match(
-                    expected.map(|i| &*i.exports),
-                    actual.map(|i| &*i.exports),
-                )?;
+            EntityType::Module(a) => {
+                let b = match b {
+                    EntityType::Module(b) => b,
+                    _ => return self.create_error("item type mismatch"),
+                };
+                let a = self.types[*a].unwrap_module();
+                let b = self.types[*b].unwrap_module();
+                // Note the order changing between imports and exports! This is
+                // a live demonstration of variance in action.
+                self.check_type_sets_match(&b.imports, &a.imports, "import")?;
+                self.check_type_sets_match(&a.exports, &b.exports, "export")?;
                 Ok(())
             }
-            _ => self.create_error("wrong kind of item used for instantiate"),
         }
     }
 
-    fn check_export_sets_match(
+    fn check_type_sets_match(
         &self,
-        expected: Def<&[(String, ImportSectionEntryType)]>,
-        actual: Def<&[(String, ImportSectionEntryType)]>,
+        a: &HashMap<String, EntityType>,
+        b: &HashMap<String, EntityType>,
+        desc: &str,
     ) -> Result<()> {
-        let name_to_idx = actual
-            .item
-            .iter()
-            .enumerate()
-            .map(|(i, e)| (&e.0, i))
-            .collect::<HashMap<_, _>>();
-        for expected_export in expected.item {
-            let idx = match name_to_idx.get(&expected_export.0) {
-                Some(i) => *i,
-                None => {
-                    return self.create_error(&format!("no export named `{}`", expected_export.0))
-                }
-            };
-            self.check_imports_match(
-                expected.map(|_| &expected_export.1),
-                actual.map(|_| &actual.item[idx].1),
-            )?;
+        for (name, b) in b {
+            match a.get(name) {
+                Some(a) => self.check_subtypes(a, b)?,
+                None => return self.create_error(&format!("no {} named `{}`", desc, name)),
+            }
         }
         Ok(())
     }
 
     /// Validates [`Payload::FunctionSection`](crate::Payload)
     pub fn function_section(&mut self, section: &crate::FunctionSectionReader<'_>) -> Result<()> {
-        self.expected_code_bodies = Some(section.get_count());
+        self.cur.expected_code_bodies = Some(section.get_count());
         self.check_max(
-            self.state.func_type_indices.len(),
+            self.cur.state.func_types.len(),
             section.get_count(),
             MAX_WASM_FUNCTIONS,
             "funcs",
@@ -1178,9 +1163,10 @@
         // Assert that each type index is indeed a function type, and otherwise
         // just push it for handling later.
         self.section(Order::Function, section, |me, i| {
-            let type_index = me.state.def(i);
-            me.func_type_at(type_index)?;
-            me.state.assert_mut().func_type_indices.push(type_index);
+            me.func_type_at(i)?;
+            let state = me.cur.state.assert_mut();
+            state.func_types.push(state.types[i as usize]);
+            state.code_type_indexes.push(i);
             Ok(())
         })
     }
@@ -1196,15 +1182,14 @@
     /// Validates [`Payload::TableSection`](crate::Payload)
     pub fn table_section(&mut self, section: &crate::TableSectionReader<'_>) -> Result<()> {
         self.check_max(
-            self.state.tables.len(),
+            self.cur.state.tables.len(),
             section.get_count(),
             self.max_tables(),
             "tables",
         )?;
         self.section(Order::Table, section, |me, ty| {
             me.table_type(&ty)?;
-            let def = me.state.def(ty);
-            me.state.assert_mut().tables.push(def);
+            me.cur.state.assert_mut().tables.push(ty);
             Ok(())
         })
     }
@@ -1219,28 +1204,29 @@
 
     pub fn memory_section(&mut self, section: &crate::MemorySectionReader<'_>) -> Result<()> {
         self.check_max(
-            self.state.memories.len(),
+            self.cur.state.memories.len(),
             section.get_count(),
             self.max_memories(),
             "memories",
         )?;
         self.section(Order::Memory, section, |me, ty| {
             me.memory_type(&ty)?;
-            me.state.assert_mut().memories.push(ty);
+            me.cur.state.assert_mut().memories.push(ty);
             Ok(())
         })
     }
 
     pub fn event_section(&mut self, section: &crate::EventSectionReader<'_>) -> Result<()> {
         self.check_max(
-            self.state.events.len(),
+            self.cur.state.events.len(),
             section.get_count(),
             MAX_WASM_EVENTS,
             "events",
         )?;
         self.section(Order::Event, section, |me, ty| {
             me.event_type(&ty)?;
-            me.state.assert_mut().events.push(ty);
+            let state = me.cur.state.assert_mut();
+            state.events.push(state.types[ty.type_index as usize]);
             Ok(())
         })
     }
@@ -1248,7 +1234,7 @@
     /// Validates [`Payload::GlobalSection`](crate::Payload)
     pub fn global_section(&mut self, section: &crate::GlobalSectionReader<'_>) -> Result<()> {
         self.check_max(
-            self.state.globals.len(),
+            self.cur.state.globals.len(),
             section.get_count(),
             MAX_WASM_GLOBALS,
             "globals",
@@ -1256,8 +1242,7 @@
         self.section(Order::Global, section, |me, g| {
             me.global_type(&g.ty)?;
             me.init_expr(&g.init_expr, g.ty.content_type, false)?;
-            let def = me.state.def(g.ty);
-            me.state.assert_mut().globals.push(def);
+            me.cur.state.assert_mut().globals.push(g.ty);
             Ok(())
         })
     }
@@ -1270,6 +1255,7 @@
             None => return self.create_error("type mismatch: init_expr is empty"),
         };
         self.offset = offset;
+        let mut function_reference = None;
         let ty = match op {
             Operator::I32Const { .. } => Type::I32,
             Operator::I64Const { .. } => Type::I64,
@@ -1278,16 +1264,17 @@
             Operator::RefNull { ty } => ty,
             Operator::V128Const { .. } => Type::V128,
             Operator::GlobalGet { global_index } => {
-                self.get_global(self.state.def(global_index))?
-                    .item
-                    .content_type
+                let global = self.get_global(global_index)?;
+                if global.mutable {
+                    return self.create_error(
+                        "constant expression required: global.get of mutable global",
+                    );
+                }
+                global.content_type
             }
             Operator::RefFunc { function_index } => {
-                self.get_func_type_index(self.state.def(function_index))?;
-                self.state
-                    .assert_mut()
-                    .function_references
-                    .insert(function_index);
+                function_reference = Some(function_index);
+                self.get_func_type(function_index)?;
                 Type::FuncRef
             }
             Operator::End => return self.create_error("type mismatch: init_expr is empty"),
@@ -1302,6 +1289,14 @@
             }
         }
 
+        if let Some(index) = function_reference {
+            self.cur
+                .state
+                .assert_mut()
+                .function_references
+                .insert(index);
+        }
+
         // Make sure the next instruction is an `end`
         match ops.next() {
             Some(Err(e)) => return Err(e),
@@ -1325,181 +1320,81 @@
 
     /// Validates [`Payload::ExportSection`](crate::Payload)
     pub fn export_section(&mut self, section: &crate::ExportSectionReader<'_>) -> Result<()> {
-        let mut exported_names = HashSet::new();
         self.section(Order::Export, section, |me, e| {
-            if !exported_names.insert(e.field.to_string()) {
-                return me.create_error("duplicate export name");
-            }
             if let ExternalKind::Type = e.kind {
                 return me.create_error("cannot export types");
             }
-            me.check_external_kind("exported", e.kind, e.index)?;
-            if !me.export_is_expected(e)? {
-                return me.create_error("inline module type does not match declared type");
-            }
+            let ty = me.check_external_kind("exported", e.kind, e.index)?;
+            let state = me.cur.state.assert_mut();
+            state
+                .exports
+                .push(me.offset, e.field, None, ty, &mut me.types, "export")?;
             Ok(())
         })
     }
 
-    fn check_external_kind(&mut self, desc: &str, kind: ExternalKind, index: u32) -> Result<()> {
-        let (ty, total) = match kind {
-            ExternalKind::Function => ("function", self.state.func_type_indices.len()),
-            ExternalKind::Table => ("table", self.state.tables.len()),
-            ExternalKind::Memory => ("memory", self.state.memories.len()),
-            ExternalKind::Event => ("event", self.state.events.len()),
-            ExternalKind::Global => ("global", self.state.globals.len()),
-            ExternalKind::Module => ("module", self.state.module_type_indices.len()),
-            ExternalKind::Instance => ("instance", self.state.instance_type_indices.len()),
-            ExternalKind::Type => return self.create_error("cannot export types"),
-        };
-        if index as usize >= total {
-            return self.create_error(&format!(
-                "unknown {ty} {index}: {desc} {ty} index out of bounds",
-                desc = desc,
-                index = index,
-                ty = ty,
-            ));
-        }
-        if let ExternalKind::Function = kind {
-            self.state.assert_mut().function_references.insert(index);
-        }
-        Ok(())
-    }
-
-    fn export_is_expected(&mut self, actual: Export<'_>) -> Result<bool> {
-        let expected_ty = match self.expected_type {
-            Some(ty) => ty,
-            None => return Ok(true),
-        };
-        let idx = self.expected_export_pos;
-        self.expected_export_pos += 1;
-        let module_ty = self.module_type_at(expected_ty)?;
-        let expected = match module_ty.item.exports.get(idx) {
-            Some(expected) => module_ty.with(to_export(expected)),
-            None => return Ok(false),
+    fn check_external_kind(
+        &mut self,
+        desc: &str,
+        kind: ExternalKind,
+        index: u32,
+    ) -> Result<EntityType> {
+        let check = |ty: &str, total: usize| {
+            if index as usize >= total {
+                self.create_error(&format!(
+                    "unknown {ty} {index}: {desc} {ty} index out of bounds",
+                    desc = desc,
+                    index = index,
+                    ty = ty,
+                ))
+            } else {
+                Ok(())
+            }
         };
-        let index = self.state.def(actual.index);
-        let ty = match actual.kind {
-            ExternalKind::Function => self
-                .get_func_type_index(index)?
-                .map(ImportSectionEntryType::Function),
-            ExternalKind::Table => self.get_table(index)?.map(ImportSectionEntryType::Table),
+        Ok(match kind {
+            ExternalKind::Function => {
+                check("function", self.cur.state.func_types.len())?;
+                self.cur
+                    .state
+                    .assert_mut()
+                    .function_references
+                    .insert(index);
+                EntityType::Func(self.cur.state.func_types[index as usize])
+            }
+            ExternalKind::Table => {
+                check("table", self.cur.state.tables.len())?;
+                EntityType::Table(self.cur.state.tables[index as usize].clone())
+            }
             ExternalKind::Memory => {
-                let mem = *self.get_memory(index)?;
-                let ty = ImportSectionEntryType::Memory(mem);
-                self.state.def(ty)
+                check("memory", self.cur.state.memories.len())?;
+                EntityType::Memory(self.cur.state.memories[index as usize].clone())
+            }
+            ExternalKind::Global => {
+                check("global", self.cur.state.globals.len())?;
+                EntityType::Global(self.cur.state.globals[index as usize].clone())
             }
             ExternalKind::Event => {
-                let exn = *self.get_event(index)?;
-                let ty = ImportSectionEntryType::Event(exn);
-                self.state.def(ty)
-            }
-            ExternalKind::Global => self.get_global(index)?.map(ImportSectionEntryType::Global),
-            ExternalKind::Module => self
-                .get_module_type_index(index)?
-                .map(ImportSectionEntryType::Module),
-            ExternalKind::Instance => {
-                let def = self.get_instance_def(index)?;
-                match def.item {
-                    InstanceDef::Imported { type_idx } => {
-                        def.with(ImportSectionEntryType::Instance(type_idx))
-                    }
-                    InstanceDef::Instantiated { module_idx } => {
-                        let a = self.get_module_type_index(def.with(module_idx))?;
-                        let a = self.module_type_at(a)?;
-                        let b = match expected.item.ty {
-                            ImportSectionEntryType::Instance(idx) => {
-                                self.instance_type_at(expected.with(idx))?
-                            }
-                            _ => return Ok(false),
-                        };
-                        return Ok(actual.field == expected.item.name
-                            && a.item.exports.len() == b.item.exports.len()
-                            && a.item
-                                .exports
-                                .iter()
-                                .map(to_export)
-                                .zip(b.item.exports.iter().map(to_export))
-                                .all(|(ae, be)| self.exports_equal(a.with(ae), b.with(be))));
-                    }
-                }
+                check("event", self.cur.state.events.len())?;
+                EntityType::Event(self.cur.state.events[index as usize])
             }
-            ExternalKind::Type => unreachable!(), // already validated to not exist
-        };
-        let actual = ty.map(|ty| ExportType {
-            name: actual.field,
-            ty,
-        });
-        Ok(self.exports_equal(actual, expected))
-    }
-
-    fn imports_equal(&self, a: Def<Import<'_>>, b: Def<Import<'_>>) -> bool {
-        a.item.module == b.item.module
-            && a.item.field == b.item.field
-            && self.import_ty_equal(a.with(&a.item.ty), b.with(&b.item.ty))
-    }
-
-    fn exports_equal(&self, a: Def<ExportType<'_>>, b: Def<ExportType<'_>>) -> bool {
-        a.item.name == b.item.name && self.import_ty_equal(a.with(&a.item.ty), b.with(&b.item.ty))
-    }
-
-    fn import_ty_equal(
-        &self,
-        a: Def<&ImportSectionEntryType>,
-        b: Def<&ImportSectionEntryType>,
-    ) -> bool {
-        match (a.item, b.item) {
-            (ImportSectionEntryType::Function(ai), ImportSectionEntryType::Function(bi)) => {
-                self.func_type_at(a.with(*ai)).unwrap().item
-                    == self.func_type_at(b.with(*bi)).unwrap().item
-            }
-            (ImportSectionEntryType::Table(a), ImportSectionEntryType::Table(b)) => a == b,
-            (ImportSectionEntryType::Memory(a), ImportSectionEntryType::Memory(b)) => a == b,
-            (ImportSectionEntryType::Event(at), ImportSectionEntryType::Event(bt)) => {
-                self.func_type_at(a.with(at.type_index)).unwrap().item
-                    == self.func_type_at(b.with(bt.type_index)).unwrap().item
-            }
-            (ImportSectionEntryType::Global(a), ImportSectionEntryType::Global(b)) => a == b,
-            (ImportSectionEntryType::Instance(ai), ImportSectionEntryType::Instance(bi)) => {
-                let a = self.instance_type_at(a.with(*ai)).unwrap();
-                let b = self.instance_type_at(b.with(*bi)).unwrap();
-                a.item.exports.len() == b.item.exports.len()
-                    && a.item
-                        .exports
-                        .iter()
-                        .map(to_export)
-                        .zip(b.item.exports.iter().map(to_export))
-                        .all(|(ae, be)| self.exports_equal(a.with(ae), b.with(be)))
-            }
-            (ImportSectionEntryType::Module(ai), ImportSectionEntryType::Module(bi)) => {
-                let a = self.module_type_at(a.with(*ai)).unwrap();
-                let b = self.module_type_at(b.with(*bi)).unwrap();
-                a.item.imports.len() == b.item.imports.len()
-                    && a.item
-                        .imports
-                        .iter()
-                        .map(to_import)
-                        .zip(b.item.imports.iter().map(to_import))
-                        .all(|(ai, bi)| self.imports_equal(a.with(ai), b.with(bi)))
-                    && a.item.exports.len() == b.item.exports.len()
-                    && a.item
-                        .exports
-                        .iter()
-                        .map(to_export)
-                        .zip(b.item.exports.iter().map(to_export))
-                        .all(|(ae, be)| self.exports_equal(a.with(ae), b.with(be)))
+            ExternalKind::Module => {
+                check("module", self.cur.state.submodules.len())?;
+                EntityType::Module(self.cur.state.submodules[index as usize])
             }
-            _ => false,
-        }
+            ExternalKind::Instance => {
+                check("instance", self.cur.state.instances.len())?;
+                EntityType::Instance(self.cur.state.instances[index as usize])
+            }
+            ExternalKind::Type => return self.create_error("cannot export types"),
+        })
     }
 
     /// Validates [`Payload::StartSection`](crate::Payload)
     pub fn start_section(&mut self, func: u32, range: &Range) -> Result<()> {
         self.offset = range.start;
         self.update_order(Order::Start)?;
-        let ty = self.get_func_type_index(self.state.def(func))?;
-        let ty = self.func_type_at(ty)?;
-        if !ty.item.params.is_empty() || !ty.item.returns.is_empty() {
+        let ty = self.get_func_type(func)?;
+        if !ty.params.is_empty() || !ty.returns.is_empty() {
             return self.create_error("invalid start function type");
         }
         Ok(())
@@ -1522,8 +1417,8 @@
                     table_index,
                     init_expr,
                 } => {
-                    let table = me.get_table(me.state.def(table_index))?;
-                    if e.ty != table.item.element_type {
+                    let table = me.get_table(table_index)?;
+                    if e.ty != table.element_type {
                         return me.create_error("element_type != table type");
                     }
                     me.init_expr(&init_expr, Type::I32, false)?;
@@ -1553,13 +1448,13 @@
                             return me
                                 .create_error("type mismatch: segment does not have funcref type");
                         }
-                        me.get_func_type_index(me.state.def(f))?;
-                        me.state.assert_mut().function_references.insert(f);
+                        me.get_func_type(f)?;
+                        me.cur.state.assert_mut().function_references.insert(f);
                     }
                 }
             }
 
-            me.state.assert_mut().element_types.push(e.ty);
+            me.cur.state.assert_mut().element_types.push(e.ty);
             Ok(())
         })
     }
@@ -1568,60 +1463,18 @@
     pub fn data_count_section(&mut self, count: u32, range: &Range) -> Result<()> {
         self.offset = range.start;
         self.update_order(Order::DataCount)?;
-        self.state.assert_mut().data_count = Some(count);
+        self.cur.state.assert_mut().data_count = Some(count);
         if count > MAX_WASM_DATA_SEGMENTS as u32 {
             return self.create_error("data count section specifies too many data segments");
         }
         Ok(())
     }
 
-    /// Validates [`Payload::ModuleCodeSectionStart`](crate::Payload)
-    pub fn module_code_section_start(&mut self, count: u32, range: &Range) -> Result<()> {
-        if !self.features.module_linking {
-            return self.create_error("module linking proposal not enabled");
-        }
-        self.offset = range.start;
-        self.update_order(Order::ModuleCode)?;
-        match self.expected_modules.take() {
-            Some(n) if n == count => {}
-            Some(_) => {
-                return self
-                    .create_error("module and module code section have inconsistent lengths");
-            }
-            None if count == 0 => {}
-            None => return self.create_error("module code section without module section"),
-        }
-        self.module_code_section_index = self.state.module_type_indices.len() - (count as usize);
-        Ok(())
-    }
-
-    /// Validates [`Payload::ModuleCodeSectionEntry`](crate::Payload).
-    ///
-    /// Note that this does not actually perform any validation itself. The
-    /// `ModuleCodeSectionEntry` payload is associated with a sub-parser for the
-    /// sub-module, and it's expected that the returned [`Validator`] will be
-    /// paired with the [`Parser`] otherwise used with the module.
-    ///
-    /// Note that the returned [`Validator`] should be used for the nested
-    /// module. It will correctly work with parent aliases as well as ensure the
-    /// type of the inline module matches the declared type. Using
-    /// [`Validator::new`] will result in incorrect validation.
-    pub fn module_code_section_entry<'a>(&mut self) -> Validator {
-        let mut ret = Validator::default();
-        ret.features = self.features.clone();
-        ret.expected_type = Some(self.state.module_type_indices[self.module_code_section_index]);
-        self.module_code_section_index += 1;
-        let state = ret.state.assert_mut();
-        state.parent = Some(self.state.arc().clone());
-        state.depth = self.state.depth + 1;
-        return ret;
-    }
-
     /// Validates [`Payload::CodeSectionStart`](crate::Payload).
     pub fn code_section_start(&mut self, count: u32, range: &Range) -> Result<()> {
         self.offset = range.start;
         self.update_order(Order::Code)?;
-        match self.expected_code_bodies.take() {
+        match self.cur.expected_code_bodies.take() {
             Some(n) if n == count => {}
             Some(_) => {
                 return self.create_error("function and code section have inconsistent lengths");
@@ -1631,7 +1484,15 @@
             None if count == 0 => {}
             None => return self.create_error("code section without function section"),
         }
-        self.code_section_index = self.state.func_type_indices.len() - (count as usize);
+
+        // Prepare our module's view into the global `types` array. This enables
+        // parallel function validation to accesss our built-so-far list off
+        // types. Note that all the `WasmModuleResources` methods rely on
+        // `all_types` being filled in, and this is the point at which they're
+        // filled in.
+        let types = self.types.commit();
+        self.cur.state.assert_mut().all_types = Some(Arc::new(types));
+
         Ok(())
     }
 
@@ -1649,24 +1510,26 @@
     /// another thread, for example, to offload actual processing of functions
     /// elsewhere.
     pub fn code_section_entry(&mut self) -> Result<FuncValidator<ValidatorResources>> {
-        let ty_index = self.state.func_type_indices[self.code_section_index];
-        self.code_section_index += 1;
-        let resources = ValidatorResources(self.state.arc().clone());
-        Ok(FuncValidator::new(ty_index.item, 0, resources, &self.features).unwrap())
+        let ty = self.cur.state.code_type_indexes[self.cur.code_section_index];
+        self.cur.code_section_index += 1;
+        let resources = ValidatorResources(self.cur.state.arc().clone());
+        Ok(FuncValidator::new(ty, 0, resources, &self.features).unwrap())
     }
 
     /// Validates [`Payload::DataSection`](crate::Payload).
     pub fn data_section(&mut self, section: &crate::DataSectionReader<'_>) -> Result<()> {
-        self.data_found = section.get_count();
+        self.cur.data_found = section.get_count();
         self.check_max(0, section.get_count(), MAX_WASM_DATA_SEGMENTS, "segments")?;
-        self.section(Order::Data, section, |me, d| {
+        let mut section = section.clone();
+        section.forbid_bulk_memory(!self.features.bulk_memory);
+        self.section(Order::Data, &section, |me, d| {
             match d.kind {
                 DataKind::Passive => {}
                 DataKind::Active {
                     memory_index,
                     init_expr,
                 } => {
-                    let ty = me.get_memory(me.state.def(memory_index))?.index_type();
+                    let ty = me.get_memory(memory_index)?.index_type();
                     let allow32 = ty == Type::I64;
                     me.init_expr(&init_expr, ty, allow32)?;
                 }
@@ -1685,34 +1548,58 @@
 
     /// Validates [`Payload::End`](crate::Payload).
     pub fn end(&mut self) -> Result<()> {
-        if let Some(data_count) = self.state.data_count {
-            if data_count != self.data_found {
+        // Ensure that the data count section, if any, was correct.
+        if let Some(data_count) = self.cur.state.data_count {
+            if data_count != self.cur.data_found {
                 return self.create_error("data count section and passive data mismatch");
             }
         }
-        if let Some(n) = self.expected_code_bodies.take() {
+        // Ensure that the function section, if nonzero, was paired with a code
+        // section with the appropriate length.
+        if let Some(n) = self.cur.expected_code_bodies.take() {
             if n > 0 {
                 return self.create_error("function and code sections have inconsistent lengths");
             }
         }
-        if let Some(n) = self.expected_modules.take() {
-            if n > 0 {
-                return self
-                    .create_error("module and module code sections have inconsistent lengths");
-            }
-        }
-        if let Some(t) = self.expected_type {
-            let ty = self.module_type_at(t)?;
-            if self.expected_import_pos != ty.item.imports.len()
-                || self.expected_export_pos != ty.item.exports.len()
-            {
-                return self.create_error("inline module type does not match declared type");
-            }
+
+        // Ensure that the effective type size of this module is of a bounded
+        // size. This is primarily here for the module linking proposal, and
+        // we'll record this in the module type below if we're part of a nested
+        // module.
+        let type_size = combine_type_sizes(
+            self.offset,
+            self.cur.state.imports.type_size,
+            self.cur.state.exports.type_size,
+        )?;
+
+        // If we have a parent then we're going to exit this module's context
+        // and resume where we left off in the parent. We inject a new type for
+        // our module we just validated in the parent's module index space, and
+        // then we reset our current state to the parent.
+        if let Some(mut parent) = self.parents.pop() {
+            let module_type = self.types.len();
+            self.types.push(TypeDef::Module(ModuleType {
+                type_size,
+                imports: self.cur.state.imports.set.clone(),
+                exports: self.cur.state.exports.set.clone(),
+            }));
+            parent.state.assert_mut().submodules.push(module_type);
+            self.cur = parent;
         }
         Ok(())
     }
 }
 
+fn combine_type_sizes(offset: usize, a: u32, b: u32) -> Result<u32> {
+    match a.checked_add(b) {
+        Some(sum) if sum < MAX_TYPE_SIZE => Ok(sum),
+        _ => Err(BinaryReaderError::new(
+            "effective type size too large".to_string(),
+            offset,
+        )),
+    }
+}
+
 impl WasmFeatures {
     pub(crate) fn check_value_type(&self, ty: Type) -> Result<(), &'static str> {
         match ty {
@@ -1743,87 +1630,6 @@
     }
 }
 
-impl ModuleState {
-    fn def<T>(&self, item: T) -> Def<T> {
-        Def {
-            depth: self.depth,
-            item,
-        }
-    }
-
-    fn get<'me, T>(
-        &'me self,
-        idx: Def<u32>,
-        get_list: impl FnOnce(&'me ModuleState) -> &'me [T],
-    ) -> Option<&'me T> {
-        let mut cur = self;
-        for _ in 0..(self.depth - idx.depth) {
-            cur = cur.parent.as_ref().unwrap();
-        }
-        get_list(cur).get(idx.item as usize)
-    }
-
-    fn get_type<'me>(&'me self, mut idx: Def<u32>) -> Option<Def<&'me TypeDef>> {
-        loop {
-            let def = self.get(idx, |v| &v.types)?;
-            match def {
-                ValidatedType::Def(item) => break Some(idx.with(item)),
-                ValidatedType::Alias(other) => idx = *other,
-            }
-        }
-    }
-
-    fn get_table<'me>(&'me self, idx: Def<u32>) -> Option<&'me Def<TableType>> {
-        self.get(idx, |v| &v.tables)
-    }
-
-    fn get_memory<'me>(&'me self, idx: Def<u32>) -> Option<&'me MemoryType> {
-        self.get(idx, |v| &v.memories)
-    }
-
-    fn get_event<'me>(&'me self, idx: Def<u32>) -> Option<&'me EventType> {
-        self.get(idx, |v| &v.events)
-    }
-
-    fn get_global<'me>(&'me self, idx: Def<u32>) -> Option<&'me Def<GlobalType>> {
-        self.get(idx, |v| &v.globals)
-    }
-
-    fn get_func_type_index<'me>(&'me self, idx: Def<u32>) -> Option<Def<u32>> {
-        Some(*self.get(idx, |v| &v.func_type_indices)?)
-    }
-
-    fn get_module_type_index<'me>(&'me self, idx: Def<u32>) -> Option<Def<u32>> {
-        Some(*self.get(idx, |v| &v.module_type_indices)?)
-    }
-
-    fn get_instance_def<'me>(&'me self, idx: Def<u32>) -> Option<&'me Def<InstanceDef>> {
-        self.get(idx, |v| &v.instance_type_indices)
-    }
-}
-
-#[derive(Copy, Clone)]
-struct Def<T> {
-    depth: usize,
-    item: T,
-}
-
-impl<T> Def<T> {
-    fn map<U>(self, map: impl FnOnce(T) -> U) -> Def<U> {
-        Def {
-            depth: self.depth,
-            item: map(self.item),
-        }
-    }
-
-    fn with<U>(&self, item: U) -> Def<U> {
-        Def {
-            depth: self.depth,
-            item: item,
-        }
-    }
-}
-
 /// The implementation of [`WasmModuleResources`] used by [`Validator`].
 pub struct ValidatorResources(Arc<ModuleState>);
 
@@ -1831,27 +1637,39 @@
     type FuncType = crate::FuncType;
 
     fn table_at(&self, at: u32) -> Option<TableType> {
-        self.0.get_table(self.0.def(at)).map(|t| t.item)
+        self.0.tables.get(at as usize).cloned()
     }
 
     fn memory_at(&self, at: u32) -> Option<MemoryType> {
-        self.0.get_memory(self.0.def(at)).copied()
+        self.0.memories.get(at as usize).cloned()
+    }
+
+    fn event_at(&self, at: u32) -> Option<&Self::FuncType> {
+        let types = self.0.all_types.as_ref().unwrap();
+        let i = *self.0.events.get(at as usize)?;
+        match &types[i] {
+            TypeDef::Func(f) => Some(f),
+            _ => None,
+        }
     }
 
     fn global_at(&self, at: u32) -> Option<GlobalType> {
-        self.0.get_global(self.0.def(at)).map(|t| t.item)
+        self.0.globals.get(at as usize).cloned()
     }
 
     fn func_type_at(&self, at: u32) -> Option<&Self::FuncType> {
-        match self.0.get_type(self.0.def(at))?.item {
+        let types = self.0.all_types.as_ref().unwrap();
+        let i = *self.0.types.get(at as usize)?;
+        match &types[i] {
             TypeDef::Func(f) => Some(f),
             _ => None,
         }
     }
 
     fn type_of_function(&self, at: u32) -> Option<&Self::FuncType> {
-        let ty = self.0.get_func_type_index(self.0.def(at))?;
-        match self.0.get_type(ty)?.item {
+        let types = self.0.all_types.as_ref().unwrap();
+        let i = *self.0.func_types.get(at as usize)?;
+        match &types[i] {
             TypeDef::Func(f) => Some(f),
             _ => None,
         }
@@ -1919,3 +1737,261 @@
         }
     }
 }
+
+/// This is a helper structure to create a map from names to types.
+///
+/// The main purpose of this structure is to handle the two-level imports found
+/// in wasm modules pre-module-linking. A two-level import is equivalent to a
+/// single-level import of an instance, and that mapping happens here.
+#[derive(Default)]
+struct NameSet {
+    set: HashMap<String, EntityType>,
+    implicit: HashSet<String>,
+    type_size: u32,
+}
+
+impl NameSet {
+    /// Pushes a new name into this typed set off names, internally handling the
+    /// mapping of two-level namespaces into a single-level namespace.
+    ///
+    /// * `offset` - the binary offset in the original wasm file of where to
+    ///   report errors about.
+    /// * `module` - the first-level name in the namespace
+    /// * `name` - the optional second-level namespace
+    /// * `ty` - the type of the item being pushed
+    /// * `types` - our global list of types
+    /// * `desc` - a human-readable description of the item being pushed, used
+    ///   for generating errors.
+    ///
+    /// Returns an error if the name was a duplicate. Returns `Ok(Some(idx))` if
+    /// this push was the first push to define an implicit instance with the
+    /// type `idx` into the global list of types. Returns `Ok(None)` otherwise.
+    fn push(
+        &mut self,
+        offset: usize,
+        module: &str,
+        name: Option<&str>,
+        ty: EntityType,
+        types: &mut SnapshotList<TypeDef>,
+        desc: &str,
+    ) -> Result<Option<usize>> {
+        self.type_size = combine_type_sizes(offset, self.type_size, ty.size(types))?;
+        let name = match name {
+            Some(name) => name,
+            // If the `name` is not provided then this is a module-linking style
+            // definition with only one level of a name rather than two. This
+            // means we can insert the `ty` into the set of imports directly,
+            // error-ing out on duplicates.
+            None => {
+                let prev = self.set.insert(module.to_string(), ty);
+                return if prev.is_some() {
+                    Err(BinaryReaderError::new(
+                        format!("duplicate {} name `{}` already defined", desc, module),
+                        offset,
+                    ))
+                } else {
+                    Ok(None)
+                };
+            }
+        };
+        match self.set.get(module) {
+            // If `module` was previously defined and we implicitly defined it,
+            // then we know that it points to an instance type. We update the
+            // set of exports of the instance type here since we're adding a new
+            // entry. Note that nothing, at the point that we're building this
+            // set, should point to this instance type so it should be safe to
+            // mutate.
+            Some(instance) if self.implicit.contains(module) => {
+                let instance = match instance {
+                    EntityType::Instance(i) => match &mut types[*i] {
+                        TypeDef::Instance(i) => i,
+                        _ => unreachable!(),
+                    },
+                    _ => unreachable!(),
+                };
+                let prev = instance.exports.insert(name.to_string(), ty);
+                if prev.is_some() {
+                    return Err(BinaryReaderError::new(
+                        format!(
+                            "duplicate {} name `{}::{}` already defined",
+                            desc, module, name
+                        ),
+                        offset,
+                    ));
+                }
+                Ok(None)
+            }
+
+            // Otherwise `module` was previously defined, but it *wasn't*
+            // implicitly defined through a two level import (rather was
+            // explicitly defined with a single-level import), then that's an
+            // error.
+            Some(_) => {
+                return Err(BinaryReaderError::new(
+                    format!("cannot define the {} `{}` twice", desc, module),
+                    offset,
+                ))
+            }
+
+            // And finally if `module` wasn't already defined then we go ahead
+            // and define it here as a instance type with a single export, our
+            // `name`.
+            None => {
+                let idx = types.len();
+                let mut instance = InstanceType::default();
+                instance.exports.insert(name.to_string(), ty);
+                types.push(TypeDef::Instance(instance));
+                assert!(self.implicit.insert(module.to_string()));
+                self.set
+                    .insert(module.to_string(), EntityType::Instance(idx));
+                Ok(Some(idx))
+            }
+        }
+    }
+}
+
+impl EntityType {
+    fn size(&self, list: &SnapshotList<TypeDef>) -> u32 {
+        let recursive_size = match self {
+            // Note that this function computes the size of the *type*, not the
+            // size of the value, so these "leaves" all count as 1
+            EntityType::Global(_) | EntityType::Memory(_) | EntityType::Table(_) => 1,
+
+            // These types have recursive sizes so we look up the size in the
+            // type tables.
+            EntityType::Func(i)
+            | EntityType::Module(i)
+            | EntityType::Instance(i)
+            | EntityType::Event(i) => match &list[*i] {
+                TypeDef::Func(f) => (f.params.len() + f.returns.len()) as u32,
+                TypeDef::Module(m) => m.type_size,
+                TypeDef::Instance(i) => i.type_size,
+            },
+        };
+        recursive_size.saturating_add(1)
+    }
+}
+
+/// This is a type which mirrors a subset of the `Vec<T>` API, but is intended
+/// to be able to be cheaply snapshotted and cloned.
+///
+/// When each module's code sections start we "commit" the current list of types
+/// in the global list of types. This means that the temporary `cur` vec here is
+/// pushed onto `snapshots` and wrapped up in an `Arc`. At that point we clone
+/// this entire list (which is then O(modules), not O(types in all modules)) and
+/// pass out as a context to each function validator.
+///
+/// Otherwise, though, this type behaves as if it were a large `Vec<T>`, but
+/// it's represented by lists of contiguous chunks.
+struct SnapshotList<T> {
+    // All previous snapshots, the "head" of the list that this type represents.
+    // The first entry in this pair is the starting index for all elements
+    // contained in the list, and the second element is the list itself. Note
+    // the `Arc` wrapper around sub-lists, which makes cloning time for this
+    // `SnapshotList` O(snapshots) rather than O(snapshots_total), which for
+    // us in this context means the number of modules, not types.
+    //
+    // Note that this list is sorted least-to-greatest in order of the index for
+    // binary searching.
+    snapshots: Vec<(usize, Arc<Vec<T>>)>,
+
+    // This is the total length of all lists in the `snapshots` array.
+    snapshots_total: usize,
+
+    // The current list of types for the current snapshot that are being built.
+    cur: Vec<T>,
+}
+
+impl<T> SnapshotList<T> {
+    /// Same as `<&[T]>::get`
+    fn get(&self, index: usize) -> Option<&T> {
+        // Check to see if this index falls on our local list
+        if index >= self.snapshots_total {
+            return self.cur.get(index - self.snapshots_total);
+        }
+        // ... and failing that we do a binary search to figure out which bucket
+        // it's in. Note the `i-1` in the `Err` case because if we don't find an
+        // exact match the type is located in the previous bucket.
+        let i = match self.snapshots.binary_search_by_key(&index, |(i, _)| *i) {
+            Ok(i) => i,
+            Err(i) => i - 1,
+        };
+        let (len, list) = &self.snapshots[i];
+        Some(&list[index - len])
+    }
+
+    /// Same as `<&mut [T]>::get_mut`, except only works for indexes into the
+    /// current snapshot being built.
+    ///
+    /// # Panics
+    ///
+    /// Panics if an index is passed in which falls within the
+    /// previously-snapshotted list of types. This should never happen in our
+    /// contesxt and the panic is intended to weed out possible bugs in
+    /// wasmparser.
+    fn get_mut(&mut self, index: usize) -> Option<&mut T> {
+        if index >= self.snapshots_total {
+            return self.cur.get_mut(index - self.snapshots_total);
+        }
+        panic!("cannot get a mutable reference in snapshotted part of list")
+    }
+
+    /// Same as `Vec::push`
+    fn push(&mut self, val: T) {
+        self.cur.push(val);
+    }
+
+    /// Same as `<[T]>::len`
+    fn len(&self) -> usize {
+        self.cur.len() + self.snapshots_total
+    }
+
+    /// Commits previously pushed types into this snapshot vector, and returns a
+    /// clone of this list.
+    ///
+    /// The returned `SnapshotList` can be used to access all the same types as
+    /// this list itself. This list also is not changed (from an external
+    /// perspective) and can continue to access all the same types.
+    fn commit(&mut self) -> SnapshotList<T> {
+        // If the current chunk has new elements, commit them in to an
+        // `Arc`-wrapped vector in the snapshots list. Note the `shrink_to_fit`
+        // ahead of time to hopefully keep memory usage lower than it would
+        // otherwise be.
+        let len = self.cur.len();
+        if len > 0 {
+            self.cur.shrink_to_fit();
+            self.snapshots
+                .push((self.snapshots_total, Arc::new(mem::take(&mut self.cur))));
+            self.snapshots_total += len;
+        }
+        SnapshotList {
+            snapshots: self.snapshots.clone(),
+            snapshots_total: self.snapshots_total,
+            cur: Vec::new(),
+        }
+    }
+}
+
+impl<T> std::ops::Index<usize> for SnapshotList<T> {
+    type Output = T;
+
+    fn index(&self, index: usize) -> &T {
+        self.get(index).unwrap()
+    }
+}
+
+impl<T> std::ops::IndexMut<usize> for SnapshotList<T> {
+    fn index_mut(&mut self, index: usize) -> &mut T {
+        self.get_mut(index).unwrap()
+    }
+}
+
+impl<T> Default for SnapshotList<T> {
+    fn default() -> SnapshotList<T> {
+        SnapshotList {
+            snapshots: Vec::new(),
+            snapshots_total: 0,
+            cur: Vec::new(),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/benches/benchmark.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/benches/benchmark.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/benches/benchmark.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/benches/benchmark.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,231 +0,0 @@
-#[macro_use]
-extern crate criterion;
-
-use anyhow::Result;
-use criterion::Criterion;
-use std::fs;
-use std::path::Path;
-use std::path::PathBuf;
-use wasmparser::{DataKind, ElementKind, Parser, Payload, Validator};
-
-/// A benchmark input.
-pub struct BenchmarkInput {
-    /// The path to the benchmark file important for handling errors.
-    pub path: PathBuf,
-    /// The encoded Wasm module that is run by the benchmark.
-    pub wasm: Vec<u8>,
-}
-
-impl BenchmarkInput {
-    /// Creates a new benchmark input.
-    pub fn new(test_path: PathBuf, encoded_wasm: Vec<u8>) -> Self {
-        Self {
-            path: test_path,
-            wasm: encoded_wasm,
-        }
-    }
-}
-
-/// Returns a vector of all found benchmark input files under the given directory.
-///
-/// Benchmark input files can be `.wat` or `.wast` formatted files.
-/// For `.wast` files we pull out all the module directives and run them in the benchmarks.
-fn collect_test_files(path: &Path, list: &mut Vec<BenchmarkInput>) -> Result<()> {
-    for entry in path.read_dir()? {
-        let entry = entry?;
-        let path = entry.path();
-        if path.is_dir() {
-            collect_test_files(&path, list)?;
-            continue;
-        }
-        match path.extension().and_then(|ext| ext.to_str()) {
-            Some("wasm") => {
-                let wasm = fs::read(&path)?;
-                list.push(BenchmarkInput::new(path, wasm));
-            }
-            Some("wat") | Some("txt") => {
-                if let Ok(wasm) = wat::parse_file(&path) {
-                    list.push(BenchmarkInput::new(path, wasm));
-                }
-            }
-            Some("wast") => {
-                let contents = fs::read_to_string(&path)?;
-                let buf = match wast::parser::ParseBuffer::new(&contents) {
-                    Ok(buf) => buf,
-                    Err(_) => continue,
-                };
-                let wast: wast::Wast<'_> = match wast::parser::parse(&buf) {
-                    Ok(wast) => wast,
-                    Err(_) => continue,
-                };
-                for directive in wast.directives {
-                    match directive {
-                        wast::WastDirective::Module(mut module) => {
-                            let wasm = module.encode()?;
-                            list.push(BenchmarkInput::new(path.clone(), wasm));
-                        }
-                        _ => continue,
-                    }
-                }
-            }
-            _ => (),
-        }
-    }
-    Ok(())
-}
-
-/// Reads the input given the Wasm parser or validator.
-///
-/// The `path` specifies which benchmark input file we are currently operating on
-/// so that we can report better errors in case of failures.
-fn read_all_wasm(wasm: &[u8]) -> Result<()> {
-    use Payload::*;
-    for item in Parser::new(0).parse_all(wasm) {
-        match item? {
-            TypeSection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
-            ImportSection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
-            AliasSection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
-            InstanceSection(s) => {
-                for item in s {
-                    for arg in item?.args()? {
-                        arg?;
-                    }
-                }
-            }
-            ModuleSection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
-            FunctionSection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
-            TableSection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
-            MemorySection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
-            GlobalSection(s) => {
-                for item in s {
-                    for op in item?.init_expr.get_operators_reader() {
-                        op?;
-                    }
-                }
-            }
-            ExportSection(s) => {
-                for item in s {
-                    item?;
-                }
-            }
-            ElementSection(s) => {
-                for item in s {
-                    let item = item?;
-                    if let ElementKind::Active { init_expr, .. } = item.kind {
-                        for op in init_expr.get_operators_reader() {
-                            op?;
-                        }
-                    }
-                    for op in item.items.get_items_reader()? {
-                        op?;
-                    }
-                }
-            }
-            DataSection(s) => {
-                for item in s {
-                    let item = item?;
-                    if let DataKind::Active { init_expr, .. } = item.kind {
-                        for op in init_expr.get_operators_reader() {
-                            op?;
-                        }
-                    }
-                }
-            }
-            CodeSectionEntry(body) => {
-                for local in body.get_locals_reader()? {
-                    local?;
-                }
-                for op in body.get_operators_reader()? {
-                    op?;
-                }
-            }
-
-            Version { .. }
-            | StartSection { .. }
-            | DataCountSection { .. }
-            | UnknownSection { .. }
-            | CustomSection { .. }
-            | CodeSectionStart { .. }
-            | ModuleCodeSectionStart { .. }
-            | ModuleCodeSectionEntry { .. }
-            | End => {}
-        }
-    }
-    Ok(())
-}
-
-/// Returns the default benchmark inputs that are proper `wasmparser` benchmark
-/// test inputs.
-fn collect_benchmark_inputs() -> Vec<BenchmarkInput> {
-    let mut ret = Vec::new();
-    collect_test_files("../../tests".as_ref(), &mut ret).unwrap();
-    return ret;
-}
-
-fn it_works_benchmark(c: &mut Criterion) {
-    let mut inputs = collect_benchmark_inputs();
-    // Filter out all benchmark inputs that fail to parse via `wasmparser`.
-    inputs.retain(|input| read_all_wasm(input.wasm.as_slice()).is_ok());
-    c.bench_function("it works benchmark", move |b| {
-        b.iter(|| {
-            for input in &mut inputs {
-                read_all_wasm(input.wasm.as_slice()).unwrap();
-            }
-        })
-    });
-}
-
-fn validate_benchmark(c: &mut Criterion) {
-    fn validator() -> Validator {
-        let mut ret = Validator::new();
-        ret.wasm_reference_types(true)
-            .wasm_multi_value(true)
-            .wasm_simd(true)
-            .wasm_module_linking(true)
-            .wasm_bulk_memory(true)
-            .wasm_threads(true)
-            .wasm_tail_call(true);
-        return ret;
-    }
-    let mut inputs = collect_benchmark_inputs();
-    // Filter out all benchmark inputs that fail to validate via `wasmparser`.
-    inputs.retain(|input| validator().validate_all(&input.wasm).is_ok());
-    c.bench_function("validate benchmark", move |b| {
-        b.iter(|| {
-            for input in &mut inputs {
-                validator().validate_all(&input.wasm).unwrap();
-            }
-        })
-    });
-}
-
-criterion_group!(benchmark, it_works_benchmark, validate_benchmark);
-criterion_main!(benchmark);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.lock":"097d8d38fce861128185d43320f25aacc4f306c7a273427f0cc53460d2985c64","Cargo.toml":"38db996a0283398e7353969aa161779c7bd8160c8ced694497b12977b5983c95","README.md":"2e252886759b5ee5137ec39efc0765850be2cb4242c68e6b44452b75d3191db3","benches/benchmark.rs":"fd8556367534c5aa04960dc8c053dd50e531d2fbe6234b811d5e3ae95649e463","compare-with-main.sh":"2ddfab71ba571055292a29a36c1ede05f64ba094c78495b945d1486bf32ab6d7","examples/simple.rs":"606072a46c5c80df29da3ecd98a989feb1289243550033cd3c3e1df6045ce8ce","src/binary_reader.rs":"b99ceb7182a2581e8834a9a6a7f351bdf0e0f9fbbbcdc4af3bfb9c506c3fc219","src/lib.rs":"414ed00613d315875c0e84750fa0086a1a67e776a9f40637f547bf99f1cc7f0f","src/limits.rs":"76226dcbb57180a399d1e5dfaed0b2516728ab09d91852e3f9aa3adebf06b3b7","src/module_resources.rs":"3a2137adb9018a5d5ebcaf274f969e650e184f77e5db62cd9b655cc6e97fdee1","src/operators_validator.rs":"5fb8f7611f5bf3115016ae81cc4e1e1e0ac4605725df0c9131f0c5d5d1a9514f","src/parser.rs":"c05a92a04020e990635728101e3f7d6653ccdeb54f2ce3615fc6c058b344cd8e","src/primitives.rs":"f93340797ff49370c13a489dc34832771156bb38541b19cb56e371e9a2e099b2","src/readers/alias_section.rs":"ef6556c3e300549958010aba9f1a0f6852c80ceddc763b4c11463d97234488b3","src/readers/code_section.rs":"ab19a5ed2a72e85e8365a8f6915ebbc10ca07b72a097322c53c36fdfb13bd57c","src/readers/data_section.rs":"d919a22ebc44c53ca434df6c1d16efc8e126e7b55ed99691d5ae73c10bfadfff","src/readers/element_section.rs":"f168a3cb02439aeaa81621525e2747d3bc4743fac2237dcdf8658b67e010ca08","src/readers/export_section.rs":"3fe296f1789e789009a79115052194a1352d947f2a8830945d6b7d9983bb8579","src/readers/function_section.rs":"5467d7a375c22a4cc225819212e616f275ef01516f185b346eae2ffbb5c53cb3","src/readers/global_section.rs":"359450911ac662503f90288798baec2415df6d3b80990a7b75794683df7894b8","src/readers/import_section.rs":"80906451f78c64d31a76772d97c96d18d208eeabaaaf82372b0567a8991795c1","src/readers/init_expr.rs":"7020c80013dad4518a5f969c3ab4d624b46d778f03e632871cf343964f63441c","src/readers/instance_section.rs":"0f6cc9ed6bb6520493090eff5bbd6a9030ba1432206799b7dfed0b9285bafd73","src/readers/linking_section.rs":"db3091a48827a5b035e2f79f40f7ed9a7ea10acd4db6ab2bbd01e17a65a4265e","src/readers/memory_section.rs":"67d8457d3167b39fc9ae2c04f3c3e28bc10be97bbdaccd681675fb8d3eba2bd3","src/readers/mod.rs":"0fbaa4e1d7e3e68d8857fd8b3ce5c3fba886a1b460cd37398afcbf4802280b4e","src/readers/module_code_section.rs":"806eea527c84570ca6c5b8ca556f95727edae7da29e4f384b067113231b8e5f5","src/readers/module_section.rs":"6e28be8f1f4d2f1a9470ec356c46a76c2f21916143a1f0e245b96d2272d0301e","src/readers/name_section.rs":"60d4aa007cfdc16eedc1b4cb0bee560f6eebd82aaa81e9be9c844e515b16e445","src/readers/operators.rs":"3800f0321a776ddc5e8fb030828e4f2a65ebafa4b7f0808774384559ddfe49ea","src/readers/producers_section.rs":"77f93449e4bdcd61e4c79e47a685742f49cd5dac837ba002bce14120f14c9470","src/readers/reloc_section.rs":"e48e6acaa5145d6fbe1d74eb406ee59c43235faa47fbf0b07288504e60573a5e","src/readers/section_reader.rs":"e99763ce9c48994fd1e92f011a449936c4206a5c91d50fa580d003b6cc824ec5","src/readers/table_section.rs":"5d94185f68c4c7526a8836a2ebdb5b20fe754af58b68d2d0eb8fea62b7e6fe71","src/readers/type_section.rs":"87a54d238bf900aac0d0508e5c644d71b1e591df99367587feb68146a25a5a61","src/validator.rs":"8d401bdac4f8ecdd477a9fe5b979d82b49c4b988194a9a4f1253bafd15e36b11","src/validator/func.rs":"69508e0b0cfde783ca3635070496573b65a4b3ce9c39fe5afb0b6af19e346b2b"},"package":"a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/Cargo.lock	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,627 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "anyhow"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "bstr"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "cast"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
-dependencies = [
- "rustc_version",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "clap"
-version = "2.33.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
-dependencies = [
- "bitflags",
- "textwrap",
- "unicode-width",
-]
-
-[[package]]
-name = "criterion"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
-dependencies = [
- "atty",
- "cast",
- "clap",
- "criterion-plot",
- "csv",
- "itertools",
- "lazy_static",
- "num-traits",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_cbor",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
-dependencies = [
- "cast",
- "itertools",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "lazy_static",
- "maybe-uninit",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if",
- "lazy_static",
-]
-
-[[package]]
-name = "csv"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "either"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "half"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
-[[package]]
-name = "js-sys"
-version = "0.3.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4b9172132a62451e56142bff9afc91c8e4a4500aa5b847da36815b63bfda916"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
-
-[[package]]
-name = "log"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-
-[[package]]
-name = "memoffset"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "oorandom"
-version = "11.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c"
-
-[[package]]
-name = "plotters"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
-dependencies = [
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rayon"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
-dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-queue",
- "crossbeam-utils",
- "lazy_static",
- "num_cpus",
-]
-
-[[package]]
-name = "regex"
-version = "1.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "serde"
-version = "1.0.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
-
-[[package]]
-name = "serde_cbor"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
-dependencies = [
- "half",
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "walkdir"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-dependencies = [
- "same-file",
- "winapi",
- "winapi-util",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a634620115e4a229108b71bde263bb4220c483b3f07f5ba514ee8d15064c4c2"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcfd5ef6eec85623b4c6e844293d4516470d8f19cd72d0d12246017eb9060b8"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9adff9ee0e94b926ca81b57f57f86d5545cdcb1d259e21ec9bdd95b901754c75"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7b90ea6c632dd06fd765d44542e234d5e63d9bb917ecd64d79778a13bd79ae"
-
-[[package]]
-name = "wasmparser"
-version = "0.59.0"
-dependencies = [
- "anyhow",
- "criterion",
- "getopts",
- "rayon",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "863539788676619aac1a23e2df3655e96b32b0e05eb72ca34ba045ad573c625d"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "wasmparser"
-version = "0.59.0"
-authors = ["Yury Delendik <ydelendik@mozilla.com>"]
-description = "A simple event-driven library for parsing WebAssembly binary files.\n"
-homepage = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser"
-keywords = ["parser", "WebAssembly", "wasm"]
-license = "Apache-2.0 WITH LLVM-exception"
-repository = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser"
-
-[[bench]]
-name = "benchmark"
-harness = false
-[dev-dependencies.anyhow]
-version = "1.0"
-
-[dev-dependencies.criterion]
-version = "0.3"
-
-[dev-dependencies.getopts]
-version = "0.2"
-
-[dev-dependencies.rayon]
-version = "1.3"
-
-[features]
-deterministic = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/compare-with-main.sh thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/compare-with-main.sh
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/compare-with-main.sh	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/compare-with-main.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# switch to main branch and record its bench results
-git checkout main && \
-cargo bench --bench benchmark -- --noplot --save-baseline before
-
-# record current bench results
-git checkout - && \
-cargo bench --bench benchmark -- --noplot --baseline before
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/examples/simple.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/examples/simple.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/examples/simple.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/examples/simple.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-use anyhow::Result;
-use std::env;
-use wasmparser::{Parser, Payload};
-
-fn main() -> Result<()> {
-    let args = env::args().collect::<Vec<_>>();
-    if args.len() != 2 {
-        println!("Usage: {} in.wasm", args[0]);
-        return Ok(());
-    }
-
-    let buf: Vec<u8> = std::fs::read(&args[1])?;
-    for payload in Parser::new(0).parse_all(&buf) {
-        match payload? {
-            Payload::Version { .. } => {
-                println!("====== Module");
-            }
-            Payload::ExportSection(s) => {
-                for export in s {
-                    let export = export?;
-                    println!("  Export {} {:?}", export.field, export.kind);
-                }
-            }
-            Payload::ImportSection(s) => {
-                for import in s {
-                    let import = import?;
-                    println!("  Import {}::{}", import.module, import.field.unwrap());
-                }
-            }
-            _other => {
-                // println!("found payload {:?}", _other);
-            }
-        }
-    }
-
-    Ok(())
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/README.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-# The WebAssembly binary file decoder in Rust
-
-**A [Bytecode Alliance](https://bytecodealliance.org/) project**
-
-[![crates.io link](https://img.shields.io/crates/v/wasmparser.svg)](https://crates.io/crates/wasmparser)
-[![docs.rs docs](https://img.shields.io/static/v1?label=docs&message=wasmparser&color=blue&style=flat-square)](https://docs.rs/wasmparser/)
-
-The decoder library provides lightweight and fast decoding/parsing of WebAssembly binary files.
-
-The other goal is minimal memory footprint. For this reason, there is no AST or IR of WebAssembly data.
-
-See also its sibling at https://github.com/wasdk/wasmparser
-
-
-## Documentation
-
-The documentation and examples can be found at the https://docs.rs/wasmparser/
-
-
-## Example
-
-```rust
-use wasmparser::WasmDecoder;
-use wasmparser::Parser;
-use wasmparser::ParserState;
-
-fn get_name(bytes: &[u8]) -> &str {
-  str::from_utf8(bytes).ok().unwrap()
-}
-
-fn main() {
-  let ref buf: Vec<u8> = read_wasm_bytes();
-  let mut parser = Parser::new(buf);
-  loop {
-    let state = parser.read();
-    match *state {
-        ParserState::BeginWasm { .. } => {
-            println!("====== Module");
-        }
-        ParserState::ExportSectionEntry { field, ref kind, .. } => {
-            println!("  Export {} {:?}", get_name(field), kind);
-        }
-        ParserState::ImportSectionEntry { module, field, .. } => {
-            println!("  Import {}::{}", get_name(module), get_name(field))
-        }
-        ParserState::EndWasm => break,
-        _ => ( /* println!(" Other {:?}", state) */ )
-    }
-  }
-}
-```
-
-
-## Fuzzing
-
-To fuzz test wasmparser.rs, switch to a nightly Rust compiler and install [cargo-fuzz]:
-
-```
-cargo install cargo-fuzz
-```
-
-Then, from the root of the repository, run:
-
-```
-cargo fuzz run parse
-```
-
-If you want to use files as seeds for the fuzzer, add them to `fuzz/corpus/parse/` and restart cargo-fuzz.
-
-[cargo-fuzz]: https://github.com/rust-fuzz/cargo-fuzz
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/binary_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/binary_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/binary_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/binary_reader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1849 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use std::boxed::Box;
-use std::convert::TryInto;
-use std::str;
-use std::vec::Vec;
-
-use crate::limits::*;
-
-use crate::primitives::{
-    BinaryReaderError, BrTable, CustomSectionKind, ExternalKind, FuncType, GlobalType, Ieee32,
-    Ieee64, LinkingType, MemoryImmediate, MemoryType, NameType, Operator, RelocType,
-    ResizableLimits, Result, SIMDLaneIndex, SectionCode, TableType, Type, TypeOrFuncType, V128,
-};
-use crate::{ExportType, Import, ImportSectionEntryType, InstanceType, ModuleType};
-
-const MAX_WASM_BR_TABLE_SIZE: usize = MAX_WASM_FUNCTION_SIZE;
-
-fn is_name(name: &str, expected: &'static str) -> bool {
-    name == expected
-}
-
-fn is_name_prefix(name: &str, prefix: &'static str) -> bool {
-    name.starts_with(prefix)
-}
-
-const WASM_MAGIC_NUMBER: &[u8; 4] = b"\0asm";
-const WASM_EXPERIMENTAL_VERSION: u32 = 0xd;
-const WASM_SUPPORTED_VERSION: u32 = 0x1;
-
-#[derive(Clone)]
-pub(crate) struct SectionHeader<'a> {
-    pub code: SectionCode<'a>,
-    pub payload_start: usize,
-    pub payload_len: usize,
-}
-
-/// Bytecode range in the WebAssembly module.
-#[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct Range {
-    /// The start bound of the range.
-    pub start: usize,
-    /// The end bound of the range.
-    pub end: usize,
-}
-
-impl Range {
-    /// Constructs a new instance of `Range`.
-    ///
-    /// # Panics
-    /// If `start` is greater than `end`.
-    pub fn new(start: usize, end: usize) -> Range {
-        assert!(start <= end);
-        Range { start, end }
-    }
-
-    /// Returns a new slice between `start` and `end - 1` from `data`.
-    pub fn slice<'a>(&self, data: &'a [u8]) -> &'a [u8] {
-        &data[self.start..self.end]
-    }
-}
-
-/// A binary reader of the WebAssembly structures and types.
-#[derive(Clone, Debug)]
-pub struct BinaryReader<'a> {
-    pub(crate) buffer: &'a [u8],
-    pub(crate) position: usize,
-    pub(crate) original_offset: usize,
-}
-
-impl<'a> BinaryReader<'a> {
-    /// Constructs `BinaryReader` type.
-    ///
-    /// # Examples
-    /// ```
-    /// let fn_body = &vec![0x41, 0x00, 0x10, 0x00, 0x0B];
-    /// let mut reader = wasmparser::BinaryReader::new(fn_body);
-    /// while !reader.eof() {
-    ///     let op = reader.read_operator();
-    ///     println!("{:?}", op)
-    /// }
-    /// ```
-    pub fn new(data: &[u8]) -> BinaryReader {
-        BinaryReader {
-            buffer: data,
-            position: 0,
-            original_offset: 0,
-        }
-    }
-
-    /// Constructs a `BinaryReader` with an explicit starting offset.
-    pub fn new_with_offset(data: &[u8], original_offset: usize) -> BinaryReader {
-        BinaryReader {
-            buffer: data,
-            position: 0,
-            original_offset,
-        }
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.original_offset + self.position
-    }
-
-    /// Returns a range from the starting offset to the end of the buffer.
-    pub fn range(&self) -> Range {
-        Range {
-            start: self.original_offset,
-            end: self.original_offset + self.buffer.len(),
-        }
-    }
-
-    pub(crate) fn remaining_buffer(&self) -> &'a [u8] {
-        &self.buffer[self.position..]
-    }
-
-    fn ensure_has_byte(&self) -> Result<()> {
-        if self.position < self.buffer.len() {
-            Ok(())
-        } else {
-            Err(BinaryReaderError::eof(self.original_position(), 1))
-        }
-    }
-
-    pub(crate) fn ensure_has_bytes(&self, len: usize) -> Result<()> {
-        if self.position + len <= self.buffer.len() {
-            Ok(())
-        } else {
-            let hint = self.position + len - self.buffer.len();
-            Err(BinaryReaderError::eof(self.original_position(), hint))
-        }
-    }
-
-    fn read_var_u1(&mut self) -> Result<u32> {
-        let b = self.read_u8()?;
-        if (b & 0xFE) != 0 {
-            return Err(BinaryReaderError::new(
-                "Invalid var_u1",
-                self.original_position() - 1,
-            ));
-        }
-        Ok(b)
-    }
-
-    fn read_var_i7(&mut self) -> Result<i32> {
-        let b = self.read_u8()?;
-        if (b & 0x80) != 0 {
-            return Err(BinaryReaderError::new(
-                "Invalid var_i7",
-                self.original_position() - 1,
-            ));
-        }
-        Ok((b << 25) as i32 >> 25)
-    }
-
-    pub(crate) fn read_var_u7(&mut self) -> Result<u32> {
-        let b = self.read_u8()?;
-        if (b & 0x80) != 0 {
-            return Err(BinaryReaderError::new(
-                "Invalid var_u7",
-                self.original_position() - 1,
-            ));
-        }
-        Ok(b)
-    }
-
-    pub fn read_type(&mut self) -> Result<Type> {
-        let code = self.read_var_i7()?;
-        match code {
-            -0x01 => Ok(Type::I32),
-            -0x02 => Ok(Type::I64),
-            -0x03 => Ok(Type::F32),
-            -0x04 => Ok(Type::F64),
-            -0x05 => Ok(Type::V128),
-            -0x10 => Ok(Type::FuncRef),
-            -0x11 => Ok(Type::ExternRef),
-            -0x20 => Ok(Type::Func),
-            -0x40 => Ok(Type::EmptyBlockType),
-            _ => Err(BinaryReaderError::new(
-                "Invalid type",
-                self.original_position() - 1,
-            )),
-        }
-    }
-
-    /// Read a `count` indicating the number of times to call `read_local_decl`.
-    pub fn read_local_count(&mut self) -> Result<usize> {
-        let local_count = self.read_var_u32()? as usize;
-        if local_count > MAX_WASM_FUNCTION_LOCALS {
-            return Err(BinaryReaderError::new(
-                "local_count is out of bounds",
-                self.original_position() - 1,
-            ));
-        }
-        Ok(local_count)
-    }
-
-    /// Read a `(count, value_type)` declaration of local variables of the same type.
-    pub fn read_local_decl(&mut self, locals_total: &mut usize) -> Result<(u32, Type)> {
-        let count = self.read_var_u32()?;
-        let value_type = self.read_type()?;
-        *locals_total = locals_total.checked_add(count as usize).ok_or_else(|| {
-            BinaryReaderError::new(
-                "locals_total is out of bounds",
-                self.original_position() - 1,
-            )
-        })?;
-        if *locals_total > MAX_WASM_FUNCTION_LOCALS {
-            return Err(BinaryReaderError::new(
-                "locals_total is out of bounds",
-                self.original_position() - 1,
-            ));
-        }
-        Ok((count, value_type))
-    }
-
-    pub(crate) fn read_external_kind(&mut self) -> Result<ExternalKind> {
-        let code = self.read_u8()?;
-        match code {
-            0 => Ok(ExternalKind::Function),
-            1 => Ok(ExternalKind::Table),
-            2 => Ok(ExternalKind::Memory),
-            3 => Ok(ExternalKind::Global),
-            5 => Ok(ExternalKind::Module),
-            6 => Ok(ExternalKind::Instance),
-            7 => Ok(ExternalKind::Type),
-            _ => Err(BinaryReaderError::new(
-                "Invalid external kind",
-                self.original_position() - 1,
-            )),
-        }
-    }
-
-    pub(crate) fn read_func_type(&mut self) -> Result<FuncType> {
-        let params_len = self.read_var_u32()? as usize;
-        if params_len > MAX_WASM_FUNCTION_PARAMS {
-            return Err(BinaryReaderError::new(
-                "function params size is out of bound",
-                self.original_position() - 1,
-            ));
-        }
-        let mut params: Vec<Type> = Vec::with_capacity(params_len);
-        for _ in 0..params_len {
-            params.push(self.read_type()?);
-        }
-        let returns_len = self.read_var_u32()? as usize;
-        if returns_len > MAX_WASM_FUNCTION_RETURNS {
-            return Err(BinaryReaderError::new(
-                "function returns size is out of bound",
-                self.original_position() - 1,
-            ));
-        }
-        let mut returns: Vec<Type> = Vec::with_capacity(returns_len);
-        for _ in 0..returns_len {
-            returns.push(self.read_type()?);
-        }
-        Ok(FuncType {
-            params: params.into_boxed_slice(),
-            returns: returns.into_boxed_slice(),
-        })
-    }
-
-    pub(crate) fn read_module_type(&mut self) -> Result<ModuleType<'a>> {
-        let pos = self.original_position();
-        let imports_len = self.read_var_u32()? as usize;
-        if imports_len > MAX_WASM_IMPORTS {
-            return Err(BinaryReaderError::new("imports size is out of bounds", pos));
-        }
-        Ok(ModuleType {
-            imports: (0..imports_len)
-                .map(|_| self.read_import())
-                .collect::<Result<_>>()?,
-            exports: self.read_export_types()?,
-        })
-    }
-
-    pub(crate) fn read_instance_type(&mut self) -> Result<InstanceType<'a>> {
-        Ok(InstanceType {
-            exports: self.read_export_types()?,
-        })
-    }
-
-    fn read_export_types(&mut self) -> Result<Box<[ExportType<'a>]>> {
-        let pos = self.original_position();
-        let exports_len = self.read_var_u32()? as usize;
-        if exports_len > MAX_WASM_EXPORTS {
-            return Err(BinaryReaderError::new("exports size is out of bound", pos));
-        }
-        (0..exports_len).map(|_| self.read_export_type()).collect()
-    }
-
-    pub(crate) fn read_import(&mut self) -> Result<Import<'a>> {
-        let module = self.read_string()?;
-
-        // For the `field`, figure out if we're the experimental encoding of
-        // single-level imports for the module linking proposal (a single-byte
-        // string which is 0xc0, which is invalid utf-8) or if we have a second
-        // level of import.
-        let mut clone = self.clone();
-        let field = if clone.read_var_u32()? == 1 && clone.read_u8()? == 0xc0 {
-            *self = clone;
-            None
-        } else {
-            Some(self.read_string()?)
-        };
-
-        let ty = self.read_import_desc()?;
-        Ok(Import { module, field, ty })
-    }
-
-    pub(crate) fn read_export_type(&mut self) -> Result<ExportType<'a>> {
-        let name = self.read_string()?;
-        let ty = self.read_import_desc()?;
-        Ok(ExportType { name, ty })
-    }
-
-    pub(crate) fn read_import_desc(&mut self) -> Result<ImportSectionEntryType> {
-        Ok(match self.read_external_kind()? {
-            ExternalKind::Function => ImportSectionEntryType::Function(self.read_var_u32()?),
-            ExternalKind::Table => ImportSectionEntryType::Table(self.read_table_type()?),
-            ExternalKind::Memory => ImportSectionEntryType::Memory(self.read_memory_type()?),
-            ExternalKind::Global => ImportSectionEntryType::Global(self.read_global_type()?),
-            ExternalKind::Module => ImportSectionEntryType::Module(self.read_var_u32()?),
-            ExternalKind::Instance => ImportSectionEntryType::Instance(self.read_var_u32()?),
-            ExternalKind::Type => {
-                return Err(BinaryReaderError::new(
-                    "cannot import types",
-                    self.original_position() - 1,
-                ))
-            }
-        })
-    }
-
-    fn read_resizable_limits(&mut self, max_present: bool) -> Result<ResizableLimits> {
-        let initial = self.read_var_u32()?;
-        let maximum = if max_present {
-            Some(self.read_var_u32()?)
-        } else {
-            None
-        };
-        Ok(ResizableLimits { initial, maximum })
-    }
-
-    pub(crate) fn read_table_type(&mut self) -> Result<TableType> {
-        let element_type = self.read_type()?;
-        let flags = self.read_var_u32()?;
-        if (flags & !0x1) != 0 {
-            return Err(BinaryReaderError::new(
-                "invalid table resizable limits flags",
-                self.original_position() - 1,
-            ));
-        }
-        let limits = self.read_resizable_limits((flags & 0x1) != 0)?;
-        Ok(TableType {
-            element_type,
-            limits,
-        })
-    }
-
-    pub(crate) fn read_memory_type(&mut self) -> Result<MemoryType> {
-        let flags = self.read_var_u32()?;
-        if (flags & !0x3) != 0 {
-            return Err(BinaryReaderError::new(
-                "invalid table resizable limits flags",
-                self.original_position() - 1,
-            ));
-        }
-        let limits = self.read_resizable_limits((flags & 0x1) != 0)?;
-        let shared = (flags & 0x2) != 0;
-        Ok(MemoryType { limits, shared })
-    }
-
-    pub(crate) fn read_global_type(&mut self) -> Result<GlobalType> {
-        Ok(GlobalType {
-            content_type: self.read_type()?,
-            mutable: self.read_var_u1()? != 0,
-        })
-    }
-
-    fn read_memarg(&mut self) -> Result<MemoryImmediate> {
-        Ok(MemoryImmediate {
-            flags: self.read_var_u32()?,
-            offset: self.read_var_u32()?,
-        })
-    }
-
-    pub(crate) fn read_section_code(&mut self, id: u32, offset: usize) -> Result<SectionCode<'a>> {
-        match id {
-            0 => {
-                let name = self.read_string()?;
-                let kind = if is_name(name, "name") {
-                    CustomSectionKind::Name
-                } else if is_name(name, "producers") {
-                    CustomSectionKind::Producers
-                } else if is_name(name, "sourceMappingURL") {
-                    CustomSectionKind::SourceMappingURL
-                } else if is_name_prefix(name, "reloc.") {
-                    CustomSectionKind::Reloc
-                } else if is_name(name, "linking") {
-                    CustomSectionKind::Linking
-                } else {
-                    CustomSectionKind::Unknown
-                };
-                Ok(SectionCode::Custom { name, kind })
-            }
-            1 => Ok(SectionCode::Type),
-            2 => Ok(SectionCode::Import),
-            3 => Ok(SectionCode::Function),
-            4 => Ok(SectionCode::Table),
-            5 => Ok(SectionCode::Memory),
-            6 => Ok(SectionCode::Global),
-            7 => Ok(SectionCode::Export),
-            8 => Ok(SectionCode::Start),
-            9 => Ok(SectionCode::Element),
-            10 => Ok(SectionCode::Code),
-            11 => Ok(SectionCode::Data),
-            12 => Ok(SectionCode::DataCount),
-            100 => Ok(SectionCode::Module),
-            101 => Ok(SectionCode::Instance),
-            102 => Ok(SectionCode::Alias),
-            103 => Ok(SectionCode::ModuleCode),
-            _ => Err(BinaryReaderError::new("Invalid section code", offset)),
-        }
-    }
-
-    fn read_br_table(&mut self) -> Result<BrTable<'a>> {
-        let targets_len = self.read_var_u32()? as usize;
-        if targets_len > MAX_WASM_BR_TABLE_SIZE {
-            return Err(BinaryReaderError::new(
-                "br_table size is out of bound",
-                self.original_position() - 1,
-            ));
-        }
-        let start = self.position;
-        for _ in 0..targets_len {
-            self.skip_var_32()?;
-        }
-        self.skip_var_32()?;
-        Ok(BrTable {
-            buffer: &self.buffer[start..self.position],
-            cnt: targets_len as usize,
-        })
-    }
-
-    /// Returns whether the `BinaryReader` has reached the end of the file.
-    pub fn eof(&self) -> bool {
-        self.position >= self.buffer.len()
-    }
-
-    /// Returns the `BinaryReader`'s current position.
-    pub fn current_position(&self) -> usize {
-        self.position
-    }
-
-    /// Returns the number of bytes remaining in the `BinaryReader`.
-    pub fn bytes_remaining(&self) -> usize {
-        self.buffer.len() - self.position
-    }
-
-    /// Advances the `BinaryReader` `size` bytes, and returns a slice from the
-    /// current position of `size` length.
-    ///
-    /// # Errors
-    /// If `size` exceeds the remaining length in `BinaryReader`.
-    pub fn read_bytes(&mut self, size: usize) -> Result<&'a [u8]> {
-        self.ensure_has_bytes(size)?;
-        let start = self.position;
-        self.position += size;
-        Ok(&self.buffer[start..self.position])
-    }
-
-    /// Advances the `BinaryReader` four bytes and returns a `u32`.
-    /// # Errors
-    /// If `BinaryReader` has less than four bytes remaining.
-    pub fn read_u32(&mut self) -> Result<u32> {
-        self.ensure_has_bytes(4)?;
-        let word = u32::from_le_bytes(
-            self.buffer[self.position..self.position + 4]
-                .try_into()
-                .unwrap(),
-        );
-        self.position += 4;
-        Ok(word)
-    }
-
-    /// Advances the `BinaryReader` eight bytes and returns a `u64`.
-    /// # Errors
-    /// If `BinaryReader` has less than eight bytes remaining.
-    pub fn read_u64(&mut self) -> Result<u64> {
-        self.ensure_has_bytes(8)?;
-        let word = u64::from_le_bytes(
-            self.buffer[self.position..self.position + 8]
-                .try_into()
-                .unwrap(),
-        );
-        self.position += 8;
-        Ok(word)
-    }
-
-    /// Advances the `BinaryReader` a single byte, and returns the data as
-    /// a `u32`.
-    /// # Errors
-    /// If `BinaryReader` has no bytes remaining.
-    pub fn read_u8(&mut self) -> Result<u32> {
-        self.ensure_has_byte()?;
-        let b = u32::from(self.buffer[self.position]);
-        self.position += 1;
-        Ok(b)
-    }
-
-    /// Advances the `BinaryReader` up to two bytes to parse a variable
-    /// length integer as a `u8`.
-    /// # Errors
-    /// If `BinaryReader` has less than one or two bytes remaining, or the
-    /// integer is larger than eight bits.
-    pub fn read_var_u8(&mut self) -> Result<u32> {
-        // Optimization for single byte i32.
-        let byte = self.read_u8()?;
-        if (byte & 0x80) == 0 {
-            return Ok(byte);
-        }
-
-        let result = (self.read_u8()? << 7) | (byte & 0x7F);
-        if result >= 0x100 {
-            return Err(BinaryReaderError::new(
-                "Invalid var_u8",
-                self.original_position() - 1,
-            ));
-        }
-        Ok(result)
-    }
-
-    /// Advances the `BinaryReader` up to four bytes to parse a variable
-    /// length integer as a `u32`.
-    /// # Errors
-    /// If `BinaryReader` has less than one or up to four bytes remaining, or
-    /// the integer is larger than 32 bits.
-    pub fn read_var_u32(&mut self) -> Result<u32> {
-        // Optimization for single byte i32.
-        let byte = self.read_u8()?;
-        if (byte & 0x80) == 0 {
-            return Ok(byte);
-        }
-
-        let mut result = byte & 0x7F;
-        let mut shift = 7;
-        loop {
-            let byte = self.read_u8()?;
-            result |= ((byte & 0x7F) as u32) << shift;
-            if shift >= 25 && (byte >> (32 - shift)) != 0 {
-                // The continuation bit or unused bits are set.
-                return Err(BinaryReaderError::new(
-                    "Invalid var_u32",
-                    self.original_position() - 1,
-                ));
-            }
-            shift += 7;
-            if (byte & 0x80) == 0 {
-                break;
-            }
-        }
-        Ok(result)
-    }
-
-    /// Advances the `BinaryReader` up to four bytes over a variable length 32
-    /// bit integer, discarding the result.
-    /// # Errors
-    /// If `BinaryReader` has less than one or up to four bytes remaining, or
-    /// the integer is larger than 32 bits.
-    pub fn skip_var_32(&mut self) -> Result<()> {
-        for _ in 0..5 {
-            let byte = self.read_u8()?;
-            if (byte & 0x80) == 0 {
-                return Ok(());
-            }
-        }
-        Err(BinaryReaderError::new(
-            "Invalid var_32",
-            self.original_position() - 1,
-        ))
-    }
-
-    /// Alias method for `BinaryReader::skip_var_u32`.
-    pub fn skip_type(&mut self) -> Result<()> {
-        self.skip_var_32()
-    }
-
-    /// Advances the `BinaryReader` `len` bytes, skipping the result.
-    /// # Errors
-    /// If `BinaryReader` has less than `len` bytes remaining.
-    pub fn skip_bytes(&mut self, len: usize) -> Result<()> {
-        self.ensure_has_bytes(len)?;
-        self.position += len;
-        Ok(())
-    }
-
-    /// Advances the `BinaryReader` past a WebAssembly string. This method does
-    /// not perform any utf-8 validation.
-    /// # Errors
-    /// If `BinaryReader` has less than four bytes, the string's length exceeds
-    /// the remaining bytes, or the string length
-    /// exceeds `limits::MAX_WASM_STRING_SIZE`.
-    pub fn skip_string(&mut self) -> Result<()> {
-        let len = self.read_var_u32()? as usize;
-        if len > MAX_WASM_STRING_SIZE {
-            return Err(BinaryReaderError::new(
-                "string size in out of bounds",
-                self.original_position() - 1,
-            ));
-        }
-        self.skip_bytes(len)
-    }
-
-    pub(crate) fn skip_to(&mut self, position: usize) {
-        assert!(
-            self.position <= position && position <= self.buffer.len(),
-            "skip_to allowed only into region past current position"
-        );
-        self.position = position;
-    }
-
-    /// Advances the `BinaryReader` up to four bytes to parse a variable
-    /// length integer as a `i32`.
-    /// # Errors
-    /// If `BinaryReader` has less than one or up to four bytes remaining, or
-    /// the integer is larger than 32 bits.
-    pub fn read_var_i32(&mut self) -> Result<i32> {
-        // Optimization for single byte i32.
-        let byte = self.read_u8()?;
-        if (byte & 0x80) == 0 {
-            return Ok(((byte as i32) << 25) >> 25);
-        }
-
-        let mut result = (byte & 0x7F) as i32;
-        let mut shift = 7;
-        loop {
-            let byte = self.read_u8()?;
-            result |= ((byte & 0x7F) as i32) << shift;
-            if shift >= 25 {
-                let continuation_bit = (byte & 0x80) != 0;
-                let sign_and_unused_bit = (byte << 1) as i8 >> (32 - shift);
-                if continuation_bit || (sign_and_unused_bit != 0 && sign_and_unused_bit != -1) {
-                    return Err(BinaryReaderError::new(
-                        "Invalid var_i32",
-                        self.original_position() - 1,
-                    ));
-                }
-                return Ok(result);
-            }
-            shift += 7;
-            if (byte & 0x80) == 0 {
-                break;
-            }
-        }
-        let ashift = 32 - shift;
-        Ok((result << ashift) >> ashift)
-    }
-
-    /// Advances the `BinaryReader` up to four bytes to parse a variable
-    /// length integer as a signed 33 bit integer, returned as a `i64`.
-    /// # Errors
-    /// If `BinaryReader` has less than one or up to five bytes remaining, or
-    /// the integer is larger than 33 bits.
-    pub fn read_var_s33(&mut self) -> Result<i64> {
-        // Optimization for single byte.
-        let byte = self.read_u8()?;
-        if (byte & 0x80) == 0 {
-            return Ok(((byte as i8) << 1) as i64 >> 1);
-        }
-
-        let mut result = (byte & 0x7F) as i64;
-        let mut shift = 7;
-        loop {
-            let byte = self.read_u8()?;
-            result |= ((byte & 0x7F) as i64) << shift;
-            if shift >= 25 {
-                let continuation_bit = (byte & 0x80) != 0;
-                let sign_and_unused_bit = (byte << 1) as i8 >> (33 - shift);
-                if continuation_bit || (sign_and_unused_bit != 0 && sign_and_unused_bit != -1) {
-                    return Err(BinaryReaderError::new(
-                        "Invalid var_s33",
-                        self.original_position() - 1,
-                    ));
-                }
-                return Ok(result);
-            }
-            shift += 7;
-            if (byte & 0x80) == 0 {
-                break;
-            }
-        }
-        let ashift = 64 - shift;
-        Ok((result << ashift) >> ashift)
-    }
-
-    /// Advances the `BinaryReader` up to eight bytes to parse a variable
-    /// length integer as a 64 bit integer, returned as a `i64`.
-    /// # Errors
-    /// If `BinaryReader` has less than one or up to eight bytes remaining, or
-    /// the integer is larger than 64 bits.
-    pub fn read_var_i64(&mut self) -> Result<i64> {
-        let mut result: i64 = 0;
-        let mut shift = 0;
-        loop {
-            let byte = self.read_u8()?;
-            result |= i64::from(byte & 0x7F) << shift;
-            if shift >= 57 {
-                let continuation_bit = (byte & 0x80) != 0;
-                let sign_and_unused_bit = ((byte << 1) as i8) >> (64 - shift);
-                if continuation_bit || (sign_and_unused_bit != 0 && sign_and_unused_bit != -1) {
-                    return Err(BinaryReaderError::new(
-                        "Invalid var_i64",
-                        self.original_position() - 1,
-                    ));
-                }
-                return Ok(result);
-            }
-            shift += 7;
-            if (byte & 0x80) == 0 {
-                break;
-            }
-        }
-        let ashift = 64 - shift;
-        Ok((result << ashift) >> ashift)
-    }
-
-    /// Advances the `BinaryReader` up to four bytes to parse a variable
-    /// length integer as a 32 bit floating point integer, returned as `Ieee32`.
-    /// # Errors
-    /// If `BinaryReader` has less than one or up to four bytes remaining, or
-    /// the integer is larger than 32 bits.
-    pub fn read_f32(&mut self) -> Result<Ieee32> {
-        let value = self.read_u32()?;
-        Ok(Ieee32(value))
-    }
-
-    /// Advances the `BinaryReader` up to four bytes to parse a variable
-    /// length integer as a 32 bit floating point integer, returned as `Ieee32`.
-    /// # Errors
-    /// If `BinaryReader` has less than one or up to four bytes remaining, or
-    /// the integer is larger than 32 bits.
-    pub fn read_f64(&mut self) -> Result<Ieee64> {
-        let value = self.read_u64()?;
-        Ok(Ieee64(value))
-    }
-
-    /// Reads a WebAssembly string from the module.
-    /// # Errors
-    /// If `BinaryReader` has less than up to four bytes remaining, the string's
-    /// length exceeds the remaining bytes, the string's length exceeds
-    /// `limits::MAX_WASM_STRING_SIZE`, or the string contains invalid utf-8.
-    pub fn read_string(&mut self) -> Result<&'a str> {
-        let len = self.read_var_u32()? as usize;
-        if len > MAX_WASM_STRING_SIZE {
-            return Err(BinaryReaderError::new(
-                "string size in out of bounds",
-                self.original_position() - 1,
-            ));
-        }
-        let bytes = self.read_bytes(len)?;
-        str::from_utf8(bytes).map_err(|_| {
-            BinaryReaderError::new("invalid UTF-8 encoding", self.original_position() - 1)
-        })
-    }
-
-    fn read_memarg_of_align(&mut self, max_align: u32) -> Result<MemoryImmediate> {
-        let imm = self.read_memarg()?;
-        if imm.flags > max_align {
-            return Err(BinaryReaderError::new(
-                "alignment must not be larger than natural",
-                self.original_position() - 1,
-            ));
-        }
-        Ok(imm)
-    }
-
-    fn read_0xfe_operator(&mut self) -> Result<Operator<'a>> {
-        let code = self.read_u8()? as u8;
-        Ok(match code {
-            0x00 => Operator::AtomicNotify {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x01 => Operator::I32AtomicWait {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x02 => Operator::I64AtomicWait {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x03 => Operator::AtomicFence {
-                flags: self.read_u8()? as u8,
-            },
-            0x10 => Operator::I32AtomicLoad {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x11 => Operator::I64AtomicLoad {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x12 => Operator::I32AtomicLoad8U {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x13 => Operator::I32AtomicLoad16U {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x14 => Operator::I64AtomicLoad8U {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x15 => Operator::I64AtomicLoad16U {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x16 => Operator::I64AtomicLoad32U {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x17 => Operator::I32AtomicStore {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x18 => Operator::I64AtomicStore {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x19 => Operator::I32AtomicStore8 {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x1a => Operator::I32AtomicStore16 {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x1b => Operator::I64AtomicStore8 {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x1c => Operator::I64AtomicStore16 {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x1d => Operator::I64AtomicStore32 {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x1e => Operator::I32AtomicRmwAdd {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x1f => Operator::I64AtomicRmwAdd {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x20 => Operator::I32AtomicRmw8AddU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x21 => Operator::I32AtomicRmw16AddU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x22 => Operator::I64AtomicRmw8AddU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x23 => Operator::I64AtomicRmw16AddU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x24 => Operator::I64AtomicRmw32AddU {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x25 => Operator::I32AtomicRmwSub {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x26 => Operator::I64AtomicRmwSub {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x27 => Operator::I32AtomicRmw8SubU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x28 => Operator::I32AtomicRmw16SubU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x29 => Operator::I64AtomicRmw8SubU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x2a => Operator::I64AtomicRmw16SubU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x2b => Operator::I64AtomicRmw32SubU {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x2c => Operator::I32AtomicRmwAnd {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x2d => Operator::I64AtomicRmwAnd {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x2e => Operator::I32AtomicRmw8AndU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x2f => Operator::I32AtomicRmw16AndU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x30 => Operator::I64AtomicRmw8AndU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x31 => Operator::I64AtomicRmw16AndU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x32 => Operator::I64AtomicRmw32AndU {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x33 => Operator::I32AtomicRmwOr {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x34 => Operator::I64AtomicRmwOr {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x35 => Operator::I32AtomicRmw8OrU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x36 => Operator::I32AtomicRmw16OrU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x37 => Operator::I64AtomicRmw8OrU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x38 => Operator::I64AtomicRmw16OrU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x39 => Operator::I64AtomicRmw32OrU {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x3a => Operator::I32AtomicRmwXor {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x3b => Operator::I64AtomicRmwXor {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x3c => Operator::I32AtomicRmw8XorU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x3d => Operator::I32AtomicRmw16XorU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x3e => Operator::I64AtomicRmw8XorU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x3f => Operator::I64AtomicRmw16XorU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x40 => Operator::I64AtomicRmw32XorU {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x41 => Operator::I32AtomicRmwXchg {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x42 => Operator::I64AtomicRmwXchg {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x43 => Operator::I32AtomicRmw8XchgU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x44 => Operator::I32AtomicRmw16XchgU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x45 => Operator::I64AtomicRmw8XchgU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x46 => Operator::I64AtomicRmw16XchgU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x47 => Operator::I64AtomicRmw32XchgU {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x48 => Operator::I32AtomicRmwCmpxchg {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x49 => Operator::I64AtomicRmwCmpxchg {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x4a => Operator::I32AtomicRmw8CmpxchgU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x4b => Operator::I32AtomicRmw16CmpxchgU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x4c => Operator::I64AtomicRmw8CmpxchgU {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x4d => Operator::I64AtomicRmw16CmpxchgU {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x4e => Operator::I64AtomicRmw32CmpxchgU {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-
-            _ => {
-                return Err(BinaryReaderError::new(
-                    "Unknown 0xFE opcode",
-                    self.original_position() - 1,
-                ));
-            }
-        })
-    }
-
-    fn read_blocktype(&mut self) -> Result<TypeOrFuncType> {
-        let position = self.position;
-        if let Ok(ty) = self.read_type() {
-            Ok(TypeOrFuncType::Type(ty))
-        } else {
-            self.position = position;
-            let idx = self.read_var_s33()?;
-            if idx < 0 || idx > (std::u32::MAX as i64) {
-                return Err(BinaryReaderError::new("invalid function type", position));
-            }
-            Ok(TypeOrFuncType::FuncType(idx as u32))
-        }
-    }
-
-    /// Reads the next available `Operator`.
-    /// # Errors
-    /// If `BinaryReader` has less bytes remaining than required to parse
-    /// the `Operator`.
-    pub fn read_operator(&mut self) -> Result<Operator<'a>> {
-        let code = self.read_u8()? as u8;
-        Ok(match code {
-            0x00 => Operator::Unreachable,
-            0x01 => Operator::Nop,
-            0x02 => Operator::Block {
-                ty: self.read_blocktype()?,
-            },
-            0x03 => Operator::Loop {
-                ty: self.read_blocktype()?,
-            },
-            0x04 => Operator::If {
-                ty: self.read_blocktype()?,
-            },
-            0x05 => Operator::Else,
-            0x0b => Operator::End,
-            0x0c => Operator::Br {
-                relative_depth: self.read_var_u32()?,
-            },
-            0x0d => Operator::BrIf {
-                relative_depth: self.read_var_u32()?,
-            },
-            0x0e => Operator::BrTable {
-                table: self.read_br_table()?,
-            },
-            0x0f => Operator::Return,
-            0x10 => Operator::Call {
-                function_index: self.read_var_u32()?,
-            },
-            0x11 => Operator::CallIndirect {
-                index: self.read_var_u32()?,
-                table_index: self.read_var_u32()?,
-            },
-            0x12 => Operator::ReturnCall {
-                function_index: self.read_var_u32()?,
-            },
-            0x13 => Operator::ReturnCallIndirect {
-                index: self.read_var_u32()?,
-                table_index: self.read_var_u32()?,
-            },
-            0x1a => Operator::Drop,
-            0x1b => Operator::Select,
-            0x1c => {
-                let results = self.read_var_u32()?;
-                if results != 1 {
-                    return Err(BinaryReaderError::new(
-                        "invalid result arity",
-                        self.position,
-                    ));
-                }
-                Operator::TypedSelect {
-                    ty: self.read_type()?,
-                }
-            }
-            0x20 => Operator::LocalGet {
-                local_index: self.read_var_u32()?,
-            },
-            0x21 => Operator::LocalSet {
-                local_index: self.read_var_u32()?,
-            },
-            0x22 => Operator::LocalTee {
-                local_index: self.read_var_u32()?,
-            },
-            0x23 => Operator::GlobalGet {
-                global_index: self.read_var_u32()?,
-            },
-            0x24 => Operator::GlobalSet {
-                global_index: self.read_var_u32()?,
-            },
-            0x25 => Operator::TableGet {
-                table: self.read_var_u32()?,
-            },
-            0x26 => Operator::TableSet {
-                table: self.read_var_u32()?,
-            },
-            0x28 => Operator::I32Load {
-                memarg: self.read_memarg()?,
-            },
-            0x29 => Operator::I64Load {
-                memarg: self.read_memarg()?,
-            },
-            0x2a => Operator::F32Load {
-                memarg: self.read_memarg()?,
-            },
-            0x2b => Operator::F64Load {
-                memarg: self.read_memarg()?,
-            },
-            0x2c => Operator::I32Load8S {
-                memarg: self.read_memarg()?,
-            },
-            0x2d => Operator::I32Load8U {
-                memarg: self.read_memarg()?,
-            },
-            0x2e => Operator::I32Load16S {
-                memarg: self.read_memarg()?,
-            },
-            0x2f => Operator::I32Load16U {
-                memarg: self.read_memarg()?,
-            },
-            0x30 => Operator::I64Load8S {
-                memarg: self.read_memarg()?,
-            },
-            0x31 => Operator::I64Load8U {
-                memarg: self.read_memarg()?,
-            },
-            0x32 => Operator::I64Load16S {
-                memarg: self.read_memarg()?,
-            },
-            0x33 => Operator::I64Load16U {
-                memarg: self.read_memarg()?,
-            },
-            0x34 => Operator::I64Load32S {
-                memarg: self.read_memarg()?,
-            },
-            0x35 => Operator::I64Load32U {
-                memarg: self.read_memarg()?,
-            },
-            0x36 => Operator::I32Store {
-                memarg: self.read_memarg()?,
-            },
-            0x37 => Operator::I64Store {
-                memarg: self.read_memarg()?,
-            },
-            0x38 => Operator::F32Store {
-                memarg: self.read_memarg()?,
-            },
-            0x39 => Operator::F64Store {
-                memarg: self.read_memarg()?,
-            },
-            0x3a => Operator::I32Store8 {
-                memarg: self.read_memarg()?,
-            },
-            0x3b => Operator::I32Store16 {
-                memarg: self.read_memarg()?,
-            },
-            0x3c => Operator::I64Store8 {
-                memarg: self.read_memarg()?,
-            },
-            0x3d => Operator::I64Store16 {
-                memarg: self.read_memarg()?,
-            },
-            0x3e => Operator::I64Store32 {
-                memarg: self.read_memarg()?,
-            },
-            0x3f => Operator::MemorySize {
-                reserved: self.read_var_u1()?,
-            },
-            0x40 => Operator::MemoryGrow {
-                reserved: self.read_var_u1()?,
-            },
-            0x41 => Operator::I32Const {
-                value: self.read_var_i32()?,
-            },
-            0x42 => Operator::I64Const {
-                value: self.read_var_i64()?,
-            },
-            0x43 => Operator::F32Const {
-                value: self.read_f32()?,
-            },
-            0x44 => Operator::F64Const {
-                value: self.read_f64()?,
-            },
-            0x45 => Operator::I32Eqz,
-            0x46 => Operator::I32Eq,
-            0x47 => Operator::I32Ne,
-            0x48 => Operator::I32LtS,
-            0x49 => Operator::I32LtU,
-            0x4a => Operator::I32GtS,
-            0x4b => Operator::I32GtU,
-            0x4c => Operator::I32LeS,
-            0x4d => Operator::I32LeU,
-            0x4e => Operator::I32GeS,
-            0x4f => Operator::I32GeU,
-            0x50 => Operator::I64Eqz,
-            0x51 => Operator::I64Eq,
-            0x52 => Operator::I64Ne,
-            0x53 => Operator::I64LtS,
-            0x54 => Operator::I64LtU,
-            0x55 => Operator::I64GtS,
-            0x56 => Operator::I64GtU,
-            0x57 => Operator::I64LeS,
-            0x58 => Operator::I64LeU,
-            0x59 => Operator::I64GeS,
-            0x5a => Operator::I64GeU,
-            0x5b => Operator::F32Eq,
-            0x5c => Operator::F32Ne,
-            0x5d => Operator::F32Lt,
-            0x5e => Operator::F32Gt,
-            0x5f => Operator::F32Le,
-            0x60 => Operator::F32Ge,
-            0x61 => Operator::F64Eq,
-            0x62 => Operator::F64Ne,
-            0x63 => Operator::F64Lt,
-            0x64 => Operator::F64Gt,
-            0x65 => Operator::F64Le,
-            0x66 => Operator::F64Ge,
-            0x67 => Operator::I32Clz,
-            0x68 => Operator::I32Ctz,
-            0x69 => Operator::I32Popcnt,
-            0x6a => Operator::I32Add,
-            0x6b => Operator::I32Sub,
-            0x6c => Operator::I32Mul,
-            0x6d => Operator::I32DivS,
-            0x6e => Operator::I32DivU,
-            0x6f => Operator::I32RemS,
-            0x70 => Operator::I32RemU,
-            0x71 => Operator::I32And,
-            0x72 => Operator::I32Or,
-            0x73 => Operator::I32Xor,
-            0x74 => Operator::I32Shl,
-            0x75 => Operator::I32ShrS,
-            0x76 => Operator::I32ShrU,
-            0x77 => Operator::I32Rotl,
-            0x78 => Operator::I32Rotr,
-            0x79 => Operator::I64Clz,
-            0x7a => Operator::I64Ctz,
-            0x7b => Operator::I64Popcnt,
-            0x7c => Operator::I64Add,
-            0x7d => Operator::I64Sub,
-            0x7e => Operator::I64Mul,
-            0x7f => Operator::I64DivS,
-            0x80 => Operator::I64DivU,
-            0x81 => Operator::I64RemS,
-            0x82 => Operator::I64RemU,
-            0x83 => Operator::I64And,
-            0x84 => Operator::I64Or,
-            0x85 => Operator::I64Xor,
-            0x86 => Operator::I64Shl,
-            0x87 => Operator::I64ShrS,
-            0x88 => Operator::I64ShrU,
-            0x89 => Operator::I64Rotl,
-            0x8a => Operator::I64Rotr,
-            0x8b => Operator::F32Abs,
-            0x8c => Operator::F32Neg,
-            0x8d => Operator::F32Ceil,
-            0x8e => Operator::F32Floor,
-            0x8f => Operator::F32Trunc,
-            0x90 => Operator::F32Nearest,
-            0x91 => Operator::F32Sqrt,
-            0x92 => Operator::F32Add,
-            0x93 => Operator::F32Sub,
-            0x94 => Operator::F32Mul,
-            0x95 => Operator::F32Div,
-            0x96 => Operator::F32Min,
-            0x97 => Operator::F32Max,
-            0x98 => Operator::F32Copysign,
-            0x99 => Operator::F64Abs,
-            0x9a => Operator::F64Neg,
-            0x9b => Operator::F64Ceil,
-            0x9c => Operator::F64Floor,
-            0x9d => Operator::F64Trunc,
-            0x9e => Operator::F64Nearest,
-            0x9f => Operator::F64Sqrt,
-            0xa0 => Operator::F64Add,
-            0xa1 => Operator::F64Sub,
-            0xa2 => Operator::F64Mul,
-            0xa3 => Operator::F64Div,
-            0xa4 => Operator::F64Min,
-            0xa5 => Operator::F64Max,
-            0xa6 => Operator::F64Copysign,
-            0xa7 => Operator::I32WrapI64,
-            0xa8 => Operator::I32TruncF32S,
-            0xa9 => Operator::I32TruncF32U,
-            0xaa => Operator::I32TruncF64S,
-            0xab => Operator::I32TruncF64U,
-            0xac => Operator::I64ExtendI32S,
-            0xad => Operator::I64ExtendI32U,
-            0xae => Operator::I64TruncF32S,
-            0xaf => Operator::I64TruncF32U,
-            0xb0 => Operator::I64TruncF64S,
-            0xb1 => Operator::I64TruncF64U,
-            0xb2 => Operator::F32ConvertI32S,
-            0xb3 => Operator::F32ConvertI32U,
-            0xb4 => Operator::F32ConvertI64S,
-            0xb5 => Operator::F32ConvertI64U,
-            0xb6 => Operator::F32DemoteF64,
-            0xb7 => Operator::F64ConvertI32S,
-            0xb8 => Operator::F64ConvertI32U,
-            0xb9 => Operator::F64ConvertI64S,
-            0xba => Operator::F64ConvertI64U,
-            0xbb => Operator::F64PromoteF32,
-            0xbc => Operator::I32ReinterpretF32,
-            0xbd => Operator::I64ReinterpretF64,
-            0xbe => Operator::F32ReinterpretI32,
-            0xbf => Operator::F64ReinterpretI64,
-
-            0xc0 => Operator::I32Extend8S,
-            0xc1 => Operator::I32Extend16S,
-            0xc2 => Operator::I64Extend8S,
-            0xc3 => Operator::I64Extend16S,
-            0xc4 => Operator::I64Extend32S,
-
-            0xd0 => Operator::RefNull {
-                ty: self.read_type()?,
-            },
-            0xd1 => Operator::RefIsNull,
-            0xd2 => Operator::RefFunc {
-                function_index: self.read_var_u32()?,
-            },
-
-            0xfc => self.read_0xfc_operator()?,
-            0xfd => self.read_0xfd_operator()?,
-            0xfe => self.read_0xfe_operator()?,
-
-            _ => {
-                return Err(BinaryReaderError::new(
-                    "Unknown opcode",
-                    self.original_position() - 1,
-                ));
-            }
-        })
-    }
-
-    fn read_0xfc_operator(&mut self) -> Result<Operator<'a>> {
-        let code = self.read_u8()? as u8;
-        Ok(match code {
-            0x00 => Operator::I32TruncSatF32S,
-            0x01 => Operator::I32TruncSatF32U,
-            0x02 => Operator::I32TruncSatF64S,
-            0x03 => Operator::I32TruncSatF64U,
-            0x04 => Operator::I64TruncSatF32S,
-            0x05 => Operator::I64TruncSatF32U,
-            0x06 => Operator::I64TruncSatF64S,
-            0x07 => Operator::I64TruncSatF64U,
-
-            0x08 => {
-                let segment = self.read_var_u32()?;
-                let mem = self.read_u8()?;
-                if mem != 0 {
-                    return Err(BinaryReaderError::new(
-                        "reserved byte must be zero",
-                        self.original_position() - 1,
-                    ));
-                }
-                Operator::MemoryInit { segment }
-            }
-            0x09 => {
-                let segment = self.read_var_u32()?;
-                Operator::DataDrop { segment }
-            }
-            0x0a => {
-                let dst = self.read_u8()?;
-                if dst != 0 {
-                    return Err(BinaryReaderError::new(
-                        "reserved byte must be zero",
-                        self.original_position() - 1,
-                    ));
-                }
-                let src = self.read_u8()?;
-                if src != 0 {
-                    return Err(BinaryReaderError::new(
-                        "reserved byte must be zero",
-                        self.original_position() - 1,
-                    ));
-                }
-                Operator::MemoryCopy
-            }
-            0x0b => {
-                let mem = self.read_u8()?;
-                if mem != 0 {
-                    return Err(BinaryReaderError::new(
-                        "reserved byte must be zero",
-                        self.original_position() - 1,
-                    ));
-                }
-                Operator::MemoryFill
-            }
-            0x0c => {
-                let segment = self.read_var_u32()?;
-                let table = self.read_var_u32()?;
-                Operator::TableInit { segment, table }
-            }
-            0x0d => {
-                let segment = self.read_var_u32()?;
-                Operator::ElemDrop { segment }
-            }
-            0x0e => {
-                let dst_table = self.read_var_u32()?;
-                let src_table = self.read_var_u32()?;
-                Operator::TableCopy {
-                    src_table,
-                    dst_table,
-                }
-            }
-
-            0x0f => {
-                let table = self.read_var_u32()?;
-                Operator::TableGrow { table }
-            }
-            0x10 => {
-                let table = self.read_var_u32()?;
-                Operator::TableSize { table }
-            }
-
-            0x11 => {
-                let table = self.read_var_u32()?;
-                Operator::TableFill { table }
-            }
-
-            _ => {
-                return Err(BinaryReaderError::new(
-                    "Unknown 0xfc opcode",
-                    self.original_position() - 1,
-                ));
-            }
-        })
-    }
-
-    fn read_lane_index(&mut self, max: u32) -> Result<SIMDLaneIndex> {
-        let index = self.read_u8()?;
-        if index >= max {
-            return Err(BinaryReaderError::new(
-                "invalid lane index",
-                self.original_position() - 1,
-            ));
-        }
-        Ok(index as SIMDLaneIndex)
-    }
-
-    fn read_v128(&mut self) -> Result<V128> {
-        let mut bytes = [0; 16];
-        bytes.clone_from_slice(self.read_bytes(16)?);
-        Ok(V128(bytes))
-    }
-
-    fn read_0xfd_operator(&mut self) -> Result<Operator<'a>> {
-        let code = self.read_var_u32()?;
-        Ok(match code {
-            0x00 => Operator::V128Load {
-                memarg: self.read_memarg()?,
-            },
-            0x01 => Operator::I16x8Load8x8S {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x02 => Operator::I16x8Load8x8U {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x03 => Operator::I32x4Load16x4S {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x04 => Operator::I32x4Load16x4U {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x05 => Operator::I64x2Load32x2S {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x06 => Operator::I64x2Load32x2U {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x07 => Operator::V8x16LoadSplat {
-                memarg: self.read_memarg_of_align(0)?,
-            },
-            0x08 => Operator::V16x8LoadSplat {
-                memarg: self.read_memarg_of_align(1)?,
-            },
-            0x09 => Operator::V32x4LoadSplat {
-                memarg: self.read_memarg_of_align(2)?,
-            },
-            0x0a => Operator::V64x2LoadSplat {
-                memarg: self.read_memarg_of_align(3)?,
-            },
-            0x0b => Operator::V128Store {
-                memarg: self.read_memarg()?,
-            },
-            0x0c => Operator::V128Const {
-                value: self.read_v128()?,
-            },
-            0x0d => {
-                let mut lanes = [0 as SIMDLaneIndex; 16];
-                for lane in &mut lanes {
-                    *lane = self.read_lane_index(32)?
-                }
-                Operator::V8x16Shuffle { lanes }
-            }
-            0x0e => Operator::V8x16Swizzle,
-            0x0f => Operator::I8x16Splat,
-            0x10 => Operator::I16x8Splat,
-            0x11 => Operator::I32x4Splat,
-            0x12 => Operator::I64x2Splat,
-            0x13 => Operator::F32x4Splat,
-            0x14 => Operator::F64x2Splat,
-            0x15 => Operator::I8x16ExtractLaneS {
-                lane: self.read_lane_index(16)?,
-            },
-            0x16 => Operator::I8x16ExtractLaneU {
-                lane: self.read_lane_index(16)?,
-            },
-            0x17 => Operator::I8x16ReplaceLane {
-                lane: self.read_lane_index(16)?,
-            },
-            0x18 => Operator::I16x8ExtractLaneS {
-                lane: self.read_lane_index(8)?,
-            },
-            0x19 => Operator::I16x8ExtractLaneU {
-                lane: self.read_lane_index(8)?,
-            },
-            0x1a => Operator::I16x8ReplaceLane {
-                lane: self.read_lane_index(8)?,
-            },
-            0x1b => Operator::I32x4ExtractLane {
-                lane: self.read_lane_index(4)?,
-            },
-            0x1c => Operator::I32x4ReplaceLane {
-                lane: self.read_lane_index(4)?,
-            },
-            0x1d => Operator::I64x2ExtractLane {
-                lane: self.read_lane_index(2)?,
-            },
-            0x1e => Operator::I64x2ReplaceLane {
-                lane: self.read_lane_index(2)?,
-            },
-            0x1f => Operator::F32x4ExtractLane {
-                lane: self.read_lane_index(4)?,
-            },
-            0x20 => Operator::F32x4ReplaceLane {
-                lane: self.read_lane_index(4)?,
-            },
-            0x21 => Operator::F64x2ExtractLane {
-                lane: self.read_lane_index(2)?,
-            },
-            0x22 => Operator::F64x2ReplaceLane {
-                lane: self.read_lane_index(2)?,
-            },
-            0x23 => Operator::I8x16Eq,
-            0x24 => Operator::I8x16Ne,
-            0x25 => Operator::I8x16LtS,
-            0x26 => Operator::I8x16LtU,
-            0x27 => Operator::I8x16GtS,
-            0x28 => Operator::I8x16GtU,
-            0x29 => Operator::I8x16LeS,
-            0x2a => Operator::I8x16LeU,
-            0x2b => Operator::I8x16GeS,
-            0x2c => Operator::I8x16GeU,
-            0x2d => Operator::I16x8Eq,
-            0x2e => Operator::I16x8Ne,
-            0x2f => Operator::I16x8LtS,
-            0x30 => Operator::I16x8LtU,
-            0x31 => Operator::I16x8GtS,
-            0x32 => Operator::I16x8GtU,
-            0x33 => Operator::I16x8LeS,
-            0x34 => Operator::I16x8LeU,
-            0x35 => Operator::I16x8GeS,
-            0x36 => Operator::I16x8GeU,
-            0x37 => Operator::I32x4Eq,
-            0x38 => Operator::I32x4Ne,
-            0x39 => Operator::I32x4LtS,
-            0x3a => Operator::I32x4LtU,
-            0x3b => Operator::I32x4GtS,
-            0x3c => Operator::I32x4GtU,
-            0x3d => Operator::I32x4LeS,
-            0x3e => Operator::I32x4LeU,
-            0x3f => Operator::I32x4GeS,
-            0x40 => Operator::I32x4GeU,
-            0x41 => Operator::F32x4Eq,
-            0x42 => Operator::F32x4Ne,
-            0x43 => Operator::F32x4Lt,
-            0x44 => Operator::F32x4Gt,
-            0x45 => Operator::F32x4Le,
-            0x46 => Operator::F32x4Ge,
-            0x47 => Operator::F64x2Eq,
-            0x48 => Operator::F64x2Ne,
-            0x49 => Operator::F64x2Lt,
-            0x4a => Operator::F64x2Gt,
-            0x4b => Operator::F64x2Le,
-            0x4c => Operator::F64x2Ge,
-            0x4d => Operator::V128Not,
-            0x4e => Operator::V128And,
-            0x4f => Operator::V128AndNot,
-            0x50 => Operator::V128Or,
-            0x51 => Operator::V128Xor,
-            0x52 => Operator::V128Bitselect,
-            0x60 => Operator::I8x16Abs,
-            0x61 => Operator::I8x16Neg,
-            0x62 => Operator::I8x16AnyTrue,
-            0x63 => Operator::I8x16AllTrue,
-            0x64 => Operator::I8x16Bitmask,
-            0x65 => Operator::I8x16NarrowI16x8S,
-            0x66 => Operator::I8x16NarrowI16x8U,
-            0x6b => Operator::I8x16Shl,
-            0x6c => Operator::I8x16ShrS,
-            0x6d => Operator::I8x16ShrU,
-            0x6e => Operator::I8x16Add,
-            0x6f => Operator::I8x16AddSaturateS,
-            0x70 => Operator::I8x16AddSaturateU,
-            0x71 => Operator::I8x16Sub,
-            0x72 => Operator::I8x16SubSaturateS,
-            0x73 => Operator::I8x16SubSaturateU,
-            0x76 => Operator::I8x16MinS,
-            0x77 => Operator::I8x16MinU,
-            0x78 => Operator::I8x16MaxS,
-            0x79 => Operator::I8x16MaxU,
-            0x7b => Operator::I8x16RoundingAverageU,
-            0x80 => Operator::I16x8Abs,
-            0x81 => Operator::I16x8Neg,
-            0x82 => Operator::I16x8AnyTrue,
-            0x83 => Operator::I16x8AllTrue,
-            0x84 => Operator::I16x8Bitmask,
-            0x85 => Operator::I16x8NarrowI32x4S,
-            0x86 => Operator::I16x8NarrowI32x4U,
-            0x87 => Operator::I16x8WidenLowI8x16S,
-            0x88 => Operator::I16x8WidenHighI8x16S,
-            0x89 => Operator::I16x8WidenLowI8x16U,
-            0x8a => Operator::I16x8WidenHighI8x16U,
-            0x8b => Operator::I16x8Shl,
-            0x8c => Operator::I16x8ShrS,
-            0x8d => Operator::I16x8ShrU,
-            0x8e => Operator::I16x8Add,
-            0x8f => Operator::I16x8AddSaturateS,
-            0x90 => Operator::I16x8AddSaturateU,
-            0x91 => Operator::I16x8Sub,
-            0x92 => Operator::I16x8SubSaturateS,
-            0x93 => Operator::I16x8SubSaturateU,
-            0x95 => Operator::I16x8Mul,
-            0x96 => Operator::I16x8MinS,
-            0x97 => Operator::I16x8MinU,
-            0x98 => Operator::I16x8MaxS,
-            0x99 => Operator::I16x8MaxU,
-            0x9b => Operator::I16x8RoundingAverageU,
-            0xa0 => Operator::I32x4Abs,
-            0xa1 => Operator::I32x4Neg,
-            0xa2 => Operator::I32x4AnyTrue,
-            0xa3 => Operator::I32x4AllTrue,
-            0xa4 => Operator::I32x4Bitmask,
-            0xa7 => Operator::I32x4WidenLowI16x8S,
-            0xa8 => Operator::I32x4WidenHighI16x8S,
-            0xa9 => Operator::I32x4WidenLowI16x8U,
-            0xaa => Operator::I32x4WidenHighI16x8U,
-            0xab => Operator::I32x4Shl,
-            0xac => Operator::I32x4ShrS,
-            0xad => Operator::I32x4ShrU,
-            0xae => Operator::I32x4Add,
-            0xb1 => Operator::I32x4Sub,
-            0xb5 => Operator::I32x4Mul,
-            0xb6 => Operator::I32x4MinS,
-            0xb7 => Operator::I32x4MinU,
-            0xb8 => Operator::I32x4MaxS,
-            0xb9 => Operator::I32x4MaxU,
-            0xc1 => Operator::I64x2Neg,
-            0xcb => Operator::I64x2Shl,
-            0xcc => Operator::I64x2ShrS,
-            0xcd => Operator::I64x2ShrU,
-            0xce => Operator::I64x2Add,
-            0xd1 => Operator::I64x2Sub,
-            0xd5 => Operator::I64x2Mul,
-            0xe0 => Operator::F32x4Abs,
-            0xe1 => Operator::F32x4Neg,
-            0xe3 => Operator::F32x4Sqrt,
-            0xe4 => Operator::F32x4Add,
-            0xe5 => Operator::F32x4Sub,
-            0xe6 => Operator::F32x4Mul,
-            0xe7 => Operator::F32x4Div,
-            0xe8 => Operator::F32x4Min,
-            0xe9 => Operator::F32x4Max,
-            0xec => Operator::F64x2Abs,
-            0xed => Operator::F64x2Neg,
-            0xef => Operator::F64x2Sqrt,
-            0xf0 => Operator::F64x2Add,
-            0xf1 => Operator::F64x2Sub,
-            0xf2 => Operator::F64x2Mul,
-            0xf3 => Operator::F64x2Div,
-            0xf4 => Operator::F64x2Min,
-            0xf5 => Operator::F64x2Max,
-            0xf8 => Operator::I32x4TruncSatF32x4S,
-            0xf9 => Operator::I32x4TruncSatF32x4U,
-            0xfa => Operator::F32x4ConvertI32x4S,
-            0xfb => Operator::F32x4ConvertI32x4U,
-            _ => {
-                return Err(BinaryReaderError::new(
-                    "Unknown 0xfd opcode",
-                    self.original_position() - 1,
-                ));
-            }
-        })
-    }
-
-    pub(crate) fn read_file_header(&mut self) -> Result<u32> {
-        let magic_number = self.read_bytes(4)?;
-        if magic_number != WASM_MAGIC_NUMBER {
-            return Err(BinaryReaderError::new(
-                "Bad magic number",
-                self.original_position() - 4,
-            ));
-        }
-        let version = self.read_u32()?;
-        if version != WASM_SUPPORTED_VERSION && version != WASM_EXPERIMENTAL_VERSION {
-            return Err(BinaryReaderError::new(
-                "Bad version number",
-                self.original_position() - 4,
-            ));
-        }
-        Ok(version)
-    }
-
-    pub(crate) fn read_name_type(&mut self) -> Result<NameType> {
-        let code = self.read_var_u7()?;
-        match code {
-            0 => Ok(NameType::Module),
-            1 => Ok(NameType::Function),
-            2 => Ok(NameType::Local),
-            _ => Err(BinaryReaderError::new(
-                "Invalid name type",
-                self.original_position() - 1,
-            )),
-        }
-    }
-
-    pub(crate) fn read_linking_type(&mut self) -> Result<LinkingType> {
-        let ty = self.read_var_u32()?;
-        Ok(match ty {
-            1 => LinkingType::StackPointer(self.read_var_u32()?),
-            _ => {
-                return Err(BinaryReaderError::new(
-                    "Invalid linking type",
-                    self.original_position() - 1,
-                ));
-            }
-        })
-    }
-
-    pub(crate) fn read_reloc_type(&mut self) -> Result<RelocType> {
-        let code = self.read_var_u7()?;
-        match code {
-            0 => Ok(RelocType::FunctionIndexLEB),
-            1 => Ok(RelocType::TableIndexSLEB),
-            2 => Ok(RelocType::TableIndexI32),
-            3 => Ok(RelocType::GlobalAddrLEB),
-            4 => Ok(RelocType::GlobalAddrSLEB),
-            5 => Ok(RelocType::GlobalAddrI32),
-            6 => Ok(RelocType::TypeIndexLEB),
-            7 => Ok(RelocType::GlobalIndexLEB),
-            _ => Err(BinaryReaderError::new(
-                "Invalid reloc type",
-                self.original_position() - 1,
-            )),
-        }
-    }
-
-    pub(crate) fn skip_init_expr(&mut self) -> Result<()> {
-        // TODO add skip_operator() method and/or validate init_expr operators.
-        loop {
-            if let Operator::End = self.read_operator()? {
-                return Ok(());
-            }
-        }
-    }
-}
-
-impl<'a> BrTable<'a> {
-    /// Returns the number of `br_table` entries, not including the default
-    /// label
-    pub fn len(&self) -> usize {
-        self.cnt
-    }
-
-    /// Returns whether `BrTable` doesn't have any labels apart from the default one.
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    /// Reads br_table entries.
-    ///
-    /// # Examples
-    /// ```rust
-    /// let buf = vec![0x0e, 0x02, 0x01, 0x02, 0x00];
-    /// let mut reader = wasmparser::BinaryReader::new(&buf);
-    /// let op = reader.read_operator().unwrap();
-    /// if let wasmparser::Operator::BrTable { ref table } = op {
-    ///     let br_table_depths = table.read_table().unwrap();
-    ///     assert!(br_table_depths.0 == vec![1,2].into_boxed_slice() &&
-    ///             br_table_depths.1 == 0);
-    /// } else {
-    ///     unreachable!();
-    /// }
-    /// ```
-    pub fn read_table(&self) -> Result<(Box<[u32]>, u32)> {
-        let mut reader = BinaryReader::new(self.buffer);
-        let mut table = Vec::new();
-        while !reader.eof() {
-            table.push(reader.read_var_u32()?);
-        }
-        let default_target = table.pop().ok_or_else(|| {
-            BinaryReaderError::new(
-                "br_table missing default target",
-                reader.original_position(),
-            )
-        })?;
-        Ok((table.into_boxed_slice(), default_target))
-    }
-}
-
-/// Iterator for `BrTable`.
-///
-/// #Examples
-/// ```rust
-/// let buf = vec![0x0e, 0x02, 0x01, 0x02, 0x00];
-/// let mut reader = wasmparser::BinaryReader::new(&buf);
-/// let op = reader.read_operator().unwrap();
-/// if let wasmparser::Operator::BrTable { ref table } = op {
-///     for depth in table {
-///         println!("BrTable depth: {}", depth);
-///     }
-/// }
-/// ```
-#[derive(Clone, Debug)]
-pub struct BrTableIterator<'a> {
-    reader: BinaryReader<'a>,
-}
-
-impl<'a> IntoIterator for &'a BrTable<'a> {
-    type Item = u32;
-    type IntoIter = BrTableIterator<'a>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        BrTableIterator {
-            reader: BinaryReader::new(self.buffer),
-        }
-    }
-}
-
-impl<'a> Iterator for BrTableIterator<'a> {
-    type Item = u32;
-
-    fn next(&mut self) -> Option<u32> {
-        if self.reader.eof() {
-            return None;
-        }
-        self.reader.read_var_u32().ok()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/* Copyright 2017 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//! A simple event-driven library for parsing WebAssembly binary files
-//! (or streams).
-//!
-//! The parser library reports events as they happend and only stores
-//! parsing information for a brief period of time, making it very fast
-//! and memory-efficient. The event-driven model, however, has some drawbacks.
-//! If you need random access to the entire WebAssembly data-structure,
-//! this is not the right library for you. You could however, build such
-//! a data-structure using this library.
-
-pub use crate::binary_reader::BinaryReader;
-pub use crate::binary_reader::Range;
-
-pub use crate::primitives::BinaryReaderError;
-pub use crate::primitives::BrTable;
-pub use crate::primitives::CustomSectionKind;
-pub use crate::primitives::ExportType;
-pub use crate::primitives::ExternalKind;
-pub use crate::primitives::FuncType;
-pub use crate::primitives::GlobalType;
-pub use crate::primitives::Ieee32;
-pub use crate::primitives::Ieee64;
-pub use crate::primitives::ImportSectionEntryType;
-pub use crate::primitives::InstanceType;
-pub use crate::primitives::LinkingType;
-pub use crate::primitives::MemoryImmediate;
-pub use crate::primitives::MemoryType;
-pub use crate::primitives::ModuleType;
-pub use crate::primitives::NameType;
-pub use crate::primitives::Naming;
-pub use crate::primitives::Operator;
-pub use crate::primitives::RelocType;
-pub use crate::primitives::ResizableLimits;
-pub use crate::primitives::Result;
-pub use crate::primitives::SectionCode;
-pub use crate::primitives::TableType;
-pub use crate::primitives::Type;
-pub use crate::primitives::TypeDef;
-pub use crate::primitives::TypeOrFuncType;
-pub use crate::primitives::V128;
-
-pub use crate::module_resources::WasmFuncType;
-pub use crate::module_resources::WasmGlobalType;
-pub use crate::module_resources::WasmMemoryType;
-pub use crate::module_resources::WasmModuleResources;
-pub use crate::module_resources::WasmTableType;
-pub use crate::module_resources::WasmType;
-pub use crate::module_resources::WasmTypeDef;
-
-pub(crate) use crate::module_resources::{wasm_func_type_inputs, wasm_func_type_outputs};
-
-pub use crate::operators_validator::OperatorValidatorConfig;
-
-pub use crate::parser::*;
-pub use crate::readers::*;
-pub use crate::validator::*;
-
-mod binary_reader;
-mod limits;
-mod module_resources;
-mod operators_validator;
-mod parser;
-mod primitives;
-mod readers;
-mod validator;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/limits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/limits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/limits.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/limits.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/* Copyright 2017 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// The following limits are imposed by wasmparser on WebAssembly modules.
-// The limits are agreed upon with other engines for consistency.
-pub const MAX_WASM_TYPES: usize = 1_000_000;
-pub const MAX_WASM_FUNCTIONS: usize = 1_000_000;
-pub const MAX_WASM_IMPORTS: usize = 100_000;
-pub const MAX_WASM_EXPORTS: usize = 100_000;
-pub const MAX_WASM_GLOBALS: usize = 1_000_000;
-pub const _MAX_WASM_DATA_SEGMENTS: usize = 100_000;
-pub const MAX_WASM_MEMORY_PAGES: usize = 65536;
-pub const MAX_WASM_STRING_SIZE: usize = 100_000;
-pub const _MAX_WASM_MODULE_SIZE: usize = 1024 * 1024 * 1024; //= 1 GiB
-pub const MAX_WASM_FUNCTION_SIZE: usize = 128 * 1024;
-pub const MAX_WASM_FUNCTION_LOCALS: usize = 50000;
-pub const MAX_WASM_FUNCTION_PARAMS: usize = 1000;
-pub const MAX_WASM_FUNCTION_RETURNS: usize = 1000;
-pub const _MAX_WASM_TABLE_SIZE: usize = 10_000_000;
-pub const MAX_WASM_TABLE_ENTRIES: usize = 10_000_000;
-pub const MAX_WASM_TABLES: usize = 100;
-pub const MAX_WASM_MEMORIES: usize = 1;
-pub const MAX_WASM_MODULES: usize = 1_000;
-pub const MAX_WASM_INSTANCES: usize = 1_000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/module_resources.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/module_resources.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/module_resources.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/module_resources.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,433 +0,0 @@
-/* Copyright 2019 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use crate::{FuncType, TypeDef};
-
-/// Types that qualify as Wasm types for validation purposes.
-///
-/// Must be comparable with `wasmparser` given Wasm types and
-/// must be comparable to themselves.
-pub trait WasmType: PartialEq<crate::Type> + PartialEq + Eq {
-    /// Converts the custom type into a `wasmparser` known type.
-    ///
-    /// # Note
-    ///
-    /// This interface is required as bridge until transitioning is complete.
-    fn to_parser_type(&self) -> crate::Type;
-}
-
-pub trait WasmTypeDef {
-    type FuncType: WasmFuncType;
-
-    fn as_func(&self) -> Option<&Self::FuncType>;
-}
-
-/// Types that qualify as Wasm function types for validation purposes.
-pub trait WasmFuncType {
-    /// A type that is comparable with Wasm types.
-    type Type: WasmType;
-
-    /// Returns the number of input types.
-    fn len_inputs(&self) -> usize;
-    /// Returns the number of output types.
-    fn len_outputs(&self) -> usize;
-    /// Returns the type at given index if any.
-    ///
-    /// # Note
-    ///
-    /// The returned type may be wrapped by the user crate and thus
-    /// the actually returned type only has to be comparable to a Wasm type.
-    fn input_at(&self, at: u32) -> Option<&Self::Type>;
-    /// Returns the type at given index if any.
-    ///
-    /// # Note
-    ///
-    /// The returned type may be wrapped by the user crate and thus
-    /// the actually returned type only has to be comparable to a Wasm type.
-    fn output_at(&self, at: u32) -> Option<&Self::Type>;
-}
-
-/// Iterator over the inputs of a Wasm function type.
-pub(crate) struct WasmFuncTypeInputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    /// The iterated-over function type.
-    func_type: &'a F,
-    /// The current starting index.
-    start: u32,
-    /// The current ending index.
-    end: u32,
-}
-
-impl<'a, F, T> WasmFuncTypeInputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    fn new(func_type: &'a F) -> Self {
-        Self {
-            func_type,
-            start: 0,
-            end: func_type.len_inputs() as u32,
-        }
-    }
-}
-
-impl<'a, F, T> Iterator for WasmFuncTypeInputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    type Item = &'a T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.start == self.end {
-            return None;
-        }
-        let ty = self
-            .func_type
-            .input_at(self.start)
-            // Expected since `self.start != self.end`.
-            .expect("we expect to receive an input type at this point");
-        self.start += 1;
-        Some(ty)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.len(), Some(self.len()))
-    }
-}
-
-impl<'a, F, T> DoubleEndedIterator for WasmFuncTypeInputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    fn next_back(&mut self) -> Option<Self::Item> {
-        if self.start == self.end {
-            return None;
-        }
-        let ty = self
-            .func_type
-            .input_at(self.end)
-            // Expected since `self.start != self.end`.
-            .expect("we expect to receive an input type at this point");
-        self.end -= 1;
-        Some(ty)
-    }
-}
-
-impl<'a, F, T> ExactSizeIterator for WasmFuncTypeInputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    fn len(&self) -> usize {
-        (self.end as usize) - (self.start as usize)
-    }
-}
-
-/// Iterator over the outputs of a Wasm function type.
-pub(crate) struct WasmFuncTypeOutputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    /// The iterated-over function type.
-    func_type: &'a F,
-    /// The current starting index.
-    start: u32,
-    /// The current ending index.
-    end: u32,
-}
-
-impl<'a, F, T> WasmFuncTypeOutputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    fn new(func_type: &'a F) -> Self {
-        Self {
-            func_type,
-            start: 0,
-            end: func_type.len_outputs() as u32,
-        }
-    }
-}
-
-impl<'a, F, T> Iterator for WasmFuncTypeOutputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    type Item = &'a T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.start == self.end {
-            return None;
-        }
-        let ty = self
-            .func_type
-            .output_at(self.start)
-            // Expected since `self.start != self.end`.
-            .expect("we expect to receive an input type at this point");
-        self.start += 1;
-        Some(ty)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.len(), Some(self.len()))
-    }
-}
-
-impl<'a, F, T> DoubleEndedIterator for WasmFuncTypeOutputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    fn next_back(&mut self) -> Option<Self::Item> {
-        if self.start == self.end {
-            return None;
-        }
-        let ty = self
-            .func_type
-            .output_at(self.end)
-            // Expected since `self.start != self.end`.
-            .expect("we expect to receive an input type at this point");
-        self.end -= 1;
-        Some(ty)
-    }
-}
-
-impl<'a, F, T> ExactSizeIterator for WasmFuncTypeOutputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    fn len(&self) -> usize {
-        (self.end as usize) - (self.start as usize)
-    }
-}
-
-/// Returns an iterator over the input types of a Wasm function type.
-pub(crate) fn wasm_func_type_inputs<'a, F, T>(func_type: &'a F) -> WasmFuncTypeInputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    WasmFuncTypeInputs::new(func_type)
-}
-
-/// Returns an iterator over the output types of a Wasm function type.
-pub(crate) fn wasm_func_type_outputs<'a, F, T>(func_type: &'a F) -> WasmFuncTypeOutputs<'a, F, T>
-where
-    F: WasmFuncType<Type = T>,
-    T: WasmType + 'a,
-{
-    WasmFuncTypeOutputs::new(func_type)
-}
-
-/// Types that qualify as Wasm table types for validation purposes.
-pub trait WasmTableType {
-    /// A type that is comparable with Wasm types.
-    type Type: WasmType;
-
-    /// Returns the element type of the table.
-    fn element_type(&self) -> &Self::Type;
-    /// Returns the initial limit of the table.
-    fn initial_limit(&self) -> u32;
-    /// Returns the maximum limit of the table if any.
-    fn maximum_limit(&self) -> Option<u32>;
-}
-
-/// Types that qualify as Wasm memory types for validation purposes.
-pub trait WasmMemoryType {
-    /// Returns `true` if the linear memory is shared.
-    fn is_shared(&self) -> bool;
-    /// Returns the initial limit of the linear memory.
-    fn initial_limit(&self) -> u32;
-    /// Returns the maximum limit of the linear memory if any.
-    fn maximum_limit(&self) -> Option<u32>;
-}
-
-/// Types that qualify as Wasm global types for validation purposes.
-pub trait WasmGlobalType {
-    /// A type that is comparable with Wasm types.
-    type Type: WasmType;
-
-    /// Returns `true` if the global variable is mutable.
-    fn is_mutable(&self) -> bool;
-    /// Returns the content type of the global variable.
-    fn content_type(&self) -> &Self::Type;
-}
-
-/// Types  that qualify as Wasm valiation database.
-///
-/// # Note
-///
-/// The `wasmparser` crate provides a builtin validation framework but allows
-/// users of this crate to also feed the parsed Wasm into their own data
-/// structure while parsing and also validate at the same time without
-/// the need of an additional parsing or validation step or copying data around.
-pub trait WasmModuleResources {
-    /// The function type used for validation.
-    type TypeDef: WasmTypeDef;
-    /// The table type used for validation.
-    type TableType: WasmTableType;
-    /// The memory type used for validation.
-    type MemoryType: WasmMemoryType;
-    /// The global type used for validation.
-    type GlobalType: WasmGlobalType;
-
-    /// Returns the type at given index.
-    fn type_at(&self, at: u32) -> Option<&Self::TypeDef>;
-    /// Returns the table at given index if any.
-    fn table_at(&self, at: u32) -> Option<&Self::TableType>;
-    /// Returns the linear memory at given index.
-    fn memory_at(&self, at: u32) -> Option<&Self::MemoryType>;
-    /// Returns the global variable at given index.
-    fn global_at(&self, at: u32) -> Option<&Self::GlobalType>;
-    /// Returns the function signature ID at given index.
-    fn func_type_at(&self, at: u32) -> Option<&<Self::TypeDef as WasmTypeDef>::FuncType>;
-    /// Returns the element type at the given index.
-    fn element_type_at(&self, at: u32) -> Option<crate::Type>;
-
-    /// Returns the number of elements.
-    fn element_count(&self) -> u32;
-    /// Returns the number of bytes in the Wasm data section.
-    fn data_count(&self) -> u32;
-    /// Returns whether the function index is referenced in the module anywhere
-    /// outside of the start/function sections.
-    fn is_function_referenced(&self, idx: u32) -> bool;
-}
-
-impl<T> WasmModuleResources for &'_ T
-where
-    T: ?Sized + WasmModuleResources,
-{
-    type TypeDef = T::TypeDef;
-    type TableType = T::TableType;
-    type MemoryType = T::MemoryType;
-    type GlobalType = T::GlobalType;
-
-    fn type_at(&self, at: u32) -> Option<&Self::TypeDef> {
-        T::type_at(self, at)
-    }
-    fn table_at(&self, at: u32) -> Option<&Self::TableType> {
-        T::table_at(self, at)
-    }
-    fn memory_at(&self, at: u32) -> Option<&Self::MemoryType> {
-        T::memory_at(self, at)
-    }
-    fn global_at(&self, at: u32) -> Option<&Self::GlobalType> {
-        T::global_at(self, at)
-    }
-    fn func_type_at(&self, at: u32) -> Option<&<T::TypeDef as WasmTypeDef>::FuncType> {
-        T::func_type_at(self, at)
-    }
-    fn element_type_at(&self, at: u32) -> Option<crate::Type> {
-        T::element_type_at(self, at)
-    }
-
-    fn element_count(&self) -> u32 {
-        T::element_count(self)
-    }
-    fn data_count(&self) -> u32 {
-        T::data_count(self)
-    }
-    fn is_function_referenced(&self, idx: u32) -> bool {
-        T::is_function_referenced(self, idx)
-    }
-}
-
-impl WasmType for crate::Type {
-    fn to_parser_type(&self) -> crate::Type {
-        *self
-    }
-}
-
-impl<'a> WasmTypeDef for TypeDef<'a> {
-    type FuncType = FuncType;
-
-    fn as_func(&self) -> Option<&Self::FuncType> {
-        match self {
-            TypeDef::Func(f) => Some(f),
-            _ => None,
-        }
-    }
-}
-
-impl WasmFuncType for crate::FuncType {
-    type Type = crate::Type;
-
-    fn len_inputs(&self) -> usize {
-        self.params.len()
-    }
-
-    fn len_outputs(&self) -> usize {
-        self.returns.len()
-    }
-
-    fn input_at(&self, at: u32) -> Option<&Self::Type> {
-        self.params.get(at as usize)
-    }
-
-    fn output_at(&self, at: u32) -> Option<&Self::Type> {
-        self.returns.get(at as usize)
-    }
-}
-
-impl WasmGlobalType for crate::GlobalType {
-    type Type = crate::Type;
-
-    fn is_mutable(&self) -> bool {
-        self.mutable
-    }
-
-    fn content_type(&self) -> &Self::Type {
-        &self.content_type
-    }
-}
-
-impl WasmTableType for crate::TableType {
-    type Type = crate::Type;
-
-    fn element_type(&self) -> &Self::Type {
-        &self.element_type
-    }
-
-    fn initial_limit(&self) -> u32 {
-        self.limits.initial
-    }
-
-    fn maximum_limit(&self) -> Option<u32> {
-        self.limits.maximum
-    }
-}
-
-impl WasmMemoryType for crate::MemoryType {
-    fn is_shared(&self) -> bool {
-        self.shared
-    }
-
-    fn initial_limit(&self) -> u32 {
-        self.limits.initial
-    }
-    fn maximum_limit(&self) -> Option<u32> {
-        self.limits.maximum
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/operators_validator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/operators_validator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/operators_validator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/operators_validator.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2035 +0,0 @@
-/* Copyright 2019 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use std::cmp::min;
-
-use crate::primitives::{MemoryImmediate, Operator, SIMDLaneIndex, Type, TypeOrFuncType};
-use crate::{
-    wasm_func_type_inputs, wasm_func_type_outputs, BinaryReaderError, WasmFuncType, WasmGlobalType,
-    WasmModuleResources, WasmTableType, WasmType, WasmTypeDef,
-};
-
-#[derive(Debug)]
-struct BlockState {
-    start_types: Vec<Type>,
-    return_types: Vec<Type>,
-    // Position in `FuncState::stack_types` array where block values
-    // start.
-    stack_starts_at: usize,
-    // True for loop.
-    jump_to_top: bool,
-    is_else_allowed: bool,
-    is_dead_code: bool,
-    // Amount of the required polymorphic values at the stack_starts_at
-    // position in `FuncState::stack_types` array. These values are
-    // fictitious and are not actually present in the stack_types.
-    polymorphic_values: Option<usize>,
-}
-
-impl BlockState {
-    fn is_stack_polymorphic(&self) -> bool {
-        self.polymorphic_values.is_some()
-    }
-}
-
-#[derive(Debug)]
-struct FuncState {
-    local_types: Vec<Type>,
-    blocks: Vec<BlockState>,
-    stack_types: Vec<Type>,
-    end_function: bool,
-}
-
-impl FuncState {
-    fn block_at(&self, depth: usize) -> &BlockState {
-        assert!(depth < self.blocks.len());
-        &self.blocks[self.blocks.len() - 1 - depth]
-    }
-    fn last_block(&self) -> &BlockState {
-        self.blocks.last().unwrap()
-    }
-    fn stack_type_at(&self, index: usize) -> Option<Type> {
-        let stack_starts_at = self.last_block().stack_starts_at;
-        if self.last_block().is_stack_polymorphic()
-            && stack_starts_at + index >= self.stack_types.len()
-        {
-            return None;
-        }
-        assert!(stack_starts_at + index < self.stack_types.len());
-        Some(self.stack_types[self.stack_types.len() - 1 - index])
-    }
-    fn assert_stack_type_at(&self, index: usize, expected: Type) -> bool {
-        match self.stack_type_at(index) {
-            Some(ty) => ty == expected,
-            None => true,
-        }
-    }
-    fn assert_block_stack_len(&self, depth: usize, minimal_len: usize) -> bool {
-        assert!(depth < self.blocks.len());
-        let blocks_end = self.blocks.len();
-        let block_offset = blocks_end - 1 - depth;
-        for i in block_offset..blocks_end {
-            if self.blocks[i].is_stack_polymorphic() {
-                return true;
-            }
-        }
-        let block_starts_at = self.blocks[block_offset].stack_starts_at;
-        self.stack_types.len() >= block_starts_at + minimal_len
-    }
-    fn assert_last_block_stack_len_exact(&self, len: usize) -> bool {
-        let block_starts_at = self.last_block().stack_starts_at;
-        if self.last_block().is_stack_polymorphic() {
-            let polymorphic_values = self.last_block().polymorphic_values.unwrap();
-            self.stack_types.len() + polymorphic_values <= block_starts_at + len
-        } else {
-            self.stack_types.len() == block_starts_at + len
-        }
-    }
-    fn remove_frame_stack_types(&mut self, remove_count: usize) -> OperatorValidatorResult<()> {
-        if remove_count == 0 {
-            return Ok(());
-        }
-        let last_block = self.blocks.last_mut().unwrap();
-        if last_block.is_stack_polymorphic() {
-            let len = self.stack_types.len();
-            let remove_non_polymorphic = len
-                .checked_sub(last_block.stack_starts_at)
-                .ok_or_else(|| OperatorValidatorError::new("invalid block signature"))?
-                .min(remove_count);
-            self.stack_types.truncate(len - remove_non_polymorphic);
-            let polymorphic_values = last_block.polymorphic_values.unwrap();
-            let remove_polymorphic = min(remove_count - remove_non_polymorphic, polymorphic_values);
-            last_block.polymorphic_values = Some(polymorphic_values - remove_polymorphic);
-        } else {
-            assert!(self.stack_types.len() >= last_block.stack_starts_at + remove_count);
-            let keep = self.stack_types.len() - remove_count;
-            self.stack_types.truncate(keep);
-        }
-        Ok(())
-    }
-    fn push_block(
-        &mut self,
-        ty: TypeOrFuncType,
-        block_type: BlockType,
-        resources: impl WasmModuleResources,
-    ) -> OperatorValidatorResult<()> {
-        let (start_types, return_types) = match ty {
-            TypeOrFuncType::Type(Type::EmptyBlockType) => (vec![], vec![]),
-            TypeOrFuncType::Type(ty) => (vec![], vec![ty]),
-            TypeOrFuncType::FuncType(idx) => {
-                let ty = func_type_at(&resources, idx)?;
-                (
-                    wasm_func_type_inputs(ty)
-                        .map(WasmType::to_parser_type)
-                        .collect::<Vec<_>>(),
-                    wasm_func_type_outputs(ty)
-                        .map(WasmType::to_parser_type)
-                        .collect::<Vec<_>>(),
-                )
-            }
-        };
-        if block_type == BlockType::If {
-            // Collect conditional value from the stack_types.
-            let last_block = self.blocks.last().unwrap();
-            if !last_block.is_stack_polymorphic()
-                || self.stack_types.len() > last_block.stack_starts_at
-            {
-                self.stack_types.pop();
-            }
-            assert!(self.stack_types.len() >= last_block.stack_starts_at);
-        }
-        for (i, ty) in start_types.iter().rev().enumerate() {
-            if !self.assert_stack_type_at(i, *ty) {
-                return Err(OperatorValidatorError::new("stack operand type mismatch"));
-            }
-        }
-        let (stack_starts_at, polymorphic_values) = {
-            // When stack for last block is polymorphic, ensure that
-            // the polymorphic_values matches, and next block is informed about that.
-            let last_block = self.blocks.last_mut().unwrap();
-            if !last_block.is_stack_polymorphic()
-                || last_block.stack_starts_at + start_types.len() <= self.stack_types.len()
-            {
-                (self.stack_types.len() - start_types.len(), None)
-            } else {
-                let unknown_stack_types_len =
-                    last_block.stack_starts_at + start_types.len() - self.stack_types.len();
-                (last_block.stack_starts_at, Some(unknown_stack_types_len))
-            }
-        };
-        self.blocks.push(BlockState {
-            start_types,
-            return_types,
-            stack_starts_at,
-            jump_to_top: block_type == BlockType::Loop,
-            is_else_allowed: block_type == BlockType::If,
-            is_dead_code: false,
-            polymorphic_values,
-        });
-        Ok(())
-    }
-    fn pop_block(&mut self) {
-        assert!(self.blocks.len() > 1);
-        let last_block = self.blocks.pop().unwrap();
-        if last_block.is_stack_polymorphic() {
-            assert!(
-                self.stack_types.len()
-                    <= last_block.return_types.len() + last_block.stack_starts_at
-            );
-        } else {
-            assert!(
-                self.stack_types.len()
-                    == last_block.return_types.len() + last_block.stack_starts_at
-            );
-        }
-        let keep = last_block.stack_starts_at;
-        self.stack_types.truncate(keep);
-        self.stack_types.extend_from_slice(&last_block.return_types);
-    }
-    fn reset_block(&mut self) {
-        assert!(self.last_block().is_else_allowed);
-        let last_block = self.blocks.last_mut().unwrap();
-        let keep = last_block.stack_starts_at;
-        self.stack_types.truncate(keep);
-        self.stack_types
-            .extend(last_block.start_types.iter().cloned());
-        last_block.is_else_allowed = false;
-        last_block.polymorphic_values = None;
-    }
-    fn change_frame(&mut self, remove_count: usize) -> OperatorValidatorResult<()> {
-        self.remove_frame_stack_types(remove_count)
-    }
-    fn change_frame_with_type(
-        &mut self,
-        remove_count: usize,
-        ty: Type,
-    ) -> OperatorValidatorResult<()> {
-        self.remove_frame_stack_types(remove_count)?;
-        self.stack_types.push(ty);
-        Ok(())
-    }
-    fn change_frame_with_types<I>(
-        &mut self,
-        remove_count: usize,
-        new_items: I,
-    ) -> OperatorValidatorResult<()>
-    where
-        I: Iterator<Item = Type>,
-    {
-        self.remove_frame_stack_types(remove_count)?;
-        self.stack_types.extend(new_items);
-        Ok(())
-    }
-    fn change_frame_to_exact_types_from(&mut self, depth: usize) -> OperatorValidatorResult<()> {
-        let types = self.block_at(depth).return_types.clone();
-        let last_block = self.blocks.last_mut().unwrap();
-        let keep = last_block.stack_starts_at;
-        self.stack_types.truncate(keep);
-        self.stack_types.extend_from_slice(&types);
-        last_block.polymorphic_values = None;
-        Ok(())
-    }
-    fn change_frame_after_select(&mut self, ty: Option<Type>) -> OperatorValidatorResult<()> {
-        self.remove_frame_stack_types(3)?;
-        if ty.is_none() {
-            let last_block = self.blocks.last_mut().unwrap();
-            assert!(last_block.is_stack_polymorphic());
-            last_block.polymorphic_values = Some(last_block.polymorphic_values.unwrap() + 1);
-            return Ok(());
-        }
-        self.stack_types.push(ty.unwrap());
-        Ok(())
-    }
-    fn start_dead_code(&mut self) {
-        let last_block = self.blocks.last_mut().unwrap();
-        let keep = last_block.stack_starts_at;
-        self.stack_types.truncate(keep);
-        last_block.is_dead_code = true;
-        last_block.polymorphic_values = Some(0);
-    }
-    fn end_function(&mut self) {
-        self.end_function = true;
-    }
-}
-
-#[derive(Copy, Clone, PartialEq, Eq)]
-enum BlockType {
-    Block,
-    Loop,
-    If,
-}
-
-pub enum FunctionEnd {
-    No,
-    Yes,
-}
-
-/// A wrapper around a `BinaryReaderError` where the inner error's offset is a
-/// temporary placeholder value. This can be converted into a proper
-/// `BinaryReaderError` via the `set_offset` method, which replaces the
-/// placeholder offset with an actual offset.
-pub(crate) struct OperatorValidatorError(pub(crate) BinaryReaderError);
-
-/// Create an `OperatorValidatorError` with a format string.
-macro_rules! format_op_err {
-    ( $( $arg:expr ),* $(,)* ) => {
-        OperatorValidatorError::new(format!( $( $arg ),* ))
-    }
-}
-
-/// Early return an `Err(OperatorValidatorError)` with a format string.
-macro_rules! bail_op_err {
-    ( $( $arg:expr ),* $(,)* ) => {
-        return Err(format_op_err!( $( $arg ),* ));
-    }
-}
-
-impl OperatorValidatorError {
-    /// Create a new `OperatorValidatorError` with a placeholder offset.
-    pub(crate) fn new(message: impl Into<String>) -> Self {
-        let offset = std::usize::MAX;
-        let e = BinaryReaderError::new(message, offset);
-        OperatorValidatorError(e)
-    }
-
-    /// Convert this `OperatorValidatorError` into a `BinaryReaderError` by
-    /// supplying an actual offset to replace the internal placeholder offset.
-    pub(crate) fn set_offset(mut self, offset: usize) -> BinaryReaderError {
-        debug_assert_eq!(self.0.inner.offset, std::usize::MAX);
-        self.0.inner.offset = offset;
-        self.0
-    }
-}
-
-type OperatorValidatorResult<T> = std::result::Result<T, OperatorValidatorError>;
-
-#[derive(Copy, Clone, Debug)]
-pub struct OperatorValidatorConfig {
-    pub enable_threads: bool,
-    pub enable_reference_types: bool,
-    pub enable_simd: bool,
-    pub enable_bulk_memory: bool,
-    pub enable_multi_value: bool,
-    pub enable_tail_call: bool,
-    pub enable_module_linking: bool,
-
-    #[cfg(feature = "deterministic")]
-    pub deterministic_only: bool,
-}
-
-pub(crate) const DEFAULT_OPERATOR_VALIDATOR_CONFIG: OperatorValidatorConfig =
-    OperatorValidatorConfig {
-        enable_threads: false,
-        enable_reference_types: false,
-        enable_simd: false,
-        enable_bulk_memory: false,
-        enable_multi_value: true,
-        enable_tail_call: false,
-        enable_module_linking: false,
-
-        #[cfg(feature = "deterministic")]
-        deterministic_only: true,
-    };
-
-pub(crate) fn check_value_type(
-    ty: Type,
-    operator_config: &OperatorValidatorConfig,
-) -> OperatorValidatorResult<()> {
-    match ty {
-        Type::I32 | Type::I64 | Type::F32 | Type::F64 => Ok(()),
-        Type::FuncRef | Type::ExternRef => {
-            if !operator_config.enable_reference_types {
-                return Err(OperatorValidatorError::new(
-                    "reference types support is not enabled",
-                ));
-            }
-            Ok(())
-        }
-        Type::V128 => {
-            if !operator_config.enable_simd {
-                return Err(OperatorValidatorError::new("SIMD support is not enabled"));
-            }
-            Ok(())
-        }
-        _ => Err(OperatorValidatorError::new("invalid value type")),
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct OperatorValidator {
-    func_state: FuncState,
-    config: OperatorValidatorConfig,
-}
-
-impl OperatorValidator {
-    pub fn new<F, T>(
-        func_type: &F,
-        locals: &[(u32, Type)],
-        config: OperatorValidatorConfig,
-    ) -> OperatorValidatorResult<OperatorValidator>
-    where
-        F: WasmFuncType<Type = T>,
-        T: WasmType,
-    {
-        let local_types = {
-            let mut local_types = wasm_func_type_inputs(func_type)
-                .map(WasmType::to_parser_type)
-                .collect::<Vec<_>>();
-            for local in locals {
-                check_value_type(local.1, &config)?;
-                for _ in 0..local.0 {
-                    local_types.push(local.1);
-                }
-            }
-            local_types
-        };
-        let mut blocks = Vec::new();
-        let last_returns = wasm_func_type_outputs(func_type)
-            .map(WasmType::to_parser_type)
-            .collect::<Vec<_>>();
-        blocks.push(BlockState {
-            start_types: vec![],
-            return_types: last_returns,
-            stack_starts_at: 0,
-            jump_to_top: false,
-            is_else_allowed: false,
-            is_dead_code: false,
-            polymorphic_values: None,
-        });
-
-        Ok(OperatorValidator {
-            func_state: FuncState {
-                local_types,
-                blocks,
-                stack_types: Vec::new(),
-                end_function: false,
-            },
-            config,
-        })
-    }
-
-    fn check_frame_size(&self, require_count: usize) -> OperatorValidatorResult<()> {
-        if !self.func_state.assert_block_stack_len(0, require_count) {
-            Err(OperatorValidatorError::new(
-                "type mismatch: not enough operands",
-            ))
-        } else {
-            Ok(())
-        }
-    }
-
-    fn check_operands_1(&self, operand: Type) -> OperatorValidatorResult<()> {
-        self.check_frame_size(1)?;
-        if !self.func_state.assert_stack_type_at(0, operand) {
-            return Err(OperatorValidatorError::new("stack operand type mismatch"));
-        }
-        Ok(())
-    }
-
-    fn check_operands_2(&self, operand1: Type, operand2: Type) -> OperatorValidatorResult<()> {
-        self.check_frame_size(2)?;
-        if !self.func_state.assert_stack_type_at(1, operand1) {
-            return Err(OperatorValidatorError::new("stack operand type mismatch"));
-        }
-        if !self.func_state.assert_stack_type_at(0, operand2) {
-            return Err(OperatorValidatorError::new("stack operand type mismatch"));
-        }
-        Ok(())
-    }
-
-    fn check_operands_3(
-        &self,
-        operand1: Type,
-        operand2: Type,
-        operand3: Type,
-    ) -> OperatorValidatorResult<()> {
-        self.check_frame_size(3)?;
-        if !self.func_state.assert_stack_type_at(2, operand1) {
-            return Err(OperatorValidatorError::new("stack operand type mismatch"));
-        }
-        if !self.func_state.assert_stack_type_at(1, operand2) {
-            return Err(OperatorValidatorError::new("stack operand type mismatch"));
-        }
-        if !self.func_state.assert_stack_type_at(0, operand3) {
-            return Err(OperatorValidatorError::new("stack operand type mismatch"));
-        }
-        Ok(())
-    }
-
-    fn check_operands<I>(&self, expected_types: I) -> OperatorValidatorResult<()>
-    where
-        I: ExactSizeIterator<Item = Type>,
-    {
-        let len = expected_types.len();
-        self.check_frame_size(len)?;
-        for (i, expected_type) in expected_types.enumerate() {
-            if !self
-                .func_state
-                .assert_stack_type_at(len - 1 - i, expected_type)
-            {
-                return Err(OperatorValidatorError::new("stack operand type mismatch"));
-            }
-        }
-        Ok(())
-    }
-
-    fn check_block_return_types(
-        &self,
-        block: &BlockState,
-        reserve_items: usize,
-    ) -> OperatorValidatorResult<()> {
-        if !self.config.enable_multi_value && block.return_types.len() > 1 {
-            return Err(OperatorValidatorError::new(
-                "blocks, loops, and ifs may only return at most one \
-                 value when multi-value is not enabled",
-            ));
-        }
-        let len = block.return_types.len();
-        for i in 0..len {
-            if !self
-                .func_state
-                .assert_stack_type_at(len - 1 - i + reserve_items, block.return_types[i])
-            {
-                return Err(OperatorValidatorError::new(
-                    "type mismatch: stack item type does not match block item type",
-                ));
-            }
-        }
-        Ok(())
-    }
-
-    fn check_block_return(&self) -> OperatorValidatorResult<()> {
-        let len = self.func_state.last_block().return_types.len();
-        if !self.func_state.assert_last_block_stack_len_exact(len) {
-            return Err(OperatorValidatorError::new(
-                "type mismatch: stack size does not match block type",
-            ));
-        }
-        self.check_block_return_types(self.func_state.last_block(), 0)
-    }
-
-    fn check_call(
-        &mut self,
-        function_index: u32,
-        resources: impl WasmModuleResources,
-    ) -> OperatorValidatorResult<()> {
-        let ty = match resources.func_type_at(function_index) {
-            Some(i) => i,
-            None => {
-                bail_op_err!(
-                    "unknown function {}: function index out of bounds",
-                    function_index
-                );
-            }
-        };
-        self.check_operands(wasm_func_type_inputs(ty).map(WasmType::to_parser_type))?;
-        self.func_state.change_frame_with_types(
-            ty.len_inputs(),
-            wasm_func_type_outputs(ty).map(WasmType::to_parser_type),
-        )?;
-        Ok(())
-    }
-
-    fn check_call_indirect(
-        &mut self,
-        index: u32,
-        table_index: u32,
-        resources: impl WasmModuleResources,
-    ) -> OperatorValidatorResult<()> {
-        if resources.table_at(table_index).is_none() {
-            return Err(OperatorValidatorError::new(
-                "unknown table: table index out of bounds",
-            ));
-        }
-        let ty = func_type_at(&resources, index)?;
-        let types = {
-            let mut types = Vec::with_capacity(ty.len_inputs() + 1);
-            types.extend(wasm_func_type_inputs(ty).map(WasmType::to_parser_type));
-            types.push(Type::I32);
-            types
-        };
-        self.check_operands(types.into_iter())?;
-        self.func_state.change_frame_with_types(
-            ty.len_inputs() + 1,
-            wasm_func_type_outputs(ty).map(WasmType::to_parser_type),
-        )?;
-        Ok(())
-    }
-
-    fn check_return(&mut self) -> OperatorValidatorResult<()> {
-        let depth = (self.func_state.blocks.len() - 1) as u32;
-        self.check_jump_from_block(depth, 0)?;
-        self.func_state.start_dead_code();
-        Ok(())
-    }
-
-    fn check_jump_from_block(
-        &self,
-        relative_depth: u32,
-        reserve_items: usize,
-    ) -> OperatorValidatorResult<()> {
-        if relative_depth as usize >= self.func_state.blocks.len() {
-            return Err(OperatorValidatorError::new(
-                "unknown label: invalid block depth",
-            ));
-        }
-        let block = self.func_state.block_at(relative_depth as usize);
-        if block.jump_to_top {
-            let len = block.start_types.len();
-            if !self
-                .func_state
-                .assert_block_stack_len(0, reserve_items + len)
-            {
-                return Err(OperatorValidatorError::new(
-                    "type mismatch: stack size does not match target loop type",
-                ));
-            }
-            for i in 0..len {
-                if !self
-                    .func_state
-                    .assert_stack_type_at(len - 1 - i + reserve_items, block.start_types[i])
-                {
-                    return Err(OperatorValidatorError::new(
-                        "type mismatch: stack item type does not match block param type",
-                    ));
-                }
-            }
-            return Ok(());
-        }
-
-        let len = block.return_types.len();
-        if !self
-            .func_state
-            .assert_block_stack_len(0, len + reserve_items)
-        {
-            return Err(OperatorValidatorError::new(
-                "type mismatch: stack size does not match target block type",
-            ));
-        }
-        self.check_block_return_types(block, reserve_items)
-    }
-
-    fn match_block_return(&self, depth1: u32, depth2: u32) -> OperatorValidatorResult<()> {
-        if depth1 as usize >= self.func_state.blocks.len() {
-            return Err(OperatorValidatorError::new(
-                "unknown label: invalid block depth",
-            ));
-        }
-        if depth2 as usize >= self.func_state.blocks.len() {
-            return Err(OperatorValidatorError::new(
-                "unknown label: invalid block depth",
-            ));
-        }
-        let block1 = self.func_state.block_at(depth1 as usize);
-        let block2 = self.func_state.block_at(depth2 as usize);
-        let return_types1 = &block1.return_types;
-        let return_types2 = &block2.return_types;
-        if block1.jump_to_top || block2.jump_to_top {
-            if block1.jump_to_top {
-                if !block2.jump_to_top && !return_types2.is_empty() {
-                    return Err(OperatorValidatorError::new(
-                        "type mismatch: block types do not match",
-                    ));
-                }
-            } else if !return_types1.is_empty() {
-                return Err(OperatorValidatorError::new(
-                    "type mismatch: block types do not match",
-                ));
-            }
-        } else if *return_types1 != *return_types2 {
-            return Err(OperatorValidatorError::new(
-                "type mismatch: block types do not match",
-            ));
-        }
-        Ok(())
-    }
-
-    fn check_memory_index(
-        &self,
-        memory_index: u32,
-        resources: impl WasmModuleResources,
-    ) -> OperatorValidatorResult<()> {
-        if resources.memory_at(memory_index).is_none() {
-            bail_op_err!("unknown memory {}", memory_index);
-        }
-        Ok(())
-    }
-
-    fn check_memarg(
-        &self,
-        memarg: MemoryImmediate,
-        max_align: u32,
-        resources: impl WasmModuleResources,
-    ) -> OperatorValidatorResult<()> {
-        self.check_memory_index(0, resources)?;
-        let align = memarg.flags;
-        if align > max_align {
-            return Err(OperatorValidatorError::new(
-                "alignment must not be larger than natural",
-            ));
-        }
-        Ok(())
-    }
-
-    #[cfg(feature = "deterministic")]
-    fn check_non_deterministic_enabled(&self) -> OperatorValidatorResult<()> {
-        if !self.config.deterministic_only {
-            return Err(OperatorValidatorError::new(
-                "deterministic_only support is not enabled",
-            ));
-        }
-        Ok(())
-    }
-
-    #[inline(always)]
-    #[cfg(not(feature = "deterministic"))]
-    fn check_non_deterministic_enabled(&self) -> OperatorValidatorResult<()> {
-        Ok(())
-    }
-
-    fn check_threads_enabled(&self) -> OperatorValidatorResult<()> {
-        if !self.config.enable_threads {
-            return Err(OperatorValidatorError::new(
-                "threads support is not enabled",
-            ));
-        }
-        Ok(())
-    }
-
-    fn check_reference_types_enabled(&self) -> OperatorValidatorResult<()> {
-        if !self.config.enable_reference_types {
-            return Err(OperatorValidatorError::new(
-                "reference types support is not enabled",
-            ));
-        }
-        Ok(())
-    }
-
-    fn check_simd_enabled(&self) -> OperatorValidatorResult<()> {
-        if !self.config.enable_simd {
-            return Err(OperatorValidatorError::new("SIMD support is not enabled"));
-        }
-        Ok(())
-    }
-
-    fn check_bulk_memory_enabled(&self) -> OperatorValidatorResult<()> {
-        if !self.config.enable_bulk_memory {
-            return Err(OperatorValidatorError::new(
-                "bulk memory support is not enabled",
-            ));
-        }
-        Ok(())
-    }
-
-    fn check_shared_memarg_wo_align(
-        &self,
-        _: MemoryImmediate,
-        resources: impl WasmModuleResources,
-    ) -> OperatorValidatorResult<()> {
-        self.check_memory_index(0, resources)?;
-        Ok(())
-    }
-
-    fn check_simd_lane_index(&self, index: SIMDLaneIndex, max: u8) -> OperatorValidatorResult<()> {
-        if index >= max {
-            return Err(OperatorValidatorError::new("SIMD index out of bounds"));
-        }
-        Ok(())
-    }
-
-    fn check_block_type(
-        &self,
-        ty: TypeOrFuncType,
-        resources: impl WasmModuleResources,
-    ) -> OperatorValidatorResult<()> {
-        match ty {
-            TypeOrFuncType::Type(Type::EmptyBlockType)
-            | TypeOrFuncType::Type(Type::I32)
-            | TypeOrFuncType::Type(Type::I64)
-            | TypeOrFuncType::Type(Type::F32)
-            | TypeOrFuncType::Type(Type::F64) => Ok(()),
-            TypeOrFuncType::Type(Type::ExternRef) | TypeOrFuncType::Type(Type::FuncRef) => {
-                self.check_reference_types_enabled()
-            }
-            TypeOrFuncType::Type(Type::V128) => self.check_simd_enabled(),
-            TypeOrFuncType::FuncType(idx) => {
-                let ty = func_type_at(&resources, idx)?;
-                if !self.config.enable_multi_value {
-                    if ty.len_outputs() > 1 {
-                        return Err(OperatorValidatorError::new(
-                            "blocks, loops, and ifs may only return at most one \
-                             value when multi-value is not enabled",
-                        ));
-                    }
-                    if ty.len_inputs() > 0 {
-                        return Err(OperatorValidatorError::new(
-                            "blocks, loops, and ifs accept no parameters \
-                             when multi-value is not enabled",
-                        ));
-                    }
-                }
-                Ok(())
-            }
-            _ => Err(OperatorValidatorError::new("invalid block return type")),
-        }
-    }
-
-    fn check_block_params(
-        &self,
-        ty: TypeOrFuncType,
-        resources: impl WasmModuleResources,
-        skip: usize,
-    ) -> OperatorValidatorResult<()> {
-        if let TypeOrFuncType::FuncType(idx) = ty {
-            let func_ty = func_type_at(&resources, idx)?;
-            let len = func_ty.len_inputs();
-            self.check_frame_size(len + skip)?;
-            for (i, ty) in wasm_func_type_inputs(func_ty).enumerate() {
-                if !self
-                    .func_state
-                    .assert_stack_type_at(len - 1 - i + skip, ty.to_parser_type())
-                {
-                    return Err(OperatorValidatorError::new(
-                        "stack operand type mismatch for block",
-                    ));
-                }
-            }
-        }
-        Ok(())
-    }
-
-    fn check_select(&self, expected_ty: Option<Type>) -> OperatorValidatorResult<Option<Type>> {
-        self.check_frame_size(3)?;
-        let func_state = &self.func_state;
-        let last_block = func_state.last_block();
-
-        let ty = if last_block.is_stack_polymorphic() {
-            match func_state.stack_types.len() - last_block.stack_starts_at {
-                0 => return Ok(None),
-                1 => {
-                    self.check_operands_1(Type::I32)?;
-                    return Ok(None);
-                }
-                2 => {
-                    self.check_operands_1(Type::I32)?;
-                    func_state.stack_types[func_state.stack_types.len() - 2]
-                }
-                _ => {
-                    let ty = expected_ty
-                        .unwrap_or(func_state.stack_types[func_state.stack_types.len() - 3]);
-                    self.check_operands_2(ty, Type::I32)?;
-                    ty
-                }
-            }
-        } else {
-            let ty =
-                expected_ty.unwrap_or(func_state.stack_types[func_state.stack_types.len() - 3]);
-            self.check_operands_2(ty, Type::I32)?;
-            ty
-        };
-
-        Ok(Some(ty))
-    }
-
-    pub(crate) fn process_operator(
-        &mut self,
-        operator: &Operator,
-        resources: &impl WasmModuleResources,
-    ) -> OperatorValidatorResult<FunctionEnd> {
-        if self.func_state.end_function {
-            return Err(OperatorValidatorError::new("unexpected operator"));
-        }
-        match *operator {
-            Operator::Unreachable => self.func_state.start_dead_code(),
-            Operator::Nop => (),
-            Operator::Block { ty } => {
-                self.check_block_type(ty, resources)?;
-                self.check_block_params(ty, resources, 0)?;
-                self.func_state
-                    .push_block(ty, BlockType::Block, resources)?;
-            }
-            Operator::Loop { ty } => {
-                self.check_block_type(ty, resources)?;
-                self.check_block_params(ty, resources, 0)?;
-                self.func_state.push_block(ty, BlockType::Loop, resources)?;
-            }
-            Operator::If { ty } => {
-                self.check_block_type(ty, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.check_block_params(ty, resources, 1)?;
-                self.func_state.push_block(ty, BlockType::If, resources)?;
-            }
-            Operator::Else => {
-                if !self.func_state.last_block().is_else_allowed {
-                    return Err(OperatorValidatorError::new(
-                        "unexpected else: if block is not started",
-                    ));
-                }
-                self.check_block_return()?;
-                self.func_state.reset_block()
-            }
-            Operator::End => {
-                self.check_block_return()?;
-                if self.func_state.blocks.len() == 1 {
-                    self.func_state.end_function();
-                    return Ok(FunctionEnd::Yes);
-                }
-
-                let last_block = &self.func_state.last_block();
-                if last_block.is_else_allowed && last_block.start_types != last_block.return_types {
-                    return Err(OperatorValidatorError::new("type mismatch: else is expected: if block has a type that can't be implemented with a no-op"));
-                }
-                self.func_state.pop_block()
-            }
-            Operator::Br { relative_depth } => {
-                self.check_jump_from_block(relative_depth, 0)?;
-                self.func_state.start_dead_code()
-            }
-            Operator::BrIf { relative_depth } => {
-                self.check_operands_1(Type::I32)?;
-                self.check_jump_from_block(relative_depth, 1)?;
-                if self.func_state.last_block().is_stack_polymorphic() {
-                    self.func_state
-                        .change_frame_to_exact_types_from(relative_depth as usize)?;
-                } else {
-                    self.func_state.change_frame(1)?;
-                }
-            }
-            Operator::BrTable { ref table } => {
-                self.check_operands_1(Type::I32)?;
-                let mut depth0: Option<u32> = None;
-                for relative_depth in table {
-                    if depth0.is_none() {
-                        self.check_jump_from_block(relative_depth, 1)?;
-                        depth0 = Some(relative_depth);
-                        continue;
-                    }
-                    self.match_block_return(relative_depth, depth0.unwrap())?;
-                }
-                self.func_state.start_dead_code()
-            }
-            Operator::Return => self.check_return()?,
-            Operator::Call { function_index } => self.check_call(function_index, resources)?,
-            Operator::ReturnCall { function_index } => {
-                if !self.config.enable_tail_call {
-                    return Err(OperatorValidatorError::new(
-                        "tail calls support is not enabled",
-                    ));
-                }
-                self.check_call(function_index, resources)?;
-                self.check_return()?;
-            }
-            Operator::CallIndirect { index, table_index } => {
-                self.check_call_indirect(index, table_index, resources)?
-            }
-            Operator::ReturnCallIndirect { index, table_index } => {
-                if !self.config.enable_tail_call {
-                    return Err(OperatorValidatorError::new(
-                        "tail calls support is not enabled",
-                    ));
-                }
-                self.check_call_indirect(index, table_index, resources)?;
-                self.check_return()?;
-            }
-            Operator::Drop => {
-                self.check_frame_size(1)?;
-                self.func_state.change_frame(1)?;
-            }
-            Operator::Select => {
-                let ty = self.check_select(None)?;
-                match ty {
-                    Some(Type::I32) | Some(Type::I64) | Some(Type::F32) | Some(Type::F64) => {}
-                    Some(_) => {
-                        bail_op_err!("type mismatch: only integer types allowed with bare `select`")
-                    }
-                    None => {}
-                }
-                self.func_state.change_frame_after_select(ty)?;
-            }
-            Operator::TypedSelect { ty } => {
-                self.check_select(Some(ty))?;
-                self.func_state.change_frame_after_select(Some(ty))?;
-            }
-            Operator::LocalGet { local_index } => {
-                if local_index as usize >= self.func_state.local_types.len() {
-                    bail_op_err!("unknown local {}: local index out of bounds", local_index);
-                }
-                let local_type = self.func_state.local_types[local_index as usize];
-                self.func_state.change_frame_with_type(0, local_type)?;
-            }
-            Operator::LocalSet { local_index } => {
-                if local_index as usize >= self.func_state.local_types.len() {
-                    bail_op_err!("unknown local {}: local index out of bounds", local_index);
-                }
-                let local_type = self.func_state.local_types[local_index as usize];
-                self.check_operands_1(local_type)?;
-                self.func_state.change_frame(1)?;
-            }
-            Operator::LocalTee { local_index } => {
-                if local_index as usize >= self.func_state.local_types.len() {
-                    bail_op_err!("unknown local {}: local index out of bounds", local_index);
-                }
-                let local_type = self.func_state.local_types[local_index as usize];
-                self.check_operands_1(local_type)?;
-                self.func_state.change_frame_with_type(1, local_type)?;
-            }
-            Operator::GlobalGet { global_index } => {
-                if let Some(ty) = resources.global_at(global_index) {
-                    self.func_state
-                        .change_frame_with_type(0, ty.content_type().to_parser_type())?;
-                } else {
-                    return Err(OperatorValidatorError::new(
-                        "unknown global: global index out of bounds",
-                    ));
-                };
-            }
-            Operator::GlobalSet { global_index } => {
-                if let Some(ty) = resources.global_at(global_index) {
-                    if !ty.is_mutable() {
-                        return Err(OperatorValidatorError::new(
-                            "global is immutable: cannot modify it with `global.set`",
-                        ));
-                    }
-                    self.check_operands_1(ty.content_type().to_parser_type())?;
-                    self.func_state.change_frame(1)?;
-                } else {
-                    return Err(OperatorValidatorError::new(
-                        "unknown global: global index out of bounds",
-                    ));
-                };
-            }
-            Operator::I32Load { memarg } => {
-                self.check_memarg(memarg, 2, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I64Load { memarg } => {
-                self.check_memarg(memarg, 3, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::F32Load { memarg } => {
-                self.check_non_deterministic_enabled()?;
-                self.check_memarg(memarg, 2, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::F32)?;
-            }
-            Operator::F64Load { memarg } => {
-                self.check_non_deterministic_enabled()?;
-                self.check_memarg(memarg, 3, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::F64)?;
-            }
-            Operator::I32Load8S { memarg } => {
-                self.check_memarg(memarg, 0, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32Load8U { memarg } => {
-                self.check_memarg(memarg, 0, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32Load16S { memarg } => {
-                self.check_memarg(memarg, 1, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32Load16U { memarg } => {
-                self.check_memarg(memarg, 1, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I64Load8S { memarg } => {
-                self.check_memarg(memarg, 0, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64Load8U { memarg } => {
-                self.check_memarg(memarg, 0, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64Load16S { memarg } => {
-                self.check_memarg(memarg, 1, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64Load16U { memarg } => {
-                self.check_memarg(memarg, 1, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64Load32S { memarg } => {
-                self.check_memarg(memarg, 2, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64Load32U { memarg } => {
-                self.check_memarg(memarg, 2, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I32Store { memarg } => {
-                self.check_memarg(memarg, 2, resources)?;
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::I64Store { memarg } => {
-                self.check_memarg(memarg, 3, resources)?;
-                self.check_operands_2(Type::I32, Type::I64)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::F32Store { memarg } => {
-                self.check_non_deterministic_enabled()?;
-                self.check_memarg(memarg, 2, resources)?;
-                self.check_operands_2(Type::I32, Type::F32)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::F64Store { memarg } => {
-                self.check_non_deterministic_enabled()?;
-                self.check_memarg(memarg, 3, resources)?;
-                self.check_operands_2(Type::I32, Type::F64)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::I32Store8 { memarg } => {
-                self.check_memarg(memarg, 0, resources)?;
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::I32Store16 { memarg } => {
-                self.check_memarg(memarg, 1, resources)?;
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::I64Store8 { memarg } => {
-                self.check_memarg(memarg, 0, resources)?;
-                self.check_operands_2(Type::I32, Type::I64)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::I64Store16 { memarg } => {
-                self.check_memarg(memarg, 1, resources)?;
-                self.check_operands_2(Type::I32, Type::I64)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::I64Store32 { memarg } => {
-                self.check_memarg(memarg, 2, resources)?;
-                self.check_operands_2(Type::I32, Type::I64)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::MemorySize {
-                reserved: memory_index,
-            } => {
-                self.check_memory_index(memory_index, resources)?;
-                self.func_state.change_frame_with_type(0, Type::I32)?;
-            }
-            Operator::MemoryGrow {
-                reserved: memory_index,
-            } => {
-                self.check_memory_index(memory_index, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32Const { .. } => self.func_state.change_frame_with_type(0, Type::I32)?,
-            Operator::I64Const { .. } => self.func_state.change_frame_with_type(0, Type::I64)?,
-            Operator::F32Const { .. } => {
-                self.check_non_deterministic_enabled()?;
-                self.func_state.change_frame_with_type(0, Type::F32)?;
-            }
-            Operator::F64Const { .. } => {
-                self.check_non_deterministic_enabled()?;
-                self.func_state.change_frame_with_type(0, Type::F64)?;
-            }
-            Operator::I32Eqz => {
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32Eq
-            | Operator::I32Ne
-            | Operator::I32LtS
-            | Operator::I32LtU
-            | Operator::I32GtS
-            | Operator::I32GtU
-            | Operator::I32LeS
-            | Operator::I32LeU
-            | Operator::I32GeS
-            | Operator::I32GeU => {
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::I64Eqz => {
-                self.check_operands_1(Type::I64)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I64Eq
-            | Operator::I64Ne
-            | Operator::I64LtS
-            | Operator::I64LtU
-            | Operator::I64GtS
-            | Operator::I64GtU
-            | Operator::I64LeS
-            | Operator::I64LeU
-            | Operator::I64GeS
-            | Operator::I64GeU => {
-                self.check_operands_2(Type::I64, Type::I64)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::F32Eq
-            | Operator::F32Ne
-            | Operator::F32Lt
-            | Operator::F32Gt
-            | Operator::F32Le
-            | Operator::F32Ge => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_2(Type::F32, Type::F32)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::F64Eq
-            | Operator::F64Ne
-            | Operator::F64Lt
-            | Operator::F64Gt
-            | Operator::F64Le
-            | Operator::F64Ge => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_2(Type::F64, Type::F64)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::I32Clz | Operator::I32Ctz | Operator::I32Popcnt => {
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32Add
-            | Operator::I32Sub
-            | Operator::I32Mul
-            | Operator::I32DivS
-            | Operator::I32DivU
-            | Operator::I32RemS
-            | Operator::I32RemU
-            | Operator::I32And
-            | Operator::I32Or
-            | Operator::I32Xor
-            | Operator::I32Shl
-            | Operator::I32ShrS
-            | Operator::I32ShrU
-            | Operator::I32Rotl
-            | Operator::I32Rotr => {
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::I64Clz | Operator::I64Ctz | Operator::I64Popcnt => {
-                self.check_operands_1(Type::I64)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64Add
-            | Operator::I64Sub
-            | Operator::I64Mul
-            | Operator::I64DivS
-            | Operator::I64DivU
-            | Operator::I64RemS
-            | Operator::I64RemU
-            | Operator::I64And
-            | Operator::I64Or
-            | Operator::I64Xor
-            | Operator::I64Shl
-            | Operator::I64ShrS
-            | Operator::I64ShrU
-            | Operator::I64Rotl
-            | Operator::I64Rotr => {
-                self.check_operands_2(Type::I64, Type::I64)?;
-                self.func_state.change_frame_with_type(2, Type::I64)?;
-            }
-            Operator::F32Abs
-            | Operator::F32Neg
-            | Operator::F32Ceil
-            | Operator::F32Floor
-            | Operator::F32Trunc
-            | Operator::F32Nearest
-            | Operator::F32Sqrt => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::F32)?;
-                self.func_state.change_frame_with_type(1, Type::F32)?;
-            }
-            Operator::F32Add
-            | Operator::F32Sub
-            | Operator::F32Mul
-            | Operator::F32Div
-            | Operator::F32Min
-            | Operator::F32Max
-            | Operator::F32Copysign => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_2(Type::F32, Type::F32)?;
-                self.func_state.change_frame_with_type(2, Type::F32)?;
-            }
-            Operator::F64Abs
-            | Operator::F64Neg
-            | Operator::F64Ceil
-            | Operator::F64Floor
-            | Operator::F64Trunc
-            | Operator::F64Nearest
-            | Operator::F64Sqrt => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::F64)?;
-                self.func_state.change_frame_with_type(1, Type::F64)?;
-            }
-            Operator::F64Add
-            | Operator::F64Sub
-            | Operator::F64Mul
-            | Operator::F64Div
-            | Operator::F64Min
-            | Operator::F64Max
-            | Operator::F64Copysign => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_2(Type::F64, Type::F64)?;
-                self.func_state.change_frame_with_type(2, Type::F64)?;
-            }
-            Operator::I32WrapI64 => {
-                self.check_operands_1(Type::I64)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32TruncF32S | Operator::I32TruncF32U => {
-                self.check_operands_1(Type::F32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32TruncF64S | Operator::I32TruncF64U => {
-                self.check_operands_1(Type::F64)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I64ExtendI32S | Operator::I64ExtendI32U => {
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64TruncF32S | Operator::I64TruncF32U => {
-                self.check_operands_1(Type::F32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64TruncF64S | Operator::I64TruncF64U => {
-                self.check_operands_1(Type::F64)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::F32ConvertI32S | Operator::F32ConvertI32U => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::F32)?;
-            }
-            Operator::F32ConvertI64S | Operator::F32ConvertI64U => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::I64)?;
-                self.func_state.change_frame_with_type(1, Type::F32)?;
-            }
-            Operator::F32DemoteF64 => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::F64)?;
-                self.func_state.change_frame_with_type(1, Type::F32)?;
-            }
-            Operator::F64ConvertI32S | Operator::F64ConvertI32U => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::F64)?;
-            }
-            Operator::F64ConvertI64S | Operator::F64ConvertI64U => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::I64)?;
-                self.func_state.change_frame_with_type(1, Type::F64)?;
-            }
-            Operator::F64PromoteF32 => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::F32)?;
-                self.func_state.change_frame_with_type(1, Type::F64)?;
-            }
-            Operator::I32ReinterpretF32 => {
-                self.check_operands_1(Type::F32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I64ReinterpretF64 => {
-                self.check_operands_1(Type::F64)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::F32ReinterpretI32 => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::F32)?;
-            }
-            Operator::F64ReinterpretI64 => {
-                self.check_non_deterministic_enabled()?;
-                self.check_operands_1(Type::I64)?;
-                self.func_state.change_frame_with_type(1, Type::F64)?;
-            }
-            Operator::I32TruncSatF32S | Operator::I32TruncSatF32U => {
-                self.check_operands_1(Type::F32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32TruncSatF64S | Operator::I32TruncSatF64U => {
-                self.check_operands_1(Type::F64)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I64TruncSatF32S | Operator::I64TruncSatF32U => {
-                self.check_operands_1(Type::F32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64TruncSatF64S | Operator::I64TruncSatF64U => {
-                self.check_operands_1(Type::F64)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I32Extend16S | Operator::I32Extend8S => {
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-
-            Operator::I64Extend32S | Operator::I64Extend16S | Operator::I64Extend8S => {
-                self.check_operands_1(Type::I64)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-
-            Operator::I32AtomicLoad { memarg }
-            | Operator::I32AtomicLoad16U { memarg }
-            | Operator::I32AtomicLoad8U { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I64AtomicLoad { memarg }
-            | Operator::I64AtomicLoad32U { memarg }
-            | Operator::I64AtomicLoad16U { memarg }
-            | Operator::I64AtomicLoad8U { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I32AtomicStore { memarg }
-            | Operator::I32AtomicStore16 { memarg }
-            | Operator::I32AtomicStore8 { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::I64AtomicStore { memarg }
-            | Operator::I64AtomicStore32 { memarg }
-            | Operator::I64AtomicStore16 { memarg }
-            | Operator::I64AtomicStore8 { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_2(Type::I32, Type::I64)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::I32AtomicRmwAdd { memarg }
-            | Operator::I32AtomicRmwSub { memarg }
-            | Operator::I32AtomicRmwAnd { memarg }
-            | Operator::I32AtomicRmwOr { memarg }
-            | Operator::I32AtomicRmwXor { memarg }
-            | Operator::I32AtomicRmw16AddU { memarg }
-            | Operator::I32AtomicRmw16SubU { memarg }
-            | Operator::I32AtomicRmw16AndU { memarg }
-            | Operator::I32AtomicRmw16OrU { memarg }
-            | Operator::I32AtomicRmw16XorU { memarg }
-            | Operator::I32AtomicRmw8AddU { memarg }
-            | Operator::I32AtomicRmw8SubU { memarg }
-            | Operator::I32AtomicRmw8AndU { memarg }
-            | Operator::I32AtomicRmw8OrU { memarg }
-            | Operator::I32AtomicRmw8XorU { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::I64AtomicRmwAdd { memarg }
-            | Operator::I64AtomicRmwSub { memarg }
-            | Operator::I64AtomicRmwAnd { memarg }
-            | Operator::I64AtomicRmwOr { memarg }
-            | Operator::I64AtomicRmwXor { memarg }
-            | Operator::I64AtomicRmw32AddU { memarg }
-            | Operator::I64AtomicRmw32SubU { memarg }
-            | Operator::I64AtomicRmw32AndU { memarg }
-            | Operator::I64AtomicRmw32OrU { memarg }
-            | Operator::I64AtomicRmw32XorU { memarg }
-            | Operator::I64AtomicRmw16AddU { memarg }
-            | Operator::I64AtomicRmw16SubU { memarg }
-            | Operator::I64AtomicRmw16AndU { memarg }
-            | Operator::I64AtomicRmw16OrU { memarg }
-            | Operator::I64AtomicRmw16XorU { memarg }
-            | Operator::I64AtomicRmw8AddU { memarg }
-            | Operator::I64AtomicRmw8SubU { memarg }
-            | Operator::I64AtomicRmw8AndU { memarg }
-            | Operator::I64AtomicRmw8OrU { memarg }
-            | Operator::I64AtomicRmw8XorU { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_2(Type::I32, Type::I64)?;
-                self.func_state.change_frame_with_type(2, Type::I64)?;
-            }
-            Operator::I32AtomicRmwXchg { memarg }
-            | Operator::I32AtomicRmw16XchgU { memarg }
-            | Operator::I32AtomicRmw8XchgU { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::I32AtomicRmwCmpxchg { memarg }
-            | Operator::I32AtomicRmw16CmpxchgU { memarg }
-            | Operator::I32AtomicRmw8CmpxchgU { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_3(Type::I32, Type::I32, Type::I32)?;
-                self.func_state.change_frame_with_type(3, Type::I32)?;
-            }
-            Operator::I64AtomicRmwXchg { memarg }
-            | Operator::I64AtomicRmw32XchgU { memarg }
-            | Operator::I64AtomicRmw16XchgU { memarg }
-            | Operator::I64AtomicRmw8XchgU { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_2(Type::I32, Type::I64)?;
-                self.func_state.change_frame_with_type(2, Type::I64)?;
-            }
-            Operator::I64AtomicRmwCmpxchg { memarg }
-            | Operator::I64AtomicRmw32CmpxchgU { memarg }
-            | Operator::I64AtomicRmw16CmpxchgU { memarg }
-            | Operator::I64AtomicRmw8CmpxchgU { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_3(Type::I32, Type::I64, Type::I64)?;
-                self.func_state.change_frame_with_type(3, Type::I64)?;
-            }
-            Operator::AtomicNotify { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_2(Type::I32, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::I32AtomicWait { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_3(Type::I32, Type::I32, Type::I64)?;
-                self.func_state.change_frame_with_type(3, Type::I32)?;
-            }
-            Operator::I64AtomicWait { memarg } => {
-                self.check_threads_enabled()?;
-                self.check_shared_memarg_wo_align(memarg, resources)?;
-                self.check_operands_3(Type::I32, Type::I64, Type::I64)?;
-                self.func_state.change_frame_with_type(3, Type::I32)?;
-            }
-            Operator::AtomicFence { ref flags } => {
-                self.check_threads_enabled()?;
-                if *flags != 0 {
-                    return Err(OperatorValidatorError::new(
-                        "non-zero flags for fence not supported yet",
-                    ));
-                }
-            }
-            Operator::RefNull { ty } => {
-                self.check_reference_types_enabled()?;
-                match ty {
-                    Type::FuncRef | Type::ExternRef => {}
-                    _ => {
-                        return Err(OperatorValidatorError::new(
-                            "invalid reference type in ref.null",
-                        ))
-                    }
-                }
-                self.func_state.change_frame_with_type(0, ty)?;
-            }
-            Operator::RefIsNull => {
-                self.check_reference_types_enabled()?;
-                self.check_frame_size(1)?;
-                match self.func_state.stack_type_at(0) {
-                    None | Some(Type::FuncRef) | Some(Type::ExternRef) => {}
-                    _ => {
-                        return Err(OperatorValidatorError::new(
-                            "type mismatch: invalid reference type in ref.is_null",
-                        ))
-                    }
-                }
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::RefFunc { function_index } => {
-                self.check_reference_types_enabled()?;
-                if resources.func_type_at(function_index).is_none() {
-                    return Err(OperatorValidatorError::new(
-                        "unknown function: function index out of bounds",
-                    ));
-                }
-                if !resources.is_function_referenced(function_index) {
-                    return Err(OperatorValidatorError::new("undeclared function reference"));
-                }
-                self.func_state.change_frame_with_type(0, Type::FuncRef)?;
-            }
-            Operator::V128Load { memarg } => {
-                self.check_simd_enabled()?;
-                self.check_memarg(memarg, 4, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::V128Store { memarg } => {
-                self.check_simd_enabled()?;
-                self.check_memarg(memarg, 4, resources)?;
-                self.check_operands_2(Type::I32, Type::V128)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::V128Const { .. } => {
-                self.check_simd_enabled()?;
-                self.func_state.change_frame_with_type(0, Type::V128)?;
-            }
-            Operator::I8x16Splat | Operator::I16x8Splat | Operator::I32x4Splat => {
-                self.check_simd_enabled()?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::I64x2Splat => {
-                self.check_simd_enabled()?;
-                self.check_operands_1(Type::I64)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::F32x4Splat => {
-                self.check_non_deterministic_enabled()?;
-                self.check_simd_enabled()?;
-                self.check_operands_1(Type::F32)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::F64x2Splat => {
-                self.check_non_deterministic_enabled()?;
-                self.check_simd_enabled()?;
-                self.check_operands_1(Type::F64)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::I8x16ExtractLaneS { lane } | Operator::I8x16ExtractLaneU { lane } => {
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 16)?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I16x8ExtractLaneS { lane } | Operator::I16x8ExtractLaneU { lane } => {
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 8)?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I32x4ExtractLane { lane } => {
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 4)?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I8x16ReplaceLane { lane } => {
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 16)?;
-                self.check_operands_2(Type::V128, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::I16x8ReplaceLane { lane } => {
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 8)?;
-                self.check_operands_2(Type::V128, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::I32x4ReplaceLane { lane } => {
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 4)?;
-                self.check_operands_2(Type::V128, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::I64x2ExtractLane { lane } => {
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 2)?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::I64)?;
-            }
-            Operator::I64x2ReplaceLane { lane } => {
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 2)?;
-                self.check_operands_2(Type::V128, Type::I64)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::F32x4ExtractLane { lane } => {
-                self.check_non_deterministic_enabled()?;
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 4)?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::F32)?;
-            }
-            Operator::F32x4ReplaceLane { lane } => {
-                self.check_non_deterministic_enabled()?;
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 4)?;
-                self.check_operands_2(Type::V128, Type::F32)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::F64x2ExtractLane { lane } => {
-                self.check_non_deterministic_enabled()?;
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 2)?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::F64)?;
-            }
-            Operator::F64x2ReplaceLane { lane } => {
-                self.check_non_deterministic_enabled()?;
-                self.check_simd_enabled()?;
-                self.check_simd_lane_index(lane, 2)?;
-                self.check_operands_2(Type::V128, Type::F64)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::F32x4Eq
-            | Operator::F32x4Ne
-            | Operator::F32x4Lt
-            | Operator::F32x4Gt
-            | Operator::F32x4Le
-            | Operator::F32x4Ge
-            | Operator::F64x2Eq
-            | Operator::F64x2Ne
-            | Operator::F64x2Lt
-            | Operator::F64x2Gt
-            | Operator::F64x2Le
-            | Operator::F64x2Ge
-            | Operator::F32x4Add
-            | Operator::F32x4Sub
-            | Operator::F32x4Mul
-            | Operator::F32x4Div
-            | Operator::F32x4Min
-            | Operator::F32x4Max
-            | Operator::F64x2Add
-            | Operator::F64x2Sub
-            | Operator::F64x2Mul
-            | Operator::F64x2Div
-            | Operator::F64x2Min
-            | Operator::F64x2Max => {
-                self.check_non_deterministic_enabled()?;
-                self.check_simd_enabled()?;
-                self.check_operands_2(Type::V128, Type::V128)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::I8x16Eq
-            | Operator::I8x16Ne
-            | Operator::I8x16LtS
-            | Operator::I8x16LtU
-            | Operator::I8x16GtS
-            | Operator::I8x16GtU
-            | Operator::I8x16LeS
-            | Operator::I8x16LeU
-            | Operator::I8x16GeS
-            | Operator::I8x16GeU
-            | Operator::I16x8Eq
-            | Operator::I16x8Ne
-            | Operator::I16x8LtS
-            | Operator::I16x8LtU
-            | Operator::I16x8GtS
-            | Operator::I16x8GtU
-            | Operator::I16x8LeS
-            | Operator::I16x8LeU
-            | Operator::I16x8GeS
-            | Operator::I16x8GeU
-            | Operator::I32x4Eq
-            | Operator::I32x4Ne
-            | Operator::I32x4LtS
-            | Operator::I32x4LtU
-            | Operator::I32x4GtS
-            | Operator::I32x4GtU
-            | Operator::I32x4LeS
-            | Operator::I32x4LeU
-            | Operator::I32x4GeS
-            | Operator::I32x4GeU
-            | Operator::V128And
-            | Operator::V128AndNot
-            | Operator::V128Or
-            | Operator::V128Xor
-            | Operator::I8x16Add
-            | Operator::I8x16AddSaturateS
-            | Operator::I8x16AddSaturateU
-            | Operator::I8x16Sub
-            | Operator::I8x16SubSaturateS
-            | Operator::I8x16SubSaturateU
-            | Operator::I8x16MinS
-            | Operator::I8x16MinU
-            | Operator::I8x16MaxS
-            | Operator::I8x16MaxU
-            | Operator::I16x8Add
-            | Operator::I16x8AddSaturateS
-            | Operator::I16x8AddSaturateU
-            | Operator::I16x8Sub
-            | Operator::I16x8SubSaturateS
-            | Operator::I16x8SubSaturateU
-            | Operator::I16x8Mul
-            | Operator::I16x8MinS
-            | Operator::I16x8MinU
-            | Operator::I16x8MaxS
-            | Operator::I16x8MaxU
-            | Operator::I32x4Add
-            | Operator::I32x4Sub
-            | Operator::I32x4Mul
-            | Operator::I32x4MinS
-            | Operator::I32x4MinU
-            | Operator::I32x4MaxS
-            | Operator::I32x4MaxU
-            | Operator::I64x2Add
-            | Operator::I64x2Sub
-            | Operator::I64x2Mul
-            | Operator::I8x16RoundingAverageU
-            | Operator::I16x8RoundingAverageU
-            | Operator::I8x16NarrowI16x8S
-            | Operator::I8x16NarrowI16x8U
-            | Operator::I16x8NarrowI32x4S
-            | Operator::I16x8NarrowI32x4U => {
-                self.check_simd_enabled()?;
-                self.check_operands_2(Type::V128, Type::V128)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::F32x4Abs
-            | Operator::F32x4Neg
-            | Operator::F32x4Sqrt
-            | Operator::F64x2Abs
-            | Operator::F64x2Neg
-            | Operator::F64x2Sqrt
-            | Operator::F32x4ConvertI32x4S
-            | Operator::F32x4ConvertI32x4U => {
-                self.check_non_deterministic_enabled()?;
-                self.check_simd_enabled()?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::V128Not
-            | Operator::I8x16Abs
-            | Operator::I8x16Neg
-            | Operator::I16x8Abs
-            | Operator::I16x8Neg
-            | Operator::I32x4Abs
-            | Operator::I32x4Neg
-            | Operator::I64x2Neg
-            | Operator::I32x4TruncSatF32x4S
-            | Operator::I32x4TruncSatF32x4U
-            | Operator::I16x8WidenLowI8x16S
-            | Operator::I16x8WidenHighI8x16S
-            | Operator::I16x8WidenLowI8x16U
-            | Operator::I16x8WidenHighI8x16U
-            | Operator::I32x4WidenLowI16x8S
-            | Operator::I32x4WidenHighI16x8S
-            | Operator::I32x4WidenLowI16x8U
-            | Operator::I32x4WidenHighI16x8U => {
-                self.check_simd_enabled()?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::V128Bitselect => {
-                self.check_simd_enabled()?;
-                self.check_operands_3(Type::V128, Type::V128, Type::V128)?;
-                self.func_state.change_frame_with_type(3, Type::V128)?;
-            }
-            Operator::I8x16AnyTrue
-            | Operator::I8x16AllTrue
-            | Operator::I8x16Bitmask
-            | Operator::I16x8AnyTrue
-            | Operator::I16x8AllTrue
-            | Operator::I16x8Bitmask
-            | Operator::I32x4AnyTrue
-            | Operator::I32x4AllTrue
-            | Operator::I32x4Bitmask => {
-                self.check_simd_enabled()?;
-                self.check_operands_1(Type::V128)?;
-                self.func_state.change_frame_with_type(1, Type::I32)?;
-            }
-            Operator::I8x16Shl
-            | Operator::I8x16ShrS
-            | Operator::I8x16ShrU
-            | Operator::I16x8Shl
-            | Operator::I16x8ShrS
-            | Operator::I16x8ShrU
-            | Operator::I32x4Shl
-            | Operator::I32x4ShrS
-            | Operator::I32x4ShrU
-            | Operator::I64x2Shl
-            | Operator::I64x2ShrS
-            | Operator::I64x2ShrU => {
-                self.check_simd_enabled()?;
-                self.check_operands_2(Type::V128, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::V8x16Swizzle => {
-                self.check_simd_enabled()?;
-                self.check_operands_2(Type::V128, Type::V128)?;
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::V8x16Shuffle { ref lanes } => {
-                self.check_simd_enabled()?;
-                self.check_operands_2(Type::V128, Type::V128)?;
-                for i in lanes {
-                    self.check_simd_lane_index(*i, 32)?;
-                }
-                self.func_state.change_frame_with_type(2, Type::V128)?;
-            }
-            Operator::V8x16LoadSplat { memarg } => {
-                self.check_simd_enabled()?;
-                self.check_memarg(memarg, 0, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::V16x8LoadSplat { memarg } => {
-                self.check_simd_enabled()?;
-                self.check_memarg(memarg, 1, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::V32x4LoadSplat { memarg } => {
-                self.check_simd_enabled()?;
-                self.check_memarg(memarg, 2, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-            Operator::V64x2LoadSplat { memarg }
-            | Operator::I16x8Load8x8S { memarg }
-            | Operator::I16x8Load8x8U { memarg }
-            | Operator::I32x4Load16x4S { memarg }
-            | Operator::I32x4Load16x4U { memarg }
-            | Operator::I64x2Load32x2S { memarg }
-            | Operator::I64x2Load32x2U { memarg } => {
-                self.check_simd_enabled()?;
-                self.check_memarg(memarg, 3, resources)?;
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, Type::V128)?;
-            }
-
-            Operator::MemoryInit { segment } => {
-                self.check_bulk_memory_enabled()?;
-                self.check_memory_index(0, resources)?;
-                if segment >= resources.data_count() {
-                    bail_op_err!("unknown data segment {}", segment);
-                }
-                self.check_operands_3(Type::I32, Type::I32, Type::I32)?;
-                self.func_state.change_frame(3)?;
-            }
-            Operator::DataDrop { segment } => {
-                self.check_bulk_memory_enabled()?;
-                if segment >= resources.data_count() {
-                    bail_op_err!("unknown data segment {}", segment);
-                }
-            }
-            Operator::MemoryCopy | Operator::MemoryFill => {
-                self.check_bulk_memory_enabled()?;
-                self.check_memory_index(0, resources)?;
-                self.check_operands_3(Type::I32, Type::I32, Type::I32)?;
-                self.func_state.change_frame(3)?;
-            }
-            Operator::TableInit { segment, table } => {
-                self.check_bulk_memory_enabled()?;
-                if table > 0 {
-                    self.check_reference_types_enabled()?;
-                }
-                let table = match resources.table_at(table) {
-                    Some(table) => table,
-                    None => bail_op_err!("unknown table {}: table index out of bounds", table),
-                };
-                let segment_ty = match resources.element_type_at(segment) {
-                    Some(ty) => ty,
-                    None => bail_op_err!(
-                        "unknown elem segment {}: segment index out of bounds",
-                        segment
-                    ),
-                };
-                if segment_ty != table.element_type().to_parser_type() {
-                    return Err(OperatorValidatorError::new("type mismatch"));
-                }
-                self.check_operands_3(Type::I32, Type::I32, Type::I32)?;
-                self.func_state.change_frame(3)?;
-            }
-            Operator::ElemDrop { segment } => {
-                self.check_bulk_memory_enabled()?;
-                if segment >= resources.element_count() {
-                    bail_op_err!(
-                        "unknown elem segment {}: segment index out of bounds",
-                        segment
-                    );
-                }
-            }
-            Operator::TableCopy {
-                src_table,
-                dst_table,
-            } => {
-                self.check_bulk_memory_enabled()?;
-                if src_table > 0 || dst_table > 0 {
-                    self.check_reference_types_enabled()?;
-                }
-                let (src, dst) =
-                    match (resources.table_at(src_table), resources.table_at(dst_table)) {
-                        (Some(a), Some(b)) => (a, b),
-                        _ => return Err(OperatorValidatorError::new("table index out of bounds")),
-                    };
-                if src.element_type().to_parser_type() != dst.element_type().to_parser_type() {
-                    return Err(OperatorValidatorError::new("type mismatch"));
-                }
-                self.check_operands_3(Type::I32, Type::I32, Type::I32)?;
-                self.func_state.change_frame(3)?;
-            }
-            Operator::TableGet { table } => {
-                self.check_reference_types_enabled()?;
-                let ty = match resources.table_at(table) {
-                    Some(ty) => ty.element_type().to_parser_type(),
-                    None => return Err(OperatorValidatorError::new("table index out of bounds")),
-                };
-                self.check_operands_1(Type::I32)?;
-                self.func_state.change_frame_with_type(1, ty)?;
-            }
-            Operator::TableSet { table } => {
-                self.check_reference_types_enabled()?;
-                let ty = match resources.table_at(table) {
-                    Some(ty) => ty.element_type().to_parser_type(),
-                    None => return Err(OperatorValidatorError::new("table index out of bounds")),
-                };
-                self.check_operands_2(Type::I32, ty)?;
-                self.func_state.change_frame(2)?;
-            }
-            Operator::TableGrow { table } => {
-                self.check_reference_types_enabled()?;
-                let ty = match resources.table_at(table) {
-                    Some(ty) => ty.element_type().to_parser_type(),
-                    None => return Err(OperatorValidatorError::new("table index out of bounds")),
-                };
-                self.check_operands_2(ty, Type::I32)?;
-                self.func_state.change_frame_with_type(2, Type::I32)?;
-            }
-            Operator::TableSize { table } => {
-                self.check_reference_types_enabled()?;
-                if resources.table_at(table).is_none() {
-                    return Err(OperatorValidatorError::new("table index out of bounds"));
-                }
-                self.func_state.change_frame_with_type(0, Type::I32)?;
-            }
-            Operator::TableFill { table } => {
-                self.check_bulk_memory_enabled()?;
-                let ty = match resources.table_at(table) {
-                    Some(ty) => ty.element_type().to_parser_type(),
-                    None => return Err(OperatorValidatorError::new("table index out of bounds")),
-                };
-                self.check_operands_3(Type::I32, ty, Type::I32)?;
-                self.func_state.change_frame(3)?;
-            }
-        }
-        Ok(FunctionEnd::No)
-    }
-}
-
-fn func_type_at<T: WasmModuleResources>(
-    resources: &T,
-    at: u32,
-) -> OperatorValidatorResult<&<T::TypeDef as WasmTypeDef>::FuncType> {
-    let ty = match resources.type_at(at) {
-        Some(ty) => ty,
-        None => {
-            return Err(OperatorValidatorError::new(
-                "unknown type: type index out of bounds",
-            ))
-        }
-    };
-    ty.as_func()
-        .ok_or_else(|| OperatorValidatorError::new("type index not a function type"))
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/parser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/parser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/parser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/parser.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1338 +0,0 @@
-use crate::{AliasSectionReader, InstanceSectionReader, ModuleSectionReader};
-use crate::{BinaryReader, BinaryReaderError, FunctionBody, Range, Result};
-use crate::{DataSectionReader, ElementSectionReader, ExportSectionReader};
-use crate::{FunctionSectionReader, ImportSectionReader, TypeSectionReader};
-use crate::{GlobalSectionReader, MemorySectionReader, TableSectionReader};
-use std::convert::TryInto;
-use std::fmt;
-use std::iter;
-
-/// An incremental parser of a binary WebAssembly module.
-///
-/// This type is intended to be used to incrementally parse a WebAssembly module
-/// as bytes become available for the module. This can also be used to parse
-/// modules that are already entirely resident within memory.
-///
-/// This primary function for a parser is the [`Parser::parse`] function which
-/// will incrementally consume input. You can also use the [`Parser::parse_all`]
-/// function to parse a module that is entirely resident in memory.
-#[derive(Debug, Clone)]
-pub struct Parser {
-    state: State,
-    offset: u64,
-    max_size: u64,
-}
-
-#[derive(Debug, Clone)]
-enum State {
-    ModuleHeader,
-    SectionStart,
-    FunctionBody { remaining: u32, len: u32 },
-    ModuleCode { remaining: u32, len: u32 },
-}
-
-/// A successful return payload from [`Parser::parse`].
-///
-/// On success one of two possible values can be returned, either that more data
-/// is needed to continue parsing or a chunk of the input was parsed, indicating
-/// how much of it was parsed.
-#[derive(Debug)]
-pub enum Chunk<'a> {
-    /// This can be returned at any time and indicates that more data is needed
-    /// to proceed with parsing. Zero bytes were consumed from the input to
-    /// [`Parser::parse`]. The `usize` value here is a hint as to how many more
-    /// bytes are needed to continue parsing.
-    NeedMoreData(u64),
-
-    /// A chunk was successfully parsed.
-    Parsed {
-        /// This many bytes of the `data` input to [`Parser::parse`] were
-        /// consumed to produce `payload`.
-        consumed: usize,
-        /// The value that we actually parsed.
-        payload: Payload<'a>,
-    },
-}
-
-/// Values that can be parsed from a wasm module.
-///
-/// This enumeration is all possible chunks of pieces that can be parsed by a
-/// [`Parser`] from a binary WebAssembly module. Note that for many sections the
-/// entire section is parsed all at once, whereas other functions, like the code
-/// section, are parsed incrementally. This is a distinction where some
-/// sections, like the type section, are required to be fully resident in memory
-/// (fully downloaded) before proceeding. Other sections, like the code section,
-/// can be processed in a streaming fashion where each function is extracted
-/// individually so it can possibly be shipped to another thread while you wait
-/// for more functions to get downloaded.
-///
-/// Note that payloads, when returned, do not indicate that the wasm module is
-/// valid. For example when you receive a `Payload::TypeSection` the type
-/// section itself has not yet actually been parsed. The reader returned will be
-/// able to parse it, but you'll have to actually iterate the reader to do the
-/// full parse. Each payload returned is intended to be a *window* into the
-/// original `data` passed to [`Parser::parse`] which can be further processed
-/// if necessary.
-pub enum Payload<'a> {
-    /// Indicates the header of a WebAssembly binary.
-    ///
-    /// This header also indicates the version number that was parsed, which is
-    /// currently always 1.
-    Version {
-        /// The version number found
-        num: u32,
-        /// The range of bytes that were parsed to consume the header of the
-        /// module. Note that this range is relative to the start of the byte
-        /// stream.
-        range: Range,
-    },
-
-    /// A type section was received, and the provided reader can be used to
-    /// parse the contents of the type section.
-    TypeSection(crate::TypeSectionReader<'a>),
-    /// A import section was received, and the provided reader can be used to
-    /// parse the contents of the import section.
-    ImportSection(crate::ImportSectionReader<'a>),
-    /// An alias section was received, and the provided reader can be used to
-    /// parse the contents of the alias section.
-    AliasSection(crate::AliasSectionReader<'a>),
-    /// An instance section was received, and the provided reader can be used to
-    /// parse the contents of the instance section.
-    InstanceSection(crate::InstanceSectionReader<'a>),
-    /// A module section was received, and the provided reader can be used to
-    /// parse the contents of the module section.
-    ModuleSection(crate::ModuleSectionReader<'a>),
-    /// A function section was received, and the provided reader can be used to
-    /// parse the contents of the function section.
-    FunctionSection(crate::FunctionSectionReader<'a>),
-    /// A table section was received, and the provided reader can be used to
-    /// parse the contents of the table section.
-    TableSection(crate::TableSectionReader<'a>),
-    /// A memory section was received, and the provided reader can be used to
-    /// parse the contents of the memory section.
-    MemorySection(crate::MemorySectionReader<'a>),
-    /// A global section was received, and the provided reader can be used to
-    /// parse the contents of the global section.
-    GlobalSection(crate::GlobalSectionReader<'a>),
-    /// An export section was received, and the provided reader can be used to
-    /// parse the contents of the export section.
-    ExportSection(crate::ExportSectionReader<'a>),
-    /// A start section was received, and the `u32` here is the index of the
-    /// start function.
-    StartSection {
-        /// The start function index
-        func: u32,
-        /// The range of bytes that specify the `func` field, specified in
-        /// offsets relative to the start of the byte stream.
-        range: Range,
-    },
-    /// An element section was received, and the provided reader can be used to
-    /// parse the contents of the element section.
-    ElementSection(crate::ElementSectionReader<'a>),
-    /// A data count section was received, and the `u32` here is the contents of
-    /// the data count section.
-    DataCountSection {
-        /// The number of data segments.
-        count: u32,
-        /// The range of bytes that specify the `count` field, specified in
-        /// offsets relative to the start of the byte stream.
-        range: Range,
-    },
-    /// A data section was received, and the provided reader can be used to
-    /// parse the contents of the data section.
-    DataSection(crate::DataSectionReader<'a>),
-    /// A custom section was found.
-    CustomSection {
-        /// The name of the custom section.
-        name: &'a str,
-        /// The offset, relative to the start of the original module, that the
-        /// payload for this custom section starts at.
-        data_offset: usize,
-        /// The actual contents of the custom section.
-        data: &'a [u8],
-    },
-
-    /// Indicator of the start of the code section.
-    ///
-    /// This entry is returned whenever the code section starts. The `count`
-    /// field indicates how many entries are in this code section. After
-    /// receiving this start marker you're guaranteed that the next `count`
-    /// items will be either `CodeSectionEntry` or an error will be returned.
-    ///
-    /// This, unlike other sections, is intended to be used for streaming the
-    /// contents of the code section. The code section is not required to be
-    /// fully resident in memory when we parse it. Instead a [`Parser`] is
-    /// capable of parsing piece-by-piece of a code section.
-    CodeSectionStart {
-        /// The number of functions in this section.
-        count: u32,
-        /// The range of bytes that represent this section, specified in
-        /// offsets relative to the start of the byte stream.
-        range: Range,
-        /// The size, in bytes, of the remaining contents of this section.
-        ///
-        /// This can be used in combination with [`Parser::skip_section`]
-        /// where the caller will know how many bytes to skip before feeding
-        /// bytes into `Parser` again.
-        size: u32,
-    },
-
-    /// An entry of the code section, a function, was parsed.
-    ///
-    /// This entry indicates that a function was successfully received from the
-    /// code section, and the payload here is the window into the original input
-    /// where the function resides. Note that the function itself has not been
-    /// parsed, it's only been outlined. You'll need to process the
-    /// `FunctionBody` provided to test whether it parses and/or is valid.
-    CodeSectionEntry(crate::FunctionBody<'a>),
-
-    /// Indicator of the start of the module code section.
-    ///
-    /// This behaves the same as the `CodeSectionStart` payload being returned.
-    /// You're guaranteed the next `count` items will be of type
-    /// `ModuleCodeSectionEntry`.
-    ModuleCodeSectionStart {
-        /// The number of inline modules in this section.
-        count: u32,
-        /// The range of bytes that represent this section, specified in
-        /// offsets relative to the start of the byte stream.
-        range: Range,
-        /// The size, in bytes, of the remaining contents of this section.
-        size: u32,
-    },
-
-    /// An entry of the module code section, a module, was parsed.
-    ///
-    /// This variant is special in that it returns a sub-`Parser`. Upon
-    /// receiving a `ModuleCodeSectionEntry` it is expected that the returned
-    /// `Parser` will be used instead of the parent `Parser` until the parse has
-    /// finished. You'll need to feed data into the `Parser` returned until it
-    /// returns `Payload::End`. After that you'll switch back to the parent
-    /// parser to resume parsing the rest of the module code section.
-    ///
-    /// Note that binaries will not be parsed correctly if you feed the data for
-    /// a nested module into the parent [`Parser`].
-    ModuleCodeSectionEntry {
-        /// The parser to use to parse the contents of the nested submodule.
-        /// This parser should be used until it reports `End`.
-        parser: Parser,
-        /// The range of bytes, relative to the start of the input stream, of
-        /// the bytes containing this submodule.
-        range: Range,
-    },
-
-    /// An unknown section was found.
-    ///
-    /// This variant is returned for all unknown sections in a wasm file. This
-    /// likely wants to be interpreted as an error by consumers of the parser,
-    /// but this can also be used to parse sections unknown to wasmparser at
-    /// this time.
-    UnknownSection {
-        /// The 8-bit identifier for this section.
-        id: u8,
-        /// The contents of this section.
-        contents: &'a [u8],
-        /// The range of bytes, relative to the start of the original data
-        /// stream, that the contents of this section reside in.
-        range: Range,
-    },
-
-    /// The end of the WebAssembly module was reached.
-    End,
-}
-
-impl Parser {
-    /// Creates a new module parser.
-    ///
-    /// Reports errors and ranges relative to `offset` provided, where `offset`
-    /// is some logical offset within the input stream that we're parsing.
-    pub fn new(offset: u64) -> Parser {
-        Parser {
-            state: State::ModuleHeader,
-            offset,
-            max_size: u64::max_value(),
-        }
-    }
-
-    /// Attempts to parse a chunk of data.
-    ///
-    /// This method will attempt to parse the next incremental portion of a
-    /// WebAssembly binary. Data available for the module is provided as `data`,
-    /// and the data can be incomplete if more data has yet to arrive for the
-    /// module. The `eof` flag indicates whether `data` represents all possible
-    /// data for the module and no more data will ever be received.
-    ///
-    /// There are two ways parsing can succeed with this method:
-    ///
-    /// * `Chunk::NeedMoreData` - this indicates that there is not enough bytes
-    ///   in `data` to parse a chunk of this module. The caller needs to wait
-    ///   for more data to be available in this situation before calling this
-    ///   method again. It is guaranteed that this is only returned if `eof` is
-    ///   `false`.
-    ///
-    /// * `Chunk::Parsed` - this indicates that a chunk of the input was
-    ///   successfully parsed. The payload is available in this variant of what
-    ///   was parsed, and this also indicates how many bytes of `data` was
-    ///   consumed. It's expected that the caller will not provide these bytes
-    ///   back to the [`Parser`] again.
-    ///
-    /// Note that all `Chunk` return values are connected, with a lifetime, to
-    /// the input buffer. Each parsed chunk borrows the input buffer and is a
-    /// view into it for successfully parsed chunks.
-    ///
-    /// It is expected that you'll call this method until `Payload::End` is
-    /// reached, at which point you're guaranteed that the module has completely
-    /// parsed. Note that complete parsing, for the top-level wasm module,
-    /// implies that `data` is empty and `eof` is `true`.
-    ///
-    /// # Errors
-    ///
-    /// Parse errors are returned as an `Err`. Errors can happen when the
-    /// structure of the module is unexpected, or if sections are too large for
-    /// example. Note that errors are not returned for malformed *contents* of
-    /// sections here. Sections are generally not individually parsed and each
-    /// returned [`Payload`] needs to be iterated over further to detect all
-    /// errors.
-    ///
-    /// # Examples
-    ///
-    /// An example of reading a wasm file from a stream (`std::io::Read`) and
-    /// incrementally parsing it.
-    ///
-    /// ```
-    /// use std::io::Read;
-    /// use anyhow::Result;
-    /// use wasmparser::{Parser, Chunk, Payload::*};
-    ///
-    /// fn parse(mut reader: impl Read) -> Result<()> {
-    ///     let mut buf = Vec::new();
-    ///     let mut parser = Parser::new(0);
-    ///     let mut eof = false;
-    ///     let mut stack = Vec::new();
-    ///
-    ///     loop {
-    ///         let (payload, consumed) = match parser.parse(&buf, eof)? {
-    ///             Chunk::NeedMoreData(hint) => {
-    ///                 assert!(!eof); // otherwise an error would be returned
-    ///
-    ///                 // Use the hint to preallocate more space, then read
-    ///                 // some more data into our buffer.
-    ///                 //
-    ///                 // Note that the buffer management here is not ideal,
-    ///                 // but it's compact enough to fit in an example!
-    ///                 let len = buf.len();
-    ///                 buf.extend((0..hint).map(|_| 0u8));
-    ///                 let n = reader.read(&mut buf[len..])?;
-    ///                 buf.truncate(len + n);
-    ///                 eof = n == 0;
-    ///                 continue;
-    ///             }
-    ///
-    ///             Chunk::Parsed { consumed, payload } => (payload, consumed),
-    ///         };
-    ///
-    ///         match payload {
-    ///             // Each of these would be handled individually as necessary
-    ///             Version { .. } => { /* ... */ }
-    ///             TypeSection(_) => { /* ... */ }
-    ///             ImportSection(_) => { /* ... */ }
-    ///             AliasSection(_) => { /* ... */ }
-    ///             InstanceSection(_) => { /* ... */ }
-    ///             ModuleSection(_) => { /* ... */ }
-    ///             FunctionSection(_) => { /* ... */ }
-    ///             TableSection(_) => { /* ... */ }
-    ///             MemorySection(_) => { /* ... */ }
-    ///             GlobalSection(_) => { /* ... */ }
-    ///             ExportSection(_) => { /* ... */ }
-    ///             StartSection { .. } => { /* ... */ }
-    ///             ElementSection(_) => { /* ... */ }
-    ///             DataCountSection { .. } => { /* ... */ }
-    ///             DataSection(_) => { /* ... */ }
-    ///
-    ///             // Here we know how many functions we'll be receiving as
-    ///             // `CodeSectionEntry`, so we can prepare for that, and
-    ///             // afterwards we can parse and handle each function
-    ///             // individually.
-    ///             CodeSectionStart { .. } => { /* ... */ }
-    ///             CodeSectionEntry(body) => {
-    ///                 // here we can iterate over `body` to parse the function
-    ///                 // and its locals
-    ///             }
-    ///
-    ///             // When parsing nested modules we need to switch which
-    ///             // `Parser` we're using.
-    ///             ModuleCodeSectionStart { .. } => { /* ... */ }
-    ///             ModuleCodeSectionEntry { parser: subparser, .. } => {
-    ///                 stack.push(parser);
-    ///                 parser = subparser;
-    ///             }
-    ///
-    ///             CustomSection { name, .. } => { /* ... */ }
-    ///
-    ///             // most likely you'd return an error here
-    ///             UnknownSection { id, .. } => { /* ... */ }
-    ///
-    ///             // Once we've reached the end of a module we either resume
-    ///             // at the parent module or we break out of the loop because
-    ///             // we're done.
-    ///             End => {
-    ///                 if let Some(parent_parser) = stack.pop() {
-    ///                     parser = parent_parser;
-    ///                 } else {
-    ///                     break;
-    ///                 }
-    ///             }
-    ///         }
-    ///
-    ///         // once we're done processing the payload we can forget the
-    ///         // original.
-    ///         buf.drain(..consumed);
-    ///     }
-    ///
-    ///     Ok(())
-    /// }
-    ///
-    /// # parse(&b"\0asm\x01\0\0\0"[..]).unwrap();
-    /// ```
-    pub fn parse<'a>(&mut self, data: &'a [u8], eof: bool) -> Result<Chunk<'a>> {
-        let (data, eof) = if usize_to_u64(data.len()) > self.max_size {
-            (&data[..(self.max_size as usize)], true)
-        } else {
-            (data, eof)
-        };
-        // TODO: thread through `offset: u64` to `BinaryReader`, remove
-        // the cast here.
-        let mut reader = BinaryReader::new_with_offset(data, self.offset as usize);
-        match self.parse_reader(&mut reader, eof) {
-            Ok(payload) => {
-                // Be sure to update our offset with how far we got in the
-                // reader
-                self.offset += usize_to_u64(reader.position);
-                self.max_size -= usize_to_u64(reader.position);
-                Ok(Chunk::Parsed {
-                    consumed: reader.position,
-                    payload,
-                })
-            }
-            Err(e) => {
-                // If we're at EOF then there's no way we can recover from any
-                // error, so continue to propagate it.
-                if eof {
-                    return Err(e);
-                }
-
-                // If our error doesn't look like it can be resolved with more
-                // data being pulled down, then propagate it, otherwise switch
-                // the error to "feed me please"
-                match e.inner.needed_hint {
-                    Some(hint) => Ok(Chunk::NeedMoreData(usize_to_u64(hint))),
-                    None => Err(e),
-                }
-            }
-        }
-    }
-
-    fn parse_reader<'a>(
-        &mut self,
-        reader: &mut BinaryReader<'a>,
-        eof: bool,
-    ) -> Result<Payload<'a>> {
-        use Payload::*;
-
-        match self.state {
-            State::ModuleHeader => {
-                let start = reader.original_position();
-                let num = reader.read_file_header()?;
-                self.state = State::SectionStart;
-                Ok(Version {
-                    num,
-                    range: Range {
-                        start,
-                        end: reader.original_position(),
-                    },
-                })
-            }
-            State::SectionStart => {
-                // If we're at eof and there are no bytes in our buffer, then
-                // that means we reached the end of the wasm file since it's
-                // just a bunch of sections concatenated after the module
-                // header.
-                if eof && reader.bytes_remaining() == 0 {
-                    return Ok(Payload::End);
-                }
-
-                let id = reader.read_var_u7()? as u8;
-                let len_pos = reader.position;
-                let mut len = reader.read_var_u32()?;
-
-                // Test to make sure that this section actually fits within
-                // `Parser::max_size`. This doesn't matter for top-level modules
-                // but it is required for nested modules to correctly ensure
-                // that all sections live entirely within their section of the
-                // file.
-                let section_overflow = self
-                    .max_size
-                    .checked_sub(usize_to_u64(reader.position))
-                    .and_then(|s| s.checked_sub(len.into()))
-                    .is_none();
-                if section_overflow {
-                    return Err(BinaryReaderError::new("section too large", len_pos));
-                }
-
-                match id {
-                    0 => {
-                        let mut content = subreader(reader, len)?;
-                        // Note that if this fails we can't read any more bytes,
-                        // so clear the "we'd succeed if we got this many more
-                        // bytes" because we can't recover from "eof" at this point.
-                        let name = content.read_string().map_err(clear_hint)?;
-                        Ok(Payload::CustomSection {
-                            name,
-                            data_offset: content.original_position(),
-                            data: content.remaining_buffer(),
-                        })
-                    }
-                    1 => section(reader, len, TypeSectionReader::new, TypeSection),
-                    2 => section(reader, len, ImportSectionReader::new, ImportSection),
-                    3 => section(reader, len, FunctionSectionReader::new, FunctionSection),
-                    4 => section(reader, len, TableSectionReader::new, TableSection),
-                    5 => section(reader, len, MemorySectionReader::new, MemorySection),
-                    6 => section(reader, len, GlobalSectionReader::new, GlobalSection),
-                    7 => section(reader, len, ExportSectionReader::new, ExportSection),
-                    8 => {
-                        let (func, range) = single_u32(reader, len, "start")?;
-                        Ok(StartSection { func, range })
-                    }
-                    9 => section(reader, len, ElementSectionReader::new, ElementSection),
-                    10 => {
-                        let start = reader.original_position();
-                        let count = delimited(reader, &mut len, |r| r.read_var_u32())?;
-                        let range = Range {
-                            start,
-                            end: reader.original_position() + len as usize,
-                        };
-                        self.state = State::FunctionBody {
-                            remaining: count,
-                            len,
-                        };
-                        Ok(CodeSectionStart {
-                            count,
-                            range,
-                            size: len,
-                        })
-                    }
-                    11 => section(reader, len, DataSectionReader::new, DataSection),
-                    12 => {
-                        let (count, range) = single_u32(reader, len, "data count")?;
-                        Ok(DataCountSection { count, range })
-                    }
-                    100 => section(reader, len, ModuleSectionReader::new, ModuleSection),
-                    101 => section(reader, len, InstanceSectionReader::new, InstanceSection),
-                    102 => section(reader, len, AliasSectionReader::new, AliasSection),
-                    103 => {
-                        let start = reader.original_position();
-                        let count = delimited(reader, &mut len, |r| r.read_var_u32())?;
-                        let range = Range {
-                            start,
-                            end: reader.original_position() + len as usize,
-                        };
-                        self.state = State::ModuleCode {
-                            remaining: count,
-                            len,
-                        };
-                        Ok(ModuleCodeSectionStart {
-                            count,
-                            range,
-                            size: len,
-                        })
-                    }
-                    id => {
-                        let offset = reader.original_position();
-                        let contents = reader.read_bytes(len as usize)?;
-                        let range = Range {
-                            start: offset,
-                            end: offset + len as usize,
-                        };
-                        Ok(UnknownSection {
-                            id,
-                            contents,
-                            range,
-                        })
-                    }
-                }
-            }
-
-            // Once we hit 0 remaining incrementally parsed items, with 0
-            // remaining bytes in each section, we're done and can switch back
-            // to parsing sections.
-            State::FunctionBody {
-                remaining: 0,
-                len: 0,
-            }
-            | State::ModuleCode {
-                remaining: 0,
-                len: 0,
-            } => {
-                self.state = State::SectionStart;
-                self.parse_reader(reader, eof)
-            }
-
-            // ... otherwise trailing bytes with no remaining entries in these
-            // sections indicates an error.
-            State::FunctionBody { remaining: 0, len } | State::ModuleCode { remaining: 0, len } => {
-                debug_assert!(len > 0);
-                let offset = reader.original_position();
-                Err(BinaryReaderError::new(
-                    "trailing bytes at end of section",
-                    offset,
-                ))
-            }
-
-            // Functions are relatively easy to parse when we know there's at
-            // least one remaining and at least one byte available to read
-            // things.
-            //
-            // We use the remaining length try to read a u32 size of the
-            // function, and using that size we require the entire function be
-            // resident in memory. This means that we're reading whole chunks of
-            // functions at a time.
-            //
-            // Limiting via `Parser::max_size` (nested modules) happens above in
-            // `fn parse`, and limiting by our section size happens via
-            // `delimited`. Actual parsing of the function body is delegated to
-            // the caller to iterate over the `FunctionBody` structure.
-            State::FunctionBody { remaining, mut len } => {
-                let body = delimited(reader, &mut len, |r| {
-                    let size = r.read_var_u32()?;
-                    let offset = r.original_position();
-                    Ok(FunctionBody::new(offset, r.read_bytes(size as usize)?))
-                })?;
-                self.state = State::FunctionBody {
-                    remaining: remaining - 1,
-                    len,
-                };
-                Ok(CodeSectionEntry(body))
-            }
-
-            // Modules are trickier than functions. What's going to happen here
-            // is that we'll be offloading parsing to a sub-`Parser`. This
-            // sub-`Parser` will be delimited to not read past the size of the
-            // module that's specified.
-            //
-            // So the first thing that happens here is we read the size of the
-            // module. We use `delimited` to make sure the bytes specifying the
-            // size of the module are themselves within the module code section.
-            //
-            // Once we've read the size of a module, however, there's a few
-            // pieces of state that we need to update. We as a parser will not
-            // receive the next `size` bytes, so we need to update our internal
-            // bookkeeping to account for that:
-            //
-            // * The `len`, number of bytes remaining in this section, is
-            //   decremented by `size`. This can underflow, however, meaning
-            //   that the size of the module doesn't fit within the section.
-            //
-            // * Our `Parser::max_size` field needs to account for the bytes
-            //   that we're reading. Note that this is guaranteed to not
-            //   underflow, however, because whenever we parse a section header
-            //   we guarantee that its contents fit within our `max_size`.
-            //
-            // To update `len` we do that when updating `self.state`, and to
-            // update `max_size` we do that inline. Note that this will get
-            // further tweaked after we return with the bytes we read specifying
-            // the size of the module itself.
-            State::ModuleCode { remaining, mut len } => {
-                let size = delimited(reader, &mut len, |r| r.read_var_u32())?;
-                match len.checked_sub(size) {
-                    Some(i) => len = i,
-                    None => {
-                        return Err(BinaryReaderError::new(
-                            "Unexpected EOF",
-                            reader.original_position(),
-                        ));
-                    }
-                }
-                self.state = State::ModuleCode {
-                    remaining: remaining - 1,
-                    len,
-                };
-                let range = Range {
-                    start: reader.original_position(),
-                    end: reader.original_position() + size as usize,
-                };
-                self.max_size -= u64::from(size);
-                self.offset += u64::from(size);
-                let mut parser = Parser::new(usize_to_u64(reader.original_position()));
-                parser.max_size = size.into();
-                Ok(ModuleCodeSectionEntry { parser, range })
-            }
-        }
-    }
-
-    /// Convenience function that can be used to parse a module entirely
-    /// resident in memory.
-    ///
-    /// This function will parse the `data` provided as a WebAssembly module,
-    /// assuming that `data` represents the entire WebAssembly module.
-    ///
-    /// Note that when this function yields `ModuleCodeSectionEntry`
-    /// no action needs to be taken with the returned parser. The parser will be
-    /// automatically switched to internally and more payloads will continue to
-    /// get returned.
-    pub fn parse_all<'a>(
-        self,
-        mut data: &'a [u8],
-    ) -> impl Iterator<Item = Result<Payload<'a>>> + 'a {
-        let mut stack = Vec::new();
-        let mut cur = self;
-        let mut done = false;
-        iter::from_fn(move || {
-            if done {
-                return None;
-            }
-            let payload = match cur.parse(data, true) {
-                // Propagate all errors
-                Err(e) => return Some(Err(e)),
-
-                // This isn't possible because `eof` is always true.
-                Ok(Chunk::NeedMoreData(_)) => unreachable!(),
-
-                Ok(Chunk::Parsed { payload, consumed }) => {
-                    data = &data[consumed..];
-                    payload
-                }
-            };
-
-            match &payload {
-                // If a module ends then we either finished the current
-                // module or, if there's a parent, we switch back to
-                // resuming parsing the parent.
-                Payload::End => match stack.pop() {
-                    Some(p) => cur = p,
-                    None => done = true,
-                },
-
-                // When we enter a nested module then we need to update our
-                // current parser, saving off the previous state.
-                //
-                // Afterwards we turn the loop again to recurse in parsing the
-                // nested module.
-                Payload::ModuleCodeSectionEntry { parser, range: _ } => {
-                    stack.push(cur.clone());
-                    cur = parser.clone();
-                }
-
-                _ => {}
-            }
-
-            Some(Ok(payload))
-        })
-    }
-
-    /// Skip parsing the code or module code section entirely.
-    ///
-    /// This function can be used to indicate, after receiving
-    /// `CodeSectionStart` or `ModuleCodeSectionStart`, that the section
-    /// will not be parsed.
-    ///
-    /// The caller will be responsible for skipping `size` bytes (found in the
-    /// `CodeSectionStart` or `ModuleCodeSectionStart` payload). Bytes should
-    /// only be fed into `parse` after the `size` bytes have been skipped.
-    ///
-    /// # Panics
-    ///
-    /// This function will panic if the parser is not in a state where it's
-    /// parsing the code or module code section.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use wasmparser::{Result, Parser, Chunk, Range, SectionReader, Payload::*};
-    ///
-    /// fn objdump_headers(mut wasm: &[u8]) -> Result<()> {
-    ///     let mut parser = Parser::new(0);
-    ///     loop {
-    ///         let payload = match parser.parse(wasm, true)? {
-    ///             Chunk::Parsed { consumed, payload } => {
-    ///                 wasm = &wasm[consumed..];
-    ///                 payload
-    ///             }
-    ///             // this state isn't possible with `eof = true`
-    ///             Chunk::NeedMoreData(_) => unreachable!(),
-    ///         };
-    ///         match payload {
-    ///             TypeSection(s) => print_range("type section", &s.range()),
-    ///             ImportSection(s) => print_range("import section", &s.range()),
-    ///             // .. other sections
-    ///
-    ///             // Print the range of the code section we see, but don't
-    ///             // actually iterate over each individual function.
-    ///             CodeSectionStart { range, size, .. } => {
-    ///                 print_range("code section", &range);
-    ///                 parser.skip_section();
-    ///                 wasm = &wasm[size as usize..];
-    ///             }
-    ///             End => break,
-    ///             _ => {}
-    ///         }
-    ///     }
-    ///     Ok(())
-    /// }
-    ///
-    /// fn print_range(section: &str, range: &Range) {
-    ///     println!("{:>40}: {:#010x} - {:#010x}", section, range.start, range.end);
-    /// }
-    /// ```
-    pub fn skip_section(&mut self) {
-        let skip = match self.state {
-            State::FunctionBody { remaining: _, len } | State::ModuleCode { remaining: _, len } => {
-                len
-            }
-            _ => panic!("wrong state to call `skip_section`"),
-        };
-        self.offset += u64::from(skip);
-        self.max_size -= u64::from(skip);
-        self.state = State::SectionStart;
-    }
-}
-
-fn usize_to_u64(a: usize) -> u64 {
-    a.try_into().unwrap()
-}
-
-/// Parses an entire section resident in memory into a `Payload`.
-///
-/// Requires that `len` bytes are resident in `reader` and uses `ctor`/`variant`
-/// to construct the section to return.
-fn section<'a, T>(
-    reader: &mut BinaryReader<'a>,
-    len: u32,
-    ctor: fn(&'a [u8], usize) -> Result<T>,
-    variant: fn(T) -> Payload<'a>,
-) -> Result<Payload<'a>> {
-    let offset = reader.original_position();
-    let payload = reader.read_bytes(len as usize)?;
-    // clear the hint for "need this many more bytes" here because we already
-    // read all the bytes, so it's not possible to read more bytes if this
-    // fails.
-    let reader = ctor(payload, offset).map_err(clear_hint)?;
-    Ok(variant(reader))
-}
-
-/// Creates a new `BinaryReader` from the given `reader` which will be reading
-/// the first `len` bytes.
-///
-/// This means that `len` bytes must be resident in memory at the time of this
-/// reading.
-fn subreader<'a>(reader: &mut BinaryReader<'a>, len: u32) -> Result<BinaryReader<'a>> {
-    let offset = reader.original_position();
-    let payload = reader.read_bytes(len as usize)?;
-    Ok(BinaryReader::new_with_offset(payload, offset))
-}
-
-/// Reads a section that is represented by a single uleb-encoded `u32`.
-fn single_u32<'a>(reader: &mut BinaryReader<'a>, len: u32, desc: &str) -> Result<(u32, Range)> {
-    let range = Range {
-        start: reader.original_position(),
-        end: reader.original_position() + len as usize,
-    };
-    let mut content = subreader(reader, len)?;
-    // We can't recover from "unexpected eof" here because our entire section is
-    // already resident in memory, so clear the hint for how many more bytes are
-    // expected.
-    let index = content.read_var_u32().map_err(clear_hint)?;
-    if !content.eof() {
-        return Err(BinaryReaderError::new(
-            format!("Unexpected content in the {} section", desc),
-            content.original_position(),
-        ));
-    }
-    Ok((index, range))
-}
-
-/// Attempts to parse using `f`.
-///
-/// This will update `*len` with the number of bytes consumed, and it will cause
-/// a failure to be returned instead of the number of bytes consumed exceeds
-/// what `*len` currently is.
-fn delimited<'a, T>(
-    reader: &mut BinaryReader<'a>,
-    len: &mut u32,
-    f: impl FnOnce(&mut BinaryReader<'a>) -> Result<T>,
-) -> Result<T> {
-    let start = reader.position;
-    let ret = f(reader)?;
-    *len = match (reader.position - start)
-        .try_into()
-        .ok()
-        .and_then(|i| len.checked_sub(i))
-    {
-        Some(i) => i,
-        None => return Err(BinaryReaderError::new("Unexpected EOF", start)),
-    };
-    Ok(ret)
-}
-
-impl Default for Parser {
-    fn default() -> Parser {
-        Parser::new(0)
-    }
-}
-
-impl fmt::Debug for Payload<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use Payload::*;
-        match self {
-            CustomSection {
-                name,
-                data_offset,
-                data: _,
-            } => f
-                .debug_struct("CustomSection")
-                .field("name", name)
-                .field("data_offset", data_offset)
-                .field("data", &"...")
-                .finish(),
-            Version { num, range } => f
-                .debug_struct("Version")
-                .field("num", num)
-                .field("range", range)
-                .finish(),
-            TypeSection(_) => f.debug_tuple("TypeSection").field(&"...").finish(),
-            ImportSection(_) => f.debug_tuple("ImportSection").field(&"...").finish(),
-            AliasSection(_) => f.debug_tuple("AliasSection").field(&"...").finish(),
-            InstanceSection(_) => f.debug_tuple("InstanceSection").field(&"...").finish(),
-            ModuleSection(_) => f.debug_tuple("ModuleSection").field(&"...").finish(),
-            FunctionSection(_) => f.debug_tuple("FunctionSection").field(&"...").finish(),
-            TableSection(_) => f.debug_tuple("TableSection").field(&"...").finish(),
-            MemorySection(_) => f.debug_tuple("MemorySection").field(&"...").finish(),
-            GlobalSection(_) => f.debug_tuple("GlobalSection").field(&"...").finish(),
-            ExportSection(_) => f.debug_tuple("ExportSection").field(&"...").finish(),
-            ElementSection(_) => f.debug_tuple("ElementSection").field(&"...").finish(),
-            DataSection(_) => f.debug_tuple("DataSection").field(&"...").finish(),
-            StartSection { func, range } => f
-                .debug_struct("StartSection")
-                .field("func", func)
-                .field("range", range)
-                .finish(),
-            DataCountSection { count, range } => f
-                .debug_struct("DataCountSection")
-                .field("count", count)
-                .field("range", range)
-                .finish(),
-            CodeSectionStart { count, range, size } => f
-                .debug_struct("CodeSectionStart")
-                .field("count", count)
-                .field("range", range)
-                .field("size", size)
-                .finish(),
-            CodeSectionEntry(_) => f.debug_tuple("CodeSectionEntry").field(&"...").finish(),
-            ModuleCodeSectionStart { count, range, size } => f
-                .debug_struct("ModuleCodeSectionStart")
-                .field("count", count)
-                .field("range", range)
-                .field("size", size)
-                .finish(),
-            ModuleCodeSectionEntry { parser: _, range } => f
-                .debug_struct("ModuleCodeSectionEntry")
-                .field("range", range)
-                .finish(),
-            UnknownSection { id, range, .. } => f
-                .debug_struct("UnknownSection")
-                .field("id", id)
-                .field("range", range)
-                .finish(),
-            End => f.write_str("End"),
-        }
-    }
-}
-
-fn clear_hint(mut err: BinaryReaderError) -> BinaryReaderError {
-    err.inner.needed_hint = None;
-    err
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    macro_rules! assert_matches {
-        ($a:expr, $b:pat $(,)?) => {
-            match $a {
-                $b => {}
-                a => panic!("`{:?}` doesn't match `{}`", a, stringify!($b)),
-            }
-        };
-    }
-
-    #[test]
-    fn header() {
-        assert!(Parser::default().parse(&[], true).is_err());
-        assert_matches!(
-            Parser::default().parse(&[], false),
-            Ok(Chunk::NeedMoreData(4)),
-        );
-        assert_matches!(
-            Parser::default().parse(b"\0", false),
-            Ok(Chunk::NeedMoreData(3)),
-        );
-        assert_matches!(
-            Parser::default().parse(b"\0asm", false),
-            Ok(Chunk::NeedMoreData(4)),
-        );
-        assert_matches!(
-            Parser::default().parse(b"\0asm\x01\0\0\0", false),
-            Ok(Chunk::Parsed {
-                consumed: 8,
-                payload: Payload::Version { num: 1, .. },
-            }),
-        );
-    }
-
-    fn parser_after_header() -> Parser {
-        let mut p = Parser::default();
-        assert_matches!(
-            p.parse(b"\0asm\x01\0\0\0", false),
-            Ok(Chunk::Parsed {
-                consumed: 8,
-                payload: Payload::Version { num: 1, .. },
-            }),
-        );
-        return p;
-    }
-
-    #[test]
-    fn start_section() {
-        assert_matches!(
-            parser_after_header().parse(&[], false),
-            Ok(Chunk::NeedMoreData(1)),
-        );
-        assert!(parser_after_header().parse(&[8], true).is_err());
-        assert!(parser_after_header().parse(&[8, 1], true).is_err());
-        assert!(parser_after_header().parse(&[8, 2], true).is_err());
-        assert_matches!(
-            parser_after_header().parse(&[8], false),
-            Ok(Chunk::NeedMoreData(1)),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[8, 1], false),
-            Ok(Chunk::NeedMoreData(1)),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[8, 2], false),
-            Ok(Chunk::NeedMoreData(2)),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[8, 1, 1], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::StartSection { func: 1, .. },
-            }),
-        );
-        assert!(parser_after_header().parse(&[8, 2, 1, 1], false).is_err());
-        assert!(parser_after_header().parse(&[8, 0], false).is_err());
-    }
-
-    #[test]
-    fn end_works() {
-        assert_matches!(
-            parser_after_header().parse(&[], true),
-            Ok(Chunk::Parsed {
-                consumed: 0,
-                payload: Payload::End,
-            }),
-        );
-    }
-
-    #[test]
-    fn type_section() {
-        assert!(parser_after_header().parse(&[1], true).is_err());
-        assert!(parser_after_header().parse(&[1, 0], false).is_err());
-        // assert!(parser_after_header().parse(&[8, 2], true).is_err());
-        assert_matches!(
-            parser_after_header().parse(&[1], false),
-            Ok(Chunk::NeedMoreData(1)),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[1, 1], false),
-            Ok(Chunk::NeedMoreData(1)),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[1, 1, 1], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::TypeSection(_),
-            }),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[1, 1, 1, 2, 3, 4], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::TypeSection(_),
-            }),
-        );
-    }
-
-    #[test]
-    fn custom_section() {
-        assert!(parser_after_header().parse(&[0], true).is_err());
-        assert!(parser_after_header().parse(&[0, 0], false).is_err());
-        assert!(parser_after_header().parse(&[0, 1, 1], false).is_err());
-        assert_matches!(
-            parser_after_header().parse(&[0, 2, 1], false),
-            Ok(Chunk::NeedMoreData(1)),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[0, 1, 0], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::CustomSection {
-                    name: "",
-                    data_offset: 11,
-                    data: b"",
-                },
-            }),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[0, 2, 1, b'a'], false),
-            Ok(Chunk::Parsed {
-                consumed: 4,
-                payload: Payload::CustomSection {
-                    name: "a",
-                    data_offset: 12,
-                    data: b"",
-                },
-            }),
-        );
-        assert_matches!(
-            parser_after_header().parse(&[0, 2, 0, b'a'], false),
-            Ok(Chunk::Parsed {
-                consumed: 4,
-                payload: Payload::CustomSection {
-                    name: "",
-                    data_offset: 11,
-                    data: b"a",
-                },
-            }),
-        );
-    }
-
-    #[test]
-    fn function_section() {
-        assert!(parser_after_header().parse(&[10], true).is_err());
-        assert!(parser_after_header().parse(&[10, 0], true).is_err());
-        assert!(parser_after_header().parse(&[10, 1], true).is_err());
-        assert_matches!(
-            parser_after_header().parse(&[10], false),
-            Ok(Chunk::NeedMoreData(1))
-        );
-        assert_matches!(
-            parser_after_header().parse(&[10, 1], false),
-            Ok(Chunk::NeedMoreData(1))
-        );
-        let mut p = parser_after_header();
-        assert_matches!(
-            p.parse(&[10, 1, 0], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::CodeSectionStart { count: 0, .. },
-            }),
-        );
-        assert_matches!(
-            p.parse(&[], true),
-            Ok(Chunk::Parsed {
-                consumed: 0,
-                payload: Payload::End,
-            }),
-        );
-        let mut p = parser_after_header();
-        assert_matches!(
-            p.parse(&[10, 2, 1, 0], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::CodeSectionStart { count: 1, .. },
-            }),
-        );
-        assert_matches!(
-            p.parse(&[0], false),
-            Ok(Chunk::Parsed {
-                consumed: 1,
-                payload: Payload::CodeSectionEntry(_),
-            }),
-        );
-        assert_matches!(
-            p.parse(&[], true),
-            Ok(Chunk::Parsed {
-                consumed: 0,
-                payload: Payload::End,
-            }),
-        );
-
-        // 1 byte section with 1 function can't read the function body because
-        // the section is too small
-        let mut p = parser_after_header();
-        assert_matches!(
-            p.parse(&[10, 1, 1], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::CodeSectionStart { count: 1, .. },
-            }),
-        );
-        assert_eq!(
-            p.parse(&[0], false).unwrap_err().message(),
-            "Unexpected EOF"
-        );
-
-        // section with 2 functions but section is cut off
-        let mut p = parser_after_header();
-        assert_matches!(
-            p.parse(&[10, 2, 2], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::CodeSectionStart { count: 2, .. },
-            }),
-        );
-        assert_matches!(
-            p.parse(&[0], false),
-            Ok(Chunk::Parsed {
-                consumed: 1,
-                payload: Payload::CodeSectionEntry(_),
-            }),
-        );
-        assert_matches!(p.parse(&[], false), Ok(Chunk::NeedMoreData(1)));
-        assert_eq!(
-            p.parse(&[0], false).unwrap_err().message(),
-            "Unexpected EOF",
-        );
-
-        // trailing data is bad
-        let mut p = parser_after_header();
-        assert_matches!(
-            p.parse(&[10, 3, 1], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::CodeSectionStart { count: 1, .. },
-            }),
-        );
-        assert_matches!(
-            p.parse(&[0], false),
-            Ok(Chunk::Parsed {
-                consumed: 1,
-                payload: Payload::CodeSectionEntry(_),
-            }),
-        );
-        assert_eq!(
-            p.parse(&[0], false).unwrap_err().message(),
-            "trailing bytes at end of section",
-        );
-    }
-
-    #[test]
-    fn module_code_errors() {
-        // no bytes to say size of section
-        assert!(parser_after_header().parse(&[103], true).is_err());
-        // section must start with a u32
-        assert!(parser_after_header().parse(&[103, 0], true).is_err());
-        // EOF before we finish reading the section
-        assert!(parser_after_header().parse(&[103, 1], true).is_err());
-    }
-
-    #[test]
-    fn module_code_one() {
-        let mut p = parser_after_header();
-        assert_matches!(p.parse(&[103], false), Ok(Chunk::NeedMoreData(1)));
-        assert_matches!(p.parse(&[103, 9], false), Ok(Chunk::NeedMoreData(1)));
-        // Module code section, 10 bytes large, one module.
-        assert_matches!(
-            p.parse(&[103, 10, 1], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::ModuleCodeSectionStart { count: 1, .. },
-            })
-        );
-        // Declare an empty module, which will be 8 bytes large for the header.
-        // Switch to the sub-parser on success.
-        let mut sub = match p.parse(&[8], false) {
-            Ok(Chunk::Parsed {
-                consumed: 1,
-                payload: Payload::ModuleCodeSectionEntry { parser, .. },
-            }) => parser,
-            other => panic!("bad parse {:?}", other),
-        };
-
-        // Parse the header of the submodule with the sub-parser.
-        assert_matches!(sub.parse(&[], false), Ok(Chunk::NeedMoreData(4)));
-        assert_matches!(sub.parse(b"\0asm", false), Ok(Chunk::NeedMoreData(4)));
-        assert_matches!(
-            sub.parse(b"\0asm\x01\0\0\0", false),
-            Ok(Chunk::Parsed {
-                consumed: 8,
-                payload: Payload::Version { num: 1, .. },
-            }),
-        );
-
-        // The sub-parser should be byte-limited so the next byte shouldn't get
-        // consumed, it's intended for the parent parser.
-        assert_matches!(
-            sub.parse(&[10], false),
-            Ok(Chunk::Parsed {
-                consumed: 0,
-                payload: Payload::End,
-            }),
-        );
-
-        // The parent parser should now be back to resuming, and we simulate it
-        // being done with bytes to ensure that it's safely at the end,
-        // completing the module code section.
-        assert_matches!(p.parse(&[], false), Ok(Chunk::NeedMoreData(1)));
-        assert_matches!(
-            p.parse(&[], true),
-            Ok(Chunk::Parsed {
-                consumed: 0,
-                payload: Payload::End,
-            }),
-        );
-    }
-
-    #[test]
-    fn nested_section_too_big() {
-        let mut p = parser_after_header();
-        // Module code section, 12 bytes large, one module. This leaves 11 bytes
-        // of payload for the module definition itself.
-        assert_matches!(
-            p.parse(&[103, 12, 1], false),
-            Ok(Chunk::Parsed {
-                consumed: 3,
-                payload: Payload::ModuleCodeSectionStart { count: 1, .. },
-            })
-        );
-        // Use one byte to say we're a 10 byte module, which fits exactly within
-        // our module code section.
-        let mut sub = match p.parse(&[10], false) {
-            Ok(Chunk::Parsed {
-                consumed: 1,
-                payload: Payload::ModuleCodeSectionEntry { parser, .. },
-            }) => parser,
-            other => panic!("bad parse {:?}", other),
-        };
-
-        // use 8 bytes to parse the header, leaving 2 remaining bytes in our
-        // module.
-        assert_matches!(
-            sub.parse(b"\0asm\x01\0\0\0", false),
-            Ok(Chunk::Parsed {
-                consumed: 8,
-                payload: Payload::Version { num: 1, .. },
-            }),
-        );
-
-        // We can't parse a section which declares its bigger than the outer
-        // module. This is section 1, one byte big, with one content byte. The
-        // content byte, however, lives outside of the parent's module code
-        // section.
-        assert_eq!(
-            sub.parse(&[1, 1, 0], false).unwrap_err().message(),
-            "section too large",
-        );
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/primitives.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/primitives.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/primitives.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/primitives.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,771 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use std::error::Error;
-use std::fmt;
-use std::result;
-
-#[derive(Debug, Clone)]
-pub struct BinaryReaderError {
-    // Wrap the actual error data in a `Box` so that the error is just one
-    // word. This means that we can continue returning small `Result`s in
-    // registers.
-    pub(crate) inner: Box<BinaryReaderErrorInner>,
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct BinaryReaderErrorInner {
-    pub(crate) message: String,
-    pub(crate) offset: usize,
-    pub(crate) needed_hint: Option<usize>,
-}
-
-pub type Result<T> = result::Result<T, BinaryReaderError>;
-
-impl Error for BinaryReaderError {}
-
-impl fmt::Display for BinaryReaderError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "{} (at offset {})",
-            self.inner.message, self.inner.offset
-        )
-    }
-}
-
-impl BinaryReaderError {
-    pub(crate) fn new(message: impl Into<String>, offset: usize) -> Self {
-        let message = message.into();
-        BinaryReaderError {
-            inner: Box::new(BinaryReaderErrorInner {
-                message,
-                offset,
-                needed_hint: None,
-            }),
-        }
-    }
-
-    pub(crate) fn eof(offset: usize, needed_hint: usize) -> Self {
-        BinaryReaderError {
-            inner: Box::new(BinaryReaderErrorInner {
-                message: "Unexpected EOF".to_string(),
-                offset,
-                needed_hint: Some(needed_hint),
-            }),
-        }
-    }
-
-    /// Get this error's message.
-    pub fn message(&self) -> &str {
-        &self.inner.message
-    }
-
-    /// Get the offset within the Wasm binary where the error occured.
-    pub fn offset(&self) -> usize {
-        self.inner.offset
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub enum CustomSectionKind {
-    Unknown,
-    Name,
-    Producers,
-    SourceMappingURL,
-    Reloc,
-    Linking,
-}
-
-/// Section code as defined [here].
-///
-/// [here]: https://webassembly.github.io/spec/core/binary/modules.html#sections
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub enum SectionCode<'a> {
-    Custom {
-        name: &'a str,
-        kind: CustomSectionKind,
-    },
-    Type,       // Function signature declarations
-    Alias,      // Aliased indices from nested/parent modules
-    Import,     // Import declarations
-    Module,     // Module declarations
-    Instance,   // Instance definitions
-    Function,   // Function declarations
-    Table,      // Indirect function table and other tables
-    Memory,     // Memory attributes
-    Global,     // Global declarations
-    Export,     // Exports
-    Start,      // Start function declaration
-    Element,    // Elements section
-    ModuleCode, // Module definitions
-    Code,       // Function bodies (code)
-    Data,       // Data segments
-    DataCount,  // Count of passive data segments
-}
-
-/// Types as defined [here].
-///
-/// [here]: https://webassembly.github.io/spec/core/syntax/types.html#types
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum Type {
-    I32,
-    I64,
-    F32,
-    F64,
-    V128,
-    FuncRef,
-    ExternRef,
-    Func,
-    EmptyBlockType,
-}
-
-/// Either a value type or a function type.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum TypeOrFuncType {
-    /// A value type.
-    ///
-    /// When used as the type for a block, this type is the optional result
-    /// type: `[] -> [t?]`.
-    Type(Type),
-
-    /// A function type (referenced as an index into the types section).
-    FuncType(u32),
-}
-
-/// External types as defined [here].
-///
-/// [here]: https://webassembly.github.io/spec/core/syntax/types.html#external-types
-#[derive(Debug, Copy, Clone)]
-pub enum ExternalKind {
-    Function,
-    Table,
-    Memory,
-    Global,
-    Type,
-    Module,
-    Instance,
-}
-
-#[derive(Debug, Clone)]
-pub enum TypeDef<'a> {
-    Func(FuncType),
-    Instance(InstanceType<'a>),
-    Module(ModuleType<'a>),
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Hash)]
-pub struct FuncType {
-    pub params: Box<[Type]>,
-    pub returns: Box<[Type]>,
-}
-
-#[derive(Debug, Clone)]
-pub struct InstanceType<'a> {
-    pub exports: Box<[ExportType<'a>]>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ModuleType<'a> {
-    pub imports: Box<[crate::Import<'a>]>,
-    pub exports: Box<[ExportType<'a>]>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ExportType<'a> {
-    pub name: &'a str,
-    pub ty: ImportSectionEntryType,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct ResizableLimits {
-    pub initial: u32,
-    pub maximum: Option<u32>,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct TableType {
-    pub element_type: Type,
-    pub limits: ResizableLimits,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct MemoryType {
-    pub limits: ResizableLimits,
-    pub shared: bool,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct GlobalType {
-    pub content_type: Type,
-    pub mutable: bool,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum ImportSectionEntryType {
-    Function(u32),
-    Table(TableType),
-    Memory(MemoryType),
-    Global(GlobalType),
-    Module(u32),
-    Instance(u32),
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct MemoryImmediate {
-    pub flags: u32,
-    pub offset: u32,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct Naming<'a> {
-    pub index: u32,
-    pub name: &'a str,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum NameType {
-    Module,
-    Function,
-    Local,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum LinkingType {
-    StackPointer(u32),
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum RelocType {
-    FunctionIndexLEB,
-    TableIndexSLEB,
-    TableIndexI32,
-    GlobalAddrLEB,
-    GlobalAddrSLEB,
-    GlobalAddrI32,
-    TypeIndexLEB,
-    GlobalIndexLEB,
-}
-
-/// A br_table entries representation.
-#[derive(Debug, Clone)]
-pub struct BrTable<'a> {
-    pub(crate) buffer: &'a [u8],
-    pub(crate) cnt: usize,
-}
-
-/// An IEEE binary32 immediate floating point value, represented as a u32
-/// containing the bitpattern.
-///
-/// All bit patterns are allowed.
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
-pub struct Ieee32(pub(crate) u32);
-
-impl Ieee32 {
-    pub fn bits(self) -> u32 {
-        self.0
-    }
-}
-
-/// An IEEE binary64 immediate floating point value, represented as a u64
-/// containing the bitpattern.
-///
-/// All bit patterns are allowed.
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
-pub struct Ieee64(pub(crate) u64);
-
-impl Ieee64 {
-    pub fn bits(self) -> u64 {
-        self.0
-    }
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
-pub struct V128(pub(crate) [u8; 16]);
-
-impl V128 {
-    pub fn bytes(&self) -> &[u8; 16] {
-        &self.0
-    }
-}
-
-pub type SIMDLaneIndex = u8;
-
-/// Instructions as defined [here].
-///
-/// [here]: https://webassembly.github.io/spec/core/binary/instructions.html
-#[derive(Debug, Clone)]
-pub enum Operator<'a> {
-    Unreachable,
-    Nop,
-    Block { ty: TypeOrFuncType },
-    Loop { ty: TypeOrFuncType },
-    If { ty: TypeOrFuncType },
-    Else,
-    End,
-    Br { relative_depth: u32 },
-    BrIf { relative_depth: u32 },
-    BrTable { table: BrTable<'a> },
-    Return,
-    Call { function_index: u32 },
-    CallIndirect { index: u32, table_index: u32 },
-    ReturnCall { function_index: u32 },
-    ReturnCallIndirect { index: u32, table_index: u32 },
-    Drop,
-    Select,
-    TypedSelect { ty: Type },
-    LocalGet { local_index: u32 },
-    LocalSet { local_index: u32 },
-    LocalTee { local_index: u32 },
-    GlobalGet { global_index: u32 },
-    GlobalSet { global_index: u32 },
-    I32Load { memarg: MemoryImmediate },
-    I64Load { memarg: MemoryImmediate },
-    F32Load { memarg: MemoryImmediate },
-    F64Load { memarg: MemoryImmediate },
-    I32Load8S { memarg: MemoryImmediate },
-    I32Load8U { memarg: MemoryImmediate },
-    I32Load16S { memarg: MemoryImmediate },
-    I32Load16U { memarg: MemoryImmediate },
-    I64Load8S { memarg: MemoryImmediate },
-    I64Load8U { memarg: MemoryImmediate },
-    I64Load16S { memarg: MemoryImmediate },
-    I64Load16U { memarg: MemoryImmediate },
-    I64Load32S { memarg: MemoryImmediate },
-    I64Load32U { memarg: MemoryImmediate },
-    I32Store { memarg: MemoryImmediate },
-    I64Store { memarg: MemoryImmediate },
-    F32Store { memarg: MemoryImmediate },
-    F64Store { memarg: MemoryImmediate },
-    I32Store8 { memarg: MemoryImmediate },
-    I32Store16 { memarg: MemoryImmediate },
-    I64Store8 { memarg: MemoryImmediate },
-    I64Store16 { memarg: MemoryImmediate },
-    I64Store32 { memarg: MemoryImmediate },
-    MemorySize { reserved: u32 },
-    MemoryGrow { reserved: u32 },
-    I32Const { value: i32 },
-    I64Const { value: i64 },
-    F32Const { value: Ieee32 },
-    F64Const { value: Ieee64 },
-    RefNull { ty: Type },
-    RefIsNull,
-    RefFunc { function_index: u32 },
-    I32Eqz,
-    I32Eq,
-    I32Ne,
-    I32LtS,
-    I32LtU,
-    I32GtS,
-    I32GtU,
-    I32LeS,
-    I32LeU,
-    I32GeS,
-    I32GeU,
-    I64Eqz,
-    I64Eq,
-    I64Ne,
-    I64LtS,
-    I64LtU,
-    I64GtS,
-    I64GtU,
-    I64LeS,
-    I64LeU,
-    I64GeS,
-    I64GeU,
-    F32Eq,
-    F32Ne,
-    F32Lt,
-    F32Gt,
-    F32Le,
-    F32Ge,
-    F64Eq,
-    F64Ne,
-    F64Lt,
-    F64Gt,
-    F64Le,
-    F64Ge,
-    I32Clz,
-    I32Ctz,
-    I32Popcnt,
-    I32Add,
-    I32Sub,
-    I32Mul,
-    I32DivS,
-    I32DivU,
-    I32RemS,
-    I32RemU,
-    I32And,
-    I32Or,
-    I32Xor,
-    I32Shl,
-    I32ShrS,
-    I32ShrU,
-    I32Rotl,
-    I32Rotr,
-    I64Clz,
-    I64Ctz,
-    I64Popcnt,
-    I64Add,
-    I64Sub,
-    I64Mul,
-    I64DivS,
-    I64DivU,
-    I64RemS,
-    I64RemU,
-    I64And,
-    I64Or,
-    I64Xor,
-    I64Shl,
-    I64ShrS,
-    I64ShrU,
-    I64Rotl,
-    I64Rotr,
-    F32Abs,
-    F32Neg,
-    F32Ceil,
-    F32Floor,
-    F32Trunc,
-    F32Nearest,
-    F32Sqrt,
-    F32Add,
-    F32Sub,
-    F32Mul,
-    F32Div,
-    F32Min,
-    F32Max,
-    F32Copysign,
-    F64Abs,
-    F64Neg,
-    F64Ceil,
-    F64Floor,
-    F64Trunc,
-    F64Nearest,
-    F64Sqrt,
-    F64Add,
-    F64Sub,
-    F64Mul,
-    F64Div,
-    F64Min,
-    F64Max,
-    F64Copysign,
-    I32WrapI64,
-    I32TruncF32S,
-    I32TruncF32U,
-    I32TruncF64S,
-    I32TruncF64U,
-    I64ExtendI32S,
-    I64ExtendI32U,
-    I64TruncF32S,
-    I64TruncF32U,
-    I64TruncF64S,
-    I64TruncF64U,
-    F32ConvertI32S,
-    F32ConvertI32U,
-    F32ConvertI64S,
-    F32ConvertI64U,
-    F32DemoteF64,
-    F64ConvertI32S,
-    F64ConvertI32U,
-    F64ConvertI64S,
-    F64ConvertI64U,
-    F64PromoteF32,
-    I32ReinterpretF32,
-    I64ReinterpretF64,
-    F32ReinterpretI32,
-    F64ReinterpretI64,
-    I32Extend8S,
-    I32Extend16S,
-    I64Extend8S,
-    I64Extend16S,
-    I64Extend32S,
-
-    // 0xFC operators
-    // Non-trapping Float-to-int Conversions
-    I32TruncSatF32S,
-    I32TruncSatF32U,
-    I32TruncSatF64S,
-    I32TruncSatF64U,
-    I64TruncSatF32S,
-    I64TruncSatF32U,
-    I64TruncSatF64S,
-    I64TruncSatF64U,
-
-    // 0xFC operators
-    // bulk memory https://github.com/WebAssembly/bulk-memory-operations/blob/master/proposals/bulk-memory-operations/Overview.md
-    MemoryInit { segment: u32 },
-    DataDrop { segment: u32 },
-    MemoryCopy,
-    MemoryFill,
-    TableInit { segment: u32, table: u32 },
-    ElemDrop { segment: u32 },
-    TableCopy { dst_table: u32, src_table: u32 },
-    TableFill { table: u32 },
-    TableGet { table: u32 },
-    TableSet { table: u32 },
-    TableGrow { table: u32 },
-    TableSize { table: u32 },
-
-    // 0xFE operators
-    // https://github.com/WebAssembly/threads/blob/master/proposals/threads/Overview.md
-    AtomicNotify { memarg: MemoryImmediate },
-    I32AtomicWait { memarg: MemoryImmediate },
-    I64AtomicWait { memarg: MemoryImmediate },
-    AtomicFence { flags: u8 },
-    I32AtomicLoad { memarg: MemoryImmediate },
-    I64AtomicLoad { memarg: MemoryImmediate },
-    I32AtomicLoad8U { memarg: MemoryImmediate },
-    I32AtomicLoad16U { memarg: MemoryImmediate },
-    I64AtomicLoad8U { memarg: MemoryImmediate },
-    I64AtomicLoad16U { memarg: MemoryImmediate },
-    I64AtomicLoad32U { memarg: MemoryImmediate },
-    I32AtomicStore { memarg: MemoryImmediate },
-    I64AtomicStore { memarg: MemoryImmediate },
-    I32AtomicStore8 { memarg: MemoryImmediate },
-    I32AtomicStore16 { memarg: MemoryImmediate },
-    I64AtomicStore8 { memarg: MemoryImmediate },
-    I64AtomicStore16 { memarg: MemoryImmediate },
-    I64AtomicStore32 { memarg: MemoryImmediate },
-    I32AtomicRmwAdd { memarg: MemoryImmediate },
-    I64AtomicRmwAdd { memarg: MemoryImmediate },
-    I32AtomicRmw8AddU { memarg: MemoryImmediate },
-    I32AtomicRmw16AddU { memarg: MemoryImmediate },
-    I64AtomicRmw8AddU { memarg: MemoryImmediate },
-    I64AtomicRmw16AddU { memarg: MemoryImmediate },
-    I64AtomicRmw32AddU { memarg: MemoryImmediate },
-    I32AtomicRmwSub { memarg: MemoryImmediate },
-    I64AtomicRmwSub { memarg: MemoryImmediate },
-    I32AtomicRmw8SubU { memarg: MemoryImmediate },
-    I32AtomicRmw16SubU { memarg: MemoryImmediate },
-    I64AtomicRmw8SubU { memarg: MemoryImmediate },
-    I64AtomicRmw16SubU { memarg: MemoryImmediate },
-    I64AtomicRmw32SubU { memarg: MemoryImmediate },
-    I32AtomicRmwAnd { memarg: MemoryImmediate },
-    I64AtomicRmwAnd { memarg: MemoryImmediate },
-    I32AtomicRmw8AndU { memarg: MemoryImmediate },
-    I32AtomicRmw16AndU { memarg: MemoryImmediate },
-    I64AtomicRmw8AndU { memarg: MemoryImmediate },
-    I64AtomicRmw16AndU { memarg: MemoryImmediate },
-    I64AtomicRmw32AndU { memarg: MemoryImmediate },
-    I32AtomicRmwOr { memarg: MemoryImmediate },
-    I64AtomicRmwOr { memarg: MemoryImmediate },
-    I32AtomicRmw8OrU { memarg: MemoryImmediate },
-    I32AtomicRmw16OrU { memarg: MemoryImmediate },
-    I64AtomicRmw8OrU { memarg: MemoryImmediate },
-    I64AtomicRmw16OrU { memarg: MemoryImmediate },
-    I64AtomicRmw32OrU { memarg: MemoryImmediate },
-    I32AtomicRmwXor { memarg: MemoryImmediate },
-    I64AtomicRmwXor { memarg: MemoryImmediate },
-    I32AtomicRmw8XorU { memarg: MemoryImmediate },
-    I32AtomicRmw16XorU { memarg: MemoryImmediate },
-    I64AtomicRmw8XorU { memarg: MemoryImmediate },
-    I64AtomicRmw16XorU { memarg: MemoryImmediate },
-    I64AtomicRmw32XorU { memarg: MemoryImmediate },
-    I32AtomicRmwXchg { memarg: MemoryImmediate },
-    I64AtomicRmwXchg { memarg: MemoryImmediate },
-    I32AtomicRmw8XchgU { memarg: MemoryImmediate },
-    I32AtomicRmw16XchgU { memarg: MemoryImmediate },
-    I64AtomicRmw8XchgU { memarg: MemoryImmediate },
-    I64AtomicRmw16XchgU { memarg: MemoryImmediate },
-    I64AtomicRmw32XchgU { memarg: MemoryImmediate },
-    I32AtomicRmwCmpxchg { memarg: MemoryImmediate },
-    I64AtomicRmwCmpxchg { memarg: MemoryImmediate },
-    I32AtomicRmw8CmpxchgU { memarg: MemoryImmediate },
-    I32AtomicRmw16CmpxchgU { memarg: MemoryImmediate },
-    I64AtomicRmw8CmpxchgU { memarg: MemoryImmediate },
-    I64AtomicRmw16CmpxchgU { memarg: MemoryImmediate },
-    I64AtomicRmw32CmpxchgU { memarg: MemoryImmediate },
-
-    // 0xFD operators
-    // SIMD https://github.com/WebAssembly/simd/blob/master/proposals/simd/BinarySIMD.md
-    V128Load { memarg: MemoryImmediate },
-    V128Store { memarg: MemoryImmediate },
-    V128Const { value: V128 },
-    I8x16Splat,
-    I8x16ExtractLaneS { lane: SIMDLaneIndex },
-    I8x16ExtractLaneU { lane: SIMDLaneIndex },
-    I8x16ReplaceLane { lane: SIMDLaneIndex },
-    I16x8Splat,
-    I16x8ExtractLaneS { lane: SIMDLaneIndex },
-    I16x8ExtractLaneU { lane: SIMDLaneIndex },
-    I16x8ReplaceLane { lane: SIMDLaneIndex },
-    I32x4Splat,
-    I32x4ExtractLane { lane: SIMDLaneIndex },
-    I32x4ReplaceLane { lane: SIMDLaneIndex },
-    I64x2Splat,
-    I64x2ExtractLane { lane: SIMDLaneIndex },
-    I64x2ReplaceLane { lane: SIMDLaneIndex },
-    F32x4Splat,
-    F32x4ExtractLane { lane: SIMDLaneIndex },
-    F32x4ReplaceLane { lane: SIMDLaneIndex },
-    F64x2Splat,
-    F64x2ExtractLane { lane: SIMDLaneIndex },
-    F64x2ReplaceLane { lane: SIMDLaneIndex },
-    I8x16Eq,
-    I8x16Ne,
-    I8x16LtS,
-    I8x16LtU,
-    I8x16GtS,
-    I8x16GtU,
-    I8x16LeS,
-    I8x16LeU,
-    I8x16GeS,
-    I8x16GeU,
-    I16x8Eq,
-    I16x8Ne,
-    I16x8LtS,
-    I16x8LtU,
-    I16x8GtS,
-    I16x8GtU,
-    I16x8LeS,
-    I16x8LeU,
-    I16x8GeS,
-    I16x8GeU,
-    I32x4Eq,
-    I32x4Ne,
-    I32x4LtS,
-    I32x4LtU,
-    I32x4GtS,
-    I32x4GtU,
-    I32x4LeS,
-    I32x4LeU,
-    I32x4GeS,
-    I32x4GeU,
-    F32x4Eq,
-    F32x4Ne,
-    F32x4Lt,
-    F32x4Gt,
-    F32x4Le,
-    F32x4Ge,
-    F64x2Eq,
-    F64x2Ne,
-    F64x2Lt,
-    F64x2Gt,
-    F64x2Le,
-    F64x2Ge,
-    V128Not,
-    V128And,
-    V128AndNot,
-    V128Or,
-    V128Xor,
-    V128Bitselect,
-    I8x16Abs,
-    I8x16Neg,
-    I8x16AnyTrue,
-    I8x16AllTrue,
-    I8x16Bitmask,
-    I8x16Shl,
-    I8x16ShrS,
-    I8x16ShrU,
-    I8x16Add,
-    I8x16AddSaturateS,
-    I8x16AddSaturateU,
-    I8x16Sub,
-    I8x16SubSaturateS,
-    I8x16SubSaturateU,
-    I8x16MinS,
-    I8x16MinU,
-    I8x16MaxS,
-    I8x16MaxU,
-    I16x8Abs,
-    I16x8Neg,
-    I16x8AnyTrue,
-    I16x8AllTrue,
-    I16x8Bitmask,
-    I16x8Shl,
-    I16x8ShrS,
-    I16x8ShrU,
-    I16x8Add,
-    I16x8AddSaturateS,
-    I16x8AddSaturateU,
-    I16x8Sub,
-    I16x8SubSaturateS,
-    I16x8SubSaturateU,
-    I16x8Mul,
-    I16x8MinS,
-    I16x8MinU,
-    I16x8MaxS,
-    I16x8MaxU,
-    I32x4Abs,
-    I32x4Neg,
-    I32x4AnyTrue,
-    I32x4AllTrue,
-    I32x4Bitmask,
-    I32x4Shl,
-    I32x4ShrS,
-    I32x4ShrU,
-    I32x4Add,
-    I32x4Sub,
-    I32x4Mul,
-    I32x4MinS,
-    I32x4MinU,
-    I32x4MaxS,
-    I32x4MaxU,
-    I64x2Neg,
-    I64x2Shl,
-    I64x2ShrS,
-    I64x2ShrU,
-    I64x2Add,
-    I64x2Sub,
-    I64x2Mul,
-    F32x4Abs,
-    F32x4Neg,
-    F32x4Sqrt,
-    F32x4Add,
-    F32x4Sub,
-    F32x4Mul,
-    F32x4Div,
-    F32x4Min,
-    F32x4Max,
-    F64x2Abs,
-    F64x2Neg,
-    F64x2Sqrt,
-    F64x2Add,
-    F64x2Sub,
-    F64x2Mul,
-    F64x2Div,
-    F64x2Min,
-    F64x2Max,
-    I32x4TruncSatF32x4S,
-    I32x4TruncSatF32x4U,
-    F32x4ConvertI32x4S,
-    F32x4ConvertI32x4U,
-    V8x16Swizzle,
-    V8x16Shuffle { lanes: [SIMDLaneIndex; 16] },
-    V8x16LoadSplat { memarg: MemoryImmediate },
-    V16x8LoadSplat { memarg: MemoryImmediate },
-    V32x4LoadSplat { memarg: MemoryImmediate },
-    V64x2LoadSplat { memarg: MemoryImmediate },
-    I8x16NarrowI16x8S,
-    I8x16NarrowI16x8U,
-    I16x8NarrowI32x4S,
-    I16x8NarrowI32x4U,
-    I16x8WidenLowI8x16S,
-    I16x8WidenHighI8x16S,
-    I16x8WidenLowI8x16U,
-    I16x8WidenHighI8x16U,
-    I32x4WidenLowI16x8S,
-    I32x4WidenHighI16x8S,
-    I32x4WidenLowI16x8U,
-    I32x4WidenHighI16x8U,
-    I16x8Load8x8S { memarg: MemoryImmediate },
-    I16x8Load8x8U { memarg: MemoryImmediate },
-    I32x4Load16x4S { memarg: MemoryImmediate },
-    I32x4Load16x4U { memarg: MemoryImmediate },
-    I64x2Load32x2S { memarg: MemoryImmediate },
-    I64x2Load32x2U { memarg: MemoryImmediate },
-    I8x16RoundingAverageU,
-    I16x8RoundingAverageU,
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/alias_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/alias_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/alias_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/alias_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-use crate::{
-    BinaryReader, BinaryReaderError, ExternalKind, Range, Result, SectionIteratorLimited,
-    SectionReader, SectionWithLimitedItems,
-};
-
-#[derive(Clone)]
-pub struct AliasSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-#[derive(Debug)]
-pub struct Alias {
-    pub instance: AliasedInstance,
-    pub kind: ExternalKind,
-    pub index: u32,
-}
-
-#[derive(Debug)]
-pub enum AliasedInstance {
-    Parent,
-    Child(u32),
-}
-
-impl<'a> AliasSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<AliasSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(AliasSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn read(&mut self) -> Result<Alias> {
-        Ok(Alias {
-            instance: match self.reader.read_u8()? {
-                0x00 => AliasedInstance::Child(self.reader.read_var_u32()?),
-                0x01 => AliasedInstance::Parent,
-                _ => {
-                    return Err(BinaryReaderError::new(
-                        "invalid byte in alias",
-                        self.original_position() - 1,
-                    ))
-                }
-            },
-            kind: self.reader.read_external_kind()?,
-            index: self.reader.read_var_u32()?,
-        })
-    }
-}
-
-impl<'a> SectionReader for AliasSectionReader<'a> {
-    type Item = Alias;
-
-    fn read(&mut self) -> Result<Self::Item> {
-        AliasSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        AliasSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for AliasSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        AliasSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for AliasSectionReader<'a> {
-    type Item = Result<Alias>;
-    type IntoIter = SectionIteratorLimited<AliasSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/code_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/code_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/code_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/code_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, BinaryReaderError, OperatorsReader, Range, Result, SectionIteratorLimited,
-    SectionReader, SectionWithLimitedItems, Type,
-};
-
-#[derive(Debug)]
-pub struct FunctionBody<'a> {
-    offset: usize,
-    data: &'a [u8],
-}
-
-impl<'a> FunctionBody<'a> {
-    pub fn new(offset: usize, data: &'a [u8]) -> Self {
-        Self { offset, data }
-    }
-
-    pub fn get_binary_reader<'b>(&self) -> BinaryReader<'b>
-    where
-        'a: 'b,
-    {
-        BinaryReader::new_with_offset(self.data, self.offset)
-    }
-
-    fn skip_locals(reader: &mut BinaryReader) -> Result<()> {
-        let count = reader.read_var_u32()?;
-        for _ in 0..count {
-            reader.skip_var_32()?;
-            reader.skip_type()?;
-        }
-        Ok(())
-    }
-
-    pub fn get_locals_reader<'b>(&self) -> Result<LocalsReader<'b>>
-    where
-        'a: 'b,
-    {
-        let mut reader = BinaryReader::new_with_offset(self.data, self.offset);
-        let count = reader.read_var_u32()?;
-        Ok(LocalsReader { reader, count })
-    }
-
-    pub fn get_operators_reader<'b>(&self) -> Result<OperatorsReader<'b>>
-    where
-        'a: 'b,
-    {
-        let mut reader = BinaryReader::new_with_offset(self.data, self.offset);
-        Self::skip_locals(&mut reader)?;
-        let pos = reader.position;
-        Ok(OperatorsReader::new(&self.data[pos..], self.offset + pos))
-    }
-
-    pub fn range(&self) -> Range {
-        Range {
-            start: self.offset,
-            end: self.offset + self.data.len(),
-        }
-    }
-}
-
-pub struct LocalsReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> LocalsReader<'a> {
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn read(&mut self) -> Result<(u32, Type)> {
-        let count = self.reader.read_var_u32()?;
-        let value_type = self.reader.read_type()?;
-        Ok((count, value_type))
-    }
-}
-
-pub struct CodeSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> IntoIterator for LocalsReader<'a> {
-    type Item = Result<(u32, Type)>;
-    type IntoIter = LocalsIterator<'a>;
-    fn into_iter(self) -> Self::IntoIter {
-        let count = self.count;
-        LocalsIterator {
-            reader: self,
-            left: count,
-            err: false,
-        }
-    }
-}
-
-pub struct LocalsIterator<'a> {
-    reader: LocalsReader<'a>,
-    left: u32,
-    err: bool,
-}
-
-impl<'a> Iterator for LocalsIterator<'a> {
-    type Item = Result<(u32, Type)>;
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.err || self.left == 0 {
-            return None;
-        }
-        let result = self.reader.read();
-        self.err = result.is_err();
-        self.left -= 1;
-        Some(result)
-    }
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let count = self.reader.get_count() as usize;
-        (count, Some(count))
-    }
-}
-
-impl<'a> CodeSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<CodeSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(CodeSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    fn verify_body_end(&self, end: usize) -> Result<()> {
-        if self.reader.buffer.len() < end {
-            return Err(BinaryReaderError::new(
-                "Function body extends past end of the code section",
-                self.reader.original_offset + self.reader.buffer.len(),
-            ));
-        }
-        Ok(())
-    }
-
-    /// Reads content of the code section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::CodeSectionReader;
-    /// # let data: &[u8] = &[
-    /// #     0x01, 0x03, 0x00, 0x01, 0x0b];
-    /// let mut code_reader = CodeSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..code_reader.get_count() {
-    ///     let body = code_reader.read().expect("function body");
-    ///     let mut binary_reader = body.get_binary_reader();
-    ///     assert!(binary_reader.read_local_count().expect("local count") == 0);
-    ///     let op = binary_reader.read_operator().expect("first operator");
-    ///     println!("First operator: {:?}", op);
-    /// }
-    /// ```
-    pub fn read<'b>(&mut self) -> Result<FunctionBody<'b>>
-    where
-        'a: 'b,
-    {
-        let size = self.reader.read_var_u32()? as usize;
-        let body_start = self.reader.position;
-        let body_end = body_start + size;
-        self.verify_body_end(body_end)?;
-        self.reader.skip_to(body_end);
-        Ok(FunctionBody {
-            offset: self.reader.original_offset + body_start,
-            data: &self.reader.buffer[body_start..body_end],
-        })
-    }
-}
-
-impl<'a> SectionReader for CodeSectionReader<'a> {
-    type Item = FunctionBody<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        CodeSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        CodeSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for CodeSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        CodeSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for CodeSectionReader<'a> {
-    type Item = Result<FunctionBody<'a>>;
-    type IntoIter = SectionIteratorLimited<CodeSectionReader<'a>>;
-
-    /// Implements iterator over the code section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::CodeSectionReader;
-    /// # let data: &[u8] = &[
-    /// #     0x01, 0x03, 0x00, 0x01, 0x0b];
-    /// let mut code_reader = CodeSectionReader::new(data, 0).unwrap();
-    /// for body in code_reader {
-    ///     let mut binary_reader = body.expect("b").get_binary_reader();
-    ///     assert!(binary_reader.read_local_count().expect("local count") == 0);
-    ///     let op = binary_reader.read_operator().expect("first operator");
-    ///     println!("First operator: {:?}", op);
-    /// }
-    /// ```
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/data_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/data_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/data_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/data_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, BinaryReaderError, InitExpr, Range, Result, SectionIteratorLimited,
-    SectionReader, SectionWithLimitedItems,
-};
-
-#[derive(Debug, Copy, Clone)]
-pub struct Data<'a> {
-    pub kind: DataKind<'a>,
-    pub data: &'a [u8],
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum DataKind<'a> {
-    Passive,
-    Active {
-        memory_index: u32,
-        init_expr: InitExpr<'a>,
-    },
-}
-
-#[derive(Clone)]
-pub struct DataSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> DataSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<DataSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(DataSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    fn verify_data_end(&self, end: usize) -> Result<()> {
-        if self.reader.buffer.len() < end {
-            return Err(BinaryReaderError::new(
-                "Data segment extends past end of the data section",
-                self.reader.original_offset + self.reader.buffer.len(),
-            ));
-        }
-        Ok(())
-    }
-
-    /// Reads content of the data section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::{DataSectionReader, DataKind};
-    /// # let data: &[u8] = &[
-    /// #     0x01, 0x00, 0x41, 0x80, 0x08, 0x0b, 0x04, 0x00, 0x00, 0x00, 0x00];
-    /// let mut data_reader = DataSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..data_reader.get_count() {
-    ///     let data = data_reader.read().expect("data");
-    ///     println!("Data: {:?}", data);
-    ///     if let DataKind::Active { init_expr, .. } = data.kind {
-    ///         let mut init_expr_reader = init_expr.get_binary_reader();
-    ///         let op = init_expr_reader.read_operator().expect("op");
-    ///         println!("Init const: {:?}", op);
-    ///     }
-    /// }
-    /// ```
-    pub fn read<'b>(&mut self) -> Result<Data<'b>>
-    where
-        'a: 'b,
-    {
-        let flags = self.reader.read_var_u32()?;
-        let kind = if flags == 1 {
-            DataKind::Passive
-        } else {
-            let memory_index = match flags {
-                0 => 0,
-                2 => self.reader.read_var_u32()?,
-                _ => {
-                    return Err(BinaryReaderError::new(
-                        "invalid flags byte in data segment",
-                        self.reader.original_position() - 1,
-                    ));
-                }
-            };
-            let init_expr = {
-                let expr_offset = self.reader.position;
-                self.reader.skip_init_expr()?;
-                let data = &self.reader.buffer[expr_offset..self.reader.position];
-                InitExpr::new(data, self.reader.original_offset + expr_offset)
-            };
-            DataKind::Active {
-                memory_index,
-                init_expr,
-            }
-        };
-        let data_len = self.reader.read_var_u32()? as usize;
-        let data_end = self.reader.position + data_len;
-        self.verify_data_end(data_end)?;
-        let data = &self.reader.buffer[self.reader.position..data_end];
-        self.reader.skip_to(data_end);
-        Ok(Data { kind, data })
-    }
-}
-
-impl<'a> SectionReader for DataSectionReader<'a> {
-    type Item = Data<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        DataSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        DataSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for DataSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        DataSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for DataSectionReader<'a> {
-    type Item = Result<Data<'a>>;
-    type IntoIter = SectionIteratorLimited<DataSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/element_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/element_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/element_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/element_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,290 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, BinaryReaderError, InitExpr, Range, Result, SectionIteratorLimited,
-    SectionReader, SectionWithLimitedItems, Type,
-};
-use crate::{ExternalKind, Operator};
-
-#[derive(Clone)]
-pub struct Element<'a> {
-    pub kind: ElementKind<'a>,
-    pub items: ElementItems<'a>,
-    pub ty: Type,
-}
-
-#[derive(Clone)]
-pub enum ElementKind<'a> {
-    Passive,
-    Active {
-        table_index: u32,
-        init_expr: InitExpr<'a>,
-    },
-    Declared,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct ElementItems<'a> {
-    exprs: bool,
-    offset: usize,
-    data: &'a [u8],
-}
-
-#[derive(Debug)]
-pub enum ElementItem {
-    Null(Type),
-    Func(u32),
-}
-
-impl<'a> ElementItems<'a> {
-    pub fn get_items_reader<'b>(&self) -> Result<ElementItemsReader<'b>>
-    where
-        'a: 'b,
-    {
-        ElementItemsReader::new(self.data, self.offset, self.exprs)
-    }
-}
-
-pub struct ElementItemsReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-    exprs: bool,
-}
-
-impl<'a> ElementItemsReader<'a> {
-    pub fn new(data: &[u8], offset: usize, exprs: bool) -> Result<ElementItemsReader> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(ElementItemsReader {
-            reader,
-            count,
-            exprs,
-        })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn uses_exprs(&self) -> bool {
-        self.exprs
-    }
-
-    pub fn read(&mut self) -> Result<ElementItem> {
-        if self.exprs {
-            let offset = self.reader.original_position();
-            let ret = match self.reader.read_operator()? {
-                Operator::RefNull { ty } => ElementItem::Null(ty),
-                Operator::RefFunc { function_index } => ElementItem::Func(function_index),
-                _ => return Err(BinaryReaderError::new("invalid passive segment", offset)),
-            };
-            match self.reader.read_operator()? {
-                Operator::End => {}
-                _ => return Err(BinaryReaderError::new("invalid passive segment", offset)),
-            }
-            Ok(ret)
-        } else {
-            self.reader.read_var_u32().map(ElementItem::Func)
-        }
-    }
-}
-
-impl<'a> IntoIterator for ElementItemsReader<'a> {
-    type Item = Result<ElementItem>;
-    type IntoIter = ElementItemsIterator<'a>;
-    fn into_iter(self) -> Self::IntoIter {
-        let count = self.count;
-        ElementItemsIterator {
-            reader: self,
-            left: count,
-            err: false,
-        }
-    }
-}
-
-pub struct ElementItemsIterator<'a> {
-    reader: ElementItemsReader<'a>,
-    left: u32,
-    err: bool,
-}
-
-impl<'a> Iterator for ElementItemsIterator<'a> {
-    type Item = Result<ElementItem>;
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.err || self.left == 0 {
-            return None;
-        }
-        let result = self.reader.read();
-        self.err = result.is_err();
-        self.left -= 1;
-        Some(result)
-    }
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let count = self.reader.get_count() as usize;
-        (count, Some(count))
-    }
-}
-
-#[derive(Clone)]
-pub struct ElementSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> ElementSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<ElementSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(ElementSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    /// Reads content of the element section.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// # let data: &[u8] = &[];
-    /// use wasmparser::{ElementSectionReader, ElementKind};
-    /// let mut element_reader = ElementSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..element_reader.get_count() {
-    ///     let element = element_reader.read().expect("element");
-    ///     if let ElementKind::Active { init_expr, .. } = element.kind {
-    ///         let mut init_expr_reader = init_expr.get_binary_reader();
-    ///         let op = init_expr_reader.read_operator().expect("op");
-    ///         println!("Init const: {:?}", op);
-    ///     }
-    ///     let mut items_reader = element.items.get_items_reader().expect("items reader");
-    ///     for _ in 0..items_reader.get_count() {
-    ///         let item = items_reader.read().expect("item");
-    ///         println!("  Item: {:?}", item);
-    ///     }
-    /// }
-    /// ```
-    pub fn read<'b>(&mut self) -> Result<Element<'b>>
-    where
-        'a: 'b,
-    {
-        let flags = self.reader.read_var_u32()?;
-        if (flags & !0b111) != 0 {
-            return Err(BinaryReaderError::new(
-                "invalid flags byte in element segment",
-                self.reader.original_position() - 1,
-            ));
-        }
-        let kind = if flags & 0b001 != 0 {
-            if flags & 0b010 != 0 {
-                ElementKind::Declared
-            } else {
-                ElementKind::Passive
-            }
-        } else {
-            let table_index = if flags & 0b010 == 0 {
-                0
-            } else {
-                self.reader.read_var_u32()?
-            };
-            let init_expr = {
-                let expr_offset = self.reader.position;
-                self.reader.skip_init_expr()?;
-                let data = &self.reader.buffer[expr_offset..self.reader.position];
-                InitExpr::new(data, self.reader.original_offset + expr_offset)
-            };
-            ElementKind::Active {
-                table_index,
-                init_expr,
-            }
-        };
-        let exprs = flags & 0b100 != 0;
-        let ty = if flags & 0b011 != 0 {
-            if exprs {
-                self.reader.read_type()?
-            } else {
-                match self.reader.read_external_kind()? {
-                    ExternalKind::Function => Type::FuncRef,
-                    _ => {
-                        return Err(BinaryReaderError::new(
-                            "only the function external type is supported in elem segment",
-                            self.reader.original_position() - 1,
-                        ));
-                    }
-                }
-            }
-        } else {
-            Type::FuncRef
-        };
-        let data_start = self.reader.position;
-        let items_count = self.reader.read_var_u32()?;
-        if exprs {
-            for _ in 0..items_count {
-                self.reader.skip_init_expr()?;
-            }
-        } else {
-            for _ in 0..items_count {
-                self.reader.skip_var_32()?;
-            }
-        }
-        let data_end = self.reader.position;
-        let items = ElementItems {
-            offset: self.reader.original_offset + data_start,
-            data: &self.reader.buffer[data_start..data_end],
-            exprs,
-        };
-        Ok(Element { kind, items, ty })
-    }
-}
-
-impl<'a> SectionReader for ElementSectionReader<'a> {
-    type Item = Element<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        ElementSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        ElementSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for ElementSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        ElementSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for ElementSectionReader<'a> {
-    type Item = Result<Element<'a>>;
-    type IntoIter = SectionIteratorLimited<ElementSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/export_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/export_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/export_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/export_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, ExternalKind, Range, Result, SectionIteratorLimited, SectionReader,
-    SectionWithLimitedItems,
-};
-
-#[derive(Debug, Copy, Clone)]
-pub struct Export<'a> {
-    pub field: &'a str,
-    pub kind: ExternalKind,
-    pub index: u32,
-}
-
-#[derive(Clone)]
-pub struct ExportSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> ExportSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<ExportSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(ExportSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    /// Reads content of the export section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::ExportSectionReader;
-    ///
-    /// # let data: &[u8] = &[0x01, 0x01, 0x65, 0x00, 0x00];
-    /// let mut export_reader = ExportSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..export_reader.get_count() {
-    ///     let export = export_reader.read().expect("export");
-    ///     println!("Export: {:?}", export);
-    /// }
-    /// ```
-    pub fn read<'b>(&mut self) -> Result<Export<'b>>
-    where
-        'a: 'b,
-    {
-        let field = self.reader.read_string()?;
-        let kind = self.reader.read_external_kind()?;
-        let index = self.reader.read_var_u32()?;
-        Ok(Export { field, kind, index })
-    }
-}
-
-impl<'a> SectionReader for ExportSectionReader<'a> {
-    type Item = Export<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        ExportSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        ExportSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for ExportSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        ExportSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for ExportSectionReader<'a> {
-    type Item = Result<Export<'a>>;
-    type IntoIter = SectionIteratorLimited<ExportSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/function_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/function_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/function_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/function_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, Range, Result, SectionIteratorLimited, SectionReader, SectionWithLimitedItems,
-};
-
-#[derive(Clone)]
-pub struct FunctionSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> FunctionSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<FunctionSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(FunctionSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    /// Reads function type index from the function section.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use wasmparser::FunctionSectionReader;
-    /// # let data: &[u8] = &[0x01, 0x00];
-    /// let mut function_reader = FunctionSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..function_reader.get_count() {
-    ///     let ty = function_reader.read().expect("function type index");
-    ///     println!("Function type index: {}", ty);
-    /// }
-    /// ```
-    pub fn read(&mut self) -> Result<u32> {
-        self.reader.read_var_u32()
-    }
-}
-
-impl<'a> SectionReader for FunctionSectionReader<'a> {
-    type Item = u32;
-    fn read(&mut self) -> Result<Self::Item> {
-        FunctionSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        FunctionSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for FunctionSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        FunctionSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for FunctionSectionReader<'a> {
-    type Item = Result<u32>;
-    type IntoIter = SectionIteratorLimited<FunctionSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/global_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/global_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/global_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/global_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, GlobalType, InitExpr, Range, Result, SectionIteratorLimited, SectionReader,
-    SectionWithLimitedItems,
-};
-
-#[derive(Debug, Copy, Clone)]
-pub struct Global<'a> {
-    pub ty: GlobalType,
-    pub init_expr: InitExpr<'a>,
-}
-
-#[derive(Clone)]
-pub struct GlobalSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> GlobalSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<GlobalSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(GlobalSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    /// Reads content of the global section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::GlobalSectionReader;
-    /// # let data: &[u8] = &[0x01, 0x7F, 0x01, 0x41, 0x90, 0x88, 0x04, 0x0B];
-    /// let mut global_reader = GlobalSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..global_reader.get_count() {
-    ///     let global = global_reader.read().expect("global");
-    ///     println!("Global: {:?}", global);
-    ///     let mut init_expr_reader = global.init_expr.get_binary_reader();
-    ///     let op = init_expr_reader.read_operator().expect("op");
-    ///     println!("Init const: {:?}", op);
-    /// }
-    /// ```
-    pub fn read<'b>(&mut self) -> Result<Global<'b>>
-    where
-        'a: 'b,
-    {
-        let ty = self.reader.read_global_type()?;
-        let expr_offset = self.reader.position;
-        self.reader.skip_init_expr()?;
-        let data = &self.reader.buffer[expr_offset..self.reader.position];
-        let init_expr = InitExpr::new(data, self.reader.original_offset + expr_offset);
-        Ok(Global { ty, init_expr })
-    }
-}
-
-impl<'a> SectionReader for GlobalSectionReader<'a> {
-    type Item = Global<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        GlobalSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        GlobalSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for GlobalSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        GlobalSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for GlobalSectionReader<'a> {
-    type Item = Result<Global<'a>>;
-    type IntoIter = SectionIteratorLimited<GlobalSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/import_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/import_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/import_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/import_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use crate::{
-    BinaryReader, ImportSectionEntryType, Range, Result, SectionIteratorLimited, SectionReader,
-    SectionWithLimitedItems,
-};
-
-#[derive(Debug, Copy, Clone)]
-pub struct Import<'a> {
-    pub module: &'a str,
-    pub field: Option<&'a str>,
-    pub ty: ImportSectionEntryType,
-}
-
-#[derive(Clone)]
-pub struct ImportSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> ImportSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<ImportSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(ImportSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    /// Reads content of the import section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::ImportSectionReader;
-    /// # let data: &[u8] = &[0x01, 0x01, 0x41, 0x01, 0x66, 0x00, 0x00];
-    /// let mut import_reader = ImportSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..import_reader.get_count() {
-    ///     let import = import_reader.read().expect("import");
-    ///     println!("Import: {:?}", import);
-    /// }
-    /// ```
-    pub fn read<'b>(&mut self) -> Result<Import<'b>>
-    where
-        'a: 'b,
-    {
-        self.reader.read_import()
-    }
-}
-
-impl<'a> SectionReader for ImportSectionReader<'a> {
-    type Item = Import<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        ImportSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        ImportSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for ImportSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        ImportSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for ImportSectionReader<'a> {
-    type Item = Result<Import<'a>>;
-    type IntoIter = SectionIteratorLimited<ImportSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/init_expr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/init_expr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/init_expr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/init_expr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{BinaryReader, OperatorsReader};
-
-#[derive(Debug, Copy, Clone)]
-pub struct InitExpr<'a> {
-    offset: usize,
-    data: &'a [u8],
-}
-
-impl<'a> InitExpr<'a> {
-    pub fn new(data: &[u8], offset: usize) -> InitExpr {
-        InitExpr { offset, data }
-    }
-
-    pub fn get_binary_reader<'b>(&self) -> BinaryReader<'b>
-    where
-        'a: 'b,
-    {
-        BinaryReader::new_with_offset(self.data, self.offset)
-    }
-
-    pub fn get_operators_reader<'b>(&self) -> OperatorsReader<'b>
-    where
-        'a: 'b,
-    {
-        OperatorsReader::new(self.data, self.offset)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/instance_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/instance_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/instance_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/instance_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-use crate::{
-    BinaryReader, BinaryReaderError, ExternalKind, Range, Result, SectionIteratorLimited,
-    SectionReader, SectionWithLimitedItems,
-};
-
-#[derive(Clone)]
-pub struct InstanceSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> InstanceSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<InstanceSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(InstanceSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn read(&mut self) -> Result<Instance<'a>> {
-        let instance = Instance::new(
-            &self.reader.buffer[self.reader.position..],
-            self.original_position(),
-        )?;
-        self.reader.skip_bytes(1)?;
-        self.reader.skip_var_32()?;
-        let count = self.reader.read_var_u32()?;
-        for _ in 0..count {
-            self.reader.skip_bytes(1)?;
-            self.reader.skip_var_32()?;
-        }
-        Ok(instance)
-    }
-}
-
-impl<'a> SectionReader for InstanceSectionReader<'a> {
-    type Item = Instance<'a>;
-
-    fn read(&mut self) -> Result<Self::Item> {
-        InstanceSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        InstanceSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for InstanceSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        InstanceSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for InstanceSectionReader<'a> {
-    type Item = Result<Instance<'a>>;
-    type IntoIter = SectionIteratorLimited<InstanceSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
-
-pub struct Instance<'a> {
-    reader: BinaryReader<'a>,
-    module: u32,
-}
-
-impl<'a> Instance<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<Instance<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        if reader.read_u8()? != 0 {
-            return Err(BinaryReaderError::new(
-                "instantiate instruction not found",
-                offset,
-            ));
-        }
-        let module = reader.read_var_u32()?;
-        Ok(Instance { module, reader })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn module(&self) -> u32 {
-        self.module
-    }
-
-    pub fn args(&self) -> Result<InstanceArgsReader<'a>> {
-        let mut reader = self.reader.clone();
-        let count = reader.read_var_u32()?;
-        Ok(InstanceArgsReader {
-            count,
-            remaining: count,
-            reader,
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct InstanceArgsReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-    remaining: u32,
-}
-
-impl<'a> InstanceArgsReader<'a> {
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn read(&mut self) -> Result<(ExternalKind, u32)> {
-        let kind = self.reader.read_external_kind()?;
-        let index = self.reader.read_var_u32()?;
-        self.remaining -= 1;
-        Ok((kind, index))
-    }
-}
-
-impl<'a> SectionReader for InstanceArgsReader<'a> {
-    type Item = (ExternalKind, u32);
-
-    fn read(&mut self) -> Result<Self::Item> {
-        InstanceArgsReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.remaining == 0
-    }
-    fn original_position(&self) -> usize {
-        InstanceArgsReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for InstanceArgsReader<'a> {
-    fn get_count(&self) -> u32 {
-        self.count
-    }
-}
-
-impl<'a> IntoIterator for InstanceArgsReader<'a> {
-    type Item = Result<(ExternalKind, u32)>;
-    type IntoIter = SectionIteratorLimited<InstanceArgsReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/linking_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/linking_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/linking_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/linking_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, LinkingType, Range, Result, SectionIteratorLimited, SectionReader,
-    SectionWithLimitedItems,
-};
-
-pub struct LinkingSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> LinkingSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<LinkingSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(LinkingSectionReader { reader, count })
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn read<'b>(&mut self) -> Result<LinkingType>
-    where
-        'a: 'b,
-    {
-        Ok(self.reader.read_linking_type()?)
-    }
-}
-
-impl<'a> SectionReader for LinkingSectionReader<'a> {
-    type Item = LinkingType;
-    fn read(&mut self) -> Result<Self::Item> {
-        LinkingSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        LinkingSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for LinkingSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        LinkingSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for LinkingSectionReader<'a> {
-    type Item = Result<LinkingType>;
-    type IntoIter = SectionIteratorLimited<LinkingSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/memory_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/memory_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/memory_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/memory_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, MemoryType, Range, Result, SectionIteratorLimited, SectionReader,
-    SectionWithLimitedItems,
-};
-
-#[derive(Clone)]
-pub struct MemorySectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> MemorySectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<MemorySectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(MemorySectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    /// Reads content of the memory section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::MemorySectionReader;
-    /// # let data: &[u8] = &[0x01, 0x00, 0x02];
-    /// let mut memory_reader = MemorySectionReader::new(data, 0).unwrap();
-    /// for _ in 0..memory_reader.get_count() {
-    ///     let memory = memory_reader.read().expect("memory");
-    ///     println!("Memory: {:?}", memory);
-    /// }
-    /// ```
-    pub fn read(&mut self) -> Result<MemoryType> {
-        self.reader.read_memory_type()
-    }
-}
-
-impl<'a> SectionReader for MemorySectionReader<'a> {
-    type Item = MemoryType;
-    fn read(&mut self) -> Result<Self::Item> {
-        MemorySectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        MemorySectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for MemorySectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        MemorySectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for MemorySectionReader<'a> {
-    type Item = Result<MemoryType>;
-    type IntoIter = SectionIteratorLimited<MemorySectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, BinaryReaderError, ExternalKind, GlobalType, LinkingType, MemoryType, NameType,
-    Naming, Operator, Range, RelocType, Result, SectionCode, TableType, Type,
-};
-
-pub use self::alias_section::*;
-pub use self::code_section::*;
-pub use self::data_section::*;
-pub use self::element_section::*;
-pub use self::export_section::*;
-pub use self::function_section::*;
-pub use self::global_section::*;
-pub use self::import_section::*;
-pub use self::init_expr::*;
-pub use self::instance_section::*;
-pub use self::linking_section::*;
-pub use self::memory_section::*;
-pub use self::module_code_section::*;
-pub use self::module_section::*;
-pub use self::name_section::*;
-pub use self::operators::*;
-pub use self::producers_section::*;
-pub use self::reloc_section::*;
-pub use self::section_reader::*;
-pub use self::table_section::*;
-pub use self::type_section::*;
-
-mod alias_section;
-mod code_section;
-mod data_section;
-mod element_section;
-mod export_section;
-mod function_section;
-mod global_section;
-mod import_section;
-mod init_expr;
-mod instance_section;
-mod linking_section;
-mod memory_section;
-mod module_code_section;
-mod module_section;
-mod name_section;
-mod operators;
-mod producers_section;
-mod reloc_section;
-mod section_reader;
-mod table_section;
-mod type_section;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/module_code_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/module_code_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/module_code_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/module_code_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-use crate::{
-    BinaryReader, BinaryReaderError, Range, Result, SectionIteratorLimited, SectionReader,
-    SectionWithLimitedItems,
-};
-
-pub struct ModuleCodeSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-#[derive(Debug)]
-pub struct ModuleCode<'a> {
-    reader: BinaryReader<'a>,
-}
-
-impl<'a> ModuleCodeSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<ModuleCodeSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(ModuleCodeSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    fn verify_module_end(&self, end: usize) -> Result<()> {
-        if self.reader.buffer.len() < end {
-            return Err(BinaryReaderError::new(
-                "module body extends past end of the module code section",
-                self.reader.original_offset + self.reader.buffer.len(),
-            ));
-        }
-        Ok(())
-    }
-
-    pub fn read(&mut self) -> Result<ModuleCode<'a>> {
-        let size = self.reader.read_var_u32()? as usize;
-        let module_start = self.reader.position;
-        let module_end = module_start + size;
-        self.verify_module_end(module_end)?;
-        self.reader.skip_to(module_end);
-        Ok(ModuleCode {
-            reader: BinaryReader::new_with_offset(
-                &self.reader.buffer[module_start..module_end],
-                self.reader.original_offset + module_start,
-            ),
-        })
-    }
-}
-
-impl<'a> SectionReader for ModuleCodeSectionReader<'a> {
-    type Item = ModuleCode<'a>;
-
-    fn read(&mut self) -> Result<Self::Item> {
-        ModuleCodeSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        ModuleCodeSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for ModuleCodeSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        ModuleCodeSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for ModuleCodeSectionReader<'a> {
-    type Item = Result<ModuleCode<'a>>;
-    type IntoIter = SectionIteratorLimited<ModuleCodeSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
-
-impl<'a> ModuleCode<'a> {
-    pub fn raw_bytes(&self) -> (usize, &[u8]) {
-        (self.reader.original_position(), self.reader.buffer)
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/module_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/module_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/module_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/module_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-use super::{
-    BinaryReader, Range, Result, SectionIteratorLimited, SectionReader, SectionWithLimitedItems,
-};
-
-#[derive(Clone)]
-pub struct ModuleSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> ModuleSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<ModuleSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(ModuleSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn read(&mut self) -> Result<u32> {
-        self.reader.read_var_u32()
-    }
-}
-
-impl<'a> SectionReader for ModuleSectionReader<'a> {
-    type Item = u32;
-
-    fn read(&mut self) -> Result<Self::Item> {
-        ModuleSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        ModuleSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for ModuleSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        ModuleSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for ModuleSectionReader<'a> {
-    type Item = Result<u32>;
-    type IntoIter = SectionIteratorLimited<ModuleSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/name_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/name_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/name_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/name_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,253 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, BinaryReaderError, NameType, Naming, Range, Result, SectionIterator,
-    SectionReader,
-};
-
-#[derive(Debug, Copy, Clone)]
-pub struct ModuleName<'a> {
-    data: &'a [u8],
-    offset: usize,
-}
-
-impl<'a> ModuleName<'a> {
-    pub fn get_name<'b>(&self) -> Result<&'b str>
-    where
-        'a: 'b,
-    {
-        let mut reader = BinaryReader::new_with_offset(self.data, self.offset);
-        reader.read_string()
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.offset
-    }
-}
-
-pub struct NamingReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> NamingReader<'a> {
-    fn new(data: &'a [u8], offset: usize) -> Result<NamingReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(NamingReader { reader, count })
-    }
-
-    fn skip(reader: &mut BinaryReader) -> Result<()> {
-        let count = reader.read_var_u32()?;
-        for _ in 0..count {
-            reader.skip_var_32()?;
-            reader.skip_string()?;
-        }
-        Ok(())
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn read<'b>(&mut self) -> Result<Naming<'b>>
-    where
-        'a: 'b,
-    {
-        let index = self.reader.read_var_u32()?;
-        let name = self.reader.read_string()?;
-        Ok(Naming { index, name })
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct FunctionName<'a> {
-    data: &'a [u8],
-    offset: usize,
-}
-
-impl<'a> FunctionName<'a> {
-    pub fn get_map<'b>(&self) -> Result<NamingReader<'b>>
-    where
-        'a: 'b,
-    {
-        NamingReader::new(self.data, self.offset)
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.offset
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct FunctionLocalName<'a> {
-    pub func_index: u32,
-    data: &'a [u8],
-    offset: usize,
-}
-
-impl<'a> FunctionLocalName<'a> {
-    pub fn get_map<'b>(&self) -> Result<NamingReader<'b>>
-    where
-        'a: 'b,
-    {
-        NamingReader::new(self.data, self.offset)
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.offset
-    }
-}
-
-pub struct FunctionLocalReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> FunctionLocalReader<'a> {
-    fn new(data: &'a [u8], offset: usize) -> Result<FunctionLocalReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(FunctionLocalReader { reader, count })
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn read<'b>(&mut self) -> Result<FunctionLocalName<'b>>
-    where
-        'a: 'b,
-    {
-        let func_index = self.reader.read_var_u32()?;
-        let start = self.reader.position;
-        NamingReader::skip(&mut self.reader)?;
-        let end = self.reader.position;
-        Ok(FunctionLocalName {
-            func_index,
-            data: &self.reader.buffer[start..end],
-            offset: self.reader.original_offset + start,
-        })
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct LocalName<'a> {
-    data: &'a [u8],
-    offset: usize,
-}
-
-impl<'a> LocalName<'a> {
-    pub fn get_function_local_reader<'b>(&self) -> Result<FunctionLocalReader<'b>>
-    where
-        'a: 'b,
-    {
-        FunctionLocalReader::new(self.data, self.offset)
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.offset
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum Name<'a> {
-    Module(ModuleName<'a>),
-    Function(FunctionName<'a>),
-    Local(LocalName<'a>),
-}
-
-pub struct NameSectionReader<'a> {
-    reader: BinaryReader<'a>,
-}
-
-impl<'a> NameSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<NameSectionReader<'a>> {
-        Ok(NameSectionReader {
-            reader: BinaryReader::new_with_offset(data, offset),
-        })
-    }
-
-    fn verify_section_end(&self, end: usize) -> Result<()> {
-        if self.reader.buffer.len() < end {
-            return Err(BinaryReaderError::new(
-                "Name entry extends past end of the code section",
-                self.reader.original_offset + self.reader.buffer.len(),
-            ));
-        }
-        Ok(())
-    }
-
-    pub fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn read<'b>(&mut self) -> Result<Name<'b>>
-    where
-        'a: 'b,
-    {
-        let ty = self.reader.read_name_type()?;
-        let payload_len = self.reader.read_var_u32()? as usize;
-        let payload_start = self.reader.position;
-        let payload_end = payload_start + payload_len;
-        self.verify_section_end(payload_end)?;
-        let offset = self.reader.original_offset + payload_start;
-        let data = &self.reader.buffer[payload_start..payload_end];
-        self.reader.skip_to(payload_end);
-        Ok(match ty {
-            NameType::Module => Name::Module(ModuleName { data, offset }),
-            NameType::Function => Name::Function(FunctionName { data, offset }),
-            NameType::Local => Name::Local(LocalName { data, offset }),
-        })
-    }
-}
-
-impl<'a> SectionReader for NameSectionReader<'a> {
-    type Item = Name<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        NameSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        NameSectionReader::eof(self)
-    }
-    fn original_position(&self) -> usize {
-        NameSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> IntoIterator for NameSectionReader<'a> {
-    type Item = Result<Name<'a>>;
-    type IntoIter = SectionIterator<NameSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIterator::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/operators.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/operators.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/operators.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/operators.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{BinaryReader, BinaryReaderError, Operator, Result};
-
-#[derive(Clone)]
-pub struct OperatorsReader<'a> {
-    pub(crate) reader: BinaryReader<'a>,
-}
-
-impl<'a> OperatorsReader<'a> {
-    pub(crate) fn new<'b>(data: &'a [u8], offset: usize) -> OperatorsReader<'b>
-    where
-        'a: 'b,
-    {
-        OperatorsReader {
-            reader: BinaryReader::new_with_offset(data, offset),
-        }
-    }
-
-    pub fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn ensure_end(&self) -> Result<()> {
-        if self.eof() {
-            return Ok(());
-        }
-        Err(BinaryReaderError::new(
-            "Unexpected data at the end of operators",
-            self.reader.original_position(),
-        ))
-    }
-
-    pub fn read<'b>(&mut self) -> Result<Operator<'b>>
-    where
-        'a: 'b,
-    {
-        self.reader.read_operator()
-    }
-
-    pub fn into_iter_with_offsets<'b>(self) -> OperatorsIteratorWithOffsets<'b>
-    where
-        'a: 'b,
-    {
-        OperatorsIteratorWithOffsets {
-            reader: self,
-            err: false,
-        }
-    }
-
-    pub fn read_with_offset<'b>(&mut self) -> Result<(Operator<'b>, usize)>
-    where
-        'a: 'b,
-    {
-        let pos = self.reader.original_position();
-        Ok((self.read()?, pos))
-    }
-}
-
-impl<'a> IntoIterator for OperatorsReader<'a> {
-    type Item = Result<Operator<'a>>;
-    type IntoIter = OperatorsIterator<'a>;
-
-    /// Reads content of the code section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::{Operator, CodeSectionReader, Result};
-    /// # let data: &[u8] = &[
-    /// #     0x01, 0x03, 0x00, 0x01, 0x0b];
-    /// let mut code_reader = CodeSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..code_reader.get_count() {
-    ///     let body = code_reader.read().expect("function body");
-    ///     let mut op_reader = body.get_operators_reader().expect("op reader");
-    ///     let ops = op_reader.into_iter().collect::<Result<Vec<Operator>>>().expect("ops");
-    ///     assert!(
-    ///         if let [Operator::Nop, Operator::End] = ops.as_slice() { true } else { false },
-    ///         "found {:?}",
-    ///         ops
-    ///     );
-    /// }
-    /// ```
-    fn into_iter(self) -> Self::IntoIter {
-        OperatorsIterator {
-            reader: self,
-            err: false,
-        }
-    }
-}
-
-pub struct OperatorsIterator<'a> {
-    reader: OperatorsReader<'a>,
-    err: bool,
-}
-
-impl<'a> Iterator for OperatorsIterator<'a> {
-    type Item = Result<Operator<'a>>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.err || self.reader.eof() {
-            return None;
-        }
-        let result = self.reader.read();
-        self.err = result.is_err();
-        Some(result)
-    }
-}
-
-pub struct OperatorsIteratorWithOffsets<'a> {
-    reader: OperatorsReader<'a>,
-    err: bool,
-}
-
-impl<'a> Iterator for OperatorsIteratorWithOffsets<'a> {
-    type Item = Result<(Operator<'a>, usize)>;
-
-    /// Reads content of the code section with offsets.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::{Operator, CodeSectionReader, Result};
-    /// # let data: &[u8] = &[
-    /// #     0x01, 0x03, 0x00, /* offset = 23 */ 0x01, 0x0b];
-    /// let mut code_reader = CodeSectionReader::new(data, 20).unwrap();
-    /// for _ in 0..code_reader.get_count() {
-    ///     let body = code_reader.read().expect("function body");
-    ///     let mut op_reader = body.get_operators_reader().expect("op reader");
-    ///     let ops = op_reader.into_iter_with_offsets().collect::<Result<Vec<(Operator, usize)>>>().expect("ops");
-    ///     assert!(
-    ///         if let [(Operator::Nop, 23), (Operator::End, 24)] = ops.as_slice() { true } else { false },
-    ///         "found {:?}",
-    ///         ops
-    ///     );
-    /// }
-    /// ```
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.err || self.reader.eof() {
-            return None;
-        }
-        let result = self.reader.read_with_offset();
-        self.err = result.is_err();
-        Some(result)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/producers_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/producers_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/producers_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/producers_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-/* Copyright 2019 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, Range, Result, SectionIteratorLimited, SectionReader, SectionWithLimitedItems,
-};
-
-#[derive(Debug, Copy, Clone)]
-pub struct ProducersFieldValue<'a> {
-    pub name: &'a str,
-    pub version: &'a str,
-}
-
-pub struct ProducersFieldValuesReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> ProducersFieldValuesReader<'a> {
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    fn skip(reader: &mut BinaryReader, values_count: u32) -> Result<()> {
-        for _ in 0..values_count {
-            reader.skip_string()?;
-            reader.skip_string()?;
-        }
-        Ok(())
-    }
-
-    pub fn read<'b>(&mut self) -> Result<ProducersFieldValue<'b>>
-    where
-        'a: 'b,
-    {
-        let name = self.reader.read_string()?;
-        let version = self.reader.read_string()?;
-        Ok(ProducersFieldValue { name, version })
-    }
-}
-
-impl<'a> IntoIterator for ProducersFieldValuesReader<'a> {
-    type Item = Result<ProducersFieldValue<'a>>;
-    type IntoIter = ProducersFieldValuesIterator<'a>;
-    fn into_iter(self) -> Self::IntoIter {
-        let count = self.count;
-        ProducersFieldValuesIterator {
-            reader: self,
-            left: count,
-            err: false,
-        }
-    }
-}
-
-pub struct ProducersFieldValuesIterator<'a> {
-    reader: ProducersFieldValuesReader<'a>,
-    left: u32,
-    err: bool,
-}
-
-impl<'a> Iterator for ProducersFieldValuesIterator<'a> {
-    type Item = Result<ProducersFieldValue<'a>>;
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.err || self.left == 0 {
-            return None;
-        }
-        let result = self.reader.read();
-        self.err = result.is_err();
-        self.left -= 1;
-        Some(result)
-    }
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let count = self.reader.get_count() as usize;
-        (count, Some(count))
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct ProducersField<'a> {
-    pub name: &'a str,
-    values_count: u32,
-    values_data: &'a [u8],
-    values_offset: usize,
-}
-
-impl<'a> ProducersField<'a> {
-    pub fn get_producer_field_values_reader<'b>(&self) -> Result<ProducersFieldValuesReader<'b>>
-    where
-        'a: 'b,
-    {
-        Ok(ProducersFieldValuesReader {
-            reader: BinaryReader::new_with_offset(self.values_data, self.values_offset),
-            count: self.values_count,
-        })
-    }
-}
-
-pub struct ProducersSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> ProducersSectionReader<'a> {
-    /// Creates reader for the producers section.
-    ///
-    /// # Examples
-    /// ```
-    /// # let data: &[u8] = &[0x01, 0x08, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65,
-    /// #     0x02, 0x03, 0x77, 0x61, 0x74, 0x01, 0x31, 0x01, 0x43, 0x03, 0x39, 0x2e, 0x30];
-    /// use wasmparser::{ProducersSectionReader, ProducersFieldValue, Result};
-    /// let mut reader = ProducersSectionReader::new(data, 0).expect("producers reader");
-    /// let field = reader.read().expect("producers field");
-    /// assert!(field.name == "language");
-    /// let mut values_reader = field.get_producer_field_values_reader().expect("values reader");
-    /// let value = values_reader.into_iter().collect::<Result<Vec<ProducersFieldValue>>>().expect("values");
-    /// assert!(value.len() == 2);
-    /// assert!(value[0].name == "wat" && value[0].version == "1");
-    /// assert!(value[1].name == "C" && value[1].version == "9.0");
-    /// ```
-    pub fn new(data: &'a [u8], offset: usize) -> Result<ProducersSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(ProducersSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn read<'b>(&mut self) -> Result<ProducersField<'b>>
-    where
-        'a: 'b,
-    {
-        let name = self.reader.read_string()?;
-        let values_count = self.reader.read_var_u32()?;
-        let values_start = self.reader.position;
-        ProducersFieldValuesReader::skip(&mut self.reader, values_count)?;
-        let values_end = self.reader.position;
-        Ok(ProducersField {
-            name,
-            values_count,
-            values_data: &self.reader.buffer[values_start..values_end],
-            values_offset: self.reader.original_offset + values_start,
-        })
-    }
-}
-
-impl<'a> SectionReader for ProducersSectionReader<'a> {
-    type Item = ProducersField<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        ProducersSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        ProducersSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for ProducersSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        ProducersSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for ProducersSectionReader<'a> {
-    type Item = Result<ProducersField<'a>>;
-    type IntoIter = SectionIteratorLimited<ProducersSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/reloc_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/reloc_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/reloc_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/reloc_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, Range, RelocType, Result, SectionCode, SectionIteratorLimited, SectionReader,
-    SectionWithLimitedItems,
-};
-
-#[derive(Debug, Copy, Clone)]
-pub struct Reloc {
-    pub ty: RelocType,
-    pub offset: u32,
-    pub index: u32,
-    pub addend: Option<u32>,
-}
-
-pub struct RelocSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    section_code: SectionCode<'a>,
-    count: u32,
-}
-
-impl<'a> RelocSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<RelocSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-
-        let section_id_position = reader.position;
-        let section_id = reader.read_var_u7()?;
-        let section_code = reader.read_section_code(section_id, section_id_position)?;
-
-        let count = reader.read_var_u32()?;
-        Ok(RelocSectionReader {
-            reader,
-            section_code,
-            count,
-        })
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    pub fn get_section_code<'b>(&self) -> SectionCode<'b>
-    where
-        'a: 'b,
-    {
-        self.section_code
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn read(&mut self) -> Result<Reloc> {
-        let ty = self.reader.read_reloc_type()?;
-        let offset = self.reader.read_var_u32()?;
-        let index = self.reader.read_var_u32()?;
-        let addend = match ty {
-            RelocType::FunctionIndexLEB
-            | RelocType::TableIndexSLEB
-            | RelocType::TableIndexI32
-            | RelocType::TypeIndexLEB
-            | RelocType::GlobalIndexLEB => None,
-            RelocType::GlobalAddrLEB | RelocType::GlobalAddrSLEB | RelocType::GlobalAddrI32 => {
-                Some(self.reader.read_var_u32()?)
-            }
-        };
-        Ok(Reloc {
-            ty,
-            offset,
-            index,
-            addend,
-        })
-    }
-}
-
-impl<'a> SectionReader for RelocSectionReader<'a> {
-    type Item = Reloc;
-    fn read(&mut self) -> Result<Self::Item> {
-        RelocSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        RelocSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for RelocSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        RelocSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for RelocSectionReader<'a> {
-    type Item = Result<Reloc>;
-    type IntoIter = SectionIteratorLimited<RelocSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/section_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/section_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/section_reader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/section_reader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{BinaryReaderError, Range, Result};
-
-pub trait SectionReader {
-    type Item;
-    fn read(&mut self) -> Result<Self::Item>;
-    fn eof(&self) -> bool;
-    fn original_position(&self) -> usize;
-    fn range(&self) -> Range;
-    fn ensure_end(&self) -> Result<()> {
-        if self.eof() {
-            return Ok(());
-        }
-        Err(BinaryReaderError::new(
-            "Unexpected data at the end of the section",
-            self.original_position(),
-        ))
-    }
-}
-
-pub trait SectionWithLimitedItems {
-    fn get_count(&self) -> u32;
-}
-
-pub struct SectionIterator<R>
-where
-    R: SectionReader,
-{
-    reader: R,
-    err: bool,
-}
-
-impl<R> SectionIterator<R>
-where
-    R: SectionReader,
-{
-    pub fn new(reader: R) -> SectionIterator<R> {
-        SectionIterator { reader, err: false }
-    }
-}
-
-impl<R> Iterator for SectionIterator<R>
-where
-    R: SectionReader,
-{
-    type Item = Result<R::Item>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.err || self.reader.eof() {
-            return None;
-        }
-        let result = self.reader.read();
-        self.err = result.is_err();
-        Some(result)
-    }
-}
-
-pub struct SectionIteratorLimited<R>
-where
-    R: SectionReader + SectionWithLimitedItems,
-{
-    reader: R,
-    left: u32,
-    end: bool,
-}
-
-impl<R> SectionIteratorLimited<R>
-where
-    R: SectionReader + SectionWithLimitedItems,
-{
-    pub fn new(reader: R) -> SectionIteratorLimited<R> {
-        let left = reader.get_count();
-        SectionIteratorLimited {
-            reader,
-            left,
-            end: false,
-        }
-    }
-}
-
-impl<R> Iterator for SectionIteratorLimited<R>
-where
-    R: SectionReader + SectionWithLimitedItems,
-{
-    type Item = Result<R::Item>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.end {
-            return None;
-        }
-        if self.left == 0 {
-            return match self.reader.ensure_end() {
-                Ok(()) => None,
-                Err(err) => {
-                    self.end = true;
-                    Some(Err(err))
-                }
-            };
-        }
-        let result = self.reader.read();
-        self.end = result.is_err();
-        self.left -= 1;
-        Some(result)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let count = self.reader.get_count() as usize;
-        (count, Some(count))
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/table_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/table_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/table_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/table_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use super::{
-    BinaryReader, Range, Result, SectionIteratorLimited, SectionReader, SectionWithLimitedItems,
-    TableType,
-};
-
-#[derive(Clone)]
-pub struct TableSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> TableSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<TableSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(TableSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    /// Reads content of the table section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::TableSectionReader;
-    ///
-    /// # let data: &[u8] = &[0x01, 0x70, 0x01, 0x01, 0x01];
-    /// let mut table_reader = TableSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..table_reader.get_count() {
-    ///     let table = table_reader.read().expect("table");
-    ///     println!("Table: {:?}", table);
-    /// }
-    /// ```
-    pub fn read(&mut self) -> Result<TableType> {
-        self.reader.read_table_type()
-    }
-}
-
-impl<'a> SectionReader for TableSectionReader<'a> {
-    type Item = TableType;
-    fn read(&mut self) -> Result<Self::Item> {
-        TableSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        TableSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for TableSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        TableSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for TableSectionReader<'a> {
-    type Item = Result<TableType>;
-    type IntoIter = SectionIteratorLimited<TableSectionReader<'a>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/type_section.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/type_section.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/type_section.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/readers/type_section.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use crate::{
-    BinaryReader, BinaryReaderError, Range, Result, SectionIteratorLimited, SectionReader,
-    SectionWithLimitedItems, TypeDef,
-};
-
-#[derive(Clone)]
-pub struct TypeSectionReader<'a> {
-    reader: BinaryReader<'a>,
-    count: u32,
-}
-
-impl<'a> TypeSectionReader<'a> {
-    pub fn new(data: &'a [u8], offset: usize) -> Result<TypeSectionReader<'a>> {
-        let mut reader = BinaryReader::new_with_offset(data, offset);
-        let count = reader.read_var_u32()?;
-        Ok(TypeSectionReader { reader, count })
-    }
-
-    pub fn original_position(&self) -> usize {
-        self.reader.original_position()
-    }
-
-    pub fn get_count(&self) -> u32 {
-        self.count
-    }
-
-    /// Reads content of the type section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::TypeSectionReader;
-    /// # let data: &[u8] = &[0x01, 0x60, 0x00, 0x00];
-    /// let mut type_reader = TypeSectionReader::new(data, 0).unwrap();
-    /// for _ in 0..type_reader.get_count() {
-    ///     let ty = type_reader.read().expect("type");
-    ///     println!("Type {:?}", ty);
-    /// }
-    /// ```
-    pub fn read(&mut self) -> Result<TypeDef<'a>> {
-        Ok(match self.reader.read_u8()? {
-            0x60 => TypeDef::Func(self.reader.read_func_type()?),
-            0x61 => TypeDef::Module(self.reader.read_module_type()?),
-            0x62 => TypeDef::Instance(self.reader.read_instance_type()?),
-            _ => {
-                return Err(BinaryReaderError::new(
-                    "invalid leading byte in type definition",
-                    self.original_position() - 1,
-                ))
-            }
-        })
-    }
-}
-
-impl<'a> SectionReader for TypeSectionReader<'a> {
-    type Item = TypeDef<'a>;
-    fn read(&mut self) -> Result<Self::Item> {
-        TypeSectionReader::read(self)
-    }
-    fn eof(&self) -> bool {
-        self.reader.eof()
-    }
-    fn original_position(&self) -> usize {
-        TypeSectionReader::original_position(self)
-    }
-    fn range(&self) -> Range {
-        self.reader.range()
-    }
-}
-
-impl<'a> SectionWithLimitedItems for TypeSectionReader<'a> {
-    fn get_count(&self) -> u32 {
-        TypeSectionReader::get_count(self)
-    }
-}
-
-impl<'a> IntoIterator for TypeSectionReader<'a> {
-    type Item = Result<TypeDef<'a>>;
-    type IntoIter = SectionIteratorLimited<TypeSectionReader<'a>>;
-
-    /// Implements iterator over the type section.
-    ///
-    /// # Examples
-    /// ```
-    /// use wasmparser::TypeSectionReader;
-    /// # let data: &[u8] = &[0x01, 0x60, 0x00, 0x00];
-    /// let mut type_reader = TypeSectionReader::new(data, 0).unwrap();
-    /// for ty in type_reader {
-    ///     println!("Type {:?}", ty);
-    /// }
-    /// ```
-    fn into_iter(self) -> Self::IntoIter {
-        SectionIteratorLimited::new(self)
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/validator/func.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/validator/func.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/validator/func.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/validator/func.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-use super::ModuleState;
-use crate::operators_validator::{FunctionEnd, OperatorValidator};
-use crate::{BinaryReaderError, Result, Type};
-use crate::{Operator, WasmModuleResources, WasmTypeDef};
-use std::sync::Arc;
-
-/// Validation context for a WebAssembly function.
-///
-/// This structure is created by
-/// [`Validator::code_section_entry`](crate::Validator::code_section_entry)
-/// and is created per-function in a WebAssembly module. This structure is
-/// suitable for sending to other threads while the original
-/// [`Validator`](crate::Validator) continues processing other functions.
-pub struct FuncValidator {
-    pub(super) validator: OperatorValidator,
-    pub(super) state: Arc<ModuleState>,
-    pub(super) offset: usize,
-    pub(super) eof_found: bool,
-}
-
-impl FuncValidator {
-    /// Validates the next operator in a function.
-    ///
-    /// This functions is expected to be called once-per-operator in a
-    /// WebAssembly function. Each operator's offset in the original binary and
-    /// the operator itself are passed to this function.
-    pub fn op(&mut self, offset: usize, operator: &Operator<'_>) -> Result<()> {
-        self.offset = offset;
-        let end = self
-            .validator
-            .process_operator(operator, &*self.state)
-            .map_err(|e| e.set_offset(offset))?;
-        match end {
-            FunctionEnd::Yes => self.eof_found = true,
-            FunctionEnd::No => {}
-        }
-        Ok(())
-    }
-
-    /// Function that must be called after the last opcode has been processed.
-    ///
-    /// This will validate that the function was properly terminated with the
-    /// `end` opcode. If this function is not called then the function will not
-    /// be properly validated.
-    pub fn finish(&mut self) -> Result<()> {
-        if !self.eof_found {
-            return Err(BinaryReaderError::new(
-                "end of function not found",
-                self.offset,
-            ));
-        }
-        Ok(())
-    }
-}
-
-impl WasmModuleResources for ModuleState {
-    type TypeDef = super::TypeDef;
-    type TableType = crate::TableType;
-    type MemoryType = crate::MemoryType;
-    type GlobalType = crate::GlobalType;
-
-    fn type_at(&self, at: u32) -> Option<&Self::TypeDef> {
-        self.get_type(self.def(at)).map(|t| t.item)
-    }
-
-    fn table_at(&self, at: u32) -> Option<&Self::TableType> {
-        self.get_table(self.def(at)).map(|t| &t.item)
-    }
-
-    fn memory_at(&self, at: u32) -> Option<&Self::MemoryType> {
-        self.get_memory(self.def(at))
-    }
-
-    fn global_at(&self, at: u32) -> Option<&Self::GlobalType> {
-        self.get_global(self.def(at)).map(|t| &t.item)
-    }
-
-    fn func_type_at(&self, at: u32) -> Option<&super::FuncType> {
-        let ty = self.get_func_type_index(self.def(at))?;
-        match self.get_type(ty)?.item {
-            super::TypeDef::Func(f) => Some(f),
-            _ => None,
-        }
-    }
-
-    fn element_type_at(&self, at: u32) -> Option<Type> {
-        self.element_types.get(at as usize).cloned()
-    }
-
-    fn element_count(&self) -> u32 {
-        self.element_types.len() as u32
-    }
-
-    fn data_count(&self) -> u32 {
-        self.data_count.unwrap_or(0)
-    }
-
-    fn is_function_referenced(&self, idx: u32) -> bool {
-        self.function_references.contains(&idx)
-    }
-}
-
-impl WasmTypeDef for super::TypeDef {
-    type FuncType = crate::FuncType;
-
-    fn as_func(&self) -> Option<&Self::FuncType> {
-        match self {
-            super::TypeDef::Func(f) => Some(f),
-            _ => None,
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/validator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/validator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wasmparser-0.59.0/src/validator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wasmparser-0.59.0/src/validator.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1859 +0,0 @@
-/* Copyright 2018 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use crate::limits::*;
-use crate::operators_validator::{
-    FunctionEnd, OperatorValidator, OperatorValidatorConfig, DEFAULT_OPERATOR_VALIDATOR_CONFIG,
-};
-use crate::WasmModuleResources;
-use crate::{Alias, AliasedInstance, ExternalKind, Import, ImportSectionEntryType};
-use crate::{BinaryReaderError, GlobalType, MemoryType, Range, Result, TableType, Type};
-use crate::{DataKind, ElementItem, ElementKind, InitExpr, Instance, Operator};
-use crate::{Export, ExportType, FunctionBody, OperatorsReader, Parser, Payload};
-use crate::{FuncType, ResizableLimits, SectionReader, SectionWithLimitedItems};
-use std::collections::{HashMap, HashSet};
-use std::mem;
-use std::sync::Arc;
-
-/// Test whether the given buffer contains a valid WebAssembly function.
-/// The resources parameter contains all needed data to validate the operators.
-pub fn validate_function_body(
-    bytes: &[u8],
-    offset: usize,
-    func_index: u32,
-    resources: impl WasmModuleResources,
-    operator_config: Option<OperatorValidatorConfig>,
-) -> Result<()> {
-    let operator_config = operator_config.unwrap_or(DEFAULT_OPERATOR_VALIDATOR_CONFIG);
-    let function_body = FunctionBody::new(offset, bytes);
-    let mut locals_reader = function_body.get_locals_reader()?;
-    let local_count = locals_reader.get_count() as usize;
-    if local_count > MAX_WASM_FUNCTION_LOCALS {
-        return Err(BinaryReaderError::new(
-            "locals exceed maximum",
-            locals_reader.original_position(),
-        ));
-    }
-    let mut locals: Vec<(u32, Type)> = Vec::with_capacity(local_count);
-    let mut locals_total: usize = 0;
-    for _ in 0..local_count {
-        let (count, ty) = locals_reader.read()?;
-        locals_total = locals_total.checked_add(count as usize).ok_or_else(|| {
-            BinaryReaderError::new("locals overflow", locals_reader.original_position())
-        })?;
-        if locals_total > MAX_WASM_FUNCTION_LOCALS {
-            return Err(BinaryReaderError::new(
-                "locals exceed maximum",
-                locals_reader.original_position(),
-            ));
-        }
-        locals.push((count, ty));
-    }
-    let operators_reader = function_body.get_operators_reader()?;
-    let func_type = resources
-        .func_type_at(func_index)
-        // Note: This was an out-of-bounds access before the change to return `Option`
-        // so I assumed it is considered a bug to access a non-existing function
-        // id here and went with panicking instead of returning a proper error.
-        .expect("the function index of the validated function itself is out of bounds");
-    let mut operator_validator = OperatorValidator::new(func_type, &locals, operator_config)
-        .map_err(|e| e.set_offset(offset))?;
-    let mut eof_found = false;
-    let mut last_op = 0;
-    for item in operators_reader.into_iter_with_offsets() {
-        let (ref op, offset) = item?;
-        match operator_validator
-            .process_operator(op, &resources)
-            .map_err(|e| e.set_offset(offset))?
-        {
-            FunctionEnd::Yes => {
-                eof_found = true;
-            }
-            FunctionEnd::No => {
-                last_op = offset;
-            }
-        }
-    }
-    if !eof_found {
-        return Err(BinaryReaderError::new("end of function not found", last_op));
-    }
-    Ok(())
-}
-
-/// Test whether the given buffer contains a valid WebAssembly module,
-/// analogous to [`WebAssembly.validate`][js] in the JS API.
-///
-/// This functions requires the wasm module is entirely resident in memory and
-/// is specified by `bytes`. Additionally this validates the given bytes with
-/// the default set of WebAssembly features implemented by `wasmparser`.
-///
-/// For more fine-tuned control over validation it's recommended to review the
-/// documentation of [`Validator`].
-///
-/// [js]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/validate
-pub fn validate(bytes: &[u8]) -> Result<()> {
-    Validator::new().validate_all(bytes)
-}
-
-#[test]
-fn test_validate() {
-    assert!(validate(&[0x0, 0x61, 0x73, 0x6d, 0x1, 0x0, 0x0, 0x0]).is_ok());
-    assert!(validate(&[0x0, 0x61, 0x73, 0x6d, 0x2, 0x0, 0x0, 0x0]).is_err());
-}
-
-mod func;
-pub use func::FuncValidator;
-
-/// Validator for a WebAssembly binary module.
-///
-/// This structure encapsulates state necessary to validate a WebAssembly
-/// binary. This implements validation as defined by the [core
-/// specification][core]. A `Validator` is designed, like
-/// [`Parser`], to accept incremental input over time.
-/// Additionally a `Validator` is also designed for parallel validation of
-/// functions as they are received.
-///
-/// It's expected that you'll be using a [`Parser`] in tandem with a
-/// `Validator`. As each [`Payload`](crate::Payload) is received from a
-/// [`Parser`] you'll pass it into a `Validator` to test the validity of the
-/// payload. Note that all payloads received from a [`Parser`] are expected to
-/// be passed to a [`Validator`]. For example if you receive
-/// [`Payload::TypeSection`](crate::Payload) you'll call
-/// [`Validator::type_section`] to validate this.
-///
-/// The design of [`Validator`] is intended that you'll interleave, in your own
-/// application's processing, calls to validation. Each variant, after it's
-/// received, will be validated and then your application would proceed as
-/// usual. At all times, however, you'll have access to the [`Validator`] and
-/// the validation context up to that point. This enables applications to check
-/// the types of functions and learn how many globals there are, for example.
-///
-/// [core]: https://webassembly.github.io/spec/core/valid/index.html
-#[derive(Default)]
-pub struct Validator {
-    /// Internal state that is incrementally built-up for the module being
-    /// validate. This houses type information for all wasm items, like
-    /// functions. Note that this starts out as a solely owned `Arc<T>` so we can
-    /// get mutable access, but after we get to the code section this is never
-    /// mutated to we can clone it cheaply and hand it to sub-validators.
-    state: arc::MaybeOwned<ModuleState>,
-
-    /// Enabled WebAssembly feature flags, dictating what's valid and what
-    /// isn't.
-    features: WasmFeatures,
-
-    /// Where we are, order-wise, in the wasm binary.
-    order: Order,
-
-    /// The current byte-level offset in the wasm binary. This is updated to
-    /// produce error messages in `create_error`.
-    offset: usize,
-
-    /// The number of data segments we ended up finding in this module, or 0 if
-    /// they either weren't present or none were found.
-    data_found: u32,
-
-    /// The number of functions we expect to be defined in the code section, or
-    /// basically the length of the function section if it was found. The next
-    /// index is where we are, in the function index space, for the next entry
-    /// in the code section (used to figure out what type is next for the
-    /// function being validated.
-    expected_code_bodies: Option<u32>,
-    code_section_index: usize,
-
-    /// Similar to code bodies above, but for module bodies instead.
-    expected_modules: Option<u32>,
-    module_code_section_index: usize,
-
-    /// If this validator is for a nested module then this keeps track of the
-    /// type of the module that we're matching against. The `expected_type` is
-    /// an entry in our parent's type index space, and the two positional
-    /// indices keep track of where we are in matching against imports/exports.
-    ///
-    /// Note that the exact algorithm for how it's determine that a submodule
-    /// matches its declare type is a bit up for debate. For now we go for 1:1
-    /// "everything must be equal" matching. This is the subject of
-    /// WebAssembly/module-linking#7, though.
-    expected_type: Option<Def<u32>>,
-    expected_import_pos: usize,
-    expected_export_pos: usize,
-}
-
-#[derive(Default)]
-struct ModuleState {
-    depth: usize,
-    types: Vec<ValidatedType>,
-    tables: Vec<Def<TableType>>,
-    memories: Vec<MemoryType>,
-    globals: Vec<Def<GlobalType>>,
-    element_types: Vec<Type>,
-    data_count: Option<u32>,
-    func_type_indices: Vec<Def<u32>>,
-    module_type_indices: Vec<Def<u32>>,
-    instance_type_indices: Vec<Def<InstanceDef>>,
-    function_references: HashSet<u32>,
-    parent: Option<Arc<ModuleState>>,
-}
-
-#[derive(Clone)]
-struct WasmFeatures {
-    reference_types: bool,
-    module_linking: bool,
-    simd: bool,
-    multi_value: bool,
-    threads: bool,
-    tail_call: bool,
-    bulk_memory: bool,
-    deterministic_only: bool,
-}
-
-impl Default for WasmFeatures {
-    fn default() -> WasmFeatures {
-        WasmFeatures {
-            // off-by-default features
-            reference_types: false,
-            module_linking: false,
-            simd: false,
-            threads: false,
-            tail_call: false,
-            bulk_memory: false,
-            deterministic_only: cfg!(feature = "deterministic"),
-
-            // on-by-default features
-            multi_value: true,
-        }
-    }
-}
-
-#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
-enum Order {
-    Initial,
-    AfterHeader,
-    Type,
-    Import,
-    ModuleLinkingHeader,
-    Function,
-    Table,
-    Memory,
-    Global,
-    Export,
-    Start,
-    Element,
-    DataCount,
-    ModuleCode,
-    Code,
-    Data,
-}
-
-impl Default for Order {
-    fn default() -> Order {
-        Order::Initial
-    }
-}
-
-enum InstanceDef {
-    Imported { type_idx: u32 },
-    Instantiated { module_idx: u32 },
-}
-
-enum ValidatedType {
-    Def(TypeDef),
-    Alias(Def<u32>),
-}
-
-enum TypeDef {
-    Func(FuncType),
-    Module(ModuleType),
-    Instance(InstanceType),
-}
-
-struct ModuleType {
-    imports: Vec<(String, Option<String>, ImportSectionEntryType)>,
-    exports: Vec<(String, ImportSectionEntryType)>,
-}
-
-struct InstanceType {
-    exports: Vec<(String, ImportSectionEntryType)>,
-}
-
-fn to_import(item: &(String, Option<String>, ImportSectionEntryType)) -> Import<'_> {
-    Import {
-        module: &item.0,
-        field: item.1.as_deref(),
-        ty: item.2,
-    }
-}
-
-fn to_export(item: &(String, ImportSectionEntryType)) -> ExportType<'_> {
-    ExportType {
-        name: &item.0,
-        ty: item.1,
-    }
-}
-
-/// Possible return values from [`Validator::payload`].
-pub enum ValidPayload<'a> {
-    /// The payload validated, no further action need be taken.
-    Ok,
-    /// The payload validated, but it started a nested module.
-    ///
-    /// This result indicates that the current validator needs to be saved until
-    /// later. The returned parser and validator should be used instead.
-    Push(Parser, Validator),
-    /// The payload validated, and the current validator is finished. The last
-    /// validator that was in use should be popped off the stack to resume.
-    Pop,
-    /// A function was found to be validate.
-    ///
-    /// The function validator will need to be run over the operators in
-    /// [`OperatorsReader`] to finish validation.
-    Func(FuncValidator, OperatorsReader<'a>),
-}
-
-impl Validator {
-    /// Creates a new [`Validator`] ready to validate a WebAssembly module.
-    ///
-    /// The new validator will receive payloads parsed from
-    /// [`Parser`], and expects the first payload received to be
-    /// the version header from the parser.
-    pub fn new() -> Validator {
-        Validator::default()
-    }
-
-    /// Configures whether the reference types proposal for WebAssembly is
-    /// enabled.
-    ///
-    /// The default for this option is `false`.
-    pub fn wasm_reference_types(&mut self, enabled: bool) -> &mut Validator {
-        self.features.reference_types = enabled;
-        self
-    }
-
-    /// Configures whether the module linking proposal for WebAssembly is
-    /// enabled.
-    ///
-    /// The default for this option is `false`.
-    pub fn wasm_module_linking(&mut self, enabled: bool) -> &mut Validator {
-        self.features.module_linking = enabled;
-        self
-    }
-
-    /// Configures whether the SIMD proposal for WebAssembly is
-    /// enabled.
-    ///
-    /// The default for this option is `false`.
-    pub fn wasm_simd(&mut self, enabled: bool) -> &mut Validator {
-        self.features.simd = enabled;
-        self
-    }
-
-    /// Configures whether the threads proposal for WebAssembly is
-    /// enabled.
-    ///
-    /// The default for this option is `false`.
-    pub fn wasm_threads(&mut self, enabled: bool) -> &mut Validator {
-        self.features.threads = enabled;
-        self
-    }
-
-    /// Configures whether the tail call proposal for WebAssembly is
-    /// enabled.
-    ///
-    /// The default for this option is `false`.
-    pub fn wasm_tail_call(&mut self, enabled: bool) -> &mut Validator {
-        self.features.tail_call = enabled;
-        self
-    }
-
-    /// Configures whether the multi-value proposal for WebAssembly is
-    /// enabled.
-    ///
-    /// The default for this option is `true`.
-    pub fn wasm_multi_value(&mut self, enabled: bool) -> &mut Validator {
-        self.features.multi_value = enabled;
-        self
-    }
-
-    /// Configures whether the bulk-memory proposal for WebAssembly is
-    /// enabled.
-    ///
-    /// The default for this option is `true`.
-    pub fn wasm_bulk_memory(&mut self, enabled: bool) -> &mut Validator {
-        self.features.bulk_memory = enabled;
-        self
-    }
-
-    /// Configures whether only deterministic instructions are allowed to validate.
-    ///
-    /// The default for this option is `true`.
-    pub fn deterministic_only(&mut self, enabled: bool) -> &mut Validator {
-        self.features.deterministic_only = enabled;
-        self
-    }
-
-    /// Validates an entire in-memory module with this validator.
-    ///
-    /// This function will internally create a [`Parser`] to parse the `bytes`
-    /// provided. The entire wasm module specified by `bytes` will be parsed and
-    /// validated. Parse and validation errors will be returned through
-    /// `Err(_)`, and otherwise a successful validation means `Ok(())` is
-    /// returned.
-    pub fn validate_all(self, bytes: &[u8]) -> Result<()> {
-        let mut functions_to_validate = Vec::new();
-        let mut stack = Vec::new();
-        let mut cur = self;
-        for payload in Parser::new(0).parse_all(bytes) {
-            match cur.payload(&payload?)? {
-                ValidPayload::Ok => {}
-                ValidPayload::Pop => cur = stack.pop().unwrap(),
-                ValidPayload::Push(_parser, validator) => {
-                    stack.push(cur);
-                    cur = validator
-                }
-                ValidPayload::Func(validator, ops) => functions_to_validate.push((validator, ops)),
-            }
-        }
-
-        for (mut validator, ops) in functions_to_validate {
-            for item in ops.into_iter_with_offsets() {
-                let (op, offset) = item?;
-                validator.op(offset, &op)?;
-            }
-            validator.finish()?;
-        }
-        Ok(())
-    }
-
-    /// Convenience function to validate a single [`Payload`].
-    ///
-    /// This function is intended to be used as a convenience. It will
-    /// internally perform any validation necessary to validate the [`Payload`]
-    /// provided. The convenience part is that you're likely already going to
-    /// be matching on [`Payload`] in your application, at which point it's more
-    /// appropriate to call the individual methods on [`Validator`] per-variant
-    /// in [`Payload`], such as [`Validator::type_section`].
-    ///
-    /// This function returns a [`ValidPayload`] variant on success, indicating
-    /// one of a few possible actions that need to be taken after a payload is
-    /// validated. For example function contents are not validated here, they're
-    /// returned through [`ValidPayload`] for validation by the caller.
-    pub fn payload<'a>(&mut self, payload: &Payload<'a>) -> Result<ValidPayload<'a>> {
-        use crate::Payload::*;
-        match payload {
-            Version { num, range } => self.version(*num, range)?,
-            TypeSection(s) => self.type_section(s)?,
-            ImportSection(s) => self.import_section(s)?,
-            AliasSection(s) => self.alias_section(s)?,
-            InstanceSection(s) => self.instance_section(s)?,
-            ModuleSection(s) => self.module_section(s)?,
-            FunctionSection(s) => self.function_section(s)?,
-            TableSection(s) => self.table_section(s)?,
-            MemorySection(s) => self.memory_section(s)?,
-            GlobalSection(s) => self.global_section(s)?,
-            ExportSection(s) => self.export_section(s)?,
-            StartSection { func, range } => self.start_section(*func, range)?,
-            ElementSection(s) => self.element_section(s)?,
-            DataCountSection { count, range } => self.data_count_section(*count, range)?,
-            CodeSectionStart {
-                count,
-                range,
-                size: _,
-            } => self.code_section_start(*count, range)?,
-            CodeSectionEntry(body) => {
-                let (func_validator, ops) = self.code_section_entry(body)?;
-                return Ok(ValidPayload::Func(func_validator, ops));
-            }
-            ModuleCodeSectionStart {
-                count,
-                range,
-                size: _,
-            } => self.module_code_section_start(*count, range)?,
-            DataSection(s) => self.data_section(s)?,
-            End => {
-                self.end()?;
-                return Ok(if self.state.depth > 0 {
-                    ValidPayload::Pop
-                } else {
-                    ValidPayload::Ok
-                });
-            }
-
-            CustomSection { .. } => {} // no validation for custom sections
-            UnknownSection { id, range, .. } => self.unknown_section(*id, range)?,
-            ModuleCodeSectionEntry { parser, range: _ } => {
-                let subvalidator = self.module_code_section_entry();
-                return Ok(ValidPayload::Push(parser.clone(), subvalidator));
-            }
-        }
-        Ok(ValidPayload::Ok)
-    }
-
-    fn create_error<T>(&self, msg: impl Into<String>) -> Result<T> {
-        Err(BinaryReaderError::new(msg.into(), self.offset))
-    }
-
-    /// Validates [`Payload::Version`](crate::Payload)
-    pub fn version(&mut self, num: u32, range: &Range) -> Result<()> {
-        self.offset = range.start;
-        if self.order != Order::Initial {
-            return self.create_error("wasm version header out of order");
-        }
-        self.order = Order::AfterHeader;
-        if num != 1 {
-            return self.create_error("bad wasm file version");
-        }
-        Ok(())
-    }
-
-    fn update_order(&mut self, order: Order) -> Result<()> {
-        let prev = mem::replace(&mut self.order, order);
-        // If the previous section came before this section, then that's always
-        // valid.
-        if prev < order {
-            return Ok(());
-        }
-        // ... otherwise if this is a repeated section then only the "module
-        // linking header" is allows to have repeats
-        if order == self.order && self.order == Order::ModuleLinkingHeader {
-            return Ok(());
-        }
-        self.create_error("section out of order")
-    }
-
-    fn header_order(&mut self, order: Order) -> Order {
-        if self.features.module_linking {
-            Order::ModuleLinkingHeader
-        } else {
-            order
-        }
-    }
-
-    fn get_type<'me>(&'me self, idx: Def<u32>) -> Result<Def<&'me TypeDef>> {
-        match self.state.get_type(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error("unknown type: type index out of bounds"),
-        }
-    }
-
-    fn get_table<'me>(&'me self, idx: Def<u32>) -> Result<&'me Def<TableType>> {
-        match self.state.get_table(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error("unknown table: table index out of bounds"),
-        }
-    }
-
-    fn get_memory<'me>(&'me self, idx: Def<u32>) -> Result<&'me MemoryType> {
-        match self.state.get_memory(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error("unknown memory: memory index out of bounds"),
-        }
-    }
-
-    fn get_global<'me>(&'me self, idx: Def<u32>) -> Result<&'me Def<GlobalType>> {
-        match self.state.get_global(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error("unknown global: global index out of bounds"),
-        }
-    }
-
-    fn get_func_type_index<'me>(&'me self, idx: Def<u32>) -> Result<Def<u32>> {
-        match self.state.get_func_type_index(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error(format!(
-                "unknown function {}: func index out of bounds",
-                idx.item
-            )),
-        }
-    }
-
-    fn get_module_type_index<'me>(&'me self, idx: Def<u32>) -> Result<Def<u32>> {
-        match self.state.get_module_type_index(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error("unknown module: module index out of bounds"),
-        }
-    }
-
-    fn get_instance_def<'me>(&'me self, idx: Def<u32>) -> Result<&'me Def<InstanceDef>> {
-        match self.state.get_instance_def(idx) {
-            Some(t) => Ok(t),
-            None => self.create_error("unknown instance: instance index out of bounds"),
-        }
-    }
-
-    fn func_type_at<'me>(&'me self, type_index: Def<u32>) -> Result<Def<&'me FuncType>> {
-        let def = self.get_type(type_index)?;
-        match &def.item {
-            TypeDef::Func(item) => Ok(def.with(item)),
-            _ => self.create_error("type index is not a function"),
-        }
-    }
-
-    fn module_type_at<'me>(&'me self, type_index: Def<u32>) -> Result<Def<&'me ModuleType>> {
-        if !self.features.module_linking {
-            return self.create_error("module linking proposal not enabled");
-        }
-        let ty = self.get_type(type_index)?;
-        match &ty.item {
-            TypeDef::Module(item) => Ok(ty.with(item)),
-            _ => self.create_error("type index is not a module"),
-        }
-    }
-
-    fn instance_type_at<'me>(&'me self, type_index: Def<u32>) -> Result<Def<&'me InstanceType>> {
-        if !self.features.module_linking {
-            return self.create_error("module linking proposal not enabled");
-        }
-        let def = self.get_type(type_index)?;
-        match &def.item {
-            TypeDef::Instance(item) => Ok(def.with(item)),
-            _ => self.create_error("type index is not an instance"),
-        }
-    }
-
-    fn check_max(&self, cur_len: usize, amt_added: u32, max: usize, desc: &str) -> Result<()> {
-        let overflow = max
-            .checked_sub(cur_len)
-            .and_then(|amt| amt.checked_sub(amt_added as usize))
-            .is_none();
-        if overflow {
-            return if max == 1 {
-                self.create_error(format!("multiple {}", desc))
-            } else {
-                self.create_error(format!("{} count is out of bounds", desc))
-            };
-        }
-        Ok(())
-    }
-
-    fn section<T>(
-        &mut self,
-        order: Order,
-        section: &T,
-        mut validate_item: impl FnMut(&mut Self, T::Item) -> Result<()>,
-    ) -> Result<()>
-    where
-        T: SectionReader + Clone + SectionWithLimitedItems,
-    {
-        self.offset = section.range().start;
-        self.update_order(order)?;
-
-        let mut section = section.clone();
-        for _ in 0..section.get_count() {
-            self.offset = section.original_position();
-            let item = section.read()?;
-            validate_item(self, item)?;
-        }
-        self.offset = section.range().end;
-        section.ensure_end()?;
-        Ok(())
-    }
-
-    /// Validates [`Payload::TypeSection`](crate::Payload)
-    pub fn type_section(&mut self, section: &crate::TypeSectionReader<'_>) -> Result<()> {
-        let order = self.header_order(Order::Type);
-        self.check_max(
-            self.state.types.len(),
-            section.get_count(),
-            MAX_WASM_TYPES,
-            "types",
-        )?;
-        self.section(order, section, |me, item| me.type_def(item))
-    }
-
-    fn type_def(&mut self, def: crate::TypeDef<'_>) -> Result<()> {
-        let def = match def {
-            crate::TypeDef::Func(t) => {
-                for ty in t.params.iter().chain(t.returns.iter()) {
-                    self.value_type(*ty)?;
-                }
-                if t.returns.len() > 1 && !self.features.multi_value {
-                    return self
-                        .create_error("invalid result arity: func type returns multiple values");
-                }
-                TypeDef::Func(t)
-            }
-            crate::TypeDef::Module(t) => {
-                if !self.features.module_linking {
-                    return self.create_error("module linking proposal not enabled");
-                }
-                let imports = t
-                    .imports
-                    .iter()
-                    .map(|i| {
-                        self.import_entry_type(&i.ty)?;
-                        Ok((i.module.to_string(), i.field.map(|i| i.to_string()), i.ty))
-                    })
-                    .collect::<Result<_>>()?;
-                let mut names = HashSet::new();
-                let exports = t
-                    .exports
-                    .iter()
-                    .map(|e| {
-                        if !names.insert(e.name) {
-                            return self.create_error("duplicate export name");
-                        }
-                        self.import_entry_type(&e.ty)?;
-                        Ok((e.name.to_string(), e.ty))
-                    })
-                    .collect::<Result<_>>()?;
-                TypeDef::Module(ModuleType { imports, exports })
-            }
-            crate::TypeDef::Instance(t) => {
-                if !self.features.module_linking {
-                    return self.create_error("module linking proposal not enabled");
-                }
-                let mut names = HashSet::new();
-                let exports = t
-                    .exports
-                    .iter()
-                    .map(|e| {
-                        if !names.insert(e.name) {
-                            return self.create_error("duplicate export name");
-                        }
-                        self.import_entry_type(&e.ty)?;
-                        Ok((e.name.to_string(), e.ty))
-                    })
-                    .collect::<Result<_>>()?;
-                TypeDef::Instance(InstanceType { exports })
-            }
-        };
-        let def = ValidatedType::Def(def);
-        self.state.assert_mut().types.push(def);
-        Ok(())
-    }
-
-    fn value_type(&self, ty: Type) -> Result<()> {
-        match ty {
-            Type::I32 | Type::I64 | Type::F32 | Type::F64 => Ok(()),
-            Type::FuncRef | Type::ExternRef => {
-                if self.features.reference_types {
-                    Ok(())
-                } else {
-                    self.create_error("reference types support is not enabled")
-                }
-            }
-            Type::V128 => {
-                if self.features.simd {
-                    Ok(())
-                } else {
-                    self.create_error("SIMD support is not enabled")
-                }
-            }
-            _ => self.create_error("invalid value type"),
-        }
-    }
-
-    fn import_entry_type(&self, import_type: &ImportSectionEntryType) -> Result<()> {
-        match import_type {
-            ImportSectionEntryType::Function(type_index) => {
-                self.func_type_at(self.state.def(*type_index))?;
-                Ok(())
-            }
-            ImportSectionEntryType::Table(t) => self.table_type(t),
-            ImportSectionEntryType::Memory(t) => self.memory_type(t),
-            ImportSectionEntryType::Global(t) => self.global_type(t),
-            ImportSectionEntryType::Module(type_index) => {
-                self.module_type_at(self.state.def(*type_index))?;
-                Ok(())
-            }
-            ImportSectionEntryType::Instance(type_index) => {
-                self.instance_type_at(self.state.def(*type_index))?;
-                Ok(())
-            }
-        }
-    }
-
-    fn table_type(&self, ty: &TableType) -> Result<()> {
-        match ty.element_type {
-            Type::FuncRef => {}
-            Type::ExternRef => {
-                if !self.features.reference_types {
-                    return self.create_error("element is not anyfunc");
-                }
-            }
-            _ => return self.create_error("element is not reference type"),
-        }
-        self.limits(&ty.limits)
-    }
-
-    fn memory_type(&self, ty: &MemoryType) -> Result<()> {
-        self.limits(&ty.limits)?;
-        let initial = ty.limits.initial;
-        if initial as usize > MAX_WASM_MEMORY_PAGES {
-            return self.create_error("memory size must be at most 65536 pages (4GiB)");
-        }
-        let maximum = ty.limits.maximum;
-        if maximum.is_some() && maximum.unwrap() as usize > MAX_WASM_MEMORY_PAGES {
-            return self.create_error("memory size must be at most 65536 pages (4GiB)");
-        }
-        if ty.shared {
-            if !self.features.threads {
-                return self.create_error("threads must be enabled for shared memories");
-            }
-            if ty.limits.maximum.is_none() {
-                return self.create_error("shared memory must have maximum size");
-            }
-        }
-        Ok(())
-    }
-
-    fn global_type(&self, ty: &GlobalType) -> Result<()> {
-        self.value_type(ty.content_type)
-    }
-
-    fn limits(&self, limits: &ResizableLimits) -> Result<()> {
-        if let Some(max) = limits.maximum {
-            if limits.initial > max {
-                return self.create_error("size minimum must not be greater than maximum");
-            }
-        }
-        Ok(())
-    }
-
-    /// Validates [`Payload::ImportSection`](crate::Payload)
-    pub fn import_section(&mut self, section: &crate::ImportSectionReader<'_>) -> Result<()> {
-        let order = self.header_order(Order::Import);
-        self.section(order, section, |me, item| me.import(item))
-    }
-
-    fn import(&mut self, entry: Import<'_>) -> Result<()> {
-        self.import_entry_type(&entry.ty)?;
-        let (len, max, desc) = match entry.ty {
-            ImportSectionEntryType::Function(type_index) => {
-                let def = self.state.def(type_index);
-                let state = self.state.assert_mut();
-                state.func_type_indices.push(def);
-                (state.func_type_indices.len(), MAX_WASM_FUNCTIONS, "funcs")
-            }
-            ImportSectionEntryType::Table(ty) => {
-                let def = self.state.def(ty);
-                let state = self.state.assert_mut();
-                state.tables.push(def);
-                (state.tables.len(), self.max_tables(), "tables")
-            }
-            ImportSectionEntryType::Memory(ty) => {
-                let state = self.state.assert_mut();
-                state.memories.push(ty);
-                (state.memories.len(), MAX_WASM_MEMORIES, "memories")
-            }
-            ImportSectionEntryType::Global(ty) => {
-                let def = self.state.def(ty);
-                let state = self.state.assert_mut();
-                state.globals.push(def);
-                (state.globals.len(), MAX_WASM_GLOBALS, "globals")
-            }
-            ImportSectionEntryType::Instance(type_idx) => {
-                let def = self.state.def(InstanceDef::Imported { type_idx });
-                let state = self.state.assert_mut();
-                state.instance_type_indices.push(def);
-                (
-                    state.instance_type_indices.len(),
-                    MAX_WASM_INSTANCES,
-                    "instances",
-                )
-            }
-            ImportSectionEntryType::Module(type_index) => {
-                let def = self.state.def(type_index);
-                let state = self.state.assert_mut();
-                state.module_type_indices.push(def);
-                (state.module_type_indices.len(), MAX_WASM_MODULES, "modules")
-            }
-        };
-        self.check_max(len, 0, max, desc)?;
-
-        if let Some(ty) = self.expected_type {
-            let idx = self.expected_import_pos;
-            self.expected_import_pos += 1;
-            let module_ty = self.module_type_at(ty)?;
-            let equal = match module_ty.item.imports.get(idx) {
-                Some(import) => {
-                    self.imports_equal(self.state.def(entry), module_ty.with(to_import(import)))
-                }
-                None => false,
-            };
-            if !equal {
-                return self.create_error("inline module type does not match declared type");
-            }
-        }
-        Ok(())
-    }
-
-    /// Validates [`Payload::AliasSection`](crate::Payload)
-    pub fn alias_section(&mut self, section: &crate::AliasSectionReader<'_>) -> Result<()> {
-        if !self.features.module_linking {
-            return self.create_error("module linking proposal not enabled");
-        }
-        self.section(Order::ModuleLinkingHeader, section, |me, a| me.alias(a))
-    }
-
-    fn alias(&mut self, alias: Alias) -> Result<()> {
-        match alias.instance {
-            AliasedInstance::Child(instance_idx) => {
-                let ty = self.get_instance_def(self.state.def(instance_idx))?;
-                let exports = match ty.item {
-                    InstanceDef::Imported { type_idx } => {
-                        let ty = self.instance_type_at(ty.with(type_idx))?;
-                        ty.map(|t| &t.exports)
-                    }
-                    InstanceDef::Instantiated { module_idx } => {
-                        let ty = self.get_module_type_index(ty.with(module_idx))?;
-                        let ty = self.module_type_at(ty)?;
-                        ty.map(|t| &t.exports)
-                    }
-                };
-                let export = match exports.item.get(alias.index as usize) {
-                    Some(e) => e,
-                    None => {
-                        return self.create_error("aliased export index out of bounds");
-                    }
-                };
-                match (export.1, alias.kind) {
-                    (ImportSectionEntryType::Function(ty), ExternalKind::Function) => {
-                        let def = exports.with(ty);
-                        self.state.assert_mut().func_type_indices.push(def);
-                    }
-                    (ImportSectionEntryType::Table(ty), ExternalKind::Table) => {
-                        let def = exports.with(ty);
-                        self.state.assert_mut().tables.push(def);
-                    }
-                    (ImportSectionEntryType::Memory(ty), ExternalKind::Memory) => {
-                        self.state.assert_mut().memories.push(ty);
-                    }
-                    (ImportSectionEntryType::Global(ty), ExternalKind::Global) => {
-                        let def = exports.with(ty);
-                        self.state.assert_mut().globals.push(def);
-                    }
-                    (ImportSectionEntryType::Instance(ty), ExternalKind::Instance) => {
-                        let def = exports.with(InstanceDef::Imported { type_idx: ty });
-                        self.state.assert_mut().instance_type_indices.push(def);
-                    }
-                    (ImportSectionEntryType::Module(ty), ExternalKind::Module) => {
-                        let def = exports.with(ty);
-                        self.state.assert_mut().module_type_indices.push(def);
-                    }
-                    _ => return self.create_error("alias kind mismatch with export kind"),
-                }
-            }
-            AliasedInstance::Parent => {
-                let idx = match self.state.depth.checked_sub(1) {
-                    None => return self.create_error("no parent module to alias from"),
-                    Some(depth) => Def {
-                        depth,
-                        item: alias.index,
-                    },
-                };
-                match alias.kind {
-                    ExternalKind::Module => {
-                        let ty = self.get_module_type_index(idx)?;
-                        self.state.assert_mut().module_type_indices.push(ty);
-                    }
-                    ExternalKind::Type => {
-                        // make sure this type actually exists, then push it as
-                        // ourselve aliasing that type.
-                        self.get_type(idx)?;
-                        self.state
-                            .assert_mut()
-                            .types
-                            .push(ValidatedType::Alias(idx));
-                    }
-                    _ => return self.create_error("only parent types/modules can be aliased"),
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Validates [`Payload::ModuleSection`](crate::Payload)
-    pub fn module_section(&mut self, section: &crate::ModuleSectionReader<'_>) -> Result<()> {
-        if !self.features.module_linking {
-            return self.create_error("module linking proposal not enabled");
-        }
-        self.check_max(
-            self.state.module_type_indices.len(),
-            section.get_count(),
-            MAX_WASM_MODULES,
-            "modules",
-        )?;
-        self.expected_modules = Some(section.get_count() + self.expected_modules.unwrap_or(0));
-        self.section(Order::ModuleLinkingHeader, section, |me, type_index| {
-            let type_index = me.state.def(type_index);
-            me.module_type_at(type_index)?;
-            me.state.assert_mut().module_type_indices.push(type_index);
-            Ok(())
-        })
-    }
-
-    /// Validates [`Payload::InstanceSection`](crate::Payload)
-    pub fn instance_section(&mut self, section: &crate::InstanceSectionReader<'_>) -> Result<()> {
-        if !self.features.module_linking {
-            return self.create_error("module linking proposal not enabled");
-        }
-        self.check_max(
-            self.state.instance_type_indices.len(),
-            section.get_count(),
-            MAX_WASM_INSTANCES,
-            "instances",
-        )?;
-        self.section(Order::ModuleLinkingHeader, section, |me, i| me.instance(i))
-    }
-
-    fn instance(&mut self, instance: Instance<'_>) -> Result<()> {
-        // Fetch the type of the instantiated module so we can typecheck all of
-        // the import items.
-        let module_idx = instance.module();
-        let module_ty = self.get_module_type_index(self.state.def(module_idx))?;
-        let ty = self.module_type_at(module_ty)?;
-
-        // Make sure the right number of imports are provided
-        let mut args = instance.args()?;
-        if args.get_count() as usize != ty.item.imports.len() {
-            return self.create_error("wrong number of imports provided");
-        }
-
-        // Now pairwise match each import against the expected type, making sure
-        // that the provided type is a subtype of the expected type.
-        for import_ty in ty.item.imports.iter() {
-            let (kind, index) = args.read()?;
-            let index = self.state.def(index);
-            let actual = match kind {
-                ExternalKind::Function => self
-                    .get_func_type_index(index)?
-                    .map(ImportSectionEntryType::Function),
-                ExternalKind::Table => self.get_table(index)?.map(ImportSectionEntryType::Table),
-                ExternalKind::Memory => self
-                    .state
-                    .def(ImportSectionEntryType::Memory(*self.get_memory(index)?)),
-                ExternalKind::Global => self.get_global(index)?.map(ImportSectionEntryType::Global),
-                ExternalKind::Module => self
-                    .get_module_type_index(index)?
-                    .map(ImportSectionEntryType::Module),
-                ExternalKind::Instance => {
-                    let def = self.get_instance_def(index)?;
-                    match def.item {
-                        InstanceDef::Imported { type_idx } => {
-                            def.with(ImportSectionEntryType::Instance(type_idx))
-                        }
-                        InstanceDef::Instantiated { module_idx } => {
-                            let expected = match import_ty.2 {
-                                ImportSectionEntryType::Instance(idx) => ty.with(idx),
-                                _ => {
-                                    return self
-                                        .create_error("wrong kind of item used for instantiate")
-                                }
-                            };
-                            let expected = self.instance_type_at(expected)?;
-                            let module_idx = def.with(module_idx);
-                            let actual = self.get_module_type_index(module_idx)?;
-                            let actual = self.module_type_at(actual)?;
-                            self.check_export_sets_match(
-                                expected.map(|m| &*m.exports),
-                                actual.map(|m| &*m.exports),
-                            )?;
-                            continue;
-                        }
-                    }
-                }
-                ExternalKind::Type => return self.create_error("cannot export types"),
-            };
-            let item = actual.item;
-            self.check_imports_match(ty.with(&import_ty.2), actual.map(|_| &item))?;
-        }
-        args.ensure_end()?;
-
-        let def = self.state.def(InstanceDef::Instantiated { module_idx });
-        self.state.assert_mut().instance_type_indices.push(def);
-        Ok(())
-    }
-
-    // Note that this function is basically implementing
-    // https://webassembly.github.io/spec/core/exec/modules.html#import-matching
-    fn check_imports_match(
-        &self,
-        expected: Def<&ImportSectionEntryType>,
-        actual: Def<&ImportSectionEntryType>,
-    ) -> Result<()> {
-        let limits_match = |expected: &ResizableLimits, actual: &ResizableLimits| {
-            actual.initial >= expected.initial
-                && match expected.maximum {
-                    Some(expected_max) => match actual.maximum {
-                        Some(actual_max) => actual_max <= expected_max,
-                        None => false,
-                    },
-                    None => true,
-                }
-        };
-        match (expected.item, actual.item) {
-            (
-                ImportSectionEntryType::Function(expected_idx),
-                ImportSectionEntryType::Function(actual_idx),
-            ) => {
-                let expected = self.func_type_at(expected.map(|_| *expected_idx))?;
-                let actual = self.func_type_at(actual.map(|_| *actual_idx))?;
-                if actual.item == expected.item {
-                    return Ok(());
-                }
-                self.create_error("function provided for instantiation has wrong type")
-            }
-            (ImportSectionEntryType::Table(expected), ImportSectionEntryType::Table(actual)) => {
-                if expected.element_type == actual.element_type
-                    && limits_match(&expected.limits, &actual.limits)
-                {
-                    return Ok(());
-                }
-                self.create_error("table provided for instantiation has wrong type")
-            }
-            (ImportSectionEntryType::Memory(expected), ImportSectionEntryType::Memory(actual)) => {
-                if limits_match(&expected.limits, &actual.limits)
-                    && expected.shared == actual.shared
-                {
-                    return Ok(());
-                }
-                self.create_error("memory provided for instantiation has wrong type")
-            }
-            (ImportSectionEntryType::Global(expected), ImportSectionEntryType::Global(actual)) => {
-                if expected == actual {
-                    return Ok(());
-                }
-                self.create_error("global provided for instantiation has wrong type")
-            }
-            (
-                ImportSectionEntryType::Instance(expected_idx),
-                ImportSectionEntryType::Instance(actual_idx),
-            ) => {
-                let expected = self.instance_type_at(expected.map(|_| *expected_idx))?;
-                let actual = self.instance_type_at(actual.map(|_| *actual_idx))?;
-                self.check_export_sets_match(
-                    expected.map(|i| &*i.exports),
-                    actual.map(|i| &*i.exports),
-                )?;
-                Ok(())
-            }
-            (
-                ImportSectionEntryType::Module(expected_idx),
-                ImportSectionEntryType::Module(actual_idx),
-            ) => {
-                let expected = self.module_type_at(expected.map(|_| *expected_idx))?;
-                let actual = self.module_type_at(actual.map(|_| *actual_idx))?;
-                if expected.item.imports.len() != actual.item.imports.len() {
-                    return self.create_error("mismatched number of module imports");
-                }
-                for (a, b) in expected.item.imports.iter().zip(actual.item.imports.iter()) {
-                    self.check_imports_match(expected.map(|_| &a.2), actual.map(|_| &b.2))?;
-                }
-                self.check_export_sets_match(
-                    expected.map(|i| &*i.exports),
-                    actual.map(|i| &*i.exports),
-                )?;
-                Ok(())
-            }
-            _ => self.create_error("wrong kind of item used for instantiate"),
-        }
-    }
-
-    fn check_export_sets_match(
-        &self,
-        expected: Def<&[(String, ImportSectionEntryType)]>,
-        actual: Def<&[(String, ImportSectionEntryType)]>,
-    ) -> Result<()> {
-        let name_to_idx = actual
-            .item
-            .iter()
-            .enumerate()
-            .map(|(i, e)| (&e.0, i))
-            .collect::<HashMap<_, _>>();
-        for expected_export in expected.item {
-            let idx = match name_to_idx.get(&expected_export.0) {
-                Some(i) => *i,
-                None => {
-                    return self.create_error(&format!("no export named `{}`", expected_export.0))
-                }
-            };
-            self.check_imports_match(
-                expected.map(|_| &expected_export.1),
-                actual.map(|_| &actual.item[idx].1),
-            )?;
-        }
-        Ok(())
-    }
-
-    /// Validates [`Payload::FunctionSection`](crate::Payload)
-    pub fn function_section(&mut self, section: &crate::FunctionSectionReader<'_>) -> Result<()> {
-        self.expected_code_bodies = Some(section.get_count());
-        self.check_max(
-            self.state.func_type_indices.len(),
-            section.get_count(),
-            MAX_WASM_FUNCTIONS,
-            "funcs",
-        )?;
-        // Assert that each type index is indeed a function type, and otherwise
-        // just push it for handling later.
-        self.section(Order::Function, section, |me, i| {
-            let type_index = me.state.def(i);
-            me.func_type_at(type_index)?;
-            me.state.assert_mut().func_type_indices.push(type_index);
-            Ok(())
-        })
-    }
-
-    fn max_tables(&self) -> usize {
-        if self.features.reference_types || self.features.module_linking {
-            MAX_WASM_TABLES
-        } else {
-            1
-        }
-    }
-
-    /// Validates [`Payload::TableSection`](crate::Payload)
-    pub fn table_section(&mut self, section: &crate::TableSectionReader<'_>) -> Result<()> {
-        self.check_max(
-            self.state.tables.len(),
-            section.get_count(),
-            self.max_tables(),
-            "tables",
-        )?;
-        self.section(Order::Table, section, |me, ty| {
-            me.table_type(&ty)?;
-            let def = me.state.def(ty);
-            me.state.assert_mut().tables.push(def);
-            Ok(())
-        })
-    }
-
-    pub fn memory_section(&mut self, section: &crate::MemorySectionReader<'_>) -> Result<()> {
-        self.check_max(
-            self.state.memories.len(),
-            section.get_count(),
-            MAX_WASM_MEMORIES,
-            "memories",
-        )?;
-        self.section(Order::Memory, section, |me, ty| {
-            me.memory_type(&ty)?;
-            me.state.assert_mut().memories.push(ty);
-            Ok(())
-        })
-    }
-
-    /// Validates [`Payload::GlobalSection`](crate::Payload)
-    pub fn global_section(&mut self, section: &crate::GlobalSectionReader<'_>) -> Result<()> {
-        self.check_max(
-            self.state.globals.len(),
-            section.get_count(),
-            MAX_WASM_GLOBALS,
-            "globals",
-        )?;
-        self.section(Order::Global, section, |me, g| {
-            me.global_type(&g.ty)?;
-            me.init_expr(&g.init_expr, g.ty.content_type)?;
-            let def = me.state.def(g.ty);
-            me.state.assert_mut().globals.push(def);
-            Ok(())
-        })
-    }
-
-    fn init_expr(&mut self, expr: &InitExpr<'_>, expected_ty: Type) -> Result<()> {
-        let mut ops = expr.get_operators_reader().into_iter_with_offsets();
-        let (op, offset) = match ops.next() {
-            Some(Err(e)) => return Err(e),
-            Some(Ok(pair)) => pair,
-            None => return self.create_error("type mismatch: init_expr is empty"),
-        };
-        self.offset = offset;
-        let ty = match op {
-            Operator::I32Const { .. } => Type::I32,
-            Operator::I64Const { .. } => Type::I64,
-            Operator::F32Const { .. } => Type::F32,
-            Operator::F64Const { .. } => Type::F64,
-            Operator::RefNull { ty } => ty,
-            Operator::V128Const { .. } => Type::V128,
-            Operator::GlobalGet { global_index } => {
-                self.get_global(self.state.def(global_index))?
-                    .item
-                    .content_type
-            }
-            Operator::RefFunc { function_index } => {
-                self.get_func_type_index(self.state.def(function_index))?;
-                self.state
-                    .assert_mut()
-                    .function_references
-                    .insert(function_index);
-                Type::FuncRef
-            }
-            Operator::End => return self.create_error("type mismatch: init_expr is empty"),
-            _ => {
-                return self
-                    .create_error("constant expression required: invalid init_expr operator")
-            }
-        };
-        if ty != expected_ty {
-            return self.create_error("type mismatch: invalid init_expr type");
-        }
-
-        // Make sure the next instruction is an `end`
-        match ops.next() {
-            Some(Err(e)) => return Err(e),
-            Some(Ok((Operator::End, _))) => {}
-            Some(Ok(_)) => {
-                return self
-                    .create_error("constant expression required: type mismatch: only one init_expr operator is expected")
-            }
-            None => return self.create_error("type mismatch: init_expr is not terminated"),
-        }
-
-        // ... and verify we're done after that
-        match ops.next() {
-            Some(Err(e)) => Err(e),
-            Some(Ok(_)) => {
-                self.create_error("constant expression required: invalid init_expr operator")
-            }
-            None => Ok(()),
-        }
-    }
-
-    /// Validates [`Payload::ExportSection`](crate::Payload)
-    pub fn export_section(&mut self, section: &crate::ExportSectionReader<'_>) -> Result<()> {
-        let mut exported_names = HashSet::new();
-        self.section(Order::Export, section, |me, e| {
-            if !exported_names.insert(e.field.to_string()) {
-                return me.create_error("duplicate export name");
-            }
-            if let ExternalKind::Type = e.kind {
-                return me.create_error("cannot export types");
-            }
-            me.check_external_kind("exported", e.kind, e.index)?;
-            if !me.export_is_expected(e)? {
-                return me.create_error("inline module type does not match declared type");
-            }
-            Ok(())
-        })
-    }
-
-    fn check_external_kind(&mut self, desc: &str, kind: ExternalKind, index: u32) -> Result<()> {
-        let (ty, total) = match kind {
-            ExternalKind::Function => ("function", self.state.func_type_indices.len()),
-            ExternalKind::Table => ("table", self.state.tables.len()),
-            ExternalKind::Memory => ("memory", self.state.memories.len()),
-            ExternalKind::Global => ("global", self.state.globals.len()),
-            ExternalKind::Module => ("module", self.state.module_type_indices.len()),
-            ExternalKind::Instance => ("instance", self.state.instance_type_indices.len()),
-            ExternalKind::Type => return self.create_error("cannot export types"),
-        };
-        if index as usize >= total {
-            return self.create_error(&format!(
-                "unknown {ty} {index}: {desc} {ty} index out of bounds",
-                desc = desc,
-                index = index,
-                ty = ty,
-            ));
-        }
-        if let ExternalKind::Function = kind {
-            self.state.assert_mut().function_references.insert(index);
-        }
-        Ok(())
-    }
-
-    fn export_is_expected(&mut self, actual: Export<'_>) -> Result<bool> {
-        let expected_ty = match self.expected_type {
-            Some(ty) => ty,
-            None => return Ok(true),
-        };
-        let idx = self.expected_export_pos;
-        self.expected_export_pos += 1;
-        let module_ty = self.module_type_at(expected_ty)?;
-        let expected = match module_ty.item.exports.get(idx) {
-            Some(expected) => module_ty.with(to_export(expected)),
-            None => return Ok(false),
-        };
-        let index = self.state.def(actual.index);
-        let ty = match actual.kind {
-            ExternalKind::Function => self
-                .get_func_type_index(index)?
-                .map(ImportSectionEntryType::Function),
-            ExternalKind::Table => self.get_table(index)?.map(ImportSectionEntryType::Table),
-            ExternalKind::Memory => {
-                let mem = *self.get_memory(index)?;
-                let ty = ImportSectionEntryType::Memory(mem);
-                self.state.def(ty)
-            }
-            ExternalKind::Global => self.get_global(index)?.map(ImportSectionEntryType::Global),
-            ExternalKind::Module => self
-                .get_module_type_index(index)?
-                .map(ImportSectionEntryType::Module),
-            ExternalKind::Instance => {
-                let def = self.get_instance_def(index)?;
-                match def.item {
-                    InstanceDef::Imported { type_idx } => {
-                        def.with(ImportSectionEntryType::Instance(type_idx))
-                    }
-                    InstanceDef::Instantiated { module_idx } => {
-                        let a = self.get_module_type_index(def.with(module_idx))?;
-                        let a = self.module_type_at(a)?;
-                        let b = match expected.item.ty {
-                            ImportSectionEntryType::Instance(idx) => {
-                                self.instance_type_at(expected.with(idx))?
-                            }
-                            _ => return Ok(false),
-                        };
-                        return Ok(actual.field == expected.item.name
-                            && a.item.exports.len() == b.item.exports.len()
-                            && a.item
-                                .exports
-                                .iter()
-                                .map(to_export)
-                                .zip(b.item.exports.iter().map(to_export))
-                                .all(|(ae, be)| self.exports_equal(a.with(ae), b.with(be))));
-                    }
-                }
-            }
-            ExternalKind::Type => unreachable!(), // already validated to not exist
-        };
-        let actual = ty.map(|ty| ExportType {
-            name: actual.field,
-            ty,
-        });
-        Ok(self.exports_equal(actual, expected))
-    }
-
-    fn imports_equal(&self, a: Def<Import<'_>>, b: Def<Import<'_>>) -> bool {
-        a.item.module == b.item.module
-            && a.item.field == b.item.field
-            && self.import_ty_equal(a.with(&a.item.ty), b.with(&b.item.ty))
-    }
-
-    fn exports_equal(&self, a: Def<ExportType<'_>>, b: Def<ExportType<'_>>) -> bool {
-        a.item.name == b.item.name && self.import_ty_equal(a.with(&a.item.ty), b.with(&b.item.ty))
-    }
-
-    fn import_ty_equal(
-        &self,
-        a: Def<&ImportSectionEntryType>,
-        b: Def<&ImportSectionEntryType>,
-    ) -> bool {
-        match (a.item, b.item) {
-            (ImportSectionEntryType::Function(ai), ImportSectionEntryType::Function(bi)) => {
-                self.func_type_at(a.with(*ai)).unwrap().item
-                    == self.func_type_at(b.with(*bi)).unwrap().item
-            }
-            (ImportSectionEntryType::Table(a), ImportSectionEntryType::Table(b)) => a == b,
-            (ImportSectionEntryType::Memory(a), ImportSectionEntryType::Memory(b)) => a == b,
-            (ImportSectionEntryType::Global(a), ImportSectionEntryType::Global(b)) => a == b,
-            (ImportSectionEntryType::Instance(ai), ImportSectionEntryType::Instance(bi)) => {
-                let a = self.instance_type_at(a.with(*ai)).unwrap();
-                let b = self.instance_type_at(b.with(*bi)).unwrap();
-                a.item.exports.len() == b.item.exports.len()
-                    && a.item
-                        .exports
-                        .iter()
-                        .map(to_export)
-                        .zip(b.item.exports.iter().map(to_export))
-                        .all(|(ae, be)| self.exports_equal(a.with(ae), b.with(be)))
-            }
-            (ImportSectionEntryType::Module(ai), ImportSectionEntryType::Module(bi)) => {
-                let a = self.module_type_at(a.with(*ai)).unwrap();
-                let b = self.module_type_at(b.with(*bi)).unwrap();
-                a.item.imports.len() == b.item.imports.len()
-                    && a.item
-                        .imports
-                        .iter()
-                        .map(to_import)
-                        .zip(b.item.imports.iter().map(to_import))
-                        .all(|(ai, bi)| self.imports_equal(a.with(ai), b.with(bi)))
-                    && a.item.exports.len() == b.item.exports.len()
-                    && a.item
-                        .exports
-                        .iter()
-                        .map(to_export)
-                        .zip(b.item.exports.iter().map(to_export))
-                        .all(|(ae, be)| self.exports_equal(a.with(ae), b.with(be)))
-            }
-            _ => false,
-        }
-    }
-
-    /// Validates [`Payload::StartSection`](crate::Payload)
-    pub fn start_section(&mut self, func: u32, range: &Range) -> Result<()> {
-        self.offset = range.start;
-        self.update_order(Order::Start)?;
-        let ty = self.get_func_type_index(self.state.def(func))?;
-        let ty = self.func_type_at(ty)?;
-        if !ty.item.params.is_empty() || !ty.item.returns.is_empty() {
-            return self.create_error("invalid start function type");
-        }
-        Ok(())
-    }
-
-    /// Validates [`Payload::ElementSection`](crate::Payload)
-    pub fn element_section(&mut self, section: &crate::ElementSectionReader<'_>) -> Result<()> {
-        self.section(Order::Element, section, |me, e| {
-            match e.ty {
-                Type::FuncRef => {}
-                Type::ExternRef if me.features.reference_types => {}
-                Type::ExternRef => {
-                    return me
-                        .create_error("reference types must be enabled for anyref elem segment");
-                }
-                _ => return me.create_error("invalid reference type"),
-            }
-            match e.kind {
-                ElementKind::Active {
-                    table_index,
-                    init_expr,
-                } => {
-                    let table = me.get_table(me.state.def(table_index))?;
-                    if e.ty != table.item.element_type {
-                        return me.create_error("element_type != table type");
-                    }
-                    me.init_expr(&init_expr, Type::I32)?;
-                }
-                ElementKind::Passive | ElementKind::Declared => {
-                    if !me.features.bulk_memory {
-                        return me.create_error("reference types must be enabled");
-                    }
-                }
-            }
-            let mut items = e.items.get_items_reader()?;
-            if items.get_count() > MAX_WASM_TABLE_ENTRIES as u32 {
-                return me.create_error("num_elements is out of bounds");
-            }
-            for _ in 0..items.get_count() {
-                me.offset = items.original_position();
-                match items.read()? {
-                    ElementItem::Null(ty) => {
-                        if ty != e.ty {
-                            return me.create_error("null type doesn't match element type");
-                        }
-                    }
-                    ElementItem::Func(f) => {
-                        me.get_func_type_index(me.state.def(f))?;
-                        me.state.assert_mut().function_references.insert(f);
-                    }
-                }
-            }
-
-            me.state.assert_mut().element_types.push(e.ty);
-            Ok(())
-        })
-    }
-
-    /// Validates [`Payload::DataCountSection`](crate::Payload)
-    pub fn data_count_section(&mut self, count: u32, range: &Range) -> Result<()> {
-        self.offset = range.start;
-        self.update_order(Order::DataCount)?;
-        self.state.assert_mut().data_count = Some(count);
-        Ok(())
-    }
-
-    /// Validates [`Payload::ModuleCodeSectionStart`](crate::Payload)
-    pub fn module_code_section_start(&mut self, count: u32, range: &Range) -> Result<()> {
-        if !self.features.module_linking {
-            return self.create_error("module linking proposal not enabled");
-        }
-        self.offset = range.start;
-        self.update_order(Order::ModuleCode)?;
-        match self.expected_modules.take() {
-            Some(n) if n == count => {}
-            Some(_) => {
-                return self
-                    .create_error("module and module code section have inconsistent lengths");
-            }
-            None if count == 0 => {}
-            None => return self.create_error("module code section without module section"),
-        }
-        self.module_code_section_index = self.state.module_type_indices.len() - (count as usize);
-        Ok(())
-    }
-
-    /// Validates [`Payload::ModuleCodeSectionEntry`](crate::Payload).
-    ///
-    /// Note that this does not actually perform any validation itself. The
-    /// `ModuleCodeSectionEntry` payload is associated with a sub-parser for the
-    /// sub-module, and it's expected that the returned [`Validator`] will be
-    /// paired with the [`Parser`] otherwise used with the module.
-    ///
-    /// Note that the returned [`Validator`] should be used for the nested
-    /// module. It will correctly work with parent aliases as well as ensure the
-    /// type of the inline module matches the declared type. Using
-    /// [`Validator::new`] will result in incorrect validation.
-    pub fn module_code_section_entry<'a>(&mut self) -> Validator {
-        let mut ret = Validator::default();
-        ret.features = self.features.clone();
-        ret.expected_type = Some(self.state.module_type_indices[self.module_code_section_index]);
-        self.module_code_section_index += 1;
-        let state = ret.state.assert_mut();
-        state.parent = Some(self.state.arc().clone());
-        state.depth = self.state.depth + 1;
-        return ret;
-    }
-
-    /// Validates [`Payload::CodeSectionStart`](crate::Payload).
-    pub fn code_section_start(&mut self, count: u32, range: &Range) -> Result<()> {
-        self.offset = range.start;
-        self.update_order(Order::Code)?;
-        match self.expected_code_bodies.take() {
-            Some(n) if n == count => {}
-            Some(_) => {
-                return self.create_error("function and code section have inconsistent lengths");
-            }
-            // empty code sections are allowed even if the function section is
-            // missing
-            None if count == 0 => {}
-            None => return self.create_error("code section without function section"),
-        }
-        self.code_section_index = self.state.func_type_indices.len() - (count as usize);
-        Ok(())
-    }
-
-    /// Validates [`Payload::CodeSectionEntry`](crate::Payload).
-    ///
-    /// This function will prepare a [`FuncValidator`] which can be used to
-    /// validate the function. The function body provided will be parsed only
-    /// enough to create the function validation context. After this the
-    /// [`OperatorsReader`] returned can be used to read the opcodes of the
-    /// function as well as feed information into the validator.
-    ///
-    /// Note that the returned [`FuncValidator`] is "connected" to this
-    /// [`Validator`] in that it uses the internal context of this validator for
-    /// validating the function. The [`FuncValidator`] can be sent to
-    /// another thread, for example, to offload actual processing of functions
-    /// elsewhere.
-    pub fn code_section_entry<'a>(
-        &mut self,
-        body: &FunctionBody<'a>,
-    ) -> Result<(FuncValidator, OperatorsReader<'a>)> {
-        let ty_index = self.state.func_type_indices[self.code_section_index];
-        self.code_section_index += 1;
-        self.offset = body.get_binary_reader().original_position();
-
-        let mut locals = body.get_locals_reader()?;
-
-        let mut list = Vec::new();
-        let mut total = 0u32;
-        let max = MAX_WASM_FUNCTION_LOCALS as u32;
-        if locals.get_count() > max {
-            return self.create_error("locals exceed maximum");
-        }
-        for _ in 0..locals.get_count() {
-            self.offset = locals.original_position();
-            let (cnt, ty) = locals.read()?;
-            total = match total.checked_add(cnt) {
-                Some(total) => total,
-                None => return self.create_error("locals overflow"),
-            };
-            if total > max {
-                return self.create_error("locals exceed maximum");
-            }
-            list.push((cnt, ty));
-        }
-        let config = OperatorValidatorConfig {
-            enable_module_linking: self.features.module_linking,
-            enable_reference_types: self.features.reference_types,
-            enable_multi_value: self.features.multi_value,
-            enable_simd: self.features.simd,
-            enable_bulk_memory: self.features.bulk_memory,
-            enable_threads: self.features.threads,
-            enable_tail_call: self.features.tail_call,
-            #[cfg(feature = "deterministic")]
-            deterministic_only: self.features.deterministic_only,
-        };
-        let ty = self.func_type_at(ty_index)?;
-        Ok((
-            FuncValidator {
-                validator: OperatorValidator::new(ty.item, &list, config).map_err(|e| e.0)?,
-                state: self.state.arc().clone(),
-                offset: body.get_binary_reader().original_position(),
-                eof_found: false,
-            },
-            body.get_operators_reader()?,
-        ))
-    }
-
-    /// Validates [`Payload::DataSection`](crate::Payload).
-    pub fn data_section(&mut self, section: &crate::DataSectionReader<'_>) -> Result<()> {
-        self.data_found = section.get_count();
-        self.section(Order::Data, section, |me, d| {
-            match d.kind {
-                DataKind::Passive => {}
-                DataKind::Active {
-                    memory_index,
-                    init_expr,
-                } => {
-                    me.get_memory(me.state.def(memory_index))?;
-                    me.init_expr(&init_expr, Type::I32)?;
-                }
-            }
-            Ok(())
-        })
-    }
-
-    /// Validates [`Payload::UnknownSection`](crate::Payload).
-    ///
-    /// Currently always returns an error.
-    pub fn unknown_section(&mut self, id: u8, range: &Range) -> Result<()> {
-        self.offset = range.start;
-        self.create_error(format!("invalid section code: {}", id))
-    }
-
-    /// Validates [`Payload::End`](crate::Payload).
-    pub fn end(&mut self) -> Result<()> {
-        if let Some(data_count) = self.state.data_count {
-            if data_count != self.data_found {
-                return self.create_error("data count section and passive data mismatch");
-            }
-        }
-        if let Some(n) = self.expected_code_bodies.take() {
-            if n > 0 {
-                return self.create_error("function and code sections have inconsistent lengths");
-            }
-        }
-        if let Some(n) = self.expected_modules.take() {
-            if n > 0 {
-                return self
-                    .create_error("module and module code sections have inconsistent lengths");
-            }
-        }
-        if let Some(t) = self.expected_type {
-            let ty = self.module_type_at(t)?;
-            if self.expected_import_pos != ty.item.imports.len()
-                || self.expected_export_pos != ty.item.exports.len()
-            {
-                return self.create_error("inline module type does not match declared type");
-            }
-        }
-        Ok(())
-    }
-}
-
-impl ModuleState {
-    fn def<T>(&self, item: T) -> Def<T> {
-        Def {
-            depth: self.depth,
-            item,
-        }
-    }
-
-    fn get<'me, T>(
-        &'me self,
-        idx: Def<u32>,
-        get_list: impl FnOnce(&'me ModuleState) -> &'me [T],
-    ) -> Option<&'me T> {
-        let mut cur = self;
-        for _ in 0..(self.depth - idx.depth) {
-            cur = cur.parent.as_ref().unwrap();
-        }
-        get_list(cur).get(idx.item as usize)
-    }
-
-    fn get_type<'me>(&'me self, mut idx: Def<u32>) -> Option<Def<&'me TypeDef>> {
-        loop {
-            let def = self.get(idx, |v| &v.types)?;
-            match def {
-                ValidatedType::Def(item) => break Some(idx.with(item)),
-                ValidatedType::Alias(other) => idx = *other,
-            }
-        }
-    }
-
-    fn get_table<'me>(&'me self, idx: Def<u32>) -> Option<&'me Def<TableType>> {
-        self.get(idx, |v| &v.tables)
-    }
-
-    fn get_memory<'me>(&'me self, idx: Def<u32>) -> Option<&'me MemoryType> {
-        self.get(idx, |v| &v.memories)
-    }
-
-    fn get_global<'me>(&'me self, idx: Def<u32>) -> Option<&'me Def<GlobalType>> {
-        self.get(idx, |v| &v.globals)
-    }
-
-    fn get_func_type_index<'me>(&'me self, idx: Def<u32>) -> Option<Def<u32>> {
-        Some(*self.get(idx, |v| &v.func_type_indices)?)
-    }
-
-    fn get_module_type_index<'me>(&'me self, idx: Def<u32>) -> Option<Def<u32>> {
-        Some(*self.get(idx, |v| &v.module_type_indices)?)
-    }
-
-    fn get_instance_def<'me>(&'me self, idx: Def<u32>) -> Option<&'me Def<InstanceDef>> {
-        self.get(idx, |v| &v.instance_type_indices)
-    }
-}
-
-#[derive(Copy, Clone)]
-struct Def<T> {
-    depth: usize,
-    item: T,
-}
-
-impl<T> Def<T> {
-    fn map<U>(self, map: impl FnOnce(T) -> U) -> Def<U> {
-        Def {
-            depth: self.depth,
-            item: map(self.item),
-        }
-    }
-
-    fn with<U>(&self, item: U) -> Def<U> {
-        Def {
-            depth: self.depth,
-            item: item,
-        }
-    }
-}
-
-mod arc {
-    use std::ops::Deref;
-    use std::sync::Arc;
-
-    pub struct MaybeOwned<T> {
-        owned: bool,
-        arc: Arc<T>,
-    }
-
-    impl<T> MaybeOwned<T> {
-        pub fn as_mut(&mut self) -> Option<&mut T> {
-            if !self.owned {
-                return None;
-            }
-            debug_assert!(Arc::get_mut(&mut self.arc).is_some());
-            Some(unsafe { &mut *(&*self.arc as *const T as *mut T) })
-        }
-
-        pub fn assert_mut(&mut self) -> &mut T {
-            self.as_mut().unwrap()
-        }
-
-        pub fn arc(&mut self) -> &Arc<T> {
-            self.owned = false;
-            &self.arc
-        }
-    }
-
-    impl<T: Default> Default for MaybeOwned<T> {
-        fn default() -> MaybeOwned<T> {
-            MaybeOwned {
-                owned: true,
-                arc: Arc::default(),
-            }
-        }
-    }
-
-    impl<T> Deref for MaybeOwned<T> {
-        type Target = T;
-
-        fn deref(&self) -> &T {
-            &self.arc
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/.cargo-checksum.json	2021-12-09 12:01:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"c804621b77af08b710b59963aacf7396a02e60347ebb70d243e02c8487c7ea39","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f69886395d9520e3b996b8513fb8c26c37673c62061b86b4f076ddc29b3eddd8","src/features/gen_AbortController.rs":"22a673d3f796021e093565d2350b603a3d7ba350a8aeef3125fadaca0b0453a3","src/features/gen_AbortSignal.rs":"b73e1e02538f807117e0d4bb52e6e592818d72f40c5141717d880eb68fed63a4","src/features/gen_AddEventListenerOptions.rs":"5da7771078d6ca66a22c24693fda1a6059d199431581ea1f8320eba4c2494f9d","src/features/gen_AesCbcParams.rs":"fb4eff6727e702bf93537fa7e5add7e89312f8bfacc6cff60b79b17f3c77b849","src/features/gen_AesCtrParams.rs":"656fde69a4869bcf35385aae0be8b9a123115d2ac4844b672bc05072e45b3426","src/features/gen_AesDerivedKeyParams.rs":"8f6ca56646439bebf55895a8e6182bf790855407a6e9557d24f2c8cc084e0661","src/features/gen_AesGcmParams.rs":"c60919542fc824441fbb549520c9c8bd35ded528f32e0434273dc2410898593a","src/features/gen_AesKeyAlgorithm.rs":"a5b22834b6832fc08cb32c082d5a6f7262a03251bfee2b152720fcb89c245313","src/features/gen_AesKeyGenParams.rs":"9cba2073ae34fed648240c9dfa1dcd79723442f6d1f7da5ee5bcd8dd746064c9","src/features/gen_Algorithm.rs":"e6d216af2c87ffba8bb10f386c0949a4c94535d0b80f1174b7ce1c71b324d835","src/features/gen_AlignSetting.rs":"ff73a541ea9cde572943606d73da5a663cf3f2dcf63944bf01902c9434a5b765","src/features/gen_AllowedBluetoothDevice.rs":"3e2f9ba35cd3b79d515a15a21565606577e37273c27d5004003a40665f053bc5","src/features/gen_AllowedUsbDevice.rs":"ecd9ae032ea73f44525a197422d11bae03a042b5843383e29d2862ba718ff6ec","src/features/gen_AnalyserNode.rs":"568689e45535a8a2a9a6010867d9e33c0bfa78fbe3e623c12519dcc75e14f02b","src/features/gen_AnalyserOptions.rs":"217e3463d513d7f02f26fae1a1af180e0bc1ee41ac218b1d53b626b5f9abb52d","src/features/gen_AngleInstancedArrays.rs":"13f2066df6bcab82e067e38f54e60edef16405265622b4faa04f3899e93b4fa7","src/features/gen_Animation.rs":"5d18dcf5d8c5d9c543c5c8a06af4705b5b59629339a0a82210e9a2751ff23b84","src/features/gen_AnimationEffect.rs":"8ae9123859c065210a101f6d0bb700e9d0a5d98ed467aea67d11eb36665b50e4","src/features/gen_AnimationEvent.rs":"79d6438a0eef7e7b59aa7f5289c92f94433a919db6a30cea076f28bc02688ff8","src/features/gen_AnimationEventInit.rs":"9402d807f6aabf563e06d6a714a372fb418acd9ee2ffa9760350c3da9f534e87","src/features/gen_AnimationPlayState.rs":"2b1e8fa5a0c5baf1340578d64b3bdf5e4429552544da28dfe8f088e57eedf3f9","src/features/gen_AnimationPlaybackEvent.rs":"f4890bd07bd9cac9db43210ffa0be7c5ffbc0ba41359fe26526fd708e227bca9","src/features/gen_AnimationPlaybackEventInit.rs":"4bf79b8fcbcdb4f8bf9fe6cf02b12996b288752093637f04d162dca511528c5e","src/features/gen_AnimationPropertyDetails.rs":"cbc389f42d5690d54430ef6524c09aab1630fc64494591418b45a275f44a136c","src/features/gen_AnimationPropertyValueDetails.rs":"6461af9b73b85f59c6751270dedc58f7e5e2761e4a03a3e87fa837e9eaf6a380","src/features/gen_AnimationTimeline.rs":"4f6522d4e21c5f7d4f05801dacdb0721e1600e59f7db5b0521c8b2f6abf1938c","src/features/gen_AssignedNodesOptions.rs":"6c40f1562aaff98e6f07600afed6a277a3b36aacf1edb8438603911449f4fe2f","src/features/gen_AttestationConveyancePreference.rs":"5494c5b72adfd25932b87600095032423402a48a6d277b62c666a7c015bb8c4d","src/features/gen_Attr.rs":"eabeee62feec2dbb1686329dce3deb8aa09acc19d3eb89bef58002bd41e646cb","src/features/gen_AttributeNameValue.rs":"5103311039110739ae3c5f33cd4d6577f00054244db2032a7291b69f707088af","src/features/gen_AudioBuffer.rs":"978bff3b26200f5fdad478c956b43222dd91113ffb003c67bb5823d4d502ea6e","src/features/gen_AudioBufferOptions.rs":"487757f0d50e97f45d345dbfa7c2ac8e433acf31001f3f4cd6095753e03e9285","src/features/gen_AudioBufferSourceNode.rs":"3164e60f02763ff5dcffbbb098dfc6ed6f9bc00e3d3c724dfda8d6ee5434ce28","src/features/gen_AudioBufferSourceOptions.rs":"8da8dffd8a95e5605f834b99a9fcd2a505bd0cfcfe300e159b3aa85e2ae841bb","src/features/gen_AudioConfiguration.rs":"76e17fa6ece0dcf58858945a07ccab8cfa83113c51f694fd6f27c0721fbbab0c","src/features/gen_AudioContext.rs":"9be7133ef28854041db31c70c8fb882db929d8b8af14c880ceb7c953007011b3","src/features/gen_AudioContextOptions.rs":"6de301901511ba867b555bfcd659242dd198a970b8a18e972845c9cb4433f6b6","src/features/gen_AudioContextState.rs":"edd11d999f8cf221a6b15fb3438190e4dc9cdf1d85d2ad3ad3c62f61785d1b03","src/features/gen_AudioDestinationNode.rs":"6a02565a7900eae9ffa25ab927be837ebfe94a32c403c2e5b934d513ae1c50f3","src/features/gen_AudioListener.rs":"61abb86f591b7248db9e456998789692a84e9c2595280501b698bcc09a531bbb","src/features/gen_AudioNode.rs":"95315a26b92d04298f083794e7f67aa7b766d35bd1caa0b31db327cda491d8f6","src/features/gen_AudioNodeOptions.rs":"838a95ac0c2c0bb95be39dfbd62dc73f502203c219b4ed50f30543ffba50cfe5","src/features/gen_AudioParam.rs":"b84526ac400e8f0def32ac662799e7917e1a0dd1f4b0801c5018d173acc1ba2b","src/features/gen_AudioParamMap.rs":"833e5f93b45dcea6f3b56ac5eb883f240d2ee9ccf7b8084a431f6778c6f4f012","src/features/gen_AudioProcessingEvent.rs":"21d4a7f371be7acef5b201e5d7f47b24c6245ae77d85be626fd803695011f4f0","src/features/gen_AudioScheduledSourceNode.rs":"55406f3e4669483cfd0421e444abe5dbfaf6b833c4402aaf78693ad8aaa32010","src/features/gen_AudioStreamTrack.rs":"052efb0cb7fa24020da9b7db68cd90a94b6938d63f3f49124b20f49fe8e62ed9","src/features/gen_AudioTrack.rs":"5dbfd1581aaa64d69979a11b22d86af28c7acb5e3cbc52cf64205ffb7d519c01","src/features/gen_AudioTrackList.rs":"a8ad569369804ad75d782d9e89f9a198a220f84fb5455b3ac6db59ee4c6e6745","src/features/gen_AudioWorklet.rs":"ff12056ddb42786d6bb79d2e39047906cfe2547a70fb41816266be4915c18085","src/features/gen_AudioWorkletGlobalScope.rs":"0173f737347b82d76b8ffb0e51092550dd135f112a46c28c4148156246135750","src/features/gen_AudioWorkletNode.rs":"ffae556691a3420cda558d5430f38eba420c32049452baa731f27a8bfb292ff4","src/features/gen_AudioWorkletNodeOptions.rs":"673a5afa55acd44cb224abf6f9d51ef811dc0a7d7debfba84bc709846807058b","src/features/gen_AudioWorkletProcessor.rs":"0e79ca4194036f1a03d34f6a6a3fa9016da19b5d801409fc8849e779c09844a7","src/features/gen_AuthenticationExtensionsClientInputs.rs":"b310559438a59611174a9913d2f32992671619b11d7baea1535c004ee01d1240","src/features/gen_AuthenticationExtensionsClientOutputs.rs":"dbb690d1288790c932bfca404265174851468167044ec26d99d32b52130b1cc9","src/features/gen_AuthenticatorAssertionResponse.rs":"feb2fee43a04d007a6eee628ad504b329817ef9a5a75eae8ab2600183c27dc94","src/features/gen_AuthenticatorAttachment.rs":"04a5fb20a1c8fadf143130a310fce74e0977c3788873021abeddc274eaf97796","src/features/gen_AuthenticatorAttestationResponse.rs":"652197afb60ffc73e5cb4a8db3d86957d7ed47ff6a635ab5d9da06bbfc31b938","src/features/gen_AuthenticatorResponse.rs":"38f40f2a6e74d7473dceb7cb5ca98946acade68ffa586c3ffe1983c00e27fd44","src/features/gen_AuthenticatorSelectionCriteria.rs":"0425b2c2048af2f54d7dc87ef9a7d152acf155f479e979c00bfe53ecdf1e0e65","src/features/gen_AuthenticatorTransport.rs":"f2826d2287434eb0429a01deb86331e1f8b1e7737e24faf60834858632f46e54","src/features/gen_AutoKeyword.rs":"3e949f9dbda20ebace5d004a42ee5683893ed7e7fd3105dc3c64cbac1c052a20","src/features/gen_AutocompleteInfo.rs":"15ee8a5f449c618995fde2aaf2232f1b7a2fdcf29a23310610562d94089a9ac0","src/features/gen_BarProp.rs":"efd61c21636866a6df69525b711e7f97e6ee527c827a185f72408b8b321103e1","src/features/gen_BaseAudioContext.rs":"d521a7fea03f7d80533176aa8feab1681500a1b4ad451c88a677236c5686c49e","src/features/gen_BaseComputedKeyframe.rs":"f2098fa1a343d5bf14fa5907554297d5e08385150ffca00ce05534009494b694","src/features/gen_BaseKeyframe.rs":"0a6deb12414c04f8e56a64e196a85970b260c2bea9179b24e2c82aa360980da8","src/features/gen_BasePropertyIndexedKeyframe.rs":"081101440bbadbc971cfa409a09e61f4ded56b3b0980d09c56356b8aaf5692b4","src/features/gen_BasicCardRequest.rs":"6dd32cc911b6bd4bf3ffa13f838b9ecde4c2f97b0e33cf18d81d4183e0c1a39d","src/features/gen_BasicCardResponse.rs":"b35f6370d292cbb4fbb23c91671ba85970a9eace248033dbd348c2020cae1119","src/features/gen_BasicCardType.rs":"6bfda80623bc1bcd3994f909c2eab21543b6622f17d6a2294be98ea72b38ea96","src/features/gen_BatteryManager.rs":"16cc81521988ce39c22bd295bed270d82a973ee37ae7999badd24a77bf7724f6","src/features/gen_BeforeUnloadEvent.rs":"a1a6f0a200a65eaf6526425fb7a2602f4f59bcbdbe8ef63c1ddb8c0126a77aa8","src/features/gen_BinaryType.rs":"b69e6050d2d6f2c4fa4fca374fc3f66882f84ee8a68cfe29750056c700ee4f9c","src/features/gen_BiquadFilterNode.rs":"8186b1f05c8835f0a7d3ffa70fce921b6ef62277b0c77a7e858d5b497d7869d6","src/features/gen_BiquadFilterOptions.rs":"b984e9b55c06786607b33a8af739400ece4be7550ecaf2799bb16b31a1fbfbb4","src/features/gen_BiquadFilterType.rs":"a610a212326537cc522cf65b3c4d793083a89828ef2ec489026e2c6993d6a6a7","src/features/gen_Blob.rs":"d25689423dcc28c0d44c818fc596021eeab67c8425d5574bb9c2498a75000687","src/features/gen_BlobEvent.rs":"99b2cd41721cdc34267fc4b061f217962e72a10adefd9c88db6fd851db5c00b3","src/features/gen_BlobEventInit.rs":"9f2333057bb9acbecfd5d6beafa1cae8815d6a8bcb0daf27bd59c9dd1a905dcf","src/features/gen_BlobPropertyBag.rs":"915a652f443db4ac6db475d78c7d3f09dc189b07f656f566020d36ff6d53101a","src/features/gen_BlockParsingOptions.rs":"86a1764e757453cbb6d91d86ee0374eb104e96be346f3ef0a6adad9efdbae66e","src/features/gen_Bluetooth.rs":"5c53e5eddf3b80aa1ac69828641dd93cdb8f1ee15272b676aa903abfb4aa620d","src/features/gen_BluetoothAdvertisingEvent.rs":"be8ac27bd89f353e219aae98f3d2e8f5f7f110dd131273bf72423460d58f1efe","src/features/gen_BluetoothAdvertisingEventInit.rs":"f938992897a5a799dbea3451c180cd5256e9e9c8a5dd8047d543b057fd58a3b1","src/features/gen_BluetoothCharacteristicProperties.rs":"43ff806873ddaf114fae3def048a926073f6e4781dc53b9d306030d786ad3aca","src/features/gen_BluetoothDataFilterInit.rs":"4d1d914ebc081f2919f5fd562fd20732d8d6a2f8f6ae60bdef3e53b4a012a9dd","src/features/gen_BluetoothDevice.rs":"e284a910f08632248da9e67ebda4e17b69d620acca54c91bdc2c25ac69ed9309","src/features/gen_BluetoothLeScanFilterInit.rs":"b2bbc6ac690dfadfa8c30aba386e58b0d9e1011ad524e6a50421429308a9d818","src/features/gen_BluetoothManufacturerDataMap.rs":"4bd41d1c47e4e2ec175872881531c1978676647f63d8344267e66346ae7a5568","src/features/gen_BluetoothPermissionDescriptor.rs":"7e23ba9098e8f18874c8d08840ff82a4ff03d536617528362976946a5473ffb9","src/features/gen_BluetoothPermissionResult.rs":"b7ff0bf1603061515518860ba02f8f2d43fd12108f1a0563f97301e617400315","src/features/gen_BluetoothPermissionStorage.rs":"df7387637030527acdfae61e16a192d36413703626b2c961ec64d671fe7eb62f","src/features/gen_BluetoothRemoteGattCharacteristic.rs":"4136c767dd8e49631227f23228e2125440f854321386bd0687c8a8799b978783","src/features/gen_BluetoothRemoteGattDescriptor.rs":"28a0d224a89811db1829c49a4520aed22efa208d161a89d1fd07b4748a36556f","src/features/gen_BluetoothRemoteGattServer.rs":"ad25e1a91df3bb3b64e9ffa69976b6b61e4858959a2f8235c35828aea660dbcd","src/features/gen_BluetoothRemoteGattService.rs":"bf09ed5374d82e659b9d4776becb02790e573a50ff7fd0cc1246556df9ae8165","src/features/gen_BluetoothServiceDataMap.rs":"aadd8f9a2868bac979f155a9a9eb6e1d08a0754ee072f20b6e795a025845d1e3","src/features/gen_BluetoothUuid.rs":"9d31a31bb80ae846df9d1719bf5fcd1221502232acd66f8d7ba0dff6ca4c42bb","src/features/gen_BoxQuadOptions.rs":"95d1ce66429ba94e36617753db82706e54535ac0383d653d381e8b901b8c423a","src/features/gen_BroadcastChannel.rs":"c5f8ba5e35d31fd49ef92c4a03af88925543e99894b766cfc977db6137258fde","src/features/gen_BrowserElementDownloadOptions.rs":"65d7b48b25a83f4b821b7641f65618d927801c9dbf7dc1d1f9891958d008a76a","src/features/gen_BrowserElementExecuteScriptOptions.rs":"48aa65194cbc64e34b69eee09c037b62b7e0a5942af2f47a1b3b585bff056219","src/features/gen_BrowserFeedWriter.rs":"54348581bfb88a1356a1cd187113c9828bebb5b86ea97ebace6b69dc9c49f95c","src/features/gen_BrowserFindCaseSensitivity.rs":"8809028a31a3d644281867759a95ffc0f4977d9513d5f51b82fee90ea124d2c9","src/features/gen_BrowserFindDirection.rs":"4ddbc14c34afd26f766b55ad79277216b1105bb17f6608a4d71c06b35b41bd12","src/features/gen_Cache.rs":"9027ace9a9072fc7d55926239e1aa089f3c909e04d4ae0d07089b991ccab86ab","src/features/gen_CacheBatchOperation.rs":"0d58f8d650f98aae92e57cb736115ef9efba7cef13a878b7c7e39537716fdb9f","src/features/gen_CacheQueryOptions.rs":"5d5fe9f34d0455c32776d1e2a31d37cf86c8f1c66c2ead41cfe9d56398778450","src/features/gen_CacheStorage.rs":"12751d03bc6c7f9054baf0526d018bf815e9425c937b08bc7e3e3f51173de4a8","src/features/gen_CacheStorageNamespace.rs":"95789749d91ef88ff8f2dbfe980e831af42abbf4b73446affcccb589c5962243","src/features/gen_CanvasCaptureMediaStream.rs":"ad7c36a8b2e6943eb90ba21bb3deb8c1774256fabf20f637dfd92681e817e37e","src/features/gen_CanvasGradient.rs":"4f3c587209bfb617980017fb96ec9b5ae8e0a4a9d883de879262916e312c6438","src/features/gen_CanvasPattern.rs":"885ff5370817b4f5f455a7d0f5ad2ca56e1d9467058f87c118c604eb88f25237","src/features/gen_CanvasRenderingContext2d.rs":"1df33f1238d870f7f2832b2278204711615d704e992b48daba51d3d50353ae88","src/features/gen_CanvasWindingRule.rs":"3d5eb123879452621161a28078a925cdb9b104c7ef8299518fbdfc7cc8ce2981","src/features/gen_CaretChangedReason.rs":"fde6f8968985fd74465546565bb121f6d18ed03246f4e31a06f3f7cf5ab6dc88","src/features/gen_CaretPosition.rs":"4de00fb02b1410c14a0ed4c53deb51e27a77d8339f55eeac90bbae2fa7f82703","src/features/gen_CaretStateChangedEventInit.rs":"ce9caa4a247424f565089c783a30490a88076e9ddb17ed61dab8d1c8f9c431a6","src/features/gen_CdataSection.rs":"6c1bde87dd3cb7f1697de2c954e5de5ec13077acb9d03f7a2e81c0e3e6c02ef3","src/features/gen_ChannelCountMode.rs":"b338b6533f775c80a47219edbfe8db85596172b0b3e304f23323126e5b0853c8","src/features/gen_ChannelInterpretation.rs":"e46c50f7233d9b126038bd72a34ca7ba05edc18f117947e0771011abdc85885c","src/features/gen_ChannelMergerNode.rs":"8956149b1ad7c28f51e8ac51fb27960cf72136c826f01187fb5deeaff5dec074","src/features/gen_ChannelMergerOptions.rs":"c7a145fa82ca9e40100387d267967ba89fe1a20900c5492602140d7586be6f9f","src/features/gen_ChannelPixelLayout.rs":"a05ad3608eb6e455a20b1e1dbb91dda3efd01a3617472c9f332489b00143dcb7","src/features/gen_ChannelPixelLayoutDataType.rs":"d8a95cc801cadaaabab89cae8572e674f034c3792f2da5b3c6a9913931370094","src/features/gen_ChannelSplitterNode.rs":"68cd2c93a554a5f37c9b770e665d92a27ce5c2a20f9ce401843be89c9378d137","src/features/gen_ChannelSplitterOptions.rs":"09537a5041e0c004576fc0d9cde7b5bce9fa08ddee1245c50f3a5fde682d25e9","src/features/gen_CharacterData.rs":"bf4f3955de6623d6dea2584e72933c695b50ebc196d4dff9654473e9bc86ce87","src/features/gen_CheckerboardReason.rs":"0d78b8c736d7a198a054b917565d91ac09dbe883673745f190abdf6cf59999cc","src/features/gen_CheckerboardReport.rs":"33e0e7b577e56bda8b43f5957a827facfa7545312b8ac2cd8eea7e1baaa160c4","src/features/gen_CheckerboardReportService.rs":"d4d637d6a4e539d9b81fe8855333cd73c5e36fb12c51ba1cb9cd328ae600364d","src/features/gen_ChromeFilePropertyBag.rs":"2a8bf26fc3672dd0b17167632f92ffa3271f9ccd74e611aa596d04d7797711fd","src/features/gen_ChromeWorker.rs":"fbf3a05b1b757ff6fad20ef257fe5d5c75fba2485dbd8d90784988670ca9e713","src/features/gen_Client.rs":"3f8bfe8136245ee67de78b56ab77c8a16748424a2ef32cc76e185a77d1ae1063","src/features/gen_ClientQueryOptions.rs":"478351e4a6527d7d524e66e6fdaa0455ad279aa7d40fbcd2304599a16adb112c","src/features/gen_ClientRectsAndTexts.rs":"a07146710da469936a32e0f8540999270c18ac46236f488ac849480c2fee79ce","src/features/gen_ClientType.rs":"784e2c9ca6c5a920dc6360984b99c5503508642f3b05cf66e3f8b88c27c74b36","src/features/gen_Clients.rs":"1ed24533d8b668821d87f5dda06e91d781e1866e64cf844a2202e10795f61dd2","src/features/gen_Clipboard.rs":"85b0fc87eadb6dca9376cc80764890a7610cbebaec022fdb90831c9b6383d320","src/features/gen_ClipboardEvent.rs":"a07c3624e73e36e32f23f6bb6a04ba1f26da327a0ca40a8cceab03f7a4a0b428","src/features/gen_ClipboardEventInit.rs":"8e70091ffe9ad3b01a10a6c2f75a16195be193f98a34ac8f12c56bc545a06037","src/features/gen_ClipboardItem.rs":"caeda320a1c37963fe4ac0e56e0330e1585ed0f86e6caeff10e7c17391bc389c","src/features/gen_ClipboardItemOptions.rs":"fe1af3dae329072d7d7d791bc0aa07903ac1d852dcc4500bb87d265155bb5804","src/features/gen_ClipboardPermissionDescriptor.rs":"14a66119543e4dd1e9b20838e53a430064f79bfd8b663a715356291ae788b793","src/features/gen_CloseEvent.rs":"c4b2dff76ca15c4ae1393823e3991ee8b820aac7f6c87867ae08009c3c309f6b","src/features/gen_CloseEventInit.rs":"a1fb7e3bc033a8dd020f5592e024c836e807d8edcffcd6f74264c047b07f9689","src/features/gen_CollectedClientData.rs":"b427e74618dfda89b859dbd021fdf9d4b9b16d40d5fd0c451f74258761404a78","src/features/gen_Comment.rs":"468034ee4b36292eea3fc1552215bfd212bcecc0f42dac58df668bae4ccf3c84","src/features/gen_CompositeOperation.rs":"354833c14817eca16eb361c26fdfe27f84a381fb16493f84380e99b0352aa371","src/features/gen_CompositionEvent.rs":"f12e46914958d7edf991e4f72baeb872ffaef3bfa1b13a13d3a7cd0e2f60fab0","src/features/gen_CompositionEventInit.rs":"18ce11f7fb9e2fdd479d187fddfc06e5359d5d17e3918a1af3a485e40e240f2f","src/features/gen_ComputedEffectTiming.rs":"11144682dc13bfdb76003c2f7114dc988c249af0eee2be3471b92c0d047c5989","src/features/gen_ConnStatusDict.rs":"362b759b5730779fca9520cd7005c16549f4707cdd965681d495c33aef4b2cb4","src/features/gen_ConnectionType.rs":"d42e120aeba026e63c08def0b8b28aad6aeb6a44377ce796dab17806a702455b","src/features/gen_ConsoleCounter.rs":"6c3fc6802a11f30456728b58f8e82d9429d641559f36d88f2907dcbbdeca6a35","src/features/gen_ConsoleCounterError.rs":"581900072ae9ee7b1c8187c17995d4f6f5ebae6696d062cd58a417b530131456","src/features/gen_ConsoleEvent.rs":"be35432f5ae25a6a1109ef612e76a1efd1fe3ac477e37e5a3623aa538ab58fb7","src/features/gen_ConsoleInstance.rs":"837ad3de78c8b635a9a5bdd2e2655d135776c8b45bf7509d3ce81a09a2a35d2c","src/features/gen_ConsoleInstanceOptions.rs":"bf72cecd096e9e1f6538cdb6be357aec01ff1b6e5a26beff3e67bfef871c9698","src/features/gen_ConsoleLevel.rs":"14ce635ee006e2583f22aeb64b583c738e1be70eed13359d335b49f3a211c886","src/features/gen_ConsoleLogLevel.rs":"b47f41606b7026f45655d838d9934053bcb3c9e89d94a71cefad33512e863414","src/features/gen_ConsoleProfileEvent.rs":"313aa38e579f1595c4af9cb4121dff84106556bbbc6ea8cd4f0dc435c5c8d8ae","src/features/gen_ConsoleStackEntry.rs":"703d13879de9625d0801de7da185f62d9333f51b347bf8dae50aa0cf6330fc55","src/features/gen_ConsoleTimerError.rs":"99ebd72d5b7a60f8733a4f6bae2401da67f38e3c296927a7aa02a1e95397c5d1","src/features/gen_ConsoleTimerLogOrEnd.rs":"4518a3b049f8c8e10051b5530dfe8a063b4cbfc44dffdfe4863ce7102e5ff019","src/features/gen_ConsoleTimerStart.rs":"7eede17ddc55f34ce537b55788d865342fb9526021cd42ac2faa3da463e60313","src/features/gen_ConstantSourceNode.rs":"c8da84b670926e40a0310c5c92217f5f81952395a6f2c083da7d644fae96c902","src/features/gen_ConstantSourceOptions.rs":"4a09174f85df625f1218cd7de58e896009638a0b6992d1984e7edef23a15698c","src/features/gen_ConstrainBooleanParameters.rs":"e020c9cc1ed30d30ba1898696ccc16b83e197734fc48cf63de11cd247b324a61","src/features/gen_ConstrainDomStringParameters.rs":"1fb78522cb0e95244d7ec4fc7300472be341494f36d58b3538a76da27ae44b59","src/features/gen_ConstrainDoubleRange.rs":"3d67298f19f8ec3859c621990dc9769fa02c190816a530bef4544c276edac25a","src/features/gen_ConstrainLongRange.rs":"f2e35dd45dd2a59f80d6d11f618ead3a0dc2da6b3a9992b1e269f1869f93f2b9","src/features/gen_ContextAttributes2d.rs":"527dcb26f0a141321472a725192af72d884b81e97fadd82d3bf312831aafb8d8","src/features/gen_ConvertCoordinateOptions.rs":"9effc56eb6b9cb7ab63d015dce2a738098c9fded84e97f40756ac5c9c9b02ffb","src/features/gen_ConvolverNode.rs":"78e636782a7a7f98cb010617632ce5791fe4379f406e571a80fce17398b38d23","src/features/gen_ConvolverOptions.rs":"b4e225b3b2b8fbd82c127ed22f08049ced78d5d3d4161cb128354c28a7c5d62b","src/features/gen_Coordinates.rs":"0cd254219ddbdb2b252ca67900d3cc1a25e2f448fedb477b7c1dbd9c80800d9b","src/features/gen_Credential.rs":"7b1795101c30e142400f44eedf8ec29d1cf99d9cd5304aa6625a48f6df2c740d","src/features/gen_CredentialCreationOptions.rs":"f70c39b104eca71b2679bc1481ba222c14980f5de6a4153cf965b17a0271eb61","src/features/gen_CredentialRequestOptions.rs":"0c16810c9d424b3d7a96de9d84eca9bbc6c5b780271aa824fbeebdef952d0329","src/features/gen_CredentialsContainer.rs":"b91d2c02d924d9d2fe44414a00671e58698274b053c0223a6116ab60e6c639c3","src/features/gen_Crypto.rs":"70c7b240c3dead7ba67a017c631fabf290cea92ac82960c55289637a921b6013","src/features/gen_CryptoKey.rs":"d0517bd6a66743472a135e9d1fdc1af6fcfa7a49318739c75837e403c2877531","src/features/gen_CryptoKeyPair.rs":"0052bb7df568c0be45fa71d2bd4ad3c0f9a7d74de0d688fae0891dc1015587b3","src/features/gen_Csp.rs":"29b4c29846e042a6e63d0783396afaadf7a072be3dd8c781a6607e5c623bf7d5","src/features/gen_CspPolicies.rs":"dbc8808cf2f2898fdb6568ab8e6d2177b069d7be911034542c6bd5b2b45ea1d4","src/features/gen_CspReport.rs":"7c12eb697e8a3fb2cfaeab259564334f1d6b11c1076bce0c4cae0b6b92eeeb63","src/features/gen_CspReportProperties.rs":"b38455402e2143e9c327dfdc27c90877a7c6e909b68a234429f45b0e31bd209e","src/features/gen_CssAnimation.rs":"a5ed22ee4ec2b678d09352baf0f77cacd99ea8a1c4d1cd252507fc8054152e56","src/features/gen_CssBoxType.rs":"46333d2364d1e4e47ca380bedf324502103f0bc61e73e4c6658e5dfd0d8708da","src/features/gen_CssConditionRule.rs":"75ac1b778ca957816970c1a0dca472267140fe8027a9fbf7e7a445b1fb27a54f","src/features/gen_CssCounterStyleRule.rs":"16181d9de43847aa523590ca0c633c1a1212f2c281fa55f2113909dbf2844b3d","src/features/gen_CssFontFaceRule.rs":"bc801156a41852698930b6dfa9dcb75685fba61be086a39c2254e55cfa7c732b","src/features/gen_CssFontFeatureValuesRule.rs":"5a1c8a9e5281df0129b2af0b98089e3457bc3d0b8f1dc6b9dace788e0e413b65","src/features/gen_CssGroupingRule.rs":"96939ed4f5f97d6bb044a05471d8c51798d571276214122c25fed8eddccbeec2","src/features/gen_CssImportRule.rs":"0030b12aafe451333e50c7bfd9f76444e9e20a4a3f8b0cd3eceb77a31f736558","src/features/gen_CssKeyframeRule.rs":"f9b6162051073908209cd80f0d12f84b128068279035e1cdbcfa49f4e749f5ac","src/features/gen_CssKeyframesRule.rs":"0c06eb58a6d733ee0b1a8378499647614f0da4760d3910b6cb3c65fbbfe5eb37","src/features/gen_CssMediaRule.rs":"c4eef5dcdd831ef7bf4572ea75d0a0651b424d400ca20748c40e22ce4d0757e5","src/features/gen_CssNamespaceRule.rs":"b8aa55dcec07f335cca1935daeca7043d3645cde33502114c2b63d3aa3166ade","src/features/gen_CssPageRule.rs":"761f4a1b6fcd060f39d449dd70b29b9e7696dfb68202e1eb9546198cacfc3067","src/features/gen_CssPseudoElement.rs":"9a561e5d1be08cf8728c661e50ad8c0926a0d36a4b5ccd321061524e5c86ac59","src/features/gen_CssRule.rs":"36b948a407ece56df90ac875278ce850d102f7abc0aaa818af95c3b1586b9fbd","src/features/gen_CssRuleList.rs":"bb1e2d9901e40aa2f8780ef030fc8630f713282f133556edff045ebfa9f517d7","src/features/gen_CssStyleDeclaration.rs":"a2d19cb5fb2f2b4cda82ad7206f3c9be72428deccf8abc23eac95419c08ea168","src/features/gen_CssStyleRule.rs":"a939b9ffef0ca954c6eb6cedc1c4d270446931e22219d9874bbe7cc117ace1b1","src/features/gen_CssStyleSheet.rs":"2d71e59c3fd69b2a4e26c192912beb124e6c399661c775744760bfb9d34e9096","src/features/gen_CssStyleSheetParsingMode.rs":"306bfa1738a286143cd7deaf4a19b7c154d11a6e97bd24f3c447adfe32d2902b","src/features/gen_CssSupportsRule.rs":"c593c07c94d8dd9fca3a580db4e930b0d7f9833485216010924b4abce6232a64","src/features/gen_CssTransition.rs":"5ad6189609acbb2c47d6b5bc266f32e8645ce863ebcbcbc1d524cf3c1a869321","src/features/gen_CustomElementRegistry.rs":"a9f3c3c4e3da13339be986dd3d672dfd7d37ee961e5254b3d86bf2e74b9c4e5a","src/features/gen_CustomEvent.rs":"b448bd3399b19544a8aa08f2feab9751a259672380c879718a2f0f7df72380a0","src/features/gen_CustomEventInit.rs":"15dbabaed261cd4725c0a34c82cbb596c4a9bd6bc4c269de53eb7cf2db355bc1","src/features/gen_DataTransfer.rs":"089d4050d67cc1c353a769c81b75f623dde953175394661726f33e1882a017d0","src/features/gen_DataTransferItem.rs":"7bef4fc286c6bf6b13aa93749eb5ac98f26d47fc0985feeafa8329a4ed536ddc","src/features/gen_DataTransferItemList.rs":"de7faa8c7a6d0beb3bba70e23c5128d5e494c8cbb217c2193e54aec2b9d92533","src/features/gen_DateTimeValue.rs":"c10c3b2501926303d96ece04b22d52bbeecfdc18fdfedacecc576f671aad5833","src/features/gen_DecoderDoctorNotification.rs":"706c5252860b41395c310220689cd4db676f571abd573fe34a56b6be06195196","src/features/gen_DecoderDoctorNotificationType.rs":"2c034054e294d588a1a61c981b3ab4301262cd415df9fd3074baaeb0f2183c68","src/features/gen_DedicatedWorkerGlobalScope.rs":"66b8e2efeed32cb846e73ac0914f98172dc5e58adb09640513a055507965d7f1","src/features/gen_DelayNode.rs":"135d77e54dc6e891c977db32788b88780fe66c9a10e3ea00afc33ee31d1f984c","src/features/gen_DelayOptions.rs":"f4f032ce71f2c3b84a8b15a7d0371d70d51aeade5b97b95f90fbe3d77ddf16a9","src/features/gen_DeviceAcceleration.rs":"6cb540b703909ca12fe613746826b2cdee854efcc4075d81137b735925ba7ff2","src/features/gen_DeviceAccelerationInit.rs":"de7a6a526aa7d92afe56092fde505c506ad3e550d8c66b6ad73fe2b350954c27","src/features/gen_DeviceLightEvent.rs":"cf4acd7239ff3ad1d3b6de206bfb8e8f8cdd03294782d3d6c4edc82891ffd3ea","src/features/gen_DeviceLightEventInit.rs":"9c627c70509e287867a55b7dcee3420bbf5378f24d96f8dee32df8743bd55120","src/features/gen_DeviceMotionEvent.rs":"4c01f7d5a5bea22f60ea40f71d3b52854f3b0e8a4ee9dc049410addec1e8514e","src/features/gen_DeviceMotionEventInit.rs":"b9341df9940b926478a66745878fb47bc8153d0fefab15df251cc038910f86c9","src/features/gen_DeviceOrientationEvent.rs":"f80e289ccc63686aeaa20f1b33533e3bc39505266871cb574fe34e6af2577cfe","src/features/gen_DeviceOrientationEventInit.rs":"1d00b110eb12c209426abd8dd46b33749e0ce529335b538821f88a5506423baf","src/features/gen_DeviceProximityEvent.rs":"5c3609f2e772f6bca328303015295efd619b3724b810873f37a2683a16ff63ec","src/features/gen_DeviceProximityEventInit.rs":"9aeee24205a7e78c804c28cd618ee3050a4a287c1721a6f2f61f49af3369ee54","src/features/gen_DeviceRotationRate.rs":"6b5feff00434d59bfc4e411123de8af78542b73c4fb399f4f0a5c470af9d31fb","src/features/gen_DeviceRotationRateInit.rs":"68f78a3f9352541fb7c571d2b2d78bc3b457f199f077721ea423f9f1837c4134","src/features/gen_DhKeyDeriveParams.rs":"e15491b5fca37a6f265e00dd140a2d1e062387eca4aefb8dfa8bdc124efcbd05","src/features/gen_DirectionSetting.rs":"a3914ca9888d2eed07f97f8f8573dcca0f341bb51ff25309827696c060791c8f","src/features/gen_Directory.rs":"0cdd48e3d3e7b24c3c4d1c0924ee449df9accb420fafd57db9f30151b031d287","src/features/gen_DisplayNameOptions.rs":"2b79ade606a22eaedd29b75390a108c987459612b84f6e5a7031d39e2799592a","src/features/gen_DisplayNameResult.rs":"bd87c0baadab332791037e94f2678546dc973a22c88467d8b0339545304a058e","src/features/gen_DistanceModelType.rs":"1de01e98ff27aa8c7febf0148431b5158a7135f4d7813f4eea2a9167c6ff5490","src/features/gen_DnsCacheDict.rs":"f4274c8ec13ed3e490bb2af77bd1fdf5ffbe752151630d74063d3cfa23475b90","src/features/gen_DnsCacheEntry.rs":"c43fe7c1030806cce0d3786a77eafcd9618bed19ba38bfdf6589961023b153c1","src/features/gen_DnsLookupDict.rs":"dd8e257cc1b19a7d231f2215cff1a8939b4335541fb48c6bc1fb7d43131f1e5d","src/features/gen_Document.rs":"6fa1f4872ed74565905e87c0f47dd30bdf2dbcd97f661cc9666bdc0c0a649b1f","src/features/gen_DocumentFragment.rs":"e3836ec87706b63aa5634e3fcf5071f7b006dbf03f88710146782f9c88c84d51","src/features/gen_DocumentTimeline.rs":"cf8ee30909ab743219dd9f3e9f451e211703d869fc1ffd1d903ce1c0ba7b525d","src/features/gen_DocumentTimelineOptions.rs":"bf9538760683552de91e73697faa2cc809c2de34a018b59d8a004b7ff0f9b7f1","src/features/gen_DocumentType.rs":"1a286b2fe64384c408b655927f3fc31cf2533ffe02e2c3fb1030b176e96d78d6","src/features/gen_DomError.rs":"c70683657c862500c8740202ca8af37ab04a004c30d9ef61537d613f636d3801","src/features/gen_DomException.rs":"8d12196bacccac079c5afb536e612e7c566164772ef06c3fbb602dbe1ba7c26b","src/features/gen_DomImplementation.rs":"cfff99bd9701658a873dae8ada67720abe5470ab746aa8fe5f12073a1b717f48","src/features/gen_DomMatrix.rs":"78307276718b7dc04d8d06928c920b7d4b2b717fd0d95dbd6e1bf8b2bc4a07f6","src/features/gen_DomMatrixReadOnly.rs":"fc5b72955322cefa88aac36f7cb71393777e2acfa6640ba1653f31cda2db084f","src/features/gen_DomParser.rs":"7b08c04a1ac48dd12ffc839e1ae2b6bfc8c7f6fcb753ef182f40233a2cb797a2","src/features/gen_DomPoint.rs":"34f57a05676603cdeed1c700ba9035dd8332603aa50b774849665fabe0a4a8c1","src/features/gen_DomPointInit.rs":"036cfba2491ad61310d96a43b39028dd1e246a933ea1a08cc9c961fdeb782a4c","src/features/gen_DomPointReadOnly.rs":"e7a48fb0a8a855c4ce037a7251a11c97204ab9689140653b26da4b04fee6a4ac","src/features/gen_DomQuad.rs":"94784f3230d883c7fc9ee33ce81886122abdb307134f2939cb80620dc6227e50","src/features/gen_DomQuadInit.rs":"748d92021faceccedd97de2b4cd519f0912d88af08df7ff5636bd4089908a9fc","src/features/gen_DomQuadJson.rs":"0f6c37faabdc035ec594520d37ca5418e1bf3551a05dd687aa5985b353cdeba5","src/features/gen_DomRect.rs":"3410beae932a67c305fa579915b23e65d24f918ae6fe9369e46d8fba9b3a1e53","src/features/gen_DomRectInit.rs":"04aa2279e84629ddd3c67f580d898a57cdccaace89866a3cc8543fbe5339c594","src/features/gen_DomRectList.rs":"9926d64b88e495e87c14370878ed351c592a58ec5541fd5148c45de34afda02c","src/features/gen_DomRectReadOnly.rs":"457e3c8b01c65e9b7809f6b13b1917f806cd659d597f01ffd92fe1df23502d8c","src/features/gen_DomRequest.rs":"2ab7a80f1bfa51c572dc73ef642a4eb2251d8594a267f7ef91dc952c8818aadc","src/features/gen_DomRequestReadyState.rs":"367a5ac277f4d98f624fb1a1593811af7cea79472dd48e602495cb6cb643955f","src/features/gen_DomStringList.rs":"d30200e307bca8fa831d99957fc24cef76136eb676dd29f40ba22ee9272a34f5","src/features/gen_DomStringMap.rs":"2d474c7764f318dc1dfcd5b9fdb17037553029408568808d33c2bbe71ded6b5d","src/features/gen_DomTokenList.rs":"c160a6e1976fc4bf6d6e962ff6c48b2852c11478a3dd88ebd66d1fd810fed633","src/features/gen_DomWindowResizeEventDetail.rs":"43562a08c34cce78a5344ae49c4657746847a7999cfa7d7b0864aac6ab6b69c2","src/features/gen_DragEvent.rs":"3c5775532cbd16c0449ed5c4e1ba67ff7aa20287af985acd2c758d2a15b19fe9","src/features/gen_DragEventInit.rs":"19f5d71659b700c109e86ae97c64d1e635d2032570cbb79ea647a93d37664658","src/features/gen_DynamicsCompressorNode.rs":"7a0e064247801084ddb40bd49c43ccbb59a857701284d660432d859d77558930","src/features/gen_DynamicsCompressorOptions.rs":"3dbd672a5fe04462e2f4791a73be71ed1362fcde5631c4d81db26c04d83abaff","src/features/gen_EcKeyAlgorithm.rs":"2686acbcac6c4a012233131f227465bd445f450540f71ce789f62063e0dae44b","src/features/gen_EcKeyGenParams.rs":"31feb819f181b6e9fa15bb70bda598b8a110476a4bfaea9ced0432539d6b6d92","src/features/gen_EcKeyImportParams.rs":"125157883bb223804d00e3da49891145b4d6745d6d34f5b6389e8bab4aa8a6a8","src/features/gen_EcdhKeyDeriveParams.rs":"1c9ea7ef8db319cce9f093f0bdfaac2b8574691974fcbc4ed56b91c6dcb2076a","src/features/gen_EcdsaParams.rs":"a0a1f9b817fcc29c014aff1136967587dcce91e8782fac6c588d5e229b59e094","src/features/gen_EffectTiming.rs":"88a0cce51b58c8e9632beef6b4760a52c705474a9b44ca62a4541bd477e1f795","src/features/gen_Element.rs":"af2cd465ae1fb928ce206c550cd47317524f7b84d5f5cf038ca8688bc0c7c548","src/features/gen_ElementCreationOptions.rs":"a19a59ebcc7472f1a8badccd48af411eda5eebc65cc273bcca5e38e946e5e6ba","src/features/gen_ElementDefinitionOptions.rs":"06c4b31b18844a18030d6882c69758f64854f3cd65e970a797fb1f130863d9fe","src/features/gen_EndingTypes.rs":"94d4e8be85aaa2e6bdda06b3a7d0d52772251e3572fe5a276014feb0132835c3","src/features/gen_ErrorCallback.rs":"ebcb8a14ff86e07bdbd671797c6c27d1bcf6f75317696ca9989ecd394121c0f6","src/features/gen_ErrorEvent.rs":"9d4845e4f8ad55cf324f49558697ef5b283fa2e7b06f5041c031d2498eb36a74","src/features/gen_ErrorEventInit.rs":"82f994bf84d5ce6c9788331339f209e67ca3a1b9aeef8bbba3a424d24dbb4dd2","src/features/gen_Event.rs":"85a57dac21d22d54fa8c7e4c0ab5384906be4ebbe79732f49f213928ef2e888e","src/features/gen_EventInit.rs":"6a370121d3a4beac81e792f596c649119f07bf01b720f0fe1a28a97d4a889368","src/features/gen_EventListener.rs":"8c4f39487c62ffc7e6e129618954bf2c1df600dfc604cbacd0957330da611951","src/features/gen_EventListenerOptions.rs":"1a47c82135dec50135e687955dfba86bfdbf636e19b32f5c9a260a4142e7c249","src/features/gen_EventModifierInit.rs":"74cb57e2fda554eabd1c9237c946d136da28f7d0fa82dd548a7f29799a15c796","src/features/gen_EventSource.rs":"ebb0a09b7a110c24f6c3cc161699be2c018ad0d430b9a7e5cd00565f137ee114","src/features/gen_EventSourceInit.rs":"b74bbb9ce4322a82664eab82c1dce9dfe37443507c020ccd53196081f3437a88","src/features/gen_EventTarget.rs":"abb29ba368ffdc31da0afcb2de0bafbcd00e7c54fa252868e1234c66984d42b5","src/features/gen_Exception.rs":"837144fdc010480b6cd1d1fd6a22a46cd3be9043e6dbe27c80461ecb314f9092","src/features/gen_ExtBlendMinmax.rs":"50ec3e3df0307dc9704ae3dce4da22df6a6b348b6357a715bcbcc11bacc9d8cc","src/features/gen_ExtColorBufferFloat.rs":"be87130736e493341fb1ebc7e83d26127c2a449befda1b04fe5789f444196003","src/features/gen_ExtColorBufferHalfFloat.rs":"e1d1e92b3a0cfb48f9575ca9b2cf72e2c3ec25c03f760866b33d5f89327fa255","src/features/gen_ExtDisjointTimerQuery.rs":"463b356c45fb133854838335708663f1e5dfaf3b82267f0d1803f1cb60766b48","src/features/gen_ExtFragDepth.rs":"a1dd524b3428462685c88fba7ea719fa161af32dfc45f053572f5924b930281f","src/features/gen_ExtSRgb.rs":"f0546b101793f462cc5313dd1624107058e6a5b8b61a323b1cd7ff3a57990ab1","src/features/gen_ExtShaderTextureLod.rs":"b4fdf292d87ff7117e5fc415438937bce72b133bc9d6047cf93a1d2e1d0babf8","src/features/gen_ExtTextureFilterAnisotropic.rs":"922ff1acbc4c63844a9a96a61ed8ae5c5b4121a6f02a9af22fadbc45bbec83eb","src/features/gen_ExtendableEvent.rs":"2e3d895a3161d42981073c3d34403593947f4f91ad63ac999bdedcdd15726912","src/features/gen_ExtendableEventInit.rs":"51ffd903fc69ec80dd2ade32e8ee431c5f24e71a84350741fc757de93895d7e8","src/features/gen_ExtendableMessageEvent.rs":"b884972fd494f3dc9fb604a25d8c68da7f277b80ed64a9d54d706042c99b1ddb","src/features/gen_ExtendableMessageEventInit.rs":"5ac00ec99f79437967650fbab53c8f9a0530b9a6078cf18357953a76c47c3538","src/features/gen_External.rs":"67735db3b40fa309c7ae161a3217f7466aafc1ddb498f8b6f436ff43c87cf149","src/features/gen_FakePluginMimeEntry.rs":"034852a1af88f6aee7a09ad88e1fbd4b038c8241a51c968b0e18859546e6ebe4","src/features/gen_FakePluginTagInit.rs":"94c7f9a28744ec2228a228a4c5c3314ddeabbb2f243f9c7ff3400960763a607c","src/features/gen_FetchEvent.rs":"376b035785abf43a50da8e0c6e50e0e02290ef5c124b4ba52054dedbfe0aeb61","src/features/gen_FetchEventInit.rs":"3f66b8dbb281287af3e44f3eff2e518afa492cb5cd1811c56dfbcb664158a97f","src/features/gen_FetchObserver.rs":"a6bbdf5ff0fd4a9e0c7270fbcf0437b96020b421459e598b04cc33738625a201","src/features/gen_FetchReadableStreamReadDataArray.rs":"f6d5706514d3d534c321cca69f2c397288c10c9f603a6ddaeca69412a4c8eb29","src/features/gen_FetchReadableStreamReadDataDone.rs":"632a7329649420291aa4a6cacdd1c318e063ba5d8458d440dcafc65086566665","src/features/gen_FetchState.rs":"b2e213c3eaba1c1b3cdbafb781086be20d447c03fb2a200876c9ea7d70b3e4d1","src/features/gen_File.rs":"2042623fc660593a7da48f125af17be6714d9945e201bba17a239e58f949ac8c","src/features/gen_FileCallback.rs":"e850de14c9efab8113dbe258aa6981d6bbad87ee1f9ef19f245664fb38dff348","src/features/gen_FileList.rs":"b5a770020d9db6b813aee1fa432e7ec340be66b9b2dd5da160f5cca9b67c2fe1","src/features/gen_FilePropertyBag.rs":"68bd6fedf42d0242b307130ae667687439528a7c0024750f30cd5a43c3edafa2","src/features/gen_FileReader.rs":"19a99fc05142317ed793c975f5bfa815bdc7ee996e0492ae511720ed32617cbd","src/features/gen_FileReaderSync.rs":"b11856194e4df09c3bb0c5b5a9001e24d984d50c874c9a142c5972b618e5326c","src/features/gen_FileSystem.rs":"c2f5d295484e733e378a0f4372722e09ad6308df1103f1b11152b1807958de5b","src/features/gen_FileSystemDirectoryEntry.rs":"55c7f7659160b3beefe0a7085a951da83f202674791984d9bfa3455d3de1627f","src/features/gen_FileSystemDirectoryReader.rs":"53fd042dc13ddd7fa92032cab53d231433475ea6e236e4dde10c458ccde03ded","src/features/gen_FileSystemEntriesCallback.rs":"3eee6a71c5c6b6b20e38c6962178df4d4175af79191ac408d24be96df3755490","src/features/gen_FileSystemEntry.rs":"c68034dda8059eed104dee7060a6ddb19405047fd3ad7a938588bd93dc76948f","src/features/gen_FileSystemEntryCallback.rs":"79bfb9079ddb645bf8f4456a2c13ecf7fb670f4a643dc0ea677eaec23134e70d","src/features/gen_FileSystemFileEntry.rs":"7bbe45d02738074e44af5deda8ee47bfa311ae977e79214eea76c80c2ef659a6","src/features/gen_FileSystemFlags.rs":"21f4a25890351044165fb9dfedebb2fa33fa2967a6c13ad01d4acb5ba88b9233","src/features/gen_FillMode.rs":"7111688961245836afea8e8809f7be47f6b0b4beec11406824413884e1b8bd0a","src/features/gen_FlashClassification.rs":"3a2b85763b5c06ad91caf025e8e0276c9600139cc7c4a2acc702f3c5d54b5506","src/features/gen_FlexLineGrowthState.rs":"f161325fd49e735cb8926d7534a724304ad98cdf766754c752728e5c603c3d75","src/features/gen_FocusEvent.rs":"967ea03c5a6a2698b8f51f2d3e0b03a63556629a27d6a660a8e7897a09119553","src/features/gen_FocusEventInit.rs":"b27f492f2d8cb4ae64ca97b84c3301bd2e1855f82e5e996e6816b1d68009fb2c","src/features/gen_FontFace.rs":"5a494ad9024adfb36c05791a52754551bbef2d0d4e566026e454568b61828ce7","src/features/gen_FontFaceDescriptors.rs":"ac5da119e3fe4e004e0f1b483c272d0fcfcf50072b0fc715099dba4ca8a1db6a","src/features/gen_FontFaceLoadStatus.rs":"bccd5593d78c4ac175466b13676f48b5e1f13be04cd441dfff053699ce39a8b4","src/features/gen_FontFaceSet.rs":"143ef500e0b8ddc65aa453ef9eafa430347657f1753f13d9eb55ba27d0bdbd3f","src/features/gen_FontFaceSetIterator.rs":"720bc1538b60de6717b4d19ca076e59192817881de28e952b3c4d2e39ba2c2ac","src/features/gen_FontFaceSetIteratorResult.rs":"caaf836e1d04c61ade11997c9b98fc35fc505eca8072b786d97c71c881c315e6","src/features/gen_FontFaceSetLoadEvent.rs":"4b2f4c852d01b0c74140564802fec1e814f25a10834b80cc91632feffad26c2d","src/features/gen_FontFaceSetLoadEventInit.rs":"e9cc802bba0f183ed5d8e21a05eff720f7fd50ebf61ff6a9f4e58ec5844903e2","src/features/gen_FontFaceSetLoadStatus.rs":"d48669f3d80a625345b7ff65ff85c6acd3cc12166c38d3fb41d017b350ed6891","src/features/gen_FormData.rs":"f2418ab446cfc6bc57937925673616ece3ff42b1759d19d222b8929707fe9c51","src/features/gen_FrameType.rs":"824c844e4c85e05d7397df6817c1ca469ff809ccc87508642d65b1d02f541514","src/features/gen_FuzzingFunctions.rs":"808c99360b3f71f1f3943e92a0b15045e5087e061428da746e0414228c0c06a9","src/features/gen_GainNode.rs":"b369829a5fd3693cd29b3f1bc12d8b2daafb8062260c448e9a39a8eb5f681344","src/features/gen_GainOptions.rs":"904eae2f402b365efd1d3a075a1ca4966034274e8f8ad25e0b390a74b4c379b9","src/features/gen_Gamepad.rs":"7f56e49efc09e4ee6614f17f96c773f9abcd8ca9be2c2a2fdfe5c1ace7fb7647","src/features/gen_GamepadAxisMoveEvent.rs":"c0a6d0534c40785154851b978a2dc7f080ec338bb5fefb23ecc1233bc26989cb","src/features/gen_GamepadAxisMoveEventInit.rs":"9cb79625e4f7d82248e017a5fe714ee985934f0469423e7c8162d38c70c08895","src/features/gen_GamepadButton.rs":"548f6a8b1187bdbec307f2e0d22bce32a2b1aa53c5f961980b18010111fc3608","src/features/gen_GamepadButtonEvent.rs":"cbca5736b9b80943cc42912f798f1309e6f784738aab71fc7afaa44d4a2fd9c4","src/features/gen_GamepadButtonEventInit.rs":"e485fc32360b76e13c1d277c560ed9a0ccb7379aa07783ef0f200a8110539eb1","src/features/gen_GamepadEvent.rs":"e2302d17933334bb93ab33595e4924946691f64969cdccd2fbff3ca7067e7cd7","src/features/gen_GamepadEventInit.rs":"358e3579322cb6132876aeb4405f764a7887ea8bf85cc3d79d252c30430ae353","src/features/gen_GamepadHand.rs":"47ca33a4b565c04780e20e28293774c879c450f674d8c4ef580fa7cb5cd312f5","src/features/gen_GamepadHapticActuator.rs":"a3691cafc6d338a5e64adf2692323a94f05edd1f3a559ca55b4ef76b757dd25e","src/features/gen_GamepadHapticActuatorType.rs":"e4ab6a38add4c8d6cffd7d9ed85cc78ea6fa055366210fff0afaa9af8f4aabfd","src/features/gen_GamepadMappingType.rs":"dd3dba7287488999f4d7b67866d5aa8b0e24c8ce175cf08ce25d38779e110ce6","src/features/gen_GamepadPose.rs":"c1086fb98f6bbe750add186e875532511362b3416c5154cef08c64c1f84b49d1","src/features/gen_GamepadServiceTest.rs":"484968cced13ab6cd026d488221ffb52f4822b5db46803f56798a1fe11926f23","src/features/gen_Geolocation.rs":"9097a110d7ac379d67e7d701f9b182b7e4afc61e8937b26c56574420e063f698","src/features/gen_GetNotificationOptions.rs":"719ea1cbf0b2001447a61317baaf50b35cb48caa872c2aaa308b3d84630791d7","src/features/gen_GetRootNodeOptions.rs":"21bafe1a38b129599b5621e12009b4712da5e7f46445f4f40273f4d10e1bc02b","src/features/gen_GetUserMediaRequest.rs":"5f62a38161cf1722d955fdfa934d57316bd5689707e822220638eab13e1448f4","src/features/gen_Gpu.rs":"bfe458ce270d2796030c2026f12c5cdad6fa828f40fd0037d685a4e285ccde53","src/features/gen_GpuAdapter.rs":"04d002e43ef4d27afc70fed135b5c24b7efea496cd1590c542a2c37716692cdb","src/features/gen_GpuAdapterFeatures.rs":"f760d4b48af93ac5418d10001b96e410b40c4fd989eaf555b09786479d4ea514","src/features/gen_GpuAddressMode.rs":"0e7391d525dd69e5b8549e90f47711df6fcbe78f3a04bf6fa556f9c6a4da1959","src/features/gen_GpuBindGroup.rs":"be3727c3d451a4586ec525ad8dfdf9dc17498d7bb65848e77d7ac7dc2460e688","src/features/gen_GpuBindGroupDescriptor.rs":"ea9b4bfb2887cf5e24ff846ca54087eeb1610af644fa831a8989c5204e051d96","src/features/gen_GpuBindGroupEntry.rs":"d85e0bff82116f4f58df609f8e6e48894a3196cc7d505c78e9956ab36b3d45cf","src/features/gen_GpuBindGroupLayout.rs":"b68d0f9478408eec0d0f289c14ddf18286ae7e857990f87494480cea3ca834d0","src/features/gen_GpuBindGroupLayoutDescriptor.rs":"8b4543804842e0eddca59861cfdfb8ca17fe213c8525699c7e5ece6a7b74cc19","src/features/gen_GpuBindGroupLayoutEntry.rs":"fcce85fd699f3384266baab333425dc83f0ea08efba273259522698965e6e24f","src/features/gen_GpuBindingType.rs":"3fd11deb28ad4eb9e039c4437860d8c28ea1cf37d03d129aa80f75bb6844ff81","src/features/gen_GpuBlendDescriptor.rs":"b0c1166e5aece0d4658c3bef10749e01518ee9ee5d5c3c50d46d5a8fe056ba62","src/features/gen_GpuBlendFactor.rs":"249f659e96c0e2fdfefdbc173413dc18f974cd99fa464a9dac176e20350edd27","src/features/gen_GpuBlendOperation.rs":"c97691cb456ebb9d621ff01e68dd1ef05064d240261345a2ee1f806a41aed17c","src/features/gen_GpuBuffer.rs":"096658b4a4cd39bcefaf5d372b7cb7e0ac09cb7c74c6783e261c2eb41a516bbc","src/features/gen_GpuBufferBinding.rs":"98c4edf9be6a483421bc16db2b4688f423469dce647e10bcebb76a6b7bf2fcb6","src/features/gen_GpuBufferCopyView.rs":"fcdbe8a9712df9bd8a0ca46592b9758eaed0da9658d611dcea02fdb1c2bf04da","src/features/gen_GpuBufferDescriptor.rs":"93baee132ba9312281baf257310216da8cb4265ac2b6ce9ac371e544b9c80314","src/features/gen_GpuBufferUsage.rs":"1027ee869b8b8d1256aaa5060930526e40fb083a16af1be7bdab34879518ef89","src/features/gen_GpuCanvasContext.rs":"ed9e175a83210ff859606e86ff5796909c49fff3042d2f3d4e358e9777421c16","src/features/gen_GpuColorDict.rs":"da00e9bcfe7561d0f49b63579602fe49fffe7fd11d09687a79092ae2726c734c","src/features/gen_GpuColorStateDescriptor.rs":"9e7af0793cee79dd6c20a54ec1537bba6316c456773bfaab151d651e44126cab","src/features/gen_GpuColorWrite.rs":"287e3dd7bca71f77ececa750bee2ddccfc7bacbbd07796eadf52daa4fb0673f8","src/features/gen_GpuCommandBuffer.rs":"8ea53a734c23d8ebbf5ef12985e32f95ce9e313d69497e870f0a2eec4148c81f","src/features/gen_GpuCommandBufferDescriptor.rs":"d00737abcd615254e31a85111ee13dd8315e016f3793e7ea3cee423ba084d1d4","src/features/gen_GpuCommandEncoder.rs":"a05806757b71259723c7327798cfe9c7680f350654cff80b8394a09b0fab528e","src/features/gen_GpuCommandEncoderDescriptor.rs":"449360310b072f3fe17ac2b43f4a2c99370ed283499838e4b49102c1c54fd438","src/features/gen_GpuCompareFunction.rs":"74f62d9f220fb00b69bfc444c92e4dfdc8ba24b55d2419199bbb6c4ddfd4e401","src/features/gen_GpuCompilationInfo.rs":"6cd0c8de6e0c3e75b51c71258daf0675e61e0225e1fe8731ec7c761ae056fdf2","src/features/gen_GpuCompilationMessage.rs":"c5fb0cf36bad55e8a06973aee090a6b607249c8c8217cba45f502a2b30b7b71b","src/features/gen_GpuCompilationMessageType.rs":"1b40c435b88c5c448aebf82903376bb3dfe418563bf7f818de0ebea17be27347","src/features/gen_GpuComputePassDescriptor.rs":"a903c438ea0eb7e70b2f00395d10a9bbc64ad2d82e391b07b734c693463ad6e5","src/features/gen_GpuComputePassEncoder.rs":"476bb588a7f89e3fee9e43711cbfa25544a281729f92a57afec2ad94abff5102","src/features/gen_GpuComputePipeline.rs":"6b8d7763b7b9ed18ff56ce7cfb2e652818d1204eb034a34a8dddb2ff38a252e8","src/features/gen_GpuComputePipelineDescriptor.rs":"f96ded298509800f2e381bc062dbe75d025ab49df4259c171b28415b6b9d5560","src/features/gen_GpuCullMode.rs":"9c444518620d79ad209fc149d20ecf5e85f99f9f4d9743ccd6bf26f718a800ed","src/features/gen_GpuDepthStencilStateDescriptor.rs":"7c515fa96eb0a828f2069d8244789aa04429c1effd0067b6c3e609b92b41b46d","src/features/gen_GpuDevice.rs":"71799e0194652aeecc44eedad065ee8d6cdf66c813a9cac6d9a311037ac2df1a","src/features/gen_GpuDeviceDescriptor.rs":"e58706551733c37128dc585ffa64dcf3f710194da42f179a81e0fff6275bd715","src/features/gen_GpuDeviceLostInfo.rs":"d8a10412c11aa35c4502baae9bfc9ece898a03cb283fc7eb374737634abb6a1f","src/features/gen_GpuErrorFilter.rs":"4ef11fba30662098baf2786bb2ea73c9270858ed7e345602cb2c797140583589","src/features/gen_GpuExtent3dDict.rs":"7e0be5e2278b21dafd3a16f0413f080437bfdb3a2f84234b4a33dab11674de16","src/features/gen_GpuFeatureName.rs":"40b44f92cc76932dcab555ba2bd9c3065dcc68c5113bc6380f054a78e6239e9a","src/features/gen_GpuFence.rs":"60626c06900a410ef9b75344515dbbe84137b79962747c27bb655d25b87ec9e6","src/features/gen_GpuFenceDescriptor.rs":"f039e4ab7e130b052e6b519a4baf8b65ceb3bc01eb860e13fb43db85f23020f9","src/features/gen_GpuFilterMode.rs":"9625970572ffc19dac0de7fd1b9d74f30f684f6ef68dd22557cc8e711fd8e4ef","src/features/gen_GpuFrontFace.rs":"270095ca143d38f2c292de31b4845717432a2f2ad68ffc6e18f261dad3e82c4f","src/features/gen_GpuImageBitmapCopyView.rs":"dcb86362e429b9ddfd205caeb38d6477fb6a894b8bc787aa13f91c7e17d97d32","src/features/gen_GpuIndexFormat.rs":"97a9383acf35e56180d0ba3ed18e3dbafe3a91244417579a1b767bb5f7411e65","src/features/gen_GpuInputStepMode.rs":"ebfd10d2e569992b9415c6555add6fc016590c1fd1f5ff943d7fb1b02c2e00c9","src/features/gen_GpuLimits.rs":"13e7e682297d553612442e9a1943a3c596adf470ae2d7a5d45f0e6b487c7d461","src/features/gen_GpuLoadOp.rs":"f476752bf5624466b0b81e7e26a58a57225dc0bceece22d81d6f2aef4e2bcb2e","src/features/gen_GpuMapMode.rs":"db416fcf8e221b55349e1cf0e846c335a80b747f878c3cabeee7eeca06dc12e1","src/features/gen_GpuObjectDescriptorBase.rs":"6d050ceee632fd9bb5eccabad0d58217aafe8a7fcd210556783b5ac6eaae44f4","src/features/gen_GpuOrigin2dDict.rs":"12f1988ea907a1644387daf900403c1c2055c1868e93ef729c7544df22da4caa","src/features/gen_GpuOrigin3dDict.rs":"5588fe603edad5db48a1f0d2f4efe3f83982473e3a14c3837a5525a67c89b10e","src/features/gen_GpuOutOfMemoryError.rs":"125e1662f869cd02d0118514a01724c4dcb933a2fb51e1f4cad3518d9c63ec63","src/features/gen_GpuPipelineDescriptorBase.rs":"28e83a09e89d94f79ca80b3bc820854176a94f73f007fc93ec0f8ee3094323d4","src/features/gen_GpuPipelineLayout.rs":"ab277ba99eebf321f6107d8058be848252601a4c5b0e49fce70bcd2d0d2e82f4","src/features/gen_GpuPipelineLayoutDescriptor.rs":"5a8cda8ab1f9fd3390ecb5aef70eda6d007a628a013662c0a093bad2c9531c01","src/features/gen_GpuPipelineStatisticName.rs":"17d4d8f70478a45a98f95cf69cd1a4edcbcb16b4c5281fccef2d0bdf9108114a","src/features/gen_GpuPowerPreference.rs":"dcac329ff410f4bbd7ddf9a4f8f172ed066f9990f44f9928b5911c8859ab9f87","src/features/gen_GpuPrimitiveTopology.rs":"518777660c5885ac469d7caf8b30c397ebd0001cc61303ad6bb94d443aea0fcd","src/features/gen_GpuProgrammableStageDescriptor.rs":"d0b80a7eb042f9f41b1b0ddbdf39685e6b4bf5d87d8b8a0a99471e53b94d03d4","src/features/gen_GpuQuerySet.rs":"829b8a0a846e1b17a97bf6c739e3d637f1d02ac95ee65cf1c2a9022e21d17ee4","src/features/gen_GpuQuerySetDescriptor.rs":"feff35a852500184c3e3c1fe75dd840da332b9646fc5a17e3258b7e12d1ce01f","src/features/gen_GpuQueryType.rs":"cf60e7aac79617e430eef1e5f28a7e20695a351412b1d1845d20537f5118ee19","src/features/gen_GpuQueue.rs":"cfd53d6a22b272ca140c408fdf0679871eb74b620710d1583c75fe920f1aa284","src/features/gen_GpuRasterizationStateDescriptor.rs":"c6177f859264e7459ada24f2e1d9486bbdb8c09bd9d7517d1abf8b5d7af018e5","src/features/gen_GpuRenderBundle.rs":"7123168a7e8f7c7fbb845be6b91c9577cb87882602610e2eab0ae1d79903a01a","src/features/gen_GpuRenderBundleDescriptor.rs":"e364c17d400420157f9b6a7318f1fb4a33713f51818d303bced534fc01830f2e","src/features/gen_GpuRenderBundleEncoder.rs":"a88f6922f4215d3e9b7345220cecde23b92955ccab7cc4ddc402447822bdda47","src/features/gen_GpuRenderBundleEncoderDescriptor.rs":"2c876020d5fa6f80791cd5c34ca5c59745ef4b2d80e698b3cf18a18ee48677f4","src/features/gen_GpuRenderPassColorAttachmentDescriptor.rs":"50cc837ed3b6191076363a2b9f7bc754ee3297a1073bc36e521ef31032288a55","src/features/gen_GpuRenderPassDepthStencilAttachmentDescriptor.rs":"e690910e4b5691bf19d39ed9c2d291d73dbf6b665fabda148ee88d88201d8fa4","src/features/gen_GpuRenderPassDescriptor.rs":"86622017970cbed2ac539a471dfa156c6a61c9bb1747842acbf5358e5f51ffef","src/features/gen_GpuRenderPassEncoder.rs":"17de4b920ba6da0104354e8c802638bbff9f03fbf997f78417caf621a26ec0bc","src/features/gen_GpuRenderPipeline.rs":"fc4f77b58dd0b6e03459826f9e441f29511572c52afbca79f904a17cc791dc3c","src/features/gen_GpuRenderPipelineDescriptor.rs":"3913d1969f7edcf35c3ad4f1878e0720aaca422ecedc4d4efbecd729f79dd10c","src/features/gen_GpuRequestAdapterOptions.rs":"783b02a911f774e75355aadd9e9b403a067119e2fb68c23a46f8a7a3de536ce7","src/features/gen_GpuSampler.rs":"310714f350252367df2c01f05238a4a0b730466e17d93ecfbe301b004cd3cfc7","src/features/gen_GpuSamplerDescriptor.rs":"b4385dbe7718f24cb4fac357ae47e736882a40bfa2346abff5ca48c19f027d95","src/features/gen_GpuShaderModule.rs":"b1bf4a3740b9ca93266693fe9943f8bdd0347e8a90fde51df574f62c87ec126d","src/features/gen_GpuShaderModuleDescriptor.rs":"87ba4c028f41ede4c205e0327cf6775a6faa3286755ddaf3dc24dc257c65bdd2","src/features/gen_GpuShaderStage.rs":"8afc5527a158169fb6d75936736cdd928c340993fe2bd383dc8393195de7694b","src/features/gen_GpuStencilOperation.rs":"81c58a42a567decefc4b88cef33b632d86c101d4de95ee40b2da3144c831fac5","src/features/gen_GpuStencilStateFaceDescriptor.rs":"534626ea9cce0b903a905fccc6b4f6e24fdc4b7d98ad682213475d67c534c9f0","src/features/gen_GpuStoreOp.rs":"7e850ee144b4595b4edf47caf7f797baf97c6e1821d0673acff211040d7848b0","src/features/gen_GpuSwapChain.rs":"150bbb454c969c3c70e6196789d8ab15768037a70f92f3041640d4ae53448ca1","src/features/gen_GpuSwapChainDescriptor.rs":"fd7c2fee8dac4dd96494cb7e6f6d18672bdf5de1e2f348ac3e70fade3fe1f058","src/features/gen_GpuTexture.rs":"c3a6b7fb826511df353d591b0d158b0ef13b28126f6960114eb05d89690088d8","src/features/gen_GpuTextureAspect.rs":"f78304891f684d9e2debf954b51a0777efff4f71812570f24644a8fc8f782d3b","src/features/gen_GpuTextureComponentType.rs":"4481c519c70af920ef19721b5778fe268f27e4b4a590dcba22ca5ba1ac04f082","src/features/gen_GpuTextureCopyView.rs":"078508cbc186d525dadddedc0aabb9e3e8a240468491ffaee1cce5735a8304f5","src/features/gen_GpuTextureDataLayout.rs":"ff549c023fda93857e20500c86fa3e5169eb761ee02a6bfa418f21a545f10a14","src/features/gen_GpuTextureDescriptor.rs":"31b210ad2f96c06b158365b9f4d7cb49d18652daa9869f1f6c2e813c5f963bd9","src/features/gen_GpuTextureDimension.rs":"014c0e2bbde08e1de29ddb2de71319bb6f51eb3368332f8ee988411d4833a3d0","src/features/gen_GpuTextureFormat.rs":"bf7df9d69449547ed35b28289258d98a1679cd377cb3ed40606b060e42108c52","src/features/gen_GpuTextureUsage.rs":"b7b6e886431fa86b3f29d0d73b2eb1d664444866bf9e3762bf0faff602bba065","src/features/gen_GpuTextureView.rs":"bde860085c501aebfcf9aed2632e161681237a44d0e29ac8a2877592bd4b84fc","src/features/gen_GpuTextureViewDescriptor.rs":"d05bebf7a95b78d6955a93ba5deb00c2218ee11bcd23c32fa28fbd13a0922421","src/features/gen_GpuTextureViewDimension.rs":"cc408d7938eb88579c597fccd07d1ee6d95b7f54ed59055ebb931a980f28e480","src/features/gen_GpuUncapturedErrorEvent.rs":"a5bf4fa2efa218a74d82d8ced6fe59208625896e8a9a54a24227da5d682cb6a9","src/features/gen_GpuUncapturedErrorEventInit.rs":"832ad11d6fb0286a384a65f9cb028c98634ad151d77f2bfcc28ff4f950c2cc44","src/features/gen_GpuValidationError.rs":"c0383558710066ca5c8b299382bae80b92ae85f63230e5acc5200c8ff828f77e","src/features/gen_GpuVertexAttributeDescriptor.rs":"fec9ea75e3629c0852c9bf0bea9c7f2714e9b0caec9bcbc807b1b53a6f6359f8","src/features/gen_GpuVertexBufferLayoutDescriptor.rs":"20992e66c4dd051eecca4c9b1d0e9af474501d1e3482528839ac7c48e5e9b728","src/features/gen_GpuVertexFormat.rs":"b60dbd85807a510b3f56c622de773630568d44cc0824deba9a9abb7a15013dc6","src/features/gen_GpuVertexStateDescriptor.rs":"de793a6da4c5c72510fa04fa62962dd353cd0c686b2f1e26be1aeb801aa559eb","src/features/gen_GridDeclaration.rs":"cb62c8a5c1afbf831a6fd209cdf5a4109d97dc6c58125fa643600e7093a8be11","src/features/gen_GridTrackState.rs":"56a37325cf0673adb1ba275a4b8b46476a5dd280c6a45b67f2bfc158cf532cb0","src/features/gen_GroupedHistoryEventInit.rs":"9c252dd0d732b4c2ad27ac86124c37b2cdffa0ca6b82eaac93b88c1e40b044d7","src/features/gen_HalfOpenInfoDict.rs":"5e23184b313bf7cdd0621626505d65645de817628b0951f42375732b5bd75f0c","src/features/gen_HashChangeEvent.rs":"9249ee9383295fcede2206b0442f9e687e8e455d7085ca71e85f44350813124e","src/features/gen_HashChangeEventInit.rs":"3eff5068de3763023a366c13f7a4e71d758df64c0a20c4d740cb46edb0c7ca88","src/features/gen_Headers.rs":"0b448fba408c7ef1b8becca98d4518f3fcf6d4afc5c68d4a78a9119579000bac","src/features/gen_HeadersGuardEnum.rs":"a1073aa29b5b2ea585bcd9bad4d6418a8bb9a5490a5785c4f49531f7b98023fd","src/features/gen_HiddenPluginEventInit.rs":"5ea35e8f0bb3945debd92811fcf7a293424ab32af33cdfb686148af652721e8f","src/features/gen_History.rs":"16a1dde15ab3f7684ef1da38b4d17bafa157b5bfd9c1b979d083608578144ebd","src/features/gen_HitRegionOptions.rs":"02305e996a1f552d2ce903b777a41a76e1c4e81021c950326a21ce3fda07c345","src/features/gen_HkdfParams.rs":"41f1dfbc70c0208530525229fb4716f157ce334d78b4a17e8a2c2d9fa067a1ef","src/features/gen_HmacDerivedKeyParams.rs":"e148d6a7498fe71e4ca6033e66528152bb40f6f11b86d97373758a51cbcd5abb","src/features/gen_HmacImportParams.rs":"9be9a626fe7799a0de6fc72ae77de68124c6bba0c0466895ecd6ee729a76c5b0","src/features/gen_HmacKeyAlgorithm.rs":"e62ca977d716f2857c0b3f794c6aba51757cba23392c3ba2a80c3380757764b1","src/features/gen_HmacKeyGenParams.rs":"8637f60c6bee71c96edf83041e3f898a4bab0e2d23488307de20953db057eea7","src/features/gen_HtmlAllCollection.rs":"b8dd381351ae53ed3134602660094d3fef44bd4ac2e83e13aa983b939b918ef7","src/features/gen_HtmlAnchorElement.rs":"9eb3acf526d282a720b314c78ac58fa01043321b457c3958d9ad444d150591ae","src/features/gen_HtmlAreaElement.rs":"c8cd2827b924375f5b3782bc1bcaa449f40267ebb643b95799bf43658a37a112","src/features/gen_HtmlAudioElement.rs":"f6b2ab9872c2914c61df93c5a025079c572f88ef9a9f311f6fdfd63f22e55cd0","src/features/gen_HtmlBaseElement.rs":"60747bb4ccd2f35ef71a9f92cb47dfd13545aefdd37141f734a2ddd6154fc03b","src/features/gen_HtmlBodyElement.rs":"31d56eb35d7f80a9a1d00faf1ea163590eb82dac7f736e93a21d790a892120db","src/features/gen_HtmlBrElement.rs":"0a68a1a4f6fcdb06d039093f5f9c2cc3bf5d815df21366b6aa3e27621a10691a","src/features/gen_HtmlButtonElement.rs":"76d249508a1b6f2d75b400509ff313410cd66bb8d927c4c78564b266618f5503","src/features/gen_HtmlCanvasElement.rs":"5258e23e9708ba994cc2bb31e79ad5fa0a8c52dfdb1b1ed488704eab7c5f25fa","src/features/gen_HtmlCollection.rs":"c683e1048703fae2455454eb316c240a0f4bf8876c3e5bd83f844057705c4e72","src/features/gen_HtmlDListElement.rs":"f8c2b9185a485568e31c8654c42215165eb15e0b2ccc39348157338c287c00f7","src/features/gen_HtmlDataElement.rs":"6ea32dd938582f00ff20bc78af8a2b7a7f0c2d0b28fbab5ab131ce6f831c0062","src/features/gen_HtmlDataListElement.rs":"c1bd084146c933a88e22c6386cf3e85ce1b532a6e6d13ba478f7ee6e8ee85f05","src/features/gen_HtmlDetailsElement.rs":"ea140261b2bbf530a06d6c4e16822e066dbafd0d88ab96032ec6981f43710d95","src/features/gen_HtmlDialogElement.rs":"68bdff6eea8e73c19fec2bacd44ef3cdb29a6fee71bf497807ec9a18b2a657b4","src/features/gen_HtmlDirectoryElement.rs":"4720fbdd65d0534c05aaa27d3b26c4912cb8c84ca79981b67d5f05d00af66c21","src/features/gen_HtmlDivElement.rs":"c3a862c709816e06d4d4d29c6a5b9ca5fd8e9069ed0fa0d2fef21da095512e4f","src/features/gen_HtmlDocument.rs":"07fd8fdc3890d9a2f15786739892df59609d699ed3ee2731aa37aeffaf1f1b85","src/features/gen_HtmlElement.rs":"bb1b4f04709031bfb4560b8261ba1e18709107ffe6be80bc2a46c2bb1de722da","src/features/gen_HtmlEmbedElement.rs":"854f1ef3e2ad614de0d6c25d93efc748698b58178295cd6a99cabe34e18791b8","src/features/gen_HtmlFieldSetElement.rs":"7ff26ece40ff9f74e55134c8267a95ba771861eea5695209d969f770f12e205b","src/features/gen_HtmlFontElement.rs":"e2d46e16fd2330e3003b92c895b86e36bf1a382160d8c6bba2a62c8b7284b140","src/features/gen_HtmlFormControlsCollection.rs":"456a4851aa1924eb320330bd65f158d3a986e8ba1522e6ed18bc0895717a890f","src/features/gen_HtmlFormElement.rs":"8ecec4caf12751a784cfaadd44d476979fe6b1e152a108aff475c10842451952","src/features/gen_HtmlFrameElement.rs":"0eb15066928fd1524f0facb17813db9a3b866f209d8d256d4712b1572abe32e8","src/features/gen_HtmlFrameSetElement.rs":"694f2bfc231f75d817083fc7054abfd40b250c51adbf9b82b4331a46c277867d","src/features/gen_HtmlHeadElement.rs":"5d6e63cee2f7025b891a1178c408f4b18405420fd56478b0c23a6aa1473a4f01","src/features/gen_HtmlHeadingElement.rs":"3c62d74812f65829da4284eb00a9df76a0652c41ee2d25f3bff06f95e03d68dd","src/features/gen_HtmlHrElement.rs":"c4f315cbcc4632780deee0bd6478640db7b74b9cbe317f56c58f416971113032","src/features/gen_HtmlHtmlElement.rs":"6f43098fbc7519d578f55cf20fa1520ef3223891486c0941836218e0ee99a84c","src/features/gen_HtmlIFrameElement.rs":"1f620bded333088f76dcb924ac73e7777450389c6e224d814974a15149965d76","src/features/gen_HtmlImageElement.rs":"db5085d2d595d102604b9d701754a28c4f843a2ceb49168d3c4e2bd51fcb31b3","src/features/gen_HtmlInputElement.rs":"16834b39e37b138a4490c9d66d9bd6ceb0c1715a63895c2ad1831615402a0f3f","src/features/gen_HtmlLabelElement.rs":"457c5984c9b4da0352150c56459e4c27f89d609b5c3716ec8dd4beb0a171126e","src/features/gen_HtmlLegendElement.rs":"0815079e45df189b5675da3e5181e9aa7d06e24e09571f3625f72559f6e20779","src/features/gen_HtmlLiElement.rs":"0d6facfb83b8e3d7421edd43fdff831f45311d70b5aecd6e24ef5860f6b7031a","src/features/gen_HtmlLinkElement.rs":"eb2ccd5626aff271f3296055668dbaeee48e13ca2f922c6c51ce8bab284dc298","src/features/gen_HtmlMapElement.rs":"895960d6223ada62ec2d3af14d1f4456dfe027cb3d2234f704a3d050f94b7dba","src/features/gen_HtmlMediaElement.rs":"f92c3700587ff98aaa7d38d1dbf9a5fab89d23856314e779b8796b73a15d4b36","src/features/gen_HtmlMenuElement.rs":"a73ee6b2bc999df77bbc82049975c13055b2ff7aa562898d4349f776d3eb9442","src/features/gen_HtmlMenuItemElement.rs":"c8de905b47a4c0b542bdbbe6ca53d8f1174508962d5c22b77b51ff4dc7b4541a","src/features/gen_HtmlMetaElement.rs":"baa028e5c20edf56e79eb1efd10319f3904e253182d1b468bd5721f552fcfac1","src/features/gen_HtmlMeterElement.rs":"192520cf268f16c2e78a54442e14b208a61baebfa2c8c67d07c919ba3ecaf8a5","src/features/gen_HtmlModElement.rs":"3caffe30ad1ce19dd6e4ddc0adc2104235ad5c284311296fc88984e33c17c015","src/features/gen_HtmlOListElement.rs":"24544269a523bf4ec586c9d052d22b8cecf77b8b303299a40a85356e9badad8e","src/features/gen_HtmlObjectElement.rs":"8ec094b1627fe63ab7a9fa640c7403c389234921d53a6c143a94403c6c7c6450","src/features/gen_HtmlOptGroupElement.rs":"eaf398dd5d20695c61f1c44acb581313a196124cf58b121ebcf43bf6a7557852","src/features/gen_HtmlOptionElement.rs":"ae4ea59257f6b7d76e1f4b2541e0bfb8cd40a5843d83f4b4bbcc24cdfd37929a","src/features/gen_HtmlOptionsCollection.rs":"445546270b5af22e21ecffeee547ff6db5394a0c63f412ad0f1f5a5feb3d9831","src/features/gen_HtmlOutputElement.rs":"17823a660a41bcfc7be5c8e119f7cc4fcd1d81830853ab9e95a6b1b6350544cf","src/features/gen_HtmlParagraphElement.rs":"889e6e908f00f75ec4b27aafa6a9642987d3522a1dbf60d960b6cfc647b779f3","src/features/gen_HtmlParamElement.rs":"ce017be1047df3a8084e149343dbdc7754e86e589c8825f55bc090978c78d833","src/features/gen_HtmlPictureElement.rs":"22539f8c05d4be0f936139881df8553c0c9e50fb34e24b20b5e38adf3a7601ed","src/features/gen_HtmlPreElement.rs":"9c34cd1cc9fc79f9a6b5b30e5d7457b72552f3e2309f72726e61cd68331b0476","src/features/gen_HtmlProgressElement.rs":"6e43a1b9c29242b8873d4a1e23c9db3ff7433a3920aac63ca1ff49aac4cb67f8","src/features/gen_HtmlQuoteElement.rs":"4eae1d1edd38c25050b9162f9581b859e6e6349028dae4a54aea9a0cdf20f2fe","src/features/gen_HtmlScriptElement.rs":"0d2b8ae4410a4f9d4406f59f4d56a8067d81f528ab28f951bcaf322bb9f98e5f","src/features/gen_HtmlSelectElement.rs":"c0f9e48072c495b3c8d614139544179a7364d87192b571ab2eb17fa322e0190b","src/features/gen_HtmlSlotElement.rs":"0a7144137e3d5fa672da5b71b2960e7c72935d3f663581ecf016188ecb18b79e","src/features/gen_HtmlSourceElement.rs":"6725b6629f2d5d5261f123bafbf7a049d9d0e1e8d5a8c912915416d438eb0df4","src/features/gen_HtmlSpanElement.rs":"0ebefe71eff86c40b98be070c878416fc91bcbcf0d81c0e92a73b31d7ef66552","src/features/gen_HtmlStyleElement.rs":"e33b7638a202285b0b1bcbe02886e84c2ce766b4490f1a0ee0db04fd9325c980","src/features/gen_HtmlTableCaptionElement.rs":"5a76b44047ed4c23d1651eb19611e85e512c23fb5de8ca17177382b38d672e0d","src/features/gen_HtmlTableCellElement.rs":"1c735be830be7764aca44948549d95a5b260af8c93307f8bc2c17909f9200047","src/features/gen_HtmlTableColElement.rs":"c3401c72e370c26febea655bb81b3fde22d966f700930e4b2c1f54ed55a57b03","src/features/gen_HtmlTableElement.rs":"cb3cffa65972fe4fa4ba5250e30433ff815b65e6b752b5994dbec8bbee3d08f3","src/features/gen_HtmlTableRowElement.rs":"66516a76a05c17e6a27ad43f6b174174e98e2ac48ef918a3a9c1e7a952ee5333","src/features/gen_HtmlTableSectionElement.rs":"3ec342c2caa54ff97931213815f530d016a3cc853cfcc7beff8776dfa5ab2de8","src/features/gen_HtmlTemplateElement.rs":"a99c90d7d12adf389627194b3de8b0002b40bd736b9d6e3fd34ea3bb6704b3ae","src/features/gen_HtmlTextAreaElement.rs":"f415434954a9a8336a19341b942376673fee76e5d4e6a4267e1a0374299dab74","src/features/gen_HtmlTimeElement.rs":"ef5d905160cfc33f93371a3bf994970c2154d03c7760570c4096c580a5c03c8c","src/features/gen_HtmlTitleElement.rs":"902efa4ea80463197f4746ca3df926bc0948a1325e5302948920b21e590e7007","src/features/gen_HtmlTrackElement.rs":"7dd2da51ad5924761996be36f1b17312e74b2fc66600734372251f0af70ba66a","src/features/gen_HtmlUListElement.rs":"28d58e8504b591fdaf1c4dcb493e42a894a2da362a89691a99caf6fafe2a0a8d","src/features/gen_HtmlUnknownElement.rs":"2134c044f806da863ec47f3594d494dd065e719b39e010a8de4601d9a103e273","src/features/gen_HtmlVideoElement.rs":"0272a16b4bb4fc91dbebb9b50ec4315bc60b6a6ec22f9c0384bb0059bb783712","src/features/gen_HttpConnDict.rs":"f4121b5ff895275a63d6c3cdc74147141ae45507fec30323515d625a0ce5fb14","src/features/gen_HttpConnInfo.rs":"1cca36ce49133a3d4ad471ce86afc3c20c5a51edd5ba9a80bcc2721b77b98918","src/features/gen_HttpConnectionElement.rs":"7e2a4278ca4d0f4d4fbd7a6e977182b03f1c0dc2ace5ddd5e1255ee48df4df29","src/features/gen_IdbCursor.rs":"eed4565dd0da1a36d119ab3b45b39b44063628b604078de39f124c3482bf51e9","src/features/gen_IdbCursorDirection.rs":"15b2feb3b3310848a1aefccd7af5e4c69a114349d927f731a7388ddb909307bd","src/features/gen_IdbCursorWithValue.rs":"e95ea51882cc5845211f04191865096830fffc6a35771968a5088a3e08dc089a","src/features/gen_IdbDatabase.rs":"a9a59188d086cb4b804d04ccc7892e6bffbc1454057ffd014e37ddceaf491ef1","src/features/gen_IdbFactory.rs":"1576b18867f40d2f7e1e1a3d8386e76f7cbb1cc035a52b508062b7794735f35d","src/features/gen_IdbFileHandle.rs":"0a947cc9b37ba0abf9845ce9ac521cc28dd3f053852afaa9959d63ff17ef3259","src/features/gen_IdbFileMetadataParameters.rs":"710f5c1e6ca2d750b32a8feb09c2f81e596c104f40cd2ab5f3cfc2ab614d8f38","src/features/gen_IdbFileRequest.rs":"fc5b8371e85f373539c32eb1e15bbf8601596e62461ad27574e49d2dc7ba44a6","src/features/gen_IdbIndex.rs":"c06eb38505ee8799727d706b81a42f1dc6b3bce86176902aaadd093ca4f06c2e","src/features/gen_IdbIndexParameters.rs":"23beb6fdc176781feb028f768b87e976c165a462c77b151f6481ae1d329f302e","src/features/gen_IdbKeyRange.rs":"1c1a181603c0cedaed6f52f09fa7172912c0dbb93bead2784542beab6813c29e","src/features/gen_IdbLocaleAwareKeyRange.rs":"7f7ad2efcf3aef1fb8c1e9e7028f8a93328448a4a7daebc5e6b7758b8a1930ec","src/features/gen_IdbMutableFile.rs":"4a39ac766943dc983d152d18603a5bab94722e3a34a26a607e71d640fb011b3d","src/features/gen_IdbObjectStore.rs":"57c4e4dab3769a4a872374cae1fd6eb67e2a91584afeb35508ac56bceafa1098","src/features/gen_IdbObjectStoreParameters.rs":"7bde9734db670a3ca9064af009f4f038dc2defa73565f1a18e152d1c15888127","src/features/gen_IdbOpenDbOptions.rs":"c78dce50606ba6630772479b8fba1b71399f336aa119ecdd22de0ac1f14dd9f4","src/features/gen_IdbOpenDbRequest.rs":"acd97b9739842cd4ae9db7bcc6bf34bbf60562aae832b169414aededfd09e474","src/features/gen_IdbRequest.rs":"ed0cfa60d5abade057ee0305c8a8c440f2e4ef31f5e04cc983bc5bb29aa080d8","src/features/gen_IdbRequestReadyState.rs":"a4265c126a77a595f7808e7a9ef408a8763f91000481ba045675c6433645c093","src/features/gen_IdbTransaction.rs":"f1318320da86653f8070abba2f6c325d60a262922331fe3665c7b5625d5cc55c","src/features/gen_IdbTransactionMode.rs":"16f13453aab9464622b0e7c1c58bd16e95bbec51d36211251e03d199586c2df8","src/features/gen_IdbVersionChangeEvent.rs":"20b43376a228baa00abc5548bfb9fe64bb0b1342f93e0bea3dace4ddeaef8063","src/features/gen_IdbVersionChangeEventInit.rs":"45515d3c2b31392181449610e7e117b92e8b14f90bc00053b51990e8ebf105c1","src/features/gen_IdleDeadline.rs":"ed98f7fe667dc44301914fb1113ddfd5500d9eaa6984cbf87e47160037b330de","src/features/gen_IdleRequestOptions.rs":"33db5f538695496772e621af2e650a55a347ef8fa8ee9b942902dc68ad1dc0a7","src/features/gen_IirFilterNode.rs":"4ecf97076db887dde2a7abfe263310579129ede1949364817bd50ec2c19d5c38","src/features/gen_IirFilterOptions.rs":"bdddeb8bcca524a8c7c09e5c5213c03e3bd2b62f0a96c7a656946d8daae7a84e","src/features/gen_ImageBitmap.rs":"715270d866433b60c111abe60272f6f995298bb4ea4bf04d649ae30dba8faf1b","src/features/gen_ImageBitmapFormat.rs":"13d89431bd64e94e138a000c30677435228b12a0436a17b7ce5e8642e53f1cc4","src/features/gen_ImageBitmapRenderingContext.rs":"cb5001600b0980b8a2ef73607c90cec9db31ed84ff2b54a310c6ba1da49ba3f2","src/features/gen_ImageCapture.rs":"289b4404ef49a0d9582e82e635f6f14f5924d0bf3950da234b1814b1b68031e9","src/features/gen_ImageCaptureError.rs":"4d6cbbc8a735b2deea1bd103a5647866fd317feb13b96a06bd8c8efb1515da08","src/features/gen_ImageCaptureErrorEvent.rs":"3ea6227337568de038658d42f82e8b34541a2d79f84b1780826137744bf51d5a","src/features/gen_ImageCaptureErrorEventInit.rs":"0965b685c08c174084422efea514d87dee4c26b3afeb54e359b14f894a3c5af2","src/features/gen_ImageData.rs":"013f106f3a1ce1e00f5a921c4bd8593b4b0804fa70b84e7a30550c05ff94085c","src/features/gen_InputEvent.rs":"8b71472774c4ec7bb02adea0767fd9d9270c367752ae5a6fcc2cd67884b88a3e","src/features/gen_InputEventInit.rs":"fca5006973abaa8a00ee58a2d280b9ab6c7cc8e3341c2a8c3a3d7395c05b4b73","src/features/gen_InstallTriggerData.rs":"d51e5d5d8e1cf188d994a416ddb426fcb304a7733104dee8897d301f2f2b1860","src/features/gen_IntersectionObserver.rs":"423102a0d2f5a6f9042ea03709271025edb599313de070cc3075a72d24020660","src/features/gen_IntersectionObserverEntry.rs":"c851cb4bb94533ad4ca6891399d6dab68ee1f0c288b8aadc83cf225145319177","src/features/gen_IntersectionObserverEntryInit.rs":"3d4205a2989e295479cbbb5d342f8a9f507ffed5f261015be7ae4e8ce5173985","src/features/gen_IntersectionObserverInit.rs":"8fe832192d7a615e623e0c711b4d07a44c07031dd7611a11b34add6110cd9f47","src/features/gen_IntlUtils.rs":"0a4850de54b9db0f10e77e75ceb08489a48a2375f09e4c8818a868d9d4b3a544","src/features/gen_IterableKeyAndValueResult.rs":"3492d7407f724f910286642922bd099643d3ffd39001d9b422759bfded40357a","src/features/gen_IterableKeyOrValueResult.rs":"0b7df2f78707ca503e1d611630110322223b1c6a10b9a7e08229aa1c40905a1c","src/features/gen_IterationCompositeOperation.rs":"34244ce902aa6bc7a13653bd953b7cd632ee6d37bb97dbb702bdd95b355636b1","src/features/gen_JsonWebKey.rs":"6e375109ae526f97e8b974aa7e3fc23dcb4fde8a2b2c9c45904c9aeab5a48af6","src/features/gen_KeyAlgorithm.rs":"953a9747728fb7d882709675b526244ad115fb057eabd7d00603e23c86ec2bfe","src/features/gen_KeyEvent.rs":"a424577f5fdacb0a1c984184814c80cd297132fc02c97838e364340797745599","src/features/gen_KeyIdsInitData.rs":"bdf0480a1dbcd92ab908f7a9c1fd8dbafdc8b3d893b47495f6a33deb59375222","src/features/gen_KeyboardEvent.rs":"197c30105e45c84625c0c8deb8a65dc32f6d207bad82c98911bb2a859679b15a","src/features/gen_KeyboardEventInit.rs":"c56916218eacdd353561f603fd77f516a7c3bb01f1368a9bd72acee0f185715e","src/features/gen_KeyframeEffect.rs":"1f14763ce0b3427cf4ae9fc114b6d2042f8edb4e0c9f928d852e083da6d3d952","src/features/gen_KeyframeEffectOptions.rs":"042d7d6cab67fad191af2fce5b992ee7a68e816a360c52d362c14d0f933e35b5","src/features/gen_L10nElement.rs":"28faa639f66f2b8340ccda87fb77579a9e9e6fed0ad8c0c4b9dc2bd91b33633c","src/features/gen_L10nValue.rs":"1de07194c926ffd629b1ee12b6e151bc592a033c0ea846b5e4a2f80e33654982","src/features/gen_LifecycleCallbacks.rs":"6869285ef61a694780c3a0172489bdac49ae2325cc9a7f68a173bbfb708f4c7f","src/features/gen_LineAlignSetting.rs":"b2ca8b4538aec009efbb4a5e255ac84813c2f9aedf35a7763198e539f49a3c1e","src/features/gen_ListBoxObject.rs":"304d890fc42913ca323ab01626f50bfe60c8b39bb66e727bc42f041089d6f3f1","src/features/gen_LocalMediaStream.rs":"761414ce9135e07c8da51bd8c82a3d354373d263e13537331b988c2a3f70e2d6","src/features/gen_LocaleInfo.rs":"4c3ba907208ee42beb836ed074a9b64322d4cf2f9931e6149b555d28d1ea5d2c","src/features/gen_Location.rs":"35c4faf094c494796f1c4802c29a3a9a58bded8c8de8a60db7e61b6a1ff0937f","src/features/gen_MediaCapabilities.rs":"1ead279786ecf73750ab673a28e92a6818cd95175defc62c26cda182729a6509","src/features/gen_MediaCapabilitiesInfo.rs":"68e29d59d42d16e8c02084e13d25f57369727a253e37850c8c8be1d320e3aaa1","src/features/gen_MediaConfiguration.rs":"af5716f042eb9cf52a189a67c016f4ac76ea1781d218d5543ca6d70814e49f64","src/features/gen_MediaDecodingConfiguration.rs":"c21d750f69f25e36b768076d8fc0fcbdd932139aff5989635ccae04df3807835","src/features/gen_MediaDecodingType.rs":"d1916c6285797ceb3caddf891af06afd8994d2fcc02a6337ef1da5ab47507ac6","src/features/gen_MediaDeviceInfo.rs":"f1b16f0b1adeb71694e0605f787c16e96e9bb08cf4f79deb51d4331c8b957c3f","src/features/gen_MediaDeviceKind.rs":"7c1ca8ff8a4fa76c22062258e7c40ef12676dfffe845d866a83a1594b9cb82db","src/features/gen_MediaDevices.rs":"4949a3fb12d3dde7f377a125e64be4632593c707a430b3becf8ede1f4620b71b","src/features/gen_MediaElementAudioSourceNode.rs":"5ea44897fae35372f794ec259aa717cbc6e72f52a8591f6d48994ed057b115f7","src/features/gen_MediaElementAudioSourceOptions.rs":"785cebbb6cf33e15c1c389857181e8981abd7c88049bf77388b49b9738379bcf","src/features/gen_MediaEncodingConfiguration.rs":"2ef53a8d7621f5c713f9dbea4e8245e4d598bae597289a256fa5f5dda159ad9a","src/features/gen_MediaEncodingType.rs":"93007744005d05609265fbea52ecaf990080cc7c6cd6270a0afb9fb4f181d1fc","src/features/gen_MediaEncryptedEvent.rs":"bc3df23cfea07861c2d2bc00415f874f563446258fd0b6cfb89797a6efbf68ad","src/features/gen_MediaError.rs":"30f45c72c94bb005bcb27e9a7c2aa0f4cd8734980b9ea8404ee2854890a08aaa","src/features/gen_MediaKeyError.rs":"6975d9514ca16300416c32d64e9924963f20e4b86e5cfa38fff850c1495a7450","src/features/gen_MediaKeyMessageEvent.rs":"26f73d02cdefb0b636251ae4fde5ae91bbfb0d4a552808c71f3321081a1e92d3","src/features/gen_MediaKeyMessageEventInit.rs":"1fcd84c10ecc96a7c34c1dde3eab3f7d18183a091532a01d7dc78afc97538309","src/features/gen_MediaKeyMessageType.rs":"b19c5a04861ba1e36f96295f7a750651aca0c2087dac2a418028d4d65b14144e","src/features/gen_MediaKeyNeededEventInit.rs":"08dfd72aa171872f08932444754a62bb8b777518cf38811c661f608e797b1b59","src/features/gen_MediaKeySession.rs":"ba6db5ccdfed12cd3254def797540bfe67e120f578ee36525a996054c88d725f","src/features/gen_MediaKeySessionType.rs":"ce2fa1c5681989c5b8d6008e0d44cacfc854f809618da9327661cca1fa591c44","src/features/gen_MediaKeyStatus.rs":"861c23c4f01ea4918278a9c429a3e9edbecf45ec949b6aad88c991b1a873c94c","src/features/gen_MediaKeyStatusMap.rs":"71699e5f7bc86501fb3b9d332328574371c144fb95b70ed16bb3df701876c62e","src/features/gen_MediaKeySystemAccess.rs":"540946af2689b7c394a022f0c61dea24624ec5ee7102be517a450d442a1a3e00","src/features/gen_MediaKeySystemConfiguration.rs":"80678f8c405595c8cdc38eacda24e51ac9850ee6da77a60030cbe2033ea7ce0b","src/features/gen_MediaKeySystemMediaCapability.rs":"c0b76b0a667c4c4faa50a6086404819ddf4641457ada39c7c24ab2ff059bfb03","src/features/gen_MediaKeySystemStatus.rs":"727abd4cfa31f19c48285d4d4c596a9c0ece295ae895982fcf401f8722c56760","src/features/gen_MediaKeys.rs":"529163689ffb48b9a580c3e2850b450c41f6e43148422c7fc7b6eb82ff7e8571","src/features/gen_MediaKeysPolicy.rs":"7e9c753bb56d6b7a3adbe7ffc2e234f85938bd7f824c635add1f25ff2d8c4b03","src/features/gen_MediaKeysRequirement.rs":"34f2c808691b4ccbfc3eb167a9faf6179d243659657d1f36f58c53a17a0a46e9","src/features/gen_MediaList.rs":"e443617e10154cf77c11ab11ce9e8249c367ad3406d6fcf26b1a049eddf50a1c","src/features/gen_MediaQueryList.rs":"7110cd3987635bc065768921bc883a18c195351b4de0862f4c056d9a5121735f","src/features/gen_MediaQueryListEvent.rs":"cf4699cc82bb142ec982c165c084d4ca79818909fc13cf4ae7a8c6c34d512d3b","src/features/gen_MediaQueryListEventInit.rs":"cc651c14f63244ed16ef05a709e617873e9279f1deba37f54156e765ee1fd789","src/features/gen_MediaRecorder.rs":"93e60c34d0e065b1fe594ea5ba2d291efa6a48ca9d2dd8f6fff21a5baaaf2eb9","src/features/gen_MediaRecorderErrorEvent.rs":"fd118345033e97cf67040a1fc689a6c9248500d9f73f318c5ebb31cf40db093b","src/features/gen_MediaRecorderErrorEventInit.rs":"142fee3717e954a9e15501d074ab56b95eb7bb01278416542fb6165c5d080219","src/features/gen_MediaRecorderOptions.rs":"1bf4d86ef189409777b7c97b349deb176bd4171a89be3e055046d407440c5e88","src/features/gen_MediaSource.rs":"6127868eeee2db1e8607f8d9a90e238bfbb18ee64e2f15da0214e0e39ece6dda","src/features/gen_MediaSourceEndOfStreamError.rs":"fa5b41310927741d4d3c433961d8ea4816a399051d3277ac8db4a9f4b492643e","src/features/gen_MediaSourceEnum.rs":"0bb306a1b65ea78650c0e74887e13999631eb9b4b94425e8ecfc564deecf2096","src/features/gen_MediaSourceReadyState.rs":"3c3f0ff77a9568e16605e2c79211c2af8cf9fef4f7de128a5f97e224a8775f06","src/features/gen_MediaStream.rs":"58cb70701c46970644b6ee49c182e5669bdd620e2a5a5423ee7d80c045b135f1","src/features/gen_MediaStreamAudioDestinationNode.rs":"944e25ce9ee98b7d1b21540de9081ac53be3a670e3d5206789956626cd1ae615","src/features/gen_MediaStreamAudioSourceNode.rs":"2ab03687f00af284f4d6b7efe13fb3d4af2a6cee1d14fa21a5211bf93f671166","src/features/gen_MediaStreamAudioSourceOptions.rs":"43e32b6ec0964284b4b68ba785fc157167a84747a7a14e55a77c0782c197e300","src/features/gen_MediaStreamConstraints.rs":"4261f11ebd3b64b03e855b278e795321e314fd1dc2dfa48a25515b507c831a53","src/features/gen_MediaStreamError.rs":"f0b4957ca1a33775c1ccde9bab24954c9903f44e78a0b85b332e7babf86d14a7","src/features/gen_MediaStreamEvent.rs":"86bca8a7dc3c9454db3720eac85a5f48076ba0bf9734d8a3a436699f17403f4b","src/features/gen_MediaStreamEventInit.rs":"192e2b16396da522f431467bf77c374ede4be7ba6590b37eacec485638629ded","src/features/gen_MediaStreamTrack.rs":"f4ab5f3734a498016f14a3febb0748d62ebcf4d504b4f208397da6fcfdc5af8c","src/features/gen_MediaStreamTrackEvent.rs":"3b730263a422fda4ad3faa22472e978cfe47604b0e7ccbdc961ad5836486d641","src/features/gen_MediaStreamTrackEventInit.rs":"75850a7c348d67c9f7ac4807680af1b8ed6f06d6d057b91228801ee666f09138","src/features/gen_MediaStreamTrackState.rs":"667229f52276b167c143cb0e811c5deeb203139f742470a7ccea8fa5781c7f00","src/features/gen_MediaTrackConstraintSet.rs":"a98725f3add9aa3bb6f3e23cdef02c04d3ba34ea69de8c4c5dcc233c4360c345","src/features/gen_MediaTrackConstraints.rs":"86389763eca467334b09c9184cecc3b2a6b75a5e05480a80cce90e6220dd8d59","src/features/gen_MediaTrackSettings.rs":"05c7c177ac96efd383bf8c7f0ad9207ea5934ad827bc9e3572d24041998c5d3f","src/features/gen_MediaTrackSupportedConstraints.rs":"3f4c3dfe300851957926e3b0f6e5fc6f18544d1d256c885b6ed2f29351ea3eda","src/features/gen_MessageChannel.rs":"738c0b3c2611e3e23797f1f9068fde88c525a5e16a6c8a416b15f15bd9e1e490","src/features/gen_MessageEvent.rs":"4e5d88c8f56def27f3f9e526b015f639b80413e6e51ad1f2ef08420fc99e69d1","src/features/gen_MessageEventInit.rs":"76951a3cef4d01c13c58320b9dead41cfa7925503829696056b57f62eb999738","src/features/gen_MessagePort.rs":"faf3319cbae678424ba6080e3a7d67c4920af135240bbf7313d545e69e8c46b8","src/features/gen_MidiAccess.rs":"9ef5e8cc922383663bd56889f35d20c1b1f2fc44e08761a8c512f1f0f0a44b9f","src/features/gen_MidiConnectionEvent.rs":"00eabee3f7e0f094b25d0638200dce28a5ccc0b51c45736aa152ed6680605861","src/features/gen_MidiConnectionEventInit.rs":"12974b64a8117beb0cda0a6d2b1bcef99276dad79ebf01df1e419339084677e7","src/features/gen_MidiInput.rs":"4e6f45ffea1553abf22ff80125594a2662770d8156e0349b00c521909048e142","src/features/gen_MidiInputMap.rs":"ace61748a759c1ff89ffb8bc77670030f0fabf026cbb58ef2e10585946ebbdd0","src/features/gen_MidiMessageEvent.rs":"131c438bcaf5f46dfa02e7df845aefada9ddac1e9157b35ff28125391726eb97","src/features/gen_MidiMessageEventInit.rs":"7c197fd693591af5dedb2c753583c8937053500eaa9ca9109e2c8098dc29d4ac","src/features/gen_MidiOptions.rs":"8dff16a4021830d41c3070e96716b16284504f4da13e5e1fbd01ac3a8fdaa366","src/features/gen_MidiOutput.rs":"234354ffc46f1c434880a196d7e8f5bb316747128f55dcdf44fc45efde04fc01","src/features/gen_MidiOutputMap.rs":"c8456551ffc867f7c7615840182121906684fb50cf188afbdd0de56f12c1b771","src/features/gen_MidiPort.rs":"72812ffa630a50b6319b432426ec2aa9c7a9d2e31cbe1b22fa81fb57d1cedc2c","src/features/gen_MidiPortConnectionState.rs":"0263903572dc129c9ba91ecdbf80eeca3692cc61fbaa1064e93db9fb1a46ecd8","src/features/gen_MidiPortDeviceState.rs":"26fce23b90bb0cf23a40c3f0c3187d43902e37b8704b8fad56ef9d21d22146b8","src/features/gen_MidiPortType.rs":"7d4c4d9d8212a26abf80a94a9d8b28ddfb1bb943cac12429b892b72cf702a79d","src/features/gen_MimeType.rs":"2c95940dcc9e19a1d526e06ade9de8f9699799e5f4dd62f005e382e354cc80b1","src/features/gen_MimeTypeArray.rs":"ea15d0ac9a21b52472b40dd9dbd3ac99059cb3892b93dd7f234645ec56e7e4e6","src/features/gen_MouseEvent.rs":"f79cd256a8c05f8f5c3b3877633e3fbb9201830cc15f25f05ee975088db9fa2b","src/features/gen_MouseEventInit.rs":"fe6b4ee81cbe22d688353672592b924b119807f6082cf07f463a6ad14296893b","src/features/gen_MouseScrollEvent.rs":"863992ce4797392b5d18afee55d29f1bb370581134d381234fa37c16bdc1cb52","src/features/gen_MozDebug.rs":"2f826d72d754d27d0223bde857178c0880e44ca5471044757ba6a7a2cf8d35fe","src/features/gen_MutationEvent.rs":"06106789ddc65cfc114bdca567c22a838420e89aafee01b42df1dd5185082dd4","src/features/gen_MutationObserver.rs":"4b41d9e2c09e7ff0a50b996b8c4dabf821eb265f64b888b49a0e5a95bf580a88","src/features/gen_MutationObserverInit.rs":"c458d00baef80cca07f953149f441e851240a2aa417b24d5a45f7054fb9c17af","src/features/gen_MutationObservingInfo.rs":"07405cbbb7917506a8485afd760c526a75ce49fbc972e5829bacd3f61b8e721b","src/features/gen_MutationRecord.rs":"0814c47f63a9b64fdd7e468639399e8fad59944519f2a77d141652fd1935efdb","src/features/gen_NamedNodeMap.rs":"7530fbf270943e067d5346d7257611c3b9767e14e1b501ba7bf7571c1cb30990","src/features/gen_NativeOsFileReadOptions.rs":"672ed1bf3ac9df60c1db3669bcd03f21b98c3b2fc4e0f0487c85ab8d0ab4daa7","src/features/gen_NativeOsFileWriteAtomicOptions.rs":"83304d291c390ca3992e881dd8729b1696f516188daf0643ac6adbb0bb05c8a6","src/features/gen_NavigationType.rs":"27326326001f74ced627dfe829474e5871ebb9481b34ecc085a19ce7139b27f5","src/features/gen_Navigator.rs":"6f072b775424eb901bdfbec26dd726124f0655cdbfb84443cc3e196ca3589f28","src/features/gen_NavigatorAutomationInformation.rs":"0d0f40f3614c3117055918b09b34ab96ee286e91ae0f36450b842fe011dd2b4f","src/features/gen_NetworkCommandOptions.rs":"f916deadd612fac6d3a3215edb0f6288f93ae16f4352774eefd33ae8d451f715","src/features/gen_NetworkInformation.rs":"3bf940ec98f163bf6904b58a7d537d83a43f22727e457a903504e64798f48f2e","src/features/gen_NetworkResultOptions.rs":"37f309b9f7d7be715152b7b1f49dd3b4107b0ce5a4ffbedc06cbb0d355ae00c8","src/features/gen_Node.rs":"dbb2734dbe23513ad2149e9054d1cdd5a1e33c35ced69d27d280ba8ffc5f3a63","src/features/gen_NodeFilter.rs":"2c7ae4636c7996a61f71b3f185f1015036672599c3767bb793eaae3ebf624d7c","src/features/gen_NodeIterator.rs":"c639ff14766b1490dac8b926fe416f6cd688ba9a9355db1722dff01c02bb3906","src/features/gen_NodeList.rs":"dcdb905934b0002e3216efbf8a87d4a15bacb6abb08aa0575990cacba482d69a","src/features/gen_Notification.rs":"817f89269854772cdfb3e4e0fcab55da0f3b47da784bae3616c147f7bb477231","src/features/gen_NotificationBehavior.rs":"23dc43ca47b80c91a0fb41aa01a2c2724c8d923ab5c0924fcd961842a13a96bb","src/features/gen_NotificationDirection.rs":"e3da35827de357cb66836fe14630bd483228e1eba945c748f8dae97150ef15cc","src/features/gen_NotificationEvent.rs":"0e5adff722deb99cac38eeee5429b15d77775fc0b621749dc278b81011d24a5d","src/features/gen_NotificationEventInit.rs":"99eb47c42b2472cfa2690efd624326e9a1e997a557063c2198c90b23b40c7339","src/features/gen_NotificationOptions.rs":"003492fc3de8b8e92094817b7857bc0c195b3d527c7fd023d1dedfe8280d9c57","src/features/gen_NotificationPermission.rs":"1f63c34fd652c74cb5675eeb7a0372cb62f450c4db85ec24bf44169e03d66e94","src/features/gen_ObserverCallback.rs":"0cb8bde84ec905c76ba9792361b9c718db07f6a6b99c56c6850e6fe8f7d66e45","src/features/gen_OesElementIndexUint.rs":"4168bdebdd4312a0beeb58b7c256e0820356adab41ff09948350da4773f05f12","src/features/gen_OesStandardDerivatives.rs":"54a973e991168f9b6b58c2e2f064213e78b0b3cd2991b303de290dbcd28401a2","src/features/gen_OesTextureFloat.rs":"b3c79dbf226ef1a0a109fd6d95aec02f21a3127703bee4a325a041062125bdb8","src/features/gen_OesTextureFloatLinear.rs":"0fbe09be2e365ecb7044a54d57a908ae74d857d1bf25d95feb37eb4da6dc0fce","src/features/gen_OesTextureHalfFloat.rs":"7b9cf18ee30eb122651cc942594558281d961ecd904a1982abb783a69dcfc22e","src/features/gen_OesTextureHalfFloatLinear.rs":"00964fd4730c601804fa94ce998b7ed18c8cd67fa7ca94a6872cb729515034b2","src/features/gen_OesVertexArrayObject.rs":"93f361d88f590508f12f4b0f46c02bb5d7087d3a2b8dcc7b878c8354892f6156","src/features/gen_OfflineAudioCompletionEvent.rs":"22c901f1b05fd203112c28efe81a4f9246087cd6f018decbfa0b038bfb5dbd63","src/features/gen_OfflineAudioCompletionEventInit.rs":"5c58e20f3b3dcce9c253babaf5f9f42386b8357f337d60f00c47a0210ad89998","src/features/gen_OfflineAudioContext.rs":"292d7a59b643124fee7f77557795d37df76160864e1dd8f6a4bcb5c2f0aa081c","src/features/gen_OfflineAudioContextOptions.rs":"bf3b99798238b3e6ae127bebd6de402cf6f09efe341c3a1dfa87774475d36719","src/features/gen_OfflineResourceList.rs":"87123923bf9b5fd5842bd8d93b0a3d96b1def0dbde4606e8fa1831d75b5729d5","src/features/gen_OffscreenCanvas.rs":"83fb02652a0b65b2ab60841c422d7be212ee2a89e181b92b3f5116d737ee43e8","src/features/gen_OpenWindowEventDetail.rs":"ac8a8d7685ce5cb0b8e0b0a81a37d9f22fb9c9c4198fdef03b828c08a6179040","src/features/gen_OptionalEffectTiming.rs":"cc5237288dd65d982b2b86325a3df1f9eec7206bb24edc26d60a85c4cd6ecc67","src/features/gen_OrientationLockType.rs":"08c0a541d5678d878cb759a2508de2c0f49f24b3977341d91d0f7e9d197f53b8","src/features/gen_OrientationType.rs":"6c098483cd89105dd71d4a6cf8a78849fc041a2d4dfa2f0c785868d5942b9cc5","src/features/gen_OscillatorNode.rs":"f08e43739c071857fa45a0857c0591c78b60d9559950503402f4c9c46ca7378f","src/features/gen_OscillatorOptions.rs":"a3cb4bb91d9161900731ffa7dc2fb6d20390c073cdf34e36c342fbd42f902d8b","src/features/gen_OscillatorType.rs":"93c4d2f99fcafaa7ef4bec764269ad1b444e3e476b04592cd8459797e1dfe7f1","src/features/gen_OverSampleType.rs":"c8c2c78cec42eed8dc62a975f06efe18d2979a7795130d5e893600283ecc7608","src/features/gen_PageTransitionEvent.rs":"a393341d683794a0bdddc6c9b84909cf17e119c98ef2b39a974a50374910e6df","src/features/gen_PageTransitionEventInit.rs":"7631a12b79f8ef023bbc60220877de08f0210f846c34eb39f3a1628715b233e6","src/features/gen_PaintRequest.rs":"186e9d50f161af53ab95368157feff8326a55a6e5511cd5827ea78c0c9681f52","src/features/gen_PaintRequestList.rs":"b6026597d53e0756d54860219ea485ecfbb7b6c02eca86344f2f9253c2fffca4","src/features/gen_PaintWorkletGlobalScope.rs":"87c66d813b4e4f22bd5bf797669b82694fec4443a50a95588bcf20074fce4cf4","src/features/gen_PannerNode.rs":"0d6b8b86a892855a83c1ed17c79f4db0780be1f8be1444a211244c4d2ef4fbc8","src/features/gen_PannerOptions.rs":"b032b69d302daea4c14346757c36d79b69b8317e31996d302725729b88fdd626","src/features/gen_PanningModelType.rs":"86a933489b9218ce7fc7aa94ff45400d0535ad09815bcd0befa1ee7aabb5b6d3","src/features/gen_Path2d.rs":"f769d3835eaa3208bb9a37415fefe343b70e715c13495d8e028ebb2eb6b24800","src/features/gen_PaymentAddress.rs":"21d584eb4f5142db978fbf1427e7b2d1c6dff6bce9a20f203ddfcbd04fecd98f","src/features/gen_PaymentComplete.rs":"fb98a8c13f12fad28e138084fb477078474cae85ace2102f1f7ab0e9ea180890","src/features/gen_PaymentMethodChangeEvent.rs":"e7b42de69626b1c288226252f3875cb7a78e026d2dc29af1e37bba810890b0f9","src/features/gen_PaymentMethodChangeEventInit.rs":"1a42d5cc801fd5140db6776dbc2436f37565ba9086c4c10f912d07708c62fef6","src/features/gen_PaymentRequestUpdateEvent.rs":"dac170f2c2c04d0b834812e6c5ecff3bc314f4b0678f2156243bde8b64becfb2","src/features/gen_PaymentRequestUpdateEventInit.rs":"54a3cb2de8a96c0555c2261e20660a19325d8e38b79fe4217c90399b3b0dce3d","src/features/gen_PaymentResponse.rs":"78b5a6d071cef272a5b67ae8ff7585f70c618f32d43f36a4f5759de675dd1465","src/features/gen_Pbkdf2Params.rs":"4ca2a2936ba88e91f662a715c81281e74e1f59569e6fb2c324eb3dd75bfe2e8f","src/features/gen_PcImplIceConnectionState.rs":"1f178ce0c21cd444876373c634c725c595207fe8dd3fd51f009a2af117da1145","src/features/gen_PcImplIceGatheringState.rs":"a00986d3a41d405a8d4f6657cdafcb67b239e6ddc4f52958e8f7b31fea1f51e2","src/features/gen_PcImplSignalingState.rs":"bd5fbe37b40fa9a60df7dc5772172889cd93345c6cfe2571838c606cddcf9ea4","src/features/gen_PcObserverStateType.rs":"5db7b022d155db56c9739c1500154a81075aa865bd516a37aeb48770fbb00c16","src/features/gen_Performance.rs":"5fbab28b1bd1397f05b6640c20a09099b95da7b043fcf46484d8ce06901364c1","src/features/gen_PerformanceEntry.rs":"9dbb870cca7a4a13663a1973db55fb93221726d94be3d750579392185dbf7f74","src/features/gen_PerformanceEntryEventInit.rs":"92d6fbef8afab69b0f0d220a38c3084f75cc079d418c21c9b919bd2abc1597ef","src/features/gen_PerformanceEntryFilterOptions.rs":"0c22bd161ff85a4c84b3ac6a355bd128f3fb910d9c22eec6c54c5bab1f0f5848","src/features/gen_PerformanceMark.rs":"c2c8542af97172f8df2ae347f210d33fedccdaeecacb623fe51e58877535d203","src/features/gen_PerformanceMeasure.rs":"66d43ba4cc604284baf04e9b8cc44ab2cf0d01f6008d279a4ac0ae0f803253ca","src/features/gen_PerformanceNavigation.rs":"a15dd13ca206215821f56b23d54691efb8539b508d3607821f593aee9efa460c","src/features/gen_PerformanceNavigationTiming.rs":"a558ebc1c036acd2ecb26a93166a98145b23446f91b0a61368714f98204bdda1","src/features/gen_PerformanceObserver.rs":"d2385f7294d168eaaf0ea1da63f7b40e78d286b379982fb06da8cdbf3dc85906","src/features/gen_PerformanceObserverEntryList.rs":"4d46b764d4022e9d259c4033b0816035dbf8ff0f648d347a372b7e5d1059d4a2","src/features/gen_PerformanceObserverInit.rs":"58d31d41faa1a624e6ba3ada95f7cd6f2ef24ba3fb0c2dd54e6632919f65494a","src/features/gen_PerformanceResourceTiming.rs":"ec60aa78c5bd42382e500077f47ab8a6bf756df8dc2ff450a4a807da761060fd","src/features/gen_PerformanceServerTiming.rs":"bb97abf245e992ba90ec3123729325532343a4a8470b0c9881fe78f5f1aead92","src/features/gen_PerformanceTiming.rs":"53122dd391fd6f6fb007081b148aedd6523181a9aaf96bfff4d15677f66dcb80","src/features/gen_PeriodicWave.rs":"a03d0d8d55fb208bbdcc047fa0ae5353eb831a0d2b19394a0626e39592a5347a","src/features/gen_PeriodicWaveConstraints.rs":"cadd1a6dcae08740d503e1fa17ae2bf4158e22f030b9fb49d5156ca5b59a31bc","src/features/gen_PeriodicWaveOptions.rs":"033634abd9b9bb80fa9135c0870555a04729fa8e437c167060e7bb44b4fbb56e","src/features/gen_PermissionDescriptor.rs":"13378b3c9f7b7469ba28be2ec6f57d6678d0fa320dedd5de038a9fd214140ee5","src/features/gen_PermissionName.rs":"5bf9d0c70373803aa791d2ade99e79c2d33901e0d5c58b3b6ec6f214a12bb8fd","src/features/gen_PermissionState.rs":"684ac0ac7b62aa1f8f0f692a9cc21ac68bc2b08f7f4b8d7d87d0a0ed7cbf6f06","src/features/gen_PermissionStatus.rs":"bf694843c2641c80c998207f91edf985e75cb86aa8ea51e0882310e9b215a2e9","src/features/gen_Permissions.rs":"ba264558419f1be2d690c638eb383186ed198329c5cc2ad93f16b2aca07b1e62","src/features/gen_PlaybackDirection.rs":"019fd4b5582b6b05140183b3532f8bf15e59f01843a08c5b25d32a46132437f0","src/features/gen_Plugin.rs":"2c87486b03b7d3ba7091f0c03a3501f7db07aef85de79a2ca815c2e8a3cbf56a","src/features/gen_PluginArray.rs":"e2f8f1299872a35e2eaa3e5532f8d26d7a0594f8f24239292e2b97ae7062fb9c","src/features/gen_PluginCrashedEventInit.rs":"5e0c89d395e55ca7c5cb6c5dcfbf863baeca531dd646a28e86efc3e2a1c867a1","src/features/gen_PointerEvent.rs":"2f0da8c5cc571e841d4ed528698222172c977fb1bd3a16b69cd4679dc31a088d","src/features/gen_PointerEventInit.rs":"de261cd63e627e1f3ed2a9e3c349b6332f57d53d1b86ad5297b849b1902a82e4","src/features/gen_PopStateEvent.rs":"d24bd2e645f803920e7cbb840222051b9d8c0d5574d4399c77db7d762af838ab","src/features/gen_PopStateEventInit.rs":"079ee27c9d493a221634328c96ac519a645d34b65609659983c10230edb3853c","src/features/gen_PopupBlockedEvent.rs":"30f5da6719bedbd8b6a0f1c7cfe2e63ef813fbcd9e4fab219268f50130d10054","src/features/gen_PopupBlockedEventInit.rs":"0817bb58c8b7b2455bc20366ead0b688e8fa5bc10f743b59c4cd279d6475d918","src/features/gen_Position.rs":"dc70fb91db27be75a984d229cde040346adc9dd2889703c19c5b1f8c43869e4e","src/features/gen_PositionAlignSetting.rs":"5d4ea2efdd8b4abbe454f8ff9c5d28a5d445987aa33b2d1f97fd01af37b1e71f","src/features/gen_PositionError.rs":"cb382955b444136ffaf3c945f03cfdb19904ef3a15789eb30ae917adade0bc27","src/features/gen_PositionOptions.rs":"d4517f2dd13397c2340fccf32fa045ff0d51b781e938e3e2ba3e9ada581df7bc","src/features/gen_Presentation.rs":"1662b831ca5c35ff6b185af578abfbcef4fb1d341807a4496319cd2917d66f30","src/features/gen_PresentationAvailability.rs":"b54927d1a35f62d7cc334f779b64d76605802501d97ac38a5e816177bd49c96b","src/features/gen_PresentationConnection.rs":"f24f9e832d716dc82c3c29dd4659cd29bd374742f0b7680d027340fa2f7d6dfd","src/features/gen_PresentationConnectionAvailableEvent.rs":"2e9540e88f32cce49c0c6e94798a6fb59c49983b0fff3d3b09f3044598f5d52e","src/features/gen_PresentationConnectionAvailableEventInit.rs":"254dfe493857be16b9be913d469aa92a2e8297239420ef1c7c002e9b3af24e92","src/features/gen_PresentationConnectionBinaryType.rs":"f11f6612638a1e488923eef4505fb98d9e488baa72d3ff22cc28ea602e9be277","src/features/gen_PresentationConnectionCloseEvent.rs":"643ff22b2f25f07f65f0ad462183a86471120721a71603f453941425412b1819","src/features/gen_PresentationConnectionCloseEventInit.rs":"8320bcd91f19854a179ff0c97a144515fcc39f26d9ad1728ed0669774a8d5667","src/features/gen_PresentationConnectionClosedReason.rs":"4ddd489f3f1b98d4cebf658cb97d27cea7938d444079f4fe48cd0dc568faa0ff","src/features/gen_PresentationConnectionList.rs":"55b28f935815e1847cd7df9f9f5d6f430c7912cd2c8c4e9dc033cda677caf738","src/features/gen_PresentationConnectionState.rs":"2c60447dc361373a8657cd392b12da327d62ca00a9a27f637c20c990a9e4222f","src/features/gen_PresentationReceiver.rs":"bcae2171fa1f0356ce16cb73e67a85a5acc2bfdf1d4fcf7e90c5a1146f3ad3fd","src/features/gen_PresentationRequest.rs":"290965b210a525ddebc6e01c325a765940f6efe0c9eed3420a4a3f5a0796fdae","src/features/gen_PresentationStyle.rs":"4f6aca19049cb83d8dcff67a883282766acd9700dfde188758203bc37c23b605","src/features/gen_ProcessingInstruction.rs":"5080bac3aa02b7c4c62d58d93eb75ee58ff80f1a0014a2e1069075cc46cc9f10","src/features/gen_ProfileTimelineLayerRect.rs":"42c3f38c7c95bd1727f95200d9bc2db26b998292c7bd528d0fc2203ea3dc5045","src/features/gen_ProfileTimelineMarker.rs":"80f313682e43f1ab2841beadb5e4924da75f7be914368b34a94d14e0c70f3dde","src/features/gen_ProfileTimelineMessagePortOperationType.rs":"605bab8ea6c39d97e7180bea75b9ac584b3bb1cf6a84941abc3a623408f993d2","src/features/gen_ProfileTimelineStackFrame.rs":"db4b215e90ca361695d7670f99345a5c2ca30005a0066987c9265ebc9676cf19","src/features/gen_ProfileTimelineWorkerOperationType.rs":"2ac6b4de397e799142e8070f1f4954ef50d1919e34d9a6def79f0df6a7ef85e9","src/features/gen_ProgressEvent.rs":"eb1506bf278616417b89e88e21343e6a7f4816b85572dd4ac57092c38b90a6b4","src/features/gen_ProgressEventInit.rs":"41e62f0ac90e3e117a5dd39a73991ed50257a019cec2473b70c92037fb5631e1","src/features/gen_PromiseNativeHandler.rs":"49207cd99d5693f9001b15263b7fd8fbf743b8ff555d41ddf1e73f34169fbc0c","src/features/gen_PromiseRejectionEvent.rs":"0e2aea29a5ff440db58510e9223eea280a6a6da3a4f24bf58467aed1501ec94d","src/features/gen_PromiseRejectionEventInit.rs":"38aa7b14cbed806f08272a2a7f6f7b39a329e38a6b870b5e6d2f8a3ee75f764d","src/features/gen_PublicKeyCredential.rs":"c13f38c0c47d5a56ba61981b8d86af63612720cbeee7dd787be28afa51b7ea00","src/features/gen_PublicKeyCredentialCreationOptions.rs":"5835296f41e5757dd94dd2edf0a44a61e295982c4c7df39f2410eabcd406b88f","src/features/gen_PublicKeyCredentialDescriptor.rs":"2c828d4b0a41901f9974152222e4c6161e82cc37fe3a0447893ce0edcbbd16d7","src/features/gen_PublicKeyCredentialEntity.rs":"f5994bc9b356d267f999929286bd365cab4b3dc8de398f1da38585a14cb73808","src/features/gen_PublicKeyCredentialParameters.rs":"db17825343c909569e509a7d5fe7782bf500bafa068c0baa6bfe974344bfde1f","src/features/gen_PublicKeyCredentialRequestOptions.rs":"b6fd48cfca26ced5da5a88b6720489573b00352b2f5ed3001c65c038ab69ed59","src/features/gen_PublicKeyCredentialRpEntity.rs":"d1a621c0a02c42daac7bb010c2f7fedb6754014cffde286ad50b13f64bad3a5a","src/features/gen_PublicKeyCredentialType.rs":"27cceb962fcb5fda91255c3ba00e0024c33f58af79071237016486d10bb99913","src/features/gen_PublicKeyCredentialUserEntity.rs":"e11f2427845eaa085e047cc8de109238fc3c30ddf4a6dac7314f13e7372fa6ee","src/features/gen_PushEncryptionKeyName.rs":"c2dd7f79a295570998fcb77838ca5100e67e581f5784ae349cb630d1faea206e","src/features/gen_PushEvent.rs":"1550db60daf9bbd9abdc7c5a498949b532351ae57ef287b0f12c3c9aade1b235","src/features/gen_PushEventInit.rs":"466b4ea2899ce8c7ed99e75a9c62942b40d3e7799d461bb432898fffdcce5376","src/features/gen_PushManager.rs":"2109a4929d10afa7b662ce0bc6e54addd4fa4aa4f6bf1ab085e23350e0769beb","src/features/gen_PushMessageData.rs":"d31c5751c0c3b32280c616265b8fb7127ad7ffce8ec494680cec582eea5f8202","src/features/gen_PushPermissionState.rs":"c0ea3b24ff5b6e3caafac3573d2308fbd0fdaa62d630e227ecb9fe7d2cc4a5a7","src/features/gen_PushSubscription.rs":"777a667a2ac06d221847200ccf870c40676c747bf9402a970b6679c14ae84db3","src/features/gen_PushSubscriptionInit.rs":"ef225d5273142571d875a72cc05bc7df8a4f14e24756eac66241040990b2cc50","src/features/gen_PushSubscriptionJson.rs":"59373e7b643b24487339f54665c6819f4c2e48ad5a777c2cd4ad4d35b2dce587","src/features/gen_PushSubscriptionKeys.rs":"da7573fd615a4aabe4fcf5def2a230d9ef2a3d7b0c09bba347ec4d6f3cf5eb17","src/features/gen_PushSubscriptionOptions.rs":"70e2dcc8653102e1b51a20817185196d167c088a8b7b6cc59633058ab4dc7c92","src/features/gen_PushSubscriptionOptionsInit.rs":"24f04a7d2cc6f3f8cb41b98d45b68de1d15ad404bf1de1cc6513b405cba20e16","src/features/gen_RadioNodeList.rs":"43bdd086b2a43eb9df8f7a1bdaa6ae352b1a9ca52dcea076356990dcc5b4dea3","src/features/gen_Range.rs":"9a4c1aa6557284b122c30b7afd0f2461493cd80b8023c11de770f0ae55482d5e","src/features/gen_RcwnPerfStats.rs":"51864f35f67afba8a9511575f0b1acce19ac24784638f2c7901028402e52859e","src/features/gen_RcwnStatus.rs":"3161d54e04c15e64125779443eeef4ef47b322a657f1425932826720d35db370","src/features/gen_ReadableStream.rs":"5b22695972871080b623f70264f340e072a8faa8b37e9da8e1fde7aa4a9370e3","src/features/gen_RecordingState.rs":"57314351835b800e9fc06fc4b3a43528d09f8798694f9d9d5b8fdc554cce361c","src/features/gen_ReferrerPolicy.rs":"507a0a4ee4116fd1365d17032d427c639189ab0acc628bb4158afae126a8c933","src/features/gen_RegisterRequest.rs":"f409ebfa9ccc071366774ed0622f012c1146ab0b7e28eba835e74acac94ac6d2","src/features/gen_RegisterResponse.rs":"25ccdc277215275fcbcbce05c166e811a7869255f1bf48b628995e259f39bd6a","src/features/gen_RegisteredKey.rs":"17a6625b6c3bf56d60cd7d6e15c88cc55cf5d8e83d2f016a424e365ad03e72b2","src/features/gen_RegistrationOptions.rs":"a7181dbeadde6dda25784e84f71d54a3b630f298f9860c21a7af770d83fb95ae","src/features/gen_Request.rs":"e3783e85937f21260361f6b46a1d807f843499956c64f4f76d782e8fb833b49b","src/features/gen_RequestCache.rs":"41af1e453d3367f2b5006fe022649eae354af01a4693d6e68c97e79e8e7e87dc","src/features/gen_RequestCredentials.rs":"0b11758e27a1e548bdd5da73736a8217d4cff146e51fbec626fa78118e347df1","src/features/gen_RequestDestination.rs":"2c4f69ffd4d345e716cf5c4bbb434a74745c69d0fec7659751da9605e58753d2","src/features/gen_RequestDeviceOptions.rs":"1a62ae5963469be4b9b8bec1187ce5d93186cf0912bc2e1534ace1f5bee64dbc","src/features/gen_RequestInit.rs":"8248c9f9ccaae09c34da9133477d2955377c62b43207a246b3f624312b8af546","src/features/gen_RequestMediaKeySystemAccessNotification.rs":"9b2587a75f22359e12b72afb3a14dc3c05708d11e07f15b1e2af947b09101e26","src/features/gen_RequestMode.rs":"658621f1dd7dd75452a8357e74a57ba30048c361227cd75d3e9f9403ae0b7d97","src/features/gen_RequestRedirect.rs":"3208a10ea00365ebadcc72eaa778a579d8dbede43c24f73ad9da85155e50302f","src/features/gen_Response.rs":"0a9419f9cbed1176279eb85b44f02ca11ca4bd528cc585061b2a9d1464f46cff","src/features/gen_ResponseInit.rs":"0e11aaaac84a81d24ca44d77c4b3fc1c87e9dbb3a29f6503ac55360eee838b09","src/features/gen_ResponseType.rs":"80f51ee7b020dd3a9ba6dcd314ea905880b8a35b2666a20c07e42ef7f29e6c63","src/features/gen_RsaHashedImportParams.rs":"1fa2992d812167d235dbbb667818a1de5140fbe11b0c20bb0c07c842dc552aac","src/features/gen_RsaOaepParams.rs":"dad9d33ea0f49cd12e0025de8e5e12d3ffd1b67b7d22ef5d9977354b08f1b6fd","src/features/gen_RsaOtherPrimesInfo.rs":"0549a10f659e60c8b8629703e983d599e0100f89b8853462cf106281cd1ace3d","src/features/gen_RsaPssParams.rs":"9ab3baa7313a7b98f230323619ce442bd9224f1595b3af310f27ae0d50f8ff12","src/features/gen_RtcAnswerOptions.rs":"60fab78c0d32fe844db05eb8bebb95c4b814338c277e607e08ed095bd4720a3e","src/features/gen_RtcBundlePolicy.rs":"429222371ca717516f33fa5d8b910ccfff174cc6dd7ab0062b9fab98150b5ac3","src/features/gen_RtcCertificate.rs":"b2cdd7ff988368847284283244628d65f42c6854331d1064992303854d4e601c","src/features/gen_RtcCertificateExpiration.rs":"e064233b0076f52a4fa3026f9ff81d75326d33bf9c8f9dd6d16e0ff4d4cea1a0","src/features/gen_RtcCodecStats.rs":"45b996ba02c799b77ee1571a73f8f06684398f4f823ab08e39d76b84b67e97cc","src/features/gen_RtcConfiguration.rs":"05edc2a061494a944401d26daf3ebde2fdf27607407c2d8631b08a89ad1a2d30","src/features/gen_RtcDataChannel.rs":"359f074a79fc4e27c5e7081d4c4ff62bcb390684cede314019af88f82573c2c7","src/features/gen_RtcDataChannelEvent.rs":"f753fcb58b40d404126b324c54bf87dbacf42c69b15a93827671e16c429c5691","src/features/gen_RtcDataChannelEventInit.rs":"cdc3f221d11ab86d3eb15c6d52d5c92cf5ca5a8cbe24f957ca0c19d2eeceb03d","src/features/gen_RtcDataChannelInit.rs":"5fb2de55a0dbde6276d6244ca1eb72cc40ebff4d831c8e75e40a53675397ca5f","src/features/gen_RtcDataChannelState.rs":"0139dc7e80fbb6c5b2a850abc767b96feafbaabcb1751f815f2eb96c4d923587","src/features/gen_RtcDataChannelType.rs":"acae3f77da2d33a0c3408ac28e2e7b2ac4a74a98cebc7c417efb6355110c06cc","src/features/gen_RtcDegradationPreference.rs":"57b419cf6dcf2cb0d9658012951796ac0a5b316acfdf33086ca3ef78f10ee525","src/features/gen_RtcFecParameters.rs":"e5e617e2cef7a7081adc5513f4cbb8613cf9341fa6d5e9e69c47536285c23ce4","src/features/gen_RtcIceCandidate.rs":"2cab25550f9070e862bdaa72ab2802958bed1ed7d09455fc0fe65314efcec872","src/features/gen_RtcIceCandidateInit.rs":"828b46651afa20755e7cb6924d0d787803b7ec6c82915a8195ff56496adf6e2e","src/features/gen_RtcIceCandidatePairStats.rs":"ac847e29e35b48e28834460ce58c7611ff64f9eeab99350ce5a3c452a2d848f4","src/features/gen_RtcIceCandidateStats.rs":"b6216653e4f9922c084472198af3a56638b9181e01f87787c54dfb5874f14d95","src/features/gen_RtcIceComponentStats.rs":"0668434c115d96c3b0da1a445f627a5449ebd08b07c176ea8d02afe04afb596d","src/features/gen_RtcIceConnectionState.rs":"f8e9797ac87cdfb6370a85e0ef1e6f680f83079df276a22f1e5edd14a0e8bd45","src/features/gen_RtcIceCredentialType.rs":"f2d4a0a33c29f70facc721103094b25ad07a9ada4bf9c5c5796db057a75316f0","src/features/gen_RtcIceGatheringState.rs":"30576e2b180daeef2ac4bd561db79ca370ab16e460ca9f530384555f93d4092e","src/features/gen_RtcIceServer.rs":"4679c6d0a7ba986fbdee4615a1acb0cb38385e02c663d70fc99c3a0d129e5f81","src/features/gen_RtcIceTransportPolicy.rs":"d665fb2a3fa65d096d316b5e1ced1fc074c386e0216347b47b43d2274f8df05c","src/features/gen_RtcIdentityAssertion.rs":"8b31e95b22a8ae99269cf41107c531136094547dd498fdbc3f04873535717da2","src/features/gen_RtcIdentityAssertionResult.rs":"59ec0279bf364a13364caea1b198c7083a10cc9bd5e5f1168fc0ada660abc01c","src/features/gen_RtcIdentityProvider.rs":"bc81fa5ec1be6ca9c01fac011e1d92b9a7536ea836adf129a76f6f07a0a3b62b","src/features/gen_RtcIdentityProviderDetails.rs":"a8911bc789eddf825ed0582bcb9c6e8700e4432e2d767686a5791c095692de2d","src/features/gen_RtcIdentityProviderOptions.rs":"58011cc153889042bf175d60ecdf063203f457bde446d0d61af7a5e8fa7a1bc9","src/features/gen_RtcIdentityProviderRegistrar.rs":"859df6142afbc442f42b0bebfb093b6c25fe6cf758d35e3345872d1973a7fdd0","src/features/gen_RtcIdentityValidationResult.rs":"000dfd817f8573b4951f3e5b417f56378bd586c1a9a41847a2fd66b5d1ca5ae3","src/features/gen_RtcInboundRtpStreamStats.rs":"a4f242f9f14302884c67a1d960fb65e182d950b3d630e7733cece470d8223cb0","src/features/gen_RtcLifecycleEvent.rs":"1b71a0e5cfec5645edc6b573141c3d2f63a81d918b89dbe5e4bb7c840db93eab","src/features/gen_RtcMediaStreamStats.rs":"81eb58e7a977f42632f2f7ad852b1ec792aee9c3a8e7214eb280c22dd3801b03","src/features/gen_RtcMediaStreamTrackStats.rs":"7212b34111d4da7b5cd7f86367d52a87a63ae74bdd6a0eb1aebbaf0c69f0de5f","src/features/gen_RtcOfferAnswerOptions.rs":"d5e89d48759e310d51bec82349a1a379ff1c4c38d85e05dd7728ca2b13a7b6a2","src/features/gen_RtcOfferOptions.rs":"c0cacdc840be81e81cf311d2949305219dc73fea7bd9b9f5482f9a50aae704b5","src/features/gen_RtcOutboundRtpStreamStats.rs":"e18b652b92ec60b10c5d480af965371efd69c3238aca5f608b7a9b561b754613","src/features/gen_RtcPeerConnection.rs":"218f28ea1fdef63411b384fa73bc5d03517094a8b051df13b9a3191466eb7c01","src/features/gen_RtcPeerConnectionIceEvent.rs":"9c20c2a3986d1af34989de01ffe42e7a1fa04e5e49957f3dfa6ac8963238f35a","src/features/gen_RtcPeerConnectionIceEventInit.rs":"3fbe60a27bbfad6061381494dfa1c9453345250199465a661a52e46637aca89d","src/features/gen_RtcPriorityType.rs":"2c8777cd3f7116c15a17ba931e494f7165860301e8dc31693359d93368df13c1","src/features/gen_RtcRtcpParameters.rs":"476d518c26a94a83349c94f4c2d029d6181e6b178db4a128039da8a63b2ca917","src/features/gen_RtcRtpCodecParameters.rs":"135e2642fd144b7ce321474b3f3dbea0e61dfc4230b6dd31f9a4b639df9feb69","src/features/gen_RtcRtpContributingSource.rs":"d9e2fb9135c445975aa313e10280eb87578127ab38d0aea1b10c0458a338dd9b","src/features/gen_RtcRtpEncodingParameters.rs":"8c880dc71e3d4986b5ca93f1dc39318eba89417427973ef486aa49a58dc860ac","src/features/gen_RtcRtpHeaderExtensionParameters.rs":"093081c49a7af7868d35c22359b399934e065bd3d02b5066ddb11daeaab56bbb","src/features/gen_RtcRtpParameters.rs":"144cc02e5b912c1f4018ee11da41301638e239bb33528c00a41b9299fbbb6017","src/features/gen_RtcRtpReceiver.rs":"03e12412c220be0c43e2482a97b352019ae20522156d310287bdbd2165840b06","src/features/gen_RtcRtpSender.rs":"e97c14c6804a8c8a412fba1d8bdac37fff691c98c99410450ce40e3da26b14e1","src/features/gen_RtcRtpSourceEntry.rs":"f940f1f5e1aa52dd047c2748617445743b0729ecc2ea64011aec0723ba902800","src/features/gen_RtcRtpSourceEntryType.rs":"6c25ef3f3787644cce46919441b5089652809463941cbea85a6b7b46180845f7","src/features/gen_RtcRtpSynchronizationSource.rs":"b04bbed47761c160e875fd938267ddb46481ce65bf8e5bd3ebb219df89ebfacd","src/features/gen_RtcRtpTransceiver.rs":"df74700b9233bfc2344d98e36129aca4386aba7d49a3bc4764334c8e93c93463","src/features/gen_RtcRtpTransceiverDirection.rs":"6769d7b07af5ea9deecc93655b9e11106a4200a849be8378ae4d849424b952c3","src/features/gen_RtcRtpTransceiverInit.rs":"e379af5fa742209d357ed93bb8711f801ca4968f7d0b99ec358240f9b23206e6","src/features/gen_RtcRtxParameters.rs":"98ebc3b95940028adcc60a84df1e8a173166246cfd3bc1009fca346fa01fa726","src/features/gen_RtcSdpType.rs":"9b26bc0b0b6e5f283d9d02a295a12ca10d0be02b5ff0d3d066e6b7424897861a","src/features/gen_RtcSessionDescription.rs":"b39cf338e374daadbed53bbdb1b935a9804b82f0a4109c974ee33d981600b4b7","src/features/gen_RtcSessionDescriptionInit.rs":"921215b7debe33112abeada16531926926566cb311586f44b1f3d10e8d8ae622","src/features/gen_RtcSignalingState.rs":"6119a1ca6bff6ab9c6c1dd75d0c7dca9f20ff7c2d757a21db2e8b87d49879144","src/features/gen_RtcStats.rs":"2e591212811e79cf9a700232cf47db57f3ae24d9f630524b2122b1da8ca23a05","src/features/gen_RtcStatsIceCandidatePairState.rs":"6c83f5a45a14afb3cf2766a837b7a552a783452e98365446b0a5f668c8a640d8","src/features/gen_RtcStatsIceCandidateType.rs":"dadcf6e4d115d475ea31df2ec7d89f8c1bc5f51d8c7105debb03b420f17ba902","src/features/gen_RtcStatsReport.rs":"82bbfd5a956f5490c2c475e426611b8932b82ec0a23f6c2f27ecf5c1b64ab6bd","src/features/gen_RtcStatsReportInternal.rs":"0c933bdb25848df6fd7c9e7b47e61a4fb9dcffe7eeb1dbcd4b99cecfa92f6698","src/features/gen_RtcStatsType.rs":"1450309c6a806fd88f125d1e197d9f081f401763388481df987f0aa8940b470d","src/features/gen_RtcTrackEvent.rs":"0a5107fcdcc08162ce9ecf3b9307dbc160563d5e92980451ecc14b4c1711a95e","src/features/gen_RtcTrackEventInit.rs":"15a9ea9649ee0f1ad7ec4059afaadcbcafc1065af843550ac5b9f215041fbdcd","src/features/gen_RtcTransportStats.rs":"7dca1e1c6df47127fbacbb7c427cf8effd2e31cb548eea6a0d6984ed657a3ab3","src/features/gen_RtcdtmfSender.rs":"9c52c3b89d3c8e37bc771fef7fd426cebca9c1d4ed6dd81aa14504d796aa2283","src/features/gen_RtcdtmfToneChangeEvent.rs":"51a24a7bafda3427cdc77da9dbecd485b65fce5a45af1157b7066ad594d14a1d","src/features/gen_RtcdtmfToneChangeEventInit.rs":"794869bc802a5992da23c5c3e630d9d0531a51d959f9d90827ed156b9df09c6f","src/features/gen_RtcrtpContributingSourceStats.rs":"b0f14187842497820470282ece3c7ed2008fdae9d6ded5bbdb7cce1a97938567","src/features/gen_RtcrtpStreamStats.rs":"91b8de9074c94b25803db6d9f19eb4d7453c72ecd0296b8ffcbf77be38f3d7d4","src/features/gen_Screen.rs":"359f2f3130385f32a40b68464101a723901249ee222aaa1fdd3cafb684991b35","src/features/gen_ScreenColorGamut.rs":"c014ab50fd69b3ada4678bb06f7444f7c131e345e4693d37e7572a73f103af95","src/features/gen_ScreenLuminance.rs":"f485f75b6fc2f60941281fd6904d4b990c489c62ede9d2e422bbfe8bf84f0b41","src/features/gen_ScreenOrientation.rs":"f6da7e3bc5d915a50e592923478cfa1c9dfb9ed37657b68c510c823b72855427","src/features/gen_ScriptProcessorNode.rs":"82e13a9d776612454621162d281b1cd30c2ed93232942a494cfb914a28601962","src/features/gen_ScrollAreaEvent.rs":"09b8f73edec7000b315cb073ba409382c7316bdc58578d771a2c8bf042a95a88","src/features/gen_ScrollBehavior.rs":"c824edeb7edf82a2dce10e9afd17bb9ea0a7b33e563b604dede912dbf3a19eb7","src/features/gen_ScrollBoxObject.rs":"b6106f2ecbf162cc99ddb709585763f3aaae84eeb560d4eb3a3c4eb7ece6cc04","src/features/gen_ScrollIntoViewOptions.rs":"4904b9e86d30a6e67a0538c00056fb40e45861dbcc3465362c48d993be520e59","src/features/gen_ScrollLogicalPosition.rs":"e87e8ddd76362dad66ca1bb2cd2d5999aa82f280235da92585f67d2676423a82","src/features/gen_ScrollOptions.rs":"9ebf73b81d707df7a94ad8795a7f9cd86b939989715a9073a84d857606b69dd5","src/features/gen_ScrollRestoration.rs":"39c0e0d2dbe1431210d13f0c27268c28c6dfdaacde617477df297646fa36d8f6","src/features/gen_ScrollSetting.rs":"16938096f99865deaefbcc2cf0d83235a61290b7995d1fe5cf11fb771b0d886b","src/features/gen_ScrollState.rs":"924a649ae58c3814c3f259e5ef7083e3e2771984243b8186cca9ef933fb11618","src/features/gen_ScrollToOptions.rs":"a7f0a099ab064a238f46be23e51a49faf2f775f4954827930b255fad3e1ebc0d","src/features/gen_ScrollViewChangeEventInit.rs":"0450792f9e911c7a3334cca9d36d586af218d5635583b6747c393261864522f8","src/features/gen_SecurityPolicyViolationEvent.rs":"3c91b1defa63fa83b443b8e5d6248bb7ffab6bd503abbe74ecec2b1a724629ba","src/features/gen_SecurityPolicyViolationEventDisposition.rs":"3e47f38d7536c2c3486941f7de134e429d09c17f9dc6b9f1e3e3e0155abf6071","src/features/gen_SecurityPolicyViolationEventInit.rs":"fe96daaff634c83ca1de8a0fb70e0e8e7e9b31dc35132b4816487e36eca12e84","src/features/gen_Selection.rs":"fa8219337ecabde3c3b6c07d2f7916d449680965fdf3aad02fc85b569908daab","src/features/gen_ServerSocketOptions.rs":"3e14f8d9e1d78177493bd80cc22a347b97d44219fe8a8307111cce17f6c16fb6","src/features/gen_ServiceWorker.rs":"31adfc788f2e0d3485f14478ce5e5aa5487e15c6d4eeedc6c3505d08ed2f3ead","src/features/gen_ServiceWorkerContainer.rs":"254dccf1dcf4332763c17fe9799899b5c3ebca51b264adf26f88e3648d62fb90","src/features/gen_ServiceWorkerGlobalScope.rs":"c597475fceb184e86539125ff5d5c4528a281a02b404df4a0f45a97b2165be86","src/features/gen_ServiceWorkerRegistration.rs":"30e250e798b64308c4dbf058f5067523a29af53e1130b40c1c425ed98f10463c","src/features/gen_ServiceWorkerState.rs":"ca63c9289c07ca36b7ff6a82a144a24a50aa26e684085d9307faffbf6eba2b31","src/features/gen_ServiceWorkerUpdateViaCache.rs":"b1a6b876135e43cbadbede3e5bc17db1f965c5e55773f18efbf9510a1c07e0d2","src/features/gen_ShadowRoot.rs":"da77146a0ff8f1f93043f3232d32f383fb847bd4aa0378e793167d396fe62bdc","src/features/gen_ShadowRootInit.rs":"89e6c3e0b3ce5729432ae6fed937a2c235cbba6a5f073c4122c72a48d2175e1e","src/features/gen_ShadowRootMode.rs":"a2bdc2409cd46a3de86b6f70d848f5650e0e01f4f8892f5f434ceb78e2ae01d4","src/features/gen_SharedWorker.rs":"86fe8ff9dde760b6e0ddda182ddda741ab3d2ece7263ab22e8aa07f2a7b7b84a","src/features/gen_SharedWorkerGlobalScope.rs":"2702daa492b26de185b741ce56d18af2843ab2f0d57459ab55b3087107a3ed56","src/features/gen_SignResponse.rs":"af7b40403e333c06f2e28c8af3d94f8d35406a769a1ca3204e9510c4ee940adc","src/features/gen_SocketElement.rs":"a003e434f8b1321365f193cb0d1ae5c082da82c10502d45f7e05f5f9d755e49d","src/features/gen_SocketOptions.rs":"1f363b39a90dd261314970c52619a46808a1ef1244aa27309789cdeb2343931d","src/features/gen_SocketReadyState.rs":"338b0920535a184291e8a9c19cda1d0dd1bfa2a7a819a82462247c135521119b","src/features/gen_SocketsDict.rs":"e2f1d362eded12c7ab52cc5343dbd85ff66d6f7fd4965affcede648782dd9e55","src/features/gen_SourceBuffer.rs":"de32724de72ddf603d64c7554ded791d22367142b29502ef5a8d50bc1df2ec19","src/features/gen_SourceBufferAppendMode.rs":"edfed4630a1a214606d6deeff55e524e4fa3805645eb43b9d454b141957be111","src/features/gen_SourceBufferList.rs":"13d4c6a9d1c1794312a2c2612077c288111b66249b214463565c828cb8e06d4d","src/features/gen_SpeechGrammar.rs":"9ff7dbcfad4e3c9269dbdcb57c1757e5ea4ba62aa41a221b25adbc1ab2d63138","src/features/gen_SpeechGrammarList.rs":"de1dfedf0d438749b086618655e95bc9872715f11e56dd84d47b7b473b3c817c","src/features/gen_SpeechRecognition.rs":"57cfd5e338c3a287d227d71fcd4cc68c8a481f0699c9a935a7051ad59b647d7f","src/features/gen_SpeechRecognitionAlternative.rs":"b126d92fa8c5112670cd394474872c01b3d1890abdf9cd923d5f28b04f855a85","src/features/gen_SpeechRecognitionError.rs":"880962f5e77c69262bb25da3778811aec90f02322cbb3a2fd5175466f5364310","src/features/gen_SpeechRecognitionErrorCode.rs":"24fa70deff60dcb903baa215e0ea81319c3fab750168b4b9e93f2adee0266602","src/features/gen_SpeechRecognitionErrorInit.rs":"6e902b7945d6d863adf5488bfca85b4fefbb4ae98769fbbda4fe01c2f518f3fe","src/features/gen_SpeechRecognitionEvent.rs":"b113873dab56e39d3794b559854633d4543824d5192a6bf5927654d6cf44af33","src/features/gen_SpeechRecognitionEventInit.rs":"99ec85976bb2e5829693192c61524c941b32b0a279a78f03dbdbb8b78d063d3e","src/features/gen_SpeechRecognitionResult.rs":"5ddc0948f29627ac6a97665046fa717611e7576449b368e54f38f154de7e6e99","src/features/gen_SpeechRecognitionResultList.rs":"ab80313846b12fd9b4cc8e7fc1a546053bb1a26b83e741b2bbaa056f9cdd37f6","src/features/gen_SpeechSynthesis.rs":"fd9a3378b8542454ea66534798d98d387e4752fc34da7f285984f35f7ef290ad","src/features/gen_SpeechSynthesisErrorCode.rs":"a5628a117bf0f676eb184202fddffad9a6ef584e62b85f06f9462233a3a7f4ce","src/features/gen_SpeechSynthesisErrorEvent.rs":"0954a8c93de376e8f01e12090bdfc7da9c7a0b581b6de823f850aa0602f84787","src/features/gen_SpeechSynthesisErrorEventInit.rs":"29e4505ed879899e7c688a33f7038d6d6f77b31bacfbed10ec3c091e72063dd5","src/features/gen_SpeechSynthesisEvent.rs":"f6c0c8ec10af34f13338ca915743c67fc569bd58e8b4cf2aa480195830c6cdf4","src/features/gen_SpeechSynthesisEventInit.rs":"d6efb833df8a6eb9d43eb942db95412d789ef3eee123eb384975f49b415f1991","src/features/gen_SpeechSynthesisUtterance.rs":"5c2228a64338cbbf8eac84e096cb60ce96c4b4dab18da6637535ac5bddb9171a","src/features/gen_SpeechSynthesisVoice.rs":"33ae3252a7ed807288543391c6292b528943befae6d40bc6cc7400fc196d5d29","src/features/gen_StereoPannerNode.rs":"790036a57347be0844dce3eeb613698480dc3cda2911de2dd300ddb922391e03","src/features/gen_StereoPannerOptions.rs":"f91bcbf0f2f08e71d4855822486e716a3caa7abb79c9c97aaecc0c73cfe6b465","src/features/gen_Storage.rs":"3458ab8c089b9c12251797f282a74ab34fb68eaf46485c9398dc87b6b549c588","src/features/gen_StorageEstimate.rs":"0bb3af25f128834be45ebfcb97e6cc23e239ed660ec28ef8baeee85736230320","src/features/gen_StorageEvent.rs":"e3029ba00116b7f949123ccc14b7eeb5b71757048681bc62c1f8adfaf57055fa","src/features/gen_StorageEventInit.rs":"6c5ebc167f00727a6a64dfd9726af7cfdd6711cc17e9acf8a0c75b7847817669","src/features/gen_StorageManager.rs":"9a8fc4582cabc2ea12fe4e8dbaaaf16ed09ddd20515b9847a5d8c8294b6fac38","src/features/gen_StorageType.rs":"21de2e2548aec3d8098624f8ee0a7012ca5dbc9a491ad76662b68d3e4b535077","src/features/gen_StyleRuleChangeEventInit.rs":"76b40eeec026f05e45fb118583da7b838ab632b677ebe813190c50e9b4e98eef","src/features/gen_StyleSheet.rs":"ec9b78fbb41ff82286de7eeafbd493dc1dab5a2178adb53fc1f4836dfbc40410","src/features/gen_StyleSheetApplicableStateChangeEventInit.rs":"6caee0c9ab21a1e1bddb3b7304dbf09c84759448754a08bda6e5eecd9b800ca4","src/features/gen_StyleSheetChangeEventInit.rs":"e4957c236d5c64be5e12d6643b1abef8a9939812e2c3b979ea93c279ab638dd8","src/features/gen_StyleSheetList.rs":"e85da1181baaf5f12f9452bb2853d1134059bf7c9264afcde3f2e230cec7dbe1","src/features/gen_SubtleCrypto.rs":"1ae15a01a8a9e961ed4634bc8052d0a33a3f85b255907ee12ac924fc79aa6441","src/features/gen_SupportedType.rs":"249ed9426b0967b7679c20225e5e5a51cbb3228d64b697a129a944db6e07363e","src/features/gen_SvgAngle.rs":"b52a729e4b32c007eef9fc907128bcc9a8e47a7ef4ab87e9b759d1845ce76a6d","src/features/gen_SvgAnimateElement.rs":"a5cf575fea9fc420722145f437ecb5896b2dc8bfb168ec2ff031318ac55d8c3d","src/features/gen_SvgAnimateMotionElement.rs":"2a20725adf96393768fcbfb79d1d6de8b134c36ecf760349547626538968a115","src/features/gen_SvgAnimateTransformElement.rs":"0e7b16f9239e0329046095fba453993887fb2e9aa4c8c58362f65f28fc41f66a","src/features/gen_SvgAnimatedAngle.rs":"e16ec1265a8375328b660ceae784d64c278f476f421d1b6e39d47c0e5240809a","src/features/gen_SvgAnimatedBoolean.rs":"24e2b9cf5abf16008aabb81b1c7b88c317d5b5ee51af0715927855c0ed6c9f25","src/features/gen_SvgAnimatedEnumeration.rs":"5a3679796ba08066e16fe8dd7a1cd933e4850e792ca9b9622464fbfc5779fe57","src/features/gen_SvgAnimatedInteger.rs":"c9a9060c1759738b177f6e41a75dec263d048899674c400653d15b0cedd90368","src/features/gen_SvgAnimatedLength.rs":"17cdd1d00009767a9b24c95ba0539c143e4acf5e9ac42ae8a6c6d7fbab6af951","src/features/gen_SvgAnimatedLengthList.rs":"17f30ab4aa62b44ace67505919d4c060ed9781e9370bc92a3b5b7ea6f3011846","src/features/gen_SvgAnimatedNumber.rs":"0b94f47c029fed07b6d55865ec01f873ca813a8b7def22ed2edba541e343ba5d","src/features/gen_SvgAnimatedNumberList.rs":"64489b71d888a51f8c393b28f55c3ae4cfb7153c9d7561b7458095e96272926d","src/features/gen_SvgAnimatedPreserveAspectRatio.rs":"315b01fa858424fb1d3decb0cd8392c25ee39ad63d651e1031f0213d25e33c5e","src/features/gen_SvgAnimatedRect.rs":"dce356787fa5f3652c24ec50701964e2ca938bcdecdce4f7004217635dca7637","src/features/gen_SvgAnimatedString.rs":"bba9665cb5c9ab1a65cf42d8d91ec89962c4f28a2b00455b6cd75b45fdfb8654","src/features/gen_SvgAnimatedTransformList.rs":"186985112c03dfa01215376253b23a8064d04badc1c18559a5855d2e5f948554","src/features/gen_SvgAnimationElement.rs":"7f02230a9de6d3ab65adf09dd0beaa455424acfb89702f5fbe476f519dd75e8a","src/features/gen_SvgBoundingBoxOptions.rs":"c66e9b113f404f9213f10a589fb696e77773eeb6812c5bd9ca7aa08c65c6e378","src/features/gen_SvgCircleElement.rs":"28a12097dff150aad65509079e8391501a97c827b16f777ac21d321da11d7a0f","src/features/gen_SvgClipPathElement.rs":"2dc412a00409db064114645df8b9d7144c516b5c3db8cf9a6cd0bdd3ce9372f5","src/features/gen_SvgComponentTransferFunctionElement.rs":"ba5a2433686f01954b04c05d0b95ff77db2ed3ba6e6805c5e30c778f2bc7fbfb","src/features/gen_SvgDefsElement.rs":"a744c2d236cc64cf29e8db050d05b093e2e34e914222d2113860c9ae1067bce9","src/features/gen_SvgDescElement.rs":"6fae2e501d25772dff0ae38f5abab36e44c89ff6409e7b537414b81897f4ba12","src/features/gen_SvgElement.rs":"752cc902029e40c358736411a5132c1e58fe9d9a9bc0a4a48b813bec70b901c0","src/features/gen_SvgEllipseElement.rs":"3572df8517312e845863a09ba58676e0b7a871a7a08c16b681505199bd5afae1","src/features/gen_SvgFilterElement.rs":"0d8b419b98ae482d12b30034a91b3bf62b9291e7768dc8d15e6d701879534384","src/features/gen_SvgForeignObjectElement.rs":"bfe7b528da2dde762c106bcadac6367bbfd5f027027eddc194ebc7ee8c56ed96","src/features/gen_SvgGeometryElement.rs":"09137589fc1f0429eef260998a0531f2ce2f9d7442fdda9f56d77a48269fffc0","src/features/gen_SvgGradientElement.rs":"b6a8f66965553bcd21e16697a9623c799028a889a741fdf4a66a23bd529df3b5","src/features/gen_SvgGraphicsElement.rs":"6198a715ecbdc492144d06965616a45b3c8849be6b4e1247eda69d88e723cf88","src/features/gen_SvgImageElement.rs":"c0967ab2bfcabc51b1da9c0837f97e8537883fe58b1e5b0e69274ee2537b5168","src/features/gen_SvgLength.rs":"c86726fb7c35efd34e4ec3e0279a2bbc54d8ddf7612daca24b1d981684ec416b","src/features/gen_SvgLengthList.rs":"7785c90eaf5c548f2333152f53c97627ec546f3451c21bce4c2407e311d3ec40","src/features/gen_SvgLineElement.rs":"ad2509d3c6c8b3d1168e9c09aa417e5fa0b869508dfd53a2f44fd2f511c9d862","src/features/gen_SvgLinearGradientElement.rs":"eeb7b392bc31bb4b53841e85769bc9e408b3d67cf9b1ed029a04b2fc8f9f450f","src/features/gen_SvgMarkerElement.rs":"d5d80555e65be46800e009c1b7ec50ea83cc7c794fe57628fd6162ce388118f8","src/features/gen_SvgMaskElement.rs":"499b98ab2a420f82587c4149e9418b1bced22a545a2c34d7de5dcb5a4a8b4f84","src/features/gen_SvgMatrix.rs":"e54a525a464f38e618c0989593f9363a77be77733a8b1f5b7164f666667a041b","src/features/gen_SvgMetadataElement.rs":"80e5ae7242c43b2c223f80e2a7ae709346711f18d3ac87d6d5db8fa7f6b0b3d8","src/features/gen_SvgNumber.rs":"b298de768bddeae288d0d0356298dbf265b185e299474a6b58971699b19fdaad","src/features/gen_SvgNumberList.rs":"bbd1dc6d79c0dbf5570e3a89d6ac224ab0260269ad5115e66a6b70e2c078ac04","src/features/gen_SvgPathElement.rs":"549a6c10a25ea4a36a42d9ca89a7621a311725db7906799d224c8dd31a27846e","src/features/gen_SvgPathSeg.rs":"e5c2a0ea3da88842fd39e6ac378d03bc4f871f7a3b7bae3ece3f2357aa69f199","src/features/gen_SvgPathSegArcAbs.rs":"86b2846c402938f6be30bc24de2e5bbf7e41cfc39451c7f8b77ca29bf1299877","src/features/gen_SvgPathSegArcRel.rs":"4c75d74ab1ba7b02fb33eef74ce09531ae433e510024027b2d1c09940c016e48","src/features/gen_SvgPathSegClosePath.rs":"baa62f321e0d2932ccc8c616d7d9311c470ddd04bfb58ac4f18c20e3b469bc3f","src/features/gen_SvgPathSegCurvetoCubicAbs.rs":"c62a29b04de26b175929504f87e29d277f2d9cf993662f7984951887d431cfdb","src/features/gen_SvgPathSegCurvetoCubicRel.rs":"553ff8954c6b034a48e7f459fc9ec73791af4d7e0dd078870058f4d484f1ea1a","src/features/gen_SvgPathSegCurvetoCubicSmoothAbs.rs":"bde697ced633520d881e000294211b76414692b36b6ebcca676c5602a30984d6","src/features/gen_SvgPathSegCurvetoCubicSmoothRel.rs":"38941564fa7a31235a98b1e17793942ddf6e02c3fd33e1eed4ff292afa37fed8","src/features/gen_SvgPathSegCurvetoQuadraticAbs.rs":"159bbde9b146e8cd47fe5660f5bc9ea400858bc1782617420ad127c62436141b","src/features/gen_SvgPathSegCurvetoQuadraticRel.rs":"c6caa01129e60fa64131867be7173eca550d513efcd879e604cd4bb1ae8c1b9d","src/features/gen_SvgPathSegCurvetoQuadraticSmoothAbs.rs":"00bffb67410e1b36f45e9e41e4bb6aa84296f8c4b35b2c0b2844142a984608fc","src/features/gen_SvgPathSegCurvetoQuadraticSmoothRel.rs":"bb15c69de9f6f22b4a837ef186493a7f3c004f20c70783d7dd5d3fff2ca0f103","src/features/gen_SvgPathSegLinetoAbs.rs":"2e180003906ffc1af159941d670ee4531a567d9b42b59daacb3a152481c8a3aa","src/features/gen_SvgPathSegLinetoHorizontalAbs.rs":"26044a1a872f22e739685cd955208557f9966294a5749fb2cac79aed95a09bbc","src/features/gen_SvgPathSegLinetoHorizontalRel.rs":"2157cedf43bbd49c8ac2a20ed754d3d0c2f4606412f1f8820efbe0fb8d7ac7f0","src/features/gen_SvgPathSegLinetoRel.rs":"a7f8983760bfb51de4fea30ea03b0213c8ecfa6f28a8b5aa44311d41d7845788","src/features/gen_SvgPathSegLinetoVerticalAbs.rs":"cff0ae6f2afa22dd256e9729aa6b43891dc9f7b75f52cca30e656b4238b2b451","src/features/gen_SvgPathSegLinetoVerticalRel.rs":"a2de44579ebc00fdb0d8741a9f764ac0a4191b445f821e7d61c4799f98048106","src/features/gen_SvgPathSegList.rs":"f3704ddd4247d1892afcf2edfd5f90e51d9c46870e77bba07b310680ad8e48bb","src/features/gen_SvgPathSegMovetoAbs.rs":"f0aba5eb08f8737dae33c929b327bb8170bf3b13bb48dd5c796ea337be89dfef","src/features/gen_SvgPathSegMovetoRel.rs":"e30131715bd6ad0a79bab3df29df09d62b40994d144e0aeb31ac795c0af8671e","src/features/gen_SvgPatternElement.rs":"ca027659e61f6290e1d8021e5238e565f51fb7a5b81550f36305c4ef5181d4bd","src/features/gen_SvgPoint.rs":"1522a170a4faeb7c057d28e7c148e41d01bb17cd8fc1daa8ad5e0b664b8cf6c7","src/features/gen_SvgPointList.rs":"3ea1ed6441da75ddbe7803859de22c83b547f460431c43ff794b57e486a39944","src/features/gen_SvgPolygonElement.rs":"06ea7131a5ab18e7755b1a3683917951fe9317a324130f5708dd3e70565f4370","src/features/gen_SvgPolylineElement.rs":"841c0029667d488bb7cb07a3d644d9383343e69be36c22784df01b7f96a8cec1","src/features/gen_SvgPreserveAspectRatio.rs":"f61b946976a5bde9e88f4567aef6826588fda50ebc60a7deacddabafea3ef57d","src/features/gen_SvgRadialGradientElement.rs":"bd9fadeeabcc00a6429f95acb82bdf5ca1ea0177c6dc262bfac7eb316b2bb5d1","src/features/gen_SvgRect.rs":"bc3e17242a4cc809099f564913b32317362b5b39adbb3e124869b03ed8255a50","src/features/gen_SvgRectElement.rs":"0c870c3931f167d69984cccd024ad214bf69b730fe4ea4cf3fb96675a4406578","src/features/gen_SvgScriptElement.rs":"ca0cb4dfc0e847501a18d0ec97fd3e54e7b60fc8a56dfcf1f22771b82fd847a1","src/features/gen_SvgSetElement.rs":"a960c07c479b1b031543a669f8ad48594cb83c64a5e50b139e86d8420eecad36","src/features/gen_SvgStopElement.rs":"67a2e6d3a036f8afe8cedad81bc7fe47de162205c4aeeb0803c349715bd8d678","src/features/gen_SvgStringList.rs":"17c1d6e8d4595c198e8e7eb3eb231d29972e61cfb488b161a0afffc9b5efbbc8","src/features/gen_SvgStyleElement.rs":"4c4ab38b5d6f830ad103b3aea3d4456ef8478fd3b0cd862bc18abc5713167f97","src/features/gen_SvgSwitchElement.rs":"8d29b4c2f3ff8665de05425088527dd271d190e614a0f232e37a0b6685766a57","src/features/gen_SvgSymbolElement.rs":"0dd77fea3f99c51e40945ac001c2ee1d08cf46335f65ed1bd548c66cc109d9fa","src/features/gen_SvgTextContentElement.rs":"2647d8753787b93ec443fc3845c215b0a2f1863ec8f8d0ec48bbbb6f24e03190","src/features/gen_SvgTextElement.rs":"3db0831b063fde130ee479f295a494d7e86e8c8b450d55f41762dc3c218c5035","src/features/gen_SvgTextPathElement.rs":"14bcffbda35fe2d02b5b6fde676a301a17bbeb961c2c599c8d9fad1bad35f878","src/features/gen_SvgTextPositioningElement.rs":"7aa0edaa5260eb961289b60f2e44f955f5e22ed36736abe47e63d5338f623291","src/features/gen_SvgTitleElement.rs":"e545f6c9885a1e60acf4436afa6556388022b8ad58f83a1357f2f5608e0baead","src/features/gen_SvgTransform.rs":"7b2f1aa106095ca51eb328b5284e70cc9fa04f7670021dd548ab3494136eb97f","src/features/gen_SvgTransformList.rs":"7dc113fa4bbda8902f18950c100867220aa19b3b41215082316cf395efafc03c","src/features/gen_SvgUnitTypes.rs":"9747e695f4d5cd7e529e453502aff72bb09983e8a767ab9d5a15a8e075f543d6","src/features/gen_SvgUseElement.rs":"822992a667740d5686ce295cccb85976218b76149adf38a994d2baee81bfd54f","src/features/gen_SvgViewElement.rs":"5c37b3f070787486e6f956ea65596c1bc0dd65f04a8085e48ee2a8b7458d4668","src/features/gen_SvgZoomAndPan.rs":"e2b2921c87828c38172966d65246f159e783cb9b163ea782a568eded70a51866","src/features/gen_SvgaElement.rs":"eeb4a535367ed81b505e0b2e722599d25a7ad76a44f283c074d56fcc2f4bb8cc","src/features/gen_SvgfeBlendElement.rs":"68f54754a795ba441e9a0e2954ea21600013d00740008a1e8fa7f8993e15ceab","src/features/gen_SvgfeColorMatrixElement.rs":"41fee54606c21b0073cbddb3ce3c30013d5a3e20d68d19e9176b8541eb3da55e","src/features/gen_SvgfeComponentTransferElement.rs":"5e9a0122706d3f4930c8cca687d1ece623d11fcdc1638cee97886767f348ec97","src/features/gen_SvgfeCompositeElement.rs":"2d0e8b355602c887fee891f86a0afbd4f76df84aa7577fe9e9067cac3c6a4343","src/features/gen_SvgfeConvolveMatrixElement.rs":"e217221a54780f2a1a881c2824c0fff3ec12f69fce9ef21042ab9ac75b8b767a","src/features/gen_SvgfeDiffuseLightingElement.rs":"788292d6d49ce142cee37d733d1a6720489b814d3a242e340af4e1fd2fcda298","src/features/gen_SvgfeDisplacementMapElement.rs":"fca503e59f6027575615fc421dfd17f6e89f2370e45b4a5a93a5893717304ad3","src/features/gen_SvgfeDistantLightElement.rs":"60d8ad6d42897ff3c539e5cc7706382c668fb4328b74004ab943a2f9c7916a54","src/features/gen_SvgfeDropShadowElement.rs":"68fbb8c51d282e0b30a9d74ed76d67fb42c23841b18fef88f93e52dde77dbcb0","src/features/gen_SvgfeFloodElement.rs":"6c262940aa2b251c14d200b8118d2fca051f790d1144717a8abfe37fc2f49253","src/features/gen_SvgfeFuncAElement.rs":"6171bfa683624cbc0b7d75df9f33e624706c3f086b187362be8d5738d55c33c9","src/features/gen_SvgfeFuncBElement.rs":"a71fe49c21f179ce09ec6d1567f72872b5d35de38b808f510c68efdfd884df52","src/features/gen_SvgfeFuncGElement.rs":"99647359494e2b27bcc4fe40422a3edcb7d37e2b8a2d2ccf1702857f61bb99a6","src/features/gen_SvgfeFuncRElement.rs":"68194967b26762c5861652d57c87e40afa05101dbec83b68f118d9fc7a14867a","src/features/gen_SvgfeGaussianBlurElement.rs":"fe08d8e4d39b02a21ba478f636a2019662d84437a160163efb7008636ce54d72","src/features/gen_SvgfeImageElement.rs":"58f798fc4d19cfd32c4e384a76600399b3987afbc23fefcf79d50356697f5e22","src/features/gen_SvgfeMergeElement.rs":"4d99683aca29ee2bb5e2a27b97b500099476448c6421ebd59973e3b22c249749","src/features/gen_SvgfeMergeNodeElement.rs":"e8e57ab8c8ed2446dd346bb4ea0a34e17d0639b89f5466914f02fb6114b3d412","src/features/gen_SvgfeMorphologyElement.rs":"8ef2a3e495700b626925db1d563b5890dd6cb3a6cf0f646f21c08e88a1f94ba1","src/features/gen_SvgfeOffsetElement.rs":"c09b22e2e4bd311a8ce972914a957ebaa5885ff4e154194951a9d668fe6378f2","src/features/gen_SvgfePointLightElement.rs":"5771eaadedeebcbad40a4f7ce2e3290dc5d6501d311131407d7976653672dd4f","src/features/gen_SvgfeSpecularLightingElement.rs":"b8b9e207786b516943c8a80a5a4e1426a8e94fd6e018d8aac20c8ea6df4383d6","src/features/gen_SvgfeSpotLightElement.rs":"9391ca97d19d5a7ac94433e0a0b7003d516ab78bc74585ce4f28fcabf7124751","src/features/gen_SvgfeTileElement.rs":"5d7866e819bc558dab61a412522ee0a55f3d34b029c45cc7e1577d8825717945","src/features/gen_SvgfeTurbulenceElement.rs":"743ca26ca599f50f11a95dfe24aa928ab246896037699325c5b834b996efd0b0","src/features/gen_SvggElement.rs":"d16f65442deae04c6b67dae58d3d815b3ba42482671004a6ae6e71a0a42f4a31","src/features/gen_SvgmPathElement.rs":"73b9c3c86c11115974e2fb4beb62f28e22ca14dc2e5e1dce0f037d045e23d717","src/features/gen_SvgsvgElement.rs":"5a4dd45e93271e2691449a35b393ff66190902788c60d8a55a517e60df6c5593","src/features/gen_SvgtSpanElement.rs":"aca8f8845f36142c2d3c7d3b0da6a2d2a4032a327802259d18bdfae50b50ce18","src/features/gen_TcpReadyState.rs":"c6c38218a04a7f48c6cff5054e98e24f68bba8e3080ead9e62dc57a35f67c022","src/features/gen_TcpServerSocket.rs":"6a5441c0bb8f38b1b55551f9440e318ca56e2c512e78489ee78515723b335306","src/features/gen_TcpServerSocketEvent.rs":"77fb8b39848a7ecc410f9a71f3db2602a7783436975e2ecd17af64cb4673a6ce","src/features/gen_TcpServerSocketEventInit.rs":"db238b8d9ab5deb325929e5f65682e03d0a04dc67b938f4c137c04f2d6a5c571","src/features/gen_TcpSocket.rs":"5826567bbf2ebb37e2435eb3f696b77a3133772b99042e5fcb48dd17a467504b","src/features/gen_TcpSocketBinaryType.rs":"c05d218c3fdfeb03049fdd97a3d6560b7487e872fef23df2eefd615c010c61cd","src/features/gen_TcpSocketErrorEvent.rs":"821762cc2df34624b6b7293d4a573e4e198f891b57a64e3088797e0a95a64628","src/features/gen_TcpSocketErrorEventInit.rs":"95135f11520bbe11dce0f046bbc2aef7c23e5bf1d7982c0dd370dfed85727dda","src/features/gen_TcpSocketEvent.rs":"6b7ddd3dc0f9b3443168c10cf8ed9e37f5fdfbe09c0e9bf27e721bfc7217510e","src/features/gen_TcpSocketEventInit.rs":"1300f1e0bc413ec84133ea31e5f106f2ca949e35494796a4afef9521a0a7b238","src/features/gen_Text.rs":"7b9c813679014c9e3d5e9a0776da14a6cb636ba0a89fe1b2ae995bfd0aea967a","src/features/gen_TextDecodeOptions.rs":"57122588a466e3c602a79e67e3d5e6322a9a38ae74e097333dacca07b40535b6","src/features/gen_TextDecoder.rs":"dd13f4b891fba128bca5ea363dcf166185216bfe2875cca5b88a82952ac27a2b","src/features/gen_TextDecoderOptions.rs":"bc5ae476e1816a84119e2b4387a29346fee5b7102d63bec56cc5c1a33aa8461d","src/features/gen_TextEncoder.rs":"4010e8d0aad37d276b4b4f3725870beb2da325ddef298cf763534869f3c5c951","src/features/gen_TextMetrics.rs":"a5f781fcce5e98b070ecae889a33a126d8e08f043670becc63e8545106e7e3b1","src/features/gen_TextTrack.rs":"d6587555e5aeaf00052be1ce86362c06892c12d166bdde4011f1c4c5a0dbe363","src/features/gen_TextTrackCue.rs":"21aca25510262a705038c899c8942ab175fc51913f000abdc1403680d238222a","src/features/gen_TextTrackCueList.rs":"7eb319aa77e92024336545bd79a908f1f552ba26d1079b4814fbdf85d94657f1","src/features/gen_TextTrackKind.rs":"eed78dbbf9186ed05ef097ebe35d8d89ce44adb5667deedb8d1a28998ce42cde","src/features/gen_TextTrackList.rs":"0a9bf9b89b6fd33ef096ba5773597a350ab57953d07448f71a69f306dbcfa0d4","src/features/gen_TextTrackMode.rs":"e931c50b7bae1bf8d4f8128fb6ba08902ba828c71a3fccb9fcb1f52574e8260d","src/features/gen_TimeEvent.rs":"9f4e621882489525bd5184e23878a1f5d2b74336a38abb2951adb7cdf38dea76","src/features/gen_TimeRanges.rs":"da5dfb312750f2dab3a3ba53b5b6d661394d76aa458a1a7ff143d642a93474a1","src/features/gen_Touch.rs":"57ad271eb835055cb908154d63419dd4c8fde9f513bb8775ec4e3d6f69d3476a","src/features/gen_TouchEvent.rs":"04b852685975a9191759b93848f839cb5520a363db898ec76659a7902c3bbc46","src/features/gen_TouchEventInit.rs":"63d495cf090dc553e9edee435fd95ee305ba2f5668751dcef19eb7c6d8dfb265","src/features/gen_TouchInit.rs":"058dcc615f4bba118e130be24aa92360fef6e7d992849fe512467cd6b63cf0fa","src/features/gen_TouchList.rs":"86463508340402ff944e352c5182ada16b489e3fe4ebea8df4fa90e27ea848da","src/features/gen_TrackEvent.rs":"04ca5466f0b9ffd0461cb5a6fdc748a62ab5d75860c1c6dd5210b4c99950ad90","src/features/gen_TrackEventInit.rs":"311f33cf3bf7927880bd89a62b4897442fcf0f931800b7f99341da269f43f434","src/features/gen_TransitionEvent.rs":"417f136c0b5a56755cc3d70fe61fed28e1538bdd1137a2979ee8314936f39283","src/features/gen_TransitionEventInit.rs":"e268ea3bdee9f7bee6b2a75e9c043ab08baf1ccff19f29f115d1cb51fb5dbfc7","src/features/gen_Transport.rs":"9f284cce5e86bae1ec308a5e894000047a8400a3e448290d93321ec2f7f92cad","src/features/gen_TreeBoxObject.rs":"b0ac1711f076b8b582efcbc7b00c9c922ec4713553383ee5851995ee883db149","src/features/gen_TreeCellInfo.rs":"3d85e58e679a74a8ea8193378199faab65b15b2577dd884eb78d26b477535b14","src/features/gen_TreeView.rs":"51c310aa2e2b3d60a7d07b0488126d9cb5dd56187c31c6777c32a632a0b18c37","src/features/gen_TreeWalker.rs":"9edc4bf05503446e0cc5823ccfa268f86af854ff52f55f53eeeba954de78ac1e","src/features/gen_U2f.rs":"3a7daa83ede40bd467bbda6ee95724cc9875810cad9c2c156ce6831d03b069f0","src/features/gen_U2fClientData.rs":"b2c03a384aa6238ed70eb51275c6001869b5a9af53a356caca9b9e96369d19c9","src/features/gen_UdpMessageEventInit.rs":"49c356c982705f7f5b928065b1388e3c25db17439102f03c79fa7dcbca8d72ce","src/features/gen_UdpOptions.rs":"4ceca10ac8531cbd9e98ca15f747c136bff9608662f16ad2cb39ccbbcf31032c","src/features/gen_UiEvent.rs":"ca6ab349ed8a595292ccad7877f2b31845c2b4cd5d766fea3b244564b2ae0302","src/features/gen_UiEventInit.rs":"451b74c676d136200c36210ff96ccd7e76b10402799c630adae0903b86947746","src/features/gen_Url.rs":"ea67c6b279d0419dc7f1d38c309971619c49740f2df3a049c664ccfca3754bd8","src/features/gen_UrlSearchParams.rs":"6a6d4791fdb100ea0701dd25e8247880e6fd608f7ea8518b6e710ce547e6c3da","src/features/gen_Usb.rs":"f3f74d4de808e41015208195f5c6e998d242e6fc0206e670e2e45fce04408af7","src/features/gen_UsbAlternateInterface.rs":"d67cc9760c637742752dd93f9ecfd132979bb20394c4805a4df061cc1f6dd5c7","src/features/gen_UsbConfiguration.rs":"8025296a40d4a4f91535e8ff6d35d5ea255e921524af77684c21156d9d3c1998","src/features/gen_UsbConnectionEvent.rs":"a83fea0345941c678ebfa41e2b172294d05ef545f6d907c7ba00ef0e22ce11e8","src/features/gen_UsbConnectionEventInit.rs":"65ea354132c5be0746e201e0e7b6220e523ff1cbe3ff3a4d94b81f1709bbfea9","src/features/gen_UsbControlTransferParameters.rs":"543d51d3a1d660cfee4a1fd899876f1dc91ae0c6282834540711766fe07863df","src/features/gen_UsbDevice.rs":"bd44dc706ae17fe454f873025cc28d2df4c8d7f805b7ff8b243d8d0726904cef","src/features/gen_UsbDeviceFilter.rs":"2a4081e19c7b159e03e0462ccd508d3b54ccd65c42fa40d78a9c0ab05b0c6407","src/features/gen_UsbDeviceRequestOptions.rs":"a0e3737644948869fdbb3fa52b8ef087704a173173f9efba9b2bfff7cd8aa10d","src/features/gen_UsbDirection.rs":"c7ae396f989a3d3e1e81bbbf7dd2153f4cfb118a6ee4bbc196e5e9c8789144dc","src/features/gen_UsbEndpoint.rs":"a47f6341e6968c972f3254ad76098b232dadc1a99e6e0ffdaea7bfec551c551d","src/features/gen_UsbEndpointType.rs":"da27bbe27fd480bdc67389c79f66fbd1ee3ef3692f2b34f2dd2e1ad41f3dadd9","src/features/gen_UsbInTransferResult.rs":"6a3f5f915f584c05663624f1a1b855e7ac11395381f11cd88c4c081f01fc1d3d","src/features/gen_UsbInterface.rs":"88b2f94f634365804700d473f6c9a67d698928f9e902a9be9492e1337c928abf","src/features/gen_UsbIsochronousInTransferPacket.rs":"bf93354e699e5267f1becee881f19a1133a3157a314bb71687468ade5cc6d0d4","src/features/gen_UsbIsochronousInTransferResult.rs":"38b40a1e80b4df8a54b93c5ce3301f76096e783332113d552c595ca8cf662b9a","src/features/gen_UsbIsochronousOutTransferPacket.rs":"82b0731f29f9966c426b63e09920a06585985e30f2c8064964375fc2a3af6cd5","src/features/gen_UsbIsochronousOutTransferResult.rs":"59413837db2bd8d3a8cf81c12bd0d9722c799e98d086ab2235915706d39c1703","src/features/gen_UsbOutTransferResult.rs":"88ff1266bd44159ed61e8312b76a7c3d34620796cda7adcdb4b15ad4b55176df","src/features/gen_UsbPermissionDescriptor.rs":"ac9cac3ef3839706efaa31d7235b7e43f4963a0df17de1292e486c9d7f29d754","src/features/gen_UsbPermissionResult.rs":"8f7812a8bf8cfb5e4b7306e82bf7d1f467a09f3bfb6b97a3c30ae6c9c3079746","src/features/gen_UsbPermissionStorage.rs":"3354b6adfef58b809ec807a39877e5956af961c8fd0f8673727399f2cd31e338","src/features/gen_UsbRecipient.rs":"8c3b039753e2aaf1bce5c512b2a068b3e135a2ea53c138d5ae19421e7ed13285","src/features/gen_UsbRequestType.rs":"2828435971a99d76694051b98dd0b8f5804d94124e69c84365657d36f18e632d","src/features/gen_UsbTransferStatus.rs":"eae9df4484d4dfc767f05afba9dabd8020a2ada617747b7d3e2b21b2fb1aef44","src/features/gen_UserProximityEvent.rs":"d2d72ea832948a08e879dd1bb284a335a90ebfb673aabd63f09dc30c3253ef0c","src/features/gen_UserProximityEventInit.rs":"a360df8665aaabc8a42d5651619ca70abb4b7d0c6124652a3d9e2298fb7cf2a1","src/features/gen_UserVerificationRequirement.rs":"b1a35c80f9dec794f4eff81d0719afc0789b072951ed6d2582bb4d45abfaca07","src/features/gen_ValidityState.rs":"af1943bcede18e0d2eb9b247e095369938a5557a404cab2f560fd7b9afb31fe3","src/features/gen_ValueEvent.rs":"b181c6636fe70653f9233d7b5dd07d6c0095bee2d01274edb9953e54659e22c7","src/features/gen_ValueEventInit.rs":"25f950cbf59a4e53b8cf106edf33992b95186c8a3db5444287b23f842ef4e02a","src/features/gen_VideoConfiguration.rs":"667c979393320b5f1eef00e1192a3e477bcdf9f4eec8c2044b5dd33e83a4a7dc","src/features/gen_VideoFacingModeEnum.rs":"b3c0ff4d0788efffbe576dcfbf570bd175e9762ee4f28efeefe90c53a7a17ad1","src/features/gen_VideoPlaybackQuality.rs":"1c1e13aab7651b1a338b78c8c4604c4d2959b32586b536f54f0a05926e467b10","src/features/gen_VideoStreamTrack.rs":"4bd9eff4024053a97f1a079bdf1f410dce6f88db6c032280bb44267776fe7f1b","src/features/gen_VideoTrack.rs":"703c2196c9d815f31db2fb9f66c0675783e63f76f2615f1f2b155f9f9e1b7299","src/features/gen_VideoTrackList.rs":"b1904c399e3ad1e898932ac33676d6d0d6f9ca841aa028424600a35178a39f15","src/features/gen_VisibilityState.rs":"19be9df67e09759e57bf2598638b661a3f841a62020d78451205999342d17e49","src/features/gen_VoidCallback.rs":"b7d95a5cd16c6c2e13cbe81403433c5be60684ae441f8dd325bb7bdccb2a4560","src/features/gen_VrDisplay.rs":"ade0deafec308c57c71e89251a1c2d868e512266fc3487f392fe27052f9a937d","src/features/gen_VrDisplayCapabilities.rs":"871c0eaa1e43cd295fcd5c8ef365fbf0f35b4ebf68af4a16292d0b4b59cf825e","src/features/gen_VrEye.rs":"9057788f049aa66ba43ff5024bb35fb8e7e95fbe58cdd4ea55805795dd866606","src/features/gen_VrEyeParameters.rs":"11f206a2de3c75920438f8da2c20c6b9f9d4bd4c98c650a91c0b82f7bfad142a","src/features/gen_VrFieldOfView.rs":"3cdc50a8bf8ceacf3db53fbdcace3703a6f37784c4c9dc3e152eef9835a27d26","src/features/gen_VrFrameData.rs":"4782710db2f05c88291a7249615df191830a77e5a31e8bb3054b1e3354454230","src/features/gen_VrLayer.rs":"2857b4610478ccdfde7c8328c91df8c7712b2a88d775457438e0a8ce190badce","src/features/gen_VrMockController.rs":"125b2c6615f248d5a7e86c68a03ea13fa61a6d772de65f6352bb71358fb3f0f5","src/features/gen_VrMockDisplay.rs":"720ce2b306c588831eb5458589b749a592bedce75103ecd4aa08c73cf26a8882","src/features/gen_VrPose.rs":"7008271bd1950eea6f15913e4d5b34f4ce134e1100d351110779f79077ec7d16","src/features/gen_VrServiceTest.rs":"bfb58d1fbfe50869fb432da3f821fc596f578b816f11788c85b8acf910745ebb","src/features/gen_VrStageParameters.rs":"7f02fd4d9ff57809dd7da0a2e4f05082bdf4887e02de59d0db61f92f028e45ad","src/features/gen_VrSubmitFrameResult.rs":"f8d306db93b4ea76523dfb685bf1dac8f84e3d1914f26da98fb7052ed2bca0dc","src/features/gen_VttCue.rs":"1f88d73ca5cacfaa808e59d961b48c9f621cd95b18de924e6463f0be7fb7423c","src/features/gen_VttRegion.rs":"cba69f45ed75f5ea0719ddc710f93db836f8842a05a29f3934b79db1d5eba67d","src/features/gen_WatchAdvertisementsOptions.rs":"7ee13feec2e67b5cf66a7c4eef0af7855d5bc451082e70fdf6a553483046f433","src/features/gen_WaveShaperNode.rs":"389e8390dc1a4bee1ba4a3afc9cee5c187622b963a36f8ba1826b31d7ba8a598","src/features/gen_WaveShaperOptions.rs":"208f486b8cfaea54369fbe8d5e0a4bc5c16d8b89713caefa3d0549f90d67a936","src/features/gen_WebGl2RenderingContext.rs":"482256e13fe1478494dc94ba2e29708c17803ddefc3608059564655052e21dea","src/features/gen_WebGlActiveInfo.rs":"489ef1a664aef7b21e9fa9dae1e3624b2c309ad997a33896f4207b31e3fb4190","src/features/gen_WebGlBuffer.rs":"4f1ab8a20c116a8137dcb4a40013f40cd2f3360490448af596bd905c8b84c2d3","src/features/gen_WebGlContextAttributes.rs":"1619f1ee5b0f363f83a6e577a0199ae59e98e705524facb87d7206c231e4fa22","src/features/gen_WebGlContextEvent.rs":"55a4c40df76f77ffcd5e61eec57c4c284ff5f9cd48936c59e83ba7d8ea1eef5b","src/features/gen_WebGlContextEventInit.rs":"e8145ebc13b12a63d60af34b85b0da4f70e99d9e3bed145b323eaa2ce87eb3a0","src/features/gen_WebGlFramebuffer.rs":"4f6f7399c9108d057a7551f7a203a561300c3c9fb5c122b71882fd96f45e2eb6","src/features/gen_WebGlPowerPreference.rs":"37bd86706c93fe1db55831ee4036357a870b2b0f35946b1dc720d43c99ace69e","src/features/gen_WebGlProgram.rs":"ab7f5978df1f4f8734ed495a6bbfb00c0e9316365f75f8c2f7ea71b261d65c0c","src/features/gen_WebGlQuery.rs":"d1affe73839ca2b791a58bd4fab3d343eeb812921a0fb6af555de7acf6e592be","src/features/gen_WebGlRenderbuffer.rs":"77b37d3e6ec405a93cc58e9e444f16f712ac5f2f2a8a7d0447d2ace0757f388a","src/features/gen_WebGlRenderingContext.rs":"779e1e107e690f536b944f14885b38d04f26f3cb9bffa69375368656f2b5f0c2","src/features/gen_WebGlSampler.rs":"66c01d7f72438bb5e463da537f2591a9d7d7d8e871855cb4f0443c177edc33b5","src/features/gen_WebGlShader.rs":"565fe2c214b6f0612f61af504401bb8964586d2e30efcfd9e679261b29ce3395","src/features/gen_WebGlShaderPrecisionFormat.rs":"8e98d68c3d73d3f81990688b3ab9c118ee1726f6822057a2dc27b1006f150f24","src/features/gen_WebGlSync.rs":"877509338c881fdc05cd4cb54d4348150458f6a65878d74a6ef5673f511c08d1","src/features/gen_WebGlTexture.rs":"e732c8bf86a74cc5f4edecfac8cf8f5a11151a1d7827fdb821348004b54ddaa0","src/features/gen_WebGlTransformFeedback.rs":"cc279b6aef9b511d5b82fad731897369f885bda4978da874072c518524d71642","src/features/gen_WebGlUniformLocation.rs":"217705d615bb907919eb39c6b507be1c018dfcd3b5f2a7732378ef654d2b45b9","src/features/gen_WebGlVertexArrayObject.rs":"64b7ead520fc21c16c606ce232526685b3a5a681315690cb7a7199c484d79a13","src/features/gen_WebKitCssMatrix.rs":"5e2b5a532506563f19cb6325e53d9b9313d2567c350c9a3cf1b8b2d63326df15","src/features/gen_WebSocket.rs":"a096a57bf7b827ef4ba669f48289fe6f44739fe9584554c3132f71f164373b1c","src/features/gen_WebSocketDict.rs":"e4e3fc2925c3487d343488f793ccfb1fc227f6fde4ffd337d3f4e34d0a92ae80","src/features/gen_WebSocketElement.rs":"338094542dbe82c6afb76ec0dbccab340f36f39635bdad0533f3d7c530414e49","src/features/gen_WebglColorBufferFloat.rs":"9375d241a136f13cee0cb9226b38ef2099bd28bd881006694096f9474b149350","src/features/gen_WebglCompressedTextureAstc.rs":"01e0f33dc87f946271bf2604d93d11670a70019b3407e7271d9532f4a5cb7a9e","src/features/gen_WebglCompressedTextureAtc.rs":"4371ecab9f58dd8d2727f5dbb7bacc131482e1dbc936a9ecc84c46f5868842ae","src/features/gen_WebglCompressedTextureEtc.rs":"bc6c8f46ab10e8b4866352792f83a03417932b5cea5904247e15a07cb8171c70","src/features/gen_WebglCompressedTextureEtc1.rs":"86d5d35c33c3a5c60c40be84997822b154857e9c7c00a0f5ffcfcc290cd9b306","src/features/gen_WebglCompressedTexturePvrtc.rs":"c45135ec293ff6475aea3c1c6a79383860c6b2a8ddaac62c777c1a2599908f8f","src/features/gen_WebglCompressedTextureS3tc.rs":"4fae612ec2d8efa4885be7484d426876f845f82325d6590f0b222aa298aa6098","src/features/gen_WebglCompressedTextureS3tcSrgb.rs":"330167d63cb1aa9af017fa4a89ed508f7ca11ac6025dc9be9b0b33c55b08cb2b","src/features/gen_WebglDebugRendererInfo.rs":"ea64ba9725ed892a8179e8b01316adfc60f46e3b7ae75ff34c25a9fe4445fe21","src/features/gen_WebglDebugShaders.rs":"d4d8ef96a6d3ec9377c84a4412216563fda01fa0e5c500cd4c43c3f98e6ea6ad","src/features/gen_WebglDepthTexture.rs":"9b844e722a4205ef216dedd38baba893bdbc64b4dac6dd71a8f85557ba2d0fca","src/features/gen_WebglDrawBuffers.rs":"d543ff58043e05676487492ab431a176aea23499036353bbe5ba679f5e328bf4","src/features/gen_WebglLoseContext.rs":"dd6f2d8583c501a71e1f9d62ca9e86553b739a565dba383d8189e5f4b8e9b252","src/features/gen_WebrtcGlobalStatisticsReport.rs":"b75edb84f3760371f1cecc944c4207b77c89cf28489f197de27db4454609e0d5","src/features/gen_WheelEvent.rs":"074399baac351d33c3ffd36490de1bf023a787d7b4c0efafe70766d2471d71bc","src/features/gen_WheelEventInit.rs":"dd7b64a53aa74457aba857d36d03be5d5e30a66438426370c4a7dd47487f9535","src/features/gen_WidevineCdmManifest.rs":"823063e19084ec22c47df8d96bb68259c91f01e4b768cb9f9b822f116ccbc519","src/features/gen_Window.rs":"d6cd19f140f43446ac9cbf94199fcb7f7686b3bbc29930e043ac5dddb257a642","src/features/gen_WindowClient.rs":"ff361e372f34f5e9827fa2d3a730a4883584ff03a160602cfd08c53cda37db19","src/features/gen_Worker.rs":"01d98139644f0071c27f6fa81f4fd65fbcb4ee1efe703e6985ff028f53bbf360","src/features/gen_WorkerDebuggerGlobalScope.rs":"ea05815fbcd4ada52a9ac3b96217c7e49b71c8b4b5ec8a80dc36c17eea0ca5f9","src/features/gen_WorkerGlobalScope.rs":"d16e695939577b240b5a6c7e68ebfad15c4f0f2ea9e855fca7376a0a96743b22","src/features/gen_WorkerLocation.rs":"a19e4ae7febd95960dc7c6c25e494d19b5a80c5c9383934856c5e5c99fec5996","src/features/gen_WorkerNavigator.rs":"23e5507ca9f118e74cc41d568293604c6a116357ab40f54f737eec1865c05e64","src/features/gen_WorkerOptions.rs":"62b6fcc4c3312f6f687ba7bfb6e23bb9fd2a7b4af2486b53eca44448fdc5408d","src/features/gen_Worklet.rs":"ce9a7902e0e57a5361706c5e730a597b8e8e492d4a7e5febf8593f8d03e9f1ec","src/features/gen_WorkletGlobalScope.rs":"c90eae45088cea558148a2f0810b40014aaf7f18c7b80178e43c1e320f676792","src/features/gen_WorkletOptions.rs":"f63937d2a4f3c1d2ecf85c194c65e70d0fc1779cc3580f435375f323dd8e93aa","src/features/gen_XPathExpression.rs":"6b02941d4ebe2f99f8bd994e93a45112eadfce959f0e347b56d2d8d66d6420fd","src/features/gen_XPathNsResolver.rs":"e0cb020c7f401a255a1779da5f1f3152db848f026d76ff540ad1ca46e32cb528","src/features/gen_XPathResult.rs":"cc21c29ebdbe1ec26303ee37955a4fd0866d031c841a857842d99cd86ef6450d","src/features/gen_XmlDocument.rs":"67940fa6b8d801726fe165bcaff989da8a3a3e6a66918dc7ae8e58cfad9ddfa6","src/features/gen_XmlHttpRequest.rs":"f0dac24b0f518b709cdc85c7e7ba69e617ca749d518f4f0a33988fa500b87272","src/features/gen_XmlHttpRequestEventTarget.rs":"85a9cddd8a3107d891fb45f6fe97e7e290566bf677075b144de1735b11f1f918","src/features/gen_XmlHttpRequestResponseType.rs":"822a877dfd730b262bcc76d4273b3cffa19a49a88b2dfffb56c6ca88af15f7e7","src/features/gen_XmlHttpRequestUpload.rs":"a78c2d2e42afbd492547e58e9ff95c1a0742c68d2c3fed7fc93becb427a55d48","src/features/gen_XmlSerializer.rs":"178f20617d3fcd48e976b60a3932763b049e0919b4d4f614f6f1ec4a2944e0d9","src/features/gen_Xr.rs":"14991fcf6c12ee95aaddaa5b2f60c222daff71e8091e787c4678d77e76a2f611","src/features/gen_XrBoundedReferenceSpace.rs":"99a42496a502ef4230831100412b05d54f75743997b626e2b121dfa3e43b1f2b","src/features/gen_XrEye.rs":"4d3dfd0b6059d92f07dca955d53dcfff1892c13d31b5bb65512b9f8b4da9a281","src/features/gen_XrFrame.rs":"48c3b74373df6f9c285c18a1d1702919159ff0a134891556784b6b089c00868f","src/features/gen_XrHandedness.rs":"1df7a74595c1f200f90af667e141cb7df634e98d72dd3cebb41413dd68bc9867","src/features/gen_XrInputSource.rs":"2d66f1de8922dbc8e06e61a7bb8ffabf183de02fee6c0472afc6ab30252f990e","src/features/gen_XrInputSourceArray.rs":"5825c2f28fa2a2c1c9285be5ad5853c0055221b23d28575a87c46e14f0b54369","src/features/gen_XrInputSourceEvent.rs":"2eb0704e038f88c859dd4e2d072aa14ac38159ebbecdf328329aeb0b79ec400d","src/features/gen_XrInputSourceEventInit.rs":"f1fd0cf679cd64aa40ffa062331d710a2443d4917ac3059649fceed8282163ad","src/features/gen_XrInputSourcesChangeEvent.rs":"e1f3ce3c216e715d71ae57020f498ffe4d7ff988e2a6eda5f3003e72bc815751","src/features/gen_XrInputSourcesChangeEventInit.rs":"4c118667d6c11673bd33ca36d89dbfddbaccc6f83e94481a163f4c029d6b0ad9","src/features/gen_XrPose.rs":"f9020f169196e85abd98584afcd16e3fc58deb54398a6b278e51566094092e00","src/features/gen_XrReferenceSpace.rs":"7b8eace89a7386c5ad612b98ef673d0f014519c9a20ef26765a6db8ede5ecdf3","src/features/gen_XrReferenceSpaceEvent.rs":"e905debddfec87eaed677cbd1c9a64ea2d65862c6c285fe8c321cf465e124b2f","src/features/gen_XrReferenceSpaceEventInit.rs":"68d9b141a2ade0e2d2ea9356c2fd7d478a3fe9587c05f0f1e36a1d4779dec181","src/features/gen_XrReferenceSpaceType.rs":"d61b9b6f6487ebd9c04cf63c212681e80db3aa29a4bbb4e0ea116931c70dc2f7","src/features/gen_XrRenderState.rs":"ed90a29f032066efdef9a3dc0dd50eff73bcc50a1919d39a9939c14fb9a4a3e7","src/features/gen_XrRenderStateInit.rs":"daea04b6217bc1b455a5dd8283062258d87f2e39cc8dd281f311357d31419bf5","src/features/gen_XrRigidTransform.rs":"e8785bde251c9a5fa21edadbdd1004507302ce9b99abc01d75fbed4bc838a6e8","src/features/gen_XrSession.rs":"eae09fe86ab04983d54fd6e95a3a3df5ea581bde218a59fb727faabdfdddc7da","src/features/gen_XrSessionEvent.rs":"ede1fbe296b2866a7e1a5ee61f300bddbbeb3a3e84220e082a2b41c9d64d4911","src/features/gen_XrSessionEventInit.rs":"787f5527a2e21f32e686a2355326aa137961f932a3f2fd7a423a207744314fc5","src/features/gen_XrSessionInit.rs":"4a796d65a2ea53cbcc1708c99050429f286ba64a225c36394d8c3a02cd792585","src/features/gen_XrSessionMode.rs":"8917e38178f125be2fe65e29806832f91ed9def6b2dfea268073cd489595862e","src/features/gen_XrSpace.rs":"763fa831a0840abc2d1056d9f572ba94766d34c6da3d2346e52fb3fc6706bf7f","src/features/gen_XrTargetRayMode.rs":"deed03830cd199ce9f5640609754dae3db1c87a9a6cb2e5f1fe6f2db55c15d95","src/features/gen_XrView.rs":"3bf7ab8cedc42b19e9bd8fefb16617ed78ebffbab0581b18c29585b7f3271614","src/features/gen_XrViewerPose.rs":"120b5963e6df13a9e3b34231fd77dd8725334c405131fef4e4ae66fc6f31c49e","src/features/gen_XrViewport.rs":"42dd33801b04520d01cb9c846c1ab29c917c5080aa0d5c16d15bbb6af95bb7da","src/features/gen_XrVisibilityState.rs":"655e21fb9650587196160f998f574198a99cd76052139c89032d6ec099b360b7","src/features/gen_XrWebGlLayer.rs":"47e3928a282c8432b6c2ab2a7faafb69e895cab21192d8547af598884d854c11","src/features/gen_XrWebGlLayerInit.rs":"2d911d2950efd8b7a07226708ed2e57e319386c05bad269edbd6fd8eb4531154","src/features/gen_XsltProcessor.rs":"78c3bbcaff8c5958ff1b54b86c33706e5e9d9b38c225b6ebc3ab9506d7e4e831","src/features/gen_console.rs":"9e6e4b3b024b4506ce846c6f5c624e268ee11afc5073486034a5cae8a9e399cc","src/features/gen_css.rs":"77400ec13ee99fa627dfb8d4e3616911463d3c774faf102285adf08d06a3cec2","src/features/mod.rs":"dcdfdf4accad5aeabc9d18338cf0841752c6856ee3302e38fcbfaf72add510c1","src/lib.rs":"254bd5fa8d7e3234207fdc46b9ceb4718fec5fb5ff99daa039b8da721b2ad43d","tests/wasm/anchor_element.rs":"d81b8164a053cb9bc6e0260f9d02189b1a3b0e6641a2ed6f3a5ad77651355b41","tests/wasm/blob.js":"0941f81ef62f2b79576d5449b1ed9ace4769e8cc9217d73ee5a84458ab301eaa","tests/wasm/blob.rs":"96d1e9ef3ffbe5c3bd4bb08cb7cd5459d9854e81ae11e051fb2cb7464b8abbdc","tests/wasm/body_element.rs":"a685026c9661beb45cfb979b40ac8a4db4888c1a31290c607f1b825f899eb7dd","tests/wasm/br_element.rs":"e173291a963e904d1af98af2a56fea5e0261fa521d0f5bf2190e9db379a02750","tests/wasm/button_element.rs":"7b1b3db27f64bb22bb1d9ecda2312d0c240b751ca0af781b441737fae4d609df","tests/wasm/console.rs":"119e2fca44af45ad2729caebc03480249ee6b7f14aca0714bf6b813fe818fc0b","tests/wasm/div_element.rs":"e07aae54d094c95372ecca15e7b4bcdc51a033c2e832ff128c00579c692fade6","tests/wasm/dom_point.rs":"157b3fc2ba453c71d5dd88afff6645f646234b48b013a90897d22783b9f5b99f","tests/wasm/element.js":"5c8f2c78cba875a619b084603b6d64c481c15dfd1496f963343807fcee74b54f","tests/wasm/element.rs":"14b9b726c2ebf94f865acbe167209ffeba0fbfcc2dbdc2cf2b2c5ee4e256f795","tests/wasm/event.js":"3bb5a3f34d82681f15f64467621eb71a2ee003a941eeea3a86b74b699c686981","tests/wasm/event.rs":"9d14c4fc8e7156c23f79102da32663a54bd414007327c592a8df06c392c9fbbe","tests/wasm/head_element.rs":"7a40e1d68ce01f73837a888813c593e98361a51c43be0a517e4250597dbc46d3","tests/wasm/headers.js":"61d901c54bc6061c253f2e008d83a501a5c474199dbaf11f4f9b4c902b9828fe","tests/wasm/headers.rs":"0bc1dd8e35110563afbcbb8ea859ad4cb75c0144df8fbbe2fff6a2c67a98c95a","tests/wasm/heading_element.rs":"2b03a9e8be6dc8f775a04d567ee5cb662115b10685c4c22b65117571baf2d459","tests/wasm/history.rs":"431de0cb978a8af659bf296bb9b21d7e1bb89a403f22306a08ab8242014058c8","tests/wasm/hr_element.rs":"a8a5a947cf929235f97eb235c35e72c19ecad708db6e0ed9736dbb6714cfd60c","tests/wasm/html_element.rs":"15364d6db56f203d8e5c10096a66d7b93c0058d6e19d8428f140689da8ce13b4","tests/wasm/html_html_element.rs":"eec3cc44e9dfd497ee4f3a2fa86fe9b29bb6ef63a6a3cdf2d222c761939635bc","tests/wasm/indexeddb.rs":"f2db7b9d9f6e5372adcf271846ade7d2e83e7fcecf4e790b06c10b5b42720954","tests/wasm/input_element.rs":"6cdb170516670eec1f4f3a89b27f91d77ec7643a522c993b11ffcd9caa86cd60","tests/wasm/location.rs":"02280feb8888d6cbae4c78c62464a74a948275585a22eebebbaac088f089dba5","tests/wasm/main.rs":"4f96c4d0085d6d49242618f4371bfbdac9f34cb4842ceb1fbcf0dab6b0f5b4e0","tests/wasm/menu_element.rs":"71818d4e62581b4a94f8558c46768341f182cedd2a0a47184e792b5cc2f8dbeb","tests/wasm/menu_item_element.rs":"1b55d1e0dd142ad366dddece2c2f9467d1ec926885311d99f946bb39430b1f8d","tests/wasm/meta_element.rs":"81b2529543adeb894dc148f45f17c5a64e31a2a87a93d5e258818c53ddb9bf8e","tests/wasm/meter_element.rs":"fe2504c6cc10c99ce94d55df0cbfce86d9f2dd88c627e2ffb4d8010085c994f7","tests/wasm/mod_elements.rs":"b678141009a5ebaf55e8171f116e770eee2712cb30884bad42e8a60e12fdbaae","tests/wasm/olist_element.rs":"6ef5067d3e1a3c4efc8f2c429286245dc9874762ec0dda2c6b72dc560fa22f67","tests/wasm/optgroup_element.rs":"f64dbc200f3f700a43f0d4628901a1b9d40f8c818244c52324d9602c4d3a1bef","tests/wasm/option_element.rs":"c841ff8ac3abf37fb0306ff553462195140869dfca978c749a59fd168fd82e9b","tests/wasm/options_collection.rs":"b9071a0a8e659cb59a09a0263ed15453186720653131b8b3bcfb2a41bf8b83a1","tests/wasm/output_element.rs":"1c56ae2f4e530f4228260f0a73e8a124edaab4f35e1e9ba8916601a7a1dcedcf","tests/wasm/paragraph_element.rs":"e2ec82bd46336dc186c9a127330a115ba16749e6e2002f0ed98b6b45ec6e851f","tests/wasm/param_element.rs":"3d0ba799f06d06448d33f47134fa93b3276cf71aea03ba271368259aea9e4f20","tests/wasm/performance.rs":"3e89000a2edd79ddddeea319f00d27988582ae96fd82470c038e02813e19c3f6","tests/wasm/pre_element.rs":"91e5dd0012b33e54a5d79436f10505a33638bb0cd8c623063ea647da5b73603c","tests/wasm/progress_element.rs":"192c833db7e02d30767a2411405ba2989d0be0376dffda4ed696440e1309ef56","tests/wasm/quote_element.rs":"069bc812ee94323550d699968b49c73179f03cd45570c0252ae12943cc90f7c8","tests/wasm/response.js":"d469f28cd408dfb29f41b0ce78e6b9f038e5880f4f7bdb8f817cd8a5c5edbfba","tests/wasm/response.rs":"41cbfee4f5a821baf6f76fd5b0205ed744d5b9d4c8c917f7b70a69ef8241c2fc","tests/wasm/rtc_rtp_transceiver_direction.rs":"c2898d52655cdee52af7f138b7b5858ac7135b692e379d6ae88bf96cc18cc086","tests/wasm/script_element.rs":"43ab8519f106505edf7b260c9ffc8dc6f0601c85f0b52820165a18d104ad3a25","tests/wasm/select_element.rs":"15b7eb6962e8f91d95a8d361f680d588e6d4a90b1603a4ffcaf86ed36067795e","tests/wasm/slot_element.rs":"6f1609580f1a9c3c7a28d6bdeb9bcc85fe15a5156cdb1b3ed838210352f99a73","tests/wasm/span_element.rs":"8674b3d22e539c35348eccdb5ec7bda067664475e0bbe6fc7f93048fb58016eb","tests/wasm/style_element.rs":"258951e44d1b090fad51ec9f88a39189b23db512cd3038ff14a74843676a9bfc","tests/wasm/table_element.rs":"0148fb21f804289f00d076ec2513f264754d2e18ab2b36321073901c4065cf32","tests/wasm/title_element.rs":"45441849b48e9a76b2154b2b2537d2a3de3acb2baea45344e99a33b3344759eb","tests/wasm/whitelisted_immutable_slices.rs":"37f804d332efcb7bfcafcf6311267833c22206b9b720967ff03ef9e909a1a756","tests/wasm/xpath_result.rs":"73b4a266fa9cdeed78995f167ab965d324a049b1acccaa9452030137278b0739","webidls/disabled/README.md":"fed82e8fe36dc5d00b920c4ee9a2414cd0ce36acbe5d919aaf74b63d54a35171","webidls/enabled/AbortController.webidl":"a319d0198939fdb0157fb00958dc9cf3ce1fcf2c9f9b75abb002f531e6d06a55","webidls/enabled/AbortSignal.webidl":"f74eb8fa35d704e08577a79d9dd43af9f85acbb10d5c3f45c13b8095d53381cb","webidls/enabled/AbstractWorker.webidl":"686dd52b59005af6a26c4568587a615aaceb29dacaf62c68d85c49b652ddd05d","webidls/enabled/AnalyserNode.webidl":"bca770c263df41dc7c0c4a84df350b6f26251975cf1b9a10c33afce9e6556c5a","webidls/enabled/Animation.webidl":"023779799f9472feb29799a088a5f06fc4936fc16c5b0656c7f62acc5fc09cee","webidls/enabled/AnimationEffect.webidl":"7073873320ec2290594fce3a860f281645026c0ab7e59926d4a9d999bad69a31","webidls/enabled/AnimationEvent.webidl":"1909fde84b084b7f08c6ec743fbbcdcc999752a82e6e41b1eddc11a2aa993ac6","webidls/enabled/AnimationPlaybackEvent.webidl":"4ad10915c9f09c3c29d916ed60211bd05a4dfc1808134b3c86dd5b59ed44cd5c","webidls/enabled/AnimationTimeline.webidl":"2919663ac49c67b37bec89bbadfa588da6f0151a7f76aefc14de2b401af9f3aa","webidls/enabled/Attr.webidl":"93c5596b9910cdc4b7e5a1d10540140804b913f6144bf92a2ca4908989810786","webidls/enabled/AudioBuffer.webidl":"4daea95aba367af47795e22f95393bc9da6e1d484f81c1b4a42f2fc4479d354d","webidls/enabled/AudioBufferSourceNode.webidl":"f4707cb8c6eddc6b6f66df79aba78ef681a94137d30f5074109fb4229595c0b2","webidls/enabled/AudioContext.webidl":"784cebaecafac8f6e725dd900f2be7224b54950a290e1a3e755355b1a2fd3c50","webidls/enabled/AudioDestinationNode.webidl":"2eddaa6204b0909cf04d5cb0d3f1f5be437627c6c6d6d8406e76236d6057acae","webidls/enabled/AudioListener.webidl":"0bac51bc4e9c6570194f1097766e2e28c24bfd55d465c72e4d03e5d89d787f5b","webidls/enabled/AudioNode.webidl":"03925e17a4186c805274c9661dd78fe47070d99b9d3c6784397f581ff06309e0","webidls/enabled/AudioParam.webidl":"7c05f7dc0f835dcd11df71a14acd8f022420bde29b1538608d94a14675e270e8","webidls/enabled/AudioParamMap.webidl":"5de70145121b759dd3c0c0fae816efd16594ec54e0bc5cede32b3ac07c19d98b","webidls/enabled/AudioProcessingEvent.webidl":"d3e745f7638c8612c935ecdea396a79ced2c85db92ab583663c6eef960b1ba26","webidls/enabled/AudioScheduledSourceNode.webidl":"53e244e2c7f1fac4fc20492eaab362b8a8ce49985b097926eccee8903a0f5a42","webidls/enabled/AudioStreamTrack.webidl":"02808973b874aa79c1a48679034388756a3290c12f82e3628582eb31dbcea947","webidls/enabled/AudioTrack.webidl":"3e522e138f545acc1bf8c616e5dc0f2091b5224db6343bc042e2fc282b44b5e6","webidls/enabled/AudioTrackList.webidl":"042090b55f4177512d76af56c0390ad464db5f7a7885c27782c65f712373f147","webidls/enabled/AudioWorklet.webidl":"46c6d9db119e3ad907c4562d72622cb8b50565cb94bd471785e5a5ec5cfc2eb3","webidls/enabled/AudioWorkletGlobalScope.webidl":"0db8be98680d0a50a1a7c34f61dde3a4f7c8bbc37e36e5c68644229268b219b9","webidls/enabled/AudioWorkletNode.webidl":"152b5807d30d7758536a788df8acc249d86ed0da9ffeb102aa86a6f29a7c0ab5","webidls/enabled/AudioWorkletProcessor.webidl":"d434eeec0f01f4e4bcfffa09265d001465e6c5de8ba04e554c46cf0856580511","webidls/enabled/AutocompleteInfo.webidl":"37c61e3383ed0adbf64c58dcd971526728f38d795e34f4a169df906a94318be1","webidls/enabled/BarProp.webidl":"7090c75a43ded4a69279c21d95cfa93bbd892f28cdf20f07419024625a20d8a5","webidls/enabled/BaseAudioContext.webidl":"929e09821e1984e2d237c4ecd139ae403b4c5a1f10a7286ea68f37b6161e9c61","webidls/enabled/BaseKeyframeTypes.webidl":"868c8af21d1dc070665bb4094ff9120864b51ea782456b15e19735f884bfbcae","webidls/enabled/BasicCardPayment.webidl":"58f8668af928def7f481264e9b188eb8ec37d06a6d2db7f09982527ed12f4c80","webidls/enabled/BatteryManager.webidl":"6e1a16048d8461a2fe741bd8c5a36a7e0e5568aa23df3cf6d9171c25bc410b51","webidls/enabled/BeforeUnloadEvent.webidl":"ece2550a12535f09976d2162f275549786e297f716d0a4a0602f0abba4b88902","webidls/enabled/BiquadFilterNode.webidl":"f8be585db9560d61135c3ad902c8051a75a2431dc978529392f36795cd638c53","webidls/enabled/Blob.webidl":"6e2e9170e0f106f7288d887ab20f6d8c86ac740efec0b449a02b7067aab381ff","webidls/enabled/BlobEvent.webidl":"daa437be043dbb78f3a0ee0f2a6d678dcb1b87f93b30bb1eb5ffcb8e35a91b61","webidls/enabled/BroadcastChannel.webidl":"b01aacde9d3e8a3334a67f361aae9a62c9acbfb26a8895856a1478f6dd1572ab","webidls/enabled/BrowserElement.webidl":"18dc483096ca4974d2db3849f0eb5e1566f907b51461455b2075c36b0c49b582","webidls/enabled/BrowserElementDictionaries.webidl":"b17c3827fe54297b6f219366578a014bcd026696f00c9af69f49281dc11ccf0f","webidls/enabled/BrowserFeedWriter.webidl":"a84ba567abab0e8a514b7a4c15d7f30b42122054a5cae813b74afa149d832798","webidls/enabled/CDATASection.webidl":"d4b63c03dbbe6a3d4f6e4af3e14623275d1a340f63197e99799752daa3b0bef4","webidls/enabled/CSPDictionaries.webidl":"73e457518fd6b582d84056986c34c1fcd1e30bd3efb107693ea577a6c1311e4c","webidls/enabled/CSPReport.webidl":"78e5cfd587b06eefe1c12bb238f7e563ff738b071fea1dc61811f2aa49e5d4c8","webidls/enabled/CSS.webidl":"fcd69a266cf4afa42918686fa6c3905e100d3818e371bc5024466d45e58ded9c","webidls/enabled/CSSAnimation.webidl":"6b22c711173de295a97e58441ba978bcd5b94d9baa61be942f3057a75c68d43f","webidls/enabled/CSSConditionRule.webidl":"db214bd8a2318883f743e6205d9de8bb0d0e6177c3aacbf5d7d9edd53a5ca9ec","webidls/enabled/CSSCounterStyleRule.webidl":"f6d000ed82d6865cd90c1a9c50f92d7bdf750817ffdaa8f4bf48d620396a1e46","webidls/enabled/CSSFontFaceRule.webidl":"776837af265c277f0903163c82463f17522f886cdefe287eccd65e1ccc76b8e1","webidls/enabled/CSSFontFeatureValuesRule.webidl":"5c41b9f45ab3138d14bda783a71a5cd7757bf322fdc6929c5ecfb7766aba6fbb","webidls/enabled/CSSGroupingRule.webidl":"e6643ecd36ffba6cbefad13d22c4e66fd6397ec8dfae872de4f6a9dc71cf14f4","webidls/enabled/CSSImportRule.webidl":"2a86b7d98441e09625f9bbf0c37fb19d156bce2be4a67b38b77ace84499916b5","webidls/enabled/CSSKeyframeRule.webidl":"9be4cfc74e85fc5cd6caae8e0e68c501e230ded614f395b1fb4bbb5ba317a655","webidls/enabled/CSSKeyframesRule.webidl":"7765afd3fa51e1bd48722bb9e9dc4355570108c5ef7a2e829718cba62e1182f5","webidls/enabled/CSSMediaRule.webidl":"4628bf3fb3a1e962a9620c3a9f0e38c83f13f6004821e7f44acc9426580f675b","webidls/enabled/CSSMozDocumentRule.webidl":"75512e059392c8508d4bc1482b8fb64ada87b98c0a49facb03e989da0516ed6b","webidls/enabled/CSSNamespaceRule.webidl":"ad8bf21e6a4ac78ce0121a19a81ef894be10d4181be073e1953da71de679700d","webidls/enabled/CSSPageRule.webidl":"cc9ab4d1c6f97d271072518308ab8ac304349344f0d7eccf79d588a2fef237fc","webidls/enabled/CSSPseudoElement.webidl":"b5301e7127d6f242e986dbe27a28c3a0fef9cd4c4971a40de57226289345caf0","webidls/enabled/CSSRule.webidl":"0c80b2aa8f585e8c079cdfe7501559a03d39eb29f5c67fb28f6693f84b28beec","webidls/enabled/CSSRuleList.webidl":"c154d7193260fd94e0bc6e59004688acbefa5e6295141800319af6b48445bf11","webidls/enabled/CSSStyleDeclaration.webidl":"34b2c1d3dc90a64d51a1846dff540a712f87adb7d7641a60cbd726f593a2b3bf","webidls/enabled/CSSStyleRule.webidl":"af892d9d4e5bcfacda5eb3149d388bab1c48e315457e7da9e634b15641c3e15c","webidls/enabled/CSSStyleSheet.webidl":"cf36dc8af47b22a40ffe62e93b960d8df177ecb88aee870b87e56b329694f27b","webidls/enabled/CSSSupportsRule.webidl":"4bcb8d7322a6946f1e221f50961032e4f7e0d505e1e4036eedbf6c77ece3bdab","webidls/enabled/CSSTransition.webidl":"4eacd7bef998ef2a65c04ccd4cae986412861aa832b557e267f26eb6147713ff","webidls/enabled/Cache.webidl":"08bb3436cf7f7f28d3f50ee95151ba64fbb382eb9d16107b85f6ccc98a760148","webidls/enabled/CacheStorage.webidl":"2241ac3b02009ee05e398eef37c2c1c820f51df51ba9e14921cb53a0e008a9ab","webidls/enabled/CanvasCaptureMediaStream.webidl":"ff0c2ad1b56f355dbb3a839d9d4749dff3f3454ba3e9a5ab664d9281ffe63235","webidls/enabled/CanvasRenderingContext2D.webidl":"5445b1c92b0cddb1c68c5fe50ee59eb3261fd77cfbe4877f215dbd2fdc4ec449","webidls/enabled/CaretPosition.webidl":"ba94dd9aaf16cfc0ccd542c95f3660cf077296240b9dfe4334cd6b5ffe671525","webidls/enabled/CaretStateChangedEvent.webidl":"0134ffce3d0182e79c9d6ff8b7c6cdb4a97d9b2ff9a13561366811cfea6a12d8","webidls/enabled/ChannelMergerNode.webidl":"7f11b5fd15a3f6ac3f044e467cac63a26209cbc4ead0457bfbd41a08640e9125","webidls/enabled/ChannelSplitterNode.webidl":"b6c1dc502e54d04774d49dbedc3e272279e58c32fa7dfa54d79c21cedbf47e2c","webidls/enabled/CharacterData.webidl":"401d0d18bb8f580d95ab049072c8651a017a4d235cdec6f63b08cdf405ea1cca","webidls/enabled/CheckerboardReportService.webidl":"704019da496de4d3a57a2d8a2b7f545d3cae832c80aa7a552848aad28c046375","webidls/enabled/ChildNode.webidl":"82a749ed13c518c2cadee3108ce929e92d943e06a652345b75731b0298fad11b","webidls/enabled/ChildSHistory.webidl":"3fad4c1fe27a81b10d9ea17f8e200c42385b49e73d566ace74854e90b5a0674b","webidls/enabled/Client.webidl":"6dc4103d4e0780b9470a18463c5129556c6fe6892078f0375d8b95b332d6afe5","webidls/enabled/Clients.webidl":"d66e3ecd5f75fbfc35ac6c6dbc41fafa6dea9de7e8e1fcc06ed56f3f0f6fbdc4","webidls/enabled/CloseEvent.webidl":"4be59406394ce09bb52df54fecc0e4d8b57b9a4dabc4c879932de6f18a77c9ff","webidls/enabled/Comment.webidl":"247cdf5db093d5c6cd65026fd01e89bff9238219bb396b9bbacc0414000ffd4b","webidls/enabled/CompositionEvent.webidl":"a2af3c8147069174c6821a08f8c2ac917f08007011e503a2a8665f08777e7e10","webidls/enabled/Console.webidl":"cc605a496fd37010ab514529bce5d4336a3458ec1d29152977372d2b87bf0653","webidls/enabled/ConstantSourceNode.webidl":"b73cd0b4b99f807884e414d02f23cd463f6ce18930c7a7d53404166b5d1483d1","webidls/enabled/ConvolverNode.webidl":"f3568dc792134493c1eeb3695aff0a050583432a62fcbebd6f98f4c965167a60","webidls/enabled/Coordinates.webidl":"fbd19a84b321fbc47e36920e0b928337425663454bf18a008e2614eadcfbca0d","webidls/enabled/CreateOfferRequest.webidl":"3f2c597dab891a9ab706877d247d1813cf08b186b6466a607c98df3b9ed3627b","webidls/enabled/CredentialManagement.webidl":"dfb89f57823e6fce9fdd6609cc7ae47b688847d8e64c8e1413b73d55a5c7da11","webidls/enabled/Crypto.webidl":"3d51d82fc5601a2572def379ba6e7813e16528c6810d624f84bcfdc0a011624d","webidls/enabled/CustomElementRegistry.webidl":"b1280c83946e92851ee8550ba398be763bfa4f03d4a95b9ebd0b2dade83c94ec","webidls/enabled/CustomEvent.webidl":"59ac2bbf3e812bc1e86df4bb99f84775e685d5ae301b0c195d528ede5bef842e","webidls/enabled/DOMError.webidl":"cf1284821ac423e6e12a8364f3780070de8b90e5397001428c9ce0bcb04d92b0","webidls/enabled/DOMException.webidl":"de495751b559812848269705dadf5b47808b5fc26a6001beff46d26f6501a27d","webidls/enabled/DOMHighResTimeStamp.webidl":"a625f3d3afebacf6d9dde7bcc9900e31c22269b280069fb3369be50f651c02cc","webidls/enabled/DOMImplementation.webidl":"c9e3c075f4f675d77f02a1f2411f5e077f5ac73f9dd4054a2186e8c21783ede1","webidls/enabled/DOMMatrix.webidl":"b7d164b05bf953410fd7336cc31acd3134c286667e750239fa8c54bc9b47a654","webidls/enabled/DOMParser.webidl":"5faf36788e528fe708a63b749cf66555bce526dc787a34b4f1411bdc4bca17ae","webidls/enabled/DOMPoint.webidl":"80425c8b3e478ee89d1cb424dc044bd8f0f50b8f4e25978f06c1a9afcc2836a7","webidls/enabled/DOMQuad.webidl":"a5f9c69d63c20bb4997ef0c3606d143bb99133b959ecabb06cd29bdfa73d33be","webidls/enabled/DOMRect.webidl":"9d53d4ea40b863cef890dff5a64d88a9d82476f513be2968b444abb026a0c12a","webidls/enabled/DOMRectList.webidl":"014d3aa34f758ec7f0fc9d22560c5b63a910d0d81e03562b7e42704d244cd02e","webidls/enabled/DOMRequest.webidl":"5956b162b2ff3e3df11de27618aade353105a57f25e01fd1056a528570a999d7","webidls/enabled/DOMStringList.webidl":"1a8808f5ad7dfc317c8be2aee38f371a460c3df4438f5b43f1ffc7fd53569df4","webidls/enabled/DOMStringMap.webidl":"e9fa0acccb357fa2ec3259ba832aaf5150003dea5f37ec1d71f4747667653535","webidls/enabled/DOMTokenList.webidl":"c84d9b2e4d96ff5a80cf130d13ec1f84f4d71eb714180af32e60ff6aa1ba8d7c","webidls/enabled/DataTransfer.webidl":"7f2edf4491d8a9efc41be993b154e492860367eaed1f43ccd8a204fe50b10a3d","webidls/enabled/DataTransferItem.webidl":"3dc5738ca445b0bb1b7be431a452b822e9ae3b4dfae3b415937eddad01180fa5","webidls/enabled/DataTransferItemList.webidl":"de9cc6130335e1fb38fb7c53d71ac52edba183b546748aeafd516518c3787f96","webidls/enabled/DecoderDoctorNotification.webidl":"7433c819f26e6d87b60cbfe3e47b4a01d8459daf2ffad069c4d80942436bfe44","webidls/enabled/DedicatedWorkerGlobalScope.webidl":"e01bab22923ab6e7cd3809cefa757d9488792d0cab6ec43f616ad6181ed14598","webidls/enabled/DelayNode.webidl":"8149532f064510f47f20103ce98aa71324dcf026aa784a180d773c73153a8d7a","webidls/enabled/DeviceLightEvent.webidl":"d37471f88312940800b65663daa968f11c6c3aab73fae19bd9c55f30ca160247","webidls/enabled/DeviceMotionEvent.webidl":"643de66eb3045c9af443bca568786643a83615ef084907932f5a76d998d95700","webidls/enabled/DeviceOrientationEvent.webidl":"968d6b251ea88b60b858f67c9c16e795718e46a0160a48bb8b28b049a509e135","webidls/enabled/DeviceProximityEvent.webidl":"9dd73c557174f955fbe1aa07eca784900015fd06da463b027320f483a9ca5406","webidls/enabled/Directory.webidl":"b10754b626fb2e10d08b96faa5cc518fc857375b7ad6d46bbf621ca07c90a067","webidls/enabled/Document.webidl":"efe0c6ab1f09532b953eb6017716eda90a80f572081e5c4cf76acf00382040dc","webidls/enabled/DocumentFragment.webidl":"a414150e4f5b0b9d6dbdd785fc7c478c03b7e8695016854f81b96d2a66d22eaa","webidls/enabled/DocumentOrShadowRoot.webidl":"b185c3fdde1cbecbf02c5f35306eb8dd5401f02ecaa10db19031cd5202be9eab","webidls/enabled/DocumentTimeline.webidl":"d58a5f2db91c2254b52a5ac93209c255bf51d4902fc89b317f44b0c177ba8e0f","webidls/enabled/DocumentType.webidl":"02cd492b434c876d14176936af762de6e4b8597e899e11ca2781e911f739a478","webidls/enabled/DragEvent.webidl":"af3b57bd2ab3a7c568a8f73bebe456287d4b7a44ce9249f2274aa7460915ae23","webidls/enabled/DynamicsCompressorNode.webidl":"6e7db468e68d848fb6a2b324aaa91d380d9527d2f16389f551fdbf5c014e463a","webidls/enabled/Element.webidl":"daaeb22b1cf4048453774dba406e712da1014ec236a5231b445a9ae8aa4a69d4","webidls/enabled/ErrorEvent.webidl":"54c7f54480c4b0b6d3e0ec8acb0706e3c39d2a8243450e9635465ca49f1d7dce","webidls/enabled/Event.webidl":"60be5c731683290ad22127f06d15d5803becc035df547eb40855ed5449447d8d","webidls/enabled/EventHandler.webidl":"76648d023242168a438b6e1be7251ce9aaf5a7ac97416748ca62d930de814365","webidls/enabled/EventListener.webidl":"d573ff8970014a87094b5e3df0a31197bfeb10921fbfe4155389d6d0cefb4d28","webidls/enabled/EventSource.webidl":"3be1f5955ceb4da1b015fa6c0e6ee322389b1e2141314b3fe85483e83c294579","webidls/enabled/EventTarget.webidl":"40187dc0aa6e641cb0621646c3802db110eba4552755ab404f1861ff316d3b8d","webidls/enabled/ExtendableEvent.webidl":"4857ba825f4dcbcd291ccc36e528d0163d2ce650623b5bc21bda1d73ac2eccf5","webidls/enabled/ExtendableMessageEvent.webidl":"4b156c28fe958a210b4c36c70b10608038dc01d6e4e2b8538fdd838b49204fe0","webidls/enabled/External.webidl":"48d64c8ff4c1336ba62cbd47c4b04f98d71f4e5d18c62e0b35aea8767fcf5596","webidls/enabled/FakePluginTagInit.webidl":"650764c6f953960228adb980789bea1b27063e8425f166ed95be6f3e2a6cd555","webidls/enabled/Fetch.webidl":"479ee79d19b374436c7e64a18392ea4674ce6bf9c0f70fa04c33686cbf4221d8","webidls/enabled/FetchEvent.webidl":"856272f6ada12242a800c2f407a225df180e264b4b50ead4fe3a5bce033199bd","webidls/enabled/FetchObserver.webidl":"4cd88f04070d6d939b8a2edaf8df806a4d1f070819aaf900c406f920cbbfb629","webidls/enabled/File.webidl":"9f4d4364b8e1b5dd818f057859e2a78e4ddd37cfac5c4037bb36561372da01db","webidls/enabled/FileList.webidl":"25ea98ff242e523322790af498b0eb4244d6a043ad40e7021e84b9bcc071f713","webidls/enabled/FileReader.webidl":"2dbae186aa045708e3e4419e85868a649ed516c5ba7ffe751f907d81b14cca85","webidls/enabled/FileReaderSync.webidl":"b2e20aad23a052460eb9477134fc470cd584302fd008be9e63e8199e845fbba7","webidls/enabled/FileSystem.webidl":"ef3f14d145c56fc89e507b2d423fc7784981dfdcc6861b1247513b487c253861","webidls/enabled/FileSystemDirectoryEntry.webidl":"e178d3cfa6af9b0c9ab542899d5319fa927e695df4b2bb5ba813064f6ece07f7","webidls/enabled/FileSystemDirectoryReader.webidl":"d6d9ae4c4b9c3392a5a3088d6cb9fe5ddb1f1bd99f188a6c6d0a7f50c9f87b9e","webidls/enabled/FileSystemEntry.webidl":"06fff476695ad6a2f01befbb70e4b683662de147304ce8f2c8e506a0bd7bb401","webidls/enabled/FileSystemFileEntry.webidl":"262075fbd13231cfb60884b57e01faa9a703e40693fa40b03d8a943fdd466385","webidls/enabled/Flex.webidl":"66353797d8a358336c0ccec47abce7e27af7cac091be33aa070191708adeb8c2","webidls/enabled/FocusEvent.webidl":"785632d65c2c65a83531f275a13f78a3313ed5143e1b27d894b7c7cb92f0034b","webidls/enabled/FontFace.webidl":"373443d52e08d3e9846b3d32f235c3d4906e6a629dd2b555f1736849d744dab4","webidls/enabled/FontFaceSet.webidl":"bcd6059af09a2eaa45582ee7a333f6312a38458caaaab2bd48d0d1de42475d69","webidls/enabled/FontFaceSetLoadEvent.webidl":"77c31560bef55a814579eac3a92adb39bd9f3a1c9994b35c95923b30dfb2e772","webidls/enabled/FontFaceSource.webidl":"4bd55612ff913320383541643cecfcd26049a84ec0d0a138273c2ae83090e145","webidls/enabled/FormData.webidl":"5c0b3bdbec1684060fc4dc3e462e8b28057a7b9b0720a2166a486176d5de8321","webidls/enabled/FrameLoader.webidl":"a77b950c6070f7c76227204ef75d46a7565c8af10ad89d311df3cb7b6bf1ba06","webidls/enabled/Function.webidl":"f23f405c4d9cf82da718071c83b4f8f70c1c1b257bb5067110eed1b37c36b639","webidls/enabled/FuzzingFunctions.webidl":"62442b227444a7c2bea377cd7862f140b6d5ed28758b2816254b04f4e9736e24","webidls/enabled/GainNode.webidl":"bd7b7367d39fdf384204790ba3bd3bb711e00b50be70fa24ac550ac973e37152","webidls/enabled/Gamepad.webidl":"97974dccdfb8842adcbe266f15a777631e2210708edf2f52c7ead60aacf9b548","webidls/enabled/GamepadAxisMoveEvent.webidl":"ea86a6aba28574d9c92c2a5fab7a353c52990819a3c879c2a46d2b0852358a3d","webidls/enabled/GamepadButtonEvent.webidl":"4fc269cc3740e74cf0768e1de19b8b706b110769d3dc67a221bdfc178535ebe8","webidls/enabled/GamepadEvent.webidl":"f696441506b360ffc8daffb102f4ed6f70d8bdabbf34f81639e0008c16b96d50","webidls/enabled/GamepadHapticActuator.webidl":"7c76aa852470fa4e0be4a296b0f40ae30625aebf563ced44c97b47c50f6f84b2","webidls/enabled/GamepadPose.webidl":"e287374f54910af89a3adea7b03e40e2d47543226c4acf87df4432a120648c70","webidls/enabled/GamepadServiceTest.webidl":"ba5f82e91b8bee870cf7522fee6808c50202233af678ccc883535e11f30d8ab4","webidls/enabled/Geolocation.webidl":"de7825ad40b6ddada9ca1491b9d9a244f26e354ea71a1554159f942083c96246","webidls/enabled/GeometryUtils.webidl":"8b3fb64f1fe7bf50a85c580fc1265b4234c4418bc2021cf69eb3c9b3baa700ff","webidls/enabled/GetUserMediaRequest.webidl":"eaa284f01a9ff6104ac39c5c81773d2185e3b580fa106ce7011ca8285aa7c46d","webidls/enabled/Grid.webidl":"df70b1c6d1115e4ee7607e321c0e8db5f4d0c2dbfc1a2bfb9f31e087a7979e0d","webidls/enabled/GroupedHistoryEvent.webidl":"03a70bbdd88f23166189b94332d5af19c3ffe92a64806d7dc7e561ce0a68eea4","webidls/enabled/HTMLAllCollection.webidl":"911e1f71ef504f2ac767746f6824dcb2657a7812031d6c96d654039211fd821d","webidls/enabled/HTMLAnchorElement.webidl":"b47247a861732603ba42d30f23cebf6b9e4c181be00147188df1cd1d09e8c59e","webidls/enabled/HTMLAreaElement.webidl":"532631e8f1560c34603a324800d406dc3142f264b04fd8d603fca0ba3ef07bc3","webidls/enabled/HTMLAudioElement.webidl":"d345663eab59d6f1b4cd89c06815a759ee7dd56ba599b5acf8691b71412b09b0","webidls/enabled/HTMLBRElement.webidl":"0d51f01d47710a439ea5a6990b8ac957a911cfaeda13418bf833c8f3a2950419","webidls/enabled/HTMLBaseElement.webidl":"dac35d6efe54834ec0f603966f32884edfa8e19e84147a0beb9e529e9c5cb962","webidls/enabled/HTMLBodyElement.webidl":"91040e98085638f1d3b008af5095e9aa1cfec26a198d277c9cc45a51db3de22b","webidls/enabled/HTMLButtonElement.webidl":"c8a883c50ba52ea96c948eae621d727d96a97deea79c24bb847fff8a8774a112","webidls/enabled/HTMLCanvasElement.webidl":"449595a837ad01733b566ff1cfedfb9292a2789ea94ef578ef1d85b6b16a523f","webidls/enabled/HTMLCollection.webidl":"9de949e45fa8ed104d65cde5f6fd3d14fbce486f6929d250ad0df4f7b90761e8","webidls/enabled/HTMLDListElement.webidl":"b1d9a3246ae855bc27c772d8bdb78b6eb29d53ea578bce227ef07759d03ba01f","webidls/enabled/HTMLDataElement.webidl":"0a634c145a85789033a38a8a8bbbd2a739d7beb177965d65aaa457cfa2170e39","webidls/enabled/HTMLDataListElement.webidl":"6dbd134a023f91992c8b5c3b0010e96b5ec832bdc9815e9f7a815319fb4d1338","webidls/enabled/HTMLDetailsElement.webidl":"a7594e9a10a37c9428b5c9b12868cc44c1608cdba609c69ae9bfc6a6aba6befb","webidls/enabled/HTMLDialogElement.webidl":"de3563250d1044703779d6885774914293abfc28b9e30b736f4421abc9aadb67","webidls/enabled/HTMLDirectoryElement.webidl":"514908cd8fe9f661ac53aad204f35709601a3a07d39123b7f59e18bc22426029","webidls/enabled/HTMLDivElement.webidl":"52950712bff7f588c8068ae22cb6361a7d7dd12293e930aaebf2de82ebcf48c5","webidls/enabled/HTMLDocument.webidl":"6fd853fc8c560ae6dab74ee3a995172a9d336fe53c8c89cce99e20ecf6d4668b","webidls/enabled/HTMLElement.webidl":"bd7301da0e9ebaef9c5f94455a1bee1c338157f35eda5abb92b1b64fed3ac3a6","webidls/enabled/HTMLEmbedElement.webidl":"f3e0f590bb3aa783a654e6c330ff0aefbf58c4f0282e9b292b3952850a3886bb","webidls/enabled/HTMLFieldSetElement.webidl":"954116d02cc7452304242bc1a1f2d3fa41d197fe638c1b8cf872054bcf5706be","webidls/enabled/HTMLFontElement.webidl":"53245e2002f2be50a73d4ed57b6990f71c83aa9602e7427d39735b161df9edb9","webidls/enabled/HTMLFormControlsCollection.webidl":"888734b0d8fcd38406791ba9f8e64358f36ee7953b3291fcf0ec98de70d25fc3","webidls/enabled/HTMLFormElement.webidl":"40b08a72b8f5a6bc5671cbfbaf2b1764a04ee238453360780b448d787e7309ba","webidls/enabled/HTMLFrameElement.webidl":"27ca6eb4eb8c1d8c970a704b3a5b9d833f5a9306ab38b3b3d0f260a5910880fe","webidls/enabled/HTMLFrameSetElement.webidl":"930323ebfd8d5a1cc5d51e44c7430f130f3cd22dabe06d48b0c98bdd0ac86dbb","webidls/enabled/HTMLHRElement.webidl":"ae5c90df7ced4b6b53d3894f6311d2ddfc319bb82cdbb02d31a46cbdf3b73ac7","webidls/enabled/HTMLHeadElement.webidl":"988d03275a9869bf7e8fa43ca19af6633e8620b6fdc953686eca4aa75c641158","webidls/enabled/HTMLHeadingElement.webidl":"5eaf33184107dadcf275e475ad4514e0d8a284b883c5d041400126cfdb612bd3","webidls/enabled/HTMLHtmlElement.webidl":"20e7b4c634ab5707801b1409d09e40a73d060b0037ab5ebf82f8222c98d1d942","webidls/enabled/HTMLHyperlinkElementUtils.webidl":"a692047eae18831f97049dc6675df4f1a5c5f8074c7f65b305958ff00a342f11","webidls/enabled/HTMLIFrameElement.webidl":"bfb7f7293e7a8490321e0bb72e41fab95bf72cc57172b49363ae0c6245f1716d","webidls/enabled/HTMLImageElement.webidl":"5ef561669bc561ee3d40a7225f1b9b2439bd39eb92c5e5815f9030b65758590f","webidls/enabled/HTMLInputElement.webidl":"0bb9f192f24b8690fd58b79b765afe374de35ee9eca826312dfb47a1af584616","webidls/enabled/HTMLLIElement.webidl":"a69f089ccf8d4c9b7404bbac1716d7d6c9c52a44e8cee19fc524797fc8c6c225","webidls/enabled/HTMLLabelElement.webidl":"20b224fabbecb8f7e8baca8b02d07e2a5d40b9d9ed23b033eb4f970deecf0d0d","webidls/enabled/HTMLLegendElement.webidl":"5cfd37822114dc8632b6fbd945b22e05f0917390d0dedb9c4f25ac9f6accf459","webidls/enabled/HTMLLinkElement.webidl":"bf1ae8f6e0ae80150c086a4f8bd21527fe5c7612dd156a5287f7ff7c473e20c4","webidls/enabled/HTMLMapElement.webidl":"fc6bdad42f4227b6568d616bd989ce6ace9218052f08e96fd5e8e10d907a2cf0","webidls/enabled/HTMLMediaElement.webidl":"3c23886c5869cc83076d8ad757050ae217148f1bf62d37d80db9a229c566434b","webidls/enabled/HTMLMenuElement.webidl":"6c6adaacef6052c67bf00aa25fef284e6c8c2ea76281fa46a2912eadec8286f1","webidls/enabled/HTMLMenuItemElement.webidl":"92997704b744587112e009c0d4cba9fbe50656692a75341ee7a0c999c26a8fbd","webidls/enabled/HTMLMetaElement.webidl":"5e552df9ff76ad54f7984608dc7967a3a138c7c0d84ebdd8157a7ed6713b3023","webidls/enabled/HTMLMeterElement.webidl":"21a8832878f43f57b716d5fe0e99a617492602b971f7fdc23ac42f597968f0ba","webidls/enabled/HTMLModElement.webidl":"63beaf5e6d77e63739acbd6b58147af7d84e665f4a5853445ae160de4cf21b30","webidls/enabled/HTMLOListElement.webidl":"07bb6b740fa7f619f621e8693e07932c6bb67747e2a5556685dcf3ccbafe7a04","webidls/enabled/HTMLObjectElement.webidl":"077d847e31bf725d78f8adaf2e03fa0229753461aaa50a223c88f13a46c20ad6","webidls/enabled/HTMLOptGroupElement.webidl":"bd91a7cf0eaa65f217e7cf47e54d11a4315245209a52ba846d770392921ed15b","webidls/enabled/HTMLOptionElement.webidl":"0d6dcc38b9a6c799aaf5937725c3ace50a6629e05fc4621d8caa901a4e7536d8","webidls/enabled/HTMLOptionsCollection.webidl":"339de15c91688b5b88db589431493bb91e77aeb33f27370d98fd655c9db18d3a","webidls/enabled/HTMLOutputElement.webidl":"6682a865158c147bcbb173aea4b7b9cad55505637c182e857c7ee3edbfaddc96","webidls/enabled/HTMLParagraphElement.webidl":"259b49192386f7448a548ef630403d576e0489d43da92b1fce891856da83258c","webidls/enabled/HTMLParamElement.webidl":"cb4f844f9698cfff48b02cdd7fe2c2820dc7c0f5b5e6ec24c27cddad25810e63","webidls/enabled/HTMLPictureElement.webidl":"b0bcc2f70ac7ea0835669bfc7f51676518f1cbb68f388f3ea8ec4e4f51df4974","webidls/enabled/HTMLPreElement.webidl":"1e6619dd4b9a111e9c9021e5b25be43cda52ca97e2d07e3c4f695cdd557f4f02","webidls/enabled/HTMLProgressElement.webidl":"3dc186323a3ab7837afd1feb9b1a0bf647677dea57d0af691381ee5e706f6cd7","webidls/enabled/HTMLQuoteElement.webidl":"6e2da7bdc4cccdfe1e9a4a0eac8eec04366bf950edc279c1f0adaf15b85b5637","webidls/enabled/HTMLScriptElement.webidl":"2ccb5d8577c1f59af4162b00289c4bc492faa97ed24bf1156c69a39a2ebd4a0d","webidls/enabled/HTMLSelectElement.webidl":"228eae3eaa5c155b11c1f8b999720bd73e0558da78b682e6ec22733ad8065d3f","webidls/enabled/HTMLSlotElement.webidl":"0596089d5a147ac30025ec605b3a3153cd23d6ce3f5bc44747a4d2841119ec96","webidls/enabled/HTMLSourceElement.webidl":"94aa3d4813b51191598cb03db140823663cff47ae30ff42a266fdf7451788233","webidls/enabled/HTMLSpanElement.webidl":"6423fbaca98b5ce2ab38321ca5f1f172839ee46b9b2ae0674c4b6a27ead11d19","webidls/enabled/HTMLStyleElement.webidl":"fbacc26b670030072a883935f76e3100babc35d6f941fa1f8c7f5818f33e0127","webidls/enabled/HTMLTableCaptionElement.webidl":"958c408d02849c9cd19f31a9c5e072f5d3430b966bc271d80162292b3651608a","webidls/enabled/HTMLTableCellElement.webidl":"c84cf7b3a19d63fa1bdece8b8bdee3ed9c406466612170bcff633a769c7db83e","webidls/enabled/HTMLTableColElement.webidl":"ed7925a256b258e1c12cc23906513a8873f0a250964285f46ce7f7562273263f","webidls/enabled/HTMLTableElement.webidl":"6642918b6c9fb7ba1123322fd6ff3c1961901989b80442ad3923bd25a0efd601","webidls/enabled/HTMLTableRowElement.webidl":"e4179070615991b3945b600088654fd15ad488bdd2d5c5e0d63c505aecf42bd3","webidls/enabled/HTMLTableSectionElement.webidl":"7247e0101de978da4e992411924b4e308d66e5ed0e67caf3bb387f458a52ac68","webidls/enabled/HTMLTemplateElement.webidl":"856f72fe1152031a0723dcc0db42981fd178535110e5b3464fe6c6961abac80a","webidls/enabled/HTMLTextAreaElement.webidl":"75be70ae5fc540ad47f00ecb6d1608539e09accfd9297e9baafb68f8a662e054","webidls/enabled/HTMLTimeElement.webidl":"e3600955169b12d39e2c28350596c6dad1cfcad1e6c7aab7a796443851135f9a","webidls/enabled/HTMLTitleElement.webidl":"2a19cb43661fc288db244f76239a0615e8708442f14f19564d885f2171b39e2d","webidls/enabled/HTMLTrackElement.webidl":"aae1b41c17c99812bee6dd027c1cdaa7c9837c25bf6aa7f6feec249132c097a1","webidls/enabled/HTMLUListElement.webidl":"386d32f21bad1d28bc7dfe52eb3c145e0d1af972e0e15ff1f045898b323a3835","webidls/enabled/HTMLVideoElement.webidl":"74752f0439de22022f063ebe1af45e87873745e879d8a66d11731444c81f9580","webidls/enabled/HashChangeEvent.webidl":"d2a74c3cf0c3f324a72bffe00f1510bad07a471a29f0cd0d8503aacccb10d23f","webidls/enabled/Headers.webidl":"e1813f9bb6af1f481c92e09b9a98787fa04ba73eb9483f5019be55430f1a581e","webidls/enabled/HiddenPluginEvent.webidl":"3e0963c7234e801be89c767237b587d2de0411347c9ac3a12aa83614b2436108","webidls/enabled/History.webidl":"1a1f730026fff73b55915a86256c445f677a9e60491cbdf9a9b534694601dce6","webidls/enabled/IDBCursor.webidl":"2e2a45d6baa4538b488d1b04567d6c18aedbf55a25f774197bf529561733469e","webidls/enabled/IDBDatabase.webidl":"ae3df70f19f2158328da71cf3186d4f318f2ea601c4a74086a09df0c1f98f799","webidls/enabled/IDBFactory.webidl":"d083eb421265c4244c718944a9606364f29cdee014b7065f39978e96f172d2d0","webidls/enabled/IDBFileHandle.webidl":"6dc69328c528373d5b0729133a07088a07ebff274c523e286a18eb0b7b1ce694","webidls/enabled/IDBFileRequest.webidl":"9e353c0027b43bdfa10267c5c7394faca6b6fb5b5c543e83f3f716e50eb3c5d4","webidls/enabled/IDBIndex.webidl":"2e4f1000f4d5b2af7094bc981eca2131a020ef5c01e6166a71268a01cebf43f5","webidls/enabled/IDBKeyRange.webidl":"2fcb022d462bcad22be8c26326e625a960afd33971a0d059405d33cb6fc1f13d","webidls/enabled/IDBMutableFile.webidl":"24384645ce4497d5c05c87254a9374bc8eb0150d989e6628a0aeeb5d7112d595","webidls/enabled/IDBObjectStore.webidl":"15e9d390744e643b5116be4a311da8ce5191ad4487c1b02e45cd32741555bdb9","webidls/enabled/IDBOpenDBRequest.webidl":"e276f9e0886c0db0729c42e6a505083d744391c750d5356d1bb923ce88c3b71e","webidls/enabled/IDBRequest.webidl":"61648cf7a5983d8d764e020836e17e076d28f0c61831aae3cdd804009613717e","webidls/enabled/IDBTransaction.webidl":"b10869c54f13168dec58eb7b77a0d844747bbb8c1f5a92f93035adb07ee1962c","webidls/enabled/IDBVersionChangeEvent.webidl":"6dc880e91df87e3cc885c8a1c9f2fc0f3936701f0d9276e2d4636282c645c0b0","webidls/enabled/IIRFilterNode.webidl":"52c927bdfdaa6398c6ecdd07ad9b78e2e52ca1930858de3c61d9693f773e499c","webidls/enabled/IdleDeadline.webidl":"fc18e1e454adc488d4fbcf6ab6716c872001402d87839902801120a248ca5949","webidls/enabled/ImageBitmap.webidl":"2a34698350ae11aa0184db2b259e972cd7899f24ace4b143c39da4c7e564f992","webidls/enabled/ImageBitmapRenderingContext.webidl":"74f023f995036cfc5a4ab4a31b8075a8e62166faa8c04a174fda77427f41dba3","webidls/enabled/ImageCaptureErrorEvent.webidl":"d6573af4e4dfb5e46fb00d7c1ab8e9309a0e589a4afccce76cedec5953831278","webidls/enabled/ImageData.webidl":"f9af056bde477d5e0f33b4a15de4a90e5c14a3b47a77d084ef1c992482f8d87f","webidls/enabled/ImageDocument.webidl":"f4be384237b42e88005acd4538976614db6258b3621e1dedefe3ccea061c4971","webidls/enabled/InputEvent.webidl":"5391bf07fda374c3841c200b25b99280d6212ed3a832d62584c68dea123afa8f","webidls/enabled/InstallTrigger.webidl":"e0c2ccd3607658e0f0aa8c4d86b4e6189f5db7886471841e32b274278a433794","webidls/enabled/IntersectionObserver.webidl":"27db23a135c4ab3570b7f2dac995e9a9b6576983f87339bab0ba37aa512bec83","webidls/enabled/IntlUtils.webidl":"57f74df6b5666e29cb8c065bca9a4ba1bce721d5b8ffe551d7bb1d02f0f892ed","webidls/enabled/IterableIterator.webidl":"baccf4e84a6b0db6939d0513bda2ee3d5c9368b5c3c81abbf2eac36232ee8891","webidls/enabled/KeyAlgorithm.webidl":"0e04cffe31f96f7e2807bb2dfa1e6bf02462815d693c8a3aeae949ed9e21a7d4","webidls/enabled/KeyEvent.webidl":"adde8f3fa9edbaf0373d32638ad44cd20d6f2275564774840b9cfbe9b21c2015","webidls/enabled/KeyIdsInitData.webidl":"74b45f0eb628afb2b9c6f8cae2b183199dafdccf9b87744dc1b1bbbf9114f6aa","webidls/enabled/KeyboardEvent.webidl":"d175066375c67b9c08475f65c0ddde40ba5e53f4952beca86f243376ff97f370","webidls/enabled/KeyframeAnimationOptions.webidl":"68d0e95aab8b82f4b2bbc78211d7625b836d412f9cffa1f19c0b89b7cd14e589","webidls/enabled/KeyframeEffect.webidl":"c32ecf113886ae8971e297e41c34c871aef7ec7affc98d7d13bf340ed7e8aba2","webidls/enabled/L10nUtils.webidl":"85fe322b17bb6a46d2dd889a631b8bc82799beafe283611f28ac0a8355fdd2b8","webidls/enabled/LinkStyle.webidl":"28e1365b101a6d7b254f4f12e8a355df5fc7aff6bbedf0c4d9e87565425989a1","webidls/enabled/ListBoxObject.webidl":"619ff9d051200bc369155cd00c8761bfbeba57dae2183b7893414328eb8e5ed9","webidls/enabled/LocalMediaStream.webidl":"0081e8fc581f8e7e829e6106e6f598b4d614242014a83f2c0e63c07837a04798","webidls/enabled/Location.webidl":"a1f1bb28d2da5bd67b68fd4d945e378f8c2740a034437007034c2e930ded60c2","webidls/enabled/MIDIAccess.webidl":"58f6e706e668360ff02f794fffc8f81dea879f68f59ae9d2d13f18d3c5916f80","webidls/enabled/MIDIConnectionEvent.webidl":"8775a52412a3904f46deb8635f14e18701c36fdf9084f906f573d22a7de3486d","webidls/enabled/MIDIInput.webidl":"11a4eeccc4ab74501291d25d7d5068dcb689721f93ebefe40653d3a95fa6a75a","webidls/enabled/MIDIInputMap.webidl":"6a356c20cc9bcbf679ea7e8d2deab519fce8e6b7390f309da7bf425b18670231","webidls/enabled/MIDIMessageEvent.webidl":"fe15f6b56f1a102f04e13f2ea544f5d37a805f8e01b305d1caee76ed40fc8c0f","webidls/enabled/MIDIOptions.webidl":"3ef87d615386ba5cb1ce19b13fc430488476246a8970bc0218795139ef3b039c","webidls/enabled/MIDIOutput.webidl":"57621dcf012c636911474c898ca9dae74fccbc41fffc5a16159771178848e2c8","webidls/enabled/MIDIOutputMap.webidl":"f68fa016132b90ad2a18bc4fc024a24568b7ed85379238698eae3d38aac01b3a","webidls/enabled/MIDIPort.webidl":"3fdda9ee45900012dcb6886cf5ca7465be826dba05305d4a9d2ba254e610e76b","webidls/enabled/MediaCapabilities.webidl":"26019e7e198c2b17df984c4df5e78836ddd56c9e1eafd7e09f7f52e6db478d32","webidls/enabled/MediaDeviceInfo.webidl":"39e9ae3834c61db85ae2f3ba034a7a69e721dbef396823615cdf79f410cbef9f","webidls/enabled/MediaDevices.webidl":"0dcb1d9691beca2c64dfa3a03b0da9a2f67eeff8a03d2eff50915b5979c1cd44","webidls/enabled/MediaElementAudioSourceNode.webidl":"8d1e8f589128a98d46ead4393ec012a44c1b8848f72ede824afca1320040d825","webidls/enabled/MediaEncryptedEvent.webidl":"0370afe3a99060853cf2d3850afb494f7f0414eff53788c1b6e92c0b60338b6c","webidls/enabled/MediaError.webidl":"f7040be08c475be0176a8eff443f1cde81d26a9b76ed71b7a8485e7e2d424448","webidls/enabled/MediaKeyError.webidl":"2ee05d150360dc18e1da2a8143a7a883a73292c7498c18496703a522b7310d96","webidls/enabled/MediaKeyMessageEvent.webidl":"2663944d4bca18a5a26f5d1ed63ae22b6180eb042344b86441f319bf8f02ace2","webidls/enabled/MediaKeySession.webidl":"808e30d9a46c15ebfe258075722b1096c8669505873b4c468c9b2ba23704ab24","webidls/enabled/MediaKeyStatusMap.webidl":"4f8ee56ebb7e6bb9ecce7755d2972b2c4cd58d448f9201b92420e3ce3ba7036d","webidls/enabled/MediaKeySystemAccess.webidl":"001bc4ad92c0bf64434d7bca21a51de2eaee9d64c412fc7c9300d5d22ac6de14","webidls/enabled/MediaKeys.webidl":"7f6e87c4b84dfc9c69c7655a24686aeadd73e106f28fc9157460601aa043337c","webidls/enabled/MediaKeysRequestStatus.webidl":"ea6e75921cfe8326e7363314e8f26d54af9a0e95979187e91fb946d0be063bf9","webidls/enabled/MediaList.webidl":"74de965ebabbdbd724bd586f6b30328e1dfe0ac8db36604984134e5dd2ad89f5","webidls/enabled/MediaQueryList.webidl":"b399a51efa2025a24c9f5e1bef7fa80f5d650377839bae57d2f32df62e4db522","webidls/enabled/MediaQueryListEvent.webidl":"a7b021abf05e8d95222c0125331af9a78eee1f4a93d68bd81f9157925a29725d","webidls/enabled/MediaRecorder.webidl":"33348887f1bbe57d64eb478dc4cdf5e95485ee70ba608e34861a134ddcfcc864","webidls/enabled/MediaRecorderErrorEvent.webidl":"8b92015f20fb6f7713a86b78775a1c1409b836101c9528ad30f58ffe9d441039","webidls/enabled/MediaSource.webidl":"b1cce86a3aacc2cc42a63ad96dd674d5004026127700805febb56a7c8fd1878a","webidls/enabled/MediaStream.webidl":"fcb79371eb57f7218e9d77b836cf9e89be681d4a82382cb269443663d33cd05f","webidls/enabled/MediaStreamAudioDestinationNode.webidl":"97ac421a9aa230abdde89655bb11a3191b5868aa91c7f1ddb543106923ec7f65","webidls/enabled/MediaStreamAudioSourceNode.webidl":"08ffe8661570e05d5f14a1a98f667c75490b71a30e9aa41f0c2fb6d1747d140e","webidls/enabled/MediaStreamError.webidl":"8d5b8ca56dc1a2de36920227cc760eaba720cfc475c8b2a54477002eaf5bc1b1","webidls/enabled/MediaStreamEvent.webidl":"c88d8691cb94213bd1f7e37c1133a3665d6068991ccd6415fee41cbe6ac2d8e6","webidls/enabled/MediaStreamTrack.webidl":"446fa1a68f2839bf7395473bb929ad28be407e80debd7d2d57d985b1a202c173","webidls/enabled/MediaStreamTrackEvent.webidl":"6f33b799bb7e2fb3488614e3c90ff880c3b826be1a218fdf138b7ed6b99c98ce","webidls/enabled/MediaTrackConstraintSet.webidl":"da63d3cdc6f7933857d9bba7e264479f290ba03f998582812e402aab27878bc9","webidls/enabled/MediaTrackSettings.webidl":"988264c143728a0bca54193a7f22f93226d29b00e8a72c8a32fc56900cf019fe","webidls/enabled/MediaTrackSupportedConstraints.webidl":"b2824bee249132b4d2c2a4712427e7c2ef9ecbd453a8cd8cd14d304f10c07971","webidls/enabled/MessageChannel.webidl":"6efa741daefc8bcf42fae3421300772320b3ca6703a173e0d336f99e260bf890","webidls/enabled/MessageEvent.webidl":"3362fbe943a3d14ea9ce3c627e8493ebbfb8f07538a6f14e02079ad8dac7c097","webidls/enabled/MessagePort.webidl":"c9b1373d6900344c2c0eb89eba5be91041cfc0975b6294e99de0a9fc7d032dd7","webidls/enabled/MimeType.webidl":"757626dfb9f020b59cd3f739ab46022cf281e4beaf4c039aa515b167ee70e246","webidls/enabled/MimeTypeArray.webidl":"4c6ae0d0c6a967662f8cff4bfb33f26f7479a603aa8540b74fecb2064277699b","webidls/enabled/MouseEvent.webidl":"cab1731afe353b2bf7ae9f74f6091e7313e905cc0d63da71ad63fdb2cdeae910","webidls/enabled/MouseScrollEvent.webidl":"fea46e3944596b54e3d2699770694f42aae140afd63f58dfe24a129157dcf9d2","webidls/enabled/MozApplicationEvent.webidl":"75512e059392c8508d4bc1482b8fb64ada87b98c0a49facb03e989da0516ed6b","webidls/enabled/MutationEvent.webidl":"e4cce023edbe9c6b4eabd23b87d197f85628838e8b1f7b8100aeb4e5dbd199f3","webidls/enabled/MutationObserver.webidl":"a82560b2778ee60fea84a6e9c7bfecb5eb8b2b50a7fabce014675233bfea00b7","webidls/enabled/NamedNodeMap.webidl":"149542c31147345d43d93d670b0e856a1dde4d5c534cfa52d8aa584ee2153af3","webidls/enabled/NativeOSFileInternals.webidl":"b518244fb86ba62334e13f42a561a3a48e520321c196a48c024359c6eda3ce6e","webidls/enabled/Navigator.webidl":"cc24b4212020b38b133507183fc7a173f4a46467c84ac55cfd74f95f0d7959b7","webidls/enabled/NetDashboard.webidl":"99f5150c764f90494142efcfd8a2cb824b44f1190189f9aaf30af93cd85ccaaf","webidls/enabled/NetworkInformation.webidl":"de0820f9049746b459e5dd2a4dd9e40404c8857cf31c12e29fdfbac1fdabcb62","webidls/enabled/NetworkOptions.webidl":"8782c373d76d76f336decce7274f43ca99a896d961722026898eeb60bcb473a7","webidls/enabled/Node.webidl":"8211c13ac9a626b447d2891f6764842f714b2c1e73dcc1b44ef23d545588b064","webidls/enabled/NodeFilter.webidl":"527355d4a296696054715a80a30231ea74cb5927b5e940ab769bc3bc31aa0d5d","webidls/enabled/NodeIterator.webidl":"f5b20bca6adbfa7e14ae2d46eb216819cbc670c54288407271ac6760ef231f12","webidls/enabled/NodeList.webidl":"4c7d5d3149f3e79087e89108430acd4e9deebe531a946e23f91f3fee9a20b712","webidls/enabled/Notification.webidl":"1f7ee993ee4993e24ca4a6251c6460f63c4b72c1eed64e913101570522f095f2","webidls/enabled/NotificationEvent.webidl":"abe1d7da9d0dd1a25f4b2940d5b0319f4ab130a9f856738de7b97864bdc2828c","webidls/enabled/NotifyPaintEvent.webidl":"7e58bbd1dcdd2e3cfa25ab411495045872fc4e9bdd126764fe2f5ecab7996fda","webidls/enabled/OfflineAudioCompletionEvent.webidl":"87284c182880aa88a9dfa49cb8375594bec1f9af6475d20c4d54322bf3f49650","webidls/enabled/OfflineAudioContext.webidl":"48af81c9f50bdfcdbe80dcc50363f1ef0a6e2b0fa54948917c0e865a86dd8b58","webidls/enabled/OfflineResourceList.webidl":"6dabc602d066c2824ad95621243a505f1f6b842699d41ac9e61c6a35a0dcda45","webidls/enabled/OffscreenCanvas.webidl":"74c97f6e287477de6e7d14359e7f7e3e65f10fff0beb9241335bf2bb056630ff","webidls/enabled/OscillatorNode.webidl":"f6c2b954f63b18638959b6de9c1e4757f91e61e6481573dd4fce6fcc80d17756","webidls/enabled/PageTransitionEvent.webidl":"56539720e7a07f1b7b57ef204b5a1f2d4c288f68728e0180d298a7a40f3b2ebb","webidls/enabled/PaintRequest.webidl":"e8c046b22f6b46d6d15e206f23f33564cda53364b22eb4828785065d7772d995","webidls/enabled/PaintRequestList.webidl":"840ea6f7382f1d295bb60fb399dedadd25a3bea4997f82b889d5507e04e408e9","webidls/enabled/PaintWorkletGlobalScope.webidl":"507e7512675d51fccfb2d0df3842eaa9405fc97365b96af58c2e5a3141498645","webidls/enabled/PannerNode.webidl":"4e04b9b89270824d179595c7b8b1837bc41d1a0fb72398302290a839eba33630","webidls/enabled/ParentNode.webidl":"7a24e04913390b98d0d02f7344419acdbc74f8f309cdade59d923883cfaa8017","webidls/enabled/ParentSHistory.webidl":"0bdd83ec933e0e3311e9e1519efe7311d893404c0651d94a5885fa5f2773dac4","webidls/enabled/PaymentAddress.webidl":"c71b7efeb0d3d1b8fd6f01eee3af89f5cd8b42660d25d889dedf0615f528faa5","webidls/enabled/PaymentMethodChangeEvent.webidl":"f037593088cec9010aa383133613aebb8f14fbc5c9973f21773625353fafb389","webidls/enabled/PaymentRequestUpdateEvent.webidl":"56f93400a5a4116a7ffc22785d7a3a770568ff8cf758bd1dc415334da1ebabb1","webidls/enabled/PaymentResponse.webidl":"c71b5bd925a7e17e8e72191cd59234ba63a452f37d40018938b5a812af94c702","webidls/enabled/PeerConnectionImpl.webidl":"20d3d5a5c409bd6c9ce4783ec4635e403f614647f1cbe57b48b8e2d446b2ce6e","webidls/enabled/PeerConnectionImplEnums.webidl":"c9f54424a844df7a01eaac3ba3a96e5e31e2530eb99cca84f48a3d9d875f4d52","webidls/enabled/PeerConnectionObserver.webidl":"420b96cc56f87d01194293d21f68722cee9a591aaabb058cb1eb7ff0edf6c624","webidls/enabled/PeerConnectionObserverEnums.webidl":"67e698124e7cd1f758c1d8ce2d5ef5f2a3cb818af4d08ee54dcdbc10cd890783","webidls/enabled/Performance.webidl":"f7a39a50aa51bbead766c0cfeeb7fb27323f0dc0f40e337d2d854c12ef7d150b","webidls/enabled/PerformanceEntry.webidl":"d4287b10c20bd543e607fb717e09fd2f9fa510fa8d425187b78a5ec464649993","webidls/enabled/PerformanceEntryEvent.webidl":"36855fbb87f6ee4ab9bc99ece991c81ce1c0aa537eb9987f7fd4a5ce83be498c","webidls/enabled/PerformanceMark.webidl":"83d630e8efeb08b521194c98404029b4f495141a038269ee188094400adc8173","webidls/enabled/PerformanceMeasure.webidl":"74f29148a94dcd4881669a64857d13caf5a8aa295e8a0ae9a749be79e761fa67","webidls/enabled/PerformanceNavigation.webidl":"e2f8f4f77a5926932c56a9a9deb5c12c4991245c81f1a3f09d4ae494ca414bae","webidls/enabled/PerformanceNavigationTiming.webidl":"9995bfabffc7d7d23114ae7c5d4eee93048164da9b1e74851b518b069fd7eb29","webidls/enabled/PerformanceObserver.webidl":"0f35f9181edb8981dbdebb41da917b9698d6d044f2d0182f039aebdbaf284c07","webidls/enabled/PerformanceObserverEntryList.webidl":"5917ca5fd5199ac3b527fbcf3d19f0885b9670d40bdb996df63c34537503c435","webidls/enabled/PerformanceResourceTiming.webidl":"8a0f4e08bf0288dcacf29b3e8270b8828a26b0a3cdcd3259c95e35276f6a82f8","webidls/enabled/PerformanceServerTiming.webidl":"2ea12d8606689422ba4cfbd3de676f155cb764ac83915f235c8dc119572a5713","webidls/enabled/PerformanceTiming.webidl":"444081120979dc63fa0f8f20b339ad6e2bd5460e25bb727c3a047cc394d528ce","webidls/enabled/PeriodicWave.webidl":"13ecbaad1289109aaf58c5ed2595face11563a921546c0ad812ba66e64bf38a1","webidls/enabled/PermissionStatus.webidl":"af7a7599374070947d2c8c1f0425363cfaf510db202fdec592b6c01a382e87ee","webidls/enabled/Permissions.webidl":"7567d31bd5dce5df70fc0c0bf033d1d02d599df1ee88352eeeff04150f863180","webidls/enabled/Plugin.webidl":"ccc55caf98f299b044eaa2d58edf49bf92c30319f64fd0dd9b4be1fdaa75a776","webidls/enabled/PluginArray.webidl":"8b745bee17f369381b94a50b0515a9527e0053adf28e09ff09c279ad2bd0295d","webidls/enabled/PluginCrashedEvent.webidl":"4dc5bf4bd81716bbbf78a88b75ac76a163a2f25e508b4df60805870b8ca17553","webidls/enabled/PointerEvent.webidl":"842a273210f481e541db88187a4e4f506f9682ab27f4ada97236e6816737ae68","webidls/enabled/PopStateEvent.webidl":"b3fbde27e8a0990a9f3ee510ae077b4d73bbb0e6ea481007c3cb6dcccedad979","webidls/enabled/PopupBlockedEvent.webidl":"7097dae7f8bf471487ea5942b3747b5ae47aca54e111bc6cbaf1599e13d90716","webidls/enabled/Position.webidl":"e0455234c92c570ae8bfdbe2f535c62b16ddd339f9a82e4c4f945c04fa2776cb","webidls/enabled/PositionError.webidl":"b6158a0245dc08a95e13559a03d8ac1c5569b8d486c0fbca872f13dbb953e0ef","webidls/enabled/Presentation.webidl":"8bc67e499d9f99263774da2773ec87fe5ebfd38df4bec99983c9c6a213055ce7","webidls/enabled/PresentationAvailability.webidl":"0ccdb1da5aee3e5495a372c1310b2d4f483a2f92b7a6cd322c620c72ddf1bcee","webidls/enabled/PresentationConnection.webidl":"3ae91a52f95fb9ef6c8b2da5fadaecd794a49034b8613c6533d25ef888efca84","webidls/enabled/PresentationConnectionAvailableEvent.webidl":"3927bc5f09504bdd34068e018741ae66158fc442922c3f94211e2794c0bab240","webidls/enabled/PresentationConnectionCloseEvent.webidl":"e943f060198350fa90d509806b15e0ba29c694c6f96c70b80ba7878861b3e6af","webidls/enabled/PresentationConnectionList.webidl":"bfb59c582a8787c44f1dbaf29a50b40b754c9828093b8056ee20e1db902a4d97","webidls/enabled/PresentationReceiver.webidl":"faa276a23a21d8db39a07dce80a7a120e6cc0e2597b5bf3d4240db568bd42356","webidls/enabled/PresentationRequest.webidl":"669dd03457f5eb4ddbd6ce9ae8fcd02ccabfb062ae9322fe7e91940b3655af72","webidls/enabled/ProcessingInstruction.webidl":"c653d1de81771557a93cac5694336418576cce5a8358e40f089304d8adc474e6","webidls/enabled/ProfileTimelineMarker.webidl":"08414691af335e0f2bb906cf53cfec9a8723254ecc37f0e7bacf6b8be63c7f4f","webidls/enabled/ProgressEvent.webidl":"aafe0abe465e049bd95032ee52877aed82bff3dddaab231cc3eb71453184ab1e","webidls/enabled/Promise.webidl":"14240c5da3b60a0240f27faaf8ca1676c0afb5a4d3ea6d0daf7a532090bd6a96","webidls/enabled/PromiseRejectionEvent.webidl":"25accc9224ed7795778b4cc93b7f51b5b4e1ae0ce18f97e7a91e6b6cf02bcea9","webidls/enabled/PushEvent.webidl":"2b1fd7de0888b157ba25991c4e6ef4615a1276c2cce16c68d53f92f1eb4aaa09","webidls/enabled/PushManager.webidl":"a6fcf2d1eb32de1619f5f95bbf3b66635224c68496067e3002e03a6e972e4d42","webidls/enabled/PushMessageData.webidl":"72ce9e056c2ba9857ecaedda5362cd2d56faf161ed142296cb84def701a88f53","webidls/enabled/PushSubscription.webidl":"77d0d1cbd486f109ee2104aa3c23791b8094e9887fa517ac18bfe1691d3d6409","webidls/enabled/PushSubscriptionOptions.webidl":"817516cac055730ff992f8d972d3b752432ebab9b1903cfc18c8cedbd9ae7294","webidls/enabled/RTCCertificate.webidl":"10b5eb04b373caafe3fcff85601e9249261521d824128f876f2bdf8117951917","webidls/enabled/RTCConfiguration.webidl":"77029b6e5ecaf3a6fad064b7f183b3dae38013badc3fbb52e3ee41644121d943","webidls/enabled/RTCDTMFSender.webidl":"469720957ec9c36f26f81f29d878d2844c7b33fc25a6ce8b597c8f5a79b56b66","webidls/enabled/RTCDTMFToneChangeEvent.webidl":"d5c54f4fc2aa1085a5c966e5028a98865133f43fa537578e66f3d183ec3415f4","webidls/enabled/RTCDataChannel.webidl":"eec20a6f0fe0679248b519a6636d8bd52a49aa23af893f180fe93c203c5eeb8d","webidls/enabled/RTCDataChannelEvent.webidl":"4a95a226ddedfe4dcceaba7338343f8a8621023015563cf2f905c19128e8e7b2","webidls/enabled/RTCIceCandidate.webidl":"9c53b5ada7baaa7d79922795981bc6d180d425ceef2485898546cbf4cde05450","webidls/enabled/RTCIdentityAssertion.webidl":"fc8faa529cf633e6fd7b510599fb1db4c30a2d168f4a156515065cfa167d6d23","webidls/enabled/RTCIdentityProvider.webidl":"989bcc614f5608866c6810b393a4e173179b26964c31bb4ee885a6f0c7e540f6","webidls/enabled/RTCPeerConnection.webidl":"8bdfc58c8173e3c05fbb32f8cfe50a2ac493b315fe9dd99783bf8c20a7ad9213","webidls/enabled/RTCPeerConnectionIceEvent.webidl":"a48cc1c8e9984364fcda93381a2a1b00dd2a38684e540a1482dab8218b4d6a1e","webidls/enabled/RTCPeerConnectionStatic.webidl":"806b6872b02b8f96811381403b77c62f33032bf0adc4d327eb7587c14bcf8933","webidls/enabled/RTCRtpReceiver.webidl":"6b5aaaa00f3ef2ec4fded7c6aa36afe4831aa34386d44f19643559c761aebc70","webidls/enabled/RTCRtpSender.webidl":"05658cbac5285d08651fae5339dff0627a8fdeaf368bc87bf0e8993be7a78304","webidls/enabled/RTCRtpSources.webidl":"a5d739766665a4f290cd121407bd44d23ebf57b869350a3796ac2aa315383f39","webidls/enabled/RTCRtpTransceiver.webidl":"91c83bc5c01d0b2a780694dbf45739becec07949ed7e524127b732414a5be536","webidls/enabled/RTCSessionDescription.webidl":"7ad506b114aec2894fa4c650d929e1cc3a1406e2388b9961607ff53cf2c192de","webidls/enabled/RTCStatsReport.webidl":"8921ce8843ba6bedb22e4c37241455680382449a50289a3476ce770a30f6d24c","webidls/enabled/RTCTrackEvent.webidl":"5f0a6325b2ea07859be497d968954f0a698c4d56e109fa1308fc9669bdc14b0b","webidls/enabled/RadioNodeList.webidl":"5b1751029f985b32667174c4414eea17b926ea681d3608bf4f15f084b0184cc1","webidls/enabled/Range.webidl":"ef6a8c87810057eefc486c2c1ac68d2b364340438ab14216fc3ed1b93097ff0b","webidls/enabled/ReadableStream.webidl":"6db9df4fc9649ecb7588dadc979d0be4db85574242632955fb431436072efd1d","webidls/enabled/Request.webidl":"a365e9ba61f60c47ece03ea678711a4b71f44765814bf74268841314d1d2fff1","webidls/enabled/Response.webidl":"333c54b567c87b4995268b608551055db70249f93c08c12b5f129f3a62ce34d7","webidls/enabled/SVGAElement.webidl":"9266973cab81785a2d9651a4bcacacf0df9c080f87ce7e20ca8662a86cda9ae1","webidls/enabled/SVGAngle.webidl":"4a527a6cee8e2e98da9cba4686690691087742406a246527bccacde78abf8587","webidls/enabled/SVGAnimateElement.webidl":"406e108607cf6f6532fc02f2503e52c0651127c45f4aea2cb3a4a388c4ba6c1d","webidls/enabled/SVGAnimateMotionElement.webidl":"0b99671068057b224eb5fb40c2ca818ef89bcc408aad982bde138092f1412dff","webidls/enabled/SVGAnimateTransformElement.webidl":"c8c232b0c2193b259f024158e61c79756042e96eb642ce32ef83abfc00946f36","webidls/enabled/SVGAnimatedAngle.webidl":"1ec87dd46edb885b468de542e37b3a2ff3e69015b3c92386f92f1903f9222f81","webidls/enabled/SVGAnimatedBoolean.webidl":"21ca5be2d236ba2a8935532a82a7791cf921cc22050d1911706b13a6f40a60f7","webidls/enabled/SVGAnimatedEnumeration.webidl":"ac2483e79c8c0681b24b400e88f3490ffe040c50584f51e98533fc5fd64b8822","webidls/enabled/SVGAnimatedInteger.webidl":"1225c8d8f41ee85008eee904eac1e017a0f60762d7adb09a7ab467141535cf3d","webidls/enabled/SVGAnimatedLength.webidl":"ec75bc98faa3fa71fd96af7a4aab0f3bf982507360d9fc55737a8aa00526f93c","webidls/enabled/SVGAnimatedLengthList.webidl":"4a2c967bf7c3069567f53edc7bfa7baefc81985a76e82013fcbf0556de3cd7c3","webidls/enabled/SVGAnimatedNumber.webidl":"a352a8f78f6feb508c3139f8b129ec63288424fe8afb84abbcf73b24857683c0","webidls/enabled/SVGAnimatedNumberList.webidl":"586dec7836b1a38358f333637b3d10cbe44db1cb3e6527ffda21984912cc09d5","webidls/enabled/SVGAnimatedPathData.webidl":"9fd44f6b2db82cfa362324f1ae291214cfb3ee81432974e4f9b5767f4d6ed15f","webidls/enabled/SVGAnimatedPoints.webidl":"50a53c450b5e7a660f40abe303d8e99d9dba86a1b68143decfea8149dee940c0","webidls/enabled/SVGAnimatedPreserveAspectRatio.webidl":"f9d89696cefa023f366a95c43cfe7ddbbba069541e115baba0121bcb9d67835a","webidls/enabled/SVGAnimatedRect.webidl":"82b5590f298c162a3143db0884c11558256562c42740d263af230c058e1dd740","webidls/enabled/SVGAnimatedString.webidl":"538b70cf811953c09aabba7e3a0218df267e23bb3716fe972427abd27e10269f","webidls/enabled/SVGAnimatedTransformList.webidl":"bd33eeb6a4530cb1f1d4aee69996fb40a153a636124b233fd98b30a69c865da4","webidls/enabled/SVGAnimationElement.webidl":"842df3f92d8b2727ee2325cc0f1044a92196402811542a8a7b5505c2dd337c51","webidls/enabled/SVGCircleElement.webidl":"af611f14ef46c012c4803c0712f7ac4293b7332fb0d718ce0f088c1b2f23179a","webidls/enabled/SVGClipPathElement.webidl":"632723812c80f2713beebf908830e6ea0a1dd18f1136d6e7c3d62db1daaa2365","webidls/enabled/SVGComponentTransferFunctionElement.webidl":"fd86f255607d5124e5b3ba4e94eddb4e09081be7acc70ecaf18a3b16147d5a64","webidls/enabled/SVGDefsElement.webidl":"a472683867e97fee7949177b855cbc8d00c0ac382df1307ad6c04f615cbbdc9c","webidls/enabled/SVGDescElement.webidl":"1e53672d52672362c5b24429554a346c02f88bf0af92f9aba1a765dcfa1f725b","webidls/enabled/SVGElement.webidl":"6b01e10405a29d32e63f44e6202e3937c8746d0e40375333f7f8fb620d944490","webidls/enabled/SVGEllipseElement.webidl":"c409ec29884913a14283b120e7171a3fc6d00991d70c5c5e328f2fb6a6369388","webidls/enabled/SVGFEBlendElement.webidl":"a97a3542c0d6df30ead0ff7c85fc6621eb738cc058d381a9c4a14d1e2ff5dc07","webidls/enabled/SVGFEColorMatrixElement.webidl":"c4948fc95e2b0ac5c7dd749c33ed3f280d199fcbf1c1c5bec627b7945292ca1b","webidls/enabled/SVGFEComponentTransferElement.webidl":"afae71ba9759d1f64c84bc20461af3049a40871bbe311c84ce6d4206e373b51e","webidls/enabled/SVGFECompositeElement.webidl":"fa3ef383464e76b4c9d355a1205482f296ec9d2ea8064219ffc1647f3d5e72f9","webidls/enabled/SVGFEConvolveMatrixElement.webidl":"fa50facca3ff39ed8518f2544d7a00f9ed8080be6f55ca82c068908442d83446","webidls/enabled/SVGFEDiffuseLightingElement.webidl":"afd160379bdd740ee1cdb94c98d0c5a5f100005a74a888d95187bef9143e99aa","webidls/enabled/SVGFEDisplacementMapElement.webidl":"04de93553c74074f036b9b4ba2f9df5040eee50f5fe9c29b0ab7d37faa0be57b","webidls/enabled/SVGFEDistantLightElement.webidl":"ef9695659ef0fbc29d8a65618b94e273b7628a129b861c6fb591d9a8987c1d52","webidls/enabled/SVGFEDropShadowElement.webidl":"b5b15d88289ea3bd932652458426a8bb9f9a1a226cb4adfad275b30132a71c3a","webidls/enabled/SVGFEFloodElement.webidl":"dc1d87cc8b66c37700c4eb780efc5eed6852fc2110a36d6f87436cab4c602ab6","webidls/enabled/SVGFEFuncAElement.webidl":"be785a50252c031f4ca1527e661d7c2b755941f23e43e4e058059d65a3e58299","webidls/enabled/SVGFEFuncBElement.webidl":"23c0f541ee460d88c2bfffc23d39f0b2cf55afdcc166bf8d21b0c6a44027dbe8","webidls/enabled/SVGFEFuncGElement.webidl":"744bc8c3d1c94826a4e77bfb804ad15e261ebbb97a0b54449b919de96360c82a","webidls/enabled/SVGFEFuncRElement.webidl":"c9cc8f0e5751873a92d1c2dcab2abfb54eeba2f4fe29bd0444c3860ca5d6f62d","webidls/enabled/SVGFEGaussianBlurElement.webidl":"4bdd910d48b661e2d5c63c180e1a876d00ec7a6641eab97686fb6050ac02bed5","webidls/enabled/SVGFEImageElement.webidl":"abb94b92701be406254738f5da555d427ce22f618df430f56053436bdb601977","webidls/enabled/SVGFEMergeElement.webidl":"9469944946e6117fe2c9ad894f4791c87e389951d3a639b0ac167801d2fbabf3","webidls/enabled/SVGFEMergeNodeElement.webidl":"f1f8d479644ec523d59dda7e1091909a1e523af2ec8dfa212ecd9e46cdb69e82","webidls/enabled/SVGFEMorphologyElement.webidl":"6595ca562b5ff35c102b58d4db856026b29e4c39035428b243a090164e8396e3","webidls/enabled/SVGFEOffsetElement.webidl":"6f4c392cec4199615873b79141b89586394ef3d87ad226eada35e0f08dcf620a","webidls/enabled/SVGFEPointLightElement.webidl":"4a572696b33c47bf4449edf743df65ada8e755145cee81f03395a9450986e926","webidls/enabled/SVGFESpecularLightingElement.webidl":"403020eb2023ca663700c693a48c6d7469a09ad1e96482d3902642e4cd3e0d8e","webidls/enabled/SVGFESpotLightElement.webidl":"30cc640692270ad6f98fb7d5b786c0208499c13edae57e564829cbdcbca16358","webidls/enabled/SVGFETileElement.webidl":"342a723b07d6397362ffd31fd890d2754651465f703bd91e06440f6fec89b11b","webidls/enabled/SVGFETurbulenceElement.webidl":"69b932ff2f1fc73aa8256daa9c88b133aa29c2d6ccf44ebbd1a00055ef3a49ea","webidls/enabled/SVGFilterElement.webidl":"15ab2e501123bca1f8f8051891c91cc8f02399b2ecb607a5f4786bebdac34cfe","webidls/enabled/SVGFilterPrimitiveStandardAttributes.webidl":"0b690e40034014c00ce6870c62750735292e22a6f63f34fac3e8773fecfddbdf","webidls/enabled/SVGFitToViewBox.webidl":"c54c72b53fc99992fa17dfed0d4ef1159633c1a973073691c744b76e90ba39ea","webidls/enabled/SVGForeignObjectElement.webidl":"27312a4ce1f30c2a42028be85200b384808e7f9bf43e1156392ef4e4591711fa","webidls/enabled/SVGGElement.webidl":"d35dc8c24962a0a42dca4dc1242ac5561b76db6d730ce28edb601187d53b2923","webidls/enabled/SVGGeometryElement.webidl":"dd0f86c2571613a37c9be53298d86cfcd48851d2775270604eccb23891215f6e","webidls/enabled/SVGGradientElement.webidl":"47efcfa524e2cdfe2435862dfb30c7df990acc9909ba5958aa0f42b2a6a92bef","webidls/enabled/SVGGraphicsElement.webidl":"846e3cdfeadff07b5360f6870796ed8effe0df1a15fa74a359a2afa296497900","webidls/enabled/SVGImageElement.webidl":"cb24d5626d0634ad5e2d026b1fa50bf7410158f3535717ccb8f0828b86a5621a","webidls/enabled/SVGLength.webidl":"283434b1f076b7709de5bba30bcfcd97464b2d0ac9d99b438279adcb2184f3ab","webidls/enabled/SVGLengthList.webidl":"28cab0827aa11b64900f0bc06fb16d4abbfc8503c21dee2a44bc7eef07130da1","webidls/enabled/SVGLineElement.webidl":"ebf5835ae85de91fa701dfd1d90c814f564d42726000cfb5e81755f8112650b0","webidls/enabled/SVGLinearGradientElement.webidl":"08418f12e42c67d57f66c63895d353b63a30e752fc81bcaa682dcc29972fa7f5","webidls/enabled/SVGMPathElement.webidl":"65ae7e78f412d13d434b023518f7a91ade30e5fb1445fb275616e1db158a1de5","webidls/enabled/SVGMarkerElement.webidl":"7a8871261fb808c56bead16e23cbdf80d37da3ceea6745b86b60165367788962","webidls/enabled/SVGMaskElement.webidl":"2e9a8b5eddff4cd6f3daced2c32227e31a67032451506c49e8d45e8a80199b76","webidls/enabled/SVGMatrix.webidl":"2c36393352662d30b3e15ac98976d0ffbfe6fecb9bf9a46788e3748feb7d9ee8","webidls/enabled/SVGMetadataElement.webidl":"edefcf9243c063a58dfd18648b10be9516c798db0eefa08cf0843f0014ebb16c","webidls/enabled/SVGNumber.webidl":"c094b396c9dd967c23eee36cf78ea9be5d97df72b0b22177f5fdf6a7390e792f","webidls/enabled/SVGNumberList.webidl":"34e5d3d99cafa3592cef91f6e780da38be123bf06c95d80979e758068acb8923","webidls/enabled/SVGPathElement.webidl":"d3e339379a478000382a56d34ba98adc08a2c3c2fe1260937d9c40e8e265a605","webidls/enabled/SVGPathSeg.webidl":"aab6325878704a3a46567ace2757640c8e45f9e68e632dccd06d919b3aca95f9","webidls/enabled/SVGPathSegList.webidl":"e43bb7403e0dbc76554a7589f24db6b2c8042b946ebab71b210a30459881e972","webidls/enabled/SVGPatternElement.webidl":"577dc47c532c5936068309fd6bfc65d0bb21e45e2903cd4515f03ac39e556a50","webidls/enabled/SVGPoint.webidl":"bbd6730609d9394f7199b269f24cb5aecea28e8625794e47eaab414f67afe281","webidls/enabled/SVGPointList.webidl":"feddf9227ee780a02849dea772dfd466796da7d1244a68849667fc55a7521c62","webidls/enabled/SVGPolygonElement.webidl":"e902ed44dffcf2efb005ba2ff9ffffbb62d382e52a8dbb9a105abdb227b7403f","webidls/enabled/SVGPolylineElement.webidl":"1d2e524aedb66b056b69f8d2560fa3b68a8417411b16e07bb58f0f1628ec1965","webidls/enabled/SVGPreserveAspectRatio.webidl":"687f803cac4b9a6e7f3f32d8ede0d5d2cf838fa4b7a5abd063be28c976d09d13","webidls/enabled/SVGRadialGradientElement.webidl":"66586aba27c83dddb8646f5263e35ec841e72a0267824bf856d4a8fa055de370","webidls/enabled/SVGRect.webidl":"81c17d4961853662265c27acb21543baad83170b65096a2aa0186f5c811ab129","webidls/enabled/SVGRectElement.webidl":"75ddf7eda4a1a1ac1d4b243364e21d8fbc84b47fa33d936abe509995c683433e","webidls/enabled/SVGSVGElement.webidl":"a535ea99879c22834a8e6abafa24cfe90113b21e977f81bc23afb45ef5732344","webidls/enabled/SVGScriptElement.webidl":"cdf1a3aba7db43ac419bff2831ad62b925c24410c3608b63953996d4d8842661","webidls/enabled/SVGSetElement.webidl":"858076ae56590ecb61aab88b746a92b6f161d90e7c78ffac4fc6c0bcaff6b1ce","webidls/enabled/SVGStopElement.webidl":"5a51ffa270957553fedc913848867a9f0786673c3111585a638c3c4517e5bb44","webidls/enabled/SVGStringList.webidl":"f6ff08eb3ec1148edb86954f324d6aae52df7f90581c37e964e16f4c8410e095","webidls/enabled/SVGStyleElement.webidl":"fb96e6f37015f9d9a4f20fd91f5f6199e0e71c0c6875666753209a7415b810a5","webidls/enabled/SVGSwitchElement.webidl":"c9758f48f58a700705f56d4bcce9bb67def9f0cb1e8410018f95e0d83cdda80e","webidls/enabled/SVGSymbolElement.webidl":"3c3a9f9d778404f4082edc53b2a015b14be759392fca787e911535d4f4437ef5","webidls/enabled/SVGTSpanElement.webidl":"237383c44aaeb9daaf5839c91800355cef2488cb107c2d7afe7bdca73c01e7ce","webidls/enabled/SVGTests.webidl":"e41ebf9f26401ad603f11cae37b46ee0b0cf36ef0d10adf4a039eee1184c31b9","webidls/enabled/SVGTextContentElement.webidl":"41f71dbf7a1fadc3b5d5b5e1d1d4f7bb30aacef0f9352619b956e481f99b37f0","webidls/enabled/SVGTextElement.webidl":"a4e13ba09815aca62014069ee79aa1fc32ceb1e2770f0c712bf11096ce30a55a","webidls/enabled/SVGTextPathElement.webidl":"717b1ba9ab66c3ed589a89cf5ace7273add4d6c8d9a2acf628bd36e771658a6b","webidls/enabled/SVGTextPositioningElement.webidl":"8d67f3364c487310ff034b42d520ebfda3bf8fab718aa0008f0b2cff668064fb","webidls/enabled/SVGTitleElement.webidl":"4de199bfc0c27e876a27b6016f8fbb33190fcdb73a521a9538f2d63f89337a32","webidls/enabled/SVGTransform.webidl":"d2d36367d2f0401ba43c042624e584d9ad021b1d1128020375554ae3d2d3a176","webidls/enabled/SVGTransformList.webidl":"567206d078d12714d7b5c133d613be2ef91ab788531a5a5283b3cc9c3f685843","webidls/enabled/SVGURIReference.webidl":"1a209294dc3a93a82de934b06d8d2122b47a15a12033376b8b4581b4da857bb9","webidls/enabled/SVGUnitTypes.webidl":"94aab6a0c212cf5f541bd463100e0a91e8c3c1d2da8e450f013841c989cdf151","webidls/enabled/SVGUseElement.webidl":"57dc59cee19582a3f1068757b7256d8594cada661d349cb3c0ec5cb7fe6bbff8","webidls/enabled/SVGViewElement.webidl":"dcd8c5d4d96f130750b77a25f3014813267eeffd2f5486d6f1738ec98b998645","webidls/enabled/SVGZoomAndPan.webidl":"f3d3d76f88dae5a4ad43c9759dd269ae53afd1c1aa40c5cf7e674ccd63362c66","webidls/enabled/SVGZoomAndPanValues.webidl":"7b98dde6c7bb2937953f5eea85e7906845cf1d4d7615c281d54699eac7f89162","webidls/enabled/Screen.webidl":"edabc2ab6ac7a8c1cc3cb31310cade22c3456464e5be1521079bf869d0448fac","webidls/enabled/ScreenOrientation.webidl":"f3b0c3c66600197645d8a4a25f851f78b4e0af602095f2116ef70da41933843b","webidls/enabled/ScriptProcessorNode.webidl":"975e17ea75e47d41f7594c86c1e8c70fab15cd62d95247a731720cf97728d7ae","webidls/enabled/ScrollAreaEvent.webidl":"a581b628239507466e61aa72a9dd6afbcfb0ccef52fa4cca3b36c6ce25ce1864","webidls/enabled/ScrollBoxObject.webidl":"9c3c77fc81ed10e4b9518781544f5edb138870bb2859b555c3dd01a8feb03bec","webidls/enabled/ScrollViewChangeEvent.webidl":"243bddb6bf78f5d362ac33ff57f37ea26111e72232675fcebe84d81a970d3993","webidls/enabled/SecurityPolicyViolationEvent.webidl":"2e77aa3d68aede50ae1f99f7f77050b249d706783c7492a59b0a7a9b4b82b0e1","webidls/enabled/Selection.webidl":"8a9141c66796c84e21b59a2e6614d61fce4a99dcdba16c9fae7bde375b4ebab6","webidls/enabled/ServiceWorker.webidl":"b5e273dc50eb3596eff8bc1216eb62f9d3ed8c2a039deb48c27dd2c5e68a91a4","webidls/enabled/ServiceWorkerContainer.webidl":"28f4a29e48e0a94ed410120b5e86fb14eb13c39f02b35226d64610b748223d51","webidls/enabled/ServiceWorkerGlobalScope.webidl":"2d605b7abc210730cfa4b0d480b02aba32969f37ef134487a017a8d85b86cf88","webidls/enabled/ServiceWorkerRegistration.webidl":"de39e1be12fae269d5e08a2d5a742ecc5e8d1725e36231b08b91cfb996c3ef37","webidls/enabled/ShadowRoot.webidl":"da96cf6f2c1a871cdc646bec67d24ffe9345eb5bbb62634da5c9e7b0a5024d98","webidls/enabled/SharedWorker.webidl":"5f622c95284d639e7d0bc396d60b3e660eb655c0eb7a0ccde54e0b986f94df6c","webidls/enabled/SharedWorkerGlobalScope.webidl":"4d2c21ce657841d20495066cbfa4ea37cb6575f01f1fc69132393cf65519e4e5","webidls/enabled/SocketCommon.webidl":"65872f202a5324c291c5499f8593ed4826911a077f4d1d8a114d564e65ebfbae","webidls/enabled/SourceBuffer.webidl":"c6382aa83a2fb0506a5cd7e7ee088f85a27bc14c0a136999d1d09bedaf85f549","webidls/enabled/SourceBufferList.webidl":"5dc259a31f77b9bc8a6125aaeb1238102235b5f23261b4282acc21888f69a798","webidls/enabled/SpeechGrammar.webidl":"6aebc3b030f5baf5abef93e32aafaa358f0de5494f273b0851b43e5ec15bd4fc","webidls/enabled/SpeechGrammarList.webidl":"6383881e2cdb5922c92ad66b5d465f08f3f5fc79a24f266b6f32ac931bc7a5a6","webidls/enabled/SpeechRecognition.webidl":"6734b5d93d77956f9237271ca39389ea57fabdbcd5be3a90e1892a72c9debba3","webidls/enabled/SpeechRecognitionAlternative.webidl":"bdb0ceaa3fa8dcc053cf097c88ef93e16024ce65f1c6992771088a19110b6e3a","webidls/enabled/SpeechRecognitionError.webidl":"fc8aeb8170d4269667ab76d53d6fb4c9f358a9aaddee7b90a700d8b5b65362c1","webidls/enabled/SpeechRecognitionEvent.webidl":"2789b5157f7739cbcb64783eb1c7fc909ad3c28593b244817309260a8d9de16e","webidls/enabled/SpeechRecognitionResult.webidl":"c136902df06dd6c99837b2fea499c430165b4cffaa876af09023993932db33db","webidls/enabled/SpeechRecognitionResultList.webidl":"e7269b67251ec271436a8da484def7654cabf23caba6ceada18b9828e8e168d1","webidls/enabled/SpeechSynthesis.webidl":"c160ea5b021ea8c6598f8f729e436503b4181b58bd5bc95ec583f73865185fb1","webidls/enabled/SpeechSynthesisErrorEvent.webidl":"1231f5651bd3440a59c967ce22fb56b53d2bca7a9c2d0be913642ab2ded65cd2","webidls/enabled/SpeechSynthesisEvent.webidl":"2c86b63898380ec9a3665f83a350ab964ae3de52073aa06de68ebe429c97fad0","webidls/enabled/SpeechSynthesisUtterance.webidl":"0c463f489ecf947a897e32cb77869ca61018ba53a503e9c43e9d194524f69c2f","webidls/enabled/SpeechSynthesisVoice.webidl":"615ca94184a3d9de46c3ec47f860faa275dd4607f1395fa2f2203f5a82330804","webidls/enabled/StereoPannerNode.webidl":"ba538833cc7cf33fd621838a349b01712290e5e53a00d8c1397c60b0e2249965","webidls/enabled/Storage.webidl":"e16fc5c9c2ea4686b0683bb783d6b10ef3a9d0864c49966d62366b7960dc2a0e","webidls/enabled/StorageEvent.webidl":"b50c47b1f3c01673017c71f354ab1e19e91f1a3846e11a1fd7074c5c39e17b29","webidls/enabled/StorageManager.webidl":"d72dc2e1869068c8297f182c446375417f485c314ef5dd6b42fec20793b1cf06","webidls/enabled/StorageType.webidl":"4784de962657f20943274788b8118a4bb105113f69bef7c15accd9a9a1708639","webidls/enabled/StyleRuleChangeEvent.webidl":"0521ff622835d6e093b3dfc742d10e867b416246233b3979f995f21ece3e7677","webidls/enabled/StyleSheet.webidl":"5d34b67fcca9d7a0460d344e31a683e44aece4321d0c99e46ab3fc108edd7037","webidls/enabled/StyleSheetApplicableStateChangeEvent.webidl":"01ef38bbcdc8b59daa8fc455374270a606127e0cf3f528793635fa5788fdbd7d","webidls/enabled/StyleSheetChangeEvent.webidl":"82c65f78a3939d2e5e8ba012f854f13949c96c5157d67fa2cfda03527a705cb4","webidls/enabled/StyleSheetList.webidl":"10ab6f214b7501041e6ff1ff4ca0991e2bc32c833a09415b70d9c3f06b515bc9","webidls/enabled/SubtleCrypto.webidl":"8ffb08be9f2200fceda4aebd296d00ad478cbe402dc9fb7da1a8699d44bbd57f","webidls/enabled/TCPServerSocket.webidl":"a3ef75413046358b090887b9e6c0d03a0aa164fd8ba4059ce8b4136a42a5fb70","webidls/enabled/TCPServerSocketEvent.webidl":"3169fd04ae2c3e31d5c57f493c5247caab9dbbfa0f38a6088abaa4b35e5d41d2","webidls/enabled/TCPSocket.webidl":"006cc21d7d4e9558954299e996384611d9a7a3f057adfce91144cd91ad4ec43e","webidls/enabled/TCPSocketErrorEvent.webidl":"639f7bf942b272983c2d0495d13c4d51e33b011517bad27930d4022d85719914","webidls/enabled/TCPSocketEvent.webidl":"c958fee252aa98f6eac35048964aeac905293006e0cf80c6845ba16000c91e79","webidls/enabled/Text.webidl":"56fbb7605981f8d363ca4ce2cf666180ad3afdd2b792022a47b02769fc1e9ca0","webidls/enabled/TextClause.webidl":"900118a0b65693a577b25a23522f299622f034de6d7d13a14c45abe967a56606","webidls/enabled/TextDecoder.webidl":"28d2750c80b7bc651a55a77ff02ba8d3992f15cd98b802711ff6189d95601488","webidls/enabled/TextEncoder.webidl":"9c6fec6dd1aae1154702bcf7fb5ca712db1281d08ecaaf97596a488a81b02f24","webidls/enabled/TextTrack.webidl":"b7b7b3e11c4218190edf4a97dad9d6a304abe63aa0855846ae7c39464518412f","webidls/enabled/TextTrackCue.webidl":"9dac62a7e82c03cc914d4edec84f7c4c018aa925535041d99cba447c8158170a","webidls/enabled/TextTrackCueList.webidl":"68acd65d75d9cfdacfc8e266c3147736cef3b6d59f2cedf65480eb5a8c1a8af8","webidls/enabled/TextTrackList.webidl":"057df5f7bc9bf2b57c2db79ebb72ea6bd62474034279159c65c30a4ae934e4eb","webidls/enabled/TimeEvent.webidl":"25f99d13ad790a6308b865f5266e5221734c794a8a25334dff439141500ba2c6","webidls/enabled/TimeRanges.webidl":"926ffda3eb7b15a1750a608351d12b1df624fdc5f9469c9bd278491d4d1a70d3","webidls/enabled/Touch.webidl":"93720f0d2b8b807bb2967de4fe8cf1ada71c2c08d42155022b3ec5a9acb11cc3","webidls/enabled/TouchEvent.webidl":"4a1f50a1d81ea31dfd9d2db5d2881221738e24fef7a5910df1e9734b9389ed67","webidls/enabled/TouchList.webidl":"e38500c028542915bd23a6a8fd0b69d60d70ee5ff72e0a0a67736763eada79ac","webidls/enabled/TrackEvent.webidl":"646d6266c3258dc2db8d5cd52ecfe54fabe34561b8f50ca49257f3898638f5cd","webidls/enabled/TransceiverImpl.webidl":"82f262e14394f4133826f1df0e5c0aa4e436b134ce1a19df79ca30de0ae0160c","webidls/enabled/TransitionEvent.webidl":"fbced41fcb7810b4c1b8c8d1d2ae6b93c0d57056372956d4586178e18dd1e433","webidls/enabled/TreeBoxObject.webidl":"311c977c7ba48244524a823a5705593a52d539c3462757957d20de0f58324257","webidls/enabled/TreeView.webidl":"fae7befbc1d1b55dce24fd3899b2288a2570df2c7296541e57251acb2d166a86","webidls/enabled/TreeWalker.webidl":"c4c41e63f6344711ece9127d0aa47a317ab1cdf033b8bc5c8e2457ccea7f33aa","webidls/enabled/U2F.webidl":"223991655cb44c4aaf9f9772129a7d647e008acacc8df6382d85e224e12d0957","webidls/enabled/UDPMessageEvent.webidl":"20ef1b7ab382adb831261bcd2d1012c8d1ae4a86686a339241833f1747b646f1","webidls/enabled/UDPSocket.webidl":"8a74ceb3871b615b28209bbaa1de53a4381d60cc95ba8408e9610a5d91b4907a","webidls/enabled/UIEvent.webidl":"d4b22362979e5a4507ccafc8fa36fe78ef2b8022ba376ec8b33a11f074cd36d4","webidls/enabled/URL.webidl":"8d87dee3c4cc09f7a502592a3fa765946be617d630802d25337516e2067b3300","webidls/enabled/URLSearchParams.webidl":"49d4c3648b19b4347b924aba3d6ea02fcdd85cf219546d1873ca44a0fec0c830","webidls/enabled/UserProximityEvent.webidl":"7b4a94b00c4228aa1f4f23173c81caf695c9a6fe2f7636e1bb6541337446c8e2","webidls/enabled/VRDisplay.webidl":"e8bf817b110c9a5b229c85a0768ec9dba606e1b2aeeb8bcc3e6704cf9f7536e8","webidls/enabled/VRServiceTest.webidl":"219d8fe614bbdcfb53e8fdf481400362d264cfc5763d4c5be6a93328533c0e8b","webidls/enabled/VTTCue.webidl":"dbeac63c2c1e62eb7dd1271b9c64dd6e78ca4cb281ef5e780faab68b0b80ae8d","webidls/enabled/VTTRegion.webidl":"f27235cfdbc6e44dcd65b023e487e487b5ebfeeffc7aaa650df0cca650fab254","webidls/enabled/ValidityState.webidl":"49853d0c5b3b9036b1fd538535f69ebcb09decb13369a31bf0f918cce2c70392","webidls/enabled/VideoPlaybackQuality.webidl":"d5788b9ee029f65d00fb033b3a140e81b1a6b631ea0b27077c3459d51e766a88","webidls/enabled/VideoStreamTrack.webidl":"f9e9d29eca4c7d77fe7f6d951825dd69f593b565e8d1cf4148eb6019cc1d5983","webidls/enabled/VideoTrack.webidl":"bbe3c09176359d1bf088faa762c4ebe6e26dfd3e414b8daa4fbca9c16d956e25","webidls/enabled/VideoTrackList.webidl":"5d7d92ffbb1d0e367220bdb2dd60b9a51cd76129205fc6968c46781b9999fab2","webidls/enabled/WaveShaperNode.webidl":"2414eb5bb9da49f46cc19e50f4a6f5daf2aa95d2808ec09b1d24b8e1e6bd2722","webidls/enabled/WebAuthentication.webidl":"7743c280e9089aad5c4e648598f753781e5c2190231f7a7fc954f4990d3c619e","webidls/enabled/WebComponents.webidl":"6676e82b062673e6862d2af6fb5be52b9723973bd78f97ae3dada3d85e47ec56","webidls/enabled/WebGL2RenderingContext.webidl":"75bfead6935558da65b6b40a21ccd249b172bf68454d6a0b7640c25c43481178","webidls/enabled/WebGLContextEvent.webidl":"d14a1221ec65fa3f3ec0aca9068c6ef34fe838b47da87451c5c3376c17100f64","webidls/enabled/WebGLRenderingContext.webidl":"24b02e0f3e56e209879cd169ff5f50094ee21f62295584f6e4561439365a3e79","webidls/enabled/WebKitCSSMatrix.webidl":"6352f13d6a9a265a24d2c0208f515455068d90feeb1c5c35b03b08e5450c4e75","webidls/enabled/WebSocket.webidl":"1c9477647fd70a7dbf33829ff504bc18c57964ea7ecc7e44033c3347ae951772","webidls/enabled/WebrtcDeprecated.webidl":"4e45cee6502ff5f367ed2d2d70c8d02c6cd2286399ba3216930017e0f88a1fbc","webidls/enabled/WebrtcGlobalInformation.webidl":"53d916d76b600907b24c0495a1cd7d7fbdf867c43b55cf033342d0f4294865f2","webidls/enabled/WheelEvent.webidl":"e66dfac75f22f387d8800f262bed8f9775605bb558854a0363711fef8cd4b792","webidls/enabled/WidevineCDMManifest.webidl":"e8ddae9d39c447aa996f9c398cbb5ed25fe1888c96cf8cb3d7f9e4dcb572a4f9","webidls/enabled/Window.webidl":"d54bac1954728cef18733f8789f5a078e016c46843bcb8d543ed4026fd783d5e","webidls/enabled/WindowOrWorkerGlobalScope.webidl":"f9923f971c7c0e135d881f60e6fce499f160f1fc87170809b523c5db24f62d49","webidls/enabled/WindowRoot.webidl":"19ca1ac9641a219ecc3f04084c1605768a92cea39fdf0d87b13f1bed69197d65","webidls/enabled/Worker.webidl":"c577045e24d4f274c5dc6d61f962e600f38b65c1b4503df086dcff5aebf7a522","webidls/enabled/WorkerDebuggerGlobalScope.webidl":"09a9365afd1e9d2798080c9741ad681a773330ac0800dcd356608c2aa21502f7","webidls/enabled/WorkerGlobalScope.webidl":"32c95b7bb6ee3473e400495815950676e35d92cc360c9db32a326b0344583fc4","webidls/enabled/WorkerLocation.webidl":"86a85cead8f1ccc91357c29e5f100abfb7aa1a7254f4096c9f5a9ed10aeea5b8","webidls/enabled/WorkerNavigator.webidl":"8bb49d3460aa9580a53be991d3e5d1c38bc2217606c8a766744d33141cb2159c","webidls/enabled/Worklet.webidl":"300f6fa33ee5e39d0c24abd169a33de5892a5a6d246e31de2081d2a299febfb2","webidls/enabled/WorkletGlobalScope.webidl":"a1fdfe1774a6c9fb84ff97733aa38f429d31d05317980a4d01f1d089abc01919","webidls/enabled/XMLDocument.webidl":"305e736ecbf2d1ce5d36e2f027a3f9063a1272708d1bf11912c852d003979c9e","webidls/enabled/XMLHttpRequest.webidl":"9d91dfc41042386a61485ca3a9b93934e3f01d292fd8c3e524a1ca75661b5ecb","webidls/enabled/XMLHttpRequestEventTarget.webidl":"518e63b2b0ca73e80a16bc2224fb8544a8d8cab091a768859041979f7c7ee1f7","webidls/enabled/XMLHttpRequestUpload.webidl":"bc484d3e99947124dd9a222dc2d2333728ccae2801c995890d8846ba8976be32","webidls/enabled/XMLSerializer.webidl":"debd3ca7717a6d768694c384eb1ae2c19be3c48a96f4ada25eb45682ce5432ff","webidls/enabled/XPathEvaluator.webidl":"ee62bd2950cd45133036f9fc3616119ab36eef1656019aaad096e1d90d63abaa","webidls/enabled/XPathExpression.webidl":"fc377e078e136b88d8b57fcdae3562766be19a07f9582eca9de938be5fc6aac5","webidls/enabled/XPathNSResolver.webidl":"aa9675d1c521cdde72d9240fb2aa2b419a6a88313697857925be5ff23152ffe6","webidls/enabled/XPathResult.webidl":"9aeee101e1c58a9e7bcd40bff869b6a1edf8ba3184b8260549fd21b5d5d0778f","webidls/enabled/XSLTProcessor.webidl":"3a612f59fa344d936e4889358a2f2a074321807efd8df3c0d0970cc65ba79497","webidls/enabled/nsISupports.webidl":"5a857b3c311298fd9b1a4de08fa4d8e0ee60ccb88d374d4a189f0f45ffd7dd51","webidls/unavailable_option_primitive/PaymentRequest.webidl":"0ed7c8c477ad3340876c3aff5fd3ab47d10667a37967b279a29f23f080629cb3","webidls/unavailable_option_primitive/README.md":"2fe458cfa8faba4b5a3ecf6809a538e219880c214e564a0272cc7c91994609b9","webidls/unavailable_option_primitive/VRDisplayEvent.webidl":"10a00f04eaaf1496d1ffa2fba048753008bee79ebbd2639516e73feca20b85ea","webidls/unstable/Bluetooth.webidl":"ce86c56c2618ee8204a6d9710839538b5029846a4d21db1c02af9a4855e45755","webidls/unstable/Clipboard.webidl":"ee8debb51c88f5d31dae832ca4a8c8951d91f89b81a9ba1605a63c19ed9384c0","webidls/unstable/ImageCapture.webidl":"b324635b5585a2bdc24f213571816f7eb2d8fdd2af25e2b3642c887ea6fec8be","webidls/unstable/WebGPU.webidl":"28b6f8bcb96763eb61f7ed9c29b8b879dc07e68f71c23ba3313dde9f3650c588","webidls/unstable/WebUSB.webidl":"c09980878e761daadd0793838dbf924998bc71621652d6fd41b5248f0df973d9","webidls/unstable/WebXRDevice.webidl":"b93fe132ae70bee82db259f330a7cc2b3441cd76910a14588e9b553fcf665249"},"package":"222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"}
\ No newline at end of file
+{"files":{"Cargo.toml":"1f1e060353f52d8c2edbfa275c18c5fc8b67ca0ecaeffb6873168bad81ecedcd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f69886395d9520e3b996b8513fb8c26c37673c62061b86b4f076ddc29b3eddd8","src/features/gen_AbortController.rs":"22a673d3f796021e093565d2350b603a3d7ba350a8aeef3125fadaca0b0453a3","src/features/gen_AbortSignal.rs":"b73e1e02538f807117e0d4bb52e6e592818d72f40c5141717d880eb68fed63a4","src/features/gen_AddEventListenerOptions.rs":"51126f7369da3c922d93ae8bd1defb7175689e128eae194560d67e1dc98d3f0f","src/features/gen_AesCbcParams.rs":"fb4eff6727e702bf93537fa7e5add7e89312f8bfacc6cff60b79b17f3c77b849","src/features/gen_AesCtrParams.rs":"656fde69a4869bcf35385aae0be8b9a123115d2ac4844b672bc05072e45b3426","src/features/gen_AesDerivedKeyParams.rs":"8f6ca56646439bebf55895a8e6182bf790855407a6e9557d24f2c8cc084e0661","src/features/gen_AesGcmParams.rs":"c60919542fc824441fbb549520c9c8bd35ded528f32e0434273dc2410898593a","src/features/gen_AesKeyAlgorithm.rs":"a5b22834b6832fc08cb32c082d5a6f7262a03251bfee2b152720fcb89c245313","src/features/gen_AesKeyGenParams.rs":"9cba2073ae34fed648240c9dfa1dcd79723442f6d1f7da5ee5bcd8dd746064c9","src/features/gen_Algorithm.rs":"e6d216af2c87ffba8bb10f386c0949a4c94535d0b80f1174b7ce1c71b324d835","src/features/gen_AlignSetting.rs":"ff73a541ea9cde572943606d73da5a663cf3f2dcf63944bf01902c9434a5b765","src/features/gen_AllowedBluetoothDevice.rs":"3e2f9ba35cd3b79d515a15a21565606577e37273c27d5004003a40665f053bc5","src/features/gen_AllowedUsbDevice.rs":"ecd9ae032ea73f44525a197422d11bae03a042b5843383e29d2862ba718ff6ec","src/features/gen_AnalyserNode.rs":"568689e45535a8a2a9a6010867d9e33c0bfa78fbe3e623c12519dcc75e14f02b","src/features/gen_AnalyserOptions.rs":"bcfd24aec9eb51714445554999eed2d230604ab40aa0640a998dfbf91a3b42d7","src/features/gen_AngleInstancedArrays.rs":"13f2066df6bcab82e067e38f54e60edef16405265622b4faa04f3899e93b4fa7","src/features/gen_Animation.rs":"5d18dcf5d8c5d9c543c5c8a06af4705b5b59629339a0a82210e9a2751ff23b84","src/features/gen_AnimationEffect.rs":"8ae9123859c065210a101f6d0bb700e9d0a5d98ed467aea67d11eb36665b50e4","src/features/gen_AnimationEvent.rs":"79d6438a0eef7e7b59aa7f5289c92f94433a919db6a30cea076f28bc02688ff8","src/features/gen_AnimationEventInit.rs":"00f41040b0fa7f94fbf0676968924fcc16f196cdf299d431cea1427bf4a06423","src/features/gen_AnimationPlayState.rs":"2b1e8fa5a0c5baf1340578d64b3bdf5e4429552544da28dfe8f088e57eedf3f9","src/features/gen_AnimationPlaybackEvent.rs":"f4890bd07bd9cac9db43210ffa0be7c5ffbc0ba41359fe26526fd708e227bca9","src/features/gen_AnimationPlaybackEventInit.rs":"a34fd13ce88f24d5fb4706a02543dc7236b573b5edbfcfb2096822922b422482","src/features/gen_AnimationPropertyDetails.rs":"cbc389f42d5690d54430ef6524c09aab1630fc64494591418b45a275f44a136c","src/features/gen_AnimationPropertyValueDetails.rs":"6461af9b73b85f59c6751270dedc58f7e5e2761e4a03a3e87fa837e9eaf6a380","src/features/gen_AnimationTimeline.rs":"4f6522d4e21c5f7d4f05801dacdb0721e1600e59f7db5b0521c8b2f6abf1938c","src/features/gen_AssignedNodesOptions.rs":"7739ce85a91539b3e1722ce158f0f86442a96c6c3be194de43bc2a33ce82ac94","src/features/gen_AttestationConveyancePreference.rs":"5494c5b72adfd25932b87600095032423402a48a6d277b62c666a7c015bb8c4d","src/features/gen_Attr.rs":"eabeee62feec2dbb1686329dce3deb8aa09acc19d3eb89bef58002bd41e646cb","src/features/gen_AttributeNameValue.rs":"5103311039110739ae3c5f33cd4d6577f00054244db2032a7291b69f707088af","src/features/gen_AudioBuffer.rs":"6ef1dd126a8215a7d283328864bc2481ffc12822d15b54efbae505b630f6306f","src/features/gen_AudioBufferOptions.rs":"487757f0d50e97f45d345dbfa7c2ac8e433acf31001f3f4cd6095753e03e9285","src/features/gen_AudioBufferSourceNode.rs":"3164e60f02763ff5dcffbbb098dfc6ed6f9bc00e3d3c724dfda8d6ee5434ce28","src/features/gen_AudioBufferSourceOptions.rs":"3e12876229222ee29d963ee678ba3dd53217dfcb714c497c7fc036086cc8784d","src/features/gen_AudioConfiguration.rs":"777d891233cbc023a246b9e5ae2e3c65d4f65fbd099f1bb91c5ce9d55f2fa768","src/features/gen_AudioContext.rs":"9be7133ef28854041db31c70c8fb882db929d8b8af14c880ceb7c953007011b3","src/features/gen_AudioContextOptions.rs":"da8ecd48a5d2a8212d326238623f4957674c4e0860ec0f6a162873bf81aa464e","src/features/gen_AudioContextState.rs":"edd11d999f8cf221a6b15fb3438190e4dc9cdf1d85d2ad3ad3c62f61785d1b03","src/features/gen_AudioDestinationNode.rs":"6a02565a7900eae9ffa25ab927be837ebfe94a32c403c2e5b934d513ae1c50f3","src/features/gen_AudioListener.rs":"61abb86f591b7248db9e456998789692a84e9c2595280501b698bcc09a531bbb","src/features/gen_AudioNode.rs":"95315a26b92d04298f083794e7f67aa7b766d35bd1caa0b31db327cda491d8f6","src/features/gen_AudioNodeOptions.rs":"2cf7743ea95bb38fdb3079d18f4de1970947aa6ac14bc214b1fe5e7504642af7","src/features/gen_AudioParam.rs":"b84526ac400e8f0def32ac662799e7917e1a0dd1f4b0801c5018d173acc1ba2b","src/features/gen_AudioParamMap.rs":"833e5f93b45dcea6f3b56ac5eb883f240d2ee9ccf7b8084a431f6778c6f4f012","src/features/gen_AudioProcessingEvent.rs":"21d4a7f371be7acef5b201e5d7f47b24c6245ae77d85be626fd803695011f4f0","src/features/gen_AudioScheduledSourceNode.rs":"55406f3e4669483cfd0421e444abe5dbfaf6b833c4402aaf78693ad8aaa32010","src/features/gen_AudioStreamTrack.rs":"052efb0cb7fa24020da9b7db68cd90a94b6938d63f3f49124b20f49fe8e62ed9","src/features/gen_AudioTrack.rs":"5dbfd1581aaa64d69979a11b22d86af28c7acb5e3cbc52cf64205ffb7d519c01","src/features/gen_AudioTrackList.rs":"a8ad569369804ad75d782d9e89f9a198a220f84fb5455b3ac6db59ee4c6e6745","src/features/gen_AudioWorklet.rs":"ff12056ddb42786d6bb79d2e39047906cfe2547a70fb41816266be4915c18085","src/features/gen_AudioWorkletGlobalScope.rs":"0173f737347b82d76b8ffb0e51092550dd135f112a46c28c4148156246135750","src/features/gen_AudioWorkletNode.rs":"ffae556691a3420cda558d5430f38eba420c32049452baa731f27a8bfb292ff4","src/features/gen_AudioWorkletNodeOptions.rs":"d7cd56d2f0d1e3e6641c7d0e48c3ceb1e825dbf2254926f8d9d9e4a6e0aacfb0","src/features/gen_AudioWorkletProcessor.rs":"0e79ca4194036f1a03d34f6a6a3fa9016da19b5d801409fc8849e779c09844a7","src/features/gen_AuthenticationExtensionsClientInputs.rs":"7d252079cd0fcef736b2fe997eba205d0215dbb6c704decf2f0b7350d295d876","src/features/gen_AuthenticationExtensionsClientOutputs.rs":"377033a67bce2ed40204cf880a81029fb90ead72eaa05276baecee58df03bff5","src/features/gen_AuthenticatorAssertionResponse.rs":"feb2fee43a04d007a6eee628ad504b329817ef9a5a75eae8ab2600183c27dc94","src/features/gen_AuthenticatorAttachment.rs":"04a5fb20a1c8fadf143130a310fce74e0977c3788873021abeddc274eaf97796","src/features/gen_AuthenticatorAttestationResponse.rs":"652197afb60ffc73e5cb4a8db3d86957d7ed47ff6a635ab5d9da06bbfc31b938","src/features/gen_AuthenticatorResponse.rs":"38f40f2a6e74d7473dceb7cb5ca98946acade68ffa586c3ffe1983c00e27fd44","src/features/gen_AuthenticatorSelectionCriteria.rs":"197ffe666616e6365634aca65dbafb197b3e0933a31d35644ec0e2ec63b5e607","src/features/gen_AuthenticatorTransport.rs":"f2826d2287434eb0429a01deb86331e1f8b1e7737e24faf60834858632f46e54","src/features/gen_AutoKeyword.rs":"3e949f9dbda20ebace5d004a42ee5683893ed7e7fd3105dc3c64cbac1c052a20","src/features/gen_AutocompleteInfo.rs":"b638bfcd9d8883a2b90fefc11e7614ad51058ef2ea1924870d1e478ebfda1a19","src/features/gen_BarProp.rs":"efd61c21636866a6df69525b711e7f97e6ee527c827a185f72408b8b321103e1","src/features/gen_BaseAudioContext.rs":"d521a7fea03f7d80533176aa8feab1681500a1b4ad451c88a677236c5686c49e","src/features/gen_BaseComputedKeyframe.rs":"f7a5f2b59003775b8e49097c35fc4101769450323773d5a9e099171f230f8e89","src/features/gen_BaseKeyframe.rs":"2d0e9be4506f5f6d15d76140e10fac7bf228885063f1e19f1cbb5a4889fd2def","src/features/gen_BasePropertyIndexedKeyframe.rs":"bab0c960a7c63973008f828515fdfe3a02f9bbf6b26633899ecc8f2d906975f0","src/features/gen_BasicCardRequest.rs":"c865e3c3159c7e2a27fcc9154f41a27af2807f25d302ee06444c9f71ff88c5f2","src/features/gen_BasicCardResponse.rs":"b35f6370d292cbb4fbb23c91671ba85970a9eace248033dbd348c2020cae1119","src/features/gen_BasicCardType.rs":"6bfda80623bc1bcd3994f909c2eab21543b6622f17d6a2294be98ea72b38ea96","src/features/gen_BatteryManager.rs":"16cc81521988ce39c22bd295bed270d82a973ee37ae7999badd24a77bf7724f6","src/features/gen_BeforeUnloadEvent.rs":"a1a6f0a200a65eaf6526425fb7a2602f4f59bcbdbe8ef63c1ddb8c0126a77aa8","src/features/gen_BinaryType.rs":"b69e6050d2d6f2c4fa4fca374fc3f66882f84ee8a68cfe29750056c700ee4f9c","src/features/gen_BiquadFilterNode.rs":"8186b1f05c8835f0a7d3ffa70fce921b6ef62277b0c77a7e858d5b497d7869d6","src/features/gen_BiquadFilterOptions.rs":"055da15310a344fa1ac4875180c9ed4411003371f57416bdcf5d1690322b6151","src/features/gen_BiquadFilterType.rs":"a610a212326537cc522cf65b3c4d793083a89828ef2ec489026e2c6993d6a6a7","src/features/gen_Blob.rs":"d25689423dcc28c0d44c818fc596021eeab67c8425d5574bb9c2498a75000687","src/features/gen_BlobEvent.rs":"99b2cd41721cdc34267fc4b061f217962e72a10adefd9c88db6fd851db5c00b3","src/features/gen_BlobEventInit.rs":"fead3a1b8ca11dac28bc7885d62b86f5d60aad0f0123a6b1c03f5aa7650df0dd","src/features/gen_BlobPropertyBag.rs":"6ca1507b1412588a2d7e4bbc019045b773f220e98de7e6d91fc6121b38260250","src/features/gen_BlockParsingOptions.rs":"51bc88409e8e5429d8716b808f293a53832886da74248abd6a1c827d0f1e4491","src/features/gen_Bluetooth.rs":"c4b919e2b117ada872254f4e840499cdaaa3c28b8375703042c0f01fb005c681","src/features/gen_BluetoothAdvertisingEvent.rs":"be8ac27bd89f353e219aae98f3d2e8f5f7f110dd131273bf72423460d58f1efe","src/features/gen_BluetoothAdvertisingEventInit.rs":"f938992897a5a799dbea3451c180cd5256e9e9c8a5dd8047d543b057fd58a3b1","src/features/gen_BluetoothCharacteristicProperties.rs":"43ff806873ddaf114fae3def048a926073f6e4781dc53b9d306030d786ad3aca","src/features/gen_BluetoothDataFilterInit.rs":"2a8d1edf468db70f99db6ae21fc214957318d0208e850075ba6c377f982e0367","src/features/gen_BluetoothDevice.rs":"e284a910f08632248da9e67ebda4e17b69d620acca54c91bdc2c25ac69ed9309","src/features/gen_BluetoothLeScanFilterInit.rs":"920a06a7315ea78b1dcaf353dd7cdbe2a491526f10d957e0e6446d458126894e","src/features/gen_BluetoothManufacturerDataMap.rs":"4bd41d1c47e4e2ec175872881531c1978676647f63d8344267e66346ae7a5568","src/features/gen_BluetoothPermissionDescriptor.rs":"7e23ba9098e8f18874c8d08840ff82a4ff03d536617528362976946a5473ffb9","src/features/gen_BluetoothPermissionResult.rs":"b7ff0bf1603061515518860ba02f8f2d43fd12108f1a0563f97301e617400315","src/features/gen_BluetoothPermissionStorage.rs":"df7387637030527acdfae61e16a192d36413703626b2c961ec64d671fe7eb62f","src/features/gen_BluetoothRemoteGattCharacteristic.rs":"4136c767dd8e49631227f23228e2125440f854321386bd0687c8a8799b978783","src/features/gen_BluetoothRemoteGattDescriptor.rs":"28a0d224a89811db1829c49a4520aed22efa208d161a89d1fd07b4748a36556f","src/features/gen_BluetoothRemoteGattServer.rs":"ad25e1a91df3bb3b64e9ffa69976b6b61e4858959a2f8235c35828aea660dbcd","src/features/gen_BluetoothRemoteGattService.rs":"bf09ed5374d82e659b9d4776becb02790e573a50ff7fd0cc1246556df9ae8165","src/features/gen_BluetoothServiceDataMap.rs":"aadd8f9a2868bac979f155a9a9eb6e1d08a0754ee072f20b6e795a025845d1e3","src/features/gen_BluetoothUuid.rs":"9d31a31bb80ae846df9d1719bf5fcd1221502232acd66f8d7ba0dff6ca4c42bb","src/features/gen_BoxQuadOptions.rs":"069698a93e4d7497a3589394815a3b51c96229afbbe613b49e0eb5ef1c7d0939","src/features/gen_BroadcastChannel.rs":"c5f8ba5e35d31fd49ef92c4a03af88925543e99894b766cfc977db6137258fde","src/features/gen_BrowserElementDownloadOptions.rs":"9135eb0378fd1ab10d52f5ed6964f34f4b472610f2ead928656cbc117f56f19c","src/features/gen_BrowserElementExecuteScriptOptions.rs":"a2e3bc4bfe58e0f3d9aca8142b47456ca07b271e86ee896259bfdc7f9373f3b1","src/features/gen_BrowserFeedWriter.rs":"54348581bfb88a1356a1cd187113c9828bebb5b86ea97ebace6b69dc9c49f95c","src/features/gen_BrowserFindCaseSensitivity.rs":"8809028a31a3d644281867759a95ffc0f4977d9513d5f51b82fee90ea124d2c9","src/features/gen_BrowserFindDirection.rs":"4ddbc14c34afd26f766b55ad79277216b1105bb17f6608a4d71c06b35b41bd12","src/features/gen_Cache.rs":"9027ace9a9072fc7d55926239e1aa089f3c909e04d4ae0d07089b991ccab86ab","src/features/gen_CacheBatchOperation.rs":"b6f2bd3db9b8ce1da521b4626171d58499750e0e7691af21557c28c2995385e1","src/features/gen_CacheQueryOptions.rs":"adb579e02080d760f744ffcfe9d9cac52030c6fd308a9a201ccf7fffa5eac1f2","src/features/gen_CacheStorage.rs":"12751d03bc6c7f9054baf0526d018bf815e9425c937b08bc7e3e3f51173de4a8","src/features/gen_CacheStorageNamespace.rs":"95789749d91ef88ff8f2dbfe980e831af42abbf4b73446affcccb589c5962243","src/features/gen_CanvasCaptureMediaStream.rs":"ad7c36a8b2e6943eb90ba21bb3deb8c1774256fabf20f637dfd92681e817e37e","src/features/gen_CanvasGradient.rs":"4f3c587209bfb617980017fb96ec9b5ae8e0a4a9d883de879262916e312c6438","src/features/gen_CanvasPattern.rs":"885ff5370817b4f5f455a7d0f5ad2ca56e1d9467058f87c118c604eb88f25237","src/features/gen_CanvasRenderingContext2d.rs":"1df33f1238d870f7f2832b2278204711615d704e992b48daba51d3d50353ae88","src/features/gen_CanvasWindingRule.rs":"3d5eb123879452621161a28078a925cdb9b104c7ef8299518fbdfc7cc8ce2981","src/features/gen_CaretChangedReason.rs":"fde6f8968985fd74465546565bb121f6d18ed03246f4e31a06f3f7cf5ab6dc88","src/features/gen_CaretPosition.rs":"4de00fb02b1410c14a0ed4c53deb51e27a77d8339f55eeac90bbae2fa7f82703","src/features/gen_CaretStateChangedEventInit.rs":"e060668e44d19b14a6756180b20dbdeb99fcda157bfecd01609e934c4f3e6cad","src/features/gen_CdataSection.rs":"6c1bde87dd3cb7f1697de2c954e5de5ec13077acb9d03f7a2e81c0e3e6c02ef3","src/features/gen_ChannelCountMode.rs":"b338b6533f775c80a47219edbfe8db85596172b0b3e304f23323126e5b0853c8","src/features/gen_ChannelInterpretation.rs":"e46c50f7233d9b126038bd72a34ca7ba05edc18f117947e0771011abdc85885c","src/features/gen_ChannelMergerNode.rs":"8956149b1ad7c28f51e8ac51fb27960cf72136c826f01187fb5deeaff5dec074","src/features/gen_ChannelMergerOptions.rs":"c52e323482fd7be3124a535d233ac7aeddbf8f4061fa0e276dfb1b758be6e2d3","src/features/gen_ChannelPixelLayout.rs":"a05ad3608eb6e455a20b1e1dbb91dda3efd01a3617472c9f332489b00143dcb7","src/features/gen_ChannelPixelLayoutDataType.rs":"d8a95cc801cadaaabab89cae8572e674f034c3792f2da5b3c6a9913931370094","src/features/gen_ChannelSplitterNode.rs":"68cd2c93a554a5f37c9b770e665d92a27ce5c2a20f9ce401843be89c9378d137","src/features/gen_ChannelSplitterOptions.rs":"6c9ed10973ddbe6185eedd3c26efed924fa5e93f70bf733e88eda15b26011e6a","src/features/gen_CharacterData.rs":"bf4f3955de6623d6dea2584e72933c695b50ebc196d4dff9654473e9bc86ce87","src/features/gen_CheckerboardReason.rs":"0d78b8c736d7a198a054b917565d91ac09dbe883673745f190abdf6cf59999cc","src/features/gen_CheckerboardReport.rs":"095c6add2d2a3790be0e7bdd91e09378aa2840e0df74db5d0016b1c728ab857b","src/features/gen_CheckerboardReportService.rs":"d4d637d6a4e539d9b81fe8855333cd73c5e36fb12c51ba1cb9cd328ae600364d","src/features/gen_ChromeFilePropertyBag.rs":"cc472c05dde22ba67874209f172152d75584b8b276fca31d5f1ca45286615824","src/features/gen_ChromeWorker.rs":"fbf3a05b1b757ff6fad20ef257fe5d5c75fba2485dbd8d90784988670ca9e713","src/features/gen_Client.rs":"3f8bfe8136245ee67de78b56ab77c8a16748424a2ef32cc76e185a77d1ae1063","src/features/gen_ClientQueryOptions.rs":"8edeb52238896499c58dcd94f375fd0632447d0823ac6a19508b807f56f451a3","src/features/gen_ClientRectsAndTexts.rs":"a07146710da469936a32e0f8540999270c18ac46236f488ac849480c2fee79ce","src/features/gen_ClientType.rs":"784e2c9ca6c5a920dc6360984b99c5503508642f3b05cf66e3f8b88c27c74b36","src/features/gen_Clients.rs":"1ed24533d8b668821d87f5dda06e91d781e1866e64cf844a2202e10795f61dd2","src/features/gen_Clipboard.rs":"85b0fc87eadb6dca9376cc80764890a7610cbebaec022fdb90831c9b6383d320","src/features/gen_ClipboardEvent.rs":"533f75485084262efd87c5e059b3a22a3e9114c2a189eb6f59158d949e0a2263","src/features/gen_ClipboardEventInit.rs":"c0e9dae70b6eadfe80b51211e09f85926f2a84c8e19907c8a923fb73794a92f9","src/features/gen_ClipboardItem.rs":"caeda320a1c37963fe4ac0e56e0330e1585ed0f86e6caeff10e7c17391bc389c","src/features/gen_ClipboardItemOptions.rs":"a406bc498614bc4dc0292089f309dacefd2711658bb34beda86407431ed1ea40","src/features/gen_ClipboardPermissionDescriptor.rs":"14a66119543e4dd1e9b20838e53a430064f79bfd8b663a715356291ae788b793","src/features/gen_CloseEvent.rs":"c4b2dff76ca15c4ae1393823e3991ee8b820aac7f6c87867ae08009c3c309f6b","src/features/gen_CloseEventInit.rs":"dbb2707a47ff7e25f84241c1c46914aa0417ad457f9c98a952b8c3678242625c","src/features/gen_CollectedClientData.rs":"b427e74618dfda89b859dbd021fdf9d4b9b16d40d5fd0c451f74258761404a78","src/features/gen_Comment.rs":"468034ee4b36292eea3fc1552215bfd212bcecc0f42dac58df668bae4ccf3c84","src/features/gen_CompositeOperation.rs":"354833c14817eca16eb361c26fdfe27f84a381fb16493f84380e99b0352aa371","src/features/gen_CompositionEvent.rs":"f12e46914958d7edf991e4f72baeb872ffaef3bfa1b13a13d3a7cd0e2f60fab0","src/features/gen_CompositionEventInit.rs":"a542f3d96dcf6410bff6bf3803b907f9f8858782ddfc6cc7355b5757fdf8f86b","src/features/gen_ComputedEffectTiming.rs":"c254438a916ca6478add8d648a33b3e7253159e1952a13e8e7ebde9cb5961efe","src/features/gen_ConnStatusDict.rs":"04ef20fc0c9aa5f8d7ed41cb76ba97dd32b3baffcb3fdd403ee97fd0ebf9302b","src/features/gen_ConnectionType.rs":"d42e120aeba026e63c08def0b8b28aad6aeb6a44377ce796dab17806a702455b","src/features/gen_ConsoleCounter.rs":"b3cef9293bed4638b78348562c7193e49b08855e7c8b6bc113fd48a4efba0689","src/features/gen_ConsoleCounterError.rs":"b36c68e3925d2b5012aafa42b4ed0991bdfc416fee43e0599a8b05c49c4b638e","src/features/gen_ConsoleEvent.rs":"b4ffe2480e8257df5bcc9bc99a0904b7e01e36b1c3b88161b7b7d3d318ba0d83","src/features/gen_ConsoleInstance.rs":"837ad3de78c8b635a9a5bdd2e2655d135776c8b45bf7509d3ce81a09a2a35d2c","src/features/gen_ConsoleInstanceOptions.rs":"27b490955c91e599ccb2b862a9c7c0c6a34bfc055faa1700a589e9525faa61cd","src/features/gen_ConsoleLevel.rs":"14ce635ee006e2583f22aeb64b583c738e1be70eed13359d335b49f3a211c886","src/features/gen_ConsoleLogLevel.rs":"b47f41606b7026f45655d838d9934053bcb3c9e89d94a71cefad33512e863414","src/features/gen_ConsoleProfileEvent.rs":"2a9038ea21a4aac7bc6cba94ccea5cb7758729ca0a1d21ab9d0a23dc66c91923","src/features/gen_ConsoleStackEntry.rs":"5a4c85e73ec8f29bb77b817130b9ead6e882489c87e529a1677ba6080266873e","src/features/gen_ConsoleTimerError.rs":"458c5fd7374b74df15ee629309981df4ed3b6e74f8816d72c84f5f69509991df","src/features/gen_ConsoleTimerLogOrEnd.rs":"a2cf4b2bce260ad4866011a5a333f5b34c70249ec4663858e73182a0e1ef6c8f","src/features/gen_ConsoleTimerStart.rs":"69d5c418dd052e614b0c4dd2716f81422b5bbfd3aac5d0985850fde6f5b03083","src/features/gen_ConstantSourceNode.rs":"c8da84b670926e40a0310c5c92217f5f81952395a6f2c083da7d644fae96c902","src/features/gen_ConstantSourceOptions.rs":"3287906ed1828fd730350f83fdb2f1ff46de43af55f18cd18bf72ac2da6da89d","src/features/gen_ConstrainBooleanParameters.rs":"f5d3fd58157ab3a2802f5141decb8747fae2e4c948d0f3520c31dc4304af2cb4","src/features/gen_ConstrainDomStringParameters.rs":"351042c365f1a7820b2c51e848845feac63feec1fa50d339d68a84d28e94df1e","src/features/gen_ConstrainDoubleRange.rs":"6a90b99dd73b80e64dbb854121f99ca5fed04af7ba518bc0d445853213638d0d","src/features/gen_ConstrainLongRange.rs":"1894ee736f93ec69cd7c385a57809ed02ac88028b1d2af55f609480061f8d1fb","src/features/gen_ContextAttributes2d.rs":"d7e4dd3b1d765dfe1fd6a585c151f4ab059f112a50a9098903c55ffee371c0a1","src/features/gen_ConvertCoordinateOptions.rs":"1343293ecd2180d7f1d850809ae35087baf1a82a3587026dc695876b24585183","src/features/gen_ConvolverNode.rs":"78e636782a7a7f98cb010617632ce5791fe4379f406e571a80fce17398b38d23","src/features/gen_ConvolverOptions.rs":"b45dd8de522a4673b108b2f486684fd38a8dde0ce93d88bf2ad42e4f0de51d86","src/features/gen_Coordinates.rs":"0cd254219ddbdb2b252ca67900d3cc1a25e2f448fedb477b7c1dbd9c80800d9b","src/features/gen_Credential.rs":"7b1795101c30e142400f44eedf8ec29d1cf99d9cd5304aa6625a48f6df2c740d","src/features/gen_CredentialCreationOptions.rs":"edbc19859f7664d7346ba1361450dbb0a9abfa30f4349b14852e8237366f50c1","src/features/gen_CredentialRequestOptions.rs":"5e6a665f1866123e480068617c601c7eac687053ccbf846ba32342b1264407b4","src/features/gen_CredentialsContainer.rs":"b91d2c02d924d9d2fe44414a00671e58698274b053c0223a6116ab60e6c639c3","src/features/gen_Crypto.rs":"70c7b240c3dead7ba67a017c631fabf290cea92ac82960c55289637a921b6013","src/features/gen_CryptoKey.rs":"d0517bd6a66743472a135e9d1fdc1af6fcfa7a49318739c75837e403c2877531","src/features/gen_CryptoKeyPair.rs":"0052bb7df568c0be45fa71d2bd4ad3c0f9a7d74de0d688fae0891dc1015587b3","src/features/gen_Csp.rs":"7107796503ca11e9788eff30844c0b0b1e0008e3326b4c615c16a32009eb3409","src/features/gen_CspPolicies.rs":"4b8cbb4892e5602b85b8375e0e85ec29bd2c64bbbec9f7564c940649c346558c","src/features/gen_CspReport.rs":"7e293cf03d4b959e78a0c64dc715f9c146968dca89a887b5f11e5e7d3547bf20","src/features/gen_CspReportProperties.rs":"4487fcda92e6ced5f3971260831937dd39ae03e751c62f50f05e7bf72e5dc775","src/features/gen_CssAnimation.rs":"a5ed22ee4ec2b678d09352baf0f77cacd99ea8a1c4d1cd252507fc8054152e56","src/features/gen_CssBoxType.rs":"46333d2364d1e4e47ca380bedf324502103f0bc61e73e4c6658e5dfd0d8708da","src/features/gen_CssConditionRule.rs":"75ac1b778ca957816970c1a0dca472267140fe8027a9fbf7e7a445b1fb27a54f","src/features/gen_CssCounterStyleRule.rs":"16181d9de43847aa523590ca0c633c1a1212f2c281fa55f2113909dbf2844b3d","src/features/gen_CssFontFaceRule.rs":"bc801156a41852698930b6dfa9dcb75685fba61be086a39c2254e55cfa7c732b","src/features/gen_CssFontFeatureValuesRule.rs":"5a1c8a9e5281df0129b2af0b98089e3457bc3d0b8f1dc6b9dace788e0e413b65","src/features/gen_CssGroupingRule.rs":"96939ed4f5f97d6bb044a05471d8c51798d571276214122c25fed8eddccbeec2","src/features/gen_CssImportRule.rs":"0030b12aafe451333e50c7bfd9f76444e9e20a4a3f8b0cd3eceb77a31f736558","src/features/gen_CssKeyframeRule.rs":"f9b6162051073908209cd80f0d12f84b128068279035e1cdbcfa49f4e749f5ac","src/features/gen_CssKeyframesRule.rs":"0c06eb58a6d733ee0b1a8378499647614f0da4760d3910b6cb3c65fbbfe5eb37","src/features/gen_CssMediaRule.rs":"c4eef5dcdd831ef7bf4572ea75d0a0651b424d400ca20748c40e22ce4d0757e5","src/features/gen_CssNamespaceRule.rs":"b8aa55dcec07f335cca1935daeca7043d3645cde33502114c2b63d3aa3166ade","src/features/gen_CssPageRule.rs":"761f4a1b6fcd060f39d449dd70b29b9e7696dfb68202e1eb9546198cacfc3067","src/features/gen_CssPseudoElement.rs":"9a561e5d1be08cf8728c661e50ad8c0926a0d36a4b5ccd321061524e5c86ac59","src/features/gen_CssRule.rs":"36b948a407ece56df90ac875278ce850d102f7abc0aaa818af95c3b1586b9fbd","src/features/gen_CssRuleList.rs":"bb1e2d9901e40aa2f8780ef030fc8630f713282f133556edff045ebfa9f517d7","src/features/gen_CssStyleDeclaration.rs":"a2d19cb5fb2f2b4cda82ad7206f3c9be72428deccf8abc23eac95419c08ea168","src/features/gen_CssStyleRule.rs":"a939b9ffef0ca954c6eb6cedc1c4d270446931e22219d9874bbe7cc117ace1b1","src/features/gen_CssStyleSheet.rs":"2d71e59c3fd69b2a4e26c192912beb124e6c399661c775744760bfb9d34e9096","src/features/gen_CssStyleSheetParsingMode.rs":"306bfa1738a286143cd7deaf4a19b7c154d11a6e97bd24f3c447adfe32d2902b","src/features/gen_CssSupportsRule.rs":"c593c07c94d8dd9fca3a580db4e930b0d7f9833485216010924b4abce6232a64","src/features/gen_CssTransition.rs":"5ad6189609acbb2c47d6b5bc266f32e8645ce863ebcbcbc1d524cf3c1a869321","src/features/gen_CustomElementRegistry.rs":"a9f3c3c4e3da13339be986dd3d672dfd7d37ee961e5254b3d86bf2e74b9c4e5a","src/features/gen_CustomEvent.rs":"b448bd3399b19544a8aa08f2feab9751a259672380c879718a2f0f7df72380a0","src/features/gen_CustomEventInit.rs":"4156d993ff99a085c3bddda5c8969f742abfbac17b7eeed262c508448d2f7049","src/features/gen_DataTransfer.rs":"089d4050d67cc1c353a769c81b75f623dde953175394661726f33e1882a017d0","src/features/gen_DataTransferItem.rs":"7bef4fc286c6bf6b13aa93749eb5ac98f26d47fc0985feeafa8329a4ed536ddc","src/features/gen_DataTransferItemList.rs":"de7faa8c7a6d0beb3bba70e23c5128d5e494c8cbb217c2193e54aec2b9d92533","src/features/gen_DateTimeValue.rs":"87e00954814d1dfbae7fd0d4c4185745b3798e508c74bd3ae0e4fb7804163c63","src/features/gen_DecoderDoctorNotification.rs":"706c5252860b41395c310220689cd4db676f571abd573fe34a56b6be06195196","src/features/gen_DecoderDoctorNotificationType.rs":"2c034054e294d588a1a61c981b3ab4301262cd415df9fd3074baaeb0f2183c68","src/features/gen_DedicatedWorkerGlobalScope.rs":"66b8e2efeed32cb846e73ac0914f98172dc5e58adb09640513a055507965d7f1","src/features/gen_DelayNode.rs":"135d77e54dc6e891c977db32788b88780fe66c9a10e3ea00afc33ee31d1f984c","src/features/gen_DelayOptions.rs":"3703d08189d63c105d729ccb44ab756e0ef9cde78a8eb26c60c53ee2b21c94d2","src/features/gen_DeviceAcceleration.rs":"6cb540b703909ca12fe613746826b2cdee854efcc4075d81137b735925ba7ff2","src/features/gen_DeviceAccelerationInit.rs":"597aac598c9e4a48e81d80690b5138d9137f2e12a785234fc64fe95834b321eb","src/features/gen_DeviceLightEvent.rs":"cf4acd7239ff3ad1d3b6de206bfb8e8f8cdd03294782d3d6c4edc82891ffd3ea","src/features/gen_DeviceLightEventInit.rs":"7e17d61529e83d76eac042a9da92b475176d611fab422b4bd548fe021f879171","src/features/gen_DeviceMotionEvent.rs":"4c01f7d5a5bea22f60ea40f71d3b52854f3b0e8a4ee9dc049410addec1e8514e","src/features/gen_DeviceMotionEventInit.rs":"64bd68a4fb83d479df18d39f94e57137f24e4bdfd7cd5a703360680ecd6061a8","src/features/gen_DeviceOrientationEvent.rs":"f80e289ccc63686aeaa20f1b33533e3bc39505266871cb574fe34e6af2577cfe","src/features/gen_DeviceOrientationEventInit.rs":"47a7cd0b9a06a5733cbb330fb9f733d028a4d8b1216bffaa84e3f71b2b54c945","src/features/gen_DeviceProximityEvent.rs":"5c3609f2e772f6bca328303015295efd619b3724b810873f37a2683a16ff63ec","src/features/gen_DeviceProximityEventInit.rs":"306721f09e1385aacc3716655f1704e9c6254adade92deb53e2d0c536b041a34","src/features/gen_DeviceRotationRate.rs":"6b5feff00434d59bfc4e411123de8af78542b73c4fb399f4f0a5c470af9d31fb","src/features/gen_DeviceRotationRateInit.rs":"b1775ee3ab2392711885c9efc2e6dd54ad563d50e68717d9b8efea5488c1ad52","src/features/gen_DhKeyDeriveParams.rs":"e15491b5fca37a6f265e00dd140a2d1e062387eca4aefb8dfa8bdc124efcbd05","src/features/gen_DirectionSetting.rs":"a3914ca9888d2eed07f97f8f8573dcca0f341bb51ff25309827696c060791c8f","src/features/gen_Directory.rs":"0cdd48e3d3e7b24c3c4d1c0924ee449df9accb420fafd57db9f30151b031d287","src/features/gen_DisplayMediaStreamConstraints.rs":"895b7eb8e0f14907103f921ff8e63d44ef1ebcbc7be4c56cee406263bc1eaad2","src/features/gen_DisplayNameOptions.rs":"80a869c942c78645b455566e523682826e81399c9db63df6474ca12597e119d3","src/features/gen_DisplayNameResult.rs":"3b5d8a520d09aea1ce36ff7c2aa1db691b30c934048bd81a1ee2f0ba0e1339c9","src/features/gen_DistanceModelType.rs":"1de01e98ff27aa8c7febf0148431b5158a7135f4d7813f4eea2a9167c6ff5490","src/features/gen_DnsCacheDict.rs":"e7408600a87c24596bf5d8834c686263d4aaecc54c887db4db431e553072296c","src/features/gen_DnsCacheEntry.rs":"0a63c8b6c26e1aa74b464d13b8ad20c3b7ccb199c6d1989853cc30cdade1b518","src/features/gen_DnsLookupDict.rs":"14d616b62b2127af4cf224af7deb9b5735a46698104971fb8507cbc306c736e4","src/features/gen_Document.rs":"6fa1f4872ed74565905e87c0f47dd30bdf2dbcd97f661cc9666bdc0c0a649b1f","src/features/gen_DocumentFragment.rs":"e3836ec87706b63aa5634e3fcf5071f7b006dbf03f88710146782f9c88c84d51","src/features/gen_DocumentTimeline.rs":"cf8ee30909ab743219dd9f3e9f451e211703d869fc1ffd1d903ce1c0ba7b525d","src/features/gen_DocumentTimelineOptions.rs":"97b0bdb73ebf832529052e373393fae0c377d50bd21a022b1c83640dfaf95070","src/features/gen_DocumentType.rs":"1a286b2fe64384c408b655927f3fc31cf2533ffe02e2c3fb1030b176e96d78d6","src/features/gen_DomError.rs":"c70683657c862500c8740202ca8af37ab04a004c30d9ef61537d613f636d3801","src/features/gen_DomException.rs":"8d12196bacccac079c5afb536e612e7c566164772ef06c3fbb602dbe1ba7c26b","src/features/gen_DomImplementation.rs":"cfff99bd9701658a873dae8ada67720abe5470ab746aa8fe5f12073a1b717f48","src/features/gen_DomMatrix.rs":"78307276718b7dc04d8d06928c920b7d4b2b717fd0d95dbd6e1bf8b2bc4a07f6","src/features/gen_DomMatrixReadOnly.rs":"fc5b72955322cefa88aac36f7cb71393777e2acfa6640ba1653f31cda2db084f","src/features/gen_DomParser.rs":"7b08c04a1ac48dd12ffc839e1ae2b6bfc8c7f6fcb753ef182f40233a2cb797a2","src/features/gen_DomPoint.rs":"34f57a05676603cdeed1c700ba9035dd8332603aa50b774849665fabe0a4a8c1","src/features/gen_DomPointInit.rs":"9ab98fc17b64500f3e64e7831a45515a747e31ca788dea05b742881b9c13fa38","src/features/gen_DomPointReadOnly.rs":"e7a48fb0a8a855c4ce037a7251a11c97204ab9689140653b26da4b04fee6a4ac","src/features/gen_DomQuad.rs":"94784f3230d883c7fc9ee33ce81886122abdb307134f2939cb80620dc6227e50","src/features/gen_DomQuadInit.rs":"b77d3f6554f0e1876b3a0c88d9aaf8769d1ea69c93c940cf035383c029ee9b6f","src/features/gen_DomQuadJson.rs":"5c0ed02fe5872c1752f6abd85af0e0046bc99b4abf87548cc63ec53b0c2ddffd","src/features/gen_DomRect.rs":"3410beae932a67c305fa579915b23e65d24f918ae6fe9369e46d8fba9b3a1e53","src/features/gen_DomRectInit.rs":"08055e2025d229bce0b88979bbd10065df4b344d5ab02dc56597ff0f7f4ffc63","src/features/gen_DomRectList.rs":"9926d64b88e495e87c14370878ed351c592a58ec5541fd5148c45de34afda02c","src/features/gen_DomRectReadOnly.rs":"457e3c8b01c65e9b7809f6b13b1917f806cd659d597f01ffd92fe1df23502d8c","src/features/gen_DomRequest.rs":"2ab7a80f1bfa51c572dc73ef642a4eb2251d8594a267f7ef91dc952c8818aadc","src/features/gen_DomRequestReadyState.rs":"367a5ac277f4d98f624fb1a1593811af7cea79472dd48e602495cb6cb643955f","src/features/gen_DomStringList.rs":"d30200e307bca8fa831d99957fc24cef76136eb676dd29f40ba22ee9272a34f5","src/features/gen_DomStringMap.rs":"2d474c7764f318dc1dfcd5b9fdb17037553029408568808d33c2bbe71ded6b5d","src/features/gen_DomTokenList.rs":"c160a6e1976fc4bf6d6e962ff6c48b2852c11478a3dd88ebd66d1fd810fed633","src/features/gen_DomWindowResizeEventDetail.rs":"17a68b6bdefb2a33b48aa8cb28facd7a7e06e2eb9fd31842c14f495a2d5bcab3","src/features/gen_DragEvent.rs":"3c5775532cbd16c0449ed5c4e1ba67ff7aa20287af985acd2c758d2a15b19fe9","src/features/gen_DragEventInit.rs":"c67b7a2ec6f2e25f1c2dabe76d5df3e6fc484ad9b9141adeb04a2c813e9b2835","src/features/gen_DynamicsCompressorNode.rs":"7a0e064247801084ddb40bd49c43ccbb59a857701284d660432d859d77558930","src/features/gen_DynamicsCompressorOptions.rs":"475728b013b7e97c7b0126c357475bc920014a48299e73c93a1e5d9f4663ea79","src/features/gen_EcKeyAlgorithm.rs":"2686acbcac6c4a012233131f227465bd445f450540f71ce789f62063e0dae44b","src/features/gen_EcKeyGenParams.rs":"31feb819f181b6e9fa15bb70bda598b8a110476a4bfaea9ced0432539d6b6d92","src/features/gen_EcKeyImportParams.rs":"125157883bb223804d00e3da49891145b4d6745d6d34f5b6389e8bab4aa8a6a8","src/features/gen_EcdhKeyDeriveParams.rs":"1c9ea7ef8db319cce9f093f0bdfaac2b8574691974fcbc4ed56b91c6dcb2076a","src/features/gen_EcdsaParams.rs":"a0a1f9b817fcc29c014aff1136967587dcce91e8782fac6c588d5e229b59e094","src/features/gen_EffectTiming.rs":"ea475718faebb98d23cdf34551c93b0bfe4d408867b6044fa0742f811841df1d","src/features/gen_Element.rs":"af2cd465ae1fb928ce206c550cd47317524f7b84d5f5cf038ca8688bc0c7c548","src/features/gen_ElementCreationOptions.rs":"4a4acd857d14bced9ad2a1b632027bc9482183b9febe1255fe2726fbf5b545aa","src/features/gen_ElementDefinitionOptions.rs":"32a611d3d3d675408f7feca92af9339ad1b1a5d8623d57a83e896736411abac9","src/features/gen_EndingTypes.rs":"94d4e8be85aaa2e6bdda06b3a7d0d52772251e3572fe5a276014feb0132835c3","src/features/gen_ErrorCallback.rs":"a30f71dc95cf65bb7b0fe2ecb999d673a14881eb732ff1fc9a68560ca4fea5ca","src/features/gen_ErrorEvent.rs":"9d4845e4f8ad55cf324f49558697ef5b283fa2e7b06f5041c031d2498eb36a74","src/features/gen_ErrorEventInit.rs":"49f7bc6378030947c2142a71df34474451902793e16fecaf3adc503622b85432","src/features/gen_Event.rs":"85a57dac21d22d54fa8c7e4c0ab5384906be4ebbe79732f49f213928ef2e888e","src/features/gen_EventInit.rs":"1ff984424984ec74eeff8b84a364e65bd4a147b2a66fcdea235b3cd8f4652ca5","src/features/gen_EventListener.rs":"302b63ced95ebec9b3779f4401449cb75f617a512685389283bd891bd474b8f9","src/features/gen_EventListenerOptions.rs":"5bcd8e3d33ad515c02a770aefc4e2d170c06d372378c62c083d36556efc0ab30","src/features/gen_EventModifierInit.rs":"2026db5da154b61f3921cb6b57c5ec5e448be08f5ff8118023bd6bb0f43a390e","src/features/gen_EventSource.rs":"ebb0a09b7a110c24f6c3cc161699be2c018ad0d430b9a7e5cd00565f137ee114","src/features/gen_EventSourceInit.rs":"91d7e25cdc5761cb138bf09cafb8ffeb4a0e1f55838a3aeecb6bcf14ed2339c4","src/features/gen_EventTarget.rs":"abb29ba368ffdc31da0afcb2de0bafbcd00e7c54fa252868e1234c66984d42b5","src/features/gen_Exception.rs":"837144fdc010480b6cd1d1fd6a22a46cd3be9043e6dbe27c80461ecb314f9092","src/features/gen_ExtBlendMinmax.rs":"50ec3e3df0307dc9704ae3dce4da22df6a6b348b6357a715bcbcc11bacc9d8cc","src/features/gen_ExtColorBufferFloat.rs":"be87130736e493341fb1ebc7e83d26127c2a449befda1b04fe5789f444196003","src/features/gen_ExtColorBufferHalfFloat.rs":"e1d1e92b3a0cfb48f9575ca9b2cf72e2c3ec25c03f760866b33d5f89327fa255","src/features/gen_ExtDisjointTimerQuery.rs":"463b356c45fb133854838335708663f1e5dfaf3b82267f0d1803f1cb60766b48","src/features/gen_ExtFragDepth.rs":"a1dd524b3428462685c88fba7ea719fa161af32dfc45f053572f5924b930281f","src/features/gen_ExtSRgb.rs":"f0546b101793f462cc5313dd1624107058e6a5b8b61a323b1cd7ff3a57990ab1","src/features/gen_ExtShaderTextureLod.rs":"b4fdf292d87ff7117e5fc415438937bce72b133bc9d6047cf93a1d2e1d0babf8","src/features/gen_ExtTextureFilterAnisotropic.rs":"922ff1acbc4c63844a9a96a61ed8ae5c5b4121a6f02a9af22fadbc45bbec83eb","src/features/gen_ExtendableEvent.rs":"2e3d895a3161d42981073c3d34403593947f4f91ad63ac999bdedcdd15726912","src/features/gen_ExtendableEventInit.rs":"8e81fa90f562200a8a76dcfb792eabe89aee4c0634790cb46f535ed59418a993","src/features/gen_ExtendableMessageEvent.rs":"b884972fd494f3dc9fb604a25d8c68da7f277b80ed64a9d54d706042c99b1ddb","src/features/gen_ExtendableMessageEventInit.rs":"4801a6d85cca930305ebc73c8716e28068cc5efea048311f45b4f46b3d221429","src/features/gen_External.rs":"67735db3b40fa309c7ae161a3217f7466aafc1ddb498f8b6f436ff43c87cf149","src/features/gen_FakePluginMimeEntry.rs":"034852a1af88f6aee7a09ad88e1fbd4b038c8241a51c968b0e18859546e6ebe4","src/features/gen_FakePluginTagInit.rs":"94c7f9a28744ec2228a228a4c5c3314ddeabbb2f243f9c7ff3400960763a607c","src/features/gen_FetchEvent.rs":"376b035785abf43a50da8e0c6e50e0e02290ef5c124b4ba52054dedbfe0aeb61","src/features/gen_FetchEventInit.rs":"3f66b8dbb281287af3e44f3eff2e518afa492cb5cd1811c56dfbcb664158a97f","src/features/gen_FetchObserver.rs":"a6bbdf5ff0fd4a9e0c7270fbcf0437b96020b421459e598b04cc33738625a201","src/features/gen_FetchReadableStreamReadDataArray.rs":"9d9f5a5182b36ae2b1c52cf984bdd36f2f017b4510d443dd3fef3f7afefe7ef3","src/features/gen_FetchReadableStreamReadDataDone.rs":"5b811672e5e01578bbc47d99ad769feee1407d056c3ff917e913f7688eaccdb6","src/features/gen_FetchState.rs":"b2e213c3eaba1c1b3cdbafb781086be20d447c03fb2a200876c9ea7d70b3e4d1","src/features/gen_File.rs":"2042623fc660593a7da48f125af17be6714d9945e201bba17a239e58f949ac8c","src/features/gen_FileCallback.rs":"0ca5ce1d329bf0f40b312be4f28235f9ef85a860edd17d541b8eff35c72ae57d","src/features/gen_FileList.rs":"b5a770020d9db6b813aee1fa432e7ec340be66b9b2dd5da160f5cca9b67c2fe1","src/features/gen_FilePropertyBag.rs":"1c886bf6ef86535def96686a957226ffc34a9b1031067ed993c23c1e822b942a","src/features/gen_FileReader.rs":"19a99fc05142317ed793c975f5bfa815bdc7ee996e0492ae511720ed32617cbd","src/features/gen_FileReaderSync.rs":"b11856194e4df09c3bb0c5b5a9001e24d984d50c874c9a142c5972b618e5326c","src/features/gen_FileSystem.rs":"c2f5d295484e733e378a0f4372722e09ad6308df1103f1b11152b1807958de5b","src/features/gen_FileSystemDirectoryEntry.rs":"55c7f7659160b3beefe0a7085a951da83f202674791984d9bfa3455d3de1627f","src/features/gen_FileSystemDirectoryReader.rs":"53fd042dc13ddd7fa92032cab53d231433475ea6e236e4dde10c458ccde03ded","src/features/gen_FileSystemEntriesCallback.rs":"c5be303b47ef078fad8fff03be27ae13dfb7f86c25368a1e9a2f388414a3566f","src/features/gen_FileSystemEntry.rs":"c68034dda8059eed104dee7060a6ddb19405047fd3ad7a938588bd93dc76948f","src/features/gen_FileSystemEntryCallback.rs":"8cd4a192748a805b64b2ff9256cd69d2513a9b1a379dc08240581967e15176fa","src/features/gen_FileSystemFileEntry.rs":"7bbe45d02738074e44af5deda8ee47bfa311ae977e79214eea76c80c2ef659a6","src/features/gen_FileSystemFlags.rs":"4bd62b46bcb197cad00e64027865112b56214208b41d8da9c79e4e4384e49616","src/features/gen_FillMode.rs":"7111688961245836afea8e8809f7be47f6b0b4beec11406824413884e1b8bd0a","src/features/gen_FlashClassification.rs":"3a2b85763b5c06ad91caf025e8e0276c9600139cc7c4a2acc702f3c5d54b5506","src/features/gen_FlexLineGrowthState.rs":"f161325fd49e735cb8926d7534a724304ad98cdf766754c752728e5c603c3d75","src/features/gen_FocusEvent.rs":"967ea03c5a6a2698b8f51f2d3e0b03a63556629a27d6a660a8e7897a09119553","src/features/gen_FocusEventInit.rs":"81c288f321fa920f3b3de56155061096b067b497de472057b4d6cf3900453ae0","src/features/gen_FontFace.rs":"5a494ad9024adfb36c05791a52754551bbef2d0d4e566026e454568b61828ce7","src/features/gen_FontFaceDescriptors.rs":"9f732e6c81ab5a1d7192853befc69b0576b8602428f9555e7e791838881b84d3","src/features/gen_FontFaceLoadStatus.rs":"bccd5593d78c4ac175466b13676f48b5e1f13be04cd441dfff053699ce39a8b4","src/features/gen_FontFaceSet.rs":"143ef500e0b8ddc65aa453ef9eafa430347657f1753f13d9eb55ba27d0bdbd3f","src/features/gen_FontFaceSetIterator.rs":"720bc1538b60de6717b4d19ca076e59192817881de28e952b3c4d2e39ba2c2ac","src/features/gen_FontFaceSetIteratorResult.rs":"caaf836e1d04c61ade11997c9b98fc35fc505eca8072b786d97c71c881c315e6","src/features/gen_FontFaceSetLoadEvent.rs":"4b2f4c852d01b0c74140564802fec1e814f25a10834b80cc91632feffad26c2d","src/features/gen_FontFaceSetLoadEventInit.rs":"19eda414928946cc1e8687bc25917d5d7083808ea0437ad54e48a0e85e68ef95","src/features/gen_FontFaceSetLoadStatus.rs":"d48669f3d80a625345b7ff65ff85c6acd3cc12166c38d3fb41d017b350ed6891","src/features/gen_FormData.rs":"f2418ab446cfc6bc57937925673616ece3ff42b1759d19d222b8929707fe9c51","src/features/gen_FrameType.rs":"824c844e4c85e05d7397df6817c1ca469ff809ccc87508642d65b1d02f541514","src/features/gen_FuzzingFunctions.rs":"808c99360b3f71f1f3943e92a0b15045e5087e061428da746e0414228c0c06a9","src/features/gen_GainNode.rs":"b369829a5fd3693cd29b3f1bc12d8b2daafb8062260c448e9a39a8eb5f681344","src/features/gen_GainOptions.rs":"e92c2a769fc0f0baa12f6a74453ba51c1f0ee00d31e879ad28d8a67b47e7e7bf","src/features/gen_Gamepad.rs":"7f56e49efc09e4ee6614f17f96c773f9abcd8ca9be2c2a2fdfe5c1ace7fb7647","src/features/gen_GamepadAxisMoveEvent.rs":"c0a6d0534c40785154851b978a2dc7f080ec338bb5fefb23ecc1233bc26989cb","src/features/gen_GamepadAxisMoveEventInit.rs":"a73996dc638ab4bc0318fe40a23e0362a5aa99a85370c8bd7b0b1840c3e7f8ba","src/features/gen_GamepadButton.rs":"548f6a8b1187bdbec307f2e0d22bce32a2b1aa53c5f961980b18010111fc3608","src/features/gen_GamepadButtonEvent.rs":"cbca5736b9b80943cc42912f798f1309e6f784738aab71fc7afaa44d4a2fd9c4","src/features/gen_GamepadButtonEventInit.rs":"178a18761f37a31ef1009efb901042ab4c03a7379dbf5781fbaba4361eb54346","src/features/gen_GamepadEvent.rs":"e2302d17933334bb93ab33595e4924946691f64969cdccd2fbff3ca7067e7cd7","src/features/gen_GamepadEventInit.rs":"59716f435c0d81c5ed72f3f5f0021c358ec958d845504112c4e61a3fb665a5e6","src/features/gen_GamepadHand.rs":"47ca33a4b565c04780e20e28293774c879c450f674d8c4ef580fa7cb5cd312f5","src/features/gen_GamepadHapticActuator.rs":"a3691cafc6d338a5e64adf2692323a94f05edd1f3a559ca55b4ef76b757dd25e","src/features/gen_GamepadHapticActuatorType.rs":"e4ab6a38add4c8d6cffd7d9ed85cc78ea6fa055366210fff0afaa9af8f4aabfd","src/features/gen_GamepadMappingType.rs":"dd3dba7287488999f4d7b67866d5aa8b0e24c8ce175cf08ce25d38779e110ce6","src/features/gen_GamepadPose.rs":"c1086fb98f6bbe750add186e875532511362b3416c5154cef08c64c1f84b49d1","src/features/gen_GamepadServiceTest.rs":"484968cced13ab6cd026d488221ffb52f4822b5db46803f56798a1fe11926f23","src/features/gen_Geolocation.rs":"9097a110d7ac379d67e7d701f9b182b7e4afc61e8937b26c56574420e063f698","src/features/gen_GetNotificationOptions.rs":"8145b8416c61c47068c2d9dcc2227a674f6f8981dae25ef55dd6e22e26fec9f1","src/features/gen_GetRootNodeOptions.rs":"dfe74ae2106e4278c6afa196c85b43fb1360c870f1bc00d35e8906fbd2f5c789","src/features/gen_GetUserMediaRequest.rs":"5f62a38161cf1722d955fdfa934d57316bd5689707e822220638eab13e1448f4","src/features/gen_Gpu.rs":"bfe458ce270d2796030c2026f12c5cdad6fa828f40fd0037d685a4e285ccde53","src/features/gen_GpuAdapter.rs":"a0379312d4c77ec27282232b5eae805276bf12b40ff9e595e8fc9b6f328de7a1","src/features/gen_GpuAddressMode.rs":"0e7391d525dd69e5b8549e90f47711df6fcbe78f3a04bf6fa556f9c6a4da1959","src/features/gen_GpuBindGroup.rs":"be3727c3d451a4586ec525ad8dfdf9dc17498d7bb65848e77d7ac7dc2460e688","src/features/gen_GpuBindGroupDescriptor.rs":"ea9b4bfb2887cf5e24ff846ca54087eeb1610af644fa831a8989c5204e051d96","src/features/gen_GpuBindGroupEntry.rs":"d85e0bff82116f4f58df609f8e6e48894a3196cc7d505c78e9956ab36b3d45cf","src/features/gen_GpuBindGroupLayout.rs":"b68d0f9478408eec0d0f289c14ddf18286ae7e857990f87494480cea3ca834d0","src/features/gen_GpuBindGroupLayoutDescriptor.rs":"8b4543804842e0eddca59861cfdfb8ca17fe213c8525699c7e5ece6a7b74cc19","src/features/gen_GpuBindGroupLayoutEntry.rs":"530b167b2549ed21ee51672242819b3d6b44e04c7b08d277b8b0832fe1fa8e59","src/features/gen_GpuBlendComponent.rs":"0d88e42ab9a061f5acae2a8117bb1edcbb609f5e462fa14fe2b6385f26b32308","src/features/gen_GpuBlendFactor.rs":"6f8898a2ffb4d49eeace1b79050f888fbbc0257d3772ddfc921d525133453516","src/features/gen_GpuBlendOperation.rs":"c97691cb456ebb9d621ff01e68dd1ef05064d240261345a2ee1f806a41aed17c","src/features/gen_GpuBlendState.rs":"6b1360518cf0d82b03d2bc0f2dbebd6dd10ad40bbc33d0d942c66a0334c3db51","src/features/gen_GpuBuffer.rs":"096658b4a4cd39bcefaf5d372b7cb7e0ac09cb7c74c6783e261c2eb41a516bbc","src/features/gen_GpuBufferBinding.rs":"98c4edf9be6a483421bc16db2b4688f423469dce647e10bcebb76a6b7bf2fcb6","src/features/gen_GpuBufferBindingLayout.rs":"ef4e381bf64da38a08661c67793cd515715e6eb62cef15082bb9a6c055644d09","src/features/gen_GpuBufferBindingType.rs":"182075a7860893c43e31190f913c70cda5c71c263137d75df7ed68e6739bf0e7","src/features/gen_GpuBufferDescriptor.rs":"93baee132ba9312281baf257310216da8cb4265ac2b6ce9ac371e544b9c80314","src/features/gen_GpuBufferUsage.rs":"1027ee869b8b8d1256aaa5060930526e40fb083a16af1be7bdab34879518ef89","src/features/gen_GpuCanvasCompositingAlphaMode.rs":"7fb1fb90f40c4edaeec0ceffd9157434aa60cf4ad960da15b9413ac3a0a09c75","src/features/gen_GpuCanvasConfiguration.rs":"dbd83e8692bf6edce95f140c06036bfdac9acf635a1ba409b2943699b14b7d70","src/features/gen_GpuCanvasContext.rs":"d158fbbc9826426eabd547dae6cabe7be56724940fb61a45c12fcd32107e9be8","src/features/gen_GpuColorDict.rs":"da00e9bcfe7561d0f49b63579602fe49fffe7fd11d09687a79092ae2726c734c","src/features/gen_GpuColorTargetState.rs":"0fa63962ae29d6ea67dc51511f5251faaa845406cc49c52ae129e47342d75f08","src/features/gen_GpuColorWrite.rs":"287e3dd7bca71f77ececa750bee2ddccfc7bacbbd07796eadf52daa4fb0673f8","src/features/gen_GpuCommandBuffer.rs":"8ea53a734c23d8ebbf5ef12985e32f95ce9e313d69497e870f0a2eec4148c81f","src/features/gen_GpuCommandBufferDescriptor.rs":"388e91840314a2e6f15a28fb1d57fe14f146d799740d54f8484f3289a80126f2","src/features/gen_GpuCommandEncoder.rs":"ccac0502b2df17f3ed3fe2c7c57e00325afe2503e62d05d2a04c310f0f074ca6","src/features/gen_GpuCommandEncoderDescriptor.rs":"87c0e89700f197a1084978bc2248e34e0ee9514a8ee60c6ace2a110a9a68a2ff","src/features/gen_GpuCompareFunction.rs":"74f62d9f220fb00b69bfc444c92e4dfdc8ba24b55d2419199bbb6c4ddfd4e401","src/features/gen_GpuCompilationInfo.rs":"6cd0c8de6e0c3e75b51c71258daf0675e61e0225e1fe8731ec7c761ae056fdf2","src/features/gen_GpuCompilationMessage.rs":"dd2a734e34d713461813054c6c0014930dbfbea0cc26c4962e7ca0ecc9372a54","src/features/gen_GpuCompilationMessageType.rs":"1b40c435b88c5c448aebf82903376bb3dfe418563bf7f818de0ebea17be27347","src/features/gen_GpuComputePassDescriptor.rs":"dd889e8e9c2385b1ba146e1b2b7429084d486fd1d99ec9ed1425998c7f8fca23","src/features/gen_GpuComputePassEncoder.rs":"476bb588a7f89e3fee9e43711cbfa25544a281729f92a57afec2ad94abff5102","src/features/gen_GpuComputePipeline.rs":"6b8d7763b7b9ed18ff56ce7cfb2e652818d1204eb034a34a8dddb2ff38a252e8","src/features/gen_GpuComputePipelineDescriptor.rs":"832daf6a586edc6dca8f086d4c8d98bf2a45800758924a2edd10ba09cdc1fe00","src/features/gen_GpuCullMode.rs":"9c444518620d79ad209fc149d20ecf5e85f99f9f4d9743ccd6bf26f718a800ed","src/features/gen_GpuDepthStencilState.rs":"8bf97aa66c27e81e930609442b867139452f6d2e7409f2e379de4e5e513906c4","src/features/gen_GpuDevice.rs":"93583eca3e83db4cda0b3a391eb724af94bee90c068e9adb9be4aba7abe83530","src/features/gen_GpuDeviceDescriptor.rs":"79c42a7e6739216d2a18a7e9cc330b81620b91123e7bc39ce29f112ea2cf9850","src/features/gen_GpuDeviceLostInfo.rs":"0fa692a5b50b35d13d98528a9cc5ee72cf1f047224a5f876113825b77a4ae78e","src/features/gen_GpuDeviceLostReason.rs":"2ee61871427d8a1063de70f5dd395a9effbec7b35e4137bdf2d8a78366a7317e","src/features/gen_GpuErrorFilter.rs":"4ef11fba30662098baf2786bb2ea73c9270858ed7e345602cb2c797140583589","src/features/gen_GpuExtent3dDict.rs":"4b8e975fb381f980174fdd7c6acf9503dd6a9f5b0c681eb1d074bf48c415b6c6","src/features/gen_GpuExternalTexture.rs":"d53c385256bf38bd541e93ce3239d362137b6d2684afa388a303041290879ae5","src/features/gen_GpuExternalTextureBindingLayout.rs":"ad7c8fc0059b0e633827d3c68017768bb2e353532da20fb2bb0c751fb3f8f2e8","src/features/gen_GpuExternalTextureDescriptor.rs":"05c76067677161fd8862393bc9426329f95212a6ff2f6c2d6066dd0a7da43f67","src/features/gen_GpuFeatureName.rs":"40b44f92cc76932dcab555ba2bd9c3065dcc68c5113bc6380f054a78e6239e9a","src/features/gen_GpuFilterMode.rs":"9625970572ffc19dac0de7fd1b9d74f30f684f6ef68dd22557cc8e711fd8e4ef","src/features/gen_GpuFragmentState.rs":"2fa0b91541d517ed9e1354e07068fab146f9775a6b2a0891fc29ed616ea073c4","src/features/gen_GpuFrontFace.rs":"270095ca143d38f2c292de31b4845717432a2f2ad68ffc6e18f261dad3e82c4f","src/features/gen_GpuImageCopyBuffer.rs":"3a81ce2e51618c2703b419439aeaeac36e9ab6d495b6b9c025bf355d083b16b1","src/features/gen_GpuImageCopyExternalImage.rs":"1b1c518bd3e6487484392a3142354e378a7de7cc5363a8863843287ab468bde6","src/features/gen_GpuImageCopyTexture.rs":"be5441acfd15e1203b425092b52f9d1f5d23336b08eaef8185337438e99131b5","src/features/gen_GpuImageCopyTextureTagged.rs":"b7a89e384cf0cc9eeb18c7e6502b5c651a5b66ce6b687afd94a46db985f44140","src/features/gen_GpuImageDataLayout.rs":"6afc8553a342b5e8fc817988777ba0f5a8ad8df440927c7926015872239338b5","src/features/gen_GpuIndexFormat.rs":"97a9383acf35e56180d0ba3ed18e3dbafe3a91244417579a1b767bb5f7411e65","src/features/gen_GpuLoadOp.rs":"f476752bf5624466b0b81e7e26a58a57225dc0bceece22d81d6f2aef4e2bcb2e","src/features/gen_GpuMapMode.rs":"db416fcf8e221b55349e1cf0e846c335a80b747f878c3cabeee7eeca06dc12e1","src/features/gen_GpuMultisampleState.rs":"0e66f09d53d10b7c99d6583673ba10677941eff30c1dc37912b85c8032b5d6eb","src/features/gen_GpuObjectDescriptorBase.rs":"7744aa864e2428e4ace461255017eed5c5853ef2d8f553a9d454f2695bdc194f","src/features/gen_GpuOrigin2dDict.rs":"d8601ba073bed77df89a9cd308dadde25b214e06bb6c8e17d1ee6efeebaf8659","src/features/gen_GpuOrigin3dDict.rs":"224cb61d87395f1fb4c68ab3d0f335856c83c455a1d2a95240c46f030a190f1d","src/features/gen_GpuOutOfMemoryError.rs":"125e1662f869cd02d0118514a01724c4dcb933a2fb51e1f4cad3518d9c63ec63","src/features/gen_GpuPipelineDescriptorBase.rs":"d80e7624956e5f1e785b89a641760af5f1610a0f07836984482b5b65cab0f7c5","src/features/gen_GpuPipelineLayout.rs":"ab277ba99eebf321f6107d8058be848252601a4c5b0e49fce70bcd2d0d2e82f4","src/features/gen_GpuPipelineLayoutDescriptor.rs":"5a8cda8ab1f9fd3390ecb5aef70eda6d007a628a013662c0a093bad2c9531c01","src/features/gen_GpuPipelineStatisticName.rs":"17d4d8f70478a45a98f95cf69cd1a4edcbcb16b4c5281fccef2d0bdf9108114a","src/features/gen_GpuPowerPreference.rs":"dcac329ff410f4bbd7ddf9a4f8f172ed066f9990f44f9928b5911c8859ab9f87","src/features/gen_GpuPredefinedColorSpace.rs":"7d2c91bb5c2683ff6bd76c8f0172170fcf32a434f72f09b5c6de4db2bbaf01d7","src/features/gen_GpuPrimitiveState.rs":"d046acca1bbd40fbbd5fefd18fa45534a31892a24b55750114ca2944d7b51e24","src/features/gen_GpuPrimitiveTopology.rs":"518777660c5885ac469d7caf8b30c397ebd0001cc61303ad6bb94d443aea0fcd","src/features/gen_GpuProgrammableStage.rs":"efc2b431d6e8d929caec7c6026dd039dabab6031f22fe63bac4b92884b644614","src/features/gen_GpuQuerySet.rs":"829b8a0a846e1b17a97bf6c739e3d637f1d02ac95ee65cf1c2a9022e21d17ee4","src/features/gen_GpuQuerySetDescriptor.rs":"feff35a852500184c3e3c1fe75dd840da332b9646fc5a17e3258b7e12d1ce01f","src/features/gen_GpuQueryType.rs":"cf60e7aac79617e430eef1e5f28a7e20695a351412b1d1845d20537f5118ee19","src/features/gen_GpuQueue.rs":"f3a2c1499ee23683d0269cd1e99a683b0f2b8a3b523bcbb148c8c0e6b11d8a16","src/features/gen_GpuRenderBundle.rs":"7123168a7e8f7c7fbb845be6b91c9577cb87882602610e2eab0ae1d79903a01a","src/features/gen_GpuRenderBundleDescriptor.rs":"ced934408bd9a2b102f9ba91fc0465342fd46fa1102f87cacab9634fbfe0163d","src/features/gen_GpuRenderBundleEncoder.rs":"de6ba71050f77a237744e80e187de8169c9690261958fd5d57869f6c42c07769","src/features/gen_GpuRenderBundleEncoderDescriptor.rs":"07fd300f92c11babf02b9b2d46657eda3bfe0fa90f38c290772ba89406b2581a","src/features/gen_GpuRenderPassColorAttachment.rs":"8d001c988598c7d9c01be876d6d6be3d9cb95ced3a74298cc94867bf25e73147","src/features/gen_GpuRenderPassDepthStencilAttachment.rs":"86bd5de734ef6edf7e0c53c27da32af4b8d4bb07ad7c899169756350c8490b29","src/features/gen_GpuRenderPassDescriptor.rs":"dcdf3854ef105724314e78b3207e4cf1eeeca48cf499cc8b63d0a5398d42a580","src/features/gen_GpuRenderPassEncoder.rs":"889121da7b70f25994d359e8a872d50c2d9931463763de04da7732399c3d8edc","src/features/gen_GpuRenderPassLayout.rs":"1ed432ada16fccfdf7d03e75919624f39011ee2255fbe43e5296067c8d4a9d7e","src/features/gen_GpuRenderPipeline.rs":"fc4f77b58dd0b6e03459826f9e441f29511572c52afbca79f904a17cc791dc3c","src/features/gen_GpuRenderPipelineDescriptor.rs":"78115bc7d932ee78d91c9b500c71a347bafc8352e6eace95e4d944d4e2bd68e0","src/features/gen_GpuRequestAdapterOptions.rs":"1a185bba94f1f9ffcbe798c3e713df8d1824d36c5ed4ba82f3b020ceea24b396","src/features/gen_GpuSampler.rs":"310714f350252367df2c01f05238a4a0b730466e17d93ecfbe301b004cd3cfc7","src/features/gen_GpuSamplerBindingLayout.rs":"39aec7201d1d18c4d847570013ef2df7a6efcace38451c7b2849360df7a525cb","src/features/gen_GpuSamplerBindingType.rs":"29cb9ec4e7eb0cc969e1c7d9bc18cdf5603c31e5749ad2fd5b9cdcc3145a6d77","src/features/gen_GpuSamplerDescriptor.rs":"276beb394ecab10fc3f9fab47adb5df51a743a0641948ca2f6fe2123984c63e0","src/features/gen_GpuShaderModule.rs":"b1bf4a3740b9ca93266693fe9943f8bdd0347e8a90fde51df574f62c87ec126d","src/features/gen_GpuShaderModuleDescriptor.rs":"ff09f1b0c6f894cc13592725767f5977fe476b4333e06197db6b7224d900abe5","src/features/gen_GpuShaderStage.rs":"8afc5527a158169fb6d75936736cdd928c340993fe2bd383dc8393195de7694b","src/features/gen_GpuStencilFaceState.rs":"93f8b3771fa34e7e3562e03ded3222a667a6ebf457c64a3290899402ed3a45a2","src/features/gen_GpuStencilOperation.rs":"81c58a42a567decefc4b88cef33b632d86c101d4de95ee40b2da3144c831fac5","src/features/gen_GpuStorageTextureAccess.rs":"adae978d653d1ac5c50894e4edfd86800bb6e94af4f7e2f2d2fed71fe92b73c0","src/features/gen_GpuStorageTextureBindingLayout.rs":"5a9efdeb3612b33514fa3d5aace2727bc8adf839361fce2fa0bd621fdcd58d3d","src/features/gen_GpuStoreOp.rs":"a4ccea8e02a9060ea8896f99b4f9140cf60d2392e6ee39e586f7d8b111778403","src/features/gen_GpuSupportedFeatures.rs":"26cd04727743d8f7bda4113a273a7676f58d4e3e65a1f85abb9692afe3bad81d","src/features/gen_GpuSupportedLimits.rs":"1be654ada81731d17976a954042cdeb596cfeea620176e9bdd5969b1a106c5eb","src/features/gen_GpuTexture.rs":"c3a6b7fb826511df353d591b0d158b0ef13b28126f6960114eb05d89690088d8","src/features/gen_GpuTextureAspect.rs":"f78304891f684d9e2debf954b51a0777efff4f71812570f24644a8fc8f782d3b","src/features/gen_GpuTextureBindingLayout.rs":"909d03f03148bf7e4ae4a006e7a27a3b551bbac07fdc8c232e37e37c9384835a","src/features/gen_GpuTextureDescriptor.rs":"31b210ad2f96c06b158365b9f4d7cb49d18652daa9869f1f6c2e813c5f963bd9","src/features/gen_GpuTextureDimension.rs":"014c0e2bbde08e1de29ddb2de71319bb6f51eb3368332f8ee988411d4833a3d0","src/features/gen_GpuTextureFormat.rs":"bf7df9d69449547ed35b28289258d98a1679cd377cb3ed40606b060e42108c52","src/features/gen_GpuTextureSampleType.rs":"2d6d9b268c62e42659151f021fe6430838d22eeb5fdadc8600403d4f5760661e","src/features/gen_GpuTextureUsage.rs":"3738609751b6dfb69d0b83bc6133b78c0b8f065b59952e8a43b5c030e37fd354","src/features/gen_GpuTextureView.rs":"bde860085c501aebfcf9aed2632e161681237a44d0e29ac8a2877592bd4b84fc","src/features/gen_GpuTextureViewDescriptor.rs":"1123d79392c48bd6dcbf9e61b2b1f5b9bdf694f74fe0217df69ec1a26218e423","src/features/gen_GpuTextureViewDimension.rs":"cc408d7938eb88579c597fccd07d1ee6d95b7f54ed59055ebb931a980f28e480","src/features/gen_GpuUncapturedErrorEvent.rs":"a5bf4fa2efa218a74d82d8ced6fe59208625896e8a9a54a24227da5d682cb6a9","src/features/gen_GpuUncapturedErrorEventInit.rs":"832ad11d6fb0286a384a65f9cb028c98634ad151d77f2bfcc28ff4f950c2cc44","src/features/gen_GpuValidationError.rs":"c0383558710066ca5c8b299382bae80b92ae85f63230e5acc5200c8ff828f77e","src/features/gen_GpuVertexAttribute.rs":"ed0c6c9f22fc1c8043f42e1d5d0ce908511ec22659b81d6075dbfecddbea7102","src/features/gen_GpuVertexBufferLayout.rs":"92e02cf17c23a3bab6a11a3bdeaa5dba2b5fd2165746a7c23c1ad7f186ec67ec","src/features/gen_GpuVertexFormat.rs":"7af0ef727dc6e839d280dfa1c8ee805631e87265bdd6f7080665d87855ca0de4","src/features/gen_GpuVertexState.rs":"ff5fb9c53f6708e0631f1acfca253281e072f1fd63240efbca23f1b1770cd2a7","src/features/gen_GpuVertexStepMode.rs":"0d18152c25c83dd458c1fb4836fbb104866e3676905e1f5ea98da9b14ea11caa","src/features/gen_GridDeclaration.rs":"cb62c8a5c1afbf831a6fd209cdf5a4109d97dc6c58125fa643600e7093a8be11","src/features/gen_GridTrackState.rs":"56a37325cf0673adb1ba275a4b8b46476a5dd280c6a45b67f2bfc158cf532cb0","src/features/gen_GroupedHistoryEventInit.rs":"dbe0443bef46f6e25cd6c7eb661745950b84d742d8570fc9728759d2605cfb29","src/features/gen_HalfOpenInfoDict.rs":"7c56d26cd329c7b101754819e7dba980512f162b1fda2c8379c08b0caedf5c36","src/features/gen_HashChangeEvent.rs":"9249ee9383295fcede2206b0442f9e687e8e455d7085ca71e85f44350813124e","src/features/gen_HashChangeEventInit.rs":"f7409742a9b8c8863190df7bb4bb22d1dabbceb6eb83114fd2bdbe66c7290a51","src/features/gen_Headers.rs":"0b448fba408c7ef1b8becca98d4518f3fcf6d4afc5c68d4a78a9119579000bac","src/features/gen_HeadersGuardEnum.rs":"a1073aa29b5b2ea585bcd9bad4d6418a8bb9a5490a5785c4f49531f7b98023fd","src/features/gen_Hid.rs":"41dccb182cf09e9aa1d81c1a26df7d97fb644fb4ed6e8a3f95948aa02296d4ea","src/features/gen_HidCollectionInfo.rs":"034acdbb574326450e29d6929a16a9920bb461edb0dd97dcb6514bc0c7d915ba","src/features/gen_HidConnectionEvent.rs":"0fa4e8d506a651a90318a44bc787d006bbd6853b3f5ea3b0d3cc977e57b5b7a3","src/features/gen_HidConnectionEventInit.rs":"db5e1eba9bbc8f4f1059445a5d9de5418c8f54d916610acd48b436f8e32c4eeb","src/features/gen_HidDevice.rs":"8f96f5c27671c2d2b7e805c56b7bff136dac9446bdefe0bb286adc19766f822c","src/features/gen_HidDeviceFilter.rs":"e538ef697b91c324a5753aaf24fc295c210e2b6b6ea3ecd26b16aa5723b2fbd5","src/features/gen_HidDeviceRequestOptions.rs":"e0a1765d7ba01eb0641d6c6b0635e10e92836b7c356df656422f1caeda9ff5cc","src/features/gen_HidInputReportEvent.rs":"87658a5d8d6c1d761aaaf684ef5886607ecce717d94960d399b626b94aeb2882","src/features/gen_HidInputReportEventInit.rs":"3a0bdcac5d08a0d8b6317b35a47b25a6bcef6c663c7ea9e93d96cbedd5d7f22f","src/features/gen_HidReportInfo.rs":"61332820b2b48c1c73e7e68b865f6b9dd2903a2a0ed962c01c1dd2175e1d7745","src/features/gen_HidReportItem.rs":"47667430a289aa2d4496a6e1f2cb85579c1fb5275827814240eac8e351810186","src/features/gen_HidUnitSystem.rs":"54dac3cc6c73031848a7b41d19cb100357d699691cd557c614b5195867ca9ddf","src/features/gen_HiddenPluginEventInit.rs":"a9a3340c99d6cb6dc55a57dc994398bc1d14b0cbe064ead89bf466bd6e7b8ef3","src/features/gen_History.rs":"16a1dde15ab3f7684ef1da38b4d17bafa157b5bfd9c1b979d083608578144ebd","src/features/gen_HitRegionOptions.rs":"0e09cf6a9ef1a3d9e250cc5a08ede11c9fa98d04516aadf5cdb2c0ab6ffeac30","src/features/gen_HkdfParams.rs":"41f1dfbc70c0208530525229fb4716f157ce334d78b4a17e8a2c2d9fa067a1ef","src/features/gen_HmacDerivedKeyParams.rs":"e148d6a7498fe71e4ca6033e66528152bb40f6f11b86d97373758a51cbcd5abb","src/features/gen_HmacImportParams.rs":"9be9a626fe7799a0de6fc72ae77de68124c6bba0c0466895ecd6ee729a76c5b0","src/features/gen_HmacKeyAlgorithm.rs":"e62ca977d716f2857c0b3f794c6aba51757cba23392c3ba2a80c3380757764b1","src/features/gen_HmacKeyGenParams.rs":"8637f60c6bee71c96edf83041e3f898a4bab0e2d23488307de20953db057eea7","src/features/gen_HtmlAllCollection.rs":"b8dd381351ae53ed3134602660094d3fef44bd4ac2e83e13aa983b939b918ef7","src/features/gen_HtmlAnchorElement.rs":"9eb3acf526d282a720b314c78ac58fa01043321b457c3958d9ad444d150591ae","src/features/gen_HtmlAreaElement.rs":"c8cd2827b924375f5b3782bc1bcaa449f40267ebb643b95799bf43658a37a112","src/features/gen_HtmlAudioElement.rs":"f6b2ab9872c2914c61df93c5a025079c572f88ef9a9f311f6fdfd63f22e55cd0","src/features/gen_HtmlBaseElement.rs":"60747bb4ccd2f35ef71a9f92cb47dfd13545aefdd37141f734a2ddd6154fc03b","src/features/gen_HtmlBodyElement.rs":"31d56eb35d7f80a9a1d00faf1ea163590eb82dac7f736e93a21d790a892120db","src/features/gen_HtmlBrElement.rs":"0a68a1a4f6fcdb06d039093f5f9c2cc3bf5d815df21366b6aa3e27621a10691a","src/features/gen_HtmlButtonElement.rs":"76d249508a1b6f2d75b400509ff313410cd66bb8d927c4c78564b266618f5503","src/features/gen_HtmlCanvasElement.rs":"5258e23e9708ba994cc2bb31e79ad5fa0a8c52dfdb1b1ed488704eab7c5f25fa","src/features/gen_HtmlCollection.rs":"c683e1048703fae2455454eb316c240a0f4bf8876c3e5bd83f844057705c4e72","src/features/gen_HtmlDListElement.rs":"f8c2b9185a485568e31c8654c42215165eb15e0b2ccc39348157338c287c00f7","src/features/gen_HtmlDataElement.rs":"6ea32dd938582f00ff20bc78af8a2b7a7f0c2d0b28fbab5ab131ce6f831c0062","src/features/gen_HtmlDataListElement.rs":"c1bd084146c933a88e22c6386cf3e85ce1b532a6e6d13ba478f7ee6e8ee85f05","src/features/gen_HtmlDetailsElement.rs":"ea140261b2bbf530a06d6c4e16822e066dbafd0d88ab96032ec6981f43710d95","src/features/gen_HtmlDialogElement.rs":"68bdff6eea8e73c19fec2bacd44ef3cdb29a6fee71bf497807ec9a18b2a657b4","src/features/gen_HtmlDirectoryElement.rs":"4720fbdd65d0534c05aaa27d3b26c4912cb8c84ca79981b67d5f05d00af66c21","src/features/gen_HtmlDivElement.rs":"c3a862c709816e06d4d4d29c6a5b9ca5fd8e9069ed0fa0d2fef21da095512e4f","src/features/gen_HtmlDocument.rs":"07fd8fdc3890d9a2f15786739892df59609d699ed3ee2731aa37aeffaf1f1b85","src/features/gen_HtmlElement.rs":"af2a446eb05ba68e4fb6a9f036114ae595b55db4ec06cdcc9bc7b72966a547c6","src/features/gen_HtmlEmbedElement.rs":"854f1ef3e2ad614de0d6c25d93efc748698b58178295cd6a99cabe34e18791b8","src/features/gen_HtmlFieldSetElement.rs":"7ff26ece40ff9f74e55134c8267a95ba771861eea5695209d969f770f12e205b","src/features/gen_HtmlFontElement.rs":"e2d46e16fd2330e3003b92c895b86e36bf1a382160d8c6bba2a62c8b7284b140","src/features/gen_HtmlFormControlsCollection.rs":"456a4851aa1924eb320330bd65f158d3a986e8ba1522e6ed18bc0895717a890f","src/features/gen_HtmlFormElement.rs":"8ecec4caf12751a784cfaadd44d476979fe6b1e152a108aff475c10842451952","src/features/gen_HtmlFrameElement.rs":"0eb15066928fd1524f0facb17813db9a3b866f209d8d256d4712b1572abe32e8","src/features/gen_HtmlFrameSetElement.rs":"694f2bfc231f75d817083fc7054abfd40b250c51adbf9b82b4331a46c277867d","src/features/gen_HtmlHeadElement.rs":"5d6e63cee2f7025b891a1178c408f4b18405420fd56478b0c23a6aa1473a4f01","src/features/gen_HtmlHeadingElement.rs":"3c62d74812f65829da4284eb00a9df76a0652c41ee2d25f3bff06f95e03d68dd","src/features/gen_HtmlHrElement.rs":"c4f315cbcc4632780deee0bd6478640db7b74b9cbe317f56c58f416971113032","src/features/gen_HtmlHtmlElement.rs":"6f43098fbc7519d578f55cf20fa1520ef3223891486c0941836218e0ee99a84c","src/features/gen_HtmlIFrameElement.rs":"1f620bded333088f76dcb924ac73e7777450389c6e224d814974a15149965d76","src/features/gen_HtmlImageElement.rs":"db5085d2d595d102604b9d701754a28c4f843a2ceb49168d3c4e2bd51fcb31b3","src/features/gen_HtmlInputElement.rs":"16834b39e37b138a4490c9d66d9bd6ceb0c1715a63895c2ad1831615402a0f3f","src/features/gen_HtmlLabelElement.rs":"457c5984c9b4da0352150c56459e4c27f89d609b5c3716ec8dd4beb0a171126e","src/features/gen_HtmlLegendElement.rs":"0815079e45df189b5675da3e5181e9aa7d06e24e09571f3625f72559f6e20779","src/features/gen_HtmlLiElement.rs":"0d6facfb83b8e3d7421edd43fdff831f45311d70b5aecd6e24ef5860f6b7031a","src/features/gen_HtmlLinkElement.rs":"eb2ccd5626aff271f3296055668dbaeee48e13ca2f922c6c51ce8bab284dc298","src/features/gen_HtmlMapElement.rs":"895960d6223ada62ec2d3af14d1f4456dfe027cb3d2234f704a3d050f94b7dba","src/features/gen_HtmlMediaElement.rs":"f92c3700587ff98aaa7d38d1dbf9a5fab89d23856314e779b8796b73a15d4b36","src/features/gen_HtmlMenuElement.rs":"a73ee6b2bc999df77bbc82049975c13055b2ff7aa562898d4349f776d3eb9442","src/features/gen_HtmlMenuItemElement.rs":"c8de905b47a4c0b542bdbbe6ca53d8f1174508962d5c22b77b51ff4dc7b4541a","src/features/gen_HtmlMetaElement.rs":"baa028e5c20edf56e79eb1efd10319f3904e253182d1b468bd5721f552fcfac1","src/features/gen_HtmlMeterElement.rs":"192520cf268f16c2e78a54442e14b208a61baebfa2c8c67d07c919ba3ecaf8a5","src/features/gen_HtmlModElement.rs":"3caffe30ad1ce19dd6e4ddc0adc2104235ad5c284311296fc88984e33c17c015","src/features/gen_HtmlOListElement.rs":"24544269a523bf4ec586c9d052d22b8cecf77b8b303299a40a85356e9badad8e","src/features/gen_HtmlObjectElement.rs":"8ec094b1627fe63ab7a9fa640c7403c389234921d53a6c143a94403c6c7c6450","src/features/gen_HtmlOptGroupElement.rs":"eaf398dd5d20695c61f1c44acb581313a196124cf58b121ebcf43bf6a7557852","src/features/gen_HtmlOptionElement.rs":"ae4ea59257f6b7d76e1f4b2541e0bfb8cd40a5843d83f4b4bbcc24cdfd37929a","src/features/gen_HtmlOptionsCollection.rs":"445546270b5af22e21ecffeee547ff6db5394a0c63f412ad0f1f5a5feb3d9831","src/features/gen_HtmlOutputElement.rs":"17823a660a41bcfc7be5c8e119f7cc4fcd1d81830853ab9e95a6b1b6350544cf","src/features/gen_HtmlParagraphElement.rs":"889e6e908f00f75ec4b27aafa6a9642987d3522a1dbf60d960b6cfc647b779f3","src/features/gen_HtmlParamElement.rs":"ce017be1047df3a8084e149343dbdc7754e86e589c8825f55bc090978c78d833","src/features/gen_HtmlPictureElement.rs":"22539f8c05d4be0f936139881df8553c0c9e50fb34e24b20b5e38adf3a7601ed","src/features/gen_HtmlPreElement.rs":"9c34cd1cc9fc79f9a6b5b30e5d7457b72552f3e2309f72726e61cd68331b0476","src/features/gen_HtmlProgressElement.rs":"6e43a1b9c29242b8873d4a1e23c9db3ff7433a3920aac63ca1ff49aac4cb67f8","src/features/gen_HtmlQuoteElement.rs":"4eae1d1edd38c25050b9162f9581b859e6e6349028dae4a54aea9a0cdf20f2fe","src/features/gen_HtmlScriptElement.rs":"0d2b8ae4410a4f9d4406f59f4d56a8067d81f528ab28f951bcaf322bb9f98e5f","src/features/gen_HtmlSelectElement.rs":"c0f9e48072c495b3c8d614139544179a7364d87192b571ab2eb17fa322e0190b","src/features/gen_HtmlSlotElement.rs":"0a7144137e3d5fa672da5b71b2960e7c72935d3f663581ecf016188ecb18b79e","src/features/gen_HtmlSourceElement.rs":"6725b6629f2d5d5261f123bafbf7a049d9d0e1e8d5a8c912915416d438eb0df4","src/features/gen_HtmlSpanElement.rs":"0ebefe71eff86c40b98be070c878416fc91bcbcf0d81c0e92a73b31d7ef66552","src/features/gen_HtmlStyleElement.rs":"e33b7638a202285b0b1bcbe02886e84c2ce766b4490f1a0ee0db04fd9325c980","src/features/gen_HtmlTableCaptionElement.rs":"5a76b44047ed4c23d1651eb19611e85e512c23fb5de8ca17177382b38d672e0d","src/features/gen_HtmlTableCellElement.rs":"1c735be830be7764aca44948549d95a5b260af8c93307f8bc2c17909f9200047","src/features/gen_HtmlTableColElement.rs":"c3401c72e370c26febea655bb81b3fde22d966f700930e4b2c1f54ed55a57b03","src/features/gen_HtmlTableElement.rs":"cb3cffa65972fe4fa4ba5250e30433ff815b65e6b752b5994dbec8bbee3d08f3","src/features/gen_HtmlTableRowElement.rs":"66516a76a05c17e6a27ad43f6b174174e98e2ac48ef918a3a9c1e7a952ee5333","src/features/gen_HtmlTableSectionElement.rs":"3ec342c2caa54ff97931213815f530d016a3cc853cfcc7beff8776dfa5ab2de8","src/features/gen_HtmlTemplateElement.rs":"a99c90d7d12adf389627194b3de8b0002b40bd736b9d6e3fd34ea3bb6704b3ae","src/features/gen_HtmlTextAreaElement.rs":"f415434954a9a8336a19341b942376673fee76e5d4e6a4267e1a0374299dab74","src/features/gen_HtmlTimeElement.rs":"ef5d905160cfc33f93371a3bf994970c2154d03c7760570c4096c580a5c03c8c","src/features/gen_HtmlTitleElement.rs":"902efa4ea80463197f4746ca3df926bc0948a1325e5302948920b21e590e7007","src/features/gen_HtmlTrackElement.rs":"7dd2da51ad5924761996be36f1b17312e74b2fc66600734372251f0af70ba66a","src/features/gen_HtmlUListElement.rs":"28d58e8504b591fdaf1c4dcb493e42a894a2da362a89691a99caf6fafe2a0a8d","src/features/gen_HtmlUnknownElement.rs":"2134c044f806da863ec47f3594d494dd065e719b39e010a8de4601d9a103e273","src/features/gen_HtmlVideoElement.rs":"0272a16b4bb4fc91dbebb9b50ec4315bc60b6a6ec22f9c0384bb0059bb783712","src/features/gen_HttpConnDict.rs":"baf67439744e3a18159d76574545f7b25cb692deec452dc6ecbe14e329a0243c","src/features/gen_HttpConnInfo.rs":"7786642fc4bb838ae4c7600d024b52fff4d95dafc73256ffed83968c738f4ea3","src/features/gen_HttpConnectionElement.rs":"2945befb384530b48e4f2898b04c90c3ea9f260ec5fb21359289e2dd242109cb","src/features/gen_IdbCursor.rs":"eed4565dd0da1a36d119ab3b45b39b44063628b604078de39f124c3482bf51e9","src/features/gen_IdbCursorDirection.rs":"15b2feb3b3310848a1aefccd7af5e4c69a114349d927f731a7388ddb909307bd","src/features/gen_IdbCursorWithValue.rs":"e95ea51882cc5845211f04191865096830fffc6a35771968a5088a3e08dc089a","src/features/gen_IdbDatabase.rs":"a9a59188d086cb4b804d04ccc7892e6bffbc1454057ffd014e37ddceaf491ef1","src/features/gen_IdbFactory.rs":"1576b18867f40d2f7e1e1a3d8386e76f7cbb1cc035a52b508062b7794735f35d","src/features/gen_IdbFileHandle.rs":"0a947cc9b37ba0abf9845ce9ac521cc28dd3f053852afaa9959d63ff17ef3259","src/features/gen_IdbFileMetadataParameters.rs":"7b0d01af6efaf36f29864c8f46d7cc730ddc227e434313d3d1d58a43fb9681ef","src/features/gen_IdbFileRequest.rs":"fc5b8371e85f373539c32eb1e15bbf8601596e62461ad27574e49d2dc7ba44a6","src/features/gen_IdbIndex.rs":"c06eb38505ee8799727d706b81a42f1dc6b3bce86176902aaadd093ca4f06c2e","src/features/gen_IdbIndexParameters.rs":"f3782b683b4242a21f884c294899a85e85357d4a2167a736aa3050f1d8405ca0","src/features/gen_IdbKeyRange.rs":"1c1a181603c0cedaed6f52f09fa7172912c0dbb93bead2784542beab6813c29e","src/features/gen_IdbLocaleAwareKeyRange.rs":"7f7ad2efcf3aef1fb8c1e9e7028f8a93328448a4a7daebc5e6b7758b8a1930ec","src/features/gen_IdbMutableFile.rs":"4a39ac766943dc983d152d18603a5bab94722e3a34a26a607e71d640fb011b3d","src/features/gen_IdbObjectStore.rs":"57c4e4dab3769a4a872374cae1fd6eb67e2a91584afeb35508ac56bceafa1098","src/features/gen_IdbObjectStoreParameters.rs":"8ab70080db8cd57bdeb3ca2e199af22934d0a7b47378346bf1641fcf4195a946","src/features/gen_IdbOpenDbOptions.rs":"3e43cd3eed015e32eb3521de69655ef3bcd7197d66385d95202d1b60cdac355d","src/features/gen_IdbOpenDbRequest.rs":"acd97b9739842cd4ae9db7bcc6bf34bbf60562aae832b169414aededfd09e474","src/features/gen_IdbRequest.rs":"ed0cfa60d5abade057ee0305c8a8c440f2e4ef31f5e04cc983bc5bb29aa080d8","src/features/gen_IdbRequestReadyState.rs":"a4265c126a77a595f7808e7a9ef408a8763f91000481ba045675c6433645c093","src/features/gen_IdbTransaction.rs":"f1318320da86653f8070abba2f6c325d60a262922331fe3665c7b5625d5cc55c","src/features/gen_IdbTransactionMode.rs":"16f13453aab9464622b0e7c1c58bd16e95bbec51d36211251e03d199586c2df8","src/features/gen_IdbVersionChangeEvent.rs":"20b43376a228baa00abc5548bfb9fe64bb0b1342f93e0bea3dace4ddeaef8063","src/features/gen_IdbVersionChangeEventInit.rs":"e9ab4e7e13dc92a2bec2fa824234309b162530ca04d2816eeb4052efdb1483c9","src/features/gen_IdleDeadline.rs":"ed98f7fe667dc44301914fb1113ddfd5500d9eaa6984cbf87e47160037b330de","src/features/gen_IdleRequestOptions.rs":"5ecac686538851aca1acc899dd2bd469fa0ab0329c4eaa734646026a7c83c926","src/features/gen_IirFilterNode.rs":"4ecf97076db887dde2a7abfe263310579129ede1949364817bd50ec2c19d5c38","src/features/gen_IirFilterOptions.rs":"bdddeb8bcca524a8c7c09e5c5213c03e3bd2b62f0a96c7a656946d8daae7a84e","src/features/gen_ImageBitmap.rs":"715270d866433b60c111abe60272f6f995298bb4ea4bf04d649ae30dba8faf1b","src/features/gen_ImageBitmapFormat.rs":"13d89431bd64e94e138a000c30677435228b12a0436a17b7ce5e8642e53f1cc4","src/features/gen_ImageBitmapRenderingContext.rs":"cb5001600b0980b8a2ef73607c90cec9db31ed84ff2b54a310c6ba1da49ba3f2","src/features/gen_ImageCapture.rs":"289b4404ef49a0d9582e82e635f6f14f5924d0bf3950da234b1814b1b68031e9","src/features/gen_ImageCaptureError.rs":"4d6cbbc8a735b2deea1bd103a5647866fd317feb13b96a06bd8c8efb1515da08","src/features/gen_ImageCaptureErrorEvent.rs":"3ea6227337568de038658d42f82e8b34541a2d79f84b1780826137744bf51d5a","src/features/gen_ImageCaptureErrorEventInit.rs":"35ee879def40a580c124949c9811a354cc41677c55a2692a16896e0d2d519251","src/features/gen_ImageData.rs":"7f5774664b9fd743a0059d2838599285556cdb35f493e00e186bf7ed599ad090","src/features/gen_InputEvent.rs":"8b579076de7a0a875c0acad8c23c858eb17d7640c15ae3348b0eacef2df8b396","src/features/gen_InputEventInit.rs":"d2a4457a1f6edfcc35d24616cb481ae4c0317bf06aed1af2fa65482bc64466bd","src/features/gen_InstallTriggerData.rs":"b4784bcf583596040c80abc05cf48d2970552e1827b3d364a2f73df97c05e8cb","src/features/gen_IntersectionObserver.rs":"423102a0d2f5a6f9042ea03709271025edb599313de070cc3075a72d24020660","src/features/gen_IntersectionObserverEntry.rs":"c851cb4bb94533ad4ca6891399d6dab68ee1f0c288b8aadc83cf225145319177","src/features/gen_IntersectionObserverEntryInit.rs":"3d4205a2989e295479cbbb5d342f8a9f507ffed5f261015be7ae4e8ce5173985","src/features/gen_IntersectionObserverInit.rs":"e381825e4f5e5d121e162219ac21bf919f501f750b4bfdc8213f7d35a446b71c","src/features/gen_IntlUtils.rs":"0a4850de54b9db0f10e77e75ceb08489a48a2375f09e4c8818a868d9d4b3a544","src/features/gen_IterableKeyAndValueResult.rs":"1949d409d3f40c8412ac4fbb179284dc8b2fe8b698e781aa2a6cc1c90beee9e1","src/features/gen_IterableKeyOrValueResult.rs":"297d7de076b3dae6e92fb768166f69ba448db4c687189f3c2baaa707480d4e63","src/features/gen_IterationCompositeOperation.rs":"34244ce902aa6bc7a13653bd953b7cd632ee6d37bb97dbb702bdd95b355636b1","src/features/gen_JsonWebKey.rs":"6e375109ae526f97e8b974aa7e3fc23dcb4fde8a2b2c9c45904c9aeab5a48af6","src/features/gen_KeyAlgorithm.rs":"953a9747728fb7d882709675b526244ad115fb057eabd7d00603e23c86ec2bfe","src/features/gen_KeyEvent.rs":"a424577f5fdacb0a1c984184814c80cd297132fc02c97838e364340797745599","src/features/gen_KeyIdsInitData.rs":"bdf0480a1dbcd92ab908f7a9c1fd8dbafdc8b3d893b47495f6a33deb59375222","src/features/gen_KeyboardEvent.rs":"197c30105e45c84625c0c8deb8a65dc32f6d207bad82c98911bb2a859679b15a","src/features/gen_KeyboardEventInit.rs":"43222e27927932d800e2f2a66a6e54e787879232bdee13480904aea65865ee36","src/features/gen_KeyframeEffect.rs":"1f14763ce0b3427cf4ae9fc114b6d2042f8edb4e0c9f928d852e083da6d3d952","src/features/gen_KeyframeEffectOptions.rs":"10798558882089ab807075f5ab495d39d2db2b6b1a4dd86ebe2c7f38746eb453","src/features/gen_L10nElement.rs":"28faa639f66f2b8340ccda87fb77579a9e9e6fed0ad8c0c4b9dc2bd91b33633c","src/features/gen_L10nValue.rs":"97102dd86844b041ef2d1916f40724c2a0511d988ddbcab7ec9d386efc619a46","src/features/gen_LifecycleCallbacks.rs":"f26e20d6fe30d07d188203e0cb557d33b3cc1d2037c2e558566a40bc6a748584","src/features/gen_LineAlignSetting.rs":"b2ca8b4538aec009efbb4a5e255ac84813c2f9aedf35a7763198e539f49a3c1e","src/features/gen_ListBoxObject.rs":"304d890fc42913ca323ab01626f50bfe60c8b39bb66e727bc42f041089d6f3f1","src/features/gen_LocalMediaStream.rs":"761414ce9135e07c8da51bd8c82a3d354373d263e13537331b988c2a3f70e2d6","src/features/gen_LocaleInfo.rs":"b0c2341be54ca04e6a84d9420b15bfb4c15933cde1d3da37a5062230f4b8d550","src/features/gen_Location.rs":"35c4faf094c494796f1c4802c29a3a9a58bded8c8de8a60db7e61b6a1ff0937f","src/features/gen_MediaCapabilities.rs":"1ead279786ecf73750ab673a28e92a6818cd95175defc62c26cda182729a6509","src/features/gen_MediaCapabilitiesInfo.rs":"68e29d59d42d16e8c02084e13d25f57369727a253e37850c8c8be1d320e3aaa1","src/features/gen_MediaConfiguration.rs":"90b3a8ac98a8e6b15f00da6c3068128f433718e4d7a0bee04a3dad3c3b5081bd","src/features/gen_MediaDecodingConfiguration.rs":"c21d750f69f25e36b768076d8fc0fcbdd932139aff5989635ccae04df3807835","src/features/gen_MediaDecodingType.rs":"d1916c6285797ceb3caddf891af06afd8994d2fcc02a6337ef1da5ab47507ac6","src/features/gen_MediaDeviceInfo.rs":"f1b16f0b1adeb71694e0605f787c16e96e9bb08cf4f79deb51d4331c8b957c3f","src/features/gen_MediaDeviceKind.rs":"7c1ca8ff8a4fa76c22062258e7c40ef12676dfffe845d866a83a1594b9cb82db","src/features/gen_MediaDevices.rs":"76b9abf41bd7008e65996e76dc2c5237dbced5a01bafce1d2f8308905a7c2acc","src/features/gen_MediaElementAudioSourceNode.rs":"5ea44897fae35372f794ec259aa717cbc6e72f52a8591f6d48994ed057b115f7","src/features/gen_MediaElementAudioSourceOptions.rs":"785cebbb6cf33e15c1c389857181e8981abd7c88049bf77388b49b9738379bcf","src/features/gen_MediaEncodingConfiguration.rs":"2ef53a8d7621f5c713f9dbea4e8245e4d598bae597289a256fa5f5dda159ad9a","src/features/gen_MediaEncodingType.rs":"93007744005d05609265fbea52ecaf990080cc7c6cd6270a0afb9fb4f181d1fc","src/features/gen_MediaEncryptedEvent.rs":"bc3df23cfea07861c2d2bc00415f874f563446258fd0b6cfb89797a6efbf68ad","src/features/gen_MediaError.rs":"30f45c72c94bb005bcb27e9a7c2aa0f4cd8734980b9ea8404ee2854890a08aaa","src/features/gen_MediaKeyError.rs":"6975d9514ca16300416c32d64e9924963f20e4b86e5cfa38fff850c1495a7450","src/features/gen_MediaKeyMessageEvent.rs":"26f73d02cdefb0b636251ae4fde5ae91bbfb0d4a552808c71f3321081a1e92d3","src/features/gen_MediaKeyMessageEventInit.rs":"1fcd84c10ecc96a7c34c1dde3eab3f7d18183a091532a01d7dc78afc97538309","src/features/gen_MediaKeyMessageType.rs":"b19c5a04861ba1e36f96295f7a750651aca0c2087dac2a418028d4d65b14144e","src/features/gen_MediaKeyNeededEventInit.rs":"ae366333d834aac3c355b743bc44b2f2fc78ac7e913d2c399be184ebb1d9fc0b","src/features/gen_MediaKeySession.rs":"ba6db5ccdfed12cd3254def797540bfe67e120f578ee36525a996054c88d725f","src/features/gen_MediaKeySessionType.rs":"ce2fa1c5681989c5b8d6008e0d44cacfc854f809618da9327661cca1fa591c44","src/features/gen_MediaKeyStatus.rs":"861c23c4f01ea4918278a9c429a3e9edbecf45ec949b6aad88c991b1a873c94c","src/features/gen_MediaKeyStatusMap.rs":"71699e5f7bc86501fb3b9d332328574371c144fb95b70ed16bb3df701876c62e","src/features/gen_MediaKeySystemAccess.rs":"540946af2689b7c394a022f0c61dea24624ec5ee7102be517a450d442a1a3e00","src/features/gen_MediaKeySystemConfiguration.rs":"5219cd8c42236eff0f02c6d0ddfa3c2e01f28d813e0c23bfa4df3e5a0c3839c1","src/features/gen_MediaKeySystemMediaCapability.rs":"3e0781a218fdbb337dc67120943d526c4a1f15361c9ecfa03947503812eb4e3d","src/features/gen_MediaKeySystemStatus.rs":"727abd4cfa31f19c48285d4d4c596a9c0ece295ae895982fcf401f8722c56760","src/features/gen_MediaKeys.rs":"529163689ffb48b9a580c3e2850b450c41f6e43148422c7fc7b6eb82ff7e8571","src/features/gen_MediaKeysPolicy.rs":"1e895a905e9ae33c657be2223c8c106a227a2280f0a03ee364d68fb9438b4521","src/features/gen_MediaKeysRequirement.rs":"34f2c808691b4ccbfc3eb167a9faf6179d243659657d1f36f58c53a17a0a46e9","src/features/gen_MediaList.rs":"e443617e10154cf77c11ab11ce9e8249c367ad3406d6fcf26b1a049eddf50a1c","src/features/gen_MediaQueryList.rs":"7110cd3987635bc065768921bc883a18c195351b4de0862f4c056d9a5121735f","src/features/gen_MediaQueryListEvent.rs":"cf4699cc82bb142ec982c165c084d4ca79818909fc13cf4ae7a8c6c34d512d3b","src/features/gen_MediaQueryListEventInit.rs":"47796a3246ba2599a5df4669945310204aad1e3d276c4dd3016b4616ed40dc86","src/features/gen_MediaRecorder.rs":"93e60c34d0e065b1fe594ea5ba2d291efa6a48ca9d2dd8f6fff21a5baaaf2eb9","src/features/gen_MediaRecorderErrorEvent.rs":"fd118345033e97cf67040a1fc689a6c9248500d9f73f318c5ebb31cf40db093b","src/features/gen_MediaRecorderErrorEventInit.rs":"142fee3717e954a9e15501d074ab56b95eb7bb01278416542fb6165c5d080219","src/features/gen_MediaRecorderOptions.rs":"b24b645ba58609d1a975780ff5dd35b2e43f59b78de899e724b0e72df42e4d73","src/features/gen_MediaSource.rs":"6127868eeee2db1e8607f8d9a90e238bfbb18ee64e2f15da0214e0e39ece6dda","src/features/gen_MediaSourceEndOfStreamError.rs":"fa5b41310927741d4d3c433961d8ea4816a399051d3277ac8db4a9f4b492643e","src/features/gen_MediaSourceEnum.rs":"0bb306a1b65ea78650c0e74887e13999631eb9b4b94425e8ecfc564deecf2096","src/features/gen_MediaSourceReadyState.rs":"3c3f0ff77a9568e16605e2c79211c2af8cf9fef4f7de128a5f97e224a8775f06","src/features/gen_MediaStream.rs":"58cb70701c46970644b6ee49c182e5669bdd620e2a5a5423ee7d80c045b135f1","src/features/gen_MediaStreamAudioDestinationNode.rs":"944e25ce9ee98b7d1b21540de9081ac53be3a670e3d5206789956626cd1ae615","src/features/gen_MediaStreamAudioSourceNode.rs":"2ab03687f00af284f4d6b7efe13fb3d4af2a6cee1d14fa21a5211bf93f671166","src/features/gen_MediaStreamAudioSourceOptions.rs":"43e32b6ec0964284b4b68ba785fc157167a84747a7a14e55a77c0782c197e300","src/features/gen_MediaStreamConstraints.rs":"35270e2a1d10f2b318cd7d54ea210fd17f7f2e6f328a0e078eaef04de08532e7","src/features/gen_MediaStreamError.rs":"f0b4957ca1a33775c1ccde9bab24954c9903f44e78a0b85b332e7babf86d14a7","src/features/gen_MediaStreamEvent.rs":"86bca8a7dc3c9454db3720eac85a5f48076ba0bf9734d8a3a436699f17403f4b","src/features/gen_MediaStreamEventInit.rs":"3e3105e0a1730643f25165b849fc5047c5ee628cb5e44291e8457fd52599ae2a","src/features/gen_MediaStreamTrack.rs":"f4ab5f3734a498016f14a3febb0748d62ebcf4d504b4f208397da6fcfdc5af8c","src/features/gen_MediaStreamTrackEvent.rs":"3b730263a422fda4ad3faa22472e978cfe47604b0e7ccbdc961ad5836486d641","src/features/gen_MediaStreamTrackEventInit.rs":"75850a7c348d67c9f7ac4807680af1b8ed6f06d6d057b91228801ee666f09138","src/features/gen_MediaStreamTrackState.rs":"667229f52276b167c143cb0e811c5deeb203139f742470a7ccea8fa5781c7f00","src/features/gen_MediaTrackConstraintSet.rs":"26ac05009dee4ab012df4b44ed46d7961834bff7dafe51d56ed3272e6ffa9c59","src/features/gen_MediaTrackConstraints.rs":"aa7a6a4772d4faf932808b4f3ae1cf94028c8ba93a3abb9c1bb16c05f2a5be71","src/features/gen_MediaTrackSettings.rs":"6ad03e2ac9e45558159961eb22a858c2928620de7302814cfd27bb6aa3eed13c","src/features/gen_MediaTrackSupportedConstraints.rs":"e89af88dc39f8980dfcbe297a569c29ddea56ffbf40f2019cef597d844c75d1c","src/features/gen_MessageChannel.rs":"738c0b3c2611e3e23797f1f9068fde88c525a5e16a6c8a416b15f15bd9e1e490","src/features/gen_MessageEvent.rs":"4e5d88c8f56def27f3f9e526b015f639b80413e6e51ad1f2ef08420fc99e69d1","src/features/gen_MessageEventInit.rs":"cd13498890933891ad4e3c88373880cee5e0d0f2b4042cead7174a425b460196","src/features/gen_MessagePort.rs":"faf3319cbae678424ba6080e3a7d67c4920af135240bbf7313d545e69e8c46b8","src/features/gen_MidiAccess.rs":"9ef5e8cc922383663bd56889f35d20c1b1f2fc44e08761a8c512f1f0f0a44b9f","src/features/gen_MidiConnectionEvent.rs":"00eabee3f7e0f094b25d0638200dce28a5ccc0b51c45736aa152ed6680605861","src/features/gen_MidiConnectionEventInit.rs":"fb202ac53452d5cf8c17828f824d4e2ccd6be8b8e18b00498b98be9b26551051","src/features/gen_MidiInput.rs":"4e6f45ffea1553abf22ff80125594a2662770d8156e0349b00c521909048e142","src/features/gen_MidiInputMap.rs":"ace61748a759c1ff89ffb8bc77670030f0fabf026cbb58ef2e10585946ebbdd0","src/features/gen_MidiMessageEvent.rs":"131c438bcaf5f46dfa02e7df845aefada9ddac1e9157b35ff28125391726eb97","src/features/gen_MidiMessageEventInit.rs":"b0fff678d5e7bdb1da6e094c4b3bbae754c283d803694a523ab42002f4a9b42d","src/features/gen_MidiOptions.rs":"fc920bf0b4f259e136dfbb64fa9074ac6830158c0ee828c90fc275ade32cdd6c","src/features/gen_MidiOutput.rs":"234354ffc46f1c434880a196d7e8f5bb316747128f55dcdf44fc45efde04fc01","src/features/gen_MidiOutputMap.rs":"c8456551ffc867f7c7615840182121906684fb50cf188afbdd0de56f12c1b771","src/features/gen_MidiPort.rs":"72812ffa630a50b6319b432426ec2aa9c7a9d2e31cbe1b22fa81fb57d1cedc2c","src/features/gen_MidiPortConnectionState.rs":"0263903572dc129c9ba91ecdbf80eeca3692cc61fbaa1064e93db9fb1a46ecd8","src/features/gen_MidiPortDeviceState.rs":"26fce23b90bb0cf23a40c3f0c3187d43902e37b8704b8fad56ef9d21d22146b8","src/features/gen_MidiPortType.rs":"7d4c4d9d8212a26abf80a94a9d8b28ddfb1bb943cac12429b892b72cf702a79d","src/features/gen_MimeType.rs":"2c95940dcc9e19a1d526e06ade9de8f9699799e5f4dd62f005e382e354cc80b1","src/features/gen_MimeTypeArray.rs":"ea15d0ac9a21b52472b40dd9dbd3ac99059cb3892b93dd7f234645ec56e7e4e6","src/features/gen_MouseEvent.rs":"f79cd256a8c05f8f5c3b3877633e3fbb9201830cc15f25f05ee975088db9fa2b","src/features/gen_MouseEventInit.rs":"e85028ccf018063932c7de6f93e1e09a979a12aa1c6aa8bcfc1c3b9f787b8d15","src/features/gen_MouseScrollEvent.rs":"863992ce4797392b5d18afee55d29f1bb370581134d381234fa37c16bdc1cb52","src/features/gen_MozDebug.rs":"2f826d72d754d27d0223bde857178c0880e44ca5471044757ba6a7a2cf8d35fe","src/features/gen_MutationEvent.rs":"06106789ddc65cfc114bdca567c22a838420e89aafee01b42df1dd5185082dd4","src/features/gen_MutationObserver.rs":"4b41d9e2c09e7ff0a50b996b8c4dabf821eb265f64b888b49a0e5a95bf580a88","src/features/gen_MutationObserverInit.rs":"bdbacc30a8682b8d9454ec8ef724312cfb4c1eb22b23138f7092dcf750bcb41a","src/features/gen_MutationObservingInfo.rs":"75926321728fe6d5f2befd56a49839b8204f7f4cfdefc92873793897cb980413","src/features/gen_MutationRecord.rs":"0814c47f63a9b64fdd7e468639399e8fad59944519f2a77d141652fd1935efdb","src/features/gen_NamedNodeMap.rs":"7530fbf270943e067d5346d7257611c3b9767e14e1b501ba7bf7571c1cb30990","src/features/gen_NativeOsFileReadOptions.rs":"48f2f768c867a9154cd7c96ea138bddb38c93e6b2be06257e571a5fb9317e3e0","src/features/gen_NativeOsFileWriteAtomicOptions.rs":"df50e7c1b995203a021158b71ae57e1521164e226583654e3e3519a6ff841e80","src/features/gen_NavigationType.rs":"27326326001f74ced627dfe829474e5871ebb9481b34ecc085a19ce7139b27f5","src/features/gen_Navigator.rs":"5e7c726f43f711c149c7a34aec2360cc38b6a65209a06692dc9e2183dfd81b19","src/features/gen_NavigatorAutomationInformation.rs":"0d0f40f3614c3117055918b09b34ab96ee286e91ae0f36450b842fe011dd2b4f","src/features/gen_NetworkCommandOptions.rs":"2b666fba4fc04a1f8e69ca0fecbc5d7de02e93b885d758f7f35673c892ac8b70","src/features/gen_NetworkInformation.rs":"3bf940ec98f163bf6904b58a7d537d83a43f22727e457a903504e64798f48f2e","src/features/gen_NetworkResultOptions.rs":"5c228f1471c639d4af795a90e32546c14d208f3a7c61f38065b9da491cc327fb","src/features/gen_Node.rs":"dbb2734dbe23513ad2149e9054d1cdd5a1e33c35ced69d27d280ba8ffc5f3a63","src/features/gen_NodeFilter.rs":"1f259eb87488c56e086ede5e972f088e3991f84f7c2f63a3a074b4aff155c5bd","src/features/gen_NodeIterator.rs":"c639ff14766b1490dac8b926fe416f6cd688ba9a9355db1722dff01c02bb3906","src/features/gen_NodeList.rs":"dcdb905934b0002e3216efbf8a87d4a15bacb6abb08aa0575990cacba482d69a","src/features/gen_Notification.rs":"817f89269854772cdfb3e4e0fcab55da0f3b47da784bae3616c147f7bb477231","src/features/gen_NotificationBehavior.rs":"d9c59e81b86ebf74ca6309482307baa2e0fdcd113d87e0718daa06199ed258d1","src/features/gen_NotificationDirection.rs":"e3da35827de357cb66836fe14630bd483228e1eba945c748f8dae97150ef15cc","src/features/gen_NotificationEvent.rs":"0e5adff722deb99cac38eeee5429b15d77775fc0b621749dc278b81011d24a5d","src/features/gen_NotificationEventInit.rs":"99eb47c42b2472cfa2690efd624326e9a1e997a557063c2198c90b23b40c7339","src/features/gen_NotificationOptions.rs":"cf2276351b813547d6587965ff5efc8b903d0c203787b703c69170415de3b8e5","src/features/gen_NotificationPermission.rs":"1f63c34fd652c74cb5675eeb7a0372cb62f450c4db85ec24bf44169e03d66e94","src/features/gen_ObserverCallback.rs":"ab96efbfac99c7e794c0722c0f0e03e9decad13d736101b34bc007cba5f428d4","src/features/gen_OesElementIndexUint.rs":"4168bdebdd4312a0beeb58b7c256e0820356adab41ff09948350da4773f05f12","src/features/gen_OesStandardDerivatives.rs":"54a973e991168f9b6b58c2e2f064213e78b0b3cd2991b303de290dbcd28401a2","src/features/gen_OesTextureFloat.rs":"b3c79dbf226ef1a0a109fd6d95aec02f21a3127703bee4a325a041062125bdb8","src/features/gen_OesTextureFloatLinear.rs":"0fbe09be2e365ecb7044a54d57a908ae74d857d1bf25d95feb37eb4da6dc0fce","src/features/gen_OesTextureHalfFloat.rs":"7b9cf18ee30eb122651cc942594558281d961ecd904a1982abb783a69dcfc22e","src/features/gen_OesTextureHalfFloatLinear.rs":"00964fd4730c601804fa94ce998b7ed18c8cd67fa7ca94a6872cb729515034b2","src/features/gen_OesVertexArrayObject.rs":"93f361d88f590508f12f4b0f46c02bb5d7087d3a2b8dcc7b878c8354892f6156","src/features/gen_OfflineAudioCompletionEvent.rs":"22c901f1b05fd203112c28efe81a4f9246087cd6f018decbfa0b038bfb5dbd63","src/features/gen_OfflineAudioCompletionEventInit.rs":"5c58e20f3b3dcce9c253babaf5f9f42386b8357f337d60f00c47a0210ad89998","src/features/gen_OfflineAudioContext.rs":"292d7a59b643124fee7f77557795d37df76160864e1dd8f6a4bcb5c2f0aa081c","src/features/gen_OfflineAudioContextOptions.rs":"bf3b99798238b3e6ae127bebd6de402cf6f09efe341c3a1dfa87774475d36719","src/features/gen_OfflineResourceList.rs":"87123923bf9b5fd5842bd8d93b0a3d96b1def0dbde4606e8fa1831d75b5729d5","src/features/gen_OffscreenCanvas.rs":"83fb02652a0b65b2ab60841c422d7be212ee2a89e181b92b3f5116d737ee43e8","src/features/gen_OpenWindowEventDetail.rs":"a6b47ad19efa60fae89c0de77da2361025622b6505ae07f9c690354b06e0a7c2","src/features/gen_OptionalEffectTiming.rs":"6e570e3f6043679bed393d014cb757f7747a13d9a88e496bb1fcbcee43d1cd43","src/features/gen_OrientationLockType.rs":"08c0a541d5678d878cb759a2508de2c0f49f24b3977341d91d0f7e9d197f53b8","src/features/gen_OrientationType.rs":"6c098483cd89105dd71d4a6cf8a78849fc041a2d4dfa2f0c785868d5942b9cc5","src/features/gen_OscillatorNode.rs":"f08e43739c071857fa45a0857c0591c78b60d9559950503402f4c9c46ca7378f","src/features/gen_OscillatorOptions.rs":"f9f05aade4da1b79817a0e964d5b377b225a8cdae16ed0fdeae6ea7e69cfbddc","src/features/gen_OscillatorType.rs":"93c4d2f99fcafaa7ef4bec764269ad1b444e3e476b04592cd8459797e1dfe7f1","src/features/gen_OverSampleType.rs":"c8c2c78cec42eed8dc62a975f06efe18d2979a7795130d5e893600283ecc7608","src/features/gen_PageTransitionEvent.rs":"a393341d683794a0bdddc6c9b84909cf17e119c98ef2b39a974a50374910e6df","src/features/gen_PageTransitionEventInit.rs":"0215c246858dc96344f5c9ec097628a1a1233fb7bcd60b6734da5ea76ad3c486","src/features/gen_PaintRequest.rs":"186e9d50f161af53ab95368157feff8326a55a6e5511cd5827ea78c0c9681f52","src/features/gen_PaintRequestList.rs":"b6026597d53e0756d54860219ea485ecfbb7b6c02eca86344f2f9253c2fffca4","src/features/gen_PaintWorkletGlobalScope.rs":"87c66d813b4e4f22bd5bf797669b82694fec4443a50a95588bcf20074fce4cf4","src/features/gen_PannerNode.rs":"0d6b8b86a892855a83c1ed17c79f4db0780be1f8be1444a211244c4d2ef4fbc8","src/features/gen_PannerOptions.rs":"badac9d5572b695f9ee7f61c9412dcb3cb48dc83affb854ad1137813a518ef60","src/features/gen_PanningModelType.rs":"86a933489b9218ce7fc7aa94ff45400d0535ad09815bcd0befa1ee7aabb5b6d3","src/features/gen_Path2d.rs":"f769d3835eaa3208bb9a37415fefe343b70e715c13495d8e028ebb2eb6b24800","src/features/gen_PaymentAddress.rs":"21d584eb4f5142db978fbf1427e7b2d1c6dff6bce9a20f203ddfcbd04fecd98f","src/features/gen_PaymentComplete.rs":"fb98a8c13f12fad28e138084fb477078474cae85ace2102f1f7ab0e9ea180890","src/features/gen_PaymentMethodChangeEvent.rs":"e7b42de69626b1c288226252f3875cb7a78e026d2dc29af1e37bba810890b0f9","src/features/gen_PaymentMethodChangeEventInit.rs":"1a42d5cc801fd5140db6776dbc2436f37565ba9086c4c10f912d07708c62fef6","src/features/gen_PaymentRequestUpdateEvent.rs":"dac170f2c2c04d0b834812e6c5ecff3bc314f4b0678f2156243bde8b64becfb2","src/features/gen_PaymentRequestUpdateEventInit.rs":"9c8d2922ee9eb1a1a131fd0b273f85f63bc96af6cff3bae30898c5b2d101599c","src/features/gen_PaymentResponse.rs":"78b5a6d071cef272a5b67ae8ff7585f70c618f32d43f36a4f5759de675dd1465","src/features/gen_Pbkdf2Params.rs":"4ca2a2936ba88e91f662a715c81281e74e1f59569e6fb2c324eb3dd75bfe2e8f","src/features/gen_PcImplIceConnectionState.rs":"1f178ce0c21cd444876373c634c725c595207fe8dd3fd51f009a2af117da1145","src/features/gen_PcImplIceGatheringState.rs":"a00986d3a41d405a8d4f6657cdafcb67b239e6ddc4f52958e8f7b31fea1f51e2","src/features/gen_PcImplSignalingState.rs":"bd5fbe37b40fa9a60df7dc5772172889cd93345c6cfe2571838c606cddcf9ea4","src/features/gen_PcObserverStateType.rs":"5db7b022d155db56c9739c1500154a81075aa865bd516a37aeb48770fbb00c16","src/features/gen_Performance.rs":"5fbab28b1bd1397f05b6640c20a09099b95da7b043fcf46484d8ce06901364c1","src/features/gen_PerformanceEntry.rs":"9dbb870cca7a4a13663a1973db55fb93221726d94be3d750579392185dbf7f74","src/features/gen_PerformanceEntryEventInit.rs":"3330c450f5573b3377cb7abb8264866c0165f32b71d934d3f1e6569ddc674e56","src/features/gen_PerformanceEntryFilterOptions.rs":"3ca5a0325b36c330f42ef1c74e58510251f4a80b75c8418949ea2670e013f57a","src/features/gen_PerformanceMark.rs":"c2c8542af97172f8df2ae347f210d33fedccdaeecacb623fe51e58877535d203","src/features/gen_PerformanceMeasure.rs":"66d43ba4cc604284baf04e9b8cc44ab2cf0d01f6008d279a4ac0ae0f803253ca","src/features/gen_PerformanceNavigation.rs":"a15dd13ca206215821f56b23d54691efb8539b508d3607821f593aee9efa460c","src/features/gen_PerformanceNavigationTiming.rs":"a558ebc1c036acd2ecb26a93166a98145b23446f91b0a61368714f98204bdda1","src/features/gen_PerformanceObserver.rs":"d2385f7294d168eaaf0ea1da63f7b40e78d286b379982fb06da8cdbf3dc85906","src/features/gen_PerformanceObserverEntryList.rs":"4d46b764d4022e9d259c4033b0816035dbf8ff0f648d347a372b7e5d1059d4a2","src/features/gen_PerformanceObserverInit.rs":"58d31d41faa1a624e6ba3ada95f7cd6f2ef24ba3fb0c2dd54e6632919f65494a","src/features/gen_PerformanceResourceTiming.rs":"ec60aa78c5bd42382e500077f47ab8a6bf756df8dc2ff450a4a807da761060fd","src/features/gen_PerformanceServerTiming.rs":"bb97abf245e992ba90ec3123729325532343a4a8470b0c9881fe78f5f1aead92","src/features/gen_PerformanceTiming.rs":"53122dd391fd6f6fb007081b148aedd6523181a9aaf96bfff4d15677f66dcb80","src/features/gen_PeriodicWave.rs":"a03d0d8d55fb208bbdcc047fa0ae5353eb831a0d2b19394a0626e39592a5347a","src/features/gen_PeriodicWaveConstraints.rs":"56a71fe0f55bbb09ecfdc185ccbf60951e319ebd53942ba61a9fbe306128ca96","src/features/gen_PeriodicWaveOptions.rs":"c6d357e16070532efbdf6d482e4d2735e3142d2f7033fb88df0b143ad501c5fb","src/features/gen_PermissionDescriptor.rs":"13378b3c9f7b7469ba28be2ec6f57d6678d0fa320dedd5de038a9fd214140ee5","src/features/gen_PermissionName.rs":"5bf9d0c70373803aa791d2ade99e79c2d33901e0d5c58b3b6ec6f214a12bb8fd","src/features/gen_PermissionState.rs":"684ac0ac7b62aa1f8f0f692a9cc21ac68bc2b08f7f4b8d7d87d0a0ed7cbf6f06","src/features/gen_PermissionStatus.rs":"bf694843c2641c80c998207f91edf985e75cb86aa8ea51e0882310e9b215a2e9","src/features/gen_Permissions.rs":"ba264558419f1be2d690c638eb383186ed198329c5cc2ad93f16b2aca07b1e62","src/features/gen_PlaybackDirection.rs":"019fd4b5582b6b05140183b3532f8bf15e59f01843a08c5b25d32a46132437f0","src/features/gen_Plugin.rs":"2c87486b03b7d3ba7091f0c03a3501f7db07aef85de79a2ca815c2e8a3cbf56a","src/features/gen_PluginArray.rs":"e2f8f1299872a35e2eaa3e5532f8d26d7a0594f8f24239292e2b97ae7062fb9c","src/features/gen_PluginCrashedEventInit.rs":"029c0906eddedefba717fb3a07ddb0b6c52d5f879806a05061ba590b4095983d","src/features/gen_PointerEvent.rs":"2f0da8c5cc571e841d4ed528698222172c977fb1bd3a16b69cd4679dc31a088d","src/features/gen_PointerEventInit.rs":"93f5a76bd5b14f355e60e9848fef1112922f54472aedb226970684aa65a36ff7","src/features/gen_PopStateEvent.rs":"d24bd2e645f803920e7cbb840222051b9d8c0d5574d4399c77db7d762af838ab","src/features/gen_PopStateEventInit.rs":"c6bc65b656cdc09aaf6d0c24115e63e232ad7f6d7e41eca6c5c5e3d49a60374d","src/features/gen_PopupBlockedEvent.rs":"30f5da6719bedbd8b6a0f1c7cfe2e63ef813fbcd9e4fab219268f50130d10054","src/features/gen_PopupBlockedEventInit.rs":"1e9bd86a6f118dd6e47e66b0eebd70437543c3b79ebe685e410970a8c6f00f97","src/features/gen_Position.rs":"dc70fb91db27be75a984d229cde040346adc9dd2889703c19c5b1f8c43869e4e","src/features/gen_PositionAlignSetting.rs":"5d4ea2efdd8b4abbe454f8ff9c5d28a5d445987aa33b2d1f97fd01af37b1e71f","src/features/gen_PositionError.rs":"cb382955b444136ffaf3c945f03cfdb19904ef3a15789eb30ae917adade0bc27","src/features/gen_PositionOptions.rs":"76875f462200aed2a6367508f5a31b7a595d97fd67d417954d9d905e16d8b2df","src/features/gen_Presentation.rs":"1662b831ca5c35ff6b185af578abfbcef4fb1d341807a4496319cd2917d66f30","src/features/gen_PresentationAvailability.rs":"b54927d1a35f62d7cc334f779b64d76605802501d97ac38a5e816177bd49c96b","src/features/gen_PresentationConnection.rs":"f24f9e832d716dc82c3c29dd4659cd29bd374742f0b7680d027340fa2f7d6dfd","src/features/gen_PresentationConnectionAvailableEvent.rs":"2e9540e88f32cce49c0c6e94798a6fb59c49983b0fff3d3b09f3044598f5d52e","src/features/gen_PresentationConnectionAvailableEventInit.rs":"254dfe493857be16b9be913d469aa92a2e8297239420ef1c7c002e9b3af24e92","src/features/gen_PresentationConnectionBinaryType.rs":"f11f6612638a1e488923eef4505fb98d9e488baa72d3ff22cc28ea602e9be277","src/features/gen_PresentationConnectionCloseEvent.rs":"643ff22b2f25f07f65f0ad462183a86471120721a71603f453941425412b1819","src/features/gen_PresentationConnectionCloseEventInit.rs":"8320bcd91f19854a179ff0c97a144515fcc39f26d9ad1728ed0669774a8d5667","src/features/gen_PresentationConnectionClosedReason.rs":"4ddd489f3f1b98d4cebf658cb97d27cea7938d444079f4fe48cd0dc568faa0ff","src/features/gen_PresentationConnectionList.rs":"55b28f935815e1847cd7df9f9f5d6f430c7912cd2c8c4e9dc033cda677caf738","src/features/gen_PresentationConnectionState.rs":"2c60447dc361373a8657cd392b12da327d62ca00a9a27f637c20c990a9e4222f","src/features/gen_PresentationReceiver.rs":"bcae2171fa1f0356ce16cb73e67a85a5acc2bfdf1d4fcf7e90c5a1146f3ad3fd","src/features/gen_PresentationRequest.rs":"290965b210a525ddebc6e01c325a765940f6efe0c9eed3420a4a3f5a0796fdae","src/features/gen_PresentationStyle.rs":"4f6aca19049cb83d8dcff67a883282766acd9700dfde188758203bc37c23b605","src/features/gen_ProcessingInstruction.rs":"5080bac3aa02b7c4c62d58d93eb75ee58ff80f1a0014a2e1069075cc46cc9f10","src/features/gen_ProfileTimelineLayerRect.rs":"ef6ae99ea9f754ef92c0726e5bfbb67f1fa18a84339b0b61647d9348266cb975","src/features/gen_ProfileTimelineMarker.rs":"1c31033ee312e0e53b80fedb569119aa2a04880fd0de26930f5898d2c6c0e930","src/features/gen_ProfileTimelineMessagePortOperationType.rs":"605bab8ea6c39d97e7180bea75b9ac584b3bb1cf6a84941abc3a623408f993d2","src/features/gen_ProfileTimelineStackFrame.rs":"86d66608379a86fed89e1b2a47b82636a4f5745b63f567feae2bcf9588b64975","src/features/gen_ProfileTimelineWorkerOperationType.rs":"2ac6b4de397e799142e8070f1f4954ef50d1919e34d9a6def79f0df6a7ef85e9","src/features/gen_ProgressEvent.rs":"eb1506bf278616417b89e88e21343e6a7f4816b85572dd4ac57092c38b90a6b4","src/features/gen_ProgressEventInit.rs":"6360f129dd696021f52b797b922c6a891389d8c33b4a796098bd498484b335c5","src/features/gen_PromiseNativeHandler.rs":"49207cd99d5693f9001b15263b7fd8fbf743b8ff555d41ddf1e73f34169fbc0c","src/features/gen_PromiseRejectionEvent.rs":"0e2aea29a5ff440db58510e9223eea280a6a6da3a4f24bf58467aed1501ec94d","src/features/gen_PromiseRejectionEventInit.rs":"38aa7b14cbed806f08272a2a7f6f7b39a329e38a6b870b5e6d2f8a3ee75f764d","src/features/gen_PublicKeyCredential.rs":"c13f38c0c47d5a56ba61981b8d86af63612720cbeee7dd787be28afa51b7ea00","src/features/gen_PublicKeyCredentialCreationOptions.rs":"5835296f41e5757dd94dd2edf0a44a61e295982c4c7df39f2410eabcd406b88f","src/features/gen_PublicKeyCredentialDescriptor.rs":"2c828d4b0a41901f9974152222e4c6161e82cc37fe3a0447893ce0edcbbd16d7","src/features/gen_PublicKeyCredentialEntity.rs":"f5994bc9b356d267f999929286bd365cab4b3dc8de398f1da38585a14cb73808","src/features/gen_PublicKeyCredentialParameters.rs":"db17825343c909569e509a7d5fe7782bf500bafa068c0baa6bfe974344bfde1f","src/features/gen_PublicKeyCredentialRequestOptions.rs":"b6fd48cfca26ced5da5a88b6720489573b00352b2f5ed3001c65c038ab69ed59","src/features/gen_PublicKeyCredentialRpEntity.rs":"d1a621c0a02c42daac7bb010c2f7fedb6754014cffde286ad50b13f64bad3a5a","src/features/gen_PublicKeyCredentialType.rs":"27cceb962fcb5fda91255c3ba00e0024c33f58af79071237016486d10bb99913","src/features/gen_PublicKeyCredentialUserEntity.rs":"e11f2427845eaa085e047cc8de109238fc3c30ddf4a6dac7314f13e7372fa6ee","src/features/gen_PushEncryptionKeyName.rs":"c2dd7f79a295570998fcb77838ca5100e67e581f5784ae349cb630d1faea206e","src/features/gen_PushEvent.rs":"1550db60daf9bbd9abdc7c5a498949b532351ae57ef287b0f12c3c9aade1b235","src/features/gen_PushEventInit.rs":"6952b4088bb8fff8d90cefc4d51be8111bde75c8ecf8eac8e9bf4e19be62199a","src/features/gen_PushManager.rs":"2109a4929d10afa7b662ce0bc6e54addd4fa4aa4f6bf1ab085e23350e0769beb","src/features/gen_PushMessageData.rs":"d31c5751c0c3b32280c616265b8fb7127ad7ffce8ec494680cec582eea5f8202","src/features/gen_PushPermissionState.rs":"c0ea3b24ff5b6e3caafac3573d2308fbd0fdaa62d630e227ecb9fe7d2cc4a5a7","src/features/gen_PushSubscription.rs":"777a667a2ac06d221847200ccf870c40676c747bf9402a970b6679c14ae84db3","src/features/gen_PushSubscriptionInit.rs":"ef225d5273142571d875a72cc05bc7df8a4f14e24756eac66241040990b2cc50","src/features/gen_PushSubscriptionJson.rs":"61929b55eca05bfe260a0804b1c1b155fba49aca683d343428c832616a0678ff","src/features/gen_PushSubscriptionKeys.rs":"bcf53c2621843de2b46ecba303e08305aabf340b613372abed7305275aa747dd","src/features/gen_PushSubscriptionOptions.rs":"70e2dcc8653102e1b51a20817185196d167c088a8b7b6cc59633058ab4dc7c92","src/features/gen_PushSubscriptionOptionsInit.rs":"bc50c0da1f0d3eba88b656df0fd3120aaea910e948a994f7cc7e265642013ffa","src/features/gen_QueuingStrategy.rs":"7988b863d98ceedaf4af581e51845ae7c80308e3c228392337104dfd9ea2685b","src/features/gen_RadioNodeList.rs":"43bdd086b2a43eb9df8f7a1bdaa6ae352b1a9ca52dcea076356990dcc5b4dea3","src/features/gen_Range.rs":"9a4c1aa6557284b122c30b7afd0f2461493cd80b8023c11de770f0ae55482d5e","src/features/gen_RcwnPerfStats.rs":"e058f42b7e61ee87fbc47270bc11213bd7b7cc7d7755e8997bb305e1f98bb593","src/features/gen_RcwnStatus.rs":"f8add780b50d2f999870f8fcf12ec96e0d88f60b32e7a03a671b87f3eb1d87e1","src/features/gen_ReadableStream.rs":"d79b7fc398065123c56515e3165b2e296be2a2d0c699ddc0a6e8341b19d84ad2","src/features/gen_ReadableStreamByobReadResult.rs":"1e267583b6f58f666633f96ccd827ce433b52132fe58cd5d24596878087b9db8","src/features/gen_ReadableStreamByobReader.rs":"ea1cba9c8845b3dd8e98270d963d04af187cc9b0a5e1fc5022c0c26b0fcd47c6","src/features/gen_ReadableStreamDefaultReadResult.rs":"1a0f4fd8c4212a8f0a826718dcade7b48c3da5de7acb853dcebbefdd66cca582","src/features/gen_ReadableStreamDefaultReader.rs":"6474170e2513534293ccebc18bcd6c9a33a2e366daf8314049d997a8b162b8ff","src/features/gen_ReadableStreamGetReaderOptions.rs":"48e38b79a0f08e10e9b6a83a76f4ab716e3f71958de3dd6a5a2e385022ecb1b9","src/features/gen_ReadableStreamIteratorOptions.rs":"67a30ec557ed691668b5a16390d11f5c9ea05447e660464d404ba7d9852905c7","src/features/gen_ReadableStreamReaderMode.rs":"d196bb4989aebbe24078429812cd969c0999cd8962d99f62a1a4bf5d466d2e2e","src/features/gen_ReadableWritablePair.rs":"53943451598c66920e5d6f20952ab7bbd20870a44e670eeb7e2535f83f82929e","src/features/gen_RecordingState.rs":"57314351835b800e9fc06fc4b3a43528d09f8798694f9d9d5b8fdc554cce361c","src/features/gen_ReferrerPolicy.rs":"507a0a4ee4116fd1365d17032d427c639189ab0acc628bb4158afae126a8c933","src/features/gen_RegisterRequest.rs":"c9f17a2566b9b93ae738f2a2154d22219613df0cabc02eb3518fe94737c70ef7","src/features/gen_RegisterResponse.rs":"0ce773cf81294d47a24ebc5bbb803f78b2b6adf18eead32caedfbe28859ce04d","src/features/gen_RegisteredKey.rs":"827d2dc05846b52687d28428e7101d467c9066e79a1c48069d0212db341bac4e","src/features/gen_RegistrationOptions.rs":"18d6e15cdceb01a6fd780d4993de3f2b69b3870ddd539d12b1a8df3d988ef422","src/features/gen_Request.rs":"e3783e85937f21260361f6b46a1d807f843499956c64f4f76d782e8fb833b49b","src/features/gen_RequestCache.rs":"41af1e453d3367f2b5006fe022649eae354af01a4693d6e68c97e79e8e7e87dc","src/features/gen_RequestCredentials.rs":"0b11758e27a1e548bdd5da73736a8217d4cff146e51fbec626fa78118e347df1","src/features/gen_RequestDestination.rs":"2c4f69ffd4d345e716cf5c4bbb434a74745c69d0fec7659751da9605e58753d2","src/features/gen_RequestDeviceOptions.rs":"4ab7659b4d5c6bfe3bbeabdb37fc4c2053bb784f28f15f3cdc16d088a7ae2ef0","src/features/gen_RequestInit.rs":"a67395cf3087f8698610440284dc7b11d911203d2c22c0fe7568e999c4802ce0","src/features/gen_RequestMediaKeySystemAccessNotification.rs":"9b2587a75f22359e12b72afb3a14dc3c05708d11e07f15b1e2af947b09101e26","src/features/gen_RequestMode.rs":"658621f1dd7dd75452a8357e74a57ba30048c361227cd75d3e9f9403ae0b7d97","src/features/gen_RequestRedirect.rs":"3208a10ea00365ebadcc72eaa778a579d8dbede43c24f73ad9da85155e50302f","src/features/gen_Response.rs":"0a9419f9cbed1176279eb85b44f02ca11ca4bd528cc585061b2a9d1464f46cff","src/features/gen_ResponseInit.rs":"7f7dcbe06d2f813b4f2cd40148129fbba0466355d5665711b6231d48b75ee45f","src/features/gen_ResponseType.rs":"80f51ee7b020dd3a9ba6dcd314ea905880b8a35b2666a20c07e42ef7f29e6c63","src/features/gen_RsaHashedImportParams.rs":"1fa2992d812167d235dbbb667818a1de5140fbe11b0c20bb0c07c842dc552aac","src/features/gen_RsaOaepParams.rs":"dad9d33ea0f49cd12e0025de8e5e12d3ffd1b67b7d22ef5d9977354b08f1b6fd","src/features/gen_RsaOtherPrimesInfo.rs":"0549a10f659e60c8b8629703e983d599e0100f89b8853462cf106281cd1ace3d","src/features/gen_RsaPssParams.rs":"9ab3baa7313a7b98f230323619ce442bd9224f1595b3af310f27ae0d50f8ff12","src/features/gen_RtcAnswerOptions.rs":"8c49bd84a13f85ba3d7b96cd09247a8d5051f30e0db3dd5bab991660fe0455ac","src/features/gen_RtcBundlePolicy.rs":"429222371ca717516f33fa5d8b910ccfff174cc6dd7ab0062b9fab98150b5ac3","src/features/gen_RtcCertificate.rs":"b2cdd7ff988368847284283244628d65f42c6854331d1064992303854d4e601c","src/features/gen_RtcCertificateExpiration.rs":"3ca057523b4044347c184c5bd3bae1493757f6593a521bbf700cca0a39629425","src/features/gen_RtcCodecStats.rs":"8e82d6b5f6abca29ccb995680db53b5d4fc91855b332aa37fe06ef62ae9f60c0","src/features/gen_RtcConfiguration.rs":"ff6922aee128515c053c6d85d7646ddb50fd0d964f542b47385047099fd74de3","src/features/gen_RtcDataChannel.rs":"359f074a79fc4e27c5e7081d4c4ff62bcb390684cede314019af88f82573c2c7","src/features/gen_RtcDataChannelEvent.rs":"f753fcb58b40d404126b324c54bf87dbacf42c69b15a93827671e16c429c5691","src/features/gen_RtcDataChannelEventInit.rs":"cdc3f221d11ab86d3eb15c6d52d5c92cf5ca5a8cbe24f957ca0c19d2eeceb03d","src/features/gen_RtcDataChannelInit.rs":"372db1ce4ef46791ba4e49dc456c167764d379dd6434ce45eaab5e7ca8128f1e","src/features/gen_RtcDataChannelState.rs":"0139dc7e80fbb6c5b2a850abc767b96feafbaabcb1751f815f2eb96c4d923587","src/features/gen_RtcDataChannelType.rs":"acae3f77da2d33a0c3408ac28e2e7b2ac4a74a98cebc7c417efb6355110c06cc","src/features/gen_RtcDegradationPreference.rs":"57b419cf6dcf2cb0d9658012951796ac0a5b316acfdf33086ca3ef78f10ee525","src/features/gen_RtcFecParameters.rs":"88f848f836e5cdfea5ace67d8f41499a4a3b8917d26ee31e74cff090b9906730","src/features/gen_RtcIceCandidate.rs":"2cab25550f9070e862bdaa72ab2802958bed1ed7d09455fc0fe65314efcec872","src/features/gen_RtcIceCandidateInit.rs":"828b46651afa20755e7cb6924d0d787803b7ec6c82915a8195ff56496adf6e2e","src/features/gen_RtcIceCandidatePairStats.rs":"2aa4787e4f146434eea1f957563be7d57faf8dcdd1e65c2251b9299147707d18","src/features/gen_RtcIceCandidateStats.rs":"b9cc34d83d6fefc92e90f11071303c7c601648d94b4c1d57e004a29b020f78bb","src/features/gen_RtcIceComponentStats.rs":"fb5b68e5f8f33aacb2e59d02ff281c0ba82a021544c0b73043069a9a9a2676b5","src/features/gen_RtcIceConnectionState.rs":"f8e9797ac87cdfb6370a85e0ef1e6f680f83079df276a22f1e5edd14a0e8bd45","src/features/gen_RtcIceCredentialType.rs":"f2d4a0a33c29f70facc721103094b25ad07a9ada4bf9c5c5796db057a75316f0","src/features/gen_RtcIceGatheringState.rs":"30576e2b180daeef2ac4bd561db79ca370ab16e460ca9f530384555f93d4092e","src/features/gen_RtcIceServer.rs":"9b4867d05e72f2f4a848fd9e8f00c7cad101cb1c6f6f0fda72cb588af92f8d07","src/features/gen_RtcIceTransportPolicy.rs":"d665fb2a3fa65d096d316b5e1ced1fc074c386e0216347b47b43d2274f8df05c","src/features/gen_RtcIdentityAssertion.rs":"ccc50f5ba41f8ca9b2d800009db40e847aa90300dbad022cb642f0af8e620eec","src/features/gen_RtcIdentityAssertionResult.rs":"59ec0279bf364a13364caea1b198c7083a10cc9bd5e5f1168fc0ada660abc01c","src/features/gen_RtcIdentityProvider.rs":"bc81fa5ec1be6ca9c01fac011e1d92b9a7536ea836adf129a76f6f07a0a3b62b","src/features/gen_RtcIdentityProviderDetails.rs":"a8911bc789eddf825ed0582bcb9c6e8700e4432e2d767686a5791c095692de2d","src/features/gen_RtcIdentityProviderOptions.rs":"8f77dcfbd9d6d8968d55d12dbb4743454af9cec3fb9d1117dec0ed62ac783161","src/features/gen_RtcIdentityProviderRegistrar.rs":"859df6142afbc442f42b0bebfb093b6c25fe6cf758d35e3345872d1973a7fdd0","src/features/gen_RtcIdentityValidationResult.rs":"000dfd817f8573b4951f3e5b417f56378bd586c1a9a41847a2fd66b5d1ca5ae3","src/features/gen_RtcInboundRtpStreamStats.rs":"d4e866b7858b87aed59a362c93e21411fa4806871bafe6c9ae3b64bbac8e2142","src/features/gen_RtcLifecycleEvent.rs":"1b71a0e5cfec5645edc6b573141c3d2f63a81d918b89dbe5e4bb7c840db93eab","src/features/gen_RtcMediaStreamStats.rs":"9b68715f09131b3d201b92aaaad440f25188c1cfebf087a1fd378dcf18640326","src/features/gen_RtcMediaStreamTrackStats.rs":"d976c2fd426a0e8c1ec5858e40dbc1f356f20c8fe62593de6375c893bfcdf400","src/features/gen_RtcOfferAnswerOptions.rs":"910f1449daa0f7b5bfe74a6b1bea7b99fc23de34ba8b1a71230e4bae9fab4adc","src/features/gen_RtcOfferOptions.rs":"61adb3ee6e6404a23f0650e151540c9cc776539f7d98f4bb4121aa0424347667","src/features/gen_RtcOutboundRtpStreamStats.rs":"a77697e7e63b90f6775909894b4942c6cee5515f289c1087a61c9123ebce2b39","src/features/gen_RtcPeerConnection.rs":"218f28ea1fdef63411b384fa73bc5d03517094a8b051df13b9a3191466eb7c01","src/features/gen_RtcPeerConnectionIceEvent.rs":"9c20c2a3986d1af34989de01ffe42e7a1fa04e5e49957f3dfa6ac8963238f35a","src/features/gen_RtcPeerConnectionIceEventInit.rs":"767baa52242edfd25ae24974a39692c17494775110982780c41cdd5788a88e8b","src/features/gen_RtcPriorityType.rs":"2c8777cd3f7116c15a17ba931e494f7165860301e8dc31693359d93368df13c1","src/features/gen_RtcRtcpParameters.rs":"c039417ecb70d087862d2265b6891c7ea2481dfb7f2221059feb3ccb08c5b499","src/features/gen_RtcRtpCodecParameters.rs":"6ec3770952bce964d0de4f2004e0f2e9cebc629aecd47e6515fe8b564454f048","src/features/gen_RtcRtpContributingSource.rs":"d9e2fb9135c445975aa313e10280eb87578127ab38d0aea1b10c0458a338dd9b","src/features/gen_RtcRtpEncodingParameters.rs":"7d6af18e9a4070c797d50297c12b243ff18986f219cd6c004e9f69fbab99978c","src/features/gen_RtcRtpHeaderExtensionParameters.rs":"3a48f805279630f6a404cd38e4972f39110daa06326390d1206e5ec75e27435e","src/features/gen_RtcRtpParameters.rs":"1366d8ba01198425bedf23a68a981c5490621dea780b893f23413b4a95d7b9b9","src/features/gen_RtcRtpReceiver.rs":"03e12412c220be0c43e2482a97b352019ae20522156d310287bdbd2165840b06","src/features/gen_RtcRtpSender.rs":"e97c14c6804a8c8a412fba1d8bdac37fff691c98c99410450ce40e3da26b14e1","src/features/gen_RtcRtpSourceEntry.rs":"f940f1f5e1aa52dd047c2748617445743b0729ecc2ea64011aec0723ba902800","src/features/gen_RtcRtpSourceEntryType.rs":"6c25ef3f3787644cce46919441b5089652809463941cbea85a6b7b46180845f7","src/features/gen_RtcRtpSynchronizationSource.rs":"b04bbed47761c160e875fd938267ddb46481ce65bf8e5bd3ebb219df89ebfacd","src/features/gen_RtcRtpTransceiver.rs":"df74700b9233bfc2344d98e36129aca4386aba7d49a3bc4764334c8e93c93463","src/features/gen_RtcRtpTransceiverDirection.rs":"6769d7b07af5ea9deecc93655b9e11106a4200a849be8378ae4d849424b952c3","src/features/gen_RtcRtpTransceiverInit.rs":"3c5ff52772e516f622983c3cf31aa63acc149d1ddd96f7c961cad86d126b1b51","src/features/gen_RtcRtxParameters.rs":"6fb1b8eb3e2b0050f50960289d7f73060b6305758d61ebb2c3e1469f1851f729","src/features/gen_RtcSdpType.rs":"9b26bc0b0b6e5f283d9d02a295a12ca10d0be02b5ff0d3d066e6b7424897861a","src/features/gen_RtcSessionDescription.rs":"b39cf338e374daadbed53bbdb1b935a9804b82f0a4109c974ee33d981600b4b7","src/features/gen_RtcSessionDescriptionInit.rs":"921215b7debe33112abeada16531926926566cb311586f44b1f3d10e8d8ae622","src/features/gen_RtcSignalingState.rs":"6119a1ca6bff6ab9c6c1dd75d0c7dca9f20ff7c2d757a21db2e8b87d49879144","src/features/gen_RtcStats.rs":"f7f4d3649a0e4d673c0de43b91261d953a4f775a824cc9a75e525bcf275b6824","src/features/gen_RtcStatsIceCandidatePairState.rs":"6c83f5a45a14afb3cf2766a837b7a552a783452e98365446b0a5f668c8a640d8","src/features/gen_RtcStatsIceCandidateType.rs":"dadcf6e4d115d475ea31df2ec7d89f8c1bc5f51d8c7105debb03b420f17ba902","src/features/gen_RtcStatsReport.rs":"82bbfd5a956f5490c2c475e426611b8932b82ec0a23f6c2f27ecf5c1b64ab6bd","src/features/gen_RtcStatsReportInternal.rs":"df7c8ff7c914606f1ae7bd49651f61764d88cfa6bc51233ca692186084ff7fa8","src/features/gen_RtcStatsType.rs":"1450309c6a806fd88f125d1e197d9f081f401763388481df987f0aa8940b470d","src/features/gen_RtcTrackEvent.rs":"0a5107fcdcc08162ce9ecf3b9307dbc160563d5e92980451ecc14b4c1711a95e","src/features/gen_RtcTrackEventInit.rs":"15a9ea9649ee0f1ad7ec4059afaadcbcafc1065af843550ac5b9f215041fbdcd","src/features/gen_RtcTransportStats.rs":"5b116c339c59f70613c1b07d1be1ae11f57d44a83ec060d2fabad1414c2ca828","src/features/gen_RtcdtmfSender.rs":"9c52c3b89d3c8e37bc771fef7fd426cebca9c1d4ed6dd81aa14504d796aa2283","src/features/gen_RtcdtmfToneChangeEvent.rs":"51a24a7bafda3427cdc77da9dbecd485b65fce5a45af1157b7066ad594d14a1d","src/features/gen_RtcdtmfToneChangeEventInit.rs":"a98e94949638548be091a0194f84fb2bf5f8072843e2db768f229c8f3a892352","src/features/gen_RtcrtpContributingSourceStats.rs":"4887d7397d4f482ecc8d6e22732475def1a4a250cdde36edba3120a1af6bc323","src/features/gen_RtcrtpStreamStats.rs":"0ac163635a7b3af5e3b8395e6c4b8c6161da43b4ebc1ac15362ec6f957a92931","src/features/gen_Screen.rs":"359f2f3130385f32a40b68464101a723901249ee222aaa1fdd3cafb684991b35","src/features/gen_ScreenColorGamut.rs":"c014ab50fd69b3ada4678bb06f7444f7c131e345e4693d37e7572a73f103af95","src/features/gen_ScreenLuminance.rs":"f485f75b6fc2f60941281fd6904d4b990c489c62ede9d2e422bbfe8bf84f0b41","src/features/gen_ScreenOrientation.rs":"f6da7e3bc5d915a50e592923478cfa1c9dfb9ed37657b68c510c823b72855427","src/features/gen_ScriptProcessorNode.rs":"82e13a9d776612454621162d281b1cd30c2ed93232942a494cfb914a28601962","src/features/gen_ScrollAreaEvent.rs":"09b8f73edec7000b315cb073ba409382c7316bdc58578d771a2c8bf042a95a88","src/features/gen_ScrollBehavior.rs":"c824edeb7edf82a2dce10e9afd17bb9ea0a7b33e563b604dede912dbf3a19eb7","src/features/gen_ScrollBoxObject.rs":"b6106f2ecbf162cc99ddb709585763f3aaae84eeb560d4eb3a3c4eb7ece6cc04","src/features/gen_ScrollIntoViewOptions.rs":"0a7a8e5383750254a1d4a7a828bab6446b9d4bdb1b1ab6d36562d7ccdba95a55","src/features/gen_ScrollLogicalPosition.rs":"e87e8ddd76362dad66ca1bb2cd2d5999aa82f280235da92585f67d2676423a82","src/features/gen_ScrollOptions.rs":"8fca95b89ac8a63fcd62bc59ee265e2719468b3718cbdeb103aa68978ff47f87","src/features/gen_ScrollRestoration.rs":"39c0e0d2dbe1431210d13f0c27268c28c6dfdaacde617477df297646fa36d8f6","src/features/gen_ScrollSetting.rs":"16938096f99865deaefbcc2cf0d83235a61290b7995d1fe5cf11fb771b0d886b","src/features/gen_ScrollState.rs":"924a649ae58c3814c3f259e5ef7083e3e2771984243b8186cca9ef933fb11618","src/features/gen_ScrollToOptions.rs":"2639839bfb66668632d8e4b9e59bb05a344539096ebce38c9c87023a5332fe90","src/features/gen_ScrollViewChangeEventInit.rs":"75d9d6d3159c2e37b75b3394f4ea0d91866e0d8156037f9fb1073a20dfebd457","src/features/gen_SecurityPolicyViolationEvent.rs":"3c91b1defa63fa83b443b8e5d6248bb7ffab6bd503abbe74ecec2b1a724629ba","src/features/gen_SecurityPolicyViolationEventDisposition.rs":"3e47f38d7536c2c3486941f7de134e429d09c17f9dc6b9f1e3e3e0155abf6071","src/features/gen_SecurityPolicyViolationEventInit.rs":"c86815cd7ac5558bee4d03ec98e7dd2ec6779d248388a2773346ae6c18a4d467","src/features/gen_Selection.rs":"fa8219337ecabde3c3b6c07d2f7916d449680965fdf3aad02fc85b569908daab","src/features/gen_ServerSocketOptions.rs":"342b21f8cc1d3256323cadf3279d4614b903c672f0a6c4000e91b6ce992c7ed1","src/features/gen_ServiceWorker.rs":"31adfc788f2e0d3485f14478ce5e5aa5487e15c6d4eeedc6c3505d08ed2f3ead","src/features/gen_ServiceWorkerContainer.rs":"254dccf1dcf4332763c17fe9799899b5c3ebca51b264adf26f88e3648d62fb90","src/features/gen_ServiceWorkerGlobalScope.rs":"c597475fceb184e86539125ff5d5c4528a281a02b404df4a0f45a97b2165be86","src/features/gen_ServiceWorkerRegistration.rs":"30e250e798b64308c4dbf058f5067523a29af53e1130b40c1c425ed98f10463c","src/features/gen_ServiceWorkerState.rs":"ca63c9289c07ca36b7ff6a82a144a24a50aa26e684085d9307faffbf6eba2b31","src/features/gen_ServiceWorkerUpdateViaCache.rs":"b1a6b876135e43cbadbede3e5bc17db1f965c5e55773f18efbf9510a1c07e0d2","src/features/gen_ShadowRoot.rs":"da77146a0ff8f1f93043f3232d32f383fb847bd4aa0378e793167d396fe62bdc","src/features/gen_ShadowRootInit.rs":"89e6c3e0b3ce5729432ae6fed937a2c235cbba6a5f073c4122c72a48d2175e1e","src/features/gen_ShadowRootMode.rs":"a2bdc2409cd46a3de86b6f70d848f5650e0e01f4f8892f5f434ceb78e2ae01d4","src/features/gen_SharedWorker.rs":"86fe8ff9dde760b6e0ddda182ddda741ab3d2ece7263ab22e8aa07f2a7b7b84a","src/features/gen_SharedWorkerGlobalScope.rs":"2702daa492b26de185b741ce56d18af2843ab2f0d57459ab55b3087107a3ed56","src/features/gen_SignResponse.rs":"f5295e581abb18aecba401b0e354396656b3e3512df901e29c0cb66ee3b31264","src/features/gen_SocketElement.rs":"860778ffbb321b4fc9cbdddfd34404e361fd9bfc97e4a4f1fdef40f683683205","src/features/gen_SocketOptions.rs":"29ef2786eaa8457b918c407d0dcaebebffd0f44d53acc1d7d8104117578396d3","src/features/gen_SocketReadyState.rs":"338b0920535a184291e8a9c19cda1d0dd1bfa2a7a819a82462247c135521119b","src/features/gen_SocketsDict.rs":"474c6039df0e9405f90b029ee2e9f888afee2c6ea804f16c8fe6a71417e73914","src/features/gen_SourceBuffer.rs":"de32724de72ddf603d64c7554ded791d22367142b29502ef5a8d50bc1df2ec19","src/features/gen_SourceBufferAppendMode.rs":"edfed4630a1a214606d6deeff55e524e4fa3805645eb43b9d454b141957be111","src/features/gen_SourceBufferList.rs":"13d4c6a9d1c1794312a2c2612077c288111b66249b214463565c828cb8e06d4d","src/features/gen_SpeechGrammar.rs":"9ff7dbcfad4e3c9269dbdcb57c1757e5ea4ba62aa41a221b25adbc1ab2d63138","src/features/gen_SpeechGrammarList.rs":"de1dfedf0d438749b086618655e95bc9872715f11e56dd84d47b7b473b3c817c","src/features/gen_SpeechRecognition.rs":"57cfd5e338c3a287d227d71fcd4cc68c8a481f0699c9a935a7051ad59b647d7f","src/features/gen_SpeechRecognitionAlternative.rs":"b126d92fa8c5112670cd394474872c01b3d1890abdf9cd923d5f28b04f855a85","src/features/gen_SpeechRecognitionError.rs":"880962f5e77c69262bb25da3778811aec90f02322cbb3a2fd5175466f5364310","src/features/gen_SpeechRecognitionErrorCode.rs":"24fa70deff60dcb903baa215e0ea81319c3fab750168b4b9e93f2adee0266602","src/features/gen_SpeechRecognitionErrorInit.rs":"8fa55bf7af0897e5746e35aa9fd92ccf5839c1ebf0269dbd78453921e39788a4","src/features/gen_SpeechRecognitionEvent.rs":"b113873dab56e39d3794b559854633d4543824d5192a6bf5927654d6cf44af33","src/features/gen_SpeechRecognitionEventInit.rs":"c8333da541668db686f1c8fbb2ad2f06b04c4d100f184ba6ed580519829d67a1","src/features/gen_SpeechRecognitionResult.rs":"5ddc0948f29627ac6a97665046fa717611e7576449b368e54f38f154de7e6e99","src/features/gen_SpeechRecognitionResultList.rs":"ab80313846b12fd9b4cc8e7fc1a546053bb1a26b83e741b2bbaa056f9cdd37f6","src/features/gen_SpeechSynthesis.rs":"fd9a3378b8542454ea66534798d98d387e4752fc34da7f285984f35f7ef290ad","src/features/gen_SpeechSynthesisErrorCode.rs":"a5628a117bf0f676eb184202fddffad9a6ef584e62b85f06f9462233a3a7f4ce","src/features/gen_SpeechSynthesisErrorEvent.rs":"0954a8c93de376e8f01e12090bdfc7da9c7a0b581b6de823f850aa0602f84787","src/features/gen_SpeechSynthesisErrorEventInit.rs":"29e4505ed879899e7c688a33f7038d6d6f77b31bacfbed10ec3c091e72063dd5","src/features/gen_SpeechSynthesisEvent.rs":"f6c0c8ec10af34f13338ca915743c67fc569bd58e8b4cf2aa480195830c6cdf4","src/features/gen_SpeechSynthesisEventInit.rs":"d6efb833df8a6eb9d43eb942db95412d789ef3eee123eb384975f49b415f1991","src/features/gen_SpeechSynthesisUtterance.rs":"5c2228a64338cbbf8eac84e096cb60ce96c4b4dab18da6637535ac5bddb9171a","src/features/gen_SpeechSynthesisVoice.rs":"33ae3252a7ed807288543391c6292b528943befae6d40bc6cc7400fc196d5d29","src/features/gen_StereoPannerNode.rs":"790036a57347be0844dce3eeb613698480dc3cda2911de2dd300ddb922391e03","src/features/gen_StereoPannerOptions.rs":"46de83f6acff3c290b2963537c2c235f1be1bcff2032974a09d1a1164c6f6856","src/features/gen_Storage.rs":"3458ab8c089b9c12251797f282a74ab34fb68eaf46485c9398dc87b6b549c588","src/features/gen_StorageEstimate.rs":"09164fcf182d321e8972c0628fae7503231c19a422a0ec2de1ac0284278c16b4","src/features/gen_StorageEvent.rs":"e3029ba00116b7f949123ccc14b7eeb5b71757048681bc62c1f8adfaf57055fa","src/features/gen_StorageEventInit.rs":"dfe4e0801d297e39cea9a13f1e45697eae07609dbf8a15ccfb53b583cf06733e","src/features/gen_StorageManager.rs":"9a8fc4582cabc2ea12fe4e8dbaaaf16ed09ddd20515b9847a5d8c8294b6fac38","src/features/gen_StorageType.rs":"21de2e2548aec3d8098624f8ee0a7012ca5dbc9a491ad76662b68d3e4b535077","src/features/gen_StreamPipeOptions.rs":"d5ed1a33ece3f5e377c86202d5a8a7c3806db9033d7abf2711d2bdeac2c42644","src/features/gen_StyleRuleChangeEventInit.rs":"e80f937a1d6fc8c33a6b4e26ca6d2aa3ca307e14adbffc918615907f7defc7fe","src/features/gen_StyleSheet.rs":"ec9b78fbb41ff82286de7eeafbd493dc1dab5a2178adb53fc1f4836dfbc40410","src/features/gen_StyleSheetApplicableStateChangeEventInit.rs":"3b027c6c8296b0d95c4609e7cc36bf50bea109bd7397773d56044183ced59557","src/features/gen_StyleSheetChangeEventInit.rs":"36bda30f8adc000930d347cb6d1dbb642e66236fb589a3198622740564ff50b8","src/features/gen_StyleSheetList.rs":"e85da1181baaf5f12f9452bb2853d1134059bf7c9264afcde3f2e230cec7dbe1","src/features/gen_SubtleCrypto.rs":"1ae15a01a8a9e961ed4634bc8052d0a33a3f85b255907ee12ac924fc79aa6441","src/features/gen_SupportedType.rs":"249ed9426b0967b7679c20225e5e5a51cbb3228d64b697a129a944db6e07363e","src/features/gen_SvgAngle.rs":"b52a729e4b32c007eef9fc907128bcc9a8e47a7ef4ab87e9b759d1845ce76a6d","src/features/gen_SvgAnimateElement.rs":"a5cf575fea9fc420722145f437ecb5896b2dc8bfb168ec2ff031318ac55d8c3d","src/features/gen_SvgAnimateMotionElement.rs":"2a20725adf96393768fcbfb79d1d6de8b134c36ecf760349547626538968a115","src/features/gen_SvgAnimateTransformElement.rs":"0e7b16f9239e0329046095fba453993887fb2e9aa4c8c58362f65f28fc41f66a","src/features/gen_SvgAnimatedAngle.rs":"e16ec1265a8375328b660ceae784d64c278f476f421d1b6e39d47c0e5240809a","src/features/gen_SvgAnimatedBoolean.rs":"24e2b9cf5abf16008aabb81b1c7b88c317d5b5ee51af0715927855c0ed6c9f25","src/features/gen_SvgAnimatedEnumeration.rs":"5a3679796ba08066e16fe8dd7a1cd933e4850e792ca9b9622464fbfc5779fe57","src/features/gen_SvgAnimatedInteger.rs":"c9a9060c1759738b177f6e41a75dec263d048899674c400653d15b0cedd90368","src/features/gen_SvgAnimatedLength.rs":"17cdd1d00009767a9b24c95ba0539c143e4acf5e9ac42ae8a6c6d7fbab6af951","src/features/gen_SvgAnimatedLengthList.rs":"17f30ab4aa62b44ace67505919d4c060ed9781e9370bc92a3b5b7ea6f3011846","src/features/gen_SvgAnimatedNumber.rs":"0b94f47c029fed07b6d55865ec01f873ca813a8b7def22ed2edba541e343ba5d","src/features/gen_SvgAnimatedNumberList.rs":"64489b71d888a51f8c393b28f55c3ae4cfb7153c9d7561b7458095e96272926d","src/features/gen_SvgAnimatedPreserveAspectRatio.rs":"315b01fa858424fb1d3decb0cd8392c25ee39ad63d651e1031f0213d25e33c5e","src/features/gen_SvgAnimatedRect.rs":"dce356787fa5f3652c24ec50701964e2ca938bcdecdce4f7004217635dca7637","src/features/gen_SvgAnimatedString.rs":"bba9665cb5c9ab1a65cf42d8d91ec89962c4f28a2b00455b6cd75b45fdfb8654","src/features/gen_SvgAnimatedTransformList.rs":"186985112c03dfa01215376253b23a8064d04badc1c18559a5855d2e5f948554","src/features/gen_SvgAnimationElement.rs":"7f02230a9de6d3ab65adf09dd0beaa455424acfb89702f5fbe476f519dd75e8a","src/features/gen_SvgBoundingBoxOptions.rs":"ae5e374091f5ce1bc8bc557b369feadd2eba8f38d5e28fc7bad8f581678c07ee","src/features/gen_SvgCircleElement.rs":"28a12097dff150aad65509079e8391501a97c827b16f777ac21d321da11d7a0f","src/features/gen_SvgClipPathElement.rs":"2dc412a00409db064114645df8b9d7144c516b5c3db8cf9a6cd0bdd3ce9372f5","src/features/gen_SvgComponentTransferFunctionElement.rs":"ba5a2433686f01954b04c05d0b95ff77db2ed3ba6e6805c5e30c778f2bc7fbfb","src/features/gen_SvgDefsElement.rs":"a744c2d236cc64cf29e8db050d05b093e2e34e914222d2113860c9ae1067bce9","src/features/gen_SvgDescElement.rs":"6fae2e501d25772dff0ae38f5abab36e44c89ff6409e7b537414b81897f4ba12","src/features/gen_SvgElement.rs":"752cc902029e40c358736411a5132c1e58fe9d9a9bc0a4a48b813bec70b901c0","src/features/gen_SvgEllipseElement.rs":"3572df8517312e845863a09ba58676e0b7a871a7a08c16b681505199bd5afae1","src/features/gen_SvgFilterElement.rs":"0d8b419b98ae482d12b30034a91b3bf62b9291e7768dc8d15e6d701879534384","src/features/gen_SvgForeignObjectElement.rs":"bfe7b528da2dde762c106bcadac6367bbfd5f027027eddc194ebc7ee8c56ed96","src/features/gen_SvgGeometryElement.rs":"09137589fc1f0429eef260998a0531f2ce2f9d7442fdda9f56d77a48269fffc0","src/features/gen_SvgGradientElement.rs":"b6a8f66965553bcd21e16697a9623c799028a889a741fdf4a66a23bd529df3b5","src/features/gen_SvgGraphicsElement.rs":"6198a715ecbdc492144d06965616a45b3c8849be6b4e1247eda69d88e723cf88","src/features/gen_SvgImageElement.rs":"c0967ab2bfcabc51b1da9c0837f97e8537883fe58b1e5b0e69274ee2537b5168","src/features/gen_SvgLength.rs":"c86726fb7c35efd34e4ec3e0279a2bbc54d8ddf7612daca24b1d981684ec416b","src/features/gen_SvgLengthList.rs":"7785c90eaf5c548f2333152f53c97627ec546f3451c21bce4c2407e311d3ec40","src/features/gen_SvgLineElement.rs":"ad2509d3c6c8b3d1168e9c09aa417e5fa0b869508dfd53a2f44fd2f511c9d862","src/features/gen_SvgLinearGradientElement.rs":"eeb7b392bc31bb4b53841e85769bc9e408b3d67cf9b1ed029a04b2fc8f9f450f","src/features/gen_SvgMarkerElement.rs":"d5d80555e65be46800e009c1b7ec50ea83cc7c794fe57628fd6162ce388118f8","src/features/gen_SvgMaskElement.rs":"499b98ab2a420f82587c4149e9418b1bced22a545a2c34d7de5dcb5a4a8b4f84","src/features/gen_SvgMatrix.rs":"e54a525a464f38e618c0989593f9363a77be77733a8b1f5b7164f666667a041b","src/features/gen_SvgMetadataElement.rs":"80e5ae7242c43b2c223f80e2a7ae709346711f18d3ac87d6d5db8fa7f6b0b3d8","src/features/gen_SvgNumber.rs":"b298de768bddeae288d0d0356298dbf265b185e299474a6b58971699b19fdaad","src/features/gen_SvgNumberList.rs":"bbd1dc6d79c0dbf5570e3a89d6ac224ab0260269ad5115e66a6b70e2c078ac04","src/features/gen_SvgPathElement.rs":"549a6c10a25ea4a36a42d9ca89a7621a311725db7906799d224c8dd31a27846e","src/features/gen_SvgPathSeg.rs":"e5c2a0ea3da88842fd39e6ac378d03bc4f871f7a3b7bae3ece3f2357aa69f199","src/features/gen_SvgPathSegArcAbs.rs":"86b2846c402938f6be30bc24de2e5bbf7e41cfc39451c7f8b77ca29bf1299877","src/features/gen_SvgPathSegArcRel.rs":"4c75d74ab1ba7b02fb33eef74ce09531ae433e510024027b2d1c09940c016e48","src/features/gen_SvgPathSegClosePath.rs":"baa62f321e0d2932ccc8c616d7d9311c470ddd04bfb58ac4f18c20e3b469bc3f","src/features/gen_SvgPathSegCurvetoCubicAbs.rs":"c62a29b04de26b175929504f87e29d277f2d9cf993662f7984951887d431cfdb","src/features/gen_SvgPathSegCurvetoCubicRel.rs":"553ff8954c6b034a48e7f459fc9ec73791af4d7e0dd078870058f4d484f1ea1a","src/features/gen_SvgPathSegCurvetoCubicSmoothAbs.rs":"bde697ced633520d881e000294211b76414692b36b6ebcca676c5602a30984d6","src/features/gen_SvgPathSegCurvetoCubicSmoothRel.rs":"38941564fa7a31235a98b1e17793942ddf6e02c3fd33e1eed4ff292afa37fed8","src/features/gen_SvgPathSegCurvetoQuadraticAbs.rs":"159bbde9b146e8cd47fe5660f5bc9ea400858bc1782617420ad127c62436141b","src/features/gen_SvgPathSegCurvetoQuadraticRel.rs":"c6caa01129e60fa64131867be7173eca550d513efcd879e604cd4bb1ae8c1b9d","src/features/gen_SvgPathSegCurvetoQuadraticSmoothAbs.rs":"00bffb67410e1b36f45e9e41e4bb6aa84296f8c4b35b2c0b2844142a984608fc","src/features/gen_SvgPathSegCurvetoQuadraticSmoothRel.rs":"bb15c69de9f6f22b4a837ef186493a7f3c004f20c70783d7dd5d3fff2ca0f103","src/features/gen_SvgPathSegLinetoAbs.rs":"2e180003906ffc1af159941d670ee4531a567d9b42b59daacb3a152481c8a3aa","src/features/gen_SvgPathSegLinetoHorizontalAbs.rs":"26044a1a872f22e739685cd955208557f9966294a5749fb2cac79aed95a09bbc","src/features/gen_SvgPathSegLinetoHorizontalRel.rs":"2157cedf43bbd49c8ac2a20ed754d3d0c2f4606412f1f8820efbe0fb8d7ac7f0","src/features/gen_SvgPathSegLinetoRel.rs":"a7f8983760bfb51de4fea30ea03b0213c8ecfa6f28a8b5aa44311d41d7845788","src/features/gen_SvgPathSegLinetoVerticalAbs.rs":"cff0ae6f2afa22dd256e9729aa6b43891dc9f7b75f52cca30e656b4238b2b451","src/features/gen_SvgPathSegLinetoVerticalRel.rs":"a2de44579ebc00fdb0d8741a9f764ac0a4191b445f821e7d61c4799f98048106","src/features/gen_SvgPathSegList.rs":"f3704ddd4247d1892afcf2edfd5f90e51d9c46870e77bba07b310680ad8e48bb","src/features/gen_SvgPathSegMovetoAbs.rs":"f0aba5eb08f8737dae33c929b327bb8170bf3b13bb48dd5c796ea337be89dfef","src/features/gen_SvgPathSegMovetoRel.rs":"e30131715bd6ad0a79bab3df29df09d62b40994d144e0aeb31ac795c0af8671e","src/features/gen_SvgPatternElement.rs":"ca027659e61f6290e1d8021e5238e565f51fb7a5b81550f36305c4ef5181d4bd","src/features/gen_SvgPoint.rs":"1522a170a4faeb7c057d28e7c148e41d01bb17cd8fc1daa8ad5e0b664b8cf6c7","src/features/gen_SvgPointList.rs":"3ea1ed6441da75ddbe7803859de22c83b547f460431c43ff794b57e486a39944","src/features/gen_SvgPolygonElement.rs":"06ea7131a5ab18e7755b1a3683917951fe9317a324130f5708dd3e70565f4370","src/features/gen_SvgPolylineElement.rs":"841c0029667d488bb7cb07a3d644d9383343e69be36c22784df01b7f96a8cec1","src/features/gen_SvgPreserveAspectRatio.rs":"f61b946976a5bde9e88f4567aef6826588fda50ebc60a7deacddabafea3ef57d","src/features/gen_SvgRadialGradientElement.rs":"bd9fadeeabcc00a6429f95acb82bdf5ca1ea0177c6dc262bfac7eb316b2bb5d1","src/features/gen_SvgRect.rs":"bc3e17242a4cc809099f564913b32317362b5b39adbb3e124869b03ed8255a50","src/features/gen_SvgRectElement.rs":"0c870c3931f167d69984cccd024ad214bf69b730fe4ea4cf3fb96675a4406578","src/features/gen_SvgScriptElement.rs":"ca0cb4dfc0e847501a18d0ec97fd3e54e7b60fc8a56dfcf1f22771b82fd847a1","src/features/gen_SvgSetElement.rs":"a960c07c479b1b031543a669f8ad48594cb83c64a5e50b139e86d8420eecad36","src/features/gen_SvgStopElement.rs":"67a2e6d3a036f8afe8cedad81bc7fe47de162205c4aeeb0803c349715bd8d678","src/features/gen_SvgStringList.rs":"17c1d6e8d4595c198e8e7eb3eb231d29972e61cfb488b161a0afffc9b5efbbc8","src/features/gen_SvgStyleElement.rs":"4c4ab38b5d6f830ad103b3aea3d4456ef8478fd3b0cd862bc18abc5713167f97","src/features/gen_SvgSwitchElement.rs":"8d29b4c2f3ff8665de05425088527dd271d190e614a0f232e37a0b6685766a57","src/features/gen_SvgSymbolElement.rs":"0dd77fea3f99c51e40945ac001c2ee1d08cf46335f65ed1bd548c66cc109d9fa","src/features/gen_SvgTextContentElement.rs":"2647d8753787b93ec443fc3845c215b0a2f1863ec8f8d0ec48bbbb6f24e03190","src/features/gen_SvgTextElement.rs":"3db0831b063fde130ee479f295a494d7e86e8c8b450d55f41762dc3c218c5035","src/features/gen_SvgTextPathElement.rs":"14bcffbda35fe2d02b5b6fde676a301a17bbeb961c2c599c8d9fad1bad35f878","src/features/gen_SvgTextPositioningElement.rs":"7aa0edaa5260eb961289b60f2e44f955f5e22ed36736abe47e63d5338f623291","src/features/gen_SvgTitleElement.rs":"e545f6c9885a1e60acf4436afa6556388022b8ad58f83a1357f2f5608e0baead","src/features/gen_SvgTransform.rs":"7b2f1aa106095ca51eb328b5284e70cc9fa04f7670021dd548ab3494136eb97f","src/features/gen_SvgTransformList.rs":"7dc113fa4bbda8902f18950c100867220aa19b3b41215082316cf395efafc03c","src/features/gen_SvgUnitTypes.rs":"9747e695f4d5cd7e529e453502aff72bb09983e8a767ab9d5a15a8e075f543d6","src/features/gen_SvgUseElement.rs":"822992a667740d5686ce295cccb85976218b76149adf38a994d2baee81bfd54f","src/features/gen_SvgViewElement.rs":"5c37b3f070787486e6f956ea65596c1bc0dd65f04a8085e48ee2a8b7458d4668","src/features/gen_SvgZoomAndPan.rs":"e2b2921c87828c38172966d65246f159e783cb9b163ea782a568eded70a51866","src/features/gen_SvgaElement.rs":"eeb4a535367ed81b505e0b2e722599d25a7ad76a44f283c074d56fcc2f4bb8cc","src/features/gen_SvgfeBlendElement.rs":"68f54754a795ba441e9a0e2954ea21600013d00740008a1e8fa7f8993e15ceab","src/features/gen_SvgfeColorMatrixElement.rs":"41fee54606c21b0073cbddb3ce3c30013d5a3e20d68d19e9176b8541eb3da55e","src/features/gen_SvgfeComponentTransferElement.rs":"5e9a0122706d3f4930c8cca687d1ece623d11fcdc1638cee97886767f348ec97","src/features/gen_SvgfeCompositeElement.rs":"2d0e8b355602c887fee891f86a0afbd4f76df84aa7577fe9e9067cac3c6a4343","src/features/gen_SvgfeConvolveMatrixElement.rs":"e217221a54780f2a1a881c2824c0fff3ec12f69fce9ef21042ab9ac75b8b767a","src/features/gen_SvgfeDiffuseLightingElement.rs":"788292d6d49ce142cee37d733d1a6720489b814d3a242e340af4e1fd2fcda298","src/features/gen_SvgfeDisplacementMapElement.rs":"fca503e59f6027575615fc421dfd17f6e89f2370e45b4a5a93a5893717304ad3","src/features/gen_SvgfeDistantLightElement.rs":"60d8ad6d42897ff3c539e5cc7706382c668fb4328b74004ab943a2f9c7916a54","src/features/gen_SvgfeDropShadowElement.rs":"68fbb8c51d282e0b30a9d74ed76d67fb42c23841b18fef88f93e52dde77dbcb0","src/features/gen_SvgfeFloodElement.rs":"6c262940aa2b251c14d200b8118d2fca051f790d1144717a8abfe37fc2f49253","src/features/gen_SvgfeFuncAElement.rs":"6171bfa683624cbc0b7d75df9f33e624706c3f086b187362be8d5738d55c33c9","src/features/gen_SvgfeFuncBElement.rs":"a71fe49c21f179ce09ec6d1567f72872b5d35de38b808f510c68efdfd884df52","src/features/gen_SvgfeFuncGElement.rs":"99647359494e2b27bcc4fe40422a3edcb7d37e2b8a2d2ccf1702857f61bb99a6","src/features/gen_SvgfeFuncRElement.rs":"68194967b26762c5861652d57c87e40afa05101dbec83b68f118d9fc7a14867a","src/features/gen_SvgfeGaussianBlurElement.rs":"fe08d8e4d39b02a21ba478f636a2019662d84437a160163efb7008636ce54d72","src/features/gen_SvgfeImageElement.rs":"58f798fc4d19cfd32c4e384a76600399b3987afbc23fefcf79d50356697f5e22","src/features/gen_SvgfeMergeElement.rs":"4d99683aca29ee2bb5e2a27b97b500099476448c6421ebd59973e3b22c249749","src/features/gen_SvgfeMergeNodeElement.rs":"e8e57ab8c8ed2446dd346bb4ea0a34e17d0639b89f5466914f02fb6114b3d412","src/features/gen_SvgfeMorphologyElement.rs":"8ef2a3e495700b626925db1d563b5890dd6cb3a6cf0f646f21c08e88a1f94ba1","src/features/gen_SvgfeOffsetElement.rs":"c09b22e2e4bd311a8ce972914a957ebaa5885ff4e154194951a9d668fe6378f2","src/features/gen_SvgfePointLightElement.rs":"5771eaadedeebcbad40a4f7ce2e3290dc5d6501d311131407d7976653672dd4f","src/features/gen_SvgfeSpecularLightingElement.rs":"b8b9e207786b516943c8a80a5a4e1426a8e94fd6e018d8aac20c8ea6df4383d6","src/features/gen_SvgfeSpotLightElement.rs":"9391ca97d19d5a7ac94433e0a0b7003d516ab78bc74585ce4f28fcabf7124751","src/features/gen_SvgfeTileElement.rs":"5d7866e819bc558dab61a412522ee0a55f3d34b029c45cc7e1577d8825717945","src/features/gen_SvgfeTurbulenceElement.rs":"743ca26ca599f50f11a95dfe24aa928ab246896037699325c5b834b996efd0b0","src/features/gen_SvggElement.rs":"d16f65442deae04c6b67dae58d3d815b3ba42482671004a6ae6e71a0a42f4a31","src/features/gen_SvgmPathElement.rs":"73b9c3c86c11115974e2fb4beb62f28e22ca14dc2e5e1dce0f037d045e23d717","src/features/gen_SvgsvgElement.rs":"5a4dd45e93271e2691449a35b393ff66190902788c60d8a55a517e60df6c5593","src/features/gen_SvgtSpanElement.rs":"aca8f8845f36142c2d3c7d3b0da6a2d2a4032a327802259d18bdfae50b50ce18","src/features/gen_TcpReadyState.rs":"c6c38218a04a7f48c6cff5054e98e24f68bba8e3080ead9e62dc57a35f67c022","src/features/gen_TcpServerSocket.rs":"6a5441c0bb8f38b1b55551f9440e318ca56e2c512e78489ee78515723b335306","src/features/gen_TcpServerSocketEvent.rs":"77fb8b39848a7ecc410f9a71f3db2602a7783436975e2ecd17af64cb4673a6ce","src/features/gen_TcpServerSocketEventInit.rs":"a5cd65a846b00461aab270c97e1a854ae5ada77021b40707202438b72c5d884f","src/features/gen_TcpSocket.rs":"5826567bbf2ebb37e2435eb3f696b77a3133772b99042e5fcb48dd17a467504b","src/features/gen_TcpSocketBinaryType.rs":"c05d218c3fdfeb03049fdd97a3d6560b7487e872fef23df2eefd615c010c61cd","src/features/gen_TcpSocketErrorEvent.rs":"821762cc2df34624b6b7293d4a573e4e198f891b57a64e3088797e0a95a64628","src/features/gen_TcpSocketErrorEventInit.rs":"dc2ebc0fa03a0658e857321ec0dcaa3989c8e42a68917cc7c6690bd979f66932","src/features/gen_TcpSocketEvent.rs":"6b7ddd3dc0f9b3443168c10cf8ed9e37f5fdfbe09c0e9bf27e721bfc7217510e","src/features/gen_TcpSocketEventInit.rs":"2e1026ddd718c538f3ba3f4a63963bf9945e2a189bdd9567b01744f2dd345bbb","src/features/gen_Text.rs":"7b9c813679014c9e3d5e9a0776da14a6cb636ba0a89fe1b2ae995bfd0aea967a","src/features/gen_TextDecodeOptions.rs":"4b251d36f3b3f9d0e23464b79746ccc4b63666e9276dba55db27287659495bf6","src/features/gen_TextDecoder.rs":"dd13f4b891fba128bca5ea363dcf166185216bfe2875cca5b88a82952ac27a2b","src/features/gen_TextDecoderOptions.rs":"edf124386c34d9506dfb1b5eb1c9431f852da59150b3312e9420274be5bcabb9","src/features/gen_TextEncoder.rs":"4010e8d0aad37d276b4b4f3725870beb2da325ddef298cf763534869f3c5c951","src/features/gen_TextMetrics.rs":"3019b1d8868b16f2f952620a8f6b47dc30872229ae1a8087958de9aa9b449539","src/features/gen_TextTrack.rs":"d6587555e5aeaf00052be1ce86362c06892c12d166bdde4011f1c4c5a0dbe363","src/features/gen_TextTrackCue.rs":"21aca25510262a705038c899c8942ab175fc51913f000abdc1403680d238222a","src/features/gen_TextTrackCueList.rs":"7eb319aa77e92024336545bd79a908f1f552ba26d1079b4814fbdf85d94657f1","src/features/gen_TextTrackKind.rs":"eed78dbbf9186ed05ef097ebe35d8d89ce44adb5667deedb8d1a28998ce42cde","src/features/gen_TextTrackList.rs":"0a9bf9b89b6fd33ef096ba5773597a350ab57953d07448f71a69f306dbcfa0d4","src/features/gen_TextTrackMode.rs":"e931c50b7bae1bf8d4f8128fb6ba08902ba828c71a3fccb9fcb1f52574e8260d","src/features/gen_TimeEvent.rs":"9f4e621882489525bd5184e23878a1f5d2b74336a38abb2951adb7cdf38dea76","src/features/gen_TimeRanges.rs":"da5dfb312750f2dab3a3ba53b5b6d661394d76aa458a1a7ff143d642a93474a1","src/features/gen_Touch.rs":"57ad271eb835055cb908154d63419dd4c8fde9f513bb8775ec4e3d6f69d3476a","src/features/gen_TouchEvent.rs":"04b852685975a9191759b93848f839cb5520a363db898ec76659a7902c3bbc46","src/features/gen_TouchEventInit.rs":"ec1e7ebea0179b37e19422dc2704eeff8383106ba530736b66b874e477731d3f","src/features/gen_TouchInit.rs":"058dcc615f4bba118e130be24aa92360fef6e7d992849fe512467cd6b63cf0fa","src/features/gen_TouchList.rs":"86463508340402ff944e352c5182ada16b489e3fe4ebea8df4fa90e27ea848da","src/features/gen_TrackEvent.rs":"04ca5466f0b9ffd0461cb5a6fdc748a62ab5d75860c1c6dd5210b4c99950ad90","src/features/gen_TrackEventInit.rs":"22b1116a4f97d81d8407e0b0a99f84574eb2dd0def466b5703c6588fd2ae7a08","src/features/gen_TransformStream.rs":"ce9185211df7ee577e433dee4f65fee3da6417d24cf8213fa271f7c7f5739242","src/features/gen_TransitionEvent.rs":"417f136c0b5a56755cc3d70fe61fed28e1538bdd1137a2979ee8314936f39283","src/features/gen_TransitionEventInit.rs":"71ac09149706e718ac88e688a71463dc72f8c264f71c3c8784cdeca6e9f9d1b6","src/features/gen_Transport.rs":"9f284cce5e86bae1ec308a5e894000047a8400a3e448290d93321ec2f7f92cad","src/features/gen_TreeBoxObject.rs":"b0ac1711f076b8b582efcbc7b00c9c922ec4713553383ee5851995ee883db149","src/features/gen_TreeCellInfo.rs":"a99015322b5788b6755d5b29c44dac9462da8acaf7d0c5357f19d9b41a8d9bbe","src/features/gen_TreeView.rs":"51c310aa2e2b3d60a7d07b0488126d9cb5dd56187c31c6777c32a632a0b18c37","src/features/gen_TreeWalker.rs":"9edc4bf05503446e0cc5823ccfa268f86af854ff52f55f53eeeba954de78ac1e","src/features/gen_U2f.rs":"3a7daa83ede40bd467bbda6ee95724cc9875810cad9c2c156ce6831d03b069f0","src/features/gen_U2fClientData.rs":"a3e808724c0f5278a69c687f2c31daa21c40fd9069cc66bb96861013d1c324a2","src/features/gen_UdpMessageEventInit.rs":"9c9ffacbdd0dde3ca215ac15de231573b8aad0cbd04ff15f60b799cbd8e1d323","src/features/gen_UdpOptions.rs":"c6f17f889e6748ae479392d908893cf46f5e876ba81b0165164219aa143a7fe3","src/features/gen_UiEvent.rs":"ca6ab349ed8a595292ccad7877f2b31845c2b4cd5d766fea3b244564b2ae0302","src/features/gen_UiEventInit.rs":"71125c61c0c9fde7a1c02bae45da3ebf2817b5bee6eb6c4d9993086231d1eedb","src/features/gen_Url.rs":"ea67c6b279d0419dc7f1d38c309971619c49740f2df3a049c664ccfca3754bd8","src/features/gen_UrlSearchParams.rs":"6a6d4791fdb100ea0701dd25e8247880e6fd608f7ea8518b6e710ce547e6c3da","src/features/gen_Usb.rs":"f3f74d4de808e41015208195f5c6e998d242e6fc0206e670e2e45fce04408af7","src/features/gen_UsbAlternateInterface.rs":"d67cc9760c637742752dd93f9ecfd132979bb20394c4805a4df061cc1f6dd5c7","src/features/gen_UsbConfiguration.rs":"8025296a40d4a4f91535e8ff6d35d5ea255e921524af77684c21156d9d3c1998","src/features/gen_UsbConnectionEvent.rs":"a83fea0345941c678ebfa41e2b172294d05ef545f6d907c7ba00ef0e22ce11e8","src/features/gen_UsbConnectionEventInit.rs":"65ea354132c5be0746e201e0e7b6220e523ff1cbe3ff3a4d94b81f1709bbfea9","src/features/gen_UsbControlTransferParameters.rs":"543d51d3a1d660cfee4a1fd899876f1dc91ae0c6282834540711766fe07863df","src/features/gen_UsbDevice.rs":"bd44dc706ae17fe454f873025cc28d2df4c8d7f805b7ff8b243d8d0726904cef","src/features/gen_UsbDeviceFilter.rs":"6e0780c582cd4bdcd4cc90a914776392ea6e0f85536da0aa584aa61a1bd92824","src/features/gen_UsbDeviceRequestOptions.rs":"a0e3737644948869fdbb3fa52b8ef087704a173173f9efba9b2bfff7cd8aa10d","src/features/gen_UsbDirection.rs":"c7ae396f989a3d3e1e81bbbf7dd2153f4cfb118a6ee4bbc196e5e9c8789144dc","src/features/gen_UsbEndpoint.rs":"a47f6341e6968c972f3254ad76098b232dadc1a99e6e0ffdaea7bfec551c551d","src/features/gen_UsbEndpointType.rs":"da27bbe27fd480bdc67389c79f66fbd1ee3ef3692f2b34f2dd2e1ad41f3dadd9","src/features/gen_UsbInTransferResult.rs":"6a3f5f915f584c05663624f1a1b855e7ac11395381f11cd88c4c081f01fc1d3d","src/features/gen_UsbInterface.rs":"88b2f94f634365804700d473f6c9a67d698928f9e902a9be9492e1337c928abf","src/features/gen_UsbIsochronousInTransferPacket.rs":"bf93354e699e5267f1becee881f19a1133a3157a314bb71687468ade5cc6d0d4","src/features/gen_UsbIsochronousInTransferResult.rs":"38b40a1e80b4df8a54b93c5ce3301f76096e783332113d552c595ca8cf662b9a","src/features/gen_UsbIsochronousOutTransferPacket.rs":"82b0731f29f9966c426b63e09920a06585985e30f2c8064964375fc2a3af6cd5","src/features/gen_UsbIsochronousOutTransferResult.rs":"59413837db2bd8d3a8cf81c12bd0d9722c799e98d086ab2235915706d39c1703","src/features/gen_UsbOutTransferResult.rs":"88ff1266bd44159ed61e8312b76a7c3d34620796cda7adcdb4b15ad4b55176df","src/features/gen_UsbPermissionDescriptor.rs":"ac9cac3ef3839706efaa31d7235b7e43f4963a0df17de1292e486c9d7f29d754","src/features/gen_UsbPermissionResult.rs":"8f7812a8bf8cfb5e4b7306e82bf7d1f467a09f3bfb6b97a3c30ae6c9c3079746","src/features/gen_UsbPermissionStorage.rs":"c2c4094c72866cdf9adf5899c64e4f4700cff3706f8ce45abbfc3a77ace388e3","src/features/gen_UsbRecipient.rs":"8c3b039753e2aaf1bce5c512b2a068b3e135a2ea53c138d5ae19421e7ed13285","src/features/gen_UsbRequestType.rs":"2828435971a99d76694051b98dd0b8f5804d94124e69c84365657d36f18e632d","src/features/gen_UsbTransferStatus.rs":"eae9df4484d4dfc767f05afba9dabd8020a2ada617747b7d3e2b21b2fb1aef44","src/features/gen_UserProximityEvent.rs":"d2d72ea832948a08e879dd1bb284a335a90ebfb673aabd63f09dc30c3253ef0c","src/features/gen_UserProximityEventInit.rs":"a2f029953be41cff9fcbd33e42df82452283c5e534c9c72c1612e1c0ccb2d854","src/features/gen_UserVerificationRequirement.rs":"b1a35c80f9dec794f4eff81d0719afc0789b072951ed6d2582bb4d45abfaca07","src/features/gen_ValidityState.rs":"af1943bcede18e0d2eb9b247e095369938a5557a404cab2f560fd7b9afb31fe3","src/features/gen_ValueEvent.rs":"b181c6636fe70653f9233d7b5dd07d6c0095bee2d01274edb9953e54659e22c7","src/features/gen_ValueEventInit.rs":"690a3dd9390fcde91215205538226facf4780071e012f3eb6ae4a1e6075b88dc","src/features/gen_VideoConfiguration.rs":"9831cce61fb49fddb7df9a715d5e96b9469fa9458a6a335548edd2c199e94d71","src/features/gen_VideoFacingModeEnum.rs":"b3c0ff4d0788efffbe576dcfbf570bd175e9762ee4f28efeefe90c53a7a17ad1","src/features/gen_VideoPlaybackQuality.rs":"1c1e13aab7651b1a338b78c8c4604c4d2959b32586b536f54f0a05926e467b10","src/features/gen_VideoStreamTrack.rs":"4bd9eff4024053a97f1a079bdf1f410dce6f88db6c032280bb44267776fe7f1b","src/features/gen_VideoTrack.rs":"703c2196c9d815f31db2fb9f66c0675783e63f76f2615f1f2b155f9f9e1b7299","src/features/gen_VideoTrackList.rs":"b1904c399e3ad1e898932ac33676d6d0d6f9ca841aa028424600a35178a39f15","src/features/gen_VisibilityState.rs":"19be9df67e09759e57bf2598638b661a3f841a62020d78451205999342d17e49","src/features/gen_VoidCallback.rs":"fed29136edf3b9b59909b6727fc047142ab9c1fbf6f46a8a45e1fb843531456c","src/features/gen_VrDisplay.rs":"ade0deafec308c57c71e89251a1c2d868e512266fc3487f392fe27052f9a937d","src/features/gen_VrDisplayCapabilities.rs":"871c0eaa1e43cd295fcd5c8ef365fbf0f35b4ebf68af4a16292d0b4b59cf825e","src/features/gen_VrEye.rs":"9057788f049aa66ba43ff5024bb35fb8e7e95fbe58cdd4ea55805795dd866606","src/features/gen_VrEyeParameters.rs":"11f206a2de3c75920438f8da2c20c6b9f9d4bd4c98c650a91c0b82f7bfad142a","src/features/gen_VrFieldOfView.rs":"3cdc50a8bf8ceacf3db53fbdcace3703a6f37784c4c9dc3e152eef9835a27d26","src/features/gen_VrFrameData.rs":"4782710db2f05c88291a7249615df191830a77e5a31e8bb3054b1e3354454230","src/features/gen_VrLayer.rs":"92057daabb436d632e204b05d3166726f22c246018072f05b8fd23ca4f84e744","src/features/gen_VrMockController.rs":"125b2c6615f248d5a7e86c68a03ea13fa61a6d772de65f6352bb71358fb3f0f5","src/features/gen_VrMockDisplay.rs":"720ce2b306c588831eb5458589b749a592bedce75103ecd4aa08c73cf26a8882","src/features/gen_VrPose.rs":"7008271bd1950eea6f15913e4d5b34f4ce134e1100d351110779f79077ec7d16","src/features/gen_VrServiceTest.rs":"bfb58d1fbfe50869fb432da3f821fc596f578b816f11788c85b8acf910745ebb","src/features/gen_VrStageParameters.rs":"7f02fd4d9ff57809dd7da0a2e4f05082bdf4887e02de59d0db61f92f028e45ad","src/features/gen_VrSubmitFrameResult.rs":"f8d306db93b4ea76523dfb685bf1dac8f84e3d1914f26da98fb7052ed2bca0dc","src/features/gen_VttCue.rs":"1f88d73ca5cacfaa808e59d961b48c9f621cd95b18de924e6463f0be7fb7423c","src/features/gen_VttRegion.rs":"cba69f45ed75f5ea0719ddc710f93db836f8842a05a29f3934b79db1d5eba67d","src/features/gen_WakeLock.rs":"d819562d9a265768075f811d6c6ab9496ba9ce089cf3eb8ae3ec386df084acf8","src/features/gen_WakeLockSentinel.rs":"3db5aaa786692be6d7c15239548a7fb5d7b1c8683d5ef9486ae6d7a50a1d460c","src/features/gen_WakeLockType.rs":"bb0f8175a18c30d9f927be8ac5501b4bcbd34733115fda55962367c3ef31760d","src/features/gen_WatchAdvertisementsOptions.rs":"c4940b9e77178a2382e0484a06d9cea92c359153968b5fe99f9ed2945ae82d43","src/features/gen_WaveShaperNode.rs":"389e8390dc1a4bee1ba4a3afc9cee5c187622b963a36f8ba1826b31d7ba8a598","src/features/gen_WaveShaperOptions.rs":"1f7b91bad5131ff3309584056db564717a896986984d50cd93441a78ebb3ba04","src/features/gen_WebGl2RenderingContext.rs":"482256e13fe1478494dc94ba2e29708c17803ddefc3608059564655052e21dea","src/features/gen_WebGlActiveInfo.rs":"489ef1a664aef7b21e9fa9dae1e3624b2c309ad997a33896f4207b31e3fb4190","src/features/gen_WebGlBuffer.rs":"4f1ab8a20c116a8137dcb4a40013f40cd2f3360490448af596bd905c8b84c2d3","src/features/gen_WebGlContextAttributes.rs":"ba6d690e4944bc96270053fb1059cf3d6db4fdeab5b7fd66cd0f799f31689b1d","src/features/gen_WebGlContextEvent.rs":"55a4c40df76f77ffcd5e61eec57c4c284ff5f9cd48936c59e83ba7d8ea1eef5b","src/features/gen_WebGlContextEventInit.rs":"942b817682d9ea17c0c6bc29fa4bf2f387100b5733ff3cda813419d7d3bd9603","src/features/gen_WebGlFramebuffer.rs":"4f6f7399c9108d057a7551f7a203a561300c3c9fb5c122b71882fd96f45e2eb6","src/features/gen_WebGlPowerPreference.rs":"37bd86706c93fe1db55831ee4036357a870b2b0f35946b1dc720d43c99ace69e","src/features/gen_WebGlProgram.rs":"ab7f5978df1f4f8734ed495a6bbfb00c0e9316365f75f8c2f7ea71b261d65c0c","src/features/gen_WebGlQuery.rs":"d1affe73839ca2b791a58bd4fab3d343eeb812921a0fb6af555de7acf6e592be","src/features/gen_WebGlRenderbuffer.rs":"77b37d3e6ec405a93cc58e9e444f16f712ac5f2f2a8a7d0447d2ace0757f388a","src/features/gen_WebGlRenderingContext.rs":"779e1e107e690f536b944f14885b38d04f26f3cb9bffa69375368656f2b5f0c2","src/features/gen_WebGlSampler.rs":"66c01d7f72438bb5e463da537f2591a9d7d7d8e871855cb4f0443c177edc33b5","src/features/gen_WebGlShader.rs":"565fe2c214b6f0612f61af504401bb8964586d2e30efcfd9e679261b29ce3395","src/features/gen_WebGlShaderPrecisionFormat.rs":"8e98d68c3d73d3f81990688b3ab9c118ee1726f6822057a2dc27b1006f150f24","src/features/gen_WebGlSync.rs":"877509338c881fdc05cd4cb54d4348150458f6a65878d74a6ef5673f511c08d1","src/features/gen_WebGlTexture.rs":"e732c8bf86a74cc5f4edecfac8cf8f5a11151a1d7827fdb821348004b54ddaa0","src/features/gen_WebGlTransformFeedback.rs":"cc279b6aef9b511d5b82fad731897369f885bda4978da874072c518524d71642","src/features/gen_WebGlUniformLocation.rs":"217705d615bb907919eb39c6b507be1c018dfcd3b5f2a7732378ef654d2b45b9","src/features/gen_WebGlVertexArrayObject.rs":"64b7ead520fc21c16c606ce232526685b3a5a681315690cb7a7199c484d79a13","src/features/gen_WebKitCssMatrix.rs":"5e2b5a532506563f19cb6325e53d9b9313d2567c350c9a3cf1b8b2d63326df15","src/features/gen_WebSocket.rs":"a096a57bf7b827ef4ba669f48289fe6f44739fe9584554c3132f71f164373b1c","src/features/gen_WebSocketDict.rs":"5bd1cca62a56ee77e31ae20bd3b92ff574e9be7a34d8f5365224ea4898f789ec","src/features/gen_WebSocketElement.rs":"5bae0d744c788fca8906a59e8cae54384fdb44c47f3e65413152d21f141bb073","src/features/gen_WebglColorBufferFloat.rs":"9375d241a136f13cee0cb9226b38ef2099bd28bd881006694096f9474b149350","src/features/gen_WebglCompressedTextureAstc.rs":"01e0f33dc87f946271bf2604d93d11670a70019b3407e7271d9532f4a5cb7a9e","src/features/gen_WebglCompressedTextureAtc.rs":"4371ecab9f58dd8d2727f5dbb7bacc131482e1dbc936a9ecc84c46f5868842ae","src/features/gen_WebglCompressedTextureEtc.rs":"bc6c8f46ab10e8b4866352792f83a03417932b5cea5904247e15a07cb8171c70","src/features/gen_WebglCompressedTextureEtc1.rs":"86d5d35c33c3a5c60c40be84997822b154857e9c7c00a0f5ffcfcc290cd9b306","src/features/gen_WebglCompressedTexturePvrtc.rs":"c45135ec293ff6475aea3c1c6a79383860c6b2a8ddaac62c777c1a2599908f8f","src/features/gen_WebglCompressedTextureS3tc.rs":"4fae612ec2d8efa4885be7484d426876f845f82325d6590f0b222aa298aa6098","src/features/gen_WebglCompressedTextureS3tcSrgb.rs":"330167d63cb1aa9af017fa4a89ed508f7ca11ac6025dc9be9b0b33c55b08cb2b","src/features/gen_WebglDebugRendererInfo.rs":"ea64ba9725ed892a8179e8b01316adfc60f46e3b7ae75ff34c25a9fe4445fe21","src/features/gen_WebglDebugShaders.rs":"d4d8ef96a6d3ec9377c84a4412216563fda01fa0e5c500cd4c43c3f98e6ea6ad","src/features/gen_WebglDepthTexture.rs":"9b844e722a4205ef216dedd38baba893bdbc64b4dac6dd71a8f85557ba2d0fca","src/features/gen_WebglDrawBuffers.rs":"d543ff58043e05676487492ab431a176aea23499036353bbe5ba679f5e328bf4","src/features/gen_WebglLoseContext.rs":"dd6f2d8583c501a71e1f9d62ca9e86553b739a565dba383d8189e5f4b8e9b252","src/features/gen_WebrtcGlobalStatisticsReport.rs":"d614b26af2dc9561e73d64ada0930ef69f2dcdbf528cb55b4649b7a0d1e1233e","src/features/gen_WheelEvent.rs":"074399baac351d33c3ffd36490de1bf023a787d7b4c0efafe70766d2471d71bc","src/features/gen_WheelEventInit.rs":"c30696952b6068e5c9af5cecf1161229519cef383d263886b715f5fd07d83345","src/features/gen_WidevineCdmManifest.rs":"823063e19084ec22c47df8d96bb68259c91f01e4b768cb9f9b822f116ccbc519","src/features/gen_Window.rs":"d6cd19f140f43446ac9cbf94199fcb7f7686b3bbc29930e043ac5dddb257a642","src/features/gen_WindowClient.rs":"ff361e372f34f5e9827fa2d3a730a4883584ff03a160602cfd08c53cda37db19","src/features/gen_Worker.rs":"01d98139644f0071c27f6fa81f4fd65fbcb4ee1efe703e6985ff028f53bbf360","src/features/gen_WorkerDebuggerGlobalScope.rs":"ea05815fbcd4ada52a9ac3b96217c7e49b71c8b4b5ec8a80dc36c17eea0ca5f9","src/features/gen_WorkerGlobalScope.rs":"d16e695939577b240b5a6c7e68ebfad15c4f0f2ea9e855fca7376a0a96743b22","src/features/gen_WorkerLocation.rs":"a19e4ae7febd95960dc7c6c25e494d19b5a80c5c9383934856c5e5c99fec5996","src/features/gen_WorkerNavigator.rs":"00736ff724410f32ce2265d96abc00f0833556fa8112209b57bc1b547afc13fb","src/features/gen_WorkerOptions.rs":"e5cf814d505f507d9770eb495cf4148bb88bddff3b50919df9533e17267e491b","src/features/gen_WorkerType.rs":"68726f663bb028e16595b2abdab19959806766c30058ecf4f5a3444ec9efeef6","src/features/gen_Worklet.rs":"ce9a7902e0e57a5361706c5e730a597b8e8e492d4a7e5febf8593f8d03e9f1ec","src/features/gen_WorkletGlobalScope.rs":"c90eae45088cea558148a2f0810b40014aaf7f18c7b80178e43c1e320f676792","src/features/gen_WorkletOptions.rs":"df6a2209f7fd44a1452c5ec9cc933df662f4918dc9344fae93b8d04b4e53e7d6","src/features/gen_WritableStream.rs":"e6526b9eb2aa62e1b3f0589b26e02d51c58461d55d0563c32cfefe3a193eac11","src/features/gen_WritableStreamDefaultWriter.rs":"f696b080c30c3f9d88f1ae972cd6be433bf9e38bebb2e9a0d5417e8df38709c7","src/features/gen_XPathExpression.rs":"6b02941d4ebe2f99f8bd994e93a45112eadfce959f0e347b56d2d8d66d6420fd","src/features/gen_XPathNsResolver.rs":"1ecb1475d4cab9f798542a15d254717f4623fc43ef4220c4f0ab6a7926d64801","src/features/gen_XPathResult.rs":"cc21c29ebdbe1ec26303ee37955a4fd0866d031c841a857842d99cd86ef6450d","src/features/gen_XmlDocument.rs":"67940fa6b8d801726fe165bcaff989da8a3a3e6a66918dc7ae8e58cfad9ddfa6","src/features/gen_XmlHttpRequest.rs":"f0dac24b0f518b709cdc85c7e7ba69e617ca749d518f4f0a33988fa500b87272","src/features/gen_XmlHttpRequestEventTarget.rs":"85a9cddd8a3107d891fb45f6fe97e7e290566bf677075b144de1735b11f1f918","src/features/gen_XmlHttpRequestResponseType.rs":"822a877dfd730b262bcc76d4273b3cffa19a49a88b2dfffb56c6ca88af15f7e7","src/features/gen_XmlHttpRequestUpload.rs":"a78c2d2e42afbd492547e58e9ff95c1a0742c68d2c3fed7fc93becb427a55d48","src/features/gen_XmlSerializer.rs":"178f20617d3fcd48e976b60a3932763b049e0919b4d4f614f6f1ec4a2944e0d9","src/features/gen_Xr.rs":"14991fcf6c12ee95aaddaa5b2f60c222daff71e8091e787c4678d77e76a2f611","src/features/gen_XrBoundedReferenceSpace.rs":"99a42496a502ef4230831100412b05d54f75743997b626e2b121dfa3e43b1f2b","src/features/gen_XrEye.rs":"4d3dfd0b6059d92f07dca955d53dcfff1892c13d31b5bb65512b9f8b4da9a281","src/features/gen_XrFrame.rs":"48c3b74373df6f9c285c18a1d1702919159ff0a134891556784b6b089c00868f","src/features/gen_XrHandedness.rs":"1df7a74595c1f200f90af667e141cb7df634e98d72dd3cebb41413dd68bc9867","src/features/gen_XrInputSource.rs":"2d66f1de8922dbc8e06e61a7bb8ffabf183de02fee6c0472afc6ab30252f990e","src/features/gen_XrInputSourceArray.rs":"5825c2f28fa2a2c1c9285be5ad5853c0055221b23d28575a87c46e14f0b54369","src/features/gen_XrInputSourceEvent.rs":"2eb0704e038f88c859dd4e2d072aa14ac38159ebbecdf328329aeb0b79ec400d","src/features/gen_XrInputSourceEventInit.rs":"f1fd0cf679cd64aa40ffa062331d710a2443d4917ac3059649fceed8282163ad","src/features/gen_XrInputSourcesChangeEvent.rs":"e1f3ce3c216e715d71ae57020f498ffe4d7ff988e2a6eda5f3003e72bc815751","src/features/gen_XrInputSourcesChangeEventInit.rs":"4c118667d6c11673bd33ca36d89dbfddbaccc6f83e94481a163f4c029d6b0ad9","src/features/gen_XrPose.rs":"f9020f169196e85abd98584afcd16e3fc58deb54398a6b278e51566094092e00","src/features/gen_XrReferenceSpace.rs":"7b8eace89a7386c5ad612b98ef673d0f014519c9a20ef26765a6db8ede5ecdf3","src/features/gen_XrReferenceSpaceEvent.rs":"e905debddfec87eaed677cbd1c9a64ea2d65862c6c285fe8c321cf465e124b2f","src/features/gen_XrReferenceSpaceEventInit.rs":"68d9b141a2ade0e2d2ea9356c2fd7d478a3fe9587c05f0f1e36a1d4779dec181","src/features/gen_XrReferenceSpaceType.rs":"d61b9b6f6487ebd9c04cf63c212681e80db3aa29a4bbb4e0ea116931c70dc2f7","src/features/gen_XrRenderState.rs":"ed90a29f032066efdef9a3dc0dd50eff73bcc50a1919d39a9939c14fb9a4a3e7","src/features/gen_XrRenderStateInit.rs":"dd0981a02b6f05de1c8774c0978aa658c786228729178975c909d4b234fc32e9","src/features/gen_XrRigidTransform.rs":"e8785bde251c9a5fa21edadbdd1004507302ce9b99abc01d75fbed4bc838a6e8","src/features/gen_XrSession.rs":"eae09fe86ab04983d54fd6e95a3a3df5ea581bde218a59fb727faabdfdddc7da","src/features/gen_XrSessionEvent.rs":"ede1fbe296b2866a7e1a5ee61f300bddbbeb3a3e84220e082a2b41c9d64d4911","src/features/gen_XrSessionEventInit.rs":"787f5527a2e21f32e686a2355326aa137961f932a3f2fd7a423a207744314fc5","src/features/gen_XrSessionInit.rs":"09dfa660548d246130fa0fe6369a06735f35eb72d883420ffcd196c5c4962c91","src/features/gen_XrSessionMode.rs":"8917e38178f125be2fe65e29806832f91ed9def6b2dfea268073cd489595862e","src/features/gen_XrSpace.rs":"763fa831a0840abc2d1056d9f572ba94766d34c6da3d2346e52fb3fc6706bf7f","src/features/gen_XrTargetRayMode.rs":"deed03830cd199ce9f5640609754dae3db1c87a9a6cb2e5f1fe6f2db55c15d95","src/features/gen_XrView.rs":"3bf7ab8cedc42b19e9bd8fefb16617ed78ebffbab0581b18c29585b7f3271614","src/features/gen_XrViewerPose.rs":"120b5963e6df13a9e3b34231fd77dd8725334c405131fef4e4ae66fc6f31c49e","src/features/gen_XrViewport.rs":"42dd33801b04520d01cb9c846c1ab29c917c5080aa0d5c16d15bbb6af95bb7da","src/features/gen_XrVisibilityState.rs":"655e21fb9650587196160f998f574198a99cd76052139c89032d6ec099b360b7","src/features/gen_XrWebGlLayer.rs":"47e3928a282c8432b6c2ab2a7faafb69e895cab21192d8547af598884d854c11","src/features/gen_XrWebGlLayerInit.rs":"8d207b65f30a8b95f65b7d58f0de19f601abe7cfd88feb21149c4a315a0fdd26","src/features/gen_XsltProcessor.rs":"78c3bbcaff8c5958ff1b54b86c33706e5e9d9b38c225b6ebc3ab9506d7e4e831","src/features/gen_console.rs":"9e6e4b3b024b4506ce846c6f5c624e268ee11afc5073486034a5cae8a9e399cc","src/features/gen_css.rs":"77400ec13ee99fa627dfb8d4e3616911463d3c774faf102285adf08d06a3cec2","src/features/mod.rs":"c1730b342547a74bf68c2604d328a96b43b3298272bfcc56530a653d50f4b842","src/lib.rs":"cf7a06e1e3b862ba3f4cc65d57863fb6a85dfa51c2f8f66a1ba10ca766949675","tests/wasm/anchor_element.rs":"d81b8164a053cb9bc6e0260f9d02189b1a3b0e6641a2ed6f3a5ad77651355b41","tests/wasm/blob.js":"0941f81ef62f2b79576d5449b1ed9ace4769e8cc9217d73ee5a84458ab301eaa","tests/wasm/blob.rs":"96d1e9ef3ffbe5c3bd4bb08cb7cd5459d9854e81ae11e051fb2cb7464b8abbdc","tests/wasm/body_element.rs":"a685026c9661beb45cfb979b40ac8a4db4888c1a31290c607f1b825f899eb7dd","tests/wasm/br_element.rs":"e173291a963e904d1af98af2a56fea5e0261fa521d0f5bf2190e9db379a02750","tests/wasm/button_element.rs":"7b1b3db27f64bb22bb1d9ecda2312d0c240b751ca0af781b441737fae4d609df","tests/wasm/console.rs":"119e2fca44af45ad2729caebc03480249ee6b7f14aca0714bf6b813fe818fc0b","tests/wasm/div_element.rs":"e07aae54d094c95372ecca15e7b4bcdc51a033c2e832ff128c00579c692fade6","tests/wasm/dom_point.rs":"157b3fc2ba453c71d5dd88afff6645f646234b48b013a90897d22783b9f5b99f","tests/wasm/element.js":"5c8f2c78cba875a619b084603b6d64c481c15dfd1496f963343807fcee74b54f","tests/wasm/element.rs":"14b9b726c2ebf94f865acbe167209ffeba0fbfcc2dbdc2cf2b2c5ee4e256f795","tests/wasm/event.js":"3bb5a3f34d82681f15f64467621eb71a2ee003a941eeea3a86b74b699c686981","tests/wasm/event.rs":"9d14c4fc8e7156c23f79102da32663a54bd414007327c592a8df06c392c9fbbe","tests/wasm/head_element.rs":"7a40e1d68ce01f73837a888813c593e98361a51c43be0a517e4250597dbc46d3","tests/wasm/headers.js":"61d901c54bc6061c253f2e008d83a501a5c474199dbaf11f4f9b4c902b9828fe","tests/wasm/headers.rs":"0bc1dd8e35110563afbcbb8ea859ad4cb75c0144df8fbbe2fff6a2c67a98c95a","tests/wasm/heading_element.rs":"2b03a9e8be6dc8f775a04d567ee5cb662115b10685c4c22b65117571baf2d459","tests/wasm/history.rs":"431de0cb978a8af659bf296bb9b21d7e1bb89a403f22306a08ab8242014058c8","tests/wasm/hr_element.rs":"a8a5a947cf929235f97eb235c35e72c19ecad708db6e0ed9736dbb6714cfd60c","tests/wasm/html_element.rs":"15364d6db56f203d8e5c10096a66d7b93c0058d6e19d8428f140689da8ce13b4","tests/wasm/html_html_element.rs":"eec3cc44e9dfd497ee4f3a2fa86fe9b29bb6ef63a6a3cdf2d222c761939635bc","tests/wasm/image_data.rs":"5f37ea0a65d5aeeba236ec5c243c626371dd33169c26ab53a822287550957189","tests/wasm/indexeddb.rs":"f2db7b9d9f6e5372adcf271846ade7d2e83e7fcecf4e790b06c10b5b42720954","tests/wasm/input_element.rs":"6cdb170516670eec1f4f3a89b27f91d77ec7643a522c993b11ffcd9caa86cd60","tests/wasm/location.rs":"02280feb8888d6cbae4c78c62464a74a948275585a22eebebbaac088f089dba5","tests/wasm/main.rs":"ffe6d490040feda2282da465da9c77a8572e6ba3bd06799ac269b77cb0954fec","tests/wasm/menu_element.rs":"71818d4e62581b4a94f8558c46768341f182cedd2a0a47184e792b5cc2f8dbeb","tests/wasm/menu_item_element.rs":"1b55d1e0dd142ad366dddece2c2f9467d1ec926885311d99f946bb39430b1f8d","tests/wasm/meta_element.rs":"81b2529543adeb894dc148f45f17c5a64e31a2a87a93d5e258818c53ddb9bf8e","tests/wasm/meter_element.rs":"fe2504c6cc10c99ce94d55df0cbfce86d9f2dd88c627e2ffb4d8010085c994f7","tests/wasm/mod_elements.rs":"b678141009a5ebaf55e8171f116e770eee2712cb30884bad42e8a60e12fdbaae","tests/wasm/olist_element.rs":"6ef5067d3e1a3c4efc8f2c429286245dc9874762ec0dda2c6b72dc560fa22f67","tests/wasm/optgroup_element.rs":"f64dbc200f3f700a43f0d4628901a1b9d40f8c818244c52324d9602c4d3a1bef","tests/wasm/option_element.rs":"c841ff8ac3abf37fb0306ff553462195140869dfca978c749a59fd168fd82e9b","tests/wasm/options_collection.rs":"b9071a0a8e659cb59a09a0263ed15453186720653131b8b3bcfb2a41bf8b83a1","tests/wasm/output_element.rs":"1c56ae2f4e530f4228260f0a73e8a124edaab4f35e1e9ba8916601a7a1dcedcf","tests/wasm/paragraph_element.rs":"e2ec82bd46336dc186c9a127330a115ba16749e6e2002f0ed98b6b45ec6e851f","tests/wasm/param_element.rs":"3d0ba799f06d06448d33f47134fa93b3276cf71aea03ba271368259aea9e4f20","tests/wasm/performance.rs":"3e89000a2edd79ddddeea319f00d27988582ae96fd82470c038e02813e19c3f6","tests/wasm/pre_element.rs":"91e5dd0012b33e54a5d79436f10505a33638bb0cd8c623063ea647da5b73603c","tests/wasm/progress_element.rs":"192c833db7e02d30767a2411405ba2989d0be0376dffda4ed696440e1309ef56","tests/wasm/quote_element.rs":"069bc812ee94323550d699968b49c73179f03cd45570c0252ae12943cc90f7c8","tests/wasm/response.js":"d469f28cd408dfb29f41b0ce78e6b9f038e5880f4f7bdb8f817cd8a5c5edbfba","tests/wasm/response.rs":"41cbfee4f5a821baf6f76fd5b0205ed744d5b9d4c8c917f7b70a69ef8241c2fc","tests/wasm/rtc_rtp_transceiver_direction.rs":"c2898d52655cdee52af7f138b7b5858ac7135b692e379d6ae88bf96cc18cc086","tests/wasm/script_element.rs":"43ab8519f106505edf7b260c9ffc8dc6f0601c85f0b52820165a18d104ad3a25","tests/wasm/select_element.rs":"15b7eb6962e8f91d95a8d361f680d588e6d4a90b1603a4ffcaf86ed36067795e","tests/wasm/slot_element.rs":"6f1609580f1a9c3c7a28d6bdeb9bcc85fe15a5156cdb1b3ed838210352f99a73","tests/wasm/span_element.rs":"8674b3d22e539c35348eccdb5ec7bda067664475e0bbe6fc7f93048fb58016eb","tests/wasm/style_element.rs":"258951e44d1b090fad51ec9f88a39189b23db512cd3038ff14a74843676a9bfc","tests/wasm/table_element.rs":"0148fb21f804289f00d076ec2513f264754d2e18ab2b36321073901c4065cf32","tests/wasm/title_element.rs":"45441849b48e9a76b2154b2b2537d2a3de3acb2baea45344e99a33b3344759eb","tests/wasm/whitelisted_immutable_slices.rs":"37f804d332efcb7bfcafcf6311267833c22206b9b720967ff03ef9e909a1a756","tests/wasm/xpath_result.rs":"73b4a266fa9cdeed78995f167ab965d324a049b1acccaa9452030137278b0739","webidls/disabled/README.md":"fed82e8fe36dc5d00b920c4ee9a2414cd0ce36acbe5d919aaf74b63d54a35171","webidls/enabled/AbortController.webidl":"f58169caf4ce85fd1aecca3a6407b34eec7228bd38909110a5d8ae09a62f60f9","webidls/enabled/AbortSignal.webidl":"f74eb8fa35d704e08577a79d9dd43af9f85acbb10d5c3f45c13b8095d53381cb","webidls/enabled/AbstractWorker.webidl":"686dd52b59005af6a26c4568587a615aaceb29dacaf62c68d85c49b652ddd05d","webidls/enabled/AnalyserNode.webidl":"b13c9d8f4f6ff18c3c356320376a20441e55ffa9023d91163eaa1bcc439875c2","webidls/enabled/Animation.webidl":"6a4f3b332cbb42d2e59e8e0a85b88fe7312053279869de725b894322faef0e5f","webidls/enabled/AnimationEffect.webidl":"6e0a16de15cd7b6f69217d04ee45b53a4a3f0673e39fc200ed822fdcf2320bad","webidls/enabled/AnimationEvent.webidl":"1909fde84b084b7f08c6ec743fbbcdcc999752a82e6e41b1eddc11a2aa993ac6","webidls/enabled/AnimationPlaybackEvent.webidl":"4ad10915c9f09c3c29d916ed60211bd05a4dfc1808134b3c86dd5b59ed44cd5c","webidls/enabled/AnimationTimeline.webidl":"2919663ac49c67b37bec89bbadfa588da6f0151a7f76aefc14de2b401af9f3aa","webidls/enabled/Attr.webidl":"93c5596b9910cdc4b7e5a1d10540140804b913f6144bf92a2ca4908989810786","webidls/enabled/AudioBuffer.webidl":"135fdde7d51b0583ce5ec3dba6489791b74911af948d422f393115b4448119b4","webidls/enabled/AudioBufferSourceNode.webidl":"c3be4b3dd9277c05ddaf36637c8c068b8fbefa7b2165c17f87137ca827cc3aef","webidls/enabled/AudioContext.webidl":"fd9e3328b950094f7dd49593e7f857bdedc49ad5095833fadf944e23db54d183","webidls/enabled/AudioDestinationNode.webidl":"2eddaa6204b0909cf04d5cb0d3f1f5be437627c6c6d6d8406e76236d6057acae","webidls/enabled/AudioListener.webidl":"6b5d9f559252f7279797b9cd283f6d8ab8ac158ac60ed3b27bb6ea2867ae233b","webidls/enabled/AudioNode.webidl":"e3608d3db0c6bd456b47ce7417fa20b3e4160e4e6bd24e0b47b8892760a51dc2","webidls/enabled/AudioParam.webidl":"7c05f7dc0f835dcd11df71a14acd8f022420bde29b1538608d94a14675e270e8","webidls/enabled/AudioParamMap.webidl":"5de70145121b759dd3c0c0fae816efd16594ec54e0bc5cede32b3ac07c19d98b","webidls/enabled/AudioProcessingEvent.webidl":"d3e745f7638c8612c935ecdea396a79ced2c85db92ab583663c6eef960b1ba26","webidls/enabled/AudioScheduledSourceNode.webidl":"6ffc9eb4d15098b52b6d21f1f3ca681983dbfffc7df3857aca224b5bdb291a01","webidls/enabled/AudioStreamTrack.webidl":"02808973b874aa79c1a48679034388756a3290c12f82e3628582eb31dbcea947","webidls/enabled/AudioTrack.webidl":"3e522e138f545acc1bf8c616e5dc0f2091b5224db6343bc042e2fc282b44b5e6","webidls/enabled/AudioTrackList.webidl":"042090b55f4177512d76af56c0390ad464db5f7a7885c27782c65f712373f147","webidls/enabled/AudioWorklet.webidl":"46c6d9db119e3ad907c4562d72622cb8b50565cb94bd471785e5a5ec5cfc2eb3","webidls/enabled/AudioWorkletGlobalScope.webidl":"9c57f6122faa98f1d4bfa08a6929f20fd4d36283ca4c419a0d77fccbade63e0d","webidls/enabled/AudioWorkletNode.webidl":"152b5807d30d7758536a788df8acc249d86ed0da9ffeb102aa86a6f29a7c0ab5","webidls/enabled/AudioWorkletProcessor.webidl":"d434eeec0f01f4e4bcfffa09265d001465e6c5de8ba04e554c46cf0856580511","webidls/enabled/AutocompleteInfo.webidl":"37c61e3383ed0adbf64c58dcd971526728f38d795e34f4a169df906a94318be1","webidls/enabled/BarProp.webidl":"7090c75a43ded4a69279c21d95cfa93bbd892f28cdf20f07419024625a20d8a5","webidls/enabled/BaseAudioContext.webidl":"9393078e40af06348469ab4d35b2a88346a3514cfb91304aa828baaca3f18d58","webidls/enabled/BaseKeyframeTypes.webidl":"868c8af21d1dc070665bb4094ff9120864b51ea782456b15e19735f884bfbcae","webidls/enabled/BasicCardPayment.webidl":"58f8668af928def7f481264e9b188eb8ec37d06a6d2db7f09982527ed12f4c80","webidls/enabled/BatteryManager.webidl":"6e1a16048d8461a2fe741bd8c5a36a7e0e5568aa23df3cf6d9171c25bc410b51","webidls/enabled/BeforeUnloadEvent.webidl":"ece2550a12535f09976d2162f275549786e297f716d0a4a0602f0abba4b88902","webidls/enabled/BiquadFilterNode.webidl":"9479e916a533e347256cb39802d9a60056fd7e437a376b695e9ccb3f119acab1","webidls/enabled/Blob.webidl":"6e2e9170e0f106f7288d887ab20f6d8c86ac740efec0b449a02b7067aab381ff","webidls/enabled/BlobEvent.webidl":"daa437be043dbb78f3a0ee0f2a6d678dcb1b87f93b30bb1eb5ffcb8e35a91b61","webidls/enabled/BroadcastChannel.webidl":"31d906ead85a2dcb44996cb7a31daf8640f68c9509495de45b57a7c8350576b9","webidls/enabled/BrowserElement.webidl":"b5d93eedc74fe16e914147396f709760bea9fe04509050e7406a9fe4f92b54f9","webidls/enabled/BrowserElementDictionaries.webidl":"b17c3827fe54297b6f219366578a014bcd026696f00c9af69f49281dc11ccf0f","webidls/enabled/BrowserFeedWriter.webidl":"2e1fea89a94d92471a6a80401f87cf3efe0cb573050d8ac3b87f847a204bdcac","webidls/enabled/CDATASection.webidl":"d4b63c03dbbe6a3d4f6e4af3e14623275d1a340f63197e99799752daa3b0bef4","webidls/enabled/CSPDictionaries.webidl":"73e457518fd6b582d84056986c34c1fcd1e30bd3efb107693ea577a6c1311e4c","webidls/enabled/CSPReport.webidl":"78e5cfd587b06eefe1c12bb238f7e563ff738b071fea1dc61811f2aa49e5d4c8","webidls/enabled/CSS.webidl":"fcd69a266cf4afa42918686fa6c3905e100d3818e371bc5024466d45e58ded9c","webidls/enabled/CSSAnimation.webidl":"6b22c711173de295a97e58441ba978bcd5b94d9baa61be942f3057a75c68d43f","webidls/enabled/CSSConditionRule.webidl":"db214bd8a2318883f743e6205d9de8bb0d0e6177c3aacbf5d7d9edd53a5ca9ec","webidls/enabled/CSSCounterStyleRule.webidl":"f6d000ed82d6865cd90c1a9c50f92d7bdf750817ffdaa8f4bf48d620396a1e46","webidls/enabled/CSSFontFaceRule.webidl":"776837af265c277f0903163c82463f17522f886cdefe287eccd65e1ccc76b8e1","webidls/enabled/CSSFontFeatureValuesRule.webidl":"5c41b9f45ab3138d14bda783a71a5cd7757bf322fdc6929c5ecfb7766aba6fbb","webidls/enabled/CSSGroupingRule.webidl":"c666240491d2b7d616e972cd71e0d8fc7cc122c7f0f524ebfcd15aec56100c62","webidls/enabled/CSSImportRule.webidl":"2a86b7d98441e09625f9bbf0c37fb19d156bce2be4a67b38b77ace84499916b5","webidls/enabled/CSSKeyframeRule.webidl":"9be4cfc74e85fc5cd6caae8e0e68c501e230ded614f395b1fb4bbb5ba317a655","webidls/enabled/CSSKeyframesRule.webidl":"8e9c7b2aba2d44d0577bfa2d47aa99b3b6e9c97d02b19e2bc195d6ddf2ada652","webidls/enabled/CSSMediaRule.webidl":"4628bf3fb3a1e962a9620c3a9f0e38c83f13f6004821e7f44acc9426580f675b","webidls/enabled/CSSMozDocumentRule.webidl":"75512e059392c8508d4bc1482b8fb64ada87b98c0a49facb03e989da0516ed6b","webidls/enabled/CSSNamespaceRule.webidl":"ad8bf21e6a4ac78ce0121a19a81ef894be10d4181be073e1953da71de679700d","webidls/enabled/CSSPageRule.webidl":"cc9ab4d1c6f97d271072518308ab8ac304349344f0d7eccf79d588a2fef237fc","webidls/enabled/CSSPseudoElement.webidl":"b5301e7127d6f242e986dbe27a28c3a0fef9cd4c4971a40de57226289345caf0","webidls/enabled/CSSRule.webidl":"0c80b2aa8f585e8c079cdfe7501559a03d39eb29f5c67fb28f6693f84b28beec","webidls/enabled/CSSRuleList.webidl":"c154d7193260fd94e0bc6e59004688acbefa5e6295141800319af6b48445bf11","webidls/enabled/CSSStyleDeclaration.webidl":"9c2deefbce32527759551dcda35a6cbeb5dbcf517ed28539f8a1a88a4735cdd5","webidls/enabled/CSSStyleRule.webidl":"af892d9d4e5bcfacda5eb3149d388bab1c48e315457e7da9e634b15641c3e15c","webidls/enabled/CSSStyleSheet.webidl":"e5874ad91cc61ecb4d02e8487e1f3b6cee8e2c99656be14eab47cc9d12bdbcae","webidls/enabled/CSSSupportsRule.webidl":"4bcb8d7322a6946f1e221f50961032e4f7e0d505e1e4036eedbf6c77ece3bdab","webidls/enabled/CSSTransition.webidl":"4eacd7bef998ef2a65c04ccd4cae986412861aa832b557e267f26eb6147713ff","webidls/enabled/Cache.webidl":"65bca29e1f8820f75e37ba315b6053901db2df2828941eee9ce7c91b68081a12","webidls/enabled/CacheStorage.webidl":"2241ac3b02009ee05e398eef37c2c1c820f51df51ba9e14921cb53a0e008a9ab","webidls/enabled/CanvasCaptureMediaStream.webidl":"46291c9f79a537aedfe851409e3c117956685fe4066f258daecca6113d1ea582","webidls/enabled/CanvasRenderingContext2D.webidl":"5f8077bba3847a1cd4cb70bbdaf95e763a5bc78edd5cdf66b23e7d7bdcb9a94d","webidls/enabled/CaretPosition.webidl":"ba94dd9aaf16cfc0ccd542c95f3660cf077296240b9dfe4334cd6b5ffe671525","webidls/enabled/CaretStateChangedEvent.webidl":"0134ffce3d0182e79c9d6ff8b7c6cdb4a97d9b2ff9a13561366811cfea6a12d8","webidls/enabled/ChannelMergerNode.webidl":"7f11b5fd15a3f6ac3f044e467cac63a26209cbc4ead0457bfbd41a08640e9125","webidls/enabled/ChannelSplitterNode.webidl":"b6c1dc502e54d04774d49dbedc3e272279e58c32fa7dfa54d79c21cedbf47e2c","webidls/enabled/CharacterData.webidl":"9e25440ce2f886539ea3395d0db29f198cd23682e9c3fb2b22c60ceb42c08569","webidls/enabled/CheckerboardReportService.webidl":"e9dfab3838aa24bc97447c7626984ed50ff1c44fd35fe6126472348174a66818","webidls/enabled/ChildNode.webidl":"07ea27a94a9cd723bffee9b97c82dd6b532a5adf6c9f61dedd508896666a885a","webidls/enabled/ChildSHistory.webidl":"33938353c3bdf6325a8a3819701a1cc1ce18806b764a6ce7468413b8b87a4a31","webidls/enabled/Client.webidl":"97a3f557fb24f6ab44f6a79b2dea8a44dd6651a9ec636ebefcb72dfd00b682af","webidls/enabled/Clients.webidl":"8abf090639c031cfed787bfeb706764c1411bb0694f3e963a7a318d1a07e2f4a","webidls/enabled/CloseEvent.webidl":"4be59406394ce09bb52df54fecc0e4d8b57b9a4dabc4c879932de6f18a77c9ff","webidls/enabled/Comment.webidl":"247cdf5db093d5c6cd65026fd01e89bff9238219bb396b9bbacc0414000ffd4b","webidls/enabled/CompositionEvent.webidl":"ab086646c17da2b5572ae3adbbd58a7c5753f2db4ee91b2ddb227744b647b9fb","webidls/enabled/Console.webidl":"b16ced12e357ba51a89b034984bc8c71a1e29b5e28dd04cef28b01069539040f","webidls/enabled/ConstantSourceNode.webidl":"b73cd0b4b99f807884e414d02f23cd463f6ce18930c7a7d53404166b5d1483d1","webidls/enabled/ConvolverNode.webidl":"f3568dc792134493c1eeb3695aff0a050583432a62fcbebd6f98f4c965167a60","webidls/enabled/Coordinates.webidl":"fbd19a84b321fbc47e36920e0b928337425663454bf18a008e2614eadcfbca0d","webidls/enabled/CreateOfferRequest.webidl":"3f2c597dab891a9ab706877d247d1813cf08b186b6466a607c98df3b9ed3627b","webidls/enabled/CredentialManagement.webidl":"4afb5893119ee632e570fa2c78cfb9fc4c31912fb6ad68ec3957c6a3a9eb3fa3","webidls/enabled/Crypto.webidl":"3d51d82fc5601a2572def379ba6e7813e16528c6810d624f84bcfdc0a011624d","webidls/enabled/CustomElementRegistry.webidl":"a581b8015f01ec5b6481a081719fb43627fa7f26cf11a155345fb57d8c9d1612","webidls/enabled/CustomEvent.webidl":"b618f7e566aad4468e1813a8c15392d4e8d3cf98f83dba2314ff115c50a83627","webidls/enabled/DOMError.webidl":"cf1284821ac423e6e12a8364f3780070de8b90e5397001428c9ce0bcb04d92b0","webidls/enabled/DOMException.webidl":"de495751b559812848269705dadf5b47808b5fc26a6001beff46d26f6501a27d","webidls/enabled/DOMHighResTimeStamp.webidl":"a625f3d3afebacf6d9dde7bcc9900e31c22269b280069fb3369be50f651c02cc","webidls/enabled/DOMImplementation.webidl":"c9e3c075f4f675d77f02a1f2411f5e077f5ac73f9dd4054a2186e8c21783ede1","webidls/enabled/DOMMatrix.webidl":"b7d164b05bf953410fd7336cc31acd3134c286667e750239fa8c54bc9b47a654","webidls/enabled/DOMParser.webidl":"1466c13c06577c97f34d2742bbb3bbae3e08772133c89635347840f7f0dd7115","webidls/enabled/DOMPoint.webidl":"80425c8b3e478ee89d1cb424dc044bd8f0f50b8f4e25978f06c1a9afcc2836a7","webidls/enabled/DOMQuad.webidl":"a5f9c69d63c20bb4997ef0c3606d143bb99133b959ecabb06cd29bdfa73d33be","webidls/enabled/DOMRect.webidl":"9d53d4ea40b863cef890dff5a64d88a9d82476f513be2968b444abb026a0c12a","webidls/enabled/DOMRectList.webidl":"014d3aa34f758ec7f0fc9d22560c5b63a910d0d81e03562b7e42704d244cd02e","webidls/enabled/DOMRequest.webidl":"b540e91e8fd42e712178a5748c3e050a66e0b44e61e0a6c8819466fe557c0a80","webidls/enabled/DOMStringList.webidl":"1a8808f5ad7dfc317c8be2aee38f371a460c3df4438f5b43f1ffc7fd53569df4","webidls/enabled/DOMStringMap.webidl":"a7302611b98978fd5131e60fc6ef145dca824e0aedc9aee4ca7f919b2d3effe8","webidls/enabled/DOMTokenList.webidl":"ca5e72b3bf410709bc6aad5f37afb83ef589e142d2868b699a431125598b2591","webidls/enabled/DataTransfer.webidl":"489090d9843e2b13bb55a837155590a51077821fc4ab39a2b45a7cacefab0f3c","webidls/enabled/DataTransferItem.webidl":"46a91a059e83273dbd34f00786a1990d2abb5ff69853c068769e79abc13881ea","webidls/enabled/DataTransferItemList.webidl":"121799cb890f4446398d3ae1e932e5ae642c59c167b1905e05d33c2f36f7079d","webidls/enabled/DecoderDoctorNotification.webidl":"7433c819f26e6d87b60cbfe3e47b4a01d8459daf2ffad069c4d80942436bfe44","webidls/enabled/DedicatedWorkerGlobalScope.webidl":"529b8ec9aded8849361004a77ebe39421035c13bf3fc6ed22a24fcc9ea0da538","webidls/enabled/DelayNode.webidl":"8149532f064510f47f20103ce98aa71324dcf026aa784a180d773c73153a8d7a","webidls/enabled/DeviceLightEvent.webidl":"d37471f88312940800b65663daa968f11c6c3aab73fae19bd9c55f30ca160247","webidls/enabled/DeviceMotionEvent.webidl":"643de66eb3045c9af443bca568786643a83615ef084907932f5a76d998d95700","webidls/enabled/DeviceOrientationEvent.webidl":"2e88d1957715faf693515ec05cf91e9fb7c8b30efa6159931bc9113339688cb9","webidls/enabled/DeviceProximityEvent.webidl":"9dd73c557174f955fbe1aa07eca784900015fd06da463b027320f483a9ca5406","webidls/enabled/Directory.webidl":"b10754b626fb2e10d08b96faa5cc518fc857375b7ad6d46bbf621ca07c90a067","webidls/enabled/Document.webidl":"6916e80d6a0f8496e19112d253d2a24800501039d6ac7a9f73b487083a9262b0","webidls/enabled/DocumentFragment.webidl":"a414150e4f5b0b9d6dbdd785fc7c478c03b7e8695016854f81b96d2a66d22eaa","webidls/enabled/DocumentOrShadowRoot.webidl":"b185c3fdde1cbecbf02c5f35306eb8dd5401f02ecaa10db19031cd5202be9eab","webidls/enabled/DocumentTimeline.webidl":"d58a5f2db91c2254b52a5ac93209c255bf51d4902fc89b317f44b0c177ba8e0f","webidls/enabled/DocumentType.webidl":"02cd492b434c876d14176936af762de6e4b8597e899e11ca2781e911f739a478","webidls/enabled/DragEvent.webidl":"1f12cd956166fd17ac66b8a45797acb7eb65deac8294ed220c4c156eb680fc44","webidls/enabled/DynamicsCompressorNode.webidl":"6e7db468e68d848fb6a2b324aaa91d380d9527d2f16389f551fdbf5c014e463a","webidls/enabled/Element.webidl":"09dc7079beae9d3fac34e2f544110c95a1d95d481560ba646ef88965e1c40586","webidls/enabled/ErrorEvent.webidl":"54c7f54480c4b0b6d3e0ec8acb0706e3c39d2a8243450e9635465ca49f1d7dce","webidls/enabled/Event.webidl":"db7e44c631f87f4520ccde6627945725fc391403af7366ec4713ccc66edf7493","webidls/enabled/EventHandler.webidl":"76648d023242168a438b6e1be7251ce9aaf5a7ac97416748ca62d930de814365","webidls/enabled/EventListener.webidl":"d9984669abda9266281274e9fe084904c54b1d71c15033b36c69ff93b560da36","webidls/enabled/EventSource.webidl":"e277f35be84f3a0957c624ee422e43aec3b17a24644714e6de24be8c5bc4fa4c","webidls/enabled/EventTarget.webidl":"5d303c1b4ba45061f1de06558dcdb7c9b3cfc54c539e0853ff3038111009cfdd","webidls/enabled/ExtendableEvent.webidl":"15354aa78f8b996853c21815e48ddb39de5bccd19e11ee234af9f85f182d2b3e","webidls/enabled/ExtendableMessageEvent.webidl":"4b156c28fe958a210b4c36c70b10608038dc01d6e4e2b8538fdd838b49204fe0","webidls/enabled/External.webidl":"6274b07951a3ee892b51266e89ce1673a8587b7b28ed592d2100c78f2edb41e7","webidls/enabled/FakePluginTagInit.webidl":"650764c6f953960228adb980789bea1b27063e8425f166ed95be6f3e2a6cd555","webidls/enabled/Fetch.webidl":"479ee79d19b374436c7e64a18392ea4674ce6bf9c0f70fa04c33686cbf4221d8","webidls/enabled/FetchEvent.webidl":"44cb01a7e650948abcb9ad4dab22aa2fc47aa94884cf1ef5dff95fe90bb99804","webidls/enabled/FetchObserver.webidl":"98e0498ec43f79811b50e5d999046fb1d7ac8ba7b2e3d9d428ad45b8670b0d28","webidls/enabled/File.webidl":"9f4d4364b8e1b5dd818f057859e2a78e4ddd37cfac5c4037bb36561372da01db","webidls/enabled/FileList.webidl":"25ea98ff242e523322790af498b0eb4244d6a043ad40e7021e84b9bcc071f713","webidls/enabled/FileReader.webidl":"dae5c206d56950ba85c7a88eb865320875b119607880f46c076cffd4f5055097","webidls/enabled/FileReaderSync.webidl":"b2e20aad23a052460eb9477134fc470cd584302fd008be9e63e8199e845fbba7","webidls/enabled/FileSystem.webidl":"6c35399931e6ee50ce7eb04cd45ca2b573c4fa55252bed3864117b1d887bef24","webidls/enabled/FileSystemDirectoryEntry.webidl":"67b81667e6fd85b7f2a4663676f5d06c5dbcfc5abcad0210ada7d23ecf10535f","webidls/enabled/FileSystemDirectoryReader.webidl":"f578c5b8d435d84e0dfe0a4cf7d2fa47ea449238b2f08c6f9fb5a615935b4394","webidls/enabled/FileSystemEntry.webidl":"deb905ac99bd1c411cc7b847361f8f541e6c84b52f6778e60dcac0a971f64f0e","webidls/enabled/FileSystemFileEntry.webidl":"72e5b5024aed480345b8a5a44d7a9491722661f7d613255c7b132ca8121c47ee","webidls/enabled/Flex.webidl":"66353797d8a358336c0ccec47abce7e27af7cac091be33aa070191708adeb8c2","webidls/enabled/FocusEvent.webidl":"785632d65c2c65a83531f275a13f78a3313ed5143e1b27d894b7c7cb92f0034b","webidls/enabled/FontFace.webidl":"373443d52e08d3e9846b3d32f235c3d4906e6a629dd2b555f1736849d744dab4","webidls/enabled/FontFaceSet.webidl":"60792d6d3a03a87ec7c23828fa89285e183bd1f4c077389b8bcdb9bb84dde47a","webidls/enabled/FontFaceSetLoadEvent.webidl":"77c31560bef55a814579eac3a92adb39bd9f3a1c9994b35c95923b30dfb2e772","webidls/enabled/FontFaceSource.webidl":"4bd55612ff913320383541643cecfcd26049a84ec0d0a138273c2ae83090e145","webidls/enabled/FormData.webidl":"06714409d1c538dd1e4d36a6d37a1b2423a7bf845078930c79da6507f7e7904a","webidls/enabled/FrameLoader.webidl":"2118244c44c142e9da53f153b0216e7289d9ece4b6f3f22ca547dde303ace25c","webidls/enabled/Function.webidl":"23529f87dc7d752ef38e07eaa16743e22050c9860a27dfbe8527b26391e79e16","webidls/enabled/FuzzingFunctions.webidl":"0220b76387612398fd28a0a168c375735b786276971efd7f5249920bcede6e66","webidls/enabled/GainNode.webidl":"bd7b7367d39fdf384204790ba3bd3bb711e00b50be70fa24ac550ac973e37152","webidls/enabled/Gamepad.webidl":"97974dccdfb8842adcbe266f15a777631e2210708edf2f52c7ead60aacf9b548","webidls/enabled/GamepadAxisMoveEvent.webidl":"ea86a6aba28574d9c92c2a5fab7a353c52990819a3c879c2a46d2b0852358a3d","webidls/enabled/GamepadButtonEvent.webidl":"4fc269cc3740e74cf0768e1de19b8b706b110769d3dc67a221bdfc178535ebe8","webidls/enabled/GamepadEvent.webidl":"f696441506b360ffc8daffb102f4ed6f70d8bdabbf34f81639e0008c16b96d50","webidls/enabled/GamepadHapticActuator.webidl":"7c76aa852470fa4e0be4a296b0f40ae30625aebf563ced44c97b47c50f6f84b2","webidls/enabled/GamepadPose.webidl":"e287374f54910af89a3adea7b03e40e2d47543226c4acf87df4432a120648c70","webidls/enabled/GamepadServiceTest.webidl":"f86a0e6bcd1c6da5fc224c2563ba191d7ce295b5c48b5b6591a032770189908b","webidls/enabled/Geolocation.webidl":"4fba86d71ebd9e6e822950ea951112408c3aaa4ad11d23116e1eceadb9d31e55","webidls/enabled/GeometryUtils.webidl":"8b3fb64f1fe7bf50a85c580fc1265b4234c4418bc2021cf69eb3c9b3baa700ff","webidls/enabled/GetUserMediaRequest.webidl":"eaa284f01a9ff6104ac39c5c81773d2185e3b580fa106ce7011ca8285aa7c46d","webidls/enabled/Grid.webidl":"df70b1c6d1115e4ee7607e321c0e8db5f4d0c2dbfc1a2bfb9f31e087a7979e0d","webidls/enabled/GroupedHistoryEvent.webidl":"03a70bbdd88f23166189b94332d5af19c3ffe92a64806d7dc7e561ce0a68eea4","webidls/enabled/HTMLAllCollection.webidl":"911e1f71ef504f2ac767746f6824dcb2657a7812031d6c96d654039211fd821d","webidls/enabled/HTMLAnchorElement.webidl":"b47247a861732603ba42d30f23cebf6b9e4c181be00147188df1cd1d09e8c59e","webidls/enabled/HTMLAreaElement.webidl":"532631e8f1560c34603a324800d406dc3142f264b04fd8d603fca0ba3ef07bc3","webidls/enabled/HTMLAudioElement.webidl":"d345663eab59d6f1b4cd89c06815a759ee7dd56ba599b5acf8691b71412b09b0","webidls/enabled/HTMLBRElement.webidl":"0d51f01d47710a439ea5a6990b8ac957a911cfaeda13418bf833c8f3a2950419","webidls/enabled/HTMLBaseElement.webidl":"dac35d6efe54834ec0f603966f32884edfa8e19e84147a0beb9e529e9c5cb962","webidls/enabled/HTMLBodyElement.webidl":"91040e98085638f1d3b008af5095e9aa1cfec26a198d277c9cc45a51db3de22b","webidls/enabled/HTMLButtonElement.webidl":"675fda12c739ef8bb73509ad4d2eea45ddce77ea56b2c307596f4436de5822b3","webidls/enabled/HTMLCanvasElement.webidl":"e3fccbb3328169f1a0758a04d2bcc1118a408e42de9e5df888d8f035419a47ff","webidls/enabled/HTMLCollection.webidl":"9de949e45fa8ed104d65cde5f6fd3d14fbce486f6929d250ad0df4f7b90761e8","webidls/enabled/HTMLDListElement.webidl":"b1d9a3246ae855bc27c772d8bdb78b6eb29d53ea578bce227ef07759d03ba01f","webidls/enabled/HTMLDataElement.webidl":"0a634c145a85789033a38a8a8bbbd2a739d7beb177965d65aaa457cfa2170e39","webidls/enabled/HTMLDataListElement.webidl":"6dbd134a023f91992c8b5c3b0010e96b5ec832bdc9815e9f7a815319fb4d1338","webidls/enabled/HTMLDetailsElement.webidl":"a7594e9a10a37c9428b5c9b12868cc44c1608cdba609c69ae9bfc6a6aba6befb","webidls/enabled/HTMLDialogElement.webidl":"3c79889eca00e5b0ee13847a45021c002e70b03fb6263953cec90ef79736d462","webidls/enabled/HTMLDirectoryElement.webidl":"514908cd8fe9f661ac53aad204f35709601a3a07d39123b7f59e18bc22426029","webidls/enabled/HTMLDivElement.webidl":"52950712bff7f588c8068ae22cb6361a7d7dd12293e930aaebf2de82ebcf48c5","webidls/enabled/HTMLDocument.webidl":"d6837c86a9b26838cbc677377dd251b89464fb7e38e45fc418196446e2acabfc","webidls/enabled/HTMLElement.webidl":"5996532a5317cd9c0f6b32b7f56a244bdf631eb180ab81b436f8e865740fc9b4","webidls/enabled/HTMLEmbedElement.webidl":"f3e0f590bb3aa783a654e6c330ff0aefbf58c4f0282e9b292b3952850a3886bb","webidls/enabled/HTMLFieldSetElement.webidl":"28b971856338d6481da21f39e0610cb12a9f84f6efa48a8523000ee7315eb53a","webidls/enabled/HTMLFontElement.webidl":"53245e2002f2be50a73d4ed57b6990f71c83aa9602e7427d39735b161df9edb9","webidls/enabled/HTMLFormControlsCollection.webidl":"888734b0d8fcd38406791ba9f8e64358f36ee7953b3291fcf0ec98de70d25fc3","webidls/enabled/HTMLFormElement.webidl":"17e3ef7f89aaae92c1abeae1363f8678e09c0ba482414fac1b9936c9b9cfdf97","webidls/enabled/HTMLFrameElement.webidl":"27ca6eb4eb8c1d8c970a704b3a5b9d833f5a9306ab38b3b3d0f260a5910880fe","webidls/enabled/HTMLFrameSetElement.webidl":"930323ebfd8d5a1cc5d51e44c7430f130f3cd22dabe06d48b0c98bdd0ac86dbb","webidls/enabled/HTMLHRElement.webidl":"ae5c90df7ced4b6b53d3894f6311d2ddfc319bb82cdbb02d31a46cbdf3b73ac7","webidls/enabled/HTMLHeadElement.webidl":"988d03275a9869bf7e8fa43ca19af6633e8620b6fdc953686eca4aa75c641158","webidls/enabled/HTMLHeadingElement.webidl":"5eaf33184107dadcf275e475ad4514e0d8a284b883c5d041400126cfdb612bd3","webidls/enabled/HTMLHtmlElement.webidl":"20e7b4c634ab5707801b1409d09e40a73d060b0037ab5ebf82f8222c98d1d942","webidls/enabled/HTMLHyperlinkElementUtils.webidl":"a692047eae18831f97049dc6675df4f1a5c5f8074c7f65b305958ff00a342f11","webidls/enabled/HTMLIFrameElement.webidl":"bfb7f7293e7a8490321e0bb72e41fab95bf72cc57172b49363ae0c6245f1716d","webidls/enabled/HTMLImageElement.webidl":"cdb0f3161a074a2995c4105b3a4ade9a90ca7b99a0de467dc928d0dfa99ae277","webidls/enabled/HTMLInputElement.webidl":"108c6788321db701bfaebe207609f0eb857b4c3428ae254647048fd46b0a44f4","webidls/enabled/HTMLLIElement.webidl":"a69f089ccf8d4c9b7404bbac1716d7d6c9c52a44e8cee19fc524797fc8c6c225","webidls/enabled/HTMLLabelElement.webidl":"20b224fabbecb8f7e8baca8b02d07e2a5d40b9d9ed23b033eb4f970deecf0d0d","webidls/enabled/HTMLLegendElement.webidl":"5cfd37822114dc8632b6fbd945b22e05f0917390d0dedb9c4f25ac9f6accf459","webidls/enabled/HTMLLinkElement.webidl":"bf1ae8f6e0ae80150c086a4f8bd21527fe5c7612dd156a5287f7ff7c473e20c4","webidls/enabled/HTMLMapElement.webidl":"fc6bdad42f4227b6568d616bd989ce6ace9218052f08e96fd5e8e10d907a2cf0","webidls/enabled/HTMLMediaElement.webidl":"25e8614ad3813f8ce44c9803dbdd8685f16578bd4ee9fdfe941968cb3caa2c04","webidls/enabled/HTMLMenuElement.webidl":"6c6adaacef6052c67bf00aa25fef284e6c8c2ea76281fa46a2912eadec8286f1","webidls/enabled/HTMLMenuItemElement.webidl":"92997704b744587112e009c0d4cba9fbe50656692a75341ee7a0c999c26a8fbd","webidls/enabled/HTMLMetaElement.webidl":"5e552df9ff76ad54f7984608dc7967a3a138c7c0d84ebdd8157a7ed6713b3023","webidls/enabled/HTMLMeterElement.webidl":"21a8832878f43f57b716d5fe0e99a617492602b971f7fdc23ac42f597968f0ba","webidls/enabled/HTMLModElement.webidl":"63beaf5e6d77e63739acbd6b58147af7d84e665f4a5853445ae160de4cf21b30","webidls/enabled/HTMLOListElement.webidl":"07bb6b740fa7f619f621e8693e07932c6bb67747e2a5556685dcf3ccbafe7a04","webidls/enabled/HTMLObjectElement.webidl":"4c4edfbcbb867e4e6a5945f213c5a246e1ac28fec4f61a59f40025aeaf0570d2","webidls/enabled/HTMLOptGroupElement.webidl":"bd91a7cf0eaa65f217e7cf47e54d11a4315245209a52ba846d770392921ed15b","webidls/enabled/HTMLOptionElement.webidl":"0d6dcc38b9a6c799aaf5937725c3ace50a6629e05fc4621d8caa901a4e7536d8","webidls/enabled/HTMLOptionsCollection.webidl":"902bdf9c4e15f30c3be3745842fdfe4e4e0739b7650eb7ee2c6781200825ceac","webidls/enabled/HTMLOutputElement.webidl":"863c2a5fae4e3ddeffd325ab6e49a11479a89264aeaf9b945f72595e611304e4","webidls/enabled/HTMLParagraphElement.webidl":"259b49192386f7448a548ef630403d576e0489d43da92b1fce891856da83258c","webidls/enabled/HTMLParamElement.webidl":"cb4f844f9698cfff48b02cdd7fe2c2820dc7c0f5b5e6ec24c27cddad25810e63","webidls/enabled/HTMLPictureElement.webidl":"b0bcc2f70ac7ea0835669bfc7f51676518f1cbb68f388f3ea8ec4e4f51df4974","webidls/enabled/HTMLPreElement.webidl":"1e6619dd4b9a111e9c9021e5b25be43cda52ca97e2d07e3c4f695cdd557f4f02","webidls/enabled/HTMLProgressElement.webidl":"3dc186323a3ab7837afd1feb9b1a0bf647677dea57d0af691381ee5e706f6cd7","webidls/enabled/HTMLQuoteElement.webidl":"6e2da7bdc4cccdfe1e9a4a0eac8eec04366bf950edc279c1f0adaf15b85b5637","webidls/enabled/HTMLScriptElement.webidl":"2ccb5d8577c1f59af4162b00289c4bc492faa97ed24bf1156c69a39a2ebd4a0d","webidls/enabled/HTMLSelectElement.webidl":"88b81485179669a3cab43e1b70b695d7428a219b8d896c3915ee79d1871af482","webidls/enabled/HTMLSlotElement.webidl":"0596089d5a147ac30025ec605b3a3153cd23d6ce3f5bc44747a4d2841119ec96","webidls/enabled/HTMLSourceElement.webidl":"94aa3d4813b51191598cb03db140823663cff47ae30ff42a266fdf7451788233","webidls/enabled/HTMLSpanElement.webidl":"6423fbaca98b5ce2ab38321ca5f1f172839ee46b9b2ae0674c4b6a27ead11d19","webidls/enabled/HTMLStyleElement.webidl":"fbacc26b670030072a883935f76e3100babc35d6f941fa1f8c7f5818f33e0127","webidls/enabled/HTMLTableCaptionElement.webidl":"958c408d02849c9cd19f31a9c5e072f5d3430b966bc271d80162292b3651608a","webidls/enabled/HTMLTableCellElement.webidl":"c84cf7b3a19d63fa1bdece8b8bdee3ed9c406466612170bcff633a769c7db83e","webidls/enabled/HTMLTableColElement.webidl":"ed7925a256b258e1c12cc23906513a8873f0a250964285f46ce7f7562273263f","webidls/enabled/HTMLTableElement.webidl":"5cccd80201ee85f478c7e13a81d6dbb0540999bca34babed4c624348394e2699","webidls/enabled/HTMLTableRowElement.webidl":"fc316de4f53eee5972d4be2833ebd846e02468e93488ed8256b8d25514ed0b0c","webidls/enabled/HTMLTableSectionElement.webidl":"96a78ae9c92e7a846bcf3617be572cf653fbe27b26b91c5072ce37839cdcf346","webidls/enabled/HTMLTemplateElement.webidl":"856f72fe1152031a0723dcc0db42981fd178535110e5b3464fe6c6961abac80a","webidls/enabled/HTMLTextAreaElement.webidl":"adee1b61033e6b2b04af8f2ca560f08b7c65f0d8436de802d24b9d325f20704a","webidls/enabled/HTMLTimeElement.webidl":"e3600955169b12d39e2c28350596c6dad1cfcad1e6c7aab7a796443851135f9a","webidls/enabled/HTMLTitleElement.webidl":"2a19cb43661fc288db244f76239a0615e8708442f14f19564d885f2171b39e2d","webidls/enabled/HTMLTrackElement.webidl":"aae1b41c17c99812bee6dd027c1cdaa7c9837c25bf6aa7f6feec249132c097a1","webidls/enabled/HTMLUListElement.webidl":"386d32f21bad1d28bc7dfe52eb3c145e0d1af972e0e15ff1f045898b323a3835","webidls/enabled/HTMLVideoElement.webidl":"74752f0439de22022f063ebe1af45e87873745e879d8a66d11731444c81f9580","webidls/enabled/HashChangeEvent.webidl":"763423e003a16e9dc5b533fbee8feeab272fc6bf26b5919317d4af84d7b01d32","webidls/enabled/Headers.webidl":"e926b6f5b1c4ca759e273a453c8e3febcf197c59c3df58cfcf75cc15da0a4bdf","webidls/enabled/HiddenPluginEvent.webidl":"3e0963c7234e801be89c767237b587d2de0411347c9ac3a12aa83614b2436108","webidls/enabled/History.webidl":"bf089265b512c70b13469a1f15dfb2c133379d54a2e400d3a1b2f60efc6a7097","webidls/enabled/IDBCursor.webidl":"971f682413e154b343218fd706dc491b60207d04ec9ca0f91946614d29212785","webidls/enabled/IDBDatabase.webidl":"134cd2ab199481583c825362625c5e18696975831dee04ca81af45db7ab5bc53","webidls/enabled/IDBFactory.webidl":"d083eb421265c4244c718944a9606364f29cdee014b7065f39978e96f172d2d0","webidls/enabled/IDBFileHandle.webidl":"e9fbfb9d0335606f31f180b48dd17fba9ccb9e2589ffb057ca7b03855c1399b7","webidls/enabled/IDBFileRequest.webidl":"9e353c0027b43bdfa10267c5c7394faca6b6fb5b5c543e83f3f716e50eb3c5d4","webidls/enabled/IDBIndex.webidl":"2e4f1000f4d5b2af7094bc981eca2131a020ef5c01e6166a71268a01cebf43f5","webidls/enabled/IDBKeyRange.webidl":"2fcb022d462bcad22be8c26326e625a960afd33971a0d059405d33cb6fc1f13d","webidls/enabled/IDBMutableFile.webidl":"24384645ce4497d5c05c87254a9374bc8eb0150d989e6628a0aeeb5d7112d595","webidls/enabled/IDBObjectStore.webidl":"184af7c1767edb9ebc6be00f38cc9e2ba1823920d1b83cbdd29039aff1522328","webidls/enabled/IDBOpenDBRequest.webidl":"e276f9e0886c0db0729c42e6a505083d744391c750d5356d1bb923ce88c3b71e","webidls/enabled/IDBRequest.webidl":"61648cf7a5983d8d764e020836e17e076d28f0c61831aae3cdd804009613717e","webidls/enabled/IDBTransaction.webidl":"5f6e0156dbff80adde62a68b875f54d2566b79f55e7ee0cf441a71ae9bae369a","webidls/enabled/IDBVersionChangeEvent.webidl":"6dc880e91df87e3cc885c8a1c9f2fc0f3936701f0d9276e2d4636282c645c0b0","webidls/enabled/IIRFilterNode.webidl":"80a0fdeea73945603c5cd6d1f85d3c9596b4e8be23d72db79234a441c537b4b4","webidls/enabled/IdleDeadline.webidl":"fc18e1e454adc488d4fbcf6ab6716c872001402d87839902801120a248ca5949","webidls/enabled/ImageBitmap.webidl":"27ca0c5c9f8bd68fabb836c3be7488174086b55b790ae59dd37880c3e3fd7d79","webidls/enabled/ImageBitmapRenderingContext.webidl":"5028eb8183be0b3209613487e567c894e6657afaee287cd0601da13d23d0b8af","webidls/enabled/ImageCaptureErrorEvent.webidl":"d6573af4e4dfb5e46fb00d7c1ab8e9309a0e589a4afccce76cedec5953831278","webidls/enabled/ImageData.webidl":"f9af056bde477d5e0f33b4a15de4a90e5c14a3b47a77d084ef1c992482f8d87f","webidls/enabled/ImageDocument.webidl":"02d381ad74b8b79371c50799b0c08995b35f77e9fdad674202902a9bd2227879","webidls/enabled/InputEvent.webidl":"2e7cd9ef0fba43a89ed17fed1c0826b43a779f4413a1d3bae8b56583a0449cf3","webidls/enabled/InstallTrigger.webidl":"05f9fde3b20b0845e80851ba848d0e5ce5ddc9f9b49ad9d00d44243c0c6bfaae","webidls/enabled/IntersectionObserver.webidl":"df9812da4b5360065bd25d0596c8a4accec582863497d90803aca1dced443b4e","webidls/enabled/IntlUtils.webidl":"57f74df6b5666e29cb8c065bca9a4ba1bce721d5b8ffe551d7bb1d02f0f892ed","webidls/enabled/IterableIterator.webidl":"baccf4e84a6b0db6939d0513bda2ee3d5c9368b5c3c81abbf2eac36232ee8891","webidls/enabled/KeyAlgorithm.webidl":"0e04cffe31f96f7e2807bb2dfa1e6bf02462815d693c8a3aeae949ed9e21a7d4","webidls/enabled/KeyEvent.webidl":"696a44a23b0e626f8a0f1501463249ff63f920bb2f565548258c3fcf9d1b9067","webidls/enabled/KeyIdsInitData.webidl":"74b45f0eb628afb2b9c6f8cae2b183199dafdccf9b87744dc1b1bbbf9114f6aa","webidls/enabled/KeyboardEvent.webidl":"634a8d06d479ea1ce5fbce9a5591876aed8ecb315849735d7e0305fddfabdc26","webidls/enabled/KeyframeAnimationOptions.webidl":"68d0e95aab8b82f4b2bbc78211d7625b836d412f9cffa1f19c0b89b7cd14e589","webidls/enabled/KeyframeEffect.webidl":"c6c6fff71d4a344b4a035c980f66e91339fd721723037b5205a50684aaee8a2e","webidls/enabled/L10nUtils.webidl":"85fe322b17bb6a46d2dd889a631b8bc82799beafe283611f28ac0a8355fdd2b8","webidls/enabled/LinkStyle.webidl":"28e1365b101a6d7b254f4f12e8a355df5fc7aff6bbedf0c4d9e87565425989a1","webidls/enabled/ListBoxObject.webidl":"fe5e39d16b8e781b53d8eeaf5fc5f59511a137180fe574d4441cb2524361769f","webidls/enabled/LocalMediaStream.webidl":"006e7d70d312b75c33c75fc90a342811c9ca4d745232814a24d61d304a8b2e7b","webidls/enabled/Location.webidl":"b5a280c463d23a070071b3063df584145b507e513f1b0d2974915cbac0abdecd","webidls/enabled/MIDIAccess.webidl":"58f6e706e668360ff02f794fffc8f81dea879f68f59ae9d2d13f18d3c5916f80","webidls/enabled/MIDIConnectionEvent.webidl":"8775a52412a3904f46deb8635f14e18701c36fdf9084f906f573d22a7de3486d","webidls/enabled/MIDIInput.webidl":"11a4eeccc4ab74501291d25d7d5068dcb689721f93ebefe40653d3a95fa6a75a","webidls/enabled/MIDIInputMap.webidl":"6a356c20cc9bcbf679ea7e8d2deab519fce8e6b7390f309da7bf425b18670231","webidls/enabled/MIDIMessageEvent.webidl":"fe15f6b56f1a102f04e13f2ea544f5d37a805f8e01b305d1caee76ed40fc8c0f","webidls/enabled/MIDIOptions.webidl":"3ef87d615386ba5cb1ce19b13fc430488476246a8970bc0218795139ef3b039c","webidls/enabled/MIDIOutput.webidl":"7a883cc5a3438a73aa524682fdc1a2aeb122ac57bd6df775cf4264851cbcf208","webidls/enabled/MIDIOutputMap.webidl":"f68fa016132b90ad2a18bc4fc024a24568b7ed85379238698eae3d38aac01b3a","webidls/enabled/MIDIPort.webidl":"3fdda9ee45900012dcb6886cf5ca7465be826dba05305d4a9d2ba254e610e76b","webidls/enabled/MediaCapabilities.webidl":"26019e7e198c2b17df984c4df5e78836ddd56c9e1eafd7e09f7f52e6db478d32","webidls/enabled/MediaDeviceInfo.webidl":"39e9ae3834c61db85ae2f3ba034a7a69e721dbef396823615cdf79f410cbef9f","webidls/enabled/MediaDevices.webidl":"2b9b65d1186f18077012f66eafc79d4e9d6c1a478213d0a3053720b377ec07a0","webidls/enabled/MediaElementAudioSourceNode.webidl":"8d1e8f589128a98d46ead4393ec012a44c1b8848f72ede824afca1320040d825","webidls/enabled/MediaEncryptedEvent.webidl":"0370afe3a99060853cf2d3850afb494f7f0414eff53788c1b6e92c0b60338b6c","webidls/enabled/MediaError.webidl":"f7040be08c475be0176a8eff443f1cde81d26a9b76ed71b7a8485e7e2d424448","webidls/enabled/MediaKeyError.webidl":"2ee05d150360dc18e1da2a8143a7a883a73292c7498c18496703a522b7310d96","webidls/enabled/MediaKeyMessageEvent.webidl":"2663944d4bca18a5a26f5d1ed63ae22b6180eb042344b86441f319bf8f02ace2","webidls/enabled/MediaKeySession.webidl":"82e5bae1694bd530c3228da3e742c88b7c1d40eb2a77edf2d19ade6a388c5628","webidls/enabled/MediaKeyStatusMap.webidl":"4f8ee56ebb7e6bb9ecce7755d2972b2c4cd58d448f9201b92420e3ce3ba7036d","webidls/enabled/MediaKeySystemAccess.webidl":"001bc4ad92c0bf64434d7bca21a51de2eaee9d64c412fc7c9300d5d22ac6de14","webidls/enabled/MediaKeys.webidl":"eba4547a687f049131921d5d6eb950395817184de2ebf8f443ed49c3476daae9","webidls/enabled/MediaKeysRequestStatus.webidl":"ea6e75921cfe8326e7363314e8f26d54af9a0e95979187e91fb946d0be063bf9","webidls/enabled/MediaList.webidl":"cafc6b4bd71eedaad33fa5fae41e53edecd182a716d6f63db591e7f362e42a26","webidls/enabled/MediaQueryList.webidl":"66a1aaf73a788ecaff60fe1782aab47e5e4de12e6e2eceaa306506c39d5ddfa9","webidls/enabled/MediaQueryListEvent.webidl":"a7b021abf05e8d95222c0125331af9a78eee1f4a93d68bd81f9157925a29725d","webidls/enabled/MediaRecorder.webidl":"025f38f44f27c1502a4aaa293700232c68c6c55df21347c1decb74e2bc595209","webidls/enabled/MediaRecorderErrorEvent.webidl":"8b92015f20fb6f7713a86b78775a1c1409b836101c9528ad30f58ffe9d441039","webidls/enabled/MediaSource.webidl":"aa7bbedf0cad79e527df3e93629ca1712fdf8b4f5c59312bee6f648dfba02b5d","webidls/enabled/MediaStream.webidl":"ee8f14692caeb5ecd685f9271161d556c494aa6f20b3abeeaec03a863fad2b1f","webidls/enabled/MediaStreamAudioDestinationNode.webidl":"97ac421a9aa230abdde89655bb11a3191b5868aa91c7f1ddb543106923ec7f65","webidls/enabled/MediaStreamAudioSourceNode.webidl":"08ffe8661570e05d5f14a1a98f667c75490b71a30e9aa41f0c2fb6d1747d140e","webidls/enabled/MediaStreamError.webidl":"8d5b8ca56dc1a2de36920227cc760eaba720cfc475c8b2a54477002eaf5bc1b1","webidls/enabled/MediaStreamEvent.webidl":"c88d8691cb94213bd1f7e37c1133a3665d6068991ccd6415fee41cbe6ac2d8e6","webidls/enabled/MediaStreamTrack.webidl":"15ce546469c519d9dce742700cb6df39e8bb858891ac11d664e3e2a82f20b8a4","webidls/enabled/MediaStreamTrackEvent.webidl":"6f33b799bb7e2fb3488614e3c90ff880c3b826be1a218fdf138b7ed6b99c98ce","webidls/enabled/MediaTrackConstraintSet.webidl":"da63d3cdc6f7933857d9bba7e264479f290ba03f998582812e402aab27878bc9","webidls/enabled/MediaTrackSettings.webidl":"988264c143728a0bca54193a7f22f93226d29b00e8a72c8a32fc56900cf019fe","webidls/enabled/MediaTrackSupportedConstraints.webidl":"b2824bee249132b4d2c2a4712427e7c2ef9ecbd453a8cd8cd14d304f10c07971","webidls/enabled/MessageChannel.webidl":"6efa741daefc8bcf42fae3421300772320b3ca6703a173e0d336f99e260bf890","webidls/enabled/MessageEvent.webidl":"f45e89ee3fea8c987f75e4dc049c796c67d59640e176def5510fcf3c32152899","webidls/enabled/MessagePort.webidl":"b9c1245a59ff0185dff678889fff61f67a2ece6d81ec4269655f07a8165249ff","webidls/enabled/MimeType.webidl":"757626dfb9f020b59cd3f739ab46022cf281e4beaf4c039aa515b167ee70e246","webidls/enabled/MimeTypeArray.webidl":"4c6ae0d0c6a967662f8cff4bfb33f26f7479a603aa8540b74fecb2064277699b","webidls/enabled/MouseEvent.webidl":"3d3da4ef7163b5996dbe24f2cff42581de65826ddb5c2452e79d35833c7ce3b9","webidls/enabled/MouseScrollEvent.webidl":"958dfac037298b7b32367655db780311b8afe881adc58fb3176c678209625f07","webidls/enabled/MozApplicationEvent.webidl":"75512e059392c8508d4bc1482b8fb64ada87b98c0a49facb03e989da0516ed6b","webidls/enabled/MutationEvent.webidl":"669e0af319257c6e364bdcd79447313fb240e5266a321bbe08f87163cc872ad4","webidls/enabled/MutationObserver.webidl":"8acdb27ba6f9201f2589626a402ed4f92eaf6d361e325100865bc791254bdb46","webidls/enabled/NamedNodeMap.webidl":"149542c31147345d43d93d670b0e856a1dde4d5c534cfa52d8aa584ee2153af3","webidls/enabled/NativeOSFileInternals.webidl":"b518244fb86ba62334e13f42a561a3a48e520321c196a48c024359c6eda3ce6e","webidls/enabled/Navigator.webidl":"c014640de9c0d208a554de73ca45f11974f0c58739d0021e8890d5b9237da217","webidls/enabled/NetDashboard.webidl":"99f5150c764f90494142efcfd8a2cb824b44f1190189f9aaf30af93cd85ccaaf","webidls/enabled/NetworkInformation.webidl":"de0820f9049746b459e5dd2a4dd9e40404c8857cf31c12e29fdfbac1fdabcb62","webidls/enabled/NetworkOptions.webidl":"8782c373d76d76f336decce7274f43ca99a896d961722026898eeb60bcb473a7","webidls/enabled/Node.webidl":"713e28cceccd791e997db68b5b0d84aa46285e6de42126b9f0ae8e4781ea8ec1","webidls/enabled/NodeFilter.webidl":"527355d4a296696054715a80a30231ea74cb5927b5e940ab769bc3bc31aa0d5d","webidls/enabled/NodeIterator.webidl":"99b822656a67ec184e1bfd09cb7cb4e2f684a7f2d8d197047501a45cd25b9150","webidls/enabled/NodeList.webidl":"4c7d5d3149f3e79087e89108430acd4e9deebe531a946e23f91f3fee9a20b712","webidls/enabled/Notification.webidl":"57f70f2d51c416d2d92c44a17562f66659721a0e7525bfb0a82cd5947d941b34","webidls/enabled/NotificationEvent.webidl":"abe1d7da9d0dd1a25f4b2940d5b0319f4ab130a9f856738de7b97864bdc2828c","webidls/enabled/NotifyPaintEvent.webidl":"7e58bbd1dcdd2e3cfa25ab411495045872fc4e9bdd126764fe2f5ecab7996fda","webidls/enabled/OfflineAudioCompletionEvent.webidl":"87284c182880aa88a9dfa49cb8375594bec1f9af6475d20c4d54322bf3f49650","webidls/enabled/OfflineAudioContext.webidl":"3cd688ad772feeedab5f1f8f1970b94fc214824329345715667591d16b80af09","webidls/enabled/OfflineResourceList.webidl":"0be922a661387bc2dc8798511493d448dbed92fced1026a341d445fef9c6d292","webidls/enabled/OffscreenCanvas.webidl":"74c97f6e287477de6e7d14359e7f7e3e65f10fff0beb9241335bf2bb056630ff","webidls/enabled/OscillatorNode.webidl":"da2d3207a42adffaba99f452bd26dd70a9d33330c3387a3211bb2394b0d9d734","webidls/enabled/PageTransitionEvent.webidl":"56539720e7a07f1b7b57ef204b5a1f2d4c288f68728e0180d298a7a40f3b2ebb","webidls/enabled/PaintRequest.webidl":"e8c046b22f6b46d6d15e206f23f33564cda53364b22eb4828785065d7772d995","webidls/enabled/PaintRequestList.webidl":"840ea6f7382f1d295bb60fb399dedadd25a3bea4997f82b889d5507e04e408e9","webidls/enabled/PaintWorkletGlobalScope.webidl":"0dd8d9cca67b0614191ff51e2ea2ad3d6931fcebc373cee232a7f1eecfab6622","webidls/enabled/PannerNode.webidl":"89878fe816b8cb7d87c7827d80bd6793a45027f12a18f30cee332d76a0ea25f2","webidls/enabled/ParentNode.webidl":"9229df880bb1128768d0f9bd827a7bada0382e186b80d453b7f4283ec8dfecbb","webidls/enabled/ParentSHistory.webidl":"0bdd83ec933e0e3311e9e1519efe7311d893404c0651d94a5885fa5f2773dac4","webidls/enabled/PaymentAddress.webidl":"c71b7efeb0d3d1b8fd6f01eee3af89f5cd8b42660d25d889dedf0615f528faa5","webidls/enabled/PaymentMethodChangeEvent.webidl":"f037593088cec9010aa383133613aebb8f14fbc5c9973f21773625353fafb389","webidls/enabled/PaymentRequestUpdateEvent.webidl":"fa0c3008240926490e742a9a3595df6ffa989717066f2388d0bb5c9b14d45211","webidls/enabled/PaymentResponse.webidl":"0f7565bd2b5c2a28ee1508062ea4dfa56df719e72eb4b0b5c8ed20b0c658bbd3","webidls/enabled/PeerConnectionImpl.webidl":"10a3cd47a2320691dd600193bcd1ce73bea1f07cee67b592ea7708af71a517f8","webidls/enabled/PeerConnectionImplEnums.webidl":"c9f54424a844df7a01eaac3ba3a96e5e31e2530eb99cca84f48a3d9d875f4d52","webidls/enabled/PeerConnectionObserver.webidl":"de1368051415402be718fb1a7b105295738961199d03a32233bae8a0c9feae70","webidls/enabled/PeerConnectionObserverEnums.webidl":"67e698124e7cd1f758c1d8ce2d5ef5f2a3cb818af4d08ee54dcdbc10cd890783","webidls/enabled/Performance.webidl":"7dde1a5f0a7d197e4477232b50a69f196d74ebba8699b5e424cecefb7ca0d557","webidls/enabled/PerformanceEntry.webidl":"d4287b10c20bd543e607fb717e09fd2f9fa510fa8d425187b78a5ec464649993","webidls/enabled/PerformanceEntryEvent.webidl":"36855fbb87f6ee4ab9bc99ece991c81ce1c0aa537eb9987f7fd4a5ce83be498c","webidls/enabled/PerformanceMark.webidl":"83d630e8efeb08b521194c98404029b4f495141a038269ee188094400adc8173","webidls/enabled/PerformanceMeasure.webidl":"74f29148a94dcd4881669a64857d13caf5a8aa295e8a0ae9a749be79e761fa67","webidls/enabled/PerformanceNavigation.webidl":"e2f8f4f77a5926932c56a9a9deb5c12c4991245c81f1a3f09d4ae494ca414bae","webidls/enabled/PerformanceNavigationTiming.webidl":"9995bfabffc7d7d23114ae7c5d4eee93048164da9b1e74851b518b069fd7eb29","webidls/enabled/PerformanceObserver.webidl":"bb1f4e05f7751ef85adc4b9159ba1c99610b90007ffbd627acc6ac1a7bdc017b","webidls/enabled/PerformanceObserverEntryList.webidl":"5917ca5fd5199ac3b527fbcf3d19f0885b9670d40bdb996df63c34537503c435","webidls/enabled/PerformanceResourceTiming.webidl":"8a0f4e08bf0288dcacf29b3e8270b8828a26b0a3cdcd3259c95e35276f6a82f8","webidls/enabled/PerformanceServerTiming.webidl":"2ea12d8606689422ba4cfbd3de676f155cb764ac83915f235c8dc119572a5713","webidls/enabled/PerformanceTiming.webidl":"444081120979dc63fa0f8f20b339ad6e2bd5460e25bb727c3a047cc394d528ce","webidls/enabled/PeriodicWave.webidl":"13ecbaad1289109aaf58c5ed2595face11563a921546c0ad812ba66e64bf38a1","webidls/enabled/PermissionStatus.webidl":"af7a7599374070947d2c8c1f0425363cfaf510db202fdec592b6c01a382e87ee","webidls/enabled/Permissions.webidl":"7567d31bd5dce5df70fc0c0bf033d1d02d599df1ee88352eeeff04150f863180","webidls/enabled/Plugin.webidl":"ccc55caf98f299b044eaa2d58edf49bf92c30319f64fd0dd9b4be1fdaa75a776","webidls/enabled/PluginArray.webidl":"56664598004a41d88f39a1d14efad836ca63002e01e9ce9e7a478503af67dc4b","webidls/enabled/PluginCrashedEvent.webidl":"4dc5bf4bd81716bbbf78a88b75ac76a163a2f25e508b4df60805870b8ca17553","webidls/enabled/PointerEvent.webidl":"842a273210f481e541db88187a4e4f506f9682ab27f4ada97236e6816737ae68","webidls/enabled/PopStateEvent.webidl":"b3fbde27e8a0990a9f3ee510ae077b4d73bbb0e6ea481007c3cb6dcccedad979","webidls/enabled/PopupBlockedEvent.webidl":"7097dae7f8bf471487ea5942b3747b5ae47aca54e111bc6cbaf1599e13d90716","webidls/enabled/Position.webidl":"e0455234c92c570ae8bfdbe2f535c62b16ddd339f9a82e4c4f945c04fa2776cb","webidls/enabled/PositionError.webidl":"b6158a0245dc08a95e13559a03d8ac1c5569b8d486c0fbca872f13dbb953e0ef","webidls/enabled/Presentation.webidl":"8bc67e499d9f99263774da2773ec87fe5ebfd38df4bec99983c9c6a213055ce7","webidls/enabled/PresentationAvailability.webidl":"0ccdb1da5aee3e5495a372c1310b2d4f483a2f92b7a6cd322c620c72ddf1bcee","webidls/enabled/PresentationConnection.webidl":"e0db91d3b8b56f9a722e332205fe27c530a5cb958a0f8428b79b8bf34a699fbe","webidls/enabled/PresentationConnectionAvailableEvent.webidl":"3927bc5f09504bdd34068e018741ae66158fc442922c3f94211e2794c0bab240","webidls/enabled/PresentationConnectionCloseEvent.webidl":"e943f060198350fa90d509806b15e0ba29c694c6f96c70b80ba7878861b3e6af","webidls/enabled/PresentationConnectionList.webidl":"bfb59c582a8787c44f1dbaf29a50b40b754c9828093b8056ee20e1db902a4d97","webidls/enabled/PresentationReceiver.webidl":"faa276a23a21d8db39a07dce80a7a120e6cc0e2597b5bf3d4240db568bd42356","webidls/enabled/PresentationRequest.webidl":"669dd03457f5eb4ddbd6ce9ae8fcd02ccabfb062ae9322fe7e91940b3655af72","webidls/enabled/ProcessingInstruction.webidl":"c653d1de81771557a93cac5694336418576cce5a8358e40f089304d8adc474e6","webidls/enabled/ProfileTimelineMarker.webidl":"08414691af335e0f2bb906cf53cfec9a8723254ecc37f0e7bacf6b8be63c7f4f","webidls/enabled/ProgressEvent.webidl":"aafe0abe465e049bd95032ee52877aed82bff3dddaab231cc3eb71453184ab1e","webidls/enabled/Promise.webidl":"0196edcf454c2a67b8c81fab76d3522cffc8a593e014db2d997a6f5f0d725d81","webidls/enabled/PromiseRejectionEvent.webidl":"25accc9224ed7795778b4cc93b7f51b5b4e1ae0ce18f97e7a91e6b6cf02bcea9","webidls/enabled/PushEvent.webidl":"2b1fd7de0888b157ba25991c4e6ef4615a1276c2cce16c68d53f92f1eb4aaa09","webidls/enabled/PushManager.webidl":"a6fcf2d1eb32de1619f5f95bbf3b66635224c68496067e3002e03a6e972e4d42","webidls/enabled/PushMessageData.webidl":"72ce9e056c2ba9857ecaedda5362cd2d56faf161ed142296cb84def701a88f53","webidls/enabled/PushSubscription.webidl":"77d0d1cbd486f109ee2104aa3c23791b8094e9887fa517ac18bfe1691d3d6409","webidls/enabled/PushSubscriptionOptions.webidl":"817516cac055730ff992f8d972d3b752432ebab9b1903cfc18c8cedbd9ae7294","webidls/enabled/RTCCertificate.webidl":"10b5eb04b373caafe3fcff85601e9249261521d824128f876f2bdf8117951917","webidls/enabled/RTCConfiguration.webidl":"77029b6e5ecaf3a6fad064b7f183b3dae38013badc3fbb52e3ee41644121d943","webidls/enabled/RTCDTMFSender.webidl":"c39f43e55e99ee405a460f61b3bdab82c44dbdc99d4dd44d90d2f66e3c8c11d8","webidls/enabled/RTCDTMFToneChangeEvent.webidl":"d5c54f4fc2aa1085a5c966e5028a98865133f43fa537578e66f3d183ec3415f4","webidls/enabled/RTCDataChannel.webidl":"4e8ab33057cdc819b762e50d07264361fa791147af92b98fa166625bbc05c168","webidls/enabled/RTCDataChannelEvent.webidl":"4a95a226ddedfe4dcceaba7338343f8a8621023015563cf2f905c19128e8e7b2","webidls/enabled/RTCIceCandidate.webidl":"9c53b5ada7baaa7d79922795981bc6d180d425ceef2485898546cbf4cde05450","webidls/enabled/RTCIdentityAssertion.webidl":"fc8faa529cf633e6fd7b510599fb1db4c30a2d168f4a156515065cfa167d6d23","webidls/enabled/RTCIdentityProvider.webidl":"691b7c71765e7b8eb9750127def9a7221ea02c9c285a7fc70b43766203ba1a5e","webidls/enabled/RTCPeerConnection.webidl":"302d229b311a66a041f7336d77107e6a206c8401b29a1e3b6d97e3718bce4f80","webidls/enabled/RTCPeerConnectionIceEvent.webidl":"a48cc1c8e9984364fcda93381a2a1b00dd2a38684e540a1482dab8218b4d6a1e","webidls/enabled/RTCPeerConnectionStatic.webidl":"df6df2f73a649ed1aff025c04a7f14fe4864bd48264e9752b90ffcb257e84321","webidls/enabled/RTCRtpReceiver.webidl":"167fa341b3f51c78c5bace58b083997eb4d909046b7b0028b4bd68d72289278d","webidls/enabled/RTCRtpSender.webidl":"291041a9384a808294750bb2f5d5e46da4a824d2a8cdb84c703014a41f4331bf","webidls/enabled/RTCRtpSources.webidl":"a5d739766665a4f290cd121407bd44d23ebf57b869350a3796ac2aa315383f39","webidls/enabled/RTCRtpTransceiver.webidl":"56ef24b14df17249743169c66567f35f314a89c2a2461e728370d8cb44152ecb","webidls/enabled/RTCSessionDescription.webidl":"7ad506b114aec2894fa4c650d929e1cc3a1406e2388b9961607ff53cf2c192de","webidls/enabled/RTCStatsReport.webidl":"8921ce8843ba6bedb22e4c37241455680382449a50289a3476ce770a30f6d24c","webidls/enabled/RTCTrackEvent.webidl":"5f0a6325b2ea07859be497d968954f0a698c4d56e109fa1308fc9669bdc14b0b","webidls/enabled/RadioNodeList.webidl":"5b1751029f985b32667174c4414eea17b926ea681d3608bf4f15f084b0184cc1","webidls/enabled/Range.webidl":"9b3a888227ec17c4ba0eb48ba2cc4fb24d0fc3a61ee30643bb0c4e12a3544f99","webidls/enabled/ReadableStream.webidl":"12cab9fcba5249f6db8ae9096feec1ab39b590e11c64dc6f855b320570dbd701","webidls/enabled/Request.webidl":"f1929c2c4d6f8d19e592a0d7821d06613adc7a02926da489641ee7efb989575b","webidls/enabled/Response.webidl":"333c54b567c87b4995268b608551055db70249f93c08c12b5f129f3a62ce34d7","webidls/enabled/SVGAElement.webidl":"9266973cab81785a2d9651a4bcacacf0df9c080f87ce7e20ca8662a86cda9ae1","webidls/enabled/SVGAngle.webidl":"2c611ab01465abec50c5d412f9f9b8d013af0be13613e55bc011746243d02c56","webidls/enabled/SVGAnimateElement.webidl":"406e108607cf6f6532fc02f2503e52c0651127c45f4aea2cb3a4a388c4ba6c1d","webidls/enabled/SVGAnimateMotionElement.webidl":"0b99671068057b224eb5fb40c2ca818ef89bcc408aad982bde138092f1412dff","webidls/enabled/SVGAnimateTransformElement.webidl":"c8c232b0c2193b259f024158e61c79756042e96eb642ce32ef83abfc00946f36","webidls/enabled/SVGAnimatedAngle.webidl":"1ec87dd46edb885b468de542e37b3a2ff3e69015b3c92386f92f1903f9222f81","webidls/enabled/SVGAnimatedBoolean.webidl":"21ca5be2d236ba2a8935532a82a7791cf921cc22050d1911706b13a6f40a60f7","webidls/enabled/SVGAnimatedEnumeration.webidl":"ac2483e79c8c0681b24b400e88f3490ffe040c50584f51e98533fc5fd64b8822","webidls/enabled/SVGAnimatedInteger.webidl":"1225c8d8f41ee85008eee904eac1e017a0f60762d7adb09a7ab467141535cf3d","webidls/enabled/SVGAnimatedLength.webidl":"ec75bc98faa3fa71fd96af7a4aab0f3bf982507360d9fc55737a8aa00526f93c","webidls/enabled/SVGAnimatedLengthList.webidl":"4a2c967bf7c3069567f53edc7bfa7baefc81985a76e82013fcbf0556de3cd7c3","webidls/enabled/SVGAnimatedNumber.webidl":"a352a8f78f6feb508c3139f8b129ec63288424fe8afb84abbcf73b24857683c0","webidls/enabled/SVGAnimatedNumberList.webidl":"586dec7836b1a38358f333637b3d10cbe44db1cb3e6527ffda21984912cc09d5","webidls/enabled/SVGAnimatedPathData.webidl":"9fd44f6b2db82cfa362324f1ae291214cfb3ee81432974e4f9b5767f4d6ed15f","webidls/enabled/SVGAnimatedPoints.webidl":"50a53c450b5e7a660f40abe303d8e99d9dba86a1b68143decfea8149dee940c0","webidls/enabled/SVGAnimatedPreserveAspectRatio.webidl":"f9d89696cefa023f366a95c43cfe7ddbbba069541e115baba0121bcb9d67835a","webidls/enabled/SVGAnimatedRect.webidl":"82b5590f298c162a3143db0884c11558256562c42740d263af230c058e1dd740","webidls/enabled/SVGAnimatedString.webidl":"538b70cf811953c09aabba7e3a0218df267e23bb3716fe972427abd27e10269f","webidls/enabled/SVGAnimatedTransformList.webidl":"bd33eeb6a4530cb1f1d4aee69996fb40a153a636124b233fd98b30a69c865da4","webidls/enabled/SVGAnimationElement.webidl":"2409dfa104150ea27ee52588dfe205153bab86173fa602b274a47791825c4fa7","webidls/enabled/SVGCircleElement.webidl":"af611f14ef46c012c4803c0712f7ac4293b7332fb0d718ce0f088c1b2f23179a","webidls/enabled/SVGClipPathElement.webidl":"632723812c80f2713beebf908830e6ea0a1dd18f1136d6e7c3d62db1daaa2365","webidls/enabled/SVGComponentTransferFunctionElement.webidl":"fd86f255607d5124e5b3ba4e94eddb4e09081be7acc70ecaf18a3b16147d5a64","webidls/enabled/SVGDefsElement.webidl":"a472683867e97fee7949177b855cbc8d00c0ac382df1307ad6c04f615cbbdc9c","webidls/enabled/SVGDescElement.webidl":"1e53672d52672362c5b24429554a346c02f88bf0af92f9aba1a765dcfa1f725b","webidls/enabled/SVGElement.webidl":"ff5e68745c8dec85d34e528a4689f311a3f013f0a1ec3f782fd132553a907004","webidls/enabled/SVGEllipseElement.webidl":"c409ec29884913a14283b120e7171a3fc6d00991d70c5c5e328f2fb6a6369388","webidls/enabled/SVGFEBlendElement.webidl":"a97a3542c0d6df30ead0ff7c85fc6621eb738cc058d381a9c4a14d1e2ff5dc07","webidls/enabled/SVGFEColorMatrixElement.webidl":"c4948fc95e2b0ac5c7dd749c33ed3f280d199fcbf1c1c5bec627b7945292ca1b","webidls/enabled/SVGFEComponentTransferElement.webidl":"afae71ba9759d1f64c84bc20461af3049a40871bbe311c84ce6d4206e373b51e","webidls/enabled/SVGFECompositeElement.webidl":"fa3ef383464e76b4c9d355a1205482f296ec9d2ea8064219ffc1647f3d5e72f9","webidls/enabled/SVGFEConvolveMatrixElement.webidl":"fa50facca3ff39ed8518f2544d7a00f9ed8080be6f55ca82c068908442d83446","webidls/enabled/SVGFEDiffuseLightingElement.webidl":"afd160379bdd740ee1cdb94c98d0c5a5f100005a74a888d95187bef9143e99aa","webidls/enabled/SVGFEDisplacementMapElement.webidl":"04de93553c74074f036b9b4ba2f9df5040eee50f5fe9c29b0ab7d37faa0be57b","webidls/enabled/SVGFEDistantLightElement.webidl":"ef9695659ef0fbc29d8a65618b94e273b7628a129b861c6fb591d9a8987c1d52","webidls/enabled/SVGFEDropShadowElement.webidl":"d2bceb961dd63c4a7bdd2d471c25357969f9275d22fd0aeeb490b5b31cb53412","webidls/enabled/SVGFEFloodElement.webidl":"dc1d87cc8b66c37700c4eb780efc5eed6852fc2110a36d6f87436cab4c602ab6","webidls/enabled/SVGFEFuncAElement.webidl":"be785a50252c031f4ca1527e661d7c2b755941f23e43e4e058059d65a3e58299","webidls/enabled/SVGFEFuncBElement.webidl":"23c0f541ee460d88c2bfffc23d39f0b2cf55afdcc166bf8d21b0c6a44027dbe8","webidls/enabled/SVGFEFuncGElement.webidl":"744bc8c3d1c94826a4e77bfb804ad15e261ebbb97a0b54449b919de96360c82a","webidls/enabled/SVGFEFuncRElement.webidl":"c9cc8f0e5751873a92d1c2dcab2abfb54eeba2f4fe29bd0444c3860ca5d6f62d","webidls/enabled/SVGFEGaussianBlurElement.webidl":"b57fcbd7010044f4f7b985660761295a011c120c1bc946b1f0df650c76ebfaf6","webidls/enabled/SVGFEImageElement.webidl":"abb94b92701be406254738f5da555d427ce22f618df430f56053436bdb601977","webidls/enabled/SVGFEMergeElement.webidl":"9469944946e6117fe2c9ad894f4791c87e389951d3a639b0ac167801d2fbabf3","webidls/enabled/SVGFEMergeNodeElement.webidl":"f1f8d479644ec523d59dda7e1091909a1e523af2ec8dfa212ecd9e46cdb69e82","webidls/enabled/SVGFEMorphologyElement.webidl":"6595ca562b5ff35c102b58d4db856026b29e4c39035428b243a090164e8396e3","webidls/enabled/SVGFEOffsetElement.webidl":"6f4c392cec4199615873b79141b89586394ef3d87ad226eada35e0f08dcf620a","webidls/enabled/SVGFEPointLightElement.webidl":"4a572696b33c47bf4449edf743df65ada8e755145cee81f03395a9450986e926","webidls/enabled/SVGFESpecularLightingElement.webidl":"403020eb2023ca663700c693a48c6d7469a09ad1e96482d3902642e4cd3e0d8e","webidls/enabled/SVGFESpotLightElement.webidl":"30cc640692270ad6f98fb7d5b786c0208499c13edae57e564829cbdcbca16358","webidls/enabled/SVGFETileElement.webidl":"342a723b07d6397362ffd31fd890d2754651465f703bd91e06440f6fec89b11b","webidls/enabled/SVGFETurbulenceElement.webidl":"69b932ff2f1fc73aa8256daa9c88b133aa29c2d6ccf44ebbd1a00055ef3a49ea","webidls/enabled/SVGFilterElement.webidl":"15ab2e501123bca1f8f8051891c91cc8f02399b2ecb607a5f4786bebdac34cfe","webidls/enabled/SVGFilterPrimitiveStandardAttributes.webidl":"0b690e40034014c00ce6870c62750735292e22a6f63f34fac3e8773fecfddbdf","webidls/enabled/SVGFitToViewBox.webidl":"c54c72b53fc99992fa17dfed0d4ef1159633c1a973073691c744b76e90ba39ea","webidls/enabled/SVGForeignObjectElement.webidl":"27312a4ce1f30c2a42028be85200b384808e7f9bf43e1156392ef4e4591711fa","webidls/enabled/SVGGElement.webidl":"d35dc8c24962a0a42dca4dc1242ac5561b76db6d730ce28edb601187d53b2923","webidls/enabled/SVGGeometryElement.webidl":"dd0f86c2571613a37c9be53298d86cfcd48851d2775270604eccb23891215f6e","webidls/enabled/SVGGradientElement.webidl":"47efcfa524e2cdfe2435862dfb30c7df990acc9909ba5958aa0f42b2a6a92bef","webidls/enabled/SVGGraphicsElement.webidl":"846e3cdfeadff07b5360f6870796ed8effe0df1a15fa74a359a2afa296497900","webidls/enabled/SVGImageElement.webidl":"cb24d5626d0634ad5e2d026b1fa50bf7410158f3535717ccb8f0828b86a5621a","webidls/enabled/SVGLength.webidl":"55eec15aa711a9e7b4936d51713a98fd584a7739152032c5baedaba2ad646dad","webidls/enabled/SVGLengthList.webidl":"ba84807f6a41814e2e3ee76d9ec2c77b60e7a19d7d8268ca644b5ffd3d429a17","webidls/enabled/SVGLineElement.webidl":"ebf5835ae85de91fa701dfd1d90c814f564d42726000cfb5e81755f8112650b0","webidls/enabled/SVGLinearGradientElement.webidl":"08418f12e42c67d57f66c63895d353b63a30e752fc81bcaa682dcc29972fa7f5","webidls/enabled/SVGMPathElement.webidl":"65ae7e78f412d13d434b023518f7a91ade30e5fb1445fb275616e1db158a1de5","webidls/enabled/SVGMarkerElement.webidl":"44b14d831193c7c8861e03c85558d215d54c01503a6335c2af7d3717dcfa73ef","webidls/enabled/SVGMaskElement.webidl":"2e9a8b5eddff4cd6f3daced2c32227e31a67032451506c49e8d45e8a80199b76","webidls/enabled/SVGMatrix.webidl":"2c36393352662d30b3e15ac98976d0ffbfe6fecb9bf9a46788e3748feb7d9ee8","webidls/enabled/SVGMetadataElement.webidl":"edefcf9243c063a58dfd18648b10be9516c798db0eefa08cf0843f0014ebb16c","webidls/enabled/SVGNumber.webidl":"c094b396c9dd967c23eee36cf78ea9be5d97df72b0b22177f5fdf6a7390e792f","webidls/enabled/SVGNumberList.webidl":"29e35160d72aa287675018cf85bcd35d1c08c4a1147ed3a241695697b1b2a5b5","webidls/enabled/SVGPathElement.webidl":"d3e339379a478000382a56d34ba98adc08a2c3c2fe1260937d9c40e8e265a605","webidls/enabled/SVGPathSeg.webidl":"aab6325878704a3a46567ace2757640c8e45f9e68e632dccd06d919b3aca95f9","webidls/enabled/SVGPathSegList.webidl":"e43bb7403e0dbc76554a7589f24db6b2c8042b946ebab71b210a30459881e972","webidls/enabled/SVGPatternElement.webidl":"577dc47c532c5936068309fd6bfc65d0bb21e45e2903cd4515f03ac39e556a50","webidls/enabled/SVGPoint.webidl":"bbd6730609d9394f7199b269f24cb5aecea28e8625794e47eaab414f67afe281","webidls/enabled/SVGPointList.webidl":"cf36eeb67bba98bf204b50620934a1d4f42f03c25e70b213e16b5b0bde31008f","webidls/enabled/SVGPolygonElement.webidl":"e902ed44dffcf2efb005ba2ff9ffffbb62d382e52a8dbb9a105abdb227b7403f","webidls/enabled/SVGPolylineElement.webidl":"1d2e524aedb66b056b69f8d2560fa3b68a8417411b16e07bb58f0f1628ec1965","webidls/enabled/SVGPreserveAspectRatio.webidl":"687f803cac4b9a6e7f3f32d8ede0d5d2cf838fa4b7a5abd063be28c976d09d13","webidls/enabled/SVGRadialGradientElement.webidl":"66586aba27c83dddb8646f5263e35ec841e72a0267824bf856d4a8fa055de370","webidls/enabled/SVGRect.webidl":"81c17d4961853662265c27acb21543baad83170b65096a2aa0186f5c811ab129","webidls/enabled/SVGRectElement.webidl":"75ddf7eda4a1a1ac1d4b243364e21d8fbc84b47fa33d936abe509995c683433e","webidls/enabled/SVGSVGElement.webidl":"8d544dd5181b8e851dd0f722b0b33579634f28f00dcb268e23fb1265008f2968","webidls/enabled/SVGScriptElement.webidl":"cdf1a3aba7db43ac419bff2831ad62b925c24410c3608b63953996d4d8842661","webidls/enabled/SVGSetElement.webidl":"858076ae56590ecb61aab88b746a92b6f161d90e7c78ffac4fc6c0bcaff6b1ce","webidls/enabled/SVGStopElement.webidl":"5a51ffa270957553fedc913848867a9f0786673c3111585a638c3c4517e5bb44","webidls/enabled/SVGStringList.webidl":"24d5fb5896875652f0e8f691a809ae21211138953b0d0fc2e5003a3b7a202463","webidls/enabled/SVGStyleElement.webidl":"fb96e6f37015f9d9a4f20fd91f5f6199e0e71c0c6875666753209a7415b810a5","webidls/enabled/SVGSwitchElement.webidl":"c9758f48f58a700705f56d4bcce9bb67def9f0cb1e8410018f95e0d83cdda80e","webidls/enabled/SVGSymbolElement.webidl":"3c3a9f9d778404f4082edc53b2a015b14be759392fca787e911535d4f4437ef5","webidls/enabled/SVGTSpanElement.webidl":"237383c44aaeb9daaf5839c91800355cef2488cb107c2d7afe7bdca73c01e7ce","webidls/enabled/SVGTests.webidl":"e41ebf9f26401ad603f11cae37b46ee0b0cf36ef0d10adf4a039eee1184c31b9","webidls/enabled/SVGTextContentElement.webidl":"3f009cf0d40b5ea4cc0bc3a1c29fa080d4be290303a5ee054d12567271cf4db1","webidls/enabled/SVGTextElement.webidl":"a4e13ba09815aca62014069ee79aa1fc32ceb1e2770f0c712bf11096ce30a55a","webidls/enabled/SVGTextPathElement.webidl":"717b1ba9ab66c3ed589a89cf5ace7273add4d6c8d9a2acf628bd36e771658a6b","webidls/enabled/SVGTextPositioningElement.webidl":"8d67f3364c487310ff034b42d520ebfda3bf8fab718aa0008f0b2cff668064fb","webidls/enabled/SVGTitleElement.webidl":"4de199bfc0c27e876a27b6016f8fbb33190fcdb73a521a9538f2d63f89337a32","webidls/enabled/SVGTransform.webidl":"d37e820b70eb0cabef9bdf2f3f659e79ee94c305848dedc686bea0b96c8fbdbe","webidls/enabled/SVGTransformList.webidl":"33d93445ef164886a04d30d47dc1e47a2ae8c7405c7b537b00919ec076c28c13","webidls/enabled/SVGURIReference.webidl":"1a209294dc3a93a82de934b06d8d2122b47a15a12033376b8b4581b4da857bb9","webidls/enabled/SVGUnitTypes.webidl":"94aab6a0c212cf5f541bd463100e0a91e8c3c1d2da8e450f013841c989cdf151","webidls/enabled/SVGUseElement.webidl":"57dc59cee19582a3f1068757b7256d8594cada661d349cb3c0ec5cb7fe6bbff8","webidls/enabled/SVGViewElement.webidl":"dcd8c5d4d96f130750b77a25f3014813267eeffd2f5486d6f1738ec98b998645","webidls/enabled/SVGZoomAndPan.webidl":"f3d3d76f88dae5a4ad43c9759dd269ae53afd1c1aa40c5cf7e674ccd63362c66","webidls/enabled/SVGZoomAndPanValues.webidl":"7b98dde6c7bb2937953f5eea85e7906845cf1d4d7615c281d54699eac7f89162","webidls/enabled/Screen.webidl":"edabc2ab6ac7a8c1cc3cb31310cade22c3456464e5be1521079bf869d0448fac","webidls/enabled/ScreenOrientation.webidl":"a150e228618f005cf574fad2928a0c621e3407c570e271a9c576c44ed3d43086","webidls/enabled/ScriptProcessorNode.webidl":"975e17ea75e47d41f7594c86c1e8c70fab15cd62d95247a731720cf97728d7ae","webidls/enabled/ScrollAreaEvent.webidl":"011178fe11784066ba040ed23c06533b66a9d6f7eee7369937a6732c02c15d7e","webidls/enabled/ScrollBoxObject.webidl":"af9c3755f744c0131ffadd7ffe7f88863ff550678badd539b69aeadd8c9298b3","webidls/enabled/ScrollViewChangeEvent.webidl":"243bddb6bf78f5d362ac33ff57f37ea26111e72232675fcebe84d81a970d3993","webidls/enabled/SecurityPolicyViolationEvent.webidl":"2e77aa3d68aede50ae1f99f7f77050b249d706783c7492a59b0a7a9b4b82b0e1","webidls/enabled/Selection.webidl":"e7c9ce0ebe7682e465041703cf87816778de9d7e4cf1b402ff7d554485b720d4","webidls/enabled/ServiceWorker.webidl":"c82e31e1324c4441605a21e582b92e9d0ef36156d3a818f7ee7bcb5240ec05d5","webidls/enabled/ServiceWorkerContainer.webidl":"28f4a29e48e0a94ed410120b5e86fb14eb13c39f02b35226d64610b748223d51","webidls/enabled/ServiceWorkerGlobalScope.webidl":"9e00be5c419275c6082d5897f47f3e8f638b69b37ae0bb91da865adbf24cb13d","webidls/enabled/ServiceWorkerRegistration.webidl":"9349028080c0df9531a7e104368ec5b3250167e64a75c77a3eb4f34fad6b7e31","webidls/enabled/ShadowRoot.webidl":"da96cf6f2c1a871cdc646bec67d24ffe9345eb5bbb62634da5c9e7b0a5024d98","webidls/enabled/SharedWorker.webidl":"5f622c95284d639e7d0bc396d60b3e660eb655c0eb7a0ccde54e0b986f94df6c","webidls/enabled/SharedWorkerGlobalScope.webidl":"bf36b09c0cc5d6bc65f325ec6f6c5d6f00325a6c40802156d9acebb5197cf395","webidls/enabled/SocketCommon.webidl":"65872f202a5324c291c5499f8593ed4826911a077f4d1d8a114d564e65ebfbae","webidls/enabled/SourceBuffer.webidl":"d8855776500b775821ebdca02ee430a357d16e0cbefb9e39c0b1939c58990197","webidls/enabled/SourceBufferList.webidl":"5dc259a31f77b9bc8a6125aaeb1238102235b5f23261b4282acc21888f69a798","webidls/enabled/SpeechGrammar.webidl":"6aebc3b030f5baf5abef93e32aafaa358f0de5494f273b0851b43e5ec15bd4fc","webidls/enabled/SpeechGrammarList.webidl":"0c2c2b01155a481ec45164eb5561f47beb177fc39ab13ce1b8066a22816ef752","webidls/enabled/SpeechRecognition.webidl":"718734f6db9e0eddbe0d78b23a46c60dfea1d6e64b87b9c617556b8c934171eb","webidls/enabled/SpeechRecognitionAlternative.webidl":"bdb0ceaa3fa8dcc053cf097c88ef93e16024ce65f1c6992771088a19110b6e3a","webidls/enabled/SpeechRecognitionError.webidl":"fc8aeb8170d4269667ab76d53d6fb4c9f358a9aaddee7b90a700d8b5b65362c1","webidls/enabled/SpeechRecognitionEvent.webidl":"2789b5157f7739cbcb64783eb1c7fc909ad3c28593b244817309260a8d9de16e","webidls/enabled/SpeechRecognitionResult.webidl":"c136902df06dd6c99837b2fea499c430165b4cffaa876af09023993932db33db","webidls/enabled/SpeechRecognitionResultList.webidl":"e7269b67251ec271436a8da484def7654cabf23caba6ceada18b9828e8e168d1","webidls/enabled/SpeechSynthesis.webidl":"bd2384a31fd4216a388ff58888679f2a27f1d2e98edae96aea069dfb8cdeee15","webidls/enabled/SpeechSynthesisErrorEvent.webidl":"1231f5651bd3440a59c967ce22fb56b53d2bca7a9c2d0be913642ab2ded65cd2","webidls/enabled/SpeechSynthesisEvent.webidl":"2c86b63898380ec9a3665f83a350ab964ae3de52073aa06de68ebe429c97fad0","webidls/enabled/SpeechSynthesisUtterance.webidl":"0c463f489ecf947a897e32cb77869ca61018ba53a503e9c43e9d194524f69c2f","webidls/enabled/SpeechSynthesisVoice.webidl":"615ca94184a3d9de46c3ec47f860faa275dd4607f1395fa2f2203f5a82330804","webidls/enabled/StereoPannerNode.webidl":"ba538833cc7cf33fd621838a349b01712290e5e53a00d8c1397c60b0e2249965","webidls/enabled/Storage.webidl":"81e3792a1c753157683441a44a0c23900c954eaf158204b3ff5e154eff37808d","webidls/enabled/StorageEvent.webidl":"c2a378abf1f1918d787fe0b38af8993e8e8dc83295992293a2f9801861ad623f","webidls/enabled/StorageManager.webidl":"d72dc2e1869068c8297f182c446375417f485c314ef5dd6b42fec20793b1cf06","webidls/enabled/StorageType.webidl":"4784de962657f20943274788b8118a4bb105113f69bef7c15accd9a9a1708639","webidls/enabled/StyleRuleChangeEvent.webidl":"0521ff622835d6e093b3dfc742d10e867b416246233b3979f995f21ece3e7677","webidls/enabled/StyleSheet.webidl":"5d34b67fcca9d7a0460d344e31a683e44aece4321d0c99e46ab3fc108edd7037","webidls/enabled/StyleSheetApplicableStateChangeEvent.webidl":"01ef38bbcdc8b59daa8fc455374270a606127e0cf3f528793635fa5788fdbd7d","webidls/enabled/StyleSheetChangeEvent.webidl":"82c65f78a3939d2e5e8ba012f854f13949c96c5157d67fa2cfda03527a705cb4","webidls/enabled/StyleSheetList.webidl":"10ab6f214b7501041e6ff1ff4ca0991e2bc32c833a09415b70d9c3f06b515bc9","webidls/enabled/SubtleCrypto.webidl":"8ffb08be9f2200fceda4aebd296d00ad478cbe402dc9fb7da1a8699d44bbd57f","webidls/enabled/TCPServerSocket.webidl":"6cb2948c47f24da5914e1bf2ec781012a73922a4cbbff4531ed61809b05139de","webidls/enabled/TCPServerSocketEvent.webidl":"3169fd04ae2c3e31d5c57f493c5247caab9dbbfa0f38a6088abaa4b35e5d41d2","webidls/enabled/TCPSocket.webidl":"278a817cb093e1b4c168cb148e07b0a79e209cceed1276b0ec2243d3de961c8c","webidls/enabled/TCPSocketErrorEvent.webidl":"639f7bf942b272983c2d0495d13c4d51e33b011517bad27930d4022d85719914","webidls/enabled/TCPSocketEvent.webidl":"c958fee252aa98f6eac35048964aeac905293006e0cf80c6845ba16000c91e79","webidls/enabled/Text.webidl":"56fbb7605981f8d363ca4ce2cf666180ad3afdd2b792022a47b02769fc1e9ca0","webidls/enabled/TextClause.webidl":"900118a0b65693a577b25a23522f299622f034de6d7d13a14c45abe967a56606","webidls/enabled/TextDecoder.webidl":"28d2750c80b7bc651a55a77ff02ba8d3992f15cd98b802711ff6189d95601488","webidls/enabled/TextEncoder.webidl":"9c6fec6dd1aae1154702bcf7fb5ca712db1281d08ecaaf97596a488a81b02f24","webidls/enabled/TextTrack.webidl":"43dbb2265f8893d438d91fc2a05808813b4b7d00e9934b026362d38ffc5f06a6","webidls/enabled/TextTrackCue.webidl":"9dac62a7e82c03cc914d4edec84f7c4c018aa925535041d99cba447c8158170a","webidls/enabled/TextTrackCueList.webidl":"68acd65d75d9cfdacfc8e266c3147736cef3b6d59f2cedf65480eb5a8c1a8af8","webidls/enabled/TextTrackList.webidl":"057df5f7bc9bf2b57c2db79ebb72ea6bd62474034279159c65c30a4ae934e4eb","webidls/enabled/TimeEvent.webidl":"f516b56d682f41ea4cfd4b79d44707e896fa80677ac0e6a53c0dd24cd43a4fd9","webidls/enabled/TimeRanges.webidl":"926ffda3eb7b15a1750a608351d12b1df624fdc5f9469c9bd278491d4d1a70d3","webidls/enabled/Touch.webidl":"93720f0d2b8b807bb2967de4fe8cf1ada71c2c08d42155022b3ec5a9acb11cc3","webidls/enabled/TouchEvent.webidl":"93bee04784f1c5dce705b782072abc16dc9f296dee06b72167e2accca4e22c50","webidls/enabled/TouchList.webidl":"e38500c028542915bd23a6a8fd0b69d60d70ee5ff72e0a0a67736763eada79ac","webidls/enabled/TrackEvent.webidl":"646d6266c3258dc2db8d5cd52ecfe54fabe34561b8f50ca49257f3898638f5cd","webidls/enabled/TransceiverImpl.webidl":"6a5a827bcf4a98741ff68a9a389bb38782a328a965b482059016476549d2eff1","webidls/enabled/TransitionEvent.webidl":"fbced41fcb7810b4c1b8c8d1d2ae6b93c0d57056372956d4586178e18dd1e433","webidls/enabled/TreeBoxObject.webidl":"9c7524b2984549e3308405d1ed2ea5a7bf1d1f91a5ac248802612d4321c4f501","webidls/enabled/TreeView.webidl":"71ff0f7acb681e68a1d74c40dc87ccf9fe1975bb7a4926d74fee3a63b27563c7","webidls/enabled/TreeWalker.webidl":"c4c41e63f6344711ece9127d0aa47a317ab1cdf033b8bc5c8e2457ccea7f33aa","webidls/enabled/U2F.webidl":"89560a2258259bf7bf3028dcb39f2fa96c08547cc126ae6489b75265b3341188","webidls/enabled/UDPMessageEvent.webidl":"20ef1b7ab382adb831261bcd2d1012c8d1ae4a86686a339241833f1747b646f1","webidls/enabled/UDPSocket.webidl":"1f4832f892dc5917bc94e2b33ae9f86fba17abfb2b68cb801d3ec557c67dad66","webidls/enabled/UIEvent.webidl":"baf73d89d59893db3fe46a65c1631d95412f273e819ba240b7c5df7ac32d8647","webidls/enabled/URL.webidl":"f2e01d246e53d2c604be77c24f4e8e0a9f49229ac6397418e2dc4df78816fb55","webidls/enabled/URLSearchParams.webidl":"ff1a908768d5a1caf4ab773f3060b694d4a7498d4443c2022cd36f527e70f84c","webidls/enabled/UserProximityEvent.webidl":"7b4a94b00c4228aa1f4f23173c81caf695c9a6fe2f7636e1bb6541337446c8e2","webidls/enabled/VRDisplay.webidl":"cbd85f9443b289a949143047e2a11e78a7876495c7cbe5d984820770f779cb95","webidls/enabled/VRServiceTest.webidl":"00bdca757373eb90f58747ca73fbd37ea2d3c9c1689c4b9747a3f2fc97367f03","webidls/enabled/VTTCue.webidl":"dbeac63c2c1e62eb7dd1271b9c64dd6e78ca4cb281ef5e780faab68b0b80ae8d","webidls/enabled/VTTRegion.webidl":"f27235cfdbc6e44dcd65b023e487e487b5ebfeeffc7aaa650df0cca650fab254","webidls/enabled/ValidityState.webidl":"49853d0c5b3b9036b1fd538535f69ebcb09decb13369a31bf0f918cce2c70392","webidls/enabled/VideoPlaybackQuality.webidl":"d5788b9ee029f65d00fb033b3a140e81b1a6b631ea0b27077c3459d51e766a88","webidls/enabled/VideoStreamTrack.webidl":"f3ae8966e8f43f2e7889bd201863700618e2261fc295967a4e83998c1f818c4c","webidls/enabled/VideoTrack.webidl":"bbe3c09176359d1bf088faa762c4ebe6e26dfd3e414b8daa4fbca9c16d956e25","webidls/enabled/VideoTrackList.webidl":"5d7d92ffbb1d0e367220bdb2dd60b9a51cd76129205fc6968c46781b9999fab2","webidls/enabled/WaveShaperNode.webidl":"2414eb5bb9da49f46cc19e50f4a6f5daf2aa95d2808ec09b1d24b8e1e6bd2722","webidls/enabled/WebAuthentication.webidl":"7743c280e9089aad5c4e648598f753781e5c2190231f7a7fc954f4990d3c619e","webidls/enabled/WebComponents.webidl":"9fa5080f1e24837ba9020ed6d9cab2b6cea1bf0ac5f9663b6910047a73ef973a","webidls/enabled/WebGL2RenderingContext.webidl":"2bb99beadc0753ed4f9de2defbaeb1a21eab5d88aa967ba80793ba7915f81e09","webidls/enabled/WebGLContextEvent.webidl":"d14a1221ec65fa3f3ec0aca9068c6ef34fe838b47da87451c5c3376c17100f64","webidls/enabled/WebGLRenderingContext.webidl":"48073fd543720718321d467f9540b56a4556bb61ae733969cdfcb7c580b4df6a","webidls/enabled/WebKitCSSMatrix.webidl":"6352f13d6a9a265a24d2c0208f515455068d90feeb1c5c35b03b08e5450c4e75","webidls/enabled/WebSocket.webidl":"b4a43d3b30a4746e7d37f210bb0eae060aae9fbd25b795645094c3adaff5e1bc","webidls/enabled/WebrtcDeprecated.webidl":"4e45cee6502ff5f367ed2d2d70c8d02c6cd2286399ba3216930017e0f88a1fbc","webidls/enabled/WebrtcGlobalInformation.webidl":"f1c928589b949651661c2f2175a71318da898a61dfa2134a4548979c585f8d74","webidls/enabled/WheelEvent.webidl":"e66dfac75f22f387d8800f262bed8f9775605bb558854a0363711fef8cd4b792","webidls/enabled/WidevineCDMManifest.webidl":"e8ddae9d39c447aa996f9c398cbb5ed25fe1888c96cf8cb3d7f9e4dcb572a4f9","webidls/enabled/Window.webidl":"df82dc0f97f9262e91540277154052311a8d932cb85b7aea1a75d5497e2d0654","webidls/enabled/WindowOrWorkerGlobalScope.webidl":"5291943566e4bbad248b3217b760255d4899c9d691d9936768ae39dc8fe02500","webidls/enabled/WindowRoot.webidl":"19ca1ac9641a219ecc3f04084c1605768a92cea39fdf0d87b13f1bed69197d65","webidls/enabled/Worker.webidl":"0bb49d29355c9d51dd2e0e075dc6b7718cadc4e030e823115c97fffdb6c7f8a2","webidls/enabled/WorkerDebuggerGlobalScope.webidl":"6a176eb8c9faf74ea2fb13c0ecf318c689d9696c5fae1ff57e67173a7ef41bd8","webidls/enabled/WorkerGlobalScope.webidl":"4f420dc5f52a620af17ff2aa13936c93c6547af2fe8a284e868525de1e417615","webidls/enabled/WorkerLocation.webidl":"86a85cead8f1ccc91357c29e5f100abfb7aa1a7254f4096c9f5a9ed10aeea5b8","webidls/enabled/WorkerNavigator.webidl":"8bb49d3460aa9580a53be991d3e5d1c38bc2217606c8a766744d33141cb2159c","webidls/enabled/Worklet.webidl":"c2b4020b16311557d11dbf40e473f1009d971d38b11f4a9fc4ff2433aa673c1f","webidls/enabled/WorkletGlobalScope.webidl":"a1fdfe1774a6c9fb84ff97733aa38f429d31d05317980a4d01f1d089abc01919","webidls/enabled/XMLDocument.webidl":"305e736ecbf2d1ce5d36e2f027a3f9063a1272708d1bf11912c852d003979c9e","webidls/enabled/XMLHttpRequest.webidl":"b194283955dc37eafa78cf486c141202b81b0e303d79d52c543208ade31b5f4a","webidls/enabled/XMLHttpRequestEventTarget.webidl":"518e63b2b0ca73e80a16bc2224fb8544a8d8cab091a768859041979f7c7ee1f7","webidls/enabled/XMLHttpRequestUpload.webidl":"bc484d3e99947124dd9a222dc2d2333728ccae2801c995890d8846ba8976be32","webidls/enabled/XMLSerializer.webidl":"debd3ca7717a6d768694c384eb1ae2c19be3c48a96f4ada25eb45682ce5432ff","webidls/enabled/XPathEvaluator.webidl":"ee62bd2950cd45133036f9fc3616119ab36eef1656019aaad096e1d90d63abaa","webidls/enabled/XPathExpression.webidl":"fc377e078e136b88d8b57fcdae3562766be19a07f9582eca9de938be5fc6aac5","webidls/enabled/XPathNSResolver.webidl":"aa9675d1c521cdde72d9240fb2aa2b419a6a88313697857925be5ff23152ffe6","webidls/enabled/XPathResult.webidl":"9aeee101e1c58a9e7bcd40bff869b6a1edf8ba3184b8260549fd21b5d5d0778f","webidls/enabled/XSLTProcessor.webidl":"25fdce9fa32f6ac0c2a757b9a0349319a0994cda61770bd9d90823b725ba25bf","webidls/enabled/nsISupports.webidl":"5a857b3c311298fd9b1a4de08fa4d8e0ee60ccb88d374d4a189f0f45ffd7dd51","webidls/unavailable_option_primitive/PaymentRequest.webidl":"5a227487e72dd7e855c22e3b30560e6dc76845cd0a7c5df97a30f7850fdc8a41","webidls/unavailable_option_primitive/README.md":"2fe458cfa8faba4b5a3ecf6809a538e219880c214e564a0272cc7c91994609b9","webidls/unavailable_option_primitive/VRDisplayEvent.webidl":"10a00f04eaaf1496d1ffa2fba048753008bee79ebbd2639516e73feca20b85ea","webidls/unstable/Bluetooth.webidl":"fb72b2522c67d7cb3cacdd2d6c414d264d12f288230461dac39ba9d10eeb0a1d","webidls/unstable/Clipboard.webidl":"440eb20159569205332c7b593207bec62e8c5c276a564c7498f9647728bdf076","webidls/unstable/ImageCapture.webidl":"b324635b5585a2bdc24f213571816f7eb2d8fdd2af25e2b3642c887ea6fec8be","webidls/unstable/QueuingStrategy.webidl":"ae2600efd82f8fe5afb072859b0c5796a2770dc55d74711f8d19df20687a9911","webidls/unstable/ReadableStreamBYOBReader.webidl":"9a778fa26356f88b72c56fbaeda1c4281af69cde876f53746cb8c2f192a8d05a","webidls/unstable/ReadableStreamDefaultReader.webidl":"8e0af1807afe20ef357112a31ce96ac27079b40fbf3a51c1b15ad5392a5ecadf","webidls/unstable/ReadableStreamGenericReader.webidl":"422880ab80aba1b67f74ff786a7856029b32250a4ad5c0d200f041d53eae2d5b","webidls/unstable/ScreenWakeLock.webidl":"ede7e4df35aa6504551291b7b7dce3e3f60b6c857e2dfa6be6d1c98f1b592c20","webidls/unstable/TransformStream.webidl":"1ec888bc61d671539b5b43fa84282c8250d23435d73b5f893199362c9b6c7573","webidls/unstable/WebGPU.webidl":"a7c843c36da9438c2f36385f8660a7610b52954bf1868aad67dfa3087ce74305","webidls/unstable/WebHID.webidl":"a8b6fc4f7801565026d310d8f06cad188faad9335ee8b6374b547410981c5978","webidls/unstable/WebUSB.webidl":"c09980878e761daadd0793838dbf924998bc71621652d6fd41b5248f0df973d9","webidls/unstable/WebXRDevice.webidl":"9db6d242cbcdf3ced4eb17b5bb8661bfd7bc97fd899ef3587b2694a4fde74e37","webidls/unstable/WritableStream.webidl":"54a665c8f1c01edb99859389131b2d1b172d46cabf406682176bb9f8639d5be9","webidls/unstable/WritableStreamDefaultWriter.webidl":"1e31fbe8fbd06fe5393f77b106dd270374003a5da7fa35fe61a10b10ff03f55a"},"package":"224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/Cargo.toml	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "web-sys"
-version = "0.3.46"
+version = "0.3.53"
 authors = ["The wasm-bindgen Developers"]
 description = "Bindings for all Web APIs, a procedurally generated crate from WebIDL\n"
 homepage = "https://rustwasm.github.io/wasm-bindgen/web-sys/index.html"
@@ -29,10 +29,10 @@
 test = false
 doctest = false
 [dependencies.js-sys]
-version = "0.3.46"
+version = "0.3.53"
 
 [dependencies.wasm-bindgen]
-version = "0.2.69"
+version = "0.2.76"
 
 [features]
 AbortController = []
@@ -274,6 +274,7 @@
 DhKeyDeriveParams = []
 DirectionSetting = []
 Directory = []
+DisplayMediaStreamConstraints = []
 DisplayNameOptions = []
 DisplayNameResult = []
 DistanceModelType = []
@@ -407,7 +408,6 @@
 GetUserMediaRequest = []
 Gpu = []
 GpuAdapter = []
-GpuAdapterFeatures = []
 GpuAddressMode = []
 GpuBindGroup = []
 GpuBindGroupDescriptor = []
@@ -415,18 +415,21 @@
 GpuBindGroupLayout = []
 GpuBindGroupLayoutDescriptor = []
 GpuBindGroupLayoutEntry = []
-GpuBindingType = []
-GpuBlendDescriptor = []
+GpuBlendComponent = []
 GpuBlendFactor = []
 GpuBlendOperation = []
+GpuBlendState = []
 GpuBuffer = []
 GpuBufferBinding = []
-GpuBufferCopyView = []
+GpuBufferBindingLayout = []
+GpuBufferBindingType = []
 GpuBufferDescriptor = []
 GpuBufferUsage = []
+GpuCanvasCompositingAlphaMode = []
+GpuCanvasConfiguration = []
 GpuCanvasContext = []
 GpuColorDict = []
-GpuColorStateDescriptor = []
+GpuColorTargetState = []
 GpuColorWrite = []
 GpuCommandBuffer = []
 GpuCommandBufferDescriptor = []
@@ -441,23 +444,29 @@
 GpuComputePipeline = []
 GpuComputePipelineDescriptor = []
 GpuCullMode = []
-GpuDepthStencilStateDescriptor = []
+GpuDepthStencilState = []
 GpuDevice = ["EventTarget"]
 GpuDeviceDescriptor = []
 GpuDeviceLostInfo = []
+GpuDeviceLostReason = []
 GpuErrorFilter = []
 GpuExtent3dDict = []
+GpuExternalTexture = []
+GpuExternalTextureBindingLayout = []
+GpuExternalTextureDescriptor = []
 GpuFeatureName = []
-GpuFence = []
-GpuFenceDescriptor = []
 GpuFilterMode = []
+GpuFragmentState = []
 GpuFrontFace = []
-GpuImageBitmapCopyView = []
+GpuImageCopyBuffer = []
+GpuImageCopyExternalImage = []
+GpuImageCopyTexture = []
+GpuImageCopyTextureTagged = []
+GpuImageDataLayout = []
 GpuIndexFormat = []
-GpuInputStepMode = []
-GpuLimits = []
 GpuLoadOp = []
 GpuMapMode = []
+GpuMultisampleState = []
 GpuObjectDescriptorBase = []
 GpuOrigin2dDict = []
 GpuOrigin3dDict = []
@@ -467,42 +476,47 @@
 GpuPipelineLayoutDescriptor = []
 GpuPipelineStatisticName = []
 GpuPowerPreference = []
+GpuPredefinedColorSpace = []
+GpuPrimitiveState = []
 GpuPrimitiveTopology = []
-GpuProgrammableStageDescriptor = []
+GpuProgrammableStage = []
 GpuQuerySet = []
 GpuQuerySetDescriptor = []
 GpuQueryType = []
 GpuQueue = []
-GpuRasterizationStateDescriptor = []
 GpuRenderBundle = []
 GpuRenderBundleDescriptor = []
 GpuRenderBundleEncoder = []
 GpuRenderBundleEncoderDescriptor = []
-GpuRenderPassColorAttachmentDescriptor = []
-GpuRenderPassDepthStencilAttachmentDescriptor = []
+GpuRenderPassColorAttachment = []
+GpuRenderPassDepthStencilAttachment = []
 GpuRenderPassDescriptor = []
 GpuRenderPassEncoder = []
+GpuRenderPassLayout = []
 GpuRenderPipeline = []
 GpuRenderPipelineDescriptor = []
 GpuRequestAdapterOptions = []
 GpuSampler = []
+GpuSamplerBindingLayout = []
+GpuSamplerBindingType = []
 GpuSamplerDescriptor = []
 GpuShaderModule = []
 GpuShaderModuleDescriptor = []
 GpuShaderStage = []
+GpuStencilFaceState = []
 GpuStencilOperation = []
-GpuStencilStateFaceDescriptor = []
+GpuStorageTextureAccess = []
+GpuStorageTextureBindingLayout = []
 GpuStoreOp = []
-GpuSwapChain = []
-GpuSwapChainDescriptor = []
+GpuSupportedFeatures = []
+GpuSupportedLimits = []
 GpuTexture = []
 GpuTextureAspect = []
-GpuTextureComponentType = []
-GpuTextureCopyView = []
-GpuTextureDataLayout = []
+GpuTextureBindingLayout = []
 GpuTextureDescriptor = []
 GpuTextureDimension = []
 GpuTextureFormat = []
+GpuTextureSampleType = []
 GpuTextureUsage = []
 GpuTextureView = []
 GpuTextureViewDescriptor = []
@@ -510,10 +524,11 @@
 GpuUncapturedErrorEvent = ["Event"]
 GpuUncapturedErrorEventInit = []
 GpuValidationError = []
-GpuVertexAttributeDescriptor = []
-GpuVertexBufferLayoutDescriptor = []
+GpuVertexAttribute = []
+GpuVertexBufferLayout = []
 GpuVertexFormat = []
-GpuVertexStateDescriptor = []
+GpuVertexState = []
+GpuVertexStepMode = []
 GridDeclaration = []
 GridTrackState = []
 GroupedHistoryEventInit = []
@@ -522,6 +537,18 @@
 HashChangeEventInit = []
 Headers = []
 HeadersGuardEnum = []
+Hid = ["EventTarget"]
+HidCollectionInfo = []
+HidConnectionEvent = ["Event"]
+HidConnectionEventInit = []
+HidDevice = ["EventTarget"]
+HidDeviceFilter = []
+HidDeviceRequestOptions = []
+HidInputReportEvent = ["Event"]
+HidInputReportEventInit = []
+HidReportInfo = []
+HidReportItem = []
+HidUnitSystem = []
 HiddenPluginEventInit = []
 History = []
 HitRegionOptions = []
@@ -903,11 +930,20 @@
 PushSubscriptionKeys = []
 PushSubscriptionOptions = []
 PushSubscriptionOptionsInit = []
+QueuingStrategy = []
 RadioNodeList = ["NodeList"]
 Range = []
 RcwnPerfStats = []
 RcwnStatus = []
 ReadableStream = []
+ReadableStreamByobReadResult = []
+ReadableStreamByobReader = []
+ReadableStreamDefaultReadResult = []
+ReadableStreamDefaultReader = []
+ReadableStreamGetReaderOptions = []
+ReadableStreamIteratorOptions = []
+ReadableStreamReaderMode = []
+ReadableWritablePair = []
 RecordingState = []
 ReferrerPolicy = []
 RegisterRequest = []
@@ -1072,6 +1108,7 @@
 StorageEventInit = []
 StorageManager = []
 StorageType = []
+StreamPipeOptions = []
 StyleRuleChangeEventInit = []
 StyleSheet = []
 StyleSheetApplicableStateChangeEventInit = []
@@ -1230,6 +1267,7 @@
 TouchList = []
 TrackEvent = ["Event"]
 TrackEventInit = []
+TransformStream = []
 TransitionEvent = ["Event"]
 TransitionEventInit = []
 Transport = []
@@ -1299,6 +1337,9 @@
 VrSubmitFrameResult = []
 VttCue = ["EventTarget", "TextTrackCue"]
 VttRegion = []
+WakeLock = []
+WakeLockSentinel = ["EventTarget"]
+WakeLockType = []
 WatchAdvertisementsOptions = []
 WaveShaperNode = ["AudioNode", "EventTarget"]
 WaveShaperOptions = []
@@ -1354,6 +1395,8 @@
 Worklet = []
 WorkletGlobalScope = []
 WorkletOptions = []
+WritableStream = []
+WritableStreamDefaultWriter = []
 XPathExpression = []
 XPathNsResolver = []
 XPathResult = []
@@ -1399,7 +1442,7 @@
 console = []
 css = []
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-futures]
-version = "0.4.19"
+version = "0.4.26"
 
 [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
-version = "0.3.19"
+version = "0.3.26"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AddEventListenerOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AddEventListenerOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AddEventListenerOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AddEventListenerOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -67,3 +67,8 @@
         self
     }
 }
+impl Default for AddEventListenerOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AnalyserOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AnalyserOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AnalyserOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AnalyserOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -141,3 +141,8 @@
         self
     }
 }
+impl Default for AnalyserOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AnimationEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AnimationEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AnimationEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AnimationEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -122,3 +122,8 @@
         self
     }
 }
+impl Default for AnimationEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AnimationPlaybackEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AnimationPlaybackEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AnimationPlaybackEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AnimationPlaybackEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for AnimationPlaybackEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AssignedNodesOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AssignedNodesOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AssignedNodesOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AssignedNodesOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for AssignedNodesOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioBuffer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioBuffer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioBuffer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioBuffer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -78,7 +78,7 @@
     #[doc = "*This API requires the following crate features to be activated: `AudioBuffer`*"]
     pub fn copy_to_channel(
         this: &AudioBuffer,
-        source: &mut [f32],
+        source: &[f32],
         channel_number: i32,
     ) -> Result<(), JsValue>;
     # [wasm_bindgen (catch , method , structural , js_class = "AudioBuffer" , js_name = copyToChannel)]
@@ -89,7 +89,7 @@
     #[doc = "*This API requires the following crate features to be activated: `AudioBuffer`*"]
     pub fn copy_to_channel_with_start_in_channel(
         this: &AudioBuffer,
-        source: &mut [f32],
+        source: &[f32],
         channel_number: i32,
         start_in_channel: u32,
     ) -> Result<(), JsValue>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioBufferSourceOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioBufferSourceOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioBufferSourceOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioBufferSourceOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -113,3 +113,8 @@
         self
     }
 }
+impl Default for AudioBufferSourceOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioConfiguration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioConfiguration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioConfiguration.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioConfiguration.rs	2021-12-09 12:01:26.000000000 +0000
@@ -88,3 +88,8 @@
         self
     }
 }
+impl Default for AudioConfiguration {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioContextOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioContextOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioContextOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioContextOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for AudioContextOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioNodeOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioNodeOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioNodeOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioNodeOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -73,3 +73,8 @@
         self
     }
 }
+impl Default for AudioNodeOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioWorkletNodeOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioWorkletNodeOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioWorkletNodeOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AudioWorkletNodeOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -141,3 +141,8 @@
         self
     }
 }
+impl Default for AudioWorkletNodeOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticationExtensionsClientInputs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticationExtensionsClientInputs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticationExtensionsClientInputs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticationExtensionsClientInputs.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,8 @@
         self
     }
 }
+impl Default for AuthenticationExtensionsClientInputs {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticationExtensionsClientOutputs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticationExtensionsClientOutputs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticationExtensionsClientOutputs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticationExtensionsClientOutputs.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,8 @@
         self
     }
 }
+impl Default for AuthenticationExtensionsClientOutputs {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticatorSelectionCriteria.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticatorSelectionCriteria.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticatorSelectionCriteria.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AuthenticatorSelectionCriteria.rs	2021-12-09 12:01:26.000000000 +0000
@@ -73,3 +73,8 @@
         self
     }
 }
+impl Default for AuthenticatorSelectionCriteria {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AutocompleteInfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AutocompleteInfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_AutocompleteInfo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_AutocompleteInfo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -88,3 +88,8 @@
         self
     }
 }
+impl Default for AutocompleteInfo {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BaseComputedKeyframe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BaseComputedKeyframe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BaseComputedKeyframe.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BaseComputedKeyframe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -100,3 +100,8 @@
         self
     }
 }
+impl Default for BaseComputedKeyframe {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BaseKeyframe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BaseKeyframe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BaseKeyframe.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BaseKeyframe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -83,3 +83,8 @@
         self
     }
 }
+impl Default for BaseKeyframe {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BasePropertyIndexedKeyframe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BasePropertyIndexedKeyframe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BasePropertyIndexedKeyframe.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BasePropertyIndexedKeyframe.rs	2021-12-09 12:01:26.000000000 +0000
@@ -65,3 +65,8 @@
         self
     }
 }
+impl Default for BasePropertyIndexedKeyframe {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BasicCardRequest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BasicCardRequest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BasicCardRequest.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BasicCardRequest.rs	2021-12-09 12:01:26.000000000 +0000
@@ -54,3 +54,8 @@
         self
     }
 }
+impl Default for BasicCardRequest {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BiquadFilterOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BiquadFilterOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BiquadFilterOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BiquadFilterOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -144,3 +144,8 @@
         self
     }
 }
+impl Default for BiquadFilterOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BlobEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BlobEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BlobEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BlobEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -85,3 +85,8 @@
         self
     }
 }
+impl Default for BlobEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BlobPropertyBag.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BlobPropertyBag.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BlobPropertyBag.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BlobPropertyBag.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,3 +51,8 @@
         self
     }
 }
+impl Default for BlobPropertyBag {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BlockParsingOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BlockParsingOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BlockParsingOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BlockParsingOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for BlockParsingOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BluetoothDataFilterInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BluetoothDataFilterInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BluetoothDataFilterInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BluetoothDataFilterInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -66,3 +66,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for BluetoothDataFilterInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BluetoothLeScanFilterInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BluetoothLeScanFilterInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BluetoothLeScanFilterInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BluetoothLeScanFilterInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -129,3 +129,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for BluetoothLeScanFilterInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_Bluetooth.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_Bluetooth.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_Bluetooth.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_Bluetooth.rs	2021-12-09 12:01:26.000000000 +0000
@@ -204,17 +204,6 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn get_devices(this: &Bluetooth) -> ::js_sys::Promise;
     #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (method , structural , js_class = "Bluetooth" , js_name = requestDevice)]
-    #[doc = "The `requestDevice()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/Bluetooth/requestDevice)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `Bluetooth`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn request_device(this: &Bluetooth) -> ::js_sys::Promise;
-    #[cfg(web_sys_unstable_apis)]
     #[cfg(feature = "RequestDeviceOptions")]
     # [wasm_bindgen (method , structural , js_class = "Bluetooth" , js_name = requestDevice)]
     #[doc = "The `requestDevice()` method."]
@@ -225,8 +214,5 @@
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn request_device_with_options(
-        this: &Bluetooth,
-        options: &RequestDeviceOptions,
-    ) -> ::js_sys::Promise;
+    pub fn request_device(this: &Bluetooth, options: &RequestDeviceOptions) -> ::js_sys::Promise;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BoxQuadOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BoxQuadOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BoxQuadOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BoxQuadOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,3 +51,8 @@
         self
     }
 }
+impl Default for BoxQuadOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BrowserElementDownloadOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BrowserElementDownloadOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BrowserElementDownloadOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BrowserElementDownloadOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -54,3 +54,8 @@
         self
     }
 }
+impl Default for BrowserElementDownloadOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BrowserElementExecuteScriptOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BrowserElementExecuteScriptOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_BrowserElementExecuteScriptOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_BrowserElementExecuteScriptOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,3 +47,8 @@
         self
     }
 }
+impl Default for BrowserElementExecuteScriptOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CacheBatchOperation.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CacheBatchOperation.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CacheBatchOperation.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CacheBatchOperation.rs	2021-12-09 12:01:26.000000000 +0000
@@ -87,3 +87,8 @@
         self
     }
 }
+impl Default for CacheBatchOperation {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CacheQueryOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CacheQueryOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CacheQueryOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CacheQueryOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -88,3 +88,8 @@
         self
     }
 }
+impl Default for CacheQueryOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CaretStateChangedEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CaretStateChangedEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CaretStateChangedEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CaretStateChangedEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -206,3 +206,8 @@
         self
     }
 }
+impl Default for CaretStateChangedEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ChannelMergerOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ChannelMergerOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ChannelMergerOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ChannelMergerOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -90,3 +90,8 @@
         self
     }
 }
+impl Default for ChannelMergerOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ChannelSplitterOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ChannelSplitterOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ChannelSplitterOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ChannelSplitterOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -90,3 +90,8 @@
         self
     }
 }
+impl Default for ChannelSplitterOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CheckerboardReport.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CheckerboardReport.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CheckerboardReport.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CheckerboardReport.rs	2021-12-09 12:01:26.000000000 +0000
@@ -82,3 +82,8 @@
         self
     }
 }
+impl Default for CheckerboardReport {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ChromeFilePropertyBag.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ChromeFilePropertyBag.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ChromeFilePropertyBag.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ChromeFilePropertyBag.rs	2021-12-09 12:01:26.000000000 +0000
@@ -80,3 +80,8 @@
         self
     }
 }
+impl Default for ChromeFilePropertyBag {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ClientQueryOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ClientQueryOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ClientQueryOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ClientQueryOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,3 +51,8 @@
         self
     }
 }
+impl Default for ClientQueryOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -113,3 +113,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for ClipboardEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardEvent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardEvent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardEvent.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardEvent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -27,30 +27,4 @@
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn clipboard_data(this: &ClipboardEvent) -> Option<DataTransfer>;
-    #[cfg(web_sys_unstable_apis)]
-    #[wasm_bindgen(catch, constructor, js_class = "ClipboardEvent")]
-    #[doc = "The `new ClipboardEvent(..)` constructor, creating a new instance of `ClipboardEvent`."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ClipboardEvent/ClipboardEvent)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `ClipboardEvent`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(type_: &str) -> Result<ClipboardEvent, JsValue>;
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "ClipboardEventInit")]
-    #[wasm_bindgen(catch, constructor, js_class = "ClipboardEvent")]
-    #[doc = "The `new ClipboardEvent(..)` constructor, creating a new instance of `ClipboardEvent`."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ClipboardEvent/ClipboardEvent)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `ClipboardEvent`, `ClipboardEventInit`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new_with_event_init_dict(
-        type_: &str,
-        event_init_dict: &ClipboardEventInit,
-    ) -> Result<ClipboardEvent, JsValue>;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardItemOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardItemOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardItemOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ClipboardItemOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for ClipboardItemOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CloseEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CloseEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CloseEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CloseEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -115,3 +115,8 @@
         self
     }
 }
+impl Default for CloseEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CompositionEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CompositionEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CompositionEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CompositionEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -112,3 +112,8 @@
         self
     }
 }
+impl Default for CompositionEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ComputedEffectTiming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ComputedEffectTiming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ComputedEffectTiming.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ComputedEffectTiming.rs	2021-12-09 12:01:26.000000000 +0000
@@ -232,3 +232,8 @@
         self
     }
 }
+impl Default for ComputedEffectTiming {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConnStatusDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConnStatusDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConnStatusDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConnStatusDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,3 +34,8 @@
         self
     }
 }
+impl Default for ConnStatusDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleCounterError.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleCounterError.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleCounterError.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleCounterError.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for ConsoleCounterError {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleCounter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleCounter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleCounter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleCounter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for ConsoleCounter {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleEvent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleEvent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleEvent.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleEvent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -291,3 +291,8 @@
         self
     }
 }
+impl Default for ConsoleEvent {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleInstanceOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleInstanceOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleInstanceOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleInstanceOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -116,3 +116,8 @@
         self
     }
 }
+impl Default for ConsoleInstanceOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleProfileEvent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleProfileEvent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleProfileEvent.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleProfileEvent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,3 +51,8 @@
         self
     }
 }
+impl Default for ConsoleProfileEvent {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleStackEntry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleStackEntry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleStackEntry.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleStackEntry.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for ConsoleStackEntry {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerError.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerError.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerError.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerError.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for ConsoleTimerError {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerLogOrEnd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerLogOrEnd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerLogOrEnd.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerLogOrEnd.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for ConsoleTimerLogOrEnd {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerStart.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerStart.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerStart.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConsoleTimerStart.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,8 @@
         self
     }
 }
+impl Default for ConsoleTimerStart {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstantSourceOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstantSourceOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstantSourceOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstantSourceOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,3 +34,8 @@
         self
     }
 }
+impl Default for ConstantSourceOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainBooleanParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainBooleanParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainBooleanParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainBooleanParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for ConstrainBooleanParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainDomStringParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainDomStringParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainDomStringParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainDomStringParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for ConstrainDomStringParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainDoubleRange.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainDoubleRange.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainDoubleRange.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainDoubleRange.rs	2021-12-09 12:01:26.000000000 +0000
@@ -72,3 +72,8 @@
         self
     }
 }
+impl Default for ConstrainDoubleRange {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainLongRange.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainLongRange.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainLongRange.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConstrainLongRange.rs	2021-12-09 12:01:26.000000000 +0000
@@ -72,3 +72,8 @@
         self
     }
 }
+impl Default for ConstrainLongRange {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ContextAttributes2d.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ContextAttributes2d.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ContextAttributes2d.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ContextAttributes2d.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for ContextAttributes2d {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConvertCoordinateOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConvertCoordinateOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConvertCoordinateOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConvertCoordinateOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -52,3 +52,8 @@
         self
     }
 }
+impl Default for ConvertCoordinateOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConvolverOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConvolverOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ConvolverOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ConvolverOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for ConvolverOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CredentialCreationOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CredentialCreationOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CredentialCreationOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CredentialCreationOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -53,3 +53,8 @@
         self
     }
 }
+impl Default for CredentialCreationOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CredentialRequestOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CredentialRequestOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CredentialRequestOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CredentialRequestOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -53,3 +53,8 @@
         self
     }
 }
+impl Default for CredentialRequestOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CspPolicies.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CspPolicies.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CspPolicies.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CspPolicies.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for CspPolicies {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CspReportProperties.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CspReportProperties.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CspReportProperties.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CspReportProperties.rs	2021-12-09 12:01:26.000000000 +0000
@@ -173,3 +173,8 @@
         self
     }
 }
+impl Default for CspReportProperties {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CspReport.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CspReport.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CspReport.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CspReport.rs	2021-12-09 12:01:26.000000000 +0000
@@ -38,3 +38,8 @@
         self
     }
 }
+impl Default for CspReport {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_Csp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_Csp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_Csp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_Csp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -394,3 +394,8 @@
         self
     }
 }
+impl Default for Csp {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CustomEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CustomEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_CustomEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_CustomEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -85,3 +85,8 @@
         self
     }
 }
+impl Default for CustomEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DateTimeValue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DateTimeValue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DateTimeValue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DateTimeValue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -86,3 +86,8 @@
         self
     }
 }
+impl Default for DateTimeValue {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DelayOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DelayOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DelayOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DelayOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -107,3 +107,8 @@
         self
     }
 }
+impl Default for DelayOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceAccelerationInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceAccelerationInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceAccelerationInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceAccelerationInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -59,3 +59,8 @@
         self
     }
 }
+impl Default for DeviceAccelerationInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceLightEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceLightEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceLightEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceLightEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,3 +84,8 @@
         self
     }
 }
+impl Default for DeviceLightEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceMotionEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceMotionEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceMotionEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceMotionEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -142,3 +142,8 @@
         self
     }
 }
+impl Default for DeviceMotionEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceOrientationEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceOrientationEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceOrientationEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceOrientationEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -127,3 +127,8 @@
         self
     }
 }
+impl Default for DeviceOrientationEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceProximityEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceProximityEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceProximityEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceProximityEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -110,3 +110,8 @@
         self
     }
 }
+impl Default for DeviceProximityEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceRotationRateInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceRotationRateInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceRotationRateInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DeviceRotationRateInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -59,3 +59,8 @@
         self
     }
 }
+impl Default for DeviceRotationRateInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayMediaStreamConstraints.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayMediaStreamConstraints.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayMediaStreamConstraints.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayMediaStreamConstraints.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,53 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = DisplayMediaStreamConstraints)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `DisplayMediaStreamConstraints` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `DisplayMediaStreamConstraints`*"]
+    pub type DisplayMediaStreamConstraints;
+}
+impl DisplayMediaStreamConstraints {
+    #[doc = "Construct a new `DisplayMediaStreamConstraints`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `DisplayMediaStreamConstraints`*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[doc = "Change the `audio` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `DisplayMediaStreamConstraints`*"]
+    pub fn audio(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("audio"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[doc = "Change the `video` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `DisplayMediaStreamConstraints`*"]
+    pub fn video(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("video"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+impl Default for DisplayMediaStreamConstraints {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayNameOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayNameOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayNameOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayNameOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for DisplayNameOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayNameResult.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayNameResult.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayNameResult.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DisplayNameResult.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,3 +47,8 @@
         self
     }
 }
+impl Default for DisplayNameResult {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsCacheDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsCacheDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsCacheDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsCacheDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for DnsCacheDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsCacheEntry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsCacheEntry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsCacheEntry.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsCacheEntry.rs	2021-12-09 12:01:26.000000000 +0000
@@ -98,3 +98,8 @@
         self
     }
 }
+impl Default for DnsCacheEntry {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsLookupDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsLookupDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsLookupDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DnsLookupDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,3 +64,8 @@
         self
     }
 }
+impl Default for DnsLookupDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DocumentTimelineOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DocumentTimelineOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DocumentTimelineOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DocumentTimelineOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for DocumentTimelineOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomPointInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomPointInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomPointInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomPointInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -72,3 +72,8 @@
         self
     }
 }
+impl Default for DomPointInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomQuadInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomQuadInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomQuadInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomQuadInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -76,3 +76,8 @@
         self
     }
 }
+impl Default for DomQuadInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomQuadJson.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomQuadJson.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomQuadJson.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomQuadJson.rs	2021-12-09 12:01:26.000000000 +0000
@@ -76,3 +76,8 @@
         self
     }
 }
+impl Default for DomQuadJson {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomRectInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomRectInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomRectInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomRectInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -73,3 +73,8 @@
         self
     }
 }
+impl Default for DomRectInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomWindowResizeEventDetail.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomWindowResizeEventDetail.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DomWindowResizeEventDetail.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DomWindowResizeEventDetail.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,3 +47,8 @@
         self
     }
 }
+impl Default for DomWindowResizeEventDetail {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DragEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DragEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DragEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DragEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -486,3 +486,8 @@
         self
     }
 }
+impl Default for DragEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DynamicsCompressorOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DynamicsCompressorOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_DynamicsCompressorOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_DynamicsCompressorOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -147,3 +147,8 @@
         self
     }
 }
+impl Default for DynamicsCompressorOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EffectTiming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EffectTiming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EffectTiming.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EffectTiming.rs	2021-12-09 12:01:26.000000000 +0000
@@ -147,3 +147,8 @@
         self
     }
 }
+impl Default for EffectTiming {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ElementCreationOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ElementCreationOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ElementCreationOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ElementCreationOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,3 +47,8 @@
         self
     }
 }
+impl Default for ElementCreationOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ElementDefinitionOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ElementDefinitionOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ElementDefinitionOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ElementDefinitionOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for ElementDefinitionOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ErrorCallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ErrorCallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ErrorCallback.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ErrorCallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for ErrorCallback {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ErrorEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ErrorEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ErrorEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ErrorEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -145,3 +145,8 @@
         self
     }
 }
+impl Default for ErrorEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for EventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventListenerOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventListenerOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventListenerOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventListenerOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for EventListenerOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventListener.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventListener.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventListener.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventListener.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for EventListener {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventModifierInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventModifierInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventModifierInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventModifierInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -317,3 +317,8 @@
         self
     }
 }
+impl Default for EventModifierInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventSourceInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventSourceInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_EventSourceInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_EventSourceInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for EventSourceInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ExtendableEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ExtendableEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ExtendableEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ExtendableEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for ExtendableEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ExtendableMessageEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ExtendableMessageEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ExtendableMessageEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ExtendableMessageEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -142,3 +142,8 @@
         self
     }
 }
+impl Default for ExtendableMessageEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FetchReadableStreamReadDataArray.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FetchReadableStreamReadDataArray.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FetchReadableStreamReadDataArray.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FetchReadableStreamReadDataArray.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,3 +20,8 @@
         ret
     }
 }
+impl Default for FetchReadableStreamReadDataArray {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FetchReadableStreamReadDataDone.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FetchReadableStreamReadDataDone.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FetchReadableStreamReadDataDone.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FetchReadableStreamReadDataDone.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,8 @@
         self
     }
 }
+impl Default for FetchReadableStreamReadDataDone {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FileCallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FileCallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FileCallback.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FileCallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for FileCallback {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FilePropertyBag.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FilePropertyBag.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FilePropertyBag.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FilePropertyBag.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for FilePropertyBag {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemEntriesCallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemEntriesCallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemEntriesCallback.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemEntriesCallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for FileSystemEntriesCallback {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemEntryCallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemEntryCallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemEntryCallback.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemEntryCallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for FileSystemEntryCallback {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemFlags.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemFlags.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemFlags.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FileSystemFlags.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,3 +51,8 @@
         self
     }
 }
+impl Default for FileSystemFlags {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FocusEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FocusEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FocusEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FocusEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -117,3 +117,8 @@
         self
     }
 }
+impl Default for FocusEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FontFaceDescriptors.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FontFaceDescriptors.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FontFaceDescriptors.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FontFaceDescriptors.rs	2021-12-09 12:01:26.000000000 +0000
@@ -149,3 +149,8 @@
         self
     }
 }
+impl Default for FontFaceDescriptors {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FontFaceSetLoadEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FontFaceSetLoadEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_FontFaceSetLoadEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_FontFaceSetLoadEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -88,3 +88,8 @@
         self
     }
 }
+impl Default for FontFaceSetLoadEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GainOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GainOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GainOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GainOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -86,3 +86,8 @@
         self
     }
 }
+impl Default for GainOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadAxisMoveEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadAxisMoveEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadAxisMoveEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadAxisMoveEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -115,3 +115,8 @@
         self
     }
 }
+impl Default for GamepadAxisMoveEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadButtonEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadButtonEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadButtonEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadButtonEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -103,3 +103,8 @@
         self
     }
 }
+impl Default for GamepadButtonEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GamepadEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -89,3 +89,8 @@
         self
     }
 }
+impl Default for GamepadEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GetNotificationOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GetNotificationOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GetNotificationOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GetNotificationOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,8 @@
         self
     }
 }
+impl Default for GetNotificationOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GetRootNodeOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GetRootNodeOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GetRootNodeOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GetRootNodeOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for GetRootNodeOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuAdapterFeatures.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuAdapterFeatures.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuAdapterFeatures.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuAdapterFeatures.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUAdapterFeatures , typescript_type = "GPUAdapterFeatures")]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuAdapterFeatures` class."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUAdapterFeatures)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuAdapterFeatures`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuAdapterFeatures;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuAdapter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuAdapter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuAdapter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuAdapter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -27,17 +27,40 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn name(this: &GpuAdapter) -> String;
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuAdapterFeatures")]
+    #[cfg(feature = "GpuSupportedFeatures")]
     # [wasm_bindgen (structural , method , getter , js_class = "GPUAdapter" , js_name = features)]
     #[doc = "Getter for the `features` field of this object."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUAdapter/features)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuAdapter`, `GpuAdapterFeatures`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuAdapter`, `GpuSupportedFeatures`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn features(this: &GpuAdapter) -> GpuAdapterFeatures;
+    pub fn features(this: &GpuAdapter) -> GpuSupportedFeatures;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuSupportedLimits")]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUAdapter" , js_name = limits)]
+    #[doc = "Getter for the `limits` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUAdapter/limits)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuAdapter`, `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn limits(this: &GpuAdapter) -> GpuSupportedLimits;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUAdapter" , js_name = isSoftware)]
+    #[doc = "Getter for the `isSoftware` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUAdapter/isSoftware)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuAdapter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn is_software(this: &GpuAdapter) -> bool;
     #[cfg(web_sys_unstable_apis)]
     # [wasm_bindgen (method , structural , js_class = "GPUAdapter" , js_name = requestDevice)]
     #[doc = "The `requestDevice()` method."]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBindGroupLayoutEntry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBindGroupLayoutEntry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBindGroupLayoutEntry.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBindGroupLayoutEntry.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,18 +16,16 @@
 }
 #[cfg(web_sys_unstable_apis)]
 impl GpuBindGroupLayoutEntry {
-    #[cfg(feature = "GpuBindingType")]
     #[doc = "Construct a new `GpuBindGroupLayoutEntry`."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuBindingType`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(binding: u32, type_: GpuBindingType, visibility: u32) -> Self {
+    pub fn new(binding: u32, visibility: u32) -> Self {
         #[allow(unused_mut)]
         let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
         ret.binding(binding);
-        ret.type_(type_);
         ret.visibility(visibility);
         ret
     }
@@ -53,19 +51,17 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `hasDynamicOffset` field of this object."]
+    #[cfg(feature = "GpuBufferBindingLayout")]
+    #[doc = "Change the `buffer` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuBufferBindingLayout`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn has_dynamic_offset(&mut self, val: bool) -> &mut Self {
+    pub fn buffer(&mut self, val: &GpuBufferBindingLayout) -> &mut Self {
         use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("hasDynamicOffset"),
-            &JsValue::from(val),
-        );
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("buffer"), &JsValue::from(val));
         debug_assert!(
             r.is_ok(),
             "setting properties should never fail on our dictionary objects"
@@ -74,17 +70,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `minBufferBindingSize` field of this object."]
+    #[cfg(feature = "GpuExternalTextureBindingLayout")]
+    #[doc = "Change the `externalTexture` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuExternalTextureBindingLayout`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn min_buffer_binding_size(&mut self, val: f64) -> &mut Self {
+    pub fn external_texture(&mut self, val: &GpuExternalTextureBindingLayout) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("minBufferBindingSize"),
+            &JsValue::from("externalTexture"),
             &JsValue::from(val),
         );
         debug_assert!(
@@ -95,18 +92,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureFormat")]
-    #[doc = "Change the `storageTextureFormat` field of this object."]
+    #[cfg(feature = "GpuSamplerBindingLayout")]
+    #[doc = "Change the `sampler` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuTextureFormat`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuSamplerBindingLayout`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn storage_texture_format(&mut self, val: GpuTextureFormat) -> &mut Self {
+    pub fn sampler(&mut self, val: &GpuSamplerBindingLayout) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("storageTextureFormat"),
+            &JsValue::from("sampler"),
             &JsValue::from(val),
         );
         debug_assert!(
@@ -117,18 +114,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureComponentType")]
-    #[doc = "Change the `textureComponentType` field of this object."]
+    #[cfg(feature = "GpuStorageTextureBindingLayout")]
+    #[doc = "Change the `storageTexture` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuTextureComponentType`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuStorageTextureBindingLayout`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn texture_component_type(&mut self, val: GpuTextureComponentType) -> &mut Self {
+    pub fn storage_texture(&mut self, val: &GpuStorageTextureBindingLayout) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("textureComponentType"),
+            &JsValue::from("storageTexture"),
             &JsValue::from(val),
         );
         debug_assert!(
@@ -139,36 +136,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBindingType")]
-    #[doc = "Change the `type` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuBindingType`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn type_(&mut self, val: GpuBindingType) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("type"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureViewDimension")]
-    #[doc = "Change the `viewDimension` field of this object."]
+    #[cfg(feature = "GpuTextureBindingLayout")]
+    #[doc = "Change the `texture` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuTextureViewDimension`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBindGroupLayoutEntry`, `GpuTextureBindingLayout`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn view_dimension(&mut self, val: GpuTextureViewDimension) -> &mut Self {
+    pub fn texture(&mut self, val: &GpuTextureBindingLayout) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("viewDimension"),
+            &JsValue::from("texture"),
             &JsValue::from(val),
         );
         debug_assert!(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBindingType.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBindingType.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBindingType.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBindingType.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#![allow(unused_imports)]
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-#[doc = "The `GpuBindingType` enum."]
-#[doc = ""]
-#[doc = "*This API requires the following crate features to be activated: `GpuBindingType`*"]
-#[doc = ""]
-#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum GpuBindingType {
-    UniformBuffer = "uniform-buffer",
-    StorageBuffer = "storage-buffer",
-    ReadonlyStorageBuffer = "readonly-storage-buffer",
-    Sampler = "sampler",
-    ComparisonSampler = "comparison-sampler",
-    SampledTexture = "sampled-texture",
-    MultisampledTexture = "multisampled-texture",
-    ReadonlyStorageTexture = "readonly-storage-texture",
-    WriteonlyStorageTexture = "writeonly-storage-texture",
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendComponent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendComponent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendComponent.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendComponent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,102 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUBlendComponent)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuBlendComponent` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendComponent`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuBlendComponent;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuBlendComponent {
+    #[doc = "Construct a new `GpuBlendComponent`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendComponent`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuBlendFactor")]
+    #[doc = "Change the `dstFactor` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendComponent`, `GpuBlendFactor`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn dst_factor(&mut self, val: GpuBlendFactor) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("dstFactor"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuBlendOperation")]
+    #[doc = "Change the `operation` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendComponent`, `GpuBlendOperation`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn operation(&mut self, val: GpuBlendOperation) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("operation"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuBlendFactor")]
+    #[doc = "Change the `srcFactor` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendComponent`, `GpuBlendFactor`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn src_factor(&mut self, val: GpuBlendFactor) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("srcFactor"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuBlendComponent {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUBlendDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuBlendDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBlendDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuBlendDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuBlendDescriptor {
-    #[doc = "Construct a new `GpuBlendDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBlendDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new() -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBlendFactor")]
-    #[doc = "Change the `dstFactor` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBlendDescriptor`, `GpuBlendFactor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn dst_factor(&mut self, val: GpuBlendFactor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("dstFactor"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBlendOperation")]
-    #[doc = "Change the `operation` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBlendDescriptor`, `GpuBlendOperation`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn operation(&mut self, val: GpuBlendOperation) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("operation"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBlendFactor")]
-    #[doc = "Change the `srcFactor` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBlendDescriptor`, `GpuBlendFactor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn src_factor(&mut self, val: GpuBlendFactor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("srcFactor"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendFactor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendFactor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendFactor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendFactor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -12,15 +12,15 @@
 pub enum GpuBlendFactor {
     Zero = "zero",
     One = "one",
-    SrcColor = "src-color",
-    OneMinusSrcColor = "one-minus-src-color",
+    Src = "src",
+    OneMinusSrc = "one-minus-src",
     SrcAlpha = "src-alpha",
     OneMinusSrcAlpha = "one-minus-src-alpha",
-    DstColor = "dst-color",
-    OneMinusDstColor = "one-minus-dst-color",
+    Dst = "dst",
+    OneMinusDst = "one-minus-dst",
     DstAlpha = "dst-alpha",
     OneMinusDstAlpha = "one-minus-dst-alpha",
     SrcAlphaSaturated = "src-alpha-saturated",
-    BlendColor = "blend-color",
-    OneMinusBlendColor = "one-minus-blend-color",
+    Constant = "constant",
+    OneMinusConstant = "one-minus-constant",
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendState.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendState.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendState.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBlendState.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,69 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUBlendState)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuBlendState` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuBlendState;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuBlendState {
+    #[cfg(feature = "GpuBlendComponent")]
+    #[doc = "Construct a new `GpuBlendState`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendComponent`, `GpuBlendState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(alpha: &GpuBlendComponent, color: &GpuBlendComponent) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.alpha(alpha);
+        ret.color(color);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuBlendComponent")]
+    #[doc = "Change the `alpha` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendComponent`, `GpuBlendState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn alpha(&mut self, val: &GpuBlendComponent) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("alpha"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuBlendComponent")]
+    #[doc = "Change the `color` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendComponent`, `GpuBlendState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn color(&mut self, val: &GpuBlendComponent) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("color"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferBindingLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferBindingLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferBindingLayout.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferBindingLayout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUBufferBindingLayout)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuBufferBindingLayout` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBufferBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuBufferBindingLayout;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuBufferBindingLayout {
+    #[doc = "Construct a new `GpuBufferBindingLayout`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBufferBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `hasDynamicOffset` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBufferBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn has_dynamic_offset(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("hasDynamicOffset"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `minBindingSize` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBufferBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn min_binding_size(&mut self, val: f64) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("minBindingSize"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuBufferBindingType")]
+    #[doc = "Change the `type` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBufferBindingLayout`, `GpuBufferBindingType`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn type_(&mut self, val: GpuBufferBindingType) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("type"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuBufferBindingLayout {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferBindingType.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferBindingType.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferBindingType.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferBindingType.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `GpuBufferBindingType` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `GpuBufferBindingType`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GpuBufferBindingType {
+    Uniform = "uniform",
+    Storage = "storage",
+    ReadOnlyStorage = "read-only-storage",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferCopyView.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferCopyView.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferCopyView.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuBufferCopyView.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUBufferCopyView)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuBufferCopyView` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBufferCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuBufferCopyView;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuBufferCopyView {
-    #[cfg(feature = "GpuBuffer")]
-    #[doc = "Construct a new `GpuBufferCopyView`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuBufferCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(buffer: &GpuBuffer) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.buffer(buffer);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `bytesPerRow` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBufferCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn bytes_per_row(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("bytesPerRow"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `offset` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBufferCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn offset(&mut self, val: f64) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("offset"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `rowsPerImage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBufferCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn rows_per_image(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("rowsPerImage"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
-    #[doc = "Change the `buffer` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuBufferCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn buffer(&mut self, val: &GpuBuffer) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("buffer"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasCompositingAlphaMode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasCompositingAlphaMode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasCompositingAlphaMode.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasCompositingAlphaMode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `GpuCanvasCompositingAlphaMode` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `GpuCanvasCompositingAlphaMode`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GpuCanvasCompositingAlphaMode {
+    Opaque = "opaque",
+    Premultiplied = "premultiplied",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasConfiguration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasConfiguration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasConfiguration.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasConfiguration.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,149 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUCanvasConfiguration)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuCanvasConfiguration` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasConfiguration`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuCanvasConfiguration;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuCanvasConfiguration {
+    #[cfg(all(feature = "GpuDevice", feature = "GpuTextureFormat",))]
+    #[doc = "Construct a new `GpuCanvasConfiguration`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasConfiguration`, `GpuDevice`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(device: &GpuDevice, format: GpuTextureFormat) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.device(device);
+        ret.format(format);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuPredefinedColorSpace")]
+    #[doc = "Change the `colorSpace` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasConfiguration`, `GpuPredefinedColorSpace`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn color_space(&mut self, val: GpuPredefinedColorSpace) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("colorSpace"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuCanvasCompositingAlphaMode")]
+    #[doc = "Change the `compositingAlphaMode` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasCompositingAlphaMode`, `GpuCanvasConfiguration`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn compositing_alpha_mode(&mut self, val: GpuCanvasCompositingAlphaMode) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("compositingAlphaMode"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuDevice")]
+    #[doc = "Change the `device` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasConfiguration`, `GpuDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn device(&mut self, val: &GpuDevice) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("device"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureFormat")]
+    #[doc = "Change the `format` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasConfiguration`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn format(&mut self, val: GpuTextureFormat) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `size` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasConfiguration`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn size(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("size"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `usage` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasConfiguration`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn usage(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("usage"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasContext.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasContext.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasContext.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCanvasContext.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,33 +16,61 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub type GpuCanvasContext;
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(all(feature = "GpuSwapChain", feature = "GpuSwapChainDescriptor",))]
-    # [wasm_bindgen (method , structural , js_class = "GPUCanvasContext" , js_name = configureSwapChain)]
-    #[doc = "The `configureSwapChain()` method."]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUCanvasContext" , js_name = canvas)]
+    #[doc = "Getter for the `canvas` field of this object."]
     #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCanvasContext/configureSwapChain)"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCanvasContext/canvas)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasContext`, `GpuSwapChain`, `GpuSwapChainDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasContext`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn configure_swap_chain(
-        this: &GpuCanvasContext,
-        descriptor: &GpuSwapChainDescriptor,
-    ) -> GpuSwapChain;
+    pub fn canvas(this: &GpuCanvasContext) -> ::js_sys::Object;
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuDevice")]
-    # [wasm_bindgen (method , structural , js_class = "GPUCanvasContext" , js_name = getSwapChainPreferredFormat)]
-    #[doc = "The `getSwapChainPreferredFormat()` method."]
+    #[cfg(feature = "GpuCanvasConfiguration")]
+    # [wasm_bindgen (method , structural , js_class = "GPUCanvasContext" , js_name = configure)]
+    #[doc = "The `configure()` method."]
     #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCanvasContext/getSwapChainPreferredFormat)"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCanvasContext/configure)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasContext`, `GpuDevice`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasConfiguration`, `GpuCanvasContext`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn get_swap_chain_preferred_format(
-        this: &GpuCanvasContext,
-        device: &GpuDevice,
-    ) -> ::js_sys::Promise;
+    pub fn configure(this: &GpuCanvasContext, configuration: &GpuCanvasConfiguration);
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTexture")]
+    # [wasm_bindgen (method , structural , js_class = "GPUCanvasContext" , js_name = getCurrentTexture)]
+    #[doc = "The `getCurrentTexture()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCanvasContext/getCurrentTexture)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasContext`, `GpuTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn get_current_texture(this: &GpuCanvasContext) -> GpuTexture;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(all(feature = "GpuAdapter", feature = "GpuTextureFormat",))]
+    # [wasm_bindgen (method , structural , js_class = "GPUCanvasContext" , js_name = getPreferredFormat)]
+    #[doc = "The `getPreferredFormat()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCanvasContext/getPreferredFormat)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuAdapter`, `GpuCanvasContext`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn get_preferred_format(this: &GpuCanvasContext, adapter: &GpuAdapter) -> GpuTextureFormat;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "GPUCanvasContext" , js_name = unconfigure)]
+    #[doc = "The `unconfigure()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCanvasContext/unconfigure)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCanvasContext`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unconfigure(this: &GpuCanvasContext);
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuColorStateDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuColorStateDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuColorStateDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuColorStateDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUColorStateDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuColorStateDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuColorStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuColorStateDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuColorStateDescriptor {
-    #[cfg(feature = "GpuTextureFormat")]
-    #[doc = "Construct a new `GpuColorStateDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuColorStateDescriptor`, `GpuTextureFormat`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(format: GpuTextureFormat) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.format(format);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBlendDescriptor")]
-    #[doc = "Change the `alphaBlend` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBlendDescriptor`, `GpuColorStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn alpha_blend(&mut self, val: &GpuBlendDescriptor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("alphaBlend"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBlendDescriptor")]
-    #[doc = "Change the `colorBlend` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBlendDescriptor`, `GpuColorStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn color_blend(&mut self, val: &GpuBlendDescriptor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("colorBlend"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureFormat")]
-    #[doc = "Change the `format` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuColorStateDescriptor`, `GpuTextureFormat`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn format(&mut self, val: GpuTextureFormat) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `writeMask` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuColorStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn write_mask(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("writeMask"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuColorTargetState.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuColorTargetState.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuColorTargetState.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuColorTargetState.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,90 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUColorTargetState)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuColorTargetState` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuColorTargetState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuColorTargetState;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuColorTargetState {
+    #[cfg(feature = "GpuTextureFormat")]
+    #[doc = "Construct a new `GpuColorTargetState`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuColorTargetState`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(format: GpuTextureFormat) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.format(format);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuBlendState")]
+    #[doc = "Change the `blend` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBlendState`, `GpuColorTargetState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn blend(&mut self, val: &GpuBlendState) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("blend"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureFormat")]
+    #[doc = "Change the `format` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuColorTargetState`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn format(&mut self, val: GpuTextureFormat) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `writeMask` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuColorTargetState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn write_mask(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("writeMask"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandBufferDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandBufferDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandBufferDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandBufferDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,3 +45,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuCommandBufferDescriptor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandEncoderDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandEncoderDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandEncoderDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandEncoderDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -66,3 +66,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuCommandEncoderDescriptor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandEncoder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandEncoder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandEncoder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCommandEncoder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -235,113 +235,113 @@
         size: f64,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(all(feature = "GpuBufferCopyView", feature = "GpuTextureCopyView",))]
+    #[cfg(all(feature = "GpuImageCopyBuffer", feature = "GpuImageCopyTexture",))]
     # [wasm_bindgen (method , structural , js_class = "GPUCommandEncoder" , js_name = copyBufferToTexture)]
     #[doc = "The `copyBufferToTexture()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCommandEncoder/copyBufferToTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBufferCopyView`, `GpuCommandEncoder`, `GpuTextureCopyView`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCommandEncoder`, `GpuImageCopyBuffer`, `GpuImageCopyTexture`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn copy_buffer_to_texture_with_u32_sequence(
         this: &GpuCommandEncoder,
-        source: &GpuBufferCopyView,
-        destination: &GpuTextureCopyView,
+        source: &GpuImageCopyBuffer,
+        destination: &GpuImageCopyTexture,
         copy_size: &::wasm_bindgen::JsValue,
     );
     #[cfg(web_sys_unstable_apis)]
     #[cfg(all(
-        feature = "GpuBufferCopyView",
         feature = "GpuExtent3dDict",
-        feature = "GpuTextureCopyView",
+        feature = "GpuImageCopyBuffer",
+        feature = "GpuImageCopyTexture",
     ))]
     # [wasm_bindgen (method , structural , js_class = "GPUCommandEncoder" , js_name = copyBufferToTexture)]
     #[doc = "The `copyBufferToTexture()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCommandEncoder/copyBufferToTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBufferCopyView`, `GpuCommandEncoder`, `GpuExtent3dDict`, `GpuTextureCopyView`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCommandEncoder`, `GpuExtent3dDict`, `GpuImageCopyBuffer`, `GpuImageCopyTexture`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn copy_buffer_to_texture_with_gpu_extent_3d_dict(
         this: &GpuCommandEncoder,
-        source: &GpuBufferCopyView,
-        destination: &GpuTextureCopyView,
+        source: &GpuImageCopyBuffer,
+        destination: &GpuImageCopyTexture,
         copy_size: &GpuExtent3dDict,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(all(feature = "GpuBufferCopyView", feature = "GpuTextureCopyView",))]
+    #[cfg(all(feature = "GpuImageCopyBuffer", feature = "GpuImageCopyTexture",))]
     # [wasm_bindgen (method , structural , js_class = "GPUCommandEncoder" , js_name = copyTextureToBuffer)]
     #[doc = "The `copyTextureToBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCommandEncoder/copyTextureToBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBufferCopyView`, `GpuCommandEncoder`, `GpuTextureCopyView`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCommandEncoder`, `GpuImageCopyBuffer`, `GpuImageCopyTexture`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn copy_texture_to_buffer_with_u32_sequence(
         this: &GpuCommandEncoder,
-        source: &GpuTextureCopyView,
-        destination: &GpuBufferCopyView,
+        source: &GpuImageCopyTexture,
+        destination: &GpuImageCopyBuffer,
         copy_size: &::wasm_bindgen::JsValue,
     );
     #[cfg(web_sys_unstable_apis)]
     #[cfg(all(
-        feature = "GpuBufferCopyView",
         feature = "GpuExtent3dDict",
-        feature = "GpuTextureCopyView",
+        feature = "GpuImageCopyBuffer",
+        feature = "GpuImageCopyTexture",
     ))]
     # [wasm_bindgen (method , structural , js_class = "GPUCommandEncoder" , js_name = copyTextureToBuffer)]
     #[doc = "The `copyTextureToBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCommandEncoder/copyTextureToBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBufferCopyView`, `GpuCommandEncoder`, `GpuExtent3dDict`, `GpuTextureCopyView`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCommandEncoder`, `GpuExtent3dDict`, `GpuImageCopyBuffer`, `GpuImageCopyTexture`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn copy_texture_to_buffer_with_gpu_extent_3d_dict(
         this: &GpuCommandEncoder,
-        source: &GpuTextureCopyView,
-        destination: &GpuBufferCopyView,
+        source: &GpuImageCopyTexture,
+        destination: &GpuImageCopyBuffer,
         copy_size: &GpuExtent3dDict,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureCopyView")]
+    #[cfg(feature = "GpuImageCopyTexture")]
     # [wasm_bindgen (method , structural , js_class = "GPUCommandEncoder" , js_name = copyTextureToTexture)]
     #[doc = "The `copyTextureToTexture()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCommandEncoder/copyTextureToTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuCommandEncoder`, `GpuTextureCopyView`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCommandEncoder`, `GpuImageCopyTexture`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn copy_texture_to_texture_with_u32_sequence(
         this: &GpuCommandEncoder,
-        source: &GpuTextureCopyView,
-        destination: &GpuTextureCopyView,
+        source: &GpuImageCopyTexture,
+        destination: &GpuImageCopyTexture,
         copy_size: &::wasm_bindgen::JsValue,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(all(feature = "GpuExtent3dDict", feature = "GpuTextureCopyView",))]
+    #[cfg(all(feature = "GpuExtent3dDict", feature = "GpuImageCopyTexture",))]
     # [wasm_bindgen (method , structural , js_class = "GPUCommandEncoder" , js_name = copyTextureToTexture)]
     #[doc = "The `copyTextureToTexture()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCommandEncoder/copyTextureToTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuCommandEncoder`, `GpuExtent3dDict`, `GpuTextureCopyView`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCommandEncoder`, `GpuExtent3dDict`, `GpuImageCopyTexture`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn copy_texture_to_texture_with_gpu_extent_3d_dict(
         this: &GpuCommandEncoder,
-        source: &GpuTextureCopyView,
-        destination: &GpuTextureCopyView,
+        source: &GpuImageCopyTexture,
+        destination: &GpuImageCopyTexture,
         copy_size: &GpuExtent3dDict,
     );
     #[cfg(web_sys_unstable_apis)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCompilationMessage.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCompilationMessage.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCompilationMessage.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuCompilationMessage.rs	2021-12-09 12:01:26.000000000 +0000
@@ -60,4 +60,26 @@
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn line_pos(this: &GpuCompilationMessage) -> f64;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUCompilationMessage" , js_name = offset)]
+    #[doc = "Getter for the `offset` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCompilationMessage/offset)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCompilationMessage`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn offset(this: &GpuCompilationMessage) -> f64;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUCompilationMessage" , js_name = length)]
+    #[doc = "Getter for the `length` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUCompilationMessage/length)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCompilationMessage`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn length(this: &GpuCompilationMessage) -> f64;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuComputePassDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuComputePassDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuComputePassDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuComputePassDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,3 +45,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuComputePassDescriptor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuComputePipelineDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuComputePipelineDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuComputePipelineDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuComputePipelineDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,17 +16,17 @@
 }
 #[cfg(web_sys_unstable_apis)]
 impl GpuComputePipelineDescriptor {
-    #[cfg(feature = "GpuProgrammableStageDescriptor")]
+    #[cfg(feature = "GpuProgrammableStage")]
     #[doc = "Construct a new `GpuComputePipelineDescriptor`."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuComputePipelineDescriptor`, `GpuProgrammableStageDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuComputePipelineDescriptor`, `GpuProgrammableStage`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(compute_stage: &GpuProgrammableStageDescriptor) -> Self {
+    pub fn new(compute: &GpuProgrammableStage) -> Self {
         #[allow(unused_mut)]
         let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.compute_stage(compute_stage);
+        ret.compute(compute);
         ret
     }
     #[cfg(web_sys_unstable_apis)]
@@ -66,18 +66,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuProgrammableStageDescriptor")]
-    #[doc = "Change the `computeStage` field of this object."]
+    #[cfg(feature = "GpuProgrammableStage")]
+    #[doc = "Change the `compute` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuComputePipelineDescriptor`, `GpuProgrammableStageDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuComputePipelineDescriptor`, `GpuProgrammableStage`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn compute_stage(&mut self, val: &GpuProgrammableStageDescriptor) -> &mut Self {
+    pub fn compute(&mut self, val: &GpuProgrammableStage) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("computeStage"),
+            &JsValue::from("compute"),
             &JsValue::from(val),
         );
         debug_assert!(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDepthStencilStateDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDepthStencilStateDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDepthStencilStateDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDepthStencilStateDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUDepthStencilStateDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuDepthStencilStateDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuDepthStencilStateDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuDepthStencilStateDescriptor {
-    #[cfg(feature = "GpuTextureFormat")]
-    #[doc = "Construct a new `GpuDepthStencilStateDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`, `GpuTextureFormat`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(format: GpuTextureFormat) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.format(format);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuCompareFunction")]
-    #[doc = "Change the `depthCompare` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuCompareFunction`, `GpuDepthStencilStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_compare(&mut self, val: GpuCompareFunction) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthCompare"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `depthWriteEnabled` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_write_enabled(&mut self, val: bool) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthWriteEnabled"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureFormat")]
-    #[doc = "Change the `format` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`, `GpuTextureFormat`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn format(&mut self, val: GpuTextureFormat) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuStencilStateFaceDescriptor")]
-    #[doc = "Change the `stencilBack` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`, `GpuStencilStateFaceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn stencil_back(&mut self, val: &GpuStencilStateFaceDescriptor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("stencilBack"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuStencilStateFaceDescriptor")]
-    #[doc = "Change the `stencilFront` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`, `GpuStencilStateFaceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn stencil_front(&mut self, val: &GpuStencilStateFaceDescriptor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("stencilFront"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `stencilReadMask` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn stencil_read_mask(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("stencilReadMask"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `stencilWriteMask` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn stencil_write_mask(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("stencilWriteMask"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDepthStencilState.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDepthStencilState.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDepthStencilState.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDepthStencilState.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,243 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUDepthStencilState)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuDepthStencilState` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuDepthStencilState;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuDepthStencilState {
+    #[cfg(feature = "GpuTextureFormat")]
+    #[doc = "Construct a new `GpuDepthStencilState`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(format: GpuTextureFormat) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.format(format);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `depthBias` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_bias(&mut self, val: i32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthBias"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `depthBiasClamp` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_bias_clamp(&mut self, val: f32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthBiasClamp"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `depthBiasSlopeScale` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_bias_slope_scale(&mut self, val: f32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthBiasSlopeScale"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuCompareFunction")]
+    #[doc = "Change the `depthCompare` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCompareFunction`, `GpuDepthStencilState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_compare(&mut self, val: GpuCompareFunction) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthCompare"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `depthWriteEnabled` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_write_enabled(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthWriteEnabled"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureFormat")]
+    #[doc = "Change the `format` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn format(&mut self, val: GpuTextureFormat) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStencilFaceState")]
+    #[doc = "Change the `stencilBack` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`, `GpuStencilFaceState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn stencil_back(&mut self, val: &GpuStencilFaceState) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stencilBack"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStencilFaceState")]
+    #[doc = "Change the `stencilFront` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`, `GpuStencilFaceState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn stencil_front(&mut self, val: &GpuStencilFaceState) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stencilFront"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `stencilReadMask` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn stencil_read_mask(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stencilReadMask"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `stencilWriteMask` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn stencil_write_mask(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stencilWriteMask"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,17 +45,17 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `features` field of this object."]
+    #[doc = "Change the `requiredFeatures` field of this object."]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `GpuDeviceDescriptor`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn features(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+    pub fn required_features(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("features"),
+            &JsValue::from("requiredFeatures"),
             &JsValue::from(val),
         );
         debug_assert!(
@@ -65,23 +65,10 @@
         let _ = r;
         self
     }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuLimits")]
-    #[doc = "Change the `limits` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDeviceDescriptor`, `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn limits(&mut self, val: &GpuLimits) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("limits"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuDeviceDescriptor {
+    fn default() -> Self {
+        Self::new()
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceLostInfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceLostInfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceLostInfo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceLostInfo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,6 +16,17 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub type GpuDeviceLostInfo;
     #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUDeviceLostInfo" , js_name = reason)]
+    #[doc = "Getter for the `reason` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDeviceLostInfo/reason)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDeviceLostInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn reason(this: &GpuDeviceLostInfo) -> ::wasm_bindgen::JsValue;
+    #[cfg(web_sys_unstable_apis)]
     # [wasm_bindgen (structural , method , getter , js_class = "GPUDeviceLostInfo" , js_name = message)]
     #[doc = "Getter for the `message` field of this object."]
     #[doc = ""]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceLostReason.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceLostReason.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceLostReason.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDeviceLostReason.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `GpuDeviceLostReason` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `GpuDeviceLostReason`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GpuDeviceLostReason {
+    Destroyed = "destroyed",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDevice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDevice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDevice.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuDevice.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,51 +16,41 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub type GpuDevice;
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuAdapter")]
-    # [wasm_bindgen (structural , method , getter , js_class = "GPUDevice" , js_name = adapter)]
-    #[doc = "Getter for the `adapter` field of this object."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/adapter)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuAdapter`, `GpuDevice`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn adapter(this: &GpuDevice) -> GpuAdapter;
-    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuSupportedFeatures")]
     # [wasm_bindgen (structural , method , getter , js_class = "GPUDevice" , js_name = features)]
     #[doc = "Getter for the `features` field of this object."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/features)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`, `GpuSupportedFeatures`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn features(this: &GpuDevice) -> ::js_sys::Array;
+    pub fn features(this: &GpuDevice) -> GpuSupportedFeatures;
     #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuSupportedLimits")]
     # [wasm_bindgen (structural , method , getter , js_class = "GPUDevice" , js_name = limits)]
     #[doc = "Getter for the `limits` field of this object."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/limits)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`, `GpuSupportedLimits`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn limits(this: &GpuDevice) -> ::js_sys::Object;
+    pub fn limits(this: &GpuDevice) -> GpuSupportedLimits;
     #[cfg(web_sys_unstable_apis)]
     #[cfg(feature = "GpuQueue")]
-    # [wasm_bindgen (structural , method , getter , js_class = "GPUDevice" , js_name = defaultQueue)]
-    #[doc = "Getter for the `defaultQueue` field of this object."]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUDevice" , js_name = queue)]
+    #[doc = "Getter for the `queue` field of this object."]
     #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/defaultQueue)"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/queue)"]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `GpuDevice`, `GpuQueue`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn default_queue(this: &GpuDevice) -> GpuQueue;
+    pub fn queue(this: &GpuDevice) -> GpuQueue;
     #[cfg(web_sys_unstable_apis)]
     # [wasm_bindgen (structural , method , getter , js_class = "GPUDevice" , js_name = lost)]
     #[doc = "Getter for the `lost` field of this object."]
@@ -205,6 +195,21 @@
         descriptor: &GpuComputePipelineDescriptor,
     ) -> GpuComputePipeline;
     #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuComputePipelineDescriptor")]
+    # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = createComputePipelineAsync)]
+    #[doc = "The `createComputePipelineAsync()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/createComputePipelineAsync)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuComputePipelineDescriptor`, `GpuDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn create_compute_pipeline_async(
+        this: &GpuDevice,
+        descriptor: &GpuComputePipelineDescriptor,
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
     #[cfg(all(feature = "GpuPipelineLayout", feature = "GpuPipelineLayoutDescriptor",))]
     # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = createPipelineLayout)]
     #[doc = "The `createPipelineLayout()` method."]
@@ -232,36 +237,6 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn create_query_set(this: &GpuDevice, descriptor: &GpuQuerySetDescriptor) -> GpuQuerySet;
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuComputePipelineDescriptor")]
-    # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = createReadyComputePipeline)]
-    #[doc = "The `createReadyComputePipeline()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/createReadyComputePipeline)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuComputePipelineDescriptor`, `GpuDevice`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn create_ready_compute_pipeline(
-        this: &GpuDevice,
-        descriptor: &GpuComputePipelineDescriptor,
-    ) -> ::js_sys::Promise;
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuRenderPipelineDescriptor")]
-    # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = createReadyRenderPipeline)]
-    #[doc = "The `createReadyRenderPipeline()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/createReadyRenderPipeline)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`, `GpuRenderPipelineDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn create_ready_render_pipeline(
-        this: &GpuDevice,
-        descriptor: &GpuRenderPipelineDescriptor,
-    ) -> ::js_sys::Promise;
-    #[cfg(web_sys_unstable_apis)]
     #[cfg(all(
         feature = "GpuRenderBundleEncoder",
         feature = "GpuRenderBundleEncoderDescriptor",
@@ -295,6 +270,21 @@
         descriptor: &GpuRenderPipelineDescriptor,
     ) -> GpuRenderPipeline;
     #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuRenderPipelineDescriptor")]
+    # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = createRenderPipelineAsync)]
+    #[doc = "The `createRenderPipelineAsync()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/createRenderPipelineAsync)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`, `GpuRenderPipelineDescriptor`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn create_render_pipeline_async(
+        this: &GpuDevice,
+        descriptor: &GpuRenderPipelineDescriptor,
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
     #[cfg(feature = "GpuSampler")]
     # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = createSampler)]
     #[doc = "The `createSampler()` method."]
@@ -349,6 +339,35 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn create_texture(this: &GpuDevice, descriptor: &GpuTextureDescriptor) -> GpuTexture;
     #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = destroy)]
+    #[doc = "The `destroy()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/destroy)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn destroy(this: &GpuDevice);
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(all(
+        feature = "GpuExternalTexture",
+        feature = "GpuExternalTextureDescriptor",
+    ))]
+    # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = importExternalTexture)]
+    #[doc = "The `importExternalTexture()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUDevice/importExternalTexture)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`, `GpuExternalTexture`, `GpuExternalTextureDescriptor`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn import_external_texture(
+        this: &GpuDevice,
+        descriptor: &GpuExternalTextureDescriptor,
+    ) -> GpuExternalTexture;
+    #[cfg(web_sys_unstable_apis)]
     # [wasm_bindgen (method , structural , js_class = "GPUDevice" , js_name = popErrorScope)]
     #[doc = "The `popErrorScope()` method."]
     #[doc = ""]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExtent3dDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExtent3dDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExtent3dDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExtent3dDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,21 +22,26 @@
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new() -> Self {
+    pub fn new(width: u32) -> Self {
         #[allow(unused_mut)]
         let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.width(width);
         ret
     }
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `depth` field of this object."]
+    #[doc = "Change the `depthOrArrayLayers` field of this object."]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `GpuExtent3dDict`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth(&mut self, val: u32) -> &mut Self {
+    pub fn depth_or_array_layers(&mut self, val: u32) -> &mut Self {
         use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("depth"), &JsValue::from(val));
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthOrArrayLayers"),
+            &JsValue::from(val),
+        );
         debug_assert!(
             r.is_ok(),
             "setting properties should never fail on our dictionary objects"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTextureBindingLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTextureBindingLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTextureBindingLayout.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTextureBindingLayout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,36 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUExternalTextureBindingLayout)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuExternalTextureBindingLayout` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTextureBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuExternalTextureBindingLayout;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuExternalTextureBindingLayout {
+    #[doc = "Construct a new `GpuExternalTextureBindingLayout`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTextureBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuExternalTextureBindingLayout {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTextureDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTextureDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTextureDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTextureDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,90 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUExternalTextureDescriptor)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuExternalTextureDescriptor` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTextureDescriptor`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuExternalTextureDescriptor;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuExternalTextureDescriptor {
+    #[cfg(feature = "HtmlVideoElement")]
+    #[doc = "Construct a new `GpuExternalTextureDescriptor`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTextureDescriptor`, `HtmlVideoElement`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(source: &HtmlVideoElement) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.source(source);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `label` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTextureDescriptor`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn label(&mut self, val: &str) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("label"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuPredefinedColorSpace")]
+    #[doc = "Change the `colorSpace` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTextureDescriptor`, `GpuPredefinedColorSpace`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn color_space(&mut self, val: GpuPredefinedColorSpace) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("colorSpace"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "HtmlVideoElement")]
+    #[doc = "Change the `source` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTextureDescriptor`, `HtmlVideoElement`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn source(&mut self, val: &HtmlVideoElement) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("source"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTexture.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTexture.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTexture.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuExternalTexture.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,40 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUExternalTexture , typescript_type = "GPUExternalTexture")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuExternalTexture` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUExternalTexture)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuExternalTexture;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUExternalTexture" , js_name = label)]
+    #[doc = "Getter for the `label` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUExternalTexture/label)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn label(this: &GpuExternalTexture) -> Option<String>;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , setter , js_class = "GPUExternalTexture" , js_name = label)]
+    #[doc = "Setter for the `label` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUExternalTexture/label)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExternalTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn set_label(this: &GpuExternalTexture, value: Option<&str>);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFenceDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFenceDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFenceDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFenceDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUFenceDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuFenceDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFenceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuFenceDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuFenceDescriptor {
-    #[doc = "Construct a new `GpuFenceDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFenceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new() -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `label` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFenceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn label(&mut self, val: &str) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("label"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `initialValue` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFenceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn initial_value(&mut self, val: f64) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("initialValue"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFence.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFence.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFence.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFence.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUFence , typescript_type = "GPUFence")]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuFence` class."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUFence)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuFence;
-    #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (structural , method , getter , js_class = "GPUFence" , js_name = label)]
-    #[doc = "Getter for the `label` field of this object."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUFence/label)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn label(this: &GpuFence) -> Option<String>;
-    #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (structural , method , setter , js_class = "GPUFence" , js_name = label)]
-    #[doc = "Setter for the `label` field of this object."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUFence/label)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn set_label(this: &GpuFence, value: Option<&str>);
-    #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (method , structural , js_class = "GPUFence" , js_name = getCompletedValue)]
-    #[doc = "The `getCompletedValue()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUFence/getCompletedValue)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn get_completed_value(this: &GpuFence) -> f64;
-    #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (method , structural , js_class = "GPUFence" , js_name = onCompletion)]
-    #[doc = "The `onCompletion()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUFence/onCompletion)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn on_completion_with_u32(this: &GpuFence, completion_value: u32) -> ::js_sys::Promise;
-    #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (method , structural , js_class = "GPUFence" , js_name = onCompletion)]
-    #[doc = "The `onCompletion()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUFence/onCompletion)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn on_completion_with_f64(this: &GpuFence, completion_value: f64) -> ::js_sys::Promise;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFragmentState.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFragmentState.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFragmentState.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuFragmentState.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,99 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUFragmentState)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuFragmentState` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuFragmentState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuFragmentState;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuFragmentState {
+    #[cfg(feature = "GpuShaderModule")]
+    #[doc = "Construct a new `GpuFragmentState`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuFragmentState`, `GpuShaderModule`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(
+        entry_point: &str,
+        module: &GpuShaderModule,
+        targets: &::wasm_bindgen::JsValue,
+    ) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.entry_point(entry_point);
+        ret.module(module);
+        ret.targets(targets);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `entryPoint` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuFragmentState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn entry_point(&mut self, val: &str) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("entryPoint"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuShaderModule")]
+    #[doc = "Change the `module` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuFragmentState`, `GpuShaderModule`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn module(&mut self, val: &GpuShaderModule) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("module"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `targets` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuFragmentState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn targets(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("targets"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageBitmapCopyView.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageBitmapCopyView.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageBitmapCopyView.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageBitmapCopyView.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUImageBitmapCopyView)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuImageBitmapCopyView` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuImageBitmapCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuImageBitmapCopyView;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuImageBitmapCopyView {
-    #[cfg(feature = "ImageBitmap")]
-    #[doc = "Construct a new `GpuImageBitmapCopyView`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuImageBitmapCopyView`, `ImageBitmap`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(image_bitmap: &ImageBitmap) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.image_bitmap(image_bitmap);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "ImageBitmap")]
-    #[doc = "Change the `imageBitmap` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuImageBitmapCopyView`, `ImageBitmap`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn image_bitmap(&mut self, val: &ImageBitmap) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("imageBitmap"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `origin` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuImageBitmapCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn origin(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("origin"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyBuffer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyBuffer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyBuffer.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyBuffer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,111 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUImageCopyBuffer)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuImageCopyBuffer` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyBuffer`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuImageCopyBuffer;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuImageCopyBuffer {
+    #[cfg(feature = "GpuBuffer")]
+    #[doc = "Construct a new `GpuImageCopyBuffer`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuImageCopyBuffer`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(buffer: &GpuBuffer) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.buffer(buffer);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `bytesPerRow` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyBuffer`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn bytes_per_row(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("bytesPerRow"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `offset` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyBuffer`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn offset(&mut self, val: f64) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("offset"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `rowsPerImage` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyBuffer`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn rows_per_image(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("rowsPerImage"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuBuffer")]
+    #[doc = "Change the `buffer` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuImageCopyBuffer`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn buffer(&mut self, val: &GpuBuffer) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("buffer"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyExternalImage.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyExternalImage.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyExternalImage.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyExternalImage.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,67 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUImageCopyExternalImage)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuImageCopyExternalImage` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyExternalImage`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuImageCopyExternalImage;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuImageCopyExternalImage {
+    #[doc = "Construct a new `GpuImageCopyExternalImage`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyExternalImage`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(source: &::js_sys::Object) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.source(source);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `origin` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyExternalImage`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn origin(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("origin"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `source` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyExternalImage`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn source(&mut self, val: &::js_sys::Object) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("source"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyTexture.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyTexture.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyTexture.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyTexture.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,112 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUImageCopyTexture)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuImageCopyTexture` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuImageCopyTexture;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuImageCopyTexture {
+    #[cfg(feature = "GpuTexture")]
+    #[doc = "Construct a new `GpuImageCopyTexture`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTexture`, `GpuTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(texture: &GpuTexture) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.texture(texture);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureAspect")]
+    #[doc = "Change the `aspect` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTexture`, `GpuTextureAspect`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn aspect(&mut self, val: GpuTextureAspect) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("aspect"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `mipLevel` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn mip_level(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("mipLevel"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `origin` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn origin(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("origin"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTexture")]
+    #[doc = "Change the `texture` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTexture`, `GpuTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn texture(&mut self, val: &GpuTexture) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("texture"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyTextureTagged.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyTextureTagged.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyTextureTagged.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageCopyTextureTagged.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,155 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUImageCopyTextureTagged)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuImageCopyTextureTagged` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTextureTagged`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuImageCopyTextureTagged;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuImageCopyTextureTagged {
+    #[cfg(feature = "GpuTexture")]
+    #[doc = "Construct a new `GpuImageCopyTextureTagged`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTextureTagged`, `GpuTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(texture: &GpuTexture) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.texture(texture);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureAspect")]
+    #[doc = "Change the `aspect` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTextureTagged`, `GpuTextureAspect`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn aspect(&mut self, val: GpuTextureAspect) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("aspect"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `mipLevel` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTextureTagged`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn mip_level(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("mipLevel"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `origin` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTextureTagged`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn origin(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("origin"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTexture")]
+    #[doc = "Change the `texture` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTextureTagged`, `GpuTexture`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn texture(&mut self, val: &GpuTexture) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("texture"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuPredefinedColorSpace")]
+    #[doc = "Change the `colorSpace` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTextureTagged`, `GpuPredefinedColorSpace`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn color_space(&mut self, val: GpuPredefinedColorSpace) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("colorSpace"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `premultipliedAlpha` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTextureTagged`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn premultiplied_alpha(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("premultipliedAlpha"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageDataLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageDataLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageDataLayout.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuImageDataLayout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUImageDataLayout)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuImageDataLayout` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageDataLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuImageDataLayout;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuImageDataLayout {
+    #[doc = "Construct a new `GpuImageDataLayout`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageDataLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `bytesPerRow` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageDataLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn bytes_per_row(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("bytesPerRow"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `offset` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageDataLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn offset(&mut self, val: f64) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("offset"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `rowsPerImage` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageDataLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn rows_per_image(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("rowsPerImage"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuImageDataLayout {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuInputStepMode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuInputStepMode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuInputStepMode.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuInputStepMode.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#![allow(unused_imports)]
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-#[doc = "The `GpuInputStepMode` enum."]
-#[doc = ""]
-#[doc = "*This API requires the following crate features to be activated: `GpuInputStepMode`*"]
-#[doc = ""]
-#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum GpuInputStepMode {
-    Vertex = "vertex",
-    Instance = "instance",
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuLimits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuLimits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuLimits.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuLimits.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,240 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPULimits)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuLimits` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuLimits;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuLimits {
-    #[doc = "Construct a new `GpuLimits`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new() -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxBindGroups` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_bind_groups(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxBindGroups"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxDynamicStorageBuffersPerPipelineLayout` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_dynamic_storage_buffers_per_pipeline_layout(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxDynamicStorageBuffersPerPipelineLayout"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxDynamicUniformBuffersPerPipelineLayout` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_dynamic_uniform_buffers_per_pipeline_layout(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxDynamicUniformBuffersPerPipelineLayout"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxSampledTexturesPerShaderStage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_sampled_textures_per_shader_stage(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxSampledTexturesPerShaderStage"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxSamplersPerShaderStage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_samplers_per_shader_stage(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxSamplersPerShaderStage"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxStorageBufferBindingSize` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_storage_buffer_binding_size(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxStorageBufferBindingSize"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxStorageBuffersPerShaderStage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_storage_buffers_per_shader_stage(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxStorageBuffersPerShaderStage"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxStorageTexturesPerShaderStage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_storage_textures_per_shader_stage(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxStorageTexturesPerShaderStage"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxUniformBufferBindingSize` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_uniform_buffer_binding_size(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxUniformBufferBindingSize"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `maxUniformBuffersPerShaderStage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuLimits`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn max_uniform_buffers_per_shader_stage(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("maxUniformBuffersPerShaderStage"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuMultisampleState.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuMultisampleState.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuMultisampleState.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuMultisampleState.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,91 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUMultisampleState)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuMultisampleState` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuMultisampleState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuMultisampleState;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuMultisampleState {
+    #[doc = "Construct a new `GpuMultisampleState`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuMultisampleState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `alphaToCoverageEnabled` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuMultisampleState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn alpha_to_coverage_enabled(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("alphaToCoverageEnabled"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `count` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuMultisampleState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn count(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("count"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `mask` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuMultisampleState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn mask(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("mask"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuMultisampleState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuObjectDescriptorBase.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuObjectDescriptorBase.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuObjectDescriptorBase.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuObjectDescriptorBase.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,3 +45,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuObjectDescriptorBase {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuOrigin2dDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuOrigin2dDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuOrigin2dDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuOrigin2dDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -62,3 +62,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuOrigin2dDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuOrigin3dDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuOrigin3dDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuOrigin3dDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuOrigin3dDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -79,3 +79,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuOrigin3dDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPipelineDescriptorBase.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPipelineDescriptorBase.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPipelineDescriptorBase.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPipelineDescriptorBase.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,3 +64,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuPipelineDescriptorBase {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPredefinedColorSpace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPredefinedColorSpace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPredefinedColorSpace.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPredefinedColorSpace.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `GpuPredefinedColorSpace` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `GpuPredefinedColorSpace`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GpuPredefinedColorSpace {
+    Srgb = "srgb",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPrimitiveState.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPrimitiveState.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPrimitiveState.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuPrimitiveState.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,145 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUPrimitiveState)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuPrimitiveState` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuPrimitiveState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuPrimitiveState;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuPrimitiveState {
+    #[doc = "Construct a new `GpuPrimitiveState`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuPrimitiveState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `clampDepth` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuPrimitiveState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn clamp_depth(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("clampDepth"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuCullMode")]
+    #[doc = "Change the `cullMode` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCullMode`, `GpuPrimitiveState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn cull_mode(&mut self, val: GpuCullMode) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("cullMode"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuFrontFace")]
+    #[doc = "Change the `frontFace` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuFrontFace`, `GpuPrimitiveState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn front_face(&mut self, val: GpuFrontFace) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("frontFace"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuIndexFormat")]
+    #[doc = "Change the `stripIndexFormat` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuIndexFormat`, `GpuPrimitiveState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn strip_index_format(&mut self, val: GpuIndexFormat) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stripIndexFormat"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuPrimitiveTopology")]
+    #[doc = "Change the `topology` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuPrimitiveState`, `GpuPrimitiveTopology`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn topology(&mut self, val: GpuPrimitiveTopology) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("topology"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuPrimitiveState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuProgrammableStageDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuProgrammableStageDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuProgrammableStageDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuProgrammableStageDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUProgrammableStageDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuProgrammableStageDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStageDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuProgrammableStageDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuProgrammableStageDescriptor {
-    #[cfg(feature = "GpuShaderModule")]
-    #[doc = "Construct a new `GpuProgrammableStageDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStageDescriptor`, `GpuShaderModule`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(entry_point: &str, module: &GpuShaderModule) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.entry_point(entry_point);
-        ret.module(module);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `entryPoint` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStageDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn entry_point(&mut self, val: &str) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("entryPoint"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuShaderModule")]
-    #[doc = "Change the `module` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStageDescriptor`, `GpuShaderModule`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn module(&mut self, val: &GpuShaderModule) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("module"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuProgrammableStage.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuProgrammableStage.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuProgrammableStage.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuProgrammableStage.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,73 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUProgrammableStage)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuProgrammableStage` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStage`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuProgrammableStage;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuProgrammableStage {
+    #[cfg(feature = "GpuShaderModule")]
+    #[doc = "Construct a new `GpuProgrammableStage`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStage`, `GpuShaderModule`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(entry_point: &str, module: &GpuShaderModule) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.entry_point(entry_point);
+        ret.module(module);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `entryPoint` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStage`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn entry_point(&mut self, val: &str) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("entryPoint"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuShaderModule")]
+    #[doc = "Change the `module` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStage`, `GpuShaderModule`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn module(&mut self, val: &GpuShaderModule) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("module"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuQueue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuQueue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuQueue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuQueue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -38,94 +38,57 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_label(this: &GpuQueue, value: Option<&str>);
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(all(feature = "GpuImageBitmapCopyView", feature = "GpuTextureCopyView",))]
-    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = copyImageBitmapToTexture)]
-    #[doc = "The `copyImageBitmapToTexture()` method."]
+    #[cfg(all(
+        feature = "GpuImageCopyExternalImage",
+        feature = "GpuImageCopyTextureTagged",
+    ))]
+    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = copyExternalImageToTexture)]
+    #[doc = "The `copyExternalImageToTexture()` method."]
     #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/copyImageBitmapToTexture)"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/copyExternalImageToTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuImageBitmapCopyView`, `GpuQueue`, `GpuTextureCopyView`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyExternalImage`, `GpuImageCopyTextureTagged`, `GpuQueue`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn copy_image_bitmap_to_texture_with_u32_sequence(
+    pub fn copy_external_image_to_texture_with_u32_sequence(
         this: &GpuQueue,
-        source: &GpuImageBitmapCopyView,
-        destination: &GpuTextureCopyView,
+        source: &GpuImageCopyExternalImage,
+        destination: &GpuImageCopyTextureTagged,
         copy_size: &::wasm_bindgen::JsValue,
     );
     #[cfg(web_sys_unstable_apis)]
     #[cfg(all(
         feature = "GpuExtent3dDict",
-        feature = "GpuImageBitmapCopyView",
-        feature = "GpuTextureCopyView",
+        feature = "GpuImageCopyExternalImage",
+        feature = "GpuImageCopyTextureTagged",
     ))]
-    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = copyImageBitmapToTexture)]
-    #[doc = "The `copyImageBitmapToTexture()` method."]
+    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = copyExternalImageToTexture)]
+    #[doc = "The `copyExternalImageToTexture()` method."]
     #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/copyImageBitmapToTexture)"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/copyExternalImageToTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuExtent3dDict`, `GpuImageBitmapCopyView`, `GpuQueue`, `GpuTextureCopyView`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExtent3dDict`, `GpuImageCopyExternalImage`, `GpuImageCopyTextureTagged`, `GpuQueue`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn copy_image_bitmap_to_texture_with_gpu_extent_3d_dict(
+    pub fn copy_external_image_to_texture_with_gpu_extent_3d_dict(
         this: &GpuQueue,
-        source: &GpuImageBitmapCopyView,
-        destination: &GpuTextureCopyView,
+        source: &GpuImageCopyExternalImage,
+        destination: &GpuImageCopyTextureTagged,
         copy_size: &GpuExtent3dDict,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuFence")]
-    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = createFence)]
-    #[doc = "The `createFence()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/createFence)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`, `GpuQueue`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn create_fence(this: &GpuQueue) -> GpuFence;
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(all(feature = "GpuFence", feature = "GpuFenceDescriptor",))]
-    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = createFence)]
-    #[doc = "The `createFence()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/createFence)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`, `GpuFenceDescriptor`, `GpuQueue`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn create_fence_with_descriptor(
-        this: &GpuQueue,
-        descriptor: &GpuFenceDescriptor,
-    ) -> GpuFence;
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuFence")]
-    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = signal)]
-    #[doc = "The `signal()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/signal)"]
+    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = onSubmittedWorkDone)]
+    #[doc = "The `onSubmittedWorkDone()` method."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`, `GpuQueue`*"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/onSubmittedWorkDone)"]
     #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn signal_with_u32(this: &GpuQueue, fence: &GpuFence, signal_value: u32);
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuFence")]
-    # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = signal)]
-    #[doc = "The `signal()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/signal)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFence`, `GpuQueue`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuQueue`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn signal_with_f64(this: &GpuQueue, fence: &GpuFence, signal_value: f64);
+    pub fn on_submitted_work_done(this: &GpuQueue) -> ::js_sys::Promise;
     #[cfg(web_sys_unstable_apis)]
     # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = submit)]
     #[doc = "The `submit()` method."]
@@ -654,83 +617,83 @@
         size: f64,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(all(feature = "GpuTextureCopyView", feature = "GpuTextureDataLayout",))]
+    #[cfg(all(feature = "GpuImageCopyTexture", feature = "GpuImageDataLayout",))]
     # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = writeTexture)]
     #[doc = "The `writeTexture()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/writeTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuQueue`, `GpuTextureCopyView`, `GpuTextureDataLayout`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTexture`, `GpuImageDataLayout`, `GpuQueue`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn write_texture_with_buffer_source_and_u32_sequence(
         this: &GpuQueue,
-        destination: &GpuTextureCopyView,
+        destination: &GpuImageCopyTexture,
         data: &::js_sys::Object,
-        data_layout: &GpuTextureDataLayout,
+        data_layout: &GpuImageDataLayout,
         size: &::wasm_bindgen::JsValue,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(all(feature = "GpuTextureCopyView", feature = "GpuTextureDataLayout",))]
+    #[cfg(all(feature = "GpuImageCopyTexture", feature = "GpuImageDataLayout",))]
     # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = writeTexture)]
     #[doc = "The `writeTexture()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/writeTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuQueue`, `GpuTextureCopyView`, `GpuTextureDataLayout`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuImageCopyTexture`, `GpuImageDataLayout`, `GpuQueue`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn write_texture_with_u8_array_and_u32_sequence(
         this: &GpuQueue,
-        destination: &GpuTextureCopyView,
+        destination: &GpuImageCopyTexture,
         data: &[u8],
-        data_layout: &GpuTextureDataLayout,
+        data_layout: &GpuImageDataLayout,
         size: &::wasm_bindgen::JsValue,
     );
     #[cfg(web_sys_unstable_apis)]
     #[cfg(all(
         feature = "GpuExtent3dDict",
-        feature = "GpuTextureCopyView",
-        feature = "GpuTextureDataLayout",
+        feature = "GpuImageCopyTexture",
+        feature = "GpuImageDataLayout",
     ))]
     # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = writeTexture)]
     #[doc = "The `writeTexture()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/writeTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuExtent3dDict`, `GpuQueue`, `GpuTextureCopyView`, `GpuTextureDataLayout`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExtent3dDict`, `GpuImageCopyTexture`, `GpuImageDataLayout`, `GpuQueue`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn write_texture_with_buffer_source_and_gpu_extent_3d_dict(
         this: &GpuQueue,
-        destination: &GpuTextureCopyView,
+        destination: &GpuImageCopyTexture,
         data: &::js_sys::Object,
-        data_layout: &GpuTextureDataLayout,
+        data_layout: &GpuImageDataLayout,
         size: &GpuExtent3dDict,
     );
     #[cfg(web_sys_unstable_apis)]
     #[cfg(all(
         feature = "GpuExtent3dDict",
-        feature = "GpuTextureCopyView",
-        feature = "GpuTextureDataLayout",
+        feature = "GpuImageCopyTexture",
+        feature = "GpuImageDataLayout",
     ))]
     # [wasm_bindgen (method , structural , js_class = "GPUQueue" , js_name = writeTexture)]
     #[doc = "The `writeTexture()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUQueue/writeTexture)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuExtent3dDict`, `GpuQueue`, `GpuTextureCopyView`, `GpuTextureDataLayout`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuExtent3dDict`, `GpuImageCopyTexture`, `GpuImageDataLayout`, `GpuQueue`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn write_texture_with_u8_array_and_gpu_extent_3d_dict(
         this: &GpuQueue,
-        destination: &GpuTextureCopyView,
+        destination: &GpuImageCopyTexture,
         data: &[u8],
-        data_layout: &GpuTextureDataLayout,
+        data_layout: &GpuImageDataLayout,
         size: &GpuExtent3dDict,
     );
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRasterizationStateDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRasterizationStateDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRasterizationStateDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRasterizationStateDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPURasterizationStateDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuRasterizationStateDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRasterizationStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuRasterizationStateDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuRasterizationStateDescriptor {
-    #[doc = "Construct a new `GpuRasterizationStateDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRasterizationStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new() -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `clampDepth` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRasterizationStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn clamp_depth(&mut self, val: bool) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("clampDepth"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuCullMode")]
-    #[doc = "Change the `cullMode` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuCullMode`, `GpuRasterizationStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn cull_mode(&mut self, val: GpuCullMode) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("cullMode"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `depthBias` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRasterizationStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_bias(&mut self, val: i32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthBias"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `depthBiasClamp` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRasterizationStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_bias_clamp(&mut self, val: f32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthBiasClamp"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `depthBiasSlopeScale` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRasterizationStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_bias_slope_scale(&mut self, val: f32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthBiasSlopeScale"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuFrontFace")]
-    #[doc = "Change the `frontFace` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuFrontFace`, `GpuRasterizationStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn front_face(&mut self, val: GpuFrontFace) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("frontFace"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -45,3 +45,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuRenderBundleDescriptor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleEncoderDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleEncoderDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleEncoderDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleEncoderDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -109,4 +109,46 @@
         let _ = r;
         self
     }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `depthReadOnly` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderBundleEncoderDescriptor`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_read_only(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthReadOnly"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `stencilReadOnly` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderBundleEncoderDescriptor`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn stencil_read_only(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stencilReadOnly"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleEncoder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleEncoder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleEncoder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderBundleEncoder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -365,114 +365,124 @@
         indirect_offset: f64,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderBundleEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderBundleEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderBundleEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderBundleEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn set_index_buffer(this: &GpuRenderBundleEncoder, buffer: &GpuBuffer);
+    pub fn set_index_buffer(
+        this: &GpuRenderBundleEncoder,
+        buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
+    );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderBundleEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderBundleEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderBundleEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderBundleEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_u32(
         this: &GpuRenderBundleEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: u32,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderBundleEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderBundleEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderBundleEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderBundleEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_f64(
         this: &GpuRenderBundleEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: f64,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderBundleEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderBundleEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderBundleEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderBundleEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_u32_and_u32(
         this: &GpuRenderBundleEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: u32,
         size: u32,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderBundleEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderBundleEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderBundleEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderBundleEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_f64_and_u32(
         this: &GpuRenderBundleEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: f64,
         size: u32,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderBundleEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderBundleEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderBundleEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderBundleEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_u32_and_f64(
         this: &GpuRenderBundleEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: u32,
         size: f64,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderBundleEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderBundleEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderBundleEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderBundleEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_f64_and_f64(
         this: &GpuRenderBundleEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: f64,
         size: f64,
     );
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassColorAttachmentDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassColorAttachmentDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassColorAttachmentDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassColorAttachmentDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPURenderPassColorAttachmentDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuRenderPassColorAttachmentDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachmentDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuRenderPassColorAttachmentDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuRenderPassColorAttachmentDescriptor {
-    #[cfg(feature = "GpuTextureView")]
-    #[doc = "Construct a new `GpuRenderPassColorAttachmentDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachmentDescriptor`, `GpuTextureView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(attachment: &GpuTextureView, load_value: &::wasm_bindgen::JsValue) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.attachment(attachment);
-        ret.load_value(load_value);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureView")]
-    #[doc = "Change the `attachment` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachmentDescriptor`, `GpuTextureView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn attachment(&mut self, val: &GpuTextureView) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("attachment"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `loadValue` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachmentDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn load_value(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("loadValue"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureView")]
-    #[doc = "Change the `resolveTarget` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachmentDescriptor`, `GpuTextureView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn resolve_target(&mut self, val: &GpuTextureView) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("resolveTarget"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuStoreOp")]
-    #[doc = "Change the `storeOp` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachmentDescriptor`, `GpuStoreOp`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn store_op(&mut self, val: GpuStoreOp) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("storeOp"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassColorAttachment.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassColorAttachment.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassColorAttachment.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassColorAttachment.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,121 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPURenderPassColorAttachment)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuRenderPassColorAttachment` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachment`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuRenderPassColorAttachment;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuRenderPassColorAttachment {
+    #[cfg(all(feature = "GpuStoreOp", feature = "GpuTextureView",))]
+    #[doc = "Construct a new `GpuRenderPassColorAttachment`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachment`, `GpuStoreOp`, `GpuTextureView`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(
+        load_value: &::wasm_bindgen::JsValue,
+        store_op: GpuStoreOp,
+        view: &GpuTextureView,
+    ) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.load_value(load_value);
+        ret.store_op(store_op);
+        ret.view(view);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `loadValue` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachment`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn load_value(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("loadValue"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureView")]
+    #[doc = "Change the `resolveTarget` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachment`, `GpuTextureView`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn resolve_target(&mut self, val: &GpuTextureView) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("resolveTarget"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStoreOp")]
+    #[doc = "Change the `storeOp` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachment`, `GpuStoreOp`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn store_op(&mut self, val: GpuStoreOp) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("storeOp"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureView")]
+    #[doc = "Change the `view` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassColorAttachment`, `GpuTextureView`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn view(&mut self, val: &GpuTextureView) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("view"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDepthStencilAttachmentDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDepthStencilAttachmentDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDepthStencilAttachmentDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDepthStencilAttachmentDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPURenderPassDepthStencilAttachmentDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuRenderPassDepthStencilAttachmentDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuRenderPassDepthStencilAttachmentDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuRenderPassDepthStencilAttachmentDescriptor {
-    #[cfg(all(feature = "GpuStoreOp", feature = "GpuTextureView",))]
-    #[doc = "Construct a new `GpuRenderPassDepthStencilAttachmentDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`, `GpuStoreOp`, `GpuTextureView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(
-        attachment: &GpuTextureView,
-        depth_load_value: &::wasm_bindgen::JsValue,
-        depth_store_op: GpuStoreOp,
-        stencil_load_value: &::wasm_bindgen::JsValue,
-        stencil_store_op: GpuStoreOp,
-    ) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.attachment(attachment);
-        ret.depth_load_value(depth_load_value);
-        ret.depth_store_op(depth_store_op);
-        ret.stencil_load_value(stencil_load_value);
-        ret.stencil_store_op(stencil_store_op);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureView")]
-    #[doc = "Change the `attachment` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`, `GpuTextureView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn attachment(&mut self, val: &GpuTextureView) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("attachment"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `depthLoadValue` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_load_value(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthLoadValue"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `depthReadOnly` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_read_only(&mut self, val: bool) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthReadOnly"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuStoreOp")]
-    #[doc = "Change the `depthStoreOp` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`, `GpuStoreOp`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_store_op(&mut self, val: GpuStoreOp) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthStoreOp"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `stencilLoadValue` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn stencil_load_value(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("stencilLoadValue"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `stencilReadOnly` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn stencil_read_only(&mut self, val: bool) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("stencilReadOnly"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuStoreOp")]
-    #[doc = "Change the `stencilStoreOp` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`, `GpuStoreOp`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn stencil_store_op(&mut self, val: GpuStoreOp) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("stencilStoreOp"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDepthStencilAttachment.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDepthStencilAttachment.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDepthStencilAttachment.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDepthStencilAttachment.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,188 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPURenderPassDepthStencilAttachment)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuRenderPassDepthStencilAttachment` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuRenderPassDepthStencilAttachment;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuRenderPassDepthStencilAttachment {
+    #[cfg(all(feature = "GpuStoreOp", feature = "GpuTextureView",))]
+    #[doc = "Construct a new `GpuRenderPassDepthStencilAttachment`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`, `GpuStoreOp`, `GpuTextureView`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(
+        depth_load_value: &::wasm_bindgen::JsValue,
+        depth_store_op: GpuStoreOp,
+        stencil_load_value: &::wasm_bindgen::JsValue,
+        stencil_store_op: GpuStoreOp,
+        view: &GpuTextureView,
+    ) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.depth_load_value(depth_load_value);
+        ret.depth_store_op(depth_store_op);
+        ret.stencil_load_value(stencil_load_value);
+        ret.stencil_store_op(stencil_store_op);
+        ret.view(view);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `depthLoadValue` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_load_value(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthLoadValue"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `depthReadOnly` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_read_only(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthReadOnly"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStoreOp")]
+    #[doc = "Change the `depthStoreOp` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`, `GpuStoreOp`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_store_op(&mut self, val: GpuStoreOp) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthStoreOp"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `stencilLoadValue` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn stencil_load_value(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stencilLoadValue"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `stencilReadOnly` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn stencil_read_only(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stencilReadOnly"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStoreOp")]
+    #[doc = "Change the `stencilStoreOp` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`, `GpuStoreOp`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn stencil_store_op(&mut self, val: GpuStoreOp) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stencilStoreOp"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureView")]
+    #[doc = "Change the `view` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`, `GpuTextureView`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn view(&mut self, val: &GpuTextureView) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("view"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -67,16 +67,16 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuRenderPassDepthStencilAttachmentDescriptor")]
+    #[cfg(feature = "GpuRenderPassDepthStencilAttachment")]
     #[doc = "Change the `depthStencilAttachment` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachmentDescriptor`, `GpuRenderPassDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassDepthStencilAttachment`, `GpuRenderPassDescriptor`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn depth_stencil_attachment(
         &mut self,
-        val: &GpuRenderPassDepthStencilAttachmentDescriptor,
+        val: &GpuRenderPassDepthStencilAttachment,
     ) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassEncoder.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassEncoder.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassEncoder.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassEncoder.rs	2021-12-09 12:01:26.000000000 +0000
@@ -109,31 +109,34 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn execute_bundles(this: &GpuRenderPassEncoder, bundles: &::wasm_bindgen::JsValue);
     #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setBlendColor)]
-    #[doc = "The `setBlendColor()` method."]
+    # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setBlendConstant)]
+    #[doc = "The `setBlendConstant()` method."]
     #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setBlendColor)"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setBlendConstant)"]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn set_blend_color_with_f64_sequence(
+    pub fn set_blend_constant_with_f64_sequence(
         this: &GpuRenderPassEncoder,
         color: &::wasm_bindgen::JsValue,
     );
     #[cfg(web_sys_unstable_apis)]
     #[cfg(feature = "GpuColorDict")]
-    # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setBlendColor)]
-    #[doc = "The `setBlendColor()` method."]
+    # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setBlendConstant)]
+    #[doc = "The `setBlendConstant()` method."]
     #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setBlendColor)"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setBlendConstant)"]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `GpuColorDict`, `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn set_blend_color_with_gpu_color_dict(this: &GpuRenderPassEncoder, color: &GpuColorDict);
+    pub fn set_blend_constant_with_gpu_color_dict(
+        this: &GpuRenderPassEncoder,
+        color: &GpuColorDict,
+    );
     #[cfg(web_sys_unstable_apis)]
     # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setScissorRect)]
     #[doc = "The `setScissorRect()` method."]
@@ -488,106 +491,124 @@
         indirect_offset: f64,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderPassEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn set_index_buffer(this: &GpuRenderPassEncoder, buffer: &GpuBuffer);
+    pub fn set_index_buffer(
+        this: &GpuRenderPassEncoder,
+        buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
+    );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderPassEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn set_index_buffer_with_u32(this: &GpuRenderPassEncoder, buffer: &GpuBuffer, offset: u32);
+    pub fn set_index_buffer_with_u32(
+        this: &GpuRenderPassEncoder,
+        buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
+        offset: u32,
+    );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderPassEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn set_index_buffer_with_f64(this: &GpuRenderPassEncoder, buffer: &GpuBuffer, offset: f64);
+    pub fn set_index_buffer_with_f64(
+        this: &GpuRenderPassEncoder,
+        buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
+        offset: f64,
+    );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderPassEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_u32_and_u32(
         this: &GpuRenderPassEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: u32,
         size: u32,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderPassEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_f64_and_u32(
         this: &GpuRenderPassEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: f64,
         size: u32,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderPassEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_u32_and_f64(
         this: &GpuRenderPassEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: u32,
         size: f64,
     );
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuBuffer")]
+    #[cfg(all(feature = "GpuBuffer", feature = "GpuIndexFormat",))]
     # [wasm_bindgen (method , structural , js_class = "GPURenderPassEncoder" , js_name = setIndexBuffer)]
     #[doc = "The `setIndexBuffer()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPURenderPassEncoder/setIndexBuffer)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuRenderPassEncoder`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuBuffer`, `GpuIndexFormat`, `GpuRenderPassEncoder`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub fn set_index_buffer_with_f64_and_f64(
         this: &GpuRenderPassEncoder,
         buffer: &GpuBuffer,
+        index_format: GpuIndexFormat,
         offset: f64,
         size: f64,
     );
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassLayout.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPassLayout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,112 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPURenderPassLayout)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuRenderPassLayout` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuRenderPassLayout;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuRenderPassLayout {
+    #[doc = "Construct a new `GpuRenderPassLayout`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(color_formats: &::wasm_bindgen::JsValue) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.color_formats(color_formats);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `label` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn label(&mut self, val: &str) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("label"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `colorFormats` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn color_formats(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("colorFormats"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureFormat")]
+    #[doc = "Change the `depthStencilFormat` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassLayout`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_stencil_format(&mut self, val: GpuTextureFormat) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthStencilFormat"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `sampleCount` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPassLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn sample_count(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("sampleCount"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPipelineDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPipelineDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPipelineDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRenderPipelineDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -16,26 +16,17 @@
 }
 #[cfg(web_sys_unstable_apis)]
 impl GpuRenderPipelineDescriptor {
-    #[cfg(all(
-        feature = "GpuPrimitiveTopology",
-        feature = "GpuProgrammableStageDescriptor",
-    ))]
+    #[cfg(feature = "GpuVertexState")]
     #[doc = "Construct a new `GpuRenderPipelineDescriptor`."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuPrimitiveTopology`, `GpuProgrammableStageDescriptor`, `GpuRenderPipelineDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPipelineDescriptor`, `GpuVertexState`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(
-        color_states: &::wasm_bindgen::JsValue,
-        primitive_topology: GpuPrimitiveTopology,
-        vertex_stage: &GpuProgrammableStageDescriptor,
-    ) -> Self {
+    pub fn new(vertex: &GpuVertexState) -> Self {
         #[allow(unused_mut)]
         let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.color_states(color_states);
-        ret.primitive_topology(primitive_topology);
-        ret.vertex_stage(vertex_stage);
+        ret.vertex(vertex);
         ret
     }
     #[cfg(web_sys_unstable_apis)]
@@ -75,82 +66,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `alphaToCoverageEnabled` field of this object."]
+    #[cfg(feature = "GpuDepthStencilState")]
+    #[doc = "Change the `depthStencil` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPipelineDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn alpha_to_coverage_enabled(&mut self, val: bool) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("alphaToCoverageEnabled"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `colorStates` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPipelineDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn color_states(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("colorStates"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuDepthStencilStateDescriptor")]
-    #[doc = "Change the `depthStencilState` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilStateDescriptor`, `GpuRenderPipelineDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_stencil_state(&mut self, val: &GpuDepthStencilStateDescriptor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthStencilState"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuProgrammableStageDescriptor")]
-    #[doc = "Change the `fragmentStage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStageDescriptor`, `GpuRenderPipelineDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuDepthStencilState`, `GpuRenderPipelineDescriptor`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn fragment_stage(&mut self, val: &GpuProgrammableStageDescriptor) -> &mut Self {
+    pub fn depth_stencil(&mut self, val: &GpuDepthStencilState) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("fragmentStage"),
+            &JsValue::from("depthStencil"),
             &JsValue::from(val),
         );
         debug_assert!(
@@ -161,18 +88,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuPrimitiveTopology")]
-    #[doc = "Change the `primitiveTopology` field of this object."]
+    #[cfg(feature = "GpuFragmentState")]
+    #[doc = "Change the `fragment` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuPrimitiveTopology`, `GpuRenderPipelineDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuFragmentState`, `GpuRenderPipelineDescriptor`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn primitive_topology(&mut self, val: GpuPrimitiveTopology) -> &mut Self {
+    pub fn fragment(&mut self, val: &GpuFragmentState) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("primitiveTopology"),
+            &JsValue::from("fragment"),
             &JsValue::from(val),
         );
         debug_assert!(
@@ -183,18 +110,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuRasterizationStateDescriptor")]
-    #[doc = "Change the `rasterizationState` field of this object."]
+    #[cfg(feature = "GpuMultisampleState")]
+    #[doc = "Change the `multisample` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRasterizationStateDescriptor`, `GpuRenderPipelineDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuMultisampleState`, `GpuRenderPipelineDescriptor`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn rasterization_state(&mut self, val: &GpuRasterizationStateDescriptor) -> &mut Self {
+    pub fn multisample(&mut self, val: &GpuMultisampleState) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("rasterizationState"),
+            &JsValue::from("multisample"),
             &JsValue::from(val),
         );
         debug_assert!(
@@ -205,17 +132,18 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `sampleCount` field of this object."]
+    #[cfg(feature = "GpuPrimitiveState")]
+    #[doc = "Change the `primitive` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPipelineDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuPrimitiveState`, `GpuRenderPipelineDescriptor`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn sample_count(&mut self, val: u32) -> &mut Self {
+    pub fn primitive(&mut self, val: &GpuPrimitiveState) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(
             self.as_ref(),
-            &JsValue::from("sampleCount"),
+            &JsValue::from("primitive"),
             &JsValue::from(val),
         );
         debug_assert!(
@@ -226,63 +154,17 @@
         self
     }
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `sampleMask` field of this object."]
+    #[cfg(feature = "GpuVertexState")]
+    #[doc = "Change the `vertex` field of this object."]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPipelineDescriptor`*"]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPipelineDescriptor`, `GpuVertexState`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn sample_mask(&mut self, val: u32) -> &mut Self {
+    pub fn vertex(&mut self, val: &GpuVertexState) -> &mut Self {
         use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("sampleMask"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuProgrammableStageDescriptor")]
-    #[doc = "Change the `vertexStage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuProgrammableStageDescriptor`, `GpuRenderPipelineDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn vertex_stage(&mut self, val: &GpuProgrammableStageDescriptor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("vertexStage"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuVertexStateDescriptor")]
-    #[doc = "Change the `vertexState` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuRenderPipelineDescriptor`, `GpuVertexStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn vertex_state(&mut self, val: &GpuVertexStateDescriptor) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("vertexState"),
-            &JsValue::from(val),
-        );
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("vertex"), &JsValue::from(val));
         debug_assert!(
             r.is_ok(),
             "setting properties should never fail on our dictionary objects"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRequestAdapterOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRequestAdapterOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRequestAdapterOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuRequestAdapterOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,6 +28,27 @@
         ret
     }
     #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `forceSoftware` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuRequestAdapterOptions`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn force_software(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("forceSoftware"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
     #[cfg(feature = "GpuPowerPreference")]
     #[doc = "Change the `powerPreference` field of this object."]
     #[doc = ""]
@@ -50,3 +71,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuRequestAdapterOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerBindingLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerBindingLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerBindingLayout.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerBindingLayout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,54 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUSamplerBindingLayout)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuSamplerBindingLayout` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSamplerBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuSamplerBindingLayout;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuSamplerBindingLayout {
+    #[doc = "Construct a new `GpuSamplerBindingLayout`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSamplerBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuSamplerBindingType")]
+    #[doc = "Change the `type` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSamplerBindingLayout`, `GpuSamplerBindingType`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn type_(&mut self, val: GpuSamplerBindingType) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("type"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuSamplerBindingLayout {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerBindingType.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerBindingType.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerBindingType.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerBindingType.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,16 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `GpuSamplerBindingType` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `GpuSamplerBindingType`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GpuSamplerBindingType {
+    Filtering = "filtering",
+    NonFiltering = "non-filtering",
+    Comparison = "comparison",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSamplerDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -262,3 +262,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuSamplerDescriptor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuShaderModuleDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuShaderModuleDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuShaderModuleDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuShaderModuleDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,7 @@
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(code: &::wasm_bindgen::JsValue) -> Self {
+    pub fn new(code: &str) -> Self {
         #[allow(unused_mut)]
         let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
         ret.code(code);
@@ -52,7 +52,7 @@
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn code(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+    pub fn code(&mut self, val: &str) -> &mut Self {
         use wasm_bindgen::JsValue;
         let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("code"), &JsValue::from(val));
         debug_assert!(
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStencilFaceState.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStencilFaceState.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStencilFaceState.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStencilFaceState.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,118 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUStencilFaceState)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuStencilFaceState` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStencilFaceState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuStencilFaceState;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuStencilFaceState {
+    #[doc = "Construct a new `GpuStencilFaceState`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStencilFaceState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuCompareFunction")]
+    #[doc = "Change the `compare` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuCompareFunction`, `GpuStencilFaceState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn compare(&mut self, val: GpuCompareFunction) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("compare"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStencilOperation")]
+    #[doc = "Change the `depthFailOp` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStencilFaceState`, `GpuStencilOperation`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn depth_fail_op(&mut self, val: GpuStencilOperation) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("depthFailOp"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStencilOperation")]
+    #[doc = "Change the `failOp` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStencilFaceState`, `GpuStencilOperation`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn fail_op(&mut self, val: GpuStencilOperation) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("failOp"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStencilOperation")]
+    #[doc = "Change the `passOp` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStencilFaceState`, `GpuStencilOperation`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn pass_op(&mut self, val: GpuStencilOperation) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("passOp"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuStencilFaceState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStencilStateFaceDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStencilStateFaceDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStencilStateFaceDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStencilStateFaceDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUStencilStateFaceDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuStencilStateFaceDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuStencilStateFaceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuStencilStateFaceDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuStencilStateFaceDescriptor {
-    #[doc = "Construct a new `GpuStencilStateFaceDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuStencilStateFaceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new() -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuCompareFunction")]
-    #[doc = "Change the `compare` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuCompareFunction`, `GpuStencilStateFaceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn compare(&mut self, val: GpuCompareFunction) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("compare"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuStencilOperation")]
-    #[doc = "Change the `depthFailOp` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuStencilOperation`, `GpuStencilStateFaceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn depth_fail_op(&mut self, val: GpuStencilOperation) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("depthFailOp"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuStencilOperation")]
-    #[doc = "Change the `failOp` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuStencilOperation`, `GpuStencilStateFaceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn fail_op(&mut self, val: GpuStencilOperation) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("failOp"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuStencilOperation")]
-    #[doc = "Change the `passOp` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuStencilOperation`, `GpuStencilStateFaceDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn pass_op(&mut self, val: GpuStencilOperation) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("passOp"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStorageTextureAccess.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStorageTextureAccess.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStorageTextureAccess.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStorageTextureAccess.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `GpuStorageTextureAccess` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `GpuStorageTextureAccess`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GpuStorageTextureAccess {
+    WriteOnly = "write-only",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStorageTextureBindingLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStorageTextureBindingLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStorageTextureBindingLayout.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStorageTextureBindingLayout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,92 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUStorageTextureBindingLayout)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuStorageTextureBindingLayout` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStorageTextureBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuStorageTextureBindingLayout;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuStorageTextureBindingLayout {
+    #[cfg(feature = "GpuTextureFormat")]
+    #[doc = "Construct a new `GpuStorageTextureBindingLayout`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStorageTextureBindingLayout`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(format: GpuTextureFormat) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.format(format);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuStorageTextureAccess")]
+    #[doc = "Change the `access` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStorageTextureAccess`, `GpuStorageTextureBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn access(&mut self, val: GpuStorageTextureAccess) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("access"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureFormat")]
+    #[doc = "Change the `format` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStorageTextureBindingLayout`, `GpuTextureFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn format(&mut self, val: GpuTextureFormat) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureViewDimension")]
+    #[doc = "Change the `viewDimension` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuStorageTextureBindingLayout`, `GpuTextureViewDimension`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn view_dimension(&mut self, val: GpuTextureViewDimension) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("viewDimension"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStoreOp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStoreOp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStoreOp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuStoreOp.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,5 +11,5 @@
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum GpuStoreOp {
     Store = "store",
-    Clear = "clear",
+    Discard = "discard",
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSupportedFeatures.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSupportedFeatures.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSupportedFeatures.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSupportedFeatures.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUSupportedFeatures , typescript_type = "GPUSupportedFeatures")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuSupportedFeatures` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedFeatures)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedFeatures`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuSupportedFeatures;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSupportedLimits.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSupportedLimits.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSupportedLimits.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSupportedLimits.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,304 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUSupportedLimits , typescript_type = "GPUSupportedLimits")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuSupportedLimits` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuSupportedLimits;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxTextureDimension1D)]
+    #[doc = "Getter for the `maxTextureDimension1D` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxTextureDimension1D)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_texture_dimension_1d(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxTextureDimension2D)]
+    #[doc = "Getter for the `maxTextureDimension2D` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxTextureDimension2D)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_texture_dimension_2d(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxTextureDimension3D)]
+    #[doc = "Getter for the `maxTextureDimension3D` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxTextureDimension3D)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_texture_dimension_3d(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxTextureArrayLayers)]
+    #[doc = "Getter for the `maxTextureArrayLayers` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxTextureArrayLayers)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_texture_array_layers(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxBindGroups)]
+    #[doc = "Getter for the `maxBindGroups` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxBindGroups)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_bind_groups(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxDynamicUniformBuffersPerPipelineLayout)]
+    #[doc = "Getter for the `maxDynamicUniformBuffersPerPipelineLayout` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxDynamicUniformBuffersPerPipelineLayout)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_dynamic_uniform_buffers_per_pipeline_layout(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxDynamicStorageBuffersPerPipelineLayout)]
+    #[doc = "Getter for the `maxDynamicStorageBuffersPerPipelineLayout` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxDynamicStorageBuffersPerPipelineLayout)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_dynamic_storage_buffers_per_pipeline_layout(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxSampledTexturesPerShaderStage)]
+    #[doc = "Getter for the `maxSampledTexturesPerShaderStage` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxSampledTexturesPerShaderStage)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_sampled_textures_per_shader_stage(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxSamplersPerShaderStage)]
+    #[doc = "Getter for the `maxSamplersPerShaderStage` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxSamplersPerShaderStage)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_samplers_per_shader_stage(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxStorageBuffersPerShaderStage)]
+    #[doc = "Getter for the `maxStorageBuffersPerShaderStage` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxStorageBuffersPerShaderStage)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_storage_buffers_per_shader_stage(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxStorageTexturesPerShaderStage)]
+    #[doc = "Getter for the `maxStorageTexturesPerShaderStage` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxStorageTexturesPerShaderStage)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_storage_textures_per_shader_stage(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxUniformBuffersPerShaderStage)]
+    #[doc = "Getter for the `maxUniformBuffersPerShaderStage` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxUniformBuffersPerShaderStage)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_uniform_buffers_per_shader_stage(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxUniformBufferBindingSize)]
+    #[doc = "Getter for the `maxUniformBufferBindingSize` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxUniformBufferBindingSize)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_uniform_buffer_binding_size(this: &GpuSupportedLimits) -> f64;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxStorageBufferBindingSize)]
+    #[doc = "Getter for the `maxStorageBufferBindingSize` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxStorageBufferBindingSize)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_storage_buffer_binding_size(this: &GpuSupportedLimits) -> f64;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = minUniformBufferOffsetAlignment)]
+    #[doc = "Getter for the `minUniformBufferOffsetAlignment` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/minUniformBufferOffsetAlignment)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn min_uniform_buffer_offset_alignment(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = minStorageBufferOffsetAlignment)]
+    #[doc = "Getter for the `minStorageBufferOffsetAlignment` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/minStorageBufferOffsetAlignment)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn min_storage_buffer_offset_alignment(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxVertexBuffers)]
+    #[doc = "Getter for the `maxVertexBuffers` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxVertexBuffers)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_vertex_buffers(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxVertexAttributes)]
+    #[doc = "Getter for the `maxVertexAttributes` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxVertexAttributes)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_vertex_attributes(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxVertexBufferArrayStride)]
+    #[doc = "Getter for the `maxVertexBufferArrayStride` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxVertexBufferArrayStride)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_vertex_buffer_array_stride(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxInterStageShaderComponents)]
+    #[doc = "Getter for the `maxInterStageShaderComponents` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxInterStageShaderComponents)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_inter_stage_shader_components(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxComputeWorkgroupStorageSize)]
+    #[doc = "Getter for the `maxComputeWorkgroupStorageSize` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxComputeWorkgroupStorageSize)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_compute_workgroup_storage_size(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxComputeInvocationsPerWorkgroup)]
+    #[doc = "Getter for the `maxComputeInvocationsPerWorkgroup` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxComputeInvocationsPerWorkgroup)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_compute_invocations_per_workgroup(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxComputeWorkgroupSizeX)]
+    #[doc = "Getter for the `maxComputeWorkgroupSizeX` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxComputeWorkgroupSizeX)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_compute_workgroup_size_x(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxComputeWorkgroupSizeY)]
+    #[doc = "Getter for the `maxComputeWorkgroupSizeY` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxComputeWorkgroupSizeY)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_compute_workgroup_size_y(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxComputeWorkgroupSizeZ)]
+    #[doc = "Getter for the `maxComputeWorkgroupSizeZ` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxComputeWorkgroupSizeZ)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_compute_workgroup_size_z(this: &GpuSupportedLimits) -> u32;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "GPUSupportedLimits" , js_name = maxComputeWorkgroupsPerDimension)]
+    #[doc = "Getter for the `maxComputeWorkgroupsPerDimension` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSupportedLimits/maxComputeWorkgroupsPerDimension)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuSupportedLimits`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn max_compute_workgroups_per_dimension(this: &GpuSupportedLimits) -> u32;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSwapChainDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSwapChainDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSwapChainDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSwapChainDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUSwapChainDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuSwapChainDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuSwapChainDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuSwapChainDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuSwapChainDescriptor {
-    #[cfg(all(feature = "GpuDevice", feature = "GpuTextureFormat",))]
-    #[doc = "Construct a new `GpuSwapChainDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`, `GpuSwapChainDescriptor`, `GpuTextureFormat`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(device: &GpuDevice, format: GpuTextureFormat) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.device(device);
-        ret.format(format);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `label` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuSwapChainDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn label(&mut self, val: &str) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("label"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuDevice")]
-    #[doc = "Change the `device` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuDevice`, `GpuSwapChainDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn device(&mut self, val: &GpuDevice) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("device"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureFormat")]
-    #[doc = "Change the `format` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuSwapChainDescriptor`, `GpuTextureFormat`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn format(&mut self, val: GpuTextureFormat) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `usage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuSwapChainDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn usage(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("usage"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSwapChain.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSwapChain.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSwapChain.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuSwapChain.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUSwapChain , typescript_type = "GPUSwapChain")]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuSwapChain` class."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSwapChain)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuSwapChain`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuSwapChain;
-    #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (structural , method , getter , js_class = "GPUSwapChain" , js_name = label)]
-    #[doc = "Getter for the `label` field of this object."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSwapChain/label)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuSwapChain`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn label(this: &GpuSwapChain) -> Option<String>;
-    #[cfg(web_sys_unstable_apis)]
-    # [wasm_bindgen (structural , method , setter , js_class = "GPUSwapChain" , js_name = label)]
-    #[doc = "Setter for the `label` field of this object."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSwapChain/label)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuSwapChain`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn set_label(this: &GpuSwapChain, value: Option<&str>);
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTexture")]
-    # [wasm_bindgen (method , structural , js_class = "GPUSwapChain" , js_name = getCurrentTexture)]
-    #[doc = "The `getCurrentTexture()` method."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/GPUSwapChain/getCurrentTexture)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuSwapChain`, `GpuTexture`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn get_current_texture(this: &GpuSwapChain) -> GpuTexture;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureBindingLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureBindingLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureBindingLayout.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureBindingLayout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,101 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUTextureBindingLayout)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuTextureBindingLayout` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuTextureBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuTextureBindingLayout;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuTextureBindingLayout {
+    #[doc = "Construct a new `GpuTextureBindingLayout`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuTextureBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `multisampled` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuTextureBindingLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn multisampled(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("multisampled"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureSampleType")]
+    #[doc = "Change the `sampleType` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuTextureBindingLayout`, `GpuTextureSampleType`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn sample_type(&mut self, val: GpuTextureSampleType) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("sampleType"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuTextureViewDimension")]
+    #[doc = "Change the `viewDimension` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuTextureBindingLayout`, `GpuTextureViewDimension`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn view_dimension(&mut self, val: GpuTextureViewDimension) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("viewDimension"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuTextureBindingLayout {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureComponentType.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureComponentType.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureComponentType.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureComponentType.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#![allow(unused_imports)]
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-#[doc = "The `GpuTextureComponentType` enum."]
-#[doc = ""]
-#[doc = "*This API requires the following crate features to be activated: `GpuTextureComponentType`*"]
-#[doc = ""]
-#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum GpuTextureComponentType {
-    Float = "float",
-    Sint = "sint",
-    Uint = "uint",
-    DepthComparison = "depth-comparison",
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureCopyView.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureCopyView.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureCopyView.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureCopyView.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUTextureCopyView)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuTextureCopyView` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuTextureCopyView;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuTextureCopyView {
-    #[cfg(feature = "GpuTexture")]
-    #[doc = "Construct a new `GpuTextureCopyView`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTexture`, `GpuTextureCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(texture: &GpuTexture) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.texture(texture);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTextureAspect")]
-    #[doc = "Change the `aspect` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureAspect`, `GpuTextureCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn aspect(&mut self, val: GpuTextureAspect) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("aspect"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `mipLevel` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn mip_level(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("mipLevel"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `origin` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn origin(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("origin"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuTexture")]
-    #[doc = "Change the `texture` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTexture`, `GpuTextureCopyView`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn texture(&mut self, val: &GpuTexture) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("texture"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureDataLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureDataLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureDataLayout.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureDataLayout.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUTextureDataLayout)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuTextureDataLayout` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureDataLayout`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuTextureDataLayout;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuTextureDataLayout {
-    #[doc = "Construct a new `GpuTextureDataLayout`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureDataLayout`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new() -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `bytesPerRow` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureDataLayout`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn bytes_per_row(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("bytesPerRow"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `offset` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureDataLayout`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn offset(&mut self, val: f64) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("offset"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `rowsPerImage` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuTextureDataLayout`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn rows_per_image(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("rowsPerImage"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureSampleType.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureSampleType.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureSampleType.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureSampleType.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `GpuTextureSampleType` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `GpuTextureSampleType`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GpuTextureSampleType {
+    Float = "float",
+    UnfilterableFloat = "unfilterable-float",
+    Depth = "depth",
+    Sint = "sint",
+    Uint = "uint",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureUsage.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureUsage.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureUsage.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureUsage.rs	2021-12-09 12:01:26.000000000 +0000
@@ -35,21 +35,21 @@
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
     pub const COPY_DST: u32 = 2u64 as u32;
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "The `GPUTextureUsage.SAMPLED` const."]
+    #[doc = "The `GPUTextureUsage.TEXTURE_BINDING` const."]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `GpuTextureUsage`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub const SAMPLED: u32 = 4u64 as u32;
+    pub const TEXTURE_BINDING: u32 = 4u64 as u32;
     #[cfg(web_sys_unstable_apis)]
-    #[doc = "The `GPUTextureUsage.STORAGE` const."]
+    #[doc = "The `GPUTextureUsage.STORAGE_BINDING` const."]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `GpuTextureUsage`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub const STORAGE: u32 = 8u64 as u32;
+    pub const STORAGE_BINDING: u32 = 8u64 as u32;
     #[cfg(web_sys_unstable_apis)]
     #[doc = "The `GPUTextureUsage.RENDER_ATTACHMENT` const."]
     #[doc = ""]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureViewDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureViewDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureViewDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuTextureViewDescriptor.rs	2021-12-09 12:01:26.000000000 +0000
@@ -189,3 +189,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for GpuTextureViewDescriptor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexAttributeDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexAttributeDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexAttributeDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexAttributeDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUVertexAttributeDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuVertexAttributeDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttributeDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuVertexAttributeDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuVertexAttributeDescriptor {
-    #[cfg(feature = "GpuVertexFormat")]
-    #[doc = "Construct a new `GpuVertexAttributeDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttributeDescriptor`, `GpuVertexFormat`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(format: GpuVertexFormat, offset: f64, shader_location: u32) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.format(format);
-        ret.offset(offset);
-        ret.shader_location(shader_location);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuVertexFormat")]
-    #[doc = "Change the `format` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttributeDescriptor`, `GpuVertexFormat`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn format(&mut self, val: GpuVertexFormat) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `offset` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttributeDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn offset(&mut self, val: f64) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r =
-            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("offset"), &JsValue::from(val));
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `shaderLocation` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttributeDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn shader_location(&mut self, val: u32) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("shaderLocation"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexAttribute.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexAttribute.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexAttribute.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexAttribute.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,92 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUVertexAttribute)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuVertexAttribute` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttribute`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuVertexAttribute;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuVertexAttribute {
+    #[cfg(feature = "GpuVertexFormat")]
+    #[doc = "Construct a new `GpuVertexAttribute`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttribute`, `GpuVertexFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(format: GpuVertexFormat, offset: f64, shader_location: u32) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.format(format);
+        ret.offset(offset);
+        ret.shader_location(shader_location);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuVertexFormat")]
+    #[doc = "Change the `format` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttribute`, `GpuVertexFormat`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn format(&mut self, val: GpuVertexFormat) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("format"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `offset` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttribute`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn offset(&mut self, val: f64) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("offset"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `shaderLocation` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexAttribute`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn shader_location(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("shaderLocation"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexBufferLayoutDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexBufferLayoutDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexBufferLayoutDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexBufferLayoutDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUVertexBufferLayoutDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuVertexBufferLayoutDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayoutDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuVertexBufferLayoutDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuVertexBufferLayoutDescriptor {
-    #[doc = "Construct a new `GpuVertexBufferLayoutDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayoutDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new(array_stride: f64, attributes: &::wasm_bindgen::JsValue) -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret.array_stride(array_stride);
-        ret.attributes(attributes);
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `arrayStride` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayoutDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn array_stride(&mut self, val: f64) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("arrayStride"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `attributes` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayoutDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn attributes(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("attributes"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuInputStepMode")]
-    #[doc = "Change the `stepMode` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuInputStepMode`, `GpuVertexBufferLayoutDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn step_mode(&mut self, val: GpuInputStepMode) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("stepMode"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexBufferLayout.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexBufferLayout.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexBufferLayout.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexBufferLayout.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUVertexBufferLayout)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuVertexBufferLayout` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuVertexBufferLayout;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuVertexBufferLayout {
+    #[doc = "Construct a new `GpuVertexBufferLayout`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(array_stride: f64, attributes: &::wasm_bindgen::JsValue) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.array_stride(array_stride);
+        ret.attributes(attributes);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `arrayStride` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn array_stride(&mut self, val: f64) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("arrayStride"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `attributes` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayout`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn attributes(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("attributes"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuVertexStepMode")]
+    #[doc = "Change the `stepMode` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexBufferLayout`, `GpuVertexStepMode`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn step_mode(&mut self, val: GpuVertexStepMode) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("stepMode"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexFormat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexFormat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexFormat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexFormat.rs	2021-12-09 12:01:26.000000000 +0000
@@ -10,34 +10,34 @@
 #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum GpuVertexFormat {
-    Uchar2 = "uchar2",
-    Uchar4 = "uchar4",
-    Char2 = "char2",
-    Char4 = "char4",
-    Uchar2norm = "uchar2norm",
-    Uchar4norm = "uchar4norm",
-    Char2norm = "char2norm",
-    Char4norm = "char4norm",
-    Ushort2 = "ushort2",
-    Ushort4 = "ushort4",
-    Short2 = "short2",
-    Short4 = "short4",
-    Ushort2norm = "ushort2norm",
-    Ushort4norm = "ushort4norm",
-    Short2norm = "short2norm",
-    Short4norm = "short4norm",
-    Half2 = "half2",
-    Half4 = "half4",
-    Float = "float",
-    Float2 = "float2",
-    Float3 = "float3",
-    Float4 = "float4",
-    Uint = "uint",
-    Uint2 = "uint2",
-    Uint3 = "uint3",
-    Uint4 = "uint4",
-    Int = "int",
-    Int2 = "int2",
-    Int3 = "int3",
-    Int4 = "int4",
+    Uint8x2 = "uint8x2",
+    Uint8x4 = "uint8x4",
+    Sint8x2 = "sint8x2",
+    Sint8x4 = "sint8x4",
+    Unorm8x2 = "unorm8x2",
+    Unorm8x4 = "unorm8x4",
+    Snorm8x2 = "snorm8x2",
+    Snorm8x4 = "snorm8x4",
+    Uint16x2 = "uint16x2",
+    Uint16x4 = "uint16x4",
+    Sint16x2 = "sint16x2",
+    Sint16x4 = "sint16x4",
+    Unorm16x2 = "unorm16x2",
+    Unorm16x4 = "unorm16x4",
+    Snorm16x2 = "snorm16x2",
+    Snorm16x4 = "snorm16x4",
+    Float16x2 = "float16x2",
+    Float16x4 = "float16x4",
+    Float32 = "float32",
+    Float32x2 = "float32x2",
+    Float32x3 = "float32x3",
+    Float32x4 = "float32x4",
+    Uint32 = "uint32",
+    Uint32x2 = "uint32x2",
+    Uint32x3 = "uint32x3",
+    Uint32x4 = "uint32x4",
+    Sint32 = "sint32",
+    Sint32x2 = "sint32x2",
+    Sint32x3 = "sint32x3",
+    Sint32x4 = "sint32x4",
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexStateDescriptor.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexStateDescriptor.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexStateDescriptor.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexStateDescriptor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-#![allow(unused_imports)]
-use super::*;
-use wasm_bindgen::prelude::*;
-#[cfg(web_sys_unstable_apis)]
-#[wasm_bindgen]
-extern "C" {
-    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUVertexStateDescriptor)]
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    #[doc = "The `GpuVertexStateDescriptor` dictionary."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub type GpuVertexStateDescriptor;
-}
-#[cfg(web_sys_unstable_apis)]
-impl GpuVertexStateDescriptor {
-    #[doc = "Construct a new `GpuVertexStateDescriptor`."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn new() -> Self {
-        #[allow(unused_mut)]
-        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
-        ret
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "GpuIndexFormat")]
-    #[doc = "Change the `indexFormat` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuIndexFormat`, `GpuVertexStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn index_format(&mut self, val: GpuIndexFormat) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("indexFormat"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-    #[cfg(web_sys_unstable_apis)]
-    #[doc = "Change the `vertexBuffers` field of this object."]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `GpuVertexStateDescriptor`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn vertex_buffers(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
-        use wasm_bindgen::JsValue;
-        let r = ::js_sys::Reflect::set(
-            self.as_ref(),
-            &JsValue::from("vertexBuffers"),
-            &JsValue::from(val),
-        );
-        debug_assert!(
-            r.is_ok(),
-            "setting properties should never fail on our dictionary objects"
-        );
-        let _ = r;
-        self
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexState.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexState.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexState.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexState.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,94 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = GPUVertexState)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `GpuVertexState` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type GpuVertexState;
+}
+#[cfg(web_sys_unstable_apis)]
+impl GpuVertexState {
+    #[cfg(feature = "GpuShaderModule")]
+    #[doc = "Construct a new `GpuVertexState`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuShaderModule`, `GpuVertexState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(entry_point: &str, module: &GpuShaderModule) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.entry_point(entry_point);
+        ret.module(module);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `entryPoint` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn entry_point(&mut self, val: &str) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("entryPoint"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "GpuShaderModule")]
+    #[doc = "Change the `module` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuShaderModule`, `GpuVertexState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn module(&mut self, val: &GpuShaderModule) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("module"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `buffers` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `GpuVertexState`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn buffers(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("buffers"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexStepMode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexStepMode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexStepMode.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GpuVertexStepMode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `GpuVertexStepMode` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `GpuVertexStepMode`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum GpuVertexStepMode {
+    Vertex = "vertex",
+    Instance = "instance",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GroupedHistoryEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GroupedHistoryEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_GroupedHistoryEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_GroupedHistoryEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -89,3 +89,8 @@
         self
     }
 }
+impl Default for GroupedHistoryEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HalfOpenInfoDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HalfOpenInfoDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HalfOpenInfoDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HalfOpenInfoDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for HalfOpenInfoDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HashChangeEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HashChangeEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HashChangeEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HashChangeEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -99,3 +99,8 @@
         self
     }
 }
+impl Default for HashChangeEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidCollectionInfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidCollectionInfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidCollectionInfo.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidCollectionInfo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,175 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = HIDCollectionInfo)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidCollectionInfo` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidCollectionInfo;
+}
+#[cfg(web_sys_unstable_apis)]
+impl HidCollectionInfo {
+    #[doc = "Construct a new `HidCollectionInfo`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `children` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn children(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("children"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `featureReports` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn feature_reports(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("featureReports"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `inputReports` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn input_reports(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("inputReports"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `outputReports` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn output_reports(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("outputReports"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `type` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn type_(&mut self, val: u8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("type"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `usage` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn usage(&mut self, val: u16) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("usage"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `usagePage` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidCollectionInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn usage_page(&mut self, val: u16) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("usagePage"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for HidCollectionInfo {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidConnectionEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidConnectionEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidConnectionEventInit.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidConnectionEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,114 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = HIDConnectionEventInit)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidConnectionEventInit` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidConnectionEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidConnectionEventInit;
+}
+#[cfg(web_sys_unstable_apis)]
+impl HidConnectionEventInit {
+    #[cfg(feature = "HidDevice")]
+    #[doc = "Construct a new `HidConnectionEventInit`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidConnectionEventInit`, `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(device: &HidDevice) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.device(device);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `bubbles` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidConnectionEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn bubbles(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("bubbles"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `cancelable` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidConnectionEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn cancelable(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("cancelable"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `composed` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidConnectionEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn composed(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("composed"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "HidDevice")]
+    #[doc = "Change the `device` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidConnectionEventInit`, `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn device(&mut self, val: &HidDevice) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("device"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidConnectionEvent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidConnectionEvent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidConnectionEvent.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidConnectionEvent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = Event , extends = :: js_sys :: Object , js_name = HIDConnectionEvent , typescript_type = "HIDConnectionEvent")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidConnectionEvent` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDConnectionEvent)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidConnectionEvent`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidConnectionEvent;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "HidDevice")]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDConnectionEvent" , js_name = device)]
+    #[doc = "Getter for the `device` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDConnectionEvent/device)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidConnectionEvent`, `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn device(this: &HidConnectionEvent) -> HidDevice;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HiddenPluginEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HiddenPluginEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HiddenPluginEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HiddenPluginEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for HiddenPluginEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDeviceFilter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDeviceFilter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDeviceFilter.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDeviceFilter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,116 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = HIDDeviceFilter)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidDeviceFilter` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceFilter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidDeviceFilter;
+}
+#[cfg(web_sys_unstable_apis)]
+impl HidDeviceFilter {
+    #[doc = "Construct a new `HidDeviceFilter`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceFilter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `productId` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceFilter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn product_id(&mut self, val: u16) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("productId"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `usage` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceFilter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn usage(&mut self, val: u16) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("usage"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `usagePage` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceFilter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn usage_page(&mut self, val: u16) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("usagePage"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `vendorId` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceFilter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn vendor_id(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("vendorId"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for HidDeviceFilter {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDeviceRequestOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDeviceRequestOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDeviceRequestOptions.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDeviceRequestOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,52 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = HIDDeviceRequestOptions)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidDeviceRequestOptions` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceRequestOptions`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidDeviceRequestOptions;
+}
+#[cfg(web_sys_unstable_apis)]
+impl HidDeviceRequestOptions {
+    #[doc = "Construct a new `HidDeviceRequestOptions`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceRequestOptions`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(filters: &::wasm_bindgen::JsValue) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.filters(filters);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `filters` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDeviceRequestOptions`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn filters(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("filters"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDevice.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDevice.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDevice.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidDevice.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,188 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = EventTarget , extends = :: js_sys :: Object , js_name = HIDDevice , typescript_type = "HIDDevice")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidDevice` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidDevice;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDDevice" , js_name = oninputreport)]
+    #[doc = "Getter for the `oninputreport` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/oninputreport)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn oninputreport(this: &HidDevice) -> Option<::js_sys::Function>;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , setter , js_class = "HIDDevice" , js_name = oninputreport)]
+    #[doc = "Setter for the `oninputreport` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/oninputreport)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn set_oninputreport(this: &HidDevice, value: Option<&::js_sys::Function>);
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDDevice" , js_name = opened)]
+    #[doc = "Getter for the `opened` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/opened)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn opened(this: &HidDevice) -> bool;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDDevice" , js_name = vendorId)]
+    #[doc = "Getter for the `vendorId` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/vendorId)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn vendor_id(this: &HidDevice) -> u16;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDDevice" , js_name = productId)]
+    #[doc = "Getter for the `productId` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/productId)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn product_id(this: &HidDevice) -> u16;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDDevice" , js_name = productName)]
+    #[doc = "Getter for the `productName` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/productName)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn product_name(this: &HidDevice) -> String;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDDevice" , js_name = collections)]
+    #[doc = "Getter for the `collections` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/collections)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn collections(this: &HidDevice) -> ::js_sys::Array;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "HIDDevice" , js_name = close)]
+    #[doc = "The `close()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/close)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn close(this: &HidDevice) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "HIDDevice" , js_name = open)]
+    #[doc = "The `open()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/open)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn open(this: &HidDevice) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "HIDDevice" , js_name = receiveFeatureReport)]
+    #[doc = "The `receiveFeatureReport()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/receiveFeatureReport)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn receive_feature_report(this: &HidDevice, report_id: u8) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "HIDDevice" , js_name = sendFeatureReport)]
+    #[doc = "The `sendFeatureReport()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/sendFeatureReport)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn send_feature_report_with_buffer_source(
+        this: &HidDevice,
+        report_id: u8,
+        data: &::js_sys::Object,
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "HIDDevice" , js_name = sendFeatureReport)]
+    #[doc = "The `sendFeatureReport()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/sendFeatureReport)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn send_feature_report_with_u8_array(
+        this: &HidDevice,
+        report_id: u8,
+        data: &mut [u8],
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "HIDDevice" , js_name = sendReport)]
+    #[doc = "The `sendReport()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/sendReport)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn send_report_with_buffer_source(
+        this: &HidDevice,
+        report_id: u8,
+        data: &::js_sys::Object,
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "HIDDevice" , js_name = sendReport)]
+    #[doc = "The `sendReport()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDDevice/sendReport)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn send_report_with_u8_array(
+        this: &HidDevice,
+        report_id: u8,
+        data: &mut [u8],
+    ) -> ::js_sys::Promise;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidInputReportEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidInputReportEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidInputReportEventInit.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidInputReportEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,154 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = HIDInputReportEventInit)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidInputReportEventInit` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidInputReportEventInit;
+}
+#[cfg(web_sys_unstable_apis)]
+impl HidInputReportEventInit {
+    #[cfg(feature = "HidDevice")]
+    #[doc = "Construct a new `HidInputReportEventInit`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`, `HidInputReportEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(data: &::js_sys::DataView, device: &HidDevice, report_id: u8) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.data(data);
+        ret.device(device);
+        ret.report_id(report_id);
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `bubbles` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn bubbles(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("bubbles"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `cancelable` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn cancelable(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("cancelable"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `composed` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn composed(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("composed"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `data` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn data(&mut self, val: &::js_sys::DataView) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("data"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "HidDevice")]
+    #[doc = "Change the `device` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`, `HidInputReportEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn device(&mut self, val: &HidDevice) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("device"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `reportId` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEventInit`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn report_id(&mut self, val: u8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("reportId"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidInputReportEvent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidInputReportEvent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidInputReportEvent.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidInputReportEvent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,52 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = Event , extends = :: js_sys :: Object , js_name = HIDInputReportEvent , typescript_type = "HIDInputReportEvent")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidInputReportEvent` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDInputReportEvent)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEvent`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidInputReportEvent;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "HidDevice")]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDInputReportEvent" , js_name = device)]
+    #[doc = "Getter for the `device` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDInputReportEvent/device)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidDevice`, `HidInputReportEvent`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn device(this: &HidInputReportEvent) -> HidDevice;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDInputReportEvent" , js_name = reportId)]
+    #[doc = "Getter for the `reportId` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDInputReportEvent/reportId)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEvent`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn report_id(this: &HidInputReportEvent) -> u8;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HIDInputReportEvent" , js_name = data)]
+    #[doc = "Getter for the `data` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HIDInputReportEvent/data)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidInputReportEvent`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn data(this: &HidInputReportEvent) -> ::js_sys::DataView;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidReportInfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidReportInfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidReportInfo.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidReportInfo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,74 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = HIDReportInfo)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidReportInfo` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidReportInfo;
+}
+#[cfg(web_sys_unstable_apis)]
+impl HidReportInfo {
+    #[doc = "Construct a new `HidReportInfo`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `items` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn items(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("items"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `reportId` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportInfo`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn report_id(&mut self, val: u8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("reportId"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for HidReportInfo {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidReportItem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidReportItem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidReportItem.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidReportItem.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,618 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = HIDReportItem)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `HidReportItem` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type HidReportItem;
+}
+#[cfg(web_sys_unstable_apis)]
+impl HidReportItem {
+    #[doc = "Construct a new `HidReportItem`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `hasNull` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn has_null(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("hasNull"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `hasPreferredState` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn has_preferred_state(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("hasPreferredState"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `isAbsolute` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn is_absolute(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("isAbsolute"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `isArray` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn is_array(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("isArray"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `isBufferedBytes` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn is_buffered_bytes(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("isBufferedBytes"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `isConstant` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn is_constant(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("isConstant"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `isLinear` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn is_linear(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("isLinear"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `isRange` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn is_range(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("isRange"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `isVolatile` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn is_volatile(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("isVolatile"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `logicalMaximum` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn logical_maximum(&mut self, val: i32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("logicalMaximum"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `logicalMinimum` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn logical_minimum(&mut self, val: i32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("logicalMinimum"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `physicalMaximum` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn physical_maximum(&mut self, val: i32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("physicalMaximum"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `physicalMinimum` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn physical_minimum(&mut self, val: i32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("physicalMinimum"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `reportCount` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn report_count(&mut self, val: u16) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("reportCount"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `reportSize` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn report_size(&mut self, val: u16) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("reportSize"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `strings` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn strings(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("strings"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `unitExponent` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unit_exponent(&mut self, val: i8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("unitExponent"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `unitFactorCurrentExponent` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unit_factor_current_exponent(&mut self, val: i8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("unitFactorCurrentExponent"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `unitFactorLengthExponent` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unit_factor_length_exponent(&mut self, val: i8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("unitFactorLengthExponent"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `unitFactorLuminousIntensityExponent` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unit_factor_luminous_intensity_exponent(&mut self, val: i8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("unitFactorLuminousIntensityExponent"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `unitFactorMassExponent` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unit_factor_mass_exponent(&mut self, val: i8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("unitFactorMassExponent"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `unitFactorTemperatureExponent` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unit_factor_temperature_exponent(&mut self, val: i8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("unitFactorTemperatureExponent"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `unitFactorTimeExponent` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unit_factor_time_exponent(&mut self, val: i8) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("unitFactorTimeExponent"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "HidUnitSystem")]
+    #[doc = "Change the `unitSystem` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`, `HidUnitSystem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn unit_system(&mut self, val: HidUnitSystem) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("unitSystem"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `usageMaximum` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn usage_maximum(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("usageMaximum"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `usageMinimum` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn usage_minimum(&mut self, val: u32) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("usageMinimum"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `usages` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn usages(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("usages"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `wrap` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HidReportItem`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn wrap(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("wrap"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for HidReportItem {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_Hid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_Hid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_Hid.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_Hid.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,85 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = EventTarget , extends = :: js_sys :: Object , js_name = HID , typescript_type = "HID")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `Hid` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HID)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Hid`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type Hid;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HID" , js_name = onconnect)]
+    #[doc = "Getter for the `onconnect` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HID/onconnect)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Hid`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn onconnect(this: &Hid) -> Option<::js_sys::Function>;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , setter , js_class = "HID" , js_name = onconnect)]
+    #[doc = "Setter for the `onconnect` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HID/onconnect)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Hid`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn set_onconnect(this: &Hid, value: Option<&::js_sys::Function>);
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "HID" , js_name = ondisconnect)]
+    #[doc = "Getter for the `ondisconnect` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HID/ondisconnect)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Hid`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn ondisconnect(this: &Hid) -> Option<::js_sys::Function>;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , setter , js_class = "HID" , js_name = ondisconnect)]
+    #[doc = "Setter for the `ondisconnect` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HID/ondisconnect)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Hid`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn set_ondisconnect(this: &Hid, value: Option<&::js_sys::Function>);
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "HID" , js_name = getDevices)]
+    #[doc = "The `getDevices()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HID/getDevices)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Hid`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn get_devices(this: &Hid) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "HidDeviceRequestOptions")]
+    # [wasm_bindgen (method , structural , js_class = "HID" , js_name = requestDevice)]
+    #[doc = "The `requestDevice()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HID/requestDevice)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Hid`, `HidDeviceRequestOptions`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn request_device(this: &Hid, options: &HidDeviceRequestOptions) -> ::js_sys::Promise;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidUnitSystem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidUnitSystem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HidUnitSystem.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HidUnitSystem.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,20 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `HidUnitSystem` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `HidUnitSystem`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum HidUnitSystem {
+    None = "none",
+    SiLinear = "si-linear",
+    SiRotation = "si-rotation",
+    EnglishLinear = "english-linear",
+    EnglishRotation = "english-rotation",
+    VendorDefined = "vendor-defined",
+    Reserved = "reserved",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HitRegionOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HitRegionOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HitRegionOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HitRegionOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -65,3 +65,8 @@
         self
     }
 }
+impl Default for HitRegionOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HtmlElement.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HtmlElement.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HtmlElement.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HtmlElement.rs	2021-12-09 12:01:26.000000000 +0000
@@ -25,6 +25,34 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `HtmlElement`*"]
     pub fn set_title(this: &HtmlElement, value: &str);
+    # [wasm_bindgen (structural , method , getter , js_class = "HTMLElement" , js_name = scrollHeight)]
+    #[doc = "Getter for the `scrollHeight` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/scrollHeight)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HtmlElement`*"]
+    pub fn scroll_height(this: &HtmlElement) -> i32;
+    # [wasm_bindgen (structural , method , setter , js_class = "HTMLElement" , js_name = scrollHeight)]
+    #[doc = "Setter for the `scrollHeight` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/scrollHeight)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HtmlElement`*"]
+    pub fn set_scroll_height(this: &HtmlElement, value: i32);
+    # [wasm_bindgen (structural , method , getter , js_class = "HTMLElement" , js_name = scrollTop)]
+    #[doc = "Getter for the `scrollTop` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/scrollTop)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HtmlElement`*"]
+    pub fn scroll_top(this: &HtmlElement) -> i32;
+    # [wasm_bindgen (structural , method , setter , js_class = "HTMLElement" , js_name = scrollTop)]
+    #[doc = "Setter for the `scrollTop` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/scrollTop)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `HtmlElement`*"]
+    pub fn set_scroll_top(this: &HtmlElement, value: i32);
     # [wasm_bindgen (structural , method , getter , js_class = "HTMLElement" , js_name = lang)]
     #[doc = "Getter for the `lang` field of this object."]
     #[doc = ""]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for HttpConnDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnectionElement.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnectionElement.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnectionElement.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnectionElement.rs	2021-12-09 12:01:26.000000000 +0000
@@ -116,3 +116,8 @@
         self
     }
 }
+impl Default for HttpConnectionElement {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnInfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnInfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnInfo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_HttpConnInfo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -63,3 +63,8 @@
         self
     }
 }
+impl Default for HttpConnInfo {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbFileMetadataParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbFileMetadataParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbFileMetadataParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbFileMetadataParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for IdbFileMetadataParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbIndexParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbIndexParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbIndexParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbIndexParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -65,3 +65,8 @@
         self
     }
 }
+impl Default for IdbIndexParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbObjectStoreParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbObjectStoreParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbObjectStoreParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbObjectStoreParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -54,3 +54,8 @@
         self
     }
 }
+impl Default for IdbObjectStoreParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbOpenDbOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbOpenDbOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbOpenDbOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbOpenDbOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -55,3 +55,8 @@
         self
     }
 }
+impl Default for IdbOpenDbOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbVersionChangeEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbVersionChangeEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbVersionChangeEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdbVersionChangeEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for IdbVersionChangeEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdleRequestOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdleRequestOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IdleRequestOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IdleRequestOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for IdleRequestOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ImageCaptureErrorEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ImageCaptureErrorEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ImageCaptureErrorEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ImageCaptureErrorEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -89,3 +89,8 @@
         self
     }
 }
+impl Default for ImageCaptureErrorEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ImageData.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ImageData.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ImageData.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ImageData.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,7 +46,7 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `ImageData`*"]
     pub fn new_with_u8_clamped_array(
-        data: ::wasm_bindgen::Clamped<&mut [u8]>,
+        data: ::wasm_bindgen::Clamped<&[u8]>,
         sw: u32,
     ) -> Result<ImageData, JsValue>;
     #[wasm_bindgen(catch, constructor, js_class = "ImageData")]
@@ -56,7 +56,7 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `ImageData`*"]
     pub fn new_with_u8_clamped_array_and_sh(
-        data: ::wasm_bindgen::Clamped<&mut [u8]>,
+        data: ::wasm_bindgen::Clamped<&[u8]>,
         sw: u32,
         sh: u32,
     ) -> Result<ImageData, JsValue>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_InputEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_InputEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_InputEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_InputEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -98,6 +98,54 @@
         let _ = r;
         self
     }
+    #[doc = "Change the `data` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `InputEventInit`*"]
+    pub fn data(&mut self, val: Option<&str>) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("data"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(feature = "DataTransfer")]
+    #[doc = "Change the `dataTransfer` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `DataTransfer`, `InputEventInit`*"]
+    pub fn data_transfer(&mut self, val: Option<&DataTransfer>) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("dataTransfer"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[doc = "Change the `inputType` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `InputEventInit`*"]
+    pub fn input_type(&mut self, val: &str) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("inputType"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
     #[doc = "Change the `isComposing` field of this object."]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `InputEventInit`*"]
@@ -115,4 +163,26 @@
         let _ = r;
         self
     }
+    #[doc = "Change the `targetRanges` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `InputEventInit`*"]
+    pub fn target_ranges(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("targetRanges"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+impl Default for InputEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_InputEvent.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_InputEvent.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_InputEvent.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_InputEvent.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,6 +18,28 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `InputEvent`*"]
     pub fn is_composing(this: &InputEvent) -> bool;
+    # [wasm_bindgen (structural , method , getter , js_class = "InputEvent" , js_name = inputType)]
+    #[doc = "Getter for the `inputType` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/InputEvent/inputType)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `InputEvent`*"]
+    pub fn input_type(this: &InputEvent) -> String;
+    # [wasm_bindgen (structural , method , getter , js_class = "InputEvent" , js_name = data)]
+    #[doc = "Getter for the `data` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/InputEvent/data)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `InputEvent`*"]
+    pub fn data(this: &InputEvent) -> Option<String>;
+    #[cfg(feature = "DataTransfer")]
+    # [wasm_bindgen (structural , method , getter , js_class = "InputEvent" , js_name = dataTransfer)]
+    #[doc = "Getter for the `dataTransfer` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/InputEvent/dataTransfer)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `DataTransfer`, `InputEvent`*"]
+    pub fn data_transfer(this: &InputEvent) -> Option<DataTransfer>;
     #[wasm_bindgen(catch, constructor, js_class = "InputEvent")]
     #[doc = "The `new InputEvent(..)` constructor, creating a new instance of `InputEvent`."]
     #[doc = ""]
@@ -36,4 +58,11 @@
         type_: &str,
         event_init_dict: &InputEventInit,
     ) -> Result<InputEvent, JsValue>;
+    # [wasm_bindgen (method , structural , js_class = "InputEvent" , js_name = getTargetRanges)]
+    #[doc = "The `getTargetRanges()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/InputEvent/getTargetRanges)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `InputEvent`*"]
+    pub fn get_target_ranges(this: &InputEvent) -> ::js_sys::Array;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_InstallTriggerData.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_InstallTriggerData.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_InstallTriggerData.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_InstallTriggerData.rs	2021-12-09 12:01:26.000000000 +0000
@@ -63,3 +63,8 @@
         self
     }
 }
+impl Default for InstallTriggerData {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IntersectionObserverInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IntersectionObserverInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IntersectionObserverInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IntersectionObserverInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -68,3 +68,8 @@
         self
     }
 }
+impl Default for IntersectionObserverInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IterableKeyAndValueResult.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IterableKeyAndValueResult.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IterableKeyAndValueResult.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IterableKeyAndValueResult.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for IterableKeyAndValueResult {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IterableKeyOrValueResult.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IterableKeyOrValueResult.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_IterableKeyOrValueResult.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_IterableKeyOrValueResult.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for IterableKeyOrValueResult {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_KeyboardEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_KeyboardEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_KeyboardEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_KeyboardEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -438,3 +438,8 @@
         self
     }
 }
+impl Default for KeyboardEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_KeyframeEffectOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_KeyframeEffectOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_KeyframeEffectOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_KeyframeEffectOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -183,3 +183,8 @@
         self
     }
 }
+impl Default for KeyframeEffectOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_L10nValue.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_L10nValue.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_L10nValue.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_L10nValue.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for L10nValue {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_LifecycleCallbacks.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_LifecycleCallbacks.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_LifecycleCallbacks.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_LifecycleCallbacks.rs	2021-12-09 12:01:26.000000000 +0000
@@ -88,3 +88,8 @@
         self
     }
 }
+impl Default for LifecycleCallbacks {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_LocaleInfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_LocaleInfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_LocaleInfo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_LocaleInfo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,3 +51,8 @@
         self
     }
 }
+impl Default for LocaleInfo {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaConfiguration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaConfiguration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaConfiguration.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaConfiguration.rs	2021-12-09 12:01:26.000000000 +0000
@@ -48,3 +48,8 @@
         self
     }
 }
+impl Default for MediaConfiguration {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaDevices.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaDevices.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaDevices.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaDevices.rs	2021-12-09 12:01:26.000000000 +0000
@@ -32,6 +32,24 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `MediaDevices`*"]
     pub fn enumerate_devices(this: &MediaDevices) -> Result<::js_sys::Promise, JsValue>;
+    # [wasm_bindgen (catch , method , structural , js_class = "MediaDevices" , js_name = getDisplayMedia)]
+    #[doc = "The `getDisplayMedia()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getDisplayMedia)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `MediaDevices`*"]
+    pub fn get_display_media(this: &MediaDevices) -> Result<::js_sys::Promise, JsValue>;
+    #[cfg(feature = "DisplayMediaStreamConstraints")]
+    # [wasm_bindgen (catch , method , structural , js_class = "MediaDevices" , js_name = getDisplayMedia)]
+    #[doc = "The `getDisplayMedia()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getDisplayMedia)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `DisplayMediaStreamConstraints`, `MediaDevices`*"]
+    pub fn get_display_media_with_constraints(
+        this: &MediaDevices,
+        constraints: &DisplayMediaStreamConstraints,
+    ) -> Result<::js_sys::Promise, JsValue>;
     #[cfg(feature = "MediaTrackSupportedConstraints")]
     # [wasm_bindgen (method , structural , js_class = "MediaDevices" , js_name = getSupportedConstraints)]
     #[doc = "The `getSupportedConstraints()` method."]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeyNeededEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeyNeededEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeyNeededEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeyNeededEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for MediaKeyNeededEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeysPolicy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeysPolicy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeysPolicy.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeysPolicy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for MediaKeysPolicy {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeySystemConfiguration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeySystemConfiguration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeySystemConfiguration.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeySystemConfiguration.rs	2021-12-09 12:01:26.000000000 +0000
@@ -137,3 +137,8 @@
         self
     }
 }
+impl Default for MediaKeySystemConfiguration {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeySystemMediaCapability.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeySystemMediaCapability.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeySystemMediaCapability.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaKeySystemMediaCapability.rs	2021-12-09 12:01:26.000000000 +0000
@@ -54,3 +54,8 @@
         self
     }
 }
+impl Default for MediaKeySystemMediaCapability {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaQueryListEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaQueryListEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaQueryListEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaQueryListEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -101,3 +101,8 @@
         self
     }
 }
+impl Default for MediaQueryListEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaRecorderOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaRecorderOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaRecorderOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaRecorderOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -88,3 +88,8 @@
         self
     }
 }
+impl Default for MediaRecorderOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaStreamConstraints.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaStreamConstraints.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaStreamConstraints.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaStreamConstraints.rs	2021-12-09 12:01:26.000000000 +0000
@@ -93,3 +93,8 @@
         self
     }
 }
+impl Default for MediaStreamConstraints {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaStreamEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaStreamEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaStreamEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaStreamEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -86,3 +86,8 @@
         self
     }
 }
+impl Default for MediaStreamEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackConstraintSet.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackConstraintSet.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackConstraintSet.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackConstraintSet.rs	2021-12-09 12:01:26.000000000 +0000
@@ -285,3 +285,8 @@
         self
     }
 }
+impl Default for MediaTrackConstraintSet {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackConstraints.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackConstraints.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackConstraints.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackConstraints.rs	2021-12-09 12:01:26.000000000 +0000
@@ -302,3 +302,8 @@
         self
     }
 }
+impl Default for MediaTrackConstraints {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackSettings.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackSettings.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackSettings.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackSettings.rs	2021-12-09 12:01:26.000000000 +0000
@@ -166,3 +166,8 @@
         self
     }
 }
+impl Default for MediaTrackSettings {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackSupportedConstraints.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackSupportedConstraints.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackSupportedConstraints.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MediaTrackSupportedConstraints.rs	2021-12-09 12:01:26.000000000 +0000
@@ -265,3 +265,8 @@
         self
     }
 }
+impl Default for MediaTrackSupportedConstraints {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MessageEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MessageEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MessageEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MessageEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -142,3 +142,8 @@
         self
     }
 }
+impl Default for MessageEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiConnectionEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiConnectionEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiConnectionEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiConnectionEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -85,3 +85,8 @@
         self
     }
 }
+impl Default for MidiConnectionEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiMessageEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiMessageEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiMessageEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiMessageEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for MidiMessageEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MidiOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for MidiOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MouseEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MouseEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MouseEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MouseEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -468,3 +468,8 @@
         self
     }
 }
+impl Default for MouseEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MutationObserverInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MutationObserverInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MutationObserverInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MutationObserverInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -173,3 +173,8 @@
         self
     }
 }
+impl Default for MutationObserverInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MutationObservingInfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MutationObservingInfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_MutationObservingInfo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_MutationObservingInfo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -191,3 +191,8 @@
         self
     }
 }
+impl Default for MutationObservingInfo {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NativeOsFileReadOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NativeOsFileReadOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NativeOsFileReadOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NativeOsFileReadOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for NativeOsFileReadOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NativeOsFileWriteAtomicOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NativeOsFileWriteAtomicOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NativeOsFileWriteAtomicOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NativeOsFileWriteAtomicOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -97,3 +97,8 @@
         self
     }
 }
+impl Default for NativeOsFileWriteAtomicOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_Navigator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_Navigator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_Navigator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_Navigator.rs	2021-12-09 12:01:26.000000000 +0000
@@ -115,7 +115,7 @@
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn bluetooth(this: &Navigator) -> Bluetooth;
+    pub fn bluetooth(this: &Navigator) -> Option<Bluetooth>;
     #[cfg(web_sys_unstable_apis)]
     #[cfg(feature = "Clipboard")]
     # [wasm_bindgen (structural , method , getter , js_class = "Navigator" , js_name = clipboard)]
@@ -127,19 +127,31 @@
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn clipboard(this: &Navigator) -> Clipboard;
+    pub fn clipboard(this: &Navigator) -> Option<Clipboard>;
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "Gpu")]
-    # [wasm_bindgen (structural , method , getter , js_class = "Navigator" , js_name = gpu)]
-    #[doc = "Getter for the `gpu` field of this object."]
+    #[cfg(feature = "WakeLock")]
+    # [wasm_bindgen (structural , method , getter , js_class = "Navigator" , js_name = wakeLock)]
+    #[doc = "Getter for the `wakeLock` field of this object."]
     #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/gpu)"]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/wakeLock)"]
     #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `Gpu`, `Navigator`*"]
+    #[doc = "*This API requires the following crate features to be activated: `Navigator`, `WakeLock`*"]
     #[doc = ""]
     #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
     #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn gpu(this: &Navigator) -> Gpu;
+    pub fn wake_lock(this: &Navigator) -> WakeLock;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "Hid")]
+    # [wasm_bindgen (structural , method , getter , js_class = "Navigator" , js_name = hid)]
+    #[doc = "Getter for the `hid` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/hid)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Hid`, `Navigator`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn hid(this: &Navigator) -> Hid;
     #[cfg(web_sys_unstable_apis)]
     #[cfg(feature = "Usb")]
     # [wasm_bindgen (structural , method , getter , js_class = "Navigator" , js_name = usb)]
@@ -171,6 +183,18 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `Navigator`*"]
     pub fn hardware_concurrency(this: &Navigator) -> f64;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "Gpu")]
+    # [wasm_bindgen (structural , method , getter , js_class = "Navigator" , js_name = gpu)]
+    #[doc = "Getter for the `gpu` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/gpu)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Gpu`, `Navigator`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn gpu(this: &Navigator) -> Gpu;
     #[cfg(feature = "Geolocation")]
     # [wasm_bindgen (structural , catch , method , getter , js_class = "Navigator" , js_name = geolocation)]
     #[doc = "Getter for the `geolocation` field of this object."]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NetworkCommandOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NetworkCommandOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NetworkCommandOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NetworkCommandOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -681,3 +681,8 @@
         self
     }
 }
+impl Default for NetworkCommandOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NetworkResultOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NetworkResultOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NetworkResultOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NetworkResultOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -549,3 +549,8 @@
         self
     }
 }
+impl Default for NetworkResultOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NodeFilter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NodeFilter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NodeFilter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NodeFilter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for NodeFilter {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NotificationBehavior.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NotificationBehavior.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NotificationBehavior.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NotificationBehavior.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for NotificationBehavior {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NotificationOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NotificationOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_NotificationOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_NotificationOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -116,3 +116,8 @@
         self
     }
 }
+impl Default for NotificationOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ObserverCallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ObserverCallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ObserverCallback.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ObserverCallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for ObserverCallback {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_OpenWindowEventDetail.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_OpenWindowEventDetail.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_OpenWindowEventDetail.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_OpenWindowEventDetail.rs	2021-12-09 12:01:26.000000000 +0000
@@ -81,3 +81,8 @@
         self
     }
 }
+impl Default for OpenWindowEventDetail {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_OptionalEffectTiming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_OptionalEffectTiming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_OptionalEffectTiming.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_OptionalEffectTiming.rs	2021-12-09 12:01:26.000000000 +0000
@@ -147,3 +147,8 @@
         self
     }
 }
+impl Default for OptionalEffectTiming {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_OscillatorOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_OscillatorOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_OscillatorOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_OscillatorOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -136,3 +136,8 @@
         self
     }
 }
+impl Default for OscillatorOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PageTransitionEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PageTransitionEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PageTransitionEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PageTransitionEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for PageTransitionEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PannerOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PannerOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PannerOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PannerOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -313,3 +313,8 @@
         self
     }
 }
+impl Default for PannerOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PaymentRequestUpdateEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PaymentRequestUpdateEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PaymentRequestUpdateEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PaymentRequestUpdateEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for PaymentRequestUpdateEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PerformanceEntryEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PerformanceEntryEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PerformanceEntryEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PerformanceEntryEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -162,3 +162,8 @@
         self
     }
 }
+impl Default for PerformanceEntryEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PerformanceEntryFilterOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PerformanceEntryFilterOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PerformanceEntryFilterOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PerformanceEntryFilterOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -67,3 +67,8 @@
         self
     }
 }
+impl Default for PerformanceEntryFilterOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PeriodicWaveConstraints.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PeriodicWaveConstraints.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PeriodicWaveConstraints.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PeriodicWaveConstraints.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for PeriodicWaveConstraints {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PeriodicWaveOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PeriodicWaveOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PeriodicWaveOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PeriodicWaveOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -63,3 +63,8 @@
         self
     }
 }
+impl Default for PeriodicWaveOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PluginCrashedEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PluginCrashedEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PluginCrashedEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PluginCrashedEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -190,3 +190,8 @@
         self
     }
 }
+impl Default for PluginCrashedEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PointerEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PointerEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PointerEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PointerEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -636,3 +636,8 @@
         self
     }
 }
+impl Default for PointerEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PopStateEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PopStateEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PopStateEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PopStateEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,3 +84,8 @@
         self
     }
 }
+impl Default for PopStateEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PopupBlockedEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PopupBlockedEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PopupBlockedEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PopupBlockedEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -123,3 +123,8 @@
         self
     }
 }
+impl Default for PopupBlockedEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PositionOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PositionOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PositionOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PositionOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for PositionOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineLayerRect.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineLayerRect.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineLayerRect.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineLayerRect.rs	2021-12-09 12:01:26.000000000 +0000
@@ -73,3 +73,8 @@
         self
     }
 }
+impl Default for ProfileTimelineLayerRect {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineMarker.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineMarker.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineMarker.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineMarker.rs	2021-12-09 12:01:26.000000000 +0000
@@ -260,3 +260,8 @@
         self
     }
 }
+impl Default for ProfileTimelineMarker {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineStackFrame.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineStackFrame.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineStackFrame.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ProfileTimelineStackFrame.rs	2021-12-09 12:01:26.000000000 +0000
@@ -126,3 +126,8 @@
         self
     }
 }
+impl Default for ProfileTimelineStackFrame {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ProgressEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ProgressEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ProgressEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ProgressEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -115,3 +115,8 @@
         self
     }
 }
+impl Default for ProgressEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PushEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PushEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PushEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PushEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,3 +84,8 @@
         self
     }
 }
+impl Default for PushEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionJson.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionJson.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionJson.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionJson.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,3 +51,8 @@
         self
     }
 }
+impl Default for PushSubscriptionJson {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionKeys.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionKeys.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionKeys.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionKeys.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,3 +47,8 @@
         self
     }
 }
+impl Default for PushSubscriptionKeys {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionOptionsInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionOptionsInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionOptionsInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_PushSubscriptionOptionsInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -54,3 +54,8 @@
         self
     }
 }
+impl Default for PushSubscriptionOptionsInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_QueuingStrategy.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_QueuingStrategy.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_QueuingStrategy.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_QueuingStrategy.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,74 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = QueuingStrategy)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `QueuingStrategy` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `QueuingStrategy`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type QueuingStrategy;
+}
+#[cfg(web_sys_unstable_apis)]
+impl QueuingStrategy {
+    #[doc = "Construct a new `QueuingStrategy`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `QueuingStrategy`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `highWaterMark` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `QueuingStrategy`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn high_water_mark(&mut self, val: f64) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("highWaterMark"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `size` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `QueuingStrategy`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn size(&mut self, val: &::js_sys::Function) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("size"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for QueuingStrategy {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RcwnPerfStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RcwnPerfStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RcwnPerfStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RcwnPerfStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for RcwnPerfStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RcwnStatus.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RcwnStatus.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RcwnStatus.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RcwnStatus.rs	2021-12-09 12:01:26.000000000 +0000
@@ -122,3 +122,8 @@
         self
     }
 }
+impl Default for RcwnStatus {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamByobReader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamByobReader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamByobReader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamByobReader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = ReadableStreamBYOBReader , typescript_type = "ReadableStreamBYOBReader")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `ReadableStreamByobReader` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamBYOBReader)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type ReadableStreamByobReader;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "ReadableStreamBYOBReader" , js_name = closed)]
+    #[doc = "Getter for the `closed` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamBYOBReader/closed)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn closed(this: &ReadableStreamByobReader) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamBYOBReader" , js_name = read)]
+    #[doc = "The `read()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamBYOBReader/read)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn read_with_array_buffer_view(
+        this: &ReadableStreamByobReader,
+        view: &::js_sys::Object,
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamBYOBReader" , js_name = read)]
+    #[doc = "The `read()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamBYOBReader/read)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn read_with_u8_array(
+        this: &ReadableStreamByobReader,
+        view: &mut [u8],
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamBYOBReader" , js_name = releaseLock)]
+    #[doc = "The `releaseLock()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamBYOBReader/releaseLock)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn release_lock(this: &ReadableStreamByobReader);
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamBYOBReader" , js_name = cancel)]
+    #[doc = "The `cancel()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamBYOBReader/cancel)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn cancel(this: &ReadableStreamByobReader) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamBYOBReader" , js_name = cancel)]
+    #[doc = "The `cancel()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamBYOBReader/cancel)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn cancel_with_reason(
+        this: &ReadableStreamByobReader,
+        reason: &::wasm_bindgen::JsValue,
+    ) -> ::js_sys::Promise;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamByobReadResult.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamByobReadResult.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamByobReadResult.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamByobReadResult.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,70 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = ReadableStreamBYOBReadResult)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `ReadableStreamByobReadResult` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReadResult`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type ReadableStreamByobReadResult;
+}
+#[cfg(web_sys_unstable_apis)]
+impl ReadableStreamByobReadResult {
+    #[doc = "Construct a new `ReadableStreamByobReadResult`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReadResult`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `done` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReadResult`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn done(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("done"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `value` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamByobReadResult`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn value(&mut self, val: &::js_sys::Object) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("value"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for ReadableStreamByobReadResult {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamDefaultReader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamDefaultReader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamDefaultReader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamDefaultReader.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,76 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = ReadableStreamDefaultReader , typescript_type = "ReadableStreamDefaultReader")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `ReadableStreamDefaultReader` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type ReadableStreamDefaultReader;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "ReadableStreamDefaultReader" , js_name = closed)]
+    #[doc = "Getter for the `closed` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader/closed)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn closed(this: &ReadableStreamDefaultReader) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamDefaultReader" , js_name = read)]
+    #[doc = "The `read()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader/read)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn read(this: &ReadableStreamDefaultReader) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamDefaultReader" , js_name = releaseLock)]
+    #[doc = "The `releaseLock()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader/releaseLock)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn release_lock(this: &ReadableStreamDefaultReader);
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamDefaultReader" , js_name = cancel)]
+    #[doc = "The `cancel()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader/cancel)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn cancel(this: &ReadableStreamDefaultReader) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStreamDefaultReader" , js_name = cancel)]
+    #[doc = "The `cancel()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader/cancel)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReader`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn cancel_with_reason(
+        this: &ReadableStreamDefaultReader,
+        reason: &::wasm_bindgen::JsValue,
+    ) -> ::js_sys::Promise;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamDefaultReadResult.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamDefaultReadResult.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamDefaultReadResult.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamDefaultReadResult.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,70 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = ReadableStreamDefaultReadResult)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `ReadableStreamDefaultReadResult` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReadResult`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type ReadableStreamDefaultReadResult;
+}
+#[cfg(web_sys_unstable_apis)]
+impl ReadableStreamDefaultReadResult {
+    #[doc = "Construct a new `ReadableStreamDefaultReadResult`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReadResult`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `done` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReadResult`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn done(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("done"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[doc = "Change the `value` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamDefaultReadResult`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn value(&mut self, val: &::wasm_bindgen::JsValue) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("value"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+#[cfg(web_sys_unstable_apis)]
+impl Default for ReadableStreamDefaultReadResult {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamGetReaderOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamGetReaderOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamGetReaderOptions.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamGetReaderOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,41 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = ReadableStreamGetReaderOptions)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `ReadableStreamGetReaderOptions` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamGetReaderOptions`*"]
+    pub type ReadableStreamGetReaderOptions;
+}
+impl ReadableStreamGetReaderOptions {
+    #[doc = "Construct a new `ReadableStreamGetReaderOptions`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamGetReaderOptions`*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[cfg(feature = "ReadableStreamReaderMode")]
+    #[doc = "Change the `mode` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamGetReaderOptions`, `ReadableStreamReaderMode`*"]
+    pub fn mode(&mut self, val: ReadableStreamReaderMode) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("mode"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+impl Default for ReadableStreamGetReaderOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamIteratorOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamIteratorOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamIteratorOptions.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamIteratorOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,44 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = ReadableStreamIteratorOptions)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `ReadableStreamIteratorOptions` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamIteratorOptions`*"]
+    pub type ReadableStreamIteratorOptions;
+}
+impl ReadableStreamIteratorOptions {
+    #[doc = "Construct a new `ReadableStreamIteratorOptions`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamIteratorOptions`*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[doc = "Change the `preventCancel` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStreamIteratorOptions`*"]
+    pub fn prevent_cancel(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("preventCancel"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+impl Default for ReadableStreamIteratorOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamReaderMode.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamReaderMode.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamReaderMode.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStreamReaderMode.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,10 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[wasm_bindgen]
+#[doc = "The `ReadableStreamReaderMode` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `ReadableStreamReaderMode`*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ReadableStreamReaderMode {
+    Byob = "byob",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStream.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableStream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,4 +11,101 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `ReadableStream`*"]
     pub type ReadableStream;
+    # [wasm_bindgen (structural , method , getter , js_class = "ReadableStream" , js_name = locked)]
+    #[doc = "Getter for the `locked` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/locked)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`*"]
+    pub fn locked(this: &ReadableStream) -> bool;
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = cancel)]
+    #[doc = "The `cancel()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/cancel)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`*"]
+    pub fn cancel(this: &ReadableStream) -> ::js_sys::Promise;
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = cancel)]
+    #[doc = "The `cancel()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/cancel)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`*"]
+    pub fn cancel_with_reason(
+        this: &ReadableStream,
+        reason: &::wasm_bindgen::JsValue,
+    ) -> ::js_sys::Promise;
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = getReader)]
+    #[doc = "The `getReader()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/getReader)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`*"]
+    pub fn get_reader(this: &ReadableStream) -> ::js_sys::Object;
+    #[cfg(feature = "ReadableStreamGetReaderOptions")]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = getReader)]
+    #[doc = "The `getReader()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/getReader)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`, `ReadableStreamGetReaderOptions`*"]
+    pub fn get_reader_with_options(
+        this: &ReadableStream,
+        options: &ReadableStreamGetReaderOptions,
+    ) -> ::js_sys::Object;
+    #[cfg(feature = "ReadableWritablePair")]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = pipeThrough)]
+    #[doc = "The `pipeThrough()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/pipeThrough)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`, `ReadableWritablePair`*"]
+    pub fn pipe_through(this: &ReadableStream, transform: &ReadableWritablePair) -> ReadableStream;
+    #[cfg(all(feature = "ReadableWritablePair", feature = "StreamPipeOptions",))]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = pipeThrough)]
+    #[doc = "The `pipeThrough()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/pipeThrough)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`, `ReadableWritablePair`, `StreamPipeOptions`*"]
+    pub fn pipe_through_with_options(
+        this: &ReadableStream,
+        transform: &ReadableWritablePair,
+        options: &StreamPipeOptions,
+    ) -> ReadableStream;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "WritableStream")]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = pipeTo)]
+    #[doc = "The `pipeTo()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/pipeTo)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`, `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn pipe_to(this: &ReadableStream, destination: &WritableStream) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(all(feature = "StreamPipeOptions", feature = "WritableStream",))]
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = pipeTo)]
+    #[doc = "The `pipeTo()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/pipeTo)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`, `StreamPipeOptions`, `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn pipe_to_with_options(
+        this: &ReadableStream,
+        destination: &WritableStream,
+        options: &StreamPipeOptions,
+    ) -> ::js_sys::Promise;
+    # [wasm_bindgen (method , structural , js_class = "ReadableStream" , js_name = tee)]
+    #[doc = "The `tee()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/tee)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`*"]
+    pub fn tee(this: &ReadableStream) -> ::js_sys::Array;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableWritablePair.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableWritablePair.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableWritablePair.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ReadableWritablePair.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,69 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = ReadableWritablePair)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `ReadableWritablePair` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableWritablePair`*"]
+    pub type ReadableWritablePair;
+}
+impl ReadableWritablePair {
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(all(feature = "ReadableStream", feature = "WritableStream",))]
+    #[doc = "Construct a new `ReadableWritablePair`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`, `ReadableWritablePair`, `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new(readable: &ReadableStream, writable: &WritableStream) -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret.readable(readable);
+        ret.writable(writable);
+        ret
+    }
+    #[cfg(feature = "ReadableStream")]
+    #[doc = "Change the `readable` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`, `ReadableWritablePair`*"]
+    pub fn readable(&mut self, val: &ReadableStream) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("readable"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "WritableStream")]
+    #[doc = "Change the `writable` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableWritablePair`, `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn writable(&mut self, val: &WritableStream) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("writable"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisteredKey.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisteredKey.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisteredKey.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisteredKey.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,3 +84,8 @@
         self
     }
 }
+impl Default for RegisteredKey {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisterRequest.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisterRequest.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisterRequest.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisterRequest.rs	2021-12-09 12:01:26.000000000 +0000
@@ -54,3 +54,8 @@
         self
     }
 }
+impl Default for RegisterRequest {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisterResponse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisterResponse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisterResponse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RegisterResponse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for RegisterResponse {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RegistrationOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RegistrationOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RegistrationOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RegistrationOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -51,3 +51,8 @@
         self
     }
 }
+impl Default for RegistrationOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RequestDeviceOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RequestDeviceOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RequestDeviceOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RequestDeviceOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -91,3 +91,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for RequestDeviceOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RequestInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RequestInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RequestInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RequestInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -213,3 +213,8 @@
         self
     }
 }
+impl Default for RequestInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ResponseInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ResponseInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ResponseInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ResponseInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -68,3 +68,8 @@
         self
     }
 }
+impl Default for ResponseInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcAnswerOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcAnswerOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcAnswerOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcAnswerOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,3 +20,8 @@
         ret
     }
 }
+impl Default for RtcAnswerOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcCertificateExpiration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcCertificateExpiration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcCertificateExpiration.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcCertificateExpiration.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for RtcCertificateExpiration {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcCodecStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcCodecStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcCodecStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcCodecStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -145,3 +145,8 @@
         self
     }
 }
+impl Default for RtcCodecStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcConfiguration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcConfiguration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcConfiguration.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcConfiguration.rs	2021-12-09 12:01:26.000000000 +0000
@@ -107,3 +107,8 @@
         self
     }
 }
+impl Default for RtcConfiguration {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcDataChannelInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcDataChannelInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcDataChannelInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcDataChannelInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -135,3 +135,8 @@
         self
     }
 }
+impl Default for RtcDataChannelInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcdtmfToneChangeEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcdtmfToneChangeEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcdtmfToneChangeEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcdtmfToneChangeEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,3 +84,8 @@
         self
     }
 }
+impl Default for RtcdtmfToneChangeEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcFecParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcFecParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcFecParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcFecParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,8 @@
         self
     }
 }
+impl Default for RtcFecParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceCandidatePairStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceCandidatePairStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceCandidatePairStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceCandidatePairStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -299,3 +299,8 @@
         self
     }
 }
+impl Default for RtcIceCandidatePairStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceCandidateStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceCandidateStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceCandidateStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceCandidateStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -167,3 +167,8 @@
         self
     }
 }
+impl Default for RtcIceCandidateStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceComponentStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceComponentStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceComponentStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceComponentStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -149,3 +149,8 @@
         self
     }
 }
+impl Default for RtcIceComponentStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceServer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceServer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceServer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIceServer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -98,3 +98,8 @@
         self
     }
 }
+impl Default for RtcIceServer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIdentityAssertion.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIdentityAssertion.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIdentityAssertion.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIdentityAssertion.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for RtcIdentityAssertion {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIdentityProviderOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIdentityProviderOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIdentityProviderOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcIdentityProviderOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for RtcIdentityProviderOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcInboundRtpStreamStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcInboundRtpStreamStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcInboundRtpStreamStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcInboundRtpStreamStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -414,3 +414,8 @@
         self
     }
 }
+impl Default for RtcInboundRtpStreamStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcMediaStreamStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcMediaStreamStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcMediaStreamStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcMediaStreamStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -98,3 +98,8 @@
         self
     }
 }
+impl Default for RtcMediaStreamStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcMediaStreamTrackStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcMediaStreamTrackStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcMediaStreamTrackStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcMediaStreamTrackStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -302,3 +302,8 @@
         self
     }
 }
+impl Default for RtcMediaStreamTrackStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOfferAnswerOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOfferAnswerOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOfferAnswerOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOfferAnswerOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,3 +20,8 @@
         ret
     }
 }
+impl Default for RtcOfferAnswerOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOfferOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOfferOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOfferOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOfferOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -71,3 +71,8 @@
         self
     }
 }
+impl Default for RtcOfferOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOutboundRtpStreamStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOutboundRtpStreamStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOutboundRtpStreamStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcOutboundRtpStreamStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -383,3 +383,8 @@
         self
     }
 }
+impl Default for RtcOutboundRtpStreamStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcPeerConnectionIceEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcPeerConnectionIceEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcPeerConnectionIceEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcPeerConnectionIceEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -89,3 +89,8 @@
         self
     }
 }
+impl Default for RtcPeerConnectionIceEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtcpParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtcpParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtcpParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtcpParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for RtcRtcpParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpCodecParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpCodecParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpCodecParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpCodecParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for RtcRtpCodecParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcrtpContributingSourceStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcrtpContributingSourceStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcrtpContributingSourceStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcrtpContributingSourceStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -98,3 +98,8 @@
         self
     }
 }
+impl Default for RtcrtpContributingSourceStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpEncodingParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpEncodingParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpEncodingParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpEncodingParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -158,3 +158,8 @@
         self
     }
 }
+impl Default for RtcRtpEncodingParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpHeaderExtensionParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpHeaderExtensionParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpHeaderExtensionParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpHeaderExtensionParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -63,3 +63,8 @@
         self
     }
 }
+impl Default for RtcRtpHeaderExtensionParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -82,3 +82,8 @@
         self
     }
 }
+impl Default for RtcRtpParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcrtpStreamStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcrtpStreamStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcrtpStreamStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcrtpStreamStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -298,3 +298,8 @@
         self
     }
 }
+impl Default for RtcrtpStreamStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpTransceiverInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpTransceiverInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpTransceiverInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtpTransceiverInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -55,3 +55,8 @@
         self
     }
 }
+impl Default for RtcRtpTransceiverInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtxParameters.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtxParameters.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtxParameters.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcRtxParameters.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,8 @@
         self
     }
 }
+impl Default for RtcRtxParameters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcStatsReportInternal.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcStatsReportInternal.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcStatsReportInternal.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcStatsReportInternal.rs	2021-12-09 12:01:26.000000000 +0000
@@ -370,3 +370,8 @@
         self
     }
 }
+impl Default for RtcStatsReportInternal {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,3 +64,8 @@
         self
     }
 }
+impl Default for RtcStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcTransportStats.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcTransportStats.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcTransportStats.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_RtcTransportStats.rs	2021-12-09 12:01:26.000000000 +0000
@@ -98,3 +98,8 @@
         self
     }
 }
+impl Default for RtcTransportStats {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollIntoViewOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollIntoViewOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollIntoViewOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollIntoViewOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -67,3 +67,8 @@
         self
     }
 }
+impl Default for ScrollIntoViewOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -38,3 +38,8 @@
         self
     }
 }
+impl Default for ScrollOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollToOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollToOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollToOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollToOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,3 +64,8 @@
         self
     }
 }
+impl Default for ScrollToOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollViewChangeEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollViewChangeEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollViewChangeEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ScrollViewChangeEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -85,3 +85,8 @@
         self
     }
 }
+impl Default for ScrollViewChangeEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SecurityPolicyViolationEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SecurityPolicyViolationEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SecurityPolicyViolationEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SecurityPolicyViolationEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -273,3 +273,8 @@
         self
     }
 }
+impl Default for SecurityPolicyViolationEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ServerSocketOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ServerSocketOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ServerSocketOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ServerSocketOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -38,3 +38,8 @@
         self
     }
 }
+impl Default for ServerSocketOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SignResponse.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SignResponse.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SignResponse.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SignResponse.rs	2021-12-09 12:01:26.000000000 +0000
@@ -105,3 +105,8 @@
         self
     }
 }
+impl Default for SignResponse {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketElement.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketElement.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketElement.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketElement.rs	2021-12-09 12:01:26.000000000 +0000
@@ -103,3 +103,8 @@
         self
     }
 }
+impl Default for SocketElement {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -55,3 +55,8 @@
         self
     }
 }
+impl Default for SocketOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketsDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketsDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketsDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SocketsDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -67,3 +67,8 @@
         self
     }
 }
+impl Default for SocketsDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SpeechRecognitionErrorInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SpeechRecognitionErrorInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SpeechRecognitionErrorInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SpeechRecognitionErrorInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -102,3 +102,8 @@
         self
     }
 }
+impl Default for SpeechRecognitionErrorInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SpeechRecognitionEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SpeechRecognitionEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SpeechRecognitionEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SpeechRecognitionEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -137,3 +137,8 @@
         self
     }
 }
+impl Default for SpeechRecognitionEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StereoPannerOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StereoPannerOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StereoPannerOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StereoPannerOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -86,3 +86,8 @@
         self
     }
 }
+impl Default for StereoPannerOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StorageEstimate.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StorageEstimate.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StorageEstimate.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StorageEstimate.rs	2021-12-09 12:01:26.000000000 +0000
@@ -46,3 +46,8 @@
         self
     }
 }
+impl Default for StorageEstimate {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StorageEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StorageEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StorageEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StorageEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -149,3 +149,8 @@
         self
     }
 }
+impl Default for StorageEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StreamPipeOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StreamPipeOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StreamPipeOptions.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StreamPipeOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,93 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = StreamPipeOptions)]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `StreamPipeOptions` dictionary."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `StreamPipeOptions`*"]
+    pub type StreamPipeOptions;
+}
+impl StreamPipeOptions {
+    #[doc = "Construct a new `StreamPipeOptions`."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `StreamPipeOptions`*"]
+    pub fn new() -> Self {
+        #[allow(unused_mut)]
+        let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
+        ret
+    }
+    #[doc = "Change the `preventAbort` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `StreamPipeOptions`*"]
+    pub fn prevent_abort(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("preventAbort"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[doc = "Change the `preventCancel` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `StreamPipeOptions`*"]
+    pub fn prevent_cancel(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("preventCancel"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[doc = "Change the `preventClose` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `StreamPipeOptions`*"]
+    pub fn prevent_close(&mut self, val: bool) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("preventClose"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+    #[cfg(feature = "AbortSignal")]
+    #[doc = "Change the `signal` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `AbortSignal`, `StreamPipeOptions`*"]
+    pub fn signal(&mut self, val: &AbortSignal) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r =
+            ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("signal"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+impl Default for StreamPipeOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleRuleChangeEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleRuleChangeEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleRuleChangeEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleRuleChangeEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -103,3 +103,8 @@
         self
     }
 }
+impl Default for StyleRuleChangeEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleSheetApplicableStateChangeEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleSheetApplicableStateChangeEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleSheetApplicableStateChangeEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleSheetApplicableStateChangeEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -106,3 +106,8 @@
         self
     }
 }
+impl Default for StyleSheetApplicableStateChangeEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleSheetChangeEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleSheetChangeEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleSheetChangeEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_StyleSheetChangeEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -106,3 +106,8 @@
         self
     }
 }
+impl Default for StyleSheetChangeEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SvgBoundingBoxOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SvgBoundingBoxOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_SvgBoundingBoxOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_SvgBoundingBoxOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -81,3 +81,8 @@
         self
     }
 }
+impl Default for SvgBoundingBoxOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpServerSocketEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpServerSocketEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpServerSocketEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpServerSocketEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -86,3 +86,8 @@
         self
     }
 }
+impl Default for TcpServerSocketEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpSocketErrorEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpSocketErrorEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpSocketErrorEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpSocketErrorEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -101,3 +101,8 @@
         self
     }
 }
+impl Default for TcpSocketErrorEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpSocketEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpSocketEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpSocketEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TcpSocketEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,3 +84,8 @@
         self
     }
 }
+impl Default for TcpSocketEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TextDecodeOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TextDecodeOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TextDecodeOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TextDecodeOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -34,3 +34,8 @@
         self
     }
 }
+impl Default for TextDecodeOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TextDecoderOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TextDecoderOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TextDecoderOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TextDecoderOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -33,3 +33,8 @@
         self
     }
 }
+impl Default for TextDecoderOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TextMetrics.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TextMetrics.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TextMetrics.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TextMetrics.rs	2021-12-09 12:01:26.000000000 +0000
@@ -18,4 +18,46 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `TextMetrics`*"]
     pub fn width(this: &TextMetrics) -> f64;
+    # [wasm_bindgen (structural , method , getter , js_class = "TextMetrics" , js_name = actualBoundingBoxLeft)]
+    #[doc = "Getter for the `actualBoundingBoxLeft` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TextMetrics/actualBoundingBoxLeft)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TextMetrics`*"]
+    pub fn actual_bounding_box_left(this: &TextMetrics) -> f64;
+    # [wasm_bindgen (structural , method , getter , js_class = "TextMetrics" , js_name = actualBoundingBoxRight)]
+    #[doc = "Getter for the `actualBoundingBoxRight` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TextMetrics/actualBoundingBoxRight)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TextMetrics`*"]
+    pub fn actual_bounding_box_right(this: &TextMetrics) -> f64;
+    # [wasm_bindgen (structural , method , getter , js_class = "TextMetrics" , js_name = fontBoundingBoxAscent)]
+    #[doc = "Getter for the `fontBoundingBoxAscent` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TextMetrics/fontBoundingBoxAscent)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TextMetrics`*"]
+    pub fn font_bounding_box_ascent(this: &TextMetrics) -> f64;
+    # [wasm_bindgen (structural , method , getter , js_class = "TextMetrics" , js_name = fontBoundingBoxDescent)]
+    #[doc = "Getter for the `fontBoundingBoxDescent` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TextMetrics/fontBoundingBoxDescent)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TextMetrics`*"]
+    pub fn font_bounding_box_descent(this: &TextMetrics) -> f64;
+    # [wasm_bindgen (structural , method , getter , js_class = "TextMetrics" , js_name = actualBoundingBoxAscent)]
+    #[doc = "Getter for the `actualBoundingBoxAscent` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TextMetrics/actualBoundingBoxAscent)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TextMetrics`*"]
+    pub fn actual_bounding_box_ascent(this: &TextMetrics) -> f64;
+    # [wasm_bindgen (structural , method , getter , js_class = "TextMetrics" , js_name = actualBoundingBoxDescent)]
+    #[doc = "Getter for the `actualBoundingBoxDescent` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TextMetrics/actualBoundingBoxDescent)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TextMetrics`*"]
+    pub fn actual_bounding_box_descent(this: &TextMetrics) -> f64;
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TouchEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TouchEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TouchEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TouchEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -368,3 +368,8 @@
         self
     }
 }
+impl Default for TouchEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TrackEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TrackEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TrackEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TrackEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,3 +84,8 @@
         self
     }
 }
+impl Default for TrackEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TransformStream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TransformStream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TransformStream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TransformStream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,96 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = TransformStream , typescript_type = "TransformStream")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `TransformStream` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TransformStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type TransformStream;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "ReadableStream")]
+    # [wasm_bindgen (structural , method , getter , js_class = "TransformStream" , js_name = readable)]
+    #[doc = "Getter for the `readable` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream/readable)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `ReadableStream`, `TransformStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn readable(this: &TransformStream) -> ReadableStream;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "WritableStream")]
+    # [wasm_bindgen (structural , method , getter , js_class = "TransformStream" , js_name = writable)]
+    #[doc = "Getter for the `writable` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream/writable)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TransformStream`, `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn writable(this: &TransformStream) -> WritableStream;
+    #[cfg(web_sys_unstable_apis)]
+    #[wasm_bindgen(catch, constructor, js_class = "TransformStream")]
+    #[doc = "The `new TransformStream(..)` constructor, creating a new instance of `TransformStream`."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream/TransformStream)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TransformStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new() -> Result<TransformStream, JsValue>;
+    #[cfg(web_sys_unstable_apis)]
+    #[wasm_bindgen(catch, constructor, js_class = "TransformStream")]
+    #[doc = "The `new TransformStream(..)` constructor, creating a new instance of `TransformStream`."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream/TransformStream)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `TransformStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new_with_transformer(transformer: &::js_sys::Object)
+        -> Result<TransformStream, JsValue>;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "QueuingStrategy")]
+    #[wasm_bindgen(catch, constructor, js_class = "TransformStream")]
+    #[doc = "The `new TransformStream(..)` constructor, creating a new instance of `TransformStream`."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream/TransformStream)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `QueuingStrategy`, `TransformStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new_with_transformer_and_writable_strategy(
+        transformer: &::js_sys::Object,
+        writable_strategy: &QueuingStrategy,
+    ) -> Result<TransformStream, JsValue>;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "QueuingStrategy")]
+    #[wasm_bindgen(catch, constructor, js_class = "TransformStream")]
+    #[doc = "The `new TransformStream(..)` constructor, creating a new instance of `TransformStream`."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream/TransformStream)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `QueuingStrategy`, `TransformStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn new_with_transformer_and_writable_strategy_and_readable_strategy(
+        transformer: &::js_sys::Object,
+        writable_strategy: &QueuingStrategy,
+        readable_strategy: &QueuingStrategy,
+    ) -> Result<TransformStream, JsValue>;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TransitionEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TransitionEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TransitionEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TransitionEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -122,3 +122,8 @@
         self
     }
 }
+impl Default for TransitionEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TreeCellInfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TreeCellInfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_TreeCellInfo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_TreeCellInfo.rs	2021-12-09 12:01:26.000000000 +0000
@@ -50,3 +50,8 @@
         self
     }
 }
+impl Default for TreeCellInfo {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_U2fClientData.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_U2fClientData.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_U2fClientData.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_U2fClientData.rs	2021-12-09 12:01:26.000000000 +0000
@@ -64,3 +64,8 @@
         self
     }
 }
+impl Default for U2fClientData {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UdpMessageEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UdpMessageEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UdpMessageEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UdpMessageEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -118,3 +118,8 @@
         self
     }
 }
+impl Default for UdpMessageEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UdpOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UdpOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UdpOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UdpOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -122,3 +122,8 @@
         self
     }
 }
+impl Default for UdpOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UiEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UiEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UiEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UiEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -99,3 +99,8 @@
         self
     }
 }
+impl Default for UiEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UsbDeviceFilter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UsbDeviceFilter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UsbDeviceFilter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UsbDeviceFilter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -154,3 +154,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for UsbDeviceFilter {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UsbPermissionStorage.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UsbPermissionStorage.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UsbPermissionStorage.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UsbPermissionStorage.rs	2021-12-09 12:01:26.000000000 +0000
@@ -49,3 +49,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for UsbPermissionStorage {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UserProximityEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UserProximityEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_UserProximityEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_UserProximityEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -84,3 +84,8 @@
         self
     }
 }
+impl Default for UserProximityEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ValueEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ValueEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_ValueEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_ValueEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -108,3 +108,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for ValueEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_VideoConfiguration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_VideoConfiguration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_VideoConfiguration.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_VideoConfiguration.rs	2021-12-09 12:01:26.000000000 +0000
@@ -98,3 +98,8 @@
         self
     }
 }
+impl Default for VideoConfiguration {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_VoidCallback.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_VoidCallback.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_VoidCallback.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_VoidCallback.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for VoidCallback {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_VrLayer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_VrLayer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_VrLayer.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_VrLayer.rs	2021-12-09 12:01:26.000000000 +0000
@@ -69,3 +69,8 @@
         self
     }
 }
+impl Default for VrLayer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLock.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLock.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLock.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLock.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,30 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = WakeLock , typescript_type = "WakeLock")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `WakeLock` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WakeLock)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WakeLock`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type WakeLock;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "WakeLockType")]
+    # [wasm_bindgen (method , structural , js_class = "WakeLock" , js_name = request)]
+    #[doc = "The `request()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WakeLock/request)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WakeLock`, `WakeLockType`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn request(this: &WakeLock, type_: WakeLockType) -> ::js_sys::Promise;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLockSentinel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLockSentinel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLockSentinel.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLockSentinel.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,74 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = EventTarget , extends = :: js_sys :: Object , js_name = WakeLockSentinel , typescript_type = "WakeLockSentinel")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `WakeLockSentinel` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WakeLockSentinel)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WakeLockSentinel`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type WakeLockSentinel;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "WakeLockSentinel" , js_name = released)]
+    #[doc = "Getter for the `released` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WakeLockSentinel/released)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WakeLockSentinel`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn released(this: &WakeLockSentinel) -> bool;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "WakeLockType")]
+    # [wasm_bindgen (structural , method , getter , js_class = "WakeLockSentinel" , js_name = type)]
+    #[doc = "Getter for the `type` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WakeLockSentinel/type)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WakeLockSentinel`, `WakeLockType`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn type_(this: &WakeLockSentinel) -> WakeLockType;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "WakeLockSentinel" , js_name = onrelease)]
+    #[doc = "Getter for the `onrelease` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WakeLockSentinel/onrelease)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WakeLockSentinel`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn onrelease(this: &WakeLockSentinel) -> Option<::js_sys::Function>;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , setter , js_class = "WakeLockSentinel" , js_name = onrelease)]
+    #[doc = "Setter for the `onrelease` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WakeLockSentinel/onrelease)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WakeLockSentinel`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn set_onrelease(this: &WakeLockSentinel, value: Option<&::js_sys::Function>);
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WakeLockSentinel" , js_name = release)]
+    #[doc = "The `release()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WakeLockSentinel/release)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WakeLockSentinel`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn release(this: &WakeLockSentinel) -> ::js_sys::Promise;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLockType.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLockType.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLockType.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WakeLockType.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+#[doc = "The `WakeLockType` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `WakeLockType`*"]
+#[doc = ""]
+#[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+#[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum WakeLockType {
+    Screen = "screen",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WatchAdvertisementsOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WatchAdvertisementsOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WatchAdvertisementsOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WatchAdvertisementsOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -47,3 +47,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for WatchAdvertisementsOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WaveShaperOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WaveShaperOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WaveShaperOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WaveShaperOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -104,3 +104,8 @@
         self
     }
 }
+impl Default for WaveShaperOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebGlContextAttributes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebGlContextAttributes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebGlContextAttributes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebGlContextAttributes.rs	2021-12-09 12:01:26.000000000 +0000
@@ -166,3 +166,8 @@
         self
     }
 }
+impl Default for WebGlContextAttributes {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebGlContextEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebGlContextEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebGlContextEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebGlContextEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -88,3 +88,8 @@
         self
     }
 }
+impl Default for WebGlContextEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebrtcGlobalStatisticsReport.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebrtcGlobalStatisticsReport.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebrtcGlobalStatisticsReport.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebrtcGlobalStatisticsReport.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for WebrtcGlobalStatisticsReport {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebSocketDict.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebSocketDict.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebSocketDict.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebSocketDict.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for WebSocketDict {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebSocketElement.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebSocketElement.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WebSocketElement.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WebSocketElement.rs	2021-12-09 12:01:26.000000000 +0000
@@ -122,3 +122,8 @@
         self
     }
 }
+impl Default for WebSocketElement {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WheelEventInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WheelEventInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WheelEventInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WheelEventInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -527,3 +527,8 @@
         self
     }
 }
+impl Default for WheelEventInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerNavigator.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerNavigator.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerNavigator.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerNavigator.rs	2021-12-09 12:01:26.000000000 +0000
@@ -28,18 +28,6 @@
     #[doc = "*This API requires the following crate features to be activated: `MediaCapabilities`, `WorkerNavigator`*"]
     pub fn media_capabilities(this: &WorkerNavigator) -> MediaCapabilities;
     #[cfg(web_sys_unstable_apis)]
-    #[cfg(feature = "Gpu")]
-    # [wasm_bindgen (structural , method , getter , js_class = "WorkerNavigator" , js_name = gpu)]
-    #[doc = "Getter for the `gpu` field of this object."]
-    #[doc = ""]
-    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WorkerNavigator/gpu)"]
-    #[doc = ""]
-    #[doc = "*This API requires the following crate features to be activated: `Gpu`, `WorkerNavigator`*"]
-    #[doc = ""]
-    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
-    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
-    pub fn gpu(this: &WorkerNavigator) -> Gpu;
-    #[cfg(web_sys_unstable_apis)]
     #[cfg(feature = "Usb")]
     # [wasm_bindgen (structural , method , getter , js_class = "WorkerNavigator" , js_name = usb)]
     #[doc = "Getter for the `usb` field of this object."]
@@ -58,6 +46,18 @@
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `WorkerNavigator`*"]
     pub fn hardware_concurrency(this: &WorkerNavigator) -> f64;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "Gpu")]
+    # [wasm_bindgen (structural , method , getter , js_class = "WorkerNavigator" , js_name = gpu)]
+    #[doc = "Getter for the `gpu` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WorkerNavigator/gpu)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `Gpu`, `WorkerNavigator`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn gpu(this: &WorkerNavigator) -> Gpu;
     # [wasm_bindgen (structural , catch , method , getter , js_class = "WorkerNavigator" , js_name = appCodeName)]
     #[doc = "Getter for the `appCodeName` field of this object."]
     #[doc = ""]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -19,6 +19,24 @@
         let mut ret: Self = ::wasm_bindgen::JsCast::unchecked_into(::js_sys::Object::new());
         ret
     }
+    #[cfg(feature = "RequestCredentials")]
+    #[doc = "Change the `credentials` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `RequestCredentials`, `WorkerOptions`*"]
+    pub fn credentials(&mut self, val: RequestCredentials) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(
+            self.as_ref(),
+            &JsValue::from("credentials"),
+            &JsValue::from(val),
+        );
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
     #[doc = "Change the `name` field of this object."]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `WorkerOptions`*"]
@@ -32,4 +50,23 @@
         let _ = r;
         self
     }
+    #[cfg(feature = "WorkerType")]
+    #[doc = "Change the `type` field of this object."]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WorkerOptions`, `WorkerType`*"]
+    pub fn type_(&mut self, val: WorkerType) -> &mut Self {
+        use wasm_bindgen::JsValue;
+        let r = ::js_sys::Reflect::set(self.as_ref(), &JsValue::from("type"), &JsValue::from(val));
+        debug_assert!(
+            r.is_ok(),
+            "setting properties should never fail on our dictionary objects"
+        );
+        let _ = r;
+        self
+    }
+}
+impl Default for WorkerOptions {
+    fn default() -> Self {
+        Self::new()
+    }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerType.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerType.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerType.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkerType.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,11 @@
+#![allow(unused_imports)]
+use wasm_bindgen::prelude::*;
+#[wasm_bindgen]
+#[doc = "The `WorkerType` enum."]
+#[doc = ""]
+#[doc = "*This API requires the following crate features to be activated: `WorkerType`*"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum WorkerType {
+    Classic = "classic",
+    Module = "module",
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkletOptions.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkletOptions.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkletOptions.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WorkletOptions.rs	2021-12-09 12:01:26.000000000 +0000
@@ -38,3 +38,8 @@
         self
     }
 }
+impl Default for WorkletOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WritableStreamDefaultWriter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WritableStreamDefaultWriter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WritableStreamDefaultWriter.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WritableStreamDefaultWriter.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,123 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = WritableStreamDefaultWriter , typescript_type = "WritableStreamDefaultWriter")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `WritableStreamDefaultWriter` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type WritableStreamDefaultWriter;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "WritableStreamDefaultWriter" , js_name = closed)]
+    #[doc = "Getter for the `closed` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/closed)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn closed(this: &WritableStreamDefaultWriter) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "WritableStreamDefaultWriter" , js_name = desiredSize)]
+    #[doc = "Getter for the `desiredSize` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/desiredSize)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn desired_size(this: &WritableStreamDefaultWriter) -> Option<f64>;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "WritableStreamDefaultWriter" , js_name = ready)]
+    #[doc = "Getter for the `ready` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/ready)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn ready(this: &WritableStreamDefaultWriter) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStreamDefaultWriter" , js_name = abort)]
+    #[doc = "The `abort()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/abort)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn abort(this: &WritableStreamDefaultWriter) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStreamDefaultWriter" , js_name = abort)]
+    #[doc = "The `abort()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/abort)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn abort_with_reason(
+        this: &WritableStreamDefaultWriter,
+        reason: &::wasm_bindgen::JsValue,
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStreamDefaultWriter" , js_name = close)]
+    #[doc = "The `close()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/close)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn close(this: &WritableStreamDefaultWriter) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStreamDefaultWriter" , js_name = releaseLock)]
+    #[doc = "The `releaseLock()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/releaseLock)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn release_lock(this: &WritableStreamDefaultWriter);
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStreamDefaultWriter" , js_name = write)]
+    #[doc = "The `write()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/write)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn write(this: &WritableStreamDefaultWriter) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStreamDefaultWriter" , js_name = write)]
+    #[doc = "The `write()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStreamDefaultWriter/write)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn write_with_chunk(
+        this: &WritableStreamDefaultWriter,
+        chunk: &::wasm_bindgen::JsValue,
+    ) -> ::js_sys::Promise;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WritableStream.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WritableStream.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_WritableStream.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_WritableStream.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,77 @@
+#![allow(unused_imports)]
+use super::*;
+use wasm_bindgen::prelude::*;
+#[cfg(web_sys_unstable_apis)]
+#[wasm_bindgen]
+extern "C" {
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = WritableStream , typescript_type = "WritableStream")]
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[doc = "The `WritableStream` class."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub type WritableStream;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (structural , method , getter , js_class = "WritableStream" , js_name = locked)]
+    #[doc = "Getter for the `locked` field of this object."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream/locked)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn locked(this: &WritableStream) -> bool;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStream" , js_name = abort)]
+    #[doc = "The `abort()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream/abort)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn abort(this: &WritableStream) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStream" , js_name = abort)]
+    #[doc = "The `abort()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream/abort)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn abort_with_reason(
+        this: &WritableStream,
+        reason: &::wasm_bindgen::JsValue,
+    ) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    # [wasm_bindgen (method , structural , js_class = "WritableStream" , js_name = close)]
+    #[doc = "The `close()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream/close)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStream`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn close(this: &WritableStream) -> ::js_sys::Promise;
+    #[cfg(web_sys_unstable_apis)]
+    #[cfg(feature = "WritableStreamDefaultWriter")]
+    # [wasm_bindgen (method , structural , js_class = "WritableStream" , js_name = getWriter)]
+    #[doc = "The `getWriter()` method."]
+    #[doc = ""]
+    #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream/getWriter)"]
+    #[doc = ""]
+    #[doc = "*This API requires the following crate features to be activated: `WritableStream`, `WritableStreamDefaultWriter`*"]
+    #[doc = ""]
+    #[doc = "*This API is unstable and requires `--cfg=web_sys_unstable_apis` to be activated, as"]
+    #[doc = "[described in the `wasm-bindgen` guide](https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html)*"]
+    pub fn get_writer(this: &WritableStream) -> WritableStreamDefaultWriter;
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_XPathNsResolver.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_XPathNsResolver.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_XPathNsResolver.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_XPathNsResolver.rs	2021-12-09 12:01:26.000000000 +0000
@@ -37,3 +37,8 @@
         self
     }
 }
+impl Default for XPathNsResolver {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_XrRenderStateInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_XrRenderStateInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_XrRenderStateInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_XrRenderStateInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -113,3 +113,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for XrRenderStateInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_XrSessionInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_XrSessionInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_XrSessionInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_XrSessionInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -70,3 +70,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for XrSessionInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_XrWebGlLayerInit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_XrWebGlLayerInit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/gen_XrWebGlLayerInit.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/gen_XrWebGlLayerInit.rs	2021-12-09 12:01:26.000000000 +0000
@@ -146,3 +146,9 @@
         self
     }
 }
+#[cfg(web_sys_unstable_apis)]
+impl Default for XrWebGlLayerInit {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/features/mod.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/features/mod.rs	2021-12-09 12:01:26.000000000 +0000
@@ -1432,6 +1432,12 @@
 #[cfg(feature = "Directory")]
 pub use gen_Directory::*;
 
+#[cfg(feature = "DisplayMediaStreamConstraints")]
+#[allow(non_snake_case)]
+mod gen_DisplayMediaStreamConstraints;
+#[cfg(feature = "DisplayMediaStreamConstraints")]
+pub use gen_DisplayMediaStreamConstraints::*;
+
 #[cfg(feature = "DisplayNameOptions")]
 #[allow(non_snake_case)]
 mod gen_DisplayNameOptions;
@@ -2230,12 +2236,6 @@
 #[cfg(feature = "GpuAdapter")]
 pub use gen_GpuAdapter::*;
 
-#[cfg(feature = "GpuAdapterFeatures")]
-#[allow(non_snake_case)]
-mod gen_GpuAdapterFeatures;
-#[cfg(feature = "GpuAdapterFeatures")]
-pub use gen_GpuAdapterFeatures::*;
-
 #[cfg(feature = "GpuAddressMode")]
 #[allow(non_snake_case)]
 mod gen_GpuAddressMode;
@@ -2278,17 +2278,11 @@
 #[cfg(feature = "GpuBindGroupLayoutEntry")]
 pub use gen_GpuBindGroupLayoutEntry::*;
 
-#[cfg(feature = "GpuBindingType")]
+#[cfg(feature = "GpuBlendComponent")]
 #[allow(non_snake_case)]
-mod gen_GpuBindingType;
-#[cfg(feature = "GpuBindingType")]
-pub use gen_GpuBindingType::*;
-
-#[cfg(feature = "GpuBlendDescriptor")]
-#[allow(non_snake_case)]
-mod gen_GpuBlendDescriptor;
-#[cfg(feature = "GpuBlendDescriptor")]
-pub use gen_GpuBlendDescriptor::*;
+mod gen_GpuBlendComponent;
+#[cfg(feature = "GpuBlendComponent")]
+pub use gen_GpuBlendComponent::*;
 
 #[cfg(feature = "GpuBlendFactor")]
 #[allow(non_snake_case)]
@@ -2302,6 +2296,12 @@
 #[cfg(feature = "GpuBlendOperation")]
 pub use gen_GpuBlendOperation::*;
 
+#[cfg(feature = "GpuBlendState")]
+#[allow(non_snake_case)]
+mod gen_GpuBlendState;
+#[cfg(feature = "GpuBlendState")]
+pub use gen_GpuBlendState::*;
+
 #[cfg(feature = "GpuBuffer")]
 #[allow(non_snake_case)]
 mod gen_GpuBuffer;
@@ -2314,11 +2314,17 @@
 #[cfg(feature = "GpuBufferBinding")]
 pub use gen_GpuBufferBinding::*;
 
-#[cfg(feature = "GpuBufferCopyView")]
+#[cfg(feature = "GpuBufferBindingLayout")]
 #[allow(non_snake_case)]
-mod gen_GpuBufferCopyView;
-#[cfg(feature = "GpuBufferCopyView")]
-pub use gen_GpuBufferCopyView::*;
+mod gen_GpuBufferBindingLayout;
+#[cfg(feature = "GpuBufferBindingLayout")]
+pub use gen_GpuBufferBindingLayout::*;
+
+#[cfg(feature = "GpuBufferBindingType")]
+#[allow(non_snake_case)]
+mod gen_GpuBufferBindingType;
+#[cfg(feature = "GpuBufferBindingType")]
+pub use gen_GpuBufferBindingType::*;
 
 #[cfg(feature = "GpuBufferDescriptor")]
 #[allow(non_snake_case)]
@@ -2332,6 +2338,18 @@
 #[cfg(feature = "GpuBufferUsage")]
 pub use gen_GpuBufferUsage::*;
 
+#[cfg(feature = "GpuCanvasCompositingAlphaMode")]
+#[allow(non_snake_case)]
+mod gen_GpuCanvasCompositingAlphaMode;
+#[cfg(feature = "GpuCanvasCompositingAlphaMode")]
+pub use gen_GpuCanvasCompositingAlphaMode::*;
+
+#[cfg(feature = "GpuCanvasConfiguration")]
+#[allow(non_snake_case)]
+mod gen_GpuCanvasConfiguration;
+#[cfg(feature = "GpuCanvasConfiguration")]
+pub use gen_GpuCanvasConfiguration::*;
+
 #[cfg(feature = "GpuCanvasContext")]
 #[allow(non_snake_case)]
 mod gen_GpuCanvasContext;
@@ -2344,11 +2362,11 @@
 #[cfg(feature = "GpuColorDict")]
 pub use gen_GpuColorDict::*;
 
-#[cfg(feature = "GpuColorStateDescriptor")]
+#[cfg(feature = "GpuColorTargetState")]
 #[allow(non_snake_case)]
-mod gen_GpuColorStateDescriptor;
-#[cfg(feature = "GpuColorStateDescriptor")]
-pub use gen_GpuColorStateDescriptor::*;
+mod gen_GpuColorTargetState;
+#[cfg(feature = "GpuColorTargetState")]
+pub use gen_GpuColorTargetState::*;
 
 #[cfg(feature = "GpuColorWrite")]
 #[allow(non_snake_case)]
@@ -2434,11 +2452,11 @@
 #[cfg(feature = "GpuCullMode")]
 pub use gen_GpuCullMode::*;
 
-#[cfg(feature = "GpuDepthStencilStateDescriptor")]
+#[cfg(feature = "GpuDepthStencilState")]
 #[allow(non_snake_case)]
-mod gen_GpuDepthStencilStateDescriptor;
-#[cfg(feature = "GpuDepthStencilStateDescriptor")]
-pub use gen_GpuDepthStencilStateDescriptor::*;
+mod gen_GpuDepthStencilState;
+#[cfg(feature = "GpuDepthStencilState")]
+pub use gen_GpuDepthStencilState::*;
 
 #[cfg(feature = "GpuDevice")]
 #[allow(non_snake_case)]
@@ -2458,6 +2476,12 @@
 #[cfg(feature = "GpuDeviceLostInfo")]
 pub use gen_GpuDeviceLostInfo::*;
 
+#[cfg(feature = "GpuDeviceLostReason")]
+#[allow(non_snake_case)]
+mod gen_GpuDeviceLostReason;
+#[cfg(feature = "GpuDeviceLostReason")]
+pub use gen_GpuDeviceLostReason::*;
+
 #[cfg(feature = "GpuErrorFilter")]
 #[allow(non_snake_case)]
 mod gen_GpuErrorFilter;
@@ -2470,23 +2494,29 @@
 #[cfg(feature = "GpuExtent3dDict")]
 pub use gen_GpuExtent3dDict::*;
 
-#[cfg(feature = "GpuFeatureName")]
+#[cfg(feature = "GpuExternalTexture")]
 #[allow(non_snake_case)]
-mod gen_GpuFeatureName;
-#[cfg(feature = "GpuFeatureName")]
-pub use gen_GpuFeatureName::*;
+mod gen_GpuExternalTexture;
+#[cfg(feature = "GpuExternalTexture")]
+pub use gen_GpuExternalTexture::*;
 
-#[cfg(feature = "GpuFence")]
+#[cfg(feature = "GpuExternalTextureBindingLayout")]
 #[allow(non_snake_case)]
-mod gen_GpuFence;
-#[cfg(feature = "GpuFence")]
-pub use gen_GpuFence::*;
+mod gen_GpuExternalTextureBindingLayout;
+#[cfg(feature = "GpuExternalTextureBindingLayout")]
+pub use gen_GpuExternalTextureBindingLayout::*;
 
-#[cfg(feature = "GpuFenceDescriptor")]
+#[cfg(feature = "GpuExternalTextureDescriptor")]
 #[allow(non_snake_case)]
-mod gen_GpuFenceDescriptor;
-#[cfg(feature = "GpuFenceDescriptor")]
-pub use gen_GpuFenceDescriptor::*;
+mod gen_GpuExternalTextureDescriptor;
+#[cfg(feature = "GpuExternalTextureDescriptor")]
+pub use gen_GpuExternalTextureDescriptor::*;
+
+#[cfg(feature = "GpuFeatureName")]
+#[allow(non_snake_case)]
+mod gen_GpuFeatureName;
+#[cfg(feature = "GpuFeatureName")]
+pub use gen_GpuFeatureName::*;
 
 #[cfg(feature = "GpuFilterMode")]
 #[allow(non_snake_case)]
@@ -2494,35 +2524,53 @@
 #[cfg(feature = "GpuFilterMode")]
 pub use gen_GpuFilterMode::*;
 
+#[cfg(feature = "GpuFragmentState")]
+#[allow(non_snake_case)]
+mod gen_GpuFragmentState;
+#[cfg(feature = "GpuFragmentState")]
+pub use gen_GpuFragmentState::*;
+
 #[cfg(feature = "GpuFrontFace")]
 #[allow(non_snake_case)]
 mod gen_GpuFrontFace;
 #[cfg(feature = "GpuFrontFace")]
 pub use gen_GpuFrontFace::*;
 
-#[cfg(feature = "GpuImageBitmapCopyView")]
+#[cfg(feature = "GpuImageCopyBuffer")]
 #[allow(non_snake_case)]
-mod gen_GpuImageBitmapCopyView;
-#[cfg(feature = "GpuImageBitmapCopyView")]
-pub use gen_GpuImageBitmapCopyView::*;
+mod gen_GpuImageCopyBuffer;
+#[cfg(feature = "GpuImageCopyBuffer")]
+pub use gen_GpuImageCopyBuffer::*;
 
-#[cfg(feature = "GpuIndexFormat")]
+#[cfg(feature = "GpuImageCopyExternalImage")]
 #[allow(non_snake_case)]
-mod gen_GpuIndexFormat;
-#[cfg(feature = "GpuIndexFormat")]
-pub use gen_GpuIndexFormat::*;
+mod gen_GpuImageCopyExternalImage;
+#[cfg(feature = "GpuImageCopyExternalImage")]
+pub use gen_GpuImageCopyExternalImage::*;
+
+#[cfg(feature = "GpuImageCopyTexture")]
+#[allow(non_snake_case)]
+mod gen_GpuImageCopyTexture;
+#[cfg(feature = "GpuImageCopyTexture")]
+pub use gen_GpuImageCopyTexture::*;
+
+#[cfg(feature = "GpuImageCopyTextureTagged")]
+#[allow(non_snake_case)]
+mod gen_GpuImageCopyTextureTagged;
+#[cfg(feature = "GpuImageCopyTextureTagged")]
+pub use gen_GpuImageCopyTextureTagged::*;
 
-#[cfg(feature = "GpuInputStepMode")]
+#[cfg(feature = "GpuImageDataLayout")]
 #[allow(non_snake_case)]
-mod gen_GpuInputStepMode;
-#[cfg(feature = "GpuInputStepMode")]
-pub use gen_GpuInputStepMode::*;
+mod gen_GpuImageDataLayout;
+#[cfg(feature = "GpuImageDataLayout")]
+pub use gen_GpuImageDataLayout::*;
 
-#[cfg(feature = "GpuLimits")]
+#[cfg(feature = "GpuIndexFormat")]
 #[allow(non_snake_case)]
-mod gen_GpuLimits;
-#[cfg(feature = "GpuLimits")]
-pub use gen_GpuLimits::*;
+mod gen_GpuIndexFormat;
+#[cfg(feature = "GpuIndexFormat")]
+pub use gen_GpuIndexFormat::*;
 
 #[cfg(feature = "GpuLoadOp")]
 #[allow(non_snake_case)]
@@ -2536,6 +2584,12 @@
 #[cfg(feature = "GpuMapMode")]
 pub use gen_GpuMapMode::*;
 
+#[cfg(feature = "GpuMultisampleState")]
+#[allow(non_snake_case)]
+mod gen_GpuMultisampleState;
+#[cfg(feature = "GpuMultisampleState")]
+pub use gen_GpuMultisampleState::*;
+
 #[cfg(feature = "GpuObjectDescriptorBase")]
 #[allow(non_snake_case)]
 mod gen_GpuObjectDescriptorBase;
@@ -2590,17 +2644,29 @@
 #[cfg(feature = "GpuPowerPreference")]
 pub use gen_GpuPowerPreference::*;
 
+#[cfg(feature = "GpuPredefinedColorSpace")]
+#[allow(non_snake_case)]
+mod gen_GpuPredefinedColorSpace;
+#[cfg(feature = "GpuPredefinedColorSpace")]
+pub use gen_GpuPredefinedColorSpace::*;
+
+#[cfg(feature = "GpuPrimitiveState")]
+#[allow(non_snake_case)]
+mod gen_GpuPrimitiveState;
+#[cfg(feature = "GpuPrimitiveState")]
+pub use gen_GpuPrimitiveState::*;
+
 #[cfg(feature = "GpuPrimitiveTopology")]
 #[allow(non_snake_case)]
 mod gen_GpuPrimitiveTopology;
 #[cfg(feature = "GpuPrimitiveTopology")]
 pub use gen_GpuPrimitiveTopology::*;
 
-#[cfg(feature = "GpuProgrammableStageDescriptor")]
+#[cfg(feature = "GpuProgrammableStage")]
 #[allow(non_snake_case)]
-mod gen_GpuProgrammableStageDescriptor;
-#[cfg(feature = "GpuProgrammableStageDescriptor")]
-pub use gen_GpuProgrammableStageDescriptor::*;
+mod gen_GpuProgrammableStage;
+#[cfg(feature = "GpuProgrammableStage")]
+pub use gen_GpuProgrammableStage::*;
 
 #[cfg(feature = "GpuQuerySet")]
 #[allow(non_snake_case)]
@@ -2626,12 +2692,6 @@
 #[cfg(feature = "GpuQueue")]
 pub use gen_GpuQueue::*;
 
-#[cfg(feature = "GpuRasterizationStateDescriptor")]
-#[allow(non_snake_case)]
-mod gen_GpuRasterizationStateDescriptor;
-#[cfg(feature = "GpuRasterizationStateDescriptor")]
-pub use gen_GpuRasterizationStateDescriptor::*;
-
 #[cfg(feature = "GpuRenderBundle")]
 #[allow(non_snake_case)]
 mod gen_GpuRenderBundle;
@@ -2656,17 +2716,17 @@
 #[cfg(feature = "GpuRenderBundleEncoderDescriptor")]
 pub use gen_GpuRenderBundleEncoderDescriptor::*;
 
-#[cfg(feature = "GpuRenderPassColorAttachmentDescriptor")]
+#[cfg(feature = "GpuRenderPassColorAttachment")]
 #[allow(non_snake_case)]
-mod gen_GpuRenderPassColorAttachmentDescriptor;
-#[cfg(feature = "GpuRenderPassColorAttachmentDescriptor")]
-pub use gen_GpuRenderPassColorAttachmentDescriptor::*;
+mod gen_GpuRenderPassColorAttachment;
+#[cfg(feature = "GpuRenderPassColorAttachment")]
+pub use gen_GpuRenderPassColorAttachment::*;
 
-#[cfg(feature = "GpuRenderPassDepthStencilAttachmentDescriptor")]
+#[cfg(feature = "GpuRenderPassDepthStencilAttachment")]
 #[allow(non_snake_case)]
-mod gen_GpuRenderPassDepthStencilAttachmentDescriptor;
-#[cfg(feature = "GpuRenderPassDepthStencilAttachmentDescriptor")]
-pub use gen_GpuRenderPassDepthStencilAttachmentDescriptor::*;
+mod gen_GpuRenderPassDepthStencilAttachment;
+#[cfg(feature = "GpuRenderPassDepthStencilAttachment")]
+pub use gen_GpuRenderPassDepthStencilAttachment::*;
 
 #[cfg(feature = "GpuRenderPassDescriptor")]
 #[allow(non_snake_case)]
@@ -2680,6 +2740,12 @@
 #[cfg(feature = "GpuRenderPassEncoder")]
 pub use gen_GpuRenderPassEncoder::*;
 
+#[cfg(feature = "GpuRenderPassLayout")]
+#[allow(non_snake_case)]
+mod gen_GpuRenderPassLayout;
+#[cfg(feature = "GpuRenderPassLayout")]
+pub use gen_GpuRenderPassLayout::*;
+
 #[cfg(feature = "GpuRenderPipeline")]
 #[allow(non_snake_case)]
 mod gen_GpuRenderPipeline;
@@ -2704,6 +2770,18 @@
 #[cfg(feature = "GpuSampler")]
 pub use gen_GpuSampler::*;
 
+#[cfg(feature = "GpuSamplerBindingLayout")]
+#[allow(non_snake_case)]
+mod gen_GpuSamplerBindingLayout;
+#[cfg(feature = "GpuSamplerBindingLayout")]
+pub use gen_GpuSamplerBindingLayout::*;
+
+#[cfg(feature = "GpuSamplerBindingType")]
+#[allow(non_snake_case)]
+mod gen_GpuSamplerBindingType;
+#[cfg(feature = "GpuSamplerBindingType")]
+pub use gen_GpuSamplerBindingType::*;
+
 #[cfg(feature = "GpuSamplerDescriptor")]
 #[allow(non_snake_case)]
 mod gen_GpuSamplerDescriptor;
@@ -2728,17 +2806,29 @@
 #[cfg(feature = "GpuShaderStage")]
 pub use gen_GpuShaderStage::*;
 
+#[cfg(feature = "GpuStencilFaceState")]
+#[allow(non_snake_case)]
+mod gen_GpuStencilFaceState;
+#[cfg(feature = "GpuStencilFaceState")]
+pub use gen_GpuStencilFaceState::*;
+
 #[cfg(feature = "GpuStencilOperation")]
 #[allow(non_snake_case)]
 mod gen_GpuStencilOperation;
 #[cfg(feature = "GpuStencilOperation")]
 pub use gen_GpuStencilOperation::*;
 
-#[cfg(feature = "GpuStencilStateFaceDescriptor")]
+#[cfg(feature = "GpuStorageTextureAccess")]
+#[allow(non_snake_case)]
+mod gen_GpuStorageTextureAccess;
+#[cfg(feature = "GpuStorageTextureAccess")]
+pub use gen_GpuStorageTextureAccess::*;
+
+#[cfg(feature = "GpuStorageTextureBindingLayout")]
 #[allow(non_snake_case)]
-mod gen_GpuStencilStateFaceDescriptor;
-#[cfg(feature = "GpuStencilStateFaceDescriptor")]
-pub use gen_GpuStencilStateFaceDescriptor::*;
+mod gen_GpuStorageTextureBindingLayout;
+#[cfg(feature = "GpuStorageTextureBindingLayout")]
+pub use gen_GpuStorageTextureBindingLayout::*;
 
 #[cfg(feature = "GpuStoreOp")]
 #[allow(non_snake_case)]
@@ -2746,17 +2836,17 @@
 #[cfg(feature = "GpuStoreOp")]
 pub use gen_GpuStoreOp::*;
 
-#[cfg(feature = "GpuSwapChain")]
+#[cfg(feature = "GpuSupportedFeatures")]
 #[allow(non_snake_case)]
-mod gen_GpuSwapChain;
-#[cfg(feature = "GpuSwapChain")]
-pub use gen_GpuSwapChain::*;
+mod gen_GpuSupportedFeatures;
+#[cfg(feature = "GpuSupportedFeatures")]
+pub use gen_GpuSupportedFeatures::*;
 
-#[cfg(feature = "GpuSwapChainDescriptor")]
+#[cfg(feature = "GpuSupportedLimits")]
 #[allow(non_snake_case)]
-mod gen_GpuSwapChainDescriptor;
-#[cfg(feature = "GpuSwapChainDescriptor")]
-pub use gen_GpuSwapChainDescriptor::*;
+mod gen_GpuSupportedLimits;
+#[cfg(feature = "GpuSupportedLimits")]
+pub use gen_GpuSupportedLimits::*;
 
 #[cfg(feature = "GpuTexture")]
 #[allow(non_snake_case)]
@@ -2770,23 +2860,11 @@
 #[cfg(feature = "GpuTextureAspect")]
 pub use gen_GpuTextureAspect::*;
 
-#[cfg(feature = "GpuTextureComponentType")]
-#[allow(non_snake_case)]
-mod gen_GpuTextureComponentType;
-#[cfg(feature = "GpuTextureComponentType")]
-pub use gen_GpuTextureComponentType::*;
-
-#[cfg(feature = "GpuTextureCopyView")]
-#[allow(non_snake_case)]
-mod gen_GpuTextureCopyView;
-#[cfg(feature = "GpuTextureCopyView")]
-pub use gen_GpuTextureCopyView::*;
-
-#[cfg(feature = "GpuTextureDataLayout")]
+#[cfg(feature = "GpuTextureBindingLayout")]
 #[allow(non_snake_case)]
-mod gen_GpuTextureDataLayout;
-#[cfg(feature = "GpuTextureDataLayout")]
-pub use gen_GpuTextureDataLayout::*;
+mod gen_GpuTextureBindingLayout;
+#[cfg(feature = "GpuTextureBindingLayout")]
+pub use gen_GpuTextureBindingLayout::*;
 
 #[cfg(feature = "GpuTextureDescriptor")]
 #[allow(non_snake_case)]
@@ -2806,6 +2884,12 @@
 #[cfg(feature = "GpuTextureFormat")]
 pub use gen_GpuTextureFormat::*;
 
+#[cfg(feature = "GpuTextureSampleType")]
+#[allow(non_snake_case)]
+mod gen_GpuTextureSampleType;
+#[cfg(feature = "GpuTextureSampleType")]
+pub use gen_GpuTextureSampleType::*;
+
 #[cfg(feature = "GpuTextureUsage")]
 #[allow(non_snake_case)]
 mod gen_GpuTextureUsage;
@@ -2848,17 +2932,17 @@
 #[cfg(feature = "GpuValidationError")]
 pub use gen_GpuValidationError::*;
 
-#[cfg(feature = "GpuVertexAttributeDescriptor")]
+#[cfg(feature = "GpuVertexAttribute")]
 #[allow(non_snake_case)]
-mod gen_GpuVertexAttributeDescriptor;
-#[cfg(feature = "GpuVertexAttributeDescriptor")]
-pub use gen_GpuVertexAttributeDescriptor::*;
+mod gen_GpuVertexAttribute;
+#[cfg(feature = "GpuVertexAttribute")]
+pub use gen_GpuVertexAttribute::*;
 
-#[cfg(feature = "GpuVertexBufferLayoutDescriptor")]
+#[cfg(feature = "GpuVertexBufferLayout")]
 #[allow(non_snake_case)]
-mod gen_GpuVertexBufferLayoutDescriptor;
-#[cfg(feature = "GpuVertexBufferLayoutDescriptor")]
-pub use gen_GpuVertexBufferLayoutDescriptor::*;
+mod gen_GpuVertexBufferLayout;
+#[cfg(feature = "GpuVertexBufferLayout")]
+pub use gen_GpuVertexBufferLayout::*;
 
 #[cfg(feature = "GpuVertexFormat")]
 #[allow(non_snake_case)]
@@ -2866,11 +2950,17 @@
 #[cfg(feature = "GpuVertexFormat")]
 pub use gen_GpuVertexFormat::*;
 
-#[cfg(feature = "GpuVertexStateDescriptor")]
+#[cfg(feature = "GpuVertexState")]
+#[allow(non_snake_case)]
+mod gen_GpuVertexState;
+#[cfg(feature = "GpuVertexState")]
+pub use gen_GpuVertexState::*;
+
+#[cfg(feature = "GpuVertexStepMode")]
 #[allow(non_snake_case)]
-mod gen_GpuVertexStateDescriptor;
-#[cfg(feature = "GpuVertexStateDescriptor")]
-pub use gen_GpuVertexStateDescriptor::*;
+mod gen_GpuVertexStepMode;
+#[cfg(feature = "GpuVertexStepMode")]
+pub use gen_GpuVertexStepMode::*;
 
 #[cfg(feature = "GridDeclaration")]
 #[allow(non_snake_case)]
@@ -2920,6 +3010,78 @@
 #[cfg(feature = "HeadersGuardEnum")]
 pub use gen_HeadersGuardEnum::*;
 
+#[cfg(feature = "Hid")]
+#[allow(non_snake_case)]
+mod gen_Hid;
+#[cfg(feature = "Hid")]
+pub use gen_Hid::*;
+
+#[cfg(feature = "HidCollectionInfo")]
+#[allow(non_snake_case)]
+mod gen_HidCollectionInfo;
+#[cfg(feature = "HidCollectionInfo")]
+pub use gen_HidCollectionInfo::*;
+
+#[cfg(feature = "HidConnectionEvent")]
+#[allow(non_snake_case)]
+mod gen_HidConnectionEvent;
+#[cfg(feature = "HidConnectionEvent")]
+pub use gen_HidConnectionEvent::*;
+
+#[cfg(feature = "HidConnectionEventInit")]
+#[allow(non_snake_case)]
+mod gen_HidConnectionEventInit;
+#[cfg(feature = "HidConnectionEventInit")]
+pub use gen_HidConnectionEventInit::*;
+
+#[cfg(feature = "HidDevice")]
+#[allow(non_snake_case)]
+mod gen_HidDevice;
+#[cfg(feature = "HidDevice")]
+pub use gen_HidDevice::*;
+
+#[cfg(feature = "HidDeviceFilter")]
+#[allow(non_snake_case)]
+mod gen_HidDeviceFilter;
+#[cfg(feature = "HidDeviceFilter")]
+pub use gen_HidDeviceFilter::*;
+
+#[cfg(feature = "HidDeviceRequestOptions")]
+#[allow(non_snake_case)]
+mod gen_HidDeviceRequestOptions;
+#[cfg(feature = "HidDeviceRequestOptions")]
+pub use gen_HidDeviceRequestOptions::*;
+
+#[cfg(feature = "HidInputReportEvent")]
+#[allow(non_snake_case)]
+mod gen_HidInputReportEvent;
+#[cfg(feature = "HidInputReportEvent")]
+pub use gen_HidInputReportEvent::*;
+
+#[cfg(feature = "HidInputReportEventInit")]
+#[allow(non_snake_case)]
+mod gen_HidInputReportEventInit;
+#[cfg(feature = "HidInputReportEventInit")]
+pub use gen_HidInputReportEventInit::*;
+
+#[cfg(feature = "HidReportInfo")]
+#[allow(non_snake_case)]
+mod gen_HidReportInfo;
+#[cfg(feature = "HidReportInfo")]
+pub use gen_HidReportInfo::*;
+
+#[cfg(feature = "HidReportItem")]
+#[allow(non_snake_case)]
+mod gen_HidReportItem;
+#[cfg(feature = "HidReportItem")]
+pub use gen_HidReportItem::*;
+
+#[cfg(feature = "HidUnitSystem")]
+#[allow(non_snake_case)]
+mod gen_HidUnitSystem;
+#[cfg(feature = "HidUnitSystem")]
+pub use gen_HidUnitSystem::*;
+
 #[cfg(feature = "HiddenPluginEventInit")]
 #[allow(non_snake_case)]
 mod gen_HiddenPluginEventInit;
@@ -5206,6 +5368,12 @@
 #[cfg(feature = "PushSubscriptionOptionsInit")]
 pub use gen_PushSubscriptionOptionsInit::*;
 
+#[cfg(feature = "QueuingStrategy")]
+#[allow(non_snake_case)]
+mod gen_QueuingStrategy;
+#[cfg(feature = "QueuingStrategy")]
+pub use gen_QueuingStrategy::*;
+
 #[cfg(feature = "RadioNodeList")]
 #[allow(non_snake_case)]
 mod gen_RadioNodeList;
@@ -5236,6 +5404,54 @@
 #[cfg(feature = "ReadableStream")]
 pub use gen_ReadableStream::*;
 
+#[cfg(feature = "ReadableStreamByobReadResult")]
+#[allow(non_snake_case)]
+mod gen_ReadableStreamByobReadResult;
+#[cfg(feature = "ReadableStreamByobReadResult")]
+pub use gen_ReadableStreamByobReadResult::*;
+
+#[cfg(feature = "ReadableStreamByobReader")]
+#[allow(non_snake_case)]
+mod gen_ReadableStreamByobReader;
+#[cfg(feature = "ReadableStreamByobReader")]
+pub use gen_ReadableStreamByobReader::*;
+
+#[cfg(feature = "ReadableStreamDefaultReadResult")]
+#[allow(non_snake_case)]
+mod gen_ReadableStreamDefaultReadResult;
+#[cfg(feature = "ReadableStreamDefaultReadResult")]
+pub use gen_ReadableStreamDefaultReadResult::*;
+
+#[cfg(feature = "ReadableStreamDefaultReader")]
+#[allow(non_snake_case)]
+mod gen_ReadableStreamDefaultReader;
+#[cfg(feature = "ReadableStreamDefaultReader")]
+pub use gen_ReadableStreamDefaultReader::*;
+
+#[cfg(feature = "ReadableStreamGetReaderOptions")]
+#[allow(non_snake_case)]
+mod gen_ReadableStreamGetReaderOptions;
+#[cfg(feature = "ReadableStreamGetReaderOptions")]
+pub use gen_ReadableStreamGetReaderOptions::*;
+
+#[cfg(feature = "ReadableStreamIteratorOptions")]
+#[allow(non_snake_case)]
+mod gen_ReadableStreamIteratorOptions;
+#[cfg(feature = "ReadableStreamIteratorOptions")]
+pub use gen_ReadableStreamIteratorOptions::*;
+
+#[cfg(feature = "ReadableStreamReaderMode")]
+#[allow(non_snake_case)]
+mod gen_ReadableStreamReaderMode;
+#[cfg(feature = "ReadableStreamReaderMode")]
+pub use gen_ReadableStreamReaderMode::*;
+
+#[cfg(feature = "ReadableWritablePair")]
+#[allow(non_snake_case)]
+mod gen_ReadableWritablePair;
+#[cfg(feature = "ReadableWritablePair")]
+pub use gen_ReadableWritablePair::*;
+
 #[cfg(feature = "RecordingState")]
 #[allow(non_snake_case)]
 mod gen_RecordingState;
@@ -6220,6 +6436,12 @@
 #[cfg(feature = "StorageType")]
 pub use gen_StorageType::*;
 
+#[cfg(feature = "StreamPipeOptions")]
+#[allow(non_snake_case)]
+mod gen_StreamPipeOptions;
+#[cfg(feature = "StreamPipeOptions")]
+pub use gen_StreamPipeOptions::*;
+
 #[cfg(feature = "StyleRuleChangeEventInit")]
 #[allow(non_snake_case)]
 mod gen_StyleRuleChangeEventInit;
@@ -7168,6 +7390,12 @@
 #[cfg(feature = "TrackEventInit")]
 pub use gen_TrackEventInit::*;
 
+#[cfg(feature = "TransformStream")]
+#[allow(non_snake_case)]
+mod gen_TransformStream;
+#[cfg(feature = "TransformStream")]
+pub use gen_TransformStream::*;
+
 #[cfg(feature = "TransitionEvent")]
 #[allow(non_snake_case)]
 mod gen_TransitionEvent;
@@ -7582,6 +7810,24 @@
 #[cfg(feature = "VttRegion")]
 pub use gen_VttRegion::*;
 
+#[cfg(feature = "WakeLock")]
+#[allow(non_snake_case)]
+mod gen_WakeLock;
+#[cfg(feature = "WakeLock")]
+pub use gen_WakeLock::*;
+
+#[cfg(feature = "WakeLockSentinel")]
+#[allow(non_snake_case)]
+mod gen_WakeLockSentinel;
+#[cfg(feature = "WakeLockSentinel")]
+pub use gen_WakeLockSentinel::*;
+
+#[cfg(feature = "WakeLockType")]
+#[allow(non_snake_case)]
+mod gen_WakeLockType;
+#[cfg(feature = "WakeLockType")]
+pub use gen_WakeLockType::*;
+
 #[cfg(feature = "WatchAdvertisementsOptions")]
 #[allow(non_snake_case)]
 mod gen_WatchAdvertisementsOptions;
@@ -7894,6 +8140,12 @@
 #[cfg(feature = "WorkerOptions")]
 pub use gen_WorkerOptions::*;
 
+#[cfg(feature = "WorkerType")]
+#[allow(non_snake_case)]
+mod gen_WorkerType;
+#[cfg(feature = "WorkerType")]
+pub use gen_WorkerType::*;
+
 #[cfg(feature = "Worklet")]
 #[allow(non_snake_case)]
 mod gen_Worklet;
@@ -7912,6 +8164,18 @@
 #[cfg(feature = "WorkletOptions")]
 pub use gen_WorkletOptions::*;
 
+#[cfg(feature = "WritableStream")]
+#[allow(non_snake_case)]
+mod gen_WritableStream;
+#[cfg(feature = "WritableStream")]
+pub use gen_WritableStream::*;
+
+#[cfg(feature = "WritableStreamDefaultWriter")]
+#[allow(non_snake_case)]
+mod gen_WritableStreamDefaultWriter;
+#[cfg(feature = "WritableStreamDefaultWriter")]
+pub use gen_WritableStreamDefaultWriter::*;
+
 #[cfg(feature = "XPathExpression")]
 #[allow(non_snake_case)]
 mod gen_XPathExpression;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/src/lib.rs	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 //! API, and APIs should mention in the documentation what features they
 //! require.
 
-#![doc(html_root_url = "https://docs.rs/web-sys/0.2")]
+#![doc(html_root_url = "https://docs.rs/web-sys/0.3")]
 #![allow(deprecated)]
 
 mod features;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/tests/wasm/image_data.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/tests/wasm/image_data.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/tests/wasm/image_data.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/tests/wasm/image_data.rs	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,18 @@
+use wasm_bindgen::prelude::*;
+use wasm_bindgen::Clamped;
+use wasm_bindgen_test::*;
+use web_sys::HtmlAnchorElement;
+#[wasm_bindgen(module = "/tests/wasm/element.js")]
+extern "C" {
+    fn new_a() -> HtmlAnchorElement;
+}
+
+#[wasm_bindgen_test]
+fn test_anchor_element() {
+    // This test is to make sure there is no weird mutability going on.
+    let buf = vec![1, 2, 3, 255];
+    let image_data = web_sys::ImageData::new_with_u8_clamped_array(Clamped(&buf), 1).unwrap();
+    let mut data = image_data.data();
+    data[1] = 4;
+    assert_eq!(buf[1], 2);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/tests/wasm/main.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/tests/wasm/main.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/tests/wasm/main.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/tests/wasm/main.rs	2021-12-09 12:01:26.000000000 +0000
@@ -20,6 +20,7 @@
 pub mod hr_element;
 pub mod html_element;
 pub mod html_html_element;
+pub mod image_data;
 pub mod input_element;
 //TODO: Both menu-related tests completely break in Chrome, but run fine in Firefox.
 //pub mod menu_element;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AbortController.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AbortController.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AbortController.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AbortController.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,5 +11,5 @@
 interface AbortController {
   readonly attribute AbortSignal signal;
 
-  void abort();
+  undefined abort();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AnalyserNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AnalyserNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AnalyserNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AnalyserNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -22,12 +22,12 @@
 interface AnalyserNode : AudioNode {
 
     // Real-time frequency-domain data
-    void getFloatFrequencyData(Float32Array array);
-    void getByteFrequencyData(Uint8Array array);
+    undefined getFloatFrequencyData(Float32Array array);
+    undefined getByteFrequencyData(Uint8Array array);
 
     // Real-time waveform data
-    void getFloatTimeDomainData(Float32Array array);
-    void getByteTimeDomainData(Uint8Array array);
+    undefined getFloatTimeDomainData(Float32Array array);
+    undefined getByteTimeDomainData(Uint8Array array);
 
     [SetterThrows, Pure]
     attribute unsigned long fftSize;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AnimationEffect.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AnimationEffect.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AnimationEffect.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AnimationEffect.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -61,5 +61,5 @@
   [BinaryName="getComputedTimingAsDict"]
   ComputedEffectTiming getComputedTiming();
   [Throws]
-  void updateTiming(optional OptionalEffectTiming timing);
+  undefined updateTiming(optional OptionalEffectTiming timing);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Animation.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Animation.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Animation.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Animation.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -37,16 +37,16 @@
   readonly attribute Promise<Animation> finished;
            attribute EventHandler       onfinish;
            attribute EventHandler       oncancel;
-  void cancel ();
+  undefined cancel ();
   [Throws]
-  void finish ();
+  undefined finish ();
   [Throws, BinaryName="playFromJS"]
-  void play ();
+  undefined play ();
   [Throws, BinaryName="pauseFromJS"]
-  void pause ();
-  void updatePlaybackRate (double playbackRate);
+  undefined pause ();
+  undefined updatePlaybackRate (double playbackRate);
   [Throws]
-  void reverse ();
+  undefined reverse ();
 };
 
 // Non-standard extensions
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioBufferSourceNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioBufferSourceNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioBufferSourceNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioBufferSourceNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -35,9 +35,9 @@
     attribute EventHandler onended;
 
     [Throws]
-    void start(optional double when = 0, optional double grainOffset = 0,
+    undefined start(optional double when = 0, optional double grainOffset = 0,
                optional double grainDuration);
 
     [Throws]
-    void stop (optional double when = 0);
+    undefined stop (optional double when = 0);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioBuffer.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioBuffer.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioBuffer.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioBuffer.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -32,7 +32,7 @@
     Float32Array getChannelData(unsigned long channel);
 
     [Throws]
-    void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
+    undefined copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
     [Throws]
-    void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
+    undefined copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioContext.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioContext.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioContext.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioContext.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -22,9 +22,9 @@
     // Bug 1324545: AudioTimestamp                  getOutputTimestamp ();
 
     [Throws]
-    Promise<void> suspend();
+    Promise<undefined> suspend();
     [Throws]
-    Promise<void> close();
+    Promise<undefined> close();
 
     [NewObject, Throws]
     MediaElementAudioSourceNode createMediaElementSource(HTMLMediaElement mediaElement);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioListener.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioListener.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioListener.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioListener.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -22,10 +22,10 @@
     attribute double speedOfSound;
 
     // Uses a 3D cartesian coordinate system
-    void setPosition(double x, double y, double z);
-    void setOrientation(double x, double y, double z, double xUp, double yUp, double zUp);
+    undefined setPosition(double x, double y, double z);
+    undefined setOrientation(double x, double y, double z, double xUp, double yUp, double zUp);
     [Deprecated="PannerNodeDoppler"]
-    void setVelocity(double x, double y, double z);
+    undefined setVelocity(double x, double y, double z);
 
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -33,21 +33,21 @@
     [Throws]
     AudioNode connect(AudioNode destination, optional unsigned long output = 0, optional unsigned long input = 0);
     [Throws]
-    void connect(AudioParam destination, optional unsigned long output = 0);
+    undefined connect(AudioParam destination, optional unsigned long output = 0);
     [Throws]
-    void disconnect();
+    undefined disconnect();
     [Throws]
-    void disconnect(unsigned long output);
+    undefined disconnect(unsigned long output);
     [Throws]
-    void disconnect(AudioNode destination);
+    undefined disconnect(AudioNode destination);
     [Throws]
-    void disconnect(AudioNode destination, unsigned long output);
+    undefined disconnect(AudioNode destination, unsigned long output);
     [Throws]
-    void disconnect(AudioNode destination, unsigned long output, unsigned long input);
+    undefined disconnect(AudioNode destination, unsigned long output, unsigned long input);
     [Throws]
-    void disconnect(AudioParam destination);
+    undefined disconnect(AudioParam destination);
     [Throws]
-    void disconnect(AudioParam destination, unsigned long output);
+    undefined disconnect(AudioParam destination, unsigned long output);
 
     readonly attribute BaseAudioContext context;
     readonly attribute unsigned long numberOfInputs;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioScheduledSourceNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioScheduledSourceNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioScheduledSourceNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioScheduledSourceNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -19,8 +19,8 @@
 interface mixin rustAudioScheduledSourceNode {
                     attribute EventHandler onended;
     [Throws]
-    void start (optional double when = 0);
+    undefined start (optional double when = 0);
 
     [Throws]
-    void stop (optional double when = 0);
+    undefined stop (optional double when = 0);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioWorkletGlobalScope.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioWorkletGlobalScope.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioWorkletGlobalScope.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/AudioWorkletGlobalScope.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
 
 [Global=(Worklet,AudioWorklet),Exposed=AudioWorklet]
 interface AudioWorkletGlobalScope : WorkletGlobalScope {
-    void registerProcessor (DOMString name, VoidFunction processorCtor);
+    undefined registerProcessor (DOMString name, VoidFunction processorCtor);
     readonly  attribute   unsigned long long currentFrame;
     readonly  attribute   double currentTime;
     readonly  attribute   float sampleRate;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BaseAudioContext.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BaseAudioContext.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BaseAudioContext.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BaseAudioContext.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -10,8 +10,8 @@
  * liability, trademark and document use rules apply.
  */
 
-callback DecodeSuccessCallback = void (AudioBuffer decodedData);
-callback DecodeErrorCallback = void (DOMException error);
+callback DecodeSuccessCallback = undefined (AudioBuffer decodedData);
+callback DecodeErrorCallback = undefined (DOMException error);
 
 enum AudioContextState {
     "suspended",
@@ -36,7 +36,7 @@
     // Bug 1324552: readonly        attribute double               baseLatency;
 
     [Throws]
-    Promise<void> resume();
+    Promise<undefined> resume();
 
                     attribute EventHandler         onstatechange;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BiquadFilterNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BiquadFilterNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BiquadFilterNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BiquadFilterNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -39,7 +39,7 @@
     readonly attribute AudioParam Q; // Quality factor
     readonly attribute AudioParam gain; // in Decibels
 
-    void getFrequencyResponse(Float32Array frequencyHz,
+    undefined getFrequencyResponse(Float32Array frequencyHz,
                               Float32Array magResponse,
                               Float32Array phaseResponse);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BroadcastChannel.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BroadcastChannel.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BroadcastChannel.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BroadcastChannel.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,9 +13,9 @@
   readonly attribute DOMString name;
 
   [Throws]
-  void postMessage(any message);
+  undefined postMessage(any message);
 
-  void close();
+  undefined close();
 
   attribute EventHandler onmessage;
   attribute EventHandler onmessageerror;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BrowserElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BrowserElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BrowserElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BrowserElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -4,7 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-callback BrowserElementNextPaintEventCallback = void ();
+callback BrowserElementNextPaintEventCallback = undefined ();
 
 enum BrowserFindCaseSensitivity { "case-sensitive", "case-insensitive" };
 enum BrowserFindDirection { "forward", "backward" };
@@ -29,19 +29,19 @@
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void addNextPaintListener(BrowserElementNextPaintEventCallback listener);
+  undefined addNextPaintListener(BrowserElementNextPaintEventCallback listener);
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void removeNextPaintListener(BrowserElementNextPaintEventCallback listener);
+  undefined removeNextPaintListener(BrowserElementNextPaintEventCallback listener);
 };
 
 interface mixin BrowserElementPrivileged {
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void sendMouseEvent(DOMString type,
+  undefined sendMouseEvent(DOMString type,
                       unsigned long x,
                       unsigned long y,
                       unsigned long button,
@@ -52,7 +52,7 @@
    Pref="dom.mozBrowserFramesEnabled",
    Func="TouchEvent::PrefEnabled",
    ChromeOnly]
-  void sendTouchEvent(DOMString type,
+  undefined sendTouchEvent(DOMString type,
                       sequence<unsigned long> identifiers,
                       sequence<long> x,
                       sequence<long> y,
@@ -66,22 +66,22 @@
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void goBack();
+  undefined goBack();
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void goForward();
+  undefined goForward();
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void reload(optional boolean hardReload = false);
+  undefined reload(optional boolean hardReload = false);
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void stop();
+  undefined stop();
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
@@ -104,7 +104,7 @@
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void zoom(float zoom);
+  undefined zoom(float zoom);
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
@@ -124,17 +124,17 @@
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void findAll(DOMString searchString, BrowserFindCaseSensitivity caseSensitivity);
+  undefined findAll(DOMString searchString, BrowserFindCaseSensitivity caseSensitivity);
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void findNext(BrowserFindDirection direction);
+  undefined findNext(BrowserFindDirection direction);
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
    ChromeOnly]
-  void clearMatch();
+  undefined clearMatch();
 
   [Throws,
    Pref="dom.mozBrowserFramesEnabled",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BrowserFeedWriter.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BrowserFeedWriter.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/BrowserFeedWriter.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/BrowserFeedWriter.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,10 +11,10 @@
   /**
    * Writes the feed content, assumes that the feed writer is initialized.
    */
-  void writeContent();
+  undefined writeContent();
 
   /**
    * Uninitialize the feed writer.
    */
-  void close();
+  undefined close();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Cache.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Cache.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Cache.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Cache.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,11 +18,11 @@
   [NewObject]
   Promise<sequence<Response>> matchAll(optional RequestInfo request, optional CacheQueryOptions options);
   [NewObject, NeedsCallerType]
-  Promise<void> add(RequestInfo request);
+  Promise<undefined> add(RequestInfo request);
   [NewObject, NeedsCallerType]
-  Promise<void> addAll(sequence<RequestInfo> requests);
+  Promise<undefined> addAll(sequence<RequestInfo> requests);
   [NewObject]
-  Promise<void> put(RequestInfo request, Response response);
+  Promise<undefined> put(RequestInfo request, Response response);
   [NewObject]
   Promise<boolean> delete(RequestInfo request, optional CacheQueryOptions options);
   [NewObject]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CanvasCaptureMediaStream.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CanvasCaptureMediaStream.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CanvasCaptureMediaStream.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CanvasCaptureMediaStream.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,5 +13,5 @@
 [Pref="canvas.capturestream.enabled"]
 interface CanvasCaptureMediaStream : MediaStream {
     readonly attribute HTMLCanvasElement canvas;
-    void requestFrame();
+    undefined requestFrame();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CanvasRenderingContext2D.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CanvasRenderingContext2D.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CanvasRenderingContext2D.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CanvasRenderingContext2D.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -96,7 +96,7 @@
    * and Web Extensions (with a permission) only.
    */
   [Throws, Func="CanvasUtils::HasDrawWindowPrivilege"]
-  void drawWindow(Window window, double x, double y, double w, double h,
+  undefined drawWindow(Window window, double x, double y, double w, double h,
                   DOMString bgColor, optional unsigned long flags = 0);
 
   /**
@@ -104,7 +104,7 @@
    * backend to fallback to a software one. All state should be preserved.
    */
   [ChromeOnly]
-  void demote();
+  undefined demote();
 };
 
 CanvasRenderingContext2D includes CanvasState;
@@ -127,25 +127,25 @@
 
 interface mixin CanvasState {
   // state
-  void save(); // push state on state stack
-  void restore(); // pop state stack and restore state
+  undefined save(); // push state on state stack
+  undefined restore(); // pop state stack and restore state
 };
 
 interface mixin CanvasTransform {
   // transformations (default transform is the identity matrix)
 // NOT IMPLEMENTED           attribute SVGMatrix currentTransform;
   [Throws, LenientFloat]
-  void scale(double x, double y);
+  undefined scale(double x, double y);
   [Throws, LenientFloat]
-  void rotate(double angle);
+  undefined rotate(double angle);
   [Throws, LenientFloat]
-  void translate(double x, double y);
+  undefined translate(double x, double y);
   [Throws, LenientFloat]
-  void transform(double a, double b, double c, double d, double e, double f);
+  undefined transform(double a, double b, double c, double d, double e, double f);
   [Throws, LenientFloat]
-  void setTransform(double a, double b, double c, double d, double e, double f);
+  undefined setTransform(double a, double b, double c, double d, double e, double f);
   [Throws]
-  void resetTransform();
+  undefined resetTransform();
   [NewObject, Throws]
   DOMMatrix getTransform();
 };
@@ -191,23 +191,23 @@
 
 interface mixin CanvasRect {
   [LenientFloat]
-  void clearRect(double x, double y, double w, double h);
+  undefined clearRect(double x, double y, double w, double h);
   [LenientFloat]
-  void fillRect(double x, double y, double w, double h);
+  undefined fillRect(double x, double y, double w, double h);
   [LenientFloat]
-  void strokeRect(double x, double y, double w, double h);
+  undefined strokeRect(double x, double y, double w, double h);
 };
 
 interface mixin CanvasDrawPath {
   // path API (see also CanvasPathMethods)
-  void beginPath();
-  void fill(optional CanvasWindingRule winding = "nonzero");
-  void fill(Path2D path, optional CanvasWindingRule winding = "nonzero");
-  void stroke();
-  void stroke(Path2D path);
-  void clip(optional CanvasWindingRule winding = "nonzero");
-  void clip(Path2D path, optional CanvasWindingRule winding = "nonzero");
-// NOT IMPLEMENTED  void resetClip();
+  undefined beginPath();
+  undefined fill(optional CanvasWindingRule winding = "nonzero");
+  undefined fill(Path2D path, optional CanvasWindingRule winding = "nonzero");
+  undefined stroke();
+  undefined stroke(Path2D path);
+  undefined clip(optional CanvasWindingRule winding = "nonzero");
+  undefined clip(Path2D path, optional CanvasWindingRule winding = "nonzero");
+// NOT IMPLEMENTED  undefined resetClip();
   [NeedsSubjectPrincipal]
   boolean isPointInPath(unrestricted double x, unrestricted double y, optional CanvasWindingRule winding = "nonzero");
   [NeedsSubjectPrincipal] // Only required because overloads can't have different extended attributes.
@@ -219,31 +219,31 @@
 };
 
 interface mixin CanvasUserInterface {
-  [Pref="canvas.focusring.enabled", Throws] void drawFocusIfNeeded(Element element);
-// NOT IMPLEMENTED  void drawSystemFocusRing(Path path, HTMLElement element);
+  [Pref="canvas.focusring.enabled", Throws] undefined drawFocusIfNeeded(Element element);
+// NOT IMPLEMENTED  undefined drawSystemFocusRing(Path path, HTMLElement element);
   [Pref="canvas.customfocusring.enabled"] boolean drawCustomFocusRing(Element element);
 // NOT IMPLEMENTED  boolean drawCustomFocusRing(Path path, HTMLElement element);
-// NOT IMPLEMENTED  void scrollPathIntoView();
-// NOT IMPLEMENTED  void scrollPathIntoView(Path path);
+// NOT IMPLEMENTED  undefined scrollPathIntoView();
+// NOT IMPLEMENTED  undefined scrollPathIntoView(Path path);
 };
 
 interface mixin CanvasText {
   // text (see also the CanvasPathDrawingStyles interface)
   [Throws, LenientFloat]
-  void fillText(DOMString text, double x, double y, optional double maxWidth);
+  undefined fillText(DOMString text, double x, double y, optional double maxWidth);
   [Throws, LenientFloat]
-  void strokeText(DOMString text, double x, double y, optional double maxWidth);
+  undefined strokeText(DOMString text, double x, double y, optional double maxWidth);
   [NewObject, Throws]
   TextMetrics measureText(DOMString text);
 };
 
 interface mixin CanvasDrawImage {
   [Throws, LenientFloat]
-  void drawImage(CanvasImageSource image, double dx, double dy);
+  undefined drawImage(CanvasImageSource image, double dx, double dy);
   [Throws, LenientFloat]
-  void drawImage(CanvasImageSource image, double dx, double dy, double dw, double dh);
+  undefined drawImage(CanvasImageSource image, double dx, double dy, double dw, double dh);
   [Throws, LenientFloat]
-  void drawImage(CanvasImageSource image, double sx, double sy, double sw, double sh, double dx, double dy, double dw, double dh);
+  undefined drawImage(CanvasImageSource image, double sx, double sy, double sw, double sh, double dx, double dy, double dw, double dh);
 };
 
 interface mixin CanvasImageData {
@@ -255,9 +255,9 @@
   [NewObject, Throws, NeedsSubjectPrincipal]
   ImageData getImageData(double sx, double sy, double sw, double sh);
   [Throws]
-  void putImageData(ImageData imagedata, double dx, double dy);
+  undefined putImageData(ImageData imagedata, double dx, double dy);
   [Throws]
-  void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
+  undefined putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
 };
 
 interface mixin CanvasPathDrawingStyles {
@@ -271,7 +271,7 @@
   attribute double miterLimit; // (default 10)
 
   // dashed lines
-  [LenientFloat, Throws] void setLineDash(sequence<double> segments); // default empty
+  [LenientFloat, Throws] undefined setLineDash(sequence<double> segments); // default empty
   sequence<double> getLineDash();
   [LenientFloat] attribute double lineDashOffset;
 };
@@ -286,52 +286,52 @@
 
 interface mixin CanvasPathMethods {
   // shared path API methods
-  void closePath();
+  undefined closePath();
   [LenientFloat]
-  void moveTo(double x, double y);
+  undefined moveTo(double x, double y);
   [LenientFloat]
-  void lineTo(double x, double y);
+  undefined lineTo(double x, double y);
   [LenientFloat]
-  void quadraticCurveTo(double cpx, double cpy, double x, double y);
+  undefined quadraticCurveTo(double cpx, double cpy, double x, double y);
 
   [LenientFloat]
-  void bezierCurveTo(double cp1x, double cp1y, double cp2x, double cp2y, double x, double y);
+  undefined bezierCurveTo(double cp1x, double cp1y, double cp2x, double cp2y, double x, double y);
 
   [Throws, LenientFloat]
-  void arcTo(double x1, double y1, double x2, double y2, double radius);
-// NOT IMPLEMENTED  [LenientFloat] void arcTo(double x1, double y1, double x2, double y2, double radiusX, double radiusY, double rotation);
+  undefined arcTo(double x1, double y1, double x2, double y2, double radius);
+// NOT IMPLEMENTED  [LenientFloat] undefined arcTo(double x1, double y1, double x2, double y2, double radiusX, double radiusY, double rotation);
 
   [LenientFloat]
-  void rect(double x, double y, double w, double h);
+  undefined rect(double x, double y, double w, double h);
 
   [Throws, LenientFloat]
-  void arc(double x, double y, double radius, double startAngle, double endAngle, optional boolean anticlockwise = false);
+  undefined arc(double x, double y, double radius, double startAngle, double endAngle, optional boolean anticlockwise = false);
 
   [Throws, LenientFloat]
-  void ellipse(double x, double y, double radiusX, double radiusY, double rotation, double startAngle, double endAngle, optional boolean anticlockwise = false);
+  undefined ellipse(double x, double y, double radiusX, double radiusY, double rotation, double startAngle, double endAngle, optional boolean anticlockwise = false);
 };
 
 interface mixin CanvasHitRegions {
   // hit regions
-  [Pref="canvas.hitregions.enabled", Throws] void addHitRegion(optional HitRegionOptions options);
-  [Pref="canvas.hitregions.enabled"] void removeHitRegion(DOMString id);
-  [Pref="canvas.hitregions.enabled"] void clearHitRegions();
+  [Pref="canvas.hitregions.enabled", Throws] undefined addHitRegion(optional HitRegionOptions options);
+  [Pref="canvas.hitregions.enabled"] undefined removeHitRegion(DOMString id);
+  [Pref="canvas.hitregions.enabled"] undefined clearHitRegions();
 };
 
 interface CanvasGradient {
   // opaque object
   [Throws]
   // addColorStop should take a double
-  void addColorStop(float offset, DOMString color);
+  undefined addColorStop(float offset, DOMString color);
 };
 
 interface CanvasPattern {
   // opaque object
   // [Throws, LenientFloat] - could not do this overload because of bug 1020975
-  // void setTransform(double a, double b, double c, double d, double e, double f);
+  // undefined setTransform(double a, double b, double c, double d, double e, double f);
 
   // No throw necessary here - SVGMatrix is always good.
-  void setTransform(SVGMatrix matrix);
+  undefined setTransform(SVGMatrix matrix);
 };
 
 interface TextMetrics {
@@ -339,17 +339,19 @@
   // x-direction
   readonly attribute double width; // advance width
 
-  /*
-   * NOT IMPLEMENTED YET
-
   readonly attribute double actualBoundingBoxLeft;
   readonly attribute double actualBoundingBoxRight;
 
-  // y-direction
   readonly attribute double fontBoundingBoxAscent;
   readonly attribute double fontBoundingBoxDescent;
+
+  // y-direction
   readonly attribute double actualBoundingBoxAscent;
   readonly attribute double actualBoundingBoxDescent;
+
+  /*
+   * NOT IMPLEMENTED YET
+  
   readonly attribute double emHeightAscent;
   readonly attribute double emHeightDescent;
   readonly attribute double hangingBaseline;
@@ -365,6 +367,6 @@
  Constructor(DOMString pathString)]
 interface Path2D
 {
-  void addPath(Path2D path, optional SVGMatrix transformation);
+  undefined addPath(Path2D path, optional SVGMatrix transformation);
 };
 Path2D includes CanvasPathMethods;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CharacterData.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CharacterData.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CharacterData.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CharacterData.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,13 +18,13 @@
   [Throws]
   DOMString substringData(unsigned long offset, unsigned long count);
   [Throws]
-  void appendData(DOMString data);
+  undefined appendData(DOMString data);
   [Throws]
-  void insertData(unsigned long offset, DOMString data);
+  undefined insertData(unsigned long offset, DOMString data);
   [Throws]
-  void deleteData(unsigned long offset, unsigned long count);
+  undefined deleteData(unsigned long offset, unsigned long count);
   [Throws]
-  void replaceData(unsigned long offset, unsigned long count, DOMString data);
+  undefined replaceData(unsigned long offset, unsigned long count, DOMString data);
 };
 
 CharacterData includes ChildNode;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CheckerboardReportService.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CheckerboardReportService.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CheckerboardReportService.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CheckerboardReportService.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -44,7 +44,7 @@
   /**
    * Sets the state of the apz.record_checkerboarding pref.
    */
-  void setRecordingEnabled(boolean aEnabled);
+  undefined setRecordingEnabled(boolean aEnabled);
 
   /**
    * Flush any in-progress checkerboard reports. Since this happens
@@ -54,5 +54,5 @@
    * this notification, the caller may call getReports() to obtain the flushed
    * reports, along with any other reports that are available.
    */
-  void flushActiveReports();
+  undefined flushActiveReports();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ChildNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ChildNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ChildNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ChildNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -9,13 +9,13 @@
 
 interface mixin ChildNode {
   [CEReactions, Throws, Unscopable]
-  void before((Node or DOMString)... nodes);
+  undefined before((Node or DOMString)... nodes);
   [CEReactions, Throws, Unscopable]
-  void after((Node or DOMString)... nodes);
+  undefined after((Node or DOMString)... nodes);
   [CEReactions, Throws, Unscopable]
-  void replaceWith((Node or DOMString)... nodes);
+  undefined replaceWith((Node or DOMString)... nodes);
   [CEReactions, Unscopable]
-  void remove();
+  undefined remove();
 };
 
 interface mixin NonDocumentTypeChildNode {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ChildSHistory.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ChildSHistory.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ChildSHistory.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ChildSHistory.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -20,14 +20,14 @@
 
   boolean canGo(long aOffset);
   [Throws]
-  void go(long aOffset);
+  undefined go(long aOffset);
 
   /**
    * Reload the current entry. The flags which should be passed to this
    * function are documented and defined in nsIWebNavigation.idl
    */
   [Throws]
-  void reload(unsigned long aReloadFlags);
+  undefined reload(unsigned long aReloadFlags);
 
   /**
    * Getter for the legacy nsISHistory implementation.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Clients.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Clients.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Clients.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Clients.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,7 +18,7 @@
   [NewObject]
   Promise<WindowClient?> openWindow(USVString url);
   [NewObject]
-  Promise<void> claim();
+  Promise<undefined> claim();
 };
 
 dictionary ClientQueryOptions {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Client.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Client.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Client.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Client.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -23,7 +23,7 @@
   // readonly attribute boolean reserved;
 
   [Throws]
-  void postMessage(any message, optional sequence<object> transfer = []);
+  undefined postMessage(any message, optional sequence<object> transfer = []);
 };
 
 [Exposed=ServiceWorker]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CompositionEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CompositionEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CompositionEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CompositionEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,7 @@
 
 partial interface CompositionEvent
 {
-  void initCompositionEvent(DOMString typeArg,
+  undefined initCompositionEvent(DOMString typeArg,
                             optional boolean canBubbleArg = false,
                             optional boolean cancelableArg = false,
                             optional Window? viewArg = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Console.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Console.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Console.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Console.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,59 +18,59 @@
 
   // Logging
   [UseCounter]
-  void assert(optional boolean condition = false, any... data);
+  undefined assert(optional boolean condition = false, any... data);
   [UseCounter]
-  void clear();
+  undefined clear();
   [UseCounter]
-  void count(optional DOMString label = "default");
+  undefined count(optional DOMString label = "default");
   [UseCounter]
-  void countReset(optional DOMString label = "default");
+  undefined countReset(optional DOMString label = "default");
   [UseCounter]
-  void debug(any... data);
+  undefined debug(any... data);
   [UseCounter]
-  void error(any... data);
+  undefined error(any... data);
   [UseCounter]
-  void info(any... data);
+  undefined info(any... data);
   [UseCounter]
-  void log(any... data);
+  undefined log(any... data);
   [UseCounter]
-  void table(any... data); // FIXME: The spec is still unclear about this.
+  undefined table(any... data); // FIXME: The spec is still unclear about this.
   [UseCounter]
-  void trace(any... data);
+  undefined trace(any... data);
   [UseCounter]
-  void warn(any... data);
+  undefined warn(any... data);
   [UseCounter]
-  void dir(any... data); // FIXME: This doesn't follow the spec yet.
+  undefined dir(any... data); // FIXME: This doesn't follow the spec yet.
   [UseCounter]
-  void dirxml(any... data);
+  undefined dirxml(any... data);
 
   // Grouping
   [UseCounter]
-  void group(any... data);
+  undefined group(any... data);
   [UseCounter]
-  void groupCollapsed(any... data);
+  undefined groupCollapsed(any... data);
   [UseCounter]
-  void groupEnd();
+  undefined groupEnd();
 
   // Timing
   [UseCounter]
-  void time(optional DOMString label = "default");
+  undefined time(optional DOMString label = "default");
   [UseCounter]
-  void timeLog(optional DOMString label = "default", any... data);
+  undefined timeLog(optional DOMString label = "default", any... data);
   [UseCounter]
-  void timeEnd(optional DOMString label = "default");
+  undefined timeEnd(optional DOMString label = "default");
 
   // Mozilla only or Webcompat methods
 
   [UseCounter]
-  void _exception(any... data);
+  undefined _exception(any... data);
   [UseCounter]
-  void timeStamp(optional any data);
+  undefined timeStamp(optional any data);
 
   [UseCounter]
-  void profile(any... data);
+  undefined profile(any... data);
   [UseCounter]
-  void profileEnd(any... data);
+  undefined profileEnd(any... data);
 
   // invalid widl
   // [ChromeOnly]
@@ -151,40 +151,40 @@
 // This is basically a copy of the console namespace.
 interface ConsoleInstance {
   // Logging
-  void assert(optional boolean condition = false, any... data);
-  void clear();
-  void count(optional DOMString label = "default");
-  void countReset(optional DOMString label = "default");
-  void debug(any... data);
-  void error(any... data);
-  void info(any... data);
-  void log(any... data);
-  void table(any... data); // FIXME: The spec is still unclear about this.
-  void trace(any... data);
-  void warn(any... data);
-  void dir(any... data); // FIXME: This doesn't follow the spec yet.
-  void dirxml(any... data);
+  undefined assert(optional boolean condition = false, any... data);
+  undefined clear();
+  undefined count(optional DOMString label = "default");
+  undefined countReset(optional DOMString label = "default");
+  undefined debug(any... data);
+  undefined error(any... data);
+  undefined info(any... data);
+  undefined log(any... data);
+  undefined table(any... data); // FIXME: The spec is still unclear about this.
+  undefined trace(any... data);
+  undefined warn(any... data);
+  undefined dir(any... data); // FIXME: This doesn't follow the spec yet.
+  undefined dirxml(any... data);
 
   // Grouping
-  void group(any... data);
-  void groupCollapsed(any... data);
-  void groupEnd();
+  undefined group(any... data);
+  undefined groupCollapsed(any... data);
+  undefined groupEnd();
 
   // Timing
-  void time(optional DOMString label = "default");
-  void timeLog(optional DOMString label = "default", any... data);
-  void timeEnd(optional DOMString label = "default");
+  undefined time(optional DOMString label = "default");
+  undefined timeLog(optional DOMString label = "default", any... data);
+  undefined timeEnd(optional DOMString label = "default");
 
   // Mozilla only or Webcompat methods
 
-  void _exception(any... data);
-  void timeStamp(optional any data);
+  undefined _exception(any... data);
+  undefined timeStamp(optional any data);
 
-  void profile(any... data);
-  void profileEnd(any... data);
+  undefined profile(any... data);
+  undefined profileEnd(any... data);
 };
 
-callback ConsoleInstanceDumpCallback = void (DOMString message);
+callback ConsoleInstanceDumpCallback = undefined (DOMString message);
 
 enum ConsoleLogLevel {
   "All", "Debug", "Log", "Info", "Clear", "Trace", "TimeLog", "TimeEnd", "Time",
@@ -223,7 +223,7 @@
 // this interface is just for testing
 partial interface ConsoleInstance {
   [ChromeOnly]
-  void reportForServiceWorkerScope(DOMString scope, DOMString message,
+  undefined reportForServiceWorkerScope(DOMString scope, DOMString message,
                                    DOMString filename, unsigned long lineNumber,
                                    unsigned long columnNumber,
                                    ConsoleLevel level);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CredentialManagement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CredentialManagement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CredentialManagement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CredentialManagement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,7 @@
   [Throws]
   Promise<Credential> store(Credential credential);
   [Throws]
-  Promise<void> preventSilentAccess();
+  Promise<undefined> preventSilentAccess();
 };
 
 dictionary CredentialRequestOptions {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSGroupingRule.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSGroupingRule.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSGroupingRule.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSGroupingRule.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,5 +13,5 @@
   [Throws]
   unsigned long insertRule(DOMString rule, optional unsigned long index = 0);
   [Throws]
-  void deleteRule(unsigned long index);
+  undefined deleteRule(unsigned long index);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSKeyframesRule.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSKeyframesRule.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSKeyframesRule.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSKeyframesRule.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
            attribute DOMString   name;
   readonly attribute CSSRuleList cssRules;
 
-  void            appendRule(DOMString rule);
-  void            deleteRule(DOMString select);
+  undefined            appendRule(DOMString rule);
+  undefined            deleteRule(DOMString select);
   CSSKeyframeRule? findRule(DOMString select);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSStyleDeclaration.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSStyleDeclaration.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSStyleDeclaration.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSStyleDeclaration.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -24,7 +24,7 @@
   DOMString getPropertyValue(DOMString property);
   DOMString getPropertyPriority(DOMString property);
   [CEReactions, NeedsSubjectPrincipal=NonSystem, Throws]
-  void setProperty(DOMString property, [TreatNullAs=EmptyString] DOMString value, [TreatNullAs=EmptyString] optional DOMString priority = "");
+  undefined setProperty(DOMString property, [TreatNullAs=EmptyString] DOMString value, [TreatNullAs=EmptyString] optional DOMString priority = "");
   [CEReactions, Throws]
   DOMString removeProperty(DOMString property);
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSStyleSheet.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSStyleSheet.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSStyleSheet.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CSSStyleSheet.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -23,5 +23,5 @@
   [Throws, NeedsSubjectPrincipal]
   unsigned long insertRule(DOMString rule, optional unsigned long index = 0);
   [Throws, NeedsSubjectPrincipal]
-  void deleteRule(unsigned long index);
+  undefined deleteRule(unsigned long index);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CustomElementRegistry.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CustomElementRegistry.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CustomElementRegistry.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CustomElementRegistry.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -6,18 +6,18 @@
 [Func="CustomElementRegistry::IsCustomElementEnabled"]
 interface CustomElementRegistry {
   [CEReactions, Throws]
-  void define(DOMString name, Function functionConstructor,
+  undefined define(DOMString name, Function functionConstructor,
               optional ElementDefinitionOptions options);
   [ChromeOnly, Throws]
-  void setElementCreationCallback(DOMString name, CustomElementCreationCallback callback);
+  undefined setElementCreationCallback(DOMString name, CustomElementCreationCallback callback);
   any get(DOMString name);
   [Throws]
-  Promise<void> whenDefined(DOMString name);
-  [CEReactions] void upgrade(Node root);
+  Promise<undefined> whenDefined(DOMString name);
+  [CEReactions] undefined upgrade(Node root);
 };
 
 dictionary ElementDefinitionOptions {
   DOMString extends;
 };
 
-callback CustomElementCreationCallback = void (DOMString name);
+callback CustomElementCreationCallback = undefined (DOMString name);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CustomEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CustomEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/CustomEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/CustomEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -17,7 +17,7 @@
   readonly attribute any detail;
 
   // initCustomEvent is a Gecko specific deprecated method.
-  void initCustomEvent(DOMString type,
+  undefined initCustomEvent(DOMString type,
                        optional boolean canBubble = false,
                        optional boolean cancelable = false,
                        optional any detail = null);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransferItemList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransferItemList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransferItemList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransferItemList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -15,7 +15,7 @@
   [Throws, NeedsSubjectPrincipal]
   DataTransferItem? add(File data);
   [Throws, NeedsSubjectPrincipal]
-  void remove(unsigned long index);
+  undefined remove(unsigned long index);
   [Throws, NeedsSubjectPrincipal]
-  void clear();
+  undefined clear();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransferItem.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransferItem.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransferItem.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransferItem.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,12 +11,12 @@
   readonly attribute DOMString kind;
   readonly attribute DOMString type;
   [Throws, NeedsSubjectPrincipal]
-  void getAsString(FunctionStringCallback? _callback);
+  undefined getAsString(FunctionStringCallback? _callback);
   [Throws, NeedsSubjectPrincipal]
   File? getAsFile();
 };
 
-callback FunctionStringCallback = void (DOMString data);
+callback FunctionStringCallback = undefined (DOMString data);
 
 partial interface DataTransferItem {
   [Pref="dom.webkitBlink.filesystem.enabled", BinaryName="getAsEntry", Throws,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransfer.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransfer.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransfer.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DataTransfer.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,7 @@
 
   readonly attribute DataTransferItemList items;
 
-  void setDragImage(Element image, long x, long y);
+  undefined setDragImage(Element image, long x, long y);
 
   // ReturnValueNeedsContainsHack on .types because lots of extension
   // code was expecting .contains() back when it was a DOMStringList.
@@ -23,9 +23,9 @@
   [Throws, NeedsSubjectPrincipal]
   DOMString getData(DOMString format);
   [Throws, NeedsSubjectPrincipal]
-  void setData(DOMString format, DOMString data);
+  undefined setData(DOMString format, DOMString data);
   [Throws, NeedsSubjectPrincipal]
-  void clearData(optional DOMString format);
+  undefined clearData(optional DOMString format);
   [NeedsSubjectPrincipal]
   readonly attribute FileList? files;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DedicatedWorkerGlobalScope.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DedicatedWorkerGlobalScope.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DedicatedWorkerGlobalScope.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DedicatedWorkerGlobalScope.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -19,9 +19,9 @@
   readonly attribute DOMString name;
 
   [Throws]
-  void postMessage(any message, optional sequence<object> transfer = []);
+  undefined postMessage(any message, optional sequence<object> transfer = []);
 
-  void close();
+  undefined close();
 
   attribute EventHandler onmessage;
   attribute EventHandler onmessageerror;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DeviceOrientationEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DeviceOrientationEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DeviceOrientationEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DeviceOrientationEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
   readonly attribute boolean absolute;
 
   // initDeviceOrientationEvent is a Gecko specific deprecated method.
-  void initDeviceOrientationEvent(DOMString type,
+  undefined initDeviceOrientationEvent(DOMString type,
                                   optional boolean canBubble = false,
                                   optional boolean cancelable = false,
                                   optional double? alpha = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Document.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Document.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Document.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Document.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -98,8 +98,8 @@
 
   // NEW
   // No support for prepend/append yet
-  // void prepend((Node or DOMString)... nodes);
-  // void append((Node or DOMString)... nodes);
+  // undefined prepend((Node or DOMString)... nodes);
+  // undefined append((Node or DOMString)... nodes);
 
   // These are not in the spec, but leave them for now for backwards compat.
   // So sort of like Gecko extensions
@@ -144,9 +144,9 @@
   // dynamic markup insertion
   //(HTML only)Document open(optional DOMString type, optional DOMString replace);
   //(HTML only)WindowProxy open(DOMString url, DOMString name, DOMString features, optional boolean replace);
-  //(HTML only)void close();
-  //(HTML only)void write(DOMString... text);
-  //(HTML only)void writeln(DOMString... text);
+  //(HTML only)undefined close();
+  //(HTML only)undefined write(DOMString... text);
+  //(HTML only)undefined writeln(DOMString... text);
 
   // user interaction
   [Pure]
@@ -187,7 +187,7 @@
    *
    * @see <https://developer.mozilla.org/en/DOM/document.releaseCapture>
    */
-  void releaseCapture();
+  undefined releaseCapture();
 
   [ChromeOnly]
   readonly attribute URI? documentURIObject;
@@ -212,9 +212,9 @@
   [SameObject] readonly attribute HTMLCollection anchors;
   [SameObject] readonly attribute HTMLCollection applets;
 
-  //(HTML only)void clear();
-  //(HTML only)void captureEvents();
-  //(HTML only)void releaseEvents();
+  //(HTML only)undefined clear();
+  //(HTML only)undefined captureEvents();
+  //(HTML only)undefined releaseEvents();
 
   //(HTML only)[SameObject] readonly attribute HTMLAllCollection all;
 };
@@ -229,7 +229,7 @@
   readonly attribute boolean fullscreenEnabled;
 
   [Func="nsDocument::IsUnprefixedFullscreenEnabled"]
-  void exitFullscreen();
+  undefined exitFullscreen();
 
   // Events handlers
   [Func="nsDocument::IsUnprefixedFullscreenEnabled"]
@@ -241,7 +241,7 @@
 // https://w3c.github.io/pointerlock/#extensions-to-the-document-interface
 // https://w3c.github.io/pointerlock/#extensions-to-the-documentorshadowroot-mixin
 partial interface Document {
-  void exitPointerLock();
+  undefined exitPointerLock();
 
   // Event handlers
   attribute EventHandler onpointerlockchange;
@@ -262,7 +262,7 @@
     readonly attribute DOMString? preferredStyleSheetSet;
     [Constant]
     readonly attribute DOMStringList styleSheetSets;
-    void enableStyleSheetsForSet (DOMString? name);
+    undefined enableStyleSheetsForSet (DOMString? name);
 };
 
 // https://drafts.csswg.org/cssom-view/#extensions-to-the-document-interface
@@ -340,7 +340,7 @@
    * instance.
    */
   [ChromeOnly, Throws]
-  void removeAnonymousContent(AnonymousContent aContent);
+  undefined removeAnonymousContent(AnonymousContent aContent);
 };
 
 // http://w3c.github.io/selection-api/#extensions-to-document-interface
@@ -359,7 +359,7 @@
 // by user gesture.
 partial interface Document {
   [ChromeOnly]
-  void notifyUserGestureActivation();
+  undefined notifyUserGestureActivation();
 };
 
 // For more information on Flash classification, see
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMParser.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMParser.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMParser.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMParser.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -27,5 +27,5 @@
   // Can be used to allow a DOMParser to parse XUL/XBL no matter what
   // principal it's using for the document.
   [ChromeOnly]
-  void forceEnableXULXBL();
+  undefined forceEnableXULXBL();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMRequest.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMRequest.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMRequest.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMRequest.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -26,7 +26,7 @@
            [TreatNonCallableAsNull] optional AnyCallback? rejectCallback = null);
 
   [ChromeOnly]
-  void fireDetailedError(DOMException aError);
+  undefined fireDetailedError(DOMException aError);
 };
 
 DOMRequest includes DOMRequestShared;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMStringMap.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMStringMap.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMStringMap.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMStringMap.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -15,7 +15,7 @@
 interface DOMStringMap {
   getter DOMString (DOMString name);
   [CEReactions, Throws]
-  setter void (DOMString name, DOMString value);
+  setter undefined (DOMString name, DOMString value);
   [CEReactions]
-  deleter void (DOMString name);
+  deleter undefined (DOMString name);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMTokenList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMTokenList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMTokenList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DOMTokenList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -17,9 +17,9 @@
   getter DOMString? item(unsigned long index);
   boolean contains(DOMString token);
   [CEReactions, Throws]
-  void add(DOMString... tokens);
+  undefined add(DOMString... tokens);
   [CEReactions, Throws]
-  void remove(DOMString... tokens);
+  undefined remove(DOMString... tokens);
   [CEReactions, Throws]
   boolean replace(DOMString token, DOMString newToken);
   [CEReactions, Throws]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DragEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DragEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/DragEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/DragEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
 {
   readonly attribute DataTransfer? dataTransfer;
 
-  void initDragEvent(DOMString type,
+  undefined initDragEvent(DOMString type,
                      optional boolean canBubble = false,
                      optional boolean cancelable = false,
                      optional Window? aView = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Element.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Element.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Element.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Element.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -43,13 +43,13 @@
   [CEReactions, NeedsSubjectPrincipal=NonSystem, Throws]
   boolean toggleAttribute(DOMString name, optional boolean force);
   [CEReactions, NeedsSubjectPrincipal=NonSystem, Throws]
-  void setAttribute(DOMString name, DOMString value);
+  undefined setAttribute(DOMString name, DOMString value);
   [CEReactions, NeedsSubjectPrincipal=NonSystem, Throws]
-  void setAttributeNS(DOMString? namespace, DOMString name, DOMString value);
+  undefined setAttributeNS(DOMString? namespace, DOMString name, DOMString value);
   [CEReactions, Throws]
-  void removeAttribute(DOMString name);
+  undefined removeAttribute(DOMString name);
   [CEReactions, Throws]
-  void removeAttributeNS(DOMString? namespace, DOMString localName);
+  undefined removeAttributeNS(DOMString? namespace, DOMString localName);
   [Pure]
   boolean hasAttribute(DOMString name);
   [Pure]
@@ -78,7 +78,7 @@
   Element? insertAdjacentElement(DOMString where, Element element); // historical
 
   [Throws]
-  void insertAdjacentText(DOMString where, DOMString data); // historical
+  undefined insertAdjacentText(DOMString where, DOMString data); // historical
 
   /**
    * The ratio of font-size-inflated text font size to computed font
@@ -98,10 +98,10 @@
 
   // Pointer events methods.
   [Throws, Pref="dom.w3c_pointer_events.enabled"]
-  void setPointerCapture(long pointerId);
+  undefined setPointerCapture(long pointerId);
 
   [Throws, Pref="dom.w3c_pointer_events.enabled"]
-  void releasePointerCapture(long pointerId);
+  undefined releasePointerCapture(long pointerId);
 
   [Pref="dom.w3c_pointer_events.enabled"]
   boolean hasPointerCapture(long pointerId);
@@ -115,19 +115,19 @@
    * element.
    *
    */
-  void setCapture(optional boolean retargetToElement = false);
+  undefined setCapture(optional boolean retargetToElement = false);
 
   /**
    * If this element has captured the mouse, release the capture. If another
    * element has captured the mouse, this method has no effect.
    */
-  void releaseCapture();
+  undefined releaseCapture();
 
   /*
    * Chrome-only version of setCapture that works outside of a mousedown event.
    */
   [ChromeOnly]
-  void setCaptureAlways(optional boolean retargetToElement = false);
+  undefined setCaptureAlways(optional boolean retargetToElement = false);
 
   // Obsolete methods.
   Attr? getAttributeNode(DOMString name);
@@ -186,19 +186,19 @@
   DOMRect getBoundingClientRect();
 
   // scrolling
-  void scrollIntoView(optional (boolean or ScrollIntoViewOptions) arg);
+  undefined scrollIntoView(optional (boolean or ScrollIntoViewOptions) arg);
   // None of the CSSOM attributes are [Pure], because they flush
            attribute long scrollTop;   // scroll on setting
            attribute long scrollLeft;  // scroll on setting
   readonly attribute long scrollWidth;
   readonly attribute long scrollHeight;
 
-  void scroll(unrestricted double x, unrestricted double y);
-  void scroll(optional ScrollToOptions options);
-  void scrollTo(unrestricted double x, unrestricted double y);
-  void scrollTo(optional ScrollToOptions options);
-  void scrollBy(unrestricted double x, unrestricted double y);
-  void scrollBy(optional ScrollToOptions options);
+  undefined scroll(unrestricted double x, unrestricted double y);
+  undefined scroll(optional ScrollToOptions options);
+  undefined scrollTo(unrestricted double x, unrestricted double y);
+  undefined scrollTo(optional ScrollToOptions options);
+  undefined scrollBy(unrestricted double x, unrestricted double y);
+  undefined scrollBy(optional ScrollToOptions options);
 
   readonly attribute long clientTop;
   readonly attribute long clientLeft;
@@ -213,7 +213,7 @@
   [CEReactions, Pure,SetterThrows,TreatNullAs=EmptyString]
   attribute DOMString outerHTML;
   [CEReactions, Throws]
-  void insertAdjacentHTML(DOMString position, DOMString text);
+  undefined insertAdjacentHTML(DOMString position, DOMString text);
 };
 
 // http://www.w3.org/TR/selectors-api/#interface-definitions
@@ -255,11 +255,11 @@
 // https://fullscreen.spec.whatwg.org/#api
 partial interface Element {
   [Throws, Func="nsDocument::IsUnprefixedFullscreenEnabled", NeedsCallerType]
-  void requestFullscreen();
+  undefined requestFullscreen();
 };
 
 // https://w3c.github.io/pointerlock/#extensions-to-the-element-interface
 partial interface Element {
   [NeedsCallerType]
-  void requestPointerLock();
+  undefined requestPointerLock();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventListener.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventListener.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventListener.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventListener.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,5 +11,5 @@
  */
 
 callback interface EventListener {
-  void handleEvent(Event event);
+  undefined handleEvent(Event event);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventSource.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventSource.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventSource.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventSource.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -29,7 +29,7 @@
   attribute EventHandler onopen;
   attribute EventHandler onmessage;
   attribute EventHandler onerror;
-  void close();
+  undefined close();
 };
 
 dictionary EventSourceInit {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventTarget.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventTarget.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventTarget.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/EventTarget.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -28,12 +28,12 @@
      value is true, while in chrome the default boolean value is
      false. */
   [Throws]
-  void addEventListener(DOMString type,
+  undefined addEventListener(DOMString type,
                         EventListener listener,
                         optional (AddEventListenerOptions or boolean) options,
                         optional boolean? wantsUntrusted = null);
   [Throws]
-  void removeEventListener(DOMString type,
+  undefined removeEventListener(DOMString type,
                            EventListener listener,
                            optional (EventListenerOptions or boolean) options);
   [Throws, NeedsCallerType]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Event.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Event.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Event.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Event.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -29,15 +29,15 @@
   [Pure]
   readonly attribute unsigned short eventPhase;
 
-  void stopPropagation();
-  void stopImmediatePropagation();
+  undefined stopPropagation();
+  undefined stopImmediatePropagation();
 
   [Pure]
   readonly attribute boolean bubbles;
   [Pure]
   readonly attribute boolean cancelable;
   [NeedsCallerType]
-  void preventDefault();
+  undefined preventDefault();
   [Pure, NeedsCallerType]
   readonly attribute boolean defaultPrevented;
   [ChromeOnly, Pure]
@@ -52,7 +52,7 @@
   [Pure]
   readonly attribute DOMHighResTimeStamp timeStamp;
 
-  void initEvent(DOMString type,
+  undefined initEvent(DOMString type,
                  optional boolean bubbles = false,
                  optional boolean cancelable = false);
   attribute boolean cancelBubble;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ExtendableEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ExtendableEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ExtendableEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ExtendableEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -12,7 +12,7 @@
 interface ExtendableEvent : Event {
   // https://github.com/slightlyoff/ServiceWorker/issues/261
   [Throws]
-  void waitUntil(Promise<any> p);
+  undefined waitUntil(Promise<any> p);
 };
 
 dictionary ExtendableEventInit : EventInit {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/External.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/External.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/External.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/External.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -7,6 +7,6 @@
 [NoInterfaceObject, JSImplementation="@mozilla.org/sidebar;1"]
 interface External
 {
-  void AddSearchProvider(DOMString aDescriptionURL);
+  undefined AddSearchProvider(DOMString aDescriptionURL);
   unsigned long IsSearchProviderInstalled(DOMString aSearchURL);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FetchEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FetchEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FetchEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FetchEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -16,7 +16,7 @@
   readonly attribute boolean isReload;
 
   [Throws]
-  void respondWith(Promise<Response> r);
+  undefined respondWith(Promise<Response> r);
 };
 
 dictionary FetchEventInit : EventInit {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FetchObserver.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FetchObserver.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FetchObserver.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FetchObserver.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
  */
 
 callback interface ObserverCallback {
-  void handleEvent(FetchObserver observer);
+  undefined handleEvent(FetchObserver observer);
 };
 
 enum FetchState {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileReader.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileReader.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileReader.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileReader.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -15,15 +15,15 @@
 interface FileReader : EventTarget {
   // async read methods
   [Throws]
-  void readAsArrayBuffer(Blob blob);
+  undefined readAsArrayBuffer(Blob blob);
   [Throws]
-  void readAsBinaryString(Blob filedata);
+  undefined readAsBinaryString(Blob filedata);
   [Throws]
-  void readAsText(Blob blob, optional DOMString label);
+  undefined readAsText(Blob blob, optional DOMString label);
   [Throws]
-  void readAsDataURL(Blob blob);
+  undefined readAsDataURL(Blob blob);
 
-  void abort();
+  undefined abort();
 
   // states
   const unsigned short EMPTY = 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemDirectoryEntry.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemDirectoryEntry.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemDirectoryEntry.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemDirectoryEntry.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -7,12 +7,12 @@
 interface FileSystemDirectoryEntry : FileSystemEntry {
     FileSystemDirectoryReader createReader();
 
-    void getFile(optional USVString? path,
+    undefined getFile(optional USVString? path,
                  optional FileSystemFlags options,
                  optional FileSystemEntryCallback successCallback,
                  optional ErrorCallback errorCallback);
 
-    void getDirectory(optional USVString? path,
+    undefined getDirectory(optional USVString? path,
                       optional FileSystemFlags options,
                       optional FileSystemEntryCallback successCallback,
                       optional ErrorCallback errorCallback);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemDirectoryReader.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemDirectoryReader.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemDirectoryReader.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemDirectoryReader.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -5,7 +5,7 @@
  */
 
 callback interface FileSystemEntriesCallback {
-    void handleEvent(sequence<FileSystemEntry> entries);
+    undefined handleEvent(sequence<FileSystemEntry> entries);
 };
 
 interface FileSystemDirectoryReader {
@@ -13,6 +13,6 @@
     // readEntries can be called just once. The second time it returns no data.
 
     [Throws]
-    void readEntries(FileSystemEntriesCallback successCallback,
+    undefined readEntries(FileSystemEntriesCallback successCallback,
                      optional ErrorCallback errorCallback);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemEntry.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemEntry.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemEntry.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemEntry.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -16,6 +16,6 @@
 
     readonly attribute FileSystem filesystem;
 
-    void getParent(optional FileSystemEntryCallback successCallback,
+    undefined getParent(optional FileSystemEntryCallback successCallback,
                    optional ErrorCallback errorCallback);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemFileEntry.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemFileEntry.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemFileEntry.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystemFileEntry.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -5,11 +5,11 @@
  */
 
 callback interface FileCallback {
-    void handleEvent(File file);
+    undefined handleEvent(File file);
 };
 
 interface FileSystemFileEntry : FileSystemEntry {
     [BinaryName="GetFile"]
-    void file (FileCallback successCallback,
+    undefined file (FileCallback successCallback,
                optional ErrorCallback errorCallback);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystem.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystem.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystem.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FileSystem.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,15 +11,15 @@
 };
 
 callback interface FileSystemEntryCallback {
-    void handleEvent(FileSystemEntry entry);
+    undefined handleEvent(FileSystemEntry entry);
 };
 
 callback interface VoidCallback {
-    void handleEvent();
+    undefined handleEvent();
 };
 
 callback interface ErrorCallback {
-    void handleEvent(DOMException err);
+    undefined handleEvent(DOMException err);
 };
 
 interface FileSystem {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FontFaceSet.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FontFaceSet.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FontFaceSet.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FontFaceSet.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -23,7 +23,7 @@
   [Throws] FontFaceSetIteratorResult next();
 };
 
-callback FontFaceSetForEachCallback = void (FontFace value, FontFace key, FontFaceSet set);
+callback FontFaceSetForEachCallback = undefined (FontFace value, FontFace key, FontFaceSet set);
 
 enum FontFaceSetLoadStatus { "loading", "loaded" };
 
@@ -34,14 +34,14 @@
 
   // Emulate setlike behavior until we can use that directly.
   readonly attribute unsigned long size;
-  [Throws] void add(FontFace font);
+  [Throws] undefined add(FontFace font);
   boolean has(FontFace font);
   boolean delete(FontFace font);
-  void clear();
+  undefined clear();
   [NewObject] FontFaceSetIterator entries();
   // Iterator keys();
   [NewObject, Alias=keys, Alias="@@iterator"] FontFaceSetIterator values();
-  [Throws] void forEach(FontFaceSetForEachCallback cb, optional any thisArg);
+  [Throws] undefined forEach(FontFaceSetForEachCallback cb, optional any thisArg);
 
   // -- events for when loading state changes
   attribute EventHandler onloading;
@@ -57,7 +57,7 @@
   [Throws] boolean check(DOMString font, optional DOMString text = " ");
 
   // async notification that font loading and layout operations are done
-  [Throws] readonly attribute Promise<void> ready;
+  [Throws] readonly attribute Promise<undefined> ready;
 
   // loading state, "loading" while one or more fonts loading, "loaded" otherwise
   readonly attribute FontFaceSetLoadStatus status;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FormData.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FormData.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FormData.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FormData.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,16 +13,16 @@
  Exposed=(Window,Worker)]
 interface FormData {
   [Throws]
-  void append(USVString name, Blob value, optional USVString filename);
+  undefined append(USVString name, Blob value, optional USVString filename);
   [Throws]
-  void append(USVString name, USVString value);
-  void delete(USVString name);
+  undefined append(USVString name, USVString value);
+  undefined delete(USVString name);
   FormDataEntryValue? get(USVString name);
   sequence<FormDataEntryValue> getAll(USVString name);
   boolean has(USVString name);
   [Throws]
-  void set(USVString name, Blob value, optional USVString filename);
+  undefined set(USVString name, Blob value, optional USVString filename);
   [Throws]
-  void set(USVString name, USVString value);
+  undefined set(USVString name, USVString value);
   iterable<USVString, FormDataEntryValue>;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FrameLoader.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FrameLoader.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FrameLoader.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FrameLoader.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -46,7 +46,7 @@
    * is being fired.
    */
   [Throws]
-  void addProcessChangeBlockingPromise(Promise<any> aPromise);
+  undefined addProcessChangeBlockingPromise(Promise<any> aPromise);
 
   /**
    * Find out whether the loader's frame is at too great a depth in
@@ -61,20 +61,20 @@
    * Throws an exception with non-remote frames.
    */
   [Throws]
-  void activateRemoteFrame();
+  undefined activateRemoteFrame();
 
   /**
    * Deactivate remote frame.
    * Throws an exception with non-remote frames.
    */
   [Throws]
-  void deactivateRemoteFrame();
+  undefined deactivateRemoteFrame();
 
   /**
    * @see nsIDOMWindowUtils sendMouseEvent.
    */
   [Throws]
-  void sendCrossProcessMouseEvent(DOMString aType,
+  undefined sendCrossProcessMouseEvent(DOMString aType,
                                   float aX,
                                   float aY,
                                   long aButton,
@@ -86,7 +86,7 @@
    * Activate event forwarding from client (remote frame) to parent.
    */
   [Throws]
-  void activateFrameEvent(DOMString aType, boolean capture);
+  undefined activateFrameEvent(DOMString aType, boolean capture);
 
   // Note, when frameloaders are swapped, also messageManagers are swapped.
   readonly attribute MessageSender? messageManager;
@@ -96,19 +96,19 @@
    * received by the Compositor, a MozAfterRemoteFrame event be sent
    * to the window.
    */
-  void requestNotifyAfterRemotePaint();
+  undefined requestNotifyAfterRemotePaint();
 
   /**
    * Close the window through the ownerElement.
    */
   [Throws]
-  void requestFrameLoaderClose();
+  undefined requestFrameLoaderClose();
 
   /**
    * Force a remote browser to recompute its dimension and screen position.
    */
   [Throws]
-  void requestUpdatePosition();
+  undefined requestUpdatePosition();
 
   /**
    * Print the current document.
@@ -119,7 +119,7 @@
    * @param aProgressListener optional print progress listener.
    */
   [Throws]
-  void print(unsigned long long aOuterWindowID,
+  undefined print(unsigned long long aOuterWindowID,
              nsIPrintSettings aPrintSettings,
              optional nsIWebProgressListener? aProgressListener = null);
 
@@ -212,7 +212,7 @@
 interface mixin WebBrowserPersistable
 {
   [Throws]
-  void startPersistence(unsigned long long aOuterWindowID,
+  undefined startPersistence(unsigned long long aOuterWindowID,
                         nsIWebBrowserPersistDocumentReceiver aRecv);
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Function.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Function.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Function.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Function.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,4 +13,4 @@
 
 callback Function = any(any... arguments);
 
-callback VoidFunction = void ();
+callback VoidFunction = undefined ();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FuzzingFunctions.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FuzzingFunctions.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/FuzzingFunctions.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/FuzzingFunctions.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -15,16 +15,16 @@
   /**
    * Synchronously perform a garbage collection.
    */
-  static void garbageCollect();
+  static undefined garbageCollect();
 
   /**
    * Synchronously perform a cycle collection.
    */
-  static void cycleCollect();
+  static undefined cycleCollect();
 
   /**
    * Enable accessibility.
    */
   [Throws]
-  static void enableAccessibility();
+  static undefined enableAccessibility();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/GamepadServiceTest.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/GamepadServiceTest.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/GamepadServiceTest.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/GamepadServiceTest.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -19,23 +19,23 @@
                                     unsigned long numAxes,
                                     unsigned long numHaptics);
 
-  void removeGamepad(unsigned long index);
+  undefined removeGamepad(unsigned long index);
 
-  void newButtonEvent(unsigned long index,
+  undefined newButtonEvent(unsigned long index,
                       unsigned long button,
                       boolean pressed,
                       boolean touched);
 
-  void newButtonValueEvent(unsigned long index,
+  undefined newButtonValueEvent(unsigned long index,
                            unsigned long button,
                            boolean pressed,
                            boolean touched,
                            double value);
 
-  void newAxisMoveEvent(unsigned long index,
+  undefined newAxisMoveEvent(unsigned long index,
                         unsigned long axis,
                         double value);
-  void newPoseMove(unsigned long index,
+  undefined newPoseMove(unsigned long index,
                    Float32Array? orient,
                    Float32Array? pos,
                    Float32Array? angVelocity,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Geolocation.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Geolocation.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Geolocation.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Geolocation.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
 [NoInterfaceObject]
 interface Geolocation {
   [Throws, NeedsCallerType]
-  void getCurrentPosition(PositionCallback successCallback,
+  undefined getCurrentPosition(PositionCallback successCallback,
                           optional PositionErrorCallback? errorCallback = null,
                           optional PositionOptions options);
 
@@ -28,9 +28,9 @@
                      optional PositionErrorCallback? errorCallback = null,
                      optional PositionOptions options);
 
-  void clearWatch(long watchId);
+  undefined clearWatch(long watchId);
 };
 
-callback PositionCallback = void (Position position);
+callback PositionCallback = undefined (Position position);
 
-callback PositionErrorCallback = void (PositionError positionError);
+callback PositionErrorCallback = undefined (PositionError positionError);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HashChangeEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HashChangeEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HashChangeEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HashChangeEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -10,7 +10,7 @@
   readonly attribute DOMString oldURL;
   readonly attribute DOMString newURL;
 
-  void initHashChangeEvent(DOMString typeArg,
+  undefined initHashChangeEvent(DOMString typeArg,
                            optional boolean canBubbleArg = false,
                            optional boolean cancelableArg = false,
                            optional DOMString oldURLArg = "",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Headers.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Headers.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Headers.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Headers.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -21,11 +21,11 @@
 [Constructor(optional HeadersInit init),
  Exposed=(Window,Worker)]
 interface Headers {
-  [Throws] void append(ByteString name, ByteString value);
-  [Throws] void delete(ByteString name);
+  [Throws] undefined append(ByteString name, ByteString value);
+  [Throws] undefined delete(ByteString name);
   [Throws] ByteString? get(ByteString name);
   [Throws] boolean has(ByteString name);
-  [Throws] void set(ByteString name, ByteString value);
+  [Throws] undefined set(ByteString name, ByteString value);
   iterable<ByteString, ByteString>;
 
   // Used to test different guard states from mochitest.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/History.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/History.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/History.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/History.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -21,13 +21,13 @@
   [Throws]
   readonly attribute any state;
   [Throws]
-  void go(optional long delta = 0);
+  undefined go(optional long delta = 0);
   [Throws]
-  void back();
+  undefined back();
   [Throws]
-  void forward();
+  undefined forward();
   [Throws]
-  void pushState(any data, DOMString title, optional DOMString? url = null);
+  undefined pushState(any data, DOMString title, optional DOMString? url = null);
   [Throws]
-  void replaceState(any data, DOMString title, optional DOMString? url = null);
+  undefined replaceState(any data, DOMString title, optional DOMString? url = null);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLButtonElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLButtonElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLButtonElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLButtonElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -42,7 +42,7 @@
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList labels;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLCanvasElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLCanvasElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLCanvasElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLCanvasElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -28,7 +28,7 @@
   DOMString toDataURL(optional DOMString type = "",
                       optional any encoderOptions);
   [Throws, NeedsSubjectPrincipal]
-  void toBlob(BlobCallback _callback,
+  undefined toBlob(BlobCallback _callback,
               optional DOMString type = "",
               optional any encoderOptions);
 };
@@ -40,4 +40,4 @@
   OffscreenCanvas transferControlToOffscreen();
 };
 
-callback BlobCallback = void(Blob? blob);
+callback BlobCallback = undefined(Blob? blob);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLDialogElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLDialogElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLDialogElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLDialogElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -17,9 +17,9 @@
   attribute boolean open;
   attribute DOMString returnValue;
   [CEReactions]
-  void show();
+  undefined show();
   [CEReactions, Throws]
-  void showModal();
+  undefined showModal();
   [CEReactions]
-  void close(optional DOMString returnValue);
+  undefined close(optional DOMString returnValue);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLDocument.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLDocument.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLDocument.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLDocument.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -20,11 +20,11 @@
   [CEReactions, Throws]
   WindowProxy? open(DOMString url, DOMString name, DOMString features, optional boolean replace = false);
   [CEReactions, Throws]
-  void close();
+  undefined close();
   [CEReactions, Throws]
-  void write(DOMString... text);
+  undefined write(DOMString... text);
   [CEReactions, Throws]
-  void writeln(DOMString... text);
+  undefined writeln(DOMString... text);
 
   [CEReactions, SetterThrows, SetterNeedsSubjectPrincipal]
            attribute DOMString designMode;
@@ -48,15 +48,15 @@
   [CEReactions, TreatNullAs=EmptyString] attribute DOMString alinkColor;
   [CEReactions, TreatNullAs=EmptyString] attribute DOMString bgColor;
 
-  void clear();
+  undefined clear();
 
   readonly attribute HTMLAllCollection all;
 
   // @deprecated These are old Netscape 4 methods. Do not use,
   //             the implementation is no-op.
   // XXXbz do we actually need these anymore?
-  void                      captureEvents();
-  void                      releaseEvents();
+  undefined                      captureEvents();
+  undefined                      releaseEvents();
 };
 
 partial interface HTMLDocument {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,6 +18,10 @@
   [CEReactions]
            attribute DOMString title;
   [CEReactions]
+           attribute long scrollHeight;
+  [CEReactions]
+           attribute long scrollTop;
+  [CEReactions]
            attribute DOMString lang;
   //         attribute boolean translate;
   [CEReactions, SetterThrows, Pure]
@@ -32,13 +36,13 @@
   [CEReactions, SetterThrows, Pure]
            attribute boolean hidden;
   [NeedsCallerType]
-  void click();
+  undefined click();
   [CEReactions, SetterThrows, Pure]
            attribute long tabIndex;
   [Throws]
-  void focus();
+  undefined focus();
   [Throws]
-  void blur();
+  undefined blur();
   [CEReactions, SetterThrows, Pure]
            attribute DOMString accessKey;
   [Pure]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLFieldSetElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLFieldSetElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLFieldSetElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLFieldSetElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -31,5 +31,5 @@
   boolean checkValidity();
   boolean reportValidity();
 
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLFormElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLFormElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLFormElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLFormElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -42,9 +42,9 @@
   getter nsISupports (DOMString name);
 
   [Throws]
-  void submit();
+  undefined submit();
   [CEReactions]
-  void reset();
+  undefined reset();
   boolean checkValidity();
   boolean reportValidity();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLImageElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLImageElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLImageElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLImageElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -47,7 +47,7 @@
   readonly attribute unsigned long naturalHeight;
   readonly attribute boolean complete;
            [NewObject]
-           Promise<void> decode();
+           Promise<undefined> decode();
 };
 
 // http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLInputElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLInputElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLInputElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLInputElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -101,9 +101,9 @@
            attribute unsigned long width;
 /* TODO
   [Throws]
-  void stepUp(optional long n = 1);
+  undefined stepUp(optional long n = 1);
   [Throws]
-  void stepDown(optional long n = 1);
+  undefined stepDown(optional long n = 1);
 */
 
   [Pure]
@@ -114,11 +114,11 @@
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList? labels;
 
-  void select();
+  undefined select();
 
   [Throws]
            attribute unsigned long? selectionStart;
@@ -127,13 +127,13 @@
   [Throws]
            attribute DOMString? selectionDirection;
   [Throws]
-  void setRangeText(DOMString replacement);
+  undefined setRangeText(DOMString replacement);
 
   [Throws]
-  void setRangeText(DOMString replacement, unsigned long start,
+  undefined setRangeText(DOMString replacement, unsigned long start,
     unsigned long end, optional SelectionMode selectionMode = "preserve");
   [Throws]
-  void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
+  undefined setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
 
   // also has obsolete members
 };
@@ -160,7 +160,7 @@
   Promise<sequence<File>> getFiles(optional boolean recursiveFlag = false);
 
   [Throws, Pref="dom.input.dirpicker"]
-  void chooseDirectory();
+  undefined chooseDirectory();
 };
 */
 
@@ -186,10 +186,10 @@
   DateTimeValue getDateTimeInputBoxValue();
 
   [Pref="dom.forms.datetime", ChromeOnly]
-  void updateDateTimeInputBox(optional DateTimeValue value);
+  undefined updateDateTimeInputBox(optional DateTimeValue value);
 
   [Pref="dom.forms.datetime", ChromeOnly]
-  void setDateTimePickerState(boolean open);
+  undefined setDateTimePickerState(boolean open);
 
   [Pref="dom.forms.datetime", ChromeOnly,
    BinaryName="getMinimumAsDouble"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLMediaElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLMediaElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLMediaElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLMediaElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
            attribute DOMString preload;
   [NewObject]
   readonly attribute TimeRanges buffered;
-  void load();
+  undefined load();
   DOMString canPlayType(DOMString type);
 
   // ready state
@@ -50,7 +50,7 @@
   [SetterThrows]
            attribute double currentTime;
   [Throws]
-  void fastSeek(double time);
+  undefined fastSeek(double time);
   readonly attribute unrestricted double duration;
   [ChromeOnly]
   readonly attribute boolean isEncrypted;
@@ -70,9 +70,9 @@
   [CEReactions, SetterThrows]
            attribute boolean loop;
   [Throws]
-  Promise<void> play();
+  Promise<undefined> play();
   [Throws]
-  void pause();
+  undefined pause();
 
   // TODO: Bug 847377 - mediaGroup and MediaController
   // media controller
@@ -104,9 +104,9 @@
 partial interface HTMLMediaElement {
   readonly attribute MediaKeys? mediaKeys;
 
-  // void, not any: https://www.w3.org/Bugs/Public/show_bug.cgi?id=26457
+  // undefined, not any: https://www.w3.org/Bugs/Public/show_bug.cgi?id=26457
   [NewObject]
-  Promise<void> setMediaKeys(MediaKeys? mediaKeys);
+  Promise<undefined> setMediaKeys(MediaKeys? mediaKeys);
 
   attribute EventHandler onencrypted;
 
@@ -145,7 +145,7 @@
  */
 partial interface HTMLMediaElement {
   [Throws, Pref="media.seekToNextFrame.enabled"]
-  Promise<void> seekToNextFrame();
+  Promise<undefined> seekToNextFrame();
 };
 
 /*
@@ -159,7 +159,7 @@
  */
 partial interface HTMLMediaElement {
   [Pref="media.test.video-suspend"]
-  void setVisible(boolean aVisible);
+  undefined setVisible(boolean aVisible);
 
   [Pref="media.test.video-suspend"]
   boolean hasSuspendTaint();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLObjectElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLObjectElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLObjectElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLObjectElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -44,7 +44,7 @@
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 };
 
 // http://www.whatwg.org/specs/web-apps/current-work/#HTMLObjectElement-partial
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLOptionsCollection.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLOptionsCollection.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLOptionsCollection.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLOptionsCollection.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -14,11 +14,11 @@
   [CEReactions, SetterThrows]
   attribute unsigned long length;
   [CEReactions, Throws]
-  setter void (unsigned long index, HTMLOptionElement? option);
+  setter undefined (unsigned long index, HTMLOptionElement? option);
   [CEReactions, Throws]
-  void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
+  undefined add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
   [CEReactions, Throws]
-  void remove(long index);
+  undefined remove(long index);
   [Throws]
   attribute long selectedIndex;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLOutputElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLOutputElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLOutputElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLOutputElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -33,7 +33,7 @@
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList labels;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLSelectElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLSelectElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLSelectElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLSelectElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -36,11 +36,11 @@
   getter Element? item(unsigned long index);
   HTMLOptionElement? namedItem(DOMString name);
   [CEReactions, Throws]
-  void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
+  undefined add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
   [CEReactions]
-  void remove(long index);
+  undefined remove(long index);
   [CEReactions, Throws]
-  setter void (unsigned long index, HTMLOptionElement? option);
+  setter undefined (unsigned long index, HTMLOptionElement? option);
 
   readonly attribute HTMLCollection selectedOptions;
   [SetterThrows, Pure]
@@ -54,13 +54,13 @@
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList labels;
 
   // https://www.w3.org/Bugs/Public/show_bug.cgi?id=20720
   [CEReactions]
-  void remove();
+  undefined remove();
 };
 
 // Chrome only interface
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -17,26 +17,26 @@
            attribute HTMLTableCaptionElement? caption;
   HTMLElement createCaption();
   [CEReactions]
-  void deleteCaption();
+  undefined deleteCaption();
            [CEReactions, SetterThrows]
            attribute HTMLTableSectionElement? tHead;
   HTMLElement createTHead();
   [CEReactions]
-  void deleteTHead();
+  undefined deleteTHead();
            [CEReactions, SetterThrows]
            attribute HTMLTableSectionElement? tFoot;
   HTMLElement createTFoot();
   [CEReactions]
-  void deleteTFoot();
+  undefined deleteTFoot();
   readonly attribute HTMLCollection tBodies;
   HTMLElement createTBody();
   readonly attribute HTMLCollection rows;
   [Throws]
   HTMLElement insertRow(optional long index = -1);
   [CEReactions, Throws]
-  void deleteRow(long index);
+  undefined deleteRow(long index);
   //         attribute boolean sortable;
-  //void stopSorting();
+  //undefined stopSorting();
 };
 
 partial interface HTMLTableElement {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableRowElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableRowElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableRowElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableRowElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
   [Throws]
   HTMLElement insertCell(optional long index = -1);
   [CEReactions, Throws]
-  void deleteCell(long index);
+  undefined deleteCell(long index);
 };
 
 partial interface HTMLTableRowElement {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableSectionElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableSectionElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableSectionElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTableSectionElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -17,7 +17,7 @@
   [Throws]
   HTMLElement insertRow(optional long index = -1);
   [CEReactions, Throws]
-  void deleteRow(long index);
+  undefined deleteRow(long index);
 };
 
 partial interface HTMLTableSectionElement {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTextAreaElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTextAreaElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTextAreaElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/HTMLTextAreaElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -59,11 +59,11 @@
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList labels;
 
-  void select();
+  undefined select();
   [Throws]
            attribute unsigned long? selectionStart;
   [Throws]
@@ -71,10 +71,10 @@
   [Throws]
            attribute DOMString? selectionDirection;
   [Throws]
-  void setRangeText(DOMString replacement);
+  undefined setRangeText(DOMString replacement);
   [Throws]
-  void setRangeText(DOMString replacement, unsigned long start,
+  undefined setRangeText(DOMString replacement, unsigned long start,
     unsigned long end, optional SelectionMode selectionMode = "preserve");
   [Throws]
-  void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
+  undefined setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBCursor.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBCursor.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBCursor.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBCursor.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -30,13 +30,13 @@
     IDBRequest update (any value);
 
     [Throws]
-    void       advance ([EnforceRange] unsigned long count);
+    undefined       advance ([EnforceRange] unsigned long count);
 
     [Throws]
-    void       continue (optional any key);
+    undefined       continue (optional any key);
 
     [Throws]
-    void       continuePrimaryKey(any key, any primaryKey);
+    undefined       continuePrimaryKey(any key, any primaryKey);
 
     [Throws]
     IDBRequest delete ();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBDatabase.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBDatabase.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBDatabase.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBDatabase.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -21,13 +21,13 @@
     IDBObjectStore createObjectStore (DOMString name, optional IDBObjectStoreParameters optionalParameters);
 
     [Throws]
-    void           deleteObjectStore (DOMString name);
+    undefined           deleteObjectStore (DOMString name);
 
     [Throws]
     IDBTransaction transaction ((DOMString or sequence<DOMString>) storeNames,
                                 optional IDBTransactionMode mode = "readonly");
 
-    void           close ();
+    undefined           close ();
 
                 attribute EventHandler       onabort;
                 attribute EventHandler       onclose;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBFileHandle.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBFileHandle.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBFileHandle.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBFileHandle.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -35,7 +35,7 @@
   [Throws]
   IDBFileRequest? flush();
   [Throws]
-  void abort();
+  undefined abort();
 
   attribute EventHandler oncomplete;
   attribute EventHandler onabort;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBObjectStore.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBObjectStore.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBObjectStore.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBObjectStore.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -52,7 +52,7 @@
     IDBIndex   index (DOMString name);
 
     [Throws]
-    void       deleteIndex (DOMString indexName);
+    undefined       deleteIndex (DOMString indexName);
 
     [Throws]
     IDBRequest count (optional any key);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBTransaction.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBTransaction.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBTransaction.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IDBTransaction.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -31,7 +31,7 @@
     IDBObjectStore objectStore (DOMString name);
 
     [Throws]
-    void           abort();
+    undefined           abort();
 
                 attribute EventHandler       onabort;
                 attribute EventHandler       oncomplete;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IIRFilterNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IIRFilterNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IIRFilterNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IIRFilterNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -17,5 +17,5 @@
 [Pref="dom.webaudio.enabled",
 Constructor(BaseAudioContext context, IIRFilterOptions options)]
 interface IIRFilterNode : AudioNode {
-    void getFrequencyResponse(Float32Array frequencyHz, Float32Array magResponse, Float32Array phaseResponse);
+    undefined getFrequencyResponse(Float32Array frequencyHz, Float32Array magResponse, Float32Array phaseResponse);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageBitmapRenderingContext.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageBitmapRenderingContext.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageBitmapRenderingContext.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageBitmapRenderingContext.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -32,9 +32,9 @@
   // would be covered by the canvas's bitmap which are not covered by
   // the supplied ImageBitmap are rendered transparent black. Any CSS
   // styles affecting the display of the canvas are applied as usual.
-  void transferFromImageBitmap(ImageBitmap bitmap);
+  undefined transferFromImageBitmap(ImageBitmap bitmap);
 
   // Deprecated version of transferFromImageBitmap
   [Deprecated="ImageBitmapRenderingContext_TransferImageBitmap"]
-  void transferImageBitmap(ImageBitmap bitmap);
+  undefined transferImageBitmap(ImageBitmap bitmap);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageBitmap.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageBitmap.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageBitmap.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageBitmap.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -47,7 +47,7 @@
 // new interface type "Closeable".
 partial interface ImageBitmap {
   // Dispose of all graphical resources associated with this ImageBitmap.
-  void close();
+  undefined close();
 };
 
 // ImageBitmap-extensions
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageDocument.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageDocument.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageDocument.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ImageDocument.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -23,20 +23,20 @@
   readonly attribute imgIRequest? imageRequest;
 
   /* Resize the image to fit visible area. */
-  void shrinkToFit();
+  undefined shrinkToFit();
 
   /* Restore image original size. */
-  void restoreImage();
+  undefined restoreImage();
 
   /* Restore the image, trying to keep a certain pixel in the same position.
    * The coordinate system is that of the shrunken image.
    */
-  void restoreImageTo(long x, long y);
+  undefined restoreImageTo(long x, long y);
 
   /* A helper method for switching between states.
    * The switching logic is as follows. If the image has been resized
    * restore image original size, otherwise if the image is overflowing
    * current visible area resize the image to fit the area.
    */
-  void toggleImageSize();
+  undefined toggleImageSize();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/InputEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/InputEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/InputEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/InputEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -8,9 +8,37 @@
 interface InputEvent : UIEvent
 {
   readonly attribute boolean       isComposing;
+  readonly attribute DOMString     inputType;
+  [NeedsCallerType]
+  readonly attribute DOMString?    data;
 };
 
 dictionary InputEventInit : UIEventInit
 {
   boolean isComposing = false;
+  DOMString inputType = "";
+  // NOTE:  Currently, default value of `data` attribute is declared as empty
+  //        string by UI Events.  However, both Chrome and Safari uses `null`,
+  //        and there is a spec issue about this:
+  //        https://github.com/w3c/uievents/issues/139
+  //        So, we take `null` for compatibility with them.
+  DOMString? data = null;
 };
+
+partial interface InputEvent
+{
+  [NeedsCallerType]
+  readonly attribute DataTransfer? dataTransfer;
+  // Enable `getTargetRanges()` only when `beforeinput` event is enabled
+  // because this may be used for feature detection of `beforeinput` event
+  // support (due to Chrome not supporting `onbeforeinput` attribute).
+  [Pref="dom.input_events.beforeinput.enabled"]
+  sequence<StaticRange> getTargetRanges();
+};
+
+partial dictionary InputEventInit
+{
+  DataTransfer? dataTransfer = null;
+  [Pref="dom.input_events.beforeinput.enabled"]
+  sequence<StaticRange> targetRanges = [];
+};
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/InstallTrigger.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/InstallTrigger.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/InstallTrigger.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/InstallTrigger.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -8,7 +8,7 @@
  * A callback function that webpages can implement to be notified when triggered
  * installs complete.
  */
-callback InstallTriggerCallback = void(DOMString url, short status);
+callback InstallTriggerCallback = undefined(DOMString url, short status);
 
 dictionary InstallTriggerData {
   DOMString URL;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IntersectionObserver.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IntersectionObserver.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/IntersectionObserver.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/IntersectionObserver.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -35,9 +35,9 @@
   readonly attribute DOMString rootMargin;
   [Constant,Cached]
   readonly attribute sequence<double> thresholds;
-  void observe(Element target);
-  void unobserve(Element target);
-  void disconnect();
+  undefined observe(Element target);
+  undefined unobserve(Element target);
+  undefined disconnect();
   sequence<IntersectionObserverEntry> takeRecords();
 
   [ChromeOnly]
@@ -45,7 +45,7 @@
 };
 
 callback IntersectionCallback =
-  void (sequence<IntersectionObserverEntry> entries, IntersectionObserver observer);
+  undefined (sequence<IntersectionObserverEntry> entries, IntersectionObserver observer);
 
 dictionary IntersectionObserverEntryInit {
   required DOMHighResTimeStamp time;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyboardEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyboardEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyboardEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyboardEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -36,7 +36,7 @@
   readonly attribute DOMString code;
 
   [Throws]
-  void initKeyboardEvent(DOMString typeArg,
+  undefined initKeyboardEvent(DOMString typeArg,
                          optional boolean bubblesArg = false,
                          optional boolean cancelableArg = false,
                          optional Window? viewArg = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -230,7 +230,7 @@
   // for compatibility with the other web browsers on Windows.
   const unsigned long DOM_VK_WIN_OEM_CLEAR  = 0xFE;
 
-  void initKeyEvent(DOMString type,
+  undefined initKeyEvent(DOMString type,
                     optional boolean canBubble = false,
                     optional boolean cancelable = false,
                     optional Window? view = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyframeEffect.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyframeEffect.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyframeEffect.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/KeyframeEffect.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
   attribute IterationCompositeOperation     iterationComposite;
   attribute CompositeOperation              composite;
   [Throws] sequence<object> getKeyframes ();
-  [Throws] void             setKeyframes (object? keyframes);
+  [Throws] undefined             setKeyframes (object? keyframes);
 };
 
 // Non-standard extensions
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ListBoxObject.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ListBoxObject.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ListBoxObject.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ListBoxObject.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,9 +13,9 @@
   long getNumberOfVisibleRows();
   long getIndexOfFirstVisibleRow();
 
-  void ensureIndexIsVisible(long rowIndex);
-  void scrollToIndex(long rowIndex);
-  void scrollByLines(long numLines);
+  undefined ensureIndexIsVisible(long rowIndex);
+  undefined scrollToIndex(long rowIndex);
+  undefined scrollByLines(long numLines);
 
   Element? getItemAtIndex(long index);
   long getIndexOfItem(Element item);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/LocalMediaStream.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/LocalMediaStream.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/LocalMediaStream.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/LocalMediaStream.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,5 +11,5 @@
  */
 
 interface LocalMediaStream : MediaStream {
-    void stop();
+    undefined stop();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Location.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Location.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Location.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Location.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -40,14 +40,14 @@
            attribute USVString hash;
 
   [Throws, NeedsSubjectPrincipal]
-  void assign(USVString url);
+  undefined assign(USVString url);
 
   [Throws, CrossOriginCallable, NeedsSubjectPrincipal]
-  void replace(USVString url);
+  undefined replace(USVString url);
 
   // XXXbz there is no forceget argument in the spec!  See bug 1037721.
   [Throws, NeedsSubjectPrincipal]
-  void reload(optional boolean forceget = false);
+  undefined reload(optional boolean forceget = false);
 
   // Bug 1085214 [SameObject] readonly attribute USVString[] ancestorOrigins;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaDevices.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaDevices.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaDevices.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaDevices.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -21,4 +21,7 @@
 
   [Throws, NeedsCallerType]
   Promise<MediaStream> getUserMedia(optional MediaStreamConstraints constraints);
+
+  [SecureContext, Pref="media.getdisplaymedia.enabled", Throws, NeedsCallerType]
+  Promise<MediaStream> getDisplayMedia(optional DisplayMediaStreamConstraints constraints);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaKeySession.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaKeySession.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaKeySession.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaKeySession.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
 
   readonly attribute unrestricted double expiration;
 
-  readonly attribute Promise<void> closed;
+  readonly attribute Promise<undefined> closed;
 
   readonly attribute MediaKeyStatusMap keyStatuses;
 
@@ -28,18 +28,18 @@
   attribute EventHandler onmessage;
 
   [NewObject]
-  Promise<void> generateRequest(DOMString initDataType, BufferSource initData);
+  Promise<undefined> generateRequest(DOMString initDataType, BufferSource initData);
 
   [NewObject]
   Promise<boolean> load(DOMString sessionId);
 
   // session operations
   [NewObject]
-  Promise<void> update(BufferSource response);
+  Promise<undefined> update(BufferSource response);
 
   [NewObject]
-  Promise<void> close();
+  Promise<undefined> close();
 
   [NewObject]
-  Promise<void> remove();
+  Promise<undefined> remove();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaKeys.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaKeys.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaKeys.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaKeys.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -30,7 +30,7 @@
   MediaKeySession createSession(optional MediaKeySessionType sessionType = "temporary");
 
   [NewObject]
-  Promise<void> setServerCertificate(BufferSource serverCertificate);
+  Promise<undefined> setServerCertificate(BufferSource serverCertificate);
 
   [Pref="media.eme.hdcp-policy-check.enabled", NewObject]
   Promise<MediaKeyStatus> getStatusForPolicy(optional MediaKeysPolicy policy);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
   readonly attribute unsigned long    length;
   getter DOMString?  item(unsigned long index);
   [Throws]
-  void               deleteMedium(DOMString oldMedium);
+  undefined               deleteMedium(DOMString oldMedium);
   [Throws]
-  void               appendMedium(DOMString newMedium);
+  undefined               appendMedium(DOMString newMedium);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaQueryList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaQueryList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaQueryList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaQueryList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -15,10 +15,10 @@
   readonly attribute boolean matches;
 
   [Throws]
-  void addListener(EventListener? listener);
+  undefined addListener(EventListener? listener);
 
   [Throws]
-  void removeListener(EventListener? listener);
+  undefined removeListener(EventListener? listener);
 
            attribute EventHandler onchange;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaRecorder.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaRecorder.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaRecorder.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaRecorder.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -34,19 +34,19 @@
   attribute EventHandler onwarning;
 
   [Throws]
-  void start(optional long timeSlice);
+  undefined start(optional long timeSlice);
 
   [Throws]
-  void stop();
+  undefined stop();
 
   [Throws]
-  void pause();
+  undefined pause();
 
   [Throws]
-  void resume();
+  undefined resume();
 
   [Throws]
-  void requestData();
+  undefined requestData();
 
   static boolean isTypeSupported(DOMString type);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaSource.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaSource.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaSource.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaSource.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -34,12 +34,12 @@
   [NewObject, Throws]
   SourceBuffer addSourceBuffer(DOMString type);
   [Throws]
-  void removeSourceBuffer(SourceBuffer sourceBuffer);
+  undefined removeSourceBuffer(SourceBuffer sourceBuffer);
   [Throws]
-  void endOfStream(optional MediaSourceEndOfStreamError error);
+  undefined endOfStream(optional MediaSourceEndOfStreamError error);
   [Throws]
-  void setLiveSeekableRange(double start, double end);
+  undefined setLiveSeekableRange(double start, double end);
   [Throws]
-  void clearLiveSeekableRange();
+  undefined clearLiveSeekableRange();
   static boolean isTypeSupported(DOMString type);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaStreamTrack.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaStreamTrack.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaStreamTrack.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaStreamTrack.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -82,16 +82,16 @@
     readonly    attribute MediaStreamTrackState readyState;
                 attribute EventHandler          onended;
     MediaStreamTrack       clone ();
-    void                   stop ();
+    undefined                   stop ();
 //  MediaTrackCapabilities getCapabilities ();
     MediaTrackConstraints  getConstraints ();
     [NeedsCallerType]
     MediaTrackSettings     getSettings ();
 
     [Throws, NeedsCallerType]
-    Promise<void>          applyConstraints (optional MediaTrackConstraints constraints);
+    Promise<undefined>          applyConstraints (optional MediaTrackConstraints constraints);
 //              attribute EventHandler          onoverconstrained;
 
     [ChromeOnly]
-    void mutedChanged(boolean muted);
+    undefined mutedChanged(boolean muted);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaStream.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaStream.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaStream.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MediaStream.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -23,6 +23,11 @@
     DOMString? peerIdentity = null;
 };
 
+dictionary DisplayMediaStreamConstraints {
+    (boolean or MediaTrackConstraints) video = true;
+    (boolean or MediaTrackConstraints) audio = false;
+};
+
 [Exposed=Window,
  Constructor,
  Constructor (MediaStream stream),
@@ -33,8 +38,8 @@
     sequence<VideoStreamTrack> getVideoTracks ();
     sequence<MediaStreamTrack> getTracks ();
     MediaStreamTrack?          getTrackById (DOMString trackId);
-    void                       addTrack (MediaStreamTrack track);
-    void                       removeTrack (MediaStreamTrack track);
+    undefined                       addTrack (MediaStreamTrack track);
+    undefined                       removeTrack (MediaStreamTrack track);
     MediaStream                clone ();
     readonly    attribute boolean      active;
                 attribute EventHandler onaddtrack;
@@ -47,5 +52,5 @@
     // Webrtc allows the remote side to name a stream whatever it wants, and we
     // need to surface this to content.
     [ChromeOnly]
-    void assignId(DOMString id);
+    undefined assignId(DOMString id);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MessageEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MessageEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MessageEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MessageEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -43,7 +43,7 @@
    * the similarly-named method on the Event interface, also setting the
    * data, origin, source, and lastEventId attributes of this appropriately.
    */
-  void initMessageEvent(DOMString type,
+  undefined initMessageEvent(DOMString type,
                         optional boolean bubbles = false,
                         optional boolean cancelable = false,
                         optional any data = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MessagePort.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MessagePort.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MessagePort.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MessagePort.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -10,10 +10,10 @@
 [Exposed=(Window,Worker,AudioWorklet,System)]
 interface MessagePort : EventTarget {
   [Throws]
-  void postMessage(any message, optional sequence<object> transferable = []);
+  undefined postMessage(any message, optional sequence<object> transferable = []);
 
-  void start();
-  void close();
+  undefined start();
+  undefined close();
 
   // event handlers
   attribute EventHandler onmessage;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MIDIOutput.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MIDIOutput.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MIDIOutput.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MIDIOutput.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -10,6 +10,6 @@
 [SecureContext, Pref="dom.webmidi.enabled"]
 interface MIDIOutput : MIDIPort {
   [Throws]
-  void send(sequence<octet> data, optional DOMHighResTimeStamp timestamp);
-  void clear();
+  undefined send(sequence<octet> data, optional DOMHighResTimeStamp timestamp);
+  undefined clear();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MouseEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MouseEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MouseEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MouseEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -38,7 +38,7 @@
   readonly attribute long           movementY;
 
   // Deprecated in DOM Level 3:
-void initMouseEvent(DOMString typeArg,
+undefined initMouseEvent(DOMString typeArg,
                     optional boolean canBubbleArg = false,
                     optional boolean cancelableArg = false,
                     optional Window? viewArg = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MouseScrollEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MouseScrollEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MouseScrollEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MouseScrollEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
 
   readonly attribute long axis;
 
-  void initMouseScrollEvent(DOMString type,
+  undefined initMouseScrollEvent(DOMString type,
                             optional boolean canBubble = false,
                             optional boolean cancelable = false,
                             optional Window? view = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MutationEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MutationEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MutationEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MutationEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -24,7 +24,7 @@
   readonly attribute unsigned short attrChange;
 
   [Throws]
-  void initMutationEvent(DOMString type,
+  undefined initMutationEvent(DOMString type,
                          optional boolean canBubble = false,
                          optional boolean cancelable = false,
                          optional Node? relatedNode = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MutationObserver.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MutationObserver.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/MutationObserver.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/MutationObserver.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -40,8 +40,8 @@
 [Constructor(MutationCallback mutationCallback)]
 interface MutationObserver {
   [Throws]
-  void observe(Node target, optional MutationObserverInit options);
-  void disconnect();
+  undefined observe(Node target, optional MutationObserverInit options);
+  undefined disconnect();
   sequence<MutationRecord> takeRecords();
 
   [ChromeOnly, Throws]
@@ -52,7 +52,7 @@
   attribute boolean mergeAttributeRecords;
 };
 
-callback MutationCallback = void (sequence<MutationRecord> mutations, MutationObserver observer);
+callback MutationCallback = undefined (sequence<MutationRecord> mutations, MutationObserver observer);
 
 dictionary MutationObserverInit {
   boolean childList = false;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Navigator.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Navigator.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Navigator.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Navigator.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -80,14 +80,14 @@
 interface mixin NavigatorContentUtils {
   // content handler registration
   [Throws, Func="nsGlobalWindowInner::RegisterProtocolHandlerAllowedForContext"]
-  void registerProtocolHandler(DOMString scheme, DOMString url, DOMString title);
+  undefined registerProtocolHandler(DOMString scheme, DOMString url, DOMString title);
   [Pref="dom.registerContentHandler.enabled", Throws]
-  void registerContentHandler(DOMString mimeType, DOMString url, DOMString title);
+  undefined registerContentHandler(DOMString mimeType, DOMString url, DOMString title);
   // NOT IMPLEMENTED
   //DOMString isProtocolHandlerRegistered(DOMString scheme, DOMString url);
   //DOMString isContentHandlerRegistered(DOMString mimeType, DOMString url);
-  //void unregisterProtocolHandler(DOMString scheme, DOMString url);
-  //void unregisterContentHandler(DOMString mimeType, DOMString url);
+  //undefined unregisterProtocolHandler(DOMString scheme, DOMString url);
+  //undefined unregisterContentHandler(DOMString mimeType, DOMString url);
 };
 
 [SecureContext, Exposed=(Window,Worker)]
@@ -98,7 +98,7 @@
 
 interface mixin NavigatorStorageUtils {
   // NOT IMPLEMENTED
-  //void yieldForStorageUpdates();
+  //undefined yieldForStorageUpdates();
 };
 
 partial interface Navigator {
@@ -182,7 +182,7 @@
   [ChromeOnly, Pref="dom.vr.enabled"]
   readonly attribute boolean isWebVRContentPresenting;
   [ChromeOnly, Pref="dom.vr.enabled"]
-  void requestVRPresentation(VRDisplay display);
+  undefined requestVRPresentation(VRDisplay display);
 };
 partial interface Navigator {
   [Pref="dom.vr.test.enabled"]
@@ -195,8 +195,8 @@
   Promise<MIDIAccess> requestMIDIAccess(optional MIDIOptions options);
 };
 
-callback NavigatorUserMediaSuccessCallback = void (MediaStream stream);
-callback NavigatorUserMediaErrorCallback = void (MediaStreamError error);
+callback NavigatorUserMediaSuccessCallback = undefined (MediaStream stream);
+callback NavigatorUserMediaErrorCallback = undefined (MediaStreamError error);
 
 partial interface Navigator {
   [Throws, Func="Navigator::HasUserMediaSupport"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/NodeIterator.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/NodeIterator.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/NodeIterator.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/NodeIterator.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -27,5 +27,5 @@
   [Throws]
   Node? previousNode();
 
-  void detach();
+  undefined detach();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Node.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Node.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Node.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Node.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -73,7 +73,7 @@
   [CEReactions, Throws]
   Node removeChild(Node child);
   [CEReactions]
-  void normalize();
+  undefined normalize();
 
   [CEReactions, Throws]
   Node cloneNode(optional boolean deep = false);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Notification.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Notification.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Notification.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Notification.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -56,7 +56,7 @@
   [Constant]
   readonly attribute any data;
 
-  void close();
+  undefined close();
 };
 
 dictionary NotificationOptions {
@@ -87,7 +87,7 @@
   "granted"
 };
 
-callback NotificationPermissionCallback = void (NotificationPermission permission);
+callback NotificationPermissionCallback = undefined (NotificationPermission permission);
 
 enum NotificationDirection {
   "auto",
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/OfflineAudioContext.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/OfflineAudioContext.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/OfflineAudioContext.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/OfflineAudioContext.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -24,7 +24,7 @@
     [Throws]
     Promise<AudioBuffer> startRendering();
 
-    // TODO: Promise<void>        suspend (double suspendTime);
+    // TODO: Promise<undefined>        suspend (double suspendTime);
 
     readonly        attribute unsigned long length;
                     attribute EventHandler  oncomplete;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/OfflineResourceList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/OfflineResourceList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/OfflineResourceList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/OfflineResourceList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -33,14 +33,14 @@
    * Begin the application update process on the associated application cache.
    */
   [Throws, UseCounter]
-  void update();
+  undefined update();
 
   /**
    * Swap in the newest version of the application cache, or disassociate
    * from the cache if the cache group is obsolete.
    */
   [Throws, UseCounter]
-  void swapCache();
+  undefined swapCache();
 
   /* Events */
   [UseCounter]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/OscillatorNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/OscillatorNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/OscillatorNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/OscillatorNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -35,7 +35,7 @@
     readonly attribute AudioParam frequency; // in Hertz
     readonly attribute AudioParam detune; // in Cents
 
-    void setPeriodicWave(PeriodicWave periodicWave);
+    undefined setPeriodicWave(PeriodicWave periodicWave);
 };
 
 OscillatorNode includes rustAudioScheduledSourceNode;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaintWorkletGlobalScope.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaintWorkletGlobalScope.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaintWorkletGlobalScope.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaintWorkletGlobalScope.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -9,5 +9,5 @@
 
 [Global=(Worklet,PaintWorklet),Exposed=PaintWorklet]
 interface PaintWorkletGlobalScope : WorkletGlobalScope {
-    void registerPaint(DOMString name, VoidFunction paintCtor);
+    undefined registerPaint(DOMString name, VoidFunction paintCtor);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PannerNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PannerNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PannerNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PannerNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -46,10 +46,10 @@
     attribute PanningModelType panningModel;
 
     // Uses a 3D cartesian coordinate system
-    void setPosition(double x, double y, double z);
-    void setOrientation(double x, double y, double z);
+    undefined setPosition(double x, double y, double z);
+    undefined setOrientation(double x, double y, double z);
     [Deprecated="PannerNodeDoppler"]
-    void setVelocity(double x, double y, double z);
+    undefined setVelocity(double x, double y, double z);
 
     // Cartesian coordinate for position
     readonly attribute AudioParam positionX;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ParentNode.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ParentNode.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ParentNode.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ParentNode.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,7 +18,7 @@
   readonly attribute unsigned long childElementCount;
 
   [CEReactions, Throws, Unscopable]
-  void prepend((Node or DOMString)... nodes);
+  undefined prepend((Node or DOMString)... nodes);
   [CEReactions, Throws, Unscopable]
-  void append((Node or DOMString)... nodes);
+  undefined append((Node or DOMString)... nodes);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaymentRequestUpdateEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaymentRequestUpdateEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaymentRequestUpdateEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaymentRequestUpdateEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
  Func="mozilla::dom::PaymentRequest::PrefEnabled"]
 interface PaymentRequestUpdateEvent : Event {
   [Throws]
-  void updateWith(Promise<PaymentDetailsUpdate> detailsPromise);
+  undefined updateWith(Promise<PaymentDetailsUpdate> detailsPromise);
 };
 
 dictionary PaymentRequestUpdateEventInit : EventInit {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaymentResponse.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaymentResponse.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaymentResponse.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PaymentResponse.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -28,5 +28,5 @@
   readonly attribute DOMString?      payerPhone;
 
   [NewObject]
-  Promise<void> complete(optional PaymentComplete result = "unknown");
+  Promise<undefined> complete(optional PaymentComplete result = "unknown");
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PeerConnectionImpl.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PeerConnectionImpl.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PeerConnectionImpl.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PeerConnectionImpl.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -21,24 +21,24 @@
 interface PeerConnectionImpl  {
   /* Must be called first. Observer events dispatched on the thread provided */
   [Throws]
-  void initialize(PeerConnectionObserver observer, Window window,
+  undefined initialize(PeerConnectionObserver observer, Window window,
                   RTCConfiguration iceServers,
                   nsISupports thread);
 
   /* JSEP calls */
   [Throws]
-  void createOffer(optional RTCOfferOptions options);
+  undefined createOffer(optional RTCOfferOptions options);
   [Throws]
-  void createAnswer();
+  undefined createAnswer();
   [Throws]
-  void setLocalDescription(long action, DOMString sdp);
+  undefined setLocalDescription(long action, DOMString sdp);
   [Throws]
-  void setRemoteDescription(long action, DOMString sdp);
+  undefined setRemoteDescription(long action, DOMString sdp);
 
   /* Stats call, calls either |onGetStatsSuccess| or |onGetStatsError| on our
      observer. (see the |PeerConnectionObserver| interface) */
   [Throws]
-  void getStats(MediaStreamTrack? selector);
+  undefined getStats(MediaStreamTrack? selector);
 
   /* Adds the tracks created by GetUserMedia */
   [Throws]
@@ -47,7 +47,7 @@
   [Throws]
   boolean checkNegotiationNeeded();
   [Throws]
-  void insertDTMF(TransceiverImpl transceiver, DOMString tones,
+  undefined insertDTMF(TransceiverImpl transceiver, DOMString tones,
                   optional unsigned long duration = 100,
                   optional unsigned long interToneGap = 70);
   [Throws]
@@ -58,31 +58,31 @@
   DOMHighResTimeStamp getNowInRtpSourceReferenceTime();
 
   [Throws]
-  void replaceTrackNoRenegotiation(TransceiverImpl transceiverImpl,
+  undefined replaceTrackNoRenegotiation(TransceiverImpl transceiverImpl,
                                    MediaStreamTrack? withTrack);
   [Throws]
-  void closeStreams();
+  undefined closeStreams();
 
   [Throws]
-  void addRIDExtension(MediaStreamTrack recvTrack, unsigned short extensionId);
+  undefined addRIDExtension(MediaStreamTrack recvTrack, unsigned short extensionId);
   [Throws]
-  void addRIDFilter(MediaStreamTrack recvTrack, DOMString rid);
+  undefined addRIDFilter(MediaStreamTrack recvTrack, DOMString rid);
 
   // Inserts CSRC data for the RtpSourceObserver for testing
   [Throws]
-  void insertAudioLevelForContributingSource(MediaStreamTrack recvTrack,
+  undefined insertAudioLevelForContributingSource(MediaStreamTrack recvTrack,
                                              unsigned long source,
                                              DOMHighResTimeStamp timestamp,
                                              boolean hasLevel,
                                              byte level);
 
   [Throws]
-  void enablePacketDump(unsigned long level,
+  undefined enablePacketDump(unsigned long level,
                         mozPacketDumpType type,
                         boolean sending);
 
   [Throws]
-  void disablePacketDump(unsigned long level,
+  undefined disablePacketDump(unsigned long level,
                          mozPacketDumpType type,
                          boolean sending);
 
@@ -92,11 +92,11 @@
    * into the SDP.
    */
   [Throws]
-  void addIceCandidate(DOMString candidate, DOMString mid, unsigned short level);
+  undefined addIceCandidate(DOMString candidate, DOMString mid, unsigned short level);
 
   /* Puts the SIPCC engine back to 'kIdle', shuts down threads, deletes state */
   [Throws]
-  void close();
+  undefined close();
 
   /* Notify DOM window if this plugin crash is ours. */
   boolean pluginCrash(unsigned long long pluginId, DOMString name);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PeerConnectionObserver.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PeerConnectionObserver.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PeerConnectionObserver.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PeerConnectionObserver.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,39 +13,39 @@
 interface PeerConnectionObserver
 {
   /* JSEP callbacks */
-  void onCreateOfferSuccess(DOMString offer);
-  void onCreateOfferError(unsigned long name, DOMString message);
-  void onCreateAnswerSuccess(DOMString answer);
-  void onCreateAnswerError(unsigned long name, DOMString message);
-  void onSetLocalDescriptionSuccess();
-  void onSetRemoteDescriptionSuccess();
-  void onSetLocalDescriptionError(unsigned long name, DOMString message);
-  void onSetRemoteDescriptionError(unsigned long name, DOMString message);
-  void onAddIceCandidateSuccess();
-  void onAddIceCandidateError(unsigned long name, DOMString message);
-  void onIceCandidate(unsigned short level, DOMString mid, DOMString candidate);
+  undefined onCreateOfferSuccess(DOMString offer);
+  undefined onCreateOfferError(unsigned long name, DOMString message);
+  undefined onCreateAnswerSuccess(DOMString answer);
+  undefined onCreateAnswerError(unsigned long name, DOMString message);
+  undefined onSetLocalDescriptionSuccess();
+  undefined onSetRemoteDescriptionSuccess();
+  undefined onSetLocalDescriptionError(unsigned long name, DOMString message);
+  undefined onSetRemoteDescriptionError(unsigned long name, DOMString message);
+  undefined onAddIceCandidateSuccess();
+  undefined onAddIceCandidateError(unsigned long name, DOMString message);
+  undefined onIceCandidate(unsigned short level, DOMString mid, DOMString candidate);
 
   /* Stats callbacks */
-  void onGetStatsSuccess(optional RTCStatsReportInternal report);
-  void onGetStatsError(unsigned long name, DOMString message);
+  undefined onGetStatsSuccess(optional RTCStatsReportInternal report);
+  undefined onGetStatsError(unsigned long name, DOMString message);
 
   /* Data channel callbacks */
-  void notifyDataChannel(RTCDataChannel channel);
+  undefined notifyDataChannel(RTCDataChannel channel);
 
   /* Notification of one of several types of state changed */
-  void onStateChange(PCObserverStateType state);
+  undefined onStateChange(PCObserverStateType state);
 
   /* Transceiver management; called when setRemoteDescription causes a
      transceiver to be created on the C++ side */
-  void onTransceiverNeeded(DOMString kind, TransceiverImpl transceiverImpl);
+  undefined onTransceiverNeeded(DOMString kind, TransceiverImpl transceiverImpl);
 
   /* DTMF callback */
-  void onDTMFToneChange(MediaStreamTrack track, DOMString tone);
+  undefined onDTMFToneChange(MediaStreamTrack track, DOMString tone);
 
   /* Packet dump callback */
-  void onPacket(unsigned long level, mozPacketDumpType type, boolean sending,
+  undefined onPacket(unsigned long level, mozPacketDumpType type, boolean sending,
                 ArrayBuffer packet);
 
   /* Transceiver sync */
-  void syncTransceivers();
+  undefined syncTransceivers();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PerformanceObserver.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PerformanceObserver.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PerformanceObserver.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PerformanceObserver.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -12,14 +12,14 @@
   boolean buffered = false;
 };
 
-callback PerformanceObserverCallback = void (PerformanceObserverEntryList entries,
+callback PerformanceObserverCallback = undefined (PerformanceObserverEntryList entries,
                                              PerformanceObserver observer);
 
 [Func="mozilla::dom::DOMPrefs::PerformanceObserverEnabled",
  Constructor(PerformanceObserverCallback callback),
  Exposed=(Window,Worker)]
 interface PerformanceObserver {
-    void observe(PerformanceObserverInit options);
-    void disconnect();
+    undefined observe(PerformanceObserverInit options);
+    undefined disconnect();
     PerformanceEntryList takeRecords();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Performance.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Performance.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Performance.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Performance.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -43,8 +43,8 @@
 // http://www.w3.org/TR/resource-timing/#extensions-performance-interface
 [Exposed=(Window,Worker)]
 partial interface Performance {
-  void clearResourceTimings();
-  void setResourceTimingBufferSize(unsigned long maxSize);
+  undefined clearResourceTimings();
+  undefined setResourceTimingBufferSize(unsigned long maxSize);
   attribute EventHandler onresourcetimingbufferfull;
 };
 
@@ -52,9 +52,9 @@
 [Exposed=(Window,Worker)]
 partial interface Performance {
   [Throws]
-  void mark(DOMString markName);
-  void clearMarks(optional DOMString markName);
+  undefined mark(DOMString markName);
+  undefined clearMarks(optional DOMString markName);
   [Throws]
-  void measure(DOMString measureName, optional DOMString startMark, optional DOMString endMark);
-  void clearMeasures(optional DOMString measureName);
+  undefined measure(DOMString measureName, optional DOMString startMark, optional DOMString endMark);
+  undefined clearMeasures(optional DOMString measureName);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PluginArray.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PluginArray.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PluginArray.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PluginArray.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -14,5 +14,5 @@
   [NeedsCallerType]
   getter Plugin? namedItem(DOMString name);
 
-  void refresh(optional boolean reloadDocuments = false);
+  undefined refresh(optional boolean reloadDocuments = false);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PresentationConnection.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PresentationConnection.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/PresentationConnection.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/PresentationConnection.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -60,16 +60,16 @@
    * This function only works when the state is "connected".
    */
   [Throws]
-  void send(DOMString data);
+  undefined send(DOMString data);
 
   [Throws]
-  void send(Blob data);
+  undefined send(Blob data);
 
   [Throws]
-  void send(ArrayBuffer data);
+  undefined send(ArrayBuffer data);
 
   [Throws]
-  void send(ArrayBufferView data);
+  undefined send(ArrayBufferView data);
 
   /*
    * It is triggered when receiving messages.
@@ -83,7 +83,7 @@
    * This function only works when the state is "connected" or "connecting".
    */
   [Throws]
-  void close();
+  undefined close();
 
   /*
    * Both the controlling and receiving browsing context can terminate the
@@ -92,5 +92,5 @@
    * This function only works when the state is not "connected".
    */
    [Throws]
-   void terminate();
+   undefined terminate();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Promise.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Promise.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Promise.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Promise.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -7,7 +7,7 @@
  * Web IDL infrastructure.
  */
 
-callback PromiseJobCallback = void();
+callback PromiseJobCallback = undefined();
 
 [TreatNonCallableAsNull]
 callback AnyCallback = any (any value);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Range.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Range.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Range.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Range.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -27,23 +27,23 @@
   readonly attribute Node commonAncestorContainer;
 
   [Throws, BinaryName="setStartJS"]
-  void setStart(Node refNode, unsigned long offset);
+  undefined setStart(Node refNode, unsigned long offset);
   [Throws, BinaryName="setEndJS"]
-  void setEnd(Node refNode, unsigned long offset);
+  undefined setEnd(Node refNode, unsigned long offset);
   [Throws, BinaryName="setStartBeforeJS"]
-  void setStartBefore(Node refNode);
+  undefined setStartBefore(Node refNode);
   [Throws, BinaryName="setStartAfterJS"]
-  void setStartAfter(Node refNode);
+  undefined setStartAfter(Node refNode);
   [Throws, BinaryName="setEndBeforeJS"]
-  void setEndBefore(Node refNode);
+  undefined setEndBefore(Node refNode);
   [Throws, BinaryName="setEndAfterJS"]
-  void setEndAfter(Node refNode);
+  undefined setEndAfter(Node refNode);
   [BinaryName="collapseJS"]
-  void collapse(optional boolean toStart = false);
+  undefined collapse(optional boolean toStart = false);
   [Throws, BinaryName="selectNodeJS"]
-  void selectNode(Node refNode);
+  undefined selectNode(Node refNode);
   [Throws, BinaryName="selectNodeContentsJS"]
-  void selectNodeContents(Node refNode);
+  undefined selectNodeContents(Node refNode);
 
   const unsigned short START_TO_START = 0;
   const unsigned short START_TO_END = 1;
@@ -52,18 +52,18 @@
   [Throws]
   short compareBoundaryPoints(unsigned short how, Range sourceRange);
   [CEReactions, Throws]
-  void deleteContents();
+  undefined deleteContents();
   [CEReactions, Throws]
   DocumentFragment extractContents();
   [CEReactions, Throws]
   DocumentFragment cloneContents();
   [CEReactions, Throws]
-  void insertNode(Node node);
+  undefined insertNode(Node node);
   [CEReactions, Throws]
-  void surroundContents(Node newParent);
+  undefined surroundContents(Node newParent);
 
   Range cloneRange();
-  void detach();
+  undefined detach();
 
   [Throws]
   boolean isPointInRange(Node node, unsigned long offset);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ReadableStream.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ReadableStream.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ReadableStream.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ReadableStream.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -1,10 +1,47 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
  * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Source: https://streams.spec.whatwg.org/#rs-class-definition
  */
-
-// Minimum viable ReadableStream, for use by other objects.
-[Exposed=(Window,Worker)]
+ 
+[Exposed=(Window,Worker,Worklet), Transferable]
 interface ReadableStream {
+  constructor(optional object underlyingSource, optional QueuingStrategy strategy = {});
+
+  readonly attribute boolean locked;
+
+  Promise<undefined> cancel(optional any reason);
+  ReadableStreamReader getReader(optional ReadableStreamGetReaderOptions options = {});
+  ReadableStream pipeThrough(ReadableWritablePair transform, optional StreamPipeOptions options = {});
+  Promise<undefined> pipeTo(WritableStream destination, optional StreamPipeOptions options = {});
+  sequence<ReadableStream> tee();
+
+  async iterable<any>(optional ReadableStreamIteratorOptions options = {});
+};
+
+typedef (ReadableStreamDefaultReader or ReadableStreamBYOBReader) ReadableStreamReader;
+
+enum ReadableStreamReaderMode { "byob" };
+
+dictionary ReadableStreamGetReaderOptions {
+  ReadableStreamReaderMode mode;
+};
+
+dictionary ReadableStreamIteratorOptions {
+  boolean preventCancel = false;
+};
+
+dictionary ReadableWritablePair {
+  required ReadableStream readable;
+  required WritableStream writable;
+};
+
+dictionary StreamPipeOptions {
+  boolean preventClose = false;
+  boolean preventAbort = false;
+  boolean preventCancel = false;
+  AbortSignal signal;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Request.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Request.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Request.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Request.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -35,7 +35,7 @@
 
   // Bug 1124638 - Allow chrome callers to set the context.
   [ChromeOnly]
-  void overrideContentPolicyType(nsContentPolicyType context);
+  undefined overrideContentPolicyType(nsContentPolicyType context);
 };
 Request includes Body;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCDataChannel.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCDataChannel.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCDataChannel.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCDataChannel.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -26,16 +26,16 @@
   attribute EventHandler onopen;
   attribute EventHandler onerror;
   attribute EventHandler onclose;
-  void close();
+  undefined close();
   attribute EventHandler onmessage;
   attribute EventHandler onbufferedamountlow;
   attribute RTCDataChannelType binaryType;
   [Throws]
-  void send(DOMString data);
+  undefined send(DOMString data);
   [Throws]
-  void send(Blob data);
+  undefined send(Blob data);
   [Throws]
-  void send(ArrayBuffer data);
+  undefined send(ArrayBuffer data);
   [Throws]
-  void send(ArrayBufferView data);
+  undefined send(ArrayBufferView data);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCDTMFSender.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCDTMFSender.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCDTMFSender.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCDTMFSender.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -9,7 +9,7 @@
 
 [JSImplementation="@mozilla.org/dom/rtcdtmfsender;1"]
 interface RTCDTMFSender : EventTarget {
-    void insertDTMF(DOMString tones,
+    undefined insertDTMF(DOMString tones,
                     optional unsigned long duration = 100,
                     optional unsigned long interToneGap = 70);
              attribute EventHandler  ontonechange;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCIdentityProvider.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCIdentityProvider.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCIdentityProvider.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCIdentityProvider.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -8,7 +8,7 @@
 
 [NoInterfaceObject]
 interface RTCIdentityProviderRegistrar {
-  void register(RTCIdentityProvider idp);
+  undefined register(RTCIdentityProvider idp);
 
   /* Whether an IdP was passed to register() to chrome code. */
   [ChromeOnly]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCPeerConnectionStatic.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCPeerConnectionStatic.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCPeerConnectionStatic.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCPeerConnectionStatic.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -19,7 +19,7 @@
     "iceconnectionstatechange"
 };
 
-callback PeerConnectionLifecycleCallback = void (RTCPeerConnection pc,
+callback PeerConnectionLifecycleCallback = undefined (RTCPeerConnection pc,
                                                  unsigned long long windowId,
                                                  RTCLifecycleEvent eventType);
 
@@ -33,7 +33,7 @@
      automatically unregistered when window goes away.
      Fires when a PC is created, and whenever the ICE connection state or
      gathering state changes. */
-  void registerPeerConnectionLifecycleCallback(
+  undefined registerPeerConnectionLifecycleCallback(
     PeerConnectionLifecycleCallback cb);
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCPeerConnection.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCPeerConnection.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCPeerConnection.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCPeerConnection.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -7,9 +7,9 @@
  * http://w3c.github.io/webrtc-pc/#interface-definition
  */
 
-callback RTCSessionDescriptionCallback = void (RTCSessionDescriptionInit description);
-callback RTCPeerConnectionErrorCallback = void (DOMException error);
-callback RTCStatsCallback = void (RTCStatsReport report);
+callback RTCSessionDescriptionCallback = undefined (RTCSessionDescriptionInit description);
+callback RTCPeerConnectionErrorCallback = undefined (DOMException error);
+callback RTCStatsCallback = undefined (RTCStatsReport report);
 
 enum RTCSignalingState {
     "stable",
@@ -70,14 +70,14 @@
   static Promise<RTCCertificate> generateCertificate (AlgorithmIdentifier keygenAlgorithm);
 
   [Pref="media.peerconnection.identity.enabled"]
-  void setIdentityProvider (DOMString provider,
+  undefined setIdentityProvider (DOMString provider,
                             optional RTCIdentityProviderOptions options);
   [Pref="media.peerconnection.identity.enabled"]
   Promise<DOMString> getIdentityAssertion();
   Promise<RTCSessionDescriptionInit> createOffer (optional RTCOfferOptions options);
   Promise<RTCSessionDescriptionInit> createAnswer (optional RTCAnswerOptions options);
-  Promise<void> setLocalDescription (RTCSessionDescriptionInit description);
-  Promise<void> setRemoteDescription (RTCSessionDescriptionInit description);
+  Promise<undefined> setLocalDescription (RTCSessionDescriptionInit description);
+  Promise<undefined> setRemoteDescription (RTCSessionDescriptionInit description);
   readonly attribute RTCSessionDescription? localDescription;
   readonly attribute RTCSessionDescription? currentLocalDescription;
   readonly attribute RTCSessionDescription? pendingLocalDescription;
@@ -85,7 +85,7 @@
   readonly attribute RTCSessionDescription? currentRemoteDescription;
   readonly attribute RTCSessionDescription? pendingRemoteDescription;
   readonly attribute RTCSignalingState signalingState;
-  Promise<void> addIceCandidate ((RTCIceCandidateInit or RTCIceCandidate)? candidate);
+  Promise<undefined> addIceCandidate ((RTCIceCandidateInit or RTCIceCandidate)? candidate);
   readonly attribute boolean? canTrickleIceCandidates;
   readonly attribute RTCIceGatheringState iceGatheringState;
   readonly attribute RTCIceConnectionState iceConnectionState;
@@ -102,7 +102,7 @@
   sequence<MediaStream> getLocalStreams ();
   [Deprecated="RTCPeerConnectionGetStreams"]
   sequence<MediaStream> getRemoteStreams ();
-  void addStream (MediaStream stream);
+  undefined addStream (MediaStream stream);
 
   // replaces addStream; fails if already added
   // because a track can be part of multiple streams, stream parameters
@@ -111,7 +111,7 @@
   RTCRtpSender addTrack(MediaStreamTrack track,
                         MediaStream stream,
                         MediaStream... moreStreams);
-  void removeTrack(RTCRtpSender sender);
+  undefined removeTrack(RTCRtpSender sender);
 
   RTCRtpTransceiver addTransceiver((MediaStreamTrack or DOMString) trackOrKind,
                                    optional RTCRtpTransceiverInit init);
@@ -120,7 +120,7 @@
   sequence<RTCRtpReceiver> getReceivers();
   sequence<RTCRtpTransceiver> getTransceivers();
 
-  void close ();
+  undefined close ();
   attribute EventHandler onnegotiationneeded;
   attribute EventHandler onicecandidate;
   attribute EventHandler onsignalingstatechange;
@@ -143,24 +143,24 @@
 
 partial interface RTCPeerConnection {
 
-  // Dummy Promise<void> return values avoid "WebIDL.WebIDLError: error:
+  // Dummy Promise<undefined> return values avoid "WebIDL.WebIDLError: error:
   // We have overloads with both Promise and non-Promise return types"
 
-  Promise<void> createOffer (RTCSessionDescriptionCallback successCallback,
+  Promise<undefined> createOffer (RTCSessionDescriptionCallback successCallback,
                              RTCPeerConnectionErrorCallback failureCallback,
                              optional RTCOfferOptions options);
-  Promise<void> createAnswer (RTCSessionDescriptionCallback successCallback,
+  Promise<undefined> createAnswer (RTCSessionDescriptionCallback successCallback,
                               RTCPeerConnectionErrorCallback failureCallback);
-  Promise<void> setLocalDescription (RTCSessionDescriptionInit description,
+  Promise<undefined> setLocalDescription (RTCSessionDescriptionInit description,
                                      VoidFunction successCallback,
                                      RTCPeerConnectionErrorCallback failureCallback);
-  Promise<void> setRemoteDescription (RTCSessionDescriptionInit description,
+  Promise<undefined> setRemoteDescription (RTCSessionDescriptionInit description,
                                       VoidFunction successCallback,
                                       RTCPeerConnectionErrorCallback failureCallback);
-  Promise<void> addIceCandidate (RTCIceCandidate candidate,
+  Promise<undefined> addIceCandidate (RTCIceCandidate candidate,
                                  VoidFunction successCallback,
                                  RTCPeerConnectionErrorCallback failureCallback);
-  Promise<void> getStats (MediaStreamTrack? selector,
+  Promise<undefined> getStats (MediaStreamTrack? selector,
                           RTCStatsCallback successCallback,
                           RTCPeerConnectionErrorCallback failureCallback);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpReceiver.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpReceiver.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpReceiver.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpReceiver.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,11 +18,11 @@
   sequence<RTCRtpSynchronizationSource> getSynchronizationSources();
 
   [ChromeOnly]
-  void setStreamIds(sequence<DOMString> streamIds);
+  undefined setStreamIds(sequence<DOMString> streamIds);
   [ChromeOnly]
-  void setRemoteSendBit(boolean sendBit);
+  undefined setRemoteSendBit(boolean sendBit);
   [ChromeOnly]
-  void processTrackAdditionsAndRemovals(
+  undefined processTrackAdditionsAndRemovals(
       RTCRtpTransceiver transceiver,
       object postProcessing);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpSender.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpSender.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpSender.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpSender.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -70,9 +70,9 @@
  JSImplementation="@mozilla.org/dom/rtpsender;1"]
 interface RTCRtpSender {
   readonly attribute MediaStreamTrack? track;
-  Promise<void> setParameters (optional RTCRtpParameters parameters);
+  Promise<undefined> setParameters (optional RTCRtpParameters parameters);
   RTCRtpParameters getParameters();
-  Promise<void> replaceTrack(MediaStreamTrack? withTrack);
+  Promise<undefined> replaceTrack(MediaStreamTrack? withTrack);
   Promise<RTCStatsReport> getStats();
   [Pref="media.peerconnection.dtmf.enabled"]
   readonly attribute RTCDTMFSender? dtmf;
@@ -80,9 +80,9 @@
   [ChromeOnly]
   sequence<MediaStream> getStreams();
   [ChromeOnly]
-  void setStreams(sequence<MediaStream> streams);
+  undefined setStreams(sequence<MediaStream> streams);
   [ChromeOnly]
-  void setTrack(MediaStreamTrack? track);
+  undefined setTrack(MediaStreamTrack? track);
   [ChromeOnly]
-  void checkWasCreatedByPc(RTCPeerConnection pc);
+  undefined checkWasCreatedByPc(RTCPeerConnection pc);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpTransceiver.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpTransceiver.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpTransceiver.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/RTCRtpTransceiver.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -33,12 +33,12 @@
              attribute RTCRtpTransceiverDirection  direction;
     readonly attribute RTCRtpTransceiverDirection? currentDirection;
 
-    void stop();
+    undefined stop();
     // TODO: bug 1396922
-    // void setCodecPreferences(sequence<RTCRtpCodecCapability> codecs);
+    // undefined setCodecPreferences(sequence<RTCRtpCodecCapability> codecs);
 
     [ChromeOnly]
-    void setRemoteTrackId(DOMString trackId);
+    undefined setRemoteTrackId(DOMString trackId);
     [ChromeOnly]
     boolean remoteTrackIdIs(DOMString trackId);
 
@@ -47,31 +47,31 @@
     DOMString getRemoteTrackId();
 
     [ChromeOnly]
-    void setAddTrackMagic();
+    undefined setAddTrackMagic();
     [ChromeOnly]
     readonly attribute boolean addTrackMagic;
     [ChromeOnly]
     attribute boolean shouldRemove;
     [ChromeOnly]
-    void setCurrentDirection(RTCRtpTransceiverDirection direction);
+    undefined setCurrentDirection(RTCRtpTransceiverDirection direction);
     [ChromeOnly]
-    void setDirectionInternal(RTCRtpTransceiverDirection direction);
+    undefined setDirectionInternal(RTCRtpTransceiverDirection direction);
     [ChromeOnly]
-    void setMid(DOMString mid);
+    undefined setMid(DOMString mid);
     [ChromeOnly]
-    void unsetMid();
+    undefined unsetMid();
     [ChromeOnly]
-    void setStopped();
+    undefined setStopped();
 
     [ChromeOnly]
     DOMString getKind();
     [ChromeOnly]
     boolean hasBeenUsedToSend();
     [ChromeOnly]
-    void sync();
+    undefined sync();
 
     [ChromeOnly]
-    void insertDTMF(DOMString tones,
+    undefined insertDTMF(DOMString tones,
                     optional unsigned long duration = 100,
                     optional unsigned long interToneGap = 70);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScreenOrientation.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScreenOrientation.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScreenOrientation.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScreenOrientation.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -30,9 +30,9 @@
 
 interface ScreenOrientation : EventTarget {
   [Throws]
-  Promise<void> lock(OrientationLockType orientation);
+  Promise<undefined> lock(OrientationLockType orientation);
   [Throws]
-  void unlock();
+  undefined unlock();
   [Throws, NeedsCallerType]
   readonly attribute OrientationType type;
   [Throws, NeedsCallerType]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScrollAreaEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScrollAreaEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScrollAreaEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScrollAreaEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
   readonly attribute float width;
   readonly attribute float height;
 
-  void initScrollAreaEvent(DOMString type,
+  undefined initScrollAreaEvent(DOMString type,
                            optional boolean canBubble = false,
                            optional boolean cancelable = false,
                            optional Window? view = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScrollBoxObject.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScrollBoxObject.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScrollBoxObject.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ScrollBoxObject.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -14,18 +14,18 @@
    * Values will be clamped to legal values.
    */
   [Throws]
-  void scrollTo(long x, long y);
+  undefined scrollTo(long x, long y);
 
   /**
    * Scroll the given amount of device pixels to the right and down.
    * Values will be clamped to make the resuling position legal.
    */
   [Throws]
-  void scrollBy(long dx, long dy);
+  undefined scrollBy(long dx, long dy);
   [Throws]
-  void scrollByIndex(long dindexes);
+  undefined scrollByIndex(long dindexes);
   [Throws]
-  void scrollToElement(Element child);
+  undefined scrollToElement(Element child);
 
   /**
    * Get the current scroll position in css pixels.
@@ -41,5 +41,5 @@
   readonly attribute long scrolledHeight;
 
   [Throws]
-  void ensureElementIsVisible(Element child);
+  undefined ensureElementIsVisible(Element child);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Selection.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Selection.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Selection.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Selection.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -31,38 +31,38 @@
    * Adds a range to the current selection.
    */
   [Throws, BinaryName="addRangeJS"]
-  void      addRange(Range range);
+  undefined      addRange(Range range);
   /**
    * Removes a range from the current selection.
    */
   [Throws]
-  void      removeRange(Range range);
+  undefined      removeRange(Range range);
   /**
    * Removes all ranges from the current selection.
    */
   [Throws]
-  void      removeAllRanges();
+  undefined      removeAllRanges();
   [Throws, BinaryName="RemoveAllRanges"]
-  void      empty();
+  undefined      empty();
   [Throws, BinaryName="collapseJS"]
-  void      collapse(Node? node, optional unsigned long offset = 0);
+  undefined      collapse(Node? node, optional unsigned long offset = 0);
   [Throws, BinaryName="collapseJS"]
-  void      setPosition(Node? node, optional unsigned long offset = 0);
+  undefined      setPosition(Node? node, optional unsigned long offset = 0);
   [Throws, BinaryName="collapseToStartJS"]
-  void      collapseToStart();
+  undefined      collapseToStart();
   [Throws, BinaryName="collapseToEndJS"]
-  void      collapseToEnd();
+  undefined      collapseToEnd();
   [Throws, BinaryName="extendJS"]
-  void      extend(Node node, optional unsigned long offset = 0);
+  undefined      extend(Node node, optional unsigned long offset = 0);
   [Throws, BinaryName="setBaseAndExtentJS"]
-  void      setBaseAndExtent(Node anchorNode,
+  undefined      setBaseAndExtent(Node anchorNode,
                              unsigned long anchorOffset,
                              Node focusNode,
                              unsigned long focusOffset);
   [Throws, BinaryName="selectAllChildrenJS"]
-  void      selectAllChildren(Node node);
+  undefined      selectAllChildren(Node node);
   [CEReactions, Throws]
-  void      deleteFromDocument();
+  undefined      deleteFromDocument();
   [Throws]
   boolean   containsNode(Node node,
                          optional boolean allowPartialContainment = false);
@@ -72,7 +72,7 @@
 // Additional methods not currently in the spec
 partial interface Selection {
   [Throws]
-  void modify(DOMString alter, DOMString direction,
+  undefined modify(DOMString alter, DOMString direction,
               DOMString granularity);
 };
 
@@ -93,9 +93,9 @@
   [ChromeOnly,Throws]
   DOMString  toStringWithFormat(DOMString formatType, unsigned long flags, long wrapColumn);
   [ChromeOnly]
-  void  addSelectionListener(nsISelectionListener newListener);
+  undefined  addSelectionListener(nsISelectionListener newListener);
   [ChromeOnly]
-  void  removeSelectionListener(nsISelectionListener listenerToRemove);
+  undefined  removeSelectionListener(nsISelectionListener listenerToRemove);
 
   [ChromeOnly,BinaryName="rawType"]
   readonly attribute short selectionType;
@@ -121,7 +121,7 @@
    * @param aHPercent how to align the frame horizontally.
    */
   [ChromeOnly,Throws]
-  void scrollIntoView(short aRegion, boolean aIsSynchronous, short aVPercent, short aHPercent);
+  undefined scrollIntoView(short aRegion, boolean aIsSynchronous, short aVPercent, short aHPercent);
 
   /**
    * setColors() sets custom colors for the selection.
@@ -144,12 +144,12 @@
    *                             selection.
    */
   [ChromeOnly,Throws]
-  void setColors(DOMString aForegroundColor, DOMString aBackgroundColor,
+  undefined setColors(DOMString aForegroundColor, DOMString aBackgroundColor,
                  DOMString aAltForegroundColor, DOMString aAltBackgroundColor);
 
   /**
    * resetColors() forget the customized colors which were set by setColors().
    */
   [ChromeOnly,Throws]
-  void resetColors();
+  undefined resetColors();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorkerGlobalScope.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorkerGlobalScope.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorkerGlobalScope.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorkerGlobalScope.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
   [SameObject] readonly attribute ServiceWorkerRegistration registration;
 
   [Throws, NewObject]
-  Promise<void> skipWaiting();
+  Promise<undefined> skipWaiting();
 
   attribute EventHandler oninstall;
   attribute EventHandler onactivate;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorkerRegistration.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorkerRegistration.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorkerRegistration.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorkerRegistration.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -21,7 +21,7 @@
   readonly attribute ServiceWorkerUpdateViaCache updateViaCache;
 
   [Throws, NewObject]
-  Promise<void> update();
+  Promise<undefined> update();
 
   [Throws, NewObject]
   Promise<boolean> unregister();
@@ -45,7 +45,7 @@
 // https://notifications.spec.whatwg.org/
 partial interface ServiceWorkerRegistration {
   [Throws, Func="mozilla::dom::DOMPrefs::NotificationEnabledInServiceWorkers"]
-  Promise<void> showNotification(DOMString title, optional NotificationOptions options);
+  Promise<undefined> showNotification(DOMString title, optional NotificationOptions options);
   [Throws, Func="mozilla::dom::DOMPrefs::NotificationEnabledInServiceWorkers"]
   Promise<sequence<Notification>> getNotifications(optional GetNotificationOptions filter);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorker.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorker.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorker.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/ServiceWorker.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
   attribute EventHandler onstatechange;
 
   [Throws]
-  void postMessage(any message, optional sequence<object> transferable = []);
+  undefined postMessage(any message, optional sequence<object> transferable = []);
 };
 
 ServiceWorker includes AbstractWorker;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SharedWorkerGlobalScope.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SharedWorkerGlobalScope.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SharedWorkerGlobalScope.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SharedWorkerGlobalScope.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,7 +18,7 @@
   [Replaceable]
   readonly attribute DOMString name;
 
-  void close();
+  undefined close();
 
   attribute EventHandler onconnect;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SourceBuffer.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SourceBuffer.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SourceBuffer.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SourceBuffer.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -37,27 +37,27 @@
   attribute EventHandler onerror;
   attribute EventHandler onabort;
   [Throws]
-  void appendBuffer(ArrayBuffer data);
+  undefined appendBuffer(ArrayBuffer data);
   [Throws]
-  void appendBuffer(ArrayBufferView data);
+  undefined appendBuffer(ArrayBufferView data);
   // Experimental function as proposed in:
   // https://github.com/w3c/media-source/issues/100 for promise proposal.
   [Throws, Func="mozilla::dom::MediaSource::ExperimentalEnabled"]
-  Promise<void> appendBufferAsync(ArrayBuffer data);
+  Promise<undefined> appendBufferAsync(ArrayBuffer data);
   [Throws, Func="mozilla::dom::MediaSource::ExperimentalEnabled"]
-  Promise<void> appendBufferAsync(ArrayBufferView data);
+  Promise<undefined> appendBufferAsync(ArrayBufferView data);
   //[Throws]
-  //void appendStream(Stream stream, [EnforceRange] optional unsigned long long maxSize);
+  //undefined appendStream(Stream stream, [EnforceRange] optional unsigned long long maxSize);
   [Throws]
-  void abort();
+  undefined abort();
   [Throws]
-  void remove(double start, unrestricted double end);
+  undefined remove(double start, unrestricted double end);
   // Experimental function as proposed in:
   // https://github.com/w3c/media-source/issues/100 for promise proposal.
   [Throws, Func="mozilla::dom::MediaSource::ExperimentalEnabled"]
-  Promise<void> removeAsync(double start, unrestricted double end);
+  Promise<undefined> removeAsync(double start, unrestricted double end);
   // Experimental function as proposed in:
   // https://github.com/w3c/media-source/issues/155
   [Throws, Func="mozilla::dom::MediaSource::ExperimentalEnabled"]
-  void changeType(DOMString type);
+  undefined changeType(DOMString type);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechGrammarList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechGrammarList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechGrammarList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechGrammarList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -17,7 +17,7 @@
     [Throws]
     getter SpeechGrammar item(unsigned long index);
     [Throws]
-    void addFromURI(DOMString src, optional float weight);
+    undefined addFromURI(DOMString src, optional float weight);
     [Throws]
-    void addFromString(DOMString string, optional float weight);
+    undefined addFromString(DOMString string, optional float weight);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechRecognition.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechRecognition.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechRecognition.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechRecognition.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -26,9 +26,9 @@
 
     // methods to drive the speech interaction
     [Throws, NeedsCallerType]
-    void start(optional MediaStream stream);
-    void stop();
-    void abort();
+    undefined start(optional MediaStream stream);
+    undefined stop();
+    undefined abort();
 
     // event methods
     attribute EventHandler onaudiostart;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechSynthesis.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechSynthesis.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechSynthesis.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SpeechSynthesis.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -16,15 +16,15 @@
   readonly attribute boolean speaking;
   readonly attribute boolean paused;
 
-  void speak(SpeechSynthesisUtterance utterance);
-  void cancel();
-  void pause();
-  void resume();
+  undefined speak(SpeechSynthesisUtterance utterance);
+  undefined cancel();
+  undefined pause();
+  undefined resume();
   sequence<SpeechSynthesisVoice> getVoices();
 
   attribute EventHandler onvoiceschanged;
 
   [ChromeOnly]
   // Force an utterance to end. Circumvents bad speech service implementations.
-  void forceEnd();
+  undefined forceEnd();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/StorageEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/StorageEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/StorageEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/StorageEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
   readonly attribute Storage? storageArea;
 
   // Bug 1016053 - This is not spec compliant.
-  void initStorageEvent(DOMString type,
+  undefined initStorageEvent(DOMString type,
                         optional boolean canBubble = false,
                         optional boolean cancelable = false,
                         optional DOMString? key = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Storage.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Storage.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Storage.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Storage.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -22,13 +22,13 @@
   getter DOMString? getItem(DOMString key);
 
   [Throws, NeedsSubjectPrincipal]
-  setter void setItem(DOMString key, DOMString value);
+  setter undefined setItem(DOMString key, DOMString value);
 
   [Throws, NeedsSubjectPrincipal]
-  deleter void removeItem(DOMString key);
+  deleter undefined removeItem(DOMString key);
 
   [Throws, NeedsSubjectPrincipal]
-  void clear();
+  undefined clear();
 
   [ChromeOnly]
   readonly attribute boolean isSessionOnly;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGAngle.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGAngle.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGAngle.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGAngle.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -28,8 +28,8 @@
            attribute DOMString valueAsString;
 
   [Throws]
-  void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
+  undefined newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
   [Throws]
-  void convertToSpecifiedUnits(unsigned short unitType);
+  undefined convertToSpecifiedUnits(unsigned short unitType);
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGAnimationElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGAnimationElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGAnimationElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGAnimationElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -21,13 +21,13 @@
   float getSimpleDuration();
 
   [Throws]
-  void beginElement();
+  undefined beginElement();
   [Throws]
-  void beginElementAt(float offset);
+  undefined beginElementAt(float offset);
   [Throws]
-  void endElement();
+  undefined endElement();
   [Throws]
-  void endElementAt(float offset);
+  undefined endElementAt(float offset);
 };
 
 SVGAnimationElement includes SVGTests;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -24,8 +24,8 @@
 
   [SetterThrows, Pure]
         attribute long tabIndex;
-  [Throws] void focus();
-  [Throws] void blur();
+  [Throws] undefined focus();
+  [Throws] undefined blur();
 };
 
 SVGElement includes GlobalEventHandlers;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGFEDropShadowElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGFEDropShadowElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGFEDropShadowElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGFEDropShadowElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,7 @@
   [Constant]
   readonly attribute SVGAnimatedNumber stdDeviationY;
 
-  void setStdDeviation(float stdDeviationX, float stdDeviationY);
+  undefined setStdDeviation(float stdDeviationX, float stdDeviationY);
 };
 
 SVGFEDropShadowElement includes SVGFilterPrimitiveStandardAttributes;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGFEGaussianBlurElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGFEGaussianBlurElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGFEGaussianBlurElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGFEGaussianBlurElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,7 +18,7 @@
   [Constant]
   readonly attribute SVGAnimatedNumber stdDeviationY;
 
-  void setStdDeviation(float stdDeviationX, float stdDeviationY);
+  undefined setStdDeviation(float stdDeviationX, float stdDeviationY);
 };
 
 SVGFEGaussianBlurElement includes SVGFilterPrimitiveStandardAttributes;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGLengthList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGLengthList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGLengthList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGLengthList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 interface SVGLengthList {
   readonly attribute unsigned long numberOfItems;
   [Throws]
-  void clear();
+  undefined clear();
   [Throws]
   SVGLength initialize(SVGLength newItem);
   [Throws]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGLength.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGLength.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGLength.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGLength.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
            attribute DOMString valueAsString;
 
   [Throws]
-  void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
+  undefined newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
   [Throws]
-  void convertToSpecifiedUnits(unsigned short unitType);
+  undefined convertToSpecifiedUnits(unsigned short unitType);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGMarkerElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGMarkerElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGMarkerElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGMarkerElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -37,9 +37,9 @@
   [Constant]
   readonly attribute SVGAnimatedAngle orientAngle;
 
-  void setOrientToAuto();
+  undefined setOrientToAuto();
   [Throws]
-  void setOrientToAngle(SVGAngle angle);
+  undefined setOrientToAngle(SVGAngle angle);
 };
 
 SVGMarkerElement includes SVGFitToViewBox;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGNumberList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGNumberList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGNumberList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGNumberList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 interface SVGNumberList {
   readonly attribute unsigned long numberOfItems;
   [Throws]
-  void clear();
+  undefined clear();
   [Throws]
   SVGNumber initialize(SVGNumber newItem);
   [Throws]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGPointList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGPointList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGPointList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGPointList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 interface SVGPointList {
   readonly attribute unsigned long numberOfItems;
   [Throws]
-  void clear();
+  undefined clear();
   [Throws]
   SVGPoint initialize(SVGPoint newItem);
   [Throws]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGStringList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGStringList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGStringList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGStringList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,7 @@
   readonly attribute unsigned long length;
   readonly attribute unsigned long numberOfItems;
 
-  void clear();
+  undefined clear();
   [Throws]
   DOMString initialize(DOMString newItem);
   [Throws]
@@ -28,5 +28,5 @@
   DOMString removeItem(unsigned long index);
   [Throws]
   DOMString appendItem(DOMString newItem);
-  //setter void (unsigned long index, DOMString newItem);
+  //setter undefined (unsigned long index, DOMString newItem);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGSVGElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGSVGElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGSVGElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGSVGElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -33,21 +33,21 @@
   [DependsOn=Nothing, Affects=Nothing]
   unsigned long suspendRedraw(unsigned long maxWaitMilliseconds);
   [DependsOn=Nothing, Affects=Nothing]
-  void unsuspendRedraw(unsigned long suspendHandleID);
+  undefined unsuspendRedraw(unsigned long suspendHandleID);
   [DependsOn=Nothing, Affects=Nothing]
-  void unsuspendRedrawAll();
+  undefined unsuspendRedrawAll();
   [DependsOn=Nothing, Affects=Nothing]
-  void forceRedraw();
-  void pauseAnimations();
-  void unpauseAnimations();
+  undefined forceRedraw();
+  undefined pauseAnimations();
+  undefined unpauseAnimations();
   boolean animationsPaused();
   float getCurrentTime();
-  void setCurrentTime(float seconds);
+  undefined setCurrentTime(float seconds);
   // NodeList getIntersectionList(SVGRect rect, SVGElement referenceElement);
   // NodeList getEnclosureList(SVGRect rect, SVGElement referenceElement);
   // boolean checkIntersection(SVGElement element, SVGRect rect);
   // boolean checkEnclosure(SVGElement element, SVGRect rect);
-  void deselectAll();
+  undefined deselectAll();
   [NewObject]
   SVGNumber createSVGNumber();
   [NewObject]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTextContentElement.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTextContentElement.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTextContentElement.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTextContentElement.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -36,7 +36,7 @@
   float getRotationOfChar(unsigned long charnum);
   long getCharNumAtPosition(SVGPoint point);
   [Throws]
-  void selectSubString(unsigned long charnum, unsigned long nchars);
+  undefined selectSubString(unsigned long charnum, unsigned long nchars);
 };
 
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTransformList.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTransformList.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTransformList.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTransformList.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 interface SVGTransformList {
   readonly attribute unsigned long numberOfItems;
   [Throws]
-  void clear();
+  undefined clear();
   [Throws]
   SVGTransform initialize(SVGTransform newItem);
   [Throws]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTransform.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTransform.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTransform.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/SVGTransform.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -26,16 +26,16 @@
   readonly attribute float angle;
 
   [Throws]
-  void setMatrix(SVGMatrix matrix);
+  undefined setMatrix(SVGMatrix matrix);
   [Throws]
-  void setTranslate(float tx, float ty);
+  undefined setTranslate(float tx, float ty);
   [Throws]
-  void setScale(float sx, float sy);
+  undefined setScale(float sx, float sy);
   [Throws]
-  void setRotate(float angle, float cx, float cy);
+  undefined setRotate(float angle, float cx, float cy);
   [Throws]
-  void setSkewX(float angle);
+  undefined setSkewX(float angle);
   [Throws]
-  void setSkewY(float angle);
+  undefined setSkewY(float angle);
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TCPServerSocket.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TCPServerSocket.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TCPServerSocket.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TCPServerSocket.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -38,5 +38,5 @@
   /**
    * Close the server socket.
    */
-  void close();
+  undefined close();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TCPSocket.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TCPSocket.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TCPSocket.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TCPSocket.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -34,7 +34,7 @@
   /**
    * Upgrade an insecure connection to use TLS. Throws if the ready state is not OPEN.
    */
-  [Throws] void upgradeToSecure();
+  [Throws] undefined upgradeToSecure();
 
   /**
    * The UTF16 host of this socket object.
@@ -61,7 +61,7 @@
    * Pause reading incoming data and invocations of the ondata handler until
    * resume is called. Can be called multiple times without resuming.
    */
-  void suspend();
+  undefined suspend();
 
   /**
    * Resume reading incoming data and invoking ondata as usual. There must be
@@ -69,17 +69,17 @@
    * socket is not suspended.
    */
   [Throws]
-  void resume();
+  undefined resume();
 
   /**
    * Close the socket.
    */
-  void close();
+  undefined close();
 
   /**
    * Close the socket immediately without waiting for unsent data.
    */
-  [ChromeOnly] void closeImmediately();
+  [ChromeOnly] undefined closeImmediately();
 
   /**
    * Write data to the socket.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TextTrack.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TextTrack.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TextTrack.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TextTrack.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -34,9 +34,9 @@
   readonly attribute TextTrackCueList? cues;
   readonly attribute TextTrackCueList? activeCues;
 
-  void addCue(VTTCue cue);
+  undefined addCue(VTTCue cue);
   [Throws]
-  void removeCue(VTTCue cue);
+  undefined removeCue(VTTCue cue);
 
            attribute EventHandler oncuechange;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TimeEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TimeEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TimeEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TimeEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -14,7 +14,7 @@
 {
   readonly attribute long         detail;
   readonly attribute WindowProxy? view;
-  void initTimeEvent(DOMString aType,
+  undefined initTimeEvent(DOMString aType,
                      optional Window? aView = null,
                      optional long aDetail = 0);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TouchEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TouchEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TouchEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TouchEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -22,7 +22,7 @@
   readonly attribute boolean ctrlKey;
   readonly attribute boolean shiftKey;
 
-  void initTouchEvent(DOMString type,
+  undefined initTouchEvent(DOMString type,
                       optional boolean canBubble = false,
                       optional boolean cancelable = false,
                       optional Window? view = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TransceiverImpl.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TransceiverImpl.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TransceiverImpl.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TransceiverImpl.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -18,6 +18,6 @@
 interface TransceiverImpl {
   MediaStreamTrack getReceiveTrack();
   [Throws]
-  void syncWithJS(RTCRtpTransceiver transceiver);
+  undefined syncWithJS(RTCRtpTransceiver transceiver);
 };
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TreeBoxObject.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TreeBoxObject.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TreeBoxObject.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TreeBoxObject.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -70,25 +70,25 @@
   /**
    * Ensures that a row at a given index is visible.
    */
-  void ensureRowIsVisible(long index);
+  undefined ensureRowIsVisible(long index);
 
   /**
    * Ensures that a given cell in the tree is visible.
    */
   [Throws]
-  void ensureCellIsVisible(long row, TreeColumn? col);
+  undefined ensureCellIsVisible(long row, TreeColumn? col);
 
   /**
    * Scrolls such that the row at index is at the top of the visible view.
    */
-  void scrollToRow(long index);
+  undefined scrollToRow(long index);
 
   /**
    * Scroll the tree up or down by numLines lines. Positive
    * values move down in the tree. Prevents scrolling off the
    * end of the tree.
    */
-  void scrollByLines(long numLines);
+  undefined scrollByLines(long numLines);
 
   /**
    * Scroll the tree up or down by numPages pages. A page
@@ -96,16 +96,16 @@
    * Positive values move down in the tree. Prevents scrolling
    * off the end of the tree.
    */
-  void scrollByPages(long numPages);
+  undefined scrollByPages(long numPages);
 
   /**
    * Invalidation methods for fine-grained painting control.
    */
-  void invalidate();
-  void invalidateColumn(TreeColumn? col);
-  void invalidateRow(long index);
-  void invalidateCell(long row, TreeColumn? col);
-  void invalidateRange(long startIndex, long endIndex);
+  undefined invalidate();
+  undefined invalidateColumn(TreeColumn? col);
+  undefined invalidateRow(long index);
+  undefined invalidateCell(long row, TreeColumn? col);
+  undefined invalidateRange(long startIndex, long endIndex);
 
   /**
    * A hit test that can tell you what row the mouse is over.
@@ -133,7 +133,7 @@
    * DEPRECATED: please use above version
    */
   [Throws]
-  void getCellAt(long x, long y, object row, object column, object childElt);
+  undefined getCellAt(long x, long y, object row, object column, object childElt);
 
   /**
    * Find the coordinates of an element within a specific cell.
@@ -145,7 +145,7 @@
    * DEPRECATED: Please use above version
    */
   [Throws]
-  void getCoordsForCellItem(long row, TreeColumn col, DOMString element,
+  undefined getCoordsForCellItem(long row, TreeColumn col, DOMString element,
                             object x, object y, object width, object height);
 
   /**
@@ -160,7 +160,7 @@
    * rows were added or at which rows were removed.  For
    * non-contiguous additions/removals, this method should be called multiple times.
    */
-  void rowCountChanged(long index, long count);
+  undefined rowCountChanged(long index, long count);
 
   /**
    * Notify the tree that the view is about to perform a batch
@@ -168,21 +168,21 @@
    * This must be followed by calling endUpdateBatch(), otherwise the tree
    * will get out of sync.
    */
-  void beginUpdateBatch();
+  undefined beginUpdateBatch();
 
   /**
    * Notify the tree that the view has completed a batch update.
    */
-  void endUpdateBatch();
+  undefined endUpdateBatch();
 
   /**
    * Called on a theme switch to flush out the tree's style and image caches.
    */
-  void clearStyleAndImageCaches();
+  undefined clearStyleAndImageCaches();
 
   /**
    * Remove an image source from the image cache to allow its invalidation.
    */
   [Throws]
-  void removeImageCacheEntry(long row, TreeColumn col);
+  undefined removeImageCacheEntry(long row, TreeColumn col);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TreeView.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TreeView.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/TreeView.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/TreeView.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -88,7 +88,7 @@
    * specifies before/on/after the given |row|.
    */
   [Throws]
-  void drop(long row, long orientation, DataTransfer? dataTransfer);
+  undefined drop(long row, long orientation, DataTransfer? dataTransfer);
 
   /**
    * Methods used by the tree to draw thread lines in the tree.
@@ -141,29 +141,29 @@
    * Called during initialization to link the view to the front end box object.
    */
   [Throws]
-  void setTree(TreeBoxObject? tree);
+  undefined setTree(TreeBoxObject? tree);
   
   /**
    * Called on the view when an item is opened or closed.
    */
   [Throws]
-  void toggleOpenState(long row);
+  undefined toggleOpenState(long row);
 
   /**
    * Called on the view when a header is clicked.
    */
   [Throws]
-  void cycleHeader(TreeColumn column);
+  undefined cycleHeader(TreeColumn column);
 
   /**
    * Should be called from a XUL onselect handler whenever the selection changes.
    */
-  void selectionChanged();
+  undefined selectionChanged();
 
   /**
    * Called on the view when a cell in a non-selectable cycling column (e.g., unread/flag/etc.) is clicked.
    */
-  void cycleCell(long row, TreeColumn column);
+  undefined cycleCell(long row, TreeColumn column);
   
   /**
    * isEditable is called to ask the view if the cell contents are editable.
@@ -186,28 +186,28 @@
    * This method is only called for columns of type other than |text|.
    */
   [Throws]
-  void setCellValue(long row, TreeColumn column, DOMString value);
+  undefined setCellValue(long row, TreeColumn column, DOMString value);
 
   /**
    * setCellText is called when the contents of the cell have been edited by the user.
    */   
   [Throws]
-  void setCellText(long row, TreeColumn column, DOMString value);
+  undefined setCellText(long row, TreeColumn column, DOMString value);
 
   /**
    * A command API that can be used to invoke commands on the selection.  The tree
    * will automatically invoke this method when certain keys are pressed.  For example,
    * when the DEL key is pressed, performAction will be called with the "delete" string.
    */
-  void performAction(DOMString action);
+  undefined performAction(DOMString action);
 
   /**
    * A command API that can be used to invoke commands on a specific row.
    */
-  void performActionOnRow(DOMString action, long row);
+  undefined performActionOnRow(DOMString action, long row);
 
   /**
    * A command API that can be used to invoke commands on a specific cell.
    */
-  void performActionOnCell(DOMString action, long row, TreeColumn column);
+  undefined performActionOnCell(DOMString action, long row, TreeColumn column);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/U2F.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/U2F.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/U2F.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/U2F.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -63,8 +63,8 @@
     DOMString? errorMessage;
 };
 
-callback U2FRegisterCallback = void(RegisterResponse response);
-callback U2FSignCallback = void(SignResponse response);
+callback U2FRegisterCallback = undefined(RegisterResponse response);
+callback U2FSignCallback = undefined(SignResponse response);
 
 [SecureContext, Pref="security.webauth.u2f"]
 interface U2F {
@@ -79,14 +79,14 @@
   const unsigned short TIMEOUT = 5;
 
   [Throws]
-  void register (DOMString appId,
+  undefined register (DOMString appId,
                  sequence<RegisterRequest> registerRequests,
                  sequence<RegisteredKey> registeredKeys,
                  U2FRegisterCallback callback,
                  optional long? opt_timeoutSeconds);
 
   [Throws]
-  void sign (DOMString appId,
+  undefined sign (DOMString appId,
              DOMString challenge,
              sequence<RegisteredKey> registeredKeys,
              U2FSignCallback callback,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/UDPSocket.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/UDPSocket.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/UDPSocket.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/UDPSocket.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -28,13 +28,13 @@
     readonly    attribute boolean          addressReuse;
     readonly    attribute boolean          loopback;
     readonly    attribute SocketReadyState readyState;
-    readonly    attribute Promise<void>    opened;
-    readonly    attribute Promise<void>    closed;
+    readonly    attribute Promise<undefined>    opened;
+    readonly    attribute Promise<undefined>    closed;
 //    readonly    attribute ReadableStream   input; //Bug 1056444: Stream API is not ready
 //    readonly    attribute WriteableStream  output; //Bug 1056444: Stream API is not ready
                 attribute EventHandler     onmessage; //Bug 1056444: use event interface before Stream API is ready
-    Promise<void> close ();
-    [Throws] void    joinMulticastGroup (DOMString multicastGroupAddress);
-    [Throws] void    leaveMulticastGroup (DOMString multicastGroupAddress);
+    Promise<undefined> close ();
+    [Throws] undefined    joinMulticastGroup (DOMString multicastGroupAddress);
+    [Throws] undefined    leaveMulticastGroup (DOMString multicastGroupAddress);
     [Throws] boolean send ((DOMString or Blob or ArrayBuffer or ArrayBufferView) data, optional DOMString? remoteAddress, optional unsigned short? remotePort); //Bug 1056444: use send method before Stream API is ready
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/UIEvent.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/UIEvent.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/UIEvent.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/UIEvent.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -15,7 +15,7 @@
 {
   readonly attribute WindowProxy? view;
   readonly attribute long         detail;
-  void initUIEvent(DOMString aType,
+  undefined initUIEvent(DOMString aType,
                    optional boolean aCanBubble = false,
                    optional boolean aCancelable = false,
                    optional Window? aView = null,
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/URLSearchParams.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/URLSearchParams.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/URLSearchParams.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/URLSearchParams.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -16,15 +16,15 @@
 [Constructor(optional (sequence<sequence<USVString>> or record<USVString, USVString> or USVString) init = ""),
  Exposed=(Window,Worker,WorkerDebugger,System)]
 interface URLSearchParams {
-  void append(USVString name, USVString value);
-  void delete(USVString name);
+  undefined append(USVString name, USVString value);
+  undefined delete(USVString name);
   USVString? get(USVString name);
   sequence<USVString> getAll(USVString name);
   boolean has(USVString name);
-  void set(USVString name, USVString value);
+  undefined set(USVString name, USVString value);
 
   [Throws]
-  void sort();
+  undefined sort();
 
   iterable<USVString, USVString>;
   stringifier;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/URL.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/URL.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/URL.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/URL.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -44,7 +44,7 @@
   [Throws]
   static DOMString createObjectURL(Blob blob);
   [Throws]
-  static void revokeObjectURL(DOMString url);
+  static undefined revokeObjectURL(DOMString url);
   [ChromeOnly, Throws]
   static boolean isValidURL(DOMString url);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/VideoStreamTrack.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/VideoStreamTrack.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/VideoStreamTrack.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/VideoStreamTrack.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -13,7 +13,7 @@
 // [Constructor(optional MediaTrackConstraints videoConstraints)]
 interface VideoStreamTrack : MediaStreamTrack {
 //    static sequence<DOMString> getSourceIds ();
-//    void                       takePhoto ();
+//    undefined                       takePhoto ();
 //                attribute EventHandler onphoto;
 //                attribute EventHandler onphotoerror;
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/VRDisplay.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/VRDisplay.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/VRDisplay.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/VRDisplay.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -258,7 +258,7 @@
    * updated when calling resetPose(). This should be called in only
    * sitting-space experiences.
    */
-  void resetPose();
+  undefined resetPose();
 
   /**
    * z-depth defining the near plane of the eye view frustum
@@ -289,18 +289,18 @@
    * Passing the value returned by `requestAnimationFrame` to
    * `cancelAnimationFrame` will unregister the callback.
    */
-  [Throws] void cancelAnimationFrame(long handle);
+  [Throws] undefined cancelAnimationFrame(long handle);
 
   /**
    * Begin presenting to the VRDisplay. Must be called in response to a user gesture.
    * Repeat calls while already presenting will update the VRLayers being displayed.
    */
-  [Throws, NeedsCallerType] Promise<void> requestPresent(sequence<VRLayer> layers);
+  [Throws, NeedsCallerType] Promise<undefined> requestPresent(sequence<VRLayer> layers);
 
   /**
    * Stops presenting to the VRDisplay.
    */
-  [Throws] Promise<void> exitPresent();
+  [Throws] Promise<undefined> exitPresent();
 
   /**
    * Get the layers currently being presented.
@@ -313,5 +313,5 @@
    * canvas as any other operation that uses its source image, and canvases
    * created without preserveDrawingBuffer set to true will be cleared.
    */
-  void submitFrame();
+  undefined submitFrame();
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/VRServiceTest.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/VRServiceTest.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/VRServiceTest.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/VRServiceTest.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -8,23 +8,23 @@
 [Pref="dom.vr.test.enabled",
  HeaderFile="mozilla/dom/VRServiceTest.h"]
 interface VRMockDisplay {
-  void setEyeResolution(unsigned long aRenderWidth, unsigned long aRenderHeight);
-  void setEyeParameter(VREye eye, double offsetX, double offsetY, double offsetZ,
+  undefined setEyeResolution(unsigned long aRenderWidth, unsigned long aRenderHeight);
+  undefined setEyeParameter(VREye eye, double offsetX, double offsetY, double offsetZ,
                        double upDegree, double rightDegree,
                        double downDegree, double leftDegree);
-  void setPose(Float32Array? position, Float32Array? linearVelocity,
+  undefined setPose(Float32Array? position, Float32Array? linearVelocity,
                Float32Array? linearAcceleration, Float32Array? orientation,
                Float32Array? angularVelocity, Float32Array? angularAcceleration);
-  void setMountState(boolean isMounted);
-  void update();
+  undefined setMountState(boolean isMounted);
+  undefined update();
 };
 
 [Pref="dom.vr.test.enabled",
  HeaderFile="mozilla/dom/VRServiceTest.h"]
 interface VRMockController {
-  void newButtonEvent(unsigned long button, boolean pressed);
-  void newAxisMoveEvent(unsigned long axis, double value);
-  void newPoseMove(Float32Array? position, Float32Array? linearVelocity,
+  undefined newButtonEvent(unsigned long button, boolean pressed);
+  undefined newAxisMoveEvent(unsigned long axis, double value);
+  undefined newPoseMove(Float32Array? position, Float32Array? linearVelocity,
                    Float32Array? linearAcceleration, Float32Array? orientation,
                    Float32Array? angularVelocity, Float32Array? angularAcceleration);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebComponents.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebComponents.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebComponents.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebComponents.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -10,11 +10,11 @@
  * liability, trademark and document use rules apply.
  */
 
-callback LifecycleConnectedCallback = void();
-callback LifecycleDisconnectedCallback = void();
-callback LifecycleAdoptedCallback = void(Document? oldDocument,
+callback LifecycleConnectedCallback = undefined();
+callback LifecycleDisconnectedCallback = undefined();
+callback LifecycleAdoptedCallback = undefined(Document? oldDocument,
                                          Document? newDocment);
-callback LifecycleAttributeChangedCallback = void(DOMString attrName,
+callback LifecycleAttributeChangedCallback = undefined(DOMString attrName,
                                                   DOMString? oldValue,
                                                   DOMString? newValue,
                                                   DOMString? namespaceURI);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebGL2RenderingContext.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebGL2RenderingContext.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebGL2RenderingContext.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebGL2RenderingContext.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -304,237 +304,237 @@
 
     /* Buffer objects */
     // WebGL1:
-    void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
-    void bufferData(GLenum target, ArrayBuffer? srcData, GLenum usage);
-    void bufferData(GLenum target, ArrayBufferView srcData, GLenum usage);
-    void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer srcData);
-    void bufferSubData(GLenum target, GLintptr offset, ArrayBufferView srcData);
+    undefined bufferData(GLenum target, GLsizeiptr size, GLenum usage);
+    undefined bufferData(GLenum target, ArrayBuffer? srcData, GLenum usage);
+    undefined bufferData(GLenum target, ArrayBufferView srcData, GLenum usage);
+    undefined bufferSubData(GLenum target, GLintptr offset, ArrayBuffer srcData);
+    undefined bufferSubData(GLenum target, GLintptr offset, ArrayBufferView srcData);
     // WebGL2:
-    void bufferData(GLenum target, ArrayBufferView srcData, GLenum usage,
+    undefined bufferData(GLenum target, ArrayBufferView srcData, GLenum usage,
                     GLuint srcOffset, optional GLuint length = 0);
-    void bufferSubData(GLenum target, GLintptr dstByteOffset, ArrayBufferView srcData,
+    undefined bufferSubData(GLenum target, GLintptr dstByteOffset, ArrayBufferView srcData,
                        GLuint srcOffset, optional GLuint length = 0);
 
-    void copyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset,
+    undefined copyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset,
                            GLintptr writeOffset, GLsizeiptr size);
     // MapBufferRange, in particular its read-only and write-only modes,
     // can not be exposed safely to JavaScript. GetBufferSubData
     // replaces it for the purpose of fetching data back from the GPU.
-    void getBufferSubData(GLenum target, GLintptr srcByteOffset, ArrayBufferView dstData,
+    undefined getBufferSubData(GLenum target, GLintptr srcByteOffset, ArrayBufferView dstData,
                           optional GLuint dstOffset = 0, optional GLuint length = 0);
 
     /* Framebuffer objects */
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0,
+    undefined blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0,
                          GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-    void framebufferTextureLayer(GLenum target, GLenum attachment, WebGLTexture? texture, GLint level,
+    undefined framebufferTextureLayer(GLenum target, GLenum attachment, WebGLTexture? texture, GLint level,
                                  GLint layer);
 
     [Throws]
-    void invalidateFramebuffer(GLenum target, sequence<GLenum> attachments);
+    undefined invalidateFramebuffer(GLenum target, sequence<GLenum> attachments);
 
     [Throws]
-    void invalidateSubFramebuffer(GLenum target, sequence<GLenum> attachments,
+    undefined invalidateSubFramebuffer(GLenum target, sequence<GLenum> attachments,
                                   GLint x, GLint y, GLsizei width, GLsizei height);
 
-    void readBuffer(GLenum src);
+    undefined readBuffer(GLenum src);
 
     /* Renderbuffer objects */
     [Throws]
     any getInternalformatParameter(GLenum target, GLenum internalformat, GLenum pname);
-    void renderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat,
+    undefined renderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat,
                                         GLsizei width, GLsizei height);
 
     /* Texture objects */
-    void texStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width,
+    undefined texStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width,
                       GLsizei height);
-    void texStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width,
+    undefined texStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width,
                       GLsizei height, GLsizei depth);
 
     // WebGL1 legacy entrypoints:
     [Throws] // Another overhead throws.
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLsizei width, GLsizei height, GLint border, GLenum format,
                     GLenum type, ArrayBufferView? pixels);
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, HTMLCanvasElement source); // May throw DOMException
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, HTMLImageElement source); // May throw DOMException
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, HTMLVideoElement source); // May throw DOMException
     [Throws] // Another overhead throws.
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, ImageBitmap source);
     [Throws] // Another overhead throws.
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, ImageData source);
 
     [Throws] // Another overhead throws.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLsizei width, GLsizei height,
                        GLenum format, GLenum type, ArrayBufferView? pixels);
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, HTMLCanvasElement source); // May throw DOMException
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, HTMLImageElement source); // May throw DOMException
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, HTMLVideoElement source); // May throw DOMException
     [Throws] // Another overhead throws.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, ImageBitmap source);
     [Throws] // Another overhead throws.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, ImageData source);
 
     // WebGL2 entrypoints:
     [Throws] // Another overhead throws.
-    void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLint border, GLenum format, GLenum type, GLintptr pboOffset);
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLint border, GLenum format, GLenum type,
                     HTMLCanvasElement source); // May throw DOMException
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLint border, GLenum format, GLenum type,
                     HTMLImageElement source); // May throw DOMException
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLint border, GLenum format, GLenum type,
                     HTMLVideoElement source); // May throw DOMException
     [Throws] // Another overhead throws.
-    void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLint border, GLenum format, GLenum type,
                     ImageBitmap source);
     [Throws] // Another overhead throws.
-    void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLint border, GLenum format, GLenum type,
                     ImageData source);
     [Throws] // Another overhead throws.
-    void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLint border, GLenum format, GLenum type, ArrayBufferView srcData,
                     GLuint srcOffset);
 
     [Throws] // Another overhead throws.
-    void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLsizei depth, GLint border, GLenum format, GLenum type, GLintptr pboOffset);
     [Throws]
-    void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLsizei depth, GLint border, GLenum format, GLenum type,
                     HTMLCanvasElement source); // May throw DOMException
     [Throws]
-    void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLsizei depth, GLint border, GLenum format, GLenum type,
                     HTMLImageElement source); // May throw DOMException
     [Throws]
-    void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLsizei depth, GLint border, GLenum format, GLenum type,
                     HTMLVideoElement source); // May throw DOMException
     [Throws] // Another overhead throws.
-    void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLsizei depth, GLint border, GLenum format, GLenum type,
                     ImageBitmap source);
     [Throws] // Another overhead throws.
-    void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLsizei depth, GLint border, GLenum format, GLenum type,
                     ImageData source);
     [Throws] // Another overhead throws.
-    void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLsizei depth, GLint border, GLenum format, GLenum type, ArrayBufferView? srcData);
     [Throws] // Another overhead throws.
-    void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+    undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                     GLsizei depth, GLint border, GLenum format, GLenum type, ArrayBufferView srcData,
                     GLuint srcOffset);
 
     [Throws] // Another overhead throws.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                        GLsizei height, GLenum format, GLenum type, GLintptr pboOffset);
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                        GLsizei height, GLenum format, GLenum type,
                        HTMLCanvasElement source); // May throw DOMException
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                        GLsizei height, GLenum format, GLenum type,
                        HTMLImageElement source); // May throw DOMException
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                        GLsizei height, GLenum format, GLenum type,
                        HTMLVideoElement source); // May throw DOMException
     [Throws] // Another overhead throws.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                        GLsizei height, GLenum format, GLenum type,
                        ImageBitmap source);
     [Throws] // Another overhead throws.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                        GLsizei height, GLenum format, GLenum type,
                        ImageData source);
     [Throws] // Another overhead throws.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                        GLsizei height, GLenum format, GLenum type, ArrayBufferView srcData,
                        GLuint srcOffset);
 
     [Throws] // Another overhead throws.
-    void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                        GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
                        GLintptr pboOffset);
     [Throws]
-    void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                        GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
                        HTMLCanvasElement source); // May throw DOMException
     [Throws]
-    void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                        GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
                        HTMLImageElement source); // May throw DOMException
     [Throws]
-    void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                        GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
                        HTMLVideoElement source); // May throw DOMException
     [Throws] // Another overhead throws.
-    void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                        GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
                        ImageBitmap source);
     [Throws] // Another overhead throws.
-    void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                        GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
                        ImageData source);
     [Throws] // Another overhead throws.
-    void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                        GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
                        ArrayBufferView? srcData, optional GLuint srcOffset = 0);
 
-    void copyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    undefined copyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                            GLint x, GLint y, GLsizei width, GLsizei height);
 
-    void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+    undefined compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
                               GLsizei height, GLint border, GLsizei imageSize,  GLintptr offset);
-    void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+    undefined compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
                               GLsizei height, GLint border, ArrayBufferView srcData,
                               optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
 
-    void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+    undefined compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
                               GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLintptr offset);
-    void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+    undefined compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
                               GLsizei height, GLsizei depth, GLint border, ArrayBufferView srcData,
                               optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
 
-    void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                                  GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, GLintptr offset);
-    void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                                  GLsizei width, GLsizei height, GLenum format,
                                  ArrayBufferView srcData,
                                  optional GLuint srcOffset = 0,
                                  optional GLuint srcLengthOverride = 0);
 
-    void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                                  GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
                                  GLenum format, GLsizei imageSize, GLintptr offset);
-    void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                                  GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
                                  GLenum format, ArrayBufferView srcData,
                                  optional GLuint srcOffset = 0,
@@ -544,139 +544,139 @@
     [WebGLHandlesContextLoss] GLint getFragDataLocation(WebGLProgram program, DOMString name);
 
     /* Uniforms */
-    void uniform1ui(WebGLUniformLocation? location, GLuint v0);
-    void uniform2ui(WebGLUniformLocation? location, GLuint v0, GLuint v1);
-    void uniform3ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2);
-    void uniform4ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+    undefined uniform1ui(WebGLUniformLocation? location, GLuint v0);
+    undefined uniform2ui(WebGLUniformLocation? location, GLuint v0, GLuint v1);
+    undefined uniform3ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2);
+    undefined uniform4ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
-    void uniform1fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+    undefined uniform1fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform2fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+    undefined uniform2fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform3fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+    undefined uniform3fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform4fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+    undefined uniform4fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
 
-    void uniform1iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+    undefined uniform1iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform2iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+    undefined uniform2iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform3iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+    undefined uniform3iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform4iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+    undefined uniform4iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
 
-    void uniform1uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+    undefined uniform1uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform2uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+    undefined uniform2uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform3uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+    undefined uniform3uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
-    void uniform4uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+    undefined uniform4uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
                     optional GLuint srcLength = 0);
 
-    void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                           optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
-    void uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
-    void uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
 
-    void uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
-    void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                           optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
-    void uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
 
-    void uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
-    void uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
-    void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+    undefined uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
                           optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
 
     /* Vertex attribs */
-    void vertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w);
-    void vertexAttribI4iv(GLuint index, Int32List values);
-    void vertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-    void vertexAttribI4uiv(GLuint index, Uint32List values);
-    void vertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+    undefined vertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w);
+    undefined vertexAttribI4iv(GLuint index, Int32List values);
+    undefined vertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+    undefined vertexAttribI4uiv(GLuint index, Uint32List values);
+    undefined vertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
 
     /* Writing to the drawing buffer */
-    void vertexAttribDivisor(GLuint index, GLuint divisor);
-    void drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount);
-    void drawElementsInstanced(GLenum mode, GLsizei count, GLenum type, GLintptr offset, GLsizei instanceCount);
-    void drawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLintptr offset);
+    undefined vertexAttribDivisor(GLuint index, GLuint divisor);
+    undefined drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount);
+    undefined drawElementsInstanced(GLenum mode, GLsizei count, GLenum type, GLintptr offset, GLsizei instanceCount);
+    undefined drawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLintptr offset);
 
     /* Reading back pixels */
     // WebGL1:
     [Throws, NeedsCallerType] // Throws on readback in a write-only context.
-    void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
+    undefined readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
                     ArrayBufferView? dstData);
     // WebGL2:
     [Throws, NeedsCallerType] // Throws on readback in a write-only context.
-    void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
+    undefined readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
                     GLintptr offset);
     [Throws, NeedsCallerType] // Throws on readback in a write-only context.
-    void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
+    undefined readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
                     ArrayBufferView dstData, GLuint dstOffset);
 
     /* Multiple Render Targets */
-    void drawBuffers(sequence<GLenum> buffers);
+    undefined drawBuffers(sequence<GLenum> buffers);
 
-    void clearBufferfv(GLenum buffer, GLint drawbuffer, Float32List values,
+    undefined clearBufferfv(GLenum buffer, GLint drawbuffer, Float32List values,
                        optional GLuint srcOffset = 0);
-    void clearBufferiv(GLenum buffer, GLint drawbuffer, Int32List values,
+    undefined clearBufferiv(GLenum buffer, GLint drawbuffer, Int32List values,
                        optional GLuint srcOffset = 0);
-    void clearBufferuiv(GLenum buffer, GLint drawbuffer, Uint32List values,
+    undefined clearBufferuiv(GLenum buffer, GLint drawbuffer, Uint32List values,
                         optional GLuint srcOffset = 0);
 
-    void clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+    undefined clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
 
     /* Query Objects */
     WebGLQuery? createQuery();
-    void deleteQuery(WebGLQuery? query);
+    undefined deleteQuery(WebGLQuery? query);
     [WebGLHandlesContextLoss] GLboolean isQuery(WebGLQuery? query);
-    void beginQuery(GLenum target, WebGLQuery query);
-    void endQuery(GLenum target);
+    undefined beginQuery(GLenum target, WebGLQuery query);
+    undefined endQuery(GLenum target);
     any getQuery(GLenum target, GLenum pname);
     any getQueryParameter(WebGLQuery query, GLenum pname);
 
     /* Sampler Objects */
     WebGLSampler? createSampler();
-    void deleteSampler(WebGLSampler? sampler);
+    undefined deleteSampler(WebGLSampler? sampler);
     [WebGLHandlesContextLoss] GLboolean isSampler(WebGLSampler? sampler);
-    void bindSampler(GLuint unit, WebGLSampler? sampler);
-    void samplerParameteri(WebGLSampler sampler, GLenum pname, GLint param);
-    void samplerParameterf(WebGLSampler sampler, GLenum pname, GLfloat param);
+    undefined bindSampler(GLuint unit, WebGLSampler? sampler);
+    undefined samplerParameteri(WebGLSampler sampler, GLenum pname, GLint param);
+    undefined samplerParameterf(WebGLSampler sampler, GLenum pname, GLfloat param);
     any getSamplerParameter(WebGLSampler sampler, GLenum pname);
 
     /* Sync objects */
     WebGLSync? fenceSync(GLenum condition, GLbitfield flags);
     [WebGLHandlesContextLoss] GLboolean isSync(WebGLSync? sync);
-    void deleteSync(WebGLSync? sync);
+    undefined deleteSync(WebGLSync? sync);
     GLenum clientWaitSync(WebGLSync sync, GLbitfield flags, GLuint64 timeout);
-    void waitSync(WebGLSync sync, GLbitfield flags, GLint64 timeout);
+    undefined waitSync(WebGLSync sync, GLbitfield flags, GLint64 timeout);
     any getSyncParameter(WebGLSync sync, GLenum pname);
 
     /* Transform Feedback */
     WebGLTransformFeedback? createTransformFeedback();
-    void deleteTransformFeedback(WebGLTransformFeedback? tf);
+    undefined deleteTransformFeedback(WebGLTransformFeedback? tf);
     [WebGLHandlesContextLoss] GLboolean isTransformFeedback(WebGLTransformFeedback? tf);
-    void bindTransformFeedback(GLenum target, WebGLTransformFeedback? tf);
-    void beginTransformFeedback(GLenum primitiveMode);
-    void endTransformFeedback();
-    void transformFeedbackVaryings(WebGLProgram program, sequence<DOMString> varyings, GLenum bufferMode);
+    undefined bindTransformFeedback(GLenum target, WebGLTransformFeedback? tf);
+    undefined beginTransformFeedback(GLenum primitiveMode);
+    undefined endTransformFeedback();
+    undefined transformFeedbackVaryings(WebGLProgram program, sequence<DOMString> varyings, GLenum bufferMode);
     [NewObject]
     WebGLActiveInfo? getTransformFeedbackVarying(WebGLProgram program, GLuint index);
-    void pauseTransformFeedback();
-    void resumeTransformFeedback();
+    undefined pauseTransformFeedback();
+    undefined resumeTransformFeedback();
 
     /* Uniform Buffer Objects and Transform Feedback Buffers */
-    void bindBufferBase(GLenum target, GLuint index, WebGLBuffer? buffer);
-    void bindBufferRange(GLenum target, GLuint index, WebGLBuffer? buffer, GLintptr offset, GLsizeiptr size);
+    undefined bindBufferBase(GLenum target, GLuint index, WebGLBuffer? buffer);
+    undefined bindBufferRange(GLenum target, GLuint index, WebGLBuffer? buffer, GLintptr offset, GLsizeiptr size);
     [Throws] // GetOrCreateDOMReflector can fail.
     any getIndexedParameter(GLenum target, GLuint index);
     sequence<GLuint>? getUniformIndices(WebGLProgram program, sequence<DOMString> uniformNames);
@@ -685,13 +685,13 @@
     [Throws] // Creating a Uint32Array can fail.
     any getActiveUniformBlockParameter(WebGLProgram program, GLuint uniformBlockIndex, GLenum pname);
     DOMString? getActiveUniformBlockName(WebGLProgram program, GLuint uniformBlockIndex);
-    void uniformBlockBinding(WebGLProgram program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+    undefined uniformBlockBinding(WebGLProgram program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
 
     /* Vertex Array Objects */
     WebGLVertexArrayObject? createVertexArray();
-    void deleteVertexArray(WebGLVertexArrayObject? vertexArray);
+    undefined deleteVertexArray(WebGLVertexArrayObject? vertexArray);
     [WebGLHandlesContextLoss] GLboolean isVertexArray(WebGLVertexArrayObject? vertexArray);
-    void bindVertexArray(WebGLVertexArrayObject? array);
+    undefined bindVertexArray(WebGLVertexArrayObject? array);
 };
 
 WebGL2RenderingContextBase includes WebGLRenderingContextBase;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebGLRenderingContext.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebGLRenderingContext.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebGLRenderingContext.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebGLRenderingContext.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -545,32 +545,32 @@
     [Throws, NeedsCallerType]
     object? getExtension(DOMString name);
 
-    void activeTexture(GLenum texture);
-    void attachShader(WebGLProgram program, WebGLShader shader);
-    void bindAttribLocation(WebGLProgram program, GLuint index, DOMString name);
-    void bindBuffer(GLenum target, WebGLBuffer? buffer);
-    void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
-    void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
-    void bindTexture(GLenum target, WebGLTexture? texture);
-    void blendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-    void blendEquation(GLenum mode);
-    void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
-    void blendFunc(GLenum sfactor, GLenum dfactor);
-    void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB,
+    undefined activeTexture(GLenum texture);
+    undefined attachShader(WebGLProgram program, WebGLShader shader);
+    undefined bindAttribLocation(WebGLProgram program, GLuint index, DOMString name);
+    undefined bindBuffer(GLenum target, WebGLBuffer? buffer);
+    undefined bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
+    undefined bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
+    undefined bindTexture(GLenum target, WebGLTexture? texture);
+    undefined blendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+    undefined blendEquation(GLenum mode);
+    undefined blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
+    undefined blendFunc(GLenum sfactor, GLenum dfactor);
+    undefined blendFuncSeparate(GLenum srcRGB, GLenum dstRGB,
                            GLenum srcAlpha, GLenum dstAlpha);
 
     [WebGLHandlesContextLoss] GLenum checkFramebufferStatus(GLenum target);
-    void clear(GLbitfield mask);
-    void clearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-    void clearDepth(GLclampf depth);
-    void clearStencil(GLint s);
-    void colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-    void compileShader(WebGLShader shader);
+    undefined clear(GLbitfield mask);
+    undefined clearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+    undefined clearDepth(GLclampf depth);
+    undefined clearStencil(GLint s);
+    undefined colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+    undefined compileShader(WebGLShader shader);
 
-    void copyTexImage2D(GLenum target, GLint level, GLenum internalformat,
+    undefined copyTexImage2D(GLenum target, GLint level, GLenum internalformat,
                         GLint x, GLint y, GLsizei width, GLsizei height,
                         GLint border);
-    void copyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined copyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                            GLint x, GLint y, GLsizei width, GLsizei height);
 
     WebGLBuffer? createBuffer();
@@ -580,36 +580,36 @@
     WebGLShader? createShader(GLenum type);
     WebGLTexture? createTexture();
 
-    void cullFace(GLenum mode);
+    undefined cullFace(GLenum mode);
 
-    void deleteBuffer(WebGLBuffer? buffer);
-    void deleteFramebuffer(WebGLFramebuffer? framebuffer);
-    void deleteProgram(WebGLProgram? program);
-    void deleteRenderbuffer(WebGLRenderbuffer? renderbuffer);
-    void deleteShader(WebGLShader? shader);
-    void deleteTexture(WebGLTexture? texture);
-
-    void depthFunc(GLenum func);
-    void depthMask(GLboolean flag);
-    void depthRange(GLclampf zNear, GLclampf zFar);
-    void detachShader(WebGLProgram program, WebGLShader shader);
-    void disable(GLenum cap);
-    void disableVertexAttribArray(GLuint index);
-    void drawArrays(GLenum mode, GLint first, GLsizei count);
-    void drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset);
-
-    void enable(GLenum cap);
-    void enableVertexAttribArray(GLuint index);
-    void finish();
-    void flush();
-    void framebufferRenderbuffer(GLenum target, GLenum attachment,
+    undefined deleteBuffer(WebGLBuffer? buffer);
+    undefined deleteFramebuffer(WebGLFramebuffer? framebuffer);
+    undefined deleteProgram(WebGLProgram? program);
+    undefined deleteRenderbuffer(WebGLRenderbuffer? renderbuffer);
+    undefined deleteShader(WebGLShader? shader);
+    undefined deleteTexture(WebGLTexture? texture);
+
+    undefined depthFunc(GLenum func);
+    undefined depthMask(GLboolean flag);
+    undefined depthRange(GLclampf zNear, GLclampf zFar);
+    undefined detachShader(WebGLProgram program, WebGLShader shader);
+    undefined disable(GLenum cap);
+    undefined disableVertexAttribArray(GLuint index);
+    undefined drawArrays(GLenum mode, GLint first, GLsizei count);
+    undefined drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset);
+
+    undefined enable(GLenum cap);
+    undefined enableVertexAttribArray(GLuint index);
+    undefined finish();
+    undefined flush();
+    undefined framebufferRenderbuffer(GLenum target, GLenum attachment,
                                  GLenum renderbuffertarget,
                                  WebGLRenderbuffer? renderbuffer);
-    void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget,
+    undefined framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget,
                               WebGLTexture? texture, GLint level);
-    void frontFace(GLenum mode);
+    undefined frontFace(GLenum mode);
 
-    void generateMipmap(GLenum target);
+    undefined generateMipmap(GLenum target);
 
     [NewObject]
     WebGLActiveInfo? getActiveAttrib(WebGLProgram program, GLuint index);
@@ -653,7 +653,7 @@
 
     [WebGLHandlesContextLoss] GLintptr getVertexAttribOffset(GLuint index, GLenum pname);
 
-    void hint(GLenum target, GLenum mode);
+    undefined hint(GLenum target, GLenum mode);
     [WebGLHandlesContextLoss] GLboolean isBuffer(WebGLBuffer? buffer);
     [WebGLHandlesContextLoss] GLboolean isEnabled(GLenum cap);
     [WebGLHandlesContextLoss] GLboolean isFramebuffer(WebGLFramebuffer? framebuffer);
@@ -661,144 +661,144 @@
     [WebGLHandlesContextLoss] GLboolean isRenderbuffer(WebGLRenderbuffer? renderbuffer);
     [WebGLHandlesContextLoss] GLboolean isShader(WebGLShader? shader);
     [WebGLHandlesContextLoss] GLboolean isTexture(WebGLTexture? texture);
-    void lineWidth(GLfloat width);
-    void linkProgram(WebGLProgram program);
-    void pixelStorei(GLenum pname, GLint param);
-    void polygonOffset(GLfloat factor, GLfloat units);
+    undefined lineWidth(GLfloat width);
+    undefined linkProgram(WebGLProgram program);
+    undefined pixelStorei(GLenum pname, GLint param);
+    undefined polygonOffset(GLfloat factor, GLfloat units);
 
-    void renderbufferStorage(GLenum target, GLenum internalformat,
+    undefined renderbufferStorage(GLenum target, GLenum internalformat,
                              GLsizei width, GLsizei height);
-    void sampleCoverage(GLclampf value, GLboolean invert);
-    void scissor(GLint x, GLint y, GLsizei width, GLsizei height);
+    undefined sampleCoverage(GLclampf value, GLboolean invert);
+    undefined scissor(GLint x, GLint y, GLsizei width, GLsizei height);
 
-    void shaderSource(WebGLShader shader, DOMString source);
+    undefined shaderSource(WebGLShader shader, DOMString source);
 
-    void stencilFunc(GLenum func, GLint ref, GLuint mask);
-    void stencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
-    void stencilMask(GLuint mask);
-    void stencilMaskSeparate(GLenum face, GLuint mask);
-    void stencilOp(GLenum fail, GLenum zfail, GLenum zpass);
-    void stencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-
-    void texParameterf(GLenum target, GLenum pname, GLfloat param);
-    void texParameteri(GLenum target, GLenum pname, GLint param);
-
-    void uniform1f(WebGLUniformLocation? location, GLfloat x);
-    void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
-    void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);
-    void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-    void uniform1i(WebGLUniformLocation? location, GLint x);
-    void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
-    void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
-    void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
-
-    void useProgram(WebGLProgram? program);
-    void validateProgram(WebGLProgram program);
-
-    void vertexAttrib1f(GLuint indx, GLfloat x);
-    void vertexAttrib1fv(GLuint indx, Float32List values);
-    void vertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
-    void vertexAttrib2fv(GLuint indx, Float32List values);
-    void vertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-    void vertexAttrib3fv(GLuint indx, Float32List values);
-    void vertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void vertexAttrib4fv(GLuint indx, Float32List values);
-    void vertexAttribPointer(GLuint indx, GLint size, GLenum type,
+    undefined stencilFunc(GLenum func, GLint ref, GLuint mask);
+    undefined stencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
+    undefined stencilMask(GLuint mask);
+    undefined stencilMaskSeparate(GLenum face, GLuint mask);
+    undefined stencilOp(GLenum fail, GLenum zfail, GLenum zpass);
+    undefined stencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
+
+    undefined texParameterf(GLenum target, GLenum pname, GLfloat param);
+    undefined texParameteri(GLenum target, GLenum pname, GLint param);
+
+    undefined uniform1f(WebGLUniformLocation? location, GLfloat x);
+    undefined uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
+    undefined uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);
+    undefined uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+
+    undefined uniform1i(WebGLUniformLocation? location, GLint x);
+    undefined uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
+    undefined uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
+    undefined uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
+
+    undefined useProgram(WebGLProgram? program);
+    undefined validateProgram(WebGLProgram program);
+
+    undefined vertexAttrib1f(GLuint indx, GLfloat x);
+    undefined vertexAttrib1fv(GLuint indx, Float32List values);
+    undefined vertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
+    undefined vertexAttrib2fv(GLuint indx, Float32List values);
+    undefined vertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+    undefined vertexAttrib3fv(GLuint indx, Float32List values);
+    undefined vertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    undefined vertexAttrib4fv(GLuint indx, Float32List values);
+    undefined vertexAttribPointer(GLuint indx, GLint size, GLenum type,
                              GLboolean normalized, GLsizei stride, GLintptr offset);
 
-    void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
+    undefined viewport(GLint x, GLint y, GLsizei width, GLsizei height);
 };
 
 [Exposed=(Window,Worker),
  Func="mozilla::dom::OffscreenCanvas::PrefEnabledOnWorkerThread"]
 interface WebGLRenderingContext {
     // bufferData has WebGL2 overloads.
-    void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
-    void bufferData(GLenum target, ArrayBuffer? data, GLenum usage);
-    void bufferData(GLenum target, ArrayBufferView data, GLenum usage);
+    undefined bufferData(GLenum target, GLsizeiptr size, GLenum usage);
+    undefined bufferData(GLenum target, ArrayBuffer? data, GLenum usage);
+    undefined bufferData(GLenum target, ArrayBufferView data, GLenum usage);
     // bufferSubData has WebGL2 overloads.
-    void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer data);
-    void bufferSubData(GLenum target, GLintptr offset, ArrayBufferView data);
+    undefined bufferSubData(GLenum target, GLintptr offset, ArrayBuffer data);
+    undefined bufferSubData(GLenum target, GLintptr offset, ArrayBufferView data);
 
     // compressedTexImage2D has WebGL2 overloads.
-    void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
+    undefined compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
                               GLsizei width, GLsizei height, GLint border,
                               ArrayBufferView data);
     // compressedTexSubImage2D has WebGL2 overloads.
-    void compressedTexSubImage2D(GLenum target, GLint level,
+    undefined compressedTexSubImage2D(GLenum target, GLint level,
                                  GLint xoffset, GLint yoffset,
                                  GLsizei width, GLsizei height, GLenum format,
                                  ArrayBufferView data);
 
     // readPixels has WebGL2 overloads.
     [Throws, NeedsCallerType]
-    void readPixels(GLint x, GLint y, GLsizei width, GLsizei height,
+    undefined readPixels(GLint x, GLint y, GLsizei width, GLsizei height,
                     GLenum format, GLenum type, ArrayBufferView? pixels);
 
     // texImage2D has WebGL2 overloads.
     // Overloads must share [Throws].
     [Throws] // Can't actually throw.
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLsizei width, GLsizei height, GLint border, GLenum format,
                     GLenum type, ArrayBufferView? pixels);
     [Throws] // Can't actually throw.
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, ImageBitmap pixels);
     [Throws] // Can't actually throw.
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, ImageData pixels);
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, HTMLImageElement image); // May throw DOMException
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, HTMLCanvasElement canvas); // May throw DOMException
     [Throws]
-    void texImage2D(GLenum target, GLint level, GLint internalformat,
+    undefined texImage2D(GLenum target, GLint level, GLint internalformat,
                     GLenum format, GLenum type, HTMLVideoElement video); // May throw DOMException
 
     // texSubImage2D has WebGL2 overloads.
     [Throws] // Can't actually throw.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLsizei width, GLsizei height,
                        GLenum format, GLenum type, ArrayBufferView? pixels);
     [Throws] // Can't actually throw.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, ImageBitmap pixels);
     [Throws] // Can't actually throw.
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, ImageData pixels);
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, HTMLImageElement image); // May throw DOMException
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, HTMLCanvasElement canvas); // May throw DOMException
     [Throws]
-    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                        GLenum format, GLenum type, HTMLVideoElement video); // May throw DOMException
 
     // uniform*fv have WebGL2 overloads, or rather extensions, that are not
     // distinguishable from the WebGL1 versions when called with two arguments.
-    void uniform1fv(WebGLUniformLocation? location, Float32List data);
-    void uniform2fv(WebGLUniformLocation? location, Float32List data);
-    void uniform3fv(WebGLUniformLocation? location, Float32List data);
-    void uniform4fv(WebGLUniformLocation? location, Float32List data);
+    undefined uniform1fv(WebGLUniformLocation? location, Float32List data);
+    undefined uniform2fv(WebGLUniformLocation? location, Float32List data);
+    undefined uniform3fv(WebGLUniformLocation? location, Float32List data);
+    undefined uniform4fv(WebGLUniformLocation? location, Float32List data);
 
     // uniform*iv have WebGL2 overloads, or rather extensions, that are not
     // distinguishable from the WebGL1 versions when called with two arguments.
-    void uniform1iv(WebGLUniformLocation? location, Int32List data);
-    void uniform2iv(WebGLUniformLocation? location, Int32List data);
-    void uniform3iv(WebGLUniformLocation? location, Int32List data);
-    void uniform4iv(WebGLUniformLocation? location, Int32List data);
+    undefined uniform1iv(WebGLUniformLocation? location, Int32List data);
+    undefined uniform2iv(WebGLUniformLocation? location, Int32List data);
+    undefined uniform3iv(WebGLUniformLocation? location, Int32List data);
+    undefined uniform4iv(WebGLUniformLocation? location, Int32List data);
 
     // uniformMatrix*fv have WebGL2 overloads, or rather extensions, that are
     // not distinguishable from the WebGL1 versions when called with two
     // arguments.
-    void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
-    void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
-    void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
+    undefined uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
+    undefined uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
+    undefined uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data);
 };
 
 WebGLRenderingContext includes WebGLRenderingContextBase;
@@ -808,7 +808,7 @@
 [Exposed=(Window,Worker)]
 partial interface WebGLRenderingContext {
     [Func="mozilla::dom::DOMPrefs::OffscreenCanvasEnabled"]
-    void commit();
+    undefined commit();
 };
 
 ////////////////////////////////////////
@@ -938,8 +938,8 @@
 
 [NoInterfaceObject]
 interface WEBGL_lose_context {
-    void loseContext();
-    void restoreContext();
+    undefined loseContext();
+    undefined restoreContext();
 };
 
 [NoInterfaceObject]
@@ -1007,7 +1007,7 @@
     const GLenum MAX_COLOR_ATTACHMENTS_WEBGL = 0x8CDF;
     const GLenum MAX_DRAW_BUFFERS_WEBGL      = 0x8824;
 
-    void drawBuffersWEBGL(sequence<GLenum> buffers);
+    undefined drawBuffersWEBGL(sequence<GLenum> buffers);
 };
 
 [NoInterfaceObject]
@@ -1054,18 +1054,18 @@
     const GLenum VERTEX_ARRAY_BINDING_OES = 0x85B5;
 
     WebGLVertexArrayObject? createVertexArrayOES();
-    void deleteVertexArrayOES(WebGLVertexArrayObject? arrayObject);
+    undefined deleteVertexArrayOES(WebGLVertexArrayObject? arrayObject);
     [WebGLHandlesContextLoss] GLboolean isVertexArrayOES(WebGLVertexArrayObject? arrayObject);
-    void bindVertexArrayOES(WebGLVertexArrayObject? arrayObject);
+    undefined bindVertexArrayOES(WebGLVertexArrayObject? arrayObject);
 };
 
 [NoInterfaceObject]
 interface ANGLE_instanced_arrays {
     const GLenum VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE = 0x88FE;
 
-    void drawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-    void drawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, GLintptr offset, GLsizei primcount);
-    void vertexAttribDivisorANGLE(GLuint index, GLuint divisor);
+    undefined drawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+    undefined drawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, GLintptr offset, GLsizei primcount);
+    undefined vertexAttribDivisorANGLE(GLuint index, GLuint divisor);
 };
 
 [NoInterfaceObject]
@@ -1088,11 +1088,11 @@
     const GLenum GPU_DISJOINT_EXT = 0x8FBB;
 
     WebGLQuery? createQueryEXT();
-    void deleteQueryEXT(WebGLQuery? query);
+    undefined deleteQueryEXT(WebGLQuery? query);
     [WebGLHandlesContextLoss] boolean isQueryEXT(WebGLQuery? query);
-    void beginQueryEXT(GLenum target, WebGLQuery query);
-    void endQueryEXT(GLenum target);
-    void queryCounterEXT(WebGLQuery query, GLenum target);
+    undefined beginQueryEXT(GLenum target, WebGLQuery query);
+    undefined endQueryEXT(GLenum target);
+    undefined queryCounterEXT(WebGLQuery query, GLenum target);
     any getQueryEXT(GLenum target, GLenum pname);
     any getQueryObjectEXT(WebGLQuery query, GLenum pname);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebrtcGlobalInformation.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebrtcGlobalInformation.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebrtcGlobalInformation.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebrtcGlobalInformation.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -8,23 +8,23 @@
   sequence<RTCStatsReportInternal> reports;
 };
 
-callback WebrtcGlobalStatisticsCallback = void (WebrtcGlobalStatisticsReport reports);
-callback WebrtcGlobalLoggingCallback = void (sequence<DOMString> logMessages);
+callback WebrtcGlobalStatisticsCallback = undefined (WebrtcGlobalStatisticsReport reports);
+callback WebrtcGlobalLoggingCallback = undefined (sequence<DOMString> logMessages);
 
 [ChromeOnly]
 interface WebrtcGlobalInformation {
 
   [Throws]
-  static void getAllStats(WebrtcGlobalStatisticsCallback callback,
+  static undefined getAllStats(WebrtcGlobalStatisticsCallback callback,
                           optional DOMString pcIdFilter);
 
-  static void clearAllStats();
+  static undefined clearAllStats();
 
   [Throws]
-  static void getLogging(DOMString pattern,
+  static undefined getLogging(DOMString pattern,
                          WebrtcGlobalLoggingCallback callback);
 
-  static void clearLogging();
+  static undefined clearLogging();
 
   // NSPR WebRTC Trace debug level (0 - 65535)
   //
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebSocket.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebSocket.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebSocket.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WebSocket.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -43,7 +43,7 @@
   readonly attribute DOMString protocol;
 
   [Throws]
-  void close([Clamp] optional unsigned short code, optional DOMString reason);
+  undefined close([Clamp] optional unsigned short code, optional DOMString reason);
 
   // messaging
 
@@ -52,16 +52,16 @@
   attribute BinaryType binaryType;
 
   [Throws]
-  void send(DOMString data);
+  undefined send(DOMString data);
 
   [Throws]
-  void send(Blob data);
+  undefined send(Blob data);
 
   [Throws]
-  void send(ArrayBuffer data);
+  undefined send(ArrayBuffer data);
 
   [Throws]
-  void send(ArrayBufferView data);
+  undefined send(ArrayBufferView data);
 };
 
 // Support for creating server-side chrome-only WebSocket. Used in
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WindowOrWorkerGlobalScope.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WindowOrWorkerGlobalScope.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WindowOrWorkerGlobalScope.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WindowOrWorkerGlobalScope.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -28,12 +28,12 @@
   long setTimeout(Function handler, optional long timeout = 0, any... arguments);
   [Throws]
   long setTimeout(DOMString handler, optional long timeout = 0, any... unused);
-  void clearTimeout(optional long handle = 0);
+  undefined clearTimeout(optional long handle = 0);
   [Throws]
   long setInterval(Function handler, optional long timeout = 0, any... arguments);
   [Throws]
   long setInterval(DOMString handler, optional long timeout = 0, any... unused);
-  void clearInterval(optional long handle = 0);
+  undefined clearInterval(optional long handle = 0);
 
   // ImageBitmap
   [Throws]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Window.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Window.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Window.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Window.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -48,11 +48,11 @@
   [Replaceable, Throws] readonly attribute BarProp statusbar;
   [Replaceable, Throws] readonly attribute BarProp toolbar;
   [Throws] attribute DOMString status;
-  [Throws, CrossOriginCallable] void close();
+  [Throws, CrossOriginCallable] undefined close();
   [Throws, CrossOriginReadable] readonly attribute boolean closed;
-  [Throws] void stop();
-  [Throws, CrossOriginCallable] void focus();
-  [Throws, CrossOriginCallable] void blur();
+  [Throws] undefined stop();
+  [Throws, CrossOriginCallable] undefined focus();
+  [Throws, CrossOriginCallable] undefined blur();
   [Replaceable] readonly attribute any event;
 
   // other browsing contexts
@@ -76,15 +76,15 @@
   [Throws, Pref="browser.cache.offline.enable", Func="nsGlobalWindowInner::OfflineCacheAllowedForContext"] readonly attribute ApplicationCache applicationCache;
 
   // user prompts
-  [Throws, NeedsSubjectPrincipal] void alert();
-  [Throws, NeedsSubjectPrincipal] void alert(DOMString message);
+  [Throws, NeedsSubjectPrincipal] undefined alert();
+  [Throws, NeedsSubjectPrincipal] undefined alert(DOMString message);
   [Throws, NeedsSubjectPrincipal] boolean confirm(optional DOMString message = "");
   [Throws, NeedsSubjectPrincipal] DOMString? prompt(optional DOMString message = "", optional DOMString default = "");
   [Throws, Func="nsGlobalWindowInner::IsWindowPrintEnabled"]
-  void print();
+  undefined print();
 
   [Throws, CrossOriginCallable, NeedsSubjectPrincipal]
-  void postMessage(any message, DOMString targetOrigin, optional sequence<object> transfer = []);
+  undefined postMessage(any message, DOMString targetOrigin, optional sequence<object> transfer = []);
 
   // also has obsolete members
 };
@@ -112,8 +112,8 @@
 
 // http://www.whatwg.org/specs/web-apps/current-work/
 partial interface Window {
-  void captureEvents();
-  void releaseEvents();
+  undefined captureEvents();
+  undefined releaseEvents();
 };
 
 // https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html
@@ -149,14 +149,14 @@
   [Replaceable, Throws] readonly attribute Screen screen;
 
   // browsing context
-  //[Throws] void moveTo(double x, double y);
-  //[Throws] void moveBy(double x, double y);
-  //[Throws] void resizeTo(double x, double y);
-  //[Throws] void resizeBy(double x, double y);
-  [Throws, NeedsCallerType] void moveTo(long x, long y);
-  [Throws, NeedsCallerType] void moveBy(long x, long y);
-  [Throws, NeedsCallerType] void resizeTo(long x, long y);
-  [Throws, NeedsCallerType] void resizeBy(long x, long y);
+  //[Throws] undefined moveTo(double x, double y);
+  //[Throws] undefined moveBy(double x, double y);
+  //[Throws] undefined resizeTo(double x, double y);
+  //[Throws] undefined resizeBy(double x, double y);
+  [Throws, NeedsCallerType] undefined moveTo(long x, long y);
+  [Throws, NeedsCallerType] undefined moveBy(long x, long y);
+  [Throws, NeedsCallerType] undefined resizeTo(long x, long y);
+  [Throws, NeedsCallerType] undefined resizeBy(long x, long y);
 
   // viewport
   // These are writable because we allow chrome to write them.  And they need
@@ -168,12 +168,12 @@
   [Throws, NeedsCallerType] attribute any innerHeight;
 
   // viewport scrolling
-  void scroll(unrestricted double x, unrestricted double y);
-  void scroll(optional ScrollToOptions options);
-  void scrollTo(unrestricted double x, unrestricted double y);
-  void scrollTo(optional ScrollToOptions options);
-  void scrollBy(unrestricted double x, unrestricted double y);
-  void scrollBy(optional ScrollToOptions options);
+  undefined scroll(unrestricted double x, unrestricted double y);
+  undefined scroll(optional ScrollToOptions options);
+  undefined scrollTo(unrestricted double x, unrestricted double y);
+  undefined scrollTo(optional ScrollToOptions options);
+  undefined scrollBy(unrestricted double x, unrestricted double y);
+  undefined scrollBy(optional ScrollToOptions options);
   // The four properties below are double per spec at the moment, but whether
   // that will continue is unclear.
   [Replaceable, Throws] readonly attribute double scrollX;
@@ -199,9 +199,9 @@
 // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/RequestAnimationFrame/Overview.html
 partial interface Window {
   [Throws] long requestAnimationFrame(FrameRequestCallback callback);
-  [Throws] void cancelAnimationFrame(long handle);
+  [Throws] undefined cancelAnimationFrame(long handle);
 };
-callback FrameRequestCallback = void (DOMHighResTimeStamp time);
+callback FrameRequestCallback = undefined (DOMHighResTimeStamp time);
 
 // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/NavigationTiming/Overview.html
 partial interface Window {
@@ -264,11 +264,11 @@
   unsigned long requestIdleCallback(IdleRequestCallback callback,
                                     optional IdleRequestOptions options);
   [Func="nsGlobalWindowInner::IsRequestIdleCallbackEnabled"]
-  void          cancelIdleCallback(unsigned long handle);
+  undefined          cancelIdleCallback(unsigned long handle);
 };
 
 dictionary IdleRequestOptions {
   unsigned long timeout;
 };
 
-callback IdleRequestCallback = void (IdleDeadline deadline);
+callback IdleRequestCallback = undefined (IdleDeadline deadline);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WorkerDebuggerGlobalScope.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WorkerDebuggerGlobalScope.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WorkerDebuggerGlobalScope.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WorkerDebuggerGlobalScope.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -12,29 +12,29 @@
   object createSandbox(DOMString name, object prototype);
 
   [Throws]
-  void loadSubScript(DOMString url, optional object sandbox);
+  undefined loadSubScript(DOMString url, optional object sandbox);
 
-  void enterEventLoop();
+  undefined enterEventLoop();
 
-  void leaveEventLoop();
+  undefined leaveEventLoop();
 
-  void postMessage(DOMString message);
+  undefined postMessage(DOMString message);
 
   attribute EventHandler onmessage;
 
   [Throws]
-  void setImmediate(Function handler);
+  undefined setImmediate(Function handler);
 
-  void reportError(DOMString message);
+  undefined reportError(DOMString message);
 
   [Throws]
   sequence<any> retrieveConsoleEvents();
 
   [Throws]
-  void setConsoleEventHandler(AnyCallback? handler);
+  undefined setConsoleEventHandler(AnyCallback? handler);
 };
 
 // So you can debug while you debug
 partial interface WorkerDebuggerGlobalScope {
-  void dump(optional DOMString string);
+  undefined dump(optional DOMString string);
 };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WorkerGlobalScope.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WorkerGlobalScope.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/WorkerGlobalScope.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/WorkerGlobalScope.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
   readonly attribute WorkerNavigator navigator;
 
   [Throws]
-  void importScripts(DOMString... urls);
+  undefined importScripts(DOMString... urls);
 
   attribute OnErrorEventHandler onerror;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Worker.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Worker.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Worker.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Worker.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -15,10 +15,10 @@
 [Constructor(USVString scriptURL, optional WorkerOptions options),
  Exposed=(Window,DedicatedWorker,SharedWorker,System)]
 interface Worker : EventTarget {
-  void terminate();
+  undefined terminate();
 
   [Throws]
-  void postMessage(any message, optional sequence<object> transfer = []);
+  undefined postMessage(any message, optional sequence<object> transfer = []);
 
   attribute EventHandler onmessage;
   attribute EventHandler onmessageerror;
@@ -27,11 +27,13 @@
 Worker includes AbstractWorker;
 
 dictionary WorkerOptions {
-  // WorkerType type = "classic"; TODO: Bug 1247687
-  // RequestCredentials credentials = "omit"; // credentials is only used if type is "module" TODO: Bug 1247687
+  WorkerType type = "classic";
+  RequestCredentials credentials = "omit"; // credentials is only used if type is "module"
   DOMString name = "";
 };
 
+enum WorkerType { "classic", "module" };
+
 [Constructor(USVString scriptURL),
  Func="mozilla::dom::ChromeWorker::WorkerAvailable",
  Exposed=(Window,DedicatedWorker,SharedWorker,System)]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Worklet.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Worklet.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/Worklet.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/Worklet.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -11,7 +11,7 @@
  Exposed=Window]
 interface Worklet {
   [NewObject, Throws, NeedsCallerType]
-  Promise<void> addModule(USVString moduleURL, optional WorkletOptions options = {});
+  Promise<undefined> addModule(USVString moduleURL, optional WorkletOptions options = {});
 };
 
 dictionary WorkletOptions {
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/XMLHttpRequest.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/XMLHttpRequest.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/XMLHttpRequest.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/XMLHttpRequest.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -45,12 +45,12 @@
 
   // request
   [Throws]
-  void open(ByteString method, USVString url);
+  undefined open(ByteString method, USVString url);
   [Throws]
-  void open(ByteString method, USVString url, boolean async,
+  undefined open(ByteString method, USVString url, boolean async,
             optional USVString? user=null, optional USVString? password=null);
   [Throws]
-  void setRequestHeader(ByteString header, ByteString value);
+  undefined setRequestHeader(ByteString header, ByteString value);
 
   [SetterThrows]
   attribute unsigned long timeout;
@@ -62,10 +62,10 @@
   readonly attribute XMLHttpRequestUpload upload;
 
   [Throws]
-  void send(optional (Document or BodyInit)? body = null);
+  undefined send(optional (Document or BodyInit)? body = null);
 
   [Throws]
-  void abort();
+  undefined abort();
 
   // response
   readonly attribute USVString responseURL;
@@ -83,7 +83,7 @@
   ByteString getAllResponseHeaders();
 
   [Throws]
-  void overrideMimeType(DOMString mime);
+  undefined overrideMimeType(DOMString mime);
 
   [SetterThrows]
   attribute XMLHttpRequestResponseType responseType;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/XSLTProcessor.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/XSLTProcessor.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/enabled/XSLTProcessor.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/enabled/XSLTProcessor.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -20,7 +20,7 @@
      *              stylesheet.
      */
     [Throws]
-    void importStylesheet(Node style);
+    undefined importStylesheet(Node style);
 
     /**
      * Transforms the node source applying the stylesheet given by
@@ -55,7 +55,7 @@
      * @param value        The new value of the XSLT parameter
      */
     [Throws]
-    void setParameter([TreatNullAs=EmptyString] DOMString namespaceURI,
+    undefined setParameter([TreatNullAs=EmptyString] DOMString namespaceURI,
                       DOMString localName,
                       any value);
 
@@ -78,7 +78,7 @@
      * @param localName    The local name of the XSLT parameter
      */
     [Throws]
-    void removeParameter([TreatNullAs=EmptyString] DOMString namespaceURI,
+    undefined removeParameter([TreatNullAs=EmptyString] DOMString namespaceURI,
                          DOMString localName);
 
     /**
@@ -86,12 +86,12 @@
      * the processor use the default-value for all parameters as specified in
      * the stylesheet.
      */
-    void clearParameters();
+    undefined clearParameters();
 
     /**
      * Remove all parameters and stylesheets from this XSLTProcessor.
      */
-    void reset();
+    undefined reset();
 
     /**
     * Disables all loading of external documents, such as from
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unavailable_option_primitive/PaymentRequest.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unavailable_option_primitive/PaymentRequest.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unavailable_option_primitive/PaymentRequest.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unavailable_option_primitive/PaymentRequest.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -97,7 +97,7 @@
   [NewObject]
   Promise<PaymentResponse> show(optional Promise<PaymentDetailsUpdate> detailsPromise);
   [NewObject]
-  Promise<void>            abort();
+  Promise<undefined>            abort();
   [NewObject]
   Promise<boolean>         canMakePayment();
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/Bluetooth.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/Bluetooth.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/Bluetooth.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/Bluetooth.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -26,7 +26,7 @@
   [SameObject]
   readonly attribute BluetoothDevice? referringDevice;
   Promise<sequence<BluetoothDevice>> getDevices();
-  Promise<BluetoothDevice> requestDevice(optional RequestDeviceOptions options = {});
+  Promise<BluetoothDevice> requestDevice(RequestDeviceOptions options);
 };
 
 Bluetooth includes BluetoothDeviceEventHandlers;
@@ -75,7 +75,7 @@
   readonly attribute DOMString? name;
   readonly attribute BluetoothRemoteGATTServer? gatt;
 
-  Promise<void> watchAdvertisements(
+  Promise<undefined> watchAdvertisements(
       optional WatchAdvertisementsOptions options = {});
   readonly attribute boolean watchingAdvertisements;
 };
@@ -130,7 +130,7 @@
   readonly attribute BluetoothDevice device;
   readonly attribute boolean connected;
   Promise<BluetoothRemoteGATTServer> connect();
-  void disconnect();
+  undefined disconnect();
   Promise<BluetoothRemoteGATTService> getPrimaryService(BluetoothServiceUUID service);
   Promise<sequence<BluetoothRemoteGATTService>>
     getPrimaryServices(optional BluetoothServiceUUID service);
@@ -165,9 +165,9 @@
   Promise<sequence<BluetoothRemoteGATTDescriptor>>
     getDescriptors(optional BluetoothDescriptorUUID descriptor);
   Promise<DataView> readValue();
-  Promise<void> writeValue(BufferSource value);
-  Promise<void> writeValueWithResponse(BufferSource value);
-  Promise<void> writeValueWithoutResponse(BufferSource value);
+  Promise<undefined> writeValue(BufferSource value);
+  Promise<undefined> writeValueWithResponse(BufferSource value);
+  Promise<undefined> writeValueWithoutResponse(BufferSource value);
   Promise<BluetoothRemoteGATTCharacteristic> startNotifications();
   Promise<BluetoothRemoteGATTCharacteristic> stopNotifications();
 };
@@ -193,7 +193,7 @@
   readonly attribute UUID uuid;
   readonly attribute DataView? value;
   Promise<DataView> readValue();
-  Promise<void> writeValue(BufferSource value);
+  Promise<undefined> writeValue(BufferSource value);
 };
 
 [SecureContext]
@@ -232,5 +232,5 @@
 [SecureContext]
 partial interface Navigator {
   [SameObject]
-  readonly attribute Bluetooth bluetooth;
-};
\ No newline at end of file
+  readonly attribute Bluetooth? bluetooth;
+};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/Clipboard.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/Clipboard.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/Clipboard.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/Clipboard.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -1,22 +1,23 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * Clipboard API and events
- * W3C Working Draft, 5 June 2019
+ * W3C Working Draft, 4 June 2021
  * The origin of this IDL file is:
- * https://www.w3.org/TR/2019/WD-clipboard-apis-20190605/
+ * https://www.w3.org/TR/2021/WD-clipboard-apis-20210604/
  */
 
 dictionary ClipboardEventInit : EventInit {
   DataTransfer? clipboardData = null;
 };
 
-[Constructor(DOMString type, optional ClipboardEventInit eventInitDict), Exposed=Window]
+[Exposed=Window]
 interface ClipboardEvent : Event {
+  constructor(DOMString type, optional ClipboardEventInit eventInitDict = {});
   readonly attribute DataTransfer? clipboardData;
 };
 
 partial interface Navigator {
-  [SecureContext, SameObject] readonly attribute Clipboard clipboard;
+  [SecureContext, SameObject] readonly attribute Clipboard? clipboard;
 };
 
 typedef sequence<ClipboardItem> ClipboardItems;
@@ -24,8 +25,8 @@
 [SecureContext, Exposed=Window] interface Clipboard : EventTarget {
   Promise<ClipboardItems> read();
   Promise<DOMString> readText();
-  Promise<void> write(ClipboardItems data);
-  Promise<void> writeText(DOMString data);
+  Promise<undefined> write(ClipboardItems data);
+  Promise<undefined> writeText(DOMString data);
 };
 
 typedef (DOMString or Blob) ClipboardItemDataType;
@@ -33,12 +34,12 @@
 
 callback ClipboardItemDelayedCallback = ClipboardItemData ();
 
-[Constructor(record<DOMString, ClipboardItemData> items,
-    optional ClipboardItemOptions options),
- Exposed=Window] interface ClipboardItem {
+[Exposed=Window] interface ClipboardItem {
+  constructor(record<DOMString, ClipboardItemData> items,
+    optional ClipboardItemOptions options = {});
   static ClipboardItem createDelayed(
       record<DOMString, ClipboardItemDelayedCallback> items,
-      optional ClipboardItemOptions options);
+      optional ClipboardItemOptions options = {});
 
   readonly attribute PresentationStyle presentationStyle;
   readonly attribute long long lastModified;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/QueuingStrategy.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/QueuingStrategy.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/QueuingStrategy.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/QueuingStrategy.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Source: https://streams.spec.whatwg.org/#dictdef-queuingstrategy
+ */
+ 
+dictionary QueuingStrategy {
+  unrestricted double highWaterMark;
+  QueuingStrategySize size;
+};
+
+callback QueuingStrategySize = unrestricted double (optional any chunk);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamBYOBReader.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamBYOBReader.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamBYOBReader.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamBYOBReader.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Source: https://streams.spec.whatwg.org/#readablestreamdefaultreader
+ */
+
+[Exposed=(Window,Worker,Worklet)]
+interface ReadableStreamBYOBReader {
+  constructor(ReadableStream stream);
+
+  Promise<ReadableStreamBYOBReadResult> read(ArrayBufferView view);
+  undefined releaseLock();
+};
+ReadableStreamBYOBReader includes ReadableStreamGenericReader;
+
+dictionary ReadableStreamBYOBReadResult {
+ ArrayBufferView value;
+ boolean done;
+};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamDefaultReader.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamDefaultReader.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamDefaultReader.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamDefaultReader.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Source: https://streams.spec.whatwg.org/#readablestreamdefaultreader
+ */
+ 
+[Exposed=(Window,Worker,Worklet)]
+interface ReadableStreamDefaultReader {
+  constructor(ReadableStream stream);
+
+  Promise<ReadableStreamDefaultReadResult> read();
+  undefined releaseLock();
+};
+ReadableStreamDefaultReader includes ReadableStreamGenericReader;
+
+dictionary ReadableStreamDefaultReadResult {
+ any value;
+ boolean done;
+};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamGenericReader.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamGenericReader.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamGenericReader.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/ReadableStreamGenericReader.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Source: https://streams.spec.whatwg.org/#readablestreamgenericreader
+ */
+ 
+interface mixin ReadableStreamGenericReader {
+  readonly attribute Promise<undefined> closed;
+
+  Promise<undefined> cancel(optional any reason);
+};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/ScreenWakeLock.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/ScreenWakeLock.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/ScreenWakeLock.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/ScreenWakeLock.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,23 @@
+/* The origin of this IDL file is
+ * https://www.w3.org/TR/screen-wake-lock/#idl-index
+ */
+
+[SecureContext]
+partial interface Navigator {
+  [SameObject] readonly attribute WakeLock wakeLock;
+};
+
+[SecureContext, Exposed=(Window)]
+interface WakeLock {
+  Promise<WakeLockSentinel> request(WakeLockType type);
+};
+
+[SecureContext, Exposed=(Window)]
+interface WakeLockSentinel : EventTarget {
+  readonly attribute boolean released;
+  readonly attribute WakeLockType type;
+  Promise<undefined> release();
+  attribute EventHandler onrelease;
+};
+
+enum WakeLockType { "screen" };
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/TransformStream.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/TransformStream.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/TransformStream.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/TransformStream.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Source: https://streams.spec.whatwg.org/#transformstream
+ */
+ 
+[Constructor(optional object transformer, optional QueuingStrategy writableStrategy, optional QueuingStrategy readableStrategy),
+ Exposed=(Window,Worker,Worklet), Transferable]
+interface TransformStream {
+  constructor(optional object transformer, optional QueuingStrategy writableStrategy = {}, optional QueuingStrategy readableStrategy = {});
+
+  readonly attribute ReadableStream readable;
+  readonly attribute WritableStream writable;
+};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebGPU.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebGPU.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebGPU.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebGPU.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -6,32 +6,50 @@
     USVString label;
 };
 
-dictionary GPULimits {
-    GPUSize32 maxBindGroups = 4;
-    GPUSize32 maxDynamicUniformBuffersPerPipelineLayout = 8;
-    GPUSize32 maxDynamicStorageBuffersPerPipelineLayout = 4;
-    GPUSize32 maxSampledTexturesPerShaderStage = 16;
-    GPUSize32 maxSamplersPerShaderStage = 16;
-    GPUSize32 maxStorageBuffersPerShaderStage = 4;
-    GPUSize32 maxStorageTexturesPerShaderStage = 4;
-    GPUSize32 maxUniformBuffersPerShaderStage = 12;
-    GPUSize32 maxUniformBufferBindingSize = 16384;
-    GPUSize32 maxStorageBufferBindingSize = 134217728;
+[Exposed=(Window, DedicatedWorker)]
+interface GPUSupportedLimits {
+    readonly attribute unsigned long maxTextureDimension1D;
+    readonly attribute unsigned long maxTextureDimension2D;
+    readonly attribute unsigned long maxTextureDimension3D;
+    readonly attribute unsigned long maxTextureArrayLayers;
+    readonly attribute unsigned long maxBindGroups;
+    readonly attribute unsigned long maxDynamicUniformBuffersPerPipelineLayout;
+    readonly attribute unsigned long maxDynamicStorageBuffersPerPipelineLayout;
+    readonly attribute unsigned long maxSampledTexturesPerShaderStage;
+    readonly attribute unsigned long maxSamplersPerShaderStage;
+    readonly attribute unsigned long maxStorageBuffersPerShaderStage;
+    readonly attribute unsigned long maxStorageTexturesPerShaderStage;
+    readonly attribute unsigned long maxUniformBuffersPerShaderStage;
+    readonly attribute unsigned long long maxUniformBufferBindingSize;
+    readonly attribute unsigned long long maxStorageBufferBindingSize;
+    readonly attribute unsigned long minUniformBufferOffsetAlignment;
+    readonly attribute unsigned long minStorageBufferOffsetAlignment;
+    readonly attribute unsigned long maxVertexBuffers;
+    readonly attribute unsigned long maxVertexAttributes;
+    readonly attribute unsigned long maxVertexBufferArrayStride;
+    readonly attribute unsigned long maxInterStageShaderComponents;
+    readonly attribute unsigned long maxComputeWorkgroupStorageSize;
+    readonly attribute unsigned long maxComputeInvocationsPerWorkgroup;
+    readonly attribute unsigned long maxComputeWorkgroupSizeX;
+    readonly attribute unsigned long maxComputeWorkgroupSizeY;
+    readonly attribute unsigned long maxComputeWorkgroupSizeZ;
+    readonly attribute unsigned long maxComputeWorkgroupsPerDimension;
 };
 
-interface GPUAdapterFeatures {
-    readonly setlike<GPUFeatureName>;
+[Exposed=(Window, DedicatedWorker)]
+interface GPUSupportedFeatures {
+    readonly setlike<DOMString>;
 };
 
-[Exposed=Window]
-partial interface Navigator {
-    [SameObject] readonly attribute GPU gpu;
+enum GPUPredefinedColorSpace {
+    "srgb",
 };
 
-[Exposed=DedicatedWorker]
-partial interface WorkerNavigator {
+interface mixin NavigatorGPU {
     [SameObject] readonly attribute GPU gpu;
 };
+Navigator includes NavigatorGPU;
+WorkerNavigator includes NavigatorGPU;
 
 [Exposed=(Window, DedicatedWorker)]
 interface GPU {
@@ -40,6 +58,7 @@
 
 dictionary GPURequestAdapterOptions {
     GPUPowerPreference powerPreference;
+    boolean forceSoftware = false;
 };
 
 enum GPUPowerPreference {
@@ -47,17 +66,19 @@
     "high-performance"
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUAdapter {
     readonly attribute DOMString name;
-    [SameObject] readonly attribute GPUAdapterFeatures features;
-    //readonly attribute GPULimits limits; Don’t expose higher limits for now.
+    [SameObject] readonly attribute GPUSupportedFeatures features;
+    [SameObject] readonly attribute GPUSupportedLimits limits;
+    readonly attribute boolean isSoftware;
 
-    Promise<GPUDevice?> requestDevice(optional GPUDeviceDescriptor descriptor = {});
+    Promise<GPUDevice> requestDevice(optional GPUDeviceDescriptor descriptor = {});
 };
 
 dictionary GPUDeviceDescriptor : GPUObjectDescriptorBase {
-    sequence<GPUFeatureName> features = [];
-    GPULimits limits = {};
+    sequence<GPUFeatureName> requiredFeatures = [];
+    record<DOMString, GPUSize64> requiredLimits = {};
 };
 
 enum GPUFeatureName {
@@ -69,17 +90,19 @@
     "timestamp-query",
 };
 
-[Exposed=(Window, DedicatedWorker), Serializable]
+[Exposed=(Window, DedicatedWorker)]
 interface GPUDevice : EventTarget {
-    [SameObject] readonly attribute GPUAdapter adapter;
-    readonly attribute FrozenArray<GPUFeatureName> features;
-    readonly attribute object limits;
+    [SameObject] readonly attribute GPUSupportedFeatures features;
+    [SameObject] readonly attribute GPUSupportedLimits limits;
 
-    [SameObject] readonly attribute GPUQueue defaultQueue;
+    [SameObject] readonly attribute GPUQueue queue;
+
+    undefined destroy();
 
     GPUBuffer createBuffer(GPUBufferDescriptor descriptor);
     GPUTexture createTexture(GPUTextureDescriptor descriptor);
     GPUSampler createSampler(optional GPUSamplerDescriptor descriptor = {});
+    GPUExternalTexture importExternalTexture(GPUExternalTextureDescriptor descriptor);
 
     GPUBindGroupLayout createBindGroupLayout(GPUBindGroupLayoutDescriptor descriptor);
     GPUPipelineLayout createPipelineLayout(GPUPipelineLayoutDescriptor descriptor);
@@ -88,8 +111,8 @@
     GPUShaderModule createShaderModule(GPUShaderModuleDescriptor descriptor);
     GPUComputePipeline createComputePipeline(GPUComputePipelineDescriptor descriptor);
     GPURenderPipeline createRenderPipeline(GPURenderPipelineDescriptor descriptor);
-    Promise<GPUComputePipeline> createReadyComputePipeline(GPUComputePipelineDescriptor descriptor);
-    Promise<GPURenderPipeline> createReadyRenderPipeline(GPURenderPipelineDescriptor descriptor);
+    Promise<GPUComputePipeline> createComputePipelineAsync(GPUComputePipelineDescriptor descriptor);
+    Promise<GPURenderPipeline> createRenderPipelineAsync(GPURenderPipelineDescriptor descriptor);
 
     GPUCommandEncoder createCommandEncoder(optional GPUCommandEncoderDescriptor descriptor = {});
     GPURenderBundleEncoder createRenderBundleEncoder(GPURenderBundleEncoderDescriptor descriptor);
@@ -98,13 +121,13 @@
 };
 GPUDevice includes GPUObjectBase;
 
-[Serializable]
+[Exposed=(Window, DedicatedWorker)]
 interface GPUBuffer {
-    Promise<void> mapAsync(GPUMapModeFlags mode, optional GPUSize64 offset = 0, optional GPUSize64 size);
+    Promise<undefined> mapAsync(GPUMapModeFlags mode, optional GPUSize64 offset = 0, optional GPUSize64 size);
     ArrayBuffer getMappedRange(optional GPUSize64 offset = 0, optional GPUSize64 size);
-    void unmap();
+    undefined unmap();
 
-    void destroy();
+    undefined destroy();
 };
 GPUBuffer includes GPUObjectBase;
 
@@ -115,6 +138,7 @@
 };
 
 typedef [EnforceRange] unsigned long GPUBufferUsageFlags;
+[Exposed=(Window, DedicatedWorker)]
 interface GPUBufferUsage {
     const GPUFlagsConstant MAP_READ      = 0x0001;
     const GPUFlagsConstant MAP_WRITE     = 0x0002;
@@ -129,16 +153,17 @@
 };
 
 typedef [EnforceRange] unsigned long GPUMapModeFlags;
+[Exposed=(Window, DedicatedWorker)]
 interface GPUMapMode {
     const GPUFlagsConstant READ  = 0x0001;
     const GPUFlagsConstant WRITE = 0x0002;
 };
 
-[Serializable]
+[Exposed=(Window, DedicatedWorker)]
 interface GPUTexture {
     GPUTextureView createView(optional GPUTextureViewDescriptor descriptor = {});
 
-    void destroy();
+    undefined destroy();
 };
 GPUTexture includes GPUObjectBase;
 
@@ -154,18 +179,20 @@
 enum GPUTextureDimension {
     "1d",
     "2d",
-    "3d"
+    "3d",
 };
 
 typedef [EnforceRange] unsigned long GPUTextureUsageFlags;
+[Exposed=(Window, DedicatedWorker)]
 interface GPUTextureUsage {
     const GPUFlagsConstant COPY_SRC          = 0x01;
     const GPUFlagsConstant COPY_DST          = 0x02;
-    const GPUFlagsConstant SAMPLED           = 0x04;
-    const GPUFlagsConstant STORAGE           = 0x08;
+    const GPUFlagsConstant TEXTURE_BINDING   = 0x04;
+    const GPUFlagsConstant STORAGE_BINDING   = 0x08;
     const GPUFlagsConstant RENDER_ATTACHMENT = 0x10;
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUTextureView {
 };
 GPUTextureView includes GPUObjectBase;
@@ -274,14 +301,17 @@
     "depth32float-stencil8",
 };
 
-enum GPUTextureComponentType {
-    "float",
-    "sint",
-    "uint",
-    // Texture is used with comparison sampling only.
-    "depth-comparison"
+[Exposed=(Window, DedicatedWorker)]
+interface GPUExternalTexture {
+};
+GPUExternalTexture includes GPUObjectBase;
+
+dictionary GPUExternalTextureDescriptor : GPUObjectDescriptorBase {
+    required HTMLVideoElement source;
+    GPUPredefinedColorSpace colorSpace = "srgb";
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUSampler {
 };
 GPUSampler includes GPUObjectBase;
@@ -294,9 +324,9 @@
     GPUFilterMode minFilter = "nearest";
     GPUFilterMode mipmapFilter = "nearest";
     float lodMinClamp = 0;
-    float lodMaxClamp = 0xffffffff; // TODO: What should this be? Was Number.MAX_VALUE.
+    float lodMaxClamp = 32;
     GPUCompareFunction compare;
-    unsigned short maxAnisotropy = 1;
+    [Clamp] unsigned short maxAnisotropy = 1;
 };
 
 enum GPUAddressMode {
@@ -321,7 +351,7 @@
     "always"
 };
 
-[Serializable]
+[Exposed=(Window, DedicatedWorker)]
 interface GPUBindGroupLayout {
 };
 GPUBindGroupLayout includes GPUObjectBase;
@@ -330,46 +360,75 @@
     required sequence<GPUBindGroupLayoutEntry> entries;
 };
 
+typedef [EnforceRange] unsigned long GPUShaderStageFlags;
+[Exposed=(Window, DedicatedWorker)]
+interface GPUShaderStage {
+    const GPUFlagsConstant VERTEX   = 0x1;
+    const GPUFlagsConstant FRAGMENT = 0x2;
+    const GPUFlagsConstant COMPUTE  = 0x4;
+};
+
 dictionary GPUBindGroupLayoutEntry {
     required GPUIndex32 binding;
     required GPUShaderStageFlags visibility;
-    required GPUBindingType type;
 
-    // Used for uniform buffer and storage buffer bindings. Must be undefined for other binding types.
-    boolean hasDynamicOffset;
+    GPUBufferBindingLayout buffer;
+    GPUSamplerBindingLayout sampler;
+    GPUTextureBindingLayout texture;
+    GPUStorageTextureBindingLayout storageTexture;
+    GPUExternalTextureBindingLayout externalTexture;
+};
 
-    // Used for uniform buffer and storage buffer bindings. Must be undefined for other binding types.
-    GPUSize64 minBufferBindingSize;
+enum GPUBufferBindingType {
+    "uniform",
+    "storage",
+    "read-only-storage",
+};
 
-    // Used for sampled texture and storage texture bindings. Must be undefined for other binding types.
-    GPUTextureViewDimension viewDimension;
+dictionary GPUBufferBindingLayout {
+    GPUBufferBindingType type = "uniform";
+    boolean hasDynamicOffset = false;
+    GPUSize64 minBindingSize = 0;
+};
 
-    // Used for sampled texture bindings. Must be undefined for other binding types.
-    GPUTextureComponentType textureComponentType;
+enum GPUSamplerBindingType {
+    "filtering",
+    "non-filtering",
+    "comparison",
+};
 
-    // Used for storage texture bindings. Must be undefined for other binding types.
-    GPUTextureFormat storageTextureFormat;
+dictionary GPUSamplerBindingLayout {
+    GPUSamplerBindingType type = "filtering";
 };
 
-typedef [EnforceRange] unsigned long GPUShaderStageFlags;
-interface GPUShaderStage {
-    const GPUFlagsConstant VERTEX   = 0x1;
-    const GPUFlagsConstant FRAGMENT = 0x2;
-    const GPUFlagsConstant COMPUTE  = 0x4;
+enum GPUTextureSampleType {
+  "float",
+  "unfilterable-float",
+  "depth",
+  "sint",
+  "uint",
+};
+
+dictionary GPUTextureBindingLayout {
+    GPUTextureSampleType sampleType = "float";
+    GPUTextureViewDimension viewDimension = "2d";
+    boolean multisampled = false;
+};
+
+enum GPUStorageTextureAccess {
+    "write-only",
 };
 
-enum GPUBindingType {
-    "uniform-buffer",
-    "storage-buffer",
-    "readonly-storage-buffer",
-    "sampler",
-    "comparison-sampler",
-    "sampled-texture",
-    "multisampled-texture",
-    "readonly-storage-texture",
-    "writeonly-storage-texture"
+dictionary GPUStorageTextureBindingLayout {
+    GPUStorageTextureAccess access = "write-only";
+    required GPUTextureFormat format;
+    GPUTextureViewDimension viewDimension = "2d";
+};
+
+dictionary GPUExternalTextureBindingLayout {
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUBindGroup {
 };
 GPUBindGroup includes GPUObjectBase;
@@ -379,7 +438,7 @@
     required sequence<GPUBindGroupEntry> entries;
 };
 
-typedef (GPUSampler or GPUTextureView or GPUBufferBinding) GPUBindingResource;
+typedef (GPUSampler or GPUTextureView or GPUBufferBinding or GPUExternalTexture) GPUBindingResource;
 
 dictionary GPUBindGroupEntry {
     required GPUIndex32 binding;
@@ -392,7 +451,7 @@
     GPUSize64 size;
 };
 
-[Serializable]
+[Exposed=(Window, DedicatedWorker)]
 interface GPUPipelineLayout {
 };
 GPUPipelineLayout includes GPUObjectBase;
@@ -401,39 +460,38 @@
     required sequence<GPUBindGroupLayout> bindGroupLayouts;
 };
 
+[Exposed=(Window, DedicatedWorker)]
+interface GPUShaderModule {
+    Promise<GPUCompilationInfo> compilationInfo();
+};
+GPUShaderModule includes GPUObjectBase;
+
+dictionary GPUShaderModuleDescriptor : GPUObjectDescriptorBase {
+    required USVString code;
+    object sourceMap;
+};
+
 enum GPUCompilationMessageType {
     "error",
     "warning",
     "info"
 };
 
-[Serializable]
+[Exposed=(Window, DedicatedWorker), Serializable]
 interface GPUCompilationMessage {
     readonly attribute DOMString message;
     readonly attribute GPUCompilationMessageType type;
     readonly attribute unsigned long long lineNum;
     readonly attribute unsigned long long linePos;
+    readonly attribute unsigned long long offset;
+    readonly attribute unsigned long long length;
 };
 
-[Serializable]
+[Exposed=(Window, DedicatedWorker), Serializable]
 interface GPUCompilationInfo {
     readonly attribute FrozenArray<GPUCompilationMessage> messages;
 };
 
-[Serializable]
-interface GPUShaderModule {
-    Promise<GPUCompilationInfo> compilationInfo();
-};
-GPUShaderModule includes GPUObjectBase;
-
-typedef (USVString or Uint32Array) GPUCode;
-
-
-dictionary GPUShaderModuleDescriptor : GPUObjectDescriptorBase {
-    required GPUCode code;
-    object sourceMap;
-};
-
 dictionary GPUPipelineDescriptorBase : GPUObjectDescriptorBase {
     GPUPipelineLayout layout;
 };
@@ -442,40 +500,36 @@
     GPUBindGroupLayout getBindGroupLayout(unsigned long index);
 };
 
-dictionary GPUProgrammableStageDescriptor {
+dictionary GPUProgrammableStage {
     required GPUShaderModule module;
     required USVString entryPoint;
+    record<USVString, GPUPipelineConstantValue> constants;
 };
 
-[Serializable]
+typedef double GPUPipelineConstantValue; // May represent WGSL’s bool, f32, i32, u32.
+
+[Exposed=(Window, DedicatedWorker)]
 interface GPUComputePipeline {
 };
 GPUComputePipeline includes GPUObjectBase;
 GPUComputePipeline includes GPUPipelineBase;
 
 dictionary GPUComputePipelineDescriptor : GPUPipelineDescriptorBase {
-    required GPUProgrammableStageDescriptor computeStage;
+    required GPUProgrammableStage compute;
 };
 
-[Serializable]
+[Exposed=(Window, DedicatedWorker)]
 interface GPURenderPipeline {
 };
 GPURenderPipeline includes GPUObjectBase;
 GPURenderPipeline includes GPUPipelineBase;
 
 dictionary GPURenderPipelineDescriptor : GPUPipelineDescriptorBase {
-    required GPUProgrammableStageDescriptor vertexStage;
-    GPUProgrammableStageDescriptor fragmentStage;
-
-    required GPUPrimitiveTopology primitiveTopology;
-    GPURasterizationStateDescriptor rasterizationState = {};
-    required sequence<GPUColorStateDescriptor> colorStates;
-    GPUDepthStencilStateDescriptor depthStencilState;
-    GPUVertexStateDescriptor vertexState = {};
-
-    GPUSize32 sampleCount = 1;
-    GPUSampleMask sampleMask = 0xFFFFFFFF;
-    boolean alphaToCoverageEnabled = false;
+    required GPUVertexState vertex;
+    GPUPrimitiveState primitive = {};
+    GPUDepthStencilState depthStencil;
+    GPUMultisampleState multisample = {};
+    GPUFragmentState fragment;
 };
 
 enum GPUPrimitiveTopology {
@@ -486,15 +540,14 @@
     "triangle-strip"
 };
 
-dictionary GPURasterizationStateDescriptor {
+dictionary GPUPrimitiveState {
+    GPUPrimitiveTopology topology = "triangle-list";
+    GPUIndexFormat stripIndexFormat;
     GPUFrontFace frontFace = "ccw";
     GPUCullMode cullMode = "none";
+
     // Enable depth clamping (requires "depth-clamping" feature)
     boolean clampDepth = false;
-
-    GPUDepthBias depthBias = 0;
-    float depthBiasSlopeScale = 0;
-    float depthBiasClamp = 0;
 };
 
 enum GPUFrontFace {
@@ -508,15 +561,30 @@
     "back"
 };
 
-dictionary GPUColorStateDescriptor {
+dictionary GPUMultisampleState {
+    GPUSize32 count = 1;
+    GPUSampleMask mask = 0xFFFFFFFF;
+    boolean alphaToCoverageEnabled = false;
+};
+
+dictionary GPUFragmentState: GPUProgrammableStage {
+    required sequence<GPUColorTargetState> targets;
+};
+
+dictionary GPUColorTargetState {
     required GPUTextureFormat format;
 
-    GPUBlendDescriptor alphaBlend = {};
-    GPUBlendDescriptor colorBlend = {};
+    GPUBlendState blend;
     GPUColorWriteFlags writeMask = 0xF;  // GPUColorWrite.ALL
 };
 
+dictionary GPUBlendState {
+    required GPUBlendComponent color;
+    required GPUBlendComponent alpha;
+};
+
 typedef [EnforceRange] unsigned long GPUColorWriteFlags;
+[Exposed=(Window, DedicatedWorker)]
 interface GPUColorWrite {
     const GPUFlagsConstant RED   = 0x1;
     const GPUFlagsConstant GREEN = 0x2;
@@ -525,7 +593,7 @@
     const GPUFlagsConstant ALL   = 0xF;
 };
 
-dictionary GPUBlendDescriptor {
+dictionary GPUBlendComponent {
     GPUBlendFactor srcFactor = "one";
     GPUBlendFactor dstFactor = "zero";
     GPUBlendOperation operation = "add";
@@ -534,17 +602,17 @@
 enum GPUBlendFactor {
     "zero",
     "one",
-    "src-color",
-    "one-minus-src-color",
+    "src",
+    "one-minus-src",
     "src-alpha",
     "one-minus-src-alpha",
-    "dst-color",
-    "one-minus-dst-color",
+    "dst",
+    "one-minus-dst",
     "dst-alpha",
     "one-minus-dst-alpha",
     "src-alpha-saturated",
-    "blend-color",
-    "one-minus-blend-color"
+    "constant",
+    "one-minus-constant"
 };
 
 enum GPUBlendOperation {
@@ -555,20 +623,24 @@
     "max"
 };
 
-dictionary GPUDepthStencilStateDescriptor {
+dictionary GPUDepthStencilState {
     required GPUTextureFormat format;
 
     boolean depthWriteEnabled = false;
     GPUCompareFunction depthCompare = "always";
 
-    GPUStencilStateFaceDescriptor stencilFront = {};
-    GPUStencilStateFaceDescriptor stencilBack = {};
+    GPUStencilFaceState stencilFront = {};
+    GPUStencilFaceState stencilBack = {};
 
     GPUStencilValue stencilReadMask = 0xFFFFFFFF;
     GPUStencilValue stencilWriteMask = 0xFFFFFFFF;
+
+    GPUDepthBias depthBias = 0;
+    float depthBiasSlopeScale = 0;
+    float depthBiasClamp = 0;
 };
 
-dictionary GPUStencilStateFaceDescriptor {
+dictionary GPUStencilFaceState {
     GPUCompareFunction compare = "always";
     GPUStencilOperation failOp = "keep";
     GPUStencilOperation depthFailOp = "keep";
@@ -592,61 +664,61 @@
 };
 
 enum GPUVertexFormat {
-    "uchar2",
-    "uchar4",
-    "char2",
-    "char4",
-    "uchar2norm",
-    "uchar4norm",
-    "char2norm",
-    "char4norm",
-    "ushort2",
-    "ushort4",
-    "short2",
-    "short4",
-    "ushort2norm",
-    "ushort4norm",
-    "short2norm",
-    "short4norm",
-    "half2",
-    "half4",
-    "float",
-    "float2",
-    "float3",
-    "float4",
-    "uint",
-    "uint2",
-    "uint3",
-    "uint4",
-    "int",
-    "int2",
-    "int3",
-    "int4"
+    "uint8x2",
+    "uint8x4",
+    "sint8x2",
+    "sint8x4",
+    "unorm8x2",
+    "unorm8x4",
+    "snorm8x2",
+    "snorm8x4",
+    "uint16x2",
+    "uint16x4",
+    "sint16x2",
+    "sint16x4",
+    "unorm16x2",
+    "unorm16x4",
+    "snorm16x2",
+    "snorm16x4",
+    "float16x2",
+    "float16x4",
+    "float32",
+    "float32x2",
+    "float32x3",
+    "float32x4",
+    "uint32",
+    "uint32x2",
+    "uint32x3",
+    "uint32x4",
+    "sint32",
+    "sint32x2",
+    "sint32x3",
+    "sint32x4",
 };
 
-enum GPUInputStepMode {
+enum GPUVertexStepMode {
     "vertex",
     "instance"
 };
 
-dictionary GPUVertexStateDescriptor {
-    GPUIndexFormat indexFormat;
-    sequence<GPUVertexBufferLayoutDescriptor?> vertexBuffers = [];
+dictionary GPUVertexState: GPUProgrammableStage {
+    sequence<GPUVertexBufferLayout?> buffers = [];
 };
 
-dictionary GPUVertexBufferLayoutDescriptor {
+dictionary GPUVertexBufferLayout {
     required GPUSize64 arrayStride;
-    GPUInputStepMode stepMode = "vertex";
-    required sequence<GPUVertexAttributeDescriptor> attributes;
+    GPUVertexStepMode stepMode = "vertex";
+    required sequence<GPUVertexAttribute> attributes;
 };
 
-dictionary GPUVertexAttributeDescriptor {
+dictionary GPUVertexAttribute {
     required GPUVertexFormat format;
     required GPUSize64 offset;
 
     required GPUIndex32 shaderLocation;
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUCommandBuffer {
     readonly attribute Promise<double> executionTime;
 };
@@ -655,39 +727,40 @@
 dictionary GPUCommandBufferDescriptor : GPUObjectDescriptorBase {
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUCommandEncoder {
     GPURenderPassEncoder beginRenderPass(GPURenderPassDescriptor descriptor);
     GPUComputePassEncoder beginComputePass(optional GPUComputePassDescriptor descriptor = {});
 
-    void copyBufferToBuffer(
+    undefined copyBufferToBuffer(
         GPUBuffer source,
         GPUSize64 sourceOffset,
         GPUBuffer destination,
         GPUSize64 destinationOffset,
         GPUSize64 size);
 
-    void copyBufferToTexture(
-        GPUBufferCopyView source,
-        GPUTextureCopyView destination,
+    undefined copyBufferToTexture(
+        GPUImageCopyBuffer source,
+        GPUImageCopyTexture destination,
         GPUExtent3D copySize);
 
-    void copyTextureToBuffer(
-        GPUTextureCopyView source,
-        GPUBufferCopyView destination,
+    undefined copyTextureToBuffer(
+        GPUImageCopyTexture source,
+        GPUImageCopyBuffer destination,
         GPUExtent3D copySize);
 
-    void copyTextureToTexture(
-        GPUTextureCopyView source,
-        GPUTextureCopyView destination,
+    undefined copyTextureToTexture(
+        GPUImageCopyTexture source,
+        GPUImageCopyTexture destination,
         GPUExtent3D copySize);
 
-    void pushDebugGroup(USVString groupLabel);
-    void popDebugGroup();
-    void insertDebugMarker(USVString markerLabel);
+    undefined pushDebugGroup(USVString groupLabel);
+    undefined popDebugGroup();
+    undefined insertDebugMarker(USVString markerLabel);
 
-    void writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
+    undefined writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
 
-    void resolveQuerySet(
+    undefined resolveQuerySet(
         GPUQuerySet querySet,
         GPUSize32 firstQuery,
         GPUSize32 queryCount,
@@ -700,57 +773,61 @@
 
 dictionary GPUCommandEncoderDescriptor : GPUObjectDescriptorBase {
     boolean measureExecutionTime = false;
-
-    // TODO: reusability flag?
 };
 
-dictionary GPUTextureDataLayout {
+dictionary GPUImageDataLayout {
     GPUSize64 offset = 0;
     GPUSize32 bytesPerRow;
     GPUSize32 rowsPerImage;
 };
 
-dictionary GPUBufferCopyView : GPUTextureDataLayout {
+dictionary GPUImageCopyBuffer : GPUImageDataLayout {
     required GPUBuffer buffer;
 };
 
-dictionary GPUTextureCopyView {
+dictionary GPUImageCopyTexture {
     required GPUTexture texture;
     GPUIntegerCoordinate mipLevel = 0;
     GPUOrigin3D origin = {};
     GPUTextureAspect aspect = "all";
 };
 
-dictionary GPUImageBitmapCopyView {
-    required ImageBitmap imageBitmap;
+dictionary GPUImageCopyTextureTagged : GPUImageCopyTexture {
+    GPUPredefinedColorSpace colorSpace = "srgb";
+    boolean premultipliedAlpha = false;
+};
+
+dictionary GPUImageCopyExternalImage {
+    required (ImageBitmap or HTMLCanvasElement or OffscreenCanvas) source;
     GPUOrigin2D origin = {};
 };
 
 interface mixin GPUProgrammablePassEncoder {
-    void setBindGroup(GPUIndex32 index, GPUBindGroup bindGroup,
+    undefined setBindGroup(GPUIndex32 index, GPUBindGroup bindGroup,
                       optional sequence<GPUBufferDynamicOffset> dynamicOffsets = []);
 
-    void setBindGroup(GPUIndex32 index, GPUBindGroup bindGroup,
+    undefined setBindGroup(GPUIndex32 index, GPUBindGroup bindGroup,
                       Uint32Array dynamicOffsetsData,
                       GPUSize64 dynamicOffsetsDataStart,
                       GPUSize32 dynamicOffsetsDataLength);
 
-    void pushDebugGroup(USVString groupLabel);
-    void popDebugGroup();
-    void insertDebugMarker(USVString markerLabel);
+    undefined pushDebugGroup(USVString groupLabel);
+    undefined popDebugGroup();
+    undefined insertDebugMarker(USVString markerLabel);
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUComputePassEncoder {
-    void setPipeline(GPUComputePipeline pipeline);
-    void dispatch(GPUSize32 x, optional GPUSize32 y = 1, optional GPUSize32 z = 1);
-    void dispatchIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
+    undefined setPipeline(GPUComputePipeline pipeline);
+    undefined dispatch(GPUSize32 x, optional GPUSize32 y = 1, optional GPUSize32 z = 1);
+    undefined dispatchIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
 
-    void beginPipelineStatisticsQuery(GPUQuerySet querySet, GPUSize32 queryIndex);
-    void endPipelineStatisticsQuery();
+    undefined beginPipelineStatisticsQuery(GPUQuerySet querySet, GPUSize32 queryIndex);
+    undefined endPipelineStatisticsQuery();
 
-    void writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
+    undefined writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
 
-    void endPass();
+    undefined endPass();
 };
 GPUComputePassEncoder includes GPUObjectBase;
 GPUComputePassEncoder includes GPUProgrammablePassEncoder;
@@ -759,64 +836,65 @@
 };
 
 interface mixin GPURenderEncoderBase {
-    void setPipeline(GPURenderPipeline pipeline);
+    undefined setPipeline(GPURenderPipeline pipeline);
 
-    void setIndexBuffer(GPUBuffer buffer, optional GPUSize64 offset = 0, optional GPUSize64 size = 0);
-    void setVertexBuffer(GPUIndex32 slot, GPUBuffer buffer, optional GPUSize64 offset = 0, optional GPUSize64 size = 0);
+    undefined setIndexBuffer(GPUBuffer buffer, GPUIndexFormat indexFormat, optional GPUSize64 offset = 0, optional GPUSize64 size);
+    undefined setVertexBuffer(GPUIndex32 slot, GPUBuffer buffer, optional GPUSize64 offset = 0, optional GPUSize64 size);
 
-    void draw(GPUSize32 vertexCount, optional GPUSize32 instanceCount = 1,
+    undefined draw(GPUSize32 vertexCount, optional GPUSize32 instanceCount = 1,
               optional GPUSize32 firstVertex = 0, optional GPUSize32 firstInstance = 0);
-    void drawIndexed(GPUSize32 indexCount, optional GPUSize32 instanceCount = 1,
+    undefined drawIndexed(GPUSize32 indexCount, optional GPUSize32 instanceCount = 1,
                      optional GPUSize32 firstIndex = 0,
                      optional GPUSignedOffset32 baseVertex = 0,
                      optional GPUSize32 firstInstance = 0);
 
-    void drawIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
-    void drawIndexedIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
+    undefined drawIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
+    undefined drawIndexedIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPURenderPassEncoder {
-    void setViewport(float x, float y,
+    undefined setViewport(float x, float y,
                      float width, float height,
                      float minDepth, float maxDepth);
 
-    void setScissorRect(GPUIntegerCoordinate x, GPUIntegerCoordinate y,
+    undefined setScissorRect(GPUIntegerCoordinate x, GPUIntegerCoordinate y,
                         GPUIntegerCoordinate width, GPUIntegerCoordinate height);
 
-    void setBlendColor(GPUColor color);
-    void setStencilReference(GPUStencilValue reference);
+    undefined setBlendConstant(GPUColor color);
+    undefined setStencilReference(GPUStencilValue reference);
 
-    void beginOcclusionQuery(GPUSize32 queryIndex);
-    void endOcclusionQuery();
+    undefined beginOcclusionQuery(GPUSize32 queryIndex);
+    undefined endOcclusionQuery();
 
-    void beginPipelineStatisticsQuery(GPUQuerySet querySet, GPUSize32 queryIndex);
-    void endPipelineStatisticsQuery();
+    undefined beginPipelineStatisticsQuery(GPUQuerySet querySet, GPUSize32 queryIndex);
+    undefined endPipelineStatisticsQuery();
 
-    void writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
+    undefined writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
 
-    void executeBundles(sequence<GPURenderBundle> bundles);
-    void endPass();
+    undefined executeBundles(sequence<GPURenderBundle> bundles);
+    undefined endPass();
 };
 GPURenderPassEncoder includes GPUObjectBase;
 GPURenderPassEncoder includes GPUProgrammablePassEncoder;
 GPURenderPassEncoder includes GPURenderEncoderBase;
 
 dictionary GPURenderPassDescriptor : GPUObjectDescriptorBase {
-    required sequence<GPURenderPassColorAttachmentDescriptor> colorAttachments;
-    GPURenderPassDepthStencilAttachmentDescriptor depthStencilAttachment;
+    required sequence<GPURenderPassColorAttachment> colorAttachments;
+    GPURenderPassDepthStencilAttachment depthStencilAttachment;
     GPUQuerySet occlusionQuerySet;
 };
 
-dictionary GPURenderPassColorAttachmentDescriptor {
-    required GPUTextureView attachment;
+dictionary GPURenderPassColorAttachment {
+    required GPUTextureView view;
     GPUTextureView resolveTarget;
 
     required (GPULoadOp or GPUColor) loadValue;
-    GPUStoreOp storeOp = "store";
+    required GPUStoreOp storeOp;
 };
 
-dictionary GPURenderPassDepthStencilAttachmentDescriptor {
-    required GPUTextureView attachment;
+dictionary GPURenderPassDepthStencilAttachment {
+    required GPUTextureView view;
 
     required (GPULoadOp or float) depthLoadValue;
     required GPUStoreOp depthStoreOp;
@@ -833,9 +911,16 @@
 
 enum GPUStoreOp {
     "store",
-    "clear"
+    "discard"
+};
+
+dictionary GPURenderPassLayout: GPUObjectDescriptorBase {
+    required sequence<GPUTextureFormat> colorFormats;
+    GPUTextureFormat depthStencilFormat;
+    GPUSize32 sampleCount = 1;
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPURenderBundle {
 };
 GPURenderBundle includes GPUObjectBase;
@@ -843,6 +928,7 @@
 dictionary GPURenderBundleDescriptor : GPUObjectDescriptorBase {
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPURenderBundleEncoder {
     GPURenderBundle finish(optional GPURenderBundleDescriptor descriptor = {});
 };
@@ -850,50 +936,40 @@
 GPURenderBundleEncoder includes GPUProgrammablePassEncoder;
 GPURenderBundleEncoder includes GPURenderEncoderBase;
 
-dictionary GPURenderBundleEncoderDescriptor : GPUObjectDescriptorBase {
-    required sequence<GPUTextureFormat> colorFormats;
-    GPUTextureFormat depthStencilFormat;
-    GPUSize32 sampleCount = 1;
+dictionary GPURenderBundleEncoderDescriptor : GPURenderPassLayout {
+    boolean depthReadOnly = false;
+    boolean stencilReadOnly = false;
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUQueue {
-    void submit(sequence<GPUCommandBuffer> commandBuffers);
+    undefined submit(sequence<GPUCommandBuffer> commandBuffers);
 
-    GPUFence createFence(optional GPUFenceDescriptor descriptor = {});
-    void signal(GPUFence fence, GPUFenceValue signalValue);
+    Promise<undefined> onSubmittedWorkDone();
 
-    void writeBuffer(
+    undefined writeBuffer(
         GPUBuffer buffer,
         GPUSize64 bufferOffset,
         [AllowShared] BufferSource data,
         optional GPUSize64 dataOffset = 0,
         optional GPUSize64 size);
 
-    void writeTexture(
-      GPUTextureCopyView destination,
+    undefined writeTexture(
+      GPUImageCopyTexture destination,
       [AllowShared] BufferSource data,
-      GPUTextureDataLayout dataLayout,
+      GPUImageDataLayout dataLayout,
       GPUExtent3D size);
 
-    void copyImageBitmapToTexture(
-        GPUImageBitmapCopyView source,
-        GPUTextureCopyView destination,
+    undefined copyExternalImageToTexture(
+        GPUImageCopyExternalImage source,
+        GPUImageCopyTextureTagged destination,
         GPUExtent3D copySize);
 };
 GPUQueue includes GPUObjectBase;
 
-interface GPUFence {
-    GPUFenceValue getCompletedValue();
-    Promise<void> onCompletion(GPUFenceValue completionValue);
-};
-GPUFence includes GPUObjectBase;
-
-dictionary GPUFenceDescriptor : GPUObjectDescriptorBase {
-    GPUFenceValue initialValue = 0;
-};
-
+[Exposed=(Window, DedicatedWorker)]
 interface GPUQuerySet {
-    void destroy();
+    undefined destroy();
 };
 GPUQuerySet includes GPUObjectBase;
 
@@ -917,24 +993,38 @@
     "compute-shader-invocations"
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUCanvasContext {
-    GPUSwapChain configureSwapChain(GPUSwapChainDescriptor descriptor);
+    readonly attribute (HTMLCanvasElement or OffscreenCanvas) canvas;
+
+    undefined configure(GPUCanvasConfiguration configuration);
+    undefined unconfigure();
 
-    Promise<GPUTextureFormat> getSwapChainPreferredFormat(GPUDevice device);
+    GPUTextureFormat getPreferredFormat(GPUAdapter adapter);
+    GPUTexture getCurrentTexture();
+};
+
+enum GPUCanvasCompositingAlphaMode {
+    "opaque",
+    "premultiplied",
 };
 
-dictionary GPUSwapChainDescriptor : GPUObjectDescriptorBase {
+dictionary GPUCanvasConfiguration {
     required GPUDevice device;
     required GPUTextureFormat format;
     GPUTextureUsageFlags usage = 0x10;  // GPUTextureUsage.RENDER_ATTACHMENT
+    GPUPredefinedColorSpace colorSpace = "srgb";
+    GPUCanvasCompositingAlphaMode compositingAlphaMode = "opaque";
+    GPUExtent3D size;
 };
 
-interface GPUSwapChain {
-    GPUTexture getCurrentTexture();
+enum GPUDeviceLostReason {
+    "destroyed",
 };
-GPUSwapChain includes GPUObjectBase;
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUDeviceLostInfo {
+    readonly attribute (GPUDeviceLostReason or undefined) reason;
     readonly attribute DOMString message;
 };
 
@@ -947,10 +1037,12 @@
     "validation"
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUOutOfMemoryError {
     constructor();
 };
 
+[Exposed=(Window, DedicatedWorker)]
 interface GPUValidationError {
     constructor(DOMString message);
     readonly attribute DOMString message;
@@ -959,7 +1051,7 @@
 typedef (GPUOutOfMemoryError or GPUValidationError) GPUError;
 
 partial interface GPUDevice {
-    void pushErrorScope(GPUErrorFilter filter);
+    undefined pushErrorScope(GPUErrorFilter filter);
     Promise<GPUError?> popErrorScope();
 };
 
@@ -984,7 +1076,6 @@
 };
 
 typedef [EnforceRange] unsigned long GPUBufferDynamicOffset;
-typedef [EnforceRange] unsigned long long GPUFenceValue;
 typedef [EnforceRange] unsigned long GPUStencilValue;
 typedef [EnforceRange] unsigned long GPUSampleMask;
 typedef [EnforceRange] long GPUDepthBias;
@@ -1019,8 +1110,8 @@
 typedef (sequence<GPUIntegerCoordinate> or GPUOrigin3DDict) GPUOrigin3D;
 
 dictionary GPUExtent3DDict {
-    GPUIntegerCoordinate width = 1;
+    required GPUIntegerCoordinate width;
     GPUIntegerCoordinate height = 1;
-    GPUIntegerCoordinate depth = 1;
+    GPUIntegerCoordinate depthOrArrayLayers = 1;
 };
 typedef (sequence<GPUIntegerCoordinate> or GPUExtent3DDict) GPUExtent3D;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebHID.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebHID.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebHID.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebHID.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,127 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: WebHID API (https://wicg.github.io/webhid/)
+
+dictionary HIDDeviceFilter {
+    unsigned long vendorId;
+    unsigned short productId;
+    unsigned short usagePage;
+    unsigned short usage;
+};
+
+dictionary HIDDeviceRequestOptions {
+    required sequence<HIDDeviceFilter> filters;
+};
+
+[
+    Exposed=Window,
+    SecureContext
+]
+interface HID : EventTarget {
+    attribute EventHandler onconnect;
+    attribute EventHandler ondisconnect;
+    Promise<sequence<HIDDevice>> getDevices();
+    Promise<sequence<HIDDevice>> requestDevice(
+        HIDDeviceRequestOptions options);
+};
+
+[SecureContext] partial interface Navigator {
+    [SameObject] readonly attribute HID hid;
+};
+
+dictionary HIDConnectionEventInit : EventInit {
+    required HIDDevice device;
+};
+
+[
+    Exposed=Window,
+    SecureContext
+] interface HIDConnectionEvent : Event {
+    constructor(DOMString type, HIDConnectionEventInit eventInitDict);
+    [SameObject] readonly attribute HIDDevice device;
+};
+
+dictionary HIDInputReportEventInit : EventInit {
+    required HIDDevice device;
+    required octet reportId;
+    required DataView data;
+};
+
+[
+    Exposed=Window,
+    SecureContext
+] interface HIDInputReportEvent : Event {
+    constructor(DOMString type, HIDInputReportEventInit eventInitDict);
+    [SameObject] readonly attribute HIDDevice device;
+    readonly attribute octet reportId;
+    readonly attribute DataView data;
+};
+
+enum HIDUnitSystem {
+    "none", "si-linear", "si-rotation", "english-linear",
+    "english-rotation", "vendor-defined", "reserved"
+};
+
+dictionary HIDReportItem {
+    boolean isAbsolute;
+    boolean isArray;
+    boolean isBufferedBytes;
+    boolean isConstant;
+    boolean isLinear;
+    boolean isRange;
+    boolean isVolatile;
+    boolean hasNull;
+    boolean hasPreferredState;
+    boolean wrap;
+    sequence<unsigned long> usages;
+    unsigned long usageMinimum;
+    unsigned long usageMaximum;
+    unsigned short reportSize;
+    unsigned short reportCount;
+    byte unitExponent;
+    HIDUnitSystem unitSystem;
+    byte unitFactorLengthExponent;
+    byte unitFactorMassExponent;
+    byte unitFactorTimeExponent;
+    byte unitFactorTemperatureExponent;
+    byte unitFactorCurrentExponent;
+    byte unitFactorLuminousIntensityExponent;
+    long logicalMinimum;
+    long logicalMaximum;
+    long physicalMinimum;
+    long physicalMaximum;
+    sequence<DOMString> strings;
+};
+
+dictionary HIDReportInfo {
+    octet reportId;
+    sequence<HIDReportItem> items;
+};
+
+dictionary HIDCollectionInfo {
+    unsigned short usagePage;
+    unsigned short usage;
+    octet type;
+    sequence<HIDCollectionInfo> children;
+    sequence<HIDReportInfo> inputReports;
+    sequence<HIDReportInfo> outputReports;
+    sequence<HIDReportInfo> featureReports;
+};
+
+[
+    Exposed=Window,
+    SecureContext
+] interface HIDDevice : EventTarget {
+    attribute EventHandler oninputreport;
+    readonly attribute boolean opened;
+    readonly attribute unsigned short vendorId;
+    readonly attribute unsigned short productId;
+    readonly attribute DOMString productName;
+    readonly attribute FrozenArray<HIDCollectionInfo> collections;
+    Promise<undefined> open();
+    Promise<undefined> close();
+    Promise<undefined> sendReport([EnforceRange] octet reportId, BufferSource data);
+    Promise<undefined> sendFeatureReport([EnforceRange] octet reportId, BufferSource data);
+    Promise<DataView> receiveFeatureReport([EnforceRange] octet reportId);
+};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebXRDevice.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebXRDevice.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebXRDevice.webidl	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WebXRDevice.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -42,13 +42,13 @@
   [SameObject] readonly attribute XRInputSourceArray inputSources;
 
   // Methods
-  void updateRenderState(optional XRRenderStateInit state = {});
+  undefined updateRenderState(optional XRRenderStateInit state = {});
   [NewObject] Promise<XRReferenceSpace> requestReferenceSpace(XRReferenceSpaceType type);
 
   long requestAnimationFrame(XRFrameRequestCallback callback);
-  void cancelAnimationFrame(long handle);
+  undefined cancelAnimationFrame(long handle);
 
-  Promise<void> end();
+  Promise<undefined> end();
 
   // Events
   attribute EventHandler onend;
@@ -73,7 +73,7 @@
   readonly attribute XRWebGLLayer? baseLayer;
 };
 
-callback XRFrameRequestCallback = void (DOMHighResTimeStamp time, XRFrame frame);
+callback XRFrameRequestCallback = undefined (DOMHighResTimeStamp time, XRFrame frame);
 
 [SecureContext, Exposed=Window] interface XRFrame {
   [SameObject] readonly attribute XRSession session;
@@ -220,7 +220,7 @@
 };
 
 partial interface mixin WebGLRenderingContextBase {
-    Promise<void> makeXRCompatible();
+    Promise<undefined> makeXRCompatible();
 };
 
 [SecureContext, Exposed=Window]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WritableStreamDefaultWriter.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WritableStreamDefaultWriter.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WritableStreamDefaultWriter.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WritableStreamDefaultWriter.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Source: https://streams.spec.whatwg.org/#writablestreamdefaultwriter
+ */
+ 
+[Exposed=(Window,Worker,Worklet)]
+interface WritableStreamDefaultWriter {
+  constructor(WritableStream stream);
+
+  readonly attribute Promise<undefined> closed;
+  readonly attribute unrestricted double? desiredSize;
+  readonly attribute Promise<undefined> ready;
+
+  Promise<undefined> abort(optional any reason);
+  Promise<undefined> close();
+  undefined releaseLock();
+  Promise<undefined> write(optional any chunk);
+};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WritableStream.webidl thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WritableStream.webidl
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/web-sys/webidls/unstable/WritableStream.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/web-sys/webidls/unstable/WritableStream.webidl	2021-12-09 12:01:26.000000000 +0000
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Source: https://streams.spec.whatwg.org/#ws-class-definition
+ */
+ 
+[Exposed=(Window,Worker,Worklet), Transferable]
+interface WritableStream {
+  constructor(optional object underlyingSink, optional QueuingStrategy strategy = {});
+
+  readonly attribute boolean locked;
+
+  Promise<undefined> abort(optional any reason);
+  Promise<undefined> close();
+  WritableStreamDefaultWriter getWriter();
+};
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"d15a0464554e57323507a2ff34925a2c592f3dffec9beb092c7ce985440f5bda","LICENSE.md":"fd232cfaeeff018cd3b9f22e0279b1c2237742999277596638800e967f6e4a29","src/activation.rs":"0e25834dfecd59391e2ecfdaa2e01bb5ac4d181778b47d0b9f67c56a6b2bd75f","src/audioclient.rs":"8c645d4ddb171620a527bcc14fa2904ff9aeb529262e68a0a9957d2ed77118be","src/audiosessiontypes.rs":"ba8cd1950cdab112861208ac1ecc35e656cbbe36e60c31315e547cfe47707685","src/basetsd.rs":"7b879d3164d5e6ec1b94d18a6b58f74a7f4e62fc279df32126e76c4f3138239d","src/bcrypt.rs":"05fe44190a37dd744bff8fc682f25a47c5f4239d417b213d18542aaa19b08b06","src/cfg.rs":"057ace203f04f8c09b6f68fefba7d3eb6644c46f2e44ca8f1364a8bc3bdd4970","src/cfgmgr32.rs":"714289f058283fc89fc79bbd4932bdbc0e9a88edd62a1787aac82c338f2dfb45","src/combaseapi.rs":"45458b1e0d918b237afd7e9581e2714b58ee009a91bbec45827694d1159a2e8b","src/commctrl.rs":"c0173aabd50f34a85c2523876fa0191d052d1d0c157f95ed228d98508806cc7d","src/commdlg.rs":"e75f64491eea54f651884eb3cc5353588c7fe54b086b43557d6d4917abbf95cd","src/corsym.rs":"301f937c7cb394675b2127a24595beef261d269d8f7cb45d6b4ac21a063985e3","src/d2d1.rs":"e7aa08883d85e2631f5327541e644b650ad009095daadef606bb06d9ac99afd3","src/d2dbasetypes.rs":"5a26048c997a580d8bb2a3512f1cb20dba411da99ffd6b23f4b0615ab9378058","src/d3d10shader.rs":"d6edf923fa8442be35b7f4ebebcd2e4bec4c3842ed5aee4bfd05c2de11edc4e0","src/d3d11.rs":"3f2f681357730df7ea954fb78903f0f0ad0bb3b577727307e751fd9598a4e837","src/d3d11shader.rs":"29612cc75ba238e2cd691fdcc01be9c79ca12b046e207d3cbfc5af23f04c4cb9","src/d3d12.rs":"906e512385e78756fe84f9a9622c510ce5a6daeb121127cf93f11af0f2fa3763","src/d3d12sdklayers.rs":"b50edb48a1c51bc7e3bf7176733c3dad4eb45a4e9747096e3b5a723052e130c8","src/d3d12shader.rs":"ff58932ef32c108348e41864f09ac6f909d641cac4f94c3e4f6c3dc4e5916521","src/d3d9.rs":"e01614130a4d68bb6e2a23f62ffb4d5016381e9026f8477aaca64851c8dcad53","src/d3d9caps.rs":"d4bcf91b7ae307388c91c19eacdb808506faea184b03178feee5c47959211b7b","src/d3d9types.rs":"1e10aae6297bc8dc083b111da496313ff19dcb9b88450e2637f8e98c0401519c","src/d3dcommon.rs":"f841b2e4df6dfccb9eb1955add24689db7b173780ec25e99b89097140a012152","src/d3dcompiler.rs":"02269410bd7f83f49391f852320ca0d76fd8d907ed22c68a003af65b3f5ab54a","src/dbghelp.rs":"c0ea5bcd04f414a696cd876439a7c4d6ee63627f4662705d189fd6e0412622f8","src/dcommon.rs":"8889ca66e2f89f1c275e5d6b7d6b203e7f25b4e7a262689b2ec6f04b9d1b5ae8","src/devpropdef.rs":"74948513ed623d3bdf1ea3fbf1f540b3e9e46efb9c1674ecccfe7f2fae5792f2","src/docobj.rs":"43e214d9d0c436a88ed2c620b8386e58e4d549ba9c8be51bf52291caf95e225d","src/dpapi.rs":"d44a1a6c9e52b34e8e87df1079b97081c646f07d0eee51f0d0cf66ae1c6fd58a","src/dsgetdc.rs":"5911c35ef3d80a5162fdbea6902f9b07033b746ff91bff2657a0971edb07bff2","src/dsound.rs":"53a5532d645e1b7995f0b4a0f0711fc66da8a27b7f8c87ce3d9e0882cfdca07c","src/dsrole.rs":"50b27a8afb11188ce24ab49620fe69ea21658148d8fd6076b8927175db5c1a9e","src/dwmapi.rs":"e65ca961eec0db275e211e04c59a8995c8c13d36ab08dc36ce197d9a4856266f","src/dwrite.rs":"f138d36e8b93778a7866cc755893b4da19cfd6ce42427139589a0bbaa294eb44","src/dxgi.rs":"5b6fcc5c665df1c0c6ed3de5d678a7bade1bb8ab1acbe952b784ce99fc817e53","src/dxgi1_2.rs":"6ba44755d715f2493236103fc5c24d7d45dff2e1fc3690aefbd4eb6c859dbc07","src/dxgi1_3.rs":"1f86a9db5fd45199fcc3ce56423e5fcf0c58df4001e2b50c5586d38ab820b78f","src/dxgi1_4.rs":"c578e6fcb82d535b20fc10232b75a7b9512d068919cc1e3f1c7cf55f3eb46460","src/dxgiformat.rs":"2e73df34f480b6ef3b5e21de0a520dacec91b00772e42786568fd162ca5e9aa6","src/dxgitype.rs":"204b8dae38c13a1dd8cd2ce6ca68851f743b416213d6db1cd0d96808bcbf7058","src/errhandlingapi.rs":"a70f9db3dd8ab60aba0daf39f12b527e54e312ca640e0b80d80c93ffdb6913c6","src/excpt.rs":"b07cf9ff0d23dd50c0776d048d0c579e401b7d729635f78998f85d35f33f05a4","src/fileapi.rs":"d31814c612bbd9372abbf6f8455fc2af89ac236c6b1855da10d66545e485ec57","src/gl.rs":"9429708bb97aeecb2c40030460ed0c3415fc0f2335c9513c68afa6157bd9b465","src/guiddef.rs":"86618dcd39c77048c7e453e6e86dafe90358eb7f97144f9672ae09e7b9855729","src/heapapi.rs":"21e420ba7641e507e8f2801d2b0ed25dbcb98e967924d711beb5cbfa8a5785e4","src/hidclass.rs":"a93380d35dc4d45807b10bbd69ee63eb8517b75989b68391685070a2fcfbefa1","src/hidpi.rs":"0b641fc119ac35761fe8e5eaed9a0781e9018598ea269d6cd386dbf5563ab9a0","src/hidsdi.rs":"50abb938ea8d0af90ccdea7ac3de4bc10fe42e34bc6a6d6eb4da1b330727da34","src/hidusage.rs":"44adc029bc89f0d4977b1295b7e998ddabf5283de66e1e33146bda8968d1d98b","src/hstring.rs":"51b3e63e3f1ed48f54c63c3e820e0563fb857b2743529d5f947f718d43425b89","src/http.rs":"ebb8b8db9e786e2683ad8b9a9066ef418df773ae7ce4d75f166cb5321f85f5a0","src/imm.rs":"b9277502f17f4cc6bde4f80f722ec1b976913355edbf162814ccfec2b3b080fd","src/inaddr.rs":"938143669da02c83a31d207be11e2176ed5219edf0e6f8f7a5534a5c6c3ce8d1","src/inspectable.rs":"b01f1814a233a77bf9f25c264747252c0464388c7d9c7302e5bde57502b8139b","src/ksmedia.rs":"acb96b1ea0cf3b5397f9037958093c6b4dbb54c4246516e57b9fed055e8e69c1","src/lib.rs":"8a7840b030f56883f68bdf90a1a04df8be2a5e2698a9ea86c73fac59c9f09b6e","src/libloaderapi.rs":"21a5d17c9f8ac4c006b515979964a8870f30710be4482083f45c6a41a16a36ce","src/lmaccess.rs":"712661c871569513334152bdcdf56c07776c560a22cd5b892a0f38e1957e28db","src/lmcons.rs":"3449aab4399cc36e7d7db551e384d82dfa4204178c4cfb9642f90645687fbc81","src/lmdfs.rs":"c351cdb2d10bf3a7c5ce7400dcdca41a792554e21e75fa9e5378ac18d8d3e4e7","src/lmerrlog.rs":"7937928544d27575e302c5e9c5e6803e9033e1f4d715e7ca29be202276d7d7a6","src/lmjoin.rs":"362cdc71f3f50099b862eff0733b3a57dd0f95cac15943135f794424f651b916","src/lsalookup.rs":"4aef1a95033444181f2b2b9df364ea165b0fdedb396c63e5d12db6b7398a3d5f","src/macros.rs":"5dacc570f226b6f1ad31d76a03675f0d182a3d578846920000fabb7cd92fc7f8","src/memoryapi.rs":"2273b8bfd7fc36dcf654c320826952ad502e8922a84174f8c1f7ed08aa555a04","src/minschannel.rs":"139828de63a0a4476de2bee454f5bca5e8a46cc29f1680339bb2804ee2d17322","src/minwinbase.rs":"6cd387a7f79e1a708bc48b5b27eaeaa7aadf0fff7a5e0a76cda0bdf3fa871863","src/minwindef.rs":"47ba4f2ec7789109ae339170715ed76288ae60ee57a4f06d5cc50a0e6855699f","src/mmdeviceapi.rs":"c8b7f7b6b78488d23ccba2b34e8765eac60ec9f08e19c96b377d957f65b1b6d1","src/mmreg.rs":"1621fad6eaa16d1e5ca95055fd11bf066b777b1343625f9fdc74e4d313d60dea","src/mmsystem.rs":"f6a2bff3bf80af1468de2c2a5f7ff2ced2b625adaf24f08f9b303965ed5ee371","src/mscat.rs":"9226a8e30546c4142e4fcdc716f8a15cc7c8081c9e875ec72ff9e8551f86f9a1","src/mssip.rs":"d7e2b91e358ff4986e700396d04f92aa1671aafada0d4889914a413177c091e1","src/nb30.rs":"dd85d7849111f04d33895835269929dc219e04de4373e91468eb053e3e0a5c52","src/ncrypt.rs":"29f168dcddeaa2cb231a7174cec672be83cca192ffc4632cead4c4a25189fb49","src/ntdef.rs":"3be66042d16a862f0fed8f48406b08c3091fbf92885a44efb7747f4a764d7de7","src/ntsecapi.rs":"dfb2cc7e23e8b20fa5ffd30ccecdb81b62d8ffeb68fdf99f93fb141ff4155afd","src/ntstatus.rs":"de6208f4e119a6405c1726433ea5e47a8b5f46b345f5809e9f580cce88360a79","src/oaidl.rs":"640c911e39888928baf77145cca34c1a768bfd759ec9709f70649a2946cb3246","src/objbase.rs":"7c9edb6a9ea72baddb15a6aec3602b3f9e7b1ce969dd655f440eae0ede1372e2","src/objidl.rs":"2a623b989f2a216edca3bd118eceff41267632839a3fd4410df9a7c126a87b64","src/objidlbase.rs":"3415a0bcd1b5b63ff48e17138ff87dae7c31eaeb323ae81f34b6712efade1d04","src/olectl.rs":"da2014c3d5858c5abff1635e1b8c8223333e7d22d28cac614aac3305a7f04ee4","src/pdh.rs":"eb01459c2acc456ecd204c6716d26027a6c77c2b4a9b698d3c922254fe2cc319","src/playsoundapi.rs":"7efddfc8601de565946c8c93074211c83b20866a1588e36e0518bba9864d0cf0","src/processsnapshot.rs":"df99a56280e6e41c5896341ffa1abe734f6c8662f4d7ea960cb97fb34c5b85d9","src/processthreadsapi.rs":"bf8edf8984ee97bc5054e68d02ec4633b5f15720602ab19c95d78e7d420c9cc8","src/propidl.rs":"88b5f176e4624063cadd8db95db52bf07cff421d73a8cfe319f992a9c99cd315","src/propsys.rs":"05c411639479f88e77383c585117a886f48ea7453260210db9f283e2cafdffbf","src/prsht.rs":"f862538c0010a51a02e5f24b3a44b54ba5993c32400b98a3b0558741ae7473a3","src/psapi.rs":"512523c5f8334c9ad221a73776c0ed2da93d8e2353dc4d2cee951ffa6ea7c163","src/qos.rs":"9ef6183b7c03b5b412f81f38ebb06048ff6266032bc236964dd994f173b82ec4","src/reason.rs":"c92aded3bbea859f110eed73b9b0fb40df6ac4a6ed6431ca69882b46b5ad5229","src/restrictederrorinfo.rs":"b8c53f4ae149ea806028cdafe699390a20202d72028b5f62836bcbf97720d133","src/roapi.rs":"dbbefb19f402a2aece66b500739b0a9e2c4d0133a8bc94d076510d5a67def175","src/roerrorapi.rs":"84a0a71a3f9ce67a577954ee5761cbd97d892eb5e7eb2c381f6bd29d4e1d4af7","src/rpc.rs":"e2293651222edf37f3ad3076adaae9033b25b06bd7b88ed7372585a4ae46c7d9","src/rpcdce.rs":"de77ca3c9b689ffaaf395a6882d3dfc3a1cec181efa6cb6075e605e4462bc3f6","src/sapi.rs":"05dbc1166b836251538c9e52a772fa584a1d0a1ad823e4336ab5e6cfefb96d57","src/schannel.rs":"e48926896227ffae5033bd634a7c71f5359d7a08b7b8c6e94e03864d87a37f8b","src/servprov.rs":"f086b4330162c7da711ea59d7023304a8fa2a53470b54d846ea1c11567703693","src/setupapi.rs":"4959862dd39597cd711022fcefbaf5c75b61410d57d04e9dbec2ddf7a2fa6f31","src/shellapi.rs":"ce3e3e7cd8aefe8068d6c51256827c0c3d51a449e4ab73e7125ea28d44dd6b6d","src/shellscalingapi.rs":"59c162b0215ff4b71b3535b6e142cca8cd99028031f47f0a6efb960c160a8776","src/shlguid.rs":"dcb7a1ada1b1b90f405e6dea8bcf1fc6994725b49a3165b7908670b2c31490e5","src/shlobj.rs":"53ff059ec6123001bed8f007c36e40812f83e4e04bd50b371319d10b4e38c36f","src/shobjidl.rs":"953d6ef4dc2a0d175d7133dc2f41255123ab8f778b22feaebd8ca1fa77356aa7","src/shtypes.rs":"ff785004e819bcfc521ab79327e58f98debab4e40c20412bbecdcee1b2801371","src/spapidef.rs":"9abe751425b6aaac7e4a7ea49f6d8e859f8f73164abd4d69b48e3e224d7de829","src/sql.rs":"004ed353b40bb4bceab55d6e8c33063a8eac992b076e47e6ead8303dbbc5b67f","src/sqltypes.rs":"0c5fa183c9f5b9e16e292de6a9afdf73f554730e651250856148ac04718803b8","src/sspi.rs":"dbd9d544abea4396983867ef4f7fbe2588673cc953dbeb74e7edc46503b16fa0","src/strmif.rs":"168040999cf99843cc1447988e46c56481a7a343ae41ab854db40ef566fa1119","src/subauth.rs":"183dd0df6436e9f0e859d62ca78e8ed42d4c1a5dc0690dcf22d42467fd2e0700","src/synchapi.rs":"cfce677c85377a340cb9307d9ac9eb06ffe9fd5e2ce08ed4a0390729e3a7d717","src/sysinfoapi.rs":"9a5579143263ce20d8c365b9874a0ae90ef28bc3295eab26ba3782efa48b464a","src/threadpoolapi.rs":"57876ea70b86d08663f7916ce076547f17596c26b8bf4dfafbad60e78264ff95","src/timezoneapi.rs":"5ccd80e6d16a858c56e20a7f3c5570e29777dab0fdfc057b6d2fb06463d56eb3","src/tlhelp32.rs":"c96ef7416bceab473463cc4ad98f037aeaac87bb7adf45cc16c281308537e82f","src/unknwnbase.rs":"2708c19491deb7364100025f3bb88a791c219551a65af70a776f8f3c5bf18b05","src/urlhist.rs":"8c8c0d0a613e59f68bf0e8cec061ea2126baa98d1479df4d07c8df5e41b50bc1","src/urlmon.rs":"0652e602ef2f5826360e5eab68bdf4f9365827a012c2c89289c54016ea001b74","src/usb.rs":"7e682ee819b237eabe796e604cff2434c450f724f4c86d919683eb7a5167c343","src/usbspec.rs":"d19671960838eb592cda4cd7c84c6f66cd9484f0904b5a28e1d8fd91e9c2c6af","src/usp10.rs":"baa2c1ef6ca5f064bc55b24f39c0553ede45a87b9183318572916fd4f1c679c6","src/vadefs.rs":"0e2f12fd1c521a943908669b2d10fceea409bac45242ec6e87c0e69706c1b3d0","src/vsbackup.rs":"af71cb851bd7eacde9d3e46a112497baef3ecebb472aae3c76c7faff804d33f9","src/vss.rs":"a626613810a69309b8f50d0a3bd75928d9de771c2287b6242487cb8cd55394a0","src/vsserror.rs":"f06b108d66ea9f06ad15d83b981117ed6a2a9cd218bb3bf53f13b0055acd9b2e","src/vswriter.rs":"8c4f5d27fa0883d187506538136cc610074941bb952afbe0984f7cb7c3c656f7","src/werapi.rs":"a2d692514ff3a61126971c5c2c5a7298c0f822559550a7f14501f8c96d1d951a","src/winbase.rs":"e224c40d827b1f1a9c74643c000f71e87ad18f749810cc611425af325c9472b8","src/wincon.rs":"402c5ebf80aa6ab1002935b7ddca17e8a243d0c714982054395862fe0ae40a04","src/wincred.rs":"e5fa987622dd880151ae190bb45daa666ffae3ae8e2da97407210afe01dd93d6","src/wincrypt.rs":"f7f8743b6a89d3f5e8b07405e43010bb3729aa8a8cf4546cc02705f802947ebc","src/windef.rs":"89fa9f5ab2909a4840f16979ebbc0afa2134abcb1d47cb7435b581f31b227658","src/windowscodecs.rs":"7c63bc4e2d0e7ce60c7bb13b93ef5aa12213f71a46845b6e034a9c224ef3eb3c","src/windowsx.rs":"414a9a841590f88804da3eb9ba55d583372a467cc50ab1ebdd7cfc653ce5f627","src/winerror.rs":"f3882eba4e299acbdedd548feb1ff89de958fb72d665bd6ba013b6a1f7596b52","src/winevt.rs":"64ae96f475ed98da7a84704d53d16caccbac2dbd525de0ef0f65fc58a6775ed1","src/wingdi.rs":"35aa9dd14b4b4c5a227ac3df0d312c19cbaede2d1388c26ad8eb910e80efeafd","src/winhttp.rs":"37769be104a2eb9efa70ffd74c8f38a09d9639cf575a677ad75d941e8d87cd58","src/winioctl.rs":"0f0efe0a41894a325b70428d04aeddec8dd7a87a91489a4e564a248e8498861b","src/winnetwk.rs":"d492c3d14a422f611166d39b895ddc6dd749ebc64a020bf3125af452494f91dd","src/winnls.rs":"90904d6adad70081a620165223fb4a71b64d747596c64d0df7de9511cd0f75c6","src/winnt.rs":"2c51ad0a065006010f1cfe7a3335274304e4747adc63f9798e1ca1f7091154a5","src/winreg.rs":"c687a5c6433daa13793815ef9af8befaedc9635be14eea0c618ad5334952dc31","src/winscard.rs":"78ab1d3ae22e486726740c343a4cc6268ca318de43f4b7d7ba51acbdf1b93936","src/winsmcrd.rs":"62be129c3d4cdea9dd31e769b587f071a94c347c8df71a43bb1eea18d52a60cc","src/winsock2.rs":"21dc0393f37f56c15c59d49a32861fb24c8f28d43ce26b56d958a174a5040a76","src/winspool.rs":"a3bd8e04f2db6118fe529bf52cb856a773cd8b816d197fc8edc8ac942578fd74","src/winstring.rs":"dc535f972d93be2fe067a5ca64edb45b6ad8e4549ecc0ce24486bd94555d5707","src/winsvc.rs":"7999f00b341f3e0e8701ea89f71986a6600650ff8cffdb1292e9f55d47bd0a3e","src/winusb.rs":"0ac355aa879a4aae501db04f1e8859dbef5e33fda9d46a7a12ef25e5524ec396","src/winusbio.rs":"8e2d64832999b59b2ea900396184c36d34cf94c97f31e15916c299213748a3e1","src/winuser.rs":"791bd8625812feccc8ec421489194d635c94cb4c4d754287a0caa54fa8f71c19","src/ws2def.rs":"0a1c7a69e4da8edc0584b0e3fb4ad1fa4aed621510b1bc1b0d104990577c6a38","src/ws2ipdef.rs":"c6a898cf25d187ad83e110af1e2286824868691a60818ecc44e68fa0bbbd4ff6","src/ws2spi.rs":"e63da700de55a317769230319eb9e4ec85cc0ac80b2baa076399367338b7ca0f","src/ws2tcpip.rs":"698084fd5d631a2ef236fe76001e7c44afd9b8958243e4ad4c098ac4beb4b352","src/wtypes.rs":"2689e8f442ccdc0b0e1ec82160a5cc3e80abf95dca82855ec595314062774a14","src/wtypesbase.rs":"f6dc0a8b09f3f003339c5dd366bdddb9dd671894be9dcf4a42058b226d2917a8","src/xinput.rs":"e15cd46bf18977481e22d609f8e0bb5508776902d7fa64477bb5b78596c0f67d"},"package":"167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-[package]
-name = "winapi"
-version = "0.2.8"
-authors = ["Peter Atashian <retep998@gmail.com>"]
-description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings."
-documentation = "https://retep998.github.io/doc/winapi/"
-repository = "https://github.com/retep998/winapi-rs"
-readme = "README.md"
-keywords = ["windows", "ffi", "win32", "com", "directx"]
-license = "MIT"
-include = ["src/**/*", "Cargo.toml", "LICENSE.md"]
-
-[dev-dependencies]
-advapi32-sys = { version = "0", path = "lib/advapi32" }
-bcrypt-sys = { version = "0", path = "lib/bcrypt" }
-comctl32-sys = { version = "0", path = "lib/comctl32" }
-comdlg32-sys = { version = "0", path = "lib/comdlg32" }
-credui-sys = { version = "0", path = "lib/credui" }
-crypt32-sys = { version = "0", path = "lib/crypt32" }
-d2d1-sys = { version = "0", path = "lib/d2d1" }
-d3d11-sys = { version = "0", path = "lib/d3d11" }
-d3d12-sys = { version = "0", path = "lib/d3d12" }
-d3d9-sys = { version = "0", path = "lib/d3d9" }
-d3dcompiler-sys = { version = "0", path = "lib/d3dcompiler" }
-dbghelp-sys = { version = "0", path = "lib/dbghelp" }
-dsound-sys = { version = "0", path = "lib/dsound" }
-dwmapi-sys = { version = "0", path = "lib/dwmapi" }
-dwrite-sys = { version = "0", path = "lib/dwrite" }
-dxgi-sys = { version = "0", path = "lib/dxgi" }
-dxguid-sys = { version = "0", path = "lib/dxguid" }
-gdi32-sys = { version = "0", path = "lib/gdi32" }
-hid-sys = { version = "0", path = "lib/hid" }
-httpapi-sys = { version = "0", path = "lib/httpapi" }
-kernel32-sys = { version = "0", path = "lib/kernel32" }
-ktmw32-sys = { version = "0", path = "lib/ktmw32" }
-mpr-sys = { version = "0", path = "lib/mpr" }
-netapi32-sys = { version = "0", path = "lib/netapi32" }
-odbc32-sys = { version = "0", path = "lib/odbc32" }
-ole32-sys = { version = "0", path = "lib/ole32" }
-oleaut32-sys = { version = "0", path = "lib/oleaut32" }
-opengl32-sys = { version = "0", path = "lib/opengl32" }
-pdh-sys = { version = "0", path = "lib/pdh" }
-psapi-sys = { version = "0", path = "lib/psapi" }
-runtimeobject-sys = { version = "0", path = "lib/runtimeobject" }
-secur32-sys = { version = "0", path = "lib/secur32" }
-setupapi-sys = { version = "0", path = "lib/setupapi" }
-shell32-sys = { version = "0", path = "lib/shell32" }
-shlwapi-sys = { version = "0", path = "lib/shlwapi" }
-user32-sys = { version = "0", path = "lib/user32" }
-userenv-sys = { version = "0", path = "lib/userenv" }
-usp10-sys = { version = "0", path = "lib/usp10" }
-uuid-sys = { version = "0", path = "lib/uuid" }
-vssapi-sys = { version = "0", path = "lib/vssapi" }
-wevtapi-sys = { version = "0", path = "lib/wevtapi" }
-winhttp-sys = { version = "0", path = "lib/winhttp" }
-winmm-sys = { version = "0", path = "lib/winmm" }
-winscard-sys = { version = "0", path = "lib/winscard" }
-winspool-sys = { version = "0", path = "lib/winspool" }
-winusb-sys = { version = "0", path = "lib/winusb" }
-ws2_32-sys = { version = "0", path = "lib/ws2_32" }
-xinput-sys = { version = "0", path = "lib/xinput" }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/LICENSE.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/LICENSE.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/LICENSE.md	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/LICENSE.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Peter Atashian
-
-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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/activation.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/activation.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/activation.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/activation.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-RIDL!(
-interface IActivationFactory(IActivationFactoryVtbl): IInspectable(IInspectableVtbl) {
-    fn ActivateInstance(&mut self, instance: *mut *mut ::IInspectable) -> ::HRESULT
-}
-);
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/audioclient.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/audioclient.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/audioclient.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/audioclient.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-//1627
-pub const AUDCLNT_E_NOT_INITIALIZED: ::HRESULT = AUDCLNT_ERR!(0x001);
-pub const AUDCLNT_E_ALREADY_INITIALIZED: ::HRESULT = AUDCLNT_ERR!(0x002);
-pub const AUDCLNT_E_WRONG_ENDPOINT_TYPE: ::HRESULT = AUDCLNT_ERR!(0x003);
-pub const AUDCLNT_E_DEVICE_INVALIDATED: ::HRESULT = AUDCLNT_ERR!(0x004);
-pub const AUDCLNT_E_NOT_STOPPED: ::HRESULT = AUDCLNT_ERR!(0x005);
-pub const AUDCLNT_E_BUFFER_TOO_LARGE: ::HRESULT = AUDCLNT_ERR!(0x006);
-pub const AUDCLNT_E_OUT_OF_ORDER: ::HRESULT = AUDCLNT_ERR!(0x007);
-pub const AUDCLNT_E_UNSUPPORTED_FORMAT: ::HRESULT = AUDCLNT_ERR!(0x008);
-pub const AUDCLNT_E_INVALID_SIZE: ::HRESULT = AUDCLNT_ERR!(0x009);
-pub const AUDCLNT_E_DEVICE_IN_USE: ::HRESULT = AUDCLNT_ERR!(0x00a);
-pub const AUDCLNT_E_BUFFER_OPERATION_PENDING: ::HRESULT = AUDCLNT_ERR!(0x00b);
-pub const AUDCLNT_E_THREAD_NOT_REGISTERED: ::HRESULT = AUDCLNT_ERR!(0x00c);
-pub const AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED: ::HRESULT = AUDCLNT_ERR!(0x00e);
-pub const AUDCLNT_E_ENDPOINT_CREATE_FAILED: ::HRESULT = AUDCLNT_ERR!(0x00f);
-pub const AUDCLNT_E_SERVICE_NOT_RUNNING: ::HRESULT = AUDCLNT_ERR!(0x010);
-pub const AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED: ::HRESULT = AUDCLNT_ERR!(0x011);
-pub const AUDCLNT_E_EXCLUSIVE_MODE_ONLY: ::HRESULT = AUDCLNT_ERR!(0x012);
-pub const AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL: ::HRESULT = AUDCLNT_ERR!(0x013);
-pub const AUDCLNT_E_EVENTHANDLE_NOT_SET: ::HRESULT = AUDCLNT_ERR!(0x014);
-pub const AUDCLNT_E_INCORRECT_BUFFER_SIZE: ::HRESULT = AUDCLNT_ERR!(0x015);
-pub const AUDCLNT_E_BUFFER_SIZE_ERROR: ::HRESULT = AUDCLNT_ERR!(0x016);
-pub const AUDCLNT_E_CPUUSAGE_EXCEEDED: ::HRESULT = AUDCLNT_ERR!(0x017);
-pub const AUDCLNT_E_BUFFER_ERROR: ::HRESULT = AUDCLNT_ERR!(0x018);
-pub const AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED: ::HRESULT = AUDCLNT_ERR!(0x019);
-pub const AUDCLNT_E_INVALID_DEVICE_PERIOD: ::HRESULT = AUDCLNT_ERR!(0x020);
-pub const AUDCLNT_E_INVALID_STREAM_FLAG: ::HRESULT = AUDCLNT_ERR!(0x021);
-pub const AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE: ::HRESULT = AUDCLNT_ERR!(0x022);
-pub const AUDCLNT_E_OUT_OF_OFFLOAD_RESOURCES: ::HRESULT = AUDCLNT_ERR!(0x023);
-pub const AUDCLNT_E_OFFLOAD_MODE_ONLY: ::HRESULT = AUDCLNT_ERR!(0x024);
-pub const AUDCLNT_E_NONOFFLOAD_MODE_ONLY: ::HRESULT = AUDCLNT_ERR!(0x025);
-pub const AUDCLNT_E_RESOURCES_INVALIDATED: ::HRESULT = AUDCLNT_ERR!(0x026);
-pub const AUDCLNT_E_RAW_MODE_UNSUPPORTED: ::HRESULT = AUDCLNT_ERR!(0x027);
-pub const AUDCLNT_S_BUFFER_EMPTY: ::SCODE = AUDCLNT_SUCCESS!(0x001);
-pub const AUDCLNT_S_THREAD_ALREADY_REGISTERED: ::SCODE = AUDCLNT_SUCCESS!(0x002);
-pub const AUDCLNT_S_POSITION_STALLED: ::SCODE = AUDCLNT_SUCCESS!(0x003);
-DEFINE_GUID!(IID_IAudioClient, 0x1CB9AD4C, 0xDBFA, 0x4c32,
-    0xB1, 0x78, 0xC2, 0xF5, 0x68, 0xA7, 0x03, 0xB2);
-DEFINE_GUID!(IID_IAudioRenderClient, 0xF294ACFC, 0x3146, 0x4483,
-    0xA7, 0xBF, 0xAD, 0xDC, 0xA7, 0xC2, 0x60, 0xE2);
-RIDL!{interface IAudioClient(IAudioClientVtbl): IUnknown(IUnknownVtbl) {
-    fn Initialize(
-        &mut self, ShareMode: ::AUDCLNT_SHAREMODE, StreamFlags: ::DWORD,
-        hnsBufferDuration: ::REFERENCE_TIME, hnsPeriodicity: ::REFERENCE_TIME,
-        pFormat: *const ::WAVEFORMATEX, AudioSessionGuid: ::LPCGUID
-    ) -> ::HRESULT,
-    fn GetBufferSize(&mut self, pNumBufferFrames: *mut ::UINT32) -> ::HRESULT,
-    fn GetStreamLatency(&mut self, phnsLatency: *mut ::REFERENCE_TIME) -> ::HRESULT,
-    fn GetCurrentPadding(&mut self, pNumPaddingFrames: *mut ::UINT32) -> ::HRESULT,
-    fn IsFormatSupported(
-        &mut self, ShareMode: ::AUDCLNT_SHAREMODE, pFormat: *const ::WAVEFORMATEX,
-        ppClosestMatch: *mut *mut ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetMixFormat(&mut self, ppDeviceFormat: *mut *mut ::WAVEFORMATEX) -> ::HRESULT,
-    fn GetDevicePeriod(
-        &mut self, phnsDefaultDevicePeriod: *mut ::REFERENCE_TIME,
-        phnsMinimumDevicePeriod: *mut ::REFERENCE_TIME
-    ) -> ::HRESULT,
-    fn Start(&mut self) -> ::HRESULT,
-    fn Stop(&mut self) -> ::HRESULT,
-    fn Reset(&mut self) -> ::HRESULT,
-    fn SetEventHandle(&mut self, eventHandle: ::HANDLE) -> ::HRESULT,
-    fn GetService(&mut self, riid: ::REFIID, ppv: *mut ::LPVOID) -> ::HRESULT
-}}
-RIDL!{interface IAudioRenderClient(IAudioRenderClientVtbl): IUnknown(IUnknownVtbl) {
-    fn GetBuffer(&mut self, NumFramesRequested: ::UINT32, ppData: *mut *mut ::BYTE) -> ::HRESULT,
-    fn ReleaseBuffer(&mut self, NumFramesWritten: ::UINT32, dwFlags: ::DWORD) -> ::HRESULT
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/audiosessiontypes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/audiosessiontypes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/audiosessiontypes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/audiosessiontypes.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-ENUM!{enum AUDCLNT_SHAREMODE {
-    AUDCLNT_SHAREMODE_SHARED,
-    AUDCLNT_SHAREMODE_EXCLUSIVE,
-}}
-pub const AUDCLNT_STREAMFLAGS_CROSSPROCESS: ::DWORD = 0x00010000;
-pub const AUDCLNT_STREAMFLAGS_LOOPBACK: ::DWORD = 0x00020000;
-pub const AUDCLNT_STREAMFLAGS_EVENTCALLBACK: ::DWORD = 0x00040000;
-pub const AUDCLNT_STREAMFLAGS_NOPERSIST: ::DWORD = 0x00080000;
-pub const AUDCLNT_STREAMFLAGS_RATEADJUST: ::DWORD = 0x00100000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/basetsd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/basetsd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/basetsd.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/basetsd.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Type definitions for the basic sized types.
-#[cfg(target_arch = "x86")]
-pub type POINTER_64_INT = ::c_ulong;
-#[cfg(target_arch = "x86_64")]
-pub type POINTER_64_INT = ::__uint64;
-pub type INT8 = ::c_schar;
-pub type PINT8 = *mut ::c_schar;
-pub type INT16 = ::c_short;
-pub type PINT16 = *mut ::c_short;
-pub type INT32 = ::c_int;
-pub type PINT32 = *mut ::c_int;
-pub type INT64 = ::__int64;
-pub type PINT64 = *mut ::__int64;
-pub type UINT8 = ::c_uchar;
-pub type PUINT8 = *mut ::c_uchar;
-pub type UINT16 = ::c_ushort;
-pub type PUINT16 = *mut ::c_ushort;
-pub type UINT32 = ::c_uint;
-pub type PUINT32 = *mut ::c_uint;
-pub type UINT64 = ::__uint64;
-pub type PUINT64 = *mut ::__uint64;
-pub type LONG32 = ::c_int;
-pub type PLONG32 = *mut ::c_int;
-pub type ULONG32 = ::c_uint;
-pub type PULONG32 = *mut ::c_uint;
-pub type DWORD32 = ::c_uint;
-pub type PDWORD32 = *mut ::c_uint;
-#[cfg(target_arch = "x86")]
-pub type INT_PTR = ::c_int;
-#[cfg(target_arch = "x86_64")]
-pub type INT_PTR = ::__int64;
-#[cfg(target_arch = "x86")]
-pub type PINT_PTR = *mut ::c_int;
-#[cfg(target_arch = "x86_64")]
-pub type PINT_PTR = *mut ::__int64;
-#[cfg(target_arch = "x86")]
-pub type UINT_PTR = ::c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type UINT_PTR = ::__uint64;
-#[cfg(target_arch = "x86")]
-pub type PUINT_PTR = *mut ::c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type PUINT_PTR = *mut ::__uint64;
-#[cfg(target_arch = "x86")]
-pub type LONG_PTR = ::c_long;
-#[cfg(target_arch = "x86_64")]
-pub type LONG_PTR = ::__int64;
-#[cfg(target_arch = "x86")]
-pub type PLONG_PTR = *mut ::c_long;
-#[cfg(target_arch = "x86_64")]
-pub type PLONG_PTR = *mut ::__int64;
-#[cfg(target_arch = "x86")]
-pub type ULONG_PTR = ::c_ulong;
-#[cfg(target_arch = "x86_64")]
-pub type ULONG_PTR = ::__uint64;
-#[cfg(target_arch = "x86")]
-pub type PULONG_PTR = *mut ::c_ulong;
-#[cfg(target_arch = "x86_64")]
-pub type PULONG_PTR = *mut ::__uint64;
-#[cfg(target_arch = "x86_64")]
-pub type SHANDLE_PTR = ::__int64;
-#[cfg(target_arch = "x86_64")]
-pub type HANDLE_PTR = ::__uint64;
-#[cfg(target_arch = "x86_64")]
-pub type UHALF_PTR = ::c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type PUHALF_PTR = *mut ::c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type HALF_PTR = ::c_int;
-#[cfg(target_arch = "x86_64")]
-pub type PHALF_PTR = *mut ::c_int;
-#[cfg(target_arch = "x86")]
-pub type SHANDLE_PTR = ::c_long;
-#[cfg(target_arch = "x86")]
-pub type HANDLE_PTR = ::c_ulong;
-#[cfg(target_arch = "x86")]
-pub type UHALF_PTR = ::c_ushort;
-#[cfg(target_arch = "x86")]
-pub type PUHALF_PTR = *mut ::c_ushort;
-#[cfg(target_arch = "x86")]
-pub type HALF_PTR = ::c_short;
-#[cfg(target_arch = "x86")]
-pub type PHALF_PTR = *mut ::c_short;
-pub type SIZE_T = ULONG_PTR;
-pub type PSIZE_T = *mut ULONG_PTR;
-pub type SSIZE_T = LONG_PTR;
-pub type PSSIZE_T = *mut LONG_PTR;
-pub type DWORD_PTR = ULONG_PTR;
-pub type PDWORD_PTR = *mut ULONG_PTR;
-pub type LONG64 = ::__int64;
-pub type PLONG64 = *mut ::__int64;
-pub type ULONG64 = ::__uint64;
-pub type PULONG64 = *mut ::__uint64;
-pub type DWORD64 = ::__uint64;
-pub type PDWORD64 = *mut ::__uint64;
-pub type KAFFINITY = ULONG_PTR;
-pub type PKAFFINITY = *mut KAFFINITY;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/bcrypt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/bcrypt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/bcrypt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/bcrypt.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,356 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Cryptographic Primitive API Prototypes and Definitions
-pub const KDF_HASH_ALGORITHM: ::ULONG = 0x0;
-pub const KDF_SECRET_PREPEND: ::ULONG = 0x1;
-pub const KDF_SECRET_APPEND: ::ULONG = 0x2;
-pub const KDF_HMAC_KEY: ::ULONG = 0x3;
-pub const KDF_TLS_PRF_LABEL: ::ULONG = 0x4;
-pub const KDF_TLS_PRF_SEED: ::ULONG = 0x5;
-pub const KDF_SECRET_HANDLE: ::ULONG = 0x6;
-pub const KDF_TLS_PRF_PROTOCOL: ::ULONG = 0x7;
-pub const KDF_ALGORITHMID: ::ULONG = 0x8;
-pub const KDF_PARTYUINFO: ::ULONG = 0x9;
-pub const KDF_PARTYVINFO: ::ULONG = 0xA;
-pub const KDF_SUPPPUBINFO: ::ULONG = 0xB;
-pub const KDF_SUPPPRIVINFO: ::ULONG = 0xC;
-pub const KDF_LABEL: ::ULONG = 0xD;
-pub const KDF_CONTEXT: ::ULONG = 0xE;
-pub const KDF_SALT: ::ULONG = 0xF;
-pub const KDF_ITERATION_COUNT: ::ULONG = 0x10;
-pub const KDF_GENERIC_PARAMETER: ::ULONG = 0x11;
-pub const KDF_KEYBITLENGTH: ::ULONG = 0x12;
-pub const KDF_USE_SECRET_AS_HMAC_KEY_FLAG: ::ULONG = 0x1;
-STRUCT!{struct BCRYPT_KEY_LENGTHS_STRUCT {
-    dwMinLength: ::ULONG,
-    dwMaxLength: ::ULONG,
-    dwIncrement: ::ULONG,
-}}
-pub type BCRYPT_AUTH_TAG_LENGTHS_STRUCT = BCRYPT_KEY_LENGTHS_STRUCT;
-STRUCT!{struct BCRYPT_OID {
-    cbOID: ::ULONG,
-    pbOID: ::PUCHAR,
-}}
-STRUCT!{struct BCRYPT_OID_LIST {
-    dwOIDCount: ::ULONG,
-    pOIDs: *mut BCRYPT_OID,
-}}
-STRUCT!{struct BCRYPT_PKCS1_PADDING_INFO {
-    pszAlgId: ::LPCWSTR,
-}}
-STRUCT!{struct BCRYPT_PSS_PADDING_INFO {
-    pszAlgId: ::LPCWSTR,
-    cbSalt: ::ULONG,
-}}
-STRUCT!{struct BCRYPT_OAEP_PADDING_INFO {
-    pszAlgId: ::LPCWSTR,
-    pbLabel: ::PUCHAR,
-    cbLabel: ::ULONG,
-}}
-pub const BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION: ::ULONG = 1;
-pub const BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG: ::ULONG = 0x00000001;
-pub const BCRYPT_AUTH_MODE_IN_PROGRESS_FLAG: ::ULONG = 0x00000002;
-STRUCT!{struct BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO {
-    cbSize: ::ULONG,
-    dwInfoVersion: ::ULONG,
-    pbNonce: ::PUCHAR,
-    cbNonce: ::ULONG,
-    pbAuthData: ::PUCHAR,
-    cbAuthData: ::ULONG,
-    pbTag: ::PUCHAR,
-    cbTag: ::ULONG,
-    pbMacContext: ::PUCHAR,
-    cbMacContext: ::ULONG,
-    cbAAD: ::ULONG,
-    cbData: ::ULONGLONG,
-    dwFlags: ::ULONG,
-}}
-pub type PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO = *mut BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO;
-pub const BCRYPT_PROV_DISPATCH: ::ULONG = 0x00000001;
-pub const BCRYPT_BLOCK_PADDING: ::ULONG = 0x00000001;
-pub const BCRYPT_PAD_NONE: ::ULONG = 0x00000001;
-pub const BCRYPT_PAD_PKCS1: ::ULONG = 0x00000002;
-pub const BCRYPT_PAD_OAEP: ::ULONG = 0x00000004;
-pub const BCRYPT_PAD_PSS: ::ULONG = 0x00000008;
-pub const BCRYPT_PAD_PKCS1_OPTIONAL_HASH_OID: ::ULONG = 0x00000010;
-pub const BCRYPTBUFFER_VERSION: ::ULONG = 0;
-STRUCT!{struct BCryptBuffer {
-    cbBuffer: ::ULONG,
-    BufferType: ::ULONG,
-    pvBuffer: ::PVOID,
-}}
-pub type PBCryptBuffer = *mut BCryptBuffer;
-STRUCT!{struct BCryptBufferDesc {
-    ulVersion: ::ULONG,
-    cBuffers: ::ULONG,
-    pBuffers: PBCryptBuffer,
-}}
-pub type PBCryptBufferDesc = *mut BCryptBufferDesc;
-//321
-pub type BCRYPT_HANDLE = ::PVOID;
-pub type BCRYPT_ALG_HANDLE = ::PVOID;
-pub type BCRYPT_KEY_HANDLE = ::PVOID;
-pub type BCRYPT_HASH_HANDLE = ::PVOID;
-pub type BCRYPT_SECRET_HANDLE = ::PVOID;
-STRUCT!{struct BCRYPT_KEY_BLOB {
-    Magic: ::ULONG,
-}}
-pub const BCRYPT_RSAPUBLIC_MAGIC: ::ULONG = 0x31415352;
-pub const BCRYPT_RSAPRIVATE_MAGIC: ::ULONG = 0x32415352;
-STRUCT!{struct BCRYPT_RSAKEY_BLOB {
-    Magic: ::ULONG,
-    BitLength: ::ULONG,
-    cbPublicExp: ::ULONG,
-    cbModulus: ::ULONG,
-    cbPrime1: ::ULONG,
-    cbPrime2: ::ULONG,
-}}
-pub const BCRYPT_RSAFULLPRIVATE_MAGIC: ::ULONG = 0x33415352;
-pub const BCRYPT_ECDH_PUBLIC_P256_MAGIC: ::ULONG = 0x314B4345;
-pub const BCRYPT_ECDH_PRIVATE_P256_MAGIC: ::ULONG = 0x324B4345;
-pub const BCRYPT_ECDH_PUBLIC_P384_MAGIC: ::ULONG = 0x334B4345;
-pub const BCRYPT_ECDH_PRIVATE_P384_MAGIC: ::ULONG = 0x344B4345;
-pub const BCRYPT_ECDH_PUBLIC_P521_MAGIC: ::ULONG = 0x354B4345;
-pub const BCRYPT_ECDH_PRIVATE_P521_MAGIC: ::ULONG = 0x364B4345;
-pub const BCRYPT_ECDSA_PUBLIC_P256_MAGIC: ::ULONG = 0x31534345;
-pub const BCRYPT_ECDSA_PRIVATE_P256_MAGIC: ::ULONG = 0x32534345;
-pub const BCRYPT_ECDSA_PUBLIC_P384_MAGIC: ::ULONG = 0x33534345;
-pub const BCRYPT_ECDSA_PRIVATE_P384_MAGIC: ::ULONG = 0x34534345;
-pub const BCRYPT_ECDSA_PUBLIC_P521_MAGIC: ::ULONG = 0x35534345;
-pub const BCRYPT_ECDSA_PRIVATE_P521_MAGIC: ::ULONG = 0x36534345;
-STRUCT!{struct BCRYPT_ECCKEY_BLOB {
-    dwMagic: ::ULONG,
-    cbKey: ::ULONG,
-}}
-pub type PBCRYPT_ECCKEY_BLOB = *mut BCRYPT_ECCKEY_BLOB;
-pub const BCRYPT_DH_PUBLIC_MAGIC: ::ULONG = 0x42504844;
-pub const BCRYPT_DH_PRIVATE_MAGIC: ::ULONG = 0x56504844;
-STRUCT!{struct BCRYPT_DH_KEY_BLOB {
-    dwMagic: ::ULONG,
-    cbKey: ::ULONG,
-}}
-pub type PBCRYPT_DH_KEY_BLOB = *mut BCRYPT_DH_KEY_BLOB;
-pub const BCRYPT_DH_PARAMETERS_MAGIC: ::ULONG = 0x4d504844;
-STRUCT!{struct BCRYPT_DH_PARAMETER_HEADER {
-    cbLength: ::ULONG,
-    dwMagic: ::ULONG,
-    cbKeyLength: ::ULONG,
-}}
-pub const BCRYPT_DSA_PUBLIC_MAGIC: ::ULONG = 0x42505344;
-pub const BCRYPT_DSA_PRIVATE_MAGIC: ::ULONG = 0x56505344;
-pub const BCRYPT_DSA_PUBLIC_MAGIC_V2: ::ULONG = 0x32425044;
-pub const BCRYPT_DSA_PRIVATE_MAGIC_V2: ::ULONG = 0x32565044;
-STRUCT!{struct BCRYPT_DSA_KEY_BLOB {
-    dwMagic: ::ULONG,
-    cbKey: ::ULONG,
-    Count: [::UCHAR; 4],
-    Seed: [::UCHAR; 20],
-    q: [::UCHAR; 20],
-}}
-pub type PBCRYPT_DSA_KEY_BLOB = *mut BCRYPT_DSA_KEY_BLOB;
-ENUM!{enum HASHALGORITHM_ENUM {
-    DSA_HASH_ALGORITHM_SHA1,
-    DSA_HASH_ALGORITHM_SHA256,
-    DSA_HASH_ALGORITHM_SHA512,
-}}
-ENUM!{enum DSAFIPSVERSION_ENUM {
-    DSA_FIPS186_2,
-    DSA_FIPS186_3,
-}}
-STRUCT!{struct BCRYPT_DSA_KEY_BLOB_V2 {
-    dwMagic: ::ULONG,
-    cbKey: ::ULONG,
-    hashAlgorithm: HASHALGORITHM_ENUM,
-    standardVersion: DSAFIPSVERSION_ENUM,
-    cbSeedLength: ::ULONG,
-    cbGroupSize: ::ULONG,
-    Count: [::UCHAR; 4],
-}}
-pub type PBCRYPT_DSA_KEY_BLOB_V2 = *mut BCRYPT_DSA_KEY_BLOB_V2;
-STRUCT!{struct BCRYPT_KEY_DATA_BLOB_HEADER {
-    dwMagic: ::ULONG,
-    dwVersion: ::ULONG,
-    cbKeyData: ::ULONG,
-}}
-pub type PBCRYPT_KEY_DATA_BLOB_HEADER = *mut BCRYPT_KEY_DATA_BLOB_HEADER;
-pub const BCRYPT_KEY_DATA_BLOB_MAGIC: ::ULONG = 0x4d42444b;
-pub const BCRYPT_KEY_DATA_BLOB_VERSION1: ::ULONG = 0x1;
-pub const BCRYPT_DSA_PARAMETERS_MAGIC: ::ULONG = 0x4d505344;
-pub const BCRYPT_DSA_PARAMETERS_MAGIC_V2: ::ULONG = 0x324d5044;
-STRUCT!{struct BCRYPT_DSA_PARAMETER_HEADER {
-    cbLength: ::ULONG,
-    dwMagic: ::ULONG,
-    cbKeyLength: ::ULONG,
-    Count: [::UCHAR; 4],
-    Seed: [::UCHAR; 20],
-    q: [::UCHAR; 20],
-}}
-STRUCT!{struct BCRYPT_DSA_PARAMETER_HEADER_V2 {
-    cbLength: ::ULONG,
-    dwMagic: ::ULONG,
-    cbKeyLength: ::ULONG,
-    hashAlgorithm: HASHALGORITHM_ENUM,
-    standardVersion: DSAFIPSVERSION_ENUM,
-    cbSeedLength: ::ULONG,
-    cbGroupSize: ::ULONG,
-    Count: [::UCHAR; 4],
-}}
-ENUM!{enum BCRYPT_HASH_OPERATION_TYPE {
-    BCRYPT_HASH_OPERATION_HASH_DATA = 1,
-    BCRYPT_HASH_OPERATION_FINISH_HASH = 2,
-}}
-STRUCT!{struct BCRYPT_MULTI_HASH_OPERATION {
-    iHash: ::ULONG,
-    hashOperation: BCRYPT_HASH_OPERATION_TYPE,
-    pbBuffer: ::PUCHAR,
-    cbBuffer: ::ULONG,
-}}
-ENUM!{enum BCRYPT_MULTI_OPERATION_TYPE {
-    BCRYPT_OPERATION_TYPE_HASH = 1,
-}}
-STRUCT!{struct BCRYPT_MULTI_OBJECT_LENGTH_STRUCT {
-    cbPerObject: ::ULONG,
-    cbPerElement: ::ULONG,
-}}
-pub const BCRYPT_CIPHER_INTERFACE: ::ULONG = 0x00000001;
-pub const BCRYPT_HASH_INTERFACE: ::ULONG = 0x00000002;
-pub const BCRYPT_ASYMMETRIC_ENCRYPTION_INTERFACE: ::ULONG = 0x00000003;
-pub const BCRYPT_SECRET_AGREEMENT_INTERFACE: ::ULONG = 0x00000004;
-pub const BCRYPT_SIGNATURE_INTERFACE: ::ULONG = 0x00000005;
-pub const BCRYPT_RNG_INTERFACE: ::ULONG = 0x00000006;
-pub const BCRYPT_KEY_DERIVATION_INTERFACE: ::ULONG = 0x00000007;
-pub const BCRYPT_ALG_HANDLE_HMAC_FLAG: ::ULONG = 0x00000008;
-pub const BCRYPT_CAPI_AES_FLAG: ::ULONG = 0x00000010;
-pub const BCRYPT_HASH_REUSABLE_FLAG: ::ULONG = 0x00000020;
-pub const BCRYPT_BUFFERS_LOCKED_FLAG: ::ULONG = 0x00000040;
-pub const BCRYPT_EXTENDED_KEYSIZE: ::ULONG = 0x00000080;
-pub const BCRYPT_CIPHER_OPERATION: ::ULONG = 0x00000001;
-pub const BCRYPT_HASH_OPERATION: ::ULONG = 0x00000002;
-pub const BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION: ::ULONG = 0x00000004;
-pub const BCRYPT_SECRET_AGREEMENT_OPERATION: ::ULONG = 0x00000008;
-pub const BCRYPT_SIGNATURE_OPERATION: ::ULONG = 0x00000010;
-pub const BCRYPT_RNG_OPERATION: ::ULONG = 0x00000020;
-pub const BCRYPT_KEY_DERIVATION_OPERATION: ::ULONG = 0x00000040;
-STRUCT!{struct BCRYPT_ALGORITHM_IDENTIFIER {
-    pszName: ::LPWSTR,
-    dwClass: ::ULONG,
-    dwFlags: ::ULONG,
-}}
-STRUCT!{struct BCRYPT_PROVIDER_NAME {
-    pszProviderName: ::LPWSTR,
-}}
-pub const BCRYPT_PUBLIC_KEY_FLAG: ::ULONG = 0x00000001;
-pub const BCRYPT_PRIVATE_KEY_FLAG: ::ULONG = 0x00000002;
-pub const BCRYPT_RNG_USE_ENTROPY_IN_BUFFER: ::ULONG = 0x00000001;
-pub const BCRYPT_USE_SYSTEM_PREFERRED_RNG: ::ULONG = 0x00000002;
-STRUCT!{struct BCRYPT_INTERFACE_VERSION {
-    MajorVersion: ::USHORT,
-    MinorVersion: ::USHORT,
-}}
-pub type PBCRYPT_INTERFACE_VERSION = *mut BCRYPT_INTERFACE_VERSION;
-pub const BCRYPT_CIPHER_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_HASH_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_HASH_INTERFACE_MAJORVERSION_2: ::USHORT = 2;
-pub const BCRYPT_HASH_INTERFACE_VERSION_2: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(BCRYPT_HASH_INTERFACE_MAJORVERSION_2, 0);
-pub const BCRYPT_ASYMMETRIC_ENCRYPTION_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_SECRET_AGREEMENT_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_SIGNATURE_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_RNG_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const CRYPT_MIN_DEPENDENCIES: ::ULONG = 0x00000001;
-pub const CRYPT_PROCESS_ISOLATE: ::ULONG = 0x00010000;
-pub const CRYPT_UM: ::ULONG = 0x00000001;
-pub const CRYPT_KM: ::ULONG = 0x00000002;
-pub const CRYPT_MM: ::ULONG = 0x00000003;
-pub const CRYPT_ANY: ::ULONG = 0x00000004;
-pub const CRYPT_OVERWRITE: ::ULONG = 0x00000001;
-pub const CRYPT_LOCAL: ::ULONG = 0x00000001;
-pub const CRYPT_DOMAIN: ::ULONG = 0x00000002;
-pub const CRYPT_EXCLUSIVE: ::ULONG = 0x00000001;
-pub const CRYPT_OVERRIDE: ::ULONG = 0x00010000;
-pub const CRYPT_ALL_FUNCTIONS: ::ULONG = 0x00000001;
-pub const CRYPT_ALL_PROVIDERS: ::ULONG = 0x00000002;
-pub const CRYPT_PRIORITY_TOP: ::ULONG = 0x00000000;
-pub const CRYPT_PRIORITY_BOTTOM: ::ULONG = 0xFFFFFFFF;
-STRUCT!{struct CRYPT_INTERFACE_REG {
-    dwInterface: ::ULONG,
-    dwFlags: ::ULONG,
-    cFunctions: ::ULONG,
-    rgpszFunctions: *mut ::PWSTR,
-}}
-pub type PCRYPT_INTERFACE_REG = *mut CRYPT_INTERFACE_REG;
-STRUCT!{struct CRYPT_IMAGE_REG {
-    pszImage: ::PWSTR,
-    cInterfaces: ::ULONG,
-    rgpInterfaces: *mut PCRYPT_INTERFACE_REG,
-}}
-pub type PCRYPT_IMAGE_REG = *mut CRYPT_IMAGE_REG;
-STRUCT!{struct CRYPT_PROVIDER_REG {
-    cAliases: ::ULONG,
-    rgpszAliases: *mut ::PWSTR,
-    pUM: PCRYPT_IMAGE_REG,
-    pKM: PCRYPT_IMAGE_REG,
-}}
-pub type PCRYPT_PROVIDER_REG = *mut CRYPT_PROVIDER_REG;
-STRUCT!{struct CRYPT_PROVIDERS {
-    cProviders: ::ULONG,
-    rgpszProviders: *mut ::PWSTR,
-}}
-pub type PCRYPT_PROVIDERS = *mut CRYPT_PROVIDERS;
-STRUCT!{struct CRYPT_CONTEXT_CONFIG {
-    dwFlags: ::ULONG,
-    dwReserved: ::ULONG,
-}}
-pub type PCRYPT_CONTEXT_CONFIG = *mut CRYPT_CONTEXT_CONFIG;
-STRUCT!{struct CRYPT_CONTEXT_FUNCTION_CONFIG {
-    dwFlags: ::ULONG,
-    dwReserved: ::ULONG,
-}}
-pub type PCRYPT_CONTEXT_FUNCTION_CONFIG = *mut CRYPT_CONTEXT_FUNCTION_CONFIG;
-STRUCT!{struct CRYPT_CONTEXTS {
-    cContexts: ::ULONG,
-    rgpszContexts: *mut ::PWSTR,
-}}
-pub type PCRYPT_CONTEXTS = *mut CRYPT_CONTEXTS;
-STRUCT!{struct CRYPT_CONTEXT_FUNCTIONS {
-    cFunctions: ::ULONG,
-    rgpszFunctions: *mut ::PWSTR,
-}}
-pub type PCRYPT_CONTEXT_FUNCTIONS = *mut CRYPT_CONTEXT_FUNCTIONS;
-STRUCT!{struct CRYPT_CONTEXT_FUNCTION_PROVIDERS {
-    cProviders: ::ULONG,
-    rgpszProviders: *mut ::PWSTR,
-}}
-pub type PCRYPT_CONTEXT_FUNCTION_PROVIDERS = *mut CRYPT_CONTEXT_FUNCTION_PROVIDERS;
-STRUCT!{struct CRYPT_PROPERTY_REF {
-    pszProperty: ::PWSTR,
-    cbValue: ::ULONG,
-    pbValue: ::PUCHAR,
-}}
-pub type PCRYPT_PROPERTY_REF = *mut CRYPT_PROPERTY_REF;
-STRUCT!{struct CRYPT_IMAGE_REF {
-    pszImage: ::PWSTR,
-    dwFlags: ::ULONG,
-}}
-pub type PCRYPT_IMAGE_REF = *mut CRYPT_IMAGE_REF;
-STRUCT!{struct CRYPT_PROVIDER_REF {
-    dwInterface: ::ULONG,
-    pszFunction: ::PWSTR,
-    pszProvider: ::PWSTR,
-    cProperties: ::ULONG,
-    rgpProperties: *mut PCRYPT_PROPERTY_REF,
-    pUM: PCRYPT_IMAGE_REF,
-    pKM: PCRYPT_IMAGE_REF,
-}}
-pub type PCRYPT_PROVIDER_REF = *mut CRYPT_PROVIDER_REF;
-STRUCT!{struct CRYPT_PROVIDER_REFS {
-    cProviders: ::ULONG,
-    rgpProviders: *mut PCRYPT_PROVIDER_REF,
-}}
-pub type PCRYPT_PROVIDER_REFS = *mut CRYPT_PROVIDER_REFS;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/cfgmgr32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/cfgmgr32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/cfgmgr32.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/cfgmgr32.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,758 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! user APIs for the Configuration Manager
-pub type PCVOID = *const ::VOID;
-pub const MAX_DEVICE_ID_LEN: usize = 200;
-pub const MAX_DEVNODE_ID_LEN: usize = MAX_DEVICE_ID_LEN;
-pub const MAX_GUID_STRING_LEN: usize = 39;
-pub const MAX_CLASS_NAME_LEN: usize = 32;
-pub const MAX_PROFILE_LEN: usize = 80;
-pub const MAX_CONFIG_VALUE: ::DWORD = 9999;
-pub const MAX_INSTANCE_VALUE: ::DWORD = 9999;
-pub const MAX_MEM_REGISTERS: ::DWORD = 9;
-pub const MAX_IO_PORTS: ::DWORD = 20;
-pub const MAX_IRQS: ::DWORD = 7;
-pub const MAX_DMA_CHANNELS: ::DWORD = 7;
-pub const DWORD_MAX: ::DWORD = 0xffffffff;
-pub const DWORDLONG_MAX: ::DWORDLONG = 0xffffffffffffffff;
-pub const CONFIGMG_VERSION: ::DWORD = 0x0400;
-pub type RETURN_TYPE = ::DWORD;
-pub type CONFIGRET = RETURN_TYPE;
-pub type DEVNODE = ::DWORD;
-pub type DEVINST = ::DWORD;
-pub type PDEVNODE = *mut DEVNODE;
-pub type PDEVINST = *mut DEVNODE;
-pub type DEVNODEID_A = *mut ::CHAR;
-pub type DEVINSTID_A = *mut ::CHAR;
-pub type DEVNODEID_W = *mut ::WCHAR;
-pub type DEVINSTID_W = *mut ::WCHAR;
-pub type LOG_CONF = ::DWORD_PTR;
-pub type PLOG_CONF = *mut LOG_CONF;
-pub type RES_DES = ::DWORD_PTR;
-pub type PRES_DES = *mut RES_DES;
-pub type RESOURCEID = ::ULONG;
-pub type PRESOURCEID = *mut RESOURCEID;
-pub type PRIORITY = ::ULONG;
-pub type PPRIORITY = *mut PRIORITY;
-pub type RANGE_LIST = ::DWORD_PTR;
-pub type PRANGE_LIST = *mut RANGE_LIST;
-pub type RANGE_ELEMENT = ::DWORD_PTR;
-pub type PRANGE_ELEMENT = *mut RANGE_ELEMENT;
-pub type HMACHINE = ::HANDLE;
-pub type PHMACHINE = *mut HMACHINE;
-pub type CONFLICT_LIST = ::ULONG_PTR;
-pub type PCONFLICT_LIST = *mut CONFLICT_LIST;
-STRUCT!{nodebug struct CONFLICT_DETAILS_A {
-    CD_ulSize: ::ULONG,
-    CD_ulMask: ::ULONG,
-    CD_dnDevInst: DEVINST,
-    CD_rdResDes: RES_DES,
-    CD_ulFlags: ::ULONG,
-    CD_szDescription: [::CHAR; ::MAX_PATH],
-}}
-pub type PCONFLICT_DETAILS_A = *mut CONFLICT_DETAILS_A;
-STRUCT!{nodebug struct CONFLICT_DETAILS_W {
-    CD_ulSize: ::ULONG,
-    CD_ulMask: ::ULONG,
-    CD_dnDevInst: DEVINST,
-    CD_rdResDes: RES_DES,
-    CD_ulFlags: ::ULONG,
-    CD_szDescription: [::WCHAR; ::MAX_PATH],
-}}
-pub type PCONFLICT_DETAILS_W = *mut CONFLICT_DETAILS_W;
-pub const CM_CDMASK_DEVINST: ::ULONG = 0x00000001;
-pub const CM_CDMASK_RESDES: ::ULONG = 0x00000002;
-pub const CM_CDMASK_FLAGS: ::ULONG = 0x00000004;
-pub const CM_CDMASK_DESCRIPTION: ::ULONG = 0x00000008;
-pub const CM_CDMASK_VALID: ::ULONG = 0x0000000F;
-pub const CM_CDFLAGS_DRIVER: ::ULONG = 0x00000001;
-pub const CM_CDFLAGS_ROOT_OWNED: ::ULONG = 0x00000002;
-pub const CM_CDFLAGS_RESERVED: ::ULONG = 0x00000004;
-pub type REGDISPOSITION = ::ULONG;
-pub const mMD_MemoryType: ::DWORD = 0x1;
-pub const fMD_MemoryType: ::DWORD = mMD_MemoryType;
-pub const fMD_ROM: ::DWORD = 0x0;
-pub const fMD_RAM: ::DWORD = 0x1;
-pub const mMD_32_24: ::DWORD = 0x2;
-pub const fMD_32_24: ::DWORD = mMD_32_24;
-pub const fMD_24: ::DWORD = 0x0;
-pub const fMD_32: ::DWORD = 0x2;
-pub const mMD_Prefetchable: ::DWORD = 0x4;
-pub const fMD_Prefetchable: ::DWORD = mMD_Prefetchable;
-pub const fMD_Pref: ::DWORD = mMD_Prefetchable;
-pub const fMD_PrefetchDisallowed: ::DWORD = 0x0;
-pub const fMD_PrefetchAllowed: ::DWORD = 0x4;
-pub const mMD_Readable: ::DWORD = 0x8;
-pub const fMD_Readable: ::DWORD = mMD_Readable;
-pub const fMD_ReadAllowed: ::DWORD = 0x0;
-pub const fMD_ReadDisallowed: ::DWORD = 0x8;
-pub const mMD_CombinedWrite: ::DWORD = 0x10;
-pub const fMD_CombinedWrite: ::DWORD = mMD_CombinedWrite;
-pub const fMD_CombinedWriteDisallowed: ::DWORD = 0x0;
-pub const fMD_CombinedWriteAllowed: ::DWORD = 0x10;
-pub const mMD_Cacheable: ::DWORD = 0x20;
-pub const fMD_NonCacheable: ::DWORD = 0x0;
-pub const fMD_Cacheable: ::DWORD = 0x20;
-pub const fMD_WINDOW_DECODE: ::DWORD = 0x40;
-pub const fMD_MEMORY_BAR: ::DWORD = 0x80;
-STRUCT!{struct MEM_RANGE {
-    MR_Align: ::DWORDLONG,
-    MR_nBytes: ::ULONG,
-    MR_Min: ::DWORDLONG,
-    MR_Max: ::DWORDLONG,
-    MR_Flags: ::DWORD,
-    MR_Reserved: ::DWORD,
-}}
-pub type PMEM_RANGE = *mut MEM_RANGE;
-STRUCT!{struct MEM_DES {
-    MD_Count: ::DWORD,
-    MD_Type: ::DWORD,
-    MD_Alloc_Base: ::DWORDLONG,
-    MD_Alloc_End: ::DWORDLONG,
-    MD_Flags: ::DWORD,
-    MD_Reserved: ::DWORD,
-}}
-pub type PMEM_DES = *mut MEM_DES;
-STRUCT!{struct MEM_RESOURCE {
-    MEM_Header: MEM_DES,
-    MEM_Data: [MEM_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PMEM_RESOURCE = *mut MEM_RESOURCE;
-STRUCT!{struct MEM_LARGE_RANGE {
-    MLR_Align: ::DWORDLONG,
-    MLR_nBytes: ::ULONGLONG,
-    MLR_Min: ::DWORDLONG,
-    MLR_Max: ::DWORDLONG,
-    MLR_Flags: ::DWORD,
-    MLR_Reserved: ::DWORD,
-}}
-pub type PMEM_LARGE_RANGE = *mut MEM_LARGE_RANGE;
-STRUCT!{struct MEM_LARGE_DES {
-    MLD_Count: ::DWORD,
-    MLD_Type: ::DWORD,
-    MLD_Alloc_Base: ::DWORDLONG,
-    MLD_Alloc_End: ::DWORDLONG,
-    MLD_Flags: ::DWORD,
-    MLD_Reserved: ::DWORD,
-}}
-pub type PMEM_LARGE_DES = *mut MEM_LARGE_DES;
-STRUCT!{struct MEM_LARGE_RESOURCE {
-    MEM_LARGE_Header: MEM_LARGE_DES,
-    MEM_LARGE_Data: [MEM_LARGE_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PMEM_LARGE_RESOURCE = *mut MEM_LARGE_RESOURCE;
-pub const fIOD_PortType: ::DWORD = 0x1;
-pub const fIOD_Memory: ::DWORD = 0x0;
-pub const fIOD_IO: ::DWORD = 0x1;
-pub const fIOD_DECODE: ::DWORD = 0x00fc;
-pub const fIOD_10_BIT_DECODE: ::DWORD = 0x0004;
-pub const fIOD_12_BIT_DECODE: ::DWORD = 0x0008;
-pub const fIOD_16_BIT_DECODE: ::DWORD = 0x0010;
-pub const fIOD_POSITIVE_DECODE: ::DWORD = 0x0020;
-pub const fIOD_PASSIVE_DECODE: ::DWORD = 0x0040;
-pub const fIOD_WINDOW_DECODE: ::DWORD = 0x0080;
-pub const fIOD_PORT_BAR: ::DWORD = 0x0100;
-pub const IO_ALIAS_10_BIT_DECODE: ::DWORDLONG = 0x00000004;
-pub const IO_ALIAS_12_BIT_DECODE: ::DWORDLONG = 0x00000010;
-pub const IO_ALIAS_16_BIT_DECODE: ::DWORDLONG = 0x00000000;
-pub const IO_ALIAS_POSITIVE_DECODE: ::DWORDLONG = 0x000000FF;
-STRUCT!{struct IO_RANGE {
-    IOR_Align: ::DWORDLONG,
-    IOR_nPorts: ::DWORD,
-    IOR_Min: ::DWORDLONG,
-    IOR_Max: ::DWORDLONG,
-    IOR_RangeFlags: ::DWORD,
-    IOR_Alias: ::DWORDLONG,
-}}
-pub type PIO_RANGE = *mut IO_RANGE;
-STRUCT!{struct IO_DES {
-    IOD_Count: ::DWORD,
-    IOD_Type: ::DWORD,
-    IOD_Alloc_Base: ::DWORDLONG,
-    IOD_Alloc_End: ::DWORDLONG,
-    IOD_DesFlags: ::DWORD,
-}}
-pub type PIO_DES = *mut IO_DES;
-STRUCT!{struct IO_RESOURCE {
-    IO_Header: IO_DES,
-    IO_Data: [IO_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PIO_RESOURCE = *mut IO_RESOURCE;
-pub const mDD_Width: ::ULONG = 0x3;
-pub const fDD_BYTE: ::ULONG = 0x0;
-pub const fDD_WORD: ::ULONG = 0x1;
-pub const fDD_DWORD: ::ULONG = 0x2;
-pub const fDD_BYTE_AND_WORD: ::ULONG = 0x3;
-pub const mDD_BusMaster: ::ULONG = 0x4;
-pub const fDD_NoBusMaster: ::ULONG = 0x0;
-pub const fDD_BusMaster: ::ULONG = 0x4;
-pub const mDD_Type: ::ULONG = 0x18;
-pub const fDD_TypeStandard: ::ULONG = 0x00;
-pub const fDD_TypeA: ::ULONG = 0x08;
-pub const fDD_TypeB: ::ULONG = 0x10;
-pub const fDD_TypeF: ::ULONG = 0x18;
-STRUCT!{struct DMA_RANGE {
-    DR_Min: ::ULONG,
-    DR_Max: ::ULONG,
-    DR_Flags: ::ULONG,
-}}
-pub type PDMA_RANGE = *mut DMA_RANGE;
-STRUCT!{struct DMA_DES {
-    DD_Count: ::DWORD,
-    DD_Type: ::DWORD,
-    DD_Flags: ::DWORD,
-    DD_Alloc_Chan: ::ULONG,
-}}
-pub type PDMA_DES = *mut DMA_DES;
-STRUCT!{struct DMA_RESOURCE {
-    DMA_Header: DMA_DES,
-    DMA_Data: [DMA_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PDMA_RESOURCE = *mut DMA_RESOURCE;
-pub const mIRQD_Share: ::ULONG = 0x1;
-pub const fIRQD_Exclusive: ::ULONG = 0x0;
-pub const fIRQD_Share: ::ULONG = 0x1;
-pub const fIRQD_Share_Bit: ::ULONG = 0;
-pub const fIRQD_Level_Bit: ::ULONG = 1;
-pub const mIRQD_Edge_Level: ::ULONG = 0x2;
-pub const fIRQD_Level: ::ULONG = 0x0;
-pub const fIRQD_Edge: ::ULONG = 0x2;
-STRUCT!{struct IRQ_RANGE {
-    IRQR_Min: ::ULONG,
-    IRQR_Max: ::ULONG,
-    IRQR_Flags: ::ULONG,
-}}
-pub type PIRQ_RANGE = *mut IRQ_RANGE;
-STRUCT!{struct IRQ_DES_32 {
-    IRQD_Count: ::DWORD,
-    IRQD_Type: ::DWORD,
-    IRQD_Flags: ::DWORD,
-    IRQD_Alloc_Num: ::ULONG,
-    IRQD_Affinity: ::ULONG32,
-}}
-pub type PIRQ_DES_32 = *mut IRQ_DES_32;
-STRUCT!{struct IRQ_DES_64 {
-    IRQD_Count: ::DWORD,
-    IRQD_Type: ::DWORD,
-    IRQD_Flags: ::DWORD,
-    IRQD_Alloc_Num: ::ULONG,
-    IRQD_Affinity: ::ULONG64,
-}}
-pub type PIRQ_DES_64 = *mut IRQ_DES_64;
-STRUCT!{struct IRQ_RESOURCE_32 {
-    IRQ_Header: IRQ_DES_32,
-    IRQ_Data: [IRQ_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PIRQ_RESOURCE_32 = *mut IRQ_RESOURCE_32;
-STRUCT!{struct IRQ_RESOURCE_64 {
-    IRQ_Header: IRQ_DES_64,
-    IRQ_Data: [IRQ_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PIRQ_RESOURCE_64 = *mut IRQ_RESOURCE_64;
-STRUCT!{struct DEVPRIVATE_RANGE {
-    PR_Data1: ::DWORD,
-    PR_Data2: ::DWORD,
-    PR_Data3: ::DWORD,
-}}
-pub type PDEVPRIVATE_RANGE = *mut DEVPRIVATE_RANGE;
-STRUCT!{struct DEVPRIVATE_DES {
-    PD_Count: ::DWORD,
-    PD_Type: ::DWORD,
-    PD_Data1: ::DWORD,
-    PD_Data2: ::DWORD,
-    PD_Data3: ::DWORD,
-    PD_Flags: ::DWORD,
-}}
-pub type PDEVPRIVATE_DES = *mut DEVPRIVATE_DES;
-STRUCT!{struct DEVPRIVATE_RESOURCE {
-    PRV_Header: DEVPRIVATE_DES,
-    PRV_Data: [DEVPRIVATE_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PDEVPRIVATE_RESOURCE = *mut DEVPRIVATE_RESOURCE;
-STRUCT!{struct CS_DES {
-    CSD_SignatureLength: ::DWORD,
-    CSD_LegacyDataOffset: ::DWORD,
-    CSD_LegacyDataSize: ::DWORD,
-    CSD_Flags: ::DWORD,
-    CSD_ClassGuid: ::GUID,
-    CSD_Signature: [::BYTE; ::ANYSIZE_ARRAY],
-}}
-pub type PCS_DES = *mut CS_DES;
-STRUCT!{struct CS_RESOURCE {
-    CS_Header: CS_DES,
-}}
-pub type PCS_RESOURCE = *mut CS_RESOURCE;
-pub const mPCD_IO_8_16: ::DWORD = 0x1;
-pub const fPCD_IO_8: ::DWORD = 0x0;
-pub const fPCD_IO_16: ::DWORD = 0x1;
-pub const mPCD_MEM_8_16: ::DWORD = 0x2;
-pub const fPCD_MEM_8: ::DWORD = 0x0;
-pub const fPCD_MEM_16: ::DWORD = 0x2;
-pub const mPCD_MEM_A_C: ::DWORD = 0xC;
-pub const fPCD_MEM1_A: ::DWORD = 0x4;
-pub const fPCD_MEM2_A: ::DWORD = 0x8;
-pub const fPCD_IO_ZW_8: ::DWORD = 0x10;
-pub const fPCD_IO_SRC_16: ::DWORD = 0x20;
-pub const fPCD_IO_WS_16: ::DWORD = 0x40;
-pub const mPCD_MEM_WS: ::DWORD = 0x300;
-pub const fPCD_MEM_WS_ONE: ::DWORD = 0x100;
-pub const fPCD_MEM_WS_TWO: ::DWORD = 0x200;
-pub const fPCD_MEM_WS_THREE: ::DWORD = 0x300;
-pub const fPCD_MEM_A: ::DWORD = 0x4;
-pub const fPCD_ATTRIBUTES_PER_WINDOW: ::DWORD = 0x8000;
-pub const fPCD_IO1_16: ::DWORD = 0x00010000;
-pub const fPCD_IO1_ZW_8: ::DWORD = 0x00020000;
-pub const fPCD_IO1_SRC_16: ::DWORD = 0x00040000;
-pub const fPCD_IO1_WS_16: ::DWORD = 0x00080000;
-pub const fPCD_IO2_16: ::DWORD = 0x00100000;
-pub const fPCD_IO2_ZW_8: ::DWORD = 0x00200000;
-pub const fPCD_IO2_SRC_16: ::DWORD = 0x00400000;
-pub const fPCD_IO2_WS_16: ::DWORD = 0x00800000;
-pub const mPCD_MEM1_WS: ::DWORD = 0x03000000;
-pub const fPCD_MEM1_WS_TWO: ::DWORD = 0x02000000;
-pub const fPCD_MEM1_WS_THREE: ::DWORD = 0x03000000;
-pub const fPCD_MEM1_16: ::DWORD = 0x04000000;
-pub const mPCD_MEM2_WS: ::DWORD = 0x30000000;
-pub const fPCD_MEM2_WS_ONE: ::DWORD = 0x10000000;
-pub const fPCD_MEM2_WS_TWO: ::DWORD = 0x20000000;
-pub const fPCD_MEM2_WS_THREE: ::DWORD = 0x30000000;
-pub const fPCD_MEM2_16: ::DWORD = 0x40000000;
-pub const PCD_MAX_MEMORY: usize = 2;
-pub const PCD_MAX_IO: usize = 2;
-STRUCT!{struct PCCARD_DES {
-    PCD_Count: ::DWORD,
-    PCD_Type: ::DWORD,
-    PCD_Flags: ::DWORD,
-    PCD_ConfigIndex: ::BYTE,
-    PCD_Reserved: [::BYTE; 3],
-    PCD_MemoryCardBase1: ::DWORD,
-    PCD_MemoryCardBase2: ::DWORD,
-    PCD_MemoryCardBase: [::DWORD; PCD_MAX_MEMORY],
-    PCD_MemoryFlags: [::WORD; PCD_MAX_MEMORY],
-    PCD_IoFlags: [::BYTE; PCD_MAX_IO],
-}}
-pub type PPCCARD_DES = *mut PCCARD_DES;
-STRUCT!{struct PCCARD_RESOURCE {
-    PcCard_Header: PCCARD_DES,
-}}
-pub type PPCCARD_RESOURCE = *mut PCCARD_RESOURCE;
-pub const mPMF_AUDIO_ENABLE: ::DWORD = 0x8;
-pub const fPMF_AUDIO_ENABLE: ::DWORD = 0x8;
-STRUCT!{struct MFCARD_DES {
-    PMF_Count: ::DWORD,
-    PMF_Type: ::DWORD,
-    PMF_Flags: ::DWORD,
-    PMF_ConfigOptions: ::BYTE,
-    PMF_IoResourceIndex: ::BYTE,
-    PMF_Reserved: [::BYTE; 2],
-    PMF_ConfigRegisterBase: ::DWORD,
-}}
-pub type PMFCARD_DES = *mut MFCARD_DES;
-STRUCT!{struct MFCARD_RESOURCE {
-    MfCard_Header: MFCARD_DES,
-}}
-pub type PMFCARD_RESOURCE = *mut MFCARD_RESOURCE;
-STRUCT!{struct BUSNUMBER_RANGE {
-    BUSR_Min: ::ULONG,
-    BUSR_Max: ::ULONG,
-    BUSR_nBusNumbers: ::ULONG,
-    BUSR_Flags: ::ULONG,
-}}
-pub type PBUSNUMBER_RANGE = *mut BUSNUMBER_RANGE;
-STRUCT!{struct BUSNUMBER_DES {
-    BUSD_Count: ::DWORD,
-    BUSD_Type: ::DWORD,
-    BUSD_Flags: ::DWORD,
-    BUSD_Alloc_Base: ::ULONG,
-    BUSD_Alloc_End: ::ULONG,
-}}
-pub type PBUSNUMBER_DES = *mut BUSNUMBER_DES;
-STRUCT!{struct BUSNUMBER_RESOURCE {
-    BusNumber_Header: BUSNUMBER_DES,
-    BusNumber_Data: [BUSNUMBER_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PBUSNUMBER_RESOURCE = *mut BUSNUMBER_RESOURCE;
-STRUCT!{struct CONNECTION_DES {
-    COND_Type: ::DWORD,
-    COND_Flags: ::DWORD,
-    COND_Class: ::BYTE,
-    COND_ClassType: ::BYTE,
-    COND_Reserved1: ::BYTE,
-    COND_Reserved2: ::BYTE,
-    COND_Id: ::LARGE_INTEGER,
-}}
-pub type PCONNECTION_DES = *mut CONNECTION_DES;
-STRUCT!{struct CONNECTION_RESOURCE {
-    Connection_Header: CONNECTION_DES,
-}}
-pub type PCONNECTION_RESOURCE = *mut CONNECTION_RESOURCE;
-pub const CM_HWPI_NOT_DOCKABLE: ::DWORD = 0x00000000;
-pub const CM_HWPI_UNDOCKED: ::DWORD = 0x00000001;
-pub const CM_HWPI_DOCKED: ::DWORD = 0x00000002;
-STRUCT!{nodebug struct HWPROFILEINFO_A {
-    HWPI_ulHWProfile: ::ULONG,
-    HWPI_szFriendlyName: [::CHAR; MAX_PROFILE_LEN],
-    HWPI_dwFlags: ::DWORD,
-}}
-pub type PHWPROFILEINFO_A = *mut HWPROFILEINFO_A;
-STRUCT!{nodebug struct HWPROFILEINFO_W {
-    HWPI_ulHWProfile: ::ULONG,
-    HWPI_szFriendlyName: [::WCHAR; MAX_PROFILE_LEN],
-    HWPI_dwFlags: ::DWORD,
-}}
-pub type PHWPROFILEINFO_W = *mut HWPROFILEINFO_W;
-pub const ResType_All: RESOURCEID = 0x00000000;
-pub const ResType_None: RESOURCEID = 0x00000000;
-pub const ResType_Mem: RESOURCEID = 0x00000001;
-pub const ResType_IO: RESOURCEID = 0x00000002;
-pub const ResType_DMA: RESOURCEID = 0x00000003;
-pub const ResType_IRQ: RESOURCEID = 0x00000004;
-pub const ResType_DoNotUse: RESOURCEID = 0x00000005;
-pub const ResType_BusNumber: RESOURCEID = 0x00000006;
-pub const ResType_MemLarge: RESOURCEID = 0x00000007;
-pub const ResType_MAX: RESOURCEID = 0x00000007;
-pub const ResType_Ignored_Bit: RESOURCEID = 0x00008000;
-pub const ResType_ClassSpecific: RESOURCEID = 0x0000FFFF;
-pub const ResType_Reserved: RESOURCEID = 0x00008000;
-pub const ResType_DevicePrivate: RESOURCEID = 0x00008001;
-pub const ResType_PcCardConfig: RESOURCEID = 0x00008002;
-pub const ResType_MfCardConfig: RESOURCEID = 0x00008003;
-pub const ResType_Connection: RESOURCEID = 0x00008004;
-pub const CM_ADD_RANGE_ADDIFCONFLICT: ::ULONG = 0x00000000;
-pub const CM_ADD_RANGE_DONOTADDIFCONFLICT: ::ULONG = 0x00000001;
-pub const CM_ADD_RANGE_BITS: ::ULONG = 0x00000001;
-pub const BASIC_LOG_CONF: ::ULONG = 0x00000000;
-pub const FILTERED_LOG_CONF: ::ULONG = 0x00000001;
-pub const ALLOC_LOG_CONF: ::ULONG = 0x00000002;
-pub const BOOT_LOG_CONF: ::ULONG = 0x00000003;
-pub const FORCED_LOG_CONF: ::ULONG = 0x00000004;
-pub const OVERRIDE_LOG_CONF: ::ULONG = 0x00000005;
-pub const NUM_LOG_CONF: ::ULONG = 0x00000006;
-pub const LOG_CONF_BITS: ::ULONG = 0x00000007;
-pub const PRIORITY_EQUAL_FIRST: ::ULONG = 0x00000008;
-pub const PRIORITY_EQUAL_LAST: ::ULONG = 0x00000000;
-pub const PRIORITY_BIT: ::ULONG = 0x00000008;
-pub const RegDisposition_OpenAlways: REGDISPOSITION = 0x00000000;
-pub const RegDisposition_OpenExisting: REGDISPOSITION = 0x00000001;
-pub const RegDisposition_Bits: REGDISPOSITION = 0x00000001;
-pub const CM_ADD_ID_HARDWARE: ::ULONG = 0x00000000;
-pub const CM_ADD_ID_COMPATIBLE: ::ULONG = 0x00000001;
-pub const CM_ADD_ID_BITS: ::ULONG = 0x00000001;
-pub const CM_CREATE_DEVNODE_NORMAL: ::ULONG = 0x00000000;
-pub const CM_CREATE_DEVNODE_NO_WAIT_INSTALL: ::ULONG = 0x00000001;
-pub const CM_CREATE_DEVNODE_PHANTOM: ::ULONG = 0x00000002;
-pub const CM_CREATE_DEVNODE_GENERATE_ID: ::ULONG = 0x00000004;
-pub const CM_CREATE_DEVNODE_DO_NOT_INSTALL: ::ULONG = 0x00000008;
-pub const CM_CREATE_DEVNODE_BITS: ::ULONG = 0x0000000F;
-pub const CM_CREATE_DEVINST_NORMAL: ::ULONG = CM_CREATE_DEVNODE_NORMAL;
-pub const CM_CREATE_DEVINST_NO_WAIT_INSTALL: ::ULONG = CM_CREATE_DEVNODE_NO_WAIT_INSTALL;
-pub const CM_CREATE_DEVINST_PHANTOM: ::ULONG = CM_CREATE_DEVNODE_PHANTOM;
-pub const CM_CREATE_DEVINST_GENERATE_ID: ::ULONG = CM_CREATE_DEVNODE_GENERATE_ID;
-pub const CM_CREATE_DEVINST_DO_NOT_INSTALL: ::ULONG = CM_CREATE_DEVNODE_DO_NOT_INSTALL;
-pub const CM_CREATE_DEVINST_BITS: ::ULONG = CM_CREATE_DEVNODE_BITS;
-pub const CM_DELETE_CLASS_ONLY: ::ULONG = 0x00000000;
-pub const CM_DELETE_CLASS_SUBKEYS: ::ULONG = 0x00000001;
-pub const CM_DELETE_CLASS_INTERFACE: ::ULONG = 0x00000002;
-pub const CM_DELETE_CLASS_BITS: ::ULONG = 0x00000003;
-pub const CM_ENUMERATE_CLASSES_INSTALLER: ::ULONG = 0x00000000;
-pub const CM_ENUMERATE_CLASSES_INTERFACE: ::ULONG = 0x00000001;
-pub const CM_ENUMERATE_CLASSES_BITS: ::ULONG = 0x00000001;
-pub const CM_DETECT_NEW_PROFILE: ::ULONG = 0x00000001;
-pub const CM_DETECT_CRASHED: ::ULONG = 0x00000002;
-pub const CM_DETECT_HWPROF_FIRST_BOOT: ::ULONG = 0x00000004;
-pub const CM_DETECT_RUN: ::ULONG = 0x80000000;
-pub const CM_DETECT_BITS: ::ULONG = 0x80000007;
-pub const CM_DISABLE_POLITE: ::ULONG = 0x00000000;
-pub const CM_DISABLE_ABSOLUTE: ::ULONG = 0x00000001;
-pub const CM_DISABLE_HARDWARE: ::ULONG = 0x00000002;
-pub const CM_DISABLE_UI_NOT_OK: ::ULONG = 0x00000004;
-pub const CM_DISABLE_BITS: ::ULONG = 0x00000007;
-pub const CM_GETIDLIST_FILTER_NONE: ::ULONG = 0x00000000;
-pub const CM_GETIDLIST_FILTER_ENUMERATOR: ::ULONG = 0x00000001;
-pub const CM_GETIDLIST_FILTER_SERVICE: ::ULONG = 0x00000002;
-pub const CM_GETIDLIST_FILTER_EJECTRELATIONS: ::ULONG = 0x00000004;
-pub const CM_GETIDLIST_FILTER_REMOVALRELATIONS: ::ULONG = 0x00000008;
-pub const CM_GETIDLIST_FILTER_POWERRELATIONS: ::ULONG = 0x00000010;
-pub const CM_GETIDLIST_FILTER_BUSRELATIONS: ::ULONG = 0x00000020;
-pub const CM_GETIDLIST_DONOTGENERATE: ::ULONG = 0x10000040;
-pub const CM_GETIDLIST_FILTER_TRANSPORTRELATIONS: ::ULONG = 0x00000080;
-pub const CM_GETIDLIST_FILTER_PRESENT: ::ULONG = 0x00000100;
-pub const CM_GETIDLIST_FILTER_CLASS: ::ULONG = 0x00000200;
-pub const CM_GETIDLIST_FILTER_BITS: ::ULONG = 0x100003FF;
-pub const CM_GET_DEVICE_INTERFACE_LIST_PRESENT: ::ULONG = 0x00000000;
-pub const CM_GET_DEVICE_INTERFACE_LIST_ALL_DEVICES: ::ULONG = 0x00000001;
-pub const CM_GET_DEVICE_INTERFACE_LIST_BITS: ::ULONG = 0x00000001;
-pub const CM_DRP_DEVICEDESC: ::ULONG = 0x00000001;
-pub const CM_DRP_HARDWAREID: ::ULONG = 0x00000002;
-pub const CM_DRP_COMPATIBLEIDS: ::ULONG = 0x00000003;
-pub const CM_DRP_UNUSED0: ::ULONG = 0x00000004;
-pub const CM_DRP_SERVICE: ::ULONG = 0x00000005;
-pub const CM_DRP_UNUSED1: ::ULONG = 0x00000006;
-pub const CM_DRP_UNUSED2: ::ULONG = 0x00000007;
-pub const CM_DRP_CLASS: ::ULONG = 0x00000008;
-pub const CM_DRP_CLASSGUID: ::ULONG = 0x00000009;
-pub const CM_DRP_DRIVER: ::ULONG = 0x0000000A;
-pub const CM_DRP_CONFIGFLAGS: ::ULONG = 0x0000000B;
-pub const CM_DRP_MFG: ::ULONG = 0x0000000C;
-pub const CM_DRP_FRIENDLYNAME: ::ULONG = 0x0000000D;
-pub const CM_DRP_LOCATION_INFORMATION: ::ULONG = 0x0000000E;
-pub const CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: ::ULONG = 0x0000000F;
-pub const CM_DRP_CAPABILITIES: ::ULONG = 0x00000010;
-pub const CM_DRP_UI_NUMBER: ::ULONG = 0x00000011;
-pub const CM_DRP_UPPERFILTERS: ::ULONG = 0x00000012;
-pub const CM_CRP_UPPERFILTERS: ::ULONG = CM_DRP_UPPERFILTERS;
-pub const CM_DRP_LOWERFILTERS: ::ULONG = 0x00000013;
-pub const CM_CRP_LOWERFILTERS: ::ULONG = CM_DRP_LOWERFILTERS;
-pub const CM_DRP_BUSTYPEGUID: ::ULONG = 0x00000014;
-pub const CM_DRP_LEGACYBUSTYPE: ::ULONG = 0x00000015;
-pub const CM_DRP_BUSNUMBER: ::ULONG = 0x00000016;
-pub const CM_DRP_ENUMERATOR_NAME: ::ULONG = 0x00000017;
-pub const CM_DRP_SECURITY: ::ULONG = 0x00000018;
-pub const CM_CRP_SECURITY: ::ULONG = CM_DRP_SECURITY;
-pub const CM_DRP_SECURITY_SDS: ::ULONG = 0x00000019;
-pub const CM_CRP_SECURITY_SDS: ::ULONG = CM_DRP_SECURITY_SDS;
-pub const CM_DRP_DEVTYPE: ::ULONG = 0x0000001A;
-pub const CM_CRP_DEVTYPE: ::ULONG = CM_DRP_DEVTYPE;
-pub const CM_DRP_EXCLUSIVE: ::ULONG = 0x0000001B;
-pub const CM_CRP_EXCLUSIVE: ::ULONG = CM_DRP_EXCLUSIVE;
-pub const CM_DRP_CHARACTERISTICS: ::ULONG = 0x0000001C;
-pub const CM_CRP_CHARACTERISTICS: ::ULONG = CM_DRP_CHARACTERISTICS;
-pub const CM_DRP_ADDRESS: ::ULONG = 0x0000001D;
-pub const CM_DRP_UI_NUMBER_DESC_FORMAT: ::ULONG = 0x0000001E;
-pub const CM_DRP_DEVICE_POWER_DATA: ::ULONG = 0x0000001F;
-pub const CM_DRP_REMOVAL_POLICY: ::ULONG = 0x00000020;
-pub const CM_DRP_REMOVAL_POLICY_HW_DEFAULT: ::ULONG = 0x00000021;
-pub const CM_DRP_REMOVAL_POLICY_OVERRIDE: ::ULONG = 0x00000022;
-pub const CM_DRP_INSTALL_STATE: ::ULONG = 0x00000023;
-pub const CM_DRP_LOCATION_PATHS: ::ULONG = 0x00000024;
-pub const CM_DRP_BASE_CONTAINERID: ::ULONG = 0x00000025;
-pub const CM_DRP_MIN: ::ULONG = 0x00000001;
-pub const CM_CRP_MIN: ::ULONG = CM_DRP_MIN;
-pub const CM_DRP_MAX: ::ULONG = 0x00000025;
-pub const CM_CRP_MAX: ::ULONG = CM_DRP_MAX;
-pub const CM_DEVCAP_LOCKSUPPORTED: ::ULONG = 0x00000001;
-pub const CM_DEVCAP_EJECTSUPPORTED: ::ULONG = 0x00000002;
-pub const CM_DEVCAP_REMOVABLE: ::ULONG = 0x00000004;
-pub const CM_DEVCAP_DOCKDEVICE: ::ULONG = 0x00000008;
-pub const CM_DEVCAP_UNIQUEID: ::ULONG = 0x00000010;
-pub const CM_DEVCAP_SILENTINSTALL: ::ULONG = 0x00000020;
-pub const CM_DEVCAP_RAWDEVICEOK: ::ULONG = 0x00000040;
-pub const CM_DEVCAP_SURPRISEREMOVALOK: ::ULONG = 0x00000080;
-pub const CM_DEVCAP_HARDWAREDISABLED: ::ULONG = 0x00000100;
-pub const CM_DEVCAP_NONDYNAMIC: ::ULONG = 0x00000200;
-pub const CM_REMOVAL_POLICY_EXPECT_NO_REMOVAL: ::ULONG = 1;
-pub const CM_REMOVAL_POLICY_EXPECT_ORDERLY_REMOVAL: ::ULONG = 2;
-pub const CM_REMOVAL_POLICY_EXPECT_SURPRISE_REMOVAL: ::ULONG = 3;
-pub const CM_INSTALL_STATE_INSTALLED: ::ULONG = 0;
-pub const CM_INSTALL_STATE_NEEDS_REINSTALL: ::ULONG = 1;
-pub const CM_INSTALL_STATE_FAILED_INSTALL: ::ULONG = 2;
-pub const CM_INSTALL_STATE_FINISH_INSTALL: ::ULONG = 3;
-pub const CM_LOCATE_DEVNODE_NORMAL: ::ULONG = 0x00000000;
-pub const CM_LOCATE_DEVNODE_PHANTOM: ::ULONG = 0x00000001;
-pub const CM_LOCATE_DEVNODE_CANCELREMOVE: ::ULONG = 0x00000002;
-pub const CM_LOCATE_DEVNODE_NOVALIDATION: ::ULONG = 0x00000004;
-pub const CM_LOCATE_DEVNODE_BITS: ::ULONG = 0x00000007;
-pub const CM_LOCATE_DEVINST_NORMAL: ::ULONG = CM_LOCATE_DEVNODE_NORMAL;
-pub const CM_LOCATE_DEVINST_PHANTOM: ::ULONG = CM_LOCATE_DEVNODE_PHANTOM;
-pub const CM_LOCATE_DEVINST_CANCELREMOVE: ::ULONG = CM_LOCATE_DEVNODE_CANCELREMOVE;
-pub const CM_LOCATE_DEVINST_NOVALIDATION: ::ULONG = CM_LOCATE_DEVNODE_NOVALIDATION;
-pub const CM_LOCATE_DEVINST_BITS: ::ULONG = CM_LOCATE_DEVNODE_BITS;
-pub const CM_OPEN_CLASS_KEY_INSTALLER: ::ULONG = 0x00000000;
-pub const CM_OPEN_CLASS_KEY_INTERFACE: ::ULONG = 0x00000001;
-pub const CM_OPEN_CLASS_KEY_BITS: ::ULONG = 0x00000001;
-pub const CM_REMOVE_UI_OK: ::ULONG = 0x00000000;
-pub const CM_REMOVE_UI_NOT_OK: ::ULONG = 0x00000001;
-pub const CM_REMOVE_NO_RESTART: ::ULONG = 0x00000002;
-pub const CM_REMOVE_BITS: ::ULONG = 0x00000003;
-pub const CM_QUERY_REMOVE_UI_OK: ::ULONG = CM_REMOVE_UI_OK;
-pub const CM_QUERY_REMOVE_UI_NOT_OK: ::ULONG = CM_REMOVE_UI_NOT_OK;
-pub const CM_QUERY_REMOVE_BITS: ::ULONG = CM_QUERY_REMOVE_UI_OK | CM_QUERY_REMOVE_UI_NOT_OK;
-pub const CM_REENUMERATE_NORMAL: ::ULONG = 0x00000000;
-pub const CM_REENUMERATE_SYNCHRONOUS: ::ULONG = 0x00000001;
-pub const CM_REENUMERATE_RETRY_INSTALLATION: ::ULONG = 0x00000002;
-pub const CM_REENUMERATE_ASYNCHRONOUS: ::ULONG = 0x00000004;
-pub const CM_REENUMERATE_BITS: ::ULONG = 0x00000007;
-pub const CM_REGISTER_DEVICE_DRIVER_STATIC: ::ULONG = 0x00000000;
-pub const CM_REGISTER_DEVICE_DRIVER_DISABLEABLE: ::ULONG = 0x00000001;
-pub const CM_REGISTER_DEVICE_DRIVER_REMOVABLE: ::ULONG = 0x00000002;
-pub const CM_REGISTER_DEVICE_DRIVER_BITS: ::ULONG = 0x00000003;
-pub const CM_REGISTRY_HARDWARE: ::ULONG = 0x00000000;
-pub const CM_REGISTRY_SOFTWARE: ::ULONG = 0x00000001;
-pub const CM_REGISTRY_USER: ::ULONG = 0x00000100;
-pub const CM_REGISTRY_CONFIG: ::ULONG = 0x00000200;
-pub const CM_REGISTRY_BITS: ::ULONG = 0x00000301;
-pub const CM_SET_DEVNODE_PROBLEM_NORMAL: ::ULONG = 0x00000000;
-pub const CM_SET_DEVNODE_PROBLEM_OVERRIDE: ::ULONG = 0x00000001;
-pub const CM_SET_DEVNODE_PROBLEM_BITS: ::ULONG = 0x00000001;
-pub const CM_SET_DEVINST_PROBLEM_NORMAL: ::ULONG = CM_SET_DEVNODE_PROBLEM_NORMAL;
-pub const CM_SET_DEVINST_PROBLEM_OVERRIDE: ::ULONG = CM_SET_DEVNODE_PROBLEM_OVERRIDE;
-pub const CM_SET_DEVINST_PROBLEM_BITS: ::ULONG = CM_SET_DEVNODE_PROBLEM_BITS;
-pub const CM_SET_HW_PROF_FLAGS_UI_NOT_OK: ::ULONG = 0x00000001;
-pub const CM_SET_HW_PROF_FLAGS_BITS: ::ULONG = 0x00000001;
-pub const CM_SETUP_DEVNODE_READY: ::ULONG = 0x00000000;
-pub const CM_SETUP_DEVINST_READY: ::ULONG = CM_SETUP_DEVNODE_READY;
-pub const CM_SETUP_DOWNLOAD: ::ULONG = 0x00000001;
-pub const CM_SETUP_WRITE_LOG_CONFS: ::ULONG = 0x00000002;
-pub const CM_SETUP_PROP_CHANGE: ::ULONG = 0x00000003;
-pub const CM_SETUP_DEVNODE_RESET: ::ULONG = 0x00000004;
-pub const CM_SETUP_DEVINST_RESET: ::ULONG = CM_SETUP_DEVNODE_RESET;
-pub const CM_SETUP_DEVNODE_CONFIG: ::ULONG = 0x00000005;
-pub const CM_SETUP_DEVINST_CONFIG: ::ULONG = CM_SETUP_DEVNODE_CONFIG;
-pub const CM_SETUP_DEVNODE_CONFIG_CLASS: ::ULONG = 0x00000006;
-pub const CM_SETUP_DEVINST_CONFIG_CLASS: ::ULONG = CM_SETUP_DEVNODE_CONFIG_CLASS;
-pub const CM_SETUP_DEVNODE_CONFIG_EXTENSIONS: ::ULONG = 0x00000007;
-pub const CM_SETUP_DEVINST_CONFIG_EXTENSIONS: ::ULONG = CM_SETUP_DEVNODE_CONFIG_EXTENSIONS;
-pub const CM_SETUP_BITS: ::ULONG = 0x00000007;
-pub const CM_QUERY_ARBITRATOR_RAW: ::ULONG = 0x00000000;
-pub const CM_QUERY_ARBITRATOR_TRANSLATED: ::ULONG = 0x00000001;
-pub const CM_QUERY_ARBITRATOR_BITS: ::ULONG = 0x00000001;
-pub const CM_CUSTOMDEVPROP_MERGE_MULTISZ: ::ULONG = 0x00000001;
-pub const CM_CUSTOMDEVPROP_BITS: ::ULONG = 0x00000001;
-pub const CM_NAME_ATTRIBUTE_NAME_RETRIEVED_FROM_DEVICE: ::ULONG = 0x1;
-pub const CM_NAME_ATTRIBUTE_USER_ASSIGNED_NAME: ::ULONG = 0x2;
-pub const CM_CLASS_PROPERTY_INSTALLER: ::ULONG = 0x00000000;
-pub const CM_CLASS_PROPERTY_INTERFACE: ::ULONG = 0x00000001;
-pub const CM_CLASS_PROPERTY_BITS: ::ULONG = 0x00000001;
-DECLARE_HANDLE!(HCMNOTIFICATION, HCMNOTIFICATION__);
-pub type PHCMNOTIFICATION = *mut HCMNOTIFICATION;
-pub const CM_NOTIFY_FILTER_FLAG_ALL_INTERFACE_CLASSES: ::ULONG = 0x00000001;
-pub const CM_NOTIFY_FILTER_FLAG_ALL_DEVICE_INSTANCES: ::ULONG = 0x00000002;
-pub const CM_NOTIFY_FILTER_VALID_FLAGS: ::ULONG = CM_NOTIFY_FILTER_FLAG_ALL_INTERFACE_CLASSES
-    | CM_NOTIFY_FILTER_FLAG_ALL_DEVICE_INSTANCES;
-ENUM!{enum CM_NOTIFY_FILTER_TYPE {
-    CM_NOTIFY_FILTER_TYPE_DEVICEINTERFACE = 0,
-    CM_NOTIFY_FILTER_TYPE_DEVICEHANDLE,
-    CM_NOTIFY_FILTER_TYPE_DEVICEINSTANCE,
-    CM_NOTIFY_FILTER_TYPE_MAX,
-}}
-pub type PCM_NOTIFY_FILTER_TYPE = *mut CM_NOTIFY_FILTER_TYPE;
-STRUCT!{struct CM_NOTIFY_FILTER_DeviceInterface {
-    ClassGuid: ::GUID,
-}}
-STRUCT!{struct CM_NOTIFY_FILTER_DeviceHandle {
-    hTarget: ::HANDLE,
-}}
-STRUCT!{nodebug struct CM_NOTIFY_FILTER_DeviceInstance {
-    InstanceId: [::WCHAR; MAX_DEVICE_ID_LEN],
-}}
-STRUCT!{nodebug struct CM_NOTIFY_FILTER {
-    cbSize: ::DWORD,
-    Flags: ::DWORD,
-    FilterType: CM_NOTIFY_FILTER_TYPE,
-    Reserved: ::DWORD,
-    u: [::BYTE; 400],
-}}
-UNION!(CM_NOTIFY_FILTER, u, DeviceInterface, DeviceInterface_mut, CM_NOTIFY_FILTER_DeviceInterface);
-UNION!(CM_NOTIFY_FILTER, u, DeviceHandle, DeviceHandle_mut, CM_NOTIFY_FILTER_DeviceHandle);
-UNION!(CM_NOTIFY_FILTER, u, DeviceInstance, DeviceInstance_mut, CM_NOTIFY_FILTER_DeviceInstance);
-pub type PCM_NOTIFY_FILTER = *mut CM_NOTIFY_FILTER;
-ENUM!{enum CM_NOTIFY_ACTION {
-    CM_NOTIFY_ACTION_DEVICEINTERFACEARRIVAL = 0,
-    CM_NOTIFY_ACTION_DEVICEINTERFACEREMOVAL,
-    CM_NOTIFY_ACTION_DEVICEQUERYREMOVE,
-    CM_NOTIFY_ACTION_DEVICEQUERYREMOVEFAILED,
-    CM_NOTIFY_ACTION_DEVICEREMOVEPENDING,
-    CM_NOTIFY_ACTION_DEVICEREMOVECOMPLETE,
-    CM_NOTIFY_ACTION_DEVICECUSTOMEVENT,
-    CM_NOTIFY_ACTION_DEVICEINSTANCEENUMERATED,
-    CM_NOTIFY_ACTION_DEVICEINSTANCESTARTED,
-    CM_NOTIFY_ACTION_DEVICEINSTANCEREMOVED,
-    CM_NOTIFY_ACTION_MAX,
-}}
-pub type PCM_NOTIFY_ACTION = *mut CM_NOTIFY_ACTION;
-STRUCT!{struct CM_NOTIFY_EVENT_DATA_DeviceInterface {
-    ClassGuid: ::GUID,
-    SymbolicLink: [::WCHAR; ::ANYSIZE_ARRAY],
-}}
-STRUCT!{struct CM_NOTIFY_EVENT_DATA_DeviceHandle {
-    EventGuid: ::GUID,
-    NameOffset: ::LONG,
-    DataSize: ::DWORD,
-    Data: [::BYTE; ::ANYSIZE_ARRAY],
-}}
-STRUCT!{struct CM_NOTIFY_EVENT_DATA_DeviceInstance {
-    InstanceId: [::WCHAR; ::ANYSIZE_ARRAY],
-}}
-STRUCT!{struct CM_NOTIFY_EVENT_DATA {
-    FilterType: CM_NOTIFY_FILTER_TYPE,
-    Reserved: ::DWORD,
-    u: [::BYTE; 25],
-}}
-UNION!(
-    CM_NOTIFY_EVENT_DATA, u, DeviceInterface, DeviceInterface_mut,
-    CM_NOTIFY_EVENT_DATA_DeviceInterface
-);
-UNION!(CM_NOTIFY_EVENT_DATA, u, DeviceHandle, DeviceHandle_mut, CM_NOTIFY_EVENT_DATA_DeviceHandle);
-UNION!(
-    CM_NOTIFY_EVENT_DATA, u, DeviceInstance, DeviceInstance_mut, CM_NOTIFY_EVENT_DATA_DeviceInstance
-);
-pub type PCM_NOTIFY_EVENT_DATA = *mut CM_NOTIFY_EVENT_DATA;
-pub type PCM_NOTIFY_CALLBACK = Option<unsafe extern "system" fn(
-    hNotify: HCMNOTIFICATION, Context: ::PVOID, Action: CM_NOTIFY_ACTION,
-    EventData: PCM_NOTIFY_EVENT_DATA, EventDataSize: ::DWORD,
-) -> ::DWORD>;
-pub const CR_SUCCESS: CONFIGRET = 0x00000000;
-pub const CR_DEFAULT: CONFIGRET = 0x00000001;
-pub const CR_OUT_OF_MEMORY: CONFIGRET = 0x00000002;
-pub const CR_INVALID_POINTER: CONFIGRET = 0x00000003;
-pub const CR_INVALID_FLAG: CONFIGRET = 0x00000004;
-pub const CR_INVALID_DEVNODE: CONFIGRET = 0x00000005;
-pub const CR_INVALID_DEVINST: CONFIGRET = CR_INVALID_DEVNODE;
-pub const CR_INVALID_RES_DES: CONFIGRET = 0x00000006;
-pub const CR_INVALID_LOG_CONF: CONFIGRET = 0x00000007;
-pub const CR_INVALID_ARBITRATOR: CONFIGRET = 0x00000008;
-pub const CR_INVALID_NODELIST: CONFIGRET = 0x00000009;
-pub const CR_DEVNODE_HAS_REQS: CONFIGRET = 0x0000000A;
-pub const CR_DEVINST_HAS_REQS: CONFIGRET = CR_DEVNODE_HAS_REQS;
-pub const CR_INVALID_RESOURCEID: CONFIGRET = 0x0000000B;
-pub const CR_DLVXD_NOT_FOUND: CONFIGRET = 0x0000000C;
-pub const CR_NO_SUCH_DEVNODE: CONFIGRET = 0x0000000D;
-pub const CR_NO_SUCH_DEVINST: CONFIGRET = CR_NO_SUCH_DEVNODE;
-pub const CR_NO_MORE_LOG_CONF: CONFIGRET = 0x0000000E;
-pub const CR_NO_MORE_RES_DES: CONFIGRET = 0x0000000F;
-pub const CR_ALREADY_SUCH_DEVNODE: CONFIGRET = 0x00000010;
-pub const CR_ALREADY_SUCH_DEVINST: CONFIGRET = CR_ALREADY_SUCH_DEVNODE;
-pub const CR_INVALID_RANGE_LIST: CONFIGRET = 0x00000011;
-pub const CR_INVALID_RANGE: CONFIGRET = 0x00000012;
-pub const CR_FAILURE: CONFIGRET = 0x00000013;
-pub const CR_NO_SUCH_LOGICAL_DEV: CONFIGRET = 0x00000014;
-pub const CR_CREATE_BLOCKED: CONFIGRET = 0x00000015;
-pub const CR_NOT_SYSTEM_VM: CONFIGRET = 0x00000016;
-pub const CR_REMOVE_VETOED: CONFIGRET = 0x00000017;
-pub const CR_APM_VETOED: CONFIGRET = 0x00000018;
-pub const CR_INVALID_LOAD_TYPE: CONFIGRET = 0x00000019;
-pub const CR_BUFFER_SMALL: CONFIGRET = 0x0000001A;
-pub const CR_NO_ARBITRATOR: CONFIGRET = 0x0000001B;
-pub const CR_NO_REGISTRY_HANDLE: CONFIGRET = 0x0000001C;
-pub const CR_REGISTRY_ERROR: CONFIGRET = 0x0000001D;
-pub const CR_INVALID_DEVICE_ID: CONFIGRET = 0x0000001E;
-pub const CR_INVALID_DATA: CONFIGRET = 0x0000001F;
-pub const CR_INVALID_API: CONFIGRET = 0x00000020;
-pub const CR_DEVLOADER_NOT_READY: CONFIGRET = 0x00000021;
-pub const CR_NEED_RESTART: CONFIGRET = 0x00000022;
-pub const CR_NO_MORE_HW_PROFILES: CONFIGRET = 0x00000023;
-pub const CR_DEVICE_NOT_THERE: CONFIGRET = 0x00000024;
-pub const CR_NO_SUCH_VALUE: CONFIGRET = 0x00000025;
-pub const CR_WRONG_TYPE: CONFIGRET = 0x00000026;
-pub const CR_INVALID_PRIORITY: CONFIGRET = 0x00000027;
-pub const CR_NOT_DISABLEABLE: CONFIGRET = 0x00000028;
-pub const CR_FREE_RESOURCES: CONFIGRET = 0x00000029;
-pub const CR_QUERY_VETOED: CONFIGRET = 0x0000002A;
-pub const CR_CANT_SHARE_IRQ: CONFIGRET = 0x0000002B;
-pub const CR_NO_DEPENDENT: CONFIGRET = 0x0000002C;
-pub const CR_SAME_RESOURCES: CONFIGRET = 0x0000002D;
-pub const CR_NO_SUCH_REGISTRY_KEY: CONFIGRET = 0x0000002E;
-pub const CR_INVALID_MACHINENAME: CONFIGRET = 0x0000002F;
-pub const CR_REMOTE_COMM_FAILURE: CONFIGRET = 0x00000030;
-pub const CR_MACHINE_UNAVAILABLE: CONFIGRET = 0x00000031;
-pub const CR_NO_CM_SERVICES: CONFIGRET = 0x00000032;
-pub const CR_ACCESS_DENIED: CONFIGRET = 0x00000033;
-pub const CR_CALL_NOT_IMPLEMENTED: CONFIGRET = 0x00000034;
-pub const CR_INVALID_PROPERTY: CONFIGRET = 0x00000035;
-pub const CR_DEVICE_INTERFACE_ACTIVE: CONFIGRET = 0x00000036;
-pub const CR_NO_SUCH_DEVICE_INTERFACE: CONFIGRET = 0x00000037;
-pub const CR_INVALID_REFERENCE_STRING: CONFIGRET = 0x00000038;
-pub const CR_INVALID_CONFLICT_LIST: CONFIGRET = 0x00000039;
-pub const CR_INVALID_INDEX: CONFIGRET = 0x0000003A;
-pub const CR_INVALID_STRUCTURE_SIZE: CONFIGRET = 0x0000003B;
-pub const NUM_CR_RESULTS: CONFIGRET = 0x0000003C;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/cfg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/cfg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/cfg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/cfg.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! common Configuration Manager definitions for both user mode and kernel mode code
-ENUM!{enum PNP_VETO_TYPE {
-    PNP_VetoTypeUnknown,
-    PNP_VetoLegacyDevice,
-    PNP_VetoPendingClose,
-    PNP_VetoWindowsApp,
-    PNP_VetoWindowsService,
-    PNP_VetoOutstandingOpen,
-    PNP_VetoDevice,
-    PNP_VetoDriver,
-    PNP_VetoIllegalDeviceRequest,
-    PNP_VetoInsufficientPower,
-    PNP_VetoNonDisableable,
-    PNP_VetoLegacyDriver,
-    PNP_VetoInsufficientRights,
-}}
-pub type PPNP_VETO_TYPE = *mut PNP_VETO_TYPE;
-pub const CM_PROB_NOT_CONFIGURED: ::CONFIGRET = 0x00000001;
-pub const CM_PROB_DEVLOADER_FAILED: ::CONFIGRET = 0x00000002;
-pub const CM_PROB_OUT_OF_MEMORY: ::CONFIGRET = 0x00000003;
-pub const CM_PROB_ENTRY_IS_WRONG_TYPE: ::CONFIGRET = 0x00000004;
-pub const CM_PROB_LACKED_ARBITRATOR: ::CONFIGRET = 0x00000005;
-pub const CM_PROB_BOOT_CONFIG_CONFLICT: ::CONFIGRET = 0x00000006;
-pub const CM_PROB_FAILED_FILTER: ::CONFIGRET = 0x00000007;
-pub const CM_PROB_DEVLOADER_NOT_FOUND: ::CONFIGRET = 0x00000008;
-pub const CM_PROB_INVALID_DATA: ::CONFIGRET = 0x00000009;
-pub const CM_PROB_FAILED_START: ::CONFIGRET = 0x0000000A;
-pub const CM_PROB_LIAR: ::CONFIGRET = 0x0000000B;
-pub const CM_PROB_NORMAL_CONFLICT: ::CONFIGRET = 0x0000000C;
-pub const CM_PROB_NOT_VERIFIED: ::CONFIGRET = 0x0000000D;
-pub const CM_PROB_NEED_RESTART: ::CONFIGRET = 0x0000000E;
-pub const CM_PROB_REENUMERATION: ::CONFIGRET = 0x0000000F;
-pub const CM_PROB_PARTIAL_LOG_CONF: ::CONFIGRET = 0x00000010;
-pub const CM_PROB_UNKNOWN_RESOURCE: ::CONFIGRET = 0x00000011;
-pub const CM_PROB_REINSTALL: ::CONFIGRET = 0x00000012;
-pub const CM_PROB_REGISTRY: ::CONFIGRET = 0x00000013;
-pub const CM_PROB_VXDLDR: ::CONFIGRET = 0x00000014;
-pub const CM_PROB_WILL_BE_REMOVED: ::CONFIGRET = 0x00000015;
-pub const CM_PROB_DISABLED: ::CONFIGRET = 0x00000016;
-pub const CM_PROB_DEVLOADER_NOT_READY: ::CONFIGRET = 0x00000017;
-pub const CM_PROB_DEVICE_NOT_THERE: ::CONFIGRET = 0x00000018;
-pub const CM_PROB_MOVED: ::CONFIGRET = 0x00000019;
-pub const CM_PROB_TOO_EARLY: ::CONFIGRET = 0x0000001A;
-pub const CM_PROB_NO_VALID_LOG_CONF: ::CONFIGRET = 0x0000001B;
-pub const CM_PROB_FAILED_INSTALL: ::CONFIGRET = 0x0000001C;
-pub const CM_PROB_HARDWARE_DISABLED: ::CONFIGRET = 0x0000001D;
-pub const CM_PROB_CANT_SHARE_IRQ: ::CONFIGRET = 0x0000001E;
-pub const CM_PROB_FAILED_ADD: ::CONFIGRET = 0x0000001F;
-pub const CM_PROB_DISABLED_SERVICE: ::CONFIGRET = 0x00000020;
-pub const CM_PROB_TRANSLATION_FAILED: ::CONFIGRET = 0x00000021;
-pub const CM_PROB_NO_SOFTCONFIG: ::CONFIGRET = 0x00000022;
-pub const CM_PROB_BIOS_TABLE: ::CONFIGRET = 0x00000023;
-pub const CM_PROB_IRQ_TRANSLATION_FAILED: ::CONFIGRET = 0x00000024;
-pub const CM_PROB_FAILED_DRIVER_ENTRY: ::CONFIGRET = 0x00000025;
-pub const CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD: ::CONFIGRET = 0x00000026;
-pub const CM_PROB_DRIVER_FAILED_LOAD: ::CONFIGRET = 0x00000027;
-pub const CM_PROB_DRIVER_SERVICE_KEY_INVALID: ::CONFIGRET = 0x00000028;
-pub const CM_PROB_LEGACY_SERVICE_NO_DEVICES: ::CONFIGRET = 0x00000029;
-pub const CM_PROB_DUPLICATE_DEVICE: ::CONFIGRET = 0x0000002A;
-pub const CM_PROB_FAILED_POST_START: ::CONFIGRET = 0x0000002B;
-pub const CM_PROB_HALTED: ::CONFIGRET = 0x0000002C;
-pub const CM_PROB_PHANTOM: ::CONFIGRET = 0x0000002D;
-pub const CM_PROB_SYSTEM_SHUTDOWN: ::CONFIGRET = 0x0000002E;
-pub const CM_PROB_HELD_FOR_EJECT: ::CONFIGRET = 0x0000002F;
-pub const CM_PROB_DRIVER_BLOCKED: ::CONFIGRET = 0x00000030;
-pub const CM_PROB_REGISTRY_TOO_LARGE: ::CONFIGRET = 0x00000031;
-pub const CM_PROB_SETPROPERTIES_FAILED: ::CONFIGRET = 0x00000032;
-pub const CM_PROB_WAITING_ON_DEPENDENCY: ::CONFIGRET = 0x00000033;
-pub const CM_PROB_UNSIGNED_DRIVER: ::CONFIGRET = 0x00000034;
-pub const CM_PROB_USED_BY_DEBUGGER: ::CONFIGRET = 0x00000035;
-pub const NUM_CM_PROB_V1: ::CONFIGRET = 0x00000025;
-pub const NUM_CM_PROB_V2: ::CONFIGRET = 0x00000032;
-pub const NUM_CM_PROB_V3: ::CONFIGRET = 0x00000033;
-pub const NUM_CM_PROB_V4: ::CONFIGRET = 0x00000034;
-pub const NUM_CM_PROB_V5: ::CONFIGRET = 0x00000035;
-pub const NUM_CM_PROB_V6: ::CONFIGRET = 0x00000036;
-pub const DN_ROOT_ENUMERATED: ::CONFIGRET = 0x00000001;
-pub const DN_DRIVER_LOADED: ::CONFIGRET = 0x00000002;
-pub const DN_ENUM_LOADED: ::CONFIGRET = 0x00000004;
-pub const DN_STARTED: ::CONFIGRET = 0x00000008;
-pub const DN_MANUAL: ::CONFIGRET = 0x00000010;
-pub const DN_NEED_TO_ENUM: ::CONFIGRET = 0x00000020;
-pub const DN_NOT_FIRST_TIME: ::CONFIGRET = 0x00000040;
-pub const DN_HARDWARE_ENUM: ::CONFIGRET = 0x00000080;
-pub const DN_LIAR: ::CONFIGRET = 0x00000100;
-pub const DN_HAS_MARK: ::CONFIGRET = 0x00000200;
-pub const DN_HAS_PROBLEM: ::CONFIGRET = 0x00000400;
-pub const DN_FILTERED: ::CONFIGRET = 0x00000800;
-pub const DN_MOVED: ::CONFIGRET = 0x00001000;
-pub const DN_DISABLEABLE: ::CONFIGRET = 0x00002000;
-pub const DN_REMOVABLE: ::CONFIGRET = 0x00004000;
-pub const DN_PRIVATE_PROBLEM: ::CONFIGRET = 0x00008000;
-pub const DN_MF_PARENT: ::CONFIGRET = 0x00010000;
-pub const DN_MF_CHILD: ::CONFIGRET = 0x00020000;
-pub const DN_WILL_BE_REMOVED: ::CONFIGRET = 0x00040000;
-pub const DN_NOT_FIRST_TIMEE: ::CONFIGRET = 0x00080000;
-pub const DN_STOP_FREE_RES: ::CONFIGRET = 0x00100000;
-pub const DN_REBAL_CANDIDATE: ::CONFIGRET = 0x00200000;
-pub const DN_BAD_PARTIAL: ::CONFIGRET = 0x00400000;
-pub const DN_NT_ENUMERATOR: ::CONFIGRET = 0x00800000;
-pub const DN_NT_DRIVER: ::CONFIGRET = 0x01000000;
-pub const DN_NEEDS_LOCKING: ::CONFIGRET = 0x02000000;
-pub const DN_ARM_WAKEUP: ::CONFIGRET = 0x04000000;
-pub const DN_APM_ENUMERATOR: ::CONFIGRET = 0x08000000;
-pub const DN_APM_DRIVER: ::CONFIGRET = 0x10000000;
-pub const DN_SILENT_INSTALL: ::CONFIGRET = 0x20000000;
-pub const DN_NO_SHOW_IN_DM: ::CONFIGRET = 0x40000000;
-pub const DN_BOOT_LOG_PROB: ::CONFIGRET = 0x80000000;
-pub const DN_NEED_RESTART: ::CONFIGRET = DN_LIAR;
-pub const DN_DRIVER_BLOCKED: ::CONFIGRET = DN_NOT_FIRST_TIME;
-pub const DN_LEGACY_DRIVER: ::CONFIGRET = DN_MOVED;
-pub const DN_CHILD_WITH_INVALID_ID: ::CONFIGRET = DN_HAS_MARK;
-pub const DN_DEVICE_DISCONNECTED: ::CONFIGRET = DN_NEEDS_LOCKING;
-pub const DN_CHANGEABLE_FLAGS: ::CONFIGRET = DN_NOT_FIRST_TIME + DN_HARDWARE_ENUM + DN_HAS_MARK
-    + DN_DISABLEABLE + DN_REMOVABLE + DN_MF_CHILD + DN_MF_PARENT + DN_NOT_FIRST_TIMEE
-    + DN_STOP_FREE_RES + DN_REBAL_CANDIDATE + DN_NT_ENUMERATOR + DN_NT_DRIVER + DN_SILENT_INSTALL
-    + DN_NO_SHOW_IN_DM;
-pub const LCPRI_FORCECONFIG: ::PRIORITY = 0x00000000;
-pub const LCPRI_BOOTCONFIG: ::PRIORITY = 0x00000001;
-pub const LCPRI_DESIRED: ::PRIORITY = 0x00002000;
-pub const LCPRI_NORMAL: ::PRIORITY = 0x00003000;
-pub const LCPRI_LASTBESTCONFIG: ::PRIORITY = 0x00003FFF;
-pub const LCPRI_SUBOPTIMAL: ::PRIORITY = 0x00005000;
-pub const LCPRI_LASTSOFTCONFIG: ::PRIORITY = 0x00007FFF;
-pub const LCPRI_RESTART: ::PRIORITY = 0x00008000;
-pub const LCPRI_REBOOT: ::PRIORITY = 0x00009000;
-pub const LCPRI_POWEROFF: ::PRIORITY = 0x0000A000;
-pub const LCPRI_HARDRECONFIG: ::PRIORITY = 0x0000C000;
-pub const LCPRI_HARDWIRED: ::PRIORITY = 0x0000E000;
-pub const LCPRI_IMPOSSIBLE: ::PRIORITY = 0x0000F000;
-pub const LCPRI_DISABLED: ::PRIORITY = 0x0000FFFF;
-pub const MAX_LCPRI: ::PRIORITY = 0x0000FFFF;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/combaseapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/combaseapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/combaseapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/combaseapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub const CLSCTX_INPROC_SERVER: DWORD = 0x1;
-pub const CLSCTX_INPROC_HANDLER: DWORD = 0x2;
-pub const CLSCTX_LOCAL_SERVER: DWORD = 0x4;
-pub const CLSCTX_REMOTE_SERVER: DWORD = 0x10;
-pub const CLSCTX_SERVER: DWORD = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER |
-                                 CLSCTX_REMOTE_SERVER;
-pub const CLSCTX_ALL: DWORD = CLSCTX_INPROC_HANDLER | CLSCTX_SERVER;
-STRUCT!{struct ServerInformation {
-    dwServerPid: DWORD,
-    dwServerTid: DWORD,
-    ui64ServerAddress: UINT64,
-}}
-pub type PServerInformation = *mut ServerInformation;
-DECLARE_HANDLE!(CO_MTA_USAGE_COOKIE, CO_MTA_USAGE_COOKIE__);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/commctrl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/commctrl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/commctrl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/commctrl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3578 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//138
-STRUCT!{struct INITCOMMONCONTROLSEX {
-    dwSize: ::DWORD,
-    dwICC: ::DWORD,
-}}
-pub type LPINITCOMMONCONTROLSEX = *mut INITCOMMONCONTROLSEX;
-pub const ICC_LISTVIEW_CLASSES: ::DWORD = 0x1;
-pub const ICC_TREEVIEW_CLASSES: ::DWORD = 0x2;
-pub const ICC_BAR_CLASSES: ::DWORD = 0x4;
-pub const ICC_TAB_CLASSES: ::DWORD = 0x8;
-pub const ICC_UPDOWN_CLASS: ::DWORD = 0x10;
-pub const ICC_PROGRESS_CLASS: ::DWORD = 0x20;
-pub const ICC_HOTKEY_CLASS: ::DWORD = 0x40;
-pub const ICC_ANIMATE_CLASS: ::DWORD = 0x80;
-pub const ICC_WIN95_CLASSES: ::DWORD = 0xFF;
-pub const ICC_DATE_CLASSES: ::DWORD = 0x100;
-pub const ICC_USEREX_CLASSES: ::DWORD = 0x200;
-pub const ICC_COOL_CLASSES: ::DWORD = 0x400;
-pub const ICC_INTERNET_CLASSES: ::DWORD = 0x800;
-pub const ICC_PAGESCROLLER_CLASS: ::DWORD = 0x1000;
-pub const ICC_NATIVEFNTCTL_CLASS: ::DWORD = 0x2000;
-pub const ICC_STANDARD_CLASSES: ::DWORD = 0x4000;
-pub const ICC_LINK_CLASS: ::DWORD = 0x8000;
-pub const ODT_HEADER: ::UINT = 100;
-pub const ODT_TAB: ::UINT = 101;
-pub const ODT_LISTVIEW: ::UINT = 102;
-pub const LVM_FIRST: ::UINT = 0x1000;
-pub const TV_FIRST: ::UINT = 0x1100;
-pub const HDM_FIRST: ::UINT = 0x1200;
-pub const TCM_FIRST: ::UINT = 0x1300;
-pub const PGM_FIRST: ::UINT = 0x1400;
-pub const ECM_FIRST: ::UINT = 0x1500;
-pub const BCM_FIRST: ::UINT = 0x1600;
-pub const CBM_FIRST: ::UINT = 0x1700;
-pub const CCM_FIRST: ::UINT = 0x2000;
-pub const CCM_LAST: ::UINT = CCM_FIRST + 0x200;
-pub const CCM_SETBKCOLOR: ::UINT = CCM_FIRST + 1;
-STRUCT!{struct COLORSCHEME {
-    dwSize: ::DWORD,
-    clrBtnHighlight: ::COLORREF,
-    clrBtnShadow: ::COLORREF,
-}}
-pub type LPCOLORSCHEME = *mut COLORSCHEME;
-pub const CCM_SETCOLORSCHEME: ::UINT = CCM_FIRST + 2;
-pub const CCM_GETCOLORSCHEME: ::UINT = CCM_FIRST + 3;
-pub const CCM_GETDROPTARGET: ::UINT = CCM_FIRST + 4;
-pub const CCM_SETUNICODEFORMAT: ::UINT = CCM_FIRST + 5;
-pub const CCM_GETUNICODEFORMAT: ::UINT = CCM_FIRST + 6;
-pub const CCM_SETVERSION: ::UINT = CCM_FIRST + 7;
-pub const CCM_GETVERSION: ::UINT = CCM_FIRST + 8;
-pub const CCM_SETNOTIFYWINDOW: ::UINT = CCM_FIRST + 9;
-pub const CCM_SETWINDOWTHEME: ::UINT = CCM_FIRST + 0xb;
-pub const CCM_DPISCALE: ::UINT = CCM_FIRST + 0xc;
-pub const INFOTIPSIZE: ::c_int = 1024;
-pub const NM_OUTOFMEMORY: ::UINT = (NM_FIRST as ::INT - 1) as ::UINT;
-pub const NM_CLICK: ::UINT = (NM_FIRST as ::INT - 2) as ::UINT;
-pub const NM_DBLCLK: ::UINT = (NM_FIRST as ::INT - 3) as ::UINT;
-pub const NM_RETURN: ::UINT = (NM_FIRST as ::INT - 4) as ::UINT;
-pub const NM_RCLICK: ::UINT = (NM_FIRST as ::INT - 5) as ::UINT;
-pub const NM_RDBLCLK: ::UINT = (NM_FIRST as ::INT - 6) as ::UINT;
-pub const NM_SETFOCUS: ::UINT = (NM_FIRST as ::INT - 7) as ::UINT;
-pub const NM_KILLFOCUS: ::UINT = (NM_FIRST as ::INT - 8) as ::UINT;
-pub const NM_CUSTOMDRAW: ::UINT = (NM_FIRST as ::INT - 12) as ::UINT;
-pub const NM_HOVER: ::UINT = (NM_FIRST as ::INT - 13) as ::UINT;
-pub const NM_NCHITTEST: ::UINT = (NM_FIRST as ::INT - 14) as ::UINT;
-pub const NM_KEYDOWN: ::UINT = (NM_FIRST as ::INT - 15) as ::UINT;
-pub const NM_RELEASEDCAPTURE: ::UINT = (NM_FIRST as ::INT - 16) as ::UINT;
-pub const NM_SETCURSOR: ::UINT = (NM_FIRST as ::INT - 17) as ::UINT;
-pub const NM_CHAR: ::UINT = (NM_FIRST as ::INT - 18) as ::UINT;
-pub const NM_TOOLTIPSCREATED: ::UINT = (NM_FIRST as ::INT - 19) as ::UINT;
-pub const NM_LDOWN: ::UINT = (NM_FIRST as ::INT - 20) as ::UINT;
-pub const NM_RDOWN: ::UINT = (NM_FIRST as ::INT - 21) as ::UINT;
-pub const NM_THEMECHANGED: ::UINT = (NM_FIRST as ::INT - 22) as ::UINT;
-pub const NM_FONTCHANGED: ::UINT = (NM_FIRST as ::INT - 23) as ::UINT;
-pub const NM_CUSTOMTEXT: ::UINT = (NM_FIRST as ::INT - 24) as ::UINT;
-pub const NM_TVSTATEIMAGECHANGING: ::UINT = (NM_FIRST as ::INT - 24) as ::UINT;
-STRUCT!{struct NMTOOLTIPSCREATED {
-    hdr: ::NMHDR,
-    hwndToolTips: ::HWND,
-}}
-pub type LPNMTOOLTIPSCREATED = *mut NMTOOLTIPSCREATED;
-STRUCT!{struct NMMOUSE {
-    hdr : ::NMHDR,
-    dwItemSpec: ::DWORD_PTR,
-    dwItemData: ::DWORD_PTR,
-    pt: ::POINT,
-    dwHitInfo: ::LPARAM,
-}}
-pub type LPNMMOUSE = *mut NMMOUSE;
-pub type NMCLICK = NMMOUSE;
-pub type LPNMCLICK = LPNMMOUSE;
-STRUCT!{struct NMOBJECTNOTIFY {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    piid: *const ::IID,
-    pObject: *mut ::c_void,
-    hResult: ::HRESULT,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMOBJECTNOTIFY = *mut NMOBJECTNOTIFY;
-STRUCT!{struct NMKEY {
-    hdr: ::NMHDR,
-    nVKey: ::UINT,
-    uFlags: ::UINT,
-}}
-pub type LPNMKEY = *mut NMKEY;
-STRUCT!{struct NMCHAR {
-    hdr: ::NMHDR,
-    ch: ::UINT,
-    dwItemPrev: ::DWORD,
-    dwItemNext: ::DWORD,
-}}
-pub type LPNMCHAR = *mut NMCHAR;
-STRUCT!{struct NMCUSTOMTEXT {
-    hdr: ::NMHDR,
-    hDC: ::HDC,
-    lpString: ::LPCWSTR,
-    nCount: ::c_int,
-    lpRect: ::LPRECT,
-    uFormat: ::UINT,
-    fLink: ::BOOL,
-}}
-pub type LPNMCUSTOMTEXT = *mut NMCUSTOMTEXT;
-pub const NM_FIRST: ::UINT = 0;
-pub const NM_LAST: ::UINT = -99i32 as ::UINT;
-pub const LVN_FIRST: ::UINT = -100i32 as ::UINT;
-pub const LVN_LAST: ::UINT = -199i32 as ::UINT;
-pub const HDN_FIRST: ::UINT = -300i32 as ::UINT;
-pub const HDN_LAST: ::UINT = -399i32 as ::UINT;
-pub const TVN_FIRST: ::UINT = -400i32 as ::UINT;
-pub const TVN_LAST: ::UINT = -499i32 as ::UINT;
-pub const TTN_FIRST: ::UINT = -520i32 as ::UINT;
-pub const TTN_LAST: ::UINT = -549i32 as ::UINT;
-pub const TCN_FIRST: ::UINT = -550i32 as ::UINT;
-pub const TCN_LAST: ::UINT = -580i32 as ::UINT;
-// pub const CDN_FIRST: ::UINT = 0 - 601;
-// pub const CDN_LAST: ::UINT = 0 - 699;
-pub const TBN_FIRST: ::UINT = -700i32 as ::UINT;
-pub const TBN_LAST: ::UINT = -720i32 as ::UINT;
-pub const UDN_FIRST: ::UINT = -721i32 as ::UINT;
-pub const UDN_LAST: ::UINT = -729i32 as ::UINT;
-pub const DTN_FIRST: ::UINT = -740i32 as ::UINT;
-pub const DTN_LAST: ::UINT = -745i32 as ::UINT;
-pub const MCN_FIRST: ::UINT = -746i32 as ::UINT;
-pub const MCN_LAST: ::UINT = -752i32 as ::UINT;
-pub const DTN_FIRST2: ::UINT = -753i32 as ::UINT;
-pub const DTN_LAST2: ::UINT = -799i32 as ::UINT;
-pub const CBEN_FIRST: ::UINT = -800i32 as ::UINT;
-pub const CBEN_LAST: ::UINT = -830i32 as ::UINT;
-pub const RBN_FIRST: ::UINT = -831i32 as ::UINT;
-pub const RBN_LAST: ::UINT = -859i32 as ::UINT;
-pub const IPN_FIRST: ::UINT = -860i32 as ::UINT;
-pub const IPN_LAST: ::UINT = -879i32 as ::UINT;
-pub const SBN_FIRST: ::UINT = -880i32 as ::UINT;
-pub const SBN_LAST: ::UINT = -899i32 as ::UINT;
-pub const PGN_FIRST: ::UINT = -900i32 as ::UINT;
-pub const PGN_LAST: ::UINT = -950i32 as ::UINT;
-pub const WMN_FIRST: ::UINT = -1000i32 as ::UINT;
-pub const WMN_LAST: ::UINT = -1200i32 as ::UINT;
-pub const BCN_FIRST: ::UINT = -1250i32 as ::UINT;
-pub const BCN_LAST: ::UINT = -1350i32 as ::UINT;
-pub const TRBN_FIRST: ::UINT = -1501i32 as ::UINT;
-pub const TRBN_LAST: ::UINT = -1519i32 as ::UINT;
-pub const CDRF_DODEFAULT: ::LRESULT = 0x00000000;
-pub const CDRF_NEWFONT: ::LRESULT = 0x00000002;
-pub const CDRF_SKIPDEFAULT: ::LRESULT = 0x00000004;
-pub const CDRF_DOERASE: ::LRESULT = 0x00000008;
-pub const CDRF_SKIPPOSTPAINT: ::LRESULT = 0x00000100;
-pub const CDRF_NOTIFYPOSTPAINT: ::LRESULT = 0x00000010;
-pub const CDRF_NOTIFYITEMDRAW: ::LRESULT = 0x00000020;
-pub const CDRF_NOTIFYSUBITEMDRAW: ::LRESULT = 0x00000020;
-pub const CDRF_NOTIFYPOSTERASE: ::LRESULT = 0x00000040;
-pub const CDDS_PREPAINT: ::DWORD = 0x00000001;
-pub const CDDS_POSTPAINT: ::DWORD = 0x00000002;
-pub const CDDS_PREERASE: ::DWORD = 0x00000003;
-pub const CDDS_POSTERASE: ::DWORD = 0x00000004;
-pub const CDDS_ITEM: ::DWORD = 0x00010000;
-pub const CDDS_ITEMPREPAINT: ::DWORD = CDDS_ITEM | CDDS_PREPAINT;
-pub const CDDS_ITEMPOSTPAINT: ::DWORD = CDDS_ITEM | CDDS_POSTPAINT;
-pub const CDDS_ITEMPREERASE: ::DWORD = CDDS_ITEM | CDDS_PREERASE;
-pub const CDDS_ITEMPOSTERASE: ::DWORD = CDDS_ITEM | CDDS_POSTERASE;
-pub const CDDS_SUBITEM: ::DWORD = 0x00020000;
-pub const CDIS_SELECTED: ::UINT = 0x0001;
-pub const CDIS_GRAYED: ::UINT = 0x0002;
-pub const CDIS_DISABLED: ::UINT = 0x0004;
-pub const CDIS_CHECKED: ::UINT = 0x0008;
-pub const CDIS_FOCUS: ::UINT = 0x0010;
-pub const CDIS_DEFAULT: ::UINT = 0x0020;
-pub const CDIS_HOT: ::UINT = 0x0040;
-pub const CDIS_MARKED: ::UINT = 0x0080;
-pub const CDIS_INDETERMINATE: ::UINT = 0x0100;
-pub const CDIS_SHOWKEYBOARDCUES: ::UINT = 0x0200;
-pub const CDIS_NEARHOT: ::UINT = 0x0400;
-pub const CDIS_OTHERSIDEHOT: ::UINT = 0x0800;
-pub const CDIS_DROPHILITED: ::UINT = 0x1000;
-STRUCT!{struct NMCUSTOMDRAW {
-    hdr: ::NMHDR,
-    dwDrawStage: ::DWORD,
-    hdc: ::HDC,
-    rc: ::RECT,
-    dwItemSpec: ::DWORD_PTR,
-    uItemState: ::UINT,
-    lItemlParam: ::LPARAM,
-}}
-pub type LPNMCUSTOMDRAW = *mut NMCUSTOMDRAW;
-STRUCT!{struct NMTTCUSTOMDRAW {
-    nmcd: NMCUSTOMDRAW,
-    uDrawFlags: ::UINT,
-}}
-pub type LPNMTTCUSTOMDRAW = *mut NMTTCUSTOMDRAW;
-STRUCT!{struct NMCUSTOMSPLITRECTINFO {
-    hdr: ::NMHDR,
-    rcClient: ::RECT,
-    rcButton: ::RECT,
-    rcSplit: ::RECT,
-}}
-pub type LPNMCUSTOMSPLITRECTINFO = *mut NMCUSTOMSPLITRECTINFO;
-pub const NM_GETCUSTOMSPLITRECT: ::UINT = BCN_FIRST + 0x0003;
-pub const CLR_NONE: ::DWORD = 0xFFFFFFFF;
-pub const CLR_DEFAULT: ::DWORD = 0xFF000000;
-pub enum IMAGELIST {}
-pub type HIMAGELIST = *mut IMAGELIST;
-STRUCT!{struct IMAGELISTDRAWPARAMS {
-    cbSize: ::DWORD,
-    himl: HIMAGELIST,
-    i: ::c_int,
-    hdcDst: ::HDC,
-    x: ::c_int,
-    y: ::c_int,
-    cx: ::c_int,
-    cy: ::c_int,
-    xBitmap: ::c_int,
-    yBitmap: ::c_int,
-    rgbBk: ::COLORREF,
-    rgbFg: ::COLORREF,
-    fStyle: ::UINT,
-    dwRop: ::DWORD,
-    fState: ::DWORD,
-    Frame: ::DWORD,
-    crEffect: ::COLORREF,
-}}
-pub type LPIMAGELISTDRAWPARAMS = *mut IMAGELISTDRAWPARAMS;
-pub const ILC_MASK: ::UINT = 0x00000001;
-pub const ILC_COLOR: ::UINT = 0x00000000;
-pub const ILC_COLORDDB: ::UINT = 0x000000FE;
-pub const ILC_COLOR4: ::UINT = 0x00000004;
-pub const ILC_COLOR8: ::UINT = 0x00000008;
-pub const ILC_COLOR16: ::UINT = 0x00000010;
-pub const ILC_COLOR24: ::UINT = 0x00000018;
-pub const ILC_COLOR32: ::UINT = 0x00000020;
-pub const ILC_PALETTE: ::UINT = 0x00000800;
-pub const ILC_MIRROR: ::UINT = 0x00002000;
-pub const ILC_PERITEMMIRROR: ::UINT = 0x00008000;
-pub const ILC_ORIGINALSIZE: ::UINT = 0x00010000;
-pub const ILC_HIGHQUALITYSCALE: ::UINT = 0x00020000;
-pub const ILD_NORMAL: ::UINT = 0x00000000;
-pub const ILD_TRANSPARENT: ::UINT = 0x00000001;
-pub const ILD_MASK: ::UINT = 0x00000010;
-pub const ILD_IMAGE: ::UINT = 0x00000020;
-pub const ILD_ROP: ::UINT = 0x00000040;
-pub const ILD_BLEND25: ::UINT = 0x00000002;
-pub const ILD_BLEND50: ::UINT = 0x00000004;
-pub const ILD_OVERLAYMASK: ::UINT = 0x00000F00;
-#[inline] #[allow(dead_code)]
-pub fn INDEXTOOVERLAYMASK(i: ::UINT) -> ::UINT { i << 8 }
-pub const ILD_PRESERVEALPHA: ::UINT = 0x00001000;
-pub const ILD_SCALE: ::UINT = 0x00002000;
-pub const ILD_DPISCALE: ::UINT = 0x00004000;
-pub const ILD_ASYNC: ::UINT = 0x00008000;
-pub const ILD_SELECTED: ::UINT = ILD_BLEND50;
-pub const ILD_FOCUS: ::UINT = ILD_BLEND25;
-pub const ILD_BLEND: ::UINT = ILD_BLEND50;
-pub const CLR_HILIGHT: ::DWORD = CLR_DEFAULT;
-pub const ILS_NORMAL: ::DWORD = 0x00000000;
-pub const ILS_GLOW: ::DWORD = 0x00000001;
-pub const ILS_SHADOW: ::DWORD = 0x00000002;
-pub const ILS_SATURATE: ::DWORD = 0x00000004;
-pub const ILS_ALPHA: ::DWORD = 0x00000008;
-pub const HBITMAP_CALLBACK: ::HBITMAP = (0-1) as ::HBITMAP;
-pub const ILCF_MOVE: ::UINT = 0x00000000;
-pub const ILCF_SWAP: ::UINT = 0x00000001;
-STRUCT!{struct IMAGEINFO {
-    hbmImage: ::HBITMAP,
-    hbmMask: ::HBITMAP,
-    Unused1: ::c_int,
-    Unused2: ::c_int,
-    rcImage: ::RECT,
-}}
-pub type LPIMAGEINFO = *mut IMAGEINFO;
-pub const HDS_HORZ: ::DWORD = 0x0000;
-pub const HDS_BUTTONS: ::DWORD = 0x0002;
-pub const HDS_HOTTRACK: ::DWORD = 0x0004;
-pub const HDS_HIDDEN: ::DWORD = 0x0008;
-pub const HDS_DRAGDROP: ::DWORD = 0x0040;
-pub const HDS_FULLDRAG: ::DWORD = 0x0080;
-pub const HDS_FILTERBAR: ::DWORD = 0x0100;
-pub const HDS_FLAT: ::DWORD = 0x0200;
-pub const HDS_CHECKBOXES: ::DWORD = 0x0400;
-pub const HDS_NOSIZING: ::DWORD = 0x0800;
-pub const HDS_OVERFLOW: ::DWORD = 0x1000;
-pub const HDFT_ISSTRING: ::UINT = 0x0000;
-pub const HDFT_ISNUMBER: ::UINT = 0x0001;
-pub const HDFT_ISDATE: ::UINT = 0x0002;
-pub const HDFT_HASNOVALUE: ::UINT = 0x8000;
-STRUCT!{struct HD_TEXTFILTERA {
-    pszText: ::LPSTR,
-    cchTextMax: ::INT,
-}}
-pub type LPHD_TEXTFILTERA = *mut HD_TEXTFILTERA;
-STRUCT!{struct HD_TEXTFILTERW {
-    pszText: ::LPWSTR,
-    cchTextMax: ::INT,
-}}
-pub type LPHD_TEXTFILTERW = *mut HD_TEXTFILTERW;
-STRUCT!{struct HDITEMA {
-    mask: ::UINT,
-    cxy: ::c_int,
-    pszText: ::LPSTR,
-    hbm: ::HBITMAP,
-    cchTextMax: ::c_int,
-    fmt: ::c_int,
-    lParam: ::LPARAM,
-    iImage: ::c_int,
-    iOrder: ::c_int,
-    _type: ::UINT,
-    pvFilter: *mut ::c_void,
-    state: ::UINT,
-}}
-pub type LPHDITEMA = *mut HDITEMA;
-STRUCT!{struct HDITEMW {
-    mask: ::UINT,
-    cxy: ::c_int,
-    pszText: ::LPWSTR,
-    hbm: ::HBITMAP,
-    cchTextMax: ::c_int,
-    fmt: ::c_int,
-    lParam: ::LPARAM,
-    iImage: ::c_int,
-    iOrder: ::c_int,
-    _type: ::UINT,
-    pvFilter: *mut ::c_void,
-    state: ::UINT,
-}}
-pub type LPHDITEMW = *mut HDITEMW;
-pub const HDI_WIDTH: ::UINT = 0x0001;
-pub const HDI_HEIGHT: ::UINT = HDI_WIDTH;
-pub const HDI_TEXT: ::UINT = 0x0002;
-pub const HDI_FORMAT: ::UINT = 0x0004;
-pub const HDI_LPARAM: ::UINT = 0x0008;
-pub const HDI_BITMAP: ::UINT = 0x0010;
-pub const HDI_IMAGE: ::UINT = 0x0020;
-pub const HDI_DI_SETITEM: ::UINT = 0x0040;
-pub const HDI_ORDER: ::UINT = 0x0080;
-pub const HDI_FILTER: ::UINT = 0x0100;
-pub const HDI_STATE: ::UINT = 0x0200;
-pub const HDF_LEFT: ::c_int = 0x0000;
-pub const HDF_RIGHT: ::c_int = 0x0001;
-pub const HDF_CENTER: ::c_int = 0x0002;
-pub const HDF_JUSTIFYMASK: ::c_int = 0x0003;
-pub const HDF_RTLREADING: ::c_int = 0x0004;
-pub const HDF_BITMAP: ::c_int = 0x2000;
-pub const HDF_STRING: ::c_int = 0x4000;
-pub const HDF_OWNERDRAW: ::c_int = 0x8000;
-pub const HDF_IMAGE: ::c_int = 0x0800;
-pub const HDF_BITMAP_ON_RIGHT: ::c_int = 0x1000;
-pub const HDF_SORTUP: ::c_int = 0x0400;
-pub const HDF_SORTDOWN: ::c_int = 0x0200;
-pub const HDF_CHECKBOX: ::c_int = 0x0040;
-pub const HDF_CHECKED: ::c_int = 0x0080;
-pub const HDF_FIXEDWIDTH: ::c_int = 0x0100;
-pub const HDF_SPLITBUTTON: ::c_int = 0x1000000;
-pub const HDIS_FOCUSED: ::UINT = 0x00000001;
-pub const HDM_GETITEMCOUNT: ::UINT = HDM_FIRST + 0;
-pub const HDM_INSERTITEMA: ::UINT = HDM_FIRST + 1;
-pub const HDM_INSERTITEMW: ::UINT = HDM_FIRST + 10;
-pub const HDM_DELETEITEM: ::UINT = HDM_FIRST + 2;
-pub const HDM_GETITEMA: ::UINT = HDM_FIRST + 3;
-pub const HDM_GETITEMW: ::UINT = HDM_FIRST + 11;
-pub const HDM_SETITEMA: ::UINT = HDM_FIRST + 4;
-pub const HDM_SETITEMW: ::UINT = HDM_FIRST + 12;
-STRUCT!{struct HDLAYOUT {
-    prc: *mut ::RECT,
-    pwpos: *mut ::WINDOWPOS,
-}}
-pub type LPHDLAYOUT = *mut HDLAYOUT;
-pub const HDM_LAYOUT: ::UINT = HDM_FIRST + 5;
-pub const HHT_NOWHERE: ::UINT = 0x0001;
-pub const HHT_ONHEADER: ::UINT = 0x0002;
-pub const HHT_ONDIVIDER: ::UINT = 0x0004;
-pub const HHT_ONDIVOPEN: ::UINT = 0x0008;
-pub const HHT_ONFILTER: ::UINT = 0x0010;
-pub const HHT_ONFILTERBUTTON: ::UINT = 0x0020;
-pub const HHT_ABOVE: ::UINT = 0x0100;
-pub const HHT_BELOW: ::UINT = 0x0200;
-pub const HHT_TORIGHT: ::UINT = 0x0400;
-pub const HHT_TOLEFT: ::UINT = 0x0800;
-pub const HHT_ONITEMSTATEICON: ::UINT = 0x1000;
-pub const HHT_ONDROPDOWN: ::UINT = 0x2000;
-pub const HHT_ONOVERFLOW: ::UINT = 0x4000;
-STRUCT!{struct HDHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-    iItem: ::c_int,
-}}
-pub type LPHDHITTESTINFO = *mut HDHITTESTINFO;
-pub const HDSIL_NORMAL: ::WPARAM = 0;
-pub const HDSIL_STATE: ::WPARAM = 1;
-pub const HDM_HITTEST: ::UINT = HDM_FIRST + 6;
-pub const HDM_GETITEMRECT: ::UINT = HDM_FIRST + 7;
-pub const HDM_SETIMAGELIST: ::UINT = HDM_FIRST + 8;
-pub const HDM_GETIMAGELIST: ::UINT = HDM_FIRST + 9;
-pub const HDM_ORDERTOINDEX: ::UINT = HDM_FIRST + 15;
-pub const HDM_CREATEDRAGIMAGE: ::UINT = HDM_FIRST + 16;
-pub const HDM_GETORDERARRAY: ::UINT = HDM_FIRST + 17;
-pub const HDM_SETORDERARRAY: ::UINT = HDM_FIRST + 18;
-pub const HDM_SETHOTDIVIDER: ::UINT = HDM_FIRST + 19;
-pub const HDM_SETBITMAPMARGIN: ::UINT = HDM_FIRST + 20;
-pub const HDM_GETBITMAPMARGIN: ::UINT = HDM_FIRST + 21;
-pub const HDM_SETFILTERCHANGETIMEOUT: ::UINT = HDM_FIRST + 22;
-pub const HDM_EDITFILTER: ::UINT = HDM_FIRST + 23;
-pub const HDM_CLEARFILTER: ::UINT = HDM_FIRST + 24;
-pub const HDM_GETITEMDROPDOWNRECT: ::UINT = HDM_FIRST + 25;
-pub const HDM_GETOVERFLOWRECT: ::UINT = HDM_FIRST + 26;
-pub const HDM_GETFOCUSEDITEM: ::UINT = HDM_FIRST + 27;
-pub const HDM_SETFOCUSEDITEM: ::UINT = HDM_FIRST + 28;
-pub const HDN_ITEMCHANGINGA: ::UINT = HDN_FIRST-0;
-pub const HDN_ITEMCHANGINGW: ::UINT = HDN_FIRST-20;
-pub const HDN_ITEMCHANGEDA: ::UINT = HDN_FIRST-1;
-pub const HDN_ITEMCHANGEDW: ::UINT = HDN_FIRST-21;
-pub const HDN_ITEMCLICKA: ::UINT = HDN_FIRST-2;
-pub const HDN_ITEMCLICKW: ::UINT = HDN_FIRST-22;
-pub const HDN_ITEMDBLCLICKA: ::UINT = HDN_FIRST-3;
-pub const HDN_ITEMDBLCLICKW: ::UINT = HDN_FIRST-23;
-pub const HDN_DIVIDERDBLCLICKA: ::UINT = HDN_FIRST-5;
-pub const HDN_DIVIDERDBLCLICKW: ::UINT = HDN_FIRST-25;
-pub const HDN_BEGINTRACKA: ::UINT = HDN_FIRST-6;
-pub const HDN_BEGINTRACKW: ::UINT = HDN_FIRST-26;
-pub const HDN_ENDTRACKA: ::UINT = HDN_FIRST-7;
-pub const HDN_ENDTRACKW: ::UINT = HDN_FIRST-27;
-pub const HDN_TRACKA: ::UINT = HDN_FIRST-8;
-pub const HDN_TRACKW: ::UINT = HDN_FIRST-28;
-pub const HDN_GETDISPINFOA: ::UINT = HDN_FIRST-9;
-pub const HDN_GETDISPINFOW: ::UINT = HDN_FIRST-29;
-pub const HDN_BEGINDRAG: ::UINT = HDN_FIRST-10;
-pub const HDN_ENDDRAG: ::UINT = HDN_FIRST-11;
-pub const HDN_FILTERCHANGE: ::UINT = HDN_FIRST-12;
-pub const HDN_FILTERBTNCLICK: ::UINT = HDN_FIRST-13;
-pub const HDN_BEGINFILTEREDIT: ::UINT = HDN_FIRST-14;
-pub const HDN_ENDFILTEREDIT: ::UINT = HDN_FIRST-15;
-pub const HDN_ITEMSTATEICONCLICK: ::UINT = HDN_FIRST-16;
-pub const HDN_ITEMKEYDOWN: ::UINT = HDN_FIRST-17;
-pub const HDN_DROPDOWN: ::UINT = HDN_FIRST-18;
-pub const HDN_OVERFLOWCLICK: ::UINT = HDN_FIRST-19;
-STRUCT!{struct NMHEADERA {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    iButton: ::c_int,
-    pitem: *mut HDITEMA,
-}}
-pub type LPNMHEADERA = *mut NMHEADERA;
-STRUCT!{struct NMHEADERW {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    iButton: ::c_int,
-    pitem: *mut HDITEMW,
-}}
-pub type LPNMHEADERW = *mut NMHEADERW;
-STRUCT!{struct NMHDDISPINFOW {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    mask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPNMHDDISPINFOW = *mut NMHDDISPINFOW;
-STRUCT!{struct NMHDDISPINFOA {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    mask: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPNMHDDISPINFOA = *mut NMHDDISPINFOA;
-STRUCT!{struct NMHDFILTERBTNCLICK {
-    hdr: ::NMHDR,
-    iItem: ::INT,
-    rc: ::RECT,
-}}
-pub type LPNMHDFILTERBTNCLICK = *mut NMHDFILTERBTNCLICK;
-#[cfg(target_arch="x86")]
-STRUCT!{struct TBBUTTON {
-    iBitmap: ::c_int,
-    idCommand: ::c_int,
-    fsState: ::BYTE,
-    fsStyle: ::BYTE,
-    bReserved: [::BYTE; 2],
-    dwData: ::DWORD_PTR,
-    iString: ::INT_PTR,
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{struct TBBUTTON {
-    iBitmap: ::c_int,
-    idCommand: ::c_int,
-    fsState: ::BYTE,
-    fsStyle: ::BYTE,
-    bReserved: [::BYTE; 6],
-    dwData: ::DWORD_PTR,
-    iString: ::INT_PTR,
-}}
-pub type PTBBUTTON = *mut TBBUTTON;
-pub type LPTBBUTTON = *mut TBBUTTON;
-pub type LPCTBBUTTON = *const TBBUTTON;
-STRUCT!{struct COLORMAP {
-    from: ::COLORREF,
-    to: ::COLORREF,
-}}
-pub type LPCOLORMAP = *mut COLORMAP;
-pub const CMB_MASKED: ::UINT = 0x02;
-pub const TBSTATE_CHECKED: ::BYTE = 0x01;
-pub const TBSTATE_PRESSED: ::BYTE = 0x02;
-pub const TBSTATE_ENABLED: ::BYTE = 0x04;
-pub const TBSTATE_HIDDEN: ::BYTE = 0x08;
-pub const TBSTATE_INDETERMINATE: ::BYTE = 0x10;
-pub const TBSTATE_WRAP: ::BYTE = 0x20;
-pub const TBSTATE_ELLIPSES: ::BYTE = 0x40;
-pub const TBSTATE_MARKED: ::BYTE = 0x80;
-pub const TBSTYLE_BUTTON: ::DWORD = 0x0000;
-pub const TBSTYLE_SEP: ::DWORD = 0x0001;
-pub const TBSTYLE_CHECK: ::DWORD = 0x0002;
-pub const TBSTYLE_GROUP: ::DWORD = 0x0004;
-pub const TBSTYLE_CHECKGROUP: ::DWORD = TBSTYLE_GROUP | TBSTYLE_CHECK;
-pub const TBSTYLE_DROPDOWN: ::DWORD = 0x0008;
-pub const TBSTYLE_AUTOSIZE: ::DWORD = 0x0010;
-pub const TBSTYLE_NOPREFIX: ::DWORD = 0x0020;
-pub const TBSTYLE_TOOLTIPS: ::DWORD = 0x0100;
-pub const TBSTYLE_WRAPABLE: ::DWORD = 0x0200;
-pub const TBSTYLE_ALTDRAG: ::DWORD = 0x0400;
-pub const TBSTYLE_FLAT: ::DWORD = 0x0800;
-pub const TBSTYLE_LIST: ::DWORD = 0x1000;
-pub const TBSTYLE_CUSTOMERASE: ::DWORD = 0x2000;
-pub const TBSTYLE_REGISTERDROP: ::DWORD = 0x4000;
-pub const TBSTYLE_TRANSPARENT: ::DWORD = 0x8000;
-pub const TBSTYLE_EX_DRAWDDARROWS: ::DWORD = 0x00000001;
-pub const BTNS_BUTTON: ::DWORD = TBSTYLE_BUTTON;
-pub const BTNS_SEP: ::DWORD = TBSTYLE_SEP;
-pub const BTNS_CHECK: ::DWORD = TBSTYLE_CHECK;
-pub const BTNS_GROUP: ::DWORD = TBSTYLE_GROUP;
-pub const BTNS_CHECKGROUP: ::DWORD = TBSTYLE_CHECKGROUP;
-pub const BTNS_DROPDOWN: ::DWORD = TBSTYLE_DROPDOWN;
-pub const BTNS_AUTOSIZE: ::DWORD = TBSTYLE_AUTOSIZE;
-pub const BTNS_NOPREFIX: ::DWORD = TBSTYLE_NOPREFIX;
-pub const BTNS_SHOWTEXT: ::DWORD = 0x0040;
-pub const BTNS_WHOLEDROPDOWN: ::DWORD = 0x0080;
-pub const TBSTYLE_EX_MIXEDBUTTONS: ::DWORD = 0x00000008;
-pub const TBSTYLE_EX_HIDECLIPPEDBUTTONS: ::DWORD = 0x00000010;
-pub const TBSTYLE_EX_MULTICOLUMN: ::DWORD = 0x00000002;
-pub const TBSTYLE_EX_VERTICAL: ::DWORD = 0x00000004;
-pub const TBSTYLE_EX_DOUBLEBUFFER: ::DWORD = 0x00000080;
-STRUCT!{struct NMTBCUSTOMDRAW {
-    nmcd: NMCUSTOMDRAW,
-    hbrMonoDither: ::HBRUSH,
-    hbrLines: ::HBRUSH,
-    hpenLines: ::HPEN,
-    clrText: ::COLORREF,
-    clrMark: ::COLORREF,
-    clrTextHighlight: ::COLORREF,
-    clrBtnFace: ::COLORREF,
-    clrBtnHighlight: ::COLORREF,
-    clrHighlightHotTrack: ::COLORREF,
-    rcText: ::RECT,
-    nStringBkMode: ::c_int,
-    nHLStringBkMode: ::c_int,
-    iListGap: ::c_int,
-}}
-pub type LPNMTBCUSTOMDRAW = *mut NMTBCUSTOMDRAW;
-pub const TBCDRF_NOEDGES: ::LRESULT = 0x00010000;
-pub const TBCDRF_HILITEHOTTRACK: ::LRESULT = 0x00020000;
-pub const TBCDRF_NOOFFSET: ::LRESULT = 0x00040000;
-pub const TBCDRF_NOMARK: ::LRESULT = 0x00080000;
-pub const TBCDRF_NOETCHEDEFFECT: ::LRESULT = 0x00100000;
-pub const TBCDRF_BLENDICON: ::LRESULT = 0x00200000;
-pub const TBCDRF_NOBACKGROUND: ::LRESULT = 0x00400000;
-pub const TBCDRF_USECDCOLORS: ::LRESULT = 0x00800000;
-pub const TB_ENABLEBUTTON: ::UINT = ::WM_USER + 1;
-pub const TB_CHECKBUTTON: ::UINT = ::WM_USER + 2;
-pub const TB_PRESSBUTTON: ::UINT = ::WM_USER + 3;
-pub const TB_HIDEBUTTON: ::UINT = ::WM_USER + 4;
-pub const TB_INDETERMINATE: ::UINT = ::WM_USER + 5;
-pub const TB_MARKBUTTON: ::UINT = ::WM_USER + 6;
-pub const TB_ISBUTTONENABLED: ::UINT = ::WM_USER + 9;
-pub const TB_ISBUTTONCHECKED: ::UINT = ::WM_USER + 10;
-pub const TB_ISBUTTONPRESSED: ::UINT = ::WM_USER + 11;
-pub const TB_ISBUTTONHIDDEN: ::UINT = ::WM_USER + 12;
-pub const TB_ISBUTTONINDETERMINATE : ::UINT = ::WM_USER + 13;
-pub const TB_ISBUTTONHIGHLIGHTED: ::UINT = ::WM_USER + 14;
-pub const TB_SETSTATE: ::UINT = ::WM_USER + 17;
-pub const TB_GETSTATE: ::UINT = ::WM_USER + 18;
-pub const TB_ADDBITMAP: ::UINT = ::WM_USER + 19;
-STRUCT!{struct TBADDBITMAP {
-    hInst: ::HINSTANCE,
-    nID: ::UINT_PTR,
-}}
-pub type LPTBADDBITMAP = *mut TBADDBITMAP;
-pub const HINST_COMMCTRL: ::HINSTANCE = (0 - 1) as ::HINSTANCE;
-pub const IDB_STD_SMALL_COLOR: ::WPARAM = 0;
-pub const IDB_STD_LARGE_COLOR: ::WPARAM = 1;
-pub const IDB_VIEW_SMALL_COLOR: ::WPARAM = 4;
-pub const IDB_VIEW_LARGE_COLOR: ::WPARAM = 5;
-pub const IDB_HIST_SMALL_COLOR: ::WPARAM = 8;
-pub const IDB_HIST_LARGE_COLOR: ::WPARAM = 9;
-pub const IDB_HIST_NORMAL: ::WPARAM = 12;
-pub const IDB_HIST_HOT: ::WPARAM = 13;
-pub const IDB_HIST_DISABLED: ::WPARAM = 14;
-pub const IDB_HIST_PRESSED: ::WPARAM = 15;
-pub const STD_CUT: ::c_int = 0;
-pub const STD_COPY: ::c_int = 1;
-pub const STD_PASTE: ::c_int = 2;
-pub const STD_UNDO: ::c_int = 3;
-pub const STD_REDOW: ::c_int = 4;
-pub const STD_DELETE: ::c_int = 5;
-pub const STD_FILENEW: ::c_int = 6;
-pub const STD_FILEOPEN: ::c_int = 7;
-pub const STD_FILESAVE: ::c_int = 8;
-pub const STD_PRINTPRE: ::c_int = 9;
-pub const STD_PROPERTIES: ::c_int = 10;
-pub const STD_HELP: ::c_int = 11;
-pub const STD_FIND: ::c_int = 12;
-pub const STD_REPLACE: ::c_int = 13;
-pub const STD_PRINT: ::c_int = 14;
-pub const VIEW_LARGEICONS: ::c_int = 0;
-pub const VIEW_SMALLICONS: ::c_int = 1;
-pub const VIEW_LIST: ::c_int = 2;
-pub const VIEW_DETAILS: ::c_int = 3;
-pub const VIEW_SORTNAME: ::c_int = 4;
-pub const VIEW_SORTSIZE: ::c_int = 5;
-pub const VIEW_SORTDATE: ::c_int = 6;
-pub const VIEW_SORTTYPE: ::c_int = 7;
-pub const VIEW_PARENTFOLDER: ::c_int = 8;
-pub const VIEW_NETCONNECT: ::c_int = 9;
-pub const VIEW_NETDISCONNECT: ::c_int = 10;
-pub const VIEW_NEWFOLDER: ::c_int = 11;
-pub const VIEW_VIEWMENU: ::c_int = 12;
-pub const HIST_BACK: ::c_int = 0;
-pub const HIST_FORWARD: ::c_int = 1;
-pub const HIST_FAVORITES: ::c_int = 2;
-pub const HIST_ADDTOFAVORITES: ::c_int = 3;
-pub const HIST_VIEWTREE: ::c_int = 4;
-pub const TB_ADDBUTTONSA: ::UINT = ::WM_USER + 20;
-pub const TB_INSERTBUTTONA: ::UINT = ::WM_USER + 21;
-pub const TB_DELETEBUTTON: ::UINT = ::WM_USER + 22;
-pub const TB_GETBUTTON: ::UINT = ::WM_USER + 23;
-pub const TB_BUTTONCOUNT: ::UINT = ::WM_USER + 24;
-pub const TB_COMMANDTOINDEX: ::UINT = ::WM_USER + 25;
-STRUCT!{struct TBSAVEPARAMSA {
-    hkr: ::HKEY,
-    pszSubKey: ::LPCSTR,
-    pszValueName: ::LPCSTR,
-}}
-pub type LPTBSAVEPARAMSA = *mut TBSAVEPARAMSA;
-STRUCT!{struct TBSAVEPARAMSW {
-    hkr: ::HKEY,
-    pszSubKey: ::LPCWSTR,
-    pszValueName: ::LPCWSTR,
-}}
-pub type LPTBSAVEPARAMSW = *mut TBSAVEPARAMSW;
-pub const TB_SAVERESTOREA: ::UINT = ::WM_USER + 26;
-pub const TB_SAVERESTOREW: ::UINT = ::WM_USER + 76;
-pub const TB_CUSTOMIZE: ::UINT = ::WM_USER + 27;
-pub const TB_ADDSTRINGA: ::UINT = ::WM_USER + 28;
-pub const TB_ADDSTRINGW: ::UINT = ::WM_USER + 77;
-pub const TB_GETITEMRECT: ::UINT = ::WM_USER + 29;
-pub const TB_BUTTONSTRUCTSIZE: ::UINT = ::WM_USER + 30;
-pub const TB_SETBUTTONSIZE: ::UINT = ::WM_USER + 31;
-pub const TB_SETBITMAPSIZE: ::UINT = ::WM_USER + 32;
-pub const TB_AUTOSIZE: ::UINT = ::WM_USER + 33;
-pub const TB_GETTOOLTIPS: ::UINT = ::WM_USER + 35;
-pub const TB_SETTOOLTIPS: ::UINT = ::WM_USER + 36;
-pub const TB_SETPARENT: ::UINT = ::WM_USER + 37;
-pub const TB_SETROWS: ::UINT = ::WM_USER + 39;
-pub const TB_GETROWS: ::UINT = ::WM_USER + 40;
-pub const TB_SETCMDID: ::UINT = ::WM_USER + 42;
-pub const TB_CHANGEBITMAP: ::UINT = ::WM_USER + 43;
-pub const TB_GETBITMAP: ::UINT = ::WM_USER + 44;
-pub const TB_GETBUTTONTEXTA: ::UINT = ::WM_USER + 45;
-pub const TB_GETBUTTONTEXTW: ::UINT = ::WM_USER + 75;
-pub const TB_REPLACEBITMAP: ::UINT = ::WM_USER + 46;
-pub const TB_SETINDENT: ::UINT = ::WM_USER + 47;
-pub const TB_SETIMAGELIST: ::UINT = ::WM_USER + 48;
-pub const TB_GETIMAGELIST: ::UINT = ::WM_USER + 49;
-pub const TB_LOADIMAGES: ::UINT = ::WM_USER + 50;
-pub const TB_GETRECT: ::UINT = ::WM_USER + 51;
-pub const TB_SETHOTIMAGELIST: ::UINT = ::WM_USER + 52;
-pub const TB_GETHOTIMAGELIST: ::UINT = ::WM_USER + 53;
-pub const TB_SETDISABLEDIMAGELIST: ::UINT = ::WM_USER + 54;
-pub const TB_GETDISABLEDIMAGELIST: ::UINT = ::WM_USER + 55;
-pub const TB_SETSTYLE: ::UINT = ::WM_USER + 56;
-pub const TB_GETSTYLE: ::UINT = ::WM_USER + 57;
-pub const TB_GETBUTTONSIZE: ::UINT = ::WM_USER + 58;
-pub const TB_SETBUTTONWIDTH: ::UINT = ::WM_USER + 59;
-pub const TB_SETMAXTEXTROWS: ::UINT = ::WM_USER + 60;
-pub const TB_GETTEXTROWS: ::UINT = ::WM_USER + 61;
-pub const TB_GETOBJECT: ::UINT = ::WM_USER + 62;
-pub const TB_GETHOTITEM: ::UINT = ::WM_USER + 71;
-pub const TB_SETHOTITEM: ::UINT = ::WM_USER + 72;
-pub const TB_SETANCHORHIGHLIGHT: ::UINT = ::WM_USER + 73;
-pub const TB_GETANCHORHIGHLIGHT: ::UINT = ::WM_USER + 74;
-pub const TB_MAPACCELERATORA: ::UINT = ::WM_USER + 78;
-STRUCT!{struct TBINSERTMARK {
-    iButton: ::c_int,
-    dwFlags: ::DWORD,
-}}
-pub type LPTBINSERTMARK = *mut TBINSERTMARK;
-pub const TBIMHT_AFTER: ::DWORD = 0x00000001;
-pub const TBIMHT_BACKGROUND: ::DWORD = 0x00000002;
-pub const TB_GETINSERTMARK: ::UINT = ::WM_USER + 79;
-pub const TB_SETINSERTMARK: ::UINT = ::WM_USER + 80;
-pub const TB_INSERTMARKHITTEST: ::UINT = ::WM_USER + 81;
-pub const TB_MOVEBUTTON: ::UINT = ::WM_USER + 82;
-pub const TB_GETMAXSIZE: ::UINT = ::WM_USER + 83;
-pub const TB_SETEXTENDEDSTYLE: ::UINT = ::WM_USER + 84;
-pub const TB_GETEXTENDEDSTYLE: ::UINT = ::WM_USER + 85;
-pub const TB_GETPADDING: ::UINT = ::WM_USER + 86;
-pub const TB_SETPADDING: ::UINT = ::WM_USER + 87;
-pub const TB_SETINSERTMARKCOLOR: ::UINT = ::WM_USER + 88;
-pub const TB_GETINSERTMARKCOLOR: ::UINT = ::WM_USER + 89;
-pub const TB_SETCOLORSCHEME: ::UINT = CCM_SETCOLORSCHEME;
-pub const TB_GETCOLORSCHEME: ::UINT = CCM_GETCOLORSCHEME;
-pub const TB_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const TB_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const TB_MAPACCELERATORW: ::UINT = ::WM_USER + 90;
-STRUCT!{struct TBREPLACEBITMAP {
-    hInstOld: ::HINSTANCE,
-    nIDOld: ::UINT_PTR,
-    hInstNew: ::HINSTANCE,
-    nIDNew: ::UINT_PTR,
-    nButtons: ::c_int,
-}}
-pub type LPTBREPLACEBITMAP = *mut TBREPLACEBITMAP;
-pub const TBBF_LARGE: ::DWORD = 0x0001;
-pub const TB_GETBITMAPFLAGS: ::UINT = ::WM_USER + 41;
-pub const TBIF_IMAGE: ::DWORD = 0x00000001;
-pub const TBIF_TEXT: ::DWORD = 0x00000002;
-pub const TBIF_STATE: ::DWORD = 0x00000004;
-pub const TBIF_STYLE: ::DWORD = 0x00000008;
-pub const TBIF_LPARAM: ::DWORD = 0x00000010;
-pub const TBIF_COMMAND: ::DWORD = 0x00000020;
-pub const TBIF_SIZE: ::DWORD = 0x00000040;
-pub const TBIF_BYINDEX: ::DWORD = 0x80000000;
-STRUCT!{struct TBBUTTONINFOA {
-    cbSize: ::UINT,
-    dwMask: ::DWORD,
-    idCommand: ::c_int,
-    iImage: ::c_int,
-    fsState: ::BYTE,
-    fsStyle: ::BYTE,
-    cx: ::WORD,
-    lParam: ::DWORD_PTR,
-    pszText: ::LPSTR,
-    cchText: ::c_int,
-}}
-pub type LPTBBUTTONINFOA = *mut TBBUTTONINFOA;
-STRUCT!{struct TBBUTTONINFOW {
-    cbSize: ::UINT,
-    dwMask: ::DWORD,
-    idCommand: ::c_int,
-    iImage: ::c_int,
-    fsState: ::BYTE,
-    fsStyle: ::BYTE,
-    cx: ::WORD,
-    lParam: ::DWORD_PTR,
-    pszText: ::LPWSTR,
-    cchText: ::c_int,
-}}
-pub type LPTBBUTTONINFOW = *mut TBBUTTONINFOW;
-pub const TB_GETBUTTONINFOW: ::UINT = ::WM_USER + 63;
-pub const TB_SETBUTTONINFOW: ::UINT = ::WM_USER + 64;
-pub const TB_GETBUTTONINFOA: ::UINT = ::WM_USER + 65;
-pub const TB_SETBUTTONINFOA: ::UINT = ::WM_USER + 66;
-pub const TB_INSERTBUTTONW: ::UINT = ::WM_USER + 67;
-pub const TB_ADDBUTTONSW: ::UINT = ::WM_USER + 68;
-pub const TB_HITTEST: ::UINT = ::WM_USER + 69;
-pub const TB_SETDRAWTEXTFLAGS: ::UINT = ::WM_USER + 70;
-pub const TB_GETSTRINGW: ::UINT = ::WM_USER + 91;
-pub const TB_GETSTRINGA: ::UINT = ::WM_USER + 92;
-pub const TB_SETBOUNDINGSIZE: ::UINT = ::WM_USER + 93;
-pub const TB_SETHOTITEM2: ::UINT = ::WM_USER + 94;
-pub const TB_HASACCELERATOR: ::UINT = ::WM_USER + 95;
-pub const TB_SETLISTGAP: ::UINT = ::WM_USER + 96;
-pub const TB_GETIMAGELISTCOUNT: ::UINT = ::WM_USER + 98;
-pub const TB_GETIDEALSIZE: ::UINT = ::WM_USER + 99;
-pub const TBMF_PAD: ::DWORD = 0x00000001;
-pub const TBMF_BARPAD: ::DWORD = 0x00000002;
-pub const TBMF_BUTTONSPACING: ::DWORD = 0x00000004;
-STRUCT!{struct TBMETRICS {
-    cbSize: ::UINT,
-    dwMask: ::DWORD,
-    cxPad: ::c_int,
-    cyPad: ::c_int,
-    cxBarPad: ::c_int,
-    cyBarPad: ::c_int,
-    cxButtonSpacing: ::c_int,
-    cyButtonSpacing: ::c_int,
-}}
-pub type LPTBMETRICS = *mut TBMETRICS;
-pub const TB_GETMETRICS: ::UINT = ::WM_USER + 101;
-pub const TB_SETMETRICS: ::UINT = ::WM_USER + 102;
-pub const TB_GETITEMDROPDOWNRECT: ::UINT = ::WM_USER + 103;
-pub const TB_SETPRESSEDIMAGELIST: ::UINT = ::WM_USER + 104;
-pub const TB_GETPRESSEDIMAGELIST: ::UINT = ::WM_USER + 105;
-pub const TB_SETWINDOWTHEME: ::UINT = CCM_SETWINDOWTHEME;
-pub const TBN_GETBUTTONINFOA: ::UINT = TBN_FIRST - 0;
-pub const TBN_BEGINDRAG: ::UINT = TBN_FIRST - 1;
-pub const TBN_ENDDRAG: ::UINT = TBN_FIRST - 2;
-pub const TBN_BEGINADJUST: ::UINT = TBN_FIRST - 3;
-pub const TBN_ENDADJUST: ::UINT = TBN_FIRST - 4;
-pub const TBN_RESET: ::UINT = TBN_FIRST - 5;
-pub const TBN_QUERYINSERT: ::UINT = TBN_FIRST - 6;
-pub const TBN_QUERYDELETE: ::UINT = TBN_FIRST - 7;
-pub const TBN_TOOLBARCHANGE: ::UINT = TBN_FIRST - 8;
-pub const TBN_CUSTHELP: ::UINT = TBN_FIRST - 9;
-pub const TBN_DROPDOWN: ::UINT = TBN_FIRST - 10;
-pub const TBN_GETOBJECT: ::UINT = TBN_FIRST - 12;
-STRUCT!{struct NMTBHOTITEM {
-    hdr: ::NMHDR,
-    idOld: ::c_int,
-    idNew: ::c_int,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMTBHOTITEM = *mut NMTBHOTITEM;
-pub const HICF_OTHER: ::DWORD = 0x00000000;
-pub const HICF_MOUSE: ::DWORD = 0x00000001;
-pub const HICF_ARROWKEYS: ::DWORD = 0x00000002;
-pub const HICF_ACCELERATOR: ::DWORD = 0x00000004;
-pub const HICF_DUPACCEL: ::DWORD = 0x00000008;
-pub const HICF_ENTERING: ::DWORD = 0x00000010;
-pub const HICF_LEAVING: ::DWORD = 0x00000020;
-pub const HICF_RESELECT: ::DWORD = 0x00000040;
-pub const HICF_LMOUSE: ::DWORD = 0x00000080;
-pub const HICF_TOGGLEDROPDOWN: ::DWORD = 0x00000100;
-pub const TBN_HOTITEMCHANGE: ::UINT = TBN_FIRST - 13;
-pub const TBN_DRAGOUT: ::UINT = TBN_FIRST - 14;
-pub const TBN_DELETINGBUTTON: ::UINT = TBN_FIRST - 15;
-pub const TBN_GETDISPINFOA: ::UINT = TBN_FIRST - 16;
-pub const TBN_GETDISPINFOW: ::UINT = TBN_FIRST - 17;
-pub const TBN_GETINFOTIPA: ::UINT = TBN_FIRST - 18;
-pub const TBN_GETINFOTIPW: ::UINT = TBN_FIRST - 19;
-pub const TBN_GETBUTTONINFOW: ::UINT = TBN_FIRST - 20;
-pub const TBN_RESTORE: ::UINT = TBN_FIRST - 21;
-pub const TBN_SAVE: ::UINT = TBN_FIRST - 22;
-pub const TBN_INITCUSTOMIZE: ::UINT = TBN_FIRST - 23;
-pub const TBN_WRAPHOTITEM: ::UINT = TBN_FIRST - 24;
-pub const TBN_DUPACCELERATOR: ::UINT = TBN_FIRST - 25;
-pub const TBN_WRAPACCELERATOR: ::UINT = TBN_FIRST - 26;
-pub const TBN_DRAGOVER: ::UINT = TBN_FIRST - 27;
-pub const TBN_MAPACCELERATOR: ::UINT = TBN_FIRST - 28;
-pub const TBNRF_HIDEHELP: ::LRESULT = 0x00000001;
-pub const TBNRF_ENDCUSTOMIZE: ::LRESULT = 0x00000002;
-STRUCT!{struct NMTBSAVE {
-    hdr: ::NMHDR,
-    pData: *mut ::DWORD,
-    pCurrent: *mut ::DWORD,
-    cbData: ::UINT,
-    iItem: ::c_int,
-    cButtons: ::c_int,
-    tbButton: TBBUTTON,
-}}
-pub type LPNMTBSAVE = *mut NMTBSAVE;
-STRUCT!{struct NMTBRESTORE {
-    hdr: ::NMHDR,
-    pData: *mut ::DWORD,
-    pCurrent: *mut ::DWORD,
-    cbData: ::UINT,
-    iItem: ::c_int,
-    cButtons: ::c_int,
-    cbBytesPerRecord: ::c_int,
-    tbButton: TBBUTTON,
-}}
-pub type LPNMTBRESTORE = *mut NMTBRESTORE;
-STRUCT!{struct NMTBGETINFOTIPA {
-    hdr: ::NMHDR,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iItem: ::c_int,
-    lParal: ::LPARAM,
-}}
-pub type LPNMTBGETINFOTIPA = *mut NMTBGETINFOTIPA;
-STRUCT!{struct NMTBGETINFOTIPW {
-    hdr: ::NMHDR,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iItem: ::c_int,
-    lParal: ::LPARAM,
-}}
-pub type LPNMTBGETINFOTIPW = *mut NMTBGETINFOTIPW;
-pub const TBNF_IMAGE: ::DWORD = 0x00000001;
-pub const TBNF_TEXT: ::DWORD = 0x00000002;
-pub const TBNF_DI_SETITEM: ::DWORD = 0x10000000;
-STRUCT!{struct NMTBDISPINFOA {
-    hdr: ::NMHDR,
-    dwMask: ::DWORD,
-    idCommand: ::c_int,
-    lParam: ::DWORD_PTR,
-    iImage: ::c_int,
-    pszText: ::LPSTR,
-    cchText: ::c_int,
-}}
-pub type LPNMTBDISPINFOA = *mut NMTBDISPINFOA;
-STRUCT!{struct NMTBDISPINFOW {
-    hdr: ::NMHDR,
-    dwMask: ::DWORD,
-    idCommand: ::c_int,
-    lParam: ::DWORD_PTR,
-    iImage: ::c_int,
-    pszText: ::LPWSTR,
-    cchText: ::c_int,
-}}
-pub type LPNMTBDISPINFOW = *mut NMTBDISPINFOW;
-pub const TBDDRET_DEFAULT: ::LRESULT = 0;
-pub const TBDDRET_NODEFAULT: ::LRESULT = 1;
-pub const TBDDRET_TREATPRESSED: ::LRESULT = 2;
-pub type TBNOTIFYA = NMTOOLBARA;
-pub type TBNOTIFYW = NMTOOLBARW;
-pub type LPTBNOTIFYA = LPNMTOOLBARA;
-pub type LPTBNOTIFYW = LPNMTOOLBARW;
-STRUCT!{struct NMTOOLBARA {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    tbButton: TBBUTTON,
-    cchText: ::c_int,
-    pszText: ::LPSTR,
-    rcButton: ::RECT,
-}}
-pub type LPNMTOOLBARA = *mut NMTOOLBARA;
-STRUCT!{struct NMTOOLBARW {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    tbButton: TBBUTTON,
-    cchText: ::c_int,
-    pszText: ::LPWSTR,
-    rcButton: ::RECT,
-}}
-pub type LPNMTOOLBARW = *mut NMTOOLBARW;
-pub const RBIM_IMAGELIST: ::UINT = 0x00000001;
-pub const RBS_TOOLTIPS: ::DWORD = 0x00000100;
-pub const RBS_VARHEIGHT: ::DWORD = 0x00000200;
-pub const RBS_BANDBORDERS: ::DWORD = 0x00000400;
-pub const RBS_FIXEDORDER: ::DWORD = 0x00000800;
-pub const RBS_REGISTERDROP: ::DWORD = 0x00001000;
-pub const RBS_AUTOSIZE: ::DWORD = 0x00002000;
-pub const RBS_VERTICALGRIPPER: ::DWORD = 0x00004000;
-pub const RBS_DBLCLKTOGGLE: ::DWORD = 0x00008000;
-STRUCT!{struct REBARINFO {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    himl: HIMAGELIST,
-}}
-pub type LPREBARINFO = *mut REBARINFO;
-pub const RBBS_BREAK: ::UINT = 0x00000001;
-pub const RBBS_FIXEDSIZE: ::UINT = 0x00000002;
-pub const RBBS_CHILDEDGE: ::UINT = 0x00000004;
-pub const RBBS_HIDDEN: ::UINT = 0x00000008;
-pub const RBBS_NOVERT: ::UINT = 0x00000010;
-pub const RBBS_FIXEDBMP: ::UINT = 0x00000020;
-pub const RBBS_VARIABLEHEIGHT: ::UINT = 0x00000040;
-pub const RBBS_GRIPPERALWAYS: ::UINT = 0x00000080;
-pub const RBBS_NOGRIPPER: ::UINT = 0x00000100;
-pub const RBBS_USECHEVRON: ::UINT = 0x00000200;
-pub const RBBS_HIDETITLE: ::UINT = 0x00000400;
-pub const RBBS_TOPALIGN: ::UINT = 0x00000800;
-pub const RBBIM_STYLE: ::UINT = 0x00000001;
-pub const RBBIM_COLORS: ::UINT = 0x00000002;
-pub const RBBIM_TEXT: ::UINT = 0x00000004;
-pub const RBBIM_IMAGE: ::UINT = 0x00000008;
-pub const RBBIM_CHILD: ::UINT = 0x00000010;
-pub const RBBIM_CHILDSIZE: ::UINT = 0x00000020;
-pub const RBBIM_SIZE: ::UINT = 0x00000040;
-pub const RBBIM_BACKGROUND: ::UINT = 0x00000080;
-pub const RBBIM_ID: ::UINT = 0x00000100;
-pub const RBBIM_IDEALSIZE: ::UINT = 0x00000200;
-pub const RBBIM_LPARAM: ::UINT = 0x00000400;
-pub const RBBIM_HEADERSIZE: ::UINT = 0x00000800;
-pub const RBBIM_CHEVRONLOCATION: ::UINT = 0x00001000;
-pub const RBBIM_CHEVRONSTATE: ::UINT = 0x00002000;
-STRUCT!{struct REBARBANDINFOA {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    fStyle: ::UINT,
-    clrFore: ::COLORREF,
-    clrBack: ::COLORREF,
-    lpText: ::LPSTR,
-    cch: ::UINT,
-    iImage: ::c_int,
-    hwndChild: ::HWND,
-    cxMinChild: ::UINT,
-    cyMinChild: ::UINT,
-    cx: ::UINT,
-    hbmBack: ::HBITMAP,
-    wID: ::UINT,
-    cyChild: ::UINT,
-    cyMaxChild: ::UINT,
-    cyIntegral: ::UINT,
-    cxIdeal: ::UINT,
-    lParam: ::LPARAM,
-    cxHeader: ::UINT,
-    rcChevronLocation: ::RECT,
-    uChevronState: ::UINT,
-}}
-pub type LPREBARBANDINFOA = *mut REBARBANDINFOA;
-pub type LPCREBARBANDINFOA = *const REBARBANDINFOA;
-STRUCT!{struct REBARBANDINFOW {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    fStyle: ::UINT,
-    clrFore: ::COLORREF,
-    clrBack: ::COLORREF,
-    lpText: ::LPWSTR,
-    cch: ::UINT,
-    iImage: ::c_int,
-    hwndChild: ::HWND,
-    cxMinChild: ::UINT,
-    cyMinChild: ::UINT,
-    cx: ::UINT,
-    hbmBack: ::HBITMAP,
-    wID: ::UINT,
-    cyChild: ::UINT,
-    cyMaxChild: ::UINT,
-    cyIntegral: ::UINT,
-    cxIdeal: ::UINT,
-    lParam: ::LPARAM,
-    cxHeader: ::UINT,
-    rcChevronLocation: ::RECT,
-    uChevronState: ::UINT,
-}}
-pub type LPREBARBANDINFOW = *mut REBARBANDINFOW;
-pub type LPCREBARBANDINFOW = *const REBARBANDINFOW;
-pub const RB_INSERTBANDA: ::UINT = ::WM_USER + 1;
-pub const RB_DELETEBAND: ::UINT = ::WM_USER + 2;
-pub const RB_GETBARINFO: ::UINT = ::WM_USER + 3;
-pub const RB_SETBARINFO: ::UINT = ::WM_USER + 4;
-pub const RB_SETBANDINFOA: ::UINT = ::WM_USER + 6;
-pub const RB_SETPARENT: ::UINT = ::WM_USER + 7;
-pub const RB_HITTEST: ::UINT = ::WM_USER + 8;
-pub const RB_GETRECT: ::UINT = ::WM_USER + 9;
-pub const RB_INSERTBANDW: ::UINT = ::WM_USER + 10;
-pub const RB_SETBANDINFOW: ::UINT = ::WM_USER + 11;
-pub const RB_GETBANDCOUNT: ::UINT = ::WM_USER + 12;
-pub const RB_GETROWCOUNT: ::UINT = ::WM_USER + 13;
-pub const RB_GETROWHEIGHT: ::UINT = ::WM_USER + 14;
-pub const RB_IDTOINDEX: ::UINT = ::WM_USER + 16;
-pub const RB_GETTOOLTIPS: ::UINT = ::WM_USER + 17;
-pub const RB_SETTOOLTIPS: ::UINT = ::WM_USER + 18;
-pub const RB_SETBKCOLOR: ::UINT = ::WM_USER + 19;
-pub const RB_GETBKCOLOR: ::UINT = ::WM_USER + 20;
-pub const RB_SETTEXTCOLOR: ::UINT = ::WM_USER + 21;
-pub const RB_GETTEXTCOLOR: ::UINT = ::WM_USER + 22;
-pub const RBSTR_CHANGERECT: ::WPARAM = 0x0001;
-pub const RB_SIZETORECT: ::UINT = ::WM_USER + 23;
-pub const RB_SETCOLORSCHEME: ::UINT = CCM_SETCOLORSCHEME;
-pub const RB_GETCOLORSCHEME: ::UINT = CCM_GETCOLORSCHEME;
-pub const RB_BEGINDRAG: ::UINT = ::WM_USER + 24;
-pub const RB_ENDDRAG: ::UINT = ::WM_USER + 25;
-pub const RB_DRAGMOVE: ::UINT = ::WM_USER + 26;
-pub const RB_GETBARHEIGHT: ::UINT = ::WM_USER + 27;
-pub const RB_GETBANDINFOW: ::UINT = ::WM_USER + 28;
-pub const RB_GETBANDINFOA: ::UINT = ::WM_USER + 29;
-pub const RB_MINIMIZEBAND: ::UINT = ::WM_USER + 30;
-pub const RB_MAXIMIZEBAND: ::UINT = ::WM_USER + 31;
-pub const RB_GETDROPTARGET: ::UINT = CCM_GETDROPTARGET;
-pub const RB_GETBANDBORDERS: ::UINT = ::WM_USER + 34;
-pub const RB_SHOWBAND: ::UINT = ::WM_USER + 35;
-pub const RB_SETPALETTE: ::UINT = ::WM_USER + 37;
-pub const RB_GETPALETTE: ::UINT = ::WM_USER + 38;
-pub const RB_MOVEBAND: ::UINT = ::WM_USER + 39;
-pub const RB_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const RB_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const RB_GETBANDMARGINS: ::UINT = ::WM_USER + 40;
-pub const RB_SETWINDOWTHEME: ::UINT = CCM_SETWINDOWTHEME;
-pub const RB_SETEXTENDEDSTYLE: ::UINT = ::WM_USER + 41;
-pub const RB_GETEXTENDEDSTYLE: ::UINT = ::WM_USER + 42;
-pub const RB_PUSHCHEVRON: ::UINT = ::WM_USER + 43;
-pub const RB_SETBANDWIDTH: ::UINT = ::WM_USER + 44;
-pub const RBN_HEIGHTCHANGE: ::UINT = RBN_FIRST - 0;
-pub const RBN_GETOBJECT: ::UINT = RBN_FIRST - 1;
-pub const RBN_LAYOUTCHANGED: ::UINT = RBN_FIRST - 2;
-pub const RBN_AUTOSIZE: ::UINT = RBN_FIRST - 3;
-pub const RBN_BEGINDRAG: ::UINT = RBN_FIRST - 4;
-pub const RBN_ENDDRAG: ::UINT = RBN_FIRST - 5;
-pub const RBN_DELETINGBAND: ::UINT = RBN_FIRST - 6;
-pub const RBN_DELETEDBAND: ::UINT = RBN_FIRST - 7;
-pub const RBN_CHILDSIZE: ::UINT = RBN_FIRST - 8;
-pub const RBN_CHEVRONPUSHED: ::UINT = RBN_FIRST - 10;
-pub const RBN_SPLITTERDRAG: ::UINT = RBN_FIRST - 11;
-pub const RBN_MINMAX: ::UINT = RBN_FIRST - 21;
-pub const RBN_AUTOBREAK: ::UINT = RBN_FIRST - 22;
-STRUCT!{struct NMREBARCHILDSIZE {
-    hdr: ::NMHDR,
-    uBand: ::UINT,
-    wID: ::UINT,
-    rcChild: ::RECT,
-    rcBand: ::RECT,
-}}
-pub type LPNMREBARCHILDSIZE = *mut NMREBARCHILDSIZE;
-STRUCT!{struct NMREBAR {
-    hdr: ::NMHDR,
-    dwMask: ::DWORD,
-    uBand: ::UINT,
-    fStyle: ::UINT,
-    wID: ::UINT,
-    lParam: ::LPARAM,
-}}
-pub type LPNMREBAR = *mut NMREBAR;
-pub const RBNM_ID: ::DWORD = 0x00000001;
-pub const RBNM_STYLE: ::DWORD = 0x00000002;
-pub const RBNM_LPARAM: ::DWORD = 0x00000004;
-STRUCT!{struct NMRBAUTOSIZE {
-    hdr: ::NMHDR,
-    fChanged: ::BOOL,
-    rcTarget: ::RECT,
-    rcActual: ::RECT,
-}}
-pub type LPNMRBAUTOSIZE = *mut NMRBAUTOSIZE;
-STRUCT!{struct NMREBARCHEVRON {
-    hdr: ::NMHDR,
-    uBand: ::UINT,
-    wID: ::UINT,
-    lParam: ::LPARAM,
-    rc: ::RECT,
-    lParamNM: ::LPARAM,
-}}
-pub type LPNMREBARCHEVRON = *mut NMREBARCHEVRON;
-STRUCT!{struct NMREBARSPLITTER {
-    hdr: ::NMHDR,
-    rcSizing: ::RECT,
-}}
-pub type LPNMREBARSPLITTER = *mut NMREBARSPLITTER;
-pub const RBAB_AUTOSIZE: ::UINT = 0x0001;
-pub const RBAB_ADDBAND: ::UINT = 0x0002;
-STRUCT!{struct NMREBARAUTOBREAK {
-    hdr: ::NMHDR,
-    uBand: ::UINT,
-    wID: ::UINT,
-    lParam: ::LPARAM,
-    uMsg: ::UINT,
-    fStyleCurrent: ::UINT,
-    fAutoBreak: ::UINT,
-}}
-pub type LPNMREBARAUTOBREAK = *mut NMREBARAUTOBREAK;
-pub const RBHT_NOWHERE: ::UINT = 0x0001;
-pub const RBHT_CAPTION: ::UINT = 0x0002;
-pub const RBHT_CLIENT: ::UINT = 0x0003;
-pub const RBHT_GRABBER: ::UINT = 0x0004;
-pub const RBHT_CHEVRON: ::UINT = 0x0008;
-pub const RBHT_SPLITTER: ::UINT = 0x0010;
-STRUCT!{struct RBHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-    iBand: ::c_int,
-}}
-pub type LPRBHITTESTINFO = *mut RBHITTESTINFO;
-pub type LPTOOLINFOA = LPTTTOOLINFOA;
-pub type LPTOOLINFOW = LPTTTOOLINFOW;
-pub type TOOLINFOA = TTTOOLINFOA;
-pub type TOOLINFOW = TTTOOLINFOW;
-STRUCT!{struct TTTOOLINFOA {
-    cbSize: ::UINT,
-    uFlags: ::UINT,
-    hwnd: ::HWND,
-    uId: ::UINT_PTR,
-    rect: ::RECT,
-    hinst: ::HINSTANCE,
-    lpszText: ::LPSTR,
-    lParam: ::LPARAM,
-    lpReserved: *mut ::c_void,
-}}
-pub type PTTTOOLINFOA = *mut TTTOOLINFOA;
-pub type LPTTTOOLINFOA = *mut TTTOOLINFOA;
-STRUCT!{struct TTTOOLINFOW {
-    cbSize: ::UINT,
-    uFlags: ::UINT,
-    hwnd: ::HWND,
-    uId: ::UINT_PTR,
-    rect: ::RECT,
-    hinst: ::HINSTANCE,
-    lpszText: ::LPSTR,
-    lParam: ::LPARAM,
-    lpReserved: *mut ::c_void,
-}}
-pub type PTTTOOLINFOW = *mut TTTOOLINFOW;
-pub type LPTTTOOLINFOW = *mut TTTOOLINFOW;
-pub const TTS_ALWAYSTIP: ::DWORD = 0x01;
-pub const TTS_NOPREFIX: ::DWORD = 0x02;
-pub const TTS_NOANIMATE: ::DWORD = 0x10;
-pub const TTS_NOFADE: ::DWORD = 0x20;
-pub const TTS_BALLOON: ::DWORD = 0x40;
-pub const TTS_CLOSE: ::DWORD = 0x80;
-pub const TTS_USEVISUALSTYLE: ::DWORD = 0x100;
-pub const TTF_IDISHWND: ::UINT = 0x0001;
-pub const TTF_CENTERTIP: ::UINT = 0x0002;
-pub const TTF_RTLREADING: ::UINT = 0x0004;
-pub const TTF_SUBCLASS: ::UINT = 0x0010;
-pub const TTF_TRACK: ::UINT = 0x0020;
-pub const TTF_ABSOLUTE: ::UINT = 0x0080;
-pub const TTF_TRANSPARENT: ::UINT = 0x0100;
-pub const TTF_PARSELINKS: ::UINT = 0x1000;
-pub const TTF_DI_SETITEM: ::UINT = 0x8000;
-pub const TTDT_AUTOMATIC: ::WPARAM = 0;
-pub const TTDT_RESHOW: ::WPARAM = 1;
-pub const TTDT_AUTOPOP: ::WPARAM = 2;
-pub const TTDT_INITIAL: ::WPARAM = 3;
-pub const TTI_NONE: ::WPARAM = 0;
-pub const TTI_INFO: ::WPARAM = 1;
-pub const TTI_WARNING: ::WPARAM = 2;
-pub const TTI_ERROR: ::WPARAM = 3;
-pub const TTI_INFO_LARGE: ::WPARAM = 4;
-pub const TTI_WARNING_LARGE: ::WPARAM = 5;
-pub const TTI_ERROR_LARGE: ::WPARAM = 6;
-pub const TTM_ACTIVATE: ::UINT = ::WM_USER + 1;
-pub const TTM_SETDELAYTIME: ::UINT = ::WM_USER + 3;
-pub const TTM_ADDTOOLA: ::UINT = ::WM_USER + 4;
-pub const TTM_ADDTOOLW: ::UINT = ::WM_USER + 50;
-pub const TTM_DELTOOLA: ::UINT = ::WM_USER + 5;
-pub const TTM_DELTOOLW: ::UINT = ::WM_USER + 51;
-pub const TTM_NEWTOOLRECTA: ::UINT = ::WM_USER + 6;
-pub const TTM_NEWTOOLRECTW: ::UINT = ::WM_USER + 52;
-pub const TTM_RELAYEVENT: ::UINT = ::WM_USER + 7;
-pub const TTM_GETTOOLINFOA: ::UINT = ::WM_USER + 8;
-pub const TTM_GETTOOLINFOW: ::UINT = ::WM_USER + 53;
-pub const TTM_SETTOOLINFOA: ::UINT = ::WM_USER + 9;
-pub const TTM_SETTOOLINFOW: ::UINT = ::WM_USER + 54;
-pub const TTM_HITTESTA: ::UINT = ::WM_USER + 10;
-pub const TTM_HITTESTW: ::UINT = ::WM_USER + 55;
-pub const TTM_GETTEXTA: ::UINT = ::WM_USER + 11;
-pub const TTM_GETTEXTW: ::UINT = ::WM_USER + 56;
-pub const TTM_UPDATETIPTEXTA: ::UINT = ::WM_USER + 12;
-pub const TTM_UPDATETIPTEXTW: ::UINT = ::WM_USER + 57;
-pub const TTM_GETTOOLCOUNT: ::UINT = ::WM_USER + 13;
-pub const TTM_ENUMTOOLSA: ::UINT = ::WM_USER + 14;
-pub const TTM_ENUMTOOLSW: ::UINT = ::WM_USER + 58;
-pub const TTM_GETCURRENTTOOLA: ::UINT = ::WM_USER + 15;
-pub const TTM_GETCURRENTTOOLW: ::UINT = ::WM_USER + 59;
-pub const TTM_WINDOWFROMPOINT: ::UINT = ::WM_USER + 16;
-pub const TTM_TRACKACTIVATE: ::UINT = ::WM_USER + 17;
-pub const TTM_TRACKPOSITION: ::UINT = ::WM_USER + 18;
-pub const TTM_SETTIPBKCOLOR: ::UINT = ::WM_USER + 19;
-pub const TTM_SETTIPTEXTCOLOR: ::UINT = ::WM_USER + 20;
-pub const TTM_GETDELAYTIME: ::UINT = ::WM_USER + 21;
-pub const TTM_GETTIPBKCOLOR: ::UINT = ::WM_USER + 22;
-pub const TTM_GETTIPTEXTCOLOR: ::UINT = ::WM_USER + 23;
-pub const TTM_SETMAXTIPWIDTH: ::UINT = ::WM_USER + 24;
-pub const TTM_GETMAXTIPWIDTH: ::UINT = ::WM_USER + 25;
-pub const TTM_SETMARGIN: ::UINT = ::WM_USER + 26;
-pub const TTM_GETMARGIN: ::UINT = ::WM_USER + 27;
-pub const TTM_POP: ::UINT = ::WM_USER + 28;
-pub const TTM_UPDATE: ::UINT = ::WM_USER + 29;
-pub const TTM_GETBUBBLESIZE: ::UINT = ::WM_USER + 30;
-pub const TTM_ADJUSTRECT: ::UINT = ::WM_USER + 31;
-pub const TTM_SETTITLEA: ::UINT = ::WM_USER + 32;
-pub const TTM_SETTITLEW: ::UINT = ::WM_USER + 33;
-pub const TTM_POPUP: ::UINT = ::WM_USER + 34;
-pub const TTM_GETTITLE: ::UINT = ::WM_USER + 35;
-STRUCT!{struct TTGETTITLE {
-    dwSize: ::DWORD,
-    uTitleBitmap: ::UINT,
-    cch: ::UINT,
-    pszTitle: *mut ::WCHAR,
-}}
-pub type LPTTGETTITLE = *mut TTGETTITLE;
-pub const TTM_SETWINDOWTHEME: ::UINT = CCM_SETWINDOWTHEME;
-pub type LPHITTESTINFOW = LPTTHITTESTINFOW;
-pub type LPHITTESTINFOA = LPTTHITTESTINFOA;
-STRUCT!{struct TTHITTESTINFOA {
-    hwnd: ::HWND,
-    pt: ::POINT,
-    ti: TTTOOLINFOA,
-}}
-pub type LPTTHITTESTINFOA = *mut TTHITTESTINFOA;
-STRUCT!{struct TTHITTESTINFOW {
-    hwnd: ::HWND,
-    pt: ::POINT,
-    ti: TTTOOLINFOW,
-}}
-pub type LPTTHITTESTINFOW = *mut TTHITTESTINFOW;
-pub const TTN_GETDISPINFOA: ::UINT = TTN_FIRST - 0;
-pub const TTN_GETDISPINFOW: ::UINT = TTN_FIRST - 10;
-pub const TTN_SHOW: ::UINT = TTN_FIRST - 1;
-pub const TTN_POP: ::UINT = TTN_FIRST - 2;
-pub const TTN_LINKCLICK: ::UINT = TTN_FIRST - 3;
-pub const TTN_NEEDTEXTA: ::UINT = TTN_GETDISPINFOA;
-pub const TTN_NEEDTEXTW: ::UINT = TTN_GETDISPINFOW;
-pub type TOOLTIPTEXTW = NMTTDISPINFOW;
-pub type TOOLTIPTEXTA = NMTTDISPINFOA;
-pub type LPTOOLTIPTEXTA = LPNMTTDISPINFOA;
-pub type LPTOOLTIPTEXTW = LPNMTTDISPINFOW;
-STRUCT!{nodebug struct NMTTDISPINFOA {
-    hdr: ::NMHDR,
-    lpszText: ::LPSTR,
-    szText: [::c_char; 80],
-    hinst: ::HINSTANCE,
-    uFlags: ::UINT,
-    lParam: ::LPARAM,
-}}
-pub type LPNMTTDISPINFOA = *mut NMTTDISPINFOA;
-STRUCT!{nodebug struct NMTTDISPINFOW {
-    hdr: ::NMHDR,
-    lpszText: ::LPWSTR,
-    szText: [::WCHAR; 80],
-    hinst: ::HINSTANCE,
-    uFlags: ::UINT,
-    lParam: ::LPARAM,
-}}
-pub type LPNMTTDISPINFOW = *mut NMTTDISPINFOW;
-pub const SBARS_SIZEGRIP: ::DWORD = 0x0100;
-pub const SBARS_TOOLTIPS: ::DWORD = 0x0800;
-pub const SBT_TOOLTIPS: ::DWORD = 0x0800;
-pub const SB_SETTEXTA: ::UINT = ::WM_USER + 1;
-pub const SB_SETTEXTW: ::UINT = ::WM_USER + 11;
-pub const SB_GETTEXTA: ::UINT = ::WM_USER + 2;
-pub const SB_GETTEXTW: ::UINT = ::WM_USER + 13;
-pub const SB_GETTEXTLENGTHA: ::UINT = ::WM_USER + 3;
-pub const SB_GETTEXTLENGTHW: ::UINT = ::WM_USER + 12;
-pub const SB_SETPARTS: ::UINT = ::WM_USER + 4;
-pub const SB_GETPARTS: ::UINT = ::WM_USER + 6;
-pub const SB_GETBORDERS: ::UINT = ::WM_USER + 7;
-pub const SB_SETMINHEIGHT: ::UINT = ::WM_USER + 8;
-pub const SB_SIMPLE: ::UINT = ::WM_USER + 9;
-pub const SB_GETRECT: ::UINT = ::WM_USER + 10;
-pub const SB_ISSIMPLE: ::UINT = ::WM_USER + 14;
-pub const SB_SETICON: ::UINT = ::WM_USER + 15;
-pub const SB_SETTIPTEXTA: ::UINT = ::WM_USER + 16;
-pub const SB_SETTIPTEXTW: ::UINT = ::WM_USER + 17;
-pub const SB_GETTIPTEXTA: ::UINT = ::WM_USER + 18;
-pub const SB_GETTIPTEXTW: ::UINT = ::WM_USER + 19;
-pub const SB_GETICON: ::UINT = ::WM_USER + 20;
-pub const SB_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const SB_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const SBT_OWNERDRAW: ::WPARAM = 0x1000;
-pub const SBT_NOBORDERS: ::WPARAM = 0x0100;
-pub const SBT_POPOUT: ::WPARAM = 0x0200;
-pub const SBT_RTLREADING: ::WPARAM = 0x0400;
-pub const SBT_NOTABPARSING: ::WPARAM = 0x0800;
-pub const SB_SETBKCOLOR: ::UINT = CCM_SETBKCOLOR;
-pub const SBN_SIMPLEMODECHANGE: ::UINT = SBN_FIRST - 0;
-pub const SB_SIMPLEID: ::WPARAM = 0x00ff;
-pub const TBS_AUTOTICKS: ::DWORD = 0x0001;
-pub const TBS_VERT: ::DWORD = 0x0002;
-pub const TBS_HORZ: ::DWORD = 0x0000;
-pub const TBS_TOP: ::DWORD = 0x0004;
-pub const TBS_BOTTOM: ::DWORD = 0x0000;
-pub const TBS_LEFT: ::DWORD = 0x0004;
-pub const TBS_RIGHT: ::DWORD = 0x0000;
-pub const TBS_BOTH: ::DWORD = 0x0008;
-pub const TBS_NOTICKS: ::DWORD = 0x0010;
-pub const TBS_ENABLESELRANGE: ::DWORD = 0x0020;
-pub const TBS_FIXEDLENGTH: ::DWORD = 0x0040;
-pub const TBS_NOTHUMB: ::DWORD = 0x0080;
-pub const TBS_TOOLTIPS: ::DWORD = 0x0100;
-pub const TBS_REVERSED: ::DWORD = 0x0200;
-pub const TBS_DOWNISLEFT: ::DWORD = 0x0400;
-pub const TBS_NOTIFYBEFOREMOVE: ::DWORD = 0x0800;
-pub const TBS_TRANSPARENTBKGND: ::DWORD = 0x1000;
-pub const TBM_GETPOS: ::UINT = ::WM_USER;
-pub const TBM_GETRANGEMIN: ::UINT = ::WM_USER + 1;
-pub const TBM_GETRANGEMAX: ::UINT = ::WM_USER + 2;
-pub const TBM_GETTIC: ::UINT = ::WM_USER + 3;
-pub const TBM_SETTIC: ::UINT = ::WM_USER + 4;
-pub const TBM_SETPOS: ::UINT = ::WM_USER + 5;
-pub const TBM_SETRANGE: ::UINT = ::WM_USER + 6;
-pub const TBM_SETRANGEMIN: ::UINT = ::WM_USER + 7;
-pub const TBM_SETRANGEMAX: ::UINT = ::WM_USER + 8;
-pub const TBM_CLEARTICS: ::UINT = ::WM_USER + 9;
-pub const TBM_SETSEL: ::UINT = ::WM_USER + 10;
-pub const TBM_SETSELSTART: ::UINT = ::WM_USER + 11;
-pub const TBM_SETSELEND: ::UINT = ::WM_USER + 12;
-pub const TBM_GETPTICS: ::UINT = ::WM_USER + 14;
-pub const TBM_GETTICPOS: ::UINT = ::WM_USER + 15;
-pub const TBM_GETNUMTICS: ::UINT = ::WM_USER + 16;
-pub const TBM_GETSELSTART: ::UINT = ::WM_USER + 17;
-pub const TBM_GETSELEND: ::UINT = ::WM_USER + 18;
-pub const TBM_CLEARSEL: ::UINT = ::WM_USER + 19;
-pub const TBM_SETTICFREQ: ::UINT = ::WM_USER + 20;
-pub const TBM_SETPAGESIZE: ::UINT = ::WM_USER + 21;
-pub const TBM_GETPAGESIZE: ::UINT = ::WM_USER + 22;
-pub const TBM_SETLINESIZE: ::UINT = ::WM_USER + 23;
-pub const TBM_GETLINESIZE: ::UINT = ::WM_USER + 24;
-pub const TBM_GETTHUMBRECT: ::UINT = ::WM_USER + 25;
-pub const TBM_GETCHANNELRECT: ::UINT = ::WM_USER + 26;
-pub const TBM_SETTHUMBLENGTH: ::UINT = ::WM_USER + 27;
-pub const TBM_GETTHUMBLENGTH: ::UINT = ::WM_USER + 28;
-pub const TBM_SETTOOLTIPS: ::UINT = ::WM_USER + 29;
-pub const TBM_GETTOOLTIPS: ::UINT = ::WM_USER + 30;
-pub const TBM_SETTIPSIDE: ::UINT = ::WM_USER + 31;
-pub const TBTS_TOP: ::WPARAM = 0;
-pub const TBTS_LEFT: ::WPARAM = 1;
-pub const TBTS_BOTTOM: ::WPARAM = 2;
-pub const TBTS_RIGHT: ::WPARAM = 3;
-pub const TBM_SETBUDDY: ::UINT = ::WM_USER + 32;
-pub const TBM_GETBUDDY: ::UINT = ::WM_USER + 33;
-pub const TBM_SETPOSNOTIFY: ::UINT = ::WM_USER + 34;
-pub const TBM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const TBM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const TBCD_TICS: ::DWORD_PTR = 0x0001;
-pub const TBCD_THUMB: ::DWORD_PTR = 0x0001;
-pub const TBCD_CHANNEL: ::DWORD_PTR = 0x0001;
-pub const TB_LINEUP: ::WPARAM = 0;
-pub const TB_LINEDOWN: ::WPARAM = 1;
-pub const TB_PAGEUP: ::WPARAM = 2;
-pub const TB_PAGEDOWN: ::WPARAM = 3;
-pub const TB_THUMBPOSITION: ::WPARAM = 4;
-pub const TB_THUMBTRACK: ::WPARAM = 5;
-pub const TB_TOP: ::WPARAM = 6;
-pub const TB_BOTTOM: ::WPARAM = 7;
-pub const TB_ENDTRACK: ::WPARAM = 8;
-pub const TRBN_THUMBPOSCHANGING: ::UINT = TRBN_FIRST - 1;
-STRUCT!{struct NMTRBTHUMBPOSCHANGING {
-    hdr: ::NMHDR,
-    dwPos: ::DWORD,
-    nReason: ::c_int,
-}}
-STRUCT!{struct DRAGLISTINFO {
-    uNotification: ::UINT,
-    hWnd: ::HWND,
-    ptCursor: ::POINT,
-}}
-pub type LPDRAGLISTINFO = *mut DRAGLISTINFO;
-pub const DL_BEGINDRAG: ::UINT = ::WM_USER + 133;
-pub const DL_DRAGGING: ::UINT = ::WM_USER + 134;
-pub const DL_DROPPED: ::UINT = ::WM_USER + 135;
-pub const DL_CANCELDRAG: ::UINT = ::WM_USER + 136;
-pub const DL_CURSORSET: ::UINT = 0;
-pub const DL_STOPCURSOR: ::UINT = 1;
-pub const DL_COPYCURSOR: ::UINT = 2;
-pub const DL_MOVECURSOR: ::UINT = 3;
-STRUCT!{struct UDACCEL {
-    nSec: ::UINT,
-    nInc: ::UINT,
-}}
-pub type LPUDACCEL = *mut UDACCEL;
-pub const UD_MAXVAL: ::c_short = 0x7fff;
-pub const UD_MINVAL: ::c_short = 0 - UD_MAXVAL;
-pub const UDS_WRAP: ::DWORD = 0x0001;
-pub const UDS_SETBUDDYINT: ::DWORD = 0x0002;
-pub const UDS_ALIGNRIGHT: ::DWORD = 0x0004;
-pub const UDS_ALIGNLEFT: ::DWORD = 0x0008;
-pub const UDS_AUTOBUDDY: ::DWORD = 0x0010;
-pub const UDS_ARROWKEYS: ::DWORD = 0x0020;
-pub const UDS_HORZ: ::DWORD = 0x0040;
-pub const UDS_NOTHOUSANDS: ::DWORD = 0x0080;
-pub const UDS_HOTTRACK: ::DWORD = 0x0100;
-pub const UDM_SETRANGE: ::UINT = ::WM_USER + 101;
-pub const UDM_GETRANGE: ::UINT = ::WM_USER + 102;
-pub const UDM_SETPOS: ::UINT = ::WM_USER + 103;
-pub const UDM_GETPOS: ::UINT = ::WM_USER + 104;
-pub const UDM_SETBUDDY: ::UINT = ::WM_USER + 105;
-pub const UDM_GETBUDDY: ::UINT = ::WM_USER + 106;
-pub const UDM_SETACCEL: ::UINT = ::WM_USER + 107;
-pub const UDM_GETACCEL: ::UINT = ::WM_USER + 108;
-pub const UDM_SETBASE: ::UINT = ::WM_USER + 109;
-pub const UDM_GETBASE: ::UINT = ::WM_USER + 110;
-pub const UDM_SETRANGE32: ::UINT = ::WM_USER + 111;
-pub const UDM_GETRANGE32: ::UINT = ::WM_USER + 112;
-pub const UDM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const UDM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const UDM_SETPOS32: ::UINT = ::WM_USER + 113;
-pub const UDM_GETPOS32: ::UINT = ::WM_USER + 114;
-pub type NM_UPDOWN = NMUPDOWN;
-pub type LPNM_UPDOWN = LPNMUPDOWN;
-STRUCT!{struct NMUPDOWN {
-    hdr: ::NMHDR,
-    iPos: ::c_int,
-    iDelta: ::c_int,
-}}
-pub type LPNMUPDOWN = *mut NMUPDOWN;
-pub const UDN_DELTAPOS: ::UINT = UDN_FIRST - 1;
-pub const PBS_SMOOTH: ::DWORD = 0x01;
-pub const PBS_VERTICAL: ::DWORD = 0x04;
-pub const PBM_SETRANGE: ::UINT = ::WM_USER + 1;
-pub const PBM_SETPOS: ::UINT = ::WM_USER + 2;
-pub const PBM_DELTAPOS: ::UINT = ::WM_USER + 3;
-pub const PBM_SETSTEP: ::UINT = ::WM_USER + 4;
-pub const PBM_STEPIT: ::UINT = ::WM_USER + 5;
-pub const PBM_SETRANGE32: ::UINT = ::WM_USER + 6;
-STRUCT!{struct PBRANGE {
-    iLow: ::c_int,
-    iHigh: ::c_int,
-}}
-pub type LPPBRANGE = *mut PBRANGE;
-pub const PBM_GETRANGE: ::UINT = ::WM_USER + 7;
-pub const PBM_GETPOS: ::UINT = ::WM_USER + 8;
-pub const PBM_SETBARCOLOR: ::UINT = ::WM_USER + 9;
-pub const PBM_SETBKCOLOR: ::UINT = CCM_SETBKCOLOR;
-pub const PBM_SETMARQUEE: ::UINT = ::WM_USER + 10;
-pub const PBS_MARQUEE: ::DWORD = 0x08;
-pub const PBS_SMOOTHREVERSE: ::DWORD = 0x10;
-pub const PBM_GETSTEP: ::UINT = ::WM_USER + 13;
-pub const PBM_GETBKCOLOR: ::UINT = ::WM_USER + 14;
-pub const PBM_GETBARCOLOR: ::UINT = ::WM_USER + 15;
-pub const PBM_SETSTATE: ::UINT = ::WM_USER + 16;
-pub const PBM_GETSTATE: ::UINT = ::WM_USER + 17;
-pub const PBST_NORMAL: ::c_int = 0x0001;
-pub const PBST_ERROR: ::c_int = 0x0002;
-pub const PBST_PAUSED: ::c_int = 0x0003;
-pub const HOTKEYF_SHIFT: ::BYTE = 0x01;
-pub const HOTKEYF_CONTROL: ::BYTE = 0x02;
-pub const HOTKEYF_ALT: ::BYTE = 0x04;
-pub const HOTKEYF_EXT: ::BYTE = 0x08;
-pub const HKCOMB_NONE: ::WPARAM = 0x0001;
-pub const HKCOMB_S: ::WPARAM = 0x0002;
-pub const HKCOMB_C: ::WPARAM = 0x0004;
-pub const HKCOMB_A: ::WPARAM = 0x0008;
-pub const HKCOMB_SC: ::WPARAM = 0x0010;
-pub const HKCOMB_SA: ::WPARAM = 0x0020;
-pub const HKCOMB_CA: ::WPARAM = 0x0040;
-pub const HKCOMB_SCA: ::WPARAM = 0x0080;
-pub const HKM_SETHOTKEY: ::UINT = ::WM_USER + 1;
-pub const HKM_GETHOTKEY: ::UINT = ::WM_USER + 2;
-pub const HKM_SETRULES: ::UINT = ::WM_USER + 3;
-pub const CCS_TOP: ::DWORD = 0x00000001;
-pub const CCS_NOMOVEY: ::DWORD = 0x00000002;
-pub const CCS_BOTTOM: ::DWORD = 0x00000003;
-pub const CCS_NORESIZE: ::DWORD = 0x00000004;
-pub const CCS_NOPARENTALIGN: ::DWORD = 0x00000008;
-pub const CCS_ADJUSTABLE: ::DWORD = 0x00000020;
-pub const CCS_NODIVIDER: ::DWORD = 0x00000040;
-pub const CCS_VERT: ::DWORD = 0x00000080;
-pub const CCS_LEFT: ::DWORD = CCS_VERT | CCS_TOP;
-pub const CCS_RIGHT: ::DWORD = CCS_VERT | CCS_BOTTOM;
-pub const CCS_NOMOVEX: ::DWORD = CCS_VERT | CCS_NOMOVEY;
-pub const MAX_LINKID_TEXT: usize = 48;
-pub const L_MAX_URL_LENGTH: usize = 2048 + 32 + 4;
-pub const LWS_TRANSPARENT: ::DWORD = 0x0001;
-pub const LWS_IGNORERETURN: ::DWORD = 0x0002;
-pub const LWS_NOPREFIX: ::DWORD = 0x0004;
-pub const LWS_USEVISUALSTYLE: ::DWORD = 0x0008;
-pub const LWS_USECUSTOMTEXT: ::DWORD = 0x0010;
-pub const LWS_RIGHT: ::DWORD = 0x0020;
-pub const LIF_ITEMINDEX: ::UINT = 0x00000001;
-pub const LIF_STATE: ::UINT = 0x00000002;
-pub const LIF_ITEMID: ::UINT = 0x00000004;
-pub const LIF_URL: ::UINT = 0x00000008;
-pub const LIS_FOCUSED: ::UINT = 0x00000001;
-pub const LIS_ENABLED: ::UINT = 0x00000002;
-pub const LIS_VISITED: ::UINT = 0x00000004;
-pub const LIS_HOTTRACK: ::UINT = 0x00000008;
-pub const LIS_DEFAULTCOLORS: ::UINT = 0x00000010;
-STRUCT!{nodebug struct LITEM {
-    mask: ::UINT,
-    iLink: ::c_int,
-    state: ::UINT,
-    stateMask: ::UINT,
-    szID: [::WCHAR; MAX_LINKID_TEXT],
-    szUrl: [::WCHAR; L_MAX_URL_LENGTH],
-}}
-pub type PLITEM = *mut LITEM;
-STRUCT!{nodebug struct LHITTESTINFO {
-    pt: ::POINT,
-    item: LITEM,
-}}
-pub type PLHITTESTINFO = *mut LHITTESTINFO;
-STRUCT!{nodebug struct NMLINK {
-    hdr: ::NMHDR,
-    item: LITEM,
-}}
-pub type PNMLINK = *mut NMLINK;
-pub const LM_HITTEST: ::UINT = ::WM_USER + 0x300;
-pub const LM_GETIDEALHEIGHT: ::UINT = ::WM_USER + 0x301;
-pub const LM_SETITEM: ::UINT = ::WM_USER + 0x302;
-pub const LM_GETITEM: ::UINT = ::WM_USER + 0x303;
-pub const LM_GETIDEALSIZE: ::UINT = LM_GETIDEALHEIGHT;
-pub const LVS_ICON: ::DWORD = 0x0000;
-pub const LVS_REPORT: ::DWORD = 0x0001;
-pub const LVS_SMALLICON: ::DWORD = 0x0002;
-pub const LVS_LIST: ::DWORD = 0x0003;
-pub const LVS_TYPEMASK: ::DWORD = 0x0003;
-pub const LVS_SINGLESEL: ::DWORD = 0x0004;
-pub const LVS_SHOWSELALWAYS: ::DWORD = 0x0008;
-pub const LVS_SORTASCENDING: ::DWORD = 0x0010;
-pub const LVS_SORTDESCENDING: ::DWORD = 0x0020;
-pub const LVS_SHAREIMAGELISTS: ::DWORD = 0x0040;
-pub const LVS_NOLABELWRAP: ::DWORD = 0x0080;
-pub const LVS_AUTOARRANGE: ::DWORD = 0x0100;
-pub const LVS_EDITLABELS: ::DWORD = 0x0200;
-pub const LVS_OWNERDATA: ::DWORD = 0x1000;
-pub const LVS_NOSCROLL: ::DWORD = 0x2000;
-pub const LVS_TYPESTYLEMASK: ::DWORD = 0xfc00;
-pub const LVS_ALIGNTOP: ::DWORD = 0x0000;
-pub const LVS_ALIGNLEFT: ::DWORD = 0x0800;
-pub const LVS_ALIGNMASK: ::DWORD = 0x0c00;
-pub const LVS_OWNERDRAWFIXED: ::DWORD = 0x0400;
-pub const LVS_NOCOLUMNHEADER: ::DWORD = 0x4000;
-pub const LVS_NOSORTHEADER: ::DWORD = 0x8000;
-pub const LVM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const LVM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const LVM_GETBKCOLOR: ::UINT = LVM_FIRST + 0;
-pub const LVM_SETBKCOLOR: ::UINT = LVM_FIRST + 1;
-pub const LVM_GETIMAGELIST: ::UINT = LVM_FIRST + 2;
-pub const LVM_SETIMAGELIST: ::UINT = LVM_FIRST + 3;
-pub const LVM_GETITEMCOUNT: ::UINT = LVM_FIRST + 4;
-pub const LVSIL_NORMAL: ::c_int = 0;
-pub const LVSIL_SMALL: ::c_int = 1;
-pub const LVSIL_STATE: ::c_int = 2;
-pub const LVSIL_GROUPHEADER: ::c_int = 3;
-pub const LVIF_TEXT: ::UINT = 0x00000001;
-pub const LVIF_IMAGE: ::UINT = 0x00000002;
-pub const LVIF_PARAM: ::UINT = 0x00000004;
-pub const LVIF_STATE: ::UINT = 0x00000008;
-pub const LVIF_INDENT: ::UINT = 0x00000010;
-pub const LVIF_NORECOMPUTE: ::UINT = 0x00000800;
-pub const LVIF_GROUPID: ::UINT = 0x00000100;
-pub const LVIF_COLUMNS: ::UINT = 0x00000200;
-pub const LVIF_COLFMT: ::UINT = 0x00010000;
-pub const LVIS_FOCUSED: ::UINT = 0x0001;
-pub const LVIS_SELECTED: ::UINT = 0x0002;
-pub const LVIS_CUT: ::UINT = 0x0004;
-pub const LVIS_DROPHILITED: ::UINT = 0x0008;
-pub const LVIS_GLOW: ::UINT = 0x0010;
-pub const LVIS_ACTIVATING: ::UINT = 0x0020;
-pub const LVIS_OVERLAYMASK: ::UINT = 0x0F00;
-pub const LVIS_STATEIMAGEMASK: ::UINT = 0xF000;
-#[inline] #[allow(dead_code)]
-pub fn INDEXTOSTATEIMAGEMASK(i: ::UINT) -> ::UINT { i << 12 }
-pub const I_INDENTCALLBACK: ::c_int = -1;
-pub type LV_ITEMA = LVITEMA;
-pub type LV_ITEMW = LVITEMW;
-pub const I_GROUPIDCALLBACK: ::c_int = -1;
-pub const I_GROUPIDNONE: ::c_int = -2;
-STRUCT!{struct LVITEMA {
-    mask: ::UINT,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-    iIndent: ::c_int,
-    iGroupId: ::c_int,
-    cColumns: ::UINT,
-    puColumns: ::PUINT,
-    piColFmt: *mut ::c_int,
-    iGroup: ::c_int,
-}}
-pub type LPLVITEMA = *mut LVITEMA;
-STRUCT!{struct LVITEMW {
-    mask: ::UINT,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-    iIndent: ::c_int,
-    iGroupId: ::c_int,
-    cColumns: ::UINT,
-    puColumns: ::PUINT,
-    piColFmt: *mut ::c_int,
-    iGroup: ::c_int,
-}}
-pub type LPLVITEMW = *mut LVITEMW;
-pub const LPSTR_TEXTCALLBACKW: ::LPWSTR = (0 - 1) as ::LPWSTR;
-pub const LPSTR_TEXTCALLBACKA: ::LPSTR = (0 - 1) as ::LPSTR;
-pub const I_IMAGECALLBACK: ::c_int = -1;
-pub const I_IMAGENONE: ::c_int = -2;
-pub const I_COLUMNSCALLBACK: ::UINT = -1i32 as ::UINT;
-pub const LVM_GETITEMA: ::UINT = LVM_FIRST + 5;
-pub const LVM_GETITEMW: ::UINT = LVM_FIRST + 75;
-pub const LVM_SETITEMA: ::UINT = LVM_FIRST + 6;
-pub const LVM_SETITEMW: ::UINT = LVM_FIRST + 76;
-pub const LVM_INSERTITEMA: ::UINT = LVM_FIRST + 7;
-pub const LVM_INSERTITEMW: ::UINT = LVM_FIRST + 77;
-pub const LVM_DELETEITEM: ::UINT = LVM_FIRST + 8;
-pub const LVM_DELETEALLITEMS: ::UINT = LVM_FIRST + 9;
-pub const LVM_GETCALLBACKMASK: ::UINT = LVM_FIRST + 10;
-pub const LVM_SETCALLBACKMASK: ::UINT = LVM_FIRST + 11;
-pub const LVM_GETNEXTITEM: ::UINT = LVM_FIRST + 12;
-pub const LVNI_ALL: ::LPARAM = 0x0000;
-pub const LVNI_FOCUSED: ::LPARAM = 0x0001;
-pub const LVNI_SELECTED: ::LPARAM = 0x0002;
-pub const LVNI_CUT: ::LPARAM = 0x0004;
-pub const LVNI_DROPHILITED: ::LPARAM = 0x0008;
-pub const LVNI_STATEMASK: ::LPARAM = LVNI_FOCUSED | LVNI_SELECTED | LVNI_CUT | LVNI_DROPHILITED;
-pub const LVNI_VISIBLEORDER: ::LPARAM = 0x0010;
-pub const LVNI_PREVIOUS: ::LPARAM = 0x0020;
-pub const LVNI_VISIBLEONLY: ::LPARAM = 0x0040;
-pub const LVNI_SAMEGROUPONLY: ::LPARAM = 0x0080;
-pub const LVNI_ABOVE: ::LPARAM = 0x0100;
-pub const LVNI_BELOW: ::LPARAM = 0x0200;
-pub const LVNI_TOLEFT: ::LPARAM = 0x0400;
-pub const LVNI_TORIGHT: ::LPARAM = 0x0800;
-pub const LVNI_DIRECTIONMASK: ::LPARAM = LVNI_ABOVE | LVNI_BELOW | LVNI_TOLEFT | LVNI_TORIGHT;
-pub const LVFI_PARAM: ::UINT = 0x0001;
-pub const LVFI_STRING: ::UINT = 0x0002;
-pub const LVFI_SUBSTRING: ::UINT = 0x0004;
-pub const LVFI_PARTIAL: ::UINT = 0x0008;
-pub const LVFI_WRAP: ::UINT = 0x0020;
-pub const LVFI_NEARESTXY: ::UINT = 0x0040;
-pub type LV_FINDINFOA = LVFINDINFOA;
-pub type LV_FINDINFOW = LVFINDINFOW;
-STRUCT!{struct LVFINDINFOA {
-    flags: ::UINT,
-    psz: ::LPCSTR,
-    lParam: ::LPARAM,
-    pt: ::POINT,
-    vkDirection: ::UINT,
-}}
-pub type LPLVFINDINFOA = *mut LVFINDINFOA;
-STRUCT!{struct LVFINDINFOW {
-    flags: ::UINT,
-    psz: ::LPCWSTR,
-    lParam: ::LPARAM,
-    pt: ::POINT,
-    vkDirection: ::UINT,
-}}
-pub type LPLVFINDINFOW = *mut LVFINDINFOW;
-pub const LVM_FINDITEMA: ::UINT = LVM_FIRST + 13;
-pub const LVM_FINDITEMW: ::UINT = LVM_FIRST + 83;
-pub const LVIR_BOUNDS: ::c_int = 0;
-pub const LVIR_ICON: ::c_int = 1;
-pub const LVIR_LABEL: ::c_int = 2;
-pub const LVIR_SELECTBOUNDS: ::c_int = 3;
-pub const LVM_GETITEMRECT: ::UINT = LVM_FIRST + 14;
-pub const LVM_SETITEMPOSITION: ::UINT = LVM_FIRST + 15;
-pub const LVM_GETITEMPOSITION: ::UINT = LVM_FIRST + 16;
-pub const LVM_GETSTRINGWIDTHA: ::UINT = LVM_FIRST + 17;
-pub const LVM_GETSTRINGWIDTHW: ::UINT = LVM_FIRST + 87;
-pub const LVHT_NOWHERE: ::UINT = 0x00000001;
-pub const LVHT_ONITEMICON: ::UINT = 0x00000002;
-pub const LVHT_ONITEMLABEL: ::UINT = 0x00000004;
-pub const LVHT_ONITEMSTATEICON: ::UINT = 0x00000008;
-pub const LVHT_ONITEM: ::UINT = LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON;
-pub const LVHT_ABOVE: ::UINT = 0x00000008;
-pub const LVHT_BELOW: ::UINT = 0x00000010;
-pub const LVHT_TORIGHT: ::UINT = 0x00000020;
-pub const LVHT_TOLEFT: ::UINT = 0x00000040;
-pub const LVHT_EX_GROUP_HEADER: ::UINT = 0x10000000;
-pub const LVHT_EX_GROUP_FOOTER: ::UINT = 0x20000000;
-pub const LVHT_EX_GROUP_COLLAPSE: ::UINT = 0x40000000;
-pub const LVHT_EX_GROUP_BACKGROUND: ::UINT = 0x80000000;
-pub const LVHT_EX_GROUP_STATEICON: ::UINT = 0x01000000;
-pub const LVHT_EX_GROUP_SUBSETLINK: ::UINT = 0x02000000;
-pub const LVHT_EX_GROUP: ::UINT = LVHT_EX_GROUP_BACKGROUND | LVHT_EX_GROUP_COLLAPSE
-    | LVHT_EX_GROUP_FOOTER | LVHT_EX_GROUP_HEADER | LVHT_EX_GROUP_STATEICON
-    | LVHT_EX_GROUP_SUBSETLINK;
-pub const LVHT_EX_ONCONTENTS: ::UINT = 0x04000000;
-pub const LVHT_EX_FOOTER: ::UINT = 0x08000000;
-pub type LV_HITTESTINFO = LVHITTESTINFO;
-STRUCT!{struct LVHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    iGroup: ::c_int,
-}}
-pub type LPLVHITTESTINFO = *mut LVHITTESTINFO;
-pub const LVM_HITTEST: ::UINT = LVM_FIRST + 18;
-pub const LVM_ENSUREVISIBLE: ::UINT = LVM_FIRST + 19;
-pub const LVM_SCROLL: ::UINT = LVM_FIRST + 20;
-pub const LVM_REDRAWITEMS: ::UINT = LVM_FIRST + 21;
-pub const LVA_DEFAULT: ::WPARAM = 0x0000;
-pub const LVA_ALIGNLEFT: ::WPARAM = 0x0001;
-pub const LVA_ALIGNTOP: ::WPARAM = 0x0002;
-pub const LVA_SNAPTOGRID: ::WPARAM = 0x0005;
-pub const LVM_ARRANGE: ::UINT = LVM_FIRST + 22;
-pub const LVM_EDITLABELA: ::UINT = LVM_FIRST + 23;
-pub const LVM_EDITLABELW: ::UINT = LVM_FIRST + 118;
-pub const LVM_GETEDITCONTROL: ::UINT = LVM_FIRST + 24;
-pub type LV_COLUMNA = LVCOLUMNA;
-pub type LV_COLUMNW = LVCOLUMNW;
-STRUCT!{struct LVCOLUMNA {
-    mask: ::UINT,
-    fmt: ::c_int,
-    cx: ::c_int,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iSubItem: ::c_int,
-    iImage: ::c_int,
-    iOrder: ::c_int,
-    cxMin: ::c_int,
-    cxDefault: ::c_int,
-    cxIdeal: ::c_int,
-}}
-pub type LPLVCOLUMNA = *mut LVCOLUMNA;
-STRUCT!{struct LVCOLUMNW {
-    mask: ::UINT,
-    fmt: ::c_int,
-    cx: ::c_int,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iSubItem: ::c_int,
-    iImage: ::c_int,
-    iOrder: ::c_int,
-    cxMin: ::c_int,
-    cxDefault: ::c_int,
-    cxIdeal: ::c_int,
-}}
-pub type LPLVCOLUMNW = *mut LVCOLUMNW;
-pub const LVCF_FMT: ::UINT = 0x0001;
-pub const LVCF_WIDTH: ::UINT = 0x0002;
-pub const LVCF_TEXT: ::UINT = 0x0004;
-pub const LVCF_SUBITEM: ::UINT = 0x0008;
-pub const LVCF_IMAGE: ::UINT = 0x0010;
-pub const LVCF_ORDER: ::UINT = 0x0020;
-pub const LVCF_MINWIDTH: ::UINT = 0x0040;
-pub const LVCF_DEFAULTWIDTH: ::UINT = 0x0080;
-pub const LVCF_IDEALWIDTH: ::UINT = 0x0100;
-pub const LVCFMT_LEFT: ::c_int = 0x0000;
-pub const LVCFMT_RIGHT: ::c_int = 0x0001;
-pub const LVCFMT_CENTER: ::c_int = 0x0002;
-pub const LVCFMT_JUSTIFYMASK: ::c_int = 0x0003;
-pub const LVCFMT_IMAGE: ::c_int = 0x0800;
-pub const LVCFMT_BITMAP_ON_RIGHT: ::c_int = 0x1000;
-pub const LVCFMT_COL_HAS_IMAGES: ::c_int = 0x8000;
-pub const LVCFMT_FIXED_WIDTH: ::c_int = 0x00100;
-pub const LVCFMT_NO_DPI_SCALE: ::c_int = 0x40000;
-pub const LVCFMT_FIXED_RATIO: ::c_int = 0x80000;
-pub const LVCFMT_LINE_BREAK: ::c_int = 0x100000;
-pub const LVCFMT_FILL: ::c_int = 0x200000;
-pub const LVCFMT_WRAP: ::c_int = 0x400000;
-pub const LVCFMT_NO_TITLE: ::c_int = 0x800000;
-pub const LVCFMT_TILE_PLACEMENTMASK: ::c_int = LVCFMT_LINE_BREAK | LVCFMT_FILL;
-pub const LVCFMT_SPLITBUTTON: ::c_int = 0x1000000;
-pub const LVM_GETCOLUMNA: ::UINT = LVM_FIRST + 25;
-pub const LVM_GETCOLUMNW: ::UINT = LVM_FIRST + 95;
-pub const LVM_SETCOLUMNA: ::UINT = LVM_FIRST + 26;
-pub const LVM_SETCOLUMNW: ::UINT = LVM_FIRST + 96;
-pub const LVM_INSERTCOLUMNA: ::UINT = LVM_FIRST + 27;
-pub const LVM_INSERTCOLUMNW: ::UINT = LVM_FIRST + 97;
-pub const LVM_DELETECOLUMN: ::UINT = LVM_FIRST + 28;
-pub const LVM_GETCOLUMNWIDTH: ::UINT = LVM_FIRST + 29;
-pub const LVM_SETCOLUMNWIDTH: ::UINT = LVM_FIRST + 30;
-pub const LVM_GETHEADER: ::UINT = LVM_FIRST + 31;
-pub const LVM_CREATEDRAGIMAGE: ::UINT = LVM_FIRST + 33;
-pub const LVM_GETVIEWRECT: ::UINT = LVM_FIRST + 34;
-pub const LVM_GETTEXTCOLOR: ::UINT = LVM_FIRST + 35;
-pub const LVM_SETTEXTCOLOR: ::UINT = LVM_FIRST + 36;
-pub const LVM_GETTEXTBKCOLOR: ::UINT = LVM_FIRST + 37;
-pub const LVM_SETTEXTBKCOLOR: ::UINT = LVM_FIRST + 38;
-pub const LVM_GETTOPINDEX: ::UINT = LVM_FIRST + 39;
-pub const LVM_GETCOUNTPERPAGE: ::UINT = LVM_FIRST + 40;
-pub const LVM_GETORIGIN: ::UINT = LVM_FIRST + 41;
-pub const LVM_UPDATE: ::UINT = LVM_FIRST + 42;
-pub const LVM_SETITEMSTATE: ::UINT = LVM_FIRST + 43;
-pub const LVM_GETITEMSTATE: ::UINT = LVM_FIRST + 44;
-pub const LVM_GETITEMTEXTA: ::UINT = LVM_FIRST + 45;
-pub const LVM_GETITEMTEXTW: ::UINT = LVM_FIRST + 115;
-pub const LVM_SETITEMTEXTA: ::UINT = LVM_FIRST + 46;
-pub const LVM_SETITEMTEXTW: ::UINT = LVM_FIRST + 116;
-pub const LVM_SETITEMCOUNT: ::UINT = LVM_FIRST + 47;
-pub const LVM_SORTITEMS: ::UINT = LVM_FIRST + 48;
-pub const LVM_SETITEMPOSITION32: ::UINT = LVM_FIRST + 49;
-pub const LVM_GETSELECTEDCOUNT: ::UINT = LVM_FIRST + 50;
-pub const LVM_GETITEMSPACING: ::UINT = LVM_FIRST + 51;
-pub const LVM_GETISEARCHSTRINGA: ::UINT = LVM_FIRST + 52;
-pub const LVM_GETISEARCHSTRINGW: ::UINT = LVM_FIRST + 117;
-pub const LVM_SETICONSPACING: ::UINT = LVM_FIRST + 53;
-pub const LVM_SETEXTENDEDLISTVIEWSTYLE: ::UINT = LVM_FIRST + 54;
-pub const LVM_GETEXTENDEDLISTVIEWSTYLE: ::UINT = LVM_FIRST + 55;
-pub const LVSICF_NOINVALIDATEALL: ::LPARAM = 0x00000001;
-pub const LVSICF_NOSCROLL: ::LPARAM = 0x00000002;
-pub const LVS_EX_GRIDLINES: ::DWORD = 0x00000001;
-pub const LVS_EX_SUBITEMIMAGES: ::DWORD = 0x00000002;
-pub const LVS_EX_CHECKBOXES: ::DWORD = 0x00000004;
-pub const LVS_EX_TRACKSELECT: ::DWORD = 0x00000008;
-pub const LVS_EX_HEADERDRAGDROP: ::DWORD = 0x00000010;
-pub const LVS_EX_FULLROWSELECT: ::DWORD = 0x00000020;
-pub const LVS_EX_ONECLICKACTIVATE: ::DWORD = 0x00000040;
-pub const LVS_EX_TWOCLICKACTIVATE: ::DWORD = 0x00000080;
-pub const LVS_EX_FLATSB: ::DWORD = 0x00000100;
-pub const LVS_EX_REGIONAL: ::DWORD = 0x00000200;
-pub const LVS_EX_INFOTIP: ::DWORD = 0x00000400;
-pub const LVS_EX_UNDERLINEHOT: ::DWORD = 0x00000800;
-pub const LVS_EX_UNDERLINECOLD: ::DWORD = 0x00001000;
-pub const LVS_EX_MULTIWORKAREAS: ::DWORD = 0x00002000;
-pub const LVS_EX_LABELTIP: ::DWORD = 0x00004000;
-pub const LVS_EX_BORDERSELECT: ::DWORD = 0x00008000;
-pub const LVS_EX_DOUBLEBUFFER: ::DWORD = 0x00010000;
-pub const LVS_EX_HIDELABELS: ::DWORD = 0x00020000;
-pub const LVS_EX_SINGLEROW: ::DWORD = 0x00040000;
-pub const LVS_EX_SNAPTOGRID: ::DWORD = 0x00080000;
-pub const LVS_EX_SIMPLESELECT: ::DWORD = 0x00100000;
-pub const LVS_EX_JUSTIFYCOLUMNS: ::DWORD = 0x00200000;
-pub const LVS_EX_TRANSPARENTBKGND: ::DWORD = 0x00400000;
-pub const LVS_EX_TRANSPARENTSHADOWTEXT: ::DWORD = 0x00800000;
-pub const LVS_EX_AUTOAUTOARRANGE: ::DWORD = 0x01000000;
-pub const LVS_EX_HEADERINALLVIEWS: ::DWORD = 0x02000000;
-pub const LVS_EX_AUTOCHECKSELECT: ::DWORD = 0x08000000;
-pub const LVS_EX_AUTOSIZECOLUMNS: ::DWORD = 0x10000000;
-pub const LVS_EX_COLUMNSNAPPOINTS: ::DWORD = 0x40000000;
-pub const LVS_EX_COLUMNOVERFLOW: ::DWORD = 0x80000000;
-pub const LVM_GETSUBITEMRECT: ::UINT = LVM_FIRST + 56;
-pub const LVM_SUBITEMHITTEST: ::UINT = LVM_FIRST + 57;
-pub const LVM_SETCOLUMNORDERARRAY: ::UINT = LVM_FIRST + 58;
-pub const LVM_GETCOLUMNORDERARRAY: ::UINT = LVM_FIRST + 59;
-pub const LVM_SETHOTITEM: ::UINT = LVM_FIRST + 60;
-pub const LVM_GETHOTITEM: ::UINT = LVM_FIRST + 61;
-pub const LVM_SETHOTCURSOR: ::UINT = LVM_FIRST + 62;
-pub const LVM_GETHOTCURSOR: ::UINT = LVM_FIRST + 63;
-pub const LVM_APPROXIMATEVIEWRECT: ::UINT = LVM_FIRST + 64;
-pub const LV_MAX_WORKAREAS: ::WPARAM = 16;
-pub const LVM_SETWORKAREAS: ::UINT = LVM_FIRST + 65;
-pub const LVM_GETWORKAREAS: ::UINT = LVM_FIRST + 70;
-pub const LVM_GETNUMBEROFWORKAREAS: ::UINT = LVM_FIRST + 73;
-pub const LVM_GETSELECTIONMARK: ::UINT = LVM_FIRST + 66;
-pub const LVM_SETSELECTIONMARK: ::UINT = LVM_FIRST + 67;
-pub const LVM_SETHOVERTIME: ::UINT = LVM_FIRST + 71;
-pub const LVM_GETHOVERTIME: ::UINT = LVM_FIRST + 72;
-pub const LVM_SETTOOLTIPS: ::UINT = LVM_FIRST + 74;
-pub const LVM_GETTOOLTIPS: ::UINT = LVM_FIRST + 78;
-pub const LVM_SORTITEMSEX: ::UINT = LVM_FIRST + 81;
-STRUCT!{struct LVBKIMAGEA {
-    ulFlags: ::ULONG,
-    hbm: ::HBITMAP,
-    pszImage: ::LPSTR,
-    cchImageMax: ::UINT,
-    xOffsetPercent: ::c_int,
-    yOffsetPercent: ::c_int,
-}}
-pub type LPLVBKIMAGEA = *mut LVBKIMAGEA;
-STRUCT!{struct LVBKIMAGEW {
-    ulFlags: ::ULONG,
-    hbm: ::HBITMAP,
-    pszImage: ::LPWSTR,
-    cchImageMax: ::UINT,
-    xOffsetPercent: ::c_int,
-    yOffsetPercent: ::c_int,
-}}
-pub type LPLVBKIMAGEW = *mut LVBKIMAGEW;
-pub const LVBKIF_SOURCE_NONE: ::ULONG = 0x00000000;
-pub const LVBKIF_SOURCE_HBITMAP: ::ULONG = 0x00000001;
-pub const LVBKIF_SOURCE_URL: ::ULONG = 0x00000002;
-pub const LVBKIF_SOURCE_MASK: ::ULONG = 0x00000003;
-pub const LVBKIF_STYLE_NORMAL: ::ULONG = 0x00000000;
-pub const LVBKIF_STYLE_TILE: ::ULONG = 0x00000010;
-pub const LVBKIF_STYLE_MASK: ::ULONG = 0x00000010;
-pub const LVBKIF_FLAG_TILEOFFSET: ::ULONG = 0x00000100;
-pub const LVBKIF_TYPE_WATERMARK: ::ULONG = 0x10000000;
-pub const LVBKIF_FLAG_ALPHABLEND: ::ULONG = 0x20000000;
-pub const LVM_SETBKIMAGEA: ::UINT = LVM_FIRST + 68;
-pub const LVM_SETBKIMAGEW: ::UINT = LVM_FIRST + 138;
-pub const LVM_GETBKIMAGEA: ::UINT = LVM_FIRST + 69;
-pub const LVM_GETBKIMAGEW: ::UINT = LVM_FIRST + 139;
-pub const LVM_SETSELECTEDCOLUMN: ::UINT = LVM_FIRST + 140;
-pub const LV_VIEW_ICON: ::DWORD = 0x0000;
-pub const LV_VIEW_DETAILS: ::DWORD = 0x0001;
-pub const LV_VIEW_SMALLICON: ::DWORD = 0x0002;
-pub const LV_VIEW_LIST: ::DWORD = 0x0003;
-pub const LV_VIEW_TILE: ::DWORD = 0x0004;
-pub const LV_VIEW_MAX: ::DWORD = 0x0004;
-pub const LVM_SETVIEW: ::UINT = LVM_FIRST + 142;
-pub const LVM_GETVIEW: ::UINT = LVM_FIRST + 143;
-pub const LVGF_NONE: ::UINT = 0x00000000;
-pub const LVGF_HEADER: ::UINT = 0x00000001;
-pub const LVGF_FOOTER: ::UINT = 0x00000002;
-pub const LVGF_STATE: ::UINT = 0x00000004;
-pub const LVGF_ALIGN: ::UINT = 0x00000008;
-pub const LVGF_GROUPID: ::UINT = 0x00000010;
-pub const LVGF_SUBTITLE: ::UINT = 0x00000100;
-pub const LVGF_TASK: ::UINT = 0x00000200;
-pub const LVGF_DESCRIPTIONTOP: ::UINT = 0x00000400;
-pub const LVGF_DESCRIPTIONBOTTOM: ::UINT = 0x00000800;
-pub const LVGF_TITLEIMAGE: ::UINT = 0x00001000;
-pub const LVGF_EXTENDEDIMAGE: ::UINT = 0x00002000;
-pub const LVGF_ITEMS: ::UINT = 0x00004000;
-pub const LVGF_SUBSET: ::UINT = 0x00008000;
-pub const LVGF_SUBSETITEMS: ::UINT = 0x00010000;
-pub const LVGS_NORMAL: ::UINT = 0x00000000;
-pub const LVGS_COLLAPSED: ::UINT = 0x00000001;
-pub const LVGS_HIDDEN: ::UINT = 0x00000002;
-pub const LVGS_NOHEADER: ::UINT = 0x00000004;
-pub const LVGS_COLLAPSIBLE: ::UINT = 0x00000008;
-pub const LVGS_FOCUSED: ::UINT = 0x00000010;
-pub const LVGS_SELECTED: ::UINT = 0x00000020;
-pub const LVGS_SUBSETED: ::UINT = 0x00000040;
-pub const LVGS_SUBSETLINKFOCUSED: ::UINT = 0x00000080;
-pub const LVGA_HEADER_LEFT: ::UINT = 0x00000001;
-pub const LVGA_HEADER_CENTER: ::UINT = 0x00000002;
-pub const LVGA_HEADER_RIGHT: ::UINT = 0x00000004;
-pub const LVGA_FOOTER_LEFT: ::UINT = 0x00000008;
-pub const LVGA_FOOTER_CENTER: ::UINT = 0x00000010;
-pub const LVGA_FOOTER_RIGHT: ::UINT = 0x00000020;
-STRUCT!{struct LVGROUP {
-    cbSize: ::UINT,
-    mask: ::UINT,
-    pszHeader: ::LPWSTR,
-    cchHeader: ::c_int,
-    pszFooter: ::LPWSTR,
-    cchFooter: ::c_int,
-    iGroupId: ::c_int,
-    stateMask: ::UINT,
-    state: ::UINT,
-    uAlign: ::UINT,
-    pszSubtitle: ::LPWSTR,
-    cchSubtitle: ::UINT,
-    pszTask: ::LPWSTR,
-    cchTask: ::UINT,
-    pszDescriptionTop: ::LPWSTR,
-    cchDescriptionTop: ::UINT,
-    pszDescriptionBottom: ::LPWSTR,
-    cchDescriptionBottom: ::UINT,
-    iTitleImage: ::c_int,
-    iExtendedImage: ::c_int,
-    iFirstItem: ::c_int,
-    cItems: ::UINT,
-    pszSubsetTitle: ::LPWSTR,
-    cchSubsetTitle: ::UINT,
-}}
-pub type PLVGROUP = *mut LVGROUP;
-pub const LVM_INSERTGROUP: ::UINT = LVM_FIRST + 145;
-pub const LVM_SETGROUPINFO: ::UINT = LVM_FIRST + 147;
-pub const LVM_GETGROUPINFO: ::UINT = LVM_FIRST + 149;
-pub const LVM_REMOVEGROUP: ::UINT = LVM_FIRST + 150;
-pub const LVM_MOVEGROUP: ::UINT = LVM_FIRST + 151;
-pub const LVM_GETGROUPCOUNT: ::UINT = LVM_FIRST + 152;
-pub const LVM_GETGROUPINFOBYINDEX: ::UINT = LVM_FIRST + 153;
-pub const LVM_MOVEITEMTOGROUP: ::UINT = LVM_FIRST + 154;
-pub const LVM_GETGROUPRECT: ::UINT = LVM_FIRST + 98;
-pub const LVGGR_GROUP: ::LPARAM = 0;
-pub const LVGGR_HEADER: ::LPARAM = 1;
-pub const LVGGR_LABEL: ::LPARAM = 2;
-pub const LVGGR_SUBSETLINK: ::LPARAM = 3;
-pub const LVGMF_NONE: ::UINT = 0x00000000;
-pub const LVGMF_BORDERSIZE: ::UINT = 0x00000001;
-pub const LVGMF_BORDERCOLOR: ::UINT = 0x00000002;
-pub const LVGMF_TEXTCOLOR: ::UINT = 0x00000004;
-STRUCT!{struct LVGROUPMETRICS {
-    cbSize: ::UINT,
-    mask: ::UINT,
-    Left: ::UINT,
-    Top: ::UINT,
-    Right: ::UINT,
-    Bottom: ::UINT,
-    crLeft: ::COLORREF,
-    crTop: ::COLORREF,
-    crRight: ::COLORREF,
-    crBottom: ::COLORREF,
-    crHeader: ::COLORREF,
-    crFooter: ::COLORREF,
-}}
-pub type PLVGROUPMETRICS = *mut LVGROUPMETRICS;
-pub const LVM_SETGROUPMETRICS: ::UINT = LVM_FIRST + 155;
-pub const LVM_GETGROUPMETRICS: ::UINT = LVM_FIRST + 156;
-pub const LVM_ENABLEGROUPVIEW: ::UINT = LVM_FIRST + 157;
-pub const LVM_SORTGROUPS: ::UINT = LVM_FIRST + 158;
-pub type PFNLVGROUPCOMPARE = Option<unsafe extern "system" fn(
-    ::c_int, ::c_int, *mut ::c_void,
-) -> ::c_int>;
-STRUCT!{nodebug struct LVINSERTGROUPSORTED {
-    pfnGroupCompare: PFNLVGROUPCOMPARE,
-    pvData: *mut ::c_void,
-    lvGroup: LVGROUP,
-}}
-pub type PLVINSERTGROUPSORTED = *mut LVINSERTGROUPSORTED;
-pub const LVM_INSERTGROUPSORTED: ::UINT = LVM_FIRST + 159;
-pub const LVM_REMOVEALLGROUPS: ::UINT = LVM_FIRST + 160;
-pub const LVM_HASGROUP: ::UINT = LVM_FIRST + 161;
-pub const LVM_GETGROUPSTATE: ::UINT = LVM_FIRST + 92;
-pub const LVM_GETFOCUSEDGROUP: ::UINT = LVM_FIRST + 93;
-pub const LVTVIF_AUTOSIZE: ::DWORD = 0x00000000;
-pub const LVTVIF_FIXEDWIDTH: ::DWORD = 0x00000001;
-pub const LVTVIF_FIXEDHEIGHT: ::DWORD = 0x00000002;
-pub const LVTVIF_FIXEDSIZE: ::DWORD = 0x00000003;
-pub const LVTVIF_EXTENDED: ::DWORD = 0x00000004;
-pub const LVTVIM_TILESIZE: ::DWORD = 0x00000001;
-pub const LVTVIM_COLUMNS: ::DWORD = 0x00000002;
-pub const LVTVIM_LABELMARGIN: ::DWORD = 0x00000004;
-STRUCT!{struct LVTILEVIEWINFO {
-    cbSize: ::UINT,
-    dwMask: ::DWORD,
-    dwFlags: ::DWORD,
-    sizeTile: ::SIZE,
-    cLines: ::c_int,
-    rcLabelMargin: ::RECT,
-}}
-pub type PLVTILEVIEWINFO = *mut LVTILEVIEWINFO;
-STRUCT!{struct LVTILEINFO {
-    cbSize: ::UINT,
-    iItem: ::c_int,
-    cColumns: ::UINT,
-    puColumns: ::PUINT,
-    piColFmt: *mut ::c_int,
-}}
-pub type PLVTILEINFO = *mut LVTILEINFO;
-pub const LVM_SETTILEVIEWINFO: ::UINT = LVM_FIRST + 162;
-pub const LVM_GETTILEVIEWINFO: ::UINT = LVM_FIRST + 163;
-pub const LVM_SETTILEINFO: ::UINT = LVM_FIRST + 164;
-pub const LVM_GETTILEINFO: ::UINT = LVM_FIRST + 165;
-STRUCT!{struct LVINSERTMARK {
-    cbSize: ::UINT,
-    dwFlags: ::DWORD,
-    iItem: ::c_int,
-    dwReserved: ::DWORD,
-}}
-pub type LPLVINSERTMARK = *mut LVINSERTMARK;
-pub const LVIM_AFTER: ::DWORD = 0x00000001;
-pub const LVM_SETINSERTMARK: ::UINT = LVM_FIRST + 166;
-pub const LVM_GETINSERTMARK: ::UINT = LVM_FIRST + 167;
-pub const LVM_INSERTMARKHITTEST: ::UINT = LVM_FIRST + 168;
-pub const LVM_GETINSERTMARKRECT: ::UINT = LVM_FIRST + 169;
-pub const LVM_SETINSERTMARKCOLOR: ::UINT = LVM_FIRST + 170;
-pub const LVM_GETINSERTMARKCOLOR: ::UINT = LVM_FIRST + 171;
-STRUCT!{struct LVSETINFOTIP {
-    cbSize: ::UINT,
-    dwFlags: ::DWORD,
-    pszText: ::LPWSTR,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-}}
-pub type PLVSETINFOTIP = *mut LVSETINFOTIP;
-pub const  LVM_SETINFOTIP: ::UINT = LVM_FIRST + 173;
-pub const LVM_GETSELECTEDCOLUMN: ::UINT = LVM_FIRST + 174;
-pub const LVM_ISGROUPVIEWENABLED: ::UINT = LVM_FIRST + 175;
-pub const LVM_GETOUTLINECOLOR: ::UINT = LVM_FIRST + 176;
-pub const LVM_SETOUTLINECOLOR: ::UINT = LVM_FIRST + 177;
-pub const LVM_CANCELEDITLABEL: ::UINT = LVM_FIRST + 179;
-pub const LVM_MAPINDEXTOID: ::UINT = LVM_FIRST + 180;
-pub const LVM_MAPIDTOINDEX: ::UINT = LVM_FIRST + 181;
-pub const LVM_ISITEMVISIBLE: ::UINT = LVM_FIRST + 182;
-pub const LVM_GETEMPTYTEXT: ::UINT = LVM_FIRST + 204;
-pub const LVM_GETFOOTERRECT: ::UINT = LVM_FIRST + 205;
-pub const LVFF_ITEMCOUNT: ::UINT = 0x00000001;
-STRUCT!{struct LVFOOTERINFO {
-    mask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    cItems: ::UINT,
-}}
-pub type LPLVFOOTERINFO = *mut LVFOOTERINFO;
-pub const LVM_GETFOOTERINFO: ::UINT = LVM_FIRST + 206;
-pub const LVM_GETFOOTERITEMRECT: ::UINT = LVM_FIRST + 207;
-pub const LVFIF_TEXT: ::UINT = 0x00000001;
-pub const LVFIF_STATE: ::UINT = 0x00000002;
-pub const LVFIS_FOCUSED: ::UINT = 0x0001;
-STRUCT!{struct LVFOOTERITEM {
-    mask: ::UINT,
-    iItem: ::c_int,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    state: ::UINT,
-    stateMask: ::UINT,
-}}
-pub type LPLVFOOTERITEM = *mut LVFOOTERITEM;
-pub const LVM_GETFOOTERITEM: ::UINT = LVM_FIRST + 208;
-STRUCT!{struct LVITEMINDEX {
-    iItem: ::c_int,
-    iGroup: ::c_int,
-}}
-pub type PLVITEMINDEX = *mut LVITEMINDEX;
-pub const LVM_GETITEMINDEXRECT: ::UINT = LVM_FIRST + 209;
-pub const LVM_SETITEMINDEXSTATE: ::UINT = LVM_FIRST + 210;
-pub const LVM_GETNEXTITEMINDEX: ::UINT = LVM_FIRST + 211;
-pub type LPNM_LISTVIEW = LPNMLISTVIEW;
-pub type NM_LISTVIEW = NMLISTVIEW;
-STRUCT!{struct NMLISTVIEW {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    uNewState: ::UINT,
-    uOldState: ::UINT,
-    uChanged: ::UINT,
-    ptAction: ::POINT,
-    lParam: ::LPARAM,
-}}
-pub type LPNMLISTVIEW = *mut NMLISTVIEW;
-STRUCT!{struct NMITEMACTIVATE {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    uNewState: ::UINT,
-    uOldState: ::UINT,
-    uChanged: ::UINT,
-    ptAction: ::POINT,
-    lParam: ::LPARAM,
-    uKeyFlags: ::UINT,
-}}
-pub type LPNMITEMACTIVATE = *mut NMITEMACTIVATE;
-pub const LVKF_ALT: ::UINT = 0x0001;
-pub const LVKF_CONTROL: ::UINT = 0x0002;
-pub const LVKF_SHIFT: ::UINT = 0x0004;
-STRUCT!{struct NMLVCUSTOMDRAW {
-    nmcd: NMCUSTOMDRAW,
-    clrText: ::COLORREF,
-    clrTextBk: ::COLORREF,
-    iSubItem: ::c_int,
-    dwItemType: ::DWORD,
-    clrFace: ::COLORREF,
-    iIconEffect: ::c_int,
-    iIconPhase: ::c_int,
-    iPartId: ::c_int,
-    iStateId: ::c_int,
-    rcText: ::RECT,
-    uAlign: ::UINT,
-}}
-pub type LPNMLVCUSTOMDRAW = *mut NMLVCUSTOMDRAW;
-pub const LVCDI_ITEM: ::DWORD = 0x00000000;
-pub const LVCDI_GROUP: ::DWORD = 0x00000001;
-pub const LVCDI_ITEMSLIST: ::DWORD = 0x00000002;
-pub const LVCDRF_NOSELECT: ::LRESULT = 0x00010000;
-pub const LVCDRF_NOGROUPFRAME: ::LRESULT = 0x00020000;
-STRUCT!{struct NMLVCACHEHINT {
-    hdr: ::NMHDR,
-    iFrom: ::c_int,
-    iTo: ::c_int,
-}}
-pub type LPNMLVCACHEHINT = *mut NMLVCACHEHINT;
-pub type LPNM_CACHEHINT = LPNMLVCACHEHINT;
-pub type PNM_CACHEHINT = LPNMLVCACHEHINT;
-pub type NM_CACHEHINT = NMLVCACHEHINT;
-STRUCT!{struct NMLVFINDITEMA {
-    hdr: ::NMHDR,
-    iStart: ::c_int,
-    lvfi: LVFINDINFOA,
-}}
-pub type LPNMLVFINDITEMA = *mut NMLVFINDITEMA;
-STRUCT!{struct NMLVFINDITEMW {
-    hdr: ::NMHDR,
-    iStart: ::c_int,
-    lvfi: LVFINDINFOW,
-}}
-pub type LPNMLVFINDITEMW = *mut NMLVFINDITEMW;
-pub type PNM_FINDITEMA = LPNMLVFINDITEMA;
-pub type LPNM_FINDITEMA = LPNMLVFINDITEMA;
-pub type NM_FINDITEMA = NMLVFINDITEMA;
-pub type PNM_FINDITEMW = LPNMLVFINDITEMW;
-pub type LPNM_FINDITEMW = LPNMLVFINDITEMW;
-pub type NM_FINDITEMW = NMLVFINDITEMW;
-STRUCT!{struct NMLVODSTATECHANGE {
-    hdr: ::NMHDR,
-    iFrom: ::c_int,
-    iTo: ::c_int,
-    uNewState: ::UINT,
-    uOldState: ::UINT,
-}}
-pub type LPNMLVODSTATECHANGE = *mut NMLVODSTATECHANGE;
-pub type PNM_ODSTATECHANGE = LPNMLVODSTATECHANGE;
-pub type LPNM_ODSTATECHANGE = LPNMLVODSTATECHANGE;
-pub type NM_ODSTATECHANGE = NMLVODSTATECHANGE;
-pub const LVN_ITEMCHANGING: ::UINT = LVN_FIRST - 0;
-pub const LVN_ITEMCHANGED: ::UINT = LVN_FIRST - 1;
-pub const LVN_INSERTITEM: ::UINT = LVN_FIRST - 2;
-pub const LVN_DELETEITEM: ::UINT = LVN_FIRST - 3;
-pub const LVN_DELETEALLITEMS: ::UINT = LVN_FIRST - 4;
-pub const LVN_BEGINLABELEDITA: ::UINT = LVN_FIRST - 5;
-pub const LVN_BEGINLABELEDITW: ::UINT = LVN_FIRST - 75;
-pub const LVN_ENDLABELEDITA: ::UINT = LVN_FIRST - 6;
-pub const LVN_ENDLABELEDITW: ::UINT = LVN_FIRST - 76;
-pub const LVN_COLUMNCLICK: ::UINT = LVN_FIRST - 8;
-pub const LVN_BEGINDRAG: ::UINT = LVN_FIRST - 9;
-pub const LVN_BEGINRDRAG: ::UINT = LVN_FIRST - 11;
-pub const LVN_ODCACHEHINT: ::UINT = LVN_FIRST - 13;
-pub const LVN_ODFINDITEMA: ::UINT = LVN_FIRST - 52;
-pub const LVN_ODFINDITEMW: ::UINT = LVN_FIRST - 79;
-pub const LVN_ITEMACTIVATE: ::UINT = LVN_FIRST - 14;
-pub const LVN_ODSTATECHANGED: ::UINT = LVN_FIRST - 15;
-pub const LVN_HOTTRACK: ::UINT = LVN_FIRST - 21;
-pub const LVN_GETDISPINFOA: ::UINT = LVN_FIRST - 50;
-pub const LVN_GETDISPINFOW: ::UINT = LVN_FIRST - 77;
-pub const LVN_SETDISPINFOA: ::UINT = LVN_FIRST - 51;
-pub const LVN_SETDISPINFOW: ::UINT = LVN_FIRST - 78;
-pub const LVIF_DI_SETITEM: ::UINT = 0x1000;
-pub type LV_DISPINFOA = NMLVDISPINFOA;
-pub type LV_DISPINFOW = NMLVDISPINFOW;
-STRUCT!{struct NMLVDISPINFOA {
-    hdr: ::NMHDR,
-    item: LVITEMA,
-}}
-pub type LPNMLVDISPINFOA = *mut NMLVDISPINFOA;
-STRUCT!{struct NMLVDISPINFOW {
-    hdr: ::NMHDR,
-    item: LVITEMW,
-}}
-pub type LPNMLVDISPINFOW = *mut NMLVDISPINFOW;
-pub const LVN_KEYDOWN: ::UINT = LVN_FIRST - 55;
-pub type LV_KEYDOWN = NMLVKEYDOWN;
-STRUCT!{struct NMLVKEYDOWN {
-    hdr: ::NMHDR,
-    wVKey: ::WORD,
-    flags: ::UINT,
-}}
-pub type LPNMLVKEYDOWN = *mut NMLVKEYDOWN;
-pub const LVN_MARQUEEBEGIN: ::UINT = LVN_FIRST - 56;
-STRUCT!{nodebug struct NMLVLINK {
-    hdr: ::NMHDR,
-    link: LITEM,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-}}
-pub type PNMLVLINK = *mut NMLVLINK;
-STRUCT!{struct NMLVGETINFOTIPA {
-    hdr: ::NMHDR,
-    dwFlags: ::DWORD,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPNMLVGETINFOTIPA = *mut NMLVGETINFOTIPA;
-STRUCT!{struct NMLVGETINFOTIPW {
-    hdr: ::NMHDR,
-    dwFlags: ::DWORD,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPNMLVGETINFOTIPW = *mut NMLVGETINFOTIPW;
-pub const LVGIT_UNFOLDED: ::DWORD = 0x0001;
-pub const LVN_GETINFOTIPA: ::UINT = LVN_FIRST - 57;
-pub const LVN_GETINFOTIPW: ::UINT = LVN_FIRST - 58;
-pub const LVNSCH_DEFAULT: ::LPARAM = -1;
-pub const LVNSCH_ERROR: ::LPARAM = -2;
-pub const LVNSCH_IGNORE: ::LPARAM = -3;
-pub const LVN_INCREMENTALSEARCHA: ::UINT = LVN_FIRST - 62;
-pub const LVN_INCREMENTALSEARCHW: ::UINT = LVN_FIRST - 63;
-pub const LVN_COLUMNDROPDOWN: ::UINT = LVN_FIRST - 64;
-pub const LVN_COLUMNOVERFLOWCLICK: ::UINT = LVN_FIRST - 66;
-STRUCT!{struct NMLVSCROLL {
-    hdr: ::NMHDR,
-    dx: ::c_int,
-    dy: ::c_int,
-}}
-pub type LPNMLVSCROLL = *mut NMLVSCROLL;
-pub const LVN_BEGINSCROLL: ::UINT = LVN_FIRST - 80;
-pub const LVN_ENDSCROLL: ::UINT = LVN_FIRST - 81;
-pub const LVN_LINKCLICK: ::UINT = LVN_FIRST - 84;
-pub const EMF_CENTERED: ::DWORD = 0x00000001;
-STRUCT!{nodebug struct NMLVEMPTYMARKUP {
-    hdr: ::NMHDR,
-    dwFlags: ::DWORD,
-    szMarkup: [::WCHAR; L_MAX_URL_LENGTH],
-}}
-pub const LVN_GETEMPTYMARKUP: ::UINT = LVN_FIRST - 87;
-pub const TVS_HASBUTTONS: ::DWORD = 0x0001;
-pub const TVS_HASLINES: ::DWORD = 0x0002;
-pub const TVS_LINESATROOT: ::DWORD = 0x0004;
-pub const TVS_EDITLABELS: ::DWORD = 0x0008;
-pub const TVS_DISABLEDRAGDROP: ::DWORD = 0x0010;
-pub const TVS_SHOWSELALWAYS: ::DWORD = 0x0020;
-pub const TVS_RTLREADING: ::DWORD = 0x0040;
-pub const TVS_NOTOOLTIPS: ::DWORD = 0x0080;
-pub const TVS_CHECKBOXES: ::DWORD = 0x0100;
-pub const TVS_TRACKSELECT: ::DWORD = 0x0200;
-pub const TVS_SINGLEEXPAND: ::DWORD = 0x0400;
-pub const TVS_INFOTIP: ::DWORD = 0x0800;
-pub const TVS_FULLROWSELECT: ::DWORD = 0x1000;
-pub const TVS_NOSCROLL: ::DWORD = 0x2000;
-pub const TVS_NONEVENHEIGHT: ::DWORD = 0x4000;
-pub const TVS_NOHSCROLL: ::DWORD = 0x8000;
-pub const TVS_EX_NOSINGLECOLLAPSE: ::DWORD = 0x0001;
-pub const TVS_EX_MULTISELECT: ::DWORD = 0x0002;
-pub const TVS_EX_DOUBLEBUFFER: ::DWORD = 0x0004;
-pub const TVS_EX_NOINDENTSTATE: ::DWORD = 0x0008;
-pub const TVS_EX_RICHTOOLTIP: ::DWORD = 0x0010;
-pub const TVS_EX_AUTOHSCROLL: ::DWORD = 0x0020;
-pub const TVS_EX_FADEINOUTEXPANDOS: ::DWORD = 0x0040;
-pub const TVS_EX_PARTIALCHECKBOXES: ::DWORD = 0x0080;
-pub const TVS_EX_EXCLUSIONCHECKBOXES: ::DWORD = 0x0100;
-pub const TVS_EX_DIMMEDCHECKBOXES: ::DWORD = 0x0200;
-pub const TVS_EX_DRAWIMAGEASYNC: ::DWORD = 0x0400;
-pub enum TREEITEM {}
-pub type HTREEITEM = *mut TREEITEM;
-pub const TVIF_TEXT: ::UINT = 0x0001;
-pub const TVIF_IMAGE: ::UINT = 0x0002;
-pub const TVIF_PARAM: ::UINT = 0x0004;
-pub const TVIF_STATE: ::UINT = 0x0008;
-pub const TVIF_HANDLE: ::UINT = 0x0010;
-pub const TVIF_SELECTEDIMAGE: ::UINT = 0x0020;
-pub const TVIF_CHILDREN: ::UINT = 0x0040;
-pub const TVIF_INTEGRAL: ::UINT = 0x0080;
-pub const TVIF_STATEEX: ::UINT = 0x0100;
-pub const TVIF_EXPANDEDIMAGE: ::UINT = 0x0200;
-pub const TVIS_SELECTED: ::UINT = 0x0002;
-pub const TVIS_CUT: ::UINT = 0x0004;
-pub const TVIS_DROPHILITED: ::UINT = 0x0008;
-pub const TVIS_BOLD: ::UINT = 0x0010;
-pub const TVIS_EXPANDED: ::UINT = 0x0020;
-pub const TVIS_EXPANDEDONCE: ::UINT = 0x0040;
-pub const TVIS_EXPANDPARTIAL: ::UINT = 0x0080;
-pub const TVIS_OVERLAYMASK: ::UINT = 0x0F00;
-pub const TVIS_STATEIMAGEMASK: ::UINT = 0xF000;
-pub const TVIS_USERMASK: ::UINT = 0xF000;
-pub const TVIS_EX_FLAT: ::UINT = 0x0001;
-pub const TVIS_EX_DISABLED: ::UINT = 0x0002;
-pub const TVIS_EX_ALL: ::UINT = 0x0002;
-STRUCT!{struct NMTVSTATEIMAGECHANGING {
-    hdr: ::NMHDR,
-    hti: HTREEITEM,
-    iOldStateImageIndex: ::c_int,
-    iNewStateImageIndex: ::c_int,
-}}
-pub type LPNMTVSTATEIMAGECHANGING = *mut NMTVSTATEIMAGECHANGING;
-pub const I_CHILDRENCALLBACK: ::c_int = -1;
-pub const I_CHILDRENAUTO: ::c_int = -2;
-pub type LPTV_ITEMW = LPTVITEMW;
-pub type LPTV_ITEMA = LPTVITEMA;
-pub type TV_ITEMW = TVITEMW;
-pub type TV_ITEMA = TVITEMA;
-STRUCT!{struct TVITEMA {
-    mask: ::UINT,
-    hItem: HTREEITEM,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    cChildren: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPTVITEMA = *mut TVITEMA;
-STRUCT!{struct TVITEMW {
-    mask: ::UINT,
-    hItem: HTREEITEM,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    cChildren: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPTVITEMW = *mut TVITEMW;
-STRUCT!{struct TVITEMEXA {
-    mask: ::UINT,
-    hItem: HTREEITEM,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    cChildren: ::c_int,
-    lParam: ::LPARAM,
-    iIntegral: ::c_int,
-    uStateEx: ::UINT,
-    hwnd: ::HWND,
-    iExpandedImage: ::c_int,
-    iReserved: ::c_int,
-}}
-pub type LPTVITEMEXA = *mut TVITEMEXA;
-STRUCT!{struct TVITEMEXW {
-    mask: ::UINT,
-    hItem: HTREEITEM,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    cChildren: ::c_int,
-    lParam: ::LPARAM,
-    iIntegral: ::c_int,
-    uStateEx: ::UINT,
-    hwnd: ::HWND,
-    iExpandedImage: ::c_int,
-    iReserved: ::c_int,
-}}
-pub type LPTVITEMEXW = *mut TVITEMEXW;
-pub const TVI_ROOT: HTREEITEM = (0 - 0x10000) as HTREEITEM;
-pub const TVI_FIRST: HTREEITEM = (0 - 0x0FFFF) as HTREEITEM;
-pub const TVI_LAST: HTREEITEM = (0 - 0x0FFFE) as HTREEITEM;
-pub const TVI_SORT: HTREEITEM = (0 - 0x0FFFD) as HTREEITEM;
-pub type LPTV_INSERTSTRUCTA = LPTVINSERTSTRUCTA;
-pub type LPTV_INSERTSTRUCTW = LPTVINSERTSTRUCTW;
-pub type TV_INSERTSTRUCTA = TVINSERTSTRUCTA;
-pub type TV_INSERTSTRUCTW = TVINSERTSTRUCTW;
-STRUCT!{struct TVINSERTSTRUCTA {
-    hParent: HTREEITEM,
-    hInsertAfter: HTREEITEM,
-    itemex: TVITEMEXA,
-}}
-UNION!(TVINSERTSTRUCTA, itemex, item, item_mut, TV_ITEMA);
-pub type LPTVINSERTSTRUCTA = *mut TVINSERTSTRUCTA;
-STRUCT!{struct TVINSERTSTRUCTW {
-    hParent: HTREEITEM,
-    hInsertAfter: HTREEITEM,
-    itemex: TVITEMEXW,
-}}
-UNION!(TVINSERTSTRUCTW, itemex, item, item_mut, TV_ITEMW);
-pub type LPTVINSERTSTRUCTW = *mut TVINSERTSTRUCTW;
-pub const TVM_INSERTITEMA: ::UINT = TV_FIRST + 0;
-pub const TVM_INSERTITEMW: ::UINT = TV_FIRST + 50;
-pub const TVM_DELETEITEM: ::UINT = TV_FIRST + 1;
-pub const TVM_EXPAND: ::UINT = TV_FIRST + 2;
-pub const TVM_GETITEMRECT: ::UINT = TV_FIRST + 4;
-pub const TVE_COLLAPSE: ::WPARAM = 0x0001;
-pub const TVE_EXPAND: ::WPARAM = 0x0002;
-pub const TVE_TOGGLE: ::WPARAM = 0x0003;
-pub const TVE_EXPANDPARTIAL: ::WPARAM = 0x4000;
-pub const TVE_COLLAPSERESET: ::WPARAM = 0x8000;
-pub const TVM_GETCOUNT: ::UINT = TV_FIRST + 5;
-pub const TVM_GETINDENT: ::UINT = TV_FIRST + 6;
-pub const TVM_SETINDENT: ::UINT = TV_FIRST + 7;
-pub const TVM_GETIMAGELIST: ::UINT = TV_FIRST + 8;
-pub const TVM_SETIMAGELIST: ::UINT = TV_FIRST + 9;
-pub const TVM_GETNEXTITEM: ::UINT = TV_FIRST + 10;
-pub const TVSIL_NORMAL: ::WPARAM = 0;
-pub const TVSIL_STATE: ::WPARAM = 2;
-pub const TVGN_ROOT: ::WPARAM = 0x0000;
-pub const TVGN_NEXT: ::WPARAM = 0x0001;
-pub const TVGN_PREVIOUS: ::WPARAM = 0x0002;
-pub const TVGN_PARENT: ::WPARAM = 0x0003;
-pub const TVGN_CHILD: ::WPARAM = 0x0004;
-pub const TVGN_FIRSTVISIBLE: ::WPARAM = 0x0005;
-pub const TVGN_NEXTVISIBLE: ::WPARAM = 0x0006;
-pub const TVGN_PREVIOUSVISIBLE: ::WPARAM = 0x0007;
-pub const TVGN_DROPHILITE: ::WPARAM = 0x0008;
-pub const TVGN_CARET: ::WPARAM = 0x0009;
-pub const TVGN_LASTVISIBLE: ::WPARAM = 0x000A;
-pub const TVGN_NEXTSELECTED: ::WPARAM = 0x000B;
-pub const TVSI_NOSINGLEEXPAND: ::WPARAM = 0x8000;
-pub const TVM_SELECTITEM: ::UINT = TV_FIRST + 11;
-pub const TVM_GETITEMA: ::UINT = TV_FIRST + 12;
-pub const TVM_GETITEMW: ::UINT = TV_FIRST + 62;
-pub const TVM_SETITEMA: ::UINT = TV_FIRST + 13;
-pub const TVM_SETITEMW: ::UINT = TV_FIRST + 63;
-pub const TVM_EDITLABELA: ::UINT = TV_FIRST + 14;
-pub const TVM_EDITLABELW: ::UINT = TV_FIRST + 65;
-pub const TVM_GETEDITCONTROL: ::UINT = TV_FIRST + 15;
-pub const TVM_GETVISIBLECOUNT: ::UINT = TV_FIRST + 16;
-pub const TVM_HITTEST: ::UINT = TV_FIRST + 17;
-pub type LPTV_HITTESTINFO = LPTVHITTESTINFO;
-pub type TV_HITTESTINFO = TVHITTESTINFO;
-STRUCT!{struct TVHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-    hItem: HTREEITEM,
-}}
-pub type LPTVHITTESTINFO = *mut TVHITTESTINFO;
-pub const TVHT_NOWHERE: ::UINT = 0x0001;
-pub const TVHT_ONITEMICON: ::UINT = 0x0002;
-pub const TVHT_ONITEMLABEL: ::UINT = 0x0004;
-pub const TVHT_ONITEM: ::UINT = TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMSTATEICON;
-pub const TVHT_ONITEMINDENT: ::UINT = 0x0008;
-pub const TVHT_ONITEMBUTTON: ::UINT = 0x0010;
-pub const TVHT_ONITEMRIGHT: ::UINT = 0x0020;
-pub const TVHT_ONITEMSTATEICON: ::UINT = 0x0040;
-pub const TVHT_ABOVE: ::UINT = 0x0100;
-pub const TVHT_BELOW: ::UINT = 0x0200;
-pub const TVHT_TORIGHT: ::UINT = 0x0400;
-pub const TVHT_TOLEFT: ::UINT = 0x0800;
-pub const TVM_CREATEDRAGIMAGE: ::UINT = TV_FIRST + 18;
-pub const TVM_SORTCHILDREN: ::UINT = TV_FIRST + 19;
-pub const TVM_ENSUREVISIBLE: ::UINT = TV_FIRST + 20;
-pub const TVM_SORTCHILDRENCB: ::UINT = TV_FIRST + 21;
-pub const TVM_ENDEDITLABELNOW: ::UINT = TV_FIRST + 22;
-pub const TVM_GETISEARCHSTRINGA: ::UINT = TV_FIRST + 23;
-pub const TVM_GETISEARCHSTRINGW: ::UINT = TV_FIRST + 64;
-pub const TVM_SETTOOLTIPS: ::UINT = TV_FIRST + 24;
-pub const TVM_GETTOOLTIPS: ::UINT = TV_FIRST + 25;
-pub const TVM_SETINSERTMARK: ::UINT = TV_FIRST + 26;
-pub const TVM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const TVM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const TVM_SETITEMHEIGHT: ::UINT = TV_FIRST + 27;
-pub const TVM_GETITEMHEIGHT: ::UINT = TV_FIRST + 28;
-pub const TVM_SETBKCOLOR: ::UINT = TV_FIRST + 29;
-pub const TVM_SETTEXTCOLOR: ::UINT = TV_FIRST + 30;
-pub const TVM_GETBKCOLOR: ::UINT = TV_FIRST + 31;
-pub const TVM_GETTEXTCOLOR: ::UINT = TV_FIRST + 32;
-pub const TVM_SETSCROLLTIME: ::UINT = TV_FIRST + 33;
-pub const TVM_GETSCROLLTIME: ::UINT = TV_FIRST + 34;
-pub const TVM_SETINSERTMARKCOLOR: ::UINT = TV_FIRST + 37;
-pub const TVM_GETINSERTMARKCOLOR: ::UINT = TV_FIRST + 38;
-pub const TVM_SETBORDER: ::UINT = TV_FIRST + 35;
-pub const TVSBF_XBORDER: ::WPARAM = 0x00000001;
-pub const TVSBF_YBORDER: ::WPARAM = 0x00000002;
-pub const TVM_GETITEMSTATE: ::UINT = TV_FIRST + 39;
-pub const TVM_SETLINECOLOR: ::UINT = TV_FIRST + 40;
-pub const TVM_GETLINECOLOR: ::UINT = TV_FIRST + 41;
-pub const TVM_MAPACCIDTOHTREEITEM: ::UINT = TV_FIRST + 42;
-pub const TVM_MAPHTREEITEMTOACCID: ::UINT = TV_FIRST + 43;
-pub const TVM_SETEXTENDEDSTYLE: ::UINT = TV_FIRST + 44;
-pub const TVM_GETEXTENDEDSTYLE: ::UINT = TV_FIRST + 45;
-pub const TVM_SETAUTOSCROLLINFO: ::UINT = TV_FIRST + 59;
-pub const TVM_SETHOT: ::UINT = TV_FIRST + 58;
-pub const TVM_GETSELECTEDCOUNT: ::UINT = TV_FIRST + 70;
-pub const TVM_SHOWINFOTIP: ::UINT = TV_FIRST + 71;
-ENUM!{enum TVITEMPART {
-    TVGIPR_BUTTON = 0x0001,
-}}
-STRUCT!{struct TVGETITEMPARTRECTINFO {
-    hti: HTREEITEM,
-    prc: *mut ::RECT,
-    partID: TVITEMPART,
-}}
-pub const TVM_GETITEMPARTRECT: ::UINT = TV_FIRST + 72;
-pub type PFNTVCOMPARE = Option<unsafe extern "system" fn(
-    lParam1: ::LPARAM, lParam2: ::LPARAM, lParamSort: ::LPARAM,
-) -> ::c_int>;
-pub type LPTV_SORTCB = LPTVSORTCB;
-pub type TV_SORTCB = TVSORTCB;
-STRUCT!{nodebug struct TVSORTCB {
-    hParent: HTREEITEM,
-    lpfnCompare: PFNTVCOMPARE,
-    lParam: ::LPARAM,
-}}
-pub type LPTVSORTCB = *mut TVSORTCB;
-pub type LPNM_TREEVIEWA = LPNMTREEVIEWA;
-pub type LPNM_TREEVIEWW = LPNMTREEVIEWW;
-pub type NM_TREEVIEWA = NMTREEVIEWA;
-pub type NM_TREEVIEWW = NMTREEVIEWW;
-STRUCT!{struct NMTREEVIEWA {
-    hdr: ::NMHDR,
-    action: ::UINT,
-    itemOld: TVITEMA,
-    itemNew: TVITEMA,
-    ptDrag: ::POINT,
-}}
-pub type LPNMTREEVIEWA = *mut NMTREEVIEWA;
-STRUCT!{struct NMTREEVIEWW {
-    hdr: ::NMHDR,
-    action: ::UINT,
-    itemOld: TVITEMW,
-    itemNew: TVITEMW,
-    ptDrag: ::POINT,
-}}
-pub type LPNMTREEVIEWW = *mut NMTREEVIEWW;
-pub const TVN_SELCHANGINGA: ::UINT = TVN_FIRST - 1;
-pub const TVN_SELCHANGINGW: ::UINT = TVN_FIRST - 50;
-pub const TVN_SELCHANGEDA: ::UINT = TVN_FIRST - 2;
-pub const TVN_SELCHANGEDW: ::UINT = TVN_FIRST - 51;
-pub const TVN_GETDISPINFOA: ::UINT = TVN_FIRST - 3;
-pub const TVN_GETDISPINFOW: ::UINT = TVN_FIRST - 52;
-pub const TVN_SETDISPINFOA: ::UINT = TVN_FIRST - 4;
-pub const TVN_SETDISPINFOW: ::UINT = TVN_FIRST - 53;
-pub const TVC_UNKNOWN: ::LPARAM = 0x0000;
-pub const TVC_BYMOUSE: ::LPARAM = 0x0001;
-pub const TVC_BYKEYBOARD: ::LPARAM = 0x0002;
-pub const TVIF_DI_SETITEM: ::UINT = 0x1000;
-pub type TV_DISPINFOA = NMTVDISPINFOA;
-pub type TV_DISPINFOW = NMTVDISPINFOW;
-STRUCT!{struct NMTVDISPINFOA {
-    hdr: ::NMHDR,
-    item: TVITEMA,
-}}
-pub type LPNMTVDISPINFOA = *mut NMTVDISPINFOA;
-STRUCT!{struct NMTVDISPINFOW {
-    hdr: ::NMHDR,
-    item: TVITEMW,
-}}
-pub type LPNMTVDISPINFOW = *mut NMTVDISPINFOW;
-STRUCT!{struct NMTVDISPINFOEXA {
-    hdr: ::NMHDR,
-    item: TVITEMEXA,
-}}
-pub type LPNMTVDISPINFOEXA = *mut NMTVDISPINFOEXA;
-STRUCT!{struct NMTVDISPINFOEXW {
-    hdr: ::NMHDR,
-    item: TVITEMEXW,
-}}
-pub type LPNMTVDISPINFOEXW = *mut NMTVDISPINFOEXW;
-pub type TV_DISPINFOEXA = NMTVDISPINFOEXA;
-pub type TV_DISPINFOEXW = NMTVDISPINFOEXW;
-pub const TVN_ITEMEXPANDINGA: ::UINT = TVN_FIRST - 5;
-pub const TVN_ITEMEXPANDINGW: ::UINT = TVN_FIRST - 54;
-pub const TVN_ITEMEXPANDEDA: ::UINT = TVN_FIRST - 6;
-pub const TVN_ITEMEXPANDEDW: ::UINT = TVN_FIRST - 55;
-pub const TVN_BEGINDRAGA: ::UINT = TVN_FIRST - 7;
-pub const TVN_BEGINDRAGW: ::UINT = TVN_FIRST - 56;
-pub const TVN_BEGINRDRAGA: ::UINT = TVN_FIRST - 8;
-pub const TVN_BEGINRDRAGW: ::UINT = TVN_FIRST - 57;
-pub const TVN_DELETEITEMA: ::UINT = TVN_FIRST - 9;
-pub const TVN_DELETEITEMW: ::UINT = TVN_FIRST - 58;
-pub const TVN_BEGINLABELEDITA: ::UINT = TVN_FIRST - 10;
-pub const TVN_BEGINLABELEDITW: ::UINT = TVN_FIRST - 59;
-pub const TVN_ENDLABELEDITA: ::UINT = TVN_FIRST - 11;
-pub const TVN_ENDLABELEDITW: ::UINT = TVN_FIRST - 60;
-pub const TVN_KEYDOWN: ::UINT = TVN_FIRST - 12;
-pub const TVN_GETINFOTIPA: ::UINT = TVN_FIRST - 13;
-pub const TVN_GETINFOTIPW: ::UINT = TVN_FIRST - 14;
-pub const TVN_SINGLEEXPAND: ::UINT = TVN_FIRST - 15;
-pub const TVN_ITEMCHANGINGA: ::UINT = TVN_FIRST - 16;
-pub const TVN_ITEMCHANGINGW: ::UINT = TVN_FIRST - 17;
-pub const TVN_ITEMCHANGEDA: ::UINT = TVN_FIRST - 18;
-pub const TVN_ITEMCHANGEDW: ::UINT = TVN_FIRST - 19;
-pub const TVN_ASYNCDRAW: ::UINT = TVN_FIRST - 20;
-pub const TVNRET_DEFAULT: ::LRESULT = 0;
-pub const TVNRET_SKIPOLD: ::LRESULT = 1;
-pub const TVNRET_SKIPNEW: ::LRESULT = 2;
-pub type TV_KEYDOWN = NMTVKEYDOWN;
-STRUCT!{struct NMTVKEYDOWN {
-    hdr: ::NMHDR,
-    wVKey: ::WORD,
-    flags: ::UINT,
-}}
-pub type LPNMTVKEYDOWN = *mut NMTVKEYDOWN;
-STRUCT!{struct NMTVCUSTOMDRAW {
-    nmcd: NMCUSTOMDRAW,
-    clrText: ::COLORREF,
-    clrTextBk: ::COLORREF,
-    iLevel: ::c_int,
-}}
-pub type LPNMTVCUSTOMDRAW = *mut NMTVCUSTOMDRAW;
-STRUCT!{struct NMTVGETINFOTIPA {
-    hdr: ::NMHDR,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    hItem: HTREEITEM,
-    lParam: ::LPARAM,
-}}
-pub type LPNMTVGETINFOTIPA = *mut NMTVGETINFOTIPA;
-STRUCT!{struct NMTVGETINFOTIPW {
-    hdr: ::NMHDR,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    hItem: HTREEITEM,
-    lParam: ::LPARAM,
-}}
-pub type LPNMTVGETINFOTIPW = *mut NMTVGETINFOTIPW;
-pub const TVCDRF_NOIMAGES: ::LRESULT = 0x00010000;
-STRUCT!{struct NMTVITEMCHANGE {
-    hdr: ::NMHDR,
-    uChanged: ::UINT,
-    hItem: HTREEITEM,
-    uStateNew: ::UINT,
-    uStateOld: ::UINT,
-    lParam: ::LPARAM,
-}}
-STRUCT!{struct NMTVASYNCDRAW {
-    hdr: ::NMHDR,
-    pimldp: *mut IMAGELISTDRAWPARAMS,
-    hr: ::HRESULT,
-    hItem: HTREEITEM,
-    lParam: ::LPARAM,
-    dwRetFlags: ::DWORD,
-    iRetImageIndex: ::c_int,
-}}
-pub const CBEIF_TEXT: ::UINT = 0x00000001;
-pub const CBEIF_IMAGE: ::UINT = 0x00000002;
-pub const CBEIF_SELECTEDIMAGE: ::UINT = 0x00000004;
-pub const CBEIF_OVERLAY: ::UINT = 0x00000008;
-pub const CBEIF_INDENT: ::UINT = 0x00000010;
-pub const CBEIF_LPARAM: ::UINT = 0x00000020;
-pub const CBEIF_DI_SETITEM: ::UINT = 0x10000000;
-STRUCT!{struct COMBOBOXEXITEMA {
-    mask: ::UINT,
-    iItem: ::INT_PTR,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    iOverlay: ::c_int,
-    iIndent: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type PCOMBOBOXEXITEMA = *mut COMBOBOXEXITEMA;
-pub type PCCOMBOBOXEXITEMA = *const COMBOBOXEXITEMA;
-STRUCT!{struct COMBOBOXEXITEMW {
-    mask: ::UINT,
-    iItem: ::INT_PTR,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    iOverlay: ::c_int,
-    iIndent: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type PCOMBOBOXEXITEMW = *mut COMBOBOXEXITEMW;
-pub type PCCOMBOBOXEXITEMW = *const COMBOBOXEXITEMW;
-pub const CBEM_INSERTITEMA: ::UINT = ::WM_USER + 1;
-pub const CBEM_SETIMAGELIST: ::UINT = ::WM_USER + 2;
-pub const CBEM_GETIMAGELIST: ::UINT = ::WM_USER + 3;
-pub const CBEM_GETITEMA: ::UINT = ::WM_USER + 4;
-pub const CBEM_SETITEMA: ::UINT = ::WM_USER + 5;
-pub const CBEM_DELETEITEM: ::UINT = ::CB_DELETESTRING;
-pub const CBEM_GETCOMBOCONTROL: ::UINT = ::WM_USER + 6;
-pub const CBEM_GETEDITCONTROL: ::UINT = ::WM_USER + 7;
-pub const CBEM_SETEXSTYLE: ::UINT = ::WM_USER + 8;
-pub const CBEM_SETEXTENDEDSTYLE: ::UINT = ::WM_USER + 14;
-pub const CBEM_GETEXSTYLE: ::UINT = ::WM_USER + 9;
-pub const CBEM_GETEXTENDEDSTYLE: ::UINT = ::WM_USER + 9;
-pub const CBEM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const CBEM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const CBEM_HASEDITCHANGED: ::UINT = ::WM_USER + 10;
-pub const CBEM_INSERTITEMW: ::UINT = ::WM_USER + 11;
-pub const CBEM_SETITEMW: ::UINT = ::WM_USER + 12;
-pub const CBEM_GETITEMW: ::UINT = ::WM_USER + 13;
-pub const CBEM_SETWINDOWTHEME: ::UINT = CCM_SETWINDOWTHEME;
-pub const CBES_EX_NOEDITIMAGE: ::DWORD = 0x00000001;
-pub const CBES_EX_NOEDITIMAGEINDENT: ::DWORD = 0x00000002;
-pub const CBES_EX_PATHWORDBREAKPROC: ::DWORD = 0x00000004;
-pub const CBES_EX_NOSIZELIMIT: ::DWORD = 0x00000008;
-pub const CBES_EX_CASESENSITIVE: ::DWORD = 0x00000010;
-pub const CBES_EX_TEXTENDELLIPSIS: ::DWORD = 0x00000020;
-STRUCT!{struct NMCOMBOBOXEXA {
-    hdr: ::NMHDR,
-    ceItem: COMBOBOXEXITEMA,
-}}
-pub type PNMCOMBOBOXEXA = *mut NMCOMBOBOXEXA;
-STRUCT!{struct NMCOMBOBOXEXW {
-    hdr: ::NMHDR,
-    ceItem: COMBOBOXEXITEMW,
-}}
-pub type PNMCOMBOBOXEXW = *mut NMCOMBOBOXEXW;
-pub const CBEN_GETDISPINFOA: ::UINT = CBEN_FIRST - 0;
-pub const CBEN_INSERTITEM: ::UINT = CBEN_FIRST - 1;
-pub const CBEN_DELETEITEM: ::UINT = CBEN_FIRST - 2;
-pub const CBEN_BEGINEDIT: ::UINT = CBEN_FIRST - 4;
-pub const CBEN_ENDEDITA: ::UINT = CBEN_FIRST - 5;
-pub const CBEN_ENDEDITW: ::UINT = CBEN_FIRST - 6;
-pub const CBEN_GETDISPINFOW: ::UINT = CBEN_FIRST - 7;
-pub const CBEN_DRAGBEGINA: ::UINT = CBEN_FIRST - 8;
-pub const CBEN_DRAGBEGINW: ::UINT = CBEN_FIRST - 9;
-pub const CBENF_KILLFOCUS: ::c_int = 1;
-pub const CBENF_RETURN: ::c_int = 2;
-pub const CBENF_ESCAPE: ::c_int = 3;
-pub const CBENF_DROPDOWN: ::c_int = 4;
-pub const CBEMAXSTRLEN: usize = 260;
-STRUCT!{nodebug struct NMCBEDRAGBEGINW {
-    hdr: ::NMHDR,
-    iItemid: ::c_int,
-    szText: [::WCHAR; CBEMAXSTRLEN],
-}}
-pub type PNMCBEDRAGBEGINW = *mut NMCBEDRAGBEGINW;
-pub type LPNMCBEDRAGBEGINW = *mut NMCBEDRAGBEGINW;
-STRUCT!{nodebug struct NMCBEDRAGBEGINA {
-    hdr: ::NMHDR,
-    iItemid: ::c_int,
-    szText: [::c_char; CBEMAXSTRLEN],
-}}
-pub type PNMCBEDRAGBEGINA = *mut NMCBEDRAGBEGINA;
-pub type LPNMCBEDRAGBEGINA = *mut NMCBEDRAGBEGINA;
-STRUCT!{nodebug struct NMCBEENDEDITW {
-    hdr: ::NMHDR,
-    fChanged: ::BOOL,
-    iNewSelection: ::c_int,
-    szText: [::WCHAR; CBEMAXSTRLEN],
-    iWhy: ::c_int,
-}}
-pub type PNMCBEENDEDITW = *mut NMCBEENDEDITW;
-pub type LPNMCBEENDEDITW = *mut NMCBEENDEDITW;
-STRUCT!{nodebug struct NMCBEENDEDITA {
-    hdr: ::NMHDR,
-    fChanged: ::BOOL,
-    iNewSelection: ::c_int,
-    szText: [::c_char; CBEMAXSTRLEN],
-    iWhy: ::c_int,
-}}
-pub type PNMCBEENDEDITA = *mut NMCBEENDEDITA;
-pub type LPNMCBEENDEDITA = *mut NMCBEENDEDITA;
-pub const TCS_SCROLLOPPOSITE: ::DWORD = 0x0001;
-pub const TCS_BOTTOM: ::DWORD = 0x0002;
-pub const TCS_RIGHT: ::DWORD = 0x0002;
-pub const TCS_MULTISELECT: ::DWORD = 0x0004;
-pub const TCS_FLATBUTTONS: ::DWORD = 0x0008;
-pub const TCS_FORCEICONLEFT: ::DWORD = 0x0010;
-pub const TCS_FORCELABELLEFT: ::DWORD = 0x0020;
-pub const TCS_HOTTRACK: ::DWORD = 0x0040;
-pub const TCS_VERTICAL: ::DWORD = 0x0080;
-pub const TCS_TABS: ::DWORD = 0x0000;
-pub const TCS_BUTTONS: ::DWORD = 0x0100;
-pub const TCS_SINGLELINE: ::DWORD = 0x0000;
-pub const TCS_MULTILINE: ::DWORD = 0x0200;
-pub const TCS_RIGHTJUSTIFY: ::DWORD = 0x0000;
-pub const TCS_FIXEDWIDTH: ::DWORD = 0x0400;
-pub const TCS_RAGGEDRIGHT: ::DWORD = 0x0800;
-pub const TCS_FOCUSONBUTTONDOWN: ::DWORD = 0x1000;
-pub const TCS_OWNERDRAWFIXED: ::DWORD = 0x2000;
-pub const TCS_TOOLTIPS: ::DWORD = 0x4000;
-pub const TCS_FOCUSNEVER: ::DWORD = 0x8000;
-pub const TCS_EX_FLATSEPARATORS: ::DWORD = 0x00000001;
-pub const TCS_EX_REGISTERDROP: ::DWORD = 0x00000002;
-pub const TCM_GETIMAGELIST: ::UINT = TCM_FIRST + 2;
-pub const TCM_SETIMAGELIST: ::UINT = TCM_FIRST + 3;
-pub const TCM_GETITEMCOUNT: ::UINT = TCM_FIRST + 4;
-pub const TCIF_TEXT: ::UINT = 0x0001;
-pub const TCIF_IMAGE: ::UINT = 0x0002;
-pub const TCIF_RTLREADING: ::UINT = 0x0004;
-pub const TCIF_PARAM: ::UINT = 0x0008;
-pub const TCIF_STATE: ::UINT = 0x0010;
-pub const TCIS_BUTTONPRESSED: ::DWORD = 0x0001;
-pub const TCIS_HIGHLIGHTED: ::DWORD = 0x0002;
-pub type TC_ITEMHEADERA = TCITEMHEADERA;
-pub type TC_ITEMHEADERW = TCITEMHEADERW;
-STRUCT!{struct TCITEMHEADERA {
-    mask: ::UINT,
-    lpReserved1: ::UINT,
-    lpReserved2: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-}}
-pub type LPTCITEMHEADERA = *mut TCITEMHEADERA;
-STRUCT!{struct TCITEMHEADERW {
-    mask: ::UINT,
-    lpReserved1: ::UINT,
-    lpReserved2: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-}}
-pub type LPTCITEMHEADERW = *mut TCITEMHEADERW;
-pub type TC_ITEMA = TCITEMA;
-pub type TC_ITEMW = TCITEMW;
-STRUCT!{struct TCITEMA {
-    mask: ::UINT,
-    dwState: ::DWORD,
-    dwStateMask: ::DWORD,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPTCITEMA = *mut TCITEMA;
-STRUCT!{struct TCITEMW {
-    mask: ::UINT,
-    dwState: ::DWORD,
-    dwStateMask: ::DWORD,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPTCITEMW = *mut TCITEMW;
-pub const TCM_GETITEMA: ::UINT = TCM_FIRST + 5;
-pub const TCM_GETITEMW: ::UINT = TCM_FIRST + 60;
-pub const TCM_SETITEMA: ::UINT = TCM_FIRST + 6;
-pub const TCM_SETITEMW: ::UINT = TCM_FIRST + 61;
-pub const TCM_INSERTITEMA: ::UINT = TCM_FIRST + 7;
-pub const TCM_INSERTITEMW: ::UINT = TCM_FIRST + 62;
-pub const TCM_DELETEITEM: ::UINT = TCM_FIRST + 8;
-pub const TCM_DELETEALLITEMS: ::UINT = TCM_FIRST + 9;
-pub const TCM_GETITEMRECT: ::UINT = TCM_FIRST + 10;
-pub const TCM_GETCURSEL: ::UINT = TCM_FIRST + 11;
-pub const TCM_SETCURSEL: ::UINT = TCM_FIRST + 12;
-pub const TCHT_NOWHERE: ::UINT = 0x0001;
-pub const TCHT_ONITEMICON: ::UINT = 0x0002;
-pub const TCHT_ONITEMLABEL: ::UINT = 0x0004;
-pub const TCHT_ONITEM: ::UINT = TCHT_ONITEMICON | TCHT_ONITEMLABEL;
-pub type LPTC_HITTESTINFO = LPTCHITTESTINFO;
-pub type TC_HITTESTINFO = TCHITTESTINFO;
-STRUCT!{struct TCHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-}}
-pub type LPTCHITTESTINFO = *mut TCHITTESTINFO;
-pub const TCM_HITTEST: ::UINT = TCM_FIRST + 13;
-pub const TCM_SETITEMEXTRA: ::UINT = TCM_FIRST + 14;
-pub const TCM_ADJUSTRECT: ::UINT = TCM_FIRST + 40;
-pub const TCM_SETITEMSIZE: ::UINT = TCM_FIRST + 41;
-pub const TCM_REMOVEIMAGE: ::UINT = TCM_FIRST + 42;
-pub const TCM_SETPADDING: ::UINT = TCM_FIRST + 43;
-pub const TCM_GETROWCOUNT: ::UINT = TCM_FIRST + 44;
-pub const TCM_GETTOOLTIPS: ::UINT = TCM_FIRST + 45;
-pub const TCM_SETTOOLTIPS: ::UINT = TCM_FIRST + 46;
-pub const TCM_GETCURFOCUS: ::UINT = TCM_FIRST + 47;
-pub const TCM_SETCURFOCUS: ::UINT = TCM_FIRST + 48;
-pub const TCM_SETMINTABWIDTH: ::UINT = TCM_FIRST + 49;
-pub const TCM_DESELECTALL: ::UINT = TCM_FIRST + 50;
-pub const TCM_HIGHLIGHTITEM: ::UINT = TCM_FIRST + 51;
-pub const TCM_SETEXTENDEDSTYLE: ::UINT = TCM_FIRST + 52;
-pub const TCM_GETEXTENDEDSTYLE: ::UINT = TCM_FIRST + 53;
-pub const TCM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const TCM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const TCN_KEYDOWN: ::UINT = TCN_FIRST - 0;
-pub type TC_KEYDOWN = NMTCKEYDOWN;
-STRUCT!{struct NMTCKEYDOWN {
-    hdr: ::NMHDR,
-    wVKey: ::WORD,
-    flags: ::UINT,
-}}
-pub const TCN_SELCHANGE: ::UINT = TCN_FIRST - 1;
-pub const TCN_SELCHANGING: ::UINT = TCN_FIRST - 2;
-pub const TCN_GETOBJECT: ::UINT = TCN_FIRST - 3;
-pub const TCN_FOCUSCHANGE: ::UINT = TCN_FIRST - 4;
-pub const ACS_CENTER: ::DWORD = 0x0001;
-pub const ACS_TRANSPARENT: ::DWORD = 0x0002;
-pub const ACS_AUTOPLAY: ::DWORD = 0x0004;
-pub const ACS_TIMER: ::DWORD = 0x0008;
-pub const ACM_OPENA: ::UINT = ::WM_USER + 100;
-pub const ACM_OPENW: ::UINT = ::WM_USER + 103;
-pub const ACM_PLAY: ::UINT = ::WM_USER + 101;
-pub const ACM_STOP: ::UINT = ::WM_USER + 102;
-pub const ACM_ISPLAYING: ::UINT = ::WM_USER + 104;
-pub const ACN_START: ::WPARAM = 1;
-pub const ACN_STOP: ::WPARAM = 2;
-pub type MONTHDAYSTATE = ::DWORD;
-pub type LPMONTHDAYSTATE = *mut ::DWORD;
-pub const MCM_FIRST: ::UINT = 0x1000;
-pub const MCM_GETCURSEL: ::UINT = MCM_FIRST + 1;
-pub const MCM_SETCURSEL: ::UINT = MCM_FIRST + 2;
-pub const MCM_GETMAXSELCOUNT: ::UINT = MCM_FIRST + 3;
-pub const MCM_SETMAXSELCOUNT: ::UINT = MCM_FIRST + 4;
-pub const MCM_GETSELRANGE: ::UINT = MCM_FIRST + 5;
-pub const MCM_SETSELRANGE: ::UINT = MCM_FIRST + 6;
-pub const MCM_GETMONTHRANGE: ::UINT = MCM_FIRST + 7;
-pub const MCM_SETDAYSTATE: ::UINT = MCM_FIRST + 8;
-pub const MCM_GETMINREQRECT: ::UINT = MCM_FIRST + 9;
-pub const MCM_SETCOLOR: ::UINT = MCM_FIRST + 10;
-pub const MCM_GETCOLOR: ::UINT = MCM_FIRST + 11;
-pub const MCM_SETTODAY: ::UINT = MCM_FIRST + 12;
-pub const MCM_GETTODAY: ::UINT = MCM_FIRST + 13;
-pub const MCM_HITTEST: ::UINT = MCM_FIRST + 14;
-pub const MCSC_BACKGROUND: ::WPARAM = 0;
-pub const MCSC_TEXT: ::WPARAM = 1;
-pub const MCSC_TITLEBK: ::WPARAM = 2;
-pub const MCSC_TITLETEXT: ::WPARAM = 3;
-pub const MCSC_MONTHBK: ::WPARAM = 4;
-pub const MCSC_TRAILINGTEXT: ::WPARAM = 5;
-STRUCT!{struct MCHITTESTINFO {
-    cbSize: ::UINT,
-    pt: ::POINT,
-    uHit: ::UINT,
-    st: ::SYSTEMTIME,
-    rc: ::RECT,
-    iOffset: ::c_int,
-    iRow: ::c_int,
-    iCol: ::c_int,
-}}
-pub type PMCHITTESTINFO = *mut MCHITTESTINFO;
-pub const MCHT_TITLE: ::UINT = 0x00010000;
-pub const MCHT_CALENDAR: ::UINT = 0x00020000;
-pub const MCHT_TODAYLINK: ::UINT = 0x00030000;
-pub const MCHT_CALENDARCONTROL: ::UINT = 0x00100000;
-pub const MCHT_NEXT: ::UINT = 0x01000000;
-pub const MCHT_PREV: ::UINT = 0x02000000;
-pub const MCHT_NOWHERE: ::UINT = 0x00000000;
-pub const MCHT_TITLEBK: ::UINT = MCHT_TITLE;
-pub const MCHT_TITLEMONTH: ::UINT = MCHT_TITLE | 0x0001;
-pub const MCHT_TITLEYEAR: ::UINT = MCHT_TITLE | 0x0002;
-pub const MCHT_TITLEBTNNEXT: ::UINT = MCHT_TITLE | MCHT_NEXT | 0x0003;
-pub const MCHT_TITLEBTNPREV: ::UINT = MCHT_TITLE | MCHT_PREV | 0x0003;
-pub const MCHT_CALENDARBK: ::UINT = MCHT_CALENDAR;
-pub const MCHT_CALENDARDATE: ::UINT = MCHT_CALENDAR | 0x0001;
-pub const MCHT_CALENDARDATENEXT: ::UINT = MCHT_CALENDARDATE | MCHT_NEXT;
-pub const MCHT_CALENDARDATEPREV: ::UINT = MCHT_CALENDARDATE | MCHT_PREV;
-pub const MCHT_CALENDARDAY: ::UINT = MCHT_CALENDAR | 0x0002;
-pub const MCHT_CALENDARWEEKNUM: ::UINT = MCHT_CALENDAR | 0x0003;
-pub const MCHT_CALENDARDATEMIN: ::UINT = MCHT_CALENDAR | 0x0004;
-pub const MCHT_CALENDARDATEMAX: ::UINT = MCHT_CALENDAR | 0x0005;
-pub const MCM_SETFIRSTDAYOFWEEK: ::UINT = MCM_FIRST + 15;
-pub const MCM_GETFIRSTDAYOFWEEK: ::UINT = MCM_FIRST + 16;
-pub const MCM_GETRANGE: ::UINT = MCM_FIRST + 17;
-pub const MCM_SETRANGE: ::UINT = MCM_FIRST + 18;
-pub const MCM_GETMONTHDELTA: ::UINT = MCM_FIRST + 19;
-pub const MCM_SETMONTHDELTA: ::UINT = MCM_FIRST + 20;
-pub const MCM_GETMAXTODAYWIDTH: ::UINT = MCM_FIRST + 21;
-pub const MCM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const MCM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const MCM_GETCURRENTVIEW: ::UINT = MCM_FIRST + 22;
-pub const MCM_GETCALENDARCOUNT: ::UINT = MCM_FIRST + 23;
-pub const MCMV_MONTH: ::DWORD = 0;
-pub const MCMV_YEAR: ::DWORD = 1;
-pub const MCMV_DECADE: ::DWORD = 2;
-pub const MCMV_CENTURY: ::DWORD = 3;
-pub const MCMV_MAX: ::DWORD = MCMV_CENTURY;
-pub const MCGIP_CALENDARCONTROL: ::DWORD = 0;
-pub const MCGIP_NEXT: ::DWORD = 1;
-pub const MCGIP_PREV: ::DWORD = 2;
-pub const MCGIP_FOOTER: ::DWORD = 3;
-pub const MCGIP_CALENDAR: ::DWORD = 4;
-pub const MCGIP_CALENDARHEADER: ::DWORD = 5;
-pub const MCGIP_CALENDARBODY: ::DWORD = 6;
-pub const MCGIP_CALENDARROW: ::DWORD = 7;
-pub const MCGIP_CALENDARCELL: ::DWORD = 8;
-pub const MCGIF_DATE: ::DWORD = 0x00000001;
-pub const MCGIF_RECT: ::DWORD = 0x00000002;
-pub const MCGIF_NAME: ::DWORD = 0x00000004;
-STRUCT!{struct MCGRIDINFO {
-    cbSize: ::UINT,
-    dwPart: ::DWORD,
-    dwFlags: ::DWORD,
-    iCalendar: ::c_int,
-    iRow: ::c_int,
-    iCol: ::c_int,
-    bSelected: ::BOOL,
-    stStart: ::SYSTEMTIME,
-    stEnd: ::SYSTEMTIME,
-    rc: ::RECT,
-    pszName: ::PWSTR,
-    cchName: ::size_t,
-}}
-pub type PMCGRIDINFO = *mut MCGRIDINFO;
-pub const MCM_GETCALENDARGRIDINFO: ::UINT = MCM_FIRST + 24;
-pub const MCM_GETCALID: ::UINT = MCM_FIRST + 27;
-pub const MCM_SETCALID: ::UINT = MCM_FIRST + 28;
-pub const MCM_SIZERECTTOMIN: ::UINT = MCM_FIRST + 29;
-pub const MCM_SETCALENDARBORDER: ::UINT = MCM_FIRST + 30;
-pub const MCM_GETCALENDARBORDER: ::UINT = MCM_FIRST + 31;
-pub const MCM_SETCURRENTVIEW: ::UINT = MCM_FIRST + 32;
-STRUCT!{struct NMSELCHANGE {
-    nmhdr: ::NMHDR,
-    stSelStart: ::SYSTEMTIME,
-    stSelEnd: ::SYSTEMTIME,
-}}
-pub type LPNMSELCHANGE = *mut NMSELCHANGE;
-pub const MCN_SELCHANGE: ::UINT = MCN_FIRST - 3;
-STRUCT!{struct NMDAYSTATE {
-    nmhdr: ::NMHDR,
-    stStart: ::SYSTEMTIME,
-    cDayState: ::c_int,
-    prgDayState: LPMONTHDAYSTATE,
-}}
-pub type LPNMDAYSTATE = *mut NMDAYSTATE;
-pub const MCN_GETDAYSTATE: ::UINT = MCN_FIRST - 1;
-pub type NMSELECT = NMSELCHANGE;
-pub type LPNMSELECT = *mut NMSELCHANGE;
-pub const MCN_SELECT: ::UINT = MCN_FIRST;
-STRUCT!{struct NMVIEWCHANGE {
-    nmhdr: ::NMHDR,
-    dwOldView: ::DWORD,
-    dwNewView: ::DWORD,
-}}
-pub type LPNMVIEWCHANGE = *mut NMVIEWCHANGE;
-pub const MCN_VIEWCHANGE: ::UINT = MCN_FIRST - 4;
-pub const MCS_DAYSTATE: ::DWORD = 0x0001;
-pub const MCS_MULTISELECT: ::DWORD = 0x0002;
-pub const MCS_WEEKNUMBERS: ::DWORD = 0x0004;
-pub const MCS_NOTODAYCIRCLE: ::DWORD = 0x0008;
-pub const MCS_NOTODAY: ::DWORD = 0x0010;
-pub const MCS_NOTRAILINGDATES: ::DWORD = 0x0040;
-pub const MCS_SHORTDAYSOFWEEK: ::DWORD = 0x0080;
-pub const MCS_NOSELCHANGEONNAV: ::DWORD = 0x0100;
-pub const GMR_VISIBLE: ::DWORD = 0;
-pub const GMR_DAYSTATE: ::DWORD = 1;
-STRUCT!{struct DATETIMEPICKERINFO {
-    cbSize: ::UINT,
-    rcCheck: ::RECT,
-    stateCheck: ::DWORD,
-    rcButton: ::RECT,
-    stateButton: ::DWORD,
-    hwndEdit: ::HWND,
-    hwndUD: ::HWND,
-    hwndDropDown: ::HWND,
-}}
-pub type LPDATETIMEPICKERINFO = *mut DATETIMEPICKERINFO;
-pub const DTM_FIRST: ::UINT = 0x1000;
-pub const DTM_GETSYSTEMTIME: ::UINT = DTM_FIRST + 1;
-pub const DTM_SETSYSTEMTIME: ::UINT = DTM_FIRST + 2;
-pub const DTM_GETRANGE: ::UINT = DTM_FIRST + 3;
-pub const DTM_SETRANGE: ::UINT = DTM_FIRST + 4;
-pub const DTM_SETFORMATA: ::UINT = DTM_FIRST + 5;
-pub const DTM_SETFORMATW: ::UINT = DTM_FIRST + 50;
-pub const DTM_SETMCCOLOR: ::UINT = DTM_FIRST + 6;
-pub const DTM_GETMCCOLOR: ::UINT = DTM_FIRST + 7;
-pub const DTM_GETMONTHCAL: ::UINT = DTM_FIRST + 8;
-pub const DTM_SETMCFONT: ::UINT = DTM_FIRST + 9;
-pub const DTM_GETMCFONT: ::UINT = DTM_FIRST + 10;
-pub const DTM_SETMCSTYLE: ::UINT = DTM_FIRST + 11;
-pub const DTM_GETMCSTYLE: ::UINT = DTM_FIRST + 12;
-pub const DTM_CLOSEMONTHCAL: ::UINT = DTM_FIRST + 13;
-pub const DTM_GETDATETIMEPICKERINFO: ::UINT = DTM_FIRST + 14;
-pub const DTM_GETIDEALSIZE: ::UINT = DTM_FIRST + 15;
-pub const DTS_UPDOWN: ::DWORD = 0x0001;
-pub const DTS_SHOWNONE: ::DWORD = 0x0002;
-pub const DTS_SHORTDATEFORMAT: ::DWORD = 0x0000;
-pub const DTS_LONGDATEFORMAT: ::DWORD = 0x0004;
-pub const DTS_SHORTDATECENTURYFORMAT: ::DWORD = 0x000C;
-pub const DTS_TIMEFORMAT: ::DWORD = 0x0009;
-pub const DTS_APPCANPARSE: ::DWORD = 0x0010;
-pub const DTS_RIGHTALIGN: ::DWORD = 0x0020;
-pub const DTN_DATETIMECHANGE: ::UINT = DTN_FIRST2 - 6;
-STRUCT!{struct NMDATETIMECHANGE {
-    nmhdr: ::NMHDR,
-    dwFlags: ::DWORD,
-    st: ::SYSTEMTIME,
-}}
-pub type LPNMDATETIMECHANGE = *mut NMDATETIMECHANGE;
-pub const DTN_USERSTRINGA: ::UINT = DTN_FIRST2 - 5;
-pub const DTN_USERSTRINGW: ::UINT = DTN_FIRST - 5;
-STRUCT!{struct NMDATETIMESTRINGA {
-    nmhdr: ::NMHDR,
-    pszUserString: ::LPCSTR,
-    st: ::SYSTEMTIME,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMDATETIMESTRINGA = *mut NMDATETIMESTRINGA;
-STRUCT!{struct NMDATETIMESTRINGW {
-    nmhdr: ::NMHDR,
-    pszUserString: ::LPCWSTR,
-    st: ::SYSTEMTIME,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMDATETIMESTRINGW = *mut NMDATETIMESTRINGW;
-pub const DTN_WMKEYDOWNA: ::UINT = DTN_FIRST2 - 4;
-pub const DTN_WMKEYDOWNW: ::UINT = DTN_FIRST - 4;
-STRUCT!{struct NMDATETIMEWMKEYDOWNA {
-    nmhdr: ::NMHDR,
-    nVirtKey: ::c_int,
-    pszFormat: ::LPCSTR,
-    st: ::SYSTEMTIME,
-}}
-pub type LPNMDATETIMEWMKEYDOWNA = *mut NMDATETIMEWMKEYDOWNA;
-STRUCT!{struct NMDATETIMEWMKEYDOWNW {
-    nmhdr: ::NMHDR,
-    nVirtKey: ::c_int,
-    pszFormat: ::LPCWSTR,
-    st: ::SYSTEMTIME,
-}}
-pub type LPNMDATETIMEWMKEYDOWNW = *mut NMDATETIMEWMKEYDOWNW;
-pub const DTN_FORMATA: ::UINT = DTN_FIRST2 - 3;
-pub const DTN_FORMATW: ::UINT = DTN_FIRST - 3;
-STRUCT!{nodebug struct NMDATETIMEFORMATA {
-    nmhdr: ::NMHDR,
-    pszFormat: ::LPCSTR,
-    st: ::SYSTEMTIME,
-    pszDisplay: ::LPCSTR,
-    szDisplay: [::CHAR; 64],
-}}
-pub type LPNMDATETIMEFORMATA = *mut NMDATETIMEFORMATA;
-STRUCT!{nodebug struct NMDATETIMEFORMATW {
-    nmhdr: ::NMHDR,
-    pszFormat: ::LPCWSTR,
-    st: ::SYSTEMTIME,
-    pszDisplay: ::LPCWSTR,
-    szDisplay: [::WCHAR; 64],
-}}
-pub type LPNMDATETIMEFORMATW = *mut NMDATETIMEFORMATW;
-pub const DTN_FORMATQUERYA: ::UINT = DTN_FIRST2 - 2;
-pub const DTN_FORMATQUERYW: ::UINT = DTN_FIRST - 2;
-STRUCT!{struct NMDATETIMEFORMATQUERYA {
-    nmhdr: ::NMHDR,
-    pszFormat: ::LPCSTR,
-    szMax: ::SIZE,
-}}
-pub type LPNMDATETIMEFORMATQUERYA = *mut NMDATETIMEFORMATQUERYA;
-STRUCT!{struct NMDATETIMEFORMATQUERYW {
-    nmhdr: ::NMHDR,
-    pszFormat: ::LPCWSTR,
-    szMax: ::SIZE,
-}}
-pub type LPNMDATETIMEFORMATQUERYW = *mut NMDATETIMEFORMATQUERYW;
-pub const DTN_DROPDOWN: ::UINT = DTN_FIRST2 - 1;
-pub const DTN_CLOSEUP: ::UINT = DTN_FIRST2;
-pub const GDTR_MIN: ::WPARAM = 0x0001;
-pub const GDTR_MAX: ::WPARAM = 0x0002;
-pub const GDT_ERROR: ::LRESULT = -1;
-pub const GDT_VALID: ::LRESULT = 0;
-pub const GDT_NONE: ::LRESULT = 1;
-pub const IPM_CLEARADDRESS: ::UINT = ::WM_USER + 100;
-pub const IPM_SETADDRESS: ::UINT = ::WM_USER + 101;
-pub const IPM_GETADDRESS: ::UINT = ::WM_USER + 102;
-pub const IPM_SETRANGE: ::UINT = ::WM_USER + 103;
-pub const IPM_SETFOCUS: ::UINT = ::WM_USER + 104;
-pub const IPM_ISBLANK: ::UINT = ::WM_USER + 105;
-pub const IPN_FIELDCHANGED: ::UINT = IPN_FIRST - 0;
-STRUCT!{struct NMIPADDRESS {
-    hdr: ::NMHDR,
-    iField: ::c_int,
-    iValue: ::c_int,
-}}
-pub type LPNMIPADDRESS = *mut NMIPADDRESS;
-#[inline] #[allow(dead_code)]
-pub fn MAKEIPRANGE(low: ::BYTE, high: ::BYTE) -> ::LPARAM {
-    (high << 8 + low) as ::LPARAM
-}
-#[inline] #[allow(dead_code)]
-pub fn MAKEIPADDRESS(b1: ::DWORD, b2: ::DWORD, b3: ::DWORD, b4: ::DWORD) -> ::LPARAM {
-    ((b1 << 24) + (b2 << 16) + (b3 << 8) + b4) as ::LPARAM
-}
-pub const PGS_VERT: ::DWORD = 0x00000000;
-pub const PGS_HORZ: ::DWORD = 0x00000001;
-pub const PGS_AUTOSCROLL: ::DWORD = 0x00000002;
-pub const PGS_DRAGNDROP: ::DWORD = 0x00000004;
-pub const  PGF_INVISIBLE: ::DWORD = 0;
-pub const  PGF_NORMAL: ::DWORD = 1;
-pub const  PGF_GRAYED: ::DWORD = 2;
-pub const  PGF_DEPRESSED: ::DWORD = 4;
-pub const  PGF_HOT: ::DWORD = 8;
-pub const PGB_TOPORLEFT: ::c_int = 0;
-pub const PGB_BOTTOMORRIGHT: ::c_int = 1;
-pub const PGM_SETCHILD: ::UINT = PGM_FIRST + 1;
-pub const PGM_RECALCSIZE: ::UINT = PGM_FIRST + 2;
-pub const PGM_FORWARDMOUSE: ::UINT = PGM_FIRST + 3;
-pub const PGM_SETBKCOLOR: ::UINT = PGM_FIRST + 4;
-pub const PGM_GETBKCOLOR: ::UINT = PGM_FIRST + 5;
-pub const PGM_SETBORDER: ::UINT = PGM_FIRST + 6;
-pub const PGM_GETBORDER: ::UINT = PGM_FIRST + 7;
-pub const PGM_SETPOS: ::UINT = PGM_FIRST + 8;
-pub const PGM_GETPOS: ::UINT = PGM_FIRST + 9;
-pub const PGM_SETBUTTONSIZE: ::UINT = PGM_FIRST + 10;
-pub const PGM_GETBUTTONSIZE: ::UINT = PGM_FIRST + 11;
-pub const PGM_GETBUTTONSTATE: ::UINT = PGM_FIRST + 12;
-pub const PGM_GETDROPTARGET: ::UINT = CCM_GETDROPTARGET;
-pub const PGM_SETSCROLLINFO: ::UINT = PGM_FIRST + 13;
-pub const PGN_SCROLL: ::UINT = PGN_FIRST - 1;
-pub const PGF_SCROLLUP: ::c_int = 1;
-pub const PGF_SCROLLDOWN: ::c_int = 2;
-pub const PGF_SCROLLLEFT: ::c_int = 4;
-pub const PGF_SCROLLRIGHT: ::c_int = 8;
-pub const PGK_SHIFT: ::BOOL = 1;
-pub const PGK_CONTROL: ::BOOL = 2;
-pub const PGK_MENU: ::BOOL = 4;
-STRUCT!{struct NMPGSCROLL {
-    hdr: ::NMHDR,
-    fwKeys: ::BOOL,
-    rcParent: ::RECT,
-    iDir: ::c_int,
-    iXpos: ::c_int,
-    iYpos: ::c_int,
-    iScroll: ::c_int,
-}}
-pub type LPNMPGSCROLL = *mut NMPGSCROLL;
-pub const PGN_CALCSIZE: ::UINT = PGN_FIRST - 2;
-pub const PGF_CALCWIDTH: ::DWORD = 1;
-pub const PGF_CALCHEIGHT: ::DWORD = 2;
-STRUCT!{struct NMPGCALCSIZE {
-    hdr: ::NMHDR,
-    dwFlag: ::DWORD,
-    iWidth: ::c_int,
-    iHeight: ::c_int,
-}}
-pub type LPNMPGCALCSIZE = *mut NMPGCALCSIZE;
-pub const PGN_HOTITEMCHANGE: ::UINT = PGN_FIRST - 3;
-STRUCT!{struct NMPGHOTITEM {
-    hdr: ::NMHDR,
-    idOld: ::c_int,
-    idNew: ::c_int,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMPGHOTITEM = *mut NMPGHOTITEM;
-pub const NFS_EDIT: ::DWORD = 0x0001;
-pub const NFS_STATIC: ::DWORD = 0x0002;
-pub const NFS_LISTCOMBO: ::DWORD = 0x0004;
-pub const NFS_BUTTON: ::DWORD = 0x0008;
-pub const NFS_ALL: ::DWORD = 0x0010;
-pub const NFS_USEFONTASSOC: ::DWORD = 0x0020;
-pub const BUTTON_IMAGELIST_ALIGN_LEFT: ::UINT = 0;
-pub const BUTTON_IMAGELIST_ALIGN_RIGHT: ::UINT = 1;
-pub const BUTTON_IMAGELIST_ALIGN_TOP: ::UINT = 2;
-pub const BUTTON_IMAGELIST_ALIGN_BOTTOM: ::UINT = 3;
-pub const BUTTON_IMAGELIST_ALIGN_CENTER: ::UINT = 4;
-STRUCT!{struct BUTTON_IMAGELIST {
-    himl: HIMAGELIST,
-    margin: ::RECT,
-    uAlign: ::UINT,
-}}
-pub type PBUTTON_IMAGELIST = *mut BUTTON_IMAGELIST;
-pub const BCM_GETIDEALSIZE: ::UINT = BCM_FIRST + 0x0001;
-pub const BCM_SETIMAGELIST: ::UINT = BCM_FIRST + 0x0002;
-pub const BCM_GETIMAGELIST: ::UINT = BCM_FIRST + 0x0003;
-pub const BCM_SETTEXTMARGIN: ::UINT = BCM_FIRST + 0x0004;
-pub const BCM_GETTEXTMARGIN: ::UINT = BCM_FIRST + 0x0005;
-STRUCT!{struct NMBCHOTITEM {
-    hdr: ::NMHDR,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMBCHOTITEM = *mut NMBCHOTITEM;
-pub const BCN_HOTITEMCHANGE: ::UINT = BCN_FIRST + 0x0001;
-pub const BS_SPLITBUTTON: ::UINT = 0x0000000C;
-pub const BS_DEFSPLITBUTTON: ::UINT = 0x0000000D;
-pub const BS_COMMANDLINK: ::UINT = 0x0000000E;
-pub const BS_DEFCOMMANDLINK: ::UINT = 0x0000000F;
-pub const BCSIF_GLYPH: ::UINT = 0x0001;
-pub const BCSIF_IMAGE: ::UINT = 0x0002;
-pub const BCSIF_STYLE: ::UINT = 0x0004;
-pub const BCSIF_SIZE: ::UINT = 0x0008;
-pub const BCSS_NOSPLIT: ::UINT = 0x0001;
-pub const BCSS_STRETCH: ::UINT = 0x0002;
-pub const BCSS_ALIGNLEFT: ::UINT = 0x0004;
-pub const BCSS_IMAGE: ::UINT = 0x0008;
-STRUCT!{struct BUTTON_SPLITINFO {
-    mask: ::UINT,
-    himlGlyph: HIMAGELIST,
-    uSplitStyle: ::UINT,
-    size: ::SIZE,
-}}
-pub type PBUTTON_SPLITINFO = *mut BUTTON_SPLITINFO;
-pub const BCM_SETDROPDOWNSTATE: ::UINT = BCM_FIRST + 0x0006;
-pub const BCM_SETSPLITINFO: ::UINT = BCM_FIRST + 0x0007;
-pub const BCM_GETSPLITINFO: ::UINT = BCM_FIRST + 0x0008;
-pub const BCM_SETNOTE: ::UINT = BCM_FIRST + 0x0009;
-pub const BCM_GETNOTE: ::UINT = BCM_FIRST + 0x000A;
-pub const BCM_GETNOTELENGTH: ::UINT = BCM_FIRST + 0x000B;
-pub const BCM_SETSHIELD: ::UINT = BCM_FIRST + 0x000C;
-pub const BCCL_NOGLYPH: HIMAGELIST = (0 - 1) as HIMAGELIST;
-STRUCT!{struct NMBCDROPDOWN {
-    hdr: ::NMHDR,
-    rcButton: ::RECT,
-}}
-pub type LPNMBCDROPDOWN = *mut NMBCDROPDOWN;
-pub const BCN_DROPDOWN: ::UINT = BCN_FIRST + 0x0002;
-pub const EM_SETCUEBANNER: ::UINT = ECM_FIRST + 1;
-pub const EM_GETCUEBANNER: ::UINT = ECM_FIRST + 2;
-pub const EM_SHOWBALLOONTIP: ::UINT = ECM_FIRST + 3;
-pub const EM_HIDEBALLOONTIP: ::UINT = ECM_FIRST + 4;
-pub const EM_SETHILITE: ::UINT = ECM_FIRST + 5;
-pub const EM_GETHILITE: ::UINT = ECM_FIRST + 6;
-pub const EM_NOSETFOCUS: ::UINT = ECM_FIRST + 7;
-pub const EM_TAKEFOCUS: ::UINT = ECM_FIRST + 8;
-STRUCT!{struct EDITBALLOONTIP {
-    cbStruct: ::DWORD,
-    pszTitle: ::LPCWSTR,
-    pszText: ::LPCWSTR,
-    ttiIcon: ::INT,
-}}
-pub type PEDITBALLOONTIP = *mut EDITBALLOONTIP;
-pub const CB_SETMINVISIBLE: ::UINT = CBM_FIRST + 1;
-pub const CB_GETMINVISIBLE: ::UINT = CBM_FIRST + 2;
-pub const CB_SETCUEBANNER: ::UINT = CBM_FIRST + 3;
-pub const CB_GETCUEBANNER: ::UINT = CBM_FIRST + 4;
-pub type PFTASKDIALOGCALLBACK = Option<unsafe extern "system" fn(
-    hwnd: ::HWND, msg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM, lpRefData: ::LONG_PTR,
-) -> ::HRESULT>;
-FLAGS!{enum TASKDIALOG_FLAGS {
-    TDF_ENABLE_HYPERLINKS = 0x0001,
-    TDF_USE_HICON_MAIN = 0x0002,
-    TDF_USE_HICON_FOOTER = 0x0004,
-    TDF_ALLOW_DIALOG_CANCELLATION = 0x0008,
-    TDF_USE_COMMAND_LINKS = 0x0010,
-    TDF_USE_COMMAND_LINKS_NO_ICON = 0x0020,
-    TDF_EXPAND_FOOTER_AREA = 0x0040,
-    TDF_EXPANDED_BY_DEFAULT = 0x0080,
-    TDF_VERIFICATION_FLAG_CHECKED = 0x0100,
-    TDF_SHOW_PROGRESS_BAR = 0x0200,
-    TDF_SHOW_MARQUEE_PROGRESS_BAR = 0x0400,
-    TDF_CALLBACK_TIMER = 0x0800,
-    TDF_POSITION_RELATIVE_TO_WINDOW = 0x1000,
-    TDF_RTL_LAYOUT = 0x2000,
-    TDF_NO_DEFAULT_RADIO_BUTTON = 0x4000,
-    TDF_CAN_BE_MINIMIZED = 0x8000,
-    TDF_NO_SET_FOREGROUND = 0x00010000,
-    TDF_SIZE_TO_CONTENT = 0x01000000,
-}}
-ENUM!{enum TASKDIALOG_MESSAGES {
-    TDM_NAVIGATE_PAGE = ::WM_USER + 101,
-    TDM_CLICK_BUTTON = ::WM_USER + 102,
-    TDM_SET_MARQUEE_PROGRESS_BAR = ::WM_USER + 103,
-    TDM_SET_PROGRESS_BAR_STATE = ::WM_USER + 104,
-    TDM_SET_PROGRESS_BAR_RANGE = ::WM_USER + 105,
-    TDM_SET_PROGRESS_BAR_POS = ::WM_USER + 106,
-    TDM_SET_PROGRESS_BAR_MARQUEE = ::WM_USER + 107,
-    TDM_SET_ELEMENT_TEXT = ::WM_USER + 108,
-    TDM_CLICK_RADIO_BUTTON = ::WM_USER + 110,
-    TDM_ENABLE_BUTTON = ::WM_USER + 111,
-    TDM_ENABLE_RADIO_BUTTON = ::WM_USER + 112,
-    TDM_CLICK_VERIFICATION = ::WM_USER + 113,
-    TDM_UPDATE_ELEMENT_TEXT = ::WM_USER + 114,
-    TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = ::WM_USER + 115,
-    TDM_UPDATE_ICON = ::WM_USER + 116,
-}}
-ENUM!{enum TASKDIALOG_NOTIFICATIONS {
-    TDN_CREATED = 0,
-    TDN_NAVIGATED = 1,
-    TDN_BUTTON_CLICKED = 2,
-    TDN_HYPERLINK_CLICKED = 3,
-    TDN_TIMER = 4,
-    TDN_DESTROYED = 5,
-    TDN_RADIO_BUTTON_CLICKED = 6,
-    TDN_DIALOG_CONSTRUCTED = 7,
-    TDN_VERIFICATION_CLICKED = 8,
-    TDN_HELP = 9,
-    TDN_EXPANDO_BUTTON_CLICKED = 10,
-}}
-STRUCT!{struct TASKDIALOG_BUTTON {
-    nButtonID: ::c_int,
-    pszButtonText: ::PCWSTR,
-}}
-ENUM!{enum TASKDIALOG_ELEMENTS {
-    TDE_CONTENT,
-    TDE_EXPANDED_INFORMATION,
-    TDE_FOOTER,
-    TDE_MAIN_INSTRUCTION,
-}}
-ENUM!{enum TASKDIALOG_ICON_ELEMENTS {
-    TDIE_ICON_MAIN,
-    TDIE_ICON_FOOTER,
-}}
-FLAGS!{enum TASKDIALOG_COMMON_BUTTON_FLAGS {
-    TDCBF_OK_BUTTON = 0x0001,
-    TDCBF_YES_BUTTON = 0x0002,
-    TDCBF_NO_BUTTON = 0x0004,
-    TDCBF_CANCEL_BUTTON = 0x0008,
-    TDCBF_RETRY_BUTTON = 0x0010,
-    TDCBF_CLOSE_BUTTON = 0x0020,
-}}
-STRUCT!{nodebug struct TASKDIALOGCONFIG {
-    cbSize: ::UINT,
-    hwndParent: ::HWND,
-    hInstance: ::HINSTANCE,
-    dwFlags: TASKDIALOG_FLAGS,
-    dwCommonButtons: TASKDIALOG_COMMON_BUTTON_FLAGS,
-    pszWindowTitle: ::PCWSTR,
-    hMainIcon: ::HICON,
-    pszMainInstruction: ::PCWSTR,
-    pszContent: ::PCWSTR,
-    cButtons: ::UINT,
-    pButtons: *const TASKDIALOG_BUTTON,
-    nDefaultButton: ::c_int,
-    cRadioButtons: ::UINT,
-    pRadioButtons: *const TASKDIALOG_BUTTON,
-    nDefaultRadioButton: ::c_int,
-    pszVerificationText: ::PCWSTR,
-    pszExpandedInformation: ::PCWSTR,
-    pszExpandedControlText: ::PCWSTR,
-    pszCollapsedControlText: ::PCWSTR,
-    hFooterIcon: ::HICON,
-    pszFooter: ::PCWSTR,
-    pfCallback: PFTASKDIALOGCALLBACK,
-    lpCallbackData: ::LONG_PTR,
-    cxWidth: ::UINT,
-}}
-UNION!(TASKDIALOGCONFIG, hMainIcon, pszMainIcon, pszMainIcon_mut, ::PCWSTR);
-UNION!(TASKDIALOGCONFIG, hFooterIcon, pszFooterIcon, pszFooterIcon_mut, ::PCWSTR);
-pub const DA_LAST: ::c_int = 0x7FFFFFFF;
-pub const DA_ERR: ::c_int = -1;
-pub type PFNDAENUMCALLBACK = Option<unsafe extern "system" fn(
-    p: *mut ::c_void, pData: *mut ::c_void,
-) -> ::c_int>;
-pub type PFNDAENUMCALLBACKCONST = Option<unsafe extern "system" fn(
-    p: *const ::c_void, pData: *mut ::c_void,
-) -> ::c_int>;
-pub type PFNDACOMPARE = Option<unsafe extern "system" fn(
-    p1: *mut ::c_void, p2: *mut ::c_void, lParam: ::LPARAM,
-) -> ::c_int>;
-pub type PFNDACOMPARECONST = Option<unsafe extern "system" fn(
-    p1: *const ::c_void, p2: *const ::c_void, lParam: ::LPARAM,
-) -> ::c_int>;
-pub enum DSA {}
-pub type HDSA = *mut DSA;
-pub const DSA_APPEND: ::c_int = DA_LAST;
-pub const DSA_ERR: ::c_int = DA_ERR;
-pub type PFNDSAENUMCALLBACK = PFNDAENUMCALLBACK;
-pub type PFNDSAENUMCALLBACKCONST = PFNDAENUMCALLBACKCONST;
-pub type PFNDSACOMPARE = PFNDACOMPARE;
-pub type PFNDSACOMPARECONST = PFNDACOMPARECONST;
-pub enum DPA {}
-pub type HDPA = *mut DPA;
-STRUCT!{struct DPASTREAMINFO {
-    iPos: ::c_int,
-    pvItem: *mut ::c_void,
-}}
-pub type PFNDPASTREAM = Option<unsafe extern "system" fn(
-    pinfo: *mut DPASTREAMINFO, pstream: *mut ::IStream, pvInstData: *mut ::c_void,
-) -> ::HRESULT>;
-pub const DPAM_SORTED: ::DWORD = 0x00000001;
-pub const DPAM_NORMAL: ::DWORD = 0x00000002;
-pub const DPAM_UNION: ::DWORD = 0x00000004;
-pub const DPAM_INTERSECT: ::DWORD = 0x00000008;
-pub type PFNDPAMERGE = Option<unsafe extern "system" fn(
-    uMsg: ::UINT, pvDest: *mut ::c_void, pvSrc: *mut ::c_void, lParam: ::LPARAM,
-) -> *mut ::c_void>;
-pub type PFNDPAMERGECONST = Option<unsafe extern "system" fn(
-    uMsg: ::UINT, pvDest: *const ::c_void, pvSrc: *const ::c_void, lParam: ::LPARAM,
-) -> *const ::c_void>;
-pub const DPAMM_MERGE: ::UINT = 1;
-pub const DPAMM_DELETE: ::UINT = 2;
-pub const DPAMM_INSERT: ::UINT = 3;
-pub const DPAS_SORTED: ::UINT = 0x0001;
-pub const DPAS_INSERTBEFORE: ::UINT = 0x0002;
-pub const DPAS_INSERTAFTER: ::UINT = 0x0004;
-pub const DPA_APPEND: ::c_int = DA_LAST;
-pub const DPA_ERR: ::c_int = DA_ERR;
-pub type PFNDPAENUMCALLBACK = PFNDAENUMCALLBACK;
-pub type PFNDPAENUMCALLBACKCONST = PFNDAENUMCALLBACKCONST;
-pub type PFNDPACOMPARE = PFNDACOMPARE;
-pub type PFNDPACOMPARECONST = PFNDACOMPARECONST;
-pub const WSB_PROP_CYVSCROLL: ::UINT = 0x00000001;
-pub const WSB_PROP_CXHSCROLL: ::UINT = 0x00000002;
-pub const WSB_PROP_CYHSCROLL: ::UINT = 0x00000004;
-pub const WSB_PROP_CXVSCROLL: ::UINT = 0x00000008;
-pub const WSB_PROP_CXHTHUMB: ::UINT = 0x00000010;
-pub const WSB_PROP_CYVTHUMB: ::UINT = 0x00000020;
-pub const WSB_PROP_VBKGCOLOR: ::UINT = 0x00000040;
-pub const WSB_PROP_HBKGCOLOR: ::UINT = 0x00000080;
-pub const WSB_PROP_VSTYLE: ::UINT = 0x00000100;
-pub const WSB_PROP_HSTYLE: ::UINT = 0x00000200;
-pub const WSB_PROP_WINSTYLE: ::UINT = 0x00000400;
-pub const WSB_PROP_PALETTE: ::UINT = 0x00000800;
-pub const WSB_PROP_MASK: ::UINT = 0x00000FFF;
-pub const FSB_FLAT_MODE: ::INT_PTR = 2;
-pub const FSB_ENCARTA_MODE: ::INT_PTR = 1;
-pub const FSB_REGULAR_MODE: ::INT_PTR = 0;
-pub type SUBCLASSPROC = Option<unsafe extern "system" fn(
-    hWnd: ::HWND, uMsg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM, uIdSubclass: ::UINT_PTR,
-    dwRefData: ::DWORD_PTR,
-) -> ::LRESULT>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/commdlg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/commdlg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/commdlg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/commdlg.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,583 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! 32-Bit Common Dialog APIs
-pub type LPOFNHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct OPENFILENAME_NT4A {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpstrFilter: ::LPCSTR,
-    lpstrCustomFilter: ::LPSTR,
-    nMaxCustFilter: ::DWORD,
-    nFilterIndex: ::DWORD,
-    lpstrFile: ::LPSTR,
-    nMaxFile: ::DWORD,
-    lpstrFileTitle: ::LPSTR,
-    nMaxFileTitle: ::DWORD,
-    lpstrInitialDir: ::LPCSTR,
-    lpstrTitle: ::LPCSTR,
-    Flags: ::DWORD,
-    nFileOffset: ::WORD,
-    nFileExtension: ::WORD,
-    lpstrDefExt: ::LPCSTR,
-    lCustData: ::LPARAM,
-    lpfnHook: LPOFNHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-}}
-pub type LPOPENFILENAME_NT4A = *mut OPENFILENAME_NT4A;
-STRUCT!{nodebug struct OPENFILENAME_NT4W {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpstrFilter: ::LPCWSTR,
-    lpstrCustomFilter: ::LPWSTR,
-    nMaxCustFilter: ::DWORD,
-    nFilterIndex: ::DWORD,
-    lpstrFile: ::LPWSTR,
-    nMaxFile: ::DWORD,
-    lpstrFileTitle: ::LPWSTR,
-    nMaxFileTitle: ::DWORD,
-    lpstrInitialDir: ::LPCWSTR,
-    lpstrTitle: ::LPCWSTR,
-    Flags: ::DWORD,
-    nFileOffset: ::WORD,
-    nFileExtension: ::WORD,
-    lpstrDefExt: ::LPCWSTR,
-    lCustData: ::LPARAM,
-    lpfnHook: LPOFNHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-}}
-pub type LPOPENFILENAME_NT4W = *mut OPENFILENAME_NT4W;
-STRUCT!{nodebug struct OPENFILENAMEA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpstrFilter: ::LPCSTR,
-    lpstrCustomFilter: ::LPSTR,
-    nMaxCustFilter: ::DWORD,
-    nFilterIndex: ::DWORD,
-    lpstrFile: ::LPSTR,
-    nMaxFile: ::DWORD,
-    lpstrFileTitle: ::LPSTR,
-    nMaxFileTitle: ::DWORD,
-    lpstrInitialDir: ::LPCSTR,
-    lpstrTitle: ::LPCSTR,
-    Flags: ::DWORD,
-    nFileOffset: ::WORD,
-    nFileExtension: ::WORD,
-    lpstrDefExt: ::LPCSTR,
-    lCustData: ::LPARAM,
-    lpfnHook: LPOFNHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-    pvReserved: *mut ::c_void,
-    dwReserved: ::DWORD,
-    FlagsEx: ::DWORD,
-}}
-pub type LPOPENFILENAMEA = *mut OPENFILENAMEA;
-STRUCT!{nodebug struct OPENFILENAMEW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpstrFilter: ::LPCWSTR,
-    lpstrCustomFilter: ::LPWSTR,
-    nMaxCustFilter: ::DWORD,
-    nFilterIndex: ::DWORD,
-    lpstrFile: ::LPWSTR,
-    nMaxFile: ::DWORD,
-    lpstrFileTitle: ::LPWSTR,
-    nMaxFileTitle: ::DWORD,
-    lpstrInitialDir: ::LPCWSTR,
-    lpstrTitle: ::LPCWSTR,
-    Flags: ::DWORD,
-    nFileOffset: ::WORD,
-    nFileExtension: ::WORD,
-    lpstrDefExt: ::LPCWSTR,
-    lCustData: ::LPARAM,
-    lpfnHook: LPOFNHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-    pvReserved: *mut ::c_void,
-    dwReserved: ::DWORD,
-    FlagsEx: ::DWORD,
-}}
-pub type LPOPENFILENAMEW = *mut OPENFILENAMEW;
-pub const OFN_READONLY: ::DWORD = 0x00000001;
-pub const OFN_OVERWRITEPROMPT: ::DWORD = 0x00000002;
-pub const OFN_HIDEREADONLY: ::DWORD = 0x00000004;
-pub const OFN_NOCHANGEDIR: ::DWORD = 0x00000008;
-pub const OFN_SHOWHELP: ::DWORD = 0x00000010;
-pub const OFN_ENABLEHOOK: ::DWORD = 0x00000020;
-pub const OFN_ENABLETEMPLATE: ::DWORD = 0x00000040;
-pub const OFN_ENABLETEMPLATEHANDLE: ::DWORD = 0x00000080;
-pub const OFN_NOVALIDATE: ::DWORD = 0x00000100;
-pub const OFN_ALLOWMULTISELECT: ::DWORD = 0x00000200;
-pub const OFN_EXTENSIONDIFFERENT: ::DWORD = 0x00000400;
-pub const OFN_PATHMUSTEXIST: ::DWORD = 0x00000800;
-pub const OFN_FILEMUSTEXIST: ::DWORD = 0x00001000;
-pub const OFN_CREATEPROMPT: ::DWORD = 0x00002000;
-pub const OFN_SHAREAWARE: ::DWORD = 0x00004000;
-pub const OFN_NOREADONLYRETURN: ::DWORD = 0x00008000;
-pub const OFN_NOTESTFILECREATE: ::DWORD = 0x00010000;
-pub const OFN_NONETWORKBUTTON: ::DWORD = 0x00020000;
-pub const OFN_NOLONGNAMES: ::DWORD = 0x00040000;
-pub const OFN_EXPLORER: ::DWORD = 0x00080000;
-pub const OFN_NODEREFERENCELINKS: ::DWORD = 0x00100000;
-pub const OFN_LONGNAMES: ::DWORD = 0x00200000;
-pub const OFN_ENABLEINCLUDENOTIFY: ::DWORD = 0x00400000;
-pub const OFN_ENABLESIZING: ::DWORD = 0x00800000;
-pub const OFN_DONTADDTORECENT: ::DWORD = 0x02000000;
-pub const OFN_FORCESHOWHIDDEN: ::DWORD = 0x10000000;
-pub const OFN_EX_NOPLACESBAR: ::DWORD = 0x00000001;
-pub const OFN_SHAREFALLTHROUGH: ::UINT_PTR = 2;
-pub const OFN_SHARENOWARN: ::UINT_PTR = 1;
-pub const OFN_SHAREWARN: ::UINT_PTR = 0;
-pub type LPCCHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{struct OFNOTIFYA {
-    hdr: ::NMHDR,
-    lpOFN: LPOPENFILENAMEA,
-    pszFile: ::LPSTR,
-}}
-pub type LPOFNOTIFYA = *mut OFNOTIFYA;
-STRUCT!{struct OFNOTIFYW {
-    hdr: ::NMHDR,
-    lpOFN: LPOPENFILENAMEW,
-    pszFile: ::LPWSTR,
-}}
-pub type LPOFNOTIFYW = *mut OFNOTIFYW;
-STRUCT!{struct OFNOTIFYEXA {
-    hdr: ::NMHDR,
-    lpOFN: LPOPENFILENAMEA,
-    psf: ::LPVOID,
-    pidl: ::LPVOID,
-}}
-pub type LPOFNOTIFYEXA = *mut OFNOTIFYEXA;
-STRUCT!{struct OFNOTIFYEXW {
-    hdr: ::NMHDR,
-    lpOFN: LPOPENFILENAMEW,
-    psf: ::LPVOID,
-    pidl: ::LPVOID,
-}}
-pub type LPOFNOTIFYEXW = *mut OFNOTIFYEXW;
-pub const CDN_FIRST: ::UINT = -601i32 as ::UINT;
-pub const CDN_LAST: ::UINT = -699i32 as ::UINT;
-pub const CDN_INITDONE: ::UINT = CDN_FIRST - 0x0000;
-pub const CDN_SELCHANGE: ::UINT = CDN_FIRST - 0x0001;
-pub const CDN_FOLDERCHANGE: ::UINT = CDN_FIRST - 0x0002;
-pub const CDN_SHAREVIOLATION: ::UINT = CDN_FIRST - 0x0003;
-pub const CDN_HELP: ::UINT = CDN_FIRST - 0x0004;
-pub const CDN_FILEOK: ::UINT = CDN_FIRST - 0x0005;
-pub const CDN_TYPECHANGE: ::UINT = CDN_FIRST - 0x0006;
-pub const CDN_INCLUDEITEM: ::UINT = CDN_FIRST - 0x0007;
-pub const CDM_FIRST: ::UINT = ::WM_USER + 100;
-pub const CDM_LAST: ::UINT = ::WM_USER + 200;
-pub const CDM_GETSPEC: ::UINT = CDM_FIRST + 0x0000;
-pub const CDM_GETFILEPATH: ::UINT = CDM_FIRST + 0x0001;
-pub const CDM_GETFOLDERPATH: ::UINT = CDM_FIRST + 0x0002;
-pub const CDM_GETFOLDERIDLIST: ::UINT = CDM_FIRST + 0x0003;
-pub const CDM_SETCONTROLTEXT: ::UINT = CDM_FIRST + 0x0004;
-pub const CDM_HIDECONTROL: ::UINT = CDM_FIRST + 0x0005;
-pub const CDM_SETDEFEXT: ::UINT = CDM_FIRST + 0x0006;
-STRUCT!{nodebug struct CHOOSECOLORA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HWND,
-    rgbResult: ::COLORREF,
-    lpCustColors: *mut ::COLORREF,
-    Flags: ::DWORD,
-    lCustData: ::LPARAM,
-    lpfnHook: LPCCHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-}}
-pub type LPCHOOSECOLORA = *mut CHOOSECOLORA;
-STRUCT!{nodebug struct CHOOSECOLORW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HWND,
-    rgbResult: ::COLORREF,
-    lpCustColors: *mut ::COLORREF,
-    Flags: ::DWORD,
-    lCustData: ::LPARAM,
-    lpfnHook: LPCCHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-}}
-pub type LPCHOOSECOLORW = *mut CHOOSECOLORW;
-pub const CC_RGBINIT: ::DWORD = 0x00000001;
-pub const CC_FULLOPEN: ::DWORD = 0x00000002;
-pub const CC_PREVENTFULLOPEN: ::DWORD = 0x00000004;
-pub const CC_SHOWHELP: ::DWORD = 0x00000008;
-pub const CC_ENABLEHOOK: ::DWORD = 0x00000010;
-pub const CC_ENABLETEMPLATE: ::DWORD = 0x00000020;
-pub const CC_ENABLETEMPLATEHANDLE: ::DWORD = 0x00000040;
-pub const CC_SOLIDCOLOR: ::DWORD = 0x00000080;
-pub const CC_ANYCOLOR: ::DWORD = 0x00000100;
-pub type LPFRHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct FINDREPLACEA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    Flags: ::DWORD,
-    lpstrFindWhat: ::LPSTR,
-    lpstrReplaceWith: ::LPSTR,
-    wFindWhatLen: ::WORD,
-    wReplaceWithLen: ::WORD,
-    lCustData: ::LPARAM,
-    lpfnHook: LPFRHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-}}
-pub type LPFINDREPLACEA = *mut FINDREPLACEA;
-STRUCT!{nodebug struct FINDREPLACEW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    Flags: ::DWORD,
-    lpstrFindWhat: ::LPWSTR,
-    lpstrReplaceWith: ::LPWSTR,
-    wFindWhatLen: ::WORD,
-    wReplaceWithLen: ::WORD,
-    lCustData: ::LPARAM,
-    lpfnHook: LPFRHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-}}
-pub type LPFINDREPLACEW = *mut FINDREPLACEW;
-pub const FR_DOWN: ::DWORD = 0x00000001;
-pub const FR_WHOLEWORD: ::DWORD = 0x00000002;
-pub const FR_MATCHCASE: ::DWORD = 0x00000004;
-pub const FR_FINDNEXT: ::DWORD = 0x00000008;
-pub const FR_REPLACE: ::DWORD = 0x00000010;
-pub const FR_REPLACEALL: ::DWORD = 0x00000020;
-pub const FR_DIALOGTERM: ::DWORD = 0x00000040;
-pub const FR_SHOWHELP: ::DWORD = 0x00000080;
-pub const FR_ENABLEHOOK: ::DWORD = 0x00000100;
-pub const FR_ENABLETEMPLATE: ::DWORD = 0x00000200;
-pub const FR_NOUPDOWN: ::DWORD = 0x00000400;
-pub const FR_NOMATCHCASE: ::DWORD = 0x00000800;
-pub const FR_NOWHOLEWORD: ::DWORD = 0x00001000;
-pub const FR_ENABLETEMPLATEHANDLE: ::DWORD = 0x00002000;
-pub const FR_HIDEUPDOWN: ::DWORD = 0x00004000;
-pub const FR_HIDEMATCHCASE: ::DWORD = 0x00008000;
-pub const FR_HIDEWHOLEWORD: ::DWORD = 0x00010000;
-pub const FR_RAW: ::DWORD = 0x00020000;
-pub const FR_MATCHDIAC: ::DWORD = 0x20000000;
-pub const FR_MATCHKASHIDA: ::DWORD = 0x40000000;
-pub const FR_MATCHALEFHAMZA: ::DWORD = 0x80000000;
-pub type LPCFHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct CHOOSEFONTA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDC: ::HDC,
-    lpLogFont: ::LPLOGFONTA,
-    iPointSize: ::INT,
-    Flags: ::DWORD,
-    rgbColors: ::COLORREF,
-    lCustData: ::LPARAM,
-    lpfnHook: LPCFHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-    hInstance: ::HINSTANCE,
-    lpszStyle: ::LPSTR,
-    nFontType: ::WORD,
-    ___MISSING_ALIGNMENT__: ::WORD,
-    nSizeMin: ::INT,
-    nSizeMax: ::INT,
-}}
-pub type LPCHOOSEFONTA = *mut CHOOSEFONTA;
-STRUCT!{nodebug struct CHOOSEFONTW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDC: ::HDC,
-    lpLogFont: ::LPLOGFONTW,
-    iPointSize: ::INT,
-    Flags: ::DWORD,
-    rgbColors: ::COLORREF,
-    lCustData: ::LPARAM,
-    lpfnHook: LPCFHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-    hInstance: ::HINSTANCE,
-    lpszStyle: ::LPWSTR,
-    nFontType: ::WORD,
-    ___MISSING_ALIGNMENT__: ::WORD,
-    nSizeMin: ::INT,
-    nSizeMax: ::INT,
-}}
-pub type LPCHOOSEFONTW = *mut CHOOSEFONTW;
-pub const CF_SCREENFONTS: ::DWORD = 0x00000001;
-pub const CF_PRINTERFONTS: ::DWORD = 0x00000002;
-pub const CF_BOTH: ::DWORD = CF_SCREENFONTS | CF_PRINTERFONTS;
-pub const CF_SHOWHELP: ::DWORD = 0x00000004;
-pub const CF_ENABLEHOOK: ::DWORD = 0x00000008;
-pub const CF_ENABLETEMPLATE: ::DWORD = 0x00000010;
-pub const CF_ENABLETEMPLATEHANDLE: ::DWORD = 0x00000020;
-pub const CF_INITTOLOGFONTSTRUCT: ::DWORD = 0x00000040;
-pub const CF_USESTYLE: ::DWORD = 0x00000080;
-pub const CF_EFFECTS: ::DWORD = 0x00000100;
-pub const CF_APPLY: ::DWORD = 0x00000200;
-pub const CF_ANSIONLY: ::DWORD = 0x00000400;
-pub const CF_SCRIPTSONLY: ::DWORD = CF_ANSIONLY;
-pub const CF_NOVECTORFONTS: ::DWORD = 0x00000800;
-pub const CF_NOOEMFONTS: ::DWORD = CF_NOVECTORFONTS;
-pub const CF_NOSIMULATIONS: ::DWORD = 0x00001000;
-pub const CF_LIMITSIZE: ::DWORD = 0x00002000;
-pub const CF_FIXEDPITCHONLY: ::DWORD = 0x00004000;
-pub const CF_WYSIWYG: ::DWORD = 0x00008000;
-pub const CF_FORCEFONTEXIST: ::DWORD = 0x00010000;
-pub const CF_SCALABLEONLY: ::DWORD = 0x00020000;
-pub const CF_TTONLY: ::DWORD = 0x00040000;
-pub const CF_NOFACESEL: ::DWORD = 0x00080000;
-pub const CF_NOSTYLESEL: ::DWORD = 0x00100000;
-pub const CF_NOSIZESEL: ::DWORD = 0x00200000;
-pub const CF_SELECTSCRIPT: ::DWORD = 0x00400000;
-pub const CF_NOSCRIPTSEL: ::DWORD = 0x00800000;
-pub const CF_NOVERTFONTS: ::DWORD = 0x01000000;
-pub const CF_INACTIVEFONTS: ::DWORD = 0x02000000;
-pub const SIMULATED_FONTTYPE: ::WORD = 0x8000;
-pub const PRINTER_FONTTYPE: ::WORD = 0x4000;
-pub const SCREEN_FONTTYPE: ::WORD = 0x2000;
-pub const BOLD_FONTTYPE: ::WORD = 0x0100;
-pub const ITALIC_FONTTYPE: ::WORD = 0x0200;
-pub const REGULAR_FONTTYPE: ::WORD = 0x0400;
-pub const PS_OPENTYPE_FONTTYPE: ::DWORD = 0x10000;
-pub const TT_OPENTYPE_FONTTYPE: ::DWORD = 0x20000;
-pub const TYPE1_FONTTYPE: ::DWORD = 0x40000;
-pub const SYMBOL_FONTTYPE: ::DWORD = 0x80000;
-pub const WM_CHOOSEFONT_GETLOGFONT: ::UINT = ::WM_USER + 1;
-pub const WM_CHOOSEFONT_SETLOGFONT: ::UINT = ::WM_USER + 101;
-pub const WM_CHOOSEFONT_SETFLAGS: ::UINT = ::WM_USER + 102;
-pub const CD_LBSELNOITEMS: ::WORD = -1i16 as ::WORD;
-pub const CD_LBSELCHANGE: ::WORD = 0;
-pub const CD_LBSELSUB: ::WORD = 1;
-pub const CD_LBSELADD: ::WORD = 2;
-pub type LPPRINTHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-pub type LPSETUPHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct PRINTDLGA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    hDC: ::HDC,
-    Flags: ::DWORD,
-    nFromPage: ::WORD,
-    nToPage: ::WORD,
-    nMinPage: ::WORD,
-    nMaxPage: ::WORD,
-    nCopies: ::WORD,
-    hInstance: ::HINSTANCE,
-    lCustData: ::LPARAM,
-    lpfnPrintHook: LPPRINTHOOKPROC,
-    lpfnSetupHook: LPSETUPHOOKPROC,
-    lpPrintTemplateName: ::LPCSTR,
-    lpSetupTemplateName: ::LPCSTR,
-    hPrintTemplate: ::HGLOBAL,
-    hSetupTemplate: ::HGLOBAL,
-}}
-pub type LPPRINTDLGA = *mut PRINTDLGA;
-STRUCT!{nodebug struct PRINTDLGW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    hDC: ::HDC,
-    Flags: ::DWORD,
-    nFromPage: ::WORD,
-    nToPage: ::WORD,
-    nMinPage: ::WORD,
-    nMaxPage: ::WORD,
-    nCopies: ::WORD,
-    hInstance: ::HINSTANCE,
-    lCustData: ::LPARAM,
-    lpfnPrintHook: LPPRINTHOOKPROC,
-    lpfnSetupHook: LPSETUPHOOKPROC,
-    lpPrintTemplateName: ::LPCWSTR,
-    lpSetupTemplateName: ::LPCWSTR,
-    hPrintTemplate: ::HGLOBAL,
-    hSetupTemplate: ::HGLOBAL,
-}}
-pub type LPPRINTDLGW = *mut PRINTDLGW;
-RIDL!(
-interface IPrintDialogCallback(IPrintDialogCallbackVtbl) : IUnknown(IUnknownVtbl) {
-    fn InitDone(&mut self) -> ::HRESULT,
-    fn SelectionChange(&mut self) -> ::HRESULT,
-    fn HandleMessage(
-        &mut self, hDlg: ::HWND, uMsg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM,
-        pResult: *mut ::LRESULT
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IPrintDialogServices(IPrintDialogServicesVtbl) : IUnknown(IUnknownVtbl) {
-    fn GetCurrentDevMode(&mut self, pDevMode: ::LPDEVMODEW, pcbSize: *mut ::UINT) -> ::HRESULT,
-    fn GetCurrentPrinterName(&mut self, pPrinterName: ::LPWSTR, pcchSize: *mut ::UINT) -> ::HRESULT,
-    fn GetCurrentPortName(&mut self, pPortName: ::LPWSTR, pcchSize: *mut ::UINT) -> ::HRESULT
-}
-);
-STRUCT!{struct PRINTPAGERANGE {
-    nFromPage: ::DWORD,
-    nToPage: ::DWORD,
-}}
-pub type LPPRINTPAGERANGE = *mut PRINTPAGERANGE;
-pub type PCPRINTPAGERANGE = *const PRINTPAGERANGE;
-STRUCT!{struct PRINTDLGEXA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    hDC: ::HDC,
-    Flags: ::DWORD,
-    Flags2: ::DWORD,
-    ExclusionFlags: ::DWORD,
-    nPageRanges: ::DWORD,
-    nMaxPageRanges: ::DWORD,
-    lpPageRanges: LPPRINTPAGERANGE,
-    nMinPage: ::DWORD,
-    nMaxPage: ::DWORD,
-    nCopies: ::DWORD,
-    hInstance: ::HINSTANCE,
-    lpPrintTemplateName: ::LPCSTR,
-    lpCallback: ::LPUNKNOWN,
-    nPropertyPages: ::DWORD,
-    lphPropertyPages: *mut ::HPROPSHEETPAGE,
-    nStartPage: ::DWORD,
-    dwResultAction: ::DWORD,
-}}
-pub type LPPRINTDLGEXA = *mut PRINTDLGEXA;
-STRUCT!{struct PRINTDLGEXW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    hDC: ::HDC,
-    Flags: ::DWORD,
-    Flags2: ::DWORD,
-    ExclusionFlags: ::DWORD,
-    nPageRanges: ::DWORD,
-    nMaxPageRanges: ::DWORD,
-    lpPageRanges: LPPRINTPAGERANGE,
-    nMinPage: ::DWORD,
-    nMaxPage: ::DWORD,
-    nCopies: ::DWORD,
-    hInstance: ::HINSTANCE,
-    lpPrintTemplateName: ::LPCWSTR,
-    lpCallback: ::LPUNKNOWN,
-    nPropertyPages: ::DWORD,
-    lphPropertyPages: *mut ::HPROPSHEETPAGE,
-    nStartPage: ::DWORD,
-    dwResultAction: ::DWORD,
-}}
-pub type LPPRINTDLGEXW = *mut PRINTDLGEXW;
-pub const PD_ALLPAGES: ::DWORD = 0x00000000;
-pub const PD_SELECTION: ::DWORD = 0x00000001;
-pub const PD_PAGENUMS: ::DWORD = 0x00000002;
-pub const PD_NOSELECTION: ::DWORD = 0x00000004;
-pub const PD_NOPAGENUMS: ::DWORD = 0x00000008;
-pub const PD_COLLATE: ::DWORD = 0x00000010;
-pub const PD_PRINTTOFILE: ::DWORD = 0x00000020;
-pub const PD_PRINTSETUP: ::DWORD = 0x00000040;
-pub const PD_NOWARNING: ::DWORD = 0x00000080;
-pub const PD_RETURNDC: ::DWORD = 0x00000100;
-pub const PD_RETURNIC: ::DWORD = 0x00000200;
-pub const PD_RETURNDEFAULT: ::DWORD = 0x00000400;
-pub const PD_SHOWHELP: ::DWORD = 0x00000800;
-pub const PD_ENABLEPRINTHOOK: ::DWORD = 0x00001000;
-pub const PD_ENABLESETUPHOOK: ::DWORD = 0x00002000;
-pub const PD_ENABLEPRINTTEMPLATE: ::DWORD = 0x00004000;
-pub const PD_ENABLESETUPTEMPLATE: ::DWORD = 0x00008000;
-pub const PD_ENABLEPRINTTEMPLATEHANDLE: ::DWORD = 0x00010000;
-pub const PD_ENABLESETUPTEMPLATEHANDLE: ::DWORD = 0x00020000;
-pub const PD_USEDEVMODECOPIES: ::DWORD = 0x00040000;
-pub const PD_USEDEVMODECOPIESANDCOLLATE: ::DWORD = 0x00040000;
-pub const PD_DISABLEPRINTTOFILE: ::DWORD = 0x00080000;
-pub const PD_HIDEPRINTTOFILE: ::DWORD = 0x00100000;
-pub const PD_NONETWORKBUTTON: ::DWORD = 0x00200000;
-pub const PD_CURRENTPAGE: ::DWORD = 0x00400000;
-pub const PD_NOCURRENTPAGE: ::DWORD = 0x00800000;
-pub const PD_EXCLUSIONFLAGS: ::DWORD = 0x01000000;
-pub const PD_USELARGETEMPLATE: ::DWORD = 0x10000000;
-pub const PD_EXCL_COPIESANDCOLLATE: ::DWORD = ::DM_COPIES | ::DM_COLLATE;
-pub const START_PAGE_GENERAL: ::DWORD = 0xffffffff;
-pub const PD_RESULT_CANCEL: ::DWORD = 0;
-pub const PD_RESULT_PRINT: ::DWORD = 1;
-pub const PD_RESULT_APPLY: ::DWORD = 2;
-STRUCT!{struct DEVNAMES {
-    wDriverOffset: ::WORD,
-    wDeviceOffset: ::WORD,
-    wOutputOffset: ::WORD,
-    wDefault: ::WORD,
-}}
-pub type LPDEVNAMES = *mut DEVNAMES;
-pub type PCDEVNAMES = *const DEVNAMES;
-pub const DN_DEFAULTPRN: ::WORD = 0x0001;
-pub const WM_PSD_PAGESETUPDLG: ::UINT = ::WM_USER;
-pub const WM_PSD_FULLPAGERECT: ::UINT = ::WM_USER + 1;
-pub const WM_PSD_MINMARGINRECT: ::UINT = ::WM_USER + 2;
-pub const WM_PSD_MARGINRECT: ::UINT = ::WM_USER + 3;
-pub const WM_PSD_GREEKTEXTRECT: ::UINT = ::WM_USER + 4;
-pub const WM_PSD_ENVSTAMPRECT: ::UINT = ::WM_USER + 5;
-pub const WM_PSD_YAFULLPAGERECT: ::UINT = ::WM_USER + 6;
-pub type LPPAGEPAINTHOOK = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-pub type LPPAGESETUPHOOK = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct PAGESETUPDLGA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    Flags: ::DWORD,
-    ptPaperSize: ::POINT,
-    rtMinMargin: ::RECT,
-    rtMargin: ::RECT,
-    hInstance: ::HINSTANCE,
-    lCustData: ::LPARAM,
-    lpfnPageSetupHook: LPPAGESETUPHOOK,
-    lpfnPagePaintHook: LPPAGEPAINTHOOK,
-    lpPageSetupTemplateName: ::LPCSTR,
-    hPageSetupTemplate: ::HGLOBAL,
-}}
-pub type LPPAGESETUPDLGA = *mut PAGESETUPDLGA;
-STRUCT!{nodebug struct PAGESETUPDLGW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    Flags: ::DWORD,
-    ptPaperSize: ::POINT,
-    rtMinMargin: ::RECT,
-    rtMargin: ::RECT,
-    hInstance: ::HINSTANCE,
-    lCustData: ::LPARAM,
-    lpfnPageSetupHook: LPPAGESETUPHOOK,
-    lpfnPagePaintHook: LPPAGEPAINTHOOK,
-    lpPageSetupTemplateName: ::LPCWSTR,
-    hPageSetupTemplate: ::HGLOBAL,
-}}
-pub type LPPAGESETUPDLGW = *mut PAGESETUPDLGW;
-pub const PSD_DEFAULTMINMARGINS: ::DWORD = 0x00000000;
-pub const PSD_INWININIINTLMEASURE: ::DWORD = 0x00000000;
-pub const PSD_MINMARGINS: ::DWORD = 0x00000001;
-pub const PSD_MARGINS: ::DWORD = 0x00000002;
-pub const PSD_INTHOUSANDTHSOFINCHES: ::DWORD = 0x00000004;
-pub const PSD_INHUNDREDTHSOFMILLIMETERS: ::DWORD = 0x00000008;
-pub const PSD_DISABLEMARGINS: ::DWORD = 0x00000010;
-pub const PSD_DISABLEPRINTER: ::DWORD = 0x00000020;
-pub const PSD_NOWARNING: ::DWORD = 0x00000080;
-pub const PSD_DISABLEORIENTATION: ::DWORD = 0x00000100;
-pub const PSD_RETURNDEFAULT: ::DWORD = 0x00000400;
-pub const PSD_DISABLEPAPER: ::DWORD = 0x00000200;
-pub const PSD_SHOWHELP: ::DWORD = 0x00000800;
-pub const PSD_ENABLEPAGESETUPHOOK: ::DWORD = 0x00002000;
-pub const PSD_ENABLEPAGESETUPTEMPLATE: ::DWORD = 0x00008000;
-pub const PSD_ENABLEPAGESETUPTEMPLATEHANDLE: ::DWORD = 0x00020000;
-pub const PSD_ENABLEPAGEPAINTHOOK: ::DWORD = 0x00040000;
-pub const PSD_DISABLEPAGEPAINTING: ::DWORD = 0x00080000;
-pub const PSD_NONETWORKBUTTON: ::DWORD = 0x00200000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/corsym.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/corsym.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/corsym.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/corsym.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Common Language Runtime Debugging Symbol Reader/Writer/Binder Interfaces
-DEFINE_GUID!(CorSym_LanguageType_C, 0x63a08714, 0xfc37, 0x11d2,
-    0x90, 0x4c, 0x0, 0xc0, 0x4f, 0xa3, 0x02, 0xa1);
-DEFINE_GUID!(CorSym_LanguageType_CPlusPlus, 0x3a12d0b7, 0xc26c, 0x11d0,
-    0xb4, 0x42, 0x0, 0xa0, 0x24, 0x4a, 0x1d, 0xd2);
-DEFINE_GUID!(CorSym_LanguageType_CSharp, 0x3f5162f8, 0x07c6, 0x11d3,
-    0x90, 0x53, 0x0, 0xc0, 0x4f, 0xa3, 0x02, 0xa1);
-DEFINE_GUID!(CorSym_LanguageType_Basic, 0x3a12d0b8, 0xc26c, 0x11d0,
-    0xb4, 0x42, 0x0, 0xa0, 0x24, 0x4a, 0x1d, 0xd2);
-DEFINE_GUID!(CorSym_LanguageType_Java, 0x3a12d0b4, 0xc26c, 0x11d0,
-    0xb4, 0x42, 0x0, 0xa0, 0x24, 0x4a, 0x1d, 0xd2);
-DEFINE_GUID!(CorSym_LanguageType_Cobol, 0xaf046cd1, 0xd0e1, 0x11d2,
-    0x97, 0x7c, 0x0, 0xa0, 0xc9, 0xb4, 0xd5, 0xc);
-DEFINE_GUID!(CorSym_LanguageType_Pascal, 0xaf046cd2, 0xd0e1, 0x11d2,
-    0x97, 0x7c, 0x0, 0xa0, 0xc9, 0xb4, 0xd5, 0xc);
-DEFINE_GUID!(CorSym_LanguageType_ILAssembly, 0xaf046cd3, 0xd0e1, 0x11d2,
-    0x97, 0x7c, 0x0, 0xa0, 0xc9, 0xb4, 0xd5, 0xc);
-DEFINE_GUID!(CorSym_LanguageType_JScript, 0x3a12d0b6, 0xc26c, 0x11d0,
-    0xb4, 0x42, 0x00, 0xa0, 0x24, 0x4a, 0x1d, 0xd2);
-DEFINE_GUID!(CorSym_LanguageType_SMC, 0xd9b9f7b, 0x6611, 0x11d3,
-    0xbd, 0x2a, 0x0, 0x0, 0xf8, 0x8, 0x49, 0xbd);
-DEFINE_GUID!(CorSym_LanguageType_MCPlusPlus, 0x4b35fde8, 0x07c6, 0x11d3,
-    0x90, 0x53, 0x0, 0xc0, 0x4f, 0xa3, 0x02, 0xa1);
-DEFINE_GUID!(CorSym_LanguageVendor_Microsoft, 0x994b45c4, 0xe6e9, 0x11d2,
-    0x90, 0x3f, 0x00, 0xc0, 0x4f, 0xa3, 0x02, 0xa1);
-DEFINE_GUID!(CorSym_DocumentType_Text, 0x5a869d0b, 0x6611, 0x11d3,
-    0xbd, 0x2a, 0x0, 0x0, 0xf8, 0x8, 0x49, 0xbd);
-DEFINE_GUID!(CorSym_DocumentType_MC, 0xeb40cb65, 0x3c1f, 0x4352,
-    0x9d, 0x7b, 0xba, 0xf, 0xc4, 0x7a, 0x9d, 0x77);
-DEFINE_GUID!(CorSym_SourceHash_MD5,  0x406ea660, 0x64cf, 0x4c82,
-    0xb6, 0xf0, 0x42, 0xd4, 0x81, 0x72, 0xa7, 0x99);
-DEFINE_GUID!(CorSym_SourceHash_SHA1, 0xff1816ec, 0xaa5e, 0x4d10,
-    0x87, 0xf7, 0x6f, 0x49, 0x63, 0x83, 0x34, 0x60);
-ENUM!{enum CorSymAddrKind {
-    ADDR_IL_OFFSET = 1,
-    ADDR_NATIVE_RVA = 2,
-    ADDR_NATIVE_REGISTER = 3,
-    ADDR_NATIVE_REGREL = 4,
-    ADDR_NATIVE_OFFSET = 5,
-    ADDR_NATIVE_REGREG = 6,
-    ADDR_NATIVE_REGSTK = 7,
-    ADDR_NATIVE_STKREG = 8,
-    ADDR_BITFIELD = 9,
-    ADDR_NATIVE_ISECTOFFSET = 10,
-}}
-FLAGS!{enum CorSymVarFlag {
-    VAR_IS_COMP_GEN = 1,
-}}
-RIDL!(
-interface ISymUnmanagedBinder(ISymUnmanagedBinderVtbl): IUnknown(IUnknownVtbl) {
-    fn GetReaderForFile(
-        &mut self, importer: *mut ::IUnknown, fileName: *const ::WCHAR, searchPath: *const ::WCHAR,
-        pRetVal: *mut *mut ISymUnmanagedReader
-    ) -> ::HRESULT,
-    fn GetReaderFromStream(
-        &mut self, importer: *mut ::IUnknown, pstream: *mut ::IStream,
-        pRetVal: *mut *mut ISymUnmanagedReader
-    ) -> ::HRESULT
-}
-);
-FLAGS!{enum CorSymSearchPolicyAttributes {
-    AllowRegistryAccess = 0x1,
-    AllowSymbolServerAccess = 0x2,
-    AllowOriginalPathAccess = 0x4,
-    AllowReferencePathAccess = 0x8,
-}}
-RIDL!(
-interface ISymUnmanagedBinder2(ISymUnmanagedBinder2Vtbl):
-    ISymUnmanagedBinder(ISymUnmanagedBinderVtbl) {
-    fn GetReaderForFile2(
-        &mut self, importer: *mut ::IUnknown, fileName: *const ::WCHAR, searchPath: *const ::WCHAR,
-        searchPolicy: ::ULONG32, pRetVal: *mut *mut ISymUnmanagedReader
-    ) -> ::HRESULT
-}
-);
-#[derive(Clone, Copy)]
-pub struct ISymUnmanagedReader;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d2d1.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d2d1.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d2d1.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d2d1.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,734 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of d2d1.h
-// Types confirmed affected by the ABI issue:
-// D2D1_SIZE_F, D2D1_SIZE_U, D2D1_COLOR_F, D2D1_PIXEL_FORMAT,
-// D2D1_POINT_2F
-pub const D2D1_DEFAULT_FLATTENING_TOLERANCE: ::FLOAT = 0.25;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR: ::DWORD = 0;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR: ::DWORD = 1;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC: ::DWORD = 2;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR: ::DWORD = 3;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC: ::DWORD = 4;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC: ::DWORD = 5;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_FANT: ::DWORD = 6;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR: ::DWORD = 7;
-ENUM!{enum D2D1_GAMMA {
-    D2D1_GAMMA_2_2 = 0,
-    D2D1_GAMMA_1_0 = 1,
-}}
-ENUM!{enum D2D1_OPACITY_MASK_CONTENT {
-    D2D1_OPACITY_MASK_CONTENT_GRAPHICS = 0,
-    D2D1_OPACITY_MASK_CONTENT_TEXT_NATURAL = 1,
-    D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE = 2,
-}}
-ENUM!{enum D2D1_EXTEND_MODE {
-    D2D1_EXTEND_MODE_CLAMP = 0,
-    D2D1_EXTEND_MODE_WRAP = 1,
-    D2D1_EXTEND_MODE_MIRROR = 2,
-}}
-ENUM!{enum D2D1_ANTIALIAS_MODE {
-    D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0,
-    D2D1_ANTIALIAS_MODE_ALIASED = 1,
-}}
-ENUM!{enum D2D1_TEXT_ANTIALIAS_MODE {
-    D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0,
-    D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1,
-    D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2,
-    D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3,
-}}
-ENUM!{enum D2D1_BITMAP_INTERPOLATION_MODE {
-    D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR =
-        D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR,
-    D2D1_BITMAP_INTERPOLATION_MODE_LINEAR =
-        D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR,
-}}
-FLAGS!{enum D2D1_DRAW_TEXT_OPTIONS {
-    D2D1_DRAW_TEXT_OPTIONS_NO_SNAP = 0x00000001,
-    D2D1_DRAW_TEXT_OPTIONS_CLIP = 0x00000002,
-    D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT = 0x00000004,
-    D2D1_DRAW_TEXT_OPTIONS_NONE = 0x00000000,
-}}
-pub type D2D1_POINT_2U = ::D2D_POINT_2U;
-pub type D2D1_POINT_2F = ::D2D_POINT_2F;
-pub type D2D1_RECT_F = ::D2D_RECT_F;
-pub type D2D1_RECT_U = ::D2D_RECT_U;
-pub type D2D1_SIZE_F = ::D2D_SIZE_F;
-pub type D2D1_SIZE_U = ::D2D_SIZE_U;
-pub type D2D1_COLOR_F = ::D2D_COLOR_F;
-pub type D2D1_MATRIX_3X2_F = ::D2D_MATRIX_3X2_F;
-pub type D2D1_TAG = ::UINT64;
-STRUCT!{struct D2D1_BITMAP_PROPERTIES {
-    pixelFormat: ::D2D1_PIXEL_FORMAT,
-    dpiX: ::FLOAT,
-    dpiY: ::FLOAT,
-}}
-STRUCT!{struct D2D1_GRADIENT_STOP {
-    position: ::FLOAT,
-    color: D2D1_COLOR_F,
-}}
-STRUCT!{struct D2D1_BRUSH_PROPERTIES {
-    opacity: ::FLOAT,
-    transform: D2D1_MATRIX_3X2_F,
-}}
-STRUCT!{struct D2D1_BITMAP_BRUSH_PROPERTIES {
-    extendModeX: D2D1_EXTEND_MODE,
-    extendModeY: D2D1_EXTEND_MODE,
-    interpolationMode: D2D1_BITMAP_INTERPOLATION_MODE,
-}}
-STRUCT!{struct D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES {
-    startPoint: ::D2D1_POINT_2F,
-    endPoint: ::D2D1_POINT_2F,
-}}
-STRUCT!{struct D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES {
-    center: ::D2D1_POINT_2F,
-    gradientOriginOffset: ::D2D1_POINT_2F,
-    radiusX: ::FLOAT,
-    radiusY: ::FLOAT,
-}}
-ENUM!{enum D2D1_ARC_SIZE {
-    D2D1_ARC_SIZE_SMALL = 0,
-    D2D1_ARC_SIZE_LARGE = 1,
-}}
-ENUM!{enum D2D1_CAP_STYLE {
-    D2D1_CAP_STYLE_FLAT = 0,
-    D2D1_CAP_STYLE_SQUARE = 1,
-    D2D1_CAP_STYLE_ROUND = 2,
-    D2D1_CAP_STYLE_TRIANGLE = 3,
-}}
-ENUM!{enum D2D1_DASH_STYLE {
-    D2D1_DASH_STYLE_SOLID = 0,
-    D2D1_DASH_STYLE_DASH = 1,
-    D2D1_DASH_STYLE_DOT = 2,
-    D2D1_DASH_STYLE_DASH_DOT = 3,
-    D2D1_DASH_STYLE_DASH_DOT_DOT = 4,
-    D2D1_DASH_STYLE_CUSTOM = 5,
-}}
-ENUM!{enum D2D1_LINE_JOIN {
-    D2D1_LINE_JOIN_MITER = 0,
-    D2D1_LINE_JOIN_BEVEL = 1,
-    D2D1_LINE_JOIN_ROUND = 2,
-    D2D1_LINE_JOIN_MITER_OR_BEVEL = 3,
-}}
-ENUM!{enum D2D1_COMBINE_MODE {
-    D2D1_COMBINE_MODE_UNION = 0,
-    D2D1_COMBINE_MODE_INTERSECT = 1,
-    D2D1_COMBINE_MODE_XOR = 2,
-    D2D1_COMBINE_MODE_EXCLUDE = 3,
-}}
-ENUM!{enum D2D1_GEOMETRY_RELATION {
-    D2D1_GEOMETRY_RELATION_UNKNOWN = 0,
-    D2D1_GEOMETRY_RELATION_DISJOINT = 1,
-    D2D1_GEOMETRY_RELATION_IS_CONTAINED = 2,
-    D2D1_GEOMETRY_RELATION_CONTAINS = 3,
-    D2D1_GEOMETRY_RELATION_OVERLAP = 4,
-}}
-ENUM!{enum D2D1_GEOMETRY_SIMPLIFICATION_OPTION {
-    D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES = 0,
-    D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES = 1,
-}}
-ENUM!{enum D2D1_FIGURE_BEGIN {
-    D2D1_FIGURE_BEGIN_FILLED = 0,
-    D2D1_FIGURE_BEGIN_HOLLOW = 1,
-}}
-ENUM!{enum D2D1_FIGURE_END {
-    D2D1_FIGURE_END_OPEN = 0,
-    D2D1_FIGURE_END_CLOSED = 1,
-}}
-STRUCT!{struct D2D1_BEZIER_SEGMENT {
-    point1: ::D2D1_POINT_2F,
-    point2: ::D2D1_POINT_2F,
-    point3: ::D2D1_POINT_2F,
-}}
-STRUCT!{struct D2D1_TRIANGLE {
-    point1: ::D2D1_POINT_2F,
-    point2: ::D2D1_POINT_2F,
-    point3: ::D2D1_POINT_2F,
-}}
-FLAGS!{enum D2D1_PATH_SEGMENT {
-    D2D1_PATH_SEGMENT_NONE = 0x00000000,
-    D2D1_PATH_SEGMENT_FORCE_UNSTROKED = 0x00000001,
-    D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN = 0x00000002,
-}}
-ENUM!{enum D2D1_SWEEP_DIRECTION {
-    D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE = 0,
-    D2D1_SWEEP_DIRECTION_CLOCKWISE = 1,
-}}
-ENUM!{enum D2D1_FILL_MODE {
-    D2D1_FILL_MODE_ALTERNATE = 0,
-    D2D1_FILL_MODE_WINDING = 1,
-}}
-STRUCT!{struct D2D1_ARC_SEGMENT {
-    point: ::D2D1_POINT_2F,
-    size: D2D1_SIZE_F,
-    rotationAngle: ::FLOAT,
-    sweepDirection: D2D1_SWEEP_DIRECTION,
-    arcSize: D2D1_ARC_SIZE,
-}}
-STRUCT!{struct D2D1_QUADRATIC_BEZIER_SEGMENT {
-    point1: ::D2D1_POINT_2F,
-    point2: ::D2D1_POINT_2F,
-}}
-STRUCT!{struct D2D1_ELLIPSE {
-    point: ::D2D1_POINT_2F,
-    radiusX: ::FLOAT,
-    radiusY: ::FLOAT,
-}}
-STRUCT!{struct D2D1_ROUNDED_RECT {
-    rect: ::D2D1_RECT_F,
-    radiusX: ::FLOAT,
-    radiusY: ::FLOAT,
-}}
-STRUCT!{struct D2D1_STROKE_STYLE_PROPERTIES {
-    startCap: D2D1_CAP_STYLE,
-    endCap: D2D1_CAP_STYLE,
-    dashCap: D2D1_CAP_STYLE,
-    lineJoin: D2D1_LINE_JOIN,
-    miterLimit: ::FLOAT,
-    dashStyle: D2D1_DASH_STYLE,
-    dashOffset: ::FLOAT,
-}}
-FLAGS!{enum D2D1_LAYER_OPTIONS {
-    D2D1_LAYER_OPTIONS_NONE = 0x00000000,
-    D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE = 0x00000001,
-}}
-STRUCT!{struct D2D1_LAYER_PARAMETERS {
-    contentBounds: ::D2D1_RECT_F,
-    geometricMask: *mut ID2D1Geometry,
-    maskAntialiasMode: D2D1_ANTIALIAS_MODE,
-    maskTransform: D2D1_MATRIX_3X2_F,
-    opacity: ::FLOAT,
-    opacityBrush: *mut ID2D1Brush,
-    layerOptions: D2D1_LAYER_OPTIONS,
-}}
-ENUM!{enum D2D1_WINDOW_STATE {
-    D2D1_WINDOW_STATE_NONE = 0x0000000,
-    D2D1_WINDOW_STATE_OCCLUDED = 0x0000001,
-}}
-ENUM!{enum D2D1_RENDER_TARGET_TYPE {
-    D2D1_RENDER_TARGET_TYPE_DEFAULT = 0,
-    D2D1_RENDER_TARGET_TYPE_SOFTWARE = 1,
-    D2D1_RENDER_TARGET_TYPE_HARDWARE = 2,
-}}
-ENUM!{enum D2D1_FEATURE_LEVEL {
-    D2D1_FEATURE_LEVEL_DEFAULT = 0,
-    D2D1_FEATURE_LEVEL_9 = ::D3D_FEATURE_LEVEL_9_1.0,
-    D2D1_FEATURE_LEVEL_10 = ::D3D_FEATURE_LEVEL_10_0.0,
-}}
-FLAGS!{enum D2D1_RENDER_TARGET_USAGE {
-    D2D1_RENDER_TARGET_USAGE_NONE = 0x00000000,
-    D2D1_RENDER_TARGET_USAGE_FORCE_BITMAP_REMOTING = 0x00000001,
-    D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE = 0x00000002,
-}}
-FLAGS!{enum D2D1_PRESENT_OPTIONS {
-    D2D1_PRESENT_OPTIONS_NONE = 0x00000000,
-    D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS = 0x00000001,
-    D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002,
-}}
-STRUCT!{struct D2D1_RENDER_TARGET_PROPERTIES {
-    _type: D2D1_RENDER_TARGET_TYPE,
-    pixelFormat: ::D2D1_PIXEL_FORMAT,
-    dpiX: ::FLOAT,
-    dpiY: ::FLOAT,
-    usage: D2D1_RENDER_TARGET_USAGE,
-    minLevel: D2D1_FEATURE_LEVEL,
-}}
-STRUCT!{struct D2D1_HWND_RENDER_TARGET_PROPERTIES {
-    hwnd: ::HWND,
-    pixelSize: D2D1_SIZE_U,
-    presentOptions: D2D1_PRESENT_OPTIONS,
-}}
-FLAGS!{enum D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS {
-    D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE = 0x00000000,
-    D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE = 0x00000001,
-}}
-STRUCT!{struct D2D1_DRAWING_STATE_DESCRIPTION {
-    antialiasMode: D2D1_ANTIALIAS_MODE,
-    textAntialiasMode: D2D1_TEXT_ANTIALIAS_MODE,
-    tag1: D2D1_TAG,
-    tag2: D2D1_TAG,
-    transform: D2D1_MATRIX_3X2_F,
-}}
-ENUM!{enum D2D1_DC_INITIALIZE_MODE {
-    D2D1_DC_INITIALIZE_MODE_COPY = 0,
-    D2D1_DC_INITIALIZE_MODE_CLEAR = 1,
-}}
-ENUM!{enum D2D1_DEBUG_LEVEL {
-    D2D1_DEBUG_LEVEL_NONE = 0,
-    D2D1_DEBUG_LEVEL_ERROR = 1,
-    D2D1_DEBUG_LEVEL_WARNING = 2,
-    D2D1_DEBUG_LEVEL_INFORMATION = 3,
-}}
-ENUM!{enum D2D1_FACTORY_TYPE {
-    D2D1_FACTORY_TYPE_SINGLE_THREADED = 0,
-    D2D1_FACTORY_TYPE_MULTI_THREADED = 1,
-}}
-STRUCT!{struct D2D1_FACTORY_OPTIONS {
-    debugLevel: D2D1_DEBUG_LEVEL,
-}}
-RIDL!(
-interface ID2D1Resource(ID2D1ResourceVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFactory(&mut self, factory: *mut *mut ID2D1Factory) -> ()
-});
-RIDL!(
-interface ID2D1Image(ID2D1ImageVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-});
-RIDL!(
-interface ID2D1Bitmap(ID2D1BitmapVtbl): ID2D1Image(ID2D1ImageVtbl) {
-    fn GetSize(&mut self, ret: *mut D2D1_SIZE_F) -> *mut D2D1_SIZE_F, // FIXME: ABI issue
-    fn GetPixelSize(&mut self, ret: *mut D2D1_SIZE_U) -> *mut D2D1_SIZE_U, // FIXME: ABI issue
-    fn GetPixelFormat(
-        &mut self, ret: *mut ::D2D1_PIXEL_FORMAT
-    ) -> *mut ::D2D1_PIXEL_FORMAT, // FIXME: ABI issue
-    fn GetDpi(&mut self, dpiX: *mut ::FLOAT, dpiY: *mut ::FLOAT) -> (),
-    fn CopyFromBitmap(
-        &mut self, destPoint: *const ::D2D1_POINT_2U, bitmap: *mut ID2D1Bitmap,
-        srcRect: *const ::D2D1_RECT_U
-    ) -> ::HRESULT,
-    fn CopyFromRenderTarget(
-        &mut self, destPoint: *const ::D2D1_POINT_2U, renderTarget: *mut ID2D1RenderTarget,
-        srcRect: *const ::D2D1_RECT_U
-    ) -> ::HRESULT,
-    fn CopyFromMemory(
-        &mut self, dstRect: *const ::D2D1_RECT_U, srcData: *const ::c_void, pitch: ::UINT32
-    ) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1GradientStopCollection(ID2D1GradientStopCollectionVtbl)
-    : ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetGradientStopCount(&mut self) -> ::UINT32,
-    fn GetGradientStops(
-        &mut self, gradientStops: *mut D2D1_GRADIENT_STOP, gradientStopsCount: ::UINT32
-    ) -> (),
-    fn GetColorInterpolationGamma(&mut self) -> D2D1_GAMMA,
-    fn GetExtendMode(&mut self) -> D2D1_EXTEND_MODE
-});
-RIDL!(
-interface ID2D1Brush(ID2D1BrushVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn SetOpacity(&mut self, opacity: ::FLOAT) -> (),
-    fn SetTransform(&mut self, transform: *const D2D1_MATRIX_3X2_F) -> (),
-    fn GetOpacity(&mut self) -> ::FLOAT,
-    fn GetTransform(&mut self, transform: *mut D2D1_MATRIX_3X2_F) -> ()
-});
-RIDL!(
-interface ID2D1BitmapBrush(ID2D1BitmapBrushVtbl): ID2D1Brush(ID2D1BrushVtbl) {
-    fn SetExtendModeX(&mut self, extendModeX: D2D1_EXTEND_MODE) -> (),
-    fn SetExtendModeY(&mut self, extendModeY: D2D1_EXTEND_MODE) -> (),
-    fn SetInterpolationMode(&mut self, interpolationMode: D2D1_BITMAP_INTERPOLATION_MODE) -> (),
-    fn SetBitmap(&mut self, bitmap: *mut ID2D1Bitmap) -> (),
-    fn GetExtendModeX(&mut self) -> D2D1_EXTEND_MODE,
-    fn GetExtendModeY(&mut self) -> D2D1_EXTEND_MODE,
-    fn GetInterpolationMode(&mut self) -> D2D1_BITMAP_INTERPOLATION_MODE,
-    fn GetBitmap(&mut self, bitmap: *mut *mut ID2D1Bitmap) -> ()
-});
-RIDL!(
-interface ID2D1SolidColorBrush(ID2D1SolidColorBrushVtbl): ID2D1Brush(ID2D1BrushVtbl) {
-    fn SetColor(&mut self, color: *const D2D1_COLOR_F) -> (),
-    fn GetColor(&mut self, color: *mut D2D1_COLOR_F) -> *mut D2D1_COLOR_F
-});
-RIDL!(
-interface ID2D1LinearGradientBrush(ID2D1LinearGradientBrushVtbl): ID2D1Brush(ID2D1BrushVtbl) {
-    fn SetStartPoint(&mut self, startPoint: ::D2D1_POINT_2F) -> (),
-    fn SetEndPoint(&mut self, endPoint: ::D2D1_POINT_2F) -> (),
-    fn GetStartPoint(&mut self, ret: *mut D2D1_POINT_2F) -> *mut D2D1_POINT_2F, // FIXME ABI issue
-    fn GetEndPoint(&mut self, ret: *mut D2D1_POINT_2F) -> *mut D2D1_POINT_2F, // FIXME ABI issue
-    fn GetGradientStopCollection(
-        &mut self, gradientStopCollection: *mut *mut ID2D1GradientStopCollection
-    ) -> ()
-});
-RIDL!(
-interface ID2D1RadialGradientBrush(ID2D1RadialGradientBrushVtbl): ID2D1Brush(ID2D1BrushVtbl) {
-    fn SetCenter(&mut self, center: ::D2D1_POINT_2F) -> (),
-    fn SetGradientOriginOffset(&mut self, gradientOriginOffset: ::D2D1_POINT_2F) -> (),
-    fn SetRadiusX(&mut self, radiusX: ::FLOAT) -> (),
-    fn SetRadiusY(&mut self, radiusY: ::FLOAT) -> (),
-    fn GetCenter(&mut self, ret: *mut D2D1_POINT_2F) -> *mut D2D1_POINT_2F, // FIXME ABI issue
-    fn GetGradientOriginOffset(
-        &mut self, ret: *mut D2D1_POINT_2F
-    ) -> *mut D2D1_POINT_2F, // FIXME ABI issue
-    fn GetRadiusX(&mut self) -> ::FLOAT,
-    fn GetRadiusY(&mut self) -> ::FLOAT,
-    fn GetGradientStopCollection(
-        &mut self, gradientStopCollection: *mut *mut ID2D1GradientStopCollection
-    ) -> ()
-});
-RIDL!(
-interface ID2D1StrokeStyle(ID2D1StrokeStyleVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetStartCap(&mut self) -> D2D1_CAP_STYLE,
-    fn GetEndCap(&mut self) -> D2D1_CAP_STYLE,
-    fn GetDashCap(&mut self) -> D2D1_CAP_STYLE,
-    fn GetMiterLimit(&mut self) -> ::FLOAT,
-    fn GetLineJoin(&mut self) -> D2D1_LINE_JOIN,
-    fn GetDashOffset(&mut self) -> ::FLOAT,
-    fn GetDashStyle(&mut self) -> D2D1_DASH_STYLE,
-    fn GetDashesCount(&mut self) -> ::UINT32,
-    fn GetDashes(&mut self, dashes: *mut ::FLOAT, dashesCount: ::UINT32) -> ()
-});
-RIDL!(
-interface ID2D1Geometry(ID2D1GeometryVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetBounds(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, bounds: *mut ::D2D1_RECT_F
-    ) -> ::HRESULT,
-    fn GetWidenedBounds(
-        &mut self, strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle,
-        worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        bounds: *mut ::D2D1_RECT_F
-    ) -> ::HRESULT,
-    fn StrokeContainsPoint(
-        &mut self, point: ::D2D1_POINT_2F, strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle,
-        worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        contains: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn FillContainsPoint(
-        &mut self, point: ::D2D1_POINT_2F, worldTransform: *const D2D1_MATRIX_3X2_F,
-        flatteningTolerance: ::FLOAT, contains: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn CompareWithGeometry(
-        &mut self, inputGeometry: *mut ID2D1Geometry,
-        inputGeometryTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        relation: *mut D2D1_GEOMETRY_RELATION
-    ) -> ::HRESULT,
-    fn Simplify(
-        &mut self, simplificationOption: D2D1_GEOMETRY_SIMPLIFICATION_OPTION,
-        worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        geometrySink: *mut ID2D1SimplifiedGeometrySink
-    ) -> ::HRESULT,
-    fn Tessellate(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        tessellationSink: *mut ID2D1TessellationSink
-    ) -> ::HRESULT,
-    fn CombineWithGeometry(
-        &mut self, inputGeometry: *mut ID2D1Geometry, combineMode: D2D1_COMBINE_MODE,
-        inputGeometryTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        geometrySink: *mut ID2D1SimplifiedGeometrySink
-    ) -> ::HRESULT,
-    fn Outline(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        geometrySink: *mut ID2D1SimplifiedGeometrySink
-    ) -> ::HRESULT,
-    fn ComputeArea(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        area: *mut ::FLOAT
-    ) -> ::HRESULT,
-    fn ComputeLength(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        length: *mut ::FLOAT
-    ) -> ::HRESULT,
-    fn ComputePointAtLength(
-        &mut self, length: ::FLOAT, worldTransform: *const D2D1_MATRIX_3X2_F,
-        flatteningTolerance: ::FLOAT, point: *mut ::D2D1_POINT_2F,
-        unitTangentVector: *mut ::D2D1_POINT_2F
-    ) -> ::HRESULT,
-    fn Widen(
-        &mut self, strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle,
-        worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        geometrySink: *mut ID2D1SimplifiedGeometrySink
-    ) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1RectangleGeometry(ID2D1RectangleGeometryVtbl): ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetRect(&mut self, rect: *mut ::D2D1_RECT_F) -> ()
-});
-RIDL!(
-interface ID2D1RoundedRectangleGeometry(ID2D1RoundedRectangleGeometryVtbl)
-    : ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetRoundedRect(&mut self, roundedRect: *mut D2D1_ROUNDED_RECT) -> ()
-});
-RIDL!(
-interface ID2D1EllipseGeometry(ID2D1EllipseGeometryVtbl): ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetEllipse(&mut self, ellipse: *mut D2D1_ELLIPSE) -> ()
-});
-RIDL!(
-interface ID2D1GeometryGroup(ID2D1GeometryGroupVtbl): ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetFillMode(&mut self) -> D2D1_FILL_MODE,
-    fn GetSourceGeometryCount(&mut self) -> ::UINT32,
-    fn GetSourceGeometries(
-        &mut self, geometries: *mut *mut ID2D1Geometry, geometriesCount: ::UINT32
-    ) -> ()
-});
-RIDL!(
-interface ID2D1TransformedGeometry(ID2D1TransformedGeometryVtbl)
-    : ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetSourceGeometry(&mut self, sourceGeometry: *mut *mut ID2D1Geometry) -> (),
-    fn GetTransform(&mut self, transform: *mut D2D1_MATRIX_3X2_F) -> ()
-});
-RIDL!(
-interface ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySinkVtbl): IUnknown(IUnknownVtbl) {
-    fn SetFillMode(&mut self, fillMode: D2D1_FILL_MODE) -> (),
-    fn SetSegmentFlags(&mut self, vertexFlags: D2D1_PATH_SEGMENT) -> (),
-    fn BeginFigure(&mut self, startPoint: ::D2D1_POINT_2F, figureBegin: D2D1_FIGURE_BEGIN) -> (),
-    fn AddLines(&mut self, points: *const ::D2D1_POINT_2F, pointsCount: ::UINT32) -> (),
-    fn AddBeziers(&mut self, beziers: *const D2D1_BEZIER_SEGMENT, beziersCount: ::UINT32) -> (),
-    fn EndFigure(&mut self, figureEnd: D2D1_FIGURE_END) -> (),
-    fn Close(&mut self) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1GeometrySink(ID2D1GeometrySinkVtbl)
-    : ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySinkVtbl) {
-    fn AddLine(&mut self, point: ::D2D1_POINT_2F) -> (),
-    fn AddBezier(&mut self, bezier: *const D2D1_BEZIER_SEGMENT) -> (),
-    fn AddQuadraticBezier(&mut self, bezier: *const D2D1_QUADRATIC_BEZIER_SEGMENT) -> (),
-    fn AddQuadraticBeziers(
-        &mut self, beziers: *const D2D1_QUADRATIC_BEZIER_SEGMENT, beziersCount: ::UINT32
-    ) -> (),
-    fn AddArc(&mut self, arc: *const D2D1_ARC_SEGMENT) -> ()
-});
-RIDL!(
-interface ID2D1TessellationSink(ID2D1TessellationSinkVtbl): IUnknown(IUnknownVtbl) {
-    fn AddTriangles(&mut self, triangles: *const D2D1_TRIANGLE, triangleCount: ::UINT32) -> (),
-    fn Close(&mut self) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1PathGeometry(ID2D1PathGeometryVtbl): ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn Open(&mut self, geometrySink: *mut *mut ID2D1GeometrySink) -> ::HRESULT,
-    fn Stream(&mut self, geometrySink: *mut ID2D1GeometrySink) -> ::HRESULT,
-    fn GetSegmentCount(&mut self, count: *mut ::UINT32) -> ::HRESULT,
-    fn GetFigureCount(&mut self, count: *mut ::UINT32) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1Mesh(ID2D1MeshVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn Open(&mut self, tessellationSink: *mut *mut ID2D1TessellationSink) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1Layer(ID2D1LayerVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetSize(&mut self, ret: *mut D2D1_SIZE_F) -> *mut D2D1_SIZE_F // FIXME: ABI issue
-});
-RIDL!(
-interface ID2D1DrawingStateBlock(ID2D1DrawingStateBlockVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetDescription(&mut self, stateDescription: *mut D2D1_DRAWING_STATE_DESCRIPTION) -> (),
-    fn SetDescription(&mut self, stateDescription: *const D2D1_DRAWING_STATE_DESCRIPTION) -> (),
-    fn SetTextRenderingParams(
-        &mut self, textRenderingParams: *mut ::IDWriteRenderingParams
-    ) -> (),
-    fn GetTextRenderingParams(
-        &mut self, textRenderingParams: *mut *mut ::IDWriteRenderingParams
-    ) -> ()
-});
-RIDL!(
-interface ID2D1RenderTarget(ID2D1RenderTargetVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn CreateBitmap(
-        &mut self, size: D2D1_SIZE_U, srcData: *const ::c_void, pitch: ::UINT32,
-        bitmapProperties: *const D2D1_BITMAP_PROPERTIES, bitmap: *mut *mut ID2D1Bitmap
-    ) -> ::HRESULT,
-    fn CreateBitmapFromWicBitmap(
-        &mut self, wicBitmapSource: *mut ::IWICBitmapSource,
-        bitmapProperties: *const D2D1_BITMAP_PROPERTIES, bitmap: *mut *mut ID2D1Bitmap
-    ) -> ::HRESULT,
-    fn CreateSharedBitmap(
-        &mut self, riid: ::REFIID, data: *const ::c_void,
-        bitmapProperties: *const D2D1_BITMAP_PROPERTIES, bitmap: *mut *mut ID2D1Bitmap
-    ) -> ::HRESULT,
-    fn CreateBitmapBrush(
-        &mut self, bitmap: *mut ID2D1Bitmap,
-        bitmapBrushProperties: *const D2D1_BITMAP_BRUSH_PROPERTIES,
-        brushProperties: *const D2D1_BRUSH_PROPERTIES, bitmapBrush: *mut *mut ID2D1BitmapBrush
-    ) -> ::HRESULT,
-    fn CreateSolidColorBrush(
-        &mut self, color: *const D2D1_COLOR_F, brushProperties: *const D2D1_BRUSH_PROPERTIES,
-        solidColorBrush: *mut *mut ID2D1SolidColorBrush
-    ) -> ::HRESULT,
-    fn CreateGradientStopCollection(
-        &mut self, gradientStops: *const D2D1_GRADIENT_STOP, gradientStopsCount: ::UINT32,
-        colorInterpolationGamma: D2D1_GAMMA, extendMode: D2D1_EXTEND_MODE,
-        gradientStopCollection: *mut *mut ID2D1GradientStopCollection
-    ) -> ::HRESULT,
-    fn CreateLinearGradientBrush(
-        &mut self, linearGradientBrushProperties: *const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES,
-        brushProperties: *const D2D1_BRUSH_PROPERTIES,
-        gradientStopCollection: *mut ID2D1GradientStopCollection,
-        linearGradientBrush: *mut *mut ID2D1LinearGradientBrush
-    ) -> ::HRESULT,
-    fn CreateRadialGradientBrush(
-        &mut self, radialGradientBrushProperties: *const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES,
-        brushProperties: *const D2D1_BRUSH_PROPERTIES,
-        gradientStopCollection: *mut ID2D1GradientStopCollection,
-        radialGradientBrush: *mut *mut ID2D1RadialGradientBrush
-    ) -> ::HRESULT,
-    fn CreateCompatibleRenderTarget(
-        &mut self, desiredSize: *const D2D1_SIZE_F, desiredPixelSize: *const D2D1_SIZE_U,
-        desiredFormat: *const ::D2D1_PIXEL_FORMAT, options: D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS,
-        bitmapRenderTarget: *mut *mut ID2D1BitmapRenderTarget
-    ) -> ::HRESULT,
-    fn CreateLayer(&mut self, size: *const D2D1_SIZE_F, layer: *mut *mut ID2D1Layer) -> ::HRESULT,
-    fn CreateMesh(&mut self, mesh: *mut *mut ID2D1Mesh) -> ::HRESULT,
-    fn DrawLine(
-        &mut self, point0: ::D2D1_POINT_2F, point1: ::D2D1_POINT_2F, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStype: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn DrawRectangle(
-        &mut self, rect: *const ::D2D1_RECT_F, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn FillRectangle(
-        &mut self, rect: *const ::D2D1_RECT_F, brush: *mut ID2D1Brush
-    ) -> (),
-    fn DrawRoundedRectangle(
-        &mut self, roundedRect: *const D2D1_ROUNDED_RECT, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn FillRoundedRectangle(
-        &mut self, roundedRect: *const D2D1_ROUNDED_RECT, brush: *mut ID2D1Brush
-    ) -> (),
-    fn DrawEllipse(
-        &mut self, ellipse: *const D2D1_ELLIPSE, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn FillEllipse(
-        &mut self, ellipse: *const D2D1_ELLIPSE, brush: *mut ID2D1Brush
-    ) -> (),
-    fn DrawGeometry(
-        &mut self, geometry: *mut ID2D1Geometry, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn FillGeometry(
-        &mut self, geometry: *mut ID2D1Geometry, brush: *mut ID2D1Brush,
-        opacityBrush: *mut ID2D1Brush
-    ) -> (),
-    fn FillMesh(
-        &mut self, mesh: *mut ID2D1Mesh, brush: *const ID2D1Brush
-    ) -> (),
-    fn FillOpacityMask(
-        &mut self, opacityMask: *mut ID2D1Bitmap, brush: *mut ID2D1Brush,
-        content: D2D1_OPACITY_MASK_CONTENT, destinationRectangle: *const ::D2D1_RECT_F,
-        sourceRectangle: *const ::D2D1_RECT_F
-    ) -> (),
-    fn DrawBitmap(
-        &mut self, bitmap: *mut ID2D1Bitmap, destinationRectangle: *const ::D2D1_RECT_F,
-        opacity: ::FLOAT, interpolationMode: D2D1_BITMAP_INTERPOLATION_MODE,
-        sourceRectangle: *const ::D2D1_RECT_F
-    ) -> (),
-    fn DrawText(
-        &mut self, string: *const ::WCHAR, stringLength: ::UINT32,
-        textFormat: *mut ::IDWriteTextFormat, layoutRect: *const ::D2D1_RECT_F,
-        defaultForegroundBrush: *mut ID2D1Brush, options: D2D1_DRAW_TEXT_OPTIONS,
-        measuringMode: ::DWRITE_MEASURING_MODE
-    ) -> (),
-    fn DrawTextLayout(
-        &mut self, origin: ::D2D1_POINT_2F, textLayout: *mut ::IDWriteTextLayout,
-        defaultForegroundBrush: *mut ID2D1Brush, options: D2D1_DRAW_TEXT_OPTIONS
-    ) -> (),
-    fn DrawGlyphRun(
-        &mut self, baselineOrigin: ::D2D1_POINT_2F, glyphRun: *const ::DWRITE_GLYPH_RUN,
-        foregroundBrush: *mut ID2D1Brush, measuringMode: ::DWRITE_MEASURING_MODE
-    ) -> (),
-    fn SetTransform(&mut self, transform: *const D2D1_MATRIX_3X2_F) -> (),
-    fn GetTransform(&mut self, transform: *mut D2D1_MATRIX_3X2_F) -> (),
-    fn SetAntialiasMode(&mut self, antialiasMode: D2D1_ANTIALIAS_MODE) -> (),
-    fn GetAntialiasMode(&mut self) -> D2D1_ANTIALIAS_MODE,
-    fn SetTextAntialiasMode(&mut self, textAntialiasMode: D2D1_TEXT_ANTIALIAS_MODE) -> (),
-    fn GetTextAntialiasMode(&mut self) -> D2D1_TEXT_ANTIALIAS_MODE,
-    fn SetTextRenderingParams(
-        &mut self, textRenderingParams: *mut ::IDWriteRenderingParams
-    ) -> (),
-    fn GetTextRenderingParams(
-        &mut self, textRenderingParams: *mut *mut ::IDWriteRenderingParams
-    ) -> (),
-    fn SetTags(&mut self, tag1: D2D1_TAG, tag2: D2D1_TAG) -> (),
-    fn GetTags(&mut self, tag1: *mut D2D1_TAG, tag2: *mut D2D1_TAG) -> (),
-    fn PushLayer(
-        &mut self, layerParameters: *const D2D1_LAYER_PARAMETERS, layer: *mut ID2D1Layer
-    ) -> (),
-    fn PopLayer(&mut self) -> (),
-    fn Flush(&mut self, tag1: *mut D2D1_TAG, tag2: *mut D2D1_TAG) -> ::HRESULT,
-    fn SaveDrawingState(&mut self, drawingStateBlock: *mut ID2D1DrawingStateBlock) -> (),
-    fn RestoreDrawingState(&mut self, drawingStateBlock: *mut ID2D1DrawingStateBlock) -> (),
-    fn PushAxisAlignedClip(
-        &mut self, clipRect: *const ::D2D1_RECT_F, antialiasMode: D2D1_ANTIALIAS_MODE
-    ) -> (),
-    fn PopAxisAlignedClip(&mut self) -> (),
-    fn Clear(&mut self, clearColor: *const D2D1_COLOR_F) -> (),
-    fn BeginDraw(&mut self) -> (),
-    fn EndDraw(&mut self, tag1: *mut D2D1_TAG, tag2: *mut D2D1_TAG) -> ::HRESULT,
-    fn GetPixelFormat(
-        &mut self, ret: *mut ::D2D1_PIXEL_FORMAT
-    ) -> *mut ::D2D1_PIXEL_FORMAT, // FIXME: ABI issue
-    fn SetDpi(&mut self, dpiX: ::FLOAT, dpiY: ::FLOAT) -> (),
-    fn GetDpi(&mut self, dpiX: *mut ::FLOAT, dpiY: *mut ::FLOAT) -> (),
-    fn GetSize(&mut self, ret: *mut D2D1_SIZE_F) -> *mut D2D1_SIZE_F, // FIXME: ABI issue
-    fn GetPixelSize(&mut self, ret: *mut D2D1_SIZE_U) -> *mut D2D1_SIZE_U, // FIXME: ABI issue
-    fn GetMaximumBitmapSize(&mut self) -> ::UINT32,
-    fn IsSupported(
-        &mut self, renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES
-    ) -> ::BOOL
-});
-RIDL!(
-interface ID2D1BitmapRenderTarget(ID2D1BitmapRenderTargetVtbl)
-    : ID2D1RenderTarget(ID2D1RenderTargetVtbl) {
-    fn GetBitmap(&mut self, bitmap: *mut *mut ID2D1Bitmap) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1HwndRenderTarget(ID2D1HwndRenderTargetVtbl)
-    : ID2D1RenderTarget(ID2D1RenderTargetVtbl) {
-    fn CheckWindowState(&mut self) -> D2D1_WINDOW_STATE,
-    fn Resize(&mut self, pixelSize: *const D2D1_SIZE_U) -> ::HRESULT,
-    fn GetHwnd(&mut self) -> ::HWND
-});
-RIDL!(
-interface ID2D1GdiInteropRenderTarget(ID2D1GdiInteropRenderTargetVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDC(&mut self, mode: D2D1_DC_INITIALIZE_MODE, hdc: *mut ::HDC) -> ::HRESULT,
-    fn ReleaseDC(&mut self, update: *const ::RECT) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1DCRenderTarget(ID2D1DCRenderTargetVtbl): ID2D1RenderTarget(ID2D1RenderTargetVtbl) {
-    fn BindDC(&mut self, hDC: ::HDC, pSubRect: *const ::RECT) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1Factory(ID2D1FactoryVtbl): IUnknown(IUnknownVtbl) {
-    fn ReloadSystemMetrics(&mut self) -> ::HRESULT,
-    fn GetDesktopDpi(&mut self, dpiX: *mut ::FLOAT, dpiY: *mut ::FLOAT) -> (),
-    fn CreateRectangleGeometry(
-        &mut self, rectangle: *const ::D2D1_RECT_F,
-        rectangleGeometry: *mut *mut ID2D1RectangleGeometry
-    ) -> ::HRESULT,
-    fn CreateRoundedRectangleGeometry(
-        &mut self, roundedRectangle: *const D2D1_ROUNDED_RECT,
-        roundedRectangleGeometry: *mut *mut ID2D1RoundedRectangleGeometry
-    ) -> ::HRESULT,
-    fn CreateEllipseGeometry(
-        &mut self, ellipse: *const D2D1_ELLIPSE,
-        ellipseGeometry: *mut *mut ID2D1EllipseGeometry
-    ) -> ::HRESULT,
-    fn CreateGeometryGroup(
-        &mut self, fillMode: D2D1_FILL_MODE, geometries: *mut *mut ID2D1Geometry,
-        geometriesCount: ::UINT32, geometryGroup: *mut *mut ID2D1GeometryGroup
-    ) -> ::HRESULT,
-    fn CreateTransformedGeometry(
-        &mut self, sourceGeometry: *mut ID2D1Geometry, transform: *const D2D1_MATRIX_3X2_F,
-        transformedGeometry: *mut *mut ID2D1TransformedGeometry
-    ) -> ::HRESULT,
-    fn CreatePathGeometry(
-        &mut self, pathGeometry: *mut *mut ID2D1PathGeometry
-    ) -> ::HRESULT,
-    fn CreateStrokeStyle(
-        &mut self, strokeStyleProperties: *const D2D1_STROKE_STYLE_PROPERTIES,
-        dashes: *const ::FLOAT, dashesCount: ::UINT32, strokeStyle: *mut *mut ID2D1StrokeStyle
-    ) -> ::HRESULT,
-    fn CreateDrawingStateBlock(
-        &mut self, drawingStateDescription: *const D2D1_DRAWING_STATE_DESCRIPTION,
-        textRenderingParams: *mut ::IDWriteRenderingParams,
-        drawingStateBlock: *mut *mut ID2D1DrawingStateBlock
-    ) -> ::HRESULT,
-    fn CreateWicBitmapRenderTarget(
-        &mut self, target: *mut ::IWICBitmap,
-        renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES,
-        renderTarget: *mut *mut ID2D1RenderTarget
-    ) -> ::HRESULT,
-    fn CreateHwndRenderTarget(
-        &mut self, renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES,
-        hwndRenderTargetProperties: *const D2D1_HWND_RENDER_TARGET_PROPERTIES,
-        hwndRenderTarget: *mut *mut ID2D1HwndRenderTarget
-    ) -> ::HRESULT,
-    fn CreateDxgiSurfaceRenderTarget(
-        &mut self, dxgiSurface: *mut ::IDXGISurface,
-        renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES,
-        renderTarget: *mut *mut ID2D1RenderTarget
-    ) -> ::HRESULT,
-    fn CreateDCRenderTarget(
-        &mut self, renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES,
-        dcRenderTarget: *mut *mut ID2D1DCRenderTarget
-    ) -> ::HRESULT
-});
-DEFINE_GUID!(
-    UuidOfID2D1Factory,
-    0x06152247, 0x6f50, 0x465a, 0x92, 0x45, 0x11, 0x8b, 0xfd, 0x3b, 0x60, 0x07
-);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d2dbasetypes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d2dbasetypes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d2dbasetypes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d2dbasetypes.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of d2dbasetypes.h
-STRUCT!{struct D2D_POINT_2U {
-    x: ::UINT32,
-    y: ::UINT32,
-}}
-STRUCT!{struct D2D_POINT_2F {
-    x: ::FLOAT,
-    y: ::FLOAT,
-}}
-pub type D2D_POINT_2L = ::POINT;
-STRUCT!{struct D2D_VECTOR_2F {
-    x: ::FLOAT,
-    y: ::FLOAT,
-}}
-STRUCT!{struct D2D_VECTOR_3F {
-    x: ::FLOAT,
-    y: ::FLOAT,
-    z: ::FLOAT,
-}}
-STRUCT!{struct D2D_VECTOR_4F {
-    x: ::FLOAT,
-    y: ::FLOAT,
-    z: ::FLOAT,
-    w: ::FLOAT,
-}}
-STRUCT!{struct D2D_RECT_F {
-    left: ::FLOAT,
-    top: ::FLOAT,
-    right: ::FLOAT,
-    bottom: ::FLOAT,
-}}
-STRUCT!{struct D2D_RECT_U {
-    left: ::UINT32,
-    top: ::UINT32,
-    right: ::UINT32,
-    bottom: ::UINT32,
-}}
-pub type D2D_RECT_L = ::RECT;
-STRUCT!{struct D2D_SIZE_F {
-    width: ::FLOAT,
-    height: ::FLOAT,
-}}
-STRUCT!{struct D2D_SIZE_U {
-    width: ::UINT32,
-    height: ::UINT32,
-}}
-pub type D2D_COLOR_F = ::D3DCOLORVALUE;
-STRUCT!{struct D2D_MATRIX_3X2_F {
-    matrix: [[::FLOAT; 2]; 3],
-}}
-STRUCT!{struct D2D_MATRIX_4X3_F {
-    matrix: [[::FLOAT; 3]; 4],
-}}
-STRUCT!{struct D2D_MATRIX_4X4_F {
-    matrix: [[::FLOAT; 4]; 4],
-}}
-STRUCT!{struct D2D_MATRIX_5X4_F {
-    matrix: [[::FLOAT; 4]; 5],
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d10shader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d10shader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d10shader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d10shader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub type D3D10_RESOURCE_RETURN_TYPE = D3D_RESOURCE_RETURN_TYPE;
-pub type D3D10_CBUFFER_TYPE = D3D_CBUFFER_TYPE;
-STRUCT!{struct D3D10_SHADER_DESC {
-    Version: UINT,
-    Creator: LPCSTR,
-    Flags: UINT,
-    ConstantBuffers: UINT,
-    BoundResources: UINT,
-    InputParameters: UINT,
-    OutputParameters: UINT,
-    InstructionCount: UINT,
-    TempRegisterCount: UINT,
-    TempArrayCount: UINT,
-    DefCount: UINT,
-    DclCount: UINT,
-    TextureNormalInstructions: UINT,
-    TextureLoadInstructions: UINT,
-    TextureCompInstructions: UINT,
-    TextureBiasInstructions: UINT,
-    TextureGradientInstructions: UINT,
-    FloatInstructionCount: UINT,
-    IntInstructionCount: UINT,
-    UintInstructionCount: UINT,
-    StaticFlowControlCount: UINT,
-    DynamicFlowControlCount: UINT,
-    MacroInstructionCount: UINT,
-    ArrayInstructionCount: UINT,
-    CutInstructionCount: UINT,
-    EmitInstructionCount: UINT,
-    GSOutputTopology: D3D_PRIMITIVE_TOPOLOGY,
-    GSMaxOutputVertexCount: UINT,
-}}
-STRUCT!{struct D3D10_SHADER_BUFFER_DESC {
-    Name: LPCSTR,
-    Type: D3D10_CBUFFER_TYPE,
-    Variables: UINT,
-    Size: UINT,
-    uFlags: UINT,
-}}
-STRUCT!{struct D3D10_SHADER_VARIABLE_DESC {
-    Name: LPCSTR,
-    StartOffset: UINT,
-    Size: UINT,
-    uFlags: UINT,
-    DefaultValue: LPVOID,
-}}
-STRUCT!{struct D3D10_SHADER_TYPE_DESC {
-    Class: D3D_SHADER_VARIABLE_CLASS,
-    Type: D3D_SHADER_VARIABLE_TYPE,
-    Rows: UINT,
-    Columns: UINT,
-    Elements: UINT,
-    Members: UINT,
-    Offset: UINT,
-}}
-STRUCT!{struct D3D10_SHADER_INPUT_BIND_DESC {
-    Name: LPCSTR,
-    Type: D3D_SHADER_INPUT_TYPE,
-    BindPoint: UINT,
-    BindCount: UINT,
-    uFlags: UINT,
-    ReturnType: D3D_RESOURCE_RETURN_TYPE,
-    Dimension: D3D_SRV_DIMENSION,
-    NumSamples: UINT,
-}}
-STRUCT!{struct D3D10_SIGNATURE_PARAMETER_DESC {
-    SemanticName: LPCSTR,
-    SemanticIndex: UINT,
-    Register: UINT,
-    SystemValueType: D3D_NAME,
-    ComponentType: D3D_REGISTER_COMPONENT_TYPE,
-    Mask: BYTE,
-    ReadWriteMask: BYTE,
-}}
-RIDL!{interface ID3D10ShaderReflectionType(ID3D10ShaderReflectionTypeVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D10_SHADER_TYPE_DESC) -> HRESULT,
-    fn GetMemberTypeByIndex(&mut self, Index: UINT) -> *mut ID3D10ShaderReflectionType,
-    fn GetMemberTypeByName(&mut self, Name: LPCSTR) -> *mut ID3D10ShaderReflectionType,
-    fn GetMemberTypeName(&mut self, Index: UINT) -> LPCSTR
-}}
-RIDL!{interface ID3D10ShaderReflectionVariable(ID3D10ShaderReflectionVariableVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D10_SHADER_VARIABLE_DESC) -> HRESULT,
-    fn GetType(&mut self) -> *mut ID3D10ShaderReflectionType
-}}
-RIDL!{interface ID3D10ShaderReflectionConstantBuffer(ID3D10ShaderReflectionConstantBufferVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D10_SHADER_BUFFER_DESC) -> HRESULT,
-    fn GetVariableByIndex(&mut self, Index: UINT) -> *mut ID3D10ShaderReflectionVariable,
-    fn GetVariableByName(&mut self, Name: LPCSTR) -> *mut ID3D10ShaderReflectionVariable
-}}
-RIDL!{interface ID3D10ShaderReflection(ID3D10ShaderReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D10_SHADER_DESC) -> HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, Index: UINT
-    ) -> *mut ID3D10ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: LPCSTR
-    ) -> *mut ID3D10ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: UINT, pDesc: *mut D3D10_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetInputParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D10_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT,
-    fn GetOutputParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D10_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d11.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d11.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d11.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d11.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2665 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub const D3D11_16BIT_INDEX_STRIP_CUT_VALUE: DWORD = 0xffff;
-pub const D3D11_32BIT_INDEX_STRIP_CUT_VALUE: DWORD = 0xffffffff;
-pub const D3D11_8BIT_INDEX_STRIP_CUT_VALUE: DWORD = 0xff;
-pub const D3D11_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT: DWORD = 9;
-pub const D3D11_CLIP_OR_CULL_DISTANCE_COUNT: DWORD = 8;
-pub const D3D11_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT: DWORD = 2;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT: DWORD = 14;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS: DWORD = 4;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT: DWORD = 15;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_PARTIAL_UPDATE_EXTENTS_BYTE_ALIGNMENT: DWORD = 16;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT: DWORD = 15;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT: DWORD = 64;
-pub const D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT: DWORD = 128;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT: DWORD = 128;
-pub const D3D11_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_SAMPLER_REGISTER_COUNT: DWORD = 16;
-pub const D3D11_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT: DWORD = 16;
-pub const D3D11_COMMONSHADER_SUBROUTINE_NESTING_LIMIT: DWORD = 32;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_COUNT: DWORD = 4096;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_READS_PER_INST: DWORD = 3;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_READ_PORTS: DWORD = 3;
-pub const D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX: DWORD = 10;
-pub const D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN: c_long = -10;
-pub const D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE: c_long = -8;
-pub const D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE: DWORD = 7;
-pub const D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 256;
-pub const D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP: DWORD = 64;
-pub const D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 240;
-pub const D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP: DWORD = 68;
-pub const D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 224;
-pub const D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP: DWORD = 72;
-pub const D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 208;
-pub const D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP: DWORD = 76;
-pub const D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 192;
-pub const D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP: DWORD = 84;
-pub const D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 176;
-pub const D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP: DWORD = 92;
-pub const D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 160;
-pub const D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP: DWORD = 100;
-pub const D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 144;
-pub const D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP: DWORD = 112;
-pub const D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 128;
-pub const D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP: DWORD = 128;
-pub const D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 112;
-pub const D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP: DWORD = 144;
-pub const D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 96;
-pub const D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP: DWORD = 168;
-pub const D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 80;
-pub const D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP: DWORD = 204;
-pub const D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 64;
-pub const D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP: DWORD = 256;
-pub const D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 48;
-pub const D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP: DWORD = 340;
-pub const D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 32;
-pub const D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP: DWORD = 512;
-pub const D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 16;
-pub const D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP: DWORD = 768;
-pub const D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION: DWORD = 1;
-pub const D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT: DWORD = 256;
-pub const D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP: DWORD = 768;
-pub const D3D11_CS_4_X_THREAD_GROUP_MAX_X: DWORD = 768;
-pub const D3D11_CS_4_X_THREAD_GROUP_MAX_Y: DWORD = 768;
-pub const D3D11_CS_4_X_UAV_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION: DWORD = 65535;
-pub const D3D11_CS_TGSM_REGISTER_COUNT: DWORD = 8192;
-pub const D3D11_CS_TGSM_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_CS_THREADGROUPID_REGISTER_COMPONENTS: DWORD = 3;
-pub const D3D11_CS_THREADGROUPID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_THREADIDINGROUPFLATTENED_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_CS_THREADIDINGROUPFLATTENED_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_THREADIDINGROUP_REGISTER_COMPONENTS: DWORD = 3;
-pub const D3D11_CS_THREADIDINGROUP_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_THREADID_REGISTER_COMPONENTS: DWORD = 3;
-pub const D3D11_CS_THREADID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP: DWORD = 1024;
-pub const D3D11_CS_THREAD_GROUP_MAX_X: DWORD = 1024;
-pub const D3D11_CS_THREAD_GROUP_MAX_Y: DWORD = 1024;
-pub const D3D11_CS_THREAD_GROUP_MAX_Z: DWORD = 64;
-pub const D3D11_CS_THREAD_GROUP_MIN_X: DWORD = 1;
-pub const D3D11_CS_THREAD_GROUP_MIN_Y: DWORD = 1;
-pub const D3D11_CS_THREAD_GROUP_MIN_Z: DWORD = 1;
-pub const D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL: DWORD = 16384;
-pub const D3D11_DEFAULT_BLEND_FACTOR_ALPHA: FLOAT = 1.0;
-pub const D3D11_DEFAULT_BLEND_FACTOR_BLUE: FLOAT = 1.0;
-pub const D3D11_DEFAULT_BLEND_FACTOR_GREEN: FLOAT = 1.0;
-pub const D3D11_DEFAULT_BLEND_FACTOR_RED: FLOAT = 1.0;
-pub const D3D11_DEFAULT_BORDER_COLOR_COMPONENT: FLOAT = 0.0;
-pub const D3D11_DEFAULT_DEPTH_BIAS: DWORD = 0;
-pub const D3D11_DEFAULT_DEPTH_BIAS_CLAMP: FLOAT = 0.0;
-pub const D3D11_DEFAULT_MAX_ANISOTROPY: DWORD = 16;
-pub const D3D11_DEFAULT_MIP_LOD_BIAS: FLOAT = 0.0;
-pub const D3D11_DEFAULT_RENDER_TARGET_ARRAY_INDEX: DWORD = 0;
-pub const D3D11_DEFAULT_SAMPLE_MASK: DWORD = 0xffffffff;
-pub const D3D11_DEFAULT_SCISSOR_ENDX: DWORD = 0;
-pub const D3D11_DEFAULT_SCISSOR_ENDY: DWORD = 0;
-pub const D3D11_DEFAULT_SCISSOR_STARTX: DWORD = 0;
-pub const D3D11_DEFAULT_SCISSOR_STARTY: DWORD = 0;
-pub const D3D11_DEFAULT_SLOPE_SCALED_DEPTH_BIAS: FLOAT = 0.0;
-pub const D3D11_DEFAULT_STENCIL_READ_MASK: DWORD = 0xff;
-pub const D3D11_DEFAULT_STENCIL_REFERENCE: DWORD = 0;
-pub const D3D11_DEFAULT_STENCIL_WRITE_MASK: DWORD = 0xff;
-pub const D3D11_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX: DWORD = 0;
-pub const D3D11_DEFAULT_VIEWPORT_HEIGHT: DWORD = 0;
-pub const D3D11_DEFAULT_VIEWPORT_MAX_DEPTH: FLOAT = 0.0;
-pub const D3D11_DEFAULT_VIEWPORT_MIN_DEPTH: FLOAT = 0.0;
-pub const D3D11_DEFAULT_VIEWPORT_TOPLEFTX: DWORD = 0;
-pub const D3D11_DEFAULT_VIEWPORT_TOPLEFTY: DWORD = 0;
-pub const D3D11_DEFAULT_VIEWPORT_WIDTH: DWORD = 0;
-pub const D3D11_DS_INPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS: DWORD = 3968;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENTS: DWORD = 3;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_DS_OUTPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_DS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_OUTPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_FLOAT16_FUSED_TOLERANCE_IN_ULP: FLOAT = 0.6;
-pub const D3D11_FLOAT32_MAX: FLOAT = 3.402823466E+38;
-pub const D3D11_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP: FLOAT = 0.6;
-pub const D3D11_FLOAT_TO_SRGB_EXPONENT_DENOMINATOR: FLOAT = 2.4;
-pub const D3D11_FLOAT_TO_SRGB_EXPONENT_NUMERATOR: FLOAT = 1.0;
-pub const D3D11_FLOAT_TO_SRGB_OFFSET: FLOAT = 0.055;
-pub const D3D11_FLOAT_TO_SRGB_SCALE_1: FLOAT = 12.92;
-pub const D3D11_FLOAT_TO_SRGB_SCALE_2: FLOAT = 1.055;
-pub const D3D11_FLOAT_TO_SRGB_THRESHOLD: FLOAT = 0.0031308;
-pub const D3D11_FTOI_INSTRUCTION_MAX_INPUT: FLOAT = 2147483647.999;
-pub const D3D11_FTOI_INSTRUCTION_MIN_INPUT: FLOAT = -2147483648.999;
-pub const D3D11_FTOU_INSTRUCTION_MAX_INPUT: FLOAT = 4294967295.999;
-pub const D3D11_FTOU_INSTRUCTION_MIN_INPUT: FLOAT = 0.0;
-pub const D3D11_GS_INPUT_INSTANCE_ID_READS_PER_INST: DWORD = 2;
-pub const D3D11_GS_INPUT_INSTANCE_ID_READ_PORTS: DWORD = 1;
-pub const D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_GS_INPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_GS_INPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_GS_INPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_GS_INPUT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_GS_INPUT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_GS_INPUT_REGISTER_VERTICES: DWORD = 32;
-pub const D3D11_GS_MAX_INSTANCE_COUNT: DWORD = 32;
-pub const D3D11_GS_MAX_OUTPUT_VERTEX_COUNT_ACROSS_INSTANCES: DWORD = 1024;
-pub const D3D11_GS_OUTPUT_ELEMENTS: DWORD = 32;
-pub const D3D11_GS_OUTPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_GS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_GS_OUTPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_HS_CONTROL_POINT_PHASE_INPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_HS_CONTROL_POINT_PHASE_OUTPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_HS_CONTROL_POINT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_HS_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_CONTROL_POINT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_CONTROL_POINT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND: DWORD = 0xffffffff;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND: DWORD = 0xffffffff;
-pub const D3D11_HS_MAXTESSFACTOR_LOWER_BOUND: FLOAT = 1.0;
-pub const D3D11_HS_MAXTESSFACTOR_UPPER_BOUND: FLOAT = 64.0;
-pub const D3D11_HS_OUTPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS: DWORD = 3968;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_SCALAR_COMPONENTS: DWORD = 128;
-pub const D3D11_IA_DEFAULT_INDEX_BUFFER_OFFSET_IN_BYTES: DWORD = 0;
-pub const D3D11_IA_DEFAULT_PRIMITIVE_TOPOLOGY: DWORD = 0;
-pub const D3D11_IA_DEFAULT_VERTEX_BUFFER_OFFSET_IN_BYTES: DWORD = 0;
-pub const D3D11_IA_INDEX_INPUT_RESOURCE_SLOT_COUNT: DWORD = 1;
-pub const D3D11_IA_INSTANCE_ID_BIT_COUNT: DWORD = 32;
-pub const D3D11_IA_INTEGER_ARITHMETIC_BIT_COUNT: DWORD = 32;
-pub const D3D11_IA_PATCH_MAX_CONTROL_POINT_COUNT: DWORD = 32;
-pub const D3D11_IA_PRIMITIVE_ID_BIT_COUNT: DWORD = 32;
-pub const D3D11_IA_VERTEX_ID_BIT_COUNT: DWORD = 32;
-pub const D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT: DWORD = 32;
-pub const D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS: DWORD = 128;
-pub const D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT: DWORD = 32;
-pub const D3D11_INTEGER_DIVIDE_BY_ZERO_QUOTIENT: DWORD = 0xffffffff;
-pub const D3D11_INTEGER_DIVIDE_BY_ZERO_REMAINDER: DWORD = 0xffffffff;
-pub const D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL: DWORD = 0xffffffff;
-pub const D3D11_KEEP_UNORDERED_ACCESS_VIEWS: DWORD = 0xffffffff;
-pub const D3D11_LINEAR_GAMMA: FLOAT = 1.0;
-pub const D3D11_MAJOR_VERSION: DWORD = 11;
-pub const D3D11_MAX_BORDER_COLOR_COMPONENT: FLOAT = 1.0;
-pub const D3D11_MAX_DEPTH: FLOAT = 1.0;
-pub const D3D11_MAX_MAXANISOTROPY: DWORD = 16;
-pub const D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT: DWORD = 32;
-pub const D3D11_MAX_POSITION_VALUE: FLOAT = 3.402823466E+34;
-pub const D3D11_MAX_TEXTURE_DIMENSION_2_TO_EXP: DWORD = 17;
-pub const D3D11_MINOR_VERSION: DWORD = 0;
-pub const D3D11_MIN_BORDER_COLOR_COMPONENT: FLOAT = 0.0;
-pub const D3D11_MIN_DEPTH: FLOAT = 0.0;
-pub const D3D11_MIN_MAXANISOTROPY: DWORD = 0;
-pub const D3D11_MIP_LOD_BIAS_MAX: FLOAT = 15.99;
-pub const D3D11_MIP_LOD_BIAS_MIN: FLOAT = -16.0;
-pub const D3D11_MIP_LOD_FRACTIONAL_BIT_COUNT: DWORD = 8;
-pub const D3D11_MIP_LOD_RANGE_BIT_COUNT: DWORD = 8;
-pub const D3D11_MULTISAMPLE_ANTIALIAS_LINE_WIDTH: FLOAT = 1.4;
-pub const D3D11_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT: DWORD = 0;
-pub const D3D11_PIXEL_ADDRESS_RANGE_BIT_COUNT: DWORD = 15;
-pub const D3D11_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT: DWORD = 16;
-pub const D3D11_PS_CS_UAV_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_PS_CS_UAV_REGISTER_COUNT: DWORD = 8;
-pub const D3D11_PS_CS_UAV_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_PS_CS_UAV_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_PS_FRONTFACING_DEFAULT_VALUE: DWORD = 0xffffffff;
-pub const D3D11_PS_FRONTFACING_FALSE_VALUE: DWORD = 0;
-pub const D3D11_PS_FRONTFACING_TRUE_VALUE: DWORD = 0xffffffff;
-pub const D3D11_PS_INPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_PS_INPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_PS_INPUT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_PS_INPUT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT: FLOAT = 0.0;
-pub const D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_PS_OUTPUT_DEPTH_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_PS_OUTPUT_MASK_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_PS_OUTPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_PS_OUTPUT_REGISTER_COUNT: DWORD = 8;
-pub const D3D11_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT: FLOAT = 0.5;
-pub const D3D11_RAW_UAV_SRV_BYTE_ALIGNMENT: DWORD = 16;
-pub const D3D11_REQ_BLEND_OBJECT_COUNT_PER_DEVICE: DWORD = 4096;
-pub const D3D11_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP: DWORD = 27;
-pub const D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT: DWORD = 4096;
-pub const D3D11_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE: DWORD = 4096;
-pub const D3D11_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP: DWORD = 32;
-pub const D3D11_REQ_DRAW_VERTEX_COUNT_2_TO_EXP: DWORD = 32;
-pub const D3D11_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION: DWORD = 16384;
-pub const D3D11_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT: DWORD = 1024;
-pub const D3D11_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT: DWORD = 4096;
-pub const D3D11_REQ_MAXANISOTROPY: DWORD = 16;
-pub const D3D11_REQ_MIP_LEVELS: DWORD = 15;
-pub const D3D11_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES: DWORD = 2048;
-pub const D3D11_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE: DWORD = 4096;
-pub const D3D11_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH: DWORD = 16384;
-pub const D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM: DWORD = 128;
-pub const D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM: FLOAT = 0.25;
-pub const D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_C_TERM: DWORD = 2048;
-pub const D3D11_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP: DWORD = 20;
-pub const D3D11_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE: DWORD = 4096;
-pub const D3D11_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION: DWORD = 2048;
-pub const D3D11_REQ_TEXTURE1D_U_DIMENSION: DWORD = 16384;
-pub const D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION: DWORD = 2048;
-pub const D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION: DWORD = 16384;
-pub const D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION: DWORD = 2048;
-pub const D3D11_REQ_TEXTURECUBE_DIMENSION: DWORD = 16384;
-pub const D3D11_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL: DWORD = 0;
-pub const D3D11_SHADER_MAJOR_VERSION: DWORD = 5;
-pub const D3D11_SHADER_MAX_INSTANCES: DWORD = 65535;
-pub const D3D11_SHADER_MAX_INTERFACES: DWORD = 253;
-pub const D3D11_SHADER_MAX_INTERFACE_CALL_SITES: DWORD = 4096;
-pub const D3D11_SHADER_MAX_TYPES: DWORD = 65535;
-pub const D3D11_SHADER_MINOR_VERSION: DWORD = 0;
-pub const D3D11_SHIFT_INSTRUCTION_PAD_VALUE: DWORD = 0;
-pub const D3D11_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT: DWORD = 5;
-pub const D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT: DWORD = 8;
-pub const D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES: DWORD = 2048;
-pub const D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES: DWORD = 512;
-pub const D3D11_SO_BUFFER_SLOT_COUNT: DWORD = 4;
-pub const D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP: DWORD = 0xffffffff;
-pub const D3D11_SO_NO_RASTERIZED_STREAM: DWORD = 0xffffffff;
-pub const D3D11_SO_OUTPUT_COMPONENT_COUNT: DWORD = 128;
-pub const D3D11_SO_STREAM_COUNT: DWORD = 4;
-pub const D3D11_SPEC_DATE_DAY: DWORD = 16;
-pub const D3D11_SPEC_DATE_MONTH: DWORD = 05;
-pub const D3D11_SPEC_DATE_YEAR: DWORD = 2011;
-pub const D3D11_SPEC_VERSION: FLOAT = 1.07;
-pub const D3D11_SRGB_GAMMA: FLOAT = 2.2;
-pub const D3D11_SRGB_TO_FLOAT_DENOMINATOR_1: FLOAT = 12.92;
-pub const D3D11_SRGB_TO_FLOAT_DENOMINATOR_2: FLOAT = 1.055;
-pub const D3D11_SRGB_TO_FLOAT_EXPONENT: FLOAT = 2.4;
-pub const D3D11_SRGB_TO_FLOAT_OFFSET: FLOAT = 0.055;
-pub const D3D11_SRGB_TO_FLOAT_THRESHOLD: FLOAT = 0.04045;
-pub const D3D11_SRGB_TO_FLOAT_TOLERANCE_IN_ULP: FLOAT = 0.5;
-pub const D3D11_STANDARD_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_STANDARD_COMPONENT_BIT_COUNT_DOUBLED: DWORD = 64;
-pub const D3D11_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE: DWORD = 4;
-pub const D3D11_STANDARD_PIXEL_COMPONENT_COUNT: DWORD = 128;
-pub const D3D11_STANDARD_PIXEL_ELEMENT_COUNT: DWORD = 32;
-pub const D3D11_STANDARD_VECTOR_SIZE: DWORD = 4;
-pub const D3D11_STANDARD_VERTEX_ELEMENT_COUNT: DWORD = 32;
-pub const D3D11_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT: DWORD = 64;
-pub const D3D11_SUBPIXEL_FRACTIONAL_BIT_COUNT: DWORD = 8;
-pub const D3D11_SUBTEXEL_FRACTIONAL_BIT_COUNT: DWORD = 8;
-pub const D3D11_TESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR: DWORD = 64;
-pub const D3D11_TESSELLATOR_MAX_ISOLINE_DENSITY_TESSELLATION_FACTOR: DWORD = 64;
-pub const D3D11_TESSELLATOR_MAX_ODD_TESSELLATION_FACTOR: DWORD = 63;
-pub const D3D11_TESSELLATOR_MAX_TESSELLATION_FACTOR: DWORD = 64;
-pub const D3D11_TESSELLATOR_MIN_EVEN_TESSELLATION_FACTOR: DWORD = 2;
-pub const D3D11_TESSELLATOR_MIN_ISOLINE_DENSITY_TESSELLATION_FACTOR: DWORD = 1;
-pub const D3D11_TESSELLATOR_MIN_ODD_TESSELLATION_FACTOR: DWORD = 1;
-pub const D3D11_TEXEL_ADDRESS_RANGE_BIT_COUNT: DWORD = 16;
-pub const D3D11_UNBOUND_MEMORY_ACCESS_RESULT: DWORD = 0;
-pub const D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX: DWORD = 15;
-pub const D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE: DWORD = 16;
-pub const D3D11_VIEWPORT_BOUNDS_MAX: DWORD = 32767;
-pub const D3D11_VIEWPORT_BOUNDS_MIN: c_long = -32768;
-pub const D3D11_VS_INPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_VS_INPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_VS_INPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_VS_INPUT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_VS_INPUT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_VS_OUTPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_VS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_VS_OUTPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT: DWORD = 10;
-pub const D3D11_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP: DWORD = 25;
-pub const D3D11_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP: DWORD = 25;
-pub const D3D11_1_UAV_SLOT_COUNT: DWORD = 64;
-pub const D3D11_2_TILED_RESOURCE_TILE_SIZE_IN_BYTES: DWORD = 65536;
-ENUM!{enum D3D11_INPUT_CLASSIFICATION {
-    D3D11_INPUT_PER_VERTEX_DATA = 0,
-    D3D11_INPUT_PER_INSTANCE_DATA = 1,
-}}
-pub const D3D11_APPEND_ALIGNED_ELEMENT: DWORD = 0xffffffff;
-STRUCT!{struct D3D11_INPUT_ELEMENT_DESC {
-    SemanticName: LPCSTR,
-    SemanticIndex: UINT,
-    Format: DXGI_FORMAT,
-    InputSlot: UINT,
-    AlignedByteOffset: UINT,
-    InputSlotClass: D3D11_INPUT_CLASSIFICATION,
-    InstanceDataStepRate: UINT,
-}}
-ENUM!{enum D3D11_FILL_MODE {
-    D3D11_FILL_WIREFRAME = 2,
-    D3D11_FILL_SOLID = 3,
-}}
-pub type D3D11_PRIMITIVE_TOPOLOGY = D3D_PRIMITIVE_TOPOLOGY;
-pub type D3D11_PRIMITIVE = D3D_PRIMITIVE;
-ENUM!{enum D3D11_CULL_MODE {
-    D3D11_CULL_NONE = 1,
-    D3D11_CULL_FRONT = 2,
-    D3D11_CULL_BACK = 3,
-}}
-STRUCT!{struct D3D11_SO_DECLARATION_ENTRY {
-    Stream: UINT,
-    SemanticName: LPCSTR,
-    SemanticIndex: UINT,
-    StartComponent: BYTE,
-    ComponentCount: BYTE,
-    OutputSlot: BYTE,
-}}
-STRUCT!{struct D3D11_VIEWPORT {
-    TopLeftX: FLOAT,
-    TopLeftY: FLOAT,
-    Width: FLOAT,
-    Height: FLOAT,
-    MinDepth: FLOAT,
-    MaxDepth: FLOAT,
-}}
-STRUCT!{struct D3D11_DRAW_INSTANCED_INDIRECT_ARGS {
-    VertexCountPerInstance: UINT,
-    InstanceCount: UINT,
-    StartVertexLocation: UINT,
-    StartInstanceLocation: UINT,
-}}
-STRUCT!{struct D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS {
-    IndexCountPerInstance: UINT,
-    InstanceCount: UINT,
-    StartIndexLocation: UINT,
-    BaseVertexLocation: INT,
-    StartInstanceLocation: UINT,
-}}
-ENUM!{enum D3D11_RESOURCE_DIMENSION {
-    D3D11_RESOURCE_DIMENSION_UNKNOWN = 0,
-    D3D11_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D11_RESOURCE_DIMENSION_TEXTURE1D = 2,
-    D3D11_RESOURCE_DIMENSION_TEXTURE2D = 3,
-    D3D11_RESOURCE_DIMENSION_TEXTURE3D = 4,
-}}
-pub type D3D11_SRV_DIMENSION = D3D_SRV_DIMENSION;
-ENUM!{enum D3D11_DSV_DIMENSION {
-    D3D11_DSV_DIMENSION_UNKNOWN = 0,
-    D3D11_DSV_DIMENSION_TEXTURE1D = 1,
-    D3D11_DSV_DIMENSION_TEXTURE1DARRAY = 2,
-    D3D11_DSV_DIMENSION_TEXTURE2D = 3,
-    D3D11_DSV_DIMENSION_TEXTURE2DARRAY = 4,
-    D3D11_DSV_DIMENSION_TEXTURE2DMS = 5,
-    D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY = 6,
-}}
-ENUM!{enum D3D11_RTV_DIMENSION {
-    D3D11_RTV_DIMENSION_UNKNOWN = 0,
-    D3D11_RTV_DIMENSION_BUFFER = 1,
-    D3D11_RTV_DIMENSION_TEXTURE1D = 2,
-    D3D11_RTV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D11_RTV_DIMENSION_TEXTURE2D = 4,
-    D3D11_RTV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D11_RTV_DIMENSION_TEXTURE2DMS = 6,
-    D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY = 7,
-    D3D11_RTV_DIMENSION_TEXTURE3D = 8,
-}}
-ENUM!{enum D3D11_UAV_DIMENSION {
-    D3D11_UAV_DIMENSION_UNKNOWN = 0,
-    D3D11_UAV_DIMENSION_BUFFER = 1,
-    D3D11_UAV_DIMENSION_TEXTURE1D = 2,
-    D3D11_UAV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D11_UAV_DIMENSION_TEXTURE2D = 4,
-    D3D11_UAV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D11_UAV_DIMENSION_TEXTURE3D = 8,
-}}
-ENUM!{enum D3D11_USAGE {
-    D3D11_USAGE_DEFAULT = 0,
-    D3D11_USAGE_IMMUTABLE = 1,
-    D3D11_USAGE_DYNAMIC = 2,
-    D3D11_USAGE_STAGING = 3,
-}}
-FLAGS!{enum D3D11_BIND_FLAG {
-    D3D11_BIND_VERTEX_BUFFER = 0x1,
-    D3D11_BIND_INDEX_BUFFER = 0x2,
-    D3D11_BIND_CONSTANT_BUFFER = 0x4,
-    D3D11_BIND_SHADER_RESOURCE = 0x8,
-    D3D11_BIND_STREAM_OUTPUT = 0x10,
-    D3D11_BIND_RENDER_TARGET = 0x20,
-    D3D11_BIND_DEPTH_STENCIL = 0x40,
-    D3D11_BIND_UNORDERED_ACCESS = 0x80,
-    D3D11_BIND_DECODER = 0x200,
-    D3D11_BIND_VIDEO_ENCODER = 0x400,
-}}
-FLAGS!{enum D3D11_CPU_ACCESS_FLAG {
-    D3D11_CPU_ACCESS_WRITE = 0x10000,
-    D3D11_CPU_ACCESS_READ = 0x20000,
-}}
-FLAGS!{enum D3D11_RESOURCE_MISC_FLAG {
-    D3D11_RESOURCE_MISC_GENERATE_MIPS = 0x1,
-    D3D11_RESOURCE_MISC_SHARED = 0x2,
-    D3D11_RESOURCE_MISC_TEXTURECUBE = 0x4,
-    D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS = 0x10,
-    D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS = 0x20,
-    D3D11_RESOURCE_MISC_BUFFER_STRUCTURED = 0x40,
-    D3D11_RESOURCE_MISC_RESOURCE_CLAMP = 0x80,
-    D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX = 0x100,
-    D3D11_RESOURCE_MISC_GDI_COMPATIBLE = 0x200,
-    D3D11_RESOURCE_MISC_SHARED_NTHANDLE = 0x800,
-    D3D11_RESOURCE_MISC_RESTRICTED_CONTENT = 0x1000,
-    D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE = 0x2000,
-    D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER = 0x4000,
-    D3D11_RESOURCE_MISC_GUARDED = 0x8000,
-    D3D11_RESOURCE_MISC_TILE_POOL = 0x20000,
-    D3D11_RESOURCE_MISC_TILED = 0x40000,
-    D3D11_RESOURCE_MISC_HW_PROTECTED = 0x80000,
-}}
-ENUM!{enum D3D11_MAP {
-    D3D11_MAP_READ = 1,
-    D3D11_MAP_WRITE = 2,
-    D3D11_MAP_READ_WRITE = 3,
-    D3D11_MAP_WRITE_DISCARD = 4,
-    D3D11_MAP_WRITE_NO_OVERWRITE = 5,
-}}
-FLAGS!{enum D3D11_MAP_FLAG {
-    D3D11_MAP_FLAG_DO_NOT_WAIT = 0x100000,
-}}
-FLAGS!{enum D3D11_RAISE_FLAG {
-    D3D11_RAISE_FLAG_DRIVER_INTERNAL_ERROR = 0x1,
-}}
-FLAGS!{enum D3D11_CLEAR_FLAG {
-    D3D11_CLEAR_DEPTH = 0x1,
-    D3D11_CLEAR_STENCIL = 0x2,
-}}
-pub type D3D11_RECT = RECT;
-STRUCT!{struct D3D11_BOX {
-    left: UINT,
-    top: UINT,
-    front: UINT,
-    right: UINT,
-    bottom: UINT,
-    back: UINT,
-}}
-RIDL!{interface ID3D11DeviceChild(ID3D11DeviceChildVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut ID3D11Device) -> (),
-    fn GetPrivateData(
-        &mut self, guid: REFGUID, pDataSize: *mut UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn SetPrivateData(
-        &mut self, guid: REFGUID, DataSize: UINT, pData: *const c_void
-    ) -> HRESULT,
-    fn SetPrivateDataInterface(&mut self, guid: REFGUID, pData: *const IUnknown) -> HRESULT
-}}
-ENUM!{enum D3D11_COMPARISON_FUNC {
-    D3D11_COMPARISON_NEVER = 1,
-    D3D11_COMPARISON_LESS = 2,
-    D3D11_COMPARISON_EQUAL = 3,
-    D3D11_COMPARISON_LESS_EQUAL = 4,
-    D3D11_COMPARISON_GREATER = 5,
-    D3D11_COMPARISON_NOT_EQUAL = 6,
-    D3D11_COMPARISON_GREATER_EQUAL = 7,
-    D3D11_COMPARISON_ALWAYS = 8,
-}}
-ENUM!{enum D3D11_DEPTH_WRITE_MASK {
-    D3D11_DEPTH_WRITE_MASK_ZERO = 0,
-    D3D11_DEPTH_WRITE_MASK_ALL = 1,
-}}
-ENUM!{enum D3D11_STENCIL_OP {
-    D3D11_STENCIL_OP_KEEP = 1,
-    D3D11_STENCIL_OP_ZERO = 2,
-    D3D11_STENCIL_OP_REPLACE = 3,
-    D3D11_STENCIL_OP_INCR_SAT = 4,
-    D3D11_STENCIL_OP_DECR_SAT = 5,
-    D3D11_STENCIL_OP_INVERT = 6,
-    D3D11_STENCIL_OP_INCR = 7,
-    D3D11_STENCIL_OP_DECR = 8,
-}}
-STRUCT!{struct D3D11_DEPTH_STENCILOP_DESC {
-    StencilFailOp: D3D11_STENCIL_OP,
-    StencilDepthFailOp: D3D11_STENCIL_OP,
-    StencilPassOp: D3D11_STENCIL_OP,
-    StencilFunc: D3D11_COMPARISON_FUNC,
-}}
-STRUCT!{struct D3D11_DEPTH_STENCIL_DESC {
-    DepthEnable: BOOL,
-    DepthWriteMask: D3D11_DEPTH_WRITE_MASK,
-    DepthFunc: D3D11_COMPARISON_FUNC,
-    StencilEnable: BOOL,
-    StencilReadMask: UINT8,
-    StencilWriteMask: UINT8,
-    FrontFace: D3D11_DEPTH_STENCILOP_DESC,
-    BackFace: D3D11_DEPTH_STENCILOP_DESC,
-}}
-RIDL!{interface ID3D11DepthStencilState(ID3D11DepthStencilStateVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_DEPTH_STENCIL_DESC) -> ()
-}}
-ENUM!{enum D3D11_BLEND {
-    D3D11_BLEND_ZERO = 1,
-    D3D11_BLEND_ONE = 2,
-    D3D11_BLEND_SRC_COLOR = 3,
-    D3D11_BLEND_INV_SRC_COLOR = 4,
-    D3D11_BLEND_SRC_ALPHA = 5,
-    D3D11_BLEND_INV_SRC_ALPHA = 6,
-    D3D11_BLEND_DEST_ALPHA = 7,
-    D3D11_BLEND_INV_DEST_ALPHA = 8,
-    D3D11_BLEND_DEST_COLOR = 9,
-    D3D11_BLEND_INV_DEST_COLOR = 10,
-    D3D11_BLEND_SRC_ALPHA_SAT = 11,
-    D3D11_BLEND_BLEND_FACTOR = 14,
-    D3D11_BLEND_INV_BLEND_FACTOR = 15,
-    D3D11_BLEND_SRC1_COLOR = 16,
-    D3D11_BLEND_INV_SRC1_COLOR = 17,
-    D3D11_BLEND_SRC1_ALPHA = 18,
-    D3D11_BLEND_INV_SRC1_ALPHA = 19,
-}}
-ENUM!{enum D3D11_BLEND_OP {
-    D3D11_BLEND_OP_ADD = 1,
-    D3D11_BLEND_OP_SUBTRACT = 2,
-    D3D11_BLEND_OP_REV_SUBTRACT = 3,
-    D3D11_BLEND_OP_MIN = 4,
-    D3D11_BLEND_OP_MAX = 5,
-}}
-FLAGS!{enum D3D11_COLOR_WRITE_ENABLE {
-    D3D11_COLOR_WRITE_ENABLE_RED = 1,
-    D3D11_COLOR_WRITE_ENABLE_GREEN = 2,
-    D3D11_COLOR_WRITE_ENABLE_BLUE = 4,
-    D3D11_COLOR_WRITE_ENABLE_ALPHA = 8,
-    D3D11_COLOR_WRITE_ENABLE_ALL = D3D11_COLOR_WRITE_ENABLE_RED.0 | D3D11_COLOR_WRITE_ENABLE_GREEN.0 |
-        D3D11_COLOR_WRITE_ENABLE_BLUE.0 | D3D11_COLOR_WRITE_ENABLE_ALPHA.0,
-}}
-STRUCT!{struct D3D11_RENDER_TARGET_BLEND_DESC {
-    BlendEnable: BOOL,
-    SrcBlend: D3D11_BLEND,
-    DestBlend: D3D11_BLEND,
-    BlendOp: D3D11_BLEND_OP,
-    SrcBlendAlpha: D3D11_BLEND,
-    DestBlendAlpha: D3D11_BLEND,
-    BlendOpAlpha: D3D11_BLEND_OP,
-    RenderTargetWriteMask: UINT8,
-}}
-STRUCT!{struct D3D11_BLEND_DESC {
-    AlphaToCoverageEnable: BOOL,
-    IndependentBlendEnable: BOOL,
-    RenderTarget: [D3D11_RENDER_TARGET_BLEND_DESC; 8],
-}}
-RIDL!{interface ID3D11BlendState(ID3D11BlendStateVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_BLEND_DESC) -> ()
-}}
-STRUCT!{struct D3D11_RASTERIZER_DESC {
-    FillMode: D3D11_FILL_MODE,
-    CullMode: D3D11_CULL_MODE,
-    FrontCounterClockwise: BOOL,
-    DepthBias: INT,
-    DepthBiasClamp: FLOAT,
-    SlopeScaledDepthBias: FLOAT,
-    DepthClipEnable: BOOL,
-    ScissorEnable: BOOL,
-    MultisampleEnable: BOOL,
-    AntialiasedLineEnable: BOOL,
-}}
-RIDL!{interface ID3D11RasterizerState(ID3D11RasterizerStateVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_RASTERIZER_DESC) -> ()
-}}
-STRUCT!{struct D3D11_SUBRESOURCE_DATA {
-    pSysMem: *const c_void,
-    SysMemPitch: UINT,
-    SysMemSlicePitch: UINT,
-}}
-STRUCT!{struct D3D11_MAPPED_SUBRESOURCE {
-    pData: *mut c_void,
-    RowPitch: UINT,
-    DepthPitch: UINT,
-}}
-RIDL!{interface ID3D11Resource(ID3D11ResourceVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetType(&mut self, pResourceDimension: *mut D3D11_RESOURCE_DIMENSION) -> (),
-    fn SetEvictionPriority(&mut self, EvictionPriority: UINT) -> (),
-    fn GetEvictionPriority(&mut self) -> UINT
-}}
-STRUCT!{struct D3D11_BUFFER_DESC {
-    ByteWidth: UINT,
-    Usage: D3D11_USAGE,
-    BindFlags: UINT,
-    CPUAccessFlags: UINT,
-    MiscFlags: UINT,
-    StructureByteStride: UINT,
-}}
-RIDL!{interface ID3D11Buffer(ID3D11BufferVtbl): ID3D11Resource(ID3D11ResourceVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_BUFFER_DESC) -> ()
-}}
-STRUCT!{struct D3D11_TEXTURE1D_DESC {
-    Width: UINT,
-    MipLevels: UINT,
-    ArraySize: UINT,
-    Format: DXGI_FORMAT,
-    Usage: D3D11_USAGE,
-    BindFlags: UINT,
-    CPUAccessFlags: UINT,
-    MiscFlags: UINT,
-}}
-RIDL!{interface ID3D11Texture1D(ID3D11Texture1DVtbl): ID3D11Resource(ID3D11ResourceVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_TEXTURE1D_DESC) -> ()
-}}
-STRUCT!{struct D3D11_TEXTURE2D_DESC {
-    Width: UINT,
-    Height: UINT,
-    MipLevels: UINT,
-    ArraySize: UINT,
-    Format: DXGI_FORMAT,
-    SampleDesc: DXGI_SAMPLE_DESC,
-    Usage: D3D11_USAGE,
-    BindFlags: UINT,
-    CPUAccessFlags: UINT,
-    MiscFlags: UINT,
-}}
-RIDL!{interface ID3D11Texture2D(ID3D11Texture2DVtbl): ID3D11Resource(ID3D11ResourceVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_TEXTURE2D_DESC) -> ()
-}}
-STRUCT!{struct D3D11_TEXTURE3D_DESC {
-    Width: UINT,
-    Height: UINT,
-    Depth: UINT,
-    MipLevels: UINT,
-    Format: DXGI_FORMAT,
-    Usage: D3D11_USAGE,
-    BindFlags: UINT,
-    CPUAccessFlags: UINT,
-    MiscFlags: UINT,
-}}
-RIDL!{interface ID3D11Texture3D(ID3D11Texture3DVtbl): ID3D11Resource(ID3D11ResourceVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_TEXTURE3D_DESC) -> ()
-}}
-ENUM!{enum D3D11_TEXTURECUBE_FACE {
-    D3D11_TEXTURECUBE_FACE_POSITIVE_X = 0,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_X = 1,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Y = 2,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Y = 3,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Z = 4,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Z = 5,
-}}
-RIDL!{interface ID3D11View(ID3D11ViewVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetResource(&mut self, ppResource: *mut *mut ID3D11Resource) -> ()
-}}
-STRUCT!{struct D3D11_BUFFER_SRV {
-    u1: UINT,
-    u2: UINT,
-}}
-UNION!{D3D11_BUFFER_SRV, u1, FirstElement, FirstElement_mut, UINT}
-UNION!{D3D11_BUFFER_SRV, u1, ElementOffset, ElementOffset_mut, UINT}
-UNION!{D3D11_BUFFER_SRV, u2, NumElements, NumElements_mut, UINT}
-UNION!{D3D11_BUFFER_SRV, u2, ElementWidth, ElementWidth_mut, UINT}
-FLAGS!{enum D3D11_BUFFEREX_SRV_FLAG {
-    D3D11_BUFFEREX_SRV_FLAG_RAW = 0x1,
-}}
-STRUCT!{struct D3D11_BUFFEREX_SRV {
-    FirstElement: UINT,
-    NumElements: UINT,
-    Flags: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_ARRAY_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX3D_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-}}
-STRUCT!{struct D3D11_TEXCUBE_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-}}
-STRUCT!{struct D3D11_TEXCUBE_ARRAY_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-    First2DArrayFace: UINT,
-    NumCubes: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_SRV {
-    UnusedField_NothingToDefine: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_ARRAY_SRV {
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_SHADER_RESOURCE_VIEW_DESC {
-    Format: DXGI_FORMAT,
-    ViewDimension:  D3D11_SRV_DIMENSION,
-    u: [UINT; 4],
-}}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Buffer, Buffer_mut, D3D11_BUFFER_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture1D, Texture1D_mut, D3D11_TEX1D_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    D3D11_TEX1D_ARRAY_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, D3D11_TEX2DMS_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    D3D11_TEX2DMS_ARRAY_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture3D, Texture3D_mut, D3D11_TEX3D_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, TextureCube, TextureCube_mut, D3D11_TEXCUBE_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, TextureCubeArray, TextureCubeArray_mut,
-    D3D11_TEXCUBE_ARRAY_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, BufferEx, BufferEx_mut, D3D11_BUFFEREX_SRV}
-RIDL!{interface ID3D11ShaderResourceView(ID3D11ShaderResourceViewVtbl): ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_RESOURCE_VIEW_DESC) -> ()
-}}
-STRUCT!{struct D3D11_BUFFER_RTV {
-    u1: UINT,
-    u2: UINT,
-}}
-UNION!{D3D11_BUFFER_RTV, u1, FirstElement, FirstElement_mut, UINT}
-UNION!{D3D11_BUFFER_RTV, u1, ElementOffset, ElementOffset_mut, UINT}
-UNION!{D3D11_BUFFER_RTV, u2, NumElements, NumElements_mut, UINT}
-UNION!{D3D11_BUFFER_RTV, u2, ElementWidth, ElementWidth_mut, UINT}
-STRUCT!{struct D3D11_TEX1D_RTV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_ARRAY_RTV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_RTV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_RTV {
-    UnusedField_NothingToDefine: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_RTV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_ARRAY_RTV {
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX3D_RTV {
-    MipSlice: UINT,
-    FirstWSlice: UINT,
-    WSize: UINT,
-}}
-STRUCT!{struct D3D11_RENDER_TARGET_VIEW_DESC {
-    Format: DXGI_FORMAT,
-    ViewDimension: D3D11_RTV_DIMENSION,
-    u: [UINT; 3],
-}}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Buffer, Buffer_mut, D3D11_BUFFER_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture1D, Texture1D_mut, D3D11_TEX1D_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    D3D11_TEX1D_ARRAY_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, D3D11_TEX2DMS_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture2DMSArray,Texture2DMSArray_mut,
-    D3D11_TEX2DMS_ARRAY_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture3D, Texture3D_mut, D3D11_TEX3D_RTV}
-RIDL!{interface ID3D11RenderTargetView(ID3D11RenderTargetViewVtbl): ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_RENDER_TARGET_VIEW_DESC) -> ()
-}}
-STRUCT!{struct D3D11_TEX1D_DSV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_ARRAY_DSV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_DSV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_DSV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_DSV {
-    UnusedField_NothingToDefine: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_ARRAY_DSV {
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-FLAGS!{enum D3D11_DSV_FLAG{
-    D3D11_DSV_READ_ONLY_DEPTH = 0x1,
-    D3D11_DSV_READ_ONLY_STENCIL = 0x2,
-}}
-STRUCT!{struct D3D11_DEPTH_STENCIL_VIEW_DESC {
-    Format: DXGI_FORMAT,
-    ViewDimension: D3D11_DSV_DIMENSION,
-    Flags: UINT,
-    u: [UINT; 3],
-}}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture1D, Texture1D_mut, D3D11_TEX1D_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    D3D11_TEX1D_ARRAY_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, D3D11_TEX2DMS_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    D3D11_TEX2DMS_ARRAY_DSV}
-RIDL!{interface ID3D11DepthStencilView(ID3D11DepthStencilViewVtbl): ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_DEPTH_STENCIL_VIEW_DESC) -> ()
-}}
-FLAGS!{enum D3D11_BUFFER_UAV_FLAG {
-    D3D11_BUFFER_UAV_FLAG_RAW = 0x1,
-    D3D11_BUFFER_UAV_FLAG_APPEND = 0x2,
-    D3D11_BUFFER_UAV_FLAG_COUNTER = 0x4,
-}}
-STRUCT!{struct D3D11_BUFFER_UAV {
-    FirstElement: UINT,
-    NumElements: UINT,
-    Flags: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_UAV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_ARRAY_UAV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_UAV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_UAV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX3D_UAV {
-    MipSlice: UINT,
-    FirstWSlice: UINT,
-    WSize: UINT,
-}}
-STRUCT!{struct D3D11_UNORDERED_ACCESS_VIEW_DESC {
-    Format: DXGI_FORMAT,
-    ViewDimension: D3D11_UAV_DIMENSION,
-    u: [UINT; 3],
-}}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Buffer, Buffer_mut, D3D11_BUFFER_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture1D, Texture1D_mut, D3D11_TEX1D_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    D3D11_TEX1D_ARRAY_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture3D, Texture3D_mut, D3D11_TEX3D_UAV}
-RIDL!{interface ID3D11UnorderedAccessView(ID3D11UnorderedAccessViewVtbl): ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_UNORDERED_ACCESS_VIEW_DESC) -> ()
-}}
-RIDL!{interface ID3D11VertexShader(ID3D11VertexShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11HullShader(ID3D11HullShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11DomainShader(ID3D11DomainShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11GeometryShader(ID3D11GeometryShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11PixelShader(ID3D11PixelShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11ComputeShader(ID3D11ComputeShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11InputLayout(ID3D11InputLayoutVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-ENUM!{enum D3D11_FILTER {
-    D3D11_FILTER_MIN_MAG_MIP_POINT = 0,
-    D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x1,
-    D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4,
-    D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x5,
-    D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10,
-    D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11,
-    D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14,
-    D3D11_FILTER_MIN_MAG_MIP_LINEAR = 0x15,
-    D3D11_FILTER_ANISOTROPIC = 0x55,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x80,
-    D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x81,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x84,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x85,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x90,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91,
-    D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95,
-    D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5,
-    D3D11_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100,
-    D3D11_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101,
-    D3D11_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104,
-    D3D11_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105,
-    D3D11_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110,
-    D3D11_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111,
-    D3D11_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114,
-    D3D11_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115,
-    D3D11_FILTER_MINIMUM_ANISOTROPIC = 0x155,
-    D3D11_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180,
-    D3D11_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181,
-    D3D11_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184,
-    D3D11_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185,
-    D3D11_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190,
-    D3D11_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191,
-    D3D11_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194,
-    D3D11_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195,
-    D3D11_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5,
-}}
-ENUM!{enum D3D11_FILTER_TYPE {
-    D3D11_FILTER_TYPE_POINT = 0,
-    D3D11_FILTER_TYPE_LINEAR = 1,
-}}
-ENUM!{enum D3D11_FILTER_REDUCTION_TYPE {
-    D3D11_FILTER_REDUCTION_TYPE_STANDARD = 0,
-    D3D11_FILTER_REDUCTION_TYPE_COMPARISON = 1,
-    D3D11_FILTER_REDUCTION_TYPE_MINIMUM = 2,
-    D3D11_FILTER_REDUCTION_TYPE_MAXIMUM = 3,
-}}
-pub const D3D11_FILTER_REDUCTION_TYPE_MASK: DWORD = 0x3;
-pub const D3D11_FILTER_REDUCTION_TYPE_SHIFT: DWORD = 7;
-pub const D3D11_FILTER_TYPE_MASK: DWORD = 0x3;
-pub const D3D11_MIN_FILTER_SHIFT: DWORD = 4;
-pub const D3D11_MAG_FILTER_SHIFT: DWORD = 2;
-pub const D3D11_MIP_FILTER_SHIFT: DWORD = 0;
-pub const D3D11_COMPARISON_FILTERING_BIT: DWORD = 0x80;
-pub const D3D11_ANISOTROPIC_FILTERING_BIT: DWORD = 0x40;
-ENUM!{enum D3D11_TEXTURE_ADDRESS_MODE {
-    D3D11_TEXTURE_ADDRESS_WRAP = 1,
-    D3D11_TEXTURE_ADDRESS_MIRROR = 2,
-    D3D11_TEXTURE_ADDRESS_CLAMP = 3,
-    D3D11_TEXTURE_ADDRESS_BORDER = 4,
-    D3D11_TEXTURE_ADDRESS_MIRROR_ONCE = 5,
-}}
-STRUCT!{struct D3D11_SAMPLER_DESC {
-    Filter:  D3D11_FILTER,
-    AddressU: D3D11_TEXTURE_ADDRESS_MODE,
-    AddressV: D3D11_TEXTURE_ADDRESS_MODE,
-    AddressW: D3D11_TEXTURE_ADDRESS_MODE,
-    MipLODBias: FLOAT,
-    MaxAnisotropy: UINT,
-    ComparisonFunc: D3D11_COMPARISON_FUNC,
-    BorderColor: [FLOAT; 4],
-    MinLOD: FLOAT,
-    MaxLOD: FLOAT,
-}}
-RIDL!{interface ID3D11SamplerState(ID3D11SamplerStateVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SAMPLER_DESC) -> ()
-}}
-FLAGS!{enum D3D11_FORMAT_SUPPORT {
-    D3D11_FORMAT_SUPPORT_BUFFER = 0x1,
-    D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER = 0x2,
-    D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER = 0x4,
-    D3D11_FORMAT_SUPPORT_SO_BUFFER = 0x8,
-    D3D11_FORMAT_SUPPORT_TEXTURE1D = 0x10,
-    D3D11_FORMAT_SUPPORT_TEXTURE2D = 0x20,
-    D3D11_FORMAT_SUPPORT_TEXTURE3D = 0x40,
-    D3D11_FORMAT_SUPPORT_TEXTURECUBE = 0x80,
-    D3D11_FORMAT_SUPPORT_SHADER_LOAD = 0x100,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE = 0x200,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON = 0x400,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT = 0x800,
-    D3D11_FORMAT_SUPPORT_MIP = 0x1000,
-    D3D11_FORMAT_SUPPORT_MIP_AUTOGEN = 0x2000,
-    D3D11_FORMAT_SUPPORT_RENDER_TARGET = 0x4000,
-    D3D11_FORMAT_SUPPORT_BLENDABLE = 0x8000,
-    D3D11_FORMAT_SUPPORT_DEPTH_STENCIL = 0x10000,
-    D3D11_FORMAT_SUPPORT_CPU_LOCKABLE = 0x20000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE = 0x40000,
-    D3D11_FORMAT_SUPPORT_DISPLAY = 0x80000,
-    D3D11_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT = 0x100000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET = 0x200000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD = 0x400000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER = 0x800000,
-    D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST = 0x1000000,
-    D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW = 0x2000000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON = 0x4000000,
-    D3D11_FORMAT_SUPPORT_DECODER_OUTPUT = 0x8000000,
-    D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_OUTPUT = 0x10000000,
-    D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_INPUT = 0x20000000,
-    D3D11_FORMAT_SUPPORT_VIDEO_ENCODER = 0x40000000,
-}}
-FLAGS!{enum D3D11_FORMAT_SUPPORT2 {
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD = 0x1,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS = 0x2,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE = 0x4,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE = 0x8,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX = 0x10,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX = 0x20,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_LOAD = 0x40,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE = 0x80,
-    D3D11_FORMAT_SUPPORT2_OUTPUT_MERGER_LOGIC_OP = 0x100,
-    D3D11_FORMAT_SUPPORT2_TILED = 0x200,
-    D3D11_FORMAT_SUPPORT2_SHAREABLE = 0x400,
-    D3D11_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x4000,
-}}
-RIDL!{interface ID3D11Asynchronous(ID3D11AsynchronousVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDataSize(&mut self) -> UINT
-}}
-FLAGS!{enum D3D11_ASYNC_GETDATA_FLAG {
-    D3D11_ASYNC_GETDATA_DONOTFLUSH = 0x1,
-}}
-ENUM!{enum D3D11_QUERY {
-    D3D11_QUERY_EVENT = 0,
-    D3D11_QUERY_OCCLUSION = D3D11_QUERY_EVENT.0 + 1,
-    D3D11_QUERY_TIMESTAMP = D3D11_QUERY_OCCLUSION.0 + 1,
-    D3D11_QUERY_TIMESTAMP_DISJOINT = D3D11_QUERY_TIMESTAMP.0 + 1,
-    D3D11_QUERY_PIPELINE_STATISTICS = D3D11_QUERY_TIMESTAMP_DISJOINT.0 + 1,
-    D3D11_QUERY_OCCLUSION_PREDICATE = D3D11_QUERY_PIPELINE_STATISTICS.0 + 1,
-    D3D11_QUERY_SO_STATISTICS = D3D11_QUERY_OCCLUSION_PREDICATE.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE = D3D11_QUERY_SO_STATISTICS.0 + 1,
-    D3D11_QUERY_SO_STATISTICS_STREAM0 = D3D11_QUERY_SO_OVERFLOW_PREDICATE.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 = D3D11_QUERY_SO_STATISTICS_STREAM0.0 + 1,
-    D3D11_QUERY_SO_STATISTICS_STREAM1 = D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 = D3D11_QUERY_SO_STATISTICS_STREAM1.0 + 1,
-    D3D11_QUERY_SO_STATISTICS_STREAM2 = D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 = D3D11_QUERY_SO_STATISTICS_STREAM2.0 + 1,
-    D3D11_QUERY_SO_STATISTICS_STREAM3 = D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3 = D3D11_QUERY_SO_STATISTICS_STREAM3.0 + 1,
-}}
-FLAGS!{enum D3D11_QUERY_MISC_FLAG {
-    D3D11_QUERY_MISC_PREDICATEHINT = 0x1,
-}}
-STRUCT!{struct D3D11_QUERY_DESC {
-    Query: D3D11_QUERY,
-    MiscFlags: UINT,
-}}
-RIDL!{interface ID3D11Query(ID3D11QueryVtbl): ID3D11Asynchronous(ID3D11AsynchronousVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_QUERY_DESC) -> ()
-}}
-RIDL!{interface ID3D11Predicate(ID3D11PredicateVtbl): ID3D11Query(ID3D11QueryVtbl) {}}
-STRUCT!{struct D3D11_QUERY_DATA_TIMESTAMP_DISJOINT {
-    Frequency: UINT64,
-    Disjoint: BOOL,
-}}
-STRUCT!{struct D3D11_QUERY_DATA_PIPELINE_STATISTICS {
-    IAVertices: UINT64,
-    IAPrimitives: UINT64,
-    VSInvocations: UINT64,
-    GSInvocations: UINT64,
-    GSPrimitives: UINT64,
-    CInvocations: UINT64,
-    CPrimitives: UINT64,
-    PSInvocations: UINT64,
-    HSInvocations: UINT64,
-    DSInvocations: UINT64,
-    CSInvocations: UINT64,
-}}
-STRUCT!{struct D3D11_QUERY_DATA_SO_STATISTICS {
-    NumPrimitivesWritten: UINT64,
-    PrimitivesStorageNeeded: UINT64,
-}}
-FLAGS!{enum D3D11_COUNTER {
-    D3D11_COUNTER_DEVICE_DEPENDENT_0 = 0x40000000,
-}}
-ENUM!{enum D3D11_COUNTER_TYPE {
-    D3D11_COUNTER_TYPE_FLOAT32 = 0,
-    D3D11_COUNTER_TYPE_UINT16 = D3D11_COUNTER_TYPE_FLOAT32.0 + 1,
-    D3D11_COUNTER_TYPE_UINT32 = D3D11_COUNTER_TYPE_UINT16.0 + 1,
-    D3D11_COUNTER_TYPE_UINT64 = D3D11_COUNTER_TYPE_UINT32.0 + 1,
-}}
-STRUCT!{struct D3D11_COUNTER_DESC {
-    Counter: D3D11_COUNTER,
-    MiscFlags: UINT,
-}}
-STRUCT!{struct D3D11_COUNTER_INFO {
-    LastDeviceDependentCounter: D3D11_COUNTER,
-    NumSimultaneousCounters: UINT,
-    NumDetectableParallelUnits: UINT8,
-}}
-RIDL!{interface ID3D11Counter(ID3D11CounterVtbl): ID3D11Asynchronous(ID3D11AsynchronousVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_COUNTER_DESC) -> ()
-}}
-ENUM!{enum D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS {
-    D3D11_STANDARD_MULTISAMPLE_PATTERN = 0xffffffff,
-    D3D11_CENTER_MULTISAMPLE_PATTERN = 0xfffffffe,
-}}
-ENUM!{enum D3D11_DEVICE_CONTEXT_TYPE {
-    D3D11_DEVICE_CONTEXT_IMMEDIATE = 0,
-    D3D11_DEVICE_CONTEXT_DEFERRED = D3D11_DEVICE_CONTEXT_IMMEDIATE.0 + 1,
-}}
-STRUCT!{struct D3D11_CLASS_INSTANCE_DESC {
-    InstanceId: UINT,
-    InstanceIndex: UINT,
-    TypeId: UINT,
-    ConstantBuffer: UINT,
-    BaseConstantBufferOffset: UINT,
-    BaseTexture: UINT,
-    BaseSampler: UINT,
-    Created: BOOL,
-}}
-RIDL!{interface ID3D11ClassInstance(ID3D11ClassInstanceVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetClassLinkage(&mut self, ppLinkage: *mut *mut ID3D11ClassLinkage) -> (),
-    fn GetDesc(&mut self, pDesc: *mut D3D11_CLASS_INSTANCE_DESC) -> (),
-    fn GetInstanceName(&mut self, pInstanceName: LPSTR, pBufferLength: *mut SIZE_T) -> (),
-    fn GetTypeName(&mut self, pTypeName: LPSTR, pBufferLength: *mut SIZE_T) -> ()
-}}
-RIDL!{interface ID3D11ClassLinkage(ID3D11ClassLinkageVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetClassInstance(
-        &mut self, GetClassInstance: LPCSTR, InstanceIndex: UINT,
-        ppInstance: *mut *mut ID3D11ClassInstance
-    ) -> HRESULT,
-    fn CreateClassInstance(
-        &mut self, pClassTypeName: LPCSTR, ConstantBufferOffset: UINT, ConstantVectorOffset: UINT, TextureOffset: UINT, SamplerOffset: UINT, ppInstance: *mut *mut ID3D11ClassInstance
-    ) -> HRESULT
-}}
-RIDL!{interface ID3D11CommandList(ID3D11CommandListVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetContextFlags(&mut self) -> UINT
-}}
-ENUM!{enum D3D11_FEATURE {
-    D3D11_FEATURE_THREADING = 0,
-    D3D11_FEATURE_DOUBLES = D3D11_FEATURE_THREADING.0 + 1,
-    D3D11_FEATURE_FORMAT_SUPPORT = D3D11_FEATURE_DOUBLES.0 + 1,
-    D3D11_FEATURE_FORMAT_SUPPORT2 = D3D11_FEATURE_FORMAT_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS = D3D11_FEATURE_FORMAT_SUPPORT2.0 + 1,
-    D3D11_FEATURE_D3D11_OPTIONS = D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS.0 + 1,
-    D3D11_FEATURE_ARCHITECTURE_INFO = D3D11_FEATURE_D3D11_OPTIONS.0 + 1,
-    D3D11_FEATURE_D3D9_OPTIONS = D3D11_FEATURE_ARCHITECTURE_INFO.0 + 1,
-    D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT = D3D11_FEATURE_D3D9_OPTIONS.0 + 1,
-    D3D11_FEATURE_D3D9_SHADOW_SUPPORT = D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D11_OPTIONS1 = D3D11_FEATURE_D3D9_SHADOW_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT = D3D11_FEATURE_D3D11_OPTIONS1.0 + 1,
-    D3D11_FEATURE_MARKER_SUPPORT = D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D9_OPTIONS1 = D3D11_FEATURE_MARKER_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D11_OPTIONS2 = D3D11_FEATURE_D3D9_OPTIONS1.0 + 1,
-    D3D11_FEATURE_D3D11_OPTIONS3 = D3D11_FEATURE_D3D11_OPTIONS2.0 + 1,
-    D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = D3D11_FEATURE_D3D11_OPTIONS3.0 + 1,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_THREADING {
-    DriverConcurrentCreates: BOOL,
-    DriverCommandLists: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_DOUBLES {
-    DoublePrecisionFloatShaderOps: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_FORMAT_SUPPORT {
-    InFormat: DXGI_FORMAT,
-    OutFormatSupport: UINT,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_FORMAT_SUPPORT2 {
-    InFormat: DXGI_FORMAT,
-    OutFormatSupport2: UINT,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS {
-    ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D11_OPTIONS {
-    OutputMergerLogicOp: BOOL,
-    UAVOnlyRenderingForcedSampleCount: BOOL,
-    DiscardAPIsSeenByDriver: BOOL,
-    FlagsForUpdateAndCopySeenByDriver: BOOL,
-    ClearView: BOOL,
-    CopyWithOverlap: BOOL,
-    ConstantBufferPartialUpdate: BOOL,
-    ConstantBufferOffsetting: BOOL,
-    MapNoOverwriteOnDynamicConstantBuffer: BOOL,
-    MapNoOverwriteOnDynamicBufferSRV: BOOL,
-    MultisampleRTVWithForcedSampleCountOne: BOOL,
-    SAD4ShaderInstructions: BOOL,
-    ExtendedDoublesShaderInstructions: BOOL,
-    ExtendedResourceSharing: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_ARCHITECTURE_INFO {
-    TileBasedDeferredRenderer: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D9_OPTIONS {
-    FullNonPow2TextureSupport: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D9_SHADOW_SUPPORT {
-    SupportsDepthAsTextureWithLessEqualComparisonFilter: BOOL,
-}}
-FLAGS!{enum D3D11_SHADER_MIN_PRECISION_SUPPORT {
-    D3D11_SHADER_MIN_PRECISION_10_BIT = 0x1,
-    D3D11_SHADER_MIN_PRECISION_16_BIT = 0x2,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_SHADER_MIN_PRECISION_SUPPORT {
-    PixelShaderMinPrecision: UINT,
-    AllOtherShaderStagesMinPrecision: UINT,
-}}
-ENUM!{enum D3D11_TILED_RESOURCES_TIER {
-    D3D11_TILED_RESOURCES_NOT_SUPPORTED = 0,
-    D3D11_TILED_RESOURCES_TIER_1 = 1,
-    D3D11_TILED_RESOURCES_TIER_2 = 2,
-    D3D11_TILED_RESOURCES_TIER_3 = 3,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D11_OPTIONS1 {
-    TiledResourcesTier: D3D11_TILED_RESOURCES_TIER,
-    MinMaxFiltering: BOOL,
-    ClearViewAlsoSupportsDepthOnlyFormats: BOOL,
-    MapOnDefaultBuffers: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D9_SIMPLE_INSTANCING_SUPPORT {
-    SimpleInstancingSupported: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_MARKER_SUPPORT {
-    Profile: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D9_OPTIONS1 {
-    FullNonPow2TextureSupported: BOOL,
-    DepthAsTextureWithLessEqualComparisonFilterSupported: BOOL,
-    SimpleInstancingSupported: BOOL,
-    TextureCubeFaceRenderTargetWithNonCubeDepthStencilSupported: BOOL,
-}}
-ENUM!{enum D3D11_CONSERVATIVE_RASTERIZATION_TIER {
-    D3D11_CONSERVATIVE_RASTERIZATION_NOT_SUPPORTED = 0,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_1 = 1,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_2 = 2,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_3 = 3,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D11_OPTIONS2 {
-    PSSpecifiedStencilRefSupported: BOOL,
-    TypedUAVLoadAdditionalFormats: BOOL,
-    ROVsSupported: BOOL,
-    ConservativeRasterizationTier: D3D11_CONSERVATIVE_RASTERIZATION_TIER,
-    TiledResourcesTier: D3D11_TILED_RESOURCES_TIER,
-    MapOnDefaultTextures: BOOL,
-    StandardSwizzle: BOOL,
-    UnifiedMemoryArchitecture: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D11_OPTIONS3 {
-    VPAndRTArrayIndexFromAnyShaderFeedingRasterizer: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT {
-    MaxGPUVirtualAddressBitsPerResource: UINT,
-    MaxGPUVirtualAddressBitsPerProcess: UINT,
-}}
-RIDL!{interface ID3D11DeviceContext(ID3D11DeviceContextVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn VSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn PSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn PSSetShader(
-        &mut self, pPixelShader: *mut ID3D11PixelShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn PSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn VSSetShader(
-        &mut self, pVertexShader: *mut ID3D11VertexShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn DrawIndexed(
-        &mut self, IndexCount: UINT, StartIndexLocation: UINT, BaseVertexLocation: INT
-    ) -> (),
-    fn Draw(&mut self, VertexCount: UINT, StartVertexLocation: UINT) -> (),
-    fn Map(
-        &mut self, pResource: *mut ID3D11Resource, Subresource: UINT, MapType: D3D11_MAP,
-        MapFlags: UINT, pMappedResource: *mut D3D11_MAPPED_SUBRESOURCE
-    ) -> HRESULT,
-    fn Unmap(&mut self, pResource: *mut ID3D11Resource, Subresource: UINT) -> (),
-    fn PSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn IASetInputLayout(&mut self, pInputLayout: *mut ID3D11InputLayout) -> (),
-    fn IASetVertexBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppVertexBuffers: *const *mut ID3D11Buffer,
-        pStrides: *const UINT, pOffsets: *const UINT
-    ) -> (),
-    fn IASetIndexBuffer(
-        &mut self, pIndexBuffer: *mut ID3D11Buffer, Format: DXGI_FORMAT, Offset: UINT
-    ) -> (),
-    fn DrawIndexedInstanced(
-        &mut self, IndexCountPerInstance: UINT, InstanceCount: UINT, StartIndexLocation: UINT,
-        BaseVertexLocation: INT, StartInstanceLocation: UINT
-    ) -> (),
-    fn DrawInstanced(
-        &mut self, VertexCountPerInstance: UINT, InstanceCount: UINT, StartVertexLocation: UINT,
-        StartInstanceLocation: UINT
-    ) -> (),
-    fn GSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn GSSetShader(
-        &mut self, pShader: *mut ID3D11GeometryShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn IASetPrimitiveTopology(&mut self, Topology: D3D11_PRIMITIVE_TOPOLOGY) -> (),
-    fn VSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn VSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn Begin(&mut self, pAsync: *mut ID3D11Asynchronous) -> (),
-    fn End(&mut self, pAsync: *mut ID3D11Asynchronous) -> (),
-    fn GetData(
-        &mut self,  pAsync: *mut ID3D11Asynchronous, pData: *mut c_void, DataSize: UINT,
-        GetDataFlags: UINT
-    ) -> HRESULT,
-    fn SetPredication(
-        &mut self, pPredicate: *mut ID3D11Predicate, PredicateValue: BOOL
-    ) -> (),
-    fn GSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn GSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn OMSetRenderTargets(
-        &mut self, NumViews: UINT, ppRenderTargetViews: *const *mut ID3D11RenderTargetView,
-        pDepthStencilView: *mut ID3D11DepthStencilView
-    ) -> (),
-    fn OMSetRenderTargetsAndUnorderedAccessViews(
-        &mut self, NumRTVs: UINT, ppRenderTargetViews: *const *mut ID3D11RenderTargetView,
-        pDepthStencilView: *mut ID3D11DepthStencilView, UAVStartSlot: UINT, NumUAVs: UINT,
-        ppUnorderedAccessViews: *const *mut ID3D11UnorderedAccessView,
-        pUAVInitialCounts: *const UINT
-    ) -> (),
-    fn OMSetBlendState(
-        &mut self, pBlendState: *mut ID3D11BlendState, BlendFactor: &[FLOAT; 4], SampleMask: UINT
-    ) -> (),
-    fn OMSetDepthStencilState(
-        &mut self, pDepthStencilState: *mut ID3D11DepthStencilState, StencilRef: UINT
-    ) -> (),
-    fn SOSetTargets(
-        &mut self, NumBuffers: UINT, ppSOTargets: *const *mut ID3D11Buffer, pOffsets: *const UINT
-    ) -> (),
-    fn DrawAuto(&mut self) -> (),
-    fn DrawIndexedInstancedIndirect(
-        &mut self, pBufferForArgs: *mut ID3D11Buffer, AlignedByteOffsetForArgs: UINT
-    ) -> (),
-    fn DrawInstancedIndirect(
-        &mut self, pBufferForArgs: *mut ID3D11Buffer, AlignedByteOffsetForArgs: UINT
-    ) -> (),
-    fn Dispatch(
-        &mut self, ThreadGroupCountX: UINT, ThreadGroupCountY: UINT, ThreadGroupCountZ: UINT
-    ) -> (),
-    fn DispatchIndirect(
-        &mut self, pBufferForArgs: *mut ID3D11Buffer, AlignedByteOffsetForArgs: UINT
-    ) -> (),
-    fn RSSetState(&mut self, pRasterizerState: *mut ID3D11RasterizerState) -> (),
-    fn RSSetViewports(&mut self, NumViewports: UINT, pViewports: *const D3D11_VIEWPORT) -> (),
-    fn RSSetScissorRects(&mut self, NumRects: UINT, pRects: *const D3D11_RECT) -> (),
-    fn CopySubresourceRegion(
-        &mut self, pDstResource: *mut ID3D11Resource, DstSubresource: UINT, DstX: UINT, DstY: UINT,
-        DstZ: UINT, pSrcResource: *mut ID3D11Resource, SrcSubresource: UINT,
-        pSrcBox: *const D3D11_BOX
-    ) -> (),
-    fn CopyResource(
-        &mut self, pDstResource: *mut ID3D11Resource, pSrcResource: *mut ID3D11Resource
-    ) -> (),
-    fn UpdateSubresource(
-        &mut self, pDstResource: *mut ID3D11Resource, DstSubresource: UINT,
-        pDstBox: *const D3D11_BOX, pSrcData: *const c_void, SrcRowPitch: UINT, SrcDepthPitch: UINT
-    ) -> (),
-    fn CopyStructureCount(
-        &mut self, pDstBuffer: *mut ID3D11Buffer, DstAlignedByteOffset: UINT,
-        pSrcView: *mut ID3D11UnorderedAccessView
-    ) -> (),
-    fn ClearRenderTargetView(
-        &mut self, pRenderTargetView: *mut ID3D11RenderTargetView, ColorRGBA: &[FLOAT; 4]
-    ) -> (),
-    fn ClearUnorderedAccessViewUint(
-        &mut self, pUnorderedAccessView: *mut ID3D11UnorderedAccessView, Values: &[UINT; 4]
-    ) -> (),
-    fn ClearUnorderedAccessViewFloat(
-        &mut self, pUnorderedAccessView: *mut ID3D11UnorderedAccessView, Values: &[FLOAT; 4]
-    ) -> (),
-    fn ClearDepthStencilView(
-        &mut self, pDepthStencilView: *mut ID3D11DepthStencilView, ClearFlags: UINT, Depth: FLOAT,
-        Stencil: UINT8
-    ) -> (),
-    fn GenerateMips(&mut self, pShaderResourceView: *mut ID3D11ShaderResourceView) -> (),
-    fn SetResourceMinLOD(&mut self, pResource: *mut ID3D11Resource, MinLOD: FLOAT) -> (),
-    fn GetResourceMinLOD(&mut self, pResource: *mut ID3D11Resource) -> FLOAT,
-    fn ResolveSubresource(
-        &mut self, pDstResource: *mut ID3D11Resource, DstSubresource: UINT,
-        pSrcResource: *mut ID3D11Resource, SrcSubresource: UINT, Format: DXGI_FORMAT
-    ) -> (),
-    fn ExecuteCommandList(
-        &mut self, pCommandList: *mut ID3D11CommandList,
-        RestoreContextState: BOOL
-    ) -> (),
-    fn HSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn HSSetShader(
-        &mut self, pHullShader: *mut ID3D11HullShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn HSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn HSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn DSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn DSSetShader(
-        &mut self, pDomainShader: *mut ID3D11DomainShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn DSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn DSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn CSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn CSSetUnorderedAccessViews(
-        &mut self, StartSlot: UINT, NumUAVs: UINT,
-        ppUnorderedAccessViews: *const *mut ID3D11UnorderedAccessView
-    ) -> (),
-    fn CSSetShader(
-        &mut self, pComputeShader: *mut ID3D11ComputeShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn CSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn CSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn VSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn PSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn PSGetShader(
-        &mut self, ppPixelShader: *mut *mut ID3D11PixelShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn PSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn VSGetShader(
-        &mut self, ppVertexShader: *mut *mut ID3D11VertexShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn PSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn IAGetInputLayout(&mut self, ppInputLayout: *mut *mut ID3D11InputLayout) -> (),
-    fn IAGetVertexBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppVertexBuffers: *mut *mut ID3D11Buffer,
-        pStrides: *mut UINT, pOffsets: *mut UINT
-    ) -> (),
-    fn IAGetIndexBuffer(
-        &mut self, pIndexBuffer: *mut *mut ID3D11Buffer, Format: *mut DXGI_FORMAT,
-        Offset: *mut UINT
-    ) -> (),
-    fn GSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn GSGetShader(
-        &mut self, ppGeometryShader: *mut *mut ID3D11GeometryShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn IAGetPrimitiveTopology(&mut self, pTopology: *mut D3D11_PRIMITIVE_TOPOLOGY) -> (),
-    fn VSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn VSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn GetPredication(
-        &mut self, ppPredicate: *mut *mut ID3D11Predicate, pPredicateValue: *mut BOOL
-    ) -> (),
-    fn GSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn GSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn OMGetRenderTargets(
-        &mut self, NumViews: UINT, ppRenderTargetViews: *mut *mut ID3D11RenderTargetView,
-        ppDepthStencilView: *mut *mut ID3D11DepthStencilView
-    ) -> (),
-    fn OMGetRenderTargetsAndUnorderedAccessViews(
-        &mut self, NumRTVs: UINT, ppRenderTargetViews: *mut *mut ID3D11RenderTargetView,
-        ppDepthStencilView: *mut *mut ID3D11DepthStencilView, UAVStartSlot: UINT,
-        ppUnorderedAccessViews: *mut *mut ID3D11UnorderedAccessView
-    ) -> (),
-    fn OMGetBlendState(
-        &mut self, ppBlendState: *mut *mut ID3D11BlendState, BlendFactor: &mut [FLOAT; 4],
-        pSampleMask: *mut UINT
-    ) -> (),
-    fn OMGetDepthStencilState(
-        &mut self, ppDepthStencilState: *mut *mut ID3D11DepthStencilState, pStencilRef: *mut UINT
-    ) -> (),
-    fn SOGetTargets(&mut self, NumBuffers: UINT, ppSOTargets: *mut *mut ID3D11Buffer) -> (),
-    fn RSGetState(&mut self, ppRasterizerState: *mut *mut ID3D11RasterizerState) -> (),
-    fn RSGetViewports(&mut self, pNumViewports: *mut UINT, pViewports: *mut D3D11_VIEWPORT) -> (),
-    fn RSGetScissorRects(&mut self, pNumRects: *mut UINT, pRects: *mut D3D11_RECT) -> (),
-    fn HSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn HSGetShader(
-        &mut self, ppHullShader: *mut *mut ID3D11HullShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn HSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn HSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn DSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn DSGetShader(
-        &mut self, ppDomainShader: *mut *mut ID3D11DomainShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn DSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn DSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn CSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn CSGetUnorderedAccessViews(
-        &mut self, StartSlot: UINT, NumUAVs: UINT,
-        ppUnorderedAccessViews: *mut *mut ID3D11UnorderedAccessView
-    ) -> (),
-    fn CSGetShader(
-        &mut self, ppComputeShader: *mut *mut ID3D11ComputeShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn CSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn CSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn ClearState(&mut self) -> (),
-    fn Flush(&mut self) -> (),
-    fn GetType(&mut self) -> D3D11_DEVICE_CONTEXT_TYPE,
-    fn GetContextFlags(&mut self) -> UINT,
-    fn FinishCommandList(
-        &mut self, RestoreDeferredContextState: BOOL, ppCommandList: *mut *mut ID3D11CommandList
-    ) -> HRESULT
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_DESC {
-    Guid: GUID,
-    SampleWidth: UINT,
-    SampleHeight: UINT,
-    OutputFormat: DXGI_FORMAT,
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_CONFIG {
-    guidConfigBitstreamEncryption: GUID,
-    guidConfigMBcontrolEncryption: GUID,
-    guidConfigResidDiffEncryption: GUID,
-    ConfigBitstreamRaw: UINT,
-    ConfigMBcontrolRasterOrder: UINT,
-    ConfigResidDiffHost: UINT,
-    ConfigSpatialResid8: UINT,
-    ConfigResid8Subtraction: UINT,
-    ConfigSpatialHost8or9Clipping: UINT,
-    ConfigSpatialResidInterleaved: UINT,
-    ConfigIntraResidUnsigned: UINT,
-    ConfigResidDiffAccelerator: UINT,
-    ConfigHostInverseScan: UINT,
-    ConfigSpecificIDCT: UINT,
-    Config4GroupedCoefs: UINT,
-    ConfigMinRenderTargetBuffCount: USHORT,
-    ConfigDecoderSpecific: USHORT,
-}}
-ENUM!{enum D3D11_VIDEO_DECODER_BUFFER_TYPE {
-    D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS = 0,
-    D3D11_VIDEO_DECODER_BUFFER_MACROBLOCK_CONTROL = 1,
-    D3D11_VIDEO_DECODER_BUFFER_RESIDUAL_DIFFERENCE = 2,
-    D3D11_VIDEO_DECODER_BUFFER_DEBLOCKING_CONTROL = 3,
-    D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX = 4,
-    D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL = 5,
-    D3D11_VIDEO_DECODER_BUFFER_BITSTREAM = 6,
-    D3D11_VIDEO_DECODER_BUFFER_MOTION_VECTOR = 7,
-    D3D11_VIDEO_DECODER_BUFFER_FILM_GRAIN = 8,
-}}
-STRUCT!{struct D3D11_AES_CTR_IV {
-    IV: UINT64,
-    Count: UINT64,
-}}
-STRUCT!{struct D3D11_ENCRYPTED_BLOCK_INFO {
-    NumEncryptedBytesAtBeginning: UINT,
-    NumBytesInSkipPattern: UINT,
-    NumBytesInEncryptPattern: UINT,
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_BUFFER_DESC {
-    BufferType: D3D11_VIDEO_DECODER_BUFFER_TYPE,
-    BufferIndex: UINT,
-    DataOffset: UINT,
-    DataSize: UINT,
-    FirstMBaddress: UINT,
-    NumMBsInBuffer: UINT,
-    Width: UINT,
-    Height: UINT,
-    Stride: UINT,
-    ReservedBits: UINT,
-    pIV: *mut c_void,
-    IVSize: UINT,
-    PartialEncryption: BOOL,
-    EncryptedBlockInfo: D3D11_ENCRYPTED_BLOCK_INFO,
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_EXTENSION {
-    Function: UINT,
-    pPrivateInputData: *mut c_void,
-    PrivateInputDataSize: UINT,
-    pPrivateOutputData: *mut c_void,
-    PrivateOutputDataSize: UINT,
-    ResourceCount: UINT,
-    ppResourceList: *mut *mut ID3D11Resource,
-}}
-RIDL!{interface ID3D11VideoDecoder(ID3D11VideoDecoderVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetCreationParameters(
-        &mut self, pVideoDesc: *mut D3D11_VIDEO_DECODER_DESC,
-        pConfig: *mut D3D11_VIDEO_DECODER_CONFIG
-    ) -> HRESULT,
-    fn GetDriverHandle(&mut self, pDriverHandle: *mut HANDLE) -> HRESULT
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT {
-    D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_INPUT = 0x1,
-    D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT = 0x2,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_DEVICE_CAPS {
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_LINEAR_SPACE = 0x1,
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_xvYCC = 0x2,
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_RGB_RANGE_CONVERSION = 0x4,
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_YCbCr_MATRIX_CONVERSION = 0x8,
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_NOMINAL_RANGE = 0x10,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_FEATURE_CAPS {
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_FILL = 0x1,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_CONSTRICTION = 0x2,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_LUMA_KEY = 0x4,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_PALETTE = 0x8,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_LEGACY = 0x10,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_STEREO = 0x20,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ROTATION = 0x40,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_STREAM = 0x80,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_PIXEL_ASPECT_RATIO = 0x100,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_MIRROR = 0x200,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_SHADER_USAGE = 0x400,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_FILTER_CAPS {
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS = 0x1,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST = 0x2,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE = 0x4,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION = 0x8,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_NOISE_REDUCTION = 0x10,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_EDGE_ENHANCEMENT = 0x20,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_ANAMORPHIC_SCALING = 0x40,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_STEREO_ADJUSTMENT = 0x80,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_FORMAT_CAPS {
-    D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_INTERLACED = 0x1,
-    D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_PROCAMP = 0x2,
-    D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_LUMA_KEY = 0x4,
-    D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_PALETTE_INTERLACED = 0x8,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS {
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DENOISE = 0x1,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DERINGING = 0x2,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_EDGE_ENHANCEMENT = 0x4,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_COLOR_CORRECTION = 0x8,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_FLESH_TONE_MAPPING = 0x10,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_IMAGE_STABILIZATION = 0x20,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_SUPER_RESOLUTION = 0x40,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_ANAMORPHIC_SCALING = 0x80,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_STEREO_CAPS {
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_MONO_OFFSET = 0x1,
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_ROW_INTERLEAVED = 0x2,
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_COLUMN_INTERLEAVED = 0x4,
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_CHECKERBOARD = 0x8,
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_FLIP_MODE = 0x10,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_CAPS {
-    DeviceCaps: UINT,
-    FeatureCaps: UINT,
-    FilterCaps: UINT,
-    InputFormatCaps: UINT,
-    AutoStreamCaps: UINT,
-    StereoCaps: UINT,
-    RateConversionCapsCount: UINT,
-    MaxInputStreams: UINT,
-    MaxStreamStates: UINT,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS {
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND = 0x1,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BOB = 0x2,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_ADAPTIVE = 0x4,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_MOTION_COMPENSATION = 0x8,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_INVERSE_TELECINE = 0x10,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_FRAME_RATE_CONVERSION = 0x20,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS {
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_32 = 0x1,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_22 = 0x2,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_2224 = 0x4,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_2332 = 0x8,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_32322 = 0x10,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_55 = 0x20,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_64 = 0x40,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_87 = 0x80,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_222222222223 = 0x100,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_OTHER = 0x80000000,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS {
-    PastFrames: UINT,
-    FutureFrames: UINT,
-    ProcessorCaps: UINT,
-    ITelecineCaps: UINT,
-    CustomRateCount: UINT,
-}}
-FLAGS!{enum D3D11_CONTENT_PROTECTION_CAPS {
-    D3D11_CONTENT_PROTECTION_CAPS_SOFTWARE = 0x1,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE = 0x2,
-    D3D11_CONTENT_PROTECTION_CAPS_PROTECTION_ALWAYS_ON = 0x4,
-    D3D11_CONTENT_PROTECTION_CAPS_PARTIAL_DECRYPTION = 0x8,
-    D3D11_CONTENT_PROTECTION_CAPS_CONTENT_KEY = 0x10,
-    D3D11_CONTENT_PROTECTION_CAPS_FRESHEN_SESSION_KEY = 0x20,
-    D3D11_CONTENT_PROTECTION_CAPS_ENCRYPTED_READ_BACK = 0x40,
-    D3D11_CONTENT_PROTECTION_CAPS_ENCRYPTED_READ_BACK_KEY = 0x80,
-    D3D11_CONTENT_PROTECTION_CAPS_SEQUENTIAL_CTR_IV = 0x100,
-    D3D11_CONTENT_PROTECTION_CAPS_ENCRYPT_SLICEDATA_ONLY = 0x200,
-    D3D11_CONTENT_PROTECTION_CAPS_DECRYPTION_BLT = 0x400,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_PROTECT_UNCOMPRESSED = 0x800,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_PROTECTED_MEMORY_PAGEABLE = 0x1000,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_TEARDOWN = 0x2000,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_DRM_COMMUNICATION = 0x4000,
-}}
-STRUCT!{struct D3D11_VIDEO_CONTENT_PROTECTION_CAPS {
-    Caps: UINT,
-    KeyExchangeTypeCount: UINT,
-    BlockAlignmentSize: UINT,
-    ProtectedMemorySize: ULONGLONG,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_CUSTOM_RATE {
-    CustomRate: DXGI_RATIONAL,
-    OutputFrames: UINT,
-    InputInterlaced: BOOL,
-    InputFramesOrFields: UINT,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_FILTER {
-    D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS = 0,
-    D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST = 1,
-    D3D11_VIDEO_PROCESSOR_FILTER_HUE = 2,
-    D3D11_VIDEO_PROCESSOR_FILTER_SATURATION = 3,
-    D3D11_VIDEO_PROCESSOR_FILTER_NOISE_REDUCTION = 4,
-    D3D11_VIDEO_PROCESSOR_FILTER_EDGE_ENHANCEMENT = 5,
-    D3D11_VIDEO_PROCESSOR_FILTER_ANAMORPHIC_SCALING = 6,
-    D3D11_VIDEO_PROCESSOR_FILTER_STEREO_ADJUSTMENT = 7,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_FILTER_RANGE {
-    Minimum: c_int,
-    Maximum: c_int,
-    Default: c_int,
-    Multiplier: c_float,
-}}
-ENUM!{enum D3D11_VIDEO_FRAME_FORMAT {
-    D3D11_VIDEO_FRAME_FORMAT_PROGRESSIVE = 0,
-    D3D11_VIDEO_FRAME_FORMAT_INTERLACED_TOP_FIELD_FIRST = 1,
-    D3D11_VIDEO_FRAME_FORMAT_INTERLACED_BOTTOM_FIELD_FIRST = 2,
-}}
-ENUM!{enum D3D11_VIDEO_USAGE {
-    D3D11_VIDEO_USAGE_PLAYBACK_NORMAL = 0,
-    D3D11_VIDEO_USAGE_OPTIMAL_SPEED = 1,
-    D3D11_VIDEO_USAGE_OPTIMAL_QUALITY = 2,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_CONTENT_DESC {
-    InputFrameFormat: D3D11_VIDEO_FRAME_FORMAT,
-    InputFrameRate: DXGI_RATIONAL,
-    InputWidth: UINT,
-    InputHeight: UINT,
-    OutputFrameRate: DXGI_RATIONAL,
-    OutputWidth: UINT,
-    OutputHeight: UINT,
-    Usage: D3D11_VIDEO_USAGE,
-}}
-RIDL!{interface ID3D11VideoProcessorEnumerator(ID3D11VideoProcessorEnumeratorVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetVideoProcessorContentDesc(
-        &mut self, pContentDesc: *mut D3D11_VIDEO_PROCESSOR_CONTENT_DESC
-    ) -> HRESULT,
-    fn CheckVideoProcessorFormat(&mut self, Format: DXGI_FORMAT, pFlags: *mut UINT) -> HRESULT,
-    fn GetVideoProcessorCaps(&mut self, pCaps: *mut D3D11_VIDEO_PROCESSOR_CAPS) -> HRESULT,
-    fn GetVideoProcessorRateConversionCaps(
-        &mut self, TypeIndex: UINT, pCaps: *mut D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS
-    ) -> HRESULT,
-    fn GetVideoProcessorCustomRate(
-        &mut self, TypeIndex: UINT, CustomRateIndex: UINT,
-        pRate: *mut D3D11_VIDEO_PROCESSOR_CUSTOM_RATE
-    ) -> HRESULT,
-    fn GetVideoProcessorFilterRange(
-        &mut self, Filter: D3D11_VIDEO_PROCESSOR_FILTER,
-        Range: *mut D3D11_VIDEO_PROCESSOR_FILTER_RANGE
-    ) -> HRESULT
-}}
-STRUCT!{struct D3D11_VIDEO_COLOR_RGBA {
-    R: c_float,
-    G: c_float,
-    B: c_float,
-    A: c_float,
-}}
-STRUCT!{struct D3D11_VIDEO_COLOR_YCbCrA {
-    Y: c_float,
-    Cb: c_float,
-    Cr: c_float,
-    A: c_float,
-}}
-STRUCT!{struct D3D11_VIDEO_COLOR {
-    u: [c_float; 4],
-}}
-UNION!{D3D11_VIDEO_COLOR, u, YCbCr, YCbCr_mut, D3D11_VIDEO_COLOR_YCbCrA}
-UNION!{D3D11_VIDEO_COLOR, u, RGBA, RGBA_mut, D3D11_VIDEO_COLOR_RGBA}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE {
-    D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE_UNDEFINED = 0,
-    D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE_16_235 = 1,
-    D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE_0_255 = 2,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_COLOR_SPACE {
-    bitfield: UINT,
-}}
-BITFIELD!{D3D11_VIDEO_PROCESSOR_COLOR_SPACE bitfield: UINT [
-    Usage set_Usage[0..1],
-    RGB_Range set_RGB_Range[1..2],
-    YCbCr_Matrix set_YCbCr_Matrix[2..3],
-    YCbCr_xvYCC set_YCbCr_xvYCC[3..4],
-    Nominal_Range set_Nominal_Range[4..6],
-]}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE {
-    D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_OPAQUE = 0,
-    D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_BACKGROUND = 1,
-    D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_DESTINATION = 2,
-    D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_SOURCE_STREAM = 3,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_OUTPUT_RATE {
-    D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_NORMAL = 0,
-    D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_HALF = 1,
-    D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_CUSTOM = 2,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_STEREO_FORMAT {
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_MONO = 0,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_HORIZONTAL = 1,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_VERTICAL = 2,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_SEPARATE = 3,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_MONO_OFFSET = 4,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_ROW_INTERLEAVED = 5,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_COLUMN_INTERLEAVED = 6,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_CHECKERBOARD = 7,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE {
-    D3D11_VIDEO_PROCESSOR_STEREO_FLIP_NONE = 0,
-    D3D11_VIDEO_PROCESSOR_STEREO_FLIP_FRAME0 = 1,
-    D3D11_VIDEO_PROCESSOR_STEREO_FLIP_FRAME1 = 2,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_ROTATION {
-    D3D11_VIDEO_PROCESSOR_ROTATION_IDENTITY = 0,
-    D3D11_VIDEO_PROCESSOR_ROTATION_90 = 1,
-    D3D11_VIDEO_PROCESSOR_ROTATION_180 = 2,
-    D3D11_VIDEO_PROCESSOR_ROTATION_270 = 3,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_STREAM {
-    Enable: BOOL,
-    OutputIndex: UINT,
-    InputFrameOrField: UINT,
-    PastFrames: UINT,
-    FutureFrames: UINT,
-    ppPastSurfaces: *mut *mut ID3D11VideoProcessorInputView,
-    pInputSurface: *mut ID3D11VideoProcessorInputView,
-    ppFutureSurfaces: *mut *mut ID3D11VideoProcessorInputView,
-    ppPastSurfacesRight: *mut *mut ID3D11VideoProcessorInputView,
-    pInputSurfaceRight: *mut ID3D11VideoProcessorInputView,
-    ppFutureSurfacesRight: *mut *mut ID3D11VideoProcessorInputView,
-}}
-RIDL!{interface ID3D11VideoProcessor(ID3D11VideoProcessorVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetContentDesc(&mut self, pDesc: *mut D3D11_VIDEO_PROCESSOR_CONTENT_DESC) -> (),
-    fn GetRateConversionCaps(
-        &mut self, pCaps: *mut D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS
-    ) -> ()
-}}
-STRUCT!{struct D3D11_OMAC {
-    Omac: [BYTE; 16],
-}}
-ENUM!{enum D3D11_AUTHENTICATED_CHANNEL_TYPE {
-    D3D11_AUTHENTICATED_CHANNEL_D3D11 = 1,
-    D3D11_AUTHENTICATED_CHANNEL_DRIVER_SOFTWARE = 2,
-    D3D11_AUTHENTICATED_CHANNEL_DRIVER_HARDWARE = 3,
-}}
-RIDL!{interface ID3D11AuthenticatedChannel(ID3D11AuthenticatedChannelVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetCertificateSize(&mut self, pCertificateSize: *mut UINT) -> HRESULT,
-    fn GetCertificate(&mut self, CertificateSize: UINT, pCertificate: *mut BYTE) -> HRESULT,
-    fn GetChannelHandle(&mut self, pChannelHandle: *mut HANDLE) -> ()
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_INPUT {
-    QueryType: GUID,
-    hChannel: HANDLE,
-    SequenceNumber: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT {
-    omac: D3D11_OMAC,
-    QueryType: GUID,
-    hChannel: HANDLE,
-    SequenceNumber: UINT,
-    ReturnCode: HRESULT,
-}}
-//FIXME bitfield
-STRUCT!{struct D3D11_AUTHENTICATED_PROTECTION_FLAGS {
-    u: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_PROTECTION_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    ProtectionFlags: D3D11_AUTHENTICATED_PROTECTION_FLAGS,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_CHANNEL_TYPE_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    ChannelType: D3D11_AUTHENTICATED_CHANNEL_TYPE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_DEVICE_HANDLE_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    DeviceHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    DecoderHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    DecoderHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    DeviceHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_COUNT_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    RestrictedSharedResourceProcessCount: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    ProcessIndex: UINT,
-}}
-ENUM!{enum D3D11_AUTHENTICATED_PROCESS_IDENTIFIER_TYPE {
-    DD3D11_PROCESSIDTYPE_UNKNOWN = 0,
-    DD3D11_PROCESSIDTYPE_DWM = 1,
-    DD3D11_PROCESSIDTYPE_HANDLE  = 2,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    ProcessIndex: UINT,
-    ProcessIdentifier: D3D11_AUTHENTICATED_PROCESS_IDENTIFIER_TYPE,
-    ProcessHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_UNRESTRICTED_PROTECTED_SHARED_RESOURCE_COUNT_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    UnrestrictedProtectedSharedResourceCount: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    DeviceHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    DeviceHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    OutputIDCount: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    DeviceHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    OutputIDIndex: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    DeviceHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    OutputIDIndex: UINT,
-    OutputID: UINT64,
-}}
-ENUM!{enum D3D11_BUS_TYPE {
-    D3D11_BUS_TYPE_OTHER = 0,
-    D3D11_BUS_TYPE_PCI = 0x1,
-    D3D11_BUS_TYPE_PCIX = 0x2,
-    D3D11_BUS_TYPE_PCIEXPRESS = 0x3,
-    D3D11_BUS_TYPE_AGP = 0x4,
-    D3D11_BUS_IMPL_MODIFIER_INSIDE_OF_CHIPSET = 0x10000,
-    D3D11_BUS_IMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_CHIP = 0x20000,
-    D3D11_BUS_IMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_SOCKET = 0x30000,
-    D3D11_BUS_IMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR = 0x40000,
-    D3D11_BUS_IMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR_INSIDE_OF_NUAE = 0x50000,
-    D3D11_BUS_IMPL_MODIFIER_NON_STANDARD = 0x80000000,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_ACESSIBILITY_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    BusType: D3D11_BUS_TYPE,
-    AccessibleInContiguousBlocks: BOOL,
-    AccessibleInNonContiguousBlocks: BOOL,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_ACCESSIBILITY_ENCRYPTION_GUID_COUNT_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    EncryptionGuidCount: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_ACCESSIBILITY_ENCRYPTION_GUID_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    EncryptionGuidIndex: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_ACCESSIBILITY_ENCRYPTION_GUID_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    EncryptionGuidIndex: UINT,
-    EncryptionGuid: GUID,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_CURRENT_ACCESSIBILITY_ENCRYPTION_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    EncryptionGuid: GUID,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_INPUT {
-    omac: D3D11_OMAC,
-    ConfigureType: GUID,
-    hChannel: HANDLE,
-    SequenceNumber: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_OUTPUT {
-    omac: D3D11_OMAC,
-    ConfigureType: GUID,
-    hChannel: HANDLE,
-    SequenceNumber: UINT,
-    ReturnCode: HRESULT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_INITIALIZE_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    StartSequenceQuery: UINT,
-    StartSequenceConfigure: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_PROTECTION_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    Protections: D3D11_AUTHENTICATED_PROTECTION_FLAGS,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_CRYPTO_SESSION_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    DecoderHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    DeviceHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_SHARED_RESOURCE_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    ProcessType: D3D11_AUTHENTICATED_PROCESS_IDENTIFIER_TYPE,
-    ProcessHandle: HANDLE,
-    AllowAccess: BOOL,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_ACCESSIBLE_ENCRYPTION_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    EncryptionGuid: GUID,
-}}
-RIDL!{interface ID3D11CryptoSession(ID3D11CryptoSessionVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetCryptoType(&mut self, pCryptoType: *mut GUID) -> (),
-    fn GetDecoderProfile(&mut self, pDecoderProfile: *mut GUID) -> (),
-    fn GetCertificateSize(&mut self, pCertificateSize: *mut UINT) -> HRESULT,
-    fn GetCertificate(&mut self, CertificateSize: UINT, pCertificate: *mut BYTE) -> HRESULT,
-    fn GetCryptoSessionHandle(&mut self, pCertificate: *mut HANDLE) -> ()
-}}
-ENUM!{enum D3D11_VDOV_DIMENSION {
-    D3D11_VDOV_DIMENSION_UNKNOWN = 0,
-    D3D11_VDOV_DIMENSION_TEXTURE2D = 1,
-}}
-STRUCT!{struct D3D11_TEX2D_VDOV {
-    ArraySlice: UINT,
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC {
-    DecodeProfile: GUID,
-    ViewDimension: D3D11_VDOV_DIMENSION,
-    Texture2D: D3D11_TEX2D_VDOV,
-}}
-RIDL!{interface ID3D11VideoDecoderOutputView(ID3D11VideoDecoderOutputViewVtbl)
-    : ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC) -> ()
-}}
-ENUM!{enum D3D11_VPIV_DIMENSION {
-    D3D11_VPIV_DIMENSION_UNKNOWN = 0,
-    D3D11_VPIV_DIMENSION_TEXTURE2D = 1,
-}}
-STRUCT!{struct D3D11_TEX2D_VPIV {
-    MipSlice: UINT,
-    ArraySlice: UINT,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC {
-    FourCC: UINT,
-    ViewDimension: D3D11_VPIV_DIMENSION,
-    Texture2D: D3D11_TEX2D_VPIV,
-}}
-RIDL!{interface ID3D11VideoProcessorInputView(ID3D11VideoProcessorInputViewVtbl)
-    : ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC) -> ()
-}}
-ENUM!{enum D3D11_VPOV_DIMENSION {
-    D3D11_VPOV_DIMENSION_UNKNOWN = 0,
-    D3D11_VPOV_DIMENSION_TEXTURE2D = 1,
-    D3D11_VPOV_DIMENSION_TEXTURE2DARRAY = 2,
-}}
-STRUCT!{struct D3D11_TEX2D_VPOV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_VPOV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC {
-    ViewDimension: D3D11_VPOV_DIMENSION,
-    u: [UINT; 3],
-}}
-UNION!{D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_VPOV}
-UNION!{D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_VPOV}
-RIDL!{interface ID3D11VideoProcessorOutputView(ID3D11VideoProcessorOutputViewVtbl)
-    : ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC) -> ()
-}}
-RIDL!{interface ID3D11VideoContext(ID3D11VideoContextVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDecoderBuffer(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder, Type:  D3D11_VIDEO_DECODER_BUFFER_TYPE,
-        pBufferSize: *mut UINT, ppBuffer: *mut *mut c_void
-    ) -> HRESULT,
-    fn ReleaseDecoderBuffer(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder, Type:  D3D11_VIDEO_DECODER_BUFFER_TYPE
-    ) -> HRESULT,
-    fn DecoderBeginFrame(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder, pView: *mut ID3D11VideoDecoderOutputView,
-        ContentKeySize: UINT, pContentKey: *const c_void
-    ) -> HRESULT,
-    fn DecoderEndFrame(&mut self, pDecoder: *mut ID3D11VideoDecoder) -> HRESULT,
-    fn SubmitDecoderBuffers(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder, NumBuffers: UINT,
-        pBufferDesc: *const D3D11_VIDEO_DECODER_BUFFER_DESC
-    ) -> HRESULT,
-    fn DecoderExtension(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder,
-        pExtensionData: *const D3D11_VIDEO_DECODER_EXTENSION
-    ) -> HRESULT,
-    fn VideoProcessorSetOutputTargetRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, Enable: BOOL, pRect: *const RECT
-    ) -> (),
-    fn VideoProcessorSetOutputBackgroundColor(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, YCbCr: BOOL, pRect: *const RECT
-    ) -> (),
-    fn VideoProcessorSetOutputColorSpace(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        pColorSpace: *const D3D11_VIDEO_PROCESSOR_COLOR_SPACE
-    ) -> HRESULT,
-    fn VideoProcessorSetOutputAlphaFillMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        AlphaFillMode: D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE, StreamIndex: UINT
-    ) -> (),
-    fn VideoProcessorSetOutputConstriction(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, Enable: BOOL, Size: SIZE
-    ) -> (),
-    fn VideoProcessorSetOutputStereoMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, Enable: BOOL
-    ) -> (),
-    fn VideoProcessorSetOutputExtension(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pExtensionGuid: *const GUID,
-        DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn VideoProcessorGetOutputTargetRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, Enabled: *mut BOOL, pRect: *mut RECT
-    ) -> (),
-    fn VideoProcessorGetOutputBackgroundColor(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pYCbCr: *mut BOOL,
-        pColor: *mut D3D11_VIDEO_COLOR
-    ) -> (),
-    fn VideoProcessorGetOutputColorSpace(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        pColorSpace: *mut D3D11_VIDEO_PROCESSOR_COLOR_SPACE
-    ) -> (),
-    fn VideoProcessorGetOutputAlphaFillMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        pAlphaFillMode: *mut D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE, pStreamIndex: *mut UINT
-    ) -> (),
-    fn VideoProcessorGetOutputConstriction(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pEnabled: *mut BOOL,
-        pSize: *mut SIZE
-    ) -> (),
-    fn VideoProcessorGetOutputStereoMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pEnabled: *mut BOOL
-    ) -> (),
-    fn VideoProcessorGetOutputExtension(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pExtensionGuid: *const GUID,
-        DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn VideoProcessorSetStreamFrameFormat(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        FrameFormat: D3D11_VIDEO_FRAME_FORMAT
-    ) -> (),
-    fn VideoProcessorSetStreamColorSpace(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pColorSpace: *const D3D11_VIDEO_PROCESSOR_COLOR_SPACE
-    ) -> (),
-    fn VideoProcessorSetStreamOutputRate(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        OutputRate: D3D11_VIDEO_PROCESSOR_OUTPUT_RATE, RepeatFrame: BOOL,
-        pCustomRate: *const DXGI_RATIONAL
-    ) -> (),
-    fn VideoProcessorSetStreamSourceRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        pRect: *const RECT
-    ) -> (),
-    fn VideoProcessorSetStreamDestRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        pRect: *const RECT
-    ) -> (),
-    fn VideoProcessorSetStreamAlpha(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        Alpha: FLOAT
-    ) -> (),
-    fn VideoProcessorSetStreamPalette(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Count: UINT,
-        pEntries: *const UINT
-    ) -> (),
-    fn VideoProcessorSetStreamPixelAspectRatio(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        pSourceAspectRatio: *const DXGI_RATIONAL, pDestinationAspectRatio: *const DXGI_RATIONAL
-    ) -> (),
-    fn VideoProcessorSetStreamLumaKey(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        Lower: FLOAT, Upper: FLOAT
-    ) -> (),
-    fn VideoProcessorSetStreamStereoFormat(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        Format: D3D11_VIDEO_PROCESSOR_STEREO_FORMAT, LeftViewFrame0: BOOL, BaseViewFrame0: BOOL,
-        FlipMode: D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE
-    ) -> (),
-    fn VideoProcessorSetStreamAutoProcessingMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL
-    ) -> (),
-    fn VideoProcessorSetStreamFilter(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        Filter: D3D11_VIDEO_PROCESSOR_FILTER, Enable: BOOL, Level: c_int
-    ) -> (),
-    fn VideoProcessorSetStreamExtension(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pExtensionGuid: *const GUID, DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn VideoProcessorGetStreamFrameFormat(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pFrameFormat: *mut D3D11_VIDEO_FRAME_FORMAT
-    ) -> (),
-    fn VideoProcessorGetStreamColorSpace(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pColorSpace: *mut D3D11_VIDEO_PROCESSOR_COLOR_SPACE
-    ) -> (),
-    fn VideoProcessorGetStreamOutputRate(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pOutputRate: *mut D3D11_VIDEO_PROCESSOR_OUTPUT_RATE, pRepeatFrame: *mut BOOL,
-        pCustomRate: *mut DXGI_RATIONAL
-    ) -> (),
-    fn VideoProcessorGetStreamSourceRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pRect: *mut RECT
-    ) -> (),
-    fn VideoProcessorGetStreamDestRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pRect: *mut RECT
-    ) -> (),
-    fn VideoProcessorGetStreamAlpha(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pAlpha: *mut FLOAT
-    ) -> (),
-    fn VideoProcessorGetStreamPalette(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Count: UINT,
-        pEntries: *mut UINT
-    ) -> (),
-    fn VideoProcessorGetStreamPixelAspectRatio(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pSourceAspectRatio: *mut DXGI_RATIONAL,
-        pDestinationAspectRatio: *mut DXGI_RATIONAL
-    ) -> (),
-    fn VideoProcessorGetStreamLumaKey(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pLower: *mut FLOAT, pUpper: *mut FLOAT
-    ) -> (),
-    fn VideoProcessorGetStreamStereoFormat(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pFormat: *mut D3D11_VIDEO_PROCESSOR_STEREO_FORMAT,
-        pLeftViewFrame0: *mut BOOL, pBaseViewFrame0: *mut BOOL,
-        pFlipMode: *mut D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE, MonoOffset: *mut c_int
-    ) -> (),
-    fn VideoProcessorGetStreamAutoProcessingMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL
-    ) -> (),
-    fn VideoProcessorGetStreamFilter(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        Filter: D3D11_VIDEO_PROCESSOR_FILTER, pEnabled: *mut BOOL, pLevel: *mut c_int
-    ) -> (),
-    fn VideoProcessorGetStreamExtension(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pExtensionGuid: *const GUID, DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn VideoProcessorBlt(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        pView: *mut ID3D11VideoProcessorOutputView, OutputFrame: UINT, StreamCount: UINT,
-        pStreams: *const D3D11_VIDEO_PROCESSOR_STREAM
-    ) -> HRESULT,
-    fn NegotiateCryptoSessionKeyExchange(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn EncryptionBlt(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, pSrcSurface: *mut ID3D11Texture2D,
-        pDstSurface: *mut ID3D11Texture2D, IVSize: UINT, pIV: *mut c_void
-    ) -> HRESULT,
-    fn DecryptionBlt(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, pSrcSurface: *mut ID3D11Texture2D,
-        pDstSurface: *mut ID3D11Texture2D, pEncryptedBlockInfo: *mut D3D11_ENCRYPTED_BLOCK_INFO,
-        ContentKeySize: UINT, pContentKey: *const c_void, IVSize: UINT, pIV: *mut c_void
-    ) -> HRESULT,
-    fn StartSessionKeyRefresh(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, RandomNumberSize: UINT,
-        pRandomNumber: *mut c_void
-    ) -> HRESULT,
-    fn FinishSessionKeyRefresh(&mut self, pCryptoSession: *mut ID3D11CryptoSession) -> HRESULT,
-    fn GetEncryptionBltKey(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, KeySize: UINT,
-        pReadbackKey: *mut c_void
-    ) -> HRESULT,
-    fn NegotiateAuthenticatedChannelKeyExchange(
-        &mut self, pChannel: *mut ID3D11AuthenticatedChannel, DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn QueryAuthenticatedChannel(
-        &mut self, pChannel: *mut ID3D11AuthenticatedChannel, InputSize: UINT,
-        pInput: *const c_void, OutputSize: UINT, pOutput: *mut c_void
-    ) -> HRESULT,
-    fn ConfigureAuthenticatedChannel(
-        &mut self, pChannel: *mut ID3D11AuthenticatedChannel, InputSize: UINT,
-        pInput: *const c_void, pOutput: *mut D3D11_AUTHENTICATED_CONFIGURE_OUTPUT
-    ) -> HRESULT,
-    fn VideoProcessorSetStreamRotation(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        Rotation: D3D11_VIDEO_PROCESSOR_ROTATION
-    ) -> HRESULT,
-    fn VideoProcessorGetStreamRotation(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnable: *mut BOOL, pRotation: *mut D3D11_VIDEO_PROCESSOR_ROTATION
-    ) -> HRESULT
-}}
-RIDL!{interface ID3D11VideoDevice(ID3D11VideoDeviceVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateVideoDecoder(
-        &mut self, pVideoDesc: *const D3D11_VIDEO_DECODER_DESC,
-        pConfig: *const D3D11_VIDEO_DECODER_CONFIG, ppDecoder: *mut *mut ID3D11VideoDecoder
-    ) -> HRESULT,
-    fn CreateVideoProcessor(
-        &mut self, pEnum: *mut ID3D11VideoProcessorEnumerator, RateConversionIndex: UINT,
-        ppVideoProcessor: *mut *mut ID3D11VideoProcessor
-    ) -> HRESULT,
-    fn CreateAuthenticatedChannel(
-        &mut self, ChannelType: D3D11_AUTHENTICATED_CHANNEL_TYPE,
-        ppAuthenticatedChannel: *mut *mut ID3D11AuthenticatedChannel
-    ) -> HRESULT,
-    fn CreateCryptoSession(
-        &mut self, pCryptoType: *const GUID, pDecoderProfile: *const GUID,
-        pKeyExchangeType: *const GUID, ppCryptoSession: *mut *mut ID3D11CryptoSession
-    ) -> HRESULT,
-    fn CreateVideoDecoderOutputView(
-        &mut self, pResource: *mut ID3D11Resource,
-        pDesc: *const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC,
-        ppVDOVView: *mut *mut ID3D11VideoDecoderOutputView
-    ) -> HRESULT,
-    fn CreateVideoProcessorInputView(
-        &mut self, pResource: *mut ID3D11Resource, pEnum: *mut ID3D11VideoProcessorEnumerator,
-        pDesc: *const D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC,
-        ppVPIView: *mut *mut ID3D11VideoProcessorInputView
-    ) -> HRESULT,
-    fn CreateVideoProcessorOutputView(
-        &mut self, pResource: *mut ID3D11Resource, pEnum: *mut ID3D11VideoProcessorEnumerator,
-        pDesc: *const D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC,
-        ppVPOView: *mut *mut ID3D11VideoProcessorOutputView
-    ) -> HRESULT,
-    fn CreateVideoProcessorEnumerator(
-        &mut self, pDesc: *const D3D11_VIDEO_PROCESSOR_CONTENT_DESC,
-        ppEnum: *mut *mut ID3D11VideoProcessorEnumerator
-    ) -> HRESULT,
-    fn GetVideoDecoderProfileCount(&mut self) -> UINT,
-    fn GetVideoDecoderProfile(&mut self, Index: UINT, pDecoderProfile: *mut GUID) -> HRESULT,
-    fn CheckVideoDecoderFormat(
-        &mut self, pDecoderProfile: *const GUID, Format: DXGI_FORMAT, pSupported: *mut BOOL
-    ) -> HRESULT,
-    fn GetVideoDecoderConfigCount(
-        &mut self, pDesc: *const D3D11_VIDEO_DECODER_DESC, pCount: *mut UINT
-    ) -> HRESULT,
-    fn GetVideoDecoderConfig(
-        &mut self, pDesc: *const D3D11_VIDEO_DECODER_DESC, Index: UINT,
-        pConfig: *mut D3D11_VIDEO_DECODER_CONFIG
-    ) -> HRESULT,
-    fn GetContentProtectionCaps(
-        &mut self, pCryptoType: *const GUID, pDecoderProfile: *const GUID,
-        pCaps: *mut D3D11_VIDEO_CONTENT_PROTECTION_CAPS
-    ) -> HRESULT,
-    fn CheckCryptoKeyExchange(
-        &mut self, pCryptoType: *const GUID, pDecoderProfile: *const GUID, Index: UINT,
-        pKeyExchangeType: *mut GUID
-    ) -> HRESULT,
-    fn SetPrivateData( &mut self, guid: REFGUID, DataSize: UINT, pData: *const c_void) -> HRESULT,
-    fn SetPrivateDataInterface(&mut self, guid: REFGUID, pData: *const IUnknown) -> HRESULT
-}}
-RIDL!{interface ID3D11Device(ID3D11DeviceVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateBuffer(
-        &mut self, pDesc: *const D3D11_BUFFER_DESC, pInitialData: *const D3D11_SUBRESOURCE_DATA,
-        ppBuffer: *mut *mut ID3D11Buffer
-    ) -> HRESULT,
-    fn CreateTexture1D(
-        &mut self, pDesc: *const D3D11_TEXTURE1D_DESC, pInitialData: *const D3D11_SUBRESOURCE_DATA,
-        ppTexture1D: *mut *mut ID3D11Texture1D
-    ) ->  HRESULT,
-    fn CreateTexture2D(
-        &mut self, pDesc: *const D3D11_TEXTURE2D_DESC, pInitialData: *const D3D11_SUBRESOURCE_DATA,
-        ppTexture2D: *mut *mut ID3D11Texture2D
-    ) -> HRESULT,
-    fn CreateTexture3D(
-        &mut self, pDesc: *const D3D11_TEXTURE3D_DESC, pInitialData: *const D3D11_SUBRESOURCE_DATA,
-        ppTexture3D: *mut *mut ID3D11Texture3D
-    ) -> HRESULT,
-    fn CreateShaderResourceView(
-        &mut self, pResource: *mut ID3D11Resource, pDesc: *const D3D11_SHADER_RESOURCE_VIEW_DESC,
-        ppSRView: *mut *mut ID3D11ShaderResourceView
-    ) -> HRESULT,
-    fn CreateUnorderedAccessView(
-        &mut self, pResource: *mut ID3D11Resource, pDesc: *const D3D11_UNORDERED_ACCESS_VIEW_DESC,
-        ppUAView: *mut *mut ID3D11UnorderedAccessView
-    ) -> HRESULT,
-    fn CreateRenderTargetView(
-        &mut self, pResource: *mut ID3D11Resource, pDesc: *const D3D11_RENDER_TARGET_VIEW_DESC,
-        ppRTView: *mut *mut ID3D11RenderTargetView
-    ) -> HRESULT,
-    fn CreateDepthStencilView(
-        &mut self, pResource: *mut ID3D11Resource, pDesc: *const D3D11_DEPTH_STENCIL_VIEW_DESC,
-        ppDepthStencilView: *mut *mut ID3D11DepthStencilView
-    ) -> HRESULT,
-    fn CreateInputLayout(
-        &mut self, pInputElementDescs: *const D3D11_INPUT_ELEMENT_DESC, NumElements: UINT,
-        pShaderBytecodeWithInputSignature: *const c_void, BytecodeLength: SIZE_T,
-        ppInputLayout: *mut *mut ID3D11InputLayout
-    ) -> HRESULT,
-    fn CreateVertexShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppVertexShader: *mut *mut ID3D11VertexShader
-    ) -> HRESULT,
-    fn CreateGeometryShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppGeometryShader: *mut *mut ID3D11GeometryShader
-    ) -> HRESULT,
-    fn CreateGeometryShaderWithStreamOutput(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pSODeclaration: *const D3D11_SO_DECLARATION_ENTRY, NumEntries: UINT,
-        pBufferStrides: *const UINT, NumStrides: UINT, RasterizedStream: UINT,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppGeometryShader: *mut *mut ID3D11GeometryShader
-    ) -> HRESULT,
-    fn CreatePixelShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppPixelShader: *mut *mut ID3D11PixelShader
-    ) -> HRESULT,
-    fn CreateHullShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppHullShader: *mut *mut ID3D11HullShader
-    ) -> HRESULT,
-    fn CreateDomainShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppDomainShader: *mut *mut ID3D11DomainShader
-    ) -> HRESULT,
-    fn CreateComputeShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppComputeShader: *mut *mut ID3D11ComputeShader
-    ) -> HRESULT,
-    fn CreateClassLinkage(&mut self, ppLinkage: *mut *mut ID3D11ClassLinkage) -> HRESULT,
-    fn CreateBlendState(
-        &mut self, pBlendStateDesc: *const D3D11_BLEND_DESC,
-        ppBlendState: *mut *mut ID3D11BlendState
-    ) -> HRESULT,
-    fn CreateDepthStencilState(
-        &mut self, pDepthStencilDesc: *const D3D11_DEPTH_STENCIL_DESC,
-        ppDepthStencilState: *mut *mut ID3D11DepthStencilState
-    ) -> HRESULT,
-    fn CreateRasterizerState(
-        &mut self, pRasterizerDesc: *const D3D11_RASTERIZER_DESC,
-        ppRasterizerState: *mut *mut ID3D11RasterizerState
-    ) -> HRESULT,
-    fn CreateSamplerState(
-        &mut self, pSamplerDesc: *const D3D11_SAMPLER_DESC,
-        ppSamplerState: *mut *mut ID3D11SamplerState
-    ) -> HRESULT,
-    fn CreateQuery(
-        &mut self, pQueryDesc: *const D3D11_QUERY_DESC, ppQuery: *mut *mut ID3D11Query
-    ) -> HRESULT,
-    fn CreatePredicate(
-        &mut self, pPredicateDesc: *const D3D11_QUERY_DESC, ppPredicate: *mut *mut ID3D11Predicate
-    ) -> HRESULT,
-    fn CreateCounter(
-        &mut self, pCounterDesc: *const D3D11_COUNTER_DESC, ppCounter: *mut *mut ID3D11Counter
-    ) -> HRESULT,
-    fn CreateDeferredContext(
-        &mut self, ContextFlags: UINT, ppDeferredContext: *mut *mut ID3D11DeviceContext
-    ) -> HRESULT,
-    fn OpenSharedResource(
-        &mut self, hResource: HANDLE, ReturnedInterface: REFIID, ppResource: *mut *mut c_void
-    ) -> HRESULT,
-    fn CheckFormatSupport(
-        &mut self, Format: DXGI_FORMAT, pFormatSupport: *mut UINT
-    ) -> HRESULT,
-    fn CheckMultisampleQualityLevels(
-        &mut self, Format: DXGI_FORMAT, SampleCount: UINT, pNumQualityLevels: *mut UINT
-    ) -> HRESULT,
-    fn CheckCounterInfo(&mut self, pCounterInfo: *mut D3D11_COUNTER_INFO) -> (),
-    fn CheckCounter(
-        &mut self, pDesc: *const D3D11_COUNTER_DESC, pType: *mut D3D11_COUNTER_TYPE,
-        pActiveCounters: *mut UINT, szName: LPSTR, pNameLength: *mut UINT, szUnits: LPSTR,
-        pUnitsLength: *mut UINT, szDescription: LPSTR, pDescriptionLength: *mut UINT
-    ) -> HRESULT,
-    fn CheckFeatureSupport(
-        &mut self, Feature: D3D11_FEATURE, pFeatureSupportData: *mut c_void,
-        FeatureSupportDataSize: UINT
-    ) -> HRESULT,
-    fn GetPrivateData(
-        &mut self, guid: REFGUID, pDataSize: *mut UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn SetPrivateData(
-        &mut self, guid: REFGUID, DataSize: UINT, pData: *const c_void
-    ) -> HRESULT,
-    fn SetPrivateDataInterface(&mut self, guid: REFGUID, pData: *const IUnknown) -> HRESULT,
-    fn GetFeatureLevel(&mut self) -> D3D_FEATURE_LEVEL,
-    fn GetCreationFlags(&mut self) -> UINT,
-    fn GetDeviceRemovedReason(&mut self) -> HRESULT,
-    fn GetImmediateContext(&mut self, ppImmediateContext: *mut *mut ID3D11DeviceContext) -> (),
-    fn SetExceptionMode(&mut self, RaiseFlags: UINT) -> HRESULT,
-    fn GetExceptionMode(&mut self) -> UINT
-}}
-FLAGS!{enum D3D11_CREATE_DEVICE_FLAG {
-    D3D11_CREATE_DEVICE_SINGLETHREADED = 0x1,
-    D3D11_CREATE_DEVICE_DEBUG = 0x2,
-    D3D11_CREATE_DEVICE_SWITCH_TO_REF = 0x4,
-    D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x8,
-    D3D11_CREATE_DEVICE_BGRA_SUPPORT = 0x20,
-    D3D11_CREATE_DEVICE_DEBUGGABLE = 0x40,
-    D3D11_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY = 0x80,
-    D3D11_CREATE_DEVICE_DISABLE_GPU_TIMEOUT = 0x100,
-    D3D11_CREATE_DEVICE_VIDEO_SUPPORT = 0x800,
-}}
-pub const D3D11_SDK_VERSION: DWORD = 7;
-
-pub fn D3D11CalcSubresource(MipSlice: ::UINT, ArraySlice: ::UINT, MipLevels: ::UINT) -> ::UINT {
-    MipSlice + ArraySlice * MipLevels
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d11shader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d11shader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d11shader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d11shader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,320 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-ENUM!{enum D3D11_SHADER_VERSION_TYPE {
-    D3D11_SHVER_PIXEL_SHADER = 0,
-    D3D11_SHVER_VERTEX_SHADER = 1,
-    D3D11_SHVER_GEOMETRY_SHADER = 2,
-    D3D11_SHVER_HULL_SHADER = 3,
-    D3D11_SHVER_DOMAIN_SHADER = 4,
-    D3D11_SHVER_COMPUTE_SHADER = 5,
-    D3D11_SHVER_RESERVED0 = 0xFFF0,
-}}
-pub const D3D_RETURN_PARAMETER_INDEX: c_int = -1;
-pub type D3D11_RESOURCE_RETURN_TYPE = D3D_RESOURCE_RETURN_TYPE;
-pub type D3D11_CBUFFER_TYPE = D3D_CBUFFER_TYPE;
-STRUCT!{struct D3D11_SIGNATURE_PARAMETER_DESC {
-    SemanticName: LPCSTR,
-    SemanticIndex: UINT,
-    Register: UINT,
-    SystemValueType: D3D_NAME,
-    ComponentType: D3D_REGISTER_COMPONENT_TYPE,
-    Mask: BYTE,
-    ReadWriteMask: BYTE,
-    Stream: UINT,
-    MinPrecision: D3D_MIN_PRECISION,
-}}
-STRUCT!{struct D3D11_SHADER_BUFFER_DESC {
-    Name: LPCSTR,
-    Type: D3D_CBUFFER_TYPE,
-    Variables: UINT,
-    Size: UINT,
-    uFlags: UINT,
-}}
-STRUCT!{struct D3D11_SHADER_VARIABLE_DESC {
-    Name: LPCSTR,
-    StartOffset: UINT,
-    Size: UINT,
-    uFlags: UINT,
-    DefaultValue: LPVOID,
-    StartTexture: UINT,
-    TextureSize: UINT,
-    StartSampler: UINT,
-    SamplerSize: UINT,
-}}
-STRUCT!{struct D3D11_SHADER_TYPE_DESC {
-    Class: D3D_SHADER_VARIABLE_CLASS,
-    Type: D3D_SHADER_VARIABLE_TYPE,
-    Rows: UINT,
-    Columns: UINT,
-    Elements: UINT,
-    Members: UINT,
-    Offset: UINT,
-    Name: LPCSTR,
-}}
-pub type D3D11_TESSELLATOR_DOMAIN = D3D_TESSELLATOR_DOMAIN;
-pub type D3D11_TESSELLATOR_PARTITIONING = D3D_TESSELLATOR_PARTITIONING;
-pub type D3D11_TESSELLATOR_OUTPUT_PRIMITIVE = D3D_TESSELLATOR_OUTPUT_PRIMITIVE;
-STRUCT!{struct D3D11_SHADER_DESC {
-    Version: UINT,
-    Creator: LPCSTR,
-    Flags: UINT,
-    ConstantBuffers: UINT,
-    BoundResources: UINT,
-    InputParameters: UINT,
-    OutputParameters: UINT,
-    InstructionCount: UINT,
-    TempRegisterCount: UINT,
-    TempArrayCount: UINT,
-    DefCount: UINT,
-    DclCount: UINT,
-    TextureNormalInstructions: UINT,
-    TextureLoadInstructions: UINT,
-    TextureCompInstructions: UINT,
-    TextureBiasInstructions: UINT,
-    TextureGradientInstructions: UINT,
-    FloatInstructionCount: UINT,
-    IntInstructionCount: UINT,
-    UintInstructionCount: UINT,
-    StaticFlowControlCount: UINT,
-    DynamicFlowControlCount: UINT,
-    MacroInstructionCount: UINT,
-    ArrayInstructionCount: UINT,
-    CutInstructionCount: UINT,
-    EmitInstructionCount: UINT,
-    GSOutputTopology: D3D_PRIMITIVE_TOPOLOGY,
-    GSMaxOutputVertexCount: UINT,
-    InputPrimitive: D3D_PRIMITIVE,
-    PatchConstantParameters: UINT,
-    cGSInstanceCount: UINT,
-    cControlPoints: UINT,
-    HSOutputPrimitive: D3D_TESSELLATOR_OUTPUT_PRIMITIVE,
-    HSPartitioning: D3D_TESSELLATOR_PARTITIONING,
-    TessellatorDomain: D3D_TESSELLATOR_DOMAIN,
-    cBarrierInstructions: UINT,
-    cInterlockedInstructions: UINT,
-    cTextureStoreInstructions: UINT,
-}}
-STRUCT!{struct D3D11_SHADER_INPUT_BIND_DESC {
-    Name: LPCSTR,
-    Type: D3D_SHADER_INPUT_TYPE,
-    BindPoint: UINT,
-    BindCount: UINT,
-    uFlags: UINT,
-    ReturnType: D3D_RESOURCE_RETURN_TYPE,
-    Dimension: D3D_SRV_DIMENSION,
-    NumSamples: UINT,
-}}
-pub const D3D_SHADER_REQUIRES_DOUBLES: UINT64 = 0x00000001;
-pub const D3D_SHADER_REQUIRES_EARLY_DEPTH_STENCIL: UINT64 = 0x00000002;
-pub const D3D_SHADER_REQUIRES_UAVS_AT_EVERY_STAGE: UINT64 = 0x00000004;
-pub const D3D_SHADER_REQUIRES_64_UAVS: UINT64 = 0x00000008;
-pub const D3D_SHADER_REQUIRES_MINIMUM_PRECISION: UINT64 = 0x00000010;
-pub const D3D_SHADER_REQUIRES_11_1_DOUBLE_EXTENSIONS: UINT64 = 0x00000020;
-pub const D3D_SHADER_REQUIRES_11_1_SHADER_EXTENSIONS: UINT64 = 0x00000040;
-pub const D3D_SHADER_REQUIRES_LEVEL_9_COMPARISON_FILTERING: UINT64 = 0x00000080;
-pub const D3D_SHADER_REQUIRES_TILED_RESOURCES: UINT64 = 0x00000100;
-STRUCT!{struct D3D11_LIBRARY_DESC {
-    Creator: LPCSTR,
-    Flags: UINT,
-    FunctionCount: UINT,
-}}
-STRUCT!{struct D3D11_FUNCTION_DESC {
-    Version: UINT,
-    Creator: LPCSTR,
-    Flags: UINT,
-    ConstantBuffers: UINT,
-    BoundResources: UINT,
-    InstructionCount: UINT,
-    TempRegisterCount: UINT,
-    TempArrayCount: UINT,
-    DefCount: UINT,
-    DclCount: UINT,
-    TextureNormalInstructions: UINT,
-    TextureLoadInstructions: UINT,
-    TextureCompInstructions: UINT,
-    TextureBiasInstructions: UINT,
-    TextureGradientInstructions: UINT,
-    FloatInstructionCount: UINT,
-    IntInstructionCount: UINT,
-    UintInstructionCount: UINT,
-    StaticFlowControlCount: UINT,
-    DynamicFlowControlCount: UINT,
-    MacroInstructionCount: UINT,
-    ArrayInstructionCount: UINT,
-    MovInstructionCount: UINT,
-    MovcInstructionCount: UINT,
-    ConversionInstructionCount: UINT,
-    BitwiseInstructionCount: UINT,
-    MinFeatureLevel: D3D_FEATURE_LEVEL,
-    RequiredFeatureFlags: UINT64,
-    Name: LPCSTR,
-    FunctionParameterCount: INT,
-    HasReturn: BOOL,
-    Has10Level9VertexShader: BOOL,
-    Has10Level9PixelShader: BOOL,
-}}
-STRUCT!{struct D3D11_PARAMETER_DESC {
-    Name: LPCSTR,
-    SemanticName: LPCSTR,
-    Type: D3D_SHADER_VARIABLE_TYPE,
-    Class: D3D_SHADER_VARIABLE_CLASS,
-    Rows: UINT,
-    Columns: UINT,
-    InterpolationMode: D3D_INTERPOLATION_MODE,
-    Flags: D3D_PARAMETER_FLAGS,
-    FirstInRegister: UINT,
-    FirstInComponent: UINT,
-    FirstOutRegister: UINT,
-    FirstOutComponent: UINT,
-}}
-RIDL!{interface ID3D11ShaderReflectionType(ID3D11ShaderReflectionTypeVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_TYPE_DESC) -> HRESULT,
-    fn GetMemberTypeByIndex(&mut self, Index: UINT) -> *mut ID3D11ShaderReflectionType,
-    fn GetMemberTypeByName(&mut self, Name: LPCSTR) -> *mut ID3D11ShaderReflectionType,
-    fn GetMemberTypeName(&mut self, Index: UINT) -> LPCSTR,
-    fn IsEqual(&mut self, pType: *mut ID3D11ShaderReflectionType) -> HRESULT,
-    fn GetSubType(&mut self) -> *mut ID3D11ShaderReflectionType,
-    fn GetBaseClass(&mut self) -> *mut ID3D11ShaderReflectionType,
-    fn GetNumInterfaces(&mut self) -> UINT,
-    fn GetInterfaceByIndex(&mut self, uIndex: UINT) -> *mut ID3D11ShaderReflectionType,
-    fn IsOfType(&mut self, pType: *mut ID3D11ShaderReflectionType) -> HRESULT,
-    fn ImplementsInterface(&mut self, pBase: *mut ID3D11ShaderReflectionType) -> HRESULT
-}}
-RIDL!{interface ID3D11ShaderReflectionVariable(ID3D11ShaderReflectionVariableVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_VARIABLE_DESC) -> HRESULT,
-    fn GetType(&mut self) -> *mut ID3D11ShaderReflectionType,
-    fn GetBuffer(&mut self) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetInterfaceSlot(&mut self, uArrayIndex: UINT) -> UINT
-}}
-RIDL!{interface ID3D11ShaderReflectionConstantBuffer(ID3D11ShaderReflectionConstantBufferVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_BUFFER_DESC) -> HRESULT,
-    fn GetVariableByIndex(&mut self, Index: UINT) -> *mut ID3D11ShaderReflectionVariable,
-    fn GetVariableByName(&mut self, Name: LPCSTR) -> *mut ID3D11ShaderReflectionVariable
-}}
-RIDL!{interface ID3D11ShaderReflection(ID3D11ShaderReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_DESC) -> HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, Index: UINT
-    ) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: LPCSTR
-    ) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: UINT, pDesc: *mut D3D11_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetInputParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D11_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT,
-    fn GetOutputParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D11_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT,
-    fn GetPatchConstantParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D11_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT,
-    fn GetVariableByName(&mut self, Name: LPCSTR) -> *mut ID3D11ShaderReflectionVariable,
-    fn GetResourceBindingDescByName(
-        &mut self, Name: LPCSTR, pDesc: *mut D3D11_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetMovInstructionCount(&mut self) -> UINT,
-    fn GetMovcInstructionCount(&mut self) -> UINT,
-    fn GetConversionInstructionCount(&mut self) -> UINT,
-    fn GetBitwiseInstructionCount(&mut self) -> UINT,
-    fn GetGSInputPrimitive(&mut self) -> D3D_PRIMITIVE,
-    fn IsSampleFrequencyShader(&mut self) -> BOOL,
-    fn GetNumInterfaceSlots(&mut self) -> UINT,
-    fn GetMinFeatureLevel(&mut self, pLevel: *mut D3D_FEATURE_LEVEL) -> HRESULT,
-    fn GetThreadGroupSize(
-        &mut self, pSizeX: *mut UINT, pSizeY: *mut UINT, pSizeZ: *mut UINT
-    ) -> UINT,
-    fn GetRequiresFlags(&mut self) -> UINT64
-}}
-RIDL!{interface ID3D11LibraryReflection(ID3D11LibraryReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_LIBRARY_DESC) -> HRESULT,
-    fn GetFunctionByIndex(&mut self, FunctionIndex: INT) -> *mut ID3D11FunctionReflection
-}}
-RIDL!{interface ID3D11FunctionReflection(ID3D11FunctionReflectionVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_FUNCTION_DESC) -> HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, BufferIndex: UINT
-    ) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: LPCSTR
-    ) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: UINT, pDesc: *mut D3D11_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetVariableByName(&mut self, Name: LPCSTR) -> *mut ID3D11ShaderReflectionVariable,
-    fn GetResourceBindingDescByName(
-        &mut self, Name: LPCSTR, pDesc: *mut D3D11_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetFunctionParameter(
-        &mut self, ParameterIndex: INT
-    ) -> *mut ID3D11FunctionParameterReflection
-}}
-RIDL!{interface ID3D11FunctionParameterReflection(ID3D11FunctionParameterReflectionVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_PARAMETER_DESC) -> HRESULT
-}}
-RIDL!{interface ID3D11Module(ID3D11ModuleVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateInstance(
-        &mut self, pNamespace: LPCSTR, ppModuleInstance: *mut *mut ID3D11ModuleInstance
-    ) -> HRESULT
-}}
-RIDL!{interface ID3D11ModuleInstance(ID3D11ModuleInstanceVtbl): IUnknown(IUnknownVtbl) {
-    fn BindConstantBuffer(&mut self, uSrcSlot: UINT, uDstSlot: UINT, cbDstOffset: UINT) -> HRESULT,
-    fn BindConstantBufferByName(
-        &mut self, pName: LPCSTR, uDstSlot: UINT, cbDstOffset: UINT
-    ) -> HRESULT,
-    fn BindResource(&mut self, uSrcSlot: UINT, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindResourceByName(&mut self, pName: LPCSTR, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindSampler(&mut self, uSrcSlot: UINT, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindSamplerByName(&mut self, pName: LPCSTR, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindUnorderedAccessView(&mut self, uSrcSlot: UINT, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindUnorderedAccessViewByName(
-        &mut self, pName: LPCSTR, uDstSlot: UINT, uCount: UINT
-    ) -> HRESULT,
-    fn BindResourceAsUnorderedAccessView(
-        &mut self, uSrcSrvSlot: UINT, uDstUavSlot: UINT, uCount: UINT
-    ) -> HRESULT,
-    fn BindResourceAsUnorderedAccessViewByName(
-        &mut self, pSrvName: LPCSTR, uDstUavSlot: UINT, uCount: UINT
-    ) -> HRESULT
-}}
-RIDL!{interface ID3D11Linker(ID3D11LinkerVtbl): IUnknown(IUnknownVtbl) {
-    fn Link(
-        &mut self, pEntry: *mut ID3D11ModuleInstance, pEntryName: LPCSTR, pTargetName: LPCSTR,
-        uFlags: UINT, ppShaderBlob: *mut *mut ID3DBlob, ppErrorBuffer: *mut *mut ID3DBlob
-    ) -> HRESULT,
-    fn UseLibrary(&mut self, pLibraryMI: *mut ID3D11ModuleInstance) -> HRESULT,
-    fn AddClipPlaneFromCBuffer(&mut self, uCBufferSlot: UINT, uCBufferEntry: UINT) -> HRESULT
-}}
-RIDL!{interface ID3D11LinkingNode(ID3D11LinkingNodeVtbl): IUnknown(IUnknownVtbl) {}}
-RIDL!{interface ID3D11FunctionLinkingGraph(ID3D11FunctionLinkingGraphVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateModuleInstance(
-        &mut self, ppModuleInstance: *mut *mut ID3D11ModuleInstance,
-        ppErrorBuffer: *mut *mut ID3DBlob
-    ) -> HRESULT,
-    fn SetInputSignature(
-        &mut self, pInputParameters: *const D3D11_PARAMETER_DESC, cInputParameters: UINT,
-        ppInputNode: *mut *mut ID3D11LinkingNode
-    ) -> HRESULT,
-    fn SetOutputSignature(
-        &mut self, pOutputParameters: *const D3D11_PARAMETER_DESC, cOutputParameters: UINT,
-        ppOutputNode: *mut *mut ID3D11LinkingNode
-    ) -> HRESULT,
-    fn CallFunction(
-        &mut self, pModuleInstanceNamespace: LPCSTR,
-        pModuleWithFunctionPrototype: *mut ID3D11Module, pFunctionName: LPCSTR,
-        ppCallNode: *mut *mut ID3D11LinkingNode
-    ) -> HRESULT,
-    fn PassValue(
-        &mut self, pSrcNode: *mut ID3D11LinkingNode, SrcParameterIndex: INT,
-        pDstNode: *mut ID3D11LinkingNode, DstParameterIndex: INT
-    ) -> HRESULT,
-    fn PassValueWithSwizzle(
-        &mut self, pSrcNode: *mut ID3D11LinkingNode, SrcParameterIndex: INT, pSrcSwizzle: LPCSTR,
-        pDstNode: *mut ID3D11LinkingNode, DstParameterIndex: INT, pDstSwizzle: LPCSTR
-    ) -> HRESULT,
-    fn GetLastError(&mut self, ppErrorBuffer: *mut *mut ID3DBlob) -> HRESULT,
-    fn GenerateHlsl(&mut self, uFlags: UINT, ppBuffer: *mut *mut ID3DBlob) -> HRESULT
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2324 +0,0 @@
-// Copyright © 2015, Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-pub const D3D12_16BIT_INDEX_STRIP_CUT_VALUE: ::UINT = 0xffff;
-pub const D3D12_32BIT_INDEX_STRIP_CUT_VALUE: ::UINT = 0xffffffff;
-pub const D3D12_8BIT_INDEX_STRIP_CUT_VALUE: ::UINT = 0xff;
-pub const D3D12_ANISOTROPIC_FILTERING_BIT: ::UINT = 0x40;
-pub const D3D12_APPEND_ALIGNED_ELEMENT: ::UINT = 0xffffffff;
-pub const D3D12_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT: ::UINT = 9;
-pub const D3D12_CLIP_OR_CULL_DISTANCE_COUNT: ::UINT = 8;
-pub const D3D12_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT: ::UINT = 2;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT: ::UINT = 14;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS: ::UINT = 4;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT: ::UINT = 15;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_PARTIAL_UPDATE_EXTENTS_BYTE_ALIGNMENT: ::UINT = 16;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT: ::UINT = 15;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT: ::UINT = 64;
-pub const D3D12_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT: ::UINT = 128;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT: ::UINT = 128;
-pub const D3D12_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_SAMPLER_REGISTER_COUNT: ::UINT = 16;
-pub const D3D12_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_SAMPLER_SLOT_COUNT: ::UINT = 16;
-pub const D3D12_COMMONSHADER_SUBROUTINE_NESTING_LIMIT: ::UINT = 32;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_COUNT: ::UINT = 4096;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_READS_PER_INST: ::UINT = 3;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_READ_PORTS: ::UINT = 3;
-pub const D3D12_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX: ::UINT = 10;
-pub const D3D12_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN: ::INT = -10;
-pub const D3D12_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE: ::INT = -8;
-pub const D3D12_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE: ::UINT = 7;
-pub const D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT: ::UINT = 256;
-pub const D3D12_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 256;
-pub const D3D12_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP: ::UINT = 64;
-pub const D3D12_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 240;
-pub const D3D12_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP: ::UINT = 68;
-pub const D3D12_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 224;
-pub const D3D12_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP: ::UINT = 72;
-pub const D3D12_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 208;
-pub const D3D12_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP: ::UINT = 76;
-pub const D3D12_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 192;
-pub const D3D12_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP: ::UINT = 84;
-pub const D3D12_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 176;
-pub const D3D12_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP: ::UINT = 92;
-pub const D3D12_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 160;
-pub const D3D12_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP: ::UINT = 100;
-pub const D3D12_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 144;
-pub const D3D12_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP: ::UINT = 112;
-pub const D3D12_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 128;
-pub const D3D12_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP: ::UINT = 128;
-pub const D3D12_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 112;
-pub const D3D12_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP: ::UINT = 144;
-pub const D3D12_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 96;
-pub const D3D12_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP: ::UINT = 168;
-pub const D3D12_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 80;
-pub const D3D12_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP: ::UINT = 204;
-pub const D3D12_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 64;
-pub const D3D12_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP: ::UINT = 256;
-pub const D3D12_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 48;
-pub const D3D12_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP: ::UINT = 340;
-pub const D3D12_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 32;
-pub const D3D12_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP: ::UINT = 512;
-pub const D3D12_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 16;
-pub const D3D12_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP: ::UINT = 768;
-pub const D3D12_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION: ::UINT = 1;
-pub const D3D12_CS_4_X_RAW_UAV_BYTE_ALIGNMENT: ::UINT = 256;
-pub const D3D12_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP: ::UINT = 768;
-pub const D3D12_CS_4_X_THREAD_GROUP_MAX_X: ::UINT = 768;
-pub const D3D12_CS_4_X_THREAD_GROUP_MAX_Y: ::UINT = 768;
-pub const D3D12_CS_4_X_UAV_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION: ::UINT = 65535;
-pub const D3D12_CS_TGSM_REGISTER_COUNT: ::UINT = 8192;
-pub const D3D12_CS_TGSM_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_CS_TGSM_RESOURCE_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_CS_TGSM_RESOURCE_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_CS_THREADGROUPID_REGISTER_COMPONENTS: ::UINT = 3;
-pub const D3D12_CS_THREADGROUPID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_THREADIDINGROUPFLATTENED_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_CS_THREADIDINGROUPFLATTENED_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_THREADIDINGROUP_REGISTER_COMPONENTS: ::UINT = 3;
-pub const D3D12_CS_THREADIDINGROUP_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_THREADID_REGISTER_COMPONENTS: ::UINT = 3;
-pub const D3D12_CS_THREADID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP: ::UINT = 1024;
-pub const D3D12_CS_THREAD_GROUP_MAX_X: ::UINT = 1024;
-pub const D3D12_CS_THREAD_GROUP_MAX_Y: ::UINT = 1024;
-pub const D3D12_CS_THREAD_GROUP_MAX_Z: ::UINT = 64;
-pub const D3D12_CS_THREAD_GROUP_MIN_X: ::UINT = 1;
-pub const D3D12_CS_THREAD_GROUP_MIN_Y: ::UINT = 1;
-pub const D3D12_CS_THREAD_GROUP_MIN_Z: ::UINT = 1;
-pub const D3D12_CS_THREAD_LOCAL_TEMP_REGISTER_POOL: ::UINT = 16384;
-pub const D3D12_DEFAULT_BLEND_FACTOR_ALPHA: ::FLOAT = 1.0;
-pub const D3D12_DEFAULT_BLEND_FACTOR_BLUE: ::FLOAT = 1.0;
-pub const D3D12_DEFAULT_BLEND_FACTOR_GREEN: ::FLOAT = 1.0;
-pub const D3D12_DEFAULT_BLEND_FACTOR_RED: ::FLOAT = 1.0;
-pub const D3D12_DEFAULT_BORDER_COLOR_COMPONENT: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_DEPTH_BIAS: ::UINT = 0;
-pub const D3D12_DEFAULT_DEPTH_BIAS_CLAMP: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_MAX_ANISOTROPY: ::UINT = 16;
-pub const D3D12_DEFAULT_MIP_LOD_BIAS: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT: ::UINT = 4194304;
-pub const D3D12_DEFAULT_RENDER_TARGET_ARRAY_INDEX: ::UINT = 0;
-pub const D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT: ::UINT = 65536;
-pub const D3D12_DEFAULT_SAMPLE_MASK: ::UINT = 0xffffffff;
-pub const D3D12_DEFAULT_SCISSOR_ENDX: ::UINT = 0;
-pub const D3D12_DEFAULT_SCISSOR_ENDY: ::UINT = 0;
-pub const D3D12_DEFAULT_SCISSOR_STARTX: ::UINT = 0;
-pub const D3D12_DEFAULT_SCISSOR_STARTY: ::UINT = 0;
-pub const D3D12_DEFAULT_SLOPE_SCALED_DEPTH_BIAS: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_STENCIL_READ_MASK: ::UINT = 0xff;
-pub const D3D12_DEFAULT_STENCIL_REFERENCE: ::UINT = 0;
-pub const D3D12_DEFAULT_STENCIL_WRITE_MASK: ::UINT = 0xff;
-pub const D3D12_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX: ::UINT = 0;
-pub const D3D12_DEFAULT_VIEWPORT_HEIGHT: ::UINT = 0;
-pub const D3D12_DEFAULT_VIEWPORT_MAX_DEPTH: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_VIEWPORT_MIN_DEPTH: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_VIEWPORT_TOPLEFTX: ::UINT = 0;
-pub const D3D12_DEFAULT_VIEWPORT_TOPLEFTY: ::UINT = 0;
-pub const D3D12_DEFAULT_VIEWPORT_WIDTH: ::UINT = 0;
-pub const D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND: ::UINT = 0xffffffff;
-pub const D3D12_DRIVER_RESERVED_REGISTER_SPACE_VALUES_END: ::UINT = 0xfffffff7;
-pub const D3D12_DRIVER_RESERVED_REGISTER_SPACE_VALUES_START: ::UINT = 0xfffffff0;
-pub const D3D12_DS_INPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS: ::UINT = 3968;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENTS: ::UINT = 3;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_DS_OUTPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_DS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_OUTPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_FILTER_REDUCTION_TYPE_MASK: ::UINT = 0x3;
-pub const D3D12_FILTER_REDUCTION_TYPE_SHIFT: ::UINT = 7;
-pub const D3D12_FILTER_TYPE_MASK: ::UINT = 0x3;
-pub const D3D12_FLOAT16_FUSED_TOLERANCE_IN_ULP: ::DOUBLE = 0.6;
-pub const D3D12_FLOAT32_MAX: ::FLOAT = 3.402823466e+38;
-pub const D3D12_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP: ::FLOAT = 0.6;
-pub const D3D12_FLOAT_TO_SRGB_EXPONENT_DENOMINATOR: ::FLOAT = 2.4;
-pub const D3D12_FLOAT_TO_SRGB_EXPONENT_NUMERATOR: ::FLOAT = 1.0;
-pub const D3D12_FLOAT_TO_SRGB_OFFSET: ::FLOAT = 0.055;
-pub const D3D12_FLOAT_TO_SRGB_SCALE_1: ::FLOAT = 12.92;
-pub const D3D12_FLOAT_TO_SRGB_SCALE_2: ::FLOAT = 1.055;
-pub const D3D12_FLOAT_TO_SRGB_THRESHOLD: ::FLOAT = 0.0031308;
-pub const D3D12_FTOI_INSTRUCTION_MAX_INPUT: ::FLOAT = 2147483647.999;
-pub const D3D12_FTOI_INSTRUCTION_MIN_INPUT: ::FLOAT = -2147483648.999;
-pub const D3D12_FTOU_INSTRUCTION_MAX_INPUT: ::FLOAT = 4294967295.999;
-pub const D3D12_FTOU_INSTRUCTION_MIN_INPUT: ::FLOAT = 0.0;
-pub const D3D12_GS_INPUT_INSTANCE_ID_READS_PER_INST: ::UINT = 2;
-pub const D3D12_GS_INPUT_INSTANCE_ID_READ_PORTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_GS_INPUT_INSTANCE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_GS_INPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_GS_INPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_GS_INPUT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_GS_INPUT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_REGISTER_VERTICES: ::UINT = 32;
-pub const D3D12_GS_MAX_INSTANCE_COUNT: ::UINT = 32;
-pub const D3D12_GS_MAX_OUTPUT_VERTEX_COUNT_ACROSS_INSTANCES: ::UINT = 1024;
-pub const D3D12_GS_OUTPUT_ELEMENTS: ::UINT = 32;
-pub const D3D12_GS_OUTPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_GS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_GS_OUTPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_HS_CONTROL_POINT_PHASE_INPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_HS_CONTROL_POINT_PHASE_OUTPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_HS_CONTROL_POINT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_HS_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_CONTROL_POINT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_CONTROL_POINT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND: ::UINT = 0xffffffff;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND: ::UINT = 0xffffffff;
-pub const D3D12_HS_MAXTESSFACTOR_LOWER_BOUND: ::FLOAT = 1.0;
-pub const D3D12_HS_MAXTESSFACTOR_UPPER_BOUND: ::FLOAT = 64.0;
-pub const D3D12_HS_OUTPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS: ::UINT = 3968;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_SCALAR_COMPONENTS: ::UINT = 128;
-pub const D3D12_IA_DEFAULT_INDEX_BUFFER_OFFSET_IN_BYTES: ::UINT = 0;
-pub const D3D12_IA_DEFAULT_PRIMITIVE_TOPOLOGY: ::UINT = 0;
-pub const D3D12_IA_DEFAULT_VERTEX_BUFFER_OFFSET_IN_BYTES: ::UINT = 0;
-pub const D3D12_IA_INDEX_INPUT_RESOURCE_SLOT_COUNT: ::UINT = 1;
-pub const D3D12_IA_INSTANCE_ID_BIT_COUNT: ::UINT = 32;
-pub const D3D12_IA_INTEGER_ARITHMETIC_BIT_COUNT: ::UINT = 32;
-pub const D3D12_IA_PATCH_MAX_CONTROL_POINT_COUNT: ::UINT = 32;
-pub const D3D12_IA_PRIMITIVE_ID_BIT_COUNT: ::UINT = 32;
-pub const D3D12_IA_VERTEX_ID_BIT_COUNT: ::UINT = 32;
-pub const D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT: ::UINT = 32;
-pub const D3D12_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS: ::UINT = 128;
-pub const D3D12_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT: ::UINT = 32;
-pub const D3D12_INTEGER_DIVIDE_BY_ZERO_QUOTIENT: ::UINT = 0xffffffff;
-pub const D3D12_INTEGER_DIVIDE_BY_ZERO_REMAINDER: ::UINT = 0xffffffff;
-pub const D3D12_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL: ::UINT = 0xffffffff;
-pub const D3D12_KEEP_UNORDERED_ACCESS_VIEWS: ::UINT = 0xffffffff;
-pub const D3D12_LINEAR_GAMMA: ::FLOAT = 1.0;
-pub const D3D12_MAG_FILTER_SHIFT: ::UINT = 2;
-pub const D3D12_MAJOR_VERSION: ::UINT = 12;
-pub const D3D12_MAX_BORDER_COLOR_COMPONENT: ::FLOAT = 1.0;
-pub const D3D12_MAX_DEPTH: ::FLOAT = 1.0;
-pub const D3D12_MAX_LIVE_STATIC_SAMPLERS: ::UINT = 2032;
-pub const D3D12_MAX_MAXANISOTROPY: ::UINT = 16;
-pub const D3D12_MAX_MULTISAMPLE_SAMPLE_COUNT: ::UINT = 32;
-pub const D3D12_MAX_POSITION_VALUE: ::FLOAT = 3.402823466e+34;
-pub const D3D12_MAX_ROOT_COST: ::UINT = 64;
-pub const D3D12_MAX_SHADER_VISIBLE_DESCRIPTOR_HEAP_SIZE_TIER_1: ::UINT = 1000000;
-pub const D3D12_MAX_SHADER_VISIBLE_DESCRIPTOR_HEAP_SIZE_TIER_2: ::UINT = 1000000;
-pub const D3D12_MAX_SHADER_VISIBLE_SAMPLER_HEAP_SIZE: ::UINT = 2048;
-pub const D3D12_MAX_TEXTURE_DIMENSION_2_TO_EXP: ::UINT = 17;
-pub const D3D12_MINOR_VERSION: ::UINT = 0;
-pub const D3D12_MIN_BORDER_COLOR_COMPONENT: ::FLOAT = 0.0;
-pub const D3D12_MIN_DEPTH: ::FLOAT = 0.0;
-pub const D3D12_MIN_FILTER_SHIFT: ::UINT = 4;
-pub const D3D12_MIN_MAXANISOTROPY: ::UINT = 0;
-pub const D3D12_MIP_FILTER_SHIFT: ::UINT = 0;
-pub const D3D12_MIP_LOD_BIAS_MAX: ::FLOAT = 15.99;
-pub const D3D12_MIP_LOD_BIAS_MIN: ::FLOAT = -16.0;
-pub const D3D12_MIP_LOD_FRACTIONAL_BIT_COUNT: ::UINT = 8;
-pub const D3D12_MIP_LOD_RANGE_BIT_COUNT: ::UINT = 8;
-pub const D3D12_MULTISAMPLE_ANTIALIAS_LINE_WIDTH: ::FLOAT = 1.4;
-pub const D3D12_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT: ::UINT = 0;
-pub const D3D12_OS_RESERVED_REGISTER_SPACE_VALUES_END: ::UINT = 0xffffffff;
-pub const D3D12_OS_RESERVED_REGISTER_SPACE_VALUES_START: ::UINT = 0xfffffff8;
-pub const D3D12_PACKED_TILE: ::UINT = 0xffffffff;
-pub const D3D12_PIXEL_ADDRESS_RANGE_BIT_COUNT: ::UINT = 15;
-pub const D3D12_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT: ::UINT = 16;
-pub const D3D12_PS_CS_UAV_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_PS_CS_UAV_REGISTER_COUNT: ::UINT = 8;
-pub const D3D12_PS_CS_UAV_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_PS_CS_UAV_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_PS_FRONTFACING_DEFAULT_VALUE: ::UINT = 0xffffffff;
-pub const D3D12_PS_FRONTFACING_FALSE_VALUE: ::UINT = 0;
-pub const D3D12_PS_FRONTFACING_TRUE_VALUE: ::UINT = 0xffffffff;
-pub const D3D12_PS_INPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_PS_INPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_PS_INPUT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_PS_INPUT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT: ::FLOAT = 0.0;
-pub const D3D12_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_PS_OUTPUT_DEPTH_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_PS_OUTPUT_MASK_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_PS_OUTPUT_MASK_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_PS_OUTPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_PS_OUTPUT_REGISTER_COUNT: ::UINT = 8;
-pub const D3D12_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT: ::FLOAT = 0.5;
-pub const D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT: ::UINT = 16;
-pub const D3D12_REQ_BLEND_OBJECT_COUNT_PER_DEVICE: ::UINT = 4096;
-pub const D3D12_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP: ::UINT = 27;
-pub const D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT: ::UINT = 4096;
-pub const D3D12_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE: ::UINT = 4096;
-pub const D3D12_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP: ::UINT = 32;
-pub const D3D12_REQ_DRAW_VERTEX_COUNT_2_TO_EXP: ::UINT = 32;
-pub const D3D12_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION: ::UINT = 16384;
-pub const D3D12_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT: ::UINT = 1024;
-pub const D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT: ::UINT = 4096;
-pub const D3D12_REQ_MAXANISOTROPY: ::UINT = 16;
-pub const D3D12_REQ_MIP_LEVELS: ::UINT = 15;
-pub const D3D12_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES: ::UINT = 2048;
-pub const D3D12_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE: ::UINT = 4096;
-pub const D3D12_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH: ::UINT = 16384;
-pub const D3D12_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM: ::UINT = 128;
-pub const D3D12_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM: ::FLOAT = 0.25;
-pub const D3D12_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_C_TERM: ::UINT = 2048;
-pub const D3D12_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP: ::UINT = 20;
-pub const D3D12_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE: ::UINT = 4096;
-pub const D3D12_REQ_SUBRESOURCES: ::UINT = 30720;
-pub const D3D12_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION: ::UINT = 2048;
-pub const D3D12_REQ_TEXTURE1D_U_DIMENSION: ::UINT = 16384;
-pub const D3D12_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION: ::UINT = 2048;
-pub const D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION: ::UINT = 16384;
-pub const D3D12_REQ_TEXTURE3D_U_V_OR_W_DIMENSION: ::UINT = 2048;
-pub const D3D12_REQ_TEXTURECUBE_DIMENSION: ::UINT = 16384;
-pub const D3D12_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL: ::UINT = 0;
-pub const D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES: ::UINT = 0xffffffff;
-pub const D3D12_SHADER_COMPONENT_MAPPING_MASK: ::UINT = 0x7;
-pub const D3D12_SHADER_COMPONENT_MAPPING_SHIFT: ::UINT = 3;
-pub const D3D12_SHADER_MAJOR_VERSION: ::UINT = 5;
-pub const D3D12_SHADER_MAX_INSTANCES: ::UINT = 65535;
-pub const D3D12_SHADER_MAX_INTERFACES: ::UINT = 253;
-pub const D3D12_SHADER_MAX_INTERFACE_CALL_SITES: ::UINT = 4096;
-pub const D3D12_SHADER_MAX_TYPES: ::UINT = 65535;
-pub const D3D12_SHADER_MINOR_VERSION: ::UINT = 1;
-pub const D3D12_SHIFT_INSTRUCTION_PAD_VALUE: ::UINT = 0;
-pub const D3D12_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT: ::UINT = 5;
-pub const D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT: ::UINT = 8;
-pub const D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT: ::UINT = 65536;
-pub const D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT: ::UINT = 4096;
-pub const D3D12_SO_BUFFER_MAX_STRIDE_IN_BYTES: ::UINT = 2048;
-pub const D3D12_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES: ::UINT = 512;
-pub const D3D12_SO_BUFFER_SLOT_COUNT: ::UINT = 4;
-pub const D3D12_SO_DDI_REGISTER_INDEX_DENOTING_GAP: ::UINT = 0xffffffff;
-pub const D3D12_SO_NO_RASTERIZED_STREAM: ::UINT = 0xffffffff;
-pub const D3D12_SO_OUTPUT_COMPONENT_COUNT: ::UINT = 128;
-pub const D3D12_SO_STREAM_COUNT: ::UINT = 4;
-pub const D3D12_SPEC_DATE_DAY: ::UINT = 14;
-pub const D3D12_SPEC_DATE_MONTH: ::UINT = 11;
-pub const D3D12_SPEC_DATE_YEAR: ::UINT = 2014;
-pub const D3D12_SPEC_VERSION: ::DOUBLE = 1.16;
-pub const D3D12_SRGB_GAMMA: ::FLOAT = 2.2;
-pub const D3D12_SRGB_TO_FLOAT_DENOMINATOR_1: ::FLOAT = 12.92;
-pub const D3D12_SRGB_TO_FLOAT_DENOMINATOR_2: ::FLOAT = 1.055;
-pub const D3D12_SRGB_TO_FLOAT_EXPONENT: ::FLOAT = 2.4;
-pub const D3D12_SRGB_TO_FLOAT_OFFSET: ::FLOAT = 0.055;
-pub const D3D12_SRGB_TO_FLOAT_THRESHOLD: ::FLOAT = 0.04045;
-pub const D3D12_SRGB_TO_FLOAT_TOLERANCE_IN_ULP: ::FLOAT = 0.5;
-pub const D3D12_STANDARD_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_STANDARD_COMPONENT_BIT_COUNT_DOUBLED: ::UINT = 64;
-pub const D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE: ::UINT = 4;
-pub const D3D12_STANDARD_PIXEL_COMPONENT_COUNT: ::UINT = 128;
-pub const D3D12_STANDARD_PIXEL_ELEMENT_COUNT: ::UINT = 32;
-pub const D3D12_STANDARD_VECTOR_SIZE: ::UINT = 4;
-pub const D3D12_STANDARD_VERTEX_ELEMENT_COUNT: ::UINT = 32;
-pub const D3D12_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT: ::UINT = 64;
-pub const D3D12_SUBPIXEL_FRACTIONAL_BIT_COUNT: ::UINT = 8;
-pub const D3D12_SUBTEXEL_FRACTIONAL_BIT_COUNT: ::UINT = 8;
-pub const D3D12_SYSTEM_RESERVED_REGISTER_SPACE_VALUES_END: ::UINT = 0xffffffff;
-pub const D3D12_SYSTEM_RESERVED_REGISTER_SPACE_VALUES_START: ::UINT = 0xfffffff0;
-pub const D3D12_TESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR: ::UINT = 64;
-pub const D3D12_TESSELLATOR_MAX_ISOLINE_DENSITY_TESSELLATION_FACTOR: ::UINT = 64;
-pub const D3D12_TESSELLATOR_MAX_ODD_TESSELLATION_FACTOR: ::UINT = 63;
-pub const D3D12_TESSELLATOR_MAX_TESSELLATION_FACTOR: ::UINT = 64;
-pub const D3D12_TESSELLATOR_MIN_EVEN_TESSELLATION_FACTOR: ::UINT = 2;
-pub const D3D12_TESSELLATOR_MIN_ISOLINE_DENSITY_TESSELLATION_FACTOR: ::UINT = 1;
-pub const D3D12_TESSELLATOR_MIN_ODD_TESSELLATION_FACTOR: ::UINT = 1;
-pub const D3D12_TEXEL_ADDRESS_RANGE_BIT_COUNT: ::UINT = 16;
-pub const D3D12_TEXTURE_DATA_PITCH_ALIGNMENT: ::UINT = 256;
-pub const D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT: ::UINT = 512;
-pub const D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES: ::UINT = 65536;
-pub const D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT: ::UINT = 4096;
-pub const D3D12_UAV_SLOT_COUNT: ::UINT = 64;
-pub const D3D12_UNBOUND_MEMORY_ACCESS_RESULT: ::UINT = 0;
-pub const D3D12_VIEWPORT_AND_SCISSORRECT_MAX_INDEX: ::UINT = 15;
-pub const D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE: ::UINT = 16;
-pub const D3D12_VIEWPORT_BOUNDS_MAX: ::UINT = 32767;
-pub const D3D12_VIEWPORT_BOUNDS_MIN: ::INT = -32768;
-pub const D3D12_VS_INPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_VS_INPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_VS_INPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_VS_INPUT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_VS_INPUT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_VS_OUTPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_VS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_VS_OUTPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT: ::UINT = 10;
-pub const D3D12_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP: ::UINT = 25;
-pub const D3D12_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP: ::UINT = 25;
-pub type D3D12_GPU_VIRTUAL_ADDRESS = ::UINT64;
-ENUM!{enum D3D12_COMMAND_LIST_TYPE {
-    D3D12_COMMAND_LIST_TYPE_DIRECT = 0,
-    D3D12_COMMAND_LIST_TYPE_BUNDLE = 1,
-    D3D12_COMMAND_LIST_TYPE_COMPUTE = 2,
-    D3D12_COMMAND_LIST_TYPE_COPY = 3,
-}}
-FLAGS!{enum D3D12_COMMAND_QUEUE_FLAGS {
-    D3D12_COMMAND_QUEUE_FLAG_NONE = 0x0,
-    D3D12_COMMAND_QUEUE_FLAG_DISABLE_GPU_TIMEOUT = 0x1,
-}}
-ENUM!{enum D3D12_COMMAND_QUEUE_PRIORITY {
-    D3D12_COMMAND_QUEUE_PRIORITY_NORMAL = 0,
-    D3D12_COMMAND_QUEUE_PRIORITY_HIGH = 100,
-}}
-STRUCT!{struct D3D12_COMMAND_QUEUE_DESC {
-    Type: D3D12_COMMAND_LIST_TYPE,
-    Priority: ::INT,
-    Flags: D3D12_COMMAND_QUEUE_FLAGS,
-    NodeMask: ::UINT,
-}}
-ENUM!{enum D3D12_PRIMITIVE_TOPOLOGY_TYPE {
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED = 0,
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT = 1,
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE = 2,
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE = 3,
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH = 4,
-}}
-ENUM!{enum D3D12_INPUT_CLASSIFICATION {
-    D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA = 0,
-    D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA = 1,
-}}
-STRUCT!{struct D3D12_INPUT_ELEMENT_DESC {
-    SemanticName: ::LPCSTR,
-    SemanticIndex: ::UINT,
-    Format: ::DXGI_FORMAT,
-    InputSlot: ::UINT,
-    AlignedByteOffset: ::UINT,
-    InputSlotClass: D3D12_INPUT_CLASSIFICATION,
-    InstanceDataStepRate: ::UINT,
-}}
-ENUM!{enum D3D12_FILL_MODE {
-    D3D12_FILL_MODE_WIREFRAME = 2,
-    D3D12_FILL_MODE_SOLID = 3,
-}}
-pub type D3D12_PRIMITIVE_TOPOLOGY = ::D3D_PRIMITIVE_TOPOLOGY;
-pub type D3D12_PRIMITIVE = ::D3D_PRIMITIVE;
-ENUM!{enum D3D12_CULL_MODE {
-    D3D12_CULL_MODE_NONE = 1,
-    D3D12_CULL_MODE_FRONT = 2,
-    D3D12_CULL_MODE_BACK = 3,
-}}
-STRUCT!{struct D3D12_SO_DECLARATION_ENTRY {
-    Stream: ::UINT,
-    SemanticName: ::LPCSTR,
-    SemanticIndex: ::UINT,
-    StartComponent: ::BYTE,
-    ComponentCount: ::BYTE,
-    OutputSlot: ::BYTE,
-}}
-STRUCT!{struct D3D12_VIEWPORT {
-    TopLeftX: ::FLOAT,
-    TopLeftY: ::FLOAT,
-    Width: ::FLOAT,
-    Height: ::FLOAT,
-    MinDepth: ::FLOAT,
-    MaxDepth: ::FLOAT,
-}}
-pub type D3D12_RECT = ::RECT;
-STRUCT!{struct D3D12_BOX {
-    left: ::UINT,
-    top: ::UINT,
-    front: ::UINT,
-    right: ::UINT,
-    bottom: ::UINT,
-    back: ::UINT,
-}}
-ENUM!{enum D3D12_COMPARISON_FUNC {
-    D3D12_COMPARISON_FUNC_NEVER = 1,
-    D3D12_COMPARISON_FUNC_LESS = 2,
-    D3D12_COMPARISON_FUNC_EQUAL = 3,
-    D3D12_COMPARISON_FUNC_LESS_EQUAL = 4,
-    D3D12_COMPARISON_FUNC_GREATER = 5,
-    D3D12_COMPARISON_FUNC_NOT_EQUAL = 6,
-    D3D12_COMPARISON_FUNC_GREATER_EQUAL = 7,
-    D3D12_COMPARISON_FUNC_ALWAYS = 8,
-}}
-ENUM!{enum D3D12_DEPTH_WRITE_MASK {
-    D3D12_DEPTH_WRITE_MASK_ZERO = 0,
-    D3D12_DEPTH_WRITE_MASK_ALL = 1,
-}}
-ENUM!{enum D3D12_STENCIL_OP {
-    D3D12_STENCIL_OP_KEEP = 1,
-    D3D12_STENCIL_OP_ZERO = 2,
-    D3D12_STENCIL_OP_REPLACE = 3,
-    D3D12_STENCIL_OP_INCR_SAT = 4,
-    D3D12_STENCIL_OP_DECR_SAT = 5,
-    D3D12_STENCIL_OP_INVERT = 6,
-    D3D12_STENCIL_OP_INCR = 7,
-    D3D12_STENCIL_OP_DECR = 8,
-}}
-STRUCT!{struct D3D12_DEPTH_STENCILOP_DESC {
-    StencilFailOp: D3D12_STENCIL_OP,
-    StencilDepthFailOp: D3D12_STENCIL_OP,
-    StencilPassOp: D3D12_STENCIL_OP,
-    StencilFunc: D3D12_COMPARISON_FUNC,
-}}
-STRUCT!{struct D3D12_DEPTH_STENCIL_DESC {
-    DepthEnable: ::BOOL,
-    DepthWriteMask: D3D12_DEPTH_WRITE_MASK,
-    DepthFunc: D3D12_COMPARISON_FUNC,
-    StencilEnable: ::BOOL,
-    StencilReadMask: ::UINT8,
-    StencilWriteMask: ::UINT8,
-    FrontFace: D3D12_DEPTH_STENCILOP_DESC,
-    BackFace: D3D12_DEPTH_STENCILOP_DESC,
-}}
-ENUM!{enum D3D12_BLEND {
-    D3D12_BLEND_ZERO = 1,
-    D3D12_BLEND_ONE = 2,
-    D3D12_BLEND_SRC_COLOR = 3,
-    D3D12_BLEND_INV_SRC_COLOR = 4,
-    D3D12_BLEND_SRC_ALPHA = 5,
-    D3D12_BLEND_INV_SRC_ALPHA = 6,
-    D3D12_BLEND_DEST_ALPHA = 7,
-    D3D12_BLEND_INV_DEST_ALPHA = 8,
-    D3D12_BLEND_DEST_COLOR = 9,
-    D3D12_BLEND_INV_DEST_COLOR = 10,
-    D3D12_BLEND_SRC_ALPHA_SAT = 11,
-    D3D12_BLEND_BLEND_FACTOR = 14,
-    D3D12_BLEND_INV_BLEND_FACTOR = 15,
-    D3D12_BLEND_SRC1_COLOR = 16,
-    D3D12_BLEND_INV_SRC1_COLOR = 17,
-    D3D12_BLEND_SRC1_ALPHA = 18,
-    D3D12_BLEND_INV_SRC1_ALPHA = 19,
-}}
-ENUM!{enum D3D12_BLEND_OP {
-    D3D12_BLEND_OP_ADD = 1,
-    D3D12_BLEND_OP_SUBTRACT = 2,
-    D3D12_BLEND_OP_REV_SUBTRACT = 3,
-    D3D12_BLEND_OP_MIN = 4,
-    D3D12_BLEND_OP_MAX = 5,
-}}
-FLAGS!{enum D3D12_COLOR_WRITE_ENABLE {
-    D3D12_COLOR_WRITE_ENABLE_RED = 0x1,
-    D3D12_COLOR_WRITE_ENABLE_GREEN = 0x2,
-    D3D12_COLOR_WRITE_ENABLE_BLUE = 0x4,
-    D3D12_COLOR_WRITE_ENABLE_ALPHA = 0x8,
-    D3D12_COLOR_WRITE_ENABLE_ALL = 0xF,
-}}
-ENUM!{enum D3D12_LOGIC_OP {
-    D3D12_LOGIC_OP_CLEAR = 0,
-    D3D12_LOGIC_OP_SET = 1,
-    D3D12_LOGIC_OP_COPY = 2,
-    D3D12_LOGIC_OP_COPY_INVERTED = 3,
-    D3D12_LOGIC_OP_NOOP = 4,
-    D3D12_LOGIC_OP_INVERT = 5,
-    D3D12_LOGIC_OP_AND = 6,
-    D3D12_LOGIC_OP_NAND = 7,
-    D3D12_LOGIC_OP_OR = 8,
-    D3D12_LOGIC_OP_NOR = 9,
-    D3D12_LOGIC_OP_XOR = 10,
-    D3D12_LOGIC_OP_EQUIV = 11,
-    D3D12_LOGIC_OP_AND_REVERSE = 12,
-    D3D12_LOGIC_OP_AND_INVERTED = 13,
-    D3D12_LOGIC_OP_OR_REVERSE = 14,
-    D3D12_LOGIC_OP_OR_INVERTED = 15,
-}}
-STRUCT!{struct D3D12_RENDER_TARGET_BLEND_DESC {
-    BlendEnable: ::BOOL,
-    LogicOpEnable: ::BOOL,
-    SrcBlend: D3D12_BLEND,
-    DestBlend: D3D12_BLEND,
-    BlendOp: D3D12_BLEND_OP,
-    SrcBlendAlpha: D3D12_BLEND,
-    DestBlendAlpha: D3D12_BLEND,
-    BlendOpAlpha: D3D12_BLEND_OP,
-    LogicOp: D3D12_LOGIC_OP,
-    RenderTargetWriteMask: ::UINT8,
-}}
-STRUCT!{struct D3D12_BLEND_DESC {
-    AlphaToCoverageEnable: ::BOOL,
-    IndependentBlendEnable: ::BOOL,
-    RenderTarget: [D3D12_RENDER_TARGET_BLEND_DESC; 8],
-}}
-ENUM!{enum D3D12_CONSERVATIVE_RASTERIZATION_MODE {
-    D3D12_CONSERVATIVE_RASTERIZATION_MODE_OFF = 0,
-    D3D12_CONSERVATIVE_RASTERIZATION_MODE_ON = 1,
-}}
-STRUCT!{struct D3D12_RASTERIZER_DESC {
-    FillMode: D3D12_FILL_MODE,
-    CullMode: D3D12_CULL_MODE,
-    FrontCounterClockwise: ::BOOL,
-    DepthBias: ::INT,
-    DepthBiasClamp: ::FLOAT,
-    SlopeScaledDepthBias: ::FLOAT,
-    DepthClipEnable: ::BOOL,
-    MultisampleEnable: ::BOOL,
-    AntialiasedLineEnable: ::BOOL,
-    ForcedSampleCount: ::UINT,
-    ConservativeRaster: D3D12_CONSERVATIVE_RASTERIZATION_MODE,
-}}
-RIDL!{interface ID3D12Object(ID3D12ObjectVtbl): IUnknown(IUnknownVtbl) {
-    fn GetPrivateData(
-        &mut self, guid: ::REFGUID, pDataSize: *mut ::UINT, pData: *mut ::c_void
-    ) -> ::HRESULT,
-    fn SetPrivateData(
-        &mut self, guid: ::REFGUID, DataSize: ::UINT, pData: *const ::c_void
-    ) -> ::HRESULT,
-    fn SetPrivateDataInterface(
-        &mut self, guid: ::REFGUID, pData: *const ::IUnknown
-    ) -> ::HRESULT,
-    fn SetName(&mut self, Name: ::LPCWSTR) -> ::HRESULT
-}}
-RIDL!{interface ID3D12DeviceChild(ID3D12DeviceChildVtbl): ID3D12Object(ID3D12ObjectVtbl) {
-    fn GetDevice(
-        &mut self, riid: ::REFGUID, ppvDevice: *mut *mut ::c_void
-    ) -> ::HRESULT
-}}
-RIDL!{interface ID3D12RootSignature(ID3D12RootSignatureVtbl):
-    ID3D12DeviceChild(ID3D12DeviceChildVtbl) {
-}}
-STRUCT!{struct D3D12_SHADER_BYTECODE {
-    pShaderBytecode: *const ::c_void,
-    BytecodeLength: ::SIZE_T,
-}}
-STRUCT!{struct D3D12_STREAM_OUTPUT_DESC {
-    pSODeclaration: *const D3D12_SO_DECLARATION_ENTRY,
-    NumEntries: ::UINT,
-    pBufferStrides: *const ::UINT,
-    NumStrides: ::UINT,
-    RasterizedStream: ::UINT,
-}}
-STRUCT!{struct D3D12_INPUT_LAYOUT_DESC {
-    pInputElementDescs: *const D3D12_INPUT_ELEMENT_DESC,
-    NumElements: ::UINT,
-}}
-ENUM!{enum D3D12_INDEX_BUFFER_STRIP_CUT_VALUE {
-    D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED = 0,
-    D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF = 1,
-    D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF = 2,
-}}
-STRUCT!{struct D3D12_CACHED_PIPELINE_STATE {
-    pCachedBlob: *const ::c_void,
-    CachedBlobSizeInBytes: ::SIZE_T,
-}}
-FLAGS!{enum D3D12_PIPELINE_STATE_FLAGS {
-    D3D12_PIPELINE_STATE_FLAG_NONE = 0x0,
-    D3D12_PIPELINE_STATE_FLAG_TOOL_DEBUG = 0x1,
-}}
-STRUCT!{struct D3D12_GRAPHICS_PIPELINE_STATE_DESC {
-    pRootSignature: *mut ID3D12RootSignature,
-    VS: D3D12_SHADER_BYTECODE,
-    PS: D3D12_SHADER_BYTECODE,
-    DS: D3D12_SHADER_BYTECODE,
-    HS: D3D12_SHADER_BYTECODE,
-    GS: D3D12_SHADER_BYTECODE,
-    StreamOutput: D3D12_STREAM_OUTPUT_DESC,
-    BlendState: D3D12_BLEND_DESC,
-    SampleMask: ::UINT,
-    RasterizerState: D3D12_RASTERIZER_DESC,
-    DepthStencilState: D3D12_DEPTH_STENCIL_DESC,
-    InputLayout: D3D12_INPUT_LAYOUT_DESC,
-    IBStripCutValue: D3D12_INDEX_BUFFER_STRIP_CUT_VALUE,
-    PrimitiveTopologyType: D3D12_PRIMITIVE_TOPOLOGY_TYPE,
-    NumRenderTargets: ::UINT,
-    RTVFormats: [::DXGI_FORMAT; 8],
-    DSVFormat: ::DXGI_FORMAT,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-    NodeMask: ::UINT,
-    CachedPSO: D3D12_CACHED_PIPELINE_STATE,
-    Flags: D3D12_PIPELINE_STATE_FLAGS,
-}}
-STRUCT!{struct D3D12_COMPUTE_PIPELINE_STATE_DESC {
-    pRootSignature: *mut ID3D12RootSignature,
-    CS: D3D12_SHADER_BYTECODE,
-    NodeMask: ::UINT,
-    CachedPSO: D3D12_CACHED_PIPELINE_STATE,
-    Flags: D3D12_PIPELINE_STATE_FLAGS,
-}}
-ENUM!{enum D3D12_FEATURE {
-    D3D12_FEATURE_D3D12_OPTIONS = 0,
-    D3D12_FEATURE_ARCHITECTURE = 1,
-    D3D12_FEATURE_FEATURE_LEVELS = 2,
-    D3D12_FEATURE_FORMAT_SUPPORT = 3,
-    D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS = 4,
-    D3D12_FEATURE_FORMAT_INFO = 5,
-    D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 6,
-}}
-FLAGS!{enum D3D12_SHADER_MIN_PRECISION_SUPPORT {
-    D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0,
-    D3D12_SHADER_MIN_PRECISION_SUPPORT_10_BIT = 0x1,
-    D3D12_SHADER_MIN_PRECISION_SUPPORT_16_BIT = 0x2,
-}}
-ENUM!{enum D3D12_TILED_RESOURCES_TIER {
-    D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED = 0,
-    D3D12_TILED_RESOURCES_TIER_1 = 1,
-    D3D12_TILED_RESOURCES_TIER_2 = 2,
-    D3D12_TILED_RESOURCES_TIER_3 = 3,
-}}
-ENUM!{enum D3D12_RESOURCE_BINDING_TIER {
-    D3D12_RESOURCE_BINDING_TIER_1 = 1,
-    D3D12_RESOURCE_BINDING_TIER_2 = 2,
-    D3D12_RESOURCE_BINDING_TIER_3 = 3,
-}}
-ENUM!{enum D3D12_CONSERVATIVE_RASTERIZATION_TIER {
-    D3D12_CONSERVATIVE_RASTERIZATION_TIER_NOT_SUPPORTED = 0,
-    D3D12_CONSERVATIVE_RASTERIZATION_TIER_1 = 1,
-    D3D12_CONSERVATIVE_RASTERIZATION_TIER_2 = 2,
-    D3D12_CONSERVATIVE_RASTERIZATION_TIER_3 = 3,
-}}
-FLAGS!{enum D3D12_FORMAT_SUPPORT1 {
-    D3D12_FORMAT_SUPPORT1_NONE = 0x0,
-    D3D12_FORMAT_SUPPORT1_BUFFER = 0x1,
-    D3D12_FORMAT_SUPPORT1_IA_VERTEX_BUFFER = 0x2,
-    D3D12_FORMAT_SUPPORT1_IA_INDEX_BUFFER = 0x4,
-    D3D12_FORMAT_SUPPORT1_SO_BUFFER = 0x8,
-    D3D12_FORMAT_SUPPORT1_TEXTURE1D = 0x10,
-    D3D12_FORMAT_SUPPORT1_TEXTURE2D = 0x20,
-    D3D12_FORMAT_SUPPORT1_TEXTURE3D = 0x40,
-    D3D12_FORMAT_SUPPORT1_TEXTURECUBE = 0x80,
-    D3D12_FORMAT_SUPPORT1_SHADER_LOAD = 0x100,
-    D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE = 0x200,
-    D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE_COMPARISON = 0x400,
-    D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE_MONO_TEXT = 0x800,
-    D3D12_FORMAT_SUPPORT1_MIP = 0x1000,
-    D3D12_FORMAT_SUPPORT1_RENDER_TARGET = 0x4000,
-    D3D12_FORMAT_SUPPORT1_BLENDABLE = 0x8000,
-    D3D12_FORMAT_SUPPORT1_DEPTH_STENCIL = 0x10000,
-    D3D12_FORMAT_SUPPORT1_MULTISAMPLE_RESOLVE = 0x40000,
-    D3D12_FORMAT_SUPPORT1_DISPLAY = 0x80000,
-    D3D12_FORMAT_SUPPORT1_CAST_WITHIN_BIT_LAYOUT = 0x100000,
-    D3D12_FORMAT_SUPPORT1_MULTISAMPLE_RENDERTARGET = 0x200000,
-    D3D12_FORMAT_SUPPORT1_MULTISAMPLE_LOAD = 0x400000,
-    D3D12_FORMAT_SUPPORT1_SHADER_GATHER = 0x800000,
-    D3D12_FORMAT_SUPPORT1_BACK_BUFFER_CAST = 0x1000000,
-    D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW = 0x2000000,
-    D3D12_FORMAT_SUPPORT1_SHADER_GATHER_COMPARISON = 0x4000000,
-    D3D12_FORMAT_SUPPORT1_DECODER_OUTPUT = 0x8000000,
-    D3D12_FORMAT_SUPPORT1_VIDEO_PROCESSOR_OUTPUT = 0x10000000,
-    D3D12_FORMAT_SUPPORT1_VIDEO_PROCESSOR_INPUT = 0x20000000,
-    D3D12_FORMAT_SUPPORT1_VIDEO_ENCODER = 0x40000000,
-}}
-FLAGS!{enum D3D12_FORMAT_SUPPORT2 {
-    D3D12_FORMAT_SUPPORT2_NONE = 0x0,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_ADD = 0x1,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS = 0x2,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE = 0x4,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE = 0x8,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX = 0x10,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX = 0x20,
-    D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD = 0x40,
-    D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE = 0x80,
-    D3D12_FORMAT_SUPPORT2_OUTPUT_MERGER_LOGIC_OP = 0x100,
-    D3D12_FORMAT_SUPPORT2_TILED = 0x200,
-    D3D12_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x4000,
-}}
-FLAGS!{enum D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS {
-    D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_NONE = 0x0,
-    D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE = 0x1,
-}}
-ENUM!{enum D3D12_CROSS_NODE_SHARING_TIER {
-    D3D12_CROSS_NODE_SHARING_TIER_NOT_SUPPORTED = 0,
-    D3D12_CROSS_NODE_SHARING_TIER_1_EMULATED = 1,
-    D3D12_CROSS_NODE_SHARING_TIER_1 = 2,
-    D3D12_CROSS_NODE_SHARING_TIER_2 = 3,
-}}
-ENUM!{enum D3D12_RESOURCE_HEAP_TIER {
-    D3D12_RESOURCE_HEAP_TIER_1 = 1,
-    D3D12_RESOURCE_HEAP_TIER_2 = 2,
-}}
-STRUCT!{struct D3D12_FEATURE_DATA_D3D12_OPTIONS {
-    DoublePrecisionFloatShaderOps: ::BOOL,
-    OutputMergerLogicOp: ::BOOL,
-    MinPrecisionSupport: D3D12_SHADER_MIN_PRECISION_SUPPORT,
-    TiledResourcesTier: D3D12_TILED_RESOURCES_TIER,
-    ResourceBindingTier: D3D12_RESOURCE_BINDING_TIER,
-    PSSpecifiedStencilRefSupported: ::BOOL,
-    TypedUAVLoadAdditionalFormats: ::BOOL,
-    ROVsSupported: ::BOOL,
-    ConservativeRasterizationTier: D3D12_CONSERVATIVE_RASTERIZATION_TIER,
-    MaxGPUVirtualAddressBitsPerResource: ::UINT,
-    StandardSwizzle64KBSupported: ::BOOL,
-    CrossNodeSharingTier: D3D12_CROSS_NODE_SHARING_TIER,
-    CrossAdapterRowMajorTextureSupported: ::BOOL,
-    VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation: ::BOOL,
-    ResourceHeapTier: D3D12_RESOURCE_HEAP_TIER,
-}}
-
-
-
-
-
-
-
-
-
-FLAGS!{ enum D3D12_BUFFER_SRV_FLAGS {
-    D3D12_BUFFER_SRV_FLAG_NONE = 0x0,
-    D3D12_BUFFER_SRV_FLAG_RAW = 0x1,
-}}
-
-FLAGS!{ enum D3D12_BUFFER_UAV_FLAGS {
-    D3D12_BUFFER_UAV_FLAG_NONE = 0x0,
-    D3D12_BUFFER_UAV_FLAG_RAW = 0x1,
-}}
-
-FLAGS!{ enum D3D12_CLEAR_FLAGS {
-    D3D12_CLEAR_FLAG_DEPTH = 0x1,
-    D3D12_CLEAR_FLAG_STENCIL = 0x2,
-}}
-
-
-ENUM!{ enum D3D12_CPU_PAGE_PROPERTY {
-    D3D12_CPU_PAGE_PROPERTY_UNKNOWN = 0,
-    D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE = 1,
-    D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE = 2,
-    D3D12_CPU_PAGE_PROPERTY_WRITE_BACK = 3,
-}}
-
-
-FLAGS!{ enum D3D12_DESCRIPTOR_HEAP_FLAGS {
-    D3D12_DESCRIPTOR_HEAP_FLAG_NONE = 0x0,
-    D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE = 0x1,
-}}
-
-ENUM!{ enum D3D12_DESCRIPTOR_HEAP_TYPE {
-    D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV = 0,
-    D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER = 1,
-    D3D12_DESCRIPTOR_HEAP_TYPE_RTV = 2,
-    D3D12_DESCRIPTOR_HEAP_TYPE_DSV = 3,
-    D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES = 4,
-}}
-
-ENUM!{ enum D3D12_DESCRIPTOR_RANGE_TYPE {
-    D3D12_DESCRIPTOR_RANGE_TYPE_SRV = 0,
-    D3D12_DESCRIPTOR_RANGE_TYPE_UAV = 1,
-    D3D12_DESCRIPTOR_RANGE_TYPE_CBV = 2,
-    D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER = 3,
-}}
-
-ENUM!{ enum D3D12_DSV_DIMENSION {
-    D3D12_DSV_DIMENSION_UNKNOWN = 0,
-    D3D12_DSV_DIMENSION_TEXTURE1D = 1,
-    D3D12_DSV_DIMENSION_TEXTURE1DARRAY = 2,
-    D3D12_DSV_DIMENSION_TEXTURE2D = 3,
-    D3D12_DSV_DIMENSION_TEXTURE2DARRAY = 4,
-    D3D12_DSV_DIMENSION_TEXTURE2DMS = 5,
-    D3D12_DSV_DIMENSION_TEXTURE2DMSARRAY = 6,
-}}
-
-FLAGS!{ enum D3D12_DSV_FLAGS {
-    D3D12_DSV_FLAG_NONE = 0x0,
-    D3D12_DSV_FLAG_READ_ONLY_DEPTH = 0x1,
-    D3D12_DSV_FLAG_READ_ONLY_STENCIL = 0x2,
-}}
-
-
-
-FLAGS!{ enum D3D12_FENCE_FLAGS {
-    D3D12_FENCE_FLAG_NONE = 0x0,
-    D3D12_FENCE_FLAG_SHARED = 0x1,
-    D3D12_FENCE_FLAG_SHARED_CROSS_ADAPTER = 0x2,
-}}
-
-
-
-ENUM!{ enum D3D12_FILTER {
-    D3D12_FILTER_MIN_MAG_MIP_POINT = 0,
-    D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR = 1,
-    D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 4,
-    D3D12_FILTER_MIN_POINT_MAG_MIP_LINEAR = 5,
-    D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT = 16,
-    D3D12_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 17,
-    D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT = 20,
-    D3D12_FILTER_MIN_MAG_MIP_LINEAR = 21,
-    D3D12_FILTER_ANISOTROPIC = 85,
-    D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 128,
-    D3D12_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 129,
-    D3D12_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 132,
-    D3D12_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 133,
-    D3D12_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 144,
-    D3D12_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 145,
-    D3D12_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 148,
-    D3D12_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 149,
-    D3D12_FILTER_COMPARISON_ANISOTROPIC = 213,
-    D3D12_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 256,
-    D3D12_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 257,
-    D3D12_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 260,
-    D3D12_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 261,
-    D3D12_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 272,
-    D3D12_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 273,
-    D3D12_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 276,
-    D3D12_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 277,
-    D3D12_FILTER_MINIMUM_ANISOTROPIC = 341,
-    D3D12_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 384,
-    D3D12_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 385,
-    D3D12_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 388,
-    D3D12_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 389,
-    D3D12_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 400,
-    D3D12_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 401,
-    D3D12_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 404,
-    D3D12_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 405,
-    D3D12_FILTER_MAXIMUM_ANISOTROPIC = 469,
-}}
-
-ENUM!{ enum D3D12_FILTER_REDUCTION_TYPE {
-    D3D12_FILTER_REDUCTION_TYPE_STANDARD = 0,
-    D3D12_FILTER_REDUCTION_TYPE_COMPARISON = 1,
-    D3D12_FILTER_REDUCTION_TYPE_MINIMUM = 2,
-    D3D12_FILTER_REDUCTION_TYPE_MAXIMUM = 3,
-}}
-
-ENUM!{ enum D3D12_FILTER_TYPE {
-    D3D12_FILTER_TYPE_POINT = 0,
-    D3D12_FILTER_TYPE_LINEAR = 1,
-}}
-
-
-
-FLAGS!{ enum D3D12_HEAP_FLAGS {
-    D3D12_HEAP_FLAG_NONE = 0x0,
-    D3D12_HEAP_FLAG_SHARED = 0x1,
-    D3D12_HEAP_FLAG_DENY_BUFFERS = 0x4,
-    D3D12_HEAP_FLAG_ALLOW_DISPLAY = 0x8,
-    D3D12_HEAP_FLAG_SHARED_CROSS_ADAPTER = 0x20,
-    D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES = 0x40,
-    D3D12_HEAP_FLAG_DENY_NON_RT_DS_TEXTURES = 0x80,
-    D3D12_HEAP_FLAG_ALLOW_ALL_BUFFERS_AND_TEXTURES = 0x0,
-    D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS = 0xC0,
-    D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES = 0x44,
-    D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES = 0x84,
-}}
-
-ENUM!{ enum D3D12_HEAP_TYPE {
-    D3D12_HEAP_TYPE_DEFAULT = 1,
-    D3D12_HEAP_TYPE_UPLOAD = 2,
-    D3D12_HEAP_TYPE_READBACK = 3,
-    D3D12_HEAP_TYPE_CUSTOM = 4,
-}}
-
-
-
-ENUM!{ enum D3D12_INDIRECT_ARGUMENT_TYPE {
-    D3D12_INDIRECT_ARGUMENT_TYPE_DRAW = 0,
-    D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED = 1,
-    D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH = 2,
-    D3D12_INDIRECT_ARGUMENT_TYPE_VERTEX_BUFFER_VIEW = 3,
-    D3D12_INDIRECT_ARGUMENT_TYPE_INDEX_BUFFER_VIEW = 4,
-    D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT = 5,
-    D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT_BUFFER_VIEW = 6,
-    D3D12_INDIRECT_ARGUMENT_TYPE_SHADER_RESOURCE_VIEW = 7,
-    D3D12_INDIRECT_ARGUMENT_TYPE_UNORDERED_ACCESS_VIEW = 8,
-}}
-
-
-
-
-
-ENUM!{ enum D3D12_MEMORY_POOL {
-    D3D12_MEMORY_POOL_UNKNOWN = 0,
-    D3D12_MEMORY_POOL_L0 = 1,
-    D3D12_MEMORY_POOL_L1 = 2,
-}}
-
-
-
-
-ENUM!{ enum D3D12_PREDICATION_OP {
-    D3D12_PREDICATION_OP_EQUAL_ZERO = 0,
-    D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1,
-}}
-
-
-
-ENUM!{ enum D3D12_QUERY_HEAP_TYPE {
-    D3D12_QUERY_HEAP_TYPE_OCCLUSION = 0,
-    D3D12_QUERY_HEAP_TYPE_TIMESTAMP = 1,
-    D3D12_QUERY_HEAP_TYPE_PIPELINE_STATISTICS = 2,
-    D3D12_QUERY_HEAP_TYPE_SO_STATISTICS = 3,
-}}
-
-ENUM!{ enum D3D12_QUERY_TYPE {
-    D3D12_QUERY_TYPE_OCCLUSION = 0,
-    D3D12_QUERY_TYPE_BINARY_OCCLUSION = 1,
-    D3D12_QUERY_TYPE_TIMESTAMP = 2,
-    D3D12_QUERY_TYPE_PIPELINE_STATISTICS = 3,
-    D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 = 4,
-    D3D12_QUERY_TYPE_SO_STATISTICS_STREAM1 = 5,
-    D3D12_QUERY_TYPE_SO_STATISTICS_STREAM2 = 6,
-    D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3 = 7,
-}}
-
-FLAGS!{ enum D3D12_RESOURCE_BARRIER_FLAGS {
-    D3D12_RESOURCE_BARRIER_FLAG_NONE = 0x0,
-    D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY = 0x1,
-    D3D12_RESOURCE_BARRIER_FLAG_END_ONLY = 0x2,
-}}
-
-ENUM!{ enum D3D12_RESOURCE_BARRIER_TYPE {
-    D3D12_RESOURCE_BARRIER_TYPE_TRANSITION = 0,
-    D3D12_RESOURCE_BARRIER_TYPE_ALIASING = 1,
-    D3D12_RESOURCE_BARRIER_TYPE_UAV = 2,
-}}
-
-
-ENUM!{ enum D3D12_RESOURCE_DIMENSION {
-    D3D12_RESOURCE_DIMENSION_UNKNOWN = 0,
-    D3D12_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D12_RESOURCE_DIMENSION_TEXTURE1D = 2,
-    D3D12_RESOURCE_DIMENSION_TEXTURE2D = 3,
-    D3D12_RESOURCE_DIMENSION_TEXTURE3D = 4,
-}}
-
-FLAGS!{ enum D3D12_RESOURCE_FLAGS {
-    D3D12_RESOURCE_FLAG_NONE = 0x0,
-    D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET = 0x1,
-    D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL = 0x2,
-    D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS = 0x4,
-    D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE = 0x8,
-    D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER = 0x10,
-    D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS = 0x20,
-}}
-
-
-FLAGS!{ enum D3D12_RESOURCE_STATES {
-    D3D12_RESOURCE_STATE_COMMON = 0x0,
-    D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER = 0x1,
-    D3D12_RESOURCE_STATE_INDEX_BUFFER = 0x2,
-    D3D12_RESOURCE_STATE_RENDER_TARGET = 0x4,
-    D3D12_RESOURCE_STATE_UNORDERED_ACCESS = 0x8,
-    D3D12_RESOURCE_STATE_DEPTH_WRITE = 0x10,
-    D3D12_RESOURCE_STATE_DEPTH_READ = 0x20,
-    D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE = 0x40,
-    D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE = 0x80,
-    D3D12_RESOURCE_STATE_STREAM_OUT = 0x100,
-    D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT = 0x200,
-    D3D12_RESOURCE_STATE_COPY_DEST = 0x400,
-    D3D12_RESOURCE_STATE_COPY_SOURCE = 0x800,
-    D3D12_RESOURCE_STATE_RESOLVE_DEST = 0x1000,
-    D3D12_RESOURCE_STATE_RESOLVE_SOURCE = 0x2000,
-    D3D12_RESOURCE_STATE_GENERIC_READ = 0xAC3,
-    D3D12_RESOURCE_STATE_PRESENT = 0x0,
-    D3D12_RESOURCE_STATE_PREDICATION = 0x200,
-}}
-
-ENUM!{ enum D3D12_ROOT_PARAMETER_TYPE {
-    D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE = 0,
-    D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS = 1,
-    D3D12_ROOT_PARAMETER_TYPE_CBV = 2,
-    D3D12_ROOT_PARAMETER_TYPE_SRV = 3,
-    D3D12_ROOT_PARAMETER_TYPE_UAV = 4,
-}}
-
-FLAGS!{ enum D3D12_ROOT_SIGNATURE_FLAGS {
-    D3D12_ROOT_SIGNATURE_FLAG_NONE = 0x0,
-    D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT = 0x1,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS = 0x2,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS = 0x4,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS = 0x8,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS = 0x10,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20,
-    D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40,
-}}
-
-ENUM!{ enum D3D12_RTV_DIMENSION {
-    D3D12_RTV_DIMENSION_UNKNOWN = 0,
-    D3D12_RTV_DIMENSION_BUFFER = 1,
-    D3D12_RTV_DIMENSION_TEXTURE1D = 2,
-    D3D12_RTV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D12_RTV_DIMENSION_TEXTURE2D = 4,
-    D3D12_RTV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D12_RTV_DIMENSION_TEXTURE2DMS = 6,
-    D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY = 7,
-    D3D12_RTV_DIMENSION_TEXTURE3D = 8,
-}}
-
-ENUM!{ enum D3D12_SHADER_COMPONENT_MAPPING {
-    D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0 = 0,
-    D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1 = 1,
-    D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2 = 2,
-    D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3 = 3,
-    D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0 = 4,
-    D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1 = 5,
-}}
-
-
-ENUM!{ enum D3D12_SHADER_VISIBILITY {
-    D3D12_SHADER_VISIBILITY_ALL = 0,
-    D3D12_SHADER_VISIBILITY_VERTEX = 1,
-    D3D12_SHADER_VISIBILITY_HULL = 2,
-    D3D12_SHADER_VISIBILITY_DOMAIN = 3,
-    D3D12_SHADER_VISIBILITY_GEOMETRY = 4,
-    D3D12_SHADER_VISIBILITY_PIXEL = 5,
-}}
-
-ENUM!{ enum D3D12_SRV_DIMENSION {
-    D3D12_SRV_DIMENSION_UNKNOWN = 0,
-    D3D12_SRV_DIMENSION_BUFFER = 1,
-    D3D12_SRV_DIMENSION_TEXTURE1D = 2,
-    D3D12_SRV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D12_SRV_DIMENSION_TEXTURE2D = 4,
-    D3D12_SRV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D12_SRV_DIMENSION_TEXTURE2DMS = 6,
-    D3D12_SRV_DIMENSION_TEXTURE2DMSARRAY = 7,
-    D3D12_SRV_DIMENSION_TEXTURE3D = 8,
-    D3D12_SRV_DIMENSION_TEXTURECUBE = 9,
-    D3D12_SRV_DIMENSION_TEXTURECUBEARRAY = 10,
-}}
-
-ENUM!{ enum D3D12_STATIC_BORDER_COLOR {
-    D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK = 0,
-    D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK = 1,
-    D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE = 2,
-}}
-
-
-
-ENUM!{ enum D3D12_TEXTURE_ADDRESS_MODE {
-    D3D12_TEXTURE_ADDRESS_MODE_WRAP = 1,
-    D3D12_TEXTURE_ADDRESS_MODE_MIRROR = 2,
-    D3D12_TEXTURE_ADDRESS_MODE_CLAMP = 3,
-    D3D12_TEXTURE_ADDRESS_MODE_BORDER = 4,
-    D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 5,
-}}
-
-ENUM!{ enum D3D12_TEXTURE_COPY_TYPE {
-    D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX = 0,
-    D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT = 1,
-}}
-
-ENUM!{ enum D3D12_TEXTURE_LAYOUT {
-    D3D12_TEXTURE_LAYOUT_UNKNOWN = 0,
-    D3D12_TEXTURE_LAYOUT_ROW_MAJOR = 1,
-    D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE = 2,
-    D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE = 3,
-}}
-
-
-FLAGS!{ enum D3D12_TILE_COPY_FLAGS {
-    D3D12_TILE_COPY_FLAG_NONE = 0x0,
-    D3D12_TILE_COPY_FLAG_NO_HAZARD = 0x1,
-    D3D12_TILE_COPY_FLAG_LINEAR_BUFFER_TO_SWIZZLED_TILED_RESOURCE = 0x2,
-    D3D12_TILE_COPY_FLAG_SWIZZLED_TILED_RESOURCE_TO_LINEAR_BUFFER = 0x4,
-}}
-
-FLAGS!{ enum D3D12_TILE_MAPPING_FLAGS {
-    D3D12_TILE_MAPPING_FLAG_NONE = 0x0,
-    D3D12_TILE_MAPPING_FLAG_NO_HAZARD = 0x1,
-}}
-
-FLAGS!{ enum D3D12_TILE_RANGE_FLAGS {
-    D3D12_TILE_RANGE_FLAG_NONE = 0x0,
-    D3D12_TILE_RANGE_FLAG_NULL = 0x1,
-    D3D12_TILE_RANGE_FLAG_SKIP = 0x2,
-    D3D12_TILE_RANGE_FLAG_REUSE_SINGLE_TILE = 0x4,
-}}
-
-ENUM!{ enum D3D12_UAV_DIMENSION {
-    D3D12_UAV_DIMENSION_UNKNOWN = 0,
-    D3D12_UAV_DIMENSION_BUFFER = 1,
-    D3D12_UAV_DIMENSION_TEXTURE1D = 2,
-    D3D12_UAV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D12_UAV_DIMENSION_TEXTURE2D = 4,
-    D3D12_UAV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D12_UAV_DIMENSION_TEXTURE3D = 8,
-}}
-
-ENUM!{ enum D3D_ROOT_SIGNATURE_VERSION {
-    D3D_ROOT_SIGNATURE_VERSION_1 = 1,
-}}
-
-
-
-
-
-STRUCT!{struct D3D12_BUFFER_RTV {
-    FirstElement: ::UINT64,
-    NumElements: ::UINT,
-}}
-
-STRUCT!{struct D3D12_BUFFER_SRV {
-    FirstElement: ::UINT64,
-    NumElements: ::UINT,
-    StructureByteStride: ::UINT,
-    Flags: ::D3D12_BUFFER_SRV_FLAGS,
-}}
-
-STRUCT!{struct D3D12_BUFFER_UAV {
-    FirstElement: ::UINT64,
-    NumElements: ::UINT,
-    StructureByteStride: ::UINT,
-    CounterOffsetInBytes: ::UINT64,
-    Flags: ::D3D12_BUFFER_UAV_FLAGS,
-}}
-
-
-
-STRUCT!{struct D3D12_CLEAR_VALUE {
-    Format: ::DXGI_FORMAT,
-    u: [::FLOAT; 4],
-}}
-
-UNION!(D3D12_CLEAR_VALUE, u, DepthStencil, DepthStencil_mut, ::D3D12_DEPTH_STENCIL_VALUE);
-UNION!(D3D12_CLEAR_VALUE, u, Color, Color_mut, [::FLOAT; 4]);
-
-
-
-STRUCT!{struct D3D12_COMMAND_SIGNATURE_DESC {
-    ByteStride: ::UINT,
-    NumArgumentDescs: ::UINT,
-    pArgumentDescs: *const ::D3D12_INDIRECT_ARGUMENT_DESC,
-    NodeMask: ::UINT,
-}}
-
-
-
-STRUCT!{struct D3D12_CONSTANT_BUFFER_VIEW_DESC {
-    BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-    SizeInBytes: ::UINT,
-}}
-
-STRUCT!{struct D3D12_CPU_DESCRIPTOR_HANDLE {
-    ptr: ::SIZE_T,
-}}
-
-
-
-STRUCT!{struct D3D12_DEPTH_STENCIL_VALUE {
-    Depth: ::FLOAT,
-    Stencil: ::UINT8,
-}}
-
-STRUCT!{struct D3D12_DEPTH_STENCIL_VIEW_DESC {
-    Format: ::DXGI_FORMAT,
-    ViewDimension: ::D3D12_DSV_DIMENSION,
-    Flags: ::D3D12_DSV_FLAGS,
-    u: ::D3D12_TEX1D_ARRAY_DSV,
-}}
-
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    ::D3D12_TEX2DMS_ARRAY_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, ::D3D12_TEX2DMS_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    ::D3D12_TEX2D_ARRAY_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture2D, Texture2D_mut, ::D3D12_TEX2D_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    ::D3D12_TEX1D_ARRAY_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture1D, Texture1D_mut, ::D3D12_TEX1D_DSV);
-
-STRUCT!{struct D3D12_DESCRIPTOR_HEAP_DESC {
-    Type: ::D3D12_DESCRIPTOR_HEAP_TYPE,
-    NumDescriptors: ::UINT,
-    Flags: ::D3D12_DESCRIPTOR_HEAP_FLAGS,
-    NodeMask: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DESCRIPTOR_RANGE {
-    RangeType: ::D3D12_DESCRIPTOR_RANGE_TYPE,
-    NumDescriptors: ::UINT,
-    BaseShaderRegister: ::UINT,
-    RegisterSpace: ::UINT,
-    OffsetInDescriptorsFromTableStart: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DISCARD_REGION {
-    NumRects: ::UINT,
-    pRects: *const ::D3D12_RECT,
-    FirstSubresource: ::UINT,
-    NumSubresources: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DISPATCH_ARGUMENTS {
-    ThreadGroupCountX: ::UINT,
-    ThreadGroupCountY: ::UINT,
-    ThreadGroupCountZ: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DRAW_ARGUMENTS {
-    VertexCountPerInstance: ::UINT,
-    InstanceCount: ::UINT,
-    StartVertexLocation: ::UINT,
-    StartInstanceLocation: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DRAW_INDEXED_ARGUMENTS {
-    IndexCountPerInstance: ::UINT,
-    InstanceCount: ::UINT,
-    StartIndexLocation: ::UINT,
-    BaseVertexLocation: ::INT,
-    StartInstanceLocation: ::UINT,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_ARCHITECTURE {
-    NodeIndex: ::UINT,
-    TileBasedRenderer: ::BOOL,
-    UMA: ::BOOL,
-    CacheCoherentUMA: ::BOOL,
-}}
-
-
-STRUCT!{struct D3D12_FEATURE_DATA_FEATURE_LEVELS {
-    NumFeatureLevels: ::UINT,
-    pFeatureLevelsRequested: *const ::D3D_FEATURE_LEVEL,
-    MaxSupportedFeatureLevel: ::D3D_FEATURE_LEVEL,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_FORMAT_INFO {
-    Format: ::DXGI_FORMAT,
-    PlaneCount: ::UINT8,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_FORMAT_SUPPORT {
-    Format: ::DXGI_FORMAT,
-    Support1: ::D3D12_FORMAT_SUPPORT1,
-    Support2: ::D3D12_FORMAT_SUPPORT2,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT {
-    MaxGPUVirtualAddressBitsPerResource: ::UINT,
-    MaxGPUVirtualAddressBitsPerProcess: ::UINT,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS {
-    Format: ::DXGI_FORMAT,
-    SampleCount: ::UINT,
-    Flags: ::D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS,
-    NumQualityLevels: ::UINT,
-}}
-
-STRUCT!{struct D3D12_GPU_DESCRIPTOR_HANDLE {
-    ptr: ::UINT64,
-}}
-
-
-
-STRUCT!{struct D3D12_HEAP_DESC {
-    SizeInBytes: ::UINT64,
-    Properties: ::D3D12_HEAP_PROPERTIES,
-    Alignment: ::UINT64,
-    Flags: ::D3D12_HEAP_FLAGS,
-}}
-
-STRUCT!{struct D3D12_HEAP_PROPERTIES {
-    Type: ::D3D12_HEAP_TYPE,
-    CPUPageProperty: ::D3D12_CPU_PAGE_PROPERTY,
-    MemoryPoolPreference: ::D3D12_MEMORY_POOL,
-    CreationNodeMask: ::UINT,
-    VisibleNodeMask: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDEX_BUFFER_VIEW {
-    BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-    SizeInBytes: ::UINT,
-    Format: ::DXGI_FORMAT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_VertexBuffer {
-    Slot: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_Constant {
-    RootParameterIndex: ::UINT,
-    DestOffsetIn32BitValues: ::UINT,
-    Num32BitValuesToSet: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_ConstantBufferView {
-    RootParameterIndex: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_ShaderResourceView {
-    RootParameterIndex: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_UnorderedAccessView {
-    RootParameterIndex: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC {
-    Type: ::D3D12_INDIRECT_ARGUMENT_TYPE,
-    u: ::D3D12_INDIRECT_ARGUMENT_DESC_Constant,
-}}
-
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, UnorderedAccessView, UnorderedAccessView_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_UnorderedAccessView);
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, ShaderResourceView, ShaderResourceView_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_ShaderResourceView);
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, ConstantBufferView, ConstantBufferView_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_ConstantBufferView);
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, Constant, Constant_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_Constant);
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, VertexBuffer, VertexBuffer_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_VertexBuffer);
-
-
-
-
-STRUCT!{struct D3D12_MEMCPY_DEST {
-    pData: *mut ::c_void,
-    RowPitch: ::SIZE_T,
-    SlicePitch: ::SIZE_T,
-}}
-
-STRUCT!{struct D3D12_PACKED_MIP_INFO {
-    NumStandardMips: ::UINT8,
-    NumPackedMips: ::UINT8,
-    NumTilesForPackedMips: ::UINT,
-    StartTileIndexInOverallResource: ::UINT,
-}}
-
-STRUCT!{struct D3D12_PLACED_SUBRESOURCE_FOOTPRINT {
-    Offset: ::UINT64,
-    Footprint: ::D3D12_SUBRESOURCE_FOOTPRINT,
-}}
-
-STRUCT!{struct D3D12_QUERY_DATA_PIPELINE_STATISTICS {
-    IAVertices: ::UINT64,
-    IAPrimitives: ::UINT64,
-    VSInvocations: ::UINT64,
-    GSInvocations: ::UINT64,
-    GSPrimitives: ::UINT64,
-    CInvocations: ::UINT64,
-    CPrimitives: ::UINT64,
-    PSInvocations: ::UINT64,
-    HSInvocations: ::UINT64,
-    DSInvocations: ::UINT64,
-    CSInvocations: ::UINT64,
-}}
-
-STRUCT!{struct D3D12_QUERY_DATA_SO_STATISTICS {
-    NumPrimitivesWritten: ::UINT64,
-    PrimitivesStorageNeeded: ::UINT64,
-}}
-
-STRUCT!{struct D3D12_QUERY_HEAP_DESC {
-    Type: ::D3D12_QUERY_HEAP_TYPE,
-    Count: ::UINT,
-    NodeMask: ::UINT,
-}}
-
-STRUCT!{struct D3D12_RANGE {
-    Begin: ::SIZE_T,
-    End: ::SIZE_T,
-}}
-
-
-
-STRUCT!{struct D3D12_RENDER_TARGET_VIEW_DESC {
-    Format: ::DXGI_FORMAT,
-    ViewDimension: ::D3D12_RTV_DIMENSION,
-    u: ::D3D12_BUFFER_RTV,
-}}
-
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture3D, Texture3D_mut, ::D3D12_TEX3D_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    ::D3D12_TEX2DMS_ARRAY_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, ::D3D12_TEX2DMS_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    ::D3D12_TEX2D_ARRAY_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture2D, Texture2D_mut, ::D3D12_TEX2D_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    ::D3D12_TEX1D_ARRAY_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture1D, Texture1D_mut, ::D3D12_TEX1D_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Buffer, Buffer_mut, ::D3D12_BUFFER_RTV);
-
-STRUCT!{struct D3D12_RESOURCE_ALIASING_BARRIER {
-    pResourceBefore: *mut ::ID3D12Resource,
-    pResourceAfter: *mut ::ID3D12Resource,
-}}
-
-STRUCT!{struct D3D12_RESOURCE_ALLOCATION_INFO {
-    SizeInBytes: ::UINT64,
-    Alignment: ::UINT64,
-}}
-
-STRUCT!{struct D3D12_RESOURCE_BARRIER {
-    Type: ::D3D12_RESOURCE_BARRIER_TYPE,
-    Flags: ::D3D12_RESOURCE_BARRIER_FLAGS,
-    u: ::D3D12_RESOURCE_TRANSITION_BARRIER,
-}}
-
-UNION!(D3D12_RESOURCE_BARRIER, u, UAV, UAV_mut, ::D3D12_RESOURCE_UAV_BARRIER);
-UNION!(D3D12_RESOURCE_BARRIER, u, Aliasing, Aliasing_mut, ::D3D12_RESOURCE_ALIASING_BARRIER);
-UNION!(D3D12_RESOURCE_BARRIER, u, Transition, Transition_mut, ::D3D12_RESOURCE_TRANSITION_BARRIER);
-
-STRUCT!{struct D3D12_RESOURCE_DESC {
-    Dimension: ::D3D12_RESOURCE_DIMENSION,
-    Alignment: ::UINT64,
-    Width: ::UINT64,
-    Height: ::UINT,
-    DepthOrArraySize: ::UINT16,
-    MipLevels: ::UINT16,
-    Format: ::DXGI_FORMAT,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-    Layout: ::D3D12_TEXTURE_LAYOUT,
-    Flags: ::D3D12_RESOURCE_FLAGS,
-}}
-
-STRUCT!{struct D3D12_RESOURCE_TRANSITION_BARRIER {
-    pResource: *mut ::ID3D12Resource,
-    Subresource: ::UINT,
-    StateBefore: ::D3D12_RESOURCE_STATES,
-    StateAfter: ::D3D12_RESOURCE_STATES,
-}}
-
-STRUCT!{struct D3D12_RESOURCE_UAV_BARRIER {
-    pResource: *mut ::ID3D12Resource,
-}}
-
-STRUCT!{struct D3D12_ROOT_CONSTANTS {
-    ShaderRegister: ::UINT,
-    RegisterSpace: ::UINT,
-    Num32BitValues: ::UINT,
-}}
-
-STRUCT!{struct D3D12_ROOT_DESCRIPTOR {
-    ShaderRegister: ::UINT,
-    RegisterSpace: ::UINT,
-}}
-
-STRUCT!{struct D3D12_ROOT_DESCRIPTOR_TABLE {
-    NumDescriptorRanges: ::UINT,
-    pDescriptorRanges: *const ::D3D12_DESCRIPTOR_RANGE,
-}}
-
-#[cfg(target_pointer_width = "64")]
-STRUCT!{struct D3D12_ROOT_PARAMETER {
-    ParameterType: ::D3D12_ROOT_PARAMETER_TYPE,
-    u: ::D3D12_ROOT_DESCRIPTOR_TABLE,
-    ShaderVisibility: ::D3D12_SHADER_VISIBILITY,
-}}
-
-#[cfg(target_pointer_width = "32")]
-STRUCT!{struct D3D12_ROOT_PARAMETER {
-    ParameterType: ::D3D12_ROOT_PARAMETER_TYPE,
-    u: ::D3D12_ROOT_CONSTANTS,
-    ShaderVisibility: ::D3D12_SHADER_VISIBILITY,
-}}
-
-UNION!(D3D12_ROOT_PARAMETER, u, Descriptor, Descriptor_mut, ::D3D12_ROOT_DESCRIPTOR);
-UNION!(D3D12_ROOT_PARAMETER, u, Constants, Constants_mut, ::D3D12_ROOT_CONSTANTS);
-UNION!(D3D12_ROOT_PARAMETER, u, DescriptorTable, DescriptorTable_mut,
-    ::D3D12_ROOT_DESCRIPTOR_TABLE);
-
-STRUCT!{struct D3D12_ROOT_SIGNATURE_DESC {
-    NumParameters: ::UINT,
-    pParameters: *const ::D3D12_ROOT_PARAMETER,
-    NumStaticSamplers: ::UINT,
-    pStaticSamplers: *const ::D3D12_STATIC_SAMPLER_DESC,
-    Flags: ::D3D12_ROOT_SIGNATURE_FLAGS,
-}}
-
-STRUCT!{struct D3D12_SAMPLER_DESC {
-    Filter: ::D3D12_FILTER,
-    AddressU: ::D3D12_TEXTURE_ADDRESS_MODE,
-    AddressV: ::D3D12_TEXTURE_ADDRESS_MODE,
-    AddressW: ::D3D12_TEXTURE_ADDRESS_MODE,
-    MipLODBias: ::FLOAT,
-    MaxAnisotropy: ::UINT,
-    ComparisonFunc: ::D3D12_COMPARISON_FUNC,
-    BorderColor: [::FLOAT; 4],
-    MinLOD: ::FLOAT,
-    MaxLOD: ::FLOAT,
-}}
-
-
-
-STRUCT!{struct D3D12_SHADER_RESOURCE_VIEW_DESC {
-    Format: ::DXGI_FORMAT,
-    ViewDimension: ::D3D12_SRV_DIMENSION,
-    Shader4ComponentMapping: ::UINT,
-    u: ::D3D12_BUFFER_SRV,
-}}
-
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, TextureCubeArray, TextureCubeArray_mut,
-    ::D3D12_TEXCUBE_ARRAY_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, TextureCube, TextureCube_mut, ::D3D12_TEXCUBE_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture3D, Texture3D_mut, ::D3D12_TEX3D_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    ::D3D12_TEX2DMS_ARRAY_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, ::D3D12_TEX2DMS_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    ::D3D12_TEX2D_ARRAY_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture2D, Texture2D_mut, ::D3D12_TEX2D_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    ::D3D12_TEX1D_ARRAY_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture1D, Texture1D_mut, ::D3D12_TEX1D_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Buffer, Buffer_mut, ::D3D12_BUFFER_SRV);
-
-
-
-STRUCT!{struct D3D12_STATIC_SAMPLER_DESC {
-    Filter: ::D3D12_FILTER,
-    AddressU: ::D3D12_TEXTURE_ADDRESS_MODE,
-    AddressV: ::D3D12_TEXTURE_ADDRESS_MODE,
-    AddressW: ::D3D12_TEXTURE_ADDRESS_MODE,
-    MipLODBias: ::FLOAT,
-    MaxAnisotropy: ::UINT,
-    ComparisonFunc: ::D3D12_COMPARISON_FUNC,
-    BorderColor: ::D3D12_STATIC_BORDER_COLOR,
-    MinLOD: ::FLOAT,
-    MaxLOD: ::FLOAT,
-    ShaderRegister: ::UINT,
-    RegisterSpace: ::UINT,
-    ShaderVisibility: ::D3D12_SHADER_VISIBILITY,
-}}
-
-STRUCT!{struct D3D12_STREAM_OUTPUT_BUFFER_VIEW {
-    BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-    SizeInBytes: ::UINT64,
-    BufferFilledSizeLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-}}
-
-
-
-STRUCT!{struct D3D12_SUBRESOURCE_DATA {
-    pData: *const ::c_void,
-    RowPitch: ::LONG_PTR,
-    SlicePitch: ::LONG_PTR,
-}}
-
-STRUCT!{struct D3D12_SUBRESOURCE_FOOTPRINT {
-    Format: ::DXGI_FORMAT,
-    Width: ::UINT,
-    Height: ::UINT,
-    Depth: ::UINT,
-    RowPitch: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SUBRESOURCE_INFO {
-    Offset: ::UINT64,
-    RowPitch: ::UINT,
-    DepthPitch: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SUBRESOURCE_TILING {
-    WidthInTiles: ::UINT,
-    HeightInTiles: ::UINT16,
-    DepthInTiles: ::UINT16,
-    StartTileIndexInOverallResource: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_ARRAY_DSV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_ARRAY_RTV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_ARRAY_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_ARRAY_UAV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_DSV {
-    MipSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_RTV {
-    MipSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_UAV {
-    MipSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_ARRAY_DSV {
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_ARRAY_RTV {
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_ARRAY_SRV {
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_DSV {
-    UnusedField_NothingToDefine: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_RTV {
-    UnusedField_NothingToDefine: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_SRV {
-    UnusedField_NothingToDefine: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_ARRAY_DSV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_ARRAY_RTV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-    PlaneSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_ARRAY_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-    PlaneSlice: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_ARRAY_UAV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-    PlaneSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_DSV {
-    MipSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_RTV {
-    MipSlice: ::UINT,
-    PlaneSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    PlaneSlice: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_UAV {
-    MipSlice: ::UINT,
-    PlaneSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX3D_RTV {
-    MipSlice: ::UINT,
-    FirstWSlice: ::UINT,
-    WSize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX3D_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX3D_UAV {
-    MipSlice: ::UINT,
-    FirstWSlice: ::UINT,
-    WSize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEXCUBE_ARRAY_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    First2DArrayFace: ::UINT,
-    NumCubes: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEXCUBE_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEXTURE_COPY_LOCATION {
-    pResource: *mut ::ID3D12Resource,
-    Type: ::D3D12_TEXTURE_COPY_TYPE,
-    u: ::D3D12_PLACED_SUBRESOURCE_FOOTPRINT,
-}}
-
-UNION!(D3D12_TEXTURE_COPY_LOCATION, u, SubresourceIndex, SubresourceIndex_mut, ::UINT);
-UNION!(D3D12_TEXTURE_COPY_LOCATION, u, PlacedFootprint, PlacedFootprint_mut,
-    ::D3D12_PLACED_SUBRESOURCE_FOOTPRINT);
-
-STRUCT!{struct D3D12_TILED_RESOURCE_COORDINATE {
-    X: ::UINT,
-    Y: ::UINT,
-    Z: ::UINT,
-    Subresource: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TILE_REGION_SIZE {
-    NumTiles: ::UINT,
-    UseBox: ::BOOL,
-    Width: ::UINT,
-    Height: ::UINT16,
-    Depth: ::UINT16,
-}}
-
-STRUCT!{struct D3D12_TILE_SHAPE {
-    WidthInTexels: ::UINT,
-    HeightInTexels: ::UINT,
-    DepthInTexels: ::UINT,
-}}
-
-STRUCT!{struct D3D12_UNORDERED_ACCESS_VIEW_DESC {
-    Format: ::DXGI_FORMAT,
-    ViewDimension: ::D3D12_UAV_DIMENSION,
-    u: ::D3D12_BUFFER_UAV,
-}}
-
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture3D, Texture3D_mut, ::D3D12_TEX3D_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    ::D3D12_TEX2D_ARRAY_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture2D, Texture2D_mut, ::D3D12_TEX2D_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    ::D3D12_TEX1D_ARRAY_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture1D, Texture1D_mut, ::D3D12_TEX1D_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Buffer, Buffer_mut, ::D3D12_BUFFER_UAV);
-
-STRUCT!{struct D3D12_VERTEX_BUFFER_VIEW {
-    BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-    SizeInBytes: ::UINT,
-    StrideInBytes: ::UINT,
-}}
-
-
-
-RIDL!(
-interface ID3D12CommandAllocator(ID3D12CommandAllocatorVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn Reset(&mut self) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12CommandList(ID3D12CommandListVtbl): ID3D12DeviceChild(ID3D12DeviceChildVtbl) {
-    fn GetType(&mut self) -> ::D3D12_COMMAND_LIST_TYPE
-});
-
-RIDL!(
-interface ID3D12CommandQueue(ID3D12CommandQueueVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn UpdateTileMappings(
-        &mut self, pResource: *mut ::ID3D12Resource, NumResourceRegions: ::UINT,
-        pResourceRegionStartCoordinates: *const ::D3D12_TILED_RESOURCE_COORDINATE,
-        pResourceRegionSizes: *const ::D3D12_TILE_REGION_SIZE, pHeap: *mut ::ID3D12Heap,
-        NumRanges: ::UINT, pRangeFlags: *const ::D3D12_TILE_RANGE_FLAGS,
-        pHeapRangeStartOffsets: *const ::UINT, pRangeTileCounts: *const ::UINT,
-        Flags: ::D3D12_TILE_MAPPING_FLAGS
-    ) -> (),
-    fn CopyTileMappings(
-        &mut self, pDstResource: *mut ::ID3D12Resource,
-        pDstRegionStartCoordinate: *const ::D3D12_TILED_RESOURCE_COORDINATE,
-        pSrcResource: *mut ::ID3D12Resource,
-        pSrcRegionStartCoordinate: *const ::D3D12_TILED_RESOURCE_COORDINATE,
-        pRegionSize: *const ::D3D12_TILE_REGION_SIZE, Flags: ::D3D12_TILE_MAPPING_FLAGS
-    ) -> (),
-    fn ExecuteCommandLists(
-        &mut self, NumCommandLists: ::UINT, ppCommandLists: *mut *mut ::ID3D12CommandList
-    ) -> (),
-    fn SetMarker(
-        &mut self, Metadata: ::UINT, pData: *const ::c_void, Size: ::UINT
-    ) -> (),
-    fn BeginEvent(
-        &mut self, Metadata: ::UINT, pData: *const ::c_void, Size: ::UINT
-    ) -> (),
-    fn EndEvent(&mut self) -> (),
-    fn Signal(
-        &mut self, pFence: *mut ::ID3D12Fence, Value: ::UINT64
-    ) -> ::HRESULT,
-    fn Wait(
-        &mut self, pFence: *mut ::ID3D12Fence, Value: ::UINT64
-    ) -> ::HRESULT,
-    fn GetTimestampFrequency(&mut self, pFrequency: *mut ::UINT64) -> ::HRESULT,
-    fn GetClockCalibration(
-        &mut self, pGpuTimestamp: *mut ::UINT64, pCpuTimestamp: *mut ::UINT64
-    ) -> ::HRESULT,
-    fn GetDesc(
-        &mut self, __ret_val: *mut ::D3D12_COMMAND_QUEUE_DESC
-    ) -> *mut ::D3D12_COMMAND_QUEUE_DESC
-});
-
-RIDL!(
-interface ID3D12CommandSignature(ID3D12CommandSignatureVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-});
-
-RIDL!(
-interface ID3D12DescriptorHeap(ID3D12DescriptorHeapVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn GetDesc(
-        &mut self, __ret_val: *mut ::D3D12_DESCRIPTOR_HEAP_DESC
-    ) -> *mut ::D3D12_DESCRIPTOR_HEAP_DESC,
-    fn GetCPUDescriptorHandleForHeapStart(
-        &mut self, __ret_val: *mut ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> *mut ::D3D12_CPU_DESCRIPTOR_HANDLE,
-    fn GetGPUDescriptorHandleForHeapStart(
-        &mut self, __ret_val: *mut ::D3D12_GPU_DESCRIPTOR_HANDLE
-    ) -> *mut ::D3D12_GPU_DESCRIPTOR_HANDLE
-});
-
-
-
-RIDL!(
-interface ID3D12Device(ID3D12DeviceVtbl): ID3D12Object(ID3D12ObjectVtbl) {
-    fn GetNodeCount(&mut self) -> ::UINT,
-    fn CreateCommandQueue(
-        &mut self, pDesc: *const ::D3D12_COMMAND_QUEUE_DESC, riid: ::REFGUID,
-        ppCommandQueue: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateCommandAllocator(
-        &mut self, type_: ::D3D12_COMMAND_LIST_TYPE, riid: ::REFGUID,
-        ppCommandAllocator: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateGraphicsPipelineState(
-        &mut self, pDesc: *const ::D3D12_GRAPHICS_PIPELINE_STATE_DESC, riid: ::REFGUID,
-        ppPipelineState: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateComputePipelineState(
-        &mut self, pDesc: *const ::D3D12_COMPUTE_PIPELINE_STATE_DESC, riid: ::REFGUID,
-        ppPipelineState: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateCommandList(
-        &mut self, nodeMask: ::UINT, type_: ::D3D12_COMMAND_LIST_TYPE,
-        pCommandAllocator: *mut ::ID3D12CommandAllocator,
-        pInitialState: *mut ::ID3D12PipelineState, riid: ::REFGUID,
-        ppCommandList: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CheckFeatureSupport(
-        &mut self, Feature: ::D3D12_FEATURE, pFeatureSupportData: *mut ::c_void,
-        FeatureSupportDataSize: ::UINT
-    ) -> ::HRESULT,
-    fn CreateDescriptorHeap(
-        &mut self, pDescriptorHeapDesc: *const ::D3D12_DESCRIPTOR_HEAP_DESC, riid: ::REFGUID,
-        ppvHeap: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetDescriptorHandleIncrementSize(
-        &mut self, DescriptorHeapType: ::D3D12_DESCRIPTOR_HEAP_TYPE
-    ) -> ::UINT,
-    fn CreateRootSignature(
-        &mut self, nodeMask: ::UINT, pBlobWithRootSignature: *const ::c_void,
-        blobLengthInBytes: ::SIZE_T, riid: ::REFGUID, ppvRootSignature: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateConstantBufferView(
-        &mut self, pDesc: *const ::D3D12_CONSTANT_BUFFER_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateShaderResourceView(
-        &mut self, pResource: *mut ::ID3D12Resource,
-        pDesc: *const ::D3D12_SHADER_RESOURCE_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateUnorderedAccessView(
-        &mut self, pResource: *mut ::ID3D12Resource, pCounterResource: *mut ::ID3D12Resource,
-        pDesc: *const ::D3D12_UNORDERED_ACCESS_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateRenderTargetView(
-        &mut self, pResource: *mut ::ID3D12Resource, pDesc: *const ::D3D12_RENDER_TARGET_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateDepthStencilView(
-        &mut self, pResource: *mut ::ID3D12Resource, pDesc: *const ::D3D12_DEPTH_STENCIL_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateSampler(
-        &mut self, pDesc: *const ::D3D12_SAMPLER_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CopyDescriptors(
-        &mut self, NumDestDescriptorRanges: ::UINT,
-        pDestDescriptorRangeStarts: *const ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        pDestDescriptorRangeSizes: *const ::UINT, NumSrcDescriptorRanges: ::UINT,
-        pSrcDescriptorRangeStarts: *const ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        pSrcDescriptorRangeSizes: *const ::UINT, DescriptorHeapsType: ::D3D12_DESCRIPTOR_HEAP_TYPE
-    ) -> (),
-    fn CopyDescriptorsSimple(
-        &mut self, NumDescriptors: ::UINT, DestDescriptorRangeStart: ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        SrcDescriptorRangeStart: ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        DescriptorHeapsType: ::D3D12_DESCRIPTOR_HEAP_TYPE
-    ) -> (),
-    fn GetResourceAllocationInfo(
-        &mut self, visibleMask: ::UINT, numResourceDescs: ::UINT,
-        pResourceDescs: *const ::D3D12_RESOURCE_DESC,
-        __ret_val: *mut ::D3D12_RESOURCE_ALLOCATION_INFO
-    ) -> *mut ::D3D12_RESOURCE_ALLOCATION_INFO,
-    fn GetCustomHeapProperties(
-        &mut self, nodeMask: ::UINT, heapType: ::D3D12_HEAP_TYPE,
-        __ret_val: *mut ::D3D12_HEAP_PROPERTIES
-    ) -> *mut ::D3D12_HEAP_PROPERTIES,
-    fn CreateCommittedResource(
-        &mut self, pHeapProperties: *const ::D3D12_HEAP_PROPERTIES, HeapFlags: ::D3D12_HEAP_FLAGS,
-        pResourceDesc: *const ::D3D12_RESOURCE_DESC, InitialResourceState: ::D3D12_RESOURCE_STATES,
-        pOptimizedClearValue: *const ::D3D12_CLEAR_VALUE, riidResource: ::REFGUID,
-        ppvResource: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateHeap(
-        &mut self, pDesc: *const ::D3D12_HEAP_DESC, riid: ::REFGUID, ppvHeap: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreatePlacedResource(
-        &mut self, pHeap: *mut ::ID3D12Heap, HeapOffset: ::UINT64,
-        pDesc: *const ::D3D12_RESOURCE_DESC, InitialState: ::D3D12_RESOURCE_STATES,
-        pOptimizedClearValue: *const ::D3D12_CLEAR_VALUE, riid: ::REFGUID,
-        ppvResource: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateReservedResource(
-        &mut self, pDesc: *const ::D3D12_RESOURCE_DESC, InitialState: ::D3D12_RESOURCE_STATES,
-        pOptimizedClearValue: *const ::D3D12_CLEAR_VALUE, riid: ::REFGUID,
-        ppvResource: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateSharedHandle(
-        &mut self, pObject: *mut ::ID3D12DeviceChild, pAttributes: *const ::SECURITY_ATTRIBUTES,
-        Access: ::DWORD, Name: ::LPCWSTR, pHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn OpenSharedHandle(
-        &mut self, NTHandle: ::HANDLE, riid: ::REFGUID, ppvObj: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn OpenSharedHandleByName(
-        &mut self, Name: ::LPCWSTR, Access: ::DWORD, pNTHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn MakeResident(
-        &mut self, NumObjects: ::UINT, ppObjects: *mut *mut ::ID3D12Pageable
-    ) -> ::HRESULT,
-    fn Evict(
-        &mut self, NumObjects: ::UINT, ppObjects: *mut *mut ::ID3D12Pageable
-    ) -> ::HRESULT,
-    fn CreateFence(
-        &mut self, InitialValue: ::UINT64, Flags: ::D3D12_FENCE_FLAGS, riid: ::REFGUID,
-        ppFence: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetDeviceRemovedReason(&mut self) -> ::HRESULT,
-    fn GetCopyableFootprints(
-        &mut self, pResourceDesc: *const ::D3D12_RESOURCE_DESC, FirstSubresource: ::UINT,
-        NumSubresources: ::UINT, BaseOffset: ::UINT64,
-        pLayouts: *mut ::D3D12_PLACED_SUBRESOURCE_FOOTPRINT, pNumRows: *mut ::UINT,
-        pRowSizeInBytes: *mut ::UINT64, pTotalBytes: *mut ::UINT64
-    ) -> (),
-    fn CreateQueryHeap(
-        &mut self, pDesc: *const ::D3D12_QUERY_HEAP_DESC, riid: ::REFGUID,
-        ppvHeap: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn SetStablePowerState(&mut self, Enable: ::BOOL) -> ::HRESULT,
-    fn CreateCommandSignature(
-        &mut self, pDesc: *const ::D3D12_COMMAND_SIGNATURE_DESC,
-        pRootSignature: *mut ::ID3D12RootSignature, riid: ::REFGUID,
-        ppvCommandSignature: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetResourceTiling(
-        &mut self, pTiledResource: *mut ::ID3D12Resource, pNumTilesForEntireResource: *mut ::UINT,
-        pPackedMipDesc: *mut ::D3D12_PACKED_MIP_INFO,
-        pStandardTileShapeForNonPackedMips: *mut ::D3D12_TILE_SHAPE,
-        pNumSubresourceTilings: *mut ::UINT, FirstSubresourceTilingToGet: ::UINT,
-        pSubresourceTilingsForNonPackedMips: *mut ::D3D12_SUBRESOURCE_TILING
-    ) -> (),
-    fn GetAdapterLuid(&mut self, __ret_val: *mut ::LUID) -> *mut ::LUID
-});
-
-RIDL!(
-interface ID3D12Fence(ID3D12FenceVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn GetCompletedValue(&mut self) -> ::UINT64,
-    fn SetEventOnCompletion(
-        &mut self, Value: ::UINT64, hEvent: ::HANDLE
-    ) -> ::HRESULT,
-    fn Signal(&mut self, Value: ::UINT64) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12GraphicsCommandList(ID3D12GraphicsCommandListVtbl): ID3D12CommandList(ID3D12CommandListVtbl) {
-    fn Close(&mut self) -> ::HRESULT,
-    fn Reset(
-        &mut self, pAllocator: *mut ::ID3D12CommandAllocator,
-        pInitialState: *mut ::ID3D12PipelineState
-    ) -> ::HRESULT,
-    fn ClearState(&mut self, pPipelineState: *mut ::ID3D12PipelineState) -> (),
-    fn DrawInstanced(
-        &mut self, VertexCountPerInstance: ::UINT, InstanceCount: ::UINT,
-        StartVertexLocation: ::UINT, StartInstanceLocation: ::UINT
-    ) -> (),
-    fn DrawIndexedInstanced(
-        &mut self, IndexCountPerInstance: ::UINT, InstanceCount: ::UINT,
-        StartIndexLocation: ::UINT, BaseVertexLocation: ::INT, StartInstanceLocation: ::UINT
-    ) -> (),
-    fn Dispatch(
-        &mut self, ThreadGroupCountX: ::UINT, ThreadGroupCountY: ::UINT, ThreadGroupCountZ: ::UINT
-    ) -> (),
-    fn CopyBufferRegion(
-        &mut self, pDstBuffer: *mut ::ID3D12Resource, DstOffset: ::UINT64,
-        pSrcBuffer: *mut ::ID3D12Resource, SrcOffset: ::UINT64, NumBytes: ::UINT64
-    ) -> (),
-    fn CopyTextureRegion(
-        &mut self, pDst: *const ::D3D12_TEXTURE_COPY_LOCATION, DstX: ::UINT, DstY: ::UINT,
-        DstZ: ::UINT, pSrc: *const ::D3D12_TEXTURE_COPY_LOCATION, pSrcBox: *const ::D3D12_BOX
-    ) -> (),
-    fn CopyResource(
-        &mut self, pDstResource: *mut ::ID3D12Resource, pSrcResource: *mut ::ID3D12Resource
-    ) -> (),
-    fn CopyTiles(
-        &mut self, pTiledResource: *mut ::ID3D12Resource,
-        pTileRegionStartCoordinate: *const ::D3D12_TILED_RESOURCE_COORDINATE,
-        pTileRegionSize: *const ::D3D12_TILE_REGION_SIZE, pBuffer: *mut ::ID3D12Resource,
-        BufferStartOffsetInBytes: ::UINT64, Flags: ::D3D12_TILE_COPY_FLAGS
-    ) -> (),
-    fn ResolveSubresource(
-        &mut self, pDstResource: *mut ::ID3D12Resource, DstSubresource: ::UINT,
-        pSrcResource: *mut ::ID3D12Resource, SrcSubresource: ::UINT, Format: ::DXGI_FORMAT
-    ) -> (),
-    fn IASetPrimitiveTopology(
-        &mut self, PrimitiveTopology: ::D3D12_PRIMITIVE_TOPOLOGY
-    ) -> (),
-    fn RSSetViewports(
-        &mut self, NumViewports: ::UINT, pViewports: *const ::D3D12_VIEWPORT
-    ) -> (),
-    fn RSSetScissorRects(
-        &mut self, NumRects: ::UINT, pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn OMSetBlendFactor(&mut self, BlendFactor: *const [::FLOAT; 4]) -> (),
-    fn OMSetStencilRef(&mut self, StencilRef: ::UINT) -> (),
-    fn SetPipelineState(
-        &mut self, pPipelineState: *mut ::ID3D12PipelineState
-    ) -> (),
-    fn ResourceBarrier(
-        &mut self, NumBarriers: ::UINT, pBarriers: *const ::D3D12_RESOURCE_BARRIER
-    ) -> (),
-    fn ExecuteBundle(
-        &mut self, pCommandList: *mut ::ID3D12GraphicsCommandList
-    ) -> (),
-    fn SetDescriptorHeaps(
-        &mut self, NumDescriptorHeaps: ::UINT, ppDescriptorHeaps: *mut *mut ::ID3D12DescriptorHeap
-    ) -> (),
-    fn SetComputeRootSignature(
-        &mut self, pRootSignature: *mut ::ID3D12RootSignature
-    ) -> (),
-    fn SetGraphicsRootSignature(
-        &mut self, pRootSignature: *mut ::ID3D12RootSignature
-    ) -> (),
-    fn SetComputeRootDescriptorTable(
-        &mut self, RootParameterIndex: ::UINT, BaseDescriptor: ::D3D12_GPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn SetGraphicsRootDescriptorTable(
-        &mut self, RootParameterIndex: ::UINT, BaseDescriptor: ::D3D12_GPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn SetComputeRoot32BitConstant(
-        &mut self, RootParameterIndex: ::UINT, SrcData: ::UINT, DestOffsetIn32BitValues: ::UINT
-    ) -> (),
-    fn SetGraphicsRoot32BitConstant(
-        &mut self, RootParameterIndex: ::UINT, SrcData: ::UINT, DestOffsetIn32BitValues: ::UINT
-    ) -> (),
-    fn SetComputeRoot32BitConstants(
-        &mut self, RootParameterIndex: ::UINT, Num32BitValuesToSet: ::UINT,
-        pSrcData: *const ::c_void, DestOffsetIn32BitValues: ::UINT
-    ) -> (),
-    fn SetGraphicsRoot32BitConstants(
-        &mut self, RootParameterIndex: ::UINT, Num32BitValuesToSet: ::UINT,
-        pSrcData: *const ::c_void, DestOffsetIn32BitValues: ::UINT
-    ) -> (),
-    fn SetComputeRootConstantBufferView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetGraphicsRootConstantBufferView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetComputeRootShaderResourceView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetGraphicsRootShaderResourceView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetComputeRootUnorderedAccessView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetGraphicsRootUnorderedAccessView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn IASetIndexBuffer(
-        &mut self, pView: *const ::D3D12_INDEX_BUFFER_VIEW
-    ) -> (),
-    fn IASetVertexBuffers(
-        &mut self, StartSlot: ::UINT, NumViews: ::UINT, pViews: *const ::D3D12_VERTEX_BUFFER_VIEW
-    ) -> (),
-    fn SOSetTargets(
-        &mut self, StartSlot: ::UINT, NumViews: ::UINT,
-        pViews: *const ::D3D12_STREAM_OUTPUT_BUFFER_VIEW
-    ) -> (),
-    fn OMSetRenderTargets(
-        &mut self, NumRenderTargetDescriptors: ::UINT,
-        pRenderTargetDescriptors: *const ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        RTsSingleHandleToDescriptorRange: ::BOOL,
-        pDepthStencilDescriptor: *const ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn ClearDepthStencilView(
-        &mut self, DepthStencilView: ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        ClearFlags: ::D3D12_CLEAR_FLAGS, Depth: ::FLOAT, Stencil: ::UINT8, NumRects: ::UINT,
-        pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn ClearRenderTargetView(
-        &mut self, RenderTargetView: ::D3D12_CPU_DESCRIPTOR_HANDLE, ColorRGBA: *const [::FLOAT; 4],
-        NumRects: ::UINT, pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn ClearUnorderedAccessViewUint(
-        &mut self, ViewGPUHandleInCurrentHeap: ::D3D12_GPU_DESCRIPTOR_HANDLE,
-        ViewCPUHandle: ::D3D12_CPU_DESCRIPTOR_HANDLE, pResource: *mut ::ID3D12Resource,
-        Values: *const [::UINT; 4], NumRects: ::UINT, pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn ClearUnorderedAccessViewFloat(
-        &mut self, ViewGPUHandleInCurrentHeap: ::D3D12_GPU_DESCRIPTOR_HANDLE,
-        ViewCPUHandle: ::D3D12_CPU_DESCRIPTOR_HANDLE, pResource: *mut ::ID3D12Resource,
-        Values: *const [::FLOAT; 4], NumRects: ::UINT, pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn DiscardResource(
-        &mut self, pResource: *mut ::ID3D12Resource, pRegion: *const ::D3D12_DISCARD_REGION
-    ) -> (),
-    fn BeginQuery(
-        &mut self, pQueryHeap: *mut ::ID3D12QueryHeap, Type: ::D3D12_QUERY_TYPE, Index: ::UINT
-    ) -> (),
-    fn EndQuery(
-        &mut self, pQueryHeap: *mut ::ID3D12QueryHeap, Type: ::D3D12_QUERY_TYPE, Index: ::UINT
-    ) -> (),
-    fn ResolveQueryData(
-        &mut self, pQueryHeap: *mut ::ID3D12QueryHeap, Type: ::D3D12_QUERY_TYPE,
-        StartIndex: ::UINT, NumQueries: ::UINT, pDestinationBuffer: *mut ::ID3D12Resource,
-        AlignedDestinationBufferOffset: ::UINT64
-    ) -> (),
-    fn SetPredication(
-        &mut self, pBuffer: *mut ::ID3D12Resource, AlignedBufferOffset: ::UINT64,
-        Operation: ::D3D12_PREDICATION_OP
-    ) -> (),
-    fn SetMarker(
-        &mut self, Metadata: ::UINT, pData: *const ::c_void, Size: ::UINT
-    ) -> (),
-    fn BeginEvent(
-        &mut self, Metadata: ::UINT, pData: *const ::c_void, Size: ::UINT
-    ) -> (),
-    fn EndEvent(&mut self) -> (),
-    fn ExecuteIndirect(
-        &mut self, pCommandSignature: *mut ::ID3D12CommandSignature, MaxCommandCount: ::UINT,
-        pArgumentBuffer: *mut ::ID3D12Resource, ArgumentBufferOffset: ::UINT64,
-        pCountBuffer: *mut ::ID3D12Resource, CountBufferOffset: ::UINT64
-    ) -> ()
-});
-
-RIDL!(
-interface ID3D12Heap(ID3D12HeapVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn GetDesc(
-        &mut self, __ret_val: *mut ::D3D12_HEAP_DESC
-    ) -> *mut ::D3D12_HEAP_DESC
-});
-
-
-
-RIDL!(
-interface ID3D12Pageable(ID3D12PageableVtbl): ID3D12DeviceChild(ID3D12DeviceChildVtbl) {
-});
-
-RIDL!(
-interface ID3D12PipelineState(ID3D12PipelineStateVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn GetCachedBlob(&mut self, ppBlob: *mut *mut ::ID3DBlob) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12QueryHeap(ID3D12QueryHeapVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-});
-
-RIDL!(
-interface ID3D12Resource(ID3D12ResourceVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn Map(
-        &mut self, Subresource: ::UINT, pReadRange: *const ::D3D12_RANGE,
-        ppData: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn Unmap(
-        &mut self, Subresource: ::UINT, pWrittenRange: *const ::D3D12_RANGE
-    ) -> (),
-    fn GetDesc(
-        &mut self, __ret_val: *mut ::D3D12_RESOURCE_DESC
-    ) -> *mut ::D3D12_RESOURCE_DESC,
-    fn GetGPUVirtualAddress(&mut self) -> ::D3D12_GPU_VIRTUAL_ADDRESS,
-    fn WriteToSubresource(
-        &mut self, DstSubresource: ::UINT, pDstBox: *const ::D3D12_BOX, pSrcData: *const ::c_void,
-        SrcRowPitch: ::UINT, SrcDepthPitch: ::UINT
-    ) -> ::HRESULT,
-    fn ReadFromSubresource(
-        &mut self, pDstData: *mut ::c_void, DstRowPitch: ::UINT, DstDepthPitch: ::UINT,
-        SrcSubresource: ::UINT, pSrcBox: *const ::D3D12_BOX
-    ) -> ::HRESULT,
-    fn GetHeapProperties(
-        &mut self, pHeapProperties: *mut ::D3D12_HEAP_PROPERTIES,
-        pHeapFlags: *mut ::D3D12_HEAP_FLAGS
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12RootSignatureDeserializer(ID3D12RootSignatureDeserializerVtbl): IUnknown(IUnknownVtbl) {
-    fn GetRootSignatureDesc(&mut self) -> *const ::D3D12_ROOT_SIGNATURE_DESC
-});
-
-
-
-pub type PFN_D3D12_CREATE_DEVICE = extern "system" fn (_ : *mut ::IUnknown, _ : ::D3D_FEATURE_LEVEL, _ : ::REFGUID, _ : *mut *mut ::c_void) -> ::HRESULT;
-pub type PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER = extern "system" fn (pSrcData: ::LPCVOID, SrcDataSizeInBytes: ::SIZE_T, pRootSignatureDeserializerInterface: ::REFGUID, ppRootSignatureDeserializer: *mut *mut ::c_void) -> ::HRESULT;
-pub type PFN_D3D12_GET_DEBUG_INTERFACE = extern "system" fn (_ : ::REFGUID, _ : *mut *mut ::c_void) -> ::HRESULT;
-pub type PFN_D3D12_SERIALIZE_ROOT_SIGNATURE = extern "system" fn (pRootSignature: *const ::D3D12_ROOT_SIGNATURE_DESC, Version: ::D3D_ROOT_SIGNATURE_VERSION, ppBlob: *mut *mut ::ID3DBlob, ppErrorBlob: *mut *mut ::ID3DBlob) -> ::HRESULT;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12sdklayers.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12sdklayers.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12sdklayers.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12sdklayers.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1063 +0,0 @@
-// Copyright © 2015, Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-RIDL!{interface ID3D12Debug(ID3D12DebugVtbl): IUnknown(IUnknownVtbl) {
-    fn EnableDebugLayer(&mut self) -> ()
-}}
-FLAGS!{enum D3D12_DEBUG_FEATURE {
-    D3D12_DEBUG_FEATURE_NONE = 0,
-    D3D12_DEBUG_FEATURE_TREAT_BUNDLE_AS_DRAW = 0x1,
-    D3D12_DEBUG_FEATURE_TREAT_BUNDLE_AS_DISPATCH = 0x2,
-}}
-FLAGS!{enum D3D12_RLDO_FLAGS {
-    D3D12_RLDO_NONE = 0x0,
-    D3D12_RLDO_SUMMARY = 0x1,
-    D3D12_RLDO_DETAIL = 0x2,
-    D3D12_RLDO_IGNORE_INTERNAL = 0x4,
-}}
-RIDL!{interface ID3D12DebugDevice(ID3D12DebugDeviceVtbl): IUnknown(IUnknownVtbl) {
-    fn SetFeatureMask(&mut self, Mask: ::D3D12_DEBUG_FEATURE) -> ::HRESULT,
-    fn GetFeatureMask(&mut self) -> ::D3D12_DEBUG_FEATURE,
-    fn ReportLiveDeviceObjects(&mut self, Flags: ::D3D12_RLDO_FLAGS) -> ::HRESULT
-}}
-RIDL!{interface ID3D12DebugCommandQueue(ID3D12DebugCommandQueueVtbl): IUnknown(IUnknownVtbl) {
-    fn AssertResourceState(
-        &mut self, pResource: *mut ::ID3D12Resource, Subresource: ::UINT, State: ::UINT
-    ) -> ::BOOL
-}}
-RIDL!{interface ID3D12DebugCommandList(ID3D12DebugCommandListVtbl): IUnknown(IUnknownVtbl) {
-    fn AssertResourceState(
-        &mut self, pResource: *mut ::ID3D12Resource, Subresource: ::UINT, State: ::UINT
-    ) -> ::BOOL,
-    fn SetFeatureMask(&mut self, Mask: ::D3D12_DEBUG_FEATURE) -> ::HRESULT,
-    fn GetFeatureMask(&mut self) -> ::D3D12_DEBUG_FEATURE
-}}
-ENUM!{enum D3D12_MESSAGE_CATEGORY {
-    D3D12_MESSAGE_CATEGORY_APPLICATION_DEFINED = 0,
-    D3D12_MESSAGE_CATEGORY_MISCELLANEOUS = 1,
-    D3D12_MESSAGE_CATEGORY_INITIALIZATION = 2,
-    D3D12_MESSAGE_CATEGORY_CLEANUP = 3,
-    D3D12_MESSAGE_CATEGORY_COMPILATION = 4,
-    D3D12_MESSAGE_CATEGORY_STATE_CREATION = 5,
-    D3D12_MESSAGE_CATEGORY_STATE_SETTING = 6,
-    D3D12_MESSAGE_CATEGORY_STATE_GETTING = 7,
-    D3D12_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = 8,
-    D3D12_MESSAGE_CATEGORY_EXECUTION = 9,
-    D3D12_MESSAGE_CATEGORY_SHADER = 10,
-}}
-ENUM!{enum D3D12_MESSAGE_SEVERITY {
-    D3D12_MESSAGE_SEVERITY_CORRUPTION = 0,
-    D3D12_MESSAGE_SEVERITY_ERROR = 1,
-    D3D12_MESSAGE_SEVERITY_WARNING = 2,
-    D3D12_MESSAGE_SEVERITY_INFO = 3,
-    D3D12_MESSAGE_SEVERITY_MESSAGE = 4,
-}}
-ENUM!{enum D3D12_MESSAGE_ID {
-    D3D12_MESSAGE_ID_UNKNOWN = 0,
-    D3D12_MESSAGE_ID_STRING_FROM_APPLICATION = 1,
-    D3D12_MESSAGE_ID_CORRUPTED_THIS = 2,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER1 = 3,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER2 = 4,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER3 = 5,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER4 = 6,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER5 = 7,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER6 = 8,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER7 = 9,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER8 = 10,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER9 = 11,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER10 = 12,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER11 = 13,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER12 = 14,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER13 = 15,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER14 = 16,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER15 = 17,
-    D3D12_MESSAGE_ID_CORRUPTED_MULTITHREADING = 18,
-    D3D12_MESSAGE_ID_MESSAGE_REPORTING_OUTOFMEMORY = 19,
-    D3D12_MESSAGE_ID_GETPRIVATEDATA_MOREDATA = 20,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_INVALIDFREEDATA = 21,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_INVALIDIUNKNOWN = 22,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_INVALIDFLAGS = 23,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_CHANGINGPARAMS = 24,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_OUTOFMEMORY = 25,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_UNRECOGNIZEDFORMAT = 26,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDESC = 27,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDFORMAT = 28,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDVIDEOPLANESLICE = 29,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANESLICE = 30,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDIMENSIONS = 31,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDRESOURCE = 32,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDARG_RETURN = 33,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_OUTOFMEMORY_RETURN = 34,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_UNRECOGNIZEDFORMAT = 35,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_UNSUPPORTEDFORMAT = 36,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDESC = 37,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDFORMAT = 38,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDVIDEOPLANESLICE = 39,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDPLANESLICE = 40,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDIMENSIONS = 41,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDRESOURCE = 42,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDARG_RETURN = 43,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_OUTOFMEMORY_RETURN = 44,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_UNRECOGNIZEDFORMAT = 45,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDDESC = 46,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDFORMAT = 47,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDDIMENSIONS = 48,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDRESOURCE = 49,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDARG_RETURN = 50,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_OUTOFMEMORY_RETURN = 51,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_OUTOFMEMORY = 52,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TOOMANYELEMENTS = 53,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDFORMAT = 54,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INCOMPATIBLEFORMAT = 55,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSLOT = 56,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDINPUTSLOTCLASS = 57,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_STEPRATESLOTCLASSMISMATCH = 58,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSLOTCLASSCHANGE = 59,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSTEPRATECHANGE = 60,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDALIGNMENT = 61,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_DUPLICATESEMANTIC = 62,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_UNPARSEABLEINPUTSIGNATURE = 63,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_NULLSEMANTIC = 64,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_MISSINGELEMENT = 65,
-    D3D12_MESSAGE_ID_CREATEVERTEXSHADER_OUTOFMEMORY = 66,
-    D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDSHADERBYTECODE = 67,
-    D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDSHADERTYPE = 68,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_OUTOFMEMORY = 69,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDSHADERBYTECODE = 70,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDSHADERTYPE = 71,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTOFMEMORY = 72,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSHADERBYTECODE = 73,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSHADERTYPE = 74,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMENTRIES = 75,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTPUTSTREAMSTRIDEUNUSED = 76,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDDECL = 77,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_EXPECTEDDECL = 78,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTPUTSLOT0EXPECTED = 79,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDOUTPUTSLOT = 80,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_ONLYONEELEMENTPERSLOT = 81,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDCOMPONENTCOUNT = 82,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTARTCOMPONENTANDCOMPONENTCOUNT = 83,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDGAPDEFINITION = 84,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_REPEATEDOUTPUT = 85,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDOUTPUTSTREAMSTRIDE = 86,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MISSINGSEMANTIC = 87,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MASKMISMATCH = 88,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_CANTHAVEONLYGAPS = 89,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DECLTOOCOMPLEX = 90,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MISSINGOUTPUTSIGNATURE = 91,
-    D3D12_MESSAGE_ID_CREATEPIXELSHADER_OUTOFMEMORY = 92,
-    D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDSHADERBYTECODE = 93,
-    D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDSHADERTYPE = 94,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFILLMODE = 95,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDCULLMODE = 96,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDDEPTHBIASCLAMP = 97,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDSLOPESCALEDDEPTHBIAS = 98,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_NULLDESC = 99,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDDEPTHWRITEMASK = 100,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDDEPTHFUNC = 101,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILFAILOP = 102,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILZFAILOP = 103,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILPASSOP = 104,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILFUNC = 105,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILFAILOP = 106,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILZFAILOP = 107,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILPASSOP = 108,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILFUNC = 109,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_NULLDESC = 110,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDSRCBLEND = 111,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDDESTBLEND = 112,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDBLENDOP = 113,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDSRCBLENDALPHA = 114,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDDESTBLENDALPHA = 115,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDBLENDOPALPHA = 116,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDRENDERTARGETWRITEMASK = 117,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_NULLDESC = 118,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDFILTER = 119,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDADDRESSU = 120,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDADDRESSV = 121,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDADDRESSW = 122,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDMIPLODBIAS = 123,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDMAXANISOTROPY = 124,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDCOMPARISONFUNC = 125,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDMINLOD = 126,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDMAXLOD = 127,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_NULLDESC = 128,
-    D3D12_MESSAGE_ID_DEVICE_IASETPRIMITIVETOPOLOGY_TOPOLOGY_UNRECOGNIZED = 129,
-    D3D12_MESSAGE_ID_DEVICE_IASETPRIMITIVETOPOLOGY_TOPOLOGY_UNDEFINED = 130,
-    D3D12_MESSAGE_ID_DEVICE_RSSETVIEWPORTS_INVALIDVIEWPORT = 131,
-    D3D12_MESSAGE_ID_DEVICE_RSSETSCISSORRECTS_INVALIDSCISSOR = 132,
-    D3D12_MESSAGE_ID_CLEARRENDERTARGETVIEW_DENORMFLUSH = 133,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_DENORMFLUSH = 134,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_INVALID = 135,
-    D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSOURCE = 136,
-    D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDDESTINATIONSTATE = 137,
-    D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSOURCESTATE = 138,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_INVALIDDESTINATIONSUBRESOURCE = 139,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_INVALIDDESTINATIONBOX = 140,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_INVALIDDESTINATIONSTATE = 141,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_DESTINATION_INVALID = 142,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_DESTINATION_SUBRESOURCE_INVALID = 143,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_SOURCE_INVALID = 144,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_SOURCE_SUBRESOURCE_INVALID = 145,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_FORMAT_INVALID = 146,
-    D3D12_MESSAGE_ID_BUFFER_MAP_INVALIDMAPTYPE = 147,
-    D3D12_MESSAGE_ID_BUFFER_MAP_INVALIDFLAGS = 148,
-    D3D12_MESSAGE_ID_BUFFER_MAP_ALREADYMAPPED = 149,
-    D3D12_MESSAGE_ID_BUFFER_MAP_DEVICEREMOVED_RETURN = 150,
-    D3D12_MESSAGE_ID_BUFFER_UNMAP_NOTMAPPED = 151,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_INVALIDMAPTYPE = 152,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_INVALIDSUBRESOURCE = 153,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_INVALIDFLAGS = 154,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_ALREADYMAPPED = 155,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_DEVICEREMOVED_RETURN = 156,
-    D3D12_MESSAGE_ID_TEXTURE1D_UNMAP_INVALIDSUBRESOURCE = 157,
-    D3D12_MESSAGE_ID_TEXTURE1D_UNMAP_NOTMAPPED = 158,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_INVALIDMAPTYPE = 159,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_INVALIDSUBRESOURCE = 160,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_INVALIDFLAGS = 161,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_ALREADYMAPPED = 162,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_DEVICEREMOVED_RETURN = 163,
-    D3D12_MESSAGE_ID_TEXTURE2D_UNMAP_INVALIDSUBRESOURCE = 164,
-    D3D12_MESSAGE_ID_TEXTURE2D_UNMAP_NOTMAPPED = 165,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_INVALIDMAPTYPE = 166,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_INVALIDSUBRESOURCE = 167,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_INVALIDFLAGS = 168,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_ALREADYMAPPED = 169,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_DEVICEREMOVED_RETURN = 170,
-    D3D12_MESSAGE_ID_TEXTURE3D_UNMAP_INVALIDSUBRESOURCE = 171,
-    D3D12_MESSAGE_ID_TEXTURE3D_UNMAP_NOTMAPPED = 172,
-    D3D12_MESSAGE_ID_CHECKFORMATSUPPORT_FORMAT_DEPRECATED = 173,
-    D3D12_MESSAGE_ID_CHECKMULTISAMPLEQUALITYLEVELS_FORMAT_DEPRECATED = 174,
-    D3D12_MESSAGE_ID_SETEXCEPTIONMODE_UNRECOGNIZEDFLAGS = 175,
-    D3D12_MESSAGE_ID_SETEXCEPTIONMODE_INVALIDARG_RETURN = 176,
-    D3D12_MESSAGE_ID_SETEXCEPTIONMODE_DEVICEREMOVED_RETURN = 177,
-    D3D12_MESSAGE_ID_REF_SIMULATING_INFINITELY_FAST_HARDWARE = 178,
-    D3D12_MESSAGE_ID_REF_THREADING_MODE = 179,
-    D3D12_MESSAGE_ID_REF_UMDRIVER_EXCEPTION = 180,
-    D3D12_MESSAGE_ID_REF_KMDRIVER_EXCEPTION = 181,
-    D3D12_MESSAGE_ID_REF_HARDWARE_EXCEPTION = 182,
-    D3D12_MESSAGE_ID_REF_ACCESSING_INDEXABLE_TEMP_OUT_OF_RANGE = 183,
-    D3D12_MESSAGE_ID_REF_PROBLEM_PARSING_SHADER = 184,
-    D3D12_MESSAGE_ID_REF_OUT_OF_MEMORY = 185,
-    D3D12_MESSAGE_ID_REF_INFO = 186,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_VERTEXPOS_OVERFLOW = 187,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDEXED_INDEXPOS_OVERFLOW = 188,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINSTANCED_VERTEXPOS_OVERFLOW = 189,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINSTANCED_INSTANCEPOS_OVERFLOW = 190,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDEXEDINSTANCED_INSTANCEPOS_OVERFLOW = 191,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDEXEDINSTANCED_INDEXPOS_OVERFLOW = 192,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_VERTEX_SHADER_NOT_SET = 193,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_SEMANTICNAME_NOT_FOUND = 194,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_REGISTERINDEX = 195,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_COMPONENTTYPE = 196,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_REGISTERMASK = 197,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_SYSTEMVALUE = 198,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_NEVERWRITTEN_ALWAYSREADS = 199,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_ROOT_SIGNATURE_NOT_SET = 200,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_ROOT_SIGNATURE_MISMATCH = 201,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_NOT_SET = 202,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INPUTLAYOUT_NOT_SET = 203,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_CONSTANT_BUFFER_NOT_SET = 204,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_CONSTANT_BUFFER_TOO_SMALL = 205,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_SAMPLER_NOT_SET = 206,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_SHADERRESOURCEVIEW_NOT_SET = 207,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VIEW_DIMENSION_MISMATCH = 208,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_STRIDE_TOO_SMALL = 209,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_TOO_SMALL = 210,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_NOT_SET = 211,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_FORMAT_INVALID = 212,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_TOO_SMALL = 213,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_GS_INPUT_PRIMITIVE_MISMATCH = 214,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_RETURN_TYPE_MISMATCH = 215,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_POSITION_NOT_PRESENT = 216,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_OUTPUT_STREAM_NOT_SET = 217,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_BOUND_RESOURCE_MAPPED = 218,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INVALID_PRIMITIVETOPOLOGY = 219,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_OFFSET_UNALIGNED = 220,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_STRIDE_UNALIGNED = 221,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_OFFSET_UNALIGNED = 222,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_OUTPUT_STREAM_OFFSET_UNALIGNED = 223,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_FORMAT_LD_UNSUPPORTED = 224,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_FORMAT_SAMPLE_UNSUPPORTED = 225,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_FORMAT_SAMPLE_C_UNSUPPORTED = 226,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_MULTISAMPLE_UNSUPPORTED = 227,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_SO_TARGETS_BOUND_WITHOUT_SOURCE = 228,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_SO_STRIDE_LARGER_THAN_BUFFER = 229,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_OM_RENDER_TARGET_DOES_NOT_SUPPORT_BLENDING = 230,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_OM_DUAL_SOURCE_BLENDING_CAN_ONLY_HAVE_RENDER_TARGET_0 = 231,
-    D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_AT_FAULT = 232,
-    D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_POSSIBLY_AT_FAULT = 233,
-    D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_NOT_AT_FAULT = 234,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE_INVALIDARG_RETURN = 235,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE_OUTOFMEMORY_RETURN = 236,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE_BADINTERFACE_RETURN = 237,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_VIEWPORT_NOT_SET = 238,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TRAILING_DIGIT_IN_SEMANTIC = 239,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_TRAILING_DIGIT_IN_SEMANTIC = 240,
-    D3D12_MESSAGE_ID_DEVICE_RSSETVIEWPORTS_DENORMFLUSH = 241,
-    D3D12_MESSAGE_ID_OMSETRENDERTARGETS_INVALIDVIEW = 242,
-    D3D12_MESSAGE_ID_DEVICE_SETTEXTFILTERSIZE_INVALIDDIMENSIONS = 243,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_SAMPLER_MISMATCH = 244,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TYPE_MISMATCH = 245,
-    D3D12_MESSAGE_ID_BLENDSTATE_GETDESC_LEGACY = 246,
-    D3D12_MESSAGE_ID_SHADERRESOURCEVIEW_GETDESC_LEGACY = 247,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_PS_OUTPUT_TYPE_MISMATCH = 248,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RESOURCE_FORMAT_GATHER_UNSUPPORTED = 249,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_INVALID_USE_OF_CENTER_MULTISAMPLE_PATTERN = 250,
-    D3D12_MESSAGE_ID_DEVICE_IASETVERTEXBUFFERS_STRIDE_TOO_LARGE = 251,
-    D3D12_MESSAGE_ID_DEVICE_IASETVERTEXBUFFERS_INVALIDRANGE = 252,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_EMPTY_LAYOUT = 253,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RESOURCE_SAMPLE_COUNT_MISMATCH = 254,
-    D3D12_MESSAGE_ID_LIVE_OBJECT_SUMMARY = 255,
-    D3D12_MESSAGE_ID_LIVE_BUFFER = 256,
-    D3D12_MESSAGE_ID_LIVE_TEXTURE1D = 257,
-    D3D12_MESSAGE_ID_LIVE_TEXTURE2D = 258,
-    D3D12_MESSAGE_ID_LIVE_TEXTURE3D = 259,
-    D3D12_MESSAGE_ID_LIVE_SHADERRESOURCEVIEW = 260,
-    D3D12_MESSAGE_ID_LIVE_RENDERTARGETVIEW = 261,
-    D3D12_MESSAGE_ID_LIVE_DEPTHSTENCILVIEW = 262,
-    D3D12_MESSAGE_ID_LIVE_VERTEXSHADER = 263,
-    D3D12_MESSAGE_ID_LIVE_GEOMETRYSHADER = 264,
-    D3D12_MESSAGE_ID_LIVE_PIXELSHADER = 265,
-    D3D12_MESSAGE_ID_LIVE_INPUTLAYOUT = 266,
-    D3D12_MESSAGE_ID_LIVE_SAMPLER = 267,
-    D3D12_MESSAGE_ID_LIVE_BLENDSTATE = 268,
-    D3D12_MESSAGE_ID_LIVE_DEPTHSTENCILSTATE = 269,
-    D3D12_MESSAGE_ID_LIVE_RASTERIZERSTATE = 270,
-    D3D12_MESSAGE_ID_LIVE_QUERY = 271,
-    D3D12_MESSAGE_ID_LIVE_PREDICATE = 272,
-    D3D12_MESSAGE_ID_LIVE_COUNTER = 273,
-    D3D12_MESSAGE_ID_LIVE_DEVICE = 274,
-    D3D12_MESSAGE_ID_LIVE_SWAPCHAIN = 275,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDFLAGS = 276,
-    D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDCLASSLINKAGE = 277,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDCLASSLINKAGE = 278,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMSTREAMS = 279,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTREAMTORASTERIZER = 280,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDSTREAMS = 281,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDCLASSLINKAGE = 282,
-    D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDCLASSLINKAGE = 283,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTREAM = 284,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDENTRIES = 285,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDSTRIDES = 286,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMSTRIDES = 287,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDCALL = 288,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_OUTOFMEMORY = 289,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDSHADERBYTECODE = 290,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDSHADERTYPE = 291,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDCLASSLINKAGE = 292,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDCALL = 293,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_OUTOFMEMORY = 294,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDSHADERBYTECODE = 295,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDSHADERTYPE = 296,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDCLASSLINKAGE = 297,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HS_XOR_DS_MISMATCH = 298,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDIRECT_INVALID_ARG_BUFFER = 299,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDIRECT_OFFSET_UNALIGNED = 300,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDIRECT_OFFSET_OVERFLOW = 301,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_INVALIDMAPTYPE = 302,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_INVALIDSUBRESOURCE = 303,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_INVALIDFLAGS = 304,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_ALREADYMAPPED = 305,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_DEVICEREMOVED_RETURN = 306,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_OUTOFMEMORY_RETURN = 307,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_WITHOUT_INITIAL_DISCARD = 308,
-    D3D12_MESSAGE_ID_RESOURCE_UNMAP_INVALIDSUBRESOURCE = 309,
-    D3D12_MESSAGE_ID_RESOURCE_UNMAP_NOTMAPPED = 310,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RASTERIZING_CONTROL_POINTS = 311,
-    D3D12_MESSAGE_ID_DEVICE_IASETPRIMITIVETOPOLOGY_TOPOLOGY_UNSUPPORTED = 312,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HS_DS_SIGNATURE_MISMATCH = 313,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HULL_SHADER_INPUT_TOPOLOGY_MISMATCH = 314,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HS_DS_CONTROL_POINT_COUNT_MISMATCH = 315,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HS_DS_TESSELLATOR_DOMAIN_MISMATCH = 316,
-    D3D12_MESSAGE_ID_DEVICE_CHECKFEATURESUPPORT_UNRECOGNIZED_FEATURE = 317,
-    D3D12_MESSAGE_ID_DEVICE_CHECKFEATURESUPPORT_MISMATCHED_DATA_SIZE = 318,
-    D3D12_MESSAGE_ID_DEVICE_CHECKFEATURESUPPORT_INVALIDARG_RETURN = 319,
-    D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDCALL = 320,
-    D3D12_MESSAGE_ID_CREATECOMPUTESHADER_OUTOFMEMORY = 321,
-    D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDSHADERBYTECODE = 322,
-    D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDCLASSLINKAGE = 323,
-    D3D12_MESSAGE_ID_DEVICE_CSSETSHADERRESOURCES_VIEWS_EMPTY = 324,
-    D3D12_MESSAGE_ID_CSSETCONSTANTBUFFERS_INVALIDBUFFER = 325,
-    D3D12_MESSAGE_ID_DEVICE_CSSETCONSTANTBUFFERS_BUFFERS_EMPTY = 326,
-    D3D12_MESSAGE_ID_DEVICE_CSSETSAMPLERS_SAMPLERS_EMPTY = 327,
-    D3D12_MESSAGE_ID_DEVICE_CSGETSHADERRESOURCES_VIEWS_EMPTY = 328,
-    D3D12_MESSAGE_ID_DEVICE_CSGETCONSTANTBUFFERS_BUFFERS_EMPTY = 329,
-    D3D12_MESSAGE_ID_DEVICE_CSGETSAMPLERS_SAMPLERS_EMPTY = 330,
-    D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 331,
-    D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 332,
-    D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 333,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 334,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DOUBLEFLOATOPSNOTSUPPORTED = 335,
-    D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 336,
-    D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_DOUBLEFLOATOPSNOTSUPPORTED = 337,
-    D3D12_MESSAGE_ID_CREATEBUFFER_INVALIDSTRUCTURESTRIDE = 338,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDFLAGS = 339,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDRESOURCE = 340,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDESC = 341,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDFORMAT = 342,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDVIDEOPLANESLICE = 343,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDPLANESLICE = 344,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDIMENSIONS = 345,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_UNRECOGNIZEDFORMAT = 346,
-    D3D12_MESSAGE_ID_DEVICE_OMSETRENDERTARGETSANDUNORDEREDACCESSVIEWS_OVERLAPPING_OLD_SLOTS = 347,
-    D3D12_MESSAGE_ID_DEVICE_OMSETRENDERTARGETSANDUNORDEREDACCESSVIEWS_NO_OP = 348,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDARG_RETURN = 349,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_OUTOFMEMORY_RETURN = 350,
-    D3D12_MESSAGE_ID_CLEARUNORDEREDACCESSVIEW_DENORMFLUSH = 351,
-    D3D12_MESSAGE_ID_DEVICE_CSSETUNORDEREDACCESSS_VIEWS_EMPTY = 352,
-    D3D12_MESSAGE_ID_DEVICE_CSGETUNORDEREDACCESSS_VIEWS_EMPTY = 353,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDFLAGS = 354,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCHINDIRECT_INVALID_ARG_BUFFER = 355,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCHINDIRECT_OFFSET_UNALIGNED = 356,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCHINDIRECT_OFFSET_OVERFLOW = 357,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_DEPTH_READONLY = 358,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_STENCIL_READONLY = 359,
-    D3D12_MESSAGE_ID_CHECKFEATURESUPPORT_FORMAT_DEPRECATED = 360,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_RETURN_TYPE_MISMATCH = 361,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_NOT_SET = 362,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_UNORDEREDACCESSVIEW_RENDERTARGETVIEW_OVERLAP = 363,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_DIMENSION_MISMATCH = 364,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_APPEND_UNSUPPORTED = 365,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMICS_UNSUPPORTED = 366,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_STRUCTURE_STRIDE_MISMATCH = 367,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_BUFFER_TYPE_MISMATCH = 368,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_RAW_UNSUPPORTED = 369,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_FORMAT_LD_UNSUPPORTED = 370,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_FORMAT_STORE_UNSUPPORTED = 371,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_ADD_UNSUPPORTED = 372,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_BITWISE_OPS_UNSUPPORTED = 373,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_CMPSTORE_CMPEXCHANGE_UNSUPPORTED = 374,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_EXCHANGE_UNSUPPORTED = 375,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_SIGNED_MINMAX_UNSUPPORTED = 376,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_UNSIGNED_MINMAX_UNSUPPORTED = 377,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCH_BOUND_RESOURCE_MAPPED = 378,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCH_THREADGROUPCOUNT_OVERFLOW = 379,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCH_THREADGROUPCOUNT_ZERO = 380,
-    D3D12_MESSAGE_ID_DEVICE_SHADERRESOURCEVIEW_STRUCTURE_STRIDE_MISMATCH = 381,
-    D3D12_MESSAGE_ID_DEVICE_SHADERRESOURCEVIEW_BUFFER_TYPE_MISMATCH = 382,
-    D3D12_MESSAGE_ID_DEVICE_SHADERRESOURCEVIEW_RAW_UNSUPPORTED = 383,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCH_UNSUPPORTED = 384,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCHINDIRECT_UNSUPPORTED = 385,
-    D3D12_MESSAGE_ID_COPYSTRUCTURECOUNT_INVALIDOFFSET = 386,
-    D3D12_MESSAGE_ID_COPYSTRUCTURECOUNT_LARGEOFFSET = 387,
-    D3D12_MESSAGE_ID_COPYSTRUCTURECOUNT_INVALIDDESTINATIONSTATE = 388,
-    D3D12_MESSAGE_ID_COPYSTRUCTURECOUNT_INVALIDSOURCESTATE = 389,
-    D3D12_MESSAGE_ID_CHECKFORMATSUPPORT_FORMAT_NOT_SUPPORTED = 390,
-    D3D12_MESSAGE_ID_CLEARUNORDEREDACCESSVIEWFLOAT_INVALIDFORMAT = 391,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_COUNTER_UNSUPPORTED = 392,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_PIXEL_SHADER_WITHOUT_RTV_OR_DSV = 393,
-    D3D12_MESSAGE_ID_SHADER_ABORT = 394,
-    D3D12_MESSAGE_ID_SHADER_MESSAGE = 395,
-    D3D12_MESSAGE_ID_SHADER_ERROR = 396,
-    D3D12_MESSAGE_ID_OFFERRESOURCES_INVALIDRESOURCE = 397,
-    D3D12_MESSAGE_ID_ENQUEUESETEVENT_INVALIDARG_RETURN = 398,
-    D3D12_MESSAGE_ID_ENQUEUESETEVENT_OUTOFMEMORY_RETURN = 399,
-    D3D12_MESSAGE_ID_ENQUEUESETEVENT_ACCESSDENIED_RETURN = 400,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFORCEDSAMPLECOUNT = 401,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_INVALID_USE_OF_FORCED_SAMPLE_COUNT = 402,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDLOGICOPS = 403,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDARRAYWITHDECODER = 404,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDARRAYWITHDECODER = 405,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDARRAYWITHDECODER = 406,
-    D3D12_MESSAGE_ID_DEVICE_LOCKEDOUT_INTERFACE = 407,
-    D3D12_MESSAGE_ID_OFFERRESOURCES_INVALIDPRIORITY = 408,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDVIEW = 409,
-    D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 410,
-    D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_SHADEREXTENSIONSNOTSUPPORTED = 411,
-    D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 412,
-    D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_SHADEREXTENSIONSNOTSUPPORTED = 413,
-    D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 414,
-    D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_SHADEREXTENSIONSNOTSUPPORTED = 415,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 416,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_SHADEREXTENSIONSNOTSUPPORTED = 417,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DOUBLEEXTENSIONSNOTSUPPORTED = 418,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_SHADEREXTENSIONSNOTSUPPORTED = 419,
-    D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 420,
-    D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_SHADEREXTENSIONSNOTSUPPORTED = 421,
-    D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 422,
-    D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_SHADEREXTENSIONSNOTSUPPORTED = 423,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_MINPRECISION = 424,
-    D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_UAVSNOTSUPPORTED = 425,
-    D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_UAVSNOTSUPPORTED = 426,
-    D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_UAVSNOTSUPPORTED = 427,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_UAVSNOTSUPPORTED = 428,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UAVSNOTSUPPORTED = 429,
-    D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_UAVSNOTSUPPORTED = 430,
-    D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_UAVSNOTSUPPORTED = 431,
-    D3D12_MESSAGE_ID_DEVICE_OMSETRENDERTARGETSANDUNORDEREDACCESSVIEWS_INVALIDOFFSET = 432,
-    D3D12_MESSAGE_ID_DEVICE_OMSETRENDERTARGETSANDUNORDEREDACCESSVIEWS_TOOMANYVIEWS = 433,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_NOTSUPPORTED = 434,
-    D3D12_MESSAGE_ID_SWAPDEVICECONTEXTSTATE_NOTSUPPORTED = 435,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_PREFERUPDATESUBRESOURCE1 = 436,
-    D3D12_MESSAGE_ID_GETDC_INACCESSIBLE = 437,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDRECT = 438,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_SAMPLE_MASK_IGNORED_ON_FL9 = 439,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE1_NOT_SUPPORTED = 440,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE_BY_NAME_NOT_SUPPORTED = 441,
-    D3D12_MESSAGE_ID_ENQUEUESETEVENT_NOT_SUPPORTED = 442,
-    D3D12_MESSAGE_ID_OFFERRELEASE_NOT_SUPPORTED = 443,
-    D3D12_MESSAGE_ID_OFFERRESOURCES_INACCESSIBLE = 444,
-    D3D12_MESSAGE_ID_CREATEVIDEOPROCESSORINPUTVIEW_INVALIDMSAA = 445,
-    D3D12_MESSAGE_ID_CREATEVIDEOPROCESSOROUTPUTVIEW_INVALIDMSAA = 446,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDSOURCERECT = 447,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_EMPTYRECT = 448,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_EMPTYDESTBOX = 449,
-    D3D12_MESSAGE_ID_COPYSUBRESOURCEREGION_EMPTYSOURCEBOX = 450,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_OM_RENDER_TARGET_DOES_NOT_SUPPORT_LOGIC_OPS = 451,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_DEPTHSTENCILVIEW_NOT_SET = 452,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RENDERTARGETVIEW_NOT_SET = 453,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RENDERTARGETVIEW_NOT_SET_DUE_TO_FLIP_PRESENT = 454,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_NOT_SET_DUE_TO_FLIP_PRESENT = 455,
-    D3D12_MESSAGE_ID_GETDATAFORNEWHARDWAREKEY_NULLPARAM = 456,
-    D3D12_MESSAGE_ID_CHECKCRYPTOSESSIONSTATUS_NULLPARAM = 457,
-    D3D12_MESSAGE_ID_SETEVENTONHARDWARECONTENTPROTECTIONTILT_NULLPARAM = 458,
-    D3D12_MESSAGE_ID_GETVIDEODECODERCAPS_NULLPARAM = 459,
-    D3D12_MESSAGE_ID_GETVIDEODECODERCAPS_ZEROWIDTHHEIGHT = 460,
-    D3D12_MESSAGE_ID_CHECKVIDEODECODERDOWNSAMPLING_NULLPARAM = 461,
-    D3D12_MESSAGE_ID_CHECKVIDEODECODERDOWNSAMPLING_INVALIDCOLORSPACE = 462,
-    D3D12_MESSAGE_ID_CHECKVIDEODECODERDOWNSAMPLING_ZEROWIDTHHEIGHT = 463,
-    D3D12_MESSAGE_ID_VIDEODECODERENABLEDOWNSAMPLING_NULLPARAM = 464,
-    D3D12_MESSAGE_ID_VIDEODECODERENABLEDOWNSAMPLING_UNSUPPORTED = 465,
-    D3D12_MESSAGE_ID_VIDEODECODERUPDATEDOWNSAMPLING_NULLPARAM = 466,
-    D3D12_MESSAGE_ID_VIDEODECODERUPDATEDOWNSAMPLING_UNSUPPORTED = 467,
-    D3D12_MESSAGE_ID_CHECKVIDEOPROCESSORFORMATCONVERSION_NULLPARAM = 468,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETOUTPUTCOLORSPACE1_NULLPARAM = 469,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETOUTPUTCOLORSPACE1_NULLPARAM = 470,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMCOLORSPACE1_NULLPARAM = 471,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMCOLORSPACE1_INVALIDSTREAM = 472,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMMIRROR_NULLPARAM = 473,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMMIRROR_INVALIDSTREAM = 474,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMMIRROR_UNSUPPORTED = 475,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETSTREAMCOLORSPACE1_NULLPARAM = 476,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETSTREAMMIRROR_NULLPARAM = 477,
-    D3D12_MESSAGE_ID_RECOMMENDVIDEODECODERDOWNSAMPLING_NULLPARAM = 478,
-    D3D12_MESSAGE_ID_RECOMMENDVIDEODECODERDOWNSAMPLING_INVALIDCOLORSPACE = 479,
-    D3D12_MESSAGE_ID_RECOMMENDVIDEODECODERDOWNSAMPLING_ZEROWIDTHHEIGHT = 480,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETOUTPUTSHADERUSAGE_NULLPARAM = 481,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETOUTPUTSHADERUSAGE_NULLPARAM = 482,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_NULLPARAM = 483,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_INVALIDSTREAMCOUNT = 484,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_TARGETRECT = 485,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_INVALIDSOURCERECT = 486,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_INVALIDDESTRECT = 487,
-    D3D12_MESSAGE_ID_CREATEBUFFER_INVALIDUSAGE = 488,
-    D3D12_MESSAGE_ID_CREATETEXTURE1D_INVALIDUSAGE = 489,
-    D3D12_MESSAGE_ID_CREATETEXTURE2D_INVALIDUSAGE = 490,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_LEVEL9_STEPRATE_NOT_1 = 491,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_LEVEL9_INSTANCING_NOT_SUPPORTED = 492,
-    D3D12_MESSAGE_ID_UPDATETILEMAPPINGS_INVALID_PARAMETER = 493,
-    D3D12_MESSAGE_ID_COPYTILEMAPPINGS_INVALID_PARAMETER = 494,
-    D3D12_MESSAGE_ID_COPYTILES_INVALID_PARAMETER = 495,
-    D3D12_MESSAGE_ID_NULL_TILE_MAPPING_ACCESS_WARNING = 496,
-    D3D12_MESSAGE_ID_NULL_TILE_MAPPING_ACCESS_ERROR = 497,
-    D3D12_MESSAGE_ID_DIRTY_TILE_MAPPING_ACCESS = 498,
-    D3D12_MESSAGE_ID_DUPLICATE_TILE_MAPPINGS_IN_COVERED_AREA = 499,
-    D3D12_MESSAGE_ID_TILE_MAPPINGS_IN_COVERED_AREA_DUPLICATED_OUTSIDE = 500,
-    D3D12_MESSAGE_ID_TILE_MAPPINGS_SHARED_BETWEEN_INCOMPATIBLE_RESOURCES = 501,
-    D3D12_MESSAGE_ID_TILE_MAPPINGS_SHARED_BETWEEN_INPUT_AND_OUTPUT = 502,
-    D3D12_MESSAGE_ID_CHECKMULTISAMPLEQUALITYLEVELS_INVALIDFLAGS = 503,
-    D3D12_MESSAGE_ID_GETRESOURCETILING_NONTILED_RESOURCE = 504,
-    D3D12_MESSAGE_ID_NEED_TO_CALL_TILEDRESOURCEBARRIER = 505,
-    D3D12_MESSAGE_ID_CREATEDEVICE_INVALIDARGS = 506,
-    D3D12_MESSAGE_ID_CREATEDEVICE_WARNING = 507,
-    D3D12_MESSAGE_ID_TILED_RESOURCE_TIER_1_BUFFER_TEXTURE_MISMATCH = 508,
-    D3D12_MESSAGE_ID_CREATE_CRYPTOSESSION = 509,
-    D3D12_MESSAGE_ID_CREATE_AUTHENTICATEDCHANNEL = 510,
-    D3D12_MESSAGE_ID_LIVE_CRYPTOSESSION = 511,
-    D3D12_MESSAGE_ID_LIVE_AUTHENTICATEDCHANNEL = 512,
-    D3D12_MESSAGE_ID_DESTROY_CRYPTOSESSION = 513,
-    D3D12_MESSAGE_ID_DESTROY_AUTHENTICATEDCHANNEL = 514,
-    D3D12_MESSAGE_ID_MAP_INVALID_SUBRESOURCE = 515,
-    D3D12_MESSAGE_ID_MAP_INVALID_TYPE = 516,
-    D3D12_MESSAGE_ID_MAP_UNSUPPORTED_TYPE = 517,
-    D3D12_MESSAGE_ID_UNMAP_INVALID_SUBRESOURCE = 518,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_TYPE = 519,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_NULL_POINTER = 520,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_SUBRESOURCE = 521,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_RESERVED_BITS = 522,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISSING_BIND_FLAGS = 523,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_MISC_FLAGS = 524,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_MATCHING_STATES = 525,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMBINATION = 526,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_BEFORE_AFTER_MISMATCH = 527,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_RESOURCE = 528,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_SAMPLE_COUNT = 529,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAGS = 530,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMBINED_FLAGS = 531,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAGS_FOR_FORMAT = 532,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_SPLIT_BARRIER = 533,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_UNMATCHED_END = 534,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_UNMATCHED_BEGIN = 535,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAG = 536,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMMAND_LIST_TYPE = 537,
-    D3D12_MESSAGE_ID_INVALID_SUBRESOURCE_STATE = 538,
-    D3D12_MESSAGE_ID_INEFFICIENT_PRESENT = 539,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_CONTENTION = 540,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_RESET = 541,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_RESET_BUNDLE = 542,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_CANNOT_RESET = 543,
-    D3D12_MESSAGE_ID_COMMAND_LIST_OPEN = 544,
-    D3D12_MESSAGE_ID_QUERY_STATE_MISMATCH = 545,
-    D3D12_MESSAGE_ID_INVALID_BUNDLE_API = 546,
-    D3D12_MESSAGE_ID_COMMAND_LIST_CLOSED = 547,
-    D3D12_MESSAGE_ID_COMMAND_LIST_CLOSED_WITH_INVALID_RESOURCE = 548,
-    D3D12_MESSAGE_ID_WRONG_COMMAND_ALLOCATOR_TYPE = 549,
-    D3D12_MESSAGE_ID_INVALID_INDIRECT_ARGUMENT_BUFFER = 550,
-    D3D12_MESSAGE_ID_COMPUTE_AND_GRAPHICS_PIPELINE = 551,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_SYNC = 552,
-    D3D12_MESSAGE_ID_COMMAND_LIST_SYNC = 553,
-    D3D12_MESSAGE_ID_SET_DESCRIPTOR_HEAP_INVALID = 554,
-    D3D12_MESSAGE_ID_CREATE_QUEUE_IMAGE_NOT_SUPPORTED = 555,
-    D3D12_MESSAGE_ID_CREATE_COMMAND_ALLOCATOR_IMAGE_NOT_SUPPORTED = 556,
-    D3D12_MESSAGE_ID_CREATE_COMMANDQUEUE = 557,
-    D3D12_MESSAGE_ID_CREATE_COMMANDALLOCATOR = 558,
-    D3D12_MESSAGE_ID_CREATE_PIPELINESTATE = 559,
-    D3D12_MESSAGE_ID_CREATE_COMMANDLIST12 = 560,
-    D3D12_MESSAGE_ID_CREATE_IMAGECOMMANDLIST = 561,
-    D3D12_MESSAGE_ID_CREATE_RESOURCE = 562,
-    D3D12_MESSAGE_ID_CREATE_DESCRIPTORHEAP = 563,
-    D3D12_MESSAGE_ID_CREATE_ROOTSIGNATURE = 564,
-    D3D12_MESSAGE_ID_CREATE_LIBRARY = 565,
-    D3D12_MESSAGE_ID_CREATE_HEAP = 566,
-    D3D12_MESSAGE_ID_CREATE_MONITOREDFENCE = 567,
-    D3D12_MESSAGE_ID_CREATE_QUERYHEAP = 568,
-    D3D12_MESSAGE_ID_CREATE_COMMANDSIGNATURE = 569,
-    D3D12_MESSAGE_ID_LIVE_COMMANDQUEUE = 570,
-    D3D12_MESSAGE_ID_LIVE_COMMANDALLOCATOR = 571,
-    D3D12_MESSAGE_ID_LIVE_PIPELINESTATE = 572,
-    D3D12_MESSAGE_ID_LIVE_COMMANDLIST12 = 573,
-    D3D12_MESSAGE_ID_LIVE_IMAGECOMMANDLIST = 574,
-    D3D12_MESSAGE_ID_LIVE_RESOURCE = 575,
-    D3D12_MESSAGE_ID_LIVE_DESCRIPTORHEAP = 576,
-    D3D12_MESSAGE_ID_LIVE_ROOTSIGNATURE = 577,
-    D3D12_MESSAGE_ID_LIVE_LIBRARY = 578,
-    D3D12_MESSAGE_ID_LIVE_HEAP = 579,
-    D3D12_MESSAGE_ID_LIVE_MONITOREDFENCE = 580,
-    D3D12_MESSAGE_ID_LIVE_QUERYHEAP = 581,
-    D3D12_MESSAGE_ID_LIVE_COMMANDSIGNATURE = 582,
-    D3D12_MESSAGE_ID_DESTROY_COMMANDQUEUE = 583,
-    D3D12_MESSAGE_ID_DESTROY_COMMANDALLOCATOR = 584,
-    D3D12_MESSAGE_ID_DESTROY_PIPELINESTATE = 585,
-    D3D12_MESSAGE_ID_DESTROY_COMMANDLIST12 = 586,
-    D3D12_MESSAGE_ID_DESTROY_IMAGECOMMANDLIST = 587,
-    D3D12_MESSAGE_ID_DESTROY_RESOURCE = 588,
-    D3D12_MESSAGE_ID_DESTROY_DESCRIPTORHEAP = 589,
-    D3D12_MESSAGE_ID_DESTROY_ROOTSIGNATURE = 590,
-    D3D12_MESSAGE_ID_DESTROY_LIBRARY = 591,
-    D3D12_MESSAGE_ID_DESTROY_HEAP = 592,
-    D3D12_MESSAGE_ID_DESTROY_MONITOREDFENCE = 593,
-    D3D12_MESSAGE_ID_DESTROY_QUERYHEAP = 594,
-    D3D12_MESSAGE_ID_DESTROY_COMMANDSIGNATURE = 595,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDHEAPTYPE = 596,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDIMENSIONS = 597,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDMISCFLAGS = 598,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDMISCFLAGS = 599,
-    D3D12_MESSAGE_ID_CREATERESOURCE_LARGEALLOCATION = 600,
-    D3D12_MESSAGE_ID_CREATERESOURCE_SMALLALLOCATION = 601,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDARG_RETURN = 602,
-    D3D12_MESSAGE_ID_CREATERESOURCE_OUTOFMEMORY_RETURN = 603,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDESC = 604,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDINITIALSTATE = 605,
-    D3D12_MESSAGE_ID_RESOURCE_HAS_PENDING_INITIAL_DATA = 606,
-    D3D12_MESSAGE_ID_POSSIBLY_INVALID_SUBRESOURCE_STATE = 607,
-    D3D12_MESSAGE_ID_INVALID_USE_OF_NON_RESIDENT_RESOURCE = 608,
-    D3D12_MESSAGE_ID_POSSIBLE_INVALID_USE_OF_NON_RESIDENT_RESOURCE = 609,
-    D3D12_MESSAGE_ID_BUNDLE_PIPELINE_STATE_MISMATCH = 610,
-    D3D12_MESSAGE_ID_PRIMITIVE_TOPOLOGY_MISMATCH_PIPELINE_STATE = 611,
-    D3D12_MESSAGE_ID_RENDER_TARGET_NUMBER_MISMATCH_PIPELINE_STATE = 612,
-    D3D12_MESSAGE_ID_RENDER_TARGET_FORMAT_MISMATCH_PIPELINE_STATE = 613,
-    D3D12_MESSAGE_ID_RENDER_TARGET_SAMPLE_DESC_MISMATCH_PIPELINE_STATE = 614,
-    D3D12_MESSAGE_ID_DEPTH_STENCIL_FORMAT_MISMATCH_PIPELINE_STATE = 615,
-    D3D12_MESSAGE_ID_DEPTH_STENCIL_SAMPLE_DESC_MISMATCH_PIPELINE_STATE = 616,
-    D3D12_MESSAGE_ID_RENDER_TARGET_NUMBER_MISMATCH_BUNDLE_PIPELINE_STATE = 617,
-    D3D12_MESSAGE_ID_RENDER_TARGET_FORMAT_MISMATCH_BUNDLE_PIPELINE_STATE = 618,
-    D3D12_MESSAGE_ID_RENDER_TARGET_SAMPLE_DESC_MISMATCH_BUNDLE_PIPELINE_STATE = 619,
-    D3D12_MESSAGE_ID_DEPTH_STENCIL_FORMAT_MISMATCH_BUNDLE_PIPELINE_STATE = 620,
-    D3D12_MESSAGE_ID_DEPTH_STENCIL_SAMPLE_DESC_MISMATCH_BUNDLE_PIPELINE_STATE = 621,
-    D3D12_MESSAGE_ID_CREATESHADER_INVALIDBYTECODE = 622,
-    D3D12_MESSAGE_ID_CREATEHEAP_NULLDESC = 623,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDSIZE = 624,
-    D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDHEAPTYPE = 625,
-    D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDCPUPAGEPROPERTIES = 626,
-    D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDMEMORYPOOL = 627,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDPROPERTIES = 628,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDALIGNMENT = 629,
-    D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDMISCFLAGS = 630,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDMISCFLAGS = 631,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDARG_RETURN = 632,
-    D3D12_MESSAGE_ID_CREATEHEAP_OUTOFMEMORY_RETURN = 633,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLHEAPPROPERTIES = 634,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDHEAPTYPE = 635,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDCPUPAGEPROPERTIES = 636,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDMEMORYPOOL = 637,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDHEAPPROPERTIES = 638,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDHEAPMISCFLAGS = 639,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDHEAPMISCFLAGS = 640,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDARG_RETURN = 641,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_OUTOFMEMORY_RETURN = 642,
-    D3D12_MESSAGE_ID_GETCUSTOMHEAPPROPERTIES_UNRECOGNIZEDHEAPTYPE = 643,
-    D3D12_MESSAGE_ID_GETCUSTOMHEAPPROPERTIES_INVALIDHEAPTYPE = 644,
-    D3D12_MESSAGE_ID_CREATE_DESCRIPTOR_HEAP_INVALID_DESC = 645,
-    D3D12_MESSAGE_ID_INVALID_DESCRIPTOR_HANDLE = 646,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALID_CONSERVATIVERASTERMODE = 647,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_INVALID_SYSTEMVALUE = 648,
-    D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_INVALID_RESOURCE = 649,
-    D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_INVALID_DESC = 650,
-    D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_LARGE_OFFSET = 651,
-    D3D12_MESSAGE_ID_CREATE_UNORDEREDACCESS_VIEW_INVALID_COUNTER_USAGE = 652,
-    D3D12_MESSAGE_ID_COPY_DESCRIPTORS_INVALID_RANGES = 653,
-    D3D12_MESSAGE_ID_COPY_DESCRIPTORS_WRITE_ONLY_DESCRIPTOR = 654,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RTV_FORMAT_NOT_UNKNOWN = 655,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_RENDER_TARGET_COUNT = 656,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VERTEX_SHADER_NOT_SET = 657,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INPUTLAYOUT_NOT_SET = 658,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_HS_DS_SIGNATURE_MISMATCH = 659,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_REGISTERINDEX = 660,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_COMPONENTTYPE = 661,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_REGISTERMASK = 662,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_SYSTEMVALUE = 663,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_NEVERWRITTEN_ALWAYSREADS = 664,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_MINPRECISION = 665,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_SEMANTICNAME_NOT_FOUND = 666,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_XOR_DS_MISMATCH = 667,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HULL_SHADER_INPUT_TOPOLOGY_MISMATCH = 668,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_DS_CONTROL_POINT_COUNT_MISMATCH = 669,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_DS_TESSELLATOR_DOMAIN_MISMATCH = 670,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_USE_OF_CENTER_MULTISAMPLE_PATTERN = 671,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_USE_OF_FORCED_SAMPLE_COUNT = 672,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_PRIMITIVETOPOLOGY = 673,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_SYSTEMVALUE = 674,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_DUAL_SOURCE_BLENDING_CAN_ONLY_HAVE_RENDER_TARGET_0 = 675,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_RENDER_TARGET_DOES_NOT_SUPPORT_BLENDING = 676,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_TYPE_MISMATCH = 677,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_RENDER_TARGET_DOES_NOT_SUPPORT_LOGIC_OPS = 678,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RENDERTARGETVIEW_NOT_SET = 679,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_DEPTHSTENCILVIEW_NOT_SET = 680,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_GS_INPUT_PRIMITIVE_MISMATCH = 681,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_POSITION_NOT_PRESENT = 682,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MISSING_ROOT_SIGNATURE_FLAGS = 683,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_INDEX_BUFFER_PROPERTIES = 684,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_SAMPLE_DESC = 685,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_ROOT_SIGNATURE_MISMATCH = 686,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_DS_ROOT_SIGNATURE_MISMATCH = 687,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VS_ROOT_SIGNATURE_MISMATCH = 688,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_GS_ROOT_SIGNATURE_MISMATCH = 689,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_ROOT_SIGNATURE_MISMATCH = 690,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MISSING_ROOT_SIGNATURE = 691,
-    D3D12_MESSAGE_ID_EXECUTE_BUNDLE_OPEN_BUNDLE = 692,
-    D3D12_MESSAGE_ID_EXECUTE_BUNDLE_DESCRIPTOR_HEAP_MISMATCH = 693,
-    D3D12_MESSAGE_ID_EXECUTE_BUNDLE_TYPE = 694,
-    D3D12_MESSAGE_ID_DRAW_EMPTY_SCISSOR_RECTANGLE = 695,
-    D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_BLOB_NOT_FOUND = 696,
-    D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_DESERIALIZE_FAILED = 697,
-    D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_INVALID_CONFIGURATION = 698,
-    D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_NOT_SUPPORTED_ON_DEVICE = 699,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLRESOURCEPROPERTIES = 700,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLHEAP = 701,
-    D3D12_MESSAGE_ID_GETRESOURCEALLOCATIONINFO_INVALIDRDESCS = 702,
-    D3D12_MESSAGE_ID_MAKERESIDENT_NULLOBJECTARRAY = 703,
-    D3D12_MESSAGE_ID_MAKERESIDENT_INVALIDOBJECT = 704,
-    D3D12_MESSAGE_ID_EVICT_NULLOBJECTARRAY = 705,
-    D3D12_MESSAGE_ID_EVICT_INVALIDOBJECT = 706,
-    D3D12_MESSAGE_ID_HEAPS_UNSUPPORTED = 707,
-    D3D12_MESSAGE_ID_SET_DESCRIPTOR_TABLE_INVALID = 708,
-    D3D12_MESSAGE_ID_SET_ROOT_CONSTANT_INVALID = 709,
-    D3D12_MESSAGE_ID_SET_ROOT_CONSTANT_BUFFER_VIEW_INVALID = 710,
-    D3D12_MESSAGE_ID_SET_ROOT_SHADER_RESOURCE_VIEW_INVALID = 711,
-    D3D12_MESSAGE_ID_SET_ROOT_UNORDERED_ACCESS_VIEW_INVALID = 712,
-    D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_INVALID_DESC = 713,
-    D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_LARGE_OFFSET = 714,
-    D3D12_MESSAGE_ID_SET_INDEX_BUFFER_INVALID_DESC = 715,
-    D3D12_MESSAGE_ID_SET_INDEX_BUFFER_LARGE_OFFSET = 716,
-    D3D12_MESSAGE_ID_SET_STREAM_OUTPUT_BUFFERS_INVALID_DESC = 717,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDDIMENSIONALITY = 718,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDLAYOUT = 719,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDIMENSIONALITY = 720,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDALIGNMENT = 721,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDMIPLEVELS = 722,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDSAMPLEDESC = 723,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDLAYOUT = 724,
-    D3D12_MESSAGE_ID_SET_INDEX_BUFFER_INVALID = 725,
-    D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_INVALID = 726,
-    D3D12_MESSAGE_ID_SET_STREAM_OUTPUT_BUFFERS_INVALID = 727,
-    D3D12_MESSAGE_ID_SET_RENDER_TARGETS_INVALID = 728,
-    D3D12_MESSAGE_ID_CREATEQUERY_HEAP_INVALID_PARAMETERS = 729,
-    D3D12_MESSAGE_ID_CREATEQUERY_HEAP_JPEG_NOT_SUPPORTED = 730,
-    D3D12_MESSAGE_ID_BEGIN_END_QUERY_INVALID_PARAMETERS = 731,
-    D3D12_MESSAGE_ID_CLOSE_COMMAND_LIST_OPEN_QUERY = 732,
-    D3D12_MESSAGE_ID_RESOLVE_QUERY_DATA_INVALID_PARAMETERS = 733,
-    D3D12_MESSAGE_ID_SET_PREDICATION_INVALID_PARAMETERS = 734,
-    D3D12_MESSAGE_ID_TIMESTAMPS_NOT_SUPPORTED = 735,
-    D3D12_MESSAGE_ID_UNSTABLE_POWER_STATE = 736,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDFORMAT = 737,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDFORMAT = 738,
-    D3D12_MESSAGE_ID_GETCOPYABLELAYOUT_INVALIDSUBRESOURCERANGE = 739,
-    D3D12_MESSAGE_ID_GETCOPYABLELAYOUT_INVALIDBASEOFFSET = 740,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_HEAP = 741,
-    D3D12_MESSAGE_ID_CREATE_SAMPLER_INVALID = 742,
-    D3D12_MESSAGE_ID_CREATECOMMANDSIGNATURE_INVALID = 743,
-    D3D12_MESSAGE_ID_EXECUTE_INDIRECT_INVALID_PARAMETERS = 744,
-    D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_RESOURCE_DIMENSION = 745,
-    D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_INVALIDCONTEXTTYPE = 746,
-    D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_DECODENOTSUPPORTED = 747,
-    D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_ENCODENOTSUPPORTED = 748,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANEINDEX = 749,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDVIDEOPLANEINDEX = 750,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_AMBIGUOUSVIDEOPLANEINDEX = 751,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDPLANEINDEX = 752,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDVIDEOPLANEINDEX = 753,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_AMBIGUOUSVIDEOPLANEINDEX = 754,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDPLANEINDEX = 755,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDVIDEOPLANEINDEX = 756,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_AMBIGUOUSVIDEOPLANEINDEX = 757,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDSCANDATAOFFSET = 758,
-    D3D12_MESSAGE_ID_JPEGDECODE_NOTSUPPORTED = 759,
-    D3D12_MESSAGE_ID_JPEGDECODE_DIMENSIONSTOOLARGE = 760,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDCOMPONENTS = 761,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDCOMPONENTS = 762,
-    D3D12_MESSAGE_ID_JPEGDECODE_DESTINATIONNOT2D = 763,
-    D3D12_MESSAGE_ID_JPEGDECODE_TILEDRESOURCESUNSUPPORTED = 764,
-    D3D12_MESSAGE_ID_JPEGDECODE_GUARDRECTSUNSUPPORTED = 765,
-    D3D12_MESSAGE_ID_JPEGDECODE_FORMATUNSUPPORTED = 766,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDSUBRESOURCE = 767,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDMIPLEVEL = 768,
-    D3D12_MESSAGE_ID_JPEGDECODE_EMPTYDESTBOX = 769,
-    D3D12_MESSAGE_ID_JPEGDECODE_DESTBOXNOT2D = 770,
-    D3D12_MESSAGE_ID_JPEGDECODE_DESTBOXNOTSUB = 771,
-    D3D12_MESSAGE_ID_JPEGDECODE_DESTBOXESINTERSECT = 772,
-    D3D12_MESSAGE_ID_JPEGDECODE_XSUBSAMPLEMISMATCH = 773,
-    D3D12_MESSAGE_ID_JPEGDECODE_YSUBSAMPLEMISMATCH = 774,
-    D3D12_MESSAGE_ID_JPEGDECODE_XSUBSAMPLEODD = 775,
-    D3D12_MESSAGE_ID_JPEGDECODE_YSUBSAMPLEODD = 776,
-    D3D12_MESSAGE_ID_JPEGDECODE_UPSCALEUNSUPPORTED = 777,
-    D3D12_MESSAGE_ID_JPEGDECODE_TIER4DOWNSCALETOLARGE = 778,
-    D3D12_MESSAGE_ID_JPEGDECODE_TIER3DOWNSCALEUNSUPPORTED = 779,
-    D3D12_MESSAGE_ID_JPEGDECODE_CHROMASIZEMISMATCH = 780,
-    D3D12_MESSAGE_ID_JPEGDECODE_LUMACHROMASIZEMISMATCH = 781,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDNUMDESTINATIONS = 782,
-    D3D12_MESSAGE_ID_JPEGDECODE_SUBBOXUNSUPPORTED = 783,
-    D3D12_MESSAGE_ID_JPEGDECODE_1DESTUNSUPPORTEDFORMAT = 784,
-    D3D12_MESSAGE_ID_JPEGDECODE_3DESTUNSUPPORTEDFORMAT = 785,
-    D3D12_MESSAGE_ID_JPEGDECODE_SCALEUNSUPPORTED = 786,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDSOURCESIZE = 787,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDCOPYFLAGS = 788,
-    D3D12_MESSAGE_ID_JPEGDECODE_HAZARD = 789,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDSRCBUFFERUSAGE = 790,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDSRCBUFFERMISCFLAGS = 791,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDDSTTEXTUREUSAGE = 792,
-    D3D12_MESSAGE_ID_JPEGDECODE_BACKBUFFERNOTSUPPORTED = 793,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPRTEDCOPYFLAGS = 794,
-    D3D12_MESSAGE_ID_JPEGENCODE_NOTSUPPORTED = 795,
-    D3D12_MESSAGE_ID_JPEGENCODE_INVALIDSCANDATAOFFSET = 796,
-    D3D12_MESSAGE_ID_JPEGENCODE_INVALIDCOMPONENTS = 797,
-    D3D12_MESSAGE_ID_JPEGENCODE_SOURCENOT2D = 798,
-    D3D12_MESSAGE_ID_JPEGENCODE_TILEDRESOURCESUNSUPPORTED = 799,
-    D3D12_MESSAGE_ID_JPEGENCODE_GUARDRECTSUNSUPPORTED = 800,
-    D3D12_MESSAGE_ID_JPEGENCODE_XSUBSAMPLEMISMATCH = 801,
-    D3D12_MESSAGE_ID_JPEGENCODE_YSUBSAMPLEMISMATCH = 802,
-    D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDCOMPONENTS = 803,
-    D3D12_MESSAGE_ID_JPEGENCODE_FORMATUNSUPPORTED = 804,
-    D3D12_MESSAGE_ID_JPEGENCODE_INVALIDSUBRESOURCE = 805,
-    D3D12_MESSAGE_ID_JPEGENCODE_INVALIDMIPLEVEL = 806,
-    D3D12_MESSAGE_ID_JPEGENCODE_DIMENSIONSTOOLARGE = 807,
-    D3D12_MESSAGE_ID_JPEGENCODE_HAZARD = 808,
-    D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDDSTBUFFERUSAGE = 809,
-    D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDDSTBUFFERMISCFLAGS = 810,
-    D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDSRCTEXTUREUSAGE = 811,
-    D3D12_MESSAGE_ID_JPEGENCODE_BACKBUFFERNOTSUPPORTED = 812,
-    D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_UNSUPPORTEDCONTEXTTTYPEFORQUERY = 813,
-    D3D12_MESSAGE_ID_FLUSH1_INVALIDCONTEXTTYPE = 814,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUE = 815,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDCLEARVALUEFORMAT = 816,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUEFORMAT = 817,
-    D3D12_MESSAGE_ID_CREATERESOURCE_CLEARVALUEDENORMFLUSH = 818,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_INVALIDDEPTH = 819,
-    D3D12_MESSAGE_ID_CLEARRENDERTARGETVIEW_MISMATCHINGCLEARVALUE = 820,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_MISMATCHINGCLEARVALUE = 821,
-    D3D12_MESSAGE_ID_MAP_INVALIDHEAP = 822,
-    D3D12_MESSAGE_ID_UNMAP_INVALIDHEAP = 823,
-    D3D12_MESSAGE_ID_MAP_INVALIDRESOURCE = 824,
-    D3D12_MESSAGE_ID_UNMAP_INVALIDRESOURCE = 825,
-    D3D12_MESSAGE_ID_MAP_INVALIDSUBRESOURCE = 826,
-    D3D12_MESSAGE_ID_UNMAP_INVALIDSUBRESOURCE = 827,
-    D3D12_MESSAGE_ID_MAP_INVALIDRANGE = 828,
-    D3D12_MESSAGE_ID_UNMAP_INVALIDRANGE = 829,
-    D3D12_MESSAGE_ID_MAP_NULLRANGE = 830,
-    D3D12_MESSAGE_ID_UNMAP_NULLRANGE = 831,
-    D3D12_MESSAGE_ID_MAP_INVALIDDATAPOINTER = 832,
-    D3D12_MESSAGE_ID_MAP_INVALIDARG_RETURN = 833,
-    D3D12_MESSAGE_ID_MAP_OUTOFMEMORY_RETURN = 834,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_BUNDLENOTSUPPORTED = 835,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_COMMANDLISTMISMATCH = 836,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_OPENCOMMANDLIST = 837,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_FAILEDCOMMANDLIST = 838,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_NULLDST = 839,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDDSTRESOURCEDIMENSION = 840,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_DSTRANGEOUTOFBOUNDS = 841,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_NULLSRC = 842,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDSRCRESOURCEDIMENSION = 843,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_SRCRANGEOUTOFBOUNDS = 844,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDCOPYFLAGS = 845,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_NULLDST = 846,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDDSTTYPE = 847,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTRESOURCEDIMENSION = 848,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTRESOURCE = 849,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTSUBRESOURCE = 850,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTOFFSET = 851,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDDSTFORMAT = 852,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTFORMAT = 853,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTDIMENSIONS = 854,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTROWPITCH = 855,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTPLACEMENT = 856,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTDSPLACEDFOOTPRINTFORMAT = 857,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_DSTREGIONOUTOFBOUNDS = 858,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_NULLSRC = 859,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDSRCTYPE = 860,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCRESOURCEDIMENSION = 861,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCRESOURCE = 862,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCSUBRESOURCE = 863,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCOFFSET = 864,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDSRCFORMAT = 865,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCFORMAT = 866,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCDIMENSIONS = 867,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCROWPITCH = 868,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCPLACEMENT = 869,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCDSPLACEDFOOTPRINTFORMAT = 870,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_SRCREGIONOUTOFBOUNDS = 871,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTCOORDINATES = 872,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCBOX = 873,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_FORMATMISMATCH = 874,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_EMPTYBOX = 875,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDCOPYFLAGS = 876,
-    D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_SUBRESOURCE_INDEX = 877,
-    D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_FORMAT = 878,
-    D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_MISMATCH = 879,
-    D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_SAMPLE_COUNT = 880,
-    D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_INVALID_SHADER = 881,
-    D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_CS_ROOT_SIGNATURE_MISMATCH = 882,
-    D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_MISSING_ROOT_SIGNATURE = 883,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALIDCACHEDBLOB = 884,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBADAPTERMISMATCH = 885,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBDRIVERVERSIONMISMATCH = 886,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBDESCMISMATCH = 887,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBIGNORED = 888,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDHEAP = 889,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDRESOURCE = 890,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDBOX = 891,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDSUBRESOURCE = 892,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_EMPTYBOX = 893,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDHEAP = 894,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDRESOURCE = 895,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDBOX = 896,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDSUBRESOURCE = 897,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_EMPTYBOX = 898,
-    D3D12_MESSAGE_ID_TOO_MANY_NODES_SPECIFIED = 899,
-    D3D12_MESSAGE_ID_INVALID_NODE_INDEX = 900,
-    D3D12_MESSAGE_ID_GETHEAPPROPERTIES_INVALIDRESOURCE = 901,
-    D3D12_MESSAGE_ID_NODE_MASK_MISMATCH = 902,
-    D3D12_MESSAGE_ID_COMMAND_LIST_OUTOFMEMORY = 903,
-    D3D12_MESSAGE_ID_COMMAND_LIST_MULTIPLE_SWAPCHAIN_BUFFER_REFERENCES = 904,
-    D3D12_MESSAGE_ID_COMMAND_LIST_TOO_MANY_SWAPCHAIN_REFERENCES = 905,
-    D3D12_MESSAGE_ID_COMMAND_QUEUE_TOO_MANY_SWAPCHAIN_REFERENCES = 906,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_WRONGSWAPCHAINBUFFERREFERENCE = 907,
-    D3D12_MESSAGE_ID_COMMAND_LIST_SETRENDERTARGETS_INVALIDNUMRENDERTARGETS = 908,
-    D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_TYPE = 909,
-    D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_FLAGS = 910,
-    D3D12_MESSAGE_ID_CREATESHAREDRESOURCE_INVALIDFLAGS = 911,
-    D3D12_MESSAGE_ID_CREATESHAREDRESOURCE_INVALIDFORMAT = 912,
-    D3D12_MESSAGE_ID_CREATESHAREDHEAP_INVALIDFLAGS = 913,
-    D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_UNRECOGNIZEDPROPERTIES = 914,
-    D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_INVALIDSIZE = 915,
-    D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_INVALIDOBJECT = 916,
-    D3D12_MESSAGE_ID_KEYEDMUTEX_INVALIDOBJECT = 917,
-    D3D12_MESSAGE_ID_KEYEDMUTEX_INVALIDKEY = 918,
-    D3D12_MESSAGE_ID_KEYEDMUTEX_WRONGSTATE = 919,
-    D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_PRIORITY = 920,
-    D3D12_MESSAGE_ID_OBJECT_DELETED_WHILE_STILL_IN_USE = 921,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALID_FLAGS = 922,
-    D3D12_MESSAGE_ID_HEAP_ADDRESS_RANGE_HAS_NO_RESOURCE = 923,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RENDER_TARGET_DELETED = 924,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_ALL_RENDER_TARGETS_HAVE_UNKNOWN_FORMAT = 925,
-    D3D12_MESSAGE_ID_HEAP_ADDRESS_RANGE_INTERSECTS_MULTIPLE_BUFFERS = 926,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_GPU_WRITTEN_READBACK_RESOURCE_MAPPED = 927,
-    D3D12_MESSAGE_ID_UNMAP_RANGE_NOT_NEEDED = 928,
-    D3D12_MESSAGE_ID_UNMAP_RANGE_NOT_EMPTY = 929,
-    D3D12_MESSAGE_ID_MAP_INVALID_NULLRANGE = 930,
-    D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE = 931,
-    D3D12_MESSAGE_ID_NO_GRAPHICS_API_SUPPORT = 932,
-    D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT = 933,
-    D3D12_MESSAGE_ID_D3D12_MESSAGES_END = 934,
-}}
-STRUCT!{struct D3D12_MESSAGE {
-    Category: D3D12_MESSAGE_CATEGORY,
-    Severity: D3D12_MESSAGE_SEVERITY,
-    ID: D3D12_MESSAGE_ID,
-    pDescription: *const ::c_char,
-    DescriptionByteLength: ::SIZE_T,
-}}
-STRUCT!{struct D3D12_INFO_QUEUE_FILTER_DESC {
-    NumCategories: ::UINT,
-    pCategoryList: *mut D3D12_MESSAGE_CATEGORY,
-    NumSeverities: ::UINT,
-    pSeverityList: *mut D3D12_MESSAGE_SEVERITY,
-    NumIDs: ::UINT,
-    pIDList: *mut D3D12_MESSAGE_ID,
-}}
-STRUCT!{struct D3D12_INFO_QUEUE_FILTER {
-    AllowList: D3D12_INFO_QUEUE_FILTER_DESC,
-    DenyList: D3D12_INFO_QUEUE_FILTER_DESC,
-}}
-pub const D3D12_INFO_QUEUE_DEFAULT_MESSAGE_COUNT_LIMIT: ::UINT = 1024;
-RIDL!{interface ID3D12InfoQueue(ID3D12InfoQueueVtbl): IUnknown(IUnknownVtbl) {
-    fn SetMessageCountLimit(&mut self, MessageCountLimit: ::UINT64) -> ::HRESULT,
-    fn ClearStoredMessages(&mut self) -> (),
-    fn GetMessage(
-        &mut self, MessageIndex: ::UINT64, pMessage: *mut ::D3D12_MESSAGE,
-        pMessageByteLength: *mut ::SIZE_T
-    ) -> ::HRESULT,
-    fn GetNumMessagesAllowedByStorageFilter(&mut self) -> ::UINT64,
-    fn GetNumMessagesDeniedByStorageFilter(&mut self) -> ::UINT64,
-    fn GetNumStoredMessages(&mut self) -> ::UINT64,
-    fn GetNumStoredMessagesAllowedByRetrievalFilter(&mut self) -> ::UINT64,
-    fn GetNumMessagesDiscardedByMessageCountLimit(&mut self) -> ::UINT64,
-    fn GetMessageCountLimit(&mut self) -> ::UINT64,
-    fn AddStorageFilterEntries(&mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER) -> ::HRESULT,
-    fn GetStorageFilter(
-        &mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER, pFilterByteLength: *mut ::SIZE_T
-    ) -> ::HRESULT,
-    fn ClearStorageFilter(&mut self) -> (),
-    fn PushEmptyStorageFilter(&mut self) -> ::HRESULT,
-    fn PushCopyOfStorageFilter(&mut self) -> ::HRESULT,
-    fn PushStorageFilter(&mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER) -> ::HRESULT,
-    fn PopStorageFilter(&mut self) -> (),
-    fn GetStorageFilterStackSize(&mut self) -> ::UINT,
-    fn AddRetrievalFilterEntries(&mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER) -> ::HRESULT,
-    fn GetRetrievalFilter(
-        &mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER, pFilterByteLength: *mut ::SIZE_T
-    ) -> ::HRESULT,
-    fn ClearRetrievalFilter(&mut self) -> (),
-    fn PushEmptyRetrievalFilter(&mut self) -> ::HRESULT,
-    fn PushCopyOfRetrievalFilter(&mut self) -> ::HRESULT,
-    fn PushRetrievalFilter(&mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER) -> ::HRESULT,
-    fn PopRetrievalFilter(&mut self) -> (),
-    fn GetRetrievalFilterStackSize(&mut self) -> ::UINT,
-    fn AddMessage(
-        &mut self, Category: ::D3D12_MESSAGE_CATEGORY, Severity: ::D3D12_MESSAGE_SEVERITY,
-        ID: ::D3D12_MESSAGE_ID, pDescription: ::LPCSTR
-    ) -> ::HRESULT,
-    fn AddApplicationMessage(
-        &mut self, Severity: ::D3D12_MESSAGE_SEVERITY, pDescription: ::LPCSTR
-    ) -> ::HRESULT,
-    fn SetBreakOnCategory(
-        &mut self, Category: ::D3D12_MESSAGE_CATEGORY, bEnable: ::BOOL
-    ) -> ::HRESULT,
-    fn SetBreakOnSeverity(
-        &mut self, Severity: ::D3D12_MESSAGE_SEVERITY, bEnable: ::BOOL
-    ) -> ::HRESULT,
-    fn SetBreakOnID(&mut self, ID: ::D3D12_MESSAGE_ID, bEnable: ::BOOL) -> ::HRESULT,
-    fn GetBreakOnCategory(&mut self, Category: ::D3D12_MESSAGE_CATEGORY) -> ::BOOL,
-    fn GetBreakOnSeverity(&mut self, Severity: ::D3D12_MESSAGE_SEVERITY) -> ::BOOL,
-    fn GetBreakOnID(&mut self, ID: ::D3D12_MESSAGE_ID) -> ::BOOL,
-    fn SetMuteDebugOutput(&mut self, bMute: ::BOOL) -> (),
-    fn GetMuteDebugOutput(&mut self) -> ::BOOL
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12shader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12shader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12shader.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d12shader.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,320 +0,0 @@
-// Copyright © 2016; Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-FLAGS!{ enum D3D12_SHADER_VERSION_TYPE {
-    D3D12_SHVER_PIXEL_SHADER = 0x0,
-    D3D12_SHVER_VERTEX_SHADER = 0x1,
-    D3D12_SHVER_GEOMETRY_SHADER = 0x2,
-    D3D12_SHVER_HULL_SHADER = 0x3,
-    D3D12_SHVER_DOMAIN_SHADER = 0x4,
-    D3D12_SHVER_COMPUTE_SHADER = 0x5,
-    D3D12_SHVER_RESERVED0 = 0xFFF0,
-}}
-
-STRUCT!{struct D3D12_FUNCTION_DESC {
-    Version: ::UINT,
-    Creator: ::LPCSTR,
-    Flags: ::UINT,
-    ConstantBuffers: ::UINT,
-    BoundResources: ::UINT,
-    InstructionCount: ::UINT,
-    TempRegisterCount: ::UINT,
-    TempArrayCount: ::UINT,
-    DefCount: ::UINT,
-    DclCount: ::UINT,
-    TextureNormalInstructions: ::UINT,
-    TextureLoadInstructions: ::UINT,
-    TextureCompInstructions: ::UINT,
-    TextureBiasInstructions: ::UINT,
-    TextureGradientInstructions: ::UINT,
-    FloatInstructionCount: ::UINT,
-    IntInstructionCount: ::UINT,
-    UintInstructionCount: ::UINT,
-    StaticFlowControlCount: ::UINT,
-    DynamicFlowControlCount: ::UINT,
-    MacroInstructionCount: ::UINT,
-    ArrayInstructionCount: ::UINT,
-    MovInstructionCount: ::UINT,
-    MovcInstructionCount: ::UINT,
-    ConversionInstructionCount: ::UINT,
-    BitwiseInstructionCount: ::UINT,
-    MinFeatureLevel: ::D3D_FEATURE_LEVEL,
-    RequiredFeatureFlags: ::UINT64,
-    Name: ::LPCSTR,
-    FunctionParameterCount: ::INT,
-    HasReturn: ::BOOL,
-    Has10Level9VertexShader: ::BOOL,
-    Has10Level9PixelShader: ::BOOL,
-}}
-
-STRUCT!{struct D3D12_LIBRARY_DESC {
-    Creator: ::LPCSTR,
-    Flags: ::UINT,
-    FunctionCount: ::UINT,
-}}
-
-STRUCT!{struct D3D12_PARAMETER_DESC {
-    Name: ::LPCSTR,
-    SemanticName: ::LPCSTR,
-    Type: ::D3D_SHADER_VARIABLE_TYPE,
-    Class: ::D3D_SHADER_VARIABLE_CLASS,
-    Rows: ::UINT,
-    Columns: ::UINT,
-    InterpolationMode: ::D3D_INTERPOLATION_MODE,
-    Flags: ::D3D_PARAMETER_FLAGS,
-    FirstInRegister: ::UINT,
-    FirstInComponent: ::UINT,
-    FirstOutRegister: ::UINT,
-    FirstOutComponent: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SHADER_BUFFER_DESC {
-    Name: ::LPCSTR,
-    Type: ::D3D_CBUFFER_TYPE,
-    Variables: ::UINT,
-    Size: ::UINT,
-    uFlags: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SHADER_DESC {
-    Version: ::UINT,
-    Creator: ::LPCSTR,
-    Flags: ::UINT,
-    ConstantBuffers: ::UINT,
-    BoundResources: ::UINT,
-    InputParameters: ::UINT,
-    OutputParameters: ::UINT,
-    InstructionCount: ::UINT,
-    TempRegisterCount: ::UINT,
-    TempArrayCount: ::UINT,
-    DefCount: ::UINT,
-    DclCount: ::UINT,
-    TextureNormalInstructions: ::UINT,
-    TextureLoadInstructions: ::UINT,
-    TextureCompInstructions: ::UINT,
-    TextureBiasInstructions: ::UINT,
-    TextureGradientInstructions: ::UINT,
-    FloatInstructionCount: ::UINT,
-    IntInstructionCount: ::UINT,
-    UintInstructionCount: ::UINT,
-    StaticFlowControlCount: ::UINT,
-    DynamicFlowControlCount: ::UINT,
-    MacroInstructionCount: ::UINT,
-    ArrayInstructionCount: ::UINT,
-    CutInstructionCount: ::UINT,
-    EmitInstructionCount: ::UINT,
-    GSOutputTopology: ::D3D_PRIMITIVE_TOPOLOGY,
-    GSMaxOutputVertexCount: ::UINT,
-    InputPrimitive: ::D3D_PRIMITIVE,
-    PatchConstantParameters: ::UINT,
-    cGSInstanceCount: ::UINT,
-    cControlPoints: ::UINT,
-    HSOutputPrimitive: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE,
-    HSPartitioning: ::D3D_TESSELLATOR_PARTITIONING,
-    TessellatorDomain: ::D3D_TESSELLATOR_DOMAIN,
-    cBarrierInstructions: ::UINT,
-    cInterlockedInstructions: ::UINT,
-    cTextureStoreInstructions: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SHADER_INPUT_BIND_DESC {
-    Name: ::LPCSTR,
-    Type: ::D3D_SHADER_INPUT_TYPE,
-    BindPoint: ::UINT,
-    BindCount: ::UINT,
-    uFlags: ::UINT,
-    ReturnType: ::D3D_RESOURCE_RETURN_TYPE,
-    Dimension: ::D3D_SRV_DIMENSION,
-    NumSamples: ::UINT,
-    Space: ::UINT,
-    uID: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SHADER_TYPE_DESC {
-    Class: ::D3D_SHADER_VARIABLE_CLASS,
-    Type: ::D3D_SHADER_VARIABLE_TYPE,
-    Rows: ::UINT,
-    Columns: ::UINT,
-    Elements: ::UINT,
-    Members: ::UINT,
-    Offset: ::UINT,
-    Name: ::LPCSTR,
-}}
-
-STRUCT!{struct D3D12_SHADER_VARIABLE_DESC {
-    Name: ::LPCSTR,
-    StartOffset: ::UINT,
-    Size: ::UINT,
-    uFlags: ::UINT,
-    DefaultValue: ::LPVOID,
-    StartTexture: ::UINT,
-    TextureSize: ::UINT,
-    StartSampler: ::UINT,
-    SamplerSize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SIGNATURE_PARAMETER_DESC {
-    SemanticName: ::LPCSTR,
-    SemanticIndex: ::UINT,
-    Register: ::UINT,
-    SystemValueType: ::D3D_NAME,
-    ComponentType: ::D3D_REGISTER_COMPONENT_TYPE,
-    Mask: ::BYTE,
-    ReadWriteMask: ::BYTE,
-    Stream: ::UINT,
-    MinPrecision: ::D3D_MIN_PRECISION,
-}}
-
-RIDL!(
-interface ID3D12FunctionParameterReflection(ID3D12FunctionParameterReflectionVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_PARAMETER_DESC) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12FunctionReflection(ID3D12FunctionReflectionVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_FUNCTION_DESC) -> ::HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, BufferIndex: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: ::UINT, pDesc: *mut ::D3D12_SHADER_INPUT_BIND_DESC
-    ) -> ::HRESULT,
-    fn GetVariableByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionVariable,
-    fn GetResourceBindingDescByName(
-        &mut self, Name: ::LPCSTR, pDesc: *mut ::D3D12_SHADER_INPUT_BIND_DESC
-    ) -> ::HRESULT,
-    fn GetFunctionParameter(
-        &mut self, ParameterIndex: ::INT
-    ) -> *mut ::ID3D12FunctionParameterReflection
-});
-
-RIDL!(
-interface ID3D12LibraryReflection(ID3D12LibraryReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn QueryInterface(
-        &mut self, iid: *const ::IID, ppv: *mut ::LPVOID
-    ) -> ::HRESULT,
-    fn AddRef(&mut self) -> ::ULONG,
-    fn Release(&mut self) -> ::ULONG,
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_LIBRARY_DESC) -> ::HRESULT,
-    fn GetFunctionByIndex(
-        &mut self, FunctionIndex: ::INT
-    ) -> *mut ::ID3D12FunctionReflection
-});
-
-RIDL!(
-interface ID3D12ShaderReflectionConstantBuffer(ID3D12ShaderReflectionConstantBufferVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_SHADER_BUFFER_DESC) -> ::HRESULT,
-    fn GetVariableByIndex(
-        &mut self, Index: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionVariable,
-    fn GetVariableByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionVariable
-});
-
-RIDL!(
-interface ID3D12ShaderReflectionType(ID3D12ShaderReflectionTypeVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_SHADER_TYPE_DESC) -> ::HRESULT,
-    fn GetMemberTypeByIndex(
-        &mut self, Index: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetMemberTypeByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetMemberTypeName(&mut self, Index: ::UINT) -> ::LPCSTR,
-    fn IsEqual(
-        &mut self, pType: *mut ::ID3D12ShaderReflectionType
-    ) -> ::HRESULT,
-    fn GetSubType(&mut self) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetBaseClass(&mut self) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetNumInterfaces(&mut self) -> ::UINT,
-    fn GetInterfaceByIndex(
-        &mut self, uIndex: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionType,
-    fn IsOfType(
-        &mut self, pType: *mut ::ID3D12ShaderReflectionType
-    ) -> ::HRESULT,
-    fn ImplementsInterface(
-        &mut self, pBase: *mut ::ID3D12ShaderReflectionType
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12ShaderReflectionVariable(ID3D12ShaderReflectionVariableVtbl) {
-    fn GetDesc(
-        &mut self, pDesc: *mut ::D3D12_SHADER_VARIABLE_DESC
-    ) -> ::HRESULT,
-    fn GetType(&mut self) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetBuffer(&mut self) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetInterfaceSlot(&mut self, uArrayIndex: ::UINT) -> ::UINT
-});
-
-RIDL!(
-interface ID3D12ShaderReflection(ID3D12ShaderReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn QueryInterface(
-        &mut self, iid: *const ::IID, ppv: *mut ::LPVOID
-    ) -> ::HRESULT,
-    fn AddRef(&mut self) -> ::ULONG,
-    fn Release(&mut self) -> ::ULONG,
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_SHADER_DESC) -> ::HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, Index: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: ::UINT, pDesc: *mut ::D3D12_SHADER_INPUT_BIND_DESC
-    ) -> ::HRESULT,
-    fn GetInputParameterDesc(
-        &mut self, ParameterIndex: ::UINT, pDesc: *mut ::D3D12_SIGNATURE_PARAMETER_DESC
-    ) -> ::HRESULT,
-    fn GetOutputParameterDesc(
-        &mut self, ParameterIndex: ::UINT, pDesc: *mut ::D3D12_SIGNATURE_PARAMETER_DESC
-    ) -> ::HRESULT,
-    fn GetPatchConstantParameterDesc(
-        &mut self, ParameterIndex: ::UINT, pDesc: *mut ::D3D12_SIGNATURE_PARAMETER_DESC
-    ) -> ::HRESULT,
-    fn GetVariableByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionVariable,
-    fn GetResourceBindingDescByName(
-        &mut self, Name: ::LPCSTR, pDesc: *mut ::D3D12_SHADER_INPUT_BIND_DESC
-    ) -> ::HRESULT,
-    fn GetMovInstructionCount(&mut self) -> ::UINT,
-    fn GetMovcInstructionCount(&mut self) -> ::UINT,
-    fn GetConversionInstructionCount(&mut self) -> ::UINT,
-    fn GetBitwiseInstructionCount(&mut self) -> ::UINT,
-    fn GetGSInputPrimitive(&mut self) -> ::D3D_PRIMITIVE,
-    fn IsSampleFrequencyShader(&mut self) -> ::BOOL,
-    fn GetNumInterfaceSlots(&mut self) -> ::UINT,
-    fn GetMinFeatureLevel(
-        &mut self, pLevel: *mut ::D3D_FEATURE_LEVEL
-    ) -> ::HRESULT,
-    fn GetThreadGroupSize(
-        &mut self, pSizeX: *mut ::UINT, pSizeY: *mut ::UINT, pSizeZ: *mut ::UINT
-    ) -> ::UINT,
-    fn GetRequiresFlags(&mut self) -> ::UINT64
-});
-
-pub type D3D12_CBUFFER_TYPE = ::D3D_CBUFFER_TYPE;
-pub type D3D12_RESOURCE_RETURN_TYPE = ::D3D_RESOURCE_RETURN_TYPE;
-pub type D3D12_TESSELLATOR_DOMAIN = ::D3D_TESSELLATOR_DOMAIN;
-pub type D3D12_TESSELLATOR_OUTPUT_PRIMITIVE = ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE;
-pub type D3D12_TESSELLATOR_PARTITIONING = ::D3D_TESSELLATOR_PARTITIONING;
-pub type LPD3D12FUNCTIONPARAMETERREFLECTION = *mut ::ID3D12FunctionParameterReflection;
-pub type LPD3D12FUNCTIONREFLECTION = *mut ::ID3D12FunctionReflection;
-pub type LPD3D12LIBRARYREFLECTION = *mut ::ID3D12LibraryReflection;
-pub type LPD3D12SHADERREFLECTION = *mut ::ID3D12ShaderReflection;
-pub type LPD3D12SHADERREFLECTIONCONSTANTBUFFER = *mut ::ID3D12ShaderReflectionConstantBuffer;
-pub type LPD3D12SHADERREFLECTIONTYPE = *mut ::ID3D12ShaderReflectionType;
-pub type LPD3D12SHADERREFLECTIONVARIABLE = *mut ::ID3D12ShaderReflectionVariable;
-pub const D3D_SHADER_REQUIRES_INNER_COVERAGE: ::UINT64 = 0x00000400;
-pub const D3D_SHADER_REQUIRES_ROVS: ::UINT64 = 0x00001000;
-pub const D3D_SHADER_REQUIRES_STENCIL_REF: ::UINT64 = 0x00000200;
-pub const D3D_SHADER_REQUIRES_TYPED_UAV_LOAD_ADDITIONAL_FORMATS: ::UINT64 = 0x00000800;
-pub const D3D_SHADER_REQUIRES_VIEWPORT_AND_RT_ARRAY_INDEX_FROM_ANY_SHADER_FEEDING_RASTERIZER: ::UINT64 = 0x00002000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9caps.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9caps.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9caps.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9caps.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,349 +0,0 @@
-// Copyright © 2015, Corey Richardson
-// Licensed under the MIT License <LICENSE.md>
-//! Direct3D capabilities include file
-STRUCT!{struct D3DVSHADERCAPS2_0 {
-    Caps: ::DWORD,
-    DynamicFlowControlDepth: ::INT,
-    NumTemps: ::INT,
-    StaticFlowControlDepth: ::INT,
-}}
-pub const D3DVS20CAPS_PREDICATION: ::DWORD = 1 << 0;
-pub const D3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH: ::DWORD = 24;
-pub const D3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH: ::DWORD = 0;
-pub const D3DVS20_MAX_NUMTEMPS: ::DWORD = 32;
-pub const D3DVS20_MIN_NUMTEMPS: ::DWORD = 12;
-pub const D3DVS20_MAX_STATICFLOWCONTROLDEPTH: ::DWORD = 4;
-pub const D3DVS20_MIN_STATICFLOWCONTROLDEPTH: ::DWORD = 1;
-STRUCT!{struct D3DPSHADERCAPS2_0 {
-    Caps: ::DWORD,
-    DynamicFlowControlDepth: ::INT,
-    NumTemps: ::INT,
-    StaticFlowControlDepth: ::INT,
-    NumInstructionSlots: ::INT,
-}}
-pub const D3DPS20CAPS_ARBITRARYSWIZZLE: ::DWORD = 1 << 0;
-pub const D3DPS20CAPS_GRADIENTINSTRUCTIONS: ::DWORD = 1 << 1;
-pub const D3DPS20CAPS_PREDICATION: ::DWORD = 1 << 2;
-pub const D3DPS20CAPS_NODEPENDENTREADLIMIT: ::DWORD = 1 << 3;
-pub const D3DPS20CAPS_NOTEXINSTRUCTIONLIMIT: ::DWORD = 1 << 4;
-pub const D3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH: ::DWORD = 24;
-pub const D3DPS20_MIN_DYNAMICFLOWCONTROLDEPTH: ::DWORD = 0;
-pub const D3DPS20_MAX_NUMTEMPS: ::DWORD = 32;
-pub const D3DPS20_MIN_NUMTEMPS: ::DWORD = 12;
-pub const D3DPS20_MAX_STATICFLOWCONTROLDEPTH: ::DWORD = 4;
-pub const D3DPS20_MIN_STATICFLOWCONTROLDEPTH: ::DWORD = 0;
-pub const D3DPS20_MAX_NUMINSTRUCTIONSLOTS: ::DWORD = 512;
-pub const D3DPS20_MIN_NUMINSTRUCTIONSLOTS: ::DWORD = 96;
-pub const D3DMIN30SHADERINSTRUCTIONS: ::DWORD = 512;
-pub const D3DMAX30SHADERINSTRUCTIONS: ::DWORD = 32768;
-STRUCT!{struct D3DOVERLAYCAPS {
-    Caps: ::UINT,
-    MaxOverlayDisplayWidth: ::UINT,
-    MaxOverlayDisplayHeight: ::UINT,
-}}
-pub const D3DOVERLAYCAPS_FULLRANGERGB: ::DWORD = 0x00000001;
-pub const D3DOVERLAYCAPS_LIMITEDRANGERGB: ::DWORD = 0x00000002;
-pub const D3DOVERLAYCAPS_YCbCr_BT601: ::DWORD = 0x00000004;
-pub const D3DOVERLAYCAPS_YCbCr_BT709: ::DWORD = 0x00000008;
-pub const D3DOVERLAYCAPS_YCbCr_BT601_xvYCC: ::DWORD = 0x00000010;
-pub const D3DOVERLAYCAPS_YCbCr_BT709_xvYCC: ::DWORD = 0x00000020;
-pub const D3DOVERLAYCAPS_STRETCHX: ::DWORD = 0x00000040;
-pub const D3DOVERLAYCAPS_STRETCHY: ::DWORD = 0x00000080;
-STRUCT!{struct D3DCONTENTPROTECTIONCAPS {
-    Caps: ::DWORD,
-    KeyExchangeType: ::GUID,
-    BufferAlignmentStart: ::UINT,
-    BlockAlignmentSize: ::UINT,
-    ProtectedMemorySize: ::ULONGLONG,
-}}
-pub const D3DCPCAPS_SOFTWARE: ::DWORD = 0x00000001;
-pub const D3DCPCAPS_HARDWARE: ::DWORD = 0x00000002;
-pub const D3DCPCAPS_PROTECTIONALWAYSON: ::DWORD = 0x00000004;
-pub const D3DCPCAPS_PARTIALDECRYPTION: ::DWORD = 0x00000008;
-pub const D3DCPCAPS_CONTENTKEY: ::DWORD = 0x00000010;
-pub const D3DCPCAPS_FRESHENSESSIONKEY: ::DWORD = 0x00000020;
-pub const D3DCPCAPS_ENCRYPTEDREADBACK: ::DWORD = 0x00000040;
-pub const D3DCPCAPS_ENCRYPTEDREADBACKKEY: ::DWORD = 0x00000080;
-pub const D3DCPCAPS_SEQUENTIAL_CTR_IV: ::DWORD = 0x00000100;
-pub const D3DCPCAPS_ENCRYPTSLICEDATAONLY: ::DWORD = 0x00000200;
-STRUCT!{struct D3DCAPS9 {
-    DeviceType: ::D3DDEVTYPE,
-    AdapterOrdinal: ::UINT,
-    Caps: ::DWORD,
-    Caps2: ::DWORD,
-    Caps3: ::DWORD,
-    PresentationIntervals: ::DWORD,
-    CursorCaps: ::DWORD,
-    DevCaps: ::DWORD,
-    PrimitiveMiscCaps: ::DWORD,
-    RasterCaps: ::DWORD,
-    ZCmpCaps: ::DWORD,
-    SrcBlendCaps: ::DWORD,
-    DestBlendCaps: ::DWORD,
-    AlphaCmpCaps: ::DWORD,
-    ShadeCaps: ::DWORD,
-    TextureCaps: ::DWORD,
-    TextureFilterCaps: ::DWORD,
-    CubeTextureFilterCaps: ::DWORD,
-    VolumeTextureFilterCaps: ::DWORD,
-    TextureAddressCaps: ::DWORD,
-    VolumeTextureAddressCaps: ::DWORD,
-    LineCaps: ::DWORD,
-    MaxTextureWidth: ::DWORD,
-    MaxTextureHeight: ::DWORD,
-    MaxVolumeExtent: ::DWORD,
-    MaxTextureRepeat: ::DWORD,
-    MaxTextureAspectRatio: ::DWORD,
-    MaxAnisotropy: ::DWORD,
-    MaxVertexW: ::c_float,
-    GuardBandLeft: ::c_float,
-    GuardBandTop: ::c_float,
-    GuardBandRight: ::c_float,
-    GuardBandBottom: ::c_float,
-    ExtentsAdjust: ::c_float,
-    StencilCaps: ::DWORD,
-    FVFCaps: ::DWORD,
-    TextureOpCaps: ::DWORD,
-    MaxTextureBlendStages: ::DWORD,
-    MaxSimultaneousTextures: ::DWORD,
-    VertexProcessingCaps: ::DWORD,
-    MaxActiveLights: ::DWORD,
-    MaxUserClipPlanes: ::DWORD,
-    MaxVertexBlendMatrices: ::DWORD,
-    MaxVertexBlendMatrixIndex: ::DWORD,
-    MaxPointSize: ::c_float,
-    MaxPrimitiveCount: ::DWORD,
-    MaxVertexIndex: ::DWORD,
-    MaxStreams: ::DWORD,
-    MaxStreamStride: ::DWORD,
-    VertexShaderVersion: ::DWORD,
-    MaxVertexShaderConst: ::DWORD,
-    PixelShaderVersion: ::DWORD,
-    PixelShader1xMaxValue: ::c_float,
-    DevCaps2: ::DWORD,
-    MaxNpatchTessellationLevel: ::c_float,
-    Reserved5: ::DWORD,
-    MasterAdapterOrdinal: ::UINT,
-    AdapterOrdinalInGroup: ::UINT,
-    NumberOfAdaptersInGroup: ::UINT,
-    DeclTypes: ::DWORD,
-    NumSimultaneousRTs: ::DWORD,
-    StretchRectFilterCaps: ::DWORD,
-    VS20Caps: ::D3DVSHADERCAPS2_0,
-    PS20Caps: ::D3DPSHADERCAPS2_0,
-    VertexTextureFilterCaps: ::DWORD,
-    MaxVShaderInstructionsExecuted: ::DWORD,
-    MaxPShaderInstructionsExecuted: ::DWORD,
-    MaxVertexShader30InstructionSlots: ::DWORD,
-    MaxPixelShader30InstructionSlots: ::DWORD,
-}}
-pub const D3DCAPS_OVERLAY: ::DWORD = 0x00000800;
-pub const D3DCAPS_READ_SCANLINE: ::DWORD = 0x00020000;
-pub const D3DCAPS2_FULLSCREENGAMMA: ::DWORD = 0x00020000;
-pub const D3DCAPS2_CANCALIBRATEGAMMA: ::DWORD = 0x00100000;
-pub const D3DCAPS2_RESERVED: ::DWORD = 0x02000000;
-pub const D3DCAPS2_CANMANAGERESOURCE: ::DWORD = 0x10000000;
-pub const D3DCAPS2_DYNAMICTEXTURES: ::DWORD = 0x20000000;
-pub const D3DCAPS2_CANAUTOGENMIPMAP: ::DWORD = 0x40000000;
-pub const D3DCAPS2_CANSHARERESOURCE: ::DWORD = 0x80000000;
-pub const D3DCAPS3_RESERVED: ::DWORD = 0x8000001f;
-pub const D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD: ::DWORD = 0x00000020;
-pub const D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION: ::DWORD = 0x00000080;
-pub const D3DCAPS3_COPY_TO_VIDMEM: ::DWORD = 0x00000100;
-pub const D3DCAPS3_COPY_TO_SYSTEMMEM: ::DWORD = 0x00000200;
-pub const D3DCAPS3_DXVAHD: ::DWORD = 0x00000400;
-pub const D3DCAPS3_DXVAHD_LIMITED: ::DWORD = 0x00000800;
-pub const D3DPRESENT_INTERVAL_DEFAULT: ::DWORD = 0x00000000;
-pub const D3DPRESENT_INTERVAL_ONE: ::DWORD = 0x00000001;
-pub const D3DPRESENT_INTERVAL_TWO: ::DWORD = 0x00000002;
-pub const D3DPRESENT_INTERVAL_THREE: ::DWORD = 0x00000004;
-pub const D3DPRESENT_INTERVAL_FOUR: ::DWORD = 0x00000008;
-pub const D3DPRESENT_INTERVAL_IMMEDIATE: ::DWORD = 0x80000000;
-pub const D3DCURSORCAPS_COLOR: ::DWORD = 0x00000001;
-pub const D3DCURSORCAPS_LOWRES: ::DWORD = 0x00000002;
-pub const D3DDEVCAPS_EXECUTESYSTEMMEMORY: ::DWORD = 0x00000010;
-pub const D3DDEVCAPS_EXECUTEVIDEOMEMORY: ::DWORD = 0x00000020;
-pub const D3DDEVCAPS_TLVERTEXSYSTEMMEMORY: ::DWORD = 0x00000040;
-pub const D3DDEVCAPS_TLVERTEXVIDEOMEMORY: ::DWORD = 0x00000080;
-pub const D3DDEVCAPS_TEXTURESYSTEMMEMORY: ::DWORD = 0x00000100;
-pub const D3DDEVCAPS_TEXTUREVIDEOMEMORY: ::DWORD = 0x00000200;
-pub const D3DDEVCAPS_DRAWPRIMTLVERTEX: ::DWORD = 0x00000400;
-pub const D3DDEVCAPS_CANRENDERAFTERFLIP: ::DWORD = 0x00000800;
-pub const D3DDEVCAPS_TEXTURENONLOCALVIDMEM: ::DWORD = 0x00001000;
-pub const D3DDEVCAPS_DRAWPRIMITIVES2: ::DWORD = 0x00002000;
-pub const D3DDEVCAPS_SEPARATETEXTUREMEMORIES: ::DWORD = 0x00004000;
-pub const D3DDEVCAPS_DRAWPRIMITIVES2EX: ::DWORD = 0x00008000;
-pub const D3DDEVCAPS_HWTRANSFORMANDLIGHT: ::DWORD = 0x00010000;
-pub const D3DDEVCAPS_CANBLTSYSTONONLOCAL: ::DWORD = 0x00020000;
-pub const D3DDEVCAPS_HWRASTERIZATION: ::DWORD = 0x00080000;
-pub const D3DDEVCAPS_PUREDEVICE: ::DWORD = 0x00100000;
-pub const D3DDEVCAPS_QUINTICRTPATCHES: ::DWORD = 0x00200000;
-pub const D3DDEVCAPS_RTPATCHES: ::DWORD = 0x00400000;
-pub const D3DDEVCAPS_RTPATCHHANDLEZERO: ::DWORD = 0x00800000;
-pub const D3DDEVCAPS_NPATCHES: ::DWORD = 0x01000000;
-pub const D3DPMISCCAPS_MASKZ: ::DWORD = 0x00000002;
-pub const D3DPMISCCAPS_CULLNONE: ::DWORD = 0x00000010;
-pub const D3DPMISCCAPS_CULLCW: ::DWORD = 0x00000020;
-pub const D3DPMISCCAPS_CULLCCW: ::DWORD = 0x00000040;
-pub const D3DPMISCCAPS_COLORWRITEENABLE: ::DWORD = 0x00000080;
-pub const D3DPMISCCAPS_CLIPPLANESCALEDPOINTS: ::DWORD = 0x00000100;
-pub const D3DPMISCCAPS_CLIPTLVERTS: ::DWORD = 0x00000200;
-pub const D3DPMISCCAPS_TSSARGTEMP: ::DWORD = 0x00000400;
-pub const D3DPMISCCAPS_BLENDOP: ::DWORD = 0x00000800;
-pub const D3DPMISCCAPS_NULLREFERENCE: ::DWORD = 0x00001000;
-pub const D3DPMISCCAPS_INDEPENDENTWRITEMASKS: ::DWORD = 0x00004000;
-pub const D3DPMISCCAPS_PERSTAGECONSTANT: ::DWORD = 0x00008000;
-pub const D3DPMISCCAPS_FOGANDSPECULARALPHA: ::DWORD = 0x00010000;
-pub const D3DPMISCCAPS_SEPARATEALPHABLEND: ::DWORD = 0x00020000;
-pub const D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS: ::DWORD = 0x00040000;
-pub const D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING: ::DWORD = 0x00080000;
-pub const D3DPMISCCAPS_FOGVERTEXCLAMPED: ::DWORD = 0x00100000;
-pub const D3DPMISCCAPS_POSTBLENDSRGBCONVERT: ::DWORD = 0x00200000;
-pub const D3DLINECAPS_TEXTURE: ::DWORD = 0x00000001;
-pub const D3DLINECAPS_ZTEST: ::DWORD = 0x00000002;
-pub const D3DLINECAPS_BLEND: ::DWORD = 0x00000004;
-pub const D3DLINECAPS_ALPHACMP: ::DWORD = 0x00000008;
-pub const D3DLINECAPS_FOG: ::DWORD = 0x00000010;
-pub const D3DLINECAPS_ANTIALIAS: ::DWORD = 0x00000020;
-pub const D3DPRASTERCAPS_DITHER: ::DWORD = 0x00000001;
-pub const D3DPRASTERCAPS_ZTEST: ::DWORD = 0x00000010;
-pub const D3DPRASTERCAPS_FOGVERTEX: ::DWORD = 0x00000080;
-pub const D3DPRASTERCAPS_FOGTABLE: ::DWORD = 0x00000100;
-pub const D3DPRASTERCAPS_MIPMAPLODBIAS: ::DWORD = 0x00002000;
-pub const D3DPRASTERCAPS_ZBUFFERLESSHSR: ::DWORD = 0x00008000;
-pub const D3DPRASTERCAPS_FOGRANGE: ::DWORD = 0x00010000;
-pub const D3DPRASTERCAPS_ANISOTROPY: ::DWORD = 0x00020000;
-pub const D3DPRASTERCAPS_WBUFFER: ::DWORD = 0x00040000;
-pub const D3DPRASTERCAPS_WFOG: ::DWORD = 0x00100000;
-pub const D3DPRASTERCAPS_ZFOG: ::DWORD = 0x00200000;
-pub const D3DPRASTERCAPS_COLORPERSPECTIVE: ::DWORD = 0x00400000;
-pub const D3DPRASTERCAPS_SCISSORTEST: ::DWORD = 0x01000000;
-pub const D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS: ::DWORD = 0x02000000;
-pub const D3DPRASTERCAPS_DEPTHBIAS: ::DWORD = 0x04000000;
-pub const D3DPRASTERCAPS_MULTISAMPLE_TOGGLE: ::DWORD = 0x08000000;
-pub const D3DPCMPCAPS_NEVER: ::DWORD = 0x00000001;
-pub const D3DPCMPCAPS_LESS: ::DWORD = 0x00000002;
-pub const D3DPCMPCAPS_EQUAL: ::DWORD = 0x00000004;
-pub const D3DPCMPCAPS_LESSEQUAL: ::DWORD = 0x00000008;
-pub const D3DPCMPCAPS_GREATER: ::DWORD = 0x00000010;
-pub const D3DPCMPCAPS_NOTEQUAL: ::DWORD = 0x00000020;
-pub const D3DPCMPCAPS_GREATEREQUAL: ::DWORD = 0x00000040;
-pub const D3DPCMPCAPS_ALWAYS: ::DWORD = 0x00000080;
-pub const D3DPBLENDCAPS_ZERO: ::DWORD = 0x00000001;
-pub const D3DPBLENDCAPS_ONE: ::DWORD = 0x00000002;
-pub const D3DPBLENDCAPS_SRCCOLOR: ::DWORD = 0x00000004;
-pub const D3DPBLENDCAPS_INVSRCCOLOR: ::DWORD = 0x00000008;
-pub const D3DPBLENDCAPS_SRCALPHA: ::DWORD = 0x00000010;
-pub const D3DPBLENDCAPS_INVSRCALPHA: ::DWORD = 0x00000020;
-pub const D3DPBLENDCAPS_DESTALPHA: ::DWORD = 0x00000040;
-pub const D3DPBLENDCAPS_INVDESTALPHA: ::DWORD = 0x00000080;
-pub const D3DPBLENDCAPS_DESTCOLOR: ::DWORD = 0x00000100;
-pub const D3DPBLENDCAPS_INVDESTCOLOR: ::DWORD = 0x00000200;
-pub const D3DPBLENDCAPS_SRCALPHASAT: ::DWORD = 0x00000400;
-pub const D3DPBLENDCAPS_BOTHSRCALPHA: ::DWORD = 0x00000800;
-pub const D3DPBLENDCAPS_BOTHINVSRCALPHA: ::DWORD = 0x00001000;
-pub const D3DPBLENDCAPS_BLENDFACTOR: ::DWORD = 0x00002000;
-pub const D3DPBLENDCAPS_SRCCOLOR2: ::DWORD = 0x00004000;
-pub const D3DPBLENDCAPS_INVSRCCOLOR2: ::DWORD = 0x00008000;
-pub const D3DPSHADECAPS_COLORGOURAUDRGB: ::DWORD = 0x00000008;
-pub const D3DPSHADECAPS_SPECULARGOURAUDRGB: ::DWORD = 0x00000200;
-pub const D3DPSHADECAPS_ALPHAGOURAUDBLEND: ::DWORD = 0x00004000;
-pub const D3DPSHADECAPS_FOGGOURAUD: ::DWORD = 0x00080000;
-pub const D3DPTEXTURECAPS_PERSPECTIVE: ::DWORD = 0x00000001;
-pub const D3DPTEXTURECAPS_POW2: ::DWORD = 0x00000002;
-pub const D3DPTEXTURECAPS_ALPHA: ::DWORD = 0x00000004;
-pub const D3DPTEXTURECAPS_SQUAREONLY: ::DWORD = 0x00000020;
-pub const D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE: ::DWORD = 0x00000040;
-pub const D3DPTEXTURECAPS_ALPHAPALETTE: ::DWORD = 0x00000080;
-pub const D3DPTEXTURECAPS_NONPOW2CONDITIONAL: ::DWORD = 0x00000100;
-pub const D3DPTEXTURECAPS_PROJECTED: ::DWORD = 0x00000400;
-pub const D3DPTEXTURECAPS_CUBEMAP: ::DWORD = 0x00000800;
-pub const D3DPTEXTURECAPS_VOLUMEMAP: ::DWORD = 0x00002000;
-pub const D3DPTEXTURECAPS_MIPMAP: ::DWORD = 0x00004000;
-pub const D3DPTEXTURECAPS_MIPVOLUMEMAP: ::DWORD = 0x00008000;
-pub const D3DPTEXTURECAPS_MIPCUBEMAP: ::DWORD = 0x00010000;
-pub const D3DPTEXTURECAPS_CUBEMAP_POW2: ::DWORD = 0x00020000;
-pub const D3DPTEXTURECAPS_VOLUMEMAP_POW2: ::DWORD = 0x00040000;
-pub const D3DPTEXTURECAPS_NOPROJECTEDBUMPENV: ::DWORD = 0x00200000;
-pub const D3DPTFILTERCAPS_MINFPOINT: ::DWORD = 0x00000100;
-pub const D3DPTFILTERCAPS_MINFLINEAR: ::DWORD = 0x00000200;
-pub const D3DPTFILTERCAPS_MINFANISOTROPIC: ::DWORD = 0x00000400;
-pub const D3DPTFILTERCAPS_MINFPYRAMIDALQUAD: ::DWORD = 0x00000800;
-pub const D3DPTFILTERCAPS_MINFGAUSSIANQUAD: ::DWORD = 0x00001000;
-pub const D3DPTFILTERCAPS_MIPFPOINT: ::DWORD = 0x00010000;
-pub const D3DPTFILTERCAPS_MIPFLINEAR: ::DWORD = 0x00020000;
-pub const D3DPTFILTERCAPS_CONVOLUTIONMONO: ::DWORD = 0x00040000;
-pub const D3DPTFILTERCAPS_MAGFPOINT: ::DWORD = 0x01000000;
-pub const D3DPTFILTERCAPS_MAGFLINEAR: ::DWORD = 0x02000000;
-pub const D3DPTFILTERCAPS_MAGFANISOTROPIC: ::DWORD = 0x04000000;
-pub const D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD: ::DWORD = 0x08000000;
-pub const D3DPTFILTERCAPS_MAGFGAUSSIANQUAD: ::DWORD = 0x10000000;
-pub const D3DPTADDRESSCAPS_WRAP: ::DWORD = 0x00000001;
-pub const D3DPTADDRESSCAPS_MIRROR: ::DWORD = 0x00000002;
-pub const D3DPTADDRESSCAPS_CLAMP: ::DWORD = 0x00000004;
-pub const D3DPTADDRESSCAPS_BORDER: ::DWORD = 0x00000008;
-pub const D3DPTADDRESSCAPS_INDEPENDENTUV: ::DWORD = 0x00000010;
-pub const D3DPTADDRESSCAPS_MIRRORONCE: ::DWORD = 0x00000020;
-pub const D3DSTENCILCAPS_KEEP: ::DWORD = 0x00000001;
-pub const D3DSTENCILCAPS_ZERO: ::DWORD = 0x00000002;
-pub const D3DSTENCILCAPS_REPLACE: ::DWORD = 0x00000004;
-pub const D3DSTENCILCAPS_INCRSAT: ::DWORD = 0x00000008;
-pub const D3DSTENCILCAPS_DECRSAT: ::DWORD = 0x00000010;
-pub const D3DSTENCILCAPS_INVERT: ::DWORD = 0x00000020;
-pub const D3DSTENCILCAPS_INCR: ::DWORD = 0x00000040;
-pub const D3DSTENCILCAPS_DECR: ::DWORD = 0x00000080;
-pub const D3DSTENCILCAPS_TWOSIDED: ::DWORD = 0x00000100;
-pub const D3DTEXOPCAPS_DISABLE: ::DWORD = 0x00000001;
-pub const D3DTEXOPCAPS_SELECTARG1: ::DWORD = 0x00000002;
-pub const D3DTEXOPCAPS_SELECTARG2: ::DWORD = 0x00000004;
-pub const D3DTEXOPCAPS_MODULATE: ::DWORD = 0x00000008;
-pub const D3DTEXOPCAPS_MODULATE2X: ::DWORD = 0x00000010;
-pub const D3DTEXOPCAPS_MODULATE4X: ::DWORD = 0x00000020;
-pub const D3DTEXOPCAPS_ADD: ::DWORD = 0x00000040;
-pub const D3DTEXOPCAPS_ADDSIGNED: ::DWORD = 0x00000080;
-pub const D3DTEXOPCAPS_ADDSIGNED2X: ::DWORD = 0x00000100;
-pub const D3DTEXOPCAPS_SUBTRACT: ::DWORD = 0x00000200;
-pub const D3DTEXOPCAPS_ADDSMOOTH: ::DWORD = 0x00000400;
-pub const D3DTEXOPCAPS_BLENDDIFFUSEALPHA: ::DWORD = 0x00000800;
-pub const D3DTEXOPCAPS_BLENDTEXTUREALPHA: ::DWORD = 0x00001000;
-pub const D3DTEXOPCAPS_BLENDFACTORALPHA: ::DWORD = 0x00002000;
-pub const D3DTEXOPCAPS_BLENDTEXTUREALPHAPM: ::DWORD = 0x00004000;
-pub const D3DTEXOPCAPS_BLENDCURRENTALPHA: ::DWORD = 0x00008000;
-pub const D3DTEXOPCAPS_PREMODULATE: ::DWORD = 0x00010000;
-pub const D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR: ::DWORD = 0x00020000;
-pub const D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA: ::DWORD = 0x00040000;
-pub const D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR: ::DWORD = 0x00080000;
-pub const D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA: ::DWORD = 0x00100000;
-pub const D3DTEXOPCAPS_BUMPENVMAP: ::DWORD = 0x00200000;
-pub const D3DTEXOPCAPS_BUMPENVMAPLUMINANCE: ::DWORD = 0x00400000;
-pub const D3DTEXOPCAPS_DOTPRODUCT3: ::DWORD = 0x00800000;
-pub const D3DTEXOPCAPS_MULTIPLYADD: ::DWORD = 0x01000000;
-pub const D3DTEXOPCAPS_LERP: ::DWORD = 0x02000000;
-pub const D3DFVFCAPS_TEXCOORDCOUNTMASK: ::DWORD = 0x0000ffff;
-pub const D3DFVFCAPS_DONOTSTRIPELEMENTS: ::DWORD = 0x00080000;
-pub const D3DFVFCAPS_PSIZE: ::DWORD = 0x00100000;
-pub const D3DVTXPCAPS_TEXGEN: ::DWORD = 0x00000001;
-pub const D3DVTXPCAPS_MATERIALSOURCE7: ::DWORD = 0x00000002;
-pub const D3DVTXPCAPS_DIRECTIONALLIGHTS: ::DWORD = 0x00000008;
-pub const D3DVTXPCAPS_POSITIONALLIGHTS: ::DWORD = 0x00000010;
-pub const D3DVTXPCAPS_LOCALVIEWER: ::DWORD = 0x00000020;
-pub const D3DVTXPCAPS_TWEENING: ::DWORD = 0x00000040;
-pub const D3DVTXPCAPS_TEXGEN_SPHEREMAP: ::DWORD = 0x00000100;
-pub const D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER: ::DWORD = 0x00000200;
-pub const D3DDEVCAPS2_STREAMOFFSET: ::DWORD = 0x00000001;
-pub const D3DDEVCAPS2_DMAPNPATCH: ::DWORD = 0x00000002;
-pub const D3DDEVCAPS2_ADAPTIVETESSRTPATCH: ::DWORD = 0x00000004;
-pub const D3DDEVCAPS2_ADAPTIVETESSNPATCH: ::DWORD = 0x00000008;
-pub const D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES: ::DWORD = 0x00000010;
-pub const D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH: ::DWORD = 0x00000020;
-pub const D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET: ::DWORD = 0x00000040;
-pub const D3DDTCAPS_UBYTE4: ::DWORD = 0x00000001;
-pub const D3DDTCAPS_UBYTE4N: ::DWORD = 0x00000002;
-pub const D3DDTCAPS_SHORT2N: ::DWORD = 0x00000004;
-pub const D3DDTCAPS_SHORT4N: ::DWORD = 0x00000008;
-pub const D3DDTCAPS_USHORT2N: ::DWORD = 0x00000010;
-pub const D3DDTCAPS_USHORT4N: ::DWORD = 0x00000020;
-pub const D3DDTCAPS_UDEC3: ::DWORD = 0x00000040;
-pub const D3DDTCAPS_DEC3N: ::DWORD = 0x00000080;
-pub const D3DDTCAPS_FLOAT16_2: ::DWORD = 0x00000100;
-pub const D3DDTCAPS_FLOAT16_4: ::DWORD = 0x00000200;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,713 +0,0 @@
-// Copyright © 2015, Corey Richardson
-// Licensed under the MIT License <LICENSE.md>
-//! Direct3D include file
-pub const D3D_SDK_VERSION: ::DWORD = 32;
-pub const D3D9b_SDK_VERSION: ::DWORD = 31;
-RIDL!(
-interface IDirect3D9(IDirect3D9Vtbl): IUnknown(IUnknownVtbl) {
-    fn RegisterSoftwareDevice(&mut self, pInitializeFunction: *mut ::VOID) -> ::HRESULT,
-    fn GetAdapterCount(&mut self) -> ::UINT,
-    fn GetAdapterIdentifier(
-        &mut self, Adapter: ::UINT, Flags: ::DWORD, pIdentifier: *mut ::D3DADAPTER_IDENTIFIER9
-    ) -> ::HRESULT,
-    fn GetAdapterModeCount(&mut self, Adapter: ::UINT, Format: ::D3DFORMAT) -> ::UINT,
-    fn EnumAdapterModes(
-        &mut self, Adapter: ::UINT, Format: ::D3DFORMAT, Mode: ::UINT, pMode: *mut ::D3DDISPLAYMODE
-    ) -> ::HRESULT,
-    fn GetAdapterDisplayMode(
-        &mut self, Adapter: ::UINT, pMode: *mut ::D3DDISPLAYMODE
-    ) -> ::HRESULT,
-    fn CheckDeviceType(
-        &mut self, Adapter: ::UINT, DevType: ::D3DDEVTYPE, AdapterFormat: ::D3DFORMAT,
-        BackBufferFormat: ::D3DFORMAT, bWindowed: ::BOOL
-    ) -> ::HRESULT,
-    fn CheckDeviceFormat(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, AdapterFormat: ::D3DFORMAT,
-        Usage: ::DWORD, RType: ::D3DRESOURCETYPE, CheckFormat: ::D3DFORMAT
-    ) -> ::HRESULT,
-    fn CheckDeviceMultiSampleType(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, SurfaceFormat: ::D3DFORMAT,
-        Windowed: ::BOOL, MultiSampleType: ::D3DMULTISAMPLE_TYPE, pQualityLevels: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn CheckDepthStencilMatch(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, AdapterFormat: ::D3DFORMAT,
-        RenderTargetFormat: ::D3DFORMAT, DepthStencilFormat: ::D3DFORMAT
-    ) -> ::HRESULT,
-    fn CheckDeviceFormatConversion(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, SourceFormat: ::D3DFORMAT,
-        TargetFormat: ::D3DFORMAT
-    ) -> ::HRESULT,
-    fn GetDeviceCaps(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, pCaps: *mut ::D3DCAPS9
-    ) -> ::HRESULT,
-    fn GetAdapterMonitor(&mut self, Adapter: ::UINT) -> ::HMONITOR,
-    fn CreateDevice(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, hFocusWindow: ::HWND,
-        BehaviorFlags: ::DWORD, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS,
-        ppReturnedDeviceInterface: *mut *mut IDirect3DDevice9
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3D9 = *mut IDirect3D9;
-pub type PDIRECT3D9 = *mut IDirect3D9;
-RIDL!(
-interface IDirect3DDevice9(IDirect3DDevice9Vtbl): IUnknown(IUnknownVtbl) {
-    fn TestCooperativeLevel(&mut self) -> ::HRESULT,
-    fn GetAvailableTextureMem(&mut self) -> ::UINT,
-    fn EvictManagedResources(&mut self) -> ::HRESULT,
-    fn GetDirect3D(&mut self, ppD3D9: *mut *mut IDirect3D9) -> ::HRESULT,
-    fn GetDeviceCaps(&mut self, pCaps: *mut ::D3DCAPS9) -> ::HRESULT,
-    fn GetDisplayMode(&mut self, iSwapChain: ::UINT, pMode: *mut ::D3DDISPLAYMODE) -> ::HRESULT,
-    fn GetCreationParameters(
-        &mut self, pParameters: *mut ::D3DDEVICE_CREATION_PARAMETERS
-    ) -> ::HRESULT,
-    fn SetCursorProperties(
-        &mut self, XHotSpot: ::UINT, YHotSpot: ::UINT, pCursorBitmap: *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn SetCursorPosition(&mut self, X: ::INT, Y: ::INT, Flags: ::DWORD) -> (),
-    fn ShowCursor(&mut self, bShow: ::BOOL) -> ::BOOL,
-    fn CreateAdditionalSwapChain(
-        &mut self, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS,
-        pSwapChain: *mut *mut IDirect3DSwapChain9
-    ) -> ::HRESULT,
-    fn GetSwapChain(
-        &mut self, iSwapChain: ::UINT, pSwapChain: *mut *mut IDirect3DSwapChain9
-    ) -> ::HRESULT,
-    fn GetNumberOfSwapChains(&mut self) -> ::UINT,
-    fn Reset(&mut self, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS) -> ::HRESULT,
-    fn Present(
-        &mut self, pSourceRect: *const ::RECT, pDestRect: *const ::RECT,
-        hDestWindowOverride: ::HWND, pDirtyRegion: *const ::RGNDATA
-    ) -> ::HRESULT,
-    fn GetBackBuffer(
-        &mut self, iSwapChain: ::UINT, iBackBuffer: ::UINT, Type: ::D3DBACKBUFFER_TYPE,
-        ppBackBuffer: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn GetRasterStatus(
-        &mut self, iSwapChain: ::UINT, pRasterStatus: *mut ::D3DRASTER_STATUS
-    ) -> ::HRESULT,
-    fn SetDialogBoxMode(&mut self, bEnableDialogs: ::BOOL) -> ::HRESULT,
-    fn SetGammaRamp(
-        &mut self, iSwapChain: ::UINT, Flags: ::DWORD, pRamp: *const ::D3DGAMMARAMP
-    ) -> (),
-    fn GetGammaRamp(&mut self, iSwapChain: ::UINT, pRamp: *mut ::D3DGAMMARAMP) -> (),
-    fn CreateTexture(
-        &mut self, Width: ::UINT, Height: ::UINT, Levels: ::UINT, Usage: ::DWORD,
-        Format: ::D3DFORMAT, Pool: ::D3DPOOL, ppTexture: *mut *mut IDirect3DTexture9,
-        pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateVolumeTexture(
-        &mut self, Width: ::UINT, Height: ::UINT, Depth: ::UINT, Levels: ::UINT, Usage: ::DWORD,
-        Format: ::D3DFORMAT, Pool: ::D3DPOOL, ppVolumeTexture: *mut *mut IDirect3DVolumeTexture9,
-        pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateCubeTexture(
-        &mut self, EdgeLength: ::UINT, Levels: ::UINT, Usage: ::DWORD, Format: ::D3DFORMAT,
-        Pool: ::D3DPOOL, ppCubeTexture: *mut *mut IDirect3DCubeTexture9,
-        pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateVertexBuffer(
-        &mut self, Length: ::UINT, Usage: ::DWORD, FVF: ::DWORD, Pool: ::D3DPOOL,
-        ppVertexBuffer: *mut *mut IDirect3DVertexBuffer9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateIndexBuffer(
-        &mut self, Length: ::UINT, Usage: ::DWORD, Format: ::D3DFORMAT, Pool: ::D3DPOOL,
-        ppIndexBuffer: *mut *mut IDirect3DIndexBuffer9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateRenderTarget(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT,
-        MultiSample: ::D3DMULTISAMPLE_TYPE, MultisampleQuality: ::DWORD, Lockable: ::BOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateDepthStencilSurface(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT,
-        MultiSample: ::D3DMULTISAMPLE_TYPE, MultisampleQuality: ::DWORD, Discard: ::BOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn UpdateSurface(
-        &mut self, pSourceSurface: *mut IDirect3DSurface9, pSourceRect: *const ::RECT,
-        pDestinationSurface: *mut IDirect3DSurface9, pDestPoint: *const ::POINT
-    ) -> ::HRESULT,
-    fn UpdateTexture(
-        &mut self, pSourceTexture: *mut IDirect3DBaseTexture9,
-        pDestinationTexture: *mut IDirect3DBaseTexture9
-    ) -> ::HRESULT,
-    fn GetRenderTargetData(
-        &mut self, pRenderTarget: *mut IDirect3DSurface9, pDestSurface: *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn GetFrontBufferData(
-        &mut self, iSwapChain: ::UINT, pDestSurface: *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn StretchRect(
-        &mut self, pSourceSurface: *mut IDirect3DSurface9, pSourceRect: *const ::RECT,
-        pDestSurface: *mut IDirect3DSurface9, pDestRect: *const ::RECT,
-        Filter: ::D3DTEXTUREFILTERTYPE
-    ) -> ::HRESULT,
-    fn ColorFill(
-        &mut self, pSurface: *mut IDirect3DSurface9, pRect: *const ::RECT, color: ::D3DCOLOR
-    ) -> ::HRESULT,
-    fn CreateOffscreenPlainSurface(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT, Pool: ::D3DPOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn SetRenderTarget(
-        &mut self, RenderTargetIndex: ::DWORD, pRenderTarget: *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn GetRenderTarget(
-        &mut self, RenderTargetIndex: ::DWORD, ppRenderTarget: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn SetDepthStencilSurface(&mut self, pNewZStencil: *mut IDirect3DSurface9) -> ::HRESULT,
-    fn GetDepthStencilSurface(
-        &mut self, ppZStencilSurface: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn BeginScene(&mut self) -> ::HRESULT,
-    fn EndScene(&mut self) -> ::HRESULT,
-    fn Clear(
-        &mut self, Count: ::DWORD, pRects: *const ::D3DRECT, Flags: ::DWORD, Color: ::D3DCOLOR,
-        Z: ::FLOAT, Stencil: ::DWORD
-    ) -> ::HRESULT,
-    fn SetTransform(
-        &mut self, State: ::D3DTRANSFORMSTATETYPE, pMatrix: *const ::D3DMATRIX
-    ) -> ::HRESULT,
-    fn GetTransform(
-        &mut self, State: ::D3DTRANSFORMSTATETYPE, pMatrix: *mut ::D3DMATRIX
-    ) -> ::HRESULT,
-    fn MultiplyTransform(
-        &mut self, arg1: ::D3DTRANSFORMSTATETYPE, arg2: *const ::D3DMATRIX
-    ) -> ::HRESULT,
-    fn SetViewport(&mut self, pViewport: *const ::D3DVIEWPORT9) -> ::HRESULT,
-    fn GetViewport(&mut self, pViewport: *mut ::D3DVIEWPORT9) -> ::HRESULT,
-    fn SetMaterial(&mut self, pMaterial: *const ::D3DMATERIAL9) -> ::HRESULT,
-    fn GetMaterial(&mut self, pMaterial: *mut ::D3DMATERIAL9) -> ::HRESULT,
-    fn SetLight(&mut self, Index: ::DWORD, arg1: *const ::D3DLIGHT9) -> ::HRESULT,
-    fn GetLight(&mut self, Index: ::DWORD, arg1: *mut ::D3DLIGHT9) -> ::HRESULT,
-    fn LightEnable(&mut self, Index: ::DWORD, Enable: ::BOOL) -> ::HRESULT,
-    fn GetLightEnable(&mut self, Index: ::DWORD, pEnable: *mut ::BOOL) -> ::HRESULT,
-    fn SetClipPlane(&mut self, Index: ::DWORD, pPlane: *const ::FLOAT) -> ::HRESULT,
-    fn GetClipPlane(&mut self, Index: ::DWORD, pPlane: *mut ::FLOAT) -> ::HRESULT,
-    fn SetRenderState(&mut self, State: ::D3DRENDERSTATETYPE, Value: ::DWORD) -> ::HRESULT,
-    fn GetRenderState(&mut self, State: ::D3DRENDERSTATETYPE, pValue: *mut ::DWORD) -> ::HRESULT,
-    fn CreateStateBlock(
-        &mut self, Type: ::D3DSTATEBLOCKTYPE, ppSB: *mut *mut IDirect3DStateBlock9
-    ) -> ::HRESULT,
-    fn BeginStateBlock(&mut self) -> ::HRESULT,
-    fn EndStateBlock(&mut self, ppSB: *mut *mut IDirect3DStateBlock9) -> ::HRESULT,
-    fn SetClipStatus(&mut self, pClipStatus: *const ::D3DCLIPSTATUS9) -> ::HRESULT,
-    fn GetClipStatus(&mut self, pClipStatus: *mut ::D3DCLIPSTATUS9) -> ::HRESULT,
-    fn GetTexture(
-        &mut self, Stage: ::DWORD, ppTexture: *mut *mut IDirect3DBaseTexture9
-    ) -> ::HRESULT,
-    fn SetTexture(&mut self, Stage: ::DWORD, pTexture: *mut IDirect3DBaseTexture9) -> ::HRESULT,
-    fn GetTextureStageState(
-        &mut self, Stage: ::DWORD, Type: ::D3DTEXTURESTAGESTATETYPE, pValue: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn SetTextureStageState(
-        &mut self, Stage: ::DWORD, Type: ::D3DTEXTURESTAGESTATETYPE, Value: ::DWORD
-    ) -> ::HRESULT,
-    fn GetSamplerState(
-        &mut self, Sampler: ::DWORD, Type: ::D3DSAMPLERSTATETYPE, pValue: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn SetSamplerState(
-        &mut self, Sampler: ::DWORD, Type: ::D3DSAMPLERSTATETYPE, Value: ::DWORD
-    ) -> ::HRESULT,
-    fn ValidateDevice(&mut self, pNumPasses: *mut ::DWORD) -> ::HRESULT,
-    fn SetPaletteEntries(
-        &mut self, PaletteNumber: ::UINT, pEntries: *const ::PALETTEENTRY
-    ) -> ::HRESULT,
-    fn GetPaletteEntries(
-        &mut self, PaletteNumber: ::UINT, pEntries: *mut ::PALETTEENTRY
-    ) -> ::HRESULT,
-    fn SetCurrentTexturePalette(&mut self, PaletteNumber: ::UINT) -> ::HRESULT,
-    fn GetCurrentTexturePalette(&mut self, PaletteNumber: *mut ::UINT) -> ::HRESULT,
-    fn SetScissorRect(&mut self, pRect: *const ::RECT) -> ::HRESULT,
-    fn GetScissorRect(&mut self, pRect: *mut ::RECT) -> ::HRESULT,
-    fn SetSoftwareVertexProcessing(&mut self, bSoftware: ::BOOL) -> ::HRESULT,
-    fn GetSoftwareVertexProcessing(&mut self) -> ::BOOL,
-    fn SetNPatchMode(&mut self, nSegments: ::FLOAT) -> ::HRESULT,
-    fn GetNPatchMode(&mut self) -> ::FLOAT,
-    fn DrawPrimitive(
-        &mut self, PrimitiveType: ::D3DPRIMITIVETYPE, StartVertex: ::UINT, PrimitiveCount: ::UINT
-    ) -> ::HRESULT,
-    fn DrawIndexedPrimitive(
-        &mut self, arg1: ::D3DPRIMITIVETYPE, BaseVertexIndex: ::INT, MinVertexIndex: ::UINT,
-        NumVertices: ::UINT, startIndex: ::UINT, primCount: ::UINT
-    ) -> ::HRESULT,
-    fn DrawPrimitiveUP(
-        &mut self, PrimitiveType: ::D3DPRIMITIVETYPE, PrimitiveCount: ::UINT,
-        pVertexStreamZeroData: *const ::VOID, VertexStreamZeroStride: ::UINT
-    ) -> ::HRESULT,
-    fn DrawIndexedPrimitiveUP(
-        &mut self, PrimitiveType: ::D3DPRIMITIVETYPE, MinVertexIndex: ::UINT, NumVertices: ::UINT,
-        PrimitiveCount: ::UINT, pIndexData: *const ::VOID, IndexDataFormat: ::D3DFORMAT,
-        pVertexStreamZeroData: *const ::VOID, VertexStreamZeroStride: ::UINT
-    ) -> ::HRESULT,
-    fn ProcessVertices(
-        &mut self, SrcStartIndex: ::UINT, DestIndex: ::UINT, VertexCount: ::UINT,
-        pDestBuffer: *mut IDirect3DVertexBuffer9, pVertexDecl: *mut IDirect3DVertexDeclaration9,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn CreateVertexDeclaration(
-        &mut self, pVertexElements: *const ::D3DVERTEXELEMENT9,
-        ppDecl: *mut *mut IDirect3DVertexDeclaration9
-    ) -> ::HRESULT,
-    fn SetVertexDeclaration(&mut self, pDecl: *mut IDirect3DVertexDeclaration9) -> ::HRESULT,
-    fn GetVertexDeclaration(&mut self, ppDecl: *mut *mut IDirect3DVertexDeclaration9) -> ::HRESULT,
-    fn SetFVF(&mut self, FVF: ::DWORD) -> ::HRESULT,
-    fn GetFVF(&mut self, pFVF: *mut ::DWORD) -> ::HRESULT,
-    fn CreateVertexShader(
-        &mut self, pFunction: *const ::DWORD, ppShader: *mut *mut IDirect3DVertexShader9
-    ) -> ::HRESULT,
-    fn SetVertexShader(&mut self, pShader: *mut IDirect3DVertexShader9) -> ::HRESULT,
-    fn GetVertexShader(&mut self, ppShader: *mut *mut IDirect3DVertexShader9) -> ::HRESULT,
-    fn SetVertexShaderConstantF(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::FLOAT, Vector4fCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetVertexShaderConstantF(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::FLOAT, Vector4fCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetVertexShaderConstantI(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::INT, Vector4iCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetVertexShaderConstantI(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::INT, Vector4iCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetVertexShaderConstantB(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::BOOL, BoolCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetVertexShaderConstantB(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::BOOL, BoolCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetStreamSource(
-        &mut self, StreamNumber: ::UINT, pStreamData: *mut IDirect3DVertexBuffer9,
-        OffsetInBytes: ::UINT, Stride: ::UINT
-    ) -> ::HRESULT,
-    fn GetStreamSource(
-        &mut self, StreamNumber: ::UINT, ppStreamData: *mut *mut IDirect3DVertexBuffer9,
-        pOffsetInBytes: *mut ::UINT, pStride: *mut ::UINT
-    ) -> ::HRESULT,
-    fn SetStreamSourceFreq(&mut self, StreamNumber: ::UINT, Setting: ::UINT) -> ::HRESULT,
-    fn GetStreamSourceFreq(&mut self, StreamNumber: ::UINT, pSetting: *mut ::UINT) -> ::HRESULT,
-    fn SetIndices(&mut self, pIndexData: *mut IDirect3DIndexBuffer9) -> ::HRESULT,
-    fn GetIndices(&mut self, ppIndexData: *mut *mut IDirect3DIndexBuffer9) -> ::HRESULT,
-    fn CreatePixelShader(
-        &mut self, pFunction: *const ::DWORD, ppShader: *mut *mut IDirect3DPixelShader9
-    ) -> ::HRESULT,
-    fn SetPixelShader(&mut self, pShader: *mut IDirect3DPixelShader9) -> ::HRESULT,
-    fn GetPixelShader(&mut self, ppShader: *mut *mut IDirect3DPixelShader9) -> ::HRESULT,
-    fn SetPixelShaderConstantF(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::FLOAT, Vector4fCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetPixelShaderConstantF(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::FLOAT, Vector4fCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetPixelShaderConstantI(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::INT, Vector4iCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetPixelShaderConstantI(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::INT, Vector4iCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetPixelShaderConstantB(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::BOOL, BoolCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetPixelShaderConstantB(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::BOOL, BoolCount: ::UINT
-    ) -> ::HRESULT,
-    fn DrawRectPatch(
-        &mut self, Handle: ::UINT, pNumSegs: *const ::FLOAT,
-        pRectPatchInfo: *const ::D3DRECTPATCH_INFO
-    ) -> ::HRESULT,
-    fn DrawTriPatch(
-        &mut self, Handle: ::UINT, pNumSegs: *const ::FLOAT,
-        pTriPatchInfo: *const ::D3DTRIPATCH_INFO
-    ) -> ::HRESULT,
-    fn DeletePatch(&mut self, Handle: ::UINT) -> ::HRESULT,
-    fn CreateQuery(
-        &mut self, Type: ::D3DQUERYTYPE, ppQuery: *mut *mut IDirect3DQuery9
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DDEVICE9 = *mut IDirect3DDevice9;
-pub type PDIRECT3DDEVICE9 = *mut IDirect3DDevice9;
-RIDL!(
-interface IDirect3DStateBlock9(IDirect3DStateBlock9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn Capture(&mut self) -> ::HRESULT,
-    fn Apply(&mut self) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DSTATEBLOCK9 = *mut IDirect3DStateBlock9;
-pub type PDIRECT3DSTATEBLOCK9 = *mut IDirect3DStateBlock9;
-RIDL!(
-interface IDirect3DSwapChain9(IDirect3DSwapChain9Vtbl): IUnknown(IUnknownVtbl) {
-    fn Present(
-        &mut self, pSourceRect: *const ::RECT, pDestRect: *const ::RECT,
-        hDestWindowOverride: ::HWND, pDirtyRegion: *const ::RGNDATA, dwFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn GetFrontBufferData(&mut self, pDestSurface: *mut IDirect3DSurface9) -> ::HRESULT,
-    fn GetBackBuffer(
-        &mut self, iBackBuffer: ::UINT, Type: ::D3DBACKBUFFER_TYPE,
-        ppBackBuffer: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn GetRasterStatus(&mut self, pRasterStatus: *mut ::D3DRASTER_STATUS) -> ::HRESULT,
-    fn GetDisplayMode(&mut self, pMode: *mut ::D3DDISPLAYMODE) -> ::HRESULT,
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetPresentParameters(
-        &mut self, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DSWAPCHAIN9 = *mut IDirect3DSwapChain9;
-pub type PDIRECT3DSWAPCHAIN9 = *mut IDirect3DSwapChain9;
-RIDL!(
-interface IDirect3DResource9(IDirect3DResource9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn SetPrivateData(
-        &mut self, refguid: *const ::GUID, pData: *const ::VOID, SizeOfData: ::DWORD,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn GetPrivateData(
-        &mut self, refguid: *const ::GUID, pData: *mut ::VOID, pSizeOfData: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn FreePrivateData(&mut self, refguid: *const ::GUID) -> ::HRESULT,
-    fn SetPriority(&mut self, PriorityNew: ::DWORD) -> ::DWORD,
-    fn GetPriority(&mut self) -> ::DWORD,
-    fn PreLoad(&mut self) -> (),
-    fn GetType(&mut self) -> ::D3DRESOURCETYPE
-}
-);
-pub type LPDIRECT3DRESOURCE9 = *mut IDirect3DResource9;
-pub type PDIRECT3DRESOURCE9 = *mut IDirect3DResource9;
-RIDL!(
-interface IDirect3DVertexDeclaration9(IDirect3DVertexDeclaration9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetDeclaration(
-        &mut self, pElement: *mut ::D3DVERTEXELEMENT9, pNumElements: *mut ::UINT
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVERTEXDECLARATION9 = *mut IDirect3DVertexDeclaration9;
-pub type PDIRECT3DVERTEXDECLARATION9 = *mut IDirect3DVertexDeclaration9;
-RIDL!(
-interface IDirect3DVertexShader9(IDirect3DVertexShader9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetFunction(&mut self, arg1: *mut ::VOID, pSizeOfData: *mut ::UINT) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVERTEXSHADER9 = *mut IDirect3DVertexShader9;
-pub type PDIRECT3DVERTEXSHADER9 = *mut IDirect3DVertexShader9;
-RIDL!(
-interface IDirect3DPixelShader9(IDirect3DPixelShader9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetFunction(&mut self, arg1: *mut ::VOID, pSizeOfData: *mut ::UINT) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DPIXELSHADER9 = *mut IDirect3DPixelShader9;
-pub type PDIRECT3DPIXELSHADER9 = *mut IDirect3DPixelShader9;
-RIDL!(
-interface IDirect3DBaseTexture9(IDirect3DBaseTexture9Vtbl): IDirect3DResource9(IDirect3DResource9Vtbl) {
-    fn SetLOD(&mut self, LODNew: ::DWORD) -> ::DWORD,
-    fn GetLOD(&mut self) -> ::DWORD,
-    fn GetLevelCount(&mut self) -> ::DWORD,
-    fn SetAutoGenFilterType(&mut self, FilterType: ::D3DTEXTUREFILTERTYPE) -> ::HRESULT,
-    fn GetAutoGenFilterType(&mut self) -> ::D3DTEXTUREFILTERTYPE,
-    fn GenerateMipSubLevels(&mut self) -> ()
-}
-);
-pub type LPDIRECT3DBASETEXTURE9 = *mut IDirect3DBaseTexture9;
-pub type PDIRECT3DBASETEXTURE9 = *mut IDirect3DBaseTexture9;
-RIDL!(
-interface IDirect3DTexture9(IDirect3DTexture9Vtbl): IDirect3DBaseTexture9(IDirect3DBaseTexture9Vtbl) {
-    fn GetLevelDesc(&mut self, Level: ::UINT, pDesc: *mut ::D3DSURFACE_DESC) -> ::HRESULT,
-    fn GetSurfaceLevel(
-        &mut self, Level: ::UINT, ppSurfaceLevel: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn LockRect(
-        &mut self, Level: ::UINT, pLockedRect: *mut ::D3DLOCKED_RECT, pRect: *const ::RECT,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockRect(&mut self, Level: ::UINT) -> ::HRESULT,
-    fn AddDirtyRect(&mut self, pDirtyRect: *const ::RECT) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DTEXTURE9 = *mut IDirect3DTexture9;
-pub type PDIRECT3DTEXTURE9 = *mut IDirect3DTexture9;
-RIDL!(
-interface IDirect3DVolumeTexture9(IDirect3DVolumeTexture9Vtbl): IDirect3DBaseTexture9(IDirect3DBaseTexture9Vtbl) {
-    fn GetLevelDesc(&mut self, Level: ::UINT, pDesc: *mut ::D3DVOLUME_DESC) -> ::HRESULT,
-    fn GetVolumeLevel(
-        &mut self, Level: ::UINT, ppVolumeLevel: *mut *mut IDirect3DVolume9
-    ) -> ::HRESULT,
-    fn LockBox(
-        &mut self, Level: ::UINT, pLockedVolume: *mut ::D3DLOCKED_BOX, pBox: *const ::D3DBOX,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockBox(&mut self, Level: ::UINT) -> ::HRESULT,
-    fn AddDirtyBox(&mut self, pDirtyBox: *const ::D3DBOX) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVOLUMETEXTURE9 = *mut IDirect3DVolumeTexture9;
-pub type PDIRECT3DVOLUMETEXTURE9 = *mut IDirect3DVolumeTexture9;
-RIDL!(
-interface IDirect3DCubeTexture9(IDirect3DCubeTexture9Vtbl): IDirect3DBaseTexture9(IDirect3DBaseTexture9Vtbl) {
-    fn GetLevelDesc(&mut self, Level: ::UINT, pDesc: *mut ::D3DSURFACE_DESC) -> ::HRESULT,
-    fn GetCubeMapSurface(
-        &mut self, FaceType: ::D3DCUBEMAP_FACES, Level: ::UINT,
-        ppCubeMapSurface: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn LockRect(
-        &mut self, FaceType: ::D3DCUBEMAP_FACES, Level: ::UINT, pLockedRect: *mut ::D3DLOCKED_RECT,
-        pRect: *const ::RECT, Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockRect(&mut self, FaceType: ::D3DCUBEMAP_FACES, Level: ::UINT) -> ::HRESULT,
-    fn AddDirtyRect(
-        &mut self, FaceType: ::D3DCUBEMAP_FACES, pDirtyRect: *const ::RECT
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DCUBETEXTURE9 = *mut IDirect3DCubeTexture9;
-pub type PDIRECT3DCUBETEXTURE9 = *mut IDirect3DCubeTexture9;
-RIDL!(
-interface IDirect3DVertexBuffer9(IDirect3DVertexBuffer9Vtbl): IDirect3DResource9(IDirect3DResource9Vtbl) {
-    fn Lock(
-        &mut self, OffsetToLock: ::UINT, SizeToLock: ::UINT, ppbData: *mut *mut ::VOID,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn Unlock(&mut self) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut ::D3DVERTEXBUFFER_DESC) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVERTEXBUFFER9 = *mut IDirect3DVertexBuffer9;
-pub type PDIRECT3DVERTEXBUFFER9 = *mut IDirect3DVertexBuffer9;
-RIDL!(
-interface IDirect3DIndexBuffer9(IDirect3DIndexBuffer9Vtbl): IDirect3DResource9(IDirect3DResource9Vtbl) {
-    fn Lock(
-        &mut self, OffsetToLock: ::UINT, SizeToLock: ::UINT, ppbData: *mut *mut ::VOID,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn Unlock(&mut self) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut ::D3DINDEXBUFFER_DESC) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DINDEXBUFFER9 = *mut IDirect3DIndexBuffer9;
-pub type PDIRECT3DINDEXBUFFER9 = *mut IDirect3DIndexBuffer9;
-RIDL!(
-interface IDirect3DSurface9(IDirect3DSurface9Vtbl): IDirect3DResource9(IDirect3DResource9Vtbl) {
-    fn GetContainer(&mut self, riid: *const ::IID, ppContainer: *mut *mut ::VOID) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut ::D3DSURFACE_DESC) -> ::HRESULT,
-    fn LockRect(
-        &mut self, pLockedRect: *mut ::D3DLOCKED_RECT, pRect: *const ::RECT, Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockRect(&mut self) -> ::HRESULT,
-    fn GetDC(&mut self, phdc: *mut ::HDC) -> ::HRESULT,
-    fn ReleaseDC(&mut self, hdc: ::HDC) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DSURFACE9 = *mut IDirect3DSurface9;
-pub type PDIRECT3DSURFACE9 = *mut IDirect3DSurface9;
-RIDL!(
-interface IDirect3DVolume9(IDirect3DVolume9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn SetPrivateData(
-        &mut self, refguid: *const ::GUID, pData: *const ::VOID, SizeOfData: ::DWORD,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn GetPrivateData(
-        &mut self, refguid: *const ::GUID, pData: *mut ::VOID, pSizeOfData: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn FreePrivateData(&mut self, refguid: *const ::GUID) -> ::HRESULT,
-    fn GetContainer(&mut self, riid: *const ::IID, ppContainer: *mut *mut ::VOID) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut ::D3DVOLUME_DESC) -> ::HRESULT,
-    fn LockBox(
-        &mut self, pLockedVolume: *mut ::D3DLOCKED_BOX, pBox: *const ::D3DBOX, Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockBox(&mut self) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVOLUME9 = *mut IDirect3DVolume9;
-pub type PDIRECT3DVOLUME9 = *mut IDirect3DVolume9;
-RIDL!(
-interface IDirect3DQuery9(IDirect3DQuery9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetType(&mut self) -> ::D3DRESOURCETYPE,
-    fn GetDataSize(&mut self) -> ::DWORD,
-    fn Issue(&mut self, dwIssueFlags: ::DWORD) -> ::HRESULT,
-    fn GetData(
-        &mut self, pData: *mut ::VOID, dwSize: ::DWORD, dwGetDataFlags: ::DWORD
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DQUERY9 = *mut IDirect3DQuery9;
-pub type PDIRECT3DQUERY9 = *mut IDirect3DQuery9;
-pub const D3DCREATE_FPU_PRESERVE: ::DWORD = 0x2;
-pub const D3DCREATE_MULTITHREADED: ::DWORD = 0x4;
-pub const D3DCREATE_PUREDEVICE: ::DWORD = 0x10;
-pub const D3DCREATE_SOFTWARE_VERTEXPROCESSING: ::DWORD = 0x20;
-pub const D3DCREATE_HARDWARE_VERTEXPROCESSING: ::DWORD = 0x40;
-pub const D3DCREATE_MIXED_VERTEXPROCESSING: ::DWORD = 0x80;
-pub const D3DCREATE_DISABLE_DRIVER_MANAGEMENT: ::DWORD = 0x100;
-pub const D3DCREATE_ADAPTERGROUP_DEVICE: ::DWORD = 0x200;
-pub const D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX: ::DWORD = 0x400;
-pub const D3DCREATE_NOWINDOWCHANGES: ::DWORD = 0x800;
-pub const D3DCREATE_DISABLE_PSGP_THREADING: ::DWORD = 0x2000;
-pub const D3DCREATE_ENABLE_PRESENTSTATS: ::DWORD = 0x4000;
-pub const D3DCREATE_DISABLE_PRESENTSTATS: ::DWORD = 0x8000;
-pub const D3DCREATE_SCREENSAVER: ::DWORD = 0x10000000;
-pub const D3DADAPTER_DEFAULT: ::DWORD = 0;
-RIDL!(
-interface IDirect3D9Ex(IDirect3D9ExVtbl): IDirect3D9(IDirect3D9Vtbl) {
-    fn GetAdapterModeCountEx(
-        &mut self, Adapter: ::UINT, pFilter: *const ::D3DDISPLAYMODEFILTER
-    ) -> ::UINT,
-    fn EnumAdapterModesEx(
-        &mut self, Adapter: ::UINT, pFilter: *const ::D3DDISPLAYMODEFILTER, Mode: ::UINT,
-        pMode: *mut ::D3DDISPLAYMODEEX
-    ) -> ::HRESULT,
-    fn GetAdapterDisplayModeEx(
-        &mut self, Adapter: ::UINT, pMode: *mut ::D3DDISPLAYMODEEX,
-        pRotation: *mut ::D3DDISPLAYROTATION
-    ) -> ::HRESULT,
-    fn CreateDeviceEx(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, hFocusWindow: ::HWND,
-        BehaviorFlags: ::DWORD, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS,
-        pFullscreenDisplayMode: *mut ::D3DDISPLAYMODEEX,
-        ppReturnedDeviceInterface: *mut *mut IDirect3DDevice9Ex
-    ) -> ::HRESULT,
-    fn GetAdapterLUID(&mut self, Adapter: ::UINT, pLUID: *mut ::LUID) -> ::HRESULT
-}
-);
-pub type LPDIRECT3D9EX = *mut IDirect3D9Ex;
-pub type PDIRECT3D9EX = *mut IDirect3D9Ex;
-RIDL!(
-interface IDirect3DDevice9Ex(IDirect3DDevice9ExVtbl): IDirect3DDevice9(IDirect3DDevice9Vtbl) {
-    fn SetConvolutionMonoKernel(
-        &mut self, width: ::UINT, height: ::UINT, rows: *mut ::FLOAT, columns: *mut ::FLOAT
-    ) -> ::HRESULT,
-    fn ComposeRects(
-        &mut self, pSrc: *mut IDirect3DSurface9, pDst: *mut IDirect3DSurface9,
-        pSrcRectDescs: *mut IDirect3DVertexBuffer9, NumRects: ::UINT,
-        pDstRectDescs: *mut IDirect3DVertexBuffer9, Operation: ::D3DCOMPOSERECTSOP, Xoffset: ::INT,
-        Yoffset: ::INT
-    ) -> ::HRESULT,
-    fn PresentEx(
-        &mut self, pSourceRect: *const ::RECT, pDestRect: *const ::RECT,
-        hDestWindowOverride: ::HWND, pDirtyRegion: *const ::RGNDATA, dwFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn GetGPUThreadPriority(&mut self, pPriority: *mut ::INT) -> ::HRESULT,
-    fn SetGPUThreadPriority(&mut self, Priority: ::INT) -> ::HRESULT,
-    fn WaitForVBlank(&mut self, iSwapChain: ::UINT) -> ::HRESULT,
-    fn CheckResourceResidency(
-        &mut self, pResourceArray: *mut *mut IDirect3DResource9, NumResources: ::UINT32
-    ) -> ::HRESULT,
-    fn SetMaximumFrameLatency(&mut self, MaxLatency: ::UINT) -> ::HRESULT,
-    fn GetMaximumFrameLatency(&mut self, pMaxLatency: *mut ::UINT) -> ::HRESULT,
-    fn CheckDeviceState(&mut self, hDestinationWindow: ::HWND) -> ::HRESULT,
-    fn CreateRenderTargetEx(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT,
-        MultiSample: ::D3DMULTISAMPLE_TYPE, MultisampleQuality: ::DWORD, Lockable: ::BOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE, Usage: ::DWORD
-    ) -> ::HRESULT,
-    fn CreateOffscreenPlainSurfaceEx(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT, Pool: ::D3DPOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE, Usage: ::DWORD
-    ) -> ::HRESULT,
-    fn CreateDepthStencilSurfaceEx(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT,
-        MultiSample: ::D3DMULTISAMPLE_TYPE, MultisampleQuality: ::DWORD, Discard: ::BOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE, Usage: ::DWORD
-    ) -> ::HRESULT,
-    fn ResetEx(
-        &mut self, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS,
-        pFullscreenDisplayMode: *mut ::D3DDISPLAYMODEEX
-    ) -> ::HRESULT,
-    fn GetDisplayModeEx(
-        &mut self, iSwapChain: ::UINT, pMode: *mut ::D3DDISPLAYMODEEX,
-        pRotation: *mut ::D3DDISPLAYROTATION
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DDEVICE9EX = *mut IDirect3DDevice9Ex;
-pub type PDIRECT3DDEVICE9EX = *mut IDirect3DDevice9Ex;
-RIDL!(
-interface IDirect3DSwapChain9Ex(IDirect3DSwapChain9ExVtbl): IDirect3DSwapChain9(IDirect3DSwapChain9Vtbl) {
-    fn GetLastPresentCount(&mut self, pLastPresentCount: *mut ::UINT) -> ::HRESULT,
-    fn GetPresentStats(&mut self, pPresentationStatistics: *mut ::D3DPRESENTSTATS) -> ::HRESULT,
-    fn GetDisplayModeEx(
-        &mut self, pMode: *mut ::D3DDISPLAYMODEEX, pRotation: *mut ::D3DDISPLAYROTATION
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DSWAPCHAIN9EX = *mut IDirect3DSwapChain9Ex;
-pub type PDIRECT3DSWAPCHAIN9EX = *mut IDirect3DSwapChain9Ex;
-RIDL!(
-interface IDirect3D9ExOverlayExtension(IDirect3D9ExOverlayExtensionVtbl): IUnknown(IUnknownVtbl) {
-    fn CheckDeviceOverlayType(
-        &mut self, Adapter: ::UINT, DevType: ::D3DDEVTYPE, OverlayWidth: ::UINT,
-        OverlayHeight: ::UINT, OverlayFormat: ::D3DFORMAT, pDisplayMode: *mut ::D3DDISPLAYMODEEX,
-        DisplayRotation: ::D3DDISPLAYROTATION, pOverlayCaps: *mut ::D3DOVERLAYCAPS
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3D9EXOVERLAYEXTENSION = *mut IDirect3D9ExOverlayExtension;
-pub type PDIRECT3D9EXOVERLAYEXTENSION = *mut IDirect3D9ExOverlayExtension;
-RIDL!(
-interface IDirect3DDevice9Video(IDirect3DDevice9VideoVtbl): IUnknown(IUnknownVtbl) {
-    fn GetContentProtectionCaps(
-        &mut self, pCryptoType: *const ::GUID, pDecodeProfile: *const ::GUID,
-        pCaps: *mut ::D3DCONTENTPROTECTIONCAPS
-    ) -> ::HRESULT,
-    fn CreateAuthenticatedChannel(
-        &mut self, ChannelType: ::D3DAUTHENTICATEDCHANNELTYPE,
-        ppAuthenticatedChannel: *mut *mut IDirect3DAuthenticatedChannel9,
-        pChannelHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateCryptoSession(
-        &mut self, pCryptoType: *const ::GUID, pDecodeProfile: *const ::GUID,
-        ppCryptoSession: *mut *mut IDirect3DCryptoSession9, pCryptoHandle: *mut ::HANDLE
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DDEVICE9VIDEO = *mut IDirect3DDevice9Video;
-pub type PDIRECT3DDEVICE9VIDEO = *mut IDirect3DDevice9Video;
-RIDL!(
-interface IDirect3DAuthenticatedChannel9(IDirect3DAuthenticatedChannel9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetCertificateSize(&mut self, pCertificateSize: *mut ::UINT) -> ::HRESULT,
-    fn GetCertificate(&mut self, CertifacteSize: ::UINT, ppCertificate: *mut ::BYTE) -> ::HRESULT,
-    fn NegotiateKeyExchange(&mut self, DataSize: ::UINT, pData: *mut ::VOID) -> ::HRESULT,
-    fn Query(
-        &mut self, InputSize: ::UINT, pInput: *const ::VOID, OutputSize: ::UINT,
-        pOutput: *mut ::VOID
-    ) -> ::HRESULT,
-    fn Configure(
-        &mut self, InputSize: ::UINT, pInput: *const ::VOID,
-        pOutput: *mut ::D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DAUTHENTICATEDCHANNEL9 = *mut IDirect3DAuthenticatedChannel9;
-pub type PDIRECT3DAUTHENTICATEDCHANNEL9 = *mut IDirect3DAuthenticatedChannel9;
-RIDL!(
-interface IDirect3DCryptoSession9(IDirect3DCryptoSession9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetCertificateSize(&mut self, pCertificateSize: *mut ::UINT) -> ::HRESULT,
-    fn GetCertificate(&mut self, CertifacteSize: ::UINT, ppCertificate: *mut ::BYTE) -> ::HRESULT,
-    fn NegotiateKeyExchange(&mut self, DataSize: ::UINT, pData: *mut ::VOID) -> ::HRESULT,
-    fn EncryptionBlt(
-        &mut self, pSrcSurface: *mut IDirect3DSurface9, pDstSurface: *mut IDirect3DSurface9,
-        DstSurfaceSize: ::UINT, pIV: *mut ::VOID
-    ) -> ::HRESULT,
-    fn DecryptionBlt(
-        &mut self, pSrcSurface: *mut IDirect3DSurface9, pDstSurface: *mut IDirect3DSurface9,
-        SrcSurfaceSize: ::UINT, pEncryptedBlockInfo: *mut ::D3DENCRYPTED_BLOCK_INFO,
-        pContentKey: *mut ::VOID, pIV: *mut ::VOID
-    ) -> ::HRESULT,
-    fn GetSurfacePitch(
-        &mut self, pSrcSurface: *mut IDirect3DSurface9, pSurfacePitch: *mut ::UINT
-    ) -> ::HRESULT,
-    fn StartSessionKeyRefresh(
-        &mut self, pRandomNumber: *mut ::VOID, RandomNumberSize: ::UINT
-    ) -> ::HRESULT,
-    fn FinishSessionKeyRefresh(&mut self) -> ::HRESULT,
-    fn GetEncryptionBltKey(&mut self, pReadbackKey: *mut ::VOID, KeySize: ::UINT) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DCRYPTOSESSION9 = *mut IDirect3DCryptoSession9;
-pub type PDIRECT3DCRYPTOSESSION9 = *mut IDirect3DCryptoSession9;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9types.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9types.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9types.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3d9types.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1397 +0,0 @@
-// Copyright © 2015, Corey Richardson
-// Licensed under the MIT License <LICENSE.md>
-//! Direct3D capabilities include file
-pub type D3DCOLOR = ::DWORD;
-STRUCT!{struct D3DVECTOR {
-    x: ::c_float,
-    y: ::c_float,
-    z: ::c_float,
-}}
-STRUCT!{struct D3DCOLORVALUE {
-    r: ::c_float,
-    g: ::c_float,
-    b: ::c_float,
-    a: ::c_float,
-}}
-STRUCT!{struct D3DRECT {
-    x1: ::LONG,
-    y1: ::LONG,
-    x2: ::LONG,
-    y2: ::LONG,
-}}
-STRUCT!{struct D3DMATRIX {
-    m: [[::c_float; 4]; 4],
-}}
-STRUCT!{struct D3DVIEWPORT9 {
-    X: ::DWORD,
-    Y: ::DWORD,
-    Width: ::DWORD,
-    Height: ::DWORD,
-    MinZ: ::c_float,
-    MaxZ: ::c_float,
-}}
-pub const D3DMAXUSERCLIPPLANES: ::DWORD = 32;
-pub const D3DCLIPPLANE0: ::DWORD = (1 << 0);
-pub const D3DCLIPPLANE1: ::DWORD = (1 << 1);
-pub const D3DCLIPPLANE2: ::DWORD = (1 << 2);
-pub const D3DCLIPPLANE3: ::DWORD = (1 << 3);
-pub const D3DCLIPPLANE4: ::DWORD = (1 << 4);
-pub const D3DCLIPPLANE5: ::DWORD = (1 << 5);
-pub const D3DCS_LEFT: ::DWORD = 0x00000001;
-pub const D3DCS_RIGHT: ::DWORD = 0x00000002;
-pub const D3DCS_TOP: ::DWORD = 0x00000004;
-pub const D3DCS_BOTTOM: ::DWORD = 0x00000008;
-pub const D3DCS_FRONT: ::DWORD = 0x00000010;
-pub const D3DCS_BACK: ::DWORD = 0x00000020;
-pub const D3DCS_PLANE0: ::DWORD = 0x00000040;
-pub const D3DCS_PLANE1: ::DWORD = 0x00000080;
-pub const D3DCS_PLANE2: ::DWORD = 0x00000100;
-pub const D3DCS_PLANE3: ::DWORD = 0x00000200;
-pub const D3DCS_PLANE4: ::DWORD = 0x00000400;
-pub const D3DCS_PLANE5: ::DWORD = 0x00000800;
-pub const D3DCS_ALL: ::DWORD = D3DCS_LEFT | D3DCS_RIGHT | D3DCS_TOP | D3DCS_BOTTOM | D3DCS_FRONT
-    | D3DCS_BACK | D3DCS_PLANE0 | D3DCS_PLANE1 | D3DCS_PLANE2 | D3DCS_PLANE3 | D3DCS_PLANE4
-    | D3DCS_PLANE5;
-STRUCT!{struct D3DCLIPSTATUS9 {
-    ClipUnion: ::DWORD,
-    ClipIntersection: ::DWORD,
-}}
-STRUCT!{struct D3DMATERIAL9 {
-    Diffuse: D3DCOLORVALUE,
-    Ambient: D3DCOLORVALUE,
-    Specular: D3DCOLORVALUE,
-    Emissive: D3DCOLORVALUE,
-    Power: ::c_float,
-}}
-ENUM!{enum D3DLIGHTTYPE {
-    D3DLIGHT_POINT = 1,
-    D3DLIGHT_SPOT = 2,
-    D3DLIGHT_DIRECTIONAL = 3,
-}}
-STRUCT!{struct D3DLIGHT9 {
-    Type: D3DLIGHTTYPE,
-    Diffuse: D3DCOLORVALUE,
-    Specular: D3DCOLORVALUE,
-    Ambient: D3DCOLORVALUE,
-    Position: D3DVECTOR,
-    Direction: D3DVECTOR,
-    Range: ::c_float,
-    Falloff: ::c_float,
-    Attenuation0: ::c_float,
-    Attenuation1: ::c_float,
-    Attenuation2: ::c_float,
-    Theta: ::c_float,
-    Phi: ::c_float,
-}}
-pub const D3DCLEAR_TARGET: ::DWORD = 0x1;
-pub const D3DCLEAR_ZBUFFER: ::DWORD = 0x2;
-pub const D3DCLEAR_STENCIL: ::DWORD = 0x4;
-ENUM!{enum D3DSHADEMODE {
-    D3DSHADE_FLAT = 1,
-    D3DSHADE_GOURAUD = 2,
-    D3DSHADE_PHONG = 3,
-}}
-ENUM!{enum D3DFILLMODE {
-    D3DFILL_POINT = 1,
-    D3DFILL_WIREFRAME = 2,
-    D3DFILL_SOLID = 3,
-}}
-ENUM!{enum D3DBLEND {
-    D3DBLEND_ZERO = 1,
-    D3DBLEND_ONE = 2,
-    D3DBLEND_SRCCOLOR = 3,
-    D3DBLEND_INVSRCCOLOR = 4,
-    D3DBLEND_SRCALPHA = 5,
-    D3DBLEND_INVSRCALPHA = 6,
-    D3DBLEND_DESTALPHA = 7,
-    D3DBLEND_INVDESTALPHA = 8,
-    D3DBLEND_DESTCOLOR = 9,
-    D3DBLEND_INVDESTCOLOR = 10,
-    D3DBLEND_SRCALPHASAT = 11,
-    D3DBLEND_BOTHSRCALPHA = 12,
-    D3DBLEND_BOTHINVSRCALPHA = 13,
-    D3DBLEND_BLENDFACTOR = 14,
-    D3DBLEND_INVBLENDFACTOR = 15,
-}}
-ENUM!{enum D3DBLENDOP {
-    D3DBLENDOP_ADD = 1,
-    D3DBLENDOP_SUBTRACT = 2,
-    D3DBLENDOP_REVSUBTRACT = 3,
-    D3DBLENDOP_MIN = 4,
-    D3DBLENDOP_MAX = 5,
-}}
-ENUM!{enum D3DTEXTUREADDRESS {
-    D3DTADDRESS_WRAP = 1,
-    D3DTADDRESS_MIRROR = 2,
-    D3DTADDRESS_CLAMP = 3,
-    D3DTADDRESS_BORDER = 4,
-    D3DTADDRESS_MIRRORONCE = 5,
-}}
-ENUM!{enum D3DCULL {
-    D3DCULL_NONE = 1,
-    D3DCULL_CW = 2,
-    D3DCULL_CCW = 3,
-}}
-ENUM!{enum D3DCMPFUNC {
-    D3DCMP_NEVER = 1,
-    D3DCMP_LESS = 2,
-    D3DCMP_EQUAL = 3,
-    D3DCMP_LESSEQUAL = 4,
-    D3DCMP_GREATER = 5,
-    D3DCMP_NOTEQUAL = 6,
-    D3DCMP_GREATEREQUAL = 7,
-    D3DCMP_ALWAYS = 8,
-}}
-ENUM!{enum D3DSTENCILOP {
-    D3DSTENCILOP_KEEP = 1,
-    D3DSTENCILOP_ZERO = 2,
-    D3DSTENCILOP_REPLACE = 3,
-    D3DSTENCILOP_INCRSAT = 4,
-    D3DSTENCILOP_DECRSAT = 5,
-    D3DSTENCILOP_INVERT = 6,
-    D3DSTENCILOP_INCR = 7,
-    D3DSTENCILOP_DECR = 8,
-}}
-ENUM!{enum D3DFOGMODE {
-    D3DFOG_NONE = 0,
-    D3DFOG_EXP = 1,
-    D3DFOG_EXP2 = 2,
-    D3DFOG_LINEAR = 3,
-}}
-ENUM!{enum D3DZBUFFERTYPE {
-    D3DZB_FALSE = 0,
-    D3DZB_TRUE = 1,
-    D3DZB_USEW = 2,
-}}
-ENUM!{enum D3DPRIMITIVETYPE {
-    D3DPT_POINTLIST = 1,
-    D3DPT_LINELIST = 2,
-    D3DPT_LINESTRIP = 3,
-    D3DPT_TRIANGLELIST = 4,
-    D3DPT_TRIANGLESTRIP = 5,
-    D3DPT_TRIANGLEFAN = 6,
-}}
-ENUM!{enum D3DTRANSFORMSTATETYPE {
-    D3DTS_VIEW = 2,
-    D3DTS_PROJECTION = 3,
-    D3DTS_TEXTURE0 = 16,
-    D3DTS_TEXTURE1 = 17,
-    D3DTS_TEXTURE2 = 18,
-    D3DTS_TEXTURE3 = 19,
-    D3DTS_TEXTURE4 = 20,
-    D3DTS_TEXTURE5 = 21,
-    D3DTS_TEXTURE6 = 22,
-    D3DTS_TEXTURE7 = 23,
-}}
-ENUM!{enum D3DRENDERSTATETYPE {
-    D3DRS_ZENABLE = 7,
-    D3DRS_FILLMODE = 8,
-    D3DRS_SHADEMODE = 9,
-    D3DRS_ZWRITEENABLE = 14,
-    D3DRS_ALPHATESTENABLE = 15,
-    D3DRS_LASTPIXEL = 16,
-    D3DRS_SRCBLEND = 19,
-    D3DRS_DESTBLEND = 20,
-    D3DRS_CULLMODE = 22,
-    D3DRS_ZFUNC = 23,
-    D3DRS_ALPHAREF = 24,
-    D3DRS_ALPHAFUNC = 25,
-    D3DRS_DITHERENABLE = 26,
-    D3DRS_ALPHABLENDENABLE = 27,
-    D3DRS_FOGENABLE = 28,
-    D3DRS_SPECULARENABLE = 29,
-    D3DRS_FOGCOLOR = 34,
-    D3DRS_FOGTABLEMODE = 35,
-    D3DRS_FOGSTART = 36,
-    D3DRS_FOGEND = 37,
-    D3DRS_FOGDENSITY = 38,
-    D3DRS_RANGEFOGENABLE = 48,
-    D3DRS_STENCILENABLE = 52,
-    D3DRS_STENCILFAIL = 53,
-    D3DRS_STENCILZFAIL = 54,
-    D3DRS_STENCILPASS = 55,
-    D3DRS_STENCILFUNC = 56,
-    D3DRS_STENCILREF = 57,
-    D3DRS_STENCILMASK = 58,
-    D3DRS_STENCILWRITEMASK = 59,
-    D3DRS_TEXTUREFACTOR = 60,
-    D3DRS_WRAP0 = 128,
-    D3DRS_WRAP1 = 129,
-    D3DRS_WRAP2 = 130,
-    D3DRS_WRAP3 = 131,
-    D3DRS_WRAP4 = 132,
-    D3DRS_WRAP5 = 133,
-    D3DRS_WRAP6 = 134,
-    D3DRS_WRAP7 = 135,
-    D3DRS_CLIPPING = 136,
-    D3DRS_LIGHTING = 137,
-    D3DRS_AMBIENT = 139,
-    D3DRS_FOGVERTEXMODE = 140,
-    D3DRS_COLORVERTEX = 141,
-    D3DRS_LOCALVIEWER = 142,
-    D3DRS_NORMALIZENORMALS = 143,
-    D3DRS_DIFFUSEMATERIALSOURCE = 145,
-    D3DRS_SPECULARMATERIALSOURCE = 146,
-    D3DRS_AMBIENTMATERIALSOURCE = 147,
-    D3DRS_EMISSIVEMATERIALSOURCE = 148,
-    D3DRS_VERTEXBLEND = 151,
-    D3DRS_CLIPPLANEENABLE = 152,
-    D3DRS_POINTSIZE = 154,
-    D3DRS_POINTSIZE_MIN = 155,
-    D3DRS_POINTSPRITEENABLE = 156,
-    D3DRS_POINTSCALEENABLE = 157,
-    D3DRS_POINTSCALE_A = 158,
-    D3DRS_POINTSCALE_B = 159,
-    D3DRS_POINTSCALE_C = 160,
-    D3DRS_MULTISAMPLEANTIALIAS = 161,
-    D3DRS_MULTISAMPLEMASK = 162,
-    D3DRS_PATCHEDGESTYLE = 163,
-    D3DRS_DEBUGMONITORTOKEN = 165,
-    D3DRS_POINTSIZE_MAX = 166,
-    D3DRS_INDEXEDVERTEXBLENDENABLE = 167,
-    D3DRS_COLORWRITEENABLE = 168,
-    D3DRS_TWEENFACTOR = 170,
-    D3DRS_BLENDOP = 171,
-    D3DRS_POSITIONDEGREE = 172,
-    D3DRS_NORMALDEGREE = 173,
-    D3DRS_SCISSORTESTENABLE = 174,
-    D3DRS_SLOPESCALEDEPTHBIAS = 175,
-    D3DRS_ANTIALIASEDLINEENABLE = 176,
-    D3DRS_MINTESSELLATIONLEVEL = 178,
-    D3DRS_MAXTESSELLATIONLEVEL = 179,
-    D3DRS_ADAPTIVETESS_X = 180,
-    D3DRS_ADAPTIVETESS_Y = 181,
-    D3DRS_ADAPTIVETESS_Z = 182,
-    D3DRS_ADAPTIVETESS_W = 183,
-    D3DRS_ENABLEADAPTIVETESSELLATION = 184,
-    D3DRS_TWOSIDEDSTENCILMODE = 185,
-    D3DRS_CCW_STENCILFAIL = 186,
-    D3DRS_CCW_STENCILZFAIL = 187,
-    D3DRS_CCW_STENCILPASS = 188,
-    D3DRS_CCW_STENCILFUNC = 189,
-    D3DRS_COLORWRITEENABLE1 = 190,
-    D3DRS_COLORWRITEENABLE2 = 191,
-    D3DRS_COLORWRITEENABLE3 = 192,
-    D3DRS_BLENDFACTOR = 193,
-    D3DRS_SRGBWRITEENABLE = 194,
-    D3DRS_DEPTHBIAS = 195,
-    D3DRS_WRAP8 = 198,
-    D3DRS_WRAP9 = 199,
-    D3DRS_WRAP10 = 200,
-    D3DRS_WRAP11 = 201,
-    D3DRS_WRAP12 = 202,
-    D3DRS_WRAP13 = 203,
-    D3DRS_WRAP14 = 204,
-    D3DRS_WRAP15 = 205,
-    D3DRS_SEPARATEALPHABLENDENABLE = 206,
-    D3DRS_SRCBLENDALPHA = 207,
-    D3DRS_DESTBLENDALPHA = 208,
-    D3DRS_BLENDOPALPHA = 209,
-}}
-pub const D3D_MAX_SIMULTANEOUS_RENDERTARGETS: ::DWORD = 4;
-ENUM!{enum D3DMATERIALCOLORSOURCE {
-    D3DMCS_MATERIAL = 0,
-    D3DMCS_COLOR1 = 1,
-    D3DMCS_COLOR2 = 2,
-}}
-pub const D3DRENDERSTATE_WRAPBIAS: ::DWORD = 128;
-pub const D3DWRAP_U: ::DWORD = 0x00000001;
-pub const D3DWRAP_V: ::DWORD = 0x00000002;
-pub const D3DWRAP_W: ::DWORD = 0x00000004;
-pub const D3DWRAPCOORD_0: ::DWORD = 0x00000001;
-pub const D3DWRAPCOORD_1: ::DWORD = 0x00000002;
-pub const D3DWRAPCOORD_2: ::DWORD = 0x00000004;
-pub const D3DWRAPCOORD_3: ::DWORD = 0x00000008;
-pub const D3DCOLORWRITEENABLE_RED: ::DWORD = 1 << 0;
-pub const D3DCOLORWRITEENABLE_GREEN: ::DWORD = 1 << 1;
-pub const D3DCOLORWRITEENABLE_BLUE: ::DWORD = 1 << 2;
-pub const D3DCOLORWRITEENABLE_ALPHA: ::DWORD = 1 << 3;
-ENUM!{enum D3DTEXTURESTAGESTATETYPE {
-    D3DTSS_COLOROP = 1,
-    D3DTSS_COLORARG1 = 2,
-    D3DTSS_COLORARG2 = 3,
-    D3DTSS_ALPHAOP = 4,
-    D3DTSS_ALPHAARG1 = 5,
-    D3DTSS_ALPHAARG2 = 6,
-    D3DTSS_BUMPENVMAT00 = 7,
-    D3DTSS_BUMPENVMAT01 = 8,
-    D3DTSS_BUMPENVMAT10 = 9,
-    D3DTSS_BUMPENVMAT11 = 10,
-    D3DTSS_TEXCOORDINDEX = 11,
-    D3DTSS_BUMPENVLSCALE = 22,
-    D3DTSS_BUMPENVLOFFSET = 23,
-    D3DTSS_TEXTURETRANSFORMFLAGS = 24,
-    D3DTSS_COLORARG0 = 26,
-    D3DTSS_ALPHAARG0 = 27,
-    D3DTSS_RESULTARG = 28,
-    D3DTSS_CONSTANT = 32,
-}}
-ENUM!{enum D3DSAMPLERSTATETYPE {
-    D3DSAMP_ADDRESSU = 1,
-    D3DSAMP_ADDRESSV = 2,
-    D3DSAMP_ADDRESSW = 3,
-    D3DSAMP_BORDERCOLOR = 4,
-    D3DSAMP_MAGFILTER = 5,
-    D3DSAMP_MINFILTER = 6,
-    D3DSAMP_MIPFILTER = 7,
-    D3DSAMP_MIPMAPLODBIAS = 8,
-    D3DSAMP_MAXMIPLEVEL = 9,
-    D3DSAMP_MAXANISOTROPY = 10,
-    D3DSAMP_SRGBTEXTURE = 11,
-    D3DSAMP_ELEMENTINDEX = 12,
-    D3DSAMP_DMAPOFFSET = 13,
-}}
-pub const D3DDMAPSAMPLER: ::DWORD = 256;
-pub const D3DVERTEXTEXTURESAMPLER0: ::DWORD = D3DDMAPSAMPLER + 1;
-pub const D3DVERTEXTEXTURESAMPLER1: ::DWORD = D3DDMAPSAMPLER + 2;
-pub const D3DVERTEXTEXTURESAMPLER2: ::DWORD = D3DDMAPSAMPLER + 3;
-pub const D3DVERTEXTEXTURESAMPLER3: ::DWORD = D3DDMAPSAMPLER + 4;
-pub const D3DTSS_TCI_PASSTHRU: ::DWORD = 0x00000000;
-pub const D3DTSS_TCI_CAMERASPACENORMAL: ::DWORD = 0x00010000;
-pub const D3DTSS_TCI_CAMERASPACEPOSITION: ::DWORD = 0x00020000;
-pub const D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR: ::DWORD = 0x00030000;
-pub const D3DTSS_TCI_SPHEREMAP: ::DWORD = 0x00040000;
-ENUM!{enum D3DTEXTUREOP {
-    D3DTOP_DISABLE = 1,
-    D3DTOP_SELECTARG1 = 2,
-    D3DTOP_SELECTARG2 = 3,
-    D3DTOP_MODULATE = 4,
-    D3DTOP_MODULATE2X = 5,
-    D3DTOP_MODULATE4X = 6,
-    D3DTOP_ADD = 7,
-    D3DTOP_ADDSIGNED = 8,
-    D3DTOP_ADDSIGNED2X = 9,
-    D3DTOP_SUBTRACT = 10,
-    D3DTOP_ADDSMOOTH = 11,
-    D3DTOP_BLENDDIFFUSEALPHA = 12,
-    D3DTOP_BLENDTEXTUREALPHA = 13,
-    D3DTOP_BLENDFACTORALPHA = 14,
-    D3DTOP_BLENDTEXTUREALPHAPM = 15,
-    D3DTOP_BLENDCURRENTALPHA = 16,
-    D3DTOP_PREMODULATE = 17,
-    D3DTOP_MODULATEALPHA_ADDCOLOR = 18,
-    D3DTOP_MODULATECOLOR_ADDALPHA = 19,
-    D3DTOP_MODULATEINVALPHA_ADDCOLOR = 20,
-    D3DTOP_MODULATEINVCOLOR_ADDALPHA = 21,
-    D3DTOP_BUMPENVMAP = 22,
-    D3DTOP_BUMPENVMAPLUMINANCE = 23,
-    D3DTOP_DOTPRODUCT3 = 24,
-    D3DTOP_MULTIPLYADD = 25,
-    D3DTOP_LERP = 26,
-}}
-pub const D3DTA_SELECTMASK: ::DWORD = 0x0000000f;
-pub const D3DTA_DIFFUSE: ::DWORD = 0x00000000;
-pub const D3DTA_CURRENT: ::DWORD = 0x00000001;
-pub const D3DTA_TEXTURE: ::DWORD = 0x00000002;
-pub const D3DTA_TFACTOR: ::DWORD = 0x00000003;
-pub const D3DTA_SPECULAR: ::DWORD = 0x00000004;
-pub const D3DTA_TEMP: ::DWORD = 0x00000005;
-pub const D3DTA_CONSTANT: ::DWORD = 0x00000006;
-pub const D3DTA_COMPLEMENT: ::DWORD = 0x00000010;
-pub const D3DTA_ALPHAREPLICATE: ::DWORD = 0x00000020;
-ENUM!{enum D3DTEXTUREFILTERTYPE {
-    D3DTEXF_NONE = 0,
-    D3DTEXF_POINT = 1,
-    D3DTEXF_LINEAR = 2,
-    D3DTEXF_ANISOTROPIC = 3,
-    D3DTEXF_PYRAMIDALQUAD = 6,
-    D3DTEXF_GAUSSIANQUAD = 7,
-    D3DTEXF_CONVOLUTIONMONO = 8,
-}}
-pub const D3DPV_DONOTCOPYDATA: ::DWORD = 1 << 0;
-pub const D3DFVF_RESERVED0: ::DWORD = 0x001;
-pub const D3DFVF_POSITION_MASK: ::DWORD = 0x400E;
-pub const D3DFVF_XYZ: ::DWORD = 0x002;
-pub const D3DFVF_XYZRHW: ::DWORD = 0x004;
-pub const D3DFVF_XYZB1: ::DWORD = 0x006;
-pub const D3DFVF_XYZB2: ::DWORD = 0x008;
-pub const D3DFVF_XYZB3: ::DWORD = 0x00a;
-pub const D3DFVF_XYZB4: ::DWORD = 0x00c;
-pub const D3DFVF_XYZB5: ::DWORD = 0x00e;
-pub const D3DFVF_XYZW: ::DWORD = 0x4002;
-pub const D3DFVF_NORMAL: ::DWORD = 0x010;
-pub const D3DFVF_PSIZE: ::DWORD = 0x020;
-pub const D3DFVF_DIFFUSE: ::DWORD = 0x040;
-pub const D3DFVF_SPECULAR: ::DWORD = 0x080;
-pub const D3DFVF_TEXCOUNT_MASK: ::DWORD = 0xf00;
-pub const D3DFVF_TEXCOUNT_SHIFT: ::DWORD = 8;
-pub const D3DFVF_TEX0: ::DWORD = 0x000;
-pub const D3DFVF_TEX1: ::DWORD = 0x100;
-pub const D3DFVF_TEX2: ::DWORD = 0x200;
-pub const D3DFVF_TEX3: ::DWORD = 0x300;
-pub const D3DFVF_TEX4: ::DWORD = 0x400;
-pub const D3DFVF_TEX5: ::DWORD = 0x500;
-pub const D3DFVF_TEX6: ::DWORD = 0x600;
-pub const D3DFVF_TEX7: ::DWORD = 0x700;
-pub const D3DFVF_TEX8: ::DWORD = 0x800;
-pub const D3DFVF_LASTBETA_UBYTE4: ::DWORD = 0x1000;
-pub const D3DFVF_LASTBETA_D3DCOLOR: ::DWORD = 0x8000;
-pub const D3DFVF_RESERVED2: ::DWORD = 0x6000;
-ENUM!{enum D3DDECLUSAGE {
-    D3DDECLUSAGE_POSITION = 0,
-    D3DDECLUSAGE_BLENDWEIGHT,
-    D3DDECLUSAGE_BLENDINDICES,
-    D3DDECLUSAGE_NORMAL,
-    D3DDECLUSAGE_PSIZE,
-    D3DDECLUSAGE_TEXCOORD,
-    D3DDECLUSAGE_TANGENT,
-    D3DDECLUSAGE_BINORMAL,
-    D3DDECLUSAGE_TESSFACTOR,
-    D3DDECLUSAGE_POSITIONT,
-    D3DDECLUSAGE_COLOR,
-    D3DDECLUSAGE_FOG,
-    D3DDECLUSAGE_DEPTH,
-    D3DDECLUSAGE_SAMPLE,
-}}
-pub const MAXD3DDECLUSAGE: D3DDECLUSAGE = D3DDECLUSAGE_SAMPLE;
-pub const MAXD3DDECLUSAGEINDEX: ::DWORD = 15;
-pub const MAXD3DDECLLENGTH: ::DWORD = 64;
-ENUM!{enum D3DDECLMETHOD {
-    D3DDECLMETHOD_DEFAULT = 0,
-    D3DDECLMETHOD_PARTIALU,
-    D3DDECLMETHOD_PARTIALV,
-    D3DDECLMETHOD_CROSSUV,
-    D3DDECLMETHOD_UV,
-    D3DDECLMETHOD_LOOKUP,
-    D3DDECLMETHOD_LOOKUPPRESAMPLED,
-}}
-pub const MAXD3DDECLMETHOD: D3DDECLMETHOD = D3DDECLMETHOD_LOOKUPPRESAMPLED;
-ENUM!{enum D3DDECLTYPE {
-    D3DDECLTYPE_FLOAT1 = 0,
-    D3DDECLTYPE_FLOAT2 = 1,
-    D3DDECLTYPE_FLOAT3 = 2,
-    D3DDECLTYPE_FLOAT4 = 3,
-    D3DDECLTYPE_D3DCOLOR = 4,
-    D3DDECLTYPE_UBYTE4 = 5,
-    D3DDECLTYPE_SHORT2 = 6,
-    D3DDECLTYPE_SHORT4 = 7,
-    D3DDECLTYPE_UBYTE4N = 8,
-    D3DDECLTYPE_SHORT2N = 9,
-    D3DDECLTYPE_SHORT4N = 10,
-    D3DDECLTYPE_USHORT2N = 11,
-    D3DDECLTYPE_USHORT4N = 12,
-    D3DDECLTYPE_UDEC3 = 13,
-    D3DDECLTYPE_DEC3N = 14,
-    D3DDECLTYPE_FLOAT16_2 = 15,
-    D3DDECLTYPE_FLOAT16_4 = 16,
-    D3DDECLTYPE_UNUSED = 17,
-}}
-pub const MAXD3DDECLTYPE: D3DDECLTYPE = D3DDECLTYPE_UNUSED;
-STRUCT!{struct D3DVERTEXELEMENT9 {
-    Stream: ::WORD,
-    Offset: ::WORD,
-    Type: ::BYTE,
-    Method: ::BYTE,
-    Usage: ::BYTE,
-    UsageIndex: ::BYTE,
-}}
-pub type LPD3DVERTEXELEMENT9 = *mut D3DVERTEXELEMENT9;
-pub const D3DDECL_END: D3DVERTEXELEMENT9 = D3DVERTEXELEMENT9 {
-    Stream: 0xFF,
-    Offset: 0,
-    Type: D3DDECLTYPE_UNUSED.0 as ::BYTE,
-    Method: 0,
-    Usage: 0,
-    UsageIndex: 0,
-};
-pub const D3DDP_MAXTEXCOORD: ::DWORD = 8;
-pub const D3DSTREAMSOURCE_INDEXEDDATA: ::DWORD = 1 << 30;
-pub const D3DSTREAMSOURCE_INSTANCEDATA: ::DWORD = 2 << 30;
-pub const D3DSI_OPCODE_MASK: ::DWORD = 0x0000FFFF;
-pub const D3DSI_INSTLENGTH_MASK: ::DWORD = 0x0F000000;
-pub const D3DSI_INSTLENGTH_SHIFT: ::DWORD = 24;
-ENUM!{enum D3DSHADER_INSTRUCTION_OPCODE_TYPE {
-    D3DSIO_NOP = 0,
-    D3DSIO_MOV = 1,
-    D3DSIO_ADD = 2,
-    D3DSIO_SUB = 3,
-    D3DSIO_MAD = 4,
-    D3DSIO_MUL = 5,
-    D3DSIO_RCP = 6,
-    D3DSIO_RSQ = 7,
-    D3DSIO_DP3 = 8,
-    D3DSIO_DP4 = 9,
-    D3DSIO_MIN = 10,
-    D3DSIO_MAX = 11,
-    D3DSIO_SLT = 12,
-    D3DSIO_SGE = 13,
-    D3DSIO_EXP = 14,
-    D3DSIO_LOG = 15,
-    D3DSIO_LIT = 16,
-    D3DSIO_DST = 17,
-    D3DSIO_LRP = 18,
-    D3DSIO_FRC = 18,
-    D3DSIO_M4x4 = 20,
-    D3DSIO_M4x3 = 21,
-    D3DSIO_M3x4 = 22,
-    D3DSIO_M3x3 = 23,
-    D3DSIO_M3x2 = 24,
-    D3DSIO_CALL = 25,
-    D3DSIO_CALLNZ = 26,
-    D3DSIO_LOOP = 27,
-    D3DSIO_RET = 28,
-    D3DSIO_ENDLOOP = 29,
-    D3DSIO_LABEL = 30,
-    D3DSIO_DCL = 31,
-    D3DSIO_POW = 32,
-    D3DSIO_CRS = 33,
-    D3DSIO_SGN = 34,
-    D3DSIO_ABS = 35,
-    D3DSIO_NRM = 36,
-    D3DSIO_SINCOS = 37,
-    D3DSIO_REP = 38,
-    D3DSIO_ENDREP = 39,
-    D3DSIO_IF = 40,
-    D3DSIO_IFC = 41,
-    D3DSIO_ELSE = 42,
-    D3DSIO_ENDIF = 43,
-    D3DSIO_BREAK = 44,
-    D3DSIO_BREAKC = 45,
-    D3DSIO_MOVA = 46,
-    D3DSIO_DEFB = 47,
-    D3DSIO_DEFI = 48,
-    D3DSIO_TEXCOORD = 64,
-    D3DSIO_TEXKILL = 65,
-    D3DSIO_TEX = 66,
-    D3DSIO_TEXBEM = 67,
-    D3DSIO_TEXBEML = 68,
-    D3DSIO_TEXREG2AR = 69,
-    D3DSIO_TEXREG2GB = 70,
-    D3DSIO_TEXM3x2PAD = 71,
-    D3DSIO_TEXM3x2TEX = 72,
-    D3DSIO_TEXM3x3PAD = 73,
-    D3DSIO_TEXM3x3TEX = 74,
-    D3DSIO_RESERVED0 = 75,
-    D3DSIO_TEXM3x3SPEC = 76,
-    D3DSIO_TEXM3x3VSPEC = 77,
-    D3DSIO_EXPP = 78,
-    D3DSIO_LOGP = 79,
-    D3DSIO_CND = 80,
-    D3DSIO_DEF = 81,
-    D3DSIO_TEXREG2RGB = 82,
-    D3DSIO_TEXDP3TEX = 83,
-    D3DSIO_TEXM3x2DEPTH = 84,
-    D3DSIO_TEXDP3 = 85,
-    D3DSIO_TEXM3x3 = 86,
-    D3DSIO_TEXDEPTH = 87,
-    D3DSIO_CMP = 88,
-    D3DSIO_BEM = 89,
-    D3DSIO_DP2ADD = 90,
-    D3DSIO_DSX = 91,
-    D3DSIO_DSY = 92,
-    D3DSIO_TEXLDD = 93,
-    D3DSIO_SETP = 94,
-    D3DSIO_TEXLDL = 95,
-    D3DSIO_BREAKP = 96,
-    D3DSIO_PHASE = 0xFFFD,
-    D3DSIO_COMMENT = 0xFFFE,
-    D3DSIO_END = 0xFFFF,
-}}
-pub const D3DSI_COISSUE: ::DWORD = 0x40000000;
-pub const D3DSP_OPCODESPECIFICCONTROL_MASK: ::DWORD = 0x00ff0000;
-pub const D3DSP_OPCODESPECIFICCONTROL_SHIFT: ::DWORD = 16;
-pub const D3DSI_TEXLD_PROJECT: ::DWORD = 0x01 << D3DSP_OPCODESPECIFICCONTROL_SHIFT;
-pub const D3DSI_TEXLD_BIAS: ::DWORD = 0x02 << D3DSP_OPCODESPECIFICCONTROL_SHIFT;
-ENUM!{enum D3DSHADER_COMPARISON {
-    D3DSPC_RESERVED0 = 0,
-    D3DSPC_GT = 1,
-    D3DSPC_EQ = 2,
-    D3DSPC_GE = 3,
-    D3DSPC_LT = 4,
-    D3DSPC_NE = 5,
-    D3DSPC_LE = 6,
-    D3DSPC_RESERVED1 = 7,
-}}
-pub const D3DSHADER_COMPARISON_SHIFT: ::DWORD = D3DSP_OPCODESPECIFICCONTROL_SHIFT;
-pub const D3DSHADER_COMPARISON_MASK: ::DWORD = 0x7 << D3DSHADER_COMPARISON_SHIFT;
-pub const D3DSHADER_INSTRUCTION_PREDICATED: ::DWORD = 0x1 << 28;
-pub const D3DSP_DCL_USAGE_SHIFT: ::DWORD = 0;
-pub const D3DSP_DCL_USAGE_MASK: ::DWORD = 0x0000000f;
-pub const D3DSP_DCL_USAGEINDEX_SHIFT: ::DWORD = 16;
-pub const D3DSP_DCL_USAGEINDEX_MASK: ::DWORD = 0x000f0000;
-pub const D3DSP_TEXTURETYPE_SHIFT: ::DWORD = 27;
-pub const D3DSP_TEXTURETYPE_MASK: ::DWORD = 0x78000000;
-ENUM!{enum D3DSAMPLER_TEXTURE_TYPE {
-    D3DSTT_UNKNOWN = 0 << D3DSP_TEXTURETYPE_SHIFT,
-    D3DSTT_2D = 2 << D3DSP_TEXTURETYPE_SHIFT,
-    D3DSTT_CUBE = 3 << D3DSP_TEXTURETYPE_SHIFT,
-    D3DSTT_VOLUME = 4 << D3DSP_TEXTURETYPE_SHIFT,
-}}
-pub const D3DSP_REGNUM_MASK: ::DWORD = 0x000007FF;
-pub const D3DSP_WRITEMASK_0: ::DWORD = 0x00010000;
-pub const D3DSP_WRITEMASK_1: ::DWORD = 0x00020000;
-pub const D3DSP_WRITEMASK_2: ::DWORD = 0x00040000;
-pub const D3DSP_WRITEMASK_3: ::DWORD = 0x00080000;
-pub const D3DSP_WRITEMASK_ALL: ::DWORD = 0x000F0000;
-pub const D3DSP_DSTMOD_SHIFT: ::DWORD = 20;
-pub const D3DSP_DSTMOD_MASK: ::DWORD = 0x00F00000;
-pub const D3DSPDM_NONE: ::DWORD = 0 << D3DSP_DSTMOD_SHIFT;
-pub const D3DSPDM_SATURATE: ::DWORD = 1 << D3DSP_DSTMOD_SHIFT;
-pub const D3DSPDM_PARTIALPRECISION: ::DWORD = 2 << D3DSP_DSTMOD_SHIFT;
-pub const D3DSPDM_MSAMPCENTROID: ::DWORD = 4 << D3DSP_DSTMOD_SHIFT;
-pub const D3DSP_DSTSHIFT_SHIFT: ::DWORD = 24;
-pub const D3DSP_DSTSHIFT_MASK: ::DWORD = 0x0F000000;
-pub const D3DSP_REGTYPE_SHIFT: ::DWORD = 28;
-pub const D3DSP_REGTYPE_SHIFT2: ::DWORD = 8;
-pub const D3DSP_REGTYPE_MASK: ::DWORD = 0x70000000;
-pub const D3DSP_REGTYPE_MASK2: ::DWORD = 0x00001800;
-ENUM!{enum D3DSHADER_PARAM_REGISTER_TYPE {
-    D3DSPR_TEMP = 0,
-    D3DSPR_INPUT = 1,
-    D3DSPR_CONST = 2,
-    D3DSPR_ADDR = 3,
-    D3DSPR_TEXTURE = 3,
-    D3DSPR_RASTOUT = 4,
-    D3DSPR_ATTROUT = 5,
-    D3DSPR_TEXCRDOUT = 6,
-    D3DSPR_OUTPUT = 6,
-    D3DSPR_CONSTINT = 7,
-    D3DSPR_COLOROUT = 8,
-    D3DSPR_DEPTHOUT = 9,
-    D3DSPR_SAMPLER = 10,
-    D3DSPR_CONST2 = 11,
-    D3DSPR_CONST3 = 12,
-    D3DSPR_CONST4 = 13,
-    D3DSPR_CONSTBOOL = 14,
-    D3DSPR_LOOP = 15,
-    D3DSPR_TEMPFLOAT16 = 16,
-    D3DSPR_MISCTYPE = 17,
-    D3DSPR_LABEL = 18,
-    D3DSPR_PREDICATE = 19,
-}}
-ENUM!{enum D3DSHADER_MISCTYPE_OFFSETS {
-    D3DSMO_POSITION = 0,
-    D3DSMO_FACE = 1,
-}}
-ENUM!{enum D3DVS_RASTOUT_OFFSETS {
-    D3DSRO_POSITION = 0,
-    D3DSRO_FOG,
-    D3DSRO_POINT_SIZE,
-}}
-pub const D3DVS_ADDRESSMODE_SHIFT: ::DWORD = 13;
-pub const D3DVS_ADDRESSMODE_MASK: ::DWORD = 1 << D3DVS_ADDRESSMODE_SHIFT;
-ENUM!{enum D3DVS_ADDRESSMODE_TYPE {
-    D3DVS_ADDRMODE_ABSOLUTE = 0 << D3DVS_ADDRESSMODE_SHIFT,
-    D3DVS_ADDRMODE_RELATIVE = 1 << D3DVS_ADDRESSMODE_SHIFT,
-}}
-pub const D3DSHADER_ADDRESSMODE_SHIFT: ::DWORD = 13;
-pub const D3DSHADER_ADDRESSMODE_MASK: ::DWORD = 1 << D3DSHADER_ADDRESSMODE_SHIFT;
-ENUM!{enum D3DSHADER_ADDRESSMODE_TYPE {
-    D3DSHADER_ADDRMODE_ABSOLUTE = 0 << D3DSHADER_ADDRESSMODE_SHIFT,
-    D3DSHADER_ADDRMODE_RELATIVE = 1 << D3DSHADER_ADDRESSMODE_SHIFT,
-}}
-pub const D3DVS_SWIZZLE_SHIFT: ::DWORD = 16;
-pub const D3DVS_SWIZZLE_MASK: ::DWORD = 0x00FF0000;
-pub const D3DVS_X_X: ::DWORD = 0 << D3DVS_SWIZZLE_SHIFT;
-pub const D3DVS_X_Y: ::DWORD = 1 << D3DVS_SWIZZLE_SHIFT;
-pub const D3DVS_X_Z: ::DWORD = 2 << D3DVS_SWIZZLE_SHIFT;
-pub const D3DVS_X_W: ::DWORD = 3 << D3DVS_SWIZZLE_SHIFT;
-pub const D3DVS_Y_X: ::DWORD = 0 << (D3DVS_SWIZZLE_SHIFT + 2);
-pub const D3DVS_Y_Y: ::DWORD = 1 << (D3DVS_SWIZZLE_SHIFT + 2);
-pub const D3DVS_Y_Z: ::DWORD = 2 << (D3DVS_SWIZZLE_SHIFT + 2);
-pub const D3DVS_Y_W: ::DWORD = 3 << (D3DVS_SWIZZLE_SHIFT + 2);
-pub const D3DVS_Z_X: ::DWORD = 0 << (D3DVS_SWIZZLE_SHIFT + 4);
-pub const D3DVS_Z_Y: ::DWORD = 1 << (D3DVS_SWIZZLE_SHIFT + 4);
-pub const D3DVS_Z_Z: ::DWORD = 2 << (D3DVS_SWIZZLE_SHIFT + 4);
-pub const D3DVS_Z_W: ::DWORD = 3 << (D3DVS_SWIZZLE_SHIFT + 4);
-pub const D3DVS_W_X: ::DWORD = 0 << (D3DVS_SWIZZLE_SHIFT + 6);
-pub const D3DVS_W_Y: ::DWORD = 1 << (D3DVS_SWIZZLE_SHIFT + 6);
-pub const D3DVS_W_Z: ::DWORD = 2 << (D3DVS_SWIZZLE_SHIFT + 6);
-pub const D3DVS_W_W: ::DWORD = 3 << (D3DVS_SWIZZLE_SHIFT + 6);
-pub const D3DVS_NOSWIZZLE: ::DWORD = D3DVS_X_X | D3DVS_Y_Y | D3DVS_Z_Z | D3DVS_W_W;
-pub const D3DSP_SWIZZLE_SHIFT: ::DWORD = 16;
-pub const D3DSP_SWIZZLE_MASK: ::DWORD = 0x00FF0000;
-pub const D3DSP_NOSWIZZLE: ::DWORD = (0 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (1 << (D3DSP_SWIZZLE_SHIFT + 2)) | (2 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (3 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_REPLICATERED: ::DWORD = (0 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (0 << (D3DSP_SWIZZLE_SHIFT + 2)) | (0 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (0 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_REPLICATEGREEN: ::DWORD = (1 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (1 << (D3DSP_SWIZZLE_SHIFT + 2)) | (1 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (1 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_REPLICATEBLUE: ::DWORD = (2 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (2 << (D3DSP_SWIZZLE_SHIFT + 2)) | (2 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (2 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_REPLICATEALPHA: ::DWORD = (3 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (3 << (D3DSP_SWIZZLE_SHIFT + 2)) | (3 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (3 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_SRCMOD_SHIFT: ::DWORD = 24;
-pub const D3DSP_SRCMOD_MASK: ::DWORD = 0x0F000000;
-ENUM!{enum D3DSHADER_PARAM_SRCMOD_TYPE {
-    D3DSPSM_NONE = 0 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_NEG = 1 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_BIAS = 2 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_BIASNEG = 3 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_SIGN = 4 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_SIGNNEG = 5 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_COMP = 6 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_X2 = 7 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_X2NEG = 8 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_DZ = 9 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_DW = 10 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_ABS = 11 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_ABSNEG = 12 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_NOT = 13 << D3DSP_SRCMOD_SHIFT,
-}}
-pub const D3DSP_MIN_PRECISION_SHIFT: ::DWORD = 14;
-pub const D3DSP_MIN_PRECISION_MASK: ::DWORD = 0x0000C000;
-ENUM!{enum D3DSHADER_MIN_PRECISION {
-    D3DMP_DEFAULT = 0,
-    D3DMP_16 = 1,
-    D3DMP_2_8 = 2,
-}}
-pub const D3DSI_COMMENTSIZE_SHIFT: ::DWORD = 16;
-pub const D3DSI_COMMENTSIZE_MASK: ::DWORD = 0x7FFF0000;
-pub const D3DPS_END: ::DWORD = 0x0000FFFF;
-pub const D3DVS_END: ::DWORD = 0x0000FFFF;
-ENUM!{enum D3DBASISTYPE {
-    D3DBASIS_BEZIER = 0,
-    D3DBASIS_BSPLINE = 1,
-    D3DBASIS_CATMULL_ROM = 2,
-}}
-ENUM!{enum D3DDEGREETYPE {
-    D3DDEGREE_LINEAR = 1,
-    D3DDEGREE_QUADRATIC = 2,
-    D3DDEGREE_CUBIC = 3,
-    D3DDEGREE_QUINTIC = 5,
-}}
-ENUM!{enum D3DPATCHEDGESTYLE {
-    D3DPATCHEDGE_DISCRETE = 0,
-    D3DPATCHEDGE_CONTINUOUS = 1,
-}}
-ENUM!{enum D3DSTATEBLOCKTYPE {
-    D3DSBT_ALL = 1,
-    D3DSBT_PIXELSTATE = 2,
-    D3DSBT_VERTEXSTATE = 3,
-}}
-FLAGS!{enum D3DVERTEXBLENDFLAGS {
-    D3DVBF_DISABLE = 0,
-    D3DVBF_1WEIGHTS = 1,
-    D3DVBF_2WEIGHTS = 2,
-    D3DVBF_3WEIGHTS = 3,
-    D3DVBF_TWEENING = 255,
-    D3DVBF_0WEIGHTS = 256,
-}}
-ENUM!{enum D3DTEXTURETRANSFORMFLAGS {
-    D3DTTFF_DISABLE = 0,
-    D3DTTFF_COUNT1 = 1,
-    D3DTTFF_COUNT2 = 2,
-    D3DTTFF_COUNT3 = 3,
-    D3DTTFF_COUNT4 = 4,
-    D3DTTFF_PROJECTED = 256,
-}}
-pub const D3DFVF_TEXTUREFORMAT2: ::DWORD = 0;
-pub const D3DFVF_TEXTUREFORMAT1: ::DWORD = 3;
-pub const D3DFVF_TEXTUREFORMAT3: ::DWORD = 1;
-pub const D3DFVF_TEXTUREFORMAT4: ::DWORD = 2;
-ENUM!{enum D3DDEVTYPE {
-    D3DDEVTYPE_HAL = 1,
-    D3DDEVTYPE_REF = 2,
-    D3DDEVTYPE_SW = 3,
-    D3DDEVTYPE_NULLREF = 4,
-}}
-ENUM!{enum D3DMULTISAMPLE_TYPE {
-    D3DMULTISAMPLE_NONE = 0,
-    D3DMULTISAMPLE_NONMASKABLE = 1,
-    D3DMULTISAMPLE_2_SAMPLES = 2,
-    D3DMULTISAMPLE_3_SAMPLES = 3,
-    D3DMULTISAMPLE_4_SAMPLES = 4,
-    D3DMULTISAMPLE_5_SAMPLES = 5,
-    D3DMULTISAMPLE_6_SAMPLES = 6,
-    D3DMULTISAMPLE_7_SAMPLES = 7,
-    D3DMULTISAMPLE_8_SAMPLES = 8,
-    D3DMULTISAMPLE_9_SAMPLES = 9,
-    D3DMULTISAMPLE_10_SAMPLES = 10,
-    D3DMULTISAMPLE_11_SAMPLES = 11,
-    D3DMULTISAMPLE_12_SAMPLES = 12,
-    D3DMULTISAMPLE_13_SAMPLES = 13,
-    D3DMULTISAMPLE_14_SAMPLES = 14,
-    D3DMULTISAMPLE_15_SAMPLES = 15,
-    D3DMULTISAMPLE_16_SAMPLES = 16,
-}}
-ENUM!{enum D3DFORMAT {
-    D3DFMT_UNKNOWN = 0,
-    D3DFMT_R8G8B8 = 20,
-    D3DFMT_A8R8G8B8 = 21,
-    D3DFMT_X8R8G8B8 = 22,
-    D3DFMT_R5G6B5 = 23,
-    D3DFMT_X1R5G5B5 = 24,
-    D3DFMT_A1R5G5B5 = 25,
-    D3DFMT_A4R4G4B4 = 26,
-    D3DFMT_R3G3B2 = 27,
-    D3DFMT_A8 = 28,
-    D3DFMT_A8R3G3B2 = 29,
-    D3DFMT_X4R4G4B4 = 30,
-    D3DFMT_A2B10G10R10 = 31,
-    D3DFMT_A8B8G8R8 = 32,
-    D3DFMT_X8B8G8R8 = 33,
-    D3DFMT_G16R16 = 34,
-    D3DFMT_A2R10G10B10 = 35,
-    D3DFMT_A16B16G16R16 = 36,
-    D3DFMT_A8P8 = 40,
-    D3DFMT_P8 = 41,
-    D3DFMT_L8 = 50,
-    D3DFMT_A8L8 = 51,
-    D3DFMT_A4L4 = 52,
-    D3DFMT_V8U8 = 60,
-    D3DFMT_L6V5U5 = 61,
-    D3DFMT_X8L8V8U8 = 62,
-    D3DFMT_Q8W8V8U8 = 63,
-    D3DFMT_V16U16 = 64,
-    D3DFMT_A2W10V10U10 = 67,
-    D3DFMT_UYVY = MAKEFOURCC!(b'U', b'Y', b'V', b'Y') as u32,
-    D3DFMT_R8G8_B8G8 = MAKEFOURCC!(b'R', b'G', b'B', b'G') as u32,
-    D3DFMT_YUY2 = MAKEFOURCC!(b'Y', b'U', b'Y', b'2') as u32,
-    D3DFMT_G8R8_G8B8 = MAKEFOURCC!(b'G', b'R', b'G', b'B') as u32,
-    D3DFMT_DXT1 = MAKEFOURCC!(b'D', b'X', b'T', b'1') as u32,
-    D3DFMT_DXT2 = MAKEFOURCC!(b'D', b'X', b'T', b'2') as u32,
-    D3DFMT_DXT3 = MAKEFOURCC!(b'D', b'X', b'T', b'3') as u32,
-    D3DFMT_DXT4 = MAKEFOURCC!(b'D', b'X', b'T', b'4') as u32,
-    D3DFMT_DXT5 = MAKEFOURCC!(b'D', b'X', b'T', b'5') as u32,
-    D3DFMT_D16_LOCKABLE = 70,
-    D3DFMT_D32 = 71,
-    D3DFMT_D15S1 = 73,
-    D3DFMT_D24S8 = 75,
-    D3DFMT_D24X8 = 77,
-    D3DFMT_D24X4S4 = 79,
-    D3DFMT_D16 = 80,
-    D3DFMT_D32F_LOCKABLE = 82,
-    D3DFMT_D24FS8 = 83,
-    D3DFMT_D32_LOCKABLE = 84,
-    D3DFMT_S8_LOCKABLE = 85,
-    D3DFMT_L16 = 81,
-    D3DFMT_VERTEXDATA = 100,
-    D3DFMT_INDEX16 = 101,
-    D3DFMT_INDEX32 = 102,
-    D3DFMT_Q16W16V16U16 = 110,
-    D3DFMT_MULTI2_ARGB8 = MAKEFOURCC!(b'M', b'E', b'T', b'1') as u32,
-    D3DFMT_R16F = 111,
-    D3DFMT_G16R16F = 112,
-    D3DFMT_A16B16G16R16F = 113,
-    D3DFMT_R32F = 114,
-    D3DFMT_G32R32F = 115,
-    D3DFMT_A32B32G32R32F = 116,
-    D3DFMT_CxV8U8 = 117,
-    D3DFMT_A1 = 118,
-    D3DFMT_A2B10G10R10_XR_BIAS = 119,
-    D3DFMT_BINARYBUFFER = 199,
-}}
-STRUCT!{struct D3DDISPLAYMODE {
-    Width: ::UINT,
-    Height: ::UINT,
-    RefreshRate: ::UINT,
-    Format: D3DFORMAT,
-}}
-STRUCT!{struct D3DDEVICE_CREATION_PARAMETERS {
-    AdapterOrdinal: ::UINT,
-    DeviceType: D3DDEVTYPE,
-    hFocusWindow: ::HWND,
-    BehaviorFlags: ::DWORD,
-}}
-ENUM!{enum D3DSWAPEFFECT {
-    D3DSWAPEFFECT_DISCARD = 1,
-    D3DSWAPEFFECT_FLIP = 2,
-    D3DSWAPEFFECT_COPY = 3,
-    D3DSWAPEFFECT_OVERLAY = 4,
-    D3DSWAPEFFECT_FLIPEX = 5,
-}}
-ENUM!{enum D3DPOOL {
-    D3DPOOL_DEFAULT = 0,
-    D3DPOOL_MANAGED = 1,
-    D3DPOOL_SYSTEMMEM = 2,
-    D3DPOOL_SCRATCH = 3,
-}}
-pub const D3DPRESENT_RATE_DEFAULT: ::DWORD = 0x00000000;
-STRUCT!{struct D3DPRESENT_PARAMETERS {
-    BackBufferWidth: ::UINT,
-    BackBufferHeight: ::UINT,
-    BackBufferFormat: D3DFORMAT,
-    BackBufferCount: ::UINT,
-    MultiSampleType: D3DMULTISAMPLE_TYPE,
-    MultiSampleQuality: ::DWORD,
-    SwapEffect: D3DSWAPEFFECT,
-    hDeviceWindow: ::HWND,
-    Windowed: ::BOOL,
-    EnableAutoDepthStencil: ::BOOL,
-    AutoDepthStencilFormat: D3DFORMAT,
-    Flags: ::DWORD,
-    FullScreen_RefreshRateInHz: ::UINT,
-    PresentationInterval: ::UINT,
-}}
-pub const D3DPRESENTFLAG_LOCKABLE_BACKBUFFER: ::DWORD = 0x00000001;
-pub const D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL: ::DWORD = 0x00000002;
-pub const D3DPRESENTFLAG_DEVICECLIP: ::DWORD = 0x00000004;
-pub const D3DPRESENTFLAG_VIDEO: ::DWORD = 0x00000010;
-pub const D3DPRESENTFLAG_NOAUTOROTATE: ::DWORD = 0x00000020;
-pub const D3DPRESENTFLAG_UNPRUNEDMODE: ::DWORD = 0x00000040;
-pub const D3DPRESENTFLAG_OVERLAY_LIMITEDRGB: ::DWORD = 0x00000080;
-pub const D3DPRESENTFLAG_OVERLAY_YCbCr_BT709: ::DWORD = 0x00000100;
-pub const D3DPRESENTFLAG_OVERLAY_YCbCr_xvYCC: ::DWORD = 0x00000200;
-pub const D3DPRESENTFLAG_RESTRICTED_CONTENT: ::DWORD = 0x00000400;
-pub const D3DPRESENTFLAG_RESTRICT_SHARED_RESOURCE_DRIVER: ::DWORD = 0x00000800;
-STRUCT!{nodebug struct D3DGAMMARAMP {
-    red: [::WORD; 256],
-    green: [::WORD; 256],
-    blue: [::WORD; 256],
-}}
-ENUM!{enum D3DBACKBUFFER_TYPE {
-    D3DBACKBUFFER_TYPE_MONO = 0,
-    D3DBACKBUFFER_TYPE_LEFT = 1,
-    D3DBACKBUFFER_TYPE_RIGHT = 2,
-}}
-ENUM!{enum D3DRESOURCETYPE {
-    D3DRTYPE_SURFACE = 1,
-    D3DRTYPE_VOLUME = 2,
-    D3DRTYPE_TEXTURE = 3,
-    D3DRTYPE_VOLUMETEXTURE = 4,
-    D3DRTYPE_CUBETEXTURE = 5,
-    D3DRTYPE_VERTEXBUFFER = 6,
-    D3DRTYPE_INDEXBUFFER = 7,
-}}
-pub const D3DUSAGE_RENDERTARGET: ::DWORD = 0x00000001;
-pub const D3DUSAGE_DEPTHSTENCIL: ::DWORD = 0x00000002;
-pub const D3DUSAGE_DYNAMIC: ::DWORD = 0x00000200;
-pub const D3DUSAGE_NONSECURE: ::DWORD = 0x00800000;
-pub const D3DUSAGE_AUTOGENMIPMAP: ::DWORD = 0x00000400;
-pub const D3DUSAGE_DMAP: ::DWORD = 0x00004000;
-pub const D3DUSAGE_QUERY_LEGACYBUMPMAP: ::DWORD = 0x00008000;
-pub const D3DUSAGE_QUERY_SRGBREAD: ::DWORD = 0x00010000;
-pub const D3DUSAGE_QUERY_FILTER: ::DWORD = 0x00020000;
-pub const D3DUSAGE_QUERY_SRGBWRITE: ::DWORD = 0x00040000;
-pub const D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING: ::DWORD = 0x00080000;
-pub const D3DUSAGE_QUERY_VERTEXTEXTURE: ::DWORD = 0x00100000;
-pub const D3DUSAGE_QUERY_WRAPANDMIP: ::DWORD = 0x00200000;
-pub const D3DUSAGE_WRITEONLY: ::DWORD = 0x00000008;
-pub const D3DUSAGE_SOFTWAREPROCESSING: ::DWORD = 0x00000010;
-pub const D3DUSAGE_DONOTCLIP: ::DWORD = 0x00000020;
-pub const D3DUSAGE_POINTS: ::DWORD = 0x00000040;
-pub const D3DUSAGE_RTPATCHES: ::DWORD = 0x00000080;
-pub const D3DUSAGE_NPATCHES: ::DWORD = 0x00000100;
-pub const D3DUSAGE_TEXTAPI: ::DWORD = 0x10000000;
-pub const D3DUSAGE_RESTRICTED_CONTENT: ::DWORD = 0x00000800;
-pub const D3DUSAGE_RESTRICT_SHARED_RESOURCE: ::DWORD = 0x00002000;
-pub const D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER: ::DWORD = 0x00001000;
-ENUM!{enum D3DCUBEMAP_FACES {
-    D3DCUBEMAP_FACE_POSITIVE_X = 0,
-    D3DCUBEMAP_FACE_NEGATIVE_X = 1,
-    D3DCUBEMAP_FACE_POSITIVE_Y = 2,
-    D3DCUBEMAP_FACE_NEGATIVE_Y = 3,
-    D3DCUBEMAP_FACE_POSITIVE_Z = 4,
-    D3DCUBEMAP_FACE_NEGATIVE_Z = 5,
-}}
-pub const D3DLOCK_READONLY: ::DWORD = 0x00000010;
-pub const D3DLOCK_DISCARD: ::DWORD = 0x00002000;
-pub const D3DLOCK_NOOVERWRITE: ::DWORD = 0x00001000;
-pub const D3DLOCK_NOSYSLOCK: ::DWORD = 0x00000800;
-pub const D3DLOCK_DONOTWAIT: ::DWORD = 0x00004000;
-pub const D3DLOCK_NO_DIRTY_UPDATE: ::DWORD = 0x00008000;
-STRUCT!{struct D3DVERTEXBUFFER_DESC {
-    Format: D3DFORMAT,
-    Type: D3DRESOURCETYPE,
-    Usage: ::DWORD,
-    Pool: D3DPOOL,
-    Size: ::UINT,
-    FVF: ::DWORD,
-}}
-STRUCT!{struct D3DINDEXBUFFER_DESC {
-    Format: D3DFORMAT,
-    Type: D3DRESOURCETYPE,
-    Usage: ::DWORD,
-    Pool: D3DPOOL,
-    Size: ::UINT,
-}}
-STRUCT!{struct D3DSURFACE_DESC {
-    Format: D3DFORMAT,
-    Type: D3DRESOURCETYPE,
-    Usage: ::DWORD,
-    Pool: D3DPOOL,
-    MultiSampleType: D3DMULTISAMPLE_TYPE,
-    MultiSampleQuality: ::DWORD,
-    Width: ::UINT,
-    Height: ::UINT,
-}}
-STRUCT!{struct D3DVOLUME_DESC {
-    Format: D3DFORMAT,
-    Type: D3DRESOURCETYPE,
-    Usage: ::DWORD,
-    Pool: D3DPOOL,
-    Width: ::UINT,
-    Height: ::UINT,
-    Depth: ::UINT,
-}}
-STRUCT!{struct D3DLOCKED_RECT {
-    Pitch: ::INT,
-    pBits: *mut ::c_void,
-}}
-STRUCT!{struct D3DBOX {
-    Left: ::UINT,
-    Top: ::UINT,
-    Right: ::UINT,
-    Bottom: ::UINT,
-    Front: ::UINT,
-    Back: ::UINT,
-}}
-STRUCT!{struct D3DLOCKED_BOX {
-    RowPitch: ::INT,
-    SlicePitch: ::INT,
-    pBits: *mut ::c_void,
-}}
-STRUCT!{struct D3DRANGE {
-    Offset: ::UINT,
-    Size: ::UINT,
-}}
-STRUCT!{struct D3DRECTPATCH_INFO {
-    StartVertexOffsetWidth: ::UINT,
-    StartVertexOffsetHeight: ::UINT,
-    Width: ::UINT,
-    Height: ::UINT,
-    Stride: ::UINT,
-    Basis: D3DBASISTYPE,
-    Degree: D3DDEGREETYPE,
-}}
-STRUCT!{struct D3DTRIPATCH_INFO {
-    StartVertexOffset: ::UINT,
-    NumVertices: ::UINT,
-    Basis: D3DBASISTYPE,
-    Degree: D3DDEGREETYPE,
-}}
-pub const MAX_DEVICE_IDENTIFIER_STRING: usize = 512;
-STRUCT!{nodebug struct D3DADAPTER_IDENTIFIER9 {
-    Driver: [::c_char; MAX_DEVICE_IDENTIFIER_STRING],
-    Description: [::c_char; MAX_DEVICE_IDENTIFIER_STRING],
-    DeviceName: [::c_char; 32],
-    DriverVersion: ::LARGE_INTEGER,
-    VendorId: ::DWORD,
-    DeviceId: ::DWORD,
-    SubSysId: ::DWORD,
-    Revision: ::DWORD,
-    DeviceIdentifier: ::GUID,
-    WHQLLevel: ::DWORD,
-}}
-STRUCT!{struct D3DRASTER_STATUS {
-    InVBlank: ::BOOL,
-    ScanLine: ::UINT,
-}}
-ENUM!{enum D3DDEBUGMONITORTOKENS {
-    D3DDMT_ENABLE = 0,
-    D3DDMT_DISABLE = 1,
-}}
-ENUM!{enum D3DQUERYTYPE {
-    D3DQUERYTYPE_VCACHE = 4,
-    D3DQUERYTYPE_RESOURCEMANAGER = 5,
-    D3DQUERYTYPE_VERTEXSTATS = 6,
-    D3DQUERYTYPE_EVENT = 8,
-    D3DQUERYTYPE_OCCLUSION = 9,
-    D3DQUERYTYPE_TIMESTAMP = 10,
-    D3DQUERYTYPE_TIMESTAMPDISJOINT = 11,
-    D3DQUERYTYPE_TIMESTAMPFREQ = 12,
-    D3DQUERYTYPE_PIPELINETIMINGS = 13,
-    D3DQUERYTYPE_INTERFACETIMINGS = 14,
-    D3DQUERYTYPE_VERTEXTIMINGS = 15,
-    D3DQUERYTYPE_PIXELTIMINGS = 16,
-    D3DQUERYTYPE_BANDWIDTHTIMINGS = 17,
-    D3DQUERYTYPE_CACHEUTILIZATION = 18,
-    D3DQUERYTYPE_MEMORYPRESSURE = 19,
-}}
-pub const D3DISSUE_END: ::DWORD = 1 << 0;
-pub const D3DISSUE_BEGIN: ::DWORD = 1 << 1;
-pub const D3DGETDATA_FLUSH: ::DWORD = 1 << 0;
-STRUCT!{struct D3DRESOURCESTATS {
-    bThrashing: ::BOOL,
-    ApproxBytesDownloaded: ::DWORD,
-    NumEvicts: ::DWORD,
-    NumVidCreates: ::DWORD,
-    LastPri: ::DWORD,
-    NumUsed: ::DWORD,
-    NumUsedInVidMem: ::DWORD,
-    WorkingSet: ::DWORD,
-    WorkingSetBytes: ::DWORD,
-    TotalManaged: ::DWORD,
-    TotalBytes: ::DWORD,
-}}
-pub const D3DRTYPECOUNT: usize = 8;
-STRUCT!{struct D3DDEVINFO_RESOURCEMANAGER {
-    stats: [D3DRESOURCESTATS; 8 /*D3DRTYPECOUNT, rust bug?*/],
-}}
-pub type LPD3DDEVINFO_RESOURCEMANAGER = *mut D3DDEVINFO_RESOURCEMANAGER;
-STRUCT!{struct D3DDEVINFO_D3DVERTEXSTATS {
-    NumRenderedTriangles: ::DWORD,
-    NumExtraClippingTriangles: ::DWORD,
-}}
-pub type LPD3DDEVINFO_D3DVERTEXSTATS = *mut D3DDEVINFO_D3DVERTEXSTATS;
-STRUCT!{struct D3DDEVINFO_VCACHE {
-    Pattern: ::DWORD,
-    OptMethod: ::DWORD,
-    CacheSize: ::DWORD,
-    MagicNumber: ::DWORD,
-}}
-pub type LPD3DDEVINFO_VCACHE = *mut D3DDEVINFO_VCACHE;
-STRUCT!{struct D3DDEVINFO_D3D9PIPELINETIMINGS {
-    VertexProcessingTimePercent: ::FLOAT,
-    PixelProcessingTimePercent: ::FLOAT,
-    OtherGPUProcessingTimePercent: ::FLOAT,
-    GPUIdleTimePercent: ::FLOAT,
-}}
-STRUCT!{struct D3DDEVINFO_D3D9INTERFACETIMINGS {
-    WaitingForGPUToUseApplicationResourceTimePercent: ::FLOAT,
-    WaitingForGPUToAcceptMoreCommandsTimePercent: ::FLOAT,
-    WaitingForGPUToStayWithinLatencyTimePercent: ::FLOAT,
-    WaitingForGPUExclusiveResourceTimePercent: ::FLOAT,
-    WaitingForGPUOtherTimePercent: ::FLOAT,
-}}
-STRUCT!{struct D3DDEVINFO_D3D9STAGETIMINGS {
-    MemoryProcessingPercent: ::FLOAT,
-    ComputationProcessingPercent: ::FLOAT,
-}}
-STRUCT!{struct D3DDEVINFO_D3D9BANDWIDTHTIMINGS {
-    MaxBandwidthUtilized: ::FLOAT,
-    FrontEndUploadMemoryUtilizedPercent: ::FLOAT,
-    VertexRateUtilizedPercent: ::FLOAT,
-    TriangleSetupRateUtilizedPercent: ::FLOAT,
-    FillRateUtilizedPercent: ::FLOAT,
-}}
-STRUCT!{struct D3DDEVINFO_D3D9CACHEUTILIZATION {
-    TextureCacheHitRate: ::FLOAT,
-    PostTransformVertexCacheHitRate: ::FLOAT,
-}}
-STRUCT!{struct D3DMEMORYPRESSURE {
-    BytesEvictedFromProcess: ::UINT64,
-    SizeOfInefficientAllocation: ::UINT64,
-    LevelOfEfficiency: ::DWORD,
-}}
-ENUM!{enum D3DCOMPOSERECTSOP {
-    D3DCOMPOSERECTS_COPY = 1,
-    D3DCOMPOSERECTS_OR = 2,
-    D3DCOMPOSERECTS_AND = 3,
-    D3DCOMPOSERECTS_NEG = 4,
-}}
-STRUCT!{struct D3DCOMPOSERECTDESC {
-    X: ::USHORT,
-    Y: ::USHORT,
-    Width: ::USHORT,
-    Height: ::USHORT,
-}}
-STRUCT!{struct D3DCOMPOSERECTDESTINATION {
-    SrcRectIndex: ::USHORT,
-    Reserved: ::USHORT,
-    X: ::SHORT,
-    Y: ::SHORT,
-}}
-pub const D3DCOMPOSERECTS_MAXNUMRECTS: ::DWORD = 0xFFFF;
-pub const D3DCONVOLUTIONMONO_MAXWIDTH: ::DWORD = 7;
-pub const D3DCONVOLUTIONMONO_MAXHEIGHT: ::DWORD = D3DCONVOLUTIONMONO_MAXWIDTH;
-pub const D3DFMT_A1_SURFACE_MAXWIDTH: ::DWORD = 8192;
-pub const D3DFMT_A1_SURFACE_MAXHEIGHT: ::DWORD = 2048;
-STRUCT!{struct D3DPRESENTSTATS {
-    PresentCount: ::UINT,
-    PresentRefreshCount: ::UINT,
-    SyncRefreshCount: ::UINT,
-    SyncQPCTime: ::LARGE_INTEGER,
-    SyncGPUTime: ::LARGE_INTEGER,
-}}
-ENUM!{enum D3DSCANLINEORDERING {
-    D3DSCANLINEORDERING_UNKNOWN = 0,
-    D3DSCANLINEORDERING_PROGRESSIVE = 1,
-    D3DSCANLINEORDERING_INTERLACED = 2,
-}}
-STRUCT!{struct D3DDISPLAYMODEEX {
-    Size: ::UINT,
-    Width: ::UINT,
-    Height: ::UINT,
-    RefreshRate: ::UINT,
-    Format: D3DFORMAT,
-    ScanLineOrdering: D3DSCANLINEORDERING,
-}}
-STRUCT!{struct D3DDISPLAYMODEFILTER {
-    Size: ::UINT,
-    Format: D3DFORMAT,
-    ScanLineOrdering: D3DSCANLINEORDERING,
-}}
-ENUM!{enum D3DDISPLAYROTATION {
-    D3DDISPLAYROTATION_IDENTITY = 1,
-    D3DDISPLAYROTATION_90 = 2,
-    D3DDISPLAYROTATION_180 = 3,
-    D3DDISPLAYROTATION_270 = 4,
-}}
-pub const D3D9_RESOURCE_PRIORITY_MINIMUM: ::DWORD = 0x28000000;
-pub const D3D9_RESOURCE_PRIORITY_LOW: ::DWORD = 0x50000000;
-pub const D3D9_RESOURCE_PRIORITY_NORMAL: ::DWORD = 0x78000000;
-pub const D3D9_RESOURCE_PRIORITY_HIGH: ::DWORD = 0xa0000000;
-pub const D3D9_RESOURCE_PRIORITY_MAXIMUM: ::DWORD = 0xc8000000;
-pub const D3D_OMAC_SIZE: usize = 16;
-STRUCT!{struct D3D_OMAC {
-    Omac: [::BYTE; D3D_OMAC_SIZE],
-}}
-ENUM!{enum D3DAUTHENTICATEDCHANNELTYPE {
-    D3DAUTHENTICATEDCHANNEL_D3D9 = 1,
-    D3DAUTHENTICATEDCHANNEL_DRIVER_SOFTWARE = 2,
-    D3DAUTHENTICATEDCHANNEL_DRIVER_HARDWARE = 3,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERY_INPUT {
-    QueryType: ::GUID,
-    hChannel: ::HANDLE,
-    SequenceNumber: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT {
-    omac: D3D_OMAC,
-    QueryType: ::GUID,
-    hChannel: ::HANDLE,
-    SequenceNumber: ::UINT,
-    ReturnCode: ::HRESULT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS {
-    Value: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYPROTECTION_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    ProtectionFlags: D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYCHANNELTYPE_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    ChannelType: D3DAUTHENTICATEDCHANNELTYPE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYDEVICEHANDLE_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    DeviceHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    DXVA2DecodeHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    DXVA2DecodeHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    DeviceHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESSCOUNT_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    NumRestrictedSharedResourceProcesses: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    ProcessIndex: ::UINT,
-}}
-ENUM!{enum D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE {
-    PROCESSIDTYPE_UNKNOWN = 0,
-    PROCESSIDTYPE_DWM = 1,
-    PROCESSIDTYPE_HANDLE = 2,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    ProcessIndex: ::UINT,
-    ProcessIdentifer: D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE,
-    ProcessHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYUNRESTRICTEDPROTECTEDSHAREDRESOURCECOUNT_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    NumUnrestrictedProtectedSharedResources: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    DeviceHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    DeviceHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    NumOutputIDs: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    DeviceHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    OutputIDIndex: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    DeviceHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    OutputIDIndex: ::UINT,
-    OutputID: ::UINT64,
-}}
-FLAGS!{enum D3DBUSTYPE {
-    D3DBUSTYPE_OTHER = 0x00000000,
-    D3DBUSTYPE_PCI = 0x00000001,
-    D3DBUSTYPE_PCIX = 0x00000002,
-    D3DBUSTYPE_PCIEXPRESS = 0x00000003,
-    D3DBUSTYPE_AGP = 0x00000004,
-    D3DBUSIMPL_MODIFIER_INSIDE_OF_CHIPSET = 0x00010000,
-    MD3DBUSIMPL_ODIFIER_TRACKS_ON_MOTHER_BOARD_TO_CHIP = 0x00020000,
-    D3DBUSIMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_SOCKET = 0x00030000,
-    D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR = 0x00040000,
-    D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR_INSIDE_OF_NUAE = 0x00050000,
-    D3DBUSIMPL_MODIFIER_NON_STANDARD = 0x80000000,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYINFOBUSTYPE_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    BusType: D3DBUSTYPE,
-    bAccessibleInContiguousBlocks: ::BOOL,
-    bAccessibleInNonContiguousBlocks: ::BOOL,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUIDCOUNT_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    NumEncryptionGuids: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    EncryptionGuidIndex: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    EncryptionGuidIndex: ::UINT,
-    EncryptionGuid: ::GUID,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYUNCOMPRESSEDENCRYPTIONLEVEL_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    EncryptionGuid: ::GUID,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT {
-    omac: D3D_OMAC,
-    ConfigureType: ::GUID,
-    hChannel: ::HANDLE,
-    SequenceNumber: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT {
-    omac: D3D_OMAC,
-    ConfigureType: ::GUID,
-    hChannel: ::HANDLE,
-    SequenceNumber: ::UINT,
-    ReturnCode: ::HRESULT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGUREINITIALIZE {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    StartSequenceQuery: ::UINT,
-    StartSequenceConfigure: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGUREPROTECTION {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    Protections: D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGURECRYPTOSESSION {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    DXVA2DecodeHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    DeviceHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGURESHAREDRESOURCE {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    ProcessIdentiferType: D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE,
-    ProcessHandle: ::HANDLE,
-    AllowAccess: ::BOOL,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGUREUNCOMPRESSEDENCRYPTION {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    EncryptionGuid: ::GUID,
-}}
-STRUCT!{struct D3DENCRYPTED_BLOCK_INFO {
-    NumEncryptedBytesAtBeginning: ::UINT,
-    NumBytesInSkipPattern: ::UINT,
-    NumBytesInEncryptPattern: ::UINT,
-}}
-STRUCT!{struct D3DAES_CTR_IV {
-    IV: ::UINT64,
-    Count: ::UINT64,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3dcommon.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3dcommon.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3dcommon.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3dcommon.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,753 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of d3dcommon.h
-ENUM!{enum D3D_DRIVER_TYPE {
-    D3D_DRIVER_TYPE_UNKNOWN,
-    D3D_DRIVER_TYPE_HARDWARE,
-    D3D_DRIVER_TYPE_REFERENCE,
-    D3D_DRIVER_TYPE_NULL,
-    D3D_DRIVER_TYPE_SOFTWARE,
-    D3D_DRIVER_TYPE_WARP,
-}}
-ENUM!{enum D3D_FEATURE_LEVEL {
-    D3D_FEATURE_LEVEL_9_1 = 0x9100,
-    D3D_FEATURE_LEVEL_9_2 = 0x9200,
-    D3D_FEATURE_LEVEL_9_3 = 0x9300,
-    D3D_FEATURE_LEVEL_10_0 = 0xa000,
-    D3D_FEATURE_LEVEL_10_1 = 0xa100,
-    D3D_FEATURE_LEVEL_11_0 = 0xb000,
-    D3D_FEATURE_LEVEL_11_1 = 0xb100,
-    D3D_FEATURE_LEVEL_12_0  = 0xc000,
-    D3D_FEATURE_LEVEL_12_1  = 0xc100,
-}}
-ENUM!{enum D3D_PRIMITIVE_TOPOLOGY {
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0,
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13,
-    D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST = 33,
-    D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST = 34,
-    D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST = 35,
-    D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST = 36,
-    D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST = 37,
-    D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST = 38,
-    D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST = 39,
-    D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST = 40,
-    D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST = 41,
-    D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST = 42,
-    D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST = 43,
-    D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST = 44,
-    D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST = 45,
-    D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST = 46,
-    D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST = 47,
-    D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST = 48,
-    D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST = 49,
-    D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST = 50,
-    D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST = 51,
-    D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST = 52,
-    D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST = 53,
-    D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST = 54,
-    D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST = 55,
-    D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST = 56,
-    D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST = 57,
-    D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST = 58,
-    D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST = 59,
-    D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST = 60,
-    D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST = 61,
-    D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST = 62,
-    D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST = 63,
-    D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST = 64,
-}}
-pub const D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
-pub const D3D10_PRIMITIVE_TOPOLOGY_POINTLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST;
-pub const D3D10_PRIMITIVE_TOPOLOGY_LINELIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST;
-pub const D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;
-pub const D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
-pub const D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP;
-pub const D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ;
-pub const D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ;
-pub const D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ;
-pub const D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
-pub const D3D11_PRIMITIVE_TOPOLOGY_POINTLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_LINELIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;
-pub const D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP;
-pub const D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST;
-ENUM!{enum D3D_PRIMITIVE {
-    D3D_PRIMITIVE_UNDEFINED = 0,
-    D3D_PRIMITIVE_POINT = 1,
-    D3D_PRIMITIVE_LINE = 2,
-    D3D_PRIMITIVE_TRIANGLE = 3,
-    D3D_PRIMITIVE_LINE_ADJ = 6,
-    D3D_PRIMITIVE_TRIANGLE_ADJ = 7,
-    D3D_PRIMITIVE_1_CONTROL_POINT_PATCH = 8,
-    D3D_PRIMITIVE_2_CONTROL_POINT_PATCH = 9,
-    D3D_PRIMITIVE_3_CONTROL_POINT_PATCH = 10,
-    D3D_PRIMITIVE_4_CONTROL_POINT_PATCH = 11,
-    D3D_PRIMITIVE_5_CONTROL_POINT_PATCH = 12,
-    D3D_PRIMITIVE_6_CONTROL_POINT_PATCH = 13,
-    D3D_PRIMITIVE_7_CONTROL_POINT_PATCH = 14,
-    D3D_PRIMITIVE_8_CONTROL_POINT_PATCH = 15,
-    D3D_PRIMITIVE_9_CONTROL_POINT_PATCH = 16,
-    D3D_PRIMITIVE_10_CONTROL_POINT_PATCH = 17,
-    D3D_PRIMITIVE_11_CONTROL_POINT_PATCH = 18,
-    D3D_PRIMITIVE_12_CONTROL_POINT_PATCH = 19,
-    D3D_PRIMITIVE_13_CONTROL_POINT_PATCH = 20,
-    D3D_PRIMITIVE_14_CONTROL_POINT_PATCH = 21,
-    D3D_PRIMITIVE_15_CONTROL_POINT_PATCH = 22,
-    D3D_PRIMITIVE_16_CONTROL_POINT_PATCH = 23,
-    D3D_PRIMITIVE_17_CONTROL_POINT_PATCH = 24,
-    D3D_PRIMITIVE_18_CONTROL_POINT_PATCH = 25,
-    D3D_PRIMITIVE_19_CONTROL_POINT_PATCH = 26,
-    D3D_PRIMITIVE_20_CONTROL_POINT_PATCH = 28,
-    D3D_PRIMITIVE_21_CONTROL_POINT_PATCH = 29,
-    D3D_PRIMITIVE_22_CONTROL_POINT_PATCH = 30,
-    D3D_PRIMITIVE_23_CONTROL_POINT_PATCH = 31,
-    D3D_PRIMITIVE_24_CONTROL_POINT_PATCH = 32,
-    D3D_PRIMITIVE_25_CONTROL_POINT_PATCH = 33,
-    D3D_PRIMITIVE_26_CONTROL_POINT_PATCH = 34,
-    D3D_PRIMITIVE_27_CONTROL_POINT_PATCH = 35,
-    D3D_PRIMITIVE_28_CONTROL_POINT_PATCH = 36,
-    D3D_PRIMITIVE_29_CONTROL_POINT_PATCH = 37,
-    D3D_PRIMITIVE_30_CONTROL_POINT_PATCH = 38,
-    D3D_PRIMITIVE_31_CONTROL_POINT_PATCH = 39,
-    D3D_PRIMITIVE_32_CONTROL_POINT_PATCH = 40,
-}}
-pub const D3D10_PRIMITIVE_UNDEFINED: ::D3D_PRIMITIVE = D3D_PRIMITIVE_UNDEFINED;
-pub const D3D10_PRIMITIVE_POINT: ::D3D_PRIMITIVE = D3D_PRIMITIVE_POINT;
-pub const D3D10_PRIMITIVE_LINE: ::D3D_PRIMITIVE = D3D_PRIMITIVE_LINE;
-pub const D3D10_PRIMITIVE_TRIANGLE: ::D3D_PRIMITIVE = D3D_PRIMITIVE_TRIANGLE;
-pub const D3D10_PRIMITIVE_LINE_ADJ: ::D3D_PRIMITIVE = D3D_PRIMITIVE_LINE_ADJ;
-pub const D3D10_PRIMITIVE_TRIANGLE_ADJ: ::D3D_PRIMITIVE = D3D_PRIMITIVE_TRIANGLE_ADJ;
-pub const D3D11_PRIMITIVE_UNDEFINED: ::D3D_PRIMITIVE = D3D_PRIMITIVE_UNDEFINED;
-pub const D3D11_PRIMITIVE_POINT: ::D3D_PRIMITIVE = D3D_PRIMITIVE_POINT;
-pub const D3D11_PRIMITIVE_LINE: ::D3D_PRIMITIVE = D3D_PRIMITIVE_LINE;
-pub const D3D11_PRIMITIVE_TRIANGLE: ::D3D_PRIMITIVE = D3D_PRIMITIVE_TRIANGLE;
-pub const D3D11_PRIMITIVE_LINE_ADJ: ::D3D_PRIMITIVE = D3D_PRIMITIVE_LINE_ADJ;
-pub const D3D11_PRIMITIVE_TRIANGLE_ADJ: ::D3D_PRIMITIVE = D3D_PRIMITIVE_TRIANGLE_ADJ;
-pub const D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_1_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_2_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_3_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_4_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_5_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_6_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_7_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_8_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_9_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_10_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_11_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_12_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_13_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_14_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_15_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_16_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_17_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_18_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_19_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_20_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_21_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_22_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_23_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_24_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_25_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_26_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_27_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_28_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_29_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_30_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_31_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_32_CONTROL_POINT_PATCH;
-ENUM!{enum D3D_SRV_DIMENSION {
-    D3D_SRV_DIMENSION_UNKNOWN = 0,
-    D3D_SRV_DIMENSION_BUFFER = 1,
-    D3D_SRV_DIMENSION_TEXTURE1D = 2,
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D_SRV_DIMENSION_TEXTURE2D = 4,
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D_SRV_DIMENSION_TEXTURE2DMS = 6,
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY = 7,
-    D3D_SRV_DIMENSION_TEXTURE3D = 8,
-    D3D_SRV_DIMENSION_TEXTURECUBE = 9,
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY = 10,
-    D3D_SRV_DIMENSION_BUFFEREX = 11,
-}}
-pub const D3D10_SRV_DIMENSION_UNKNOWN: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_UNKNOWN;
-pub const D3D10_SRV_DIMENSION_BUFFER: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_BUFFER;
-pub const D3D10_SRV_DIMENSION_TEXTURE1D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1D;
-pub const D3D10_SRV_DIMENSION_TEXTURE1DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY;
-pub const D3D10_SRV_DIMENSION_TEXTURE2D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2D;
-pub const D3D10_SRV_DIMENSION_TEXTURE2DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY;
-pub const D3D10_SRV_DIMENSION_TEXTURE2DMS: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMS;
-pub const D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY;
-pub const D3D10_SRV_DIMENSION_TEXTURE3D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE3D;
-pub const D3D10_SRV_DIMENSION_TEXTURECUBE: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBE;
-pub const D3D10_1_SRV_DIMENSION_UNKNOWN: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_UNKNOWN;
-pub const D3D10_1_SRV_DIMENSION_BUFFER: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_BUFFER;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE1D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1D;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE2D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2D;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE2DMS: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMS;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE3D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE3D;
-pub const D3D10_1_SRV_DIMENSION_TEXTURECUBE: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBE;
-pub const D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY;
-pub const D3D11_SRV_DIMENSION_UNKNOWN: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_UNKNOWN;
-pub const D3D11_SRV_DIMENSION_BUFFER: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_BUFFER;
-pub const D3D11_SRV_DIMENSION_TEXTURE1D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1D;
-pub const D3D11_SRV_DIMENSION_TEXTURE1DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY;
-pub const D3D11_SRV_DIMENSION_TEXTURE2D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2D;
-pub const D3D11_SRV_DIMENSION_TEXTURE2DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY;
-pub const D3D11_SRV_DIMENSION_TEXTURE2DMS: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMS;
-pub const D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY;
-pub const D3D11_SRV_DIMENSION_TEXTURE3D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE3D;
-pub const D3D11_SRV_DIMENSION_TEXTURECUBE: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBE;
-pub const D3D11_SRV_DIMENSION_TEXTURECUBEARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY;
-pub const D3D11_SRV_DIMENSION_BUFFEREX: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_BUFFEREX;
-STRUCT!{struct D3D_SHADER_MACRO {
-    Name: ::LPCSTR,
-    Definition: ::LPCSTR,
-}}
-pub type LPD3D_SHADER_MACRO = *mut D3D_SHADER_MACRO;
-RIDL!(
-interface ID3D10Blob(ID3D10BlobVtbl): IUnknown(IUnknownVtbl) {
-    fn GetBufferPointer(&mut self) -> ::LPVOID,
-    fn GetBufferSize(&mut self) -> ::SIZE_T
-}
-);
-pub type LPD3D10BLOB = *mut ID3D10Blob;
-pub type ID3DBlob = ID3D10Blob;
-pub type LPD3DBLOB = *mut ID3DBlob;
-ENUM!{enum D3D_INCLUDE_TYPE {
-    D3D_INCLUDE_LOCAL = 0,
-    D3D_INCLUDE_SYSTEM,
-}}
-pub const D3D10_INCLUDE_LOCAL: ::D3D_INCLUDE_TYPE = D3D_INCLUDE_LOCAL;
-pub const D3D10_INCLUDE_SYSTEM: ::D3D_INCLUDE_TYPE = D3D_INCLUDE_SYSTEM;
-RIDL!(
-interface ID3DInclude(ID3DIncludeVtbl) {
-    fn Open(
-        &mut self, IncludeType: D3D_INCLUDE_TYPE, pFileName: ::LPCSTR, pParentData: ::LPCVOID,
-        ppData: *mut ::LPCVOID, pBytes: *mut ::UINT
-    ) -> ::HRESULT,
-    fn Close(&mut self, pData: ::LPCVOID) -> ::HRESULT
-}
-);
-pub type LPD3DINCLUDE = *mut ID3DInclude;
-ENUM!{enum D3D_SHADER_VARIABLE_CLASS {
-    D3D_SVC_SCALAR = 0,
-    D3D_SVC_VECTOR,
-    D3D_SVC_MATRIX_ROWS,
-    D3D_SVC_MATRIX_COLUMNS,
-    D3D_SVC_OBJECT,
-    D3D_SVC_STRUCT,
-    D3D_SVC_INTERFACE_CLASS,
-    D3D_SVC_INTERFACE_POINTER,
-}}
-pub const D3D10_SVC_SCALAR: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_SCALAR;
-pub const D3D10_SVC_VECTOR: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_VECTOR;
-pub const D3D10_SVC_MATRIX_ROWS: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_MATRIX_ROWS;
-pub const D3D10_SVC_MATRIX_COLUMNS: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_MATRIX_COLUMNS;
-pub const D3D10_SVC_OBJECT: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_OBJECT;
-pub const D3D10_SVC_STRUCT: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_STRUCT;
-pub const D3D11_SVC_INTERFACE_CLASS: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_INTERFACE_CLASS;
-pub const D3D11_SVC_INTERFACE_POINTER: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_INTERFACE_POINTER;
-FLAGS!{enum D3D_SHADER_VARIABLE_FLAGS {
-    D3D_SVF_USERPACKED = 1,
-    D3D_SVF_USED = 2,
-    D3D_SVF_INTERFACE_POINTER = 4,
-    D3D_SVF_INTERFACE_PARAMETER = 8,
-}}
-pub const D3D10_SVF_USERPACKED: ::D3D_SHADER_VARIABLE_FLAGS = D3D_SVF_USERPACKED;
-pub const D3D10_SVF_USED: ::D3D_SHADER_VARIABLE_FLAGS = D3D_SVF_USED;
-pub const D3D11_SVF_INTERFACE_POINTER: ::D3D_SHADER_VARIABLE_FLAGS = D3D_SVF_INTERFACE_POINTER;
-pub const D3D11_SVF_INTERFACE_PARAMETER: ::D3D_SHADER_VARIABLE_FLAGS = D3D_SVF_INTERFACE_PARAMETER;
-ENUM!{enum D3D_SHADER_VARIABLE_TYPE {
-    D3D_SVT_VOID = 0,
-    D3D_SVT_BOOL = 1,
-    D3D_SVT_INT = 2,
-    D3D_SVT_FLOAT = 3,
-    D3D_SVT_STRING = 4,
-    D3D_SVT_TEXTURE = 5,
-    D3D_SVT_TEXTURE1D = 6,
-    D3D_SVT_TEXTURE2D = 7,
-    D3D_SVT_TEXTURE3D = 8,
-    D3D_SVT_TEXTURECUBE = 9,
-    D3D_SVT_SAMPLER = 10,
-    D3D_SVT_SAMPLER1D = 11,
-    D3D_SVT_SAMPLER2D = 12,
-    D3D_SVT_SAMPLER3D = 13,
-    D3D_SVT_SAMPLERCUBE = 14,
-    D3D_SVT_PIXELSHADER = 15,
-    D3D_SVT_VERTEXSHADER = 16,
-    D3D_SVT_PIXELFRAGMENT = 17,
-    D3D_SVT_VERTEXFRAGMENT = 18,
-    D3D_SVT_UINT = 19,
-    D3D_SVT_UINT8 = 20,
-    D3D_SVT_GEOMETRYSHADER = 21,
-    D3D_SVT_RASTERIZER = 22,
-    D3D_SVT_DEPTHSTENCIL = 23,
-    D3D_SVT_BLEND = 24,
-    D3D_SVT_BUFFER = 25,
-    D3D_SVT_CBUFFER = 26,
-    D3D_SVT_TBUFFER = 27,
-    D3D_SVT_TEXTURE1DARRAY = 28,
-    D3D_SVT_TEXTURE2DARRAY = 29,
-    D3D_SVT_RENDERTARGETVIEW = 30,
-    D3D_SVT_DEPTHSTENCILVIEW = 31,
-    D3D_SVT_TEXTURE2DMS = 32,
-    D3D_SVT_TEXTURE2DMSARRAY = 33,
-    D3D_SVT_TEXTURECUBEARRAY = 34,
-    D3D_SVT_HULLSHADER = 35,
-    D3D_SVT_DOMAINSHADER = 36,
-    D3D_SVT_INTERFACE_POINTER = 37,
-    D3D_SVT_COMPUTESHADER = 38,
-    D3D_SVT_DOUBLE = 39,
-    D3D_SVT_RWTEXTURE1D = 40,
-    D3D_SVT_RWTEXTURE1DARRAY = 41,
-    D3D_SVT_RWTEXTURE2D = 42,
-    D3D_SVT_RWTEXTURE2DARRAY = 43,
-    D3D_SVT_RWTEXTURE3D = 44,
-    D3D_SVT_RWBUFFER = 45,
-    D3D_SVT_BYTEADDRESS_BUFFER = 46,
-    D3D_SVT_RWBYTEADDRESS_BUFFER = 47,
-    D3D_SVT_STRUCTURED_BUFFER = 48,
-    D3D_SVT_RWSTRUCTURED_BUFFER = 49,
-    D3D_SVT_APPEND_STRUCTURED_BUFFER = 50,
-    D3D_SVT_CONSUME_STRUCTURED_BUFFER = 51,
-    D3D_SVT_MIN8FLOAT = 52,
-    D3D_SVT_MIN10FLOAT = 53,
-    D3D_SVT_MIN16FLOAT = 54,
-    D3D_SVT_MIN12INT = 55,
-    D3D_SVT_MIN16INT = 56,
-    D3D_SVT_MIN16UINT = 57,
-}}
-pub const D3D10_SVT_VOID: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_VOID;
-pub const D3D10_SVT_BOOL: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_BOOL;
-pub const D3D10_SVT_INT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_INT;
-pub const D3D10_SVT_FLOAT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_FLOAT;
-pub const D3D10_SVT_STRING: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_STRING;
-pub const D3D10_SVT_TEXTURE: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE;
-pub const D3D10_SVT_TEXTURE1D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE1D;
-pub const D3D10_SVT_TEXTURE2D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE2D;
-pub const D3D10_SVT_TEXTURE3D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE3D;
-pub const D3D10_SVT_TEXTURECUBE: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURECUBE;
-pub const D3D10_SVT_SAMPLER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLER;
-pub const D3D10_SVT_SAMPLER1D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLER1D;
-pub const D3D10_SVT_SAMPLER2D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLER2D;
-pub const D3D10_SVT_SAMPLER3D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLER3D;
-pub const D3D10_SVT_SAMPLERCUBE: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLERCUBE;
-pub const D3D10_SVT_PIXELSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_PIXELSHADER;
-pub const D3D10_SVT_VERTEXSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_VERTEXSHADER;
-pub const D3D10_SVT_PIXELFRAGMENT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_PIXELFRAGMENT;
-pub const D3D10_SVT_VERTEXFRAGMENT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_VERTEXFRAGMENT;
-pub const D3D10_SVT_UINT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_UINT;
-pub const D3D10_SVT_UINT8: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_UINT8;
-pub const D3D10_SVT_GEOMETRYSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_GEOMETRYSHADER;
-pub const D3D10_SVT_RASTERIZER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RASTERIZER;
-pub const D3D10_SVT_DEPTHSTENCIL: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_DEPTHSTENCIL;
-pub const D3D10_SVT_BLEND: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_BLEND;
-pub const D3D10_SVT_BUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_BUFFER;
-pub const D3D10_SVT_CBUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_CBUFFER;
-pub const D3D10_SVT_TBUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TBUFFER;
-pub const D3D10_SVT_TEXTURE1DARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE1DARRAY;
-pub const D3D10_SVT_TEXTURE2DARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE2DARRAY;
-pub const D3D10_SVT_RENDERTARGETVIEW: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RENDERTARGETVIEW;
-pub const D3D10_SVT_DEPTHSTENCILVIEW: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_DEPTHSTENCILVIEW;
-pub const D3D10_SVT_TEXTURE2DMS: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE2DMS;
-pub const D3D10_SVT_TEXTURE2DMSARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE2DMSARRAY;
-pub const D3D10_SVT_TEXTURECUBEARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURECUBEARRAY;
-pub const D3D11_SVT_HULLSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_HULLSHADER;
-pub const D3D11_SVT_DOMAINSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_DOMAINSHADER;
-pub const D3D11_SVT_INTERFACE_POINTER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_INTERFACE_POINTER;
-pub const D3D11_SVT_COMPUTESHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_COMPUTESHADER;
-pub const D3D11_SVT_DOUBLE: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_DOUBLE;
-pub const D3D11_SVT_RWTEXTURE1D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE1D;
-pub const D3D11_SVT_RWTEXTURE1DARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE1DARRAY;
-pub const D3D11_SVT_RWTEXTURE2D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE2D;
-pub const D3D11_SVT_RWTEXTURE2DARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE2DARRAY;
-pub const D3D11_SVT_RWTEXTURE3D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE3D;
-pub const D3D11_SVT_RWBUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWBUFFER;
-pub const D3D11_SVT_BYTEADDRESS_BUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_BYTEADDRESS_BUFFER;
-pub const D3D11_SVT_RWBYTEADDRESS_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_RWBYTEADDRESS_BUFFER;
-pub const D3D11_SVT_STRUCTURED_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_STRUCTURED_BUFFER;
-pub const D3D11_SVT_RWSTRUCTURED_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_RWSTRUCTURED_BUFFER;
-pub const D3D11_SVT_APPEND_STRUCTURED_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_APPEND_STRUCTURED_BUFFER;
-pub const D3D11_SVT_CONSUME_STRUCTURED_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_CONSUME_STRUCTURED_BUFFER;
-FLAGS!{enum D3D_SHADER_INPUT_FLAGS {
-    D3D_SIF_USERPACKED = 0x1,
-    D3D_SIF_COMPARISON_SAMPLER = 0x2,
-    D3D_SIF_TEXTURE_COMPONENT_0 = 0x4,
-    D3D_SIF_TEXTURE_COMPONENT_1 = 0x8,
-    D3D_SIF_TEXTURE_COMPONENTS = 0xc,
-    D3D_SIF_UNUSED = 0x10,
-}}
-pub const D3D10_SIF_USERPACKED: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_USERPACKED;
-pub const D3D10_SIF_COMPARISON_SAMPLER: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_COMPARISON_SAMPLER;
-pub const D3D10_SIF_TEXTURE_COMPONENT_0: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_TEXTURE_COMPONENT_0;
-pub const D3D10_SIF_TEXTURE_COMPONENT_1: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_TEXTURE_COMPONENT_1;
-pub const D3D10_SIF_TEXTURE_COMPONENTS: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_TEXTURE_COMPONENTS;
-ENUM!{enum D3D_SHADER_INPUT_TYPE {
-    D3D_SIT_CBUFFER,
-    D3D_SIT_TBUFFER,
-    D3D_SIT_TEXTURE,
-    D3D_SIT_SAMPLER,
-    D3D_SIT_UAV_RWTYPED,
-    D3D_SIT_STRUCTURED,
-    D3D_SIT_UAV_RWSTRUCTURED,
-    D3D_SIT_BYTEADDRESS,
-    D3D_SIT_UAV_RWBYTEADDRESS,
-    D3D_SIT_UAV_APPEND_STRUCTURED,
-    D3D_SIT_UAV_CONSUME_STRUCTURED,
-    D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER,
-}}
-pub const D3D10_SIT_CBUFFER: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_CBUFFER;
-pub const D3D10_SIT_TBUFFER: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_TBUFFER;
-pub const D3D10_SIT_TEXTURE: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_TEXTURE;
-pub const D3D10_SIT_SAMPLER: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_SAMPLER;
-pub const D3D11_SIT_UAV_RWTYPED: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_UAV_RWTYPED;
-pub const D3D11_SIT_STRUCTURED: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_STRUCTURED;
-pub const D3D11_SIT_UAV_RWSTRUCTURED: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_UAV_RWSTRUCTURED;
-pub const D3D11_SIT_BYTEADDRESS: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_BYTEADDRESS;
-pub const D3D11_SIT_UAV_RWBYTEADDRESS: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_UAV_RWBYTEADDRESS;
-pub const D3D11_SIT_UAV_APPEND_STRUCTURED: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_UAV_APPEND_STRUCTURED;
-pub const D3D11_SIT_UAV_CONSUME_STRUCTURED: ::D3D_SHADER_INPUT_TYPE =
-    D3D_SIT_UAV_CONSUME_STRUCTURED;
-pub const D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER: ::D3D_SHADER_INPUT_TYPE =
-    D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER;
-FLAGS!{enum D3D_SHADER_CBUFFER_FLAGS {
-    D3D_CBF_USERPACKED = 1,
-}}
-pub const D3D10_CBF_USERPACKED: ::D3D_SHADER_CBUFFER_FLAGS = D3D_CBF_USERPACKED;
-ENUM!{enum D3D_CBUFFER_TYPE {
-    D3D_CT_CBUFFER,
-    D3D_CT_TBUFFER,
-    D3D_CT_INTERFACE_POINTERS,
-    D3D_CT_RESOURCE_BIND_INFO,
-}}
-pub const D3D10_CT_CBUFFER: ::D3D_CBUFFER_TYPE = D3D_CT_CBUFFER;
-pub const D3D10_CT_TBUFFER: ::D3D_CBUFFER_TYPE = D3D_CT_TBUFFER;
-pub const D3D11_CT_CBUFFER: ::D3D_CBUFFER_TYPE = D3D_CT_CBUFFER;
-pub const D3D11_CT_TBUFFER: ::D3D_CBUFFER_TYPE = D3D_CT_TBUFFER;
-pub const D3D11_CT_INTERFACE_POINTERS: ::D3D_CBUFFER_TYPE = D3D_CT_INTERFACE_POINTERS;
-pub const D3D11_CT_RESOURCE_BIND_INFO: ::D3D_CBUFFER_TYPE = D3D_CT_RESOURCE_BIND_INFO;
-ENUM!{enum D3D_NAME {
-    D3D_NAME_UNDEFINED = 0,
-    D3D_NAME_POSITION = 1,
-    D3D_NAME_CLIP_DISTANCE = 2,
-    D3D_NAME_CULL_DISTANCE = 3,
-    D3D_NAME_RENDER_TARGET_ARRAY_INDEX = 4,
-    D3D_NAME_VIEWPORT_ARRAY_INDEX = 5,
-    D3D_NAME_VERTEX_ID = 6,
-    D3D_NAME_PRIMITIVE_ID = 7,
-    D3D_NAME_INSTANCE_ID = 8,
-    D3D_NAME_IS_FRONT_FACE = 9,
-    D3D_NAME_SAMPLE_INDEX = 10,
-    D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR = 11,
-    D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR = 12,
-    D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR = 13,
-    D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR = 14,
-    D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR = 15,
-    D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR = 16,
-    D3D_NAME_TARGET = 64,
-    D3D_NAME_DEPTH = 65,
-    D3D_NAME_COVERAGE = 66,
-    D3D_NAME_DEPTH_GREATER_EQUAL = 67,
-    D3D_NAME_DEPTH_LESS_EQUAL = 68,
-}}
-pub const D3D10_NAME_UNDEFINED: D3D_NAME = D3D_NAME_UNDEFINED;
-pub const D3D10_NAME_POSITION: D3D_NAME = D3D_NAME_POSITION;
-pub const D3D10_NAME_CLIP_DISTANCE: D3D_NAME = D3D_NAME_CLIP_DISTANCE;
-pub const D3D10_NAME_CULL_DISTANCE: D3D_NAME = D3D_NAME_CULL_DISTANCE;
-pub const D3D10_NAME_RENDER_TARGET_ARRAY_INDEX: D3D_NAME = D3D_NAME_RENDER_TARGET_ARRAY_INDEX;
-pub const D3D10_NAME_VIEWPORT_ARRAY_INDEX: D3D_NAME = D3D_NAME_VIEWPORT_ARRAY_INDEX;
-pub const D3D10_NAME_VERTEX_ID: D3D_NAME = D3D_NAME_VERTEX_ID;
-pub const D3D10_NAME_PRIMITIVE_ID: D3D_NAME = D3D_NAME_PRIMITIVE_ID;
-pub const D3D10_NAME_INSTANCE_ID: D3D_NAME = D3D_NAME_INSTANCE_ID;
-pub const D3D10_NAME_IS_FRONT_FACE: D3D_NAME = D3D_NAME_IS_FRONT_FACE;
-pub const D3D10_NAME_SAMPLE_INDEX: D3D_NAME = D3D_NAME_SAMPLE_INDEX;
-pub const D3D10_NAME_TARGET: D3D_NAME = D3D_NAME_TARGET;
-pub const D3D10_NAME_DEPTH: D3D_NAME = D3D_NAME_DEPTH;
-pub const D3D10_NAME_COVERAGE: D3D_NAME = D3D_NAME_COVERAGE;
-pub const D3D11_NAME_FINAL_QUAD_EDGE_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR;
-pub const D3D11_NAME_FINAL_QUAD_INSIDE_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR;
-pub const D3D11_NAME_FINAL_TRI_EDGE_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR;
-pub const D3D11_NAME_FINAL_TRI_INSIDE_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR;
-pub const D3D11_NAME_FINAL_LINE_DETAIL_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR;
-pub const D3D11_NAME_FINAL_LINE_DENSITY_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR;
-pub const D3D11_NAME_DEPTH_GREATER_EQUAL: D3D_NAME = D3D_NAME_DEPTH_GREATER_EQUAL;
-pub const D3D11_NAME_DEPTH_LESS_EQUAL: D3D_NAME = D3D_NAME_DEPTH_LESS_EQUAL;
-ENUM!{enum D3D_RESOURCE_RETURN_TYPE {
-    D3D_RETURN_TYPE_UNORM = 1,
-    D3D_RETURN_TYPE_SNORM = 2,
-    D3D_RETURN_TYPE_SINT = 3,
-    D3D_RETURN_TYPE_UINT = 4,
-    D3D_RETURN_TYPE_FLOAT = 5,
-    D3D_RETURN_TYPE_MIXED = 6,
-    D3D_RETURN_TYPE_DOUBLE = 7,
-    D3D_RETURN_TYPE_CONTINUED = 8,
-}}
-pub const D3D10_RETURN_TYPE_UNORM: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_UNORM;
-pub const D3D10_RETURN_TYPE_SNORM: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_SNORM;
-pub const D3D10_RETURN_TYPE_SINT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_SINT;
-pub const D3D10_RETURN_TYPE_UINT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_UINT;
-pub const D3D10_RETURN_TYPE_FLOAT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_FLOAT;
-pub const D3D10_RETURN_TYPE_MIXED: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_MIXED;
-pub const D3D11_RETURN_TYPE_UNORM: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_UNORM;
-pub const D3D11_RETURN_TYPE_SNORM: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_SNORM;
-pub const D3D11_RETURN_TYPE_SINT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_SINT;
-pub const D3D11_RETURN_TYPE_UINT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_UINT;
-pub const D3D11_RETURN_TYPE_FLOAT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_FLOAT;
-pub const D3D11_RETURN_TYPE_MIXED: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_MIXED;
-pub const D3D11_RETURN_TYPE_DOUBLE: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_DOUBLE;
-pub const D3D11_RETURN_TYPE_CONTINUED: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_CONTINUED;
-ENUM!{enum D3D_REGISTER_COMPONENT_TYPE {
-    D3D_REGISTER_COMPONENT_UNKNOWN = 0,
-    D3D_REGISTER_COMPONENT_UINT32 = 1,
-    D3D_REGISTER_COMPONENT_SINT32 = 2,
-    D3D_REGISTER_COMPONENT_FLOAT32 = 3,
-}}
-pub const D3D10_REGISTER_COMPONENT_UNKNOWN: ::D3D_REGISTER_COMPONENT_TYPE =
-    D3D_REGISTER_COMPONENT_UNKNOWN;
-pub const D3D10_REGISTER_COMPONENT_UINT32: ::D3D_REGISTER_COMPONENT_TYPE =
-    D3D_REGISTER_COMPONENT_UINT32;
-pub const D3D10_REGISTER_COMPONENT_SINT32: ::D3D_REGISTER_COMPONENT_TYPE =
-    D3D_REGISTER_COMPONENT_SINT32;
-pub const D3D10_REGISTER_COMPONENT_FLOAT32: ::D3D_REGISTER_COMPONENT_TYPE =
-    D3D_REGISTER_COMPONENT_FLOAT32;
-ENUM!{enum D3D_TESSELLATOR_DOMAIN {
-    D3D_TESSELLATOR_DOMAIN_UNDEFINED,
-    D3D_TESSELLATOR_DOMAIN_ISOLINE,
-    D3D_TESSELLATOR_DOMAIN_TRI,
-    D3D_TESSELLATOR_DOMAIN_QUAD,
-}}
-pub const D3D11_TESSELLATOR_DOMAIN_UNDEFINED: ::D3D_TESSELLATOR_DOMAIN =
-    D3D_TESSELLATOR_DOMAIN_UNDEFINED;
-pub const D3D11_TESSELLATOR_DOMAIN_ISOLINE: ::D3D_TESSELLATOR_DOMAIN =
-    D3D_TESSELLATOR_DOMAIN_ISOLINE;
-pub const D3D11_TESSELLATOR_DOMAIN_TRI: ::D3D_TESSELLATOR_DOMAIN = D3D_TESSELLATOR_DOMAIN_TRI;
-pub const D3D11_TESSELLATOR_DOMAIN_QUAD: ::D3D_TESSELLATOR_DOMAIN = D3D_TESSELLATOR_DOMAIN_QUAD;
-ENUM!{enum D3D_TESSELLATOR_PARTITIONING {
-    D3D_TESSELLATOR_PARTITIONING_UNDEFINED,
-    D3D_TESSELLATOR_PARTITIONING_INTEGER,
-    D3D_TESSELLATOR_PARTITIONING_POW2,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN,
-}}
-pub const D3D11_TESSELLATOR_PARTITIONING_UNDEFINED: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_UNDEFINED;
-pub const D3D11_TESSELLATOR_PARTITIONING_INTEGER: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_INTEGER;
-pub const D3D11_TESSELLATOR_PARTITIONING_POW2: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_POW2;
-pub const D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD;
-pub const D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN;
-ENUM!{enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE {
-    D3D_TESSELLATOR_OUTPUT_UNDEFINED,
-    D3D_TESSELLATOR_OUTPUT_POINT,
-    D3D_TESSELLATOR_OUTPUT_LINE,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW,
-}}
-pub const D3D11_TESSELLATOR_OUTPUT_UNDEFINED: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_UNDEFINED;
-pub const D3D11_TESSELLATOR_OUTPUT_POINT: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_POINT;
-pub const D3D11_TESSELLATOR_OUTPUT_LINE: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_LINE;
-pub const D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW;
-pub const D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW;
-ENUM!{enum D3D_MIN_PRECISION {
-    D3D_MIN_PRECISION_DEFAULT,
-    D3D_MIN_PRECISION_FLOAT_16,
-    D3D_MIN_PRECISION_FLOAT_2_8,
-    D3D_MIN_PRECISION_RESERVED,
-    D3D_MIN_PRECISION_SINT_16,
-    D3D_MIN_PRECISION_UINT_16,
-    D3D_MIN_PRECISION_ANY_16 = 0xf0,
-    D3D_MIN_PRECISION_ANY_10 = 0xf1,
-}}
-ENUM!{enum D3D_INTERPOLATION_MODE {
-    D3D_INTERPOLATION_UNDEFINED,
-    D3D_INTERPOLATION_CONSTANT,
-    D3D_INTERPOLATION_LINEAR,
-    D3D_INTERPOLATION_LINEAR_CENTROID,
-    D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE,
-    D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID,
-    D3D_INTERPOLATION_LINEAR_SAMPLE,
-    D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE,
-}}
-FLAGS!{enum D3D_PARAMETER_FLAGS {
-    D3D_PF_NONE = 0,
-    D3D_PF_IN = 0x1,
-    D3D_PF_OUT = 0x2,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3dcompiler.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3dcompiler.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/d3dcompiler.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/d3dcompiler.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub const D3DCOMPILER_DLL: &'static str = "d3dcompiler_47.dll";
-pub const D3D_COMPILER_VERSION: DWORD = 47;
-pub const D3DCOMPILE_DEBUG: DWORD = 1 << 0;
-pub const D3DCOMPILE_SKIP_VALIDATION: DWORD = 1 << 1;
-pub const D3DCOMPILE_SKIP_OPTIMIZATION: DWORD = 1 << 2;
-pub const D3DCOMPILE_PACK_MATRIX_ROW_MAJOR: DWORD = 1 << 3;
-pub const D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR: DWORD = 1 << 4;
-pub const D3DCOMPILE_PARTIAL_PRECISION: DWORD = 1 << 5;
-pub const D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT: DWORD = 1 << 6;
-pub const D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT: DWORD = 1 << 7;
-pub const D3DCOMPILE_NO_PRESHADER: DWORD = 1 << 8;
-pub const D3DCOMPILE_AVOID_FLOW_CONTROL: DWORD = 1 << 9;
-pub const D3DCOMPILE_PREFER_FLOW_CONTROL: DWORD = 1 << 10;
-pub const D3DCOMPILE_ENABLE_STRICTNESS: DWORD = 1 << 11;
-pub const D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY: DWORD = 1 << 12;
-pub const D3DCOMPILE_IEEE_STRICTNESS: DWORD = 1 << 13;
-pub const D3DCOMPILE_OPTIMIZATION_LEVEL0: DWORD = 1 << 14;
-pub const D3DCOMPILE_OPTIMIZATION_LEVEL1: DWORD = 0;
-pub const D3DCOMPILE_OPTIMIZATION_LEVEL2: DWORD = (1 << 14) | (1 << 15);
-pub const D3DCOMPILE_OPTIMIZATION_LEVEL3: DWORD = 1 << 15;
-pub const D3DCOMPILE_RESERVED16: DWORD = 1 << 16;
-pub const D3DCOMPILE_RESERVED17: DWORD = 1 << 17;
-pub const D3DCOMPILE_WARNINGS_ARE_ERRORS: DWORD = 1 << 18;
-pub const D3DCOMPILE_RESOURCES_MAY_ALIAS: DWORD = 1 << 19;
-pub const D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES: DWORD = 1 << 20;
-pub const D3DCOMPILE_ALL_RESOURCES_BOUND: DWORD = 1 << 21;
-pub const D3DCOMPILE_EFFECT_CHILD_EFFECT: DWORD = 1 << 0;
-pub const D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS: DWORD = 1 << 1;
-pub const D3D_COMPILE_STANDARD_FILE_INCLUDE: *mut ID3DInclude = 1 as *mut ID3DInclude;
-pub const D3DCOMPILE_SECDATA_MERGE_UAV_SLOTS: DWORD = 0x00000001;
-pub const D3DCOMPILE_SECDATA_PRESERVE_TEMPLATE_SLOTS: DWORD = 0x00000002;
-pub const D3DCOMPILE_SECDATA_REQUIRE_TEMPLATE_MATCH: DWORD = 0x00000004;
-pub const D3D_DISASM_ENABLE_COLOR_CODE: DWORD = 0x00000001;
-pub const D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS: DWORD = 0x00000002;
-pub const D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING: DWORD = 0x00000004;
-pub const D3D_DISASM_ENABLE_INSTRUCTION_CYCLE: DWORD = 0x00000008;
-pub const D3D_DISASM_DISABLE_DEBUG_INFO: DWORD = 0x00000010;
-pub const D3D_DISASM_ENABLE_INSTRUCTION_OFFSET: DWORD = 0x00000020;
-pub const D3D_DISASM_INSTRUCTION_ONLY: DWORD = 0x00000040;
-pub const D3D_DISASM_PRINT_HEX_LITERALS: DWORD = 0x00000080;
-pub const D3D_GET_INST_OFFSETS_INCLUDE_NON_EXECUTABLE: DWORD = 0x00000001;
-FLAGS!{enum D3DCOMPILER_STRIP_FLAGS {
-    D3DCOMPILER_STRIP_REFLECTION_DATA = 0x00000001,
-    D3DCOMPILER_STRIP_DEBUG_INFO = 0x00000002,
-    D3DCOMPILER_STRIP_TEST_BLOBS = 0x00000004,
-    D3DCOMPILER_STRIP_PRIVATE_DATA = 0x00000008,
-    D3DCOMPILER_STRIP_ROOT_SIGNATURE = 0x00000010,
-    D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff,
-}}
-ENUM!{enum D3D_BLOB_PART {
-    D3D_BLOB_INPUT_SIGNATURE_BLOB,
-    D3D_BLOB_OUTPUT_SIGNATURE_BLOB,
-    D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB,
-    D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB,
-    D3D_BLOB_ALL_SIGNATURE_BLOB,
-    D3D_BLOB_DEBUG_INFO,
-    D3D_BLOB_LEGACY_SHADER,
-    D3D_BLOB_XNA_PREPASS_SHADER,
-    D3D_BLOB_XNA_SHADER,
-    D3D_BLOB_PDB,
-    D3D_BLOB_PRIVATE_DATA,
-    D3D_BLOB_ROOT_SIGNATURE,
-    D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000,
-    D3D_BLOB_TEST_COMPILE_DETAILS,
-    D3D_BLOB_TEST_COMPILE_PERF,
-    D3D_BLOB_TEST_COMPILE_REPORT,
-}}
-STRUCT!{struct D3D_SHADER_DATA {
-    pBytecode: LPCVOID,
-    BytecodeLength: SIZE_T,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dbghelp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dbghelp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dbghelp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dbghelp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,340 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! DbgHelp include file
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct LOADED_IMAGE {
-    ModuleName: ::PSTR,
-    hFile: ::HANDLE,
-    MappedAddress: ::PUCHAR,
-    FileHeader: ::PIMAGE_NT_HEADERS64,
-    LastRvaSection: ::PIMAGE_SECTION_HEADER,
-    NumberOfSections: ::ULONG,
-    Sections: ::PIMAGE_SECTION_HEADER,
-    Characteristics: ::ULONG,
-    fSystemImage: ::BOOLEAN,
-    fDOSImage: ::BOOLEAN,
-    fReadOnly: ::BOOLEAN,
-    Version: ::UCHAR,
-    Links: ::LIST_ENTRY,
-    SizeOfImage: ::ULONG,
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct LOADED_IMAGE {
-    ModuleName: ::PSTR,
-    hFile: ::HANDLE,
-    MappedAddress: ::PUCHAR,
-    FileHeader: ::PIMAGE_NT_HEADERS32,
-    LastRvaSection: ::PIMAGE_SECTION_HEADER,
-    NumberOfSections: ::ULONG,
-    Sections: ::PIMAGE_SECTION_HEADER,
-    Characteristics: ::ULONG,
-    fSystemImage: ::BOOLEAN,
-    fDOSImage: ::BOOLEAN,
-    fReadOnly: ::BOOLEAN,
-    Version: ::UCHAR,
-    Links: ::LIST_ENTRY,
-    SizeOfImage: ::ULONG,
-}}
-pub const MAX_SYM_NAME: usize = 2000;
-pub const ERROR_IMAGE_NOT_STRIPPED: ::DWORD = 0x8800;
-pub const ERROR_NO_DBG_POINTER: ::DWORD = 0x8801;
-pub const ERROR_NO_PDB_POINTER: ::DWORD = 0x8802;
-pub type PFIND_DEBUG_FILE_CALLBACK = Option<unsafe extern "system" fn(
-    FileHandle: ::HANDLE, FileName: ::PCSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub type PFIND_DEBUG_FILE_CALLBACKW = Option<unsafe extern "system" fn(
-    FileHandle: ::HANDLE, FileName: ::PCWSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub type PFINDFILEINPATHCALLBACK = Option<unsafe extern "system" fn(
-    filename: ::PCSTR, context: ::PVOID,
-) -> ::BOOL>;
-pub type PFINDFILEINPATHCALLBACKW = Option<unsafe extern "system" fn(
-    filename: ::PCWSTR, context: ::PVOID,
-) -> ::BOOL>;
-pub type PFIND_EXE_FILE_CALLBACK = Option<unsafe extern "system" fn(
-    FileHandle: ::HANDLE, FileName: ::PCSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub type PFIND_EXE_FILE_CALLBACKW = Option<unsafe extern "system" fn(
-    FileHandle: ::HANDLE, FileName: ::PCWSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct IMAGE_DEBUG_INFORMATION {
-    List: ::LIST_ENTRY,
-    ReservedSize: ::DWORD,
-    ReservedMappedBase: ::PVOID,
-    ReservedMachine: ::USHORT,
-    ReservedCharacteristics: ::USHORT,
-    ReservedCheckSum: ::DWORD,
-    ImageBase: ::DWORD,
-    SizeOfImage: ::DWORD,
-    ReservedNumberOfSections: ::DWORD,
-    ReservedSections: ::PIMAGE_SECTION_HEADER,
-    ReservedExportedNamesSize: ::DWORD,
-    ReservedExportedNames: ::PSTR,
-    ReservedNumberOfFunctionTableEntries: ::DWORD,
-    ReservedFunctionTableEntries: ::PIMAGE_FUNCTION_ENTRY,
-    ReservedLowestFunctionStartingAddress: ::DWORD,
-    ReservedHighestFunctionEndingAddress: ::DWORD,
-    ReservedNumberOfFpoTableEntries: ::DWORD,
-    ReservedFpoTableEntries: ::PFPO_DATA,
-    SizeOfCoffSymbols: ::DWORD,
-    CoffSymbols: ::PIMAGE_COFF_SYMBOLS_HEADER,
-    ReservedSizeOfCodeViewSymbols: ::DWORD,
-    ReservedCodeViewSymbols: ::PVOID,
-    ImageFilePath: ::PSTR,
-    ImageFileName: ::PSTR,
-    ReservedDebugFilePath: ::PSTR,
-    ReservedTimeDateStamp: ::DWORD,
-    ReservedRomImage: ::BOOL,
-    ReservedDebugDirectory: ::PIMAGE_DEBUG_DIRECTORY,
-    ReservedNumberOfDebugDirectories: ::DWORD,
-    ReservedOriginalFunctionTableBaseAddress: ::DWORD,
-    Reserved: [::DWORD; 2],
-}}
-#[cfg(target_arch = "x86")]
-pub type PIMAGE_DEBUG_INFORMATION = *mut IMAGE_DEBUG_INFORMATION;
-pub type PENUMDIRTREE_CALLBACK = Option<unsafe extern "system" fn(
-    FilePath: ::PCSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub type PENUMDIRTREE_CALLBACKW = Option<unsafe extern "system" fn(
-    FilePath: ::PCWSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub const UNDNAME_COMPLETE: ::DWORD = 0x0000;
-pub const UNDNAME_NO_LEADING_UNDERSCORES: ::DWORD = 0x0001;
-pub const UNDNAME_NO_MS_KEYWORDS: ::DWORD = 0x0002;
-pub const UNDNAME_NO_FUNCTION_RETURNS: ::DWORD = 0x0004;
-pub const UNDNAME_NO_ALLOCATION_MODEL: ::DWORD = 0x0008;
-pub const UNDNAME_NO_ALLOCATION_LANGUAGE: ::DWORD = 0x0010;
-pub const UNDNAME_NO_MS_THISTYPE: ::DWORD = 0x0020;
-pub const UNDNAME_NO_CV_THISTYPE: ::DWORD = 0x0040;
-pub const UNDNAME_NO_THISTYPE: ::DWORD = 0x0060;
-pub const UNDNAME_NO_ACCESS_SPECIFIERS: ::DWORD = 0x0080;
-pub const UNDNAME_NO_THROW_SIGNATURES: ::DWORD = 0x0100;
-pub const UNDNAME_NO_MEMBER_TYPE: ::DWORD = 0x0200;
-pub const UNDNAME_NO_RETURN_UDT_MODEL: ::DWORD = 0x0400;
-pub const UNDNAME_32_BIT_DECODE: ::DWORD = 0x0800;
-pub const UNDNAME_NAME_ONLY: ::DWORD = 0x1000;
-pub const UNDNAME_NO_ARGUMENTS: ::DWORD = 0x2000;
-pub const UNDNAME_NO_SPECIAL_SYMS: ::DWORD = 0x4000;
-pub const DBHHEADER_DEBUGDIRS: ::DWORD = 0x1;
-pub const DBHHEADER_CVMISC: ::DWORD = 0x2;
-pub const DBHHEADER_PDBGUID: ::DWORD = 0x3;
-STRUCT!{struct MODLOAD_DATA {
-    ssize: ::DWORD,
-    ssig: ::DWORD,
-    data: ::PVOID,
-    size: ::DWORD,
-    flags: ::DWORD,
-}}
-pub type PMODLOAD_DATA = *mut MODLOAD_DATA;
-STRUCT!{struct MODLOAD_CVMISC {
-    oCV: ::DWORD,
-    cCV: ::size_t,
-    oMisc: ::DWORD,
-    cMisc: ::size_t,
-    dtImage: ::DWORD,
-    cImage: ::DWORD,
-}}
-pub type PMODLOAD_CVMISC = *mut MODLOAD_CVMISC;
-STRUCT!{struct MODLOAD_PDBGUID_PDBAGE {
-    PdbGuid: ::GUID,
-    PdbAge: ::DWORD,
-}}
-pub type PMODLOAD_PDBGUID_PDBAGE = *mut MODLOAD_PDBGUID_PDBAGE;
-ENUM!{enum ADDRESS_MODE {
-    AddrMode1616,
-    AddrMode1632,
-    AddrModeReal,
-    AddrModeFlat,
-}}
-STRUCT!{struct ADDRESS64 {
-    Offset: ::DWORD64,
-    Segment: ::WORD,
-    Mode: ::ADDRESS_MODE,
-}}
-pub type LPADDRESS64 = *mut ADDRESS64;
-#[cfg(target_arch = "x86_64")]
-pub type ADDRESS = ADDRESS64;
-#[cfg(target_arch = "x86_64")]
-pub type LPADDRESS = LPADDRESS64;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct ADDRESS {
-    Offset: ::DWORD,
-    Segment: ::WORD,
-    Mode: ::ADDRESS_MODE,
-}}
-#[cfg(target_arch = "x86")]
-pub type LPADDRESS = *mut ADDRESS;
-STRUCT!{struct KDHELP64 {
-    Thread: ::DWORD64,
-    ThCallbackStack: ::DWORD,
-    ThCallbackBStore: ::DWORD,
-    NextCallback: ::DWORD,
-    FramePointer: ::DWORD,
-    KiCallUserMode: ::DWORD64,
-    KeUserCallbackDispatcher: ::DWORD64,
-    SystemRangeStart: ::DWORD64,
-    KiUserExceptionDispatcher: ::DWORD64,
-    StackBase: ::DWORD64,
-    StackLimit: ::DWORD64,
-    BuildVersion: ::DWORD,
-    Reserved0: ::DWORD,
-    Reserved1: [::DWORD64; 4],
-}}
-pub type PKDHELP64 = *mut KDHELP64;
-#[cfg(target_arch = "x86_64")]
-pub type KDHELP = KDHELP64;
-#[cfg(target_arch = "x86_64")]
-pub type PKDHELP = PKDHELP64;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct KDHELP {
-    Thread: ::DWORD,
-    ThCallbackStack: ::DWORD,
-    NextCallback: ::DWORD,
-    FramePointer: ::DWORD,
-    KiCallUserMode: ::DWORD,
-    KeUserCallbackDispatcher: ::DWORD,
-    SystemRangeStart: ::DWORD,
-    ThCallbackBStore: ::DWORD,
-    KiUserExceptionDispatcher: ::DWORD,
-    StackBase: ::DWORD,
-    StackLimit: ::DWORD,
-    Reserved: [::DWORD; 5],
-}}
-#[cfg(target_arch = "x86")]
-pub type PKDHELP = *mut KDHELP;
-STRUCT!{struct STACKFRAME64 {
-    AddrPC: ::ADDRESS64,
-    AddrReturn: ::ADDRESS64,
-    AddrFrame: ::ADDRESS64,
-    AddrStack: ::ADDRESS64,
-    AddrBStore: ::ADDRESS64,
-    FuncTableEntry: ::PVOID,
-    Params: [::DWORD64; 4],
-    Far: ::BOOL,
-    Virtual: ::BOOL,
-    Reserved: [::DWORD64; 3],
-    KdHelp: ::KDHELP64,
-}}
-pub type LPSTACKFRAME64 = *mut STACKFRAME64;
-pub const INLINE_FRAME_CONTEXT_INIT: ::DWORD = 0;
-pub const INLINE_FRAME_CONTEXT_IGNORE: ::DWORD = 0xFFFFFFFF;
-STRUCT!{struct STACKFRAME_EX {
-    AddrPC: ::ADDRESS64,
-    AddrReturn: ::ADDRESS64,
-    AddrFrame: ::ADDRESS64,
-    AddrStack: ::ADDRESS64,
-    AddrBStore: ::ADDRESS64,
-    FuncTableEntry: ::PVOID,
-    Params: [::DWORD64; 4],
-    Far: ::BOOL,
-    Virtual: ::BOOL,
-    Reserved: [::DWORD64; 3],
-    KdHelp: ::KDHELP64,
-    StackFrameSize: ::DWORD,
-    InlineFrameContext: ::DWORD,
-}}
-pub type LPSTACKFRAME_EX = *mut STACKFRAME_EX;
-#[cfg(target_arch = "x86_64")]
-pub type STACKFRAME = STACKFRAME64;
-#[cfg(target_arch = "x86_64")]
-pub type LPSTACKFRAME = LPSTACKFRAME64;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct STACKFRAME {
-    AddrPC: ::ADDRESS,
-    AddrReturn: ::ADDRESS,
-    AddrFrame: ::ADDRESS,
-    AddrStack: ::ADDRESS,
-    FuncTableEntry: ::PVOID,
-    Params: [::DWORD; 4],
-    Far: ::BOOL,
-    Virtual: ::BOOL,
-    Reserved: [::DWORD; 3],
-    KdHelp: ::KDHELP,
-    AddrBStore: ::ADDRESS,
-}}
-#[cfg(target_arch = "x86")]
-pub type LPSTACKFRAME = *mut STACKFRAME;
-pub type PREAD_PROCESS_MEMORY_ROUTINE64 = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, qwBaseAddress: ::DWORD64, lpBuffer: ::PVOID, nSize: ::DWORD,
-    lpNumberOfBytesRead: ::LPDWORD,
-) -> ::BOOL>;
-pub type PFUNCTION_TABLE_ACCESS_ROUTINE64 = Option<unsafe extern "system" fn(
-    ahProcess: ::HANDLE, AddrBase: ::DWORD64,
-) -> ::PVOID>;
-pub type PGET_MODULE_BASE_ROUTINE64 = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, Address: ::DWORD64,
-) -> ::DWORD64>;
-pub type PTRANSLATE_ADDRESS_ROUTINE64 = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, hThread: ::HANDLE, lpaddr: LPADDRESS64,
-) -> ::DWORD64>;
-pub const SYM_STKWALK_DEFAULT: ::DWORD = 0x00000000;
-pub const SYM_STKWALK_FORCE_FRAMEPTR: ::DWORD = 0x00000001;
-#[cfg(target_arch = "x86_64")]
-pub type PREAD_PROCESS_MEMORY_ROUTINE = PREAD_PROCESS_MEMORY_ROUTINE64;
-#[cfg(target_arch = "x86_64")]
-pub type PFUNCTION_TABLE_ACCESS_ROUTINE = PFUNCTION_TABLE_ACCESS_ROUTINE64;
-#[cfg(target_arch = "x86_64")]
-pub type PGET_MODULE_BASE_ROUTINE = PGET_MODULE_BASE_ROUTINE64;
-#[cfg(target_arch = "x86_64")]
-pub type PTRANSLATE_ADDRESS_ROUTINE = PTRANSLATE_ADDRESS_ROUTINE64;
-#[cfg(target_arch = "x86")]
-pub type PREAD_PROCESS_MEMORY_ROUTINE = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, qwBaseAddress: ::DWORD, lpBuffer: ::PVOID, nSize: ::DWORD,
-    lpNumberOfBytesRead: ::PDWORD,
-) -> ::BOOL>;
-#[cfg(target_arch = "x86")]
-pub type PFUNCTION_TABLE_ACCESS_ROUTINE = Option<unsafe extern "system" fn(
-    ahProcess: ::HANDLE, AddrBase: ::DWORD,
-) -> ::PVOID>;
-#[cfg(target_arch = "x86")]
-pub type PGET_MODULE_BASE_ROUTINE = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, Address: ::DWORD,
-) -> ::DWORD>;
-#[cfg(target_arch = "x86")]
-pub type PTRANSLATE_ADDRESS_ROUTINE = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, hThread: ::HANDLE, lpaddr: LPADDRESS,
-) -> ::DWORD>;
-pub const API_VERSION_NUMBER: ::USHORT = 12;
-STRUCT!{struct API_VERSION {
-    MajorVersion: ::USHORT,
-    MinorVersion: ::USHORT,
-    Revision: ::USHORT,
-    Reserved: ::USHORT,
-}}
-pub type LPAPI_VERSION = *mut API_VERSION;
-STRUCT!{struct SYMBOL_INFOW {
-    SizeOfStruct: ::ULONG,
-    TypeIndex: ::ULONG,
-    Reserved: [::ULONG64; 2],
-    Index: ::ULONG,
-    Size: ::ULONG,
-    ModBase: ::ULONG64,
-    Flags: ::ULONG,
-    Value: ::ULONG64,
-    Address: ::ULONG64,
-    Register: ::ULONG,
-    Scope: ::ULONG,
-    Tag: ::ULONG,
-    NameLen: ::ULONG,
-    MaxNameLen: ::ULONG,
-    Name: [::WCHAR; 1],
-}}
-pub type PSYMBOL_INFOW = *mut SYMBOL_INFOW;
-STRUCT!{struct IMAGEHLP_SYMBOL64 {
-    SizeOfStruct: ::DWORD,
-    Address: ::DWORD64,
-    Size: ::DWORD,
-    Flags: ::DWORD,
-    MaxNameLength: ::DWORD,
-    Name: [::CHAR; 1],
-}}
-pub type PIMAGEHLP_SYMBOL64 = *mut IMAGEHLP_SYMBOL64;
-STRUCT!{struct IMAGEHLP_LINEW64 {
-    SizeOfStruct: ::DWORD,
-    Key: ::PVOID,
-    LineNumber: ::DWORD,
-    FileName: ::PWSTR,
-    Address: ::DWORD64,
-}}
-pub type PIMAGEHLP_LINEW64 = *mut IMAGEHLP_LINEW64;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dcommon.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dcommon.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dcommon.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dcommon.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dcommon.h
-ENUM!{enum DWRITE_MEASURING_MODE {
-    DWRITE_MEASURING_MODE_NATURAL = 0,
-    DWRITE_MEASURING_MODE_GDI_CLASSIC = 1,
-    DWRITE_MEASURING_MODE_GDI_NATURAL = 2,
-}}
-ENUM!{enum D2D1_ALPHA_MODE {
-    D2D1_ALPHA_MODE_UNKNOWN = 0,
-    D2D1_ALPHA_MODE_PREMULTIPLIED = 1,
-    D2D1_ALPHA_MODE_STRAIGHT = 2,
-    D2D1_ALPHA_MODE_IGNORE = 3,
-}}
-STRUCT!{struct D2D1_PIXEL_FORMAT {
-    format: ::DXGI_FORMAT,
-    alphaMode: D2D1_ALPHA_MODE,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/devpropdef.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/devpropdef.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/devpropdef.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/devpropdef.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Defines property types and keys for the Plug and Play Device Property API
-pub type DEVPROPTYPE = ::ULONG;
-pub type PDEVPROPTYPE = *mut ::ULONG;
-pub const DEVPROP_TYPEMOD_ARRAY: DEVPROPTYPE = 0x00001000;
-pub const DEVPROP_TYPEMOD_LIST: DEVPROPTYPE = 0x00002000;
-pub const DEVPROP_TYPE_EMPTY: DEVPROPTYPE = 0x00000000;
-pub const DEVPROP_TYPE_NULL: DEVPROPTYPE = 0x00000001;
-pub const DEVPROP_TYPE_SBYTE: DEVPROPTYPE = 0x00000002;
-pub const DEVPROP_TYPE_BYTE: DEVPROPTYPE = 0x00000003;
-pub const DEVPROP_TYPE_INT16: DEVPROPTYPE = 0x00000004;
-pub const DEVPROP_TYPE_UINT16: DEVPROPTYPE = 0x00000005;
-pub const DEVPROP_TYPE_INT32: DEVPROPTYPE = 0x00000006;
-pub const DEVPROP_TYPE_UINT32: DEVPROPTYPE = 0x00000007;
-pub const DEVPROP_TYPE_INT64: DEVPROPTYPE = 0x00000008;
-pub const DEVPROP_TYPE_UINT64: DEVPROPTYPE = 0x00000009;
-pub const DEVPROP_TYPE_FLOAT: DEVPROPTYPE = 0x0000000A;
-pub const DEVPROP_TYPE_DOUBLE: DEVPROPTYPE = 0x0000000B;
-pub const DEVPROP_TYPE_DECIMAL: DEVPROPTYPE = 0x0000000C;
-pub const DEVPROP_TYPE_GUID: DEVPROPTYPE = 0x0000000D;
-pub const DEVPROP_TYPE_CURRENCY: DEVPROPTYPE = 0x0000000E;
-pub const DEVPROP_TYPE_DATE: DEVPROPTYPE = 0x0000000F;
-pub const DEVPROP_TYPE_FILETIME: DEVPROPTYPE = 0x00000010;
-pub const DEVPROP_TYPE_BOOLEAN: DEVPROPTYPE = 0x00000011;
-pub const DEVPROP_TYPE_STRING: DEVPROPTYPE = 0x00000012;
-pub const DEVPROP_TYPE_STRING_LIST: DEVPROPTYPE = DEVPROP_TYPE_STRING | DEVPROP_TYPEMOD_LIST;
-pub const DEVPROP_TYPE_SECURITY_DESCRIPTOR: DEVPROPTYPE = 0x00000013;
-pub const DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING: DEVPROPTYPE = 0x00000014;
-pub const DEVPROP_TYPE_DEVPROPKEY: DEVPROPTYPE = 0x00000015;
-pub const DEVPROP_TYPE_DEVPROPTYPE: DEVPROPTYPE = 0x00000016;
-pub const DEVPROP_TYPE_BINARY: DEVPROPTYPE = DEVPROP_TYPE_BYTE | DEVPROP_TYPEMOD_ARRAY;
-pub const DEVPROP_TYPE_ERROR: DEVPROPTYPE = 0x00000017;
-pub const DEVPROP_TYPE_NTSTATUS: DEVPROPTYPE = 0x00000018;
-pub const DEVPROP_TYPE_STRING_INDIRECT: DEVPROPTYPE = 0x00000019;
-pub const MAX_DEVPROP_TYPE: DEVPROPTYPE = 0x00000019;
-pub const MAX_DEVPROP_TYPEMOD: DEVPROPTYPE = 0x00002000;
-pub const DEVPROP_MASK_TYPE: DEVPROPTYPE = 0x00000FFF;
-pub const DEVPROP_MASK_TYPEMOD: DEVPROPTYPE = 0x0000F000;
-pub type DEVPROP_BOOLEAN = ::CHAR;
-pub type PDEVPROP_BOOLEAN = *mut ::CHAR;
-pub const DEVPROP_TRUE: DEVPROP_BOOLEAN = -1;
-pub const DEVPROP_FALSE: DEVPROP_BOOLEAN = 0;
-pub type DEVPROPGUID = ::GUID;
-pub type PDEVPROPGUID = *mut ::GUID;
-pub type DEVPROPID = ::ULONG;
-pub type PDEVPROPID = *mut ::ULONG;
-STRUCT!{struct DEVPROPKEY {
-    fmtid: DEVPROPGUID,
-    pid: DEVPROPID,
-}}
-pub type PDEVPROPKEY = *mut DEVPROPKEY;
-ENUM!{enum DEVPROPSTORE {
-    DEVPROP_STORE_SYSTEM,
-    DEVPROP_STORE_USER,
-}}
-pub type PDEVPROPSTORE = *mut DEVPROPSTORE;
-STRUCT!{struct DEVPROPCOMPKEY {
-    Key: DEVPROPKEY,
-    Store: DEVPROPSTORE,
-    LocaleName: ::PCWSTR,
-}}
-pub type PDEVPROPCOMPKEY = *mut DEVPROPCOMPKEY;
-STRUCT!{struct DEVPROPERTY {
-    CompKey: DEVPROPCOMPKEY,
-    Type: DEVPROPTYPE,
-    BufferSize: ::ULONG,
-    Buffer: ::PVOID,
-}}
-pub type PDEVPROPERTY = *mut DEVPROPERTY;
-pub const DEVPROPID_FIRST_USABLE: DEVPROPID = 2;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/docobj.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/docobj.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/docobj.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/docobj.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct OLECMD {
-    cmdID: ::ULONG,
-    cmdf: ::DWORD,
-}}
-STRUCT!{struct OLECMDTEXT {
-    cmdtextf: ::DWORD,
-    cwActual: ::ULONG,
-    cwBuf: ::ULONG,
-    rgwz: [::wchar_t; 0],
-}}
-RIDL!{interface IOleCommandTarget(IOleCommandTargetVtbl): IUnknown(IUnknownVtbl) {
-    fn QueryStatus(
-        &mut self, pguidCmdGroup: *const ::GUID, cCmds: ::ULONG, prgCmds: *mut OLECMD,
-        pCmdText: *mut OLECMDTEXT
-    ) -> ::HRESULT,
-    fn Exec(
-        &mut self, pguidCmdGroup: *const :: GUID, nCmdID: ::DWORD, nCmdexecopt: ::DWORD,
-        pvaIn: *mut ::VARIANT, pvaOut: *mut ::VARIANT
-    ) -> ::HRESULT
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dpapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dpapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dpapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dpapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Data Protection API Prototypes and Definitions
-pub const szFORCE_KEY_PROTECTION: &'static str = "ForceKeyProtection";
-STRUCT!{struct CRYPTPROTECT_PROMPTSTRUCT {
-    cbSize: ::DWORD,
-    dwPromptFlags: ::DWORD,
-    hwndApp: ::HWND,
-    szPrompt: ::LPCWSTR,
-}}
-pub type PCRYPTPROTECT_PROMPTSTRUCT = *mut CRYPTPROTECT_PROMPTSTRUCT;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dsgetdc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dsgetdc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dsgetdc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dsgetdc.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! This file contains structures, function prototypes, and definitions for the DsGetDcName API.
-pub const DS_FORCE_REDISCOVERY: ::ULONG = 0x00000001;
-pub const DS_DIRECTORY_SERVICE_REQUIRED: ::ULONG = 0x00000010;
-pub const DS_DIRECTORY_SERVICE_PREFERRED: ::ULONG = 0x00000020;
-pub const DS_GC_SERVER_REQUIRED: ::ULONG = 0x00000040;
-pub const DS_PDC_REQUIRED: ::ULONG = 0x00000080;
-pub const DS_BACKGROUND_ONLY: ::ULONG = 0x00000100;
-pub const DS_IP_REQUIRED: ::ULONG = 0x00000200;
-pub const DS_KDC_REQUIRED: ::ULONG = 0x00000400;
-pub const DS_TIMESERV_REQUIRED: ::ULONG = 0x00000800;
-pub const DS_WRITABLE_REQUIRED: ::ULONG = 0x00001000;
-pub const DS_GOOD_TIMESERV_PREFERRED: ::ULONG = 0x00002000;
-pub const DS_AVOID_SELF: ::ULONG = 0x00004000;
-pub const DS_ONLY_LDAP_NEEDED: ::ULONG = 0x00008000;
-pub const DS_IS_FLAT_NAME: ::ULONG = 0x00010000;
-pub const DS_IS_DNS_NAME: ::ULONG = 0x00020000;
-pub const DS_TRY_NEXTCLOSEST_SITE: ::ULONG = 0x00040000;
-pub const DS_DIRECTORY_SERVICE_6_REQUIRED: ::ULONG = 0x00080000;
-pub const DS_WEB_SERVICE_REQUIRED: ::ULONG = 0x00100000;
-pub const DS_DIRECTORY_SERVICE_8_REQUIRED: ::ULONG = 0x00200000;
-pub const DS_DIRECTORY_SERVICE_9_REQUIRED: ::ULONG = 0x00400000;
-pub const DS_RETURN_DNS_NAME: ::ULONG = 0x40000000;
-pub const DS_RETURN_FLAT_NAME: ::ULONG = 0x80000000;
-pub const DSGETDC_VALID_FLAGS: ::ULONG = DS_FORCE_REDISCOVERY | DS_DIRECTORY_SERVICE_REQUIRED
-    | DS_DIRECTORY_SERVICE_PREFERRED | DS_GC_SERVER_REQUIRED | DS_PDC_REQUIRED | DS_BACKGROUND_ONLY
-    | DS_IP_REQUIRED | DS_KDC_REQUIRED | DS_TIMESERV_REQUIRED | DS_WRITABLE_REQUIRED
-    | DS_GOOD_TIMESERV_PREFERRED | DS_AVOID_SELF | DS_ONLY_LDAP_NEEDED | DS_IS_FLAT_NAME
-    | DS_IS_DNS_NAME | DS_TRY_NEXTCLOSEST_SITE | DS_DIRECTORY_SERVICE_6_REQUIRED
-    | DS_DIRECTORY_SERVICE_8_REQUIRED | DS_DIRECTORY_SERVICE_9_REQUIRED | DS_WEB_SERVICE_REQUIRED
-    | DS_RETURN_FLAT_NAME | DS_RETURN_DNS_NAME;
-STRUCT!{struct DOMAIN_CONTROLLER_INFOA {
-    DomainControllerName: ::LPSTR,
-    DomainControllerAddress: ::LPSTR,
-    DomainControllerAddressType: ::ULONG,
-    DomainGuid: ::GUID,
-    DomainName: ::LPSTR,
-    DnsForestName: ::LPSTR,
-    Flags: ::ULONG,
-    DcSiteName: ::LPSTR,
-    ClientSiteName: ::LPSTR,
-}}
-pub type PDOMAIN_CONTROLLER_INFOA = *mut DOMAIN_CONTROLLER_INFOA;
-STRUCT!{struct DOMAIN_CONTROLLER_INFOW {
-    DomainControllerName: ::LPWSTR,
-    DomainControllerAddress: ::LPWSTR,
-    DomainControllerAddressType: ::ULONG,
-    DomainGuid: ::GUID,
-    DomainName: ::LPWSTR,
-    DnsForestName: ::LPWSTR,
-    Flags: ::ULONG,
-    DcSiteName: ::LPWSTR,
-    ClientSiteName: ::LPWSTR,
-}}
-pub type PDOMAIN_CONTROLLER_INFOW = *mut DOMAIN_CONTROLLER_INFOW;
-pub const DS_INET_ADDRESS: ::ULONG = 1;
-pub const DS_NETBIOS_ADDRESS: ::ULONG = 2;
-pub const DS_PDC_FLAG: ::ULONG = 0x00000001;
-pub const DS_GC_FLAG: ::ULONG = 0x00000004;
-pub const DS_LDAP_FLAG: ::ULONG = 0x00000008;
-pub const DS_DS_FLAG: ::ULONG = 0x00000010;
-pub const DS_KDC_FLAG: ::ULONG = 0x00000020;
-pub const DS_TIMESERV_FLAG: ::ULONG = 0x00000040;
-pub const DS_CLOSEST_FLAG: ::ULONG = 0x00000080;
-pub const DS_WRITABLE_FLAG: ::ULONG = 0x00000100;
-pub const DS_GOOD_TIMESERV_FLAG: ::ULONG = 0x00000200;
-pub const DS_NDNC_FLAG: ::ULONG = 0x00000400;
-pub const DS_SELECT_SECRET_DOMAIN_6_FLAG: ::ULONG = 0x00000800;
-pub const DS_FULL_SECRET_DOMAIN_6_FLAG: ::ULONG = 0x00001000;
-pub const DS_WS_FLAG: ::ULONG = 0x00002000;
-pub const DS_DS_8_FLAG: ::ULONG = 0x00004000;
-pub const DS_DS_9_FLAG: ::ULONG = 0x00008000;
-pub const DS_PING_FLAGS: ::ULONG = 0x000FFFFF;
-pub const DS_DNS_CONTROLLER_FLAG: ::ULONG = 0x20000000;
-pub const DS_DNS_DOMAIN_FLAG: ::ULONG = 0x40000000;
-pub const DS_DNS_FOREST_FLAG: ::ULONG = 0x80000000;
-pub const DS_DOMAIN_IN_FOREST: ::ULONG = 0x0001;
-pub const DS_DOMAIN_DIRECT_OUTBOUND: ::ULONG = 0x0002;
-pub const DS_DOMAIN_TREE_ROOT: ::ULONG = 0x0004;
-pub const DS_DOMAIN_PRIMARY: ::ULONG = 0x0008;
-pub const DS_DOMAIN_NATIVE_MODE: ::ULONG = 0x0010;
-pub const DS_DOMAIN_DIRECT_INBOUND: ::ULONG = 0x0020;
-pub const DS_DOMAIN_VALID_FLAGS: ::ULONG = DS_DOMAIN_IN_FOREST | DS_DOMAIN_DIRECT_OUTBOUND
-    | DS_DOMAIN_TREE_ROOT | DS_DOMAIN_PRIMARY | DS_DOMAIN_NATIVE_MODE | DS_DOMAIN_DIRECT_INBOUND;
-STRUCT!{struct DS_DOMAIN_TRUSTSW {
-    NetbiosDomainName: ::LPWSTR,
-    DnsDomainName: ::LPWSTR,
-    Flags: ::ULONG,
-    ParentIndex: ::ULONG,
-    TrustType: ::ULONG,
-    TrustAttributes: ::ULONG,
-    DomainSid: ::PSID,
-    DomainGuid: ::GUID,
-}}
-pub type PDS_DOMAIN_TRUSTSW = *mut DS_DOMAIN_TRUSTSW;
-STRUCT!{struct DS_DOMAIN_TRUSTSA {
-    NetbiosDomainName: ::LPSTR,
-    DnsDomainName: ::LPSTR,
-    Flags: ::ULONG,
-    ParentIndex: ::ULONG,
-    TrustType: ::ULONG,
-    TrustAttributes: ::ULONG,
-    DomainSid: ::PSID,
-    DomainGuid: ::GUID,
-}}
-pub type PDS_DOMAIN_TRUSTSA = *mut DS_DOMAIN_TRUSTSA;
-pub const DS_ONLY_DO_SITE_NAME: ::ULONG = 0x01;
-pub const DS_NOTIFY_AFTER_SITE_RECORDS: ::ULONG = 0x02;
-pub const DS_OPEN_VALID_OPTION_FLAGS: ::ULONG = DS_ONLY_DO_SITE_NAME
-    | DS_NOTIFY_AFTER_SITE_RECORDS;
-pub const DS_OPEN_VALID_FLAGS: ::ULONG = DS_FORCE_REDISCOVERY | DS_ONLY_LDAP_NEEDED
-    | DS_KDC_REQUIRED | DS_PDC_REQUIRED | DS_GC_SERVER_REQUIRED | DS_WRITABLE_REQUIRED;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dsound.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dsound.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dsound.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dsound.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! DSound procedure declarations, constant definitions and macros
-STRUCT!{struct DSCAPS {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    dwMinSecondarySampleRate: ::DWORD,
-    dwMaxSecondarySampleRate: ::DWORD,
-    dwPrimaryBuffers: ::DWORD,
-    dwMaxHwMixingAllBuffers: ::DWORD,
-    dwMaxHwMixingStaticBuffers: ::DWORD,
-    dwMaxHwMixingStreamingBuffers: ::DWORD,
-    dwFreeHwMixingAllBuffers: ::DWORD,
-    dwFreeHwMixingStaticBuffers: ::DWORD,
-    dwFreeHwMixingStreamingBuffers: ::DWORD,
-    dwMaxHw3DAllBuffers: ::DWORD,
-    dwMaxHw3DStaticBuffers: ::DWORD,
-    dwMaxHw3DStreamingBuffers: ::DWORD,
-    dwFreeHw3DAllBuffers: ::DWORD,
-    dwFreeHw3DStaticBuffers: ::DWORD,
-    dwFreeHw3DStreamingBuffers: ::DWORD,
-    dwTotalHwMemBytes: ::DWORD,
-    dwFreeHwMemBytes: ::DWORD,
-    dwMaxContigFreeHwMemBytes: ::DWORD,
-    dwUnlockTransferRateHwBuffers: ::DWORD,
-    dwPlayCpuOverheadSwBuffers: ::DWORD,
-    dwReserved1: ::DWORD,
-    dwReserved2: ::DWORD,
-}}
-pub type LPDSCAPS = *mut DSCAPS;
-STRUCT!{struct DSBCAPS {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    dwBufferBytes: ::DWORD,
-    dwUnlockTransferRate: ::DWORD,
-    dwPlayCpuOverhead: ::DWORD,
-}}
-pub type LPDSBCAPS = *mut DSBCAPS;
-STRUCT!{struct DSBUFFERDESC {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    dwBufferBytes: ::DWORD,
-    dwReserved: ::DWORD,
-    lpwfxFormat: ::LPWAVEFORMATEX,
-    guid3DAlgorithm: ::GUID,
-}}
-pub type LPCDSBUFFERDESC = *const DSBUFFERDESC;
-RIDL!(
-interface IDirectSoundBuffer(IDirectSoundBufferVtbl): IUnknown(IUnknownVtbl) {
-    fn GetCaps(&mut self, pDSBufferCaps: ::LPDSBCAPS) -> ::HRESULT,
-    fn GetCurrentPosition(
-        &mut self, pdwCurrentPlayCursor: ::LPDWORD, pdwCurrentWriteCursor: ::LPDWORD
-    ) -> ::HRESULT,
-    fn GetFormat(
-        &mut self, pwfxFormat: ::LPWAVEFORMATEX, dwSizeAllocated: ::DWORD,
-        pdwSizeWritten: ::LPDWORD
-    ) -> ::HRESULT,
-    fn GetVolume(&mut self, plVolume: ::LPLONG) -> ::HRESULT,
-    fn GetPan(&mut self, plPan: ::LPLONG) -> ::HRESULT,
-    fn GetFrequency(&mut self, pdwFrequency: ::LPDWORD) -> ::HRESULT,
-    fn GetStatus(&mut self, pdwStatus: ::LPDWORD) -> ::HRESULT,
-    fn Initialize(
-        &mut self, pDirectSound: ::LPDIRECTSOUND, pcDSBufferDesc: ::LPCDSBUFFERDESC
-    ) -> ::HRESULT,
-    fn Lock(
-        &mut self, dwOffset: ::DWORD, dwBytes: ::DWORD, ppvAudioPtr1: *mut ::LPVOID,
-        pdwAudioBytes1: ::LPDWORD, ppvAudioPtr2: *mut ::LPVOID, pdwAudioBytes2: ::LPDWORD,
-        dwFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn Play(&mut self, dwReserved1: ::DWORD, dwPriority: ::DWORD, dwFlags: ::DWORD) -> ::HRESULT,
-    fn SetCurrentPosition(&mut self, dwNewPosition: ::DWORD) -> ::HRESULT,
-    fn SetFormat(&mut self, pcfxFormat: ::LPCWAVEFORMATEX) -> ::HRESULT,
-    fn SetVolume(&mut self, lVolume: ::LONG) -> ::HRESULT,
-    fn SetPan(&mut self, lPan: ::LONG) -> ::HRESULT,
-    fn SetFrequency(&mut self, dwFrequency: ::DWORD) -> ::HRESULT,
-    fn Stop(&mut self) -> ::HRESULT,
-    fn Unlock(
-        &mut self, pvAudioPtr1: ::LPVOID, dwAudioBytes1: ::DWORD, pvAudioPtr2: ::LPVOID,
-        dwAudioBytes2: ::DWORD
-    ) -> ::HRESULT,
-    fn Restore(&mut self) -> ::HRESULT
-}
-);
-pub type LPDIRECTSOUNDBUFFER = *mut IDirectSoundBuffer;
-RIDL!(
-interface IDirectSound(IDirectSoundVtbl): IUnknown(IUnknownVtbl)
-{
-    fn CreateSoundBuffer(
-        &mut self, pcDSBufferDesc: ::LPCDSBUFFERDESC, ppDSBuffer: *mut ::LPDIRECTSOUNDBUFFER,
-        pUnkOuter: ::LPUNKNOWN
-    ) -> ::HRESULT,
-    fn GetCaps(&mut self, pDSCaps: ::LPDSCAPS) -> ::HRESULT,
-    fn DuplicateSoundBuffer(
-        &mut self, pDSBufferOriginal: LPDIRECTSOUNDBUFFER,
-        ppDSBufferDuplicate: *mut ::LPDIRECTSOUNDBUFFER
-    ) -> ::HRESULT,
-    fn SetCooperativeLevel(&mut self, hWnd: ::HWND, dwLevel: ::DWORD) -> ::HRESULT,
-    fn Compact(&mut self) -> ::HRESULT,
-    fn GetSpeakerConfig(&mut self, pdwSpeakerConfig: ::LPDWORD) -> ::HRESULT,
-    fn SetSpeakerConfig(&mut self, dwSpeakerConfig: ::DWORD) -> ::HRESULT,
-    fn Initialize(&mut self, pcGuidDevice: ::LPCGUID) -> ::HRESULT
-}
-);
-pub type LPDIRECTSOUND = *mut IDirectSound;
-pub const DS_OK: ::HRESULT = ::S_OK;
-pub const DSERR_GENERIC: ::HRESULT = ::E_FAIL;
-pub const DSSCL_NORMAL: ::DWORD = 0x00000001;
-pub const DSSCL_PRIORITY: ::DWORD = 0x00000002;
-pub const DSSCL_EXCLUSIVE: ::DWORD = 0x00000003;
-pub const DSSCL_WRITEPRIMARY: ::DWORD = 0x00000004;
-pub const DSBCAPS_PRIMARYBUFFER: ::DWORD = 0x00000001;
-pub const DSBCAPS_STATIC: ::DWORD = 0x00000002;
-pub const DSBCAPS_LOCHARDWARE: ::DWORD = 0x00000004;
-pub const DSBCAPS_LOCSOFTWARE: ::DWORD = 0x00000008;
-pub const DSBCAPS_CTRL3D: ::DWORD = 0x00000010;
-pub const DSBCAPS_CTRLFREQUENCY: ::DWORD = 0x00000020;
-pub const DSBCAPS_CTRLPAN: ::DWORD = 0x00000040;
-pub const DSBCAPS_CTRLVOLUME: ::DWORD = 0x00000080;
-pub const DSBCAPS_CTRLPOSITIONNOTIFY: ::DWORD = 0x00000100;
-pub const DSBCAPS_CTRLFX: ::DWORD = 0x00000200;
-pub const DSBCAPS_STICKYFOCUS: ::DWORD = 0x00004000;
-pub const DSBCAPS_GLOBALFOCUS: ::DWORD = 0x00008000;
-pub const DSBCAPS_GETCURRENTPOSITION2: ::DWORD = 0x00010000;
-pub const DSBCAPS_MUTE3DATMAXDISTANCE: ::DWORD = 0x00020000;
-pub const DSBCAPS_LOCDEFER: ::DWORD = 0x00040000;
-pub const DSBCAPS_TRUEPLAYPOSITION: ::DWORD = 0x00080000;
-pub const DSBPLAY_LOOPING: ::DWORD = 0x00000001;
-pub const DSBPLAY_LOCHARDWARE: ::DWORD = 0x00000002;
-pub const DSBPLAY_LOCSOFTWARE: ::DWORD = 0x00000004;
-pub const DSBPLAY_TERMINATEBY_TIME: ::DWORD = 0x00000008;
-pub const DSBPLAY_TERMINATEBY_DISTANCE: ::DWORD = 0x000000010;
-pub const DSBPLAY_TERMINATEBY_PRIORITY: ::DWORD = 0x000000020;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dsrole.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dsrole.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dsrole.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dsrole.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Contains public interfaces to query the network roles of workstations, servers, and DCs
-ENUM!{enum DSROLE_MACHINE_ROLE {
-    DsRole_RoleStandaloneWorkstation,
-    DsRole_RoleMemberWorkstation,
-    DsRole_RoleStandaloneServer,
-    DsRole_RoleMemberServer,
-    DsRole_RoleBackupDomainController,
-    DsRole_RolePrimaryDomainController,
-}}
-ENUM!{enum DSROLE_SERVER_STATE {
-    DsRoleServerUnknown = 0,
-    DsRoleServerPrimary,
-    DsRoleServerBackup,
-}}
-pub type PDSROLE_SERVER_STATE = *mut DSROLE_SERVER_STATE;
-ENUM!{enum DSROLE_PRIMARY_DOMAIN_INFO_LEVEL {
-    DsRolePrimaryDomainInfoBasic = 1,
-    DsRoleUpgradeStatus,
-    DsRoleOperationState,
-}}
-pub const DSROLE_PRIMARY_DS_RUNNING: ::ULONG = 0x00000001;
-pub const DSROLE_PRIMARY_DS_MIXED_MODE: ::ULONG = 0x00000002;
-pub const DSROLE_UPGRADE_IN_PROGRESS: ::ULONG = 0x00000004;
-pub const DSROLE_PRIMARY_DS_READONLY: ::ULONG = 0x00000008;
-pub const DSROLE_PRIMARY_DOMAIN_GUID_PRESENT: ::ULONG = 0x01000000;
-STRUCT!{struct DSROLE_PRIMARY_DOMAIN_INFO_BASIC {
-    MachineRole: DSROLE_MACHINE_ROLE,
-    Flags: ::ULONG,
-    DomainNameFlat: ::LPWSTR,
-    DomainNameDns: ::LPWSTR,
-    DomainForestName: ::LPWSTR,
-    DomainGuid: ::GUID,
-}}
-pub type PDSROLE_PRIMARY_DOMAIN_INFO_BASIC = *mut DSROLE_PRIMARY_DOMAIN_INFO_BASIC;
-STRUCT!{struct DSROLE_UPGRADE_STATUS_INFO {
-    OperationState: ::ULONG,
-    PreviousServerState: DSROLE_SERVER_STATE,
-}}
-pub type PDSROLE_UPGRADE_STATUS_INFO = *mut DSROLE_UPGRADE_STATUS_INFO;
-ENUM!{enum DSROLE_OPERATION_STATE {
-    DsRoleOperationIdle = 0,
-    DsRoleOperationActive,
-    DsRoleOperationNeedReboot,
-}}
-STRUCT!{struct DSROLE_OPERATION_STATE_INFO {
-    OperationState: DSROLE_OPERATION_STATE,
-}}
-pub type PDSROLE_OPERATION_STATE_INFO = *mut DSROLE_OPERATION_STATE_INFO;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dwmapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dwmapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dwmapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dwmapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Procedure declarations, constant definitions, and macros for the NLS component.
-STRUCT!{struct DWM_BLURBEHIND {
-    dwFlags: ::DWORD,
-    fEnable: ::BOOL,
-    hRgnBlur: ::HRGN,
-    fTransitionOnMaximized: ::BOOL,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dwrite.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dwrite.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dwrite.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dwrite.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1038 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! DirectX Typography Services public API definitions.
-ENUM!{enum DWRITE_FONT_FILE_TYPE {
-    DWRITE_FONT_FILE_TYPE_UNKNOWN,
-    DWRITE_FONT_FILE_TYPE_CFF,
-    DWRITE_FONT_FILE_TYPE_TRUETYPE,
-    DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION,
-    DWRITE_FONT_FILE_TYPE_TYPE1_PFM,
-    DWRITE_FONT_FILE_TYPE_TYPE1_PFB,
-    DWRITE_FONT_FILE_TYPE_VECTOR,
-    DWRITE_FONT_FILE_TYPE_BITMAP,
-}}
-ENUM!{enum DWRITE_FONT_FACE_TYPE {
-    DWRITE_FONT_FACE_TYPE_CFF,
-    DWRITE_FONT_FACE_TYPE_TRUETYPE,
-    DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION,
-    DWRITE_FONT_FACE_TYPE_TYPE1,
-    DWRITE_FONT_FACE_TYPE_VECTOR,
-    DWRITE_FONT_FACE_TYPE_BITMAP,
-    DWRITE_FONT_FACE_TYPE_UNKNOWN,
-    DWRITE_FONT_FACE_TYPE_RAW_CFF,
-}}
-FLAGS!{enum DWRITE_FONT_SIMULATIONS {
-    DWRITE_FONT_SIMULATIONS_NONE = 0x0000,
-    DWRITE_FONT_SIMULATIONS_BOLD = 0x0001,
-    DWRITE_FONT_SIMULATIONS_OBLIQUE = 0x0002,
-}}
-ENUM!{enum DWRITE_FONT_WEIGHT {
-    DWRITE_FONT_WEIGHT_THIN = 100,
-    DWRITE_FONT_WEIGHT_EXTRA_LIGHT = 200,
-    DWRITE_FONT_WEIGHT_ULTRA_LIGHT = 200,
-    DWRITE_FONT_WEIGHT_LIGHT = 300,
-    DWRITE_FONT_WEIGHT_SEMI_LIGHT = 350,
-    DWRITE_FONT_WEIGHT_NORMAL = 400,
-    DWRITE_FONT_WEIGHT_REGULAR = 400,
-    DWRITE_FONT_WEIGHT_MEDIUM = 500,
-    DWRITE_FONT_WEIGHT_DEMI_BOLD = 600,
-    DWRITE_FONT_WEIGHT_SEMI_BOLD = 600,
-    DWRITE_FONT_WEIGHT_BOLD = 700,
-    DWRITE_FONT_WEIGHT_EXTRA_BOLD = 800,
-    DWRITE_FONT_WEIGHT_ULTRA_BOLD = 800,
-    DWRITE_FONT_WEIGHT_BLACK = 900,
-    DWRITE_FONT_WEIGHT_HEAVY = 900,
-    DWRITE_FONT_WEIGHT_EXTRA_BLACK = 950,
-    DWRITE_FONT_WEIGHT_ULTRA_BLACK = 950,
-}}
-ENUM!{enum DWRITE_FONT_STRETCH {
-    DWRITE_FONT_STRETCH_UNDEFINED = 0,
-    DWRITE_FONT_STRETCH_ULTRA_CONDENSED = 1,
-    DWRITE_FONT_STRETCH_EXTRA_CONDENSED = 2,
-    DWRITE_FONT_STRETCH_CONDENSED = 3,
-    DWRITE_FONT_STRETCH_SEMI_CONDENSED = 4,
-    DWRITE_FONT_STRETCH_NORMAL = 5,
-    DWRITE_FONT_STRETCH_MEDIUM = 5,
-    DWRITE_FONT_STRETCH_SEMI_EXPANDED = 6,
-    DWRITE_FONT_STRETCH_EXPANDED = 7,
-    DWRITE_FONT_STRETCH_EXTRA_EXPANDED = 8,
-    DWRITE_FONT_STRETCH_ULTRA_EXPANDED = 9,
-}}
-ENUM!{enum DWRITE_FONT_STYLE {
-    DWRITE_FONT_STYLE_NORMAL,
-    DWRITE_FONT_STYLE_OBLIQUE,
-    DWRITE_FONT_STYLE_ITALIC,
-}}
-ENUM!{enum DWRITE_INFORMATIONAL_STRING_ID {
-    DWRITE_INFORMATIONAL_STRING_NONE,
-    DWRITE_INFORMATIONAL_STRING_COPYRIGHT_NOTICE,
-    DWRITE_INFORMATIONAL_STRING_VERSION_STRINGS,
-    DWRITE_INFORMATIONAL_STRING_TRADEMARK,
-    DWRITE_INFORMATIONAL_STRING_MANUFACTURER,
-    DWRITE_INFORMATIONAL_STRING_DESIGNER,
-    DWRITE_INFORMATIONAL_STRING_DESIGNER_URL,
-    DWRITE_INFORMATIONAL_STRING_DESCRIPTION,
-    DWRITE_INFORMATIONAL_STRING_FONT_VENDOR_URL,
-    DWRITE_INFORMATIONAL_STRING_LICENSE_DESCRIPTION,
-    DWRITE_INFORMATIONAL_STRING_LICENSE_INFO_URL,
-    DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES,
-    DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES,
-    DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES,
-    DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES,
-    DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT,
-    DWRITE_INFORMATIONAL_STRING_FULL_NAME,
-    DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME,
-    DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME,
-    DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME,
-    DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG,
-    DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG,
-}}
-STRUCT!{struct DWRITE_FONT_METRICS {
-    designUnitsPerEm: ::UINT16,
-    ascent: ::UINT16,
-    descent: ::UINT16,
-    lineGap: ::INT16,
-    capHeight: ::UINT16,
-    xHeight: ::UINT16,
-    underlinePosition: ::INT16,
-    underlineThickness: ::UINT16,
-    strikethroughPosition: ::INT16,
-    strikethroughThickness: ::UINT16,
-}}
-STRUCT!{struct DWRITE_GLYPH_METRICS {
-    leftSideBearing: ::INT32,
-    advanceWidth: ::UINT32,
-    rightSideBearing: ::INT32,
-    topSideBearing: ::INT32,
-    advanceHeight: ::UINT32,
-    bottomSideBearing: ::INT32,
-    verticalOriginY: ::INT32,
-}}
-STRUCT!{struct DWRITE_GLYPH_OFFSET {
-    advanceOffset: ::FLOAT,
-    ascenderOffset: ::FLOAT,
-}}
-ENUM!{enum DWRITE_FACTORY_TYPE {
-    DWRITE_FACTORY_TYPE_SHARED,
-    DWRITE_FACTORY_TYPE_ISOLATED,
-}}
-#[inline]
-pub fn DWRITE_MAKE_OPENTYPE_TAG(a: u8, b: u8, c: u8, d: u8) -> u32 {
-    ((d as u32) << 24) | ((c as u32) << 16) | ((b as u32) << 8) | (a as u32)
-}
-RIDL!{interface IDWriteFontFileLoader(IDWriteFontFileLoaderVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateStreamFromKey(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        fontFileStream: *mut *mut IDWriteFontFileStream
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteLocalFontFileLoader(IDWriteLocalFontFileLoaderVtbl):
-        IDWriteFontFileLoader(IDWriteFontFileLoaderVtbl) {
-    fn GetFilePathLengthFromKey(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        filePathLength: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetFilePathFromKey(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        filePath: *mut ::WCHAR,
-        filePathSize: ::UINT32
-    ) -> ::HRESULT,
-    fn GetLastWriteTimeFromKey(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        lastWriteTime: *mut ::FILETIME
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontFileStream(IDWriteFontFileStreamVtbl): IUnknown(IUnknownVtbl) {
-    fn ReadFileFragment(
-        &mut self, fragmentStart: *mut *const ::c_void, fileOffset: ::UINT64,
-        fragmentSize: ::UINT64, fragmentContext: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn ReleaseFileFragment(&mut self, fragmentContext: *mut ::c_void) -> (),
-    fn GetFileSize(&mut self, fileSize: *mut ::UINT64) -> ::HRESULT,
-    fn GetLastWriteTime(&mut self, lastWriteTime: *mut ::UINT64) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontFile(IDWriteFontFileVtbl): IUnknown(IUnknownVtbl) {
-    fn GetReferenceKey(
-        &mut self, fontFileReferenceKey: *mut *const ::c_void,
-        fontFileReferenceKeySize: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetLoader(&mut self, fontFileLoader: *mut *mut IDWriteFontFileLoader) -> ::HRESULT,
-    fn Analyze(
-        &mut self, isSupportedFontType: *mut ::BOOL, fontFileType: *mut DWRITE_FONT_FILE_TYPE,
-        fontFaceType: *mut DWRITE_FONT_FACE_TYPE, numberOfFaces: *mut ::UINT32
-    ) -> ::HRESULT
-}}
-ENUM!{enum DWRITE_PIXEL_GEOMETRY {
-    DWRITE_PIXEL_GEOMETRY_FLAT,
-    DWRITE_PIXEL_GEOMETRY_RGB,
-    DWRITE_PIXEL_GEOMETRY_BGR,
-}}
-ENUM!{enum DWRITE_RENDERING_MODE {
-    DWRITE_RENDERING_MODE_DEFAULT,
-    DWRITE_RENDERING_MODE_ALIASED,
-    DWRITE_RENDERING_MODE_GDI_CLASSIC,
-    DWRITE_RENDERING_MODE_GDI_NATURAL,
-    DWRITE_RENDERING_MODE_NATURAL,
-    DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC,
-    DWRITE_RENDERING_MODE_OUTLINE,
-    DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC = DWRITE_RENDERING_MODE_GDI_CLASSIC.0,
-    DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL = DWRITE_RENDERING_MODE_GDI_NATURAL.0,
-    DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL = DWRITE_RENDERING_MODE_NATURAL.0,
-    DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC = DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC.0,
-}}
-STRUCT!{struct DWRITE_MATRIX {
-    m11: ::FLOAT,
-    m12: ::FLOAT,
-    m21: ::FLOAT,
-    m22: ::FLOAT,
-    dx: ::FLOAT,
-    dy: ::FLOAT,
-}}
-RIDL!{interface IDWriteRenderingParams(IDWriteRenderingParamsVtbl): IUnknown(IUnknownVtbl) {
-    fn GetGamma(&mut self) -> ::FLOAT,
-    fn GetEnhancedContrast(&mut self) -> ::FLOAT,
-    fn GetClearTypeLevel(&mut self) -> ::FLOAT,
-    fn GetPixelGeometry(&mut self) -> DWRITE_PIXEL_GEOMETRY,
-    fn GetRenderingMode(&mut self) -> DWRITE_RENDERING_MODE
-}}
-pub type IDWriteGeometrySink = ::ID2D1SimplifiedGeometrySink;
-RIDL!{interface IDWriteFontFace(IDWriteFontFaceVtbl): IUnknown(IUnknownVtbl) {
-    fn GetType(&mut self) -> DWRITE_FONT_FACE_TYPE,
-    fn GetFiles(
-        &mut self, numberOfFiles: *mut ::UINT32, fontFiles: *mut *mut IDWriteFontFile
-    ) -> ::HRESULT,
-    fn GetIndex(&mut self) -> ::UINT32,
-    fn GetSimulations(&mut self) -> DWRITE_FONT_SIMULATIONS,
-    fn IsSymbolFont(&mut self) -> ::BOOL,
-    fn GetMetrics(&mut self, fontFaceMetrics: *mut DWRITE_FONT_METRICS) -> (),
-    fn GetGlyphCount(&mut self) -> ::UINT16,
-    fn GetDesignGlyphMetrics(
-        &mut self, glyphIndices: *const ::UINT16, glyphCount: ::UINT32,
-        glyphMetrics: *mut DWRITE_GLYPH_METRICS, isSideways: ::BOOL
-    ) -> ::HRESULT,
-    fn GetGlyphIndices(
-        &mut self, codePoints: *const ::UINT32, codePointCount: ::UINT32,
-        glyphIndices: *mut ::UINT16
-    ) -> ::HRESULT,
-    fn TryGetFontTable(
-        &mut self, openTypeTableTag: ::UINT32, tableData: *mut *const ::c_void,
-        tableSize: *mut ::UINT32, tableContext: *mut *mut ::c_void, exists: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn ReleaseFontTable(
-        &mut self, tableContext: *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetGlyphRunOutline(
-        &mut self, emSize: ::FLOAT, glyphIndices: *const ::UINT16, glyphAdvances: *const ::FLOAT,
-        glyphOffsets: *const DWRITE_GLYPH_OFFSET, glyphCount: ::UINT32, isSideways: ::BOOL,
-        isRightToLeft: ::BOOL, geometrySink: *mut IDWriteGeometrySink
-    ) -> ::HRESULT,
-    fn GetRecommendedRenderingMode(
-        &mut self, emSize: ::FLOAT, pixelsPerDip: ::FLOAT, measuringMode: ::DWRITE_MEASURING_MODE,
-        renderingParams: *mut IDWriteRenderingParams, renderingMode: *mut DWRITE_RENDERING_MODE
-    ) -> ::HRESULT,
-    fn GetGdiCompatibleMetrics(
-        &mut self, emSize: ::FLOAT, pixelsPerDip: ::FLOAT, transform: *const DWRITE_MATRIX,
-        fontFaceMetrics: *mut DWRITE_FONT_METRICS
-    ) -> ::HRESULT,
-    fn GetGdiCompatibleGlyphMetrics(
-        &mut self, enSize: ::FLOAT, pixelsPerDip: ::FLOAT, transform: *const DWRITE_MATRIX,
-        useGdiNatrual: ::BOOL, glyphIndices: *const ::UINT16, glyphCount: ::UINT32,
-        glyphMetrics: *mut DWRITE_GLYPH_METRICS, isSideways: ::BOOL
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontCollectionLoader(IDWriteFontCollectionLoaderVtbl):
-        IUnknown(IUnknownVtbl) {
-    fn CreateEnumeratorFromKey(
-        &mut self, factory: *mut IDWriteFactory, collectionKey: *const ::c_void,
-        collectionKeySize: ::UINT32, fontFileEnumerator: *mut *mut IDWriteFontFileEnumerator
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontFileEnumerator(IDWriteFontFileEnumeratorVtbl): IUnknown(IUnknownVtbl) {
-    fn MoveNext(&mut self, hasCurrentFile: *mut ::BOOL) -> ::HRESULT,
-    fn GetCurrentFontFile(&mut self, fontFile: *mut *mut IDWriteFontFile) -> ::HRESULT
-}}
-RIDL!{interface IDWriteLocalizedStrings(IDWriteLocalizedStringsVtbl): IUnknown(IUnknownVtbl) {
-    fn GetCount(&mut self) -> ::UINT32,
-    fn FindLocaleName(
-        &mut self, localeName: *const ::WCHAR, index: *mut ::UINT32, exists: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn GetLocaleNameLength(&mut self, index: ::UINT32, length: *mut ::UINT32) -> ::HRESULT,
-    fn GetLocaleName(
-        &mut self, index: ::UINT32, localeName: *mut ::WCHAR, size: ::UINT32
-    ) -> ::HRESULT,
-    fn GetStringLength(&mut self, index: ::UINT32, length: *mut ::UINT32) -> ::HRESULT,
-    fn GetString(
-        &mut self, index: ::UINT32, stringBuffer: *mut ::WCHAR, size: ::UINT32
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontCollection(IDWriteFontCollectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFontFamilyCount(&mut self) -> ::UINT32,
-    fn GetFontFamily(
-        &mut self, index: ::UINT32, fontFamily: *mut *mut IDWriteFontFamily
-    ) -> ::HRESULT,
-    fn FindFamilyName(
-        &mut self, familyName: *const ::WCHAR, index: *mut ::UINT32, exists: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn GetFontFromFontFace(
-        &mut self, fontFace: *mut IDWriteFontFace, font: *mut *mut IDWriteFont
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontList(IDWriteFontListVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFontCollection(&mut self, fontCollection: *mut *mut IDWriteFontCollection) -> ::HRESULT,
-    fn GetFontCount(&mut self) -> ::UINT32,
-    fn GetFont(&mut self, index: ::UINT32, font: *mut *mut IDWriteFont) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontFamily(IDWriteFontFamilyVtbl): IDWriteFontList(IDWriteFontListVtbl) {
-    fn GetFamilyNames(&mut self, names: *mut *mut IDWriteLocalizedStrings) -> ::HRESULT,
-    fn GetFirstMatchingFont(
-        &mut self, weight: DWRITE_FONT_WEIGHT, stretch: DWRITE_FONT_STRETCH,
-        style: DWRITE_FONT_STYLE, matchingFont: *mut *mut IDWriteFont
-    ) -> ::HRESULT,
-    fn GetMatchingFonts(
-        &mut self, weight: DWRITE_FONT_WEIGHT, stretch: DWRITE_FONT_STRETCH,
-        style: DWRITE_FONT_STYLE, matchingFonts: *mut *mut IDWriteFontList
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFont(IDWriteFontVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFontFamily(&mut self, fontFamily: *mut *mut IDWriteFontFamily) -> ::HRESULT,
-    fn GetWeight(&mut self) -> DWRITE_FONT_WEIGHT,
-    fn GetStretch(&mut self) -> DWRITE_FONT_STRETCH,
-    fn GetStyle(&mut self) -> DWRITE_FONT_STYLE,
-    fn IsSymbolFont(&mut self) -> ::BOOL,
-    fn GetFaceNames(&mut self, names: *mut *mut IDWriteLocalizedStrings) -> ::HRESULT,
-    fn GetInformationalStrings(
-        &mut self, informationalStringId: DWRITE_INFORMATIONAL_STRING_ID,
-        informationalStrings: *mut *mut IDWriteLocalizedStrings, exists: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn GetSimulations(&mut self) -> DWRITE_FONT_SIMULATIONS,
-    fn GetMetrics(&mut self, fontMetrics: *mut DWRITE_FONT_METRICS) -> (),
-    fn HasCharacter(&mut self, unicodeValue: ::UINT32, exists: *mut ::BOOL) -> ::HRESULT,
-    fn CreateFontFace(&mut self, fontFace: *mut *mut IDWriteFontFace) -> ::HRESULT
-}}
-ENUM!{enum DWRITE_READING_DIRECTION {
-    DWRITE_READING_DIRECTION_LEFT_TO_RIGHT = 0,
-    DWRITE_READING_DIRECTION_RIGHT_TO_LEFT = 1,
-    DWRITE_READING_DIRECTION_TOP_TO_BOTTOM = 2,
-    DWRITE_READING_DIRECTION_BOTTOM_TO_TOP = 3,
-}}
-ENUM!{enum DWRITE_FLOW_DIRECTION {
-    DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM = 0,
-    DWRITE_FLOW_DIRECTION_BOTTOM_TO_TOP = 1,
-    DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT = 2,
-    DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT = 3,
-}}
-ENUM!{enum DWRITE_TEXT_ALIGNMENT {
-    DWRITE_TEXT_ALIGNMENT_LEADING,
-    DWRITE_TEXT_ALIGNMENT_TRAILING,
-    DWRITE_TEXT_ALIGNMENT_CENTER,
-    DWRITE_TEXT_ALIGNMENT_JUSTIFIED,
-}}
-ENUM!{enum DWRITE_PARAGRAPH_ALIGNMENT {
-    DWRITE_PARAGRAPH_ALIGNMENT_NEAR,
-    DWRITE_PARAGRAPH_ALIGNMENT_FAR,
-    DWRITE_PARAGRAPH_ALIGNMENT_CENTER,
-}}
-ENUM!{enum DWRITE_WORD_WRAPPING {
-    DWRITE_WORD_WRAPPING_WRAP = 0,
-    DWRITE_WORD_WRAPPING_NO_WRAP = 1,
-    DWRITE_WORD_WRAPPING_EMERGENCY_BREAK = 2,
-    DWRITE_WORD_WRAPPING_WHOLE_WORD = 3,
-    DWRITE_WORD_WRAPPING_CHARACTER = 4,
-}}
-ENUM!{enum DWRITE_LINE_SPACING_METHOD {
-    DWRITE_LINE_SPACING_METHOD_DEFAULT,
-    DWRITE_LINE_SPACING_METHOD_UNIFORM,
-    DWRITE_LINE_SPACING_METHOD_PROPORTIONAL,
-}}
-ENUM!{enum DWRITE_TRIMMING_GRANULARITY {
-    DWRITE_TRIMMING_GRANULARITY_NONE,
-    DWRITE_TRIMMING_GRANULARITY_CHARACTER,
-    DWRITE_TRIMMING_GRANULARITY_WORD,
-}}
-ENUM!{enum DWRITE_FONT_FEATURE_TAG {
-    DWRITE_FONT_FEATURE_TAG_ALTERNATIVE_FRACTIONS = 0x63726661, // 'afrc'
-    DWRITE_FONT_FEATURE_TAG_PETITE_CAPITALS_FROM_CAPITALS = 0x63703263, // 'c2pc'
-    DWRITE_FONT_FEATURE_TAG_SMALL_CAPITALS_FROM_CAPITALS = 0x63733263, // 'c2sc'
-    DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES = 0x746c6163, // 'calt'
-    DWRITE_FONT_FEATURE_TAG_CASE_SENSITIVE_FORMS = 0x65736163, // 'case'
-    DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION = 0x706d6363, // 'ccmp'
-    DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_LIGATURES = 0x67696c63, // 'clig'
-    DWRITE_FONT_FEATURE_TAG_CAPITAL_SPACING = 0x70737063, // 'cpsp'
-    DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_SWASH = 0x68777363, // 'cswh'
-    DWRITE_FONT_FEATURE_TAG_CURSIVE_POSITIONING = 0x73727563, // 'curs'
-    DWRITE_FONT_FEATURE_TAG_DEFAULT = 0x746c6664, // 'dflt'
-    DWRITE_FONT_FEATURE_TAG_DISCRETIONARY_LIGATURES = 0x67696c64, // 'dlig'
-    DWRITE_FONT_FEATURE_TAG_EXPERT_FORMS = 0x74707865, // 'expt'
-    DWRITE_FONT_FEATURE_TAG_FRACTIONS = 0x63617266, // 'frac'
-    DWRITE_FONT_FEATURE_TAG_FULL_WIDTH = 0x64697766, // 'fwid'
-    DWRITE_FONT_FEATURE_TAG_HALF_FORMS = 0x666c6168, // 'half'
-    DWRITE_FONT_FEATURE_TAG_HALANT_FORMS = 0x6e6c6168, // 'haln'
-    DWRITE_FONT_FEATURE_TAG_ALTERNATE_HALF_WIDTH = 0x746c6168, // 'halt'
-    DWRITE_FONT_FEATURE_TAG_HISTORICAL_FORMS = 0x74736968, // 'hist'
-    DWRITE_FONT_FEATURE_TAG_HORIZONTAL_KANA_ALTERNATES = 0x616e6b68, // 'hkna'
-    DWRITE_FONT_FEATURE_TAG_HISTORICAL_LIGATURES = 0x67696c68, // 'hlig'
-    DWRITE_FONT_FEATURE_TAG_HALF_WIDTH = 0x64697768, // 'hwid'
-    DWRITE_FONT_FEATURE_TAG_HOJO_KANJI_FORMS = 0x6f6a6f68, // 'hojo'
-    DWRITE_FONT_FEATURE_TAG_JIS04_FORMS = 0x3430706a, // 'jp04'
-    DWRITE_FONT_FEATURE_TAG_JIS78_FORMS = 0x3837706a, // 'jp78'
-    DWRITE_FONT_FEATURE_TAG_JIS83_FORMS = 0x3338706a, // 'jp83'
-    DWRITE_FONT_FEATURE_TAG_JIS90_FORMS = 0x3039706a, // 'jp90'
-    DWRITE_FONT_FEATURE_TAG_KERNING = 0x6e72656b, // 'kern'
-    DWRITE_FONT_FEATURE_TAG_STANDARD_LIGATURES = 0x6167696c, // 'liga'
-    DWRITE_FONT_FEATURE_TAG_LINING_FIGURES = 0x6d756e6c, // 'lnum'
-    DWRITE_FONT_FEATURE_TAG_LOCALIZED_FORMS = 0x6c636f6c, // 'locl'
-    DWRITE_FONT_FEATURE_TAG_MARK_POSITIONING = 0x6b72616d, // 'mark'
-    DWRITE_FONT_FEATURE_TAG_MATHEMATICAL_GREEK = 0x6b72676d, // 'mgrk'
-    DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING = 0x6b6d6b6d, // 'mkmk'
-    DWRITE_FONT_FEATURE_TAG_ALTERNATE_ANNOTATION_FORMS = 0x746c616e, // 'nalt'
-    DWRITE_FONT_FEATURE_TAG_NLC_KANJI_FORMS = 0x6b636c6e, // 'nlck'
-    DWRITE_FONT_FEATURE_TAG_OLD_STYLE_FIGURES = 0x6d756e6f, // 'onum'
-    DWRITE_FONT_FEATURE_TAG_ORDINALS = 0x6e64726f, // 'ordn'
-    DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_ALTERNATE_WIDTH = 0x746c6170, // 'palt'
-    DWRITE_FONT_FEATURE_TAG_PETITE_CAPITALS = 0x70616370, // 'pcap'
-    DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_FIGURES = 0x6d756e70, // 'pnum'
-    DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_WIDTHS = 0x64697770, // 'pwid'
-    DWRITE_FONT_FEATURE_TAG_QUARTER_WIDTHS = 0x64697771, // 'qwid'
-    DWRITE_FONT_FEATURE_TAG_REQUIRED_LIGATURES = 0x67696c72, // 'rlig'
-    DWRITE_FONT_FEATURE_TAG_RUBY_NOTATION_FORMS = 0x79627572, // 'ruby'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_ALTERNATES = 0x746c6173, // 'salt'
-    DWRITE_FONT_FEATURE_TAG_SCIENTIFIC_INFERIORS = 0x666e6973, // 'sinf'
-    DWRITE_FONT_FEATURE_TAG_SMALL_CAPITALS = 0x70636d73, // 'smcp'
-    DWRITE_FONT_FEATURE_TAG_SIMPLIFIED_FORMS = 0x6c706d73, // 'smpl'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_1 = 0x31307373, // 'ss01'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_2 = 0x32307373, // 'ss02'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_3 = 0x33307373, // 'ss03'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_4 = 0x34307373, // 'ss04'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_5 = 0x35307373, // 'ss05'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_6 = 0x36307373, // 'ss06'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_7 = 0x37307373, // 'ss07'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_8 = 0x38307373, // 'ss08'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_9 = 0x39307373, // 'ss09'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_10 = 0x30317373, // 'ss10'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_11 = 0x31317373, // 'ss11'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_12 = 0x32317373, // 'ss12'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_13 = 0x33317373, // 'ss13'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_14 = 0x34317373, // 'ss14'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_15 = 0x35317373, // 'ss15'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_16 = 0x36317373, // 'ss16'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_17 = 0x37317373, // 'ss17'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_18 = 0x38317373, // 'ss18'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_19 = 0x39317373, // 'ss19'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_20 = 0x30327373, // 'ss20'
-    DWRITE_FONT_FEATURE_TAG_SUBSCRIPT = 0x73627573, // 'subs'
-    DWRITE_FONT_FEATURE_TAG_SUPERSCRIPT = 0x73707573, // 'sups'
-    DWRITE_FONT_FEATURE_TAG_SWASH = 0x68737773, // 'swsh'
-    DWRITE_FONT_FEATURE_TAG_TITLING = 0x6c746974, // 'titl'
-    DWRITE_FONT_FEATURE_TAG_TRADITIONAL_NAME_FORMS = 0x6d616e74, // 'tnam'
-    DWRITE_FONT_FEATURE_TAG_TABULAR_FIGURES = 0x6d756e74, // 'tnum'
-    DWRITE_FONT_FEATURE_TAG_TRADITIONAL_FORMS = 0x64617274, // 'trad'
-    DWRITE_FONT_FEATURE_TAG_THIRD_WIDTHS = 0x64697774, // 'twid'
-    DWRITE_FONT_FEATURE_TAG_UNICASE = 0x63696e75, // 'unic'
-    DWRITE_FONT_FEATURE_TAG_VERTICAL_WRITING = 0x74726576, // 'vert'
-    DWRITE_FONT_FEATURE_TAG_VERTICAL_ALTERNATES_AND_ROTATION = 0x32747276, // 'vrt2'
-    DWRITE_FONT_FEATURE_TAG_SLASHED_ZERO = 0x6f72657a, // 'zero'
-}}
-STRUCT!{struct DWRITE_TEXT_RANGE {
-    startPosition: ::UINT32,
-    length: ::UINT32,
-}}
-STRUCT!{struct DWRITE_FONT_FEATURE {
-    nameTag: DWRITE_FONT_FEATURE_TAG,
-    parameter: ::UINT32,
-}}
-STRUCT!{struct DWRITE_TYPOGRAPHIC_FEATURES {
-    features: *mut DWRITE_FONT_FEATURE,
-    featureCount: ::UINT32,
-}}
-STRUCT!{struct DWRITE_TRIMMING {
-    granularity: DWRITE_TRIMMING_GRANULARITY,
-    delimiter: ::UINT32,
-    delimiterCount: ::UINT32,
-}}
-RIDL!{interface IDWriteTextFormat(IDWriteTextFormatVtbl): IUnknown(IUnknownVtbl) {
-    fn SetTextAlignment(&mut self, textAlignment: DWRITE_TEXT_ALIGNMENT) -> ::HRESULT,
-    fn SetParagraphAlignment(
-        &mut self, paragraphAlignment: DWRITE_PARAGRAPH_ALIGNMENT
-    ) -> ::HRESULT,
-    fn SetWordWrapping(&mut self, wordWrapping: DWRITE_WORD_WRAPPING) -> ::HRESULT,
-    fn SetReadingDirection(&mut self, readingDirection: DWRITE_READING_DIRECTION) -> ::HRESULT,
-    fn SetFlowDirection(&mut self, flowDirection: DWRITE_FLOW_DIRECTION) -> ::HRESULT,
-    fn SetIncrementalTabStop(&mut self, incrementalTabStop: ::FLOAT) -> ::HRESULT,
-    fn SetTrimming(
-        &mut self, trimmingOptions: *const DWRITE_TRIMMING, trimmingSign: *mut IDWriteInlineObject
-    ) -> ::HRESULT,
-    fn SetLineSpacing(
-        &mut self, lineSpacingMethod: DWRITE_LINE_SPACING_METHOD, lineSpacing: ::FLOAT,
-        baseLine: ::FLOAT
-    ) -> ::HRESULT,
-    fn GetTextAlignment(&mut self) -> DWRITE_TEXT_ALIGNMENT,
-    fn GetParagraphAlignment(&mut self) -> DWRITE_PARAGRAPH_ALIGNMENT,
-    fn GetWordWrapping(&mut self) -> DWRITE_WORD_WRAPPING,
-    fn GetReadingDirection(&mut self) -> DWRITE_READING_DIRECTION,
-    fn GetFlowDirection(&mut self) -> DWRITE_FLOW_DIRECTION,
-    fn GetIncrementalTabStop(&mut self) -> ::FLOAT,
-    fn GetTrimming(
-        &mut self, trimmingOptions: *mut DWRITE_TRIMMING,
-        trimmingSign: *mut *mut IDWriteInlineObject
-    ) -> ::HRESULT,
-    fn GetLineSpacing(
-        &mut self, lineSpacingMethod: *mut DWRITE_LINE_SPACING_METHOD, lineSpacing: *mut ::FLOAT,
-        baseline: *mut ::FLOAT
-    ) -> ::HRESULT,
-    fn GetFontCollection(&mut self, fontCollection: *mut *mut IDWriteFontCollection) -> ::HRESULT,
-    fn GetFontFamilyNameLength(&mut self) -> ::UINT32,
-    fn GetFontFamilyName(&mut self, fontFamilyName: *mut ::WCHAR, nameSize: ::UINT32) -> ::HRESULT,
-    fn GetFontWeight(&mut self) -> DWRITE_FONT_WEIGHT,
-    fn GetFontStyle(&mut self) -> DWRITE_FONT_STYLE,
-    fn GetFontStretch(&mut self) -> DWRITE_FONT_STRETCH,
-    fn GetFontSize(&mut self) -> ::FLOAT,
-    fn GetLocaleNameLength(&mut self) -> ::UINT32,
-    fn GetLocaleName(&mut self, localeName: *mut ::WCHAR, nameSize: ::UINT32) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTypography(IDWriteTypographyVtbl): IUnknown(IUnknownVtbl) {
-    fn AddFontFeature(&mut self, fontFeature: DWRITE_FONT_FEATURE) -> ::HRESULT,
-    fn GetFontFeatureCount(&mut self) -> ::UINT32,
-    fn GetFontFeature(
-        &mut self, fontFeatureIndex: ::UINT32, fontFeature: *mut DWRITE_FONT_FEATURE
-    ) -> ::HRESULT
-}}
-FLAGS!{enum DWRITE_SCRIPT_SHAPES {
-    DWRITE_SCRIPT_SHAPES_DEFAULT = 0,
-    DWRITE_SCRIPT_SHAPES_NO_VISUAL = 1,
-}}
-STRUCT!{struct DWRITE_SCRIPT_ANALYSIS {
-    script: ::UINT16,
-    shapes: DWRITE_SCRIPT_SHAPES,
-}}
-ENUM!{enum DWRITE_BREAK_CONDITION {
-    DWRITE_BREAK_CONDITION_NEUTRAL,
-    DWRITE_BREAK_CONDITION_CAN_BREAK,
-    DWRITE_BREAK_CONDITION_MAY_NOT_BREAK,
-    DWRITE_BREAK_CONDITION_MUST_BREAK,
-}}
-STRUCT!{struct DWRITE_LINE_BREAKPOINT {
-    bit_fields: ::UINT8,
-}}
-BITFIELD!{DWRITE_LINE_BREAKPOINT bit_fields: ::UINT8 [
-    breakConditionBefore set_breakConditionBefore[0..2],
-    breakConditionAfter set_breakConditionAfter[2..4],
-    isWhitespace set_isWhitespace[4..5],
-    isSoftHyphen set_isSoftHyphen[5..6],
-    padding set_padding[6..8],
-]}
-ENUM!{enum DWRITE_NUMBER_SUBSTITUTION_METHOD {
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_FROM_CULTURE,
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL,
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE,
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL,
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL,
-}}
-RIDL!{interface IDWriteNumberSubstitution(IDWriteNumberSubstitutionVtbl): IUnknown(IUnknownVtbl) {
-}}
-STRUCT!{struct DWRITE_SHAPING_TEXT_PROPERTIES {
-    bit_fields: ::UINT16,
-}}
-BITFIELD!{DWRITE_SHAPING_TEXT_PROPERTIES bit_fields: ::UINT16 [
-    isShapedAlone set_isShapedAlone[0..1],
-    reserved set_reserved[1..16],
-]}
-STRUCT!{struct DWRITE_SHAPING_GLYPH_PROPERTIES {
-    bit_fields: ::UINT16,
-}}
-BITFIELD!{DWRITE_SHAPING_GLYPH_PROPERTIES bit_fields: ::UINT16 [
-    justification set_justification[0..4],
-    isClusterStart set_isClusterStart[4..5],
-    isDiacritic set_isDiacritic[5..6],
-    isZeroWidthSpace set_isZeroWidthSpace[6..7],
-    reserved set_reserved[7..16],
-]}
-RIDL!{interface IDWriteTextAnalysisSource(IDWriteTextAnalysisSourceVtbl): IUnknown(IUnknownVtbl) {
-    fn GetTextAtPosition(
-        &mut self, textPosition: ::UINT32, textString: *mut *const ::WCHAR,
-        textLength: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetTextBeforePosition(
-        &mut self, textPosition: ::UINT32, textString: *mut *const ::WCHAR,
-        textLength: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetParagraphReadingDirection(&mut self) -> DWRITE_READING_DIRECTION,
-    fn GetLocaleName(
-        &mut self, textPosition: ::UINT32, textLength: *mut ::UINT32,
-        localeName: *mut *const ::WCHAR
-    ) -> ::HRESULT,
-    fn GetNumberSubstitution(
-        &mut self, textPosition: ::UINT32, textLength: *mut ::UINT32,
-        numberSubstitution: *mut *mut IDWriteNumberSubstitution
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTextAnalysisSink(IDWriteTextAnalysisSinkVtbl): IUnknown(IUnknownVtbl) {
-    fn SetScriptAnalysis(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32,
-        scriptAnalysis: *const DWRITE_SCRIPT_ANALYSIS
-    ) -> ::HRESULT,
-    fn SetLineBreakpoints(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32,
-        lineBreakpoints: *const DWRITE_LINE_BREAKPOINT
-    ) -> ::HRESULT,
-    fn SetBidiLevel(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32, explicitLevel: ::UINT8,
-        resolvedLevel: ::UINT8
-    ) -> ::HRESULT,
-    fn SetNumberSubstitution(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32,
-        numberSubstitution: *mut IDWriteNumberSubstitution
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTextAnalyzer(IDWriteTextAnalyzerVtbl): IUnknown(IUnknownVtbl) {
-    fn AnalyzeScript(
-        &mut self, analysisSource: *mut IDWriteTextAnalysisSource, textPosition: ::UINT32,
-        textLength: ::UINT32, analysisSink: *mut IDWriteTextAnalysisSink
-    ) -> ::HRESULT,
-    fn AnalyzeBidi(
-        &mut self, analysisSource: *mut IDWriteTextAnalysisSource, textPosition: ::UINT32,
-        textLength: ::UINT32, analysisSink: *mut IDWriteTextAnalysisSink
-    ) -> ::HRESULT,
-    fn AnalyzeNumberSubstitution(
-        &mut self, analysisSource: *mut IDWriteTextAnalysisSource, textPosition: ::UINT32,
-        textLength: ::UINT32, analysisSink: *mut IDWriteTextAnalysisSink
-    ) -> ::HRESULT,
-    fn AnalyzeLineBreakpoints(
-        &mut self, analysisSource: *mut IDWriteTextAnalysisSource, textPosition: ::UINT32,
-        textLength: ::UINT32, analysisSink: *mut IDWriteTextAnalysisSink
-    ) -> ::HRESULT,
-    fn GetGlyphs(
-        &mut self, textString: *const ::WCHAR, textLength: ::UINT32,
-        fontFace: *mut IDWriteFontFace, isSideways: ::BOOL, isRightToLeft: ::BOOL,
-        scriptAnalysis: *const DWRITE_SCRIPT_ANALYSIS, localeName: *const ::WCHAR,
-        numberSubstitution: *mut IDWriteNumberSubstitution,
-        features: *mut *const DWRITE_TYPOGRAPHIC_FEATURES, featureRangeLengths: *const ::UINT32,
-        featureRanges: ::UINT32, maxGlyphCount: ::UINT32, clusterMap: *mut ::UINT16,
-        textProps: *mut DWRITE_SHAPING_TEXT_PROPERTIES, glyphIndices: *mut ::UINT16,
-        glyphProps: *mut DWRITE_SHAPING_GLYPH_PROPERTIES, actualGlyphCount: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetGlyphPlacements(
-        &mut self, textString: *const ::WCHAR, clusterMap: *const ::UINT16,
-        textProps: *mut DWRITE_SHAPING_TEXT_PROPERTIES, textLength: ::UINT32,
-        glyphIndices: *const ::UINT16, glyphProps: *const DWRITE_SHAPING_GLYPH_PROPERTIES,
-        glyphCount: ::UINT32, fontFace: *mut IDWriteFontFace, fontEmSize: ::FLOAT,
-        isSideways: ::BOOL, isRightToLeft: ::BOOL, scriptAnalysis: *const DWRITE_SCRIPT_ANALYSIS,
-        localeName: *const ::WCHAR, features: *mut *const DWRITE_TYPOGRAPHIC_FEATURES,
-        featureRangeLengths: *const ::UINT32, featureRanges: ::UINT32, glyphAdvances: *mut ::FLOAT,
-        glyphOffsets: *mut DWRITE_GLYPH_OFFSET
-    ) -> ::HRESULT,
-    fn GetGdiCompatibleGlyphPlacements(
-        &mut self, textString: *const ::WCHAR, clusterMap: *const ::UINT16,
-        textProps: *mut DWRITE_SHAPING_TEXT_PROPERTIES, textLength: ::UINT32,
-        glyphIndices: *const ::UINT16, glyphProps: *const DWRITE_SHAPING_GLYPH_PROPERTIES,
-        glyphCount: ::UINT32, fontFace: *mut IDWriteFontFace, fontEmSize: ::FLOAT,
-        pixelsPerDip: ::FLOAT, transform: *const DWRITE_MATRIX, useGdiNatrual: ::BOOL,
-        isSideways: ::BOOL, isRightToLeft: ::BOOL, scriptAnalysis: *const DWRITE_SCRIPT_ANALYSIS,
-        localeName: *const ::WCHAR, features: *mut *const DWRITE_TYPOGRAPHIC_FEATURES,
-        featureRangeLengths: *const ::UINT32, featureRanges: ::UINT32, glyphAdvances: *mut ::FLOAT,
-        glyphOffsets: *mut DWRITE_GLYPH_OFFSET
-    ) -> ::HRESULT
-}}
-STRUCT!{struct DWRITE_GLYPH_RUN {
-    fontFace: *mut IDWriteFontFace,
-    fontEmSize: ::FLOAT,
-    glyphCount: ::UINT32,
-    glyphIndices: *const ::UINT16,
-    glyphAdvances: *const ::FLOAT,
-    glyphOffsets: *const DWRITE_GLYPH_OFFSET,
-    isSideways: ::BOOL,
-    bidiLevel: ::UINT32,
-}}
-STRUCT!{struct DWRITE_GLYPH_RUN_DESCRIPTION {
-    localeName: *const ::WCHAR,
-    string: *const ::WCHAR,
-    stringLength: ::UINT32,
-    clusterMap: *const ::UINT16,
-    textPosition: ::UINT32,
-}}
-STRUCT!{struct DWRITE_UNDERLINE {
-    width: ::FLOAT,
-    thickness: ::FLOAT,
-    offset: ::FLOAT,
-    runHeight: ::FLOAT,
-    readingDirection: DWRITE_READING_DIRECTION,
-    flowDirection: DWRITE_FLOW_DIRECTION,
-    localeName: *const ::WCHAR,
-    measuringMode: ::DWRITE_MEASURING_MODE,
-}}
-STRUCT!{struct DWRITE_STRIKETHROUGH {
-    width: ::FLOAT,
-    thickness: ::FLOAT,
-    offset: ::FLOAT,
-    readingDirection: DWRITE_READING_DIRECTION,
-    flowDirection: DWRITE_FLOW_DIRECTION,
-    localeName: *const ::WCHAR,
-    measuringMode: ::DWRITE_MEASURING_MODE,
-}}
-STRUCT!{struct DWRITE_LINE_METRICS {
-    length: ::UINT32,
-    trailingWhitespaceLength: ::UINT32,
-    newlineLength: ::UINT32,
-    height: ::FLOAT,
-    baseline: ::FLOAT,
-    isTrimmed: ::BOOL,
-}}
-STRUCT!{struct DWRITE_CLUSTER_METRICS {
-    width: ::FLOAT,
-    length: ::UINT16,
-    bit_fields: ::UINT16,
-}}
-BITFIELD!{DWRITE_CLUSTER_METRICS bit_fields: ::UINT16 [
-    canWrapLineAfter set_canWrapLineAfter[0..1],
-    isWhitespace set_isWhitespace[1..2],
-    isNewline set_isNewline[2..3],
-    isSoftHyphen set_isSoftHyphen[3..4],
-    isRightToLeft set_isRightToLeft[4..5],
-    padding set_padding[5..16],
-]}
-STRUCT!{struct DWRITE_TEXT_METRICS {
-    left: ::FLOAT,
-    top: ::FLOAT,
-    width: ::FLOAT,
-    widthIncludingTrailingWhitespace: ::FLOAT,
-    height: ::FLOAT,
-    layoutWidth: ::FLOAT,
-    layoutHeight: ::FLOAT,
-    maxBidiReorderingDepth: ::UINT32,
-    lineCount: ::UINT32,
-}}
-STRUCT!{struct DWRITE_INLINE_OBJECT_METRICS {
-    width: ::FLOAT,
-    height: ::FLOAT,
-    baseline: ::FLOAT,
-    supportsSideways: ::BOOL,
-}}
-STRUCT!{struct DWRITE_OVERHANG_METRICS {
-    left: ::FLOAT,
-    top: ::FLOAT,
-    right: ::FLOAT,
-    bottom: ::FLOAT,
-}}
-STRUCT!{struct DWRITE_HIT_TEST_METRICS {
-    textPosition: ::UINT32,
-    length: ::UINT32,
-    left: ::FLOAT,
-    top: ::FLOAT,
-    width: ::FLOAT,
-    height: ::FLOAT,
-    bidiLevel: ::UINT32,
-    isText: ::BOOL,
-    isTrimmed: ::BOOL,
-}}
-RIDL!{interface IDWriteInlineObject(IDWriteInlineObjectVtbl): IUnknown(IUnknownVtbl) {
-    fn Draw(
-        &mut self, clientDrawingContext: *mut ::c_void, renderer: *mut IDWriteTextRenderer,
-        originX: ::FLOAT, originY: ::FLOAT, isSideways: ::BOOL, isRightToLeft: ::BOOL,
-        clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn GetMetrics(&mut self, metrics: *mut DWRITE_INLINE_OBJECT_METRICS) -> ::HRESULT,
-    fn GetOverhangMetrics(&mut self, overhangs: *mut DWRITE_OVERHANG_METRICS) -> ::HRESULT,
-    fn GetBreakConditions(
-        &mut self, breakConditionBefore: *mut DWRITE_BREAK_CONDITION,
-        breakConditionAfter: *mut DWRITE_BREAK_CONDITION
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWritePixelSnapping(IDWritePixelSnappingVtbl): IUnknown(IUnknownVtbl) {
-    fn IsPixelSnappingDisabled(
-        &mut self, clientDrawingContext: *mut ::c_void, isDisabled: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn GetCurrentTransform(
-        &mut self, clientDrawingContext: *mut ::c_void, transform: *mut DWRITE_MATRIX
-    ) -> ::HRESULT,
-    fn GetPixelsPerDip(
-        &mut self, clientDrawingContext: *mut ::c_void, pixelsPerDip: *mut ::FLOAT
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTextRenderer(IDWriteTextRendererVtbl):
-        IDWritePixelSnapping(IDWritePixelSnappingVtbl) {
-    fn DrawGlyphRun(
-        &mut self, clientDrawingContext: *mut ::c_void, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, measuringMode: ::DWRITE_MEASURING_MODE,
-        glyphRun: *const DWRITE_GLYPH_RUN,
-        glyphRunDescription: *const DWRITE_GLYPH_RUN_DESCRIPTION,
-        clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn DrawUnderline(
-        &mut self, clientDrawingContext: *mut ::c_void, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, underline: *const DWRITE_UNDERLINE,
-        clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn DrawStrikethrough(
-        &mut self, clientDrawingContext: *mut ::c_void, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, strikethrough: *const DWRITE_STRIKETHROUGH,
-        clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn DrawInlineObject(
-        &mut self, clientDrawingContext: *mut ::c_void, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, inlineObject: *mut IDWriteInlineObject,
-        isSideways: ::BOOL, isRightToLeft: ::BOOL, clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTextLayout(IDWriteTextLayoutVtbl):
-        IDWriteTextFormat(IDWriteTextFormatVtbl) {
-    fn SetMaxWidth(&mut self, maxWidth: ::FLOAT) -> ::HRESULT,
-    fn SetMaxHeight(&mut self, maxHeight: ::FLOAT) -> ::HRESULT,
-    fn SetFontCollection(
-        &mut self, fontCollection: *mut IDWriteFontCollection, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontFamilyName(
-        &mut self, fontFamilyName: *const ::WCHAR, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontWeight(
-        &mut self, fontWeight: DWRITE_FONT_WEIGHT, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontStyle(
-        &mut self, fontStyle: DWRITE_FONT_STYLE, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontStretch(
-        &mut self, fontStretch: DWRITE_FONT_STRETCH, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontSize(&mut self, fontSize: ::FLOAT, textRange: DWRITE_TEXT_RANGE) -> ::HRESULT,
-    fn SetUnderline(&mut self, hasUnderline: ::BOOL, textRange: DWRITE_TEXT_RANGE) -> ::HRESULT,
-    fn SetStrikethrough(
-        &mut self, hasStrikethrough: ::BOOL, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetDrawingEffect(
-        &mut self, drawingEffect: *mut ::IUnknown, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetInlineObject(
-        &mut self, inlineObject: *mut IDWriteInlineObject, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetTypography(
-        &mut self, typography: *mut IDWriteTypography, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetLocaleName(
-        &mut self, localeName: *const ::WCHAR, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetMaxWidth(&mut self) -> ::FLOAT,
-    fn GetMaxHeight(&mut self) -> ::FLOAT,
-    fn GetFontCollection(
-        &mut self, currentPosition: ::UINT32, fontCollection: *mut *mut IDWriteFontCollection,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontFamilyNameLength(
-        &mut self, currentPosition: ::UINT32, nameLength: *mut ::UINT32,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontFamilyName(
-        &mut self, currentPosition: ::UINT32, fontFamilyName: *mut ::WCHAR,
-        nameSize: ::UINT32, textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontWeight(
-        &mut self, currentPosition: ::UINT32, fontWeight: *mut DWRITE_FONT_WEIGHT,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontStyle(
-        &mut self, currentPosition: ::UINT32, fontStyle: *mut DWRITE_FONT_STYLE,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontStretch(
-        &mut self, currentPosition: ::UINT32, fontStretch: *mut DWRITE_FONT_STRETCH,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontSize(
-        &mut self, currentPosition: ::UINT32, fontSize: *mut ::FLOAT,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetUnderline(
-        &mut self, currentPosition: ::UINT32, hasUnderline: *mut ::BOOL,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetStrikethrough(
-        &mut self, currentPosition: ::UINT32, hasStrikethrough: *mut ::BOOL,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetDrawingEffect(
-        &mut self, currentPosition: ::UINT32, drawingEffect: *mut *mut ::IUnknown,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetInlineObject(
-        &mut self, currentPosition: ::UINT32, inlineObject: *mut *mut IDWriteInlineObject,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetTypography(
-        &mut self, currentPosition: ::UINT32, typography: *mut *mut IDWriteTypography,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetLocaleNameLength(
-        &mut self, currentPosition: ::UINT32, nameLength: *mut ::UINT32,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetLocaleName(
-        &mut self, currentPosition: ::UINT32, localeName: *mut ::WCHAR, nameSize: ::UINT32,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn Draw(
-        &mut self, clientDrawingContext: *mut ::c_void, renderer: *mut IDWriteTextRenderer,
-        originX: ::FLOAT, originY: ::FLOAT
-    ) -> ::HRESULT,
-    fn GetLineMetrics(
-        &mut self, lineMetrics: *mut DWRITE_LINE_METRICS, maxLineCount: ::UINT32,
-        actualLineCount: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetMetrics(&mut self, textMetrics: *mut DWRITE_TEXT_METRICS) -> ::HRESULT,
-    fn GetOverhangMetrics(&mut self, overhangs: *mut DWRITE_OVERHANG_METRICS) -> ::HRESULT,
-    fn GetClusterMetrics(
-        &mut self, clusterMetrics: *mut DWRITE_CLUSTER_METRICS, maxClusterCount: ::UINT32,
-        actualClusterCount: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn DetermineMinWidth(&mut self, minWidth: *mut ::FLOAT) -> ::HRESULT,
-    fn HitTestPoint(
-        &mut self, pointX: ::FLOAT, pointY: ::FLOAT, isTrailingHit: *mut ::BOOL,
-        isInside: *mut ::BOOL, hitTestMetrics: *mut DWRITE_HIT_TEST_METRICS
-    ) -> ::HRESULT,
-    fn HitTestTextPosition(
-        &mut self, textPosition: ::UINT32, isTrailingHit: ::BOOL, pointX: *mut ::FLOAT,
-        pointY: *mut ::FLOAT, hitTestMetrics: *mut DWRITE_HIT_TEST_METRICS
-    ) -> ::HRESULT,
-    fn HitTestTextRange(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32, originX: ::FLOAT,
-        originY: ::FLOAT, hitTestMetrics: *mut DWRITE_HIT_TEST_METRICS,
-        maxHitTestMetricsCount: ::UINT32, actualHitTestMetricsCount: *mut ::UINT32
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteBitmapRenderTarget(IDWriteBitmapRenderTargetVtbl): IUnknown(IUnknownVtbl) {
-    fn DrawGlyphRun(
-        &mut self, baselineOriginX: ::FLOAT, baselineOriginY: ::FLOAT,
-        measuringMode: ::DWRITE_MEASURING_MODE, glyphRun: *const ::DWRITE_GLYPH_RUN,
-        renderingParams: *mut IDWriteRenderingParams, textColor: ::COLORREF,
-        blackBoxRect: *mut ::RECT
-    ) -> ::HRESULT,
-    fn GetMemoryDC(&mut self) -> ::HDC,
-    fn GetPixelsPerDip(&mut self) -> ::FLOAT,
-    fn SetPixelsPerDip(&mut self, pixelsPerDip: ::FLOAT) -> ::HRESULT,
-    fn GetCurrentTransform(&mut self, transform: *mut DWRITE_MATRIX) -> ::HRESULT,
-    fn SetCurrentTransform(&mut self, transform: *const DWRITE_MATRIX) -> ::HRESULT,
-    fn GetSize(&mut self, size: *mut ::SIZE) -> ::HRESULT,
-    fn Resize(&mut self, width: ::UINT32, height: ::UINT32) -> ::HRESULT
-}}
-RIDL!{interface IDWriteGdiInterop(IDWriteGdiInteropVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateFontFromLOGFONT(
-        &mut self, logFont: *const ::LOGFONTW, font: *mut *mut IDWriteFont
-    ) -> ::HRESULT,
-    fn ConvertFontToLOGFONT(
-        &mut self, font: *mut IDWriteFont, logFont: *mut ::LOGFONTW, isSystemFont: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn ConvertFontFaceToLOGFONT(
-        &mut self, font: *mut IDWriteFontFace, logFont: *mut ::LOGFONTW
-    ) -> ::HRESULT,
-    fn CreateFontFaceFromHdc(
-        &mut self, hdc: ::HDC, fontFace: *mut *mut IDWriteFontFace
-    ) -> ::HRESULT,
-    fn CreateBitmapRenderTarget(
-        &mut self, hdc: ::HDC, width: ::UINT32, height: ::UINT32,
-        renderTarget: *mut *mut IDWriteBitmapRenderTarget
-    ) -> ::HRESULT
-}}
-ENUM!{enum DWRITE_TEXTURE_TYPE {
-    DWRITE_TEXTURE_ALIASED_1x1 = 0,
-    DWRITE_TEXTURE_CLEARTYPE_3x1 = 1,
-}}
-pub const DWRITE_ALPHA_MAX: ::BYTE = 255;
-RIDL!{interface IDWriteGlyphRunAnalysis(IDWriteGlyphRunAnalysisVtbl): IUnknown(IUnknownVtbl) {
-    fn GetAlphaTextureBounds(
-        &mut self, textureType: DWRITE_TEXTURE_TYPE, textureBounds: *mut ::RECT
-    ) -> ::HRESULT,
-    fn CreateAlphaTexture(
-        &mut self, textureType: DWRITE_TEXTURE_TYPE, textureBounds: *const ::RECT,
-        alphaValues: *mut ::BYTE, bufferSize: ::UINT32
-    ) -> ::HRESULT,
-    fn GetAlphaBlendParams(
-        &mut self, renderingParams: *mut IDWriteRenderingParams, blendGamma: *mut ::FLOAT,
-        blendEnhancedContrast: *mut ::FLOAT, blendClearTypeLevel: *mut ::FLOAT
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFactory(IDWriteFactoryVtbl): IUnknown(IUnknownVtbl) {
-    fn GetSystemFontCollection(
-        &mut self, fontCollection: *mut *mut IDWriteFontCollection, checkForUpdates: ::BOOL
-    ) -> ::HRESULT,
-    fn CreateCustomFontCollection(
-        &mut self, collectionLoader: *mut IDWriteFontCollectionLoader,
-        collectionKey: *const ::c_void, collectionKeySize: ::UINT32,
-        fontCollection: *mut *mut IDWriteFontCollection
-    ) -> ::HRESULT,
-    fn RegisterFontCollectionLoader(
-        &mut self, fontCollectionLoader: *mut IDWriteFontCollectionLoader
-    ) -> ::HRESULT,
-    fn UnregisterFontCollectionLoader(
-        &mut self, fontCollectionLoader: *mut IDWriteFontCollectionLoader
-    ) -> ::HRESULT,
-    fn CreateFontFileReference(
-        &mut self, filePath: *const ::WCHAR, lastWriteTime: *const ::FILETIME,
-        fontFile: *mut *mut IDWriteFontFile
-    ) -> ::HRESULT,
-    fn CreateCustomFontFileReference(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        fontFileLoader: *mut IDWriteFontFileLoader, fontFile: *mut *mut IDWriteFontFile
-    ) -> ::HRESULT,
-    fn CreateFontFace(
-        &mut self, fontFaceType: DWRITE_FONT_FACE_TYPE, numberOfFiles: ::UINT32,
-        fontFiles: *const *mut IDWriteFontFile, faceIndex: ::UINT32,
-        fontFaceSimulationFlags: DWRITE_FONT_SIMULATIONS, fontFace: *mut *mut IDWriteFontFace
-    ) -> ::HRESULT,
-    fn CreateRenderingParams(
-        &mut self, renderingParams: *mut *mut IDWriteRenderingParams
-    ) -> ::HRESULT,
-    fn CreateMonitorRenderingParams(
-        &mut self, monitor: ::HMONITOR, renderingParams: *mut *mut IDWriteRenderingParams
-    ) -> ::HRESULT,
-    fn CreateCustomRenderingParams(
-        &mut self, gamma: ::FLOAT, enhancedContrast: ::FLOAT, clearTypeLevel: ::FLOAT,
-        pixelGeometry: DWRITE_PIXEL_GEOMETRY, renderingMode: DWRITE_RENDERING_MODE,
-        renderingParams: *mut *mut IDWriteRenderingParams
-    ) -> ::HRESULT,
-    fn RegisterFontFileLoader(
-        &mut self, fontFileLoader: *mut IDWriteFontFileLoader
-    ) -> ::HRESULT,
-    fn UnregisterFontFileLoader(
-        &mut self, fontFileLoader: *mut IDWriteFontFileLoader
-    ) -> ::HRESULT,
-    fn CreateTextFormat(
-        &mut self, fontFamilyName: *const ::WCHAR, fontCollection: *mut IDWriteFontCollection,
-        fontWeight: DWRITE_FONT_WEIGHT, fontStyle: DWRITE_FONT_STYLE,
-        fontStretch: DWRITE_FONT_STRETCH, fontSize: ::FLOAT, localeName: *const ::WCHAR,
-        textFormat: *mut *mut IDWriteTextFormat
-    ) -> ::HRESULT,
-    fn CreateTypography(&mut self, typography: *mut *mut IDWriteTypography) -> ::HRESULT,
-    fn GetGdiInterop(&mut self, gdiInterop: *mut *mut IDWriteGdiInterop) -> ::HRESULT,
-    fn CreateTextLayout(
-        &mut self, string: *const ::WCHAR, stringLength: ::UINT32,
-        textFormat: *mut IDWriteTextFormat, maxWidth: ::FLOAT, maxHeight: ::FLOAT,
-        textLayout: *mut *mut IDWriteTextLayout
-    ) -> ::HRESULT,
-    fn CreateGdiCompatibleTextLayout(
-        &mut self, string: *const ::WCHAR, stringLength: ::UINT32,
-        textFormat: *mut IDWriteTextFormat, layoutWidth: ::FLOAT, layoutHeight: ::FLOAT,
-        pixelsPerDip: ::FLOAT, transform: *const DWRITE_MATRIX, useGdiNatrual: ::BOOL,
-        textLayout: *mut *mut IDWriteTextLayout
-    ) -> ::HRESULT,
-    fn CreateEllipsisTrimmingSign(
-        &mut self, textFormat: *mut IDWriteTextFormat, trimmingSign: *mut *mut IDWriteInlineObject
-    ) -> ::HRESULT,
-    fn CreateTextAnalyzer(&mut self, textAnalyzer: *mut *mut IDWriteTextAnalyzer) -> ::HRESULT,
-    fn CreateNumberSubstitution(
-        &mut self, substitutionMethod: DWRITE_NUMBER_SUBSTITUTION_METHOD,
-        localeName: *const ::WCHAR, ignoreUserOverride: ::BOOL,
-        numberSubstitution: *mut *mut IDWriteNumberSubstitution
-    ) -> ::HRESULT,
-    fn CreateGlyphRunAnalysis(
-        &mut self, glyphRun: *const DWRITE_GLYPH_RUN, pixelsPerDip: ::FLOAT,
-        transform: *const DWRITE_MATRIX, renderingMode: DWRITE_RENDERING_MODE,
-        measuringMode: ::DWRITE_MEASURING_MODE, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, glyphRunAnalysis: *mut *mut IDWriteGlyphRunAnalysis
-    ) -> ::HRESULT
-}}
-pub const FACILITY_DWRITE: ::HRESULT = 0x898;
-pub const DWRITE_ERR_BASE: ::HRESULT = 0x5000;
-#[inline]
-pub fn MAKE_DWRITE_HR(severity: ::HRESULT, code: ::HRESULT) -> ::HRESULT {
-    ::MAKE_HRESULT(severity, FACILITY_DWRITE, DWRITE_ERR_BASE + code)
-}
-#[inline]
-pub fn MAKE_DWRITE_HR_ERR(code: ::HRESULT) -> ::HRESULT {
-    MAKE_DWRITE_HR(::SEVERITY_ERROR, code)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,288 +0,0 @@
-// Copyright © 2015; Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgi1_2.h
-
-ENUM!{ enum DXGI_ALPHA_MODE {
-    DXGI_ALPHA_MODE_UNSPECIFIED = 0,
-    DXGI_ALPHA_MODE_PREMULTIPLIED = 1,
-    DXGI_ALPHA_MODE_STRAIGHT = 2,
-    DXGI_ALPHA_MODE_IGNORE = 3,
-    DXGI_ALPHA_MODE_FORCE_DWORD = 0xFFFFFFFF,
-}}
-
-ENUM!{ enum DXGI_COMPUTE_PREEMPTION_GRANULARITY {
-    DXGI_COMPUTE_PREEMPTION_DMA_BUFFER_BOUNDARY = 0,
-    DXGI_COMPUTE_PREEMPTION_DISPATCH_BOUNDARY = 1,
-    DXGI_COMPUTE_PREEMPTION_THREAD_GROUP_BOUNDARY = 2,
-    DXGI_COMPUTE_PREEMPTION_THREAD_BOUNDARY = 3,
-    DXGI_COMPUTE_PREEMPTION_INSTRUCTION_BOUNDARY = 4,
-}}
-
-ENUM!{ enum DXGI_GRAPHICS_PREEMPTION_GRANULARITY {
-    DXGI_GRAPHICS_PREEMPTION_DMA_BUFFER_BOUNDARY = 0,
-    DXGI_GRAPHICS_PREEMPTION_PRIMITIVE_BOUNDARY = 1,
-    DXGI_GRAPHICS_PREEMPTION_TRIANGLE_BOUNDARY = 2,
-    DXGI_GRAPHICS_PREEMPTION_PIXEL_BOUNDARY = 3,
-    DXGI_GRAPHICS_PREEMPTION_INSTRUCTION_BOUNDARY = 4,
-}}
-
-ENUM!{ enum DXGI_OUTDUPL_POINTER_SHAPE_TYPE {
-    DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MONOCHROME = 1,
-    DXGI_OUTDUPL_POINTER_SHAPE_TYPE_COLOR = 2,
-    DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MASKED_COLOR = 4,
-}}
-
-ENUM!{ enum DXGI_SCALING {
-    DXGI_SCALING_STRETCH = 0,
-    DXGI_SCALING_NONE = 1,
-    DXGI_SCALING_ASPECT_RATIO_STRETCH = 2,
-}}
-
-ENUM!{ enum _DXGI_OFFER_RESOURCE_PRIORITY {
-    DXGI_OFFER_RESOURCE_PRIORITY_LOW = 1,
-    DXGI_OFFER_RESOURCE_PRIORITY_NORMAL = 2,
-    DXGI_OFFER_RESOURCE_PRIORITY_HIGH = 3,
-}}
-
-STRUCT!{nodebug struct DXGI_ADAPTER_DESC2 {
-    Description: [::WCHAR; 128],
-    VendorId: ::UINT,
-    DeviceId: ::UINT,
-    SubSysId: ::UINT,
-    Revision: ::UINT,
-    DedicatedVideoMemory: ::SIZE_T,
-    DedicatedSystemMemory: ::SIZE_T,
-    SharedSystemMemory: ::SIZE_T,
-    AdapterLuid: ::LUID,
-    Flags: ::UINT,
-    GraphicsPreemptionGranularity: ::DXGI_GRAPHICS_PREEMPTION_GRANULARITY,
-    ComputePreemptionGranularity: ::DXGI_COMPUTE_PREEMPTION_GRANULARITY,
-}}
-
-STRUCT!{struct DXGI_MODE_DESC1 {
-    Width: ::UINT,
-    Height: ::UINT,
-    RefreshRate: ::DXGI_RATIONAL,
-    Format: ::DXGI_FORMAT,
-    ScanlineOrdering: ::DXGI_MODE_SCANLINE_ORDER,
-    Scaling: ::DXGI_MODE_SCALING,
-    Stereo: ::BOOL,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_DESC {
-    ModeDesc: ::DXGI_MODE_DESC,
-    Rotation: ::DXGI_MODE_ROTATION,
-    DesktopImageInSystemMemory: ::BOOL,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_FRAME_INFO {
-    LastPresentTime: ::LARGE_INTEGER,
-    LastMouseUpdateTime: ::LARGE_INTEGER,
-    AccumulatedFrames: ::UINT,
-    RectsCoalesced: ::BOOL,
-    ProtectedContentMaskedOut: ::BOOL,
-    PointerPosition: ::DXGI_OUTDUPL_POINTER_POSITION,
-    TotalMetadataBufferSize: ::UINT,
-    PointerShapeBufferSize: ::UINT,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_MOVE_RECT {
-    SourcePoint: ::POINT,
-    DestinationRect: ::RECT,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_POINTER_POSITION {
-    Position: ::POINT,
-    Visible: ::BOOL,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_POINTER_SHAPE_INFO {
-    Type: ::UINT,
-    Width: ::UINT,
-    Height: ::UINT,
-    Pitch: ::UINT,
-    HotSpot: ::POINT,
-}}
-
-STRUCT!{struct DXGI_PRESENT_PARAMETERS {
-    DirtyRectsCount: ::UINT,
-    pDirtyRects: *mut ::RECT,
-    pScrollRect: *mut ::RECT,
-    pScrollOffset: *mut ::POINT,
-}}
-
-STRUCT!{struct DXGI_SWAP_CHAIN_DESC1 {
-    Width: ::UINT,
-    Height: ::UINT,
-    Format: ::DXGI_FORMAT,
-    Stereo: ::BOOL,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-    BufferUsage: ::DXGI_USAGE,
-    BufferCount: ::UINT,
-    Scaling: ::DXGI_SCALING,
-    SwapEffect: ::DXGI_SWAP_EFFECT,
-    AlphaMode: ::DXGI_ALPHA_MODE,
-    Flags: ::UINT,
-}}
-
-STRUCT!{struct DXGI_SWAP_CHAIN_FULLSCREEN_DESC {
-    RefreshRate: ::DXGI_RATIONAL,
-    ScanlineOrdering: ::DXGI_MODE_SCANLINE_ORDER,
-    Scaling: ::DXGI_MODE_SCALING,
-    Windowed: ::BOOL,
-}}
-
-RIDL!(
-interface IDXGIAdapter2(IDXGIAdapter2Vtbl): IDXGIAdapter1(IDXGIAdapter1Vtbl) {
-    fn GetDesc2(&mut self, pDesc: *mut ::DXGI_ADAPTER_DESC2) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIDevice2(IDXGIDevice2Vtbl): IDXGIDevice1(IDXGIDevice1Vtbl) {
-    fn OfferResources(
-        &mut self, NumResources: ::UINT, ppResources: *mut *mut ::IDXGIResource,
-        Priority: ::DXGI_OFFER_RESOURCE_PRIORITY
-    ) -> ::HRESULT,
-    fn ReclaimResources(
-        &mut self, NumResources: ::UINT, ppResources: *mut *mut ::IDXGIResource,
-        pDiscarded: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn EnqueueSetEvent(&mut self, hEvent: ::HANDLE) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIDisplayControl(IDXGIDisplayControlVtbl): IUnknown(IUnknownVtbl) {
-    fn IsStereoEnabled(&mut self) -> ::BOOL,
-    fn SetStereoEnabled(&mut self, enabled: ::BOOL) -> ()
-});
-
-RIDL!(
-interface IDXGIFactory2(IDXGIFactory2Vtbl): IDXGIFactory1(IDXGIFactory1Vtbl) {
-    fn IsWindowedStereoEnabled(&mut self) -> ::BOOL,
-    fn CreateSwapChainForHwnd(
-        &mut self, pDevice: *mut ::IUnknown, hWnd: ::HWND, pDesc: *const ::DXGI_SWAP_CHAIN_DESC1,
-        pFullscreenDesc: *const ::DXGI_SWAP_CHAIN_FULLSCREEN_DESC,
-        pRestrictToOutput: *mut ::IDXGIOutput, ppSwapChain: *mut *mut ::IDXGISwapChain1
-    ) -> ::HRESULT,
-    fn CreateSwapChainForCoreWindow(
-        &mut self, pDevice: *mut ::IUnknown, pWindow: *mut ::IUnknown,
-        pDesc: *const ::DXGI_SWAP_CHAIN_DESC1, pRestrictToOutput: *mut ::IDXGIOutput,
-        ppSwapChain: *mut *mut ::IDXGISwapChain1
-    ) -> ::HRESULT,
-    fn GetSharedResourceAdapterLuid(
-        &mut self, hResource: ::HANDLE, pLuid: *mut ::LUID
-    ) -> ::HRESULT,
-    fn RegisterStereoStatusWindow(
-        &mut self, WindowHandle: ::HWND, wMsg: ::UINT, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn RegisterStereoStatusEvent(
-        &mut self, hEvent: ::HANDLE, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn UnregisterStereoStatus(&mut self, dwCookie: ::DWORD) -> (),
-    fn RegisterOcclusionStatusWindow(
-        &mut self, WindowHandle: ::HWND, wMsg: ::UINT, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn RegisterOcclusionStatusEvent(
-        &mut self, hEvent: ::HANDLE, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn UnregisterOcclusionStatus(&mut self, dwCookie: ::DWORD) -> (),
-    fn CreateSwapChainForComposition(
-        &mut self, pDevice: *mut ::IUnknown, pDesc: *const ::DXGI_SWAP_CHAIN_DESC1,
-        pRestrictToOutput: *mut ::IDXGIOutput, ppSwapChain: *mut *mut ::IDXGISwapChain1
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIOutput1(IDXGIOutput1Vtbl): IDXGIOutput(IDXGIOutputVtbl) {
-    fn GetDisplayModeList1(
-        &mut self, EnumFormat: ::DXGI_FORMAT, Flags: ::UINT, pNumModes: *mut ::UINT,
-        pDesc: *mut ::DXGI_MODE_DESC1
-    ) -> ::HRESULT,
-    fn FindClosestMatchingMode1(
-        &mut self, pModeToMatch: *const ::DXGI_MODE_DESC1, pClosestMatch: *mut ::DXGI_MODE_DESC1,
-        pConcernedDevice: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn GetDisplaySurfaceData1(
-        &mut self, pDestination: *mut ::IDXGIResource
-    ) -> ::HRESULT,
-    fn DuplicateOutput(
-        &mut self, pDevice: *mut ::IUnknown,
-        ppOutputDuplication: *mut *mut ::IDXGIOutputDuplication
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIOutputDuplication(IDXGIOutputDuplicationVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::DXGI_OUTDUPL_DESC) -> (),
-    fn AcquireNextFrame(
-        &mut self, TimeoutInMilliseconds: ::UINT, pFrameInfo: *mut ::DXGI_OUTDUPL_FRAME_INFO,
-        ppDesktopResource: *mut *mut ::IDXGIResource
-    ) -> ::HRESULT,
-    fn GetFrameDirtyRects(
-        &mut self, DirtyRectsBufferSize: ::UINT, pDirtyRectsBuffer: *mut ::RECT,
-        pDirtyRectsBufferSizeRequired: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetFrameMoveRects(
-        &mut self, MoveRectsBufferSize: ::UINT, pMoveRectBuffer: *mut ::DXGI_OUTDUPL_MOVE_RECT,
-        pMoveRectsBufferSizeRequired: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetFramePointerShape(
-        &mut self, PointerShapeBufferSize: ::UINT, pPointerShapeBuffer: *mut ::c_void,
-        pPointerShapeBufferSizeRequired: *mut ::UINT,
-        pPointerShapeInfo: *mut ::DXGI_OUTDUPL_POINTER_SHAPE_INFO
-    ) -> ::HRESULT,
-    fn MapDesktopSurface(
-        &mut self, pLockedRect: *mut ::DXGI_MAPPED_RECT
-    ) -> ::HRESULT,
-    fn UnMapDesktopSurface(&mut self) -> ::HRESULT,
-    fn ReleaseFrame(&mut self) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIResource1(IDXGIResource1Vtbl): IDXGIResource(IDXGIResourceVtbl) {
-    fn CreateSubresourceSurface(
-        &mut self, index: ::UINT, ppSurface: *mut *mut ::IDXGISurface2
-    ) -> ::HRESULT,
-    fn CreateSharedHandle(
-        &mut self, pAttributes: *const ::SECURITY_ATTRIBUTES, dwAccess: ::DWORD, lpName: ::LPCWSTR,
-        pHandle: *mut ::HANDLE
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISurface2(IDXGISurface2Vtbl): IDXGISurface1(IDXGISurface1Vtbl) {
-    fn GetResource(
-        &mut self, riid: ::REFGUID, ppParentResource: *mut *mut ::c_void,
-        pSubresourceIndex: *mut ::UINT
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISwapChain1(IDXGISwapChain1Vtbl): IDXGISwapChain(IDXGISwapChainVtbl) {
-    fn GetDesc1(&mut self, pDesc: *mut ::DXGI_SWAP_CHAIN_DESC1) -> ::HRESULT,
-    fn GetFullscreenDesc(
-        &mut self, pDesc: *mut ::DXGI_SWAP_CHAIN_FULLSCREEN_DESC
-    ) -> ::HRESULT,
-    fn GetHwnd(&mut self, pHwnd: *mut ::HWND) -> ::HRESULT,
-    fn GetCoreWindow(
-        &mut self, refiid: ::REFGUID, ppUnk: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn Present1(
-        &mut self, SyncInterval: ::UINT, PresentFlags: ::UINT,
-        pPresentParameters: *const ::DXGI_PRESENT_PARAMETERS
-    ) -> ::HRESULT,
-    fn IsTemporaryMonoSupported(&mut self) -> ::BOOL,
-    fn GetRestrictToOutput(
-        &mut self, ppRestrictToOutput: *mut *mut ::IDXGIOutput
-    ) -> ::HRESULT,
-    fn SetBackgroundColor(&mut self, pColor: *const ::DXGI_RGBA) -> ::HRESULT,
-    fn GetBackgroundColor(&mut self, pColor: *mut ::DXGI_RGBA) -> ::HRESULT,
-    fn SetRotation(&mut self, Rotation: ::DXGI_MODE_ROTATION) -> ::HRESULT,
-    fn GetRotation(&mut self, pRotation: *mut ::DXGI_MODE_ROTATION) -> ::HRESULT
-});
-
-pub type DXGI_OFFER_RESOURCE_PRIORITY = ::_DXGI_OFFER_RESOURCE_PRIORITY;
-pub const DXGI_ENUM_MODES_DISABLED_STEREO: ::UINT = 8;
-pub const DXGI_ENUM_MODES_STEREO: ::UINT = 4;
-pub const DXGI_SHARED_RESOURCE_READ: ::UINT = 0x80000000;
-pub const DXGI_SHARED_RESOURCE_WRITE: ::UINT = 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_3.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_3.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_3.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_3.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-// Copyright © 2015; Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgi1_3.h
-
-ENUM!{ enum DXGI_FRAME_PRESENTATION_MODE {
-    DXGI_FRAME_PRESENTATION_MODE_COMPOSED = 0,
-    DXGI_FRAME_PRESENTATION_MODE_OVERLAY = 1,
-    DXGI_FRAME_PRESENTATION_MODE_NONE = 2,
-    DXGI_FRAME_PRESENTATION_MODE_COMPOSITION_FAILURE = 3,
-}}
-
-FLAGS!{ enum DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS {
-    DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_NOMINAL_RANGE = 0x1,
-    DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_BT709 = 0x2,
-    DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_xvYCC = 0x4,
-}}
-
-FLAGS!{ enum DXGI_OVERLAY_SUPPORT_FLAG {
-    DXGI_OVERLAY_SUPPORT_FLAG_DIRECT = 0x1,
-    DXGI_OVERLAY_SUPPORT_FLAG_SCALING = 0x2,
-}}
-
-STRUCT!{struct DXGI_DECODE_SWAP_CHAIN_DESC {
-    Flags: ::UINT,
-}}
-
-STRUCT!{struct DXGI_FRAME_STATISTICS_MEDIA {
-    PresentCount: ::UINT,
-    PresentRefreshCount: ::UINT,
-    SyncRefreshCount: ::UINT,
-    SyncQPCTime: ::LARGE_INTEGER,
-    SyncGPUTime: ::LARGE_INTEGER,
-    CompositionMode: ::DXGI_FRAME_PRESENTATION_MODE,
-    ApprovedPresentDuration: ::UINT,
-}}
-
-STRUCT!{struct DXGI_MATRIX_3X2_F {
-    _11: ::FLOAT,
-    _12: ::FLOAT,
-    _21: ::FLOAT,
-    _22: ::FLOAT,
-    _31: ::FLOAT,
-    _32: ::FLOAT,
-}}
-
-RIDL!(
-interface IDXGIDecodeSwapChain(IDXGIDecodeSwapChainVtbl): IUnknown(IUnknownVtbl) {
-    fn PresentBuffer(
-        &mut self, BufferToPresent: ::UINT, SyncInterval: ::UINT, Flags: ::UINT
-    ) -> ::HRESULT,
-    fn SetSourceRect(&mut self, pRect: *const ::RECT) -> ::HRESULT,
-    fn SetTargetRect(&mut self, pRect: *const ::RECT) -> ::HRESULT,
-    fn SetDestSize(&mut self, Width: ::UINT, Height: ::UINT) -> ::HRESULT,
-    fn GetSourceRect(&mut self, pRect: *mut ::RECT) -> ::HRESULT,
-    fn GetTargetRect(&mut self, pRect: *mut ::RECT) -> ::HRESULT,
-    fn GetDestSize(
-        &mut self, pWidth: *mut ::UINT, pHeight: *mut ::UINT
-    ) -> ::HRESULT,
-    fn SetColorSpace(
-        &mut self, ColorSpace: ::DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS
-    ) -> ::HRESULT,
-    fn GetColorSpace(&mut self) -> ::DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS
-});
-
-RIDL!(
-interface IDXGIDevice3(IDXGIDevice3Vtbl): IDXGIDevice2(IDXGIDevice2Vtbl) {
-    fn Trim(&mut self) -> ()
-});
-
-RIDL!(
-interface IDXGIFactory3(IDXGIFactory3Vtbl): IDXGIFactory2(IDXGIFactory2Vtbl) {
-    fn GetCreationFlags(&mut self) -> ::UINT
-});
-
-RIDL!(
-interface IDXGIFactoryMedia(IDXGIFactoryMediaVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateSwapChainForCompositionSurfaceHandle(
-        &mut self, pDevice: *mut ::IUnknown, hSurface: ::HANDLE,
-        pDesc: *const ::DXGI_SWAP_CHAIN_DESC1, pRestrictToOutput: *mut ::IDXGIOutput,
-        ppSwapChain: *mut *mut ::IDXGISwapChain1
-    ) -> ::HRESULT,
-    fn CreateDecodeSwapChainForCompositionSurfaceHandle(
-        &mut self, pDevice: *mut ::IUnknown, hSurface: ::HANDLE,
-        pDesc: *mut ::DXGI_DECODE_SWAP_CHAIN_DESC, pYuvDecodeBuffers: *mut ::IDXGIResource,
-        pRestrictToOutput: *mut ::IDXGIOutput, ppSwapChain: *mut *mut ::IDXGIDecodeSwapChain
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIOutput2(IDXGIOutput2Vtbl): IDXGIOutput1(IDXGIOutput1Vtbl) {
-    fn SupportsOverlays(&mut self) -> ::BOOL
-});
-
-RIDL!(
-interface IDXGIOutput3(IDXGIOutput3Vtbl): IDXGIOutput2(IDXGIOutput2Vtbl) {
-    fn CheckOverlaySupport(
-        &mut self, EnumFormat: ::DXGI_FORMAT, pConcernedDevice: *mut ::IUnknown,
-        pFlags: *mut ::UINT
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISwapChain2(IDXGISwapChain2Vtbl): IDXGISwapChain1(IDXGISwapChain1Vtbl) {
-    fn SetSourceSize(&mut self, Width: ::UINT, Height: ::UINT) -> ::HRESULT,
-    fn GetSourceSize(
-        &mut self, pWidth: *mut ::UINT, pHeight: *mut ::UINT
-    ) -> ::HRESULT,
-    fn SetMaximumFrameLatency(&mut self, MaxLatency: ::UINT) -> ::HRESULT,
-    fn GetMaximumFrameLatency(&mut self, pMaxLatency: *mut ::UINT) -> ::HRESULT,
-    fn GetFrameLatencyWaitableObject(&mut self) -> ::HANDLE,
-    fn SetMatrixTransform(
-        &mut self, pMatrix: *const ::DXGI_MATRIX_3X2_F
-    ) -> ::HRESULT,
-    fn GetMatrixTransform(
-        &mut self, pMatrix: *mut ::DXGI_MATRIX_3X2_F
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISwapChainMedia(IDXGISwapChainMediaVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFrameStatisticsMedia(
-        &mut self, pStats: *mut ::DXGI_FRAME_STATISTICS_MEDIA
-    ) -> ::HRESULT,
-    fn SetPresentDuration(&mut self, Duration: ::UINT) -> ::HRESULT,
-    fn CheckPresentDurationSupport(
-        &mut self, DesiredPresentDuration: ::UINT, pClosestSmallerPresentDuration: *mut ::UINT,
-        pClosestLargerPresentDuration: *mut ::UINT
-    ) -> ::HRESULT
-});
-
-pub const DXGI_CREATE_FACTORY_DEBUG: ::UINT = 0x1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_4.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_4.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_4.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi1_4.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-// Copyright © 2015; Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgi1_4.h
-
-ENUM!{ enum DXGI_MEMORY_SEGMENT_GROUP {
-    DXGI_MEMORY_SEGMENT_GROUP_LOCAL = 0,
-    DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL = 1,
-}}
-
-FLAGS!{ enum DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG {
-    DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1,
-}}
-
-FLAGS!{ enum DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG {
-    DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1,
-    DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_OVERLAY_PRESENT = 0x2,
-}}
-
-STRUCT!{struct DXGI_QUERY_VIDEO_MEMORY_INFO {
-    Budget: ::UINT64,
-    CurrentUsage: ::UINT64,
-    AvailableForReservation: ::UINT64,
-    CurrentReservation: ::UINT64,
-}}
-
-RIDL!(
-interface IDXGIAdapter3(IDXGIAdapter3Vtbl): IDXGIAdapter2(IDXGIAdapter2Vtbl) {
-    fn RegisterHardwareContentProtectionTeardownStatusEvent(
-        &mut self, hEvent: ::HANDLE, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn UnregisterHardwareContentProtectionTeardownStatus(
-        &mut self, dwCookie: ::DWORD
-    ) -> (),
-    fn QueryVideoMemoryInfo(
-        &mut self, NodeIndex: ::UINT, MemorySegmentGroup: ::DXGI_MEMORY_SEGMENT_GROUP,
-        pVideoMemoryInfo: *mut ::DXGI_QUERY_VIDEO_MEMORY_INFO
-    ) -> ::HRESULT,
-    fn SetVideoMemoryReservation(
-        &mut self, NodeIndex: ::UINT, MemorySegmentGroup: ::DXGI_MEMORY_SEGMENT_GROUP,
-        Reservation: ::UINT64
-    ) -> ::HRESULT,
-    fn RegisterVideoMemoryBudgetChangeNotificationEvent(
-        &mut self, hEvent: ::HANDLE, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn UnregisterVideoMemoryBudgetChangeNotification(
-        &mut self, dwCookie: ::DWORD
-    ) -> ()
-});
-
-RIDL!(
-interface IDXGIFactory4(IDXGIFactory4Vtbl): IDXGIFactory3(IDXGIFactory3Vtbl) {
-    fn EnumAdapterByLuid(
-        &mut self, AdapterLuid: ::LUID, riid: ::REFGUID, ppvAdapter: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn EnumWarpAdapter(
-        &mut self, riid: ::REFGUID, ppvAdapter: *mut *mut ::c_void
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIOutput4(IDXGIOutput4Vtbl): IDXGIOutput3(IDXGIOutput3Vtbl) {
-    fn CheckOverlayColorSpaceSupport(
-        &mut self, Format: ::DXGI_FORMAT, ColorSpace: ::DXGI_COLOR_SPACE_TYPE,
-        pConcernedDevice: *mut ::IUnknown, pFlags: *mut ::UINT
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISwapChain3(IDXGISwapChain3Vtbl): IDXGISwapChain2(IDXGISwapChain2Vtbl) {
-    fn GetCurrentBackBufferIndex(&mut self) -> ::UINT,
-    fn CheckColorSpaceSupport(
-        &mut self, ColorSpace: ::DXGI_COLOR_SPACE_TYPE, pColorSpaceSupport: *mut ::UINT
-    ) -> ::HRESULT,
-    fn SetColorSpace1(
-        &mut self, ColorSpace: ::DXGI_COLOR_SPACE_TYPE
-    ) -> ::HRESULT,
-    fn ResizeBuffers1(
-        &mut self, BufferCount: ::UINT, Width: ::UINT, Height: ::UINT, Format: ::DXGI_FORMAT,
-        SwapChainFlags: ::UINT, pCreationNodeMask: *const ::UINT,
-        ppPresentQueue: *mut *mut ::IUnknown
-    ) -> ::HRESULT
-});
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgiformat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgiformat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgiformat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgiformat.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgiformat.h
-ENUM!{enum DXGI_FORMAT {
-    DXGI_FORMAT_UNKNOWN = 0,
-    DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
-    DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
-    DXGI_FORMAT_R32G32B32A32_UINT = 3,
-    DXGI_FORMAT_R32G32B32A32_SINT = 4,
-    DXGI_FORMAT_R32G32B32_TYPELESS = 5,
-    DXGI_FORMAT_R32G32B32_FLOAT = 6,
-    DXGI_FORMAT_R32G32B32_UINT = 7,
-    DXGI_FORMAT_R32G32B32_SINT = 8,
-    DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
-    DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
-    DXGI_FORMAT_R16G16B16A16_UNORM = 11,
-    DXGI_FORMAT_R16G16B16A16_UINT = 12,
-    DXGI_FORMAT_R16G16B16A16_SNORM = 13,
-    DXGI_FORMAT_R16G16B16A16_SINT = 14,
-    DXGI_FORMAT_R32G32_TYPELESS = 15,
-    DXGI_FORMAT_R32G32_FLOAT = 16,
-    DXGI_FORMAT_R32G32_UINT = 17,
-    DXGI_FORMAT_R32G32_SINT = 18,
-    DXGI_FORMAT_R32G8X24_TYPELESS = 19,
-    DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
-    DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
-    DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
-    DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
-    DXGI_FORMAT_R10G10B10A2_UNORM = 24,
-    DXGI_FORMAT_R10G10B10A2_UINT = 25,
-    DXGI_FORMAT_R11G11B10_FLOAT = 26,
-    DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
-    DXGI_FORMAT_R8G8B8A8_UNORM = 28,
-    DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
-    DXGI_FORMAT_R8G8B8A8_UINT = 30,
-    DXGI_FORMAT_R8G8B8A8_SNORM = 31,
-    DXGI_FORMAT_R8G8B8A8_SINT = 32,
-    DXGI_FORMAT_R16G16_TYPELESS = 33,
-    DXGI_FORMAT_R16G16_FLOAT = 34,
-    DXGI_FORMAT_R16G16_UNORM = 35,
-    DXGI_FORMAT_R16G16_UINT = 36,
-    DXGI_FORMAT_R16G16_SNORM = 37,
-    DXGI_FORMAT_R16G16_SINT = 38,
-    DXGI_FORMAT_R32_TYPELESS = 39,
-    DXGI_FORMAT_D32_FLOAT = 40,
-    DXGI_FORMAT_R32_FLOAT = 41,
-    DXGI_FORMAT_R32_UINT = 42,
-    DXGI_FORMAT_R32_SINT = 43,
-    DXGI_FORMAT_R24G8_TYPELESS = 44,
-    DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
-    DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
-    DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
-    DXGI_FORMAT_R8G8_TYPELESS = 48,
-    DXGI_FORMAT_R8G8_UNORM = 49,
-    DXGI_FORMAT_R8G8_UINT = 50,
-    DXGI_FORMAT_R8G8_SNORM = 51,
-    DXGI_FORMAT_R8G8_SINT = 52,
-    DXGI_FORMAT_R16_TYPELESS = 53,
-    DXGI_FORMAT_R16_FLOAT = 54,
-    DXGI_FORMAT_D16_UNORM = 55,
-    DXGI_FORMAT_R16_UNORM = 56,
-    DXGI_FORMAT_R16_UINT = 57,
-    DXGI_FORMAT_R16_SNORM = 58,
-    DXGI_FORMAT_R16_SINT = 59,
-    DXGI_FORMAT_R8_TYPELESS = 60,
-    DXGI_FORMAT_R8_UNORM = 61,
-    DXGI_FORMAT_R8_UINT = 62,
-    DXGI_FORMAT_R8_SNORM = 63,
-    DXGI_FORMAT_R8_SINT = 64,
-    DXGI_FORMAT_A8_UNORM = 65,
-    DXGI_FORMAT_R1_UNORM = 66,
-    DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
-    DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
-    DXGI_FORMAT_G8R8_G8B8_UNORM = 69,
-    DXGI_FORMAT_BC1_TYPELESS = 70,
-    DXGI_FORMAT_BC1_UNORM = 71,
-    DXGI_FORMAT_BC1_UNORM_SRGB = 72,
-    DXGI_FORMAT_BC2_TYPELESS = 73,
-    DXGI_FORMAT_BC2_UNORM = 74,
-    DXGI_FORMAT_BC2_UNORM_SRGB = 75,
-    DXGI_FORMAT_BC3_TYPELESS = 76,
-    DXGI_FORMAT_BC3_UNORM = 77,
-    DXGI_FORMAT_BC3_UNORM_SRGB = 78,
-    DXGI_FORMAT_BC4_TYPELESS = 79,
-    DXGI_FORMAT_BC4_UNORM = 80,
-    DXGI_FORMAT_BC4_SNORM = 81,
-    DXGI_FORMAT_BC5_TYPELESS = 82,
-    DXGI_FORMAT_BC5_UNORM = 83,
-    DXGI_FORMAT_BC5_SNORM = 84,
-    DXGI_FORMAT_B5G6R5_UNORM = 85,
-    DXGI_FORMAT_B5G5R5A1_UNORM = 86,
-    DXGI_FORMAT_B8G8R8A8_UNORM = 87,
-    DXGI_FORMAT_B8G8R8X8_UNORM = 88,
-    DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
-    DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
-    DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
-    DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
-    DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
-    DXGI_FORMAT_BC6H_TYPELESS = 94,
-    DXGI_FORMAT_BC6H_UF16 = 95,
-    DXGI_FORMAT_BC6H_SF16 = 96,
-    DXGI_FORMAT_BC7_TYPELESS = 97,
-    DXGI_FORMAT_BC7_UNORM = 98,
-    DXGI_FORMAT_BC7_UNORM_SRGB = 99,
-    DXGI_FORMAT_AYUV = 100,
-    DXGI_FORMAT_Y410 = 101,
-    DXGI_FORMAT_Y416 = 102,
-    DXGI_FORMAT_NV12 = 103,
-    DXGI_FORMAT_P010 = 104,
-    DXGI_FORMAT_P016 = 105,
-    DXGI_FORMAT_420_OPAQUE = 106,
-    DXGI_FORMAT_YUY2 = 107,
-    DXGI_FORMAT_Y210 = 108,
-    DXGI_FORMAT_Y216 = 109,
-    DXGI_FORMAT_NV11 = 110,
-    DXGI_FORMAT_AI44 = 111,
-    DXGI_FORMAT_IA44 = 112,
-    DXGI_FORMAT_P8 = 113,
-    DXGI_FORMAT_A8P8 = 114,
-    DXGI_FORMAT_B4G4R4A4_UNORM = 115,
-    DXGI_FORMAT_P208 = 130,
-    DXGI_FORMAT_V208 = 131,
-    DXGI_FORMAT_V408 = 132,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,240 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgi.h
-STRUCT!{struct DXGI_FRAME_STATISTICS {
-    PresentCount: ::UINT,
-    PresentRefreshCount: ::UINT,
-    SyncRefreshCount: ::UINT,
-    SyncQPCTime: ::LARGE_INTEGER,
-    SyncGPUTime: ::LARGE_INTEGER,
-}}
-STRUCT!{struct DXGI_MAPPED_RECT {
-    Pitch: ::INT,
-    pBits: *mut ::BYTE,
-}}
-STRUCT!{nodebug struct DXGI_ADAPTER_DESC {
-    Description: [::WCHAR; 128],
-    VectorId: ::UINT,
-    DeviceId: ::UINT,
-    SubSysId: ::UINT,
-    Revision: ::UINT,
-    DedicatedVideoMemory: ::SIZE_T,
-    DedicatedSystemMemory: ::SIZE_T,
-    SharedSystemMemory: ::SIZE_T,
-    AdapterLuid: ::LUID,
-}}
-STRUCT!{nodebug struct DXGI_OUTPUT_DESC {
-    DeviceName: [::WCHAR; 32],
-    DesktopCoordinates: ::RECT,
-    AttachedToDesktop: ::BOOL,
-    Rotation: ::DXGI_MODE_ROTATION,
-    Monitor: ::HMONITOR,
-}}
-STRUCT!{struct DXGI_SHARED_RESOURCE {
-    Handle: ::HANDLE,
-}}
-pub const DXGI_RESOURCE_PRIORITY_MINIMUM: ::DWORD = 0x28000000;
-pub const DXGI_RESOURCE_PRIORITY_LOW: ::DWORD = 0x50000000;
-pub const DXGI_RESOURCE_PRIORITY_NORMAL: ::DWORD = 0x78000000;
-pub const DXGI_RESOURCE_PRIORITY_HIGH: ::DWORD = 0xa0000000;
-pub const DXGI_RESOURCE_PRIORITY_MAXIMUM: ::DWORD = 0xc8000000;
-ENUM!{enum DXGI_RESIDENCY {
-    DXGI_RESIDENCY_FULLY_RESIDENT = 1,
-    DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY = 2,
-    DXGI_RESIDENCY_EVICTED_TO_DISK = 3,
-}}
-STRUCT!{struct DXGI_SURFACE_DESC {
-    Width: ::UINT,
-    Height: ::UINT,
-    Format: ::DXGI_FORMAT,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-}}
-ENUM!{enum DXGI_SWAP_EFFECT {
-    DXGI_SWAP_EFFECT_DISCARD = 0,
-    DXGI_SWAP_EFFECT_SEQUENTIAL = 1,
-    DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL = 3,
-}}
-FLAGS!{enum DXGI_SWAP_CHAIN_FLAG {
-    DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1,
-    DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2,
-    DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4,
-    DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT = 8,
-    DXGI_SWAP_CHAIN_FLAG_RESTRICT_SHARED_RESOURCE_DRIVER = 16,
-    DXGI_SWAP_CHAIN_FLAG_DISPLAY_ONLY = 32,
-    DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT = 64,
-    DXGI_SWAP_CHAIN_FLAG_FOREGROUND_LAYER = 128,
-    DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO = 256,
-    DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO = 512,
-}}
-STRUCT!{struct DXGI_SWAP_CHAIN_DESC {
-    BufferDesc: ::DXGI_MODE_DESC,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-    BufferUsage: ::DXGI_USAGE,
-    BufferCount: ::UINT,
-    OutputWindow: ::HWND,
-    Windowed: ::BOOL,
-    SwapEffect: DXGI_SWAP_EFFECT,
-    Flags: ::UINT,
-}}
-RIDL!(
-interface IDXGIObject(IDXGIObjectVtbl): IUnknown(IUnknownVtbl) {
-    fn SetPrivateData(
-        &mut self, Name: ::REFGUID, DataSize: ::UINT, pData: *const ::c_void
-    ) -> ::HRESULT,
-    fn SetPrivateDataInterface(&mut self, Name: ::REFGUID, pUnknown: *const ::IUnknown) -> ::HRESULT,
-    fn GetPrivateData(
-        &mut self, Name: ::REFGUID, pDataSize: *mut ::UINT, pData: *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetParent(
-        &mut self, riid: ::REFIID, ppParent: *mut *mut ::c_void
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn GetDevice(&mut self, riid: ::REFIID, ppDevice: *mut *mut ::c_void) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIResource(IDXGIResourceVtbl): IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl) {
-    fn GetSharedHandle(&mut self, pSharedHandle: *mut ::HANDLE) -> ::HRESULT,
-    fn GetUsage(&mut self, pUsage: *mut ::DXGI_USAGE) -> ::HRESULT,
-    fn SetEvictionPriority(&mut self, EvictionPriority: ::UINT) -> ::HRESULT,
-    fn GetEvictionPriority(&mut self, pEvictionPriority: *mut ::UINT) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIKeyedMutex(IDXGIKeyedMutexVtbl): IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl) {
-    fn AcquireSync(&mut self, Key: ::UINT64, dwMilliseconds: ::DWORD) -> ::HRESULT,
-    fn ReleaseSync(&mut self, Key: ::UINT64) -> ::HRESULT
-});
-RIDL!(
-interface IDXGISurface(IDXGISurfaceVtbl): IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut DXGI_SURFACE_DESC) -> ::HRESULT,
-    fn Map(&mut self, pLockedRect: *mut DXGI_MAPPED_RECT, MapFlags: ::UINT) -> ::HRESULT,
-    fn Unmap(&mut self) -> ::HRESULT
-});
-RIDL!(
-interface IDXGISurface1(IDXGISurface1Vtbl): IDXGISurface(IDXGISurfaceVtbl) {
-    fn GetDC(&mut self, Discard: ::BOOL, phdc: *mut ::HDC) -> ::HRESULT,
-    fn ReleaseDC(&mut self, pDirtyRect: *mut ::RECT) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIAdapter(IDXGIAdapterVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn EnumOutputs(&mut self, Output: ::UINT, ppOutput: *mut *mut IDXGIOutput) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut DXGI_ADAPTER_DESC) -> ::HRESULT,
-    fn CheckInterfaceSupport(
-        &mut self, InterfaceName: ::REFGUID, pUMDVersion: *mut ::LARGE_INTEGER
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIOutput(IDXGIOutputVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut DXGI_OUTPUT_DESC) -> ::HRESULT,
-    fn GetDisplayModeList(
-        &mut self, EnumFormat: ::DXGI_FORMAT, Flags: ::UINT, pNumModes: *mut ::UINT,
-        pDesc: *mut ::DXGI_MODE_DESC
-    ) -> ::HRESULT,
-    fn FindClosestMatchingMode(
-        &mut self, pModeToMatch: *const ::DXGI_MODE_DESC, pClosestMatch: *mut ::DXGI_MODE_DESC,
-        pConcernedDevice: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn WaitForVBlank(&mut self) -> ::HRESULT,
-    fn TakeOwnership(&mut self, pDevice: *mut ::IUnknown, Exclusive: ::BOOL) -> ::HRESULT,
-    fn ReleaseOwnership(&mut self) -> (),
-    fn GetGammaControlCapabilities(
-        &mut self, pGammaCaps: *mut ::DXGI_GAMMA_CONTROL_CAPABILITIES
-    ) -> ::HRESULT,
-    fn SetGammaControl(&mut self, pArray: *const ::DXGI_GAMMA_CONTROL) -> ::HRESULT,
-    fn GetGammaControl(&mut self, pArray: *mut ::DXGI_GAMMA_CONTROL) -> ::HRESULT,
-    fn SetDisplaySurface(&mut self, pScanoutSurface: *mut IDXGISurface) -> ::HRESULT,
-    fn GetDisplaySurfaceData(&mut self, pDestination: *mut IDXGISurface) -> ::HRESULT,
-    fn GetFrameStatistics(&mut self, pStats: *mut DXGI_FRAME_STATISTICS) -> ::HRESULT
-});
-pub const DXGI_MAX_SWAP_CHAIN_BUFFERS: ::DWORD = 16;
-pub const DXGI_PRESENT_TEST: ::DWORD = 0x00000001;
-pub const DXGI_PRESENT_DO_NOT_SEQUENCE: ::DWORD = 0x00000002;
-pub const DXGI_PRESENT_RESTART: ::DWORD = 0x00000004;
-pub const DXGI_PRESENT_DO_NOT_WAIT: ::DWORD = 0x00000008;
-pub const DXGI_PRESENT_STEREO_PREFER_RIGHT: ::DWORD = 0x00000010;
-pub const DXGI_PRESENT_STEREO_TEMPORARY_MONO: ::DWORD = 0x00000020;
-pub const DXGI_PRESENT_RESTRICT_TO_OUTPUT: ::DWORD = 0x00000040;
-pub const DXGI_PRESENT_USE_DURATION: ::DWORD = 0x00000100;
-RIDL!(
-interface IDXGISwapChain(IDXGISwapChainVtbl): IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl) {
-    fn Present(&mut self, SyncInterval: ::UINT, Flags: ::UINT) -> ::HRESULT,
-    fn GetBuffer(
-        &mut self, Buffer: ::UINT, riid: ::REFIID, ppSurface: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn SetFullscreenState(&mut self, Fullscreen: ::BOOL, pTarget: *mut IDXGIOutput) -> ::HRESULT,
-    fn GetFullscreenState(
-        &mut self, pFullscreen: *mut ::BOOL, ppTarget: *mut *mut IDXGIOutput
-    ) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut DXGI_SWAP_CHAIN_DESC) -> ::HRESULT,
-    fn ResizeBuffers(
-        &mut self, BufferCount: ::UINT, Width: ::UINT, Height: ::UINT, NewFormat: ::DXGI_FORMAT,
-        SwapChainFlags: ::UINT
-    ) -> ::HRESULT,
-    fn ResizeTarget(&mut self, pNewTargetParameters: *const ::DXGI_MODE_DESC) -> ::HRESULT,
-    fn GetContainingOutput(&mut self, ppOutput: *mut *mut IDXGIOutput) -> ::HRESULT,
-    fn GetFrameStatistics(&mut self, pStats: *mut DXGI_FRAME_STATISTICS) -> ::HRESULT,
-    fn GetLastPresentCount(&mut self, pLastPresentCount: *mut ::UINT) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIFactory(IDXGIFactoryVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn EnumAdapters(&mut self, Adapter: ::UINT, ppAdapter: *mut *mut IDXGIAdapter) -> ::HRESULT,
-    fn MakeWindowAssociation(&mut self, WindowHandle: ::HWND, Flags: ::UINT) -> ::HRESULT,
-    fn GetWindowAssociation(&mut self, pWindowHandle: *mut ::HWND) -> ::HRESULT,
-    fn CreateSwapChain(
-        &mut self, pDevice: *mut ::IUnknown, pDesc: *mut DXGI_SWAP_CHAIN_DESC,
-        ppSwapChain: *mut *mut IDXGISwapChain
-    ) -> ::HRESULT,
-    fn CreateSoftwareAdapter(
-        &mut self, Module: ::HMODULE, ppAdapter: *mut *mut IDXGIAdapter
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIDevice(IDXGIDeviceVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn GetAdapter(&mut self, pAdapter: *mut *mut IDXGIAdapter) -> ::HRESULT,
-    fn CreateSurface(
-        &mut self, pDesc: *const DXGI_SURFACE_DESC, NumSurfaces: ::UINT, Usage: ::DXGI_USAGE,
-        pSharedResource: *const DXGI_SHARED_RESOURCE, ppSurface: *mut *mut IDXGISurface
-    ) -> ::HRESULT,
-    fn QueryResourceResidency(
-        &mut self, ppResources: *const *mut ::IUnknown, pResidencyStatus: *mut DXGI_RESIDENCY,
-        NumResources: ::UINT
-    ) -> ::HRESULT,
-    fn SetGPUThreadPriority(&mut self, Priority: ::INT) -> ::HRESULT,
-    fn GetGPUThreadPriority(&mut self, pPriority: *mut ::INT) -> ::HRESULT
-});
-ENUM!{enum DXGI_ADAPTER_FLAG {
-    DXGI_ADAPTER_FLAG_NONE,
-    DXGI_ADAPTER_FLAG_REMOTE,
-    DXGI_ADAPTER_FLAG_SOFTWARE,
-}}
-STRUCT!{nodebug struct DXGI_ADAPTER_DESC1 {
-    Description: [::WCHAR; 128],
-    VendorId: ::UINT,
-    DeviceId: ::UINT,
-    SubSysId: ::UINT,
-    Revision: ::UINT,
-    DedicatedVideoMemory: ::SIZE_T,
-    DedicatedSystemMemory: ::SIZE_T,
-    SharedSystemMemory: ::SIZE_T,
-    AdapterLuid: ::LUID,
-    Flags: ::UINT,
-}}
-STRUCT!{struct DXGI_DISPLAY_COLOR_SPACE {
-    PrimaryCoordinates: [[::FLOAT; 2]; 8],
-    WhitePoints: [[::FLOAT; 2]; 16],
-}}
-RIDL!(
-interface IDXGIFactory1(IDXGIFactory1Vtbl): IDXGIFactory(IDXGIFactoryVtbl) {
-    fn EnumAdapters1(&mut self, Adapter: ::UINT, ppAdapter: *mut *mut IDXGIAdapter1) -> ::HRESULT,
-    fn IsCurrent(&mut self) -> ::BOOL
-});
-RIDL!(
-interface IDXGIAdapter1(IDXGIAdapter1Vtbl): IDXGIAdapter(IDXGIAdapterVtbl) {
-    fn GetDesc1(&mut self, pDesc: *mut DXGI_ADAPTER_DESC1) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIDevice1(IDXGIDevice1Vtbl): IDXGIDevice(IDXGIDeviceVtbl) {
-    fn SetMaximumFrameLatency(&mut self, MaxLatency: ::UINT) -> ::HRESULT,
-    fn GetMaximumFrameLatency(&mut self, pMaxLatency: *mut ::UINT) -> ::HRESULT
-});
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgitype.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgitype.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgitype.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/dxgitype.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgitype.h
-pub const DXGI_CPU_ACCESS_NONE: ::DWORD = 0;
-pub const DXGI_CPU_ACCESS_DYNAMIC: ::DWORD = 1;
-pub const DXGI_CPU_ACCESS_READ_WRITE: ::DWORD = 2;
-pub const DXGI_CPU_ACCESS_SCRATCH: ::DWORD = 3;
-pub const DXGI_CPU_ACCESS_FIELD: ::DWORD = 15;
-FLAGS!{enum DXGI_USAGE {
-    DXGI_USAGE_SHADER_INPUT = 1 << (0 + 4),
-    DXGI_USAGE_RENDER_TARGET_OUTPUT = 1 << (1 + 4),
-    DXGI_USAGE_BACK_BUFFER = 1 << (2 + 4),
-    DXGI_USAGE_SHARED = 1 << (3 + 4),
-    DXGI_USAGE_READ_ONLY = 1 << (4 + 4),
-    DXGI_USAGE_DISCARD_ON_PRESENT = 1 << (5 + 4),
-    DXGI_USAGE_UNORDERED_ACCESS = 1 << (6 + 4),
-}}
-STRUCT!{struct DXGI_RGB {
-    Red: f32,
-    Green: f32,
-    Blue: f32,
-}}
-pub type DXGI_RGBA = ::D3DCOLORVALUE;
-STRUCT!{nodebug struct DXGI_GAMMA_CONTROL {
-    Scale: DXGI_RGB,
-    Offset: DXGI_RGB,
-    GammaCurve: [DXGI_RGB; 1025],
-}}
-STRUCT!{nodebug struct DXGI_GAMMA_CONTROL_CAPABILITIES {
-    ScaleAndOffsetSupported: ::BOOL,
-    MaxConvertedValue: f32,
-    MinConvertedValue: f32,
-    NumGammaControlPoints: ::UINT,
-    ControlPointPositions: [f32; 1025],
-}}
-STRUCT!{struct DXGI_RATIONAL {
-    Numerator: ::UINT,
-    Denominator: ::UINT,
-}}
-ENUM!{enum DXGI_MODE_SCANLINE_ORDER {
-    DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED,
-    DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE,
-    DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST,
-    DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST,
-}}
-ENUM!{enum DXGI_MODE_SCALING {
-    DXGI_MODE_SCALING_UNSPECIFIED,
-    DXGI_MODE_SCALING_CENTERED,
-    DXGI_MODE_SCALING_STRETCHED,
-}}
-ENUM!{enum DXGI_MODE_ROTATION {
-    DXGI_MODE_ROTATION_UNSPECIFIED,
-    DXGI_MODE_ROTATION_IDENTITY,
-    DXGI_MODE_ROTATION_ROTATE90,
-    DXGI_MODE_ROTATION_ROTATE180,
-    DXGI_MODE_ROTATION_ROTATE270,
-}}
-STRUCT!{struct DXGI_MODE_DESC {
-    Width: ::UINT,
-    Height: ::UINT,
-    RefreshRate: DXGI_RATIONAL,
-    Format: ::DXGI_FORMAT,
-    ScanlineOrdering: DXGI_MODE_SCANLINE_ORDER,
-    Scaling: DXGI_MODE_SCALING,
-}}
-STRUCT!{struct DXGI_SAMPLE_DESC {
-    Count: ::UINT,
-    Quality: ::UINT,
-}}
-ENUM!{enum DXGI_COLOR_SPACE_TYPE {
-    DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709 = 0x0,
-    DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709 = 0x1,
-    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 = 0x2,
-    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020 = 0x3,
-    DXGI_COLOR_SPACE_RESERVED = 0x4,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601 = 0x5,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601 = 0x6,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601 = 0x7,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709 = 0x8,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709 = 0x9,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020 = 0xA,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020 = 0xB,
-    DXGI_COLOR_SPACE_CUSTOM = 0xFFFFFFFF,
-}}
-pub const DXGI_CENTER_MULTISAMPLE_QUALITY_PATTERN: ::UINT = 0xfffffffe;
-pub const DXGI_STANDARD_MULTISAMPLE_QUALITY_PATTERN: ::UINT = 0xffffffff;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/errhandlingapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/errhandlingapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/errhandlingapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/errhandlingapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-errorhandling-l1
-pub type PTOP_LEVEL_EXCEPTION_FILTER = Option<unsafe extern "system" fn(
-    ExceptionInfo: *mut ::EXCEPTION_POINTERS,
-) -> ::LONG>;
-pub type LPTOP_LEVEL_EXCEPTION_FILTER = PTOP_LEVEL_EXCEPTION_FILTER;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/excpt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/excpt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/excpt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/excpt.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-ENUM!{enum EXCEPTION_DISPOSITION {
-    ExceptionContinueExecution = 0,
-    ExceptionContinueSearch = 1,
-    ExceptionNestedException = 2,
-    ExceptionCollidedUnwind = 3,
-}}
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct _EXCEPTION_RECORD;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct _CONTEXT;
-#[cfg(target_arch = "x86_64")] #[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct _DISPATCHER_CONTEXT;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/fileapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/fileapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/fileapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/fileapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-file-l1
-pub const CREATE_NEW: ::DWORD = 1;
-pub const CREATE_ALWAYS: ::DWORD = 2;
-pub const OPEN_EXISTING: ::DWORD = 3;
-pub const OPEN_ALWAYS: ::DWORD = 4;
-pub const TRUNCATE_EXISTING: ::DWORD = 5;
-pub const INVALID_FILE_SIZE: ::DWORD = 0xFFFFFFFF;
-pub const INVALID_SET_FILE_POINTER: ::DWORD = 0xFFFFFFFF;
-pub const INVALID_FILE_ATTRIBUTES: ::DWORD = 0xFFFFFFFF;
-STRUCT!{struct WIN32_FILE_ATTRIBUTE_DATA {
-    dwFileAttributes: ::DWORD,
-    ftCreationTime: ::FILETIME,
-    ftLastAccessTime: ::FILETIME,
-    ftLastWriteTime: ::FILETIME,
-    nFileSizeHigh: ::DWORD,
-    nFileSizeLow: ::DWORD,
-}}
-pub type LPWIN32_FILE_ATTRIBUTE_DATA = *mut WIN32_FILE_ATTRIBUTE_DATA;
-STRUCT!{struct BY_HANDLE_FILE_INFORMATION {
-    dwFileAttributes: ::DWORD,
-    ftCreationTime: ::FILETIME,
-    ftLastAccessTime: ::FILETIME,
-    ftLastWriteTime: ::FILETIME,
-    dwVolumeSerialNumber: ::DWORD,
-    nFileSizeHigh: ::DWORD,
-    nFileSizeLow: ::DWORD,
-    nNumberOfLinks: ::DWORD,
-    nFileIndexHigh: ::DWORD,
-    nFileIndexLow: ::DWORD,
-}}
-pub type PBY_HANDLE_FILE_INFORMATION = *mut BY_HANDLE_FILE_INFORMATION;
-pub type LPBY_HANDLE_FILE_INFORMATION = *mut BY_HANDLE_FILE_INFORMATION;
-STRUCT!{struct CREATEFILE2_EXTENDED_PARAMETERS {
-    dwSize: ::DWORD,
-    dwFileAttributes: ::DWORD,
-    dwFileFlags: ::DWORD,
-    dwSecurityQosFlags: ::DWORD,
-    lpSecurityAttributes: ::LPSECURITY_ATTRIBUTES,
-    hTemplateFile: ::HANDLE,
-}}
-pub type PCREATEFILE2_EXTENDED_PARAMETERS = *mut CREATEFILE2_EXTENDED_PARAMETERS;
-pub type LPCREATEFILE2_EXTENDED_PARAMETERS = *mut CREATEFILE2_EXTENDED_PARAMETERS;
-ENUM!{enum PRIORITY_HINT {
-    IoPriorityHintVeryLow = 0,
-    IoPriorityHintLow = 1,
-    IoPriorityHintNormal = 2,
-    MaximumIoPriorityHintType = 3,
-}}
-STRUCT!{struct FILE_BASIC_INFO {
-    CreationTime: ::LARGE_INTEGER,
-    LastAccessTime: ::LARGE_INTEGER,
-    LastWriteTime: ::LARGE_INTEGER,
-    ChangeTime: ::LARGE_INTEGER,
-    FileAttributes: ::DWORD,
-}}
-STRUCT!{struct FILE_STANDARD_INFO {
-    AllocationSize: ::LARGE_INTEGER,
-    EndOfFile: ::LARGE_INTEGER,
-    NumberOfLinks: ::DWORD,
-    DeletePending: ::BOOLEAN,
-    Directory: ::BOOLEAN,
-}}
-STRUCT!{struct FILE_NAME_INFO {
-    FileNameLength: ::DWORD,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_RENAME_INFO {
-    ReplaceIfExists: ::BOOL,
-    RootDirectory: ::HANDLE,
-    FileNameLength: ::DWORD,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_DISPOSITION_INFO {
-    DeleteFile: ::BOOL,
-}}
-STRUCT!{struct FILE_ALLOCATION_INFO {
-    AllocationSize: ::LARGE_INTEGER,
-}}
-STRUCT!{struct FILE_END_OF_FILE_INFO {
-    EndOfFile: ::LARGE_INTEGER,
-}}
-STRUCT!{struct FILE_STREAM_INFO {
-    NextEntryOffset: ::DWORD,
-    StreamNameLength: ::DWORD,
-    StreamSize: ::DWORD,
-    StreamAllocationSize: ::DWORD,
-    StreamName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_COMPRESSION_INFO {
-    CompressedFileSize: ::LARGE_INTEGER,
-    CompressionFormat: ::WORD,
-    CompressionUnitShift: ::UCHAR,
-    ChunkShift: ::UCHAR,
-    ClusterShift: ::UCHAR,
-    Reserved: [::UCHAR; 3],
-}}
-STRUCT!{struct FILE_ATTRIBUTE_TAG_INFO {
-    NextEntryOffset: ::DWORD,
-    ReparseTag: ::DWORD,
-}}
-STRUCT!{struct FILE_ID_BOTH_DIR_INFO {
-    NextEntryOffset: ::DWORD,
-    FileIndex: ::DWORD,
-    CreationTime: ::LARGE_INTEGER,
-    LastAccessTime: ::LARGE_INTEGER,
-    LastWriteTime: ::LARGE_INTEGER,
-    ChangeTime: ::LARGE_INTEGER,
-    EndOfFile: ::LARGE_INTEGER,
-    AllocationSize: ::LARGE_INTEGER,
-    FileAttributes: ::DWORD,
-    FileNameLength: ::DWORD,
-    EaSize: ::DWORD,
-    ShortNameLength: ::CCHAR,
-    ShortName: [::WCHAR; 12],
-    FileId: ::LARGE_INTEGER,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_IO_PRIORITY_HINT_INFO {
-    PriorityHint: ::PRIORITY_HINT,
-}}
-STRUCT!{struct FILE_FULL_DIR_INFO {
-    NextEntryOffset: ::ULONG,
-    FileIndex: ::ULONG,
-    CreationTime: ::LARGE_INTEGER,
-    LastAccessTime: ::LARGE_INTEGER,
-    LastWriteTime: ::LARGE_INTEGER,
-    ChangeTime: ::LARGE_INTEGER,
-    EndOfFile: ::LARGE_INTEGER,
-    AllocationSize: ::LARGE_INTEGER,
-    FileAttributes: ::ULONG,
-    FileNameLength: ::ULONG,
-    EaSize: ::ULONG,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_STORAGE_INFO {
-    LogicalBytesPerSector: ::ULONG,
-    PhysicalBytesPerSectorForAtomicity: ::ULONG,
-    PhysicalBytesPerSectorForPerformance: ::ULONG,
-    FileSystemEffectivePhysicalBytesPerSectorForAtomicity: ::ULONG,
-    Flags: ::ULONG,
-    ByteOffsetForSectorAlignment: ::ULONG,
-    ByteOffsetForPartitionAlignment: ::ULONG,
-}}
-STRUCT!{struct FILE_ALIGNMENT_INFO {
-    AlignmentRequirement: ::ULONG,
-}}
-STRUCT!{struct FILE_ID_INFO {
-    VolumeSerialNumber: ::ULONGLONG,
-    FileId: ::FILE_ID_128,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/gl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/gl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/gl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/gl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//48
-pub type GLenum = ::c_uint;
-pub type GLboolean = ::c_uchar;
-pub type GLbitfield = ::c_uint;
-pub type GLbyte = ::c_schar;
-pub type GLshort = ::c_short;
-pub type GLint = ::c_int;
-pub type GLsizei = ::c_int;
-pub type GLubyte = ::c_uchar;
-pub type GLushort = ::c_ushort;
-pub type GLuint = ::c_uint;
-pub type GLfloat = ::c_float;
-pub type GLclampf = ::c_float;
-pub type GLdouble = ::c_double;
-pub type GLclampd = ::c_double;
-pub type GLvoid = ::c_void;
-//63
-//68
-//AccumOp
-pub const GL_ACCUM: GLenum = 0x0100;
-pub const GL_LOAD: GLenum = 0x0101;
-pub const GL_RETURN: GLenum = 0x0102;
-pub const GL_MULT: GLenum = 0x0103;
-pub const GL_ADD: GLenum = 0x0104;
-//AlphaFunction
-pub const GL_NEVER: GLenum = 0x0200;
-pub const GL_LESS: GLenum = 0x0201;
-pub const GL_EQUAL: GLenum = 0x0202;
-pub const GL_LEQUAL: GLenum = 0x0203;
-pub const GL_GREATER: GLenum = 0x0204;
-pub const GL_NOTEQUAL: GLenum = 0x0205;
-pub const GL_GEQUAL: GLenum = 0x0206;
-pub const GL_ALWAYS: GLenum = 0x0207;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/guiddef.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/guiddef.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/guiddef.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/guiddef.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct GUID {
-    Data1: ::c_ulong,
-    Data2: ::c_ushort,
-    Data3: ::c_ushort,
-    Data4: [::c_uchar; 8],
-}}
-pub type LPGUID = *mut GUID;
-pub type LPCGUID = *const GUID;
-pub type IID = GUID;
-pub type LPIID = *mut IID;
-pub type CLSID = GUID;
-pub type LPCLSID = *mut CLSID;
-pub type FMTID = GUID;
-pub type LPFMTID = *mut FMTID;
-pub type REFGUID = *const GUID;
-pub type REFIID = *const IID;
-pub type REFCLSID = *const IID;
-pub type REFFMTID = *const IID;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/heapapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/heapapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/heapapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/heapapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-heap-l1
-STRUCT!{struct HEAP_SUMMARY {
-    cb: ::DWORD,
-    cbAllocated: ::SIZE_T,
-    cbCommitted: ::SIZE_T,
-    cbReserved: ::SIZE_T,
-    cbMaxReserve: ::SIZE_T,
-}}
-pub type PHEAP_SUMMARY = *mut HEAP_SUMMARY;
-pub type LPHEAP_SUMMARY = PHEAP_SUMMARY;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hidclass.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hidclass.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hidclass.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hidclass.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-// Copyright © 2015, Peter Atashian and Alex Daniel Jones
-// Licensed under the MIT License <LICENSE.md>
-DEFINE_GUID!{GUID_DEVINTERFACE_HID, 0x4D1E55B2, 0xF16F, 0x11CF,
-    0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30}
-pub const GUID_CLASS_INPUT: ::GUID = GUID_DEVINTERFACE_HID;
-DEFINE_GUID!{GUID_HID_INTERFACE_NOTIFY, 0x2c4e2e88, 0x25e6, 0x4c33, 0x88, 0x2f, 0x3d, 0x82, 0xe6, 0x07, 0x36, 0x81}
-DEFINE_GUID!{GUID_HID_INTERFACE_HIDPARSE, 0xf5c315a5, 0x69ac, 0x4bc2, 0x92, 0x79, 0xd0, 0xb6, 0x45, 0x76, 0xf4, 0x4b}
-// FIXME devpropkey stuff
-pub const HID_REVISION: ::DWORD = 0x00000001;
-pub const IOCTL_HID_GET_DRIVER_CONFIG: ::DWORD = HID_BUFFER_CTL_CODE!(100);
-pub const IOCTL_HID_SET_DRIVER_CONFIG: ::DWORD = HID_BUFFER_CTL_CODE!(101);
-pub const IOCTL_HID_GET_POLL_FREQUENCY_MSEC: ::DWORD = HID_BUFFER_CTL_CODE!(102);
-pub const IOCTL_HID_SET_POLL_FREQUENCY_MSEC: ::DWORD = HID_BUFFER_CTL_CODE!(103);
-pub const IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS: ::DWORD = HID_BUFFER_CTL_CODE!(104);
-pub const IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: ::DWORD = HID_BUFFER_CTL_CODE!(105);
-pub const IOCTL_HID_GET_COLLECTION_INFORMATION: ::DWORD = HID_BUFFER_CTL_CODE!(106);
-pub const IOCTL_HID_ENABLE_WAKE_ON_SX: ::DWORD = HID_BUFFER_CTL_CODE!(107);
-pub const IOCTL_HID_SET_S0_IDLE_TIMEOUT: ::DWORD = HID_BUFFER_CTL_CODE!(108);
-pub const IOCTL_HID_GET_COLLECTION_DESCRIPTOR: ::DWORD = HID_CTL_CODE!(100);
-pub const IOCTL_HID_FLUSH_QUEUE: ::DWORD = HID_CTL_CODE!(101);
-pub const IOCTL_HID_SET_FEATURE: ::DWORD = HID_IN_CTL_CODE!(100);
-pub const IOCTL_HID_SET_OUTPUT_REPORT: ::DWORD = HID_IN_CTL_CODE!(101);
-pub const IOCTL_HID_GET_FEATURE: ::DWORD = HID_OUT_CTL_CODE!(100);
-pub const IOCTL_GET_PHYSICAL_DESCRIPTOR: ::DWORD = HID_OUT_CTL_CODE!(102);
-pub const IOCTL_HID_GET_HARDWARE_ID: ::DWORD = HID_OUT_CTL_CODE!(103);
-pub const IOCTL_HID_GET_INPUT_REPORT: ::DWORD = HID_OUT_CTL_CODE!(104);
-pub const IOCTL_HID_GET_OUTPUT_REPORT: ::DWORD = HID_OUT_CTL_CODE!(105);
-pub const IOCTL_HID_GET_MANUFACTURER_STRING: ::DWORD = HID_OUT_CTL_CODE!(110);
-pub const IOCTL_HID_GET_PRODUCT_STRING: ::DWORD = HID_OUT_CTL_CODE!(111);
-pub const IOCTL_HID_GET_SERIALNUMBER_STRING: ::DWORD = HID_OUT_CTL_CODE!(112);
-pub const IOCTL_HID_GET_INDEXED_STRING: ::DWORD = HID_OUT_CTL_CODE!(120);
-pub const IOCTL_HID_GET_MS_GENRE_DESCRIPTOR: ::DWORD = HID_OUT_CTL_CODE!(121);
-pub const IOCTL_HID_ENABLE_SECURE_READ: ::DWORD = HID_CTL_CODE!(130);
-pub const IOCTL_HID_DISABLE_SECURE_READ: ::DWORD = HID_CTL_CODE!(131);
-pub const IOCTL_HID_DEVICERESET_NOTIFICATION: ::DWORD = HID_CTL_CODE!(140);
-STRUCT!{struct HID_XFER_PACKET {
-    reportBuffer: ::PUCHAR,
-    reportBufferLen: ::ULONG,
-    reportId: ::UCHAR,
-}}
-pub type PHID_XFER_PACKET = *mut HID_XFER_PACKET;
-//FIXME Stuff for NT_INCLUDED
-STRUCT!{struct HID_COLLECTION_INFORMATION {
-    DescriptorSize: ::ULONG,
-    Polled: ::BOOLEAN,
-    Reserved1: [::UCHAR; 1],
-    VendorID: ::USHORT,
-    ProductID: ::USHORT,
-    VersionNumber: ::USHORT,
-}}
-pub type PHID_COLLECTION_INFORMATION = *mut HID_COLLECTION_INFORMATION;
-STRUCT!{struct HID_DRIVER_CONFIG {
-    Size: ::ULONG,
-    RingBufferSize: ::ULONG,
-}}
-pub type PHID_DRIVER_CONFIG = *mut HID_DRIVER_CONFIG;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hidpi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hidpi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hidpi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hidpi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +0,0 @@
-// Copyright © 2015, Peter Atashian and Alex Daniel Jones
-// Licensed under the MIT License <LICENSE.md>
-pub const HIDP_LINK_COLLECTION_ROOT: ::USHORT = -1i16 as u16;
-pub const HIDP_LINK_COLLECTION_UNSPECIFIED: ::USHORT = 0;
-ENUM!{enum HIDP_REPORT_TYPE {
-  HidP_Input,
-  HidP_Output,
-  HidP_Feature,
-}}
-STRUCT!{struct USAGE_AND_PAGE {
-    Usage: ::USAGE,
-    UsagePage: ::USAGE,
-}}
-pub type PUSAGE_AND_PAGE = *mut USAGE_AND_PAGE;
-STRUCT!{struct HIDP_BUTTON_CAPS {
-    UsagePage: ::USAGE,
-    ReportID: ::UCHAR,
-    IsAlias: ::BOOLEAN,
-    BitField: ::USHORT,
-    LinkCollection: ::USHORT,
-    LinkUsage: ::USAGE,
-    LinkUsagePage: ::USAGE,
-    IsRange: ::BOOLEAN,
-    IsStringRange: ::BOOLEAN,
-    IsDesignatorRange: ::BOOLEAN,
-    IsAbsolute: ::BOOLEAN,
-    Reserved: [::ULONG; 10],
-    S_un: [u16; 8],
-}}
-UNION!{HIDP_BUTTON_CAPS, S_un, Range, Range_mut, HIDP_RANGE_STRUCT}
-UNION!{HIDP_BUTTON_CAPS, S_un, NotRange, NotRange_mut, HIDP_NOTRANGE_STRUCT}
-pub type PHIDP_BUTTON_CAPS = *mut HIDP_BUTTON_CAPS;
-STRUCT!{struct HIDP_RANGE_STRUCT {
-    UsageMin: ::USAGE,
-    UsageMax: ::USAGE,
-    StringMin: ::USHORT,
-    StringMax: ::USHORT,
-    DesignatorMin: ::USHORT,
-    DesignatorMax: ::USHORT,
-    DataIndexMin: ::USHORT,
-    DataIndexMax: ::USHORT,
-}}
-STRUCT!{struct HIDP_NOTRANGE_STRUCT {
-    Usage: ::USAGE,
-    Reserved1: ::USAGE,
-    StringIndex: ::USHORT,
-    Reserved2: ::USHORT,
-    DesignatorIndex: ::USHORT,
-    Reserved3: ::USHORT,
-    DataIndex: ::USHORT,
-    Reserved4: ::USHORT,
-}}
-STRUCT!{struct HIDP_VALUE_CAPS {
-    UsagePage: ::USAGE,
-    ReportID: ::UCHAR,
-    IsAlias: ::BOOLEAN,
-    BitField: ::USHORT,
-    LinkCollection: ::USHORT,
-    LinkUsage: ::USAGE,
-    LinkUsagePage: ::USAGE,
-    IsRange: ::BOOLEAN,
-    IsStringRange: ::BOOLEAN,
-    IsDesignatorRange: ::BOOLEAN,
-    IsAbsolute: ::BOOLEAN,
-    HasNull: ::BOOLEAN,
-    Reserved: ::UCHAR,
-    BitSize: ::USHORT,
-    ReportCount: ::USHORT,
-    Reserved2: [::USHORT; 5],
-    UnitsExp: ::ULONG,
-    Units: ::ULONG,
-    LogicalMin: ::LONG,
-    LogicalMax: ::LONG,
-    PhysicalMin: ::LONG,
-    PhysicalMax: ::LONG,
-    S_un: [u16; 8],
-}}
-UNION!{HIDP_VALUE_CAPS, S_un, Range, Range_mut, HIDP_RANGE_STRUCT}
-UNION!{HIDP_VALUE_CAPS, S_un, NotRange, NotRange_mut, HIDP_NOTRANGE_STRUCT}
-pub type PHIDP_VALUE_CAPS = *mut HIDP_VALUE_CAPS;
-STRUCT!{struct HIDP_LINK_COLLECTION_NODE {
-    LinkUsage: ::USAGE,
-    LinkUsagePage: ::USAGE,
-    Parent: ::USHORT,
-    NumberOfChildren: ::USHORT,
-    NextSibling: ::USHORT,
-    FirstChild: ::USHORT,
-    bit_fields: ::ULONG,
-    UserContext: ::PVOID,
-}}
-BITFIELD!{HIDP_LINK_COLLECTION_NODE bit_fields: ::ULONG [
-    CollectionType set_CollectionType[0..8],
-    IsAlias set_IsAlias[8..9],
-]}
-pub type PHIDP_LINK_COLLECTION_NODE = *mut HIDP_LINK_COLLECTION_NODE;
-pub type PHIDP_REPORT_DESCRIPTOR = ::PUCHAR;
-pub enum HIDP_PREPARSED_DATA{}
-pub type PHIDP_PREPARSED_DATA = *mut HIDP_PREPARSED_DATA;
-STRUCT!{struct HIDP_CAPS {
-    Usage: ::USAGE,
-    UsagePage: ::USAGE,
-    InputReportByteLength: ::USHORT,
-    OutputReportByteLength: ::USHORT,
-    FeatureReportByteLength: ::USHORT,
-    Reserved: [::USHORT; 17],
-    NumberLinkCollectionNodes: ::USHORT,
-    NumberInputButtonCaps: ::USHORT,
-    NumberInputValueCaps: ::USHORT,
-    NumberInputDataIndices: ::USHORT,
-    NumberOutputButtonCaps: ::USHORT,
-    NumberOutputValueCaps: ::USHORT,
-    NumberOutputDataIndices: ::USHORT,
-    NumberFeatureButtonCaps: ::USHORT,
-    NumberFeatureValueCaps: ::USHORT,
-    NumberFeatureDataIndices: ::USHORT,
-}}
-pub type PHIDP_CAPS = *mut HIDP_CAPS;
-STRUCT!{struct HIDP_DATA {
-    DataIndex: ::USHORT,
-    Reserved: ::USHORT,
-    S_un: [u32; 1],
-}}
-UNION!{HIDP_DATA, S_un, RawValue, RawValue_mut, ::ULONG}
-UNION!{HIDP_DATA, S_un, On, On_mut, ::BOOLEAN}
-pub type PHIDP_DATA = *mut HIDP_DATA;
-STRUCT!{struct HIDP_UNKNOWN_TOKEN {
-    Token: ::UCHAR,
-    Reserved: [::UCHAR; 3],
-    BitField: ::ULONG,
-}}
-pub type PHIDP_UNKNOWN_TOKEN = *mut HIDP_UNKNOWN_TOKEN;
-STRUCT!{struct HIDP_EXTENDED_ATTRIBUTES {
-    NumGlobalUnknowns: ::UCHAR,
-    Reserved: [::UCHAR; 3],
-    GlobalUnknowns: PHIDP_UNKNOWN_TOKEN,
-    Data: [::ULONG; 1],
-}}
-pub type PHIDP_EXTENDED_ATTRIBUTES = *mut HIDP_EXTENDED_ATTRIBUTES;
-ENUM!{enum HIDP_KEYBOARD_DIRECTION {
-    HidP_Keyboard_Break,
-    HidP_Keyboard_Make,
-}}
-STRUCT!{struct HIDP_KEYBOARD_MODIFIER_STATE {
-    ul: ::ULONG,
-}}
-BITFIELD!{HIDP_KEYBOARD_MODIFIER_STATE ul: ::ULONG [
-    LeftControl set_LeftControl[0..1],
-    LeftShift set_LeftShift[1..2],
-    LeftAlt set_LeftAlt[2..3],
-    LeftGUI set_LeftGUI[3..4],
-    RightControl set_RightControl[4..5],
-    RightShift set_RightShift[5..6],
-    RightAlt set_RightAlt[6..7],
-    RigthGUI set_RigthGUI[7..8],
-    CapsLock set_CapsLock[8..9],
-    ScollLock set_ScollLock[9..10],
-    NumLock set_NumLock[10..11],
-]}
-pub type PHIDP_KEYBOARD_MODIFIER_STATE = *mut HIDP_KEYBOARD_MODIFIER_STATE;
-pub type PHIDP_INSERT_SCANCODES = Option<unsafe extern "C" fn(
-    Context: ::PVOID, NewScanCodes: ::PCHAR, Length: ::ULONG,
-) -> ::BOOLEAN>;
-pub const HIDP_STATUS_SUCCESS: ::NTSTATUS = HIDP_ERROR_CODES!(0x0, 0);
-pub const HIDP_STATUS_NULL: ::NTSTATUS = HIDP_ERROR_CODES!(0x8, 1);
-pub const HIDP_STATUS_INVALID_PREPARSED_DATA: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 1);
-pub const HIDP_STATUS_INVALID_REPORT_TYPE: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 2);
-pub const HIDP_STATUS_INVALID_REPORT_LENGTH: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 3);
-pub const HIDP_STATUS_USAGE_NOT_FOUND: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 4);
-pub const HIDP_STATUS_VALUE_OUT_OF_RANGE: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 5);
-pub const HIDP_STATUS_BAD_LOG_PHY_VALUES: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 6);
-pub const HIDP_STATUS_BUFFER_TOO_SMALL: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 7);
-pub const HIDP_STATUS_INTERNAL_ERROR: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 8);
-pub const HIDP_STATUS_I8042_TRANS_UNKNOWN: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 9);
-pub const HIDP_STATUS_INCOMPATIBLE_REPORT_ID: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xA);
-pub const HIDP_STATUS_NOT_VALUE_ARRAY: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xB);
-pub const HIDP_STATUS_IS_VALUE_ARRAY: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xC);
-pub const HIDP_STATUS_DATA_INDEX_NOT_FOUND: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xD);
-pub const HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xE);
-pub const HIDP_STATUS_BUTTON_NOT_PRESSED: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xF);
-pub const HIDP_STATUS_REPORT_DOES_NOT_EXIST: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0x10);
-pub const HIDP_STATUS_NOT_IMPLEMENTED: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0x20);
-pub const HIDP_STATUS_I8242_TRANS_UNKNOWN: ::NTSTATUS = HIDP_STATUS_I8042_TRANS_UNKNOWN;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hidsdi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hidsdi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hidsdi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hidsdi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-// Copyright © 2015, Peter Atashian and Alex Daniel Jones
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct HIDD_CONFIGURATION {
-    cookie: ::PVOID,
-    size: ::ULONG,
-    RingBufferSize: ::ULONG,
-}}
-pub type PHIDD_CONFIGURATION = *mut HIDD_CONFIGURATION;
-STRUCT!{struct HIDD_ATTRIBUTES {
-    Size: ::ULONG,
-    VendorID: ::USHORT,
-    ProductID: ::USHORT,
-    VersionNumber: ::USHORT,
-}}
-pub type PHIDD_ATTRIBUTES = *mut HIDD_ATTRIBUTES;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hidusage.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hidusage.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hidusage.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hidusage.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-// Copyright © 2015, Peter Atashian and Alex Daniel Jones
-// Licensed under the MIT License <LICENSE.md>
-pub type USAGE = ::USHORT;
-pub type PUSAGE = *mut USAGE;
-pub const HID_USAGE_PAGE_UNDEFINED: ::USAGE = 0x00;
-pub const HID_USAGE_PAGE_GENERIC: ::USAGE = 0x01;
-pub const HID_USAGE_PAGE_SIMULATION: ::USAGE = 0x02;
-pub const HID_USAGE_PAGE_VR: ::USAGE = 0x03;
-pub const HID_USAGE_PAGE_SPORT: ::USAGE = 0x04;
-pub const HID_USAGE_PAGE_GAME: ::USAGE = 0x05;
-pub const HID_USAGE_PAGE_KEYBOARD: ::USAGE = 0x07;
-pub const HID_USAGE_PAGE_LED: ::USAGE = 0x08;
-pub const HID_USAGE_PAGE_BUTTON: ::USAGE = 0x09;
-pub const HID_USAGE_PAGE_ORDINAL: ::USAGE = 0x0A;
-pub const HID_USAGE_PAGE_TELEPHONY: ::USAGE = 0x0B;
-pub const HID_USAGE_PAGE_CONSUMER: ::USAGE = 0x0C;
-pub const HID_USAGE_PAGE_DIGITIZER: ::USAGE = 0x0D;
-pub const HID_USAGE_PAGE_UNICODE: ::USAGE = 0x10;
-pub const HID_USAGE_PAGE_ALPHANUMERIC: ::USAGE = 0x14;
-pub const HID_USAGE_PAGE_SENSOR: ::USAGE = 0x20;
-pub const HID_USAGE_PAGE_BARCODE_SCANNER: ::USAGE = 0x8C;
-pub const HID_USAGE_PAGE_WEIGHING_DEVICE: ::USAGE = 0x8D;
-pub const HID_USAGE_PAGE_MAGNETIC_STRIPE_READER: ::USAGE = 0x8E;
-pub const HID_USAGE_PAGE_CAMERA_CONTROL: ::USAGE = 0x90;
-pub const HID_USAGE_PAGE_MICROSOFT_BLUETOOTH_HANDSFREE: ::USAGE = 0xFFF3;
-pub const HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN: ::USAGE = 0xFF00;
-pub const HID_USAGE_PAGE_VENDOR_DEFINED_END: ::USAGE = 0xFFFF;
-pub const HID_USAGE_GENERIC_POINTER: ::USAGE = 0x01;
-pub const HID_USAGE_GENERIC_MOUSE: ::USAGE = 0x02;
-pub const HID_USAGE_GENERIC_JOYSTICK: ::USAGE = 0x04;
-pub const HID_USAGE_GENERIC_GAMEPAD: ::USAGE = 0x05;
-pub const HID_USAGE_GENERIC_KEYBOARD: ::USAGE = 0x06;
-pub const HID_USAGE_GENERIC_KEYPAD: ::USAGE = 0x07;
-pub const HID_USAGE_GENERIC_PORTABLE_DEVICE_CONTROL: ::USAGE = 0x0D;
-pub const HID_USAGE_GENERIC_SYSTEM_CTL: ::USAGE = 0x80;
-pub const HID_USAGE_GENERIC_X: ::USAGE = 0x30;
-pub const HID_USAGE_GENERIC_Y: ::USAGE = 0x31;
-pub const HID_USAGE_GENERIC_Z: ::USAGE = 0x32;
-pub const HID_USAGE_GENERIC_RX: ::USAGE = 0x33;
-pub const HID_USAGE_GENERIC_RY: ::USAGE = 0x34;
-pub const HID_USAGE_GENERIC_RZ: ::USAGE = 0x35;
-pub const HID_USAGE_GENERIC_SLIDER: ::USAGE = 0x36;
-pub const HID_USAGE_GENERIC_DIAL: ::USAGE = 0x37;
-pub const HID_USAGE_GENERIC_WHEEL: ::USAGE = 0x38;
-pub const HID_USAGE_GENERIC_HATSWITCH: ::USAGE = 0x39;
-pub const HID_USAGE_GENERIC_COUNTED_BUFFER: ::USAGE = 0x3A;
-pub const HID_USAGE_GENERIC_BYTE_COUNT: ::USAGE = 0x3B;
-pub const HID_USAGE_GENERIC_MOTION_WAKEUP: ::USAGE = 0x3C;
-pub const HID_USAGE_GENERIC_VX: ::USAGE = 0x40;
-pub const HID_USAGE_GENERIC_VY: ::USAGE = 0x41;
-pub const HID_USAGE_GENERIC_VZ: ::USAGE = 0x42;
-pub const HID_USAGE_GENERIC_VBRX: ::USAGE = 0x43;
-pub const HID_USAGE_GENERIC_VBRY: ::USAGE = 0x44;
-pub const HID_USAGE_GENERIC_VBRZ: ::USAGE = 0x45;
-pub const HID_USAGE_GENERIC_VNO: ::USAGE = 0x46;
-pub const HID_USAGE_GENERIC_RESOLUTION_MULTIPLIER: ::USAGE = 0x48;
-pub const HID_USAGE_GENERIC_SYSCTL_POWER: ::USAGE = 0x81;
-pub const HID_USAGE_GENERIC_SYSCTL_SLEEP: ::USAGE = 0x82;
-pub const HID_USAGE_GENERIC_SYSCTL_WAKE: ::USAGE = 0x83;
-pub const HID_USAGE_GENERIC_SYSCTL_CONTEXT_MENU: ::USAGE = 0x84;
-pub const HID_USAGE_GENERIC_SYSCTL_MAIN_MENU: ::USAGE = 0x85;
-pub const HID_USAGE_GENERIC_SYSCTL_APP_MENU: ::USAGE = 0x86;
-pub const HID_USAGE_GENERIC_SYSCTL_HELP_MENU: ::USAGE = 0x87;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_EXIT: ::USAGE = 0x88;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_SELECT: ::USAGE = 0x89;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_RIGHT: ::USAGE = 0x8A;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_LEFT: ::USAGE = 0x8B;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_UP: ::USAGE = 0x8C;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_DOWN: ::USAGE = 0x8D;
-pub const HID_USAGE_GENERIC_SYSTEM_DISPLAY_ROTATION_LOCK_BUTTON: ::USAGE = 0xC9;
-pub const HID_USAGE_GENERIC_SYSTEM_DISPLAY_ROTATION_LOCK_SLIDER_SWITCH: ::USAGE = 0xCA;
-pub const HID_USAGE_GENERIC_CONTROL_ENABLE: ::USAGE = 0xCB;
-pub const HID_USAGE_SIMULATION_RUDDER: ::USAGE = 0xBA;
-pub const HID_USAGE_SIMULATION_THROTTLE: ::USAGE = 0xBB;
-pub const HID_USAGE_KEYBOARD_NOEVENT: ::USAGE = 0x00;
-pub const HID_USAGE_KEYBOARD_ROLLOVER: ::USAGE = 0x01;
-pub const HID_USAGE_KEYBOARD_POSTFAIL: ::USAGE = 0x02;
-pub const HID_USAGE_KEYBOARD_UNDEFINED: ::USAGE = 0x03;
-pub const HID_USAGE_KEYBOARD_aA: ::USAGE = 0x04;
-pub const HID_USAGE_KEYBOARD_zZ: ::USAGE = 0x1D;
-pub const HID_USAGE_KEYBOARD_ONE: ::USAGE = 0x1E;
-pub const HID_USAGE_KEYBOARD_ZERO: ::USAGE = 0x27;
-pub const HID_USAGE_KEYBOARD_LCTRL: ::USAGE = 0xE0;
-pub const HID_USAGE_KEYBOARD_LSHFT: ::USAGE = 0xE1;
-pub const HID_USAGE_KEYBOARD_LALT: ::USAGE = 0xE2;
-pub const HID_USAGE_KEYBOARD_LGUI: ::USAGE = 0xE3;
-pub const HID_USAGE_KEYBOARD_RCTRL: ::USAGE = 0xE4;
-pub const HID_USAGE_KEYBOARD_RSHFT: ::USAGE = 0xE5;
-pub const HID_USAGE_KEYBOARD_RALT: ::USAGE = 0xE6;
-pub const HID_USAGE_KEYBOARD_RGUI: ::USAGE = 0xE7;
-pub const HID_USAGE_KEYBOARD_SCROLL_LOCK: ::USAGE = 0x47;
-pub const HID_USAGE_KEYBOARD_NUM_LOCK: ::USAGE = 0x53;
-pub const HID_USAGE_KEYBOARD_CAPS_LOCK: ::USAGE = 0x39;
-pub const HID_USAGE_KEYBOARD_F1: ::USAGE = 0x3A;
-pub const HID_USAGE_KEYBOARD_F2: ::USAGE = 0x3B;
-pub const HID_USAGE_KEYBOARD_F3: ::USAGE = 0x3C;
-pub const HID_USAGE_KEYBOARD_F4: ::USAGE = 0x3D;
-pub const HID_USAGE_KEYBOARD_F5: ::USAGE = 0x3E;
-pub const HID_USAGE_KEYBOARD_F6: ::USAGE = 0x3F;
-pub const HID_USAGE_KEYBOARD_F7: ::USAGE = 0x40;
-pub const HID_USAGE_KEYBOARD_F8: ::USAGE = 0x41;
-pub const HID_USAGE_KEYBOARD_F9: ::USAGE = 0x42;
-pub const HID_USAGE_KEYBOARD_F10: ::USAGE = 0x43;
-pub const HID_USAGE_KEYBOARD_F11: ::USAGE = 0x44;
-pub const HID_USAGE_KEYBOARD_F12: ::USAGE = 0x45;
-pub const HID_USAGE_KEYBOARD_F13: ::USAGE = 0x68;
-pub const HID_USAGE_KEYBOARD_F14: ::USAGE = 0x69;
-pub const HID_USAGE_KEYBOARD_F15: ::USAGE = 0x6A;
-pub const HID_USAGE_KEYBOARD_F16: ::USAGE = 0x6B;
-pub const HID_USAGE_KEYBOARD_F17: ::USAGE = 0x6C;
-pub const HID_USAGE_KEYBOARD_F18: ::USAGE = 0x6D;
-pub const HID_USAGE_KEYBOARD_F19: ::USAGE = 0x6E;
-pub const HID_USAGE_KEYBOARD_F20: ::USAGE = 0x6F;
-pub const HID_USAGE_KEYBOARD_F21: ::USAGE = 0x70;
-pub const HID_USAGE_KEYBOARD_F22: ::USAGE = 0x71;
-pub const HID_USAGE_KEYBOARD_F23: ::USAGE = 0x72;
-pub const HID_USAGE_KEYBOARD_F24: ::USAGE = 0x73;
-pub const HID_USAGE_KEYBOARD_RETURN: ::USAGE = 0x28;
-pub const HID_USAGE_KEYBOARD_ESCAPE: ::USAGE = 0x29;
-pub const HID_USAGE_KEYBOARD_DELETE: ::USAGE = 0x2A;
-pub const HID_USAGE_KEYBOARD_PRINT_SCREEN: ::USAGE = 0x46;
-pub const HID_USAGE_KEYBOARD_DELETE_FORWARD: ::USAGE = 0x4C;
-pub const HID_USAGE_LED_NUM_LOCK: ::USAGE = 0x01;
-pub const HID_USAGE_LED_CAPS_LOCK: ::USAGE = 0x02;
-pub const HID_USAGE_LED_SCROLL_LOCK: ::USAGE = 0x03;
-pub const HID_USAGE_LED_COMPOSE: ::USAGE = 0x04;
-pub const HID_USAGE_LED_KANA: ::USAGE = 0x05;
-pub const HID_USAGE_LED_POWER: ::USAGE = 0x06;
-pub const HID_USAGE_LED_SHIFT: ::USAGE = 0x07;
-pub const HID_USAGE_LED_DO_NOT_DISTURB: ::USAGE = 0x08;
-pub const HID_USAGE_LED_MUTE: ::USAGE = 0x09;
-pub const HID_USAGE_LED_TONE_ENABLE: ::USAGE = 0x0A;
-pub const HID_USAGE_LED_HIGH_CUT_FILTER: ::USAGE = 0x0B;
-pub const HID_USAGE_LED_LOW_CUT_FILTER: ::USAGE = 0x0C;
-pub const HID_USAGE_LED_EQUALIZER_ENABLE: ::USAGE = 0x0D;
-pub const HID_USAGE_LED_SOUND_FIELD_ON: ::USAGE = 0x0E;
-pub const HID_USAGE_LED_SURROUND_FIELD_ON: ::USAGE = 0x0F;
-pub const HID_USAGE_LED_REPEAT: ::USAGE = 0x10;
-pub const HID_USAGE_LED_STEREO: ::USAGE = 0x11;
-pub const HID_USAGE_LED_SAMPLING_RATE_DETECT: ::USAGE = 0x12;
-pub const HID_USAGE_LED_SPINNING: ::USAGE = 0x13;
-pub const HID_USAGE_LED_CAV: ::USAGE = 0x14;
-pub const HID_USAGE_LED_CLV: ::USAGE = 0x15;
-pub const HID_USAGE_LED_RECORDING_FORMAT_DET: ::USAGE = 0x16;
-pub const HID_USAGE_LED_OFF_HOOK: ::USAGE = 0x17;
-pub const HID_USAGE_LED_RING: ::USAGE = 0x18;
-pub const HID_USAGE_LED_MESSAGE_WAITING: ::USAGE = 0x19;
-pub const HID_USAGE_LED_DATA_MODE: ::USAGE = 0x1A;
-pub const HID_USAGE_LED_BATTERY_OPERATION: ::USAGE = 0x1B;
-pub const HID_USAGE_LED_BATTERY_OK: ::USAGE = 0x1C;
-pub const HID_USAGE_LED_BATTERY_LOW: ::USAGE = 0x1D;
-pub const HID_USAGE_LED_SPEAKER: ::USAGE = 0x1E;
-pub const HID_USAGE_LED_HEAD_SET: ::USAGE = 0x1F;
-pub const HID_USAGE_LED_HOLD: ::USAGE = 0x20;
-pub const HID_USAGE_LED_MICROPHONE: ::USAGE = 0x21;
-pub const HID_USAGE_LED_COVERAGE: ::USAGE = 0x22;
-pub const HID_USAGE_LED_NIGHT_MODE: ::USAGE = 0x23;
-pub const HID_USAGE_LED_SEND_CALLS: ::USAGE = 0x24;
-pub const HID_USAGE_LED_CALL_PICKUP: ::USAGE = 0x25;
-pub const HID_USAGE_LED_CONFERENCE: ::USAGE = 0x26;
-pub const HID_USAGE_LED_STAND_BY: ::USAGE = 0x27;
-pub const HID_USAGE_LED_CAMERA_ON: ::USAGE = 0x28;
-pub const HID_USAGE_LED_CAMERA_OFF: ::USAGE = 0x29;
-pub const HID_USAGE_LED_ON_LINE: ::USAGE = 0x2A;
-pub const HID_USAGE_LED_OFF_LINE: ::USAGE = 0x2B;
-pub const HID_USAGE_LED_BUSY: ::USAGE = 0x2C;
-pub const HID_USAGE_LED_READY: ::USAGE = 0x2D;
-pub const HID_USAGE_LED_PAPER_OUT: ::USAGE = 0x2E;
-pub const HID_USAGE_LED_PAPER_JAM: ::USAGE = 0x2F;
-pub const HID_USAGE_LED_REMOTE: ::USAGE = 0x30;
-pub const HID_USAGE_LED_FORWARD: ::USAGE = 0x31;
-pub const HID_USAGE_LED_REVERSE: ::USAGE = 0x32;
-pub const HID_USAGE_LED_STOP: ::USAGE = 0x33;
-pub const HID_USAGE_LED_REWIND: ::USAGE = 0x34;
-pub const HID_USAGE_LED_FAST_FORWARD: ::USAGE = 0x35;
-pub const HID_USAGE_LED_PLAY: ::USAGE = 0x36;
-pub const HID_USAGE_LED_PAUSE: ::USAGE = 0x37;
-pub const HID_USAGE_LED_RECORD: ::USAGE = 0x38;
-pub const HID_USAGE_LED_ERROR: ::USAGE = 0x39;
-pub const HID_USAGE_LED_SELECTED_INDICATOR: ::USAGE = 0x3A;
-pub const HID_USAGE_LED_IN_USE_INDICATOR: ::USAGE = 0x3B;
-pub const HID_USAGE_LED_MULTI_MODE_INDICATOR: ::USAGE = 0x3C;
-pub const HID_USAGE_LED_INDICATOR_ON: ::USAGE = 0x3D;
-pub const HID_USAGE_LED_INDICATOR_FLASH: ::USAGE = 0x3E;
-pub const HID_USAGE_LED_INDICATOR_SLOW_BLINK: ::USAGE = 0x3F;
-pub const HID_USAGE_LED_INDICATOR_FAST_BLINK: ::USAGE = 0x40;
-pub const HID_USAGE_LED_INDICATOR_OFF: ::USAGE = 0x41;
-pub const HID_USAGE_LED_FLASH_ON_TIME: ::USAGE = 0x42;
-pub const HID_USAGE_LED_SLOW_BLINK_ON_TIME: ::USAGE = 0x43;
-pub const HID_USAGE_LED_SLOW_BLINK_OFF_TIME: ::USAGE = 0x44;
-pub const HID_USAGE_LED_FAST_BLINK_ON_TIME: ::USAGE = 0x45;
-pub const HID_USAGE_LED_FAST_BLINK_OFF_TIME: ::USAGE = 0x46;
-pub const HID_USAGE_LED_INDICATOR_COLOR: ::USAGE = 0x47;
-pub const HID_USAGE_LED_RED: ::USAGE = 0x48;
-pub const HID_USAGE_LED_GREEN: ::USAGE = 0x49;
-pub const HID_USAGE_LED_AMBER: ::USAGE = 0x4A;
-pub const HID_USAGE_LED_GENERIC_INDICATOR: ::USAGE = 0x4B;
-pub const HID_USAGE_TELEPHONY_PHONE: ::USAGE = 0x01;
-pub const HID_USAGE_TELEPHONY_ANSWERING_MACHINE: ::USAGE = 0x02;
-pub const HID_USAGE_TELEPHONY_MESSAGE_CONTROLS: ::USAGE = 0x03;
-pub const HID_USAGE_TELEPHONY_HANDSET: ::USAGE = 0x04;
-pub const HID_USAGE_TELEPHONY_HEADSET: ::USAGE = 0x05;
-pub const HID_USAGE_TELEPHONY_KEYPAD: ::USAGE = 0x06;
-pub const HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON: ::USAGE = 0x07;
-pub const HID_USAGE_TELEPHONY_REDIAL: ::USAGE = 0x24;
-pub const HID_USAGE_TELEPHONY_TRANSFER: ::USAGE = 0x25;
-pub const HID_USAGE_TELEPHONY_DROP: ::USAGE = 0x26;
-pub const HID_USAGE_TELEPHONY_LINE: ::USAGE = 0x2A;
-pub const HID_USAGE_TELEPHONY_RING_ENABLE: ::USAGE = 0x2D;
-pub const HID_USAGE_TELEPHONY_SEND: ::USAGE = 0x31;
-pub const HID_USAGE_TELEPHONY_KEYPAD_0: ::USAGE = 0xB0;
-pub const HID_USAGE_TELEPHONY_KEYPAD_D: ::USAGE = 0xBF;
-pub const HID_USAGE_TELEPHONY_HOST_AVAILABLE: ::USAGE = 0xF1;
-pub const HID_USAGE_CONSUMERCTRL: ::USAGE = 0x01;
-pub const HID_USAGE_CONSUMER_CHANNEL_INCREMENT: ::USAGE = 0x9C;
-pub const HID_USAGE_CONSUMER_CHANNEL_DECREMENT: ::USAGE = 0x9D;
-pub const HID_USAGE_CONSUMER_PLAY: ::USAGE = 0xB0;
-pub const HID_USAGE_CONSUMER_PAUSE: ::USAGE = 0xB1;
-pub const HID_USAGE_CONSUMER_RECORD: ::USAGE = 0xB2;
-pub const HID_USAGE_CONSUMER_FAST_FORWARD: ::USAGE = 0xB3;
-pub const HID_USAGE_CONSUMER_REWIND: ::USAGE = 0xB4;
-pub const HID_USAGE_CONSUMER_SCAN_NEXT_TRACK: ::USAGE = 0xB5;
-pub const HID_USAGE_CONSUMER_SCAN_PREV_TRACK: ::USAGE = 0xB6;
-pub const HID_USAGE_CONSUMER_STOP: ::USAGE = 0xB7;
-pub const HID_USAGE_CONSUMER_PLAY_PAUSE: ::USAGE = 0xCD;
-pub const HID_USAGE_CONSUMER_VOLUME: ::USAGE = 0xE0;
-pub const HID_USAGE_CONSUMER_BALANCE: ::USAGE = 0xE1;
-pub const HID_USAGE_CONSUMER_MUTE: ::USAGE = 0xE2;
-pub const HID_USAGE_CONSUMER_BASS: ::USAGE = 0xE3;
-pub const HID_USAGE_CONSUMER_TREBLE: ::USAGE = 0xE4;
-pub const HID_USAGE_CONSUMER_BASS_BOOST: ::USAGE = 0xE5;
-pub const HID_USAGE_CONSUMER_SURROUND_MODE: ::USAGE = 0xE6;
-pub const HID_USAGE_CONSUMER_LOUDNESS: ::USAGE = 0xE7;
-pub const HID_USAGE_CONSUMER_MPX: ::USAGE = 0xE8;
-pub const HID_USAGE_CONSUMER_VOLUME_INCREMENT: ::USAGE = 0xE9;
-pub const HID_USAGE_CONSUMER_VOLUME_DECREMENT: ::USAGE = 0xEA;
-pub const HID_USAGE_CONSUMER_BASS_INCREMENT: ::USAGE = 0x152;
-pub const HID_USAGE_CONSUMER_BASS_DECREMENT: ::USAGE = 0x153;
-pub const HID_USAGE_CONSUMER_TREBLE_INCREMENT: ::USAGE = 0x154;
-pub const HID_USAGE_CONSUMER_TREBLE_DECREMENT: ::USAGE = 0x155;
-pub const HID_USAGE_CONSUMER_AL_CONFIGURATION: ::USAGE = 0x183;
-pub const HID_USAGE_CONSUMER_AL_EMAIL: ::USAGE = 0x18A;
-pub const HID_USAGE_CONSUMER_AL_CALCULATOR: ::USAGE = 0x192;
-pub const HID_USAGE_CONSUMER_AL_BROWSER: ::USAGE = 0x194;
-pub const HID_USAGE_CONSUMER_AC_SEARCH: ::USAGE = 0x221;
-pub const HID_USAGE_CONSUMER_AC_GOTO: ::USAGE = 0x222;
-pub const HID_USAGE_CONSUMER_AC_HOME: ::USAGE = 0x223;
-pub const HID_USAGE_CONSUMER_AC_BACK: ::USAGE = 0x224;
-pub const HID_USAGE_CONSUMER_AC_FORWARD: ::USAGE = 0x225;
-pub const HID_USAGE_CONSUMER_AC_STOP: ::USAGE = 0x226;
-pub const HID_USAGE_CONSUMER_AC_REFRESH: ::USAGE = 0x227;
-pub const HID_USAGE_CONSUMER_AC_PREVIOUS: ::USAGE = 0x228;
-pub const HID_USAGE_CONSUMER_AC_NEXT: ::USAGE = 0x229;
-pub const HID_USAGE_CONSUMER_AC_BOOKMARKS: ::USAGE = 0x22A;
-pub const HID_USAGE_CONSUMER_AC_PAN: ::USAGE = 0x238;
-pub const HID_USAGE_CONSUMER_EXTENDED_KEYBOARD_ATTRIBUTES_COLLECTION: ::USAGE = 0x2C0;
-pub const HID_USAGE_CONSUMER_KEYBOARD_FORM_FACTOR: ::USAGE = 0x2C1;
-pub const HID_USAGE_CONSUMER_KEYBOARD_KEY_TYPE: ::USAGE = 0x2C2;
-pub const HID_USAGE_CONSUMER_KEYBOARD_PHYSICAL_LAYOUT: ::USAGE = 0x2C3;
-pub const HID_USAGE_CONSUMER_VENDOR_SPECIFIC_KEYBOARD_PHYSICAL_LAYOUT: ::USAGE = 0x2C4;
-pub const HID_USAGE_CONSUMER_KEYBOARD_IETF_LANGUAGE_TAG_INDEX: ::USAGE = 0x2C5;
-pub const HID_USAGE_CONSUMER_IMPLEMENTED_KEYBOARD_INPUT_ASSIST_CONTROLS: ::USAGE = 0x2C6;
-pub const HID_USAGE_DIGITIZER_PEN: ::USAGE = 0x02;
-pub const HID_USAGE_DIGITIZER_IN_RANGE: ::USAGE = 0x32;
-pub const HID_USAGE_DIGITIZER_TIP_SWITCH: ::USAGE = 0x42;
-pub const HID_USAGE_DIGITIZER_BARREL_SWITCH: ::USAGE = 0x44;
-pub const HID_USAGE_CAMERA_AUTO_FOCUS: ::USAGE = 0x20;
-pub const HID_USAGE_CAMERA_SHUTTER: ::USAGE = 0x21;
-pub const HID_USAGE_MS_BTH_HF_DIALNUMBER: ::USAGE = 0x21;
-pub const HID_USAGE_MS_BTH_HF_DIALMEMORY: ::USAGE = 0x22;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hstring.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hstring.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/hstring.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/hstring.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This interface definition contains typedefs for Windows Runtime data types.
-DECLARE_HANDLE!(HSTRING, HSTRING__);
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct HSTRING_HEADER {
-    Reserved: [::PVOID; 0], // For alignment
-    Reserved2: [::c_char; 24],
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct HSTRING_HEADER {
-    Reserved: [::PVOID; 0], // For alignment
-    Reserved2: [::c_char; 20],
-}}
-UNION!(HSTRING_HEADER, Reserved2, Reserved1, Reserved1_mut, ::PVOID);
-DECLARE_HANDLE!(HSTRING_BUFFER, HSTRING_BUFFER__);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/http.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/http.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/http.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/http.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,828 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! HTTP API specification
-pub const HTTP_INITIALIZE_SERVER: ::ULONG = 0x00000001;
-pub const HTTP_INITIALIZE_CONFIG: ::ULONG = 0x00000002;
-pub const HTTP_DEMAND_CBT: ::ULONG = 0x00000004;
-ENUM!{enum HTTP_SERVER_PROPERTY {
-    HttpServerAuthenticationProperty,
-    HttpServerLoggingProperty,
-    HttpServerQosProperty,
-    HttpServerTimeoutsProperty,
-    HttpServerQueueLengthProperty,
-    HttpServerStateProperty,
-    HttpServer503VerbosityProperty,
-    HttpServerBindingProperty,
-    HttpServerExtendedAuthenticationProperty,
-    HttpServerListenEndpointProperty,
-    HttpServerChannelBindProperty,
-    HttpServerProtectionLevelProperty,
-}}
-pub type PHTTP_SERVER_PROPERTY = *mut HTTP_SERVER_PROPERTY;
-STRUCT!{struct HTTP_PROPERTY_FLAGS {
-    BitFields: ::ULONG,
-}}
-BITFIELD!(HTTP_PROPERTY_FLAGS BitFields: ::ULONG [
-    Present set_Present[0..1],
-]);
-pub type PHTTP_PROPERTY_FLAGS = *mut HTTP_PROPERTY_FLAGS;
-ENUM!{enum HTTP_ENABLED_STATE {
-    HttpEnabledStateActive,
-    HttpEnabledStateInactive,
-}}
-pub type PHTTP_ENABLED_STATE = *mut HTTP_ENABLED_STATE;
-STRUCT!{struct HTTP_STATE_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    State: HTTP_ENABLED_STATE,
-}}
-pub type PHTTP_STATE_INFO = *mut HTTP_STATE_INFO;
-ENUM!{enum HTTP_503_RESPONSE_VERBOSITY {
-    Http503ResponseVerbosityBasic,
-    Http503ResponseVerbosityLimited,
-    Http503ResponseVerbosityFull,
-}}
-pub type PHTTP_503_RESPONSE_VERBOSITY = *mut HTTP_503_RESPONSE_VERBOSITY;
-ENUM!{enum HTTP_QOS_SETTING_TYPE {
-    HttpQosSettingTypeBandwidth,
-    HttpQosSettingTypeConnectionLimit,
-    HttpQosSettingTypeFlowRate,
-}}
-pub type PHTTP_QOS_SETTING_TYPE = *mut HTTP_QOS_SETTING_TYPE;
-STRUCT!{struct HTTP_QOS_SETTING_INFO {
-    QosType: HTTP_QOS_SETTING_TYPE,
-    QosSetting: ::PVOID,
-}}
-pub type PHTTP_QOS_SETTING_INFO = *mut HTTP_QOS_SETTING_INFO;
-STRUCT!{struct HTTP_CONNECTION_LIMIT_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    MaxConnections: ::ULONG,
-}}
-pub type PHTTP_CONNECTION_LIMIT_INFO = *mut HTTP_CONNECTION_LIMIT_INFO;
-STRUCT!{struct HTTP_BANDWIDTH_LIMIT_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    MaxBandwidth: ::ULONG,
-}}
-pub type PHTTP_BANDWIDTH_LIMIT_INFO = *mut HTTP_BANDWIDTH_LIMIT_INFO;
-STRUCT!{struct HTTP_FLOWRATE_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    MaxBandwidth: ::ULONG,
-    MaxPeakBandwidth: ::ULONG,
-    BurstSize: ::ULONG,
-}}
-pub type PHTTP_FLOWRATE_INFO = *mut HTTP_FLOWRATE_INFO;
-pub const HTTP_MIN_ALLOWED_BANDWIDTH_THROTTLING_RATE: ::ULONG = 1024;
-pub const HTTP_LIMIT_INFINITE: ::ULONG = !0;
-ENUM!{enum HTTP_SERVICE_CONFIG_TIMEOUT_KEY {
-    IdleConnectionTimeout = 0,
-    HeaderWaitTimeout,
-}}
-pub type PHTTP_SERVICE_CONFIG_TIMEOUT_KEY = *mut HTTP_SERVICE_CONFIG_TIMEOUT_KEY;
-pub type HTTP_SERVICE_CONFIG_TIMEOUT_PARAM = ::USHORT;
-pub type PHTTP_SERVICE_CONFIG_TIMEOUT_PARAM = *mut ::USHORT;
-STRUCT!{struct HTTP_SERVICE_CONFIG_TIMEOUT_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_TIMEOUT_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_TIMEOUT_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_TIMEOUT_SET = *mut HTTP_SERVICE_CONFIG_TIMEOUT_SET;
-STRUCT!{struct HTTP_TIMEOUT_LIMIT_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    EntityBody: ::USHORT,
-    DrainEntityBody: ::USHORT,
-    RequestQueue: ::USHORT,
-    IdleConnection: ::USHORT,
-    HeaderWait: ::USHORT,
-    MinSendRate: ::ULONG,
-}}
-pub type PHTTP_TIMEOUT_LIMIT_INFO = *mut HTTP_TIMEOUT_LIMIT_INFO;
-STRUCT!{struct HTTP_LISTEN_ENDPOINT_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    EnableSharing: ::BOOLEAN,
-}}
-pub type PHTTP_LISTEN_ENDPOINT_INFO = *mut HTTP_LISTEN_ENDPOINT_INFO;
-STRUCT!{struct HTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS {
-    DomainNameLength: ::USHORT,
-    DomainName: ::PWSTR,
-    RealmLength: ::USHORT,
-    Realm: ::PWSTR,
-}}
-pub type PHTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS = *mut HTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS;
-STRUCT!{struct HTTP_SERVER_AUTHENTICATION_BASIC_PARAMS {
-    RealmLength: ::USHORT,
-    Realm: ::PWSTR,
-}}
-pub type PHTTP_SERVER_AUTHENTICATION_BASIC_PARAMS = *mut HTTP_SERVER_AUTHENTICATION_BASIC_PARAMS;
-pub const HTTP_AUTH_ENABLE_BASIC: ::ULONG = 0x00000001;
-pub const HTTP_AUTH_ENABLE_DIGEST: ::ULONG = 0x00000002;
-pub const HTTP_AUTH_ENABLE_NTLM: ::ULONG = 0x00000004;
-pub const HTTP_AUTH_ENABLE_NEGOTIATE: ::ULONG = 0x00000008;
-pub const HTTP_AUTH_ENABLE_KERBEROS: ::ULONG = 0x00000010;
-pub const HTTP_AUTH_ENABLE_ALL: ::ULONG =  HTTP_AUTH_ENABLE_BASIC | HTTP_AUTH_ENABLE_DIGEST |
-    HTTP_AUTH_ENABLE_NTLM | HTTP_AUTH_ENABLE_NEGOTIATE | HTTP_AUTH_ENABLE_KERBEROS;
-pub const HTTP_AUTH_EX_FLAG_ENABLE_KERBEROS_CREDENTIAL_CACHING: ::UCHAR = 0x01;
-pub const HTTP_AUTH_EX_FLAG_CAPTURE_CREDENTIAL: ::UCHAR = 0x02;
-STRUCT!{struct HTTP_SERVER_AUTHENTICATION_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    AuthSchemes: ::ULONG,
-    ReceiveMutualAuth: ::BOOLEAN,
-    ReceiveContextHandle: ::BOOLEAN,
-    DisableNTLMCredentialCaching: ::BOOLEAN,
-    ExFlags: ::UCHAR,
-    DigestParams: HTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS,
-    BasicParams: HTTP_SERVER_AUTHENTICATION_BASIC_PARAMS,
-}}
-pub type PHTTP_SERVER_AUTHENTICATION_INFO = *mut HTTP_SERVER_AUTHENTICATION_INFO;
-ENUM!{enum HTTP_SERVICE_BINDING_TYPE {
-    HttpServiceBindingTypeNone = 0,
-    HttpServiceBindingTypeW,
-    HttpServiceBindingTypeA,
-}}
-STRUCT!{struct HTTP_SERVICE_BINDING_BASE {
-    Type: HTTP_SERVICE_BINDING_TYPE,
-}}
-pub type PHTTP_SERVICE_BINDING_BASE = *mut HTTP_SERVICE_BINDING_BASE;
-STRUCT!{struct HTTP_SERVICE_BINDING_A {
-    Base: HTTP_SERVICE_BINDING_BASE,
-    Buffer: ::PCHAR,
-    BufferSize: ::ULONG,
-}}
-pub type PHTTP_SERVICE_BINDING_A = *mut HTTP_SERVICE_BINDING_A;
-STRUCT!{struct HTTP_SERVICE_BINDING_W {
-    Base: HTTP_SERVICE_BINDING_BASE,
-    Buffer: ::PWCHAR,
-    BufferSize: ::ULONG,
-}}
-pub type PHTTP_SERVICE_BINDING_W = *mut HTTP_SERVICE_BINDING_W;
-ENUM!{enum HTTP_AUTHENTICATION_HARDENING_LEVELS {
-    HttpAuthenticationHardeningLegacy = 0,
-    HttpAuthenticationHardeningMedium,
-    HttpAuthenticationHardeningStrict,
-}}
-pub const HTTP_CHANNEL_BIND_PROXY: ::ULONG = 0x1;
-pub const HTTP_CHANNEL_BIND_PROXY_COHOSTING: ::ULONG = 0x20;
-pub const HTTP_CHANNEL_BIND_NO_SERVICE_NAME_CHECK: ::ULONG = 0x2;
-pub const HTTP_CHANNEL_BIND_DOTLESS_SERVICE: ::ULONG = 0x4;
-pub const HTTP_CHANNEL_BIND_SECURE_CHANNEL_TOKEN: ::ULONG = 0x8;
-pub const HTTP_CHANNEL_BIND_CLIENT_SERVICE: ::ULONG = 0x10;
-STRUCT!{struct HTTP_CHANNEL_BIND_INFO {
-    Hardening: HTTP_AUTHENTICATION_HARDENING_LEVELS,
-    Flags: ::ULONG,
-    ServiceNames: *mut PHTTP_SERVICE_BINDING_BASE,
-    NumberOfServiceNames: ::ULONG,
-}}
-pub type PHTTP_CHANNEL_BIND_INFO = *mut HTTP_CHANNEL_BIND_INFO;
-STRUCT!{struct HTTP_REQUEST_CHANNEL_BIND_STATUS {
-    ServiceName: PHTTP_SERVICE_BINDING_BASE,
-    ChannelToken: ::PUCHAR,
-    ChannelTokenSize: ::ULONG,
-    Flags: ::ULONG,
-}}
-pub type PHTTP_REQUEST_CHANNEL_BIND_STATUS = *mut HTTP_REQUEST_CHANNEL_BIND_STATUS;
-pub const HTTP_LOG_FIELD_DATE: ::ULONG = 0x00000001;
-pub const HTTP_LOG_FIELD_TIME: ::ULONG = 0x00000002;
-pub const HTTP_LOG_FIELD_CLIENT_IP: ::ULONG = 0x00000004;
-pub const HTTP_LOG_FIELD_USER_NAME: ::ULONG = 0x00000008;
-pub const HTTP_LOG_FIELD_SITE_NAME: ::ULONG = 0x00000010;
-pub const HTTP_LOG_FIELD_COMPUTER_NAME: ::ULONG = 0x00000020;
-pub const HTTP_LOG_FIELD_SERVER_IP: ::ULONG = 0x00000040;
-pub const HTTP_LOG_FIELD_METHOD: ::ULONG = 0x00000080;
-pub const HTTP_LOG_FIELD_URI_STEM: ::ULONG = 0x00000100;
-pub const HTTP_LOG_FIELD_URI_QUERY: ::ULONG = 0x00000200;
-pub const HTTP_LOG_FIELD_STATUS: ::ULONG = 0x00000400;
-pub const HTTP_LOG_FIELD_WIN32_STATUS: ::ULONG = 0x00000800;
-pub const HTTP_LOG_FIELD_BYTES_SENT: ::ULONG = 0x00001000;
-pub const HTTP_LOG_FIELD_BYTES_RECV: ::ULONG = 0x00002000;
-pub const HTTP_LOG_FIELD_TIME_TAKEN: ::ULONG = 0x00004000;
-pub const HTTP_LOG_FIELD_SERVER_PORT: ::ULONG = 0x00008000;
-pub const HTTP_LOG_FIELD_USER_AGENT: ::ULONG = 0x00010000;
-pub const HTTP_LOG_FIELD_COOKIE: ::ULONG = 0x00020000;
-pub const HTTP_LOG_FIELD_REFERER: ::ULONG = 0x00040000;
-pub const HTTP_LOG_FIELD_VERSION: ::ULONG = 0x00080000;
-pub const HTTP_LOG_FIELD_HOST: ::ULONG = 0x00100000;
-pub const HTTP_LOG_FIELD_SUB_STATUS: ::ULONG = 0x00200000;
-pub const HTTP_LOG_FIELD_CLIENT_PORT: ::ULONG = 0x00400000;
-pub const HTTP_LOG_FIELD_URI: ::ULONG = 0x00800000;
-pub const HTTP_LOG_FIELD_SITE_ID: ::ULONG = 0x01000000;
-pub const HTTP_LOG_FIELD_REASON: ::ULONG = 0x02000000;
-pub const HTTP_LOG_FIELD_QUEUE_NAME: ::ULONG = 0x04000000;
-ENUM!{enum HTTP_LOGGING_TYPE {
-    HttpLoggingTypeW3C,
-    HttpLoggingTypeIIS,
-    HttpLoggingTypeNCSA,
-    HttpLoggingTypeRaw,
-}}
-ENUM!{enum HTTP_LOGGING_ROLLOVER_TYPE {
-    HttpLoggingRolloverSize,
-    HttpLoggingRolloverDaily,
-    HttpLoggingRolloverWeekly,
-    HttpLoggingRolloverMonthly,
-    HttpLoggingRolloverHourly,
-}}
-pub const HTTP_MIN_ALLOWED_LOG_FILE_ROLLOVER_SIZE: ::ULONG = (1 * 1024 * 1024) as ::ULONG;
-pub const HTTP_LOGGING_FLAG_LOCAL_TIME_ROLLOVER: ::ULONG = 0x00000001;
-pub const HTTP_LOGGING_FLAG_USE_UTF8_CONVERSION: ::ULONG = 0x00000002;
-pub const HTTP_LOGGING_FLAG_LOG_ERRORS_ONLY: ::ULONG = 0x00000004;
-pub const HTTP_LOGGING_FLAG_LOG_SUCCESS_ONLY: ::ULONG = 0x00000008;
-STRUCT!{struct HTTP_LOGGING_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    LoggingFlags: ::ULONG,
-    SoftwareName: ::PCWSTR,
-    SoftwareNameLength: ::USHORT,
-    DirectoryNameLength: ::USHORT,
-    DirectoryName: ::PCWSTR,
-    Format: HTTP_LOGGING_TYPE,
-    Fields: ::ULONG,
-    pExtFields: ::PVOID,
-    NumOfExtFields: ::USHORT,
-    MaxRecordSize: ::USHORT,
-    RolloverType: HTTP_LOGGING_ROLLOVER_TYPE,
-    RolloverSize: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-}}
-pub type PHTTP_LOGGING_INFO = *mut HTTP_LOGGING_INFO;
-STRUCT!{struct HTTP_BINDING_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    RequestQueueHandle: ::HANDLE,
-}}
-pub type PHTTP_BINDING_INFO = *mut HTTP_BINDING_INFO;
-ENUM!{enum HTTP_PROTECTION_LEVEL_TYPE {
-    HttpProtectionLevelUnrestricted,
-    HttpProtectionLevelEdgeRestricted,
-    HttpProtectionLevelRestricted,
-}}
-pub type PHTTP_PROTECTION_LEVEL_TYPE = *mut HTTP_PROTECTION_LEVEL_TYPE;
-STRUCT!{struct HTTP_PROTECTION_LEVEL_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    Level: HTTP_PROTECTION_LEVEL_TYPE,
-}}
-pub type PHTTP_PROTECTION_LEVEL_INFO = *mut HTTP_PROTECTION_LEVEL_INFO;
-pub const HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING: ::ULONG = 0x00000001;
-pub const HTTP_CREATE_REQUEST_QUEUE_FLAG_CONTROLLER: ::ULONG = 0x00000002;
-pub const HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY: ::ULONG = 0x00000001;
-pub const HTTP_RECEIVE_REQUEST_FLAG_FLUSH_BODY: ::ULONG = 0x00000002;
-pub const HTTP_RECEIVE_REQUEST_ENTITY_BODY_FLAG_FILL_BUFFER: ::ULONG = 0x00000001;
-pub const HTTP_SEND_RESPONSE_FLAG_DISCONNECT: ::ULONG = 0x00000001;
-pub const HTTP_SEND_RESPONSE_FLAG_MORE_DATA: ::ULONG = 0x00000002;
-pub const HTTP_SEND_RESPONSE_FLAG_BUFFER_DATA: ::ULONG = 0x00000004;
-pub const HTTP_SEND_RESPONSE_FLAG_ENABLE_NAGLING: ::ULONG = 0x00000008;
-pub const HTTP_SEND_RESPONSE_FLAG_PROCESS_RANGES: ::ULONG = 0x00000020;
-pub const HTTP_SEND_RESPONSE_FLAG_OPAQUE: ::ULONG = 0x00000040;
-pub const HTTP_FLUSH_RESPONSE_FLAG_RECURSIVE: ::ULONG = 0x00000001;
-pub type HTTP_OPAQUE_ID = ::ULONGLONG;
-pub type PHTTP_OPAQUE_ID = *mut ::ULONGLONG;
-pub type HTTP_REQUEST_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_REQUEST_ID = *mut HTTP_OPAQUE_ID;
-pub type HTTP_CONNECTION_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_CONNECTION_ID = *mut HTTP_OPAQUE_ID;
-pub type HTTP_RAW_CONNECTION_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_RAW_CONNECTION_ID = *mut HTTP_OPAQUE_ID;
-pub type HTTP_URL_GROUP_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_URL_GROUP_ID = *mut HTTP_OPAQUE_ID;
-pub type HTTP_SERVER_SESSION_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_SERVER_SESSION_ID = *mut HTTP_OPAQUE_ID;
-pub const HTTP_BYTE_RANGE_TO_EOF: ::ULONGLONG = !0;
-STRUCT!{struct HTTP_BYTE_RANGE {
-    StartingOffset: ::ULARGE_INTEGER,
-    Length: ::ULARGE_INTEGER,
-}}
-pub type PHTTP_BYTE_RANGE = *mut HTTP_BYTE_RANGE;
-STRUCT!{struct HTTP_VERSION {
-    MajorVersion: ::USHORT,
-    MinorVersion: ::USHORT,
-}}
-pub type PHTTP_VERSION = *mut HTTP_VERSION;
-pub const HTTP_VERSION_UNKNOWN: HTTP_VERSION = HTTP_VERSION { MajorVersion: 0, MinorVersion: 0 };
-pub const HTTP_VERSION_0_9: HTTP_VERSION = HTTP_VERSION { MajorVersion: 0, MinorVersion: 9 };
-pub const HTTP_VERSION_1_0: HTTP_VERSION = HTTP_VERSION { MajorVersion: 1, MinorVersion: 0 };
-pub const HTTP_VERSION_1_1: HTTP_VERSION = HTTP_VERSION { MajorVersion: 1, MinorVersion: 1 };
-#[inline] #[allow(dead_code)]
-pub fn HTTP_SET_VERSION(mut version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) {
-    version.MajorVersion = major;
-    version.MinorVersion = minor;
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_EQUAL_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.MajorVersion == major && version.MinorVersion == minor
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_GREATER_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.MajorVersion > major || (version.MajorVersion == major && version.MinorVersion > minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_LESS_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.MajorVersion < major || (version.MajorVersion == major && version.MinorVersion < minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_NOT_EQUAL_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    !HTTP_EQUAL_VERSION(version, major, minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_GREATER_EQUAL_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    !HTTP_LESS_VERSION(version, major, minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_LESS_EQUAL_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    !HTTP_GREATER_VERSION(version, major, minor)
-}
-ENUM!{enum HTTP_VERB {
-    HttpVerbUnparsed,
-    HttpVerbUnknown,
-    HttpVerbInvalid,
-    HttpVerbOPTIONS,
-    HttpVerbGET,
-    HttpVerbHEAD,
-    HttpVerbPOST,
-    HttpVerbPUT,
-    HttpVerbDELETE,
-    HttpVerbTRACE,
-    HttpVerbCONNECT,
-    HttpVerbTRACK,
-    HttpVerbMOVE,
-    HttpVerbCOPY,
-    HttpVerbPROPFIND,
-    HttpVerbPROPPATCH,
-    HttpVerbMKCOL,
-    HttpVerbLOCK,
-    HttpVerbUNLOCK,
-    HttpVerbSEARCH,
-    HttpVerbMaximum,
-}}
-pub type PHTTP_VERB = *mut HTTP_VERB;
-ENUM!{enum HTTP_HEADER_ID {
-    HttpHeaderCacheControl = 0,
-    HttpHeaderConnection = 1,
-    HttpHeaderDate = 2,
-    HttpHeaderKeepAlive = 3,
-    HttpHeaderPragma = 4,
-    HttpHeaderTrailer = 5,
-    HttpHeaderTransferEncoding = 6,
-    HttpHeaderUpgrade = 7,
-    HttpHeaderVia = 8,
-    HttpHeaderWarning = 9,
-    HttpHeaderAllow = 10,
-    HttpHeaderContentLength = 11,
-    HttpHeaderContentType = 12,
-    HttpHeaderContentEncoding = 13,
-    HttpHeaderContentLanguage = 14,
-    HttpHeaderContentLocation = 15,
-    HttpHeaderContentMd5 = 16,
-    HttpHeaderContentRange = 17,
-    HttpHeaderExpires = 18,
-    HttpHeaderLastModified = 19,
-    HttpHeaderAccept = 20,
-    HttpHeaderAcceptCharset = 21,
-    HttpHeaderAcceptEncoding = 22,
-    HttpHeaderAcceptLanguage = 23,
-    HttpHeaderAuthorization = 24,
-    HttpHeaderCookie = 25,
-    HttpHeaderExpect = 26,
-    HttpHeaderFrom = 27,
-    HttpHeaderHost = 28,
-    HttpHeaderIfMatch = 29,
-    HttpHeaderIfModifiedSince = 30,
-    HttpHeaderIfNoneMatch = 31,
-    HttpHeaderIfRange = 32,
-    HttpHeaderIfUnmodifiedSince = 33,
-    HttpHeaderMaxForwards = 34,
-    HttpHeaderProxyAuthorization = 35,
-    HttpHeaderReferer = 36,
-    HttpHeaderRange = 37,
-    HttpHeaderTe = 38,
-    HttpHeaderTranslate = 39,
-    HttpHeaderUserAgent = 40,
-    HttpHeaderRequestMaximum = 41,
-    HttpHeaderAcceptRanges = 20,
-    HttpHeaderAge = 21,
-    HttpHeaderEtag = 22,
-    HttpHeaderLocation = 23,
-    HttpHeaderProxyAuthenticate = 24,
-    HttpHeaderRetryAfter = 25,
-    HttpHeaderServer = 26,
-    HttpHeaderSetCookie = 27,
-    HttpHeaderVary = 28,
-    HttpHeaderWwwAuthenticate = 29,
-    HttpHeaderResponseMaximum = 30,
-    HttpHeaderMaximum = 41,
-}}
-pub type PHTTP_HEADER_ID = *mut HTTP_HEADER_ID;
-STRUCT!{struct HTTP_KNOWN_HEADER {
-    RawValueLength: ::USHORT,
-    pRawValue: ::PCSTR,
-}}
-pub type PHTTP_KNOWN_HEADER = *mut HTTP_KNOWN_HEADER;
-STRUCT!{struct HTTP_UNKNOWN_HEADER {
-    NameLength: ::USHORT,
-    RawValueLength: ::USHORT,
-    pName: ::PCSTR,
-    pRawValue: ::PCSTR,
-}}
-pub type PHTTP_UNKNOWN_HEADER = *mut HTTP_UNKNOWN_HEADER;
-ENUM!{enum HTTP_LOG_DATA_TYPE {
-    HttpLogDataTypeFields = 0,
-}}
-pub type PHTTP_LOG_DATA_TYPE = *mut HTTP_LOG_DATA_TYPE;
-STRUCT!{struct HTTP_LOG_DATA {
-    Type: HTTP_LOG_DATA_TYPE,
-}}
-pub type PHTTP_LOG_DATA = *mut HTTP_LOG_DATA;
-STRUCT!{struct HTTP_LOG_FIELDS_DATA {
-    Base: HTTP_LOG_DATA,
-    UserNameLength: ::USHORT,
-    UriStemLength: ::USHORT,
-    ClientIpLength: ::USHORT,
-    ServerNameLength: ::USHORT,
-    ServiceNameLength: ::USHORT,
-    ServerIpLength: ::USHORT,
-    MethodLength: ::USHORT,
-    UriQueryLength: ::USHORT,
-    HostLength: ::USHORT,
-    UserAgentLength: ::USHORT,
-    CookieLength: ::USHORT,
-    ReferrerLength: ::USHORT,
-    UserName: ::PWCHAR,
-    UriStem: ::PWCHAR,
-    ClientIp: ::PCHAR,
-    ServerName: ::PCHAR,
-    ServiceName: ::PCHAR,
-    ServerIp: ::PCHAR,
-    Method: ::PCHAR,
-    UriQuery: ::PCHAR,
-    Host: ::PCHAR,
-    UserAgent: ::PCHAR,
-    Cookie: ::PCHAR,
-    Referrer: ::PCHAR,
-    ServerPort: ::USHORT,
-    ProtocolStatus: ::USHORT,
-    Win32Status: ::ULONG,
-    MethodNum: HTTP_VERB,
-    SubStatus: ::USHORT,
-}}
-pub type PHTTP_LOG_FIELDS_DATA = *mut HTTP_LOG_FIELDS_DATA;
-ENUM!{enum HTTP_DATA_CHUNK_TYPE {
-    HttpDataChunkFromMemory,
-    HttpDataChunkFromFileHandle,
-    HttpDataChunkFromFragmentCache,
-    HttpDataChunkFromFragmentCacheEx,
-    HttpDataChunkMaximum,
-}}
-pub type PHTTP_DATA_CHUNK_TYPE = *mut HTTP_DATA_CHUNK_TYPE;
-STRUCT!{struct HTTP_DATA_CHUNK_FromMemory {
-    pBuffer: ::PVOID,
-    BufferLength: ::ULONG,
-}}
-STRUCT!{struct HTTP_DATA_CHUNK_FromFileHandle {
-    ByteRange: HTTP_BYTE_RANGE,
-    FileHandle: ::HANDLE,
-}}
-STRUCT!{struct HTTP_DATA_CHUNK_FromFragmentCache {
-    FragmentNameLength: ::USHORT,
-    pFragmentName: ::PCWSTR,
-}}
-STRUCT!{struct HTTP_DATA_CHUNK_FromFragmentCacheEx {
-    ByteRange: HTTP_BYTE_RANGE,
-    pFragmentName: ::PCWSTR,
-}}
-STRUCT!{struct HTTP_DATA_CHUNK {
-    DataChunkType: HTTP_DATA_CHUNK_TYPE,
-    FromFileHandle: HTTP_DATA_CHUNK_FromFileHandle,
-}}
-UNION!(HTTP_DATA_CHUNK, FromFileHandle, FromMemory, FromMemory_mut, HTTP_DATA_CHUNK_FromMemory);
-UNION!(
-    HTTP_DATA_CHUNK, FromFileHandle, FromFragmentCache, FromFragmentCache_mut,
-    HTTP_DATA_CHUNK_FromFragmentCache
-);
-UNION!(
-    HTTP_DATA_CHUNK, FromFileHandle, FromFragmentCacheEx, FromFragmentCacheEx_mut,
-    HTTP_DATA_CHUNK_FromFragmentCacheEx
-);
-pub type PHTTP_DATA_CHUNK = *mut HTTP_DATA_CHUNK;
-STRUCT!{nodebug struct HTTP_REQUEST_HEADERS {
-    UnknownHeaderCount: ::USHORT,
-    pUnknownHeaders: PHTTP_UNKNOWN_HEADER,
-    TrailerCount: ::USHORT,
-    pTrailers: PHTTP_UNKNOWN_HEADER,
-    KnownHeaders: [HTTP_KNOWN_HEADER; 41], // FIXME HttpHeaderRequestMaximum
-}}
-pub type PHTTP_REQUEST_HEADERS = *mut HTTP_REQUEST_HEADERS;
-STRUCT!{nodebug struct HTTP_RESPONSE_HEADERS {
-    UnknownHeaderCount: ::USHORT,
-    pUnknownHeaders: PHTTP_UNKNOWN_HEADER,
-    TrailerCount: ::USHORT,
-    pTrailers: PHTTP_UNKNOWN_HEADER,
-    KnownHeaders: [HTTP_KNOWN_HEADER; 30], // FIXME HttpHeaderResponseMaximum
-}}
-pub type PHTTP_RESPONSE_HEADERS = *mut HTTP_RESPONSE_HEADERS;
-STRUCT!{struct HTTP_TRANSPORT_ADDRESS {
-    pRemoteAddress: ::PSOCKADDR,
-    pLocalAddress: ::PSOCKADDR,
-}}
-pub type PHTTP_TRANSPORT_ADDRESS = *mut HTTP_TRANSPORT_ADDRESS;
-STRUCT!{struct HTTP_COOKED_URL {
-    FullUrlLength: ::USHORT,
-    HostLength: ::USHORT,
-    AbsPathLength: ::USHORT,
-    QueryStringLength: ::USHORT,
-    pFullUrl: ::PCWSTR,
-    pHost: ::PCWSTR,
-    pAbsPath: ::PCWSTR,
-    pQueryString: ::PCWSTR,
-}}
-pub type PHTTP_COOKED_URL = *mut HTTP_COOKED_URL;
-pub type HTTP_URL_CONTEXT = ::ULONGLONG;
-pub const HTTP_URL_FLAG_REMOVE_ALL: ::ULONG = 0x00000001;
-ENUM!{enum HTTP_AUTH_STATUS {
-    HttpAuthStatusSuccess,
-    HttpAuthStatusNotAuthenticated,
-    HttpAuthStatusFailure,
-}}
-pub type PHTTP_AUTH_STATUS = *mut HTTP_AUTH_STATUS;
-ENUM!{enum HTTP_REQUEST_AUTH_TYPE {
-    HttpRequestAuthTypeNone = 0,
-    HttpRequestAuthTypeBasic,
-    HttpRequestAuthTypeDigest,
-    HttpRequestAuthTypeNTLM,
-    HttpRequestAuthTypeNegotiate,
-    HttpRequestAuthTypeKerberos,
-}}
-pub type PHTTP_REQUEST_AUTH_TYPE = *mut HTTP_REQUEST_AUTH_TYPE;
-STRUCT!{struct HTTP_SSL_CLIENT_CERT_INFO {
-    CertFlags: ::ULONG,
-    CertEncodedSize: ::ULONG,
-    pCertEncoded: ::PUCHAR,
-    Token: ::HANDLE,
-    CertDeniedByMapper: ::BOOLEAN,
-}}
-pub type PHTTP_SSL_CLIENT_CERT_INFO = *mut HTTP_SSL_CLIENT_CERT_INFO;
-pub const HTTP_RECEIVE_SECURE_CHANNEL_TOKEN: ::ULONG = 0x1;
-STRUCT!{struct HTTP_SSL_INFO {
-    ServerCertKeySize: ::USHORT,
-    ConnectionKeySize: ::USHORT,
-    ServerCertIssuerSize: ::ULONG,
-    ServerCertSubjectSize: ::ULONG,
-    pServerCertIssuer: ::PCSTR,
-    pServerCertSubject: ::PCSTR,
-    pClientCertInfo: PHTTP_SSL_CLIENT_CERT_INFO,
-    SslClientCertNegotiated: ::ULONG,
-}}
-pub type PHTTP_SSL_INFO = *mut HTTP_SSL_INFO;
-ENUM!{enum HTTP_REQUEST_INFO_TYPE {
-    HttpRequestInfoTypeAuth,
-    HttpRequestInfoTypeChannelBind,
-}}
-STRUCT!{struct HTTP_REQUEST_INFO {
-    InfoType: HTTP_REQUEST_INFO_TYPE,
-    InfoLength: ::ULONG,
-    pInfo: ::PVOID,
-}}
-pub type PHTTP_REQUEST_INFO = *mut HTTP_REQUEST_INFO;
-pub const HTTP_REQUEST_AUTH_FLAG_TOKEN_FOR_CACHED_CRED: ::ULONG = 0x00000001;
-STRUCT!{struct HTTP_REQUEST_AUTH_INFO {
-    AuthStatus: HTTP_AUTH_STATUS,
-    SecStatus: ::SECURITY_STATUS,
-    Flags: ::ULONG,
-    AuthType: HTTP_REQUEST_AUTH_TYPE,
-    AccessToken: ::HANDLE,
-    ContextAttributes: ::ULONG,
-    PackedContextLength: ::ULONG,
-    PackedContextType: ::ULONG,
-    PackedContext: ::PVOID,
-    MutualAuthDataLength: ::ULONG,
-    pMutualAuthData: ::PCHAR,
-    PackageNameLength: ::USHORT,
-    pPackageName: ::PWSTR,
-}}
-pub type PHTTP_REQUEST_AUTH_INFO = *mut HTTP_REQUEST_AUTH_INFO;
-STRUCT!{nodebug struct HTTP_REQUEST_V1 {
-    Flags: ::ULONG,
-    ConnectionId: HTTP_CONNECTION_ID,
-    RequestId: HTTP_REQUEST_ID,
-    UrlContext: HTTP_URL_CONTEXT,
-    Version: HTTP_VERSION,
-    Verb: HTTP_VERB,
-    UnknownVerbLength: ::USHORT,
-    RawUrlLength: ::USHORT,
-    pUnknownVerb: ::PCSTR,
-    pRawUrl: ::PCSTR,
-    CookedUrl: HTTP_COOKED_URL,
-    Address: HTTP_TRANSPORT_ADDRESS,
-    Headers: HTTP_REQUEST_HEADERS,
-    BytesReceived: ::ULONGLONG,
-    EntityChunkCount: ::USHORT,
-    pEntityChunks: PHTTP_DATA_CHUNK,
-    RawConnectionId: HTTP_RAW_CONNECTION_ID,
-    pSslInfo: PHTTP_SSL_INFO,
-}}
-pub type PHTTP_REQUEST_V1 = *mut HTTP_REQUEST_V1;
-STRUCT!{nodebug struct HTTP_REQUEST_V2 {
-    Base: HTTP_REQUEST_V1,
-    RequestInfoCount: ::USHORT,
-    pRequestInfo: PHTTP_REQUEST_INFO,
-}}
-pub type PHTTP_REQUEST_V2 = *mut HTTP_REQUEST_V2;
-pub type HTTP_REQUEST = HTTP_REQUEST_V2;
-pub type PHTTP_REQUEST = *mut HTTP_REQUEST;
-pub const HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS: ::ULONG = 0x00000001;
-pub const HTTP_REQUEST_FLAG_IP_ROUTED: ::ULONG = 0x00000002;
-STRUCT!{nodebug struct HTTP_RESPONSE_V1 {
-    Flags: ::ULONG,
-    Version: HTTP_VERSION,
-    StatusCode: ::USHORT,
-    ReasonLength: ::USHORT,
-    pReason: ::PCSTR,
-    Headers: HTTP_RESPONSE_HEADERS,
-    EntityChunkCount: ::USHORT,
-    pEntityChunks: PHTTP_DATA_CHUNK,
-}}
-pub type PHTTP_RESPONSE_V1 = *mut HTTP_RESPONSE_V1;
-pub const HTTP_RESPONSE_FLAG_MULTIPLE_ENCODINGS_AVAILABLE: ::ULONG = 0x00000001;
-ENUM!{enum HTTP_RESPONSE_INFO_TYPE {
-    HttpResponseInfoTypeMultipleKnownHeaders,
-    HttpResponseInfoTypeAuthenticationProperty,
-    HttpResponseInfoTypeQoSProperty,
-    HttpResponseInfoTypeChannelBind,
-}}
-pub type PHTTP_RESPONSE_INFO_TYPE = *mut HTTP_RESPONSE_INFO_TYPE;
-STRUCT!{struct HTTP_RESPONSE_INFO {
-    Type: HTTP_RESPONSE_INFO_TYPE,
-    Length: ::ULONG,
-    pInfo: ::PVOID,
-}}
-pub type PHTTP_RESPONSE_INFO = *mut HTTP_RESPONSE_INFO;
-pub const HTTP_RESPONSE_INFO_FLAGS_PRESERVE_ORDER: ::ULONG = 0x00000001;
-STRUCT!{struct HTTP_MULTIPLE_KNOWN_HEADERS {
-    HeaderId: HTTP_HEADER_ID,
-    Flags: ::ULONG,
-    KnownHeaderCount: ::USHORT,
-    KnownHeaders: PHTTP_KNOWN_HEADER,
-}}
-pub type PHTTP_MULTIPLE_KNOWN_HEADERS = *mut HTTP_MULTIPLE_KNOWN_HEADERS;
-STRUCT!{nodebug struct HTTP_RESPONSE_V2 {
-    Base: HTTP_RESPONSE_V1,
-    ResponseInfoCount: ::USHORT,
-    pResponseInfo: PHTTP_RESPONSE_INFO,
-}}
-pub type PHTTP_RESPONSE_V2 = *mut HTTP_RESPONSE_V2;
-pub type HTTP_RESPONSE = HTTP_RESPONSE_V2;
-pub type PHTTP_RESPONSE = *mut HTTP_RESPONSE;
-STRUCT!{struct HTTPAPI_VERSION {
-    HttpApiMajorVersion: ::USHORT,
-    HttpApiMinorVersion: ::USHORT,
-}}
-pub type PHTTPAPI_VERSION = *mut HTTPAPI_VERSION;
-pub const HTTPAPI_VERSION_2: HTTPAPI_VERSION = HTTPAPI_VERSION {
-    HttpApiMajorVersion: 2, HttpApiMinorVersion: 0,
-};
-pub const HTTPAPI_VERSION_1: HTTPAPI_VERSION = HTTPAPI_VERSION {
-    HttpApiMajorVersion: 1, HttpApiMinorVersion: 0,
-};
-#[inline] #[allow(dead_code)]
-pub fn HTTPAPI_EQUAL_VERSION(version: HTTPAPI_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.HttpApiMajorVersion == major && version.HttpApiMinorVersion == minor
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTPAPI_GREATER_VERSION(version: HTTPAPI_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.HttpApiMajorVersion > major ||
-    (version.HttpApiMajorVersion == major && version.HttpApiMinorVersion > minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTPAPI_LESS_VERSION(version: HTTPAPI_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.HttpApiMajorVersion < major ||
-    (version.HttpApiMajorVersion == major && version.HttpApiMinorVersion < minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTPAPI_VERSION_GREATER_OR_EQUAL(
-    version: HTTPAPI_VERSION, major: ::USHORT, minor: ::USHORT
-) -> bool {
-    !HTTPAPI_LESS_VERSION(version, major, minor)
-}
-ENUM!{enum HTTP_CACHE_POLICY_TYPE {
-    HttpCachePolicyNocache,
-    HttpCachePolicyUserInvalidates,
-    HttpCachePolicyTimeToLive,
-    HttpCachePolicyMaximum,
-}}
-pub type PHTTP_CACHE_POLICY_TYPE = *mut HTTP_CACHE_POLICY_TYPE;
-STRUCT!{struct HTTP_CACHE_POLICY {
-    Policy: HTTP_CACHE_POLICY_TYPE,
-    SecondsToLive: ::ULONG,
-}}
-pub type PHTTP_CACHE_POLICY = *mut HTTP_CACHE_POLICY;
-ENUM!{enum HTTP_SERVICE_CONFIG_ID {
-    HttpServiceConfigIPListenList,
-    HttpServiceConfigSSLCertInfo,
-    HttpServiceConfigUrlAclInfo,
-    HttpServiceConfigTimeout,
-    HttpServiceConfigCache,
-    HttpServiceConfigSslSniCertInfo,
-    HttpServiceConfigSslCcsCertInfo,
-    HttpServiceConfigMax,
-}}
-pub type PHTTP_SERVICE_CONFIG_ID = *mut HTTP_SERVICE_CONFIG_ID;
-ENUM!{enum HTTP_SERVICE_CONFIG_QUERY_TYPE {
-    HttpServiceConfigQueryExact,
-    HttpServiceConfigQueryNext,
-    HttpServiceConfigQueryMax,
-}}
-pub type PHTTP_SERVICE_CONFIG_QUERY_TYPE = *mut HTTP_SERVICE_CONFIG_QUERY_TYPE;
-STRUCT!{struct HTTP_SERVICE_CONFIG_SSL_KEY {
-    pIpPort: ::PSOCKADDR,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_KEY = *mut HTTP_SERVICE_CONFIG_SSL_KEY;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_SNI_KEY {
-    IpPort: ::SOCKADDR_STORAGE,
-    Host: ::PWSTR,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_SNI_KEY = *mut HTTP_SERVICE_CONFIG_SSL_SNI_KEY;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_CCS_KEY {
-    LocalAddress: ::SOCKADDR_STORAGE,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_CCS_KEY = *mut HTTP_SERVICE_CONFIG_SSL_CCS_KEY;
-STRUCT!{struct HTTP_SERVICE_CONFIG_SSL_PARAM {
-    SslHashLength: ::ULONG,
-    pSslHash: ::PVOID,
-    AppId: ::GUID,
-    pSslCertStoreName: ::PWSTR,
-    DefaultCertCheckMode: ::DWORD,
-    DefaultRevocationFreshnessTime: ::DWORD,
-    DefaultRevocationUrlRetrievalTimeout: ::DWORD,
-    pDefaultSslCtlIdentifier: ::PWSTR,
-    pDefaultSslCtlStoreName: ::PWSTR,
-    DefaultFlags: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_PARAM = *mut HTTP_SERVICE_CONFIG_SSL_PARAM;
-pub const HTTP_SERVICE_CONFIG_SSL_FLAG_USE_DS_MAPPER: ::DWORD = 0x00000001;
-pub const HTTP_SERVICE_CONFIG_SSL_FLAG_NEGOTIATE_CLIENT_CERT: ::DWORD = 0x00000002;
-pub const HTTP_SERVICE_CONFIG_SSL_FLAG_NO_RAW_FILTER: ::DWORD = 0x00000004;
-STRUCT!{struct HTTP_SERVICE_CONFIG_SSL_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_SSL_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_SET = *mut HTTP_SERVICE_CONFIG_SSL_SET;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_SNI_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_SNI_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_SSL_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_SNI_SET = *mut HTTP_SERVICE_CONFIG_SSL_SNI_SET;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_CCS_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_CCS_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_SSL_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_CCS_SET = *mut HTTP_SERVICE_CONFIG_SSL_CCS_SET;
-STRUCT!{struct HTTP_SERVICE_CONFIG_SSL_QUERY {
-    QueryDesc: HTTP_SERVICE_CONFIG_QUERY_TYPE,
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_KEY,
-    dwToken: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_QUERY = *mut HTTP_SERVICE_CONFIG_SSL_QUERY;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_SNI_QUERY {
-    QueryDesc: HTTP_SERVICE_CONFIG_QUERY_TYPE,
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_SNI_KEY,
-    dwToken: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_SNI_QUERY = *mut HTTP_SERVICE_CONFIG_SSL_SNI_QUERY;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_CCS_QUERY {
-    QueryDesc: HTTP_SERVICE_CONFIG_QUERY_TYPE,
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_CCS_KEY,
-    dwToken: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_CCS_QUERY = *mut HTTP_SERVICE_CONFIG_SSL_CCS_QUERY;
-STRUCT!{struct HTTP_SERVICE_CONFIG_IP_LISTEN_PARAM {
-    AddrLength: ::USHORT,
-    pAddress: ::PSOCKADDR,
-}}
-pub type PHTTP_SERVICE_CONFIG_IP_LISTEN_PARAM = *mut HTTP_SERVICE_CONFIG_IP_LISTEN_PARAM;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_IP_LISTEN_QUERY {
-    AddrCount: ::ULONG,
-    AddrList: [::SOCKADDR_STORAGE; ::ANYSIZE_ARRAY],
-}}
-pub type PHTTP_SERVICE_CONFIG_IP_LISTEN_QUERY = *mut HTTP_SERVICE_CONFIG_IP_LISTEN_QUERY;
-STRUCT!{struct HTTP_SERVICE_CONFIG_URLACL_KEY {
-    pUrlPrefix: ::PWSTR,
-}}
-pub type PHTTP_SERVICE_CONFIG_URLACL_KEY = *mut HTTP_SERVICE_CONFIG_URLACL_KEY;
-STRUCT!{struct HTTP_SERVICE_CONFIG_URLACL_PARAM {
-    pStringSecurityDescriptor: ::PWSTR,
-}}
-pub type PHTTP_SERVICE_CONFIG_URLACL_PARAM = *mut HTTP_SERVICE_CONFIG_URLACL_PARAM;
-STRUCT!{struct HTTP_SERVICE_CONFIG_URLACL_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_URLACL_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_URLACL_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_URLACL_SET = *mut HTTP_SERVICE_CONFIG_URLACL_SET;
-STRUCT!{struct HTTP_SERVICE_CONFIG_URLACL_QUERY {
-    QueryDesc: HTTP_SERVICE_CONFIG_QUERY_TYPE,
-    KeyDesc: HTTP_SERVICE_CONFIG_URLACL_KEY,
-    dwToken: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_URLACL_QUERY = *mut HTTP_SERVICE_CONFIG_URLACL_QUERY;
-ENUM!{enum HTTP_SERVICE_CONFIG_CACHE_KEY {
-    MaxCacheResponseSize = 0,
-    CacheRangeChunkSize,
-}}
-pub type PHTTP_SERVICE_CONFIG_CACHE_KEY = *mut HTTP_SERVICE_CONFIG_CACHE_KEY;
-pub type HTTP_SERVICE_CONFIG_CACHE_PARAM = ::ULONG;
-pub type PHTTP_SERVICE_CONFIG_CACHE_PARAM = *mut ::ULONG;
-STRUCT!{struct HTTP_SERVICE_CONFIG_CACHE_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_CACHE_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_CACHE_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_CACHE_SET = *mut HTTP_SERVICE_CONFIG_CACHE_SET;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/imm.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/imm.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/imm.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/imm.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub type LPUINT = *mut ::c_uint;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/inaddr.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/inaddr.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/inaddr.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/inaddr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! IPv4 Internet address
-STRUCT!{struct in_addr_S_un_b {
-    s_b1: ::UCHAR,
-    s_b2: ::UCHAR,
-    s_b3: ::UCHAR,
-    s_b4: ::UCHAR,
-}}
-STRUCT!{struct in_addr_S_un_w {
-    s_w1: ::USHORT,
-    s_w2: ::USHORT,
-}}
-STRUCT!{struct in_addr {
-    S_un: ::ULONG,
-}}
-UNION!(in_addr, S_un, S_un_b, S_un_b_mut, in_addr_S_un_b);
-UNION!(in_addr, S_un, S_un_w, S_un_w_mut, in_addr_S_un_w);
-UNION!(in_addr, S_un, S_addr, S_addr_mut, ::ULONG);
-pub type IN_ADDR = in_addr;
-pub type PIN_ADDR = *mut in_addr;
-pub type LPIN_ADDR = *mut in_addr;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/inspectable.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/inspectable.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/inspectable.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/inspectable.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub type LPINSPECTABLE = *mut IInspectable;
-ENUM!{enum TrustLevel {
-    BaseTrust = 0,
-    PartialTrust,
-    FullTrust,
-}}
-RIDL!(
-interface IInspectable(IInspectableVtbl): IUnknown(IUnknownVtbl) {
-    fn GetIids(&mut self, iidCount: *mut ::ULONG, iids: *mut *mut ::IID) -> ::HRESULT,
-    fn GetRuntimeClassName(&mut self, className: *mut ::HSTRING) -> ::HRESULT,
-    fn GetTrustLevel(&mut self, trustLevel: *mut TrustLevel) -> ::HRESULT
-}
-);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ksmedia.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ksmedia.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ksmedia.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ksmedia.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF,
-    0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/libloaderapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/libloaderapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/libloaderapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/libloaderapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-libraryloader-l1
-pub type DLL_DIRECTORY_COOKIE = ::PVOID;
-pub type PDLL_DIRECTORY_COOKIE = *mut ::PVOID;
-pub type ENUMRESLANGPROCA = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPCSTR, lpName: ::LPCSTR, wLanguage: ::WORD, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESLANGPROCW = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPCWSTR, lpName: ::LPCWSTR, wLanguage: ::WORD, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESNAMEPROCA = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPCSTR, lpName: ::LPSTR, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESNAMEPROCW = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPCWSTR, lpName: ::LPWSTR, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESTYPEPROCA = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPSTR, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESTYPEPROCW = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPWSTR, lParam: ::LONG_PTR,
-) -> ::BOOL>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,368 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Types and constants for WinAPI bindings.
-#![allow(bad_style)]
-#![warn(trivial_casts, trivial_numeric_casts)]
-#![warn(unused_qualifications, unused)]
-#![cfg(windows)]
-//-------------------------------------------------------------------------------------------------
-// Imports
-//-------------------------------------------------------------------------------------------------
-pub use std::os::raw::{
-    c_void,
-    c_char,
-    c_schar,
-    c_uchar,
-    c_short,
-    c_ushort,
-    c_int,
-    c_uint,
-    c_long,
-    c_ulong,
-    c_longlong,
-    c_ulonglong,
-    c_float,
-    c_double,
-};
-pub use activation::*;
-pub use audioclient::*;
-pub use audiosessiontypes::*;
-pub use basetsd::*;
-pub use bcrypt::*;
-pub use cfg::*;
-pub use cfgmgr32::*;
-pub use combaseapi::*;
-pub use commctrl::*;
-pub use commdlg::*;
-pub use corsym::*;
-pub use d2d1::*;
-pub use d2dbasetypes::*;
-pub use d3d9::*;
-pub use d3d9caps::*;
-pub use d3d9types::*;
-pub use d3d11::*;
-pub use d3d10shader::*;
-pub use d3d11shader::*;
-pub use d3d12::*;
-pub use d3d12sdklayers::*;
-pub use d3d12shader::*;
-pub use d3dcommon::*;
-pub use d3dcompiler::*;
-pub use dbghelp::*;
-pub use dcommon::*;
-pub use devpropdef::*;
-pub use docobj::*;
-pub use dpapi::*;
-pub use dsgetdc::*;
-pub use dsound::*;
-pub use dsrole::*;
-pub use dwmapi::*;
-pub use dwrite::*;
-pub use dxgi::*;
-pub use dxgi1_2::*;
-pub use dxgi1_3::*;
-pub use dxgi1_4::*;
-pub use dxgiformat::*;
-pub use dxgitype::*;
-pub use errhandlingapi::*;
-pub use excpt::*;
-pub use fileapi::*;
-pub use gl::*;
-pub use guiddef::*;
-pub use heapapi::*;
-pub use hidclass::*;
-pub use hidpi::*;
-pub use hidsdi::*;
-pub use hidusage::*;
-pub use hstring::*;
-pub use http::*;
-pub use imm::*;
-pub use inaddr::*;
-pub use inspectable::*;
-pub use ksmedia::*;
-pub use libloaderapi::*;
-pub use lmaccess::*;
-pub use lmcons::*;
-pub use lmdfs::*;
-pub use lmerrlog::*;
-pub use lmjoin::*;
-pub use lsalookup::*;
-pub use memoryapi::*;
-pub use minschannel::*;
-pub use minwinbase::*;
-pub use minwindef::*;
-pub use mmdeviceapi::*;
-pub use mmreg::*;
-pub use mmsystem::*;
-pub use mscat::*;
-pub use mssip::*;
-pub use nb30::*;
-pub use ncrypt::*;
-pub use ntdef::*;
-pub use ntsecapi::*;
-pub use ntstatus::*;
-pub use oaidl::*;
-pub use objbase::*;
-pub use objidl::*;
-pub use objidlbase::*;
-pub use olectl::*;
-pub use pdh::*;
-pub use playsoundapi::*;
-pub use processsnapshot::*;
-pub use processthreadsapi::*;
-pub use propidl::*;
-pub use propsys::*;
-pub use prsht::*;
-pub use psapi::*;
-pub use qos::*;
-pub use reason::*;
-pub use restrictederrorinfo::*;
-pub use roapi::*;
-pub use roerrorapi::*;
-pub use rpc::*;
-pub use rpcdce::*;
-pub use sapi::*;
-pub use schannel::*;
-pub use servprov::*;
-pub use setupapi::*;
-pub use shellapi::*;
-pub use shellscalingapi::*;
-pub use shlguid::*;
-pub use shlobj::*;
-pub use shobjidl::*;
-pub use shtypes::*;
-pub use spapidef::*;
-pub use sqltypes::*;
-pub use sspi::*;
-pub use strmif::*;
-pub use subauth::*;
-pub use synchapi::*;
-pub use sysinfoapi::*;
-pub use threadpoolapi::*;
-pub use timezoneapi::*;
-pub use tlhelp32::*;
-pub use unknwnbase::*;
-pub use urlhist::*;
-pub use urlmon::*;
-pub use usb::*;
-pub use usbspec::*;
-pub use usp10::*;
-pub use vadefs::*;
-pub use vsbackup::*;
-pub use vss::*;
-pub use vsserror::*;
-pub use vswriter::*;
-pub use werapi::*;
-pub use winbase::*;
-pub use wincon::*;
-pub use wincred::*;
-pub use wincrypt::*;
-pub use windowsx::*;
-pub use windef::*;
-pub use windowscodecs::*;
-pub use winerror::*;
-pub use winevt::*;
-pub use wingdi::*;
-pub use winhttp::*;
-pub use winioctl::*;
-pub use winnetwk::*;
-pub use winnls::*;
-pub use winnt::*;
-pub use winreg::*;
-pub use winscard::*;
-pub use winsmcrd::*;
-pub use winsock2::*;
-pub use winspool::*;
-pub use winstring::*;
-pub use winsvc::*;
-pub use winusb::*;
-pub use winusbio::*;
-pub use winuser::*;
-pub use ws2def::*;
-pub use ws2ipdef::*;
-pub use ws2spi::*;
-pub use ws2tcpip::*;
-pub use wtypes::*;
-pub use wtypesbase::*;
-pub use xinput::*;
-//-------------------------------------------------------------------------------------------------
-// Modules
-//-------------------------------------------------------------------------------------------------
-#[macro_use] mod macros;
-pub mod activation;
-pub mod audioclient;
-pub mod audiosessiontypes;
-pub mod basetsd;
-pub mod bcrypt;
-pub mod cfg;
-pub mod cfgmgr32;
-pub mod combaseapi;
-pub mod commctrl;
-pub mod commdlg;
-pub mod corsym;
-pub mod d2d1;
-pub mod d2dbasetypes;
-pub mod d3d9;
-pub mod d3d9caps;
-pub mod d3d9types;
-pub mod d3d11;
-pub mod d3d10shader;
-pub mod d3d11shader;
-pub mod d3d12;
-pub mod d3d12sdklayers;
-pub mod d3d12shader;
-pub mod d3dcommon;
-pub mod d3dcompiler;
-pub mod dbghelp;
-pub mod dcommon;
-pub mod devpropdef;
-pub mod docobj;
-pub mod dpapi;
-pub mod dsgetdc;
-pub mod dsound;
-pub mod dsrole;
-pub mod dwmapi;
-pub mod dwrite;
-pub mod dxgi;
-pub mod dxgi1_2;
-pub mod dxgi1_3;
-pub mod dxgi1_4;
-pub mod dxgiformat;
-pub mod dxgitype;
-pub mod errhandlingapi;
-pub mod excpt;
-pub mod fileapi;
-pub mod gl;
-pub mod guiddef;
-pub mod heapapi;
-pub mod hidclass;
-pub mod hidpi;
-pub mod hidsdi;
-pub mod hidusage;
-pub mod hstring;
-pub mod http;
-pub mod imm;
-pub mod inaddr;
-pub mod inspectable;
-pub mod ksmedia;
-pub mod libloaderapi;
-pub mod lmaccess;
-pub mod lmcons;
-pub mod lmdfs;
-pub mod lmerrlog;
-pub mod lmjoin;
-pub mod lsalookup;
-pub mod memoryapi;
-pub mod minschannel;
-pub mod minwinbase;
-pub mod minwindef;
-pub mod mmdeviceapi;
-pub mod mmreg;
-pub mod mmsystem;
-pub mod mscat;
-pub mod mssip;
-pub mod nb30;
-pub mod ncrypt;
-pub mod ntdef;
-pub mod ntsecapi;
-pub mod ntstatus;
-pub mod oaidl;
-pub mod objbase;
-pub mod objidl;
-pub mod objidlbase;
-pub mod olectl;
-pub mod pdh;
-pub mod playsoundapi;
-pub mod processsnapshot;
-pub mod processthreadsapi;
-pub mod propidl;
-pub mod propsys;
-pub mod prsht;
-pub mod psapi;
-pub mod qos;
-pub mod reason;
-pub mod restrictederrorinfo;
-pub mod roapi;
-pub mod roerrorapi;
-pub mod rpc;
-pub mod rpcdce;
-pub mod sapi;
-pub mod schannel;
-pub mod servprov;
-pub mod setupapi;
-pub mod shellapi;
-pub mod shellscalingapi;
-pub mod shlguid;
-pub mod shlobj;
-pub mod shobjidl;
-pub mod shtypes;
-pub mod spapidef;
-pub mod sqltypes;
-pub mod sspi;
-pub mod strmif;
-pub mod subauth;
-pub mod synchapi;
-pub mod sysinfoapi;
-pub mod threadpoolapi;
-pub mod timezoneapi;
-pub mod tlhelp32;
-pub mod unknwnbase;
-pub mod urlhist;
-pub mod urlmon;
-pub mod usb;
-pub mod usbspec;
-pub mod usp10;
-pub mod vadefs;
-pub mod vsbackup;
-pub mod vss;
-pub mod vsserror;
-pub mod vswriter;
-pub mod werapi;
-pub mod winbase;
-pub mod wincon;
-pub mod wincred;
-pub mod wincrypt;
-pub mod windef;
-pub mod windowscodecs;
-pub mod windowsx;
-pub mod winerror;
-pub mod winevt;
-pub mod wingdi;
-pub mod winhttp;
-pub mod winioctl;
-pub mod winnetwk;
-pub mod winnls;
-pub mod winnt;
-pub mod winreg;
-pub mod winscard;
-pub mod winsmcrd;
-pub mod winsock2;
-pub mod winspool;
-pub mod winstring;
-pub mod winsvc;
-pub mod winusb;
-pub mod winusbio;
-pub mod winuser;
-pub mod ws2def;
-pub mod ws2ipdef;
-pub mod ws2spi;
-pub mod ws2tcpip;
-pub mod wtypes;
-pub mod wtypesbase;
-pub mod xinput;
-//-------------------------------------------------------------------------------------------------
-// Primitive types not provided by std
-//-------------------------------------------------------------------------------------------------
-pub type __int8 = i8;
-pub type __uint8 = u8;
-pub type __int16 = i16;
-pub type __uint16 = u16;
-pub type __int32 = i32;
-pub type __uint32 = u32;
-pub type __int64 = i64;
-pub type __uint64 = u64;
-pub type wchar_t = c_ushort;
-#[cfg(target_arch = "x86")]
-pub type size_t = c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type size_t = __uint64;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmaccess.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmaccess.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmaccess.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmaccess.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,853 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// This file contains structures, function prototypes, and definitions
-// for the NetUser, NetUserModals, NetGroup, NetAccess, and NetLogon API.
-STRUCT!{struct USER_INFO_0 {
-    usri0_name: ::LPWSTR,
-}}
-pub type PUSER_INFO_0 = *mut USER_INFO_0;
-pub type LPUSER_INFO_0 = *mut USER_INFO_0;
-STRUCT!{struct USER_INFO_1 {
-    usri1_name: ::LPWSTR,
-    usri1_password: ::LPWSTR,
-    usri1_password_age: ::DWORD,
-    usri1_priv: ::DWORD,
-    usri1_home_dir: ::LPWSTR,
-    usri1_comment: ::LPWSTR,
-    usri1_flags: ::DWORD,
-    usri1_script_path: ::LPWSTR,
-}}
-pub type PUSER_INFO_1 = *mut USER_INFO_1;
-pub type LPUSER_INFO_1 = *mut USER_INFO_1;
-STRUCT!{struct USER_INFO_2 {
-    usri2_name: ::LPWSTR,
-    usri2_password: ::LPWSTR,
-    usri2_password_age: ::DWORD,
-    usri2_priv: ::DWORD,
-    usri2_home_dir: ::LPWSTR,
-    usri2_comment: ::LPWSTR,
-    usri2_flags: ::DWORD,
-    usri2_script_path: ::LPWSTR,
-    usri2_auth_flags: ::DWORD,
-    usri2_full_name: ::LPWSTR,
-    usri2_usr_comment: ::LPWSTR,
-    usri2_parms: ::LPWSTR,
-    usri2_workstations: ::LPWSTR,
-    usri2_last_logon: ::DWORD,
-    usri2_last_logoff: ::DWORD,
-    usri2_acct_expires: ::DWORD,
-    usri2_max_storage: ::DWORD,
-    usri2_units_per_week: ::DWORD,
-    usri2_logon_hours: ::PBYTE,
-    usri2_bad_pw_count: ::DWORD,
-    usri2_num_logons: ::DWORD,
-    usri2_logon_server: ::LPWSTR,
-    usri2_country_code: ::DWORD,
-    usri2_code_page: ::DWORD,
-}}
-pub type PUSER_INFO_2 = *mut USER_INFO_2;
-pub type LPUSER_INFO_2 = *mut USER_INFO_2;
-STRUCT!{struct USER_INFO_3 {
-    usri3_name: ::LPWSTR,
-    usri3_password: ::LPWSTR,
-    usri3_password_age: ::DWORD,
-    usri3_priv: ::DWORD,
-    usri3_home_dir: ::LPWSTR,
-    usri3_comment: ::LPWSTR,
-    usri3_flags: ::DWORD,
-    usri3_script_path: ::LPWSTR,
-    usri3_auth_flags: ::DWORD,
-    usri3_full_name: ::LPWSTR,
-    usri3_usr_comment: ::LPWSTR,
-    usri3_parms: ::LPWSTR,
-    usri3_workstations: ::LPWSTR,
-    usri3_last_logon: ::DWORD,
-    usri3_last_logoff: ::DWORD,
-    usri3_acct_expires: ::DWORD,
-    usri3_max_storage: ::DWORD,
-    usri3_units_per_week: ::DWORD,
-    usri3_logon_hours: ::PBYTE,
-    usri3_bad_pw_count: ::DWORD,
-    usri3_num_logons: ::DWORD,
-    usri3_logon_server: ::LPWSTR,
-    usri3_country_code: ::DWORD,
-    usri3_code_page: ::DWORD,
-    usri3_user_id: ::DWORD,
-    usri3_primary_group_id: ::DWORD,
-    usri3_profile: ::LPWSTR,
-    usri3_home_dir_drive: ::LPWSTR,
-    usri3_password_expired: ::DWORD,
-}}
-pub type PUSER_INFO_3 = *mut USER_INFO_3;
-pub type LPUSER_INFO_3 = *mut USER_INFO_3;
-STRUCT!{struct USER_INFO_4 {
-    usri4_name: ::LPWSTR,
-    usri4_password: ::LPWSTR,
-    usri4_password_age: ::DWORD,
-    usri4_priv: ::DWORD,
-    usri4_home_dir: ::LPWSTR,
-    usri4_comment: ::LPWSTR,
-    usri4_flags: ::DWORD,
-    usri4_script_path: ::LPWSTR,
-    usri4_auth_flags: ::DWORD,
-    usri4_full_name: ::LPWSTR,
-    usri4_usr_comment: ::LPWSTR,
-    usri4_parms: ::LPWSTR,
-    usri4_workstations: ::LPWSTR,
-    usri4_last_logon: ::DWORD,
-    usri4_last_logoff: ::DWORD,
-    usri4_acct_expires: ::DWORD,
-    usri4_max_storage: ::DWORD,
-    usri4_units_per_week: ::DWORD,
-    usri4_logon_hours: ::PBYTE,
-    usri4_bad_pw_count: ::DWORD,
-    usri4_num_logons: ::DWORD,
-    usri4_logon_server: ::LPWSTR,
-    usri4_country_code: ::DWORD,
-    usri4_code_page: ::DWORD,
-    usri4_user_sid: ::PSID,
-    usri4_primary_group_id: ::DWORD,
-    usri4_profile: ::LPWSTR,
-    usri4_home_dir_drive: ::LPWSTR,
-    usri4_password_expired: ::DWORD,
-}}
-pub type PUSER_INFO_4 = *mut USER_INFO_4;
-pub type LPUSER_INFO_4 = *mut USER_INFO_4;
-STRUCT!{struct USER_INFO_10 {
-    usri10_name: ::LPWSTR,
-    usri10_comment: ::LPWSTR,
-    usri10_usr_comment: ::LPWSTR,
-    usri10_full_name: ::LPWSTR,
-}}
-pub type PUSER_INFO_10 = *mut USER_INFO_10;
-pub type LPUSER_INFO_10 = *mut USER_INFO_10;
-STRUCT!{struct USER_INFO_11 {
-    usri11_name: ::LPWSTR,
-    usri11_comment: ::LPWSTR,
-    usri11_usr_comment: ::LPWSTR,
-    usri11_full_name: ::LPWSTR,
-    usri11_priv: ::DWORD,
-    usri11_auth_flags: ::DWORD,
-    usri11_password_age: ::DWORD,
-    usri11_home_dir: ::LPWSTR,
-    usri11_parms: ::LPWSTR,
-    usri11_last_logon: ::DWORD,
-    usri11_last_logoff: ::DWORD,
-    usri11_bad_pw_count: ::DWORD,
-    usri11_num_logons: ::DWORD,
-    usri11_logon_server: ::LPWSTR,
-    usri11_country_code: ::DWORD,
-    usri11_workstations: ::LPWSTR,
-    usri11_max_storage: ::DWORD,
-    usri11_units_per_week: ::DWORD,
-    usri11_logon_hours: ::PBYTE,
-    usri11_code_page: ::DWORD,
-}}
-pub type PUSER_INFO_11 = *mut USER_INFO_11;
-pub type LPUSER_INFO_11 = *mut USER_INFO_11;
-STRUCT!{struct USER_INFO_20 {
-    usri20_name: ::LPWSTR,
-    usri20_full_name: ::LPWSTR,
-    usri20_comment: ::LPWSTR,
-    usri20_flags: ::DWORD,
-    usri20_user_id: ::DWORD,
-}}
-pub type PUSER_INFO_20 = *mut USER_INFO_20;
-pub type LPUSER_INFO_20 = *mut USER_INFO_20;
-STRUCT!{struct USER_INFO_21 {
-    usri21_password: [::BYTE; ::ENCRYPTED_PWLEN],
-}}
-pub type PUSER_INFO_21 = *mut USER_INFO_21;
-pub type LPUSER_INFO_21 = *mut USER_INFO_21;
-STRUCT!{struct USER_INFO_22 {
-    usri22_name: ::LPWSTR,
-    usri22_password: [::BYTE; ::ENCRYPTED_PWLEN],
-    usri22_password_age: ::DWORD,
-    usri22_priv: ::DWORD,
-    usri22_home_dir: ::LPWSTR,
-    usri22_comment: ::LPWSTR,
-    usri22_flags: ::DWORD,
-    usri22_script_path: ::LPWSTR,
-    usri22_auth_flags: ::DWORD,
-    usri22_full_name: ::LPWSTR,
-    usri22_usr_comment: ::LPWSTR,
-    usri22_parms: ::LPWSTR,
-    usri22_workstations: ::LPWSTR,
-    usri22_last_logon: ::DWORD,
-    usri22_last_logoff: ::DWORD,
-    usri22_acct_expires: ::DWORD,
-    usri22_max_storage: ::DWORD,
-    usri22_units_per_week: ::DWORD,
-    usri22_logon_hours: ::PBYTE,
-    usri22_bad_pw_count: ::DWORD,
-    usri22_num_logons: ::DWORD,
-    usri22_logon_server: ::LPWSTR,
-    usri22_country_code: ::DWORD,
-    usri22_code_page: ::DWORD,
-}}
-pub type PUSER_INFO_22 = *mut USER_INFO_22;
-pub type LPUSER_INFO_22 = *mut USER_INFO_22;
-STRUCT!{struct USER_INFO_23 {
-    usri23_name: ::LPWSTR,
-    usri23_full_name: ::LPWSTR,
-    usri23_comment: ::LPWSTR,
-    usri23_flags: ::DWORD,
-    usri23_user_sid: ::PSID,
-}}
-pub type PUSER_INFO_23 = *mut USER_INFO_23;
-pub type LPUSER_INFO_23 = *mut USER_INFO_23;
-STRUCT!{struct USER_INFO_24 {
-    usri24_internet_identity: ::BOOL,
-    usri24_flags: ::DWORD,
-    usri24_internet_provider_name: ::LPWSTR,
-    usri24_internet_principal_name: ::LPWSTR,
-    usri24_user_sid: ::PSID,
-}}
-pub type PUSER_INFO_24 = *mut USER_INFO_24;
-pub type LPUSER_INFO_24 = *mut USER_INFO_24;
-STRUCT!{struct USER_INFO_1003 {
-    usri1003_password: ::LPWSTR,
-}}
-pub type PUSER_INFO_1003 = *mut USER_INFO_1003;
-pub type LPUSER_INFO_1003 = *mut USER_INFO_1003;
-STRUCT!{struct USER_INFO_1005 {
-    usri1005_priv: ::DWORD,
-}}
-pub type PUSER_INFO_1005 = *mut USER_INFO_1005;
-pub type LPUSER_INFO_1005 = *mut USER_INFO_1005;
-STRUCT!{struct USER_INFO_1006 {
-    usri1006_home_dir: ::LPWSTR,
-}}
-pub type PUSER_INFO_1006 = *mut USER_INFO_1006;
-pub type LPUSER_INFO_1006 = *mut USER_INFO_1006;
-STRUCT!{struct USER_INFO_1007 {
-    usri1007_comment: ::LPWSTR,
-}}
-pub type PUSER_INFO_1007 = *mut USER_INFO_1007;
-pub type LPUSER_INFO_1007 = *mut USER_INFO_1007;
-STRUCT!{struct USER_INFO_1008 {
-    usri1008_flags: ::DWORD,
-}}
-pub type PUSER_INFO_1008 = *mut USER_INFO_1008;
-pub type LPUSER_INFO_1008 = *mut USER_INFO_1008;
-STRUCT!{struct USER_INFO_1009 {
-    usri1009_script_path: ::LPWSTR,
-}}
-pub type PUSER_INFO_1009 = *mut USER_INFO_1009;
-pub type LPUSER_INFO_1009 = *mut USER_INFO_1009;
-STRUCT!{struct USER_INFO_1010 {
-    usri1010_auth_flags: ::DWORD,
-}}
-pub type PUSER_INFO_1010 = *mut USER_INFO_1010;
-pub type LPUSER_INFO_1010 = *mut USER_INFO_1010;
-STRUCT!{struct USER_INFO_1011 {
-    usri1011_full_name: ::LPWSTR,
-}}
-pub type PUSER_INFO_1011 = *mut USER_INFO_1011;
-pub type LPUSER_INFO_1011 = *mut USER_INFO_1011;
-STRUCT!{struct USER_INFO_1012 {
-    usri1012_usr_comment: ::LPWSTR,
-}}
-pub type PUSER_INFO_1012 = *mut USER_INFO_1012;
-pub type LPUSER_INFO_1012 = *mut USER_INFO_1012;
-STRUCT!{struct USER_INFO_1013 {
-    usri1013_parms: ::LPWSTR,
-}}
-pub type PUSER_INFO_1013 = *mut USER_INFO_1013;
-pub type LPUSER_INFO_1013 = *mut USER_INFO_1013;
-STRUCT!{struct USER_INFO_1014 {
-    usri1014_workstations: ::LPWSTR,
-}}
-pub type PUSER_INFO_1014 = *mut USER_INFO_1014;
-pub type LPUSER_INFO_1014 = *mut USER_INFO_1014;
-STRUCT!{struct USER_INFO_1017 {
-    usri1017_acct_expires: ::DWORD,
-}}
-pub type PUSER_INFO_1017 = *mut USER_INFO_1017;
-pub type LPUSER_INFO_1017 = *mut USER_INFO_1017;
-STRUCT!{struct USER_INFO_1018 {
-    usri1018_max_storage: ::DWORD,
-}}
-pub type PUSER_INFO_1018 = *mut USER_INFO_1018;
-pub type LPUSER_INFO_1018 = *mut USER_INFO_1018;
-STRUCT!{struct USER_INFO_1020 {
-    usri1020_units_per_week: ::DWORD,
-    usri1020_logon_hours: ::LPBYTE,
-}}
-pub type PUSER_INFO_1020 = *mut USER_INFO_1020;
-pub type LPUSER_INFO_1020 = *mut USER_INFO_1020;
-STRUCT!{struct USER_INFO_1023 {
-    usri1023_logon_server: ::LPWSTR,
-}}
-pub type PUSER_INFO_1023 = *mut USER_INFO_1023;
-pub type LPUSER_INFO_1023 = *mut USER_INFO_1023;
-STRUCT!{struct USER_INFO_1024 {
-    usri1024_country_code: ::DWORD,
-}}
-pub type PUSER_INFO_1024 = *mut USER_INFO_1024;
-pub type LPUSER_INFO_1024 = *mut USER_INFO_1024;
-STRUCT!{struct USER_INFO_1025 {
-    usri1025_code_page: ::DWORD,
-}}
-pub type PUSER_INFO_1025 = *mut USER_INFO_1025;
-pub type LPUSER_INFO_1025 = *mut USER_INFO_1025;
-STRUCT!{struct USER_INFO_1051 {
-    usri1051_primary_group_id: ::DWORD,
-}}
-pub type PUSER_INFO_1051 = *mut USER_INFO_1051;
-pub type LPUSER_INFO_1051 = *mut USER_INFO_1051;
-STRUCT!{struct USER_INFO_1052 {
-    usri1052_profile: ::LPWSTR,
-}}
-pub type PUSER_INFO_1052 = *mut USER_INFO_1052;
-pub type LPUSER_INFO_1052 = *mut USER_INFO_1052;
-STRUCT!{struct USER_INFO_1053 {
-    usri1053_home_dir_drive: ::LPWSTR,
-}}
-pub type PUSER_INFO_1053 = *mut USER_INFO_1053;
-pub type LPUSER_INFO_1053 = *mut USER_INFO_1053;
-STRUCT!{struct USER_MODALS_INFO_0 {
-    usrmod0_min_passwd_len: ::DWORD,
-    usrmod0_max_passwd_age: ::DWORD,
-    usrmod0_min_passwd_age: ::DWORD,
-    usrmod0_force_logoff: ::DWORD,
-    usrmod0_password_hist_len: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_0 = *mut USER_MODALS_INFO_0;
-pub type LPUSER_MODALS_INFO_0 = *mut USER_MODALS_INFO_0;
-STRUCT!{struct USER_MODALS_INFO_1 {
-    usrmod1_role: ::DWORD,
-    usrmod1_primary: ::LPWSTR,
-}}
-pub type PUSER_MODALS_INFO_1 = *mut USER_MODALS_INFO_1;
-pub type LPUSER_MODALS_INFO_1 = *mut USER_MODALS_INFO_1;
-STRUCT!{struct USER_MODALS_INFO_2 {
-    usrmod2_domain_name: ::LPWSTR,
-    usrmod2_domain_id: ::PSID,
-}}
-pub type PUSER_MODALS_INFO_2 = *mut USER_MODALS_INFO_2;
-pub type LPUSER_MODALS_INFO_2 = *mut USER_MODALS_INFO_2;
-STRUCT!{struct USER_MODALS_INFO_3 {
-    usrmod3_lockout_duration: ::DWORD,
-    usrmod3_lockout_observation_window: ::DWORD,
-    usrmod3_lockout_threshold: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_3 = *mut USER_MODALS_INFO_3;
-pub type LPUSER_MODALS_INFO_3 = *mut USER_MODALS_INFO_3;
-STRUCT!{struct USER_MODALS_INFO_1001 {
-    usrmod1001_min_passwd_len: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1001 = *mut USER_MODALS_INFO_1001;
-pub type LPUSER_MODALS_INFO_1001 = *mut USER_MODALS_INFO_1001;
-STRUCT!{struct USER_MODALS_INFO_1002 {
-    usrmod1002_max_passwd_age: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1002 = *mut USER_MODALS_INFO_1002;
-pub type LPUSER_MODALS_INFO_1002 = *mut USER_MODALS_INFO_1002;
-STRUCT!{struct USER_MODALS_INFO_1003 {
-    usrmod1003_min_passwd_age: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1003 = *mut USER_MODALS_INFO_1003;
-pub type LPUSER_MODALS_INFO_1003 = *mut USER_MODALS_INFO_1003;
-STRUCT!{struct USER_MODALS_INFO_1004 {
-    usrmod1004_force_logoff: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1004 = *mut USER_MODALS_INFO_1004;
-pub type LPUSER_MODALS_INFO_1004 = *mut USER_MODALS_INFO_1004;
-STRUCT!{struct USER_MODALS_INFO_1005 {
-    usrmod1005_password_hist_len: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1005 = *mut USER_MODALS_INFO_1005;
-pub type LPUSER_MODALS_INFO_1005 = *mut USER_MODALS_INFO_1005;
-STRUCT!{struct USER_MODALS_INFO_1006 {
-    usrmod1006_role: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1006 = *mut USER_MODALS_INFO_1006;
-pub type LPUSER_MODALS_INFO_1006 = *mut USER_MODALS_INFO_1006;
-STRUCT!{struct USER_MODALS_INFO_1007 {
-    usrmod1007_primary: ::LPWSTR,
-}}
-pub type PUSER_MODALS_INFO_1007 = *mut USER_MODALS_INFO_1007;
-pub type LPUSER_MODALS_INFO_1007 = *mut USER_MODALS_INFO_1007;
-pub const UF_SCRIPT: ::DWORD = 0x0001;
-pub const UF_ACCOUNTDISABLE: ::DWORD = 0x0002;
-pub const UF_HOMEDIR_REQUIRED: ::DWORD = 0x0008;
-pub const UF_LOCKOUT: ::DWORD = 0x0010;
-pub const UF_PASSWD_NOTREQD: ::DWORD = 0x0020;
-pub const UF_PASSWD_CANT_CHANGE: ::DWORD = 0x0040;
-pub const UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED: ::DWORD = 0x0080;
-pub const UF_TEMP_DUPLICATE_ACCOUNT: ::DWORD = 0x0100;
-pub const UF_NORMAL_ACCOUNT: ::DWORD = 0x0200;
-pub const UF_INTERDOMAIN_TRUST_ACCOUNT: ::DWORD = 0x0800;
-pub const UF_WORKSTATION_TRUST_ACCOUNT: ::DWORD = 0x1000;
-pub const UF_SERVER_TRUST_ACCOUNT: ::DWORD = 0x2000;
-pub const UF_MACHINE_ACCOUNT_MASK: ::DWORD = UF_INTERDOMAIN_TRUST_ACCOUNT
-    | UF_WORKSTATION_TRUST_ACCOUNT | UF_SERVER_TRUST_ACCOUNT;
-pub const UF_ACCOUNT_TYPE_MASK: ::DWORD = UF_TEMP_DUPLICATE_ACCOUNT | UF_NORMAL_ACCOUNT
-    | UF_INTERDOMAIN_TRUST_ACCOUNT |  UF_WORKSTATION_TRUST_ACCOUNT |  UF_SERVER_TRUST_ACCOUNT;
-pub const UF_DONT_EXPIRE_PASSWD: ::DWORD = 0x10000;
-pub const UF_MNS_LOGON_ACCOUNT: ::DWORD = 0x20000;
-pub const UF_SMARTCARD_REQUIRED: ::DWORD = 0x40000;
-pub const UF_TRUSTED_FOR_DELEGATION: ::DWORD = 0x80000;
-pub const UF_NOT_DELEGATED: ::DWORD = 0x100000;
-pub const UF_USE_DES_KEY_ONLY: ::DWORD = 0x200000;
-pub const UF_DONT_REQUIRE_PREAUTH: ::DWORD = 0x400000;
-pub const UF_PASSWORD_EXPIRED: ::DWORD = 0x800000;
-pub const UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION: ::DWORD = 0x1000000;
-pub const UF_NO_AUTH_DATA_REQUIRED: ::DWORD = 0x2000000;
-pub const UF_PARTIAL_SECRETS_ACCOUNT: ::DWORD = 0x4000000;
-pub const UF_USE_AES_KEYS: ::DWORD = 0x8000000;
-pub const UF_SETTABLE_BITS: ::DWORD = UF_SCRIPT |  UF_ACCOUNTDISABLE |  UF_LOCKOUT
-    | UF_HOMEDIR_REQUIRED | UF_PASSWD_NOTREQD | UF_PASSWD_CANT_CHANGE | UF_ACCOUNT_TYPE_MASK
-    | UF_DONT_EXPIRE_PASSWD | UF_MNS_LOGON_ACCOUNT | UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED
-    | UF_SMARTCARD_REQUIRED | UF_TRUSTED_FOR_DELEGATION | UF_NOT_DELEGATED | UF_USE_DES_KEY_ONLY
-    | UF_DONT_REQUIRE_PREAUTH | UF_PASSWORD_EXPIRED | UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION
-    | UF_NO_AUTH_DATA_REQUIRED | UF_USE_AES_KEYS | UF_PARTIAL_SECRETS_ACCOUNT;
-pub const FILTER_TEMP_DUPLICATE_ACCOUNT: ::DWORD = 0x0001;
-pub const FILTER_NORMAL_ACCOUNT: ::DWORD = 0x0002;
-pub const FILTER_INTERDOMAIN_TRUST_ACCOUNT: ::DWORD = 0x0008;
-pub const FILTER_WORKSTATION_TRUST_ACCOUNT: ::DWORD = 0x0010;
-pub const FILTER_SERVER_TRUST_ACCOUNT: ::DWORD = 0x0020;
-pub const LG_INCLUDE_INDIRECT: ::DWORD = 0x0001;
-pub const AF_OP_PRINT: ::DWORD = 0x1;
-pub const AF_OP_COMM: ::DWORD = 0x2;
-pub const AF_OP_SERVER: ::DWORD = 0x4;
-pub const AF_OP_ACCOUNTS: ::DWORD = 0x8;
-pub const AF_SETTABLE_BITS: ::DWORD = AF_OP_PRINT | AF_OP_COMM | AF_OP_SERVER | AF_OP_ACCOUNTS;
-pub const UAS_ROLE_STANDALONE: ::DWORD = 0;
-pub const UAS_ROLE_MEMBER: ::DWORD = 1;
-pub const UAS_ROLE_BACKUP: ::DWORD = 2;
-pub const UAS_ROLE_PRIMARY: ::DWORD = 3;
-pub const USER_NAME_PARMNUM: ::DWORD = 1;
-pub const USER_PASSWORD_PARMNUM: ::DWORD = 3;
-pub const USER_PASSWORD_AGE_PARMNUM: ::DWORD = 4;
-pub const USER_PRIV_PARMNUM: ::DWORD = 5;
-pub const USER_HOME_DIR_PARMNUM: ::DWORD = 6;
-pub const USER_COMMENT_PARMNUM: ::DWORD = 7;
-pub const USER_FLAGS_PARMNUM: ::DWORD = 8;
-pub const USER_SCRIPT_PATH_PARMNUM: ::DWORD = 9;
-pub const USER_AUTH_FLAGS_PARMNUM: ::DWORD = 10;
-pub const USER_FULL_NAME_PARMNUM: ::DWORD = 11;
-pub const USER_USR_COMMENT_PARMNUM: ::DWORD = 12;
-pub const USER_PARMS_PARMNUM: ::DWORD = 13;
-pub const USER_WORKSTATIONS_PARMNUM: ::DWORD = 14;
-pub const USER_LAST_LOGON_PARMNUM: ::DWORD = 15;
-pub const USER_LAST_LOGOFF_PARMNUM: ::DWORD = 16;
-pub const USER_ACCT_EXPIRES_PARMNUM: ::DWORD = 17;
-pub const USER_MAX_STORAGE_PARMNUM: ::DWORD = 18;
-pub const USER_UNITS_PER_WEEK_PARMNUM: ::DWORD = 19;
-pub const USER_LOGON_HOURS_PARMNUM: ::DWORD = 20;
-pub const USER_PAD_PW_COUNT_PARMNUM: ::DWORD = 21;
-pub const USER_NUM_LOGONS_PARMNUM: ::DWORD = 22;
-pub const USER_LOGON_SERVER_PARMNUM: ::DWORD = 23;
-pub const USER_COUNTRY_CODE_PARMNUM: ::DWORD = 24;
-pub const USER_CODE_PAGE_PARMNUM: ::DWORD = 25;
-pub const USER_PRIMARY_GROUP_PARMNUM: ::DWORD = 51;
-pub const USER_PROFILE: ::DWORD = 52;
-pub const USER_PROFILE_PARMNUM: ::DWORD = 52;
-pub const USER_HOME_DIR_DRIVE_PARMNUM: ::DWORD = 53;
-pub const USER_NAME_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_NAME_PARMNUM;
-pub const USER_PASSWORD_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_PASSWORD_PARMNUM;
-pub const USER_PASSWORD_AGE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_PASSWORD_AGE_PARMNUM;
-pub const USER_PRIV_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_PRIV_PARMNUM;
-pub const USER_HOME_DIR_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_HOME_DIR_PARMNUM;
-pub const USER_COMMENT_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_COMMENT_PARMNUM;
-pub const USER_FLAGS_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_FLAGS_PARMNUM;
-pub const USER_SCRIPT_PATH_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_SCRIPT_PATH_PARMNUM;
-pub const USER_AUTH_FLAGS_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_AUTH_FLAGS_PARMNUM;
-pub const USER_FULL_NAME_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_FULL_NAME_PARMNUM;
-pub const USER_USR_COMMENT_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_USR_COMMENT_PARMNUM;
-pub const USER_PARMS_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_PARMS_PARMNUM;
-pub const USER_WORKSTATIONS_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_WORKSTATIONS_PARMNUM;
-pub const USER_LAST_LOGON_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_LAST_LOGON_PARMNUM;
-pub const USER_LAST_LOGOFF_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_LAST_LOGOFF_PARMNUM;
-pub const USER_ACCT_EXPIRES_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_ACCT_EXPIRES_PARMNUM;
-pub const USER_MAX_STORAGE_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_MAX_STORAGE_PARMNUM;
-pub const USER_UNITS_PER_WEEK_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_UNITS_PER_WEEK_PARMNUM;
-pub const USER_LOGON_HOURS_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_LOGON_HOURS_PARMNUM;
-pub const USER_PAD_PW_COUNT_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_PAD_PW_COUNT_PARMNUM;
-pub const USER_NUM_LOGONS_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_NUM_LOGONS_PARMNUM;
-pub const USER_LOGON_SERVER_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_LOGON_SERVER_PARMNUM;
-pub const USER_COUNTRY_CODE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_COUNTRY_CODE_PARMNUM;
-pub const USER_CODE_PAGE_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_CODE_PAGE_PARMNUM;
-pub const USER_PRIMARY_GROUP_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_PRIMARY_GROUP_PARMNUM;
-pub const USER_HOME_DIR_DRIVE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_HOME_DIR_DRIVE_PARMNUM;
-pub const TIMEQ_FOREVER: ::DWORD = -1i32 as ::DWORD;
-pub const USER_MAXSTORAGE_UNLIMITED: ::DWORD = -1i32 as ::DWORD;
-pub const USER_NO_LOGOFF: ::DWORD = -1i32 as ::DWORD;
-pub const UNITS_PER_DAY: ::DWORD = 24;
-pub const UNITS_PER_WEEK: ::DWORD = UNITS_PER_DAY * 7;
-pub const USER_PRIV_MASK: ::DWORD = 0x3;
-pub const USER_PRIV_GUEST: ::DWORD = 0;
-pub const USER_PRIV_USER: ::DWORD = 1;
-pub const USER_PRIV_ADMIN: ::DWORD = 2;
-pub const MAX_PASSWD_LEN: ::DWORD = ::PWLEN;
-pub const DEF_MIN_PWLEN: ::DWORD = 6;
-pub const DEF_PWUNIQUENESS: ::DWORD = 5;
-pub const DEF_MAX_PWHIST: ::DWORD = 8;
-pub const DEF_MAX_PWAGE: ::DWORD = TIMEQ_FOREVER;
-pub const DEF_MIN_PWAGE: ::DWORD = 0;
-pub const DEF_FORCE_LOGOFF: ::DWORD = 0xffffffff;
-pub const DEF_MAX_BADPW: ::DWORD = 0;
-pub const ONE_DAY: ::DWORD = 1 * 24 * 3600;
-pub const VALIDATED_LOGON: ::DWORD = 0;
-pub const PASSWORD_EXPIRED: ::DWORD = 2;
-pub const NON_VALIDATED_LOGON: ::DWORD = 3;
-pub const VALID_LOGOFF: ::DWORD = 1;
-pub const MODALS_MIN_PASSWD_LEN_PARMNUM: ::DWORD = 1;
-pub const MODALS_MAX_PASSWD_AGE_PARMNUM: ::DWORD = 2;
-pub const MODALS_MIN_PASSWD_AGE_PARMNUM: ::DWORD = 3;
-pub const MODALS_FORCE_LOGOFF_PARMNUM: ::DWORD = 4;
-pub const MODALS_PASSWD_HIST_LEN_PARMNUM: ::DWORD = 5;
-pub const MODALS_ROLE_PARMNUM: ::DWORD = 6;
-pub const MODALS_PRIMARY_PARMNUM: ::DWORD = 7;
-pub const MODALS_DOMAIN_NAME_PARMNUM: ::DWORD = 8;
-pub const MODALS_DOMAIN_ID_PARMNUM: ::DWORD = 9;
-pub const MODALS_LOCKOUT_DURATION_PARMNUM: ::DWORD = 10;
-pub const MODALS_LOCKOUT_OBSERVATION_WINDOW_PARMNUM: ::DWORD = 11;
-pub const MODALS_LOCKOUT_THRESHOLD_PARMNUM: ::DWORD = 12;
-pub const MODALS_MIN_PASSWD_LEN_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_MIN_PASSWD_LEN_PARMNUM;
-pub const MODALS_MAX_PASSWD_AGE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_MAX_PASSWD_AGE_PARMNUM;
-pub const MODALS_MIN_PASSWD_AGE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_MIN_PASSWD_AGE_PARMNUM;
-pub const MODALS_FORCE_LOGOFF_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_FORCE_LOGOFF_PARMNUM;
-pub const MODALS_PASSWD_HIST_LEN_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_PASSWD_HIST_LEN_PARMNUM;
-pub const MODALS_ROLE_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + MODALS_ROLE_PARMNUM;
-pub const MODALS_PRIMARY_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + MODALS_PRIMARY_PARMNUM;
-pub const MODALS_DOMAIN_NAME_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_DOMAIN_NAME_PARMNUM;
-pub const MODALS_DOMAIN_ID_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + MODALS_DOMAIN_ID_PARMNUM;
-STRUCT!{struct GROUP_INFO_0 {
-    grpi0_name: ::LPWSTR,
-}}
-pub type PGROUP_INFO_0 = *mut GROUP_INFO_0;
-pub type LPGROUP_INFO_0 = *mut GROUP_INFO_0;
-STRUCT!{struct GROUP_INFO_1 {
-    grpi1_name: ::LPWSTR,
-    grpi1_comment: ::LPWSTR,
-}}
-pub type PGROUP_INFO_1 = *mut GROUP_INFO_1;
-pub type LPGROUP_INFO_1 = *mut GROUP_INFO_1;
-STRUCT!{struct GROUP_INFO_2 {
-    grpi2_name: ::LPWSTR,
-    grpi2_comment: ::LPWSTR,
-    grpi2_group_id: ::DWORD,
-    grpi2_attributes: ::DWORD,
-}}
-pub type PGROUP_INFO_2 = *mut GROUP_INFO_2;
-STRUCT!{struct GROUP_INFO_3 {
-    grpi3_name: ::LPWSTR,
-    grpi3_comment: ::LPWSTR,
-    grpi3_group_sid: ::PSID,
-    grpi3_attributes: ::DWORD,
-}}
-pub type PGROUP_INFO_3 = *mut GROUP_INFO_3;
-STRUCT!{struct GROUP_INFO_1002 {
-    grpi1002_comment: ::LPWSTR,
-}}
-pub type PGROUP_INFO_1002 = *mut GROUP_INFO_1002;
-pub type LPGROUP_INFO_1002 = *mut GROUP_INFO_1002;
-STRUCT!{struct GROUP_INFO_1005 {
-    grpi1005_attributes: ::DWORD,
-}}
-pub type PGROUP_INFO_1005 = *mut GROUP_INFO_1005;
-pub type LPGROUP_INFO_1005 = *mut GROUP_INFO_1005;
-STRUCT!{struct GROUP_USERS_INFO_0 {
-    grui0_name: ::LPWSTR,
-}}
-pub type PGROUP_USERS_INFO_0 = *mut GROUP_USERS_INFO_0;
-pub type LPGROUP_USERS_INFO_0 = *mut GROUP_USERS_INFO_0;
-STRUCT!{struct GROUP_USERS_INFO_1 {
-    grui1_name: ::LPWSTR,
-    grui1_attributes: ::DWORD,
-}}
-pub type PGROUP_USERS_INFO_1 = *mut GROUP_USERS_INFO_1;
-pub type LPGROUP_USERS_INFO_1 = *mut GROUP_USERS_INFO_1;
-pub const GROUPIDMASK: ::DWORD = 0x8000;
-pub const GROUP_SPECIALGRP_USERS: &'static str = "USERS";
-pub const GROUP_SPECIALGRP_ADMINS: &'static str = "ADMINS";
-pub const GROUP_SPECIALGRP_GUESTS: &'static str = "GUESTS";
-pub const GROUP_SPECIALGRP_LOCAL: &'static str = "LOCAL";
-pub const GROUP_ALL_PARMNUM: ::DWORD = 0;
-pub const GROUP_NAME_PARMNUM: ::DWORD = 1;
-pub const GROUP_COMMENT_PARMNUM: ::DWORD = 2;
-pub const GROUP_ATTRIBUTES_PARMNUM: ::DWORD = 3;
-pub const GROUP_ALL_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + GROUP_ALL_PARMNUM;
-pub const GROUP_NAME_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + GROUP_NAME_PARMNUM;
-pub const GROUP_COMMENT_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + GROUP_COMMENT_PARMNUM;
-pub const GROUP_ATTRIBUTES_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + GROUP_ATTRIBUTES_PARMNUM;
-STRUCT!{struct LOCALGROUP_INFO_0 {
-    lgrpi0_name: ::LPWSTR,
-}}
-pub type PLOCALGROUP_INFO_0 = *mut LOCALGROUP_INFO_0;
-pub type LPLOCALGROUP_INFO_0 = *mut LOCALGROUP_INFO_0;
-STRUCT!{struct LOCALGROUP_INFO_1 {
-    lgrpi1_name: ::LPWSTR,
-    lgrpi1_comment: ::LPWSTR,
-}}
-pub type PLOCALGROUP_INFO_1 = *mut LOCALGROUP_INFO_1;
-pub type LPLOCALGROUP_INFO_1 = *mut LOCALGROUP_INFO_1;
-STRUCT!{struct LOCALGROUP_INFO_1002 {
-    lgrpi1002_comment: ::LPWSTR,
-}}
-pub type PLOCALGROUP_INFO_1002 = *mut LOCALGROUP_INFO_1002;
-pub type LPLOCALGROUP_INFO_1002 = *mut LOCALGROUP_INFO_1002;
-STRUCT!{struct LOCALGROUP_MEMBERS_INFO_0 {
-    lgrmi0_sid: ::PSID,
-}}
-pub type PLOCALGROUP_MEMBERS_INFO_0 = *mut LOCALGROUP_MEMBERS_INFO_0;
-pub type LPLOCALGROUP_MEMBERS_INFO_0 = *mut LOCALGROUP_MEMBERS_INFO_0;
-STRUCT!{struct LOCALGROUP_MEMBERS_INFO_1 {
-    lgrmi1_sid: ::PSID,
-    lgrmi1_sidusage: ::SID_NAME_USE,
-    lgrmi1_name: ::LPWSTR,
-}}
-pub type PLOCALGROUP_MEMBERS_INFO_1 = *mut LOCALGROUP_MEMBERS_INFO_1;
-pub type LPLOCALGROUP_MEMBERS_INFO_1 = *mut LOCALGROUP_MEMBERS_INFO_1;
-STRUCT!{struct LOCALGROUP_MEMBERS_INFO_2 {
-    lgrmi2_sid: ::PSID,
-    lgrmi2_sidusage: ::SID_NAME_USE,
-    lgrmi2_domainandname: ::LPWSTR,
-}}
-pub type PLOCALGROUP_MEMBERS_INFO_2 = *mut LOCALGROUP_MEMBERS_INFO_2;
-pub type LPLOCALGROUP_MEMBERS_INFO_2 = *mut LOCALGROUP_MEMBERS_INFO_2;
-STRUCT!{struct LOCALGROUP_MEMBERS_INFO_3 {
-    lgrmi3_domainandname: ::LPWSTR,
-}}
-pub type PLOCALGROUP_MEMBERS_INFO_3 = *mut LOCALGROUP_MEMBERS_INFO_3;
-pub type LPLOCALGROUP_MEMBERS_INFO_3 = *mut LOCALGROUP_MEMBERS_INFO_3;
-STRUCT!{struct LOCALGROUP_USERS_INFO_0 {
-    lgrui0_name: ::LPWSTR,
-}}
-pub type PLOCALGROUP_USERS_INFO_0 = *mut LOCALGROUP_USERS_INFO_0;
-pub type LPLOCALGROUP_USERS_INFO_0 = *mut LOCALGROUP_USERS_INFO_0;
-pub const LOCALGROUP_NAME_PARMNUM: ::DWORD = 1;
-pub const LOCALGROUP_COMMENT_PARMNUM: ::DWORD = 2;
-STRUCT!{struct NET_DISPLAY_USER {
-    usri1_name: ::LPWSTR,
-    usri1_comment: ::LPWSTR,
-    usri1_flags: ::DWORD,
-    usri1_full_name: ::LPWSTR,
-    usri1_user_id: ::DWORD,
-    usri1_next_index: ::DWORD,
-}}
-pub type PNET_DISPLAY_USER = *mut NET_DISPLAY_USER;
-STRUCT!{struct NET_DISPLAY_MACHINE {
-    usri2_name: ::LPWSTR,
-    usri2_comment: ::LPWSTR,
-    usri2_flags: ::DWORD,
-    usri2_user_id: ::DWORD,
-    usri2_next_index: ::DWORD,
-}}
-pub type PNET_DISPLAY_MACHINE = *mut NET_DISPLAY_MACHINE;
-STRUCT!{struct NET_DISPLAY_GROUP {
-    usri3_name: ::LPWSTR,
-    usri3_comment: ::LPWSTR,
-    grpi3_group_id: ::DWORD,
-    grpi3_attributes: ::DWORD,
-    grpi3_next_index: ::DWORD,
-}}
-pub type PNET_DISPLAY_GROUP = *mut NET_DISPLAY_GROUP;
-STRUCT!{struct ACCESS_INFO_0 {
-    acc0_resource_name: ::LPWSTR,
-}}
-pub type PACCESS_INFO_0 = *mut ACCESS_INFO_0;
-pub type LPACCESS_INFO_0 = *mut ACCESS_INFO_0;
-STRUCT!{struct ACCESS_INFO_1 {
-    acc1_resource_name: ::LPWSTR,
-    acc1_attr: ::DWORD,
-    acc1_count: ::DWORD,
-}}
-pub type PACCESS_INFO_1 = *mut ACCESS_INFO_1;
-pub type LPACCESS_INFO_1 = *mut ACCESS_INFO_1;
-STRUCT!{struct ACCESS_INFO_1002 {
-    acc1002_attr: ::DWORD,
-}}
-pub type PACCESS_INFO_1002 = *mut ACCESS_INFO_1002;
-pub type LPACCESS_INFO_1002 = *mut ACCESS_INFO_1002;
-STRUCT!{struct ACCESS_LIST {
-    acl_ugname: ::LPWSTR,
-    acl_access: ::DWORD,
-}}
-pub type PACCESS_LIST = *mut ACCESS_LIST;
-pub type LPACCESS_LIST = *mut ACCESS_LIST;
-pub const ACCESS_NONE: ::DWORD = 0;
-pub const ACCESS_ALL: ::DWORD = ACCESS_READ | ACCESS_WRITE | ACCESS_CREATE | ACCESS_EXEC
-    | ACCESS_DELETE | ACCESS_ATRIB | ACCESS_PERM;
-pub const ACCESS_READ: ::DWORD = 0x01;
-pub const ACCESS_WRITE: ::DWORD = 0x02;
-pub const ACCESS_CREATE: ::DWORD = 0x04;
-pub const ACCESS_EXEC: ::DWORD = 0x08;
-pub const ACCESS_DELETE: ::DWORD = 0x10;
-pub const ACCESS_ATRIB: ::DWORD = 0x20;
-pub const ACCESS_PERM: ::DWORD = 0x40;
-pub const ACCESS_GROUP: ::DWORD = 0x8000;
-pub const ACCESS_AUDIT: ::DWORD = 0x1;
-pub const ACCESS_SUCCESS_OPEN: ::DWORD = 0x10;
-pub const ACCESS_SUCCESS_WRITE: ::DWORD = 0x20;
-pub const ACCESS_SUCCESS_DELETE: ::DWORD = 0x40;
-pub const ACCESS_SUCCESS_ACL: ::DWORD = 0x80;
-pub const ACCESS_SUCCESS_MASK: ::DWORD = 0xF0;
-pub const ACCESS_FAIL_OPEN: ::DWORD = 0x100;
-pub const ACCESS_FAIL_WRITE: ::DWORD = 0x200;
-pub const ACCESS_FAIL_DELETE: ::DWORD = 0x400;
-pub const ACCESS_FAIL_ACL: ::DWORD = 0x800;
-pub const ACCESS_FAIL_MASK: ::DWORD = 0xF00;
-pub const ACCESS_FAIL_SHIFT: ::DWORD = 4;
-pub const ACCESS_RESOURCE_NAME_PARMNUM: ::DWORD = 1;
-pub const ACCESS_ATTR_PARMNUM: ::DWORD = 2;
-pub const ACCESS_COUNT_PARMNUM: ::DWORD = 3;
-pub const ACCESS_ACCESS_LIST_PARMNUM: ::DWORD = 4;
-pub const ACCESS_RESOURCE_NAME_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + ACCESS_RESOURCE_NAME_PARMNUM;
-pub const ACCESS_ATTR_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + ACCESS_ATTR_PARMNUM;
-pub const ACCESS_COUNT_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + ACCESS_COUNT_PARMNUM;
-pub const ACCESS_ACCESS_LIST_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + ACCESS_ACCESS_LIST_PARMNUM;
-ENUM!{enum NET_VALIDATE_PASSWORD_TYPE {
-    NetValidateAuthentication = 1,
-    NetValidatePasswordChange,
-    NetValidatePasswordReset,
-}}
-pub type PNET_VALIDATE_PASSWORD_TYPE = *mut NET_VALIDATE_PASSWORD_TYPE;
-STRUCT!{struct NET_VALIDATE_PASSWORD_HASH {
-    Length: ::ULONG,
-    Hash: ::LPBYTE,
-}}
-pub type PNET_VALIDATE_PASSWORD_HASH = *mut NET_VALIDATE_PASSWORD_HASH;
-pub const NET_VALIDATE_PASSWORD_LAST_SET: ::ULONG = 0x00000001;
-pub const NET_VALIDATE_BAD_PASSWORD_TIME: ::ULONG = 0x00000002;
-pub const NET_VALIDATE_LOCKOUT_TIME: ::ULONG = 0x00000004;
-pub const NET_VALIDATE_BAD_PASSWORD_COUNT: ::ULONG = 0x00000008;
-pub const NET_VALIDATE_PASSWORD_HISTORY_LENGTH: ::ULONG = 0x00000010;
-pub const NET_VALIDATE_PASSWORD_HISTORY: ::ULONG = 0x00000020;
-STRUCT!{struct NET_VALIDATE_PERSISTED_FIELDS {
-    PresentFields: ::ULONG,
-    PasswordLastSet: ::FILETIME,
-    BadPasswordTime: ::FILETIME,
-    LockoutTime: ::FILETIME,
-    BadPasswordCount: ::ULONG,
-    PasswordHistoryLength: ::ULONG,
-    PasswordHistory: PNET_VALIDATE_PASSWORD_HASH,
-}}
-pub type PNET_VALIDATE_PERSISTED_FIELDS = *mut NET_VALIDATE_PERSISTED_FIELDS;
-STRUCT!{struct NET_VALIDATE_OUTPUT_ARG {
-    ChangedPersistedFields: NET_VALIDATE_PERSISTED_FIELDS,
-    ValidationStatus: ::NET_API_STATUS,
-}}
-pub type PNET_VALIDATE_OUTPUT_ARG = *mut NET_VALIDATE_OUTPUT_ARG;
-STRUCT!{struct NET_VALIDATE_AUTHENTICATION_INPUT_ARG {
-    InputPersistedFields: NET_VALIDATE_PERSISTED_FIELDS,
-    PasswordMatched: ::BOOLEAN,
-}}
-pub type PNET_VALIDATE_AUTHENTICATION_INPUT_ARG = *mut NET_VALIDATE_AUTHENTICATION_INPUT_ARG;
-STRUCT!{struct NET_VALIDATE_PASSWORD_CHANGE_INPUT_ARG {
-    InputPersistedFields: NET_VALIDATE_PERSISTED_FIELDS,
-    ClearPassword: ::LPWSTR,
-    UserAccountName: ::LPWSTR,
-    HashedPassword: NET_VALIDATE_PASSWORD_HASH,
-    PasswordMatch: ::BOOLEAN,
-}}
-pub type PNET_VALIDATE_PASSWORD_CHANGE_INPUT_ARG = *mut NET_VALIDATE_PASSWORD_CHANGE_INPUT_ARG;
-STRUCT!{struct NET_VALIDATE_PASSWORD_RESET_INPUT_ARG {
-    InputPersistedFields: NET_VALIDATE_PERSISTED_FIELDS,
-    ClearPassword: ::LPWSTR,
-    UserAccountName: ::LPWSTR,
-    HashedPassword: NET_VALIDATE_PASSWORD_HASH,
-    PasswordMustChangeAtNextLogon: ::BOOLEAN,
-    ClearLockout: ::BOOLEAN,
-}}
-pub type PNET_VALIDATE_PASSWORD_RESET_INPUT_ARG = *mut NET_VALIDATE_PASSWORD_RESET_INPUT_ARG;
-pub const NETLOGON_CONTROL_QUERY: ::DWORD = 1;
-pub const NETLOGON_CONTROL_REPLICATE: ::DWORD = 2;
-pub const NETLOGON_CONTROL_SYNCHRONIZE: ::DWORD = 3;
-pub const NETLOGON_CONTROL_PDC_REPLICATE: ::DWORD = 4;
-pub const NETLOGON_CONTROL_REDISCOVER: ::DWORD = 5;
-pub const NETLOGON_CONTROL_TC_QUERY: ::DWORD = 6;
-pub const NETLOGON_CONTROL_TRANSPORT_NOTIFY: ::DWORD = 7;
-pub const NETLOGON_CONTROL_FIND_USER: ::DWORD = 8;
-pub const NETLOGON_CONTROL_CHANGE_PASSWORD: ::DWORD = 9;
-pub const NETLOGON_CONTROL_TC_VERIFY: ::DWORD = 10;
-pub const NETLOGON_CONTROL_FORCE_DNS_REG: ::DWORD = 11;
-pub const NETLOGON_CONTROL_QUERY_DNS_REG: ::DWORD = 12;
-pub const NETLOGON_CONTROL_UNLOAD_NETLOGON_DLL: ::DWORD = 0xFFFB;
-pub const NETLOGON_CONTROL_BACKUP_CHANGE_LOG: ::DWORD = 0xFFFC;
-pub const NETLOGON_CONTROL_TRUNCATE_LOG: ::DWORD = 0xFFFD;
-pub const NETLOGON_CONTROL_SET_DBFLAG: ::DWORD = 0xFFFE;
-pub const NETLOGON_CONTROL_BREAKPOINT: ::DWORD = 0xFFFF;
-STRUCT!{struct NETLOGON_INFO_1 {
-    netlog1_flags: ::DWORD,
-    netlog1_pdc_connection_status: ::NET_API_STATUS,
-}}
-pub type PNETLOGON_INFO_1 = *mut NETLOGON_INFO_1;
-STRUCT!{struct NETLOGON_INFO_2 {
-    netlog2_flags: ::DWORD,
-    netlog2_pdc_connection_status: ::NET_API_STATUS,
-    netlog2_trusted_dc_name: ::LPWSTR,
-    netlog2_tc_connection_status: ::NET_API_STATUS,
-}}
-pub type PNETLOGON_INFO_2 = *mut NETLOGON_INFO_2;
-STRUCT!{struct NETLOGON_INFO_3 {
-    netlog3_flags: ::DWORD,
-    netlog3_logon_attempts: ::DWORD,
-    netlog3_reserved1: ::DWORD,
-    netlog3_reserved2: ::DWORD,
-    netlog3_reserved3: ::DWORD,
-    netlog3_reserved4: ::DWORD,
-    netlog3_reserved5: ::DWORD,
-}}
-pub type PNETLOGON_INFO_3 = *mut NETLOGON_INFO_3;
-STRUCT!{struct NETLOGON_INFO_4 {
-    netlog4_trusted_dc_name: ::LPWSTR,
-    netlog4_trusted_domain_name: ::LPWSTR,
-}}
-pub type PNETLOGON_INFO_4 = *mut NETLOGON_INFO_4;
-pub const NETLOGON_REPLICATION_NEEDED: ::DWORD = 0x01;
-pub const NETLOGON_REPLICATION_IN_PROGRESS: ::DWORD = 0x02;
-pub const NETLOGON_FULL_SYNC_REPLICATION: ::DWORD = 0x04;
-pub const NETLOGON_REDO_NEEDED: ::DWORD = 0x08;
-pub const NETLOGON_HAS_IP: ::DWORD = 0x10;
-pub const NETLOGON_HAS_TIMESERV: ::DWORD = 0x20;
-pub const NETLOGON_DNS_UPDATE_FAILURE: ::DWORD = 0x40;
-pub const NETLOGON_VERIFY_STATUS_RETURNED: ::DWORD = 0x80;
-DEFINE_GUID!(ServiceAccountPasswordGUID, 0x262E99C9, 0x6160, 0x4871,
-    0xAC, 0xEC, 0x4E, 0x61, 0x73, 0x6B, 0x6F, 0x21);
-pub const SERVICE_ACCOUNT_FLAG_LINK_TO_HOST_ONLY: ::DWORD = 0x00000001;
-pub const SERVICE_ACCOUNT_FLAG_ADD_AGAINST_RODC: ::DWORD = 0x00000002;
-pub const SERVICE_ACCOUNT_FLAG_UNLINK_FROM_HOST_ONLY: ::DWORD = 0x00000001;
-pub const SERVICE_ACCOUNT_FLAG_REMOVE_OFFLINE: ::DWORD = 0x00000002;
-ENUM!{enum MSA_INFO_LEVEL {
-    MsaInfoLevel0 = 0,
-    MsaInfoLevelMax,
-}}
-pub type PMSA_INFO_LEVEL = *mut MSA_INFO_LEVEL;
-ENUM!{enum MSA_INFO_STATE {
-    MsaInfoNotExist = 1,
-    MsaInfoNotService,
-    MsaInfoCannotInstall,
-    MsaInfoCanInstall,
-    MsaInfoInstalled,
-}}
-pub type PMSA_INFO_STATE = *mut MSA_INFO_STATE;
-STRUCT!{struct MSA_INFO_0 {
-    State: MSA_INFO_STATE,
-}}
-pub type PMSA_INFO_0 = *mut MSA_INFO_0;
-pub type LPMSA_INFO_0 = *mut MSA_INFO_0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmcons.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmcons.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmcons.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmcons.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This file contains constants used throughout the LAN Manager API header files.
-pub const CNLEN: ::DWORD = 15;
-pub const LM20_CNLEN: ::DWORD = 15;
-pub const DNLEN: ::DWORD = CNLEN;
-pub const LM20_DNLEN: ::DWORD = LM20_CNLEN;
-pub const UNCLEN: ::DWORD = CNLEN + 2;
-pub const LM20_UNCLEN: ::DWORD = LM20_CNLEN + 2;
-pub const NNLEN: ::DWORD = 80;
-pub const LM20_NNLEN: ::DWORD = 12;
-pub const RMLEN: ::DWORD = UNCLEN + 1 + NNLEN;
-pub const LM20_RMLEN: ::DWORD = LM20_UNCLEN + 1 + LM20_NNLEN;
-pub const SNLEN: ::DWORD = 80;
-pub const LM20_SNLEN: ::DWORD = 15;
-pub const STXTLEN: ::DWORD = 256;
-pub const LM20_STXTLEN: ::DWORD = 63;
-pub const PATHLEN: ::DWORD = 256;
-pub const LM20_PATHLEN: ::DWORD = 256;
-pub const DEVLEN: ::DWORD = 80;
-pub const LM20_DEVLEN: ::DWORD = 8;
-pub const EVLEN: ::DWORD = 16;
-pub const UNLEN: ::DWORD = 256;
-pub const LM20_UNLEN: ::DWORD = 20;
-pub const GNLEN: ::DWORD = UNLEN;
-pub const LM20_GNLEN: ::DWORD = LM20_UNLEN;
-pub const PWLEN: ::DWORD = 256;
-pub const LM20_PWLEN: ::DWORD = 14;
-pub const SHPWLEN: ::DWORD = 8;
-pub const CLTYPE_LEN: ::DWORD = 12;
-pub const MAXCOMMENTSZ: ::DWORD = 256;
-pub const LM20_MAXCOMMENTSZ: ::DWORD = 48;
-pub const QNLEN: ::DWORD = NNLEN;
-pub const LM20_QNLEN: ::DWORD = LM20_NNLEN;
-pub const ALERTSZ: ::DWORD = 128;
-pub const MAXDEVENTRIES: ::DWORD = 4 * 8; // FIXME: sizeof(int) instead of 4
-pub const NETBIOS_NAME_LEN: ::DWORD = 16;
-pub const MAX_PREFERRED_LENGTH: ::DWORD = -1i32 as ::DWORD;
-pub const CRYPT_KEY_LEN: ::DWORD = 7;
-pub const CRYPT_TXT_LEN: ::DWORD = 8;
-pub const ENCRYPTED_PWLEN: usize = 16;
-pub const SESSION_PWLEN: ::DWORD = 24;
-pub const SESSION_CRYPT_KLEN: ::DWORD = 21;
-pub const PARM_ERROR_UNKNOWN: ::DWORD = -1i32 as ::DWORD;
-pub const PARM_ERROR_NONE: ::DWORD = 0;
-pub const PARMNUM_BASE_INFOLEVEL: ::DWORD = 1000;
-pub type LMSTR = ::LPWSTR;
-pub type LMCSTR = ::LPCWSTR;
-pub type NET_API_STATUS = ::DWORD;
-pub type API_RET_TYPE = NET_API_STATUS;
-pub const PLATFORM_ID_DOS: ::DWORD = 300;
-pub const PLATFORM_ID_OS2: ::DWORD = 400;
-pub const PLATFORM_ID_NT: ::DWORD = 500;
-pub const PLATFORM_ID_OSF: ::DWORD = 600;
-pub const PLATFORM_ID_VMS: ::DWORD = 700;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmdfs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmdfs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmdfs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmdfs.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,311 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// This file contains structures, function prototypes, and definitions for the NetDfs API
-pub const DFS_VOLUME_STATES: ::DWORD = 0xF;
-pub const DFS_VOLUME_STATE_OK: ::DWORD = 1;
-pub const DFS_VOLUME_STATE_INCONSISTENT: ::DWORD = 2;
-pub const DFS_VOLUME_STATE_OFFLINE: ::DWORD = 3;
-pub const DFS_VOLUME_STATE_ONLINE: ::DWORD = 4;
-pub const DFS_VOLUME_STATE_RESYNCHRONIZE: ::DWORD = 0x10;
-pub const DFS_VOLUME_STATE_STANDBY: ::DWORD = 0x20;
-pub const DFS_VOLUME_STATE_FORCE_SYNC: ::DWORD = 0x40;
-pub const DFS_VOLUME_FLAVORS: ::DWORD = 0x0300;
-pub const DFS_VOLUME_FLAVOR_UNUSED1: ::DWORD = 0x0000;
-pub const DFS_VOLUME_FLAVOR_STANDALONE: ::DWORD = 0x0100;
-pub const DFS_VOLUME_FLAVOR_AD_BLOB: ::DWORD = 0x0200;
-pub const DFS_STORAGE_FLAVOR_UNUSED2: ::DWORD = 0x0300;
-pub const DFS_STORAGE_STATES: ::ULONG = 0xF;
-pub const DFS_STORAGE_STATE_OFFLINE: ::ULONG = 1;
-pub const DFS_STORAGE_STATE_ONLINE: ::ULONG = 2;
-pub const DFS_STORAGE_STATE_ACTIVE: ::ULONG = 4;
-ENUM!{enum DFS_TARGET_PRIORITY_CLASS {
-    DfsInvalidPriorityClass = -1i32 as u32,
-    DfsSiteCostNormalPriorityClass = 0,
-    DfsGlobalHighPriorityClass,
-    DfsSiteCostHighPriorityClass,
-    DfsSiteCostLowPriorityClass,
-    DfsGlobalLowPriorityClass,
-}}
-STRUCT!{struct DFS_TARGET_PRIORITY {
-    TargetPriorityClass: DFS_TARGET_PRIORITY_CLASS,
-    TargetPriorityRank: ::USHORT,
-    Reserved: ::USHORT,
-}}
-pub type PDFS_TARGET_PRIORITY = *mut DFS_TARGET_PRIORITY;
-STRUCT!{struct DFS_INFO_1 {
-    EntryPath: ::LPWSTR,
-}}
-pub type PDFS_INFO_1 = *mut DFS_INFO_1;
-pub type LPDFS_INFO_1 = *mut DFS_INFO_1;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_INFO_1_32 {
-    EntryPath: ::ULONG,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_INFO_1_32 = *mut DFS_INFO_1_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_INFO_1_32 = *mut DFS_INFO_1_32;
-STRUCT!{struct DFS_INFO_2 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    NumberOfStorages: ::DWORD,
-}}
-pub type PDFS_INFO_2 = *mut DFS_INFO_2;
-pub type LPDFS_INFO_2 = *mut DFS_INFO_2;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_INFO_2_32 {
-    EntryPath: ::ULONG,
-    Comment: ::ULONG,
-    State: ::DWORD,
-    NumberOfStorages: ::DWORD,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_INFO_2_32 = *mut DFS_INFO_2_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_INFO_2_32 = *mut DFS_INFO_2_32;
-STRUCT!{struct DFS_STORAGE_INFO {
-    State: ::ULONG,
-    ServerName: ::LPWSTR,
-    ShareName: ::LPWSTR,
-}}
-pub type PDFS_STORAGE_INFO = *mut DFS_STORAGE_INFO;
-pub type LPDFS_STORAGE_INFO = *mut DFS_STORAGE_INFO;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_STORAGE_INFO_0_32 {
-    State: ::ULONG,
-    ServerName: ::ULONG,
-    ShareName: ::ULONG,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_STORAGE_INFO_0_32 = *mut DFS_STORAGE_INFO_0_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_STORAGE_INFO_0_32 = *mut DFS_STORAGE_INFO_0_32;
-STRUCT!{struct DFS_STORAGE_INFO_1 {
-    State: ::ULONG,
-    ServerName: ::LPWSTR,
-    ShareName: ::LPWSTR,
-    TargetPriority: DFS_TARGET_PRIORITY,
-}}
-pub type PDFS_STORAGE_INFO_1 = *mut DFS_STORAGE_INFO_1;
-pub type LPDFS_STORAGE_INFO_1 = *mut DFS_STORAGE_INFO_1;
-STRUCT!{struct DFS_INFO_3 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    NumberOfStorages: ::DWORD,
-    Storage: LPDFS_STORAGE_INFO,
-}}
-pub type PDFS_INFO_3 = *mut DFS_INFO_3;
-pub type LPDFS_INFO_3 = *mut DFS_INFO_3;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_INFO_3_32 {
-    EntryPath: ::ULONG,
-    Comment: ::ULONG,
-    State: ::DWORD,
-    NumberOfStorages: ::DWORD,
-    Storage: ::ULONG,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_INFO_3_32 = *mut DFS_INFO_3_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_INFO_3_32 = *mut DFS_INFO_3_32;
-STRUCT!{struct DFS_INFO_4 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    NumberOfStorages: ::DWORD,
-    Storage: LPDFS_STORAGE_INFO,
-}}
-pub type PDFS_INFO_4 = *mut DFS_INFO_4;
-pub type LPDFS_INFO_4 = *mut DFS_INFO_4;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_INFO_4_32 {
-    EntryPath: ::ULONG,
-    Comment: ::ULONG,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    NumberOfStorages: ::DWORD,
-    Storage: ::ULONG,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_INFO_4_32 = *mut DFS_INFO_4_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_INFO_4_32 = *mut DFS_INFO_4_32;
-STRUCT!{struct DFS_INFO_5 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    PropertyFlags: ::ULONG,
-    MetadataSize: ::ULONG,
-    NumberOfStorages: ::DWORD,
-}}
-pub type PDFS_INFO_5 = *mut DFS_INFO_5;
-pub type LPDFS_INFO_5 = *mut DFS_INFO_5;
-STRUCT!{struct DFS_INFO_6 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    PropertyFlags: ::ULONG,
-    MetadataSize: ::ULONG,
-    NumberOfStorages: ::DWORD,
-    Storage: LPDFS_STORAGE_INFO,
-}}
-pub type PDFS_INFO_6 = *mut DFS_INFO_6;
-pub type LPDFS_INFO_6 = *mut DFS_INFO_6;
-STRUCT!{struct DFS_INFO_7 {
-    GenerationGuid: ::GUID,
-}}
-pub type PDFS_INFO_7 = *mut DFS_INFO_7;
-pub type LPDFS_INFO_7 = *mut DFS_INFO_7;
-STRUCT!{struct DFS_INFO_8 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    PropertyFlags: ::ULONG,
-    MetadataSize: ::ULONG,
-    SdLengthReserved: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-    NumberOfStorages: ::DWORD,
-}}
-pub type PDFS_INFO_8 = *mut DFS_INFO_8;
-pub type LPDFS_INFO_8 = *mut DFS_INFO_8;
-STRUCT!{struct DFS_INFO_9 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    PropertyFlags: ::ULONG,
-    MetadataSize: ::ULONG,
-    SdLengthReserved: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-    NumberOfStorages: ::DWORD,
-    Storage: LPDFS_STORAGE_INFO,
-}}
-pub type PDFS_INFO_9 = *mut DFS_INFO_9;
-pub type LPDFS_INFO_9 = *mut DFS_INFO_9;
-pub const DFS_PROPERTY_FLAG_INSITE_REFERRALS: ::ULONG = 0x00000001;
-pub const DFS_PROPERTY_FLAG_ROOT_SCALABILITY: ::ULONG = 0x00000002;
-pub const DFS_PROPERTY_FLAG_SITE_COSTING: ::ULONG = 0x00000004;
-pub const DFS_PROPERTY_FLAG_TARGET_FAILBACK: ::ULONG = 0x00000008;
-pub const DFS_PROPERTY_FLAG_CLUSTER_ENABLED: ::ULONG = 0x00000010;
-pub const DFS_PROPERTY_FLAG_ABDE: ::ULONG = 0x00000020;
-pub const DFS_VALID_PROPERTY_FLAGS: ::ULONG = DFS_PROPERTY_FLAG_INSITE_REFERRALS
-    | DFS_PROPERTY_FLAG_ROOT_SCALABILITY | DFS_PROPERTY_FLAG_SITE_COSTING
-    | DFS_PROPERTY_FLAG_TARGET_FAILBACK | DFS_PROPERTY_FLAG_CLUSTER_ENABLED
-    | DFS_PROPERTY_FLAG_ABDE;
-STRUCT!{struct DFS_INFO_50 {
-    NamespaceMajorVersion: ::ULONG,
-    NamespaceMinorVersion: ::ULONG,
-    NamespaceCapabilities: ::ULONGLONG,
-}}
-pub type PDFS_INFO_50 = *mut DFS_INFO_50;
-pub type LPDFS_INFO_50 = *mut DFS_INFO_50;
-STRUCT!{struct DFS_INFO_100 {
-    Comment: ::LPWSTR,
-}}
-pub type PDFS_INFO_100 = *mut DFS_INFO_100;
-pub type LPDFS_INFO_100 = *mut DFS_INFO_100;
-STRUCT!{struct DFS_INFO_101 {
-    State: ::DWORD,
-}}
-pub type PDFS_INFO_101 = *mut DFS_INFO_101;
-pub type LPDFS_INFO_101 = *mut DFS_INFO_101;
-STRUCT!{struct DFS_INFO_102 {
-    Timeout: ::ULONG,
-}}
-pub type PDFS_INFO_102 = *mut DFS_INFO_102;
-pub type LPDFS_INFO_102 = *mut DFS_INFO_102;
-STRUCT!{struct DFS_INFO_103 {
-    PropertyFlagMask: ::ULONG,
-    PropertyFlags: ::ULONG,
-}}
-pub type PDFS_INFO_103 = *mut DFS_INFO_103;
-pub type LPDFS_INFO_103 = *mut DFS_INFO_103;
-STRUCT!{struct DFS_INFO_104 {
-    TargetPriority: DFS_TARGET_PRIORITY,
-}}
-pub type PDFS_INFO_104 = *mut DFS_INFO_104;
-pub type LPDFS_INFO_104 = *mut DFS_INFO_104;
-STRUCT!{struct DFS_INFO_105 {
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    PropertyFlagMask: ::ULONG,
-    PropertyFlags: ::ULONG,
-}}
-pub type PDFS_INFO_105 = *mut DFS_INFO_105;
-pub type LPDFS_INFO_105 = *mut DFS_INFO_105;
-STRUCT!{struct DFS_INFO_106 {
-    State: ::DWORD,
-    TargetPriority: DFS_TARGET_PRIORITY,
-}}
-pub type PDFS_INFO_106 = *mut DFS_INFO_106;
-pub type LPDFS_INFO_106 = *mut DFS_INFO_106;
-STRUCT!{struct DFS_INFO_107 {
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    PropertyFlagMask: ::ULONG,
-    PropertyFlags: ::ULONG,
-    SdLengthReserved: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-}}
-pub type PDFS_INFO_107 = *mut DFS_INFO_107;
-pub type LPDFS_INFO_107 = *mut DFS_INFO_107;
-STRUCT!{struct DFS_INFO_150 {
-    SdLengthReserved: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-}}
-pub type PDFS_INFO_150 = *mut DFS_INFO_150;
-pub type LPDFS_INFO_150 = *mut DFS_INFO_150;
-STRUCT!{struct DFS_INFO_200 {
-    FtDfsName: ::LPWSTR,
-}}
-pub type PDFS_INFO_200 = *mut DFS_INFO_200;
-pub type LPDFS_INFO_200 = *mut DFS_INFO_200;
-STRUCT!{struct DFS_INFO_300 {
-    Flags: ::DWORD,
-    DfsName: ::LPWSTR,
-}}
-pub type PDFS_INFO_300 = *mut DFS_INFO_300;
-pub type LPDFS_INFO_300 = *mut DFS_INFO_300;
-pub const DFS_ADD_VOLUME: ::DWORD = 1;
-pub const DFS_RESTORE_VOLUME: ::DWORD = 2;
-pub const NET_DFS_SETDC_FLAGS: ::DWORD = 0x00000000;
-pub const NET_DFS_SETDC_TIMEOUT: ::DWORD = 0x00000001;
-pub const NET_DFS_SETDC_INITPKT: ::DWORD = 0x00000002;
-STRUCT!{struct DFS_SITENAME_INFO {
-    SiteFlags: ::ULONG,
-    SiteName: ::LPWSTR,
-}}
-pub type PDFS_SITENAME_INFO = *mut DFS_SITENAME_INFO;
-pub type LPDFS_SITENAME_INFO = *mut DFS_SITENAME_INFO;
-pub const DFS_SITE_PRIMARY: ::ULONG = 0x1;
-STRUCT!{struct DFS_SITELIST_INFO {
-    cSites: ::ULONG,
-    Site: [DFS_SITENAME_INFO; 1],
-}}
-pub type PDFS_SITELIST_INFO = *mut DFS_SITELIST_INFO;
-pub type LPDFS_SITELIST_INFO = *mut DFS_SITELIST_INFO;
-ENUM!{enum DFS_NAMESPACE_VERSION_ORIGIN {
-    DFS_NAMESPACE_VERSION_ORIGIN_COMBINED = 0,
-    DFS_NAMESPACE_VERSION_ORIGIN_SERVER,
-    DFS_NAMESPACE_VERSION_ORIGIN_DOMAIN,
-}}
-pub type PDFS_NAMESPACE_VERSION_ORIGIN = *mut DFS_NAMESPACE_VERSION_ORIGIN;
-pub const DFS_NAMESPACE_CAPABILITY_ABDE: ::ULONGLONG = 0x0000000000000001;
-STRUCT!{struct DFS_SUPPORTED_NAMESPACE_VERSION_INFO {
-    DomainDfsMajorVersion: ::ULONG,
-    DomainDfsMinorVersion: ::ULONG,
-    DomainDfsCapabilities: ::ULONGLONG,
-    StandaloneDfsMajorVersion: ::ULONG,
-    StandaloneDfsMinorVersion: ::ULONG,
-    StandaloneDfsCapabilities: ::ULONGLONG,
-}}
-pub type PDFS_SUPPORTED_NAMESPACE_VERSION_INFO = *mut DFS_SUPPORTED_NAMESPACE_VERSION_INFO;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmerrlog.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmerrlog.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmerrlog.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmerrlog.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,263 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct ERROR_LOG {
-    el_len: ::DWORD,
-    el_reserved: ::DWORD,
-    el_time: ::DWORD,
-    el_error: ::DWORD,
-    el_name: ::LPWSTR,
-    el_text: ::LPWSTR,
-    el_data: ::LPBYTE,
-    el_data_size: ::DWORD,
-    el_nstrings: ::DWORD,
-}}
-pub type PERROR_LOG = *mut ERROR_LOG;
-pub type LPERROR_LOG = *mut ERROR_LOG;
-STRUCT!{struct HLOG {
-    time: ::DWORD,
-    last_flags: ::DWORD,
-    offset: ::DWORD,
-    rec_offset: ::DWORD,
-}}
-pub type PHLOG = *mut HLOG;
-pub type LPHLOG = *mut HLOG;
-pub const LOGFLAGS_FORWARD: ::DWORD = 0;
-pub const LOGFLAGS_BACKWARD: ::DWORD = 0x1;
-pub const LOGFLAGS_SEEK: ::DWORD = 0x2;
-pub const ERRLOG_BASE: ::DWORD = 3100;
-pub const NELOG_Internal_Error: ::DWORD = ERRLOG_BASE + 0;
-pub const NELOG_Resource_Shortage: ::DWORD = ERRLOG_BASE + 1;
-pub const NELOG_Unable_To_Lock_Segment: ::DWORD = ERRLOG_BASE + 2;
-pub const NELOG_Unable_To_Unlock_Segment: ::DWORD = ERRLOG_BASE + 3;
-pub const NELOG_Uninstall_Service: ::DWORD = ERRLOG_BASE + 4;
-pub const NELOG_Init_Exec_Fail: ::DWORD = ERRLOG_BASE + 5;
-pub const NELOG_Ncb_Error: ::DWORD = ERRLOG_BASE + 6;
-pub const NELOG_Net_Not_Started: ::DWORD = ERRLOG_BASE + 7;
-pub const NELOG_Ioctl_Error: ::DWORD = ERRLOG_BASE + 8;
-pub const NELOG_System_Semaphore: ::DWORD = ERRLOG_BASE + 9;
-pub const NELOG_Init_OpenCreate_Err: ::DWORD = ERRLOG_BASE + 10;
-pub const NELOG_NetBios: ::DWORD = ERRLOG_BASE + 11;
-pub const NELOG_SMB_Illegal: ::DWORD = ERRLOG_BASE + 12;
-pub const NELOG_Service_Fail: ::DWORD = ERRLOG_BASE + 13;
-pub const NELOG_Entries_Lost: ::DWORD = ERRLOG_BASE + 14;
-pub const NELOG_Init_Seg_Overflow: ::DWORD = ERRLOG_BASE + 20;
-pub const NELOG_Srv_No_Mem_Grow: ::DWORD = ERRLOG_BASE + 21;
-pub const NELOG_Access_File_Bad: ::DWORD = ERRLOG_BASE + 22;
-pub const NELOG_Srvnet_Not_Started: ::DWORD = ERRLOG_BASE + 23;
-pub const NELOG_Init_Chardev_Err: ::DWORD = ERRLOG_BASE + 24;
-pub const NELOG_Remote_API: ::DWORD = ERRLOG_BASE + 25;
-pub const NELOG_Ncb_TooManyErr: ::DWORD = ERRLOG_BASE + 26;
-pub const NELOG_Mailslot_err: ::DWORD = ERRLOG_BASE + 27;
-pub const NELOG_ReleaseMem_Alert: ::DWORD = ERRLOG_BASE + 28;
-pub const NELOG_AT_cannot_write: ::DWORD = ERRLOG_BASE + 29;
-pub const NELOG_Cant_Make_Msg_File: ::DWORD = ERRLOG_BASE + 30;
-pub const NELOG_Exec_Netservr_NoMem: ::DWORD = ERRLOG_BASE + 31;
-pub const NELOG_Server_Lock_Failure: ::DWORD = ERRLOG_BASE + 32;
-pub const NELOG_Msg_Shutdown: ::DWORD = ERRLOG_BASE + 40;
-pub const NELOG_Msg_Sem_Shutdown: ::DWORD = ERRLOG_BASE + 41;
-pub const NELOG_Msg_Log_Err: ::DWORD = ERRLOG_BASE + 50;
-pub const NELOG_VIO_POPUP_ERR: ::DWORD = ERRLOG_BASE + 51;
-pub const NELOG_Msg_Unexpected_SMB_Type: ::DWORD = ERRLOG_BASE + 52;
-pub const NELOG_Wksta_Infoseg: ::DWORD = ERRLOG_BASE + 60;
-pub const NELOG_Wksta_Compname: ::DWORD = ERRLOG_BASE + 61;
-pub const NELOG_Wksta_BiosThreadFailure: ::DWORD = ERRLOG_BASE + 62;
-pub const NELOG_Wksta_IniSeg: ::DWORD = ERRLOG_BASE + 63;
-pub const NELOG_Wksta_HostTab_Full: ::DWORD = ERRLOG_BASE + 64;
-pub const NELOG_Wksta_Bad_Mailslot_SMB: ::DWORD = ERRLOG_BASE + 65;
-pub const NELOG_Wksta_UASInit: ::DWORD = ERRLOG_BASE + 66;
-pub const NELOG_Wksta_SSIRelogon: ::DWORD = ERRLOG_BASE + 67;
-pub const NELOG_Build_Name: ::DWORD = ERRLOG_BASE + 70;
-pub const NELOG_Name_Expansion: ::DWORD = ERRLOG_BASE + 71;
-pub const NELOG_Message_Send: ::DWORD = ERRLOG_BASE + 72;
-pub const NELOG_Mail_Slt_Err: ::DWORD = ERRLOG_BASE + 73;
-pub const NELOG_AT_cannot_read: ::DWORD = ERRLOG_BASE + 74;
-pub const NELOG_AT_sched_err: ::DWORD = ERRLOG_BASE + 75;
-pub const NELOG_AT_schedule_file_created: ::DWORD = ERRLOG_BASE + 76;
-pub const NELOG_Srvnet_NB_Open: ::DWORD = ERRLOG_BASE + 77;
-pub const NELOG_AT_Exec_Err: ::DWORD = ERRLOG_BASE + 78;
-pub const NELOG_Lazy_Write_Err: ::DWORD = ERRLOG_BASE + 80;
-pub const NELOG_HotFix: ::DWORD = ERRLOG_BASE + 81;
-pub const NELOG_HardErr_From_Server: ::DWORD = ERRLOG_BASE + 82;
-pub const NELOG_LocalSecFail1: ::DWORD = ERRLOG_BASE + 83;
-pub const NELOG_LocalSecFail2: ::DWORD = ERRLOG_BASE + 84;
-pub const NELOG_LocalSecFail3: ::DWORD = ERRLOG_BASE + 85;
-pub const NELOG_LocalSecGeneralFail: ::DWORD = ERRLOG_BASE + 86;
-pub const NELOG_NetWkSta_Internal_Error: ::DWORD = ERRLOG_BASE + 90;
-pub const NELOG_NetWkSta_No_Resource: ::DWORD = ERRLOG_BASE + 91;
-pub const NELOG_NetWkSta_SMB_Err: ::DWORD = ERRLOG_BASE + 92;
-pub const NELOG_NetWkSta_VC_Err: ::DWORD = ERRLOG_BASE + 93;
-pub const NELOG_NetWkSta_Stuck_VC_Err: ::DWORD = ERRLOG_BASE + 94;
-pub const NELOG_NetWkSta_NCB_Err: ::DWORD = ERRLOG_BASE + 95;
-pub const NELOG_NetWkSta_Write_Behind_Err: ::DWORD = ERRLOG_BASE + 96;
-pub const NELOG_NetWkSta_Reset_Err: ::DWORD = ERRLOG_BASE + 97;
-pub const NELOG_NetWkSta_Too_Many: ::DWORD = ERRLOG_BASE + 98;
-pub const NELOG_Srv_Thread_Failure: ::DWORD = ERRLOG_BASE + 104;
-pub const NELOG_Srv_Close_Failure: ::DWORD = ERRLOG_BASE + 105;
-pub const NELOG_ReplUserCurDir: ::DWORD = ERRLOG_BASE + 106;
-pub const NELOG_ReplCannotMasterDir: ::DWORD = ERRLOG_BASE + 107;
-pub const NELOG_ReplUpdateError: ::DWORD = ERRLOG_BASE + 108;
-pub const NELOG_ReplLostMaster: ::DWORD = ERRLOG_BASE + 109;
-pub const NELOG_NetlogonAuthDCFail: ::DWORD = ERRLOG_BASE + 110;
-pub const NELOG_ReplLogonFailed: ::DWORD = ERRLOG_BASE + 111;
-pub const NELOG_ReplNetErr: ::DWORD = ERRLOG_BASE + 112;
-pub const NELOG_ReplMaxFiles: ::DWORD = ERRLOG_BASE + 113;
-pub const NELOG_ReplMaxTreeDepth: ::DWORD = ERRLOG_BASE + 114;
-pub const NELOG_ReplBadMsg: ::DWORD = ERRLOG_BASE + 115;
-pub const NELOG_ReplSysErr: ::DWORD = ERRLOG_BASE + 116;
-pub const NELOG_ReplUserLoged: ::DWORD = ERRLOG_BASE + 117;
-pub const NELOG_ReplBadImport: ::DWORD = ERRLOG_BASE + 118;
-pub const NELOG_ReplBadExport: ::DWORD = ERRLOG_BASE + 119;
-pub const NELOG_ReplSignalFileErr: ::DWORD = ERRLOG_BASE + 120;
-pub const NELOG_DiskFT: ::DWORD = ERRLOG_BASE + 121;
-pub const NELOG_ReplAccessDenied: ::DWORD = ERRLOG_BASE + 122;
-pub const NELOG_NetlogonFailedPrimary: ::DWORD = ERRLOG_BASE + 123;
-pub const NELOG_NetlogonPasswdSetFailed: ::DWORD = ERRLOG_BASE + 124;
-pub const NELOG_NetlogonTrackingError: ::DWORD = ERRLOG_BASE + 125;
-pub const NELOG_NetlogonSyncError: ::DWORD = ERRLOG_BASE + 126;
-pub const NELOG_NetlogonRequireSignOrSealError: ::DWORD = ERRLOG_BASE + 127;
-pub const NELOG_UPS_PowerOut: ::DWORD = ERRLOG_BASE + 130;
-pub const NELOG_UPS_Shutdown: ::DWORD = ERRLOG_BASE + 131;
-pub const NELOG_UPS_CmdFileError: ::DWORD = ERRLOG_BASE + 132;
-pub const NELOG_UPS_CannotOpenDriver: ::DWORD = ERRLOG_BASE+133;
-pub const NELOG_UPS_PowerBack: ::DWORD = ERRLOG_BASE + 134;
-pub const NELOG_UPS_CmdFileConfig: ::DWORD = ERRLOG_BASE + 135;
-pub const NELOG_UPS_CmdFileExec: ::DWORD = ERRLOG_BASE + 136;
-pub const NELOG_Missing_Parameter: ::DWORD = ERRLOG_BASE + 150;
-pub const NELOG_Invalid_Config_Line: ::DWORD = ERRLOG_BASE + 151;
-pub const NELOG_Invalid_Config_File: ::DWORD = ERRLOG_BASE + 152;
-pub const NELOG_File_Changed: ::DWORD = ERRLOG_BASE + 153;
-pub const NELOG_Files_Dont_Fit: ::DWORD = ERRLOG_BASE + 154;
-pub const NELOG_Wrong_DLL_Version: ::DWORD = ERRLOG_BASE + 155;
-pub const NELOG_Error_in_DLL: ::DWORD = ERRLOG_BASE + 156;
-pub const NELOG_System_Error: ::DWORD = ERRLOG_BASE + 157;
-pub const NELOG_FT_ErrLog_Too_Large: ::DWORD = ERRLOG_BASE + 158;
-pub const NELOG_FT_Update_In_Progress: ::DWORD = ERRLOG_BASE + 159;
-pub const NELOG_Joined_Domain: ::DWORD = ERRLOG_BASE + 160;
-pub const NELOG_Joined_Workgroup: ::DWORD = ERRLOG_BASE + 161;
-pub const NELOG_OEM_Code: ::DWORD = ERRLOG_BASE + 199;
-pub const ERRLOG2_BASE: ::DWORD = 5700;
-pub const NELOG_NetlogonSSIInitError: ::DWORD = ERRLOG2_BASE + 0;
-pub const NELOG_NetlogonFailedToUpdateTrustList: ::DWORD = ERRLOG2_BASE + 1;
-pub const NELOG_NetlogonFailedToAddRpcInterface: ::DWORD = ERRLOG2_BASE + 2;
-pub const NELOG_NetlogonFailedToReadMailslot: ::DWORD = ERRLOG2_BASE + 3;
-pub const NELOG_NetlogonFailedToRegisterSC: ::DWORD = ERRLOG2_BASE + 4;
-pub const NELOG_NetlogonChangeLogCorrupt: ::DWORD = ERRLOG2_BASE + 5;
-pub const NELOG_NetlogonFailedToCreateShare: ::DWORD = ERRLOG2_BASE + 6;
-pub const NELOG_NetlogonDownLevelLogonFailed: ::DWORD = ERRLOG2_BASE + 7;
-pub const NELOG_NetlogonDownLevelLogoffFailed: ::DWORD = ERRLOG2_BASE + 8;
-pub const NELOG_NetlogonNTLogonFailed: ::DWORD = ERRLOG2_BASE + 9;
-pub const NELOG_NetlogonNTLogoffFailed: ::DWORD = ERRLOG2_BASE + 10;
-pub const NELOG_NetlogonPartialSyncCallSuccess: ::DWORD = ERRLOG2_BASE + 11;
-pub const NELOG_NetlogonPartialSyncCallFailed: ::DWORD = ERRLOG2_BASE + 12;
-pub const NELOG_NetlogonFullSyncCallSuccess: ::DWORD = ERRLOG2_BASE + 13;
-pub const NELOG_NetlogonFullSyncCallFailed: ::DWORD = ERRLOG2_BASE + 14;
-pub const NELOG_NetlogonPartialSyncSuccess: ::DWORD = ERRLOG2_BASE + 15;
-pub const NELOG_NetlogonPartialSyncFailed: ::DWORD = ERRLOG2_BASE + 16;
-pub const NELOG_NetlogonFullSyncSuccess: ::DWORD = ERRLOG2_BASE + 17;
-pub const NELOG_NetlogonFullSyncFailed: ::DWORD = ERRLOG2_BASE + 18;
-pub const NELOG_NetlogonAuthNoDomainController: ::DWORD = ERRLOG2_BASE + 19;
-pub const NELOG_NetlogonAuthNoTrustLsaSecret: ::DWORD = ERRLOG2_BASE + 20;
-pub const NELOG_NetlogonAuthNoTrustSamAccount: ::DWORD = ERRLOG2_BASE + 21;
-pub const NELOG_NetlogonServerAuthFailed: ::DWORD = ERRLOG2_BASE + 22;
-pub const NELOG_NetlogonServerAuthNoTrustSamAccount: ::DWORD = ERRLOG2_BASE + 23;
-pub const NELOG_FailedToRegisterSC: ::DWORD = ERRLOG2_BASE + 24;
-pub const NELOG_FailedToSetServiceStatus: ::DWORD = ERRLOG2_BASE + 25;
-pub const NELOG_FailedToGetComputerName: ::DWORD = ERRLOG2_BASE + 26;
-pub const NELOG_DriverNotLoaded: ::DWORD = ERRLOG2_BASE + 27;
-pub const NELOG_NoTranportLoaded: ::DWORD = ERRLOG2_BASE + 28;
-pub const NELOG_NetlogonFailedDomainDelta: ::DWORD = ERRLOG2_BASE + 29;
-pub const NELOG_NetlogonFailedGlobalGroupDelta: ::DWORD = ERRLOG2_BASE + 30;
-pub const NELOG_NetlogonFailedLocalGroupDelta: ::DWORD = ERRLOG2_BASE + 31;
-pub const NELOG_NetlogonFailedUserDelta: ::DWORD = ERRLOG2_BASE + 32;
-pub const NELOG_NetlogonFailedPolicyDelta: ::DWORD = ERRLOG2_BASE + 33;
-pub const NELOG_NetlogonFailedTrustedDomainDelta: ::DWORD = ERRLOG2_BASE + 34;
-pub const NELOG_NetlogonFailedAccountDelta: ::DWORD = ERRLOG2_BASE + 35;
-pub const NELOG_NetlogonFailedSecretDelta: ::DWORD = ERRLOG2_BASE + 36;
-pub const NELOG_NetlogonSystemError: ::DWORD = ERRLOG2_BASE + 37;
-pub const NELOG_NetlogonDuplicateMachineAccounts: ::DWORD = ERRLOG2_BASE + 38;
-pub const NELOG_NetlogonTooManyGlobalGroups: ::DWORD = ERRLOG2_BASE + 39;
-pub const NELOG_NetlogonBrowserDriver: ::DWORD = ERRLOG2_BASE + 40;
-pub const NELOG_NetlogonAddNameFailure: ::DWORD = ERRLOG2_BASE + 41;
-pub const NELOG_RplMessages: ::DWORD = ERRLOG2_BASE + 42;
-pub const NELOG_RplXnsBoot: ::DWORD = ERRLOG2_BASE + 43;
-pub const NELOG_RplSystem: ::DWORD = ERRLOG2_BASE + 44;
-pub const NELOG_RplWkstaTimeout: ::DWORD = ERRLOG2_BASE + 45;
-pub const NELOG_RplWkstaFileOpen: ::DWORD = ERRLOG2_BASE + 46;
-pub const NELOG_RplWkstaFileRead: ::DWORD = ERRLOG2_BASE + 47;
-pub const NELOG_RplWkstaMemory: ::DWORD = ERRLOG2_BASE + 48;
-pub const NELOG_RplWkstaFileChecksum: ::DWORD = ERRLOG2_BASE + 49;
-pub const NELOG_RplWkstaFileLineCount: ::DWORD = ERRLOG2_BASE + 50;
-pub const NELOG_RplWkstaBbcFile: ::DWORD = ERRLOG2_BASE + 51;
-pub const NELOG_RplWkstaFileSize: ::DWORD = ERRLOG2_BASE + 52;
-pub const NELOG_RplWkstaInternal: ::DWORD = ERRLOG2_BASE + 53;
-pub const NELOG_RplWkstaWrongVersion: ::DWORD = ERRLOG2_BASE + 54;
-pub const NELOG_RplWkstaNetwork: ::DWORD = ERRLOG2_BASE + 55;
-pub const NELOG_RplAdapterResource: ::DWORD = ERRLOG2_BASE + 56;
-pub const NELOG_RplFileCopy: ::DWORD = ERRLOG2_BASE + 57;
-pub const NELOG_RplFileDelete: ::DWORD = ERRLOG2_BASE + 58;
-pub const NELOG_RplFilePerms: ::DWORD = ERRLOG2_BASE + 59;
-pub const NELOG_RplCheckConfigs: ::DWORD = ERRLOG2_BASE + 60;
-pub const NELOG_RplCreateProfiles: ::DWORD = ERRLOG2_BASE + 61;
-pub const NELOG_RplRegistry: ::DWORD = ERRLOG2_BASE + 62;
-pub const NELOG_RplReplaceRPLDISK: ::DWORD = ERRLOG2_BASE + 63;
-pub const NELOG_RplCheckSecurity: ::DWORD = ERRLOG2_BASE + 64;
-pub const NELOG_RplBackupDatabase: ::DWORD = ERRLOG2_BASE + 65;
-pub const NELOG_RplInitDatabase: ::DWORD = ERRLOG2_BASE + 66;
-pub const NELOG_RplRestoreDatabaseFailure: ::DWORD = ERRLOG2_BASE + 67;
-pub const NELOG_RplRestoreDatabaseSuccess: ::DWORD = ERRLOG2_BASE + 68;
-pub const NELOG_RplInitRestoredDatabase: ::DWORD = ERRLOG2_BASE + 69;
-pub const NELOG_NetlogonSessionTypeWrong: ::DWORD = ERRLOG2_BASE + 70;
-pub const NELOG_RplUpgradeDBTo40: ::DWORD = ERRLOG2_BASE + 71;
-pub const NELOG_NetlogonLanmanBdcsNotAllowed: ::DWORD = ERRLOG2_BASE + 72;
-pub const NELOG_NetlogonNoDynamicDns: ::DWORD = ERRLOG2_BASE + 73;
-pub const NELOG_NetlogonDynamicDnsRegisterFailure: ::DWORD = ERRLOG2_BASE + 74;
-pub const NELOG_NetlogonDynamicDnsDeregisterFailure: ::DWORD = ERRLOG2_BASE + 75;
-pub const NELOG_NetlogonFailedFileCreate: ::DWORD = ERRLOG2_BASE + 76;
-pub const NELOG_NetlogonGetSubnetToSite: ::DWORD = ERRLOG2_BASE + 77;
-pub const NELOG_NetlogonNoSiteForClient: ::DWORD = ERRLOG2_BASE + 78;
-pub const NELOG_NetlogonBadSiteName: ::DWORD = ERRLOG2_BASE + 79;
-pub const NELOG_NetlogonBadSubnetName: ::DWORD = ERRLOG2_BASE + 80;
-pub const NELOG_NetlogonDynamicDnsServerFailure: ::DWORD = ERRLOG2_BASE + 81;
-pub const NELOG_NetlogonDynamicDnsFailure: ::DWORD = ERRLOG2_BASE + 82;
-pub const NELOG_NetlogonRpcCallCancelled: ::DWORD = ERRLOG2_BASE + 83;
-pub const NELOG_NetlogonDcSiteCovered: ::DWORD = ERRLOG2_BASE + 84;
-pub const NELOG_NetlogonDcSiteNotCovered: ::DWORD = ERRLOG2_BASE + 85;
-pub const NELOG_NetlogonGcSiteCovered: ::DWORD = ERRLOG2_BASE + 86;
-pub const NELOG_NetlogonGcSiteNotCovered: ::DWORD = ERRLOG2_BASE + 87;
-pub const NELOG_NetlogonFailedSpnUpdate: ::DWORD = ERRLOG2_BASE + 88;
-pub const NELOG_NetlogonFailedDnsHostNameUpdate: ::DWORD = ERRLOG2_BASE + 89;
-pub const NELOG_NetlogonAuthNoUplevelDomainController: ::DWORD = ERRLOG2_BASE + 90;
-pub const NELOG_NetlogonAuthDomainDowngraded: ::DWORD = ERRLOG2_BASE + 91;
-pub const NELOG_NetlogonNdncSiteCovered: ::DWORD = ERRLOG2_BASE + 92;
-pub const NELOG_NetlogonNdncSiteNotCovered: ::DWORD = ERRLOG2_BASE + 93;
-pub const NELOG_NetlogonDcOldSiteCovered: ::DWORD = ERRLOG2_BASE + 94;
-pub const NELOG_NetlogonDcSiteNotCoveredAuto: ::DWORD = ERRLOG2_BASE + 95;
-pub const NELOG_NetlogonGcOldSiteCovered: ::DWORD = ERRLOG2_BASE + 96;
-pub const NELOG_NetlogonGcSiteNotCoveredAuto: ::DWORD = ERRLOG2_BASE + 97;
-pub const NELOG_NetlogonNdncOldSiteCovered: ::DWORD = ERRLOG2_BASE + 98;
-pub const NELOG_NetlogonNdncSiteNotCoveredAuto: ::DWORD = ERRLOG2_BASE + 99;
-pub const NELOG_NetlogonSpnMultipleSamAccountNames: ::DWORD = ERRLOG2_BASE + 100;
-pub const NELOG_NetlogonSpnCrackNamesFailure: ::DWORD = ERRLOG2_BASE + 101;
-pub const NELOG_NetlogonNoAddressToSiteMapping: ::DWORD = ERRLOG2_BASE + 102;
-pub const NELOG_NetlogonInvalidGenericParameterValue: ::DWORD = ERRLOG2_BASE + 103;
-pub const NELOG_NetlogonInvalidDwordParameterValue: ::DWORD = ERRLOG2_BASE + 104;
-pub const NELOG_NetlogonServerAuthFailedNoAccount: ::DWORD = ERRLOG2_BASE + 105;
-pub const NELOG_NetlogonNoDynamicDnsManual: ::DWORD = ERRLOG2_BASE + 106;
-pub const NELOG_NetlogonNoSiteForClients: ::DWORD = ERRLOG2_BASE + 107;
-pub const NELOG_NetlogonDnsDeregAborted: ::DWORD = ERRLOG2_BASE + 108;
-pub const NELOG_NetlogonRpcPortRequestFailure: ::DWORD = ERRLOG2_BASE + 109;
-pub const NELOG_NetlogonPartialSiteMappingForClients: ::DWORD = ERRLOG2_BASE + 110;
-pub const NELOG_NetlogonRemoteDynamicDnsRegisterFailure: ::DWORD = ERRLOG2_BASE + 111;
-pub const NELOG_NetlogonRemoteDynamicDnsDeregisterFailure: ::DWORD = ERRLOG2_BASE + 112;
-pub const NELOG_NetlogonRejectedRemoteDynamicDnsRegister: ::DWORD = ERRLOG2_BASE + 113;
-pub const NELOG_NetlogonRejectedRemoteDynamicDnsDeregister: ::DWORD = ERRLOG2_BASE + 114;
-pub const NELOG_NetlogonRemoteDynamicDnsUpdateRequestFailure: ::DWORD = ERRLOG2_BASE + 115;
-pub const NELOG_NetlogonUserValidationReqInitialTimeOut: ::DWORD = ERRLOG2_BASE + 116;
-pub const NELOG_NetlogonUserValidationReqRecurringTimeOut: ::DWORD = ERRLOG2_BASE + 117;
-pub const NELOG_NetlogonUserValidationReqWaitInitialWarning: ::DWORD = ERRLOG2_BASE + 118;
-pub const NELOG_NetlogonUserValidationReqWaitRecurringWarning: ::DWORD = ERRLOG2_BASE + 119;
-pub const NELOG_NetlogonFailedToAddAuthzRpcInterface: ::DWORD = ERRLOG2_BASE + 120;
-pub const NELOG_NetLogonFailedToInitializeAuthzRm: ::DWORD = ERRLOG2_BASE + 121;
-pub const NELOG_NetLogonFailedToInitializeRPCSD: ::DWORD = ERRLOG2_BASE + 122;
-pub const NELOG_NetlogonMachinePasswdSetSucceeded: ::DWORD = ERRLOG2_BASE + 123;
-pub const NELOG_NetlogonMsaPasswdSetSucceeded: ::DWORD = ERRLOG2_BASE + 124;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmjoin.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmjoin.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lmjoin.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lmjoin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// Definitions and prototypes for the Net setup apis
-ENUM!{enum NETSETUP_NAME_TYPE {
-    NetSetupUnknown = 0,
-    NetSetupMachine,
-    NetSetupWorkgroup,
-    NetSetupDomain,
-    NetSetupNonExistentDomain,
-    NetSetupDnsMachine,
-}}
-pub type PNETSETUP_NAME_TYPE = *mut NETSETUP_NAME_TYPE;
-ENUM!{enum NETSETUP_JOIN_STATUS {
-    NetSetupUnknownStatus = 0,
-    NetSetupUnjoined,
-    NetSetupWorkgroupName,
-    NetSetupDomainName,
-}}
-pub type PNETSETUP_JOIN_STATUS = *mut NETSETUP_JOIN_STATUS;
-pub const NETSETUP_JOIN_DOMAIN: ::DWORD = 0x00000001;
-pub const NETSETUP_ACCT_CREATE: ::DWORD = 0x00000002;
-pub const NETSETUP_ACCT_DELETE: ::DWORD = 0x00000004;
-pub const NETSETUP_WIN9X_UPGRADE: ::DWORD = 0x00000010;
-pub const NETSETUP_DOMAIN_JOIN_IF_JOINED: ::DWORD = 0x00000020;
-pub const NETSETUP_JOIN_UNSECURE: ::DWORD = 0x00000040;
-pub const NETSETUP_MACHINE_PWD_PASSED: ::DWORD = 0x00000080;
-pub const NETSETUP_DEFER_SPN_SET: ::DWORD = 0x00000100;
-pub const NETSETUP_JOIN_DC_ACCOUNT: ::DWORD = 0x00000200;
-pub const NETSETUP_JOIN_WITH_NEW_NAME: ::DWORD = 0x00000400;
-pub const NETSETUP_JOIN_READONLY: ::DWORD = 0x00000800;
-pub const NETSETUP_DNS_NAME_CHANGES_ONLY: ::DWORD = 0x00001000;
-pub const NETSETUP_INSTALL_INVOCATION: ::DWORD = 0x00040000;
-pub const NETSETUP_AMBIGUOUS_DC: ::DWORD = 0x00001000;
-pub const NETSETUP_NO_NETLOGON_CACHE: ::DWORD = 0x00002000;
-pub const NETSETUP_DONT_CONTROL_SERVICES: ::DWORD = 0x00004000;
-pub const NETSETUP_SET_MACHINE_NAME: ::DWORD = 0x00008000;
-pub const NETSETUP_FORCE_SPN_SET: ::DWORD = 0x00010000;
-pub const NETSETUP_NO_ACCT_REUSE: ::DWORD = 0x00020000;
-pub const NETSETUP_ALT_SAMACCOUNTNAME: ::DWORD = 0x00020000;
-pub const NETSETUP_IGNORE_UNSUPPORTED_FLAGS: ::DWORD = 0x10000000;
-pub const NETSETUP_VALID_UNJOIN_FLAGS: ::DWORD = NETSETUP_ACCT_DELETE
-    | NETSETUP_IGNORE_UNSUPPORTED_FLAGS | NETSETUP_JOIN_DC_ACCOUNT;
-pub const NETSETUP_PROCESS_OFFLINE_FLAGS: ::DWORD = NETSETUP_JOIN_DOMAIN
-    | NETSETUP_DOMAIN_JOIN_IF_JOINED | NETSETUP_JOIN_WITH_NEW_NAME | NETSETUP_DONT_CONTROL_SERVICES
-    | NETSETUP_MACHINE_PWD_PASSED;
-pub const NETSETUP_PROVISION_DOWNLEVEL_PRIV_SUPPORT: ::DWORD = 0x00000001;
-pub const NETSETUP_PROVISION_REUSE_ACCOUNT: ::DWORD = 0x00000002;
-pub const NETSETUP_PROVISION_USE_DEFAULT_PASSWORD: ::DWORD = 0x00000004;
-pub const NETSETUP_PROVISION_SKIP_ACCOUNT_SEARCH: ::DWORD = 0x00000008;
-pub const NETSETUP_PROVISION_ROOT_CA_CERTS: ::DWORD = 0x00000010;
-pub const NETSETUP_PROVISION_PERSISTENTSITE: ::DWORD = 0x00000020;
-pub const NETSETUP_PROVISION_ONLINE_CALLER: ::DWORD = 0x40000000;
-pub const NETSETUP_PROVISION_CHECK_PWD_ONLY: ::DWORD = 0x80000000;
-pub const NETSETUP_PROVISIONING_PARAMS_WIN8_VERSION: ::DWORD = 0x00000001;
-pub const NETSETUP_PROVISIONING_PARAMS_CURRENT_VERSION: ::DWORD = 0x00000002;
-STRUCT!{struct NETSETUP_PROVISIONING_PARAMS {
-    dwVersion: ::DWORD,
-    lpDomain: ::LPCWSTR,
-    lpHostName: ::LPCWSTR,
-    lpMachineAccountOU: ::LPCWSTR,
-    lpDcName: ::LPCWSTR,
-    dwProvisionOptions: ::DWORD,
-    aCertTemplateNames: *mut ::LPCWSTR,
-    cCertTemplateNames: ::DWORD,
-    aMachinePolicyNames: *mut ::LPCWSTR,
-    cMachinePolicyNames: ::DWORD,
-    aMachinePolicyPaths: *mut ::LPCWSTR,
-    cMachinePolicyPaths: ::DWORD,
-    lpNetbiosName: ::LPWSTR,
-    lpSiteName: ::LPWSTR,
-    lpPrimaryDNSDomain: ::LPWSTR,
-}}
-pub type PNETSETUP_PROVISIONING_PARAMS = *mut NETSETUP_PROVISIONING_PARAMS;
-ENUM!{enum NET_COMPUTER_NAME_TYPE {
-    NetPrimaryComputerName,
-    NetAlternateComputerNames,
-    NetAllComputerNames,
-    NetComputerNameTypeMax,
-}}
-pub type PNET_COMPUTER_NAME_TYPE = *mut NET_COMPUTER_NAME_TYPE;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lsalookup.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lsalookup.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/lsalookup.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/lsalookup.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! LSA Policy Lookup API
-STRUCT!{struct LSA_UNICODE_STRING {
-    Length: ::USHORT,
-    MaximumLength: ::USHORT,
-    Buffer: ::PWSTR,
-}}
-pub type PLSA_UNICODE_STRING = *mut LSA_UNICODE_STRING;
-STRUCT!{struct LSA_STRING {
-    Length: ::USHORT,
-    MaximumLength: ::USHORT,
-    Buffer: ::PCHAR,
-}}
-pub type PLSA_STRING = *mut LSA_STRING;
-STRUCT!{struct LSA_OBJECT_ATTRIBUTES {
-    Length: ::ULONG,
-    RootDirectory: ::HANDLE,
-    ObjectName: PLSA_UNICODE_STRING,
-    Attributes: ::ULONG,
-    SecurityDescriptor: ::PVOID,
-    SecurityQualityOfService: ::PVOID,
-}}
-pub type PLSA_OBJECT_ATTRIBUTES = *mut LSA_OBJECT_ATTRIBUTES;
-STRUCT!{struct LSA_TRUST_INFORMATION {
-    Name: LSA_UNICODE_STRING,
-    Sid: ::PSID,
-}}
-pub type PLSA_TRUST_INFORMATION = *mut LSA_TRUST_INFORMATION;
-STRUCT!{struct LSA_REFERENCED_DOMAIN_LIST {
-    Entries: ::ULONG,
-    Domains: PLSA_TRUST_INFORMATION,
-}}
-pub type PLSA_REFERENCED_DOMAIN_LIST = *mut LSA_REFERENCED_DOMAIN_LIST;
-STRUCT!{struct LSA_TRANSLATED_SID2 {
-    Use: ::SID_NAME_USE,
-    Sid: ::PSID,
-    DomainIndex: ::LONG,
-    Flags: ::ULONG,
-}}
-pub type PLSA_TRANSLATED_SID2 = *mut LSA_TRANSLATED_SID2;
-STRUCT!{struct LSA_TRANSLATED_NAME {
-    Use: ::SID_NAME_USE,
-    Name: LSA_UNICODE_STRING,
-    DomainIndex: ::LONG,
-}}
-pub type PLSA_TRANSLATED_NAME = *mut LSA_TRANSLATED_NAME;
-STRUCT!{struct POLICY_ACCOUNT_DOMAIN_INFO {
-    DomainName: LSA_UNICODE_STRING,
-    DomainSid: ::PSID,
-}}
-pub type PPOLICY_ACCOUNT_DOMAIN_INFO = *mut POLICY_ACCOUNT_DOMAIN_INFO;
-STRUCT!{struct POLICY_DNS_DOMAIN_INFO {
-    Name: LSA_UNICODE_STRING,
-    DnsDomainName: LSA_UNICODE_STRING,
-    DnsForestName: LSA_UNICODE_STRING,
-    DomainGuid: ::GUID,
-    Sid: ::PSID,
-}}
-pub type PPOLICY_DNS_DOMAIN_INFO = *mut POLICY_DNS_DOMAIN_INFO;
-pub const LOOKUP_VIEW_LOCAL_INFORMATION: ::ACCESS_MASK = 0x00000001;
-pub const LOOKUP_TRANSLATE_NAMES: ::ACCESS_MASK = 0x00000800;
-ENUM!{enum LSA_LOOKUP_DOMAIN_INFO_CLASS {
-    AccountDomainInformation = 5,
-    DnsDomainInformation = 12,
-}}
-pub type PLSA_LOOKUP_DOMAIN_INFO_CLASS = *mut LSA_LOOKUP_DOMAIN_INFO_CLASS;
-pub type LSA_LOOKUP_HANDLE = ::PVOID;
-pub type PLSA_LOOKUP_HANDLE = *mut ::PVOID;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/macros.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/macros.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Macros to make things easier to define
-macro_rules! DECLARE_HANDLE {
-    ($name:ident, $inner:ident) => {
-        #[allow(missing_copy_implementations)] pub enum $inner { }
-        pub type $name = *mut $inner;
-    };
-}
-macro_rules! MAKE_HRESULT {
-    ($sev:expr, $fac:expr, $code:expr) => {
-        ($sev << 31) | ($fac << 16) | $code
-    }
-}
-macro_rules! MAKE_SCODE {
-    ($sev:expr, $fac:expr, $code:expr) => {
-        ($sev << 31) | ($fac << 16) | $code
-    }
-}
-macro_rules! HIDP_ERROR_CODES {
-    ($sev:expr, $code:expr) => {
-        ($sev << 28) | (::FACILITY_HID_ERROR_CODE << 16) | $code
-    }
-}
-macro_rules! MAKEFOURCC {
-    ($a:expr, $b:expr, $c:expr, $d:expr) => {
-        ($a as i32) | (($b as i32) << 8) | (($c as i32) << 16) | (($d as i32) << 24)
-    }
-}
-#[macro_export]
-macro_rules! DEFINE_GUID {
-    (
-        $name:ident, $l:expr, $w1:expr, $w2:expr, $b1:expr, $b2:expr, $b3:expr, $b4:expr, $b5:expr,
-        $b6:expr, $b7:expr, $b8:expr
-    ) => {
-        pub const $name: $crate::GUID = $crate::GUID {
-            Data1: $l,
-            Data2: $w1,
-            Data3: $w2,
-            Data4: [$b1, $b2, $b3, $b4, $b5, $b6, $b7, $b8],
-        };
-    }
-}
-macro_rules! CTL_CODE {
-    ($DeviceType:expr, $Function:expr, $Method:expr, $Access:expr) => {
-        ($DeviceType << 16) | ($Access << 14) | ($Function << 2) | $Method
-    }
-}
-macro_rules! HID_CTL_CODE {
-    ($id:expr) => {
-        CTL_CODE!(::FILE_DEVICE_KEYBOARD, $id, ::METHOD_NEITHER, ::FILE_ANY_ACCESS)
-    }
-}
-macro_rules! HID_BUFFER_CTL_CODE {
-    ($id:expr) => {
-        CTL_CODE!(::FILE_DEVICE_KEYBOARD, $id, ::METHOD_BUFFERED, ::FILE_ANY_ACCESS)
-    }
-}
-macro_rules! HID_IN_CTL_CODE {
-    ($id:expr) => {
-        CTL_CODE!(::FILE_DEVICE_KEYBOARD, $id, ::METHOD_IN_DIRECT, ::FILE_ANY_ACCESS)
-    }
-}
-macro_rules! HID_OUT_CTL_CODE {
-    ($id:expr) => {
-        CTL_CODE!(::FILE_DEVICE_KEYBOARD, $id, ::METHOD_OUT_DIRECT, ::FILE_ANY_ACCESS)
-    }
-}
-macro_rules! AUDCLNT_ERR {
-    ($n:expr) => {
-        MAKE_HRESULT!(::SEVERITY_ERROR, ::FACILITY_AUDCLNT, $n)
-    };
-}
-macro_rules! AUDCLNT_SUCCESS {
-    ($n:expr) => {
-        MAKE_SCODE!(::SEVERITY_SUCCESS, ::FACILITY_AUDCLNT, $n)
-    };
-}
-macro_rules! BCRYPT_MAKE_INTERFACE_VERSION {
-    ($major:expr, $minor:expr) => {
-        ::BCRYPT_INTERFACE_VERSION { MajorVersion: $major, MinorVersion: $minor }
-    }
-}
-#[macro_export]
-macro_rules! RIDL {
-    (interface $interface:ident ($vtbl:ident)
-        {$(
-            fn $method:ident(&mut self $(,$p:ident : $t:ty)*) -> $rtr:ty
-        ),+}
-    ) => {
-        #[repr(C)] #[allow(missing_copy_implementations)]
-        pub struct $vtbl {
-            $(pub $method: unsafe extern "system" fn(
-                This: *mut $interface
-                $(,$p: $t)*
-            ) -> $rtr),+
-        }
-        #[repr(C)] #[derive(Debug)] #[allow(missing_copy_implementations)]
-        pub struct $interface {
-            pub lpVtbl: *const $vtbl
-        }
-        impl $interface {
-            #[inline]
-            $(pub unsafe fn $method(&mut self $(,$p: $t)*) -> $rtr {
-                ((*self.lpVtbl).$method)(self $(,$p)*)
-            })+
-        }
-    };
-    (interface $interface:ident ($vtbl:ident) : $pinterface:ident ($pvtbl:ident) {
-    }) => {
-        #[repr(C)] #[allow(missing_copy_implementations)]
-        pub struct $vtbl {
-            pub parent: $crate::$pvtbl
-        }
-        #[repr(C)] #[derive(Debug)] #[allow(missing_copy_implementations)]
-        pub struct $interface {
-            pub lpVtbl: *const $vtbl
-        }
-        impl ::std::ops::Deref for $interface {
-            type Target = $crate::$pinterface;
-            #[inline]
-            fn deref(&self) -> &$crate::$pinterface {
-                unsafe { ::std::mem::transmute(self) }
-            }
-        }
-        impl ::std::ops::DerefMut for $interface {
-            #[inline]
-            fn deref_mut(&mut self) -> &mut $crate::$pinterface {
-                unsafe { ::std::mem::transmute(self) }
-            }
-        }
-    };
-    (interface $interface:ident ($vtbl:ident) : $pinterface:ident ($pvtbl:ident)
-        {$(
-            fn $method:ident(&mut self $(,$p:ident : $t:ty)*) -> $rtr:ty
-        ),+}
-    ) => {
-        #[repr(C)] #[allow(missing_copy_implementations)]
-        pub struct $vtbl {
-            pub parent: $crate::$pvtbl
-            $(,pub $method: unsafe extern "system" fn(
-                This: *mut $interface
-                $(,$p: $t)*
-            ) -> $rtr)+
-        }
-        #[repr(C)] #[derive(Debug)] #[allow(missing_copy_implementations)]
-        pub struct $interface {
-            pub lpVtbl: *const $vtbl
-        }
-        impl $interface {
-            #[inline]
-            $(pub unsafe fn $method(&mut self $(,$p: $t)*) -> $rtr {
-                ((*self.lpVtbl).$method)(self $(,$p)*)
-            })+
-        }
-        impl ::std::ops::Deref for $interface {
-            type Target = $crate::$pinterface;
-            #[inline]
-            fn deref(&self) -> &$crate::$pinterface {
-                unsafe { ::std::mem::transmute(self) }
-            }
-        }
-        impl ::std::ops::DerefMut for $interface {
-            #[inline]
-            fn deref_mut(&mut self) -> &mut $crate::$pinterface {
-                unsafe { ::std::mem::transmute(self) }
-            }
-        }
-    };
-}
-macro_rules! UNION {
-    ($base:ident, $field:ident, $variant:ident, $variantmut:ident, $fieldtype:ty) => {
-        impl $base {
-            #[inline]
-            pub unsafe fn $variant(&self) -> &$fieldtype {
-                ::std::mem::transmute(&self.$field)
-            }
-            #[inline]
-            pub unsafe fn $variantmut(&mut self) -> &mut $fieldtype {
-                ::std::mem::transmute(&mut self.$field)
-            }
-        }
-    }
-}
-macro_rules! BITFIELD {
-    ($base:ident $field:ident: $fieldtype:ty [
-        $($thing:ident $set_thing:ident[$r:expr],)+
-    ]) => {
-        impl $base {$(
-            #[inline]
-            pub fn $thing(&self) -> $fieldtype {
-                let size = ::std::mem::size_of::<$fieldtype>() * 8;
-                self.$field << (size - $r.end) >> (size - $r.end + $r.start)
-            }
-            #[inline]
-            pub fn $set_thing(&mut self, val: $fieldtype) {
-                let mask = ((1 << ($r.end - $r.start)) - 1) << $r.start;
-                self.$field &= !mask;
-                self.$field |= (val << $r.start) & mask;
-            }
-        )+}
-    }
-}
-#[macro_export]
-macro_rules! ENUM {
-    {enum $name:ident { $($variant:ident = $value:expr,)+ }} => {
-        #[repr(C)] #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-        pub struct $name(pub u32);
-        $(pub const $variant: $name = $name($value);)+
-    };
-    {enum $name:ident { $variant:ident = $value:expr, $($rest:tt)* }} => {
-        #[repr(C)] #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-        pub struct $name(pub u32);
-        pub const $variant: $name = $name($value);
-        ENUM!{@gen $name, $variant, $($rest)*}
-    };
-    {enum $name:ident { $variant:ident, $($rest:tt)* }} => {
-        ENUM!{enum $name { $variant = 0, $($rest)* }}
-    };
-    {@gen $name:ident, $base:ident,} => {};
-    {@gen $name:ident, $base:ident, $variant:ident = $value:expr, $($rest:tt)*} => {
-        pub const $variant: $name = $name($value);
-        ENUM!{@gen $name, $variant, $($rest)*}
-    };
-    {@gen $name:ident, $base:ident, $variant:ident, $($rest:tt)*} => {
-        pub const $variant: $name = $name($base.0 + 1u32);
-        ENUM!{@gen $name, $variant, $($rest)*}
-    };
-}
-macro_rules! FLAGS {
-    {enum $name:ident { $($variant:ident = $value:expr,)+ }} => {
-        #[repr(C)] #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-        pub struct $name(pub u32);
-        $(pub const $variant: $name = $name($value);)+
-        impl ::std::ops::BitAnd<$name> for $name {
-            type Output = $name;
-            fn bitand(self, o: $name) -> $name { $name(self.0 & o.0) }
-        }
-        impl ::std::ops::BitOr<$name> for $name {
-            type Output = $name;
-            fn bitor(self, o: $name) -> $name { $name(self.0 | o.0) }
-        }
-        impl ::std::ops::BitXor<$name> for $name {
-            type Output = $name;
-            fn bitxor(self, o: $name) -> $name { $name(self.0 ^ o.0) }
-        }
-        impl ::std::ops::Not for $name {
-            type Output = $name;
-            fn not(self) -> $name { $name(!self.0) }
-        }
-    }
-}
-macro_rules! STRUCT {
-    {$(#[$attrs:meta])* nodebug struct $name:ident { $($field:ident: $ftype:ty,)+ }} => {
-        #[repr(C)] $(#[$attrs])*
-        pub struct $name {
-            $(pub $field: $ftype,)+
-        }
-        impl Copy for $name {}
-        impl Clone for $name { fn clone(&self) -> $name { *self } }
-    };
-    {$(#[$attrs:meta])* struct $name:ident { $($field:ident: $ftype:ty,)+ }} => {
-        #[repr(C)] #[derive(Debug)] $(#[$attrs])*
-        pub struct $name {
-            $(pub $field: $ftype,)+
-        }
-        impl Copy for $name {}
-        impl Clone for $name { fn clone(&self) -> $name { *self } }
-    };
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/memoryapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/memoryapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/memoryapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/memoryapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-memory-l1-1-0
-pub const FILE_MAP_WRITE: ::DWORD = ::SECTION_MAP_WRITE;
-pub const FILE_MAP_READ: ::DWORD = ::SECTION_MAP_READ;
-pub const FILE_MAP_ALL_ACCESS: ::DWORD = ::SECTION_ALL_ACCESS;
-pub const FILE_MAP_EXECUTE: ::DWORD = ::SECTION_MAP_EXECUTE_EXPLICIT;
-pub const FILE_MAP_COPY: ::DWORD = 0x00000001;
-pub const FILE_MAP_RESERVE: ::DWORD = 0x80000000;
-ENUM!{enum MEMORY_RESOURCE_NOTIFICATION_TYPE {
-    LowMemoryResourceNotification,
-    HighMemoryResourceNotification,
-}}
-STRUCT!{struct WIN32_MEMORY_RANGE_ENTRY {
-    VirtualAddress: ::PVOID,
-    NumberOfBytes: ::SIZE_T,
-}}
-pub type PWIN32_MEMORY_RANGE_ENTRY = *mut WIN32_MEMORY_RANGE_ENTRY;
-pub type PBAD_MEMORY_CALLBACK_ROUTINE = Option<unsafe extern "system" fn()>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/minschannel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/minschannel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/minschannel.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/minschannel.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Public Definitions for MIN SCHANNEL Security Provider
-
-pub const SECPKG_ATTR_ISSUER_LIST: ::DWORD = 0x50;
-pub const SECPKG_ATTR_REMOTE_CRED: ::DWORD = 0x51;
-pub const SECPKG_ATTR_LOCAL_CRED: ::DWORD = 0x52;
-pub const SECPKG_ATTR_REMOTE_CERT_CONTEXT: ::DWORD = 0x53;
-pub const SECPKG_ATTR_LOCAL_CERT_CONTEXT: ::DWORD = 0x54;
-pub const SECPKG_ATTR_ROOT_STORE: ::DWORD = 0x55;
-pub const SECPKG_ATTR_SUPPORTED_ALGS: ::DWORD = 0x56;
-pub const SECPKG_ATTR_CIPHER_STRENGTHS: ::DWORD = 0x57;
-pub const SECPKG_ATTR_SUPPORTED_PROTOCOLS: ::DWORD = 0x58;
-pub const SECPKG_ATTR_ISSUER_LIST_EX: ::DWORD = 0x59;
-pub const SECPKG_ATTR_CONNECTION_INFO: ::DWORD = 0x5a;
-pub const SECPKG_ATTR_EAP_KEY_BLOCK: ::DWORD = 0x5b;
-pub const SECPKG_ATTR_MAPPED_CRED_ATTR: ::DWORD = 0x5c;
-pub const SECPKG_ATTR_SESSION_INFO: ::DWORD = 0x5d;
-pub const SECPKG_ATTR_APP_DATA: ::DWORD = 0x5e;
-pub const SECPKG_ATTR_REMOTE_CERTIFICATES: ::DWORD = 0x5F;
-pub const SECPKG_ATTR_CLIENT_CERT_POLICY: ::DWORD = 0x60;
-pub const SECPKG_ATTR_CC_POLICY_RESULT: ::DWORD = 0x61;
-pub const SECPKG_ATTR_USE_NCRYPT: ::DWORD = 0x62;
-pub const SECPKG_ATTR_LOCAL_CERT_INFO: ::DWORD = 0x63;
-pub const SECPKG_ATTR_CIPHER_INFO: ::DWORD = 0x64;
-pub const SECPKG_ATTR_EAP_PRF_INFO: ::DWORD = 0x65;
-pub const SECPKG_ATTR_SUPPORTED_SIGNATURES: ::DWORD = 0x66;
-pub const SECPKG_ATTR_REMOTE_CERT_CHAIN: ::DWORD = 0x67;
-pub const SECPKG_ATTR_UI_INFO: ::DWORD = 0x68;
-pub const SECPKG_ATTR_EARLY_START: ::DWORD = 0x69;
-
-STRUCT!{struct SecPkgCred_SupportedAlgs {
-	cSupportedAlgs: ::DWORD,
-	palgSupportedAlgs: ::ALG_ID,
-}}
-
-STRUCT!{struct SecPkgCred_CipherStrengths {
-	dwMinimumCipherStrength: ::DWORD,
-	dwMaximumCipherStrength: ::DWORD,
-}}
-
-STRUCT!{struct SecPkgCred_SupportedProtocols {
-	grbitProtocol: ::DWORD,
-}}
-
-STRUCT!{struct SecPkgCred_ClientCertPolicy {
-	dwFlags: ::DWORD,
-	guidPolicyId: ::GUID,
-	dwCertFlags: ::DWORD,
-	dwUrlRetrievalTimeout: ::DWORD,
-	fCheckRevocationFreshnessTime: ::BOOL,
-	dwRevocationFreshnessTime: ::DWORD,
-	fOmitUsageCheck: ::BOOL,
-	pwszSslCtlStoreName: ::LPWSTR,
-	pwszSslCtlIdentifier: ::LPWSTR,
-}}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/minwinbase.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/minwinbase.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/minwinbase.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/minwinbase.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,253 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the 32-Bit Windows Base APIs
-STRUCT!{struct SECURITY_ATTRIBUTES {
-    nLength: ::DWORD,
-    lpSecurityDescriptor: ::LPVOID,
-    bInheritHandle: ::BOOL,
-}}
-pub type PSECURITY_ATTRIBUTES = *mut SECURITY_ATTRIBUTES;
-pub type LPSECURITY_ATTRIBUTES = *mut SECURITY_ATTRIBUTES;
-STRUCT!{struct OVERLAPPED {
-    Internal: ::ULONG_PTR,
-    InternalHigh: ::ULONG_PTR,
-    Offset: ::DWORD,
-    OffsetHigh: ::DWORD,
-    hEvent: ::HANDLE,
-}}
-UNION!(OVERLAPPED, Offset, Pointer, Pointer_mut, ::PVOID);
-pub type LPOVERLAPPED = *mut OVERLAPPED;
-STRUCT!{struct OVERLAPPED_ENTRY {
-    lpCompletionKey: ::ULONG_PTR,
-    lpOverlapped: LPOVERLAPPED,
-    Internal: ::ULONG_PTR,
-    dwNumberOfBytesTransferred: ::DWORD,
-}}
-pub type LPOVERLAPPED_ENTRY = *mut OVERLAPPED_ENTRY;
-STRUCT!{struct SYSTEMTIME {
-    wYear: ::WORD,
-    wMonth: ::WORD,
-    wDayOfWeek: ::WORD,
-    wDay: ::WORD,
-    wHour: ::WORD,
-    wMinute: ::WORD,
-    wSecond: ::WORD,
-    wMilliseconds: ::WORD,
-}}
-pub type PSYSTEMTIME = *mut SYSTEMTIME;
-pub type LPSYSTEMTIME = *mut SYSTEMTIME;
-STRUCT!{nodebug struct WIN32_FIND_DATAA {
-    dwFileAttributes: ::DWORD,
-    ftCreationTime: ::FILETIME,
-    ftLastAccessTime: ::FILETIME,
-    ftLastWriteTime: ::FILETIME,
-    nFileSizeHigh: ::DWORD,
-    nFileSizeLow: ::DWORD,
-    dwReserved0: ::DWORD,
-    dwReserved1: ::DWORD,
-    cFileName: [::CHAR; ::MAX_PATH],
-    cAlternateFileName: [::CHAR; 14],
-}}
-pub type PWIN32_FIND_DATAA = *mut WIN32_FIND_DATAA;
-pub type LPWIN32_FIND_DATAA = *mut WIN32_FIND_DATAA;
-STRUCT!{nodebug struct WIN32_FIND_DATAW {
-    dwFileAttributes: ::DWORD,
-    ftCreationTime: ::FILETIME,
-    ftLastAccessTime: ::FILETIME,
-    ftLastWriteTime: ::FILETIME,
-    nFileSizeHigh: ::DWORD,
-    nFileSizeLow: ::DWORD,
-    dwReserved0: ::DWORD,
-    dwReserved1: ::DWORD,
-    cFileName: [::WCHAR; ::MAX_PATH],
-    cAlternateFileName: [::WCHAR; 14],
-}}
-pub type PWIN32_FIND_DATAW = *mut WIN32_FIND_DATAW;
-pub type LPWIN32_FIND_DATAW = *mut WIN32_FIND_DATAW;
-ENUM!{enum FINDEX_INFO_LEVELS {
-    FindExInfoStandard,
-    FindExInfoBasic,
-    FindExInfoMaxInfoLevel,
-}}
-pub const FIND_FIRST_EX_CASE_SENSITIVE: ::DWORD = 0x00000001;
-pub const FIND_FIRST_EX_LARGE_FETCH: ::DWORD = 0x00000002;
-ENUM!{enum FINDEX_SEARCH_OPS {
-    FindExSearchNameMatch,
-    FindExSearchLimitToDirectories,
-    FindExSearchLimitToDevices,
-    FindExSearchMaxSearchOp,
-}}
-ENUM!{enum GET_FILEEX_INFO_LEVELS {
-    GetFileExInfoStandard,
-    GetFileExMaxInfoLevel,
-}}
-ENUM!{enum FILE_INFO_BY_HANDLE_CLASS {
-    FileBasicInfo,
-    FileStandardInfo,
-    FileNameInfo,
-    FileRenameInfo,
-    FileDispositionInfo,
-    FileAllocationInfo,
-    FileEndOfFileInfo,
-    FileStreamInfo,
-    FileCompressionInfo,
-    FileAttributeTagInfo,
-    FileIdBothDirectoryInfo,
-    FileIdBothDirectoryRestartInfo,
-    FileIoPriorityHintInfo,
-    FileRemoteProtocolInfo,
-    FileFullDirectoryInfo,
-    FileFullDirectoryRestartInfo,
-    FileStorageInfo,
-    FileAlignmentInfo,
-    FileIdInfo,
-    FileIdExtdDirectoryInfo,
-    FileIdExtdDirectoryRestartInfo,
-    MaximumFileInfoByHandleClass,
-}}
-pub type PFILE_INFO_BY_HANDLE_CLASS = *mut FILE_INFO_BY_HANDLE_CLASS;
-pub type CRITICAL_SECTION = ::RTL_CRITICAL_SECTION;
-pub type PCRITICAL_SECTION = ::PRTL_CRITICAL_SECTION;
-pub type LPCRITICAL_SECTION = ::PRTL_CRITICAL_SECTION;
-pub type CRITICAL_SECTION_DEBUG = ::RTL_CRITICAL_SECTION_DEBUG;
-pub type PCRITICAL_SECTION_DEBUG = ::PRTL_CRITICAL_SECTION_DEBUG;
-pub type LPCRITICAL_SECTION_DEBUG = ::PRTL_CRITICAL_SECTION_DEBUG;
-pub type LPOVERLAPPED_COMPLETION_ROUTINE = Option<unsafe extern "system" fn(
-    dwErrorCode: ::DWORD, dwNumberOfBytesTransfered: ::DWORD, lpOverlapped: LPOVERLAPPED,
-)>;
-pub const LOCKFILE_FAIL_IMMEDIATELY: ::DWORD = 0x00000001;
-pub const LOCKFILE_EXCLUSIVE_LOCK: ::DWORD = 0x00000002;
-STRUCT!{struct PROCESS_HEAP_ENTRY_Block {
-    hMem: ::HANDLE,
-    dwReserved: [::DWORD; 3],
-}}
-STRUCT!{struct PROCESS_HEAP_ENTRY_Region {
-    dwCommittedSize: ::DWORD,
-    dwUnCommittedSize: ::DWORD,
-    lpFirstBlock: ::LPVOID,
-    lpLastBlock: ::LPVOID,
-}}
-STRUCT!{struct PROCESS_HEAP_ENTRY {
-    lpData: ::PVOID,
-    cbData: ::DWORD,
-    cbOverhead: ::BYTE,
-    iRegionIndex: ::BYTE,
-    wFlags: ::WORD,
-    Region: PROCESS_HEAP_ENTRY_Region,
-}}
-UNION!(PROCESS_HEAP_ENTRY, Region, Block, Block_mut, PROCESS_HEAP_ENTRY_Block);
-pub type LPPROCESS_HEAP_ENTRY = *mut PROCESS_HEAP_ENTRY;
-pub type PPROCESS_HEAP_ENTRY = *mut PROCESS_HEAP_ENTRY;
-pub const PROCESS_HEAP_REGION: ::WORD = 0x0001;
-pub const PROCESS_HEAP_UNCOMMITTED_RANGE: ::WORD = 0x0002;
-pub const PROCESS_HEAP_ENTRY_BUSY: ::WORD = 0x0004;
-pub const PROCESS_HEAP_SEG_ALLOC: ::WORD = 0x0008;
-pub const PROCESS_HEAP_ENTRY_MOVEABLE: ::WORD = 0x0010;
-pub const PROCESS_HEAP_ENTRY_DDESHARE: ::WORD = 0x0020;
-pub type PTHREAD_START_ROUTINE = Option<unsafe extern "system" fn(
-    lpThreadParameter: ::LPVOID,
-) -> ::DWORD>;
-pub type LPTHREAD_START_ROUTINE = PTHREAD_START_ROUTINE;
-pub type LPCONTEXT = ::PCONTEXT;
-STRUCT!{struct REASON_CONTEXT_Detailed {
-    LocalizedReasonModule: ::HMODULE,
-    LocalizedReasonId: ::ULONG,
-    ReasonStringCount: ::ULONG,
-    ReasonStrings: *mut ::LPWSTR,
-}}
-STRUCT!{struct REASON_CONTEXT {
-    Version: ::ULONG,
-    Flags: ::DWORD,
-    Reason: REASON_CONTEXT_Detailed,
-}}
-UNION!(REASON_CONTEXT, Reason, SimpleReasonString, SimpleReasonString_mut, ::LPWSTR);
-pub type PREASON_CONTEXT = *mut REASON_CONTEXT;
-pub const EXCEPTION_DEBUG_EVENT: ::DWORD = 1;
-pub const CREATE_THREAD_DEBUG_EVENT: ::DWORD = 2;
-pub const CREATE_PROCESS_DEBUG_EVENT: ::DWORD = 3;
-pub const EXIT_THREAD_DEBUG_EVENT: ::DWORD = 4;
-pub const EXIT_PROCESS_DEBUG_EVENT: ::DWORD = 5;
-pub const LOAD_DLL_DEBUG_EVENT: ::DWORD = 6;
-pub const UNLOAD_DLL_DEBUG_EVENT: ::DWORD = 7;
-pub const OUTPUT_DEBUG_STRING_EVENT: ::DWORD = 8;
-pub const RIP_EVENT: ::DWORD = 9;
-STRUCT!{struct EXCEPTION_DEBUG_INFO {
-    ExceptionRecord: ::EXCEPTION_RECORD,
-    dwFirstChance: ::DWORD,
-}}
-pub type LPEXCEPTION_DEBUG_INFO = *mut EXCEPTION_DEBUG_INFO;
-STRUCT!{nodebug struct CREATE_THREAD_DEBUG_INFO {
-    hThread: ::HANDLE,
-    lpThreadLocalBase: ::LPVOID,
-    lpStartAddress: LPTHREAD_START_ROUTINE,
-}}
-pub type LPCREATE_THREAD_DEBUG_INFO = *mut CREATE_THREAD_DEBUG_INFO;
-STRUCT!{nodebug struct CREATE_PROCESS_DEBUG_INFO {
-    hFile: ::HANDLE,
-    hProcess: ::HANDLE,
-    hThread: ::HANDLE,
-    lpBaseOfImage: ::LPVOID,
-    dwDebugInfoFileOffset: ::DWORD,
-    nDebugInfoSize: ::DWORD,
-    lpThreadLocalBase: ::LPVOID,
-    lpStartAddress: LPTHREAD_START_ROUTINE,
-    lpImageName: ::LPVOID,
-    fUnicode: ::WORD,
-}}
-pub type LPCREATE_PROCESS_DEBUG_INFO = *mut CREATE_PROCESS_DEBUG_INFO;
-STRUCT!{struct EXIT_THREAD_DEBUG_INFO {
-    dwExitCode: ::DWORD,
-}}
-pub type LPEXIT_THREAD_DEBUG_INFO = *mut EXIT_THREAD_DEBUG_INFO;
-STRUCT!{struct EXIT_PROCESS_DEBUG_INFO {
-    dwExitCode: ::DWORD,
-}}
-pub type LPEXIT_PROCESS_DEBUG_INFO = *mut EXIT_PROCESS_DEBUG_INFO;
-STRUCT!{struct LOAD_DLL_DEBUG_INFO {
-    hFile: ::HANDLE,
-    lpBaseOfDll: ::LPVOID,
-    dwDebugInfoFileOffset: ::DWORD,
-    nDebugInfoSize: ::DWORD,
-    lpImageName: ::LPVOID,
-    fUnicode: ::WORD,
-}}
-pub type LPLOAD_DLL_DEBUG_INFO = *mut LOAD_DLL_DEBUG_INFO;
-STRUCT!{struct UNLOAD_DLL_DEBUG_INFO {
-    lpBaseOfDll: ::LPVOID,
-}}
-pub type LPUNLOAD_DLL_DEBUG_INFO = *mut UNLOAD_DLL_DEBUG_INFO;
-STRUCT!{struct OUTPUT_DEBUG_STRING_INFO {
-    lpDebugStringData: ::LPSTR,
-    fUnicode: ::WORD,
-    nDebugStringLength: ::WORD,
-}}
-pub type LPOUTPUT_DEBUG_STRING_INFO = *mut OUTPUT_DEBUG_STRING_INFO;
-STRUCT!{struct RIP_INFO {
-    dwError: ::DWORD,
-    dwType: ::DWORD,
-}}
-pub type LPRIP_INFO = *mut RIP_INFO;
-#[cfg(target_arch="x86_64")]
-STRUCT!{nodebug struct DEBUG_EVENT {
-    dwDebugEventCode: ::DWORD,
-    dwProcessId: ::DWORD,
-    dwThreadId: ::DWORD,
-    u: [u8; 160],
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{nodebug struct DEBUG_EVENT {
-    dwDebugEventCode: ::DWORD,
-    dwProcessId: ::DWORD,
-    dwThreadId: ::DWORD,
-    u: [u8; 84],
-}}
-UNION!(DEBUG_EVENT, u, Exception, Exception_mut, EXCEPTION_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, CreateThread, CreateThread_mut, CREATE_THREAD_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, CreateProcessInfo, CreateProcessInfo_mut, CREATE_PROCESS_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, ExitThread, ExitThread_mut, EXIT_THREAD_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, ExitProcess, ExitProcess_mut, EXIT_PROCESS_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, LoadDll, LoadDll_mut, LOAD_DLL_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, UnloadDll, UnloadDll_mut, UNLOAD_DLL_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, DebugString, DebugString_mut, OUTPUT_DEBUG_STRING_INFO);
-UNION!(DEBUG_EVENT, u, RipInfo, RipInfo_mut, RIP_INFO);
-pub type LPDEBUG_EVENT = *mut DEBUG_EVENT;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/minwindef.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/minwindef.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/minwindef.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/minwindef.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Basic Windows Type Definitions for minwin partition
-pub type ULONG = ::c_ulong;
-pub type PULONG = *mut ULONG;
-pub type USHORT = ::c_ushort;
-pub type PUSHORT = *mut USHORT;
-pub type UCHAR = ::c_uchar;
-pub type PUCHAR = *mut UCHAR;
-pub type PSZ = *mut ::c_char;
-pub const MAX_PATH: usize = 260;
-pub const FALSE: BOOL = 0;
-pub const TRUE: BOOL = 1;
-pub type DWORD = ::c_ulong;
-pub type BOOL = ::c_int;
-pub type BYTE = ::c_uchar;
-pub type WORD = ::c_ushort;
-pub type FLOAT = ::c_float;
-pub type PFLOAT = *mut FLOAT;
-pub type PBOOL = *mut BOOL;
-pub type LPBOOL = *mut BOOL;
-pub type PBYTE = *mut BYTE;
-pub type LPBYTE = *mut BYTE;
-pub type PINT = *mut ::c_int;
-pub type LPINT = *mut ::c_int;
-pub type PWORD = *mut WORD;
-pub type LPWORD = *mut WORD;
-pub type LPLONG = *mut ::c_long;
-pub type PDWORD = *mut DWORD;
-pub type LPDWORD = *mut DWORD;
-pub type LPVOID = *mut ::c_void;
-pub type LPCVOID = *const ::c_void;
-pub type INT = ::c_int;
-pub type UINT = ::c_uint;
-pub type PUINT = *mut ::c_uint;
-pub type WPARAM = ::UINT_PTR;
-pub type LPARAM = ::LONG_PTR;
-pub type LRESULT = ::LONG_PTR;
-pub fn MAKEWORD(a: BYTE, b: BYTE) -> WORD {
-    (a as WORD) | ((b as WORD) << 8)
-}
-pub fn MAKELONG(a: WORD, b: WORD) -> ::LONG {
-    ((a as DWORD) | ((b as DWORD) << 16)) as ::LONG
-}
-pub fn LOWORD(l: DWORD) -> WORD {
-    (l & 0xffff) as WORD
-}
-pub fn HIWORD(l: DWORD) -> WORD {
-    ((l >> 16) & 0xffff) as WORD
-}
-pub fn LOBYTE(l: WORD) -> BYTE {
-    (l & 0xff) as BYTE
-}
-pub fn HIBYTE(l: WORD) -> BYTE {
-    ((l >> 8) & 0xff) as BYTE
-}
-pub type SPHANDLE = *mut ::HANDLE;
-pub type LPHANDLE = *mut ::HANDLE;
-pub type HGLOBAL = ::HANDLE;
-pub type HLOCAL = ::HANDLE;
-pub type GLOBALHANDLE = ::HANDLE;
-pub type LOCALHANDLE = ::HANDLE;
-/// Pointer to probably a function with unknown type signature.
-pub type FARPROC = *const ::c_void;
-/// Pointer to probably a function with unknown type signature.
-pub type NEARPROC = *const ::c_void;
-/// Pointer to probably a function with unknown type signature.
-pub type PROC = *const ::c_void;
-pub type ATOM = WORD;
-DECLARE_HANDLE!(HKEY, HKEY__);
-pub type PHKEY = *mut HKEY;
-DECLARE_HANDLE!(HMETAFILE, HMETAFILE__);
-DECLARE_HANDLE!(HINSTANCE, HINSTANCE__);
-pub type HMODULE = HINSTANCE;
-DECLARE_HANDLE!(HRGN, HRGN__);
-DECLARE_HANDLE!(HRSRC, HRSRC__);
-DECLARE_HANDLE!(HSPRITE, HSPRITE__);
-DECLARE_HANDLE!(HLSURF, HLSURF__);
-DECLARE_HANDLE!(HSTR, HSTR__);
-DECLARE_HANDLE!(HTASK, HTASK__);
-DECLARE_HANDLE!(HWINSTA, HWINSTA__);
-DECLARE_HANDLE!(HKL, HKL__);
-pub type HFILE = ::c_int;
-STRUCT!{struct FILETIME {
-    dwLowDateTime: DWORD,
-    dwHighDateTime: DWORD,
-}}
-pub type PFILETIME = *mut FILETIME;
-pub type LPFILETIME = *mut FILETIME;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mmdeviceapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mmdeviceapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mmdeviceapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mmdeviceapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-pub const DEVICE_STATE_ACTIVE: ::DWORD = 0x00000001;
-pub const DEVICE_STATE_DISABLED: ::DWORD = 0x00000002;
-pub const DEVICE_STATE_NOTPRESENT: ::DWORD = 0x00000004;
-pub const DEVICE_STATE_UNPLUGGED: ::DWORD = 0x00000008;
-pub const DEVICE_STATEMASK_ALL: ::DWORD = 0x0000000F;
-ENUM!{enum EDataFlow {
-    eRender,
-    eCapture,
-    eAll,
-    EDataFlow_enum_count,
-}}
-ENUM!{enum ERole {
-    eConsole,
-    eMultimedia,
-    eCommunications,
-    ERole_enum_count,
-}}
-DEFINE_GUID!(CLSID_MMDeviceEnumerator, 0xBCDE0395, 0xE52F, 0x467C,
-    0x8E, 0x3D, 0xC4, 0x57, 0x92, 0x91, 0x69, 0x2E);
-DEFINE_GUID!(IID_IMMDeviceEnumerator, 0xA95664D2, 0x9614, 0x4F35,
-    0xA7, 0x46, 0xDE, 0x8D, 0xB6, 0x36, 0x17, 0xE6);
-RIDL!(
-interface IMMDevice(IMMDeviceVtbl): IUnknown(IUnknownVtbl) {
-    fn Activate(
-        &mut self, iid: ::REFIID, dwClsCtx: ::DWORD, pActivationParams: *mut ::PROPVARIANT,
-        ppInterface: *mut ::LPVOID
-    ) -> ::HRESULT,
-    fn OpenPropertyStore(
-        &mut self, stgmAccess: ::DWORD, ppProperties: *mut *mut ::IPropertyStore
-    ) -> ::HRESULT,
-    fn GetId(&mut self, ppstrId: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetState(&mut self, pdwState: *mut ::DWORD) -> ::HRESULT
-}
-);
-RIDL!(
-interface IMMDeviceEnumerator(IMMDeviceEnumeratorVtbl): IUnknown(IUnknownVtbl) {
-    fn EnumAudioEndpoints(
-        &mut self, dataFlow: EDataFlow, dwStateMask: ::DWORD,
-        ppDevices: *mut *mut IMMDeviceCollection
-    ) -> ::HRESULT,
-    fn GetDefaultAudioEndpoint(
-        &mut self, dataFlow: EDataFlow, role: ERole, ppEndpoint: *mut *mut IMMDevice
-    ) -> ::HRESULT,
-    fn GetDevice(&mut self, pwstrId: ::LPCWSTR, ppDevices: *mut *mut IMMDevice) -> ::HRESULT,
-    fn RegisterEndpointNotificationCallback(
-        &mut self, pClient: *mut IMMNotificationClient
-    ) -> ::HRESULT,
-    fn UnregisterEndpointNotificationCallback(
-        &mut self, pClient: *mut IMMNotificationClient
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IMMDeviceCollection(IMMDeviceCollectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetCount(&mut self, pcDevices: *const ::UINT) -> ::HRESULT,
-    fn Item(&mut self, nDevice: ::UINT, ppDevice: *mut *mut IMMDevice) -> ::HRESULT
-}
-);
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IMMNotificationClient;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mmreg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mmreg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mmreg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mmreg.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,304 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub const WAVE_FORMAT_UNKNOWN: ::WORD = 0x0000;
-pub const WAVE_FORMAT_PCM: ::WORD = 0x0001;
-pub const WAVE_FORMAT_ADPCM: ::WORD = 0x0002;
-pub const WAVE_FORMAT_IEEE_FLOAT: ::WORD = 0x0003;
-pub const WAVE_FORMAT_VSELP: ::WORD = 0x0004;
-pub const WAVE_FORMAT_IBM_CVSD: ::WORD = 0x0005;
-pub const WAVE_FORMAT_ALAW: ::WORD = 0x0006;
-pub const WAVE_FORMAT_MULAW: ::WORD = 0x0007;
-pub const WAVE_FORMAT_DTS: ::WORD = 0x0008;
-pub const WAVE_FORMAT_DRM: ::WORD = 0x0009;
-pub const WAVE_FORMAT_WMAVOICE9: ::WORD = 0x000A;
-pub const WAVE_FORMAT_WMAVOICE10: ::WORD = 0x000B;
-pub const WAVE_FORMAT_OKI_ADPCM: ::WORD = 0x0010;
-pub const WAVE_FORMAT_DVI_ADPCM: ::WORD = 0x0011;
-pub const WAVE_FORMAT_IMA_ADPCM: ::WORD = WAVE_FORMAT_DVI_ADPCM;
-pub const WAVE_FORMAT_MEDIASPACE_ADPCM: ::WORD = 0x0012;
-pub const WAVE_FORMAT_SIERRA_ADPCM: ::WORD = 0x0013;
-pub const WAVE_FORMAT_G723_ADPCM: ::WORD = 0x0014;
-pub const WAVE_FORMAT_DIGISTD: ::WORD = 0x0015;
-pub const WAVE_FORMAT_DIGIFIX: ::WORD = 0x0016;
-pub const WAVE_FORMAT_DIALOGIC_OKI_ADPCM: ::WORD = 0x0017;
-pub const WAVE_FORMAT_MEDIAVISION_ADPCM: ::WORD = 0x0018;
-pub const WAVE_FORMAT_CU_CODEC: ::WORD = 0x0019;
-pub const WAVE_FORMAT_HP_DYN_VOICE: ::WORD = 0x001A;
-pub const WAVE_FORMAT_YAMAHA_ADPCM: ::WORD = 0x0020;
-pub const WAVE_FORMAT_SONARC: ::WORD = 0x0021;
-pub const WAVE_FORMAT_DSPGROUP_TRUESPEECH: ::WORD = 0x0022;
-pub const WAVE_FORMAT_ECHOSC1: ::WORD = 0x0023;
-pub const WAVE_FORMAT_AUDIOFILE_AF36: ::WORD = 0x0024;
-pub const WAVE_FORMAT_APTX: ::WORD = 0x0025;
-pub const WAVE_FORMAT_AUDIOFILE_AF10: ::WORD = 0x0026;
-pub const WAVE_FORMAT_PROSODY_1612: ::WORD = 0x0027;
-pub const WAVE_FORMAT_LRC: ::WORD = 0x0028;
-pub const WAVE_FORMAT_DOLBY_AC2: ::WORD = 0x0030;
-pub const WAVE_FORMAT_GSM610: ::WORD = 0x0031;
-pub const WAVE_FORMAT_MSNAUDIO: ::WORD = 0x0032;
-pub const WAVE_FORMAT_ANTEX_ADPCME: ::WORD = 0x0033;
-pub const WAVE_FORMAT_CONTROL_RES_VQLPC: ::WORD = 0x0034;
-pub const WAVE_FORMAT_DIGIREAL: ::WORD = 0x0035;
-pub const WAVE_FORMAT_DIGIADPCM: ::WORD = 0x0036;
-pub const WAVE_FORMAT_CONTROL_RES_CR10: ::WORD = 0x0037;
-pub const WAVE_FORMAT_NMS_VBXADPCM: ::WORD = 0x0038;
-pub const WAVE_FORMAT_CS_IMAADPCM: ::WORD = 0x0039;
-pub const WAVE_FORMAT_ECHOSC3: ::WORD = 0x003A;
-pub const WAVE_FORMAT_ROCKWELL_ADPCM: ::WORD = 0x003B;
-pub const WAVE_FORMAT_ROCKWELL_DIGITALK: ::WORD = 0x003C;
-pub const WAVE_FORMAT_XEBEC: ::WORD = 0x003D;
-pub const WAVE_FORMAT_G721_ADPCM: ::WORD = 0x0040;
-pub const WAVE_FORMAT_G728_CELP: ::WORD = 0x0041;
-pub const WAVE_FORMAT_MSG723: ::WORD = 0x0042;
-pub const WAVE_FORMAT_INTEL_G723_1: ::WORD = 0x0043;
-pub const WAVE_FORMAT_INTEL_G729: ::WORD = 0x0044;
-pub const WAVE_FORMAT_SHARP_G726: ::WORD = 0x0045;
-pub const WAVE_FORMAT_MPEG: ::WORD = 0x0050;
-pub const WAVE_FORMAT_RT24: ::WORD = 0x0052;
-pub const WAVE_FORMAT_PAC: ::WORD = 0x0053;
-pub const WAVE_FORMAT_MPEGLAYER3: ::WORD = 0x0055;
-pub const WAVE_FORMAT_LUCENT_G723: ::WORD = 0x0059;
-pub const WAVE_FORMAT_CIRRUS: ::WORD = 0x0060;
-pub const WAVE_FORMAT_ESPCM: ::WORD = 0x0061;
-pub const WAVE_FORMAT_VOXWARE: ::WORD = 0x0062;
-pub const WAVE_FORMAT_CANOPUS_ATRAC: ::WORD = 0x0063;
-pub const WAVE_FORMAT_G726_ADPCM: ::WORD = 0x0064;
-pub const WAVE_FORMAT_G722_ADPCM: ::WORD = 0x0065;
-pub const WAVE_FORMAT_DSAT: ::WORD = 0x0066;
-pub const WAVE_FORMAT_DSAT_DISPLAY: ::WORD = 0x0067;
-pub const WAVE_FORMAT_VOXWARE_BYTE_ALIGNED: ::WORD = 0x0069;
-pub const WAVE_FORMAT_VOXWARE_AC8: ::WORD = 0x0070;
-pub const WAVE_FORMAT_VOXWARE_AC10: ::WORD = 0x0071;
-pub const WAVE_FORMAT_VOXWARE_AC16: ::WORD = 0x0072;
-pub const WAVE_FORMAT_VOXWARE_AC20: ::WORD = 0x0073;
-pub const WAVE_FORMAT_VOXWARE_RT24: ::WORD = 0x0074;
-pub const WAVE_FORMAT_VOXWARE_RT29: ::WORD = 0x0075;
-pub const WAVE_FORMAT_VOXWARE_RT29HW: ::WORD = 0x0076;
-pub const WAVE_FORMAT_VOXWARE_VR12: ::WORD = 0x0077;
-pub const WAVE_FORMAT_VOXWARE_VR18: ::WORD = 0x0078;
-pub const WAVE_FORMAT_VOXWARE_TQ40: ::WORD = 0x0079;
-pub const WAVE_FORMAT_VOXWARE_SC3: ::WORD = 0x007A;
-pub const WAVE_FORMAT_VOXWARE_SC3_1: ::WORD = 0x007B;
-pub const WAVE_FORMAT_SOFTSOUND: ::WORD = 0x0080;
-pub const WAVE_FORMAT_VOXWARE_TQ60: ::WORD = 0x0081;
-pub const WAVE_FORMAT_MSRT24: ::WORD = 0x0082;
-pub const WAVE_FORMAT_G729A: ::WORD = 0x0083;
-pub const WAVE_FORMAT_MVI_MVI2: ::WORD = 0x0084;
-pub const WAVE_FORMAT_DF_G726: ::WORD = 0x0085;
-pub const WAVE_FORMAT_DF_GSM610: ::WORD = 0x0086;
-pub const WAVE_FORMAT_ISIAUDIO: ::WORD = 0x0088;
-pub const WAVE_FORMAT_ONLIVE: ::WORD = 0x0089;
-pub const WAVE_FORMAT_MULTITUDE_FT_SX20: ::WORD = 0x008A;
-pub const WAVE_FORMAT_INFOCOM_ITS_G721_ADPCM: ::WORD = 0x008B;
-pub const WAVE_FORMAT_CONVEDIA_G729: ::WORD = 0x008C;
-pub const WAVE_FORMAT_CONGRUENCY: ::WORD = 0x008D;
-pub const WAVE_FORMAT_SBC24: ::WORD = 0x0091;
-pub const WAVE_FORMAT_DOLBY_AC3_SPDIF: ::WORD = 0x0092;
-pub const WAVE_FORMAT_MEDIASONIC_G723: ::WORD = 0x0093;
-pub const WAVE_FORMAT_PROSODY_8KBPS: ::WORD = 0x0094;
-pub const WAVE_FORMAT_ZYXEL_ADPCM: ::WORD = 0x0097;
-pub const WAVE_FORMAT_PHILIPS_LPCBB: ::WORD = 0x0098;
-pub const WAVE_FORMAT_PACKED: ::WORD = 0x0099;
-pub const WAVE_FORMAT_MALDEN_PHONYTALK: ::WORD = 0x00A0;
-pub const WAVE_FORMAT_RACAL_RECORDER_GSM: ::WORD = 0x00A1;
-pub const WAVE_FORMAT_RACAL_RECORDER_G720_A: ::WORD = 0x00A2;
-pub const WAVE_FORMAT_RACAL_RECORDER_G723_1: ::WORD = 0x00A3;
-pub const WAVE_FORMAT_RACAL_RECORDER_TETRA_ACELP: ::WORD = 0x00A4;
-pub const WAVE_FORMAT_NEC_AAC: ::WORD = 0x00B0;
-pub const WAVE_FORMAT_RAW_AAC1: ::WORD = 0x00FF;
-pub const WAVE_FORMAT_RHETOREX_ADPCM: ::WORD = 0x0100;
-pub const WAVE_FORMAT_IRAT: ::WORD = 0x0101;
-pub const WAVE_FORMAT_VIVO_G723: ::WORD = 0x0111;
-pub const WAVE_FORMAT_VIVO_SIREN: ::WORD = 0x0112;
-pub const WAVE_FORMAT_PHILIPS_CELP: ::WORD = 0x0120;
-pub const WAVE_FORMAT_PHILIPS_GRUNDIG: ::WORD = 0x0121;
-pub const WAVE_FORMAT_DIGITAL_G723: ::WORD = 0x0123;
-pub const WAVE_FORMAT_SANYO_LD_ADPCM: ::WORD = 0x0125;
-pub const WAVE_FORMAT_SIPROLAB_ACEPLNET: ::WORD = 0x0130;
-pub const WAVE_FORMAT_SIPROLAB_ACELP4800: ::WORD = 0x0131;
-pub const WAVE_FORMAT_SIPROLAB_ACELP8V3: ::WORD = 0x0132;
-pub const WAVE_FORMAT_SIPROLAB_G729: ::WORD = 0x0133;
-pub const WAVE_FORMAT_SIPROLAB_G729A: ::WORD = 0x0134;
-pub const WAVE_FORMAT_SIPROLAB_KELVIN: ::WORD = 0x0135;
-pub const WAVE_FORMAT_VOICEAGE_AMR: ::WORD = 0x0136;
-pub const WAVE_FORMAT_G726ADPCM: ::WORD = 0x0140;
-pub const WAVE_FORMAT_DICTAPHONE_CELP68: ::WORD = 0x0141;
-pub const WAVE_FORMAT_DICTAPHONE_CELP54: ::WORD = 0x0142;
-pub const WAVE_FORMAT_QUALCOMM_PUREVOICE: ::WORD = 0x0150;
-pub const WAVE_FORMAT_QUALCOMM_HALFRATE: ::WORD = 0x0151;
-pub const WAVE_FORMAT_TUBGSM: ::WORD = 0x0155;
-pub const WAVE_FORMAT_MSAUDIO1: ::WORD = 0x0160;
-pub const WAVE_FORMAT_WMAUDIO2: ::WORD = 0x0161;
-pub const WAVE_FORMAT_WMAUDIO3: ::WORD = 0x0162;
-pub const WAVE_FORMAT_WMAUDIO_LOSSLESS: ::WORD = 0x0163;
-pub const WAVE_FORMAT_WMASPDIF: ::WORD = 0x0164;
-pub const WAVE_FORMAT_UNISYS_NAP_ADPCM: ::WORD = 0x0170;
-pub const WAVE_FORMAT_UNISYS_NAP_ULAW: ::WORD = 0x0171;
-pub const WAVE_FORMAT_UNISYS_NAP_ALAW: ::WORD = 0x0172;
-pub const WAVE_FORMAT_UNISYS_NAP_16K: ::WORD = 0x0173;
-pub const WAVE_FORMAT_SYCOM_ACM_SYC008: ::WORD = 0x0174;
-pub const WAVE_FORMAT_SYCOM_ACM_SYC701_G726L: ::WORD = 0x0175;
-pub const WAVE_FORMAT_SYCOM_ACM_SYC701_CELP54: ::WORD = 0x0176;
-pub const WAVE_FORMAT_SYCOM_ACM_SYC701_CELP68: ::WORD = 0x0177;
-pub const WAVE_FORMAT_KNOWLEDGE_ADVENTURE_ADPCM: ::WORD = 0x0178;
-pub const WAVE_FORMAT_FRAUNHOFER_IIS_MPEG2_AAC: ::WORD = 0x0180;
-pub const WAVE_FORMAT_DTS_DS: ::WORD = 0x0190;
-pub const WAVE_FORMAT_CREATIVE_ADPCM: ::WORD = 0x0200;
-pub const WAVE_FORMAT_CREATIVE_FASTSPEECH8: ::WORD = 0x0202;
-pub const WAVE_FORMAT_CREATIVE_FASTSPEECH10: ::WORD = 0x0203;
-pub const WAVE_FORMAT_UHER_ADPCM: ::WORD = 0x0210;
-pub const WAVE_FORMAT_ULEAD_DV_AUDIO: ::WORD = 0x0215;
-pub const WAVE_FORMAT_ULEAD_DV_AUDIO_1: ::WORD = 0x0216;
-pub const WAVE_FORMAT_QUARTERDECK: ::WORD = 0x0220;
-pub const WAVE_FORMAT_ILINK_VC: ::WORD = 0x0230;
-pub const WAVE_FORMAT_RAW_SPORT: ::WORD = 0x0240;
-pub const WAVE_FORMAT_ESST_AC3: ::WORD = 0x0241;
-pub const WAVE_FORMAT_GENERIC_PASSTHRU: ::WORD = 0x0249;
-pub const WAVE_FORMAT_IPI_HSX: ::WORD = 0x0250;
-pub const WAVE_FORMAT_IPI_RPELP: ::WORD = 0x0251;
-pub const WAVE_FORMAT_CS2: ::WORD = 0x0260;
-pub const WAVE_FORMAT_SONY_SCX: ::WORD = 0x0270;
-pub const WAVE_FORMAT_SONY_SCY: ::WORD = 0x0271;
-pub const WAVE_FORMAT_SONY_ATRAC3: ::WORD = 0x0272;
-pub const WAVE_FORMAT_SONY_SPC: ::WORD = 0x0273;
-pub const WAVE_FORMAT_TELUM_AUDIO: ::WORD = 0x0280;
-pub const WAVE_FORMAT_TELUM_IA_AUDIO: ::WORD = 0x0281;
-pub const WAVE_FORMAT_NORCOM_VOICE_SYSTEMS_ADPCM: ::WORD = 0x0285;
-pub const WAVE_FORMAT_FM_TOWNS_SND: ::WORD = 0x0300;
-pub const WAVE_FORMAT_MICRONAS: ::WORD = 0x0350;
-pub const WAVE_FORMAT_MICRONAS_CELP833: ::WORD = 0x0351;
-pub const WAVE_FORMAT_BTV_DIGITAL: ::WORD = 0x0400;
-pub const WAVE_FORMAT_INTEL_MUSIC_CODER: ::WORD = 0x0401;
-pub const WAVE_FORMAT_INDEO_AUDIO: ::WORD = 0x0402;
-pub const WAVE_FORMAT_QDESIGN_MUSIC: ::WORD = 0x0450;
-pub const WAVE_FORMAT_ON2_VP7_AUDIO: ::WORD = 0x0500;
-pub const WAVE_FORMAT_ON2_VP6_AUDIO: ::WORD = 0x0501;
-pub const WAVE_FORMAT_VME_VMPCM: ::WORD = 0x0680;
-pub const WAVE_FORMAT_TPC: ::WORD = 0x0681;
-pub const WAVE_FORMAT_LIGHTWAVE_LOSSLESS: ::WORD = 0x08AE;
-pub const WAVE_FORMAT_OLIGSM: ::WORD = 0x1000;
-pub const WAVE_FORMAT_OLIADPCM: ::WORD = 0x1001;
-pub const WAVE_FORMAT_OLICELP: ::WORD = 0x1002;
-pub const WAVE_FORMAT_OLISBC: ::WORD = 0x1003;
-pub const WAVE_FORMAT_OLIOPR: ::WORD = 0x1004;
-pub const WAVE_FORMAT_LH_CODEC: ::WORD = 0x1100;
-pub const WAVE_FORMAT_LH_CODEC_CELP: ::WORD = 0x1101;
-pub const WAVE_FORMAT_LH_CODEC_SBC8: ::WORD = 0x1102;
-pub const WAVE_FORMAT_LH_CODEC_SBC12: ::WORD = 0x1103;
-pub const WAVE_FORMAT_LH_CODEC_SBC16: ::WORD = 0x1104;
-pub const WAVE_FORMAT_NORRIS: ::WORD = 0x1400;
-pub const WAVE_FORMAT_ISIAUDIO_2: ::WORD = 0x1401;
-pub const WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS: ::WORD = 0x1500;
-pub const WAVE_FORMAT_MPEG_ADTS_AAC: ::WORD = 0x1600;
-pub const WAVE_FORMAT_MPEG_RAW_AAC: ::WORD = 0x1601;
-pub const WAVE_FORMAT_MPEG_LOAS: ::WORD = 0x1602;
-pub const WAVE_FORMAT_NOKIA_MPEG_ADTS_AAC: ::WORD = 0x1608;
-pub const WAVE_FORMAT_NOKIA_MPEG_RAW_AAC: ::WORD = 0x1609;
-pub const WAVE_FORMAT_VODAFONE_MPEG_ADTS_AAC: ::WORD = 0x160A;
-pub const WAVE_FORMAT_VODAFONE_MPEG_RAW_AAC: ::WORD = 0x160B;
-pub const WAVE_FORMAT_MPEG_HEAAC: ::WORD = 0x1610;
-pub const WAVE_FORMAT_VOXWARE_RT24_SPEECH: ::WORD = 0x181C;
-pub const WAVE_FORMAT_SONICFOUNDRY_LOSSLESS: ::WORD = 0x1971;
-pub const WAVE_FORMAT_INNINGS_TELECOM_ADPCM: ::WORD = 0x1979;
-pub const WAVE_FORMAT_LUCENT_SX8300P: ::WORD = 0x1C07;
-pub const WAVE_FORMAT_LUCENT_SX5363S: ::WORD = 0x1C0C;
-pub const WAVE_FORMAT_CUSEEME: ::WORD = 0x1F03;
-pub const WAVE_FORMAT_NTCSOFT_ALF2CM_ACM: ::WORD = 0x1FC4;
-pub const WAVE_FORMAT_DVM: ::WORD = 0x2000;
-pub const WAVE_FORMAT_DTS2: ::WORD = 0x2001;
-pub const WAVE_FORMAT_MAKEAVIS: ::WORD = 0x3313;
-pub const WAVE_FORMAT_DIVIO_MPEG4_AAC: ::WORD = 0x4143;
-pub const WAVE_FORMAT_NOKIA_ADAPTIVE_MULTIRATE: ::WORD = 0x4201;
-pub const WAVE_FORMAT_DIVIO_G726: ::WORD = 0x4243;
-pub const WAVE_FORMAT_LEAD_SPEECH: ::WORD = 0x434C;
-pub const WAVE_FORMAT_LEAD_VORBIS: ::WORD = 0x564C;
-pub const WAVE_FORMAT_WAVPACK_AUDIO: ::WORD = 0x5756;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_1: ::WORD = 0x674F;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_2: ::WORD = 0x6750;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_3: ::WORD = 0x6751;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_1_PLUS: ::WORD = 0x676F;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_2_PLUS: ::WORD = 0x6770;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_3_PLUS: ::WORD = 0x6771;
-pub const WAVE_FORMAT_3COM_NBX: ::WORD = 0x7000;
-pub const WAVE_FORMAT_FAAD_AAC: ::WORD = 0x706D;
-pub const WAVE_FORMAT_AMR_NB: ::WORD = 0x7361;
-pub const WAVE_FORMAT_AMR_WB: ::WORD = 0x7362;
-pub const WAVE_FORMAT_AMR_WP: ::WORD = 0x7363;
-pub const WAVE_FORMAT_GSM_AMR_CBR: ::WORD = 0x7A21;
-pub const WAVE_FORMAT_GSM_AMR_VBR_SID: ::WORD = 0x7A22;
-pub const WAVE_FORMAT_COMVERSE_INFOSYS_G723_1: ::WORD = 0xA100;
-pub const WAVE_FORMAT_COMVERSE_INFOSYS_AVQSBC: ::WORD = 0xA101;
-pub const WAVE_FORMAT_COMVERSE_INFOSYS_SBC: ::WORD = 0xA102;
-pub const WAVE_FORMAT_SYMBOL_G729_A: ::WORD = 0xA103;
-pub const WAVE_FORMAT_VOICEAGE_AMR_WB: ::WORD = 0xA104;
-pub const WAVE_FORMAT_INGENIENT_G726: ::WORD = 0xA105;
-pub const WAVE_FORMAT_MPEG4_AAC: ::WORD = 0xA106;
-pub const WAVE_FORMAT_ENCORE_G726: ::WORD = 0xA107;
-pub const WAVE_FORMAT_ZOLL_ASAO: ::WORD = 0xA108;
-pub const WAVE_FORMAT_SPEEX_VOICE: ::WORD = 0xA109;
-pub const WAVE_FORMAT_VIANIX_MASC: ::WORD = 0xA10A;
-pub const WAVE_FORMAT_WM9_SPECTRUM_ANALYZER: ::WORD = 0xA10B;
-pub const WAVE_FORMAT_WMF_SPECTRUM_ANAYZER: ::WORD = 0xA10C;
-pub const WAVE_FORMAT_GSM_610: ::WORD = 0xA10D;
-pub const WAVE_FORMAT_GSM_620: ::WORD = 0xA10E;
-pub const WAVE_FORMAT_GSM_660: ::WORD = 0xA10F;
-pub const WAVE_FORMAT_GSM_690: ::WORD = 0xA110;
-pub const WAVE_FORMAT_GSM_ADAPTIVE_MULTIRATE_WB: ::WORD = 0xA111;
-pub const WAVE_FORMAT_POLYCOM_G722: ::WORD = 0xA112;
-pub const WAVE_FORMAT_POLYCOM_G728: ::WORD = 0xA113;
-pub const WAVE_FORMAT_POLYCOM_G729_A: ::WORD = 0xA114;
-pub const WAVE_FORMAT_POLYCOM_SIREN: ::WORD = 0xA115;
-pub const WAVE_FORMAT_GLOBAL_IP_ILBC: ::WORD = 0xA116;
-pub const WAVE_FORMAT_RADIOTIME_TIME_SHIFT_RADIO: ::WORD = 0xA117;
-pub const WAVE_FORMAT_NICE_ACA: ::WORD = 0xA118;
-pub const WAVE_FORMAT_NICE_ADPCM: ::WORD = 0xA119;
-pub const WAVE_FORMAT_VOCORD_G721: ::WORD = 0xA11A;
-pub const WAVE_FORMAT_VOCORD_G726: ::WORD = 0xA11B;
-pub const WAVE_FORMAT_VOCORD_G722_1: ::WORD = 0xA11C;
-pub const WAVE_FORMAT_VOCORD_G728: ::WORD = 0xA11D;
-pub const WAVE_FORMAT_VOCORD_G729: ::WORD = 0xA11E;
-pub const WAVE_FORMAT_VOCORD_G729_A: ::WORD = 0xA11F;
-pub const WAVE_FORMAT_VOCORD_G723_1: ::WORD = 0xA120;
-pub const WAVE_FORMAT_VOCORD_LBC: ::WORD = 0xA121;
-pub const WAVE_FORMAT_NICE_G728: ::WORD = 0xA122;
-pub const WAVE_FORMAT_FRACE_TELECOM_G729: ::WORD = 0xA123;
-pub const WAVE_FORMAT_CODIAN: ::WORD = 0xA124;
-pub const WAVE_FORMAT_FLAC: ::WORD = 0xF1AC;
-pub const WAVE_FORMAT_EXTENSIBLE: ::WORD = 0xFFFE;
-pub const WAVE_FORMAT_DEVELOPMENT: ::WORD = 0xFFFF;
-//2557
-pub const SPEAKER_FRONT_LEFT: ::DWORD = 0x1;
-pub const SPEAKER_FRONT_RIGHT: ::DWORD = 0x2;
-pub const SPEAKER_FRONT_CENTER: ::DWORD = 0x4;
-pub const SPEAKER_LOW_FREQUENCY: ::DWORD = 0x8;
-pub const SPEAKER_BACK_LEFT: ::DWORD = 0x10;
-pub const SPEAKER_BACK_RIGHT: ::DWORD = 0x20;
-pub const SPEAKER_FRONT_LEFT_OF_CENTER: ::DWORD = 0x40;
-pub const SPEAKER_FRONT_RIGHT_OF_CENTER: ::DWORD = 0x80;
-pub const SPEAKER_BACK_CENTER: ::DWORD = 0x100;
-pub const SPEAKER_SIDE_LEFT: ::DWORD = 0x200;
-pub const SPEAKER_SIDE_RIGHT: ::DWORD = 0x400;
-pub const SPEAKER_TOP_CENTER: ::DWORD = 0x800;
-pub const SPEAKER_TOP_FRONT_LEFT: ::DWORD = 0x1000;
-pub const SPEAKER_TOP_FRONT_CENTER: ::DWORD = 0x2000;
-pub const SPEAKER_TOP_FRONT_RIGHT: ::DWORD = 0x4000;
-pub const SPEAKER_TOP_BACK_LEFT: ::DWORD = 0x8000;
-pub const SPEAKER_TOP_BACK_CENTER: ::DWORD = 0x10000;
-pub const SPEAKER_TOP_BACK_RIGHT: ::DWORD = 0x20000;
-pub const SPEAKER_RESERVED: ::DWORD = 0x7FFC0000;
-pub const SPEAKER_ALL: ::DWORD = 0x80000000;
-STRUCT!{#[repr(packed)] struct WAVEFORMATEX {
-    wFormatTag: ::WORD,
-    nChannels: ::WORD,
-    nSamplesPerSec: ::DWORD,
-    nAvgBytesPerSec: ::DWORD,
-    nBlockAlign: ::WORD,
-    wBitsPerSample: ::WORD,
-    cbSize: ::WORD,
-}}
-STRUCT!{#[repr(packed)] struct WAVEFORMATEXTENSIBLE {
-    Format: ::WAVEFORMATEX,
-    Samples: ::WORD,
-    dwChannelMask: ::DWORD,
-    SubFormat: ::GUID,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mmsystem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mmsystem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mmsystem.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mmsystem.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,259 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! MM procedure declarations, constant definitions and macros
-//109 (Win 7 SDK)
-pub type MMVERSION = ::UINT;
-pub type MMRESULT = ::UINT;
-STRUCT!{struct MMTIME {
-    wType: ::UINT,
-    u: MMTIME_u,
-}}
-pub type PMMTIME = *mut MMTIME;
-pub type NPMMTIME = *mut MMTIME;
-pub type LPMMTIME = *mut MMTIME;
-STRUCT!{struct MMTIME_u {
-    data: [u8; 8],
-}}
-UNION!(MMTIME_u, data, ms, ms_mut, ::DWORD);
-UNION!(MMTIME_u, data, sample, sample_mut, ::DWORD);
-UNION!(MMTIME_u, data, cb, cb_mut, ::DWORD);
-UNION!(MMTIME_u, data, ticks, ticks_mut, ::DWORD);
-UNION!(MMTIME_u, data, smpte, smpte_mut, MMTIME_smpte);
-UNION!(MMTIME_u, data, midi, midi_mut, MMTIME_midi);
-STRUCT!{struct MMTIME_smpte {
-    hour: ::BYTE,
-    min: ::BYTE,
-    sec: ::BYTE,
-    frame: ::BYTE,
-    fps: ::BYTE,
-    dummy: ::BYTE,
-    pad: [::BYTE; 2],
-}}
-STRUCT!{struct MMTIME_midi {
-    songptrpos: ::DWORD,
-}}
-pub const TIME_MS: ::UINT = 0x0001;
-pub const TIME_SAMPLES: ::UINT = 0x0002;
-pub const TIME_BYTES: ::UINT = 0x0004;
-pub const TIME_SMPTE: ::UINT = 0x0008;
-pub const TIME_MIDI: ::UINT = 0x0010;
-pub const TIME_TICKS: ::UINT = 0x0020;
-pub const MM_JOY1MOVE: ::UINT = 0x3A0;
-pub const MM_JOY2MOVE: ::UINT = 0x3A1;
-pub const MM_JOY1ZMOVE: ::UINT = 0x3A2;
-pub const MM_JOY2ZMOVE: ::UINT = 0x3A3;
-pub const MM_JOY1BUTTONDOWN: ::UINT = 0x3B5;
-pub const MM_JOY2BUTTONDOWN: ::UINT = 0x3B6;
-pub const MM_JOY1BUTTONUP: ::UINT = 0x3B7;
-pub const MM_JOY2BUTTONUP: ::UINT = 0x3B8;
-pub const MM_MCINOTIFY: ::UINT = 0x3B9;
-pub const MM_WOM_OPEN: ::UINT = 0x3BB;
-pub const MM_WOM_CLOSE: ::UINT = 0x3BC;
-pub const MM_WOM_DONE: ::UINT = 0x3BD;
-pub const MM_WIM_OPEN: ::UINT = 0x3BE;
-pub const MM_WIM_CLOSE: ::UINT = 0x3BF;
-pub const MM_WIM_DATA: ::UINT = 0x3C0;
-pub const MM_MIM_OPEN: ::UINT = 0x3C1;
-pub const MM_MIM_CLOSE: ::UINT = 0x3C2;
-pub const MM_MIM_DATA: ::UINT = 0x3C3;
-pub const MM_MIM_LONGDATA: ::UINT = 0x3C4;
-pub const MM_MIM_ERROR: ::UINT = 0x3C5;
-pub const MM_MIM_LONGERROR: ::UINT = 0x3C6;
-pub const MM_MOM_OPEN: ::UINT = 0x3C7;
-pub const MM_MOM_CLOSE: ::UINT = 0x3C8;
-pub const MM_MOM_DONE: ::UINT = 0x3C9;
-pub const MMSYSERR_BASE: MMRESULT = 0;
-pub const WAVERR_BASE: MMRESULT = 32;
-pub const MIDIERR_BASE: MMRESULT = 64;
-pub const TIMERR_BASE: MMRESULT = 96;
-pub const JOYERR_BASE: MMRESULT = 160;
-pub const MCIERR_BASE: MMRESULT = 256;
-pub const MIXERR_BASE: MMRESULT = 1024;
-pub const MMSYSERR_NOERROR: MMRESULT = 0;
-pub const MMSYSERR_ERROR: MMRESULT = MMSYSERR_BASE + 1;
-pub const MMSYSERR_BADDEVICEID: MMRESULT = MMSYSERR_BASE + 2;
-pub const MMSYSERR_NOTENABLED: MMRESULT = MMSYSERR_BASE + 3;
-pub const MMSYSERR_ALLOCATED: MMRESULT = MMSYSERR_BASE + 4;
-pub const MMSYSERR_INVALHANDLE: MMRESULT = MMSYSERR_BASE + 5;
-pub const MMSYSERR_NODRIVER: MMRESULT = MMSYSERR_BASE + 6;
-pub const MMSYSERR_NOMEM: MMRESULT = MMSYSERR_BASE + 7;
-pub const MMSYSERR_NOTSUPPORTED: MMRESULT = MMSYSERR_BASE + 8;
-pub const MMSYSERR_BADERRNUM: MMRESULT = MMSYSERR_BASE + 9;
-pub const MMSYSERR_INVALFLAG: MMRESULT = MMSYSERR_BASE + 10;
-pub const MMSYSERR_INVALPARAM: MMRESULT = MMSYSERR_BASE + 11;
-pub const MMSYSERR_HANDLEBUSY: MMRESULT = MMSYSERR_BASE + 12;
-pub const MMSYSERR_INVALIDALIAS: MMRESULT = MMSYSERR_BASE + 13;
-pub const MMSYSERR_BADDB: MMRESULT = MMSYSERR_BASE + 14;
-pub const MMSYSERR_KEYNOTFOUND: MMRESULT = MMSYSERR_BASE + 15;
-pub const MMSYSERR_READERROR: MMRESULT = MMSYSERR_BASE + 16;
-pub const MMSYSERR_WRITEERROR: MMRESULT = MMSYSERR_BASE + 17;
-pub const MMSYSERR_DELETEERROR: MMRESULT = MMSYSERR_BASE + 18;
-pub const MMSYSERR_VALNOTFOUND: MMRESULT = MMSYSERR_BASE + 19;
-pub const MMSYSERR_NODRIVERCB: MMRESULT = MMSYSERR_BASE + 20;
-pub const MMSYSERR_MOREDATA: MMRESULT = MMSYSERR_BASE + 21;
-pub const MMSYSERR_LASTERROR: MMRESULT = MMSYSERR_BASE + 21;
-pub const MIDIERR_UNPREPARED: MMRESULT = MIDIERR_BASE + 0;
-pub const MIDIERR_STILLPLAYING: MMRESULT = MIDIERR_BASE + 1;
-pub const MIDIERR_NOMAP: MMRESULT = MIDIERR_BASE + 2;
-pub const MIDIERR_NOTREADY: MMRESULT = MIDIERR_BASE + 3;
-pub const MIDIERR_NODEVICE: MMRESULT = MIDIERR_BASE + 4;
-pub const MIDIERR_INVALIDSETUP: MMRESULT = MIDIERR_BASE + 5;
-pub const MIDIERR_BADOPENMODE: MMRESULT = MIDIERR_BASE + 6;
-pub const MIDIERR_DONT_CONTINUE: MMRESULT = MIDIERR_BASE + 7;
-pub const MIDIERR_LASTERROR: MMRESULT = MIDIERR_BASE + 7;
-pub const CALLBACK_TYPEMASK: ::DWORD = 0x00070000;
-pub const CALLBACK_NULL: ::DWORD = 0x00000000;
-pub const CALLBACK_WINDOW: ::DWORD = 0x00010000;
-pub const CALLBACK_TASK: ::DWORD = 0x00020000;
-pub const CALLBACK_FUNCTION: ::DWORD = 0x00030000;
-pub const CALLBACK_THREAD: ::DWORD = CALLBACK_TASK;
-pub const CALLBACK_EVENT: ::DWORD = 0x00050000;
-//497 (Win 7 SDK)
-pub const WAVERR_BADFORMAT: MMRESULT = WAVERR_BASE + 0;
-pub const WAVERR_STILLPLAYING: MMRESULT = WAVERR_BASE + 1;
-pub const WAVERR_UNPREPARED: MMRESULT = WAVERR_BASE + 2;
-pub const WAVERR_SYNC: MMRESULT = WAVERR_BASE + 3;
-pub const WAVERR_LASTERROR: MMRESULT = WAVERR_BASE + 3;
-DECLARE_HANDLE!(HWAVEIN, HWAVEIN__);
-DECLARE_HANDLE!(HWAVEOUT, HWAVEOUT__);
-pub type LPHWAVEIN = *mut HWAVEIN;
-pub type LPHWAVEOUT = *mut HWAVEOUT;
-pub const WOM_OPEN: ::UINT = MM_WOM_OPEN;
-pub const WOM_CLOSE: ::UINT = MM_WOM_CLOSE;
-pub const WOM_DONE: ::UINT = MM_WOM_DONE;
-pub const WIM_OPEN: ::UINT = MM_WIM_OPEN;
-pub const WIM_CLOSE: ::UINT = MM_WIM_CLOSE;
-pub const WIM_DATA: ::UINT = MM_WIM_DATA;
-pub const WAVE_MAPPER: ::UINT = 0xFFFFFFFF;
-pub const WAVE_FORMAT_QUERY: ::DWORD = 0x0001;
-pub const WAVE_ALLOWSYNC: ::DWORD = 0x0002;
-pub const WAVE_MAPPED: ::DWORD = 0x0004;
-pub const WAVE_FORMAT_DIRECT: ::DWORD = 0x0008;
-pub const WAVE_FORMAT_DIRECT_QUERY: ::DWORD = WAVE_FORMAT_QUERY | WAVE_FORMAT_DIRECT;
-pub const WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE: ::DWORD = 0x0010;
-STRUCT!{struct WAVEHDR {
-    lpData: ::LPSTR,
-    dwBufferLength: ::DWORD,
-    dwBytesRecorded: ::DWORD,
-    dwUser: ::DWORD_PTR,
-    dwFlags: ::DWORD,
-    dwLoops: ::DWORD,
-    lpNext: *mut WAVEHDR,
-    reserved: ::DWORD_PTR,
-}}
-pub type PWAVEHDR = *mut WAVEHDR;
-pub type NPWAVEHDR = *mut WAVEHDR;
-pub type LPWAVEHDR = *mut WAVEHDR;
-STRUCT!{struct WAVEOUTCAPSW {
-    wMid: ::WORD,
-    wPid: ::WORD,
-    vDriverVersion: MMVERSION,
-    szPname: [::WCHAR; 32],
-    dwFormats: ::DWORD,
-    wChannels: ::WORD,
-    wReserved1: ::WORD,
-    dwSupport: ::DWORD,
-}}
-pub type PWAVEOUTCAPSW = *mut WAVEOUTCAPSW;
-pub type NPWAVEOUTCAPSW = *mut WAVEOUTCAPSW;
-pub type LPWAVEOUTCAPSW = *mut WAVEOUTCAPSW;
-STRUCT!{struct WAVEINCAPSW {
-    wMid: ::WORD,
-    wPid: ::WORD,
-    vDriverVersion: MMVERSION,
-    szPname: [::WCHAR; 32],
-    dwFormats: ::DWORD,
-    wChannels: ::WORD,
-    wReserved1: ::WORD,
-}}
-pub type PWAVEINCAPSW = *mut WAVEINCAPSW;
-pub type NPWAVEINCAPSW = *mut WAVEINCAPSW;
-pub type LPWAVEINCAPSW = *mut WAVEINCAPSW;
-pub const WAVE_INVALIDFORMAT: ::DWORD = 0x00000000;
-pub const WAVE_FORMAT_1M08: ::DWORD = 0x00000001;
-pub const WAVE_FORMAT_1S08: ::DWORD = 0x00000002;
-pub const WAVE_FORMAT_1M16: ::DWORD = 0x00000004;
-pub const WAVE_FORMAT_1S16: ::DWORD = 0x00000008;
-pub const WAVE_FORMAT_2M08: ::DWORD = 0x00000010;
-pub const WAVE_FORMAT_2S08: ::DWORD = 0x00000020;
-pub const WAVE_FORMAT_2M16: ::DWORD = 0x00000040;
-pub const WAVE_FORMAT_2S16: ::DWORD = 0x00000080;
-pub const WAVE_FORMAT_4M08: ::DWORD = 0x00000100;
-pub const WAVE_FORMAT_4S08: ::DWORD = 0x00000200;
-pub const WAVE_FORMAT_4M16: ::DWORD = 0x00000400;
-pub const WAVE_FORMAT_4S16: ::DWORD = 0x00000800;
-pub const WAVE_FORMAT_44M08: ::DWORD = 0x00000100;
-pub const WAVE_FORMAT_44S08: ::DWORD = 0x00000200;
-pub const WAVE_FORMAT_44M16: ::DWORD = 0x00000400;
-pub const WAVE_FORMAT_44S16: ::DWORD = 0x00000800;
-pub const WAVE_FORMAT_48M08: ::DWORD = 0x00001000;
-pub const WAVE_FORMAT_48S08: ::DWORD = 0x00002000;
-pub const WAVE_FORMAT_48M16: ::DWORD = 0x00004000;
-pub const WAVE_FORMAT_48S16: ::DWORD = 0x00008000;
-pub const WAVE_FORMAT_96M08: ::DWORD = 0x00010000;
-pub const WAVE_FORMAT_96S08: ::DWORD = 0x00020000;
-pub const WAVE_FORMAT_96M16: ::DWORD = 0x00040000;
-pub const WAVE_FORMAT_96S16: ::DWORD = 0x00080000;
-//782 (Win 7 SDK)
-pub type PWAVEFORMATEX = *mut ::WAVEFORMATEX;
-pub type NPWAVEFORMATEX = *mut ::WAVEFORMATEX;
-pub type LPWAVEFORMATEX = *mut ::WAVEFORMATEX;
-pub type LPCWAVEFORMATEX = *const ::WAVEFORMATEX;
-//2170 (Win 7 SDK)
-pub const TIMERR_NOERROR: ::MMRESULT = 0;
-pub const TIMERR_NOCANDO: ::MMRESULT = TIMERR_BASE + 1;
-pub const TIMERR_STRUCT: ::MMRESULT = TIMERR_BASE + 33;
-//2198 (Win 7 SDK)
-STRUCT!{struct TIMECAPS {
-    wPeriodMin: ::UINT,
-    wPeriodMax: ::UINT,
-}}
-pub type PTIMECAPS = *mut TIMECAPS;
-pub type NPTIMECAPS = *mut TIMECAPS;
-pub type LPTIMECAPS = *mut TIMECAPS;
-STRUCT!{struct MIDIHDR {
-    lpData: ::LPSTR,
-    dwBufferLength: ::DWORD,
-    dwBytesRecorded: ::DWORD,
-    dwUser: ::DWORD_PTR,
-    dwFlags: ::DWORD,
-    lpNext: *mut MIDIHDR,
-    reserved: ::DWORD_PTR,
-    dwOffset: ::DWORD,
-    dwReserved: [::DWORD_PTR; 4],
-}}
-pub type PMIDIHDR = *mut MIDIHDR;
-pub type NPMIDIHDR = *mut MIDIHDR;
-pub type LPMIDIHDR = *mut MIDIHDR;
-STRUCT!{struct MIDIINCAPSW {
-    wMid: ::WORD,
-    wPid: ::WORD,
-    vDriverVersion: MMVERSION,
-    szPname: [::WCHAR; 32],
-    dwSupport: ::DWORD,
-}}
-pub type PMIDIINCAPSW = *mut MIDIINCAPSW;
-pub type NPMIDIINCAPSW = *mut MIDIINCAPSW;
-pub type LPMIDIINCAPSW = *mut MIDIINCAPSW;
-STRUCT!{struct MIDIOUTCAPSW {
-    wMid: ::WORD,
-    wPid: ::WORD,
-    vDriverVersion: ::MMVERSION,
-    szPname: [::WCHAR; 32],
-    wTechnology: ::WORD,
-    wVoices: ::WORD,
-    wNotes: ::WORD,
-    wChannelMask: ::WORD,
-    dwSupport: ::DWORD,
-}}
-pub type PMIDIOUTCAPSW = *mut MIDIOUTCAPSW;
-pub type NPMIDIOUTCAPSW = *mut MIDIOUTCAPSW;
-pub type LPMIDIOUTCAPSW = *mut MIDIOUTCAPSW;
-DECLARE_HANDLE!(HMIDIIN, HMIDIIN__);
-DECLARE_HANDLE!(HMIDIOUT, HMIDIOUT__);
-pub type LPHMIDIIN = *mut HMIDIIN;
-pub type LPHMIDIOUT = *mut HMIDIOUT;
-DECLARE_HANDLE!(HMIDISTRM, HMIDISTRM__);
-DECLARE_HANDLE!(HMIDI, HMIDI__);
-pub type LPHMIDISTRM = *mut HMIDISTRM;
-pub type LPHMIDI = *mut HMIDI;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mscat.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mscat.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mscat.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mscat.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Microsoft Internet Security Catalog API Prototypes and Definitions
-STRUCT!{struct CRYPTCATSTORE {
-    cbStruct: ::DWORD,
-    dwPublicVersion: ::DWORD,
-    pwszP7File: ::LPWSTR,
-    hProv: ::HCRYPTPROV,
-    dwEncodingType: ::DWORD,
-    fdwStoreFlags: ::DWORD,
-    hReserved: ::HANDLE,
-    hAttrs: ::HANDLE,
-    hCryptMsg: ::HCRYPTMSG,
-    hSorted: ::HANDLE,
-}}
-STRUCT!{struct CRYPTCATMEMBER {
-    cbStruct: ::DWORD,
-    pwszReferenceTag: ::LPWSTR,
-    pwszFileName: ::LPWSTR,
-    gSubjectType: ::GUID,
-    fdwMemberFlags: ::DWORD,
-    pIndirectData: *mut ::SIP_INDIRECT_DATA,
-    dwCertVersion: ::DWORD,
-    dwReserved: ::DWORD,
-    hReserved: ::HANDLE,
-    sEncodedIndirectData: ::CRYPT_ATTR_BLOB,
-    sEncodedMemberInfo: ::CRYPT_ATTR_BLOB,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mssip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mssip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/mssip.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/mssip.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Microsoft SIP Provider Prototypes and Definitions
-STRUCT!{struct SIP_SUBJECTINFO {
-    cbSize: ::DWORD,
-    pgSubjectType: *mut ::GUID,
-    hFile: ::HANDLE,
-    pwsFileName: ::LPCWSTR,
-    pwsDisplayName: ::LPCWSTR,
-    dwReserved1: ::DWORD,
-    dwIntVersion: ::DWORD,
-    hProv: ::HCRYPTPROV,
-    DigestAlgorithm: ::CRYPT_ALGORITHM_IDENTIFIER,
-    dwFlags: ::DWORD,
-    dwEncodingType: ::DWORD,
-    dwReserved2: ::DWORD,
-    fdwCAPISettings: ::DWORD,
-    fdwSecuritySettings: ::DWORD,
-    dwIndex: ::DWORD,
-    dwUnionChoice: ::DWORD,
-    psFlat: *mut MS_ADDINFO_FLAT,
-    pClientData: ::LPVOID,
-}}
-UNION!(SIP_SUBJECTINFO, psFlat, psCatMember, psCatMember_mut, *mut MS_ADDINFO_CATALOGMEMBER);
-UNION!(SIP_SUBJECTINFO, psFlat, psBlob, psBlob_mut, *mut MS_ADDINFO_BLOB);
-pub type LPSIP_SUBJECTINFO = *mut SIP_SUBJECTINFO;
-STRUCT!{struct MS_ADDINFO_FLAT {
-    cbStruct: ::DWORD,
-    pIndirectData: *mut SIP_INDIRECT_DATA,
-}}
-pub type PMS_ADDINFO_FLAT = *mut MS_ADDINFO_FLAT;
-STRUCT!{struct MS_ADDINFO_CATALOGMEMBER {
-    cbStruct: ::DWORD,
-    pStore: *mut ::CRYPTCATSTORE,
-    pMember: *mut ::CRYPTCATMEMBER,
-}}
-pub type PMS_ADDINFO_CATALOGMEMBER = *mut MS_ADDINFO_CATALOGMEMBER;
-STRUCT!{struct MS_ADDINFO_BLOB {
-    cbStruct: ::DWORD,
-    cbMemObject: ::DWORD,
-    pbMemObject: *mut ::BYTE,
-    cbMemSignedMsg: ::DWORD,
-    pbMemSignedMsg: *mut ::BYTE,
-}}
-pub type PMS_ADDINFO_BLOB = *mut MS_ADDINFO_BLOB;
-STRUCT!{struct SIP_INDIRECT_DATA {
-    Data: ::CRYPT_ATTRIBUTE_TYPE_VALUE,
-    DigestAlgorithm: ::CRYPT_ALGORITHM_IDENTIFIER,
-    Digest: ::CRYPT_HASH_BLOB,
-}}
-pub type PSIP_INDIRECT_DATA = *mut SIP_INDIRECT_DATA;
-STRUCT!{struct SIP_ADD_NEWPROVIDER {
-    cbStruct: ::DWORD,
-    pgSubject: *mut ::GUID,
-    pwszDLLFileName: *mut ::WCHAR,
-    pwszMagicNumber: *mut ::WCHAR,
-    pwszIsFunctionName: *mut ::WCHAR,
-    pwszGetFuncName: *mut ::WCHAR,
-    pwszPutFuncName: *mut ::WCHAR,
-    pwszCreateFuncName: *mut ::WCHAR,
-    pwszVerifyFuncName: *mut ::WCHAR,
-    pwszRemoveFuncName: *mut ::WCHAR,
-    pwszIsFunctionNameFmt2: *mut ::WCHAR,
-    pwszGetCapFuncName: ::PWSTR,
-}}
-pub type PSIP_ADD_NEWPROVIDER = *mut SIP_ADD_NEWPROVIDER;
-STRUCT!{struct SIP_CAP_SET_V3 {
-    cbSize: ::DWORD,
-    dwVersion: ::DWORD,
-    isMultiSign: ::BOOL,
-    dwFlags: ::DWORD,
-}}
-UNION!(SIP_CAP_SET_V3, dwFlags, dwReserved, dwReserved_mut, ::DWORD);
-pub type PSIP_CAP_SET_V3 = *mut SIP_CAP_SET_V3;
-pub type SIP_CAP_SET = PSIP_CAP_SET_V3;
-pub type pCryptSIPGetSignedDataMsg = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, pdwEncodingType: *mut ::DWORD, dwIndex: ::DWORD,
-    pcbSignedDataMsg: *mut ::DWORD, pbSignedDataMsg: *mut ::BYTE,
-) -> ::BOOL>;
-pub type pCryptSIPPutSignedDataMsg = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, dwEncodingType: ::DWORD, pdwIndex: *mut ::DWORD,
-    cbSignedDataMsg: ::DWORD, pbSignedDataMsg: *mut ::BYTE,
-) -> ::BOOL>;
-pub type pCryptSIPCreateIndirectData = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, pcbIndirectData: *mut ::DWORD,
-    pIndirectData: *mut SIP_INDIRECT_DATA,
-) -> ::BOOL>;
-pub type pCryptSIPVerifyIndirectData = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, pIndirectData: *mut SIP_INDIRECT_DATA,
-) -> ::BOOL>;
-pub type pCryptSIPRemoveSignedDataMsg = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, dwIndex: ::DWORD,
-) -> ::BOOL>;
-STRUCT!{nodebug struct SIP_DISPATCH_INFO {
-    cbSize: ::DWORD,
-    hSIP: ::HANDLE,
-    pfGet: pCryptSIPGetSignedDataMsg,
-    pfPut: pCryptSIPPutSignedDataMsg,
-    pfCreate: pCryptSIPCreateIndirectData,
-    pfVerify: pCryptSIPVerifyIndirectData,
-    pfRemove: pCryptSIPRemoveSignedDataMsg,
-}}
-pub type LPSIP_DISPATCH_INFO = *mut SIP_DISPATCH_INFO;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/nb30.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/nb30.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/nb30.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/nb30.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,200 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// This module contains the definitions for portable NetBIOS 3.0 support.
-pub const NCBNAMSZ: usize = 16;
-pub const MAX_LANA: usize = 254;
-pub type PFPOST = Option<unsafe extern "system" fn(*mut NCB)>;
-#[cfg(target_arch="x86_64")]
-STRUCT!{nodebug struct NCB {
-    ncb_command: ::UCHAR,
-    ncb_retcode: ::UCHAR,
-    ncb_lsn: ::UCHAR,
-    ncb_num: ::UCHAR,
-    ncb_buffer: ::PUCHAR,
-    ncb_length: ::WORD,
-    ncb_callname: [::UCHAR; NCBNAMSZ],
-    ncb_name: [::UCHAR; NCBNAMSZ],
-    ncb_rto: ::UCHAR,
-    ncb_sto: ::UCHAR,
-    ncb_post: PFPOST,
-    ncb_lana_num: ::UCHAR,
-    ncb_cmd_cplt: ::UCHAR,
-    ncb_reserve: [::UCHAR; 18],
-    ncb_event: ::HANDLE,
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{nodebug struct NCB {
-    ncb_command: ::UCHAR,
-    ncb_retcode: ::UCHAR,
-    ncb_lsn: ::UCHAR,
-    ncb_num: ::UCHAR,
-    ncb_buffer: ::PUCHAR,
-    ncb_length: ::WORD,
-    ncb_callname: [::UCHAR; NCBNAMSZ],
-    ncb_name: [::UCHAR; NCBNAMSZ],
-    ncb_rto: ::UCHAR,
-    ncb_sto: ::UCHAR,
-    ncb_post: PFPOST,
-    ncb_lana_num: ::UCHAR,
-    ncb_cmd_cplt: ::UCHAR,
-    ncb_reserve: [::UCHAR; 10],
-    ncb_event: ::HANDLE,
-}}
-pub type PNCB = *mut NCB;
-STRUCT!{struct ADAPTER_STATUS {
-    adapter_address: [::UCHAR; 6],
-    rev_major: ::UCHAR,
-    reserved0: ::UCHAR,
-    adapter_type: ::UCHAR,
-    rev_minor: ::UCHAR,
-    duration: ::WORD,
-    frmr_recv: ::WORD,
-    frmr_xmit: ::WORD,
-    iframe_recv_err: ::WORD,
-    xmit_aborts: ::WORD,
-    xmit_success: ::DWORD,
-    recv_success: ::DWORD,
-    iframe_xmit_err: ::WORD,
-    recv_buff_unavail: ::WORD,
-    t1_timeouts: ::WORD,
-    ti_timeouts: ::WORD,
-    reserved1: ::DWORD,
-    free_ncbs: ::WORD,
-    max_cfg_ncbs: ::WORD,
-    max_ncbs: ::WORD,
-    xmit_buf_unavail: ::WORD,
-    max_dgram_size: ::WORD,
-    pending_sess: ::WORD,
-    max_cfg_sess: ::WORD,
-    max_sess: ::WORD,
-    max_sess_pkt_size: ::WORD,
-    name_count: ::WORD,
-}}
-pub type PADAPTER_STATUS = *mut ADAPTER_STATUS;
-STRUCT!{struct NAME_BUFFER {
-    name: [::UCHAR; NCBNAMSZ],
-    name_num: ::UCHAR,
-    name_flags: ::UCHAR,
-}}
-pub type PNAME_BUFFER = *mut NAME_BUFFER;
-pub const NAME_FLAGS_MASK: ::UCHAR = 0x87;
-pub const GROUP_NAME: ::UCHAR = 0x80;
-pub const UNIQUE_NAME: ::UCHAR = 0x00;
-pub const REGISTERING: ::UCHAR = 0x00;
-pub const REGISTERED: ::UCHAR = 0x04;
-pub const DEREGISTERED: ::UCHAR = 0x05;
-pub const DUPLICATE: ::UCHAR = 0x06;
-pub const DUPLICATE_DEREG: ::UCHAR = 0x07;
-STRUCT!{struct SESSION_HEADER {
-    sess_name: ::UCHAR,
-    num_sess: ::UCHAR,
-    rcv_dg_outstanding: ::UCHAR,
-    rcv_any_outstanding: ::UCHAR,
-}}
-pub type PSESSION_HEADER = *mut SESSION_HEADER;
-STRUCT!{struct SESSION_BUFFER {
-    lsn: ::UCHAR,
-    state: ::UCHAR,
-    local_name: [::UCHAR; NCBNAMSZ],
-    remote_name: [::UCHAR; NCBNAMSZ],
-    rcvs_outstanding: ::UCHAR,
-    sends_outstanding: ::UCHAR,
-}}
-pub type PSESSION_BUFFER = *mut SESSION_BUFFER;
-pub const LISTEN_OUTSTANDING: ::UCHAR = 0x01;
-pub const CALL_PENDING: ::UCHAR = 0x02;
-pub const SESSION_ESTABLISHED: ::UCHAR = 0x03;
-pub const HANGUP_PENDING: ::UCHAR = 0x04;
-pub const HANGUP_COMPLETE: ::UCHAR = 0x05;
-pub const SESSION_ABORTED: ::UCHAR = 0x06;
-STRUCT!{nodebug struct LANA_ENUM {
-    length: ::UCHAR,
-    lana: [::UCHAR; MAX_LANA + 1],
-}}
-pub type PLANA_ENUM = *mut LANA_ENUM;
-STRUCT!{struct FIND_NAME_HEADER {
-    node_count: ::WORD,
-    reserved: ::UCHAR,
-    unique_group: ::UCHAR,
-}}
-pub type PFIND_NAME_HEADER = *mut FIND_NAME_HEADER;
-STRUCT!{struct FIND_NAME_BUFFER {
-    length: ::UCHAR,
-    access_control: ::UCHAR,
-    frame_control: ::UCHAR,
-    destination_addr: [::UCHAR; 6],
-    source_addr: [::UCHAR; 6],
-    routing_info: [::UCHAR; 18],
-}}
-pub type PFIND_NAME_BUFFER = *mut FIND_NAME_BUFFER;
-STRUCT!{struct ACTION_HEADER {
-    transport_id: ::ULONG,
-    action_code: ::USHORT,
-    reserved: ::USHORT,
-}}
-pub type PACTION_HEADER = *mut ACTION_HEADER;
-pub const NCBCALL: ::UCHAR = 0x10;
-pub const NCBLISTEN: ::UCHAR = 0x11;
-pub const NCBHANGUP: ::UCHAR = 0x12;
-pub const NCBSEND: ::UCHAR = 0x14;
-pub const NCBRECV: ::UCHAR = 0x15;
-pub const NCBRECVANY: ::UCHAR = 0x16;
-pub const NCBCHAINSEND: ::UCHAR = 0x17;
-pub const NCBDGSEND: ::UCHAR = 0x20;
-pub const NCBDGRECV: ::UCHAR = 0x21;
-pub const NCBDGSENDBC: ::UCHAR = 0x22;
-pub const NCBADDNAME: ::UCHAR = 0x30;
-pub const NCBDELNAME: ::UCHAR = 0x31;
-pub const NCBRESET: ::UCHAR = 0x32;
-pub const NCBASTAT: ::UCHAR = 0x33;
-pub const NCBSSTAT: ::UCHAR = 0x34;
-pub const NCBCANCEL: ::UCHAR = 0x35;
-pub const NCBADDGRNAME: ::UCHAR = 0x36;
-pub const NCBENUM: ::UCHAR = 0x37;
-pub const NCBUNLINK: ::UCHAR = 0x70;
-pub const NCBSENDNA: ::UCHAR = 0x71;
-pub const NCBCHAINSENDNA: ::UCHAR = 0x72;
-pub const NCBLANSTALERT: ::UCHAR = 0x73;
-pub const NCBACTION: ::UCHAR = 0x77;
-pub const NCBFINDNAME: ::UCHAR = 0x78;
-pub const NCBTRACE: ::UCHAR = 0x79;
-pub const ASYNCH: ::UCHAR = 0x80;
-pub const NRC_GOODRET: ::UCHAR = 0x00;
-pub const NRC_BUFLEN: ::UCHAR = 0x01;
-pub const NRC_ILLCMD: ::UCHAR = 0x03;
-pub const NRC_CMDTMO: ::UCHAR = 0x05;
-pub const NRC_INCOMP: ::UCHAR = 0x06;
-pub const NRC_BADDR: ::UCHAR = 0x07;
-pub const NRC_SNUMOUT: ::UCHAR = 0x08;
-pub const NRC_NORES: ::UCHAR = 0x09;
-pub const NRC_SCLOSED: ::UCHAR = 0x0a;
-pub const NRC_CMDCAN: ::UCHAR = 0x0b;
-pub const NRC_DUPNAME: ::UCHAR = 0x0d;
-pub const NRC_NAMTFUL: ::UCHAR = 0x0e;
-pub const NRC_ACTSES: ::UCHAR = 0x0f;
-pub const NRC_LOCTFUL: ::UCHAR = 0x11;
-pub const NRC_REMTFUL: ::UCHAR = 0x12;
-pub const NRC_ILLNN: ::UCHAR = 0x13;
-pub const NRC_NOCALL: ::UCHAR = 0x14;
-pub const NRC_NOWILD: ::UCHAR = 0x15;
-pub const NRC_INUSE: ::UCHAR = 0x16;
-pub const NRC_NAMERR: ::UCHAR = 0x17;
-pub const NRC_SABORT: ::UCHAR = 0x18;
-pub const NRC_NAMCONF: ::UCHAR = 0x19;
-pub const NRC_IFBUSY: ::UCHAR = 0x21;
-pub const NRC_TOOMANY: ::UCHAR = 0x22;
-pub const NRC_BRIDGE: ::UCHAR = 0x23;
-pub const NRC_CANOCCR: ::UCHAR = 0x24;
-pub const NRC_CANCEL: ::UCHAR = 0x26;
-pub const NRC_DUPENV: ::UCHAR = 0x30;
-pub const NRC_ENVNOTDEF: ::UCHAR = 0x34;
-pub const NRC_OSRESNOTAV: ::UCHAR = 0x35;
-pub const NRC_MAXAPPS: ::UCHAR = 0x36;
-pub const NRC_NOSAPS: ::UCHAR = 0x37;
-pub const NRC_NORESOURCES: ::UCHAR = 0x38;
-pub const NRC_INVADDRESS: ::UCHAR = 0x39;
-pub const NRC_INVDDID: ::UCHAR = 0x3B;
-pub const NRC_LOCKFAIL: ::UCHAR = 0x3C;
-pub const NRC_OPENERR: ::UCHAR = 0x3f;
-pub const NRC_SYSTEM: ::UCHAR = 0x40;
-pub const NRC_PENDING: ::UCHAR = 0xff;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ncrypt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ncrypt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ncrypt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ncrypt.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Cryptographic API Prototypes and Definitions
-//191
-pub type NCRYPT_HANDLE = ::ULONG_PTR;
-pub type NCRYPT_PROV_HANDLE = ::ULONG_PTR;
-pub type NCRYPT_KEY_HANDLE = ::ULONG_PTR;
-pub type NCRYPT_HASH_HANDLE = ::ULONG_PTR;
-pub type NCRYPT_SECRET_HANDLE = ::ULONG_PTR;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ntdef.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ntdef.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ntdef.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ntdef.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Type definitions for the basic types.
-//909
-pub type NTSTATUS = ::LONG;
-pub type PNTSTATUS = *mut NTSTATUS;
-pub type PCNTSTATUS = *const NTSTATUS;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ntsecapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ntsecapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ntsecapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ntsecapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1589 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the Local Security Authority APIs.
-DEFINE_GUID!(Audit_System_SecurityStateChange, 0x0cce9210, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System_SecuritySubsystemExtension, 0x0cce9211, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System_Integrity, 0x0cce9212, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System_IPSecDriverEvents, 0x0cce9213, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System_Others, 0x0cce9214, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_Logon, 0x0cce9215, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_Logoff, 0x0cce9216, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_AccountLockout, 0x0cce9217, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_IPSecMainMode, 0x0cce9218, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_IPSecQuickMode, 0x0cce9219, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_IPSecUserMode, 0x0cce921a, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_SpecialLogon, 0x0cce921b, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_Others, 0x0cce921c, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_FileSystem, 0x0cce921d, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Registry, 0x0cce921e, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Kernel, 0x0cce921f, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Sam, 0x0cce9220, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_CertificationServices, 0x0cce9221, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_ApplicationGenerated, 0x0cce9222, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Handle, 0x0cce9223, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Share, 0x0cce9224, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_FirewallPacketDrops, 0x0cce9225, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_FirewallConnection, 0x0cce9226, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Other, 0x0cce9227, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PrivilegeUse_Sensitive, 0x0cce9228, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PrivilegeUse_NonSensitive, 0x0cce9229, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PrivilegeUse_Others, 0x0cce922a, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking_ProcessCreation, 0x0cce922b, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking_ProcessTermination, 0x0cce922c, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking_DpapiActivity, 0x0cce922d, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking_RpcCall, 0x0cce922e, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_AuditPolicy, 0x0cce922f, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_AuthenticationPolicy, 0x0cce9230, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_AuthorizationPolicy, 0x0cce9231, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_MpsscvRulePolicy, 0x0cce9232, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_WfpIPSecPolicy, 0x0cce9233, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_Others, 0x0cce9234, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_UserAccount, 0x0cce9235, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_ComputerAccount, 0x0cce9236, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_SecurityGroup, 0x0cce9237, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_DistributionGroup, 0x0cce9238, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_ApplicationGroup, 0x0cce9239, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_Others, 0x0cce923a, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DSAccess_DSAccess, 0x0cce923b, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DsAccess_AdAuditChanges, 0x0cce923c, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Ds_Replication, 0x0cce923d, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Ds_DetailedReplication, 0x0cce923e, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon_CredentialValidation, 0x0cce923f, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon_Kerberos, 0x0cce9240, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon_Others, 0x0cce9241, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon_KerbCredentialValidation, 0x0cce9242, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_NPS, 0x0cce9243, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_DetailedFileShare, 0x0cce9244, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_RemovableStorage, 0x0cce9245, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_CbacStaging, 0x0cce9246, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_Claims, 0x0cce9247, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System, 0x69979848, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon, 0x69979849, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess, 0x6997984a, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PrivilegeUse, 0x6997984b, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking, 0x6997984c, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange, 0x6997984d, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement, 0x6997984e, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DirectoryServiceAccess, 0x6997984f, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon, 0x69979850, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-ENUM!{enum POLICY_AUDIT_EVENT_TYPE {
-    AuditCategorySystem = 0,
-    AuditCategoryLogon,
-    AuditCategoryObjectAccess,
-    AuditCategoryPrivilegeUse,
-    AuditCategoryDetailedTracking,
-    AuditCategoryPolicyChange,
-    AuditCategoryAccountManagement,
-    AuditCategoryDirectoryServiceAccess,
-    AuditCategoryAccountLogon,
-}}
-pub type PPOLICY_AUDIT_EVENT_TYPE = *mut POLICY_AUDIT_EVENT_TYPE;
-pub const POLICY_AUDIT_EVENT_UNCHANGED: POLICY_AUDIT_EVENT_OPTIONS = 0x00000000;
-pub const POLICY_AUDIT_EVENT_SUCCESS: POLICY_AUDIT_EVENT_OPTIONS = 0x00000001;
-pub const POLICY_AUDIT_EVENT_FAILURE: POLICY_AUDIT_EVENT_OPTIONS = 0x00000002;
-pub const POLICY_AUDIT_EVENT_NONE: POLICY_AUDIT_EVENT_OPTIONS = 0x00000004;
-pub const POLICY_AUDIT_EVENT_MASK: POLICY_AUDIT_EVENT_OPTIONS = POLICY_AUDIT_EVENT_SUCCESS
-    | POLICY_AUDIT_EVENT_FAILURE | POLICY_AUDIT_EVENT_UNCHANGED | POLICY_AUDIT_EVENT_NONE;
-pub const POLICY_VIEW_LOCAL_INFORMATION: ::ACCESS_MASK = 0x00000001;
-pub const POLICY_VIEW_AUDIT_INFORMATION: ::ACCESS_MASK = 0x00000002;
-pub const POLICY_GET_PRIVATE_INFORMATION: ::ACCESS_MASK = 0x00000004;
-pub const POLICY_TRUST_ADMIN: ::ACCESS_MASK = 0x00000008;
-pub const POLICY_CREATE_ACCOUNT: ::ACCESS_MASK = 0x00000010;
-pub const POLICY_CREATE_SECRET: ::ACCESS_MASK = 0x00000020;
-pub const POLICY_CREATE_PRIVILEGE: ::ACCESS_MASK = 0x00000040;
-pub const POLICY_SET_DEFAULT_QUOTA_LIMITS: ::ACCESS_MASK = 0x00000080;
-pub const POLICY_SET_AUDIT_REQUIREMENTS: ::ACCESS_MASK = 0x00000100;
-pub const POLICY_AUDIT_LOG_ADMIN: ::ACCESS_MASK = 0x00000200;
-pub const POLICY_SERVER_ADMIN: ::ACCESS_MASK = 0x00000400;
-pub const POLICY_LOOKUP_NAMES: ::ACCESS_MASK = 0x00000800;
-pub const POLICY_NOTIFICATION: ::ACCESS_MASK = 0x00001000;
-pub const POLICY_ALL_ACCESS: ::ACCESS_MASK = ::STANDARD_RIGHTS_REQUIRED
-    | POLICY_VIEW_LOCAL_INFORMATION | POLICY_VIEW_AUDIT_INFORMATION
-    | POLICY_GET_PRIVATE_INFORMATION | POLICY_TRUST_ADMIN | POLICY_CREATE_ACCOUNT
-    | POLICY_CREATE_SECRET | POLICY_CREATE_PRIVILEGE | POLICY_SET_DEFAULT_QUOTA_LIMITS
-    | POLICY_SET_AUDIT_REQUIREMENTS | POLICY_AUDIT_LOG_ADMIN | POLICY_SERVER_ADMIN
-    | POLICY_LOOKUP_NAMES;
-pub const POLICY_READ: ::ACCESS_MASK = ::STANDARD_RIGHTS_READ | POLICY_VIEW_AUDIT_INFORMATION
-    | POLICY_GET_PRIVATE_INFORMATION;
-pub const POLICY_WRITE: ::ACCESS_MASK = ::STANDARD_RIGHTS_WRITE | POLICY_TRUST_ADMIN
-    | POLICY_CREATE_ACCOUNT | POLICY_CREATE_SECRET | POLICY_CREATE_PRIVILEGE
-    | POLICY_SET_DEFAULT_QUOTA_LIMITS | POLICY_SET_AUDIT_REQUIREMENTS | POLICY_AUDIT_LOG_ADMIN
-    | POLICY_SERVER_ADMIN;
-pub const POLICY_EXECUTE: ::ACCESS_MASK = ::STANDARD_RIGHTS_EXECUTE
-    | POLICY_VIEW_LOCAL_INFORMATION | POLICY_LOOKUP_NAMES;
-STRUCT!{struct LSA_TRANSLATED_SID {
-    Use: ::SID_NAME_USE,
-    RelativeId: ::ULONG,
-    DomainIndex: ::LONG,
-}}
-pub type PLSA_TRANSLATED_SID = *mut LSA_TRANSLATED_SID;
-ENUM!{enum POLICY_LSA_SERVER_ROLE {
-    PolicyServerRoleBackup = 2,
-    PolicyServerRolePrimary,
-}}
-pub type PPOLICY_LSA_SERVER_ROLE = *mut POLICY_LSA_SERVER_ROLE;
-pub type POLICY_AUDIT_EVENT_OPTIONS = ::ULONG;
-pub type PPOLICY_AUDIT_EVENT_OPTIONS = *mut ::ULONG;
-ENUM!{enum POLICY_INFORMATION_CLASS {
-    PolicyAuditLogInformation = 1,
-    PolicyAuditEventsInformation,
-    PolicyPrimaryDomainInformation,
-    PolicyPdAccountInformation,
-    PolicyAccountDomainInformation,
-    PolicyLsaServerRoleInformation,
-    PolicyReplicaSourceInformation,
-    PolicyDefaultQuotaInformation,
-    PolicyModificationInformation,
-    PolicyAuditFullSetInformation,
-    PolicyAuditFullQueryInformation,
-    PolicyDnsDomainInformation,
-    PolicyDnsDomainInformationInt,
-    PolicyLocalAccountDomainInformation,
-    PolicyLastEntry,
-}}
-pub type PPOLICY_INFORMATION_CLASS = *mut POLICY_INFORMATION_CLASS;
-STRUCT!{struct POLICY_AUDIT_LOG_INFO {
-    AuditLogPercentFull: ::ULONG,
-    MaximumLogSize: ::ULONG,
-    AuditRetentionPeriod: ::LARGE_INTEGER,
-    AuditLogFullShutdownInProgress: ::BOOLEAN,
-    TimeToShutdown: ::LARGE_INTEGER,
-    NextAuditRecordId: ::ULONG,
-}}
-pub type PPOLICY_AUDIT_LOG_INFO = *mut POLICY_AUDIT_LOG_INFO;
-STRUCT!{struct POLICY_AUDIT_EVENTS_INFO {
-    AuditingMode: ::BOOLEAN,
-    EventAuditingOptions: PPOLICY_AUDIT_EVENT_OPTIONS,
-    MaximumAuditEventCount: ::ULONG,
-}}
-pub type PPOLICY_AUDIT_EVENTS_INFO = *mut POLICY_AUDIT_EVENTS_INFO;
-STRUCT!{struct POLICY_AUDIT_SUBCATEGORIES_INFO {
-    MaximumSubCategoryCount: ::ULONG,
-    EventAuditingOptions: PPOLICY_AUDIT_EVENT_OPTIONS,
-}}
-pub type PPOLICY_AUDIT_SUBCATEGORIES_INFO = *mut POLICY_AUDIT_SUBCATEGORIES_INFO;
-STRUCT!{struct POLICY_AUDIT_CATEGORIES_INFO {
-    MaximumSubCategoryCount: ::ULONG,
-    SubCategoriesInfo: PPOLICY_AUDIT_SUBCATEGORIES_INFO,
-}}
-pub type PPOLICY_AUDIT_CATEGORIES_INFO = *mut POLICY_AUDIT_CATEGORIES_INFO;
-pub const PER_USER_POLICY_UNCHANGED: ::ULONG = 0x00;
-pub const PER_USER_AUDIT_SUCCESS_INCLUDE: ::ULONG = 0x01;
-pub const PER_USER_AUDIT_SUCCESS_EXCLUDE: ::ULONG = 0x02;
-pub const PER_USER_AUDIT_FAILURE_INCLUDE: ::ULONG = 0x04;
-pub const PER_USER_AUDIT_FAILURE_EXCLUDE: ::ULONG = 0x08;
-pub const PER_USER_AUDIT_NONE: ::ULONG = 0x10;
-pub const VALID_PER_USER_AUDIT_POLICY_FLAG: ::ULONG = PER_USER_AUDIT_SUCCESS_INCLUDE
-    | PER_USER_AUDIT_SUCCESS_EXCLUDE | PER_USER_AUDIT_FAILURE_INCLUDE
-    | PER_USER_AUDIT_FAILURE_EXCLUDE | PER_USER_AUDIT_NONE;
-STRUCT!{struct POLICY_PRIMARY_DOMAIN_INFO {
-    Name: ::LSA_UNICODE_STRING,
-    Sid: ::PSID,
-}}
-pub type PPOLICY_PRIMARY_DOMAIN_INFO = *mut POLICY_PRIMARY_DOMAIN_INFO;
-STRUCT!{struct POLICY_PD_ACCOUNT_INFO {
-    Name: ::LSA_UNICODE_STRING,
-}}
-pub type PPOLICY_PD_ACCOUNT_INFO = *mut POLICY_PD_ACCOUNT_INFO;
-STRUCT!{struct POLICY_LSA_SERVER_ROLE_INFO {
-    LsaServerRole: POLICY_LSA_SERVER_ROLE,
-}}
-pub type PPOLICY_LSA_SERVER_ROLE_INFO = *mut POLICY_LSA_SERVER_ROLE_INFO;
-STRUCT!{struct POLICY_REPLICA_SOURCE_INFO {
-    ReplicaSource: ::LSA_UNICODE_STRING,
-    ReplicaAccountName: ::LSA_UNICODE_STRING,
-}}
-pub type PPOLICY_REPLICA_SOURCE_INFO = *mut POLICY_REPLICA_SOURCE_INFO;
-STRUCT!{struct POLICY_DEFAULT_QUOTA_INFO {
-    QuotaLimits: ::QUOTA_LIMITS,
-}}
-pub type PPOLICY_DEFAULT_QUOTA_INFO = *mut POLICY_DEFAULT_QUOTA_INFO;
-STRUCT!{struct POLICY_MODIFICATION_INFO {
-    ModifiedId: ::LARGE_INTEGER,
-    DatabaseCreationTime: ::LARGE_INTEGER,
-}}
-pub type PPOLICY_MODIFICATION_INFO = *mut POLICY_MODIFICATION_INFO;
-STRUCT!{struct POLICY_AUDIT_FULL_SET_INFO {
-    ShutDownOnFull: ::BOOLEAN,
-}}
-pub type PPOLICY_AUDIT_FULL_SET_INFO = *mut POLICY_AUDIT_FULL_SET_INFO;
-STRUCT!{struct POLICY_AUDIT_FULL_QUERY_INFO {
-    ShutDownOnFull: ::BOOLEAN,
-    LogIsFull: ::BOOLEAN,
-}}
-pub type PPOLICY_AUDIT_FULL_QUERY_INFO = *mut POLICY_AUDIT_FULL_QUERY_INFO;
-ENUM!{enum POLICY_DOMAIN_INFORMATION_CLASS {
-    PolicyDomainEfsInformation = 2,
-    PolicyDomainKerberosTicketInformation,
-}}
-pub type PPOLICY_DOMAIN_INFORMATION_CLASS = *mut POLICY_DOMAIN_INFORMATION_CLASS;
-STRUCT!{struct POLICY_DOMAIN_EFS_INFO {
-    InfoLength: ::ULONG,
-    EfsBlob: ::PUCHAR,
-}}
-pub type PPOLICY_DOMAIN_EFS_INFO = *mut POLICY_DOMAIN_EFS_INFO;
-STRUCT!{struct POLICY_DOMAIN_KERBEROS_TICKET_INFO {
-    AuthenticationOptions: ::ULONG,
-    MaxServiceTicketAge: ::LARGE_INTEGER,
-    MaxTicketAge: ::LARGE_INTEGER,
-    MaxRenewAge: ::LARGE_INTEGER,
-    MaxClockSkew: ::LARGE_INTEGER,
-    Reserved: ::LARGE_INTEGER,
-}}
-pub type PPOLICY_DOMAIN_KERBEROS_TICKET_INFO = *mut POLICY_DOMAIN_KERBEROS_TICKET_INFO;
-ENUM!{enum POLICY_NOTIFICATION_INFORMATION_CLASS {
-    PolicyNotifyAuditEventsInformation = 1,
-    PolicyNotifyAccountDomainInformation,
-    PolicyNotifyServerRoleInformation,
-    PolicyNotifyDnsDomainInformation,
-    PolicyNotifyDomainEfsInformation,
-    PolicyNotifyDomainKerberosTicketInformation,
-    PolicyNotifyMachineAccountPasswordInformation,
-    PolicyNotifyGlobalSaclInformation,
-    PolicyNotifyMax,
-}}
-pub type PPOLICY_NOTIFICATION_INFORMATION_CLASS = *mut POLICY_NOTIFICATION_INFORMATION_CLASS;
-pub type LSA_HANDLE = ::PVOID;
-pub type PLSA_HANDLE = *mut ::PVOID;
-ENUM!{enum TRUSTED_INFORMATION_CLASS {
-    TrustedDomainNameInformation = 1,
-    TrustedControllersInformation,
-    TrustedPosixOffsetInformation,
-    TrustedPasswordInformation,
-    TrustedDomainInformationBasic,
-    TrustedDomainInformationEx,
-    TrustedDomainAuthInformation,
-    TrustedDomainFullInformation,
-    TrustedDomainAuthInformationInternal,
-    TrustedDomainFullInformationInternal,
-    TrustedDomainInformationEx2Internal,
-    TrustedDomainFullInformation2Internal,
-    TrustedDomainSupportedEncryptionTypes,
-}}
-pub type PTRUSTED_INFORMATION_CLASS = *mut TRUSTED_INFORMATION_CLASS;
-STRUCT!{struct TRUSTED_DOMAIN_NAME_INFO {
-    Name: ::LSA_UNICODE_STRING,
-}}
-pub type PTRUSTED_DOMAIN_NAME_INFO = *mut TRUSTED_DOMAIN_NAME_INFO;
-STRUCT!{struct TRUSTED_CONTROLLERS_INFO {
-    Entries: ::ULONG,
-    Names: ::PLSA_UNICODE_STRING,
-}}
-pub type PTRUSTED_CONTROLLERS_INFO = *mut TRUSTED_CONTROLLERS_INFO;
-STRUCT!{struct TRUSTED_POSIX_OFFSET_INFO {
-    Offset: ::ULONG,
-}}
-pub type PTRUSTED_POSIX_OFFSET_INFO = *mut TRUSTED_POSIX_OFFSET_INFO;
-STRUCT!{struct TRUSTED_PASSWORD_INFO {
-    Password: ::LSA_UNICODE_STRING,
-    OldPassword: ::LSA_UNICODE_STRING,
-}}
-pub type PTRUSTED_PASSWORD_INFO = *mut TRUSTED_PASSWORD_INFO;
-pub type TRUSTED_DOMAIN_INFORMATION_BASIC = ::LSA_TRUST_INFORMATION;
-pub type PTRUSTED_DOMAIN_INFORMATION_BASIC = ::PLSA_TRUST_INFORMATION;
-pub const TRUST_DIRECTION_DISABLED: ::ULONG = 0x00000000;
-pub const TRUST_DIRECTION_INBOUND: ::ULONG = 0x00000001;
-pub const TRUST_DIRECTION_OUTBOUND: ::ULONG = 0x00000002;
-pub const TRUST_DIRECTION_BIDIRECTIONAL: ::ULONG = TRUST_DIRECTION_INBOUND
-    | TRUST_DIRECTION_OUTBOUND;
-pub const TRUST_TYPE_DOWNLEVEL: ::ULONG = 0x00000001;
-pub const TRUST_TYPE_UPLEVEL: ::ULONG = 0x00000002;
-pub const TRUST_TYPE_MIT: ::ULONG = 0x00000003;
-pub const TRUST_ATTRIBUTE_NON_TRANSITIVE: ::ULONG = 0x00000001;
-pub const TRUST_ATTRIBUTE_UPLEVEL_ONLY: ::ULONG = 0x00000002;
-pub const TRUST_ATTRIBUTE_QUARANTINED_DOMAIN: ::ULONG = 0x00000004;
-pub const TRUST_ATTRIBUTE_FOREST_TRANSITIVE: ::ULONG = 0x00000008;
-pub const TRUST_ATTRIBUTE_CROSS_ORGANIZATION: ::ULONG = 0x00000010;
-pub const TRUST_ATTRIBUTE_WITHIN_FOREST: ::ULONG = 0x00000020;
-pub const TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL: ::ULONG = 0x00000040;
-pub const TRUST_ATTRIBUTE_TRUST_USES_RC4_ENCRYPTION: ::ULONG = 0x00000080;
-pub const TRUST_ATTRIBUTE_TRUST_USES_AES_KEYS: ::ULONG = 0x00000100;
-pub const TRUST_ATTRIBUTE_CROSS_ORGANIZATION_NO_TGT_DELEGATION: ::ULONG = 0x00000200;
-pub const TRUST_ATTRIBUTES_VALID: ::ULONG = 0xFF03FFFF;
-pub const TRUST_ATTRIBUTES_USER: ::ULONG = 0xFF000000;
-STRUCT!{struct TRUSTED_DOMAIN_INFORMATION_EX {
-    Name: ::LSA_UNICODE_STRING,
-    FlatName: ::LSA_UNICODE_STRING,
-    Sid: ::PSID,
-    TrustDirection: ::ULONG,
-    TrustType: ::ULONG,
-    TrustAttributes: ::ULONG,
-}}
-pub type PTRUSTED_DOMAIN_INFORMATION_EX = *mut TRUSTED_DOMAIN_INFORMATION_EX;
-STRUCT!{struct TRUSTED_DOMAIN_INFORMATION_EX2 {
-    Name: ::LSA_UNICODE_STRING,
-    FlatName: ::LSA_UNICODE_STRING,
-    Sid: ::PSID,
-    TrustDirection: ::ULONG,
-    TrustType: ::ULONG,
-    TrustAttributes: ::ULONG,
-    ForestTrustLength: ::ULONG,
-    ForestTrustInfo: ::PUCHAR,
-}}
-pub type PTRUSTED_DOMAIN_INFORMATION_EX2 = *mut TRUSTED_DOMAIN_INFORMATION_EX2;
-pub const TRUST_AUTH_TYPE_NONE: ::ULONG = 0;
-pub const TRUST_AUTH_TYPE_NT4OWF: ::ULONG = 1;
-pub const TRUST_AUTH_TYPE_CLEAR: ::ULONG = 2;
-pub const TRUST_AUTH_TYPE_VERSION: ::ULONG = 3;
-STRUCT!{struct LSA_AUTH_INFORMATION {
-    LastUpdateTime: ::LARGE_INTEGER,
-    AuthType: ::ULONG,
-    AuthInfoLength: ::ULONG,
-    AuthInfo: ::PUCHAR,
-}}
-pub type PLSA_AUTH_INFORMATION = *mut LSA_AUTH_INFORMATION;
-STRUCT!{struct TRUSTED_DOMAIN_AUTH_INFORMATION {
-    IncomingAuthInfos: ::ULONG,
-    IncomingAuthenticationInformation: PLSA_AUTH_INFORMATION,
-    IncomingPreviousAuthenticationInformation: PLSA_AUTH_INFORMATION,
-    OutgoingAuthInfos: ::ULONG,
-    OutgoingAuthenticationInformation: PLSA_AUTH_INFORMATION,
-    OutgoingPreviousAuthenticationInformation: PLSA_AUTH_INFORMATION,
-}}
-pub type PTRUSTED_DOMAIN_AUTH_INFORMATION = *mut TRUSTED_DOMAIN_AUTH_INFORMATION;
-STRUCT!{struct TRUSTED_DOMAIN_FULL_INFORMATION {
-    Information: TRUSTED_DOMAIN_INFORMATION_EX,
-    PosixOffset: TRUSTED_POSIX_OFFSET_INFO,
-    AuthInformation: TRUSTED_DOMAIN_AUTH_INFORMATION,
-}}
-pub type PTRUSTED_DOMAIN_FULL_INFORMATION = *mut TRUSTED_DOMAIN_FULL_INFORMATION;
-STRUCT!{struct TRUSTED_DOMAIN_FULL_INFORMATION2 {
-    Information: TRUSTED_DOMAIN_INFORMATION_EX2,
-    PosixOffset: TRUSTED_POSIX_OFFSET_INFO,
-    AuthInformation: TRUSTED_DOMAIN_AUTH_INFORMATION,
-}}
-pub type PTRUSTED_DOMAIN_FULL_INFORMATION2 = *mut TRUSTED_DOMAIN_FULL_INFORMATION2;
-STRUCT!{struct TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES {
-    SupportedEncryptionTypes: ::ULONG,
-}}
-pub type PTRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES =
-    *mut TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES;
-ENUM!{enum LSA_FOREST_TRUST_RECORD_TYPE {
-    ForestTrustTopLevelName,
-    ForestTrustTopLevelNameEx,
-    ForestTrustDomainInfo,
-    ForestTrustRecordTypeLast, // = ForestTrustDomainInfo,
-}}
-pub const LSA_FTRECORD_DISABLED_REASONS: ::ULONG = 0x0000FFFF;
-pub const LSA_TLN_DISABLED_NEW: ::ULONG = 0x00000001;
-pub const LSA_TLN_DISABLED_ADMIN: ::ULONG = 0x00000002;
-pub const LSA_TLN_DISABLED_CONFLICT: ::ULONG = 0x00000004;
-pub const LSA_SID_DISABLED_ADMIN: ::ULONG = 0x00000001;
-pub const LSA_SID_DISABLED_CONFLICT: ::ULONG = 0x00000002;
-pub const LSA_NB_DISABLED_ADMIN: ::ULONG = 0x00000004;
-pub const LSA_NB_DISABLED_CONFLICT: ::ULONG = 0x00000008;
-STRUCT!{struct LSA_FOREST_TRUST_DOMAIN_INFO {
-    Sid: ::PSID,
-    DnsName: ::LSA_UNICODE_STRING,
-    NetbiosName: ::LSA_UNICODE_STRING,
-}}
-pub type PLSA_FOREST_TRUST_DOMAIN_INFO = *mut LSA_FOREST_TRUST_DOMAIN_INFO;
-pub const MAX_FOREST_TRUST_BINARY_DATA_SIZE: ::ULONG = 128 * 1024;
-STRUCT!{struct LSA_FOREST_TRUST_BINARY_DATA {
-    Length: ::ULONG,
-    Buffer: ::PUCHAR,
-}}
-pub type PLSA_FOREST_TRUST_BINARY_DATA = *mut LSA_FOREST_TRUST_BINARY_DATA;
-STRUCT!{struct LSA_FOREST_TRUST_RECORD_ForestTrustData {
-    DomainInfo: LSA_FOREST_TRUST_DOMAIN_INFO,
-}}
-UNION!(
-    LSA_FOREST_TRUST_RECORD_ForestTrustData, DomainInfo, TopLevelName, TopLevelName_mut,
-    ::LSA_UNICODE_STRING
-);
-UNION!(
-    LSA_FOREST_TRUST_RECORD_ForestTrustData, DomainInfo, Data, Data_mut,
-    LSA_FOREST_TRUST_BINARY_DATA
-);
-STRUCT!{struct LSA_FOREST_TRUST_RECORD {
-    Flags: ::ULONG,
-    ForestTrustType: LSA_FOREST_TRUST_RECORD_TYPE,
-    Time: ::LARGE_INTEGER,
-    ForestTrustData: LSA_FOREST_TRUST_RECORD_ForestTrustData,
-}}
-pub type PLSA_FOREST_TRUST_RECORD = *mut LSA_FOREST_TRUST_RECORD;
-pub const MAX_RECORDS_IN_FOREST_TRUST_INFO: ::ULONG = 4000;
-STRUCT!{struct LSA_FOREST_TRUST_INFORMATION {
-    RecordCount: ::ULONG,
-    Entries: *mut PLSA_FOREST_TRUST_RECORD,
-}}
-pub type PLSA_FOREST_TRUST_INFORMATION = *mut LSA_FOREST_TRUST_INFORMATION;
-ENUM!{enum LSA_FOREST_TRUST_COLLISION_RECORD_TYPE {
-    CollisionTdo,
-    CollisionXref,
-    CollisionOther,
-}}
-STRUCT!{struct LSA_FOREST_TRUST_COLLISION_RECORD {
-    Index: ::ULONG,
-    Type: LSA_FOREST_TRUST_COLLISION_RECORD_TYPE,
-    Flags: ::ULONG,
-    Name: ::LSA_UNICODE_STRING,
-}}
-pub type PLSA_FOREST_TRUST_COLLISION_RECORD = *mut LSA_FOREST_TRUST_COLLISION_RECORD;
-STRUCT!{struct LSA_FOREST_TRUST_COLLISION_INFORMATION {
-    RecordCount: ::ULONG,
-    Entries: *mut PLSA_FOREST_TRUST_COLLISION_RECORD,
-}}
-pub type PLSA_FOREST_TRUST_COLLISION_INFORMATION = *mut LSA_FOREST_TRUST_COLLISION_INFORMATION;
-pub type LSA_ENUMERATION_HANDLE = ::ULONG;
-pub type PLSA_ENUMERATION_HANDLE = *mut ::ULONG;
-STRUCT!{struct LSA_ENUMERATION_INFORMATION {
-    Sid: ::PSID,
-}}
-pub type PLSA_ENUMERATION_INFORMATION = *mut LSA_ENUMERATION_INFORMATION;
-STRUCT!{struct LSA_LAST_INTER_LOGON_INFO {
-    LastSuccessfulLogon: ::LARGE_INTEGER,
-    LastFailedLogon: ::LARGE_INTEGER,
-    FailedAttemptCountSinceLastSuccessfulLogon: ::ULONG,
-}}
-pub type PLSA_LAST_INTER_LOGON_INFO = *mut LSA_LAST_INTER_LOGON_INFO;
-STRUCT!{struct SECURITY_LOGON_SESSION_DATA {
-    Size: ::ULONG,
-    LogonId: ::LUID,
-    UserName: ::LSA_UNICODE_STRING,
-    LogonDomain: ::LSA_UNICODE_STRING,
-    AuthenticationPackage: ::LSA_UNICODE_STRING,
-    LogonType: ::ULONG,
-    Session: ::ULONG,
-    Sid: ::PSID,
-    LogonTime: ::LARGE_INTEGER,
-    LogonServer: ::LSA_UNICODE_STRING,
-    DnsDomainName: ::LSA_UNICODE_STRING,
-    Upn: ::LSA_UNICODE_STRING,
-    UserFlags: ::ULONG,
-    LastLogonInfo: LSA_LAST_INTER_LOGON_INFO,
-    LogonScript: ::LSA_UNICODE_STRING,
-    ProfilePath: ::LSA_UNICODE_STRING,
-    HomeDirectory: ::LSA_UNICODE_STRING,
-    HomeDirectoryDrive: ::LSA_UNICODE_STRING,
-    LogoffTime: ::LARGE_INTEGER,
-    KickOffTime: ::LARGE_INTEGER,
-    PasswordLastSet: ::LARGE_INTEGER,
-    PasswordCanChange: ::LARGE_INTEGER,
-    PasswordMustChange: ::LARGE_INTEGER,
-}}
-pub type PSECURITY_LOGON_SESSION_DATA = *mut SECURITY_LOGON_SESSION_DATA;
-pub const CENTRAL_ACCESS_POLICY_OWNER_RIGHTS_PRESENT_FLAG: ::ULONG = 0x00000001;
-pub const CENTRAL_ACCESS_POLICY_STAGED_OWNER_RIGHTS_PRESENT_FLAG: ::ULONG = 0x00000100;
-pub const CENTRAL_ACCESS_POLICY_STAGED_FLAG: ::ULONG = 0x00010000;
-pub const CENTRAL_ACCESS_POLICY_VALID_FLAG_MASK: ::ULONG =
-    CENTRAL_ACCESS_POLICY_OWNER_RIGHTS_PRESENT_FLAG
-    | CENTRAL_ACCESS_POLICY_STAGED_OWNER_RIGHTS_PRESENT_FLAG | CENTRAL_ACCESS_POLICY_STAGED_FLAG;
-pub const LSASETCAPS_RELOAD_FLAG: ::ULONG = 0x00000001;
-pub const LSASETCAPS_VALID_FLAG_MASK: ::ULONG = LSASETCAPS_RELOAD_FLAG;
-STRUCT!{struct CENTRAL_ACCESS_POLICY_ENTRY {
-    Name: ::LSA_UNICODE_STRING,
-    Description: ::LSA_UNICODE_STRING,
-    ChangeId: ::LSA_UNICODE_STRING,
-    LengthAppliesTo: ::ULONG,
-    AppliesTo: ::PUCHAR,
-    LengthSD: ::ULONG,
-    SD: ::PSECURITY_DESCRIPTOR,
-    LengthStagedSD: ::ULONG,
-    StagedSD: ::PSECURITY_DESCRIPTOR,
-    Flags: ::ULONG,
-}}
-pub type PCENTRAL_ACCESS_POLICY_ENTRY = *mut CENTRAL_ACCESS_POLICY_ENTRY;
-pub type PCCENTRAL_ACCESS_POLICY_ENTRY = *const CENTRAL_ACCESS_POLICY_ENTRY;
-STRUCT!{struct CENTRAL_ACCESS_POLICY {
-    CAPID: ::PSID,
-    Name: ::LSA_UNICODE_STRING,
-    Description: ::LSA_UNICODE_STRING,
-    ChangeId: ::LSA_UNICODE_STRING,
-    Flags: ::ULONG,
-    CAPECount: ::ULONG,
-    CAPEs: *mut PCENTRAL_ACCESS_POLICY_ENTRY,
-}}
-pub type PCENTRAL_ACCESS_POLICY = *mut CENTRAL_ACCESS_POLICY;
-pub type PCCENTRAL_ACCESS_POLICY = *const CENTRAL_ACCESS_POLICY;
-ENUM!{enum NEGOTIATE_MESSAGES {
-    NegEnumPackagePrefixes = 0,
-    NegGetCallerName = 1,
-    NegTransferCredentials = 2,
-    NegCallPackageMax,
-}}
-pub const NEGOTIATE_MAX_PREFIX: usize = 32;
-STRUCT!{struct NEGOTIATE_PACKAGE_PREFIX {
-    PackageId: ::ULONG_PTR,
-    PackageDataA: ::PVOID,
-    PackageDataW: ::PVOID,
-    PrefixLen: ::ULONG_PTR,
-    Prefix: [::UCHAR; NEGOTIATE_MAX_PREFIX],
-}}
-pub type PNEGOTIATE_PACKAGE_PREFIX = *mut NEGOTIATE_PACKAGE_PREFIX;
-STRUCT!{struct NEGOTIATE_PACKAGE_PREFIXES {
-    MessageType: ::ULONG,
-    PrefixCount: ::ULONG,
-    Offset: ::ULONG,
-    Pad: ::ULONG,
-}}
-pub type PNEGOTIATE_PACKAGE_PREFIXES = *mut NEGOTIATE_PACKAGE_PREFIXES;
-STRUCT!{struct NEGOTIATE_CALLER_NAME_REQUEST {
-    MessageType: ::ULONG,
-    LogonId: ::LUID,
-}}
-pub type PNEGOTIATE_CALLER_NAME_REQUEST = *mut NEGOTIATE_CALLER_NAME_REQUEST;
-STRUCT!{struct NEGOTIATE_CALLER_NAME_RESPONSE {
-    MessageType: ::ULONG,
-    CallerName: ::PWSTR,
-}}
-pub type PNEGOTIATE_CALLER_NAME_RESPONSE = *mut NEGOTIATE_CALLER_NAME_RESPONSE;
-STRUCT!{struct DOMAIN_PASSWORD_INFORMATION {
-    MinPasswordLength: ::USHORT,
-    PasswordHistoryLength: ::USHORT,
-    PasswordProperties: ::ULONG,
-    MaxPasswordAge: ::LARGE_INTEGER,
-    MinPasswordAge: ::LARGE_INTEGER,
-}}
-pub type PDOMAIN_PASSWORD_INFORMATION = *mut DOMAIN_PASSWORD_INFORMATION;
-pub const DOMAIN_PASSWORD_COMPLEX: ::ULONG = 0x00000001;
-pub const DOMAIN_PASSWORD_NO_ANON_CHANGE: ::ULONG = 0x00000002;
-pub const DOMAIN_PASSWORD_NO_CLEAR_CHANGE: ::ULONG = 0x00000004;
-pub const DOMAIN_LOCKOUT_ADMINS: ::ULONG = 0x00000008;
-pub const DOMAIN_PASSWORD_STORE_CLEARTEXT: ::ULONG = 0x00000010;
-pub const DOMAIN_REFUSE_PASSWORD_CHANGE: ::ULONG = 0x00000020;
-pub const DOMAIN_NO_LM_OWF_CHANGE: ::ULONG = 0x00000040;
-pub type PSAM_PASSWORD_NOTIFICATION_ROUTINE = Option<unsafe extern "system" fn(
-    UserName: ::PUNICODE_STRING, RelativeId: ::ULONG, NewPassword: ::PUNICODE_STRING,
-) -> ::NTSTATUS>;
-pub type PSAM_INIT_NOTIFICATION_ROUTINE = Option<unsafe extern "system" fn() -> ::BOOLEAN>;
-pub type PSAM_PASSWORD_FILTER_ROUTINE = Option<unsafe extern "system" fn(
-    AccountName: ::PUNICODE_STRING, FullName: ::PUNICODE_STRING, Password: ::PUNICODE_STRING,
-    SetOperation: ::BOOLEAN,
-) -> ::BOOLEAN>;
-ENUM!{enum MSV1_0_LOGON_SUBMIT_TYPE {
-    MsV1_0InteractiveLogon = 2,
-    MsV1_0Lm20Logon,
-    MsV1_0NetworkLogon,
-    MsV1_0SubAuthLogon,
-    MsV1_0WorkstationUnlockLogon = 7,
-    MsV1_0S4ULogon = 12,
-    MsV1_0VirtualLogon = 82,
-    MsV1_0NoElevationLogon = 83,
-    MsV1_0LuidLogon = 84,
-}}
-pub type PMSV1_0_LOGON_SUBMIT_TYPE = *mut MSV1_0_LOGON_SUBMIT_TYPE;
-ENUM!{enum MSV1_0_PROFILE_BUFFER_TYPE {
-    MsV1_0InteractiveProfile = 2,
-    MsV1_0Lm20LogonProfile,
-    MsV1_0SmartCardProfile,
-}}
-pub type PMSV1_0_PROFILE_BUFFER_TYPE = *mut MSV1_0_PROFILE_BUFFER_TYPE;
-STRUCT!{struct MSV1_0_INTERACTIVE_LOGON {
-    MessageType: MSV1_0_LOGON_SUBMIT_TYPE,
-    LogonDomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-}}
-pub type PMSV1_0_INTERACTIVE_LOGON = *mut MSV1_0_INTERACTIVE_LOGON;
-STRUCT!{struct MSV1_0_INTERACTIVE_PROFILE {
-    MessageType: MSV1_0_PROFILE_BUFFER_TYPE,
-    LogonCount: ::USHORT,
-    BadPasswordCount: ::USHORT,
-    LogonTime: ::LARGE_INTEGER,
-    LogoffTime: ::LARGE_INTEGER,
-    KickOffTime: ::LARGE_INTEGER,
-    PasswordLastSet: ::LARGE_INTEGER,
-    PasswordCanChange: ::LARGE_INTEGER,
-    PasswordMustChange: ::LARGE_INTEGER,
-    LogonScript: ::UNICODE_STRING,
-    HomeDirectory: ::UNICODE_STRING,
-    FullName: ::UNICODE_STRING,
-    ProfilePath: ::UNICODE_STRING,
-    HomeDirectoryDrive: ::UNICODE_STRING,
-    LogonServer: ::UNICODE_STRING,
-    UserFlags: ::ULONG,
-}}
-pub type PMSV1_0_INTERACTIVE_PROFILE = *mut MSV1_0_INTERACTIVE_PROFILE;
-pub const MSV1_0_CHALLENGE_LENGTH: usize = 8;
-pub const MSV1_0_USER_SESSION_KEY_LENGTH: usize = 16;
-pub const MSV1_0_LANMAN_SESSION_KEY_LENGTH: usize = 8;
-pub const MSV1_0_CLEARTEXT_PASSWORD_ALLOWED: ::ULONG = 0x02;
-pub const MSV1_0_UPDATE_LOGON_STATISTICS: ::ULONG = 0x04;
-pub const MSV1_0_RETURN_USER_PARAMETERS: ::ULONG = 0x08;
-pub const MSV1_0_DONT_TRY_GUEST_ACCOUNT: ::ULONG = 0x10;
-pub const MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT: ::ULONG = 0x20;
-pub const MSV1_0_RETURN_PASSWORD_EXPIRY: ::ULONG = 0x40;
-pub const MSV1_0_USE_CLIENT_CHALLENGE: ::ULONG = 0x80;
-pub const MSV1_0_TRY_GUEST_ACCOUNT_ONLY: ::ULONG = 0x100;
-pub const MSV1_0_RETURN_PROFILE_PATH: ::ULONG = 0x200;
-pub const MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY: ::ULONG = 0x400;
-pub const MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT: ::ULONG = 0x800;
-pub const MSV1_0_DISABLE_PERSONAL_FALLBACK: ::ULONG = 0x00001000;
-pub const MSV1_0_ALLOW_FORCE_GUEST: ::ULONG = 0x00002000;
-pub const MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED: ::ULONG = 0x00004000;
-pub const MSV1_0_USE_DOMAIN_FOR_ROUTING_ONLY: ::ULONG = 0x00008000;
-pub const MSV1_0_SUBAUTHENTICATION_DLL_EX: ::ULONG = 0x00100000;
-pub const MSV1_0_ALLOW_MSVCHAPV2: ::ULONG = 0x00010000;
-pub const MSV1_0_S4U2SELF: ::ULONG = 0x00020000;
-pub const MSV1_0_CHECK_LOGONHOURS_FOR_S4U: ::ULONG = 0x00040000;
-pub const MSV1_0_INTERNET_DOMAIN: ::ULONG = 0x00080000;
-pub const MSV1_0_SUBAUTHENTICATION_DLL: ::ULONG = 0xFF000000;
-pub const MSV1_0_SUBAUTHENTICATION_DLL_SHIFT: ::ULONG = 24;
-pub const MSV1_0_MNS_LOGON: ::ULONG = 0x01000000;
-pub const MSV1_0_SUBAUTHENTICATION_DLL_RAS: ::ULONG = 2;
-pub const MSV1_0_SUBAUTHENTICATION_DLL_IIS: ::ULONG = 132;
-STRUCT!{struct MSV1_0_LM20_LOGON {
-    MessageType: MSV1_0_LOGON_SUBMIT_TYPE,
-    LogonDomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Workstation: ::UNICODE_STRING,
-    ChallengeToClient: [::UCHAR; MSV1_0_CHALLENGE_LENGTH],
-    CaseSensitiveChallengeResponse: ::STRING,
-    CaseInsensitiveChallengeResponse: ::STRING,
-    ParameterControl: ::ULONG,
-}}
-pub type PMSV1_0_LM20_LOGON = *mut MSV1_0_LM20_LOGON;
-STRUCT!{struct MSV1_0_SUBAUTH_LOGON {
-    MessageType: MSV1_0_LOGON_SUBMIT_TYPE,
-    LogonDomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Workstation: ::UNICODE_STRING,
-    ChallengeToClient: [::UCHAR; MSV1_0_CHALLENGE_LENGTH],
-    AuthenticationInfo1: ::STRING,
-    AuthenticationInfo2: ::STRING,
-    ParameterControl: ::ULONG,
-    SubAuthPackageId: ::ULONG,
-}}
-pub type PMSV1_0_SUBAUTH_LOGON = *mut MSV1_0_SUBAUTH_LOGON;
-STRUCT!{struct MSV1_0_S4U_LOGON {
-    MessageType: MSV1_0_LOGON_SUBMIT_TYPE,
-    MSV1_0_LOGON_SUBMIT_TYPE: ::ULONG,
-    UserPrincipalName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-}}
-pub type PMSV1_0_S4U_LOGON = *mut MSV1_0_S4U_LOGON;
-pub const LOGON_GUEST: ::ULONG = 0x01;
-pub const LOGON_NOENCRYPTION: ::ULONG = 0x02;
-pub const LOGON_CACHED_ACCOUNT: ::ULONG = 0x04;
-pub const LOGON_USED_LM_PASSWORD: ::ULONG = 0x08;
-pub const LOGON_EXTRA_SIDS: ::ULONG = 0x20;
-pub const LOGON_SUBAUTH_SESSION_KEY: ::ULONG = 0x40;
-pub const LOGON_SERVER_TRUST_ACCOUNT: ::ULONG = 0x80;
-pub const LOGON_NTLMV2_ENABLED: ::ULONG = 0x100;
-pub const LOGON_RESOURCE_GROUPS: ::ULONG = 0x200;
-pub const LOGON_PROFILE_PATH_RETURNED: ::ULONG = 0x400;
-pub const LOGON_NT_V2: ::ULONG = 0x800;
-pub const LOGON_LM_V2: ::ULONG = 0x1000;
-pub const LOGON_NTLM_V2: ::ULONG = 0x2000;
-pub const LOGON_OPTIMIZED: ::ULONG = 0x4000;
-pub const LOGON_WINLOGON: ::ULONG = 0x8000;
-pub const LOGON_PKINIT: ::ULONG = 0x10000;
-pub const LOGON_NO_OPTIMIZED: ::ULONG = 0x20000;
-pub const LOGON_NO_ELEVATION: ::ULONG = 0x40000;
-pub const LOGON_MANAGED_SERVICE: ::ULONG = 0x80000;
-pub const LOGON_GRACE_LOGON: ::ULONG = 0x01000000;
-STRUCT!{struct MSV1_0_LM20_LOGON_PROFILE {
-    MessageType: MSV1_0_PROFILE_BUFFER_TYPE,
-    KickOffTime: ::LARGE_INTEGER,
-    LogoffTime: ::LARGE_INTEGER,
-    UserFlags: ::ULONG,
-    UserSessionKey: [::UCHAR; MSV1_0_USER_SESSION_KEY_LENGTH],
-    LogonDomainName: ::UNICODE_STRING,
-    LanmanSessionKey: [::UCHAR; MSV1_0_LANMAN_SESSION_KEY_LENGTH],
-    LogonServer: ::UNICODE_STRING,
-    UserParameters: ::UNICODE_STRING,
-}}
-pub type PMSV1_0_LM20_LOGON_PROFILE = *mut MSV1_0_LM20_LOGON_PROFILE;
-pub const MSV1_0_OWF_PASSWORD_LENGTH: usize = 16;
-STRUCT!{struct MSV1_0_SUPPLEMENTAL_CREDENTIAL {
-    Version: ::ULONG,
-    Flags: ::ULONG,
-    LmPassword: [::UCHAR; MSV1_0_OWF_PASSWORD_LENGTH],
-    NtPassword: [::UCHAR; MSV1_0_OWF_PASSWORD_LENGTH],
-}}
-pub type PMSV1_0_SUPPLEMENTAL_CREDENTIAL = *mut MSV1_0_SUPPLEMENTAL_CREDENTIAL;
-pub const MSV1_0_NTLM3_RESPONSE_LENGTH: usize = 16;
-pub const MSV1_0_NTLM3_OWF_LENGTH: usize = 16;
-STRUCT!{struct MSV1_0_NTLM3_RESPONSE {
-    Response: [::UCHAR; MSV1_0_NTLM3_RESPONSE_LENGTH],
-    RespType: ::UCHAR,
-    HiRespType: ::UCHAR,
-    Flags: ::USHORT,
-    MsgWord: ::ULONG,
-    TimeStamp: ::ULONGLONG,
-    ChallengeFromClient: [::UCHAR; MSV1_0_CHALLENGE_LENGTH],
-    AvPairsOff: ::ULONG,
-    Buffer: [::UCHAR; 1],
-}}
-pub type PMSV1_0_NTLM3_RESPONSE = *mut MSV1_0_NTLM3_RESPONSE;
-ENUM!{enum MSV1_0_AVID {
-    MsvAvEOL,
-    MsvAvNbComputerName,
-    MsvAvNbDomainName,
-    MsvAvDnsComputerName,
-    MsvAvDnsDomainName,
-    MsvAvDnsTreeName,
-    MsvAvFlags,
-    MsvAvTimestamp,
-    MsvAvRestrictions,
-    MsvAvTargetName,
-    MsvAvChannelBindings,
-}}
-STRUCT!{struct MSV1_0_AV_PAIR {
-    AvId: ::USHORT,
-    AvLen: ::USHORT,
-}}
-pub type PMSV1_0_AV_PAIR = *mut MSV1_0_AV_PAIR;
-ENUM!{enum MSV1_0_PROTOCOL_MESSAGE_TYPE {
-    MsV1_0Lm20ChallengeRequest = 0,
-    MsV1_0Lm20GetChallengeResponse,
-    MsV1_0EnumerateUsers,
-    MsV1_0GetUserInfo,
-    MsV1_0ReLogonUsers,
-    MsV1_0ChangePassword,
-    MsV1_0ChangeCachedPassword,
-    MsV1_0GenericPassthrough,
-    MsV1_0CacheLogon,
-    MsV1_0SubAuth,
-    MsV1_0DeriveCredential,
-    MsV1_0CacheLookup,
-    MsV1_0SetProcessOption,
-    MsV1_0ConfigLocalAliases,
-    MsV1_0ClearCachedCredentials,
-    MsV1_0LookupToken,
-    MsV1_0ValidateAuth,
-    MsV1_0CacheLookupEx,
-    MsV1_0GetCredentialKey,
-    MsV1_0SetThreadOption,
-}}
-pub type PMSV1_0_PROTOCOL_MESSAGE_TYPE = *mut MSV1_0_PROTOCOL_MESSAGE_TYPE;
-STRUCT!{struct MSV1_0_CHANGEPASSWORD_REQUEST {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    DomainName: ::UNICODE_STRING,
-    AccountName: ::UNICODE_STRING,
-    OldPassword: ::UNICODE_STRING,
-    NewPassword: ::UNICODE_STRING,
-    Impersonating: ::BOOLEAN,
-}}
-pub type PMSV1_0_CHANGEPASSWORD_REQUEST = *mut MSV1_0_CHANGEPASSWORD_REQUEST;
-STRUCT!{struct MSV1_0_CHANGEPASSWORD_RESPONSE {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    PasswordInfoValid: ::BOOLEAN,
-    DomainPasswordInfo: DOMAIN_PASSWORD_INFORMATION,
-}}
-pub type PMSV1_0_CHANGEPASSWORD_RESPONSE = *mut MSV1_0_CHANGEPASSWORD_RESPONSE;
-STRUCT!{struct MSV1_0_PASSTHROUGH_REQUEST {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    DomainName: ::UNICODE_STRING,
-    PackageName: ::UNICODE_STRING,
-    DataLength: ::ULONG,
-    LogonData: ::PUCHAR,
-    Pad: ::ULONG,
-}}
-pub type PMSV1_0_PASSTHROUGH_REQUEST = *mut MSV1_0_PASSTHROUGH_REQUEST;
-STRUCT!{struct MSV1_0_PASSTHROUGH_RESPONSE {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    Pad: ::ULONG,
-    DataLength: ::ULONG,
-    ValidationData: ::PUCHAR,
-}}
-pub type PMSV1_0_PASSTHROUGH_RESPONSE = *mut MSV1_0_PASSTHROUGH_RESPONSE;
-STRUCT!{struct MSV1_0_SUBAUTH_REQUEST {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    SubAuthPackageId: ::ULONG,
-    SubAuthInfoLength: ::ULONG,
-    SubAuthSubmitBuffer: ::PUCHAR,
-}}
-pub type PMSV1_0_SUBAUTH_REQUEST = *mut MSV1_0_SUBAUTH_REQUEST;
-STRUCT!{struct MSV1_0_SUBAUTH_RESPONSE {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    SubAuthInfoLength: ::ULONG,
-    SubAuthReturnBuffer: ::PUCHAR,
-}}
-pub type PMSV1_0_SUBAUTH_RESPONSE = *mut MSV1_0_SUBAUTH_RESPONSE;
-pub const RTL_ENCRYPT_MEMORY_SIZE: ::ULONG = 8;
-pub const RTL_ENCRYPT_OPTION_CROSS_PROCESS: ::ULONG = 0x01;
-pub const RTL_ENCRYPT_OPTION_SAME_LOGON: ::ULONG = 0x02;
-pub const KERB_ETYPE_NULL: ::LONG = 0;
-pub const KERB_ETYPE_DES_CBC_CRC: ::LONG = 1;
-pub const KERB_ETYPE_DES_CBC_MD4: ::LONG = 2;
-pub const KERB_ETYPE_DES_CBC_MD5: ::LONG = 3;
-pub const KERB_ETYPE_AES128_CTS_HMAC_SHA1_96: ::LONG = 17;
-pub const KERB_ETYPE_AES256_CTS_HMAC_SHA1_96: ::LONG = 18;
-pub const KERB_ETYPE_RC4_MD4: ::LONG = -128;
-pub const KERB_ETYPE_RC4_PLAIN2: ::LONG = -129;
-pub const KERB_ETYPE_RC4_LM: ::LONG = -130;
-pub const KERB_ETYPE_RC4_SHA: ::LONG = -131;
-pub const KERB_ETYPE_DES_PLAIN: ::LONG = -132;
-pub const KERB_ETYPE_RC4_HMAC_OLD: ::LONG = -133;
-pub const KERB_ETYPE_RC4_PLAIN_OLD: ::LONG = -134;
-pub const KERB_ETYPE_RC4_HMAC_OLD_EXP: ::LONG = -135;
-pub const KERB_ETYPE_RC4_PLAIN_OLD_EXP: ::LONG = -136;
-pub const KERB_ETYPE_RC4_PLAIN: ::LONG = -140;
-pub const KERB_ETYPE_RC4_PLAIN_EXP: ::LONG = -141;
-pub const KERB_ETYPE_AES128_CTS_HMAC_SHA1_96_PLAIN: ::LONG = -148;
-pub const KERB_ETYPE_AES256_CTS_HMAC_SHA1_96_PLAIN: ::LONG = -149;
-pub const KERB_ETYPE_DSA_SHA1_CMS: ::LONG = 9;
-pub const KERB_ETYPE_RSA_MD5_CMS: ::LONG = 10;
-pub const KERB_ETYPE_RSA_SHA1_CMS: ::LONG = 11;
-pub const KERB_ETYPE_RC2_CBC_ENV: ::LONG = 12;
-pub const KERB_ETYPE_RSA_ENV: ::LONG = 13;
-pub const KERB_ETYPE_RSA_ES_OEAP_ENV: ::LONG = 14;
-pub const KERB_ETYPE_DES_EDE3_CBC_ENV: ::LONG = 15;
-pub const KERB_ETYPE_DSA_SIGN: ::LONG = 8;
-pub const KERB_ETYPE_RSA_PRIV: ::LONG = 9;
-pub const KERB_ETYPE_RSA_PUB: ::LONG = 10;
-pub const KERB_ETYPE_RSA_PUB_MD5: ::LONG = 11;
-pub const KERB_ETYPE_RSA_PUB_SHA1: ::LONG = 12;
-pub const KERB_ETYPE_PKCS7_PUB: ::LONG = 13;
-pub const KERB_ETYPE_DES3_CBC_MD5: ::LONG = 5;
-pub const KERB_ETYPE_DES3_CBC_SHA1: ::LONG = 7;
-pub const KERB_ETYPE_DES3_CBC_SHA1_KD: ::LONG = 16;
-pub const KERB_ETYPE_DES_CBC_MD5_NT: ::LONG = 20;
-pub const KERB_ETYPE_RC4_HMAC_NT: ::LONG = 23;
-pub const KERB_ETYPE_RC4_HMAC_NT_EXP: ::LONG = 24;
-pub const KERB_CHECKSUM_NONE: ::LONG = 0;
-pub const KERB_CHECKSUM_CRC32: ::LONG = 1;
-pub const KERB_CHECKSUM_MD4: ::LONG = 2;
-pub const KERB_CHECKSUM_KRB_DES_MAC: ::LONG = 4;
-pub const KERB_CHECKSUM_KRB_DES_MAC_K: ::LONG = 5;
-pub const KERB_CHECKSUM_MD5: ::LONG = 7;
-pub const KERB_CHECKSUM_MD5_DES: ::LONG = 8;
-pub const KERB_CHECKSUM_SHA1_NEW: ::LONG = 14;
-pub const KERB_CHECKSUM_HMAC_SHA1_96_AES128: ::LONG = 15;
-pub const KERB_CHECKSUM_HMAC_SHA1_96_AES256: ::LONG = 16;
-pub const KERB_CHECKSUM_LM: ::LONG = -130;
-pub const KERB_CHECKSUM_SHA1: ::LONG = -131;
-pub const KERB_CHECKSUM_REAL_CRC32: ::LONG = -132;
-pub const KERB_CHECKSUM_DES_MAC: ::LONG = -133;
-pub const KERB_CHECKSUM_DES_MAC_MD5: ::LONG = -134;
-pub const KERB_CHECKSUM_MD25: ::LONG = -135;
-pub const KERB_CHECKSUM_RC4_MD5: ::LONG = -136;
-pub const KERB_CHECKSUM_MD5_HMAC: ::LONG = -137;
-pub const KERB_CHECKSUM_HMAC_MD5: ::LONG = -138;
-pub const KERB_CHECKSUM_HMAC_SHA1_96_AES128_Ki: ::LONG = -150;
-pub const KERB_CHECKSUM_HMAC_SHA1_96_AES256_Ki: ::LONG = -151;
-pub const KERB_TICKET_FLAGS_reserved: ::ULONG = 0x80000000;
-pub const KERB_TICKET_FLAGS_forwardable: ::ULONG = 0x40000000;
-pub const KERB_TICKET_FLAGS_forwarded: ::ULONG = 0x20000000;
-pub const KERB_TICKET_FLAGS_proxiable: ::ULONG = 0x10000000;
-pub const KERB_TICKET_FLAGS_proxy: ::ULONG = 0x08000000;
-pub const KERB_TICKET_FLAGS_may_postdate: ::ULONG = 0x04000000;
-pub const KERB_TICKET_FLAGS_postdated: ::ULONG = 0x02000000;
-pub const KERB_TICKET_FLAGS_invalid: ::ULONG = 0x01000000;
-pub const KERB_TICKET_FLAGS_renewable: ::ULONG = 0x00800000;
-pub const KERB_TICKET_FLAGS_initial: ::ULONG = 0x00400000;
-pub const KERB_TICKET_FLAGS_pre_authent: ::ULONG = 0x00200000;
-pub const KERB_TICKET_FLAGS_hw_authent: ::ULONG = 0x00100000;
-pub const KERB_TICKET_FLAGS_ok_as_delegate: ::ULONG = 0x00040000;
-pub const KERB_TICKET_FLAGS_name_canonicalize: ::ULONG = 0x00010000;
-pub const KERB_TICKET_FLAGS_cname_in_pa_data: ::ULONG = 0x00040000;
-pub const KERB_TICKET_FLAGS_enc_pa_rep: ::ULONG = 0x00010000;
-pub const KERB_TICKET_FLAGS_reserved1: ::ULONG = 0x00000001;
-pub const KRB_NT_UNKNOWN: ::LONG = 0;
-pub const KRB_NT_PRINCIPAL: ::LONG = 1;
-pub const KRB_NT_PRINCIPAL_AND_ID: ::LONG = -131;
-pub const KRB_NT_SRV_INST: ::LONG = 2;
-pub const KRB_NT_SRV_INST_AND_ID: ::LONG = -132;
-pub const KRB_NT_SRV_HST: ::LONG = 3;
-pub const KRB_NT_SRV_XHST: ::LONG = 4;
-pub const KRB_NT_UID: ::LONG = 5;
-pub const KRB_NT_ENTERPRISE_PRINCIPAL: ::LONG = 10;
-pub const KRB_NT_WELLKNOWN: ::LONG = 11;
-pub const KRB_NT_ENT_PRINCIPAL_AND_ID: ::LONG = -130;
-pub const KRB_NT_MS_PRINCIPAL: ::LONG = -128;
-pub const KRB_NT_MS_PRINCIPAL_AND_ID: ::LONG = -129;
-pub const KRB_NT_MS_BRANCH_ID: ::LONG = -133;
-pub const KRB_NT_X500_PRINCIPAL: ::LONG = 6;
-pub const KERB_WRAP_NO_ENCRYPT: ::ULONG = 0x80000001;
-ENUM!{enum KERB_LOGON_SUBMIT_TYPE {
-    KerbInteractiveLogon = 2,
-    KerbSmartCardLogon = 6,
-    KerbWorkstationUnlockLogon = 7,
-    KerbSmartCardUnlockLogon = 8,
-    KerbProxyLogon = 9,
-    KerbTicketLogon = 10,
-    KerbTicketUnlockLogon = 11,
-    KerbS4ULogon = 12,
-    KerbCertificateLogon = 13,
-    KerbCertificateS4ULogon = 14,
-    KerbCertificateUnlockLogon = 15,
-    KerbNoElevationLogon = 83,
-    KerbLuidLogon = 84,
-}}
-pub type PKERB_LOGON_SUBMIT_TYPE = *mut KERB_LOGON_SUBMIT_TYPE;
-STRUCT!{struct KERB_INTERACTIVE_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    LogonDomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-}}
-pub type PKERB_INTERACTIVE_LOGON = *mut KERB_INTERACTIVE_LOGON;
-STRUCT!{struct KERB_INTERACTIVE_UNLOCK_LOGON {
-    Logon: KERB_INTERACTIVE_LOGON,
-    LogonId: ::LUID,
-}}
-pub type PKERB_INTERACTIVE_UNLOCK_LOGON = *mut KERB_INTERACTIVE_UNLOCK_LOGON;
-STRUCT!{struct KERB_SMART_CARD_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    Pin: ::UNICODE_STRING,
-    CspDataLength: ::ULONG,
-    CspData: ::PUCHAR,
-}}
-pub type PKERB_SMART_CARD_LOGON = *mut KERB_SMART_CARD_LOGON;
-STRUCT!{struct KERB_SMART_CARD_UNLOCK_LOGON {
-    Logon: KERB_SMART_CARD_LOGON,
-    LogonId: ::LUID,
-}}
-pub type PKERB_SMART_CARD_UNLOCK_LOGON = *mut KERB_SMART_CARD_UNLOCK_LOGON;
-pub const KERB_CERTIFICATE_LOGON_FLAG_CHECK_DUPLICATES: ::ULONG = 0x1;
-pub const KERB_CERTIFICATE_LOGON_FLAG_USE_CERTIFICATE_INFO: ::ULONG = 0x2;
-STRUCT!{struct KERB_CERTIFICATE_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    DomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Pin: ::UNICODE_STRING,
-    Flags: ::ULONG,
-    CspDataLength: ::ULONG,
-    CspData: ::PUCHAR,
-}}
-pub type PKERB_CERTIFICATE_LOGON = *mut KERB_CERTIFICATE_LOGON;
-STRUCT!{struct KERB_CERTIFICATE_UNLOCK_LOGON {
-    Logon: KERB_CERTIFICATE_LOGON,
-    LogonId: ::LUID,
-}}
-pub type PKERB_CERTIFICATE_UNLOCK_LOGON = *mut KERB_CERTIFICATE_UNLOCK_LOGON;
-pub const KERB_CERTIFICATE_S4U_LOGON_FLAG_CHECK_DUPLICATES: ::ULONG = 0x1;
-pub const KERB_CERTIFICATE_S4U_LOGON_FLAG_CHECK_LOGONHOURS: ::ULONG = 0x2;
-pub const KERB_CERTIFICATE_S4U_LOGON_FLAG_FAIL_IF_NT_AUTH_POLICY_REQUIRED: ::ULONG = 0x4;
-pub const KERB_CERTIFICATE_S4U_LOGON_FLAG_IDENTIFY: ::ULONG = 0x8;
-STRUCT!{struct KERB_CERTIFICATE_S4U_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    Flags: ::ULONG,
-    UserPrincipalName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-    CertificateLength: ::ULONG,
-    Certificate: ::PUCHAR,
-}}
-pub type PKERB_CERTIFICATE_S4U_LOGON = *mut KERB_CERTIFICATE_S4U_LOGON;
-STRUCT!{struct KERB_TICKET_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    Flags: ::ULONG,
-    ServiceTicketLength: ::ULONG,
-    TicketGrantingTicketLength: ::ULONG,
-    ServiceTicket: ::PUCHAR,
-    TicketGrantingTicket: ::PUCHAR,
-}}
-pub type PKERB_TICKET_LOGON = *mut KERB_TICKET_LOGON;
-STRUCT!{struct KERB_TICKET_UNLOCK_LOGON {
-    Logon: KERB_TICKET_LOGON,
-    LogonId: ::LUID,
-}}
-pub type PKERB_TICKET_UNLOCK_LOGON = *mut KERB_TICKET_UNLOCK_LOGON;
-pub const KERB_S4U_LOGON_FLAG_CHECK_LOGONHOURS: ::ULONG = 0x2;
-pub const KERB_S4U_LOGON_FLAG_IDENTIFY: ::ULONG = 0x8;
-STRUCT!{struct KERB_S4U_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    Flags: ::ULONG,
-    ClientUpn: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-}}
-pub type PKERB_S4U_LOGON = *mut KERB_S4U_LOGON;
-ENUM!{enum KERB_PROFILE_BUFFER_TYPE {
-    KerbInteractiveProfile = 2,
-    KerbSmartCardProfile = 4,
-    KerbTicketProfile = 6,
-}}
-pub type PKERB_PROFILE_BUFFER_TYPE = *mut KERB_PROFILE_BUFFER_TYPE;
-STRUCT!{struct KERB_INTERACTIVE_PROFILE {
-    MessageType: KERB_PROFILE_BUFFER_TYPE,
-    LogonCount: ::USHORT,
-    BadPasswordCount: ::USHORT,
-    LogonTime: ::LARGE_INTEGER,
-    LogoffTime: ::LARGE_INTEGER,
-    KickOffTime: ::LARGE_INTEGER,
-    PasswordLastSet: ::LARGE_INTEGER,
-    PasswordCanChange: ::LARGE_INTEGER,
-    PasswordMustChange: ::LARGE_INTEGER,
-    LogonScript: ::UNICODE_STRING,
-    HomeDirectory: ::UNICODE_STRING,
-    FullName: ::UNICODE_STRING,
-    ProfilePath: ::UNICODE_STRING,
-    HomeDirectoryDrive: ::UNICODE_STRING,
-    LogonServer: ::UNICODE_STRING,
-    UserFlags: ::ULONG,
-}}
-pub type PKERB_INTERACTIVE_PROFILE = *mut KERB_INTERACTIVE_PROFILE;
-STRUCT!{struct KERB_SMART_CARD_PROFILE {
-    Profile: KERB_INTERACTIVE_PROFILE,
-    CertificateSize: ::ULONG,
-    CertificateData: ::PUCHAR,
-}}
-pub type PKERB_SMART_CARD_PROFILE = *mut KERB_SMART_CARD_PROFILE;
-STRUCT!{struct KERB_CRYPTO_KEY {
-    KeyType: ::LONG,
-    Length: ::ULONG,
-    Value: ::PUCHAR,
-}}
-pub type PKERB_CRYPTO_KEY = *mut KERB_CRYPTO_KEY;
-STRUCT!{struct KERB_CRYPTO_KEY32 {
-    KeyType: ::LONG,
-    Length: ::ULONG,
-    Offset: ::ULONG,
-}}
-pub type PKERB_CRYPTO_KEY32 = *mut KERB_CRYPTO_KEY32;
-STRUCT!{struct KERB_TICKET_PROFILE {
-    Profile: KERB_INTERACTIVE_PROFILE,
-    SessionKey: KERB_CRYPTO_KEY,
-}}
-pub type PKERB_TICKET_PROFILE = *mut KERB_TICKET_PROFILE;
-ENUM!{enum KERB_PROTOCOL_MESSAGE_TYPE {
-    KerbDebugRequestMessage = 0,
-    KerbQueryTicketCacheMessage,
-    KerbChangeMachinePasswordMessage,
-    KerbVerifyPacMessage,
-    KerbRetrieveTicketMessage,
-    KerbUpdateAddressesMessage,
-    KerbPurgeTicketCacheMessage,
-    KerbChangePasswordMessage,
-    KerbRetrieveEncodedTicketMessage,
-    KerbDecryptDataMessage,
-    KerbAddBindingCacheEntryMessage,
-    KerbSetPasswordMessage,
-    KerbSetPasswordExMessage,
-    KerbVerifyCredentialsMessage,
-    KerbQueryTicketCacheExMessage,
-    KerbPurgeTicketCacheExMessage,
-    KerbRefreshSmartcardCredentialsMessage,
-    KerbAddExtraCredentialsMessage,
-    KerbQuerySupplementalCredentialsMessage,
-    KerbTransferCredentialsMessage,
-    KerbQueryTicketCacheEx2Message,
-    KerbSubmitTicketMessage,
-    KerbAddExtraCredentialsExMessage,
-    KerbQueryKdcProxyCacheMessage,
-    KerbPurgeKdcProxyCacheMessage,
-    KerbQueryTicketCacheEx3Message,
-    KerbCleanupMachinePkinitCredsMessage,
-    KerbAddBindingCacheEntryExMessage,
-    KerbQueryBindingCacheMessage,
-    KerbPurgeBindingCacheMessage,
-    KerbPinKdcMessage,
-    KerbUnpinAllKdcsMessage,
-    KerbQueryDomainExtendedPoliciesMessage,
-    KerbQueryS4U2ProxyCacheMessage,
-}}
-pub type PKERB_PROTOCOL_MESSAGE_TYPE = *mut KERB_PROTOCOL_MESSAGE_TYPE;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-}}
-pub type PKERB_QUERY_TKT_CACHE_REQUEST = *mut KERB_QUERY_TKT_CACHE_REQUEST;
-STRUCT!{struct KERB_TICKET_CACHE_INFO {
-    ServerName: ::UNICODE_STRING,
-    RealmName: ::UNICODE_STRING,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewTime: ::LARGE_INTEGER,
-    EncryptionType: ::LONG,
-    TicketFlags: ::ULONG,
-}}
-pub type PKERB_TICKET_CACHE_INFO = *mut KERB_TICKET_CACHE_INFO;
-STRUCT!{struct KERB_TICKET_CACHE_INFO_EX {
-    ClientName: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-    ServerName: ::UNICODE_STRING,
-    ServerRealm: ::UNICODE_STRING,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewTime: ::LARGE_INTEGER,
-    EncryptionType: ::LONG,
-    TicketFlags: ::ULONG,
-}}
-pub type PKERB_TICKET_CACHE_INFO_EX = *mut KERB_TICKET_CACHE_INFO_EX;
-STRUCT!{struct KERB_TICKET_CACHE_INFO_EX2 {
-    ClientName: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-    ServerName: ::UNICODE_STRING,
-    ServerRealm: ::UNICODE_STRING,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewTime: ::LARGE_INTEGER,
-    EncryptionType: ::LONG,
-    TicketFlags: ::ULONG,
-    SessionKeyType: ::ULONG,
-    BranchId: ::ULONG,
-}}
-pub type PKERB_TICKET_CACHE_INFO_EX2 = *mut KERB_TICKET_CACHE_INFO_EX2;
-STRUCT!{struct KERB_TICKET_CACHE_INFO_EX3 {
-    ClientName: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-    ServerName: ::UNICODE_STRING,
-    ServerRealm: ::UNICODE_STRING,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewTime: ::LARGE_INTEGER,
-    EncryptionType: ::LONG,
-    TicketFlags: ::ULONG,
-    SessionKeyType: ::ULONG,
-    BranchId: ::ULONG,
-    CacheFlags: ::ULONG,
-    KdcCalled: ::UNICODE_STRING,
-}}
-pub type PKERB_TICKET_CACHE_INFO_EX3 = *mut KERB_TICKET_CACHE_INFO_EX3;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfTickets: ::ULONG,
-    Tickets: [KERB_TICKET_CACHE_INFO; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_QUERY_TKT_CACHE_RESPONSE = *mut KERB_QUERY_TKT_CACHE_RESPONSE;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_EX_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfTickets: ::ULONG,
-    Tickets: [KERB_TICKET_CACHE_INFO_EX; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_QUERY_TKT_CACHE_EX_RESPONSE = *mut KERB_QUERY_TKT_CACHE_EX_RESPONSE;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_EX2_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfTickets: ::ULONG,
-    Tickets: [KERB_TICKET_CACHE_INFO_EX2; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_QUERY_TKT_CACHE_EX2_RESPONSE = *mut KERB_QUERY_TKT_CACHE_EX2_RESPONSE;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_EX3_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfTickets: ::ULONG,
-    Tickets: [KERB_TICKET_CACHE_INFO_EX3; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_QUERY_TKT_CACHE_EX3_RESPONSE = *mut KERB_QUERY_TKT_CACHE_EX3_RESPONSE;
-pub const KERB_USE_DEFAULT_TICKET_FLAGS: ::ULONG = 0x0;
-pub const KERB_RETRIEVE_TICKET_DEFAULT: ::ULONG = 0x0;
-pub const KERB_RETRIEVE_TICKET_DONT_USE_CACHE: ::ULONG = 0x1;
-pub const KERB_RETRIEVE_TICKET_USE_CACHE_ONLY: ::ULONG = 0x2;
-pub const KERB_RETRIEVE_TICKET_USE_CREDHANDLE: ::ULONG = 0x4;
-pub const KERB_RETRIEVE_TICKET_AS_KERB_CRED: ::ULONG = 0x8;
-pub const KERB_RETRIEVE_TICKET_WITH_SEC_CRED: ::ULONG = 0x10;
-pub const KERB_RETRIEVE_TICKET_CACHE_TICKET: ::ULONG = 0x20;
-pub const KERB_RETRIEVE_TICKET_MAX_LIFETIME: ::ULONG = 0x40;
-STRUCT!{struct KERB_AUTH_DATA {
-    Type: ::ULONG,
-    Length: ::ULONG,
-    Data: ::PUCHAR,
-}}
-pub type PKERB_AUTH_DATA = *mut KERB_AUTH_DATA;
-STRUCT!{struct KERB_NET_ADDRESS {
-    Family: ::ULONG,
-    Length: ::ULONG,
-    Address: ::PUCHAR,
-}}
-pub type PKERB_NET_ADDRESS = *mut KERB_NET_ADDRESS;
-STRUCT!{struct KERB_NET_ADDRESSES {
-    Number: ::ULONG,
-    Addresses: [KERB_NET_ADDRESS; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_NET_ADDRESSES = *mut KERB_NET_ADDRESSES;
-STRUCT!{struct KERB_EXTERNAL_NAME {
-    NameType: ::SHORT,
-    NameCount: ::USHORT,
-    Names: [::UNICODE_STRING; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_EXTERNAL_NAME = *mut KERB_EXTERNAL_NAME;
-STRUCT!{struct KERB_EXTERNAL_TICKET {
-    ServiceName: PKERB_EXTERNAL_NAME,
-    TargetName: PKERB_EXTERNAL_NAME,
-    ClientName: PKERB_EXTERNAL_NAME,
-    DomainName: ::UNICODE_STRING,
-    TargetDomainName: ::UNICODE_STRING,
-    AltTargetDomainName: ::UNICODE_STRING,
-    SessionKey: KERB_CRYPTO_KEY,
-    TicketFlags: ::ULONG,
-    Flags: ::ULONG,
-    KeyExpirationTime: ::LARGE_INTEGER,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewUntil: ::LARGE_INTEGER,
-    TimeSkew: ::LARGE_INTEGER,
-    EncodedTicketSize: ::ULONG,
-    EncodedTicket: ::PUCHAR,
-}}
-pub type PKERB_EXTERNAL_TICKET = *mut KERB_EXTERNAL_TICKET;
-STRUCT!{struct KERB_RETRIEVE_TKT_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    TargetName: ::UNICODE_STRING,
-    TicketFlags: ::ULONG,
-    CacheOptions: ::ULONG,
-    EncryptionType: ::LONG,
-    CredentialsHandle: ::SecHandle,
-}}
-pub type PKERB_RETRIEVE_TKT_REQUEST = *mut KERB_RETRIEVE_TKT_REQUEST;
-STRUCT!{struct KERB_RETRIEVE_TKT_RESPONSE {
-    Ticket: KERB_EXTERNAL_TICKET,
-}}
-pub type PKERB_RETRIEVE_TKT_RESPONSE = *mut KERB_RETRIEVE_TKT_RESPONSE;
-STRUCT!{struct KERB_PURGE_TKT_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    ServerName: ::UNICODE_STRING,
-    RealmName: ::UNICODE_STRING,
-}}
-pub type PKERB_PURGE_TKT_CACHE_REQUEST = *mut KERB_PURGE_TKT_CACHE_REQUEST;
-pub const KERB_PURGE_ALL_TICKETS: ::ULONG = 1;
-STRUCT!{struct KERB_PURGE_TKT_CACHE_EX_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-    TicketTemplate: KERB_TICKET_CACHE_INFO_EX,
-}}
-pub type PKERB_PURGE_TKT_CACHE_EX_REQUEST = *mut KERB_PURGE_TKT_CACHE_EX_REQUEST;
-STRUCT!{struct KERB_SUBMIT_TKT_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-    Key: KERB_CRYPTO_KEY32,
-    KerbCredSize: ::ULONG,
-    KerbCredOffset: ::ULONG,
-}}
-pub type PKERB_SUBMIT_TKT_REQUEST = *mut KERB_SUBMIT_TKT_REQUEST;
-STRUCT!{struct KERB_QUERY_KDC_PROXY_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    LogonId: ::LUID,
-}}
-pub type PKERB_QUERY_KDC_PROXY_CACHE_REQUEST = *mut KERB_QUERY_KDC_PROXY_CACHE_REQUEST;
-STRUCT!{struct KDC_PROXY_CACHE_ENTRY_DATA {
-    SinceLastUsed: ::ULONG64,
-    DomainName: ::UNICODE_STRING,
-    ProxyServerName: ::UNICODE_STRING,
-    ProxyServerVdir: ::UNICODE_STRING,
-    ProxyServerPort: ::USHORT,
-    LogonId: ::LUID,
-    CredUserName: ::UNICODE_STRING,
-    CredDomainName: ::UNICODE_STRING,
-    GlobalCache: ::BOOLEAN,
-}}
-pub type PKDC_PROXY_CACHE_ENTRY_DATA = *mut KDC_PROXY_CACHE_ENTRY_DATA;
-STRUCT!{struct KERB_QUERY_KDC_PROXY_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfEntries: ::ULONG,
-    Entries: PKDC_PROXY_CACHE_ENTRY_DATA,
-}}
-pub type PKERB_QUERY_KDC_PROXY_CACHE_RESPONSE = *mut KERB_QUERY_KDC_PROXY_CACHE_RESPONSE;
-STRUCT!{struct KERB_PURGE_KDC_PROXY_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    LogonId: ::LUID,
-}}
-pub type PKERB_PURGE_KDC_PROXY_CACHE_REQUEST = *mut KERB_PURGE_KDC_PROXY_CACHE_REQUEST;
-STRUCT!{struct KERB_PURGE_KDC_PROXY_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfPurged: ::ULONG,
-}}
-pub type PKERB_PURGE_KDC_PROXY_CACHE_RESPONSE = *mut KERB_PURGE_KDC_PROXY_CACHE_RESPONSE;
-pub const KERB_S4U2PROXY_CACHE_ENTRY_INFO_FLAG_NEGATIVE: ::ULONG = 0x1;
-STRUCT!{struct KERB_S4U2PROXY_CACHE_ENTRY_INFO {
-    ServerName: ::UNICODE_STRING,
-    Flags: ::ULONG,
-    LastStatus: ::NTSTATUS,
-    Expiry: ::LARGE_INTEGER,
-}}
-pub type PKERB_S4U2PROXY_CACHE_ENTRY_INFO = *mut KERB_S4U2PROXY_CACHE_ENTRY_INFO;
-pub const KERB_S4U2PROXY_CRED_FLAG_NEGATIVE: ::ULONG = 0x1;
-STRUCT!{struct KERB_S4U2PROXY_CRED {
-    UserName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-    Flags: ::ULONG,
-    LastStatus: ::NTSTATUS,
-    Expiry: ::LARGE_INTEGER,
-    CountOfEntries: ::ULONG,
-    Entries: PKERB_S4U2PROXY_CACHE_ENTRY_INFO,
-}}
-pub type PKERB_S4U2PROXY_CRED = *mut KERB_S4U2PROXY_CRED;
-STRUCT!{struct KERB_QUERY_S4U2PROXY_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    LogonId: ::LUID,
-}}
-pub type PKERB_QUERY_S4U2PROXY_CACHE_REQUEST = *mut KERB_QUERY_S4U2PROXY_CACHE_REQUEST;
-STRUCT!{struct KERB_QUERY_S4U2PROXY_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfCreds: ::ULONG,
-    Creds: PKERB_S4U2PROXY_CRED,
-}}
-pub type PKERB_QUERY_S4U2PROXY_CACHE_RESPONSE = *mut KERB_QUERY_S4U2PROXY_CACHE_RESPONSE;
-STRUCT!{struct KERB_CHANGEPASSWORD_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    DomainName: ::UNICODE_STRING,
-    AccountName: ::UNICODE_STRING,
-    OldPassword: ::UNICODE_STRING,
-    NewPassword: ::UNICODE_STRING,
-    Impersonating: ::BOOLEAN,
-}}
-pub type PKERB_CHANGEPASSWORD_REQUEST = *mut KERB_CHANGEPASSWORD_REQUEST;
-STRUCT!{struct KERB_SETPASSWORD_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    CredentialsHandle: ::SecHandle,
-    Flags: ::ULONG,
-    DomainName: ::UNICODE_STRING,
-    AccountName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-}}
-pub type PKERB_SETPASSWORD_REQUEST = *mut KERB_SETPASSWORD_REQUEST;
-STRUCT!{struct KERB_SETPASSWORD_EX_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    CredentialsHandle: ::SecHandle,
-    Flags: ::ULONG,
-    AccountRealm: ::UNICODE_STRING,
-    AccountName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-    ClientName: ::UNICODE_STRING,
-    Impersonating: ::BOOLEAN,
-    KdcAddress: ::UNICODE_STRING,
-    KdcAddressType: ::ULONG,
-}}
-pub type PKERB_SETPASSWORD_EX_REQUEST = *mut KERB_SETPASSWORD_EX_REQUEST;
-pub const DS_UNKNOWN_ADDRESS_TYPE: ::ULONG = 0;
-pub const KERB_SETPASS_USE_LOGONID: ::ULONG = 1;
-pub const KERB_SETPASS_USE_CREDHANDLE: ::ULONG = 2;
-STRUCT!{struct KERB_DECRYPT_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-    CryptoType: ::LONG,
-    KeyUsage: ::LONG,
-    Key: KERB_CRYPTO_KEY,
-    EncryptedDataSize: ::ULONG,
-    InitialVectorSize: ::ULONG,
-    InitialVector: ::PUCHAR,
-    EncryptedData: ::PUCHAR,
-}}
-pub type PKERB_DECRYPT_REQUEST = *mut KERB_DECRYPT_REQUEST;
-pub const KERB_DECRYPT_FLAG_DEFAULT_KEY: ::ULONG = 0x00000001;
-STRUCT!{struct KERB_DECRYPT_RESPONSE {
-    DecryptedData: [::UCHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_DECRYPT_RESPONSE = *mut KERB_DECRYPT_RESPONSE;
-STRUCT!{struct KERB_ADD_BINDING_CACHE_ENTRY_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    RealmName: ::UNICODE_STRING,
-    KdcAddress: ::UNICODE_STRING,
-    AddressType: ::ULONG,
-}}
-pub type PKERB_ADD_BINDING_CACHE_ENTRY_REQUEST = *mut KERB_ADD_BINDING_CACHE_ENTRY_REQUEST;
-STRUCT!{struct KERB_REFRESH_SCCRED_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CredentialBlob: ::UNICODE_STRING,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-}}
-pub type PKERB_REFRESH_SCCRED_REQUEST = *mut KERB_REFRESH_SCCRED_REQUEST;
-pub const KERB_REFRESH_SCCRED_RELEASE: ::ULONG = 0x0;
-pub const KERB_REFRESH_SCCRED_GETTGT: ::ULONG = 0x1;
-STRUCT!{struct KERB_ADD_CREDENTIALS_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    UserName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-}}
-pub type PKERB_ADD_CREDENTIALS_REQUEST = *mut KERB_ADD_CREDENTIALS_REQUEST;
-pub const KERB_REQUEST_ADD_CREDENTIAL: ::ULONG = 1;
-pub const KERB_REQUEST_REPLACE_CREDENTIAL: ::ULONG = 2;
-pub const KERB_REQUEST_REMOVE_CREDENTIAL: ::ULONG = 4;
-STRUCT!{struct KERB_ADD_CREDENTIALS_REQUEST_EX {
-    Credentials: KERB_ADD_CREDENTIALS_REQUEST,
-    PrincipalNameCount: ::ULONG,
-    PrincipalNames: [::UNICODE_STRING; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_ADD_CREDENTIALS_REQUEST_EX = *mut KERB_ADD_CREDENTIALS_REQUEST_EX;
-STRUCT!{struct KERB_TRANSFER_CRED_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    OriginLogonId: ::LUID,
-    DestinationLogonId: ::LUID,
-    Flags: ::ULONG,
-}}
-pub type PKERB_TRANSFER_CRED_REQUEST = *mut KERB_TRANSFER_CRED_REQUEST;
-pub const KERB_TRANSFER_CRED_WITH_TICKETS: ::ULONG = 0x1;
-pub const KERB_TRANSFER_CRED_CLEANUP_CREDENTIALS: ::ULONG = 0x2;
-STRUCT!{struct KERB_CLEANUP_MACHINE_PKINIT_CREDS_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-}}
-pub type PKERB_CLEANUP_MACHINE_PKINIT_CREDS_REQUEST =
-    *mut KERB_CLEANUP_MACHINE_PKINIT_CREDS_REQUEST;
-STRUCT!{struct KERB_BINDING_CACHE_ENTRY_DATA {
-    DiscoveryTime: ::ULONG64,
-    RealmName: ::UNICODE_STRING,
-    KdcAddress: ::UNICODE_STRING,
-    AddressType: ::ULONG,
-    Flags: ::ULONG,
-    DcFlags: ::ULONG,
-    CacheFlags: ::ULONG,
-    KdcName: ::UNICODE_STRING,
-}}
-pub type PKERB_BINDING_CACHE_ENTRY_DATA = *mut KERB_BINDING_CACHE_ENTRY_DATA;
-STRUCT!{struct KERB_QUERY_BINDING_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfEntries: ::ULONG,
-    Entries: PKERB_BINDING_CACHE_ENTRY_DATA,
-}}
-pub type PKERB_QUERY_BINDING_CACHE_RESPONSE = *mut KERB_QUERY_BINDING_CACHE_RESPONSE;
-STRUCT!{struct KERB_ADD_BINDING_CACHE_ENTRY_EX_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    RealmName: ::UNICODE_STRING,
-    KdcAddress: ::UNICODE_STRING,
-    AddressType: ::ULONG,
-    DcFlags: ::ULONG,
-}}
-pub type PKERB_ADD_BINDING_CACHE_ENTRY_EX_REQUEST = *mut KERB_ADD_BINDING_CACHE_ENTRY_EX_REQUEST;
-STRUCT!{struct KERB_QUERY_BINDING_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-}}
-pub type PKERB_QUERY_BINDING_CACHE_REQUEST = *mut KERB_QUERY_BINDING_CACHE_REQUEST;
-STRUCT!{struct KERB_PURGE_BINDING_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-}}
-pub type PKERB_PURGE_BINDING_CACHE_REQUEST = *mut KERB_PURGE_BINDING_CACHE_REQUEST;
-STRUCT!{struct KERB_QUERY_DOMAIN_EXTENDED_POLICIES_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    DomainName: ::UNICODE_STRING,
-}}
-pub type PKERB_QUERY_DOMAIN_EXTENDED_POLICIES_REQUEST =
-    *mut KERB_QUERY_DOMAIN_EXTENDED_POLICIES_REQUEST;
-STRUCT!{struct KERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    ExtendedPolicies: ::ULONG,
-    DsFlags: ::ULONG,
-}}
-pub type PKERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE =
-    *mut KERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE;
-ENUM!{enum KERB_CERTIFICATE_INFO_TYPE {
-    CertHashInfo = 1,
-}}
-pub type PKERB_CERTIFICATE_INFO_TYPE = *mut KERB_CERTIFICATE_INFO_TYPE;
-STRUCT!{struct KERB_CERTIFICATE_HASHINFO {
-    StoreNameLength: ::USHORT,
-    HashLength: ::USHORT,
-}}
-pub type PKERB_CERTIFICATE_HASHINFO = *mut KERB_CERTIFICATE_HASHINFO;
-STRUCT!{struct KERB_CERTIFICATE_INFO {
-    CertInfoSize: ::ULONG,
-    InfoType: ::ULONG,
-}}
-pub type PKERB_CERTIFICATE_INFO = *mut KERB_CERTIFICATE_INFO;
-STRUCT!{struct POLICY_AUDIT_SID_ARRAY {
-    UsersCount: ::ULONG,
-    UserSidArray: *mut ::PSID,
-}}
-pub type PPOLICY_AUDIT_SID_ARRAY = *mut POLICY_AUDIT_SID_ARRAY;
-STRUCT!{struct AUDIT_POLICY_INFORMATION {
-    AuditSubCategoryGuid: ::GUID,
-    AuditingInformation: ::ULONG,
-    AuditCategoryGuid: ::GUID,
-}}
-pub type PAUDIT_POLICY_INFORMATION = *mut AUDIT_POLICY_INFORMATION;
-pub type LPAUDIT_POLICY_INFORMATION = PAUDIT_POLICY_INFORMATION;
-pub type PCAUDIT_POLICY_INFORMATION = *const AUDIT_POLICY_INFORMATION;
-pub const AUDIT_SET_SYSTEM_POLICY: ::ULONG = 0x0001;
-pub const AUDIT_QUERY_SYSTEM_POLICY: ::ULONG = 0x0002;
-pub const AUDIT_SET_USER_POLICY: ::ULONG = 0x0004;
-pub const AUDIT_QUERY_USER_POLICY: ::ULONG = 0x0008;
-pub const AUDIT_ENUMERATE_USERS: ::ULONG = 0x0010;
-pub const AUDIT_SET_MISC_POLICY: ::ULONG = 0x0020;
-pub const AUDIT_QUERY_MISC_POLICY: ::ULONG = 0x0040;
-pub const AUDIT_GENERIC_ALL: ::ULONG = ::STANDARD_RIGHTS_REQUIRED | AUDIT_SET_SYSTEM_POLICY
-    | AUDIT_QUERY_SYSTEM_POLICY | AUDIT_SET_USER_POLICY | AUDIT_QUERY_USER_POLICY
-    | AUDIT_ENUMERATE_USERS | AUDIT_SET_MISC_POLICY | AUDIT_QUERY_MISC_POLICY;
-pub const AUDIT_GENERIC_READ: ::ULONG = ::STANDARD_RIGHTS_READ | AUDIT_QUERY_SYSTEM_POLICY
-    | AUDIT_QUERY_USER_POLICY | AUDIT_ENUMERATE_USERS | AUDIT_QUERY_MISC_POLICY;
-pub const AUDIT_GENERIC_WRITE: ::ULONG = ::STANDARD_RIGHTS_WRITE | AUDIT_SET_USER_POLICY
-    | AUDIT_SET_MISC_POLICY | AUDIT_SET_SYSTEM_POLICY;
-pub const AUDIT_GENERIC_EXECUTE: ::ULONG = ::STANDARD_RIGHTS_EXECUTE;
-STRUCT!{struct PKU2U_CERT_BLOB {
-    CertOffset: ::ULONG,
-    CertLength: ::USHORT,
-}}
-pub type PPKU2U_CERT_BLOB = *mut PKU2U_CERT_BLOB;
-pub const PKU2U_CREDUI_CONTEXT_VERSION: ::ULONG64 = 0x4154414454524543;
-STRUCT!{struct PKU2U_CREDUI_CONTEXT {
-    Version: ::ULONG64,
-    cbHeaderLength: ::USHORT,
-    cbStructureLength: ::ULONG,
-    CertArrayCount: ::USHORT,
-    CertArrayOffset: ::ULONG,
-}}
-pub type PPKU2U_CREDUI_CONTEXT = *mut PKU2U_CREDUI_CONTEXT;
-ENUM!{enum PKU2U_LOGON_SUBMIT_TYPE {
-    Pku2uCertificateS4ULogon = 14,
-}}
-pub type PPKU2U_LOGON_SUBMIT_TYPE = *mut PKU2U_LOGON_SUBMIT_TYPE;
-STRUCT!{struct PKU2U_CERTIFICATE_S4U_LOGON {
-    MessageType: PKU2U_LOGON_SUBMIT_TYPE,
-    Flags: ::ULONG,
-    UserPrincipalName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-    CertificateLength: ::ULONG,
-    Certificate: ::PUCHAR,
-}}
-pub type PPKU2U_CERTIFICATE_S4U_LOGON = *mut PKU2U_CERTIFICATE_S4U_LOGON;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ntstatus.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ntstatus.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ntstatus.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ntstatus.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2474 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Constant definitions for the NTSTATUS values.
-pub const STATUS_WAIT_0: ::NTSTATUS = 0x00000000;
-pub const FACILITY_VSM: ::NTSTATUS = 0x45;
-pub const FACILITY_VOLSNAP: ::NTSTATUS = 0x50;
-pub const FACILITY_VOLMGR: ::NTSTATUS = 0x38;
-pub const FACILITY_VIRTUALIZATION: ::NTSTATUS = 0x37;
-pub const FACILITY_VIDEO: ::NTSTATUS = 0x1B;
-pub const FACILITY_USB_ERROR_CODE: ::NTSTATUS = 0x10;
-pub const FACILITY_TRANSACTION: ::NTSTATUS = 0x19;
-pub const FACILITY_TPM: ::NTSTATUS = 0x29;
-pub const FACILITY_TERMINAL_SERVER: ::NTSTATUS = 0xA;
-pub const FACILITY_SXS_ERROR_CODE: ::NTSTATUS = 0x15;
-pub const FACILITY_NTSSPI: ::NTSTATUS = 0x9;
-pub const FACILITY_SPACES: ::NTSTATUS = 0xE7;
-pub const FACILITY_SMB: ::NTSTATUS = 0x5D;
-pub const FACILITY_SYSTEM_INTEGRITY: ::NTSTATUS = 0xE9;
-pub const FACILITY_SHARED_VHDX: ::NTSTATUS = 0x5C;
-pub const FACILITY_SECUREBOOT: ::NTSTATUS = 0x43;
-pub const FACILITY_SECURITY_CORE: ::NTSTATUS = 0xE8;
-pub const FACILITY_SDBUS: ::NTSTATUS = 0x51;
-pub const FACILITY_RTPM: ::NTSTATUS = 0x2A;
-pub const FACILITY_RPC_STUBS: ::NTSTATUS = 0x3;
-pub const FACILITY_RPC_RUNTIME: ::NTSTATUS = 0x2;
-pub const FACILITY_RESUME_KEY_FILTER: ::NTSTATUS = 0x40;
-pub const FACILITY_RDBSS: ::NTSTATUS = 0x41;
-pub const FACILITY_NTWIN32: ::NTSTATUS = 0x7;
-pub const FACILITY_WIN32K_NTUSER: ::NTSTATUS = 0x3E;
-pub const FACILITY_WIN32K_NTGDI: ::NTSTATUS = 0x3F;
-pub const FACILITY_NDIS_ERROR_CODE: ::NTSTATUS = 0x23;
-pub const FACILTIY_MUI_ERROR_CODE: ::NTSTATUS = 0xB;
-pub const FACILITY_MONITOR: ::NTSTATUS = 0x1D;
-pub const FACILITY_MAXIMUM_VALUE: ::NTSTATUS = 0xEB;
-pub const FACILITY_LICENSING: ::NTSTATUS = 0xEA;
-pub const FACILITY_IPSEC: ::NTSTATUS = 0x36;
-pub const FACILITY_IO_ERROR_CODE: ::NTSTATUS = 0x4;
-pub const FACILITY_INTERIX: ::NTSTATUS = 0x99;
-pub const FACILITY_HYPERVISOR: ::NTSTATUS = 0x35;
-pub const FACILITY_HID_ERROR_CODE: ::NTSTATUS = 0x11;
-pub const FACILITY_GRAPHICS_KERNEL: ::NTSTATUS = 0x1E;
-pub const FACILITY_FWP_ERROR_CODE: ::NTSTATUS = 0x22;
-pub const FACILITY_FVE_ERROR_CODE: ::NTSTATUS = 0x21;
-pub const FACILITY_FIREWIRE_ERROR_CODE: ::NTSTATUS = 0x12;
-pub const FACILITY_FILTER_MANAGER: ::NTSTATUS = 0x1C;
-pub const FACILITY_DRIVER_FRAMEWORK: ::NTSTATUS = 0x20;
-pub const FACILITY_DEBUGGER: ::NTSTATUS = 0x1;
-pub const FACILITY_COMMONLOG: ::NTSTATUS = 0x1A;
-pub const FACILITY_CODCLASS_ERROR_CODE: ::NTSTATUS = 0x6;
-pub const FACILITY_CLUSTER_ERROR_CODE: ::NTSTATUS = 0x13;
-pub const FACILITY_NTCERT: ::NTSTATUS = 0x8;
-pub const FACILITY_BTH_ATT: ::NTSTATUS = 0x42;
-pub const FACILITY_BCD_ERROR_CODE: ::NTSTATUS = 0x39;
-pub const FACILITY_AUDIO_KERNEL: ::NTSTATUS = 0x44;
-pub const FACILITY_ACPI_ERROR_CODE: ::NTSTATUS = 0x14;
-pub const STATUS_SEVERITY_WARNING: ::NTSTATUS = 0x2;
-pub const STATUS_SEVERITY_SUCCESS: ::NTSTATUS = 0x0;
-pub const STATUS_SEVERITY_INFORMATIONAL: ::NTSTATUS = 0x1;
-pub const STATUS_SEVERITY_ERROR: ::NTSTATUS = 0x3;
-pub const STATUS_SUCCESS: ::NTSTATUS = 0x00000000;
-pub const STATUS_WAIT_1: ::NTSTATUS = 0x00000001;
-pub const STATUS_WAIT_2: ::NTSTATUS = 0x00000002;
-pub const STATUS_WAIT_3: ::NTSTATUS = 0x00000003;
-pub const STATUS_WAIT_63: ::NTSTATUS = 0x0000003F;
-pub const STATUS_ABANDONED: ::NTSTATUS = 0x00000080;
-pub const STATUS_ABANDONED_WAIT_0: ::NTSTATUS = 0x00000080;
-pub const STATUS_ABANDONED_WAIT_63: ::NTSTATUS = 0x000000BF;
-pub const STATUS_USER_APC: ::NTSTATUS = 0x000000C0;
-pub const STATUS_KERNEL_APC: ::NTSTATUS = 0x00000100;
-pub const STATUS_ALERTED: ::NTSTATUS = 0x00000101;
-pub const STATUS_TIMEOUT: ::NTSTATUS = 0x00000102;
-pub const STATUS_PENDING: ::NTSTATUS = 0x00000103;
-pub const STATUS_REPARSE: ::NTSTATUS = 0x00000104;
-pub const STATUS_MORE_ENTRIES: ::NTSTATUS = 0x00000105;
-pub const STATUS_NOT_ALL_ASSIGNED: ::NTSTATUS = 0x00000106;
-pub const STATUS_SOME_NOT_MAPPED: ::NTSTATUS = 0x00000107;
-pub const STATUS_OPLOCK_BREAK_IN_PROGRESS: ::NTSTATUS = 0x00000108;
-pub const STATUS_VOLUME_MOUNTED: ::NTSTATUS = 0x00000109;
-pub const STATUS_RXACT_COMMITTED: ::NTSTATUS = 0x0000010A;
-pub const STATUS_NOTIFY_CLEANUP: ::NTSTATUS = 0x0000010B;
-pub const STATUS_NOTIFY_ENUM_DIR: ::NTSTATUS = 0x0000010C;
-pub const STATUS_NO_QUOTAS_FOR_ACCOUNT: ::NTSTATUS = 0x0000010D;
-pub const STATUS_PRIMARY_TRANSPORT_CONNECT_FAILED: ::NTSTATUS = 0x0000010E;
-pub const STATUS_PAGE_FAULT_TRANSITION: ::NTSTATUS = 0x00000110;
-pub const STATUS_PAGE_FAULT_DEMAND_ZERO: ::NTSTATUS = 0x00000111;
-pub const STATUS_PAGE_FAULT_COPY_ON_WRITE: ::NTSTATUS = 0x00000112;
-pub const STATUS_PAGE_FAULT_GUARD_PAGE: ::NTSTATUS = 0x00000113;
-pub const STATUS_PAGE_FAULT_PAGING_FILE: ::NTSTATUS = 0x00000114;
-pub const STATUS_CACHE_PAGE_LOCKED: ::NTSTATUS = 0x00000115;
-pub const STATUS_CRASH_DUMP: ::NTSTATUS = 0x00000116;
-pub const STATUS_BUFFER_ALL_ZEROS: ::NTSTATUS = 0x00000117;
-pub const STATUS_REPARSE_OBJECT: ::NTSTATUS = 0x00000118;
-pub const STATUS_RESOURCE_REQUIREMENTS_CHANGED: ::NTSTATUS = 0x00000119;
-pub const STATUS_TRANSLATION_COMPLETE: ::NTSTATUS = 0x00000120;
-pub const STATUS_DS_MEMBERSHIP_EVALUATED_LOCALLY: ::NTSTATUS = 0x00000121;
-pub const STATUS_NOTHING_TO_TERMINATE: ::NTSTATUS = 0x00000122;
-pub const STATUS_PROCESS_NOT_IN_JOB: ::NTSTATUS = 0x00000123;
-pub const STATUS_PROCESS_IN_JOB: ::NTSTATUS = 0x00000124;
-pub const STATUS_VOLSNAP_HIBERNATE_READY: ::NTSTATUS = 0x00000125;
-pub const STATUS_FSFILTER_OP_COMPLETED_SUCCESSFULLY: ::NTSTATUS = 0x00000126;
-pub const STATUS_INTERRUPT_VECTOR_ALREADY_CONNECTED: ::NTSTATUS = 0x00000127;
-pub const STATUS_INTERRUPT_STILL_CONNECTED: ::NTSTATUS = 0x00000128;
-pub const STATUS_PROCESS_CLONED: ::NTSTATUS = 0x00000129;
-pub const STATUS_FILE_LOCKED_WITH_ONLY_READERS: ::NTSTATUS = 0x0000012A;
-pub const STATUS_FILE_LOCKED_WITH_WRITERS: ::NTSTATUS = 0x0000012B;
-pub const STATUS_VALID_IMAGE_HASH: ::NTSTATUS = 0x0000012C;
-pub const STATUS_VALID_CATALOG_HASH: ::NTSTATUS = 0x0000012D;
-pub const STATUS_VALID_STRONG_CODE_HASH: ::NTSTATUS = 0x0000012E;
-pub const STATUS_RESOURCEMANAGER_READ_ONLY: ::NTSTATUS = 0x00000202;
-pub const STATUS_RING_PREVIOUSLY_EMPTY: ::NTSTATUS = 0x00000210;
-pub const STATUS_RING_PREVIOUSLY_FULL: ::NTSTATUS = 0x00000211;
-pub const STATUS_RING_PREVIOUSLY_ABOVE_QUOTA: ::NTSTATUS = 0x00000212;
-pub const STATUS_RING_NEWLY_EMPTY: ::NTSTATUS = 0x00000213;
-pub const STATUS_RING_SIGNAL_OPPOSITE_ENDPOINT: ::NTSTATUS = 0x00000214;
-pub const STATUS_OPLOCK_SWITCHED_TO_NEW_HANDLE: ::NTSTATUS = 0x00000215;
-pub const STATUS_OPLOCK_HANDLE_CLOSED: ::NTSTATUS = 0x00000216;
-pub const STATUS_WAIT_FOR_OPLOCK: ::NTSTATUS = 0x00000367;
-pub const DBG_EXCEPTION_HANDLED: ::NTSTATUS = 0x00010001;
-pub const DBG_CONTINUE: ::NTSTATUS = 0x00010002;
-pub const STATUS_FLT_IO_COMPLETE: ::NTSTATUS = 0x001C0001;
-pub const STATUS_OBJECT_NAME_EXISTS: ::NTSTATUS = 0x40000000;
-pub const STATUS_THREAD_WAS_SUSPENDED: ::NTSTATUS = 0x40000001;
-pub const STATUS_WORKING_SET_LIMIT_RANGE: ::NTSTATUS = 0x40000002;
-pub const STATUS_IMAGE_NOT_AT_BASE: ::NTSTATUS = 0x40000003;
-pub const STATUS_RXACT_STATE_CREATED: ::NTSTATUS = 0x40000004;
-pub const STATUS_SEGMENT_NOTIFICATION: ::NTSTATUS = 0x40000005;
-pub const STATUS_LOCAL_USER_SESSION_KEY: ::NTSTATUS = 0x40000006;
-pub const STATUS_BAD_CURRENT_DIRECTORY: ::NTSTATUS = 0x40000007;
-pub const STATUS_SERIAL_MORE_WRITES: ::NTSTATUS = 0x40000008;
-pub const STATUS_REGISTRY_RECOVERED: ::NTSTATUS = 0x40000009;
-pub const STATUS_FT_READ_RECOVERY_FROM_BACKUP: ::NTSTATUS = 0x4000000A;
-pub const STATUS_FT_WRITE_RECOVERY: ::NTSTATUS = 0x4000000B;
-pub const STATUS_SERIAL_COUNTER_TIMEOUT: ::NTSTATUS = 0x4000000C;
-pub const STATUS_NULL_LM_PASSWORD: ::NTSTATUS = 0x4000000D;
-pub const STATUS_IMAGE_MACHINE_TYPE_MISMATCH: ::NTSTATUS = 0x4000000E;
-pub const STATUS_RECEIVE_PARTIAL: ::NTSTATUS = 0x4000000F;
-pub const STATUS_RECEIVE_EXPEDITED: ::NTSTATUS = 0x40000010;
-pub const STATUS_RECEIVE_PARTIAL_EXPEDITED: ::NTSTATUS = 0x40000011;
-pub const STATUS_EVENT_DONE: ::NTSTATUS = 0x40000012;
-pub const STATUS_EVENT_PENDING: ::NTSTATUS = 0x40000013;
-pub const STATUS_CHECKING_FILE_SYSTEM: ::NTSTATUS = 0x40000014;
-pub const STATUS_FATAL_APP_EXIT: ::NTSTATUS = 0x40000015;
-pub const STATUS_PREDEFINED_HANDLE: ::NTSTATUS = 0x40000016;
-pub const STATUS_WAS_UNLOCKED: ::NTSTATUS = 0x40000017;
-pub const STATUS_SERVICE_NOTIFICATION: ::NTSTATUS = 0x40000018;
-pub const STATUS_WAS_LOCKED: ::NTSTATUS = 0x40000019;
-pub const STATUS_LOG_HARD_ERROR: ::NTSTATUS = 0x4000001A;
-pub const STATUS_ALREADY_WIN32: ::NTSTATUS = 0x4000001B;
-pub const STATUS_WX86_UNSIMULATE: ::NTSTATUS = 0x4000001C;
-pub const STATUS_WX86_CONTINUE: ::NTSTATUS = 0x4000001D;
-pub const STATUS_WX86_SINGLE_STEP: ::NTSTATUS = 0x4000001E;
-pub const STATUS_WX86_BREAKPOINT: ::NTSTATUS = 0x4000001F;
-pub const STATUS_WX86_EXCEPTION_CONTINUE: ::NTSTATUS = 0x40000020;
-pub const STATUS_WX86_EXCEPTION_LASTCHANCE: ::NTSTATUS = 0x40000021;
-pub const STATUS_WX86_EXCEPTION_CHAIN: ::NTSTATUS = 0x40000022;
-pub const STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE: ::NTSTATUS = 0x40000023;
-pub const STATUS_NO_YIELD_PERFORMED: ::NTSTATUS = 0x40000024;
-pub const STATUS_TIMER_RESUME_IGNORED: ::NTSTATUS = 0x40000025;
-pub const STATUS_ARBITRATION_UNHANDLED: ::NTSTATUS = 0x40000026;
-pub const STATUS_CARDBUS_NOT_SUPPORTED: ::NTSTATUS = 0x40000027;
-pub const STATUS_WX86_CREATEWX86TIB: ::NTSTATUS = 0x40000028;
-pub const STATUS_MP_PROCESSOR_MISMATCH: ::NTSTATUS = 0x40000029;
-pub const STATUS_HIBERNATED: ::NTSTATUS = 0x4000002A;
-pub const STATUS_RESUME_HIBERNATION: ::NTSTATUS = 0x4000002B;
-pub const STATUS_FIRMWARE_UPDATED: ::NTSTATUS = 0x4000002C;
-pub const STATUS_DRIVERS_LEAKING_LOCKED_PAGES: ::NTSTATUS = 0x4000002D;
-pub const STATUS_MESSAGE_RETRIEVED: ::NTSTATUS = 0x4000002E;
-pub const STATUS_SYSTEM_POWERSTATE_TRANSITION: ::NTSTATUS = 0x4000002F;
-pub const STATUS_ALPC_CHECK_COMPLETION_LIST: ::NTSTATUS = 0x40000030;
-pub const STATUS_SYSTEM_POWERSTATE_COMPLEX_TRANSITION: ::NTSTATUS = 0x40000031;
-pub const STATUS_ACCESS_AUDIT_BY_POLICY: ::NTSTATUS = 0x40000032;
-pub const STATUS_ABANDON_HIBERFILE: ::NTSTATUS = 0x40000033;
-pub const STATUS_BIZRULES_NOT_ENABLED: ::NTSTATUS = 0x40000034;
-pub const STATUS_FT_READ_FROM_COPY: ::NTSTATUS = 0x40000035;
-pub const STATUS_IMAGE_AT_DIFFERENT_BASE: ::NTSTATUS = 0x40000036;
-pub const DBG_REPLY_LATER: ::NTSTATUS = 0x40010001;
-pub const DBG_UNABLE_TO_PROVIDE_HANDLE: ::NTSTATUS = 0x40010002;
-pub const DBG_TERMINATE_THREAD: ::NTSTATUS = 0x40010003;
-pub const DBG_TERMINATE_PROCESS: ::NTSTATUS = 0x40010004;
-pub const DBG_CONTROL_C: ::NTSTATUS = 0x40010005;
-pub const DBG_PRINTEXCEPTION_C: ::NTSTATUS = 0x40010006;
-pub const DBG_RIPEXCEPTION: ::NTSTATUS = 0x40010007;
-pub const DBG_CONTROL_BREAK: ::NTSTATUS = 0x40010008;
-pub const DBG_COMMAND_EXCEPTION: ::NTSTATUS = 0x40010009;
-pub const DBG_PRINTEXCEPTION_WIDE_C: ::NTSTATUS = 0x4001000A;
-pub const STATUS_HEURISTIC_DAMAGE_POSSIBLE: ::NTSTATUS = 0x40190001;
-pub const STATUS_GUARD_PAGE_VIOLATION: ::NTSTATUS = 0x80000001u32 as i32;
-pub const STATUS_DATATYPE_MISALIGNMENT: ::NTSTATUS = 0x80000002u32 as i32;
-pub const STATUS_BREAKPOINT: ::NTSTATUS = 0x80000003u32 as i32;
-pub const STATUS_SINGLE_STEP: ::NTSTATUS = 0x80000004u32 as i32;
-pub const STATUS_BUFFER_OVERFLOW: ::NTSTATUS = 0x80000005u32 as i32;
-pub const STATUS_NO_MORE_FILES: ::NTSTATUS = 0x80000006u32 as i32;
-pub const STATUS_WAKE_SYSTEM_DEBUGGER: ::NTSTATUS = 0x80000007u32 as i32;
-pub const STATUS_HANDLES_CLOSED: ::NTSTATUS = 0x8000000Au32 as i32;
-pub const STATUS_NO_INHERITANCE: ::NTSTATUS = 0x8000000Bu32 as i32;
-pub const STATUS_GUID_SUBSTITUTION_MADE: ::NTSTATUS = 0x8000000Cu32 as i32;
-pub const STATUS_PARTIAL_COPY: ::NTSTATUS = 0x8000000Du32 as i32;
-pub const STATUS_DEVICE_PAPER_EMPTY: ::NTSTATUS = 0x8000000Eu32 as i32;
-pub const STATUS_DEVICE_POWERED_OFF: ::NTSTATUS = 0x8000000Fu32 as i32;
-pub const STATUS_DEVICE_OFF_LINE: ::NTSTATUS = 0x80000010u32 as i32;
-pub const STATUS_DEVICE_BUSY: ::NTSTATUS = 0x80000011u32 as i32;
-pub const STATUS_NO_MORE_EAS: ::NTSTATUS = 0x80000012u32 as i32;
-pub const STATUS_INVALID_EA_NAME: ::NTSTATUS = 0x80000013u32 as i32;
-pub const STATUS_EA_LIST_INCONSISTENT: ::NTSTATUS = 0x80000014u32 as i32;
-pub const STATUS_INVALID_EA_FLAG: ::NTSTATUS = 0x80000015u32 as i32;
-pub const STATUS_VERIFY_REQUIRED: ::NTSTATUS = 0x80000016u32 as i32;
-pub const STATUS_EXTRANEOUS_INFORMATION: ::NTSTATUS = 0x80000017u32 as i32;
-pub const STATUS_RXACT_COMMIT_NECESSARY: ::NTSTATUS = 0x80000018u32 as i32;
-pub const STATUS_NO_MORE_ENTRIES: ::NTSTATUS = 0x8000001Au32 as i32;
-pub const STATUS_FILEMARK_DETECTED: ::NTSTATUS = 0x8000001Bu32 as i32;
-pub const STATUS_MEDIA_CHANGED: ::NTSTATUS = 0x8000001Cu32 as i32;
-pub const STATUS_BUS_RESET: ::NTSTATUS = 0x8000001Du32 as i32;
-pub const STATUS_END_OF_MEDIA: ::NTSTATUS = 0x8000001Eu32 as i32;
-pub const STATUS_BEGINNING_OF_MEDIA: ::NTSTATUS = 0x8000001Fu32 as i32;
-pub const STATUS_MEDIA_CHECK: ::NTSTATUS = 0x80000020u32 as i32;
-pub const STATUS_SETMARK_DETECTED: ::NTSTATUS = 0x80000021u32 as i32;
-pub const STATUS_NO_DATA_DETECTED: ::NTSTATUS = 0x80000022u32 as i32;
-pub const STATUS_REDIRECTOR_HAS_OPEN_HANDLES: ::NTSTATUS = 0x80000023u32 as i32;
-pub const STATUS_SERVER_HAS_OPEN_HANDLES: ::NTSTATUS = 0x80000024u32 as i32;
-pub const STATUS_ALREADY_DISCONNECTED: ::NTSTATUS = 0x80000025u32 as i32;
-pub const STATUS_LONGJUMP: ::NTSTATUS = 0x80000026u32 as i32;
-pub const STATUS_CLEANER_CARTRIDGE_INSTALLED: ::NTSTATUS = 0x80000027u32 as i32;
-pub const STATUS_PLUGPLAY_QUERY_VETOED: ::NTSTATUS = 0x80000028u32 as i32;
-pub const STATUS_UNWIND_CONSOLIDATE: ::NTSTATUS = 0x80000029u32 as i32;
-pub const STATUS_REGISTRY_HIVE_RECOVERED: ::NTSTATUS = 0x8000002Au32 as i32;
-pub const STATUS_DLL_MIGHT_BE_INSECURE: ::NTSTATUS = 0x8000002Bu32 as i32;
-pub const STATUS_DLL_MIGHT_BE_INCOMPATIBLE: ::NTSTATUS = 0x8000002Cu32 as i32;
-pub const STATUS_STOPPED_ON_SYMLINK: ::NTSTATUS = 0x8000002Du32 as i32;
-pub const STATUS_CANNOT_GRANT_REQUESTED_OPLOCK: ::NTSTATUS = 0x8000002Eu32 as i32;
-pub const STATUS_NO_ACE_CONDITION: ::NTSTATUS = 0x8000002Fu32 as i32;
-pub const STATUS_DEVICE_SUPPORT_IN_PROGRESS: ::NTSTATUS = 0x80000030u32 as i32;
-pub const STATUS_DEVICE_POWER_CYCLE_REQUIRED: ::NTSTATUS = 0x80000031u32 as i32;
-pub const DBG_EXCEPTION_NOT_HANDLED: ::NTSTATUS = 0x80010001u32 as i32;
-pub const STATUS_CLUSTER_NODE_ALREADY_UP: ::NTSTATUS = 0x80130001u32 as i32;
-pub const STATUS_CLUSTER_NODE_ALREADY_DOWN: ::NTSTATUS = 0x80130002u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_ALREADY_ONLINE: ::NTSTATUS = 0x80130003u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_ALREADY_OFFLINE: ::NTSTATUS = 0x80130004u32 as i32;
-pub const STATUS_CLUSTER_NODE_ALREADY_MEMBER: ::NTSTATUS = 0x80130005u32 as i32;
-pub const STATUS_FLT_BUFFER_TOO_SMALL: ::NTSTATUS = 0x801C0001u32 as i32;
-pub const STATUS_FVE_PARTIAL_METADATA: ::NTSTATUS = 0x80210001u32 as i32;
-pub const STATUS_FVE_TRANSIENT_STATE: ::NTSTATUS = 0x80210002u32 as i32;
-pub const STATUS_UNSUCCESSFUL: ::NTSTATUS = 0xC0000001u32 as i32;
-pub const STATUS_NOT_IMPLEMENTED: ::NTSTATUS = 0xC0000002u32 as i32;
-pub const STATUS_INVALID_INFO_CLASS: ::NTSTATUS = 0xC0000003u32 as i32;
-pub const STATUS_INFO_LENGTH_MISMATCH: ::NTSTATUS = 0xC0000004u32 as i32;
-pub const STATUS_ACCESS_VIOLATION: ::NTSTATUS = 0xC0000005u32 as i32;
-pub const STATUS_IN_PAGE_ERROR: ::NTSTATUS = 0xC0000006u32 as i32;
-pub const STATUS_PAGEFILE_QUOTA: ::NTSTATUS = 0xC0000007u32 as i32;
-pub const STATUS_INVALID_HANDLE: ::NTSTATUS = 0xC0000008u32 as i32;
-pub const STATUS_BAD_INITIAL_STACK: ::NTSTATUS = 0xC0000009u32 as i32;
-pub const STATUS_BAD_INITIAL_PC: ::NTSTATUS = 0xC000000Au32 as i32;
-pub const STATUS_INVALID_CID: ::NTSTATUS = 0xC000000Bu32 as i32;
-pub const STATUS_TIMER_NOT_CANCELED: ::NTSTATUS = 0xC000000Cu32 as i32;
-pub const STATUS_INVALID_PARAMETER: ::NTSTATUS = 0xC000000Du32 as i32;
-pub const STATUS_NO_SUCH_DEVICE: ::NTSTATUS = 0xC000000Eu32 as i32;
-pub const STATUS_NO_SUCH_FILE: ::NTSTATUS = 0xC000000Fu32 as i32;
-pub const STATUS_INVALID_DEVICE_REQUEST: ::NTSTATUS = 0xC0000010u32 as i32;
-pub const STATUS_END_OF_FILE: ::NTSTATUS = 0xC0000011u32 as i32;
-pub const STATUS_WRONG_VOLUME: ::NTSTATUS = 0xC0000012u32 as i32;
-pub const STATUS_NO_MEDIA_IN_DEVICE: ::NTSTATUS = 0xC0000013u32 as i32;
-pub const STATUS_UNRECOGNIZED_MEDIA: ::NTSTATUS = 0xC0000014u32 as i32;
-pub const STATUS_NONEXISTENT_SECTOR: ::NTSTATUS = 0xC0000015u32 as i32;
-pub const STATUS_MORE_PROCESSING_REQUIRED: ::NTSTATUS = 0xC0000016u32 as i32;
-pub const STATUS_NO_MEMORY: ::NTSTATUS = 0xC0000017u32 as i32;
-pub const STATUS_CONFLICTING_ADDRESSES: ::NTSTATUS = 0xC0000018u32 as i32;
-pub const STATUS_NOT_MAPPED_VIEW: ::NTSTATUS = 0xC0000019u32 as i32;
-pub const STATUS_UNABLE_TO_FREE_VM: ::NTSTATUS = 0xC000001Au32 as i32;
-pub const STATUS_UNABLE_TO_DELETE_SECTION: ::NTSTATUS = 0xC000001Bu32 as i32;
-pub const STATUS_INVALID_SYSTEM_SERVICE: ::NTSTATUS = 0xC000001Cu32 as i32;
-pub const STATUS_ILLEGAL_INSTRUCTION: ::NTSTATUS = 0xC000001Du32 as i32;
-pub const STATUS_INVALID_LOCK_SEQUENCE: ::NTSTATUS = 0xC000001Eu32 as i32;
-pub const STATUS_INVALID_VIEW_SIZE: ::NTSTATUS = 0xC000001Fu32 as i32;
-pub const STATUS_INVALID_FILE_FOR_SECTION: ::NTSTATUS = 0xC0000020u32 as i32;
-pub const STATUS_ALREADY_COMMITTED: ::NTSTATUS = 0xC0000021u32 as i32;
-pub const STATUS_ACCESS_DENIED: ::NTSTATUS = 0xC0000022u32 as i32;
-pub const STATUS_BUFFER_TOO_SMALL: ::NTSTATUS = 0xC0000023u32 as i32;
-pub const STATUS_OBJECT_TYPE_MISMATCH: ::NTSTATUS = 0xC0000024u32 as i32;
-pub const STATUS_NONCONTINUABLE_EXCEPTION: ::NTSTATUS = 0xC0000025u32 as i32;
-pub const STATUS_INVALID_DISPOSITION: ::NTSTATUS = 0xC0000026u32 as i32;
-pub const STATUS_UNWIND: ::NTSTATUS = 0xC0000027u32 as i32;
-pub const STATUS_BAD_STACK: ::NTSTATUS = 0xC0000028u32 as i32;
-pub const STATUS_INVALID_UNWIND_TARGET: ::NTSTATUS = 0xC0000029u32 as i32;
-pub const STATUS_NOT_LOCKED: ::NTSTATUS = 0xC000002Au32 as i32;
-pub const STATUS_PARITY_ERROR: ::NTSTATUS = 0xC000002Bu32 as i32;
-pub const STATUS_UNABLE_TO_DECOMMIT_VM: ::NTSTATUS = 0xC000002Cu32 as i32;
-pub const STATUS_NOT_COMMITTED: ::NTSTATUS = 0xC000002Du32 as i32;
-pub const STATUS_INVALID_PORT_ATTRIBUTES: ::NTSTATUS = 0xC000002Eu32 as i32;
-pub const STATUS_PORT_MESSAGE_TOO_LONG: ::NTSTATUS = 0xC000002Fu32 as i32;
-pub const STATUS_INVALID_PARAMETER_MIX: ::NTSTATUS = 0xC0000030u32 as i32;
-pub const STATUS_INVALID_QUOTA_LOWER: ::NTSTATUS = 0xC0000031u32 as i32;
-pub const STATUS_DISK_CORRUPT_ERROR: ::NTSTATUS = 0xC0000032u32 as i32;
-pub const STATUS_OBJECT_NAME_INVALID: ::NTSTATUS = 0xC0000033u32 as i32;
-pub const STATUS_OBJECT_NAME_NOT_FOUND: ::NTSTATUS = 0xC0000034u32 as i32;
-pub const STATUS_OBJECT_NAME_COLLISION: ::NTSTATUS = 0xC0000035u32 as i32;
-pub const STATUS_PORT_DO_NOT_DISTURB: ::NTSTATUS = 0xC0000036u32 as i32;
-pub const STATUS_PORT_DISCONNECTED: ::NTSTATUS = 0xC0000037u32 as i32;
-pub const STATUS_DEVICE_ALREADY_ATTACHED: ::NTSTATUS = 0xC0000038u32 as i32;
-pub const STATUS_OBJECT_PATH_INVALID: ::NTSTATUS = 0xC0000039u32 as i32;
-pub const STATUS_OBJECT_PATH_NOT_FOUND: ::NTSTATUS = 0xC000003Au32 as i32;
-pub const STATUS_OBJECT_PATH_SYNTAX_BAD: ::NTSTATUS = 0xC000003Bu32 as i32;
-pub const STATUS_DATA_OVERRUN: ::NTSTATUS = 0xC000003Cu32 as i32;
-pub const STATUS_DATA_LATE_ERROR: ::NTSTATUS = 0xC000003Du32 as i32;
-pub const STATUS_DATA_ERROR: ::NTSTATUS = 0xC000003Eu32 as i32;
-pub const STATUS_CRC_ERROR: ::NTSTATUS = 0xC000003Fu32 as i32;
-pub const STATUS_SECTION_TOO_BIG: ::NTSTATUS = 0xC0000040u32 as i32;
-pub const STATUS_PORT_CONNECTION_REFUSED: ::NTSTATUS = 0xC0000041u32 as i32;
-pub const STATUS_INVALID_PORT_HANDLE: ::NTSTATUS = 0xC0000042u32 as i32;
-pub const STATUS_SHARING_VIOLATION: ::NTSTATUS = 0xC0000043u32 as i32;
-pub const STATUS_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000044u32 as i32;
-pub const STATUS_INVALID_PAGE_PROTECTION: ::NTSTATUS = 0xC0000045u32 as i32;
-pub const STATUS_MUTANT_NOT_OWNED: ::NTSTATUS = 0xC0000046u32 as i32;
-pub const STATUS_SEMAPHORE_LIMIT_EXCEEDED: ::NTSTATUS = 0xC0000047u32 as i32;
-pub const STATUS_PORT_ALREADY_SET: ::NTSTATUS = 0xC0000048u32 as i32;
-pub const STATUS_SECTION_NOT_IMAGE: ::NTSTATUS = 0xC0000049u32 as i32;
-pub const STATUS_SUSPEND_COUNT_EXCEEDED: ::NTSTATUS = 0xC000004Au32 as i32;
-pub const STATUS_THREAD_IS_TERMINATING: ::NTSTATUS = 0xC000004Bu32 as i32;
-pub const STATUS_BAD_WORKING_SET_LIMIT: ::NTSTATUS = 0xC000004Cu32 as i32;
-pub const STATUS_INCOMPATIBLE_FILE_MAP: ::NTSTATUS = 0xC000004Du32 as i32;
-pub const STATUS_SECTION_PROTECTION: ::NTSTATUS = 0xC000004Eu32 as i32;
-pub const STATUS_EAS_NOT_SUPPORTED: ::NTSTATUS = 0xC000004Fu32 as i32;
-pub const STATUS_EA_TOO_LARGE: ::NTSTATUS = 0xC0000050u32 as i32;
-pub const STATUS_NONEXISTENT_EA_ENTRY: ::NTSTATUS = 0xC0000051u32 as i32;
-pub const STATUS_NO_EAS_ON_FILE: ::NTSTATUS = 0xC0000052u32 as i32;
-pub const STATUS_EA_CORRUPT_ERROR: ::NTSTATUS = 0xC0000053u32 as i32;
-pub const STATUS_FILE_LOCK_CONFLICT: ::NTSTATUS = 0xC0000054u32 as i32;
-pub const STATUS_LOCK_NOT_GRANTED: ::NTSTATUS = 0xC0000055u32 as i32;
-pub const STATUS_DELETE_PENDING: ::NTSTATUS = 0xC0000056u32 as i32;
-pub const STATUS_CTL_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC0000057u32 as i32;
-pub const STATUS_UNKNOWN_REVISION: ::NTSTATUS = 0xC0000058u32 as i32;
-pub const STATUS_REVISION_MISMATCH: ::NTSTATUS = 0xC0000059u32 as i32;
-pub const STATUS_INVALID_OWNER: ::NTSTATUS = 0xC000005Au32 as i32;
-pub const STATUS_INVALID_PRIMARY_GROUP: ::NTSTATUS = 0xC000005Bu32 as i32;
-pub const STATUS_NO_IMPERSONATION_TOKEN: ::NTSTATUS = 0xC000005Cu32 as i32;
-pub const STATUS_CANT_DISABLE_MANDATORY: ::NTSTATUS = 0xC000005Du32 as i32;
-pub const STATUS_NO_LOGON_SERVERS: ::NTSTATUS = 0xC000005Eu32 as i32;
-pub const STATUS_NO_SUCH_LOGON_SESSION: ::NTSTATUS = 0xC000005Fu32 as i32;
-pub const STATUS_NO_SUCH_PRIVILEGE: ::NTSTATUS = 0xC0000060u32 as i32;
-pub const STATUS_PRIVILEGE_NOT_HELD: ::NTSTATUS = 0xC0000061u32 as i32;
-pub const STATUS_INVALID_ACCOUNT_NAME: ::NTSTATUS = 0xC0000062u32 as i32;
-pub const STATUS_USER_EXISTS: ::NTSTATUS = 0xC0000063u32 as i32;
-pub const STATUS_NO_SUCH_USER: ::NTSTATUS = 0xC0000064u32 as i32;
-pub const STATUS_GROUP_EXISTS: ::NTSTATUS = 0xC0000065u32 as i32;
-pub const STATUS_NO_SUCH_GROUP: ::NTSTATUS = 0xC0000066u32 as i32;
-pub const STATUS_MEMBER_IN_GROUP: ::NTSTATUS = 0xC0000067u32 as i32;
-pub const STATUS_MEMBER_NOT_IN_GROUP: ::NTSTATUS = 0xC0000068u32 as i32;
-pub const STATUS_LAST_ADMIN: ::NTSTATUS = 0xC0000069u32 as i32;
-pub const STATUS_WRONG_PASSWORD: ::NTSTATUS = 0xC000006Au32 as i32;
-pub const STATUS_ILL_FORMED_PASSWORD: ::NTSTATUS = 0xC000006Bu32 as i32;
-pub const STATUS_PASSWORD_RESTRICTION: ::NTSTATUS = 0xC000006Cu32 as i32;
-pub const STATUS_LOGON_FAILURE: ::NTSTATUS = 0xC000006Du32 as i32;
-pub const STATUS_ACCOUNT_RESTRICTION: ::NTSTATUS = 0xC000006Eu32 as i32;
-pub const STATUS_INVALID_LOGON_HOURS: ::NTSTATUS = 0xC000006Fu32 as i32;
-pub const STATUS_INVALID_WORKSTATION: ::NTSTATUS = 0xC0000070u32 as i32;
-pub const STATUS_PASSWORD_EXPIRED: ::NTSTATUS = 0xC0000071u32 as i32;
-pub const STATUS_ACCOUNT_DISABLED: ::NTSTATUS = 0xC0000072u32 as i32;
-pub const STATUS_NONE_MAPPED: ::NTSTATUS = 0xC0000073u32 as i32;
-pub const STATUS_TOO_MANY_LUIDS_REQUESTED: ::NTSTATUS = 0xC0000074u32 as i32;
-pub const STATUS_LUIDS_EXHAUSTED: ::NTSTATUS = 0xC0000075u32 as i32;
-pub const STATUS_INVALID_SUB_AUTHORITY: ::NTSTATUS = 0xC0000076u32 as i32;
-pub const STATUS_INVALID_ACL: ::NTSTATUS = 0xC0000077u32 as i32;
-pub const STATUS_INVALID_SID: ::NTSTATUS = 0xC0000078u32 as i32;
-pub const STATUS_INVALID_SECURITY_DESCR: ::NTSTATUS = 0xC0000079u32 as i32;
-pub const STATUS_PROCEDURE_NOT_FOUND: ::NTSTATUS = 0xC000007Au32 as i32;
-pub const STATUS_INVALID_IMAGE_FORMAT: ::NTSTATUS = 0xC000007Bu32 as i32;
-pub const STATUS_NO_TOKEN: ::NTSTATUS = 0xC000007Cu32 as i32;
-pub const STATUS_BAD_INHERITANCE_ACL: ::NTSTATUS = 0xC000007Du32 as i32;
-pub const STATUS_RANGE_NOT_LOCKED: ::NTSTATUS = 0xC000007Eu32 as i32;
-pub const STATUS_DISK_FULL: ::NTSTATUS = 0xC000007Fu32 as i32;
-pub const STATUS_SERVER_DISABLED: ::NTSTATUS = 0xC0000080u32 as i32;
-pub const STATUS_SERVER_NOT_DISABLED: ::NTSTATUS = 0xC0000081u32 as i32;
-pub const STATUS_TOO_MANY_GUIDS_REQUESTED: ::NTSTATUS = 0xC0000082u32 as i32;
-pub const STATUS_GUIDS_EXHAUSTED: ::NTSTATUS = 0xC0000083u32 as i32;
-pub const STATUS_INVALID_ID_AUTHORITY: ::NTSTATUS = 0xC0000084u32 as i32;
-pub const STATUS_AGENTS_EXHAUSTED: ::NTSTATUS = 0xC0000085u32 as i32;
-pub const STATUS_INVALID_VOLUME_LABEL: ::NTSTATUS = 0xC0000086u32 as i32;
-pub const STATUS_SECTION_NOT_EXTENDED: ::NTSTATUS = 0xC0000087u32 as i32;
-pub const STATUS_NOT_MAPPED_DATA: ::NTSTATUS = 0xC0000088u32 as i32;
-pub const STATUS_RESOURCE_DATA_NOT_FOUND: ::NTSTATUS = 0xC0000089u32 as i32;
-pub const STATUS_RESOURCE_TYPE_NOT_FOUND: ::NTSTATUS = 0xC000008Au32 as i32;
-pub const STATUS_RESOURCE_NAME_NOT_FOUND: ::NTSTATUS = 0xC000008Bu32 as i32;
-pub const STATUS_ARRAY_BOUNDS_EXCEEDED: ::NTSTATUS = 0xC000008Cu32 as i32;
-pub const STATUS_FLOAT_DENORMAL_OPERAND: ::NTSTATUS = 0xC000008Du32 as i32;
-pub const STATUS_FLOAT_DIVIDE_BY_ZERO: ::NTSTATUS = 0xC000008Eu32 as i32;
-pub const STATUS_FLOAT_INEXACT_RESULT: ::NTSTATUS = 0xC000008Fu32 as i32;
-pub const STATUS_FLOAT_INVALID_OPERATION: ::NTSTATUS = 0xC0000090u32 as i32;
-pub const STATUS_FLOAT_OVERFLOW: ::NTSTATUS = 0xC0000091u32 as i32;
-pub const STATUS_FLOAT_STACK_CHECK: ::NTSTATUS = 0xC0000092u32 as i32;
-pub const STATUS_FLOAT_UNDERFLOW: ::NTSTATUS = 0xC0000093u32 as i32;
-pub const STATUS_INTEGER_DIVIDE_BY_ZERO: ::NTSTATUS = 0xC0000094u32 as i32;
-pub const STATUS_INTEGER_OVERFLOW: ::NTSTATUS = 0xC0000095u32 as i32;
-pub const STATUS_PRIVILEGED_INSTRUCTION: ::NTSTATUS = 0xC0000096u32 as i32;
-pub const STATUS_TOO_MANY_PAGING_FILES: ::NTSTATUS = 0xC0000097u32 as i32;
-pub const STATUS_FILE_INVALID: ::NTSTATUS = 0xC0000098u32 as i32;
-pub const STATUS_ALLOTTED_SPACE_EXCEEDED: ::NTSTATUS = 0xC0000099u32 as i32;
-pub const STATUS_INSUFFICIENT_RESOURCES: ::NTSTATUS = 0xC000009Au32 as i32;
-pub const STATUS_DFS_EXIT_PATH_FOUND: ::NTSTATUS = 0xC000009Bu32 as i32;
-pub const STATUS_DEVICE_DATA_ERROR: ::NTSTATUS = 0xC000009Cu32 as i32;
-pub const STATUS_DEVICE_NOT_CONNECTED: ::NTSTATUS = 0xC000009Du32 as i32;
-pub const STATUS_DEVICE_POWER_FAILURE: ::NTSTATUS = 0xC000009Eu32 as i32;
-pub const STATUS_FREE_VM_NOT_AT_BASE: ::NTSTATUS = 0xC000009Fu32 as i32;
-pub const STATUS_MEMORY_NOT_ALLOCATED: ::NTSTATUS = 0xC00000A0u32 as i32;
-pub const STATUS_WORKING_SET_QUOTA: ::NTSTATUS = 0xC00000A1u32 as i32;
-pub const STATUS_MEDIA_WRITE_PROTECTED: ::NTSTATUS = 0xC00000A2u32 as i32;
-pub const STATUS_DEVICE_NOT_READY: ::NTSTATUS = 0xC00000A3u32 as i32;
-pub const STATUS_INVALID_GROUP_ATTRIBUTES: ::NTSTATUS = 0xC00000A4u32 as i32;
-pub const STATUS_BAD_IMPERSONATION_LEVEL: ::NTSTATUS = 0xC00000A5u32 as i32;
-pub const STATUS_CANT_OPEN_ANONYMOUS: ::NTSTATUS = 0xC00000A6u32 as i32;
-pub const STATUS_BAD_VALIDATION_CLASS: ::NTSTATUS = 0xC00000A7u32 as i32;
-pub const STATUS_BAD_TOKEN_TYPE: ::NTSTATUS = 0xC00000A8u32 as i32;
-pub const STATUS_BAD_MASTER_BOOT_RECORD: ::NTSTATUS = 0xC00000A9u32 as i32;
-pub const STATUS_INSTRUCTION_MISALIGNMENT: ::NTSTATUS = 0xC00000AAu32 as i32;
-pub const STATUS_INSTANCE_NOT_AVAILABLE: ::NTSTATUS = 0xC00000ABu32 as i32;
-pub const STATUS_PIPE_NOT_AVAILABLE: ::NTSTATUS = 0xC00000ACu32 as i32;
-pub const STATUS_INVALID_PIPE_STATE: ::NTSTATUS = 0xC00000ADu32 as i32;
-pub const STATUS_PIPE_BUSY: ::NTSTATUS = 0xC00000AEu32 as i32;
-pub const STATUS_ILLEGAL_FUNCTION: ::NTSTATUS = 0xC00000AFu32 as i32;
-pub const STATUS_PIPE_DISCONNECTED: ::NTSTATUS = 0xC00000B0u32 as i32;
-pub const STATUS_PIPE_CLOSING: ::NTSTATUS = 0xC00000B1u32 as i32;
-pub const STATUS_PIPE_CONNECTED: ::NTSTATUS = 0xC00000B2u32 as i32;
-pub const STATUS_PIPE_LISTENING: ::NTSTATUS = 0xC00000B3u32 as i32;
-pub const STATUS_INVALID_READ_MODE: ::NTSTATUS = 0xC00000B4u32 as i32;
-pub const STATUS_IO_TIMEOUT: ::NTSTATUS = 0xC00000B5u32 as i32;
-pub const STATUS_FILE_FORCED_CLOSED: ::NTSTATUS = 0xC00000B6u32 as i32;
-pub const STATUS_PROFILING_NOT_STARTED: ::NTSTATUS = 0xC00000B7u32 as i32;
-pub const STATUS_PROFILING_NOT_STOPPED: ::NTSTATUS = 0xC00000B8u32 as i32;
-pub const STATUS_COULD_NOT_INTERPRET: ::NTSTATUS = 0xC00000B9u32 as i32;
-pub const STATUS_FILE_IS_A_DIRECTORY: ::NTSTATUS = 0xC00000BAu32 as i32;
-pub const STATUS_NOT_SUPPORTED: ::NTSTATUS = 0xC00000BBu32 as i32;
-pub const STATUS_REMOTE_NOT_LISTENING: ::NTSTATUS = 0xC00000BCu32 as i32;
-pub const STATUS_DUPLICATE_NAME: ::NTSTATUS = 0xC00000BDu32 as i32;
-pub const STATUS_BAD_NETWORK_PATH: ::NTSTATUS = 0xC00000BEu32 as i32;
-pub const STATUS_NETWORK_BUSY: ::NTSTATUS = 0xC00000BFu32 as i32;
-pub const STATUS_DEVICE_DOES_NOT_EXIST: ::NTSTATUS = 0xC00000C0u32 as i32;
-pub const STATUS_TOO_MANY_COMMANDS: ::NTSTATUS = 0xC00000C1u32 as i32;
-pub const STATUS_ADAPTER_HARDWARE_ERROR: ::NTSTATUS = 0xC00000C2u32 as i32;
-pub const STATUS_INVALID_NETWORK_RESPONSE: ::NTSTATUS = 0xC00000C3u32 as i32;
-pub const STATUS_UNEXPECTED_NETWORK_ERROR: ::NTSTATUS = 0xC00000C4u32 as i32;
-pub const STATUS_BAD_REMOTE_ADAPTER: ::NTSTATUS = 0xC00000C5u32 as i32;
-pub const STATUS_PRINT_QUEUE_FULL: ::NTSTATUS = 0xC00000C6u32 as i32;
-pub const STATUS_NO_SPOOL_SPACE: ::NTSTATUS = 0xC00000C7u32 as i32;
-pub const STATUS_PRINT_CANCELLED: ::NTSTATUS = 0xC00000C8u32 as i32;
-pub const STATUS_NETWORK_NAME_DELETED: ::NTSTATUS = 0xC00000C9u32 as i32;
-pub const STATUS_NETWORK_ACCESS_DENIED: ::NTSTATUS = 0xC00000CAu32 as i32;
-pub const STATUS_BAD_DEVICE_TYPE: ::NTSTATUS = 0xC00000CBu32 as i32;
-pub const STATUS_BAD_NETWORK_NAME: ::NTSTATUS = 0xC00000CCu32 as i32;
-pub const STATUS_TOO_MANY_NAMES: ::NTSTATUS = 0xC00000CDu32 as i32;
-pub const STATUS_TOO_MANY_SESSIONS: ::NTSTATUS = 0xC00000CEu32 as i32;
-pub const STATUS_SHARING_PAUSED: ::NTSTATUS = 0xC00000CFu32 as i32;
-pub const STATUS_REQUEST_NOT_ACCEPTED: ::NTSTATUS = 0xC00000D0u32 as i32;
-pub const STATUS_REDIRECTOR_PAUSED: ::NTSTATUS = 0xC00000D1u32 as i32;
-pub const STATUS_NET_WRITE_FAULT: ::NTSTATUS = 0xC00000D2u32 as i32;
-pub const STATUS_PROFILING_AT_LIMIT: ::NTSTATUS = 0xC00000D3u32 as i32;
-pub const STATUS_NOT_SAME_DEVICE: ::NTSTATUS = 0xC00000D4u32 as i32;
-pub const STATUS_FILE_RENAMED: ::NTSTATUS = 0xC00000D5u32 as i32;
-pub const STATUS_VIRTUAL_CIRCUIT_CLOSED: ::NTSTATUS = 0xC00000D6u32 as i32;
-pub const STATUS_NO_SECURITY_ON_OBJECT: ::NTSTATUS = 0xC00000D7u32 as i32;
-pub const STATUS_CANT_WAIT: ::NTSTATUS = 0xC00000D8u32 as i32;
-pub const STATUS_PIPE_EMPTY: ::NTSTATUS = 0xC00000D9u32 as i32;
-pub const STATUS_CANT_ACCESS_DOMAIN_INFO: ::NTSTATUS = 0xC00000DAu32 as i32;
-pub const STATUS_CANT_TERMINATE_SELF: ::NTSTATUS = 0xC00000DBu32 as i32;
-pub const STATUS_INVALID_SERVER_STATE: ::NTSTATUS = 0xC00000DCu32 as i32;
-pub const STATUS_INVALID_DOMAIN_STATE: ::NTSTATUS = 0xC00000DDu32 as i32;
-pub const STATUS_INVALID_DOMAIN_ROLE: ::NTSTATUS = 0xC00000DEu32 as i32;
-pub const STATUS_NO_SUCH_DOMAIN: ::NTSTATUS = 0xC00000DFu32 as i32;
-pub const STATUS_DOMAIN_EXISTS: ::NTSTATUS = 0xC00000E0u32 as i32;
-pub const STATUS_DOMAIN_LIMIT_EXCEEDED: ::NTSTATUS = 0xC00000E1u32 as i32;
-pub const STATUS_OPLOCK_NOT_GRANTED: ::NTSTATUS = 0xC00000E2u32 as i32;
-pub const STATUS_INVALID_OPLOCK_PROTOCOL: ::NTSTATUS = 0xC00000E3u32 as i32;
-pub const STATUS_INTERNAL_DB_CORRUPTION: ::NTSTATUS = 0xC00000E4u32 as i32;
-pub const STATUS_INTERNAL_ERROR: ::NTSTATUS = 0xC00000E5u32 as i32;
-pub const STATUS_GENERIC_NOT_MAPPED: ::NTSTATUS = 0xC00000E6u32 as i32;
-pub const STATUS_BAD_DESCRIPTOR_FORMAT: ::NTSTATUS = 0xC00000E7u32 as i32;
-pub const STATUS_INVALID_USER_BUFFER: ::NTSTATUS = 0xC00000E8u32 as i32;
-pub const STATUS_UNEXPECTED_IO_ERROR: ::NTSTATUS = 0xC00000E9u32 as i32;
-pub const STATUS_UNEXPECTED_MM_CREATE_ERR: ::NTSTATUS = 0xC00000EAu32 as i32;
-pub const STATUS_UNEXPECTED_MM_MAP_ERROR: ::NTSTATUS = 0xC00000EBu32 as i32;
-pub const STATUS_UNEXPECTED_MM_EXTEND_ERR: ::NTSTATUS = 0xC00000ECu32 as i32;
-pub const STATUS_NOT_LOGON_PROCESS: ::NTSTATUS = 0xC00000EDu32 as i32;
-pub const STATUS_LOGON_SESSION_EXISTS: ::NTSTATUS = 0xC00000EEu32 as i32;
-pub const STATUS_INVALID_PARAMETER_1: ::NTSTATUS = 0xC00000EFu32 as i32;
-pub const STATUS_INVALID_PARAMETER_2: ::NTSTATUS = 0xC00000F0u32 as i32;
-pub const STATUS_INVALID_PARAMETER_3: ::NTSTATUS = 0xC00000F1u32 as i32;
-pub const STATUS_INVALID_PARAMETER_4: ::NTSTATUS = 0xC00000F2u32 as i32;
-pub const STATUS_INVALID_PARAMETER_5: ::NTSTATUS = 0xC00000F3u32 as i32;
-pub const STATUS_INVALID_PARAMETER_6: ::NTSTATUS = 0xC00000F4u32 as i32;
-pub const STATUS_INVALID_PARAMETER_7: ::NTSTATUS = 0xC00000F5u32 as i32;
-pub const STATUS_INVALID_PARAMETER_8: ::NTSTATUS = 0xC00000F6u32 as i32;
-pub const STATUS_INVALID_PARAMETER_9: ::NTSTATUS = 0xC00000F7u32 as i32;
-pub const STATUS_INVALID_PARAMETER_10: ::NTSTATUS = 0xC00000F8u32 as i32;
-pub const STATUS_INVALID_PARAMETER_11: ::NTSTATUS = 0xC00000F9u32 as i32;
-pub const STATUS_INVALID_PARAMETER_12: ::NTSTATUS = 0xC00000FAu32 as i32;
-pub const STATUS_REDIRECTOR_NOT_STARTED: ::NTSTATUS = 0xC00000FBu32 as i32;
-pub const STATUS_REDIRECTOR_STARTED: ::NTSTATUS = 0xC00000FCu32 as i32;
-pub const STATUS_STACK_OVERFLOW: ::NTSTATUS = 0xC00000FDu32 as i32;
-pub const STATUS_NO_SUCH_PACKAGE: ::NTSTATUS = 0xC00000FEu32 as i32;
-pub const STATUS_BAD_FUNCTION_TABLE: ::NTSTATUS = 0xC00000FFu32 as i32;
-pub const STATUS_VARIABLE_NOT_FOUND: ::NTSTATUS = 0xC0000100u32 as i32;
-pub const STATUS_DIRECTORY_NOT_EMPTY: ::NTSTATUS = 0xC0000101u32 as i32;
-pub const STATUS_FILE_CORRUPT_ERROR: ::NTSTATUS = 0xC0000102u32 as i32;
-pub const STATUS_NOT_A_DIRECTORY: ::NTSTATUS = 0xC0000103u32 as i32;
-pub const STATUS_BAD_LOGON_SESSION_STATE: ::NTSTATUS = 0xC0000104u32 as i32;
-pub const STATUS_LOGON_SESSION_COLLISION: ::NTSTATUS = 0xC0000105u32 as i32;
-pub const STATUS_NAME_TOO_LONG: ::NTSTATUS = 0xC0000106u32 as i32;
-pub const STATUS_FILES_OPEN: ::NTSTATUS = 0xC0000107u32 as i32;
-pub const STATUS_CONNECTION_IN_USE: ::NTSTATUS = 0xC0000108u32 as i32;
-pub const STATUS_MESSAGE_NOT_FOUND: ::NTSTATUS = 0xC0000109u32 as i32;
-pub const STATUS_PROCESS_IS_TERMINATING: ::NTSTATUS = 0xC000010Au32 as i32;
-pub const STATUS_INVALID_LOGON_TYPE: ::NTSTATUS = 0xC000010Bu32 as i32;
-pub const STATUS_NO_GUID_TRANSLATION: ::NTSTATUS = 0xC000010Cu32 as i32;
-pub const STATUS_CANNOT_IMPERSONATE: ::NTSTATUS = 0xC000010Du32 as i32;
-pub const STATUS_IMAGE_ALREADY_LOADED: ::NTSTATUS = 0xC000010Eu32 as i32;
-pub const STATUS_ABIOS_NOT_PRESENT: ::NTSTATUS = 0xC000010Fu32 as i32;
-pub const STATUS_ABIOS_LID_NOT_EXIST: ::NTSTATUS = 0xC0000110u32 as i32;
-pub const STATUS_ABIOS_LID_ALREADY_OWNED: ::NTSTATUS = 0xC0000111u32 as i32;
-pub const STATUS_ABIOS_NOT_LID_OWNER: ::NTSTATUS = 0xC0000112u32 as i32;
-pub const STATUS_ABIOS_INVALID_COMMAND: ::NTSTATUS = 0xC0000113u32 as i32;
-pub const STATUS_ABIOS_INVALID_LID: ::NTSTATUS = 0xC0000114u32 as i32;
-pub const STATUS_ABIOS_SELECTOR_NOT_AVAILABLE: ::NTSTATUS = 0xC0000115u32 as i32;
-pub const STATUS_ABIOS_INVALID_SELECTOR: ::NTSTATUS = 0xC0000116u32 as i32;
-pub const STATUS_NO_LDT: ::NTSTATUS = 0xC0000117u32 as i32;
-pub const STATUS_INVALID_LDT_SIZE: ::NTSTATUS = 0xC0000118u32 as i32;
-pub const STATUS_INVALID_LDT_OFFSET: ::NTSTATUS = 0xC0000119u32 as i32;
-pub const STATUS_INVALID_LDT_DESCRIPTOR: ::NTSTATUS = 0xC000011Au32 as i32;
-pub const STATUS_INVALID_IMAGE_NE_FORMAT: ::NTSTATUS = 0xC000011Bu32 as i32;
-pub const STATUS_RXACT_INVALID_STATE: ::NTSTATUS = 0xC000011Cu32 as i32;
-pub const STATUS_RXACT_COMMIT_FAILURE: ::NTSTATUS = 0xC000011Du32 as i32;
-pub const STATUS_MAPPED_FILE_SIZE_ZERO: ::NTSTATUS = 0xC000011Eu32 as i32;
-pub const STATUS_TOO_MANY_OPENED_FILES: ::NTSTATUS = 0xC000011Fu32 as i32;
-pub const STATUS_CANCELLED: ::NTSTATUS = 0xC0000120u32 as i32;
-pub const STATUS_CANNOT_DELETE: ::NTSTATUS = 0xC0000121u32 as i32;
-pub const STATUS_INVALID_COMPUTER_NAME: ::NTSTATUS = 0xC0000122u32 as i32;
-pub const STATUS_FILE_DELETED: ::NTSTATUS = 0xC0000123u32 as i32;
-pub const STATUS_SPECIAL_ACCOUNT: ::NTSTATUS = 0xC0000124u32 as i32;
-pub const STATUS_SPECIAL_GROUP: ::NTSTATUS = 0xC0000125u32 as i32;
-pub const STATUS_SPECIAL_USER: ::NTSTATUS = 0xC0000126u32 as i32;
-pub const STATUS_MEMBERS_PRIMARY_GROUP: ::NTSTATUS = 0xC0000127u32 as i32;
-pub const STATUS_FILE_CLOSED: ::NTSTATUS = 0xC0000128u32 as i32;
-pub const STATUS_TOO_MANY_THREADS: ::NTSTATUS = 0xC0000129u32 as i32;
-pub const STATUS_THREAD_NOT_IN_PROCESS: ::NTSTATUS = 0xC000012Au32 as i32;
-pub const STATUS_TOKEN_ALREADY_IN_USE: ::NTSTATUS = 0xC000012Bu32 as i32;
-pub const STATUS_PAGEFILE_QUOTA_EXCEEDED: ::NTSTATUS = 0xC000012Cu32 as i32;
-pub const STATUS_COMMITMENT_LIMIT: ::NTSTATUS = 0xC000012Du32 as i32;
-pub const STATUS_INVALID_IMAGE_LE_FORMAT: ::NTSTATUS = 0xC000012Eu32 as i32;
-pub const STATUS_INVALID_IMAGE_NOT_MZ: ::NTSTATUS = 0xC000012Fu32 as i32;
-pub const STATUS_INVALID_IMAGE_PROTECT: ::NTSTATUS = 0xC0000130u32 as i32;
-pub const STATUS_INVALID_IMAGE_WIN_16: ::NTSTATUS = 0xC0000131u32 as i32;
-pub const STATUS_LOGON_SERVER_CONFLICT: ::NTSTATUS = 0xC0000132u32 as i32;
-pub const STATUS_TIME_DIFFERENCE_AT_DC: ::NTSTATUS = 0xC0000133u32 as i32;
-pub const STATUS_SYNCHRONIZATION_REQUIRED: ::NTSTATUS = 0xC0000134u32 as i32;
-pub const STATUS_DLL_NOT_FOUND: ::NTSTATUS = 0xC0000135u32 as i32;
-pub const STATUS_OPEN_FAILED: ::NTSTATUS = 0xC0000136u32 as i32;
-pub const STATUS_IO_PRIVILEGE_FAILED: ::NTSTATUS = 0xC0000137u32 as i32;
-pub const STATUS_ORDINAL_NOT_FOUND: ::NTSTATUS = 0xC0000138u32 as i32;
-pub const STATUS_ENTRYPOINT_NOT_FOUND: ::NTSTATUS = 0xC0000139u32 as i32;
-pub const STATUS_CONTROL_C_EXIT: ::NTSTATUS = 0xC000013Au32 as i32;
-pub const STATUS_LOCAL_DISCONNECT: ::NTSTATUS = 0xC000013Bu32 as i32;
-pub const STATUS_REMOTE_DISCONNECT: ::NTSTATUS = 0xC000013Cu32 as i32;
-pub const STATUS_REMOTE_RESOURCES: ::NTSTATUS = 0xC000013Du32 as i32;
-pub const STATUS_LINK_FAILED: ::NTSTATUS = 0xC000013Eu32 as i32;
-pub const STATUS_LINK_TIMEOUT: ::NTSTATUS = 0xC000013Fu32 as i32;
-pub const STATUS_INVALID_CONNECTION: ::NTSTATUS = 0xC0000140u32 as i32;
-pub const STATUS_INVALID_ADDRESS: ::NTSTATUS = 0xC0000141u32 as i32;
-pub const STATUS_DLL_INIT_FAILED: ::NTSTATUS = 0xC0000142u32 as i32;
-pub const STATUS_MISSING_SYSTEMFILE: ::NTSTATUS = 0xC0000143u32 as i32;
-pub const STATUS_UNHANDLED_EXCEPTION: ::NTSTATUS = 0xC0000144u32 as i32;
-pub const STATUS_APP_INIT_FAILURE: ::NTSTATUS = 0xC0000145u32 as i32;
-pub const STATUS_PAGEFILE_CREATE_FAILED: ::NTSTATUS = 0xC0000146u32 as i32;
-pub const STATUS_NO_PAGEFILE: ::NTSTATUS = 0xC0000147u32 as i32;
-pub const STATUS_INVALID_LEVEL: ::NTSTATUS = 0xC0000148u32 as i32;
-pub const STATUS_WRONG_PASSWORD_CORE: ::NTSTATUS = 0xC0000149u32 as i32;
-pub const STATUS_ILLEGAL_FLOAT_CONTEXT: ::NTSTATUS = 0xC000014Au32 as i32;
-pub const STATUS_PIPE_BROKEN: ::NTSTATUS = 0xC000014Bu32 as i32;
-pub const STATUS_REGISTRY_CORRUPT: ::NTSTATUS = 0xC000014Cu32 as i32;
-pub const STATUS_REGISTRY_IO_FAILED: ::NTSTATUS = 0xC000014Du32 as i32;
-pub const STATUS_NO_EVENT_PAIR: ::NTSTATUS = 0xC000014Eu32 as i32;
-pub const STATUS_UNRECOGNIZED_VOLUME: ::NTSTATUS = 0xC000014Fu32 as i32;
-pub const STATUS_SERIAL_NO_DEVICE_INITED: ::NTSTATUS = 0xC0000150u32 as i32;
-pub const STATUS_NO_SUCH_ALIAS: ::NTSTATUS = 0xC0000151u32 as i32;
-pub const STATUS_MEMBER_NOT_IN_ALIAS: ::NTSTATUS = 0xC0000152u32 as i32;
-pub const STATUS_MEMBER_IN_ALIAS: ::NTSTATUS = 0xC0000153u32 as i32;
-pub const STATUS_ALIAS_EXISTS: ::NTSTATUS = 0xC0000154u32 as i32;
-pub const STATUS_LOGON_NOT_GRANTED: ::NTSTATUS = 0xC0000155u32 as i32;
-pub const STATUS_TOO_MANY_SECRETS: ::NTSTATUS = 0xC0000156u32 as i32;
-pub const STATUS_SECRET_TOO_LONG: ::NTSTATUS = 0xC0000157u32 as i32;
-pub const STATUS_INTERNAL_DB_ERROR: ::NTSTATUS = 0xC0000158u32 as i32;
-pub const STATUS_FULLSCREEN_MODE: ::NTSTATUS = 0xC0000159u32 as i32;
-pub const STATUS_TOO_MANY_CONTEXT_IDS: ::NTSTATUS = 0xC000015Au32 as i32;
-pub const STATUS_LOGON_TYPE_NOT_GRANTED: ::NTSTATUS = 0xC000015Bu32 as i32;
-pub const STATUS_NOT_REGISTRY_FILE: ::NTSTATUS = 0xC000015Cu32 as i32;
-pub const STATUS_NT_CROSS_ENCRYPTION_REQUIRED: ::NTSTATUS = 0xC000015Du32 as i32;
-pub const STATUS_DOMAIN_CTRLR_CONFIG_ERROR: ::NTSTATUS = 0xC000015Eu32 as i32;
-pub const STATUS_FT_MISSING_MEMBER: ::NTSTATUS = 0xC000015Fu32 as i32;
-pub const STATUS_ILL_FORMED_SERVICE_ENTRY: ::NTSTATUS = 0xC0000160u32 as i32;
-pub const STATUS_ILLEGAL_CHARACTER: ::NTSTATUS = 0xC0000161u32 as i32;
-pub const STATUS_UNMAPPABLE_CHARACTER: ::NTSTATUS = 0xC0000162u32 as i32;
-pub const STATUS_UNDEFINED_CHARACTER: ::NTSTATUS = 0xC0000163u32 as i32;
-pub const STATUS_FLOPPY_VOLUME: ::NTSTATUS = 0xC0000164u32 as i32;
-pub const STATUS_FLOPPY_ID_MARK_NOT_FOUND: ::NTSTATUS = 0xC0000165u32 as i32;
-pub const STATUS_FLOPPY_WRONG_CYLINDER: ::NTSTATUS = 0xC0000166u32 as i32;
-pub const STATUS_FLOPPY_UNKNOWN_ERROR: ::NTSTATUS = 0xC0000167u32 as i32;
-pub const STATUS_FLOPPY_BAD_REGISTERS: ::NTSTATUS = 0xC0000168u32 as i32;
-pub const STATUS_DISK_RECALIBRATE_FAILED: ::NTSTATUS = 0xC0000169u32 as i32;
-pub const STATUS_DISK_OPERATION_FAILED: ::NTSTATUS = 0xC000016Au32 as i32;
-pub const STATUS_DISK_RESET_FAILED: ::NTSTATUS = 0xC000016Bu32 as i32;
-pub const STATUS_SHARED_IRQ_BUSY: ::NTSTATUS = 0xC000016Cu32 as i32;
-pub const STATUS_FT_ORPHANING: ::NTSTATUS = 0xC000016Du32 as i32;
-pub const STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT: ::NTSTATUS = 0xC000016Eu32 as i32;
-pub const STATUS_PARTITION_FAILURE: ::NTSTATUS = 0xC0000172u32 as i32;
-pub const STATUS_INVALID_BLOCK_LENGTH: ::NTSTATUS = 0xC0000173u32 as i32;
-pub const STATUS_DEVICE_NOT_PARTITIONED: ::NTSTATUS = 0xC0000174u32 as i32;
-pub const STATUS_UNABLE_TO_LOCK_MEDIA: ::NTSTATUS = 0xC0000175u32 as i32;
-pub const STATUS_UNABLE_TO_UNLOAD_MEDIA: ::NTSTATUS = 0xC0000176u32 as i32;
-pub const STATUS_EOM_OVERFLOW: ::NTSTATUS = 0xC0000177u32 as i32;
-pub const STATUS_NO_MEDIA: ::NTSTATUS = 0xC0000178u32 as i32;
-pub const STATUS_NO_SUCH_MEMBER: ::NTSTATUS = 0xC000017Au32 as i32;
-pub const STATUS_INVALID_MEMBER: ::NTSTATUS = 0xC000017Bu32 as i32;
-pub const STATUS_KEY_DELETED: ::NTSTATUS = 0xC000017Cu32 as i32;
-pub const STATUS_NO_LOG_SPACE: ::NTSTATUS = 0xC000017Du32 as i32;
-pub const STATUS_TOO_MANY_SIDS: ::NTSTATUS = 0xC000017Eu32 as i32;
-pub const STATUS_LM_CROSS_ENCRYPTION_REQUIRED: ::NTSTATUS = 0xC000017Fu32 as i32;
-pub const STATUS_KEY_HAS_CHILDREN: ::NTSTATUS = 0xC0000180u32 as i32;
-pub const STATUS_CHILD_MUST_BE_VOLATILE: ::NTSTATUS = 0xC0000181u32 as i32;
-pub const STATUS_DEVICE_CONFIGURATION_ERROR: ::NTSTATUS = 0xC0000182u32 as i32;
-pub const STATUS_DRIVER_INTERNAL_ERROR: ::NTSTATUS = 0xC0000183u32 as i32;
-pub const STATUS_INVALID_DEVICE_STATE: ::NTSTATUS = 0xC0000184u32 as i32;
-pub const STATUS_IO_DEVICE_ERROR: ::NTSTATUS = 0xC0000185u32 as i32;
-pub const STATUS_DEVICE_PROTOCOL_ERROR: ::NTSTATUS = 0xC0000186u32 as i32;
-pub const STATUS_BACKUP_CONTROLLER: ::NTSTATUS = 0xC0000187u32 as i32;
-pub const STATUS_LOG_FILE_FULL: ::NTSTATUS = 0xC0000188u32 as i32;
-pub const STATUS_TOO_LATE: ::NTSTATUS = 0xC0000189u32 as i32;
-pub const STATUS_NO_TRUST_LSA_SECRET: ::NTSTATUS = 0xC000018Au32 as i32;
-pub const STATUS_NO_TRUST_SAM_ACCOUNT: ::NTSTATUS = 0xC000018Bu32 as i32;
-pub const STATUS_TRUSTED_DOMAIN_FAILURE: ::NTSTATUS = 0xC000018Cu32 as i32;
-pub const STATUS_TRUSTED_RELATIONSHIP_FAILURE: ::NTSTATUS = 0xC000018Du32 as i32;
-pub const STATUS_EVENTLOG_FILE_CORRUPT: ::NTSTATUS = 0xC000018Eu32 as i32;
-pub const STATUS_EVENTLOG_CANT_START: ::NTSTATUS = 0xC000018Fu32 as i32;
-pub const STATUS_TRUST_FAILURE: ::NTSTATUS = 0xC0000190u32 as i32;
-pub const STATUS_MUTANT_LIMIT_EXCEEDED: ::NTSTATUS = 0xC0000191u32 as i32;
-pub const STATUS_NETLOGON_NOT_STARTED: ::NTSTATUS = 0xC0000192u32 as i32;
-pub const STATUS_ACCOUNT_EXPIRED: ::NTSTATUS = 0xC0000193u32 as i32;
-pub const STATUS_POSSIBLE_DEADLOCK: ::NTSTATUS = 0xC0000194u32 as i32;
-pub const STATUS_NETWORK_CREDENTIAL_CONFLICT: ::NTSTATUS = 0xC0000195u32 as i32;
-pub const STATUS_REMOTE_SESSION_LIMIT: ::NTSTATUS = 0xC0000196u32 as i32;
-pub const STATUS_EVENTLOG_FILE_CHANGED: ::NTSTATUS = 0xC0000197u32 as i32;
-pub const STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT: ::NTSTATUS = 0xC0000198u32 as i32;
-pub const STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT: ::NTSTATUS = 0xC0000199u32 as i32;
-pub const STATUS_NOLOGON_SERVER_TRUST_ACCOUNT: ::NTSTATUS = 0xC000019Au32 as i32;
-pub const STATUS_DOMAIN_TRUST_INCONSISTENT: ::NTSTATUS = 0xC000019Bu32 as i32;
-pub const STATUS_FS_DRIVER_REQUIRED: ::NTSTATUS = 0xC000019Cu32 as i32;
-pub const STATUS_IMAGE_ALREADY_LOADED_AS_DLL: ::NTSTATUS = 0xC000019Du32 as i32;
-pub const STATUS_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING: ::NTSTATUS = 0xC000019Eu32 as i32;
-pub const STATUS_SHORT_NAMES_NOT_ENABLED_ON_VOLUME: ::NTSTATUS = 0xC000019Fu32 as i32;
-pub const STATUS_SECURITY_STREAM_IS_INCONSISTENT: ::NTSTATUS = 0xC00001A0u32 as i32;
-pub const STATUS_INVALID_LOCK_RANGE: ::NTSTATUS = 0xC00001A1u32 as i32;
-pub const STATUS_INVALID_ACE_CONDITION: ::NTSTATUS = 0xC00001A2u32 as i32;
-pub const STATUS_IMAGE_SUBSYSTEM_NOT_PRESENT: ::NTSTATUS = 0xC00001A3u32 as i32;
-pub const STATUS_NOTIFICATION_GUID_ALREADY_DEFINED: ::NTSTATUS = 0xC00001A4u32 as i32;
-pub const STATUS_INVALID_EXCEPTION_HANDLER: ::NTSTATUS = 0xC00001A5u32 as i32;
-pub const STATUS_DUPLICATE_PRIVILEGES: ::NTSTATUS = 0xC00001A6u32 as i32;
-pub const STATUS_NOT_ALLOWED_ON_SYSTEM_FILE: ::NTSTATUS = 0xC00001A7u32 as i32;
-pub const STATUS_REPAIR_NEEDED: ::NTSTATUS = 0xC00001A8u32 as i32;
-pub const STATUS_QUOTA_NOT_ENABLED: ::NTSTATUS = 0xC00001A9u32 as i32;
-pub const STATUS_NO_APPLICATION_PACKAGE: ::NTSTATUS = 0xC00001AAu32 as i32;
-pub const STATUS_FILE_METADATA_OPTIMIZATION_IN_PROGRESS: ::NTSTATUS = 0xC00001ABu32 as i32;
-pub const STATUS_NOT_SAME_OBJECT: ::NTSTATUS = 0xC00001ACu32 as i32;
-pub const STATUS_FATAL_MEMORY_EXHAUSTION: ::NTSTATUS = 0xC00001ADu32 as i32;
-pub const STATUS_ERROR_PROCESS_NOT_IN_JOB: ::NTSTATUS = 0xC00001AEu32 as i32;
-pub const STATUS_NETWORK_OPEN_RESTRICTION: ::NTSTATUS = 0xC0000201u32 as i32;
-pub const STATUS_NO_USER_SESSION_KEY: ::NTSTATUS = 0xC0000202u32 as i32;
-pub const STATUS_USER_SESSION_DELETED: ::NTSTATUS = 0xC0000203u32 as i32;
-pub const STATUS_RESOURCE_LANG_NOT_FOUND: ::NTSTATUS = 0xC0000204u32 as i32;
-pub const STATUS_INSUFF_SERVER_RESOURCES: ::NTSTATUS = 0xC0000205u32 as i32;
-pub const STATUS_INVALID_BUFFER_SIZE: ::NTSTATUS = 0xC0000206u32 as i32;
-pub const STATUS_INVALID_ADDRESS_COMPONENT: ::NTSTATUS = 0xC0000207u32 as i32;
-pub const STATUS_INVALID_ADDRESS_WILDCARD: ::NTSTATUS = 0xC0000208u32 as i32;
-pub const STATUS_TOO_MANY_ADDRESSES: ::NTSTATUS = 0xC0000209u32 as i32;
-pub const STATUS_ADDRESS_ALREADY_EXISTS: ::NTSTATUS = 0xC000020Au32 as i32;
-pub const STATUS_ADDRESS_CLOSED: ::NTSTATUS = 0xC000020Bu32 as i32;
-pub const STATUS_CONNECTION_DISCONNECTED: ::NTSTATUS = 0xC000020Cu32 as i32;
-pub const STATUS_CONNECTION_RESET: ::NTSTATUS = 0xC000020Du32 as i32;
-pub const STATUS_TOO_MANY_NODES: ::NTSTATUS = 0xC000020Eu32 as i32;
-pub const STATUS_TRANSACTION_ABORTED: ::NTSTATUS = 0xC000020Fu32 as i32;
-pub const STATUS_TRANSACTION_TIMED_OUT: ::NTSTATUS = 0xC0000210u32 as i32;
-pub const STATUS_TRANSACTION_NO_RELEASE: ::NTSTATUS = 0xC0000211u32 as i32;
-pub const STATUS_TRANSACTION_NO_MATCH: ::NTSTATUS = 0xC0000212u32 as i32;
-pub const STATUS_TRANSACTION_RESPONDED: ::NTSTATUS = 0xC0000213u32 as i32;
-pub const STATUS_TRANSACTION_INVALID_ID: ::NTSTATUS = 0xC0000214u32 as i32;
-pub const STATUS_TRANSACTION_INVALID_TYPE: ::NTSTATUS = 0xC0000215u32 as i32;
-pub const STATUS_NOT_SERVER_SESSION: ::NTSTATUS = 0xC0000216u32 as i32;
-pub const STATUS_NOT_CLIENT_SESSION: ::NTSTATUS = 0xC0000217u32 as i32;
-pub const STATUS_CANNOT_LOAD_REGISTRY_FILE: ::NTSTATUS = 0xC0000218u32 as i32;
-pub const STATUS_DEBUG_ATTACH_FAILED: ::NTSTATUS = 0xC0000219u32 as i32;
-pub const STATUS_SYSTEM_PROCESS_TERMINATED: ::NTSTATUS = 0xC000021Au32 as i32;
-pub const STATUS_DATA_NOT_ACCEPTED: ::NTSTATUS = 0xC000021Bu32 as i32;
-pub const STATUS_NO_BROWSER_SERVERS_FOUND: ::NTSTATUS = 0xC000021Cu32 as i32;
-pub const STATUS_VDM_HARD_ERROR: ::NTSTATUS = 0xC000021Du32 as i32;
-pub const STATUS_DRIVER_CANCEL_TIMEOUT: ::NTSTATUS = 0xC000021Eu32 as i32;
-pub const STATUS_REPLY_MESSAGE_MISMATCH: ::NTSTATUS = 0xC000021Fu32 as i32;
-pub const STATUS_MAPPED_ALIGNMENT: ::NTSTATUS = 0xC0000220u32 as i32;
-pub const STATUS_IMAGE_CHECKSUM_MISMATCH: ::NTSTATUS = 0xC0000221u32 as i32;
-pub const STATUS_LOST_WRITEBEHIND_DATA: ::NTSTATUS = 0xC0000222u32 as i32;
-pub const STATUS_CLIENT_SERVER_PARAMETERS_INVALID: ::NTSTATUS = 0xC0000223u32 as i32;
-pub const STATUS_PASSWORD_MUST_CHANGE: ::NTSTATUS = 0xC0000224u32 as i32;
-pub const STATUS_NOT_FOUND: ::NTSTATUS = 0xC0000225u32 as i32;
-pub const STATUS_NOT_TINY_STREAM: ::NTSTATUS = 0xC0000226u32 as i32;
-pub const STATUS_RECOVERY_FAILURE: ::NTSTATUS = 0xC0000227u32 as i32;
-pub const STATUS_STACK_OVERFLOW_READ: ::NTSTATUS = 0xC0000228u32 as i32;
-pub const STATUS_FAIL_CHECK: ::NTSTATUS = 0xC0000229u32 as i32;
-pub const STATUS_DUPLICATE_OBJECTID: ::NTSTATUS = 0xC000022Au32 as i32;
-pub const STATUS_OBJECTID_EXISTS: ::NTSTATUS = 0xC000022Bu32 as i32;
-pub const STATUS_CONVERT_TO_LARGE: ::NTSTATUS = 0xC000022Cu32 as i32;
-pub const STATUS_RETRY: ::NTSTATUS = 0xC000022Du32 as i32;
-pub const STATUS_FOUND_OUT_OF_SCOPE: ::NTSTATUS = 0xC000022Eu32 as i32;
-pub const STATUS_ALLOCATE_BUCKET: ::NTSTATUS = 0xC000022Fu32 as i32;
-pub const STATUS_PROPSET_NOT_FOUND: ::NTSTATUS = 0xC0000230u32 as i32;
-pub const STATUS_MARSHALL_OVERFLOW: ::NTSTATUS = 0xC0000231u32 as i32;
-pub const STATUS_INVALID_VARIANT: ::NTSTATUS = 0xC0000232u32 as i32;
-pub const STATUS_DOMAIN_CONTROLLER_NOT_FOUND: ::NTSTATUS = 0xC0000233u32 as i32;
-pub const STATUS_ACCOUNT_LOCKED_OUT: ::NTSTATUS = 0xC0000234u32 as i32;
-pub const STATUS_HANDLE_NOT_CLOSABLE: ::NTSTATUS = 0xC0000235u32 as i32;
-pub const STATUS_CONNECTION_REFUSED: ::NTSTATUS = 0xC0000236u32 as i32;
-pub const STATUS_GRACEFUL_DISCONNECT: ::NTSTATUS = 0xC0000237u32 as i32;
-pub const STATUS_ADDRESS_ALREADY_ASSOCIATED: ::NTSTATUS = 0xC0000238u32 as i32;
-pub const STATUS_ADDRESS_NOT_ASSOCIATED: ::NTSTATUS = 0xC0000239u32 as i32;
-pub const STATUS_CONNECTION_INVALID: ::NTSTATUS = 0xC000023Au32 as i32;
-pub const STATUS_CONNECTION_ACTIVE: ::NTSTATUS = 0xC000023Bu32 as i32;
-pub const STATUS_NETWORK_UNREACHABLE: ::NTSTATUS = 0xC000023Cu32 as i32;
-pub const STATUS_HOST_UNREACHABLE: ::NTSTATUS = 0xC000023Du32 as i32;
-pub const STATUS_PROTOCOL_UNREACHABLE: ::NTSTATUS = 0xC000023Eu32 as i32;
-pub const STATUS_PORT_UNREACHABLE: ::NTSTATUS = 0xC000023Fu32 as i32;
-pub const STATUS_REQUEST_ABORTED: ::NTSTATUS = 0xC0000240u32 as i32;
-pub const STATUS_CONNECTION_ABORTED: ::NTSTATUS = 0xC0000241u32 as i32;
-pub const STATUS_BAD_COMPRESSION_BUFFER: ::NTSTATUS = 0xC0000242u32 as i32;
-pub const STATUS_USER_MAPPED_FILE: ::NTSTATUS = 0xC0000243u32 as i32;
-pub const STATUS_AUDIT_FAILED: ::NTSTATUS = 0xC0000244u32 as i32;
-pub const STATUS_TIMER_RESOLUTION_NOT_SET: ::NTSTATUS = 0xC0000245u32 as i32;
-pub const STATUS_CONNECTION_COUNT_LIMIT: ::NTSTATUS = 0xC0000246u32 as i32;
-pub const STATUS_LOGIN_TIME_RESTRICTION: ::NTSTATUS = 0xC0000247u32 as i32;
-pub const STATUS_LOGIN_WKSTA_RESTRICTION: ::NTSTATUS = 0xC0000248u32 as i32;
-pub const STATUS_IMAGE_MP_UP_MISMATCH: ::NTSTATUS = 0xC0000249u32 as i32;
-pub const STATUS_INSUFFICIENT_LOGON_INFO: ::NTSTATUS = 0xC0000250u32 as i32;
-pub const STATUS_BAD_DLL_ENTRYPOINT: ::NTSTATUS = 0xC0000251u32 as i32;
-pub const STATUS_BAD_SERVICE_ENTRYPOINT: ::NTSTATUS = 0xC0000252u32 as i32;
-pub const STATUS_LPC_REPLY_LOST: ::NTSTATUS = 0xC0000253u32 as i32;
-pub const STATUS_IP_ADDRESS_CONFLICT1: ::NTSTATUS = 0xC0000254u32 as i32;
-pub const STATUS_IP_ADDRESS_CONFLICT2: ::NTSTATUS = 0xC0000255u32 as i32;
-pub const STATUS_REGISTRY_QUOTA_LIMIT: ::NTSTATUS = 0xC0000256u32 as i32;
-pub const STATUS_PATH_NOT_COVERED: ::NTSTATUS = 0xC0000257u32 as i32;
-pub const STATUS_NO_CALLBACK_ACTIVE: ::NTSTATUS = 0xC0000258u32 as i32;
-pub const STATUS_LICENSE_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000259u32 as i32;
-pub const STATUS_PWD_TOO_SHORT: ::NTSTATUS = 0xC000025Au32 as i32;
-pub const STATUS_PWD_TOO_RECENT: ::NTSTATUS = 0xC000025Bu32 as i32;
-pub const STATUS_PWD_HISTORY_CONFLICT: ::NTSTATUS = 0xC000025Cu32 as i32;
-pub const STATUS_PLUGPLAY_NO_DEVICE: ::NTSTATUS = 0xC000025Eu32 as i32;
-pub const STATUS_UNSUPPORTED_COMPRESSION: ::NTSTATUS = 0xC000025Fu32 as i32;
-pub const STATUS_INVALID_HW_PROFILE: ::NTSTATUS = 0xC0000260u32 as i32;
-pub const STATUS_INVALID_PLUGPLAY_DEVICE_PATH: ::NTSTATUS = 0xC0000261u32 as i32;
-pub const STATUS_DRIVER_ORDINAL_NOT_FOUND: ::NTSTATUS = 0xC0000262u32 as i32;
-pub const STATUS_DRIVER_ENTRYPOINT_NOT_FOUND: ::NTSTATUS = 0xC0000263u32 as i32;
-pub const STATUS_RESOURCE_NOT_OWNED: ::NTSTATUS = 0xC0000264u32 as i32;
-pub const STATUS_TOO_MANY_LINKS: ::NTSTATUS = 0xC0000265u32 as i32;
-pub const STATUS_QUOTA_LIST_INCONSISTENT: ::NTSTATUS = 0xC0000266u32 as i32;
-pub const STATUS_FILE_IS_OFFLINE: ::NTSTATUS = 0xC0000267u32 as i32;
-pub const STATUS_EVALUATION_EXPIRATION: ::NTSTATUS = 0xC0000268u32 as i32;
-pub const STATUS_ILLEGAL_DLL_RELOCATION: ::NTSTATUS = 0xC0000269u32 as i32;
-pub const STATUS_LICENSE_VIOLATION: ::NTSTATUS = 0xC000026Au32 as i32;
-pub const STATUS_DLL_INIT_FAILED_LOGOFF: ::NTSTATUS = 0xC000026Bu32 as i32;
-pub const STATUS_DRIVER_UNABLE_TO_LOAD: ::NTSTATUS = 0xC000026Cu32 as i32;
-pub const STATUS_DFS_UNAVAILABLE: ::NTSTATUS = 0xC000026Du32 as i32;
-pub const STATUS_VOLUME_DISMOUNTED: ::NTSTATUS = 0xC000026Eu32 as i32;
-pub const STATUS_WX86_INTERNAL_ERROR: ::NTSTATUS = 0xC000026Fu32 as i32;
-pub const STATUS_WX86_FLOAT_STACK_CHECK: ::NTSTATUS = 0xC0000270u32 as i32;
-pub const STATUS_VALIDATE_CONTINUE: ::NTSTATUS = 0xC0000271u32 as i32;
-pub const STATUS_NO_MATCH: ::NTSTATUS = 0xC0000272u32 as i32;
-pub const STATUS_NO_MORE_MATCHES: ::NTSTATUS = 0xC0000273u32 as i32;
-pub const STATUS_NOT_A_REPARSE_POINT: ::NTSTATUS = 0xC0000275u32 as i32;
-pub const STATUS_IO_REPARSE_TAG_INVALID: ::NTSTATUS = 0xC0000276u32 as i32;
-pub const STATUS_IO_REPARSE_TAG_MISMATCH: ::NTSTATUS = 0xC0000277u32 as i32;
-pub const STATUS_IO_REPARSE_DATA_INVALID: ::NTSTATUS = 0xC0000278u32 as i32;
-pub const STATUS_IO_REPARSE_TAG_NOT_HANDLED: ::NTSTATUS = 0xC0000279u32 as i32;
-pub const STATUS_PWD_TOO_LONG: ::NTSTATUS = 0xC000027Au32 as i32;
-pub const STATUS_STOWED_EXCEPTION: ::NTSTATUS = 0xC000027Bu32 as i32;
-pub const STATUS_REPARSE_POINT_NOT_RESOLVED: ::NTSTATUS = 0xC0000280u32 as i32;
-pub const STATUS_DIRECTORY_IS_A_REPARSE_POINT: ::NTSTATUS = 0xC0000281u32 as i32;
-pub const STATUS_RANGE_LIST_CONFLICT: ::NTSTATUS = 0xC0000282u32 as i32;
-pub const STATUS_SOURCE_ELEMENT_EMPTY: ::NTSTATUS = 0xC0000283u32 as i32;
-pub const STATUS_DESTINATION_ELEMENT_FULL: ::NTSTATUS = 0xC0000284u32 as i32;
-pub const STATUS_ILLEGAL_ELEMENT_ADDRESS: ::NTSTATUS = 0xC0000285u32 as i32;
-pub const STATUS_MAGAZINE_NOT_PRESENT: ::NTSTATUS = 0xC0000286u32 as i32;
-pub const STATUS_REINITIALIZATION_NEEDED: ::NTSTATUS = 0xC0000287u32 as i32;
-pub const STATUS_DEVICE_REQUIRES_CLEANING: ::NTSTATUS = 0x80000288u32 as i32;
-pub const STATUS_DEVICE_DOOR_OPEN: ::NTSTATUS = 0x80000289u32 as i32;
-pub const STATUS_ENCRYPTION_FAILED: ::NTSTATUS = 0xC000028Au32 as i32;
-pub const STATUS_DECRYPTION_FAILED: ::NTSTATUS = 0xC000028Bu32 as i32;
-pub const STATUS_RANGE_NOT_FOUND: ::NTSTATUS = 0xC000028Cu32 as i32;
-pub const STATUS_NO_RECOVERY_POLICY: ::NTSTATUS = 0xC000028Du32 as i32;
-pub const STATUS_NO_EFS: ::NTSTATUS = 0xC000028Eu32 as i32;
-pub const STATUS_WRONG_EFS: ::NTSTATUS = 0xC000028Fu32 as i32;
-pub const STATUS_NO_USER_KEYS: ::NTSTATUS = 0xC0000290u32 as i32;
-pub const STATUS_FILE_NOT_ENCRYPTED: ::NTSTATUS = 0xC0000291u32 as i32;
-pub const STATUS_NOT_EXPORT_FORMAT: ::NTSTATUS = 0xC0000292u32 as i32;
-pub const STATUS_FILE_ENCRYPTED: ::NTSTATUS = 0xC0000293u32 as i32;
-pub const STATUS_WAKE_SYSTEM: ::NTSTATUS = 0x40000294;
-pub const STATUS_WMI_GUID_NOT_FOUND: ::NTSTATUS = 0xC0000295u32 as i32;
-pub const STATUS_WMI_INSTANCE_NOT_FOUND: ::NTSTATUS = 0xC0000296u32 as i32;
-pub const STATUS_WMI_ITEMID_NOT_FOUND: ::NTSTATUS = 0xC0000297u32 as i32;
-pub const STATUS_WMI_TRY_AGAIN: ::NTSTATUS = 0xC0000298u32 as i32;
-pub const STATUS_SHARED_POLICY: ::NTSTATUS = 0xC0000299u32 as i32;
-pub const STATUS_POLICY_OBJECT_NOT_FOUND: ::NTSTATUS = 0xC000029Au32 as i32;
-pub const STATUS_POLICY_ONLY_IN_DS: ::NTSTATUS = 0xC000029Bu32 as i32;
-pub const STATUS_VOLUME_NOT_UPGRADED: ::NTSTATUS = 0xC000029Cu32 as i32;
-pub const STATUS_REMOTE_STORAGE_NOT_ACTIVE: ::NTSTATUS = 0xC000029Du32 as i32;
-pub const STATUS_REMOTE_STORAGE_MEDIA_ERROR: ::NTSTATUS = 0xC000029Eu32 as i32;
-pub const STATUS_NO_TRACKING_SERVICE: ::NTSTATUS = 0xC000029Fu32 as i32;
-pub const STATUS_SERVER_SID_MISMATCH: ::NTSTATUS = 0xC00002A0u32 as i32;
-pub const STATUS_DS_NO_ATTRIBUTE_OR_VALUE: ::NTSTATUS = 0xC00002A1u32 as i32;
-pub const STATUS_DS_INVALID_ATTRIBUTE_SYNTAX: ::NTSTATUS = 0xC00002A2u32 as i32;
-pub const STATUS_DS_ATTRIBUTE_TYPE_UNDEFINED: ::NTSTATUS = 0xC00002A3u32 as i32;
-pub const STATUS_DS_ATTRIBUTE_OR_VALUE_EXISTS: ::NTSTATUS = 0xC00002A4u32 as i32;
-pub const STATUS_DS_BUSY: ::NTSTATUS = 0xC00002A5u32 as i32;
-pub const STATUS_DS_UNAVAILABLE: ::NTSTATUS = 0xC00002A6u32 as i32;
-pub const STATUS_DS_NO_RIDS_ALLOCATED: ::NTSTATUS = 0xC00002A7u32 as i32;
-pub const STATUS_DS_NO_MORE_RIDS: ::NTSTATUS = 0xC00002A8u32 as i32;
-pub const STATUS_DS_INCORRECT_ROLE_OWNER: ::NTSTATUS = 0xC00002A9u32 as i32;
-pub const STATUS_DS_RIDMGR_INIT_ERROR: ::NTSTATUS = 0xC00002AAu32 as i32;
-pub const STATUS_DS_OBJ_CLASS_VIOLATION: ::NTSTATUS = 0xC00002ABu32 as i32;
-pub const STATUS_DS_CANT_ON_NON_LEAF: ::NTSTATUS = 0xC00002ACu32 as i32;
-pub const STATUS_DS_CANT_ON_RDN: ::NTSTATUS = 0xC00002ADu32 as i32;
-pub const STATUS_DS_CANT_MOD_OBJ_CLASS: ::NTSTATUS = 0xC00002AEu32 as i32;
-pub const STATUS_DS_CROSS_DOM_MOVE_FAILED: ::NTSTATUS = 0xC00002AFu32 as i32;
-pub const STATUS_DS_GC_NOT_AVAILABLE: ::NTSTATUS = 0xC00002B0u32 as i32;
-pub const STATUS_DIRECTORY_SERVICE_REQUIRED: ::NTSTATUS = 0xC00002B1u32 as i32;
-pub const STATUS_REPARSE_ATTRIBUTE_CONFLICT: ::NTSTATUS = 0xC00002B2u32 as i32;
-pub const STATUS_CANT_ENABLE_DENY_ONLY: ::NTSTATUS = 0xC00002B3u32 as i32;
-pub const STATUS_FLOAT_MULTIPLE_FAULTS: ::NTSTATUS = 0xC00002B4u32 as i32;
-pub const STATUS_FLOAT_MULTIPLE_TRAPS: ::NTSTATUS = 0xC00002B5u32 as i32;
-pub const STATUS_DEVICE_REMOVED: ::NTSTATUS = 0xC00002B6u32 as i32;
-pub const STATUS_JOURNAL_DELETE_IN_PROGRESS: ::NTSTATUS = 0xC00002B7u32 as i32;
-pub const STATUS_JOURNAL_NOT_ACTIVE: ::NTSTATUS = 0xC00002B8u32 as i32;
-pub const STATUS_NOINTERFACE: ::NTSTATUS = 0xC00002B9u32 as i32;
-pub const STATUS_DS_RIDMGR_DISABLED: ::NTSTATUS = 0xC00002BAu32 as i32;
-pub const STATUS_DS_ADMIN_LIMIT_EXCEEDED: ::NTSTATUS = 0xC00002C1u32 as i32;
-pub const STATUS_DRIVER_FAILED_SLEEP: ::NTSTATUS = 0xC00002C2u32 as i32;
-pub const STATUS_MUTUAL_AUTHENTICATION_FAILED: ::NTSTATUS = 0xC00002C3u32 as i32;
-pub const STATUS_CORRUPT_SYSTEM_FILE: ::NTSTATUS = 0xC00002C4u32 as i32;
-pub const STATUS_DATATYPE_MISALIGNMENT_ERROR: ::NTSTATUS = 0xC00002C5u32 as i32;
-pub const STATUS_WMI_READ_ONLY: ::NTSTATUS = 0xC00002C6u32 as i32;
-pub const STATUS_WMI_SET_FAILURE: ::NTSTATUS = 0xC00002C7u32 as i32;
-pub const STATUS_COMMITMENT_MINIMUM: ::NTSTATUS = 0xC00002C8u32 as i32;
-pub const STATUS_REG_NAT_CONSUMPTION: ::NTSTATUS = 0xC00002C9u32 as i32;
-pub const STATUS_TRANSPORT_FULL: ::NTSTATUS = 0xC00002CAu32 as i32;
-pub const STATUS_DS_SAM_INIT_FAILURE: ::NTSTATUS = 0xC00002CBu32 as i32;
-pub const STATUS_ONLY_IF_CONNECTED: ::NTSTATUS = 0xC00002CCu32 as i32;
-pub const STATUS_DS_SENSITIVE_GROUP_VIOLATION: ::NTSTATUS = 0xC00002CDu32 as i32;
-pub const STATUS_PNP_RESTART_ENUMERATION: ::NTSTATUS = 0xC00002CEu32 as i32;
-pub const STATUS_JOURNAL_ENTRY_DELETED: ::NTSTATUS = 0xC00002CFu32 as i32;
-pub const STATUS_DS_CANT_MOD_PRIMARYGROUPID: ::NTSTATUS = 0xC00002D0u32 as i32;
-pub const STATUS_SYSTEM_IMAGE_BAD_SIGNATURE: ::NTSTATUS = 0xC00002D1u32 as i32;
-pub const STATUS_PNP_REBOOT_REQUIRED: ::NTSTATUS = 0xC00002D2u32 as i32;
-pub const STATUS_POWER_STATE_INVALID: ::NTSTATUS = 0xC00002D3u32 as i32;
-pub const STATUS_DS_INVALID_GROUP_TYPE: ::NTSTATUS = 0xC00002D4u32 as i32;
-pub const STATUS_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN: ::NTSTATUS = 0xC00002D5u32 as i32;
-pub const STATUS_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN: ::NTSTATUS = 0xC00002D6u32 as i32;
-pub const STATUS_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER: ::NTSTATUS = 0xC00002D7u32 as i32;
-pub const STATUS_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER: ::NTSTATUS = 0xC00002D8u32 as i32;
-pub const STATUS_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER: ::NTSTATUS = 0xC00002D9u32 as i32;
-pub const STATUS_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER: ::NTSTATUS = 0xC00002DAu32 as i32;
-pub const STATUS_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER: ::NTSTATUS = 0xC00002DBu32 as i32;
-pub const STATUS_DS_HAVE_PRIMARY_MEMBERS: ::NTSTATUS = 0xC00002DCu32 as i32;
-pub const STATUS_WMI_NOT_SUPPORTED: ::NTSTATUS = 0xC00002DDu32 as i32;
-pub const STATUS_INSUFFICIENT_POWER: ::NTSTATUS = 0xC00002DEu32 as i32;
-pub const STATUS_SAM_NEED_BOOTKEY_PASSWORD: ::NTSTATUS = 0xC00002DFu32 as i32;
-pub const STATUS_SAM_NEED_BOOTKEY_FLOPPY: ::NTSTATUS = 0xC00002E0u32 as i32;
-pub const STATUS_DS_CANT_START: ::NTSTATUS = 0xC00002E1u32 as i32;
-pub const STATUS_DS_INIT_FAILURE: ::NTSTATUS = 0xC00002E2u32 as i32;
-pub const STATUS_SAM_INIT_FAILURE: ::NTSTATUS = 0xC00002E3u32 as i32;
-pub const STATUS_DS_GC_REQUIRED: ::NTSTATUS = 0xC00002E4u32 as i32;
-pub const STATUS_DS_LOCAL_MEMBER_OF_LOCAL_ONLY: ::NTSTATUS = 0xC00002E5u32 as i32;
-pub const STATUS_DS_NO_FPO_IN_UNIVERSAL_GROUPS: ::NTSTATUS = 0xC00002E6u32 as i32;
-pub const STATUS_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED: ::NTSTATUS = 0xC00002E7u32 as i32;
-pub const STATUS_MULTIPLE_FAULT_VIOLATION: ::NTSTATUS = 0xC00002E8u32 as i32;
-pub const STATUS_CURRENT_DOMAIN_NOT_ALLOWED: ::NTSTATUS = 0xC00002E9u32 as i32;
-pub const STATUS_CANNOT_MAKE: ::NTSTATUS = 0xC00002EAu32 as i32;
-pub const STATUS_SYSTEM_SHUTDOWN: ::NTSTATUS = 0xC00002EBu32 as i32;
-pub const STATUS_DS_INIT_FAILURE_CONSOLE: ::NTSTATUS = 0xC00002ECu32 as i32;
-pub const STATUS_DS_SAM_INIT_FAILURE_CONSOLE: ::NTSTATUS = 0xC00002EDu32 as i32;
-pub const STATUS_UNFINISHED_CONTEXT_DELETED: ::NTSTATUS = 0xC00002EEu32 as i32;
-pub const STATUS_NO_TGT_REPLY: ::NTSTATUS = 0xC00002EFu32 as i32;
-pub const STATUS_OBJECTID_NOT_FOUND: ::NTSTATUS = 0xC00002F0u32 as i32;
-pub const STATUS_NO_IP_ADDRESSES: ::NTSTATUS = 0xC00002F1u32 as i32;
-pub const STATUS_WRONG_CREDENTIAL_HANDLE: ::NTSTATUS = 0xC00002F2u32 as i32;
-pub const STATUS_CRYPTO_SYSTEM_INVALID: ::NTSTATUS = 0xC00002F3u32 as i32;
-pub const STATUS_MAX_REFERRALS_EXCEEDED: ::NTSTATUS = 0xC00002F4u32 as i32;
-pub const STATUS_MUST_BE_KDC: ::NTSTATUS = 0xC00002F5u32 as i32;
-pub const STATUS_STRONG_CRYPTO_NOT_SUPPORTED: ::NTSTATUS = 0xC00002F6u32 as i32;
-pub const STATUS_TOO_MANY_PRINCIPALS: ::NTSTATUS = 0xC00002F7u32 as i32;
-pub const STATUS_NO_PA_DATA: ::NTSTATUS = 0xC00002F8u32 as i32;
-pub const STATUS_PKINIT_NAME_MISMATCH: ::NTSTATUS = 0xC00002F9u32 as i32;
-pub const STATUS_SMARTCARD_LOGON_REQUIRED: ::NTSTATUS = 0xC00002FAu32 as i32;
-pub const STATUS_KDC_INVALID_REQUEST: ::NTSTATUS = 0xC00002FBu32 as i32;
-pub const STATUS_KDC_UNABLE_TO_REFER: ::NTSTATUS = 0xC00002FCu32 as i32;
-pub const STATUS_KDC_UNKNOWN_ETYPE: ::NTSTATUS = 0xC00002FDu32 as i32;
-pub const STATUS_SHUTDOWN_IN_PROGRESS: ::NTSTATUS = 0xC00002FEu32 as i32;
-pub const STATUS_SERVER_SHUTDOWN_IN_PROGRESS: ::NTSTATUS = 0xC00002FFu32 as i32;
-pub const STATUS_NOT_SUPPORTED_ON_SBS: ::NTSTATUS = 0xC0000300u32 as i32;
-pub const STATUS_WMI_GUID_DISCONNECTED: ::NTSTATUS = 0xC0000301u32 as i32;
-pub const STATUS_WMI_ALREADY_DISABLED: ::NTSTATUS = 0xC0000302u32 as i32;
-pub const STATUS_WMI_ALREADY_ENABLED: ::NTSTATUS = 0xC0000303u32 as i32;
-pub const STATUS_MFT_TOO_FRAGMENTED: ::NTSTATUS = 0xC0000304u32 as i32;
-pub const STATUS_COPY_PROTECTION_FAILURE: ::NTSTATUS = 0xC0000305u32 as i32;
-pub const STATUS_CSS_AUTHENTICATION_FAILURE: ::NTSTATUS = 0xC0000306u32 as i32;
-pub const STATUS_CSS_KEY_NOT_PRESENT: ::NTSTATUS = 0xC0000307u32 as i32;
-pub const STATUS_CSS_KEY_NOT_ESTABLISHED: ::NTSTATUS = 0xC0000308u32 as i32;
-pub const STATUS_CSS_SCRAMBLED_SECTOR: ::NTSTATUS = 0xC0000309u32 as i32;
-pub const STATUS_CSS_REGION_MISMATCH: ::NTSTATUS = 0xC000030Au32 as i32;
-pub const STATUS_CSS_RESETS_EXHAUSTED: ::NTSTATUS = 0xC000030Bu32 as i32;
-pub const STATUS_PASSWORD_CHANGE_REQUIRED: ::NTSTATUS = 0xC000030Cu32 as i32;
-pub const STATUS_PKINIT_FAILURE: ::NTSTATUS = 0xC0000320u32 as i32;
-pub const STATUS_SMARTCARD_SUBSYSTEM_FAILURE: ::NTSTATUS = 0xC0000321u32 as i32;
-pub const STATUS_NO_KERB_KEY: ::NTSTATUS = 0xC0000322u32 as i32;
-pub const STATUS_HOST_DOWN: ::NTSTATUS = 0xC0000350u32 as i32;
-pub const STATUS_UNSUPPORTED_PREAUTH: ::NTSTATUS = 0xC0000351u32 as i32;
-pub const STATUS_EFS_ALG_BLOB_TOO_BIG: ::NTSTATUS = 0xC0000352u32 as i32;
-pub const STATUS_PORT_NOT_SET: ::NTSTATUS = 0xC0000353u32 as i32;
-pub const STATUS_DEBUGGER_INACTIVE: ::NTSTATUS = 0xC0000354u32 as i32;
-pub const STATUS_DS_VERSION_CHECK_FAILURE: ::NTSTATUS = 0xC0000355u32 as i32;
-pub const STATUS_AUDITING_DISABLED: ::NTSTATUS = 0xC0000356u32 as i32;
-pub const STATUS_PRENT4_MACHINE_ACCOUNT: ::NTSTATUS = 0xC0000357u32 as i32;
-pub const STATUS_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER: ::NTSTATUS = 0xC0000358u32 as i32;
-pub const STATUS_INVALID_IMAGE_WIN_32: ::NTSTATUS = 0xC0000359u32 as i32;
-pub const STATUS_INVALID_IMAGE_WIN_64: ::NTSTATUS = 0xC000035Au32 as i32;
-pub const STATUS_BAD_BINDINGS: ::NTSTATUS = 0xC000035Bu32 as i32;
-pub const STATUS_NETWORK_SESSION_EXPIRED: ::NTSTATUS = 0xC000035Cu32 as i32;
-pub const STATUS_APPHELP_BLOCK: ::NTSTATUS = 0xC000035Du32 as i32;
-pub const STATUS_ALL_SIDS_FILTERED: ::NTSTATUS = 0xC000035Eu32 as i32;
-pub const STATUS_NOT_SAFE_MODE_DRIVER: ::NTSTATUS = 0xC000035Fu32 as i32;
-pub const STATUS_ACCESS_DISABLED_BY_POLICY_DEFAULT: ::NTSTATUS = 0xC0000361u32 as i32;
-pub const STATUS_ACCESS_DISABLED_BY_POLICY_PATH: ::NTSTATUS = 0xC0000362u32 as i32;
-pub const STATUS_ACCESS_DISABLED_BY_POLICY_PUBLISHER: ::NTSTATUS = 0xC0000363u32 as i32;
-pub const STATUS_ACCESS_DISABLED_BY_POLICY_OTHER: ::NTSTATUS = 0xC0000364u32 as i32;
-pub const STATUS_FAILED_DRIVER_ENTRY: ::NTSTATUS = 0xC0000365u32 as i32;
-pub const STATUS_DEVICE_ENUMERATION_ERROR: ::NTSTATUS = 0xC0000366u32 as i32;
-pub const STATUS_MOUNT_POINT_NOT_RESOLVED: ::NTSTATUS = 0xC0000368u32 as i32;
-pub const STATUS_INVALID_DEVICE_OBJECT_PARAMETER: ::NTSTATUS = 0xC0000369u32 as i32;
-pub const STATUS_MCA_OCCURED: ::NTSTATUS = 0xC000036Au32 as i32;
-pub const STATUS_DRIVER_BLOCKED_CRITICAL: ::NTSTATUS = 0xC000036Bu32 as i32;
-pub const STATUS_DRIVER_BLOCKED: ::NTSTATUS = 0xC000036Cu32 as i32;
-pub const STATUS_DRIVER_DATABASE_ERROR: ::NTSTATUS = 0xC000036Du32 as i32;
-pub const STATUS_SYSTEM_HIVE_TOO_LARGE: ::NTSTATUS = 0xC000036Eu32 as i32;
-pub const STATUS_INVALID_IMPORT_OF_NON_DLL: ::NTSTATUS = 0xC000036Fu32 as i32;
-pub const STATUS_DS_SHUTTING_DOWN: ::NTSTATUS = 0x40000370;
-pub const STATUS_NO_SECRETS: ::NTSTATUS = 0xC0000371u32 as i32;
-pub const STATUS_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY: ::NTSTATUS = 0xC0000372u32 as i32;
-pub const STATUS_FAILED_STACK_SWITCH: ::NTSTATUS = 0xC0000373u32 as i32;
-pub const STATUS_HEAP_CORRUPTION: ::NTSTATUS = 0xC0000374u32 as i32;
-pub const STATUS_SMARTCARD_WRONG_PIN: ::NTSTATUS = 0xC0000380u32 as i32;
-pub const STATUS_SMARTCARD_CARD_BLOCKED: ::NTSTATUS = 0xC0000381u32 as i32;
-pub const STATUS_SMARTCARD_CARD_NOT_AUTHENTICATED: ::NTSTATUS = 0xC0000382u32 as i32;
-pub const STATUS_SMARTCARD_NO_CARD: ::NTSTATUS = 0xC0000383u32 as i32;
-pub const STATUS_SMARTCARD_NO_KEY_CONTAINER: ::NTSTATUS = 0xC0000384u32 as i32;
-pub const STATUS_SMARTCARD_NO_CERTIFICATE: ::NTSTATUS = 0xC0000385u32 as i32;
-pub const STATUS_SMARTCARD_NO_KEYSET: ::NTSTATUS = 0xC0000386u32 as i32;
-pub const STATUS_SMARTCARD_IO_ERROR: ::NTSTATUS = 0xC0000387u32 as i32;
-pub const STATUS_DOWNGRADE_DETECTED: ::NTSTATUS = 0xC0000388u32 as i32;
-pub const STATUS_SMARTCARD_CERT_REVOKED: ::NTSTATUS = 0xC0000389u32 as i32;
-pub const STATUS_ISSUING_CA_UNTRUSTED: ::NTSTATUS = 0xC000038Au32 as i32;
-pub const STATUS_REVOCATION_OFFLINE_C: ::NTSTATUS = 0xC000038Bu32 as i32;
-pub const STATUS_PKINIT_CLIENT_FAILURE: ::NTSTATUS = 0xC000038Cu32 as i32;
-pub const STATUS_SMARTCARD_CERT_EXPIRED: ::NTSTATUS = 0xC000038Du32 as i32;
-pub const STATUS_DRIVER_FAILED_PRIOR_UNLOAD: ::NTSTATUS = 0xC000038Eu32 as i32;
-pub const STATUS_SMARTCARD_SILENT_CONTEXT: ::NTSTATUS = 0xC000038Fu32 as i32;
-pub const STATUS_PER_USER_TRUST_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000401u32 as i32;
-pub const STATUS_ALL_USER_TRUST_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000402u32 as i32;
-pub const STATUS_USER_DELETE_TRUST_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000403u32 as i32;
-pub const STATUS_DS_NAME_NOT_UNIQUE: ::NTSTATUS = 0xC0000404u32 as i32;
-pub const STATUS_DS_DUPLICATE_ID_FOUND: ::NTSTATUS = 0xC0000405u32 as i32;
-pub const STATUS_DS_GROUP_CONVERSION_ERROR: ::NTSTATUS = 0xC0000406u32 as i32;
-pub const STATUS_VOLSNAP_PREPARE_HIBERNATE: ::NTSTATUS = 0xC0000407u32 as i32;
-pub const STATUS_USER2USER_REQUIRED: ::NTSTATUS = 0xC0000408u32 as i32;
-pub const STATUS_STACK_BUFFER_OVERRUN: ::NTSTATUS = 0xC0000409u32 as i32;
-pub const STATUS_NO_S4U_PROT_SUPPORT: ::NTSTATUS = 0xC000040Au32 as i32;
-pub const STATUS_CROSSREALM_DELEGATION_FAILURE: ::NTSTATUS = 0xC000040Bu32 as i32;
-pub const STATUS_REVOCATION_OFFLINE_KDC: ::NTSTATUS = 0xC000040Cu32 as i32;
-pub const STATUS_ISSUING_CA_UNTRUSTED_KDC: ::NTSTATUS = 0xC000040Du32 as i32;
-pub const STATUS_KDC_CERT_EXPIRED: ::NTSTATUS = 0xC000040Eu32 as i32;
-pub const STATUS_KDC_CERT_REVOKED: ::NTSTATUS = 0xC000040Fu32 as i32;
-pub const STATUS_PARAMETER_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000410u32 as i32;
-pub const STATUS_HIBERNATION_FAILURE: ::NTSTATUS = 0xC0000411u32 as i32;
-pub const STATUS_DELAY_LOAD_FAILED: ::NTSTATUS = 0xC0000412u32 as i32;
-pub const STATUS_AUTHENTICATION_FIREWALL_FAILED: ::NTSTATUS = 0xC0000413u32 as i32;
-pub const STATUS_VDM_DISALLOWED: ::NTSTATUS = 0xC0000414u32 as i32;
-pub const STATUS_HUNG_DISPLAY_DRIVER_THREAD: ::NTSTATUS = 0xC0000415u32 as i32;
-pub const STATUS_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE: ::NTSTATUS = 0xC0000416u32 as i32;
-pub const STATUS_INVALID_CRUNTIME_PARAMETER: ::NTSTATUS = 0xC0000417u32 as i32;
-pub const STATUS_NTLM_BLOCKED: ::NTSTATUS = 0xC0000418u32 as i32;
-pub const STATUS_DS_SRC_SID_EXISTS_IN_FOREST: ::NTSTATUS = 0xC0000419u32 as i32;
-pub const STATUS_DS_DOMAIN_NAME_EXISTS_IN_FOREST: ::NTSTATUS = 0xC000041Au32 as i32;
-pub const STATUS_DS_FLAT_NAME_EXISTS_IN_FOREST: ::NTSTATUS = 0xC000041Bu32 as i32;
-pub const STATUS_INVALID_USER_PRINCIPAL_NAME: ::NTSTATUS = 0xC000041Cu32 as i32;
-pub const STATUS_FATAL_USER_CALLBACK_EXCEPTION: ::NTSTATUS = 0xC000041Du32 as i32;
-pub const STATUS_ASSERTION_FAILURE: ::NTSTATUS = 0xC0000420u32 as i32;
-pub const STATUS_VERIFIER_STOP: ::NTSTATUS = 0xC0000421u32 as i32;
-pub const STATUS_CALLBACK_POP_STACK: ::NTSTATUS = 0xC0000423u32 as i32;
-pub const STATUS_INCOMPATIBLE_DRIVER_BLOCKED: ::NTSTATUS = 0xC0000424u32 as i32;
-pub const STATUS_HIVE_UNLOADED: ::NTSTATUS = 0xC0000425u32 as i32;
-pub const STATUS_COMPRESSION_DISABLED: ::NTSTATUS = 0xC0000426u32 as i32;
-pub const STATUS_FILE_SYSTEM_LIMITATION: ::NTSTATUS = 0xC0000427u32 as i32;
-pub const STATUS_INVALID_IMAGE_HASH: ::NTSTATUS = 0xC0000428u32 as i32;
-pub const STATUS_NOT_CAPABLE: ::NTSTATUS = 0xC0000429u32 as i32;
-pub const STATUS_REQUEST_OUT_OF_SEQUENCE: ::NTSTATUS = 0xC000042Au32 as i32;
-pub const STATUS_IMPLEMENTATION_LIMIT: ::NTSTATUS = 0xC000042Bu32 as i32;
-pub const STATUS_ELEVATION_REQUIRED: ::NTSTATUS = 0xC000042Cu32 as i32;
-pub const STATUS_NO_SECURITY_CONTEXT: ::NTSTATUS = 0xC000042Du32 as i32;
-pub const STATUS_PKU2U_CERT_FAILURE: ::NTSTATUS = 0xC000042Fu32 as i32;
-pub const STATUS_BEYOND_VDL: ::NTSTATUS = 0xC0000432u32 as i32;
-pub const STATUS_ENCOUNTERED_WRITE_IN_PROGRESS: ::NTSTATUS = 0xC0000433u32 as i32;
-pub const STATUS_PTE_CHANGED: ::NTSTATUS = 0xC0000434u32 as i32;
-pub const STATUS_PURGE_FAILED: ::NTSTATUS = 0xC0000435u32 as i32;
-pub const STATUS_CRED_REQUIRES_CONFIRMATION: ::NTSTATUS = 0xC0000440u32 as i32;
-pub const STATUS_CS_ENCRYPTION_INVALID_SERVER_RESPONSE: ::NTSTATUS = 0xC0000441u32 as i32;
-pub const STATUS_CS_ENCRYPTION_UNSUPPORTED_SERVER: ::NTSTATUS = 0xC0000442u32 as i32;
-pub const STATUS_CS_ENCRYPTION_EXISTING_ENCRYPTED_FILE: ::NTSTATUS = 0xC0000443u32 as i32;
-pub const STATUS_CS_ENCRYPTION_NEW_ENCRYPTED_FILE: ::NTSTATUS = 0xC0000444u32 as i32;
-pub const STATUS_CS_ENCRYPTION_FILE_NOT_CSE: ::NTSTATUS = 0xC0000445u32 as i32;
-pub const STATUS_INVALID_LABEL: ::NTSTATUS = 0xC0000446u32 as i32;
-pub const STATUS_DRIVER_PROCESS_TERMINATED: ::NTSTATUS = 0xC0000450u32 as i32;
-pub const STATUS_AMBIGUOUS_SYSTEM_DEVICE: ::NTSTATUS = 0xC0000451u32 as i32;
-pub const STATUS_SYSTEM_DEVICE_NOT_FOUND: ::NTSTATUS = 0xC0000452u32 as i32;
-pub const STATUS_RESTART_BOOT_APPLICATION: ::NTSTATUS = 0xC0000453u32 as i32;
-pub const STATUS_INSUFFICIENT_NVRAM_RESOURCES: ::NTSTATUS = 0xC0000454u32 as i32;
-pub const STATUS_INVALID_SESSION: ::NTSTATUS = 0xC0000455u32 as i32;
-pub const STATUS_THREAD_ALREADY_IN_SESSION: ::NTSTATUS = 0xC0000456u32 as i32;
-pub const STATUS_THREAD_NOT_IN_SESSION: ::NTSTATUS = 0xC0000457u32 as i32;
-pub const STATUS_INVALID_WEIGHT: ::NTSTATUS = 0xC0000458u32 as i32;
-pub const STATUS_REQUEST_PAUSED: ::NTSTATUS = 0xC0000459u32 as i32;
-pub const STATUS_NO_RANGES_PROCESSED: ::NTSTATUS = 0xC0000460u32 as i32;
-pub const STATUS_DISK_RESOURCES_EXHAUSTED: ::NTSTATUS = 0xC0000461u32 as i32;
-pub const STATUS_NEEDS_REMEDIATION: ::NTSTATUS = 0xC0000462u32 as i32;
-pub const STATUS_DEVICE_FEATURE_NOT_SUPPORTED: ::NTSTATUS = 0xC0000463u32 as i32;
-pub const STATUS_DEVICE_UNREACHABLE: ::NTSTATUS = 0xC0000464u32 as i32;
-pub const STATUS_INVALID_TOKEN: ::NTSTATUS = 0xC0000465u32 as i32;
-pub const STATUS_SERVER_UNAVAILABLE: ::NTSTATUS = 0xC0000466u32 as i32;
-pub const STATUS_FILE_NOT_AVAILABLE: ::NTSTATUS = 0xC0000467u32 as i32;
-pub const STATUS_DEVICE_INSUFFICIENT_RESOURCES: ::NTSTATUS = 0xC0000468u32 as i32;
-pub const STATUS_PACKAGE_UPDATING: ::NTSTATUS = 0xC0000469u32 as i32;
-pub const STATUS_NOT_READ_FROM_COPY: ::NTSTATUS = 0xC000046Au32 as i32;
-pub const STATUS_FT_WRITE_FAILURE: ::NTSTATUS = 0xC000046Bu32 as i32;
-pub const STATUS_FT_DI_SCAN_REQUIRED: ::NTSTATUS = 0xC000046Cu32 as i32;
-pub const STATUS_OBJECT_NOT_EXTERNALLY_BACKED: ::NTSTATUS = 0xC000046Du32 as i32;
-pub const STATUS_EXTERNAL_BACKING_PROVIDER_UNKNOWN: ::NTSTATUS = 0xC000046Eu32 as i32;
-pub const STATUS_COMPRESSION_NOT_BENEFICIAL: ::NTSTATUS = 0xC000046Fu32 as i32;
-pub const STATUS_DATA_CHECKSUM_ERROR: ::NTSTATUS = 0xC0000470u32 as i32;
-pub const STATUS_INTERMIXED_KERNEL_EA_OPERATION: ::NTSTATUS = 0xC0000471u32 as i32;
-pub const STATUS_TRIM_READ_ZERO_NOT_SUPPORTED: ::NTSTATUS = 0xC0000472u32 as i32;
-pub const STATUS_TOO_MANY_SEGMENT_DESCRIPTORS: ::NTSTATUS = 0xC0000473u32 as i32;
-pub const STATUS_INVALID_OFFSET_ALIGNMENT: ::NTSTATUS = 0xC0000474u32 as i32;
-pub const STATUS_INVALID_FIELD_IN_PARAMETER_LIST: ::NTSTATUS = 0xC0000475u32 as i32;
-pub const STATUS_OPERATION_IN_PROGRESS: ::NTSTATUS = 0xC0000476u32 as i32;
-pub const STATUS_INVALID_INITIATOR_TARGET_PATH: ::NTSTATUS = 0xC0000477u32 as i32;
-pub const STATUS_SCRUB_DATA_DISABLED: ::NTSTATUS = 0xC0000478u32 as i32;
-pub const STATUS_NOT_REDUNDANT_STORAGE: ::NTSTATUS = 0xC0000479u32 as i32;
-pub const STATUS_RESIDENT_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC000047Au32 as i32;
-pub const STATUS_COMPRESSED_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC000047Bu32 as i32;
-pub const STATUS_DIRECTORY_NOT_SUPPORTED: ::NTSTATUS = 0xC000047Cu32 as i32;
-pub const STATUS_IO_OPERATION_TIMEOUT: ::NTSTATUS = 0xC000047Du32 as i32;
-pub const STATUS_SYSTEM_NEEDS_REMEDIATION: ::NTSTATUS = 0xC000047Eu32 as i32;
-pub const STATUS_APPX_INTEGRITY_FAILURE_CLR_NGEN: ::NTSTATUS = 0xC000047Fu32 as i32;
-pub const STATUS_SHARE_UNAVAILABLE: ::NTSTATUS = 0xC0000480u32 as i32;
-pub const STATUS_APISET_NOT_HOSTED: ::NTSTATUS = 0xC0000481u32 as i32;
-pub const STATUS_APISET_NOT_PRESENT: ::NTSTATUS = 0xC0000482u32 as i32;
-pub const STATUS_DEVICE_HARDWARE_ERROR: ::NTSTATUS = 0xC0000483u32 as i32;
-pub const STATUS_FIRMWARE_SLOT_INVALID: ::NTSTATUS = 0xC0000484u32 as i32;
-pub const STATUS_FIRMWARE_IMAGE_INVALID: ::NTSTATUS = 0xC0000485u32 as i32;
-pub const STATUS_STORAGE_TOPOLOGY_ID_MISMATCH: ::NTSTATUS = 0xC0000486u32 as i32;
-pub const STATUS_WIM_NOT_BOOTABLE: ::NTSTATUS = 0xC0000487u32 as i32;
-pub const STATUS_BLOCKED_BY_PARENTAL_CONTROLS: ::NTSTATUS = 0xC0000488u32 as i32;
-pub const STATUS_NEEDS_REGISTRATION: ::NTSTATUS = 0xC0000489u32 as i32;
-pub const STATUS_QUOTA_ACTIVITY: ::NTSTATUS = 0xC000048Au32 as i32;
-pub const STATUS_INVALID_TASK_NAME: ::NTSTATUS = 0xC0000500u32 as i32;
-pub const STATUS_INVALID_TASK_INDEX: ::NTSTATUS = 0xC0000501u32 as i32;
-pub const STATUS_THREAD_ALREADY_IN_TASK: ::NTSTATUS = 0xC0000502u32 as i32;
-pub const STATUS_CALLBACK_BYPASS: ::NTSTATUS = 0xC0000503u32 as i32;
-pub const STATUS_UNDEFINED_SCOPE: ::NTSTATUS = 0xC0000504u32 as i32;
-pub const STATUS_INVALID_CAP: ::NTSTATUS = 0xC0000505u32 as i32;
-pub const STATUS_NOT_GUI_PROCESS: ::NTSTATUS = 0xC0000506u32 as i32;
-pub const STATUS_DEVICE_HUNG: ::NTSTATUS = 0xC0000507u32 as i32;
-pub const STATUS_FAIL_FAST_EXCEPTION: ::NTSTATUS = 0xC0000602u32 as i32;
-pub const STATUS_IMAGE_CERT_REVOKED: ::NTSTATUS = 0xC0000603u32 as i32;
-pub const STATUS_DYNAMIC_CODE_BLOCKED: ::NTSTATUS = 0xC0000604u32 as i32;
-pub const STATUS_IMAGE_CERT_EXPIRED: ::NTSTATUS = 0xC0000605u32 as i32;
-pub const STATUS_PORT_CLOSED: ::NTSTATUS = 0xC0000700u32 as i32;
-pub const STATUS_MESSAGE_LOST: ::NTSTATUS = 0xC0000701u32 as i32;
-pub const STATUS_INVALID_MESSAGE: ::NTSTATUS = 0xC0000702u32 as i32;
-pub const STATUS_REQUEST_CANCELED: ::NTSTATUS = 0xC0000703u32 as i32;
-pub const STATUS_RECURSIVE_DISPATCH: ::NTSTATUS = 0xC0000704u32 as i32;
-pub const STATUS_LPC_RECEIVE_BUFFER_EXPECTED: ::NTSTATUS = 0xC0000705u32 as i32;
-pub const STATUS_LPC_INVALID_CONNECTION_USAGE: ::NTSTATUS = 0xC0000706u32 as i32;
-pub const STATUS_LPC_REQUESTS_NOT_ALLOWED: ::NTSTATUS = 0xC0000707u32 as i32;
-pub const STATUS_RESOURCE_IN_USE: ::NTSTATUS = 0xC0000708u32 as i32;
-pub const STATUS_HARDWARE_MEMORY_ERROR: ::NTSTATUS = 0xC0000709u32 as i32;
-pub const STATUS_THREADPOOL_HANDLE_EXCEPTION: ::NTSTATUS = 0xC000070Au32 as i32;
-pub const STATUS_THREADPOOL_SET_EVENT_ON_COMPLETION_FAILED: ::NTSTATUS = 0xC000070Bu32 as i32;
-pub const STATUS_THREADPOOL_RELEASE_SEMAPHORE_ON_COMPLETION_FAILED: ::NTSTATUS = 0xC000070Cu32 as i32;
-pub const STATUS_THREADPOOL_RELEASE_MUTEX_ON_COMPLETION_FAILED: ::NTSTATUS = 0xC000070Du32 as i32;
-pub const STATUS_THREADPOOL_FREE_LIBRARY_ON_COMPLETION_FAILED: ::NTSTATUS = 0xC000070Eu32 as i32;
-pub const STATUS_THREADPOOL_RELEASED_DURING_OPERATION: ::NTSTATUS = 0xC000070Fu32 as i32;
-pub const STATUS_CALLBACK_RETURNED_WHILE_IMPERSONATING: ::NTSTATUS = 0xC0000710u32 as i32;
-pub const STATUS_APC_RETURNED_WHILE_IMPERSONATING: ::NTSTATUS = 0xC0000711u32 as i32;
-pub const STATUS_PROCESS_IS_PROTECTED: ::NTSTATUS = 0xC0000712u32 as i32;
-pub const STATUS_MCA_EXCEPTION: ::NTSTATUS = 0xC0000713u32 as i32;
-pub const STATUS_CERTIFICATE_MAPPING_NOT_UNIQUE: ::NTSTATUS = 0xC0000714u32 as i32;
-pub const STATUS_SYMLINK_CLASS_DISABLED: ::NTSTATUS = 0xC0000715u32 as i32;
-pub const STATUS_INVALID_IDN_NORMALIZATION: ::NTSTATUS = 0xC0000716u32 as i32;
-pub const STATUS_NO_UNICODE_TRANSLATION: ::NTSTATUS = 0xC0000717u32 as i32;
-pub const STATUS_ALREADY_REGISTERED: ::NTSTATUS = 0xC0000718u32 as i32;
-pub const STATUS_CONTEXT_MISMATCH: ::NTSTATUS = 0xC0000719u32 as i32;
-pub const STATUS_PORT_ALREADY_HAS_COMPLETION_LIST: ::NTSTATUS = 0xC000071Au32 as i32;
-pub const STATUS_CALLBACK_RETURNED_THREAD_PRIORITY: ::NTSTATUS = 0xC000071Bu32 as i32;
-pub const STATUS_INVALID_THREAD: ::NTSTATUS = 0xC000071Cu32 as i32;
-pub const STATUS_CALLBACK_RETURNED_TRANSACTION: ::NTSTATUS = 0xC000071Du32 as i32;
-pub const STATUS_CALLBACK_RETURNED_LDR_LOCK: ::NTSTATUS = 0xC000071Eu32 as i32;
-pub const STATUS_CALLBACK_RETURNED_LANG: ::NTSTATUS = 0xC000071Fu32 as i32;
-pub const STATUS_CALLBACK_RETURNED_PRI_BACK: ::NTSTATUS = 0xC0000720u32 as i32;
-pub const STATUS_CALLBACK_RETURNED_THREAD_AFFINITY: ::NTSTATUS = 0xC0000721u32 as i32;
-pub const STATUS_DISK_REPAIR_DISABLED: ::NTSTATUS = 0xC0000800u32 as i32;
-pub const STATUS_DS_DOMAIN_RENAME_IN_PROGRESS: ::NTSTATUS = 0xC0000801u32 as i32;
-pub const STATUS_DISK_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000802u32 as i32;
-pub const STATUS_DATA_LOST_REPAIR: ::NTSTATUS = 0x80000803u32 as i32;
-pub const STATUS_CONTENT_BLOCKED: ::NTSTATUS = 0xC0000804u32 as i32;
-pub const STATUS_BAD_CLUSTERS: ::NTSTATUS = 0xC0000805u32 as i32;
-pub const STATUS_VOLUME_DIRTY: ::NTSTATUS = 0xC0000806u32 as i32;
-pub const STATUS_DISK_REPAIR_REDIRECTED: ::NTSTATUS = 0x40000807;
-pub const STATUS_DISK_REPAIR_UNSUCCESSFUL: ::NTSTATUS = 0xC0000808u32 as i32;
-pub const STATUS_CORRUPT_LOG_OVERFULL: ::NTSTATUS = 0xC0000809u32 as i32;
-pub const STATUS_CORRUPT_LOG_CORRUPTED: ::NTSTATUS = 0xC000080Au32 as i32;
-pub const STATUS_CORRUPT_LOG_UNAVAILABLE: ::NTSTATUS = 0xC000080Bu32 as i32;
-pub const STATUS_CORRUPT_LOG_DELETED_FULL: ::NTSTATUS = 0xC000080Cu32 as i32;
-pub const STATUS_CORRUPT_LOG_CLEARED: ::NTSTATUS = 0xC000080Du32 as i32;
-pub const STATUS_ORPHAN_NAME_EXHAUSTED: ::NTSTATUS = 0xC000080Eu32 as i32;
-pub const STATUS_PROACTIVE_SCAN_IN_PROGRESS: ::NTSTATUS = 0xC000080Fu32 as i32;
-pub const STATUS_ENCRYPTED_IO_NOT_POSSIBLE: ::NTSTATUS = 0xC0000810u32 as i32;
-pub const STATUS_CORRUPT_LOG_UPLEVEL_RECORDS: ::NTSTATUS = 0xC0000811u32 as i32;
-pub const STATUS_FILE_CHECKED_OUT: ::NTSTATUS = 0xC0000901u32 as i32;
-pub const STATUS_CHECKOUT_REQUIRED: ::NTSTATUS = 0xC0000902u32 as i32;
-pub const STATUS_BAD_FILE_TYPE: ::NTSTATUS = 0xC0000903u32 as i32;
-pub const STATUS_FILE_TOO_LARGE: ::NTSTATUS = 0xC0000904u32 as i32;
-pub const STATUS_FORMS_AUTH_REQUIRED: ::NTSTATUS = 0xC0000905u32 as i32;
-pub const STATUS_VIRUS_INFECTED: ::NTSTATUS = 0xC0000906u32 as i32;
-pub const STATUS_VIRUS_DELETED: ::NTSTATUS = 0xC0000907u32 as i32;
-pub const STATUS_BAD_MCFG_TABLE: ::NTSTATUS = 0xC0000908u32 as i32;
-pub const STATUS_CANNOT_BREAK_OPLOCK: ::NTSTATUS = 0xC0000909u32 as i32;
-pub const STATUS_BAD_KEY: ::NTSTATUS = 0xC000090Au32 as i32;
-pub const STATUS_BAD_DATA: ::NTSTATUS = 0xC000090Bu32 as i32;
-pub const STATUS_NO_KEY: ::NTSTATUS = 0xC000090Cu32 as i32;
-pub const STATUS_FILE_HANDLE_REVOKED: ::NTSTATUS = 0xC0000910u32 as i32;
-pub const STATUS_WOW_ASSERTION: ::NTSTATUS = 0xC0009898u32 as i32;
-pub const STATUS_INVALID_SIGNATURE: ::NTSTATUS = 0xC000A000u32 as i32;
-pub const STATUS_HMAC_NOT_SUPPORTED: ::NTSTATUS = 0xC000A001u32 as i32;
-pub const STATUS_AUTH_TAG_MISMATCH: ::NTSTATUS = 0xC000A002u32 as i32;
-pub const STATUS_INVALID_STATE_TRANSITION: ::NTSTATUS = 0xC000A003u32 as i32;
-pub const STATUS_INVALID_KERNEL_INFO_VERSION: ::NTSTATUS = 0xC000A004u32 as i32;
-pub const STATUS_INVALID_PEP_INFO_VERSION: ::NTSTATUS = 0xC000A005u32 as i32;
-pub const STATUS_HANDLE_REVOKED: ::NTSTATUS = 0xC000A006u32 as i32;
-pub const STATUS_IPSEC_QUEUE_OVERFLOW: ::NTSTATUS = 0xC000A010u32 as i32;
-pub const STATUS_ND_QUEUE_OVERFLOW: ::NTSTATUS = 0xC000A011u32 as i32;
-pub const STATUS_HOPLIMIT_EXCEEDED: ::NTSTATUS = 0xC000A012u32 as i32;
-pub const STATUS_PROTOCOL_NOT_SUPPORTED: ::NTSTATUS = 0xC000A013u32 as i32;
-pub const STATUS_FASTPATH_REJECTED: ::NTSTATUS = 0xC000A014u32 as i32;
-pub const STATUS_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED: ::NTSTATUS = 0xC000A080u32 as i32;
-pub const STATUS_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR: ::NTSTATUS = 0xC000A081u32 as i32;
-pub const STATUS_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR: ::NTSTATUS = 0xC000A082u32 as i32;
-pub const STATUS_XML_PARSE_ERROR: ::NTSTATUS = 0xC000A083u32 as i32;
-pub const STATUS_XMLDSIG_ERROR: ::NTSTATUS = 0xC000A084u32 as i32;
-pub const STATUS_WRONG_COMPARTMENT: ::NTSTATUS = 0xC000A085u32 as i32;
-pub const STATUS_AUTHIP_FAILURE: ::NTSTATUS = 0xC000A086u32 as i32;
-pub const STATUS_DS_OID_MAPPED_GROUP_CANT_HAVE_MEMBERS: ::NTSTATUS = 0xC000A087u32 as i32;
-pub const STATUS_DS_OID_NOT_FOUND: ::NTSTATUS = 0xC000A088u32 as i32;
-pub const STATUS_INCORRECT_ACCOUNT_TYPE: ::NTSTATUS = 0xC000A089u32 as i32;
-pub const STATUS_HASH_NOT_SUPPORTED: ::NTSTATUS = 0xC000A100u32 as i32;
-pub const STATUS_HASH_NOT_PRESENT: ::NTSTATUS = 0xC000A101u32 as i32;
-pub const STATUS_SECONDARY_IC_PROVIDER_NOT_REGISTERED: ::NTSTATUS = 0xC000A121u32 as i32;
-pub const STATUS_GPIO_CLIENT_INFORMATION_INVALID: ::NTSTATUS = 0xC000A122u32 as i32;
-pub const STATUS_GPIO_VERSION_NOT_SUPPORTED: ::NTSTATUS = 0xC000A123u32 as i32;
-pub const STATUS_GPIO_INVALID_REGISTRATION_PACKET: ::NTSTATUS = 0xC000A124u32 as i32;
-pub const STATUS_GPIO_OPERATION_DENIED: ::NTSTATUS = 0xC000A125u32 as i32;
-pub const STATUS_GPIO_INCOMPATIBLE_CONNECT_MODE: ::NTSTATUS = 0xC000A126u32 as i32;
-pub const STATUS_GPIO_INTERRUPT_ALREADY_UNMASKED: ::NTSTATUS = 0x8000A127u32 as i32;
-pub const STATUS_CANNOT_SWITCH_RUNLEVEL: ::NTSTATUS = 0xC000A141u32 as i32;
-pub const STATUS_INVALID_RUNLEVEL_SETTING: ::NTSTATUS = 0xC000A142u32 as i32;
-pub const STATUS_RUNLEVEL_SWITCH_TIMEOUT: ::NTSTATUS = 0xC000A143u32 as i32;
-pub const STATUS_SERVICES_FAILED_AUTOSTART: ::NTSTATUS = 0x4000A144;
-pub const STATUS_RUNLEVEL_SWITCH_AGENT_TIMEOUT: ::NTSTATUS = 0xC000A145u32 as i32;
-pub const STATUS_RUNLEVEL_SWITCH_IN_PROGRESS: ::NTSTATUS = 0xC000A146u32 as i32;
-pub const STATUS_NOT_APPCONTAINER: ::NTSTATUS = 0xC000A200u32 as i32;
-pub const STATUS_NOT_SUPPORTED_IN_APPCONTAINER: ::NTSTATUS = 0xC000A201u32 as i32;
-pub const STATUS_INVALID_PACKAGE_SID_LENGTH: ::NTSTATUS = 0xC000A202u32 as i32;
-pub const STATUS_APP_DATA_NOT_FOUND: ::NTSTATUS = 0xC000A281u32 as i32;
-pub const STATUS_APP_DATA_EXPIRED: ::NTSTATUS = 0xC000A282u32 as i32;
-pub const STATUS_APP_DATA_CORRUPT: ::NTSTATUS = 0xC000A283u32 as i32;
-pub const STATUS_APP_DATA_LIMIT_EXCEEDED: ::NTSTATUS = 0xC000A284u32 as i32;
-pub const STATUS_APP_DATA_REBOOT_REQUIRED: ::NTSTATUS = 0xC000A285u32 as i32;
-pub const STATUS_OFFLOAD_READ_FLT_NOT_SUPPORTED: ::NTSTATUS = 0xC000A2A1u32 as i32;
-pub const STATUS_OFFLOAD_WRITE_FLT_NOT_SUPPORTED: ::NTSTATUS = 0xC000A2A2u32 as i32;
-pub const STATUS_OFFLOAD_READ_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC000A2A3u32 as i32;
-pub const STATUS_OFFLOAD_WRITE_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC000A2A4u32 as i32;
-pub const DBG_NO_STATE_CHANGE: ::NTSTATUS = 0xC0010001u32 as i32;
-pub const DBG_APP_NOT_IDLE: ::NTSTATUS = 0xC0010002u32 as i32;
-pub const RPC_NT_INVALID_STRING_BINDING: ::NTSTATUS = 0xC0020001u32 as i32;
-pub const RPC_NT_WRONG_KIND_OF_BINDING: ::NTSTATUS = 0xC0020002u32 as i32;
-pub const RPC_NT_INVALID_BINDING: ::NTSTATUS = 0xC0020003u32 as i32;
-pub const RPC_NT_PROTSEQ_NOT_SUPPORTED: ::NTSTATUS = 0xC0020004u32 as i32;
-pub const RPC_NT_INVALID_RPC_PROTSEQ: ::NTSTATUS = 0xC0020005u32 as i32;
-pub const RPC_NT_INVALID_STRING_UUID: ::NTSTATUS = 0xC0020006u32 as i32;
-pub const RPC_NT_INVALID_ENDPOINT_FORMAT: ::NTSTATUS = 0xC0020007u32 as i32;
-pub const RPC_NT_INVALID_NET_ADDR: ::NTSTATUS = 0xC0020008u32 as i32;
-pub const RPC_NT_NO_ENDPOINT_FOUND: ::NTSTATUS = 0xC0020009u32 as i32;
-pub const RPC_NT_INVALID_TIMEOUT: ::NTSTATUS = 0xC002000Au32 as i32;
-pub const RPC_NT_OBJECT_NOT_FOUND: ::NTSTATUS = 0xC002000Bu32 as i32;
-pub const RPC_NT_ALREADY_REGISTERED: ::NTSTATUS = 0xC002000Cu32 as i32;
-pub const RPC_NT_TYPE_ALREADY_REGISTERED: ::NTSTATUS = 0xC002000Du32 as i32;
-pub const RPC_NT_ALREADY_LISTENING: ::NTSTATUS = 0xC002000Eu32 as i32;
-pub const RPC_NT_NO_PROTSEQS_REGISTERED: ::NTSTATUS = 0xC002000Fu32 as i32;
-pub const RPC_NT_NOT_LISTENING: ::NTSTATUS = 0xC0020010u32 as i32;
-pub const RPC_NT_UNKNOWN_MGR_TYPE: ::NTSTATUS = 0xC0020011u32 as i32;
-pub const RPC_NT_UNKNOWN_IF: ::NTSTATUS = 0xC0020012u32 as i32;
-pub const RPC_NT_NO_BINDINGS: ::NTSTATUS = 0xC0020013u32 as i32;
-pub const RPC_NT_NO_PROTSEQS: ::NTSTATUS = 0xC0020014u32 as i32;
-pub const RPC_NT_CANT_CREATE_ENDPOINT: ::NTSTATUS = 0xC0020015u32 as i32;
-pub const RPC_NT_OUT_OF_RESOURCES: ::NTSTATUS = 0xC0020016u32 as i32;
-pub const RPC_NT_SERVER_UNAVAILABLE: ::NTSTATUS = 0xC0020017u32 as i32;
-pub const RPC_NT_SERVER_TOO_BUSY: ::NTSTATUS = 0xC0020018u32 as i32;
-pub const RPC_NT_INVALID_NETWORK_OPTIONS: ::NTSTATUS = 0xC0020019u32 as i32;
-pub const RPC_NT_NO_CALL_ACTIVE: ::NTSTATUS = 0xC002001Au32 as i32;
-pub const RPC_NT_CALL_FAILED: ::NTSTATUS = 0xC002001Bu32 as i32;
-pub const RPC_NT_CALL_FAILED_DNE: ::NTSTATUS = 0xC002001Cu32 as i32;
-pub const RPC_NT_PROTOCOL_ERROR: ::NTSTATUS = 0xC002001Du32 as i32;
-pub const RPC_NT_UNSUPPORTED_TRANS_SYN: ::NTSTATUS = 0xC002001Fu32 as i32;
-pub const RPC_NT_UNSUPPORTED_TYPE: ::NTSTATUS = 0xC0020021u32 as i32;
-pub const RPC_NT_INVALID_TAG: ::NTSTATUS = 0xC0020022u32 as i32;
-pub const RPC_NT_INVALID_BOUND: ::NTSTATUS = 0xC0020023u32 as i32;
-pub const RPC_NT_NO_ENTRY_NAME: ::NTSTATUS = 0xC0020024u32 as i32;
-pub const RPC_NT_INVALID_NAME_SYNTAX: ::NTSTATUS = 0xC0020025u32 as i32;
-pub const RPC_NT_UNSUPPORTED_NAME_SYNTAX: ::NTSTATUS = 0xC0020026u32 as i32;
-pub const RPC_NT_UUID_NO_ADDRESS: ::NTSTATUS = 0xC0020028u32 as i32;
-pub const RPC_NT_DUPLICATE_ENDPOINT: ::NTSTATUS = 0xC0020029u32 as i32;
-pub const RPC_NT_UNKNOWN_AUTHN_TYPE: ::NTSTATUS = 0xC002002Au32 as i32;
-pub const RPC_NT_MAX_CALLS_TOO_SMALL: ::NTSTATUS = 0xC002002Bu32 as i32;
-pub const RPC_NT_STRING_TOO_LONG: ::NTSTATUS = 0xC002002Cu32 as i32;
-pub const RPC_NT_PROTSEQ_NOT_FOUND: ::NTSTATUS = 0xC002002Du32 as i32;
-pub const RPC_NT_PROCNUM_OUT_OF_RANGE: ::NTSTATUS = 0xC002002Eu32 as i32;
-pub const RPC_NT_BINDING_HAS_NO_AUTH: ::NTSTATUS = 0xC002002Fu32 as i32;
-pub const RPC_NT_UNKNOWN_AUTHN_SERVICE: ::NTSTATUS = 0xC0020030u32 as i32;
-pub const RPC_NT_UNKNOWN_AUTHN_LEVEL: ::NTSTATUS = 0xC0020031u32 as i32;
-pub const RPC_NT_INVALID_AUTH_IDENTITY: ::NTSTATUS = 0xC0020032u32 as i32;
-pub const RPC_NT_UNKNOWN_AUTHZ_SERVICE: ::NTSTATUS = 0xC0020033u32 as i32;
-pub const EPT_NT_INVALID_ENTRY: ::NTSTATUS = 0xC0020034u32 as i32;
-pub const EPT_NT_CANT_PERFORM_OP: ::NTSTATUS = 0xC0020035u32 as i32;
-pub const EPT_NT_NOT_REGISTERED: ::NTSTATUS = 0xC0020036u32 as i32;
-pub const RPC_NT_NOTHING_TO_EXPORT: ::NTSTATUS = 0xC0020037u32 as i32;
-pub const RPC_NT_INCOMPLETE_NAME: ::NTSTATUS = 0xC0020038u32 as i32;
-pub const RPC_NT_INVALID_VERS_OPTION: ::NTSTATUS = 0xC0020039u32 as i32;
-pub const RPC_NT_NO_MORE_MEMBERS: ::NTSTATUS = 0xC002003Au32 as i32;
-pub const RPC_NT_NOT_ALL_OBJS_UNEXPORTED: ::NTSTATUS = 0xC002003Bu32 as i32;
-pub const RPC_NT_INTERFACE_NOT_FOUND: ::NTSTATUS = 0xC002003Cu32 as i32;
-pub const RPC_NT_ENTRY_ALREADY_EXISTS: ::NTSTATUS = 0xC002003Du32 as i32;
-pub const RPC_NT_ENTRY_NOT_FOUND: ::NTSTATUS = 0xC002003Eu32 as i32;
-pub const RPC_NT_NAME_SERVICE_UNAVAILABLE: ::NTSTATUS = 0xC002003Fu32 as i32;
-pub const RPC_NT_INVALID_NAF_ID: ::NTSTATUS = 0xC0020040u32 as i32;
-pub const RPC_NT_CANNOT_SUPPORT: ::NTSTATUS = 0xC0020041u32 as i32;
-pub const RPC_NT_NO_CONTEXT_AVAILABLE: ::NTSTATUS = 0xC0020042u32 as i32;
-pub const RPC_NT_INTERNAL_ERROR: ::NTSTATUS = 0xC0020043u32 as i32;
-pub const RPC_NT_ZERO_DIVIDE: ::NTSTATUS = 0xC0020044u32 as i32;
-pub const RPC_NT_ADDRESS_ERROR: ::NTSTATUS = 0xC0020045u32 as i32;
-pub const RPC_NT_FP_DIV_ZERO: ::NTSTATUS = 0xC0020046u32 as i32;
-pub const RPC_NT_FP_UNDERFLOW: ::NTSTATUS = 0xC0020047u32 as i32;
-pub const RPC_NT_FP_OVERFLOW: ::NTSTATUS = 0xC0020048u32 as i32;
-pub const RPC_NT_NO_MORE_ENTRIES: ::NTSTATUS = 0xC0030001u32 as i32;
-pub const RPC_NT_SS_CHAR_TRANS_OPEN_FAIL: ::NTSTATUS = 0xC0030002u32 as i32;
-pub const RPC_NT_SS_CHAR_TRANS_SHORT_FILE: ::NTSTATUS = 0xC0030003u32 as i32;
-pub const RPC_NT_SS_IN_NULL_CONTEXT: ::NTSTATUS = 0xC0030004u32 as i32;
-pub const RPC_NT_SS_CONTEXT_MISMATCH: ::NTSTATUS = 0xC0030005u32 as i32;
-pub const RPC_NT_SS_CONTEXT_DAMAGED: ::NTSTATUS = 0xC0030006u32 as i32;
-pub const RPC_NT_SS_HANDLES_MISMATCH: ::NTSTATUS = 0xC0030007u32 as i32;
-pub const RPC_NT_SS_CANNOT_GET_CALL_HANDLE: ::NTSTATUS = 0xC0030008u32 as i32;
-pub const RPC_NT_NULL_REF_POINTER: ::NTSTATUS = 0xC0030009u32 as i32;
-pub const RPC_NT_ENUM_VALUE_OUT_OF_RANGE: ::NTSTATUS = 0xC003000Au32 as i32;
-pub const RPC_NT_BYTE_COUNT_TOO_SMALL: ::NTSTATUS = 0xC003000Bu32 as i32;
-pub const RPC_NT_BAD_STUB_DATA: ::NTSTATUS = 0xC003000Cu32 as i32;
-pub const RPC_NT_CALL_IN_PROGRESS: ::NTSTATUS = 0xC0020049u32 as i32;
-pub const RPC_NT_NO_MORE_BINDINGS: ::NTSTATUS = 0xC002004Au32 as i32;
-pub const RPC_NT_GROUP_MEMBER_NOT_FOUND: ::NTSTATUS = 0xC002004Bu32 as i32;
-pub const EPT_NT_CANT_CREATE: ::NTSTATUS = 0xC002004Cu32 as i32;
-pub const RPC_NT_INVALID_OBJECT: ::NTSTATUS = 0xC002004Du32 as i32;
-pub const RPC_NT_NO_INTERFACES: ::NTSTATUS = 0xC002004Fu32 as i32;
-pub const RPC_NT_CALL_CANCELLED: ::NTSTATUS = 0xC0020050u32 as i32;
-pub const RPC_NT_BINDING_INCOMPLETE: ::NTSTATUS = 0xC0020051u32 as i32;
-pub const RPC_NT_COMM_FAILURE: ::NTSTATUS = 0xC0020052u32 as i32;
-pub const RPC_NT_UNSUPPORTED_AUTHN_LEVEL: ::NTSTATUS = 0xC0020053u32 as i32;
-pub const RPC_NT_NO_PRINC_NAME: ::NTSTATUS = 0xC0020054u32 as i32;
-pub const RPC_NT_NOT_RPC_ERROR: ::NTSTATUS = 0xC0020055u32 as i32;
-pub const RPC_NT_UUID_LOCAL_ONLY: ::NTSTATUS = 0x40020056;
-pub const RPC_NT_SEC_PKG_ERROR: ::NTSTATUS = 0xC0020057u32 as i32;
-pub const RPC_NT_NOT_CANCELLED: ::NTSTATUS = 0xC0020058u32 as i32;
-pub const RPC_NT_INVALID_ES_ACTION: ::NTSTATUS = 0xC0030059u32 as i32;
-pub const RPC_NT_WRONG_ES_VERSION: ::NTSTATUS = 0xC003005Au32 as i32;
-pub const RPC_NT_WRONG_STUB_VERSION: ::NTSTATUS = 0xC003005Bu32 as i32;
-pub const RPC_NT_INVALID_PIPE_OBJECT: ::NTSTATUS = 0xC003005Cu32 as i32;
-pub const RPC_NT_INVALID_PIPE_OPERATION: ::NTSTATUS = 0xC003005Du32 as i32;
-pub const RPC_NT_WRONG_PIPE_VERSION: ::NTSTATUS = 0xC003005Eu32 as i32;
-pub const RPC_NT_PIPE_CLOSED: ::NTSTATUS = 0xC003005Fu32 as i32;
-pub const RPC_NT_PIPE_DISCIPLINE_ERROR: ::NTSTATUS = 0xC0030060u32 as i32;
-pub const RPC_NT_PIPE_EMPTY: ::NTSTATUS = 0xC0030061u32 as i32;
-pub const RPC_NT_INVALID_ASYNC_HANDLE: ::NTSTATUS = 0xC0020062u32 as i32;
-pub const RPC_NT_INVALID_ASYNC_CALL: ::NTSTATUS = 0xC0020063u32 as i32;
-pub const RPC_NT_PROXY_ACCESS_DENIED: ::NTSTATUS = 0xC0020064u32 as i32;
-pub const RPC_NT_COOKIE_AUTH_FAILED: ::NTSTATUS = 0xC0020065u32 as i32;
-pub const RPC_NT_SEND_INCOMPLETE: ::NTSTATUS = 0x400200AF;
-pub const STATUS_ACPI_INVALID_OPCODE: ::NTSTATUS = 0xC0140001u32 as i32;
-pub const STATUS_ACPI_STACK_OVERFLOW: ::NTSTATUS = 0xC0140002u32 as i32;
-pub const STATUS_ACPI_ASSERT_FAILED: ::NTSTATUS = 0xC0140003u32 as i32;
-pub const STATUS_ACPI_INVALID_INDEX: ::NTSTATUS = 0xC0140004u32 as i32;
-pub const STATUS_ACPI_INVALID_ARGUMENT: ::NTSTATUS = 0xC0140005u32 as i32;
-pub const STATUS_ACPI_FATAL: ::NTSTATUS = 0xC0140006u32 as i32;
-pub const STATUS_ACPI_INVALID_SUPERNAME: ::NTSTATUS = 0xC0140007u32 as i32;
-pub const STATUS_ACPI_INVALID_ARGTYPE: ::NTSTATUS = 0xC0140008u32 as i32;
-pub const STATUS_ACPI_INVALID_OBJTYPE: ::NTSTATUS = 0xC0140009u32 as i32;
-pub const STATUS_ACPI_INVALID_TARGETTYPE: ::NTSTATUS = 0xC014000Au32 as i32;
-pub const STATUS_ACPI_INCORRECT_ARGUMENT_COUNT: ::NTSTATUS = 0xC014000Bu32 as i32;
-pub const STATUS_ACPI_ADDRESS_NOT_MAPPED: ::NTSTATUS = 0xC014000Cu32 as i32;
-pub const STATUS_ACPI_INVALID_EVENTTYPE: ::NTSTATUS = 0xC014000Du32 as i32;
-pub const STATUS_ACPI_HANDLER_COLLISION: ::NTSTATUS = 0xC014000Eu32 as i32;
-pub const STATUS_ACPI_INVALID_DATA: ::NTSTATUS = 0xC014000Fu32 as i32;
-pub const STATUS_ACPI_INVALID_REGION: ::NTSTATUS = 0xC0140010u32 as i32;
-pub const STATUS_ACPI_INVALID_ACCESS_SIZE: ::NTSTATUS = 0xC0140011u32 as i32;
-pub const STATUS_ACPI_ACQUIRE_GLOBAL_LOCK: ::NTSTATUS = 0xC0140012u32 as i32;
-pub const STATUS_ACPI_ALREADY_INITIALIZED: ::NTSTATUS = 0xC0140013u32 as i32;
-pub const STATUS_ACPI_NOT_INITIALIZED: ::NTSTATUS = 0xC0140014u32 as i32;
-pub const STATUS_ACPI_INVALID_MUTEX_LEVEL: ::NTSTATUS = 0xC0140015u32 as i32;
-pub const STATUS_ACPI_MUTEX_NOT_OWNED: ::NTSTATUS = 0xC0140016u32 as i32;
-pub const STATUS_ACPI_MUTEX_NOT_OWNER: ::NTSTATUS = 0xC0140017u32 as i32;
-pub const STATUS_ACPI_RS_ACCESS: ::NTSTATUS = 0xC0140018u32 as i32;
-pub const STATUS_ACPI_INVALID_TABLE: ::NTSTATUS = 0xC0140019u32 as i32;
-pub const STATUS_ACPI_REG_HANDLER_FAILED: ::NTSTATUS = 0xC0140020u32 as i32;
-pub const STATUS_ACPI_POWER_REQUEST_FAILED: ::NTSTATUS = 0xC0140021u32 as i32;
-pub const STATUS_CTX_WINSTATION_NAME_INVALID: ::NTSTATUS = 0xC00A0001u32 as i32;
-pub const STATUS_CTX_INVALID_PD: ::NTSTATUS = 0xC00A0002u32 as i32;
-pub const STATUS_CTX_PD_NOT_FOUND: ::NTSTATUS = 0xC00A0003u32 as i32;
-pub const STATUS_CTX_CDM_CONNECT: ::NTSTATUS = 0x400A0004;
-pub const STATUS_CTX_CDM_DISCONNECT: ::NTSTATUS = 0x400A0005;
-pub const STATUS_CTX_CLOSE_PENDING: ::NTSTATUS = 0xC00A0006u32 as i32;
-pub const STATUS_CTX_NO_OUTBUF: ::NTSTATUS = 0xC00A0007u32 as i32;
-pub const STATUS_CTX_MODEM_INF_NOT_FOUND: ::NTSTATUS = 0xC00A0008u32 as i32;
-pub const STATUS_CTX_INVALID_MODEMNAME: ::NTSTATUS = 0xC00A0009u32 as i32;
-pub const STATUS_CTX_RESPONSE_ERROR: ::NTSTATUS = 0xC00A000Au32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_TIMEOUT: ::NTSTATUS = 0xC00A000Bu32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_NO_CARRIER: ::NTSTATUS = 0xC00A000Cu32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_NO_DIALTONE: ::NTSTATUS = 0xC00A000Du32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_BUSY: ::NTSTATUS = 0xC00A000Eu32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_VOICE: ::NTSTATUS = 0xC00A000Fu32 as i32;
-pub const STATUS_CTX_TD_ERROR: ::NTSTATUS = 0xC00A0010u32 as i32;
-pub const STATUS_CTX_LICENSE_CLIENT_INVALID: ::NTSTATUS = 0xC00A0012u32 as i32;
-pub const STATUS_CTX_LICENSE_NOT_AVAILABLE: ::NTSTATUS = 0xC00A0013u32 as i32;
-pub const STATUS_CTX_LICENSE_EXPIRED: ::NTSTATUS = 0xC00A0014u32 as i32;
-pub const STATUS_CTX_WINSTATION_NOT_FOUND: ::NTSTATUS = 0xC00A0015u32 as i32;
-pub const STATUS_CTX_WINSTATION_NAME_COLLISION: ::NTSTATUS = 0xC00A0016u32 as i32;
-pub const STATUS_CTX_WINSTATION_BUSY: ::NTSTATUS = 0xC00A0017u32 as i32;
-pub const STATUS_CTX_BAD_VIDEO_MODE: ::NTSTATUS = 0xC00A0018u32 as i32;
-pub const STATUS_CTX_GRAPHICS_INVALID: ::NTSTATUS = 0xC00A0022u32 as i32;
-pub const STATUS_CTX_NOT_CONSOLE: ::NTSTATUS = 0xC00A0024u32 as i32;
-pub const STATUS_CTX_CLIENT_QUERY_TIMEOUT: ::NTSTATUS = 0xC00A0026u32 as i32;
-pub const STATUS_CTX_CONSOLE_DISCONNECT: ::NTSTATUS = 0xC00A0027u32 as i32;
-pub const STATUS_CTX_CONSOLE_CONNECT: ::NTSTATUS = 0xC00A0028u32 as i32;
-pub const STATUS_CTX_SHADOW_DENIED: ::NTSTATUS = 0xC00A002Au32 as i32;
-pub const STATUS_CTX_WINSTATION_ACCESS_DENIED: ::NTSTATUS = 0xC00A002Bu32 as i32;
-pub const STATUS_CTX_INVALID_WD: ::NTSTATUS = 0xC00A002Eu32 as i32;
-pub const STATUS_CTX_WD_NOT_FOUND: ::NTSTATUS = 0xC00A002Fu32 as i32;
-pub const STATUS_CTX_SHADOW_INVALID: ::NTSTATUS = 0xC00A0030u32 as i32;
-pub const STATUS_CTX_SHADOW_DISABLED: ::NTSTATUS = 0xC00A0031u32 as i32;
-pub const STATUS_RDP_PROTOCOL_ERROR: ::NTSTATUS = 0xC00A0032u32 as i32;
-pub const STATUS_CTX_CLIENT_LICENSE_NOT_SET: ::NTSTATUS = 0xC00A0033u32 as i32;
-pub const STATUS_CTX_CLIENT_LICENSE_IN_USE: ::NTSTATUS = 0xC00A0034u32 as i32;
-pub const STATUS_CTX_SHADOW_ENDED_BY_MODE_CHANGE: ::NTSTATUS = 0xC00A0035u32 as i32;
-pub const STATUS_CTX_SHADOW_NOT_RUNNING: ::NTSTATUS = 0xC00A0036u32 as i32;
-pub const STATUS_CTX_LOGON_DISABLED: ::NTSTATUS = 0xC00A0037u32 as i32;
-pub const STATUS_CTX_SECURITY_LAYER_ERROR: ::NTSTATUS = 0xC00A0038u32 as i32;
-pub const STATUS_TS_INCOMPATIBLE_SESSIONS: ::NTSTATUS = 0xC00A0039u32 as i32;
-pub const STATUS_TS_VIDEO_SUBSYSTEM_ERROR: ::NTSTATUS = 0xC00A003Au32 as i32;
-pub const STATUS_PNP_BAD_MPS_TABLE: ::NTSTATUS = 0xC0040035u32 as i32;
-pub const STATUS_PNP_TRANSLATION_FAILED: ::NTSTATUS = 0xC0040036u32 as i32;
-pub const STATUS_PNP_IRQ_TRANSLATION_FAILED: ::NTSTATUS = 0xC0040037u32 as i32;
-pub const STATUS_PNP_INVALID_ID: ::NTSTATUS = 0xC0040038u32 as i32;
-pub const STATUS_IO_REISSUE_AS_CACHED: ::NTSTATUS = 0xC0040039u32 as i32;
-pub const STATUS_MUI_FILE_NOT_FOUND: ::NTSTATUS = 0xC00B0001u32 as i32;
-pub const STATUS_MUI_INVALID_FILE: ::NTSTATUS = 0xC00B0002u32 as i32;
-pub const STATUS_MUI_INVALID_RC_CONFIG: ::NTSTATUS = 0xC00B0003u32 as i32;
-pub const STATUS_MUI_INVALID_LOCALE_NAME: ::NTSTATUS = 0xC00B0004u32 as i32;
-pub const STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME: ::NTSTATUS = 0xC00B0005u32 as i32;
-pub const STATUS_MUI_FILE_NOT_LOADED: ::NTSTATUS = 0xC00B0006u32 as i32;
-pub const STATUS_RESOURCE_ENUM_USER_STOP: ::NTSTATUS = 0xC00B0007u32 as i32;
-pub const STATUS_FLT_NO_HANDLER_DEFINED: ::NTSTATUS = 0xC01C0001u32 as i32;
-pub const STATUS_FLT_CONTEXT_ALREADY_DEFINED: ::NTSTATUS = 0xC01C0002u32 as i32;
-pub const STATUS_FLT_INVALID_ASYNCHRONOUS_REQUEST: ::NTSTATUS = 0xC01C0003u32 as i32;
-pub const STATUS_FLT_DISALLOW_FAST_IO: ::NTSTATUS = 0xC01C0004u32 as i32;
-pub const STATUS_FLT_INVALID_NAME_REQUEST: ::NTSTATUS = 0xC01C0005u32 as i32;
-pub const STATUS_FLT_NOT_SAFE_TO_POST_OPERATION: ::NTSTATUS = 0xC01C0006u32 as i32;
-pub const STATUS_FLT_NOT_INITIALIZED: ::NTSTATUS = 0xC01C0007u32 as i32;
-pub const STATUS_FLT_FILTER_NOT_READY: ::NTSTATUS = 0xC01C0008u32 as i32;
-pub const STATUS_FLT_POST_OPERATION_CLEANUP: ::NTSTATUS = 0xC01C0009u32 as i32;
-pub const STATUS_FLT_INTERNAL_ERROR: ::NTSTATUS = 0xC01C000Au32 as i32;
-pub const STATUS_FLT_DELETING_OBJECT: ::NTSTATUS = 0xC01C000Bu32 as i32;
-pub const STATUS_FLT_MUST_BE_NONPAGED_POOL: ::NTSTATUS = 0xC01C000Cu32 as i32;
-pub const STATUS_FLT_DUPLICATE_ENTRY: ::NTSTATUS = 0xC01C000Du32 as i32;
-pub const STATUS_FLT_CBDQ_DISABLED: ::NTSTATUS = 0xC01C000Eu32 as i32;
-pub const STATUS_FLT_DO_NOT_ATTACH: ::NTSTATUS = 0xC01C000Fu32 as i32;
-pub const STATUS_FLT_DO_NOT_DETACH: ::NTSTATUS = 0xC01C0010u32 as i32;
-pub const STATUS_FLT_INSTANCE_ALTITUDE_COLLISION: ::NTSTATUS = 0xC01C0011u32 as i32;
-pub const STATUS_FLT_INSTANCE_NAME_COLLISION: ::NTSTATUS = 0xC01C0012u32 as i32;
-pub const STATUS_FLT_FILTER_NOT_FOUND: ::NTSTATUS = 0xC01C0013u32 as i32;
-pub const STATUS_FLT_VOLUME_NOT_FOUND: ::NTSTATUS = 0xC01C0014u32 as i32;
-pub const STATUS_FLT_INSTANCE_NOT_FOUND: ::NTSTATUS = 0xC01C0015u32 as i32;
-pub const STATUS_FLT_CONTEXT_ALLOCATION_NOT_FOUND: ::NTSTATUS = 0xC01C0016u32 as i32;
-pub const STATUS_FLT_INVALID_CONTEXT_REGISTRATION: ::NTSTATUS = 0xC01C0017u32 as i32;
-pub const STATUS_FLT_NAME_CACHE_MISS: ::NTSTATUS = 0xC01C0018u32 as i32;
-pub const STATUS_FLT_NO_DEVICE_OBJECT: ::NTSTATUS = 0xC01C0019u32 as i32;
-pub const STATUS_FLT_VOLUME_ALREADY_MOUNTED: ::NTSTATUS = 0xC01C001Au32 as i32;
-pub const STATUS_FLT_ALREADY_ENLISTED: ::NTSTATUS = 0xC01C001Bu32 as i32;
-pub const STATUS_FLT_CONTEXT_ALREADY_LINKED: ::NTSTATUS = 0xC01C001Cu32 as i32;
-pub const STATUS_FLT_NO_WAITER_FOR_REPLY: ::NTSTATUS = 0xC01C0020u32 as i32;
-pub const STATUS_FLT_REGISTRATION_BUSY: ::NTSTATUS = 0xC01C0023u32 as i32;
-pub const STATUS_SXS_SECTION_NOT_FOUND: ::NTSTATUS = 0xC0150001u32 as i32;
-pub const STATUS_SXS_CANT_GEN_ACTCTX: ::NTSTATUS = 0xC0150002u32 as i32;
-pub const STATUS_SXS_INVALID_ACTCTXDATA_FORMAT: ::NTSTATUS = 0xC0150003u32 as i32;
-pub const STATUS_SXS_ASSEMBLY_NOT_FOUND: ::NTSTATUS = 0xC0150004u32 as i32;
-pub const STATUS_SXS_MANIFEST_FORMAT_ERROR: ::NTSTATUS = 0xC0150005u32 as i32;
-pub const STATUS_SXS_MANIFEST_PARSE_ERROR: ::NTSTATUS = 0xC0150006u32 as i32;
-pub const STATUS_SXS_ACTIVATION_CONTEXT_DISABLED: ::NTSTATUS = 0xC0150007u32 as i32;
-pub const STATUS_SXS_KEY_NOT_FOUND: ::NTSTATUS = 0xC0150008u32 as i32;
-pub const STATUS_SXS_VERSION_CONFLICT: ::NTSTATUS = 0xC0150009u32 as i32;
-pub const STATUS_SXS_WRONG_SECTION_TYPE: ::NTSTATUS = 0xC015000Au32 as i32;
-pub const STATUS_SXS_THREAD_QUERIES_DISABLED: ::NTSTATUS = 0xC015000Bu32 as i32;
-pub const STATUS_SXS_ASSEMBLY_MISSING: ::NTSTATUS = 0xC015000Cu32 as i32;
-pub const STATUS_SXS_RELEASE_ACTIVATION_CONTEXT: ::NTSTATUS = 0x4015000D;
-pub const STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET: ::NTSTATUS = 0xC015000Eu32 as i32;
-pub const STATUS_SXS_EARLY_DEACTIVATION: ::NTSTATUS = 0xC015000Fu32 as i32;
-pub const STATUS_SXS_INVALID_DEACTIVATION: ::NTSTATUS = 0xC0150010u32 as i32;
-pub const STATUS_SXS_MULTIPLE_DEACTIVATION: ::NTSTATUS = 0xC0150011u32 as i32;
-pub const STATUS_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY: ::NTSTATUS = 0xC0150012u32 as i32;
-pub const STATUS_SXS_PROCESS_TERMINATION_REQUESTED: ::NTSTATUS = 0xC0150013u32 as i32;
-pub const STATUS_SXS_CORRUPT_ACTIVATION_STACK: ::NTSTATUS = 0xC0150014u32 as i32;
-pub const STATUS_SXS_CORRUPTION: ::NTSTATUS = 0xC0150015u32 as i32;
-pub const STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE: ::NTSTATUS = 0xC0150016u32 as i32;
-pub const STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME: ::NTSTATUS = 0xC0150017u32 as i32;
-pub const STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE: ::NTSTATUS = 0xC0150018u32 as i32;
-pub const STATUS_SXS_IDENTITY_PARSE_ERROR: ::NTSTATUS = 0xC0150019u32 as i32;
-pub const STATUS_SXS_COMPONENT_STORE_CORRUPT: ::NTSTATUS = 0xC015001Au32 as i32;
-pub const STATUS_SXS_FILE_HASH_MISMATCH: ::NTSTATUS = 0xC015001Bu32 as i32;
-pub const STATUS_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT: ::NTSTATUS = 0xC015001Cu32 as i32;
-pub const STATUS_SXS_IDENTITIES_DIFFERENT: ::NTSTATUS = 0xC015001Du32 as i32;
-pub const STATUS_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT: ::NTSTATUS = 0xC015001Eu32 as i32;
-pub const STATUS_SXS_FILE_NOT_PART_OF_ASSEMBLY: ::NTSTATUS = 0xC015001Fu32 as i32;
-pub const STATUS_ADVANCED_INSTALLER_FAILED: ::NTSTATUS = 0xC0150020u32 as i32;
-pub const STATUS_XML_ENCODING_MISMATCH: ::NTSTATUS = 0xC0150021u32 as i32;
-pub const STATUS_SXS_MANIFEST_TOO_BIG: ::NTSTATUS = 0xC0150022u32 as i32;
-pub const STATUS_SXS_SETTING_NOT_REGISTERED: ::NTSTATUS = 0xC0150023u32 as i32;
-pub const STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE: ::NTSTATUS = 0xC0150024u32 as i32;
-pub const STATUS_SMI_PRIMITIVE_INSTALLER_FAILED: ::NTSTATUS = 0xC0150025u32 as i32;
-pub const STATUS_GENERIC_COMMAND_FAILED: ::NTSTATUS = 0xC0150026u32 as i32;
-pub const STATUS_SXS_FILE_HASH_MISSING: ::NTSTATUS = 0xC0150027u32 as i32;
-pub const STATUS_CLUSTER_INVALID_NODE: ::NTSTATUS = 0xC0130001u32 as i32;
-pub const STATUS_CLUSTER_NODE_EXISTS: ::NTSTATUS = 0xC0130002u32 as i32;
-pub const STATUS_CLUSTER_JOIN_IN_PROGRESS: ::NTSTATUS = 0xC0130003u32 as i32;
-pub const STATUS_CLUSTER_NODE_NOT_FOUND: ::NTSTATUS = 0xC0130004u32 as i32;
-pub const STATUS_CLUSTER_LOCAL_NODE_NOT_FOUND: ::NTSTATUS = 0xC0130005u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_EXISTS: ::NTSTATUS = 0xC0130006u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_NOT_FOUND: ::NTSTATUS = 0xC0130007u32 as i32;
-pub const STATUS_CLUSTER_NETINTERFACE_EXISTS: ::NTSTATUS = 0xC0130008u32 as i32;
-pub const STATUS_CLUSTER_NETINTERFACE_NOT_FOUND: ::NTSTATUS = 0xC0130009u32 as i32;
-pub const STATUS_CLUSTER_INVALID_REQUEST: ::NTSTATUS = 0xC013000Au32 as i32;
-pub const STATUS_CLUSTER_INVALID_NETWORK_PROVIDER: ::NTSTATUS = 0xC013000Bu32 as i32;
-pub const STATUS_CLUSTER_NODE_DOWN: ::NTSTATUS = 0xC013000Cu32 as i32;
-pub const STATUS_CLUSTER_NODE_UNREACHABLE: ::NTSTATUS = 0xC013000Du32 as i32;
-pub const STATUS_CLUSTER_NODE_NOT_MEMBER: ::NTSTATUS = 0xC013000Eu32 as i32;
-pub const STATUS_CLUSTER_JOIN_NOT_IN_PROGRESS: ::NTSTATUS = 0xC013000Fu32 as i32;
-pub const STATUS_CLUSTER_INVALID_NETWORK: ::NTSTATUS = 0xC0130010u32 as i32;
-pub const STATUS_CLUSTER_NO_NET_ADAPTERS: ::NTSTATUS = 0xC0130011u32 as i32;
-pub const STATUS_CLUSTER_NODE_UP: ::NTSTATUS = 0xC0130012u32 as i32;
-pub const STATUS_CLUSTER_NODE_PAUSED: ::NTSTATUS = 0xC0130013u32 as i32;
-pub const STATUS_CLUSTER_NODE_NOT_PAUSED: ::NTSTATUS = 0xC0130014u32 as i32;
-pub const STATUS_CLUSTER_NO_SECURITY_CONTEXT: ::NTSTATUS = 0xC0130015u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_NOT_INTERNAL: ::NTSTATUS = 0xC0130016u32 as i32;
-pub const STATUS_CLUSTER_POISONED: ::NTSTATUS = 0xC0130017u32 as i32;
-pub const STATUS_CLUSTER_NON_CSV_PATH: ::NTSTATUS = 0xC0130018u32 as i32;
-pub const STATUS_CLUSTER_CSV_VOLUME_NOT_LOCAL: ::NTSTATUS = 0xC0130019u32 as i32;
-pub const STATUS_CLUSTER_CSV_READ_OPLOCK_BREAK_IN_PROGRESS: ::NTSTATUS = 0xC0130020u32 as i32;
-pub const STATUS_CLUSTER_CSV_AUTO_PAUSE_ERROR: ::NTSTATUS = 0xC0130021u32 as i32;
-pub const STATUS_CLUSTER_CSV_REDIRECTED: ::NTSTATUS = 0xC0130022u32 as i32;
-pub const STATUS_CLUSTER_CSV_NOT_REDIRECTED: ::NTSTATUS = 0xC0130023u32 as i32;
-pub const STATUS_CLUSTER_CSV_VOLUME_DRAINING: ::NTSTATUS = 0xC0130024u32 as i32;
-pub const STATUS_CLUSTER_CSV_SNAPSHOT_CREATION_IN_PROGRESS: ::NTSTATUS = 0xC0130025u32 as i32;
-pub const STATUS_CLUSTER_CSV_VOLUME_DRAINING_SUCCEEDED_DOWNLEVEL: ::NTSTATUS = 0xC0130026u32 as i32;
-pub const STATUS_CLUSTER_CSV_NO_SNAPSHOTS: ::NTSTATUS = 0xC0130027u32 as i32;
-pub const STATUS_CSV_IO_PAUSE_TIMEOUT: ::NTSTATUS = 0xC0130028u32 as i32;
-pub const STATUS_TRANSACTIONAL_CONFLICT: ::NTSTATUS = 0xC0190001u32 as i32;
-pub const STATUS_INVALID_TRANSACTION: ::NTSTATUS = 0xC0190002u32 as i32;
-pub const STATUS_TRANSACTION_NOT_ACTIVE: ::NTSTATUS = 0xC0190003u32 as i32;
-pub const STATUS_TM_INITIALIZATION_FAILED: ::NTSTATUS = 0xC0190004u32 as i32;
-pub const STATUS_RM_NOT_ACTIVE: ::NTSTATUS = 0xC0190005u32 as i32;
-pub const STATUS_RM_METADATA_CORRUPT: ::NTSTATUS = 0xC0190006u32 as i32;
-pub const STATUS_TRANSACTION_NOT_JOINED: ::NTSTATUS = 0xC0190007u32 as i32;
-pub const STATUS_DIRECTORY_NOT_RM: ::NTSTATUS = 0xC0190008u32 as i32;
-pub const STATUS_COULD_NOT_RESIZE_LOG: ::NTSTATUS = 0x80190009u32 as i32;
-pub const STATUS_TRANSACTIONS_UNSUPPORTED_REMOTE: ::NTSTATUS = 0xC019000Au32 as i32;
-pub const STATUS_LOG_RESIZE_INVALID_SIZE: ::NTSTATUS = 0xC019000Bu32 as i32;
-pub const STATUS_REMOTE_FILE_VERSION_MISMATCH: ::NTSTATUS = 0xC019000Cu32 as i32;
-pub const STATUS_CRM_PROTOCOL_ALREADY_EXISTS: ::NTSTATUS = 0xC019000Fu32 as i32;
-pub const STATUS_TRANSACTION_PROPAGATION_FAILED: ::NTSTATUS = 0xC0190010u32 as i32;
-pub const STATUS_CRM_PROTOCOL_NOT_FOUND: ::NTSTATUS = 0xC0190011u32 as i32;
-pub const STATUS_TRANSACTION_SUPERIOR_EXISTS: ::NTSTATUS = 0xC0190012u32 as i32;
-pub const STATUS_TRANSACTION_REQUEST_NOT_VALID: ::NTSTATUS = 0xC0190013u32 as i32;
-pub const STATUS_TRANSACTION_NOT_REQUESTED: ::NTSTATUS = 0xC0190014u32 as i32;
-pub const STATUS_TRANSACTION_ALREADY_ABORTED: ::NTSTATUS = 0xC0190015u32 as i32;
-pub const STATUS_TRANSACTION_ALREADY_COMMITTED: ::NTSTATUS = 0xC0190016u32 as i32;
-pub const STATUS_TRANSACTION_INVALID_MARSHALL_BUFFER: ::NTSTATUS = 0xC0190017u32 as i32;
-pub const STATUS_CURRENT_TRANSACTION_NOT_VALID: ::NTSTATUS = 0xC0190018u32 as i32;
-pub const STATUS_LOG_GROWTH_FAILED: ::NTSTATUS = 0xC0190019u32 as i32;
-pub const STATUS_OBJECT_NO_LONGER_EXISTS: ::NTSTATUS = 0xC0190021u32 as i32;
-pub const STATUS_STREAM_MINIVERSION_NOT_FOUND: ::NTSTATUS = 0xC0190022u32 as i32;
-pub const STATUS_STREAM_MINIVERSION_NOT_VALID: ::NTSTATUS = 0xC0190023u32 as i32;
-pub const STATUS_MINIVERSION_INACCESSIBLE_FROM_SPECIFIED_TRANSACTION: ::NTSTATUS = 0xC0190024u32 as i32;
-pub const STATUS_CANT_OPEN_MINIVERSION_WITH_MODIFY_INTENT: ::NTSTATUS = 0xC0190025u32 as i32;
-pub const STATUS_CANT_CREATE_MORE_STREAM_MINIVERSIONS: ::NTSTATUS = 0xC0190026u32 as i32;
-pub const STATUS_HANDLE_NO_LONGER_VALID: ::NTSTATUS = 0xC0190028u32 as i32;
-pub const STATUS_NO_TXF_METADATA: ::NTSTATUS = 0x80190029u32 as i32;
-pub const STATUS_LOG_CORRUPTION_DETECTED: ::NTSTATUS = 0xC0190030u32 as i32;
-pub const STATUS_CANT_RECOVER_WITH_HANDLE_OPEN: ::NTSTATUS = 0x80190031u32 as i32;
-pub const STATUS_RM_DISCONNECTED: ::NTSTATUS = 0xC0190032u32 as i32;
-pub const STATUS_ENLISTMENT_NOT_SUPERIOR: ::NTSTATUS = 0xC0190033u32 as i32;
-pub const STATUS_RECOVERY_NOT_NEEDED: ::NTSTATUS = 0x40190034;
-pub const STATUS_RM_ALREADY_STARTED: ::NTSTATUS = 0x40190035;
-pub const STATUS_FILE_IDENTITY_NOT_PERSISTENT: ::NTSTATUS = 0xC0190036u32 as i32;
-pub const STATUS_CANT_BREAK_TRANSACTIONAL_DEPENDENCY: ::NTSTATUS = 0xC0190037u32 as i32;
-pub const STATUS_CANT_CROSS_RM_BOUNDARY: ::NTSTATUS = 0xC0190038u32 as i32;
-pub const STATUS_TXF_DIR_NOT_EMPTY: ::NTSTATUS = 0xC0190039u32 as i32;
-pub const STATUS_INDOUBT_TRANSACTIONS_EXIST: ::NTSTATUS = 0xC019003Au32 as i32;
-pub const STATUS_TM_VOLATILE: ::NTSTATUS = 0xC019003Bu32 as i32;
-pub const STATUS_ROLLBACK_TIMER_EXPIRED: ::NTSTATUS = 0xC019003Cu32 as i32;
-pub const STATUS_TXF_ATTRIBUTE_CORRUPT: ::NTSTATUS = 0xC019003Du32 as i32;
-pub const STATUS_EFS_NOT_ALLOWED_IN_TRANSACTION: ::NTSTATUS = 0xC019003Eu32 as i32;
-pub const STATUS_TRANSACTIONAL_OPEN_NOT_ALLOWED: ::NTSTATUS = 0xC019003Fu32 as i32;
-pub const STATUS_TRANSACTED_MAPPING_UNSUPPORTED_REMOTE: ::NTSTATUS = 0xC0190040u32 as i32;
-pub const STATUS_TXF_METADATA_ALREADY_PRESENT: ::NTSTATUS = 0x80190041u32 as i32;
-pub const STATUS_TRANSACTION_SCOPE_CALLBACKS_NOT_SET: ::NTSTATUS = 0x80190042u32 as i32;
-pub const STATUS_TRANSACTION_REQUIRED_PROMOTION: ::NTSTATUS = 0xC0190043u32 as i32;
-pub const STATUS_CANNOT_EXECUTE_FILE_IN_TRANSACTION: ::NTSTATUS = 0xC0190044u32 as i32;
-pub const STATUS_TRANSACTIONS_NOT_FROZEN: ::NTSTATUS = 0xC0190045u32 as i32;
-pub const STATUS_TRANSACTION_FREEZE_IN_PROGRESS: ::NTSTATUS = 0xC0190046u32 as i32;
-pub const STATUS_NOT_SNAPSHOT_VOLUME: ::NTSTATUS = 0xC0190047u32 as i32;
-pub const STATUS_NO_SAVEPOINT_WITH_OPEN_FILES: ::NTSTATUS = 0xC0190048u32 as i32;
-pub const STATUS_SPARSE_NOT_ALLOWED_IN_TRANSACTION: ::NTSTATUS = 0xC0190049u32 as i32;
-pub const STATUS_TM_IDENTITY_MISMATCH: ::NTSTATUS = 0xC019004Au32 as i32;
-pub const STATUS_FLOATED_SECTION: ::NTSTATUS = 0xC019004Bu32 as i32;
-pub const STATUS_CANNOT_ACCEPT_TRANSACTED_WORK: ::NTSTATUS = 0xC019004Cu32 as i32;
-pub const STATUS_CANNOT_ABORT_TRANSACTIONS: ::NTSTATUS = 0xC019004Du32 as i32;
-pub const STATUS_TRANSACTION_NOT_FOUND: ::NTSTATUS = 0xC019004Eu32 as i32;
-pub const STATUS_RESOURCEMANAGER_NOT_FOUND: ::NTSTATUS = 0xC019004Fu32 as i32;
-pub const STATUS_ENLISTMENT_NOT_FOUND: ::NTSTATUS = 0xC0190050u32 as i32;
-pub const STATUS_TRANSACTIONMANAGER_NOT_FOUND: ::NTSTATUS = 0xC0190051u32 as i32;
-pub const STATUS_TRANSACTIONMANAGER_NOT_ONLINE: ::NTSTATUS = 0xC0190052u32 as i32;
-pub const STATUS_TRANSACTIONMANAGER_RECOVERY_NAME_COLLISION: ::NTSTATUS = 0xC0190053u32 as i32;
-pub const STATUS_TRANSACTION_NOT_ROOT: ::NTSTATUS = 0xC0190054u32 as i32;
-pub const STATUS_TRANSACTION_OBJECT_EXPIRED: ::NTSTATUS = 0xC0190055u32 as i32;
-pub const STATUS_COMPRESSION_NOT_ALLOWED_IN_TRANSACTION: ::NTSTATUS = 0xC0190056u32 as i32;
-pub const STATUS_TRANSACTION_RESPONSE_NOT_ENLISTED: ::NTSTATUS = 0xC0190057u32 as i32;
-pub const STATUS_TRANSACTION_RECORD_TOO_LONG: ::NTSTATUS = 0xC0190058u32 as i32;
-pub const STATUS_NO_LINK_TRACKING_IN_TRANSACTION: ::NTSTATUS = 0xC0190059u32 as i32;
-pub const STATUS_OPERATION_NOT_SUPPORTED_IN_TRANSACTION: ::NTSTATUS = 0xC019005Au32 as i32;
-pub const STATUS_TRANSACTION_INTEGRITY_VIOLATED: ::NTSTATUS = 0xC019005Bu32 as i32;
-pub const STATUS_TRANSACTIONMANAGER_IDENTITY_MISMATCH: ::NTSTATUS = 0xC019005Cu32 as i32;
-pub const STATUS_RM_CANNOT_BE_FROZEN_FOR_SNAPSHOT: ::NTSTATUS = 0xC019005Du32 as i32;
-pub const STATUS_TRANSACTION_MUST_WRITETHROUGH: ::NTSTATUS = 0xC019005Eu32 as i32;
-pub const STATUS_TRANSACTION_NO_SUPERIOR: ::NTSTATUS = 0xC019005Fu32 as i32;
-pub const STATUS_EXPIRED_HANDLE: ::NTSTATUS = 0xC0190060u32 as i32;
-pub const STATUS_TRANSACTION_NOT_ENLISTED: ::NTSTATUS = 0xC0190061u32 as i32;
-pub const STATUS_LOG_SECTOR_INVALID: ::NTSTATUS = 0xC01A0001u32 as i32;
-pub const STATUS_LOG_SECTOR_PARITY_INVALID: ::NTSTATUS = 0xC01A0002u32 as i32;
-pub const STATUS_LOG_SECTOR_REMAPPED: ::NTSTATUS = 0xC01A0003u32 as i32;
-pub const STATUS_LOG_BLOCK_INCOMPLETE: ::NTSTATUS = 0xC01A0004u32 as i32;
-pub const STATUS_LOG_INVALID_RANGE: ::NTSTATUS = 0xC01A0005u32 as i32;
-pub const STATUS_LOG_BLOCKS_EXHAUSTED: ::NTSTATUS = 0xC01A0006u32 as i32;
-pub const STATUS_LOG_READ_CONTEXT_INVALID: ::NTSTATUS = 0xC01A0007u32 as i32;
-pub const STATUS_LOG_RESTART_INVALID: ::NTSTATUS = 0xC01A0008u32 as i32;
-pub const STATUS_LOG_BLOCK_VERSION: ::NTSTATUS = 0xC01A0009u32 as i32;
-pub const STATUS_LOG_BLOCK_INVALID: ::NTSTATUS = 0xC01A000Au32 as i32;
-pub const STATUS_LOG_READ_MODE_INVALID: ::NTSTATUS = 0xC01A000Bu32 as i32;
-pub const STATUS_LOG_NO_RESTART: ::NTSTATUS = 0x401A000C;
-pub const STATUS_LOG_METADATA_CORRUPT: ::NTSTATUS = 0xC01A000Du32 as i32;
-pub const STATUS_LOG_METADATA_INVALID: ::NTSTATUS = 0xC01A000Eu32 as i32;
-pub const STATUS_LOG_METADATA_INCONSISTENT: ::NTSTATUS = 0xC01A000Fu32 as i32;
-pub const STATUS_LOG_RESERVATION_INVALID: ::NTSTATUS = 0xC01A0010u32 as i32;
-pub const STATUS_LOG_CANT_DELETE: ::NTSTATUS = 0xC01A0011u32 as i32;
-pub const STATUS_LOG_CONTAINER_LIMIT_EXCEEDED: ::NTSTATUS = 0xC01A0012u32 as i32;
-pub const STATUS_LOG_START_OF_LOG: ::NTSTATUS = 0xC01A0013u32 as i32;
-pub const STATUS_LOG_POLICY_ALREADY_INSTALLED: ::NTSTATUS = 0xC01A0014u32 as i32;
-pub const STATUS_LOG_POLICY_NOT_INSTALLED: ::NTSTATUS = 0xC01A0015u32 as i32;
-pub const STATUS_LOG_POLICY_INVALID: ::NTSTATUS = 0xC01A0016u32 as i32;
-pub const STATUS_LOG_POLICY_CONFLICT: ::NTSTATUS = 0xC01A0017u32 as i32;
-pub const STATUS_LOG_PINNED_ARCHIVE_TAIL: ::NTSTATUS = 0xC01A0018u32 as i32;
-pub const STATUS_LOG_RECORD_NONEXISTENT: ::NTSTATUS = 0xC01A0019u32 as i32;
-pub const STATUS_LOG_RECORDS_RESERVED_INVALID: ::NTSTATUS = 0xC01A001Au32 as i32;
-pub const STATUS_LOG_SPACE_RESERVED_INVALID: ::NTSTATUS = 0xC01A001Bu32 as i32;
-pub const STATUS_LOG_TAIL_INVALID: ::NTSTATUS = 0xC01A001Cu32 as i32;
-pub const STATUS_LOG_FULL: ::NTSTATUS = 0xC01A001Du32 as i32;
-pub const STATUS_LOG_MULTIPLEXED: ::NTSTATUS = 0xC01A001Eu32 as i32;
-pub const STATUS_LOG_DEDICATED: ::NTSTATUS = 0xC01A001Fu32 as i32;
-pub const STATUS_LOG_ARCHIVE_NOT_IN_PROGRESS: ::NTSTATUS = 0xC01A0020u32 as i32;
-pub const STATUS_LOG_ARCHIVE_IN_PROGRESS: ::NTSTATUS = 0xC01A0021u32 as i32;
-pub const STATUS_LOG_EPHEMERAL: ::NTSTATUS = 0xC01A0022u32 as i32;
-pub const STATUS_LOG_NOT_ENOUGH_CONTAINERS: ::NTSTATUS = 0xC01A0023u32 as i32;
-pub const STATUS_LOG_CLIENT_ALREADY_REGISTERED: ::NTSTATUS = 0xC01A0024u32 as i32;
-pub const STATUS_LOG_CLIENT_NOT_REGISTERED: ::NTSTATUS = 0xC01A0025u32 as i32;
-pub const STATUS_LOG_FULL_HANDLER_IN_PROGRESS: ::NTSTATUS = 0xC01A0026u32 as i32;
-pub const STATUS_LOG_CONTAINER_READ_FAILED: ::NTSTATUS = 0xC01A0027u32 as i32;
-pub const STATUS_LOG_CONTAINER_WRITE_FAILED: ::NTSTATUS = 0xC01A0028u32 as i32;
-pub const STATUS_LOG_CONTAINER_OPEN_FAILED: ::NTSTATUS = 0xC01A0029u32 as i32;
-pub const STATUS_LOG_CONTAINER_STATE_INVALID: ::NTSTATUS = 0xC01A002Au32 as i32;
-pub const STATUS_LOG_STATE_INVALID: ::NTSTATUS = 0xC01A002Bu32 as i32;
-pub const STATUS_LOG_PINNED: ::NTSTATUS = 0xC01A002Cu32 as i32;
-pub const STATUS_LOG_METADATA_FLUSH_FAILED: ::NTSTATUS = 0xC01A002Du32 as i32;
-pub const STATUS_LOG_INCONSISTENT_SECURITY: ::NTSTATUS = 0xC01A002Eu32 as i32;
-pub const STATUS_LOG_APPENDED_FLUSH_FAILED: ::NTSTATUS = 0xC01A002Fu32 as i32;
-pub const STATUS_LOG_PINNED_RESERVATION: ::NTSTATUS = 0xC01A0030u32 as i32;
-pub const STATUS_VIDEO_HUNG_DISPLAY_DRIVER_THREAD: ::NTSTATUS = 0xC01B00EAu32 as i32;
-pub const STATUS_VIDEO_HUNG_DISPLAY_DRIVER_THREAD_RECOVERED: ::NTSTATUS = 0x801B00EBu32 as i32;
-pub const STATUS_VIDEO_DRIVER_DEBUG_REPORT_REQUEST: ::NTSTATUS = 0x401B00EC;
-pub const STATUS_MONITOR_NO_DESCRIPTOR: ::NTSTATUS = 0xC01D0001u32 as i32;
-pub const STATUS_MONITOR_UNKNOWN_DESCRIPTOR_FORMAT: ::NTSTATUS = 0xC01D0002u32 as i32;
-pub const STATUS_MONITOR_INVALID_DESCRIPTOR_CHECKSUM: ::NTSTATUS = 0xC01D0003u32 as i32;
-pub const STATUS_MONITOR_INVALID_STANDARD_TIMING_BLOCK: ::NTSTATUS = 0xC01D0004u32 as i32;
-pub const STATUS_MONITOR_WMI_DATABLOCK_REGISTRATION_FAILED: ::NTSTATUS = 0xC01D0005u32 as i32;
-pub const STATUS_MONITOR_INVALID_SERIAL_NUMBER_MONDSC_BLOCK: ::NTSTATUS = 0xC01D0006u32 as i32;
-pub const STATUS_MONITOR_INVALID_USER_FRIENDLY_MONDSC_BLOCK: ::NTSTATUS = 0xC01D0007u32 as i32;
-pub const STATUS_MONITOR_NO_MORE_DESCRIPTOR_DATA: ::NTSTATUS = 0xC01D0008u32 as i32;
-pub const STATUS_MONITOR_INVALID_DETAILED_TIMING_BLOCK: ::NTSTATUS = 0xC01D0009u32 as i32;
-pub const STATUS_MONITOR_INVALID_MANUFACTURE_DATE: ::NTSTATUS = 0xC01D000Au32 as i32;
-pub const STATUS_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER: ::NTSTATUS = 0xC01E0000u32 as i32;
-pub const STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER: ::NTSTATUS = 0xC01E0001u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_DISPLAY_ADAPTER: ::NTSTATUS = 0xC01E0002u32 as i32;
-pub const STATUS_GRAPHICS_ADAPTER_WAS_RESET: ::NTSTATUS = 0xC01E0003u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_DRIVER_MODEL: ::NTSTATUS = 0xC01E0004u32 as i32;
-pub const STATUS_GRAPHICS_PRESENT_MODE_CHANGED: ::NTSTATUS = 0xC01E0005u32 as i32;
-pub const STATUS_GRAPHICS_PRESENT_OCCLUDED: ::NTSTATUS = 0xC01E0006u32 as i32;
-pub const STATUS_GRAPHICS_PRESENT_DENIED: ::NTSTATUS = 0xC01E0007u32 as i32;
-pub const STATUS_GRAPHICS_CANNOTCOLORCONVERT: ::NTSTATUS = 0xC01E0008u32 as i32;
-pub const STATUS_GRAPHICS_DRIVER_MISMATCH: ::NTSTATUS = 0xC01E0009u32 as i32;
-pub const STATUS_GRAPHICS_PARTIAL_DATA_POPULATED: ::NTSTATUS = 0x401E000A;
-pub const STATUS_GRAPHICS_PRESENT_REDIRECTION_DISABLED: ::NTSTATUS = 0xC01E000Bu32 as i32;
-pub const STATUS_GRAPHICS_PRESENT_UNOCCLUDED: ::NTSTATUS = 0xC01E000Cu32 as i32;
-pub const STATUS_GRAPHICS_WINDOWDC_NOT_AVAILABLE: ::NTSTATUS = 0xC01E000Du32 as i32;
-pub const STATUS_GRAPHICS_WINDOWLESS_PRESENT_DISABLED: ::NTSTATUS = 0xC01E000Eu32 as i32;
-pub const STATUS_GRAPHICS_NO_VIDEO_MEMORY: ::NTSTATUS = 0xC01E0100u32 as i32;
-pub const STATUS_GRAPHICS_CANT_LOCK_MEMORY: ::NTSTATUS = 0xC01E0101u32 as i32;
-pub const STATUS_GRAPHICS_ALLOCATION_BUSY: ::NTSTATUS = 0xC01E0102u32 as i32;
-pub const STATUS_GRAPHICS_TOO_MANY_REFERENCES: ::NTSTATUS = 0xC01E0103u32 as i32;
-pub const STATUS_GRAPHICS_TRY_AGAIN_LATER: ::NTSTATUS = 0xC01E0104u32 as i32;
-pub const STATUS_GRAPHICS_TRY_AGAIN_NOW: ::NTSTATUS = 0xC01E0105u32 as i32;
-pub const STATUS_GRAPHICS_ALLOCATION_INVALID: ::NTSTATUS = 0xC01E0106u32 as i32;
-pub const STATUS_GRAPHICS_UNSWIZZLING_APERTURE_UNAVAILABLE: ::NTSTATUS = 0xC01E0107u32 as i32;
-pub const STATUS_GRAPHICS_UNSWIZZLING_APERTURE_UNSUPPORTED: ::NTSTATUS = 0xC01E0108u32 as i32;
-pub const STATUS_GRAPHICS_CANT_EVICT_PINNED_ALLOCATION: ::NTSTATUS = 0xC01E0109u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_ALLOCATION_USAGE: ::NTSTATUS = 0xC01E0110u32 as i32;
-pub const STATUS_GRAPHICS_CANT_RENDER_LOCKED_ALLOCATION: ::NTSTATUS = 0xC01E0111u32 as i32;
-pub const STATUS_GRAPHICS_ALLOCATION_CLOSED: ::NTSTATUS = 0xC01E0112u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_ALLOCATION_INSTANCE: ::NTSTATUS = 0xC01E0113u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_ALLOCATION_HANDLE: ::NTSTATUS = 0xC01E0114u32 as i32;
-pub const STATUS_GRAPHICS_WRONG_ALLOCATION_DEVICE: ::NTSTATUS = 0xC01E0115u32 as i32;
-pub const STATUS_GRAPHICS_ALLOCATION_CONTENT_LOST: ::NTSTATUS = 0xC01E0116u32 as i32;
-pub const STATUS_GRAPHICS_GPU_EXCEPTION_ON_DEVICE: ::NTSTATUS = 0xC01E0200u32 as i32;
-pub const STATUS_GRAPHICS_SKIP_ALLOCATION_PREPARATION: ::NTSTATUS = 0x401E0201;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_TOPOLOGY: ::NTSTATUS = 0xC01E0300u32 as i32;
-pub const STATUS_GRAPHICS_VIDPN_TOPOLOGY_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0301u32 as i32;
-pub const STATUS_GRAPHICS_VIDPN_TOPOLOGY_CURRENTLY_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0302u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDPN: ::NTSTATUS = 0xC01E0303u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE: ::NTSTATUS = 0xC01E0304u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET: ::NTSTATUS = 0xC01E0305u32 as i32;
-pub const STATUS_GRAPHICS_VIDPN_MODALITY_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0306u32 as i32;
-pub const STATUS_GRAPHICS_MODE_NOT_PINNED: ::NTSTATUS = 0x401E0307;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_SOURCEMODESET: ::NTSTATUS = 0xC01E0308u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_TARGETMODESET: ::NTSTATUS = 0xC01E0309u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_FREQUENCY: ::NTSTATUS = 0xC01E030Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_ACTIVE_REGION: ::NTSTATUS = 0xC01E030Bu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_TOTAL_REGION: ::NTSTATUS = 0xC01E030Cu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE_MODE: ::NTSTATUS = 0xC01E0310u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET_MODE: ::NTSTATUS = 0xC01E0311u32 as i32;
-pub const STATUS_GRAPHICS_PINNED_MODE_MUST_REMAIN_IN_SET: ::NTSTATUS = 0xC01E0312u32 as i32;
-pub const STATUS_GRAPHICS_PATH_ALREADY_IN_TOPOLOGY: ::NTSTATUS = 0xC01E0313u32 as i32;
-pub const STATUS_GRAPHICS_MODE_ALREADY_IN_MODESET: ::NTSTATUS = 0xC01E0314u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEOPRESENTSOURCESET: ::NTSTATUS = 0xC01E0315u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEOPRESENTTARGETSET: ::NTSTATUS = 0xC01E0316u32 as i32;
-pub const STATUS_GRAPHICS_SOURCE_ALREADY_IN_SET: ::NTSTATUS = 0xC01E0317u32 as i32;
-pub const STATUS_GRAPHICS_TARGET_ALREADY_IN_SET: ::NTSTATUS = 0xC01E0318u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_PRESENT_PATH: ::NTSTATUS = 0xC01E0319u32 as i32;
-pub const STATUS_GRAPHICS_NO_RECOMMENDED_VIDPN_TOPOLOGY: ::NTSTATUS = 0xC01E031Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGESET: ::NTSTATUS = 0xC01E031Bu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE: ::NTSTATUS = 0xC01E031Cu32 as i32;
-pub const STATUS_GRAPHICS_FREQUENCYRANGE_NOT_IN_SET: ::NTSTATUS = 0xC01E031Du32 as i32;
-pub const STATUS_GRAPHICS_NO_PREFERRED_MODE: ::NTSTATUS = 0x401E031E;
-pub const STATUS_GRAPHICS_FREQUENCYRANGE_ALREADY_IN_SET: ::NTSTATUS = 0xC01E031Fu32 as i32;
-pub const STATUS_GRAPHICS_STALE_MODESET: ::NTSTATUS = 0xC01E0320u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_SOURCEMODESET: ::NTSTATUS = 0xC01E0321u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_SOURCE_MODE: ::NTSTATUS = 0xC01E0322u32 as i32;
-pub const STATUS_GRAPHICS_NO_RECOMMENDED_FUNCTIONAL_VIDPN: ::NTSTATUS = 0xC01E0323u32 as i32;
-pub const STATUS_GRAPHICS_MODE_ID_MUST_BE_UNIQUE: ::NTSTATUS = 0xC01E0324u32 as i32;
-pub const STATUS_GRAPHICS_EMPTY_ADAPTER_MONITOR_MODE_SUPPORT_INTERSECTION: ::NTSTATUS = 0xC01E0325u32 as i32;
-pub const STATUS_GRAPHICS_VIDEO_PRESENT_TARGETS_LESS_THAN_SOURCES: ::NTSTATUS = 0xC01E0326u32 as i32;
-pub const STATUS_GRAPHICS_PATH_NOT_IN_TOPOLOGY: ::NTSTATUS = 0xC01E0327u32 as i32;
-pub const STATUS_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_SOURCE: ::NTSTATUS = 0xC01E0328u32 as i32;
-pub const STATUS_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_TARGET: ::NTSTATUS = 0xC01E0329u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITORDESCRIPTORSET: ::NTSTATUS = 0xC01E032Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITORDESCRIPTOR: ::NTSTATUS = 0xC01E032Bu32 as i32;
-pub const STATUS_GRAPHICS_MONITORDESCRIPTOR_NOT_IN_SET: ::NTSTATUS = 0xC01E032Cu32 as i32;
-pub const STATUS_GRAPHICS_MONITORDESCRIPTOR_ALREADY_IN_SET: ::NTSTATUS = 0xC01E032Du32 as i32;
-pub const STATUS_GRAPHICS_MONITORDESCRIPTOR_ID_MUST_BE_UNIQUE: ::NTSTATUS = 0xC01E032Eu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_TARGET_SUBSET_TYPE: ::NTSTATUS = 0xC01E032Fu32 as i32;
-pub const STATUS_GRAPHICS_RESOURCES_NOT_RELATED: ::NTSTATUS = 0xC01E0330u32 as i32;
-pub const STATUS_GRAPHICS_SOURCE_ID_MUST_BE_UNIQUE: ::NTSTATUS = 0xC01E0331u32 as i32;
-pub const STATUS_GRAPHICS_TARGET_ID_MUST_BE_UNIQUE: ::NTSTATUS = 0xC01E0332u32 as i32;
-pub const STATUS_GRAPHICS_NO_AVAILABLE_VIDPN_TARGET: ::NTSTATUS = 0xC01E0333u32 as i32;
-pub const STATUS_GRAPHICS_MONITOR_COULD_NOT_BE_ASSOCIATED_WITH_ADAPTER: ::NTSTATUS = 0xC01E0334u32 as i32;
-pub const STATUS_GRAPHICS_NO_VIDPNMGR: ::NTSTATUS = 0xC01E0335u32 as i32;
-pub const STATUS_GRAPHICS_NO_ACTIVE_VIDPN: ::NTSTATUS = 0xC01E0336u32 as i32;
-pub const STATUS_GRAPHICS_STALE_VIDPN_TOPOLOGY: ::NTSTATUS = 0xC01E0337u32 as i32;
-pub const STATUS_GRAPHICS_MONITOR_NOT_CONNECTED: ::NTSTATUS = 0xC01E0338u32 as i32;
-pub const STATUS_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY: ::NTSTATUS = 0xC01E0339u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PRIMARYSURFACE_SIZE: ::NTSTATUS = 0xC01E033Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VISIBLEREGION_SIZE: ::NTSTATUS = 0xC01E033Bu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_STRIDE: ::NTSTATUS = 0xC01E033Cu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PIXELFORMAT: ::NTSTATUS = 0xC01E033Du32 as i32;
-pub const STATUS_GRAPHICS_INVALID_COLORBASIS: ::NTSTATUS = 0xC01E033Eu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PIXELVALUEACCESSMODE: ::NTSTATUS = 0xC01E033Fu32 as i32;
-pub const STATUS_GRAPHICS_TARGET_NOT_IN_TOPOLOGY: ::NTSTATUS = 0xC01E0340u32 as i32;
-pub const STATUS_GRAPHICS_NO_DISPLAY_MODE_MANAGEMENT_SUPPORT: ::NTSTATUS = 0xC01E0341u32 as i32;
-pub const STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE: ::NTSTATUS = 0xC01E0342u32 as i32;
-pub const STATUS_GRAPHICS_CANT_ACCESS_ACTIVE_VIDPN: ::NTSTATUS = 0xC01E0343u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PATH_IMPORTANCE_ORDINAL: ::NTSTATUS = 0xC01E0344u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PATH_CONTENT_GEOMETRY_TRANSFORMATION: ::NTSTATUS = 0xC01E0345u32 as i32;
-pub const STATUS_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0346u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_GAMMA_RAMP: ::NTSTATUS = 0xC01E0347u32 as i32;
-pub const STATUS_GRAPHICS_GAMMA_RAMP_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0348u32 as i32;
-pub const STATUS_GRAPHICS_MULTISAMPLING_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0349u32 as i32;
-pub const STATUS_GRAPHICS_MODE_NOT_IN_MODESET: ::NTSTATUS = 0xC01E034Au32 as i32;
-pub const STATUS_GRAPHICS_DATASET_IS_EMPTY: ::NTSTATUS = 0x401E034B;
-pub const STATUS_GRAPHICS_NO_MORE_ELEMENTS_IN_DATASET: ::NTSTATUS = 0x401E034C;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_TOPOLOGY_RECOMMENDATION_REASON: ::NTSTATUS = 0xC01E034Du32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PATH_CONTENT_TYPE: ::NTSTATUS = 0xC01E034Eu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_COPYPROTECTION_TYPE: ::NTSTATUS = 0xC01E034Fu32 as i32;
-pub const STATUS_GRAPHICS_UNASSIGNED_MODESET_ALREADY_EXISTS: ::NTSTATUS = 0xC01E0350u32 as i32;
-pub const STATUS_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_PINNED: ::NTSTATUS = 0x401E0351;
-pub const STATUS_GRAPHICS_INVALID_SCANLINE_ORDERING: ::NTSTATUS = 0xC01E0352u32 as i32;
-pub const STATUS_GRAPHICS_TOPOLOGY_CHANGES_NOT_ALLOWED: ::NTSTATUS = 0xC01E0353u32 as i32;
-pub const STATUS_GRAPHICS_NO_AVAILABLE_IMPORTANCE_ORDINALS: ::NTSTATUS = 0xC01E0354u32 as i32;
-pub const STATUS_GRAPHICS_INCOMPATIBLE_PRIVATE_FORMAT: ::NTSTATUS = 0xC01E0355u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MODE_PRUNING_ALGORITHM: ::NTSTATUS = 0xC01E0356u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_CAPABILITY_ORIGIN: ::NTSTATUS = 0xC01E0357u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE_CONSTRAINT: ::NTSTATUS = 0xC01E0358u32 as i32;
-pub const STATUS_GRAPHICS_MAX_NUM_PATHS_REACHED: ::NTSTATUS = 0xC01E0359u32 as i32;
-pub const STATUS_GRAPHICS_CANCEL_VIDPN_TOPOLOGY_AUGMENTATION: ::NTSTATUS = 0xC01E035Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_CLIENT_TYPE: ::NTSTATUS = 0xC01E035Bu32 as i32;
-pub const STATUS_GRAPHICS_CLIENTVIDPN_NOT_SET: ::NTSTATUS = 0xC01E035Cu32 as i32;
-pub const STATUS_GRAPHICS_SPECIFIED_CHILD_ALREADY_CONNECTED: ::NTSTATUS = 0xC01E0400u32 as i32;
-pub const STATUS_GRAPHICS_CHILD_DESCRIPTOR_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0401u32 as i32;
-pub const STATUS_GRAPHICS_UNKNOWN_CHILD_STATUS: ::NTSTATUS = 0x401E042F;
-pub const STATUS_GRAPHICS_NOT_A_LINKED_ADAPTER: ::NTSTATUS = 0xC01E0430u32 as i32;
-pub const STATUS_GRAPHICS_LEADLINK_NOT_ENUMERATED: ::NTSTATUS = 0xC01E0431u32 as i32;
-pub const STATUS_GRAPHICS_CHAINLINKS_NOT_ENUMERATED: ::NTSTATUS = 0xC01E0432u32 as i32;
-pub const STATUS_GRAPHICS_ADAPTER_CHAIN_NOT_READY: ::NTSTATUS = 0xC01E0433u32 as i32;
-pub const STATUS_GRAPHICS_CHAINLINKS_NOT_STARTED: ::NTSTATUS = 0xC01E0434u32 as i32;
-pub const STATUS_GRAPHICS_CHAINLINKS_NOT_POWERED_ON: ::NTSTATUS = 0xC01E0435u32 as i32;
-pub const STATUS_GRAPHICS_INCONSISTENT_DEVICE_LINK_STATE: ::NTSTATUS = 0xC01E0436u32 as i32;
-pub const STATUS_GRAPHICS_LEADLINK_START_DEFERRED: ::NTSTATUS = 0x401E0437;
-pub const STATUS_GRAPHICS_NOT_POST_DEVICE_DRIVER: ::NTSTATUS = 0xC01E0438u32 as i32;
-pub const STATUS_GRAPHICS_POLLING_TOO_FREQUENTLY: ::NTSTATUS = 0x401E0439;
-pub const STATUS_GRAPHICS_START_DEFERRED: ::NTSTATUS = 0x401E043A;
-pub const STATUS_GRAPHICS_ADAPTER_ACCESS_NOT_EXCLUDED: ::NTSTATUS = 0xC01E043Bu32 as i32;
-pub const STATUS_GRAPHICS_DEPENDABLE_CHILD_STATUS: ::NTSTATUS = 0x401E043C;
-pub const STATUS_GRAPHICS_OPM_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0500u32 as i32;
-pub const STATUS_GRAPHICS_COPP_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0501u32 as i32;
-pub const STATUS_GRAPHICS_UAB_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0502u32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_ENCRYPTED_PARAMETERS: ::NTSTATUS = 0xC01E0503u32 as i32;
-pub const STATUS_GRAPHICS_OPM_NO_PROTECTED_OUTPUTS_EXIST: ::NTSTATUS = 0xC01E0505u32 as i32;
-pub const STATUS_GRAPHICS_OPM_INTERNAL_ERROR: ::NTSTATUS = 0xC01E050Bu32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_HANDLE: ::NTSTATUS = 0xC01E050Cu32 as i32;
-pub const STATUS_GRAPHICS_PVP_INVALID_CERTIFICATE_LENGTH: ::NTSTATUS = 0xC01E050Eu32 as i32;
-pub const STATUS_GRAPHICS_OPM_SPANNING_MODE_ENABLED: ::NTSTATUS = 0xC01E050Fu32 as i32;
-pub const STATUS_GRAPHICS_OPM_THEATER_MODE_ENABLED: ::NTSTATUS = 0xC01E0510u32 as i32;
-pub const STATUS_GRAPHICS_PVP_HFS_FAILED: ::NTSTATUS = 0xC01E0511u32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_SRM: ::NTSTATUS = 0xC01E0512u32 as i32;
-pub const STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_HDCP: ::NTSTATUS = 0xC01E0513u32 as i32;
-pub const STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_ACP: ::NTSTATUS = 0xC01E0514u32 as i32;
-pub const STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_CGMSA: ::NTSTATUS = 0xC01E0515u32 as i32;
-pub const STATUS_GRAPHICS_OPM_HDCP_SRM_NEVER_SET: ::NTSTATUS = 0xC01E0516u32 as i32;
-pub const STATUS_GRAPHICS_OPM_RESOLUTION_TOO_HIGH: ::NTSTATUS = 0xC01E0517u32 as i32;
-pub const STATUS_GRAPHICS_OPM_ALL_HDCP_HARDWARE_ALREADY_IN_USE: ::NTSTATUS = 0xC01E0518u32 as i32;
-pub const STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_NO_LONGER_EXISTS: ::NTSTATUS = 0xC01E051Au32 as i32;
-pub const STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_DOES_NOT_HAVE_COPP_SEMANTICS: ::NTSTATUS = 0xC01E051Cu32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_INFORMATION_REQUEST: ::NTSTATUS = 0xC01E051Du32 as i32;
-pub const STATUS_GRAPHICS_OPM_DRIVER_INTERNAL_ERROR: ::NTSTATUS = 0xC01E051Eu32 as i32;
-pub const STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_DOES_NOT_HAVE_OPM_SEMANTICS: ::NTSTATUS = 0xC01E051Fu32 as i32;
-pub const STATUS_GRAPHICS_OPM_SIGNALING_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0520u32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_CONFIGURATION_REQUEST: ::NTSTATUS = 0xC01E0521u32 as i32;
-pub const STATUS_GRAPHICS_I2C_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0580u32 as i32;
-pub const STATUS_GRAPHICS_I2C_DEVICE_DOES_NOT_EXIST: ::NTSTATUS = 0xC01E0581u32 as i32;
-pub const STATUS_GRAPHICS_I2C_ERROR_TRANSMITTING_DATA: ::NTSTATUS = 0xC01E0582u32 as i32;
-pub const STATUS_GRAPHICS_I2C_ERROR_RECEIVING_DATA: ::NTSTATUS = 0xC01E0583u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0584u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_DATA: ::NTSTATUS = 0xC01E0585u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_MONITOR_RETURNED_INVALID_TIMING_STATUS_BYTE: ::NTSTATUS = 0xC01E0586u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_CAPABILITIES_STRING: ::NTSTATUS = 0xC01E0587u32 as i32;
-pub const STATUS_GRAPHICS_MCA_INTERNAL_ERROR: ::NTSTATUS = 0xC01E0588u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_COMMAND: ::NTSTATUS = 0xC01E0589u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_LENGTH: ::NTSTATUS = 0xC01E058Au32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM: ::NTSTATUS = 0xC01E058Bu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PHYSICAL_MONITOR_HANDLE: ::NTSTATUS = 0xC01E058Cu32 as i32;
-pub const STATUS_GRAPHICS_MONITOR_NO_LONGER_EXISTS: ::NTSTATUS = 0xC01E058Du32 as i32;
-pub const STATUS_GRAPHICS_ONLY_CONSOLE_SESSION_SUPPORTED: ::NTSTATUS = 0xC01E05E0u32 as i32;
-pub const STATUS_GRAPHICS_NO_DISPLAY_DEVICE_CORRESPONDS_TO_NAME: ::NTSTATUS = 0xC01E05E1u32 as i32;
-pub const STATUS_GRAPHICS_DISPLAY_DEVICE_NOT_ATTACHED_TO_DESKTOP: ::NTSTATUS = 0xC01E05E2u32 as i32;
-pub const STATUS_GRAPHICS_MIRRORING_DEVICES_NOT_SUPPORTED: ::NTSTATUS = 0xC01E05E3u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_POINTER: ::NTSTATUS = 0xC01E05E4u32 as i32;
-pub const STATUS_GRAPHICS_NO_MONITORS_CORRESPOND_TO_DISPLAY_DEVICE: ::NTSTATUS = 0xC01E05E5u32 as i32;
-pub const STATUS_GRAPHICS_PARAMETER_ARRAY_TOO_SMALL: ::NTSTATUS = 0xC01E05E6u32 as i32;
-pub const STATUS_GRAPHICS_INTERNAL_ERROR: ::NTSTATUS = 0xC01E05E7u32 as i32;
-pub const STATUS_GRAPHICS_SESSION_TYPE_CHANGE_IN_PROGRESS: ::NTSTATUS = 0xC01E05E8u32 as i32;
-pub const STATUS_FVE_LOCKED_VOLUME: ::NTSTATUS = 0xC0210000u32 as i32;
-pub const STATUS_FVE_NOT_ENCRYPTED: ::NTSTATUS = 0xC0210001u32 as i32;
-pub const STATUS_FVE_BAD_INFORMATION: ::NTSTATUS = 0xC0210002u32 as i32;
-pub const STATUS_FVE_TOO_SMALL: ::NTSTATUS = 0xC0210003u32 as i32;
-pub const STATUS_FVE_FAILED_WRONG_FS: ::NTSTATUS = 0xC0210004u32 as i32;
-pub const STATUS_FVE_BAD_PARTITION_SIZE: ::NTSTATUS = 0xC0210005u32 as i32;
-pub const STATUS_FVE_FS_NOT_EXTENDED: ::NTSTATUS = 0xC0210006u32 as i32;
-pub const STATUS_FVE_FS_MOUNTED: ::NTSTATUS = 0xC0210007u32 as i32;
-pub const STATUS_FVE_NO_LICENSE: ::NTSTATUS = 0xC0210008u32 as i32;
-pub const STATUS_FVE_ACTION_NOT_ALLOWED: ::NTSTATUS = 0xC0210009u32 as i32;
-pub const STATUS_FVE_BAD_DATA: ::NTSTATUS = 0xC021000Au32 as i32;
-pub const STATUS_FVE_VOLUME_NOT_BOUND: ::NTSTATUS = 0xC021000Bu32 as i32;
-pub const STATUS_FVE_NOT_DATA_VOLUME: ::NTSTATUS = 0xC021000Cu32 as i32;
-pub const STATUS_FVE_CONV_READ_ERROR: ::NTSTATUS = 0xC021000Du32 as i32;
-pub const STATUS_FVE_CONV_WRITE_ERROR: ::NTSTATUS = 0xC021000Eu32 as i32;
-pub const STATUS_FVE_OVERLAPPED_UPDATE: ::NTSTATUS = 0xC021000Fu32 as i32;
-pub const STATUS_FVE_FAILED_SECTOR_SIZE: ::NTSTATUS = 0xC0210010u32 as i32;
-pub const STATUS_FVE_FAILED_AUTHENTICATION: ::NTSTATUS = 0xC0210011u32 as i32;
-pub const STATUS_FVE_NOT_OS_VOLUME: ::NTSTATUS = 0xC0210012u32 as i32;
-pub const STATUS_FVE_KEYFILE_NOT_FOUND: ::NTSTATUS = 0xC0210013u32 as i32;
-pub const STATUS_FVE_KEYFILE_INVALID: ::NTSTATUS = 0xC0210014u32 as i32;
-pub const STATUS_FVE_KEYFILE_NO_VMK: ::NTSTATUS = 0xC0210015u32 as i32;
-pub const STATUS_FVE_TPM_DISABLED: ::NTSTATUS = 0xC0210016u32 as i32;
-pub const STATUS_FVE_TPM_SRK_AUTH_NOT_ZERO: ::NTSTATUS = 0xC0210017u32 as i32;
-pub const STATUS_FVE_TPM_INVALID_PCR: ::NTSTATUS = 0xC0210018u32 as i32;
-pub const STATUS_FVE_TPM_NO_VMK: ::NTSTATUS = 0xC0210019u32 as i32;
-pub const STATUS_FVE_PIN_INVALID: ::NTSTATUS = 0xC021001Au32 as i32;
-pub const STATUS_FVE_AUTH_INVALID_APPLICATION: ::NTSTATUS = 0xC021001Bu32 as i32;
-pub const STATUS_FVE_AUTH_INVALID_CONFIG: ::NTSTATUS = 0xC021001Cu32 as i32;
-pub const STATUS_FVE_DEBUGGER_ENABLED: ::NTSTATUS = 0xC021001Du32 as i32;
-pub const STATUS_FVE_DRY_RUN_FAILED: ::NTSTATUS = 0xC021001Eu32 as i32;
-pub const STATUS_FVE_BAD_METADATA_POINTER: ::NTSTATUS = 0xC021001Fu32 as i32;
-pub const STATUS_FVE_OLD_METADATA_COPY: ::NTSTATUS = 0xC0210020u32 as i32;
-pub const STATUS_FVE_REBOOT_REQUIRED: ::NTSTATUS = 0xC0210021u32 as i32;
-pub const STATUS_FVE_RAW_ACCESS: ::NTSTATUS = 0xC0210022u32 as i32;
-pub const STATUS_FVE_RAW_BLOCKED: ::NTSTATUS = 0xC0210023u32 as i32;
-pub const STATUS_FVE_NO_AUTOUNLOCK_MASTER_KEY: ::NTSTATUS = 0xC0210024u32 as i32;
-pub const STATUS_FVE_MOR_FAILED: ::NTSTATUS = 0xC0210025u32 as i32;
-pub const STATUS_FVE_NO_FEATURE_LICENSE: ::NTSTATUS = 0xC0210026u32 as i32;
-pub const STATUS_FVE_POLICY_USER_DISABLE_RDV_NOT_ALLOWED: ::NTSTATUS = 0xC0210027u32 as i32;
-pub const STATUS_FVE_CONV_RECOVERY_FAILED: ::NTSTATUS = 0xC0210028u32 as i32;
-pub const STATUS_FVE_VIRTUALIZED_SPACE_TOO_BIG: ::NTSTATUS = 0xC0210029u32 as i32;
-pub const STATUS_FVE_INVALID_DATUM_TYPE: ::NTSTATUS = 0xC021002Au32 as i32;
-pub const STATUS_FVE_VOLUME_TOO_SMALL: ::NTSTATUS = 0xC0210030u32 as i32;
-pub const STATUS_FVE_ENH_PIN_INVALID: ::NTSTATUS = 0xC0210031u32 as i32;
-pub const STATUS_FVE_FULL_ENCRYPTION_NOT_ALLOWED_ON_TP_STORAGE: ::NTSTATUS = 0xC0210032u32 as i32;
-pub const STATUS_FVE_WIPE_NOT_ALLOWED_ON_TP_STORAGE: ::NTSTATUS = 0xC0210033u32 as i32;
-pub const STATUS_FVE_NOT_ALLOWED_ON_CSV_STACK: ::NTSTATUS = 0xC0210034u32 as i32;
-pub const STATUS_FVE_NOT_ALLOWED_ON_CLUSTER: ::NTSTATUS = 0xC0210035u32 as i32;
-pub const STATUS_FVE_NOT_ALLOWED_TO_UPGRADE_WHILE_CONVERTING: ::NTSTATUS = 0xC0210036u32 as i32;
-pub const STATUS_FVE_WIPE_CANCEL_NOT_APPLICABLE: ::NTSTATUS = 0xC0210037u32 as i32;
-pub const STATUS_FVE_EDRIVE_DRY_RUN_FAILED: ::NTSTATUS = 0xC0210038u32 as i32;
-pub const STATUS_FVE_SECUREBOOT_DISABLED: ::NTSTATUS = 0xC0210039u32 as i32;
-pub const STATUS_FVE_SECUREBOOT_CONFIG_CHANGE: ::NTSTATUS = 0xC021003Au32 as i32;
-pub const STATUS_FVE_DEVICE_LOCKEDOUT: ::NTSTATUS = 0xC021003Bu32 as i32;
-pub const STATUS_FVE_VOLUME_EXTEND_PREVENTS_EOW_DECRYPT: ::NTSTATUS = 0xC021003Cu32 as i32;
-pub const STATUS_FVE_NOT_DE_VOLUME: ::NTSTATUS = 0xC021003Du32 as i32;
-pub const STATUS_FVE_PROTECTION_DISABLED: ::NTSTATUS = 0xC021003Eu32 as i32;
-pub const STATUS_FVE_PROTECTION_CANNOT_BE_DISABLED: ::NTSTATUS = 0xC021003Fu32 as i32;
-pub const STATUS_FWP_CALLOUT_NOT_FOUND: ::NTSTATUS = 0xC0220001u32 as i32;
-pub const STATUS_FWP_CONDITION_NOT_FOUND: ::NTSTATUS = 0xC0220002u32 as i32;
-pub const STATUS_FWP_FILTER_NOT_FOUND: ::NTSTATUS = 0xC0220003u32 as i32;
-pub const STATUS_FWP_LAYER_NOT_FOUND: ::NTSTATUS = 0xC0220004u32 as i32;
-pub const STATUS_FWP_PROVIDER_NOT_FOUND: ::NTSTATUS = 0xC0220005u32 as i32;
-pub const STATUS_FWP_PROVIDER_CONTEXT_NOT_FOUND: ::NTSTATUS = 0xC0220006u32 as i32;
-pub const STATUS_FWP_SUBLAYER_NOT_FOUND: ::NTSTATUS = 0xC0220007u32 as i32;
-pub const STATUS_FWP_NOT_FOUND: ::NTSTATUS = 0xC0220008u32 as i32;
-pub const STATUS_FWP_ALREADY_EXISTS: ::NTSTATUS = 0xC0220009u32 as i32;
-pub const STATUS_FWP_IN_USE: ::NTSTATUS = 0xC022000Au32 as i32;
-pub const STATUS_FWP_DYNAMIC_SESSION_IN_PROGRESS: ::NTSTATUS = 0xC022000Bu32 as i32;
-pub const STATUS_FWP_WRONG_SESSION: ::NTSTATUS = 0xC022000Cu32 as i32;
-pub const STATUS_FWP_NO_TXN_IN_PROGRESS: ::NTSTATUS = 0xC022000Du32 as i32;
-pub const STATUS_FWP_TXN_IN_PROGRESS: ::NTSTATUS = 0xC022000Eu32 as i32;
-pub const STATUS_FWP_TXN_ABORTED: ::NTSTATUS = 0xC022000Fu32 as i32;
-pub const STATUS_FWP_SESSION_ABORTED: ::NTSTATUS = 0xC0220010u32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_TXN: ::NTSTATUS = 0xC0220011u32 as i32;
-pub const STATUS_FWP_TIMEOUT: ::NTSTATUS = 0xC0220012u32 as i32;
-pub const STATUS_FWP_NET_EVENTS_DISABLED: ::NTSTATUS = 0xC0220013u32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_LAYER: ::NTSTATUS = 0xC0220014u32 as i32;
-pub const STATUS_FWP_KM_CLIENTS_ONLY: ::NTSTATUS = 0xC0220015u32 as i32;
-pub const STATUS_FWP_LIFETIME_MISMATCH: ::NTSTATUS = 0xC0220016u32 as i32;
-pub const STATUS_FWP_BUILTIN_OBJECT: ::NTSTATUS = 0xC0220017u32 as i32;
-pub const STATUS_FWP_TOO_MANY_CALLOUTS: ::NTSTATUS = 0xC0220018u32 as i32;
-pub const STATUS_FWP_NOTIFICATION_DROPPED: ::NTSTATUS = 0xC0220019u32 as i32;
-pub const STATUS_FWP_TRAFFIC_MISMATCH: ::NTSTATUS = 0xC022001Au32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_SA_STATE: ::NTSTATUS = 0xC022001Bu32 as i32;
-pub const STATUS_FWP_NULL_POINTER: ::NTSTATUS = 0xC022001Cu32 as i32;
-pub const STATUS_FWP_INVALID_ENUMERATOR: ::NTSTATUS = 0xC022001Du32 as i32;
-pub const STATUS_FWP_INVALID_FLAGS: ::NTSTATUS = 0xC022001Eu32 as i32;
-pub const STATUS_FWP_INVALID_NET_MASK: ::NTSTATUS = 0xC022001Fu32 as i32;
-pub const STATUS_FWP_INVALID_RANGE: ::NTSTATUS = 0xC0220020u32 as i32;
-pub const STATUS_FWP_INVALID_INTERVAL: ::NTSTATUS = 0xC0220021u32 as i32;
-pub const STATUS_FWP_ZERO_LENGTH_ARRAY: ::NTSTATUS = 0xC0220022u32 as i32;
-pub const STATUS_FWP_NULL_DISPLAY_NAME: ::NTSTATUS = 0xC0220023u32 as i32;
-pub const STATUS_FWP_INVALID_ACTION_TYPE: ::NTSTATUS = 0xC0220024u32 as i32;
-pub const STATUS_FWP_INVALID_WEIGHT: ::NTSTATUS = 0xC0220025u32 as i32;
-pub const STATUS_FWP_MATCH_TYPE_MISMATCH: ::NTSTATUS = 0xC0220026u32 as i32;
-pub const STATUS_FWP_TYPE_MISMATCH: ::NTSTATUS = 0xC0220027u32 as i32;
-pub const STATUS_FWP_OUT_OF_BOUNDS: ::NTSTATUS = 0xC0220028u32 as i32;
-pub const STATUS_FWP_RESERVED: ::NTSTATUS = 0xC0220029u32 as i32;
-pub const STATUS_FWP_DUPLICATE_CONDITION: ::NTSTATUS = 0xC022002Au32 as i32;
-pub const STATUS_FWP_DUPLICATE_KEYMOD: ::NTSTATUS = 0xC022002Bu32 as i32;
-pub const STATUS_FWP_ACTION_INCOMPATIBLE_WITH_LAYER: ::NTSTATUS = 0xC022002Cu32 as i32;
-pub const STATUS_FWP_ACTION_INCOMPATIBLE_WITH_SUBLAYER: ::NTSTATUS = 0xC022002Du32 as i32;
-pub const STATUS_FWP_CONTEXT_INCOMPATIBLE_WITH_LAYER: ::NTSTATUS = 0xC022002Eu32 as i32;
-pub const STATUS_FWP_CONTEXT_INCOMPATIBLE_WITH_CALLOUT: ::NTSTATUS = 0xC022002Fu32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_AUTH_METHOD: ::NTSTATUS = 0xC0220030u32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_DH_GROUP: ::NTSTATUS = 0xC0220031u32 as i32;
-pub const STATUS_FWP_EM_NOT_SUPPORTED: ::NTSTATUS = 0xC0220032u32 as i32;
-pub const STATUS_FWP_NEVER_MATCH: ::NTSTATUS = 0xC0220033u32 as i32;
-pub const STATUS_FWP_PROVIDER_CONTEXT_MISMATCH: ::NTSTATUS = 0xC0220034u32 as i32;
-pub const STATUS_FWP_INVALID_PARAMETER: ::NTSTATUS = 0xC0220035u32 as i32;
-pub const STATUS_FWP_TOO_MANY_SUBLAYERS: ::NTSTATUS = 0xC0220036u32 as i32;
-pub const STATUS_FWP_CALLOUT_NOTIFICATION_FAILED: ::NTSTATUS = 0xC0220037u32 as i32;
-pub const STATUS_FWP_INVALID_AUTH_TRANSFORM: ::NTSTATUS = 0xC0220038u32 as i32;
-pub const STATUS_FWP_INVALID_CIPHER_TRANSFORM: ::NTSTATUS = 0xC0220039u32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_CIPHER_TRANSFORM: ::NTSTATUS = 0xC022003Au32 as i32;
-pub const STATUS_FWP_INVALID_TRANSFORM_COMBINATION: ::NTSTATUS = 0xC022003Bu32 as i32;
-pub const STATUS_FWP_DUPLICATE_AUTH_METHOD: ::NTSTATUS = 0xC022003Cu32 as i32;
-pub const STATUS_FWP_INVALID_TUNNEL_ENDPOINT: ::NTSTATUS = 0xC022003Du32 as i32;
-pub const STATUS_FWP_L2_DRIVER_NOT_READY: ::NTSTATUS = 0xC022003Eu32 as i32;
-pub const STATUS_FWP_KEY_DICTATOR_ALREADY_REGISTERED: ::NTSTATUS = 0xC022003Fu32 as i32;
-pub const STATUS_FWP_KEY_DICTATION_INVALID_KEYING_MATERIAL: ::NTSTATUS = 0xC0220040u32 as i32;
-pub const STATUS_FWP_CONNECTIONS_DISABLED: ::NTSTATUS = 0xC0220041u32 as i32;
-pub const STATUS_FWP_INVALID_DNS_NAME: ::NTSTATUS = 0xC0220042u32 as i32;
-pub const STATUS_FWP_STILL_ON: ::NTSTATUS = 0xC0220043u32 as i32;
-pub const STATUS_FWP_IKEEXT_NOT_RUNNING: ::NTSTATUS = 0xC0220044u32 as i32;
-pub const STATUS_FWP_TCPIP_NOT_READY: ::NTSTATUS = 0xC0220100u32 as i32;
-pub const STATUS_FWP_INJECT_HANDLE_CLOSING: ::NTSTATUS = 0xC0220101u32 as i32;
-pub const STATUS_FWP_INJECT_HANDLE_STALE: ::NTSTATUS = 0xC0220102u32 as i32;
-pub const STATUS_FWP_CANNOT_PEND: ::NTSTATUS = 0xC0220103u32 as i32;
-pub const STATUS_FWP_DROP_NOICMP: ::NTSTATUS = 0xC0220104u32 as i32;
-pub const STATUS_NDIS_CLOSING: ::NTSTATUS = 0xC0230002u32 as i32;
-pub const STATUS_NDIS_BAD_VERSION: ::NTSTATUS = 0xC0230004u32 as i32;
-pub const STATUS_NDIS_BAD_CHARACTERISTICS: ::NTSTATUS = 0xC0230005u32 as i32;
-pub const STATUS_NDIS_ADAPTER_NOT_FOUND: ::NTSTATUS = 0xC0230006u32 as i32;
-pub const STATUS_NDIS_OPEN_FAILED: ::NTSTATUS = 0xC0230007u32 as i32;
-pub const STATUS_NDIS_DEVICE_FAILED: ::NTSTATUS = 0xC0230008u32 as i32;
-pub const STATUS_NDIS_MULTICAST_FULL: ::NTSTATUS = 0xC0230009u32 as i32;
-pub const STATUS_NDIS_MULTICAST_EXISTS: ::NTSTATUS = 0xC023000Au32 as i32;
-pub const STATUS_NDIS_MULTICAST_NOT_FOUND: ::NTSTATUS = 0xC023000Bu32 as i32;
-pub const STATUS_NDIS_REQUEST_ABORTED: ::NTSTATUS = 0xC023000Cu32 as i32;
-pub const STATUS_NDIS_RESET_IN_PROGRESS: ::NTSTATUS = 0xC023000Du32 as i32;
-pub const STATUS_NDIS_NOT_SUPPORTED: ::NTSTATUS = 0xC02300BBu32 as i32;
-pub const STATUS_NDIS_INVALID_PACKET: ::NTSTATUS = 0xC023000Fu32 as i32;
-pub const STATUS_NDIS_ADAPTER_NOT_READY: ::NTSTATUS = 0xC0230011u32 as i32;
-pub const STATUS_NDIS_INVALID_LENGTH: ::NTSTATUS = 0xC0230014u32 as i32;
-pub const STATUS_NDIS_INVALID_DATA: ::NTSTATUS = 0xC0230015u32 as i32;
-pub const STATUS_NDIS_BUFFER_TOO_SHORT: ::NTSTATUS = 0xC0230016u32 as i32;
-pub const STATUS_NDIS_INVALID_OID: ::NTSTATUS = 0xC0230017u32 as i32;
-pub const STATUS_NDIS_ADAPTER_REMOVED: ::NTSTATUS = 0xC0230018u32 as i32;
-pub const STATUS_NDIS_UNSUPPORTED_MEDIA: ::NTSTATUS = 0xC0230019u32 as i32;
-pub const STATUS_NDIS_GROUP_ADDRESS_IN_USE: ::NTSTATUS = 0xC023001Au32 as i32;
-pub const STATUS_NDIS_FILE_NOT_FOUND: ::NTSTATUS = 0xC023001Bu32 as i32;
-pub const STATUS_NDIS_ERROR_READING_FILE: ::NTSTATUS = 0xC023001Cu32 as i32;
-pub const STATUS_NDIS_ALREADY_MAPPED: ::NTSTATUS = 0xC023001Du32 as i32;
-pub const STATUS_NDIS_RESOURCE_CONFLICT: ::NTSTATUS = 0xC023001Eu32 as i32;
-pub const STATUS_NDIS_MEDIA_DISCONNECTED: ::NTSTATUS = 0xC023001Fu32 as i32;
-pub const STATUS_NDIS_INVALID_ADDRESS: ::NTSTATUS = 0xC0230022u32 as i32;
-pub const STATUS_NDIS_INVALID_DEVICE_REQUEST: ::NTSTATUS = 0xC0230010u32 as i32;
-pub const STATUS_NDIS_PAUSED: ::NTSTATUS = 0xC023002Au32 as i32;
-pub const STATUS_NDIS_INTERFACE_NOT_FOUND: ::NTSTATUS = 0xC023002Bu32 as i32;
-pub const STATUS_NDIS_UNSUPPORTED_REVISION: ::NTSTATUS = 0xC023002Cu32 as i32;
-pub const STATUS_NDIS_INVALID_PORT: ::NTSTATUS = 0xC023002Du32 as i32;
-pub const STATUS_NDIS_INVALID_PORT_STATE: ::NTSTATUS = 0xC023002Eu32 as i32;
-pub const STATUS_NDIS_LOW_POWER_STATE: ::NTSTATUS = 0xC023002Fu32 as i32;
-pub const STATUS_NDIS_REINIT_REQUIRED: ::NTSTATUS = 0xC0230030u32 as i32;
-pub const STATUS_NDIS_DOT11_AUTO_CONFIG_ENABLED: ::NTSTATUS = 0xC0232000u32 as i32;
-pub const STATUS_NDIS_DOT11_MEDIA_IN_USE: ::NTSTATUS = 0xC0232001u32 as i32;
-pub const STATUS_NDIS_DOT11_POWER_STATE_INVALID: ::NTSTATUS = 0xC0232002u32 as i32;
-pub const STATUS_NDIS_PM_WOL_PATTERN_LIST_FULL: ::NTSTATUS = 0xC0232003u32 as i32;
-pub const STATUS_NDIS_PM_PROTOCOL_OFFLOAD_LIST_FULL: ::NTSTATUS = 0xC0232004u32 as i32;
-pub const STATUS_NDIS_INDICATION_REQUIRED: ::NTSTATUS = 0x40230001;
-pub const STATUS_NDIS_OFFLOAD_POLICY: ::NTSTATUS = 0xC023100Fu32 as i32;
-pub const STATUS_NDIS_OFFLOAD_CONNECTION_REJECTED: ::NTSTATUS = 0xC0231012u32 as i32;
-pub const STATUS_NDIS_OFFLOAD_PATH_REJECTED: ::NTSTATUS = 0xC0231013u32 as i32;
-pub const STATUS_TPM_ERROR_MASK: ::NTSTATUS = 0xC0290000u32 as i32;
-pub const STATUS_TPM_AUTHFAIL: ::NTSTATUS = 0xC0290001u32 as i32;
-pub const STATUS_TPM_BADINDEX: ::NTSTATUS = 0xC0290002u32 as i32;
-pub const STATUS_TPM_BAD_PARAMETER: ::NTSTATUS = 0xC0290003u32 as i32;
-pub const STATUS_TPM_AUDITFAILURE: ::NTSTATUS = 0xC0290004u32 as i32;
-pub const STATUS_TPM_CLEAR_DISABLED: ::NTSTATUS = 0xC0290005u32 as i32;
-pub const STATUS_TPM_DEACTIVATED: ::NTSTATUS = 0xC0290006u32 as i32;
-pub const STATUS_TPM_DISABLED: ::NTSTATUS = 0xC0290007u32 as i32;
-pub const STATUS_TPM_DISABLED_CMD: ::NTSTATUS = 0xC0290008u32 as i32;
-pub const STATUS_TPM_FAIL: ::NTSTATUS = 0xC0290009u32 as i32;
-pub const STATUS_TPM_BAD_ORDINAL: ::NTSTATUS = 0xC029000Au32 as i32;
-pub const STATUS_TPM_INSTALL_DISABLED: ::NTSTATUS = 0xC029000Bu32 as i32;
-pub const STATUS_TPM_INVALID_KEYHANDLE: ::NTSTATUS = 0xC029000Cu32 as i32;
-pub const STATUS_TPM_KEYNOTFOUND: ::NTSTATUS = 0xC029000Du32 as i32;
-pub const STATUS_TPM_INAPPROPRIATE_ENC: ::NTSTATUS = 0xC029000Eu32 as i32;
-pub const STATUS_TPM_MIGRATEFAIL: ::NTSTATUS = 0xC029000Fu32 as i32;
-pub const STATUS_TPM_INVALID_PCR_INFO: ::NTSTATUS = 0xC0290010u32 as i32;
-pub const STATUS_TPM_NOSPACE: ::NTSTATUS = 0xC0290011u32 as i32;
-pub const STATUS_TPM_NOSRK: ::NTSTATUS = 0xC0290012u32 as i32;
-pub const STATUS_TPM_NOTSEALED_BLOB: ::NTSTATUS = 0xC0290013u32 as i32;
-pub const STATUS_TPM_OWNER_SET: ::NTSTATUS = 0xC0290014u32 as i32;
-pub const STATUS_TPM_RESOURCES: ::NTSTATUS = 0xC0290015u32 as i32;
-pub const STATUS_TPM_SHORTRANDOM: ::NTSTATUS = 0xC0290016u32 as i32;
-pub const STATUS_TPM_SIZE: ::NTSTATUS = 0xC0290017u32 as i32;
-pub const STATUS_TPM_WRONGPCRVAL: ::NTSTATUS = 0xC0290018u32 as i32;
-pub const STATUS_TPM_BAD_PARAM_SIZE: ::NTSTATUS = 0xC0290019u32 as i32;
-pub const STATUS_TPM_SHA_THREAD: ::NTSTATUS = 0xC029001Au32 as i32;
-pub const STATUS_TPM_SHA_ERROR: ::NTSTATUS = 0xC029001Bu32 as i32;
-pub const STATUS_TPM_FAILEDSELFTEST: ::NTSTATUS = 0xC029001Cu32 as i32;
-pub const STATUS_TPM_AUTH2FAIL: ::NTSTATUS = 0xC029001Du32 as i32;
-pub const STATUS_TPM_BADTAG: ::NTSTATUS = 0xC029001Eu32 as i32;
-pub const STATUS_TPM_IOERROR: ::NTSTATUS = 0xC029001Fu32 as i32;
-pub const STATUS_TPM_ENCRYPT_ERROR: ::NTSTATUS = 0xC0290020u32 as i32;
-pub const STATUS_TPM_DECRYPT_ERROR: ::NTSTATUS = 0xC0290021u32 as i32;
-pub const STATUS_TPM_INVALID_AUTHHANDLE: ::NTSTATUS = 0xC0290022u32 as i32;
-pub const STATUS_TPM_NO_ENDORSEMENT: ::NTSTATUS = 0xC0290023u32 as i32;
-pub const STATUS_TPM_INVALID_KEYUSAGE: ::NTSTATUS = 0xC0290024u32 as i32;
-pub const STATUS_TPM_WRONG_ENTITYTYPE: ::NTSTATUS = 0xC0290025u32 as i32;
-pub const STATUS_TPM_INVALID_POSTINIT: ::NTSTATUS = 0xC0290026u32 as i32;
-pub const STATUS_TPM_INAPPROPRIATE_SIG: ::NTSTATUS = 0xC0290027u32 as i32;
-pub const STATUS_TPM_BAD_KEY_PROPERTY: ::NTSTATUS = 0xC0290028u32 as i32;
-pub const STATUS_TPM_BAD_MIGRATION: ::NTSTATUS = 0xC0290029u32 as i32;
-pub const STATUS_TPM_BAD_SCHEME: ::NTSTATUS = 0xC029002Au32 as i32;
-pub const STATUS_TPM_BAD_DATASIZE: ::NTSTATUS = 0xC029002Bu32 as i32;
-pub const STATUS_TPM_BAD_MODE: ::NTSTATUS = 0xC029002Cu32 as i32;
-pub const STATUS_TPM_BAD_PRESENCE: ::NTSTATUS = 0xC029002Du32 as i32;
-pub const STATUS_TPM_BAD_VERSION: ::NTSTATUS = 0xC029002Eu32 as i32;
-pub const STATUS_TPM_NO_WRAP_TRANSPORT: ::NTSTATUS = 0xC029002Fu32 as i32;
-pub const STATUS_TPM_AUDITFAIL_UNSUCCESSFUL: ::NTSTATUS = 0xC0290030u32 as i32;
-pub const STATUS_TPM_AUDITFAIL_SUCCESSFUL: ::NTSTATUS = 0xC0290031u32 as i32;
-pub const STATUS_TPM_NOTRESETABLE: ::NTSTATUS = 0xC0290032u32 as i32;
-pub const STATUS_TPM_NOTLOCAL: ::NTSTATUS = 0xC0290033u32 as i32;
-pub const STATUS_TPM_BAD_TYPE: ::NTSTATUS = 0xC0290034u32 as i32;
-pub const STATUS_TPM_INVALID_RESOURCE: ::NTSTATUS = 0xC0290035u32 as i32;
-pub const STATUS_TPM_NOTFIPS: ::NTSTATUS = 0xC0290036u32 as i32;
-pub const STATUS_TPM_INVALID_FAMILY: ::NTSTATUS = 0xC0290037u32 as i32;
-pub const STATUS_TPM_NO_NV_PERMISSION: ::NTSTATUS = 0xC0290038u32 as i32;
-pub const STATUS_TPM_REQUIRES_SIGN: ::NTSTATUS = 0xC0290039u32 as i32;
-pub const STATUS_TPM_KEY_NOTSUPPORTED: ::NTSTATUS = 0xC029003Au32 as i32;
-pub const STATUS_TPM_AUTH_CONFLICT: ::NTSTATUS = 0xC029003Bu32 as i32;
-pub const STATUS_TPM_AREA_LOCKED: ::NTSTATUS = 0xC029003Cu32 as i32;
-pub const STATUS_TPM_BAD_LOCALITY: ::NTSTATUS = 0xC029003Du32 as i32;
-pub const STATUS_TPM_READ_ONLY: ::NTSTATUS = 0xC029003Eu32 as i32;
-pub const STATUS_TPM_PER_NOWRITE: ::NTSTATUS = 0xC029003Fu32 as i32;
-pub const STATUS_TPM_FAMILYCOUNT: ::NTSTATUS = 0xC0290040u32 as i32;
-pub const STATUS_TPM_WRITE_LOCKED: ::NTSTATUS = 0xC0290041u32 as i32;
-pub const STATUS_TPM_BAD_ATTRIBUTES: ::NTSTATUS = 0xC0290042u32 as i32;
-pub const STATUS_TPM_INVALID_STRUCTURE: ::NTSTATUS = 0xC0290043u32 as i32;
-pub const STATUS_TPM_KEY_OWNER_CONTROL: ::NTSTATUS = 0xC0290044u32 as i32;
-pub const STATUS_TPM_BAD_COUNTER: ::NTSTATUS = 0xC0290045u32 as i32;
-pub const STATUS_TPM_NOT_FULLWRITE: ::NTSTATUS = 0xC0290046u32 as i32;
-pub const STATUS_TPM_CONTEXT_GAP: ::NTSTATUS = 0xC0290047u32 as i32;
-pub const STATUS_TPM_MAXNVWRITES: ::NTSTATUS = 0xC0290048u32 as i32;
-pub const STATUS_TPM_NOOPERATOR: ::NTSTATUS = 0xC0290049u32 as i32;
-pub const STATUS_TPM_RESOURCEMISSING: ::NTSTATUS = 0xC029004Au32 as i32;
-pub const STATUS_TPM_DELEGATE_LOCK: ::NTSTATUS = 0xC029004Bu32 as i32;
-pub const STATUS_TPM_DELEGATE_FAMILY: ::NTSTATUS = 0xC029004Cu32 as i32;
-pub const STATUS_TPM_DELEGATE_ADMIN: ::NTSTATUS = 0xC029004Du32 as i32;
-pub const STATUS_TPM_TRANSPORT_NOTEXCLUSIVE: ::NTSTATUS = 0xC029004Eu32 as i32;
-pub const STATUS_TPM_OWNER_CONTROL: ::NTSTATUS = 0xC029004Fu32 as i32;
-pub const STATUS_TPM_DAA_RESOURCES: ::NTSTATUS = 0xC0290050u32 as i32;
-pub const STATUS_TPM_DAA_INPUT_DATA0: ::NTSTATUS = 0xC0290051u32 as i32;
-pub const STATUS_TPM_DAA_INPUT_DATA1: ::NTSTATUS = 0xC0290052u32 as i32;
-pub const STATUS_TPM_DAA_ISSUER_SETTINGS: ::NTSTATUS = 0xC0290053u32 as i32;
-pub const STATUS_TPM_DAA_TPM_SETTINGS: ::NTSTATUS = 0xC0290054u32 as i32;
-pub const STATUS_TPM_DAA_STAGE: ::NTSTATUS = 0xC0290055u32 as i32;
-pub const STATUS_TPM_DAA_ISSUER_VALIDITY: ::NTSTATUS = 0xC0290056u32 as i32;
-pub const STATUS_TPM_DAA_WRONG_W: ::NTSTATUS = 0xC0290057u32 as i32;
-pub const STATUS_TPM_BAD_HANDLE: ::NTSTATUS = 0xC0290058u32 as i32;
-pub const STATUS_TPM_BAD_DELEGATE: ::NTSTATUS = 0xC0290059u32 as i32;
-pub const STATUS_TPM_BADCONTEXT: ::NTSTATUS = 0xC029005Au32 as i32;
-pub const STATUS_TPM_TOOMANYCONTEXTS: ::NTSTATUS = 0xC029005Bu32 as i32;
-pub const STATUS_TPM_MA_TICKET_SIGNATURE: ::NTSTATUS = 0xC029005Cu32 as i32;
-pub const STATUS_TPM_MA_DESTINATION: ::NTSTATUS = 0xC029005Du32 as i32;
-pub const STATUS_TPM_MA_SOURCE: ::NTSTATUS = 0xC029005Eu32 as i32;
-pub const STATUS_TPM_MA_AUTHORITY: ::NTSTATUS = 0xC029005Fu32 as i32;
-pub const STATUS_TPM_PERMANENTEK: ::NTSTATUS = 0xC0290061u32 as i32;
-pub const STATUS_TPM_BAD_SIGNATURE: ::NTSTATUS = 0xC0290062u32 as i32;
-pub const STATUS_TPM_NOCONTEXTSPACE: ::NTSTATUS = 0xC0290063u32 as i32;
-pub const STATUS_TPM_COMMAND_BLOCKED: ::NTSTATUS = 0xC0290400u32 as i32;
-pub const STATUS_TPM_INVALID_HANDLE: ::NTSTATUS = 0xC0290401u32 as i32;
-pub const STATUS_TPM_DUPLICATE_VHANDLE: ::NTSTATUS = 0xC0290402u32 as i32;
-pub const STATUS_TPM_EMBEDDED_COMMAND_BLOCKED: ::NTSTATUS = 0xC0290403u32 as i32;
-pub const STATUS_TPM_EMBEDDED_COMMAND_UNSUPPORTED: ::NTSTATUS = 0xC0290404u32 as i32;
-pub const STATUS_TPM_RETRY: ::NTSTATUS = 0xC0290800u32 as i32;
-pub const STATUS_TPM_NEEDS_SELFTEST: ::NTSTATUS = 0xC0290801u32 as i32;
-pub const STATUS_TPM_DOING_SELFTEST: ::NTSTATUS = 0xC0290802u32 as i32;
-pub const STATUS_TPM_DEFEND_LOCK_RUNNING: ::NTSTATUS = 0xC0290803u32 as i32;
-pub const STATUS_TPM_COMMAND_CANCELED: ::NTSTATUS = 0xC0291001u32 as i32;
-pub const STATUS_TPM_TOO_MANY_CONTEXTS: ::NTSTATUS = 0xC0291002u32 as i32;
-pub const STATUS_TPM_NOT_FOUND: ::NTSTATUS = 0xC0291003u32 as i32;
-pub const STATUS_TPM_ACCESS_DENIED: ::NTSTATUS = 0xC0291004u32 as i32;
-pub const STATUS_TPM_INSUFFICIENT_BUFFER: ::NTSTATUS = 0xC0291005u32 as i32;
-pub const STATUS_TPM_PPI_FUNCTION_UNSUPPORTED: ::NTSTATUS = 0xC0291006u32 as i32;
-pub const STATUS_PCP_ERROR_MASK: ::NTSTATUS = 0xC0292000u32 as i32;
-pub const STATUS_PCP_DEVICE_NOT_READY: ::NTSTATUS = 0xC0292001u32 as i32;
-pub const STATUS_PCP_INVALID_HANDLE: ::NTSTATUS = 0xC0292002u32 as i32;
-pub const STATUS_PCP_INVALID_PARAMETER: ::NTSTATUS = 0xC0292003u32 as i32;
-pub const STATUS_PCP_FLAG_NOT_SUPPORTED: ::NTSTATUS = 0xC0292004u32 as i32;
-pub const STATUS_PCP_NOT_SUPPORTED: ::NTSTATUS = 0xC0292005u32 as i32;
-pub const STATUS_PCP_BUFFER_TOO_SMALL: ::NTSTATUS = 0xC0292006u32 as i32;
-pub const STATUS_PCP_INTERNAL_ERROR: ::NTSTATUS = 0xC0292007u32 as i32;
-pub const STATUS_PCP_AUTHENTICATION_FAILED: ::NTSTATUS = 0xC0292008u32 as i32;
-pub const STATUS_PCP_AUTHENTICATION_IGNORED: ::NTSTATUS = 0xC0292009u32 as i32;
-pub const STATUS_PCP_POLICY_NOT_FOUND: ::NTSTATUS = 0xC029200Au32 as i32;
-pub const STATUS_PCP_PROFILE_NOT_FOUND: ::NTSTATUS = 0xC029200Bu32 as i32;
-pub const STATUS_PCP_VALIDATION_FAILED: ::NTSTATUS = 0xC029200Cu32 as i32;
-pub const STATUS_PCP_DEVICE_NOT_FOUND: ::NTSTATUS = 0xC029200Du32 as i32;
-pub const STATUS_RTPM_CONTEXT_CONTINUE: ::NTSTATUS = 0x00293000;
-pub const STATUS_RTPM_CONTEXT_COMPLETE: ::NTSTATUS = 0x00293001;
-pub const STATUS_RTPM_NO_RESULT: ::NTSTATUS = 0xC0293002u32 as i32;
-pub const STATUS_RTPM_PCR_READ_INCOMPLETE: ::NTSTATUS = 0xC0293003u32 as i32;
-pub const STATUS_RTPM_INVALID_CONTEXT: ::NTSTATUS = 0xC0293004u32 as i32;
-pub const STATUS_RTPM_UNSUPPORTED_CMD: ::NTSTATUS = 0xC0293005u32 as i32;
-pub const STATUS_HV_INVALID_HYPERCALL_CODE: ::NTSTATUS = 0xC0350002u32 as i32;
-pub const STATUS_HV_INVALID_HYPERCALL_INPUT: ::NTSTATUS = 0xC0350003u32 as i32;
-pub const STATUS_HV_INVALID_ALIGNMENT: ::NTSTATUS = 0xC0350004u32 as i32;
-pub const STATUS_HV_INVALID_PARAMETER: ::NTSTATUS = 0xC0350005u32 as i32;
-pub const STATUS_HV_ACCESS_DENIED: ::NTSTATUS = 0xC0350006u32 as i32;
-pub const STATUS_HV_INVALID_PARTITION_STATE: ::NTSTATUS = 0xC0350007u32 as i32;
-pub const STATUS_HV_OPERATION_DENIED: ::NTSTATUS = 0xC0350008u32 as i32;
-pub const STATUS_HV_UNKNOWN_PROPERTY: ::NTSTATUS = 0xC0350009u32 as i32;
-pub const STATUS_HV_PROPERTY_VALUE_OUT_OF_RANGE: ::NTSTATUS = 0xC035000Au32 as i32;
-pub const STATUS_HV_INSUFFICIENT_MEMORY: ::NTSTATUS = 0xC035000Bu32 as i32;
-pub const STATUS_HV_PARTITION_TOO_DEEP: ::NTSTATUS = 0xC035000Cu32 as i32;
-pub const STATUS_HV_INVALID_PARTITION_ID: ::NTSTATUS = 0xC035000Du32 as i32;
-pub const STATUS_HV_INVALID_VP_INDEX: ::NTSTATUS = 0xC035000Eu32 as i32;
-pub const STATUS_HV_INVALID_PORT_ID: ::NTSTATUS = 0xC0350011u32 as i32;
-pub const STATUS_HV_INVALID_CONNECTION_ID: ::NTSTATUS = 0xC0350012u32 as i32;
-pub const STATUS_HV_INSUFFICIENT_BUFFERS: ::NTSTATUS = 0xC0350013u32 as i32;
-pub const STATUS_HV_NOT_ACKNOWLEDGED: ::NTSTATUS = 0xC0350014u32 as i32;
-pub const STATUS_HV_ACKNOWLEDGED: ::NTSTATUS = 0xC0350016u32 as i32;
-pub const STATUS_HV_INVALID_SAVE_RESTORE_STATE: ::NTSTATUS = 0xC0350017u32 as i32;
-pub const STATUS_HV_INVALID_SYNIC_STATE: ::NTSTATUS = 0xC0350018u32 as i32;
-pub const STATUS_HV_OBJECT_IN_USE: ::NTSTATUS = 0xC0350019u32 as i32;
-pub const STATUS_HV_INVALID_PROXIMITY_DOMAIN_INFO: ::NTSTATUS = 0xC035001Au32 as i32;
-pub const STATUS_HV_NO_DATA: ::NTSTATUS = 0xC035001Bu32 as i32;
-pub const STATUS_HV_INACTIVE: ::NTSTATUS = 0xC035001Cu32 as i32;
-pub const STATUS_HV_NO_RESOURCES: ::NTSTATUS = 0xC035001Du32 as i32;
-pub const STATUS_HV_FEATURE_UNAVAILABLE: ::NTSTATUS = 0xC035001Eu32 as i32;
-pub const STATUS_HV_INSUFFICIENT_BUFFER: ::NTSTATUS = 0xC0350033u32 as i32;
-pub const STATUS_HV_INSUFFICIENT_DEVICE_DOMAINS: ::NTSTATUS = 0xC0350038u32 as i32;
-pub const STATUS_HV_CPUID_FEATURE_VALIDATION_ERROR: ::NTSTATUS = 0xC035003Cu32 as i32;
-pub const STATUS_HV_CPUID_XSAVE_FEATURE_VALIDATION_ERROR: ::NTSTATUS = 0xC035003Du32 as i32;
-pub const STATUS_HV_PROCESSOR_STARTUP_TIMEOUT: ::NTSTATUS = 0xC035003Eu32 as i32;
-pub const STATUS_HV_SMX_ENABLED: ::NTSTATUS = 0xC035003Fu32 as i32;
-pub const STATUS_HV_INVALID_LP_INDEX: ::NTSTATUS = 0xC0350041u32 as i32;
-pub const STATUS_HV_INVALID_REGISTER_VALUE: ::NTSTATUS = 0xC0350050u32 as i32;
-pub const STATUS_HV_INVALID_VTL_STATE: ::NTSTATUS = 0xC0350051u32 as i32;
-pub const STATUS_HV_NX_NOT_DETECTED: ::NTSTATUS = 0xC0350055u32 as i32;
-pub const STATUS_HV_INVALID_DEVICE_ID: ::NTSTATUS = 0xC0350057u32 as i32;
-pub const STATUS_HV_INVALID_DEVICE_STATE: ::NTSTATUS = 0xC0350058u32 as i32;
-pub const STATUS_HV_PENDING_PAGE_REQUESTS: ::NTSTATUS = 0x00350059;
-pub const STATUS_HV_PAGE_REQUEST_INVALID: ::NTSTATUS = 0xC0350060u32 as i32;
-pub const STATUS_HV_NOT_PRESENT: ::NTSTATUS = 0xC0351000u32 as i32;
-pub const STATUS_VID_DUPLICATE_HANDLER: ::NTSTATUS = 0xC0370001u32 as i32;
-pub const STATUS_VID_TOO_MANY_HANDLERS: ::NTSTATUS = 0xC0370002u32 as i32;
-pub const STATUS_VID_QUEUE_FULL: ::NTSTATUS = 0xC0370003u32 as i32;
-pub const STATUS_VID_HANDLER_NOT_PRESENT: ::NTSTATUS = 0xC0370004u32 as i32;
-pub const STATUS_VID_INVALID_OBJECT_NAME: ::NTSTATUS = 0xC0370005u32 as i32;
-pub const STATUS_VID_PARTITION_NAME_TOO_LONG: ::NTSTATUS = 0xC0370006u32 as i32;
-pub const STATUS_VID_MESSAGE_QUEUE_NAME_TOO_LONG: ::NTSTATUS = 0xC0370007u32 as i32;
-pub const STATUS_VID_PARTITION_ALREADY_EXISTS: ::NTSTATUS = 0xC0370008u32 as i32;
-pub const STATUS_VID_PARTITION_DOES_NOT_EXIST: ::NTSTATUS = 0xC0370009u32 as i32;
-pub const STATUS_VID_PARTITION_NAME_NOT_FOUND: ::NTSTATUS = 0xC037000Au32 as i32;
-pub const STATUS_VID_MESSAGE_QUEUE_ALREADY_EXISTS: ::NTSTATUS = 0xC037000Bu32 as i32;
-pub const STATUS_VID_EXCEEDED_MBP_ENTRY_MAP_LIMIT: ::NTSTATUS = 0xC037000Cu32 as i32;
-pub const STATUS_VID_MB_STILL_REFERENCED: ::NTSTATUS = 0xC037000Du32 as i32;
-pub const STATUS_VID_CHILD_GPA_PAGE_SET_CORRUPTED: ::NTSTATUS = 0xC037000Eu32 as i32;
-pub const STATUS_VID_INVALID_NUMA_SETTINGS: ::NTSTATUS = 0xC037000Fu32 as i32;
-pub const STATUS_VID_INVALID_NUMA_NODE_INDEX: ::NTSTATUS = 0xC0370010u32 as i32;
-pub const STATUS_VID_NOTIFICATION_QUEUE_ALREADY_ASSOCIATED: ::NTSTATUS = 0xC0370011u32 as i32;
-pub const STATUS_VID_INVALID_MEMORY_BLOCK_HANDLE: ::NTSTATUS = 0xC0370012u32 as i32;
-pub const STATUS_VID_PAGE_RANGE_OVERFLOW: ::NTSTATUS = 0xC0370013u32 as i32;
-pub const STATUS_VID_INVALID_MESSAGE_QUEUE_HANDLE: ::NTSTATUS = 0xC0370014u32 as i32;
-pub const STATUS_VID_INVALID_GPA_RANGE_HANDLE: ::NTSTATUS = 0xC0370015u32 as i32;
-pub const STATUS_VID_NO_MEMORY_BLOCK_NOTIFICATION_QUEUE: ::NTSTATUS = 0xC0370016u32 as i32;
-pub const STATUS_VID_MEMORY_BLOCK_LOCK_COUNT_EXCEEDED: ::NTSTATUS = 0xC0370017u32 as i32;
-pub const STATUS_VID_INVALID_PPM_HANDLE: ::NTSTATUS = 0xC0370018u32 as i32;
-pub const STATUS_VID_MBPS_ARE_LOCKED: ::NTSTATUS = 0xC0370019u32 as i32;
-pub const STATUS_VID_MESSAGE_QUEUE_CLOSED: ::NTSTATUS = 0xC037001Au32 as i32;
-pub const STATUS_VID_VIRTUAL_PROCESSOR_LIMIT_EXCEEDED: ::NTSTATUS = 0xC037001Bu32 as i32;
-pub const STATUS_VID_STOP_PENDING: ::NTSTATUS = 0xC037001Cu32 as i32;
-pub const STATUS_VID_INVALID_PROCESSOR_STATE: ::NTSTATUS = 0xC037001Du32 as i32;
-pub const STATUS_VID_EXCEEDED_KM_CONTEXT_COUNT_LIMIT: ::NTSTATUS = 0xC037001Eu32 as i32;
-pub const STATUS_VID_KM_INTERFACE_ALREADY_INITIALIZED: ::NTSTATUS = 0xC037001Fu32 as i32;
-pub const STATUS_VID_MB_PROPERTY_ALREADY_SET_RESET: ::NTSTATUS = 0xC0370020u32 as i32;
-pub const STATUS_VID_MMIO_RANGE_DESTROYED: ::NTSTATUS = 0xC0370021u32 as i32;
-pub const STATUS_VID_INVALID_CHILD_GPA_PAGE_SET: ::NTSTATUS = 0xC0370022u32 as i32;
-pub const STATUS_VID_RESERVE_PAGE_SET_IS_BEING_USED: ::NTSTATUS = 0xC0370023u32 as i32;
-pub const STATUS_VID_RESERVE_PAGE_SET_TOO_SMALL: ::NTSTATUS = 0xC0370024u32 as i32;
-pub const STATUS_VID_MBP_ALREADY_LOCKED_USING_RESERVED_PAGE: ::NTSTATUS = 0xC0370025u32 as i32;
-pub const STATUS_VID_MBP_COUNT_EXCEEDED_LIMIT: ::NTSTATUS = 0xC0370026u32 as i32;
-pub const STATUS_VID_SAVED_STATE_CORRUPT: ::NTSTATUS = 0xC0370027u32 as i32;
-pub const STATUS_VID_SAVED_STATE_UNRECOGNIZED_ITEM: ::NTSTATUS = 0xC0370028u32 as i32;
-pub const STATUS_VID_SAVED_STATE_INCOMPATIBLE: ::NTSTATUS = 0xC0370029u32 as i32;
-pub const STATUS_VID_REMOTE_NODE_PARENT_GPA_PAGES_USED: ::NTSTATUS = 0x80370001u32 as i32;
-pub const STATUS_IPSEC_BAD_SPI: ::NTSTATUS = 0xC0360001u32 as i32;
-pub const STATUS_IPSEC_SA_LIFETIME_EXPIRED: ::NTSTATUS = 0xC0360002u32 as i32;
-pub const STATUS_IPSEC_WRONG_SA: ::NTSTATUS = 0xC0360003u32 as i32;
-pub const STATUS_IPSEC_REPLAY_CHECK_FAILED: ::NTSTATUS = 0xC0360004u32 as i32;
-pub const STATUS_IPSEC_INVALID_PACKET: ::NTSTATUS = 0xC0360005u32 as i32;
-pub const STATUS_IPSEC_INTEGRITY_CHECK_FAILED: ::NTSTATUS = 0xC0360006u32 as i32;
-pub const STATUS_IPSEC_CLEAR_TEXT_DROP: ::NTSTATUS = 0xC0360007u32 as i32;
-pub const STATUS_IPSEC_AUTH_FIREWALL_DROP: ::NTSTATUS = 0xC0360008u32 as i32;
-pub const STATUS_IPSEC_THROTTLE_DROP: ::NTSTATUS = 0xC0360009u32 as i32;
-pub const STATUS_IPSEC_DOSP_BLOCK: ::NTSTATUS = 0xC0368000u32 as i32;
-pub const STATUS_IPSEC_DOSP_RECEIVED_MULTICAST: ::NTSTATUS = 0xC0368001u32 as i32;
-pub const STATUS_IPSEC_DOSP_INVALID_PACKET: ::NTSTATUS = 0xC0368002u32 as i32;
-pub const STATUS_IPSEC_DOSP_STATE_LOOKUP_FAILED: ::NTSTATUS = 0xC0368003u32 as i32;
-pub const STATUS_IPSEC_DOSP_MAX_ENTRIES: ::NTSTATUS = 0xC0368004u32 as i32;
-pub const STATUS_IPSEC_DOSP_KEYMOD_NOT_ALLOWED: ::NTSTATUS = 0xC0368005u32 as i32;
-pub const STATUS_IPSEC_DOSP_MAX_PER_IP_RATELIMIT_QUEUES: ::NTSTATUS = 0xC0368006u32 as i32;
-pub const STATUS_VOLMGR_INCOMPLETE_REGENERATION: ::NTSTATUS = 0x80380001u32 as i32;
-pub const STATUS_VOLMGR_INCOMPLETE_DISK_MIGRATION: ::NTSTATUS = 0x80380002u32 as i32;
-pub const STATUS_VOLMGR_DATABASE_FULL: ::NTSTATUS = 0xC0380001u32 as i32;
-pub const STATUS_VOLMGR_DISK_CONFIGURATION_CORRUPTED: ::NTSTATUS = 0xC0380002u32 as i32;
-pub const STATUS_VOLMGR_DISK_CONFIGURATION_NOT_IN_SYNC: ::NTSTATUS = 0xC0380003u32 as i32;
-pub const STATUS_VOLMGR_PACK_CONFIG_UPDATE_FAILED: ::NTSTATUS = 0xC0380004u32 as i32;
-pub const STATUS_VOLMGR_DISK_CONTAINS_NON_SIMPLE_VOLUME: ::NTSTATUS = 0xC0380005u32 as i32;
-pub const STATUS_VOLMGR_DISK_DUPLICATE: ::NTSTATUS = 0xC0380006u32 as i32;
-pub const STATUS_VOLMGR_DISK_DYNAMIC: ::NTSTATUS = 0xC0380007u32 as i32;
-pub const STATUS_VOLMGR_DISK_ID_INVALID: ::NTSTATUS = 0xC0380008u32 as i32;
-pub const STATUS_VOLMGR_DISK_INVALID: ::NTSTATUS = 0xC0380009u32 as i32;
-pub const STATUS_VOLMGR_DISK_LAST_VOTER: ::NTSTATUS = 0xC038000Au32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_INVALID: ::NTSTATUS = 0xC038000Bu32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_NON_BASIC_BETWEEN_BASIC_PARTITIONS: ::NTSTATUS = 0xC038000Cu32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_NOT_CYLINDER_ALIGNED: ::NTSTATUS = 0xC038000Du32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_PARTITIONS_TOO_SMALL: ::NTSTATUS = 0xC038000Eu32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_PRIMARY_BETWEEN_LOGICAL_PARTITIONS: ::NTSTATUS = 0xC038000Fu32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_TOO_MANY_PARTITIONS: ::NTSTATUS = 0xC0380010u32 as i32;
-pub const STATUS_VOLMGR_DISK_MISSING: ::NTSTATUS = 0xC0380011u32 as i32;
-pub const STATUS_VOLMGR_DISK_NOT_EMPTY: ::NTSTATUS = 0xC0380012u32 as i32;
-pub const STATUS_VOLMGR_DISK_NOT_ENOUGH_SPACE: ::NTSTATUS = 0xC0380013u32 as i32;
-pub const STATUS_VOLMGR_DISK_REVECTORING_FAILED: ::NTSTATUS = 0xC0380014u32 as i32;
-pub const STATUS_VOLMGR_DISK_SECTOR_SIZE_INVALID: ::NTSTATUS = 0xC0380015u32 as i32;
-pub const STATUS_VOLMGR_DISK_SET_NOT_CONTAINED: ::NTSTATUS = 0xC0380016u32 as i32;
-pub const STATUS_VOLMGR_DISK_USED_BY_MULTIPLE_MEMBERS: ::NTSTATUS = 0xC0380017u32 as i32;
-pub const STATUS_VOLMGR_DISK_USED_BY_MULTIPLE_PLEXES: ::NTSTATUS = 0xC0380018u32 as i32;
-pub const STATUS_VOLMGR_DYNAMIC_DISK_NOT_SUPPORTED: ::NTSTATUS = 0xC0380019u32 as i32;
-pub const STATUS_VOLMGR_EXTENT_ALREADY_USED: ::NTSTATUS = 0xC038001Au32 as i32;
-pub const STATUS_VOLMGR_EXTENT_NOT_CONTIGUOUS: ::NTSTATUS = 0xC038001Bu32 as i32;
-pub const STATUS_VOLMGR_EXTENT_NOT_IN_PUBLIC_REGION: ::NTSTATUS = 0xC038001Cu32 as i32;
-pub const STATUS_VOLMGR_EXTENT_NOT_SECTOR_ALIGNED: ::NTSTATUS = 0xC038001Du32 as i32;
-pub const STATUS_VOLMGR_EXTENT_OVERLAPS_EBR_PARTITION: ::NTSTATUS = 0xC038001Eu32 as i32;
-pub const STATUS_VOLMGR_EXTENT_VOLUME_LENGTHS_DO_NOT_MATCH: ::NTSTATUS = 0xC038001Fu32 as i32;
-pub const STATUS_VOLMGR_FAULT_TOLERANT_NOT_SUPPORTED: ::NTSTATUS = 0xC0380020u32 as i32;
-pub const STATUS_VOLMGR_INTERLEAVE_LENGTH_INVALID: ::NTSTATUS = 0xC0380021u32 as i32;
-pub const STATUS_VOLMGR_MAXIMUM_REGISTERED_USERS: ::NTSTATUS = 0xC0380022u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_IN_SYNC: ::NTSTATUS = 0xC0380023u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_INDEX_DUPLICATE: ::NTSTATUS = 0xC0380024u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_INDEX_INVALID: ::NTSTATUS = 0xC0380025u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_MISSING: ::NTSTATUS = 0xC0380026u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_NOT_DETACHED: ::NTSTATUS = 0xC0380027u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_REGENERATING: ::NTSTATUS = 0xC0380028u32 as i32;
-pub const STATUS_VOLMGR_ALL_DISKS_FAILED: ::NTSTATUS = 0xC0380029u32 as i32;
-pub const STATUS_VOLMGR_NO_REGISTERED_USERS: ::NTSTATUS = 0xC038002Au32 as i32;
-pub const STATUS_VOLMGR_NO_SUCH_USER: ::NTSTATUS = 0xC038002Bu32 as i32;
-pub const STATUS_VOLMGR_NOTIFICATION_RESET: ::NTSTATUS = 0xC038002Cu32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_MEMBERS_INVALID: ::NTSTATUS = 0xC038002Du32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_PLEXES_INVALID: ::NTSTATUS = 0xC038002Eu32 as i32;
-pub const STATUS_VOLMGR_PACK_DUPLICATE: ::NTSTATUS = 0xC038002Fu32 as i32;
-pub const STATUS_VOLMGR_PACK_ID_INVALID: ::NTSTATUS = 0xC0380030u32 as i32;
-pub const STATUS_VOLMGR_PACK_INVALID: ::NTSTATUS = 0xC0380031u32 as i32;
-pub const STATUS_VOLMGR_PACK_NAME_INVALID: ::NTSTATUS = 0xC0380032u32 as i32;
-pub const STATUS_VOLMGR_PACK_OFFLINE: ::NTSTATUS = 0xC0380033u32 as i32;
-pub const STATUS_VOLMGR_PACK_HAS_QUORUM: ::NTSTATUS = 0xC0380034u32 as i32;
-pub const STATUS_VOLMGR_PACK_WITHOUT_QUORUM: ::NTSTATUS = 0xC0380035u32 as i32;
-pub const STATUS_VOLMGR_PARTITION_STYLE_INVALID: ::NTSTATUS = 0xC0380036u32 as i32;
-pub const STATUS_VOLMGR_PARTITION_UPDATE_FAILED: ::NTSTATUS = 0xC0380037u32 as i32;
-pub const STATUS_VOLMGR_PLEX_IN_SYNC: ::NTSTATUS = 0xC0380038u32 as i32;
-pub const STATUS_VOLMGR_PLEX_INDEX_DUPLICATE: ::NTSTATUS = 0xC0380039u32 as i32;
-pub const STATUS_VOLMGR_PLEX_INDEX_INVALID: ::NTSTATUS = 0xC038003Au32 as i32;
-pub const STATUS_VOLMGR_PLEX_LAST_ACTIVE: ::NTSTATUS = 0xC038003Bu32 as i32;
-pub const STATUS_VOLMGR_PLEX_MISSING: ::NTSTATUS = 0xC038003Cu32 as i32;
-pub const STATUS_VOLMGR_PLEX_REGENERATING: ::NTSTATUS = 0xC038003Du32 as i32;
-pub const STATUS_VOLMGR_PLEX_TYPE_INVALID: ::NTSTATUS = 0xC038003Eu32 as i32;
-pub const STATUS_VOLMGR_PLEX_NOT_RAID5: ::NTSTATUS = 0xC038003Fu32 as i32;
-pub const STATUS_VOLMGR_PLEX_NOT_SIMPLE: ::NTSTATUS = 0xC0380040u32 as i32;
-pub const STATUS_VOLMGR_STRUCTURE_SIZE_INVALID: ::NTSTATUS = 0xC0380041u32 as i32;
-pub const STATUS_VOLMGR_TOO_MANY_NOTIFICATION_REQUESTS: ::NTSTATUS = 0xC0380042u32 as i32;
-pub const STATUS_VOLMGR_TRANSACTION_IN_PROGRESS: ::NTSTATUS = 0xC0380043u32 as i32;
-pub const STATUS_VOLMGR_UNEXPECTED_DISK_LAYOUT_CHANGE: ::NTSTATUS = 0xC0380044u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_CONTAINS_MISSING_DISK: ::NTSTATUS = 0xC0380045u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_ID_INVALID: ::NTSTATUS = 0xC0380046u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_LENGTH_INVALID: ::NTSTATUS = 0xC0380047u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_LENGTH_NOT_SECTOR_SIZE_MULTIPLE: ::NTSTATUS = 0xC0380048u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_NOT_MIRRORED: ::NTSTATUS = 0xC0380049u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_NOT_RETAINED: ::NTSTATUS = 0xC038004Au32 as i32;
-pub const STATUS_VOLMGR_VOLUME_OFFLINE: ::NTSTATUS = 0xC038004Bu32 as i32;
-pub const STATUS_VOLMGR_VOLUME_RETAINED: ::NTSTATUS = 0xC038004Cu32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_EXTENTS_INVALID: ::NTSTATUS = 0xC038004Du32 as i32;
-pub const STATUS_VOLMGR_DIFFERENT_SECTOR_SIZE: ::NTSTATUS = 0xC038004Eu32 as i32;
-pub const STATUS_VOLMGR_BAD_BOOT_DISK: ::NTSTATUS = 0xC038004Fu32 as i32;
-pub const STATUS_VOLMGR_PACK_CONFIG_OFFLINE: ::NTSTATUS = 0xC0380050u32 as i32;
-pub const STATUS_VOLMGR_PACK_CONFIG_ONLINE: ::NTSTATUS = 0xC0380051u32 as i32;
-pub const STATUS_VOLMGR_NOT_PRIMARY_PACK: ::NTSTATUS = 0xC0380052u32 as i32;
-pub const STATUS_VOLMGR_PACK_LOG_UPDATE_FAILED: ::NTSTATUS = 0xC0380053u32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_DISKS_IN_PLEX_INVALID: ::NTSTATUS = 0xC0380054u32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_DISKS_IN_MEMBER_INVALID: ::NTSTATUS = 0xC0380055u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_MIRRORED: ::NTSTATUS = 0xC0380056u32 as i32;
-pub const STATUS_VOLMGR_PLEX_NOT_SIMPLE_SPANNED: ::NTSTATUS = 0xC0380057u32 as i32;
-pub const STATUS_VOLMGR_NO_VALID_LOG_COPIES: ::NTSTATUS = 0xC0380058u32 as i32;
-pub const STATUS_VOLMGR_PRIMARY_PACK_PRESENT: ::NTSTATUS = 0xC0380059u32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_DISKS_INVALID: ::NTSTATUS = 0xC038005Au32 as i32;
-pub const STATUS_VOLMGR_MIRROR_NOT_SUPPORTED: ::NTSTATUS = 0xC038005Bu32 as i32;
-pub const STATUS_VOLMGR_RAID5_NOT_SUPPORTED: ::NTSTATUS = 0xC038005Cu32 as i32;
-pub const STATUS_BCD_NOT_ALL_ENTRIES_IMPORTED: ::NTSTATUS = 0x80390001u32 as i32;
-pub const STATUS_BCD_TOO_MANY_ELEMENTS: ::NTSTATUS = 0xC0390002u32 as i32;
-pub const STATUS_BCD_NOT_ALL_ENTRIES_SYNCHRONIZED: ::NTSTATUS = 0x80390003u32 as i32;
-pub const STATUS_VHD_DRIVE_FOOTER_MISSING: ::NTSTATUS = 0xC03A0001u32 as i32;
-pub const STATUS_VHD_DRIVE_FOOTER_CHECKSUM_MISMATCH: ::NTSTATUS = 0xC03A0002u32 as i32;
-pub const STATUS_VHD_DRIVE_FOOTER_CORRUPT: ::NTSTATUS = 0xC03A0003u32 as i32;
-pub const STATUS_VHD_FORMAT_UNKNOWN: ::NTSTATUS = 0xC03A0004u32 as i32;
-pub const STATUS_VHD_FORMAT_UNSUPPORTED_VERSION: ::NTSTATUS = 0xC03A0005u32 as i32;
-pub const STATUS_VHD_SPARSE_HEADER_CHECKSUM_MISMATCH: ::NTSTATUS = 0xC03A0006u32 as i32;
-pub const STATUS_VHD_SPARSE_HEADER_UNSUPPORTED_VERSION: ::NTSTATUS = 0xC03A0007u32 as i32;
-pub const STATUS_VHD_SPARSE_HEADER_CORRUPT: ::NTSTATUS = 0xC03A0008u32 as i32;
-pub const STATUS_VHD_BLOCK_ALLOCATION_FAILURE: ::NTSTATUS = 0xC03A0009u32 as i32;
-pub const STATUS_VHD_BLOCK_ALLOCATION_TABLE_CORRUPT: ::NTSTATUS = 0xC03A000Au32 as i32;
-pub const STATUS_VHD_INVALID_BLOCK_SIZE: ::NTSTATUS = 0xC03A000Bu32 as i32;
-pub const STATUS_VHD_BITMAP_MISMATCH: ::NTSTATUS = 0xC03A000Cu32 as i32;
-pub const STATUS_VHD_PARENT_VHD_NOT_FOUND: ::NTSTATUS = 0xC03A000Du32 as i32;
-pub const STATUS_VHD_CHILD_PARENT_ID_MISMATCH: ::NTSTATUS = 0xC03A000Eu32 as i32;
-pub const STATUS_VHD_CHILD_PARENT_TIMESTAMP_MISMATCH: ::NTSTATUS = 0xC03A000Fu32 as i32;
-pub const STATUS_VHD_METADATA_READ_FAILURE: ::NTSTATUS = 0xC03A0010u32 as i32;
-pub const STATUS_VHD_METADATA_WRITE_FAILURE: ::NTSTATUS = 0xC03A0011u32 as i32;
-pub const STATUS_VHD_INVALID_SIZE: ::NTSTATUS = 0xC03A0012u32 as i32;
-pub const STATUS_VHD_INVALID_FILE_SIZE: ::NTSTATUS = 0xC03A0013u32 as i32;
-pub const STATUS_VIRTDISK_PROVIDER_NOT_FOUND: ::NTSTATUS = 0xC03A0014u32 as i32;
-pub const STATUS_VIRTDISK_NOT_VIRTUAL_DISK: ::NTSTATUS = 0xC03A0015u32 as i32;
-pub const STATUS_VHD_PARENT_VHD_ACCESS_DENIED: ::NTSTATUS = 0xC03A0016u32 as i32;
-pub const STATUS_VHD_CHILD_PARENT_SIZE_MISMATCH: ::NTSTATUS = 0xC03A0017u32 as i32;
-pub const STATUS_VHD_DIFFERENCING_CHAIN_CYCLE_DETECTED: ::NTSTATUS = 0xC03A0018u32 as i32;
-pub const STATUS_VHD_DIFFERENCING_CHAIN_ERROR_IN_PARENT: ::NTSTATUS = 0xC03A0019u32 as i32;
-pub const STATUS_VIRTUAL_DISK_LIMITATION: ::NTSTATUS = 0xC03A001Au32 as i32;
-pub const STATUS_VHD_INVALID_TYPE: ::NTSTATUS = 0xC03A001Bu32 as i32;
-pub const STATUS_VHD_INVALID_STATE: ::NTSTATUS = 0xC03A001Cu32 as i32;
-pub const STATUS_VIRTDISK_UNSUPPORTED_DISK_SECTOR_SIZE: ::NTSTATUS = 0xC03A001Du32 as i32;
-pub const STATUS_VIRTDISK_DISK_ALREADY_OWNED: ::NTSTATUS = 0xC03A001Eu32 as i32;
-pub const STATUS_VIRTDISK_DISK_ONLINE_AND_WRITABLE: ::NTSTATUS = 0xC03A001Fu32 as i32;
-pub const STATUS_CTLOG_TRACKING_NOT_INITIALIZED: ::NTSTATUS = 0xC03A0020u32 as i32;
-pub const STATUS_CTLOG_LOGFILE_SIZE_EXCEEDED_MAXSIZE: ::NTSTATUS = 0xC03A0021u32 as i32;
-pub const STATUS_CTLOG_VHD_CHANGED_OFFLINE: ::NTSTATUS = 0xC03A0022u32 as i32;
-pub const STATUS_CTLOG_INVALID_TRACKING_STATE: ::NTSTATUS = 0xC03A0023u32 as i32;
-pub const STATUS_CTLOG_INCONSISTENT_TRACKING_FILE: ::NTSTATUS = 0xC03A0024u32 as i32;
-pub const STATUS_VHD_METADATA_FULL: ::NTSTATUS = 0xC03A0028u32 as i32;
-pub const STATUS_VHD_INVALID_CHANGE_TRACKING_ID: ::NTSTATUS = 0xC03A0029u32 as i32;
-pub const STATUS_VHD_CHANGE_TRACKING_DISABLED: ::NTSTATUS = 0xC03A002Au32 as i32;
-pub const STATUS_VHD_MISSING_CHANGE_TRACKING_INFORMATION: ::NTSTATUS = 0xC03A0030u32 as i32;
-pub const STATUS_VHD_RESIZE_WOULD_TRUNCATE_DATA: ::NTSTATUS = 0xC03A0031u32 as i32;
-pub const STATUS_VHD_COULD_NOT_COMPUTE_MINIMUM_VIRTUAL_SIZE: ::NTSTATUS = 0xC03A0032u32 as i32;
-pub const STATUS_VHD_ALREADY_AT_OR_BELOW_MINIMUM_VIRTUAL_SIZE: ::NTSTATUS = 0xC03A0033u32 as i32;
-pub const STATUS_QUERY_STORAGE_ERROR: ::NTSTATUS = 0x803A0001u32 as i32;
-pub const STATUS_RKF_KEY_NOT_FOUND: ::NTSTATUS = 0xC0400001u32 as i32;
-pub const STATUS_RKF_DUPLICATE_KEY: ::NTSTATUS = 0xC0400002u32 as i32;
-pub const STATUS_RKF_BLOB_FULL: ::NTSTATUS = 0xC0400003u32 as i32;
-pub const STATUS_RKF_STORE_FULL: ::NTSTATUS = 0xC0400004u32 as i32;
-pub const STATUS_RKF_FILE_BLOCKED: ::NTSTATUS = 0xC0400005u32 as i32;
-pub const STATUS_RKF_ACTIVE_KEY: ::NTSTATUS = 0xC0400006u32 as i32;
-pub const STATUS_RDBSS_RESTART_OPERATION: ::NTSTATUS = 0xC0410001u32 as i32;
-pub const STATUS_RDBSS_CONTINUE_OPERATION: ::NTSTATUS = 0xC0410002u32 as i32;
-pub const STATUS_RDBSS_POST_OPERATION: ::NTSTATUS = 0xC0410003u32 as i32;
-pub const STATUS_BTH_ATT_INVALID_HANDLE: ::NTSTATUS = 0xC0420001u32 as i32;
-pub const STATUS_BTH_ATT_READ_NOT_PERMITTED: ::NTSTATUS = 0xC0420002u32 as i32;
-pub const STATUS_BTH_ATT_WRITE_NOT_PERMITTED: ::NTSTATUS = 0xC0420003u32 as i32;
-pub const STATUS_BTH_ATT_INVALID_PDU: ::NTSTATUS = 0xC0420004u32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_AUTHENTICATION: ::NTSTATUS = 0xC0420005u32 as i32;
-pub const STATUS_BTH_ATT_REQUEST_NOT_SUPPORTED: ::NTSTATUS = 0xC0420006u32 as i32;
-pub const STATUS_BTH_ATT_INVALID_OFFSET: ::NTSTATUS = 0xC0420007u32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_AUTHORIZATION: ::NTSTATUS = 0xC0420008u32 as i32;
-pub const STATUS_BTH_ATT_PREPARE_QUEUE_FULL: ::NTSTATUS = 0xC0420009u32 as i32;
-pub const STATUS_BTH_ATT_ATTRIBUTE_NOT_FOUND: ::NTSTATUS = 0xC042000Au32 as i32;
-pub const STATUS_BTH_ATT_ATTRIBUTE_NOT_LONG: ::NTSTATUS = 0xC042000Bu32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_ENCRYPTION_KEY_SIZE: ::NTSTATUS = 0xC042000Cu32 as i32;
-pub const STATUS_BTH_ATT_INVALID_ATTRIBUTE_VALUE_LENGTH: ::NTSTATUS = 0xC042000Du32 as i32;
-pub const STATUS_BTH_ATT_UNLIKELY: ::NTSTATUS = 0xC042000Eu32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_ENCRYPTION: ::NTSTATUS = 0xC042000Fu32 as i32;
-pub const STATUS_BTH_ATT_UNSUPPORTED_GROUP_TYPE: ::NTSTATUS = 0xC0420010u32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_RESOURCES: ::NTSTATUS = 0xC0420011u32 as i32;
-pub const STATUS_BTH_ATT_UNKNOWN_ERROR: ::NTSTATUS = 0xC0421000u32 as i32;
-pub const STATUS_SECUREBOOT_ROLLBACK_DETECTED: ::NTSTATUS = 0xC0430001u32 as i32;
-pub const STATUS_SECUREBOOT_POLICY_VIOLATION: ::NTSTATUS = 0xC0430002u32 as i32;
-pub const STATUS_SECUREBOOT_INVALID_POLICY: ::NTSTATUS = 0xC0430003u32 as i32;
-pub const STATUS_SECUREBOOT_POLICY_PUBLISHER_NOT_FOUND: ::NTSTATUS = 0xC0430004u32 as i32;
-pub const STATUS_SECUREBOOT_POLICY_NOT_SIGNED: ::NTSTATUS = 0xC0430005u32 as i32;
-pub const STATUS_SECUREBOOT_NOT_ENABLED: ::NTSTATUS = 0x80430006u32 as i32;
-pub const STATUS_SECUREBOOT_FILE_REPLACED: ::NTSTATUS = 0xC0430007u32 as i32;
-pub const STATUS_SYSTEM_INTEGRITY_ROLLBACK_DETECTED: ::NTSTATUS = 0xC0E90001u32 as i32;
-pub const STATUS_SYSTEM_INTEGRITY_POLICY_VIOLATION: ::NTSTATUS = 0xC0E90002u32 as i32;
-pub const STATUS_SYSTEM_INTEGRITY_INVALID_POLICY: ::NTSTATUS = 0xC0E90003u32 as i32;
-pub const STATUS_SYSTEM_INTEGRITY_POLICY_NOT_SIGNED: ::NTSTATUS = 0xC0E90004u32 as i32;
-pub const STATUS_NO_APPLICABLE_APP_LICENSES_FOUND: ::NTSTATUS = 0xC0EA0001u32 as i32;
-pub const STATUS_AUDIO_ENGINE_NODE_NOT_FOUND: ::NTSTATUS = 0xC0440001u32 as i32;
-pub const STATUS_HDAUDIO_EMPTY_CONNECTION_LIST: ::NTSTATUS = 0xC0440002u32 as i32;
-pub const STATUS_HDAUDIO_CONNECTION_LIST_NOT_SUPPORTED: ::NTSTATUS = 0xC0440003u32 as i32;
-pub const STATUS_HDAUDIO_NO_LOGICAL_DEVICES_CREATED: ::NTSTATUS = 0xC0440004u32 as i32;
-pub const STATUS_HDAUDIO_NULL_LINKED_LIST_ENTRY: ::NTSTATUS = 0xC0440005u32 as i32;
-pub const STATUS_SPACES_RESILIENCY_TYPE_INVALID: ::NTSTATUS = 0xC0E70003u32 as i32;
-pub const STATUS_SPACES_DRIVE_SECTOR_SIZE_INVALID: ::NTSTATUS = 0xC0E70004u32 as i32;
-pub const STATUS_SPACES_DRIVE_REDUNDANCY_INVALID: ::NTSTATUS = 0xC0E70006u32 as i32;
-pub const STATUS_SPACES_NUMBER_OF_DATA_COPIES_INVALID: ::NTSTATUS = 0xC0E70007u32 as i32;
-pub const STATUS_SPACES_INTERLEAVE_LENGTH_INVALID: ::NTSTATUS = 0xC0E70009u32 as i32;
-pub const STATUS_SPACES_NUMBER_OF_COLUMNS_INVALID: ::NTSTATUS = 0xC0E7000Au32 as i32;
-pub const STATUS_SPACES_NOT_ENOUGH_DRIVES: ::NTSTATUS = 0xC0E7000Bu32 as i32;
-pub const STATUS_SPACES_EXTENDED_ERROR: ::NTSTATUS = 0xC0E7000Cu32 as i32;
-pub const STATUS_SPACES_PROVISIONING_TYPE_INVALID: ::NTSTATUS = 0xC0E7000Du32 as i32;
-pub const STATUS_SPACES_ALLOCATION_SIZE_INVALID: ::NTSTATUS = 0xC0E7000Eu32 as i32;
-pub const STATUS_SPACES_ENCLOSURE_AWARE_INVALID: ::NTSTATUS = 0xC0E7000Fu32 as i32;
-pub const STATUS_SPACES_WRITE_CACHE_SIZE_INVALID: ::NTSTATUS = 0xC0E70010u32 as i32;
-pub const STATUS_SPACES_NUMBER_OF_GROUPS_INVALID: ::NTSTATUS = 0xC0E70011u32 as i32;
-pub const STATUS_SPACES_DRIVE_OPERATIONAL_STATE_INVALID: ::NTSTATUS = 0xC0E70012u32 as i32;
-pub const STATUS_SPACES_UPDATE_COLUMN_STATE: ::NTSTATUS = 0xC0E70013u32 as i32;
-pub const STATUS_SPACES_MAP_REQUIRED: ::NTSTATUS = 0xC0E70014u32 as i32;
-pub const STATUS_SPACES_UNSUPPORTED_VERSION: ::NTSTATUS = 0xC0E70015u32 as i32;
-pub const STATUS_SPACES_CORRUPT_METADATA: ::NTSTATUS = 0xC0E70016u32 as i32;
-pub const STATUS_SPACES_DRT_FULL: ::NTSTATUS = 0xC0E70017u32 as i32;
-pub const STATUS_SPACES_INCONSISTENCY: ::NTSTATUS = 0xC0E70018u32 as i32;
-pub const STATUS_SPACES_LOG_NOT_READY: ::NTSTATUS = 0xC0E70019u32 as i32;
-pub const STATUS_SPACES_NO_REDUNDANCY: ::NTSTATUS = 0xC0E7001Au32 as i32;
-pub const STATUS_SPACES_DRIVE_NOT_READY: ::NTSTATUS = 0xC0E7001Bu32 as i32;
-pub const STATUS_SPACES_REPAIRED: ::NTSTATUS = 0x00E7001C;
-pub const STATUS_SPACES_PAUSE: ::NTSTATUS = 0x00E7001D;
-pub const STATUS_SPACES_COMPLETE: ::NTSTATUS = 0x00E7001E;
-pub const STATUS_VOLSNAP_BOOTFILE_NOT_VALID: ::NTSTATUS = 0xC0500003u32 as i32;
-pub const STATUS_IO_PREEMPTED: ::NTSTATUS = 0xC0510001u32 as i32;
-pub const STATUS_SVHDX_ERROR_STORED: ::NTSTATUS = 0xC05C0000u32 as i32;
-pub const STATUS_SVHDX_ERROR_NOT_AVAILABLE: ::NTSTATUS = 0xC05CFF00u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_AVAILABLE: ::NTSTATUS = 0xC05CFF01u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_CAPACITY_DATA_CHANGED: ::NTSTATUS = 0xC05CFF02u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_RESERVATIONS_PREEMPTED: ::NTSTATUS = 0xC05CFF03u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_RESERVATIONS_RELEASED: ::NTSTATUS = 0xC05CFF04u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_REGISTRATIONS_PREEMPTED: ::NTSTATUS = 0xC05CFF05u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_OPERATING_DEFINITION_CHANGED: ::NTSTATUS = 0xC05CFF06u32 as i32;
-pub const STATUS_SVHDX_RESERVATION_CONFLICT: ::NTSTATUS = 0xC05CFF07u32 as i32;
-pub const STATUS_SVHDX_WRONG_FILE_TYPE: ::NTSTATUS = 0xC05CFF08u32 as i32;
-pub const STATUS_SVHDX_VERSION_MISMATCH: ::NTSTATUS = 0xC05CFF09u32 as i32;
-pub const STATUS_VHD_SHARED: ::NTSTATUS = 0xC05CFF0Au32 as i32;
-pub const STATUS_SVHDX_NO_INITIATOR: ::NTSTATUS = 0xC05CFF0Bu32 as i32;
-pub const STATUS_VHDSET_BACKING_STORAGE_NOT_FOUND: ::NTSTATUS = 0xC05CFF0Cu32 as i32;
-pub const STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP: ::NTSTATUS = 0xC05D0000u32 as i32;
-pub const STATUS_SMB_BAD_CLUSTER_DIALECT: ::NTSTATUS = 0xC05D0001u32 as i32;
-pub const STATUS_SMB_GUEST_LOGON_BLOCKED: ::NTSTATUS = 0xC05D0002u32 as i32;
-pub const STATUS_SECCORE_INVALID_COMMAND: ::NTSTATUS = 0xC0E80000u32 as i32;
-pub const STATUS_VSM_NOT_INITIALIZED: ::NTSTATUS = 0xC0450000u32 as i32;
-pub const STATUS_VSM_DMA_PROTECTION_NOT_IN_USE: ::NTSTATUS = 0xC0450001u32 as i32;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/oaidl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/oaidl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/oaidl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/oaidl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,590 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of OAIdl.h
-pub type wireBRECORD = *mut _wireBRECORD;
-pub type wireVARIANT = *mut _wireVARIANT;
-STRUCT!{struct SAFEARRAYBOUND {
-    cElements: ::ULONG,
-    lLbound: ::LONG,
-}}
-STRUCT!{struct SAFEARR_BSTR {
-    Size: ::ULONG,
-    aBstr: *mut ::wireBSTR,
-}}
-STRUCT!{struct SAFEARR_UNKNOWN {
-    Size: ::ULONG,
-    apUnknown: *mut *mut ::IUnknown,
-}}
-STRUCT!{struct SAFEARR_DISPATCH {
-    Size: ::ULONG,
-    apDispatch: *mut *mut IDispatch,
-}}
-STRUCT!{struct SAFEARR_VARIANT {
-    Size: ::ULONG,
-    aVariant: *mut wireVARIANT,
-}}
-STRUCT!{struct SAFEARR_BRECORD {
-    Size: ::ULONG,
-    aRecord: *mut wireBRECORD,
-}}
-STRUCT!{struct SAFEARR_HAVEIID {
-    Size: ::ULONG,
-    apUnknown: *mut *mut ::IUnknown,
-    iid: ::IID,
-}}
-ENUM!{enum SF_TYPE {
-    SF_ERROR = ::VT_ERROR.0,
-    SF_I1 = ::VT_I1.0,
-    SF_I2 = ::VT_I2.0,
-    SF_I4 = ::VT_I4.0,
-    SF_I8 = ::VT_I8.0,
-    SF_BSTR = ::VT_BSTR.0,
-    SF_UNKNOWN = ::VT_UNKNOWN.0,
-    SF_DISPATCH = ::VT_DISPATCH.0,
-    SF_VARIANT = ::VT_VARIANT.0,
-    SF_RECORD = ::VT_RECORD.0,
-    SF_HAVEIID = ::VT_UNKNOWN.0 | ::VT_RESERVED.0,
-}}
-STRUCT!{struct SAFEARRAYUNION {
-    sfType: ::ULONG,
-    u: __MIDL_IOleAutomationTypes_0001,
-}}
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct __MIDL_IOleAutomationTypes_0001 {
-    data0: u32,
-    data1: [u32; 6],
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct __MIDL_IOleAutomationTypes_0001 {
-    data0: u32,
-    data1: [u32; 5],
-}}
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, BstrStr, BstrStr_mut, SAFEARR_BSTR);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, UnknownStr, UnknownStr_mut, SAFEARR_UNKNOWN);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, DispatchStr, DispatchStr_mut, SAFEARR_DISPATCH);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, VariantStr, VariantStr_mut, SAFEARR_VARIANT);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, RecordStr, RecordStr_mut, SAFEARR_BRECORD);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, HaveIidStr, HaveIidStr_mut, SAFEARR_HAVEIID);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, ByteStr, ByteStr_mut, ::BYTE_SIZEDARR);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, WordStr, WordStr_mut, ::WORD_SIZEDARR);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, LongStr, LongStr_mut, ::DWORD_SIZEDARR);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, HyperStr, HyperStr_mut, ::HYPER_SIZEDARR);
-STRUCT!{struct _wireSAFEARRAY {
-    cDims: ::USHORT,
-    fFeatures: ::USHORT,
-    cbElements: ::ULONG,
-    cLocks: ::ULONG,
-    uArrayStructs: SAFEARRAYUNION,
-    rgsaBound: [SAFEARRAYBOUND; 1],
-}}
-pub type wireSAFEARRAY = *mut _wireSAFEARRAY;
-pub type wirePSAFEARRAY = *mut wireSAFEARRAY;
-STRUCT!{struct SAFEARRAY {
-    cDims: ::USHORT,
-    fFeatures: ::USHORT,
-    cbElements: ::ULONG,
-    cLocks: ::ULONG,
-    pvData: ::PVOID,
-    rgsabound: [SAFEARRAYBOUND; 1],
-}}
-pub type LPSAFEARRAY = *mut SAFEARRAY;
-pub const FADF_AUTO: ::DWORD = 0x1;
-pub const FADF_STATIC: ::DWORD = 0x2;
-pub const FADF_EMBEDDED: ::DWORD = 0x4;
-pub const FADF_FIXEDSIZE: ::DWORD = 0x10;
-pub const FADF_RECORD: ::DWORD = 0x20;
-pub const FADF_HAVEIID: ::DWORD = 0x40;
-pub const FADF_HAVEVARTYPE: ::DWORD = 0x80;
-pub const FADF_BSTR: ::DWORD = 0x100;
-pub const FADF_UNKNOWN: ::DWORD = 0x200;
-pub const FADF_DISPATCH: ::DWORD = 0x400;
-pub const FADF_VARIANT: ::DWORD = 0x800;
-pub const FADF_RESERVED: ::DWORD = 0xf008;
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct VARIANT {
-    data0: u64,
-    data1: u64,
-    data2: u64,
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct VARIANT {
-    data0: u64,
-    data1: u32,
-    data2: u32,
-}}
-UNION!(VARIANT, data0, vt, vt_mut, ::VARTYPE);
-UNION!(VARIANT, data1, llVal, llVal_mut, ::LONGLONG);
-UNION!(VARIANT, data1, lVal, lVal_mut, ::LONG);
-UNION!(VARIANT, data1, bVal, bVal_mut, ::BYTE);
-UNION!(VARIANT, data1, iVal, iVal_mut, ::SHORT);
-UNION!(VARIANT, data1, fltVal, fltVal_mut, ::FLOAT);
-UNION!(VARIANT, data1, dblVal, dblVal_mut, ::DOUBLE);
-UNION!(VARIANT, data1, boolVal, boolVal_mut, ::VARIANT_BOOL);
-UNION!(VARIANT, data1, scode, scode_mut, ::SCODE);
-UNION!(VARIANT, data1, cyVal, cyVal_mut, ::CY);
-UNION!(VARIANT, data1, date, date_mut, ::DATE);
-UNION!(VARIANT, data1, bstrVal, bstrVal_mut, ::BSTR);
-UNION!(VARIANT, data1, punkVal, punkVal_mut, *mut ::IUnknown);
-UNION!(VARIANT, data1, pdispVal, pdispVal_mut, *mut IDispatch);
-UNION!(VARIANT, data1, parray, parray_mut, *mut SAFEARRAY);
-UNION!(VARIANT, data1, pllVal, pllVal_mut, *mut ::LONGLONG);
-UNION!(VARIANT, data1, plVal, plVal_mut, *mut ::LONG);
-UNION!(VARIANT, data1, pbVal, pbVal_mut, *mut ::BYTE);
-UNION!(VARIANT, data1, piVal, piVal_mut, *mut ::SHORT);
-UNION!(VARIANT, data1, pfltVal, pfltVal_mut, *mut ::FLOAT);
-UNION!(VARIANT, data1, pdblVal, pdblVal_mut, *mut ::DOUBLE);
-UNION!(VARIANT, data1, pboolVal, pboolVal_mut, *mut ::VARIANT_BOOL);
-UNION!(VARIANT, data1, pscode, pscode_mut, *mut ::SCODE);
-UNION!(VARIANT, data1, pcyVal, pcyVal_mut, *mut ::CY);
-UNION!(VARIANT, data1, pdate, pdate_mut, *mut ::DATE);
-UNION!(VARIANT, data1, pbstrVal, pbstrVal_mut, *mut ::BSTR);
-UNION!(VARIANT, data1, ppunkVal, ppunkVal_mut, *mut *mut ::IUnknown);
-UNION!(VARIANT, data1, ppdispVal, ppdispVal_mut, *mut *mut IDispatch);
-UNION!(VARIANT, data1, pparray, pparray_mut, *mut *mut SAFEARRAY);
-UNION!(VARIANT, data1, pvarVal, pvarVal_mut, *mut VARIANT);
-UNION!(VARIANT, data1, byref, byref_mut, ::PVOID);
-UNION!(VARIANT, data1, cVal, cVal_mut, ::CHAR);
-UNION!(VARIANT, data1, uiVal, uiVal_mut, ::USHORT);
-UNION!(VARIANT, data1, ulVal, ulVal_mut, ::ULONG);
-UNION!(VARIANT, data1, ullVal, ullVal_mut, ::ULONGLONG);
-UNION!(VARIANT, data1, intVal, intVal_mut, ::INT);
-UNION!(VARIANT, data1, uintVal, uintVal_mut, ::UINT);
-UNION!(VARIANT, data1, pdecVal, pdecVal_mut, *mut ::DECIMAL);
-UNION!(VARIANT, data1, pcVal, pcVal_mut, *mut ::CHAR);
-UNION!(VARIANT, data1, puiVal, puiVal_mut, *mut ::USHORT);
-UNION!(VARIANT, data1, pulVal, pulVal_mut, *mut ::ULONG);
-UNION!(VARIANT, data1, pullVal, pullVal_mut, *mut ::ULONGLONG);
-UNION!(VARIANT, data1, pintVal, pintVal_mut, *mut ::INT);
-UNION!(VARIANT, data1, puintVal, puintVal_mut, *mut ::UINT);
-UNION!(VARIANT, data1, pvRecord, pvRecord_mut, ::PVOID);
-UNION!(VARIANT, data2, pRecInfo, pRecInfo_mut, *mut IRecordInfo);
-UNION!(VARIANT, data0, decVal, decVal_mut, ::DECIMAL);
-pub type LPVARIANT = *mut VARIANT;
-pub type VARIANTARG = VARIANT;
-pub type LPVARIANTARG = *mut VARIANT;
-pub type REFVARIANT = *const VARIANT;
-STRUCT!{struct _wireBRECORD {
-    fFlags: ::ULONG,
-    clSize: ::ULONG,
-    pRecInfo: *mut IRecordInfo,
-    pRecord: *mut ::BYTE,
-}}
-STRUCT!{struct _wireVARIANT {
-    clSize: ::DWORD,
-    rpcReserved: ::DWORD,
-    vt: ::USHORT,
-    wReserved1: ::USHORT,
-    wReserved2: ::USHORT,
-    wReserved3: ::USHORT,
-    data0: u64,
-    data1: u64,
-}}
-UNION!(_wireVARIANT, data0, llVal, llVal_mut, ::LONGLONG);
-UNION!(_wireVARIANT, data0, lVal, lVal_mut, ::LONG);
-UNION!(_wireVARIANT, data0, bVal, bVal_mut, ::BYTE);
-UNION!(_wireVARIANT, data0, iVal, iVal_mut, ::SHORT);
-UNION!(_wireVARIANT, data0, fltVal, fltVal_mut, ::FLOAT);
-UNION!(_wireVARIANT, data0, dblVal, dblVal_mut, ::DOUBLE);
-UNION!(_wireVARIANT, data0, boolVal, boolVal_mut, ::VARIANT_BOOL);
-UNION!(_wireVARIANT, data0, scode, scode_mut, ::SCODE);
-UNION!(_wireVARIANT, data0, cyVal, cyVal_mut, ::CY);
-UNION!(_wireVARIANT, data0, date, date_mut, ::DATE);
-UNION!(_wireVARIANT, data0, bstrVal, bstrVal_mut, ::wireBSTR);
-UNION!(_wireVARIANT, data0, punkVal, punkVal_mut, *mut ::IUnknown);
-UNION!(_wireVARIANT, data0, pdispVal, pdispVal_mut, *mut IDispatch);
-UNION!(_wireVARIANT, data0, parray, parray_mut, wirePSAFEARRAY);
-UNION!(_wireVARIANT, data0, brecVal, brecVal_mut, wireBRECORD);
-UNION!(_wireVARIANT, data0, pllVal, pllVal_mut, *mut ::LONGLONG);
-UNION!(_wireVARIANT, data0, plVal, plVal_mut, *mut ::LONG);
-UNION!(_wireVARIANT, data0, pbVal, pbVal_mut, *mut ::BYTE);
-UNION!(_wireVARIANT, data0, piVal, piVal_mut, *mut ::SHORT);
-UNION!(_wireVARIANT, data0, pfltVal, pfltVal_mut, *mut ::FLOAT);
-UNION!(_wireVARIANT, data0, pdblVal, pdblVal_mut, *mut ::DOUBLE);
-UNION!(_wireVARIANT, data0, pboolVal, pboolVal_mut, *mut ::VARIANT_BOOL);
-UNION!(_wireVARIANT, data0, pscode, pscode_mut, *mut ::SCODE);
-UNION!(_wireVARIANT, data0, pcyVal, pcyVal_mut, *mut ::CY);
-UNION!(_wireVARIANT, data0, pdate, pdate_mut, *mut ::DATE);
-UNION!(_wireVARIANT, data0, pbstrVal, pbstrVal_mut, *mut ::wireBSTR);
-UNION!(_wireVARIANT, data0, ppunkVal, ppunkVal_mut, *mut *mut ::IUnknown);
-UNION!(_wireVARIANT, data0, ppdispVal, ppdispVal_mut, *mut *mut IDispatch);
-UNION!(_wireVARIANT, data0, pparray, pparray_mut, *mut wirePSAFEARRAY);
-UNION!(_wireVARIANT, data0, pvarVal, pvarVal_mut, *mut wireVARIANT);
-UNION!(_wireVARIANT, data0, cVal, cVal_mut, ::CHAR);
-UNION!(_wireVARIANT, data0, uiVal, uiVal_mut, ::USHORT);
-UNION!(_wireVARIANT, data0, ulVal, ulVal_mut, ::ULONG);
-UNION!(_wireVARIANT, data0, ullVal, ullVal_mut, ::ULONGLONG);
-UNION!(_wireVARIANT, data0, intVal, intVal_mut, ::INT);
-UNION!(_wireVARIANT, data0, uintVal, uintVal_mut, ::UINT);
-UNION!(_wireVARIANT, data0, decVal, decVal_mut, ::DECIMAL);
-UNION!(_wireVARIANT, data0, pcVal, pcVal_mut, *mut ::CHAR);
-UNION!(_wireVARIANT, data0, puiVal, puiVal_mut, *mut ::USHORT);
-UNION!(_wireVARIANT, data0, pulVal, pulVal_mut, *mut ::ULONG);
-UNION!(_wireVARIANT, data0, pullVal, pullVal_mut, *mut ::ULONGLONG);
-UNION!(_wireVARIANT, data0, pintVal, pintVal_mut, *mut ::INT);
-UNION!(_wireVARIANT, data0, puintVal, puintVal_mut, *mut ::UINT);
-UNION!(_wireVARIANT, data0, pdecVal, pdecVal_mut, *mut ::DECIMAL);
-pub type DISPID = ::LONG;
-pub type MEMBERID = DISPID;
-pub type HREFTYPE = ::DWORD;
-ENUM!{enum TYPEKIND {
-    TKIND_ENUM = 0,
-    TKIND_RECORD,
-    TKIND_MODULE,
-    TKIND_INTERFACE,
-    TKIND_DISPATCH,
-    TKIND_COCLASS,
-    TKIND_ALIAS,
-    TKIND_UNION,
-    TKIND_MAX,
-}}
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct TYPEDESC {
-    data: u64,
-    vt: ::VARTYPE,
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct TYPEDESC {
-    data: u32,
-    vt: ::VARTYPE,
-}}
-UNION!(TYPEDESC, data, lptdesc, lptdesc_mut, *mut TYPEDESC);
-UNION!(TYPEDESC, data, lpadesc, lpadesc_mut, *mut ARRAYDESC);
-UNION!(TYPEDESC, data, hreftype, hreftype_mut, HREFTYPE);
-STRUCT!{struct ARRAYDESC {
-    tdescElem: TYPEDESC,
-    cDims: ::USHORT,
-    rgbounds: [SAFEARRAYBOUND; 1],
-}}
-STRUCT!{struct PARAMDESCEX {
-    cBytes: ::ULONG,
-    varDefaultValue: VARIANTARG,
-}}
-pub type LPPARAMDESCEX = *mut PARAMDESCEX;
-STRUCT!{struct PARAMDESC {
-    pparamdescex: LPPARAMDESCEX,
-    wParamFlags: ::USHORT,
-}}
-pub type LPPARAMDESC = *mut PARAMDESC;
-pub const PARAMFLAG_NONE: ::DWORD = 0;
-pub const PARAMFLAG_FIN: ::DWORD = 0x1;
-pub const PARAMFLAG_FOUT: ::DWORD = 0x2;
-pub const PARAMFLAG_FLCID: ::DWORD = 0x4;
-pub const PARAMFLAG_FRETVAL: ::DWORD = 0x8;
-pub const PARAMFLAG_FOPT: ::DWORD = 0x10;
-pub const PARAMFLAG_FHASDEFAULT: ::DWORD = 0x20;
-pub const PARAMFLAG_FHASCUSTDATA: ::DWORD = 0x40;
-STRUCT!{struct IDLDESC {
-    dwReserved: ::ULONG_PTR,
-    wIDLFlags: ::USHORT,
-}}
-pub type LPIDLDESC = *mut IDLDESC;
-pub const IDLFLAG_NONE: ::DWORD = PARAMFLAG_NONE;
-pub const IDLFLAG_FIN: ::DWORD = PARAMFLAG_FIN;
-pub const IDLFLAG_FOUT: ::DWORD = PARAMFLAG_FOUT;
-pub const IDLFLAG_FLCID: ::DWORD = PARAMFLAG_FLCID;
-pub const IDLFLAG_FRETVAL: ::DWORD = PARAMFLAG_FRETVAL;
-STRUCT!{struct ELEMDESC {
-    tdesc: TYPEDESC,
-    idldesc: IDLDESC,
-}}
-UNION!(ELEMDESC, idldesc, paramdesc, paramdesc_mut, PARAMDESC);
-pub type LPELEMDESC = *mut ELEMDESC;
-STRUCT!{struct TYPEATTR {
-    guid: ::GUID,
-    lcid: ::LCID,
-    dwReserved: ::DWORD,
-    memidConstructor: ::MEMBERID,
-    memidDestructor: ::MEMBERID,
-    lpstrSchema: ::LPOLESTR,
-    cbSizeInstance: ::ULONG,
-    typekind: ::TYPEKIND,
-    cFuncs: ::WORD,
-    cVars: ::WORD,
-    cImplTypes: ::WORD,
-    cbSizeVft: ::WORD,
-    cbAlignment: ::WORD,
-    wTypeFlags: ::WORD,
-    wMajorVerNum: ::WORD,
-    wMinorVerNum: ::WORD,
-    tdescAlias: ::TYPEDESC,
-    idldescType: ::IDLDESC,
-}}
-pub type LPTYPEATTR = *mut TYPEATTR;
-STRUCT!{struct DISPPARAMS {
-    rgvarg: *mut VARIANTARG,
-    rgdispidNamedArgs: *mut DISPID,
-    cArgs: ::UINT,
-    cNamedArgs: ::UINT,
-}}
-STRUCT!{nodebug struct EXCEPINFO {
-    wCode: ::WORD,
-    wReserved: ::WORD,
-    bstrSource: ::BSTR,
-    bstrDescription: ::BSTR,
-    bstrHelpFile: ::BSTR,
-    dwHelpContext: ::DWORD,
-    pvReserved: ::PVOID,
-    pfnDeferredFillIn: Option<unsafe extern "system" fn(einfo: *mut EXCEPINFO) -> ::HRESULT>,
-    scode: ::SCODE,
-}}
-ENUM!{enum CALLCONV {
-    CC_FASTCALL = 0,
-    CC_CDECL = 1,
-    CC_MSCPASCAL,
-    CC_PASCAL,
-    CC_MACPASCAL,
-    CC_STDCALL,
-    CC_FPFASTCALL,
-    CC_SYSCALL,
-    CC_MPWCDECL,
-    CC_MPWPASCAL,
-    CC_MAX,
-}}
-ENUM!{enum FUNCKIND {
-    FUNC_VIRTUAL = 0,
-    FUNC_PUREVIRTUAL,
-    FUNC_NONVIRTUAL,
-    FUNC_STATIC,
-    FUNC_DISPATCH,
-}}
-FLAGS!{enum INVOKEKIND {
-    INVOKE_FUNC = 1,
-    INVOKE_PROPERTYGET = 2,
-    INVOKE_PROPERTYPUT = 4,
-    INVOKE_PROPERTYPUTREF = 8,
-}}
-STRUCT!{struct FUNCDESC {
-    memid: ::MEMBERID,
-    lprgscode: *mut ::SCODE,
-    lprgelemdescParam: *mut ::ELEMDESC,
-    funckind: ::FUNCKIND,
-    invkind: ::INVOKEKIND,
-    callconv: ::CALLCONV,
-    cParams: ::SHORT,
-    cParamsOpt: ::SHORT,
-    oVft: ::SHORT,
-    cScodes: ::SHORT,
-    elemdescFunc: ::ELEMDESC,
-    wFuncFlags: ::WORD,
-}}
-pub type LPFUNCDESC = *mut FUNCDESC;
-ENUM!{enum VARKIND {
-    VAR_PERINSTANCE = 0,
-    VAR_STATIC,
-    VAR_CONST,
-    VAR_DISPATCH,
-}}
-pub const IMPLTYPEFLAG_FDEFAULT: ::DWORD = 0x1;
-pub const IMPLTYPEFLAG_FSOURCE: ::DWORD = 0x2;
-pub const IMPLTYPEFLAG_FRESTRICTED: ::DWORD = 0x4;
-pub const IMPLTYPEFLAG_FDEFAULTVTABLE: ::DWORD = 0x8;
-STRUCT!{struct VARDESC {
-    memid: MEMBERID,
-    lpstrSchema: ::LPOLESTR,
-    lpvarValue: *mut VARIANT,
-    elemdescVar: ::ELEMDESC,
-    wVarFlags: ::WORD,
-    varkind: VARKIND,
-}}
-UNION!(VARDESC, lpvarValue, oInst, oInst_mut, ::ULONG);
-pub type LPVARDESC = *mut VARDESC;
-FLAGS!{enum TYPEFLAGS {
-    TYPEFLAG_FAPPOBJECT = 0x1,
-    TYPEFLAG_FCANCREATE = 0x2,
-    TYPEFLAG_FLICENSED  = 0x4,
-    TYPEFLAG_FPREDECLID = 0x8,
-    TYPEFLAG_FHIDDEN = 0x10,
-    TYPEFLAG_FCONTROL = 0x20,
-    TYPEFLAG_FDUAL = 0x40,
-    TYPEFLAG_FNONEXTENSIBLE = 0x80,
-    TYPEFLAG_FOLEAUTOMATION = 0x100,
-    TYPEFLAG_FRESTRICTED = 0x200,
-    TYPEFLAG_FAGGREGATABLE = 0x400,
-    TYPEFLAG_FREPLACEABLE = 0x800,
-    TYPEFLAG_FDISPATCHABLE = 0x1000,
-    TYPEFLAG_FREVERSEBIND = 0x2000,
-    TYPEFLAG_FPROXY = 0x4000,
-}}
-FLAGS!{enum FUNCFLAGS {
-    FUNCFLAG_FRESTRICTED = 0x1,
-    FUNCFLAG_FSOURCE = 0x2,
-    FUNCFLAG_FBINDABLE = 0x4,
-    FUNCFLAG_FREQUESTEDIT = 0x8,
-    FUNCFLAG_FDISPLAYBIND = 0x10,
-    FUNCFLAG_FDEFAULTBIND = 0x20,
-    FUNCFLAG_FHIDDEN = 0x40,
-    FUNCFLAG_FUSESGETLASTERROR = 0x80,
-    FUNCFLAG_FDEFAULTCOLLELEM = 0x100,
-    FUNCFLAG_FUIDEFAULT = 0x200,
-    FUNCFLAG_FNONBROWSABLE = 0x400,
-    FUNCFLAG_FREPLACEABLE = 0x800,
-    FUNCFLAG_FIMMEDIATEBIND = 0x1000,
-}}
-FLAGS!{enum VARFLAGS {
-    VARFLAG_FREADONLY = 0x1,
-    VARFLAG_FSOURCE = 0x2,
-    VARFLAG_FBINDABLE = 0x4,
-    VARFLAG_FREQUESTEDIT = 0x8,
-    VARFLAG_FDISPLAYBIND = 0x10,
-    VARFLAG_FDEFAULTBIND = 0x20,
-    VARFLAG_FHIDDEN = 0x40,
-    VARFLAG_FRESTRICTED = 0x80,
-    VARFLAG_FDEFAULTCOLLELEM = 0x100,
-    VARFLAG_FUIDEFAULT = 0x200,
-    VARFLAG_FNONBROWSABLE = 0x400,
-    VARFLAG_FREPLACEABLE = 0x800,
-    VARFLAG_FIMMEDIATEBIND = 0x1000,
-}}
-STRUCT!{struct CLEANLOCALSTORAGE {
-    pInterface: *mut ::IUnknown,
-    pStorage: ::PVOID,
-    flags: ::DWORD,
-}}
-STRUCT!{struct CUSTDATAITEM {
-    guid: ::GUID,
-    varValue: VARIANTARG,
-}}
-pub type LPCUSTDATAITEM = *mut CUSTDATAITEM;
-STRUCT!{struct CUSTDATA {
-    cCustData: ::DWORD,
-    prgCustData: LPCUSTDATAITEM,
-}}
-pub type LPCUSTDATA = *mut CUSTDATA;
-pub type LPCREATETYPEINFO = *mut ICreateTypeInfo;
-RIDL!(
-interface ICreateTypeInfo(ICreateTypeInfoVtbl): IUnknown(IUnknownVtbl) {
-    fn SetGuid(&mut self, guid: ::REFGUID) -> ::HRESULT,
-    fn SetTypeFlags(&mut self, uTypeFlags: ::UINT) -> ::HRESULT,
-    fn SetDocString(&mut self, pStrDoc: ::LPOLESTR) -> ::HRESULT,
-    fn SetHelpContext(&mut self, dwHelpContext: ::DWORD) -> ::HRESULT,
-    fn SetVersion(&mut self, wMajorVerNum: ::WORD, wMinorVerNum: ::WORD) -> ::HRESULT,
-    fn AddRefTypeInfo(&mut self, pTInfo: *mut ITypeInfo) -> ::HRESULT,
-    fn AddFuncDesc(&mut self, index: ::UINT, pFuncDesc: *mut FUNCDESC) -> ::HRESULT,
-    fn SetImplTypeFlags(&mut self, index: ::UINT, implTypeFlags: ::INT) -> ::HRESULT,
-    fn SetAlignment(&mut self, cbAlignment: ::WORD) -> ::HRESULT,
-    fn SetSchema(&mut self, pStrSchema: ::LPOLESTR) -> ::HRESULT,
-    fn AddVarDesc(&mut self, index: ::UINT, pVarDesc: *mut VARDESC) -> ::HRESULT,
-    fn SetFuncAndParamNames(
-        &mut self, index: ::UINT, rgszNames: *mut ::LPOLESTR, cNames: ::UINT
-    ) -> ::HRESULT,
-    fn SetVarName(&mut self, index: ::UINT, szName: ::LPOLESTR) -> ::HRESULT,
-    fn SetTypeDescAlias(&mut self, pTDescAlias: *mut TYPEDESC) -> ::HRESULT,
-    fn DefineFuncAsDllEntry(
-        &mut self, index: ::UINT, szDllName: ::LPOLESTR, szProcName: ::LPOLESTR
-    ) -> ::HRESULT,
-    fn SetFuncDocString(&mut self, index: ::UINT, szDocString: ::LPOLESTR) -> ::HRESULT,
-    fn SetVarDocString(&mut self, index: ::UINT, szDocString: ::LPOLESTR) -> ::HRESULT,
-    fn SetFuncHelpContext(&mut self, index: ::UINT, dwHelpContext: ::DWORD) -> ::HRESULT,
-    fn SetVarHelpContext(&mut self, index: ::UINT, dwHelpContext: ::DWORD) -> ::HRESULT,
-    fn SetMops(&mut self, index: ::UINT, bstrMops: ::BSTR) -> ::HRESULT,
-    fn SetTypeIdldesc(&mut self, pIdlDesc: *mut IDLDESC) -> ::HRESULT,
-    fn LayOut(&mut self) -> ::HRESULT
-}
-);
-// FIXME: Implement these interfaces
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICreateTypeInfo2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICreateTypeLib;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICreateTypeLib2;
-pub type LPDISPATCH = *mut IDispatch;
-pub const DISPID_UNKNOWN: ::INT = -1;
-pub const DISPID_VALUE: ::INT = 0;
-pub const DISPID_PROPERTYPUT: ::INT = -3;
-pub const DISPID_NEWENUM: ::INT = -4;
-pub const DISPID_EVALUATE: ::INT = -5;
-pub const DISPID_CONSTRUCTOR: ::INT = -6;
-pub const DISPID_DESTRUCTOR: ::INT = -7;
-pub const DISPID_COLLECT: ::INT = -8;
-RIDL!(
-interface IDispatch(IDispatchVtbl): IUnknown(IUnknownVtbl) {
-    fn GetTypeInfoCount(&mut self, pctinfo: *mut ::UINT) -> ::HRESULT,
-    fn GetTypeInfo(
-        &mut self, iTInfo: ::UINT, lcid: ::LCID, ppTInfo: *mut *mut ITypeInfo
-    ) -> ::HRESULT,
-    fn GetIDsOfNames(
-        &mut self, riid: ::REFIID, rgszNames: *mut ::LPOLESTR, cNames: ::UINT, lcid: ::LCID,
-        rgDispId: *mut ::DISPID
-    ) -> ::HRESULT,
-    fn Invoke(
-        &mut self, dispIdMember: ::DISPID, riid: ::REFIID, lcid: ::LCID, wFlags: ::WORD,
-        pDispParams: *mut ::DISPPARAMS, pVarResult: *mut VARIANT, pExcepInfo: *mut ::EXCEPINFO,
-        puArgErr: *mut ::UINT
-    ) -> ::HRESULT
-}
-);
-// FIXME: Implement these interfaces
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumVARIANT;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeComp;
-RIDL!(
-interface ITypeInfo(ITypeInfoVtbl): IUnknown(IUnknownVtbl) {
-    fn GetTypeAttr(&mut self, ppTypeAttr: *mut *mut TYPEATTR) -> ::HRESULT,
-    fn GetTypeComp(&mut self, ppTComp: *mut *mut ITypeComp) -> ::HRESULT,
-    fn GetFuncDesc(&mut self, index: ::UINT, ppFunDesc: *mut *mut FUNCDESC) -> ::HRESULT,
-    fn GetVarDesc(&mut self, index: ::UINT, pPVarDesc: *mut *mut VARDESC) -> ::HRESULT,
-    fn GetNames(
-        &mut self, memid: MEMBERID, rgBstrNames: *mut ::BSTR, cMaxNames: ::UINT,
-        pcNames: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetRefTypeOfImplType(&mut self, index: ::UINT, pRefType: *mut HREFTYPE) -> ::HRESULT,
-    fn GetImplTypeFlags(&mut self, index: ::UINT, pImplTypeFlags: *mut ::INT) -> ::HRESULT,
-    fn GetIDsOfNames(
-        &mut self, rgszNames: *mut ::LPOLESTR, cNames: ::UINT, pMemId: *mut MEMBERID
-    ) -> ::HRESULT,
-    fn Invoke(
-        &mut self, pvInstance: ::PVOID, memid: MEMBERID, wFlags: ::WORD,
-        pDispParams: *mut DISPPARAMS, pVarResult: *mut VARIANT, pExcepInfo: *mut EXCEPINFO,
-        puArgErr: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetDocumentation(
-        &mut self, memid: MEMBERID, pBstrName: *mut ::BSTR, pBstrDocString: *mut ::BSTR,
-        pdwHelpContext: *mut ::DWORD, pBstrHelpFile: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn GetDllEntry(
-        &mut self, memid: MEMBERID, invKind: ::INVOKEKIND, pBstrDllName: *mut ::BSTR,
-        pBstrName: *mut ::BSTR, pwOrdinal: *mut ::WORD
-    ) -> ::HRESULT,
-    fn GetRefTypeInfo(&mut self, hRefType: HREFTYPE, ppTInfo: *mut *mut ITypeInfo) -> ::HRESULT,
-    fn AddressOfMember(
-        &mut self, memid: MEMBERID, invKind: ::INVOKEKIND, ppv: *mut ::PVOID
-    ) -> ::HRESULT,
-    fn CreateInstance(
-        &mut self, pUnkOuter: *mut ::IUnknown, riid: ::REFIID, ppvObj: *mut ::PVOID
-    ) -> ::HRESULT,
-    fn GetMops(&mut self, memid: MEMBERID, pBstrMops: *mut ::BSTR) -> ::HRESULT,
-    fn GetContainingTypeLib(
-        &mut self, ppTLib: *mut *mut ITypeLib, pIndex: *mut ::UINT
-    ) -> ::HRESULT,
-    fn ReleaseTypeAttr(&mut self, pTypeAttr: *mut TYPEATTR) -> (),
-    fn ReleaseFuncDesc(&mut self, pFuncDesc: *mut FUNCDESC) -> (),
-    fn ReleaseVarDesc(&mut self, pVarDesc: *mut VARDESC) -> ()
-}
-);
-// FIXME: Implement these interfaces
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeInfo2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeLib;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeLib2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeChangeEvents;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IErrorInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICreateErrorInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISupportErrorInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeMarshal;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRecordInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IErrorLog;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPropertyBag;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/objbase.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/objbase.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/objbase.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/objbase.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-//! Component object model defintions
-pub const COINIT_APARTMENTTHREADED: ::DWORD = 0x2;
-pub const COINIT_MULTITHREADED: ::DWORD = 0x0;
-pub const COINIT_DISABLE_OLE1DDE: ::DWORD = 0x4;
-pub const COINIT_SPEED_OVER_MEMORY: ::DWORD = 0x8;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/objidlbase.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/objidlbase.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/objidlbase.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/objidlbase.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-RIDL!(
-interface IMalloc(IMallocVtbl): IUnknown(IUnknownVtbl) {
-    fn Alloc(&mut self, cb: ::SIZE_T) -> *mut ::c_void,
-    fn Realloc(&mut self, pv: *mut ::c_void, cb: ::SIZE_T) -> *mut ::c_void,
-    fn Free(&mut self, pv: *mut ::c_void) -> (),
-    fn GetSize(&mut self, pv: *mut ::c_void) -> ::SIZE_T,
-    fn DidAlloc(&mut self, pv: *mut ::c_void) -> ::c_int,
-    fn HeapMinimize(&mut self) -> ()
-}
-);
-pub type LPMALLOC = *mut IMalloc;
-STRUCT!{struct STATSTG {
-    pwcsName: ::LPOLESTR,
-    type_: ::DWORD,
-    cbSize: ::ULARGE_INTEGER,
-    mtime: ::FILETIME,
-    ctime: ::FILETIME,
-    atime: ::FILETIME,
-    grfMode: ::DWORD,
-    grfLocksSupported: ::DWORD,
-    clsid: ::CLSID,
-    grfStateBits: ::DWORD,
-    reserved: ::DWORD,
-}}
-//1945
-pub type IEnumString = ::IUnknown; // TODO
-//2075
-RIDL!(
-interface ISequentialStream(ISequentialStreamVtbl): IUnknown(IUnknownVtbl) {
-    fn Read(&mut self, pv: *mut ::c_void, cb: ::ULONG, pcbRead: *mut ::ULONG) -> ::HRESULT,
-    fn Write(&mut self, pv: *const ::c_void, cb: ::ULONG, pcbWritten: *mut ::ULONG) -> ::HRESULT
-}
-);
-ENUM!{enum STGTY {
-    STGTY_STORAGE = 1,
-    STGTY_STREAM = 2,
-    STGTY_LOCKBYTES = 3,
-    STGTY_PROPERTY = 4,
-}}
-ENUM!{enum STREAM_SEEK {
-    STREAM_SEEK_SET = 0,
-    STREAM_SEEK_CUR = 1,
-    STREAM_SEEK_END = 2,
-}}
-ENUM!{enum LOCKTYPE {
-    LOCK_WRITE = 1,
-    LOCK_EXCLUSIVE = 2,
-    LOCK_ONLYONCE = 4,
-}}
-//2255
-RIDL!(
-interface IStream(IStreamVtbl): ISequentialStream(ISequentialStreamVtbl) {
-    fn Seek(
-        &mut self, dlibMove: ::LARGE_INTEGER, dwOrigin: ::DWORD,
-        plibNewPosition: *mut ::ULARGE_INTEGER
-    ) -> ::HRESULT,
-    fn SetSize(&mut self, libNewSize: ::ULARGE_INTEGER) -> ::HRESULT,
-    fn CopyTo(
-        &mut self, pstm: *mut IStream, cb: ::ULARGE_INTEGER, pcbRead: *mut ::ULARGE_INTEGER,
-        pcbWritten: *mut ::ULARGE_INTEGER
-    ) -> ::HRESULT,
-    fn Commit(&mut self, grfCommitFlags: ::DWORD) -> ::HRESULT,
-    fn Revert(&mut self) -> ::HRESULT,
-    fn LockRegion(
-        &mut self, libOffset: ::ULARGE_INTEGER, cb: ::ULARGE_INTEGER, dwLockType: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockRegion(
-        &mut self, libOffset: ::ULARGE_INTEGER, cb: ::ULARGE_INTEGER, dwLockType: ::DWORD
-    ) -> ::HRESULT,
-    fn Stat(&mut self, pstatstg: *mut STATSTG, grfStatFlag: ::DWORD) -> ::HRESULT,
-    fn Clone(&mut self, ppstm: *mut *mut IStream) -> ::HRESULT
-}
-);
-pub type LPSTREAM = *mut IStream;
-ENUM!{enum APTTYPEQUALIFIER {
-    APTTYPEQUALIFIER_NONE = 0,
-    APTTYPEQUALIFIER_IMPLICIT_MTA = 1,
-    APTTYPEQUALIFIER_NA_ON_MTA = 2,
-    APTTYPEQUALIFIER_NA_ON_STA = 3,
-    APTTYPEQUALIFIER_NA_ON_IMPLICIT_MTA = 4,
-    APTTYPEQUALIFIER_NA_ON_MAINSTA = 5,
-    APTTYPEQUALIFIER_APPLICATION_STA= 6,
-}}
-ENUM!{enum APTTYPE {
-    APTTYPE_CURRENT = -1i32 as u32,
-    APTTYPE_STA = 0,
-    APTTYPE_MTA = 1,
-    APTTYPE_NA = 2,
-    APTTYPE_MAINSTA = 3,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/objidl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/objidl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/objidl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/objidl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-//8402
-STRUCT!{struct BIND_OPTS {
-    cbStruct: ::DWORD,
-    grfFlags: ::DWORD,
-    grfMode: ::DWORD,
-    dwTickCountDeadline: ::DWORD,
-}}
-pub type LPBIND_OPTS = *mut BIND_OPTS;
-//8479
-RIDL!(
-interface IBindCtx(IBindCtxVtbl): IUnknown(IUnknownVtbl) {
-    fn RegisterObjectBound(&mut self, punk: *mut ::IUnknown) -> ::HRESULT,
-    fn RevokeObjectBound(&mut self, punk: *mut ::IUnknown) -> ::HRESULT,
-    fn ReleaseBoundObjects(&mut self) -> ::HRESULT,
-    fn SetBindOptions(&mut self, pbindopts: *mut BIND_OPTS) -> ::HRESULT,
-    fn GetBindOptions(&mut self, pbindopts: *mut BIND_OPTS) -> ::HRESULT,
-    fn GetRunningObjectTable(&mut self, pprot: *mut *mut IRunningObjectTable) -> ::HRESULT,
-    fn RegisterObjectParam(&mut self, pszKey: ::LPOLESTR, punk: *mut ::IUnknown) -> ::HRESULT,
-    fn GetObjectParam(&mut self, pszKey: ::LPOLESTR, ppunk: *mut *mut ::IUnknown) -> ::HRESULT,
-    fn EnumObjectParam(&mut self, ppenum: *mut *mut ::IEnumString) -> ::HRESULT,
-    fn RevokeObjectParam(&mut self, pszKey: ::LPOLESTR) -> ::HRESULT
-}
-);
-//8681
-pub type IEnumMoniker = ::IUnknown; // TODO
-//8958
-RIDL!(
-interface IRunningObjectTable(IRunningObjectTableVtbl): IUnknown(IUnknownVtbl) {
-    fn Register(
-        &mut self, grfFlags: ::DWORD, punkObject: *mut ::IUnknown, pmkObjectName: *mut IMoniker,
-        pdwRegister: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn Revoke(&mut self, dwRegister: ::DWORD) -> ::HRESULT,
-    fn IsRunning(&mut self, pmkObjectName: *mut IMoniker) -> ::HRESULT,
-    fn GetObject(
-        &mut self, pmkObjectName: *mut IMoniker, ppunkObject: *mut *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn NoteChangeTime(&mut self, dwRegister: ::DWORD, pfiletime: *mut ::FILETIME) -> ::HRESULT,
-    fn GetTimeOfLastChange(
-        &mut self, pmkObjectName: *mut IMoniker, pfiletime: *mut ::FILETIME
-    ) -> ::HRESULT,
-    fn EnumRunning(&mut self, ppenumMoniker: *mut *mut IEnumMoniker) -> ::HRESULT
-}
-);
-//9350
-pub type IMoniker = ::IUnknown; // TODO
-pub type EOLE_AUTHENTICATION_CAPABILITIES = ::DWORD;
-pub const EOAC_NONE: ::DWORD = 0;
-pub const EOAC_MUTUAL_AUTH: ::DWORD = 0x1;
-pub const EOAC_STATIC_CLOAKING: ::DWORD = 0x20;
-pub const EOAC_DYNAMIC_CLOAKING: ::DWORD = 0x40;
-pub const EOAC_ANY_AUTHORITY: ::DWORD = 0x80;
-pub const EOAC_MAKE_FULLSIC: ::DWORD = 0x100;
-pub const EOAC_DEFAULT: ::DWORD = 0x800;
-pub const EOAC_SECURE_REFS: ::DWORD = 0x2;
-pub const EOAC_ACCESS_CONTROL: ::DWORD = 0x4;
-pub const EOAC_APPID: ::DWORD = 0x8;
-pub const EOAC_DYNAMIC: ::DWORD = 0x10;
-pub const EOAC_REQUIRE_FULLSIC: ::DWORD = 0x200;
-pub const EOAC_AUTO_IMPERSONATE: ::DWORD = 0x400;
-pub const EOAC_NO_CUSTOM_MARSHAL: ::DWORD = 0x2000;
-pub const EOAC_DISABLE_AAA: ::DWORD = 0x1000;
-STRUCT!{struct SOLE_AUTHENTICATION_SERVICE {
-    dwAuthnSvc: ::DWORD,
-    dwAuthzSvc: ::DWORD,
-    pPrincipalName: *mut ::OLECHAR,
-    hr: ::HRESULT,
-}}
-
-RIDL!(
-interface IApartmentShutdown(IApartmentShutdownVtbl): IUnknown(IUnknownVtbl) {
-    fn OnUninitialize(&mut self, ui64ApartmentIdentifier: ::UINT64) -> ::VOID
-}
-);
-
-RIDL!(
-interface IMarshal(IMarshalVtbl): IUnknown(IUnknownVtbl) {
-    fn GetUnmarshalClass(
-        &mut self, riid: ::REFIID, pv: *const ::VOID, dwDestContext: ::DWORD,
-        pvDestContext: *const ::VOID, mshlflags: ::DWORD, pCid: *mut ::CLSID
-    ) -> ::HRESULT,
-    fn GetMarshalSizeMax(
-        &mut self, riid: ::REFIID, pv: *const ::VOID, dwDestContext: ::DWORD,
-        pvDestContext: *const ::VOID, mshlflags: ::DWORD, pSize: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn MarshalInterface(
-        &mut self, pStm: *const ::IStream, riid: ::REFIID, pv: *const ::VOID,
-        dwDestContext: ::DWORD, pvDestContext: *const ::VOID,
-        mshlflags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnmarshalInterface(
-        &mut self, pStm: *const ::IStream, riid: ::REFIID, ppv: *mut *mut ::VOID
-    ) -> ::HRESULT,
-    fn ReleaseMarshalData(&mut self, pStm: *const ::IStream) -> ::HRESULT,
-    fn DisconnectObject(&mut self, dwReserved: ::DWORD) -> ::HRESULT
-}
-);
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/olectl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/olectl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/olectl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/olectl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! OLE Control interfaces
-//299
-pub const SELFREG_E_FIRST: ::HRESULT = MAKE_SCODE!(::SEVERITY_ERROR, ::FACILITY_ITF, 0x0200);
-pub const SELFREG_E_LAST: ::HRESULT = MAKE_SCODE!(::SEVERITY_ERROR, ::FACILITY_ITF, 0x020F);
-pub const SELFREG_S_FIRST: ::HRESULT = MAKE_SCODE!(::SEVERITY_SUCCESS, ::FACILITY_ITF, 0x0200);
-pub const SELFREG_S_LAST: ::HRESULT = MAKE_SCODE!(::SEVERITY_SUCCESS, ::FACILITY_ITF, 0x020F);
-pub const SELFREG_E_TYPELIB: ::HRESULT = SELFREG_E_FIRST + 0;
-pub const SELFREG_E_CLASS: ::HRESULT = SELFREG_E_FIRST + 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/pdh.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/pdh.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/pdh.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/pdh.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-// Copyright © 2016, Klavs Madsen
-// Licensed under the MIT License <LICENSE.md>
-//! Common Performance Data Helper definitions
-pub const PDH_FMT_RAW: ::DWORD = 0x00000010;
-pub const PDH_FMT_ANSI: ::DWORD = 0x00000020;
-pub const PDH_FMT_UNICODE: ::DWORD = 0x00000040;
-pub const PDH_FMT_LONG: ::DWORD = 0x00000100;
-pub const PDH_FMT_DOUBLE: ::DWORD = 0x00000200;
-pub const PDH_FMT_LARGE: ::DWORD = 0x00000400;
-pub const PDH_FMT_NOSCALE: ::DWORD = 0x00001000;
-pub const PDH_FMT_1000: ::DWORD = 0x00002000;
-pub const PDH_FMT_NODATA: ::DWORD = 0x00004000;
-pub const PDH_FMT_NOCAP100: ::DWORD = 0x00008000;
-pub const PERF_DETAIL_COSTLY: ::DWORD = 0x00010000;
-pub const PERF_DETAIL_STANDARD: ::DWORD = 0x0000FFFF;
-
-pub type PDH_STATUS = ::LONG;
-pub type PDH_HQUERY = ::HANDLE;
-pub type HQUERY = PDH_HQUERY;
-pub type PDH_HCOUNTER = ::HANDLE;
-pub type HCOUNTER = PDH_HCOUNTER;
-
-STRUCT!{struct PDH_FMT_COUNTERVALUE {
-    CStatus: ::DWORD,
-    largeValue: ::LONGLONG,
-}}
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, largeValue, largeValue_mut, ::LONGLONG);
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, longValue, longValue_mut, ::LONG);
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, doubleValue, doubleValue_mut, ::DOUBLE); 
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, AnsiStringValue, AnsiStringValue_mut, ::LPCSTR);
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, WideStringValue, WideStringValue_mut, ::LPCWSTR);
-pub type PPDH_FMT_COUNTERVALUE = *mut PDH_FMT_COUNTERVALUE;
-
-STRUCT!{struct PDH_COUNTER_PATH_ELEMENTS_A {
-    szMachineName: ::LPSTR,
-    szObjectName: ::LPSTR,
-    szInstanceName: ::LPSTR,
-    szParentInstance: ::LPSTR,
-    dwInstanceIndex: ::DWORD,
-    szCounterName: ::LPSTR,
-}}
-pub type PPDH_COUNTER_PATH_ELEMENTS_A = *mut PDH_COUNTER_PATH_ELEMENTS_A;
-
-STRUCT!{struct PDH_COUNTER_PATH_ELEMENTS_W {
-    szMachineName: ::LPWSTR,
-    szObjectName: ::LPWSTR,
-    szInstanceName: ::LPWSTR,
-    szParentInstance: ::LPWSTR,
-    dwInstanceIndex: ::DWORD,
-    szCounterName: ::LPWSTR,
-}}
-pub type PPDH_COUNTER_PATH_ELEMENTS_W = *mut PDH_COUNTER_PATH_ELEMENTS_W;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/playsoundapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/playsoundapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/playsoundapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/playsoundapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub const SND_SYNC: DWORD = 0x0000;
-pub const SND_ASYNC: DWORD = 0x0001;
-pub const SND_NODEFAULT: DWORD = 0x0002;
-pub const SND_MEMORY: DWORD = 0x0004;
-pub const SND_LOOP: DWORD = 0x0008;
-pub const SND_NOSTOP: DWORD = 0x0010;
-pub const SND_NOWAIT: DWORD = 0x00002000;
-pub const SND_ALIAS: DWORD = 0x00010000;
-pub const SND_ALIAS_ID: DWORD = 0x00110000;
-pub const SND_FILENAME: DWORD = 0x00020000;
-pub const SND_RESOURCE: DWORD = 0x00040004;
-pub const SND_PURGE: DWORD = 0x0040;
-pub const SND_APPLICATION: DWORD = 0x0080;
-pub const SND_SENTRY: DWORD = 0x00080000;
-pub const SND_RING: DWORD = 0x00100000;
-pub const SND_SYSTEM: DWORD = 0x00200000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/processsnapshot.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/processsnapshot.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/processsnapshot.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/processsnapshot.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Defines the process snapshot API
-FLAGS!{enum PSS_CAPTURE_FLAGS {
-    PSS_CAPTURE_NONE = 0x00000000,
-    PSS_CAPTURE_VA_CLONE = 0x00000001,
-    PSS_CAPTURE_RESERVED_00000002 = 0x00000002,
-    PSS_CAPTURE_HANDLES = 0x00000004,
-    PSS_CAPTURE_HANDLE_NAME_INFORMATION = 0x00000008,
-    PSS_CAPTURE_HANDLE_BASIC_INFORMATION = 0x00000010,
-    PSS_CAPTURE_HANDLE_TYPE_SPECIFIC_INFORMATION = 0x00000020,
-    PSS_CAPTURE_HANDLE_TRACE = 0x00000040,
-    PSS_CAPTURE_THREADS = 0x00000080,
-    PSS_CAPTURE_THREAD_CONTEXT = 0x00000100,
-    PSS_CAPTURE_THREAD_CONTEXT_EXTENDED = 0x00000200,
-    PSS_CAPTURE_RESERVED_00000400 = 0x00000400,
-    PSS_CAPTURE_VA_SPACE = 0x00000800,
-    PSS_CAPTURE_VA_SPACE_SECTION_INFORMATION = 0x00001000,
-    PSS_CREATE_BREAKAWAY_OPTIONAL = 0x04000000,
-    PSS_CREATE_BREAKAWAY = 0x08000000,
-    PSS_CREATE_FORCE_BREAKAWAY = 0x10000000,
-    PSS_CREATE_USE_VM_ALLOCATIONS = 0x20000000,
-    PSS_CREATE_MEASURE_PERFORMANCE = 0x40000000,
-    PSS_CREATE_RELEASE_SECTION = -2147483648i32 as u32,
-}}
-ENUM!{enum PSS_QUERY_INFORMATION_CLASS {
-    PSS_QUERY_PROCESS_INFORMATION = 0,
-    PSS_QUERY_VA_CLONE_INFORMATION = 1,
-    PSS_QUERY_AUXILIARY_PAGES_INFORMATION = 2,
-    PSS_QUERY_VA_SPACE_INFORMATION = 3,
-    PSS_QUERY_HANDLE_INFORMATION = 4,
-    PSS_QUERY_THREAD_INFORMATION = 5,
-    PSS_QUERY_HANDLE_TRACE_INFORMATION = 6,
-    PSS_QUERY_PERFORMANCE_COUNTERS = 7,
-}}
-ENUM!{enum PSS_WALK_INFORMATION_CLASS {
-    PSS_WALK_AUXILIARY_PAGES = 0,
-    PSS_WALK_VA_SPACE = 1,
-    PSS_WALK_HANDLES = 2,
-    PSS_WALK_THREADS = 3,
-}}
-FLAGS!{enum PSS_DUPLICATE_FLAGS {
-    PSS_DUPLICATE_NONE = 0x00,
-    PSS_DUPLICATE_CLOSE_SOURCE = 0x01,
-}}
-DECLARE_HANDLE!(HPSS, HPSS__);
-DECLARE_HANDLE!(HPSSWALK, HPSSWALK__);
-pub type pAllocRoutine = Option<unsafe extern "system" fn(
-    Context: *mut ::c_void, Size: ::DWORD,
-) -> *mut ::c_void>;
-pub type pFreeRoutine = Option<unsafe extern "system" fn(
-    Context: *mut ::c_void, Address: *mut ::c_void,
-)>;
-STRUCT!{nodebug struct PSS_ALLOCATOR {
-    Context: *mut ::c_void,
-    AllocRoutine: pAllocRoutine,
-    FreeRoutine: pFreeRoutine,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/processthreadsapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/processthreadsapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/processthreadsapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/processthreadsapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct PROCESS_INFORMATION {
-    hProcess: ::HANDLE,
-    hThread: ::HANDLE,
-    dwProcessId: ::DWORD,
-    dwThreadId: ::DWORD,
-}}
-pub type PPROCESS_INFORMATION = *mut PROCESS_INFORMATION;
-pub type LPPROCESS_INFORMATION = *mut PROCESS_INFORMATION;
-STRUCT!{struct STARTUPINFOA {
-    cb: ::DWORD,
-    lpReserved: ::LPSTR,
-    lpDesktop: ::LPSTR,
-    lpTitle: ::LPSTR,
-    dwX: ::DWORD,
-    dwY: ::DWORD,
-    dwXSize: ::DWORD,
-    dwYSize: ::DWORD,
-    dwXCountChars: ::DWORD,
-    dwYCountChars: ::DWORD,
-    dwFillAttribute: ::DWORD,
-    dwFlags: ::DWORD,
-    wShowWindow: ::WORD,
-    cbReserved2: ::WORD,
-    lpReserved2: ::LPBYTE,
-    hStdInput: ::HANDLE,
-    hStdOutput: ::HANDLE,
-    hStdError: ::HANDLE,
-}}
-pub type LPSTARTUPINFOA = *mut STARTUPINFOA;
-STRUCT!{struct STARTUPINFOW {
-    cb: ::DWORD,
-    lpReserved: ::LPWSTR,
-    lpDesktop: ::LPWSTR,
-    lpTitle: ::LPWSTR,
-    dwX: ::DWORD,
-    dwY: ::DWORD,
-    dwXSize: ::DWORD,
-    dwYSize: ::DWORD,
-    dwXCountChars: ::DWORD,
-    dwYCountChars: ::DWORD,
-    dwFillAttribute: ::DWORD,
-    dwFlags: ::DWORD,
-    wShowWindow: ::WORD,
-    cbReserved2: ::WORD,
-    lpReserved2: ::LPBYTE,
-    hStdInput: ::HANDLE,
-    hStdOutput: ::HANDLE,
-    hStdError: ::HANDLE,
-}}
-pub type LPSTARTUPINFOW = *mut STARTUPINFOW;
-STRUCT!{struct PROC_THREAD_ATTRIBUTE_LIST {
-    dummy: *mut ::c_void,
-}}
-pub type PPROC_THREAD_ATTRIBUTE_LIST = *mut PROC_THREAD_ATTRIBUTE_LIST;
-pub type LPPROC_THREAD_ATTRIBUTE_LIST = *mut PROC_THREAD_ATTRIBUTE_LIST;
-ENUM!{enum THREAD_INFORMATION_CLASS {
-    ThreadMemoryPriority,
-    ThreadAbsoluteCpuPriority,
-    ThreadInformationClassMax,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/propidl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/propidl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/propidl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/propidl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-STRUCT!{struct PROPVARIANT {
-    vt: VARTYPE,
-    wReserved1: WORD,
-    wReserved2: WORD,
-    wReserved3: WORD,
-    data: [u8; 16],
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/propsys.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/propsys.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/propsys.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/propsys.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub type IPropertyDescriptionList = ::IUnknown; // TODO
-pub type IPropertyStore = ::IUnknown; // TODO
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/prsht.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/prsht.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/prsht.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/prsht.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,262 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Interface for the Windows Property Sheet Pages
-pub enum PSP {}
-pub type HPROPSHEETPAGE = *mut PSP;
-pub type LPFNPSPCALLBACKA = Option<unsafe extern "system" fn(
-    hwnd: ::HWND, uMsg: ::UINT, ppsp: *mut PROPSHEETPAGEA,
-) -> ::UINT>;
-pub type LPFNPSPCALLBACKW = Option<unsafe extern "system" fn(
-    hwnd: ::HWND, uMsg: ::UINT, ppsp: *mut PROPSHEETPAGEW,
-) -> ::UINT>;
-pub const PSP_DEFAULT: ::DWORD = 0x00000000;
-pub const PSP_DLGINDIRECT: ::DWORD = 0x00000001;
-pub const PSP_USEHICON: ::DWORD = 0x00000002;
-pub const PSP_USEICONID: ::DWORD = 0x00000004;
-pub const PSP_USETITLE: ::DWORD = 0x00000008;
-pub const PSP_RTLREADING: ::DWORD = 0x00000010;
-pub const PSP_HASHELP: ::DWORD = 0x00000020;
-pub const PSP_USEREFPARENT: ::DWORD = 0x00000040;
-pub const PSP_USECALLBACK: ::DWORD = 0x00000080;
-pub const PSP_PREMATURE: ::DWORD = 0x00000400;
-pub const PSP_HIDEHEADER: ::DWORD = 0x00000800;
-pub const PSP_USEHEADERTITLE: ::DWORD = 0x00001000;
-pub const PSP_USEHEADERSUBTITLE: ::DWORD = 0x00002000;
-pub const PSP_USEFUSIONCONTEXT: ::DWORD = 0x00004000;
-pub const PSPCB_ADDREF: ::UINT = 0;
-pub const PSPCB_RELEASE: ::UINT = 1;
-pub const PSPCB_CREATE: ::UINT = 2;
-pub type PROPSHEETPAGE_RESOURCE = ::LPCDLGTEMPLATEA;
-STRUCT!{nodebug struct PROPSHEETPAGEA_V4 {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hInstance: ::HINSTANCE,
-    pszTemplate: ::LPCSTR,
-    hIcon: ::HICON,
-    pszTitle: ::LPCSTR,
-    pfnDlgProc: ::DLGPROC,
-    lParam: ::LPARAM,
-    pfnCallback: LPFNPSPCALLBACKA,
-    pcRefParent: *mut ::UINT,
-    pszHeaderTitle: ::LPCSTR,
-    pszHeaderSubTitle: ::LPCSTR,
-    hActCtx: ::HANDLE,
-    hbmHeader: ::HBITMAP,
-}}
-UNION!(PROPSHEETPAGEA_V4, pszTemplate, pResource, pResource_mut, PROPSHEETPAGE_RESOURCE);
-UNION!(PROPSHEETPAGEA_V4, hIcon, pszIcon, pszIcon_mut, ::LPCSTR);
-UNION!(PROPSHEETPAGEA_V4, hbmHeader, pszbmHeader, pszbmHeader_mut, ::LPCSTR);
-pub type LPPROPSHEETPAGEA_V4 = *mut PROPSHEETPAGEA_V4;
-pub type LPCPROPSHEETPAGEA_V4 = *const PROPSHEETPAGEA_V4;
-STRUCT!{nodebug struct PROPSHEETPAGEW_V4 {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hInstance: ::HINSTANCE,
-    pszTemplate: ::LPCWSTR,
-    hIcon: ::HICON,
-    pszTitle: ::LPCWSTR,
-    pfnDlgProc: ::DLGPROC,
-    lParam: ::LPARAM,
-    pfnCallback: LPFNPSPCALLBACKW,
-    pcRefParent: *mut ::UINT,
-    pszHeaderTitle: ::LPCWSTR,
-    pszHeaderSubTitle: ::LPCWSTR,
-    hActCtx: ::HANDLE,
-    hbmHeader: ::HBITMAP,
-}}
-UNION!(PROPSHEETPAGEW_V4, pszTemplate, pResource, pResource_mut, PROPSHEETPAGE_RESOURCE);
-UNION!(PROPSHEETPAGEW_V4, hIcon, pszIcon, pszIcon_mut, ::LPCWSTR);
-UNION!(PROPSHEETPAGEW_V4, hbmHeader, pszbmHeader, pszbmHeader_mut, ::LPCWSTR);
-pub type LPPROPSHEETPAGEW_V4 = *mut PROPSHEETPAGEW_V4;
-pub type LPCPROPSHEETPAGEW_V4 = *const PROPSHEETPAGEW_V4;
-pub type PROPSHEETPAGEA_LATEST = PROPSHEETPAGEA_V4;
-pub type PROPSHEETPAGEW_LATEST = PROPSHEETPAGEW_V4;
-pub type LPPROPSHEETPAGEA_LATEST = LPPROPSHEETPAGEA_V4;
-pub type LPPROPSHEETPAGEW_LATEST = LPPROPSHEETPAGEW_V4;
-pub type LPCPROPSHEETPAGEA_LATEST = LPCPROPSHEETPAGEA_V4;
-pub type LPCPROPSHEETPAGEW_LATEST = LPCPROPSHEETPAGEW_V4;
-pub type PROPSHEETPAGEA = PROPSHEETPAGEA_V4;
-pub type PROPSHEETPAGEW = PROPSHEETPAGEW_V4;
-pub type LPPROPSHEETPAGEA = LPPROPSHEETPAGEA_V4;
-pub type LPPROPSHEETPAGEW = LPPROPSHEETPAGEW_V4;
-pub type LPCPROPSHEETPAGEA = LPCPROPSHEETPAGEA_V4;
-pub type LPCPROPSHEETPAGEW = LPCPROPSHEETPAGEW_V4;
-pub const PSH_DEFAULT: ::DWORD = 0x00000000;
-pub const PSH_PROPTITLE: ::DWORD = 0x00000001;
-pub const PSH_USEHICON: ::DWORD = 0x00000002;
-pub const PSH_USEICONID: ::DWORD = 0x00000004;
-pub const PSH_PROPSHEETPAGE: ::DWORD = 0x00000008;
-pub const PSH_WIZARDHASFINISH: ::DWORD = 0x00000010;
-pub const PSH_WIZARD: ::DWORD = 0x00000020;
-pub const PSH_USEPSTARTPAGE: ::DWORD = 0x00000040;
-pub const PSH_NOAPPLYNOW: ::DWORD = 0x00000080;
-pub const PSH_USECALLBACK: ::DWORD = 0x00000100;
-pub const PSH_HASHELP: ::DWORD = 0x00000200;
-pub const PSH_MODELESS: ::DWORD = 0x00000400;
-pub const PSH_RTLREADING: ::DWORD = 0x00000800;
-pub const PSH_WIZARDCONTEXTHELP: ::DWORD = 0x00001000;
-pub const PSH_WIZARD97: ::DWORD = 0x01000000;
-pub const PSH_WATERMARK: ::DWORD = 0x00008000;
-pub const PSH_USEHBMWATERMARK: ::DWORD = 0x00010000;
-pub const PSH_USEHPLWATERMARK: ::DWORD = 0x00020000;
-pub const PSH_STRETCHWATERMARK: ::DWORD = 0x00040000;
-pub const PSH_HEADER: ::DWORD = 0x00080000;
-pub const PSH_USEHBMHEADER: ::DWORD = 0x00100000;
-pub const PSH_USEPAGELANG: ::DWORD = 0x00200000;
-pub const PSH_WIZARD_LITE: ::DWORD = 0x00400000;
-pub const PSH_NOCONTEXTHELP: ::DWORD = 0x02000000;
-pub const PSH_AEROWIZARD: ::DWORD = 0x00004000;
-pub const PSH_RESIZABLE: ::DWORD = 0x04000000;
-pub const PSH_HEADERBITMAP: ::DWORD = 0x08000000;
-pub const PSH_NOMARGIN: ::DWORD = 0x10000000;
-pub type PFNPROPSHEETCALLBACK = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::LPARAM,
-) -> ::c_int>;
-STRUCT!{nodebug struct PROPSHEETHEADERA_V2 {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hwndParent: ::HWND,
-    hInstance: ::HINSTANCE,
-    hIcon: ::HICON,
-    pszCaption: ::LPCSTR,
-    nPages: ::UINT,
-    pStartPage: ::LPCSTR,
-    ppsp: LPCPROPSHEETPAGEA,
-    pfnCallback: PFNPROPSHEETCALLBACK,
-    hbmWatermark: ::HBITMAP,
-    hplWatermark: ::HPALETTE,
-    hbmHeader: ::HBITMAP,
-}}
-UNION!(PROPSHEETHEADERA_V2, hIcon, pszIcon, pszIcon_mut, ::LPCSTR);
-UNION!(PROPSHEETHEADERA_V2, pStartPage, nStartPage, nStartPage_mut, ::UINT);
-UNION!(PROPSHEETHEADERA_V2, ppsp, phpage, phpage_mut, *mut HPROPSHEETPAGE);
-UNION!(PROPSHEETHEADERA_V2, hbmWatermark, pszbmWatermark, pszbmWatermark_mut, ::LPCSTR);
-UNION!(PROPSHEETHEADERA_V2, hbmHeader, pszbmHeader, pszbmHeader_mut, ::LPCSTR);
-pub type LPPROPSHEETHEADERA_V2 = *mut PROPSHEETHEADERA_V2;
-pub type LPCPROPSHEETHEADERA_V2 = *const PROPSHEETHEADERA_V2;
-STRUCT!{nodebug struct PROPSHEETHEADERW_V2 {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hwndParent: ::HWND,
-    hInstance: ::HINSTANCE,
-    hIcon: ::HICON,
-    pszCaption: ::LPCWSTR,
-    nPages: ::UINT,
-    pStartPage: ::LPCWSTR,
-    ppsp: LPCPROPSHEETPAGEW,
-    pfnCallback: PFNPROPSHEETCALLBACK,
-    hbmWatermark: ::HBITMAP,
-    hplWatermark: ::HPALETTE,
-    hbmHeader: ::HBITMAP,
-}}
-UNION!(PROPSHEETHEADERW_V2, hIcon, pszIcon, pszIcon_mut, ::LPCWSTR);
-UNION!(PROPSHEETHEADERW_V2, pStartPage, nStartPage, nStartPage_mut, ::UINT);
-UNION!(PROPSHEETHEADERW_V2, ppsp, phpage, phpage_mut, *mut HPROPSHEETPAGE);
-UNION!(PROPSHEETHEADERW_V2, hbmWatermark, pszbmWatermark, pszbmWatermark_mut, ::LPCWSTR);
-UNION!(PROPSHEETHEADERW_V2, hbmHeader, pszbmHeader, pszbmHeader_mut, ::LPCWSTR);
-pub type LPPROPSHEETHEADERW_V2 = *mut PROPSHEETHEADERW_V2;
-pub type LPCPROPSHEETHEADERW_V2 = *const PROPSHEETHEADERW_V2;
-pub type PROPSHEETHEADERA = PROPSHEETHEADERA_V2;
-pub type PROPSHEETHEADERW = PROPSHEETHEADERW_V2;
-pub type LPPROPSHEETHEADERA = LPPROPSHEETHEADERA_V2;
-pub type LPPROPSHEETHEADERW = LPPROPSHEETHEADERW_V2;
-pub type LPCPROPSHEETHEADERA = LPCPROPSHEETHEADERA_V2;
-pub type LPCPROPSHEETHEADERW = LPCPROPSHEETHEADERW_V2;
-pub const PSCB_INITIALIZED: ::UINT = 1;
-pub const PSCB_PRECREATE: ::UINT = 2;
-pub const PSCB_BUTTONPRESSED: ::UINT = 3;
-pub type LPFNADDPROPSHEETPAGE = Option<unsafe extern "system" fn(
-    HPROPSHEETPAGE, ::LPARAM,
-) -> ::BOOL>;
-pub type LPFNADDPROPSHEETPAGES = Option<unsafe extern "system" fn(
-    ::LPVOID, LPFNADDPROPSHEETPAGE, ::LPARAM,
-) -> ::BOOL>;
-STRUCT!{struct PSHNOTIFY {
-    hdr: ::NMHDR,
-    lParam: ::LPARAM,
-}}
-pub type LPPSHNOTIFY = *mut PSHNOTIFY;
-pub const PSN_FIRST: ::UINT = -200i32 as ::UINT;
-pub const PSN_LAST: ::UINT = -299i32 as ::UINT;
-pub const PSN_SETACTIVE: ::UINT = PSN_FIRST - 0;
-pub const PSN_KILLACTIVE: ::UINT = PSN_FIRST - 1;
-pub const PSN_APPLY: ::UINT = PSN_FIRST - 2;
-pub const PSN_RESET: ::UINT = PSN_FIRST - 3;
-pub const PSN_HELP: ::UINT = PSN_FIRST - 5;
-pub const PSN_WIZBACK: ::UINT = PSN_FIRST - 6;
-pub const PSN_WIZNEXT: ::UINT = PSN_FIRST - 7;
-pub const PSN_WIZFINISH: ::UINT = PSN_FIRST - 8;
-pub const PSN_QUERYCANCEL: ::UINT = PSN_FIRST - 9;
-pub const PSN_GETOBJECT: ::UINT = PSN_FIRST - 10;
-pub const PSN_TRANSLATEACCELERATOR: ::UINT = PSN_FIRST - 12;
-pub const PSN_QUERYINITIALFOCUS: ::UINT = PSN_FIRST - 13;
-pub const PSNRET_NOERROR: ::LRESULT = 0;
-pub const PSNRET_INVALID: ::LRESULT = 1;
-pub const PSNRET_INVALID_NOCHANGEPAGE: ::LRESULT = 2;
-pub const PSNRET_MESSAGEHANDLED: ::LRESULT = 3;
-pub const PSM_SETCURSEL: ::UINT = ::WM_USER + 101;
-pub const PSM_REMOVEPAGE: ::UINT = ::WM_USER + 102;
-pub const PSM_ADDPAGE: ::UINT = ::WM_USER + 103;
-pub const PSM_CHANGED: ::UINT = ::WM_USER + 104;
-pub const PSM_RESTARTWINDOWS: ::UINT = ::WM_USER + 105;
-pub const PSM_REBOOTSYSTEM: ::UINT = ::WM_USER + 106;
-pub const PSM_CANCELTOCLOSE: ::UINT = ::WM_USER + 107;
-pub const PSM_QUERYSIBLINGS: ::UINT = ::WM_USER + 108;
-pub const PSM_UNCHANGED: ::UINT = ::WM_USER + 109;
-pub const PSM_APPLY: ::UINT = ::WM_USER + 110;
-pub const PSM_SETTITLEA: ::UINT = ::WM_USER + 111;
-pub const PSM_SETTITLEW: ::UINT = ::WM_USER + 120;
-pub const PSM_SETWIZBUTTONS: ::UINT = ::WM_USER + 112;
-pub const PSWIZB_BACK: ::DWORD = 0x00000001;
-pub const PSWIZB_NEXT: ::DWORD = 0x00000002;
-pub const PSWIZB_FINISH: ::DWORD = 0x00000004;
-pub const PSWIZB_DISABLEDFINISH: ::DWORD = 0x00000008;
-pub const PSWIZB_CANCEL: ::DWORD = 0x00000008;
-pub const PSWIZBF_ELEVATIONREQUIRED: ::WPARAM = 0x00000001;
-pub const PSBTN_BACK: ::c_int = 0;
-pub const PSBTN_NEXT: ::c_int = 1;
-pub const PSBTN_FINISH: ::c_int = 2;
-pub const PSBTN_OK: ::c_int = 3;
-pub const PSBTN_APPLYNOW: ::c_int = 4;
-pub const PSBTN_CANCEL: ::c_int = 5;
-pub const PSBTN_HELP: ::c_int = 6;
-pub const PSBTN_MAX: ::c_int = 6;
-pub const PSM_PRESSBUTTON: ::UINT = ::WM_USER + 113;
-pub const PSM_SETCURSELID: ::UINT = ::WM_USER + 114;
-pub const PSM_SETFINISHTEXTA: ::UINT = ::WM_USER + 115;
-pub const PSM_SETFINISHTEXTW: ::UINT = ::WM_USER + 121;
-pub const PSM_GETTABCONTROL: ::UINT = ::WM_USER + 116;
-pub const PSM_ISDIALOGMESSAGE: ::UINT = ::WM_USER + 117;
-pub const PSM_GETCURRENTPAGEHWND: ::UINT = ::WM_USER + 118;
-pub const PSM_INSERTPAGE: ::UINT = ::WM_USER + 119;
-pub const PSM_SETHEADERTITLEA: ::UINT = ::WM_USER + 125;
-pub const PSM_SETHEADERTITLEW: ::UINT = ::WM_USER + 126;
-pub const PSWIZF_SETCOLOR: ::UINT = (0 - 1) as ::UINT;
-pub const PSM_SETHEADERSUBTITLEA: ::UINT = ::WM_USER + 127;
-pub const PSM_SETHEADERSUBTITLEW: ::UINT = ::WM_USER + 128;
-pub const PSM_HWNDTOINDEX: ::UINT = ::WM_USER + 129;
-pub const PSM_INDEXTOHWND: ::UINT = ::WM_USER + 130;
-pub const PSM_PAGETOINDEX: ::UINT = ::WM_USER + 131;
-pub const PSM_INDEXTOPAGE: ::UINT = ::WM_USER + 132;
-pub const PSM_IDTOINDEX: ::UINT = ::WM_USER + 133;
-pub const PSM_INDEXTOID: ::UINT = ::WM_USER + 134;
-pub const PSM_GETRESULT: ::UINT = ::WM_USER + 135;
-pub const PSM_RECALCPAGESIZES: ::UINT = ::WM_USER + 136;
-pub const PSM_SETNEXTTEXTW: ::UINT = ::WM_USER + 137;
-pub const PSM_SHOWWIZBUTTONS: ::UINT = ::WM_USER + 138;
-pub const PSM_ENABLEWIZBUTTONS: ::UINT = ::WM_USER + 139;
-pub const PSM_SETBUTTONTEXTW: ::UINT = ::WM_USER + 140;
-pub const PSM_SETBUTTONTEXT: ::UINT = PSM_SETBUTTONTEXTW;
-pub const ID_PSRESTARTWINDOWS: ::INT_PTR = 0x2;
-pub const ID_PSREBOOTSYSTEM: ::INT_PTR = ID_PSRESTARTWINDOWS | 0x1;
-pub const WIZ_CXDLG: ::DWORD = 276;
-pub const WIZ_CYDLG: ::DWORD = 140;
-pub const WIZ_CXBMP: ::DWORD = 80;
-pub const WIZ_BODYX: ::DWORD = 92;
-pub const WIZ_BODYCX: ::DWORD = 184;
-pub const PROP_SM_CXDLG: ::c_short = 212;
-pub const PROP_SM_CYDLG: ::c_short = 188;
-pub const PROP_MED_CXDLG: ::c_short = 227;
-pub const PROP_MED_CYDLG: ::c_short = 215;
-pub const PROP_LG_CXDLG: ::c_short = 252;
-pub const PROP_LG_CYDLG: ::c_short = 218;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/psapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/psapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/psapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/psapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,166 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! API Prototypes and Definitions for PSAPI.DLL
-pub const LIST_MODULES_DEFAULT: ::DWORD = 0x0;
-pub const LIST_MODULES_32BIT: ::DWORD = 0x01;
-pub const LIST_MODULES_64BIT: ::DWORD = 0x02;
-pub const LIST_MODULES_ALL: ::DWORD = LIST_MODULES_32BIT | LIST_MODULES_64BIT;
-STRUCT!{struct MODULEINFO {
-    lpBaseOfDll: ::LPVOID,
-    SizeOfImage: ::DWORD,
-    EntryPoint: ::LPVOID,
-}}
-pub type LPMODULEINFO = *mut MODULEINFO;
-STRUCT!{struct PSAPI_WORKING_SET_BLOCK {
-    Flags: ::ULONG_PTR,
-    BitFields: ::ULONG_PTR,
-}}
-#[cfg(target_arch="x86")]
-BITFIELD!(PSAPI_WORKING_SET_BLOCK BitFields: ::ULONG_PTR [
-    Protection set_Protection[0..5],
-    ShareCount set_ShareCount[5..8],
-    Shared set_Shared[8..9],
-    Reserved set_Reserved[9..12],
-    VirtualPage set_VirtualPage[12..32],
-]);
-#[cfg(target_arch="x86_64")]
-BITFIELD!(PSAPI_WORKING_SET_BLOCK BitFields: ::ULONG_PTR [
-    Protection set_Protection[0..5],
-    ShareCount set_ShareCount[5..8],
-    Shared set_Shared[8..9],
-    Reserved set_Reserved[9..12],
-    VirtualPage set_VirtualPage[12..64],
-]);
-pub type PPSAPI_WORKING_SET_BLOCK = *mut PSAPI_WORKING_SET_BLOCK;
-STRUCT!{struct PSAPI_WORKING_SET_INFORMATION {
-    NumberOfEntries: ::ULONG_PTR,
-    WorkingSetInfo: [PSAPI_WORKING_SET_BLOCK; 1],
-}}
-pub type PPSAPI_WORKING_SET_INFORMATION = *mut PSAPI_WORKING_SET_INFORMATION;
-STRUCT!{struct PSAPI_WORKING_SET_EX_BLOCK_Invalid {
-    BitFields: ::ULONG_PTR,
-}}
-#[cfg(target_arch="x86")]
-BITFIELD!(PSAPI_WORKING_SET_EX_BLOCK_Invalid BitFields: ::ULONG_PTR [
-    Valid set_Valid[0..1],
-    Reserved0 set_Reserved0[1..15],
-    Shared set_Shared[15..16],
-    Reserved1 set_Reserved1[16..31],
-    Bad set_Bad[31..32],
-]);
-#[cfg(target_arch="x86_64")]
-BITFIELD!(PSAPI_WORKING_SET_EX_BLOCK_Invalid BitFields: ::ULONG_PTR [
-    Valid set_Valid[0..1],
-    Reserved0 set_Reserved0[1..15],
-    Shared set_Shared[15..16],
-    Reserved1 set_Reserved1[16..31],
-    Bad set_Bad[31..32],
-    ReservedUlong set_ReservedUlong[32..64],
-]);
-STRUCT!{struct PSAPI_WORKING_SET_EX_BLOCK {
-    Flags: ::ULONG_PTR,
-    BitFields: ::ULONG_PTR,
-}}
-#[cfg(target_arch="x86")]
-BITFIELD!(PSAPI_WORKING_SET_EX_BLOCK BitFields: ::ULONG_PTR [
-    Valid set_Valid[0..1],
-    ShareCount set_ShareCount[1..4],
-    Win32Protection set_Win32Protection[4..15],
-    Shared set_Shared[15..16],
-    Node set_Node[16..22],
-    Locked set_Locked[22..23],
-    LargePage set_LargePage[23..24],
-    Reserved set_Reserved[24..31],
-    Bad set_Bad[31..32],
-]);
-#[cfg(target_arch="x86_64")]
-BITFIELD!(PSAPI_WORKING_SET_EX_BLOCK BitFields: ::ULONG_PTR [
-    Valid set_Valid[0..1],
-    ShareCount set_ShareCount[1..4],
-    Win32Protection set_Win32Protection[4..15],
-    Shared set_Shared[15..16],
-    Node set_Node[16..22],
-    Locked set_Locked[22..23],
-    LargePage set_LargePage[23..24],
-    Reserved set_Reserved[24..31],
-    Bad set_Bad[31..32],
-    ReservedUlong set_ReservedUlong[32..64],
-]);
-UNION!(
-    PSAPI_WORKING_SET_EX_BLOCK, BitFields, Invalid, Invalid_mut, PSAPI_WORKING_SET_EX_BLOCK_Invalid
-);
-pub type PPSAPI_WORKING_SET_EX_BLOCK = *mut PSAPI_WORKING_SET_EX_BLOCK;
-STRUCT!{struct PSAPI_WORKING_SET_EX_INFORMATION {
-    VirtualAddress: ::PVOID,
-    VirtualAttributes: PSAPI_WORKING_SET_EX_BLOCK,
-}}
-pub type PPSAPI_WORKING_SET_EX_INFORMATION = *mut PSAPI_WORKING_SET_EX_INFORMATION;
-STRUCT!{struct PSAPI_WS_WATCH_INFORMATION {
-    FaultingPc: ::LPVOID,
-    FaultingVa: ::LPVOID,
-}}
-pub type PPSAPI_WS_WATCH_INFORMATION = *mut PSAPI_WS_WATCH_INFORMATION;
-STRUCT!{struct PSAPI_WS_WATCH_INFORMATION_EX {
-    BasicInfo: PSAPI_WS_WATCH_INFORMATION,
-    FaultingThreadId: ::ULONG_PTR,
-    Flags: ::ULONG_PTR,
-}}
-pub type PPSAPI_WS_WATCH_INFORMATION_EX = *mut PSAPI_WS_WATCH_INFORMATION_EX;
-STRUCT!{struct PROCESS_MEMORY_COUNTERS {
-    cb: ::DWORD,
-    PageFaultCount: ::DWORD,
-    PeakWorkingSetSize: ::SIZE_T,
-    WorkingSetSize: ::SIZE_T,
-    QuotaPeakPagedPoolUsage: ::SIZE_T,
-    QuotaPagedPoolUsage: ::SIZE_T,
-    QuotaPeakNonPagedPoolUsage: ::SIZE_T,
-    QuotaNonPagedPoolUsage: ::SIZE_T,
-    PagefileUsage: ::SIZE_T,
-    PeakPagefileUsage: ::SIZE_T,
-}}
-pub type PPROCESS_MEMORY_COUNTERS = *mut PROCESS_MEMORY_COUNTERS;
-STRUCT!{struct PROCESS_MEMORY_COUNTERS_EX {
-    cb: ::DWORD,
-    PageFaultCount: ::DWORD,
-    PeakWorkingSetSize: ::SIZE_T,
-    WorkingSetSize: ::SIZE_T,
-    QuotaPeakPagedPoolUsage: ::SIZE_T,
-    QuotaPagedPoolUsage: ::SIZE_T,
-    QuotaPeakNonPagedPoolUsage: ::SIZE_T,
-    QuotaNonPagedPoolUsage: ::SIZE_T,
-    PagefileUsage: ::SIZE_T,
-    PeakPagefileUsage: ::SIZE_T,
-    PrivateUsage: ::SIZE_T,
-}}
-pub type PPROCESS_MEMORY_COUNTERS_EX = *mut PROCESS_MEMORY_COUNTERS_EX;
-STRUCT!{struct PERFORMANCE_INFORMATION {
-    cb: ::DWORD,
-    CommitTotal: ::SIZE_T,
-    CommitLimit: ::SIZE_T,
-    CommitPeak: ::SIZE_T,
-    PhysicalTotal: ::SIZE_T,
-    PhysicalAvailable: ::SIZE_T,
-    SystemCache: ::SIZE_T,
-    KernelTotal: ::SIZE_T,
-    KernelPaged: ::SIZE_T,
-    KernelNonpaged: ::SIZE_T,
-    PageSize: ::SIZE_T,
-    HandleCount: ::DWORD,
-    ProcessCount: ::DWORD,
-    ThreadCount: ::DWORD,
-}}
-pub type PPERFORMANCE_INFORMATION = *mut PERFORMANCE_INFORMATION;
-STRUCT!{struct ENUM_PAGE_FILE_INFORMATION {
-    cb: ::DWORD,
-    Reserved: ::DWORD,
-    TotalSize: ::SIZE_T,
-    TotalInUse: ::SIZE_T,
-    PeakUsage: ::SIZE_T,
-}}
-pub type PENUM_PAGE_FILE_INFORMATION = *mut ENUM_PAGE_FILE_INFORMATION;
-pub type PENUM_PAGE_FILE_CALLBACKA = Option<unsafe extern "system" fn(
-    pContext: ::LPVOID, pPageFileInfo: PENUM_PAGE_FILE_INFORMATION, lpFilename: ::LPCSTR,
-) -> ::BOOL>;
-pub type PENUM_PAGE_FILE_CALLBACKW = Option<unsafe extern "system" fn(
-    pContext: ::LPVOID, pPageFileInfo: PENUM_PAGE_FILE_INFORMATION, lpFilename: ::LPCWSTR,
-) -> ::BOOL>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/qos.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/qos.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/qos.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/qos.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! QoS definitions for NDIS components.
-pub type SERVICETYPE = ::ULONG;
-STRUCT!{struct FLOWSPEC {
-    TokenRate: ::ULONG,
-    TokenBucketSize: ::ULONG,
-    PeakBandwidth: ::ULONG,
-    Latency: ::ULONG,
-    DelayVariation: ::ULONG,
-    ServiceType: SERVICETYPE,
-    MaxSduSize: ::ULONG,
-    MinimumPolicedSize: ::ULONG,
-}}
-pub type PFLOWSPEC = *mut FLOWSPEC;
-pub type LPFLOWSPEC = *mut FLOWSPEC;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/reason.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/reason.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/reason.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/reason.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-// Flags used by the various UIs
-pub const SHTDN_REASON_FLAG_COMMENT_REQUIRED: ::DWORD = 0x01000000;
-pub const SHTDN_REASON_FLAG_DIRTY_PROBLEM_ID_REQUIRED: ::DWORD = 0x02000000;
-pub const SHTDN_REASON_FLAG_CLEAN_UI: ::DWORD = 0x04000000;
-pub const SHTDN_REASON_FLAG_DIRTY_UI: ::DWORD = 0x08000000;
-// Flags that end up in the event log code.
-pub const SHTDN_REASON_FLAG_USER_DEFINED: ::DWORD = 0x40000000;
-pub const SHTDN_REASON_FLAG_PLANNED: ::DWORD = 0x80000000;
-// Microsoft major reasons.
-pub const SHTDN_REASON_MAJOR_OTHER: ::DWORD = 0x00000000;
-pub const SHTDN_REASON_MAJOR_NONE: ::DWORD = 0x00000000;
-pub const SHTDN_REASON_MAJOR_HARDWARE: ::DWORD = 0x00010000;
-pub const SHTDN_REASON_MAJOR_OPERATINGSYSTEM: ::DWORD = 0x00020000;
-pub const SHTDN_REASON_MAJOR_SOFTWARE: ::DWORD = 0x00030000;
-pub const SHTDN_REASON_MAJOR_APPLICATION: ::DWORD = 0x00040000;
-pub const SHTDN_REASON_MAJOR_SYSTEM: ::DWORD = 0x00050000;
-pub const SHTDN_REASON_MAJOR_POWER: ::DWORD = 0x00060000;
-pub const SHTDN_REASON_MAJOR_LEGACY_API: ::DWORD = 0x00070000;
-// Microsoft minor reasons.
-pub const SHTDN_REASON_MINOR_OTHER: ::DWORD = 0x00000000;
-pub const SHTDN_REASON_MINOR_NONE: ::DWORD = 0x000000ff;
-pub const SHTDN_REASON_MINOR_MAINTENANCE: ::DWORD = 0x00000001;
-pub const SHTDN_REASON_MINOR_INSTALLATION: ::DWORD = 0x00000002;
-pub const SHTDN_REASON_MINOR_UPGRADE: ::DWORD = 0x00000003;
-pub const SHTDN_REASON_MINOR_RECONFIG: ::DWORD = 0x00000004;
-pub const SHTDN_REASON_MINOR_HUNG: ::DWORD = 0x00000005;
-pub const SHTDN_REASON_MINOR_UNSTABLE: ::DWORD = 0x00000006;
-pub const SHTDN_REASON_MINOR_DISK: ::DWORD = 0x00000007;
-pub const SHTDN_REASON_MINOR_PROCESSOR: ::DWORD = 0x00000008;
-pub const SHTDN_REASON_MINOR_NETWORKCARD: ::DWORD = 0x00000009;
-pub const SHTDN_REASON_MINOR_POWER_SUPPLY: ::DWORD = 0x0000000a;
-pub const SHTDN_REASON_MINOR_CORDUNPLUGGED: ::DWORD = 0x0000000b;
-pub const SHTDN_REASON_MINOR_ENVIRONMENT: ::DWORD = 0x0000000c;
-pub const SHTDN_REASON_MINOR_HARDWARE_DRIVER: ::DWORD = 0x0000000d;
-pub const SHTDN_REASON_MINOR_OTHERDRIVER: ::DWORD = 0x0000000e;
-pub const SHTDN_REASON_MINOR_BLUESCREEN: ::DWORD = 0x0000000F;
-pub const SHTDN_REASON_MINOR_SERVICEPACK: ::DWORD = 0x00000010;
-pub const SHTDN_REASON_MINOR_HOTFIX: ::DWORD = 0x00000011;
-pub const SHTDN_REASON_MINOR_SECURITYFIX: ::DWORD = 0x00000012;
-pub const SHTDN_REASON_MINOR_SECURITY: ::DWORD = 0x00000013;
-pub const SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY: ::DWORD = 0x00000014;
-pub const SHTDN_REASON_MINOR_WMI: ::DWORD = 0x00000015;
-pub const SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL: ::DWORD = 0x00000016;
-pub const SHTDN_REASON_MINOR_HOTFIX_UNINSTALL: ::DWORD = 0x00000017;
-pub const SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL: ::DWORD = 0x00000018;
-pub const SHTDN_REASON_MINOR_MMC: ::DWORD = 0x00000019;
-pub const SHTDN_REASON_MINOR_SYSTEMRESTORE: ::DWORD = 0x0000001a;
-pub const SHTDN_REASON_MINOR_TERMSRV: ::DWORD = 0x00000020;
-pub const SHTDN_REASON_MINOR_DC_PROMOTION: ::DWORD = 0x00000021;
-pub const SHTDN_REASON_MINOR_DC_DEMOTION: ::DWORD = 0x00000022;
-pub const SHTDN_REASON_UNKNOWN: ::DWORD = SHTDN_REASON_MINOR_NONE;
-pub const SHTDN_REASON_LEGACY_API: ::DWORD =
-    (SHTDN_REASON_MAJOR_LEGACY_API | SHTDN_REASON_FLAG_PLANNED);
-// This mask cuts out UI flags.
-pub const SHTDN_REASON_VALID_BIT_MASK: ::DWORD = 0xc0ffffff;
-// Convenience flags.
-pub const PCLEANUI: ::DWORD = (SHTDN_REASON_FLAG_PLANNED | SHTDN_REASON_FLAG_CLEAN_UI);
-pub const UCLEANUI: ::DWORD = (SHTDN_REASON_FLAG_CLEAN_UI);
-pub const PDIRTYUI: ::DWORD = (SHTDN_REASON_FLAG_PLANNED | SHTDN_REASON_FLAG_DIRTY_UI);
-pub const UDIRTYUI: ::DWORD = (SHTDN_REASON_FLAG_DIRTY_UI);
-//89
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/restrictederrorinfo.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/restrictederrorinfo.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/restrictederrorinfo.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/restrictederrorinfo.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-RIDL!(
-interface IRestrictedErrorInfo(IRestrictedErrorInfoVtbl): IUnknown(IUnknownVtbl) {
-    fn GetErrorDetails(
-        &mut self, description: *mut ::BSTR, error: *mut ::HRESULT,
-        restrictedDescription: *mut ::BSTR, capabilitySid: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn GetReference(&mut self, reference: *mut ::BSTR) -> ::HRESULT
-}
-);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/roapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/roapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/roapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/roapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-ENUM!{enum RO_INIT_TYPE {
-    RO_INIT_SINGLETHREADED = 0,
-    RO_INIT_MULTITHREADED = 1,
-}}
-
-pub enum RO_REGISTRATION_COOKIE__{}
-pub type RO_REGISTRATION_COOKIE = *mut RO_REGISTRATION_COOKIE__;
-
-pub type PFNGETACTIVATIONFACTORY = Option<unsafe extern "system" fn(
-    ::HSTRING, *mut *mut ::IActivationFactory,
-) -> ::HRESULT>;
-
-DECLARE_HANDLE!(APARTMENT_SHUTDOWN_REGISTRATION_COOKIE, APARTMENT_SHUTDOWN_REGISTRATION_COOKIE__);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/roerrorapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/roerrorapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/roerrorapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/roerrorapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-FLAGS!{enum RO_ERROR_REPORTING_FLAGS {
-    RO_ERROR_REPORTING_NONE = 0x00000000,
-    RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS = 0x00000001,
-    RO_ERROR_REPORTING_FORCEEXCEPTIONS = 0x00000002,
-    RO_ERROR_REPORTING_USESETERRORINFO = 0x00000004,
-    RO_ERROR_REPORTING_SUPPRESSSETERRORINFO = 0x00000008,
-}}
-
-pub type PINSPECT_MEMORY_CALLBACK = Option<unsafe extern "system" fn(
-    *const ::VOID, ::UINT_PTR, ::UINT32, *mut ::BYTE,
-) -> ::HRESULT>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/rpcdce.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/rpcdce.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/rpcdce.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/rpcdce.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,535 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-// This module contains the DCE RPC runtime APIs.
-pub type RPC_CSTR = *mut ::c_uchar;
-pub type RPC_WSTR = *mut ::wchar_t;
-pub type RPC_CWSTR = *const ::wchar_t;
-pub type RPC_BINDING_HANDLE = ::I_RPC_HANDLE;
-pub type handle_t = RPC_BINDING_HANDLE;
-pub type rpc_binding_handle_t = RPC_BINDING_HANDLE;
-pub type UUID = ::GUID;
-pub type uuid_t = UUID;
-STRUCT!{struct RPC_BINDING_VECTOR {
-    Count: ::c_ulong,
-    BindingH: [RPC_BINDING_HANDLE; 1],
-}}
-pub type rpc_binding_vector_t = RPC_BINDING_VECTOR;
-STRUCT!{struct UUID_VECTOR {
-    Count: ::c_ulong,
-    Uuid: [*mut UUID; 1],
-}}
-pub type uuid_vector_t = UUID_VECTOR;
-pub type RPC_IF_HANDLE = *mut ::c_void;
-STRUCT!{struct RPC_IF_ID {
-    Uuid: UUID,
-    VersMajor: ::c_ushort,
-    VersMinor: ::c_ushort,
-}}
-pub const RPC_C_BINDING_INFINITE_TIMEOUT: ::DWORD = 10;
-pub const RPC_C_BINDING_MIN_TIMEOUT: ::DWORD = 0;
-pub const RPC_C_BINDING_DEFAULT_TIMEOUT: ::DWORD = 5;
-pub const RPC_C_BINDING_MAX_TIMEOUT: ::DWORD = 9;
-pub const RPC_C_CANCEL_INFINITE_TIMEOUT: ::c_int = -1;
-pub const RPC_C_LISTEN_MAX_CALLS_DEFAULT: ::DWORD = 1234;
-pub const RPC_C_PROTSEQ_MAX_REQS_DEFAULT: ::DWORD = 10;
-pub const RPC_C_BIND_TO_ALL_NICS: ::DWORD = 1;
-pub const RPC_C_USE_INTERNET_PORT: ::DWORD = 0x1;
-pub const RPC_C_USE_INTRANET_PORT: ::DWORD = 0x2;
-pub const RPC_C_DONT_FAIL: ::DWORD = 0x4;
-pub const RPC_C_RPCHTTP_USE_LOAD_BALANCE: ::DWORD = 0x8;
-pub const RPC_C_MQ_TEMPORARY: ::DWORD = 0x0000;
-pub const RPC_C_MQ_PERMANENT: ::DWORD = 0x0001;
-pub const RPC_C_MQ_CLEAR_ON_OPEN: ::DWORD = 0x0002;
-pub const RPC_C_MQ_USE_EXISTING_SECURITY: ::DWORD = 0x0004;
-pub const RPC_C_MQ_AUTHN_LEVEL_NONE: ::DWORD = 0x0000;
-pub const RPC_C_MQ_AUTHN_LEVEL_PKT_INTEGRITY: ::DWORD = 0x0008;
-pub const RPC_C_MQ_AUTHN_LEVEL_PKT_PRIVACY: ::DWORD = 0x0010;
-pub const RPC_C_OPT_MQ_DELIVERY: ::DWORD = 1;
-pub const RPC_C_OPT_MQ_PRIORITY: ::DWORD = 2;
-pub const RPC_C_OPT_MQ_JOURNAL: ::DWORD = 3;
-pub const RPC_C_OPT_MQ_ACKNOWLEDGE: ::DWORD = 4;
-pub const RPC_C_OPT_MQ_AUTHN_SERVICE: ::DWORD = 5;
-pub const RPC_C_OPT_MQ_AUTHN_LEVEL: ::DWORD = 6;
-pub const RPC_C_OPT_MQ_TIME_TO_REACH_QUEUE: ::DWORD = 7;
-pub const RPC_C_OPT_MQ_TIME_TO_BE_RECEIVED: ::DWORD = 8;
-pub const RPC_C_OPT_BINDING_NONCAUSAL: ::DWORD = 9;
-pub const RPC_C_OPT_SECURITY_CALLBACK: ::DWORD = 10;
-pub const RPC_C_OPT_UNIQUE_BINDING: ::DWORD = 11;
-pub const RPC_C_OPT_CALL_TIMEOUT: ::DWORD = 12;
-pub const RPC_C_OPT_DONT_LINGER: ::DWORD = 13;
-pub const RPC_C_OPT_TRUST_PEER: ::DWORD = 14;
-pub const RPC_C_OPT_ASYNC_BLOCK: ::DWORD = 15;
-pub const RPC_C_OPT_OPTIMIZE_TIME: ::DWORD = 16;
-pub const RPC_C_OPT_MAX_OPTIONS: ::DWORD = 17;
-pub const RPC_C_MQ_EXPRESS: ::DWORD = 0;
-pub const RPC_C_MQ_RECOVERABLE: ::DWORD = 1;
-pub const RPC_C_MQ_JOURNAL_NONE: ::DWORD = 0;
-pub const RPC_C_MQ_JOURNAL_DEADLETTER: ::DWORD = 1;
-pub const RPC_C_MQ_JOURNAL_ALWAYS: ::DWORD = 2;
-pub const RPC_C_FULL_CERT_CHAIN: ::DWORD = 0x0001;
-STRUCT!{struct RPC_PROTSEQ_VECTORA {
-    Count: ::c_uint,
-    Protseq: [*mut ::c_uchar; 1],
-}}
-STRUCT!{struct RPC_PROTSEQ_VECTORW {
-    Count: ::c_uint,
-    Protseq: [*mut ::c_ushort; 1],
-}}
-STRUCT!{struct RPC_POLICY {
-    Length: ::c_uint,
-    EndpointFlags: ::c_ulong,
-    NICFlags: ::c_ulong,
-}}
-pub type PRPC_POLICY = *mut RPC_POLICY;
-pub type RPC_OBJECT_INQ_FN = Option<unsafe extern "system" fn(
-    ObjectUuid: *mut UUID, TypeUuid: *mut UUID, Status: *mut ::RPC_STATUS,
-)>;
-pub type RPC_IF_CALLBACK_FN = Option<unsafe extern "system" fn(
-    InterfaceUuid: RPC_IF_HANDLE, Context: *mut ::c_void,
-) -> ::RPC_STATUS>;
-pub type RPC_SECURITY_CALLBACK_FN = Option<unsafe extern "system" fn(Context: *mut ::c_void)>;
-pub type RPC_MGR_EPV = ::c_void;
-STRUCT!{struct RPC_STATS_VECTOR {
-    Count: ::c_uint,
-    Stats: [::c_ulong; 1],
-}}
-pub const RPC_C_STATS_CALLS_IN: ::c_ulong = 0;
-pub const RPC_C_STATS_CALLS_OUT: ::c_ulong = 1;
-pub const RPC_C_STATS_PKTS_IN: ::c_ulong = 2;
-pub const RPC_C_STATS_PKTS_OUT: ::c_ulong = 3;
-STRUCT!{struct RPC_IF_ID_VECTOR {
-    Count: ::c_ulong,
-    IfId: [*mut RPC_IF_ID; 1],
-}}
-pub type RPC_AUTH_IDENTITY_HANDLE = *mut ::c_void;
-pub type RPC_AUTHZ_HANDLE = *mut ::c_void;
-pub const RPC_C_AUTHN_LEVEL_DEFAULT: ::DWORD = 0;
-pub const RPC_C_AUTHN_LEVEL_NONE: ::DWORD = 1;
-pub const RPC_C_AUTHN_LEVEL_CONNECT: ::DWORD = 2;
-pub const RPC_C_AUTHN_LEVEL_CALL: ::DWORD = 3;
-pub const RPC_C_AUTHN_LEVEL_PKT: ::DWORD = 4;
-pub const RPC_C_AUTHN_LEVEL_PKT_INTEGRITY: ::DWORD = 5;
-pub const RPC_C_AUTHN_LEVEL_PKT_PRIVACY: ::DWORD = 6;
-pub const RPC_C_IMP_LEVEL_DEFAULT: ::DWORD = 0;
-pub const RPC_C_IMP_LEVEL_ANONYMOUS: ::DWORD = 1;
-pub const RPC_C_IMP_LEVEL_IDENTIFY: ::DWORD = 2;
-pub const RPC_C_IMP_LEVEL_IMPERSONATE: ::DWORD = 3;
-pub const RPC_C_IMP_LEVEL_DELEGATE: ::DWORD = 4;
-pub const RPC_C_QOS_IDENTITY_STATIC: ::DWORD = 0;
-pub const RPC_C_QOS_IDENTITY_DYNAMIC: ::DWORD = 1;
-pub const RPC_C_QOS_CAPABILITIES_DEFAULT: ::DWORD = 0x0;
-pub const RPC_C_QOS_CAPABILITIES_MUTUAL_AUTH: ::DWORD = 0x1;
-pub const RPC_C_QOS_CAPABILITIES_MAKE_FULLSIC: ::DWORD = 0x2;
-pub const RPC_C_QOS_CAPABILITIES_ANY_AUTHORITY: ::DWORD = 0x4;
-pub const RPC_C_QOS_CAPABILITIES_IGNORE_DELEGATE_FAILURE: ::DWORD = 0x8;
-pub const RPC_C_QOS_CAPABILITIES_LOCAL_MA_HINT: ::DWORD = 0x10;
-pub const RPC_C_QOS_CAPABILITIES_SCHANNEL_FULL_AUTH_IDENTITY: ::DWORD = 0x20;
-pub const RPC_C_PROTECT_LEVEL_DEFAULT: ::DWORD = RPC_C_AUTHN_LEVEL_DEFAULT;
-pub const RPC_C_PROTECT_LEVEL_NONE: ::DWORD = RPC_C_AUTHN_LEVEL_NONE;
-pub const RPC_C_PROTECT_LEVEL_CONNECT: ::DWORD = RPC_C_AUTHN_LEVEL_CONNECT;
-pub const RPC_C_PROTECT_LEVEL_CALL: ::DWORD = RPC_C_AUTHN_LEVEL_CALL;
-pub const RPC_C_PROTECT_LEVEL_PKT: ::DWORD = RPC_C_AUTHN_LEVEL_PKT;
-pub const RPC_C_PROTECT_LEVEL_PKT_INTEGRITY: ::DWORD = RPC_C_AUTHN_LEVEL_PKT_INTEGRITY;
-pub const RPC_C_PROTECT_LEVEL_PKT_PRIVACY: ::DWORD = RPC_C_AUTHN_LEVEL_PKT_PRIVACY;
-pub const RPC_C_AUTHN_NONE: ::DWORD = 0;
-pub const RPC_C_AUTHN_DCE_PRIVATE: ::DWORD = 1;
-pub const RPC_C_AUTHN_DCE_PUBLIC: ::DWORD = 2;
-pub const RPC_C_AUTHN_DEC_PUBLIC: ::DWORD = 4;
-pub const RPC_C_AUTHN_GSS_NEGOTIATE: ::DWORD = 9;
-pub const RPC_C_AUTHN_WINNT: ::DWORD = 10;
-pub const RPC_C_AUTHN_GSS_SCHANNEL: ::DWORD = 14;
-pub const RPC_C_AUTHN_GSS_KERBEROS: ::DWORD = 16;
-pub const RPC_C_AUTHN_DPA: ::DWORD = 17;
-pub const RPC_C_AUTHN_MSN: ::DWORD = 18;
-pub const RPC_C_AUTHN_DIGEST: ::DWORD = 21;
-pub const RPC_C_AUTHN_KERNEL: ::DWORD = 20;
-pub const RPC_C_AUTHN_NEGO_EXTENDER: ::DWORD = 30;
-pub const RPC_C_AUTHN_PKU2U: ::DWORD = 31;
-pub const RPC_C_AUTHN_LIVE_SSP: ::DWORD = 32;
-pub const RPC_C_AUTHN_LIVEXP_SSP: ::DWORD = 35;
-pub const RPC_C_AUTHN_MSONLINE: ::DWORD = 82;
-pub const RPC_C_AUTHN_MQ: ::DWORD = 100;
-pub const RPC_C_AUTHN_DEFAULT: ::DWORD = 0xFFFFFFFF;
-pub const RPC_C_NO_CREDENTIALS: ::DWORD = 0xFFFFFFFF;
-pub const RPC_C_SECURITY_QOS_VERSION: ::DWORD = 1;
-pub const RPC_C_SECURITY_QOS_VERSION_1: ::DWORD = 1;
-STRUCT!{struct RPC_SECURITY_QOS {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-}}
-pub type PRPC_SECURITY_QOS = *mut RPC_SECURITY_QOS;
-STRUCT!{struct SEC_WINNT_AUTH_IDENTITY_W {
-    User: *mut ::c_ushort,
-    UserLength: ::c_ulong,
-    Domain: *mut ::c_ushort,
-    DomainLength: ::c_ulong,
-    Password: *mut ::c_ushort,
-    PasswordLength: ::c_ulong,
-    Flags: ::c_ulong,
-}}
-pub type PSEC_WINNT_AUTH_IDENTITY_W = *mut SEC_WINNT_AUTH_IDENTITY_W;
-STRUCT!{struct SEC_WINNT_AUTH_IDENTITY_A {
-    User: *mut ::c_uchar,
-    UserLength: ::c_ulong,
-    Domain: *mut ::c_uchar,
-    DomainLength: ::c_ulong,
-    Password: *mut ::c_uchar,
-    PasswordLength: ::c_ulong,
-    Flags: ::c_ulong,
-}}
-pub type PSEC_WINNT_AUTH_IDENTITY_A = *mut SEC_WINNT_AUTH_IDENTITY_A;
-pub const RPC_C_AUTHN_INFO_TYPE_HTTP: ::c_ulong = 1;
-pub const RPC_C_HTTP_AUTHN_TARGET_SERVER: ::c_ulong = 1;
-pub const RPC_C_HTTP_AUTHN_TARGET_PROXY: ::c_ulong = 2;
-pub const RPC_C_HTTP_AUTHN_SCHEME_BASIC: ::c_ulong = 0x00000001;
-pub const RPC_C_HTTP_AUTHN_SCHEME_NTLM: ::c_ulong = 0x00000002;
-pub const RPC_C_HTTP_AUTHN_SCHEME_PASSPORT: ::c_ulong = 0x00000004;
-pub const RPC_C_HTTP_AUTHN_SCHEME_DIGEST: ::c_ulong = 0x00000008;
-pub const RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE: ::c_ulong = 0x00000010;
-pub const RPC_C_HTTP_AUTHN_SCHEME_CERT: ::c_ulong = 0x00010000;
-pub const RPC_C_HTTP_FLAG_USE_SSL: ::c_ulong = 1;
-pub const RPC_C_HTTP_FLAG_USE_FIRST_AUTH_SCHEME: ::c_ulong = 2;
-pub const RPC_C_HTTP_FLAG_IGNORE_CERT_CN_INVALID: ::c_ulong = 8;
-pub const RPC_C_HTTP_FLAG_ENABLE_CERT_REVOCATION_CHECK: ::c_ulong = 16;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_W {
-    TransportCredentials: *mut SEC_WINNT_AUTH_IDENTITY_W,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_ushort,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_W = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_A {
-    TransportCredentials: *mut SEC_WINNT_AUTH_IDENTITY_A,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_uchar,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_A = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W {
-    TransportCredentials: *mut SEC_WINNT_AUTH_IDENTITY_W,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_ushort,
-    ProxyCredentials: *mut SEC_WINNT_AUTH_IDENTITY_W,
-    NumberOfProxyAuthnSchemes: ::c_ulong,
-    ProxyAuthnSchemes: *mut ::c_ulong,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_W = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A {
-    TransportCredentials: *mut SEC_WINNT_AUTH_IDENTITY_A,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_uchar,
-    ProxyCredentials: *mut SEC_WINNT_AUTH_IDENTITY_A,
-    NumberOfProxyAuthnSchemes: ::c_ulong,
-    ProxyAuthnSchemes: *mut ::c_ulong,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_A = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_V3_W {
-    TransportCredentials: RPC_AUTH_IDENTITY_HANDLE,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_ushort,
-    ProxyCredentials: *mut RPC_AUTH_IDENTITY_HANDLE,
-    NumberOfProxyAuthnSchemes: ::c_ulong,
-    ProxyAuthnSchemes: *mut ::c_ulong,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_V3_W = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_V3_W;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_V3_A {
-    TransportCredentials: RPC_AUTH_IDENTITY_HANDLE,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_uchar,
-    ProxyCredentials: *mut RPC_AUTH_IDENTITY_HANDLE,
-    NumberOfProxyAuthnSchemes: ::c_ulong,
-    ProxyAuthnSchemes: *mut ::c_ulong,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_V3_A = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_V3_A;
-STRUCT!{struct RPC_SECURITY_QOS_V2_W_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V2_W {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V2_W_union,
-}}
-pub type PRPC_SECURITY_QOS_V2_W = *mut RPC_SECURITY_QOS_V2_W;
-STRUCT!{struct RPC_SECURITY_QOS_V2_A_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V2_A {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V2_A_union,
-}}
-pub type PRPC_SECURITY_QOS_V2_A = *mut RPC_SECURITY_QOS_V2_A;
-STRUCT!{struct RPC_SECURITY_QOS_V3_W_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V3_W {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V3_W_union,
-    Sid: *mut ::c_void,
-}}
-pub type PRPC_SECURITY_QOS_V3_W = *mut RPC_SECURITY_QOS_V3_W;
-STRUCT!{struct RPC_SECURITY_QOS_V3_A_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V3_A {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V3_A_union,
-    Sid: *mut ::c_void,
-}}
-pub type PRPC_SECURITY_QOS_V3_A = *mut RPC_SECURITY_QOS_V3_A;
-STRUCT!{struct RPC_SECURITY_QOS_V4_W_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V4_W {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V4_W_union,
-    Sid: *mut ::c_void,
-    EffectiveOnly: ::c_uint,
-}}
-pub type PRPC_SECURITY_QOS_V4_W = *mut RPC_SECURITY_QOS_V4_W;
-STRUCT!{struct RPC_SECURITY_QOS_V4_A_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V4_A {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V4_A_union,
-    Sid: *mut ::c_void,
-    EffectiveOnly: ::c_uint,
-}}
-pub type PRPC_SECURITY_QOS_V4_A = *mut RPC_SECURITY_QOS_V4_A;
-STRUCT!{struct RPC_SECURITY_QOS_V5_W_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V5_W {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V5_W_union,
-    Sid: *mut ::c_void,
-    EffectiveOnly: ::c_uint,
-    ServerSecurityDescriptor: *mut ::c_void,
-}}
-pub type PRPC_SECURITY_QOS_V5_W = *mut RPC_SECURITY_QOS_V5_W;
-STRUCT!{struct RPC_SECURITY_QOS_V5_A_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V5_A {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V5_A_union,
-    Sid: *mut ::c_void,
-    EffectiveOnly: ::c_uint,
-    ServerSecurityDescriptor: *mut ::c_void,
-}}
-pub type PRPC_SECURITY_QOS_V5_A = *mut RPC_SECURITY_QOS_V5_A;
-pub const RPC_PROTSEQ_TCP: ::c_ulong = 0x1;
-pub const RPC_PROTSEQ_NMP: ::c_ulong = 0x2;
-pub const RPC_PROTSEQ_LRPC: ::c_ulong = 0x3;
-pub const RPC_PROTSEQ_HTTP: ::c_ulong = 0x4;
-pub const RPC_BHT_OBJECT_UUID_VALID: ::c_ulong = 0x1;
-pub const RPC_BHO_NONCAUSAL: ::c_ulong = 0x1;
-pub const RPC_BHO_DONTLINGER: ::c_ulong = 0x2;
-pub const RPC_BHO_EXCLUSIVE_AND_GUARANTEED: ::c_ulong = 0x4;
-STRUCT!{struct RPC_BINDING_HANDLE_TEMPLATE_V1_W_union {
-    Reserved: *mut ::c_ushort,
-}}
-STRUCT!{struct RPC_BINDING_HANDLE_TEMPLATE_V1_W {
-    Version: ::c_ulong,
-    Flags: ::c_ulong,
-    ProtocolSequence: ::c_ulong,
-    NetworkAddress: *mut ::c_ushort,
-    StringEndpoint: *mut ::c_ushort,
-    u1: RPC_BINDING_HANDLE_TEMPLATE_V1_W_union,
-    ObjectUuid: UUID,
-}}
-pub type PRPC_BINDING_HANDLE_TEMPLATE_V1_W = *mut RPC_BINDING_HANDLE_TEMPLATE_V1_W;
-STRUCT!{struct RPC_BINDING_HANDLE_TEMPLATE_V1_A_union {
-    Reserved: *mut ::c_uchar,
-}}
-STRUCT!{struct RPC_BINDING_HANDLE_TEMPLATE_V1_A {
-    Version: ::c_ulong,
-    Flags: ::c_ulong,
-    ProtocolSequence: ::c_ulong,
-    NetworkAddress: *mut ::c_uchar,
-    StringEndpoint: *mut ::c_uchar,
-    u1: RPC_BINDING_HANDLE_TEMPLATE_V1_A_union,
-    ObjectUuid: UUID,
-}}
-pub type PRPC_BINDING_HANDLE_TEMPLATE_V1_A = *mut RPC_BINDING_HANDLE_TEMPLATE_V1_A;
-STRUCT!{struct RPC_BINDING_HANDLE_SECURITY_V1_W {
-    Version: ::c_ulong,
-    ServerPrincName: *mut ::c_ushort,
-    AuthnLevel: ::c_ulong,
-    AuthnSvc: ::c_ulong,
-    AuthIdentity: *mut SEC_WINNT_AUTH_IDENTITY_W,
-    SecurityQos: *mut RPC_SECURITY_QOS,
-}}
-pub type PRPC_BINDING_HANDLE_SECURITY_V1_W = *mut RPC_BINDING_HANDLE_SECURITY_V1_W;
-STRUCT!{struct RPC_BINDING_HANDLE_SECURITY_V1_A {
-    Version: ::c_ulong,
-    ServerPrincName: *mut ::c_uchar,
-    AuthnLevel: ::c_ulong,
-    AuthnSvc: ::c_ulong,
-    AuthIdentity: *mut SEC_WINNT_AUTH_IDENTITY_A,
-    SecurityQos: *mut RPC_SECURITY_QOS,
-}}
-pub type PRPC_BINDING_HANDLE_SECURITY_V1_A = *mut RPC_BINDING_HANDLE_SECURITY_V1_A;
-STRUCT!{struct RPC_BINDING_HANDLE_OPTIONS_V1 {
-    Version: ::c_ulong,
-    Flags: ::c_ulong,
-    ComTimeout: ::c_ulong,
-    CallTimeout: ::c_ulong,
-}}
-pub type PRPC_BINDING_HANDLE_OPTIONS_V1 = *mut RPC_BINDING_HANDLE_OPTIONS_V1;
-ENUM!{enum RPC_HTTP_REDIRECTOR_STAGE {
-    RPCHTTP_RS_REDIRECT = 1,
-    RPCHTTP_RS_ACCESS_1,
-    RPCHTTP_RS_SESSION,
-    RPCHTTP_RS_ACCESS_2,
-    RPCHTTP_RS_INTERFACE,
-}}
-pub type RPC_NEW_HTTP_PROXY_CHANNEL = Option<unsafe extern "system" fn(
-    RedirectorStage: RPC_HTTP_REDIRECTOR_STAGE, ServerName: RPC_WSTR, ServerPort: RPC_WSTR,
-    RemoteUser: RPC_WSTR, AuthType: RPC_WSTR, ResourceUuid: *mut ::c_void,
-    SessionId: *mut ::c_void, Interface: *mut ::c_void, Reserved: *mut ::c_void, Flags: ::c_ulong,
-    NewServerName: *mut RPC_WSTR, NewServerPort: *mut RPC_WSTR,
-) -> ::RPC_STATUS>;
-pub type RPC_HTTP_PROXY_FREE_STRING = Option<unsafe extern "system" fn(String: RPC_WSTR)>;
-pub const RPC_C_AUTHZ_NONE: ::DWORD = 0;
-pub const RPC_C_AUTHZ_NAME: ::DWORD = 1;
-pub const RPC_C_AUTHZ_DCE: ::DWORD = 2;
-pub const RPC_C_AUTHZ_DEFAULT: ::DWORD = 0xffffffff;
-pub type RPC_AUTH_KEY_RETRIEVAL_FN = Option<unsafe extern "system" fn(
-    Arg: *mut ::c_void, ServerPrincName: RPC_WSTR, KeyVer: ::c_ulong, Key: *mut *mut ::c_void,
-    Status: *mut ::RPC_STATUS,
-)>;
-STRUCT!{struct RPC_CLIENT_INFORMATION1 {
-    UserName: *mut ::c_uchar,
-    ComputerName: *mut ::c_uchar,
-    Privilege: ::c_ushort,
-    AuthFlags: ::c_ulong,
-}}
-pub type PRPC_CLIENT_INFORMATION1 = *mut RPC_CLIENT_INFORMATION1;
-pub type RPC_EP_INQ_HANDLE = *mut ::I_RPC_HANDLE;
-pub const  RPC_C_EP_ALL_ELTS: ::c_ulong = 0;
-pub const  RPC_C_EP_MATCH_BY_IF: ::c_ulong = 1;
-pub const  RPC_C_EP_MATCH_BY_OBJ: ::c_ulong = 2;
-pub const  RPC_C_EP_MATCH_BY_BOTH: ::c_ulong = 3;
-pub const  RPC_C_VERS_ALL: ::c_ulong = 1;
-pub const  RPC_C_VERS_COMPATIBLE: ::c_ulong = 2;
-pub const  RPC_C_VERS_EXACT: ::c_ulong = 3;
-pub const  RPC_C_VERS_MAJOR_ONLY: ::c_ulong = 4;
-pub const  RPC_C_VERS_UPTO: ::c_ulong = 5;
-pub type RPC_MGMT_AUTHORIZATION_FN = Option<unsafe extern "system" fn(
-    ClientBinding: RPC_BINDING_HANDLE, RequestedMgmtOperation: ::c_ulong,
-    Status: *mut ::RPC_STATUS,
-) -> ::c_int>;
-pub const RPC_C_MGMT_INQ_IF_IDS: ::c_ulong = 0;
-pub const RPC_C_MGMT_INQ_PRINC_NAME: ::c_ulong = 1;
-pub const RPC_C_MGMT_INQ_STATS: ::c_ulong = 2;
-pub const RPC_C_MGMT_IS_SERVER_LISTEN: ::c_ulong = 3;
-pub const RPC_C_MGMT_STOP_SERVER_LISTEN: ::c_ulong = 4;
-pub const RPC_IF_AUTOLISTEN: ::c_uint = 0x0001;
-pub const RPC_IF_OLE: ::c_uint = 0x0002;
-pub const RPC_IF_ALLOW_UNKNOWN_AUTHORITY: ::c_uint = 0x0004;
-pub const RPC_IF_ALLOW_SECURE_ONLY: ::c_uint = 0x0008;
-pub const RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH: ::c_uint = 0x0010;
-pub const RPC_IF_ALLOW_LOCAL_ONLY: ::c_uint = 0x0020;
-pub const RPC_IF_SEC_NO_CACHE: ::c_uint = 0x0040;
-pub const RPC_IF_SEC_CACHE_PER_PROC: ::c_uint = 0x0080;
-pub const RPC_IF_ASYNC_CALLBACK: ::c_uint = 0x0100;
-pub const RPC_FW_IF_FLAG_DCOM: ::c_uint = 0x0001;
-pub type RPC_INTERFACE_GROUP = *mut ::c_void;
-pub type PRPC_INTERFACE_GROUP = *mut *mut ::c_void;
-STRUCT!{struct RPC_ENDPOINT_TEMPLATEW {
-    Version: ::c_ulong,
-    ProtSeq: RPC_WSTR,
-    Endpoint: RPC_WSTR,
-    SecurityDescriptor: *mut ::c_void,
-    Backlog: ::c_ulong,
-}}
-pub type PRPC_ENDPOINT_TEMPLATEW = *mut RPC_ENDPOINT_TEMPLATEW;
-STRUCT!{struct RPC_ENDPOINT_TEMPLATEA {
-    Version: ::c_ulong,
-    ProtSeq: RPC_CSTR,
-    Endpoint: RPC_CSTR,
-    SecurityDescriptor: *mut ::c_void,
-    Backlog: ::c_ulong,
-}}
-pub type PRPC_ENDPOINT_TEMPLATEA = *mut RPC_ENDPOINT_TEMPLATEA;
-STRUCT!{struct RPC_INTERFACE_TEMPLATEA {
-    Version: ::c_ulong,
-    IfSpec: RPC_IF_HANDLE,
-    MgrTypeUuid: *mut UUID,
-    MgrEpv: *mut RPC_MGR_EPV,
-    Flags: ::c_uint,
-    MaxCalls: ::c_uint,
-    MaxRpcSize: ::c_uint,
-    IfCallback: *mut RPC_IF_CALLBACK_FN,
-    UuidVector: *mut UUID_VECTOR,
-    Annotation: RPC_CSTR,
-    SecurityDescriptor: *mut ::c_void,
-}}
-pub type PRPC_INTERFACE_TEMPLATEA = *mut RPC_INTERFACE_TEMPLATEA;
-STRUCT!{struct RPC_INTERFACE_TEMPLATEW {
-    Version: ::c_ulong,
-    IfSpec: RPC_IF_HANDLE,
-    MgrTypeUuid: *mut UUID,
-    MgrEpv: *mut RPC_MGR_EPV,
-    Flags: ::c_uint,
-    MaxCalls: ::c_uint,
-    MaxRpcSize: ::c_uint,
-    IfCallback: *mut RPC_IF_CALLBACK_FN,
-    UuidVector: *mut UUID_VECTOR,
-    Annotation: RPC_WSTR,
-    SecurityDescriptor: *mut ::c_void,
-}}
-pub type PRPC_INTERFACE_TEMPLATEW = *mut RPC_INTERFACE_TEMPLATEW;
-pub type RPC_INTERFACE_GROUP_IDLE_CALLBACK_FN = Option<unsafe extern "system" fn(
-    IfGroup: RPC_INTERFACE_GROUP, IdleCallbackContext: *mut ::c_void, IsGroupIdle: ::c_ulong,
-)>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/rpc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/rpc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/rpc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/rpc.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// Master include file for RPC applications.
-pub type I_RPC_HANDLE = *mut ::c_void;
-pub type RPC_STATUS = ::c_long;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2431 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of sapi.h
-ENUM!{enum SPDATAKEYLOCATION {
-    SPDKL_DefaultLocation = 0,
-    SPDKL_CurrentUser = 1,
-    SPDKL_LocalMachine = 2,
-    SPDKL_CurrentConfig = 5,
-}}
-pub const SPDUI_EngineProperties: &'static str = "EngineProperties";
-pub const SPDUI_AddRemoveWord: &'static str = "AddRemoveWord";
-pub const SPDUI_UserTraining: &'static str = "UserTraining";
-pub const SPDUI_MicTraining: &'static str = "MicTraining";
-pub const SPDUI_RecoProfileProperties: &'static str = "RecoProfileProperties";
-pub const SPDUI_AudioProperties: &'static str = "AudioProperties";
-pub const SPDUI_AudioVolume: &'static str = "AudioVolume";
-pub const SPDUI_UserEnrollment: &'static str = "UserEnrollment";
-pub const SPDUI_ShareData: &'static str = "ShareData";
-pub const SPDUI_Tutorial: &'static str = "Tutorial";
-ENUM!{enum SPSTREAMFORMAT {
-     SPSF_Default = -1i32 as u32,
-     SPSF_NoAssignedFormat = 0,
-     SPSF_Text = 1,
-     SPSF_NonStandardFormat = 2,
-     SPSF_ExtendedAudioFormat = 3,
-     SPSF_8kHz8BitMono = 4,
-     SPSF_8kHz8BitStereo = 5,
-     SPSF_8kHz16BitMono = 6,
-     SPSF_8kHz16BitStereo = 7,
-     SPSF_11kHz8BitMono = 8,
-     SPSF_11kHz8BitStereo = 9,
-     SPSF_11kHz16BitMono = 10,
-     SPSF_11kHz16BitStereo = 11,
-     SPSF_12kHz8BitMono = 12,
-     SPSF_12kHz8BitStereo = 13,
-     SPSF_12kHz16BitMono = 14,
-     SPSF_12kHz16BitStereo = 15,
-     SPSF_16kHz8BitMono = 16,
-     SPSF_16kHz8BitStereo = 17,
-     SPSF_16kHz16BitMono = 18,
-     SPSF_16kHz16BitStereo = 19,
-     SPSF_22kHz8BitMono = 20,
-     SPSF_22kHz8BitStereo = 21,
-     SPSF_22kHz16BitMono = 22,
-     SPSF_22kHz16BitStereo = 23,
-     SPSF_24kHz8BitMono = 24,
-     SPSF_24kHz8BitStereo = 25,
-     SPSF_24kHz16BitMono = 26,
-     SPSF_24kHz16BitStereo = 27,
-     SPSF_32kHz8BitMono = 28,
-     SPSF_32kHz8BitStereo = 29,
-     SPSF_32kHz16BitMono = 30,
-     SPSF_32kHz16BitStereo = 31,
-     SPSF_44kHz8BitMono = 32,
-     SPSF_44kHz8BitStereo = 33,
-     SPSF_44kHz16BitMono = 34,
-     SPSF_44kHz16BitStereo = 35,
-     SPSF_48kHz8BitMono = 36,
-     SPSF_48kHz8BitStereo = 37,
-     SPSF_48kHz16BitMono = 38,
-     SPSF_48kHz16BitStereo = 39,
-     SPSF_TrueSpeech_8kHz1BitMono = 40,
-     SPSF_CCITT_ALaw_8kHzMono = 41,
-     SPSF_CCITT_ALaw_8kHzStereo = 42,
-     SPSF_CCITT_ALaw_11kHzMono = 43,
-     SPSF_CCITT_ALaw_11kHzStereo = 44,
-     SPSF_CCITT_ALaw_22kHzMono = 45,
-     SPSF_CCITT_ALaw_22kHzStereo = 46,
-     SPSF_CCITT_ALaw_44kHzMono = 47,
-     SPSF_CCITT_ALaw_44kHzStereo = 48,
-     SPSF_CCITT_uLaw_8kHzMono = 49,
-     SPSF_CCITT_uLaw_8kHzStereo = 50,
-     SPSF_CCITT_uLaw_11kHzMono = 51,
-     SPSF_CCITT_uLaw_11kHzStereo = 52,
-     SPSF_CCITT_uLaw_22kHzMono = 53,
-     SPSF_CCITT_uLaw_22kHzStereo = 54,
-     SPSF_CCITT_uLaw_44kHzMono = 55,
-     SPSF_CCITT_uLaw_44kHzStereo = 56,
-     SPSF_ADPCM_8kHzMono = 57,
-     SPSF_ADPCM_8kHzStereo = 58,
-     SPSF_ADPCM_11kHzMono = 59,
-     SPSF_ADPCM_11kHzStereo = 60,
-     SPSF_ADPCM_22kHzMono = 61,
-     SPSF_ADPCM_22kHzStereo = 62,
-     SPSF_ADPCM_44kHzMono = 63,
-     SPSF_ADPCM_44kHzStereo = 64,
-     SPSF_GSM610_8kHzMono = 65,
-     SPSF_GSM610_11kHzMono = 66,
-     SPSF_GSM610_22kHzMono = 67,
-     SPSF_GSM610_44kHzMono = 68,
-     SPSF_NUM_FORMATS = 69,
-}}
-pub const SPREG_USER_ROOT: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech";
-pub const SPREG_LOCAL_MACHINE_ROOT: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech";
-pub const SPCAT_AUDIOOUT: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioOutput";
-pub const SPCAT_AUDIOIN: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioInput";
-pub const SPCAT_VOICES: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Voices";
-pub const SPCAT_RECOGNIZERS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Recognizers";
-pub const SPCAT_APPLEXICONS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AppLexicons";
-pub const SPCAT_PHONECONVERTERS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\PhoneConverters";
-pub const SPCAT_TEXTNORMALIZERS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\TextNormalizers";
-pub const SPCAT_RECOPROFILES: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech\\RecoProfiles";
-pub const SPMMSYS_AUDIO_IN_TOKEN_ID: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioInput\\TokenEnums\\MMAudioIn\\";
-pub const SPMMSYS_AUDIO_OUT_TOKEN_ID: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioOutput\\TokenEnums\\MMAudioOut\\";
-pub const SPCURRENT_USER_LEXICON_TOKEN_ID: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech\\CurrentUserLexicon";
-pub const SPCURRENT_USER_SHORTCUT_TOKEN_ID: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech\\CurrentUserShortcut";
-pub const SPTOKENVALUE_CLSID: &'static str = "CLSID";
-pub const SPTOKENKEY_FILES: &'static str = "Files";
-pub const SPTOKENKEY_UI: &'static str = "UI";
-pub const SPTOKENKEY_ATTRIBUTES: &'static str = "Attributes";
-pub const SPTOKENKEY_RETAINEDAUDIO: &'static str = "SecondsPerRetainedAudioEvent";
-pub const SPTOKENKEY_AUDIO_LATENCY_WARNING: &'static str = "LatencyWarningThreshold";
-pub const SPTOKENKEY_AUDIO_LATENCY_TRUNCATE: &'static str = "LatencyTruncateThreshold";
-pub const SPTOKENKEY_AUDIO_LATENCY_UPDATE_INTERVAL: &'static str = "LatencyUpdateInterval";
-pub const SPVOICECATEGORY_TTSRATE: &'static str = "DefaultTTSRate";
-pub const SPPROP_RESOURCE_USAGE: &'static str = "ResourceUsage";
-pub const SPPROP_HIGH_CONFIDENCE_THRESHOLD: &'static str = "HighConfidenceThreshold";
-pub const SPPROP_NORMAL_CONFIDENCE_THRESHOLD: &'static str = "NormalConfidenceThreshold";
-pub const SPPROP_LOW_CONFIDENCE_THRESHOLD: &'static str = "LowConfidenceThreshold";
-pub const SPPROP_RESPONSE_SPEED: &'static str = "ResponseSpeed";
-pub const SPPROP_COMPLEX_RESPONSE_SPEED: &'static str = "ComplexResponseSpeed";
-pub const SPPROP_ADAPTATION_ON: &'static str = "AdaptationOn";
-pub const SPPROP_PERSISTED_BACKGROUND_ADAPTATION: &'static str = "PersistedBackgroundAdaptation";
-pub const SPPROP_PERSISTED_LANGUAGE_MODEL_ADAPTATION: &'static str = "PersistedLanguageModelAdaptation";
-pub const SPPROP_UX_IS_LISTENING: &'static str = "UXIsListening";
-pub const SPTOPIC_SPELLING: &'static str = "Spelling";
-pub const SPWILDCARD: &'static str = "...";
-pub const SPDICTATION: &'static str = "*";
-pub const SPINFDICTATION: &'static str = "*+";
-pub const SPREG_SAFE_USER_TOKENS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\UserTokens";
-pub const SP_LOW_CONFIDENCE: i32 = -1;
-pub const SP_NORMAL_CONFIDENCE: i32 = 0;
-pub const SP_HIGH_CONFIDENCE: i32 = 1;
-pub const DEFAULT_WEIGHT: i32 = 1;
-pub const SP_MAX_WORD_LENGTH: i32 = 128;
-pub const SP_MAX_PRON_LENGTH: i32 = 384;
-pub const SP_EMULATE_RESULT: i32 = 0x40000000;
-RIDL!(
-interface ISpNotifyCallback(ISpNotifyCallbackVtbl) {
-    fn NotifyCallback(&mut self, wParam: ::WPARAM, lParam: ::LPARAM) -> ::HRESULT
-}
-);
-pub type SPNOTIFYCALLBACK = unsafe extern "system" fn(wParam: ::WPARAM, lParam: ::LPARAM);
-RIDL!(
-interface ISpNotifySource(ISpNotifySourceVtbl): IUnknown(IUnknownVtbl) {
-    fn SetNotifySink(&mut self, pNotifySink: *mut ISpNotifySink) -> ::HRESULT,
-    fn SetNotifyWindowMessage(
-        &mut self, hWnd: ::HWND, Msg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn SetNotifyCallbackFunction(
-        &mut self, pfnCallback: SPNOTIFYCALLBACK, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn SetNotifyCallbackInterface(
-        &mut self, pSpCallback: *mut ISpNotifyCallback, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn SetNotifyWin32Event(&mut self) -> ::HRESULT,
-    fn WaitForNotifyEvent(&mut self, dwMilliseconds: ::DWORD) -> ::HRESULT,
-    fn GetNotifyEventHandle(&mut self) -> ::HANDLE
-}
-);
-RIDL!(
-interface ISpNotifySink(ISpNotifySinkVtbl): IUnknown(IUnknownVtbl) {
-    fn Notify(&mut self) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpNotifyTranslator(ISpNotifyTranslatorVtbl): ISpNotifySink(ISpNotifySinkVtbl) {
-    fn InitWindowMessage(
-        &mut self, hWnd: ::HWND, Msg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn InitCallback(
-        &mut self, pfnCallback: SPNOTIFYCALLBACK, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn InitSpNotifyCallback(
-        &mut self, pSpCallback: *mut ISpNotifyCallback, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn InitWin32Event(&mut self, hEvent: ::HANDLE, fCloseHandleOnRelease: ::BOOL) -> ::HRESULT,
-    fn Wait(&mut self, dwMilliseconds: ::DWORD) -> ::HRESULT,
-    fn GetEventHandle(&mut self) -> ::HANDLE
-}
-);
-RIDL!(
-interface ISpDataKey(ISpDataKeyVtbl): IUnknown(IUnknownVtbl) {
-    fn SetData(
-        &mut self, pszValueName: ::LPCWSTR, cbData: ::ULONG, pData: *const ::BYTE
-    ) -> ::HRESULT,
-    fn GetData(
-        &mut self, pszValueName: ::LPCWSTR, pcbData: *mut ::ULONG, pData: *mut ::BYTE
-    ) -> ::HRESULT,
-    fn SetStringValue(&mut self, pszValueName: ::LPCWSTR, pszValue: ::LPCWSTR) -> ::HRESULT,
-    fn GetStringValue(&mut self, pszValueName: ::LPCWSTR, ppszValue: *mut ::LPWSTR) -> ::HRESULT,
-    fn SetDWORD(&mut self, pszValueName: ::LPCWSTR, dwValue: ::DWORD) -> ::HRESULT,
-    fn GetDWORD(&mut self, pszValueName: ::LPCWSTR, pdwValue: *mut ::DWORD) -> ::HRESULT,
-    fn OpenKey(&mut self, pszSubKeyName: ::LPCWSTR, ppSubKey: *mut *mut ISpDataKey) -> ::HRESULT,
-    fn CreateKey(&mut self, pszSubKey: ::LPCWSTR, ppSubKey: *mut *mut ISpDataKey) -> ::HRESULT,
-    fn DeleteKey(&mut self, pszSubKey: ::LPCWSTR) -> ::HRESULT,
-    fn DeleteValue(&mut self, pszValueName: ::LPCWSTR) -> ::HRESULT,
-    fn EnumKeys(&mut self, Index: ::ULONG, ppszSubKeyName: *mut ::LPWSTR) -> ::HRESULT,
-    fn EnumValues(&mut self, Index: ::ULONG, ppszValueName: *mut ::LPWSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpRegDataKey(ISpRegDataKeyVtbl): ISpDataKey(ISpDataKeyVtbl) {
-    fn SetKey(&mut self, hkey: ::HKEY, fReadOnly: ::BOOL) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpObjectTokenCategory(ISpObjectTokenCategoryVtbl): ISpDataKey(ISpDataKeyVtbl) {
-    fn SetId(&mut self, pszCategoryId: ::LPCWSTR, fCreateIfNotExist: ::BOOL) -> ::HRESULT,
-    fn GetId(&mut self, ppszCoMemCategoryId: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetDataKey(
-        &mut self, spdkl: SPDATAKEYLOCATION, pppDataKey: *mut *mut ISpDataKey
-    ) -> ::HRESULT,
-    fn EnumTokens(
-        &mut self, pzsReqAttribs: ::LPCWSTR, pszOptAttribs: ::LPCWSTR,
-        ppEnum: *mut *mut IEnumSpObjectTokens
-    ) -> ::HRESULT,
-    fn SetDefaultTokenId(&mut self, pszTokenId: ::LPCWSTR) -> ::HRESULT,
-    fn GetDefaultTokenId(&mut self, ppszCoMemTokenId: *mut ::LPWSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpObjectToken(ISpObjectTokenVtbl): ISpDataKey(ISpDataKeyVtbl) {
-    fn SetId(
-        &mut self, pszCategoryId: ::LPCWSTR, pszTokenId: ::LPCWSTR, fCreateIfNotExist: ::BOOL
-    ) -> ::HRESULT,
-    fn GetId(&mut self, ppszCoMemTokenId: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetCategory(&mut self, ppTokenCategory: *mut *mut ISpObjectTokenCategory) -> ::HRESULT,
-    fn CreateInstance(
-        &mut self, pUnkOuter: *mut ::IUnknown, dwClsContext: ::DWORD, riid: ::REFIID,
-        ppvObject: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetStorageFileName(
-        &mut self, clsidCaller: ::REFCLSID, pszValueName: ::LPCWSTR,
-        pszFileNameSpecifier: ::LPCWSTR, nFolder: ::ULONG, ppszFilePath: *mut ::LPWSTR
-    ) -> ::HRESULT,
-    fn RemoveStorageFileName(&mut self, pszKeyName: ::LPCWSTR, fDeleteFile: ::BOOL) -> ::HRESULT,
-    fn Remove(&mut self, pclsidCaller: *const ::CLSID) -> ::HRESULT,
-    fn IsUISupported(
-        &mut self, pszTypeOfUI: ::LPCWSTR, pvExtraData: *mut ::c_void, cbExtraData: ::ULONG,
-        punkObject: *mut ::IUnknown, pfSupported: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn DisplayUI(
-        &mut self, hwndParent: ::HWND, pszTitle: ::LPCWSTR, pszTypeOfUI: ::LPCWSTR,
-        pvExtraData: *mut ::c_void, cbExtraData: ::ULONG, punkObject: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn MatchesAttributes(&mut self, pszAttributes: ::LPCWSTR, pfMatches: *mut ::BOOL) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpObjectTokenInit(ISpObjectTokenInitVtbl): ISpObjectToken(ISpObjectTokenVtbl) {
-    fn InitFromDataKey(
-        &mut self, pszCategoryId: ::LPCWSTR, pszTokenId: ::LPCWSTR, pDataKey: *mut ISpDataKey
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IEnumSpObjectTokens(IEnumSpObjectTokensVtbl): IUnknown(IUnknownVtbl) {
-    fn Next(
-        &mut self, celt: ::ULONG, pelt: *mut *mut ISpObjectToken, pceltFetched: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn Skip(&mut self, celt: ::ULONG) -> ::HRESULT,
-    fn Reset(&mut self) -> ::HRESULT,
-    fn Clone(&mut self, ppEnum: *mut *mut IEnumSpObjectTokens) -> ::HRESULT,
-    fn Item(&mut self, Index: ::ULONG, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn GetCount(&mut self, pCount: *mut ::ULONG) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpObjectWithToken(ISpObjectWithTokenVtbl): IUnknown(IUnknownVtbl) {
-    fn SetObjectToken(&mut self, pToken: *mut ISpObjectToken) -> ::HRESULT,
-    fn GetObjectToken(&mut self, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpResourceManager(ISpResourceManagerVtbl): IServiceProvider(IServiceProviderVtbl) {
-    fn SetObject(&mut self, guidServiceId: ::REFGUID, pUnkObject: *mut ::IUnknown) -> ::HRESULT,
-    fn GetObject(
-        &mut self, guidServiceId: ::REFGUID, ObjectCLSID: ::REFCLSID, ObjectIID: ::REFIID,
-        fReleaseWhenLastExternalRefReleased: ::BOOL, ppObject: *mut *mut ::c_void
-    ) -> ::HRESULT
-}
-);
-ENUM!{enum SPEVENTLPARAMTYPE {
-    SPET_LPARAM_IS_UNDEFINED = 0,
-    SPET_LPARAM_IS_TOKEN,
-    SPET_LPARAM_IS_OBJECT,
-    SPET_LPARAM_IS_POINTER,
-    SPET_LPARAM_IS_STRING,
-}}
-ENUM!{enum SPEVENTENUM {
-    SPEI_UNDEFINED = 0,
-    SPEI_START_INPUT_STREAM = 1,
-    SPEI_END_INPUT_STREAM = 2,
-    SPEI_VOICE_CHANGE = 3,
-    SPEI_TTS_BOOKMARK = 4,
-    SPEI_WORD_BOUNDARY = 5,
-    SPEI_PHONEME = 6,
-    SPEI_SENTENCE_BOUNDARY = 7,
-    SPEI_VISEME = 8,
-    SPEI_TTS_AUDIO_LEVEL = 9,
-    SPEI_TTS_PRIVATE = 15,
-    SPEI_END_SR_STREAM = 34,
-    SPEI_SOUND_START = 35,
-    SPEI_SOUND_END = 36,
-    SPEI_PHRASE_START = 37,
-    SPEI_RECOGNITION = 38,
-    SPEI_HYPOTHESIS = 39,
-    SPEI_SR_BOOKMARK = 40,
-    SPEI_PROPERTY_NUM_CHANGE = 41,
-    SPEI_PROPERTY_STRING_CHANGE = 42,
-    SPEI_FALSE_RECOGNITION = 43,
-    SPEI_INTERFERENCE = 44,
-    SPEI_REQUEST_UI = 45,
-    SPEI_RECO_STATE_CHANGE = 46,
-    SPEI_ADAPTATION = 47,
-    SPEI_START_SR_STREAM = 48,
-    SPEI_RECO_OTHER_CONTEXT = 49,
-    SPEI_SR_AUDIO_LEVEL = 50,
-    SPEI_SR_RETAINEDAUDIO = 51,
-    SPEI_SR_PRIVATE = 52,
-    SPEI_ACTIVE_CATEGORY_CHANGED = 53,
-    SPEI_RESERVED5 = 54,
-    SPEI_RESERVED6 = 55,
-    SPEI_RESERVED1 = 30,
-    SPEI_RESERVED2 = 33,
-    SPEI_RESERVED3 = 63,
-}}
-pub const SPEI_MIN_TTS: SPEVENTENUM = SPEI_START_INPUT_STREAM;
-pub const SPEI_MAX_TTS: SPEVENTENUM = SPEI_TTS_PRIVATE;
-pub const SPEI_MIN_SR: SPEVENTENUM = SPEI_END_SR_STREAM;
-pub const SPEI_MAX_SR: SPEVENTENUM = SPEI_RESERVED6;
-pub const SPFEI_FLAGCHECK: u64 = (1 << SPEI_RESERVED1.0 as u64) | (1 << SPEI_RESERVED2.0 as u64);
-pub const SPFEI_ALL_TTS_EVENTS: u64 = 0x000000000000FFFE | SPFEI_FLAGCHECK;
-pub const SPFEI_ALL_SR_EVENTS: u64 = 0x003FFFFC00000000 | SPFEI_FLAGCHECK;
-pub const SPFEI_ALL_EVENTS: u64 = 0xEFFFFFFFFFFFFFFF;
-#[inline]
-pub fn SPFEI(SPEI_ord: u64) -> u64 {
-    (1 << SPEI_ord) | SPFEI_FLAGCHECK
-}
-STRUCT!{struct SPEVENT {
-    eEventId: ::WORD,
-    elParamType: ::WORD,
-    ulStreamNum: ::ULONG,
-    ullAudioStreamOffset: ::ULONGLONG,
-    wParam: ::WPARAM,
-    lParam: ::LPARAM,
-}}
-STRUCT!{struct SPSERIALIZEDEVENT {
-    eEventId: ::WORD,
-    elParamType: ::WORD,
-    ulStreamNum: ::ULONG,
-    ullAudioStreamOffset: ::ULONGLONG,
-    SerializedwParam: ::ULONG,
-    SerializedlParam: ::LONG,
-}}
-STRUCT!{struct SPSERIALIZEDEVENT64 {
-    eEventId: ::WORD,
-    elParamType: ::WORD,
-    ulStreamNum: ::ULONG,
-    ullAudioStreamOffset: ::ULONGLONG,
-    SerializedwParam: ::ULONGLONG,
-    SerializedlParam: ::LONGLONG,
-}}
-STRUCT!{struct SPEVENTEX {
-    eEventId: ::WORD,
-    elParamType: ::WORD,
-    ulStreamNum: ::ULONG,
-    ullAudioStreamOffset: ::ULONGLONG,
-    wParam: ::WPARAM,
-    lParam: ::LPARAM,
-    ullAudioTimeOffset: ::ULONGLONG,
-}}
-ENUM!{enum SPINTERFERENCE {
-    SPINTERFERENCE_NONE = 0,
-    SPINTERFERENCE_NOISE = 1,
-    SPINTERFERENCE_NOSIGNAL = 2,
-    SPINTERFERENCE_TOOLOUD = 3,
-    SPINTERFERENCE_TOOQUIET = 4,
-    SPINTERFERENCE_TOOFAST = 5,
-    SPINTERFERENCE_TOOSLOW = 6,
-    SPINTERFERENCE_LATENCY_WARNING = 7,
-    SPINTERFERENCE_LATENCY_TRUNCATE_BEGIN = 8,
-    SPINTERFERENCE_LATENCY_TRUNCATE_END = 9,
-}}
-FLAGS!{enum SPENDSRSTREAMFLAGS {
-    SPESF_NONE = 0,
-    SPESF_STREAM_RELEASED = 1 << 0,
-    SPESF_EMULATED = 1 << 1,
-}}
-FLAGS!{enum SPVFEATURE {
-    SPVFEATURE_STRESSED = 1 << 0,
-    SPVFEATURE_EMPHASIS = 1 << 1,
-}}
-ENUM!{enum SPVISEMES {
-    SP_VISEME_0 = 0,
-    SP_VISEME_1,
-    SP_VISEME_2,
-    SP_VISEME_3,
-    SP_VISEME_4,
-    SP_VISEME_5,
-    SP_VISEME_6,
-    SP_VISEME_7,
-    SP_VISEME_8,
-    SP_VISEME_9,
-    SP_VISEME_10,
-    SP_VISEME_11,
-    SP_VISEME_12,
-    SP_VISEME_13,
-    SP_VISEME_14,
-    SP_VISEME_15,
-    SP_VISEME_16,
-    SP_VISEME_17,
-    SP_VISEME_18,
-    SP_VISEME_19,
-    SP_VISEME_20,
-    SP_VISEME_21,
-}}
-STRUCT!{struct SPEVENTSOURCEINFO {
-    ullEventInterest: ::ULONGLONG,
-    ullQueuedInterest: ::ULONGLONG,
-    ulCount: ::ULONG,
-}}
-RIDL!(
-interface ISpEventSource(ISpEventSourceVtbl): ISpNotifySource(ISpNotifySourceVtbl) {
-    fn SetInterest(
-        &mut self, ullEventInterest: ::ULONGLONG, ullQueuedInterest: ::ULONGLONG
-    ) -> ::HRESULT,
-    fn GetEvents(
-        &mut self, ulCount: ::ULONG, pEventArray: *mut SPEVENT, pulFetched: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn GetInfo(&mut self, pInfo: *mut SPEVENTSOURCEINFO) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpEventSource2(ISpEventSource2Vtbl): ISpEventSource(ISpEventSourceVtbl) {
-    fn GetEventsEx(
-        &mut self, ulCount: ::ULONG, pEventArray: *mut SPEVENTEX, pulFetched: *mut ::ULONG
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpEventSink(ISpEventSinkVtbl): IUnknown(IUnknownVtbl) {
-    fn AddEvents(&mut self, pEventArray: *const SPEVENT, ulCount: ::ULONG) -> ::HRESULT,
-    fn GetEventInterest(&mut self, pullEventInterest: *mut ::ULONGLONG) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpStreamFormat(ISpStreamFormatVtbl): IStream(IStreamVtbl) {
-    fn GetFormat(
-        &mut self, pguidFormatId: *mut ::GUID, ppCoMemWaveFormatEx: *mut *mut ::WAVEFORMATEX
-    ) -> ::HRESULT
-}
-);
-ENUM!{enum SPFILEMODE {
-    SPFM_OPEN_READONLY = 0,
-    SPFM_OPEN_READWRITE = 1,
-    SPFM_CREATE = 2,
-    SPFM_CREATE_ALWAYS = 3,
-    SPFM_NUM_MODES = 4,
-}}
-RIDL!(
-interface ISpStream(ISpStreamVtbl): ISpStreamFormat(ISpStreamFormatVtbl) {
-    fn SetBaseStream(
-        &mut self, pStream: *mut ::IStream, rguidFormat: ::REFGUID,
-        pWaveFormatEx: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetBaseStream(&mut self, ppStream: *mut *mut ::IStream) -> ::HRESULT,
-    fn BindToFile(
-        &mut self, pszFileName: ::LPCWSTR, eMode: SPFILEMODE, pFormatId: *const ::GUID,
-        pWaveFormatEx: *const ::WAVEFORMATEX, ullEventInterest: ::ULONGLONG
-    ) -> ::HRESULT,
-    fn Close(&mut self) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpStreamFormatConverter(ISpStreamFormatConverterVtbl)
-    : ISpStreamFormat(ISpStreamFormatVtbl) {
-    fn SetBaseStream(
-        &mut self, pStream: *mut ISpStreamFormat, fSetFormatToBaseStreamFormat: ::BOOL,
-        fWriteToBaseStream: ::BOOL
-    ) -> ::HRESULT,
-    fn GetBaseStream(&mut self, ppStream: *mut *mut ISpStreamFormat) -> ::HRESULT,
-    fn SetFormat(
-        &mut self, rguidFormatIdOfConvertedStream: ::REFGUID,
-        pWaveFormatExOfConvertedStream: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn ResetSeekPosition(&mut self) -> ::HRESULT,
-    fn ScaleConvertedToBaseOffset(
-        &mut self, ullOffsetConvertedStream: ::ULONGLONG, pullOffsetBaseStream: *mut ::ULONGLONG
-    ) -> ::HRESULT,
-    fn ScaleBaseToConvertedOffset(
-        &mut self, ullOffsetBaseStream: ::ULONGLONG, pullOffsetConvertedStream: *mut ::ULONGLONG
-    ) -> ::HRESULT
-}
-);
-ENUM!{enum SPAUDIOSTATE {
-    SPAS_CLOSED = 0,
-    SPAS_STOP = 1,
-    SPAS_PAUSE = 2,
-    SPAS_RUN = 3,
-}}
-STRUCT!{struct SPAUDIOSTATUS {
-    cbFreeBuffSpace: ::LONG,
-    cbNonBlockingIO: ::ULONG,
-    State: SPAUDIOSTATE,
-    CurSeekPos: ::ULONGLONG,
-    CurDevicePos: ::ULONGLONG,
-    dwAudioLevel: ::DWORD,
-    dwReserved2: ::DWORD,
-}}
-STRUCT!{struct SPAUDIOBUFFERINFO {
-    ulMsMinNotification: ::ULONG,
-    ulMsBufferSize: ::ULONG,
-    ulMsEventBias: ::ULONG,
-}}
-RIDL!(
-interface ISpAudio(ISpAudioVtbl): ISpStreamFormat(ISpStreamFormatVtbl) {
-    fn SetState(&mut self, NewState: SPAUDIOSTATE, ullReserved: ::ULONGLONG) -> ::HRESULT,
-    fn SetFormat(
-        &mut self, rguidFmtId: ::REFGUID, pWaveFormatEx: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetStatus(&mut self, pStatus: *mut SPAUDIOSTATUS) -> ::HRESULT,
-    fn SetBufferInfo(&mut self, pBuffInfo: *const SPAUDIOBUFFERINFO) -> ::HRESULT,
-    fn GetBufferInfo(&mut self, pBuffInfo: *mut SPAUDIOBUFFERINFO) -> ::HRESULT,
-    fn GetDefaultFormat(
-        &mut self, pFormatId: *mut ::GUID, ppCoMemWaveFormatEx: *mut *mut ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn EventHandle(&mut self) -> ::HANDLE,
-    fn GetVolumeLevel(&mut self, pLevel: *mut ::ULONG) -> ::HRESULT,
-    fn SetVolumeLevel(&mut self, Level: ::ULONG) -> ::HRESULT,
-    fn GetBufferNotifySize(&mut self, pcbSize: *mut ::ULONG) -> ::HRESULT,
-    fn SetBufferNotifySize(&mut self, cbSize: ::ULONG) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpMMSysAudio(ISpMMSysAudioVtbl): ISpAudio(ISpAudioVtbl) {
-    fn GetDeviceId(&mut self, puDeviceId: *mut ::UINT) -> ::HRESULT,
-    fn SetDeviceId(&mut self, uDeviceId: ::UINT) -> ::HRESULT,
-    fn GetMMHandle(&mut self, pHandle: *mut *mut ::c_void) -> ::HRESULT,
-    fn GetLineId(&mut self, puLineId: *mut ::UINT) -> ::HRESULT,
-    fn SetLineId(&mut self, uLineId: ::UINT) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpTranscript(ISpTranscriptVtbl): IUnknown(IUnknownVtbl) {
-    fn GetTranscript(&mut self, ppszTranscript: *mut ::LPWSTR) -> ::HRESULT,
-    fn AppendTranscript(&mut self, pszTranscript: ::LPCWSTR) -> ::HRESULT
-}
-);
-FLAGS!{enum SPDISPLYATTRIBUTES {
-    SPAF_ONE_TRAILING_SPACE = 0x2,
-    SPAF_TWO_TRAILING_SPACES = 0x4,
-    SPAF_CONSUME_LEADING_SPACES = 0x8,
-    SPAF_BUFFER_POSITION = 0x10,
-    SPAF_ALL = 0x1f,
-    SPAF_USER_SPECIFIED = 0x80,
-}}
-pub type SPPHONEID = ::WCHAR;
-pub type PSPPHONEID = ::LPWSTR;
-pub type PCSPPHONEID = ::LPCWSTR;
-STRUCT!{struct SPPHRASEELEMENT {
-    ulAudioTimeOffset: ::ULONG,
-    ulAudioSizeTime: ::ULONG,
-    ulAudioStreamOffset: ::ULONG,
-    ulAudioSizeBytes: ::ULONG,
-    ulRetainedStreamOffset: ::ULONG,
-    ulRetainedSizeBytes: ::ULONG,
-    pszDisplayText: ::LPCWSTR,
-    pszLexicalForm: ::LPCWSTR,
-    pszPronunciation: *const SPPHONEID,
-    bDisplayAttributes: ::BYTE,
-    RequiredConfidence: ::c_char,
-    ActualConfidence: ::c_char,
-    Reserved: ::BYTE,
-    SREngineConfidence: ::c_float,
-}}
-STRUCT!{struct SPPHRASERULE {
-    pszName: ::LPCWSTR,
-    ulId: ::ULONG,
-    ulFirstElement: ::ULONG,
-    ulCountOfElements: ::ULONG,
-    pNextSibling: *const SPPHRASERULE,
-    pFirstChild: *const SPPHRASERULE,
-    SREngineConfidence: ::c_float,
-    Confidence: ::c_char,
-}}
-ENUM!{enum SPPHRASEPROPERTYUNIONTYPE {
-    SPPPUT_UNUSED = 0,
-    SPPPUT_ARRAY_INDEX,
-}}
-STRUCT!{struct SPPHRASEPROPERTY {
-    pszName: ::LPCWSTR,
-    bType: ::BYTE,
-    bReserved: ::BYTE,
-    usArrayIndex: u16,
-    pszValue: ::LPCWSTR,
-    vValue: ::VARIANT,
-    ulFirstElement: ::ULONG,
-    ulCountOfElements: ::ULONG,
-    pNextSibling: *const SPPHRASEPROPERTY,
-    pFirstChild: *const SPPHRASEPROPERTY,
-    SREngineConfidence: ::c_float,
-    Confidence: ::c_char,
-}}
-UNION!(SPPHRASEPROPERTY, bType, ulId, ulId_mut, ::ULONG);
-STRUCT!{struct SPPHRASEREPLACEMENT {
-    bDisplayAttributes: ::BYTE,
-    pszReplacementText: ::LPCWSTR,
-    ulFirstElement: ::ULONG,
-    ulCountOfElements: ::ULONG,
-}}
-STRUCT!{struct SPSEMANTICERRORINFO {
-    ulLineNumber: ::ULONG,
-    pszScriptLine: ::LPWSTR,
-    pszSource: ::LPWSTR,
-    pszDescription: ::LPWSTR,
-    hrResultCode: ::HRESULT,
-}}
-ENUM!{enum SPSEMANTICFORMAT {
-    SPSMF_SAPI_PROPERTIES = 0,
-    SPSMF_SRGS_SEMANTICINTERPRETATION_MS = 1,
-    SPSMF_SRGS_SAPIPROPERTIES = 2,
-    SPSMF_UPS = 4,
-    SPSMF_SRGS_SEMANTICINTERPRETATION_W3C = 8,
-}}
-STRUCT!{struct SPPHRASE_50 {
-    cbSize: ::ULONG,
-    LangID: ::WORD,
-    wHomophoneGroupId: ::WORD,
-    ullGrammarID: ::ULONGLONG,
-    ftStartTime: ::ULONGLONG,
-    ullAudioStreamPosition: ::ULONGLONG,
-    ulAudioSizeBytes: ::ULONG,
-    ulRetainedSizeBytes: ::ULONG,
-    ulAudioSizeTime: ::ULONG,
-    Rule: ::SPPHRASERULE,
-    pProperties: *const ::SPPHRASEPROPERTY,
-    pElements: *const ::SPPHRASEELEMENT,
-    cReplacements: ::ULONG,
-    pReplacements: *const ::SPPHRASEREPLACEMENT,
-    SREngineID: ::GUID,
-    ulSREnginePrivateDataSize: ::ULONG,
-    pSREnginePrivateData: *const ::BYTE,
-}}
-STRUCT!{struct SPPHRASE_53 {
-    cbSize: ::ULONG,
-    LangID: ::WORD,
-    wHomophoneGroupId: ::WORD,
-    ullGrammarID: ::ULONGLONG,
-    ftStartTime: ::ULONGLONG,
-    ullAudioStreamPosition: ::ULONGLONG,
-    ulAudioSizeBytes: ::ULONG,
-    ulRetainedSizeBytes: ::ULONG,
-    ulAudioSizeTime: ::ULONG,
-    Rule: ::SPPHRASERULE,
-    pProperties: *const ::SPPHRASEPROPERTY,
-    pElements: *const ::SPPHRASEELEMENT,
-    cReplacements: ::ULONG,
-    pReplacements: *const ::SPPHRASEREPLACEMENT,
-    SREngineID: ::GUID,
-    ulSREnginePrivateDataSize: ::ULONG,
-    pSREnginePrivateData: *const ::BYTE,
-    pSML: ::LPWSTR,
-    pSemanticErrorInfo: *mut SPSEMANTICERRORINFO,
-}}
-STRUCT!{struct SPPHRASE {
-    cbSize: ::ULONG,
-    LangID: ::WORD,
-    wHomophoneGroupId: ::WORD,
-    ullGrammarID: ::ULONGLONG,
-    ftStartTime: ::ULONGLONG,
-    ullAudioStreamPosition: ::ULONGLONG,
-    ulAudioSizeBytes: ::ULONG,
-    ulRetainedSizeBytes: ::ULONG,
-    ulAudioSizeTime: ::ULONG,
-    Rule: ::SPPHRASERULE,
-    pProperties: *const ::SPPHRASEPROPERTY,
-    pElements: *const ::SPPHRASEELEMENT,
-    cReplacements: ::ULONG,
-    pReplacements: *const ::SPPHRASEREPLACEMENT,
-    SREngineID: ::GUID,
-    ulSREnginePrivateDataSize: ::ULONG,
-    pSREnginePrivateData: *const ::BYTE,
-    pSML: ::LPWSTR,
-    pSemanticErrorInfo: *mut SPSEMANTICERRORINFO,
-    SemanticTagFormat: SPSEMANTICFORMAT,
-}}
-STRUCT!{struct SPSERIALIZEDPHRASE {
-    ulSerializedSize: ::ULONG,
-}}
-STRUCT!{struct SPRULE {
-    pszRuleName: ::LPCWSTR,
-    ulRuleId: ::ULONG,
-    dwAttributes: ::DWORD,
-}}
-FLAGS!{enum SPVALUETYPE {
-    SPDF_PROPERTY = 0x1,
-    SPDF_REPLACEMENT = 0x2,
-    SPDF_RULE = 0x4,
-    SPDF_DISPLAYTEXT = 0x8,
-    SPDF_LEXICALFORM = 0x10,
-    SPDF_PRONUNCIATION = 0x20,
-    SPDF_AUDIO = 0x40,
-    SPDF_ALTERNATES = 0x80,
-    SPDF_ALL = 0xff,
-}}
-STRUCT!{struct SPBINARYGRAMMAR {
-    ulTotalSerializedSize: ::ULONG,
-}}
-ENUM!{enum SPPHRASERNG {
-    SPPR_ALL_ELEMENTS = -1i32 as u32,
-}}
-pub const SP_GETWHOLEPHRASE: SPPHRASERNG = SPPR_ALL_ELEMENTS;
-pub const SPRR_ALL_ELEMENTS: SPPHRASERNG = SPPR_ALL_ELEMENTS;
-DECLARE_HANDLE!(SPSTATEHANDLE, SPSTATEHANDLE__);
-FLAGS!{enum SPRECOEVENTFLAGS {
-    SPREF_AutoPause = 1 << 0,
-    SPREF_Emulated = 1 << 1,
-    SPREF_SMLTimeout = 1 << 2,
-    SPREF_ExtendableParse = 1 << 3,
-    SPREF_ReSent = 1 << 4,
-    SPREF_Hypothesis = 1 << 5,
-    SPREF_FalseRecognition = 1 << 6,
-}}
-ENUM!{enum SPPARTOFSPEECH {
-    SPPS_NotOverriden = -1i32 as u32,
-    SPPS_Unknown = 0,
-    SPPS_Noun = 0x1000,
-    SPPS_Verb = 0x2000,
-    SPPS_Modifier = 0x3000,
-    SPPS_Function = 0x4000,
-    SPPS_Interjection = 0x5000,
-    SPPS_Noncontent = 0x6000,
-    SPPS_LMA = 0x7000,
-    SPPS_SuppressWord = 0xf000,
-}}
-FLAGS!{enum SPLEXICONTYPE {
-    eLEXTYPE_USER = 1 << 0,
-    eLEXTYPE_APP = 1 << 1,
-    eLEXTYPE_VENDORLEXICON = 1 << 2,
-    eLEXTYPE_LETTERTOSOUND = 1 << 3,
-    eLEXTYPE_MORPHOLOGY = 1 << 4,
-    eLEXTYPE_RESERVED4 = 1 << 5,
-    eLEXTYPE_USER_SHORTCUT = 1 << 6,
-    eLEXTYPE_RESERVED6 = 1 << 7,
-    eLEXTYPE_RESERVED7 = 1 << 8,
-    eLEXTYPE_RESERVED8 = 1 << 9,
-    eLEXTYPE_RESERVED9 = 1 << 10,
-    eLEXTYPE_RESERVED10 = 1 << 11,
-    eLEXTYPE_PRIVATE1 = 1 << 12,
-    eLEXTYPE_PRIVATE2 = 1 << 13,
-    eLEXTYPE_PRIVATE3 = 1 << 14,
-    eLEXTYPE_PRIVATE4 = 1 << 15,
-    eLEXTYPE_PRIVATE5 = 1 << 16,
-    eLEXTYPE_PRIVATE6 = 1 << 17,
-    eLEXTYPE_PRIVATE7 = 1 << 18,
-    eLEXTYPE_PRIVATE8 = 1 << 19,
-    eLEXTYPE_PRIVATE9 = 1 << 20,
-    eLEXTYPE_PRIVATE10 = 1 << 21,
-    eLEXTYPE_PRIVATE11 = 1 << 22,
-    eLEXTYPE_PRIVATE12 = 1 << 23,
-    eLEXTYPE_PRIVATE13 = 1 << 24,
-    eLEXTYPE_PRIVATE14 = 1 << 25,
-    eLEXTYPE_PRIVATE15 = 1 << 26,
-    eLEXTYPE_PRIVATE16 = 1 << 27,
-    eLEXTYPE_PRIVATE17 = 1 << 28,
-    eLEXTYPE_PRIVATE18 = 1 << 29,
-    eLEXTYPE_PRIVATE19 = 1 << 30,
-    eLEXTYPE_PRIVATE20 = 1 << 31,
-}}
-FLAGS!{enum SPWORDTYPE {
-    eWORDTYPE_ADDED = 1 << 0,
-    eWORDTYPE_DELETED = 1 << 1,
-}}
-FLAGS!{enum SPPRONUNCIATIONFLAGS {
-    ePRONFLAG_USED = 1 << 0,
-}}
-STRUCT!{struct SPWORDPRONUNCIATION {
-    pNextWordPronunciation: *mut SPWORDPRONUNCIATION,
-    eLexiconType: SPLEXICONTYPE,
-    LangID: ::WORD,
-    wPronunciationFlags: ::WORD,
-    ePartOfSpeech: SPPARTOFSPEECH,
-    szPronunciation: [SPPHONEID; 1],
-}}
-STRUCT!{struct SPWORDPRONUNCIATIONLIST {
-    ulSize: ::ULONG,
-    pvBuffer: *mut ::BYTE,
-    pFirstWordPronunciation: *mut SPWORDPRONUNCIATION,
-}}
-STRUCT!{struct SPWORD {
-    pNextWord: *mut SPWORD,
-    LangID: ::WORD,
-    wReserved: ::WORD,
-    eWordType: SPWORDTYPE,
-    pszWord: ::LPWSTR,
-    pFirstWordPronunciation: *mut SPWORDPRONUNCIATION,
-}}
-STRUCT!{struct SPWORDLIST {
-    ulSize: ::ULONG,
-    pvBuffer: *mut ::BYTE,
-    pFirstWord: *mut SPWORD,
-}}
-RIDL!(
-interface ISpLexicon(ISpLexiconVtbl): IUnknown(IUnknownVtbl) {
-    fn GetPronunciations(
-        &mut self, pszWord: ::LPCWSTR, LangID: ::WORD, dwFlags: ::DWORD,
-        pWordPronunciationList: *mut SPWORDPRONUNCIATIONLIST
-    ) -> ::HRESULT,
-    fn AddPronunciation(
-        &mut self, pszWord: ::LPCWSTR, LangID: ::WORD, ePartOfSpeech: SPPARTOFSPEECH,
-        pszPronunciation: PCSPPHONEID
-    ) -> ::HRESULT,
-    fn RemovePronunciation(
-        &mut self, pszWord: ::LPCWSTR, LangID: ::WORD, ePartOfSpeech: SPPARTOFSPEECH,
-        pszPronunciation: PCSPPHONEID
-    ) -> ::HRESULT,
-    fn GetGeneration(&mut self, pdwGeneration: *mut ::DWORD) -> ::HRESULT,
-    fn GetGenerationChange(
-        &mut self, dwFlags: ::DWORD, pdwGeneration: *mut ::DWORD, pWordList: *mut SPWORDLIST
-    ) -> ::HRESULT,
-    fn GetWords(
-        &mut self, dwFlags: ::DWORD, pdwGeneration: *mut ::DWORD, pdwCookie: *mut ::DWORD,
-        pWordList: *mut SPWORDLIST
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpContainerLexicon(ISpContainerLexiconVtbl): ISpLexicon(ISpLexiconVtbl) {
-    fn AddLexicon(&mut self, pAddLexicon: *mut ISpLexicon, dwFlags: ::DWORD) -> ::HRESULT
-}
-);
-ENUM!{enum SPSHORTCUTTYPE {
-    SPSHT_NotOverriden = -1i32 as u32,
-    SPSHT_Unknown = 0,
-    SPSHT_EMAIL = 0x1000,
-    SPSHT_OTHER = 0x2000,
-    SPPS_RESERVED1 = 0x3000,
-    SPPS_RESERVED2 = 0x4000,
-    SPPS_RESERVED3 = 0x5000,
-    SPPS_RESERVED4 = 0xf000,
-}}
-STRUCT!{struct SPSHORTCUTPAIR {
-    pNextSHORTCUTPAIR: *mut SPSHORTCUTPAIR,
-    LangID: ::WORD,
-    shType: SPSHORTCUTTYPE,
-    pszDisplay: ::LPWSTR,
-    pszSpoken: ::LPWSTR,
-}}
-STRUCT!{struct SPSHORTCUTPAIRLIST {
-    ulSize: ::ULONG,
-    pvBuffer: *mut ::BYTE,
-    pFirstShortcutPair: *mut SPSHORTCUTPAIR,
-}}
-RIDL!(
-interface ISpShortcut(ISpShortcutVtbl): IUnknown(IUnknownVtbl) {
-    fn AddShortcut(
-        &mut self, pszDisplay: ::LPCWSTR, LangID: ::WORD, pszSpoken: ::LPCWSTR,
-        shType: SPSHORTCUTTYPE
-    ) -> ::HRESULT,
-    fn RemoveShortcut(
-        &mut self, pszDisplay: ::LPCWSTR, LangID: ::WORD, pszSpoken: ::LPCWSTR,
-        shType: SPSHORTCUTTYPE
-    ) -> ::HRESULT,
-    fn GetShortcuts(
-        &mut self, LangId: ::WORD, pShortcutpairList: *mut SPSHORTCUTPAIRLIST
-    ) -> ::HRESULT,
-    fn GetGeneration(&mut self, pdwGeneration: *mut ::DWORD) -> ::HRESULT,
-    fn GetWordsFromGenerationChange(
-        &mut self, pdwGeneration: *mut ::DWORD, pWordList: *mut SPWORDLIST
-    ) -> ::HRESULT,
-    fn GetWords(
-        &mut self, pdwGeneration: *mut ::DWORD, pdwCookie: *mut ::DWORD, pWordList: *mut SPWORDLIST
-    ) -> ::HRESULT,
-    fn GetShortcutsForGeneration(
-        &mut self, pdwGeneration: *mut ::DWORD, pdwCookie: *mut ::DWORD,
-        pShortcutpairList: *mut SPSHORTCUTPAIRLIST
-    ) -> ::HRESULT,
-    fn GetGenerationChange(
-        &mut self, pdwGeneration: *mut ::DWORD, pShortcutpairList: *mut SPSHORTCUTPAIRLIST
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpPhoneConverter(ISpPhoneConverterVtbl): ISpObjectWithToken(ISpObjectWithTokenVtbl) {
-    fn PhoneToId(&mut self, pszPhone: ::LPCWSTR, pId: *mut SPPHONEID) -> ::HRESULT,
-    fn IdToPhone(&mut self, pId: PCSPPHONEID, pszPhone: *mut ::WCHAR) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpPhoneticAlphabetConverter(ISpPhoneticAlphabetConverterVtbl): IUnknown(IUnknownVtbl) {
-    fn GetLangId(&mut self, pLangID: *mut ::WORD) -> ::HRESULT,
-    fn SetLangId(&mut self, LangID: *mut ::WORD) -> ::HRESULT,
-    fn SAPI2UPS(
-        &mut self, pszSAPIId: *const SPPHONEID, pszUPSId: *mut SPPHONEID, cMaxLength: ::DWORD
-    ) -> ::HRESULT,
-    fn UPS2SAPI(
-        &mut self, pszUPSId: *const SPPHONEID, pszSAPIId: *mut SPPHONEID, cMaxLength: ::DWORD
-    ) -> ::HRESULT,
-    fn GetMaxConvertLength(
-        &mut self, cSrcLength: ::DWORD, bSAPI2UPS: ::BOOL, pcMaxDestLength: *mut ::DWORD
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpPhoneticAlphabetSelection(ISpPhoneticAlphabetSelectionVtbl): IUnknown(IUnknownVtbl) {
-    fn IsAlphabetUPS(&mut self, pfIsUPS: *mut ::BOOL) -> ::HRESULT,
-    fn SetAlphabetToUPS(&mut self, fForceUPS: ::BOOL) -> ::HRESULT
-}
-);
-STRUCT!{struct SPVPITCH {
-    MiddleAdj: ::c_long,
-    RangeAdj: ::c_long,
-}}
-ENUM!{enum SPVACTIONS {
-    SPVA_Speak = 0,
-    SPVA_Silence,
-    SPVA_Pronounce,
-    SPVA_Bookmark,
-    SPVA_SpellOut,
-    SPVA_Section,
-    SPVA_ParseUnknownTag,
-}}
-STRUCT!{struct SPVCONTEXT {
-    pCategory: ::LPCWSTR,
-    pBefore: ::LPCWSTR,
-    pAfter: ::LPCWSTR,
-}}
-STRUCT!{struct SPVSTATE {
-    eAction: SPVACTIONS,
-    LangID: ::WORD,
-    wReserved: ::WORD,
-    EmphAdj: ::c_long,
-    RateAdj: ::c_long,
-    Volume: ::ULONG,
-    PitchAdj: SPVPITCH,
-    SilenceMSecs: ::ULONG,
-    pPhoneIds: *mut SPPHONEID,
-    ePartOfSpeech: SPPARTOFSPEECH,
-    Context: SPVCONTEXT,
-}}
-ENUM!{enum SPRUNSTATE {
-    SPRS_DONE = 1 << 0,
-    SPRS_IS_SPEAKING = 1 << 1,
-}}
-ENUM!{enum SPVLIMITS {
-    SPMIN_VOLUME = 0,
-    SPMAX_VOLUME = 100,
-    SPMIN_RATE = -10i32 as u32,
-    SPMAX_RATE = 10,
-}}
-ENUM!{enum SPVPRIORITY {
-    SPVPRI_NORMAL = 0,
-    SPVPRI_ALERT = 1 << 0,
-    SPVPRI_OVER = 1 << 1,
-}}
-STRUCT!{struct SPVOICESTATUS {
-    ulCurrentStream: ::ULONG,
-    ulLastStreamQueued: ::ULONG,
-    hrLastResult: ::HRESULT,
-    dwRunningState: ::DWORD,
-    ulInputWordPos: ::ULONG,
-    ulInputWordLen: ::ULONG,
-    ulInputSentPos: ::ULONG,
-    ulInputSentLen: ::ULONG,
-    lBookmarkId: ::LONG,
-    PhonemeId: SPPHONEID,
-    VisemeId: SPVISEMES,
-    dwReserved1: ::DWORD,
-    dwReserved2: ::DWORD,
-}}
-FLAGS!{enum SPEAKFLAGS {
-    SPF_DEFAULT = 0,
-    SPF_ASYNC = 1 << 0,
-    SPF_PURGEBEFORESPEAK = 1 << 1,
-    SPF_IS_FILENAME = 1 << 2,
-    SPF_IS_XML = 1 << 3,
-    SPF_IS_NOT_XML = 1 << 4,
-    SPF_PERSIST_XML = 1 << 5,
-    SPF_NLP_SPEAK_PUNC = 1 << 6,
-    SPF_PARSE_SAPI = 1 << 7,
-    SPF_PARSE_SSML = 1 << 8,
-}}
-pub const SPF_PARSE_AUTODETECT: SPEAKFLAGS = SPF_DEFAULT;
-pub const SPF_NLP_MASK: SPEAKFLAGS = SPF_NLP_SPEAK_PUNC;
-pub const SPF_PARSE_MASK: i32 = SPF_PARSE_SAPI.0 as i32 | SPF_PARSE_SSML.0 as i32;
-pub const SPF_VOICE_MASK: i32 =
-    SPF_ASYNC.0 as i32 | SPF_PURGEBEFORESPEAK.0 as i32 | SPF_IS_FILENAME.0 as i32 | SPF_IS_XML.0 as i32 |
-    SPF_IS_NOT_XML.0 as i32 | SPF_NLP_MASK.0 as i32 | SPF_PERSIST_XML.0 as i32 | SPF_PARSE_MASK;
-pub const SPF_UNUSED_FLAGS: i32 = !SPF_VOICE_MASK;
-RIDL!(
-interface ISpVoice(ISpVoiceVtbl): ISpEventSource(ISpEventSourceVtbl) {
-    fn SetOutput(&mut self, pUnkOutput: *mut ::IUnknown, fAllowFormatChanges: ::BOOL) -> ::HRESULT,
-    fn GetOutputObjectToken(&mut self, ppObjectToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn GetOutputStream(&mut self, ppStream: *mut *mut ISpStreamFormat) -> ::HRESULT,
-    fn Pause(&mut self) -> ::HRESULT,
-    fn Resume(&mut self) -> ::HRESULT,
-    fn SetVoice(&mut self, pToken: *mut ISpObjectToken) -> ::HRESULT,
-    fn GetVoice(&mut self, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn Speak(
-        &mut self, pwcs: ::LPCWSTR, dwFlags: ::DWORD, pulStreamNumber: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn SpeakStream(
-        &mut self, pStream: *mut ::IStream, dwFlags: ::DWORD, pulStreamNumber: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn GetStatus(
-        &mut self, pStatus: *mut SPVOICESTATUS, ppszLastBookmark: *mut ::LPWSTR
-    ) -> ::HRESULT,
-    fn Skip(
-        &mut self, pItemType: ::LPCWSTR, lNumItems: ::c_long, pulNumSkipped: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn SetPriority(&mut self, ePriority: SPVPRIORITY) -> ::HRESULT,
-    fn GetPriority(&mut self, pePriority: *mut SPVPRIORITY) -> ::HRESULT,
-    fn SetAlertBoundary(&mut self, eBoundary: SPEVENTENUM) -> ::HRESULT,
-    fn GetAlertBoundary(&mut self, peBoundary: *mut SPEVENTENUM) -> ::HRESULT,
-    fn SetRate(&mut self, RateAdjust: ::c_long) -> ::HRESULT,
-    fn GetRate(&mut self, pRateAdjust: *mut ::c_long) -> ::HRESULT,
-    fn SetVolume(&mut self, usVolume: ::USHORT) -> ::HRESULT,
-    fn GetVolume(&mut self, pusVolume: *mut ::USHORT) -> ::HRESULT,
-    fn WaitUntilDone(&mut self, msTimeout: ::ULONG) -> ::HRESULT,
-    fn SetSyncSpeakTimeout(&mut self, msTimeout: ::ULONG) -> ::HRESULT,
-    fn GetSyncSpeakTimeout(&mut self, pmsTimeout: *mut ::ULONG) -> ::HRESULT,
-    fn SpeakCompleteEvent(&mut self) -> ::HANDLE,
-    fn IsUISupported(
-        &mut self, pszTypeOfUI: ::LPCWSTR, pvExtraData: *mut ::c_void, cbExtraData: ::ULONG,
-        pfSupported: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn DisplayUI(
-        &mut self, hwndParent: ::HWND, pszTitle: ::LPCWSTR, pszTypeOfUI: ::LPCWSTR,
-        pvExtraData: *mut ::c_void, cbExtraData: ::ULONG
-    ) -> ::HRESULT
-}
-);
-DEFINE_GUID!(
-    UuidOfISpVoice,
-    0x6C44DF74, 0x72B9, 0x4992, 0xA1, 0xEC, 0xEF, 0x99, 0x6E, 0x04, 0x22, 0xD4
-);
-RIDL!(
-interface ISpPhrase(ISpPhraseVtbl): IUnknown(IUnknownVtbl) {
-    fn GetPhrase(&mut self, ppCoMemPhrase: *mut *mut SPPHRASE) -> ::HRESULT,
-    fn GetSerializedPhrase(&mut self, ppCoMemPhrase: *mut *mut SPSERIALIZEDPHRASE) -> ::HRESULT,
-    fn GetText(
-        &mut self, ulStart: ::ULONG, ulCount: ::ULONG, fUseTextReplacements: ::BOOL,
-        ppszCoMemText: *mut ::LPWSTR, pbDisplayAttributes: *mut ::BYTE
-    ) -> ::HRESULT,
-    fn Discard(&mut self, dwValueTypes: ::DWORD) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpPhraseAlt(ISpPhraseAltVtbl): ISpPhrase(ISpPhraseVtbl) {
-    fn GetAltInfo(
-        &mut self, pParent: *mut *mut ISpPhrase, pulStartElementInParent: *mut ::ULONG,
-        pcElementsInParent: *mut ::ULONG, pcElementsInAlt: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn Commit(&mut self) -> ::HRESULT
-}
-);
-ENUM!{enum SPXMLRESULTOPTIONS {
-    SPXRO_SML = 0,
-    SPXRO_Alternates_SML = 1,
-}}
-RIDL!(
-interface ISpPhrase2(ISpPhrase2Vtbl): ISpPhrase(ISpPhraseVtbl) {
-    fn GetXMLResult(
-        &mut self, ppszCoMemXMLResult: *mut ::LPWSTR, Options: SPXMLRESULTOPTIONS
-    ) -> ::HRESULT,
-    fn GetXMLErrorInfo(&mut self, pSemanticErrorInfo: *mut SPSEMANTICERRORINFO) -> ::HRESULT,
-    fn GetAudio(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, ppStream: *mut *mut ISpStreamFormat
-    ) -> ::HRESULT
-}
-);
-STRUCT!{struct SPRECORESULTTIMES {
-    ftStreamTime: ::FILETIME,
-    ullLength: ::ULONGLONG,
-    dwTickCount: ::DWORD,
-    ullStart: ::ULONGLONG,
-}}
-STRUCT!{struct SPSERIALIZEDRESULT {
-    ulSerializedSize: ::ULONG,
-}}
-RIDL!(
-interface ISpRecoResult(ISpRecoResultVtbl): ISpPhrase(ISpPhraseVtbl) {
-    fn GetResultTimes(&mut self, pTimes: *mut SPRECORESULTTIMES) -> ::HRESULT,
-    fn GetAlternates(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, ulRequestCount: ::ULONG,
-        ppPhrases: *mut *mut ISpPhraseAlt, pcPhrasesReturned: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn GetAudio(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, ppStream: *mut *mut ISpStreamFormat
-    ) -> ::HRESULT,
-    fn SpeakAudio(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, dwFlags: ::DWORD,
-        pulStreamNumber: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn Serialize(&mut self, ppCoMemSerializedResult: *mut *mut SPSERIALIZEDRESULT) -> ::HRESULT,
-    fn ScaleAudio(
-        &mut self, pAudioFormatId: *const ::GUID, pWaveFormatEx: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetRecoContext(&mut self, ppRecoContext: *mut *mut ISpRecoContext) -> ::HRESULT
-}
-);
-FLAGS!{enum SPCOMMITFLAGS {
-    SPCF_NONE = 0,
-    SPCF_ADD_TO_USER_LEXICON = 1 << 0,
-    SPCF_DEFINITE_CORRECTION = 1 << 1,
-}}
-RIDL!(
-interface ISpRecoResult2(ISpRecoResult2Vtbl): ISpRecoResult(ISpRecoResultVtbl) {
-    fn CommitAlternate(
-        &mut self, pPhraseAlt: *mut ISpPhraseAlt, ppNewResult: *mut *mut ISpRecoResult
-    ) -> ::HRESULT,
-    fn CommitText(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, pszCorrectedData: ::LPCWSTR,
-        eCommitFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn SetTextFeedback(&mut self, pszFeedback: ::LPCWSTR, fSuccessful: ::BOOL) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpXMLRecoResult(ISpXMLRecoResultVtbl): ISpRecoResult(ISpRecoResultVtbl) {
-    fn GetXMLResult(
-        &mut self, ppszCoMemXMLResult: *mut ::LPWSTR, Options: SPXMLRESULTOPTIONS
-    ) -> ::HRESULT,
-    fn GetXMLErrorInfo(&mut self, pSemanticErrorInfo: *mut SPSEMANTICERRORINFO) -> ::HRESULT
-}
-);
-STRUCT!{struct SPTEXTSELECTIONINFO {
-    ulStartActiveOffset: ::ULONG,
-    cchActiveChars: ::ULONG,
-    ulStartSelection: ::ULONG,
-    cchSelection: ::ULONG,
-}}
-ENUM!{enum SPWORDPRONOUNCEABLE {
-    SPWP_UNKNOWN_WORD_UNPRONOUNCEABLE = 0,
-    SPWP_UNKNOWN_WORD_PRONOUNCEABLE = 1,
-    SPWP_KNOWN_WORD_PRONOUNCEABLE = 2,
-}}
-ENUM!{enum SPGRAMMARSTATE {
-    SPGS_DISABLED = 0,
-    SPGS_ENABLED = 1,
-    SPGS_EXCLUSIVE = 3,
-}}
-ENUM!{enum SPCONTEXTSTATE {
-    SPCS_DISABLED = 0,
-    SPCS_ENABLED = 1,
-}}
-ENUM!{enum SPRULESTATE {
-    SPRS_INACTIVE = 0,
-    SPRS_ACTIVE = 1,
-    SPRS_ACTIVE_WITH_AUTO_PAUSE = 3,
-    SPRS_ACTIVE_USER_DELIMITED = 4,
-}}
-pub const SP_STREAMPOS_ASAP: ::INT = 0;
-pub const SP_STREAMPOS_REALTIME: ::INT = -1;
-pub const SPRULETRANS_TEXTBUFFER: SPSTATEHANDLE = -1isize as SPSTATEHANDLE;
-pub const SPRULETRANS_WILDCARD: SPSTATEHANDLE = -2isize as SPSTATEHANDLE;
-pub const SPRULETRANS_DICTATION: SPSTATEHANDLE = -3isize as SPSTATEHANDLE;
-ENUM!{enum SPGRAMMARWORDTYPE {
-    SPWT_DISPLAY = 0,
-    SPWT_LEXICAL = 1,
-    SPWT_PRONUNCIATION = 2,
-    SPWT_LEXICAL_NO_SPECIAL_CHARS = 3,
-}}
-STRUCT!{struct SPPROPERTYINFO {
-    pszName: ::LPCWSTR,
-    ulId: ::ULONG,
-    pszValue: ::LPCWSTR,
-    vValue: ::VARIANT,
-}}
-FLAGS!{enum SPCFGRULEATTRIBUTES {
-    SPRAF_TopLevel = 1 << 0,
-    SPRAF_Active = 1 << 1,
-    SPRAF_Export = 1 << 2,
-    SPRAF_Import = 1 << 3,
-    SPRAF_Interpreter = 1 << 4,
-    SPRAF_Dynamic = 1 << 5,
-    SPRAF_Root = 1 << 6,
-    SPRAF_AutoPause = 1 << 16,
-    SPRAF_UserDelimited = 1 << 17,
-}}
-RIDL!(
-interface ISpGrammarBuilder(ISpGrammarBuilderVtbl): IUnknown(IUnknownVtbl) {
-    fn ResetGrammar(&mut self, NewLanguage: ::WORD) -> ::HRESULT,
-    fn GetRule(
-        &mut self, pszRuleName: ::LPCWSTR, dwRuleId: ::DWORD, dwAttributes: ::DWORD,
-        fCreateIfNotExist: ::BOOL, phInitialState: *mut SPSTATEHANDLE
-    ) -> ::HRESULT,
-    fn ClearRule(&mut self, hState: SPSTATEHANDLE) -> ::HRESULT,
-    fn CreateNewState(&mut self, hState: SPSTATEHANDLE, phState: *mut SPSTATEHANDLE) -> ::HRESULT,
-    fn AddWordTransition(
-        &mut self, hFromState: SPSTATEHANDLE, hToState: SPSTATEHANDLE, psz: ::LPCWSTR,
-        pszSeparators: ::LPCWSTR, eWordType: SPGRAMMARWORDTYPE, Weight: ::c_float,
-        pPropInfo: *const SPPROPERTYINFO
-    ) -> ::HRESULT,
-    fn AddRuleTransition(
-        &mut self, hFromState: SPSTATEHANDLE, hToState: SPSTATEHANDLE, hRule: SPSTATEHANDLE,
-        Weight: ::c_float, pPropInfo: *const SPPROPERTYINFO
-    ) -> ::HRESULT,
-    fn AddResource(
-        &mut self, hRuleState: SPSTATEHANDLE, pszResourceName: ::LPCWSTR,
-        pszResourceValue: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn Commit(&mut self, dwReserved: ::DWORD) -> ::HRESULT
-}
-);
-ENUM!{enum SPLOADOPTIONS {
-    SPLO_STATIC = 0,
-    SPLO_DYNAMIC = 1,
-}}
-RIDL!(
-interface ISpRecoGrammar(ISpRecoGrammarVtbl): ISpGrammarBuilder(ISpGrammarBuilderVtbl) {
-    fn GetGrammarId(&mut self, pullGrammarId: *mut ::ULONGLONG) -> ::HRESULT,
-    fn GetRecoContext(&mut self, ppRecoCtxt: *mut *mut ISpRecoContext) -> ::HRESULT,
-    fn LoadCmdFromFile(&mut self, pszFileName: ::LPCWSTR, Options: SPLOADOPTIONS) -> ::HRESULT,
-    fn LoadCmdFromObject(
-        &mut self, rcid: ::REFCLSID, pszGrammarName: ::LPCWSTR, Options: SPLOADOPTIONS
-    ) -> ::HRESULT,
-    fn LoadCmdFromResource(
-        &mut self, hModule: ::HMODULE, pszResourceName: ::LPCWSTR, pszResourceType: ::LPCWSTR,
-        wLanguage: ::WORD, Options: SPLOADOPTIONS
-    ) -> ::HRESULT,
-    fn LoadCmdFromMemory(
-        &mut self, pGrammar: *const SPBINARYGRAMMAR, Options: SPLOADOPTIONS
-    ) -> ::HRESULT,
-    fn LoadCmdFromProprietaryGrammar(
-        &mut self, rguidParam: ::REFGUID, pszStringParam: ::LPCWSTR, pvDataPrarm: *const ::c_void,
-        cbDataSize: ::ULONG, Options: SPLOADOPTIONS
-    ) -> ::HRESULT,
-    fn SetRuleState(
-        &mut self, pszName: ::LPCWSTR, pReserved: *mut ::c_void, NewState: SPRULESTATE
-    ) -> ::HRESULT,
-    fn SetRuleIdState(&mut self, ulRuleId: ::ULONG, NewState: SPRULESTATE) -> ::HRESULT,
-    fn LoadDictation(&mut self, pszTopicName: ::LPCWSTR, Options: SPLOADOPTIONS) -> ::HRESULT,
-    fn UnloadDictation(&mut self) -> ::HRESULT,
-    fn SetDictationState(&mut self, NewState: SPRULESTATE) -> ::HRESULT,
-    fn SetWordSequenceData(
-        &mut self, pText: *const ::WCHAR, cchText: ::ULONG, pInfo: *const SPTEXTSELECTIONINFO
-    ) -> ::HRESULT,
-    fn SetTextSelection(&mut self, pInfo: *const SPTEXTSELECTIONINFO) -> ::HRESULT,
-    fn IsPronounceable(
-        &mut self, pszWord: ::LPCWSTR, pWordPronounceable: *mut SPWORDPRONOUNCEABLE
-    ) -> ::HRESULT,
-    fn SetGrammarState(&mut self, eGrammarState: SPGRAMMARSTATE) -> ::HRESULT,
-    fn SaveCmd(&mut self, pStream: *mut ::IStream, ppszCoMemErrorText: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetGrammarState(&mut self, peGrammarState: *mut SPGRAMMARSTATE) -> ::HRESULT
-}
-);
-ENUM!{enum SPMATCHINGMODE {
-    AllWords = 0,
-    Subsequence = 1,
-    OrderedSubset = 3,
-    SubsequenceContentRequired = 5,
-    OrderedSubsetContentRequired = 7,
-}}
-ENUM!{enum PHONETICALPHABET {
-    PA_Ipa = 0,
-    PA_Ups = 1,
-    PA_Sapi = 2,
-}}
-RIDL!(
-interface ISpGrammarBuilder2(ISpGrammarBuilder2Vtbl): IUnknown(IUnknownVtbl) {
-    fn AddTextSubset(
-        &mut self, hFromState: SPSTATEHANDLE, hToState: SPSTATEHANDLE, psz: ::LPCWSTR,
-        eMatchMode: SPMATCHINGMODE
-    ) -> ::HRESULT,
-    fn SetPhoneticAlphabet(&mut self, phoneticALphabet: PHONETICALPHABET) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpRecoGrammar2(ISpRecoGrammar2Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetRules(&mut self, ppCoMemRules: *mut *mut SPRULE, puNumRules: *mut ::UINT) -> ::HRESULT,
-    fn LoadCmdFromFile2(
-        &mut self, pszFileName: ::LPCWSTR, Options: SPLOADOPTIONS, pszSharingUri: ::LPCWSTR,
-        pszBaseUri: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn LoadCmdFromMemory2(
-        &mut self, pGrammar: *const SPBINARYGRAMMAR, Options: SPLOADOPTIONS,
-        pszSharingUri: ::LPCWSTR, pszBaseUri: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetRulePriority(
-        &mut self, pszRuleName: ::LPCWSTR, ulRuleId: ::ULONG, nRulePriority: ::c_int
-    ) -> ::HRESULT,
-    fn SetRuleWeight(
-        &mut self, pszRuleName: ::LPCWSTR, ulRuleId: ::ULONG, flWeight: ::c_float
-    ) -> ::HRESULT,
-    fn SetDictationWeight(&mut self, flWeight: ::c_float) -> ::HRESULT,
-    fn SetGrammarLoader(&mut self, pLoader: *mut ISpeechResourceLoader) -> ::HRESULT,
-    fn SetSMLSecurityManager(
-        &mut self, pSMLSecurityManager: *mut ::IInternetSecurityManager
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechResourceLoader(ISpeechResourceLoaderVtbl): IDispatch(IDispatchVtbl) {
-    fn LoadResource(
-        &mut self, bstrResourceUri: ::BSTR, fAlwaysReload: ::VARIANT_BOOL,
-        pStream: *mut *mut ::IUnknown, pbstrMIMEType: *mut ::BSTR, pfModified: *mut ::VARIANT_BOOL,
-        pbstrRedirectUrl: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn GetLocalCopy(
-        &mut self, bstrResourceUri: ::BSTR, pbstrLocalPath: *mut ::BSTR,
-        pbstrMIMEType: *mut ::BSTR, pbstrRedirectUrl: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn ReleaseLocalCopy(&mut self, pbstrLocalPath: ::BSTR) -> ::HRESULT
-}
-);
-STRUCT!{nodebug struct SPRECOCONTEXTSTATUS {
-    eInterference: SPINTERFERENCE,
-    szRequestTypeOfUI: [::WCHAR; 255],
-    dwReserved1: ::DWORD,
-    dwReserved2: ::DWORD,
-}}
-FLAGS!{enum SPBOOKMARKOPTIONS {
-    SPBO_NONE = 0,
-    SPBO_PAUSE = 1 << 0,
-    SPBO_AHEAD = 1 << 1,
-    SPBO_TIME_UNITS = 1 << 2,
-}}
-FLAGS!{enum SPAUDIOOPTIONS {
-    SPAO_NONE = 0,
-    SPAO_RETAIN_AUDIO = 1 << 0,
-}}
-RIDL!(
-interface ISpRecoContext(ISpRecoContextVtbl): ISpEventSource(ISpEventSourceVtbl) {
-    fn GetRecognizer(&mut self, ppRecognizer: *mut *mut ISpRecognizer) -> ::HRESULT,
-    fn CreateGrammer(
-        &mut self, ullGrammarId: ::ULONGLONG, ppGrammar: *mut *mut ISpRecoGrammar
-    ) -> ::HRESULT,
-    fn GetStatus(&mut self, pState: *mut SPRECOCONTEXTSTATUS) -> ::HRESULT,
-    fn GetMaxAlternates(&mut self, pcAlternates: *mut ::ULONG) -> ::HRESULT,
-    fn SetMaxAlternates(&mut self, cAlternates: ::ULONG) -> ::HRESULT,
-    fn SetAudioOptions(
-        &mut self, Options: SPAUDIOOPTIONS, pAudioFormatId: *const ::GUID,
-        pWaveFormatEx: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetAudioOptions(
-        &mut self, pOptions: *mut SPAUDIOOPTIONS, pAudioFormatId: *mut ::GUID,
-        ppCoMemWFEX: *mut *mut ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn DeserializeResult(
-        &mut self, pSerializedResult: *const SPSERIALIZEDRESULT, ppResult: *mut *mut ISpRecoResult
-    ) -> ::HRESULT,
-    fn Bookmark(
-        &mut self, Options: SPBOOKMARKOPTIONS, ullStreamPosition: ::ULONGLONG,
-        lparamEvent: ::LPARAM
-    ) -> ::HRESULT,
-    fn SetAdaptionData(&mut self, pAdaptionData: ::LPCWSTR, cch: ::ULONG) -> ::HRESULT,
-    fn Pause(&mut self, dwReserved: ::DWORD) -> ::HRESULT,
-    fn Resume(&mut self, dwReserved: ::DWORD) -> ::HRESULT,
-    fn SetVoice(&mut self, pVoice: *mut ISpVoice, fAllowFormatChanges: ::BOOL) -> ::HRESULT,
-    fn GetVoice(&mut self, ppVoice: *mut *mut ISpVoice) -> ::HRESULT,
-    fn SetVoicePurgeEvent(&mut self, ullEventIntereset: ::ULONGLONG) -> ::HRESULT,
-    fn GetVoicePurgeEvent(&mut self, pullEventIntereset: *mut ::ULONGLONG) -> ::HRESULT,
-    fn SetContextState(&mut self, eContextState: SPCONTEXTSTATE) -> ::HRESULT,
-    fn GetContextState(&mut self, peContextState: *mut SPCONTEXTSTATE) -> ::HRESULT
-}
-);
-FLAGS!{enum SPGRAMMAROPTIONS {
-    SPGO_SAPI = 0x1,
-    SPGO_SRGS = 0x2,
-    SPGO_UPS = 0x4,
-    SPGO_SRGS_MS_SCRIPT = 0x8,
-    SPGO_SRGS_W3C_SCRIPT = 0x100,
-    SPGO_SRGS_STG_SCRIPT = 0x200,
-    SPGO_SRGS_SCRIPT =
-        SPGO_SRGS.0 | SPGO_SRGS_MS_SCRIPT.0 | SPGO_SRGS_W3C_SCRIPT.0 |
-             SPGO_SRGS_STG_SCRIPT.0,
-    SPGO_FILE = 0x10,
-    SPGO_HTTP = 0x20,
-    SPGO_RES = 0x40,
-    SPGO_OBJECT = 0x80,
-    SPGO_DEFAULT = 0x3fb,
-    SPGO_ALL = 0x3ff,
-}}
-FLAGS!{enum SPADAPTATIONSETTINGS {
-    SPADS_Default = 0,
-    SPADS_CurrentRecognizer = 0x1,
-    SPADS_RecoProfile = 0x2,
-    SPADS_Immediate = 0x4,
-    SPADS_Reset = 0x8,
-    SPADS_HighVolumeDataSource = 0x10,
-}}
-ENUM!{enum SPADAPTATIONRELEVANCE {
-    SPAR_Unknown = 0,
-    SPAR_Low = 1,
-    SPAR_Medium = 2,
-    SPAR_High = 3,
-}}
-RIDL!(
-interface ISpRecoContext2(ISpRecoContext2Vtbl): IUnknown(IUnknownVtbl) {
-    fn SetGrammarOptions(&mut self, eGrammarOptions: ::DWORD) -> ::HRESULT,
-    fn GetGrammarOptions(&mut self, peGrammarOptions: *mut ::DWORD) -> ::HRESULT,
-    fn SetAdaptationData2(
-        &mut self, pAdaptationData: ::LPCWSTR, cch: ::ULONG, pTopicName: ::LPCWSTR,
-        eAdaptationSettings: ::DWORD, eRelevance: SPADAPTATIONRELEVANCE
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpProperties(ISpPropertiesVtbl): IUnknown(IUnknownVtbl) {
-    fn SetPropertyNum(&mut self, pName: ::LPCWSTR, lValue: ::LONG) -> ::HRESULT,
-    fn GetPropertyNum(&mut self, pName: ::LPCWSTR, plValue: *mut ::LONG) -> ::HRESULT,
-    fn SetPropertyString(&mut self, pName: ::LPCWSTR, pValue: ::LPCWSTR) -> ::HRESULT,
-    fn GetPropertyString(&mut self, pName: ::LPCWSTR, ppCoMemValue: *mut ::LPWSTR) -> ::HRESULT
-}
-);
-STRUCT!{struct SPRECOGNIZERSTATUS {
-    AudioStatus: SPAUDIOSTATUS,
-    ullRecognitionStreamPos: ::ULONGLONG,
-    ulStreamNumber: ::ULONG,
-    ulNumActive: ::ULONG,
-    clsidEngine: ::CLSID,
-    cLangIDs: ::ULONG,
-    aLangID: [::WORD; 20],
-    ullRecognitionStreamTime: ::ULONGLONG,
-}}
-ENUM!{enum SPWAVEFORMATTYPE {
-    SPWF_INPUT = 0,
-    SPWF_SRENGINE = 1,
-}}
-pub type SPSTREAMFORMATTYPE = SPWAVEFORMATTYPE;
-ENUM!{enum SPRECOSTATE {
-    SPRST_INACTIVE = 0,
-    SPRST_ACTIVE = 1,
-    SPRST_ACTIVE_ALWAYS = 2,
-    SPRST_INACTIVE_WITH_PURGE = 3,
-    SPRST_NUM_STATES = 4,
-}}
-RIDL!(
-interface ISpRecognizer(ISpRecognizerVtbl): ISpProperties(ISpPropertiesVtbl) {
-    fn SetRecognizer(&mut self, pRecognizer: *mut ISpObjectToken) -> ::HRESULT,
-    fn GetRecognizer(&mut self, ppRecognizer: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn SetInput(&mut self, pUnkInput: *mut ::IUnknown, fAllowFormatChanges: ::BOOL) -> ::HRESULT,
-    fn GetInputObjectToken(&mut self, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn GetInputStream(&mut self, ppStream: *mut *mut ISpStreamFormat) -> ::HRESULT,
-    fn CreateRecoContext(&mut self, ppNewCtxt: *mut *mut ISpRecoContext) -> ::HRESULT,
-    fn GetRecoProfile(&mut self, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn SetRecoProfile(&mut self, pToken: *mut ISpObjectToken) -> ::HRESULT,
-    fn IsSharedInstance(&mut self) -> ::HRESULT,
-    fn GetRecoState(&mut self, pState: *mut SPRECOSTATE) -> ::HRESULT,
-    fn SetRecoState(&mut self, NewState: SPRECOSTATE) -> ::HRESULT,
-    fn GetStatus(&mut self, pStatus: *mut SPRECOGNIZERSTATUS) -> ::HRESULT,
-    fn GetFormat(
-        &mut self, WaveFormatType: SPSTREAMFORMATTYPE, pFormatId: *mut ::GUID,
-        ppCoMemWFEX: *mut ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn IsUISupported(
-        &mut self, pszTypeOfUI: ::LPCWSTR, pvExtraData: *mut ::c_void, cbExtraData: ::ULONG,
-        pfSupported: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn DisplayUI(
-        &mut self, hwndParent: ::HWND, pszTitle: ::LPCWSTR, pszTypeOfUI: ::LPCWSTR,
-        pvExtraData: *mut ::c_void, cbExtraData: ::ULONG
-    ) -> ::HRESULT,
-    fn EmulateRecognition(&mut self, pPhrase: *mut ISpPhrase) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpSerializeState(ISpSerializeStateVtbl): IUnknown(IUnknownVtbl) {
-    fn GetSerializedState(
-        &mut self, ppbData: *mut *mut ::BYTE, pulSize: *mut ::ULONG, dwReserved: ::DWORD
-    ) -> ::HRESULT,
-    fn SetSerializedState(
-        &mut self, pbData: *mut ::BYTE, ulSize: ::ULONG, dwReserved: ::DWORD
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpRecognizer2(ISpRecognizer2Vtbl): IUnknown(IUnknownVtbl) {
-    fn EmulateRecognitionEx(
-        &mut self, pPhrase: *mut ISpPhrase, dwCompareFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn SetTrainingState(
-        &mut self, fDoingTraining: ::BOOL, fAdaptFromTrainingData: ::BOOL
-    ) -> ::HRESULT,
-    fn ResetAcousticModelAdaptation(&mut self) -> ::HRESULT
-}
-);
-ENUM!{enum SPCATEGORYTYPE {
-    SPCT_COMMAND = 0,
-    SPCT_DICTATION,
-    SPCT_SLEEP,
-    SPCT_SUB_COMMAND,
-    SPCT_SUB_DICTATION,
-}}
-RIDL!(
-interface ISpRecoCategory(ISpRecoCategoryVtbl): IUnknown(IUnknownVtbl) {
-    fn GetType(&mut self, peCategoryType: *mut SPCATEGORYTYPE) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpRecognizer3(ISpRecognizer3Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetCategory(
-        &mut self, categoryType: SPCATEGORYTYPE, ppCategory: *mut *mut ISpRecoCategory
-    ) -> ::HRESULT,
-    fn SetActiveCategory(&mut self, pCategory: *mut ISpRecoCategory) -> ::HRESULT,
-    fn GetActiveCategory(&mut self, ppCategory: *mut *mut ISpRecoCategory) -> ::HRESULT
-}
-);
-STRUCT!{struct SPNORMALIZATIONLIST {
-    ulSize: ::ULONG,
-    ppszzNormalizedList: *mut *mut ::WCHAR,
-}}
-RIDL!(
-interface ISpEnginePronunciation(ISpEnginePronunciationVtbl): IUnknown(IUnknownVtbl) {
-    fn Normalize(
-        &mut self, pszWord: ::LPCWSTR, pszLeftContext: ::LPCWSTR, pszRightContext: ::LPCWSTR,
-        LangID: ::WORD, pNormalizationList: *mut SPNORMALIZATIONLIST
-    ) -> ::HRESULT,
-    fn GetPronunciations(
-        &mut self, pszWord: ::LPCWSTR, pszLeftContext: ::LPCWSTR, pszRightContext: ::LPCWSTR,
-        LangID: ::WORD, pEnginePronunciationList: *mut SPWORDPRONUNCIATIONLIST
-    ) -> ::HRESULT
-}
-);
-STRUCT!{struct SPDISPLAYTOKEN {
-    pszLexical: *const ::WCHAR,
-    pszDisplay: *const ::WCHAR,
-    bDisplayAttributes: ::BYTE,
-}}
-STRUCT!{struct SPDISPLAYPHRASE {
-    ulNumTokens: ::ULONG,
-    pTokens: *mut SPDISPLAYTOKEN,
-}}
-RIDL!(
-interface ISpDisplayAlternates(ISpDisplayAlternatesVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDisplayAlternates(
-        &mut self, pPhrase: *const SPDISPLAYPHRASE, cRequestCount: ::ULONG,
-        ppCoMemPhrases: *mut *mut SPDISPLAYPHRASE, pcPhrasesReturned: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn SetFullStopTrailSpace(&mut self, ulTrailSpace: ::ULONG) -> ::HRESULT
-}
-);
-pub type SpeechLanguageId = ::c_long;
-ENUM!{enum DISPID_SpeechDataKey {
-    DISPID_SDKSetBinaryValue = 1,
-    DISPID_SDKGetBinaryValue,
-    DISPID_SDKSetStringValue,
-    DISPID_SDKGetStringValue,
-    DISPID_SDKSetLongValue,
-    DISPID_SDKGetlongValue,
-    DISPID_SDKOpenKey,
-    DISPID_SDKCreateKey,
-    DISPID_SDKDeleteKey,
-    DISPID_SDKDeleteValue,
-    DISPID_SDKEnumKeys,
-    DISPID_SDKEnumValues,
-}}
-ENUM!{enum DISPID_SpeechObjectToken {
-    DISPID_SOTId = 1,
-    DISPID_SOTDataKey,
-    DISPID_SOTCategory,
-    DISPID_SOTGetDescription,
-    DISPID_SOTSetId,
-    DISPID_SOTGetAttribute,
-    DISPID_SOTCreateInstance,
-    DISPID_SOTRemove,
-    DISPID_SOTGetStorageFileName,
-    DISPID_SOTRemoveStorageFileName,
-    DISPID_SOTIsUISupported,
-    DISPID_SOTDisplayUI,
-    DISPID_SOTMatchesAttributes,
-}}
-ENUM!{enum SpeechDataKeyLocation {
-    SDKLDefaultLocation = SPDKL_DefaultLocation.0,
-    SDKLCurrentUser = SPDKL_CurrentUser.0,
-    SDKLLocalMachine = SPDKL_LocalMachine.0,
-    SDKLCurrentConfig = SPDKL_CurrentConfig.0,
-}}
-ENUM!{enum SpeechTokenContext {
-    STCInprocServer = ::CLSCTX_INPROC_SERVER,
-    STCInprocHandler = ::CLSCTX_INPROC_HANDLER,
-    STCLocalServer = ::CLSCTX_LOCAL_SERVER,
-    STCRemoteServer = ::CLSCTX_REMOTE_SERVER,
-    STCAll = ::CLSCTX_INPROC_SERVER | ::CLSCTX_INPROC_HANDLER |
-             ::CLSCTX_LOCAL_SERVER | ::CLSCTX_REMOTE_SERVER,
-}}
-ENUM!{enum SpeechTokenShellFolder {
-    STSF_AppData = 0x1a,
-    STSF_LocalAppData = 0x1c,
-    STSF_CommonAppData = 0x23,
-    STSF_FlagCreate = 0x8000,
-}}
-ENUM!{enum DISPID_SpeechObjectTokens {
-    DISPID_SOTsCount = 1,
-    DISPID_SOTsItem = ::DISPID_VALUE as u32,
-    DISPID_SOTs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechObjectTokenCategory {
-    DISPID_SOTCId = 1,
-    DISPID_SOTCDefault,
-    DISPID_SOTCSetId,
-    DISPID_SOTCGetDataKey,
-    DISPID_SOTCEnumerateTokens,
-}}
-ENUM!{enum SpeechAudioFormatType {
-    SAFTDefault = -1i32 as u32,
-    SAFTNoAssignedFormat = 0,
-    SAFTText = 1,
-    SAFTNonStandardFormat = 2,
-    SAFTExtendedAudioFormat = 3,
-    SAFT8kHz8BitMono = 4,
-    SAFT8kHz8BitStereo = 5,
-    SAFT8kHz16BitMono = 6,
-    SAFT8kHz16BitStereo = 7,
-    SAFT11kHz8BitMono = 8,
-    SAFT11kHz8BitStereo = 9,
-    SAFT11kHz16BitMono = 10,
-    SAFT11kHz16BitStereo = 11,
-    SAFT12kHz8BitMono = 12,
-    SAFT12kHz8BitStereo = 13,
-    SAFT12kHz16BitMono = 14,
-    SAFT12kHz16BitStereo = 15,
-    SAFT16kHz8BitMono = 16,
-    SAFT16kHz8BitStereo = 17,
-    SAFT16kHz16BitMono = 18,
-    SAFT16kHz16BitStereo = 19,
-    SAFT22kHz8BitMono = 20,
-    SAFT22kHz8BitStereo = 21,
-    SAFT22kHz16BitMono = 22,
-    SAFT22kHz16BitStereo = 23,
-    SAFT24kHz8BitMono = 24,
-    SAFT24kHz8BitStereo = 25,
-    SAFT24kHz16BitMono = 26,
-    SAFT24kHz16BitStereo = 27,
-    SAFT32kHz8BitMono = 28,
-    SAFT32kHz8BitStereo = 29,
-    SAFT32kHz16BitMono = 30,
-    SAFT32kHz16BitStereo = 31,
-    SAFT44kHz8BitMono = 32,
-    SAFT44kHz8BitStereo = 33,
-    SAFT44kHz16BitMono = 34,
-    SAFT44kHz16BitStereo = 35,
-    SAFT48kHz8BitMono = 36,
-    SAFT48kHz8BitStereo = 37,
-    SAFT48kHz16BitMono = 38,
-    SAFT48kHz16BitStereo = 39,
-    SAFTTrueSpeech_8kHz1BitMono = 40,
-    SAFTCCITT_ALaw_8kHzMono = 41,
-    SAFTCCITT_ALaw_8kHzStereo = 42,
-    SAFTCCITT_ALaw_11kHzMono = 43,
-    SAFTCCITT_ALaw_11kHzStereo = 44,
-    SAFTCCITT_ALaw_22kHzMono = 45,
-    SAFTCCITT_ALaw_22kHzStereo = 46,
-    SAFTCCITT_ALaw_44kHzMono = 47,
-    SAFTCCITT_ALaw_44kHzStereo = 48,
-    SAFTCCITT_uLaw_8kHzMono = 49,
-    SAFTCCITT_uLaw_8kHzStereo = 50,
-    SAFTCCITT_uLaw_11kHzMono = 51,
-    SAFTCCITT_uLaw_11kHzStereo = 52,
-    SAFTCCITT_uLaw_22kHzMono = 53,
-    SAFTCCITT_uLaw_22kHzStereo = 54,
-    SAFTCCITT_uLaw_44kHzMono = 55,
-    SAFTCCITT_uLaw_44kHzStereo = 56,
-    SAFTADPCM_8kHzMono = 57,
-    SAFTADPCM_8kHzStereo = 58,
-    SAFTADPCM_11kHzMono = 59,
-    SAFTADPCM_11kHzStereo = 60,
-    SAFTADPCM_22kHzMono = 61,
-    SAFTADPCM_22kHzStereo = 62,
-    SAFTADPCM_44kHzMono = 63,
-    SAFTADPCM_44kHzStereo = 64,
-    SAFTGSM610_8kHzMono = 65,
-    SAFTGSM610_11kHzMono = 66,
-    SAFTGSM610_22kHzMono = 67,
-    SAFTGSM610_44kHzMono = 68,
-}}
-ENUM!{enum DISPID_SpeechAudioFormat {
-    DISPID_SAFType = 1,
-    DISPID_SAFGuid,
-    DISPID_SAFGetWaveFormatEx,
-    DISPID_SAFSetWaveFormatEx,
-}}
-ENUM!{enum DISPID_SpeechBaseStream {
-    DISPID_SBSFormat = 1,
-    DISPID_SBSRead,
-    DISPID_SBSWrite,
-    DISPID_SBSSeek,
-}}
-ENUM!{enum SpeechStreamSeekPositionType {
-    SSSPTRelativeToStart = ::STREAM_SEEK_SET.0,
-    SSSPTRelativeToCurrentPosition = ::STREAM_SEEK_CUR.0,
-    SSSPTRelativeToEnd = ::STREAM_SEEK_END.0,
-}}
-ENUM!{enum DISPID_SpeechAudio {
-    DISPID_SAStatus = 200,
-    DISPID_SABufferInfo,
-    DISPID_SADefaultFormat,
-    DISPID_SAVolume,
-    DISPID_SABufferNotifySize,
-    DISPID_SAEventHandle,
-    DISPID_SASetState,
-}}
-ENUM!{enum SpeechAudioState {
-    SASClosed = SPAS_CLOSED.0,
-    SASStop = SPAS_STOP.0,
-    SASPause = SPAS_PAUSE.0,
-    SASRun = SPAS_RUN.0,
-}}
-ENUM!{enum DISPID_SpeechMMSysAudio {
-    DISPID_SMSADeviceId = 300,
-    DISPID_SMSALineId,
-    DISPID_SMSAMMHandle,
-}}
-ENUM!{enum DISPID_SpeechFileStream {
-    DISPID_SFSOpen = 100,
-    DISPID_SFSClose,
-}}
-ENUM!{enum SpeechStreamFileMode {
-    SSFMOpenForRead = SPFM_OPEN_READONLY.0,
-    SSFMOpenReadWrite = SPFM_OPEN_READWRITE.0,
-    SSFMCreate = SPFM_CREATE.0,
-    SSFMCreateForWrite = SPFM_CREATE_ALWAYS.0,
-}}
-ENUM!{enum DISPID_SpeechCustomStream {
-    DISPID_SCSBaseStream = 100,
-}}
-ENUM!{enum DISPID_SpeechMemoryStream {
-    DISPID_SMSSetData = 100,
-    DISPID_SMSGetData,
-}}
-ENUM!{enum DISPID_SpeechAudioStatus {
-    DISPID_SASFreeBufferSpace = 1,
-    DISPID_SASNonBlockingIO,
-    DISPID_SASState,
-    DISPID_SASCurrentSeekPosition,
-    DISPID_SASCurrentDevicePosition,
-}}
-ENUM!{enum DISPID_SpeechAudioBufferInfo {
-    DISPID_SABIMinNotification = 1,
-    DISPID_SABIBufferSize,
-    DISPID_SABIEventBias,
-}}
-ENUM!{enum DISPID_SpeechWaveFormatEx {
-    DISPID_SWFEFormatTag = 1,
-    DISPID_SWFEChannels,
-    DISPID_SWFESamplesPerSec,
-    DISPID_SWFEAvgBytesPerSec,
-    DISPID_SWFEBlockAlign,
-    DISPID_SWFEBitsPerSample,
-    DISPID_SWFEExtraData,
-}}
-ENUM!{enum DISPID_SpeechVoice {
-    DISPID_SVStatus = 1,
-    DISPID_SVVoice,
-    DISPID_SVAudioOutput,
-    DISPID_SVAudioOutputStream,
-    DISPID_SVRate,
-    DISPID_SVVolume,
-    DISPID_SVAllowAudioOuputFormatChangesOnNextSet,
-    DISPID_SVEventInterests,
-    DISPID_SVPriority,
-    DISPID_SVAlertBoundary,
-    DISPID_SVSyncronousSpeakTimeout,
-    DISPID_SVSpeak,
-    DISPID_SVSpeakStream,
-    DISPID_SVPause,
-    DISPID_SVResume,
-    DISPID_SVSkip,
-    DISPID_SVGetVoices,
-    DISPID_SVGetAudioOutputs,
-    DISPID_SVWaitUntilDone,
-    DISPID_SVSpeakCompleteEvent,
-    DISPID_SVIsUISupported,
-    DISPID_SVDisplayUI,
-}}
-ENUM!{enum SpeechVoicePriority {
-    SVPNormal = SPVPRI_NORMAL.0,
-    SVPAlert = SPVPRI_ALERT.0,
-    SVPOver = SPVPRI_OVER.0,
-}}
-FLAGS!{enum SpeechVoiceSpeakFlags {
-    SVSFDefault = SPF_DEFAULT.0,
-    SVSFlagsAsync = SPF_ASYNC.0,
-    SVSFPurgeBeforeSpeak = SPF_PURGEBEFORESPEAK.0,
-    SVSFIsFilename = SPF_IS_FILENAME.0,
-    SVSFIsXML = SPF_IS_XML.0,
-    SVSFIsNotXML = SPF_IS_NOT_XML.0,
-    SVSFPersistXML = SPF_PERSIST_XML.0,
-    SVSFNLPSpeakPunc = SPF_NLP_SPEAK_PUNC.0,
-    SVSFParseSapi = SPF_PARSE_SAPI.0,
-    SVSFParseSsml = SPF_PARSE_SSML.0,
-    SVSFParseMask = SPF_PARSE_MASK as u32,
-    SVSFVoiceMask = SPF_VOICE_MASK as u32,
-    SVSFUnusedFlags = SPF_UNUSED_FLAGS as u32,
-}}
-pub const SVSFParseAutodetect: SpeechVoiceSpeakFlags = SVSFDefault;
-pub const SVSFNLPMask: SpeechVoiceSpeakFlags = SVSFNLPSpeakPunc;
-FLAGS!{enum SpeechVoiceEvents {
-    SVEStartInputStream = 1 << 1,
-    SVEEndInputStream = 1 << 2,
-    SVEVoiceChange = 1 << 3,
-    SVEBookmark = 1 << 4,
-    SVEWordBoundary = 1 << 5,
-    SVEPhoneme = 1 << 6,
-    SVESentenceBoundary = 1 << 7,
-    SVEViseme = 1 << 8,
-    SVEAudioLevel = 1 << 9,
-    SVEPrivate = 1 << 15,
-    SVEAllEvents = 0x83fe,
-}}
-ENUM!{enum DISPID_SpeechVoiceStatus {
-    DISPID_SVSCurrentStreamNumber = 1,
-    DISPID_SVSLastStreamNumberQueued,
-    DISPID_SVSLastResult,
-    DISPID_SVSRunningState,
-    DISPID_SVSInputWordPosition,
-    DISPID_SVSInputWordLength,
-    DISPID_SVSInputSentencePosition,
-    DISPID_SVSInputSentenceLength,
-    DISPID_SVSLastBookmark,
-    DISPID_SVSLastBookmarkId,
-    DISPID_SVSPhonemeId,
-    DISPID_SVSVisemeId,
-}}
-ENUM!{enum SpeechRunState {
-    SRSEDone = SPRS_DONE.0,
-    SRSEIsSpeaking = SPRS_IS_SPEAKING.0,
-}}
-ENUM!{enum SpeechVisemeType {
-    SVP_0 = 0,
-    SVP_1,
-    SVP_2,
-    SVP_3,
-    SVP_4,
-    SVP_5,
-    SVP_6,
-    SVP_7,
-    SVP_8,
-    SVP_9,
-    SVP_10,
-    SVP_11,
-    SVP_12,
-    SVP_13,
-    SVP_14,
-    SVP_15,
-    SVP_16,
-    SVP_17,
-    SVP_18,
-    SVP_19,
-    SVP_20,
-    SVP_21,
-}}
-ENUM!{enum SpeechVisemeFeature {
-    SVF_None = 0,
-    SVF_Stressed = SPVFEATURE_STRESSED.0,
-    SVF_Emphasis = SPVFEATURE_EMPHASIS.0,
-}}
-ENUM!{enum DISPID_SpeechVoiceEvent {
-    DISPID_SVEStreamStart = 1,
-    DISPID_SVEStreamEnd,
-    DISPID_SVEVoiceChange,
-    DISPID_SVEBookmark,
-    DISPID_SVEWord,
-    DISPID_SVEPhoneme,
-    DISPID_SVESentenceBoundary,
-    DISPID_SVEViseme,
-    DISPID_SVEAudioLevel,
-    DISPID_SVEEnginePrivate,
-}}
-ENUM!{enum DISPID_SpeechRecognizer {
-    DISPID_SRRecognizer = 1,
-    DISPID_SRAllowAudioInputFormatChangesOnNextSet,
-    DISPID_SRAudioInput,
-    DISPID_SRAudioInputStream,
-    DISPID_SRIsShared,
-    DISPID_SRState,
-    DISPID_SRStatus,
-    DISPID_SRProfile,
-    DISPID_SREmulateRecognition,
-    DISPID_SRCreateRecoContext,
-    DISPID_SRGetFormat,
-    DISPID_SRSetPropertyNumber,
-    DISPID_SRGetPropertyNumber,
-    DISPID_SRSetPropertyString,
-    DISPID_SRGetPropertyString,
-    DISPID_SRIsUISupported,
-    DISPID_SRDisplayUI,
-    DISPID_SRGetRecognizers,
-    DISPID_SVGetAudioInputs,
-    DISPID_SVGetProfiles,
-}}
-ENUM!{enum SpeechRecognizerState {
-    SRSInactive = SPRST_INACTIVE.0,
-    SRSActive = SPRST_ACTIVE.0,
-    SRSActiveAlways = SPRST_ACTIVE_ALWAYS.0,
-    SRSInactiveWithPurge = SPRST_INACTIVE_WITH_PURGE.0,
-}}
-ENUM!{enum SpeechDisplayAttributes {
-    SDA_No_Trailing_Space = 0,
-    SDA_One_Trailing_Space = SPAF_ONE_TRAILING_SPACE.0,
-    SDA_Two_Trailing_Spaces = SPAF_TWO_TRAILING_SPACES.0,
-    SDA_Consume_Leading_Spaces = SPAF_CONSUME_LEADING_SPACES.0,
-}}
-ENUM!{enum SpeechFormatType {
-    SFTInput = SPWF_INPUT.0,
-    SFTSREngine = SPWF_SRENGINE.0,
-}}
-FLAGS!{enum SpeechEmulationCompareFlags {
-    SECFIgnoreCase = 0x1,
-    SECFIgnoreKanaType = 0x10000,
-    SECFIgnoreWidth = 0x20000,
-    SECFNoSpecialChars = 0x20000000,
-    SECFEmulateResult = 0x40000000,
-    SECFDefault = SECFIgnoreCase.0 | SECFIgnoreKanaType.0 | SECFIgnoreWidth.0,
-}}
-ENUM!{enum DISPID_SpeechRecognizerStatus {
-    DISPID_SRSAudioStatus = 1,
-    DISPID_SRSCurrentStreamPosition,
-    DISPID_SRSCurrentStreamNumber,
-    DISPID_SRSNumberOfActiveRules,
-    DISPID_SRSClsidEngine,
-    DISPID_SRSSupportedLanguages,
-}}
-ENUM!{enum DISPID_SpeechRecoContext {
-    DISPID_SRCRecognizer = 1,
-    DISPID_SRCAudioInInterferenceStatus,
-    DISPID_SRCRequestedUIType,
-    DISPID_SRCVoice,
-    DISPID_SRAllowVoiceFormatMatchingOnNextSet,
-    DISPID_SRCVoicePurgeEvent,
-    DISPID_SRCEventInterests,
-    DISPID_SRCCmdMaxAlternates,
-    DISPID_SRCState,
-    DISPID_SRCRetainedAudio,
-    DISPID_SRCRetainedAudioFormat,
-    DISPID_SRCPause,
-    DISPID_SRCResume,
-    DISPID_SRCCreateGrammar,
-    DISPID_SRCCreateResultFromMemory,
-    DISPID_SRCBookmark,
-    DISPID_SRCSetAdaptationData,
-}}
-ENUM!{enum SpeechRetainedAudioOptions {
-    SRAONone = SPAO_NONE.0,
-    SRAORetainAudio = SPAO_RETAIN_AUDIO.0,
-}}
-ENUM!{enum SpeechBookmarkOptions {
-    SBONone = SPBO_NONE.0,
-    SBOPause = SPBO_PAUSE.0,
-}}
-ENUM!{enum SpeechInterference {
-    SINone = SPINTERFERENCE_NONE.0,
-    SINoise = SPINTERFERENCE_NOISE.0,
-    SINoSignal = SPINTERFERENCE_NOSIGNAL.0,
-    SITooLoud = SPINTERFERENCE_TOOLOUD.0,
-    SITooQuiet = SPINTERFERENCE_TOOQUIET.0,
-    SITooFast = SPINTERFERENCE_TOOFAST.0,
-    SITooSlow = SPINTERFERENCE_TOOSLOW.0,
-}}
-FLAGS!{enum SpeechRecoEvents {
-    SREStreamEnd = 1 << 0,
-    SRESoundStart = 1 << 1,
-    SRESoundEnd = 1 << 2,
-    SREPhraseStart = 1 << 3,
-    SRERecognition = 1 << 4,
-    SREHypothesis = 1 << 5,
-    SREBookmark = 1 << 6,
-    SREPropertyNumChange = 1 << 7,
-    SREPropertyStringChange = 1 << 8,
-    SREFalseRecognition = 1 << 9,
-    SREInterference = 1 << 10,
-    SRERequestUI = 1 << 11,
-    SREStateChange = 1 << 12,
-    SREAdaptation = 1 << 13,
-    SREStreamStart = 1 << 14,
-    SRERecoOtherContext = 1 << 15,
-    SREAudioLevel = 1 << 16,
-    SREPrivate = 1 << 18,
-    SREAllEvents = 0x5ffff,
-}}
-ENUM!{enum SpeechRecoContextState {
-    SRCS_Disabled = SPCS_DISABLED.0,
-    SRCS_Enabled = SPCS_ENABLED.0,
-}}
-ENUM!{enum DISPIDSPRG {
-    DISPID_SRGId = 1,
-    DISPID_SRGRecoContext,
-    DISPID_SRGState,
-    DISPID_SRGRules,
-    DISPID_SRGReset,
-    DISPID_SRGCommit,
-    DISPID_SRGCmdLoadFromFile,
-    DISPID_SRGCmdLoadFromObject,
-    DISPID_SRGCmdLoadFromResource,
-    DISPID_SRGCmdLoadFromMemory,
-    DISPID_SRGCmdLoadFromProprietaryGrammar,
-    DISPID_SRGCmdSetRuleState,
-    DISPID_SRGCmdSetRuleIdState,
-    DISPID_SRGDictationLoad,
-    DISPID_SRGDictationUnload,
-    DISPID_SRGDictationSetState,
-    DISPID_SRGSetWordSequenceData,
-    DISPID_SRGSetTextSelection,
-    DISPID_SRGIsPronounceable,
-}}
-ENUM!{enum SpeechLoadOption {
-    SLOStatic = SPLO_STATIC.0,
-    SLODynamic = SPLO_DYNAMIC.0,
-}}
-ENUM!{enum SpeechWordPronounceable {
-    SWPUnknownWordUnpronounceable = SPWP_UNKNOWN_WORD_UNPRONOUNCEABLE.0,
-    SWPUnknownWordPronounceable = SPWP_UNKNOWN_WORD_PRONOUNCEABLE.0,
-    SWPKnownWordPronounceable = SPWP_KNOWN_WORD_PRONOUNCEABLE.0,
-}}
-ENUM!{enum SpeechGrammarState {
-    SGSEnabled = SPGS_ENABLED.0,
-    SGSDisabled = SPGS_DISABLED.0,
-    SGSExclusive = SPGS_EXCLUSIVE.0,
-}}
-ENUM!{enum SpeechRuleState {
-    SGDSInactive = SPRS_INACTIVE.0,
-    SGDSActive = SPRS_ACTIVE.0,
-    SGDSActiveWithAutoPause = SPRS_ACTIVE_WITH_AUTO_PAUSE.0,
-    SGDSActiveUserDelimited = SPRS_ACTIVE_USER_DELIMITED.0,
-}}
-ENUM!{enum SpeechRuleAttributes {
-    SRATopLevel = SPRAF_TopLevel.0,
-    SRADefaultToActive = SPRAF_Active.0,
-    SRAExport = SPRAF_Export.0,
-    SRAImport = SPRAF_Import.0,
-    SRAInterpreter = SPRAF_Interpreter.0,
-    SRADynamic = SPRAF_Dynamic.0,
-    SRARoot = SPRAF_Root.0,
-}}
-ENUM!{enum SpeechGrammarWordType {
-    SGDisplay = SPWT_DISPLAY.0,
-    SGLexical = SPWT_LEXICAL.0,
-    SGPronounciation = SPWT_PRONUNCIATION.0,
-    SGLexicalNoSpecialChars = SPWT_LEXICAL_NO_SPECIAL_CHARS.0,
-}}
-ENUM!{enum DISPID_SpeechRecoContextEvents {
-    DISPID_SRCEStartStream = 1,
-    DISPID_SRCEEndStream,
-    DISPID_SRCEBookmark,
-    DISPID_SRCESoundStart,
-    DISPID_SRCESoundEnd,
-    DISPID_SRCEPhraseStart,
-    DISPID_SRCERecognition,
-    DISPID_SRCEHypothesis,
-    DISPID_SRCEPropertyNumberChange,
-    DISPID_SRCEPropertyStringChange,
-    DISPID_SRCEFalseRecognition,
-    DISPID_SRCEInterference,
-    DISPID_SRCERequestUI,
-    DISPID_SRCERecognizerStateChange,
-    DISPID_SRCEAdaptation,
-    DISPID_SRCERecognitionForOtherContext,
-    DISPID_SRCEAudioLevel,
-    DISPID_SRCEEnginePrivate,
-}}
-ENUM!{enum SpeechRecognitionType {
-    SRTStandard = 0,
-    SRTAutopause = SPREF_AutoPause.0,
-    SRTEmulated = SPREF_Emulated.0,
-    SRTSMLTimeout = SPREF_SMLTimeout.0,
-    SRTExtendableParse = SPREF_ExtendableParse.0,
-    SRTReSent = SPREF_ReSent.0,
-}}
-ENUM!{enum DISPID_SpeechGrammarRule {
-    DISPID_SGRAttributes = 1,
-    DISPID_SGRInitialState,
-    DISPID_SGRName,
-    DISPID_SGRId,
-    DISPID_SGRClear,
-    DISPID_SGRAddResource,
-    DISPID_SGRAddState,
-}}
-ENUM!{enum DISPID_SpeechGrammarRules {
-    DISPID_SGRsCount = 1,
-    DISPID_SGRsDynamic,
-    DISPID_SGRsAdd,
-    DISPID_SGRsCommit,
-    DISPID_SGRsCommitAndSave,
-    DISPID_SGRsFindRule,
-    DISPID_SGRsItem = ::DISPID_VALUE as u32,
-    DISPID_SGRs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechGrammarRuleState {
-    DISPID_SGRSRule = 1,
-    DISPID_SGRSTransitions,
-    DISPID_SGRSAddWordTransition,
-    DISPID_SGRSAddRuleTransition,
-    DISPID_SGRSAddSpecialTransition,
-}}
-ENUM!{enum SpeechSpecialTransitionType {
-    SSTTWildcard = 1,
-    SSTTDictation,
-    SSTTTextBuffer,
-}}
-ENUM!{enum DISPID_SpeechGrammarRuleStateTransitions {
-    DISPID_SGRSTsCount = 1,
-    DISPID_SGRSTsItem = ::DISPID_VALUE as u32,
-    DISPID_SGRSTs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechGrammarRuleStateTransition {
-    DISPID_SGRSTType = 1,
-    DISPID_SGRSTText,
-    DISPID_SGRSTRule,
-    DISPID_SGRSTWeight,
-    DISPID_SGRSTPropertyName,
-    DISPID_SGRSTPropertyId,
-    DISPID_SGRSTPropertyValue,
-    DISPID_SGRSTNextState,
-}}
-ENUM!{enum SpeechGrammarRuleStateTransitionType {
-    SGRSTTEpsilon = 0,
-    SGRSTTWord,
-    SGRSTTRule,
-    SGRSTTDictation,
-    SGRSTTWildcard,
-    SGRSTTTextBuffer,
-}}
-ENUM!{enum DISPIDSPTSI {
-    DISPIDSPTSI_ActiveOffset = 1,
-    DISPIDSPTSI_ActiveLength,
-    DISPIDSPTSI_SelectionOffset,
-    DISPIDSPTSI_SelectionLength,
-}}
-ENUM!{enum DISPID_SpeechRecoResult {
-    DISPID_SRRRecoContext = 1,
-    DISPID_SRRTimes,
-    DISPID_SRRAudioFormat,
-    DISPID_SRRPhraseInfo,
-    DISPID_SRRAlternates,
-    DISPID_SRRAudio,
-    DISPID_SRRSpeakAudio,
-    DISPID_SRRSaveToMemory,
-    DISPID_SRRDiscardResultInfo,
-}}
-ENUM!{enum SpeechDiscardType {
-    SDTProperty = SPDF_PROPERTY.0,
-    SDTReplacement = SPDF_REPLACEMENT.0,
-    SDTRule = SPDF_RULE.0,
-    SDTDisplayText = SPDF_DISPLAYTEXT.0,
-    SDTLexicalForm = SPDF_LEXICALFORM.0,
-    SDTPronunciation = SPDF_PRONUNCIATION.0,
-    SDTAudio = SPDF_AUDIO.0,
-    SDTAlternates = SPDF_ALTERNATES.0,
-    SDTAll = SPDF_ALL.0,
-}}
-ENUM!{enum DISPID_SpeechXMLRecoResult {
-    DISPID_SRRGetXMLResult,
-    DISPID_SRRGetXMLErrorInfo,
-}}
-ENUM!{enum DISPID_SpeechRecoResult2 {
-    DISPID_SRRSetTextFeedback,
-}}
-ENUM!{enum DISPID_SpeechPhraseBuilder {
-    DISPID_SPPBRestorePhraseFromMemory = 1,
-}}
-ENUM!{enum DISPID_SpeechRecoResultTimes {
-    DISPID_SRRTStreamTime = 1,
-    DISPID_SRRTLength,
-    DISPID_SRRTTickCount,
-    DISPID_SRRTOffsetFromStart,
-}}
-ENUM!{enum DISPID_SpeechPhraseAlternate {
-    DISPID_SPARecoResult = 1,
-    DISPID_SPAStartElementInResult,
-    DISPID_SPANumberOfElementsInResult,
-    DISPID_SPAPhraseInfo,
-    DISPID_SPACommit,
-}}
-ENUM!{enum DISPID_SpeechPhraseAlternates {
-    DISPID_SPAsCount = 1,
-    DISPID_SPAsItem = ::DISPID_VALUE as u32,
-    DISPID_SPAs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechPhraseInfo {
-    DISPID_SPILanguageId = 1,
-    DISPID_SPIGrammarId,
-    DISPID_SPIStartTime,
-    DISPID_SPIAudioStreamPosition,
-    DISPID_SPIAudioSizeBytes,
-    DISPID_SPIRetainedSizeBytes,
-    DISPID_SPIAudioSizeTime,
-    DISPID_SPIRule,
-    DISPID_SPIProperties,
-    DISPID_SPIElements,
-    DISPID_SPIReplacements,
-    DISPID_SPIEngineId,
-    DISPID_SPIEnginePrivateData,
-    DISPID_SPISaveToMemory,
-    DISPID_SPIGetText,
-    DISPID_SPIGetDisplayAttributes,
-}}
-ENUM!{enum DISPID_SpeechPhraseElement {
-    DISPID_SPEAudioTimeOffset = 1,
-    DISPID_SPEAudioSizeTime,
-    DISPID_SPEAudioStreamOffset,
-    DISPID_SPEAudioSizeBytes,
-    DISPID_SPERetainedStreamOffset,
-    DISPID_SPERetainedSizeBytes,
-    DISPID_SPEDisplayText,
-    DISPID_SPELexicalForm,
-    DISPID_SPEPronunciation,
-    DISPID_SPEDisplayAttributes,
-    DISPID_SPERequiredConfidence,
-    DISPID_SPEActualConfidence,
-    DISPID_SPEEngineConfidence,
-}}
-ENUM!{enum SpeechEngineConfidence {
-    SECLowConfidence = -1i32 as u32,
-    SECNormalConfidence = 0,
-    SECHighConfidence = 1,
-}}
-ENUM!{enum DISPID_SpeechPhraseElements {
-    DISPID_SPEsCount = 1,
-    DISPID_SPEsItem = ::DISPID_VALUE as u32,
-    DISPID_SPEs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechPhraseReplacement {
-    DISPID_SPRDisplayAttributes = 1,
-    DISPID_SPRText,
-    DISPID_SPRFirstElement,
-    DISPID_SPRNumberOfElements,
-}}
-ENUM!{enum DISPID_SpeechPhraseReplacements {
-    DISPID_SPRsCount = 1,
-    DISPID_SPRsItem = ::DISPID_VALUE as u32,
-    DISPID_SPRs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechPhraseProperty {
-    DISPID_SPPName = 1,
-    DISPID_SPPId,
-    DISPID_SPPValue,
-    DISPID_SPPFirstElement,
-    DISPID_SPPNumberOfElements,
-    DISPID_SPPEngineConfidence,
-    DISPID_SPPConfidence,
-    DISPID_SPPParent,
-    DISPID_SPPChildren,
-}}
-ENUM!{enum DISPID_SpeechPhraseProperties {
-    DISPID_SPPsCount = 1,
-    DISPID_SPPsItem = ::DISPID_VALUE as u32,
-    DISPID_SPPs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechPhraseRule {
-    DISPID_SPRuleName = 1,
-    DISPID_SPRuleId,
-    DISPID_SPRuleFirstElement,
-    DISPID_SPRuleNumberOfElements,
-    DISPID_SPRuleParent,
-    DISPID_SPRuleChildren,
-    DISPID_SPRuleConfidence,
-    DISPID_SPRuleEngineConfidence,
-}}
-ENUM!{enum DISPID_SpeechPhraseRules {
-    DISPID_SPRulesCount = 1,
-    DISPID_SPRulesItem = ::DISPID_VALUE as u32,
-    DISPID_SPRules_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechLexicon {
-    DISPID_SLGenerationId = 1,
-    DISPID_SLGetWords,
-    DISPID_SLAddPronunciation,
-    DISPID_SLAddPronunciationByPhoneIds,
-    DISPID_SLRemovePronunciation,
-    DISPID_SLRemovePronunciationByPhoneIds,
-    DISPID_SLGetPronunciations,
-    DISPID_SLGetGenerationChange,
-}}
-ENUM!{enum SpeechLexiconType {
-    SLTUser = eLEXTYPE_USER.0,
-    SLTApp = eLEXTYPE_APP.0,
-}}
-ENUM!{enum SpeechPartOfSpeech {
-    SPSNotOverriden = SPPS_NotOverriden.0,
-    SPSUnknown = SPPS_Unknown.0,
-    SPSNoun = SPPS_Noun.0,
-    SPSVerb = SPPS_Verb.0,
-    SPSModifier = SPPS_Modifier.0,
-    SPSFunction = SPPS_Function.0,
-    SPSInterjection = SPPS_Interjection.0,
-    SPSLMA = SPPS_LMA.0,
-    SPSSuppressWord = SPPS_SuppressWord.0,
-}}
-ENUM!{enum DISPID_SpeechLexiconWords {
-    DISPID_SLWsCount = 1,
-    DISPID_SLWsItem = ::DISPID_VALUE as u32,
-    DISPID_SLWs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum SpeechWordType {
-    SWTAdded = eWORDTYPE_ADDED.0,
-    SWTDeleted = eWORDTYPE_DELETED.0,
-}}
-ENUM!{enum DISPID_SpeechLexiconWord {
-    DISPID_SLWLangId = 1,
-    DISPID_SLWType,
-    DISPID_SLWWord,
-    DISPID_SLWPronunciations,
-}}
-ENUM!{enum DISPID_SpeechLexiconProns {
-    DISPID_SLPsCount = 1,
-    DISPID_SLPsItem = ::DISPID_VALUE as u32,
-    DISPID_SLPs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechLexiconPronunciation {
-    DISPID_SLPType = 1,
-    DISPID_SLPLangId,
-    DISPID_SLPPartOfSpeech,
-    DISPID_SLPPhoneIds,
-    DISPID_SLPSymbolic,
-}}
-ENUM!{enum DISPID_SpeechPhoneConverter {
-    DISPID_SPCLangId = 1,
-    DISPID_SPCPhoneToId,
-    DISPID_SPCIdToPhone,
-}}
-RIDL!(
-interface ISpeechDataKey(ISpeechDataKeyVtbl): IDispatch(IDispatchVtbl) {
-    fn SetBinaryValue(&mut self, ValueName: ::BSTR, Value: ::VARIANT) -> ::HRESULT,
-    fn GetBinaryValue(&mut self, ValueName: ::BSTR, Value: *mut ::VARIANT) -> ::HRESULT,
-    fn SetStringValue(&mut self, ValueName: ::BSTR, Value: ::BSTR) -> ::HRESULT,
-    fn GetStringValue(&mut self, ValueName: ::BSTR, Value: *mut ::BSTR) -> ::HRESULT,
-    fn SetLongValue(&mut self, ValueName: ::BSTR, Value: ::c_long) -> ::HRESULT,
-    fn GetLongValue(&mut self, ValueName: ::BSTR, Value: *mut ::c_long) -> ::HRESULT,
-    fn OpenKey(&mut self, SubKeyName: ::BSTR, SubKey: *mut *mut ISpeechDataKey) -> ::HRESULT,
-    fn CreateKey(&mut self, SubKeyName: ::BSTR, SubKey: *mut *mut ISpeechDataKey) -> ::HRESULT,
-    fn DeleteKey(&mut self, SubKeyName: ::BSTR) -> ::HRESULT,
-    fn DeleteValue(&mut self, ValueName: ::BSTR) -> ::HRESULT,
-    fn EnumKeys(&mut self, Index: ::c_long, SubKeyName: *mut ::BSTR) -> ::HRESULT,
-    fn EnumValues(&mut self, Index: ::c_long, ValueName: *mut ::BSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechObjectToken(ISpeechObjectTokenVtbl): IDispatch(IDispatchVtbl) {
-    fn get_Id(&mut self, ObjectId: *mut ::BSTR) -> ::HRESULT,
-    fn get_DataKey(&mut self, DataKey: *mut *mut ISpeechDataKey) -> ::HRESULT,
-    fn get_Category(&mut self, Category: *mut *mut ISpeechObjectTokenCategory) -> ::HRESULT,
-    fn GetDescription(&mut self, Locale: ::c_long, Description: *mut ::BSTR) -> ::HRESULT,
-    fn SetId(
-        &mut self, Id: ::BSTR, CategoryId: ::BSTR, CreateIfNotExist: ::VARIANT_BOOL
-    ) -> ::HRESULT,
-    fn GetAttribute(&mut self, AttributeName: ::BSTR, AttributeValue: *mut ::BSTR) -> ::HRESULT,
-    fn CreateInstance(
-        &mut self, pUnkOuter: *mut ::IUnknown, ClsContext: SpeechTokenContext,
-        Object: *mut *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn Remove(&mut self, ObjectStorageCLSID: ::BSTR) -> ::HRESULT,
-    fn GetStorageFileName(
-        &mut self, ObjectStorageCLSID: ::BSTR, KeyName: ::BSTR, FileName: ::BSTR, Folder: ::BSTR,
-        FilePath: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn RemoveStorageFileName(
-        &mut self, ObjectStorageCLSID: ::BSTR, KeyName: ::BSTR, DeleteFile: ::VARIANT_BOOL
-    ) -> ::HRESULT,
-    fn IsUISupported(
-        &mut self, TypeOfUI: ::BSTR, ExtraData: *const ::VARIANT, Object: *mut ::IUnknown,
-        Supported: *mut ::VARIANT_BOOL
-    ) -> ::HRESULT,
-    fn DisplayUI(
-        &mut self, hWnd: ::c_long, Title: ::BSTR, TypeOfUI: ::BSTR, ExtraData: *const ::VARIANT,
-        Object: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn MatchesAttributes(&mut self, Attributes: ::BSTR, Matches: *mut ::VARIANT_BOOL) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechObjectTokens(ISpeechObjectTokensVtbl): IDispatch(IDispatchVtbl) {
-    fn get_Count(&mut self, Count: *mut ::c_long) -> ::HRESULT,
-    fn Item(&mut self, Index: ::c_long, Token: *mut *mut ISpeechObjectToken) -> ::HRESULT,
-    fn get__NewEnum(&mut self, ppEnumVARIANT: *mut *mut ::IUnknown) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechObjectTokenCategory(ISpeechObjectTokenCategoryVtbl): IDispatch(IDispatchVtbl) {
-    fn get_Id(&mut self, Id: *mut ::BSTR) -> ::HRESULT,
-    fn put_Default(&mut self, TokenId: ::BSTR) -> ::HRESULT,
-    fn get_Default(&mut self, TokenId: *mut ::BSTR) -> ::HRESULT,
-    fn SetId(&mut self, Id: ::BSTR, CreateIfNotExist: ::VARIANT_BOOL) -> ::HRESULT,
-    fn GetDataKey(
-        &mut self, Location: SpeechDataKeyLocation, DataKey: *mut *mut ISpeechDataKey
-    ) -> ::HRESULT,
-    fn EnumerateTokens(
-        &mut self, RequiredAttributes: ::BSTR, OptionalAttributes: ::BSTR,
-        Tokens: *mut *mut ISpeechObjectTokens
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechAudioBufferInfo(ISpeechAudioBufferInfoVtbl): IDispatch(IDispatchVtbl) {
-    fn get_MinNotification(&mut self, MinNotification: *mut ::c_long) -> ::HRESULT,
-    fn put_MinNotification(&mut self, MinNotification: ::c_long) -> ::HRESULT,
-    fn get_BufferSize(&mut self, BufferSize: *mut ::c_long) -> ::HRESULT,
-    fn put_BufferSize(&mut self, BufferSize: ::c_long) -> ::HRESULT,
-    fn get_EventBias(&mut self, EventBias: *mut ::c_long) -> ::HRESULT,
-    fn put_EventBias(&mut self, EventBias: ::c_long) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechAudioStatus(ISpeechAudioStatusVtbl): IDispatch(IDispatchVtbl) {
-    fn get_FreeBufferSpace(&mut self, FreeBufferSpace: *mut ::c_long) -> ::HRESULT,
-    fn get_NonBlockingIO(&mut self, NonBlockingIO: *mut ::c_long) -> ::HRESULT,
-    fn get_State(&mut self, State: *mut SpeechAudioState) -> ::HRESULT,
-    fn get_CurrentSeekPosition(&mut self, CurrentSeekPosition: *mut ::VARIANT) -> ::HRESULT,
-    fn get_CurrentDevicePosition(&mut self, CurrentDevicePosition: *mut ::VARIANT) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechAudioFormat(ISpeechAudioFormatVtbl): IDispatch(IDispatchVtbl) {
-    fn get_Type(&mut self, AudioFormat: *mut SpeechAudioFormatType) -> ::HRESULT,
-    fn put_Type(&mut self, AudioFormat: SpeechAudioFormatType) -> ::HRESULT,
-    fn get_Guid(&mut self, Guid: *mut ::BSTR) -> ::HRESULT,
-    fn put_Guid(&mut self, Guid: ::BSTR) -> ::HRESULT,
-    fn GetWaveFormatEx(&mut self, SpeechWaveFormatEx: *mut *mut ISpeechWaveFormatEx) -> ::HRESULT,
-    fn SetWaveFormatEx(&mut self, SpeechWaveFormatEx: *mut ISpeechWaveFormatEx) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechWaveFormatEx(ISpeechWaveFormatExVtbl): IDispatch(IDispatchVtbl) {
-    fn get_FormatTag(&mut self, FormatTag: *mut ::c_short) -> ::HRESULT,
-    fn put_FormatTag(&mut self, FormatTag: ::c_short) -> ::HRESULT,
-    fn get_Channels(&mut self, Channels: *mut ::c_short) -> ::HRESULT,
-    fn put_Channels(&mut self, Channels: ::c_short) -> ::HRESULT,
-    fn get_SamplesPerSec(&mut self, SamplesPerSec: *mut ::c_long) -> ::HRESULT,
-    fn put_SamplesPerSec(&mut self, SamplesPerSec: ::c_long) -> ::HRESULT,
-    fn get_AvgBytesPerSec(&mut self, AvgBytesPerSec: *mut ::c_long) -> ::HRESULT,
-    fn put_AvgBytesPerSec(&mut self, AvgBytesPerSec: ::c_long) -> ::HRESULT,
-    fn get_BlockAlign(&mut self, BlockAlign: *mut ::c_short) -> ::HRESULT,
-    fn put_BlockAlign(&mut self, BlockAlign: ::c_short) -> ::HRESULT,
-    fn get_BitsPerSample(&mut self, BitsPerSample: *mut ::c_short) -> ::HRESULT,
-    fn put_BitsPerSample(&mut self, BitsPerSample: ::c_short) -> ::HRESULT,
-    fn get_ExtraData(&mut self, ExtraData: *mut ::VARIANT) -> ::HRESULT,
-    fn put_ExtraData(&mut self, ExtraData: ::VARIANT) -> ::HRESULT
-}
-);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/schannel.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/schannel.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/schannel.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/schannel.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,333 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Public Definitions for SCHANNEL Security Provider
-pub const UNISP_NAME: &'static str = "Microsoft Unified Security Protocol Provider";
-pub const SSL2SP_NAME: &'static str = "Microsoft SSL 2.0";
-pub const SSL3SP_NAME: &'static str = "Microsoft SSL 3.0";
-pub const TLS1SP_NAME: &'static str = "Microsoft TLS 1.0";
-pub const PCT1SP_NAME: &'static str = "Microsoft PCT 1.0";
-pub const SCHANNEL_NAME: &'static str = "Schannel";
-ENUM!{enum eTlsSignatureAlgorithm {
-    TlsSignatureAlgorithm_Anonymous = 0,
-    TlsSignatureAlgorithm_Rsa = 1,
-    TlsSignatureAlgorithm_Dsa = 2,
-    TlsSignatureAlgorithm_Ecdsa = 3,
-}}
-ENUM!{enum eTlsHashAlgorithm {
-    TlsHashAlgorithm_None = 0,
-    TlsHashAlgorithm_Md5 = 1,
-    TlsHashAlgorithm_Sha1 = 2,
-    TlsHashAlgorithm_Sha224 = 3,
-    TlsHashAlgorithm_Sha256 = 4,
-    TlsHashAlgorithm_Sha384 = 5,
-    TlsHashAlgorithm_Sha512 = 6,
-}}
-pub const UNISP_RPC_ID: ::DWORD = 14;
-STRUCT!{struct SecPkgContext_RemoteCredentialInfo {
-    cbCertificateChain: ::DWORD,
-    pbCertificateChain: ::PBYTE,
-    cCertificates: ::DWORD,
-    fFlags: ::DWORD,
-    dwBits: ::DWORD,
-}}
-pub type PSecPkgContext_RemoteCredentialInfo = *mut SecPkgContext_RemoteCredentialInfo;
-pub type SecPkgContext_RemoteCredenitalInfo = SecPkgContext_RemoteCredentialInfo;
-pub type PSecPkgContext_RemoteCredenitalInfo = *mut SecPkgContext_RemoteCredentialInfo;
-pub const RCRED_STATUS_NOCRED: ::DWORD = 0x00000000;
-pub const RCRED_CRED_EXISTS: ::DWORD = 0x00000001;
-pub const RCRED_STATUS_UNKNOWN_ISSUER: ::DWORD = 0x00000002;
-STRUCT!{struct SecPkgContext_LocalCredentialInfo {
-    cbCertificateChain: ::DWORD,
-    pbCertificateChain: ::PBYTE,
-    cCertificates: ::DWORD,
-    fFlags: ::DWORD,
-    dwBits: ::DWORD,
-}}
-pub type PSecPkgContext_LocalCredentialInfo = *mut SecPkgContext_LocalCredentialInfo;
-pub type SecPkgContext_LocalCredenitalInfo = SecPkgContext_LocalCredentialInfo;
-pub type PSecPkgContext_LocalCredenitalInfo = *mut SecPkgContext_LocalCredentialInfo;
-pub const LCRED_STATUS_NOCRED: ::DWORD = 0x00000000;
-pub const LCRED_CRED_EXISTS: ::DWORD = 0x00000001;
-pub const LCRED_STATUS_UNKNOWN_ISSUER: ::DWORD = 0x00000002;
-STRUCT!{struct SecPkgContext_ClientCertPolicyResult {
-    dwPolicyResult: ::HRESULT,
-    guidPolicyId: ::GUID,
-}}
-pub type PSecPkgContext_ClientCertPolicyResult = *mut SecPkgContext_ClientCertPolicyResult;
-STRUCT!{struct SecPkgContext_IssuerListInfoEx {
-    aIssuers: ::PCERT_NAME_BLOB,
-    cIssuers: ::DWORD,
-}}
-pub type PSecPkgContext_IssuerListInfoEx = *mut SecPkgContext_IssuerListInfoEx;
-STRUCT!{struct SecPkgContext_ConnectionInfo {
-    dwProtocol: ::DWORD,
-    aiCipher: ::ALG_ID,
-    dwCipherStrength: ::DWORD,
-    aiHash: ::ALG_ID,
-    dwHashStrength: ::DWORD,
-    aiExch: ::ALG_ID,
-    dwExchStrength: ::DWORD,
-}}
-pub type PSecPkgContext_ConnectionInfo = *mut SecPkgContext_ConnectionInfo;
-pub const SZ_ALG_MAX_SIZE: usize = 64;
-pub const SECPKGCONTEXT_CIPHERINFO_V1: ::DWORD = 1;
-STRUCT!{nodebug struct SecPkgContext_CipherInfo {
-    dwVersion: ::DWORD,
-    dwProtocol: ::DWORD,
-    dwCipherSuite: ::DWORD,
-    dwBaseCipherSuite: ::DWORD,
-    szCipherSuite: [::WCHAR; SZ_ALG_MAX_SIZE],
-    szCipher: [::WCHAR; SZ_ALG_MAX_SIZE],
-    dwCipherLen: ::DWORD,
-    dwCipherBlockLen: ::DWORD,
-    szHash: [::WCHAR; SZ_ALG_MAX_SIZE],
-    dwHashLen: ::DWORD,
-    szExchange: [::WCHAR; SZ_ALG_MAX_SIZE],
-    dwMinExchangeLen: ::DWORD,
-    dwMaxExchangeLen: ::DWORD,
-    szCertificate: [::WCHAR; SZ_ALG_MAX_SIZE],
-    dwKeyType: ::DWORD,
-}}
-pub type PSecPkgContext_CipherInfo = *mut SecPkgContext_CipherInfo;
-STRUCT!{nodebug struct SecPkgContext_EapKeyBlock {
-    rgbKeys: [::BYTE; 128],
-    rgbIVs: [::BYTE; 64],
-}}
-pub type PSecPkgContext_EapKeyBlock = *mut SecPkgContext_EapKeyBlock;
-STRUCT!{struct SecPkgContext_MappedCredAttr {
-    dwAttribute: ::DWORD,
-    pvBuffer: ::PVOID,
-}}
-pub type PSecPkgContext_MappedCredAttr = *mut SecPkgContext_MappedCredAttr;
-pub const SSL_SESSION_RECONNECT: ::DWORD = 1;
-STRUCT!{struct SecPkgContext_SessionInfo {
-    dwFlags: ::DWORD,
-    cbSessionId: ::DWORD,
-    rgbSessionId: [::BYTE; 32],
-}}
-pub type PSecPkgContext_SessionInfo = *mut SecPkgContext_SessionInfo;
-STRUCT!{struct SecPkgContext_SessionAppData {
-    dwFlags: ::DWORD,
-    cbAppData: ::DWORD,
-    pbAppData: ::PBYTE,
-}}
-pub type PSecPkgContext_SessionAppData = *mut SecPkgContext_SessionAppData;
-STRUCT!{struct SecPkgContext_EapPrfInfo {
-    dwVersion: ::DWORD,
-    cbPrfData: ::DWORD,
-    pbPrfData: ::PBYTE,
-}}
-pub type PSecPkgContext_EapPrfInfo = *mut SecPkgContext_EapPrfInfo;
-STRUCT!{struct SecPkgContext_SupportedSignatures {
-    cSignatureAndHashAlgorithms: ::WORD,
-    pSignatureAndHashAlgorithms: *mut ::WORD,
-}}
-pub type PSecPkgContext_SupportedSignatures = *mut SecPkgContext_SupportedSignatures;
-STRUCT!{struct SecPkgContext_Certificates {
-    cCertificates: ::DWORD,
-    cbCertificateChain: ::DWORD,
-    pbCertificateChain: ::PBYTE,
-}}
-pub type PSecPkgContext_Certificates = *mut SecPkgContext_Certificates;
-STRUCT!{struct SecPkgContext_CertInfo {
-    dwVersion: ::DWORD,
-    cbSubjectName: ::DWORD,
-    pwszSubjectName: ::LPWSTR,
-    cbIssuerName: ::DWORD,
-    pwszIssuerName: ::LPWSTR,
-    dwKeySize: ::DWORD,
-}}
-pub type PSecPkgContext_CertInfo = *mut SecPkgContext_CertInfo;
-pub const KERN_CONTEXT_CERT_INFO_V1: ::DWORD = 0x00000000;
-STRUCT!{struct SecPkgContext_UiInfo {
-    hParentWindow: ::HWND,
-}}
-pub type PSecPkgContext_UiInfo = *mut SecPkgContext_UiInfo;
-STRUCT!{struct SecPkgContext_EarlyStart {
-    dwEarlyStartFlags: ::DWORD,
-}}
-pub type PSecPkgContext_EarlyStart = *mut SecPkgContext_EarlyStart;
-pub const ENABLE_TLS_CLIENT_EARLY_START: ::DWORD = 0x00000001;
-pub const SCH_CRED_V1: ::DWORD = 0x00000001;
-pub const SCH_CRED_V2: ::DWORD = 0x00000002;
-pub const SCH_CRED_VERSION: ::DWORD = 0x00000002;
-pub const SCH_CRED_V3: ::DWORD = 0x00000003;
-pub const SCHANNEL_CRED_VERSION: ::DWORD = 0x00000004;
-pub enum _HMAPPER {}
-STRUCT!{struct SCHANNEL_CRED {
-    dwVersion: ::DWORD,
-    cCreds: ::DWORD,
-    paCred: *mut ::PCCERT_CONTEXT,
-    hRootStore: ::HCERTSTORE,
-    cMappers: ::DWORD,
-    aphMappers: *mut *mut _HMAPPER,
-    cSupportedAlgs: ::DWORD,
-    palgSupportedAlgs: *mut ::ALG_ID,
-    grbitEnabledProtocols: ::DWORD,
-    dwMinimumCipherStrength: ::DWORD,
-    dwMaximumCipherStrength: ::DWORD,
-    dwSessionLifespan: ::DWORD,
-    dwFlags: ::DWORD,
-    dwCredFormat: ::DWORD,
-}}
-pub type PSCHANNEL_CRED = *mut SCHANNEL_CRED;
-pub const SCH_CRED_FORMAT_CERT_CONTEXT: ::DWORD = 0x00000000;
-pub const SCH_CRED_FORMAT_CERT_HASH: ::DWORD = 0x00000001;
-pub const SCH_CRED_FORMAT_CERT_HASH_STORE: ::DWORD = 0x00000002;
-pub const SCH_CRED_MAX_STORE_NAME_SIZE: usize = 128;
-pub const SCH_CRED_MAX_SUPPORTED_ALGS: ::DWORD = 256;
-pub const SCH_CRED_MAX_SUPPORTED_CERTS: ::DWORD = 100;
-STRUCT!{struct SCHANNEL_CERT_HASH {
-    dwLength: ::DWORD,
-    dwFlags: ::DWORD,
-    hProv: ::HCRYPTPROV,
-    ShaHash: [::BYTE; 20],
-}}
-pub type PSCHANNEL_CERT_HASH = *mut SCHANNEL_CERT_HASH;
-STRUCT!{nodebug struct SCHANNEL_CERT_HASH_STORE {
-    dwLength: ::DWORD,
-    dwFlags: ::DWORD,
-    hProv: ::HCRYPTPROV,
-    ShaHash: [::BYTE; 20],
-    pwszStoreName: [::WCHAR; SCH_CRED_MAX_STORE_NAME_SIZE],
-}}
-pub type PSCHANNEL_CERT_HASH_STORE = *mut SCHANNEL_CERT_HASH_STORE;
-pub const SCH_MACHINE_CERT_HASH: ::DWORD = 0x00000001;
-pub const SCH_CRED_NO_SYSTEM_MAPPER: ::DWORD = 0x00000002;
-pub const SCH_CRED_NO_SERVERNAME_CHECK: ::DWORD = 0x00000004;
-pub const SCH_CRED_MANUAL_CRED_VALIDATION: ::DWORD = 0x00000008;
-pub const SCH_CRED_NO_DEFAULT_CREDS: ::DWORD = 0x00000010;
-pub const SCH_CRED_AUTO_CRED_VALIDATION: ::DWORD = 0x00000020;
-pub const SCH_CRED_USE_DEFAULT_CREDS: ::DWORD = 0x00000040;
-pub const SCH_CRED_DISABLE_RECONNECTS: ::DWORD = 0x00000080;
-pub const SCH_CRED_REVOCATION_CHECK_END_CERT: ::DWORD = 0x00000100;
-pub const SCH_CRED_REVOCATION_CHECK_CHAIN: ::DWORD = 0x00000200;
-pub const SCH_CRED_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT: ::DWORD = 0x00000400;
-pub const SCH_CRED_IGNORE_NO_REVOCATION_CHECK: ::DWORD = 0x00000800;
-pub const SCH_CRED_IGNORE_REVOCATION_OFFLINE: ::DWORD = 0x00001000;
-pub const SCH_CRED_RESTRICTED_ROOTS: ::DWORD = 0x00002000;
-pub const SCH_CRED_REVOCATION_CHECK_CACHE_ONLY: ::DWORD = 0x00004000;
-pub const SCH_CRED_CACHE_ONLY_URL_RETRIEVAL: ::DWORD = 0x00008000;
-pub const SCH_CRED_MEMORY_STORE_CERT: ::DWORD = 0x00010000;
-pub const SCH_CRED_CACHE_ONLY_URL_RETRIEVAL_ON_CREATE: ::DWORD = 0x00020000;
-pub const SCH_SEND_ROOT_CERT: ::DWORD = 0x00040000;
-pub const SCH_CRED_SNI_CREDENTIAL: ::DWORD = 0x00080000;
-pub const SCH_CRED_SNI_ENABLE_OCSP: ::DWORD = 0x00100000;
-pub const SCH_SEND_AUX_RECORD: ::DWORD = 0x00200000;
-pub const SCH_USE_STRONG_CRYPTO: ::DWORD = 0x00400000;
-pub const SCHANNEL_RENEGOTIATE: ::DWORD = 0;
-pub const SCHANNEL_SHUTDOWN: ::DWORD = 1;
-pub const SCHANNEL_ALERT: ::DWORD = 2;
-pub const SCHANNEL_SESSION: ::DWORD = 3;
-STRUCT!{struct SCHANNEL_ALERT_TOKEN {
-    dwTokenType: ::DWORD,
-    dwAlertType: ::DWORD,
-    dwAlertNumber: ::DWORD,
-}}
-pub const TLS1_ALERT_WARNING: ::DWORD = 1;
-pub const TLS1_ALERT_FATAL: ::DWORD = 2;
-pub const TLS1_ALERT_CLOSE_NOTIFY: ::DWORD = 0;
-pub const TLS1_ALERT_UNEXPECTED_MESSAGE: ::DWORD = 10;
-pub const TLS1_ALERT_BAD_RECORD_MAC: ::DWORD = 20;
-pub const TLS1_ALERT_DECRYPTION_FAILED: ::DWORD = 21;
-pub const TLS1_ALERT_RECORD_OVERFLOW: ::DWORD = 22;
-pub const TLS1_ALERT_DECOMPRESSION_FAIL: ::DWORD = 30;
-pub const TLS1_ALERT_HANDSHAKE_FAILURE: ::DWORD = 40;
-pub const TLS1_ALERT_BAD_CERTIFICATE: ::DWORD = 42;
-pub const TLS1_ALERT_UNSUPPORTED_CERT: ::DWORD = 43;
-pub const TLS1_ALERT_CERTIFICATE_REVOKED: ::DWORD = 44;
-pub const TLS1_ALERT_CERTIFICATE_EXPIRED: ::DWORD = 45;
-pub const TLS1_ALERT_CERTIFICATE_UNKNOWN: ::DWORD = 46;
-pub const TLS1_ALERT_ILLEGAL_PARAMETER: ::DWORD = 47;
-pub const TLS1_ALERT_UNKNOWN_CA: ::DWORD = 48;
-pub const TLS1_ALERT_ACCESS_DENIED: ::DWORD = 49;
-pub const TLS1_ALERT_DECODE_ERROR: ::DWORD = 50;
-pub const TLS1_ALERT_DECRYPT_ERROR: ::DWORD = 51;
-pub const TLS1_ALERT_EXPORT_RESTRICTION: ::DWORD = 60;
-pub const TLS1_ALERT_PROTOCOL_VERSION: ::DWORD = 70;
-pub const TLS1_ALERT_INSUFFIENT_SECURITY: ::DWORD = 71;
-pub const TLS1_ALERT_INTERNAL_ERROR: ::DWORD = 80;
-pub const TLS1_ALERT_USER_CANCELED: ::DWORD = 90;
-pub const TLS1_ALERT_NO_RENEGOTIATION: ::DWORD = 100;
-pub const TLS1_ALERT_UNSUPPORTED_EXT: ::DWORD = 110;
-pub const TLS1_ALERT_NO_APP_PROTOCOL: ::DWORD = 120;
-pub const SSL_SESSION_ENABLE_RECONNECTS: ::DWORD = 1;
-pub const SSL_SESSION_DISABLE_RECONNECTS: ::DWORD = 2;
-STRUCT!{struct SCHANNEL_SESSION_TOKEN {
-    dwTokenType: ::DWORD,
-    dwFlags: ::DWORD,
-}}
-STRUCT!{nodebug struct SCHANNEL_CLIENT_SIGNATURE {
-    cbLength: ::DWORD,
-    aiHash: ::ALG_ID,
-    cbHash: ::DWORD,
-    HashValue: [::BYTE; 36],
-    CertThumbprint: [::BYTE; 20],
-}}
-pub type PSCHANNEL_CLIENT_SIGNATURE = *mut SCHANNEL_CLIENT_SIGNATURE;
-pub const SP_PROT_PCT1_SERVER: ::DWORD = 0x00000001;
-pub const SP_PROT_PCT1_CLIENT: ::DWORD = 0x00000002;
-pub const SP_PROT_PCT1: ::DWORD = SP_PROT_PCT1_SERVER | SP_PROT_PCT1_CLIENT;
-pub const SP_PROT_SSL2_SERVER: ::DWORD = 0x00000004;
-pub const SP_PROT_SSL2_CLIENT: ::DWORD = 0x00000008;
-pub const SP_PROT_SSL2: ::DWORD = SP_PROT_SSL2_SERVER | SP_PROT_SSL2_CLIENT;
-pub const SP_PROT_SSL3_SERVER: ::DWORD = 0x00000010;
-pub const SP_PROT_SSL3_CLIENT: ::DWORD = 0x00000020;
-pub const SP_PROT_SSL3: ::DWORD = SP_PROT_SSL3_SERVER | SP_PROT_SSL3_CLIENT;
-pub const SP_PROT_TLS1_SERVER: ::DWORD = 0x00000040;
-pub const SP_PROT_TLS1_CLIENT: ::DWORD = 0x00000080;
-pub const SP_PROT_TLS1: ::DWORD = SP_PROT_TLS1_SERVER | SP_PROT_TLS1_CLIENT;
-pub const SP_PROT_SSL3TLS1_CLIENTS: ::DWORD = SP_PROT_TLS1_CLIENT | SP_PROT_SSL3_CLIENT;
-pub const SP_PROT_SSL3TLS1_SERVERS: ::DWORD = SP_PROT_TLS1_SERVER | SP_PROT_SSL3_SERVER;
-pub const SP_PROT_SSL3TLS1: ::DWORD = SP_PROT_SSL3 | SP_PROT_TLS1;
-pub const SP_PROT_UNI_SERVER: ::DWORD = 0x40000000;
-pub const SP_PROT_UNI_CLIENT: ::DWORD = 0x80000000;
-pub const SP_PROT_UNI: ::DWORD = SP_PROT_UNI_SERVER | SP_PROT_UNI_CLIENT;
-pub const SP_PROT_ALL: ::DWORD = 0xffffffff;
-pub const SP_PROT_NONE: ::DWORD = 0;
-pub const SP_PROT_CLIENTS: ::DWORD = SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT
-    | SP_PROT_SSL3_CLIENT | SP_PROT_UNI_CLIENT | SP_PROT_TLS1_CLIENT;
-pub const SP_PROT_SERVERS: ::DWORD = SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER
-    | SP_PROT_SSL3_SERVER | SP_PROT_UNI_SERVER | SP_PROT_TLS1_SERVER;
-pub const SP_PROT_TLS1_0_SERVER: ::DWORD = SP_PROT_TLS1_SERVER;
-pub const SP_PROT_TLS1_0_CLIENT: ::DWORD = SP_PROT_TLS1_CLIENT;
-pub const SP_PROT_TLS1_0: ::DWORD = SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_0_CLIENT;
-pub const SP_PROT_TLS1_1_SERVER: ::DWORD = 0x00000100;
-pub const SP_PROT_TLS1_1_CLIENT: ::DWORD = 0x00000200;
-pub const SP_PROT_TLS1_1: ::DWORD = SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_1_CLIENT;
-pub const SP_PROT_TLS1_2_SERVER: ::DWORD = 0x00000400;
-pub const SP_PROT_TLS1_2_CLIENT: ::DWORD = 0x00000800;
-pub const SP_PROT_TLS1_2: ::DWORD = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_2_CLIENT;
-pub const SP_PROT_DTLS_SERVER: ::DWORD = 0x00010000;
-pub const SP_PROT_DTLS_CLIENT: ::DWORD = 0x00020000;
-pub const SP_PROT_DTLS: ::DWORD = SP_PROT_DTLS_SERVER | SP_PROT_DTLS_CLIENT;
-pub const SP_PROT_DTLS1_0_SERVER: ::DWORD = SP_PROT_DTLS_SERVER;
-pub const SP_PROT_DTLS1_0_CLIENT: ::DWORD = SP_PROT_DTLS_CLIENT;
-pub const SP_PROT_DTLS1_0: ::DWORD = SP_PROT_DTLS1_0_SERVER | SP_PROT_DTLS1_0_CLIENT;
-pub const SP_PROT_DTLS1_X_SERVER: ::DWORD = SP_PROT_DTLS1_0_SERVER;
-pub const SP_PROT_DTLS1_X_CLIENT: ::DWORD = SP_PROT_DTLS1_0_CLIENT;
-pub const SP_PROT_DTLS1_X: ::DWORD = SP_PROT_DTLS1_X_SERVER | SP_PROT_DTLS1_X_CLIENT;
-pub const SP_PROT_TLS1_1PLUS_SERVER: ::DWORD = SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER;
-pub const SP_PROT_TLS1_1PLUS_CLIENT: ::DWORD = SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT;
-pub const SP_PROT_TLS1_1PLUS: ::DWORD = SP_PROT_TLS1_1PLUS_SERVER | SP_PROT_TLS1_1PLUS_CLIENT;
-pub const SP_PROT_TLS1_X_SERVER: ::DWORD = SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER
-    | SP_PROT_TLS1_2_SERVER;
-pub const SP_PROT_TLS1_X_CLIENT: ::DWORD = SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT
-    | SP_PROT_TLS1_2_CLIENT;
-pub const SP_PROT_TLS1_X: ::DWORD = SP_PROT_TLS1_X_SERVER | SP_PROT_TLS1_X_CLIENT;
-pub const SP_PROT_SSL3TLS1_X_CLIENTS: ::DWORD = SP_PROT_TLS1_X_CLIENT | SP_PROT_SSL3_CLIENT;
-pub const SP_PROT_SSL3TLS1_X_SERVERS: ::DWORD = SP_PROT_TLS1_X_SERVER | SP_PROT_SSL3_SERVER;
-pub const SP_PROT_SSL3TLS1_X: ::DWORD = SP_PROT_SSL3 | SP_PROT_TLS1_X;
-pub const SP_PROT_X_CLIENTS: ::DWORD = SP_PROT_CLIENTS | SP_PROT_TLS1_X_CLIENT
-    | SP_PROT_DTLS1_X_CLIENT;
-pub const SP_PROT_X_SERVERS: ::DWORD = SP_PROT_SERVERS | SP_PROT_TLS1_X_SERVER
-    | SP_PROT_DTLS1_X_SERVER;
-//716
-pub const SCHANNEL_SECRET_TYPE_CAPI: ::DWORD = 0x00000001;
-pub const SCHANNEL_SECRET_PRIVKEY: ::DWORD = 0x00000002;
-pub const SCH_CRED_X509_CERTCHAIN: ::DWORD = 0x00000001;
-pub const SCH_CRED_X509_CAPI: ::DWORD = 0x00000002;
-pub const SCH_CRED_CERT_CONTEXT: ::DWORD = 0x00000003;
-//838
-pub const SSL_CRACK_CERTIFICATE_NAME: &'static str = "SslCrackCertificate";
-pub const SSL_FREE_CERTIFICATE_NAME: &'static str = "SslFreeCertificate";
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/servprov.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/servprov.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/servprov.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/servprov.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of servprov.h
-pub type LPSERVICEPROVIDER = *mut IServiceProvider;
-RIDL!(
-interface IServiceProvider(IServiceProviderVtbl): IUnknown(IUnknownVtbl) {
-    fn QueryService(
-        &mut self, guidService: ::REFGUID, riid: ::REFIID, ppvObject: *mut *mut ::c_void
-    ) -> ::HRESULT
-}
-);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/setupapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/setupapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/setupapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/setupapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1301 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Windows NT Setup and Device Installer services
-pub const LINE_LEN: usize = 256;
-pub const MAX_INF_STRING_LENGTH: usize = 4096;
-pub const MAX_INF_SECTION_NAME_LENGTH: usize = 255;
-pub const MAX_TITLE_LEN: usize = 60;
-pub const MAX_INSTRUCTION_LEN: usize = 256;
-pub const MAX_LABEL_LEN: usize = 30;
-pub const MAX_SERVICE_NAME_LEN: usize = 256;
-pub const MAX_SUBTITLE_LEN: usize = 256;
-pub const SP_MAX_MACHINENAME_LENGTH: usize = ::MAX_PATH + 3;
-pub type HINF = ::PVOID;
-STRUCT!{struct INFCONTEXT {
-    Inf: ::PVOID,
-    CurrentInf: ::PVOID,
-    Section: ::UINT,
-    Line: ::UINT,
-}}
-pub type PINFCONTEXT = *mut INFCONTEXT;
-STRUCT!{struct SP_INF_INFORMATION {
-    InfStyle: ::DWORD,
-    InfCount: ::DWORD,
-    VersionData: [::BYTE; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_INF_INFORMATION = *mut SP_INF_INFORMATION;
-STRUCT!{struct SP_ALTPLATFORM_INFO_V2 {
-    cbSize: ::DWORD,
-    Platform: ::DWORD,
-    MajorVersion: ::DWORD,
-    MinorVersion: ::DWORD,
-    ProcessorArchitecture: ::WORD,
-    Reserved: ::WORD,
-    FirstValidatedMajorVersion: ::DWORD,
-    FirstValidatedMinorVersion: ::DWORD,
-}}
-UNION!(SP_ALTPLATFORM_INFO_V2, Reserved, Flags, Flags_mut, ::WORD);
-pub type PSP_ALTPLATFORM_INFO_V2 = *mut SP_ALTPLATFORM_INFO_V2;
-STRUCT!{struct SP_ALTPLATFORM_INFO_V1 {
-    cbSize: ::DWORD,
-    Platform: ::DWORD,
-    MajorVersion: ::DWORD,
-    MinorVersion: ::DWORD,
-    ProcessorArchitecture: ::WORD,
-    Reserved: ::WORD,
-}}
-pub type PSP_ALTPLATFORM_INFO_V1 = *mut SP_ALTPLATFORM_INFO_V1;
-pub type SP_ALTPLATFORM_INFO = SP_ALTPLATFORM_INFO_V2;
-pub type PSP_ALTPLATFORM_INFO = PSP_ALTPLATFORM_INFO_V2;
-pub const SP_ALTPLATFORM_FLAGS_VERSION_RANGE: ::WORD = 0x0001;
-STRUCT!{nodebug struct SP_ORIGINAL_FILE_INFO_A {
-    cbSize: ::DWORD,
-    OriginalInfName: [::CHAR; ::MAX_PATH],
-    OriginalCatalogName: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_ORIGINAL_FILE_INFO_A = *mut SP_ORIGINAL_FILE_INFO_A;
-STRUCT!{nodebug struct SP_ORIGINAL_FILE_INFO_W {
-    cbSize: ::DWORD,
-    OriginalInfName: [::WCHAR; ::MAX_PATH],
-    OriginalCatalogName: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_ORIGINAL_FILE_INFO_W = *mut SP_ORIGINAL_FILE_INFO_W;
-pub const INF_STYLE_NONE: ::DWORD = 0x00000000;
-pub const INF_STYLE_OLDNT: ::DWORD = 0x00000001;
-pub const INF_STYLE_WIN4: ::DWORD = 0x00000002;
-pub const INF_STYLE_CACHE_ENABLE: ::DWORD = 0x00000010;
-pub const INF_STYLE_CACHE_DISABLE: ::DWORD = 0x00000020;
-pub const INF_STYLE_CACHE_IGNORE: ::DWORD = 0x00000040;
-pub const DIRID_ABSOLUTE: ::DWORD = -1i32 as ::DWORD;
-pub const DIRID_ABSOLUTE_16BIT: ::DWORD = 0xffff;
-pub const DIRID_NULL: ::DWORD = 0;
-pub const DIRID_SRCPATH: ::DWORD = 1;
-pub const DIRID_WINDOWS: ::DWORD = 10;
-pub const DIRID_SYSTEM: ::DWORD = 11;
-pub const DIRID_DRIVERS: ::DWORD = 12;
-pub const DIRID_IOSUBSYS: ::DWORD = DIRID_DRIVERS;
-pub const DIRID_DRIVER_STORE: ::DWORD = 13;
-pub const DIRID_INF: ::DWORD = 17;
-pub const DIRID_HELP: ::DWORD = 18;
-pub const DIRID_FONTS: ::DWORD = 20;
-pub const DIRID_VIEWERS: ::DWORD = 21;
-pub const DIRID_COLOR: ::DWORD = 23;
-pub const DIRID_APPS: ::DWORD = 24;
-pub const DIRID_SHARED: ::DWORD = 25;
-pub const DIRID_BOOT: ::DWORD = 30;
-pub const DIRID_SYSTEM16: ::DWORD = 50;
-pub const DIRID_SPOOL: ::DWORD = 51;
-pub const DIRID_SPOOLDRIVERS: ::DWORD = 52;
-pub const DIRID_USERPROFILE: ::DWORD = 53;
-pub const DIRID_LOADER: ::DWORD = 54;
-pub const DIRID_PRINTPROCESSOR: ::DWORD = 55;
-pub const DIRID_DEFAULT: ::DWORD = DIRID_SYSTEM;
-pub const DIRID_COMMON_STARTMENU: ::DWORD = 16406;
-pub const DIRID_COMMON_PROGRAMS: ::DWORD = 16407;
-pub const DIRID_COMMON_STARTUP: ::DWORD = 16408;
-pub const DIRID_COMMON_DESKTOPDIRECTORY: ::DWORD = 16409;
-pub const DIRID_COMMON_FAVORITES: ::DWORD = 16415;
-pub const DIRID_COMMON_APPDATA: ::DWORD = 16419;
-pub const DIRID_PROGRAM_FILES: ::DWORD = 16422;
-pub const DIRID_SYSTEM_X86: ::DWORD = 16425;
-pub const DIRID_PROGRAM_FILES_X86: ::DWORD = 16426;
-pub const DIRID_PROGRAM_FILES_COMMON: ::DWORD = 16427;
-pub const DIRID_PROGRAM_FILES_COMMONX86: ::DWORD = 16428;
-pub const DIRID_COMMON_TEMPLATES: ::DWORD = 16429;
-pub const DIRID_COMMON_DOCUMENTS: ::DWORD = 16430;
-pub const DIRID_USER: ::DWORD = 0x8000;
-pub type PSP_FILE_CALLBACK_A = Option<unsafe extern "system" fn(
-    Context: ::PVOID, Notification: ::UINT, Param1: ::UINT_PTR, Param2: ::UINT_PTR,
-) -> ::UINT>;
-pub type PSP_FILE_CALLBACK_W = Option<unsafe extern "system" fn(
-    Context: ::PVOID, Notification: ::UINT, Param1: ::UINT_PTR, Param2: ::UINT_PTR,
-) -> ::UINT>;
-pub const SPFILENOTIFY_STARTQUEUE: ::UINT = 0x00000001;
-pub const SPFILENOTIFY_ENDQUEUE: ::UINT = 0x00000002;
-pub const SPFILENOTIFY_STARTSUBQUEUE: ::UINT = 0x00000003;
-pub const SPFILENOTIFY_ENDSUBQUEUE: ::UINT = 0x00000004;
-pub const SPFILENOTIFY_STARTDELETE: ::UINT = 0x00000005;
-pub const SPFILENOTIFY_ENDDELETE: ::UINT = 0x00000006;
-pub const SPFILENOTIFY_DELETEERROR: ::UINT = 0x00000007;
-pub const SPFILENOTIFY_STARTRENAME: ::UINT = 0x00000008;
-pub const SPFILENOTIFY_ENDRENAME: ::UINT = 0x00000009;
-pub const SPFILENOTIFY_RENAMEERROR: ::UINT = 0x0000000a;
-pub const SPFILENOTIFY_STARTCOPY: ::UINT = 0x0000000b;
-pub const SPFILENOTIFY_ENDCOPY: ::UINT = 0x0000000c;
-pub const SPFILENOTIFY_COPYERROR: ::UINT = 0x0000000d;
-pub const SPFILENOTIFY_NEEDMEDIA: ::UINT = 0x0000000e;
-pub const SPFILENOTIFY_QUEUESCAN: ::UINT = 0x0000000f;
-pub const SPFILENOTIFY_CABINETINFO: ::UINT = 0x00000010;
-pub const SPFILENOTIFY_FILEINCABINET: ::UINT = 0x00000011;
-pub const SPFILENOTIFY_NEEDNEWCABINET: ::UINT = 0x00000012;
-pub const SPFILENOTIFY_FILEEXTRACTED: ::UINT = 0x00000013;
-pub const SPFILENOTIFY_FILEOPDELAYED: ::UINT = 0x00000014;
-pub const SPFILENOTIFY_STARTBACKUP: ::UINT = 0x00000015;
-pub const SPFILENOTIFY_BACKUPERROR: ::UINT = 0x00000016;
-pub const SPFILENOTIFY_ENDBACKUP: ::UINT = 0x00000017;
-pub const SPFILENOTIFY_QUEUESCAN_EX: ::UINT = 0x00000018;
-pub const SPFILENOTIFY_STARTREGISTRATION: ::UINT = 0x00000019;
-pub const SPFILENOTIFY_ENDREGISTRATION: ::UINT = 0x00000020;
-pub const SPFILENOTIFY_QUEUESCAN_SIGNERINFO: ::UINT = 0x00000040;
-pub const SPFILENOTIFY_LANGMISMATCH: ::UINT = 0x00010000;
-pub const SPFILENOTIFY_TARGETEXISTS: ::UINT = 0x00020000;
-pub const SPFILENOTIFY_TARGETNEWER: ::UINT = 0x00040000;
-pub const FILEOP_COPY: ::UINT = 0;
-pub const FILEOP_RENAME: ::UINT = 1;
-pub const FILEOP_DELETE: ::UINT = 2;
-pub const FILEOP_BACKUP: ::UINT = 3;
-pub const FILEOP_ABORT: ::UINT = 0;
-pub const FILEOP_DOIT: ::UINT = 1;
-pub const FILEOP_SKIP: ::UINT = 2;
-pub const FILEOP_RETRY: ::UINT = FILEOP_DOIT;
-pub const FILEOP_NEWPATH: ::UINT = 4;
-pub const COPYFLG_WARN_IF_SKIP: ::UINT = 0x00000001;
-pub const COPYFLG_NOSKIP: ::UINT = 0x00000002;
-pub const COPYFLG_NOVERSIONCHECK: ::UINT = 0x00000004;
-pub const COPYFLG_FORCE_FILE_IN_USE: ::UINT = 0x00000008;
-pub const COPYFLG_NO_OVERWRITE: ::UINT = 0x00000010;
-pub const COPYFLG_NO_VERSION_DIALOG: ::UINT = 0x00000020;
-pub const COPYFLG_OVERWRITE_OLDER_ONLY: ::UINT = 0x00000040;
-pub const COPYFLG_PROTECTED_WINDOWS_DRIVER_FILE: ::UINT = 0x00000100;
-pub const COPYFLG_REPLACEONLY: ::UINT = 0x00000400;
-pub const COPYFLG_NODECOMP: ::UINT = 0x00000800;
-pub const COPYFLG_REPLACE_BOOT_FILE: ::UINT = 0x00001000;
-pub const COPYFLG_NOPRUNE: ::UINT = 0x00002000;
-pub const COPYFLG_IN_USE_TRY_RENAME: ::UINT = 0x00004000;
-pub const DELFLG_IN_USE: ::UINT = 0x00000001;
-pub const DELFLG_IN_USE1: ::UINT = 0x00010000;
-STRUCT!{struct FILEPATHS_A {
-    Target: ::PCSTR,
-    Source: ::PCSTR,
-    Win32Error: ::UINT,
-    Flags: ::DWORD,
-}}
-pub type PFILEPATHS_A = *mut FILEPATHS_A;
-STRUCT!{struct FILEPATHS_W {
-    Target: ::PCWSTR,
-    Source: ::PCWSTR,
-    Win32Error: ::UINT,
-    Flags: ::DWORD,
-}}
-pub type PFILEPATHS_W = *mut FILEPATHS_W;
-STRUCT!{struct FILEPATHS_SIGNERINFO_A {
-    Target: ::PCSTR,
-    Source: ::PCSTR,
-    Win32Error: ::UINT,
-    Flags: ::DWORD,
-    DigitalSigner: ::PCSTR,
-    Version: ::PCSTR,
-    CatalogFile: ::PCSTR,
-}}
-pub type PFILEPATHS_SIGNERINFO_A = *mut FILEPATHS_SIGNERINFO_A;
-STRUCT!{struct FILEPATHS_SIGNERINFO_W {
-    Target: ::PCWSTR,
-    Source: ::PCWSTR,
-    Win32Error: ::UINT,
-    Flags: ::DWORD,
-    DigitalSigner: ::PCWSTR,
-    Version: ::PCWSTR,
-    CatalogFile: ::PCWSTR,
-}}
-pub type PFILEPATHS_SIGNERINFO_W = *mut FILEPATHS_SIGNERINFO_W;
-STRUCT!{struct SOURCE_MEDIA_A {
-    Reserved: ::PCSTR,
-    Tagfile: ::PCSTR,
-    Description: ::PCSTR,
-    SourcePath: ::PCSTR,
-    SourceFile: ::PCSTR,
-    Flags: ::DWORD,
-}}
-pub type PSOURCE_MEDIA_A = *mut SOURCE_MEDIA_A;
-STRUCT!{struct SOURCE_MEDIA_W {
-    Reserved: ::PCWSTR,
-    Tagfile: ::PCWSTR,
-    Description: ::PCWSTR,
-    SourcePath: ::PCWSTR,
-    SourceFile: ::PCWSTR,
-    Flags: ::DWORD,
-}}
-pub type PSOURCE_MEDIA_W = *mut SOURCE_MEDIA_W;
-STRUCT!{struct CABINET_INFO_A {
-    CabinetPath: ::PCSTR,
-    CabinetFile: ::PCSTR,
-    DiskName: ::PCSTR,
-    SetId: ::USHORT,
-    CabinetNumber: ::USHORT,
-}}
-pub type PCABINET_INFO_A = *mut CABINET_INFO_A;
-STRUCT!{struct CABINET_INFO_W {
-    CabinetPath: ::PCWSTR,
-    CabinetFile: ::PCWSTR,
-    DiskName: ::PCWSTR,
-    SetId: ::USHORT,
-    CabinetNumber: ::USHORT,
-}}
-pub type PCABINET_INFO_W = *mut CABINET_INFO_W;
-STRUCT!{nodebug struct FILE_IN_CABINET_INFO_A {
-    NameInCabinet: ::PCSTR,
-    FileSize: ::DWORD,
-    Win32Error: ::DWORD,
-    DosDate: ::WORD,
-    DosTime: ::WORD,
-    DosAttribs: ::WORD,
-    FullTargetName: [::CHAR; ::MAX_PATH],
-}}
-pub type PFILE_IN_CABINET_INFO_A = *mut FILE_IN_CABINET_INFO_A;
-STRUCT!{nodebug struct FILE_IN_CABINET_INFO_W {
-    NameInCabinet: ::PCWSTR,
-    FileSize: ::DWORD,
-    Win32Error: ::DWORD,
-    DosDate: ::WORD,
-    DosTime: ::WORD,
-    DosAttribs: ::WORD,
-    FullTargetName: [::WCHAR; ::MAX_PATH],
-}}
-pub type PFILE_IN_CABINET_INFO_W = *mut FILE_IN_CABINET_INFO_W;
-STRUCT!{struct SP_REGISTER_CONTROL_STATUSA {
-    cbSize: ::DWORD,
-    FileName: ::PCSTR,
-    Win32Error: ::DWORD,
-    FailureCode: ::DWORD,
-}}
-pub type PSP_REGISTER_CONTROL_STATUSA = *mut SP_REGISTER_CONTROL_STATUSA;
-STRUCT!{struct SP_REGISTER_CONTROL_STATUSW {
-    cbSize: ::DWORD,
-    FileName: ::PCWSTR,
-    Win32Error: ::DWORD,
-    FailureCode: ::DWORD,
-}}
-pub type PSP_REGISTER_CONTROL_STATUSW = *mut SP_REGISTER_CONTROL_STATUSW;
-pub const SPREG_SUCCESS: ::DWORD = 0x00000000;
-pub const SPREG_LOADLIBRARY: ::DWORD = 0x00000001;
-pub const SPREG_GETPROCADDR: ::DWORD = 0x00000002;
-pub const SPREG_REGSVR: ::DWORD = 0x00000003;
-pub const SPREG_DLLINSTALL: ::DWORD = 0x00000004;
-pub const SPREG_TIMEOUT: ::DWORD = 0x00000005;
-pub const SPREG_UNKNOWN: ::DWORD = 0xFFFFFFFF;
-pub type HSPFILEQ = ::PVOID;
-STRUCT!{struct SP_FILE_COPY_PARAMS_A {
-    cbSize: ::DWORD,
-    QueueHandle: HSPFILEQ,
-    SourceRootPath: ::PCSTR,
-    SourcePath: ::PCSTR,
-    SourceFilename: ::PCSTR,
-    SourceDescription: ::PCSTR,
-    SourceTagfile: ::PCSTR,
-    TargetDirectory: ::PCSTR,
-    TargetFilename: ::PCSTR,
-    CopyStyle: ::DWORD,
-    LayoutInf: HINF,
-    SecurityDescriptor: ::PCSTR,
-}}
-pub type PSP_FILE_COPY_PARAMS_A = *mut SP_FILE_COPY_PARAMS_A;
-STRUCT!{struct SP_FILE_COPY_PARAMS_W {
-    cbSize: ::DWORD,
-    QueueHandle: HSPFILEQ,
-    SourceRootPath: ::PCWSTR,
-    SourcePath: ::PCWSTR,
-    SourceFilename: ::PCWSTR,
-    SourceDescription: ::PCWSTR,
-    SourceTagfile: ::PCWSTR,
-    TargetDirectory: ::PCWSTR,
-    TargetFilename: ::PCWSTR,
-    CopyStyle: ::DWORD,
-    LayoutInf: HINF,
-    SecurityDescriptor: ::PCWSTR,
-}}
-pub type PSP_FILE_COPY_PARAMS_W = *mut SP_FILE_COPY_PARAMS_W;
-pub type HDSKSPC = ::PVOID;
-pub type HDEVINFO = ::PVOID;
-STRUCT!{struct SP_DEVINFO_DATA {
-    cbSize: ::DWORD,
-    ClassGuid: ::GUID,
-    DevInst: ::DWORD,
-    Reserved: ::ULONG_PTR,
-}}
-pub type PSP_DEVINFO_DATA = *mut SP_DEVINFO_DATA;
-STRUCT!{struct SP_DEVICE_INTERFACE_DATA {
-    cbSize: ::DWORD,
-    InterfaceClassGuid: ::GUID,
-    Flags: ::DWORD,
-    Reserved: ::ULONG_PTR,
-}}
-pub type PSP_DEVICE_INTERFACE_DATA = *mut SP_DEVICE_INTERFACE_DATA;
-pub const SPINT_ACTIVE: ::DWORD = 0x00000001;
-pub const SPINT_DEFAULT: ::DWORD = 0x00000002;
-pub const SPINT_REMOVED: ::DWORD = 0x00000004;
-pub type SP_INTERFACE_DEVICE_DATA = SP_DEVICE_INTERFACE_DATA;
-pub type PSP_INTERFACE_DEVICE_DATA = PSP_DEVICE_INTERFACE_DATA;
-pub const SPID_ACTIVE: ::DWORD = SPINT_ACTIVE;
-pub const SPID_DEFAULT: ::DWORD = SPINT_DEFAULT;
-pub const SPID_REMOVED: ::DWORD = SPINT_REMOVED;
-STRUCT!{struct SP_DEVICE_INTERFACE_DETAIL_DATA_A {
-    cbSize: ::DWORD,
-    DevicePath: [::CHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_DEVICE_INTERFACE_DETAIL_DATA_A = *mut SP_DEVICE_INTERFACE_DETAIL_DATA_A;
-STRUCT!{struct SP_DEVICE_INTERFACE_DETAIL_DATA_W {
-    cbSize: ::DWORD,
-    DevicePath: [::WCHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_DEVICE_INTERFACE_DETAIL_DATA_W = *mut SP_DEVICE_INTERFACE_DETAIL_DATA_W;
-STRUCT!{nodebug struct SP_DEVINFO_LIST_DETAIL_DATA_A {
-    cbSize: ::DWORD,
-    ClassGuid: ::GUID,
-    RemoteMachineHandle: ::HANDLE,
-    RemoteMachineName: [::CHAR; SP_MAX_MACHINENAME_LENGTH],
-}}
-pub type PSP_DEVINFO_LIST_DETAIL_DATA_A = *mut SP_DEVINFO_LIST_DETAIL_DATA_A;
-STRUCT!{nodebug struct SP_DEVINFO_LIST_DETAIL_DATA_W {
-    cbSize: ::DWORD,
-    ClassGuid: ::GUID,
-    RemoteMachineHandle: ::HANDLE,
-    RemoteMachineName: [::WCHAR; SP_MAX_MACHINENAME_LENGTH],
-}}
-pub type PSP_DEVINFO_LIST_DETAIL_DATA_W = *mut SP_DEVINFO_LIST_DETAIL_DATA_W;
-pub const DIF_SELECTDEVICE: DI_FUNCTION = 0x00000001;
-pub const DIF_INSTALLDEVICE: DI_FUNCTION = 0x00000002;
-pub const DIF_ASSIGNRESOURCES: DI_FUNCTION = 0x00000003;
-pub const DIF_PROPERTIES: DI_FUNCTION = 0x00000004;
-pub const DIF_REMOVE: DI_FUNCTION = 0x00000005;
-pub const DIF_FIRSTTIMESETUP: DI_FUNCTION = 0x00000006;
-pub const DIF_FOUNDDEVICE: DI_FUNCTION = 0x00000007;
-pub const DIF_SELECTCLASSDRIVERS: DI_FUNCTION = 0x00000008;
-pub const DIF_VALIDATECLASSDRIVERS: DI_FUNCTION = 0x00000009;
-pub const DIF_INSTALLCLASSDRIVERS: DI_FUNCTION = 0x0000000A;
-pub const DIF_CALCDISKSPACE: DI_FUNCTION = 0x0000000B;
-pub const DIF_DESTROYPRIVATEDATA: DI_FUNCTION = 0x0000000C;
-pub const DIF_VALIDATEDRIVER: DI_FUNCTION = 0x0000000D;
-pub const DIF_DETECT: DI_FUNCTION = 0x0000000F;
-pub const DIF_INSTALLWIZARD: DI_FUNCTION = 0x00000010;
-pub const DIF_DESTROYWIZARDDATA: DI_FUNCTION = 0x00000011;
-pub const DIF_PROPERTYCHANGE: DI_FUNCTION = 0x00000012;
-pub const DIF_ENABLECLASS: DI_FUNCTION = 0x00000013;
-pub const DIF_DETECTVERIFY: DI_FUNCTION = 0x00000014;
-pub const DIF_INSTALLDEVICEFILES: DI_FUNCTION = 0x00000015;
-pub const DIF_UNREMOVE: DI_FUNCTION = 0x00000016;
-pub const DIF_SELECTBESTCOMPATDRV: DI_FUNCTION = 0x00000017;
-pub const DIF_ALLOW_INSTALL: DI_FUNCTION = 0x00000018;
-pub const DIF_REGISTERDEVICE: DI_FUNCTION = 0x00000019;
-pub const DIF_NEWDEVICEWIZARD_PRESELECT: DI_FUNCTION = 0x0000001A;
-pub const DIF_NEWDEVICEWIZARD_SELECT: DI_FUNCTION = 0x0000001B;
-pub const DIF_NEWDEVICEWIZARD_PREANALYZE: DI_FUNCTION = 0x0000001C;
-pub const DIF_NEWDEVICEWIZARD_POSTANALYZE: DI_FUNCTION = 0x0000001D;
-pub const DIF_NEWDEVICEWIZARD_FINISHINSTALL: DI_FUNCTION = 0x0000001E;
-pub const DIF_UNUSED1: DI_FUNCTION = 0x0000001F;
-pub const DIF_INSTALLINTERFACES: DI_FUNCTION = 0x00000020;
-pub const DIF_DETECTCANCEL: DI_FUNCTION = 0x00000021;
-pub const DIF_REGISTER_COINSTALLERS: DI_FUNCTION = 0x00000022;
-pub const DIF_ADDPROPERTYPAGE_ADVANCED: DI_FUNCTION = 0x00000023;
-pub const DIF_ADDPROPERTYPAGE_BASIC: DI_FUNCTION = 0x00000024;
-pub const DIF_RESERVED1: DI_FUNCTION = 0x00000025;
-pub const DIF_TROUBLESHOOTER: DI_FUNCTION = 0x00000026;
-pub const DIF_POWERMESSAGEWAKE: DI_FUNCTION = 0x00000027;
-pub const DIF_ADDREMOTEPROPERTYPAGE_ADVANCED: DI_FUNCTION = 0x00000028;
-pub const DIF_UPDATEDRIVER_UI: DI_FUNCTION = 0x00000029;
-pub const DIF_FINISHINSTALL_ACTION: DI_FUNCTION = 0x0000002A;
-pub const DIF_RESERVED2: DI_FUNCTION = 0x00000030;
-pub const DIF_MOVEDEVICE: DI_FUNCTION = 0x0000000E;
-pub type DI_FUNCTION = ::UINT;
-STRUCT!{nodebug struct SP_DEVINSTALL_PARAMS_A {
-    cbSize: ::DWORD,
-    Flags: ::DWORD,
-    FlagsEx: ::DWORD,
-    hwndParent: ::HWND,
-    InstallMsgHandler: PSP_FILE_CALLBACK_A,
-    InstallMsgHandlerContext: ::PVOID,
-    FileQueue: HSPFILEQ,
-    ClassInstallReserved: ::ULONG_PTR,
-    Reserved: ::DWORD,
-    DriverPath: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_DEVINSTALL_PARAMS_A = *mut SP_DEVINSTALL_PARAMS_A;
-STRUCT!{nodebug struct SP_DEVINSTALL_PARAMS_W {
-    cbSize: ::DWORD,
-    Flags: ::DWORD,
-    FlagsEx: ::DWORD,
-    hwndParent: ::HWND,
-    InstallMsgHandler: PSP_FILE_CALLBACK_W,
-    InstallMsgHandlerContext: ::PVOID,
-    FileQueue: HSPFILEQ,
-    ClassInstallReserved: ::ULONG_PTR,
-    Reserved: ::DWORD,
-    DriverPath: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_DEVINSTALL_PARAMS_W = *mut SP_DEVINSTALL_PARAMS_W;
-pub const DI_SHOWOEM: ::DWORD = 0x00000001;
-pub const DI_SHOWCOMPAT: ::DWORD = 0x00000002;
-pub const DI_SHOWCLASS: ::DWORD = 0x00000004;
-pub const DI_SHOWALL: ::DWORD = 0x00000007;
-pub const DI_NOVCP: ::DWORD = 0x00000008;
-pub const DI_DIDCOMPAT: ::DWORD = 0x00000010;
-pub const DI_DIDCLASS: ::DWORD = 0x00000020;
-pub const DI_AUTOASSIGNRES: ::DWORD = 0x00000040;
-pub const DI_NEEDRESTART: ::DWORD = 0x00000080;
-pub const DI_NEEDREBOOT: ::DWORD = 0x00000100;
-pub const DI_NOBROWSE: ::DWORD = 0x00000200;
-pub const DI_MULTMFGS: ::DWORD = 0x00000400;
-pub const DI_DISABLED: ::DWORD = 0x00000800;
-pub const DI_GENERALPAGE_ADDED: ::DWORD = 0x00001000;
-pub const DI_RESOURCEPAGE_ADDED: ::DWORD = 0x00002000;
-pub const DI_PROPERTIES_CHANGE: ::DWORD = 0x00004000;
-pub const DI_INF_IS_SORTED: ::DWORD = 0x00008000;
-pub const DI_ENUMSINGLEINF: ::DWORD = 0x00010000;
-pub const DI_DONOTCALLCONFIGMG: ::DWORD = 0x00020000;
-pub const DI_INSTALLDISABLED: ::DWORD = 0x00040000;
-pub const DI_COMPAT_FROM_CLASS: ::DWORD = 0x00080000;
-pub const DI_CLASSINSTALLPARAMS: ::DWORD = 0x00100000;
-pub const DI_NODI_DEFAULTACTION: ::DWORD = 0x00200000;
-pub const DI_QUIETINSTALL: ::DWORD = 0x00800000;
-pub const DI_NOFILECOPY: ::DWORD = 0x01000000;
-pub const DI_FORCECOPY: ::DWORD = 0x02000000;
-pub const DI_DRIVERPAGE_ADDED: ::DWORD = 0x04000000;
-pub const DI_USECI_SELECTSTRINGS: ::DWORD = 0x08000000;
-pub const DI_OVERRIDE_INFFLAGS: ::DWORD = 0x10000000;
-pub const DI_PROPS_NOCHANGEUSAGE: ::DWORD = 0x20000000;
-pub const DI_NOSELECTICONS: ::DWORD = 0x40000000;
-pub const DI_NOWRITE_IDS: ::DWORD = 0x80000000;
-pub const DI_FLAGSEX_RESERVED2: ::DWORD = 0x00000001;
-pub const DI_FLAGSEX_RESERVED3: ::DWORD = 0x00000002;
-pub const DI_FLAGSEX_CI_FAILED: ::DWORD = 0x00000004;
-pub const DI_FLAGSEX_FINISHINSTALL_ACTION: ::DWORD = 0x00000008;
-pub const DI_FLAGSEX_DIDINFOLIST: ::DWORD = 0x00000010;
-pub const DI_FLAGSEX_DIDCOMPATINFO: ::DWORD = 0x00000020;
-pub const DI_FLAGSEX_FILTERCLASSES: ::DWORD = 0x00000040;
-pub const DI_FLAGSEX_SETFAILEDINSTALL: ::DWORD = 0x00000080;
-pub const DI_FLAGSEX_DEVICECHANGE: ::DWORD = 0x00000100;
-pub const DI_FLAGSEX_ALWAYSWRITEIDS: ::DWORD = 0x00000200;
-pub const DI_FLAGSEX_PROPCHANGE_PENDING: ::DWORD = 0x00000400;
-pub const DI_FLAGSEX_ALLOWEXCLUDEDDRVS: ::DWORD = 0x00000800;
-pub const DI_FLAGSEX_NOUIONQUERYREMOVE: ::DWORD = 0x00001000;
-pub const DI_FLAGSEX_USECLASSFORCOMPAT: ::DWORD = 0x00002000;
-pub const DI_FLAGSEX_RESERVED4: ::DWORD = 0x00004000;
-pub const DI_FLAGSEX_NO_DRVREG_MODIFY: ::DWORD = 0x00008000;
-pub const DI_FLAGSEX_IN_SYSTEM_SETUP: ::DWORD = 0x00010000;
-pub const DI_FLAGSEX_INET_DRIVER: ::DWORD = 0x00020000;
-pub const DI_FLAGSEX_APPENDDRIVERLIST: ::DWORD = 0x00040000;
-pub const DI_FLAGSEX_PREINSTALLBACKUP: ::DWORD = 0x00080000;
-pub const DI_FLAGSEX_BACKUPONREPLACE: ::DWORD = 0x00100000;
-pub const DI_FLAGSEX_DRIVERLIST_FROM_URL: ::DWORD = 0x00200000;
-pub const DI_FLAGSEX_RESERVED1: ::DWORD = 0x00400000;
-pub const DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS: ::DWORD = 0x00800000;
-pub const DI_FLAGSEX_POWERPAGE_ADDED: ::DWORD = 0x01000000;
-pub const DI_FLAGSEX_FILTERSIMILARDRIVERS: ::DWORD = 0x02000000;
-pub const DI_FLAGSEX_INSTALLEDDRIVER: ::DWORD = 0x04000000;
-pub const DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE: ::DWORD = 0x08000000;
-pub const DI_FLAGSEX_ALTPLATFORM_DRVSEARCH: ::DWORD = 0x10000000;
-pub const DI_FLAGSEX_RESTART_DEVICE_ONLY: ::DWORD = 0x20000000;
-pub const DI_FLAGSEX_RECURSIVESEARCH: ::DWORD = 0x40000000;
-pub const DI_FLAGSEX_SEARCH_PUBLISHED_INFS: ::DWORD = 0x80000000;
-STRUCT!{struct SP_CLASSINSTALL_HEADER {
-    cbSize: ::DWORD,
-    InstallFunction: DI_FUNCTION,
-}}
-pub type PSP_CLASSINSTALL_HEADER = *mut SP_CLASSINSTALL_HEADER;
-STRUCT!{struct SP_ENABLECLASS_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    ClassGuid: ::GUID,
-    EnableMessage: ::DWORD,
-}}
-pub type PSP_ENABLECLASS_PARAMS = *mut SP_ENABLECLASS_PARAMS;
-pub const ENABLECLASS_QUERY: ::DWORD = 0;
-pub const ENABLECLASS_SUCCESS: ::DWORD = 1;
-pub const ENABLECLASS_FAILURE: ::DWORD = 2;
-pub const DICS_ENABLE: ::DWORD = 0x00000001;
-pub const DICS_DISABLE: ::DWORD = 0x00000002;
-pub const DICS_PROPCHANGE: ::DWORD = 0x00000003;
-pub const DICS_START: ::DWORD = 0x00000004;
-pub const DICS_STOP: ::DWORD = 0x00000005;
-pub const DICS_FLAG_GLOBAL: ::DWORD = 0x00000001;
-pub const DICS_FLAG_CONFIGSPECIFIC: ::DWORD = 0x00000002;
-pub const DICS_FLAG_CONFIGGENERAL: ::DWORD = 0x00000004;
-STRUCT!{struct SP_PROPCHANGE_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    StateChange: ::DWORD,
-    Scope: ::DWORD,
-    HwProfile: ::DWORD,
-}}
-pub type PSP_PROPCHANGE_PARAMS = *mut SP_PROPCHANGE_PARAMS;
-STRUCT!{struct SP_REMOVEDEVICE_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Scope: ::DWORD,
-    HwProfile: ::DWORD,
-}}
-pub type PSP_REMOVEDEVICE_PARAMS = *mut SP_REMOVEDEVICE_PARAMS;
-pub const DI_REMOVEDEVICE_GLOBAL: ::DWORD = 0x00000001;
-pub const DI_REMOVEDEVICE_CONFIGSPECIFIC: ::DWORD = 0x00000002;
-STRUCT!{struct SP_UNREMOVEDEVICE_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Scope: ::DWORD,
-    HwProfile: ::DWORD,
-}}
-pub type PSP_UNREMOVEDEVICE_PARAMS = *mut SP_UNREMOVEDEVICE_PARAMS;
-pub const DI_UNREMOVEDEVICE_CONFIGSPECIFIC: ::DWORD = 0x00000002;
-STRUCT!{nodebug struct SP_SELECTDEVICE_PARAMS_A {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Title: [::CHAR; MAX_TITLE_LEN],
-    Instructions: [::CHAR; MAX_INSTRUCTION_LEN],
-    ListLabel: [::CHAR; MAX_LABEL_LEN],
-    SubTitle: [::CHAR; MAX_SUBTITLE_LEN],
-    Reserved: [::BYTE; 2],
-}}
-pub type PSP_SELECTDEVICE_PARAMS_A = *mut SP_SELECTDEVICE_PARAMS_A;
-STRUCT!{nodebug struct SP_SELECTDEVICE_PARAMS_W {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Title: [::WCHAR; MAX_TITLE_LEN],
-    Instructions: [::WCHAR; MAX_INSTRUCTION_LEN],
-    ListLabel: [::WCHAR; MAX_LABEL_LEN],
-    SubTitle: [::WCHAR; MAX_SUBTITLE_LEN],
-}}
-pub type PSP_SELECTDEVICE_PARAMS_W = *mut SP_SELECTDEVICE_PARAMS_W;
-pub type PDETECT_PROGRESS_NOTIFY = Option<unsafe extern "system" fn(
-    ProgressNotifyParam: ::PVOID, DetectComplete: ::DWORD,
-) -> ::BOOL>;
-STRUCT!{nodebug struct SP_DETECTDEVICE_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    DetectProgressNotify: PDETECT_PROGRESS_NOTIFY,
-    ProgressNotifyParam: ::PVOID,
-}}
-pub type PSP_DETECTDEVICE_PARAMS = *mut SP_DETECTDEVICE_PARAMS;
-pub const MAX_INSTALLWIZARD_DYNAPAGES: usize = 20;
-STRUCT!{struct SP_INSTALLWIZARD_DATA {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Flags: ::DWORD,
-    DynamicPages: [::HPROPSHEETPAGE; MAX_INSTALLWIZARD_DYNAPAGES],
-    NumDynamicPages: ::DWORD,
-    DynamicPageFlags: ::DWORD,
-    PrivateFlags: ::DWORD,
-    PrivateData: ::LPARAM,
-    hwndWizardDlg: ::HWND,
-}}
-pub type PSP_INSTALLWIZARD_DATA = *mut SP_INSTALLWIZARD_DATA;
-pub const NDW_INSTALLFLAG_DIDFACTDEFS: ::DWORD = 0x00000001;
-pub const NDW_INSTALLFLAG_HARDWAREALLREADYIN: ::DWORD = 0x00000002;
-pub const NDW_INSTALLFLAG_NEEDRESTART: ::DWORD = DI_NEEDRESTART;
-pub const NDW_INSTALLFLAG_NEEDREBOOT: ::DWORD = DI_NEEDREBOOT;
-pub const NDW_INSTALLFLAG_NEEDSHUTDOWN: ::DWORD = 0x00000200;
-pub const NDW_INSTALLFLAG_EXPRESSINTRO: ::DWORD = 0x00000400;
-pub const NDW_INSTALLFLAG_SKIPISDEVINSTALLED: ::DWORD = 0x00000800;
-pub const NDW_INSTALLFLAG_NODETECTEDDEVS: ::DWORD = 0x00001000;
-pub const NDW_INSTALLFLAG_INSTALLSPECIFIC: ::DWORD = 0x00002000;
-pub const NDW_INSTALLFLAG_SKIPCLASSLIST: ::DWORD = 0x00004000;
-pub const NDW_INSTALLFLAG_CI_PICKED_OEM: ::DWORD = 0x00008000;
-pub const NDW_INSTALLFLAG_PCMCIAMODE: ::DWORD = 0x00010000;
-pub const NDW_INSTALLFLAG_PCMCIADEVICE: ::DWORD = 0x00020000;
-pub const NDW_INSTALLFLAG_USERCANCEL: ::DWORD = 0x00040000;
-pub const NDW_INSTALLFLAG_KNOWNCLASS: ::DWORD = 0x00080000;
-pub const DYNAWIZ_FLAG_PAGESADDED: ::DWORD = 0x00000001;
-pub const DYNAWIZ_FLAG_ANALYZE_HANDLECONFLICT: ::DWORD = 0x00000008;
-pub const DYNAWIZ_FLAG_INSTALLDET_NEXT: ::DWORD = 0x00000002;
-pub const DYNAWIZ_FLAG_INSTALLDET_PREV: ::DWORD = 0x00000004;
-pub const MIN_IDD_DYNAWIZ_RESOURCE_ID: ::c_int = 10000;
-pub const MAX_IDD_DYNAWIZ_RESOURCE_ID: ::c_int = 11000;
-pub const IDD_DYNAWIZ_FIRSTPAGE: ::c_int = 10000;
-pub const IDD_DYNAWIZ_SELECT_PREVPAGE: ::c_int = 10001;
-pub const IDD_DYNAWIZ_SELECT_NEXTPAGE: ::c_int = 10002;
-pub const IDD_DYNAWIZ_ANALYZE_PREVPAGE: ::c_int = 10003;
-pub const IDD_DYNAWIZ_ANALYZE_NEXTPAGE: ::c_int = 10004;
-pub const IDD_DYNAWIZ_SELECTDEV_PAGE: ::c_int = 10009;
-pub const IDD_DYNAWIZ_ANALYZEDEV_PAGE: ::c_int = 10010;
-pub const IDD_DYNAWIZ_INSTALLDETECTEDDEVS_PAGE: ::c_int = 10011;
-pub const IDD_DYNAWIZ_SELECTCLASS_PAGE: ::c_int = 10012;
-pub const IDD_DYNAWIZ_INSTALLDETECTED_PREVPAGE: ::c_int = 10006;
-pub const IDD_DYNAWIZ_INSTALLDETECTED_NEXTPAGE: ::c_int = 10007;
-pub const IDD_DYNAWIZ_INSTALLDETECTED_NODEVS: ::c_int = 10008;
-STRUCT!{struct SP_NEWDEVICEWIZARD_DATA {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Flags: ::DWORD,
-    DynamicPages: [::HPROPSHEETPAGE; MAX_INSTALLWIZARD_DYNAPAGES],
-    NumDynamicPages: ::DWORD,
-    hwndWizardDlg: ::HWND,
-}}
-pub type PSP_NEWDEVICEWIZARD_DATA = *mut SP_NEWDEVICEWIZARD_DATA;
-pub type SP_ADDPROPERTYPAGE_DATA = SP_NEWDEVICEWIZARD_DATA;
-pub type PSP_ADDPROPERTYPAGE_DATA = PSP_NEWDEVICEWIZARD_DATA;
-STRUCT!{nodebug struct SP_TROUBLESHOOTER_PARAMS_A {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    ChmFile: [::CHAR; ::MAX_PATH],
-    HtmlTroubleShooter: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_TROUBLESHOOTER_PARAMS_A = *mut SP_TROUBLESHOOTER_PARAMS_A;
-STRUCT!{nodebug struct SP_TROUBLESHOOTER_PARAMS_W {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    ChmFile: [::WCHAR; ::MAX_PATH],
-    HtmlTroubleShooter: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_TROUBLESHOOTER_PARAMS_W = *mut SP_TROUBLESHOOTER_PARAMS_W;
-STRUCT!{nodebug struct SP_POWERMESSAGEWAKE_PARAMS_A {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    PowerMessageWake: [::CHAR; LINE_LEN * 2],
-}}
-pub type PSP_POWERMESSAGEWAKE_PARAMS_A = *mut SP_POWERMESSAGEWAKE_PARAMS_A;
-STRUCT!{nodebug struct SP_POWERMESSAGEWAKE_PARAMS_W {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    PowerMessageWake: [::WCHAR; LINE_LEN * 2],
-}}
-pub type PSP_POWERMESSAGEWAKE_PARAMS_W = *mut SP_POWERMESSAGEWAKE_PARAMS_W;
-STRUCT!{nodebug struct SP_DRVINFO_DATA_V2_A {
-    cbSize: ::DWORD,
-    DriverType: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    Description: [::CHAR; LINE_LEN],
-    MfgName: [::CHAR; LINE_LEN],
-    ProviderName: [::CHAR; LINE_LEN],
-    DriverDate: ::FILETIME,
-    DriverVersion: ::DWORDLONG,
-}}
-pub type PSP_DRVINFO_DATA_V2_A = *mut SP_DRVINFO_DATA_V2_A;
-STRUCT!{nodebug struct SP_DRVINFO_DATA_V2_W {
-    cbSize: ::DWORD,
-    DriverType: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    Description: [::WCHAR; LINE_LEN],
-    MfgName: [::WCHAR; LINE_LEN],
-    ProviderName: [::WCHAR; LINE_LEN],
-    DriverDate: ::FILETIME,
-    DriverVersion: ::DWORDLONG,
-}}
-pub type PSP_DRVINFO_DATA_V2_W = *mut SP_DRVINFO_DATA_V2_W;
-STRUCT!{nodebug struct SP_DRVINFO_DATA_V1_A {
-    cbSize: ::DWORD,
-    DriverType: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    Description: [::CHAR; LINE_LEN],
-    MfgName: [::CHAR; LINE_LEN],
-    ProviderName: [::CHAR; LINE_LEN],
-}}
-pub type PSP_DRVINFO_DATA_V1_A = *mut SP_DRVINFO_DATA_V1_A;
-STRUCT!{nodebug struct SP_DRVINFO_DATA_V1_W {
-    cbSize: ::DWORD,
-    DriverType: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    Description: [::WCHAR; LINE_LEN],
-    MfgName: [::WCHAR; LINE_LEN],
-    ProviderName: [::WCHAR; LINE_LEN],
-}}
-pub type PSP_DRVINFO_DATA_V1_W = *mut SP_DRVINFO_DATA_V1_W;
-pub type SP_DRVINFO_DATA_A = SP_DRVINFO_DATA_V2_A;
-pub type PSP_DRVINFO_DATA_A = PSP_DRVINFO_DATA_V2_A;
-pub type SP_DRVINFO_DATA_W = SP_DRVINFO_DATA_V2_W;
-pub type PSP_DRVINFO_DATA_W = PSP_DRVINFO_DATA_V2_W;
-STRUCT!{nodebug struct SP_DRVINFO_DETAIL_DATA_A {
-    cbSize: ::DWORD,
-    InfDate: ::FILETIME,
-    CompatIDsOffset: ::DWORD,
-    CompatIDsLength: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    SectionName: [::CHAR; LINE_LEN],
-    InfFileName: [::CHAR; ::MAX_PATH],
-    DrvDescription: [::CHAR; LINE_LEN],
-    HardwareID: [::CHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_DRVINFO_DETAIL_DATA_A = *mut SP_DRVINFO_DETAIL_DATA_A;
-STRUCT!{nodebug struct SP_DRVINFO_DETAIL_DATA_W {
-    cbSize: ::DWORD,
-    InfDate: ::FILETIME,
-    CompatIDsOffset: ::DWORD,
-    CompatIDsLength: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    SectionName: [::WCHAR; LINE_LEN],
-    InfFileName: [::WCHAR; ::MAX_PATH],
-    DrvDescription: [::WCHAR; LINE_LEN],
-    HardwareID: [::WCHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_DRVINFO_DETAIL_DATA_W = *mut SP_DRVINFO_DETAIL_DATA_W;
-STRUCT!{struct SP_DRVINSTALL_PARAMS {
-    cbSize: ::DWORD,
-    Rank: ::DWORD,
-    Flags: ::DWORD,
-    PrivateData: ::DWORD_PTR,
-    Reserved: ::DWORD,
-}}
-pub type PSP_DRVINSTALL_PARAMS = *mut SP_DRVINSTALL_PARAMS;
-pub const DNF_DUPDESC: ::DWORD = 0x00000001;
-pub const DNF_OLDDRIVER: ::DWORD = 0x00000002;
-pub const DNF_EXCLUDEFROMLIST: ::DWORD = 0x00000004;
-pub const DNF_NODRIVER: ::DWORD = 0x00000008;
-pub const DNF_LEGACYINF: ::DWORD = 0x00000010;
-pub const DNF_CLASS_DRIVER: ::DWORD = 0x00000020;
-pub const DNF_COMPATIBLE_DRIVER: ::DWORD = 0x00000040;
-pub const DNF_INET_DRIVER: ::DWORD = 0x00000080;
-pub const DNF_UNUSED1: ::DWORD = 0x00000100;
-pub const DNF_UNUSED2: ::DWORD = 0x00000200;
-pub const DNF_OLD_INET_DRIVER: ::DWORD = 0x00000400;
-pub const DNF_BAD_DRIVER: ::DWORD = 0x00000800;
-pub const DNF_DUPPROVIDER: ::DWORD = 0x00001000;
-pub const DNF_INF_IS_SIGNED: ::DWORD = 0x00002000;
-pub const DNF_OEM_F6_INF: ::DWORD = 0x00004000;
-pub const DNF_DUPDRIVERVER: ::DWORD = 0x00008000;
-pub const DNF_BASIC_DRIVER: ::DWORD = 0x00010000;
-pub const DNF_AUTHENTICODE_SIGNED: ::DWORD = 0x00020000;
-pub const DNF_INSTALLEDDRIVER: ::DWORD = 0x00040000;
-pub const DNF_ALWAYSEXCLUDEFROMLIST: ::DWORD = 0x00080000;
-pub const DNF_INBOX_DRIVER: ::DWORD = 0x00100000;
-pub const DNF_REQUESTADDITIONALSOFTWARE: ::DWORD = 0x00200000;
-pub const DNF_UNUSED_22: ::DWORD = 0x00400000;
-pub const DNF_UNUSED_23: ::DWORD = 0x00800000;
-pub const DNF_UNUSED_24: ::DWORD = 0x01000000;
-pub const DNF_UNUSED_25: ::DWORD = 0x02000000;
-pub const DNF_UNUSED_26: ::DWORD = 0x04000000;
-pub const DNF_UNUSED_27: ::DWORD = 0x08000000;
-pub const DNF_UNUSED_28: ::DWORD = 0x10000000;
-pub const DNF_UNUSED_29: ::DWORD = 0x20000000;
-pub const DNF_UNUSED_30: ::DWORD = 0x40000000;
-pub const DNF_UNUSED_31: ::DWORD = 0x80000000;
-pub type PSP_DETSIG_CMPPROC = Option<unsafe extern "system" fn(
-    DeviceInfoSet: HDEVINFO, NewDeviceData: PSP_DEVINFO_DATA, ExistingDeviceData: PSP_DEVINFO_DATA,
-    CompareContext: ::PVOID,
-) -> ::DWORD>;
-STRUCT!{struct COINSTALLER_CONTEXT_DATA {
-    PostProcessing: ::BOOL,
-    InstallResult: ::DWORD,
-    PrivateData: ::PVOID,
-}}
-pub type PCOINSTALLER_CONTEXT_DATA = *mut COINSTALLER_CONTEXT_DATA;
-STRUCT!{struct SP_CLASSIMAGELIST_DATA {
-    cbSize: ::DWORD,
-    ImageList: ::HIMAGELIST,
-    Reserved: ::ULONG_PTR,
-}}
-pub type PSP_CLASSIMAGELIST_DATA = *mut SP_CLASSIMAGELIST_DATA;
-STRUCT!{struct SP_PROPSHEETPAGE_REQUEST {
-    cbSize: ::DWORD,
-    PageRequested: ::DWORD,
-    DeviceInfoSet: HDEVINFO,
-    DeviceInfoData: PSP_DEVINFO_DATA,
-}}
-pub type PSP_PROPSHEETPAGE_REQUEST = *mut SP_PROPSHEETPAGE_REQUEST;
-pub const SPPSR_SELECT_DEVICE_RESOURCES: ::DWORD = 1;
-pub const SPPSR_ENUM_BASIC_DEVICE_PROPERTIES: ::DWORD = 2;
-pub const SPPSR_ENUM_ADV_DEVICE_PROPERTIES: ::DWORD = 3;
-STRUCT!{nodebug struct SP_BACKUP_QUEUE_PARAMS_V2_A {
-    cbSize: ::DWORD,
-    FullInfPath: [::CHAR; ::MAX_PATH],
-    FilenameOffset: ::INT,
-    ReinstallInstance: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_BACKUP_QUEUE_PARAMS_V2_A = *mut SP_BACKUP_QUEUE_PARAMS_V2_A;
-STRUCT!{nodebug struct SP_BACKUP_QUEUE_PARAMS_V2_W {
-    cbSize: ::DWORD,
-    FullInfPath: [::WCHAR; ::MAX_PATH],
-    FilenameOffset: ::INT,
-    ReinstallInstance: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_BACKUP_QUEUE_PARAMS_V2_W = *mut SP_BACKUP_QUEUE_PARAMS_V2_W;
-STRUCT!{nodebug struct SP_BACKUP_QUEUE_PARAMS_V1_A {
-    cbSize: ::DWORD,
-    FullInfPath: [::CHAR; ::MAX_PATH],
-    FilenameOffset: ::INT,
-}}
-pub type PSP_BACKUP_QUEUE_PARAMS_V1_A = *mut SP_BACKUP_QUEUE_PARAMS_V1_A;
-STRUCT!{nodebug struct SP_BACKUP_QUEUE_PARAMS_V1_W {
-    cbSize: ::DWORD,
-    FullInfPath: [::WCHAR; ::MAX_PATH],
-    FilenameOffset: ::INT,
-}}
-pub type PSP_BACKUP_QUEUE_PARAMS_V1_W = *mut SP_BACKUP_QUEUE_PARAMS_V1_W;
-pub type SP_BACKUP_QUEUE_PARAMS_A = SP_BACKUP_QUEUE_PARAMS_V2_A;
-pub type PSP_BACKUP_QUEUE_PARAMS_A = PSP_BACKUP_QUEUE_PARAMS_V2_A;
-pub type SP_BACKUP_QUEUE_PARAMS_W = SP_BACKUP_QUEUE_PARAMS_V2_W;
-pub type PSP_BACKUP_QUEUE_PARAMS_W = PSP_BACKUP_QUEUE_PARAMS_V2_W;
-pub const ERROR_EXPECTED_SECTION_NAME: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0;
-pub const ERROR_BAD_SECTION_NAME_LINE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 1;
-pub const ERROR_SECTION_NAME_TOO_LONG: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 2;
-pub const ERROR_GENERAL_SYNTAX: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 3;
-pub const ERROR_WRONG_INF_STYLE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x100;
-pub const ERROR_SECTION_NOT_FOUND: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x101;
-pub const ERROR_LINE_NOT_FOUND: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x102;
-pub const ERROR_NO_BACKUP: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x103;
-pub const ERROR_NO_ASSOCIATED_CLASS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x200;
-pub const ERROR_CLASS_MISMATCH: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x201;
-pub const ERROR_DUPLICATE_FOUND: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x202;
-pub const ERROR_NO_DRIVER_SELECTED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x203;
-pub const ERROR_KEY_DOES_NOT_EXIST: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x204;
-pub const ERROR_INVALID_DEVINST_NAME: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x205;
-pub const ERROR_INVALID_CLASS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x206;
-pub const ERROR_DEVINST_ALREADY_EXISTS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x207;
-pub const ERROR_DEVINFO_NOT_REGISTERED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x208;
-pub const ERROR_INVALID_REG_PROPERTY: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x209;
-pub const ERROR_NO_INF: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x20A;
-pub const ERROR_NO_SUCH_DEVINST: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x20B;
-pub const ERROR_CANT_LOAD_CLASS_ICON: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x20C;
-pub const ERROR_INVALID_CLASS_INSTALLER: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x20D;
-pub const ERROR_DI_DO_DEFAULT: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x20E;
-pub const ERROR_DI_NOFILECOPY: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x20F;
-pub const ERROR_INVALID_HWPROFILE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x210;
-pub const ERROR_NO_DEVICE_SELECTED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x211;
-pub const ERROR_DEVINFO_LIST_LOCKED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x212;
-pub const ERROR_DEVINFO_DATA_LOCKED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x213;
-pub const ERROR_DI_BAD_PATH: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x214;
-pub const ERROR_NO_CLASSINSTALL_PARAMS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x215;
-pub const ERROR_FILEQUEUE_LOCKED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x216;
-pub const ERROR_BAD_SERVICE_INSTALLSECT: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x217;
-pub const ERROR_NO_CLASS_DRIVER_LIST: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x218;
-pub const ERROR_NO_ASSOCIATED_SERVICE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x219;
-pub const ERROR_NO_DEFAULT_DEVICE_INTERFACE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21A;
-pub const ERROR_DEVICE_INTERFACE_ACTIVE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21B;
-pub const ERROR_DEVICE_INTERFACE_REMOVED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21C;
-pub const ERROR_BAD_INTERFACE_INSTALLSECT: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21D;
-pub const ERROR_NO_SUCH_INTERFACE_CLASS: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21E;
-pub const ERROR_INVALID_REFERENCE_STRING: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21F;
-pub const ERROR_INVALID_MACHINENAME: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x220;
-pub const ERROR_REMOTE_COMM_FAILURE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x221;
-pub const ERROR_MACHINE_UNAVAILABLE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x222;
-pub const ERROR_NO_CONFIGMGR_SERVICES: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x223;
-pub const ERROR_INVALID_PROPPAGE_PROVIDER: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x224;
-pub const ERROR_NO_SUCH_DEVICE_INTERFACE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x225;
-pub const ERROR_DI_POSTPROCESSING_REQUIRED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x226;
-pub const ERROR_INVALID_COINSTALLER: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x227;
-pub const ERROR_NO_COMPAT_DRIVERS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x228;
-pub const ERROR_NO_DEVICE_ICON: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x229;
-pub const ERROR_INVALID_INF_LOGCONFIG: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22A;
-pub const ERROR_DI_DONT_INSTALL: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22B;
-pub const ERROR_INVALID_FILTER_DRIVER: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22C;
-pub const ERROR_NON_WINDOWS_NT_DRIVER: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22D;
-pub const ERROR_NON_WINDOWS_DRIVER: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22E;
-pub const ERROR_NO_CATALOG_FOR_OEM_INF: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22F;
-pub const ERROR_DEVINSTALL_QUEUE_NONNATIVE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x230;
-pub const ERROR_NOT_DISABLEABLE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x231;
-pub const ERROR_CANT_REMOVE_DEVINST: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x232;
-pub const ERROR_INVALID_TARGET: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x233;
-pub const ERROR_DRIVER_NONNATIVE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x234;
-pub const ERROR_IN_WOW64: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x235;
-pub const ERROR_SET_SYSTEM_RESTORE_POINT: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x236;
-pub const ERROR_SCE_DISABLED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x238;
-pub const ERROR_UNKNOWN_EXCEPTION: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x239;
-pub const ERROR_PNP_REGISTRY_ERROR: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x23A;
-pub const ERROR_REMOTE_REQUEST_UNSUPPORTED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x23B;
-pub const ERROR_NOT_AN_INSTALLED_OEM_INF: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x23C;
-pub const ERROR_INF_IN_USE_BY_DEVICES: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x23D;
-pub const ERROR_DI_FUNCTION_OBSOLETE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x23E;
-pub const ERROR_NO_AUTHENTICODE_CATALOG: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x23F;
-pub const ERROR_AUTHENTICODE_DISALLOWED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x240;
-pub const ERROR_AUTHENTICODE_TRUSTED_PUBLISHER: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x241;
-pub const ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x242;
-pub const ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x243;
-pub const ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x244;
-pub const ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x245;
-pub const ERROR_DEVICE_INSTALLER_NOT_READY: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x246;
-pub const ERROR_DRIVER_STORE_ADD_FAILED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x247;
-pub const ERROR_DEVICE_INSTALL_BLOCKED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x248;
-pub const ERROR_DRIVER_INSTALL_BLOCKED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x249;
-pub const ERROR_WRONG_INF_TYPE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x24A;
-pub const ERROR_FILE_HASH_NOT_IN_CATALOG: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x24B;
-pub const ERROR_DRIVER_STORE_DELETE_FAILED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x24C;
-pub const ERROR_UNRECOVERABLE_STACK_OVERFLOW: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x300;
-pub const EXCEPTION_SPAPI_UNRECOVERABLE_STACK_OVERFLOW: ::DWORD =
-    ERROR_UNRECOVERABLE_STACK_OVERFLOW;
-pub const ERROR_NO_DEFAULT_INTERFACE_DEVICE: ::DWORD = ERROR_NO_DEFAULT_DEVICE_INTERFACE;
-pub const ERROR_INTERFACE_DEVICE_ACTIVE: ::DWORD = ERROR_DEVICE_INTERFACE_ACTIVE;
-pub const ERROR_INTERFACE_DEVICE_REMOVED: ::DWORD = ERROR_DEVICE_INTERFACE_REMOVED;
-pub const ERROR_NO_SUCH_INTERFACE_DEVICE: ::DWORD = ERROR_NO_SUCH_DEVICE_INTERFACE;
-pub const ERROR_NOT_INSTALLED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x1000;
-pub const INFINFO_INF_SPEC_IS_HINF: ::DWORD = 1;
-pub const INFINFO_INF_NAME_IS_ABSOLUTE: ::DWORD = 2;
-pub const INFINFO_DEFAULT_SEARCH: ::DWORD = 3;
-pub const INFINFO_REVERSE_DEFAULT_SEARCH: ::DWORD = 4;
-pub const INFINFO_INF_PATH_LIST_SEARCH: ::DWORD = 5;
-pub const FILE_COMPRESSION_NONE: ::UINT = 0;
-pub const FILE_COMPRESSION_WINLZA: ::UINT = 1;
-pub const FILE_COMPRESSION_MSZIP: ::UINT = 2;
-pub const FILE_COMPRESSION_NTCAB: ::UINT = 3;
-pub const SRCLIST_TEMPORARY: ::DWORD = 0x00000001;
-pub const SRCLIST_NOBROWSE: ::DWORD = 0x00000002;
-pub const SRCLIST_SYSTEM: ::DWORD = 0x00000010;
-pub const SRCLIST_USER: ::DWORD = 0x00000020;
-pub const SRCLIST_SYSIFADMIN: ::DWORD = 0x00000040;
-pub const SRCLIST_SUBDIRS: ::DWORD = 0x00000100;
-pub const SRCLIST_APPEND: ::DWORD = 0x00000200;
-pub const SRCLIST_NOSTRIPPLATFORM: ::DWORD = 0x00000400;
-pub const IDF_NOBROWSE: ::DWORD = 0x00000001;
-pub const IDF_NOSKIP: ::DWORD = 0x00000002;
-pub const IDF_NODETAILS: ::DWORD = 0x00000004;
-pub const IDF_NOCOMPRESSED: ::DWORD = 0x00000008;
-pub const IDF_CHECKFIRST: ::DWORD = 0x00000100;
-pub const IDF_NOBEEP: ::DWORD = 0x00000200;
-pub const IDF_NOFOREGROUND: ::DWORD = 0x00000400;
-pub const IDF_WARNIFSKIP: ::DWORD = 0x00000800;
-pub const IDF_NOREMOVABLEMEDIAPROMPT: ::DWORD = 0x00001000;
-pub const IDF_USEDISKNAMEASPROMPT: ::DWORD = 0x00002000;
-pub const IDF_OEMDISK: ::DWORD = 0x80000000;
-pub const DPROMPT_SUCCESS: ::UINT = 0;
-pub const DPROMPT_CANCEL: ::UINT = 1;
-pub const DPROMPT_SKIPFILE: ::UINT = 2;
-pub const DPROMPT_BUFFERTOOSMALL: ::UINT = 3;
-pub const DPROMPT_OUTOFMEMORY: ::UINT = 4;
-pub const SETDIRID_NOT_FULL_PATH: ::DWORD = 0x00000001;
-pub const SRCINFO_PATH: ::UINT = 1;
-pub const SRCINFO_TAGFILE: ::UINT = 2;
-pub const SRCINFO_DESCRIPTION: ::UINT = 3;
-pub const SRCINFO_FLAGS: ::UINT = 4;
-pub const SRCINFO_TAGFILE2: ::UINT = 4;
-pub const SRC_FLAGS_CABFILE: ::UINT = 0x0010;
-pub const SP_COPY_DELETESOURCE: ::DWORD = 0x0000001;
-pub const SP_COPY_REPLACEONLY: ::DWORD = 0x0000002;
-pub const SP_COPY_NEWER: ::DWORD = 0x0000004;
-pub const SP_COPY_NEWER_OR_SAME: ::DWORD = SP_COPY_NEWER;
-pub const SP_COPY_NOOVERWRITE: ::DWORD = 0x0000008;
-pub const SP_COPY_NODECOMP: ::DWORD = 0x0000010;
-pub const SP_COPY_LANGUAGEAWARE: ::DWORD = 0x0000020;
-pub const SP_COPY_SOURCE_ABSOLUTE: ::DWORD = 0x0000040;
-pub const SP_COPY_SOURCEPATH_ABSOLUTE: ::DWORD = 0x0000080;
-pub const SP_COPY_IN_USE_NEEDS_REBOOT: ::DWORD = 0x0000100;
-pub const SP_COPY_FORCE_IN_USE: ::DWORD = 0x0000200;
-pub const SP_COPY_NOSKIP: ::DWORD = 0x0000400;
-pub const SP_FLAG_CABINETCONTINUATION: ::DWORD = 0x0000800;
-pub const SP_COPY_FORCE_NOOVERWRITE: ::DWORD = 0x0001000;
-pub const SP_COPY_FORCE_NEWER: ::DWORD = 0x0002000;
-pub const SP_COPY_WARNIFSKIP: ::DWORD = 0x0004000;
-pub const SP_COPY_NOBROWSE: ::DWORD = 0x0008000;
-pub const SP_COPY_NEWER_ONLY: ::DWORD = 0x0010000;
-pub const SP_COPY_RESERVED: ::DWORD = 0x0020000;
-pub const SP_COPY_OEMINF_CATALOG_ONLY: ::DWORD = 0x0040000;
-pub const SP_COPY_REPLACE_BOOT_FILE: ::DWORD = 0x0080000;
-pub const SP_COPY_NOPRUNE: ::DWORD = 0x0100000;
-pub const SP_COPY_OEM_F6_INF: ::DWORD = 0x0200000;
-pub const SP_COPY_ALREADYDECOMP: ::DWORD = 0x0400000;
-pub const SP_COPY_WINDOWS_SIGNED: ::DWORD = 0x1000000;
-pub const SP_COPY_PNPLOCKED: ::DWORD = 0x2000000;
-pub const SP_COPY_IN_USE_TRY_RENAME: ::DWORD = 0x4000000;
-pub const SP_COPY_INBOX_INF: ::DWORD = 0x8000000;
-pub const SP_COPY_HARDLINK: ::DWORD = 0x10000000;
-pub const SP_BACKUP_BACKUPPASS: ::DWORD = 0x00000001;
-pub const SP_BACKUP_DEMANDPASS: ::DWORD = 0x00000002;
-pub const SP_BACKUP_SPECIAL: ::DWORD = 0x00000004;
-pub const SP_BACKUP_BOOTFILE: ::DWORD = 0x00000008;
-pub const SPQ_SCAN_FILE_PRESENCE: ::DWORD = 0x00000001;
-pub const SPQ_SCAN_FILE_VALIDITY: ::DWORD = 0x00000002;
-pub const SPQ_SCAN_USE_CALLBACK: ::DWORD = 0x00000004;
-pub const SPQ_SCAN_USE_CALLBACKEX: ::DWORD = 0x00000008;
-pub const SPQ_SCAN_INFORM_USER: ::DWORD = 0x00000010;
-pub const SPQ_SCAN_PRUNE_COPY_QUEUE: ::DWORD = 0x00000020;
-pub const SPQ_SCAN_USE_CALLBACK_SIGNERINFO: ::DWORD = 0x00000040;
-pub const SPQ_SCAN_PRUNE_DELREN: ::DWORD = 0x00000080;
-pub const SPQ_SCAN_FILE_PRESENCE_WITHOUT_SOURCE: ::DWORD = 0x00000100;
-pub const SPQ_SCAN_FILE_COMPARISON: ::DWORD = 0x00000200;
-pub const SPQ_SCAN_ACTIVATE_DRP: ::DWORD = 0x00000400;
-pub const SPQ_DELAYED_COPY: ::DWORD = 0x00000001;
-pub const SPQ_FLAG_BACKUP_AWARE: ::DWORD = 0x00000001;
-pub const SPQ_FLAG_ABORT_IF_UNSIGNED: ::DWORD = 0x00000002;
-pub const SPQ_FLAG_FILES_MODIFIED: ::DWORD = 0x00000004;
-pub const SPQ_FLAG_DO_SHUFFLEMOVE: ::DWORD = 0x00000008;
-pub const SPQ_FLAG_VALID: ::DWORD = 0x0000000F;
-pub const SPOST_NONE: ::DWORD = 0;
-pub const SPOST_PATH: ::DWORD = 1;
-pub const SPOST_URL: ::DWORD = 2;
-pub const SPOST_MAX: ::DWORD = 3;
-pub const SUOI_FORCEDELETE: ::DWORD = 0x00000001;
-pub const SUOI_INTERNAL1: ::DWORD = 0x00000002;
-pub const SPDSL_IGNORE_DISK: ::UINT = 0x00000001;
-pub const SPDSL_DISALLOW_NEGATIVE_ADJUST: ::UINT = 0x00000002;
-pub const SPFILEQ_FILE_IN_USE: ::INT = 0x00000001;
-pub const SPFILEQ_REBOOT_RECOMMENDED: ::INT = 0x00000002;
-pub const SPFILEQ_REBOOT_IN_PROGRESS: ::INT = 0x00000004;
-pub const FLG_ADDREG_DELREG_BIT: ::DWORD = 0x00008000;
-pub const FLG_ADDREG_BINVALUETYPE: ::DWORD = 0x00000001;
-pub const FLG_ADDREG_NOCLOBBER: ::DWORD = 0x00000002;
-pub const FLG_ADDREG_DELVAL: ::DWORD = 0x00000004;
-pub const FLG_ADDREG_APPEND: ::DWORD = 0x00000008;
-pub const FLG_ADDREG_KEYONLY: ::DWORD = 0x00000010;
-pub const FLG_ADDREG_OVERWRITEONLY: ::DWORD = 0x00000020;
-pub const FLG_ADDREG_64BITKEY: ::DWORD = 0x00001000;
-pub const FLG_ADDREG_KEYONLY_COMMON: ::DWORD = 0x00002000;
-pub const FLG_ADDREG_32BITKEY: ::DWORD = 0x00004000;
-pub const FLG_ADDREG_TYPE_MASK: ::DWORD = 0xFFFF0000 | FLG_ADDREG_BINVALUETYPE;
-pub const FLG_ADDREG_TYPE_SZ: ::DWORD = 0x00000000;
-pub const FLG_ADDREG_TYPE_MULTI_SZ: ::DWORD = 0x00010000;
-pub const FLG_ADDREG_TYPE_EXPAND_SZ: ::DWORD = 0x00020000;
-pub const FLG_ADDREG_TYPE_BINARY: ::DWORD = 0x00000000 | FLG_ADDREG_BINVALUETYPE;
-pub const FLG_ADDREG_TYPE_DWORD: ::DWORD = 0x00010000 | FLG_ADDREG_BINVALUETYPE;
-pub const FLG_ADDREG_TYPE_NONE: ::DWORD = 0x00020000 | FLG_ADDREG_BINVALUETYPE;
-pub const FLG_DELREG_VALUE: ::DWORD = 0x00000000;
-pub const FLG_DELREG_TYPE_MASK: ::DWORD = FLG_ADDREG_TYPE_MASK;
-pub const FLG_DELREG_TYPE_SZ: ::DWORD = FLG_ADDREG_TYPE_SZ;
-pub const FLG_DELREG_TYPE_MULTI_SZ: ::DWORD = FLG_ADDREG_TYPE_MULTI_SZ;
-pub const FLG_DELREG_TYPE_EXPAND_SZ: ::DWORD = FLG_ADDREG_TYPE_EXPAND_SZ;
-pub const FLG_DELREG_TYPE_BINARY: ::DWORD = FLG_ADDREG_TYPE_BINARY;
-pub const FLG_DELREG_TYPE_DWORD: ::DWORD = FLG_ADDREG_TYPE_DWORD;
-pub const FLG_DELREG_TYPE_NONE: ::DWORD = FLG_ADDREG_TYPE_NONE;
-pub const FLG_DELREG_64BITKEY: ::DWORD = FLG_ADDREG_64BITKEY;
-pub const FLG_DELREG_KEYONLY_COMMON: ::DWORD = FLG_ADDREG_KEYONLY_COMMON;
-pub const FLG_DELREG_32BITKEY: ::DWORD = FLG_ADDREG_32BITKEY;
-pub const FLG_DELREG_OPERATION_MASK: ::DWORD = 0x000000FE;
-pub const FLG_DELREG_MULTI_SZ_DELSTRING: ::DWORD = FLG_DELREG_TYPE_MULTI_SZ | FLG_ADDREG_DELREG_BIT
-    | 0x00000002;
-pub const FLG_BITREG_CLEARBITS: ::DWORD = 0x00000000;
-pub const FLG_BITREG_SETBITS: ::DWORD = 0x00000001;
-pub const FLG_BITREG_64BITKEY: ::DWORD = 0x00001000;
-pub const FLG_BITREG_32BITKEY: ::DWORD = 0x00004000;
-pub const FLG_INI2REG_64BITKEY: ::DWORD = 0x00001000;
-pub const FLG_INI2REG_32BITKEY: ::DWORD = 0x00004000;
-pub const FLG_REGSVR_DLLREGISTER: ::DWORD = 0x00000001;
-pub const FLG_REGSVR_DLLINSTALL: ::DWORD = 0x00000002;
-pub const FLG_PROFITEM_CURRENTUSER: ::DWORD = 0x00000001;
-pub const FLG_PROFITEM_DELETE: ::DWORD = 0x00000002;
-pub const FLG_PROFITEM_GROUP: ::DWORD = 0x00000004;
-pub const FLG_PROFITEM_CSIDL: ::DWORD = 0x00000008;
-pub const FLG_ADDPROPERTY_NOCLOBBER: ::DWORD = 0x00000001;
-pub const FLG_ADDPROPERTY_OVERWRITEONLY: ::DWORD = 0x00000002;
-pub const FLG_ADDPROPERTY_APPEND: ::DWORD = 0x00000004;
-pub const FLG_ADDPROPERTY_OR: ::DWORD = 0x00000008;
-pub const FLG_ADDPROPERTY_AND: ::DWORD = 0x00000010;
-pub const FLG_DELPROPERTY_MULTI_SZ_DELSTRING: ::DWORD = 0x00000001;
-pub const SPINST_LOGCONFIG: ::UINT = 0x00000001;
-pub const SPINST_INIFILES: ::UINT = 0x00000002;
-pub const SPINST_REGISTRY: ::UINT = 0x00000004;
-pub const SPINST_INI2REG: ::UINT = 0x00000008;
-pub const SPINST_FILES: ::UINT = 0x00000010;
-pub const SPINST_BITREG: ::UINT = 0x00000020;
-pub const SPINST_REGSVR: ::UINT = 0x00000040;
-pub const SPINST_UNREGSVR: ::UINT = 0x00000080;
-pub const SPINST_PROFILEITEMS: ::UINT = 0x00000100;
-pub const SPINST_COPYINF: ::UINT = 0x00000200;
-pub const SPINST_PROPERTIES: ::UINT = 0x00000400;
-pub const SPINST_ALL: ::UINT = 0x000007ff;
-pub const SPINST_SINGLESECTION: ::UINT = 0x00010000;
-pub const SPINST_LOGCONFIG_IS_FORCED: ::UINT = 0x00020000;
-pub const SPINST_LOGCONFIGS_ARE_OVERRIDES: ::UINT = 0x00040000;
-pub const SPINST_REGISTERCALLBACKAWARE: ::UINT = 0x00080000;
-pub const SPINST_DEVICEINSTALL: ::UINT = 0x00100000;
-pub const SPSVCINST_TAGTOFRONT: ::DWORD = 0x00000001;
-pub const SPSVCINST_ASSOCSERVICE: ::DWORD = 0x00000002;
-pub const SPSVCINST_DELETEEVENTLOGENTRY: ::DWORD = 0x00000004;
-pub const SPSVCINST_NOCLOBBER_DISPLAYNAME: ::DWORD = 0x00000008;
-pub const SPSVCINST_NOCLOBBER_STARTTYPE: ::DWORD = 0x00000010;
-pub const SPSVCINST_NOCLOBBER_ERRORCONTROL: ::DWORD = 0x00000020;
-pub const SPSVCINST_NOCLOBBER_LOADORDERGROUP: ::DWORD = 0x00000040;
-pub const SPSVCINST_NOCLOBBER_DEPENDENCIES: ::DWORD = 0x00000080;
-pub const SPSVCINST_NOCLOBBER_DESCRIPTION: ::DWORD = 0x00000100;
-pub const SPSVCINST_STOPSERVICE: ::DWORD = 0x00000200;
-pub const SPSVCINST_CLOBBER_SECURITY: ::DWORD = 0x00000400;
-pub const SPSVCINST_STARTSERVICE: ::DWORD = 0x00000800;
-pub const SPSVCINST_NOCLOBBER_REQUIREDPRIVILEGES: ::DWORD = 0x00001000;
-pub type HSPFILELOG = ::PVOID;
-pub const SPFILELOG_SYSTEMLOG: ::DWORD = 0x00000001;
-pub const SPFILELOG_FORCENEW: ::DWORD = 0x00000002;
-pub const SPFILELOG_QUERYONLY: ::DWORD = 0x00000004;
-pub const SPFILELOG_OEMFILE: ::DWORD = 0x00000001;
-ENUM!{enum SetupFileLogInfo {
-    SetupFileLogSourceFilename,
-    SetupFileLogChecksum,
-    SetupFileLogDiskTagfile,
-    SetupFileLogDiskDescription,
-    SetupFileLogOtherInfo,
-    SetupFileLogMax,
-}}
-pub type LogSeverity = ::DWORD;
-pub const LogSevInformation: LogSeverity = 0x00000000;
-pub const LogSevWarning: LogSeverity = 0x00000001;
-pub const LogSevError: LogSeverity = 0x00000002;
-pub const LogSevFatalError: LogSeverity = 0x00000003;
-pub const LogSevMaximum: LogSeverity = 0x00000004;
-pub const DICD_GENERATE_ID: ::DWORD = 0x00000001;
-pub const DICD_INHERIT_CLASSDRVS: ::DWORD = 0x00000002;
-pub const DIOD_INHERIT_CLASSDRVS: ::DWORD = 0x00000002;
-pub const DIOD_CANCEL_REMOVE: ::DWORD = 0x00000004;
-pub const DIODI_NO_ADD: ::DWORD = 0x00000001;
-pub const SPRDI_FIND_DUPS: ::DWORD = 0x00000001;
-pub const SPDIT_NODRIVER: ::DWORD = 0x00000000;
-pub const SPDIT_CLASSDRIVER: ::DWORD = 0x00000001;
-pub const SPDIT_COMPATDRIVER: ::DWORD = 0x00000002;
-pub const DIGCF_DEFAULT: ::DWORD = 0x00000001;
-pub const DIGCF_PRESENT: ::DWORD = 0x00000002;
-pub const DIGCF_ALLCLASSES: ::DWORD = 0x00000004;
-pub const DIGCF_PROFILE: ::DWORD = 0x00000008;
-pub const DIGCF_DEVICEINTERFACE: ::DWORD = 0x00000010;
-pub const DIBCI_NOINSTALLCLASS: ::DWORD = 0x00000001;
-pub const DIBCI_NODISPLAYCLASS: ::DWORD = 0x00000002;
-pub const DIOCR_INSTALLER: ::DWORD = 0x00000001;
-pub const DIOCR_INTERFACE: ::DWORD = 0x00000002;
-pub const DIREG_DEV: ::DWORD = 0x00000001;
-pub const DIREG_DRV: ::DWORD = 0x00000002;
-pub const DIREG_BOTH: ::DWORD = 0x00000004;
-pub const DICLASSPROP_INSTALLER: ::DWORD = 0x00000001;
-pub const DICLASSPROP_INTERFACE: ::DWORD = 0x00000002;
-pub const SPDRP_DEVICEDESC: ::DWORD = 0x00000000;
-pub const SPDRP_HARDWAREID: ::DWORD = 0x00000001;
-pub const SPDRP_COMPATIBLEIDS: ::DWORD = 0x00000002;
-pub const SPDRP_UNUSED0: ::DWORD = 0x00000003;
-pub const SPDRP_SERVICE: ::DWORD = 0x00000004;
-pub const SPDRP_UNUSED1: ::DWORD = 0x00000005;
-pub const SPDRP_UNUSED2: ::DWORD = 0x00000006;
-pub const SPDRP_CLASS: ::DWORD = 0x00000007;
-pub const SPDRP_CLASSGUID: ::DWORD = 0x00000008;
-pub const SPDRP_DRIVER: ::DWORD = 0x00000009;
-pub const SPDRP_CONFIGFLAGS: ::DWORD = 0x0000000A;
-pub const SPDRP_MFG: ::DWORD = 0x0000000B;
-pub const SPDRP_FRIENDLYNAME: ::DWORD = 0x0000000C;
-pub const SPDRP_LOCATION_INFORMATION: ::DWORD = 0x0000000D;
-pub const SPDRP_PHYSICAL_DEVICE_OBJECT_NAME: ::DWORD = 0x0000000E;
-pub const SPDRP_CAPABILITIES: ::DWORD = 0x0000000F;
-pub const SPDRP_UI_NUMBER: ::DWORD = 0x00000010;
-pub const SPDRP_UPPERFILTERS: ::DWORD = 0x00000011;
-pub const SPDRP_LOWERFILTERS: ::DWORD = 0x00000012;
-pub const SPDRP_BUSTYPEGUID: ::DWORD = 0x00000013;
-pub const SPDRP_LEGACYBUSTYPE: ::DWORD = 0x00000014;
-pub const SPDRP_BUSNUMBER: ::DWORD = 0x00000015;
-pub const SPDRP_ENUMERATOR_NAME: ::DWORD = 0x00000016;
-pub const SPDRP_SECURITY: ::DWORD = 0x00000017;
-pub const SPDRP_SECURITY_SDS: ::DWORD = 0x00000018;
-pub const SPDRP_DEVTYPE: ::DWORD = 0x00000019;
-pub const SPDRP_EXCLUSIVE: ::DWORD = 0x0000001A;
-pub const SPDRP_CHARACTERISTICS: ::DWORD = 0x0000001B;
-pub const SPDRP_ADDRESS: ::DWORD = 0x0000001C;
-pub const SPDRP_UI_NUMBER_DESC_FORMAT: ::DWORD = 0x0000001D;
-pub const SPDRP_DEVICE_POWER_DATA: ::DWORD = 0x0000001E;
-pub const SPDRP_REMOVAL_POLICY: ::DWORD = 0x0000001F;
-pub const SPDRP_REMOVAL_POLICY_HW_DEFAULT: ::DWORD = 0x00000020;
-pub const SPDRP_REMOVAL_POLICY_OVERRIDE: ::DWORD = 0x00000021;
-pub const SPDRP_INSTALL_STATE: ::DWORD = 0x00000022;
-pub const SPDRP_LOCATION_PATHS: ::DWORD = 0x00000023;
-pub const SPDRP_BASE_CONTAINERID: ::DWORD = 0x00000024;
-pub const SPDRP_MAXIMUM_PROPERTY: ::DWORD = 0x00000025;
-pub const SPCRP_UPPERFILTERS: ::DWORD = 0x00000011;
-pub const SPCRP_LOWERFILTERS: ::DWORD = 0x00000012;
-pub const SPCRP_SECURITY: ::DWORD = 0x00000017;
-pub const SPCRP_SECURITY_SDS: ::DWORD = 0x00000018;
-pub const SPCRP_DEVTYPE: ::DWORD = 0x00000019;
-pub const SPCRP_EXCLUSIVE: ::DWORD = 0x0000001A;
-pub const SPCRP_CHARACTERISTICS: ::DWORD = 0x0000001B;
-pub const SPCRP_MAXIMUM_PROPERTY: ::DWORD = 0x0000001C;
-pub const DMI_MASK: ::DWORD = 0x00000001;
-pub const DMI_BKCOLOR: ::DWORD = 0x00000002;
-pub const DMI_USERECT: ::DWORD = 0x00000004;
-pub const DIGCDP_FLAG_BASIC: ::DWORD = 0x00000001;
-pub const DIGCDP_FLAG_ADVANCED: ::DWORD = 0x00000002;
-pub const DIGCDP_FLAG_REMOTE_BASIC: ::DWORD = 0x00000003;
-pub const DIGCDP_FLAG_REMOTE_ADVANCED: ::DWORD = 0x00000004;
-pub const IDI_RESOURCEFIRST: ::c_int = 159;
-pub const IDI_RESOURCE: ::c_int = 159;
-pub const IDI_RESOURCELAST: ::c_int = 161;
-pub const IDI_RESOURCEOVERLAYFIRST: ::c_int = 161;
-pub const IDI_RESOURCEOVERLAYLAST: ::c_int = 161;
-pub const IDI_CONFLICT: ::c_int = 161;
-pub const IDI_CLASSICON_OVERLAYFIRST: ::c_int = 500;
-pub const IDI_CLASSICON_OVERLAYLAST: ::c_int = 502;
-pub const IDI_PROBLEM_OVL: ::c_int = 500;
-pub const IDI_DISABLED_OVL: ::c_int = 501;
-pub const IDI_FORCED_OVL: ::c_int = 502;
-pub const SPWPT_SELECTDEVICE: ::DWORD = 0x00000001;
-pub const SPWP_USE_DEVINFO_DATA: ::DWORD = 0x00000001;
-STRUCT!{nodebug struct SP_INF_SIGNER_INFO_V1_A {
-    cbSize: ::DWORD,
-    CatalogFile: [::CHAR; ::MAX_PATH],
-    DigitalSigner: [::CHAR; ::MAX_PATH],
-    DigitalSignerVersion: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_INF_SIGNER_INFO_V1_A = *mut SP_INF_SIGNER_INFO_V1_A;
-STRUCT!{nodebug struct SP_INF_SIGNER_INFO_V1_W {
-    cbSize: ::DWORD,
-    CatalogFile: [::WCHAR; ::MAX_PATH],
-    DigitalSigner: [::WCHAR; ::MAX_PATH],
-    DigitalSignerVersion: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_INF_SIGNER_INFO_V1_W = *mut SP_INF_SIGNER_INFO_V1_W;
-STRUCT!{nodebug struct SP_INF_SIGNER_INFO_V2_A {
-    cbSize: ::DWORD,
-    CatalogFile: [::CHAR; ::MAX_PATH],
-    DigitalSigner: [::CHAR; ::MAX_PATH],
-    DigitalSignerVersion: [::CHAR; ::MAX_PATH],
-    SignerScore: ::DWORD,
-}}
-pub type PSP_INF_SIGNER_INFO_V2_A = *mut SP_INF_SIGNER_INFO_V2_A;
-STRUCT!{nodebug struct SP_INF_SIGNER_INFO_V2_W {
-    cbSize: ::DWORD,
-    CatalogFile: [::WCHAR; ::MAX_PATH],
-    DigitalSigner: [::WCHAR; ::MAX_PATH],
-    DigitalSignerVersion: [::WCHAR; ::MAX_PATH],
-    SignerScore: ::DWORD,
-}}
-pub type PSP_INF_SIGNER_INFO_V2_W = *mut SP_INF_SIGNER_INFO_V2_W;
-pub type SP_INF_SIGNER_INFO_A = SP_INF_SIGNER_INFO_V2_A;
-pub type PSP_INF_SIGNER_INFO_A = PSP_INF_SIGNER_INFO_V2_A;
-pub type SP_INF_SIGNER_INFO_W = SP_INF_SIGNER_INFO_V2_W;
-pub type PSP_INF_SIGNER_INFO_W = PSP_INF_SIGNER_INFO_V2_W;
-pub const SIGNERSCORE_UNKNOWN: ::DWORD = 0xFF000000;
-pub const SIGNERSCORE_W9X_SUSPECT: ::DWORD = 0xC0000000;
-pub const SIGNERSCORE_UNSIGNED: ::DWORD = 0x80000000;
-pub const SIGNERSCORE_AUTHENTICODE: ::DWORD = 0x0F000000;
-pub const SIGNERSCORE_WHQL: ::DWORD = 0x0D000005;
-pub const SIGNERSCORE_UNCLASSIFIED: ::DWORD = 0x0D000004;
-pub const SIGNERSCORE_INBOX: ::DWORD = 0x0D000003;
-pub const SIGNERSCORE_LOGO_STANDARD: ::DWORD = 0x0D000002;
-pub const SIGNERSCORE_LOGO_PREMIUM: ::DWORD = 0x0D000001;
-pub const SIGNERSCORE_MASK: ::DWORD = 0xFF000000;
-pub const SIGNERSCORE_SIGNED_MASK: ::DWORD = 0xF0000000;
-pub const DICUSTOMDEVPROP_MERGE_MULTISZ: ::DWORD = 0x00000001;
-pub const SCWMI_CLOBBER_SECURITY: ::DWORD = 0x00000001;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shellapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shellapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shellapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shellapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-// STUB
-DECLARE_HANDLE!(HDROP, HDROP__);
-
-pub const NIM_ADD: ::DWORD = 0x00000000;
-pub const NIM_MODIFY: ::DWORD = 0x00000001;
-pub const NIM_DELETE: ::DWORD = 0x00000002;
-pub const NIM_SETFOCUS: ::DWORD = 0x00000003;
-pub const NIM_SETVERSION: ::DWORD = 0x00000004;
-pub const NIF_MESSAGE: ::UINT = 0x00000001;
-pub const NIF_ICON: ::UINT = 0x00000002;
-pub const NIF_TIP: ::UINT = 0x00000004;
-pub const NIF_STATE: ::UINT = 0x00000008;
-pub const NIF_INFO: ::UINT = 0x00000010;
-pub const NIF_GUID: ::UINT = 0x00000020;
-pub const NIF_REALTIME: ::UINT = 0x00000040;
-pub const NIF_SHOWTIP: ::UINT = 0x00000080;
-pub const NOTIFYICON_VERSION: ::UINT = 3;
-pub const NOTIFYICON_VERSION_4: ::UINT = 4;
-
-STRUCT!{nodebug struct NOTIFYICONDATAA {
-    cbSize: ::DWORD,
-    hWnd: ::HWND,
-    uID: ::UINT,
-    uFlags: ::UINT,
-    uCallbackMessage: ::UINT,
-    hIcon: ::HICON,
-    szTip: [::CHAR; 128],
-    dwState: ::DWORD,
-    dwStateMask: ::DWORD,
-    szInfo: [::CHAR; 256],
-    uTimeout: ::UINT,
-    szInfoTitle: [::CHAR; 64],
-    dwInfoFlags: ::DWORD,
-    guidItem: ::GUID,
-    hBalloonIcon: ::HICON,
-}}
-UNION!(NOTIFYICONDATAA, uTimeout, uTimeout, uTimeout_mut, ::UINT);
-UNION!(NOTIFYICONDATAA, uTimeout, uVersion, uVersion_mut, ::UINT);
-pub type PNOTIFYICONDATAA = *mut NOTIFYICONDATAA;
-
-STRUCT!{nodebug struct NOTIFYICONDATAW {
-    cbSize: ::DWORD,
-    hWnd: ::HWND,
-    uID: ::UINT,
-    uFlags: ::UINT,
-    uCallbackMessage: ::UINT,
-    hIcon: ::HICON,
-    szTip: [::WCHAR; 128],
-    dwState: ::DWORD,
-    dwStateMask: ::DWORD,
-    szInfo: [::WCHAR; 256],
-    uTimeout: ::UINT,
-    szInfoTitle: [::WCHAR; 64],
-    dwInfoFlags: ::DWORD,
-    guidItem: ::GUID,
-    hBalloonIcon: ::HICON,
-}}
-UNION!(NOTIFYICONDATAW, uTimeout, uTimeout, uTimeout_mut, ::UINT);
-UNION!(NOTIFYICONDATAW, uTimeout, uVersion, uVersion_mut, ::UINT); // used with NIM_SETVERSION, values 0, 3 and 4
-pub type PNOTIFYICONDATAW = *mut NOTIFYICONDATAW;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shellscalingapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shellscalingapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shellscalingapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shellscalingapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-// ShellScalingApi.h
-ENUM!{enum PROCESS_DPI_AWARENESS {
-    Process_DPI_Unaware = 0,
-    Process_System_DPI_Aware  = 1,
-    Process_Per_Monitor_DPI_Aware = 2,
-}}
-ENUM!{enum SHELL_UI_COMPONENT {
-    SHELL_UI_COMPONENT_TASKBARS = 0,
-    SHELL_UI_COMPONENT_NOTIFICATIONAREA = 1,
-    SHELL_UI_COMPONENT_DESKBAND = 2,
-}}
-ENUM!{enum MONITOR_DPI_TYPE {
-    MDT_EFFECTIVE_DPI = 0,
-    MDT_ANGULAR_DPI = 1,
-    MDT_RAW_DPI = 2,
-}}
-pub const MDT_DEFAULT: MONITOR_DPI_TYPE = MDT_EFFECTIVE_DPI;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shlguid.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shlguid.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shlguid.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shlguid.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shlobj.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shlobj.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shlobj.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shlobj.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-// Copyright © 2015, Peter Atashian, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-pub const INVALID_HANDLE_VALUE: ::HANDLE = -1isize as ::HANDLE;
-pub type GPFIDL_FLAGS = ::c_int;
-ENUM!{enum KNOWN_FOLDER_FLAG {
-    KF_FLAG_DEFAULT = 0x00000000,
-    KF_FLAG_NO_APPCONTAINER_REDIRECTION = 0x00010000,
-    KF_FLAG_CREATE = 0x00008000,
-    KF_FLAG_DONT_VERIFY = 0x00004000,
-    KF_FLAG_DONT_UNEXPAND = 0x00002000,
-    KF_FLAG_NO_ALIAS = 0x00001000,
-    KF_FLAG_INIT = 0x00000800,
-    KF_FLAG_DEFAULT_PATH = 0x00000400,
-    KF_FLAG_NOT_PARENT_RELATIVE = 0x00000200,
-    KF_FLAG_SIMPLE_IDLIST = 0x00000100,
-    KF_FLAG_ALIAS_ONLY = 0x80000000,
-}}
-pub const IDO_SHGIOI_SHARE: ::c_int = 0x0FFFFFFF;
-pub const IDO_SHGIOI_LINK: ::c_int = 0x0FFFFFFE;
-// Yes, these values are supposed to overflow. Blame Microsoft.
-pub const IDO_SHGIOI_SLOWFILE: ::c_int = 0xFFFFFFFDu32 as ::c_int;
-pub const IDO_SHGIOI_DEFAULT: ::c_int = 0xFFFFFFFCu32 as ::c_int;
-pub const GPFIDL_DEFAULT: GPFIDL_FLAGS = 0x0000;
-pub const GPFIDL_ALTNAME: GPFIDL_FLAGS = 0x0001;
-pub const GPFIDL_UNCPRINTER: GPFIDL_FLAGS = 0x0002;
-pub const OFASI_EDIT: ::DWORD = 0x0001;
-pub const OFASI_OPENDESKTOP: ::DWORD = 0x0002;
-// 1204
-pub const CSIDL_DESKTOP: ::c_int = 0x0000;
-pub const CSIDL_INTERNET: ::c_int = 0x0001;
-pub const CSIDL_PROGRAMS: ::c_int = 0x0002;
-pub const CSIDL_CONTROLS: ::c_int = 0x0003;
-pub const CSIDL_PRINTERS: ::c_int = 0x0004;
-pub const CSIDL_PERSONAL: ::c_int = 0x0005;
-pub const CSIDL_FAVORITES: ::c_int = 0x0006;
-pub const CSIDL_STARTUP: ::c_int = 0x0007;
-pub const CSIDL_RECENT: ::c_int = 0x0008;
-pub const CSIDL_SENDTO: ::c_int = 0x0009;
-pub const CSIDL_BITBUCKET: ::c_int = 0x000a;
-pub const CSIDL_STARTMENU: ::c_int = 0x000b;
-pub const CSIDL_MYDOCUMENTS: ::c_int = CSIDL_PERSONAL;
-pub const CSIDL_MYMUSIC: ::c_int = 0x000d;
-pub const CSIDL_MYVIDEO: ::c_int = 0x000e;
-pub const CSIDL_DESKTOPDIRECTORY: ::c_int = 0x0010;
-pub const CSIDL_DRIVES: ::c_int = 0x0011;
-pub const CSIDL_NETWORK: ::c_int = 0x0012;
-pub const CSIDL_NETHOOD: ::c_int = 0x0013;
-pub const CSIDL_FONTS: ::c_int = 0x0014;
-pub const CSIDL_TEMPLATES: ::c_int = 0x0015;
-pub const CSIDL_COMMON_STARTMENU: ::c_int = 0x0016;
-pub const CSIDL_COMMON_PROGRAMS: ::c_int = 0x0017;
-pub const CSIDL_COMMON_STARTUP: ::c_int = 0x0018;
-pub const CSIDL_COMMON_DESKTOPDIRECTORY: ::c_int = 0x0019;
-pub const CSIDL_APPDATA: ::c_int = 0x001a;
-pub const CSIDL_PRINTHOOD: ::c_int = 0x001b;
-pub const CSIDL_LOCAL_APPDATA: ::c_int = 0x001c;
-pub const CSIDL_ALTSTARTUP: ::c_int = 0x001d;
-pub const CSIDL_COMMON_ALTSTARTUP: ::c_int = 0x001e;
-pub const CSIDL_COMMON_FAVORITES: ::c_int = 0x001f;
-pub const CSIDL_INTERNET_CACHE: ::c_int = 0x0020;
-pub const CSIDL_COOKIES: ::c_int = 0x0021;
-pub const CSIDL_HISTORY: ::c_int = 0x0022;
-pub const CSIDL_COMMON_APPDATA: ::c_int = 0x0023;
-pub const CSIDL_WINDOWS: ::c_int = 0x0024;
-pub const CSIDL_SYSTEM: ::c_int = 0x0025;
-pub const CSIDL_PROGRAM_FILES: ::c_int = 0x0026;
-pub const CSIDL_MYPICTURES: ::c_int = 0x0027;
-pub const CSIDL_PROFILE: ::c_int = 0x0028;
-pub const CSIDL_SYSTEMX86: ::c_int = 0x0029;
-pub const CSIDL_PROGRAM_FILESX86: ::c_int = 0x002a;
-pub const CSIDL_PROGRAM_FILES_COMMON: ::c_int = 0x002b;
-pub const CSIDL_PROGRAM_FILES_COMMONX86: ::c_int = 0x002c;
-pub const CSIDL_COMMON_TEMPLATES: ::c_int = 0x002d;
-pub const CSIDL_COMMON_DOCUMENTS: ::c_int = 0x002e;
-pub const CSIDL_COMMON_ADMINTOOLS: ::c_int = 0x002f;
-pub const CSIDL_ADMINTOOLS: ::c_int = 0x0030;
-pub const CSIDL_CONNECTIONS: ::c_int = 0x0031;
-pub const CSIDL_COMMON_MUSIC: ::c_int = 0x0035;
-pub const CSIDL_COMMON_PICTURES: ::c_int = 0x0036;
-pub const CSIDL_COMMON_VIDEO: ::c_int = 0x0037;
-pub const CSIDL_RESOURCES: ::c_int = 0x0038;
-pub const CSIDL_RESOURCES_LOCALIZED: ::c_int = 0x0039;
-pub const CSIDL_COMMON_OEM_LINKS: ::c_int = 0x003a;
-pub const CSIDL_CDBURN_AREA: ::c_int = 0x003b;
-pub const CSIDL_COMPUTERSNEARME: ::c_int = 0x003d;
-pub const CSIDL_FLAG_CREATE: ::c_int = 0x8000;
-pub const CSIDL_FLAG_DONT_VERIFY: ::c_int = 0x4000;
-pub const CSIDL_FLAG_DONT_UNEXPAND: ::c_int = 0x2000;
-pub const CSIDL_FLAG_NO_ALIAS: ::c_int = 0x1000;
-pub const CSIDL_FLAG_PER_USER_INIT: ::c_int = 0x0800;
-pub const CSIDL_FLAG_MASK: ::c_int = 0xff00;
-//1312
-pub const SHGFP_TYPE_CURRENT: ::DWORD = 0;
-pub const SHGFP_TYPE_DEFAULT: ::DWORD = 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shobjidl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shobjidl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shobjidl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shobjidl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,652 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-//Terrible forward declarations that need to be filled in
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenu;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenu2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenu3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExecuteCommand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPersistFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRunnableTask;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellTaskScheduler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IQueryCodePage;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPersistFolder2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPersistFolder3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPersistIDList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumIDList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumFullIDList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileSyncMergeHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithFolderEnumMode;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IParseAndCreateItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumExtraSearch;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellFolder2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderViewOptions;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellView;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellView2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellView3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderView;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISearchBoxInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderView2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderViewSettings;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviewHandlerVisuals;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IVisualProperties;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICommDlgBrowser;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICommDlgBrowser2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICommDlgBrowser3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IColumnManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderFilterSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderFilter;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInputObjectSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInputObject;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInputObject2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellIcon;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellBrowser;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IProfferService;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellItem2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellItemImageFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUserAccountChangeCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumShellItems;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITransferAdviseSink;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITransferSource;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumResources;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellItemResources;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITransferDestination;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IStreamAsync;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IStreamUnbufferedInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeWithItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithSelection;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithBackReferences;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPropertyUI;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICategoryProvider;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICategorizer;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDropTargetHelper;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDragSourceHelper;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDragSourceHelper2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellLinkA;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellLinkW;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellLinkDataList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IResolveShellLink;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IActionProgressDialog;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHWEventHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHWEventHandler2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IQueryCancelAutoPlay;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDynamicHWHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IActionProgress;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellExtInit;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellPropSheetExt;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRemoteComputer;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IQueryContinue;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithCancelEvent;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUserNotification;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUserNotificationCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUserNotification2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IItemNameLimits;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISearchFolderItemFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExtractImage;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExtractImage2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IThumbnailHandlerFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IParentAndItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDockingWindow;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDeskBand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDeskBandInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDeskBand2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITaskbarList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITaskbarList2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITaskbarList3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITaskbarList4;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IStartMenuPinnedList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICDBurn;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IWizardSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IWizardExtension;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IWebWizardExtension;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPublishingWizard;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderViewHost;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerBrowserEvents;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerBrowser;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAccessibleObject;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IResultsFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumObjects;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IOperationsProgressDialog;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IIOCancelInformation;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileOperation;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectProvider;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INamespaceWalkCB;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INamespaceWalkCB2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INamespaceWalk;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAutoCompleteDropDown;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IBandSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICDBurnExt;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenuSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumReadyCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumerableView;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInsertItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IMenuBand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderBandPriv;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRegTreeItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IImageRecompress;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDeskBar;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IMenuPopup;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileIsInUse;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationAssociationRegistration;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationAssociationRegistrationUI;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDelegateFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IBrowserFrameOptions;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INewWindowManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAttachmentExecute;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellMenuCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellMenu;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellRunDll;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IKnownFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IKnownFolderManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISharingConfigurationManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviousVersionsInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRelatedItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IIdentityName;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDelegateItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICurrentItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITransferMediumItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUseToBrowseItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDisplayItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IViewStateIdentityItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviewItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDestinationStreamFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INewMenuClient;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeWithBindCtx;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControl;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControl2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControlEvents;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControlDropHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeAccessible;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControlCustomDraw;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControlFolderCapabilities;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviewHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviewHandlerFrame;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITrayDeskBand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IBandHost;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerPaneVisibility;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenuCB;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDefaultExtractIconInit;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerCommand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerCommandState;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeCommand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumExplorerCommand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerCommandProvider;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IMarkupCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IControlMarkup;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeNetworkFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IOpenControlPanel;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IComputerInfoChangeNotify;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileSystemBindData;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileSystemBindData2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICustomDestinationList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationDestinations;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationDocumentLists;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithAppUserModelID;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithProgID;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUpdateIDList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDesktopGadget;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDesktopWallpaper;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHomeGroup;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeWithPropertyStore;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IOpenSearchSource;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellLibrary;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDefaultFolderMenuInitialize;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationActivationManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAssocHandlerInvoker;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAssocHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumAssocHandlers;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDataObjectProvider;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDataTransferManagerInterop;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFrameworkInputPaneHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFrameworkInputPane;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAccessibilityDockingServiceCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAccessibilityDockingService;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAppVisibilityEvents;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAppVisibility;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPackageExecutionStateChangeNotification;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPackageDebugSettings;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISuspensionDependencyManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExecuteCommandApplicationHostEnvironment;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExecuteCommandHost;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationDesignModeSettings;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationDesignModeSettings2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ILaunchTargetMonitor;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ILaunchSourceViewSizePreference;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ILaunchTargetViewSizePreference;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ILaunchSourceAppUserModelId;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeWithWindow;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHandlerInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHandlerActivationHost;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContactManagerInterop;
-//4498
-pub type SFGAOF = ::ULONG;
-//9466
-ENUM!{enum SIGDN {
-    SIGDN_NORMALDISPLAY = 0,
-    SIGDN_PARENTRELATIVEPARSING = 0x80018001,
-    SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000,
-    SIGDN_PARENTRELATIVEEDITING = 0x80031001,
-    SIGDN_DESKTOPABSOLUTEEDITING = 0x8004c000,
-    SIGDN_FILESYSPATH = 0x80058000,
-    SIGDN_URL = 0x80068000,
-    SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007c001,
-    SIGDN_PARENTRELATIVE = 0x80080001,
-    SIGDN_PARENTRELATIVEFORUI = 0x80094001,
-}}
-ENUM!{enum SICHINTF {
-    SICHINT_DISPLAY = 0,
-    SICHINT_ALLFIELDS = 0x80000000,
-    SICHINT_CANONICAL = 0x10000000,
-    SICHINT_TEST_FILESYSPATH_IF_NOT_EQUAL = 0x20000000,
-}}
-//9498
-RIDL!(
-interface IShellItem(IShellItemVtbl): IUnknown(IUnknownVtbl) {
-    fn BindToHandler(
-        &mut self, pbc: *mut ::IBindCtx, bhid: ::REFGUID, riid: ::REFIID, ppv: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetParent(&mut self, ppsi: *mut *mut IShellItem) -> ::HRESULT,
-    fn GetDisplayName(&mut self, sigdnName: SIGDN, ppszName: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetAttributes(&mut self, sfgaoMask: SFGAOF, psfgaoAttribs: *mut SFGAOF) -> ::HRESULT,
-    fn Compare(&mut self, psi: *mut IShellItem, hint: SICHINTF, piOrder: *mut ::c_int) -> ::HRESULT
-}
-);
-//11963
-pub type IFileOperationProgressSink = ::IUnknown; // TODO
-pub type IShellItemArray = ::IUnknown; // TODO
-//20869
-RIDL!(
-interface IModalWindow(IModalWindowVtbl): IUnknown(IUnknownVtbl) {
-    fn Show(&mut self, hwndOwner: ::HWND) -> ::HRESULT
-}
-);
-//22307
-ENUM!{enum FDE_OVERWRITE_RESPONSE {
-    FDEOR_DEFAULT = 0,
-    FDEOR_ACCEPT = 1,
-    FDEOR_REFUSE = 2,
-}}
-ENUM!{enum FDE_SHAREVIOLATION_RESPONSE {
-    FDESVR_DEFAULT = 0,
-    FDESVR_ACCEPT = 1,
-    FDESVR_REFUSE = 2,
-}}
-ENUM!{enum FDAP {
-    FDAP_BOTTOM = 0,
-    FDAP_TOP = 1,
-}}
-RIDL!(
-interface IFileDialogEvents(IFileDialogEventsVtbl): IUnknown(IUnknownVtbl) {
-    fn OnFileOk(&mut self, pfd: *mut IFileDialog) -> ::HRESULT,
-    fn OnFolderChanging(&mut self, pfd: *mut IFileDialog, psiFolder: *mut IShellItem) -> ::HRESULT,
-    fn OnFolderChange(&mut self, pfd: *mut IFileDialog) -> ::HRESULT,
-    fn OnSelectionChange(&mut self, pfd: *mut IFileDialog) -> ::HRESULT,
-    fn OnShareViolation(
-        &mut self, pfd: *mut IFileDialog, psi: *mut IShellItem,
-        pResponse: *mut FDE_SHAREVIOLATION_RESPONSE
-    ) -> ::HRESULT,
-    fn OnTypeChange(&mut self, pfd: *mut IFileDialog) -> ::HRESULT,
-    fn OnOverwrite(
-        &mut self, pfd: *mut IFileDialog, psi: *mut IShellItem,
-        pResponse: *mut FDE_OVERWRITE_RESPONSE
-    ) -> ::HRESULT
-}
-);
-FLAGS!{enum FILEOPENDIALOGOPTIONS {
-    FOS_OVERWRITEPROMPT = 0x2,
-    FOS_STRICTFILETYPES = 0x4,
-    FOS_NOCHANGEDIR = 0x8,
-    FOS_PICKFOLDERS = 0x20,
-    FOS_FORCEFILESYSTEM = 0x40,
-    FOS_ALLNONSTORAGEITEMS = 0x80,
-    FOS_NOVALIDATE = 0x100,
-    FOS_ALLOWMULTISELECT = 0x200,
-    FOS_PATHMUSTEXIST = 0x800,
-    FOS_FILEMUSTEXIST = 0x1000,
-    FOS_CREATEPROMPT = 0x2000,
-    FOS_SHAREAWARE = 0x4000,
-    FOS_NOREADONLYRETURN = 0x8000,
-    FOS_NOTESTFILECREATE = 0x10000,
-    FOS_HIDEMRUPLACES = 0x20000,
-    FOS_HIDEPINNEDPLACES = 0x40000,
-    FOS_NODEREFERENCELINKS = 0x100000,
-    FOS_DONTADDTORECENT = 0x2000000,
-    FOS_FORCESHOWHIDDEN = 0x10000000,
-    FOS_DEFAULTNOMINIMODE = 0x20000000,
-    FOS_FORCEPREVIEWPANEON = 0x40000000,
-    FOS_SUPPORTSTREAMABLEITEMS = 0x80000000,
-}}
-RIDL!(
-interface IFileDialog(IFileDialogVtbl): IModalWindow(IModalWindowVtbl) {
-    fn SetFileTypes(
-        &mut self, cFileTypes: ::UINT, rgFilterSpec: *const ::COMDLG_FILTERSPEC
-    ) -> ::HRESULT,
-    fn SetFileTypeIndex(&mut self, iFileType: ::UINT) -> ::HRESULT,
-    fn GetFileTypeIndex(&mut self, piFileType: *mut ::UINT) -> ::HRESULT,
-    fn Advise(&mut self, pfde: *mut IFileDialogEvents, pdwCookie: *mut ::DWORD) -> ::HRESULT,
-    fn Unadvise(&mut self, dwCookie: ::DWORD) -> ::HRESULT,
-    fn SetOptions(&mut self, fos: FILEOPENDIALOGOPTIONS) -> ::HRESULT,
-    fn GetOptions(&mut self, pfos: *mut FILEOPENDIALOGOPTIONS) -> ::HRESULT,
-    fn SetDefaultFolder(&mut self, psi: *mut IShellItem) -> ::HRESULT,
-    fn SetFolder(&mut self, psi: *mut IShellItem) -> ::HRESULT,
-    fn GetFolder(&mut self, ppsi: *mut *mut IShellItem) -> ::HRESULT,
-    fn GetCurrentSelection(&mut self, ppsi: *mut *mut IShellItem) -> ::HRESULT,
-    fn SetFileName(&mut self, pszName: ::LPCWSTR) -> ::HRESULT,
-    fn GetFileName(&mut self, pszName: *mut ::LPWSTR) -> ::HRESULT,
-    fn SetTitle(&mut self, pszTitle: ::LPCWSTR) -> ::HRESULT,
-    fn SetOkButtonLabel(&mut self, pszText: ::LPCWSTR) -> ::HRESULT,
-    fn SetFileNameLabel(&mut self, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn GetResult(&mut self, ppsi: *mut *mut IShellItem) -> ::HRESULT,
-    fn AddPlace(&mut self, psi: *mut IShellItem, fdap: FDAP) -> ::HRESULT,
-    fn SetDefaultExtension(&mut self, pszDefaultExtension: ::LPCWSTR) -> ::HRESULT,
-    fn Close(&mut self, hr: ::HRESULT) -> ::HRESULT,
-    fn SetClientGuid(&mut self, guid: ::REFGUID) -> ::HRESULT,
-    fn ClearClientData(&mut self) -> ::HRESULT,
-    fn SetFilter(&mut self, pFilter: *mut IShellItemFilter) -> ::HRESULT
-}
-);
-RIDL!(
-interface IFileSaveDialog(IFileSaveDialogVtbl): IFileDialog(IFileDialogVtbl) {
-    fn SetSaveAsItem(&mut self, psi: *mut IShellItem) -> ::HRESULT,
-    fn SetProperties(&mut self, pStore: *mut ::IPropertyStore) -> ::HRESULT,
-    fn SetCollectedProperties(
-        &mut self, pList: *mut ::IPropertyDescriptionList, fAppendDefault: ::BOOL
-    ) -> ::HRESULT,
-    fn GetProperties(&mut self, ppStore: *mut *mut ::IPropertyStore) -> ::HRESULT,
-    fn ApplyProperties(
-        &mut self, psi: *mut IShellItem, pStore: *mut ::IPropertyStore, hwnd: ::HWND,
-        pSink: *mut IFileOperationProgressSink
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IFileOpenDialog(IFileOpenDialogVtbl): IFileDialog(IFileDialogVtbl) {
-    fn GetResults(&mut self, ppenum: *mut *mut IShellItemArray) -> ::HRESULT,
-    fn GetSelectedItems(&mut self, ppsai: *mut *mut IShellItemArray) -> ::HRESULT
-}
-);
-ENUM!{enum CDCONTROLSTATE {
-    CDCS_INACTIVE = 0x00000000,
-    CDCS_ENABLED = 0x00000001,
-    CDCS_VISIBLE = 0x00000002,
-    CDCS_ENABLEDVISIBLE = 0x00000003,
-}}
-RIDL!(
-interface IFileDialogCustomize(IFileDialogCustomizeVtbl): IUnknown(IUnknownVtbl) {
-    fn EnableOpenDropDown(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn AddMenu(&mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn AddPushButton(&mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn AddComboBox(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn AddRadioButtonList(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn AddCheckButton(
-        &mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR, bChecked: ::BOOL
-    ) -> ::HRESULT,
-    fn AddEditBox(&mut self, dwIDCtl: ::DWORD, pszText: ::LPCWSTR) -> ::HRESULT,
-    fn AddSeparator(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn AddText(&mut self, dwIDCtl: ::DWORD, pszText: ::LPCWSTR) -> ::HRESULT,
-    fn SetControlLabel(&mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn GetControlState(&mut self, dwIDCtl: ::DWORD, pdwState: *mut CDCONTROLSTATE) -> ::HRESULT,
-    fn SetControlState(&mut self, dwIDCtl: ::DWORD, dwState: CDCONTROLSTATE) -> ::HRESULT,
-    fn GetEditBoxText(&mut self, dwIDCtl: ::DWORD, ppszText: *mut *mut ::WCHAR) -> ::HRESULT,
-    fn SetEditBoxText(&mut self, dwIDCtl: ::DWORD, pszText: ::LPCWSTR) -> ::HRESULT,
-    fn GetCheckButtonState(&mut self, dwIDCtl: ::DWORD, pbChecked: *mut ::BOOL) -> ::HRESULT,
-    fn SetCheckButtonState(&mut self, dwIDCtl: ::DWORD, bChecked: ::BOOL) -> ::HRESULT,
-    fn AddControlItem(
-        &mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD, pszLabel: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn RemoveControlItem(&mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD) -> ::HRESULT,
-    fn RemoveAllControlItems(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn GetControlItemState(
-        &mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD, pdwState: *mut CDCONTROLSTATE
-    ) -> ::HRESULT,
-    fn SetControlItemState(
-        &mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD, dwState: CDCONTROLSTATE
-    ) -> ::HRESULT,
-    fn GetSelectedControlItem(&mut self, dwIDCtl: ::DWORD, pdwIDItem: *mut ::DWORD) -> ::HRESULT,
-    fn SetSelectedControlItem(&mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD) -> ::HRESULT,
-    fn StartVisualGroup(&mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn EndVisualGroup(&mut self) -> ::HRESULT,
-    fn MakeProminent(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn SetControlItemText(&mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface IFileDialogControlEvents(IFileDialogControlEventsVtbl): IUnknown(IUnknownVtbl) {
-    fn OnItemSelected(
-        &mut self, pfdc: *mut IFileDialogCustomize, dwIDCtl: ::DWORD, dwIDItem: ::DWORD
-    ) -> ::HRESULT,
-    fn OnButtonClicked(&mut self, pfdc: *mut IFileDialogCustomize, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn OnCheckButtonToggled(
-        &mut self, pfdc: *mut IFileDialogCustomize, dwIDCtl: ::DWORD, bChecked: ::BOOL
-    ) -> ::HRESULT,
-    fn OnControlActivating(
-        &mut self, pfdc: *mut IFileDialogCustomize, dwIDCtl: ::DWORD
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IFileDialog2(IFileDialog2Vtbl): IFileDialog(IFileDialogVtbl) {
-    fn SetCancelButtonLabel(&mut self, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn SetNavigationRoot(&mut self, psi: IShellItem) -> ::HRESULT
-}
-);
-//27457
-pub type IShellItemFilter = ::IUnknown; // TODO
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shtypes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shtypes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/shtypes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/shtypes.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-#[repr(C)] #[allow(missing_copy_implementations)]
-pub struct SHITEMID {
-    pub cb: ::USHORT,
-    pub abID: [::BYTE; 0],
-}
-pub type LPSHITEMID = *mut SHITEMID;
-pub type LPCSHITEMID = *const SHITEMID;
-#[repr(C)]
-pub struct ITEMIDLIST {
-    pub mkid: SHITEMID,
-}
-pub type ITEMIDLIST_RELATIVE = ITEMIDLIST;
-pub type ITEMID_CHILD = ITEMIDLIST;
-pub type ITEMIDLIST_ABSOLUTE = ITEMIDLIST;
-pub type LPITEMIDLIST = *mut ITEMIDLIST;
-pub type LPCITEMIDLIST = *const ITEMIDLIST;
-pub type PIDLIST_ABSOLUTE = *mut ITEMIDLIST_ABSOLUTE;
-pub type PCIDLIST_ABSOLUTE = *const ITEMIDLIST_ABSOLUTE;
-pub type PCUIDLIST_ABSOLUTE = *const ITEMIDLIST_ABSOLUTE;
-pub type PIDLIST_RELATIVE = *mut ITEMIDLIST_RELATIVE;
-pub type PCIDLIST_RELATIVE = *const ITEMIDLIST_RELATIVE;
-pub type PUIDLIST_RELATIVE = *mut ITEMIDLIST_RELATIVE;
-pub type PCUIDLIST_RELATIVE = *const ITEMIDLIST_RELATIVE;
-pub type PITEMID_CHILD = *mut ITEMID_CHILD;
-pub type PCITEMID_CHILD = *const ITEMID_CHILD;
-pub type PUITEMID_CHILD = *mut ITEMID_CHILD;
-pub type PCUITEMID_CHILD = *const ITEMID_CHILD;
-pub type PCUITEMID_CHILD_ARRAY = *const PCUITEMID_CHILD;
-pub type PCUIDLIST_RELATIVE_ARRAY = *const PCUIDLIST_RELATIVE;
-pub type PCIDLIST_ABSOLUTE_ARRAY = *const PCIDLIST_ABSOLUTE;
-pub type PCUIDLIST_ABSOLUTE_ARRAY = *const PCUIDLIST_ABSOLUTE;
-STRUCT!{struct COMDLG_FILTERSPEC {
-    pszName: ::LPCWSTR,
-    pszSpec: ::LPCWSTR,
-}}
-pub type KNOWNFOLDERID = ::GUID;
-pub type REFKNOWNFOLDERID = *const KNOWNFOLDERID;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/spapidef.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/spapidef.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/spapidef.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/spapidef.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Windows NT Setup and Device Installer services
-pub type SP_LOG_TOKEN = ::DWORDLONG;
-pub type PSP_LOG_TOKEN = *mut ::DWORDLONG;
-pub const LOGTOKEN_TYPE_MASK: SP_LOG_TOKEN = 3;
-pub const LOGTOKEN_UNSPECIFIED: SP_LOG_TOKEN = 0;
-pub const LOGTOKEN_NO_LOG: SP_LOG_TOKEN = 1;
-pub const LOGTOKEN_SETUPAPI_APPLOG: SP_LOG_TOKEN = 2;
-pub const LOGTOKEN_SETUPAPI_DEVLOG: SP_LOG_TOKEN = 3;
-pub const TXTLOG_SETUPAPI_DEVLOG: ::DWORD = 0x00000001;
-pub const TXTLOG_SETUPAPI_CMDLINE: ::DWORD = 0x00000002;
-pub const TXTLOG_SETUPAPI_BITS: ::DWORD = 0x00000003;
-pub const TXTLOG_ERROR: ::DWORD = 0x1;
-pub const TXTLOG_WARNING: ::DWORD = 0x2;
-pub const TXTLOG_SYSTEM_STATE_CHANGE: ::DWORD = 0x3;
-pub const TXTLOG_SUMMARY: ::DWORD = 0x4;
-pub const TXTLOG_DETAILS: ::DWORD = 0x5;
-pub const TXTLOG_VERBOSE: ::DWORD = 0x6;
-pub const TXTLOG_VERY_VERBOSE: ::DWORD = 0x7;
-pub const TXTLOG_RESERVED_FLAGS: ::DWORD = 0x0000FFF0;
-pub const TXTLOG_TIMESTAMP: ::DWORD = 0x00010000;
-pub const TXTLOG_DEPTH_INCR: ::DWORD = 0x00020000;
-pub const TXTLOG_DEPTH_DECR: ::DWORD = 0x00040000;
-pub const TXTLOG_TAB_1: ::DWORD = 0x00080000;
-pub const TXTLOG_FLUSH_FILE: ::DWORD = 0x00100000;
-#[inline] #[allow(dead_code)]
-pub fn TXTLOG_LEVEL(flags: ::DWORD) -> ::DWORD {
-    return flags & 0xf;
-}
-pub const TXTLOG_DEVINST: ::DWORD = 0x00000001;
-pub const TXTLOG_INF: ::DWORD = 0x00000002;
-pub const TXTLOG_FILEQ: ::DWORD = 0x00000004;
-pub const TXTLOG_COPYFILES: ::DWORD = 0x00000008;
-pub const TXTLOG_SIGVERIF: ::DWORD = 0x00000020;
-pub const TXTLOG_BACKUP: ::DWORD = 0x00000080;
-pub const TXTLOG_UI: ::DWORD = 0x00000100;
-pub const TXTLOG_UTIL: ::DWORD = 0x00000200;
-pub const TXTLOG_INFDB: ::DWORD = 0x00000400;
-pub const TXTLOG_POLICY: ::DWORD = 0x00800000;
-pub const TXTLOG_NEWDEV: ::DWORD = 0x01000000;
-pub const TXTLOG_UMPNPMGR: ::DWORD = 0x02000000;
-pub const TXTLOG_DRIVER_STORE: ::DWORD = 0x04000000;
-pub const TXTLOG_SETUP: ::DWORD = 0x08000000;
-pub const TXTLOG_CMI: ::DWORD = 0x10000000;
-pub const TXTLOG_DEVMGR: ::DWORD = 0x20000000;
-pub const TXTLOG_INSTALLER: ::DWORD = 0x40000000;
-pub const TXTLOG_VENDOR: ::DWORD = 0x80000000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sql.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sql.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sql.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sql.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub const SQL_NULL_DATA: SQLLEN = -1;
-pub const SQL_DATA_AT_EXEC: SQLLEN = -2;
-pub const SQL_SUCCESS: SQLRETURN = 0;
-pub const SQL_SUCCESS_WITH_INFO: SQLRETURN = 1;
-pub const SQL_NO_DATA: SQLRETURN = 100;
-pub const SQL_PARAM_DATA_AVAILABLE: SQLRETURN = 101;
-pub const SQL_ERROR: SQLRETURN = -1;
-pub const SQL_INVALID_HANDLE: SQLRETURN = -2;
-pub const SQL_STILL_EXECUTING: SQLRETURN = 2;
-pub const SQL_NEED_DATA: SQLRETURN = 99;
-pub const SQL_NTS: SQLSMALLINT = -3;
-pub const SQL_MAX_MESSAGE_LENGTH: usize = 512;
-pub const SQL_DATE_LEN: usize = 10;
-pub const SQL_TIME_LEN: usize = 8;
-pub const SQL_TIMESTAMP_LEN: usize = 19;
-pub const SQL_HANDLE_ENV: SQLSMALLINT = 1;
-pub const SQL_HANDLE_DBC: SQLSMALLINT = 2;
-pub const SQL_HANDLE_STMT: SQLSMALLINT = 3;
-pub const SQL_HANDLE_DESC: SQLSMALLINT = 4;
-pub const SQL_ATTR_OUTPUT_NTS: SQLINTEGER = 10001;
-pub const SQL_ATTR_AUTO_IPD: SQLINTEGER = 10001;
-pub const SQL_ATTR_METADATA_ID: SQLINTEGER = 10014;
-pub const SQL_ATTR_APP_ROW_DESC: SQLINTEGER = 10010;
-pub const SQL_ATTR_APP_PARAM_DESC: SQLINTEGER = 10011;
-pub const SQL_ATTR_IMP_ROW_DESC: SQLINTEGER = 10012;
-pub const SQL_ATTR_IMP_PARAM_DESC: SQLINTEGER = 10013;
-pub const SQL_ATTR_CURSOR_SCROLLABLE: SQLINTEGER = -1;
-pub const SQL_ATTR_CURSOR_SENSITIVITY: SQLINTEGER = -2;
-
-//Null handle used in place of parent handle when allocating HENV
-pub const SQL_NULL_HANDLE: SQLHANDLE = 0 as SQLHANDLE;
-
-//Special length/indicator values
-
-//Return values from functions
-
-
-//Values of NULLABLE field in descriptor
-pub const SQL_NO_NULLS: SQLSMALLINT = 0;
-pub const SQL_NULLABLE: SQLSMALLINT = 1;
-pub const SQL_NULLABLE_UNKNOWN: SQLSMALLINT = 2;
-
-//Env attribute
-pub const SQL_ATTR_ODBC_VERSION: SQLINTEGER = 200;
-pub const SQL_ATTR_CONNECTION_POOLING: SQLINTEGER = 201;
-pub const SQL_ATTR_CP_MATCH: SQLINTEGER = 202;
-
-//Values for SQL_ATTR_ODBC_VERSION
-pub const SQL_OV_ODBC2: SQLINTEGER = 2;
-pub const SQL_OV_ODBC3: SQLINTEGER = 3;
-pub const SQL_OV_ODBC3_80: SQLINTEGER = 380;
-
-//Connection attributes
-pub const SQL_ACCESS_MODE: SQLINTEGER = 101;
-pub const SQL_AUTOCOMMIT: SQLINTEGER = 102;
-pub const SQL_LOGIN_TIMEOUT: SQLINTEGER = 103;
-pub const SQL_OPT_TRACE: SQLINTEGER = 104;
-pub const SQL_OPT_TRACEFILE: SQLINTEGER = 105;
-pub const SQL_TRANSLATE_DLL: SQLINTEGER = 106;
-pub const SQL_TRANSLATE_OPTION: SQLINTEGER = 107;
-pub const SQL_TXN_ISOLATION: SQLINTEGER = 108;
-pub const SQL_CURRENT_QUALIFIER: SQLINTEGER = 109;
-pub const SQL_ODBC_CURSORS: SQLINTEGER = 110;
-pub const SQL_QUIET_MODE: SQLINTEGER = 111;
-pub const SQL_PACKET_SIZE: SQLINTEGER = 112;
-
-//Connection attributes with new names
-pub const SQL_ATTR_ACCESS_MODE: SQLINTEGER = SQL_ACCESS_MODE;
-pub const SQL_ATTR_AUTOCOMMIT: SQLINTEGER = SQL_AUTOCOMMIT;
-pub const SQL_ATTR_CONNECTION_TIMEOUT: SQLINTEGER = 113;
-pub const SQL_ATTR_CURRENT_CATALOG: SQLINTEGER = SQL_CURRENT_QUALIFIER;
-pub const SQL_ATTR_DISCONNECT_BEHAVIOR: SQLINTEGER = 114;
-pub const SQL_ATTR_ENLIST_IN_DTC: SQLINTEGER = 1207;
-pub const SQL_ATTR_ENLIST_IN_XA: SQLINTEGER = 1208;
-pub const SQL_ATTR_LOGIN_TIMEOUT: SQLINTEGER = SQL_LOGIN_TIMEOUT;
-pub const SQL_ATTR_ODBC_CURSORS: SQLINTEGER = SQL_ODBC_CURSORS;
-pub const SQL_ATTR_PACKET_SIZE: SQLINTEGER = SQL_PACKET_SIZE;
-pub const SQL_ATTR_QUIET_MODE: SQLINTEGER = SQL_QUIET_MODE;
-pub const SQL_ATTR_TRACE: SQLINTEGER = SQL_OPT_TRACE;
-pub const SQL_ATTR_TRACEFILE: SQLINTEGER = SQL_OPT_TRACEFILE;
-pub const SQL_ATTR_TRANSLATE_LIB: SQLINTEGER = SQL_TRANSLATE_DLL;
-pub const SQL_ATTR_TRANSLATE_OPTION: SQLINTEGER = SQL_TRANSLATE_OPTION;
-pub const SQL_ATTR_TXN_ISOLATION: SQLINTEGER = SQL_TXN_ISOLATION;
-pub const SQL_ATTR_CONNECTION_DEAD: SQLINTEGER = 1209;
-
-//Flags for null-terminated string
-pub const SQL_NTS: SQLSMALLINT = -3;
-
-//Options for SQLDriverConnect
-pub const SQL_DRIVER_NOPROMPT: SQLUSMALLINT = 0;
-pub const SQL_DRIVER_COMPLETE: SQLUSMALLINT = 1;
-pub const SQL_DRIVER_PROMPT: SQLUSMALLINT = 2;
-pub const SQL_DRIVER_COMPLETE_REQUIRED: SQLUSMALLINT = 3;
-
-//Whether an attribute is a pointer or not
-pub const SQL_IS_POINTER: SQLINTEGER = -4;
-pub const SQL_IS_UINTEGER: SQLINTEGER = -5;
-pub const SQL_IS_INTEGER: SQLINTEGER = -6;
-pub const SQL_IS_USMALLINT: SQLINTEGER = -7;
-pub const SQL_IS_SMALLINT: SQLINTEGER = -8;
-
-//FreeStmt options
-pub const SQL_CLOSE: SQLUSMALLINT = 0;
-pub const SQL_DROP: SQLUSMALLINT = 1;
-pub const SQL_UNBIND: SQLUSMALLINT = 2;
-pub const SQL_RESET_PARAMS: SQLUSMALLINT = 3;
-
-//C datatype to SQL datatype mapping
-pub const SQL_UNKNOWN_TYPE: SQLSMALLINT = 0;
-pub const SQL_CHAR: SQLSMALLINT = 1;
-pub const SQL_NUMERIC: SQLSMALLINT = 2;
-pub const SQL_DECIMAL: SQLSMALLINT = 3;
-pub const SQL_INTEGER: SQLSMALLINT = 4;
-pub const SQL_SMALLINT: SQLSMALLINT = 5;
-pub const SQL_FLOAT: SQLSMALLINT = 6;
-pub const SQL_REAL: SQLSMALLINT = 7;
-pub const SQL_DOUBLE: SQLSMALLINT = 8;
-pub const SQL_DATETIME: SQLSMALLINT = 9;
-pub const SQL_VARCHAR: SQLSMALLINT = 12;
-
-pub const SQL_TYPE_DATE: SQLSMALLINT = 91;
-pub const SQL_TYPE_TIME: SQLSMALLINT = 92;
-pub const SQL_TYPE_TIMESTAMP: SQLSMALLINT = 93;
-
-pub const SQL_DATE: SQLSMALLINT = 9;
-pub const SQL_INTERVAL: SQLSMALLINT = 10;
-pub const SQL_TIME: SQLSMALLINT = 10;
-pub const SQL_TIMESTAMP: SQLSMALLINT = 11;
-pub const SQL_LONGVARCHAR: SQLSMALLINT = -1;
-pub const SQL_BINARY: SQLSMALLINT = -2;
-pub const SQL_VARBINARY: SQLSMALLINT = -3;
-pub const SQL_LONGVARBINARY: SQLSMALLINT = -4;
-pub const SQL_BIGINT: SQLSMALLINT = -5;
-pub const SQL_TINYINT: SQLSMALLINT = -6;
-pub const SQL_BIT: SQLSMALLINT = -7;
-pub const SQL_GUID: SQLSMALLINT = -11;
-
-pub const SQL_C_CHAR: SQLSMALLINT = SQL_CHAR;
-pub const SQL_C_LONG: SQLSMALLINT = SQL_INTEGER;
-pub const SQL_C_SHORT: SQLSMALLINT = SQL_SMALLINT;
-pub const SQL_C_FLOAT: SQLSMALLINT = SQL_REAL;
-pub const SQL_C_DOUBLE: SQLSMALLINT = SQL_DOUBLE;
-pub const SQL_C_NUMERIC: SQLSMALLINT = SQL_NUMERIC;
-pub const SQL_C_DEFAULT: SQLSMALLINT = 99;
-
-pub const SQL_SIGNED_OFFSET: SQLSMALLINT = -20;
-pub const SQL_UNSIGNED_OFFSET: SQLSMALLINT = -22;
-
-pub const SQL_C_DATE: SQLSMALLINT = SQL_DATE;
-pub const SQL_C_TIME: SQLSMALLINT = SQL_TIME;
-pub const SQL_C_TIMESTAMP: SQLSMALLINT = SQL_TIMESTAMP;
-
-pub const SQL_C_TYPE_DATE: SQLSMALLINT = SQL_TYPE_DATE;
-pub const SQL_C_TYPE_TIME: SQLSMALLINT = SQL_TYPE_TIME;
-pub const SQL_C_TYPE_TIMESTAMP: SQLSMALLINT = SQL_TYPE_TIMESTAMP;
-
-pub const SQL_C_BINARY: SQLSMALLINT = SQL_BINARY;
-pub const SQL_C_BIT: SQLSMALLINT = SQL_BIT;
-pub const SQL_C_SBIGINT: SQLSMALLINT = SQL_BIGINT + SQL_SIGNED_OFFSET;
-pub const SQL_C_UBIGINT: SQLSMALLINT = SQL_BIGINT + SQL_UNSIGNED_OFFSET;
-pub const SQL_C_TINYINT: SQLSMALLINT = SQL_TINYINT;
-pub const SQL_C_SLONG: SQLSMALLINT = SQL_C_LONG + SQL_SIGNED_OFFSET;
-pub const SQL_C_SSHORT: SQLSMALLINT = SQL_C_SHORT + SQL_SIGNED_OFFSET;
-pub const SQL_C_STINYINT: SQLSMALLINT = SQL_TINYINT + SQL_SIGNED_OFFSET;
-pub const SQL_C_ULONG: SQLSMALLINT = SQL_C_LONG + SQL_UNSIGNED_OFFSET;
-pub const SQL_C_USHORT: SQLSMALLINT = SQL_C_SHORT + SQL_UNSIGNED_OFFSET;
-pub const SQL_C_UTINYINT: SQLSMALLINT = SQL_TINYINT + SQL_UNSIGNED_OFFSET;
-
-pub const SQL_C_GUID: SQLSMALLINT = SQL_GUID;
-
-pub const SQL_WCHAR: SQLSMALLINT = -8;
-pub const SQL_WVARCHAR: SQLSMALLINT = -9;
-pub const SQL_WLONGVARCHAR: SQLSMALLINT = -10;
-pub const SQL_C_WCHAR: SQLSMALLINT = SQL_WCHAR;
-
-pub const SQL_TYPE_NULL: SQLSMALLINT = 0;
-
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sqltypes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sqltypes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sqltypes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sqltypes.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub type SQLCHAR = ::c_uchar;
-pub type SQLSCHAR = ::c_schar;
-pub type SQLDATE = ::c_uchar;
-pub type SQLDECIMAL = ::c_uchar;
-pub type SQLDOUBLE = ::c_double;
-pub type SQLFLOAT = ::c_double;
-pub type SQLINTEGER = ::c_long;
-pub type SQLUINTEGER = ::c_ulong;
-#[cfg(target_arch = "x86_64")]
-pub type SQLLEN = ::INT64;
-#[cfg(target_arch = "x86_64")]
-pub type SQLULEN = ::UINT64;
-#[cfg(target_arch = "x86_64")]
-pub type SQLSETPOSIROW = ::UINT64;
-#[cfg(target_arch = "x86")]
-pub type SQLLEN = SQLINTEGER;
-#[cfg(target_arch = "x86")]
-pub type SQLULEN = SQLUINTEGER;
-#[cfg(target_arch = "x86")]
-pub type SQLSETPOSIROW = SQLUSMALLINT;
-pub type SQLROWCOUNT = SQLULEN;
-pub type SQLROWSETSIZE = SQLULEN;
-pub type SQLTRANSID = SQLULEN;
-pub type SQLROWOFFSET = SQLLEN;
-pub type SQLNUMERIC = ::c_uchar;
-pub type SQLPOINTER = *mut ::c_void;
-pub type SQLREAL = ::c_float;
-pub type SQLSMALLINT = ::c_short;
-pub type SQLUSMALLINT = ::c_ushort;
-pub type SQLTIME = ::c_uchar;
-pub type SQLTIMESTAMP = ::c_uchar;
-pub type SQLVARCHAR = ::c_uchar;
-pub type SQLRETURN = SQLSMALLINT;
-pub type SQLHANDLE = *mut ::c_void;
-pub type SQLHENV = SQLHANDLE;
-pub type SQLHDBC = SQLHANDLE;
-pub type SQLHSTMT = SQLHANDLE;
-pub type SQLHDESC = SQLHANDLE;
-//pub type UCHAR = ::c_uchar;
-pub type SCHAR = ::c_schar;
-//pub type SQLSCHAR = SCHAR;
-pub type SDWORD = ::c_long;
-pub type SWORD = ::c_short;
-pub type UDWORD = ::c_ulong;
-//pub type UWORD = ::c_ushort;
-//#[cfg(target_arch = "x86")]
-//pub type SQLUINTEGER = ::UDWORD;
-pub type SLONG = ::c_long;
-pub type SSHORT = ::c_short;
-//pub type ULONG = ::c_ulong;
-//pub type USHORT = ::c_ushort;
-pub type SDOUBLE = ::c_double;
-pub type LDOUBLE = ::c_double;
-pub type SFLOAT = ::c_float;
-pub type PTR = *mut ::c_void;
-pub type HENV = *mut ::c_void;
-pub type HDBC = *mut ::c_void;
-pub type HSTMT = *mut ::c_void;
-pub type RETCODE = ::c_short;
-pub type SQLHWND = ::HWND;
-STRUCT!{struct DATE_STRUCT {
-    year: SQLSMALLINT,
-    month: SQLUSMALLINT,
-    day: SQLUSMALLINT,
-}}
-pub type SQL_DATE_STRUCT = DATE_STRUCT;
-STRUCT!{struct TIME_STRUCT {
-    hour: SQLUSMALLINT,
-    minute: SQLUSMALLINT,
-    second: SQLUSMALLINT,
-}}
-pub type SQL_TIME_STRUCT = TIME_STRUCT;
-STRUCT!{struct TIMESTAMP_STRUCT {
-    year: SQLSMALLINT,
-    month: SQLUSMALLINT,
-    day: SQLUSMALLINT,
-    hour: SQLUSMALLINT,
-    minute: SQLUSMALLINT,
-    second: SQLUSMALLINT,
-    fraction: SQLUINTEGER,
-}}
-pub type SQL_TIMESTAMP_STRUCT = TIMESTAMP_STRUCT;
-ENUM!{enum SQLINTERVAL {
-    SQL_IS_YEAR = 1,
-    SQL_IS_MONTH = 2,
-    SQL_IS_DAY = 3,
-    SQL_IS_HOUR = 4,
-    SQL_IS_MINUTE = 5,
-    SQL_IS_SECOND = 6,
-    SQL_IS_YEAR_TO_MONTH = 7,
-    SQL_IS_DAY_TO_HOUR = 8,
-    SQL_IS_DAY_TO_MINUTE = 9,
-    SQL_IS_DAY_TO_SECOND = 10,
-    SQL_IS_HOUR_TO_MINUTE = 11,
-    SQL_IS_HOUR_TO_SECOND = 12,
-    SQL_IS_MINUTE_TO_SECOND = 13,
-}}
-STRUCT!{struct SQL_YEAR_MONTH_STRUCT {
-    year: SQLUINTEGER,
-    month: SQLUINTEGER,
-}}
-STRUCT!{struct SQL_DAY_SECOND_STRUCT {
-    day: SQLUINTEGER,
-    hour: SQLUINTEGER,
-    minute: SQLUINTEGER,
-    second: SQLUINTEGER,
-    fraction: SQLUINTEGER,
-}}
-STRUCT!{struct SQL_INTERVAL_STRUCT {
-    interval_type: SQLINTERVAL,
-    interval_sign: SQLSMALLINT,
-    intval: [u32; 5],
-}}
-UNION!{SQL_INTERVAL_STRUCT, intval, year_month, year_month_mut, SQL_YEAR_MONTH_STRUCT}
-UNION!{SQL_INTERVAL_STRUCT, intval, day_second, day_second_mut, SQL_DAY_SECOND_STRUCT}
-pub type ODBCINT64 = ::__int64;
-pub type SQLBIGINT = ODBCINT64;
-pub type SQLUBIGINT = ::__uint64;
-pub const SQL_MAX_NUMERIC_LEN: usize = 16;
-STRUCT!{struct SQL_NUMERIC_STRUCT {
-    precision: SQLCHAR,
-    scale: SQLSCHAR,
-    sign: SQLCHAR,
-    val: [SQLCHAR; SQL_MAX_NUMERIC_LEN],
-}}
-pub type SQLGUID = ::GUID;
-pub type BOOKMARK = SQLULEN;
-pub type SQLWCHAR = ::wchar_t;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sspi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sspi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sspi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sspi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,657 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Security Support Provider Interface Prototypes and structure definitions
-pub type SEC_WCHAR = ::WCHAR;
-pub type SEC_CHAR = ::CHAR;
-pub type SECURITY_STATUS = ::LONG;
-STRUCT!{struct SecHandle {
-    dwLower: ::ULONG_PTR,
-    dwUpper: ::ULONG_PTR,
-}}
-pub type PSecHandle = *mut SecHandle;
-pub const SEC_DELETED_HANDLE: ::ULONG_PTR = 2;
-pub type CredHandle = SecHandle;
-pub type PCredHandle = PSecHandle;
-pub type CtxtHandle = SecHandle;
-pub type PCtxtHandle = PSecHandle;
-pub type SECURITY_INTEGER = ::LARGE_INTEGER;
-pub type PSECURITY_INTEGER = *mut ::LARGE_INTEGER;
-pub type TimeStamp = SECURITY_INTEGER;
-pub type PTimeStamp = *mut SECURITY_INTEGER;
-STRUCT!{struct SECURITY_STRING {
-    Length: ::c_ushort,
-    MaximumLength: ::c_ushort,
-    Buffer: *mut ::c_ushort,
-}}
-pub type PSECURITY_STRING = *mut SECURITY_STRING;
-STRUCT!{struct SecPkgInfoW {
-    fCapabilities: ::c_ulong,
-    wVersion: ::c_ushort,
-    wRPCID: ::c_ushort,
-    cbMaxToken: ::c_ulong,
-    Name: *mut SEC_WCHAR,
-    Comment: *mut SEC_WCHAR,
-}}
-pub type PSecPkgInfoW = *mut SecPkgInfoW;
-STRUCT!{struct SecPkgInfoA {
-    fCapabilities: ::c_ulong,
-    wVersion: ::c_ushort,
-    wRPCID: ::c_ushort,
-    cbMaxToken: ::c_ulong,
-    Name: *mut SEC_CHAR,
-    Comment: *mut SEC_CHAR,
-}}
-pub type PSecPkgInfoA = *mut SecPkgInfoA;
-pub const SECPKG_FLAG_INTEGRITY: ::c_ulong = 0x00000001;
-pub const SECPKG_FLAG_PRIVACY: ::c_ulong = 0x00000002;
-pub const SECPKG_FLAG_TOKEN_ONLY: ::c_ulong = 0x00000004;
-pub const SECPKG_FLAG_DATAGRAM: ::c_ulong = 0x00000008;
-pub const SECPKG_FLAG_CONNECTION: ::c_ulong = 0x00000010;
-pub const SECPKG_FLAG_MULTI_REQUIRED: ::c_ulong = 0x00000020;
-pub const SECPKG_FLAG_CLIENT_ONLY: ::c_ulong = 0x00000040;
-pub const SECPKG_FLAG_EXTENDED_ERROR: ::c_ulong = 0x00000080;
-pub const SECPKG_FLAG_IMPERSONATION: ::c_ulong = 0x00000100;
-pub const SECPKG_FLAG_ACCEPT_WIN32_NAME: ::c_ulong = 0x00000200;
-pub const SECPKG_FLAG_STREAM: ::c_ulong = 0x00000400;
-pub const SECPKG_FLAG_NEGOTIABLE: ::c_ulong = 0x00000800;
-pub const SECPKG_FLAG_GSS_COMPATIBLE: ::c_ulong = 0x00001000;
-pub const SECPKG_FLAG_LOGON: ::c_ulong = 0x00002000;
-pub const SECPKG_FLAG_ASCII_BUFFERS: ::c_ulong = 0x00004000;
-pub const SECPKG_FLAG_FRAGMENT: ::c_ulong = 0x00008000;
-pub const SECPKG_FLAG_MUTUAL_AUTH: ::c_ulong = 0x00010000;
-pub const SECPKG_FLAG_DELEGATION: ::c_ulong = 0x00020000;
-pub const SECPKG_FLAG_READONLY_WITH_CHECKSUM: ::c_ulong = 0x00040000;
-pub const SECPKG_FLAG_RESTRICTED_TOKENS: ::c_ulong = 0x00080000;
-pub const SECPKG_FLAG_NEGO_EXTENDER: ::c_ulong = 0x00100000;
-pub const SECPKG_FLAG_NEGOTIABLE2: ::c_ulong = 0x00200000;
-pub const SECPKG_FLAG_APPCONTAINER_PASSTHROUGH: ::c_ulong = 0x00400000;
-pub const SECPKG_FLAG_APPCONTAINER_CHECKS: ::c_ulong = 0x00800000;
-pub const SECPKG_ID_NONE: ::c_ulong = 0xFFFF;
-pub const SECPKG_CALLFLAGS_APPCONTAINER: ::c_ulong = 0x00000001;
-pub const SECPKG_CALLFLAGS_APPCONTAINER_AUTHCAPABLE: ::c_ulong = 0x00000002;
-pub const SECPKG_CALLFLAGS_FORCE_SUPPLIED: ::c_ulong = 0x00000004;
-STRUCT!{struct SecBuffer {
-    cbBuffer: ::c_ulong,
-    BufferType: ::c_ulong,
-    pvBuffer: *mut ::c_void,
-}}
-pub type PSecBuffer = *mut SecBuffer;
-STRUCT!{struct SecBufferDesc {
-    ulVersion: ::c_ulong,
-    cBuffers: ::c_ulong,
-    pBuffers: PSecBuffer,
-}}
-pub type PSecBufferDesc = *mut SecBufferDesc;
-pub const SECBUFFER_VERSION: ::c_ulong = 0;
-pub const SECBUFFER_EMPTY: ::c_ulong = 0;
-pub const SECBUFFER_DATA: ::c_ulong = 1;
-pub const SECBUFFER_TOKEN: ::c_ulong = 2;
-pub const SECBUFFER_PKG_PARAMS: ::c_ulong = 3;
-pub const SECBUFFER_MISSING: ::c_ulong = 4;
-pub const SECBUFFER_EXTRA: ::c_ulong = 5;
-pub const SECBUFFER_STREAM_TRAILER: ::c_ulong = 6;
-pub const SECBUFFER_STREAM_HEADER: ::c_ulong = 7;
-pub const SECBUFFER_NEGOTIATION_INFO: ::c_ulong = 8;
-pub const SECBUFFER_PADDING: ::c_ulong = 9;
-pub const SECBUFFER_STREAM: ::c_ulong = 10;
-pub const SECBUFFER_MECHLIST: ::c_ulong = 11;
-pub const SECBUFFER_MECHLIST_SIGNATURE: ::c_ulong = 12;
-pub const SECBUFFER_TARGET: ::c_ulong = 13;
-pub const SECBUFFER_CHANNEL_BINDINGS: ::c_ulong = 14;
-pub const SECBUFFER_CHANGE_PASS_RESPONSE: ::c_ulong = 15;
-pub const SECBUFFER_TARGET_HOST: ::c_ulong = 16;
-pub const SECBUFFER_ALERT: ::c_ulong = 17;
-pub const SECBUFFER_APPLICATION_PROTOCOLS: ::c_ulong = 18;
-pub const SECBUFFER_ATTRMASK: ::c_ulong = 0xF0000000;
-pub const SECBUFFER_READONLY: ::c_ulong = 0x80000000;
-pub const SECBUFFER_READONLY_WITH_CHECKSUM: ::c_ulong = 0x10000000;
-pub const SECBUFFER_RESERVED: ::c_ulong = 0x60000000;
-STRUCT!{struct SEC_NEGOTIATION_INFO {
-    Size: ::c_ulong,
-    NameLength: ::c_ulong,
-    Name: *mut SEC_WCHAR,
-    Reserved: *mut ::c_void,
-}}
-pub type PSEC_NEGOTIATION_INFO = *mut SEC_NEGOTIATION_INFO;
-STRUCT!{struct SEC_CHANNEL_BINDINGS {
-    dwInitiatorAddrType: ::c_ulong,
-    cbInitiatorLength: ::c_ulong,
-    dwInitiatorOffset: ::c_ulong,
-    dwAcceptorAddrType: ::c_ulong,
-    cbAcceptorLength: ::c_ulong,
-    dwAcceptorOffset: ::c_ulong,
-    cbApplicationDataLength: ::c_ulong,
-    dwApplicationDataOffset: ::c_ulong,
-}}
-pub type PSEC_CHANNEL_BINDINGS = *mut SEC_CHANNEL_BINDINGS;
-ENUM!{enum SEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT {
-    SecApplicationProtocolNegotiationExt_None,
-    SecApplicationProtocolNegotiationExt_NPN,
-    SecApplicationProtocolNegotiationExt_ALPN,
-}}
-pub type PSEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT = *mut SEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT;
-STRUCT!{struct SEC_APPLICATION_PROTOCOL_LIST {
-    ProtoNegoExt: ::SEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT,
-    ProtocolListSize: ::c_ushort,
-    ProtocolList: [::c_uchar; 0],
-}}
-STRUCT!{struct SEC_APPLICATION_PROTOCOLS {
-    ProtocolListsSize: ::c_ulong,
-    ProtocolLists: [SEC_APPLICATION_PROTOCOL_LIST; 0],
-}}
-pub type PSEC_APPLICATION_PROTOCOLS = *mut SEC_APPLICATION_PROTOCOLS;
-pub const SECURITY_NATIVE_DREP: ::c_ulong = 0x00000010;
-pub const SECURITY_NETWORK_DREP: ::c_ulong = 0x00000000;
-pub const SECPKG_CRED_INBOUND: ::c_ulong = 0x00000001;
-pub const SECPKG_CRED_OUTBOUND: ::c_ulong = 0x00000002;
-pub const SECPKG_CRED_BOTH: ::c_ulong = 0x00000003;
-pub const SECPKG_CRED_DEFAULT: ::c_ulong = 0x00000004;
-pub const SECPKG_CRED_RESERVED: ::c_ulong = 0xF0000000;
-pub const SECPKG_CRED_AUTOLOGON_RESTRICTED: ::c_ulong = 0x00000010;
-pub const SECPKG_CRED_PROCESS_POLICY_ONLY: ::c_ulong = 0x00000020;
-pub const ISC_REQ_DELEGATE: ::c_ulong = 0x00000001;
-pub const ISC_REQ_MUTUAL_AUTH: ::c_ulong = 0x00000002;
-pub const ISC_REQ_REPLAY_DETECT: ::c_ulong = 0x00000004;
-pub const ISC_REQ_SEQUENCE_DETECT: ::c_ulong = 0x00000008;
-pub const ISC_REQ_CONFIDENTIALITY: ::c_ulong = 0x00000010;
-pub const ISC_REQ_USE_SESSION_KEY: ::c_ulong = 0x00000020;
-pub const ISC_REQ_PROMPT_FOR_CREDS: ::c_ulong = 0x00000040;
-pub const ISC_REQ_USE_SUPPLIED_CREDS: ::c_ulong = 0x00000080;
-pub const ISC_REQ_ALLOCATE_MEMORY: ::c_ulong = 0x00000100;
-pub const ISC_REQ_USE_DCE_STYLE: ::c_ulong = 0x00000200;
-pub const ISC_REQ_DATAGRAM: ::c_ulong = 0x00000400;
-pub const ISC_REQ_CONNECTION: ::c_ulong = 0x00000800;
-pub const ISC_REQ_CALL_LEVEL: ::c_ulong = 0x00001000;
-pub const ISC_REQ_FRAGMENT_SUPPLIED: ::c_ulong = 0x00002000;
-pub const ISC_REQ_EXTENDED_ERROR: ::c_ulong = 0x00004000;
-pub const ISC_REQ_STREAM: ::c_ulong = 0x00008000;
-pub const ISC_REQ_INTEGRITY: ::c_ulong = 0x00010000;
-pub const ISC_REQ_IDENTIFY: ::c_ulong = 0x00020000;
-pub const ISC_REQ_NULL_SESSION: ::c_ulong = 0x00040000;
-pub const ISC_REQ_MANUAL_CRED_VALIDATION: ::c_ulong = 0x00080000;
-pub const ISC_REQ_RESERVED1: ::c_ulong = 0x00100000;
-pub const ISC_REQ_FRAGMENT_TO_FIT: ::c_ulong = 0x00200000;
-pub const ISC_REQ_FORWARD_CREDENTIALS: ::c_ulong = 0x00400000;
-pub const ISC_REQ_NO_INTEGRITY: ::c_ulong = 0x00800000;
-pub const ISC_REQ_USE_HTTP_STYLE: ::c_ulong = 0x01000000;
-pub const ISC_REQ_UNVERIFIED_TARGET_NAME: ::c_ulong = 0x20000000;
-pub const ISC_REQ_CONFIDENTIALITY_ONLY: ::c_ulong = 0x40000000;
-pub const ISC_RET_DELEGATE: ::c_ulong = 0x00000001;
-pub const ISC_RET_MUTUAL_AUTH: ::c_ulong = 0x00000002;
-pub const ISC_RET_REPLAY_DETECT: ::c_ulong = 0x00000004;
-pub const ISC_RET_SEQUENCE_DETECT: ::c_ulong = 0x00000008;
-pub const ISC_RET_CONFIDENTIALITY: ::c_ulong = 0x00000010;
-pub const ISC_RET_USE_SESSION_KEY: ::c_ulong = 0x00000020;
-pub const ISC_RET_USED_COLLECTED_CREDS: ::c_ulong = 0x00000040;
-pub const ISC_RET_USED_SUPPLIED_CREDS: ::c_ulong = 0x00000080;
-pub const ISC_RET_ALLOCATED_MEMORY: ::c_ulong = 0x00000100;
-pub const ISC_RET_USED_DCE_STYLE: ::c_ulong = 0x00000200;
-pub const ISC_RET_DATAGRAM: ::c_ulong = 0x00000400;
-pub const ISC_RET_CONNECTION: ::c_ulong = 0x00000800;
-pub const ISC_RET_INTERMEDIATE_RETURN: ::c_ulong = 0x00001000;
-pub const ISC_RET_CALL_LEVEL: ::c_ulong = 0x00002000;
-pub const ISC_RET_EXTENDED_ERROR: ::c_ulong = 0x00004000;
-pub const ISC_RET_STREAM: ::c_ulong = 0x00008000;
-pub const ISC_RET_INTEGRITY: ::c_ulong = 0x00010000;
-pub const ISC_RET_IDENTIFY: ::c_ulong = 0x00020000;
-pub const ISC_RET_NULL_SESSION: ::c_ulong = 0x00040000;
-pub const ISC_RET_MANUAL_CRED_VALIDATION: ::c_ulong = 0x00080000;
-pub const ISC_RET_RESERVED1: ::c_ulong = 0x00100000;
-pub const ISC_RET_FRAGMENT_ONLY: ::c_ulong = 0x00200000;
-pub const ISC_RET_FORWARD_CREDENTIALS: ::c_ulong = 0x00400000;
-pub const ISC_RET_USED_HTTP_STYLE: ::c_ulong = 0x01000000;
-pub const ISC_RET_NO_ADDITIONAL_TOKEN: ::c_ulong = 0x02000000;
-pub const ISC_RET_REAUTHENTICATION: ::c_ulong = 0x08000000;
-pub const ISC_RET_CONFIDENTIALITY_ONLY: ::c_ulong = 0x40000000;
-pub const ASC_REQ_DELEGATE: ::c_ulong = 0x00000001;
-pub const ASC_REQ_MUTUAL_AUTH: ::c_ulong = 0x00000002;
-pub const ASC_REQ_REPLAY_DETECT: ::c_ulong = 0x00000004;
-pub const ASC_REQ_SEQUENCE_DETECT: ::c_ulong = 0x00000008;
-pub const ASC_REQ_CONFIDENTIALITY: ::c_ulong = 0x00000010;
-pub const ASC_REQ_USE_SESSION_KEY: ::c_ulong = 0x00000020;
-pub const ASC_REQ_SESSION_TICKET: ::c_ulong = 0x00000040;
-pub const ASC_REQ_ALLOCATE_MEMORY: ::c_ulong = 0x00000100;
-pub const ASC_REQ_USE_DCE_STYLE: ::c_ulong = 0x00000200;
-pub const ASC_REQ_DATAGRAM: ::c_ulong = 0x00000400;
-pub const ASC_REQ_CONNECTION: ::c_ulong = 0x00000800;
-pub const ASC_REQ_CALL_LEVEL: ::c_ulong = 0x00001000;
-pub const ASC_REQ_EXTENDED_ERROR: ::c_ulong = 0x00008000;
-pub const ASC_REQ_STREAM: ::c_ulong = 0x00010000;
-pub const ASC_REQ_INTEGRITY: ::c_ulong = 0x00020000;
-pub const ASC_REQ_LICENSING: ::c_ulong = 0x00040000;
-pub const ASC_REQ_IDENTIFY: ::c_ulong = 0x00080000;
-pub const ASC_REQ_ALLOW_NULL_SESSION: ::c_ulong = 0x00100000;
-pub const ASC_REQ_ALLOW_NON_USER_LOGONS: ::c_ulong = 0x00200000;
-pub const ASC_REQ_ALLOW_CONTEXT_REPLAY: ::c_ulong = 0x00400000;
-pub const ASC_REQ_FRAGMENT_TO_FIT: ::c_ulong = 0x00800000;
-pub const ASC_REQ_FRAGMENT_SUPPLIED: ::c_ulong = 0x00002000;
-pub const ASC_REQ_NO_TOKEN: ::c_ulong = 0x01000000;
-pub const ASC_REQ_PROXY_BINDINGS: ::c_ulong = 0x04000000;
-pub const ASC_REQ_ALLOW_MISSING_BINDINGS: ::c_ulong = 0x10000000;
-pub const ASC_RET_DELEGATE: ::c_ulong = 0x00000001;
-pub const ASC_RET_MUTUAL_AUTH: ::c_ulong = 0x00000002;
-pub const ASC_RET_REPLAY_DETECT: ::c_ulong = 0x00000004;
-pub const ASC_RET_SEQUENCE_DETECT: ::c_ulong = 0x00000008;
-pub const ASC_RET_CONFIDENTIALITY: ::c_ulong = 0x00000010;
-pub const ASC_RET_USE_SESSION_KEY: ::c_ulong = 0x00000020;
-pub const ASC_RET_SESSION_TICKET: ::c_ulong = 0x00000040;
-pub const ASC_RET_ALLOCATED_MEMORY: ::c_ulong = 0x00000100;
-pub const ASC_RET_USED_DCE_STYLE: ::c_ulong = 0x00000200;
-pub const ASC_RET_DATAGRAM: ::c_ulong = 0x00000400;
-pub const ASC_RET_CONNECTION: ::c_ulong = 0x00000800;
-pub const ASC_RET_CALL_LEVEL: ::c_ulong = 0x00002000;
-pub const ASC_RET_THIRD_LEG_FAILED: ::c_ulong = 0x00004000;
-pub const ASC_RET_EXTENDED_ERROR: ::c_ulong = 0x00008000;
-pub const ASC_RET_STREAM: ::c_ulong = 0x00010000;
-pub const ASC_RET_INTEGRITY: ::c_ulong = 0x00020000;
-pub const ASC_RET_LICENSING: ::c_ulong = 0x00040000;
-pub const ASC_RET_IDENTIFY: ::c_ulong = 0x00080000;
-pub const ASC_RET_NULL_SESSION: ::c_ulong = 0x00100000;
-pub const ASC_RET_ALLOW_NON_USER_LOGONS: ::c_ulong = 0x00200000;
-pub const ASC_RET_ALLOW_CONTEXT_REPLAY: ::c_ulong = 0x00400000;
-pub const ASC_RET_FRAGMENT_ONLY: ::c_ulong = 0x00800000;
-pub const ASC_RET_NO_TOKEN: ::c_ulong = 0x01000000;
-pub const ASC_RET_NO_ADDITIONAL_TOKEN: ::c_ulong = 0x02000000;
-pub const SECPKG_CRED_ATTR_NAMES: ::c_ulong = 1;
-pub const SECPKG_CRED_ATTR_SSI_PROVIDER: ::c_ulong = 2;
-pub const SECPKG_CRED_ATTR_KDC_PROXY_SETTINGS: ::c_ulong = 3;
-pub const SECPKG_CRED_ATTR_CERT: ::c_ulong = 4;
-STRUCT!{struct SecPkgCredentials_NamesW {
-    sUserName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgCredentials_NamesW = *mut SecPkgCredentials_NamesW;
-STRUCT!{struct SecPkgCredentials_NamesA {
-    sUserName: *mut SEC_CHAR,
-}}
-pub type PSecPkgCredentials_NamesA = *mut SecPkgCredentials_NamesA;
-STRUCT!{struct SecPkgCredentials_SSIProviderW {
-    sProviderName: *mut SEC_WCHAR,
-    ProviderInfoLength: ::c_ulong,
-    ProviderInfo: *mut ::c_char,
-}}
-pub type PSecPkgCredentials_SSIProviderW = *mut SecPkgCredentials_SSIProviderW;
-STRUCT!{struct SecPkgCredentials_SSIProviderA {
-    sProviderName: *mut SEC_CHAR,
-    ProviderInfoLength: ::c_ulong,
-    ProviderInfo: *mut ::c_char,
-}}
-pub type PSecPkgCredentials_SSIProviderA = *mut SecPkgCredentials_SSIProviderA;
-pub const KDC_PROXY_SETTINGS_V1: ::ULONG = 1;
-pub const KDC_PROXY_SETTINGS_FLAGS_FORCEPROXY: ::ULONG = 0x1;
-STRUCT!{struct SecPkgCredentials_KdcProxySettingsW {
-    Version: ::ULONG,
-    Flags: ::ULONG,
-    ProxyServerOffset: ::USHORT,
-    ProxyServerLength: ::USHORT,
-    ClientTlsCredOffset: ::USHORT,
-    ClientTlsCredLength: ::USHORT,
-}}
-pub type PSecPkgCredentials_KdcProxySettingsW = *mut SecPkgCredentials_KdcProxySettingsW;
-STRUCT!{struct SecPkgCredentials_Cert {
-    EncodedCertSize: ::c_ulong,
-    EncodedCert: *mut ::c_uchar,
-}}
-pub type PSecPkgCredentials_Cert = *mut SecPkgCredentials_Cert;
-pub const SECPKG_ATTR_SIZES: ::c_ulong = 0;
-pub const SECPKG_ATTR_NAMES: ::c_ulong = 1;
-pub const SECPKG_ATTR_LIFESPAN: ::c_ulong = 2;
-pub const SECPKG_ATTR_DCE_INFO: ::c_ulong = 3;
-pub const SECPKG_ATTR_STREAM_SIZES: ::c_ulong = 4;
-pub const SECPKG_ATTR_KEY_INFO: ::c_ulong = 5;
-pub const SECPKG_ATTR_AUTHORITY: ::c_ulong = 6;
-pub const SECPKG_ATTR_PROTO_INFO: ::c_ulong = 7;
-pub const SECPKG_ATTR_PASSWORD_EXPIRY: ::c_ulong = 8;
-pub const SECPKG_ATTR_SESSION_KEY: ::c_ulong = 9;
-pub const SECPKG_ATTR_PACKAGE_INFO: ::c_ulong = 10;
-pub const SECPKG_ATTR_USER_FLAGS: ::c_ulong = 11;
-pub const SECPKG_ATTR_NEGOTIATION_INFO: ::c_ulong = 12;
-pub const SECPKG_ATTR_NATIVE_NAMES: ::c_ulong = 13;
-pub const SECPKG_ATTR_FLAGS: ::c_ulong = 14;
-pub const SECPKG_ATTR_USE_VALIDATED: ::c_ulong = 15;
-pub const SECPKG_ATTR_CREDENTIAL_NAME: ::c_ulong = 16;
-pub const SECPKG_ATTR_TARGET_INFORMATION: ::c_ulong = 17;
-pub const SECPKG_ATTR_ACCESS_TOKEN: ::c_ulong = 18;
-pub const SECPKG_ATTR_TARGET: ::c_ulong = 19;
-pub const SECPKG_ATTR_AUTHENTICATION_ID: ::c_ulong = 20;
-pub const SECPKG_ATTR_LOGOFF_TIME: ::c_ulong = 21;
-pub const SECPKG_ATTR_NEGO_KEYS: ::c_ulong = 22;
-pub const SECPKG_ATTR_PROMPTING_NEEDED: ::c_ulong = 24;
-pub const SECPKG_ATTR_UNIQUE_BINDINGS: ::c_ulong = 25;
-pub const SECPKG_ATTR_ENDPOINT_BINDINGS: ::c_ulong = 26;
-pub const SECPKG_ATTR_CLIENT_SPECIFIED_TARGET: ::c_ulong = 27;
-pub const SECPKG_ATTR_LAST_CLIENT_TOKEN_STATUS: ::c_ulong = 30;
-pub const SECPKG_ATTR_NEGO_PKG_INFO: ::c_ulong = 31;
-pub const SECPKG_ATTR_NEGO_STATUS: ::c_ulong = 32;
-pub const SECPKG_ATTR_CONTEXT_DELETED: ::c_ulong = 33;
-pub const SECPKG_ATTR_DTLS_MTU: ::c_ulong = 34;
-pub const SECPKG_ATTR_DATAGRAM_SIZES: ::c_ulong = SECPKG_ATTR_STREAM_SIZES;
-pub const SECPKG_ATTR_SUBJECT_SECURITY_ATTRIBUTES: ::c_ulong = 128;
-pub const SECPKG_ATTR_APPLICATION_PROTOCOL: ::c_ulong = 35;
-STRUCT!{struct SecPkgContext_SubjectAttributes {
-    AttributeInfo: *mut ::c_void,
-}}
-pub type PSecPkgContext_SubjectAttributes = *mut SecPkgContext_SubjectAttributes;
-pub const SECPKG_ATTR_NEGO_INFO_FLAG_NO_KERBEROS: ::c_ulong = 0x1;
-pub const SECPKG_ATTR_NEGO_INFO_FLAG_NO_NTLM: ::c_ulong = 0x2;
-ENUM!{enum SECPKG_CRED_CLASS {
-    SecPkgCredClass_None = 0,
-    SecPkgCredClass_Ephemeral = 10,
-    SecPkgCredClass_PersistedGeneric = 20,
-    SecPkgCredClass_PersistedSpecific = 30,
-    SecPkgCredClass_Explicit = 40,
-}}
-pub type PSECPKG_CRED_CLASS = *mut SECPKG_CRED_CLASS;
-STRUCT!{struct SecPkgContext_CredInfo {
-    CredClass: SECPKG_CRED_CLASS,
-    IsPromptingNeeded: ::c_ulong,
-}}
-pub type PSecPkgContext_CredInfo = *mut SecPkgContext_CredInfo;
-STRUCT!{struct SecPkgContext_NegoPackageInfo {
-    PackageMask: ::c_ulong,
-}}
-pub type PSecPkgContext_NegoPackageInfo = *mut SecPkgContext_NegoPackageInfo;
-STRUCT!{struct SecPkgContext_NegoStatus {
-    LastStatus: ::c_ulong,
-}}
-pub type PSecPkgContext_NegoStatus = *mut SecPkgContext_NegoStatus;
-STRUCT!{struct SecPkgContext_Sizes {
-    cbMaxToken: ::c_ulong,
-    cbMaxSignature: ::c_ulong,
-    cbBlockSize: ::c_ulong,
-    cbSecurityTrailer: ::c_ulong,
-}}
-pub type PSecPkgContext_Sizes = *mut SecPkgContext_Sizes;
-STRUCT!{struct SecPkgContext_StreamSizes {
-    cbHeader: ::c_ulong,
-    cbTrailer: ::c_ulong,
-    cbMaximumMessage: ::c_ulong,
-    cBuffers: ::c_ulong,
-    cbBlockSize: ::c_ulong,
-}}
-pub type PSecPkgContext_StreamSizes = *mut SecPkgContext_StreamSizes;
-pub type SecPkgContext_DatagramSizes = SecPkgContext_StreamSizes;
-pub type PSecPkgContext_DatagramSizes = PSecPkgContext_StreamSizes;
-STRUCT!{struct SecPkgContext_NamesW {
-    sUserName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgContext_NamesW = *mut SecPkgContext_NamesW;
-ENUM!{enum SECPKG_ATTR_LCT_STATUS {
-    SecPkgAttrLastClientTokenYes,
-    SecPkgAttrLastClientTokenNo,
-    SecPkgAttrLastClientTokenMaybe,
-}}
-pub type PSECPKG_ATTR_LCT_STATUS = *mut SECPKG_ATTR_LCT_STATUS;
-STRUCT!{struct SecPkgContext_LastClientTokenStatus {
-    LastClientTokenStatus: SECPKG_ATTR_LCT_STATUS,
-}}
-pub type PSecPkgContext_LastClientTokenStatus = *mut SecPkgContext_LastClientTokenStatus;
-STRUCT!{struct SecPkgContext_NamesA {
-    sUserName: *mut SEC_CHAR,
-}}
-pub type PSecPkgContext_NamesA = *mut SecPkgContext_NamesA;
-STRUCT!{struct SecPkgContext_Lifespan {
-    tsStart: TimeStamp,
-    tsExpiry: TimeStamp,
-}}
-pub type PSecPkgContext_Lifespan = *mut SecPkgContext_Lifespan;
-STRUCT!{struct SecPkgContext_DceInfo {
-    AuthzSvc: ::c_ulong,
-    pPac: *mut ::c_void,
-}}
-pub type PSecPkgContext_DceInfo = *mut SecPkgContext_DceInfo;
-STRUCT!{struct SecPkgContext_KeyInfoA {
-    sSignatureAlgorithmName: *mut ::SEC_CHAR,
-    sEncryptAlgorithmName: *mut ::SEC_CHAR,
-    KeySize: ::c_ulong,
-    SignatureAlgorithm: ::c_ulong,
-    EncryptAlgorithm: ::c_ulong,
-}}
-pub type PSecPkgContext_KeyInfoA = *mut SecPkgContext_KeyInfoA;
-STRUCT!{struct SecPkgContext_KeyInfoW {
-    sSignatureAlgorithmName: *mut ::SEC_WCHAR,
-    sEncryptAlgorithmName: *mut ::SEC_WCHAR,
-    KeySize: ::c_ulong,
-    SignatureAlgorithm: ::c_ulong,
-    EncryptAlgorithm: ::c_ulong,
-}}
-pub type PSecPkgContext_KeyInfoW = *mut SecPkgContext_KeyInfoW;
-STRUCT!{struct SecPkgContext_AuthorityA {
-    sAuthorityName: *mut SEC_CHAR,
-}}
-pub type PSecPkgContext_AuthorityA = *mut SecPkgContext_AuthorityA;
-STRUCT!{struct SecPkgContext_AuthorityW {
-    sAuthorityName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgContext_AuthorityW = *mut SecPkgContext_AuthorityW;
-STRUCT!{struct SecPkgContext_ProtoInfoA {
-    sProtocolName: *mut SEC_CHAR,
-    majorVersion: ::c_ulong,
-    minorVersion: ::c_ulong,
-}}
-pub type PSecPkgContext_ProtoInfoA = *mut SecPkgContext_ProtoInfoA;
-STRUCT!{struct SecPkgContext_ProtoInfoW {
-    sProtocolName: *mut SEC_WCHAR,
-    majorVersion: ::c_ulong,
-    minorVersion: ::c_ulong,
-}}
-pub type PSecPkgContext_ProtoInfoW = *mut SecPkgContext_ProtoInfoW;
-STRUCT!{struct SecPkgContext_PasswordExpiry {
-    tsPasswordExpires: TimeStamp,
-}}
-pub type PSecPkgContext_PasswordExpiry = *mut SecPkgContext_PasswordExpiry;
-STRUCT!{struct SecPkgContext_LogoffTime {
-    tsLogoffTime: TimeStamp,
-}}
-pub type PSecPkgContext_LogoffTime = *mut SecPkgContext_LogoffTime;
-STRUCT!{struct SecPkgContext_SessionKey {
-    SessionKeyLength: ::c_ulong,
-    SessionKey: *mut ::c_uchar,
-}}
-pub type PSecPkgContext_SessionKey = *mut SecPkgContext_SessionKey;
-STRUCT!{struct SecPkgContext_NegoKeys {
-    KeyType: ::c_ulong,
-    KeyLength: ::c_ushort,
-    KeyValue: *mut ::c_uchar,
-    VerifyKeyType: ::c_ulong,
-    VerifyKeyLength: ::c_ushort,
-    VerifyKeyValue: *mut ::c_uchar,
-}}
-pub type PSecPkgContext_NegoKeys = *mut SecPkgContext_NegoKeys;
-STRUCT!{struct SecPkgContext_PackageInfoW {
-    PackageInfo: PSecPkgInfoW,
-}}
-pub type PSecPkgContext_PackageInfoW = *mut SecPkgContext_PackageInfoW;
-STRUCT!{struct SecPkgContext_PackageInfoA {
-    PackageInfo: PSecPkgInfoA,
-}}
-pub type PSecPkgContext_PackageInfoA = *mut SecPkgContext_PackageInfoA;
-STRUCT!{struct SecPkgContext_UserFlags {
-    UserFlags: ::c_ulong,
-}}
-pub type PSecPkgContext_UserFlags = *mut SecPkgContext_UserFlags;
-STRUCT!{struct SecPkgContext_Flags {
-    Flags: ::c_ulong,
-}}
-pub type PSecPkgContext_Flags = *mut SecPkgContext_Flags;
-STRUCT!{struct SecPkgContext_NegotiationInfoA {
-    PackageInfo: PSecPkgInfoA,
-    NegotiationState: ::c_ulong,
-}}
-pub type PSecPkgContext_NegotiationInfoA = *mut SecPkgContext_NegotiationInfoA;
-STRUCT!{struct SecPkgContext_NegotiationInfoW {
-    PackageInfo: PSecPkgInfoW,
-    NegotiationState: ::c_ulong,
-}}
-pub type PSecPkgContext_NegotiationInfoW = *mut SecPkgContext_NegotiationInfoW;
-pub const SECPKG_NEGOTIATION_COMPLETE: ::c_ulong = 0;
-pub const SECPKG_NEGOTIATION_OPTIMISTIC: ::c_ulong = 1;
-pub const SECPKG_NEGOTIATION_IN_PROGRESS: ::c_ulong = 2;
-pub const SECPKG_NEGOTIATION_DIRECT: ::c_ulong = 3;
-pub const SECPKG_NEGOTIATION_TRY_MULTICRED: ::c_ulong = 4;
-STRUCT!{struct SecPkgContext_NativeNamesW {
-    sClientName: SEC_WCHAR,
-    sServerName: SEC_WCHAR,
-}}
-pub type PSecPkgContext_NativeNamesW = *mut SecPkgContext_NativeNamesW;
-STRUCT!{struct SecPkgContext_NativeNamesA {
-    sClientName: SEC_CHAR,
-    sServerName: SEC_CHAR,
-}}
-pub type PSecPkgContext_NativeNamesA = *mut SecPkgContext_NativeNamesA;
-STRUCT!{struct SecPkgContext_CredentialNameW {
-    CredentialType: ::c_ulong,
-    sCredentialName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgContext_CredentialNameW = *mut SecPkgContext_CredentialNameW;
-STRUCT!{struct SecPkgContext_CredentialNameA {
-    CredentialType: ::c_ulong,
-    sCredentialName: *mut SEC_CHAR,
-}}
-pub type PSecPkgContext_CredentialNameA = *mut SecPkgContext_CredentialNameA;
-STRUCT!{struct SecPkgContext_AccessToken {
-    AccessToken: *mut ::c_void,
-}}
-pub type PSecPkgContext_AccessToken = *mut SecPkgContext_AccessToken;
-STRUCT!{struct SecPkgContext_TargetInformation {
-    MarshalledTargetInfoLength: ::c_ulong,
-    MarshalledTargetInfo: *mut ::c_uchar,
-}}
-pub type PSecPkgContext_TargetInformation = *mut SecPkgContext_TargetInformation;
-STRUCT!{struct SecPkgContext_AuthzID {
-    AuthzIDLength: ::c_ulong,
-    AuthzID: *mut ::c_char,
-}}
-pub type PSecPkgContext_AuthzID = *mut SecPkgContext_AuthzID;
-STRUCT!{struct SecPkgContext_Target {
-    TargetLength: ::c_ulong,
-    Target: *mut ::c_char,
-}}
-pub type PSecPkgContext_Target = *mut SecPkgContext_Target;
-STRUCT!{struct SecPkgContext_ClientSpecifiedTarget {
-    sTargetName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgContext_ClientSpecifiedTarget = *mut SecPkgContext_ClientSpecifiedTarget;
-STRUCT!{struct SecPkgContext_Bindings {
-    BindingsLength: ::c_ulong,
-    Bindings: *mut SEC_CHANNEL_BINDINGS,
-}}
-pub type PSecPkgContext_Bindings = *mut SecPkgContext_Bindings;
-ENUM!{enum SEC_APPLICATION_PROTOCOL_NEGOTIATION_STATUS {
-    SecApplicationProtocolNegotiationStatus_None,
-    SecApplicationProtocolNegotiationStatus_Success,
-    SecApplicationProtocolNegotiationStatus_SelectedClientOnly,
-}}
-pub type PSEC_APPLICATION_PROTOCOL_NEGOTIATION_STATUS =
-    *mut SEC_APPLICATION_PROTOCOL_NEGOTIATION_STATUS;
-pub const MAX_PROTOCOL_ID_SIZE: usize = 0xff;
-STRUCT!{nodebug struct SecPkgContext_ApplicationProtocol {
-    ProtoNegoStatus: SEC_APPLICATION_PROTOCOL_NEGOTIATION_STATUS,
-    ProtoNegoExt: SEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT,
-    ProtocolIdSize: ::c_uchar,
-    ProtocolId: [::c_uchar; MAX_PROTOCOL_ID_SIZE],
-}}
-pub type PSecPkgContext_ApplicationProtocol = *mut SecPkgContext_ApplicationProtocol;
-pub type SEC_GET_KEY_FN = Option<unsafe extern "system" fn(
-    Arg: *mut ::c_void, Principal: *mut ::c_void, KeyVer: ::c_ulong, Key: *mut *mut ::c_void,
-    Status: *mut SECURITY_STATUS,
-)>;
-pub const SECPKG_CONTEXT_EXPORT_RESET_NEW: ::c_ulong = 0x00000001;
-pub const SECPKG_CONTEXT_EXPORT_DELETE_OLD: ::c_ulong = 0x00000002;
-pub const SECPKG_CONTEXT_EXPORT_TO_KERNEL: ::c_ulong = 0x00000004;
-pub type ACQUIRE_CREDENTIALS_HANDLE_FN_W = Option<unsafe extern "system" fn(
-    *mut SEC_WCHAR, *mut SEC_WCHAR, ::c_ulong, *mut ::c_void, *mut ::c_void, SEC_GET_KEY_FN,
-    *mut ::c_void, PCredHandle, PTimeStamp,
-) -> SECURITY_STATUS>;
-pub type ACQUIRE_CREDENTIALS_HANDLE_FN_A = Option<unsafe extern "system" fn(
-    *mut SEC_CHAR, *mut SEC_CHAR, ::c_ulong, *mut ::c_void, *mut ::c_void, SEC_GET_KEY_FN,
-    *mut ::c_void, PCredHandle, PTimeStamp,
-) -> SECURITY_STATUS>;
-pub type FREE_CREDENTIALS_HANDLE_FN = Option<unsafe extern "system" fn(
-    PCredHandle,
-) -> SECURITY_STATUS>;
-pub type ADD_CREDENTIALS_FN_W = Option<unsafe extern "system" fn(
-    PCredHandle, *mut SEC_WCHAR, *mut SEC_WCHAR, ::c_ulong, *mut ::c_void, SEC_GET_KEY_FN,
-    *mut ::c_void, PTimeStamp,
-) -> SECURITY_STATUS>;
-pub type ADD_CREDENTIALS_FN_A = Option<unsafe extern "system" fn(
-    PCredHandle, *mut SEC_CHAR, *mut SEC_CHAR, ::c_ulong, *mut ::c_void, SEC_GET_KEY_FN,
-    *mut ::c_void, PTimeStamp,
-) -> SECURITY_STATUS>;
-pub type CHANGE_PASSWORD_FN_W = Option<unsafe extern "system" fn(
-    *mut SEC_WCHAR, *mut SEC_WCHAR, *mut SEC_WCHAR, *mut SEC_WCHAR, *mut SEC_WCHAR, ::BOOLEAN,
-    ::c_ulong, PSecBufferDesc,
-) -> SECURITY_STATUS>;
-pub type CHANGE_PASSWORD_FN_A = Option<unsafe extern "system" fn(
-    *mut SEC_CHAR, *mut SEC_CHAR, *mut SEC_CHAR, *mut SEC_CHAR, *mut SEC_CHAR, ::BOOLEAN,
-    ::c_ulong, PSecBufferDesc,
-) -> SECURITY_STATUS>;
-//1844
-ENUM!{enum SecDelegationType {
-    SecFull,
-    SecService,
-    SecTree,
-    SecDirectory,
-    SecObject,
-}}
-pub type PSecDelegationType = *mut SecDelegationType;
-STRUCT!{struct SEC_WINNT_AUTH_BYTE_VECTOR {
-    ByteArrayOffset: ::c_ulong,
-    ByteArrayLength: ::c_ushort,
-}}
-pub type PSEC_WINNT_AUTH_BYTE_VECTOR = *mut SEC_WINNT_AUTH_BYTE_VECTOR;
-STRUCT!{struct SEC_WINNT_AUTH_DATA {
-    CredType: ::GUID,
-    CredData: SEC_WINNT_AUTH_BYTE_VECTOR,
-}}
-pub type PSEC_WINNT_AUTH_DATA = *mut SEC_WINNT_AUTH_DATA;
-STRUCT!{struct SEC_WINNT_AUTH_PACKED_CREDENTIALS {
-    cbHeaderLength: ::c_ushort,
-    cbStructureLength: ::c_ushort,
-    AuthData: SEC_WINNT_AUTH_DATA,
-}}
-pub type PSEC_WINNT_AUTH_PACKED_CREDENTIALS = *mut SEC_WINNT_AUTH_PACKED_CREDENTIALS;
-DEFINE_GUID!(SEC_WINNT_AUTH_DATA_TYPE_PASSWORD, 0x28bfc32f, 0x10f6, 0x4738,
-    0x98, 0xd1, 0x1a, 0xc0, 0x61, 0xdf, 0x71, 0x6a);
-DEFINE_GUID!(SEC_WINNT_AUTH_DATA_TYPE_CERT, 0x235f69ad, 0x73fb, 0x4dbc,
-    0x82, 0x3, 0x6, 0x29, 0xe7, 0x39, 0x33, 0x9b);
-STRUCT!{struct SEC_WINNT_AUTH_DATA_PASSWORD {
-    UnicodePassword: SEC_WINNT_AUTH_BYTE_VECTOR,
-}}
-pub type PSEC_WINNT_AUTH_DATA_PASSWORD = *mut SEC_WINNT_AUTH_DATA_PASSWORD;
-DEFINE_GUID!(SEC_WINNT_AUTH_DATA_TYPE_CSP_DATA, 0x68fd9879, 0x79c, 0x4dfe,
-    0x82, 0x81, 0x57, 0x8a, 0xad, 0xc1, 0xc1, 0x0);
-STRUCT!{struct SEC_WINNT_AUTH_CERTIFICATE_DATA {
-    cbHeaderLength: ::c_ushort,
-    cbStructureLength: ::c_ushort,
-    Certificate: SEC_WINNT_AUTH_BYTE_VECTOR,
-}}
-pub type PSEC_WINNT_AUTH_CERTIFICATE_DATA = *mut SEC_WINNT_AUTH_CERTIFICATE_DATA;
-STRUCT!{struct SEC_WINNT_CREDUI_CONTEXT_VECTOR {
-    CredUIContextArrayOffset: ::ULONG,
-    CredUIContextCount: ::USHORT,
-}}
-pub type PSEC_WINNT_CREDUI_CONTEXT_VECTOR = *mut SEC_WINNT_CREDUI_CONTEXT_VECTOR;
-STRUCT!{struct SEC_WINNT_AUTH_SHORT_VECTOR {
-    ShortArrayOffset: ::ULONG,
-    ShortArrayCount: ::USHORT,
-}}
-pub type PSEC_WINNT_AUTH_SHORT_VECTOR = *mut SEC_WINNT_AUTH_SHORT_VECTOR;
-STRUCT!{struct CREDUIWIN_MARSHALED_CONTEXT {
-    StructureType: ::GUID,
-    cbHeaderLength: ::USHORT,
-    LogonId: ::LUID,
-    MarshaledDataType: ::GUID,
-    MarshaledDataOffset: ::ULONG,
-    MarshaledDataLength: ::USHORT,
-}}
-pub type PCREDUIWIN_MARSHALED_CONTEXT = *mut CREDUIWIN_MARSHALED_CONTEXT;
-STRUCT!{struct SEC_WINNT_CREDUI_CONTEXT {
-    cbHeaderLength: ::USHORT,
-    CredUIContextHandle: ::HANDLE,
-    UIInfo: ::PCREDUI_INFOW,
-    dwAuthError: ::ULONG,
-    pInputAuthIdentity: PSEC_WINNT_AUTH_IDENTITY_OPAQUE,
-    TargetName: ::PUNICODE_STRING,
-}}
-pub type PSEC_WINNT_CREDUI_CONTEXT = *mut SEC_WINNT_CREDUI_CONTEXT;
-pub type PSEC_WINNT_AUTH_IDENTITY_OPAQUE = ::PVOID;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/strmif.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/strmif.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/strmif.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/strmif.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub type REFERENCE_TIME = LONGLONG;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/subauth.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/subauth.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/subauth.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/subauth.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Types and macros for Subauthentication Packages.
-STRUCT!{struct UNICODE_STRING {
-    Length: ::USHORT,
-    MaximumLength: ::USHORT,
-    Buffer: ::PWSTR,
-}}
-pub type PUNICODE_STRING = *mut UNICODE_STRING;
-STRUCT!{struct STRING {
-    Length: ::USHORT,
-    MaximumLength: ::USHORT,
-    Buffer: ::PCHAR,
-}}
-pub type PSTRING = *mut STRING;
-STRUCT!{struct OLD_LARGE_INTEGER {
-    LowPart: ::ULONG,
-    HighPart: ::LONG,
-}}
-pub type POLD_LARGE_INTEGER = *mut OLD_LARGE_INTEGER;
-pub type SAM_HANDLE = ::PVOID;
-pub type PSAM_HANDLE = *mut ::PVOID;
-pub const USER_ACCOUNT_DISABLED: ::ULONG = 0x00000001;
-pub const USER_HOME_DIRECTORY_REQUIRED: ::ULONG = 0x00000002;
-pub const USER_PASSWORD_NOT_REQUIRED: ::ULONG = 0x00000004;
-pub const USER_TEMP_DUPLICATE_ACCOUNT: ::ULONG = 0x00000008;
-pub const USER_NORMAL_ACCOUNT: ::ULONG = 0x00000010;
-pub const USER_MNS_LOGON_ACCOUNT: ::ULONG = 0x00000020;
-pub const USER_INTERDOMAIN_TRUST_ACCOUNT: ::ULONG = 0x00000040;
-pub const USER_WORKSTATION_TRUST_ACCOUNT: ::ULONG = 0x00000080;
-pub const USER_SERVER_TRUST_ACCOUNT: ::ULONG = 0x00000100;
-pub const USER_DONT_EXPIRE_PASSWORD: ::ULONG = 0x00000200;
-pub const USER_ACCOUNT_AUTO_LOCKED: ::ULONG = 0x00000400;
-pub const USER_ENCRYPTED_TEXT_PASSWORD_ALLOWED: ::ULONG = 0x00000800;
-pub const USER_SMARTCARD_REQUIRED: ::ULONG = 0x00001000;
-pub const USER_TRUSTED_FOR_DELEGATION: ::ULONG = 0x00002000;
-pub const USER_NOT_DELEGATED: ::ULONG = 0x00004000;
-pub const USER_USE_DES_KEY_ONLY: ::ULONG = 0x00008000;
-pub const USER_DONT_REQUIRE_PREAUTH: ::ULONG = 0x00010000;
-pub const USER_PASSWORD_EXPIRED: ::ULONG = 0x00020000;
-pub const USER_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION: ::ULONG = 0x00040000;
-pub const USER_NO_AUTH_DATA_REQUIRED: ::ULONG = 0x00080000;
-pub const USER_PARTIAL_SECRETS_ACCOUNT: ::ULONG = 0x00100000;
-pub const USER_USE_AES_KEYS: ::ULONG = 0x00200000;
-pub const NEXT_FREE_ACCOUNT_CONTROL_BIT: ::ULONG = USER_USE_AES_KEYS << 1;
-pub const USER_MACHINE_ACCOUNT_MASK: ::ULONG = USER_INTERDOMAIN_TRUST_ACCOUNT
-    | USER_WORKSTATION_TRUST_ACCOUNT | USER_SERVER_TRUST_ACCOUNT;
-pub const USER_ACCOUNT_TYPE_MASK: ::ULONG = USER_TEMP_DUPLICATE_ACCOUNT | USER_NORMAL_ACCOUNT
-    | USER_MACHINE_ACCOUNT_MASK;
-pub const USER_COMPUTED_ACCOUNT_CONTROL_BITS: ::ULONG = USER_ACCOUNT_AUTO_LOCKED
-| USER_PASSWORD_EXPIRED;
-pub const SAM_DAYS_PER_WEEK: ::USHORT = 7;
-pub const SAM_HOURS_PER_WEEK: ::USHORT = 24 * SAM_DAYS_PER_WEEK;
-pub const SAM_MINUTES_PER_WEEK: ::USHORT = 60 * SAM_HOURS_PER_WEEK;
-STRUCT!{struct LOGON_HOURS {
-    UnitsPerWeek: ::USHORT,
-    LogonHours: ::PUCHAR,
-}}
-pub type PLOGON_HOURS = *mut LOGON_HOURS;
-STRUCT!{struct SR_SECURITY_DESCRIPTOR {
-    Length: ::ULONG,
-    SecurityDescriptor: ::PUCHAR,
-}}
-pub type PSR_SECURITY_DESCRIPTOR = *mut SR_SECURITY_DESCRIPTOR;
-STRUCT!{struct USER_ALL_INFORMATION {
-    LastLogon: ::LARGE_INTEGER,
-    LastLogoff: ::LARGE_INTEGER,
-    PasswordLastSet: ::LARGE_INTEGER,
-    AccountExpires: ::LARGE_INTEGER,
-    PasswordCanChange: ::LARGE_INTEGER,
-    PasswordMustChange: ::LARGE_INTEGER,
-    UserName: UNICODE_STRING,
-    FullName: UNICODE_STRING,
-    HomeDirectory: UNICODE_STRING,
-    HomeDirectoryDrive: UNICODE_STRING,
-    ScriptPath: UNICODE_STRING,
-    ProfilePath: UNICODE_STRING,
-    AdminComment: UNICODE_STRING,
-    WorkStations: UNICODE_STRING,
-    UserComment: UNICODE_STRING,
-    Parameters: UNICODE_STRING,
-    LmPassword: UNICODE_STRING,
-    NtPassword: UNICODE_STRING,
-    PrivateData: UNICODE_STRING,
-    SecurityDescriptor: SR_SECURITY_DESCRIPTOR,
-    UserId: ::ULONG,
-    PrimaryGroupId: ::ULONG,
-    UserAccountControl: ::ULONG,
-    WhichFields: ::ULONG,
-    LogonHours: LOGON_HOURS,
-    BadPasswordCount: ::USHORT,
-    LogonCount: ::USHORT,
-    CountryCode: ::USHORT,
-    CodePage: ::USHORT,
-    LmPasswordPresent: ::BOOLEAN,
-    NtPasswordPresent: ::BOOLEAN,
-    PasswordExpired: ::BOOLEAN,
-    PrivateDataSensitive: ::BOOLEAN,
-}}
-pub type PUSER_ALL_INFORMATION = *mut USER_ALL_INFORMATION;
-pub const USER_ALL_PARAMETERS: ::ULONG = 0x00200000;
-pub const CLEAR_BLOCK_LENGTH: usize = 8;
-STRUCT!{struct CLEAR_BLOCK {
-    data: [::CHAR; CLEAR_BLOCK_LENGTH],
-}}
-pub type PCLEAR_BLOCK = *mut CLEAR_BLOCK;
-pub const CYPHER_BLOCK_LENGTH: usize = 8;
-STRUCT!{struct CYPHER_BLOCK {
-    data: [::CHAR; CYPHER_BLOCK_LENGTH],
-}}
-pub type PCYPHER_BLOCK = *mut CYPHER_BLOCK;
-STRUCT!{struct LM_OWF_PASSWORD {
-    data: [CYPHER_BLOCK; 2],
-}}
-pub type PLM_OWF_PASSWORD = *mut LM_OWF_PASSWORD;
-pub type LM_CHALLENGE = CLEAR_BLOCK;
-pub type PLM_CHALLENGE = *mut LM_CHALLENGE;
-pub type NT_OWF_PASSWORD = LM_OWF_PASSWORD;
-pub type PNT_OWF_PASSWORD = *mut NT_OWF_PASSWORD;
-pub type NT_CHALLENGE = LM_CHALLENGE;
-pub type PNT_CHALLENGE = *mut NT_CHALLENGE;
-pub const USER_SESSION_KEY_LENGTH: usize = CYPHER_BLOCK_LENGTH * 2;
-STRUCT!{struct USER_SESSION_KEY {
-    data: [CYPHER_BLOCK; 2],
-}}
-pub type PUSER_SESSION_KEY = *mut USER_SESSION_KEY;
-ENUM!{enum NETLOGON_LOGON_INFO_CLASS {
-    NetlogonInteractiveInformation = 1,
-    NetlogonNetworkInformation,
-    NetlogonServiceInformation,
-    NetlogonGenericInformation,
-    NetlogonInteractiveTransitiveInformation,
-    NetlogonNetworkTransitiveInformation,
-    NetlogonServiceTransitiveInformation,
-}}
-STRUCT!{struct NETLOGON_LOGON_IDENTITY_INFO {
-    LogonDomainName: UNICODE_STRING,
-    ParameterControl: ::ULONG,
-    LogonId: OLD_LARGE_INTEGER,
-    UserName: UNICODE_STRING,
-    Workstation: UNICODE_STRING,
-}}
-pub type PNETLOGON_LOGON_IDENTITY_INFO = *mut NETLOGON_LOGON_IDENTITY_INFO;
-STRUCT!{struct NETLOGON_INTERACTIVE_INFO {
-    Identity: NETLOGON_LOGON_IDENTITY_INFO,
-    LmOwfPassword: LM_OWF_PASSWORD,
-    NtOwfPassword: NT_OWF_PASSWORD,
-}}
-pub type PNETLOGON_INTERACTIVE_INFO = *mut NETLOGON_INTERACTIVE_INFO;
-STRUCT!{struct NETLOGON_SERVICE_INFO {
-    Identity: NETLOGON_LOGON_IDENTITY_INFO,
-    LmOwfPassword: LM_OWF_PASSWORD,
-    NtOwfPassword: NT_OWF_PASSWORD,
-}}
-pub type PNETLOGON_SERVICE_INFO = *mut NETLOGON_SERVICE_INFO;
-STRUCT!{struct NETLOGON_NETWORK_INFO {
-    Identity: NETLOGON_LOGON_IDENTITY_INFO,
-    LmChallenge: LM_CHALLENGE,
-    NtChallengeResponse: STRING,
-    LmChallengeResponse: STRING,
-}}
-pub type PNETLOGON_NETWORK_INFO = *mut NETLOGON_NETWORK_INFO;
-STRUCT!{struct NETLOGON_GENERIC_INFO {
-    Identity: NETLOGON_LOGON_IDENTITY_INFO,
-    PackageName: UNICODE_STRING,
-    DataLength: ::ULONG,
-    LogonData: ::PUCHAR,
-}}
-pub type PNETLOGON_GENERIC_INFO = *mut NETLOGON_GENERIC_INFO;
-pub const MSV1_0_PASSTHRU: ::ULONG = 0x01;
-pub const MSV1_0_GUEST_LOGON: ::ULONG = 0x02;
-STRUCT!{struct MSV1_0_VALIDATION_INFO {
-    LogoffTime: ::LARGE_INTEGER,
-    KickoffTime: ::LARGE_INTEGER,
-    LogonServer: UNICODE_STRING,
-    LogonDomainName: UNICODE_STRING,
-    SessionKey: USER_SESSION_KEY,
-    Authoritative: ::BOOLEAN,
-    UserFlags: ::ULONG,
-    WhichFields: ::ULONG,
-    UserId: ::ULONG,
-}}
-pub type PMSV1_0_VALIDATION_INFO = *mut MSV1_0_VALIDATION_INFO;
-pub const MSV1_0_VALIDATION_LOGOFF_TIME: ::ULONG = 0x00000001;
-pub const MSV1_0_VALIDATION_KICKOFF_TIME: ::ULONG = 0x00000002;
-pub const MSV1_0_VALIDATION_LOGON_SERVER: ::ULONG = 0x00000004;
-pub const MSV1_0_VALIDATION_LOGON_DOMAIN: ::ULONG = 0x00000008;
-pub const MSV1_0_VALIDATION_SESSION_KEY: ::ULONG = 0x00000010;
-pub const MSV1_0_VALIDATION_USER_FLAGS: ::ULONG = 0x00000020;
-pub const MSV1_0_VALIDATION_USER_ID: ::ULONG = 0x00000040;
-pub const MSV1_0_SUBAUTH_ACCOUNT_DISABLED: ::ULONG = 0x00000001;
-pub const MSV1_0_SUBAUTH_PASSWORD: ::ULONG = 0x00000002;
-pub const MSV1_0_SUBAUTH_WORKSTATIONS: ::ULONG = 0x00000004;
-pub const MSV1_0_SUBAUTH_LOGON_HOURS: ::ULONG = 0x00000008;
-pub const MSV1_0_SUBAUTH_ACCOUNT_EXPIRY: ::ULONG = 0x00000010;
-pub const MSV1_0_SUBAUTH_PASSWORD_EXPIRY: ::ULONG = 0x00000020;
-pub const MSV1_0_SUBAUTH_ACCOUNT_TYPE: ::ULONG = 0x00000040;
-pub const MSV1_0_SUBAUTH_LOCKOUT: ::ULONG = 0x00000080;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/synchapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/synchapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/synchapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/synchapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-synch-l1
-pub type SRWLOCK = ::RTL_SRWLOCK;
-pub type PSRWLOCK = *mut ::RTL_SRWLOCK;
-pub type SYNCHRONIZATION_BARRIER = ::RTL_BARRIER;
-pub type PSYNCHRONIZATION_BARRIER = ::PRTL_BARRIER;
-pub type LPSYNCHRONIZATION_BARRIER = ::PRTL_BARRIER;
-pub type PINIT_ONCE_FN = Option<unsafe extern "system" fn(
-    InitOnce: ::PINIT_ONCE, Parameter: ::PVOID, Context: *mut ::PVOID,
-) -> ::BOOL>;
-pub type PTIMERAPCROUTINE = Option<unsafe extern "system" fn(
-    lpArgToCompletionRoutine: ::LPVOID, dwTimerLowValue: ::DWORD, dwTimerHighValue: ::DWORD,
-)>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sysinfoapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sysinfoapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/sysinfoapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/sysinfoapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-sysinfo-l1.
-STRUCT!{struct SYSTEM_INFO {
-    wProcessorArchitecture: ::WORD,
-    wReserved: ::WORD,
-    dwPageSize: ::DWORD,
-    lpMinimumApplicationAddress: ::LPVOID,
-    lpMaximumApplicationAddress: ::LPVOID,
-    dwActiveProcessorMask: ::DWORD_PTR,
-    dwNumberOfProcessors: ::DWORD,
-    dwProcessorType: ::DWORD,
-    dwAllocationGranularity: ::DWORD,
-    wProcessorLevel: ::WORD,
-    wProcessorRevision: ::WORD,
-}}
-UNION!(SYSTEM_INFO, wProcessorArchitecture, dwOemId, dwOemId_mut, ::DWORD);
-pub type LPSYSTEM_INFO = *mut SYSTEM_INFO;
-STRUCT!{struct MEMORYSTATUSEX {
-    dwLength: ::DWORD,
-    dwMemoryLoad: ::DWORD,
-    ullTotalPhys: ::DWORDLONG,
-    ullAvailPhys: ::DWORDLONG,
-    ullTotalPageFile: ::DWORDLONG,
-    ullAvailPageFile: ::DWORDLONG,
-    ullTotalVirtual: ::DWORDLONG,
-    ullAvailVirtual: ::DWORDLONG,
-    ullAvailExtendedVirtual: ::DWORDLONG,
-}}
-pub type LPMEMORYSTATUSEX = *mut MEMORYSTATUSEX;
-ENUM!{enum COMPUTER_NAME_FORMAT {
-    ComputerNameNetBIOS,
-    ComputerNameDnsHostname,
-    ComputerNameDnsDomain,
-    ComputerNameDnsFullyQualified,
-    ComputerNamePhysicalNetBIOS,
-    ComputerNamePhysicalDnsHostname,
-    ComputerNamePhysicalDnsDomain,
-    ComputerNamePhysicalDnsFullyQualified,
-    ComputerNameMax,
-}}
-pub type INIT_ONCE = ::RTL_RUN_ONCE;
-pub type PINIT_ONCE = ::PRTL_RUN_ONCE;
-pub type LPINIT_ONCE = ::PRTL_RUN_ONCE;
-pub type CONDITION_VARIABLE = ::RTL_CONDITION_VARIABLE;
-pub type PCONDITION_VARIABLE = *mut CONDITION_VARIABLE;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/threadpoolapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/threadpoolapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/threadpoolapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/threadpoolapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-threadpool-l1.
-pub type PTP_WIN32_IO_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: ::PTP_CALLBACK_INSTANCE, Context: ::PVOID, Overlapped: ::PVOID, IoResult: ::ULONG,
-    NumberOfBytesTransferred: ::ULONG_PTR, Io: ::PTP_IO,
-)>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/timezoneapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/timezoneapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/timezoneapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/timezoneapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-timezone-l1
-pub const TIME_ZONE_ID_INVALID: ::DWORD = 0xFFFFFFFF;
-STRUCT!{struct TIME_ZONE_INFORMATION {
-    Bias: ::LONG,
-    StandardName: [::WCHAR; 32],
-    StandardDate: ::SYSTEMTIME,
-    StandardBias: ::LONG,
-    DaylightName: [::WCHAR; 32],
-    DaylightDate: ::SYSTEMTIME,
-    DaylightBias: ::LONG,
-}}
-pub type PTIME_ZONE_INFORMATION = *mut TIME_ZONE_INFORMATION;
-pub type LPTIME_ZONE_INFORMATION = *mut TIME_ZONE_INFORMATION;
-STRUCT!{nodebug struct DYNAMIC_TIME_ZONE_INFORMATION {
-    Bias: ::LONG,
-    StandardName: [::WCHAR; 32],
-    StandardDate: ::SYSTEMTIME,
-    StandardBias: ::LONG,
-    DaylightName: [::WCHAR; 32],
-    DaylightDate: ::SYSTEMTIME,
-    DaylightBias: ::LONG,
-    TimeZoneKeyName: [::WCHAR; 128],
-    DynamicDaylightTimeDisabled: ::BOOLEAN,
-}}
-pub type PDYNAMIC_TIME_ZONE_INFORMATION = *mut DYNAMIC_TIME_ZONE_INFORMATION;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/tlhelp32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/tlhelp32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/tlhelp32.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/tlhelp32.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-// Copyright © 2015, Gigih Aji Ibrahim
-// Licensed under the MIT License <LICENSE.md>
-pub const MAX_MODULE_NAME32: usize = 255;
-pub const TH32CS_SNAPHEAPLIST: ::DWORD = 0x00000001;
-pub const TH32CS_SNAPPROCESS: ::DWORD = 0x00000002;
-pub const TH32CS_SNAPTHREAD: ::DWORD = 0x00000004;
-pub const TH32CS_SNAPMODULE: ::DWORD = 0x00000008;
-pub const TH32CS_SNAPMODULE32: ::DWORD = 0x00000010;
-pub const TH32CS_SNAPALL: ::DWORD =
-    (TH32CS_SNAPHEAPLIST | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD | TH32CS_SNAPMODULE);
-pub const TH32CS_INHERIT: ::DWORD = 0x80000000;
-STRUCT!{struct HEAPLIST32 {
-    dwSize: ::SIZE_T,
-    th32ProcessID: ::DWORD,
-    th32HeapID: :: ULONG_PTR,
-    dwFlags: ::DWORD,
-}}
-pub type PHEAPLIST32 = *mut HEAPLIST32;
-pub type LPHEAPLIST32 = *mut HEAPLIST32;
-pub const HF32_DEFAULT: ::DWORD = 1;
-pub const HF32_SHARED: ::DWORD = 2;
-STRUCT!{struct HEAPENTRY32 {
-    dwSize: ::SIZE_T,
-    hHandle: ::HANDLE,
-    dwAddress: ::ULONG_PTR,
-    dwBlockSize: ::SIZE_T,
-    dwFlags: ::DWORD,
-    dwLockCount: ::DWORD,
-    dwResvd: ::DWORD,
-    th32ProcessID: ::DWORD,
-    th32HeapID: ::ULONG_PTR,
-}}
-pub type PHEAPENTRY32 = *mut HEAPENTRY32;
-pub type LPHEAPENTRY32 = *mut HEAPENTRY32;
-pub const LF32_FIXED: ::DWORD = 0x00000001;
-pub const LF32_FREE: ::DWORD = 0x00000002;
-pub const LF32_MOVEABLE: ::DWORD = 0x00000004;
-STRUCT!{nodebug struct PROCESSENTRY32W {
-    dwSize: ::DWORD,
-    cntUsage: ::DWORD,
-    th32ProcessID: ::DWORD,
-    th32DefaultHeapID: ::ULONG_PTR,
-    th32ModuleID: ::DWORD,
-    cntThreads: ::DWORD,
-    th32ParentProcessID: ::DWORD,
-    pcPriClassBase: ::LONG,
-    dwFlags: ::DWORD,
-    szExeFile: [::WCHAR; ::MAX_PATH],
-}}
-pub type PPROCESSENTRY32W = *mut PROCESSENTRY32W;
-pub type LPPROCESSENTRY32W = *mut PROCESSENTRY32W;
-STRUCT!{nodebug struct PROCESSENTRY32 {
-    dwSize: ::DWORD,
-    cntUsage: ::DWORD,
-    th32ProcessID: ::DWORD,
-    th32DefaultHeapID: ::ULONG_PTR,
-    th32ModuleID: ::DWORD,
-    cntThreads: ::DWORD,
-    th32ParentProcessID: ::DWORD,
-    pcPriClassBase: ::LONG,
-    dwFlags: ::DWORD,
-    szExeFile: [::CHAR; ::MAX_PATH],
-}}
-pub type PPROCESSENTRY32 = *mut PROCESSENTRY32;
-pub type LPPROCESSENTRY32 = *mut PROCESSENTRY32;
-STRUCT!{struct THREADENTRY32 {
-    dwSize: ::DWORD,
-    cntUsage: ::DWORD,
-    th32ThreadID: ::DWORD,
-    th32OwnerProcessID: ::DWORD,
-    tpBasePri: ::LONG,
-    tpDeltaPri: ::LONG,
-    dwFlags: ::DWORD,
-}}
-pub type PTHREADENTRY32 = *mut THREADENTRY32;
-pub type LPTHREADENTRY32 = *mut THREADENTRY32;
-STRUCT!{nodebug struct MODULEENTRY32W {
-    dwSize: ::DWORD,
-    th32ModuleID: ::DWORD,
-    th32ProcessID: ::DWORD,
-    GlblcntUsage: ::DWORD,
-    ProccntUsage: ::DWORD,
-    modBaseAddr: *mut ::BYTE,
-    modBaseSize: ::DWORD,
-    hModule: ::HMODULE,
-    szModule: [::WCHAR; ::MAX_MODULE_NAME32 + 1],
-    szExePath: [::WCHAR; ::MAX_PATH],
-}}
-pub type PMODULEENTRY32W = *mut MODULEENTRY32W;
-pub type LPMODULEENTRY32W = *mut MODULEENTRY32W;
-STRUCT!{nodebug struct MODULEENTRY32 {
-    dwSize: ::DWORD,
-    th32ModuleID: ::DWORD,
-    th32ProcessID: ::DWORD,
-    GlblcntUsage: ::DWORD,
-    ProccntUsage: ::DWORD,
-    modBaseAddr: *mut ::BYTE,
-    modBaseSize: ::DWORD,
-    hModule: ::HMODULE,
-    szModule: [::CHAR; ::MAX_MODULE_NAME32 + 1],
-    szExePath: [::CHAR; ::MAX_PATH],
-}}
-pub type PMODULEENTRY32 = *mut MODULEENTRY32;
-pub type LPMODULEENTRY32 = *mut MODULEENTRY32;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/unknwnbase.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/unknwnbase.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/unknwnbase.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/unknwnbase.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-RIDL!(
-interface IUnknown(IUnknownVtbl) {
-    fn QueryInterface(&mut self, riid: ::REFIID, ppvObject: *mut *mut ::c_void) -> ::HRESULT,
-    fn AddRef(&mut self) -> ::ULONG,
-    fn Release(&mut self) -> ::ULONG
-}
-);
-pub type LPUNKNOWN = *mut IUnknown;
-RIDL!(
-interface AsyncIUnknown(AsyncIUnknownVtbl): IUnknown(IUnknownVtbl) {
-    fn Begin_QueryInterface(&mut self, riid: ::REFIID) -> ::HRESULT,
-    fn Finish_QueryInterface(&mut self, ppvObject: *mut *mut ::c_void) -> ::HRESULT,
-    fn Begin_AddRef(&mut self) -> ::HRESULT,
-    fn Finish_AddRef(&mut self) -> ::ULONG,
-    fn Begin_Release(&mut self) -> ::HRESULT,
-    fn Finish_Release(&mut self) -> ::ULONG
-}
-);
-RIDL!(
-interface IClassFactory(IClassFactoryVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateInstance(
-        &mut self, pUnkOuter: *mut IUnknown, riid: ::REFIID, ppvObject: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn LockServer(&mut self, fLock: ::BOOL) -> ::HRESULT
-}
-);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/urlhist.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/urlhist.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/urlhist.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/urlhist.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Url History Interfaces
-pub const STATURL_QUERYFLAG_ISCACHED: ::DWORD = 0x00010000;
-pub const STATURL_QUERYFLAG_NOURL: ::DWORD = 0x00020000;
-pub const STATURL_QUERYFLAG_NOTITLE: ::DWORD = 0x00040000;
-pub const STATURL_QUERYFLAG_TOPLEVEL: ::DWORD = 0x00080000;
-pub const STATURLFLAG_ISCACHED: ::DWORD = 0x00000001;
-pub const STATURLFLAG_ISTOPLEVEL: ::DWORD = 0x00000002;
-ENUM!{enum ADDURL_FLAG {
-    ADDURL_FIRST = 0,
-    ADDURL_ADDTOHISTORYANDCACHE = 0,
-    ADDURL_ADDTOCACHE = 1,
-    ADDURL_Max = 2147483647,
-}}
-pub type LPENUMSTATURL = *mut IEnumSTATURL;
-STRUCT!{struct STATURL {
-    cbSize: ::DWORD,
-    pwcsUrl: ::LPWSTR,
-    pwcsTitle: ::LPWSTR,
-    ftLastVisited: ::FILETIME,
-    ftLastUpdated: ::FILETIME,
-    ftExpires: ::FILETIME,
-    dwFlags: ::DWORD,
-}}
-pub type LPSTATURL = *mut STATURL;
-RIDL!{interface IEnumSTATURL(IEnumSTATURLVtbl): IUnknown(IUnknownVtbl) {
-    fn Next(&mut self, celt: ::ULONG, rgelt: LPSTATURL, pceltFetched: *mut ::ULONG) -> ::HRESULT,
-    fn Skip(&mut self, celt: ::ULONG) -> ::HRESULT,
-    fn Reset(&mut self) -> ::HRESULT,
-    fn Clone(&mut self, ppenum: *mut *mut ::IEnumSTATURL) -> ::HRESULT,
-    fn SetFilter(&mut self, poszFilter: ::LPCOLESTR, dwFlags: ::DWORD) -> ::HRESULT
-}}
-pub type LPURLHISTORYSTG = *mut IUrlHistoryStg;
-RIDL!{interface IUrlHistoryStg(IUrlHistoryStgVtbl): IUnknown(IUnknownVtbl) {
-    fn AddUrl(&mut self, pocsUrl: ::LPCOLESTR) -> ::HRESULT,
-    fn DeleteUrl(&mut self, pocsUrl: ::LPCOLESTR, dwFlags: ::DWORD) -> ::HRESULT,
-    fn QueryUrl(
-        &mut self, pocsUrl: ::LPCOLESTR, dwFlags: ::DWORD, lpSTATURL: LPSTATURL
-    ) -> ::HRESULT,
-    fn BindToObject(
-        &mut self, pocsUrl: ::LPCOLESTR, riid: ::REFIID, ppvOut: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn EnumUrls(&mut self, ppEnum: *mut *mut ::IEnumSTATURL) -> ::HRESULT
-}}
-pub type LPURLHISTORYSTG2 = *mut IUrlHistoryStg2;
-RIDL!{interface IUrlHistoryStg2(IUrlHistoryStg2Vtbl): IUrlHistoryStg(IUrlHistoryStgVtbl) {
-    fn AddUrlAndNotify(
-        &mut self, pocsUrl: ::LPCOLESTR, pocsTitle: ::LPCOLESTR, dwFlags: ::DWORD,
-        fWriteHistory: ::BOOL, poctNotify: *mut ::IOleCommandTarget, punkISFolder: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn ClearHistory(&mut self) -> ::HRESULT
-}}
-pub type LPURLHISTORYNOTIFY = *mut IUrlHistoryNotify;
-RIDL!{interface IUrlHistoryNotify(IUrlHistoryNotifyVtbl):
-    IOleCommandTarget(IOleCommandTargetVtbl) {}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/urlmon.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/urlmon.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/urlmon.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/urlmon.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of Urlmon.h
-// FIXME: Implement these interfaces
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInternetSecurityManager;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/usb.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/usb.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/usb.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/usb.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// Copyright © 2016, bitbegin
-// Licensed under the MIT License <LICENSE.md>
-//! USB Definitions.
-ENUM!{enum USBD_PIPE_TYPE {
-    UsbdPipeTypeControl,
-    UsbdPipeTypeIsochronous,
-    UsbdPipeTypeBulk,
-    UsbdPipeTypeInterrupt,
-}}
-
-pub type USBD_STATUS = ::LONG;
-
-STRUCT!{struct USBD_ISO_PACKET_DESCRIPTOR {
-	Offset: ::ULONG,
-	Length: ::ULONG,
-	Status: ::USBD_STATUS,
-}}
-pub type PUSBD_ISO_PACKET_DESCRIPTOR = *mut USBD_ISO_PACKET_DESCRIPTOR;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/usbspec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/usbspec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/usbspec.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/usbspec.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// Copyright © 2016, bitbegin
-// Licensed under the MIT License <LICENSE.md>
-//! USB Spec Definitions.
-ENUM!{enum USB_DEVICE_SPEED {
-    UsbLowSpeed = 0,
-    UsbFullSpeed,
-    UsbHighSpeed,
-    UsbSuperSpeed,
-}}
-ENUM!{enum USB_DEVICE_TYPE {
-    Usb11Device = 0,
-    Usb20Device,
-}}
-STRUCT!{struct BM_REQUEST_TYPE {
-    _BM: ::UCHAR,
-    B: ::UCHAR,
-}}
-BITFIELD!{BM_REQUEST_TYPE _BM: ::UINT8 [
-    Recipient set_Recipient[0..2],
-    Reserved set_Reserved[2..5],
-    Type set_Type[5..7],
-    Dir set_Dir[7..8],
-]}
-pub type PBM_REQUEST_TYPE = *mut BM_REQUEST_TYPE;
-
-STRUCT!{#[repr(packed)] struct USB_CONFIGURATION_DESCRIPTOR {
-    bLength: ::UCHAR,
-    bDescriptorType: ::UCHAR,
-    wTotalLength: ::USHORT,
-    bNumInterfaces: ::UCHAR,
-    bConfigurationValue: ::UCHAR,
-    iConfiguration: ::UCHAR,
-    bmAttributes: ::UCHAR,
-    MaxPower: ::UCHAR,
-}}
-pub type PUSB_CONFIGURATION_DESCRIPTOR = *mut USB_CONFIGURATION_DESCRIPTOR;
-#[test]
-fn test_USB_CONFIGURATION_DESCRIPTOR_size() {
-    use std::mem::size_of;
-    assert_eq!(size_of::<USB_CONFIGURATION_DESCRIPTOR>(), 9)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/usp10.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/usp10.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/usp10.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/usp10.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-// Copyright © 2015, Jordan Miner
-// Licensed under the MIT License <LICENSE.md>
-//! Uniscribe structure declarations and constant definitions
-pub const SCRIPT_UNDEFINED: ::WORD = 0;
-pub const USP_E_SCRIPT_NOT_IN_FONT: ::HRESULT = MAKE_HRESULT!(
-    ::SEVERITY_ERROR, ::FACILITY_ITF, 0x200
-);
-DECLARE_HANDLE!(SCRIPT_CACHE, SCRIPT_CACHE__);
-STRUCT!{struct SCRIPT_CONTROL {
-    bit_fields: ::DWORD,
-}}
-BITFIELD!(SCRIPT_CONTROL bit_fields: ::DWORD [
-    uDefaultLanguage set_uDefaultLanguage[0..16],
-    fContextDigits set_fContextDigits[16..17],
-    fInvertPreBoundDir set_fInvertPreBoundDir[17..18],
-    fInvertPostBoundDir set_fInvertPostBoundDir[18..19],
-    fLinkStringBefore set_fLinkStringBefore[19..20],
-    fLinkStringAfter set_fLinkStringAfter[20..21],
-    fNeutralOverride set_fNeutralOverride[21..22],
-    fNumericOverride set_fNumericOverride[22..23],
-    fLegacyBidiClass set_fLegacyBidiClass[23..24],
-    fMergeNeutralItems set_fMergeNeutralItems[24..25],
-    fReserved set_fReserved[25..32],
-]);
-STRUCT!{struct SCRIPT_STATE {
-    bit_fields: ::WORD,
-}}
-BITFIELD!(SCRIPT_STATE bit_fields: ::WORD [
-    uBidiLevel set_uBidiLevel[0..5],
-    fOverrideDirection set_fOverrideDirection[5..6],
-    fInhibitSymSwap set_fInhibitSymSwap[6..7],
-    fCharShape set_fCharShape[7..8],
-    fDigitSubstitute set_fDigitSubstitute[8..9],
-    fInhibitLigate set_fInhibitLigate[9..10],
-    fDisplayZWG set_fDisplayZWG[10..11],
-    fArabicNumContext set_fArabicNumContext[11..12],
-    fGcpClusters set_fGcpClusters[12..13],
-    fReserved set_fReserved[13..14],
-    fEngineReserved set_fEngineReserved[14..16],
-]);
-STRUCT!{struct SCRIPT_ANALYSIS {
-    bit_fields: ::WORD,
-    s: SCRIPT_STATE,
-}}
-BITFIELD!(SCRIPT_ANALYSIS bit_fields: ::WORD [
-    eScript set_eScript[0..10],
-    fRTL set_fRTL[10..11],
-    fLayoutRTL set_fLayoutRTL[11..12],
-    fLinkBefore set_fLinkBefore[12..13],
-    fLinkAfter set_fLinkAfter[13..14],
-    fLogicalOrder set_fLogicalOrder[14..15],
-    fNoGlyphIndex set_fNoGlyphIndex[15..16],
-]);
-STRUCT!{struct SCRIPT_ITEM {
-    iCharPos: ::c_int,
-    a: SCRIPT_ANALYSIS,
-}}
-//490
-pub const SCRIPT_JUSTIFY_NONE: ::WORD = 0;
-pub const SCRIPT_JUSTIFY_ARABIC_BLANK: ::WORD = 1;
-pub const SCRIPT_JUSTIFY_CHARACTER: ::WORD = 2;
-pub const SCRIPT_JUSTIFY_RESERVED1: ::WORD = 3;
-pub const SCRIPT_JUSTIFY_BLANK: ::WORD = 4;
-pub const SCRIPT_JUSTIFY_RESERVED2: ::WORD = 5;
-pub const SCRIPT_JUSTIFY_RESERVED3: ::WORD = 6;
-pub const SCRIPT_JUSTIFY_ARABIC_NORMAL: ::WORD = 7;
-pub const SCRIPT_JUSTIFY_ARABIC_KASHIDA: ::WORD = 8;
-pub const SCRIPT_JUSTIFY_ARABIC_ALEF: ::WORD = 9;
-pub const SCRIPT_JUSTIFY_ARABIC_HA: ::WORD = 10;
-pub const SCRIPT_JUSTIFY_ARABIC_RA: ::WORD = 11;
-pub const SCRIPT_JUSTIFY_ARABIC_BA: ::WORD = 12;
-pub const SCRIPT_JUSTIFY_ARABIC_BARA: ::WORD = 13;
-pub const SCRIPT_JUSTIFY_ARABIC_SEEN: ::WORD = 14;
-pub const SCRIPT_JUSTIFY_ARABIC_SEEN_M: ::WORD = 15;
-STRUCT!{struct SCRIPT_VISATTR {
-    bit_fields: ::WORD,
-}}
-BITFIELD!(SCRIPT_VISATTR bit_fields: ::WORD [
-    uJustification set_uJustification[0..4],
-    fClusterStart set_fClusterStart[4..5],
-    fDiacritic set_fDiacritic[5..6],
-    fZeroWidth set_fZeroWidth[6..7],
-    fReserved set_fReserved[7..8],
-    fShapeReserved set_fShapeReserved[8..16],
-]);
-STRUCT!{struct GOFFSET {
-    du: ::LONG,
-    dv: ::LONG,
-}}
-STRUCT!{struct SCRIPT_LOGATTR {
-    bit_fields: ::BYTE,
-}}
-BITFIELD!(SCRIPT_LOGATTR bit_fields: ::BYTE [
-    fSoftBreak set_fSoftBreak[0..1],
-    fWhiteSpace set_fWhiteSpace[1..2],
-    fCharStop set_fCharStop[2..3],
-    fWordStop set_fWordStop[3..4],
-    fInvalid set_fInvalid[4..5],
-    fReserved set_fReserved[5..8],
-]);
-pub const SGCM_RTL: ::DWORD = 0x00000001;
-STRUCT!{struct SCRIPT_PROPERTIES {
-    bit_fields1: ::DWORD,
-    bit_fields2: ::DWORD,
-}}
-BITFIELD!(SCRIPT_PROPERTIES bit_fields1: ::DWORD [
-    langid set_langid[0..16],
-    fNumeric set_fNumeric[16..17],
-    fComplex set_fComplex[17..18],
-    fNeedsWordBreaking set_fNeedsWordBreaking[18..19],
-    fNeedsCaretInfo set_fNeedsCaretInfo[19..20],
-    bCharSet set_bCharSet[20..28],
-    fControl set_fControl[28..29],
-    fPrivateUseArea set_fPrivateUseArea[29..30],
-    fNeedsCharacterJustify set_fNeedsCharacterJustify[30..31],
-    fInvalidGlyph set_fInvalidGlyph[31..32],
-]);
-BITFIELD!(SCRIPT_PROPERTIES bit_fields2: ::DWORD [
-    fInvalidLogAttr set_fInvalidLogAttr[0..1],
-    fCDM set_fCDM[1..2],
-    fAmbiguousCharSet set_fAmbiguousCharSet[2..3],
-    fClusterSizeVaries set_fClusterSizeVaries[3..4],
-    fRejectInvalid set_fRejectInvalid[4..5],
-]);
-STRUCT!{struct SCRIPT_FONTPROPERTIES {
-    cBytes: ::c_int,
-    wgBlank: ::WORD,
-    wgDefault: ::WORD,
-    wgInvalid: ::WORD,
-    wgKashida: ::WORD,
-    iKashidaWidth: ::c_int,
-}}
-//1440
-pub const SSA_PASSWORD: ::DWORD = 0x00000001;
-pub const SSA_TAB: ::DWORD = 0x00000002;
-pub const SSA_CLIP: ::DWORD = 0x00000004;
-pub const SSA_FIT: ::DWORD = 0x00000008;
-pub const SSA_DZWG: ::DWORD = 0x00000010;
-pub const SSA_FALLBACK: ::DWORD = 0x00000020;
-pub const SSA_BREAK: ::DWORD = 0x00000040;
-pub const SSA_GLYPHS: ::DWORD = 0x00000080;
-pub const SSA_RTL: ::DWORD = 0x00000100;
-pub const SSA_GCP: ::DWORD = 0x00000200;
-pub const SSA_HOTKEY: ::DWORD = 0x00000400;
-pub const SSA_METAFILE: ::DWORD = 0x00000800;
-pub const SSA_LINK: ::DWORD = 0x00001000;
-pub const SSA_HIDEHOTKEY: ::DWORD = 0x00002000;
-pub const SSA_HOTKEYONLY: ::DWORD = 0x00002400;
-pub const SSA_FULLMEASURE: ::DWORD = 0x04000000;
-pub const SSA_LPKANSIFALLBACK: ::DWORD = 0x08000000;
-pub const SSA_PIDX: ::DWORD = 0x10000000;
-pub const SSA_LAYOUTRTL: ::DWORD = 0x20000000;
-pub const SSA_DONTGLYPH: ::DWORD = 0x40000000;
-pub const SSA_NOKASHIDA: ::DWORD = 0x80000000;
-STRUCT!{struct SCRIPT_TABDEF {
-    cTabStops: ::c_int,
-    iScale: ::c_int,
-    pTabStops: *mut ::c_int,
-    iTabOrigin: ::c_int,
-}}
-DECLARE_HANDLE!(SCRIPT_STRING_ANALYSIS, SCRIPT_STRING_ANALYSIS__);
-pub const SIC_COMPLEX: ::DWORD = 1;
-pub const SIC_ASCIIDIGIT: ::DWORD = 2;
-pub const SIC_NEUTRAL: ::DWORD = 4;
-STRUCT!{struct SCRIPT_DIGITSUBSTITUTE {
-    bit_fields1: ::DWORD,
-    bit_fields2: ::DWORD,
-    dwReserved: ::DWORD,
-}}
-BITFIELD!(SCRIPT_DIGITSUBSTITUTE bit_fields1: ::DWORD [
-    NationalDigitLanguage set_NationalDigitLanguage[0..16],
-    TraditionalDigitLanguage set_TraditionalDigitLanguage[16..32],
-]);
-BITFIELD!(SCRIPT_DIGITSUBSTITUTE bit_fields2: ::DWORD [
-    DigitSubstitute set_DigitSubstitute[0..8],
-]);
-pub const SCRIPT_DIGITSUBSTITUTE_CONTEXT: ::BYTE = 0;
-pub const SCRIPT_DIGITSUBSTITUTE_NONE: ::BYTE = 1;
-pub const SCRIPT_DIGITSUBSTITUTE_NATIONAL: ::BYTE = 2;
-pub const SCRIPT_DIGITSUBSTITUTE_TRADITIONAL: ::BYTE = 3;
-pub type OPENTYPE_TAG = ::ULONG;
-pub const SCRIPT_TAG_UNKNOWN: OPENTYPE_TAG = 0x00000000;
-STRUCT!{struct OPENTYPE_FEATURE_RECORD {
-    tagFeature: OPENTYPE_TAG,
-    lParameter: ::LONG,
-}}
-STRUCT!{struct TEXTRANGE_PROPERTIES {
-    potfRecords: *mut OPENTYPE_FEATURE_RECORD,
-    cotfRecords: ::c_int,
-}}
-STRUCT!{struct SCRIPT_CHARPROP {
-    bit_fields: ::WORD,
-}}
-BITFIELD!(SCRIPT_CHARPROP bit_fields: ::WORD [
-    fCanGlyphAlone set_fCanGlyphAlone[0..1],
-    reserved set_reserved[1..16],
-]);
-STRUCT!{struct SCRIPT_GLYPHPROP {
-    sva: SCRIPT_VISATTR,
-    reserved: ::WORD,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vadefs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vadefs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vadefs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vadefs.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Definitions of macro helpers used by <stdarg.h>.  This is the topmost header in the CRT header
-//! lattice, and is always the first CRT header to be included, explicitly or implicitly.
-//! Therefore, this header also has several definitions that are used throughout the CRT.
-//39
-pub type va_list = *mut ::c_char;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vsbackup.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vsbackup.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vsbackup.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vsbackup.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,303 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-//! VSS backup interfaces
-DEFINE_GUID!(IID_IVssExamineWriterMetadata, 0x902fcf7f, 0xb7fd, 0x42f8,
-    0x81, 0xf1, 0xb2, 0xe4, 0x00, 0xb1, 0xe5, 0xbd);
-DEFINE_GUID!(IID_IVssExamineWriterMetadataEx, 0x0c0e5ec0, 0xca44, 0x472b,
-    0xb7, 0x02, 0xe6, 0x52, 0xdb, 0x1c, 0x04, 0x51);
-DEFINE_GUID!(IID_IVssBackupComponents, 0x665c1d5f, 0xc218, 0x414d,
-    0xa0, 0x5d, 0x7f, 0xef, 0x5f, 0x9d, 0x5c, 0x86);
-DEFINE_GUID!(IID_IVssBackupComponentsEx, 0x963f03ad, 0x9e4c, 0x4a34,
-    0xac, 0x15, 0xe4, 0xb6, 0x17, 0x4e, 0x50, 0x36);
-STRUCT!{struct VSS_COMPONENTINFO {
-    type_: ::VSS_COMPONENT_TYPE, // type is a keyword in rust
-    bstrLogicalPath: ::BSTR,
-    bstrComponentName: ::BSTR,
-    bstrCaption: ::BSTR,
-    pbIcon: *mut ::BYTE,
-    cbIcon: ::UINT,
-    bRestoreMetadata: bool,
-    bNotifyOnBackupComplete: bool,
-    bSelectable: bool,
-    bSelectableForRestore: bool,
-    dwComponentFlags: ::DWORD,
-    cFileCount: ::UINT,
-    cDatabases: ::UINT,
-    cLogFiles: ::UINT,
-    cDependencies: ::UINT,
-}}
-pub type PVSSCOMPONENTINFO = *const ::VSS_COMPONENTINFO;
-RIDL!(
-interface IVssWMComponent(IVssWMComponentVtbl): IUnknown(IUnknownVtbl) {
-    fn GetComponentInfo(&mut self, ppInfo: *mut ::PVSSCOMPONENTINFO) -> ::HRESULT,
-    fn FreeComponentInfo(&mut self, pInfo: ::PVSSCOMPONENTINFO) -> ::HRESULT,
-    fn GetFile(&mut self, iFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc) -> ::HRESULT,
-    fn GetDatabaseFile(
-        &mut self, iDBFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetDatabaseLogFile(
-        &mut self, iDbLogFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetDependency(
-        &mut self, iDependency: ::UINT, ppDependency: *mut *mut ::IVssWMDependency
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssExamineWriterMetadata(IVssExamineWriterMetadataVtbl): IUnknown(IUnknownVtbl) {
-    fn GetIdentity(
-        &mut self, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID,
-        pbstrWriterName: *mut ::BSTR, pUsage: *mut ::VSS_USAGE_TYPE,
-        pSource: *mut ::VSS_SOURCE_TYPE
-    ) -> ::HRESULT,
-    fn GetFileCounts(&mut self, pcIncludeFiles: *mut ::UINT, pcExcludeFiles: *mut ::UINT,
-        pcComponents: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetIncludeFile(
-        &mut self, iFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetExcludeFile(
-        &mut self, iFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetComponent(
-        &mut self, iComponent: ::UINT, ppComponent: *mut *mut ::IVssWMComponent
-    ) -> ::HRESULT,
-    fn GetRestoreMethod(
-        &mut self, pMethod: *mut ::VSS_RESTOREMETHOD_ENUM, pbstrService: *mut ::BSTR,
-        pbstrUserProcedure: *mut ::BSTR, pwriterRestore: *mut ::VSS_WRITERRESTORE_ENUM,
-        pbRebootRequired: *mut bool, pcMappings: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetAlternateLocationMapping(
-        &mut self, iMapping: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetBackupSchema(&mut self, pdwSchemaMask: *mut ::DWORD) -> ::HRESULT,
-    fn GetDocument(&mut self, pDoc: *mut ::c_void) -> ::HRESULT, //TODO IXMLDOMDocument
-    fn SaveAsXML(&mut self, pbstrXML: *mut ::BSTR) -> ::HRESULT,
-    fn LoadFromXML(&mut self, pbstrXML: *mut ::BSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssExamineWriterMetadataEx(IVssExamineWriterMetadataExVtbl):
-    IVssExamineWriterMetadata(IVssExamineWriterMetadataVtbl) {
-    fn GetIdentityEx(
-        &mut self, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID,
-        pbstrWriterName: *mut ::BSTR, pbstrInstanceName: *mut ::BSTR,
-        pUsage: *mut ::VSS_USAGE_TYPE, pSource: *mut ::VSS_SOURCE_TYPE
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssExamineWriterMetadataEx2(IVssExamineWriterMetadataEx2Vtbl):
-    IVssExamineWriterMetadataEx(IVssExamineWriterMetadataExVtbl) {
-    fn GetVersion(
-        &mut self, pdwMajorVersion: *mut ::DWORD, pdwMinorVersion: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn GetExcludeFromSnapshotCount(&mut self, pcExcludedFromSnapshot: *mut ::UINT) -> ::HRESULT,
-    fn GetExcludeFromSnapshotFile(
-        &mut self, iFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT
-}
-);
-#[repr(C)]
-pub struct IVssWriterComponentsExt {
-    pub lpVtbl: *const IVssWriterComponentsExtVtbl,
-}
-#[repr(C)]
-pub struct IVssWriterComponentsExtVtbl {
-    pub parent1: ::IVssWriterComponentsVtbl,
-    pub parent2: ::IUnknownVtbl,
-}
-RIDL!(
-interface IVssBackupComponents(IVssBackupComponentsVtbl): IUnknown(IUnknownVtbl) {
-    fn GetWriterComponentsCount(&mut self, pcComponents: *mut ::UINT) -> ::HRESULT,
-    fn GetWriterComponents(
-        &mut self, iWriter: ::UINT, ppWriter: *mut *mut IVssWriterComponentsExt
-    ) -> ::HRESULT,
-    fn InitializeForBackup(&mut self, bstrXML: ::BSTR) -> ::HRESULT,
-    fn SetBackupState(
-        &mut self, bSelectComponents: bool, bBackupBootableSystemState: bool,
-        backupType: ::VSS_BACKUP_TYPE, bPartialFileSupport: bool
-    ) -> ::HRESULT,
-    fn InitializeForRestore(&mut self, bstrXML: ::BSTR) -> ::HRESULT,
-    fn SetRestoreState(&mut self, restoreType: ::VSS_RESTORE_TYPE) -> ::HRESULT,
-    fn GatherWriterMetadata(&mut self, pAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn GetWriterMetadataCount(&mut self, pcWriters: *mut ::UINT) -> ::HRESULT,
-    fn GetWriterMetadata(
-        &mut self, iWriter: ::UINT, pidInstance: *mut ::VSS_ID,
-        ppMetadata: *mut *mut IVssExamineWriterMetadata
-    ) -> ::HRESULT,
-    fn FreeWriterMetadata(&mut self) -> ::HRESULT,
-    fn AddComponent(
-        &mut self, instanceId: ::VSS_ID, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE,
-        wszLogicalPath: ::LPCWSTR, wszComponentName: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn PrepareForBackup(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn AbortBackup(&mut self) -> ::HRESULT,
-    fn GatherWriterStatus(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn GetWriterStatusCount(&mut self, pcWriters: *mut ::UINT) -> ::HRESULT,
-    fn FreeWriterStatus(&mut self) -> ::HRESULT,
-    fn GetWriterStatus(
-        &mut self, iWriter: ::UINT, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID,
-        pbstrWriter: *mut ::BSTR, pnStatus: *mut ::VSS_WRITER_STATE,
-        phResultFailure: *mut ::HRESULT
-    ) -> ::HRESULT,
-    fn SetBackupSucceeded(
-        &mut self, instanceId: ::VSS_ID, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE,
-        wszLogicalPath: ::LPCWSTR, wszComponentName: ::LPCWSTR, bSucceded: bool
-    ) -> ::HRESULT,
-    fn SetBackupOptions(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszBackupOptions: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetSelectedForRestore(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, bSelectedForRestore: bool
-    ) -> ::HRESULT,
-    fn SetRestoreOptions(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszRestoreOptions: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetAdditionalRestores(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, bAdditionalRestores: bool
-    ) -> ::HRESULT,
-    fn SetPreviousBackupStamp(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszPreviousBackupStamp: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SaveAsXML(&mut self, pbstrXML: *mut ::BSTR) -> ::HRESULT,
-    fn BackupComplete(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn AddAlternativeLocationMapping(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: bool,
-        wszDestination: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn AddRestoreSubcomponent(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszSubComponentLogicalPath: ::LPCWSTR,
-        wszSubComponentName: ::LPCWSTR, bRepair: bool
-    ) -> ::HRESULT,
-    fn SetFileRestoreStatus(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, status: ::VSS_FILE_RESTORE_STATUS
-    ) -> ::HRESULT,
-    fn AddNewTarget(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszPath: ::LPCWSTR, wszFileName: ::LPCWSTR, bRecursive: bool,
-        wszAlternatePath: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetRangesFilePath(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, iPartialFile: ::UINT, wszRangesFile: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn PreRestore(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn PostRestore(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn SetContext(&mut self, lContext: ::LONG) -> ::HRESULT,
-    fn StartSnapshotSet(&mut self, pSnapshotSetId: *mut ::VSS_ID) -> ::HRESULT,
-    fn AddToSnapshotSet(
-        &mut self, pwszVolumeName: ::VSS_PWSZ, ProviderId: ::VSS_ID, pidSnapshot: *mut ::VSS_ID
-    ) -> ::HRESULT,
-    fn DoSnapshotSet(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn DeleteSnapshots(
-        &mut self, SourceObjectId: ::VSS_ID, eSourceObjectType: ::VSS_OBJECT_TYPE,
-        bForceDelete: ::BOOL, plDeletedSnapshots: *mut ::LONG, pNondeletedSnapshotID: *mut ::VSS_ID
-    ) -> ::HRESULT,
-    fn ImportSnapshots(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn BreakSnapshotSet(&mut self, SnapshotSetId: ::VSS_ID) -> ::HRESULT,
-    fn GetSnapshotProperties(
-        &mut self, SnapshotId: ::VSS_ID,
-        pProp: *mut ::VSS_SNAPSHOT_PROP
-    ) -> ::HRESULT,
-    fn Query(&mut self, QueriedObjectId: ::VSS_ID, eQueriedObjectType: ::VSS_OBJECT_TYPE,
-        eReturnedObjectsType: ::VSS_OBJECT_TYPE, ppEnum: *mut *mut ::IVssEnumObject) -> ::HRESULT,
-    fn IsVolumeSupported(
-        &mut self, ProviderId: ::VSS_ID, pwszVolumeName: ::VSS_PWSZ,
-        pbSupportedByThisProvider: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn DisableWriterClasses(
-        &mut self, rgWriterClassId: *const ::VSS_ID, cClassId: ::UINT
-    ) -> ::HRESULT,
-    fn EnableWriterClasses(
-        &mut self, rgWriterClassId: *const ::VSS_ID, cClassId: ::UINT
-    ) -> ::HRESULT,
-    fn DisableWriterInstances(
-        &mut self, rgWriterInstanceId: *const ::VSS_ID, cInstanceId: ::UINT
-    ) -> ::HRESULT,
-    fn ExposeSnapshot(&mut self, SnapshotId: ::VSS_ID, wszPathFromRoot: ::VSS_PWSZ,
-        lAttributes: ::LONG, wszExpose: ::VSS_PWSZ, pwszExposed: ::VSS_PWSZ
-    ) -> ::HRESULT,
-    fn RevertToSnapshot(&mut self, SnapshotId: ::VSS_ID, bForceDismount: ::BOOL) -> ::HRESULT,
-    fn QueryRevertStatus(
-        &mut self, pwszVolume: ::VSS_PWSZ, ppAsync: *mut *mut ::IVssAsync
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssBackupComponentsEx(IVssBackupComponentsExVtbl):
-    IVssBackupComponents(IVssBackupComponentsVtbl) {
-    fn GetWriterMetadataEx(
-        &mut self, iWriter: ::UINT, pidInstance: *mut ::VSS_ID,
-        ppMetadata: *mut *mut ::IVssExamineWriterMetadataEx
-    ) -> ::HRESULT,
-    fn SetSelectedForRestoreEx(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, bSelectedForRestore: bool, instanceId: ::VSS_ID
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssBackupComponentsEx2(IVssBackupComponentsEx2Vtbl):
-    IVssBackupComponentsEx(IVssBackupComponentsExVtbl) {
-    fn UnexposeSnapshot(&mut self, snapshotId: ::VSS_ID) -> ::HRESULT,
-    fn SetAuthoritativeRestore(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, bAuth: bool
-    ) -> ::HRESULT,
-    fn SetRollForward(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, rollType: ::VSS_ROLLFORWARD_TYPE,
-        wszRollForwardPoint: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetRestoreName(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszRestoreName: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn BreakSnapshotSetEx(
-        &mut self, SnapshotSetID: ::VSS_ID, dwBreakFlags: ::DWORD, ppAsync: *mut *mut ::IVssAsync
-    ) -> ::HRESULT,
-    fn PreFastRecovery(
-        &mut self, SnapshotSetID: ::VSS_ID, dwPreFastRecoveryFlags: ::DWORD,
-        ppAsync: *mut *mut ::IVssAsync
-    ) -> ::HRESULT,
-    fn FastRecovery(
-        &mut self, SnapshotSetID: ::VSS_ID, dwFastRecoveryFlags: ::DWORD,
-        ppAsync: *mut *mut ::IVssAsync
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssBackupComponentsEx3(IVssBackupComponentsEx3Vtbl):
-    IVssBackupComponentsEx2(IVssBackupComponentsEx2Vtbl) {
-    fn GetWriterStatusEx(
-        &mut self, iWriter: ::UINT, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID,
-        pbstrWriter: *mut ::BSTR, pnStatus: *mut ::VSS_WRITER_STATE,
-        phrFailureWriter: *mut ::HRESULT, phrApplication: *mut ::HRESULT,
-        pbstrApplicationMessage: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn AddSnapshotToRecoverySet(
-        &mut self, snapshotId: ::VSS_ID, dwFlags: ::DWORD, pwszDestinationVolume: ::VSS_PWSZ
-    ) -> ::HRESULT,
-    fn RecoverSet(&mut self, dwFlags: ::DWORD, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn GetSessionId(&mut self, idSession: *mut ::VSS_ID) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssBackupComponentsEx4(IVssBackupComponentsEx4Vtbl):
-    IVssBackupComponentsEx3(IVssBackupComponentsEx3Vtbl) {
-    fn GetRootAndLogicalPrefixPaths(
-        &mut self, pwszFilePath: ::VSS_PWSZ, ppwszRootPath: *mut ::VSS_PWSZ,
-        ppwszLogicalPrefix: *mut ::VSS_PWSZ, bNormalizeFQDNforRootPath: ::BOOL
-    ) -> ::HRESULT
-}
-);
-pub const VSS_SW_BOOTABLE_STATE: ::DWORD = 1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vsserror.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vsserror.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vsserror.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vsserror.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-//! VSS Error header file
-pub const VSS_E_BAD_STATE: ::HRESULT = 0x80042301u32 as i32;
-pub const VSS_E_UNEXPECTED: ::HRESULT = 0x80042302u32 as i32;
-pub const VSS_E_PROVIDER_ALREADY_REGISTERED: ::HRESULT = 0x80042303u32 as i32;
-pub const VSS_E_PROVIDER_NOT_REGISTERED: ::HRESULT = 0x80042304u32 as i32;
-pub const VSS_E_PROVIDER_VETO: ::HRESULT = 0x80042306u32 as i32;
-pub const VSS_E_PROVIDER_IN_USE: ::HRESULT = 0x80042307u32 as i32;
-pub const VSS_E_OBJECT_NOT_FOUND: ::HRESULT = 0x80042308u32 as i32;
-pub const VSS_S_ASYNC_PENDING: ::HRESULT = 0x00042309u32 as i32;
-pub const VSS_S_ASYNC_FINISHED: ::HRESULT = 0x0004230Au32 as i32;
-pub const VSS_S_ASYNC_CANCELLED: ::HRESULT = 0x0004230Bu32 as i32;
-pub const VSS_E_VOLUME_NOT_SUPPORTED: ::HRESULT = 0x8004230Cu32 as i32;
-pub const VSS_E_VOLUME_NOT_SUPPORTED_BY_PROVIDER: ::HRESULT = 0x8004230Eu32 as i32;
-pub const VSS_E_OBJECT_ALREADY_EXISTS: ::HRESULT = 0x8004230Du32 as i32;
-pub const VSS_E_UNEXPECTED_PROVIDER_ERROR: ::HRESULT = 0x8004230Fu32 as i32;
-pub const VSS_E_CORRUPT_XML_DOCUMENT: ::HRESULT = 0x80042310u32 as i32;
-pub const VSS_E_INVALID_XML_DOCUMENT: ::HRESULT = 0x80042311u32 as i32;
-pub const VSS_E_MAXIMUM_NUMBER_OF_VOLUMES_REACHED: ::HRESULT = 0x80042312u32 as i32;
-pub const VSS_E_FLUSH_WRITES_TIMEOUT: ::HRESULT = 0x80042313u32 as i32;
-pub const VSS_E_HOLD_WRITES_TIMEOUT: ::HRESULT = 0x80042314u32 as i32;
-pub const VSS_E_UNEXPECTED_WRITER_ERROR: ::HRESULT = 0x80042315u32 as i32;
-pub const VSS_E_SNAPSHOT_SET_IN_PROGRESS: ::HRESULT = 0x80042316u32 as i32;
-pub const VSS_E_MAXIMUM_NUMBER_OF_SNAPSHOTS_REACHED: ::HRESULT = 0x80042317u32 as i32;
-pub const VSS_E_WRITER_INFRASTRUCTURE: ::HRESULT = 0x80042318u32 as i32;
-pub const VSS_E_WRITER_NOT_RESPONDING: ::HRESULT = 0x80042319u32 as i32;
-pub const VSS_E_WRITER_ALREADY_SUBSCRIBED: ::HRESULT = 0x8004231Au32 as i32;
-pub const VSS_E_UNSUPPORTED_CONTEXT: ::HRESULT = 0x8004231Bu32 as i32;
-pub const VSS_E_VOLUME_IN_USE: ::HRESULT = 0x8004231Du32 as i32;
-pub const VSS_E_MAXIMUM_DIFFAREA_ASSOCIATIONS_REACHED: ::HRESULT = 0x8004231Eu32 as i32;
-pub const VSS_E_INSUFFICIENT_STORAGE: ::HRESULT = 0x8004231Fu32 as i32;
-pub const VSS_E_NO_SNAPSHOTS_IMPORTED: ::HRESULT = 0x80042320u32 as i32;
-pub const VSS_S_SOME_SNAPSHOTS_NOT_IMPORTED: ::HRESULT = 0x00042321u32 as i32;
-pub const VSS_E_SOME_SNAPSHOTS_NOT_IMPORTED: ::HRESULT = 0x80042321u32 as i32;
-pub const VSS_E_MAXIMUM_NUMBER_OF_REMOTE_MACHINES_REACHED: ::HRESULT = 0x80042322u32 as i32;
-pub const VSS_E_REMOTE_SERVER_UNAVAILABLE: ::HRESULT = 0x80042323u32 as i32;
-pub const VSS_E_REMOTE_SERVER_UNSUPPORTED: ::HRESULT = 0x80042324u32 as i32;
-pub const VSS_E_REVERT_IN_PROGRESS: ::HRESULT = 0x80042325u32 as i32;
-pub const VSS_E_REVERT_VOLUME_LOST: ::HRESULT = 0x80042326u32 as i32;
-pub const VSS_E_REBOOT_REQUIRED: ::HRESULT = 0x80042327u32 as i32;
-pub const VSS_E_TRANSACTION_FREEZE_TIMEOUT: ::HRESULT = 0x80042328u32 as i32;
-pub const VSS_E_TRANSACTION_THAW_TIMEOUT: ::HRESULT = 0x80042329u32 as i32;
-pub const VSS_E_VOLUME_NOT_LOCAL: ::HRESULT = 0x8004232Du32 as i32;
-pub const VSS_E_CLUSTER_TIMEOUT: ::HRESULT = 0x8004232Eu32 as i32;
-pub const VSS_E_WRITERERROR_INCONSISTENTSNAPSHOT: ::HRESULT = 0x800423F0u32 as i32;
-pub const VSS_E_WRITERERROR_OUTOFRESOURCES: ::HRESULT = 0x800423F1u32 as i32;
-pub const VSS_E_WRITERERROR_TIMEOUT: ::HRESULT = 0x800423F2u32 as i32;
-pub const VSS_E_WRITERERROR_RETRYABLE: ::HRESULT = 0x800423F3u32 as i32;
-pub const VSS_E_WRITERERROR_NONRETRYABLE: ::HRESULT = 0x800423F4u32 as i32;
-pub const VSS_E_WRITERERROR_RECOVERY_FAILED: ::HRESULT = 0x800423F5u32 as i32;
-pub const VSS_E_BREAK_REVERT_ID_FAILED: ::HRESULT = 0x800423F6u32 as i32;
-pub const VSS_E_LEGACY_PROVIDER: ::HRESULT = 0x800423F7u32 as i32;
-pub const VSS_E_MISSING_DISK: ::HRESULT = 0x800423F8u32 as i32;
-pub const VSS_E_MISSING_HIDDEN_VOLUME: ::HRESULT = 0x800423F9u32 as i32;
-pub const VSS_E_MISSING_VOLUME: ::HRESULT = 0x800423FAu32 as i32;
-pub const VSS_E_AUTORECOVERY_FAILED: ::HRESULT = 0x800423FBu32 as i32;
-pub const VSS_E_DYNAMIC_DISK_ERROR: ::HRESULT = 0x800423FCu32 as i32;
-pub const VSS_E_NONTRANSPORTABLE_BCD: ::HRESULT = 0x800423FDu32 as i32;
-pub const VSS_E_CANNOT_REVERT_DISKID: ::HRESULT = 0x800423FEu32 as i32;
-pub const VSS_E_RESYNC_IN_PROGRESS: ::HRESULT = 0x800423FFu32 as i32;
-pub const VSS_E_CLUSTER_ERROR: ::HRESULT = 0x80042400u32 as i32;
-pub const VSS_E_UNSELECTED_VOLUME: ::HRESULT = 0x8004232Au32 as i32;
-pub const VSS_E_SNAPSHOT_NOT_IN_SET: ::HRESULT = 0x8004232Bu32 as i32;
-pub const VSS_E_NESTED_VOLUME_LIMIT: ::HRESULT = 0x8004232Cu32 as i32;
-pub const VSS_E_NOT_SUPPORTED: ::HRESULT = 0x8004232Fu32 as i32;
-pub const VSS_E_WRITERERROR_PARTIAL_FAILURE: ::HRESULT = 0x80042336u32 as i32;
-pub const VSS_E_ASRERROR_DISK_ASSIGNMENT_FAILED: ::HRESULT = 0x80042401u32 as i32;
-pub const VSS_E_ASRERROR_DISK_RECREATION_FAILED: ::HRESULT = 0x80042402u32 as i32;
-pub const VSS_E_ASRERROR_NO_ARCPATH: ::HRESULT = 0x80042403u32 as i32;
-pub const VSS_E_ASRERROR_MISSING_DYNDISK: ::HRESULT = 0x80042404u32 as i32;
-pub const VSS_E_ASRERROR_SHARED_CRIDISK: ::HRESULT = 0x80042405u32 as i32;
-pub const VSS_E_ASRERROR_DATADISK_RDISK0: ::HRESULT = 0x80042406u32 as i32;
-pub const VSS_E_ASRERROR_RDISK0_TOOSMALL: ::HRESULT = 0x80042407u32 as i32;
-pub const VSS_E_ASRERROR_CRITICAL_DISKS_TOO_SMALL: ::HRESULT = 0x80042408u32 as i32;
-pub const VSS_E_WRITER_STATUS_NOT_AVAILABLE: ::HRESULT = 0x80042409u32 as i32;
-pub const VSS_E_ASRERROR_DYNAMIC_VHD_NOT_SUPPORTED: ::HRESULT = 0x8004240Au32 as i32;
-pub const VSS_E_CRITICAL_VOLUME_ON_INVALID_DISK: ::HRESULT = 0x80042411u32 as i32;
-pub const VSS_E_ASRERROR_RDISK_FOR_SYSTEM_DISK_NOT_FOUND: ::HRESULT = 0x80042412u32 as i32;
-pub const VSS_E_ASRERROR_NO_PHYSICAL_DISK_AVAILABLE: ::HRESULT = 0x80042413u32 as i32;
-pub const VSS_E_ASRERROR_FIXED_PHYSICAL_DISK_AVAILABLE_AFTER_DISK_EXCLUSION: ::HRESULT =
-    0x80042414u32 as i32;
-pub const VSS_E_ASRERROR_CRITICAL_DISK_CANNOT_BE_EXCLUDED: ::HRESULT = 0x80042415u32 as i32;
-pub const VSS_E_ASRERROR_SYSTEM_PARTITION_HIDDEN: ::HRESULT = 0x80042416u32 as i32;
-pub const VSS_E_FSS_TIMEOUT: ::HRESULT = 0x80042417u32 as i32;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vss.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vss.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vss.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vss.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,256 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-//! VSS header file
-ENUM!{enum VSS_OBJECT_TYPE {
-    VSS_OBJECT_UNKNOWN = 0,
-    VSS_OBJECT_NONE = 1,
-    VSS_OBJECT_SNAPSHOT_SET = 2,
-    VSS_OBJECT_SNAPSHOT = 3,
-    VSS_OBJECT_PROVIDER = 4,
-    VSS_OBJECT_TYPE_COUNT = 5,
-}}
-pub type PVSS_OBJECT_TYPE = *mut VSS_OBJECT_TYPE;
-ENUM!{enum VSS_SNAPSHOT_STATE {
-    VSS_SS_UNKNOWN = 0x00,
-    VSS_SS_PREPARING = 0x01,
-    VSS_SS_PROCESSING_PREPARE = 0x02,
-    VSS_SS_PREPARED = 0x03,
-    VSS_SS_PROCESSING_PRECOMMIT = 0x04,
-    VSS_SS_PRECOMMITTED = 0x05,
-    VSS_SS_PROCESSING_COMMIT = 0x06,
-    VSS_SS_COMMITTED = 0x07,
-    VSS_SS_PROCESSING_POSTCOMMIT = 0x08,
-    VSS_SS_PROCESSING_PREFINALCOMMIT = 0x09,
-    VSS_SS_PREFINALCOMMITTED = 0x0a,
-    VSS_SS_PROCESSING_POSTFINALCOMMIT = 0x0b,
-    VSS_SS_CREATED = 0x0c,
-    VSS_SS_ABORTED = 0x0d,
-    VSS_SS_DELETED = 0x0e,
-    VSS_SS_POSTCOMMITTED = 0x0f,
-    VSS_SS_COUNT = 0x10,
-}}
-pub type PVSS_SNAPSHOT_STATE = *mut VSS_SNAPSHOT_STATE;
-pub type VSS_VOLUME_SNAPSHOT_ATTRIBUTES = ::LONG;
-pub const VSS_VOLSNAP_ATTR_PERSISTENT: ::LONG = 0x00000001;
-pub const VSS_VOLSNAP_ATTR_NO_AUTORECOVERY: ::LONG = 0x00000002;
-pub const VSS_VOLSNAP_ATTR_CLIENT_ACCESSIBLE: ::LONG = 0x00000004;
-pub const VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE: ::LONG = 0x00000008;
-pub const VSS_VOLSNAP_ATTR_NO_WRITERS: ::LONG = 0x00000010;
-pub const VSS_VOLSNAP_ATTR_TRANSPORTABLE: ::LONG = 0x00000020;
-pub const VSS_VOLSNAP_ATTR_NOT_SURFACED: ::LONG = 0x00000040;
-pub const VSS_VOLSNAP_ATTR_NOT_TRANSACTED: ::LONG = 0x00000080;
-pub const VSS_VOLSNAP_ATTR_HARDWARE_ASSISTED: ::LONG = 0x00010000;
-pub const VSS_VOLSNAP_ATTR_DIFFERENTIAL: ::LONG = 0x00020000;
-pub const VSS_VOLSNAP_ATTR_PLEX: ::LONG = 0x00040000;
-pub const VSS_VOLSNAP_ATTR_IMPORTED: ::LONG = 0x00080000;
-pub const VSS_VOLSNAP_ATTR_EXPOSED_LOCALLY: ::LONG = 0x00100000;
-pub const VSS_VOLSNAP_ATTR_EXPOSED_REMOTELY: ::LONG = 0x00200000;
-pub const VSS_VOLSNAP_ATTR_AUTORECOVER: ::LONG = 0x00400000;
-pub const VSS_VOLSNAP_ATTR_ROLLBACK_RECOVERY: ::LONG = 0x00800000;
-pub const VSS_VOLSNAP_ATTR_DELAYED_POSTSNAPSHOT: ::LONG = 0x01000000;
-pub const VSS_VOLSNAP_ATTR_TXF_RECOVERY: ::LONG = 0x02000000;
-pub const VSS_VOLSNAP_ATTR_FILE_SHARE: ::LONG = 0x04000000;
-pub type PVSS_VOLUME_SNAPSHOT_ATTRIBUTES = *mut VSS_VOLUME_SNAPSHOT_ATTRIBUTES;
-pub type VSS_SNAPSHOT_CONTEXT = ::LONG;
-pub type PVSS_SNAPSHOT_CONTEXT = *mut VSS_SNAPSHOT_CONTEXT;
-pub const VSS_CTX_BACKUP: ::LONG = 0;
-pub const VSS_CTX_FILE_SHARE_BACKUP: ::LONG = VSS_VOLSNAP_ATTR_NO_WRITERS;
-pub const VSS_CTX_NAS_ROLLBACK: ::LONG = VSS_VOLSNAP_ATTR_PERSISTENT
-    | VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE | VSS_VOLSNAP_ATTR_NO_WRITERS;
-pub const VSS_CTX_APP_ROLLBACK: ::LONG = VSS_VOLSNAP_ATTR_PERSISTENT
-    | VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE;
-pub const VSS_CTX_CLIENT_ACCESSIBLE: ::LONG = VSS_VOLSNAP_ATTR_PERSISTENT
-    | VSS_VOLSNAP_ATTR_CLIENT_ACCESSIBLE | VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE
-    | VSS_VOLSNAP_ATTR_NO_WRITERS;
-pub const VSS_CTX_CLIENT_ACCESSIBLE_WRITERS: ::LONG = VSS_VOLSNAP_ATTR_PERSISTENT
-    | VSS_VOLSNAP_ATTR_CLIENT_ACCESSIBLE | VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE;
-pub const VSS_CTX_ALL: ::LONG = 0xffffffffu32 as ::LONG;
-pub type VSS_PROVIDER_CAPABILITIES = ::DWORD;
-pub type PVSS_PROVIDER_CAPABILITIES = *mut VSS_PROVIDER_CAPABILITIES;
-pub const VSS_PRV_CAPABILITY_LEGACY: ::DWORD = 0x1;
-pub const VSS_PRV_CAPABILITY_COMPLIANT: ::DWORD = 0x2;
-pub const VSS_PRV_CAPABILITY_LUN_REPOINT: ::DWORD = 0x4;
-pub const VSS_PRV_CAPABILITY_LUN_RESYNC: ::DWORD = 0x8;
-pub const VSS_PRV_CAPABILITY_OFFLINE_CREATION: ::DWORD = 0x10;
-pub const VSS_PRV_CAPABILITY_MULTIPLE_IMPORT: ::DWORD = 0x20;
-pub const VSS_PRV_CAPABILITY_RECYCLING: ::DWORD = 0x40;
-pub const VSS_PRV_CAPABILITY_PLEX: ::DWORD = 0x80;
-pub const VSS_PRV_CAPABILITY_DIFFERENTIAL: ::DWORD = 0x100;
-pub const VSS_PRV_CAPABILITY_CLUSTERED: ::DWORD = 0x200;
-pub type VSS_HARDWARE_OPTIONS = ::DWORD;
-pub type PVSS_HARDWARE_OPTIONS = *mut VSS_HARDWARE_OPTIONS;
-pub const VSS_BREAKEX_FLAG_MASK_LUNS: ::DWORD = 0x1;
-pub const VSS_BREAKEX_FLAG_MAKE_READ_WRITE: ::DWORD = 0x2;
-pub const VSS_BREAKEX_FLAG_REVERT_IDENTITY_ALL: ::DWORD = 0x4;
-pub const VSS_BREAKEX_FLAG_REVERT_IDENTITY_NONE: ::DWORD = 0x8;
-pub const VSS_ONLUNSTATECHANGE_NOTIFY_READ_WRITE: ::DWORD = 0x100;
-pub const VSS_ONLUNSTATECHANGE_NOTIFY_LUN_PRE_RECOVERY: ::DWORD = 0x200;
-pub const VSS_ONLUNSTATECHANGE_NOTIFY_LUN_POST_RECOVERY: ::DWORD = 0x400;
-pub const VSS_ONLUNSTATECHANGE_DO_MASK_LUNS: ::DWORD = 0x800;
-pub type VSS_RECOVERY_OPTIONS = ::DWORD;
-pub type PVSS_RECOVERY_OPTIONS = *mut VSS_RECOVERY_OPTIONS;
-pub const VSS_RECOVERY_REVERT_IDENTITY_ALL: ::DWORD = 0x00000100;
-pub const VSS_RECOVERY_NO_VOLUME_CHECK: ::DWORD = 0x00000200;
-ENUM!{enum VSS_WRITER_STATE {
-    VSS_WS_UNKNOWN = 0,
-    VSS_WS_STABLE = 1,
-    VSS_WS_WAITING_FOR_FREEZE = 2,
-    VSS_WS_WAITING_FOR_THAW = 3,
-    VSS_WS_WAITING_FOR_POST_SNAPSHOT = 4,
-    VSS_WS_WAITING_FOR_BACKUP_COMPLETE = 5,
-    VSS_WS_FAILED_AT_IDENTIFY = 6,
-    VSS_WS_FAILED_AT_PREPARE_BACKUP = 7,
-    VSS_WS_FAILED_AT_PREPARE_SNAPSHOT = 8,
-    VSS_WS_FAILED_AT_FREEZE = 9,
-    VSS_WS_FAILED_AT_THAW = 10,
-    VSS_WS_FAILED_AT_POST_SNAPSHOT = 11,
-    VSS_WS_FAILED_AT_BACKUP_COMPLETE = 12,
-    VSS_WS_FAILED_AT_PRE_RESTORE = 13,
-    VSS_WS_FAILED_AT_POST_RESTORE = 14,
-    VSS_WS_FAILED_AT_BACKUPSHUTDOWN = 15,
-    VSS_WS_COUNT = 16,
-}}
-pub type PVSS_WRITER_STATE = *mut VSS_WRITER_STATE;
-ENUM!{enum VSS_BACKUP_TYPE {
-    VSS_BT_UNDEFINED = 0,
-    VSS_BT_FULL = 1,
-    VSS_BT_INCREMENTAL = 2,
-    VSS_BT_DIFFERENTIAL = 3,
-    VSS_BT_LOG = 4,
-    VSS_BT_COPY = 5,
-    VSS_BT_OTHER = 6,
-}}
-pub type PVSS_BACKUP_TYPE = *mut VSS_BACKUP_TYPE;
-ENUM!{enum VSS_RESTORE_TYPE {
-    VSS_RTYPE_UNDEFINED = 0,
-    VSS_RTYPE_BY_COPY = 1,
-    VSS_RTYPE_IMPORT = 2,
-    VSS_RTYPE_OTHER = 3,
-}}
-pub type PVSS_RESTORE_TYPE = *mut VSS_RESTORE_TYPE;
-ENUM!{enum VSS_ROLLFORWARD_TYPE {
-    VSS_RF_UNDEFINED = 0,
-    VSS_RF_NONE = 1,
-    VSS_RF_ALL = 2,
-    VSS_RF_PARTIAL = 3,
-}}
-pub type PVSS_ROLLFORWARD_TYPE = *mut VSS_ROLLFORWARD_TYPE;
-ENUM!{enum VSS_PROVIDER_TYPE {
-    VSS_PROV_UNKNOWN = 0,
-    VSS_PROV_SYSTEM = 1,
-    VSS_PROV_SOFTWARE = 2,
-    VSS_PROV_HARDWARE = 3,
-    VSS_PROV_FILESHARE = 4,
-}}
-pub type PVSS_PROVIDER_TYPE = *mut VSS_PROVIDER_TYPE;
-ENUM!{enum VSS_APPLICATION_LEVEL {
-    VSS_APP_UNKNOWN = 0,
-    VSS_APP_SYSTEM = 1,
-    VSS_APP_BACK_END = 2,
-    VSS_APP_FRONT_END = 3,
-    VSS_APP_SYSTEM_RM = 4,
-    VSS_APP_AUTO = -1i32 as u32,
-}}
-pub type PVSS_APPLICATION_LEVEL = *mut VSS_APPLICATION_LEVEL;
-ENUM!{enum VSS_SNAPSHOT_PROPERTY_ID {
-    VSS_SPROPID_UNKNOWN = 0,
-    VSS_SPROPID_SNAPSHOT_ID = 0x1,
-    VSS_SPROPID_SNAPSHOT_SET_ID = 0x2,
-    VSS_SPROPID_SNAPSHOTS_COUNT = 0x3,
-    VSS_SPROPID_SNAPSHOT_DEVICE = 0x4,
-    VSS_SPROPID_ORIGINAL_VOLUME = 0x5,
-    VSS_SPROPID_ORIGINATING_MACHINE = 0x6,
-    VSS_SPROPID_SERVICE_MACHINE = 0x7,
-    VSS_SPROPID_EXPOSED_NAME = 0x8,
-    VSS_SPROPID_EXPOSED_PATH = 0x9,
-    VSS_SPROPID_PROVIDER_ID = 0xa,
-    VSS_SPROPID_SNAPSHOT_ATTRIBUTES = 0xb,
-    VSS_SPROPID_CREATION_TIMESTAMP = 0xc,
-    VSS_SPROPID_STATUS = 0xd,
-}}
-pub type PVSS_SNAPSHOT_PROPERTY_ID = *mut VSS_SNAPSHOT_PROPERTY_ID;
-pub type VSS_FILE_SPEC_BACKUP_TYPE = ::DWORD;
-pub type PVSS_FILE_SPEC_BACKUP_TYPE = *mut VSS_FILE_SPEC_BACKUP_TYPE;
-pub const VSS_FSBT_FULL_BACKUP_REQUIRED: ::DWORD = 0x1;
-pub const VSS_FSBT_DIFFERENTIAL_BACKUP_REQUIRED: ::DWORD = 0x2;
-pub const VSS_FSBT_INCREMENTAL_BACKUP_REQUIRED: ::DWORD = 0x4;
-pub const VSS_FSBT_LOG_BACKUP_REQUIRED: ::DWORD = 0x8;
-pub const VSS_FSBT_FULL_SNAPSHOT_REQUIRED: ::DWORD = 0x100;
-pub const VSS_FSBT_DIFFERENTIAL_SNAPSHOT_REQUIRED: ::DWORD = 0x200;
-pub const VSS_FSBT_INCREMENTAL_SNAPSHOT_REQUIRED: ::DWORD = 0x400;
-pub const VSS_FSBT_LOG_SNAPSHOT_REQUIRED: ::DWORD = 0x800;
-pub const VSS_FSBT_CREATED_DURING_BACKUP: ::DWORD = 0x10000;
-pub const VSS_FSBT_ALL_BACKUP_REQUIRED: ::DWORD = 0xf;
-pub const VSS_FSBT_ALL_SNAPSHOT_REQUIRED: ::DWORD = 0xf00;
-pub type VSS_BACKUP_SCHEMA = ::DWORD;
-pub type PVSS_BACKUP_SCHEMA = *mut VSS_BACKUP_SCHEMA;
-pub const VSS_BS_UNDEFINED: ::DWORD = 0;
-pub const VSS_BS_DIFFERENTIAL: ::DWORD = 0x1;
-pub const VSS_BS_INCREMENTAL: ::DWORD = 0x2;
-pub const VSS_BS_EXCLUSIVE_INCREMENTAL_DIFFERENTIAL: ::DWORD = 0x4;
-pub const VSS_BS_LOG: ::DWORD = 0x8;
-pub const VSS_BS_COPY: ::DWORD = 0x10;
-pub const VSS_BS_TIMESTAMPED: ::DWORD = 0x20;
-pub const VSS_BS_LAST_MODIFY: ::DWORD = 0x40;
-pub const VSS_BS_LSN: ::DWORD = 0x80;
-pub const VSS_BS_WRITER_SUPPORTS_NEW_TARGET: ::DWORD = 0x100;
-pub const VSS_BS_WRITER_SUPPORTS_RESTORE_WITH_MOVE: ::DWORD = 0x200;
-pub const VSS_BS_INDEPENDENT_SYSTEM_STATE: ::DWORD = 0x400;
-pub const VSS_BS_ROLLFORWARD_RESTORE: ::DWORD = 0x1000;
-pub const VSS_BS_RESTORE_RENAME: ::DWORD = 0x2000;
-pub const VSS_BS_AUTHORITATIVE_RESTORE: ::DWORD = 0x4000;
-pub const VSS_BS_WRITER_SUPPORTS_PARALLEL_RESTORES: ::DWORD = 0x8000;
-pub type VSS_ID = ::GUID;
-pub type VSS_PWSZ = *mut ::WCHAR;
-pub type VSS_TIMESTAMP = ::LONGLONG;
-STRUCT!{struct VSS_SNAPSHOT_PROP {
-    m_SnapshotId: ::VSS_ID,
-    m_SnapshotSetId: ::VSS_ID,
-    m_lSnapshotsCount: ::LONG,
-    m_pwszSnapshotDeviceObject: ::VSS_PWSZ,
-    m_pwszOriginalVolumeName: ::VSS_PWSZ,
-    m_pwszOriginatingMachine: ::VSS_PWSZ,
-    m_pwszServiceMachine: ::VSS_PWSZ,
-    m_pwszExposedName: ::VSS_PWSZ,
-    m_pwszExposedPath: ::VSS_PWSZ,
-    m_ProviderId: ::VSS_ID,
-    m_lSnapshotAttributes: ::LONG,
-    m_tsCreationTimestamp: ::VSS_TIMESTAMP,
-    m_eStatus: ::VSS_SNAPSHOT_STATE,
-}}
-type PVSS_SNAPSHOT_PROP = *mut VSS_SNAPSHOT_PROP;
-STRUCT!{struct VSS_PROVIDER_PROP {
-    m_ProviderId: ::VSS_ID,
-    m_pwszProviderName: ::VSS_PWSZ,
-    m_eProviderType: ::VSS_PROVIDER_TYPE,
-    m_pwszProviderVersion: ::VSS_PWSZ,
-    m_ProviderVersionId: ::VSS_ID,
-    m_ClassId: ::CLSID,
-}}
-type PVSS_PROVIDER_PROP = *mut VSS_PROVIDER_PROP;
-STRUCT!{struct VSS_OBJECT_UNION {
-    Snap: ::VSS_SNAPSHOT_PROP,
-}}
-UNION!(VSS_OBJECT_UNION, Snap, Prov, Prov_mut, VSS_PROVIDER_PROP);
-STRUCT!{struct VSS_OBJECT_PROP {
-    Type: ::VSS_OBJECT_TYPE,
-    Obj: ::VSS_OBJECT_UNION,
-}}
-type PVSS_OBJECT_PROP = *mut VSS_OBJECT_PROP;
-RIDL!(
-interface IVssEnumObject(IVssEnumObjectVtbl): IUnknown(IUnknownVtbl) {
-    fn Next(
-        &mut self, celt: ::ULONG, rgelt: *mut ::VSS_OBJECT_PROP, pceltFetched: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn Skip(&mut self, celt: ::ULONG) -> ::HRESULT,
-    fn Reset(&mut self) -> ::HRESULT,
-    fn Clone(&mut self, ppenum: *mut *mut ::IVssEnumObject) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssAsync(IVssAsyncVtbl): IUnknown(IUnknownVtbl) {
-    fn Cancel(&mut self) -> ::HRESULT,
-    fn Wait(&mut self, dwMilliseconds: ::DWORD) -> ::HRESULT,
-    fn QueryStatus(&mut self, pHrResult: *mut ::HRESULT, pReserved: *mut ::INT) -> ::HRESULT
-}
-);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vswriter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vswriter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/vswriter.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/vswriter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,241 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-//! VSS Writer header file
-ENUM!{enum VSS_USAGE_TYPE {
-    VSS_UT_UNDEFINED = 0,
-    VSS_UT_BOOTABLESYSTEMSTATE = 1,
-    VSS_UT_SYSTEMSERVICE = 2,
-    VSS_UT_USERDATA = 3,
-    VSS_UT_OTHER = 4,
-}}
-ENUM!{enum VSS_SOURCE_TYPE {
-    VSS_ST_UNDEFINED = 0,
-    VSS_ST_TRANSACTEDDB = 1,
-    VSS_ST_NONTRANSACTEDDB = 2,
-    VSS_ST_OTHER = 3,
-}}
-ENUM!{enum VSS_RESTOREMETHOD_ENUM {
-    VSS_RME_UNDEFINED = 0,
-    VSS_RME_RESTORE_IF_NOT_THERE = 1,
-    VSS_RME_RESTORE_IF_CAN_REPLACE = 2,
-    VSS_RME_STOP_RESTORE_START = 3,
-    VSS_RME_RESTORE_TO_ALTERNATE_LOCATION = 4,
-    VSS_RME_RESTORE_AT_REBOOT = 5,
-    VSS_RME_RESTORE_AT_REBOOT_IF_CANNOT_REPLACE = 6,
-    VSS_RME_CUSTOM = 7,
-    VSS_RME_RESTORE_STOP_START = 8,
-}}
-ENUM!{enum VSS_WRITERRESTORE_ENUM {
-    VSS_WRE_UNDEFINED = 0,
-    VSS_WRE_NEVER = 1,
-    VSS_WRE_IF_REPLACE_FAILS = 2,
-    VSS_WRE_ALWAYS = 3,
-}}
-ENUM!{enum VSS_COMPONENT_TYPE {
-    VSS_CT_UNDEFINED = 0,
-    VSS_CT_DATABASE = 1,
-    VSS_CT_FILEGROUP = 2,
-}}
-ENUM!{enum VSS_ALTERNATE_WRITER_STATE {
-    VSS_AWS_UNDEFINED = 0,
-    VSS_AWS_NO_ALTERNATE_WRITER = 1,
-    VSS_AWS_ALTERNATE_WRITER_EXISTS = 2,
-    VSS_AWS_THIS_IS_ALTERNATE_WRITER = 3,
-}}
-pub type VSS_SUBSCRIBE_MASK = ::DWORD;
-pub const VSS_SM_POST_SNAPSHOT_FLAG: ::DWORD = 0x00000001;
-pub const VSS_SM_BACKUP_EVENTS_FLAG: ::DWORD = 0x00000002;
-pub const VSS_SM_RESTORE_EVENTS_FLAG: ::DWORD = 0x00000004;
-pub const VSS_SM_IO_THROTTLING_FLAG: ::DWORD = 0x00000008;
-pub const VSS_SM_ALL_FLAGS: ::DWORD = 0xffffffff;
-ENUM!{enum VSS_RESTORE_TARGET {
-    VSS_RT_UNDEFINED = 0,
-    VSS_RT_ORIGINAL = 1,
-    VSS_RT_ALTERNATE = 2,
-    VSS_RT_DIRECTED = 3,
-    VSS_RT_ORIGINAL_LOCATION = 4,
-}}
-ENUM!{enum VSS_FILE_RESTORE_STATUS {
-    VSS_RS_UNDEFINED = 0,
-    VSS_RS_NONE = 1,
-    VSS_RS_ALL = 2,
-    VSS_RS_FAILED = 3,
-}}
-pub type VSS_COMPONENT_FLAGS = ::DWORD;
-pub const VSS_CF_BACKUP_RECOVERY: ::DWORD = 0x00000001;
-pub const VSS_CF_APP_ROLLBACK_RECOVERY: ::DWORD = 0x00000002;
-pub const VSS_CF_NOT_SYSTEM_STATE: ::DWORD = 0x00000004;
-RIDL!(
-interface IVssWMFiledesc(IVssWMFiledescVtbl): IUnknown(IUnknownVtbl) {
-    fn GetPath(&mut self, pbstrPath: *mut ::BSTR) -> ::HRESULT,
-    fn GetFilespec(&mut self, pbstrFilespec: *mut ::BSTR) -> ::HRESULT,
-    fn GetRecursive(&mut self, pbRecursive: *mut bool) -> ::HRESULT,
-    fn GetAlternateLocation(&mut self, pbstrAlternateLocation: *mut ::BSTR) -> ::HRESULT,
-    fn GetBackupTypeMask(&mut self, pdwTypeMask: *mut ::DWORD) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssWMDependency(IVssWMDependencyVtbl): IUnknown(IUnknownVtbl) {
-    fn GetWriterId(&mut self, pWriterId: *mut ::VSS_ID) -> ::HRESULT,
-    fn GetLogicalPath(&mut self, pbstrLogicalPath: *mut ::BSTR) -> ::HRESULT,
-    fn GetComponentName(&mut self, pbstrComponentName: *mut ::BSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssComponent(IVssComponentVtbl): IUnknown(IUnknownVtbl) {
-    fn GetLogicalPath(&mut self, pbstrPath: *mut ::BSTR) -> ::HRESULT,
-    fn GetComponentType(&mut self, pct: *mut ::VSS_COMPONENT_TYPE) -> ::HRESULT,
-    fn GetComponentName(&mut self, pbstrName: *mut ::BSTR) -> ::HRESULT,
-    fn GetBackupSucceeded(&mut self, pbSucceeded: *mut bool) -> ::HRESULT,
-    fn GetAlternateLocationMappingCount(&mut self, pcMappings: *mut ::UINT) -> ::HRESULT,
-    fn GetAlternateLocationMapping(
-        &mut self, iMapping: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn SetBackupMetadata(&mut self, wszData: ::LPCWSTR) -> ::HRESULT,
-    fn GetBackupMetadata(&mut self, pbstrData: *mut ::BSTR) -> ::HRESULT,
-    fn AddPartialFile(
-        &mut self, wszPath: ::LPCWSTR, wszFilename: ::LPCWSTR, wszRanges: ::LPCWSTR,
-        wszMetadata: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn GetPartialFileCount(&mut self, pcPartialFiles: *mut ::UINT) -> ::HRESULT,
-    fn GetPartialFile(
-        &mut self, iPartialFile: ::UINT, pbstrPath: *mut ::BSTR, pbstrFilename: *mut ::BSTR,
-        pbstrRange: *mut ::BSTR, pbstrMetadata: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn IsSelectedForRestore(&mut self, pbSelectedForRestore: *mut bool) -> ::HRESULT,
-    fn GetAdditionalRestores(&mut self, pbAdditionalRestores: *mut bool) -> ::HRESULT,
-    fn GetNewTargetCount(&mut self, pcNewTarget: *mut ::UINT) -> ::HRESULT,
-    fn GetNewTarget(
-        &mut self, iNewTarget: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn AddDirectedTarget(
-        &mut self, wszSourcePath: ::LPCWSTR, wszSourceFilename: ::LPCWSTR,
-        wszSourceRangeList: ::LPCWSTR, wszDestinationPath: ::LPCWSTR,
-        wszDestinationFilename: ::LPCWSTR, wszDestinationRangeList: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn GetDirectedTargetCount(&mut self, pcDirectedTarget: *mut ::UINT) -> ::HRESULT,
-    fn GetDirectedTarget(
-        &mut self, iDirectedTarget: ::UINT, pbstrSourcePath: *mut ::BSTR,
-        pbstrSourceFileName: *mut ::BSTR, pbstrSourceRangeList: *mut ::BSTR,
-        pbstrDestinationPath: *mut ::BSTR, pbstrDestinationFilename: *mut ::BSTR,
-        pbstrDestinationRangeList: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn SetRestoreMetadata(&mut self, wszRestoreMetadata: ::LPCWSTR) -> ::HRESULT,
-    fn GetRestoreMetadata(&mut self, pbstrRestoreMetadata: *mut ::BSTR) -> ::HRESULT,
-    fn SetRestoreTarget(&mut self, target: ::VSS_RESTORE_TARGET) -> ::HRESULT,
-    fn GetRestoreTarget(&mut self, pTarget: *mut ::VSS_RESTORE_TARGET) -> ::HRESULT,
-    fn SetPreRestoreFailureMsg(&mut self, wszPreRestoreFailureMsg: ::LPCWSTR) -> ::HRESULT,
-    fn GetPreRestoreFailureMsg(&mut self, pbstrPreRestoreFailureMsg: *mut ::BSTR) -> ::HRESULT,
-    fn SetPostRestoreFailureMsg(&mut self, wszPostRestoreFailureMsg: ::LPCWSTR) -> ::HRESULT,
-    fn GetPostRestoreFailureMsg(&mut self, pbstrPostRestoreFailureMsg: *mut ::BSTR) -> ::HRESULT,
-    fn SetBackupStamp(&mut self, wszBackupStamp: ::LPCWSTR) -> ::HRESULT,
-    fn GetBackupStamp(&mut self, pbstrBackupStamp: *mut ::BSTR) -> ::HRESULT,
-    fn GetPreviousBackupStamp(&mut self, pbstrBackupStamp: *mut ::BSTR) -> ::HRESULT,
-    fn GetBackupOptions(&mut self, pbstrBackupOptions: *mut ::BSTR) -> ::HRESULT,
-    fn GetRestoreOptions(&mut self, pbstrRestoreOptions: *mut ::BSTR) -> ::HRESULT,
-    fn GetRestoreSubcomponentCount(&mut self, pcRestoreSubcomponent: *mut ::UINT) -> ::HRESULT,
-    fn GetRestoreSubcomponent(
-        &mut self, iComponent: ::UINT, pbstrLogicalPath: *mut ::BSTR,
-        pbstrComponentName: *mut ::BSTR, pbRepair: *mut bool
-    ) -> ::HRESULT,
-    fn GetFileRestoreStatus(&mut self, pStatus: *mut VSS_FILE_RESTORE_STATUS) -> ::HRESULT,
-    fn AddDifferencedFilesByLastModifyTime(
-        &mut self, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: ::BOOL,
-        ftLastModifyTime: ::FILETIME
-    ) -> ::HRESULT,
-    fn AddDifferencedFilesByLastModifyLSN(
-        &mut self, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: ::BOOL,
-        bstrLsnString: ::BSTR
-    ) -> ::HRESULT,
-    fn GetDifferencedFilesCount(&mut self, pcDifferencedFiles: *mut ::UINT) -> ::HRESULT,
-    fn GetDifferencedFile(
-        &mut self, iDifferencedFile: ::UINT, pbstrPath: *mut ::BSTR, pbstrFilespec: *mut ::BSTR,
-        pbRecursive: *mut ::BOOL, pbstrLsnString: *mut ::BSTR, pftLastModifyTime: *mut ::FILETIME
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssWriterComponents(IVssWriterComponentsVtbl) {
-    fn GetComponentCount(&mut self, pcComponents: *mut ::UINT) -> ::HRESULT,
-    fn GetWriterInfo(
-        &mut self, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID
-    ) -> ::HRESULT,
-    fn GetComponent(
-        &mut self, iComponent: ::UINT, ppComponent: *mut *mut ::IVssComponent
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssComponentEx(IVssComponentExVtbl): IVssComponent(IVssComponentVtbl) {
-    fn SetPrepareForBackupFailureMsg(&mut self, wszFailureMsg: ::LPCWSTR) -> ::HRESULT,
-    fn SetPostSnapshotFailureMsg(&mut self, wszFailureMsg: ::LPCWSTR) -> ::HRESULT,
-    fn GetPrepareForBackupFailureMsg(&mut self, pbstrFailureMsg: *mut ::BSTR) -> ::HRESULT,
-    fn GetPostSnapshotFailureMsg(&mut self, pbstrFailureMsg: *mut ::BSTR) -> ::HRESULT,
-    fn GetAuthoritativeRestore(&mut self, pbAuth: *mut bool) -> ::HRESULT,
-    fn GetRollForward(
-        &mut self, pRollType: *mut ::VSS_ROLLFORWARD_TYPE, pbstrPoint: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn GetRestoreName(&mut self, pbstrName: *mut ::BSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssComponentEx2(IVssComponentEx2Vtbl): IVssComponentEx(IVssComponentExVtbl) {
-    fn SetFailure(
-        &mut self, hr: ::HRESULT, hrApplication: ::HRESULT, wszApplicationMessage: ::LPCWSTR,
-        dwReserved: ::DWORD
-    ) -> ::HRESULT,
-    fn GetFailure(
-        &mut self, phr: *mut ::HRESULT, phrApplication: *mut ::HRESULT,
-        pbstrApplicationMessage: *mut ::BSTR, pdwReserved: *mut ::DWORD
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssCreateWriterMetadata(IVssCreateWriterMetadataVtbl) {
-    fn AddIncludeFiles(
-        &mut self, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: bool,
-        wszAlternateLocation: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn AddExcludeFiles(
-        &mut self, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: bool
-    ) -> ::HRESULT,
-    fn AddComponent(
-        &mut self, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszCaption: ::LPCWSTR, pbIcon: *const ::BYTE, cbIcon: ::UINT,
-        bRestoreMetadata: bool, bNotifyOnBackupComplete: bool, bSelectableForRestore: bool,
-        dwComponentFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn AddDatabaseFiles(
-        &mut self, wszLogicalPath: ::LPCWSTR, wszDatabaseName: ::LPCWSTR, wszPath: ::LPCWSTR,
-        wszFilespec: ::LPCWSTR, dwBackupTypeMask: ::DWORD
-    ) -> ::HRESULT,
-    fn AddDatabaseLogFiles(&mut self, wszLogicalPath: ::LPCWSTR, wszDatabaseName: ::LPCWSTR,
-        wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, dwBackupTypeMask: ::DWORD
-    ) -> ::HRESULT,
-    fn AddFilesToFileGroup(&mut self, wszLogicalPath: ::LPCWSTR, wszGroupName: ::LPCWSTR,
-        wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: bool,
-        wszAlternateLocation: ::LPCWSTR, dwBackupTypeMask: ::DWORD
-    ) -> ::HRESULT,
-    fn SetRestoreMethod(&mut self, method: ::VSS_RESTOREMETHOD_ENUM, wszService: ::LPCWSTR,
-        wszUserProcedure: ::LPCWSTR, writerRestore: ::VSS_WRITERRESTORE_ENUM,
-        bRebootRequired: bool
-    ) -> ::HRESULT,
-    fn AddAlternateLocationMapping(&mut self, wszSourcePath: ::LPCWSTR,
-        wszSourceFilespec: ::LPCWSTR, bRecursive: bool, wszDestination: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn AddComponentDependency(&mut self, wszForLogicalPath: ::LPCWSTR,
-        wszForComponentName: ::LPCWSTR, onWriterId: ::VSS_ID, wszOnLogicalPath: ::LPCWSTR,
-        wszOnComponentName: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetBackupSchema(&mut self, dwSchemaMask: ::DWORD) -> ::HRESULT,
-    fn GetDocument(&mut self, pDoc: *mut *mut ::VOID) -> ::HRESULT, //TODO IXMLDOMDocument
-    fn SaveAsXML(&mut self, pbstrXML: *mut ::BSTR) -> ::HRESULT
-}
-);
-//IVssCreateWriterMetadataEx
-//IVssWriterImpl
-//IVssCreateExpressWriterMetadata
-//IVssExpressWriter
-//CVssWriter
-//CVssWriterEx
-//CVssWriterEx2
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/werapi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/werapi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/werapi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/werapi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Function prototypes for Windows Error Reporting (WER)
-ENUM!{enum WER_REGISTER_FILE_TYPE {
-    WerRegFileTypeUserDocument = 1,
-    WerRegFileTypeOther = 2,
-    WerRegFileTypeMax,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winbase.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winbase.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winbase.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winbase.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,552 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the 32-Bit Windows Base APIs
-pub const FILE_BEGIN: ::DWORD = 0;
-pub const FILE_CURRENT: ::DWORD = 1;
-pub const FILE_END: ::DWORD = 2;
-pub const WAIT_FAILED: ::DWORD = 0xFFFFFFFF;
-pub const WAIT_OBJECT_0: ::DWORD = ::STATUS_WAIT_0 as ::DWORD;
-pub const WAIT_ABANDONED: ::DWORD = ::STATUS_ABANDONED_WAIT_0 as ::DWORD;
-pub const WAIT_ABANDONED_0: ::DWORD = ::STATUS_ABANDONED_WAIT_0 as ::DWORD;
-pub const WAIT_IO_COMPLETION: ::DWORD = ::STATUS_USER_APC as ::DWORD;
-pub const FILE_FLAG_WRITE_THROUGH: ::DWORD = 0x80000000;
-pub const FILE_FLAG_OVERLAPPED: ::DWORD = 0x40000000;
-pub const FILE_FLAG_NO_BUFFERING: ::DWORD = 0x20000000;
-pub const FILE_FLAG_RANDOM_ACCESS: ::DWORD = 0x10000000;
-pub const FILE_FLAG_SEQUENTIAL_SCAN: ::DWORD = 0x08000000;
-pub const FILE_FLAG_DELETE_ON_CLOSE: ::DWORD = 0x04000000;
-pub const FILE_FLAG_BACKUP_SEMANTICS: ::DWORD = 0x02000000;
-pub const FILE_FLAG_POSIX_SEMANTICS: ::DWORD = 0x01000000;
-pub const FILE_FLAG_SESSION_AWARE: ::DWORD = 0x00800000;
-pub const FILE_FLAG_OPEN_REPARSE_POINT: ::DWORD = 0x00200000;
-pub const FILE_FLAG_OPEN_NO_RECALL: ::DWORD = 0x00100000;
-pub const FILE_FLAG_FIRST_PIPE_INSTANCE: ::DWORD = 0x00080000;
-pub const FILE_FLAG_OPEN_REQUIRING_OPLOCK: ::DWORD = 0x00040000;
-pub const PROGRESS_CONTINUE: ::DWORD = 0;
-pub const PROGRESS_CANCEL: ::DWORD = 1;
-pub const PROGRESS_STOP: ::DWORD = 2;
-pub const PROGRESS_QUIET: ::DWORD = 3;
-pub const CALLBACK_CHUNK_FINISHED: ::DWORD = 0x00000000;
-pub const CALLBACK_STREAM_SWITCH: ::DWORD = 0x00000001;
-pub const COPY_FILE_FAIL_IF_EXISTS: ::DWORD = 0x00000001;
-pub const COPY_FILE_RESTARTABLE: ::DWORD = 0x00000002;
-pub const COPY_FILE_OPEN_SOURCE_FOR_WRITE: ::DWORD = 0x00000004;
-pub const COPY_FILE_ALLOW_DECRYPTED_DESTINATION: ::DWORD = 0x00000008;
-pub const COPY_FILE_COPY_SYMLINK: ::DWORD = 0x00000800;
-pub const COPY_FILE_NO_BUFFERING: ::DWORD = 0x00001000;
-pub const COPY_FILE_REQUEST_SECURITY_PRIVILEGES: ::DWORD = 0x00002000;
-pub const COPY_FILE_RESUME_FROM_PAUSE: ::DWORD = 0x00004000;
-pub const COPY_FILE_NO_OFFLOAD: ::DWORD = 0x00040000;
-pub const REPLACEFILE_WRITE_THROUGH: ::DWORD = 0x00000001;
-pub const REPLACEFILE_IGNORE_MERGE_ERRORS: ::DWORD = 0x00000002;
-pub const REPLACEFILE_IGNORE_ACL_ERRORS: ::DWORD = 0x00000004;
-pub const PIPE_ACCESS_INBOUND: ::DWORD = 0x00000001;
-pub const PIPE_ACCESS_OUTBOUND: ::DWORD = 0x00000002;
-pub const PIPE_ACCESS_DUPLEX: ::DWORD = 0x00000003;
-pub const PIPE_CLIENT_END: ::DWORD = 0x00000000;
-pub const PIPE_SERVER_END: ::DWORD = 0x00000001;
-pub const PIPE_WAIT: ::DWORD = 0x00000000;
-pub const PIPE_NOWAIT: ::DWORD = 0x00000001;
-pub const PIPE_READMODE_BYTE: ::DWORD = 0x00000000;
-pub const PIPE_READMODE_MESSAGE: ::DWORD = 0x00000002;
-pub const PIPE_TYPE_BYTE: ::DWORD = 0x00000000;
-pub const PIPE_TYPE_MESSAGE: ::DWORD = 0x00000004;
-pub const PIPE_ACCEPT_REMOTE_CLIENTS: ::DWORD = 0x00000000;
-pub const PIPE_REJECT_REMOTE_CLIENTS: ::DWORD = 0x00000008;
-pub const PIPE_UNLIMITED_INSTANCES: ::DWORD = 255;
-//270
-pub const SECURITY_CONTEXT_TRACKING: ::DWORD = 0x00040000;
-pub const SECURITY_EFFECTIVE_ONLY: ::DWORD = 0x00080000;
-pub const SECURITY_SQOS_PRESENT: ::DWORD = 0x00100000;
-pub const SECURITY_VALID_SQOS_FLAGS: ::DWORD = 0x001F0000;
-//282
-pub type PFIBER_START_ROUTINE = Option<unsafe extern "system" fn(lpFiberParameter: ::LPVOID)>;
-pub type LPFIBER_START_ROUTINE = PFIBER_START_ROUTINE;
-pub type PFIBER_CALLOUT_ROUTINE = Option<unsafe extern "system" fn(
-    lpParameter: ::LPVOID,
-) -> ::LPVOID>;
-//299
-pub type LPLDT_ENTRY = ::LPVOID; // TODO - fix this for 32-bit
-//405
-STRUCT!{struct COMMPROP {
-    wPacketLength: ::WORD,
-    wPacketVersion: ::WORD,
-    dwServiceMask: ::DWORD,
-    dwReserved1: ::DWORD,
-    dwMaxTxQueue: ::DWORD,
-    dwMaxRxQueue: ::DWORD,
-    dwMaxBaud: ::DWORD,
-    dwProvSubType: ::DWORD,
-    dwProvCapabilities: ::DWORD,
-    dwSettableParams: ::DWORD,
-    dwSettableBaud: ::DWORD,
-    wSettableData: ::WORD,
-    wSettableStopParity: ::WORD,
-    dwCurrentTxQueue: ::DWORD,
-    dwCurrentRxQueue: ::DWORD,
-    dwProvSpec1: ::DWORD,
-    dwProvSpec2: ::DWORD,
-    wcProvChar: [::WCHAR; 1],
-}}
-pub type LPCOMMPROP = *mut COMMPROP;
-//432
-STRUCT!{struct COMSTAT {
-    BitFields: ::DWORD,
-    cbInQue: ::DWORD,
-    cbOutQue : ::DWORD,
-}}
-BITFIELD!(COMSTAT BitFields: ::DWORD [
-    fCtsHold set_fCtsHold[0..1],
-    fDsrHold set_fDsrHold[1..2],
-    fRlsdHold set_fRlsdHold[2..3],
-    fXoffHold set_fXoffHold[3..4],
-    fXoffSent set_fXoffSent[4..5],
-    fEof set_fEof[5..6],
-    fTxim set_fTxim[6..7],
-    fReserved set_fReserved[7..32],
-]);
-pub type LPCOMSTAT = *mut COMSTAT;
-//460
-STRUCT!{struct DCB {
-    DCBlength: ::DWORD,
-    BaudRate: ::DWORD,
-    BitFields: ::DWORD,
-    wReserved: ::WORD,
-    XonLim: ::WORD,
-    XoffLim: ::WORD,
-    ByteSize: ::BYTE,
-    Parity: ::BYTE,
-    StopBits: ::BYTE,
-    XonChar: ::c_char,
-    XoffChar: ::c_char,
-    ErrorChar: ::c_char,
-    EofChar: ::c_char,
-    EvtChar: ::c_char,
-    wReserved1: ::WORD,
-}}
-BITFIELD!(DCB BitFields: ::DWORD [
-    fBinary set_fBinary[0..1],
-    fParity set_fParity[1..2],
-    fOutxCtsFlow set_fOutxCtsFlow[2..3],
-    fOutxDsrFlow set_fOutxDsrFlow[3..4],
-    fDtrControl set_fDtrControl[4..6],
-    fDsrSensitivity set_fDsrSensitivity[6..7],
-    fTXContinueOnXoff set_fTXContinueOnXoff[7..8],
-    fOutX set_fOutX[8..9],
-    fInX set_fInX[9..10],
-    fErrorChar set_fErrorChar[10..11],
-    fNull set_fNull[11..12],
-    fRtsControl set_fRtsControl[12..14],
-    fAbortOnError set_fAbortOnError[14..15],
-    fDummy2 set_fDummy2[15..32],
-]);
-pub type LPDCB = *mut DCB;
-STRUCT!{struct COMMTIMEOUTS {
-    ReadIntervalTimeout: ::DWORD,
-    ReadTotalTimeoutMultiplier: ::DWORD,
-    ReadTotalTimeoutConstant: ::DWORD,
-    WriteTotalTimeoutMultiplier: ::DWORD,
-    WriteTotalTimeoutConstant: ::DWORD,
-}}
-pub type LPCOMMTIMEOUTS = *mut COMMTIMEOUTS;
-STRUCT!{struct COMMCONFIG {
-    dwSize: ::DWORD,
-    wVersion: ::WORD,
-    wReserved: ::WORD,
-    dcb: DCB,
-    dwProviderSubType: ::DWORD,
-    dwProviderOffset: ::DWORD,
-    dwProviderSize: ::DWORD,
-    wcProviderData: [::WCHAR; 1],
-}}
-pub type LPCOMMCONFIG = *mut COMMCONFIG;
-//547
-STRUCT!{struct MEMORYSTATUS {
-    dwLength: ::DWORD,
-    dwMemoryLoad: ::DWORD,
-    dwTotalPhys: ::SIZE_T,
-    dwAvailPhys: ::SIZE_T,
-    dwTotalPageFile: ::SIZE_T,
-    dwAvailPageFile: ::SIZE_T,
-    dwTotalVirtual: ::SIZE_T,
-    dwAvailVirtual: ::SIZE_T,
-}}
-pub type LPMEMORYSTATUS = *mut MEMORYSTATUS;
-//568
-pub const DEBUG_PROCESS: ::DWORD = 0x00000001;
-pub const DEBUG_ONLY_THIS_PROCESS: ::DWORD = 0x00000002;
-pub const CREATE_SUSPENDED: ::DWORD = 0x00000004;
-pub const DETACHED_PROCESS: ::DWORD = 0x00000008;
-pub const CREATE_NEW_CONSOLE: ::DWORD = 0x00000010;
-pub const NORMAL_PRIORITY_CLASS: ::DWORD = 0x00000020;
-pub const IDLE_PRIORITY_CLASS: ::DWORD = 0x00000040;
-pub const HIGH_PRIORITY_CLASS: ::DWORD = 0x00000080;
-pub const REALTIME_PRIORITY_CLASS: ::DWORD = 0x00000100;
-pub const CREATE_NEW_PROCESS_GROUP: ::DWORD = 0x00000200;
-pub const CREATE_UNICODE_ENVIRONMENT: ::DWORD = 0x00000400;
-pub const CREATE_SEPARATE_WOW_VDM: ::DWORD = 0x00000800;
-pub const CREATE_SHARED_WOW_VDM: ::DWORD = 0x00001000;
-pub const CREATE_FORCEDOS: ::DWORD = 0x00002000;
-pub const BELOW_NORMAL_PRIORITY_CLASS: ::DWORD = 0x00004000;
-pub const ABOVE_NORMAL_PRIORITY_CLASS: ::DWORD = 0x00008000;
-pub const INHERIT_PARENT_AFFINITY: ::DWORD = 0x00010000;
-pub const INHERIT_CALLER_PRIORITY: ::DWORD = 0x00020000;
-pub const CREATE_PROTECTED_PROCESS: ::DWORD = 0x00040000;
-pub const EXTENDED_STARTUPINFO_PRESENT: ::DWORD = 0x00080000;
-pub const PROCESS_MODE_BACKGROUND_BEGIN: ::DWORD = 0x00100000;
-pub const PROCESS_MODE_BACKGROUND_END: ::DWORD = 0x00200000;
-pub const CREATE_BREAKAWAY_FROM_JOB: ::DWORD = 0x01000000;
-pub const CREATE_PRESERVE_CODE_AUTHZ_LEVEL: ::DWORD = 0x02000000;
-pub const CREATE_DEFAULT_ERROR_MODE: ::DWORD = 0x04000000;
-pub const CREATE_NO_WINDOW: ::DWORD = 0x08000000;
-pub const PROFILE_USER: ::DWORD = 0x10000000;
-pub const PROFILE_KERNEL: ::DWORD = 0x20000000;
-pub const PROFILE_SERVER: ::DWORD = 0x40000000;
-pub const CREATE_IGNORE_SYSTEM_DEFAULT: ::DWORD = 0x80000000;
-//618
-pub const THREAD_PRIORITY_LOWEST: ::DWORD = ::THREAD_BASE_PRIORITY_MIN;
-pub const THREAD_PRIORITY_BELOW_NORMAL: ::DWORD = THREAD_PRIORITY_LOWEST + 1;
-pub const THREAD_PRIORITY_NORMAL: ::DWORD = 0;
-pub const THREAD_PRIORITY_HIGHEST: ::DWORD = ::THREAD_BASE_PRIORITY_MAX;
-pub const THREAD_PRIORITY_ABOVE_NORMAL: ::DWORD = THREAD_PRIORITY_HIGHEST - 1;
-pub const THREAD_PRIORITY_ERROR_RETURN: ::DWORD = ::MAXLONG as ::DWORD;
-pub const THREAD_PRIORITY_TIME_CRITICAL: ::DWORD = ::THREAD_BASE_PRIORITY_LOWRT;
-pub const THREAD_PRIORITY_IDLE: ::DWORD = ::THREAD_BASE_PRIORITY_IDLE;
-pub const THREAD_MODE_BACKGROUND_BEGIN: ::DWORD = 0x00010000;
-pub const THREAD_MODE_BACKGROUND_END: ::DWORD = 0x00020000;
-//666
-pub const DRIVE_UNKNOWN: ::DWORD = 0;
-pub const DRIVE_NO_ROOT_DIR: ::DWORD = 1;
-pub const DRIVE_REMOVABLE: ::DWORD = 2;
-pub const DRIVE_FIXED: ::DWORD = 3;
-pub const DRIVE_REMOTE: ::DWORD = 4;
-pub const DRIVE_CDROM: ::DWORD = 5;
-pub const DRIVE_RAMDISK: ::DWORD = 6;
-pub const FILE_TYPE_UNKNOWN: ::DWORD = 0x0000;
-pub const FILE_TYPE_DISK: ::DWORD = 0x0001;
-pub const FILE_TYPE_CHAR: ::DWORD = 0x0002;
-pub const FILE_TYPE_PIPE: ::DWORD = 0x0003;
-pub const FILE_TYPE_REMOTE: ::DWORD = 0x8000;
-pub const STD_INPUT_HANDLE: ::DWORD = 0xFFFFFFF6;
-pub const STD_OUTPUT_HANDLE: ::DWORD = 0xFFFFFFF5;
-pub const STD_ERROR_HANDLE: ::DWORD = 0xFFFFFFF4;
-pub const NOPARITY: ::DWORD = 0;
-pub const ODDPARITY: ::DWORD = 1;
-pub const EVENPARITY: ::DWORD = 2;
-pub const MARKPARITY: ::DWORD = 3;
-pub const SPACEPARITY: ::DWORD = 4;
-pub const ONESTOPBIT: ::DWORD = 0;
-pub const ONE5STOPBITS: ::DWORD = 1;
-pub const TWOSTOPBITS: ::DWORD = 2;
-pub const IGNORE: ::DWORD = 0;
-pub const INFINITE: ::DWORD = 0xFFFFFFFF;
-//1729
-pub const SEM_FAILCRITICALERRORS: ::UINT = 0x0001;
-pub const SEM_NOGPFAULTERRORBOX: ::UINT = 0x0002;
-pub const SEM_NOALIGNMENTFAULTEXCEPT: ::UINT = 0x0004;
-pub const SEM_NOOPENFILEERRORBOX: ::UINT = 0x8000;
-//2320
-pub const FORMAT_MESSAGE_IGNORE_INSERTS: ::DWORD = 0x00000200;
-pub const FORMAT_MESSAGE_FROM_STRING: ::DWORD = 0x00000400;
-pub const FORMAT_MESSAGE_FROM_HMODULE: ::DWORD = 0x00000800;
-pub const FORMAT_MESSAGE_FROM_SYSTEM: ::DWORD = 0x00001000;
-pub const FORMAT_MESSAGE_ARGUMENT_ARRAY: ::DWORD = 0x00002000;
-pub const FORMAT_MESSAGE_MAX_WIDTH_MASK: ::DWORD = 0x000000FF;
-pub const FORMAT_MESSAGE_ALLOCATE_BUFFER: ::DWORD = 0x00000100;
-//2873
-pub const STARTF_USESHOWWINDOW: ::DWORD = 0x00000001;
-pub const STARTF_USESIZE: ::DWORD = 0x00000002;
-pub const STARTF_USEPOSITION: ::DWORD = 0x00000004;
-pub const STARTF_USECOUNTCHARS: ::DWORD = 0x00000008;
-pub const STARTF_USEFILLATTRIBUTE: ::DWORD = 0x00000010;
-pub const STARTF_RUNFULLSCREEN: ::DWORD = 0x00000020;
-pub const STARTF_FORCEONFEEDBACK: ::DWORD = 0x00000040;
-pub const STARTF_FORCEOFFFEEDBACK: ::DWORD = 0x00000080;
-pub const STARTF_USESTDHANDLES: ::DWORD = 0x00000100;
-pub const STARTF_USEHOTKEY: ::DWORD = 0x00000200;
-pub const STARTF_TITLEISLINKNAME: ::DWORD = 0x00000800;
-pub const STARTF_TITLEISAPPID: ::DWORD = 0x00001000;
-pub const STARTF_PREVENTPINNING: ::DWORD = 0x00002000;
-pub const STARTF_UNTRUSTEDSOURCE: ::DWORD = 0x00008000;
-//5002
-pub type LPPROGRESS_ROUTINE = Option<unsafe extern "system" fn(
-    TotalFileSize: ::LARGE_INTEGER, TotalBytesTransferred: ::LARGE_INTEGER,
-    StreamSize: ::LARGE_INTEGER, StreamBytesTransferred: ::LARGE_INTEGER, dwStreamNumber: ::DWORD,
-    dwCallbackReason: ::DWORD, hSourceFile: ::HANDLE, hDestinationFile: ::HANDLE, lpData: ::LPVOID,
-) -> ::DWORD>;
-//5095
-ENUM!{enum COPYFILE2_MESSAGE_TYPE {
-    COPYFILE2_CALLBACK_NONE = 0,
-    COPYFILE2_CALLBACK_CHUNK_STARTED,
-    COPYFILE2_CALLBACK_CHUNK_FINISHED,
-    COPYFILE2_CALLBACK_STREAM_STARTED,
-    COPYFILE2_CALLBACK_STREAM_FINISHED,
-    COPYFILE2_CALLBACK_POLL_CONTINUE,
-    COPYFILE2_CALLBACK_ERROR,
-    COPYFILE2_CALLBACK_MAX,
-}}
-ENUM!{enum COPYFILE2_MESSAGE_ACTION {
-    COPYFILE2_PROGRESS_CONTINUE = 0,
-    COPYFILE2_PROGRESS_CANCEL,
-    COPYFILE2_PROGRESS_STOP,
-    COPYFILE2_PROGRESS_QUIET,
-    COPYFILE2_PROGRESS_PAUSE,
-}}
-ENUM!{enum COPYFILE2_COPY_PHASE {
-    COPYFILE2_PHASE_NONE = 0,
-    COPYFILE2_PHASE_PREPARE_SOURCE,
-    COPYFILE2_PHASE_PREPARE_DEST,
-    COPYFILE2_PHASE_READ_SOURCE,
-    COPYFILE2_PHASE_WRITE_DESTINATION,
-    COPYFILE2_PHASE_SERVER_COPY,
-    COPYFILE2_PHASE_NAMEGRAFT_COPY,
-    COPYFILE2_PHASE_MAX,
-}}
-//5129
-STRUCT!{struct COPYFILE2_MESSAGE_ChunkStarted {
-    dwStreamNumber: ::DWORD,
-    dwReserved: ::DWORD,
-    hSourceFile: ::HANDLE,
-    hDestinationFile: ::HANDLE,
-    uliChunkNumber: ::ULARGE_INTEGER,
-    uliChunkSize: ::ULARGE_INTEGER,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_ChunkFinished {
-    dwStreamNumber: ::DWORD,
-    dwFlags: ::DWORD,
-    hSourceFile: ::HANDLE,
-    hDestinationFile: ::HANDLE,
-    uliChunkNumber: ::ULARGE_INTEGER,
-    uliChunkSize: ::ULARGE_INTEGER,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliStreamBytesTransferred: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-    uliTotalBytesTransferred: ::ULARGE_INTEGER,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_StreamStarted {
-    dwStreamNumber: ::DWORD,
-    dwReserved: ::DWORD,
-    hSourceFile: ::HANDLE,
-    hDestinationFile: ::HANDLE,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_StreamFinished {
-    dwStreamNumber: ::DWORD,
-    dwReserved: ::DWORD,
-    hSourceFile: ::HANDLE,
-    hDestinationFile: ::HANDLE,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliStreamBytesTransferred: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-    uliTotalBytesTransferred: ::ULARGE_INTEGER,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_PollContinue {
-    dwReserved: ::DWORD,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_Error {
-    CopyPhase: COPYFILE2_COPY_PHASE,
-    dwStreamNumber: ::DWORD,
-    hrFailure: ::HRESULT,
-    dwReserved: ::DWORD,
-    uliChunkNumber: ::ULARGE_INTEGER,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliStreamBytesTransferred: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-    uliTotalBytesTransferred: ::ULARGE_INTEGER,
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{struct COPYFILE2_MESSAGE {
-    Type: COPYFILE2_MESSAGE_TYPE,
-    dwPadding: ::DWORD,
-    Info: [u64; 8],
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{struct COPYFILE2_MESSAGE {
-    Type: COPYFILE2_MESSAGE_TYPE,
-    dwPadding: ::DWORD,
-    Info: [u64; 9],
-}}
-UNION!{COPYFILE2_MESSAGE, Info, ChunkStarted, ChunkStarted_mut, COPYFILE2_MESSAGE_ChunkStarted}
-UNION!{COPYFILE2_MESSAGE, Info, ChunkFinished, ChunkFinished_mut, COPYFILE2_MESSAGE_ChunkFinished}
-UNION!{COPYFILE2_MESSAGE, Info, StreamStarted, StreamStarted_mut, COPYFILE2_MESSAGE_StreamStarted}
-UNION!{COPYFILE2_MESSAGE, Info, StreamFinished, StreamFinished_mut,
-    COPYFILE2_MESSAGE_StreamFinished}
-UNION!{COPYFILE2_MESSAGE, Info, PollContinue, PollContinue_mut, COPYFILE2_MESSAGE_PollContinue}
-UNION!{COPYFILE2_MESSAGE, Info, Error, Error_mut, COPYFILE2_MESSAGE_Error}
-pub type PCOPYFILE2_PROGRESS_ROUTINE = Option<unsafe extern "system" fn(
-    pMessage: *const COPYFILE2_MESSAGE, pvCallbackContext: ::PVOID,
-) -> COPYFILE2_MESSAGE_ACTION>;
-STRUCT!{nodebug struct COPYFILE2_EXTENDED_PARAMETERS {
-    dwSize: ::DWORD,
-    dwCopyFlags: ::DWORD,
-    pfCancel: *mut ::BOOL,
-    pProgressRoutine: PCOPYFILE2_PROGRESS_ROUTINE,
-    pvCallbackContext: ::PVOID,
-}}
-//5377
-pub const MOVEFILE_REPLACE_EXISTING: ::DWORD = 0x00000001;
-pub const MOVEFILE_COPY_ALLOWED: ::DWORD = 0x00000002;
-pub const MOVEFILE_DELAY_UNTIL_REBOOT: ::DWORD = 0x00000004;
-pub const MOVEFILE_WRITE_THROUGH: ::DWORD = 0x00000008;
-pub const MOVEFILE_CREATE_HARDLINK: ::DWORD = 0x00000010;
-pub const MOVEFILE_FAIL_IF_NOT_TRACKABLE: ::DWORD = 0x00000020;
-//7176
-pub const HW_PROFILE_GUIDLEN: usize = 39;
-//pub const MAX_PROFILE_LEN: usize = 80;
-pub const DOCKINFO_UNDOCKED: ::DWORD = 0x1;
-pub const DOCKINFO_DOCKED: ::DWORD = 0x2;
-pub const DOCKINFO_USER_SUPPLIED: ::DWORD = 0x4;
-pub const DOCKINFO_USER_UNDOCKED: ::DWORD = DOCKINFO_USER_SUPPLIED | DOCKINFO_UNDOCKED;
-pub const DOCKINFO_USER_DOCKED: ::DWORD = DOCKINFO_USER_SUPPLIED | DOCKINFO_DOCKED;
-STRUCT!{nodebug struct HW_PROFILE_INFOA {
-    dwDockInfo: ::DWORD,
-    szHwProfileGuid: [::CHAR; HW_PROFILE_GUIDLEN],
-    szHwProfileName: [::CHAR; ::MAX_PROFILE_LEN],
-}}
-pub type LPHW_PROFILE_INFOA = *mut HW_PROFILE_INFOA;
-STRUCT!{nodebug struct HW_PROFILE_INFOW {
-    dwDockInfo: ::DWORD,
-    szHwProfileGuid: [::WCHAR; HW_PROFILE_GUIDLEN],
-    szHwProfileName: [::WCHAR; ::MAX_PROFILE_LEN],
-}}
-pub type LPHW_PROFILE_INFOW = *mut HW_PROFILE_INFOW;
-//7574
-STRUCT!{struct ACTCTXA {
-    cbSize: ::ULONG,
-    dwFlags: ::DWORD,
-    lpSource: ::LPCSTR,
-    wProcessorArchitecture: ::USHORT,
-    wLangId: ::LANGID,
-    lpAssemblyDirectory: ::LPCSTR,
-    lpResourceName: ::LPCSTR,
-    lpApplicationName: ::LPCSTR,
-    hModule: ::HMODULE,
-}}
-pub type PACTCTXA = *mut ACTCTXA;
-STRUCT!{struct ACTCTXW {
-    cbSize: ::ULONG,
-    dwFlags: ::DWORD,
-    lpSource: ::LPCWSTR,
-    wProcessorArchitecture: ::USHORT,
-    wLangId: ::LANGID,
-    lpAssemblyDirectory: ::LPCWSTR,
-    lpResourceName: ::LPCWSTR,
-    lpApplicationName: ::LPCWSTR,
-    hModule: ::HMODULE,
-}}
-pub type PACTCTXW = *mut ACTCTXW;
-pub type PCACTCTXA = *const ACTCTXA;
-pub type PCACTCTXW = *const ACTCTXW;
-//
-pub type PUMS_CONTEXT = *mut ::c_void;
-pub type PUMS_COMPLETION_LIST = *mut ::c_void;
-pub type UMS_THREAD_INFO_CLASS = ::RTL_UMS_THREAD_INFO_CLASS;
-pub type PUMS_THREAD_INFO_CLASS = *mut UMS_THREAD_INFO_CLASS;
-pub type PUMS_SCHEDULER_ENTRY_POINT = ::PRTL_UMS_SCHEDULER_ENTRY_POINT;
-STRUCT!{nodebug struct UMS_SCHEDULER_STARTUP_INFO {
-    UmsVersion: ::ULONG,
-    CompletionList: PUMS_COMPLETION_LIST,
-    SchedulerProc: PUMS_SCHEDULER_ENTRY_POINT,
-    SchedulerParam: ::PVOID,
-}}
-pub type PUMS_SCHEDULER_STARTUP_INFO = *mut UMS_SCHEDULER_STARTUP_INFO;
-STRUCT!{struct UMS_SYSTEM_THREAD_INFORMATION {
-    UmsVersion: ::ULONG,
-    BitFields: ::ULONG,
-}}
-BITFIELD!(UMS_SYSTEM_THREAD_INFORMATION BitFields: ::ULONG [
-    IsUmsSchedulerThread set_IsUmsSchedulerThread[0..1],
-    IsUmsWorkerThread set_IsUmsWorkerThread[1..2],
-]);
-UNION!(
-    UMS_SYSTEM_THREAD_INFORMATION, BitFields, ThreadUmsFlags, ThreadUmsFlags_mut,
-    ::ULONG
-);
-pub type PUMS_SYSTEM_THREAD_INFORMATION = *mut UMS_SYSTEM_THREAD_INFORMATION;
-STRUCT!{struct ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA {
-    lpInformation: ::PVOID,
-    lpSectionBase: ::PVOID,
-    ulSectionLength: ::ULONG,
-    lpSectionGlobalDataBase: ::PVOID,
-    ulSectionGlobalDataLength: ::ULONG,
-}}
-pub type PACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA =
-    *mut ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA;
-pub type PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA =
-    *const ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA;
-STRUCT!{struct ACTCTX_SECTION_KEYED_DATA {
-    cbSize: ::ULONG,
-    ulDataFormatVersion: ::ULONG,
-    lpData: ::PVOID,
-    ulLength: ::ULONG,
-    lpSectionGlobalData: ::PVOID,
-    ulSectionGlobalDataLength: ::ULONG,
-    lpSectionBase: ::PVOID,
-    ulSectionTotalLength: ::ULONG,
-    hActCtx: ::HANDLE,
-    ulAssemblyRosterIndex: ::ULONG,
-    ulFlags: ::ULONG,
-    AssemblyMetadata: ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA,
-}}
-pub type PACTCTX_SECTION_KEYED_DATA = *mut ACTCTX_SECTION_KEYED_DATA;
-pub type PCACTCTX_SECTION_KEYED_DATA = *const ACTCTX_SECTION_KEYED_DATA;
-ENUM!{enum STREAM_INFO_LEVELS {
-    FindStreamInfoStandard,
-    FindStreamInfoMaxInfoLevel,
-}}
-ENUM!{enum PROCESS_INFORMATION_CLASS {
-    ProcessMemoryPriority,
-    ProcessInformationClassMax,
-}}
-ENUM!{enum DEP_SYSTEM_POLICY_TYPE {
-    DEPPolicyAlwaysOff = 0,
-    DEPPolicyAlwaysOn,
-    DEPPolicyOptIn,
-    DEPPolicyOptOut,
-    DEPTotalPolicyCount,
-}}
-ENUM!{enum PIPE_ATTRIBUTE_TYPE {
-    PipeAttribute,
-    PipeConnectionAttribute,
-    PipeHandleAttribute,
-}}
-pub type APPLICATION_RECOVERY_CALLBACK = Option<unsafe extern "system" fn(
-    pvParameter: ::PVOID
-) -> ::DWORD>;
-STRUCT!{struct SYSTEM_POWER_STATUS {
-    ACLineStatus: ::BYTE,
-    BatteryFlag: ::BYTE,
-    BatteryLifePercent: ::BYTE,
-    Reserved1: ::BYTE,
-    BatteryLifeTime: ::DWORD,
-    BatteryFullLifeTime: ::DWORD,
-}}
-pub type LPSYSTEM_POWER_STATUS = *mut SYSTEM_POWER_STATUS;
-pub const OFS_MAXPATHNAME: usize = 128;
-STRUCT!{nodebug struct OFSTRUCT {
-    cBytes: ::BYTE,
-    fFixedDisk: ::BYTE,
-    nErrCode: ::WORD,
-    Reserved1: ::WORD,
-    Reserved2: ::WORD,
-    szPathName: [::CHAR; OFS_MAXPATHNAME],
-}}
-pub type POFSTRUCT = *mut OFSTRUCT;
-pub type LPOFSTRUCT = *mut OFSTRUCT;
-ENUM!{enum FILE_ID_TYPE {
-    FileIdType,
-    ObjectIdType,
-    ExtendedFileIdType,
-    MaximumFileIdType,
-}}
-STRUCT!{struct FILE_ID_DESCRIPTOR {
-    dwSize: ::DWORD,
-    Type: FILE_ID_TYPE,
-    ObjectId: ::GUID,
-}}
-UNION!(FILE_ID_DESCRIPTOR, ObjectId, FileId, FileId_mut, ::LARGE_INTEGER);
-UNION!(FILE_ID_DESCRIPTOR, ObjectId, ExtendedFileId, ExtendedFileId_mut, ::FILE_ID_128);
-pub type LPFILE_ID_DESCRIPTOR = *mut FILE_ID_DESCRIPTOR;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wincon.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wincon.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wincon.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wincon.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module contains the public data structures, data types, and procedures exported by the NT
-//! console subsystem.
-STRUCT!{struct COORD {
-    X: ::SHORT,
-    Y: ::SHORT,
-}}
-pub type PCOORD = *mut COORD;
-STRUCT!{struct SMALL_RECT {
-    Left: ::SHORT,
-    Top: ::SHORT,
-    Right: ::SHORT,
-    Bottom: ::SHORT,
-}}
-pub type PSMALL_RECT = *mut SMALL_RECT;
-STRUCT!{struct KEY_EVENT_RECORD {
-    bKeyDown: ::BOOL,
-    wRepeatCount: ::WORD,
-    wVirtualKeyCode: ::WORD,
-    wVirtualScanCode: ::WORD,
-    UnicodeChar: ::WCHAR,
-    dwControlKeyState: ::DWORD,
-}}
-UNION!{KEY_EVENT_RECORD, UnicodeChar, AsciiChar, AsciiChar_mut, ::CHAR}
-pub type PKEY_EVENT_RECORD = *mut KEY_EVENT_RECORD;
-pub const RIGHT_ALT_PRESSED: ::DWORD = 0x0001;
-pub const LEFT_ALT_PRESSED: ::DWORD = 0x0002;
-pub const RIGHT_CTRL_PRESSED: ::DWORD = 0x0004;
-pub const LEFT_CTRL_PRESSED: ::DWORD = 0x0008;
-pub const SHIFT_PRESSED: ::DWORD = 0x0010;
-pub const NUMLOCK_ON: ::DWORD = 0x0020;
-pub const SCROLLLOCK_ON: ::DWORD = 0x0040;
-pub const CAPSLOCK_ON: ::DWORD = 0x0080;
-pub const ENHANCED_KEY: ::DWORD = 0x0100;
-pub const NLS_DBCSCHAR: ::DWORD = 0x00010000;
-pub const NLS_ALPHANUMERIC: ::DWORD = 0x00000000;
-pub const NLS_KATAKANA: ::DWORD = 0x00020000;
-pub const NLS_HIRAGANA: ::DWORD = 0x00040000;
-pub const NLS_ROMAN: ::DWORD = 0x00400000;
-pub const NLS_IME_CONVERSION: ::DWORD = 0x00800000;
-pub const NLS_IME_DISABLE: ::DWORD = 0x20000000;
-STRUCT!{struct MOUSE_EVENT_RECORD {
-    dwMousePosition: COORD,
-    dwButtonState: ::DWORD,
-    dwControlKeyState: ::DWORD,
-    dwEventFlags: ::DWORD,
-}}
-pub type PMOUSE_EVENT_RECORD = *mut MOUSE_EVENT_RECORD;
-pub const FROM_LEFT_1ST_BUTTON_PRESSED: ::DWORD = 0x0001;
-pub const RIGHTMOST_BUTTON_PRESSED: ::DWORD = 0x0002;
-pub const FROM_LEFT_2ND_BUTTON_PRESSED: ::DWORD = 0x0004;
-pub const FROM_LEFT_3RD_BUTTON_PRESSED: ::DWORD = 0x0008;
-pub const FROM_LEFT_4TH_BUTTON_PRESSED: ::DWORD = 0x0010;
-pub const MOUSE_MOVED: ::DWORD = 0x0001;
-pub const DOUBLE_CLICK: ::DWORD = 0x0002;
-pub const MOUSE_WHEELED: ::DWORD = 0x0004;
-pub const MOUSE_HWHEELED: ::DWORD = 0x0008;
-STRUCT!{struct WINDOW_BUFFER_SIZE_RECORD {
-    dwSize: COORD,
-}}
-pub type PWINDOW_BUFFER_SIZE_RECORD = *mut WINDOW_BUFFER_SIZE_RECORD;
-STRUCT!{struct MENU_EVENT_RECORD {
-    dwCommandId: ::UINT,
-}}
-pub type PMENU_EVENT_RECORD = *mut MENU_EVENT_RECORD;
-STRUCT!{struct FOCUS_EVENT_RECORD {
-    bSetFocus: ::BOOL,
-}}
-pub type PFOCUS_EVENT_RECORD = *mut FOCUS_EVENT_RECORD;
-STRUCT!{struct INPUT_RECORD {
-    EventType: ::WORD,
-    Event: [u32; 4],
-}}
-UNION!{INPUT_RECORD, Event, KeyEvent, KeyEvent_mut, KEY_EVENT_RECORD}
-UNION!{INPUT_RECORD, Event, MouseEvent, MouseEvent_mut, MOUSE_EVENT_RECORD}
-UNION!{INPUT_RECORD, Event, WindowBufferSizeEvent, WindowBufferSizeEvent_mut,
-    WINDOW_BUFFER_SIZE_RECORD}
-UNION!{INPUT_RECORD, Event, MenuEvent, MenuEvent_mut, MENU_EVENT_RECORD}
-UNION!{INPUT_RECORD, Event, FocusEvent, FocusEvent_mut, FOCUS_EVENT_RECORD}
-pub type PINPUT_RECORD = *mut INPUT_RECORD;
-pub const KEY_EVENT: ::WORD = 0x0001;
-pub const MOUSE_EVENT: ::WORD = 0x0002;
-pub const WINDOW_BUFFER_SIZE_EVENT: ::WORD = 0x0004;
-pub const MENU_EVENT: ::WORD = 0x0008;
-pub const FOCUS_EVENT: ::WORD = 0x0010;
-STRUCT!{struct CHAR_INFO {
-    UnicodeChar: ::WCHAR,
-    Attributes: ::WORD,
-}}
-UNION!{CHAR_INFO, UnicodeChar, AsciiChar, AsciiChar_mut, ::CHAR}
-pub type PCHAR_INFO = *mut CHAR_INFO;
-pub const FOREGROUND_BLUE: ::DWORD = 0x0001;
-pub const FOREGROUND_GREEN: ::DWORD = 0x0002;
-pub const FOREGROUND_RED: ::DWORD = 0x0004;
-pub const FOREGROUND_INTENSITY: ::DWORD = 0x0008;
-pub const BACKGROUND_BLUE: ::DWORD = 0x0010;
-pub const BACKGROUND_GREEN: ::DWORD = 0x0020;
-pub const BACKGROUND_RED: ::DWORD = 0x0040;
-pub const BACKGROUND_INTENSITY: ::DWORD = 0x0080;
-pub const COMMON_LVB_LEADING_BYTE: ::DWORD = 0x0100;
-pub const COMMON_LVB_TRAILING_BYTE: ::DWORD = 0x0200;
-pub const COMMON_LVB_GRID_HORIZONTAL: ::DWORD = 0x0400;
-pub const COMMON_LVB_GRID_LVERTICAL: ::DWORD = 0x0800;
-pub const COMMON_LVB_GRID_RVERTICAL: ::DWORD = 0x1000;
-pub const COMMON_LVB_REVERSE_VIDEO: ::DWORD = 0x4000;
-pub const COMMON_LVB_UNDERSCORE: ::DWORD = 0x8000;
-pub const COMMON_LVB_SBCSDBCS: ::DWORD = 0x0300;
-STRUCT!{struct CONSOLE_SCREEN_BUFFER_INFO {
-    dwSize: COORD,
-    dwCursorPosition: COORD,
-    wAttributes: ::WORD,
-    srWindow: SMALL_RECT,
-    dwMaximumWindowSize: COORD,
-}}
-pub type PCONSOLE_SCREEN_BUFFER_INFO = *mut CONSOLE_SCREEN_BUFFER_INFO;
-STRUCT!{struct CONSOLE_SCREEN_BUFFER_INFOEX {
-    cbSize: ::ULONG,
-    dwSize: COORD,
-    dwCursorPosition: COORD,
-    wAttributes: ::WORD,
-    srWindow: SMALL_RECT,
-    dwMaximumWindowSize: COORD,
-    wPopupAttributes: ::WORD,
-    bFullscreenSupported: ::BOOL,
-    ColorTable: [::COLORREF; 16],
-}}
-pub type PCONSOLE_SCREEN_BUFFER_INFOEX = *mut CONSOLE_SCREEN_BUFFER_INFOEX;
-STRUCT!{struct CONSOLE_CURSOR_INFO {
-    dwSize: ::DWORD,
-    bVisible: ::BOOL,
-}}
-pub type PCONSOLE_CURSOR_INFO = *mut CONSOLE_CURSOR_INFO;
-STRUCT!{struct CONSOLE_FONT_INFO {
-    nFont: ::DWORD,
-    dwFontSize: ::COORD,
-}}
-pub type PCONSOLE_FONT_INFO = *mut CONSOLE_FONT_INFO;
-STRUCT!{struct CONSOLE_FONT_INFOEX {
-    cbSize: ::ULONG,
-    nFont: ::DWORD,
-    dwFontSize: COORD,
-    FontFamily: ::UINT,
-    FontWeight: ::UINT,
-    FaceName: [::WCHAR; ::LF_FACESIZE],
-}}
-pub type PCONSOLE_FONT_INFOEX = *mut CONSOLE_FONT_INFOEX;
-pub const HISTORY_NO_DUP_FLAG: ::DWORD = 0x1;
-STRUCT!{struct CONSOLE_HISTORY_INFO {
-    cbSize: ::UINT,
-    HistoryBufferSize: ::UINT,
-    NumberOfHistoryBuffers: ::UINT,
-    dwFlags: ::DWORD,
-}}
-pub type PCONSOLE_HISTORY_INFO = *mut CONSOLE_HISTORY_INFO;
-STRUCT!{struct CONSOLE_SELECTION_INFO {
-    dwFlags: ::DWORD,
-    dwSelectionAnchor: COORD,
-    srSelection: SMALL_RECT,
-}}
-pub type PCONSOLE_SELECTION_INFO = *mut CONSOLE_SELECTION_INFO;
-pub const CONSOLE_NO_SELECTION: ::DWORD = 0x0000;
-pub const CONSOLE_SELECTION_IN_PROGRESS: ::DWORD = 0x0001;
-pub const CONSOLE_SELECTION_NOT_EMPTY: ::DWORD = 0x0002;
-pub const CONSOLE_MOUSE_SELECTION: ::DWORD = 0x0004;
-pub const CONSOLE_MOUSE_DOWN: ::DWORD = 0x0008;
-pub type PHANDLER_ROUTINE = Option<unsafe extern "system" fn(CtrlType: ::DWORD) -> ::BOOL>;
-pub const CTRL_C_EVENT: ::DWORD = 0;
-pub const CTRL_BREAK_EVENT: ::DWORD = 1;
-pub const CTRL_CLOSE_EVENT: ::DWORD = 2;
-pub const CTRL_LOGOFF_EVENT: ::DWORD = 5;
-pub const CTRL_SHUTDOWN_EVENT: ::DWORD = 6;
-pub const ENABLE_PROCESSED_INPUT: ::DWORD = 0x0001;
-pub const ENABLE_LINE_INPUT: ::DWORD = 0x0002;
-pub const ENABLE_ECHO_INPUT: ::DWORD = 0x0004;
-pub const ENABLE_WINDOW_INPUT: ::DWORD = 0x0008;
-pub const ENABLE_MOUSE_INPUT: ::DWORD = 0x0010;
-pub const ENABLE_INSERT_MODE: ::DWORD = 0x0020;
-pub const ENABLE_QUICK_EDIT_MODE: ::DWORD = 0x0040;
-pub const ENABLE_EXTENDED_FLAGS: ::DWORD = 0x0080;
-pub const ENABLE_AUTO_POSITION: ::DWORD = 0x0100;
-pub const ENABLE_PROCESSED_OUTPUT: ::DWORD = 0x0001;
-pub const ENABLE_WRAP_AT_EOL_OUTPUT: ::DWORD = 0x0002;
-pub const CONSOLE_REAL_OUTPUT_HANDLE: *mut ::c_void = -2isize as *mut ::c_void;
-pub const CONSOLE_REAL_INPUT_HANDLE: *mut ::c_void = -3isize as *mut ::c_void;
-pub const ATTACH_PARENT_PROCESS: ::DWORD = 0xFFFFFFFF;
-STRUCT!{struct CONSOLE_READCONSOLE_CONTROL {
-    nLength: ::ULONG,
-    nInitialChars: ::ULONG,
-    dwCtrlWakeupMask: ::ULONG,
-    dwControlKeyState: ::ULONG,
-}}
-pub type PCONSOLE_READCONSOLE_CONTROL = *mut CONSOLE_READCONSOLE_CONTROL;
-pub const CONSOLE_TEXTMODE_BUFFER: ::DWORD = 1;
-pub const CONSOLE_FULLSCREEN: ::DWORD = 1;
-pub const CONSOLE_FULLSCREEN_HARDWARE: ::DWORD = 2;
-pub const CONSOLE_FULLSCREEN_MODE: ::DWORD = 1;
-pub const CONSOLE_WINDOWED_MODE: ::DWORD = 2;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wincred.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wincred.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wincred.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wincred.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Authentication API Prototypes and Definitions
-pub const NERR_BASE: ::DWORD = 2100;
-pub const NERR_PasswordExpired: ::DWORD = NERR_BASE+142;
-pub const CRED_MAX_STRING_LENGTH: ::DWORD = 256;
-pub const CRED_MAX_USERNAME_LENGTH: ::DWORD = 256+1+256;
-pub const CRED_MAX_GENERIC_TARGET_NAME_LENGTH: ::DWORD = 32767;
-pub const CRED_MAX_DOMAIN_TARGET_NAME_LENGTH: ::DWORD = 256+1+80;
-pub const CRED_MAX_TARGETNAME_NAMESPACE_LENGTH: ::DWORD = 256;
-pub const CRED_MAX_TARGETNAME_ATTRIBUTE_LENGTH: ::DWORD = 256;
-pub const CRED_MAX_VALUE_SIZE: ::DWORD = 256;
-pub const CRED_MAX_ATTRIBUTES: ::DWORD = 64;
-pub const CRED_LOGON_TYPES_MASK: ::DWORD = 0xF000;
-pub const CRED_FLAGS_PASSWORD_FOR_CERT: ::DWORD = 0x0001;
-pub const CRED_FLAGS_PROMPT_NOW: ::DWORD = 0x0002;
-pub const CRED_FLAGS_USERNAME_TARGET: ::DWORD = 0x0004;
-pub const CRED_FLAGS_OWF_CRED_BLOB: ::DWORD = 0x0008;
-pub const CRED_FLAGS_REQUIRE_CONFIRMATION: ::DWORD = 0x0010;
-pub const CRED_FLAGS_WILDCARD_MATCH: ::DWORD = 0x0020;
-pub const CRED_FLAGS_VALID_FLAGS: ::DWORD = 0xF03F;
-pub const CRED_FLAGS_VALID_INPUT_FLAGS: ::DWORD = 0xF01F;
-pub const CRED_TYPE_GENERIC: ::DWORD = 1;
-pub const CRED_TYPE_DOMAIN_PASSWORD: ::DWORD = 2;
-pub const CRED_TYPE_DOMAIN_CERTIFICATE: ::DWORD = 3;
-pub const CRED_TYPE_DOMAIN_VISIBLE_PASSWORD: ::DWORD = 4;
-pub const CRED_TYPE_GENERIC_CERTIFICATE: ::DWORD = 5;
-pub const CRED_TYPE_DOMAIN_EXTENDED: ::DWORD = 6;
-pub const CRED_TYPE_MAXIMUM: ::DWORD = 7;
-pub const CRED_TYPE_MAXIMUM_EX: ::DWORD = CRED_TYPE_MAXIMUM+1000;
-pub const CRED_MAX_CREDENTIAL_BLOB_SIZE: ::DWORD = 5*512;
-pub const CRED_PERSIST_NONE: ::DWORD = 0;
-pub const CRED_PERSIST_SESSION: ::DWORD = 1;
-pub const CRED_PERSIST_LOCAL_MACHINE: ::DWORD = 2;
-pub const CRED_PERSIST_ENTERPRISE: ::DWORD = 3;
-STRUCT!{struct CREDENTIAL_ATTRIBUTEA {
-    Keyword: ::LPSTR,
-    Flags: ::DWORD,
-    ValueSize: ::DWORD,
-    Value: ::LPBYTE,
-}}
-pub type PCREDENTIAL_ATTRIBUTEA = *mut CREDENTIAL_ATTRIBUTEA;
-STRUCT!{struct CREDENTIAL_ATTRIBUTEW {
-    Keyword: ::LPWSTR,
-    Flags: ::DWORD,
-    ValueSize: ::DWORD,
-    Value: ::LPBYTE,
-}}
-pub type PCREDENTIAL_ATTRIBUTEW = *mut CREDENTIAL_ATTRIBUTEW;
-STRUCT!{struct CREDENTIALA {
-    Flags: ::DWORD,
-    Type: ::DWORD,
-    TargetName: ::LPSTR,
-    Comment: ::LPSTR,
-    LastWritten: ::FILETIME,
-    CredentialBlobSize: ::DWORD,
-    CredentialBlob: ::LPBYTE,
-    Persist: ::DWORD,
-    AttributeCount: ::DWORD,
-    Attributes: PCREDENTIAL_ATTRIBUTEA,
-    TargetAlias: ::LPSTR,
-    UserName: ::LPSTR,
-}}
-pub type PCREDENTIALA = *mut CREDENTIALA;
-STRUCT!{struct CREDENTIALW {
-    Flags: ::DWORD,
-    Type: ::DWORD,
-    TargetName: ::LPWSTR,
-    Comment: ::LPWSTR,
-    LastWritten: ::FILETIME,
-    CredentialBlobSize: ::DWORD,
-    CredentialBlob: ::LPBYTE,
-    Persist: ::DWORD,
-    AttributeCount: ::DWORD,
-    Attributes: PCREDENTIAL_ATTRIBUTEW,
-    TargetAlias: ::LPWSTR,
-    UserName: ::LPWSTR,
-}}
-pub type PCREDENTIALW = *mut CREDENTIALW;
-pub const CRED_TI_SERVER_FORMAT_UNKNOWN: ::ULONG = 0x0001;
-pub const CRED_TI_DOMAIN_FORMAT_UNKNOWN: ::ULONG = 0x0002;
-pub const CRED_TI_ONLY_PASSWORD_REQUIRED: ::ULONG = 0x0004;
-pub const CRED_TI_USERNAME_TARGET: ::ULONG = 0x0008;
-pub const CRED_TI_CREATE_EXPLICIT_CRED: ::ULONG = 0x0010;
-pub const CRED_TI_WORKGROUP_MEMBER: ::ULONG = 0x0020;
-pub const CRED_TI_VALID_FLAGS: ::ULONG = 0xF07F;
-STRUCT!{struct CREDENTIAL_TARGET_INFORMATIONA {
-    TargetName: ::LPSTR,
-    NetbiosServerName: ::LPSTR,
-    DnsServerName: ::LPSTR,
-    NetbiosDomainName: ::LPSTR,
-    DnsDomainName: ::LPSTR,
-    DnsTreeName: ::LPSTR,
-    PackageName: ::LPSTR,
-    Flags: ::ULONG,
-    CredTypeCount: ::DWORD,
-    CredTypes: ::LPDWORD,
-}}
-pub type PCREDENTIAL_TARGET_INFORMATIONA = *mut CREDENTIAL_TARGET_INFORMATIONA;
-STRUCT!{struct CREDENTIAL_TARGET_INFORMATIONW {
-    TargetName: ::LPWSTR,
-    NetbiosServerName: ::LPWSTR,
-    DnsServerName: ::LPWSTR,
-    NetbiosDomainName: ::LPWSTR,
-    DnsDomainName: ::LPWSTR,
-    DnsTreeName: ::LPWSTR,
-    PackageName: ::LPWSTR,
-    Flags: ::ULONG,
-    CredTypeCount: ::DWORD,
-    CredTypes: ::LPDWORD,
-}}
-pub type PCREDENTIAL_TARGET_INFORMATIONW = *mut CREDENTIAL_TARGET_INFORMATIONW;
-pub const CERT_HASH_LENGTH: usize = 20;
-STRUCT!{struct CERT_CREDENTIAL_INFO {
-    cbSize: ::ULONG,
-    rgbHashOfCert: [::UCHAR; CERT_HASH_LENGTH],
-}}
-pub type PCERT_CREDENTIAL_INFO = *mut CERT_CREDENTIAL_INFO;
-STRUCT!{struct USERNAME_TARGET_CREDENTIAL_INFO {
-    UserName: ::LPWSTR,
-}}
-pub type PUSERNAME_TARGET_CREDENTIAL_INFO = *mut USERNAME_TARGET_CREDENTIAL_INFO;
-STRUCT!{struct BINARY_BLOB_CREDENTIAL_INFO {
-    cbBlob: ::ULONG,
-    pbBlob: ::LPBYTE,
-}}
-pub type PBINARY_BLOB_CREDENTIAL_INFO = *mut BINARY_BLOB_CREDENTIAL_INFO;
-ENUM!{enum CRED_MARSHAL_TYPE {
-    CertCredential = 1,
-    UsernameTargetCredential,
-    BinaryBlobCredential,
-    UsernameForPackedCredentials,
-}}
-pub type PCRED_MARSHAL_TYPE = *mut CRED_MARSHAL_TYPE;
-ENUM!{enum CRED_PROTECTION_TYPE {
-    CredUnprotected,
-    CredUserProtection,
-    CredTrustedProtection,
-}}
-pub type PCRED_PROTECTION_TYPE = *mut CRED_PROTECTION_TYPE;
-pub const CRED_PACK_PROTECTED_CREDENTIALS: ::DWORD = 0x1;
-pub const CRED_PACK_WOW_BUFFER: ::DWORD = 0x2;
-pub const CRED_PACK_GENERIC_CREDENTIALS: ::DWORD = 0x4;
-pub const CRED_PACK_ID_PROVIDER_CREDENTIALS: ::DWORD = 0x8;
-STRUCT!{struct CREDUI_INFOA {
-    cbSize: ::DWORD,
-    hwndParent: ::HWND,
-    pszMessageText: ::PCSTR,
-    pszCaptionText: ::PCSTR,
-    hbmBanner: ::HBITMAP,
-}}
-pub type PCREDUI_INFOA = *mut CREDUI_INFOA;
-STRUCT!{struct CREDUI_INFOW {
-    cbSize: ::DWORD,
-    hwndParent: ::HWND,
-    pszMessageText: ::PCWSTR,
-    pszCaptionText: ::PCWSTR,
-    hbmBanner: ::HBITMAP,
-}}
-pub type PCREDUI_INFOW = *mut CREDUI_INFOW;
-pub const CREDUI_MAX_MESSAGE_LENGTH: ::DWORD = 1024;
-pub const CREDUI_MAX_CAPTION_LENGTH: ::DWORD = 128;
-pub const CREDUI_MAX_GENERIC_TARGET_LENGTH: ::DWORD = CRED_MAX_GENERIC_TARGET_NAME_LENGTH;
-pub const CREDUI_MAX_DOMAIN_TARGET_LENGTH: ::DWORD = CRED_MAX_DOMAIN_TARGET_NAME_LENGTH;
-pub const CREDUI_MAX_USERNAME_LENGTH: ::DWORD = CRED_MAX_USERNAME_LENGTH;
-pub const CREDUI_MAX_PASSWORD_LENGTH: ::DWORD = 512 / 2;
-pub const CREDUI_FLAGS_INCORRECT_PASSWORD: ::DWORD = 0x00001;
-pub const CREDUI_FLAGS_DO_NOT_PERSIST: ::DWORD = 0x00002;
-pub const CREDUI_FLAGS_REQUEST_ADMINISTRATOR: ::DWORD = 0x00004;
-pub const CREDUI_FLAGS_EXCLUDE_CERTIFICATES: ::DWORD = 0x00008;
-pub const CREDUI_FLAGS_REQUIRE_CERTIFICATE: ::DWORD = 0x00010;
-pub const CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX: ::DWORD = 0x00040;
-pub const CREDUI_FLAGS_ALWAYS_SHOW_UI: ::DWORD = 0x00080;
-pub const CREDUI_FLAGS_REQUIRE_SMARTCARD: ::DWORD = 0x00100;
-pub const CREDUI_FLAGS_PASSWORD_ONLY_OK: ::DWORD = 0x00200;
-pub const CREDUI_FLAGS_VALIDATE_USERNAME: ::DWORD = 0x00400;
-pub const CREDUI_FLAGS_COMPLETE_USERNAME: ::DWORD = 0x00800;
-pub const CREDUI_FLAGS_PERSIST: ::DWORD = 0x01000;
-pub const CREDUI_FLAGS_SERVER_CREDENTIAL: ::DWORD = 0x04000;
-pub const CREDUI_FLAGS_EXPECT_CONFIRMATION: ::DWORD = 0x20000;
-pub const CREDUI_FLAGS_GENERIC_CREDENTIALS: ::DWORD = 0x40000;
-pub const CREDUI_FLAGS_USERNAME_TARGET_CREDENTIALS: ::DWORD = 0x80000;
-pub const CREDUI_FLAGS_KEEP_USERNAME: ::DWORD = 0x100000;
-pub const CREDUI_FLAGS_PROMPT_VALID: ::DWORD = CREDUI_FLAGS_INCORRECT_PASSWORD
-    | CREDUI_FLAGS_DO_NOT_PERSIST | CREDUI_FLAGS_REQUEST_ADMINISTRATOR
-    | CREDUI_FLAGS_EXCLUDE_CERTIFICATES | CREDUI_FLAGS_REQUIRE_CERTIFICATE
-    | CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX | CREDUI_FLAGS_ALWAYS_SHOW_UI
-    | CREDUI_FLAGS_REQUIRE_SMARTCARD | CREDUI_FLAGS_PASSWORD_ONLY_OK
-    | CREDUI_FLAGS_VALIDATE_USERNAME | CREDUI_FLAGS_COMPLETE_USERNAME | CREDUI_FLAGS_PERSIST
-    | CREDUI_FLAGS_SERVER_CREDENTIAL | CREDUI_FLAGS_EXPECT_CONFIRMATION
-    | CREDUI_FLAGS_GENERIC_CREDENTIALS | CREDUI_FLAGS_USERNAME_TARGET_CREDENTIALS
-    | CREDUI_FLAGS_KEEP_USERNAME;
-pub const CREDUIWIN_GENERIC: ::DWORD = 0x00000001;
-pub const CREDUIWIN_CHECKBOX: ::DWORD = 0x00000002;
-pub const CREDUIWIN_AUTHPACKAGE_ONLY: ::DWORD = 0x00000010;
-pub const CREDUIWIN_IN_CRED_ONLY: ::DWORD = 0x00000020;
-pub const CREDUIWIN_ENUMERATE_ADMINS: ::DWORD = 0x00000100;
-pub const CREDUIWIN_ENUMERATE_CURRENT_USER: ::DWORD = 0x00000200;
-pub const CREDUIWIN_SECURE_PROMPT: ::DWORD = 0x00001000;
-pub const CREDUIWIN_PREPROMPTING: ::DWORD = 0x00002000;
-pub const CREDUIWIN_PACK_32_WOW: ::DWORD = 0x10000000;
-pub const CREDUIWIN_VALID_FLAGS: ::DWORD = CREDUIWIN_GENERIC | CREDUIWIN_CHECKBOX
-    | CREDUIWIN_AUTHPACKAGE_ONLY | CREDUIWIN_IN_CRED_ONLY | CREDUIWIN_ENUMERATE_ADMINS
-    | CREDUIWIN_ENUMERATE_CURRENT_USER | CREDUIWIN_SECURE_PROMPT | CREDUIWIN_PREPROMPTING
-    | CREDUIWIN_PACK_32_WOW;
-pub const CRED_PRESERVE_CREDENTIAL_BLOB: ::DWORD = 0x1;
-pub const CRED_ENUMERATE_ALL_CREDENTIALS: ::DWORD = 0x1;
-pub const CRED_CACHE_TARGET_INFORMATION: ::DWORD = 0x1;
-pub const CRED_ALLOW_NAME_RESOLUTION: ::DWORD = 0x1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wincrypt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wincrypt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wincrypt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wincrypt.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2206 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Cryptographic API Prototypes and Definitions
-//108
-pub const ALG_CLASS_ANY: ALG_ID = 0;
-pub const ALG_CLASS_SIGNATURE: ALG_ID = 1 << 13;
-pub const ALG_CLASS_MSG_ENCRYPT: ALG_ID = 2 << 13;
-pub const ALG_CLASS_DATA_ENCRYPT: ALG_ID = 3 << 13;
-pub const ALG_CLASS_HASH: ALG_ID = 4 << 13;
-pub const ALG_CLASS_KEY_EXCHANGE: ALG_ID = 5 << 13;
-pub const ALG_CLASS_ALL: ALG_ID = 7 << 13;
-pub const ALG_TYPE_ANY: ALG_ID = 0;
-pub const ALG_TYPE_DSS: ALG_ID = 1 << 9;
-pub const ALG_TYPE_RSA: ALG_ID = 2 << 9;
-pub const ALG_TYPE_BLOCK: ALG_ID = 3 << 9;
-pub const ALG_TYPE_STREAM: ALG_ID = 4 << 9;
-pub const ALG_TYPE_DH: ALG_ID = 5 << 9;
-pub const ALG_TYPE_SECURECHANNEL: ALG_ID = 6 << 9;
-pub const ALG_SID_ANY: ALG_ID = 0;
-pub const ALG_SID_RSA_ANY: ALG_ID = 0;
-pub const ALG_SID_RSA_PKCS: ALG_ID = 1;
-pub const ALG_SID_RSA_MSATWORK: ALG_ID = 2;
-pub const ALG_SID_RSA_ENTRUST: ALG_ID = 3;
-pub const ALG_SID_RSA_PGP: ALG_ID = 4;
-pub const ALG_SID_DSS_ANY: ALG_ID = 0;
-pub const ALG_SID_DSS_PKCS: ALG_ID = 1;
-pub const ALG_SID_DSS_DMS: ALG_ID = 2;
-pub const ALG_SID_ECDSA: ALG_ID = 3;
-pub const ALG_SID_DES: ALG_ID = 1;
-pub const ALG_SID_3DES: ALG_ID = 3;
-pub const ALG_SID_DESX: ALG_ID = 4;
-pub const ALG_SID_IDEA: ALG_ID = 5;
-pub const ALG_SID_CAST: ALG_ID = 6;
-pub const ALG_SID_SAFERSK64: ALG_ID = 7;
-pub const ALG_SID_SAFERSK128: ALG_ID = 8;
-pub const ALG_SID_3DES_112: ALG_ID = 9;
-pub const ALG_SID_CYLINK_MEK: ALG_ID = 12;
-pub const ALG_SID_RC5: ALG_ID = 13;
-pub const ALG_SID_AES_128: ALG_ID = 14;
-pub const ALG_SID_AES_192: ALG_ID = 15;
-pub const ALG_SID_AES_256: ALG_ID = 16;
-pub const ALG_SID_AES: ALG_ID = 17;
-pub const ALG_SID_SKIPJACK: ALG_ID = 10;
-pub const ALG_SID_TEK: ALG_ID = 11;
-pub const CRYPT_MODE_CBCI: ALG_ID = 6;
-pub const CRYPT_MODE_CFBP: ALG_ID = 7;
-pub const CRYPT_MODE_OFBP: ALG_ID = 8;
-pub const CRYPT_MODE_CBCOFM: ALG_ID = 9;
-pub const CRYPT_MODE_CBCOFMI: ALG_ID = 10;
-pub const ALG_SID_RC2: ALG_ID = 2;
-pub const ALG_SID_RC4: ALG_ID = 1;
-pub const ALG_SID_SEAL: ALG_ID = 2;
-pub const ALG_SID_DH_SANDF: ALG_ID = 1;
-pub const ALG_SID_DH_EPHEM: ALG_ID = 2;
-pub const ALG_SID_AGREED_KEY_ANY: ALG_ID = 3;
-pub const ALG_SID_KEA: ALG_ID = 4;
-pub const ALG_SID_ECDH: ALG_ID = 5;
-pub const ALG_SID_MD2: ALG_ID = 1;
-pub const ALG_SID_MD4: ALG_ID = 2;
-pub const ALG_SID_MD5: ALG_ID = 3;
-pub const ALG_SID_SHA: ALG_ID = 4;
-pub const ALG_SID_SHA1: ALG_ID = 4;
-pub const ALG_SID_MAC: ALG_ID = 5;
-pub const ALG_SID_RIPEMD: ALG_ID = 6;
-pub const ALG_SID_RIPEMD160: ALG_ID = 7;
-pub const ALG_SID_SSL3SHAMD5: ALG_ID = 8;
-pub const ALG_SID_HMAC: ALG_ID = 9;
-pub const ALG_SID_TLS1PRF: ALG_ID = 10;
-pub const ALG_SID_HASH_REPLACE_OWF: ALG_ID = 11;
-pub const ALG_SID_SHA_256: ALG_ID = 12;
-pub const ALG_SID_SHA_384: ALG_ID = 13;
-pub const ALG_SID_SHA_512: ALG_ID = 14;
-pub const ALG_SID_SSL3_MASTER: ALG_ID = 1;
-pub const ALG_SID_SCHANNEL_MASTER_HASH: ALG_ID = 2;
-pub const ALG_SID_SCHANNEL_MAC_KEY: ALG_ID = 3;
-pub const ALG_SID_PCT1_MASTER: ALG_ID = 4;
-pub const ALG_SID_SSL2_MASTER: ALG_ID = 5;
-pub const ALG_SID_TLS1_MASTER: ALG_ID = 6;
-pub const ALG_SID_SCHANNEL_ENC_KEY: ALG_ID = 7;
-pub const ALG_SID_ECMQV: ALG_ID = 1;
-pub const ALG_SID_EXAMPLE: ALG_ID = 80;
-pub type ALG_ID = ::c_uint;
-pub const CALG_MD2: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD2;
-pub const CALG_MD4: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD4;
-pub const CALG_MD5: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD5;
-pub const CALG_SHA: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA;
-pub const CALG_SHA1: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA1;
-pub const CALG_MAC: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MAC;
-pub const CALG_RSA_SIGN: ALG_ID = ALG_CLASS_SIGNATURE | ALG_TYPE_RSA | ALG_SID_RSA_ANY;
-pub const CALG_DSS_SIGN: ALG_ID = ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_DSS_ANY;
-pub const CALG_NO_SIGN: ALG_ID = ALG_CLASS_SIGNATURE | ALG_TYPE_ANY | ALG_SID_ANY;
-pub const CALG_RSA_KEYX: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY;
-pub const CALG_DES: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES;
-pub const CALG_3DES_112: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES_112;
-pub const CALG_3DES: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES;
-pub const CALG_DESX: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DESX;
-pub const CALG_RC2: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2;
-pub const CALG_RC4: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC4;
-pub const CALG_SEAL: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_SEAL;
-pub const CALG_DH_SF: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_SANDF;
-pub const CALG_DH_EPHEM: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EPHEM;
-pub const CALG_AGREEDKEY_ANY: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH
-    | ALG_SID_AGREED_KEY_ANY;
-pub const CALG_KEA_KEYX: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_KEA;
-pub const CALG_HUGHES_MD5: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_MD5;
-pub const CALG_SKIPJACK: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_SKIPJACK;
-pub const CALG_TEK: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_TEK;
-pub const CALG_CYLINK_MEK: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_CYLINK_MEK;
-pub const CALG_SSL3_SHAMD5: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SSL3SHAMD5;
-pub const CALG_SSL3_MASTER: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SSL3_MASTER;
-pub const CALG_SCHANNEL_MASTER_HASH: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SCHANNEL_MASTER_HASH;
-pub const CALG_SCHANNEL_MAC_KEY: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SCHANNEL_MAC_KEY;
-pub const CALG_SCHANNEL_ENC_KEY: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SCHANNEL_ENC_KEY;
-pub const CALG_PCT1_MASTER: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_PCT1_MASTER;
-pub const CALG_SSL2_MASTER: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SSL2_MASTER;
-pub const CALG_TLS1_MASTER: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_TLS1_MASTER;
-pub const CALG_RC5: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC5;
-pub const CALG_HMAC: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HMAC;
-pub const CALG_TLS1PRF: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_TLS1PRF;
-pub const CALG_HASH_REPLACE_OWF: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HASH_REPLACE_OWF;
-pub const CALG_AES_128: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_128;
-pub const CALG_AES_192: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_192;
-pub const CALG_AES_256: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_256;
-pub const CALG_AES: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES;
-pub const CALG_SHA_256: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_256;
-pub const CALG_SHA_384: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_384;
-pub const CALG_SHA_512: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512;
-pub const CALG_ECDH: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH;
-pub const CALG_ECMQV: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_ECMQV;
-pub const CALG_ECDSA: ALG_ID = ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_ECDSA;
-pub type HCRYPTPROV = ::ULONG_PTR;
-pub type HCRYPTKEY = ::ULONG_PTR;
-pub type HCRYPTHASH = ::ULONG_PTR;
-pub const CRYPT_VERIFYCONTEXT: ::DWORD = 0xF0000000;
-pub const CRYPT_NEWKEYSET: ::DWORD = 0x00000008;
-pub const CRYPT_DELETEKEYSET: ::DWORD = 0x00000010;
-pub const CRYPT_MACHINE_KEYSET: ::DWORD = 0x00000020;
-pub const CRYPT_SILENT: ::DWORD = 0x00000040;
-pub const CRYPT_DEFAULT_CONTAINER_OPTIONAL: ::DWORD = 0x00000080;
-pub const CRYPT_EXPORTABLE: ::DWORD = 0x00000001;
-pub const CRYPT_USER_PROTECTED: ::DWORD = 0x00000002;
-pub const CRYPT_CREATE_SALT: ::DWORD = 0x00000004;
-pub const CRYPT_UPDATE_KEY: ::DWORD = 0x00000008;
-pub const CRYPT_NO_SALT: ::DWORD = 0x00000010;
-pub const CRYPT_PREGEN: ::DWORD = 0x00000040;
-pub const CRYPT_RECIPIENT: ::DWORD = 0x00000010;
-pub const CRYPT_INITIATOR: ::DWORD = 0x00000040;
-pub const CRYPT_ONLINE: ::DWORD = 0x00000080;
-pub const CRYPT_SF: ::DWORD = 0x00000100;
-pub const CRYPT_CREATE_IV: ::DWORD = 0x00000200;
-pub const CRYPT_KEK: ::DWORD = 0x00000400;
-pub const CRYPT_DATA_KEY: ::DWORD = 0x00000800;
-pub const CRYPT_VOLATILE: ::DWORD = 0x00001000;
-pub const CRYPT_SGCKEY: ::DWORD = 0x00002000;
-pub const CRYPT_USER_PROTECTED_STRONG: ::DWORD = 0x00100000;
-pub const CRYPT_ARCHIVABLE: ::DWORD = 0x00004000;
-pub const CRYPT_FORCE_KEY_PROTECTION_HIGH: ::DWORD = 0x00008000;
-pub const RSA1024BIT_KEY: ::DWORD = 0x04000000;
-pub const CRYPT_SERVER: ::DWORD = 0x00000400;
-pub const KEY_LENGTH_MASK: ::DWORD = 0xFFFF0000;
-pub const CRYPT_Y_ONLY: ::DWORD = 0x00000001;
-pub const CRYPT_SSL2_FALLBACK: ::DWORD = 0x00000002;
-pub const CRYPT_DESTROYKEY: ::DWORD = 0x00000004;
-pub const CRYPT_OAEP: ::DWORD = 0x00000040;
-pub const CRYPT_BLOB_VER3: ::DWORD = 0x00000080;
-pub const CRYPT_IPSEC_HMAC_KEY: ::DWORD = 0x00000100;
-pub const CRYPT_DECRYPT_RSA_NO_PADDING_CHECK: ::DWORD = 0x00000020;
-pub const CRYPT_SECRETDIGEST: ::DWORD = 0x00000001;
-pub const CRYPT_OWF_REPL_LM_HASH: ::DWORD = 0x00000001;
-pub const CRYPT_LITTLE_ENDIAN: ::DWORD = 0x00000001;
-pub const CRYPT_NOHASHOID: ::DWORD = 0x00000001;
-pub const CRYPT_TYPE2_FORMAT: ::DWORD = 0x00000002;
-pub const CRYPT_X931_FORMAT: ::DWORD = 0x00000004;
-pub const CRYPT_MACHINE_DEFAULT: ::DWORD = 0x00000001;
-pub const CRYPT_USER_DEFAULT: ::DWORD = 0x00000002;
-pub const CRYPT_DELETE_DEFAULT: ::DWORD = 0x00000004;
-pub const SIMPLEBLOB: ::DWORD = 0x1;
-pub const PUBLICKEYBLOB: ::DWORD = 0x6;
-pub const PRIVATEKEYBLOB: ::DWORD = 0x7;
-pub const PLAINTEXTKEYBLOB: ::DWORD = 0x8;
-pub const OPAQUEKEYBLOB: ::DWORD = 0x9;
-pub const PUBLICKEYBLOBEX: ::DWORD = 0xA;
-pub const SYMMETRICWRAPKEYBLOB: ::DWORD = 0xB;
-pub const KEYSTATEBLOB: ::DWORD = 0xC;
-pub const AT_KEYEXCHANGE: ::DWORD = 1;
-pub const AT_SIGNATURE: ::DWORD = 2;
-pub const CRYPT_USERDATA: ::DWORD = 1;
-pub const KP_IV: ::DWORD = 1;
-pub const KP_SALT: ::DWORD = 2;
-pub const KP_PADDING: ::DWORD = 3;
-pub const KP_MODE: ::DWORD = 4;
-pub const KP_MODE_BITS: ::DWORD = 5;
-pub const KP_PERMISSIONS: ::DWORD = 6;
-pub const KP_ALGID: ::DWORD = 7;
-pub const KP_BLOCKLEN: ::DWORD = 8;
-pub const KP_KEYLEN: ::DWORD = 9;
-pub const KP_SALT_EX: ::DWORD = 10;
-pub const KP_P: ::DWORD = 11;
-pub const KP_G: ::DWORD = 12;
-pub const KP_Q: ::DWORD = 13;
-pub const KP_X: ::DWORD = 14;
-pub const KP_Y: ::DWORD = 15;
-pub const KP_RA: ::DWORD = 16;
-pub const KP_RB: ::DWORD = 17;
-pub const KP_INFO: ::DWORD = 18;
-pub const KP_EFFECTIVE_KEYLEN: ::DWORD = 19;
-pub const KP_SCHANNEL_ALG: ::DWORD = 20;
-pub const KP_CLIENT_RANDOM: ::DWORD = 21;
-pub const KP_SERVER_RANDOM: ::DWORD = 22;
-pub const KP_RP: ::DWORD = 23;
-pub const KP_PRECOMP_MD5: ::DWORD = 24;
-pub const KP_PRECOMP_SHA: ::DWORD = 25;
-pub const KP_CERTIFICATE: ::DWORD = 26;
-pub const KP_CLEAR_KEY: ::DWORD = 27;
-pub const KP_PUB_EX_LEN: ::DWORD = 28;
-pub const KP_PUB_EX_VAL: ::DWORD = 29;
-pub const KP_KEYVAL: ::DWORD = 30;
-pub const KP_ADMIN_PIN: ::DWORD = 31;
-pub const KP_KEYEXCHANGE_PIN: ::DWORD = 32;
-pub const KP_SIGNATURE_PIN: ::DWORD = 33;
-pub const KP_PREHASH: ::DWORD = 34;
-pub const KP_ROUNDS: ::DWORD = 35;
-pub const KP_OAEP_PARAMS: ::DWORD = 36;
-pub const KP_CMS_KEY_INFO: ::DWORD = 37;
-pub const KP_CMS_DH_KEY_INFO: ::DWORD = 38;
-pub const KP_PUB_PARAMS: ::DWORD = 39;
-pub const KP_VERIFY_PARAMS: ::DWORD = 40;
-pub const KP_HIGHEST_VERSION: ::DWORD = 41;
-pub const KP_GET_USE_COUNT: ::DWORD = 42;
-pub const KP_PIN_ID: ::DWORD = 43;
-pub const KP_PIN_INFO: ::DWORD = 44;
-pub const PKCS5_PADDING: ::DWORD = 1;
-pub const RANDOM_PADDING: ::DWORD = 2;
-pub const ZERO_PADDING: ::DWORD = 3;
-pub const CRYPT_MODE_CBC: ::DWORD = 1;
-pub const CRYPT_MODE_ECB: ::DWORD = 2;
-pub const CRYPT_MODE_OFB: ::DWORD = 3;
-pub const CRYPT_MODE_CFB: ::DWORD = 4;
-pub const CRYPT_MODE_CTS: ::DWORD = 5;
-pub const CRYPT_ENCRYPT: ::DWORD = 0x0001;
-pub const CRYPT_DECRYPT: ::DWORD = 0x0002;
-pub const CRYPT_EXPORT: ::DWORD = 0x0004;
-pub const CRYPT_READ: ::DWORD = 0x0008;
-pub const CRYPT_WRITE: ::DWORD = 0x0010;
-pub const CRYPT_MAC: ::DWORD = 0x0020;
-pub const CRYPT_EXPORT_KEY: ::DWORD = 0x0040;
-pub const CRYPT_IMPORT_KEY: ::DWORD = 0x0080;
-pub const CRYPT_ARCHIVE: ::DWORD = 0x0100;
-pub const HP_ALGID: ::DWORD = 0x0001;
-pub const HP_HASHVAL: ::DWORD = 0x0002;
-pub const HP_HASHSIZE: ::DWORD = 0x0004;
-pub const HP_HMAC_INFO: ::DWORD = 0x0005;
-pub const HP_TLS1PRF_LABEL: ::DWORD = 0x0006;
-pub const HP_TLS1PRF_SEED: ::DWORD = 0x0007;
-pub const CRYPT_FAILED: ::BOOL = ::FALSE;
-pub const CRYPT_SUCCEED: ::BOOL = ::TRUE;
-pub const PP_ENUMALGS: ::DWORD = 1;
-pub const PP_ENUMCONTAINERS: ::DWORD = 2;
-pub const PP_IMPTYPE: ::DWORD = 3;
-pub const PP_NAME: ::DWORD = 4;
-pub const PP_VERSION: ::DWORD = 5;
-pub const PP_CONTAINER: ::DWORD = 6;
-pub const PP_CHANGE_PASSWORD: ::DWORD = 7;
-pub const PP_KEYSET_SEC_DESCR: ::DWORD = 8;
-pub const PP_CERTCHAIN: ::DWORD = 9;
-pub const PP_KEY_TYPE_SUBTYPE: ::DWORD = 10;
-pub const PP_PROVTYPE: ::DWORD = 16;
-pub const PP_KEYSTORAGE: ::DWORD = 17;
-pub const PP_APPLI_CERT: ::DWORD = 18;
-pub const PP_SYM_KEYSIZE: ::DWORD = 19;
-pub const PP_SESSION_KEYSIZE: ::DWORD = 20;
-pub const PP_UI_PROMPT: ::DWORD = 21;
-pub const PP_ENUMALGS_EX: ::DWORD = 22;
-pub const PP_ENUMMANDROOTS: ::DWORD = 25;
-pub const PP_ENUMELECTROOTS: ::DWORD = 26;
-pub const PP_KEYSET_TYPE: ::DWORD = 27;
-pub const PP_ADMIN_PIN: ::DWORD = 31;
-pub const PP_KEYEXCHANGE_PIN: ::DWORD = 32;
-pub const PP_SIGNATURE_PIN: ::DWORD = 33;
-pub const PP_SIG_KEYSIZE_INC: ::DWORD = 34;
-pub const PP_KEYX_KEYSIZE_INC: ::DWORD = 35;
-pub const PP_UNIQUE_CONTAINER: ::DWORD = 36;
-pub const PP_SGC_INFO: ::DWORD = 37;
-pub const PP_USE_HARDWARE_RNG: ::DWORD = 38;
-pub const PP_KEYSPEC: ::DWORD = 39;
-pub const PP_ENUMEX_SIGNING_PROT: ::DWORD = 40;
-pub const PP_CRYPT_COUNT_KEY_USE: ::DWORD = 41;
-pub const PP_USER_CERTSTORE: ::DWORD = 42;
-pub const PP_SMARTCARD_READER: ::DWORD = 43;
-pub const PP_SMARTCARD_GUID: ::DWORD = 45;
-pub const PP_ROOT_CERTSTORE: ::DWORD = 46;
-pub const PP_SMARTCARD_READER_ICON: ::DWORD = 47;
-pub const CRYPT_FIRST: ::DWORD = 1;
-pub const CRYPT_NEXT: ::DWORD = 2;
-pub const CRYPT_SGC_ENUM: ::DWORD = 4;
-pub const CRYPT_IMPL_HARDWARE: ::DWORD = 1;
-pub const CRYPT_IMPL_SOFTWARE: ::DWORD = 2;
-pub const CRYPT_IMPL_MIXED: ::DWORD = 3;
-pub const CRYPT_IMPL_UNKNOWN: ::DWORD = 4;
-pub const CRYPT_IMPL_REMOVABLE: ::DWORD = 8;
-pub const CRYPT_SEC_DESCR: ::DWORD = 0x00000001;
-pub const CRYPT_PSTORE: ::DWORD = 0x00000002;
-pub const CRYPT_UI_PROMPT: ::DWORD = 0x00000004;
-pub const CRYPT_FLAG_PCT1: ::DWORD = 0x0001;
-pub const CRYPT_FLAG_SSL2: ::DWORD = 0x0002;
-pub const CRYPT_FLAG_SSL3: ::DWORD = 0x0004;
-pub const CRYPT_FLAG_TLS1: ::DWORD = 0x0008;
-pub const CRYPT_FLAG_IPSEC: ::DWORD = 0x0010;
-pub const CRYPT_FLAG_SIGNING: ::DWORD = 0x0020;
-pub const CRYPT_SGC: ::DWORD = 0x0001;
-pub const CRYPT_FASTSGC: ::DWORD = 0x0002;
-pub const PP_CLIENT_HWND: ::DWORD = 1;
-pub const PP_CONTEXT_INFO: ::DWORD = 11;
-pub const PP_KEYEXCHANGE_KEYSIZE: ::DWORD = 12;
-pub const PP_SIGNATURE_KEYSIZE: ::DWORD = 13;
-pub const PP_KEYEXCHANGE_ALG: ::DWORD = 14;
-pub const PP_SIGNATURE_ALG: ::DWORD = 15;
-pub const PP_DELETEKEY: ::DWORD = 24;
-pub const PP_PIN_PROMPT_STRING: ::DWORD = 44;
-pub const PP_SECURE_KEYEXCHANGE_PIN: ::DWORD = 47;
-pub const PP_SECURE_SIGNATURE_PIN: ::DWORD = 48;
-pub const PROV_RSA_FULL: ::DWORD = 1;
-pub const PROV_RSA_SIG: ::DWORD = 2;
-pub const PROV_DSS: ::DWORD = 3;
-pub const PROV_FORTEZZA: ::DWORD = 4;
-pub const PROV_MS_EXCHANGE: ::DWORD = 5;
-pub const PROV_SSL: ::DWORD = 6;
-pub const PROV_RSA_SCHANNEL: ::DWORD = 12;
-pub const PROV_DSS_DH: ::DWORD = 13;
-pub const PROV_EC_ECDSA_SIG: ::DWORD = 14;
-pub const PROV_EC_ECNRA_SIG: ::DWORD = 15;
-pub const PROV_EC_ECDSA_FULL: ::DWORD = 16;
-pub const PROV_EC_ECNRA_FULL: ::DWORD = 17;
-pub const PROV_DH_SCHANNEL: ::DWORD = 18;
-pub const PROV_SPYRUS_LYNKS: ::DWORD = 20;
-pub const PROV_RNG: ::DWORD = 21;
-pub const PROV_INTEL_SEC: ::DWORD = 22;
-pub const PROV_REPLACE_OWF: ::DWORD = 23;
-pub const PROV_RSA_AES: ::DWORD = 24;
-pub const MS_DEF_PROV: &'static str = "Microsoft Base Cryptographic Provider v1.0";
-pub const MS_ENHANCED_PROV: &'static str = "Microsoft Enhanced Cryptographic Provider v1.0";
-pub const MS_STRONG_PROV: &'static str = "Microsoft Strong Cryptographic Provider";
-pub const MS_DEF_RSA_SIG_PROV: &'static str = "Microsoft RSA Signature Cryptographic Provider";
-pub const MS_DEF_RSA_SCHANNEL_PROV: &'static str = "Microsoft RSA SChannel Cryptographic Provider";
-pub const MS_DEF_DSS_PROV: &'static str = "Microsoft Base DSS Cryptographic Provider";
-pub const MS_DEF_DSS_DH_PROV: &'static str =
-    "Microsoft Base DSS and Diffie-Hellman Cryptographic Provider";
-pub const MS_ENH_DSS_DH_PROV: &'static str =
-    "Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider";
-pub const MS_DEF_DH_SCHANNEL_PROV: &'static str = "Microsoft DH SChannel Cryptographic Provider";
-pub const MS_SCARD_PROV: &'static str = "Microsoft Base Smart Card Crypto Provider";
-pub const MS_ENH_RSA_AES_PROV: &'static str =
-    "Microsoft Enhanced RSA and AES Cryptographic Provider";
-pub const MS_ENH_RSA_AES_PROV_XP: &'static str =
-    "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)";
-pub const MAXUIDLEN: usize = 64;
-pub const EXPO_OFFLOAD_REG_VALUE: &'static str = "ExpoOffload";
-pub const EXPO_OFFLOAD_FUNC_NAME: &'static str = "OffloadModExpo";
-pub const szKEY_CRYPTOAPI_PRIVATE_KEY_OPTIONS: &'static str =
-    "Software\\Policies\\Microsoft\\Cryptography";
-pub const szKEY_CACHE_ENABLED: &'static str = "CachePrivateKeys";
-pub const szKEY_CACHE_SECONDS: &'static str = "PrivateKeyLifetimeSeconds";
-pub const szPRIV_KEY_CACHE_MAX_ITEMS: &'static str = "PrivKeyCacheMaxItems";
-pub const cPRIV_KEY_CACHE_MAX_ITEMS_DEFAULT: ::DWORD = 20;
-pub const szPRIV_KEY_CACHE_PURGE_INTERVAL_SECONDS: &'static str =
-    "PrivKeyCachePurgeIntervalSeconds";
-pub const cPRIV_KEY_CACHE_PURGE_INTERVAL_SECONDS_DEFAULT: ::DWORD = 86400;
-pub const CUR_BLOB_VERSION: ::DWORD = 2;
-STRUCT!{struct CMS_KEY_INFO {
-    dwVersion: ::DWORD,
-    Algid: ALG_ID,
-    pbOID: *mut ::BYTE,
-    cbOID: ::DWORD,
-}}
-pub type PCMS_KEY_INFO = *mut CMS_KEY_INFO;
-STRUCT!{struct HMAC_INFO {
-    HashAlgid: ALG_ID,
-    pbInnerString: *mut ::BYTE,
-    cbInnerString: ::DWORD,
-    pbOuterString: *mut ::BYTE,
-    cbOuterString: ::DWORD,
-}}
-pub type PHMAC_INFO = *mut HMAC_INFO;
-STRUCT!{struct SCHANNEL_ALG {
-    dwUse: ::DWORD,
-    Algid: ALG_ID,
-    cBits: ::DWORD,
-    dwFlags: ::DWORD,
-    dwReserved: ::DWORD,
-}}
-pub type PSCHANNEL_ALG = *mut SCHANNEL_ALG;
-pub const SCHANNEL_MAC_KEY: ::DWORD = 0x00000000;
-pub const SCHANNEL_ENC_KEY: ::DWORD = 0x00000001;
-pub const INTERNATIONAL_USAGE: ::DWORD = 0x00000001;
-STRUCT!{struct PROV_ENUMALGS {
-    aiAlgid: ALG_ID,
-    dwBitLen: ::DWORD,
-    dwNameLen: ::DWORD,
-    szName: [::CHAR; 20],
-}}
-STRUCT!{nodebug struct PROV_ENUMALGS_EX {
-    aiAlgid: ALG_ID,
-    dwDefaultLen: ::DWORD,
-    dwMinLen: ::DWORD,
-    dwMaxLen: ::DWORD,
-    dwProtocols: ::DWORD,
-    dwNameLen: ::DWORD,
-    szName: [::CHAR; 20],
-    dwLongNameLen: ::DWORD,
-    szLongName: [::CHAR; 40],
-}}
-STRUCT!{struct BLOBHEADER {
-    bType: ::BYTE,
-    bVersion: ::BYTE,
-    reserved: ::WORD,
-    aiKeyAlg: ::ALG_ID,
-}}
-pub type PUBLICKEYSTRUC = BLOBHEADER;
-STRUCT!{struct RSAPUBKEY {
-    magic: ::DWORD,
-    bitlen: ::DWORD,
-    pubexp: ::DWORD,
-}}
-STRUCT!{struct DHPUBKEY {
-    magic: ::DWORD,
-    bitlen: ::DWORD,
-}}
-pub type DSSPUBKEY = DHPUBKEY;
-pub type KEAPUBKEY = DHPUBKEY;
-pub type TEKPUBKEY = DHPUBKEY;
-STRUCT!{struct DSSSEED {
-    counter: ::DWORD,
-    seed: [::BYTE; 20],
-}}
-STRUCT!{struct DHPUBKEY_VER3 {
-    magic: ::DWORD,
-    bitlenP: ::DWORD,
-    bitlenQ: ::DWORD,
-    bitlenJ: ::DWORD,
-    DSSSeed: DSSSEED,
-}}
-pub type DSSPUBKEY_VER3 = DHPUBKEY_VER3;
-STRUCT!{struct DHPRIVKEY_VER3 {
-    magic: ::DWORD,
-    bitlenP: ::DWORD,
-    bitlenQ: ::DWORD,
-    bitlenJ: ::DWORD,
-    bitlenX: ::DWORD,
-    DSSSeed: DSSSEED,
-}}
-pub type DSSPRIVKEY_VER3 = DHPRIVKEY_VER3;
-STRUCT!{struct KEY_TYPE_SUBTYPE {
-    dwKeySpec: ::DWORD,
-    Type: ::GUID,
-    Subtype: ::GUID,
-}}
-pub type PKEY_TYPE_SUBTYPE = *mut KEY_TYPE_SUBTYPE;
-STRUCT!{nodebug struct CERT_FORTEZZA_DATA_PROP {
-    SerialNumber: [::c_uchar; 8],
-    CertIndex: ::c_int,
-    CertLabel: [::c_uchar; 36],
-}}
-STRUCT!{nodebug struct CRYPT_RC4_KEY_STATE {
-    Key: [::c_uchar; 16],
-    SBox: [::c_uchar; 256],
-    i: ::c_uchar,
-    j: ::c_uchar,
-}}
-pub type PCRYPT_RC4_KEY_STATE = *mut CRYPT_RC4_KEY_STATE;
-STRUCT!{struct CRYPT_DES_KEY_STATE {
-    Key: [::c_uchar; 8],
-    IV: [::c_uchar; 8],
-    Feedback: [::c_uchar; 8],
-}}
-pub type PCRYPT_DES_KEY_STATE = *mut CRYPT_DES_KEY_STATE;
-STRUCT!{struct CRYPT_3DES_KEY_STATE {
-    Key: [::c_uchar; 24],
-    IV: [::c_uchar; 8],
-    Feedback: [::c_uchar; 8],
-}}
-pub type PCRYPT_3DES_KEY_STATE = *mut CRYPT_3DES_KEY_STATE;
-STRUCT!{struct CRYPT_AES_128_KEY_STATE {
-    Key: [::c_uchar; 16],
-    IV: [::c_uchar; 16],
-    EncryptionState: [[::c_uchar; 16]; 11],
-    DecryptionState: [[::c_uchar; 16]; 11],
-    Feedback: [::c_uchar; 16],
-}}
-pub type PCRYPT_AES_128_KEY_STATE = *mut CRYPT_AES_128_KEY_STATE;
-STRUCT!{struct CRYPT_AES_256_KEY_STATE {
-    Key: [::c_uchar; 32],
-    IV: [::c_uchar; 16],
-    EncryptionState: [[::c_uchar; 16]; 15],
-    DecryptionState: [[::c_uchar; 16]; 15],
-    Feedback: [::c_uchar; 16],
-}}
-pub type PCRYPT_AES_256_KEY_STATE = *mut CRYPT_AES_256_KEY_STATE;
-STRUCT!{struct CRYPTOAPI_BLOB {
-    cbData: ::DWORD,
-    pbData: *mut ::BYTE,
-}}
-pub type CRYPT_INTEGER_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_INTEGER_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_UINT_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_UINT_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_OBJID_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_OBJID_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CERT_NAME_BLOB = CRYPTOAPI_BLOB;
-pub type PCERT_NAME_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CERT_RDN_VALUE_BLOB = CRYPTOAPI_BLOB;
-pub type PCERT_RDN_VALUE_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CERT_BLOB = CRYPTOAPI_BLOB;
-pub type PCERT_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRL_BLOB = CRYPTOAPI_BLOB;
-pub type PCRL_BLOB = *mut CRYPTOAPI_BLOB;
-pub type DATA_BLOB = CRYPTOAPI_BLOB;
-pub type PDATA_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_DATA_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_DATA_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_HASH_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_HASH_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_DIGEST_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_DIGEST_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_DER_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_DER_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_ATTR_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_ATTR_BLOB = *mut CRYPTOAPI_BLOB;
-STRUCT!{struct CMS_DH_KEY_INFO {
-    dwVersion: ::DWORD,
-    Algid: ALG_ID,
-    pszContentEncObjId: ::LPSTR,
-    PubInfo: CRYPT_DATA_BLOB,
-    pReserved: *mut ::c_void,
-}}
-pub type PCMS_DH_KEY_INFO = *mut CMS_DH_KEY_INFO;
-pub type HCRYPTPROV_OR_NCRYPT_KEY_HANDLE = ::ULONG_PTR;
-pub type HCRYPTPROV_LEGACY = ::ULONG_PTR;
-STRUCT!{struct CRYPT_BIT_BLOB {
-    cbData: ::DWORD,
-    pbData: *mut ::BYTE,
-    cUnusedBits: ::DWORD,
-}}
-pub type PCRYPT_BIT_BLOB = *mut CRYPT_BIT_BLOB;
-STRUCT!{struct CRYPT_ALGORITHM_IDENTIFIER {
-    pszObjId: ::LPSTR,
-    Parameters: CRYPT_OBJID_BLOB,
-}}
-pub type PCRYPT_ALGORITHM_IDENTIFIER = *mut CRYPT_ALGORITHM_IDENTIFIER;
-pub const szOID_RSA: &'static str = "1.2.840.113549";
-pub const szOID_PKCS: &'static str = "1.2.840.113549.1";
-pub const szOID_RSA_HASH: &'static str = "1.2.840.113549.2";
-pub const szOID_RSA_ENCRYPT: &'static str = "1.2.840.113549.3";
-pub const szOID_PKCS_1: &'static str = "1.2.840.113549.1.1";
-pub const szOID_PKCS_2: &'static str = "1.2.840.113549.1.2";
-pub const szOID_PKCS_3: &'static str = "1.2.840.113549.1.3";
-pub const szOID_PKCS_4: &'static str = "1.2.840.113549.1.4";
-pub const szOID_PKCS_5: &'static str = "1.2.840.113549.1.5";
-pub const szOID_PKCS_6: &'static str = "1.2.840.113549.1.6";
-pub const szOID_PKCS_7: &'static str = "1.2.840.113549.1.7";
-pub const szOID_PKCS_8: &'static str = "1.2.840.113549.1.8";
-pub const szOID_PKCS_9: &'static str = "1.2.840.113549.1.9";
-pub const szOID_PKCS_10: &'static str = "1.2.840.113549.1.10";
-pub const szOID_PKCS_12: &'static str = "1.2.840.113549.1.12";
-pub const szOID_RSA_RSA: &'static str = "1.2.840.113549.1.1.1";
-pub const szOID_RSA_MD2RSA: &'static str = "1.2.840.113549.1.1.2";
-pub const szOID_RSA_MD4RSA: &'static str = "1.2.840.113549.1.1.3";
-pub const szOID_RSA_MD5RSA: &'static str = "1.2.840.113549.1.1.4";
-pub const szOID_RSA_SHA1RSA: &'static str = "1.2.840.113549.1.1.5";
-pub const szOID_RSA_SETOAEP_RSA: &'static str = "1.2.840.113549.1.1.6";
-pub const szOID_RSAES_OAEP: &'static str = "1.2.840.113549.1.1.7";
-pub const szOID_RSA_MGF1: &'static str = "1.2.840.113549.1.1.8";
-pub const szOID_RSA_PSPECIFIED: &'static str = "1.2.840.113549.1.1.9";
-pub const szOID_RSA_SSA_PSS: &'static str = "1.2.840.113549.1.1.10";
-pub const szOID_RSA_SHA256RSA: &'static str = "1.2.840.113549.1.1.11";
-pub const szOID_RSA_SHA384RSA: &'static str = "1.2.840.113549.1.1.12";
-pub const szOID_RSA_SHA512RSA: &'static str = "1.2.840.113549.1.1.13";
-pub const szOID_RSA_DH: &'static str = "1.2.840.113549.1.3.1";
-pub const szOID_RSA_data: &'static str = "1.2.840.113549.1.7.1";
-pub const szOID_RSA_signedData: &'static str = "1.2.840.113549.1.7.2";
-pub const szOID_RSA_envelopedData: &'static str = "1.2.840.113549.1.7.3";
-pub const szOID_RSA_signEnvData: &'static str = "1.2.840.113549.1.7.4";
-pub const szOID_RSA_digestedData: &'static str = "1.2.840.113549.1.7.5";
-pub const szOID_RSA_hashedData: &'static str = "1.2.840.113549.1.7.5";
-pub const szOID_RSA_encryptedData: &'static str = "1.2.840.113549.1.7.6";
-pub const szOID_RSA_emailAddr: &'static str = "1.2.840.113549.1.9.1";
-pub const szOID_RSA_unstructName: &'static str = "1.2.840.113549.1.9.2";
-pub const szOID_RSA_contentType: &'static str = "1.2.840.113549.1.9.3";
-pub const szOID_RSA_messageDigest: &'static str = "1.2.840.113549.1.9.4";
-pub const szOID_RSA_signingTime: &'static str = "1.2.840.113549.1.9.5";
-pub const szOID_RSA_counterSign: &'static str = "1.2.840.113549.1.9.6";
-pub const szOID_RSA_challengePwd: &'static str = "1.2.840.113549.1.9.7";
-pub const szOID_RSA_unstructAddr: &'static str = "1.2.840.113549.1.9.8";
-pub const szOID_RSA_extCertAttrs: &'static str = "1.2.840.113549.1.9.9";
-pub const szOID_RSA_certExtensions: &'static str = "1.2.840.113549.1.9.14";
-pub const szOID_RSA_SMIMECapabilities: &'static str = "1.2.840.113549.1.9.15";
-pub const szOID_RSA_preferSignedData: &'static str = "1.2.840.113549.1.9.15.1";
-pub const szOID_TIMESTAMP_TOKEN: &'static str = "1.2.840.113549.1.9.16.1.4";
-pub const szOID_RFC3161_counterSign: &'static str = "1.3.6.1.4.1.311.3.3.1";
-pub const szOID_RSA_SMIMEalg: &'static str = "1.2.840.113549.1.9.16.3";
-pub const szOID_RSA_SMIMEalgESDH: &'static str = "1.2.840.113549.1.9.16.3.5";
-pub const szOID_RSA_SMIMEalgCMS3DESwrap: &'static str = "1.2.840.113549.1.9.16.3.6";
-pub const szOID_RSA_SMIMEalgCMSRC2wrap: &'static str = "1.2.840.113549.1.9.16.3.7";
-pub const szOID_RSA_MD2: &'static str = "1.2.840.113549.2.2";
-pub const szOID_RSA_MD4: &'static str = "1.2.840.113549.2.4";
-pub const szOID_RSA_MD5: &'static str = "1.2.840.113549.2.5";
-pub const szOID_RSA_RC2CBC: &'static str = "1.2.840.113549.3.2";
-pub const szOID_RSA_RC4: &'static str = "1.2.840.113549.3.4";
-pub const szOID_RSA_DES_EDE3_CBC: &'static str = "1.2.840.113549.3.7";
-pub const szOID_RSA_RC5_CBCPad: &'static str = "1.2.840.113549.3.9";
-pub const szOID_ANSI_X942: &'static str = "1.2.840.10046";
-pub const szOID_ANSI_X942_DH: &'static str = "1.2.840.10046.2.1";
-pub const szOID_X957: &'static str = "1.2.840.10040";
-pub const szOID_X957_DSA: &'static str = "1.2.840.10040.4.1";
-pub const szOID_X957_SHA1DSA: &'static str = "1.2.840.10040.4.3";
-pub const szOID_ECC_PUBLIC_KEY: &'static str = "1.2.840.10045.2.1";
-pub const szOID_ECC_CURVE_P256: &'static str = "1.2.840.10045.3.1.7";
-pub const szOID_ECC_CURVE_P384: &'static str = "1.3.132.0.34";
-pub const szOID_ECC_CURVE_P521: &'static str = "1.3.132.0.35";
-pub const szOID_ECDSA_SHA1: &'static str = "1.2.840.10045.4.1";
-pub const szOID_ECDSA_SPECIFIED: &'static str = "1.2.840.10045.4.3";
-pub const szOID_ECDSA_SHA256: &'static str = "1.2.840.10045.4.3.2";
-pub const szOID_ECDSA_SHA384: &'static str = "1.2.840.10045.4.3.3";
-pub const szOID_ECDSA_SHA512: &'static str = "1.2.840.10045.4.3.4";
-pub const szOID_NIST_AES128_CBC: &'static str = "2.16.840.1.101.3.4.1.2";
-pub const szOID_NIST_AES192_CBC: &'static str = "2.16.840.1.101.3.4.1.22";
-pub const szOID_NIST_AES256_CBC: &'static str = "2.16.840.1.101.3.4.1.42";
-pub const szOID_NIST_AES128_WRAP: &'static str = "2.16.840.1.101.3.4.1.5";
-pub const szOID_NIST_AES192_WRAP: &'static str = "2.16.840.1.101.3.4.1.25";
-pub const szOID_NIST_AES256_WRAP: &'static str = "2.16.840.1.101.3.4.1.45";
-pub const szOID_DH_SINGLE_PASS_STDDH_SHA1_KDF: &'static str = "1.3.133.16.840.63.0.2";
-pub const szOID_DH_SINGLE_PASS_STDDH_SHA256_KDF: &'static str = "1.3.132.1.11.1";
-pub const szOID_DH_SINGLE_PASS_STDDH_SHA384_KDF: &'static str = "1.3.132.1.11.2";
-pub const szOID_DS: &'static str = "2.5";
-pub const szOID_DSALG: &'static str = "2.5.8";
-pub const szOID_DSALG_CRPT: &'static str = "2.5.8.1";
-pub const szOID_DSALG_HASH: &'static str = "2.5.8.2";
-pub const szOID_DSALG_SIGN: &'static str = "2.5.8.3";
-pub const szOID_DSALG_RSA: &'static str = "2.5.8.1.1";
-pub const szOID_OIW: &'static str = "1.3.14";
-pub const szOID_OIWSEC: &'static str = "1.3.14.3.2";
-pub const szOID_OIWSEC_md4RSA: &'static str = "1.3.14.3.2.2";
-pub const szOID_OIWSEC_md5RSA: &'static str = "1.3.14.3.2.3";
-pub const szOID_OIWSEC_md4RSA2: &'static str = "1.3.14.3.2.4";
-pub const szOID_OIWSEC_desECB: &'static str = "1.3.14.3.2.6";
-pub const szOID_OIWSEC_desCBC: &'static str = "1.3.14.3.2.7";
-pub const szOID_OIWSEC_desOFB: &'static str = "1.3.14.3.2.8";
-pub const szOID_OIWSEC_desCFB: &'static str = "1.3.14.3.2.9";
-pub const szOID_OIWSEC_desMAC: &'static str = "1.3.14.3.2.10";
-pub const szOID_OIWSEC_rsaSign: &'static str = "1.3.14.3.2.11";
-pub const szOID_OIWSEC_dsa: &'static str = "1.3.14.3.2.12";
-pub const szOID_OIWSEC_shaDSA: &'static str = "1.3.14.3.2.13";
-pub const szOID_OIWSEC_mdc2RSA: &'static str = "1.3.14.3.2.14";
-pub const szOID_OIWSEC_shaRSA: &'static str = "1.3.14.3.2.15";
-pub const szOID_OIWSEC_dhCommMod: &'static str = "1.3.14.3.2.16";
-pub const szOID_OIWSEC_desEDE: &'static str = "1.3.14.3.2.17";
-pub const szOID_OIWSEC_sha: &'static str = "1.3.14.3.2.18";
-pub const szOID_OIWSEC_mdc2: &'static str = "1.3.14.3.2.19";
-pub const szOID_OIWSEC_dsaComm: &'static str = "1.3.14.3.2.20";
-pub const szOID_OIWSEC_dsaCommSHA: &'static str = "1.3.14.3.2.21";
-pub const szOID_OIWSEC_rsaXchg: &'static str = "1.3.14.3.2.22";
-pub const szOID_OIWSEC_keyHashSeal: &'static str = "1.3.14.3.2.23";
-pub const szOID_OIWSEC_md2RSASign: &'static str = "1.3.14.3.2.24";
-pub const szOID_OIWSEC_md5RSASign: &'static str = "1.3.14.3.2.25";
-pub const szOID_OIWSEC_sha1: &'static str = "1.3.14.3.2.26";
-pub const szOID_OIWSEC_dsaSHA1: &'static str = "1.3.14.3.2.27";
-pub const szOID_OIWSEC_dsaCommSHA1: &'static str = "1.3.14.3.2.28";
-pub const szOID_OIWSEC_sha1RSASign: &'static str = "1.3.14.3.2.29";
-pub const szOID_OIWDIR: &'static str = "1.3.14.7.2";
-pub const szOID_OIWDIR_CRPT: &'static str = "1.3.14.7.2.1";
-pub const szOID_OIWDIR_HASH: &'static str = "1.3.14.7.2.2";
-pub const szOID_OIWDIR_SIGN: &'static str = "1.3.14.7.2.3";
-pub const szOID_OIWDIR_md2: &'static str = "1.3.14.7.2.2.1";
-pub const szOID_OIWDIR_md2RSA: &'static str = "1.3.14.7.2.3.1";
-pub const szOID_INFOSEC: &'static str = "2.16.840.1.101.2.1";
-pub const szOID_INFOSEC_sdnsSignature: &'static str = "2.16.840.1.101.2.1.1.1";
-pub const szOID_INFOSEC_mosaicSignature: &'static str = "2.16.840.1.101.2.1.1.2";
-pub const szOID_INFOSEC_sdnsConfidentiality: &'static str = "2.16.840.1.101.2.1.1.3";
-pub const szOID_INFOSEC_mosaicConfidentiality: &'static str = "2.16.840.1.101.2.1.1.4";
-pub const szOID_INFOSEC_sdnsIntegrity: &'static str = "2.16.840.1.101.2.1.1.5";
-pub const szOID_INFOSEC_mosaicIntegrity: &'static str = "2.16.840.1.101.2.1.1.6";
-pub const szOID_INFOSEC_sdnsTokenProtection: &'static str = "2.16.840.1.101.2.1.1.7";
-pub const szOID_INFOSEC_mosaicTokenProtection: &'static str = "2.16.840.1.101.2.1.1.8";
-pub const szOID_INFOSEC_sdnsKeyManagement: &'static str = "2.16.840.1.101.2.1.1.9";
-pub const szOID_INFOSEC_mosaicKeyManagement: &'static str = "2.16.840.1.101.2.1.1.10";
-pub const szOID_INFOSEC_sdnsKMandSig: &'static str = "2.16.840.1.101.2.1.1.11";
-pub const szOID_INFOSEC_mosaicKMandSig: &'static str = "2.16.840.1.101.2.1.1.12";
-pub const szOID_INFOSEC_SuiteASignature: &'static str = "2.16.840.1.101.2.1.1.13";
-pub const szOID_INFOSEC_SuiteAConfidentiality: &'static str = "2.16.840.1.101.2.1.1.14";
-pub const szOID_INFOSEC_SuiteAIntegrity: &'static str = "2.16.840.1.101.2.1.1.15";
-pub const szOID_INFOSEC_SuiteATokenProtection: &'static str = "2.16.840.1.101.2.1.1.16";
-pub const szOID_INFOSEC_SuiteAKeyManagement: &'static str = "2.16.840.1.101.2.1.1.17";
-pub const szOID_INFOSEC_SuiteAKMandSig: &'static str = "2.16.840.1.101.2.1.1.18";
-pub const szOID_INFOSEC_mosaicUpdatedSig: &'static str = "2.16.840.1.101.2.1.1.19";
-pub const szOID_INFOSEC_mosaicKMandUpdSig: &'static str = "2.16.840.1.101.2.1.1.20";
-pub const szOID_INFOSEC_mosaicUpdatedInteg: &'static str = "2.16.840.1.101.2.1.1.21";
-pub const szOID_NIST_sha256: &'static str = "2.16.840.1.101.3.4.2.1";
-pub const szOID_NIST_sha384: &'static str = "2.16.840.1.101.3.4.2.2";
-pub const szOID_NIST_sha512: &'static str = "2.16.840.1.101.3.4.2.3";
-STRUCT!{struct CRYPT_OBJID_TABLE {
-    dwAlgId: ::DWORD,
-    pszObjId: ::LPCSTR,
-}}
-pub type PCRYPT_OBJID_TABLE = *mut CRYPT_OBJID_TABLE;
-STRUCT!{struct CRYPT_HASH_INFO {
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    Hash: CRYPT_HASH_BLOB,
-}}
-pub type PCRYPT_HASH_INFO = *mut CRYPT_HASH_INFO;
-STRUCT!{struct CERT_EXTENSION {
-    pszObjId: ::LPSTR,
-    fCritical: ::BOOL,
-    Value: CRYPT_OBJID_BLOB,
-}}
-pub type PCERT_EXTENSION = *mut CERT_EXTENSION;
-pub type PCCERT_EXTENSION = *const CERT_EXTENSION;
-STRUCT!{struct CRYPT_ATTRIBUTE_TYPE_VALUE {
-    pszObjId: ::LPSTR,
-    Value: CRYPT_OBJID_BLOB,
-}}
-pub type PCRYPT_ATTRIBUTE_TYPE_VALUE = *mut CRYPT_ATTRIBUTE_TYPE_VALUE;
-STRUCT!{struct CRYPT_ATTRIBUTE {
-    pszObjId: ::LPSTR,
-    cValue: ::DWORD,
-    rgValue: PCRYPT_ATTR_BLOB,
-}}
-pub type PCRYPT_ATTRIBUTE = *mut CRYPT_ATTRIBUTE;
-STRUCT!{struct CRYPT_ATTRIBUTES {
-    cAttr: ::DWORD,
-    rgAttr: PCRYPT_ATTRIBUTE,
-}}
-pub type PCRYPT_ATTRIBUTES = *mut CRYPT_ATTRIBUTES;
-STRUCT!{struct CERT_RDN_ATTR {
-    pszObjId: ::LPSTR,
-    dwValueType: ::DWORD,
-    Value: CERT_RDN_VALUE_BLOB,
-}}
-pub type PCERT_RDN_ATTR = *mut CERT_RDN_ATTR;
-pub const szOID_COMMON_NAME: &'static str = "2.5.4.3";
-pub const szOID_SUR_NAME: &'static str = "2.5.4.4";
-pub const szOID_DEVICE_SERIAL_NUMBER: &'static str = "2.5.4.5";
-pub const szOID_COUNTRY_NAME: &'static str = "2.5.4.6";
-pub const szOID_LOCALITY_NAME: &'static str = "2.5.4.7";
-pub const szOID_STATE_OR_PROVINCE_NAME: &'static str = "2.5.4.8";
-pub const szOID_STREET_ADDRESS: &'static str = "2.5.4.9";
-pub const szOID_ORGANIZATION_NAME: &'static str = "2.5.4.10";
-pub const szOID_ORGANIZATIONAL_UNIT_NAME: &'static str = "2.5.4.11";
-pub const szOID_TITLE: &'static str = "2.5.4.12";
-pub const szOID_DESCRIPTION: &'static str = "2.5.4.13";
-pub const szOID_SEARCH_GUIDE: &'static str = "2.5.4.14";
-pub const szOID_BUSINESS_CATEGORY: &'static str = "2.5.4.15";
-pub const szOID_POSTAL_ADDRESS: &'static str = "2.5.4.16";
-pub const szOID_POSTAL_CODE: &'static str = "2.5.4.17";
-pub const szOID_POST_OFFICE_BOX: &'static str = "2.5.4.18";
-pub const szOID_PHYSICAL_DELIVERY_OFFICE_NAME: &'static str = "2.5.4.19";
-pub const szOID_TELEPHONE_NUMBER: &'static str = "2.5.4.20";
-pub const szOID_TELEX_NUMBER: &'static str = "2.5.4.21";
-pub const szOID_TELETEXT_TERMINAL_IDENTIFIER: &'static str = "2.5.4.22";
-pub const szOID_FACSIMILE_TELEPHONE_NUMBER: &'static str = "2.5.4.23";
-pub const szOID_X21_ADDRESS: &'static str = "2.5.4.24";
-pub const szOID_INTERNATIONAL_ISDN_NUMBER: &'static str = "2.5.4.25";
-pub const szOID_REGISTERED_ADDRESS: &'static str = "2.5.4.26";
-pub const szOID_DESTINATION_INDICATOR: &'static str = "2.5.4.27";
-pub const szOID_PREFERRED_DELIVERY_METHOD: &'static str = "2.5.4.28";
-pub const szOID_PRESENTATION_ADDRESS: &'static str = "2.5.4.29";
-pub const szOID_SUPPORTED_APPLICATION_CONTEXT: &'static str = "2.5.4.30";
-pub const szOID_MEMBER: &'static str = "2.5.4.31";
-pub const szOID_OWNER: &'static str = "2.5.4.32";
-pub const szOID_ROLE_OCCUPANT: &'static str = "2.5.4.33";
-pub const szOID_SEE_ALSO: &'static str = "2.5.4.34";
-pub const szOID_USER_PASSWORD: &'static str = "2.5.4.35";
-pub const szOID_USER_CERTIFICATE: &'static str = "2.5.4.36";
-pub const szOID_CA_CERTIFICATE: &'static str = "2.5.4.37";
-pub const szOID_AUTHORITY_REVOCATION_LIST: &'static str = "2.5.4.38";
-pub const szOID_CERTIFICATE_REVOCATION_LIST: &'static str = "2.5.4.39";
-pub const szOID_CROSS_CERTIFICATE_PAIR: &'static str = "2.5.4.40";
-pub const szOID_GIVEN_NAME: &'static str = "2.5.4.42";
-pub const szOID_INITIALS: &'static str = "2.5.4.43";
-pub const szOID_DN_QUALIFIER: &'static str = "2.5.4.46";
-pub const szOID_DOMAIN_COMPONENT: &'static str = "0.9.2342.19200300.100.1.25";
-pub const szOID_PKCS_12_FRIENDLY_NAME_ATTR: &'static str = "1.2.840.113549.1.9.20";
-pub const szOID_PKCS_12_LOCAL_KEY_ID: &'static str = "1.2.840.113549.1.9.21";
-pub const szOID_PKCS_12_KEY_PROVIDER_NAME_ATTR: &'static str = "1.3.6.1.4.1.311.17.1";
-pub const szOID_LOCAL_MACHINE_KEYSET: &'static str = "1.3.6.1.4.1.311.17.2";
-pub const szOID_PKCS_12_EXTENDED_ATTRIBUTES: &'static str = "1.3.6.1.4.1.311.17.3";
-pub const szOID_PKCS_12_PROTECTED_PASSWORD_SECRET_BAG_TYPE_ID: &'static str =
-    "1.3.6.1.4.1.311.17.4";
-pub const szOID_KEYID_RDN: &'static str = "1.3.6.1.4.1.311.10.7.1";
-pub const szOID_EV_RDN_LOCALE: &'static str = "1.3.6.1.4.1.311.60.2.1.1";
-pub const szOID_EV_RDN_STATE_OR_PROVINCE: &'static str = "1.3.6.1.4.1.311.60.2.1.2";
-pub const szOID_EV_RDN_COUNTRY: &'static str = "1.3.6.1.4.1.311.60.2.1.3";
-pub const CERT_RDN_ANY_TYPE: ::DWORD = 0;
-pub const CERT_RDN_ENCODED_BLOB: ::DWORD = 1;
-pub const CERT_RDN_OCTET_STRING: ::DWORD = 2;
-pub const CERT_RDN_NUMERIC_STRING: ::DWORD = 3;
-pub const CERT_RDN_PRINTABLE_STRING: ::DWORD = 4;
-pub const CERT_RDN_TELETEX_STRING: ::DWORD = 5;
-pub const CERT_RDN_T61_STRING: ::DWORD = 5;
-pub const CERT_RDN_VIDEOTEX_STRING: ::DWORD = 6;
-pub const CERT_RDN_IA5_STRING: ::DWORD = 7;
-pub const CERT_RDN_GRAPHIC_STRING: ::DWORD = 8;
-pub const CERT_RDN_VISIBLE_STRING: ::DWORD = 9;
-pub const CERT_RDN_ISO646_STRING: ::DWORD = 9;
-pub const CERT_RDN_GENERAL_STRING: ::DWORD = 10;
-pub const CERT_RDN_UNIVERSAL_STRING: ::DWORD = 11;
-pub const CERT_RDN_INT4_STRING: ::DWORD = 11;
-pub const CERT_RDN_BMP_STRING: ::DWORD = 12;
-pub const CERT_RDN_UNICODE_STRING: ::DWORD = 12;
-pub const CERT_RDN_UTF8_STRING: ::DWORD = 13;
-pub const CERT_RDN_TYPE_MASK: ::DWORD = 0x000000FF;
-pub const CERT_RDN_FLAGS_MASK: ::DWORD = 0xFF000000;
-pub const CERT_RDN_ENABLE_T61_UNICODE_FLAG: ::DWORD = 0x80000000;
-pub const CERT_RDN_ENABLE_UTF8_UNICODE_FLAG: ::DWORD = 0x20000000;
-pub const CERT_RDN_FORCE_UTF8_UNICODE_FLAG: ::DWORD = 0x10000000;
-pub const CERT_RDN_DISABLE_CHECK_TYPE_FLAG: ::DWORD = 0x40000000;
-pub const CERT_RDN_DISABLE_IE4_UTF8_FLAG: ::DWORD = 0x01000000;
-pub const CERT_RDN_ENABLE_PUNYCODE_FLAG: ::DWORD = 0x02000000;
-STRUCT!{struct CERT_RDN {
-    cRDNAttr: ::DWORD,
-    rgRDNAttr: PCERT_RDN_ATTR,
-}}
-pub type PCERT_RDN = *mut CERT_RDN;
-STRUCT!{struct CERT_NAME_INFO {
-    cRDN: ::DWORD,
-    rgRDN: PCERT_RDN,
-}}
-pub type PCERT_NAME_INFO = *mut CERT_NAME_INFO;
-STRUCT!{struct CERT_NAME_VALUE {
-    dwValueType: ::DWORD,
-    Value: CERT_RDN_VALUE_BLOB,
-}}
-pub type PCERT_NAME_VALUE = *mut CERT_NAME_VALUE;
-STRUCT!{struct CERT_PUBLIC_KEY_INFO {
-    Algorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    PublicKey: CRYPT_BIT_BLOB,
-}}
-pub type PCERT_PUBLIC_KEY_INFO = *mut CERT_PUBLIC_KEY_INFO;
-pub const CERT_RSA_PUBLIC_KEY_OBJID: &'static str = szOID_RSA_RSA;
-pub const CERT_DEFAULT_OID_PUBLIC_KEY_SIGN: &'static str = szOID_RSA_RSA;
-pub const CERT_DEFAULT_OID_PUBLIC_KEY_XCHG: &'static str = szOID_RSA_RSA;
-STRUCT!{struct CRYPT_ECC_PRIVATE_KEY_INFO {
-    dwVersion: ::DWORD,
-    PrivateKey: CRYPT_DER_BLOB,
-    szCurveOid: ::LPSTR,
-    PublicKey: CRYPT_BIT_BLOB,
-}}
-pub type PCRYPT_ECC_PRIVATE_KEY_INFO = *mut CRYPT_ECC_PRIVATE_KEY_INFO;
-pub const CRYPT_ECC_PRIVATE_KEY_INFO_v1: ::DWORD = 1;
-STRUCT!{struct CRYPT_PRIVATE_KEY_INFO {
-    Version: ::DWORD,
-    Algorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    PrivateKey: CRYPT_DER_BLOB,
-    pAttributes: PCRYPT_ATTRIBUTES,
-}}
-pub type PCRYPT_PRIVATE_KEY_INFO = *mut CRYPT_PRIVATE_KEY_INFO;
-STRUCT!{struct CRYPT_ENCRYPTED_PRIVATE_KEY_INFO {
-    EncryptionAlgorithm: ::CRYPT_ALGORITHM_IDENTIFIER,
-    EncryptedPrivateKey: ::CRYPT_DATA_BLOB,
-}}
-pub type PCRYPT_ENCRYPTED_PRIVATE_KEY_INFO = *mut CRYPT_ENCRYPTED_PRIVATE_KEY_INFO;
-pub type PCRYPT_DECRYPT_PRIVATE_KEY_FUNC = Option<unsafe extern "system" fn(
-    Algorithm: CRYPT_ALGORITHM_IDENTIFIER, EncryptedPrivateKey: CRYPT_DATA_BLOB,
-    pbClearTextKey: *mut ::BYTE, pcbClearTextKey: *mut ::DWORD, pVoidDecryptFunc: ::LPVOID,
-) -> ::BOOL>;
-pub type PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC = Option<unsafe extern "system" fn(
-    Algorithm: *mut CRYPT_ALGORITHM_IDENTIFIER, pClearTextPrivateKey: *mut CRYPT_DATA_BLOB,
-    pbEncryptedKey: *mut ::BYTE, pcbEncryptedKey: *mut ::DWORD, pVoidEncryptFunc: ::LPVOID,
-) -> ::BOOL>;
-pub type PCRYPT_RESOLVE_HCRYPTPROV_FUNC = Option<unsafe extern "system" fn(
-    pPrivateKeyInfo: *mut CRYPT_PRIVATE_KEY_INFO, phCryptProv: *mut HCRYPTPROV,
-    pVoidResolveFunc: ::LPVOID,
-) -> ::BOOL>;
-STRUCT!{nodebug struct CRYPT_PKCS8_IMPORT_PARAMS {
-    PrivateKey: CRYPT_DIGEST_BLOB,
-    pResolvehCryptProvFunc: PCRYPT_RESOLVE_HCRYPTPROV_FUNC,
-    pVoidResolveFunc: ::LPVOID,
-    pDecryptPrivateKeyFunc: PCRYPT_DECRYPT_PRIVATE_KEY_FUNC,
-    pVoidDecryptFunc: ::LPVOID,
-}}
-pub type PCRYPT_PKCS8_IMPORT_PARAMS = *mut CRYPT_PKCS8_IMPORT_PARAMS;
-pub type CRYPT_PRIVATE_KEY_BLOB_AND_PARAMS = CRYPT_PKCS8_IMPORT_PARAMS;
-pub type PPCRYPT_PRIVATE_KEY_BLOB_AND_PARAMS = *mut CRYPT_PKCS8_IMPORT_PARAMS;
-STRUCT!{nodebug struct CRYPT_PKCS8_EXPORT_PARAMS {
-    hCryptProv: HCRYPTPROV,
-    dwKeySpec: ::DWORD,
-    pszPrivateKeyObjId: ::LPSTR,
-    pEncryptPrivateKeyFunc: PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC,
-    pVoidEncryptFunc: ::LPVOID,
-}}
-pub type PCRYPT_PKCS8_EXPORT_PARAMS = *mut CRYPT_PKCS8_EXPORT_PARAMS;
-STRUCT!{struct CERT_INFO {
-    dwVersion: ::DWORD,
-    SerialNumber: CRYPT_INTEGER_BLOB,
-    SignatureAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    Issuer: CERT_NAME_BLOB,
-    NotBefore: ::FILETIME,
-    NotAfter: ::FILETIME,
-    Subject: CERT_NAME_BLOB,
-    SubjectPublicKeyInfo: CERT_PUBLIC_KEY_INFO,
-    IssuerUniqueId: CRYPT_BIT_BLOB,
-    SubjectUniqueId: CRYPT_BIT_BLOB,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCERT_INFO = *mut CERT_INFO;
-pub const CERT_V1: ::DWORD = 0;
-pub const CERT_V2: ::DWORD = 1;
-pub const CERT_V3: ::DWORD = 2;
-pub const CERT_INFO_VERSION_FLAG: ::DWORD = 1;
-pub const CERT_INFO_SERIAL_NUMBER_FLAG: ::DWORD = 2;
-pub const CERT_INFO_SIGNATURE_ALGORITHM_FLAG: ::DWORD = 3;
-pub const CERT_INFO_ISSUER_FLAG: ::DWORD = 4;
-pub const CERT_INFO_NOT_BEFORE_FLAG: ::DWORD = 5;
-pub const CERT_INFO_NOT_AFTER_FLAG: ::DWORD = 6;
-pub const CERT_INFO_SUBJECT_FLAG: ::DWORD = 7;
-pub const CERT_INFO_SUBJECT_PUBLIC_KEY_INFO_FLAG: ::DWORD = 8;
-pub const CERT_INFO_ISSUER_UNIQUE_ID_FLAG: ::DWORD = 9;
-pub const CERT_INFO_SUBJECT_UNIQUE_ID_FLAG: ::DWORD = 10;
-pub const CERT_INFO_EXTENSION_FLAG: ::DWORD = 11;
-STRUCT!{struct CRL_ENTRY {
-    SerialNumber: CRYPT_INTEGER_BLOB,
-    RevocationDate: ::FILETIME,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCRL_ENTRY = *mut CRL_ENTRY;
-STRUCT!{struct CRL_INFO {
-    dwVersion: ::DWORD,
-    SignatureAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    Issuer: CERT_NAME_BLOB,
-    ThisUpdate: ::FILETIME,
-    NextUpdate: ::FILETIME,
-    cCRLEntry: ::DWORD,
-    rgCRLEntry: PCRL_ENTRY,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCRL_INFO = *mut CRL_INFO;
-pub const CRL_V1: ::DWORD = 0;
-pub const CRL_V2: ::DWORD = 1;
-pub const CERT_BUNDLE_CERTIFICATE: ::DWORD = 0;
-pub const CERT_BUNDLE_CRL: ::DWORD = 1;
-STRUCT!{struct CERT_OR_CRL_BLOB {
-    dwChoice: ::DWORD,
-    cbEncoded: ::DWORD,
-    pbEncoded: *mut ::BYTE,
-}}
-pub type PCERT_OR_CRL_BLOB = *mut CERT_OR_CRL_BLOB;
-STRUCT!{struct CERT_OR_CRL_BUNDLE {
-    cItem: ::DWORD,
-    rgItem: PCERT_OR_CRL_BLOB,
-}}
-pub type PCERT_OR_CRL_BUNDLE = *mut CERT_OR_CRL_BUNDLE;
-STRUCT!{struct CERT_REQUEST_INFO {
-    dwVersion: ::DWORD,
-    Subject: CERT_NAME_BLOB,
-    SubjectPublicKeyInfo: CERT_PUBLIC_KEY_INFO,
-    cAttribute: ::DWORD,
-    rgAttribute: PCRYPT_ATTRIBUTE,
-}}
-pub type PCERT_REQUEST_INFO = *mut CERT_REQUEST_INFO;
-pub const CERT_REQUEST_V1: ::DWORD = 0;
-STRUCT!{struct CERT_KEYGEN_REQUEST_INFO {
-    dwVersion: ::DWORD,
-    SubjectPublicKeyInfo: CERT_PUBLIC_KEY_INFO,
-    pwszChallengeString: ::LPWSTR,
-}}
-pub type PCERT_KEYGEN_REQUEST_INFO = *mut CERT_KEYGEN_REQUEST_INFO;
-pub const CERT_KEYGEN_REQUEST_V1: ::DWORD = 0;
-STRUCT!{struct CERT_SIGNED_CONTENT_INFO {
-    ToBeSigned: CRYPT_DER_BLOB,
-    SignatureAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    Signature: CRYPT_BIT_BLOB,
-}}
-pub type PCERT_SIGNED_CONTENT_INFO = *mut CERT_SIGNED_CONTENT_INFO;
-STRUCT!{struct CTL_USAGE {
-    cUsageIdentifier: ::DWORD,
-    rgpszUsageIdentifier: *mut ::LPSTR,
-}}
-pub type PCTL_USAGE = *mut CTL_USAGE;
-pub type CERT_ENHKEY_USAGE = CTL_USAGE;
-pub type PCERT_ENHKEY_USAGE = *mut CERT_ENHKEY_USAGE;
-pub type PCCTL_USAGE = *const CTL_USAGE;
-pub type PCCERT_ENHKEY_USAGE = *const CERT_ENHKEY_USAGE;
-STRUCT!{struct CTL_ENTRY {
-    SubjectIdentifier: CRYPT_DATA_BLOB,
-    cAttribute: ::DWORD,
-    rgAttribute: PCRYPT_ATTRIBUTE,
-}}
-pub type PCTL_ENTRY = *mut CTL_ENTRY;
-STRUCT!{struct CTL_INFO {
-    dwVersion: ::DWORD,
-    SubjectUsage: CTL_USAGE,
-    ListIdentifier: CRYPT_DATA_BLOB,
-    SequenceNumber: CRYPT_INTEGER_BLOB,
-    ThisUpdate: ::FILETIME,
-    NextUpdate: ::FILETIME,
-    SubjectAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    cCTLEntry: ::DWORD,
-    rgCTLEntry: PCTL_ENTRY,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCTL_INFO = *mut CTL_INFO;
-pub const CTL_V1: ::DWORD = 0;
-STRUCT!{struct CRYPT_TIME_STAMP_REQUEST_INFO {
-    pszTimeStampAlgorithm: ::LPSTR,
-    pszContentType: ::LPSTR,
-    Content: CRYPT_OBJID_BLOB,
-    cAttribute: ::DWORD,
-    rgAttribute: PCRYPT_ATTRIBUTE,
-}}
-pub type PCRYPT_TIME_STAMP_REQUEST_INFO = *mut CRYPT_TIME_STAMP_REQUEST_INFO;
-STRUCT!{struct CRYPT_ENROLLMENT_NAME_VALUE_PAIR {
-    pwszName: ::LPWSTR,
-    pwszValue: ::LPWSTR,
-}}
-pub type PCRYPT_ENROLLMENT_NAME_VALUE_PAIR = *mut CRYPT_ENROLLMENT_NAME_VALUE_PAIR;
-STRUCT!{struct CRYPT_CSP_PROVIDER {
-    dwKeySpec: ::DWORD,
-    pwszProviderName: ::LPWSTR,
-    Signature: CRYPT_BIT_BLOB,
-}}
-pub type PCRYPT_CSP_PROVIDER = *mut CRYPT_CSP_PROVIDER;
-pub const CERT_ENCODING_TYPE_MASK: ::DWORD = 0x0000FFFF;
-pub const CMSG_ENCODING_TYPE_MASK: ::DWORD = 0xFFFF0000;
-pub const CRYPT_ASN_ENCODING: ::DWORD = 0x00000001;
-pub const CRYPT_NDR_ENCODING: ::DWORD = 0x00000002;
-pub const X509_ASN_ENCODING: ::DWORD = 0x00000001;
-pub const X509_NDR_ENCODING: ::DWORD = 0x00000002;
-pub const PKCS_7_ASN_ENCODING: ::DWORD = 0x00010000;
-pub const PKCS_7_NDR_ENCODING: ::DWORD = 0x00020000;
-pub const CRYPT_FORMAT_STR_MULTI_LINE: ::DWORD = 0x0001;
-pub const CRYPT_FORMAT_STR_NO_HEX: ::DWORD = 0x0010;
-pub const CRYPT_FORMAT_SIMPLE: ::DWORD = 0x0001;
-pub const CRYPT_FORMAT_X509: ::DWORD = 0x0002;
-pub const CRYPT_FORMAT_OID: ::DWORD = 0x0004;
-pub const CRYPT_FORMAT_RDN_SEMICOLON: ::DWORD = 0x0100;
-pub const CRYPT_FORMAT_RDN_CRLF: ::DWORD = 0x0200;
-pub const CRYPT_FORMAT_RDN_UNQUOTE: ::DWORD = 0x0400;
-pub const CRYPT_FORMAT_RDN_REVERSE: ::DWORD = 0x0800;
-pub const CRYPT_FORMAT_COMMA: ::DWORD = 0x1000;
-pub const CRYPT_FORMAT_SEMICOLON: ::DWORD = CRYPT_FORMAT_RDN_SEMICOLON;
-pub const CRYPT_FORMAT_CRLF: ::DWORD = CRYPT_FORMAT_RDN_CRLF;
-pub type PFN_CRYPT_ALLOC = Option<unsafe extern "system" fn(cbSize: ::size_t)>;
-pub type PFN_CRYPT_FREE = Option<unsafe extern "system" fn(pv: ::LPVOID)>;
-STRUCT!{nodebug struct CRYPT_ENCODE_PARA {
-    cbSize: ::DWORD,
-    pfnAlloc: PFN_CRYPT_ALLOC,
-    pfnFree: PFN_CRYPT_FREE,
-}}
-pub type PCRYPT_ENCODE_PARA = *mut CRYPT_ENCODE_PARA;
-pub const CRYPT_ENCODE_NO_SIGNATURE_BYTE_REVERSAL_FLAG: ::DWORD = 0x8;
-pub const CRYPT_ENCODE_ALLOC_FLAG: ::DWORD = 0x8000;
-pub const CRYPT_UNICODE_NAME_ENCODE_ENABLE_T61_UNICODE_FLAG: ::DWORD =
-    CERT_RDN_ENABLE_T61_UNICODE_FLAG;
-pub const CRYPT_UNICODE_NAME_ENCODE_ENABLE_UTF8_UNICODE_FLAG: ::DWORD =
-    CERT_RDN_ENABLE_UTF8_UNICODE_FLAG;
-pub const CRYPT_UNICODE_NAME_ENCODE_FORCE_UTF8_UNICODE_FLAG: ::DWORD =
-    CERT_RDN_FORCE_UTF8_UNICODE_FLAG;
-pub const CRYPT_UNICODE_NAME_ENCODE_DISABLE_CHECK_TYPE_FLAG: ::DWORD =
-    CERT_RDN_DISABLE_CHECK_TYPE_FLAG;
-pub const CRYPT_SORTED_CTL_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG: ::DWORD = 0x10000;
-pub const CRYPT_ENCODE_ENABLE_PUNYCODE_FLAG: ::DWORD = 0x20000;
-pub const CRYPT_ENCODE_ENABLE_UTF8PERCENT_FLAG: ::DWORD = 0x40000;
-pub const CRYPT_ENCODE_ENABLE_IA5CONVERSION_FLAG: ::DWORD = CRYPT_ENCODE_ENABLE_PUNYCODE_FLAG
-    | CRYPT_ENCODE_ENABLE_UTF8PERCENT_FLAG;
-STRUCT!{nodebug struct CRYPT_DECODE_PARA {
-    cbSize: ::DWORD,
-    pfnAlloc: PFN_CRYPT_ALLOC,
-    pfnFree: PFN_CRYPT_FREE,
-}}
-pub type PCRYPT_DECODE_PARA = *mut CRYPT_DECODE_PARA;
-pub const CRYPT_DECODE_NOCOPY_FLAG: ::DWORD = 0x1;
-pub const CRYPT_DECODE_TO_BE_SIGNED_FLAG: ::DWORD = 0x2;
-pub const CRYPT_DECODE_SHARE_OID_STRING_FLAG: ::DWORD = 0x4;
-pub const CRYPT_DECODE_NO_SIGNATURE_BYTE_REVERSAL_FLAG: ::DWORD = 0x8;
-pub const CRYPT_DECODE_ALLOC_FLAG: ::DWORD = 0x8000;
-pub const CRYPT_UNICODE_NAME_DECODE_DISABLE_IE4_UTF8_FLAG: ::DWORD =
-    CERT_RDN_DISABLE_IE4_UTF8_FLAG;
-pub const CRYPT_DECODE_ENABLE_PUNYCODE_FLAG: ::DWORD = 0x02000000;
-pub const CRYPT_DECODE_ENABLE_UTF8PERCENT_FLAG: ::DWORD = 0x04000000;
-pub const CRYPT_DECODE_ENABLE_IA5CONVERSION_FLAG: ::DWORD = CRYPT_DECODE_ENABLE_PUNYCODE_FLAG
-    | CRYPT_DECODE_ENABLE_UTF8PERCENT_FLAG;
-pub const CRYPT_ENCODE_DECODE_NONE: ::LPCSTR = 0 as ::LPCSTR;
-pub const X509_CERT: ::LPCSTR = 1 as ::LPCSTR;
-pub const X509_CERT_TO_BE_SIGNED: ::LPCSTR = 2 as ::LPCSTR;
-pub const X509_CERT_CRL_TO_BE_SIGNED: ::LPCSTR = 3 as ::LPCSTR;
-pub const X509_CERT_REQUEST_TO_BE_SIGNED: ::LPCSTR = 4 as ::LPCSTR;
-pub const X509_EXTENSIONS: ::LPCSTR = 5 as ::LPCSTR;
-pub const X509_NAME_VALUE: ::LPCSTR = 6 as ::LPCSTR;
-pub const X509_NAME: ::LPCSTR = 7 as ::LPCSTR;
-pub const X509_PUBLIC_KEY_INFO: ::LPCSTR = 8 as ::LPCSTR;
-pub const X509_AUTHORITY_KEY_ID: ::LPCSTR = 9 as ::LPCSTR;
-pub const X509_KEY_ATTRIBUTES: ::LPCSTR = 10 as ::LPCSTR;
-pub const X509_KEY_USAGE_RESTRICTION: ::LPCSTR = 11 as ::LPCSTR;
-pub const X509_ALTERNATE_NAME: ::LPCSTR = 12 as ::LPCSTR;
-pub const X509_BASIC_CONSTRAINTS: ::LPCSTR = 13 as ::LPCSTR;
-pub const X509_KEY_USAGE: ::LPCSTR = 14 as ::LPCSTR;
-pub const X509_BASIC_CONSTRAINTS2: ::LPCSTR = 15 as ::LPCSTR;
-pub const X509_CERT_POLICIES: ::LPCSTR = 16 as ::LPCSTR;
-pub const PKCS_UTC_TIME: ::LPCSTR = 17 as ::LPCSTR;
-pub const PKCS_TIME_REQUEST: ::LPCSTR = 18 as ::LPCSTR;
-pub const RSA_CSP_PUBLICKEYBLOB: ::LPCSTR = 19 as ::LPCSTR;
-pub const X509_UNICODE_NAME: ::LPCSTR = 20 as ::LPCSTR;
-pub const X509_KEYGEN_REQUEST_TO_BE_SIGNED: ::LPCSTR = 21 as ::LPCSTR;
-pub const PKCS_ATTRIBUTE: ::LPCSTR = 22 as ::LPCSTR;
-pub const PKCS_CONTENT_INFO_SEQUENCE_OF_ANY: ::LPCSTR = 23 as ::LPCSTR;
-pub const X509_UNICODE_NAME_VALUE: ::LPCSTR = 24 as ::LPCSTR;
-pub const X509_ANY_STRING: ::LPCSTR = X509_NAME_VALUE;
-pub const X509_UNICODE_ANY_STRING: ::LPCSTR = X509_UNICODE_NAME_VALUE;
-pub const X509_OCTET_STRING: ::LPCSTR = 25 as ::LPCSTR;
-pub const X509_BITS: ::LPCSTR = 26 as ::LPCSTR;
-pub const X509_INTEGER: ::LPCSTR = 27 as ::LPCSTR;
-pub const X509_MULTI_BYTE_INTEGER: ::LPCSTR = 28 as ::LPCSTR;
-pub const X509_ENUMERATED: ::LPCSTR = 29 as ::LPCSTR;
-pub const X509_CHOICE_OF_TIME: ::LPCSTR = 30 as ::LPCSTR;
-pub const X509_AUTHORITY_KEY_ID2: ::LPCSTR = 31 as ::LPCSTR;
-pub const X509_AUTHORITY_INFO_ACCESS: ::LPCSTR = 32 as ::LPCSTR;
-pub const X509_SUBJECT_INFO_ACCESS: ::LPCSTR = X509_AUTHORITY_INFO_ACCESS;
-pub const X509_CRL_REASON_CODE: ::LPCSTR = X509_ENUMERATED;
-pub const PKCS_CONTENT_INFO: ::LPCSTR = 33 as ::LPCSTR;
-pub const X509_SEQUENCE_OF_ANY: ::LPCSTR = 34 as ::LPCSTR;
-pub const X509_CRL_DIST_POINTS: ::LPCSTR = 35 as ::LPCSTR;
-pub const X509_ENHANCED_KEY_USAGE: ::LPCSTR = 36 as ::LPCSTR;
-pub const PKCS_CTL: ::LPCSTR = 37 as ::LPCSTR;
-pub const X509_MULTI_BYTE_UINT: ::LPCSTR = 38 as ::LPCSTR;
-pub const X509_DSS_PUBLICKEY: ::LPCSTR = X509_MULTI_BYTE_UINT;
-pub const X509_DSS_PARAMETERS: ::LPCSTR = 39 as ::LPCSTR;
-pub const X509_DSS_SIGNATURE: ::LPCSTR = 40 as ::LPCSTR;
-pub const PKCS_RC2_CBC_PARAMETERS: ::LPCSTR = 41 as ::LPCSTR;
-pub const PKCS_SMIME_CAPABILITIES: ::LPCSTR = 42 as ::LPCSTR;
-pub const X509_QC_STATEMENTS_EXT: ::LPCSTR = 42 as ::LPCSTR;
-pub const PKCS_RSA_PRIVATE_KEY: ::LPCSTR = 43 as ::LPCSTR;
-pub const PKCS_PRIVATE_KEY_INFO: ::LPCSTR = 44 as ::LPCSTR;
-pub const PKCS_ENCRYPTED_PRIVATE_KEY_INFO: ::LPCSTR = 45 as ::LPCSTR;
-pub const X509_PKIX_POLICY_QUALIFIER_USERNOTICE: ::LPCSTR = 46 as ::LPCSTR;
-pub const X509_DH_PUBLICKEY: ::LPCSTR = X509_MULTI_BYTE_UINT;
-pub const X509_DH_PARAMETERS: ::LPCSTR = 47 as ::LPCSTR;
-pub const PKCS_ATTRIBUTES: ::LPCSTR = 48 as ::LPCSTR;
-pub const PKCS_SORTED_CTL: ::LPCSTR = 49 as ::LPCSTR;
-pub const X509_ECC_SIGNATURE: ::LPCSTR = 47 as ::LPCSTR;
-pub const X942_DH_PARAMETERS: ::LPCSTR = 50 as ::LPCSTR;
-pub const X509_BITS_WITHOUT_TRAILING_ZEROES: ::LPCSTR = 51 as ::LPCSTR;
-pub const X942_OTHER_INFO: ::LPCSTR = 52 as ::LPCSTR;
-pub const X509_CERT_PAIR: ::LPCSTR = 53 as ::LPCSTR;
-pub const X509_ISSUING_DIST_POINT: ::LPCSTR = 54 as ::LPCSTR;
-pub const X509_NAME_CONSTRAINTS: ::LPCSTR = 55 as ::LPCSTR;
-pub const X509_POLICY_MAPPINGS: ::LPCSTR = 56 as ::LPCSTR;
-pub const X509_POLICY_CONSTRAINTS: ::LPCSTR = 57 as ::LPCSTR;
-pub const X509_CROSS_CERT_DIST_POINTS: ::LPCSTR = 58 as ::LPCSTR;
-pub const CMC_DATA: ::LPCSTR = 59 as ::LPCSTR;
-pub const CMC_RESPONSE: ::LPCSTR = 60 as ::LPCSTR;
-pub const CMC_STATUS: ::LPCSTR = 61 as ::LPCSTR;
-pub const CMC_ADD_EXTENSIONS: ::LPCSTR = 62 as ::LPCSTR;
-pub const CMC_ADD_ATTRIBUTES: ::LPCSTR = 63 as ::LPCSTR;
-pub const X509_CERTIFICATE_TEMPLATE: ::LPCSTR = 64 as ::LPCSTR;
-pub const OCSP_SIGNED_REQUEST: ::LPCSTR = 65 as ::LPCSTR;
-pub const OCSP_REQUEST: ::LPCSTR = 66 as ::LPCSTR;
-pub const OCSP_RESPONSE: ::LPCSTR = 67 as ::LPCSTR;
-pub const OCSP_BASIC_SIGNED_RESPONSE: ::LPCSTR = 68 as ::LPCSTR;
-pub const OCSP_BASIC_RESPONSE: ::LPCSTR = 69 as ::LPCSTR;
-pub const X509_LOGOTYPE_EXT: ::LPCSTR = 70 as ::LPCSTR;
-pub const X509_BIOMETRIC_EXT: ::LPCSTR = 71 as ::LPCSTR;
-pub const CNG_RSA_PUBLIC_KEY_BLOB: ::LPCSTR = 72 as ::LPCSTR;
-pub const X509_OBJECT_IDENTIFIER: ::LPCSTR = 73 as ::LPCSTR;
-pub const X509_ALGORITHM_IDENTIFIER: ::LPCSTR = 74 as ::LPCSTR;
-pub const PKCS_RSA_SSA_PSS_PARAMETERS: ::LPCSTR = 75 as ::LPCSTR;
-pub const PKCS_RSAES_OAEP_PARAMETERS: ::LPCSTR = 76 as ::LPCSTR;
-pub const ECC_CMS_SHARED_INFO: ::LPCSTR = 77 as ::LPCSTR;
-pub const TIMESTAMP_REQUEST: ::LPCSTR = 78 as ::LPCSTR;
-pub const TIMESTAMP_RESPONSE: ::LPCSTR = 79 as ::LPCSTR;
-pub const TIMESTAMP_INFO: ::LPCSTR = 80 as ::LPCSTR;
-pub const X509_CERT_BUNDLE: ::LPCSTR = 81 as ::LPCSTR;
-pub const X509_ECC_PRIVATE_KEY: ::LPCSTR = 82 as ::LPCSTR;
-pub const CNG_RSA_PRIVATE_KEY_BLOB: ::LPCSTR = 83 as ::LPCSTR;
-pub const X509_SUBJECT_DIR_ATTRS: ::LPCSTR = 84 as ::LPCSTR;
-pub const PKCS7_SIGNER_INFO: ::LPCSTR = 500 as ::LPCSTR;
-pub const CMS_SIGNER_INFO: ::LPCSTR = 501 as ::LPCSTR;
-pub const szOID_AUTHORITY_KEY_IDENTIFIER: &'static str = "2.5.29.1";
-pub const szOID_KEY_ATTRIBUTES: &'static str = "2.5.29.2";
-pub const szOID_CERT_POLICIES_95: &'static str = "2.5.29.3";
-pub const szOID_KEY_USAGE_RESTRICTION: &'static str = "2.5.29.4";
-pub const szOID_SUBJECT_ALT_NAME: &'static str = "2.5.29.7";
-pub const szOID_ISSUER_ALT_NAME: &'static str = "2.5.29.8";
-pub const szOID_BASIC_CONSTRAINTS: &'static str = "2.5.29.10";
-pub const szOID_KEY_USAGE: &'static str = "2.5.29.15";
-pub const szOID_PRIVATEKEY_USAGE_PERIOD: &'static str = "2.5.29.16";
-pub const szOID_BASIC_CONSTRAINTS2: &'static str = "2.5.29.19";
-pub const szOID_CERT_POLICIES: &'static str = "2.5.29.32";
-pub const szOID_ANY_CERT_POLICY: &'static str = "2.5.29.32.0";
-pub const szOID_INHIBIT_ANY_POLICY: &'static str = "2.5.29.54";
-pub const szOID_AUTHORITY_KEY_IDENTIFIER2: &'static str = "2.5.29.35";
-pub const szOID_SUBJECT_KEY_IDENTIFIER: &'static str = "2.5.29.14";
-pub const szOID_SUBJECT_ALT_NAME2: &'static str = "2.5.29.17";
-pub const szOID_ISSUER_ALT_NAME2: &'static str = "2.5.29.18";
-pub const szOID_CRL_REASON_CODE: &'static str = "2.5.29.21";
-pub const szOID_REASON_CODE_HOLD: &'static str = "2.5.29.23";
-pub const szOID_CRL_DIST_POINTS: &'static str = "2.5.29.31";
-pub const szOID_ENHANCED_KEY_USAGE: &'static str = "2.5.29.37";
-pub const szOID_ANY_ENHANCED_KEY_USAGE: &'static str = "2.5.29.37.0";
-pub const szOID_CRL_NUMBER: &'static str = "2.5.29.20";
-pub const szOID_DELTA_CRL_INDICATOR: &'static str = "2.5.29.27";
-pub const szOID_ISSUING_DIST_POINT: &'static str = "2.5.29.28";
-pub const szOID_FRESHEST_CRL: &'static str = "2.5.29.46";
-pub const szOID_NAME_CONSTRAINTS: &'static str = "2.5.29.30";
-pub const szOID_POLICY_MAPPINGS: &'static str = "2.5.29.33";
-pub const szOID_LEGACY_POLICY_MAPPINGS: &'static str = "2.5.29.5";
-pub const szOID_POLICY_CONSTRAINTS: &'static str = "2.5.29.36";
-pub const szOID_RENEWAL_CERTIFICATE: &'static str = "1.3.6.1.4.1.311.13.1";
-pub const szOID_ENROLLMENT_NAME_VALUE_PAIR: &'static str = "1.3.6.1.4.1.311.13.2.1";
-pub const szOID_ENROLLMENT_CSP_PROVIDER: &'static str = "1.3.6.1.4.1.311.13.2.2";
-pub const szOID_OS_VERSION: &'static str = "1.3.6.1.4.1.311.13.2.3";
-pub const szOID_ENROLLMENT_AGENT: &'static str = "1.3.6.1.4.1.311.20.2.1";
-pub const szOID_PKIX: &'static str = "1.3.6.1.5.5.7";
-pub const szOID_PKIX_PE: &'static str = "1.3.6.1.5.5.7.1";
-pub const szOID_AUTHORITY_INFO_ACCESS: &'static str = "1.3.6.1.5.5.7.1.1";
-pub const szOID_SUBJECT_INFO_ACCESS: &'static str = "1.3.6.1.5.5.7.1.11";
-pub const szOID_BIOMETRIC_EXT: &'static str = "1.3.6.1.5.5.7.1.2";
-pub const szOID_QC_STATEMENTS_EXT: &'static str = "1.3.6.1.5.5.7.1.3";
-pub const szOID_LOGOTYPE_EXT: &'static str = "1.3.6.1.5.5.7.1.12";
-pub const szOID_CERT_EXTENSIONS: &'static str = "1.3.6.1.4.1.311.2.1.14";
-pub const szOID_NEXT_UPDATE_LOCATION: &'static str = "1.3.6.1.4.1.311.10.2";
-pub const szOID_REMOVE_CERTIFICATE: &'static str = "1.3.6.1.4.1.311.10.8.1";
-pub const szOID_CROSS_CERT_DIST_POINTS: &'static str = "1.3.6.1.4.1.311.10.9.1";
-pub const szOID_CTL: &'static str = "1.3.6.1.4.1.311.10.1";
-pub const szOID_SORTED_CTL: &'static str = "1.3.6.1.4.1.311.10.1.1";
-pub const szOID_SERIALIZED: &'static str = "1.3.6.1.4.1.311.10.3.3.1";
-pub const szOID_NT_PRINCIPAL_NAME: &'static str = "1.3.6.1.4.1.311.20.2.3";
-pub const szOID_INTERNATIONALIZED_EMAIL_ADDRESS: &'static str = "1.3.6.1.4.1.311.20.2.4";
-pub const szOID_PRODUCT_UPDATE: &'static str = "1.3.6.1.4.1.311.31.1";
-pub const szOID_ANY_APPLICATION_POLICY: &'static str = "1.3.6.1.4.1.311.10.12.1";
-pub const szOID_AUTO_ENROLL_CTL_USAGE: &'static str = "1.3.6.1.4.1.311.20.1";
-pub const szOID_ENROLL_CERTTYPE_EXTENSION: &'static str = "1.3.6.1.4.1.311.20.2";
-pub const szOID_CERT_MANIFOLD: &'static str = "1.3.6.1.4.1.311.20.3";
-pub const szOID_CERTSRV_CA_VERSION: &'static str = "1.3.6.1.4.1.311.21.1";
-pub const szOID_CERTSRV_PREVIOUS_CERT_HASH: &'static str = "1.3.6.1.4.1.311.21.2";
-pub const szOID_CRL_VIRTUAL_BASE: &'static str = "1.3.6.1.4.1.311.21.3";
-pub const szOID_CRL_NEXT_PUBLISH: &'static str = "1.3.6.1.4.1.311.21.4";
-pub const szOID_KP_CA_EXCHANGE: &'static str = "1.3.6.1.4.1.311.21.5";
-pub const szOID_KP_KEY_RECOVERY_AGENT: &'static str = "1.3.6.1.4.1.311.21.6";
-pub const szOID_CERTIFICATE_TEMPLATE: &'static str = "1.3.6.1.4.1.311.21.7";
-pub const szOID_ENTERPRISE_OID_ROOT: &'static str = "1.3.6.1.4.1.311.21.8";
-pub const szOID_RDN_DUMMY_SIGNER: &'static str = "1.3.6.1.4.1.311.21.9";
-pub const szOID_APPLICATION_CERT_POLICIES: &'static str = "1.3.6.1.4.1.311.21.10";
-pub const szOID_APPLICATION_POLICY_MAPPINGS: &'static str = "1.3.6.1.4.1.311.21.11";
-pub const szOID_APPLICATION_POLICY_CONSTRAINTS: &'static str = "1.3.6.1.4.1.311.21.12";
-pub const szOID_ARCHIVED_KEY_ATTR: &'static str = "1.3.6.1.4.1.311.21.13";
-pub const szOID_CRL_SELF_CDP: &'static str = "1.3.6.1.4.1.311.21.14";
-pub const szOID_REQUIRE_CERT_CHAIN_POLICY: &'static str = "1.3.6.1.4.1.311.21.15";
-pub const szOID_ARCHIVED_KEY_CERT_HASH: &'static str = "1.3.6.1.4.1.311.21.16";
-pub const szOID_ISSUED_CERT_HASH: &'static str = "1.3.6.1.4.1.311.21.17";
-pub const szOID_DS_EMAIL_REPLICATION: &'static str = "1.3.6.1.4.1.311.21.19";
-pub const szOID_REQUEST_CLIENT_INFO: &'static str = "1.3.6.1.4.1.311.21.20";
-pub const szOID_ENCRYPTED_KEY_HASH: &'static str = "1.3.6.1.4.1.311.21.21";
-pub const szOID_CERTSRV_CROSSCA_VERSION: &'static str = "1.3.6.1.4.1.311.21.22";
-pub const szOID_NTDS_REPLICATION: &'static str = "1.3.6.1.4.1.311.25.1";
-pub const szOID_SUBJECT_DIR_ATTRS: &'static str = "2.5.29.9";
-pub const szOID_PKIX_KP: &'static str = "1.3.6.1.5.5.7.3";
-pub const szOID_PKIX_KP_SERVER_AUTH: &'static str = "1.3.6.1.5.5.7.3.1";
-pub const szOID_PKIX_KP_CLIENT_AUTH: &'static str = "1.3.6.1.5.5.7.3.2";
-pub const szOID_PKIX_KP_CODE_SIGNING: &'static str = "1.3.6.1.5.5.7.3.3";
-pub const szOID_PKIX_KP_EMAIL_PROTECTION: &'static str = "1.3.6.1.5.5.7.3.4";
-pub const szOID_PKIX_KP_IPSEC_END_SYSTEM: &'static str = "1.3.6.1.5.5.7.3.5";
-pub const szOID_PKIX_KP_IPSEC_TUNNEL: &'static str = "1.3.6.1.5.5.7.3.6";
-pub const szOID_PKIX_KP_IPSEC_USER: &'static str = "1.3.6.1.5.5.7.3.7";
-pub const szOID_PKIX_KP_TIMESTAMP_SIGNING: &'static str = "1.3.6.1.5.5.7.3.8";
-pub const szOID_PKIX_KP_OCSP_SIGNING: &'static str = "1.3.6.1.5.5.7.3.9";
-pub const szOID_PKIX_OCSP_NOCHECK: &'static str = "1.3.6.1.5.5.7.48.1.5";
-pub const szOID_PKIX_OCSP_NONCE: &'static str = "1.3.6.1.5.5.7.48.1.2";
-pub const szOID_IPSEC_KP_IKE_INTERMEDIATE: &'static str = "1.3.6.1.5.5.8.2.2";
-pub const szOID_PKINIT_KP_KDC: &'static str = "1.3.6.1.5.2.3.5";
-pub const szOID_KP_CTL_USAGE_SIGNING: &'static str = "1.3.6.1.4.1.311.10.3.1";
-pub const szOID_KP_TIME_STAMP_SIGNING: &'static str = "1.3.6.1.4.1.311.10.3.2";
-pub const szOID_SERVER_GATED_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.3";
-pub const szOID_SGC_NETSCAPE: &'static str = "2.16.840.1.113730.4.1";
-pub const szOID_KP_EFS: &'static str = "1.3.6.1.4.1.311.10.3.4";
-pub const szOID_EFS_RECOVERY: &'static str = "1.3.6.1.4.1.311.10.3.4.1";
-pub const szOID_WHQL_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.5";
-pub const szOID_NT5_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.6";
-pub const szOID_OEM_WHQL_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.7";
-pub const szOID_EMBEDDED_NT_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.8";
-pub const szOID_ROOT_LIST_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.9";
-pub const szOID_KP_QUALIFIED_SUBORDINATION: &'static str = "1.3.6.1.4.1.311.10.3.10";
-pub const szOID_KP_KEY_RECOVERY: &'static str = "1.3.6.1.4.1.311.10.3.11";
-pub const szOID_KP_DOCUMENT_SIGNING: &'static str = "1.3.6.1.4.1.311.10.3.12";
-pub const szOID_KP_LIFETIME_SIGNING: &'static str = "1.3.6.1.4.1.311.10.3.13";
-pub const szOID_KP_MOBILE_DEVICE_SOFTWARE: &'static str = "1.3.6.1.4.1.311.10.3.14";
-pub const szOID_KP_SMART_DISPLAY: &'static str = "1.3.6.1.4.1.311.10.3.15";
-pub const szOID_KP_CSP_SIGNATURE: &'static str = "1.3.6.1.4.1.311.10.3.16";
-pub const szOID_DRM: &'static str = "1.3.6.1.4.1.311.10.5.1";
-pub const szOID_DRM_INDIVIDUALIZATION: &'static str = "1.3.6.1.4.1.311.10.5.2";
-pub const szOID_LICENSES: &'static str = "1.3.6.1.4.1.311.10.6.1";
-pub const szOID_LICENSE_SERVER: &'static str = "1.3.6.1.4.1.311.10.6.2";
-pub const szOID_KP_SMARTCARD_LOGON: &'static str = "1.3.6.1.4.1.311.20.2.2";
-pub const szOID_KP_KERNEL_MODE_CODE_SIGNING: &'static str = "1.3.6.1.4.1.311.61.1.1";
-pub const szOID_KP_KERNEL_MODE_TRUSTED_BOOT_SIGNING: &'static str = "1.3.6.1.4.1.311.61.4.1";
-pub const szOID_REVOKED_LIST_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.19";
-pub const szOID_WINDOWS_KITS_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.20";
-pub const szOID_WINDOWS_RT_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.21";
-pub const szOID_PROTECTED_PROCESS_LIGHT_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.22";
-pub const szOID_WINDOWS_TCB_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.23";
-pub const szOID_PROTECTED_PROCESS_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.24";
-pub const szOID_WINDOWS_THIRD_PARTY_COMPONENT_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.25";
-pub const szOID_WINDOWS_SOFTWARE_EXTENSION_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.26";
-pub const szOID_DISALLOWED_LIST: &'static str = "1.3.6.1.4.1.311.10.3.30";
-pub const szOID_SYNC_ROOT_CTL_EXT: &'static str = "1.3.6.1.4.1.311.10.3.50";
-pub const szOID_KP_KERNEL_MODE_HAL_EXTENSION_SIGNING: &'static str = "1.3.6.1.4.1.311.61.5.1";
-pub const szOID_WINDOWS_STORE_SIGNER: &'static str = "1.3.6.1.4.1.311.76.3.1";
-pub const szOID_DYNAMIC_CODE_GEN_SIGNER: &'static str = "1.3.6.1.4.1.311.76.5.1";
-pub const szOID_MICROSOFT_PUBLISHER_SIGNER: &'static str = "1.3.6.1.4.1.311.76.8.1";
-pub const szOID_YESNO_TRUST_ATTR: &'static str = "1.3.6.1.4.1.311.10.4.1";
-pub const szOID_PKIX_POLICY_QUALIFIER_CPS: &'static str = "1.3.6.1.5.5.7.2.1";
-pub const szOID_PKIX_POLICY_QUALIFIER_USERNOTICE: &'static str = "1.3.6.1.5.5.7.2.2";
-pub const szOID_ROOT_PROGRAM_FLAGS: &'static str = "1.3.6.1.4.1.311.60.1.1";
-//6992
-pub type HCRYPTMSG = *mut ::c_void;
-//9353
-pub type HCERTSTORE = *mut ::c_void;
-STRUCT!{struct CERT_CONTEXT {
-    dwCertEncodingType: ::DWORD,
-    pbCertEncoded: *mut ::BYTE,
-    cbCertEncoded: ::DWORD,
-    pCertInfo: ::PCERT_INFO,
-    hCertStore: HCERTSTORE,
-}}
-pub type PCERT_CONTEXT = *mut CERT_CONTEXT;
-pub type PCCERT_CONTEXT = *const CERT_CONTEXT;
-STRUCT!{struct CRL_CONTEXT {
-    dwCertEncodingType: ::DWORD,
-    pbCrlEncoded: *mut ::BYTE,
-    cbCrlEncoded: ::DWORD,
-    pCrlInfo: ::PCRL_INFO,
-    hCertStore: HCERTSTORE,
-}}
-pub type PCRL_CONTEXT = *mut CRL_CONTEXT;
-pub type PCCRL_CONTEXT = *const CRL_CONTEXT;
-STRUCT!{struct CTL_CONTEXT {
-    dwMsgAndCertEncodingType: ::DWORD,
-    pbCtlEncoded: *mut ::BYTE,
-    cbCtlEncoded: ::DWORD,
-    pCtlInfo: ::PCTL_INFO,
-    hCertStore: HCERTSTORE,
-    hCryptMsg: HCRYPTMSG,
-    pbCtlContent: *mut ::BYTE,
-    cbCtlContent: ::DWORD,
-}}
-pub type PCTL_CONTEXT = *mut CTL_CONTEXT;
-pub type PCCTL_CONTEXT = *const CTL_CONTEXT;
-pub const CERT_STORE_PROV_MSG: ::DWORD = 1;
-pub const CERT_STORE_PROV_MEMORY: ::DWORD = 2;
-pub const CERT_STORE_PROV_FILE: ::DWORD = 3;
-pub const CERT_STORE_PROV_REG: ::DWORD = 4;
-pub const CERT_STORE_PROV_PKCS7: ::DWORD = 5;
-pub const CERT_STORE_PROV_SERIALIZED: ::DWORD = 6;
-pub const CERT_STORE_PROV_FILENAME_A: ::DWORD = 7;
-pub const CERT_STORE_PROV_FILENAME_W: ::DWORD = 8;
-pub const CERT_STORE_PROV_FILENAME: ::DWORD = CERT_STORE_PROV_FILENAME_W;
-pub const CERT_STORE_PROV_SYSTEM_A: ::DWORD = 9;
-pub const CERT_STORE_PROV_SYSTEM_W: ::DWORD = 10;
-pub const CERT_STORE_PROV_SYSTEM: ::DWORD = CERT_STORE_PROV_SYSTEM_W;
-pub const CERT_STORE_PROV_COLLECTION: ::DWORD = 11;
-pub const CERT_STORE_PROV_SYSTEM_REGISTRY_A: ::DWORD = 12;
-pub const CERT_STORE_PROV_SYSTEM_REGISTRY_W: ::DWORD = 13;
-pub const CERT_STORE_PROV_SYSTEM_REGISTRY: ::DWORD = CERT_STORE_PROV_SYSTEM_REGISTRY_W;
-pub const CERT_STORE_PROV_PHYSICAL_W: ::DWORD = 14;
-pub const CERT_STORE_PROV_PHYSICAL: ::DWORD = CERT_STORE_PROV_PHYSICAL_W;
-pub const CERT_STORE_PROV_SMART_CARD_W: ::DWORD = 15;
-pub const CERT_STORE_PROV_SMART_CARD: ::DWORD = CERT_STORE_PROV_SMART_CARD_W;
-pub const CERT_STORE_PROV_LDAP_W: ::DWORD = 16;
-pub const CERT_STORE_PROV_LDAP: ::DWORD = CERT_STORE_PROV_LDAP_W;
-pub const CERT_STORE_NO_CRYPT_RELEASE_FLAG: ::DWORD = 0x00000001;
-pub const CERT_STORE_SET_LOCALIZED_NAME_FLAG: ::DWORD = 0x00000002;
-pub const CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG: ::DWORD = 0x00000004;
-pub const CERT_STORE_DELETE_FLAG: ::DWORD = 0x00000010;
-pub const CERT_STORE_SHARE_STORE_FLAG: ::DWORD = 0x00000040;
-pub const CERT_STORE_SHARE_CONTEXT_FLAG: ::DWORD = 0x00000080;
-pub const CERT_STORE_MANIFOLD_FLAG: ::DWORD = 0x00000100;
-pub const CERT_STORE_ENUM_ARCHIVED_FLAG: ::DWORD = 0x00000200;
-pub const CERT_STORE_UPDATE_KEYID_FLAG: ::DWORD = 0x00000400;
-pub const CERT_STORE_BACKUP_RESTORE_FLAG: ::DWORD = 0x00000800;
-pub const CERT_STORE_READONLY_FLAG: ::DWORD = 0x00008000;
-pub const CERT_STORE_OPEN_EXISTING_FLAG: ::DWORD = 0x00004000;
-pub const CERT_STORE_CREATE_NEW_FLAG: ::DWORD = 0x00002000;
-pub const CERT_STORE_MAXIMUM_ALLOWED_FLAG: ::DWORD = 0x00001000;
-pub const CERT_SYSTEM_STORE_UNPROTECTED_FLAG: ::DWORD = 0x40000000;
-pub const CERT_SYSTEM_STORE_LOCATION_MASK: ::DWORD = 0x00FF0000;
-pub const CERT_SYSTEM_STORE_LOCATION_SHIFT: ::DWORD = 16;
-pub const CERT_SYSTEM_STORE_CURRENT_USER_ID: ::DWORD = 1;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_ID: ::DWORD = 2;
-pub const CERT_SYSTEM_STORE_CURRENT_SERVICE_ID: ::DWORD = 4;
-pub const CERT_SYSTEM_STORE_SERVICES_ID: ::DWORD = 5;
-pub const CERT_SYSTEM_STORE_USERS_ID: ::DWORD = 6;
-pub const CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY_ID: ::DWORD = 7;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID: ::DWORD = 8;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID: ::DWORD = 9;
-pub const CERT_SYSTEM_STORE_CURRENT_USER: ::DWORD = CERT_SYSTEM_STORE_CURRENT_USER_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE: ::DWORD = CERT_SYSTEM_STORE_LOCAL_MACHINE_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_CURRENT_SERVICE: ::DWORD = CERT_SYSTEM_STORE_CURRENT_SERVICE_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_SERVICES: ::DWORD = CERT_SYSTEM_STORE_SERVICES_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_USERS: ::DWORD = CERT_SYSTEM_STORE_USERS_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY: ::DWORD =
-    CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY: ::DWORD =
-    CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE: ::DWORD =
-    CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_NAME_EMAIL_TYPE: ::DWORD = 1;
-pub const CERT_NAME_RDN_TYPE: ::DWORD = 2;
-pub const CERT_NAME_ATTR_TYPE: ::DWORD = 3;
-pub const CERT_NAME_SIMPLE_DISPLAY_TYPE: ::DWORD = 4;
-pub const CERT_NAME_FRIENDLY_DISPLAY_TYPE: ::DWORD = 5;
-pub const CERT_NAME_DNS_TYPE: ::DWORD = 6;
-pub const CERT_NAME_URL_TYPE: ::DWORD = 7;
-pub const CERT_NAME_UPN_TYPE: ::DWORD = 8;
-pub const CERT_SIMPLE_NAME_STR: ::DWORD = 1;
-pub const CERT_OID_NAME_STR: ::DWORD = 2;
-pub const CERT_X500_NAME_STR: ::DWORD = 3;
-
-pub const CERT_NAME_STR_SEMICOLON_FLAG: ::DWORD = 0x40000000;
-pub const CERT_NAME_STR_NO_PLUS_FLAG: ::DWORD = 0x20000000;
-pub const CERT_NAME_STR_NO_QUOTING_FLAG: ::DWORD = 0x10000000;
-pub const CERT_NAME_STR_CRLF_FLAG: ::DWORD = 0x08000000;
-pub const CERT_NAME_STR_COMMA_FLAG: ::DWORD = 0x04000000;
-pub const CERT_NAME_STR_REVERSE_FLAG: ::DWORD = 0x02000000;
-
-pub const CERT_NAME_ISSUER_FLAG: ::DWORD = 0x1;
-pub const CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG: ::DWORD = 0x00010000;
-pub const CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG: ::DWORD = 0x00020000;
-pub const CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG: ::DWORD = 0x00040000;
-pub const CERT_NAME_STR_FORCE_UTF8_DIR_STR_FLAG: ::DWORD = 0x00080000;
-pub const CERT_DELETE_KEYSET_PROP_ID: ::DWORD = 101;
-pub const CERT_COMPARE_MASK: ::DWORD = 0xFFFF;
-pub const CERT_COMPARE_SHIFT: ::DWORD = 16;
-pub const CERT_COMPARE_ANY: ::DWORD = 0;
-pub const CERT_COMPARE_SHA1_HASH: ::DWORD = 1;
-pub const CERT_COMPARE_NAME: ::DWORD = 2;
-pub const CERT_COMPARE_ATTR: ::DWORD = 3;
-pub const CERT_COMPARE_MD5_HASH: ::DWORD = 4;
-pub const CERT_COMPARE_PROPERTY: ::DWORD = 5;
-pub const CERT_COMPARE_PUBLIC_KEY: ::DWORD = 6;
-pub const CERT_COMPARE_HASH: ::DWORD = CERT_COMPARE_SHA1_HASH;
-pub const CERT_COMPARE_NAME_STR_A: ::DWORD = 7;
-pub const CERT_COMPARE_NAME_STR_W: ::DWORD = 8;
-pub const CERT_COMPARE_KEY_SPEC: ::DWORD = 9;
-pub const CERT_COMPARE_ENHKEY_USAGE: ::DWORD = 10;
-pub const CERT_COMPARE_CTL_USAGE: ::DWORD = CERT_COMPARE_ENHKEY_USAGE;
-pub const CERT_COMPARE_SUBJECT_CERT: ::DWORD = 11;
-pub const CERT_COMPARE_ISSUER_OF: ::DWORD = 12;
-pub const CERT_COMPARE_EXISTING: ::DWORD = 13;
-pub const CERT_COMPARE_SIGNATURE_HASH: ::DWORD = 14;
-pub const CERT_COMPARE_KEY_IDENTIFIER: ::DWORD = 15;
-pub const CERT_COMPARE_CERT_ID: ::DWORD = 16;
-pub const CERT_COMPARE_CROSS_CERT_DIST_POINTS: ::DWORD = 17;
-pub const CERT_COMPARE_PUBKEY_MD5_HASH: ::DWORD = 18;
-pub const CERT_FIND_ANY: ::DWORD = CERT_COMPARE_ANY << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_SHA1_HASH: ::DWORD = CERT_COMPARE_SHA1_HASH << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_MD5_HASH: ::DWORD = CERT_COMPARE_MD5_HASH << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_SIGNATURE_HASH: ::DWORD = CERT_COMPARE_SIGNATURE_HASH << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_KEY_IDENTIFIER: ::DWORD = CERT_COMPARE_KEY_IDENTIFIER << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_HASH: ::DWORD = CERT_FIND_SHA1_HASH;
-pub const CERT_FIND_PROPERTY: ::DWORD = CERT_COMPARE_PROPERTY << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_PUBLIC_KEY: ::DWORD = CERT_COMPARE_PUBLIC_KEY << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_SUBJECT_NAME: ::DWORD = (CERT_COMPARE_NAME << CERT_COMPARE_SHIFT)
-    | CERT_INFO_SUBJECT_FLAG;
-pub const CERT_FIND_SUBJECT_ATTR: ::DWORD = (CERT_COMPARE_ATTR << CERT_COMPARE_SHIFT)
-    | CERT_INFO_SUBJECT_FLAG;
-pub const CERT_FIND_ISSUER_NAME: ::DWORD = (CERT_COMPARE_NAME << CERT_COMPARE_SHIFT)
-    | CERT_INFO_ISSUER_FLAG;
-pub const CERT_FIND_ISSUER_ATTR: ::DWORD = (CERT_COMPARE_ATTR << CERT_COMPARE_SHIFT)
-    | CERT_INFO_ISSUER_FLAG;
-pub const CERT_FIND_SUBJECT_STR_A: ::DWORD = (CERT_COMPARE_NAME_STR_A << CERT_COMPARE_SHIFT)
-    | CERT_INFO_SUBJECT_FLAG;
-pub const CERT_FIND_SUBJECT_STR_W: ::DWORD = (CERT_COMPARE_NAME_STR_W << CERT_COMPARE_SHIFT)
-    | CERT_INFO_SUBJECT_FLAG;
-pub const CERT_FIND_SUBJECT_STR: ::DWORD = CERT_FIND_SUBJECT_STR_W;
-pub const CERT_FIND_ISSUER_STR_A: ::DWORD = (CERT_COMPARE_NAME_STR_A << CERT_COMPARE_SHIFT)
-    | CERT_INFO_ISSUER_FLAG;
-pub const CERT_FIND_ISSUER_STR_W: ::DWORD = (CERT_COMPARE_NAME_STR_W << CERT_COMPARE_SHIFT)
-    | CERT_INFO_ISSUER_FLAG;
-pub const CERT_FIND_ISSUER_STR: ::DWORD = CERT_FIND_ISSUER_STR_W;
-pub const CERT_FIND_KEY_SPEC: ::DWORD = CERT_COMPARE_KEY_SPEC << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_ENHKEY_USAGE: ::DWORD = CERT_COMPARE_ENHKEY_USAGE << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_CTL_USAGE: ::DWORD = CERT_FIND_ENHKEY_USAGE;
-pub const CERT_FIND_SUBJECT_CERT: ::DWORD = CERT_COMPARE_SUBJECT_CERT << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_ISSUER_OF: ::DWORD = CERT_COMPARE_ISSUER_OF << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_EXISTING: ::DWORD = CERT_COMPARE_EXISTING << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_CERT_ID: ::DWORD = CERT_COMPARE_CERT_ID << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_CROSS_CERT_DIST_POINTS: ::DWORD = CERT_COMPARE_CROSS_CERT_DIST_POINTS
-    << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_PUBKEY_MD5_HASH: ::DWORD = CERT_COMPARE_PUBKEY_MD5_HASH << CERT_COMPARE_SHIFT;
-pub const CERT_ENCIPHER_ONLY_KEY_USAGE: ::DWORD = 0x0001;
-pub const CERT_CRL_SIGN_KEY_USAGE: ::DWORD = 0x0002;
-pub const CERT_KEY_CERT_SIGN_KEY_USAGE: ::DWORD = 0x0004;
-pub const CERT_KEY_AGREEMENT_KEY_USAGE: ::DWORD = 0x0008;
-pub const CERT_DATA_ENCIPHERMENT_KEY_USAGE: ::DWORD = 0x0010;
-pub const CERT_KEY_ENCIPHERMENT_KEY_USAGE: ::DWORD = 0x0020;
-pub const CERT_NON_REPUDIATION_KEY_USAGE: ::DWORD = 0x0040;
-pub const CERT_DIGITAL_SIGNATURE_KEY_USAGE: ::DWORD = 0x0080;
-pub const CERT_DECIPHER_ONLY_KEY_USAGE: ::DWORD = 0x8000;
-pub const CERT_STORE_ADD_NEW: ::DWORD = 1;
-pub const CERT_STORE_ADD_USE_EXISTING: ::DWORD = 2;
-pub const CERT_STORE_ADD_REPLACE_EXISTING: ::DWORD = 3;
-pub const CERT_STORE_ADD_ALWAYS: ::DWORD = 4;
-pub const CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: ::DWORD = 5;
-pub const CERT_STORE_ADD_NEWER: ::DWORD = 6;
-pub const CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: ::DWORD = 7;
-pub const CERT_STORE_SAVE_AS_STORE: ::DWORD = 1;
-pub const CERT_STORE_SAVE_AS_PKCS7: ::DWORD = 2;
-pub const CERT_STORE_SAVE_TO_FILE: ::DWORD = 1;
-pub const CERT_STORE_SAVE_TO_MEMORY: ::DWORD = 2;
-pub const CERT_STORE_SAVE_TO_FILENAME_A: ::DWORD = 3;
-pub const CERT_STORE_SAVE_TO_FILENAME_W: ::DWORD = 4;
-pub const CERT_STORE_SAVE_TO_FILENAME: ::DWORD = CERT_STORE_SAVE_TO_FILENAME_W;
-pub const CERT_CA_SUBJECT_FLAG: ::DWORD = 0x80;
-pub const CERT_END_ENTITY_SUBJECT_FLAG: ::DWORD = 0x40;
-pub const CERT_CHAIN_POLICY_BASE: ::DWORD = 1;
-pub const CERT_CHAIN_POLICY_AUTHENTICODE: ::DWORD = 2;
-pub const CERT_CHAIN_POLICY_AUTHENTICODE_TS: ::DWORD = 3;
-pub const CERT_CHAIN_POLICY_SSL: ::DWORD = 4;
-pub const CERT_CHAIN_POLICY_BASIC_CONSTRAINTS: ::DWORD = 5;
-pub const CERT_CHAIN_POLICY_NT_AUTH: ::DWORD = 6;
-pub const CERT_CHAIN_POLICY_MICROSOFT_ROOT: ::DWORD = 7;
-pub const CERT_CHAIN_REVOCATION_CHECK_END_CERT: ::DWORD = 0x10000000;
-pub const CERT_CHAIN_REVOCATION_CHECK_CHAIN: ::DWORD = 0x20000000;
-pub const CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT: ::DWORD = 0x40000000;
-pub const CERT_CHAIN_REVOCATION_CHECK_CACHE_ONLY: ::DWORD = 0x80000000;
-pub const CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT: ::DWORD = 0x08000000;
-pub const CERT_TRUST_NO_ERROR: ::DWORD = 0x00000000;
-pub const CERT_TRUST_IS_NOT_TIME_VALID: ::DWORD = 0x00000001;
-pub const CERT_TRUST_IS_NOT_TIME_NESTED: ::DWORD = 0x00000002;
-pub const CERT_TRUST_IS_REVOKED: ::DWORD = 0x00000004;
-pub const CERT_TRUST_IS_NOT_SIGNATURE_VALID: ::DWORD = 0x00000008;
-pub const CERT_TRUST_IS_NOT_VALID_FOR_USAGE: ::DWORD = 0x00000010;
-pub const CERT_TRUST_IS_UNTRUSTED_ROOT: ::DWORD = 0x00000020;
-pub const CERT_TRUST_REVOCATION_STATUS_UNKNOWN: ::DWORD = 0x00000040;
-pub const CERT_TRUST_IS_CYCLIC: ::DWORD = 0x00000080;
-
-pub const CERT_TRUST_INVALID_EXTENSION: ::DWORD = 0x00000100;
-pub const CERT_TRUST_INVALID_POLICY_CONSTRAINTS: ::DWORD = 0x00000200;
-pub const CERT_TRUST_INVALID_BASIC_CONSTRAINTS: ::DWORD = 0x00000400;
-pub const CERT_TRUST_INVALID_NAME_CONSTRAINTS: ::DWORD = 0x00000800;
-pub const CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT: ::DWORD = 0x00001000;
-pub const CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT: ::DWORD = 0x00002000;
-pub const CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT: ::DWORD = 0x00004000;
-pub const CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT: ::DWORD = 0x00008000;
-
-pub const CERT_TRUST_IS_OFFLINE_REVOCATION: ::DWORD = 0x01000000;
-pub const CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY: ::DWORD = 0x02000000;
-pub const CERT_TRUST_IS_PARTIAL_CHAIN: ::DWORD = 0x00010000;
-pub const CERT_TRUST_CTL_IS_NOT_TIME_VALID: ::DWORD = 0x00020000;
-pub const CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID: ::DWORD = 0x00040000;
-pub const CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE: ::DWORD = 0x00080000;
-pub const CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG: ::DWORD = 0x00000001;
-pub const CERT_CHAIN_POLICY_IGNORE_CTL_NOT_TIME_VALID_FLAG: ::DWORD = 0x00000002;
-pub const CERT_CHAIN_POLICY_IGNORE_NOT_TIME_NESTED_FLAG: ::DWORD = 0x00000004;
-pub const CERT_CHAIN_POLICY_IGNORE_INVALID_BASIC_CONSTRAINTS_FLAG: ::DWORD = 0x00000008;
-
-pub const CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG: ::DWORD = 0x00000010;
-pub const CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG: ::DWORD = 0x00000020;
-pub const CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG: ::DWORD = 0x00000040;
-pub const CERT_CHAIN_POLICY_IGNORE_INVALID_POLICY_FLAG: ::DWORD = 0x00000080;
-
-pub const CERT_CHAIN_POLICY_IGNORE_END_REV_UNKNOWN_FLAG: ::DWORD = 0x00000100;
-pub const CERT_CHAIN_POLICY_IGNORE_CTL_SIGNER_REV_UNKNOWN_FLAG: ::DWORD = 0x00000200;
-pub const CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG: ::DWORD = 0x00000400;
-pub const CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG: ::DWORD = 0x00000800;
-
-pub const CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS: ::DWORD =
-        CERT_CHAIN_POLICY_IGNORE_END_REV_UNKNOWN_FLAG |
-        CERT_CHAIN_POLICY_IGNORE_CTL_SIGNER_REV_UNKNOWN_FLAG |
-        CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG |
-        CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG;
-pub const CERT_TRUST_HAS_EXACT_MATCH_ISSUER: ::DWORD = 0x00000001;
-pub const CERT_TRUST_HAS_KEY_MATCH_ISSUER: ::DWORD = 0x00000002;
-pub const CERT_TRUST_HAS_NAME_MATCH_ISSUER: ::DWORD = 0x00000004;
-pub const CERT_TRUST_IS_SELF_SIGNED: ::DWORD = 0x00000008;
-pub const CERT_TRUST_HAS_PREFERRED_ISSUER: ::DWORD = 0x00000100;
-pub const CERT_TRUST_HAS_ISSUANCE_CHAIN_POLICY: ::DWORD = 0x00000200;
-pub const CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS: ::DWORD = 0x00000400;
-pub const CERT_TRUST_IS_COMPLEX_CHAIN: ::DWORD = 0x00010000;
-pub const CERT_ALT_NAME_OTHER_NAME: ::DWORD = 1;
-pub const CERT_ALT_NAME_RFC822_NAME: ::DWORD = 2;
-pub const CERT_ALT_NAME_DNS_NAME: ::DWORD = 3;
-pub const CERT_ALT_NAME_X400_ADDRESS: ::DWORD = 4;
-pub const CERT_ALT_NAME_DIRECTORY_NAME: ::DWORD = 5;
-pub const CERT_ALT_NAME_EDI_PARTY_NAME: ::DWORD = 6;
-pub const CERT_ALT_NAME_URL: ::DWORD = 7;
-pub const CERT_ALT_NAME_IP_ADDRESS: ::DWORD = 8;
-pub const CERT_ALT_NAME_REGISTERED_ID: ::DWORD = 9;
-pub const CERT_STORE_CTRL_RESYNC: ::DWORD = 1;
-pub const CERT_STORE_CTRL_NOTIFY_CHANGE: ::DWORD = 2;
-pub const CERT_STORE_CTRL_COMMIT: ::DWORD = 3;
-pub const CERT_STORE_CTRL_AUTO_RESYNC: ::DWORD = 4;
-pub const CERT_STORE_CTRL_CANCEL_NOTIFY: ::DWORD = 5;
-pub const CERT_ID_ISSUER_SERIAL_NUMBER: ::DWORD = 1;
-pub const CERT_ID_KEY_IDENTIFIER: ::DWORD = 2;
-pub const CERT_ID_SHA1_HASH: ::DWORD = 3;
-pub const CERT_KEY_PROV_HANDLE_PROP_ID: ::DWORD = 1;
-pub const CERT_KEY_PROV_INFO_PROP_ID: ::DWORD = 2;
-pub const CERT_SHA1_HASH_PROP_ID: ::DWORD = 3;
-pub const CERT_MD5_HASH_PROP_ID: ::DWORD = 4;
-pub const CERT_HASH_PROP_ID: ::DWORD = CERT_SHA1_HASH_PROP_ID;
-pub const CERT_KEY_CONTEXT_PROP_ID: ::DWORD = 5;
-pub const CERT_KEY_SPEC_PROP_ID: ::DWORD = 6;
-pub const CERT_IE30_RESERVED_PROP_ID: ::DWORD = 7;
-pub const CERT_PUBKEY_HASH_RESERVED_PROP_ID: ::DWORD = 8;
-pub const CERT_ENHKEY_USAGE_PROP_ID: ::DWORD = 9;
-pub const CERT_CTL_USAGE_PROP_ID: ::DWORD = CERT_ENHKEY_USAGE_PROP_ID;
-pub const CERT_NEXT_UPDATE_LOCATION_PROP_ID: ::DWORD = 10;
-pub const CERT_FRIENDLY_NAME_PROP_ID: ::DWORD = 11;
-pub const CERT_PVK_FILE_PROP_ID: ::DWORD = 12;
-pub const CERT_DESCRIPTION_PROP_ID: ::DWORD = 13;
-pub const CERT_ACCESS_STATE_PROP_ID: ::DWORD = 14;
-pub const CERT_SIGNATURE_HASH_PROP_ID: ::DWORD = 15;
-pub const CERT_SMART_CARD_DATA_PROP_ID: ::DWORD = 16;
-pub const CERT_EFS_PROP_ID: ::DWORD = 17;
-pub const CERT_FORTEZZA_DATA_PROP_ID: ::DWORD = 18;
-pub const CERT_ARCHIVED_PROP_ID: ::DWORD = 19;
-pub const CERT_KEY_IDENTIFIER_PROP_ID: ::DWORD = 20;
-pub const CERT_AUTO_ENROLL_PROP_ID: ::DWORD = 21;
-pub const CERT_PUBKEY_ALG_PARA_PROP_ID: ::DWORD = 22;
-pub const CERT_CROSS_CERT_DIST_POINTS_PROP_ID: ::DWORD = 23;
-pub const CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID: ::DWORD = 24;
-pub const CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: ::DWORD = 25;
-pub const CERT_ENROLLMENT_PROP_ID: ::DWORD = 26;
-pub const CERT_DATE_STAMP_PROP_ID: ::DWORD = 27;
-pub const CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID: ::DWORD = 28;
-pub const CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: ::DWORD = 29;
-pub const CERT_EXTENDED_ERROR_INFO_PROP_ID: ::DWORD = 30;
-pub const CERT_RENEWAL_PROP_ID: ::DWORD = 64;
-pub const CERT_ARCHIVED_KEY_HASH_PROP_ID: ::DWORD = 65;
-pub const CERT_AUTO_ENROLL_RETRY_PROP_ID: ::DWORD = 66;
-pub const CERT_AIA_URL_RETRIEVED_PROP_ID: ::DWORD = 67;
-pub const CERT_AUTHORITY_INFO_ACCESS_PROP_ID: ::DWORD = 68;
-pub const CERT_BACKED_UP_PROP_ID: ::DWORD = 69;
-pub const CERT_OCSP_RESPONSE_PROP_ID: ::DWORD = 70;
-pub const CERT_REQUEST_ORIGINATOR_PROP_ID: ::DWORD = 71;
-pub const CERT_SOURCE_LOCATION_PROP_ID: ::DWORD = 72;
-pub const CERT_SOURCE_URL_PROP_ID: ::DWORD = 73;
-pub const CERT_NEW_KEY_PROP_ID: ::DWORD = 74;
-pub const CERT_OCSP_CACHE_PREFIX_PROP_ID: ::DWORD = 75;
-pub const CERT_SMART_CARD_ROOT_INFO_PROP_ID: ::DWORD = 76;
-pub const CERT_NO_AUTO_EXPIRE_CHECK_PROP_ID: ::DWORD = 77;
-pub const CERT_NCRYPT_KEY_HANDLE_PROP_ID: ::DWORD = 78;
-pub const CERT_HCRYPTPROV_OR_NCRYPT_KEY_HANDLE_PROP_ID: ::DWORD = 79;
-pub const CERT_SUBJECT_INFO_ACCESS_PROP_ID: ::DWORD = 80;
-pub const CERT_CA_OCSP_AUTHORITY_INFO_ACCESS_PROP_ID: ::DWORD = 81;
-pub const CERT_CA_DISABLE_CRL_PROP_ID: ::DWORD = 82;
-pub const CERT_ROOT_PROGRAM_CERT_POLICIES_PROP_ID: ::DWORD = 83;
-pub const CERT_ROOT_PROGRAM_NAME_CONSTRAINTS_PROP_ID: ::DWORD = 84;
-pub const CERT_SUBJECT_OCSP_AUTHORITY_INFO_ACCESS_PROP_ID: ::DWORD = 85;
-pub const CERT_SUBJECT_DISABLE_CRL_PROP_ID: ::DWORD = 86;
-pub const CERT_CEP_PROP_ID: ::DWORD = 87;
-pub const CERT_SIGN_HASH_CNG_ALG_PROP_ID: ::DWORD = 89;
-pub const CERT_SCARD_PIN_ID_PROP_ID: ::DWORD = 90;
-pub const CERT_SCARD_PIN_INFO_PROP_ID: ::DWORD = 91;
-pub const CERT_SUBJECT_PUB_KEY_BIT_LENGTH_PROP_ID: ::DWORD = 92;
-pub const CERT_PUB_KEY_CNG_ALG_BIT_LENGTH_PROP_ID: ::DWORD = 93;
-pub const CERT_ISSUER_PUB_KEY_BIT_LENGTH_PROP_ID: ::DWORD = 94;
-pub const CERT_ISSUER_CHAIN_SIGN_HASH_CNG_ALG_PROP_ID: ::DWORD = 95;
-pub const CERT_ISSUER_CHAIN_PUB_KEY_CNG_ALG_BIT_LENGTH_PROP_ID: ::DWORD = 96;
-pub const CERT_NO_EXPIRE_NOTIFICATION_PROP_ID: ::DWORD = 97;
-pub const CERT_AUTH_ROOT_SHA256_HASH_PROP_ID: ::DWORD = 98;
-pub const CERT_NCRYPT_KEY_HANDLE_TRANSFER_PROP_ID: ::DWORD = 99;
-pub const CERT_HCRYPTPROV_TRANSFER_PROP_ID: ::DWORD = 100;
-pub const CERT_SMART_CARD_READER_PROP_ID: ::DWORD = 101;
-pub const CERT_SEND_AS_TRUSTED_ISSUER_PROP_ID: ::DWORD = 102;
-pub const CERT_KEY_REPAIR_ATTEMPTED_PROP_ID: ::DWORD = 103;
-pub const CERT_DISALLOWED_FILETIME_PROP_ID: ::DWORD = 104;
-pub const CERT_ROOT_PROGRAM_CHAIN_POLICIES_PROP_ID: ::DWORD = 105;
-pub const CERT_SMART_CARD_READER_NON_REMOVABLE_PROP_ID: ::DWORD = 106;
-pub const CERT_SHA256_HASH_PROP_ID: ::DWORD = 107;
-pub const CERT_SCEP_SERVER_CERTS_PROP_ID: ::DWORD = 108;
-pub const CERT_SCEP_RA_SIGNATURE_CERT_PROP_ID: ::DWORD = 109;
-pub const CERT_SCEP_RA_ENCRYPTION_CERT_PROP_ID: ::DWORD = 110;
-pub const CERT_SCEP_CA_CERT_PROP_ID: ::DWORD = 111;
-pub const CERT_SCEP_SIGNER_CERT_PROP_ID: ::DWORD = 112;
-pub const CERT_SCEP_NONCE_PROP_ID: ::DWORD = 113;
-pub const CERT_SCEP_ENCRYPT_HASH_CNG_ALG_PROP_ID: ::DWORD = 114;
-pub const CERT_SCEP_FLAGS_PROP_ID: ::DWORD = 115;
-pub const CERT_SCEP_GUID_PROP_ID: ::DWORD = 116;
-pub const CERT_SERIALIZABLE_KEY_CONTEXT_PROP_ID: ::DWORD = 117;
-pub const CERT_ISOLATED_KEY_PROP_ID: ::DWORD = 118;
-pub const CERT_FIRST_RESERVED_PROP_ID: ::DWORD = 119;
-pub const CERT_LAST_RESERVED_PROP_ID: ::DWORD = 0x00007FFF;
-pub const CERT_FIRST_USER_PROP_ID: ::DWORD = 0x00008000;
-pub const CERT_LAST_USER_PROP_ID: ::DWORD = 0x0000FFFF;
-pub const szOID_CERT_PROP_ID_PREFIX: &'static str = "1.3.6.1.4.1.311.10.11.";
-pub const szOID_CERT_KEY_IDENTIFIER_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.20";
-pub const szOID_CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID: &'static str
-    = "1.3.6.1.4.1.311.10.11.28";
-pub const szOID_CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.29";
-pub const szOID_CERT_MD5_HASH_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.4";
-pub const szOID_CERT_SIGNATURE_HASH_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.15";
-pub const szOID_DISALLOWED_HASH: &'static str = szOID_CERT_SIGNATURE_HASH_PROP_ID;
-pub const szOID_CERT_DISALLOWED_FILETIME_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.104";
-pub const CERT_ACCESS_STATE_WRITE_PERSIST_FLAG: ::DWORD = 0x1;
-pub const CERT_ACCESS_STATE_SYSTEM_STORE_FLAG: ::DWORD = 0x2;
-pub const CERT_ACCESS_STATE_LM_SYSTEM_STORE_FLAG: ::DWORD = 0x4;
-pub const CERT_ACCESS_STATE_GP_SYSTEM_STORE_FLAG: ::DWORD = 0x8;
-pub const CERT_ACCESS_STATE_SHARED_USER_FLAG: ::DWORD = 0x10;
-pub const szOID_ROOT_PROGRAM_AUTO_UPDATE_CA_REVOCATION: &'static str = "1.3.6.1.4.1.311.60.3.1";
-pub const szOID_ROOT_PROGRAM_AUTO_UPDATE_END_REVOCATION: &'static str = "1.3.6.1.4.1.311.60.3.2";
-pub const szOID_ROOT_PROGRAM_NO_OCSP_FAILOVER_TO_CRL: &'static str = "1.3.6.1.4.1.311.60.3.3";
-STRUCT!{struct CRYPT_KEY_PROV_PARAM {
-    dwParam: ::DWORD,
-    pbData: *mut ::BYTE,
-    cbData: ::DWORD,
-    dwFlags: ::DWORD,
-}}
-pub type PCRYPT_KEY_PROV_PARAM = *mut CRYPT_KEY_PROV_PARAM;
-STRUCT!{struct CRYPT_KEY_PROV_INFO {
-    pwszContainerName: ::LPWSTR,
-    pwszProvName: ::LPWSTR,
-    dwProvType: ::DWORD,
-    dwFlags: ::DWORD,
-    cProvParam: ::DWORD,
-    rgProvParam: PCRYPT_KEY_PROV_PARAM,
-    dwKeySpec: ::DWORD,
-}}
-pub type PCRYPT_KEY_PROV_INFO = *mut CRYPT_KEY_PROV_INFO;
-pub const CERT_SET_KEY_PROV_HANDLE_PROP_ID: ::DWORD = 0x00000001;
-pub const CERT_SET_KEY_CONTEXT_PROP_ID: ::DWORD = 0x00000001;
-pub const CERT_NCRYPT_KEY_SPEC: ::DWORD = 0xFFFFFFFF;
-//20213
-pub type HCERT_SERVER_OCSP_RESPONSE = *mut ::c_void;
-STRUCT!{struct CERT_SERVER_OCSP_RESPONSE_CONTEXT {
-    cbSize: ::DWORD,
-    pbEncodedOcspResponse: *mut ::BYTE,
-    cbEncodedOcspResponse: ::DWORD,
-}}
-pub type PCERT_SERVER_OCSP_RESPONSE_CONTEXT = *mut CERT_SERVER_OCSP_RESPONSE_CONTEXT;
-pub type PCCERT_SERVER_OCSP_RESPONSE_CONTEXT = *const CERT_SERVER_OCSP_RESPONSE_CONTEXT;
-
-pub const CERT_CHAIN_CACHE_END_CERT: ::DWORD = 0x00000001;
-pub const CERT_CHAIN_THREAD_STORE_SYNC: ::DWORD = 0x00000002;
-pub const CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL: ::DWORD = 0x00000004;
-pub const CERT_CHAIN_USE_LOCAL_MACHINE_STORE: ::DWORD = 0x00000008;
-pub const CERT_CHAIN_ENABLE_CACHE_AUTO_UPDATE: ::DWORD = 0x00000010;
-pub const CERT_CHAIN_ENABLE_SHARE_STORE: ::DWORD = 0x00000020;
-
-STRUCT!{struct CERT_CHAIN_ENGINE_CONFIG {
-    cbSize: ::DWORD,
-    hRestrictedRoot: HCERTSTORE,
-    hRestrictedTrust: HCERTSTORE,
-    hRestrictedOther: HCERTSTORE,
-    cAdditionalStore: ::DWORD,
-    rghAdditionalStore: *mut HCERTSTORE,
-    dwFlags: ::DWORD,
-    dwUrlRetrievalTimeout: ::DWORD,
-    MaximumCachedCertificates: ::DWORD,
-    CycleDetectionModulus: ::DWORD,
-    // #if (NTDDI_VERSION >= NTDDI_WIN7)
-    hExclusiveRoot: HCERTSTORE,
-    hExclusiveTrustedPeople: HCERTSTORE,
-    // #if (NTDDI_VERSION >= NTDDI_WIN8)
-    dwExclusiveFlags: ::DWORD,
-}}
-pub type PCERT_CHAIN_ENGINE_CONFIG = *mut CERT_CHAIN_ENGINE_CONFIG;
-// 18748
-pub type HCERTCHAINENGINE = ::HANDLE;
-pub type PFN_CERT_CREATE_CONTEXT_SORT_FUNC = Option<unsafe extern "system" fn(
-    cbTotalEncoded: ::DWORD, cbRemainEncoded: ::DWORD, cEntry: ::DWORD, pvSort: *mut ::c_void
-) -> ::BOOL>;
-STRUCT!{nodebug struct CERT_CREATE_CONTEXT_PARA {
-    cbSize: ::DWORD,
-    pfnFree: PFN_CRYPT_FREE,
-    pvFree: *mut ::c_void,
-    pfnSort: PFN_CERT_CREATE_CONTEXT_SORT_FUNC,
-    pvSort: *mut ::c_void,
-}}
-pub type PCERT_CREATE_CONTEXT_PARA = *mut CERT_CREATE_CONTEXT_PARA;
-STRUCT!{struct CERT_EXTENSIONS {
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCERT_EXTENSIONS = *mut CERT_EXTENSIONS;
-STRUCT!{struct CERT_REVOCATION_CRL_INFO {
-    cbSize: ::DWORD,
-    pBaseCrlContext: PCCRL_CONTEXT,
-    pDeltaCrlContext: PCCRL_CONTEXT,
-    pCrlEntry: PCRL_ENTRY,
-    fDeltaCrlEntry: ::BOOL,
-}}
-pub type PCERT_REVOCATION_CRL_INFO = *mut CERT_REVOCATION_CRL_INFO;
-STRUCT!{struct CERT_TRUST_STATUS {
-    dwErrorStatus: ::DWORD,
-    dwInfoStatus: ::DWORD,
-}}
-pub type PCERT_TRUST_STATUS = *mut CERT_TRUST_STATUS;
-STRUCT!{struct CERT_REVOCATION_INFO {
-    cbSize: ::DWORD,
-    dwRevocationResult: ::DWORD,
-    pszRevocationOid: ::LPCSTR,
-    pvOidSpecificInfo: ::LPVOID,
-    fHasFreshnessTime: ::BOOL,
-    dwFreshnessTime: ::DWORD,
-    pCrlInfo: PCERT_REVOCATION_CRL_INFO,
-}}
-pub type PCERT_REVOCATION_INFO = *mut CERT_REVOCATION_INFO;
-STRUCT!{struct CERT_TRUST_LIST_INFO {
-    cbSize: ::DWORD,
-    pCtlEntry: PCTL_ENTRY,
-    pCtlContext: PCCTL_CONTEXT,
-}}
-pub type PCERT_TRUST_LIST_INFO = *mut CERT_TRUST_LIST_INFO;
-STRUCT!{struct CERT_CHAIN_ELEMENT {
-    cbSize: ::DWORD,
-    pCertContext: PCCERT_CONTEXT,
-    TrustStatus: CERT_TRUST_STATUS,
-    pRevocationInfo: PCERT_REVOCATION_INFO,
-    pIssuanceUsage: PCERT_ENHKEY_USAGE,
-    pApplicationUsage: PCERT_ENHKEY_USAGE,
-    pwszExtendedErrorInfo: ::LPWSTR,
-}}
-pub type PCERT_CHAIN_ELEMENT = *mut CERT_CHAIN_ELEMENT;
-pub type PCCERT_CHAIN_ELEMENT = *const CERT_CHAIN_ELEMENT;
-STRUCT!{struct CERT_SIMPLE_CHAIN {
-    cbSize: ::DWORD,
-    TrustStatus: CERT_TRUST_STATUS,
-    cElement: ::DWORD,
-    rgpElement: *mut PCERT_CHAIN_ELEMENT,
-    pTrustListInfo: PCERT_TRUST_LIST_INFO,
-    fHasRevocationFreshnessTime: ::BOOL,
-    dwRevocationFreshnessTime: ::DWORD,
-}}
-pub type PCERT_SIMPLE_CHAIN = *mut CERT_SIMPLE_CHAIN;
-pub type PCCERT_SIMPLE_CHAIN = *const CERT_SIMPLE_CHAIN;
-STRUCT!{struct CERT_CHAIN_CONTEXT {
-    cbSize: ::DWORD,
-    TrustStatus: CERT_TRUST_STATUS,
-    cChain: ::DWORD,
-    rgpChain: *mut PCERT_SIMPLE_CHAIN,
-    cLowerQualityChainContext: ::DWORD,
-    rgpLowerQualityChainContext: *mut PCCERT_CHAIN_CONTEXT,
-    fHasRevocationFreshnessTime: ::BOOL,
-    dwRevocationFreshnessTime: ::DWORD,
-    dwCreateFlags: ::DWORD,
-    ChainId: ::GUID,
-}}
-pub type PCERT_CHAIN_CONTEXT = *mut CERT_CHAIN_CONTEXT;
-pub type PCCERT_CHAIN_CONTEXT = *const CERT_CHAIN_CONTEXT;
-STRUCT!{struct CERT_PHYSICAL_STORE_INFO {
-    cbSize: ::DWORD,
-    pszOpenStoreProvider: ::LPSTR,
-    dwOpenEncodingType: ::DWORD,
-    dwOpenFlags: ::DWORD,
-    OpenParameters: CRYPT_DATA_BLOB,
-    dwFlags: ::DWORD,
-    dwPriority: ::DWORD,
-}}
-pub type PCERT_PHYSICAL_STORE_INFO = *mut CERT_PHYSICAL_STORE_INFO;
-STRUCT!{struct CERT_SYSTEM_STORE_INFO {
-    cbSize: ::DWORD,
-}}
-pub type PCERT_SYSTEM_STORE_INFO = *mut CERT_SYSTEM_STORE_INFO;
-//13401
-pub type PFN_CERT_ENUM_SYSTEM_STORE_LOCATION = Option<unsafe extern "system" fn(
-    pwszStoreLocation: ::LPCWSTR, dwFlags: ::DWORD, pvReserved: *mut ::c_void, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-//13408
-pub type PFN_CERT_ENUM_SYSTEM_STORE = Option<unsafe extern "system" fn(
-    pvSystemStore: *const ::c_void, dwFlags: ::DWORD, pStoreInfo: PCERT_SYSTEM_STORE_INFO,
-    pvReserved: *mut ::c_void, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-//13416
-pub type PFN_CERT_ENUM_PHYSICAL_STORE = Option<unsafe extern "system" fn(
-    pvSystemStore: *const ::c_void, dwFlags: ::DWORD, pwszStoreName: ::LPCWSTR,
-    pStoreInfo: PCERT_PHYSICAL_STORE_INFO, pvReserved: *mut ::c_void, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-STRUCT!{struct CERT_STRONG_SIGN_SERIALIZED_INFO {
-    dwFlags: ::DWORD,
-    pwszCNGSignHashAlgids: ::LPWSTR,
-    pwszCNGPubKeyMinBitLengths: ::LPWSTR,
-}}
-pub type PCERT_STRONG_SIGN_SERIALIZED_INFO = *mut CERT_STRONG_SIGN_SERIALIZED_INFO;
-STRUCT!{struct CERT_STRONG_SIGN_PARA {
-    cbSize: ::DWORD,
-    dwInfoChoice: ::DWORD,
-    pvInfo: *mut ::c_void,
-}}
-UNION!(
-    CERT_STRONG_SIGN_PARA, pvInfo, pSerializedInfo, pSerializedInfo_mut,
-    PCERT_STRONG_SIGN_SERIALIZED_INFO
-);
-UNION!(CERT_STRONG_SIGN_PARA, pvInfo, pszOID, pszOID_mut, ::LPSTR);
-pub type PCERT_STRONG_SIGN_PARA = *mut CERT_STRONG_SIGN_PARA;
-pub type PCCERT_STRONG_SIGN_PARA = *const CERT_STRONG_SIGN_PARA;
-pub const USAGE_MATCH_TYPE_AND: ::DWORD = 0x00000000;
-pub const USAGE_MATCH_TYPE_OR: ::DWORD = 0x00000001;
-STRUCT!{struct CERT_USAGE_MATCH {
-    dwType: ::DWORD,
-    Usage: CERT_ENHKEY_USAGE,
-}}
-pub type PCERT_USAGE_MATCH = *mut CERT_USAGE_MATCH;
-STRUCT!{struct CERT_CHAIN_PARA {
-    cbSize: ::DWORD,
-    RequestedUsage: CERT_USAGE_MATCH,
-    RequestedIssuancePolicy: CERT_USAGE_MATCH,
-    dwUrlRetrievalTimeout: ::DWORD,
-    fCheckRevocationFreshnessTime: ::BOOL,
-    dwRevocationFreshnessTime: ::DWORD,
-    pftCacheResync: ::LPFILETIME,
-    pStrongSignPara: PCCERT_STRONG_SIGN_PARA,
-    dwStrongSignFlags: ::DWORD,
-}}
-pub type PCERT_CHAIN_PARA = *mut CERT_CHAIN_PARA;
-STRUCT!{struct CERT_SELECT_CHAIN_PARA {
-    hChainEngine: HCERTCHAINENGINE,
-    pTime: ::PFILETIME,
-    hAdditionalStore: HCERTSTORE,
-    pChainPara: PCERT_CHAIN_PARA,
-    dwFlags: ::DWORD,
-}}
-pub type PCERT_SELECT_CHAIN_PARA = *mut CERT_SELECT_CHAIN_PARA;
-pub type PCCERT_SELECT_CHAIN_PARA = *const CERT_SELECT_CHAIN_PARA;
-STRUCT!{struct CERT_SELECT_CRITERIA {
-    dwType: ::DWORD,
-    cPara: ::DWORD,
-    ppPara: *mut *mut ::c_void,
-}}
-pub type PCERT_SELECT_CRITERIA = *mut CERT_SELECT_CRITERIA;
-pub type PCCERT_SELECT_CRITERIA = *const CERT_SELECT_CRITERIA;
-STRUCT!{struct CTL_VERIFY_USAGE_PARA {
-    cbSize: ::DWORD,
-    ListIdentifier: CRYPT_DATA_BLOB,
-    cCtlStore: ::DWORD,
-    rghCtlStore: *mut HCERTSTORE,
-    cSignerStore: ::DWORD,
-    rghSignerStore: *mut HCERTSTORE,
-}}
-pub type PCTL_VERIFY_USAGE_PARA = *mut CTL_VERIFY_USAGE_PARA;
-STRUCT!{struct CTL_VERIFY_USAGE_STATUS {
-    cbSize: ::DWORD,
-    dwError: ::DWORD,
-    dwFlags: ::DWORD,
-    ppCtl: *mut PCCTL_CONTEXT,
-    dwCtlEntryIndex: ::DWORD,
-    ppSigner: *mut PCCERT_CONTEXT,
-    dwSignerIndex: ::DWORD,
-}}
-pub type PCTL_VERIFY_USAGE_STATUS = *mut CTL_VERIFY_USAGE_STATUS;
-STRUCT!{struct CERT_CHAIN_POLICY_PARA {
-    cbSize: ::DWORD,
-    dwFlags: ::DWORD,
-    pvExtraPolicyPara: *mut ::c_void,
-}}
-pub type PCERT_CHAIN_POLICY_PARA = *mut CERT_CHAIN_POLICY_PARA;
-STRUCT!{struct CERT_CHAIN_POLICY_STATUS {
-    cbSize: ::DWORD,
-    dwError: ::DWORD,
-    lChainIndex: ::LONG,
-    lElementIndex: ::LONG,
-    pvExtraPolicyStatus: *mut ::c_void,
-}}
-pub type PCERT_CHAIN_POLICY_STATUS = *mut CERT_CHAIN_POLICY_STATUS;
-STRUCT!{struct CERT_REVOCATION_CHAIN_PARA {
-    cbSize: ::DWORD,
-    hChainEngine: HCERTCHAINENGINE,
-    hAdditionalStore: HCERTSTORE,
-    dwChainFlags: ::DWORD,
-    dwUrlRetrievalTimeout: ::DWORD,
-    pftCurrentTime: ::LPFILETIME,
-    pftCacheResync: ::LPFILETIME,
-}}
-pub type PCERT_REVOCATION_CHAIN_PARA = *mut CERT_REVOCATION_CHAIN_PARA;
-STRUCT!{struct CERT_REVOCATION_PARA {
-    cbSize: ::DWORD,
-    pIssuerCert: PCCERT_CONTEXT,
-    cCertStore: ::DWORD,
-    rgCertStore: *mut HCERTSTORE,
-    hCrlStore: HCERTSTORE,
-    pftTimeToUse: ::LPFILETIME,
-    dwUrlRetrievalTimeout: ::DWORD,
-    fCheckFreshnessTime: ::BOOL,
-    dwFreshnessTime: ::DWORD,
-    pftCurrentTime: ::LPFILETIME,
-    pCrlInfo: PCERT_REVOCATION_CRL_INFO,
-    pftCacheResync: ::LPFILETIME,
-    pChainPara: PCERT_REVOCATION_CHAIN_PARA,
-}}
-pub type PCERT_REVOCATION_PARA = *mut CERT_REVOCATION_PARA;
-STRUCT!{struct CERT_REVOCATION_STATUS {
-    cbSize: ::DWORD,
-    dwIndex: ::DWORD,
-    dwError: ::DWORD,
-    dwReason: ::DWORD,
-    fHasFreshnessTime: ::BOOL,
-    dwFreshnessTime: ::DWORD,
-}}
-pub type PCERT_REVOCATION_STATUS = *mut CERT_REVOCATION_STATUS;
-//16990
-pub type HCRYPTASYNC = ::HANDLE;
-pub type PHCRYPTASYNC = *mut ::HANDLE;
-STRUCT!{struct CRYPT_ENCRYPT_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV_LEGACY,
-    ContentEncryptionAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvEncryptionAuxInfo: *mut ::c_void,
-    dwFlags: ::DWORD,
-    dwInnerContentType: ::DWORD,
-}}
-pub type PCRYPT_ENCRYPT_MESSAGE_PARA = *mut CRYPT_DECRYPT_MESSAGE_PARA;
-STRUCT!{struct CRYPT_DECRYPT_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgAndCertEncodingType: ::DWORD,
-    cCertStore: ::DWORD,
-    rghCertStore: *mut HCERTSTORE,
-    dwFlags: ::DWORD,
-}}
-pub type PCRYPT_DECRYPT_MESSAGE_PARA = *mut CRYPT_DECRYPT_MESSAGE_PARA;
-pub type PFN_CRYPT_GET_SIGNER_CERTIFICATE = Option<unsafe extern "system" fn(
-    pvGetArg: *mut ::c_void, dwCertEncodingType: ::DWORD, pSignerId: PCERT_INFO,
-    hMsgCertStore: HCERTSTORE,
-) -> PCCERT_CONTEXT>;
-STRUCT!{nodebug struct CRYPT_VERIFY_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgAndCertEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV_LEGACY,
-    pfnGetSignerCertificate: PFN_CRYPT_GET_SIGNER_CERTIFICATE,
-    pvGetArg: *mut ::c_void,
-    pStrongSignPara: PCCERT_STRONG_SIGN_PARA,
-}}
-pub type PCRYPT_VERIFY_MESSAGE_PARA = *mut CRYPT_VERIFY_MESSAGE_PARA;
-STRUCT!{struct CRYPT_OID_INFO {
-    cbSize: ::DWORD,
-    oszOID: ::LPCSTR,
-    pwszName: ::LPCWSTR,
-    dwGroupId: ::DWORD,
-    dwValue: ::DWORD,
-    ExtraInfo: CRYPT_DATA_BLOB,
-    pwszCNGAlgid: ::LPCWSTR,
-    pwszCNGExtraAlgid: ::LPCWSTR,
-}}
-UNION!(CRYPT_OID_INFO, dwValue, Algid, Algid_mut, ALG_ID);
-UNION!(CRYPT_OID_INFO, dwValue, dwLength, dwLength_mut, ::DWORD);
-pub type PCRYPT_OID_INFO = *mut CRYPT_OID_INFO;
-pub type PCCRYPT_OID_INFO = *const CRYPT_OID_INFO;
-//18004
-pub type PFN_CRYPT_ENUM_KEYID_PROP = Option<unsafe extern "system" fn(
-    pKeyIdentifier: *const CRYPT_HASH_BLOB, dwFlags: ::DWORD, pvReserved: *mut ::c_void,
-    pvArg: *mut ::c_void, cProp: ::DWORD, rgdwPropId: *mut ::DWORD, rgpvData: *mut *mut ::c_void,
-    rgcbData: *mut ::DWORD,
-) -> ::BOOL>;
-//6379
-pub type PFN_CRYPT_ENUM_OID_FUNC = Option<unsafe extern "system" fn(
-    dwEncodingType: ::DWORD, pszFuncName: ::LPCSTR, pszOID: ::LPCSTR, cValue: ::DWORD,
-    rgdwValueType: *const ::DWORD, rgpwszValueName: *const ::LPCWSTR,
-    rgpbValueData: *const *const ::BYTE, rgcbValueData: *const ::DWORD, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-//6675
-pub type PFN_CRYPT_ENUM_OID_INFO = Option<unsafe extern "system" fn(
-    pInfo: PCCRYPT_OID_INFO, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-//6022
-pub type HCRYPTOIDFUNCSET = *mut ::c_void;
-pub type HCRYPTOIDFUNCADDR = *mut ::c_void;
-pub type PFN_CRYPT_ASYNC_PARAM_FREE_FUNC = Option<unsafe extern "system" fn(
-    pszParamOid: ::LPSTR, pvParam: ::LPVOID,
-)>;
-STRUCT!{struct CRYPT_HASH_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV_LEGACY,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvHashAuxInfo: *mut ::c_void,
-}}
-pub type PCRYPT_HASH_MESSAGE_PARA = *mut CRYPT_HASH_MESSAGE_PARA;
-//14750
-pub type HCRYPTDEFAULTCONTEXT = *mut ::c_void;
-STRUCT!{struct CRYPT_OID_FUNC_ENTRY {
-    pszOID: ::LPCSTR,
-    pvFuncAddr: *mut ::c_void,
-}}
-pub type PCRYPT_OID_FUNC_ENTRY = *mut CRYPT_OID_FUNC_ENTRY;
-STRUCT!{struct CMSG_SIGNER_ENCODE_INFO {
-    cbSize: ::DWORD,
-    pCertInfo: PCERT_INFO,
-    hCryptProv: HCRYPTPROV,
-    dwKeySpec: ::DWORD,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvHashAuxInfo: *mut ::c_void,
-    cAuthAttr: ::DWORD,
-    rgAuthAttr: PCRYPT_ATTRIBUTE,
-    cUnauthAttr: ::DWORD,
-    rgUnauthAttr: PCRYPT_ATTRIBUTE,
-}}
-UNION!(CMSG_SIGNER_ENCODE_INFO, hCryptProv, hNCryptKey, hNCryptKey_mut, ::NCRYPT_KEY_HANDLE);
-pub type PCMSG_SIGNER_ENCODE_INFO = *mut CMSG_SIGNER_ENCODE_INFO;
-STRUCT!{struct CMSG_SIGNED_ENCODE_INFO {
-    cbSize: ::DWORD,
-    cSigners: ::DWORD,
-    rgSigners: PCMSG_SIGNER_ENCODE_INFO,
-    cCertEncoded: ::DWORD,
-    rgCertEncoded: PCERT_BLOB,
-    cCrlEncoded: ::DWORD,
-    rgCrlEncoded: PCRL_BLOB,
-}}
-pub type PCMSG_SIGNED_ENCODE_INFO = *mut CMSG_SIGNED_ENCODE_INFO;
-//7393
-pub type PFN_CMSG_STREAM_OUTPUT = Option<unsafe extern "system" fn(
-    pvArg: *const ::c_void, pbData: *mut ::BYTE, cbData: ::DWORD, fFinal: ::BOOL,
-) -> ::BOOL>;
-STRUCT!{nodebug struct CMSG_STREAM_INFO {
-    cbContent: ::DWORD,
-    pfnStreamOutput: PFN_CMSG_STREAM_OUTPUT,
-    pvArg: *mut ::c_void,
-}}
-pub type PCMSG_STREAM_INFO = *mut CMSG_STREAM_INFO;
-STRUCT!{struct CRYPT_TIMESTAMP_ACCURACY {
-    dwSeconds: ::DWORD,
-    dwMillis: ::DWORD,
-    dwMicros: ::DWORD,
-}}
-pub type PCRYPT_TIMESTAMP_ACCURACY = *mut CRYPT_TIMESTAMP_ACCURACY;
-STRUCT!{struct CRYPT_TIMESTAMP_INFO {
-    dwVersion: ::DWORD,
-    pszTSAPolicyId: ::LPSTR,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    HashedMessage: CRYPT_DER_BLOB,
-    SerialNumber: CRYPT_INTEGER_BLOB,
-    ftTime: ::FILETIME,
-    pvAccuracy: PCRYPT_TIMESTAMP_ACCURACY,
-    fOrdering: ::BOOL,
-    Nonce: CRYPT_DER_BLOB,
-    Tsa: CRYPT_DER_BLOB,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCRYPT_TIMESTAMP_INFO = *mut CRYPT_TIMESTAMP_INFO;
-STRUCT!{struct CRYPT_TIMESTAMP_CONTEXT {
-    cbEncoded: ::DWORD,
-    pbEncoded: *mut ::BYTE,
-    pTimeStamp: PCRYPT_TIMESTAMP_INFO,
-}}
-pub type PCRYPT_TIMESTAMP_CONTEXT = *mut CRYPT_TIMESTAMP_CONTEXT;
-STRUCT!{struct CRYPT_TIMESTAMP_PARA {
-    pszTSAPolicyId: ::LPCSTR,
-    fRequestCerts: ::BOOL,
-    Nonce: CRYPT_INTEGER_BLOB,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCRYPT_TIMESTAMP_PARA = *mut CRYPT_TIMESTAMP_PARA;
-STRUCT!{struct CRYPT_SIGN_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgEncodingType: ::DWORD,
-    pSigningCert: PCCERT_CONTEXT,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvHashAuxInfo: *mut ::c_void,
-    cMsgCert: ::DWORD,
-    rgpMsgCert: *mut PCCERT_CONTEXT,
-    cMsgCrl: ::DWORD,
-    rgpMsgCrl: *mut PCCRL_CONTEXT,
-    cAuthAttr: ::DWORD,
-    rgAuthAttr: PCRYPT_ATTRIBUTE,
-    cUnauthAttr: ::DWORD,
-    rgUnauthAttr: PCRYPT_ATTRIBUTE,
-    dwFlags: ::DWORD,
-    dwInnerContentType: ::DWORD,
-}}
-pub type PCRYPT_SIGN_MESSAGE_PARA = *mut CRYPT_SIGN_MESSAGE_PARA;
-STRUCT!{struct CRYPT_KEY_SIGN_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgAndCertEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV,
-    dwKeySpec: ::DWORD,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvHashAuxInfo: *mut ::c_void,
-    PubKeyAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-}}
-UNION!(CRYPT_KEY_SIGN_MESSAGE_PARA, hCryptProv, hNCryptKey, hNCryptKey_mut, ::NCRYPT_KEY_HANDLE);
-pub type PCRYPT_KEY_SIGN_MESSAGE_PARA = *mut CRYPT_KEY_SIGN_MESSAGE_PARA;
-STRUCT!{struct CRYPT_KEY_VERIFY_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV_LEGACY,
-}}
-pub type PCRYPT_KEY_VERIFY_MESSAGE_PARA = *mut CRYPT_KEY_VERIFY_MESSAGE_PARA;
-STRUCT!{struct HTTPSPolicyCallbackData {
-	cbSize: ::DWORD,
-	dwAuthType: ::DWORD,
-	fdwChecks: ::DWORD,
-	pwszServerName: *mut ::WCHAR,
-}}
-pub type PHTTPSPolicyCallbackData = *mut HTTPSPolicyCallbackData;
-pub type SSL_EXTRA_CERT_CHAIN_POLICY_PARA = HTTPSPolicyCallbackData;
-pub type PSSL_EXTRA_CERT_CHAIN_POLICY_PARA = *mut HTTPSPolicyCallbackData;
-pub const AUTHTYPE_CLIENT: ::DWORD = 1;
-pub const AUTHTYPE_SERVER: ::DWORD = 2;
-pub const CTL_ENTRY_FROM_PROP_CHAIN_FLAG: ::DWORD = 0x1;
-pub const CMSG_ENCODE_SORTED_CTL_FLAG: ::DWORD = 0x1;
-pub const CMSG_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG: ::DWORD = 0x2;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/windef.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/windef.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/windef.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/windef.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Basic Windows Type Definitions
-DECLARE_HANDLE!(HWND, HWND__);
-DECLARE_HANDLE!(HHOOK, HHOOK__);
-DECLARE_HANDLE!(HEVENT, HEVENT__);
-pub type HGDIOBJ = *mut ::c_void;
-DECLARE_HANDLE!(HACCEL, HACCEL__);
-DECLARE_HANDLE!(HBITMAP, HBITMAP__);
-DECLARE_HANDLE!(HBRUSH, HBRUSH__);
-DECLARE_HANDLE!(HCOLORSPACE, HCOLORSPACE__);
-DECLARE_HANDLE!(HDC, HDC__);
-DECLARE_HANDLE!(HGLRC, HGLRC__);
-DECLARE_HANDLE!(HDESK, HDESK__);
-DECLARE_HANDLE!(HENHMETAFILE, HENHMETAFILE__);
-DECLARE_HANDLE!(HFONT, HFONT__);
-DECLARE_HANDLE!(HICON, HICON__);
-DECLARE_HANDLE!(HMENU, HMENU__);
-DECLARE_HANDLE!(HPALETTE, HPALETTE__);
-DECLARE_HANDLE!(HPEN, HPEN__);
-DECLARE_HANDLE!(HWINEVENTHOOK, HWINEVENTHOOK__);
-DECLARE_HANDLE!(HMONITOR, HMONITOR__);
-DECLARE_HANDLE!(HUMPD, HUMPD__);
-pub type HCURSOR = HICON;
-pub type COLORREF = ::DWORD;
-pub type LPCOLORREF = *mut ::DWORD;
-STRUCT!{struct RECT {
-    left: ::LONG,
-    top: ::LONG,
-    right: ::LONG,
-    bottom: ::LONG,
-}}
-pub type PRECT = *mut RECT;
-pub type NPRECT = *mut RECT;
-pub type LPRECT = *mut RECT;
-pub type LPCRECT = *const RECT;
-STRUCT!{struct RECTL {
-    left: ::LONG,
-    top: ::LONG,
-    right: ::LONG,
-    bottom: ::LONG,
-}}
-pub type PRECTL = *mut RECTL;
-pub type LPRECTL = *mut RECTL;
-pub type LPCRECTL = *const RECTL;
-STRUCT!{struct POINT {
-    x: ::LONG,
-    y: ::LONG,
-}}
-pub type PPOINT = *mut POINT;
-pub type NPPOINT = *mut POINT;
-pub type LPPOINT = *mut POINT;
-STRUCT!{struct POINTL {
-    x: ::LONG,
-    y: ::LONG,
-}}
-pub type PPOINTL = *mut POINTL;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/windowscodecs.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/windowscodecs.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/windowscodecs.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/windowscodecs.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,363 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of wincodec.h
-pub type WICColor = ::UINT32;
-pub type WICInProcPointer = *mut ::BYTE;
-pub type REFWICPixelFormatGUID = ::REFGUID;
-pub type WICPixelFormatGUID = ::GUID;
-STRUCT!{struct WICRect {
-    X: ::INT,
-    Y: ::INT,
-    Width: ::INT,
-    Height: ::INT,
-}}
-ENUM!{enum WICColorContextType {
-    WICColorContextUninitialized = 0,
-    WICColorContextProfile = 0x1,
-    WICColorContextExifColorSpace = 0x2,
-}}
-ENUM!{enum WICBitmapCreateCacheOption {
-    WICBitmapNoCache = 0,
-    WICBitmapCacheOnDemand = 0x1,
-    WICBitmapCacheOnLoad = 0x2,
-}}
-ENUM!{enum WICDecodeOptions {
-    WICDecodeMetadataCacheOnDemand = 0,
-    WICDecodeMetadataCacheOnLoad = 0x1,
-}}
-ENUM!{enum WICBitmapEncoderCacheOption {
-    WICBitmapEncoderCacheInMemory = 0,
-    WICBitmapEncoderCacheTempFile = 0x1,
-    WICBitmapEncoderNoCache = 0x2,
-}}
-FLAGS!{enum WICComponentType {
-    WICDecoder = 0x1,
-    WICEncoder = 0x2,
-    WICPixelFormatConverter = 0x4,
-    WICMetadataReader = 0x8,
-    WICMetadataWriter = 0x10,
-    WICPixelFormat = 0x20,
-    WICAllComponents = 0x3f,
-}}
-FLAGS!{enum WICComponentEnumerateOptions {
-    WICComponentEnumerateDefault = 0,
-    WICComponentEnumerateRefresh = 0x1,
-    WICComponentEnumerateDisabled = 0x80000000,
-    WICComponentEnumerateUnsigned = 0x40000000,
-    WICComponentEnumerateBuiltInOnly = 0x20000000,
-}}
-#[allow(unused_qualifications)]
-STRUCT!{struct WICBitmapPattern {
-    Position: ::ULARGE_INTEGER,
-    Length: ::ULONG,
-    Pattern: *mut ::BYTE,
-    Mask: *mut ::BYTE,
-    EndOfStream: ::BOOL,
-}}
-ENUM!{enum WICBitmapInterpolationMode {
-    WICBitmapInterpolationModeNearestNeighbor = 0,
-    WICBitmapInterpolationModeLinear = 0x1,
-    WICBitmapInterpolationModeCubic = 0x2,
-    WICBitmapInterpolationModeFant = 0x3,
-}}
-ENUM!{enum WICBitmapPaletteType {
-    WICBitmapPaletteTypeCustom = 0,
-    WICBitmapPaletteTypeMedianCut = 0x1,
-    WICBitmapPaletteTypeFixedBW = 0x2,
-    WICBitmapPaletteTypeFixedHalftone8 = 0x3,
-    WICBitmapPaletteTypeFixedHalftone27 = 0x4,
-    WICBitmapPaletteTypeFixedHalftone64 = 0x5,
-    WICBitmapPaletteTypeFixedHalftone125 = 0x6,
-    WICBitmapPaletteTypeFixedHalftone216 = 0x7,
-    WICBitmapPaletteTypeFixedHalftone252 = 0x8,
-    WICBitmapPaletteTypeFixedHalftone256 = 0x9,
-    WICBitmapPaletteTypeFixedGray4 = 0xa,
-    WICBitmapPaletteTypeFixedGray16 = 0xb,
-    WICBitmapPaletteTypeFixedGray256 = 0xc,
-}}
-pub const WICBitmapPaletteTypeFixedWebPalette: WICBitmapPaletteType =
-    WICBitmapPaletteTypeFixedHalftone216;
-ENUM!{enum WICBitmapDitherType {
-    WICBitmapDitherTypeSolid = 0,
-    WICBitmapDitherTypeOrdered4x4 = 0x1,
-    WICBitmapDitherTypeOrdered8x8 = 0x2,
-    WICBitmapDitherTypeOrdered16x16 = 0x3,
-    WICBitmapDitherTypeSpiral4x4 = 0x4,
-    WICBitmapDitherTypeSpiral8x8 = 0x5,
-    WICBitmapDitherTypeDualSpiral4x4 = 0x6,
-    WICBitmapDitherTypeDualSpiral8x8 = 0x7,
-    WICBitmapDitherTypeErrorDiffusion = 0x8,
-}}
-pub const WICBitmapDitherTypeNone: WICBitmapDitherType = WICBitmapDitherTypeSolid;
-ENUM!{enum WICBitmapAlphaChannelOption {
-    WICBitmapUseAlpha = 0,
-    WICBitmapUsePremultipliedAlpha = 0x1,
-    WICBitmapIgnoreAlpha = 0x2,
-}}
-FLAGS!{enum WICBitmapTransformOptions {
-    WICBitmapTransformRotate0 = 0,
-    WICBitmapTransformRotate90 = 0x1,
-    WICBitmapTransformRotate180 = 0x2,
-    WICBitmapTransformRotate270 = 0x3,
-    WICBitmapTransformFlipHorizontal = 0x8,
-    WICBitmapTransformFlipVertical = 0x10,
-}}
-FLAGS!{enum WICBitmapLockFlags {
-    WICBitmapLockRead = 0x1,
-    WICBitmapLockWrite = 0x2,
-}}
-FLAGS!{enum WICBitmapDecoderCapabilities {
-    WICBitmapDecoderCapabilitySameEncoder = 0x1,
-    WICBitmapDecoderCapabilityCanDecodeAllImages = 0x2,
-    WICBitmapDecoderCapabilityCanDecodeSomeImages = 0x4,
-    WICBitmapDecoderCapabilityCanEnumerateMetadata = 0x8,
-    WICBitmapDecoderCapabilityCanDecodeThumbnail = 0x10,
-}}
-FLAGS!{enum WICProgressOperation {
-    WICProgressOperationCopyPixels = 0x1,
-    WICProgressOperationWritePixels = 0x2,
-    WICProgressOperationAll = 0xffff,
-}}
-FLAGS!{enum WICProgressNotification {
-    WICProgressNotificationBegin = 0x10000,
-    WICProgressNotificationEnd = 0x20000,
-    WICProgressNotificationFrequent = 0x40000,
-    WICProgressNotificationAll = 0xffff0000,
-}}
-FLAGS!{enum WICComponentSigning {
-    WICComponentSigned = 0x1,
-    WICComponentUnsigned = 0x2,
-    WICComponentSafe = 0x4,
-    WICComponentDisabled = 0x80000000,
-}}
-ENUM!{enum WICGifLogicalScreenDescriptorProperties {
-    WICGifLogicalScreenSignature = 0x1,
-    WICGifLogicalScreenDescriptorWidth = 0x2,
-    WICGifLogicalScreenDescriptorHeight = 0x3,
-    WICGifLogicalScreenDescriptorGlobalColorTableFlag = 0x4,
-    WICGifLogicalScreenDescriptorColorResolution = 0x5,
-    WICGifLogicalScreenDescriptorSortFlag = 0x6,
-    WICGifLogicalScreenDescriptorGlobalColorTableSize = 0x7,
-    WICGifLogicalScreenDescriptorBackgroundColorIndex = 0x8,
-    WICGifLogicalScreenDescriptorPixelAspectRatio = 0x9,
-}}
-ENUM!{enum WICGifImageDescriptorProperties {
-    WICGifImageDescriptorLeft = 0x1,
-    WICGifImageDescriptorTop = 0x2,
-    WICGifImageDescriptorWidth = 0x3,
-    WICGifImageDescriptorHeight = 0x4,
-    WICGifImageDescriptorLocalColorTableFlag = 0x5,
-    WICGifImageDescriptorInterlaceFlag = 0x6,
-    WICGifImageDescriptorSortFlag = 0x7,
-    WICGifImageDescriptorLocalColorTableSize = 0x8,
-}}
-ENUM!{enum WICGifGraphicControlExtensionProperties {
-    WICGifGraphicControlExtensionDisposal = 0x1,
-    WICGifGraphicControlExtensionUserInputFlag = 0x2,
-    WICGifGraphicControlExtensionTransparencyFlag = 0x3,
-    WICGifGraphicControlExtensionDelay = 0x4,
-    WICGifGraphicControlExtensionTransparentColorIndex = 0x5,
-}}
-ENUM!{enum WICGifApplicationExtensionProperties {
-    WICGifApplicationExtensionApplication = 0x1,
-    WICGifApplicationExtensionData = 0x2,
-}}
-ENUM!{enum WICGifCommentExtensionProperties {
-    WICGifCommentExtensionText = 0x1,
-}}
-ENUM!{enum WICJpegCommentProperties {
-    WICJpegCommentText = 0x1,
-}}
-ENUM!{enum WICJpegLuminanceProperties {
-    WICJpegLuminanceTable = 0x1,
-}}
-ENUM!{enum WICJpegChrominanceProperties {
-    WICJpegChrominanceTable = 0x1,
-}}
-ENUM!{enum WIC8BIMIptcProperties {
-    WIC8BIMIptcPString = 0,
-    WIC8BIMIptcEmbeddedIPTC = 0x1,
-}}
-ENUM!{enum WIC8BIMResolutionInfoProperties {
-    WIC8BIMResolutionInfoPString = 0x1,
-    WIC8BIMResolutionInfoHResolution = 0x2,
-    WIC8BIMResolutionInfoHResolutionUnit = 0x3,
-    WIC8BIMResolutionInfoWidthUnit = 0x4,
-    WIC8BIMResolutionInfoVResolution = 0x5,
-    WIC8BIMResolutionInfoVResolutionUnit = 0x6,
-    WIC8BIMResolutionInfoHeightUnit = 0x7,
-}}
-ENUM!{enum WIC8BIMIptcDigestProperties {
-    WIC8BIMIptcDigestPString = 0x1,
-    WIC8BIMIptcDigestIptcDigest = 0x2,
-}}
-ENUM!{enum WICPngGamaProperties {
-    WICPngGamaGamma = 0x1,
-}}
-ENUM!{enum WICPngBkgdProperties {
-    WICPngBkgdBackgroundColor = 0x1,
-}}
-ENUM!{enum WICPngItxtProperties {
-    WICPngItxtKeyword = 0x1,
-    WICPngItxtCompressionFlag = 0x2,
-    WICPngItxtLanguageTag = 0x3,
-    WICPngItxtTranslatedKeyword = 0x4,
-    WICPngItxtText = 0x5,
-}}
-ENUM!{enum WICPngChrmProperties {
-    WICPngChrmWhitePointX = 0x1,
-    WICPngChrmWhitePointY = 0x2,
-    WICPngChrmRedX = 0x3,
-    WICPngChrmRedY = 0x4,
-    WICPngChrmGreenX = 0x5,
-    WICPngChrmGreenY = 0x6,
-    WICPngChrmBlueX = 0x7,
-    WICPngChrmBlueY = 0x8,
-}}
-ENUM!{enum WICPngHistProperties {
-    WICPngHistFrequencies = 0x1,
-}}
-ENUM!{enum WICPngIccpProperties {
-    WICPngIccpProfileName = 0x1,
-    WICPngIccpProfileData = 0x2,
-}}
-ENUM!{enum WICPngSrgbProperties {
-    WICPngSrgbRenderingIntent = 0x1,
-}}
-ENUM!{enum WICPngTimeProperties {
-    WICPngTimeYear = 0x1,
-    WICPngTimeMonth = 0x2,
-    WICPngTimeDay = 0x3,
-    WICPngTimeHour = 0x4,
-    WICPngTimeMinute = 0x5,
-    WICPngTimeSecond = 0x6,
-}}
-ENUM!{enum WICSectionAccessLevel {
-    WICSectionAccessLevelRead = 0x1,
-    WICSectionAccessLevelReadWrite = 0x3,
-}}
-ENUM!{enum WICPixelFormatNumericRepresentation {
-    WICPixelFormatNumericRepresentationUnspecified = 0,
-    WICPixelFormatNumericRepresentationIndexed = 0x1,
-    WICPixelFormatNumericRepresentationUnsignedInteger = 0x2,
-    WICPixelFormatNumericRepresentationSignedInteger = 0x3,
-    WICPixelFormatNumericRepresentationFixed = 0x4,
-    WICPixelFormatNumericRepresentationFloat = 0x5,
-}}
-ENUM!{enum WICPlanarOptions {
-    WICPlanarOptionsDefault = 0,
-    WICPlanarOptionsPreserveSubsampling = 0x1,
-}}
-#[allow(unused_qualifications)]
-STRUCT!{struct WICImageParameters {
-    PixelFormat: ::D2D1_PIXEL_FORMAT,
-    DpiX: ::FLOAT,
-    DpiY: ::FLOAT,
-    Top: ::FLOAT,
-    Left: ::FLOAT,
-    PixelWidth: ::FLOAT,
-    PixelHeight: ::FLOAT,
-}}
-#[allow(unused_qualifications)]
-STRUCT!{struct WICBitmapPlaneDescription {
-    Format: WICPixelFormatGUID,
-    Width: ::UINT,
-    Height: ::UINT,
-}}
-#[allow(unused_qualifications)]
-STRUCT!{struct WICBitmapPlane {
-    Format: WICPixelFormatGUID,
-    pbBuffer: *mut ::BYTE,
-    cbStride: ::UINT,
-    cbBufferSize: ::UINT,
-}}
-RIDL!(
-interface IWICPalette(IWICPaletteVtbl): IUnknown(IUnknownVtbl) {
-    fn InitializePredefined(
-        &mut self, ePaletteType: WICBitmapPaletteType, fAddTransparentColor: ::BOOL
-    ) -> ::HRESULT,
-    fn InitializeCustom(&mut self, pColors: *mut WICColor, cCount: ::UINT) -> ::HRESULT,
-    fn InitializeFromBitmap(
-        &mut self, pISurface: *mut IWICBitmapSource, cCount: ::UINT, fAddTransparentColor: ::BOOL
-    ) -> ::HRESULT,
-    fn InitializeFromPalette(&mut self, pIPalette: *mut IWICPalette) -> ::HRESULT,
-    fn GetType(&mut self, pePaletteType: *mut WICBitmapPaletteType) -> ::HRESULT,
-    fn GetColorCount(&mut self, pcCount: *mut ::UINT) -> ::HRESULT,
-    fn GetColors(
-        &mut self, cCount: ::UINT, pColros: *mut WICColor, pcActualColors: *mut ::UINT
-    ) -> ::HRESULT,
-    fn IsBlackWhite(&mut self, pfIsBlackWhite: *mut ::BOOL) -> ::HRESULT,
-    fn IsGrayscale(&mut self, pfIsGrayscale: *mut ::BOOL) -> ::HRESULT,
-    fn HasAlpha(&mut self, pfHasAlpha: *mut ::BOOL) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapSource(IWICBitmapSourceVtbl): IUnknown(IUnknownVtbl) {
-    fn GetSize(&mut self, puiWidth: *mut ::UINT, puiHeight: ::UINT) -> ::HRESULT,
-    fn GetPixelFormat(&mut self, pPixelFormat: *mut WICPixelFormatGUID) -> ::HRESULT,
-    fn GetResolution(&mut self, pDpiX: *mut f64, pDpiY: *mut f64) -> ::HRESULT,
-    fn CopyPalette(&mut self, pIPalette: *mut IWICPalette) -> ::HRESULT,
-    fn CopyPixels(
-        &mut self, prc: *const WICRect, cbStride: ::UINT, cbBufferSize: ::UINT,
-        pbBuffer: *mut ::BYTE
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICFormatConverter(IWICFormatConverterVtbl): IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(
-        &mut self, pISource: *mut IWICBitmapSource, dstFormat: REFWICPixelFormatGUID,
-        dither: WICBitmapDitherType, pIPalette: *mut IWICPalette, alphaThreasholdPercent: f64,
-        paletteTranslate: WICBitmapPaletteType
-    ) -> ::HRESULT,
-    fn CanConvert(
-        &mut self, srcPixelFormat: REFWICPixelFormatGUID, dstPixelFormat: REFWICPixelFormatGUID,
-        pfCanConvert: *mut ::BOOL
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICPlanarFormatConverter(IWICPlanarFormatConverterVtbl)
-    : IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(
-        &mut self, ppPlanes: *mut *mut IWICBitmapSource, cPlanes: ::UINT,
-        dstFormat: REFWICPixelFormatGUID, dither: WICBitmapDitherType, pIPalette: *mut IWICPalette,
-        alphaThreasholdPercent: f64, paletteTranslate: WICBitmapPaletteType
-    ) -> ::HRESULT,
-    fn CanConvert(
-        &mut self, pSrcPixelFormats: *const WICPixelFormatGUID, cSrcPlanes: ::UINT,
-        dstPixelFormat: REFWICPixelFormatGUID, pfCanConvert: *mut ::BOOL
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapScaler(IWICBitmapScalerVtbl): IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(
-        &mut self, pISource: *mut IWICBitmapSource, uiWidth: ::UINT, uiHeight: ::UINT,
-        mode: WICBitmapInterpolationMode
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapClipper(IWICBitmapClipperVtbl): IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(&mut self, pISource: *mut IWICBitmapSource, prc: *const WICRect) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapFlipRotator(IWICBitmapFlipRotatorVtbl)
-    : IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(
-        &mut self, pISource: *mut IWICBitmapSource, options: WICBitmapTransformOptions
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapLock(IWICBitmapLockVtbl): IUnknown(IUnknownVtbl) {
-    fn GetSize(&mut self, puiWidth: *mut ::UINT, puiHeight: *mut ::UINT) -> ::HRESULT,
-    fn GetStride(&mut self, pcbStride: *mut ::UINT) -> ::HRESULT,
-    fn GetDataPointer(
-        &mut self, pcbBufferSize: *mut ::UINT, ppbData: *mut WICInProcPointer
-    ) -> ::HRESULT,
-    fn GetPixelFormat(&mut self, pPixelFormat: *mut WICPixelFormatGUID) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmap(IWICBitmapVtbl): IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Lock(
-        &mut self, prcLock: *const WICRect, flags: ::DWORD, ppILock: *mut *mut IWICBitmapLock
-    ) -> ::HRESULT,
-    fn SetPalette(&mut self, pIPalette: *mut IWICPalette) -> ::HRESULT,
-    fn SetResolution(&mut self, dpiX: f64, dpiY: f64) -> ::HRESULT
-});
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/windowsx.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/windowsx.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/windowsx.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/windowsx.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Macro APIs, window message crackers, and control APIs
-//1233
-pub fn GET_X_LPARAM(lp: ::LPARAM) -> ::c_int {
-    ::LOWORD(lp as ::DWORD) as ::c_short as ::c_int
-}
-pub fn GET_Y_LPARAM(lp: ::LPARAM) -> ::c_int {
-    ::HIWORD(lp as ::DWORD) as ::c_short as ::c_int
-}
-#[test]
-fn test_get_x_lparam() {
-    assert_eq!(GET_X_LPARAM(0xDEAD1234u32 as ::LPARAM), 0x1234);
-    assert_eq!(GET_X_LPARAM(0xBEEFffffu32 as ::LPARAM), -1);
-    assert_eq!(GET_X_LPARAM(0xCAFEFB2Eu32 as ::LPARAM), -1234);
-}
-#[test]
-fn test_get_y_lparam() {
-    assert_eq!(GET_Y_LPARAM(0x1234DEADu32 as ::LPARAM), 0x1234);
-    assert_eq!(GET_Y_LPARAM(0xffffBEEFu32 as ::LPARAM), -1);
-    assert_eq!(GET_Y_LPARAM(0xFB2ECAFEu32 as ::LPARAM), -1234);
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winerror.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winerror.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winerror.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winerror.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,6065 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! error code definitions for the Win32 API functions
-#[inline]
-pub fn SUCCEEDED(hr: HRESULT) -> bool {
-    hr >= 0
-}
-pub const FACILITY_XPS: HRESULT = 82;
-pub const FACILITY_XAML: HRESULT = 43;
-pub const FACILITY_USN: HRESULT = 129;
-pub const FACILITY_BLBUI: HRESULT = 128;
-pub const FACILITY_SPP: HRESULT = 256;
-pub const FACILITY_WSB_ONLINE: HRESULT = 133;
-pub const FACILITY_DLS: HRESULT = 153;
-pub const FACILITY_BLB_CLI: HRESULT = 121;
-pub const FACILITY_BLB: HRESULT = 120;
-pub const FACILITY_WSBAPP: HRESULT = 122;
-pub const FACILITY_WPN: HRESULT = 62;
-pub const FACILITY_WMAAECMA: HRESULT = 1996;
-pub const FACILITY_WINRM: HRESULT = 51;
-pub const FACILITY_WINPE: HRESULT = 61;
-pub const FACILITY_WINDOWSUPDATE: HRESULT = 36;
-pub const FACILITY_WINDOWS_STORE: HRESULT = 63;
-pub const FACILITY_WINDOWS_SETUP: HRESULT = 48;
-pub const FACILITY_WINDOWS_DEFENDER: HRESULT = 80;
-pub const FACILITY_WINDOWS_CE: HRESULT = 24;
-pub const FACILITY_WINDOWS: HRESULT = 8;
-pub const FACILITY_WINCODEC_DWRITE_DWM: HRESULT = 2200;
-pub const FACILITY_WIA: HRESULT = 33;
-pub const FACILITY_WER: HRESULT = 27;
-pub const FACILITY_WEP: HRESULT = 2049;
-pub const FACILITY_WEB_SOCKET: HRESULT = 886;
-pub const FACILITY_WEB: HRESULT = 885;
-pub const FACILITY_USERMODE_VOLSNAP: HRESULT = 130;
-pub const FACILITY_USERMODE_VOLMGR: HRESULT = 56;
-pub const FACILITY_VISUALCPP: HRESULT = 109;
-pub const FACILITY_USERMODE_VIRTUALIZATION: HRESULT = 55;
-pub const FACILITY_USERMODE_VHD: HRESULT = 58;
-pub const FACILITY_URT: HRESULT = 19;
-pub const FACILITY_UMI: HRESULT = 22;
-pub const FACILITY_UI: HRESULT = 42;
-pub const FACILITY_TPM_SOFTWARE: HRESULT = 41;
-pub const FACILITY_TPM_SERVICES: HRESULT = 40;
-pub const FACILITY_TIERING: HRESULT = 131;
-pub const FACILITY_SYNCENGINE: HRESULT = 2050;
-pub const FACILITY_SXS: HRESULT = 23;
-pub const FACILITY_STORAGE: HRESULT = 3;
-pub const FACILITY_STATE_MANAGEMENT: HRESULT = 34;
-pub const FACILITY_SSPI: HRESULT = 9;
-pub const FACILITY_USERMODE_SPACES: HRESULT = 231;
-pub const FACILITY_SOS: HRESULT = 160;
-pub const FACILITY_SCARD: HRESULT = 16;
-pub const FACILITY_SHELL: HRESULT = 39;
-pub const FACILITY_SETUPAPI: HRESULT = 15;
-pub const FACILITY_SECURITY: HRESULT = 9;
-pub const FACILITY_SDIAG: HRESULT = 60;
-pub const FACILITY_USERMODE_SDBUS: HRESULT = 2305;
-pub const FACILITY_RPC: HRESULT = 1;
-pub const FACILITY_RESTORE: HRESULT = 256;
-pub const FACILITY_SCRIPT: HRESULT = 112;
-pub const FACILITY_PARSE: HRESULT = 113;
-pub const FACILITY_RAS: HRESULT = 83;
-pub const FACILITY_POWERSHELL: HRESULT = 84;
-pub const FACILITY_PLA: HRESULT = 48;
-pub const FACILITY_PIDGENX: HRESULT = 2561;
-pub const FACILITY_P2P_INT: HRESULT = 98;
-pub const FACILITY_P2P: HRESULT = 99;
-pub const FACILITY_OPC: HRESULT = 81;
-pub const FACILITY_ONLINE_ID: HRESULT = 134;
-pub const FACILITY_WIN32: HRESULT = 7;
-pub const FACILITY_CONTROL: HRESULT = 10;
-pub const FACILITY_WEBSERVICES: HRESULT = 61;
-pub const FACILITY_NULL: HRESULT = 0;
-pub const FACILITY_NDIS: HRESULT = 52;
-pub const FACILITY_NAP: HRESULT = 39;
-pub const FACILITY_MOBILE: HRESULT = 1793;
-pub const FACILITY_METADIRECTORY: HRESULT = 35;
-pub const FACILITY_MSMQ: HRESULT = 14;
-pub const FACILITY_MEDIASERVER: HRESULT = 13;
-pub const FACILITY_MBN: HRESULT = 84;
-pub const FACILITY_LINGUISTIC_SERVICES: HRESULT = 305;
-pub const FACILITY_LEAP: HRESULT = 2184;
-pub const FACILITY_JSCRIPT: HRESULT = 2306;
-pub const FACILITY_INTERNET: HRESULT = 12;
-pub const FACILITY_ITF: HRESULT = 4;
-pub const FACILITY_INPUT: HRESULT = 64;
-pub const FACILITY_USERMODE_HYPERVISOR: HRESULT = 53;
-pub const FACILITY_ACCELERATOR: HRESULT = 1536;
-pub const FACILITY_HTTP: HRESULT = 25;
-pub const FACILITY_GRAPHICS: HRESULT = 38;
-pub const FACILITY_FWP: HRESULT = 50;
-pub const FACILITY_FVE: HRESULT = 49;
-pub const FACILITY_USERMODE_FILTER_MANAGER: HRESULT = 31;
-pub const FACILITY_EAS: HRESULT = 85;
-pub const FACILITY_EAP: HRESULT = 66;
-pub const FACILITY_DXGI_DDI: HRESULT = 2171;
-pub const FACILITY_DXGI: HRESULT = 2170;
-pub const FACILITY_DPLAY: HRESULT = 21;
-pub const FACILITY_DMSERVER: HRESULT = 256;
-pub const FACILITY_DISPATCH: HRESULT = 2;
-pub const FACILITY_DIRECTORYSERVICE: HRESULT = 37;
-pub const FACILITY_DIRECTMUSIC: HRESULT = 2168;
-pub const FACILITY_DIRECT3D11: HRESULT = 2172;
-pub const FACILITY_DIRECT3D10: HRESULT = 2169;
-pub const FACILITY_DIRECT2D: HRESULT = 2201;
-pub const FACILITY_DAF: HRESULT = 100;
-pub const FACILITY_DEPLOYMENT_SERVICES_UTIL: HRESULT = 260;
-pub const FACILITY_DEPLOYMENT_SERVICES_TRANSPORT_MANAGEMENT: HRESULT = 272;
-pub const FACILITY_DEPLOYMENT_SERVICES_TFTP: HRESULT = 264;
-pub const FACILITY_DEPLOYMENT_SERVICES_PXE: HRESULT = 263;
-pub const FACILITY_DEPLOYMENT_SERVICES_MULTICAST_SERVER: HRESULT = 289;
-pub const FACILITY_DEPLOYMENT_SERVICES_MULTICAST_CLIENT: HRESULT = 290;
-pub const FACILITY_DEPLOYMENT_SERVICES_MANAGEMENT: HRESULT = 259;
-pub const FACILITY_DEPLOYMENT_SERVICES_IMAGING: HRESULT = 258;
-pub const FACILITY_DEPLOYMENT_SERVICES_DRIVER_PROVISIONING: HRESULT = 278;
-pub const FACILITY_DEPLOYMENT_SERVICES_SERVER: HRESULT = 257;
-pub const FACILITY_DEPLOYMENT_SERVICES_CONTENT_PROVIDER: HRESULT = 293;
-pub const FACILITY_DEPLOYMENT_SERVICES_BINLSVC: HRESULT = 261;
-pub const FACILITY_DEFRAG: HRESULT = 2304;
-pub const FACILITY_DEBUGGERS: HRESULT = 176;
-pub const FACILITY_CONFIGURATION: HRESULT = 33;
-pub const FACILITY_COMPLUS: HRESULT = 17;
-pub const FACILITY_USERMODE_COMMONLOG: HRESULT = 26;
-pub const FACILITY_CMI: HRESULT = 54;
-pub const FACILITY_CERT: HRESULT = 11;
-pub const FACILITY_BLUETOOTH_ATT: HRESULT = 101;
-pub const FACILITY_BCD: HRESULT = 57;
-pub const FACILITY_BACKGROUNDCOPY: HRESULT = 32;
-pub const FACILITY_AUDIOSTREAMING: HRESULT = 1094;
-pub const FACILITY_AUDCLNT: HRESULT = 2185;
-pub const FACILITY_AUDIO: HRESULT = 102;
-pub const FACILITY_ACTION_QUEUE: HRESULT = 44;
-pub const FACILITY_ACS: HRESULT = 20;
-pub const FACILITY_AAF: HRESULT = 18;
-pub const ERROR_SUCCESS: ::DWORD = 0;
-pub const NO_ERROR: ::DWORD = 0;
-pub const SEC_E_OK: HRESULT = 0;
-pub const ERROR_INVALID_FUNCTION: ::DWORD = 1;
-pub const ERROR_FILE_NOT_FOUND: ::DWORD = 2;
-pub const ERROR_PATH_NOT_FOUND: ::DWORD = 3;
-pub const ERROR_TOO_MANY_OPEN_FILES: ::DWORD = 4;
-pub const ERROR_ACCESS_DENIED: ::DWORD = 5;
-pub const ERROR_INVALID_HANDLE: ::DWORD = 6;
-pub const ERROR_ARENA_TRASHED: ::DWORD = 7;
-pub const ERROR_NOT_ENOUGH_MEMORY: ::DWORD = 8;
-pub const ERROR_INVALID_BLOCK: ::DWORD = 9;
-pub const ERROR_BAD_ENVIRONMENT: ::DWORD = 10;
-pub const ERROR_BAD_FORMAT: ::DWORD = 11;
-pub const ERROR_INVALID_ACCESS: ::DWORD = 12;
-pub const ERROR_INVALID_DATA: ::DWORD = 13;
-pub const ERROR_OUTOFMEMORY: ::DWORD = 14;
-pub const ERROR_INVALID_DRIVE: ::DWORD = 15;
-pub const ERROR_CURRENT_DIRECTORY: ::DWORD = 16;
-pub const ERROR_NOT_SAME_DEVICE: ::DWORD = 17;
-pub const ERROR_NO_MORE_FILES: ::DWORD = 18;
-pub const ERROR_WRITE_PROTECT: ::DWORD = 19;
-pub const ERROR_BAD_UNIT: ::DWORD = 20;
-pub const ERROR_NOT_READY: ::DWORD = 21;
-pub const ERROR_BAD_COMMAND: ::DWORD = 22;
-pub const ERROR_CRC: ::DWORD = 23;
-pub const ERROR_BAD_LENGTH: ::DWORD = 24;
-pub const ERROR_SEEK: ::DWORD = 25;
-pub const ERROR_NOT_DOS_DISK: ::DWORD = 26;
-pub const ERROR_SECTOR_NOT_FOUND: ::DWORD = 27;
-pub const ERROR_OUT_OF_PAPER: ::DWORD = 28;
-pub const ERROR_WRITE_FAULT: ::DWORD = 29;
-pub const ERROR_READ_FAULT: ::DWORD = 30;
-pub const ERROR_GEN_FAILURE: ::DWORD = 31;
-pub const ERROR_SHARING_VIOLATION: ::DWORD = 32;
-pub const ERROR_LOCK_VIOLATION: ::DWORD = 33;
-pub const ERROR_WRONG_DISK: ::DWORD = 34;
-pub const ERROR_SHARING_BUFFER_EXCEEDED: ::DWORD = 36;
-pub const ERROR_HANDLE_EOF: ::DWORD = 38;
-pub const ERROR_HANDLE_DISK_FULL: ::DWORD = 39;
-pub const ERROR_NOT_SUPPORTED: ::DWORD = 50;
-pub const ERROR_REM_NOT_LIST: ::DWORD = 51;
-pub const ERROR_DUP_NAME: ::DWORD = 52;
-pub const ERROR_BAD_NETPATH: ::DWORD = 53;
-pub const ERROR_NETWORK_BUSY: ::DWORD = 54;
-pub const ERROR_DEV_NOT_EXIST: ::DWORD = 55;
-pub const ERROR_TOO_MANY_CMDS: ::DWORD = 56;
-pub const ERROR_ADAP_HDW_ERR: ::DWORD = 57;
-pub const ERROR_BAD_NET_RESP: ::DWORD = 58;
-pub const ERROR_UNEXP_NET_ERR: ::DWORD = 59;
-pub const ERROR_BAD_REM_ADAP: ::DWORD = 60;
-pub const ERROR_PRINTQ_FULL: ::DWORD = 61;
-pub const ERROR_NO_SPOOL_SPACE: ::DWORD = 62;
-pub const ERROR_PRINT_CANCELLED: ::DWORD = 63;
-pub const ERROR_NETNAME_DELETED: ::DWORD = 64;
-pub const ERROR_NETWORK_ACCESS_DENIED: ::DWORD = 65;
-pub const ERROR_BAD_DEV_TYPE: ::DWORD = 66;
-pub const ERROR_BAD_NET_NAME: ::DWORD = 67;
-pub const ERROR_TOO_MANY_NAMES: ::DWORD = 68;
-pub const ERROR_TOO_MANY_SESS: ::DWORD = 69;
-pub const ERROR_SHARING_PAUSED: ::DWORD = 70;
-pub const ERROR_REQ_NOT_ACCEP: ::DWORD = 71;
-pub const ERROR_REDIR_PAUSED: ::DWORD = 72;
-pub const ERROR_FILE_EXISTS: ::DWORD = 80;
-pub const ERROR_CANNOT_MAKE: ::DWORD = 82;
-pub const ERROR_FAIL_I24: ::DWORD = 83;
-pub const ERROR_OUT_OF_STRUCTURES: ::DWORD = 84;
-pub const ERROR_ALREADY_ASSIGNED: ::DWORD = 85;
-pub const ERROR_INVALID_PASSWORD: ::DWORD = 86;
-pub const ERROR_INVALID_PARAMETER: ::DWORD = 87;
-pub const ERROR_NET_WRITE_FAULT: ::DWORD = 88;
-pub const ERROR_NO_PROC_SLOTS: ::DWORD = 89;
-pub const ERROR_TOO_MANY_SEMAPHORES: ::DWORD = 100;
-pub const ERROR_EXCL_SEM_ALREADY_OWNED: ::DWORD = 101;
-pub const ERROR_SEM_IS_SET: ::DWORD = 102;
-pub const ERROR_TOO_MANY_SEM_REQUESTS: ::DWORD = 103;
-pub const ERROR_INVALID_AT_INTERRUPT_TIME: ::DWORD = 104;
-pub const ERROR_SEM_OWNER_DIED: ::DWORD = 105;
-pub const ERROR_SEM_USER_LIMIT: ::DWORD = 106;
-pub const ERROR_DISK_CHANGE: ::DWORD = 107;
-pub const ERROR_DRIVE_LOCKED: ::DWORD = 108;
-pub const ERROR_BROKEN_PIPE: ::DWORD = 109;
-pub const ERROR_OPEN_FAILED: ::DWORD = 110;
-pub const ERROR_BUFFER_OVERFLOW: ::DWORD = 111;
-pub const ERROR_DISK_FULL: ::DWORD = 112;
-pub const ERROR_NO_MORE_SEARCH_HANDLES: ::DWORD = 113;
-pub const ERROR_INVALID_TARGET_HANDLE: ::DWORD = 114;
-pub const ERROR_INVALID_CATEGORY: ::DWORD = 117;
-pub const ERROR_INVALID_VERIFY_SWITCH: ::DWORD = 118;
-pub const ERROR_BAD_DRIVER_LEVEL: ::DWORD = 119;
-pub const ERROR_CALL_NOT_IMPLEMENTED: ::DWORD = 120;
-pub const ERROR_SEM_TIMEOUT: ::DWORD = 121;
-pub const ERROR_INSUFFICIENT_BUFFER: ::DWORD = 122;
-pub const ERROR_INVALID_NAME: ::DWORD = 123;
-pub const ERROR_INVALID_LEVEL: ::DWORD = 124;
-pub const ERROR_NO_VOLUME_LABEL: ::DWORD = 125;
-pub const ERROR_MOD_NOT_FOUND: ::DWORD = 126;
-pub const ERROR_PROC_NOT_FOUND: ::DWORD = 127;
-pub const ERROR_WAIT_NO_CHILDREN: ::DWORD = 128;
-pub const ERROR_CHILD_NOT_COMPLETE: ::DWORD = 129;
-pub const ERROR_DIRECT_ACCESS_HANDLE: ::DWORD = 130;
-pub const ERROR_NEGATIVE_SEEK: ::DWORD = 131;
-pub const ERROR_SEEK_ON_DEVICE: ::DWORD = 132;
-pub const ERROR_IS_JOIN_TARGET: ::DWORD = 133;
-pub const ERROR_IS_JOINED: ::DWORD = 134;
-pub const ERROR_IS_SUBSTED: ::DWORD = 135;
-pub const ERROR_NOT_JOINED: ::DWORD = 136;
-pub const ERROR_NOT_SUBSTED: ::DWORD = 137;
-pub const ERROR_JOIN_TO_JOIN: ::DWORD = 138;
-pub const ERROR_SUBST_TO_SUBST: ::DWORD = 139;
-pub const ERROR_JOIN_TO_SUBST: ::DWORD = 140;
-pub const ERROR_SUBST_TO_JOIN: ::DWORD = 141;
-pub const ERROR_BUSY_DRIVE: ::DWORD = 142;
-pub const ERROR_SAME_DRIVE: ::DWORD = 143;
-pub const ERROR_DIR_NOT_ROOT: ::DWORD = 144;
-pub const ERROR_DIR_NOT_EMPTY: ::DWORD = 145;
-pub const ERROR_IS_SUBST_PATH: ::DWORD = 146;
-pub const ERROR_IS_JOIN_PATH: ::DWORD = 147;
-pub const ERROR_PATH_BUSY: ::DWORD = 148;
-pub const ERROR_IS_SUBST_TARGET: ::DWORD = 149;
-pub const ERROR_SYSTEM_TRACE: ::DWORD = 150;
-pub const ERROR_INVALID_EVENT_COUNT: ::DWORD = 151;
-pub const ERROR_TOO_MANY_MUXWAITERS: ::DWORD = 152;
-pub const ERROR_INVALID_LIST_FORMAT: ::DWORD = 153;
-pub const ERROR_LABEL_TOO_LONG: ::DWORD = 154;
-pub const ERROR_TOO_MANY_TCBS: ::DWORD = 155;
-pub const ERROR_SIGNAL_REFUSED: ::DWORD = 156;
-pub const ERROR_DISCARDED: ::DWORD = 157;
-pub const ERROR_NOT_LOCKED: ::DWORD = 158;
-pub const ERROR_BAD_THREADID_ADDR: ::DWORD = 159;
-pub const ERROR_BAD_ARGUMENTS: ::DWORD = 160;
-pub const ERROR_BAD_PATHNAME: ::DWORD = 161;
-pub const ERROR_SIGNAL_PENDING: ::DWORD = 162;
-pub const ERROR_MAX_THRDS_REACHED: ::DWORD = 164;
-pub const ERROR_LOCK_FAILED: ::DWORD = 167;
-pub const ERROR_BUSY: ::DWORD = 170;
-pub const ERROR_DEVICE_SUPPORT_IN_PROGRESS: ::DWORD = 171;
-pub const ERROR_CANCEL_VIOLATION: ::DWORD = 173;
-pub const ERROR_ATOMIC_LOCKS_NOT_SUPPORTED: ::DWORD = 174;
-pub const ERROR_INVALID_SEGMENT_NUMBER: ::DWORD = 180;
-pub const ERROR_INVALID_ORDINAL: ::DWORD = 182;
-pub const ERROR_ALREADY_EXISTS: ::DWORD = 183;
-pub const ERROR_INVALID_FLAG_NUMBER: ::DWORD = 186;
-pub const ERROR_SEM_NOT_FOUND: ::DWORD = 187;
-pub const ERROR_INVALID_STARTING_CODESEG: ::DWORD = 188;
-pub const ERROR_INVALID_STACKSEG: ::DWORD = 189;
-pub const ERROR_INVALID_MODULETYPE: ::DWORD = 190;
-pub const ERROR_INVALID_EXE_SIGNATURE: ::DWORD = 191;
-pub const ERROR_EXE_MARKED_INVALID: ::DWORD = 192;
-pub const ERROR_BAD_EXE_FORMAT: ::DWORD = 193;
-pub const ERROR_ITERATED_DATA_EXCEEDS_64k: ::DWORD = 194;
-pub const ERROR_INVALID_MINALLOCSIZE: ::DWORD = 195;
-pub const ERROR_DYNLINK_FROM_INVALID_RING: ::DWORD = 196;
-pub const ERROR_IOPL_NOT_ENABLED: ::DWORD = 197;
-pub const ERROR_INVALID_SEGDPL: ::DWORD = 198;
-pub const ERROR_AUTODATASEG_EXCEEDS_64k: ::DWORD = 199;
-pub const ERROR_RING2SEG_MUST_BE_MOVABLE: ::DWORD = 200;
-pub const ERROR_RELOC_CHAIN_XEEDS_SEGLIM: ::DWORD = 201;
-pub const ERROR_INFLOOP_IN_RELOC_CHAIN: ::DWORD = 202;
-pub const ERROR_ENVVAR_NOT_FOUND: ::DWORD = 203;
-pub const ERROR_NO_SIGNAL_SENT: ::DWORD = 205;
-pub const ERROR_FILENAME_EXCED_RANGE: ::DWORD = 206;
-pub const ERROR_RING2_STACK_IN_USE: ::DWORD = 207;
-pub const ERROR_META_EXPANSION_TOO_LONG: ::DWORD = 208;
-pub const ERROR_INVALID_SIGNAL_NUMBER: ::DWORD = 209;
-pub const ERROR_THREAD_1_INACTIVE: ::DWORD = 210;
-pub const ERROR_LOCKED: ::DWORD = 212;
-pub const ERROR_TOO_MANY_MODULES: ::DWORD = 214;
-pub const ERROR_NESTING_NOT_ALLOWED: ::DWORD = 215;
-pub const ERROR_EXE_MACHINE_TYPE_MISMATCH: ::DWORD = 216;
-pub const ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY: ::DWORD = 217;
-pub const ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY: ::DWORD = 218;
-pub const ERROR_FILE_CHECKED_OUT: ::DWORD = 220;
-pub const ERROR_CHECKOUT_REQUIRED: ::DWORD = 221;
-pub const ERROR_BAD_FILE_TYPE: ::DWORD = 222;
-pub const ERROR_FILE_TOO_LARGE: ::DWORD = 223;
-pub const ERROR_FORMS_AUTH_REQUIRED: ::DWORD = 224;
-pub const ERROR_VIRUS_INFECTED: ::DWORD = 225;
-pub const ERROR_VIRUS_DELETED: ::DWORD = 226;
-pub const ERROR_PIPE_LOCAL: ::DWORD = 229;
-pub const ERROR_BAD_PIPE: ::DWORD = 230;
-pub const ERROR_PIPE_BUSY: ::DWORD = 231;
-pub const ERROR_NO_DATA: ::DWORD = 232;
-pub const ERROR_PIPE_NOT_CONNECTED: ::DWORD = 233;
-pub const ERROR_MORE_DATA: ::DWORD = 234;
-pub const ERROR_VC_DISCONNECTED: ::DWORD = 240;
-pub const ERROR_INVALID_EA_NAME: ::DWORD = 254;
-pub const ERROR_EA_LIST_INCONSISTENT: ::DWORD = 255;
-pub const WAIT_TIMEOUT: ::DWORD = 258;
-pub const ERROR_NO_MORE_ITEMS: ::DWORD = 259;
-pub const ERROR_CANNOT_COPY: ::DWORD = 266;
-pub const ERROR_DIRECTORY: ::DWORD = 267;
-pub const ERROR_EAS_DIDNT_FIT: ::DWORD = 275;
-pub const ERROR_EA_FILE_CORRUPT: ::DWORD = 276;
-pub const ERROR_EA_TABLE_FULL: ::DWORD = 277;
-pub const ERROR_INVALID_EA_HANDLE: ::DWORD = 278;
-pub const ERROR_EAS_NOT_SUPPORTED: ::DWORD = 282;
-pub const ERROR_NOT_OWNER: ::DWORD = 288;
-pub const ERROR_TOO_MANY_POSTS: ::DWORD = 298;
-pub const ERROR_PARTIAL_COPY: ::DWORD = 299;
-pub const ERROR_OPLOCK_NOT_GRANTED: ::DWORD = 300;
-pub const ERROR_INVALID_OPLOCK_PROTOCOL: ::DWORD = 301;
-pub const ERROR_DISK_TOO_FRAGMENTED: ::DWORD = 302;
-pub const ERROR_DELETE_PENDING: ::DWORD = 303;
-pub const ERROR_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING: ::DWORD = 304;
-pub const ERROR_SHORT_NAMES_NOT_ENABLED_ON_VOLUME: ::DWORD = 305;
-pub const ERROR_SECURITY_STREAM_IS_INCONSISTENT: ::DWORD = 306;
-pub const ERROR_INVALID_LOCK_RANGE: ::DWORD = 307;
-pub const ERROR_IMAGE_SUBSYSTEM_NOT_PRESENT: ::DWORD = 308;
-pub const ERROR_NOTIFICATION_GUID_ALREADY_DEFINED: ::DWORD = 309;
-pub const ERROR_INVALID_EXCEPTION_HANDLER: ::DWORD = 310;
-pub const ERROR_DUPLICATE_PRIVILEGES: ::DWORD = 311;
-pub const ERROR_NO_RANGES_PROCESSED: ::DWORD = 312;
-pub const ERROR_NOT_ALLOWED_ON_SYSTEM_FILE: ::DWORD = 313;
-pub const ERROR_DISK_RESOURCES_EXHAUSTED: ::DWORD = 314;
-pub const ERROR_INVALID_TOKEN: ::DWORD = 315;
-pub const ERROR_DEVICE_FEATURE_NOT_SUPPORTED: ::DWORD = 316;
-pub const ERROR_MR_MID_NOT_FOUND: ::DWORD = 317;
-pub const ERROR_SCOPE_NOT_FOUND: ::DWORD = 318;
-pub const ERROR_UNDEFINED_SCOPE: ::DWORD = 319;
-pub const ERROR_INVALID_CAP: ::DWORD = 320;
-pub const ERROR_DEVICE_UNREACHABLE: ::DWORD = 321;
-pub const ERROR_DEVICE_NO_RESOURCES: ::DWORD = 322;
-pub const ERROR_DATA_CHECKSUM_ERROR: ::DWORD = 323;
-pub const ERROR_INTERMIXED_KERNEL_EA_OPERATION: ::DWORD = 324;
-pub const ERROR_FILE_LEVEL_TRIM_NOT_SUPPORTED: ::DWORD = 326;
-pub const ERROR_OFFSET_ALIGNMENT_VIOLATION: ::DWORD = 327;
-pub const ERROR_INVALID_FIELD_IN_PARAMETER_LIST: ::DWORD = 328;
-pub const ERROR_OPERATION_IN_PROGRESS: ::DWORD = 329;
-pub const ERROR_BAD_DEVICE_PATH: ::DWORD = 330;
-pub const ERROR_TOO_MANY_DESCRIPTORS: ::DWORD = 331;
-pub const ERROR_SCRUB_DATA_DISABLED: ::DWORD = 332;
-pub const ERROR_NOT_REDUNDANT_STORAGE: ::DWORD = 333;
-pub const ERROR_RESIDENT_FILE_NOT_SUPPORTED: ::DWORD = 334;
-pub const ERROR_COMPRESSED_FILE_NOT_SUPPORTED: ::DWORD = 335;
-pub const ERROR_DIRECTORY_NOT_SUPPORTED: ::DWORD = 336;
-pub const ERROR_NOT_READ_FROM_COPY: ::DWORD = 337;
-pub const ERROR_FT_WRITE_FAILURE: ::DWORD = 338;
-pub const ERROR_FT_DI_SCAN_REQUIRED: ::DWORD = 339;
-pub const ERROR_INVALID_KERNEL_INFO_VERSION: ::DWORD = 340;
-pub const ERROR_INVALID_PEP_INFO_VERSION: ::DWORD = 341;
-pub const ERROR_OBJECT_NOT_EXTERNALLY_BACKED: ::DWORD = 342;
-pub const ERROR_EXTERNAL_BACKING_PROVIDER_UNKNOWN: ::DWORD = 343;
-pub const ERROR_FAIL_NOACTION_REBOOT: ::DWORD = 350;
-pub const ERROR_FAIL_SHUTDOWN: ::DWORD = 351;
-pub const ERROR_FAIL_RESTART: ::DWORD = 352;
-pub const ERROR_MAX_SESSIONS_REACHED: ::DWORD = 353;
-pub const ERROR_THREAD_MODE_ALREADY_BACKGROUND: ::DWORD = 400;
-pub const ERROR_THREAD_MODE_NOT_BACKGROUND: ::DWORD = 401;
-pub const ERROR_PROCESS_MODE_ALREADY_BACKGROUND: ::DWORD = 402;
-pub const ERROR_PROCESS_MODE_NOT_BACKGROUND: ::DWORD = 403;
-pub const ERROR_DEVICE_HARDWARE_ERROR: ::DWORD = 483;
-pub const ERROR_INVALID_ADDRESS: ::DWORD = 487;
-pub const ERROR_USER_PROFILE_LOAD: ::DWORD = 500;
-pub const ERROR_ARITHMETIC_OVERFLOW: ::DWORD = 534;
-pub const ERROR_PIPE_CONNECTED: ::DWORD = 535;
-pub const ERROR_PIPE_LISTENING: ::DWORD = 536;
-pub const ERROR_VERIFIER_STOP: ::DWORD = 537;
-pub const ERROR_ABIOS_ERROR: ::DWORD = 538;
-pub const ERROR_WX86_WARNING: ::DWORD = 539;
-pub const ERROR_WX86_ERROR: ::DWORD = 540;
-pub const ERROR_TIMER_NOT_CANCELED: ::DWORD = 541;
-pub const ERROR_UNWIND: ::DWORD = 542;
-pub const ERROR_BAD_STACK: ::DWORD = 543;
-pub const ERROR_INVALID_UNWIND_TARGET: ::DWORD = 544;
-pub const ERROR_INVALID_PORT_ATTRIBUTES: ::DWORD = 545;
-pub const ERROR_PORT_MESSAGE_TOO_LONG: ::DWORD = 546;
-pub const ERROR_INVALID_QUOTA_LOWER: ::DWORD = 547;
-pub const ERROR_DEVICE_ALREADY_ATTACHED: ::DWORD = 548;
-pub const ERROR_INSTRUCTION_MISALIGNMENT: ::DWORD = 549;
-pub const ERROR_PROFILING_NOT_STARTED: ::DWORD = 550;
-pub const ERROR_PROFILING_NOT_STOPPED: ::DWORD = 551;
-pub const ERROR_COULD_NOT_INTERPRET: ::DWORD = 552;
-pub const ERROR_PROFILING_AT_LIMIT: ::DWORD = 553;
-pub const ERROR_CANT_WAIT: ::DWORD = 554;
-pub const ERROR_CANT_TERMINATE_SELF: ::DWORD = 555;
-pub const ERROR_UNEXPECTED_MM_CREATE_ERR: ::DWORD = 556;
-pub const ERROR_UNEXPECTED_MM_MAP_ERROR: ::DWORD = 557;
-pub const ERROR_UNEXPECTED_MM_EXTEND_ERR: ::DWORD = 558;
-pub const ERROR_BAD_FUNCTION_TABLE: ::DWORD = 559;
-pub const ERROR_NO_GUID_TRANSLATION: ::DWORD = 560;
-pub const ERROR_INVALID_LDT_SIZE: ::DWORD = 561;
-pub const ERROR_INVALID_LDT_OFFSET: ::DWORD = 563;
-pub const ERROR_INVALID_LDT_DESCRIPTOR: ::DWORD = 564;
-pub const ERROR_TOO_MANY_THREADS: ::DWORD = 565;
-pub const ERROR_THREAD_NOT_IN_PROCESS: ::DWORD = 566;
-pub const ERROR_PAGEFILE_QUOTA_EXCEEDED: ::DWORD = 567;
-pub const ERROR_LOGON_SERVER_CONFLICT: ::DWORD = 568;
-pub const ERROR_SYNCHRONIZATION_REQUIRED: ::DWORD = 569;
-pub const ERROR_NET_OPEN_FAILED: ::DWORD = 570;
-pub const ERROR_IO_PRIVILEGE_FAILED: ::DWORD = 571;
-pub const ERROR_CONTROL_C_EXIT: ::DWORD = 572;
-pub const ERROR_MISSING_SYSTEMFILE: ::DWORD = 573;
-pub const ERROR_UNHANDLED_EXCEPTION: ::DWORD = 574;
-pub const ERROR_APP_INIT_FAILURE: ::DWORD = 575;
-pub const ERROR_PAGEFILE_CREATE_FAILED: ::DWORD = 576;
-pub const ERROR_INVALID_IMAGE_HASH: ::DWORD = 577;
-pub const ERROR_NO_PAGEFILE: ::DWORD = 578;
-pub const ERROR_ILLEGAL_FLOAT_CONTEXT: ::DWORD = 579;
-pub const ERROR_NO_EVENT_PAIR: ::DWORD = 580;
-pub const ERROR_DOMAIN_CTRLR_CONFIG_ERROR: ::DWORD = 581;
-pub const ERROR_ILLEGAL_CHARACTER: ::DWORD = 582;
-pub const ERROR_UNDEFINED_CHARACTER: ::DWORD = 583;
-pub const ERROR_FLOPPY_VOLUME: ::DWORD = 584;
-pub const ERROR_BIOS_FAILED_TO_CONNECT_INTERRUPT: ::DWORD = 585;
-pub const ERROR_BACKUP_CONTROLLER: ::DWORD = 586;
-pub const ERROR_MUTANT_LIMIT_EXCEEDED: ::DWORD = 587;
-pub const ERROR_FS_DRIVER_REQUIRED: ::DWORD = 588;
-pub const ERROR_CANNOT_LOAD_REGISTRY_FILE: ::DWORD = 589;
-pub const ERROR_DEBUG_ATTACH_FAILED: ::DWORD = 590;
-pub const ERROR_SYSTEM_PROCESS_TERMINATED: ::DWORD = 591;
-pub const ERROR_DATA_NOT_ACCEPTED: ::DWORD = 592;
-pub const ERROR_VDM_HARD_ERROR: ::DWORD = 593;
-pub const ERROR_DRIVER_CANCEL_TIMEOUT: ::DWORD = 594;
-pub const ERROR_REPLY_MESSAGE_MISMATCH: ::DWORD = 595;
-pub const ERROR_LOST_WRITEBEHIND_DATA: ::DWORD = 596;
-pub const ERROR_CLIENT_SERVER_PARAMETERS_INVALID: ::DWORD = 597;
-pub const ERROR_NOT_TINY_STREAM: ::DWORD = 598;
-pub const ERROR_STACK_OVERFLOW_READ: ::DWORD = 599;
-pub const ERROR_CONVERT_TO_LARGE: ::DWORD = 600;
-pub const ERROR_FOUND_OUT_OF_SCOPE: ::DWORD = 601;
-pub const ERROR_ALLOCATE_BUCKET: ::DWORD = 602;
-pub const ERROR_MARSHALL_OVERFLOW: ::DWORD = 603;
-pub const ERROR_INVALID_VARIANT: ::DWORD = 604;
-pub const ERROR_BAD_COMPRESSION_BUFFER: ::DWORD = 605;
-pub const ERROR_AUDIT_FAILED: ::DWORD = 606;
-pub const ERROR_TIMER_RESOLUTION_NOT_SET: ::DWORD = 607;
-pub const ERROR_INSUFFICIENT_LOGON_INFO: ::DWORD = 608;
-pub const ERROR_BAD_DLL_ENTRYPOINT: ::DWORD = 609;
-pub const ERROR_BAD_SERVICE_ENTRYPOINT: ::DWORD = 610;
-pub const ERROR_IP_ADDRESS_CONFLICT1: ::DWORD = 611;
-pub const ERROR_IP_ADDRESS_CONFLICT2: ::DWORD = 612;
-pub const ERROR_REGISTRY_QUOTA_LIMIT: ::DWORD = 613;
-pub const ERROR_NO_CALLBACK_ACTIVE: ::DWORD = 614;
-pub const ERROR_PWD_TOO_SHORT: ::DWORD = 615;
-pub const ERROR_PWD_TOO_RECENT: ::DWORD = 616;
-pub const ERROR_PWD_HISTORY_CONFLICT: ::DWORD = 617;
-pub const ERROR_UNSUPPORTED_COMPRESSION: ::DWORD = 618;
-pub const ERROR_INVALID_HW_PROFILE: ::DWORD = 619;
-pub const ERROR_INVALID_PLUGPLAY_DEVICE_PATH: ::DWORD = 620;
-pub const ERROR_QUOTA_LIST_INCONSISTENT: ::DWORD = 621;
-pub const ERROR_EVALUATION_EXPIRATION: ::DWORD = 622;
-pub const ERROR_ILLEGAL_DLL_RELOCATION: ::DWORD = 623;
-pub const ERROR_DLL_INIT_FAILED_LOGOFF: ::DWORD = 624;
-pub const ERROR_VALIDATE_CONTINUE: ::DWORD = 625;
-pub const ERROR_NO_MORE_MATCHES: ::DWORD = 626;
-pub const ERROR_RANGE_LIST_CONFLICT: ::DWORD = 627;
-pub const ERROR_SERVER_SID_MISMATCH: ::DWORD = 628;
-pub const ERROR_CANT_ENABLE_DENY_ONLY: ::DWORD = 629;
-pub const ERROR_FLOAT_MULTIPLE_FAULTS: ::DWORD = 630;
-pub const ERROR_FLOAT_MULTIPLE_TRAPS: ::DWORD = 631;
-pub const ERROR_NOINTERFACE: ::DWORD = 632;
-pub const ERROR_DRIVER_FAILED_SLEEP: ::DWORD = 633;
-pub const ERROR_CORRUPT_SYSTEM_FILE: ::DWORD = 634;
-pub const ERROR_COMMITMENT_MINIMUM: ::DWORD = 635;
-pub const ERROR_PNP_RESTART_ENUMERATION: ::DWORD = 636;
-pub const ERROR_SYSTEM_IMAGE_BAD_SIGNATURE: ::DWORD = 637;
-pub const ERROR_PNP_REBOOT_REQUIRED: ::DWORD = 638;
-pub const ERROR_INSUFFICIENT_POWER: ::DWORD = 639;
-pub const ERROR_MULTIPLE_FAULT_VIOLATION: ::DWORD = 640;
-pub const ERROR_SYSTEM_SHUTDOWN: ::DWORD = 641;
-pub const ERROR_PORT_NOT_SET: ::DWORD = 642;
-pub const ERROR_DS_VERSION_CHECK_FAILURE: ::DWORD = 643;
-pub const ERROR_RANGE_NOT_FOUND: ::DWORD = 644;
-pub const ERROR_NOT_SAFE_MODE_DRIVER: ::DWORD = 646;
-pub const ERROR_FAILED_DRIVER_ENTRY: ::DWORD = 647;
-pub const ERROR_DEVICE_ENUMERATION_ERROR: ::DWORD = 648;
-pub const ERROR_MOUNT_POINT_NOT_RESOLVED: ::DWORD = 649;
-pub const ERROR_INVALID_DEVICE_OBJECT_PARAMETER: ::DWORD = 650;
-pub const ERROR_MCA_OCCURED: ::DWORD = 651;
-pub const ERROR_DRIVER_DATABASE_ERROR: ::DWORD = 652;
-pub const ERROR_SYSTEM_HIVE_TOO_LARGE: ::DWORD = 653;
-pub const ERROR_DRIVER_FAILED_PRIOR_UNLOAD: ::DWORD = 654;
-pub const ERROR_VOLSNAP_PREPARE_HIBERNATE: ::DWORD = 655;
-pub const ERROR_HIBERNATION_FAILURE: ::DWORD = 656;
-pub const ERROR_PWD_TOO_LONG: ::DWORD = 657;
-pub const ERROR_FILE_SYSTEM_LIMITATION: ::DWORD = 665;
-pub const ERROR_ASSERTION_FAILURE: ::DWORD = 668;
-pub const ERROR_ACPI_ERROR: ::DWORD = 669;
-pub const ERROR_WOW_ASSERTION: ::DWORD = 670;
-pub const ERROR_PNP_BAD_MPS_TABLE: ::DWORD = 671;
-pub const ERROR_PNP_TRANSLATION_FAILED: ::DWORD = 672;
-pub const ERROR_PNP_IRQ_TRANSLATION_FAILED: ::DWORD = 673;
-pub const ERROR_PNP_INVALID_ID: ::DWORD = 674;
-pub const ERROR_WAKE_SYSTEM_DEBUGGER: ::DWORD = 675;
-pub const ERROR_HANDLES_CLOSED: ::DWORD = 676;
-pub const ERROR_EXTRANEOUS_INFORMATION: ::DWORD = 677;
-pub const ERROR_RXACT_COMMIT_NECESSARY: ::DWORD = 678;
-pub const ERROR_MEDIA_CHECK: ::DWORD = 679;
-pub const ERROR_GUID_SUBSTITUTION_MADE: ::DWORD = 680;
-pub const ERROR_STOPPED_ON_SYMLINK: ::DWORD = 681;
-pub const ERROR_LONGJUMP: ::DWORD = 682;
-pub const ERROR_PLUGPLAY_QUERY_VETOED: ::DWORD = 683;
-pub const ERROR_UNWIND_CONSOLIDATE: ::DWORD = 684;
-pub const ERROR_REGISTRY_HIVE_RECOVERED: ::DWORD = 685;
-pub const ERROR_DLL_MIGHT_BE_INSECURE: ::DWORD = 686;
-pub const ERROR_DLL_MIGHT_BE_INCOMPATIBLE: ::DWORD = 687;
-pub const ERROR_DBG_EXCEPTION_NOT_HANDLED: ::DWORD = 688;
-pub const ERROR_DBG_REPLY_LATER: ::DWORD = 689;
-pub const ERROR_DBG_UNABLE_TO_PROVIDE_HANDLE: ::DWORD = 690;
-pub const ERROR_DBG_TERMINATE_THREAD: ::DWORD = 691;
-pub const ERROR_DBG_TERMINATE_PROCESS: ::DWORD = 692;
-pub const ERROR_DBG_CONTROL_C: ::DWORD = 693;
-pub const ERROR_DBG_PRINTEXCEPTION_C: ::DWORD = 694;
-pub const ERROR_DBG_RIPEXCEPTION: ::DWORD = 695;
-pub const ERROR_DBG_CONTROL_BREAK: ::DWORD = 696;
-pub const ERROR_DBG_COMMAND_EXCEPTION: ::DWORD = 697;
-pub const ERROR_OBJECT_NAME_EXISTS: ::DWORD = 698;
-pub const ERROR_THREAD_WAS_SUSPENDED: ::DWORD = 699;
-pub const ERROR_IMAGE_NOT_AT_BASE: ::DWORD = 700;
-pub const ERROR_RXACT_STATE_CREATED: ::DWORD = 701;
-pub const ERROR_SEGMENT_NOTIFICATION: ::DWORD = 702;
-pub const ERROR_BAD_CURRENT_DIRECTORY: ::DWORD = 703;
-pub const ERROR_FT_READ_RECOVERY_FROM_BACKUP: ::DWORD = 704;
-pub const ERROR_FT_WRITE_RECOVERY: ::DWORD = 705;
-pub const ERROR_IMAGE_MACHINE_TYPE_MISMATCH: ::DWORD = 706;
-pub const ERROR_RECEIVE_PARTIAL: ::DWORD = 707;
-pub const ERROR_RECEIVE_EXPEDITED: ::DWORD = 708;
-pub const ERROR_RECEIVE_PARTIAL_EXPEDITED: ::DWORD = 709;
-pub const ERROR_EVENT_DONE: ::DWORD = 710;
-pub const ERROR_EVENT_PENDING: ::DWORD = 711;
-pub const ERROR_CHECKING_FILE_SYSTEM: ::DWORD = 712;
-pub const ERROR_FATAL_APP_EXIT: ::DWORD = 713;
-pub const ERROR_PREDEFINED_HANDLE: ::DWORD = 714;
-pub const ERROR_WAS_UNLOCKED: ::DWORD = 715;
-pub const ERROR_SERVICE_NOTIFICATION: ::DWORD = 716;
-pub const ERROR_WAS_LOCKED: ::DWORD = 717;
-pub const ERROR_LOG_HARD_ERROR: ::DWORD = 718;
-pub const ERROR_ALREADY_WIN32: ::DWORD = 719;
-pub const ERROR_IMAGE_MACHINE_TYPE_MISMATCH_EXE: ::DWORD = 720;
-pub const ERROR_NO_YIELD_PERFORMED: ::DWORD = 721;
-pub const ERROR_TIMER_RESUME_IGNORED: ::DWORD = 722;
-pub const ERROR_ARBITRATION_UNHANDLED: ::DWORD = 723;
-pub const ERROR_CARDBUS_NOT_SUPPORTED: ::DWORD = 724;
-pub const ERROR_MP_PROCESSOR_MISMATCH: ::DWORD = 725;
-pub const ERROR_HIBERNATED: ::DWORD = 726;
-pub const ERROR_RESUME_HIBERNATION: ::DWORD = 727;
-pub const ERROR_FIRMWARE_UPDATED: ::DWORD = 728;
-pub const ERROR_DRIVERS_LEAKING_LOCKED_PAGES: ::DWORD = 729;
-pub const ERROR_WAKE_SYSTEM: ::DWORD = 730;
-pub const ERROR_WAIT_1: ::DWORD = 731;
-pub const ERROR_WAIT_2: ::DWORD = 732;
-pub const ERROR_WAIT_3: ::DWORD = 733;
-pub const ERROR_WAIT_63: ::DWORD = 734;
-pub const ERROR_ABANDONED_WAIT_0: ::DWORD = 735;
-pub const ERROR_ABANDONED_WAIT_63: ::DWORD = 736;
-pub const ERROR_USER_APC: ::DWORD = 737;
-pub const ERROR_KERNEL_APC: ::DWORD = 738;
-pub const ERROR_ALERTED: ::DWORD = 739;
-pub const ERROR_ELEVATION_REQUIRED: ::DWORD = 740;
-pub const ERROR_REPARSE: ::DWORD = 741;
-pub const ERROR_OPLOCK_BREAK_IN_PROGRESS: ::DWORD = 742;
-pub const ERROR_VOLUME_MOUNTED: ::DWORD = 743;
-pub const ERROR_RXACT_COMMITTED: ::DWORD = 744;
-pub const ERROR_NOTIFY_CLEANUP: ::DWORD = 745;
-pub const ERROR_PRIMARY_TRANSPORT_CONNECT_FAILED: ::DWORD = 746;
-pub const ERROR_PAGE_FAULT_TRANSITION: ::DWORD = 747;
-pub const ERROR_PAGE_FAULT_DEMAND_ZERO: ::DWORD = 748;
-pub const ERROR_PAGE_FAULT_COPY_ON_WRITE: ::DWORD = 749;
-pub const ERROR_PAGE_FAULT_GUARD_PAGE: ::DWORD = 750;
-pub const ERROR_PAGE_FAULT_PAGING_FILE: ::DWORD = 751;
-pub const ERROR_CACHE_PAGE_LOCKED: ::DWORD = 752;
-pub const ERROR_CRASH_DUMP: ::DWORD = 753;
-pub const ERROR_BUFFER_ALL_ZEROS: ::DWORD = 754;
-pub const ERROR_REPARSE_OBJECT: ::DWORD = 755;
-pub const ERROR_RESOURCE_REQUIREMENTS_CHANGED: ::DWORD = 756;
-pub const ERROR_TRANSLATION_COMPLETE: ::DWORD = 757;
-pub const ERROR_NOTHING_TO_TERMINATE: ::DWORD = 758;
-pub const ERROR_PROCESS_NOT_IN_JOB: ::DWORD = 759;
-pub const ERROR_PROCESS_IN_JOB: ::DWORD = 760;
-pub const ERROR_VOLSNAP_HIBERNATE_READY: ::DWORD = 761;
-pub const ERROR_FSFILTER_OP_COMPLETED_SUCCESSFULLY: ::DWORD = 762;
-pub const ERROR_INTERRUPT_VECTOR_ALREADY_CONNECTED: ::DWORD = 763;
-pub const ERROR_INTERRUPT_STILL_CONNECTED: ::DWORD = 764;
-pub const ERROR_WAIT_FOR_OPLOCK: ::DWORD = 765;
-pub const ERROR_DBG_EXCEPTION_HANDLED: ::DWORD = 766;
-pub const ERROR_DBG_CONTINUE: ::DWORD = 767;
-pub const ERROR_CALLBACK_POP_STACK: ::DWORD = 768;
-pub const ERROR_COMPRESSION_DISABLED: ::DWORD = 769;
-pub const ERROR_CANTFETCHBACKWARDS: ::DWORD = 770;
-pub const ERROR_CANTSCROLLBACKWARDS: ::DWORD = 771;
-pub const ERROR_ROWSNOTRELEASED: ::DWORD = 772;
-pub const ERROR_BAD_ACCESSOR_FLAGS: ::DWORD = 773;
-pub const ERROR_ERRORS_ENCOUNTERED: ::DWORD = 774;
-pub const ERROR_NOT_CAPABLE: ::DWORD = 775;
-pub const ERROR_REQUEST_OUT_OF_SEQUENCE: ::DWORD = 776;
-pub const ERROR_VERSION_PARSE_ERROR: ::DWORD = 777;
-pub const ERROR_BADSTARTPOSITION: ::DWORD = 778;
-pub const ERROR_MEMORY_HARDWARE: ::DWORD = 779;
-pub const ERROR_DISK_REPAIR_DISABLED: ::DWORD = 780;
-pub const ERROR_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE: ::DWORD = 781;
-pub const ERROR_SYSTEM_POWERSTATE_TRANSITION: ::DWORD = 782;
-pub const ERROR_SYSTEM_POWERSTATE_COMPLEX_TRANSITION: ::DWORD = 783;
-pub const ERROR_MCA_EXCEPTION: ::DWORD = 784;
-pub const ERROR_ACCESS_AUDIT_BY_POLICY: ::DWORD = 785;
-pub const ERROR_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY: ::DWORD = 786;
-pub const ERROR_ABANDON_HIBERFILE: ::DWORD = 787;
-pub const ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED: ::DWORD = 788;
-pub const ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR: ::DWORD = 789;
-pub const ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR: ::DWORD = 790;
-pub const ERROR_BAD_MCFG_TABLE: ::DWORD = 791;
-pub const ERROR_DISK_REPAIR_REDIRECTED: ::DWORD = 792;
-pub const ERROR_DISK_REPAIR_UNSUCCESSFUL: ::DWORD = 793;
-pub const ERROR_CORRUPT_LOG_OVERFULL: ::DWORD = 794;
-pub const ERROR_CORRUPT_LOG_CORRUPTED: ::DWORD = 795;
-pub const ERROR_CORRUPT_LOG_UNAVAILABLE: ::DWORD = 796;
-pub const ERROR_CORRUPT_LOG_DELETED_FULL: ::DWORD = 797;
-pub const ERROR_CORRUPT_LOG_CLEARED: ::DWORD = 798;
-pub const ERROR_ORPHAN_NAME_EXHAUSTED: ::DWORD = 799;
-pub const ERROR_OPLOCK_SWITCHED_TO_NEW_HANDLE: ::DWORD = 800;
-pub const ERROR_CANNOT_GRANT_REQUESTED_OPLOCK: ::DWORD = 801;
-pub const ERROR_CANNOT_BREAK_OPLOCK: ::DWORD = 802;
-pub const ERROR_OPLOCK_HANDLE_CLOSED: ::DWORD = 803;
-pub const ERROR_NO_ACE_CONDITION: ::DWORD = 804;
-pub const ERROR_INVALID_ACE_CONDITION: ::DWORD = 805;
-pub const ERROR_FILE_HANDLE_REVOKED: ::DWORD = 806;
-pub const ERROR_IMAGE_AT_DIFFERENT_BASE: ::DWORD = 807;
-pub const ERROR_ENCRYPTED_IO_NOT_POSSIBLE: ::DWORD = 808;
-pub const ERROR_EA_ACCESS_DENIED: ::DWORD = 994;
-pub const ERROR_OPERATION_ABORTED: ::DWORD = 995;
-pub const ERROR_IO_INCOMPLETE: ::DWORD = 996;
-pub const ERROR_IO_PENDING: ::DWORD = 997;
-pub const ERROR_NOACCESS: ::DWORD = 998;
-pub const ERROR_SWAPERROR: ::DWORD = 999;
-pub const ERROR_STACK_OVERFLOW: ::DWORD = 1001;
-pub const ERROR_INVALID_MESSAGE: ::DWORD = 1002;
-pub const ERROR_CAN_NOT_COMPLETE: ::DWORD = 1003;
-pub const ERROR_INVALID_FLAGS: ::DWORD = 1004;
-pub const ERROR_UNRECOGNIZED_VOLUME: ::DWORD = 1005;
-pub const ERROR_FILE_INVALID: ::DWORD = 1006;
-pub const ERROR_FULLSCREEN_MODE: ::DWORD = 1007;
-pub const ERROR_NO_TOKEN: ::DWORD = 1008;
-pub const ERROR_BADDB: ::DWORD = 1009;
-pub const ERROR_BADKEY: ::DWORD = 1010;
-pub const ERROR_CANTOPEN: ::DWORD = 1011;
-pub const ERROR_CANTREAD: ::DWORD = 1012;
-pub const ERROR_CANTWRITE: ::DWORD = 1013;
-pub const ERROR_REGISTRY_RECOVERED: ::DWORD = 1014;
-pub const ERROR_REGISTRY_CORRUPT: ::DWORD = 1015;
-pub const ERROR_REGISTRY_IO_FAILED: ::DWORD = 1016;
-pub const ERROR_NOT_REGISTRY_FILE: ::DWORD = 1017;
-pub const ERROR_KEY_DELETED: ::DWORD = 1018;
-pub const ERROR_NO_LOG_SPACE: ::DWORD = 1019;
-pub const ERROR_KEY_HAS_CHILDREN: ::DWORD = 1020;
-pub const ERROR_CHILD_MUST_BE_VOLATILE: ::DWORD = 1021;
-pub const ERROR_NOTIFY_ENUM_DIR: ::DWORD = 1022;
-pub const ERROR_DEPENDENT_SERVICES_RUNNING: ::DWORD = 1051;
-pub const ERROR_INVALID_SERVICE_CONTROL: ::DWORD = 1052;
-pub const ERROR_SERVICE_REQUEST_TIMEOUT: ::DWORD = 1053;
-pub const ERROR_SERVICE_NO_THREAD: ::DWORD = 1054;
-pub const ERROR_SERVICE_DATABASE_LOCKED: ::DWORD = 1055;
-pub const ERROR_SERVICE_ALREADY_RUNNING: ::DWORD = 1056;
-pub const ERROR_INVALID_SERVICE_ACCOUNT: ::DWORD = 1057;
-pub const ERROR_SERVICE_DISABLED: ::DWORD = 1058;
-pub const ERROR_CIRCULAR_DEPENDENCY: ::DWORD = 1059;
-pub const ERROR_SERVICE_DOES_NOT_EXIST: ::DWORD = 1060;
-pub const ERROR_SERVICE_CANNOT_ACCEPT_CTRL: ::DWORD = 1061;
-pub const ERROR_SERVICE_NOT_ACTIVE: ::DWORD = 1062;
-pub const ERROR_FAILED_SERVICE_CONTROLLER_CONNECT: ::DWORD = 1063;
-pub const ERROR_EXCEPTION_IN_SERVICE: ::DWORD = 1064;
-pub const ERROR_DATABASE_DOES_NOT_EXIST: ::DWORD = 1065;
-pub const ERROR_SERVICE_SPECIFIC_ERROR: ::DWORD = 1066;
-pub const ERROR_PROCESS_ABORTED: ::DWORD = 1067;
-pub const ERROR_SERVICE_DEPENDENCY_FAIL: ::DWORD = 1068;
-pub const ERROR_SERVICE_LOGON_FAILED: ::DWORD = 1069;
-pub const ERROR_SERVICE_START_HANG: ::DWORD = 1070;
-pub const ERROR_INVALID_SERVICE_LOCK: ::DWORD = 1071;
-pub const ERROR_SERVICE_MARKED_FOR_DELETE: ::DWORD = 1072;
-pub const ERROR_SERVICE_EXISTS: ::DWORD = 1073;
-pub const ERROR_ALREADY_RUNNING_LKG: ::DWORD = 1074;
-pub const ERROR_SERVICE_DEPENDENCY_DELETED: ::DWORD = 1075;
-pub const ERROR_BOOT_ALREADY_ACCEPTED: ::DWORD = 1076;
-pub const ERROR_SERVICE_NEVER_STARTED: ::DWORD = 1077;
-pub const ERROR_DUPLICATE_SERVICE_NAME: ::DWORD = 1078;
-pub const ERROR_DIFFERENT_SERVICE_ACCOUNT: ::DWORD = 1079;
-pub const ERROR_CANNOT_DETECT_DRIVER_FAILURE: ::DWORD = 1080;
-pub const ERROR_CANNOT_DETECT_PROCESS_ABORT: ::DWORD = 1081;
-pub const ERROR_NO_RECOVERY_PROGRAM: ::DWORD = 1082;
-pub const ERROR_SERVICE_NOT_IN_EXE: ::DWORD = 1083;
-pub const ERROR_NOT_SAFEBOOT_SERVICE: ::DWORD = 1084;
-pub const ERROR_END_OF_MEDIA: ::DWORD = 1100;
-pub const ERROR_FILEMARK_DETECTED: ::DWORD = 1101;
-pub const ERROR_BEGINNING_OF_MEDIA: ::DWORD = 1102;
-pub const ERROR_SETMARK_DETECTED: ::DWORD = 1103;
-pub const ERROR_NO_DATA_DETECTED: ::DWORD = 1104;
-pub const ERROR_PARTITION_FAILURE: ::DWORD = 1105;
-pub const ERROR_INVALID_BLOCK_LENGTH: ::DWORD = 1106;
-pub const ERROR_DEVICE_NOT_PARTITIONED: ::DWORD = 1107;
-pub const ERROR_UNABLE_TO_LOCK_MEDIA: ::DWORD = 1108;
-pub const ERROR_UNABLE_TO_UNLOAD_MEDIA: ::DWORD = 1109;
-pub const ERROR_MEDIA_CHANGED: ::DWORD = 1110;
-pub const ERROR_BUS_RESET: ::DWORD = 1111;
-pub const ERROR_NO_MEDIA_IN_DRIVE: ::DWORD = 1112;
-pub const ERROR_NO_UNICODE_TRANSLATION: ::DWORD = 1113;
-pub const ERROR_DLL_INIT_FAILED: ::DWORD = 1114;
-pub const ERROR_SHUTDOWN_IN_PROGRESS: ::DWORD = 1115;
-pub const ERROR_NO_SHUTDOWN_IN_PROGRESS: ::DWORD = 1116;
-pub const ERROR_IO_DEVICE: ::DWORD = 1117;
-pub const ERROR_SERIAL_NO_DEVICE: ::DWORD = 1118;
-pub const ERROR_IRQ_BUSY: ::DWORD = 1119;
-pub const ERROR_MORE_WRITES: ::DWORD = 1120;
-pub const ERROR_COUNTER_TIMEOUT: ::DWORD = 1121;
-pub const ERROR_FLOPPY_ID_MARK_NOT_FOUND: ::DWORD = 1122;
-pub const ERROR_FLOPPY_WRONG_CYLINDER: ::DWORD = 1123;
-pub const ERROR_FLOPPY_UNKNOWN_ERROR: ::DWORD = 1124;
-pub const ERROR_FLOPPY_BAD_REGISTERS: ::DWORD = 1125;
-pub const ERROR_DISK_RECALIBRATE_FAILED: ::DWORD = 1126;
-pub const ERROR_DISK_OPERATION_FAILED: ::DWORD = 1127;
-pub const ERROR_DISK_RESET_FAILED: ::DWORD = 1128;
-pub const ERROR_EOM_OVERFLOW: ::DWORD = 1129;
-pub const ERROR_NOT_ENOUGH_SERVER_MEMORY: ::DWORD = 1130;
-pub const ERROR_POSSIBLE_DEADLOCK: ::DWORD = 1131;
-pub const ERROR_MAPPED_ALIGNMENT: ::DWORD = 1132;
-pub const ERROR_SET_POWER_STATE_VETOED: ::DWORD = 1140;
-pub const ERROR_SET_POWER_STATE_FAILED: ::DWORD = 1141;
-pub const ERROR_TOO_MANY_LINKS: ::DWORD = 1142;
-pub const ERROR_OLD_WIN_VERSION: ::DWORD = 1150;
-pub const ERROR_APP_WRONG_OS: ::DWORD = 1151;
-pub const ERROR_SINGLE_INSTANCE_APP: ::DWORD = 1152;
-pub const ERROR_RMODE_APP: ::DWORD = 1153;
-pub const ERROR_INVALID_DLL: ::DWORD = 1154;
-pub const ERROR_NO_ASSOCIATION: ::DWORD = 1155;
-pub const ERROR_DDE_FAIL: ::DWORD = 1156;
-pub const ERROR_DLL_NOT_FOUND: ::DWORD = 1157;
-pub const ERROR_NO_MORE_USER_HANDLES: ::DWORD = 1158;
-pub const ERROR_MESSAGE_SYNC_ONLY: ::DWORD = 1159;
-pub const ERROR_SOURCE_ELEMENT_EMPTY: ::DWORD = 1160;
-pub const ERROR_DESTINATION_ELEMENT_FULL: ::DWORD = 1161;
-pub const ERROR_ILLEGAL_ELEMENT_ADDRESS: ::DWORD = 1162;
-pub const ERROR_MAGAZINE_NOT_PRESENT: ::DWORD = 1163;
-pub const ERROR_DEVICE_REINITIALIZATION_NEEDED: ::DWORD = 1164;
-pub const ERROR_DEVICE_REQUIRES_CLEANING: ::DWORD = 1165;
-pub const ERROR_DEVICE_DOOR_OPEN: ::DWORD = 1166;
-pub const ERROR_DEVICE_NOT_CONNECTED: ::DWORD = 1167;
-pub const ERROR_NOT_FOUND: ::DWORD = 1168;
-pub const ERROR_NO_MATCH: ::DWORD = 1169;
-pub const ERROR_SET_NOT_FOUND: ::DWORD = 1170;
-pub const ERROR_POINT_NOT_FOUND: ::DWORD = 1171;
-pub const ERROR_NO_TRACKING_SERVICE: ::DWORD = 1172;
-pub const ERROR_NO_VOLUME_ID: ::DWORD = 1173;
-pub const ERROR_UNABLE_TO_REMOVE_REPLACED: ::DWORD = 1175;
-pub const ERROR_UNABLE_TO_MOVE_REPLACEMENT: ::DWORD = 1176;
-pub const ERROR_UNABLE_TO_MOVE_REPLACEMENT_2: ::DWORD = 1177;
-pub const ERROR_JOURNAL_DELETE_IN_PROGRESS: ::DWORD = 1178;
-pub const ERROR_JOURNAL_NOT_ACTIVE: ::DWORD = 1179;
-pub const ERROR_POTENTIAL_FILE_FOUND: ::DWORD = 1180;
-pub const ERROR_JOURNAL_ENTRY_DELETED: ::DWORD = 1181;
-pub const ERROR_SHUTDOWN_IS_SCHEDULED: ::DWORD = 1190;
-pub const ERROR_SHUTDOWN_USERS_LOGGED_ON: ::DWORD = 1191;
-pub const ERROR_BAD_DEVICE: ::DWORD = 1200;
-pub const ERROR_CONNECTION_UNAVAIL: ::DWORD = 1201;
-pub const ERROR_DEVICE_ALREADY_REMEMBERED: ::DWORD = 1202;
-pub const ERROR_NO_NET_OR_BAD_PATH: ::DWORD = 1203;
-pub const ERROR_BAD_PROVIDER: ::DWORD = 1204;
-pub const ERROR_CANNOT_OPEN_PROFILE: ::DWORD = 1205;
-pub const ERROR_BAD_PROFILE: ::DWORD = 1206;
-pub const ERROR_NOT_CONTAINER: ::DWORD = 1207;
-pub const ERROR_EXTENDED_ERROR: ::DWORD = 1208;
-pub const ERROR_INVALID_GROUPNAME: ::DWORD = 1209;
-pub const ERROR_INVALID_COMPUTERNAME: ::DWORD = 1210;
-pub const ERROR_INVALID_EVENTNAME: ::DWORD = 1211;
-pub const ERROR_INVALID_DOMAINNAME: ::DWORD = 1212;
-pub const ERROR_INVALID_SERVICENAME: ::DWORD = 1213;
-pub const ERROR_INVALID_NETNAME: ::DWORD = 1214;
-pub const ERROR_INVALID_SHARENAME: ::DWORD = 1215;
-pub const ERROR_INVALID_PASSWORDNAME: ::DWORD = 1216;
-pub const ERROR_INVALID_MESSAGENAME: ::DWORD = 1217;
-pub const ERROR_INVALID_MESSAGEDEST: ::DWORD = 1218;
-pub const ERROR_SESSION_CREDENTIAL_CONFLICT: ::DWORD = 1219;
-pub const ERROR_REMOTE_SESSION_LIMIT_EXCEEDED: ::DWORD = 1220;
-pub const ERROR_DUP_DOMAINNAME: ::DWORD = 1221;
-pub const ERROR_NO_NETWORK: ::DWORD = 1222;
-pub const ERROR_CANCELLED: ::DWORD = 1223;
-pub const ERROR_USER_MAPPED_FILE: ::DWORD = 1224;
-pub const ERROR_CONNECTION_REFUSED: ::DWORD = 1225;
-pub const ERROR_GRACEFUL_DISCONNECT: ::DWORD = 1226;
-pub const ERROR_ADDRESS_ALREADY_ASSOCIATED: ::DWORD = 1227;
-pub const ERROR_ADDRESS_NOT_ASSOCIATED: ::DWORD = 1228;
-pub const ERROR_CONNECTION_INVALID: ::DWORD = 1229;
-pub const ERROR_CONNECTION_ACTIVE: ::DWORD = 1230;
-pub const ERROR_NETWORK_UNREACHABLE: ::DWORD = 1231;
-pub const ERROR_HOST_UNREACHABLE: ::DWORD = 1232;
-pub const ERROR_PROTOCOL_UNREACHABLE: ::DWORD = 1233;
-pub const ERROR_PORT_UNREACHABLE: ::DWORD = 1234;
-pub const ERROR_REQUEST_ABORTED: ::DWORD = 1235;
-pub const ERROR_CONNECTION_ABORTED: ::DWORD = 1236;
-pub const ERROR_RETRY: ::DWORD = 1237;
-pub const ERROR_CONNECTION_COUNT_LIMIT: ::DWORD = 1238;
-pub const ERROR_LOGIN_TIME_RESTRICTION: ::DWORD = 1239;
-pub const ERROR_LOGIN_WKSTA_RESTRICTION: ::DWORD = 1240;
-pub const ERROR_INCORRECT_ADDRESS: ::DWORD = 1241;
-pub const ERROR_ALREADY_REGISTERED: ::DWORD = 1242;
-pub const ERROR_SERVICE_NOT_FOUND: ::DWORD = 1243;
-pub const ERROR_NOT_AUTHENTICATED: ::DWORD = 1244;
-pub const ERROR_NOT_LOGGED_ON: ::DWORD = 1245;
-pub const ERROR_CONTINUE: ::DWORD = 1246;
-pub const ERROR_ALREADY_INITIALIZED: ::DWORD = 1247;
-pub const ERROR_NO_MORE_DEVICES: ::DWORD = 1248;
-pub const ERROR_NO_SUCH_SITE: ::DWORD = 1249;
-pub const ERROR_DOMAIN_CONTROLLER_EXISTS: ::DWORD = 1250;
-pub const ERROR_ONLY_IF_CONNECTED: ::DWORD = 1251;
-pub const ERROR_OVERRIDE_NOCHANGES: ::DWORD = 1252;
-pub const ERROR_BAD_USER_PROFILE: ::DWORD = 1253;
-pub const ERROR_NOT_SUPPORTED_ON_SBS: ::DWORD = 1254;
-pub const ERROR_SERVER_SHUTDOWN_IN_PROGRESS: ::DWORD = 1255;
-pub const ERROR_HOST_DOWN: ::DWORD = 1256;
-pub const ERROR_NON_ACCOUNT_SID: ::DWORD = 1257;
-pub const ERROR_NON_DOMAIN_SID: ::DWORD = 1258;
-pub const ERROR_APPHELP_BLOCK: ::DWORD = 1259;
-pub const ERROR_ACCESS_DISABLED_BY_POLICY: ::DWORD = 1260;
-pub const ERROR_REG_NAT_CONSUMPTION: ::DWORD = 1261;
-pub const ERROR_CSCSHARE_OFFLINE: ::DWORD = 1262;
-pub const ERROR_PKINIT_FAILURE: ::DWORD = 1263;
-pub const ERROR_SMARTCARD_SUBSYSTEM_FAILURE: ::DWORD = 1264;
-pub const ERROR_DOWNGRADE_DETECTED: ::DWORD = 1265;
-pub const ERROR_MACHINE_LOCKED: ::DWORD = 1271;
-pub const ERROR_CALLBACK_SUPPLIED_INVALID_DATA: ::DWORD = 1273;
-pub const ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED: ::DWORD = 1274;
-pub const ERROR_DRIVER_BLOCKED: ::DWORD = 1275;
-pub const ERROR_INVALID_IMPORT_OF_NON_DLL: ::DWORD = 1276;
-pub const ERROR_ACCESS_DISABLED_WEBBLADE: ::DWORD = 1277;
-pub const ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER: ::DWORD = 1278;
-pub const ERROR_RECOVERY_FAILURE: ::DWORD = 1279;
-pub const ERROR_ALREADY_FIBER: ::DWORD = 1280;
-pub const ERROR_ALREADY_THREAD: ::DWORD = 1281;
-pub const ERROR_STACK_BUFFER_OVERRUN: ::DWORD = 1282;
-pub const ERROR_PARAMETER_QUOTA_EXCEEDED: ::DWORD = 1283;
-pub const ERROR_DEBUGGER_INACTIVE: ::DWORD = 1284;
-pub const ERROR_DELAY_LOAD_FAILED: ::DWORD = 1285;
-pub const ERROR_VDM_DISALLOWED: ::DWORD = 1286;
-pub const ERROR_UNIDENTIFIED_ERROR: ::DWORD = 1287;
-pub const ERROR_INVALID_CRUNTIME_PARAMETER: ::DWORD = 1288;
-pub const ERROR_BEYOND_VDL: ::DWORD = 1289;
-pub const ERROR_INCOMPATIBLE_SERVICE_SID_TYPE: ::DWORD = 1290;
-pub const ERROR_DRIVER_PROCESS_TERMINATED: ::DWORD = 1291;
-pub const ERROR_IMPLEMENTATION_LIMIT: ::DWORD = 1292;
-pub const ERROR_PROCESS_IS_PROTECTED: ::DWORD = 1293;
-pub const ERROR_SERVICE_NOTIFY_CLIENT_LAGGING: ::DWORD = 1294;
-pub const ERROR_DISK_QUOTA_EXCEEDED: ::DWORD = 1295;
-pub const ERROR_CONTENT_BLOCKED: ::DWORD = 1296;
-pub const ERROR_INCOMPATIBLE_SERVICE_PRIVILEGE: ::DWORD = 1297;
-pub const ERROR_APP_HANG: ::DWORD = 1298;
-pub const ERROR_INVALID_LABEL: ::DWORD = 1299;
-pub const ERROR_NOT_ALL_ASSIGNED: ::DWORD = 1300;
-pub const ERROR_SOME_NOT_MAPPED: ::DWORD = 1301;
-pub const ERROR_NO_QUOTAS_FOR_ACCOUNT: ::DWORD = 1302;
-pub const ERROR_LOCAL_USER_SESSION_KEY: ::DWORD = 1303;
-pub const ERROR_NULL_LM_PASSWORD: ::DWORD = 1304;
-pub const ERROR_UNKNOWN_REVISION: ::DWORD = 1305;
-pub const ERROR_REVISION_MISMATCH: ::DWORD = 1306;
-pub const ERROR_INVALID_OWNER: ::DWORD = 1307;
-pub const ERROR_INVALID_PRIMARY_GROUP: ::DWORD = 1308;
-pub const ERROR_NO_IMPERSONATION_TOKEN: ::DWORD = 1309;
-pub const ERROR_CANT_DISABLE_MANDATORY: ::DWORD = 1310;
-pub const ERROR_NO_LOGON_SERVERS: ::DWORD = 1311;
-pub const ERROR_NO_SUCH_LOGON_SESSION: ::DWORD = 1312;
-pub const ERROR_NO_SUCH_PRIVILEGE: ::DWORD = 1313;
-pub const ERROR_PRIVILEGE_NOT_HELD: ::DWORD = 1314;
-pub const ERROR_INVALID_ACCOUNT_NAME: ::DWORD = 1315;
-pub const ERROR_USER_EXISTS: ::DWORD = 1316;
-pub const ERROR_NO_SUCH_USER: ::DWORD = 1317;
-pub const ERROR_GROUP_EXISTS: ::DWORD = 1318;
-pub const ERROR_NO_SUCH_GROUP: ::DWORD = 1319;
-pub const ERROR_MEMBER_IN_GROUP: ::DWORD = 1320;
-pub const ERROR_MEMBER_NOT_IN_GROUP: ::DWORD = 1321;
-pub const ERROR_LAST_ADMIN: ::DWORD = 1322;
-pub const ERROR_WRONG_PASSWORD: ::DWORD = 1323;
-pub const ERROR_ILL_FORMED_PASSWORD: ::DWORD = 1324;
-pub const ERROR_PASSWORD_RESTRICTION: ::DWORD = 1325;
-pub const ERROR_LOGON_FAILURE: ::DWORD = 1326;
-pub const ERROR_ACCOUNT_RESTRICTION: ::DWORD = 1327;
-pub const ERROR_INVALID_LOGON_HOURS: ::DWORD = 1328;
-pub const ERROR_INVALID_WORKSTATION: ::DWORD = 1329;
-pub const ERROR_PASSWORD_EXPIRED: ::DWORD = 1330;
-pub const ERROR_ACCOUNT_DISABLED: ::DWORD = 1331;
-pub const ERROR_NONE_MAPPED: ::DWORD = 1332;
-pub const ERROR_TOO_MANY_LUIDS_REQUESTED: ::DWORD = 1333;
-pub const ERROR_LUIDS_EXHAUSTED: ::DWORD = 1334;
-pub const ERROR_INVALID_SUB_AUTHORITY: ::DWORD = 1335;
-pub const ERROR_INVALID_ACL: ::DWORD = 1336;
-pub const ERROR_INVALID_SID: ::DWORD = 1337;
-pub const ERROR_INVALID_SECURITY_DESCR: ::DWORD = 1338;
-pub const ERROR_BAD_INHERITANCE_ACL: ::DWORD = 1340;
-pub const ERROR_SERVER_DISABLED: ::DWORD = 1341;
-pub const ERROR_SERVER_NOT_DISABLED: ::DWORD = 1342;
-pub const ERROR_INVALID_ID_AUTHORITY: ::DWORD = 1343;
-pub const ERROR_ALLOTTED_SPACE_EXCEEDED: ::DWORD = 1344;
-pub const ERROR_INVALID_GROUP_ATTRIBUTES: ::DWORD = 1345;
-pub const ERROR_BAD_IMPERSONATION_LEVEL: ::DWORD = 1346;
-pub const ERROR_CANT_OPEN_ANONYMOUS: ::DWORD = 1347;
-pub const ERROR_BAD_VALIDATION_CLASS: ::DWORD = 1348;
-pub const ERROR_BAD_TOKEN_TYPE: ::DWORD = 1349;
-pub const ERROR_NO_SECURITY_ON_OBJECT: ::DWORD = 1350;
-pub const ERROR_CANT_ACCESS_DOMAIN_INFO: ::DWORD = 1351;
-pub const ERROR_INVALID_SERVER_STATE: ::DWORD = 1352;
-pub const ERROR_INVALID_DOMAIN_STATE: ::DWORD = 1353;
-pub const ERROR_INVALID_DOMAIN_ROLE: ::DWORD = 1354;
-pub const ERROR_NO_SUCH_DOMAIN: ::DWORD = 1355;
-pub const ERROR_DOMAIN_EXISTS: ::DWORD = 1356;
-pub const ERROR_DOMAIN_LIMIT_EXCEEDED: ::DWORD = 1357;
-pub const ERROR_INTERNAL_DB_CORRUPTION: ::DWORD = 1358;
-pub const ERROR_INTERNAL_ERROR: ::DWORD = 1359;
-pub const ERROR_GENERIC_NOT_MAPPED: ::DWORD = 1360;
-pub const ERROR_BAD_DESCRIPTOR_FORMAT: ::DWORD = 1361;
-pub const ERROR_NOT_LOGON_PROCESS: ::DWORD = 1362;
-pub const ERROR_LOGON_SESSION_EXISTS: ::DWORD = 1363;
-pub const ERROR_NO_SUCH_PACKAGE: ::DWORD = 1364;
-pub const ERROR_BAD_LOGON_SESSION_STATE: ::DWORD = 1365;
-pub const ERROR_LOGON_SESSION_COLLISION: ::DWORD = 1366;
-pub const ERROR_INVALID_LOGON_TYPE: ::DWORD = 1367;
-pub const ERROR_CANNOT_IMPERSONATE: ::DWORD = 1368;
-pub const ERROR_RXACT_INVALID_STATE: ::DWORD = 1369;
-pub const ERROR_RXACT_COMMIT_FAILURE: ::DWORD = 1370;
-pub const ERROR_SPECIAL_ACCOUNT: ::DWORD = 1371;
-pub const ERROR_SPECIAL_GROUP: ::DWORD = 1372;
-pub const ERROR_SPECIAL_USER: ::DWORD = 1373;
-pub const ERROR_MEMBERS_PRIMARY_GROUP: ::DWORD = 1374;
-pub const ERROR_TOKEN_ALREADY_IN_USE: ::DWORD = 1375;
-pub const ERROR_NO_SUCH_ALIAS: ::DWORD = 1376;
-pub const ERROR_MEMBER_NOT_IN_ALIAS: ::DWORD = 1377;
-pub const ERROR_MEMBER_IN_ALIAS: ::DWORD = 1378;
-pub const ERROR_ALIAS_EXISTS: ::DWORD = 1379;
-pub const ERROR_LOGON_NOT_GRANTED: ::DWORD = 1380;
-pub const ERROR_TOO_MANY_SECRETS: ::DWORD = 1381;
-pub const ERROR_SECRET_TOO_LONG: ::DWORD = 1382;
-pub const ERROR_INTERNAL_DB_ERROR: ::DWORD = 1383;
-pub const ERROR_TOO_MANY_CONTEXT_IDS: ::DWORD = 1384;
-pub const ERROR_LOGON_TYPE_NOT_GRANTED: ::DWORD = 1385;
-pub const ERROR_NT_CROSS_ENCRYPTION_REQUIRED: ::DWORD = 1386;
-pub const ERROR_NO_SUCH_MEMBER: ::DWORD = 1387;
-pub const ERROR_INVALID_MEMBER: ::DWORD = 1388;
-pub const ERROR_TOO_MANY_SIDS: ::DWORD = 1389;
-pub const ERROR_LM_CROSS_ENCRYPTION_REQUIRED: ::DWORD = 1390;
-pub const ERROR_NO_INHERITANCE: ::DWORD = 1391;
-pub const ERROR_FILE_CORRUPT: ::DWORD = 1392;
-pub const ERROR_DISK_CORRUPT: ::DWORD = 1393;
-pub const ERROR_NO_USER_SESSION_KEY: ::DWORD = 1394;
-pub const ERROR_LICENSE_QUOTA_EXCEEDED: ::DWORD = 1395;
-pub const ERROR_WRONG_TARGET_NAME: ::DWORD = 1396;
-pub const ERROR_MUTUAL_AUTH_FAILED: ::DWORD = 1397;
-pub const ERROR_TIME_SKEW: ::DWORD = 1398;
-pub const ERROR_CURRENT_DOMAIN_NOT_ALLOWED: ::DWORD = 1399;
-pub const ERROR_INVALID_WINDOW_HANDLE: ::DWORD = 1400;
-pub const ERROR_INVALID_MENU_HANDLE: ::DWORD = 1401;
-pub const ERROR_INVALID_CURSOR_HANDLE: ::DWORD = 1402;
-pub const ERROR_INVALID_ACCEL_HANDLE: ::DWORD = 1403;
-pub const ERROR_INVALID_HOOK_HANDLE: ::DWORD = 1404;
-pub const ERROR_INVALID_DWP_HANDLE: ::DWORD = 1405;
-pub const ERROR_TLW_WITH_WSCHILD: ::DWORD = 1406;
-pub const ERROR_CANNOT_FIND_WND_CLASS: ::DWORD = 1407;
-pub const ERROR_WINDOW_OF_OTHER_THREAD: ::DWORD = 1408;
-pub const ERROR_HOTKEY_ALREADY_REGISTERED: ::DWORD = 1409;
-pub const ERROR_CLASS_ALREADY_EXISTS: ::DWORD = 1410;
-pub const ERROR_CLASS_DOES_NOT_EXIST: ::DWORD = 1411;
-pub const ERROR_CLASS_HAS_WINDOWS: ::DWORD = 1412;
-pub const ERROR_INVALID_INDEX: ::DWORD = 1413;
-pub const ERROR_INVALID_ICON_HANDLE: ::DWORD = 1414;
-pub const ERROR_PRIVATE_DIALOG_INDEX: ::DWORD = 1415;
-pub const ERROR_LISTBOX_ID_NOT_FOUND: ::DWORD = 1416;
-pub const ERROR_NO_WILDCARD_CHARACTERS: ::DWORD = 1417;
-pub const ERROR_CLIPBOARD_NOT_OPEN: ::DWORD = 1418;
-pub const ERROR_HOTKEY_NOT_REGISTERED: ::DWORD = 1419;
-pub const ERROR_WINDOW_NOT_DIALOG: ::DWORD = 1420;
-pub const ERROR_CONTROL_ID_NOT_FOUND: ::DWORD = 1421;
-pub const ERROR_INVALID_COMBOBOX_MESSAGE: ::DWORD = 1422;
-pub const ERROR_WINDOW_NOT_COMBOBOX: ::DWORD = 1423;
-pub const ERROR_INVALID_EDIT_HEIGHT: ::DWORD = 1424;
-pub const ERROR_DC_NOT_FOUND: ::DWORD = 1425;
-pub const ERROR_INVALID_HOOK_FILTER: ::DWORD = 1426;
-pub const ERROR_INVALID_FILTER_PROC: ::DWORD = 1427;
-pub const ERROR_HOOK_NEEDS_HMOD: ::DWORD = 1428;
-pub const ERROR_GLOBAL_ONLY_HOOK: ::DWORD = 1429;
-pub const ERROR_JOURNAL_HOOK_SET: ::DWORD = 1430;
-pub const ERROR_HOOK_NOT_INSTALLED: ::DWORD = 1431;
-pub const ERROR_INVALID_LB_MESSAGE: ::DWORD = 1432;
-pub const ERROR_SETCOUNT_ON_BAD_LB: ::DWORD = 1433;
-pub const ERROR_LB_WITHOUT_TABSTOPS: ::DWORD = 1434;
-pub const ERROR_DESTROY_OBJECT_OF_OTHER_THREAD: ::DWORD = 1435;
-pub const ERROR_CHILD_WINDOW_MENU: ::DWORD = 1436;
-pub const ERROR_NO_SYSTEM_MENU: ::DWORD = 1437;
-pub const ERROR_INVALID_MSGBOX_STYLE: ::DWORD = 1438;
-pub const ERROR_INVALID_SPI_VALUE: ::DWORD = 1439;
-pub const ERROR_SCREEN_ALREADY_LOCKED: ::DWORD = 1440;
-pub const ERROR_HWNDS_HAVE_DIFF_PARENT: ::DWORD = 1441;
-pub const ERROR_NOT_CHILD_WINDOW: ::DWORD = 1442;
-pub const ERROR_INVALID_GW_COMMAND: ::DWORD = 1443;
-pub const ERROR_INVALID_THREAD_ID: ::DWORD = 1444;
-pub const ERROR_NON_MDICHILD_WINDOW: ::DWORD = 1445;
-pub const ERROR_POPUP_ALREADY_ACTIVE: ::DWORD = 1446;
-pub const ERROR_NO_SCROLLBARS: ::DWORD = 1447;
-pub const ERROR_INVALID_SCROLLBAR_RANGE: ::DWORD = 1448;
-pub const ERROR_INVALID_SHOWWIN_COMMAND: ::DWORD = 1449;
-pub const ERROR_NO_SYSTEM_RESOURCES: ::DWORD = 1450;
-pub const ERROR_NONPAGED_SYSTEM_RESOURCES: ::DWORD = 1451;
-pub const ERROR_PAGED_SYSTEM_RESOURCES: ::DWORD = 1452;
-pub const ERROR_WORKING_SET_QUOTA: ::DWORD = 1453;
-pub const ERROR_PAGEFILE_QUOTA: ::DWORD = 1454;
-pub const ERROR_COMMITMENT_LIMIT: ::DWORD = 1455;
-pub const ERROR_MENU_ITEM_NOT_FOUND: ::DWORD = 1456;
-pub const ERROR_INVALID_KEYBOARD_HANDLE: ::DWORD = 1457;
-pub const ERROR_HOOK_TYPE_NOT_ALLOWED: ::DWORD = 1458;
-pub const ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION: ::DWORD = 1459;
-pub const ERROR_TIMEOUT: ::DWORD = 1460;
-pub const ERROR_INVALID_MONITOR_HANDLE: ::DWORD = 1461;
-pub const ERROR_INCORRECT_SIZE: ::DWORD = 1462;
-pub const ERROR_SYMLINK_CLASS_DISABLED: ::DWORD = 1463;
-pub const ERROR_SYMLINK_NOT_SUPPORTED: ::DWORD = 1464;
-pub const ERROR_XML_PARSE_ERROR: ::DWORD = 1465;
-pub const ERROR_XMLDSIG_ERROR: ::DWORD = 1466;
-pub const ERROR_RESTART_APPLICATION: ::DWORD = 1467;
-pub const ERROR_WRONG_COMPARTMENT: ::DWORD = 1468;
-pub const ERROR_AUTHIP_FAILURE: ::DWORD = 1469;
-pub const ERROR_NO_NVRAM_RESOURCES: ::DWORD = 1470;
-pub const ERROR_NOT_GUI_PROCESS: ::DWORD = 1471;
-pub const ERROR_EVENTLOG_FILE_CORRUPT: ::DWORD = 1500;
-pub const ERROR_EVENTLOG_CANT_START: ::DWORD = 1501;
-pub const ERROR_LOG_FILE_FULL: ::DWORD = 1502;
-pub const ERROR_EVENTLOG_FILE_CHANGED: ::DWORD = 1503;
-pub const ERROR_INVALID_TASK_NAME: ::DWORD = 1550;
-pub const ERROR_INVALID_TASK_INDEX: ::DWORD = 1551;
-pub const ERROR_THREAD_ALREADY_IN_TASK: ::DWORD = 1552;
-pub const ERROR_INSTALL_SERVICE_FAILURE: ::DWORD = 1601;
-pub const ERROR_INSTALL_USEREXIT: ::DWORD = 1602;
-pub const ERROR_INSTALL_FAILURE: ::DWORD = 1603;
-pub const ERROR_INSTALL_SUSPEND: ::DWORD = 1604;
-pub const ERROR_UNKNOWN_PRODUCT: ::DWORD = 1605;
-pub const ERROR_UNKNOWN_FEATURE: ::DWORD = 1606;
-pub const ERROR_UNKNOWN_COMPONENT: ::DWORD = 1607;
-pub const ERROR_UNKNOWN_PROPERTY: ::DWORD = 1608;
-pub const ERROR_INVALID_HANDLE_STATE: ::DWORD = 1609;
-pub const ERROR_BAD_CONFIGURATION: ::DWORD = 1610;
-pub const ERROR_INDEX_ABSENT: ::DWORD = 1611;
-pub const ERROR_INSTALL_SOURCE_ABSENT: ::DWORD = 1612;
-pub const ERROR_INSTALL_PACKAGE_VERSION: ::DWORD = 1613;
-pub const ERROR_PRODUCT_UNINSTALLED: ::DWORD = 1614;
-pub const ERROR_BAD_QUERY_SYNTAX: ::DWORD = 1615;
-pub const ERROR_INVALID_FIELD: ::DWORD = 1616;
-pub const ERROR_DEVICE_REMOVED: ::DWORD = 1617;
-pub const ERROR_INSTALL_ALREADY_RUNNING: ::DWORD = 1618;
-pub const ERROR_INSTALL_PACKAGE_OPEN_FAILED: ::DWORD = 1619;
-pub const ERROR_INSTALL_PACKAGE_INVALID: ::DWORD = 1620;
-pub const ERROR_INSTALL_UI_FAILURE: ::DWORD = 1621;
-pub const ERROR_INSTALL_LOG_FAILURE: ::DWORD = 1622;
-pub const ERROR_INSTALL_LANGUAGE_UNSUPPORTED: ::DWORD = 1623;
-pub const ERROR_INSTALL_TRANSFORM_FAILURE: ::DWORD = 1624;
-pub const ERROR_INSTALL_PACKAGE_REJECTED: ::DWORD = 1625;
-pub const ERROR_FUNCTION_NOT_CALLED: ::DWORD = 1626;
-pub const ERROR_FUNCTION_FAILED: ::DWORD = 1627;
-pub const ERROR_INVALID_TABLE: ::DWORD = 1628;
-pub const ERROR_DATATYPE_MISMATCH: ::DWORD = 1629;
-pub const ERROR_UNSUPPORTED_TYPE: ::DWORD = 1630;
-pub const ERROR_CREATE_FAILED: ::DWORD = 1631;
-pub const ERROR_INSTALL_TEMP_UNWRITABLE: ::DWORD = 1632;
-pub const ERROR_INSTALL_PLATFORM_UNSUPPORTED: ::DWORD = 1633;
-pub const ERROR_INSTALL_NOTUSED: ::DWORD = 1634;
-pub const ERROR_PATCH_PACKAGE_OPEN_FAILED: ::DWORD = 1635;
-pub const ERROR_PATCH_PACKAGE_INVALID: ::DWORD = 1636;
-pub const ERROR_PATCH_PACKAGE_UNSUPPORTED: ::DWORD = 1637;
-pub const ERROR_PRODUCT_VERSION: ::DWORD = 1638;
-pub const ERROR_INVALID_COMMAND_LINE: ::DWORD = 1639;
-pub const ERROR_INSTALL_REMOTE_DISALLOWED: ::DWORD = 1640;
-pub const ERROR_SUCCESS_REBOOT_INITIATED: ::DWORD = 1641;
-pub const ERROR_PATCH_TARGET_NOT_FOUND: ::DWORD = 1642;
-pub const ERROR_PATCH_PACKAGE_REJECTED: ::DWORD = 1643;
-pub const ERROR_INSTALL_TRANSFORM_REJECTED: ::DWORD = 1644;
-pub const ERROR_INSTALL_REMOTE_PROHIBITED: ::DWORD = 1645;
-pub const ERROR_PATCH_REMOVAL_UNSUPPORTED: ::DWORD = 1646;
-pub const ERROR_UNKNOWN_PATCH: ::DWORD = 1647;
-pub const ERROR_PATCH_NO_SEQUENCE: ::DWORD = 1648;
-pub const ERROR_PATCH_REMOVAL_DISALLOWED: ::DWORD = 1649;
-pub const ERROR_INVALID_PATCH_XML: ::DWORD = 1650;
-pub const ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT: ::DWORD = 1651;
-pub const ERROR_INSTALL_SERVICE_SAFEBOOT: ::DWORD = 1652;
-pub const ERROR_FAIL_FAST_EXCEPTION: ::DWORD = 1653;
-pub const ERROR_INSTALL_REJECTED: ::DWORD = 1654;
-pub const ERROR_DYNAMIC_CODE_BLOCKED: ::DWORD = 1655;
-pub const RPC_S_INVALID_STRING_BINDING: ::DWORD = 1700;
-pub const RPC_S_WRONG_KIND_OF_BINDING: ::DWORD = 1701;
-pub const RPC_S_INVALID_BINDING: ::DWORD = 1702;
-pub const RPC_S_PROTSEQ_NOT_SUPPORTED: ::DWORD = 1703;
-pub const RPC_S_INVALID_RPC_PROTSEQ: ::DWORD = 1704;
-pub const RPC_S_INVALID_STRING_UUID: ::DWORD = 1705;
-pub const RPC_S_INVALID_ENDPOINT_FORMAT: ::DWORD = 1706;
-pub const RPC_S_INVALID_NET_ADDR: ::DWORD = 1707;
-pub const RPC_S_NO_ENDPOINT_FOUND: ::DWORD = 1708;
-pub const RPC_S_INVALID_TIMEOUT: ::DWORD = 1709;
-pub const RPC_S_OBJECT_NOT_FOUND: ::DWORD = 1710;
-pub const RPC_S_ALREADY_REGISTERED: ::DWORD = 1711;
-pub const RPC_S_TYPE_ALREADY_REGISTERED: ::DWORD = 1712;
-pub const RPC_S_ALREADY_LISTENING: ::DWORD = 1713;
-pub const RPC_S_NO_PROTSEQS_REGISTERED: ::DWORD = 1714;
-pub const RPC_S_NOT_LISTENING: ::DWORD = 1715;
-pub const RPC_S_UNKNOWN_MGR_TYPE: ::DWORD = 1716;
-pub const RPC_S_UNKNOWN_IF: ::DWORD = 1717;
-pub const RPC_S_NO_BINDINGS: ::DWORD = 1718;
-pub const RPC_S_NO_PROTSEQS: ::DWORD = 1719;
-pub const RPC_S_CANT_CREATE_ENDPOINT: ::DWORD = 1720;
-pub const RPC_S_OUT_OF_RESOURCES: ::DWORD = 1721;
-pub const RPC_S_SERVER_UNAVAILABLE: ::DWORD = 1722;
-pub const RPC_S_SERVER_TOO_BUSY: ::DWORD = 1723;
-pub const RPC_S_INVALID_NETWORK_OPTIONS: ::DWORD = 1724;
-pub const RPC_S_NO_CALL_ACTIVE: ::DWORD = 1725;
-pub const RPC_S_CALL_FAILED: ::DWORD = 1726;
-pub const RPC_S_CALL_FAILED_DNE: ::DWORD = 1727;
-pub const RPC_S_PROTOCOL_ERROR: ::DWORD = 1728;
-pub const RPC_S_PROXY_ACCESS_DENIED: ::DWORD = 1729;
-pub const RPC_S_UNSUPPORTED_TRANS_SYN: ::DWORD = 1730;
-pub const RPC_S_UNSUPPORTED_TYPE: ::DWORD = 1732;
-pub const RPC_S_INVALID_TAG: ::DWORD = 1733;
-pub const RPC_S_INVALID_BOUND: ::DWORD = 1734;
-pub const RPC_S_NO_ENTRY_NAME: ::DWORD = 1735;
-pub const RPC_S_INVALID_NAME_SYNTAX: ::DWORD = 1736;
-pub const RPC_S_UNSUPPORTED_NAME_SYNTAX: ::DWORD = 1737;
-pub const RPC_S_UUID_NO_ADDRESS: ::DWORD = 1739;
-pub const RPC_S_DUPLICATE_ENDPOINT: ::DWORD = 1740;
-pub const RPC_S_UNKNOWN_AUTHN_TYPE: ::DWORD = 1741;
-pub const RPC_S_MAX_CALLS_TOO_SMALL: ::DWORD = 1742;
-pub const RPC_S_STRING_TOO_LONG: ::DWORD = 1743;
-pub const RPC_S_PROTSEQ_NOT_FOUND: ::DWORD = 1744;
-pub const RPC_S_PROCNUM_OUT_OF_RANGE: ::DWORD = 1745;
-pub const RPC_S_BINDING_HAS_NO_AUTH: ::DWORD = 1746;
-pub const RPC_S_UNKNOWN_AUTHN_SERVICE: ::DWORD = 1747;
-pub const RPC_S_UNKNOWN_AUTHN_LEVEL: ::DWORD = 1748;
-pub const RPC_S_INVALID_AUTH_IDENTITY: ::DWORD = 1749;
-pub const RPC_S_UNKNOWN_AUTHZ_SERVICE: ::DWORD = 1750;
-pub const EPT_S_INVALID_ENTRY: ::DWORD = 1751;
-pub const EPT_S_CANT_PERFORM_OP: ::DWORD = 1752;
-pub const EPT_S_NOT_REGISTERED: ::DWORD = 1753;
-pub const RPC_S_NOTHING_TO_EXPORT: ::DWORD = 1754;
-pub const RPC_S_INCOMPLETE_NAME: ::DWORD = 1755;
-pub const RPC_S_INVALID_VERS_OPTION: ::DWORD = 1756;
-pub const RPC_S_NO_MORE_MEMBERS: ::DWORD = 1757;
-pub const RPC_S_NOT_ALL_OBJS_UNEXPORTED: ::DWORD = 1758;
-pub const RPC_S_INTERFACE_NOT_FOUND: ::DWORD = 1759;
-pub const RPC_S_ENTRY_ALREADY_EXISTS: ::DWORD = 1760;
-pub const RPC_S_ENTRY_NOT_FOUND: ::DWORD = 1761;
-pub const RPC_S_NAME_SERVICE_UNAVAILABLE: ::DWORD = 1762;
-pub const RPC_S_INVALID_NAF_ID: ::DWORD = 1763;
-pub const RPC_S_CANNOT_SUPPORT: ::DWORD = 1764;
-pub const RPC_S_NO_CONTEXT_AVAILABLE: ::DWORD = 1765;
-pub const RPC_S_INTERNAL_ERROR: ::DWORD = 1766;
-pub const RPC_S_ZERO_DIVIDE: ::DWORD = 1767;
-pub const RPC_S_ADDRESS_ERROR: ::DWORD = 1768;
-pub const RPC_S_FP_DIV_ZERO: ::DWORD = 1769;
-pub const RPC_S_FP_UNDERFLOW: ::DWORD = 1770;
-pub const RPC_S_FP_OVERFLOW: ::DWORD = 1771;
-pub const RPC_X_NO_MORE_ENTRIES: ::DWORD = 1772;
-pub const RPC_X_SS_CHAR_TRANS_OPEN_FAIL: ::DWORD = 1773;
-pub const RPC_X_SS_CHAR_TRANS_SHORT_FILE: ::DWORD = 1774;
-pub const RPC_X_SS_IN_NULL_CONTEXT: ::DWORD = 1775;
-pub const RPC_X_SS_CONTEXT_DAMAGED: ::DWORD = 1777;
-pub const RPC_X_SS_HANDLES_MISMATCH: ::DWORD = 1778;
-pub const RPC_X_SS_CANNOT_GET_CALL_HANDLE: ::DWORD = 1779;
-pub const RPC_X_NULL_REF_POINTER: ::DWORD = 1780;
-pub const RPC_X_ENUM_VALUE_OUT_OF_RANGE: ::DWORD = 1781;
-pub const RPC_X_BYTE_COUNT_TOO_SMALL: ::DWORD = 1782;
-pub const RPC_X_BAD_STUB_DATA: ::DWORD = 1783;
-pub const ERROR_INVALID_USER_BUFFER: ::DWORD = 1784;
-pub const ERROR_UNRECOGNIZED_MEDIA: ::DWORD = 1785;
-pub const ERROR_NO_TRUST_LSA_SECRET: ::DWORD = 1786;
-pub const ERROR_NO_TRUST_SAM_ACCOUNT: ::DWORD = 1787;
-pub const ERROR_TRUSTED_DOMAIN_FAILURE: ::DWORD = 1788;
-pub const ERROR_TRUSTED_RELATIONSHIP_FAILURE: ::DWORD = 1789;
-pub const ERROR_TRUST_FAILURE: ::DWORD = 1790;
-pub const RPC_S_CALL_IN_PROGRESS: ::DWORD = 1791;
-pub const ERROR_NETLOGON_NOT_STARTED: ::DWORD = 1792;
-pub const ERROR_ACCOUNT_EXPIRED: ::DWORD = 1793;
-pub const ERROR_REDIRECTOR_HAS_OPEN_HANDLES: ::DWORD = 1794;
-pub const ERROR_PRINTER_DRIVER_ALREADY_INSTALLED: ::DWORD = 1795;
-pub const ERROR_UNKNOWN_PORT: ::DWORD = 1796;
-pub const ERROR_UNKNOWN_PRINTER_DRIVER: ::DWORD = 1797;
-pub const ERROR_UNKNOWN_PRINTPROCESSOR: ::DWORD = 1798;
-pub const ERROR_INVALID_SEPARATOR_FILE: ::DWORD = 1799;
-pub const ERROR_INVALID_PRIORITY: ::DWORD = 1800;
-pub const ERROR_INVALID_PRINTER_NAME: ::DWORD = 1801;
-pub const ERROR_PRINTER_ALREADY_EXISTS: ::DWORD = 1802;
-pub const ERROR_INVALID_PRINTER_COMMAND: ::DWORD = 1803;
-pub const ERROR_INVALID_DATATYPE: ::DWORD = 1804;
-pub const ERROR_INVALID_ENVIRONMENT: ::DWORD = 1805;
-pub const RPC_S_NO_MORE_BINDINGS: ::DWORD = 1806;
-pub const ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT: ::DWORD = 1807;
-pub const ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT: ::DWORD = 1808;
-pub const ERROR_NOLOGON_SERVER_TRUST_ACCOUNT: ::DWORD = 1809;
-pub const ERROR_DOMAIN_TRUST_INCONSISTENT: ::DWORD = 1810;
-pub const ERROR_SERVER_HAS_OPEN_HANDLES: ::DWORD = 1811;
-pub const ERROR_RESOURCE_DATA_NOT_FOUND: ::DWORD = 1812;
-pub const ERROR_RESOURCE_TYPE_NOT_FOUND: ::DWORD = 1813;
-pub const ERROR_RESOURCE_NAME_NOT_FOUND: ::DWORD = 1814;
-pub const ERROR_RESOURCE_LANG_NOT_FOUND: ::DWORD = 1815;
-pub const ERROR_NOT_ENOUGH_QUOTA: ::DWORD = 1816;
-pub const RPC_S_NO_INTERFACES: ::DWORD = 1817;
-pub const RPC_S_CALL_CANCELLED: ::DWORD = 1818;
-pub const RPC_S_BINDING_INCOMPLETE: ::DWORD = 1819;
-pub const RPC_S_COMM_FAILURE: ::DWORD = 1820;
-pub const RPC_S_UNSUPPORTED_AUTHN_LEVEL: ::DWORD = 1821;
-pub const RPC_S_NO_PRINC_NAME: ::DWORD = 1822;
-pub const RPC_S_NOT_RPC_ERROR: ::DWORD = 1823;
-pub const RPC_S_UUID_LOCAL_ONLY: ::DWORD = 1824;
-pub const RPC_S_SEC_PKG_ERROR: ::DWORD = 1825;
-pub const RPC_S_NOT_CANCELLED: ::DWORD = 1826;
-pub const RPC_X_INVALID_ES_ACTION: ::DWORD = 1827;
-pub const RPC_X_WRONG_ES_VERSION: ::DWORD = 1828;
-pub const RPC_X_WRONG_STUB_VERSION: ::DWORD = 1829;
-pub const RPC_X_INVALID_PIPE_OBJECT: ::DWORD = 1830;
-pub const RPC_X_WRONG_PIPE_ORDER: ::DWORD = 1831;
-pub const RPC_X_WRONG_PIPE_VERSION: ::DWORD = 1832;
-pub const RPC_S_COOKIE_AUTH_FAILED: ::DWORD = 1833;
-pub const RPC_S_GROUP_MEMBER_NOT_FOUND: ::DWORD = 1898;
-pub const EPT_S_CANT_CREATE: ::DWORD = 1899;
-pub const RPC_S_INVALID_OBJECT: ::DWORD = 1900;
-pub const ERROR_INVALID_TIME: ::DWORD = 1901;
-pub const ERROR_INVALID_FORM_NAME: ::DWORD = 1902;
-pub const ERROR_INVALID_FORM_SIZE: ::DWORD = 1903;
-pub const ERROR_ALREADY_WAITING: ::DWORD = 1904;
-pub const ERROR_PRINTER_DELETED: ::DWORD = 1905;
-pub const ERROR_INVALID_PRINTER_STATE: ::DWORD = 1906;
-pub const ERROR_PASSWORD_MUST_CHANGE: ::DWORD = 1907;
-pub const ERROR_DOMAIN_CONTROLLER_NOT_FOUND: ::DWORD = 1908;
-pub const ERROR_ACCOUNT_LOCKED_OUT: ::DWORD = 1909;
-pub const OR_INVALID_OXID: ::DWORD = 1910;
-pub const OR_INVALID_OID: ::DWORD = 1911;
-pub const OR_INVALID_SET: ::DWORD = 1912;
-pub const RPC_S_SEND_INCOMPLETE: ::DWORD = 1913;
-pub const RPC_S_INVALID_ASYNC_HANDLE: ::DWORD = 1914;
-pub const RPC_S_INVALID_ASYNC_CALL: ::DWORD = 1915;
-pub const RPC_X_PIPE_CLOSED: ::DWORD = 1916;
-pub const RPC_X_PIPE_DISCIPLINE_ERROR: ::DWORD = 1917;
-pub const RPC_X_PIPE_EMPTY: ::DWORD = 1918;
-pub const ERROR_NO_SITENAME: ::DWORD = 1919;
-pub const ERROR_CANT_ACCESS_FILE: ::DWORD = 1920;
-pub const ERROR_CANT_RESOLVE_FILENAME: ::DWORD = 1921;
-pub const RPC_S_ENTRY_TYPE_MISMATCH: ::DWORD = 1922;
-pub const RPC_S_NOT_ALL_OBJS_EXPORTED: ::DWORD = 1923;
-pub const RPC_S_INTERFACE_NOT_EXPORTED: ::DWORD = 1924;
-pub const RPC_S_PROFILE_NOT_ADDED: ::DWORD = 1925;
-pub const RPC_S_PRF_ELT_NOT_ADDED: ::DWORD = 1926;
-pub const RPC_S_PRF_ELT_NOT_REMOVED: ::DWORD = 1927;
-pub const RPC_S_GRP_ELT_NOT_ADDED: ::DWORD = 1928;
-pub const RPC_S_GRP_ELT_NOT_REMOVED: ::DWORD = 1929;
-pub const ERROR_KM_DRIVER_BLOCKED: ::DWORD = 1930;
-pub const ERROR_CONTEXT_EXPIRED: ::DWORD = 1931;
-pub const ERROR_PER_USER_TRUST_QUOTA_EXCEEDED: ::DWORD = 1932;
-pub const ERROR_ALL_USER_TRUST_QUOTA_EXCEEDED: ::DWORD = 1933;
-pub const ERROR_USER_DELETE_TRUST_QUOTA_EXCEEDED: ::DWORD = 1934;
-pub const ERROR_AUTHENTICATION_FIREWALL_FAILED: ::DWORD = 1935;
-pub const ERROR_REMOTE_PRINT_CONNECTIONS_BLOCKED: ::DWORD = 1936;
-pub const ERROR_NTLM_BLOCKED: ::DWORD = 1937;
-pub const ERROR_PASSWORD_CHANGE_REQUIRED: ::DWORD = 1938;
-pub const ERROR_INVALID_PIXEL_FORMAT: ::DWORD = 2000;
-pub const ERROR_BAD_DRIVER: ::DWORD = 2001;
-pub const ERROR_INVALID_WINDOW_STYLE: ::DWORD = 2002;
-pub const ERROR_METAFILE_NOT_SUPPORTED: ::DWORD = 2003;
-pub const ERROR_TRANSFORM_NOT_SUPPORTED: ::DWORD = 2004;
-pub const ERROR_CLIPPING_NOT_SUPPORTED: ::DWORD = 2005;
-pub const ERROR_INVALID_CMM: ::DWORD = 2010;
-pub const ERROR_INVALID_PROFILE: ::DWORD = 2011;
-pub const ERROR_TAG_NOT_FOUND: ::DWORD = 2012;
-pub const ERROR_TAG_NOT_PRESENT: ::DWORD = 2013;
-pub const ERROR_DUPLICATE_TAG: ::DWORD = 2014;
-pub const ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE: ::DWORD = 2015;
-pub const ERROR_PROFILE_NOT_FOUND: ::DWORD = 2016;
-pub const ERROR_INVALID_COLORSPACE: ::DWORD = 2017;
-pub const ERROR_ICM_NOT_ENABLED: ::DWORD = 2018;
-pub const ERROR_DELETING_ICM_XFORM: ::DWORD = 2019;
-pub const ERROR_INVALID_TRANSFORM: ::DWORD = 2020;
-pub const ERROR_COLORSPACE_MISMATCH: ::DWORD = 2021;
-pub const ERROR_INVALID_COLORINDEX: ::DWORD = 2022;
-pub const ERROR_PROFILE_DOES_NOT_MATCH_DEVICE: ::DWORD = 2023;
-pub const ERROR_CONNECTED_OTHER_PASSWORD: ::DWORD = 2108;
-pub const ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT: ::DWORD = 2109;
-pub const ERROR_BAD_USERNAME: ::DWORD = 2202;
-pub const ERROR_NOT_CONNECTED: ::DWORD = 2250;
-pub const ERROR_OPEN_FILES: ::DWORD = 2401;
-pub const ERROR_ACTIVE_CONNECTIONS: ::DWORD = 2402;
-pub const ERROR_DEVICE_IN_USE: ::DWORD = 2404;
-pub const ERROR_UNKNOWN_PRINT_MONITOR: ::DWORD = 3000;
-pub const ERROR_PRINTER_DRIVER_IN_USE: ::DWORD = 3001;
-pub const ERROR_SPOOL_FILE_NOT_FOUND: ::DWORD = 3002;
-pub const ERROR_SPL_NO_STARTDOC: ::DWORD = 3003;
-pub const ERROR_SPL_NO_ADDJOB: ::DWORD = 3004;
-pub const ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED: ::DWORD = 3005;
-pub const ERROR_PRINT_MONITOR_ALREADY_INSTALLED: ::DWORD = 3006;
-pub const ERROR_INVALID_PRINT_MONITOR: ::DWORD = 3007;
-pub const ERROR_PRINT_MONITOR_IN_USE: ::DWORD = 3008;
-pub const ERROR_PRINTER_HAS_JOBS_QUEUED: ::DWORD = 3009;
-pub const ERROR_SUCCESS_REBOOT_REQUIRED: ::DWORD = 3010;
-pub const ERROR_SUCCESS_RESTART_REQUIRED: ::DWORD = 3011;
-pub const ERROR_PRINTER_NOT_FOUND: ::DWORD = 3012;
-pub const ERROR_PRINTER_DRIVER_WARNED: ::DWORD = 3013;
-pub const ERROR_PRINTER_DRIVER_BLOCKED: ::DWORD = 3014;
-pub const ERROR_PRINTER_DRIVER_PACKAGE_IN_USE: ::DWORD = 3015;
-pub const ERROR_CORE_DRIVER_PACKAGE_NOT_FOUND: ::DWORD = 3016;
-pub const ERROR_FAIL_REBOOT_REQUIRED: ::DWORD = 3017;
-pub const ERROR_FAIL_REBOOT_INITIATED: ::DWORD = 3018;
-pub const ERROR_PRINTER_DRIVER_DOWNLOAD_NEEDED: ::DWORD = 3019;
-pub const ERROR_PRINT_JOB_RESTART_REQUIRED: ::DWORD = 3020;
-pub const ERROR_INVALID_PRINTER_DRIVER_MANIFEST: ::DWORD = 3021;
-pub const ERROR_PRINTER_NOT_SHAREABLE: ::DWORD = 3022;
-pub const ERROR_REQUEST_PAUSED: ::DWORD = 3050;
-pub const ERROR_IO_REISSUE_AS_CACHED: ::DWORD = 3950;
-pub const ERROR_WINS_INTERNAL: ::DWORD = 4000;
-pub const ERROR_CAN_NOT_DEL_LOCAL_WINS: ::DWORD = 4001;
-pub const ERROR_STATIC_INIT: ::DWORD = 4002;
-pub const ERROR_INC_BACKUP: ::DWORD = 4003;
-pub const ERROR_FULL_BACKUP: ::DWORD = 4004;
-pub const ERROR_REC_NON_EXISTENT: ::DWORD = 4005;
-pub const ERROR_RPL_NOT_ALLOWED: ::DWORD = 4006;
-pub const PEERDIST_ERROR_CONTENTINFO_VERSION_UNSUPPORTED: ::DWORD = 4050;
-pub const PEERDIST_ERROR_CANNOT_PARSE_CONTENTINFO: ::DWORD = 4051;
-pub const PEERDIST_ERROR_MISSING_DATA: ::DWORD = 4052;
-pub const PEERDIST_ERROR_NO_MORE: ::DWORD = 4053;
-pub const PEERDIST_ERROR_NOT_INITIALIZED: ::DWORD = 4054;
-pub const PEERDIST_ERROR_ALREADY_INITIALIZED: ::DWORD = 4055;
-pub const PEERDIST_ERROR_SHUTDOWN_IN_PROGRESS: ::DWORD = 4056;
-pub const PEERDIST_ERROR_INVALIDATED: ::DWORD = 4057;
-pub const PEERDIST_ERROR_ALREADY_EXISTS: ::DWORD = 4058;
-pub const PEERDIST_ERROR_OPERATION_NOTFOUND: ::DWORD = 4059;
-pub const PEERDIST_ERROR_ALREADY_COMPLETED: ::DWORD = 4060;
-pub const PEERDIST_ERROR_OUT_OF_BOUNDS: ::DWORD = 4061;
-pub const PEERDIST_ERROR_VERSION_UNSUPPORTED: ::DWORD = 4062;
-pub const PEERDIST_ERROR_INVALID_CONFIGURATION: ::DWORD = 4063;
-pub const PEERDIST_ERROR_NOT_LICENSED: ::DWORD = 4064;
-pub const PEERDIST_ERROR_SERVICE_UNAVAILABLE: ::DWORD = 4065;
-pub const PEERDIST_ERROR_TRUST_FAILURE: ::DWORD = 4066;
-pub const ERROR_DHCP_ADDRESS_CONFLICT: ::DWORD = 4100;
-pub const ERROR_WMI_GUID_NOT_FOUND: ::DWORD = 4200;
-pub const ERROR_WMI_INSTANCE_NOT_FOUND: ::DWORD = 4201;
-pub const ERROR_WMI_ITEMID_NOT_FOUND: ::DWORD = 4202;
-pub const ERROR_WMI_TRY_AGAIN: ::DWORD = 4203;
-pub const ERROR_WMI_DP_NOT_FOUND: ::DWORD = 4204;
-pub const ERROR_WMI_UNRESOLVED_INSTANCE_REF: ::DWORD = 4205;
-pub const ERROR_WMI_ALREADY_ENABLED: ::DWORD = 4206;
-pub const ERROR_WMI_GUID_DISCONNECTED: ::DWORD = 4207;
-pub const ERROR_WMI_SERVER_UNAVAILABLE: ::DWORD = 4208;
-pub const ERROR_WMI_DP_FAILED: ::DWORD = 4209;
-pub const ERROR_WMI_INVALID_MOF: ::DWORD = 4210;
-pub const ERROR_WMI_INVALID_REGINFO: ::DWORD = 4211;
-pub const ERROR_WMI_ALREADY_DISABLED: ::DWORD = 4212;
-pub const ERROR_WMI_READ_ONLY: ::DWORD = 4213;
-pub const ERROR_WMI_SET_FAILURE: ::DWORD = 4214;
-pub const ERROR_NOT_APPCONTAINER: ::DWORD = 4250;
-pub const ERROR_APPCONTAINER_REQUIRED: ::DWORD = 4251;
-pub const ERROR_NOT_SUPPORTED_IN_APPCONTAINER: ::DWORD = 4252;
-pub const ERROR_INVALID_PACKAGE_SID_LENGTH: ::DWORD = 4253;
-pub const ERROR_INVALID_MEDIA: ::DWORD = 4300;
-pub const ERROR_INVALID_LIBRARY: ::DWORD = 4301;
-pub const ERROR_INVALID_MEDIA_POOL: ::DWORD = 4302;
-pub const ERROR_DRIVE_MEDIA_MISMATCH: ::DWORD = 4303;
-pub const ERROR_MEDIA_OFFLINE: ::DWORD = 4304;
-pub const ERROR_LIBRARY_OFFLINE: ::DWORD = 4305;
-pub const ERROR_EMPTY: ::DWORD = 4306;
-pub const ERROR_NOT_EMPTY: ::DWORD = 4307;
-pub const ERROR_MEDIA_UNAVAILABLE: ::DWORD = 4308;
-pub const ERROR_RESOURCE_DISABLED: ::DWORD = 4309;
-pub const ERROR_INVALID_CLEANER: ::DWORD = 4310;
-pub const ERROR_UNABLE_TO_CLEAN: ::DWORD = 4311;
-pub const ERROR_OBJECT_NOT_FOUND: ::DWORD = 4312;
-pub const ERROR_DATABASE_FAILURE: ::DWORD = 4313;
-pub const ERROR_DATABASE_FULL: ::DWORD = 4314;
-pub const ERROR_MEDIA_INCOMPATIBLE: ::DWORD = 4315;
-pub const ERROR_RESOURCE_NOT_PRESENT: ::DWORD = 4316;
-pub const ERROR_INVALID_OPERATION: ::DWORD = 4317;
-pub const ERROR_MEDIA_NOT_AVAILABLE: ::DWORD = 4318;
-pub const ERROR_DEVICE_NOT_AVAILABLE: ::DWORD = 4319;
-pub const ERROR_REQUEST_REFUSED: ::DWORD = 4320;
-pub const ERROR_INVALID_DRIVE_OBJECT: ::DWORD = 4321;
-pub const ERROR_LIBRARY_FULL: ::DWORD = 4322;
-pub const ERROR_MEDIUM_NOT_ACCESSIBLE: ::DWORD = 4323;
-pub const ERROR_UNABLE_TO_LOAD_MEDIUM: ::DWORD = 4324;
-pub const ERROR_UNABLE_TO_INVENTORY_DRIVE: ::DWORD = 4325;
-pub const ERROR_UNABLE_TO_INVENTORY_SLOT: ::DWORD = 4326;
-pub const ERROR_UNABLE_TO_INVENTORY_TRANSPORT: ::DWORD = 4327;
-pub const ERROR_TRANSPORT_FULL: ::DWORD = 4328;
-pub const ERROR_CONTROLLING_IEPORT: ::DWORD = 4329;
-pub const ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA: ::DWORD = 4330;
-pub const ERROR_CLEANER_SLOT_SET: ::DWORD = 4331;
-pub const ERROR_CLEANER_SLOT_NOT_SET: ::DWORD = 4332;
-pub const ERROR_CLEANER_CARTRIDGE_SPENT: ::DWORD = 4333;
-pub const ERROR_UNEXPECTED_OMID: ::DWORD = 4334;
-pub const ERROR_CANT_DELETE_LAST_ITEM: ::DWORD = 4335;
-pub const ERROR_MESSAGE_EXCEEDS_MAX_SIZE: ::DWORD = 4336;
-pub const ERROR_VOLUME_CONTAINS_SYS_FILES: ::DWORD = 4337;
-pub const ERROR_INDIGENOUS_TYPE: ::DWORD = 4338;
-pub const ERROR_NO_SUPPORTING_DRIVES: ::DWORD = 4339;
-pub const ERROR_CLEANER_CARTRIDGE_INSTALLED: ::DWORD = 4340;
-pub const ERROR_IEPORT_FULL: ::DWORD = 4341;
-pub const ERROR_FILE_OFFLINE: ::DWORD = 4350;
-pub const ERROR_REMOTE_STORAGE_NOT_ACTIVE: ::DWORD = 4351;
-pub const ERROR_REMOTE_STORAGE_MEDIA_ERROR: ::DWORD = 4352;
-pub const ERROR_NOT_A_REPARSE_POINT: ::DWORD = 4390;
-pub const ERROR_REPARSE_ATTRIBUTE_CONFLICT: ::DWORD = 4391;
-pub const ERROR_INVALID_REPARSE_DATA: ::DWORD = 4392;
-pub const ERROR_REPARSE_TAG_INVALID: ::DWORD = 4393;
-pub const ERROR_REPARSE_TAG_MISMATCH: ::DWORD = 4394;
-pub const ERROR_APP_DATA_NOT_FOUND: ::DWORD = 4400;
-pub const ERROR_APP_DATA_EXPIRED: ::DWORD = 4401;
-pub const ERROR_APP_DATA_CORRUPT: ::DWORD = 4402;
-pub const ERROR_APP_DATA_LIMIT_EXCEEDED: ::DWORD = 4403;
-pub const ERROR_APP_DATA_REBOOT_REQUIRED: ::DWORD = 4404;
-pub const ERROR_SECUREBOOT_ROLLBACK_DETECTED: ::DWORD = 4420;
-pub const ERROR_SECUREBOOT_POLICY_VIOLATION: ::DWORD = 4421;
-pub const ERROR_SECUREBOOT_INVALID_POLICY: ::DWORD = 4422;
-pub const ERROR_SECUREBOOT_POLICY_PUBLISHER_NOT_FOUND: ::DWORD = 4423;
-pub const ERROR_SECUREBOOT_POLICY_NOT_SIGNED: ::DWORD = 4424;
-pub const ERROR_SECUREBOOT_NOT_ENABLED: ::DWORD = 4425;
-pub const ERROR_SECUREBOOT_FILE_REPLACED: ::DWORD = 4426;
-pub const ERROR_OFFLOAD_READ_FLT_NOT_SUPPORTED: ::DWORD = 4440;
-pub const ERROR_OFFLOAD_WRITE_FLT_NOT_SUPPORTED: ::DWORD = 4441;
-pub const ERROR_OFFLOAD_READ_FILE_NOT_SUPPORTED: ::DWORD = 4442;
-pub const ERROR_OFFLOAD_WRITE_FILE_NOT_SUPPORTED: ::DWORD = 4443;
-pub const ERROR_VOLUME_NOT_SIS_ENABLED: ::DWORD = 4500;
-pub const ERROR_DEPENDENT_RESOURCE_EXISTS: ::DWORD = 5001;
-pub const ERROR_DEPENDENCY_NOT_FOUND: ::DWORD = 5002;
-pub const ERROR_DEPENDENCY_ALREADY_EXISTS: ::DWORD = 5003;
-pub const ERROR_RESOURCE_NOT_ONLINE: ::DWORD = 5004;
-pub const ERROR_HOST_NODE_NOT_AVAILABLE: ::DWORD = 5005;
-pub const ERROR_RESOURCE_NOT_AVAILABLE: ::DWORD = 5006;
-pub const ERROR_RESOURCE_NOT_FOUND: ::DWORD = 5007;
-pub const ERROR_SHUTDOWN_CLUSTER: ::DWORD = 5008;
-pub const ERROR_CANT_EVICT_ACTIVE_NODE: ::DWORD = 5009;
-pub const ERROR_OBJECT_ALREADY_EXISTS: ::DWORD = 5010;
-pub const ERROR_OBJECT_IN_LIST: ::DWORD = 5011;
-pub const ERROR_GROUP_NOT_AVAILABLE: ::DWORD = 5012;
-pub const ERROR_GROUP_NOT_FOUND: ::DWORD = 5013;
-pub const ERROR_GROUP_NOT_ONLINE: ::DWORD = 5014;
-pub const ERROR_HOST_NODE_NOT_RESOURCE_OWNER: ::DWORD = 5015;
-pub const ERROR_HOST_NODE_NOT_GROUP_OWNER: ::DWORD = 5016;
-pub const ERROR_RESMON_CREATE_FAILED: ::DWORD = 5017;
-pub const ERROR_RESMON_ONLINE_FAILED: ::DWORD = 5018;
-pub const ERROR_RESOURCE_ONLINE: ::DWORD = 5019;
-pub const ERROR_QUORUM_RESOURCE: ::DWORD = 5020;
-pub const ERROR_NOT_QUORUM_CAPABLE: ::DWORD = 5021;
-pub const ERROR_CLUSTER_SHUTTING_DOWN: ::DWORD = 5022;
-pub const ERROR_INVALID_STATE: ::DWORD = 5023;
-pub const ERROR_RESOURCE_PROPERTIES_STORED: ::DWORD = 5024;
-pub const ERROR_NOT_QUORUM_CLASS: ::DWORD = 5025;
-pub const ERROR_CORE_RESOURCE: ::DWORD = 5026;
-pub const ERROR_QUORUM_RESOURCE_ONLINE_FAILED: ::DWORD = 5027;
-pub const ERROR_QUORUMLOG_OPEN_FAILED: ::DWORD = 5028;
-pub const ERROR_CLUSTERLOG_CORRUPT: ::DWORD = 5029;
-pub const ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE: ::DWORD = 5030;
-pub const ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE: ::DWORD = 5031;
-pub const ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND: ::DWORD = 5032;
-pub const ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE: ::DWORD = 5033;
-pub const ERROR_QUORUM_OWNER_ALIVE: ::DWORD = 5034;
-pub const ERROR_NETWORK_NOT_AVAILABLE: ::DWORD = 5035;
-pub const ERROR_NODE_NOT_AVAILABLE: ::DWORD = 5036;
-pub const ERROR_ALL_NODES_NOT_AVAILABLE: ::DWORD = 5037;
-pub const ERROR_RESOURCE_FAILED: ::DWORD = 5038;
-pub const ERROR_CLUSTER_INVALID_NODE: ::DWORD = 5039;
-pub const ERROR_CLUSTER_NODE_EXISTS: ::DWORD = 5040;
-pub const ERROR_CLUSTER_JOIN_IN_PROGRESS: ::DWORD = 5041;
-pub const ERROR_CLUSTER_NODE_NOT_FOUND: ::DWORD = 5042;
-pub const ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND: ::DWORD = 5043;
-pub const ERROR_CLUSTER_NETWORK_EXISTS: ::DWORD = 5044;
-pub const ERROR_CLUSTER_NETWORK_NOT_FOUND: ::DWORD = 5045;
-pub const ERROR_CLUSTER_NETINTERFACE_EXISTS: ::DWORD = 5046;
-pub const ERROR_CLUSTER_NETINTERFACE_NOT_FOUND: ::DWORD = 5047;
-pub const ERROR_CLUSTER_INVALID_REQUEST: ::DWORD = 5048;
-pub const ERROR_CLUSTER_INVALID_NETWORK_PROVIDER: ::DWORD = 5049;
-pub const ERROR_CLUSTER_NODE_DOWN: ::DWORD = 5050;
-pub const ERROR_CLUSTER_NODE_UNREACHABLE: ::DWORD = 5051;
-pub const ERROR_CLUSTER_NODE_NOT_MEMBER: ::DWORD = 5052;
-pub const ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS: ::DWORD = 5053;
-pub const ERROR_CLUSTER_INVALID_NETWORK: ::DWORD = 5054;
-pub const ERROR_CLUSTER_NODE_UP: ::DWORD = 5056;
-pub const ERROR_CLUSTER_IPADDR_IN_USE: ::DWORD = 5057;
-pub const ERROR_CLUSTER_NODE_NOT_PAUSED: ::DWORD = 5058;
-pub const ERROR_CLUSTER_NO_SECURITY_CONTEXT: ::DWORD = 5059;
-pub const ERROR_CLUSTER_NETWORK_NOT_INTERNAL: ::DWORD = 5060;
-pub const ERROR_CLUSTER_NODE_ALREADY_UP: ::DWORD = 5061;
-pub const ERROR_CLUSTER_NODE_ALREADY_DOWN: ::DWORD = 5062;
-pub const ERROR_CLUSTER_NETWORK_ALREADY_ONLINE: ::DWORD = 5063;
-pub const ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE: ::DWORD = 5064;
-pub const ERROR_CLUSTER_NODE_ALREADY_MEMBER: ::DWORD = 5065;
-pub const ERROR_CLUSTER_LAST_INTERNAL_NETWORK: ::DWORD = 5066;
-pub const ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS: ::DWORD = 5067;
-pub const ERROR_INVALID_OPERATION_ON_QUORUM: ::DWORD = 5068;
-pub const ERROR_DEPENDENCY_NOT_ALLOWED: ::DWORD = 5069;
-pub const ERROR_CLUSTER_NODE_PAUSED: ::DWORD = 5070;
-pub const ERROR_NODE_CANT_HOST_RESOURCE: ::DWORD = 5071;
-pub const ERROR_CLUSTER_NODE_NOT_READY: ::DWORD = 5072;
-pub const ERROR_CLUSTER_NODE_SHUTTING_DOWN: ::DWORD = 5073;
-pub const ERROR_CLUSTER_JOIN_ABORTED: ::DWORD = 5074;
-pub const ERROR_CLUSTER_INCOMPATIBLE_VERSIONS: ::DWORD = 5075;
-pub const ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED: ::DWORD = 5076;
-pub const ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED: ::DWORD = 5077;
-pub const ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND: ::DWORD = 5078;
-pub const ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED: ::DWORD = 5079;
-pub const ERROR_CLUSTER_RESNAME_NOT_FOUND: ::DWORD = 5080;
-pub const ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED: ::DWORD = 5081;
-pub const ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST: ::DWORD = 5082;
-pub const ERROR_CLUSTER_DATABASE_SEQMISMATCH: ::DWORD = 5083;
-pub const ERROR_RESMON_INVALID_STATE: ::DWORD = 5084;
-pub const ERROR_CLUSTER_GUM_NOT_LOCKER: ::DWORD = 5085;
-pub const ERROR_QUORUM_DISK_NOT_FOUND: ::DWORD = 5086;
-pub const ERROR_DATABASE_BACKUP_CORRUPT: ::DWORD = 5087;
-pub const ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT: ::DWORD = 5088;
-pub const ERROR_RESOURCE_PROPERTY_UNCHANGEABLE: ::DWORD = 5089;
-pub const ERROR_NO_ADMIN_ACCESS_POINT: ::DWORD = 5090;
-pub const ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE: ::DWORD = 5890;
-pub const ERROR_CLUSTER_QUORUMLOG_NOT_FOUND: ::DWORD = 5891;
-pub const ERROR_CLUSTER_MEMBERSHIP_HALT: ::DWORD = 5892;
-pub const ERROR_CLUSTER_INSTANCE_ID_MISMATCH: ::DWORD = 5893;
-pub const ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP: ::DWORD = 5894;
-pub const ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH: ::DWORD = 5895;
-pub const ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP: ::DWORD = 5896;
-pub const ERROR_CLUSTER_PARAMETER_MISMATCH: ::DWORD = 5897;
-pub const ERROR_NODE_CANNOT_BE_CLUSTERED: ::DWORD = 5898;
-pub const ERROR_CLUSTER_WRONG_OS_VERSION: ::DWORD = 5899;
-pub const ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME: ::DWORD = 5900;
-pub const ERROR_CLUSCFG_ALREADY_COMMITTED: ::DWORD = 5901;
-pub const ERROR_CLUSCFG_ROLLBACK_FAILED: ::DWORD = 5902;
-pub const ERROR_CLUSCFG_SYSTEM_DISK_DRIVE_LETTER_CONFLICT: ::DWORD = 5903;
-pub const ERROR_CLUSTER_OLD_VERSION: ::DWORD = 5904;
-pub const ERROR_CLUSTER_MISMATCHED_COMPUTER_ACCT_NAME: ::DWORD = 5905;
-pub const ERROR_CLUSTER_NO_NET_ADAPTERS: ::DWORD = 5906;
-pub const ERROR_CLUSTER_POISONED: ::DWORD = 5907;
-pub const ERROR_CLUSTER_GROUP_MOVING: ::DWORD = 5908;
-pub const ERROR_CLUSTER_RESOURCE_TYPE_BUSY: ::DWORD = 5909;
-pub const ERROR_RESOURCE_CALL_TIMED_OUT: ::DWORD = 5910;
-pub const ERROR_INVALID_CLUSTER_IPV6_ADDRESS: ::DWORD = 5911;
-pub const ERROR_CLUSTER_INTERNAL_INVALID_FUNCTION: ::DWORD = 5912;
-pub const ERROR_CLUSTER_PARAMETER_OUT_OF_BOUNDS: ::DWORD = 5913;
-pub const ERROR_CLUSTER_PARTIAL_SEND: ::DWORD = 5914;
-pub const ERROR_CLUSTER_REGISTRY_INVALID_FUNCTION: ::DWORD = 5915;
-pub const ERROR_CLUSTER_INVALID_STRING_TERMINATION: ::DWORD = 5916;
-pub const ERROR_CLUSTER_INVALID_STRING_FORMAT: ::DWORD = 5917;
-pub const ERROR_CLUSTER_DATABASE_TRANSACTION_IN_PROGRESS: ::DWORD = 5918;
-pub const ERROR_CLUSTER_DATABASE_TRANSACTION_NOT_IN_PROGRESS: ::DWORD = 5919;
-pub const ERROR_CLUSTER_NULL_DATA: ::DWORD = 5920;
-pub const ERROR_CLUSTER_PARTIAL_READ: ::DWORD = 5921;
-pub const ERROR_CLUSTER_PARTIAL_WRITE: ::DWORD = 5922;
-pub const ERROR_CLUSTER_CANT_DESERIALIZE_DATA: ::DWORD = 5923;
-pub const ERROR_DEPENDENT_RESOURCE_PROPERTY_CONFLICT: ::DWORD = 5924;
-pub const ERROR_CLUSTER_NO_QUORUM: ::DWORD = 5925;
-pub const ERROR_CLUSTER_INVALID_IPV6_NETWORK: ::DWORD = 5926;
-pub const ERROR_CLUSTER_INVALID_IPV6_TUNNEL_NETWORK: ::DWORD = 5927;
-pub const ERROR_QUORUM_NOT_ALLOWED_IN_THIS_GROUP: ::DWORD = 5928;
-pub const ERROR_DEPENDENCY_TREE_TOO_COMPLEX: ::DWORD = 5929;
-pub const ERROR_EXCEPTION_IN_RESOURCE_CALL: ::DWORD = 5930;
-pub const ERROR_CLUSTER_RHS_FAILED_INITIALIZATION: ::DWORD = 5931;
-pub const ERROR_CLUSTER_NOT_INSTALLED: ::DWORD = 5932;
-pub const ERROR_CLUSTER_RESOURCES_MUST_BE_ONLINE_ON_THE_SAME_NODE: ::DWORD = 5933;
-pub const ERROR_CLUSTER_MAX_NODES_IN_CLUSTER: ::DWORD = 5934;
-pub const ERROR_CLUSTER_TOO_MANY_NODES: ::DWORD = 5935;
-pub const ERROR_CLUSTER_OBJECT_ALREADY_USED: ::DWORD = 5936;
-pub const ERROR_NONCORE_GROUPS_FOUND: ::DWORD = 5937;
-pub const ERROR_FILE_SHARE_RESOURCE_CONFLICT: ::DWORD = 5938;
-pub const ERROR_CLUSTER_EVICT_INVALID_REQUEST: ::DWORD = 5939;
-pub const ERROR_CLUSTER_SINGLETON_RESOURCE: ::DWORD = 5940;
-pub const ERROR_CLUSTER_GROUP_SINGLETON_RESOURCE: ::DWORD = 5941;
-pub const ERROR_CLUSTER_RESOURCE_PROVIDER_FAILED: ::DWORD = 5942;
-pub const ERROR_CLUSTER_RESOURCE_CONFIGURATION_ERROR: ::DWORD = 5943;
-pub const ERROR_CLUSTER_GROUP_BUSY: ::DWORD = 5944;
-pub const ERROR_CLUSTER_NOT_SHARED_VOLUME: ::DWORD = 5945;
-pub const ERROR_CLUSTER_INVALID_SECURITY_DESCRIPTOR: ::DWORD = 5946;
-pub const ERROR_CLUSTER_SHARED_VOLUMES_IN_USE: ::DWORD = 5947;
-pub const ERROR_CLUSTER_USE_SHARED_VOLUMES_API: ::DWORD = 5948;
-pub const ERROR_CLUSTER_BACKUP_IN_PROGRESS: ::DWORD = 5949;
-pub const ERROR_NON_CSV_PATH: ::DWORD = 5950;
-pub const ERROR_CSV_VOLUME_NOT_LOCAL: ::DWORD = 5951;
-pub const ERROR_CLUSTER_WATCHDOG_TERMINATING: ::DWORD = 5952;
-pub const ERROR_CLUSTER_RESOURCE_VETOED_MOVE_INCOMPATIBLE_NODES: ::DWORD = 5953;
-pub const ERROR_CLUSTER_INVALID_NODE_WEIGHT: ::DWORD = 5954;
-pub const ERROR_CLUSTER_RESOURCE_VETOED_CALL: ::DWORD = 5955;
-pub const ERROR_RESMON_SYSTEM_RESOURCES_LACKING: ::DWORD = 5956;
-pub const ERROR_CLUSTER_RESOURCE_VETOED_MOVE_NOT_ENOUGH_RESOURCES_ON_DESTINATION: ::DWORD = 5957;
-pub const ERROR_CLUSTER_RESOURCE_VETOED_MOVE_NOT_ENOUGH_RESOURCES_ON_SOURCE: ::DWORD = 5958;
-pub const ERROR_CLUSTER_GROUP_QUEUED: ::DWORD = 5959;
-pub const ERROR_CLUSTER_RESOURCE_LOCKED_STATUS: ::DWORD = 5960;
-pub const ERROR_CLUSTER_SHARED_VOLUME_FAILOVER_NOT_ALLOWED: ::DWORD = 5961;
-pub const ERROR_CLUSTER_NODE_DRAIN_IN_PROGRESS: ::DWORD = 5962;
-pub const ERROR_CLUSTER_DISK_NOT_CONNECTED: ::DWORD = 5963;
-pub const ERROR_DISK_NOT_CSV_CAPABLE: ::DWORD = 5964;
-pub const ERROR_RESOURCE_NOT_IN_AVAILABLE_STORAGE: ::DWORD = 5965;
-pub const ERROR_CLUSTER_SHARED_VOLUME_REDIRECTED: ::DWORD = 5966;
-pub const ERROR_CLUSTER_SHARED_VOLUME_NOT_REDIRECTED: ::DWORD = 5967;
-pub const ERROR_CLUSTER_CANNOT_RETURN_PROPERTIES: ::DWORD = 5968;
-pub const ERROR_CLUSTER_RESOURCE_CONTAINS_UNSUPPORTED_DIFF_AREA_FOR_SHARED_VOLUMES: ::DWORD = 5969;
-pub const ERROR_CLUSTER_RESOURCE_IS_IN_MAINTENANCE_MODE: ::DWORD = 5970;
-pub const ERROR_CLUSTER_AFFINITY_CONFLICT: ::DWORD = 5971;
-pub const ERROR_CLUSTER_RESOURCE_IS_REPLICA_VIRTUAL_MACHINE: ::DWORD = 5972;
-pub const ERROR_ENCRYPTION_FAILED: ::DWORD = 6000;
-pub const ERROR_DECRYPTION_FAILED: ::DWORD = 6001;
-pub const ERROR_FILE_ENCRYPTED: ::DWORD = 6002;
-pub const ERROR_NO_RECOVERY_POLICY: ::DWORD = 6003;
-pub const ERROR_NO_EFS: ::DWORD = 6004;
-pub const ERROR_WRONG_EFS: ::DWORD = 6005;
-pub const ERROR_NO_USER_KEYS: ::DWORD = 6006;
-pub const ERROR_FILE_NOT_ENCRYPTED: ::DWORD = 6007;
-pub const ERROR_NOT_EXPORT_FORMAT: ::DWORD = 6008;
-pub const ERROR_FILE_READ_ONLY: ::DWORD = 6009;
-pub const ERROR_DIR_EFS_DISALLOWED: ::DWORD = 6010;
-pub const ERROR_EFS_SERVER_NOT_TRUSTED: ::DWORD = 6011;
-pub const ERROR_BAD_RECOVERY_POLICY: ::DWORD = 6012;
-pub const ERROR_EFS_ALG_BLOB_TOO_BIG: ::DWORD = 6013;
-pub const ERROR_VOLUME_NOT_SUPPORT_EFS: ::DWORD = 6014;
-pub const ERROR_EFS_DISABLED: ::DWORD = 6015;
-pub const ERROR_EFS_VERSION_NOT_SUPPORT: ::DWORD = 6016;
-pub const ERROR_CS_ENCRYPTION_INVALID_SERVER_RESPONSE: ::DWORD = 6017;
-pub const ERROR_CS_ENCRYPTION_UNSUPPORTED_SERVER: ::DWORD = 6018;
-pub const ERROR_CS_ENCRYPTION_EXISTING_ENCRYPTED_FILE: ::DWORD = 6019;
-pub const ERROR_CS_ENCRYPTION_NEW_ENCRYPTED_FILE: ::DWORD = 6020;
-pub const ERROR_CS_ENCRYPTION_FILE_NOT_CSE: ::DWORD = 6021;
-pub const ERROR_ENCRYPTION_POLICY_DENIES_OPERATION: ::DWORD = 6022;
-pub const ERROR_NO_BROWSER_SERVERS_FOUND: ::DWORD = 6118;
-pub const SCHED_E_SERVICE_NOT_LOCALSYSTEM: ::DWORD = 6200;
-pub const ERROR_LOG_SECTOR_INVALID: ::DWORD = 6600;
-pub const ERROR_LOG_SECTOR_PARITY_INVALID: ::DWORD = 6601;
-pub const ERROR_LOG_SECTOR_REMAPPED: ::DWORD = 6602;
-pub const ERROR_LOG_BLOCK_INCOMPLETE: ::DWORD = 6603;
-pub const ERROR_LOG_INVALID_RANGE: ::DWORD = 6604;
-pub const ERROR_LOG_BLOCKS_EXHAUSTED: ::DWORD = 6605;
-pub const ERROR_LOG_READ_CONTEXT_INVALID: ::DWORD = 6606;
-pub const ERROR_LOG_RESTART_INVALID: ::DWORD = 6607;
-pub const ERROR_LOG_BLOCK_VERSION: ::DWORD = 6608;
-pub const ERROR_LOG_BLOCK_INVALID: ::DWORD = 6609;
-pub const ERROR_LOG_READ_MODE_INVALID: ::DWORD = 6610;
-pub const ERROR_LOG_NO_RESTART: ::DWORD = 6611;
-pub const ERROR_LOG_METADATA_CORRUPT: ::DWORD = 6612;
-pub const ERROR_LOG_METADATA_INVALID: ::DWORD = 6613;
-pub const ERROR_LOG_METADATA_INCONSISTENT: ::DWORD = 6614;
-pub const ERROR_LOG_RESERVATION_INVALID: ::DWORD = 6615;
-pub const ERROR_LOG_CANT_DELETE: ::DWORD = 6616;
-pub const ERROR_LOG_CONTAINER_LIMIT_EXCEEDED: ::DWORD = 6617;
-pub const ERROR_LOG_START_OF_LOG: ::DWORD = 6618;
-pub const ERROR_LOG_POLICY_ALREADY_INSTALLED: ::DWORD = 6619;
-pub const ERROR_LOG_POLICY_NOT_INSTALLED: ::DWORD = 6620;
-pub const ERROR_LOG_POLICY_INVALID: ::DWORD = 6621;
-pub const ERROR_LOG_POLICY_CONFLICT: ::DWORD = 6622;
-pub const ERROR_LOG_PINNED_ARCHIVE_TAIL: ::DWORD = 6623;
-pub const ERROR_LOG_RECORD_NONEXISTENT: ::DWORD = 6624;
-pub const ERROR_LOG_RECORDS_RESERVED_INVALID: ::DWORD = 6625;
-pub const ERROR_LOG_SPACE_RESERVED_INVALID: ::DWORD = 6626;
-pub const ERROR_LOG_TAIL_INVALID: ::DWORD = 6627;
-pub const ERROR_LOG_FULL: ::DWORD = 6628;
-pub const ERROR_COULD_NOT_RESIZE_LOG: ::DWORD = 6629;
-pub const ERROR_LOG_MULTIPLEXED: ::DWORD = 6630;
-pub const ERROR_LOG_DEDICATED: ::DWORD = 6631;
-pub const ERROR_LOG_ARCHIVE_NOT_IN_PROGRESS: ::DWORD = 6632;
-pub const ERROR_LOG_ARCHIVE_IN_PROGRESS: ::DWORD = 6633;
-pub const ERROR_LOG_EPHEMERAL: ::DWORD = 6634;
-pub const ERROR_LOG_NOT_ENOUGH_CONTAINERS: ::DWORD = 6635;
-pub const ERROR_LOG_CLIENT_ALREADY_REGISTERED: ::DWORD = 6636;
-pub const ERROR_LOG_CLIENT_NOT_REGISTERED: ::DWORD = 6637;
-pub const ERROR_LOG_FULL_HANDLER_IN_PROGRESS: ::DWORD = 6638;
-pub const ERROR_LOG_CONTAINER_READ_FAILED: ::DWORD = 6639;
-pub const ERROR_LOG_CONTAINER_WRITE_FAILED: ::DWORD = 6640;
-pub const ERROR_LOG_CONTAINER_OPEN_FAILED: ::DWORD = 6641;
-pub const ERROR_LOG_CONTAINER_STATE_INVALID: ::DWORD = 6642;
-pub const ERROR_LOG_STATE_INVALID: ::DWORD = 6643;
-pub const ERROR_LOG_PINNED: ::DWORD = 6644;
-pub const ERROR_LOG_METADATA_FLUSH_FAILED: ::DWORD = 6645;
-pub const ERROR_LOG_INCONSISTENT_SECURITY: ::DWORD = 6646;
-pub const ERROR_LOG_APPENDED_FLUSH_FAILED: ::DWORD = 6647;
-pub const ERROR_LOG_PINNED_RESERVATION: ::DWORD = 6648;
-pub const ERROR_INVALID_TRANSACTION: ::DWORD = 6700;
-pub const ERROR_TRANSACTION_NOT_ACTIVE: ::DWORD = 6701;
-pub const ERROR_TRANSACTION_REQUEST_NOT_VALID: ::DWORD = 6702;
-pub const ERROR_TRANSACTION_NOT_REQUESTED: ::DWORD = 6703;
-pub const ERROR_TRANSACTION_ALREADY_ABORTED: ::DWORD = 6704;
-pub const ERROR_TRANSACTION_ALREADY_COMMITTED: ::DWORD = 6705;
-pub const ERROR_TM_INITIALIZATION_FAILED: ::DWORD = 6706;
-pub const ERROR_RESOURCEMANAGER_READ_ONLY: ::DWORD = 6707;
-pub const ERROR_TRANSACTION_NOT_JOINED: ::DWORD = 6708;
-pub const ERROR_TRANSACTION_SUPERIOR_EXISTS: ::DWORD = 6709;
-pub const ERROR_CRM_PROTOCOL_ALREADY_EXISTS: ::DWORD = 6710;
-pub const ERROR_TRANSACTION_PROPAGATION_FAILED: ::DWORD = 6711;
-pub const ERROR_CRM_PROTOCOL_NOT_FOUND: ::DWORD = 6712;
-pub const ERROR_TRANSACTION_INVALID_MARSHALL_BUFFER: ::DWORD = 6713;
-pub const ERROR_CURRENT_TRANSACTION_NOT_VALID: ::DWORD = 6714;
-pub const ERROR_TRANSACTION_NOT_FOUND: ::DWORD = 6715;
-pub const ERROR_RESOURCEMANAGER_NOT_FOUND: ::DWORD = 6716;
-pub const ERROR_ENLISTMENT_NOT_FOUND: ::DWORD = 6717;
-pub const ERROR_TRANSACTIONMANAGER_NOT_FOUND: ::DWORD = 6718;
-pub const ERROR_TRANSACTIONMANAGER_NOT_ONLINE: ::DWORD = 6719;
-pub const ERROR_TRANSACTIONMANAGER_RECOVERY_NAME_COLLISION: ::DWORD = 6720;
-pub const ERROR_TRANSACTION_NOT_ROOT: ::DWORD = 6721;
-pub const ERROR_TRANSACTION_OBJECT_EXPIRED: ::DWORD = 6722;
-pub const ERROR_TRANSACTION_RESPONSE_NOT_ENLISTED: ::DWORD = 6723;
-pub const ERROR_TRANSACTION_RECORD_TOO_LONG: ::DWORD = 6724;
-pub const ERROR_IMPLICIT_TRANSACTION_NOT_SUPPORTED: ::DWORD = 6725;
-pub const ERROR_TRANSACTION_INTEGRITY_VIOLATED: ::DWORD = 6726;
-pub const ERROR_TRANSACTIONMANAGER_IDENTITY_MISMATCH: ::DWORD = 6727;
-pub const ERROR_RM_CANNOT_BE_FROZEN_FOR_SNAPSHOT: ::DWORD = 6728;
-pub const ERROR_TRANSACTION_MUST_WRITETHROUGH: ::DWORD = 6729;
-pub const ERROR_TRANSACTION_NO_SUPERIOR: ::DWORD = 6730;
-pub const ERROR_HEURISTIC_DAMAGE_POSSIBLE: ::DWORD = 6731;
-pub const ERROR_TRANSACTIONAL_CONFLICT: ::DWORD = 6800;
-pub const ERROR_RM_NOT_ACTIVE: ::DWORD = 6801;
-pub const ERROR_RM_METADATA_CORRUPT: ::DWORD = 6802;
-pub const ERROR_DIRECTORY_NOT_RM: ::DWORD = 6803;
-pub const ERROR_TRANSACTIONS_UNSUPPORTED_REMOTE: ::DWORD = 6805;
-pub const ERROR_LOG_RESIZE_INVALID_SIZE: ::DWORD = 6806;
-pub const ERROR_OBJECT_NO_LONGER_EXISTS: ::DWORD = 6807;
-pub const ERROR_STREAM_MINIVERSION_NOT_FOUND: ::DWORD = 6808;
-pub const ERROR_STREAM_MINIVERSION_NOT_VALID: ::DWORD = 6809;
-pub const ERROR_MINIVERSION_INACCESSIBLE_FROM_SPECIFIED_TRANSACTION: ::DWORD = 6810;
-pub const ERROR_CANT_OPEN_MINIVERSION_WITH_MODIFY_INTENT: ::DWORD = 6811;
-pub const ERROR_CANT_CREATE_MORE_STREAM_MINIVERSIONS: ::DWORD = 6812;
-pub const ERROR_REMOTE_FILE_VERSION_MISMATCH: ::DWORD = 6814;
-pub const ERROR_HANDLE_NO_LONGER_VALID: ::DWORD = 6815;
-pub const ERROR_NO_TXF_METADATA: ::DWORD = 6816;
-pub const ERROR_LOG_CORRUPTION_DETECTED: ::DWORD = 6817;
-pub const ERROR_CANT_RECOVER_WITH_HANDLE_OPEN: ::DWORD = 6818;
-pub const ERROR_RM_DISCONNECTED: ::DWORD = 6819;
-pub const ERROR_ENLISTMENT_NOT_SUPERIOR: ::DWORD = 6820;
-pub const ERROR_RECOVERY_NOT_NEEDED: ::DWORD = 6821;
-pub const ERROR_RM_ALREADY_STARTED: ::DWORD = 6822;
-pub const ERROR_FILE_IDENTITY_NOT_PERSISTENT: ::DWORD = 6823;
-pub const ERROR_CANT_BREAK_TRANSACTIONAL_DEPENDENCY: ::DWORD = 6824;
-pub const ERROR_CANT_CROSS_RM_BOUNDARY: ::DWORD = 6825;
-pub const ERROR_TXF_DIR_NOT_EMPTY: ::DWORD = 6826;
-pub const ERROR_INDOUBT_TRANSACTIONS_EXIST: ::DWORD = 6827;
-pub const ERROR_TM_VOLATILE: ::DWORD = 6828;
-pub const ERROR_ROLLBACK_TIMER_EXPIRED: ::DWORD = 6829;
-pub const ERROR_TXF_ATTRIBUTE_CORRUPT: ::DWORD = 6830;
-pub const ERROR_EFS_NOT_ALLOWED_IN_TRANSACTION: ::DWORD = 6831;
-pub const ERROR_TRANSACTIONAL_OPEN_NOT_ALLOWED: ::DWORD = 6832;
-pub const ERROR_LOG_GROWTH_FAILED: ::DWORD = 6833;
-pub const ERROR_TRANSACTED_MAPPING_UNSUPPORTED_REMOTE: ::DWORD = 6834;
-pub const ERROR_TXF_METADATA_ALREADY_PRESENT: ::DWORD = 6835;
-pub const ERROR_TRANSACTION_SCOPE_CALLBACKS_NOT_SET: ::DWORD = 6836;
-pub const ERROR_TRANSACTION_REQUIRED_PROMOTION: ::DWORD = 6837;
-pub const ERROR_CANNOT_EXECUTE_FILE_IN_TRANSACTION: ::DWORD = 6838;
-pub const ERROR_TRANSACTIONS_NOT_FROZEN: ::DWORD = 6839;
-pub const ERROR_TRANSACTION_FREEZE_IN_PROGRESS: ::DWORD = 6840;
-pub const ERROR_NOT_SNAPSHOT_VOLUME: ::DWORD = 6841;
-pub const ERROR_NO_SAVEPOINT_WITH_OPEN_FILES: ::DWORD = 6842;
-pub const ERROR_DATA_LOST_REPAIR: ::DWORD = 6843;
-pub const ERROR_SPARSE_NOT_ALLOWED_IN_TRANSACTION: ::DWORD = 6844;
-pub const ERROR_TM_IDENTITY_MISMATCH: ::DWORD = 6845;
-pub const ERROR_FLOATED_SECTION: ::DWORD = 6846;
-pub const ERROR_CANNOT_ACCEPT_TRANSACTED_WORK: ::DWORD = 6847;
-pub const ERROR_CANNOT_ABORT_TRANSACTIONS: ::DWORD = 6848;
-pub const ERROR_BAD_CLUSTERS: ::DWORD = 6849;
-pub const ERROR_COMPRESSION_NOT_ALLOWED_IN_TRANSACTION: ::DWORD = 6850;
-pub const ERROR_VOLUME_DIRTY: ::DWORD = 6851;
-pub const ERROR_NO_LINK_TRACKING_IN_TRANSACTION: ::DWORD = 6852;
-pub const ERROR_OPERATION_NOT_SUPPORTED_IN_TRANSACTION: ::DWORD = 6853;
-pub const ERROR_EXPIRED_HANDLE: ::DWORD = 6854;
-pub const ERROR_TRANSACTION_NOT_ENLISTED: ::DWORD = 6855;
-pub const ERROR_CTX_WINSTATION_NAME_INVALID: ::DWORD = 7001;
-pub const ERROR_CTX_INVALID_PD: ::DWORD = 7002;
-pub const ERROR_CTX_PD_NOT_FOUND: ::DWORD = 7003;
-pub const ERROR_CTX_WD_NOT_FOUND: ::DWORD = 7004;
-pub const ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY: ::DWORD = 7005;
-pub const ERROR_CTX_SERVICE_NAME_COLLISION: ::DWORD = 7006;
-pub const ERROR_CTX_CLOSE_PENDING: ::DWORD = 7007;
-pub const ERROR_CTX_NO_OUTBUF: ::DWORD = 7008;
-pub const ERROR_CTX_MODEM_INF_NOT_FOUND: ::DWORD = 7009;
-pub const ERROR_CTX_INVALID_MODEMNAME: ::DWORD = 7010;
-pub const ERROR_CTX_MODEM_RESPONSE_ERROR: ::DWORD = 7011;
-pub const ERROR_CTX_MODEM_RESPONSE_TIMEOUT: ::DWORD = 7012;
-pub const ERROR_CTX_MODEM_RESPONSE_NO_CARRIER: ::DWORD = 7013;
-pub const ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE: ::DWORD = 7014;
-pub const ERROR_CTX_MODEM_RESPONSE_BUSY: ::DWORD = 7015;
-pub const ERROR_CTX_MODEM_RESPONSE_VOICE: ::DWORD = 7016;
-pub const ERROR_CTX_TD_ERROR: ::DWORD = 7017;
-pub const ERROR_CTX_WINSTATION_NOT_FOUND: ::DWORD = 7022;
-pub const ERROR_CTX_WINSTATION_ALREADY_EXISTS: ::DWORD = 7023;
-pub const ERROR_CTX_WINSTATION_BUSY: ::DWORD = 7024;
-pub const ERROR_CTX_BAD_VIDEO_MODE: ::DWORD = 7025;
-pub const ERROR_CTX_GRAPHICS_INVALID: ::DWORD = 7035;
-pub const ERROR_CTX_LOGON_DISABLED: ::DWORD = 7037;
-pub const ERROR_CTX_NOT_CONSOLE: ::DWORD = 7038;
-pub const ERROR_CTX_CLIENT_QUERY_TIMEOUT: ::DWORD = 7040;
-pub const ERROR_CTX_CONSOLE_DISCONNECT: ::DWORD = 7041;
-pub const ERROR_CTX_CONSOLE_CONNECT: ::DWORD = 7042;
-pub const ERROR_CTX_SHADOW_DENIED: ::DWORD = 7044;
-pub const ERROR_CTX_WINSTATION_ACCESS_DENIED: ::DWORD = 7045;
-pub const ERROR_CTX_INVALID_WD: ::DWORD = 7049;
-pub const ERROR_CTX_SHADOW_INVALID: ::DWORD = 7050;
-pub const ERROR_CTX_SHADOW_DISABLED: ::DWORD = 7051;
-pub const ERROR_CTX_CLIENT_LICENSE_IN_USE: ::DWORD = 7052;
-pub const ERROR_CTX_CLIENT_LICENSE_NOT_SET: ::DWORD = 7053;
-pub const ERROR_CTX_LICENSE_NOT_AVAILABLE: ::DWORD = 7054;
-pub const ERROR_CTX_LICENSE_CLIENT_INVALID: ::DWORD = 7055;
-pub const ERROR_CTX_LICENSE_EXPIRED: ::DWORD = 7056;
-pub const ERROR_CTX_SHADOW_NOT_RUNNING: ::DWORD = 7057;
-pub const ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE: ::DWORD = 7058;
-pub const ERROR_ACTIVATION_COUNT_EXCEEDED: ::DWORD = 7059;
-pub const ERROR_CTX_WINSTATIONS_DISABLED: ::DWORD = 7060;
-pub const ERROR_CTX_ENCRYPTION_LEVEL_REQUIRED: ::DWORD = 7061;
-pub const ERROR_CTX_SESSION_IN_USE: ::DWORD = 7062;
-pub const ERROR_CTX_NO_FORCE_LOGOFF: ::DWORD = 7063;
-pub const ERROR_CTX_ACCOUNT_RESTRICTION: ::DWORD = 7064;
-pub const ERROR_RDP_PROTOCOL_ERROR: ::DWORD = 7065;
-pub const ERROR_CTX_CDM_CONNECT: ::DWORD = 7066;
-pub const ERROR_CTX_CDM_DISCONNECT: ::DWORD = 7067;
-pub const ERROR_CTX_SECURITY_LAYER_ERROR: ::DWORD = 7068;
-pub const ERROR_TS_INCOMPATIBLE_SESSIONS: ::DWORD = 7069;
-pub const ERROR_TS_VIDEO_SUBSYSTEM_ERROR: ::DWORD = 7070;
-pub const FRS_ERR_INVALID_API_SEQUENCE: ::DWORD = 8001;
-pub const FRS_ERR_STARTING_SERVICE: ::DWORD = 8002;
-pub const FRS_ERR_STOPPING_SERVICE: ::DWORD = 8003;
-pub const FRS_ERR_INTERNAL_API: ::DWORD = 8004;
-pub const FRS_ERR_INTERNAL: ::DWORD = 8005;
-pub const FRS_ERR_SERVICE_COMM: ::DWORD = 8006;
-pub const FRS_ERR_INSUFFICIENT_PRIV: ::DWORD = 8007;
-pub const FRS_ERR_AUTHENTICATION: ::DWORD = 8008;
-pub const FRS_ERR_PARENT_INSUFFICIENT_PRIV: ::DWORD = 8009;
-pub const FRS_ERR_PARENT_AUTHENTICATION: ::DWORD = 8010;
-pub const FRS_ERR_CHILD_TO_PARENT_COMM: ::DWORD = 8011;
-pub const FRS_ERR_PARENT_TO_CHILD_COMM: ::DWORD = 8012;
-pub const FRS_ERR_SYSVOL_POPULATE: ::DWORD = 8013;
-pub const FRS_ERR_SYSVOL_POPULATE_TIMEOUT: ::DWORD = 8014;
-pub const FRS_ERR_SYSVOL_IS_BUSY: ::DWORD = 8015;
-pub const FRS_ERR_SYSVOL_DEMOTE: ::DWORD = 8016;
-pub const FRS_ERR_INVALID_SERVICE_PARAMETER: ::DWORD = 8017;
-pub const DS_S_SUCCESS: ::DWORD = NO_ERROR;
-pub const ERROR_DS_NOT_INSTALLED: ::DWORD = 8200;
-pub const ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY: ::DWORD = 8201;
-pub const ERROR_DS_NO_ATTRIBUTE_OR_VALUE: ::DWORD = 8202;
-pub const ERROR_DS_INVALID_ATTRIBUTE_SYNTAX: ::DWORD = 8203;
-pub const ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED: ::DWORD = 8204;
-pub const ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS: ::DWORD = 8205;
-pub const ERROR_DS_BUSY: ::DWORD = 8206;
-pub const ERROR_DS_UNAVAILABLE: ::DWORD = 8207;
-pub const ERROR_DS_NO_RIDS_ALLOCATED: ::DWORD = 8208;
-pub const ERROR_DS_NO_MORE_RIDS: ::DWORD = 8209;
-pub const ERROR_DS_INCORRECT_ROLE_OWNER: ::DWORD = 8210;
-pub const ERROR_DS_RIDMGR_INIT_ERROR: ::DWORD = 8211;
-pub const ERROR_DS_OBJ_CLASS_VIOLATION: ::DWORD = 8212;
-pub const ERROR_DS_CANT_ON_NON_LEAF: ::DWORD = 8213;
-pub const ERROR_DS_CANT_ON_RDN: ::DWORD = 8214;
-pub const ERROR_DS_CANT_MOD_OBJ_CLASS: ::DWORD = 8215;
-pub const ERROR_DS_CROSS_DOM_MOVE_ERROR: ::DWORD = 8216;
-pub const ERROR_DS_GC_NOT_AVAILABLE: ::DWORD = 8217;
-pub const ERROR_SHARED_POLICY: ::DWORD = 8218;
-pub const ERROR_POLICY_OBJECT_NOT_FOUND: ::DWORD = 8219;
-pub const ERROR_POLICY_ONLY_IN_DS: ::DWORD = 8220;
-pub const ERROR_PROMOTION_ACTIVE: ::DWORD = 8221;
-pub const ERROR_NO_PROMOTION_ACTIVE: ::DWORD = 8222;
-pub const ERROR_DS_OPERATIONS_ERROR: ::DWORD = 8224;
-pub const ERROR_DS_PROTOCOL_ERROR: ::DWORD = 8225;
-pub const ERROR_DS_TIMELIMIT_EXCEEDED: ::DWORD = 8226;
-pub const ERROR_DS_SIZELIMIT_EXCEEDED: ::DWORD = 8227;
-pub const ERROR_DS_ADMIN_LIMIT_EXCEEDED: ::DWORD = 8228;
-pub const ERROR_DS_COMPARE_FALSE: ::DWORD = 8229;
-pub const ERROR_DS_COMPARE_TRUE: ::DWORD = 8230;
-pub const ERROR_DS_AUTH_METHOD_NOT_SUPPORTED: ::DWORD = 8231;
-pub const ERROR_DS_STRONG_AUTH_REQUIRED: ::DWORD = 8232;
-pub const ERROR_DS_INAPPROPRIATE_AUTH: ::DWORD = 8233;
-pub const ERROR_DS_AUTH_UNKNOWN: ::DWORD = 8234;
-pub const ERROR_DS_REFERRAL: ::DWORD = 8235;
-pub const ERROR_DS_UNAVAILABLE_CRIT_EXTENSION: ::DWORD = 8236;
-pub const ERROR_DS_CONFIDENTIALITY_REQUIRED: ::DWORD = 8237;
-pub const ERROR_DS_INAPPROPRIATE_MATCHING: ::DWORD = 8238;
-pub const ERROR_DS_CONSTRAINT_VIOLATION: ::DWORD = 8239;
-pub const ERROR_DS_NO_SUCH_OBJECT: ::DWORD = 8240;
-pub const ERROR_DS_ALIAS_PROBLEM: ::DWORD = 8241;
-pub const ERROR_DS_INVALID_DN_SYNTAX: ::DWORD = 8242;
-pub const ERROR_DS_IS_LEAF: ::DWORD = 8243;
-pub const ERROR_DS_ALIAS_DEREF_PROBLEM: ::DWORD = 8244;
-pub const ERROR_DS_UNWILLING_TO_PERFORM: ::DWORD = 8245;
-pub const ERROR_DS_LOOP_DETECT: ::DWORD = 8246;
-pub const ERROR_DS_NAMING_VIOLATION: ::DWORD = 8247;
-pub const ERROR_DS_OBJECT_RESULTS_TOO_LARGE: ::DWORD = 8248;
-pub const ERROR_DS_AFFECTS_MULTIPLE_DSAS: ::DWORD = 8249;
-pub const ERROR_DS_SERVER_DOWN: ::DWORD = 8250;
-pub const ERROR_DS_LOCAL_ERROR: ::DWORD = 8251;
-pub const ERROR_DS_ENCODING_ERROR: ::DWORD = 8252;
-pub const ERROR_DS_DECODING_ERROR: ::DWORD = 8253;
-pub const ERROR_DS_FILTER_UNKNOWN: ::DWORD = 8254;
-pub const ERROR_DS_PARAM_ERROR: ::DWORD = 8255;
-pub const ERROR_DS_NOT_SUPPORTED: ::DWORD = 8256;
-pub const ERROR_DS_NO_RESULTS_RETURNED: ::DWORD = 8257;
-pub const ERROR_DS_CONTROL_NOT_FOUND: ::DWORD = 8258;
-pub const ERROR_DS_CLIENT_LOOP: ::DWORD = 8259;
-pub const ERROR_DS_REFERRAL_LIMIT_EXCEEDED: ::DWORD = 8260;
-pub const ERROR_DS_SORT_CONTROL_MISSING: ::DWORD = 8261;
-pub const ERROR_DS_OFFSET_RANGE_ERROR: ::DWORD = 8262;
-pub const ERROR_DS_RIDMGR_DISABLED: ::DWORD = 8263;
-pub const ERROR_DS_ROOT_MUST_BE_NC: ::DWORD = 8301;
-pub const ERROR_DS_ADD_REPLICA_INHIBITED: ::DWORD = 8302;
-pub const ERROR_DS_ATT_NOT_DEF_IN_SCHEMA: ::DWORD = 8303;
-pub const ERROR_DS_MAX_OBJ_SIZE_EXCEEDED: ::DWORD = 8304;
-pub const ERROR_DS_OBJ_STRING_NAME_EXISTS: ::DWORD = 8305;
-pub const ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA: ::DWORD = 8306;
-pub const ERROR_DS_RDN_DOESNT_MATCH_SCHEMA: ::DWORD = 8307;
-pub const ERROR_DS_NO_REQUESTED_ATTS_FOUND: ::DWORD = 8308;
-pub const ERROR_DS_USER_BUFFER_TO_SMALL: ::DWORD = 8309;
-pub const ERROR_DS_ATT_IS_NOT_ON_OBJ: ::DWORD = 8310;
-pub const ERROR_DS_ILLEGAL_MOD_OPERATION: ::DWORD = 8311;
-pub const ERROR_DS_OBJ_TOO_LARGE: ::DWORD = 8312;
-pub const ERROR_DS_BAD_INSTANCE_TYPE: ::DWORD = 8313;
-pub const ERROR_DS_MASTERDSA_REQUIRED: ::DWORD = 8314;
-pub const ERROR_DS_OBJECT_CLASS_REQUIRED: ::DWORD = 8315;
-pub const ERROR_DS_MISSING_REQUIRED_ATT: ::DWORD = 8316;
-pub const ERROR_DS_ATT_NOT_DEF_FOR_CLASS: ::DWORD = 8317;
-pub const ERROR_DS_ATT_ALREADY_EXISTS: ::DWORD = 8318;
-pub const ERROR_DS_CANT_ADD_ATT_VALUES: ::DWORD = 8320;
-pub const ERROR_DS_SINGLE_VALUE_CONSTRAINT: ::DWORD = 8321;
-pub const ERROR_DS_RANGE_CONSTRAINT: ::DWORD = 8322;
-pub const ERROR_DS_ATT_VAL_ALREADY_EXISTS: ::DWORD = 8323;
-pub const ERROR_DS_CANT_REM_MISSING_ATT: ::DWORD = 8324;
-pub const ERROR_DS_CANT_REM_MISSING_ATT_VAL: ::DWORD = 8325;
-pub const ERROR_DS_ROOT_CANT_BE_SUBREF: ::DWORD = 8326;
-pub const ERROR_DS_NO_CHAINING: ::DWORD = 8327;
-pub const ERROR_DS_NO_CHAINED_EVAL: ::DWORD = 8328;
-pub const ERROR_DS_NO_PARENT_OBJECT: ::DWORD = 8329;
-pub const ERROR_DS_PARENT_IS_AN_ALIAS: ::DWORD = 8330;
-pub const ERROR_DS_CANT_MIX_MASTER_AND_REPS: ::DWORD = 8331;
-pub const ERROR_DS_CHILDREN_EXIST: ::DWORD = 8332;
-pub const ERROR_DS_OBJ_NOT_FOUND: ::DWORD = 8333;
-pub const ERROR_DS_ALIASED_OBJ_MISSING: ::DWORD = 8334;
-pub const ERROR_DS_BAD_NAME_SYNTAX: ::DWORD = 8335;
-pub const ERROR_DS_ALIAS_POINTS_TO_ALIAS: ::DWORD = 8336;
-pub const ERROR_DS_CANT_DEREF_ALIAS: ::DWORD = 8337;
-pub const ERROR_DS_OUT_OF_SCOPE: ::DWORD = 8338;
-pub const ERROR_DS_OBJECT_BEING_REMOVED: ::DWORD = 8339;
-pub const ERROR_DS_CANT_DELETE_DSA_OBJ: ::DWORD = 8340;
-pub const ERROR_DS_GENERIC_ERROR: ::DWORD = 8341;
-pub const ERROR_DS_DSA_MUST_BE_INT_MASTER: ::DWORD = 8342;
-pub const ERROR_DS_CLASS_NOT_DSA: ::DWORD = 8343;
-pub const ERROR_DS_INSUFF_ACCESS_RIGHTS: ::DWORD = 8344;
-pub const ERROR_DS_ILLEGAL_SUPERIOR: ::DWORD = 8345;
-pub const ERROR_DS_ATTRIBUTE_OWNED_BY_SAM: ::DWORD = 8346;
-pub const ERROR_DS_NAME_TOO_MANY_PARTS: ::DWORD = 8347;
-pub const ERROR_DS_NAME_TOO_LONG: ::DWORD = 8348;
-pub const ERROR_DS_NAME_VALUE_TOO_LONG: ::DWORD = 8349;
-pub const ERROR_DS_NAME_UNPARSEABLE: ::DWORD = 8350;
-pub const ERROR_DS_NAME_TYPE_UNKNOWN: ::DWORD = 8351;
-pub const ERROR_DS_NOT_AN_OBJECT: ::DWORD = 8352;
-pub const ERROR_DS_SEC_DESC_TOO_SHORT: ::DWORD = 8353;
-pub const ERROR_DS_SEC_DESC_INVALID: ::DWORD = 8354;
-pub const ERROR_DS_NO_DELETED_NAME: ::DWORD = 8355;
-pub const ERROR_DS_SUBREF_MUST_HAVE_PARENT: ::DWORD = 8356;
-pub const ERROR_DS_NCNAME_MUST_BE_NC: ::DWORD = 8357;
-pub const ERROR_DS_CANT_ADD_SYSTEM_ONLY: ::DWORD = 8358;
-pub const ERROR_DS_CLASS_MUST_BE_CONCRETE: ::DWORD = 8359;
-pub const ERROR_DS_INVALID_DMD: ::DWORD = 8360;
-pub const ERROR_DS_OBJ_GUID_EXISTS: ::DWORD = 8361;
-pub const ERROR_DS_NOT_ON_BACKLINK: ::DWORD = 8362;
-pub const ERROR_DS_NO_CROSSREF_FOR_NC: ::DWORD = 8363;
-pub const ERROR_DS_SHUTTING_DOWN: ::DWORD = 8364;
-pub const ERROR_DS_UNKNOWN_OPERATION: ::DWORD = 8365;
-pub const ERROR_DS_INVALID_ROLE_OWNER: ::DWORD = 8366;
-pub const ERROR_DS_COULDNT_CONTACT_FSMO: ::DWORD = 8367;
-pub const ERROR_DS_CROSS_NC_DN_RENAME: ::DWORD = 8368;
-pub const ERROR_DS_CANT_MOD_SYSTEM_ONLY: ::DWORD = 8369;
-pub const ERROR_DS_REPLICATOR_ONLY: ::DWORD = 8370;
-pub const ERROR_DS_OBJ_CLASS_NOT_DEFINED: ::DWORD = 8371;
-pub const ERROR_DS_OBJ_CLASS_NOT_SUBCLASS: ::DWORD = 8372;
-pub const ERROR_DS_NAME_REFERENCE_INVALID: ::DWORD = 8373;
-pub const ERROR_DS_CROSS_REF_EXISTS: ::DWORD = 8374;
-pub const ERROR_DS_CANT_DEL_MASTER_CROSSREF: ::DWORD = 8375;
-pub const ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD: ::DWORD = 8376;
-pub const ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX: ::DWORD = 8377;
-pub const ERROR_DS_DUP_RDN: ::DWORD = 8378;
-pub const ERROR_DS_DUP_OID: ::DWORD = 8379;
-pub const ERROR_DS_DUP_MAPI_ID: ::DWORD = 8380;
-pub const ERROR_DS_DUP_SCHEMA_ID_GUID: ::DWORD = 8381;
-pub const ERROR_DS_DUP_LDAP_DISPLAY_NAME: ::DWORD = 8382;
-pub const ERROR_DS_SEMANTIC_ATT_TEST: ::DWORD = 8383;
-pub const ERROR_DS_SYNTAX_MISMATCH: ::DWORD = 8384;
-pub const ERROR_DS_EXISTS_IN_MUST_HAVE: ::DWORD = 8385;
-pub const ERROR_DS_EXISTS_IN_MAY_HAVE: ::DWORD = 8386;
-pub const ERROR_DS_NONEXISTENT_MAY_HAVE: ::DWORD = 8387;
-pub const ERROR_DS_NONEXISTENT_MUST_HAVE: ::DWORD = 8388;
-pub const ERROR_DS_AUX_CLS_TEST_FAIL: ::DWORD = 8389;
-pub const ERROR_DS_NONEXISTENT_POSS_SUP: ::DWORD = 8390;
-pub const ERROR_DS_SUB_CLS_TEST_FAIL: ::DWORD = 8391;
-pub const ERROR_DS_BAD_RDN_ATT_ID_SYNTAX: ::DWORD = 8392;
-pub const ERROR_DS_EXISTS_IN_AUX_CLS: ::DWORD = 8393;
-pub const ERROR_DS_EXISTS_IN_SUB_CLS: ::DWORD = 8394;
-pub const ERROR_DS_EXISTS_IN_POSS_SUP: ::DWORD = 8395;
-pub const ERROR_DS_RECALCSCHEMA_FAILED: ::DWORD = 8396;
-pub const ERROR_DS_TREE_DELETE_NOT_FINISHED: ::DWORD = 8397;
-pub const ERROR_DS_CANT_DELETE: ::DWORD = 8398;
-pub const ERROR_DS_ATT_SCHEMA_REQ_ID: ::DWORD = 8399;
-pub const ERROR_DS_BAD_ATT_SCHEMA_SYNTAX: ::DWORD = 8400;
-pub const ERROR_DS_CANT_CACHE_ATT: ::DWORD = 8401;
-pub const ERROR_DS_CANT_CACHE_CLASS: ::DWORD = 8402;
-pub const ERROR_DS_CANT_REMOVE_ATT_CACHE: ::DWORD = 8403;
-pub const ERROR_DS_CANT_REMOVE_CLASS_CACHE: ::DWORD = 8404;
-pub const ERROR_DS_CANT_RETRIEVE_DN: ::DWORD = 8405;
-pub const ERROR_DS_MISSING_SUPREF: ::DWORD = 8406;
-pub const ERROR_DS_CANT_RETRIEVE_INSTANCE: ::DWORD = 8407;
-pub const ERROR_DS_CODE_INCONSISTENCY: ::DWORD = 8408;
-pub const ERROR_DS_DATABASE_ERROR: ::DWORD = 8409;
-pub const ERROR_DS_GOVERNSID_MISSING: ::DWORD = 8410;
-pub const ERROR_DS_MISSING_EXPECTED_ATT: ::DWORD = 8411;
-pub const ERROR_DS_NCNAME_MISSING_CR_REF: ::DWORD = 8412;
-pub const ERROR_DS_SECURITY_CHECKING_ERROR: ::DWORD = 8413;
-pub const ERROR_DS_SCHEMA_NOT_LOADED: ::DWORD = 8414;
-pub const ERROR_DS_SCHEMA_ALLOC_FAILED: ::DWORD = 8415;
-pub const ERROR_DS_ATT_SCHEMA_REQ_SYNTAX: ::DWORD = 8416;
-pub const ERROR_DS_GCVERIFY_ERROR: ::DWORD = 8417;
-pub const ERROR_DS_DRA_SCHEMA_MISMATCH: ::DWORD = 8418;
-pub const ERROR_DS_CANT_FIND_DSA_OBJ: ::DWORD = 8419;
-pub const ERROR_DS_CANT_FIND_EXPECTED_NC: ::DWORD = 8420;
-pub const ERROR_DS_CANT_FIND_NC_IN_CACHE: ::DWORD = 8421;
-pub const ERROR_DS_CANT_RETRIEVE_CHILD: ::DWORD = 8422;
-pub const ERROR_DS_SECURITY_ILLEGAL_MODIFY: ::DWORD = 8423;
-pub const ERROR_DS_CANT_REPLACE_HIDDEN_REC: ::DWORD = 8424;
-pub const ERROR_DS_BAD_HIERARCHY_FILE: ::DWORD = 8425;
-pub const ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED: ::DWORD = 8426;
-pub const ERROR_DS_CONFIG_PARAM_MISSING: ::DWORD = 8427;
-pub const ERROR_DS_COUNTING_AB_INDICES_FAILED: ::DWORD = 8428;
-pub const ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED: ::DWORD = 8429;
-pub const ERROR_DS_INTERNAL_FAILURE: ::DWORD = 8430;
-pub const ERROR_DS_UNKNOWN_ERROR: ::DWORD = 8431;
-pub const ERROR_DS_ROOT_REQUIRES_CLASS_TOP: ::DWORD = 8432;
-pub const ERROR_DS_REFUSING_FSMO_ROLES: ::DWORD = 8433;
-pub const ERROR_DS_MISSING_FSMO_SETTINGS: ::DWORD = 8434;
-pub const ERROR_DS_UNABLE_TO_SURRENDER_ROLES: ::DWORD = 8435;
-pub const ERROR_DS_DRA_GENERIC: ::DWORD = 8436;
-pub const ERROR_DS_DRA_INVALID_PARAMETER: ::DWORD = 8437;
-pub const ERROR_DS_DRA_BUSY: ::DWORD = 8438;
-pub const ERROR_DS_DRA_BAD_DN: ::DWORD = 8439;
-pub const ERROR_DS_DRA_BAD_NC: ::DWORD = 8440;
-pub const ERROR_DS_DRA_DN_EXISTS: ::DWORD = 8441;
-pub const ERROR_DS_DRA_INTERNAL_ERROR: ::DWORD = 8442;
-pub const ERROR_DS_DRA_INCONSISTENT_DIT: ::DWORD = 8443;
-pub const ERROR_DS_DRA_CONNECTION_FAILED: ::DWORD = 8444;
-pub const ERROR_DS_DRA_BAD_INSTANCE_TYPE: ::DWORD = 8445;
-pub const ERROR_DS_DRA_OUT_OF_MEM: ::DWORD = 8446;
-pub const ERROR_DS_DRA_MAIL_PROBLEM: ::DWORD = 8447;
-pub const ERROR_DS_DRA_REF_ALREADY_EXISTS: ::DWORD = 8448;
-pub const ERROR_DS_DRA_REF_NOT_FOUND: ::DWORD = 8449;
-pub const ERROR_DS_DRA_OBJ_IS_REP_SOURCE: ::DWORD = 8450;
-pub const ERROR_DS_DRA_DB_ERROR: ::DWORD = 8451;
-pub const ERROR_DS_DRA_NO_REPLICA: ::DWORD = 8452;
-pub const ERROR_DS_DRA_ACCESS_DENIED: ::DWORD = 8453;
-pub const ERROR_DS_DRA_NOT_SUPPORTED: ::DWORD = 8454;
-pub const ERROR_DS_DRA_RPC_CANCELLED: ::DWORD = 8455;
-pub const ERROR_DS_DRA_SOURCE_DISABLED: ::DWORD = 8456;
-pub const ERROR_DS_DRA_SINK_DISABLED: ::DWORD = 8457;
-pub const ERROR_DS_DRA_NAME_COLLISION: ::DWORD = 8458;
-pub const ERROR_DS_DRA_SOURCE_REINSTALLED: ::DWORD = 8459;
-pub const ERROR_DS_DRA_MISSING_PARENT: ::DWORD = 8460;
-pub const ERROR_DS_DRA_PREEMPTED: ::DWORD = 8461;
-pub const ERROR_DS_DRA_ABANDON_SYNC: ::DWORD = 8462;
-pub const ERROR_DS_DRA_SHUTDOWN: ::DWORD = 8463;
-pub const ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET: ::DWORD = 8464;
-pub const ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA: ::DWORD = 8465;
-pub const ERROR_DS_DRA_EXTN_CONNECTION_FAILED: ::DWORD = 8466;
-pub const ERROR_DS_INSTALL_SCHEMA_MISMATCH: ::DWORD = 8467;
-pub const ERROR_DS_DUP_LINK_ID: ::DWORD = 8468;
-pub const ERROR_DS_NAME_ERROR_RESOLVING: ::DWORD = 8469;
-pub const ERROR_DS_NAME_ERROR_NOT_FOUND: ::DWORD = 8470;
-pub const ERROR_DS_NAME_ERROR_NOT_UNIQUE: ::DWORD = 8471;
-pub const ERROR_DS_NAME_ERROR_NO_MAPPING: ::DWORD = 8472;
-pub const ERROR_DS_NAME_ERROR_DOMAIN_ONLY: ::DWORD = 8473;
-pub const ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING: ::DWORD = 8474;
-pub const ERROR_DS_CONSTRUCTED_ATT_MOD: ::DWORD = 8475;
-pub const ERROR_DS_WRONG_OM_OBJ_CLASS: ::DWORD = 8476;
-pub const ERROR_DS_DRA_REPL_PENDING: ::DWORD = 8477;
-pub const ERROR_DS_DS_REQUIRED: ::DWORD = 8478;
-pub const ERROR_DS_INVALID_LDAP_DISPLAY_NAME: ::DWORD = 8479;
-pub const ERROR_DS_NON_BASE_SEARCH: ::DWORD = 8480;
-pub const ERROR_DS_CANT_RETRIEVE_ATTS: ::DWORD = 8481;
-pub const ERROR_DS_BACKLINK_WITHOUT_LINK: ::DWORD = 8482;
-pub const ERROR_DS_EPOCH_MISMATCH: ::DWORD = 8483;
-pub const ERROR_DS_SRC_NAME_MISMATCH: ::DWORD = 8484;
-pub const ERROR_DS_SRC_AND_DST_NC_IDENTICAL: ::DWORD = 8485;
-pub const ERROR_DS_DST_NC_MISMATCH: ::DWORD = 8486;
-pub const ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC: ::DWORD = 8487;
-pub const ERROR_DS_SRC_GUID_MISMATCH: ::DWORD = 8488;
-pub const ERROR_DS_CANT_MOVE_DELETED_OBJECT: ::DWORD = 8489;
-pub const ERROR_DS_PDC_OPERATION_IN_PROGRESS: ::DWORD = 8490;
-pub const ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD: ::DWORD = 8491;
-pub const ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION: ::DWORD = 8492;
-pub const ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS: ::DWORD = 8493;
-pub const ERROR_DS_NC_MUST_HAVE_NC_PARENT: ::DWORD = 8494;
-pub const ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE: ::DWORD = 8495;
-pub const ERROR_DS_DST_DOMAIN_NOT_NATIVE: ::DWORD = 8496;
-pub const ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER: ::DWORD = 8497;
-pub const ERROR_DS_CANT_MOVE_ACCOUNT_GROUP: ::DWORD = 8498;
-pub const ERROR_DS_CANT_MOVE_RESOURCE_GROUP: ::DWORD = 8499;
-pub const ERROR_DS_INVALID_SEARCH_FLAG: ::DWORD = 8500;
-pub const ERROR_DS_NO_TREE_DELETE_ABOVE_NC: ::DWORD = 8501;
-pub const ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE: ::DWORD = 8502;
-pub const ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE: ::DWORD = 8503;
-pub const ERROR_DS_SAM_INIT_FAILURE: ::DWORD = 8504;
-pub const ERROR_DS_SENSITIVE_GROUP_VIOLATION: ::DWORD = 8505;
-pub const ERROR_DS_CANT_MOD_PRIMARYGROUPID: ::DWORD = 8506;
-pub const ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD: ::DWORD = 8507;
-pub const ERROR_DS_NONSAFE_SCHEMA_CHANGE: ::DWORD = 8508;
-pub const ERROR_DS_SCHEMA_UPDATE_DISALLOWED: ::DWORD = 8509;
-pub const ERROR_DS_CANT_CREATE_UNDER_SCHEMA: ::DWORD = 8510;
-pub const ERROR_DS_INSTALL_NO_SRC_SCH_VERSION: ::DWORD = 8511;
-pub const ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE: ::DWORD = 8512;
-pub const ERROR_DS_INVALID_GROUP_TYPE: ::DWORD = 8513;
-pub const ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN: ::DWORD = 8514;
-pub const ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN: ::DWORD = 8515;
-pub const ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER: ::DWORD = 8516;
-pub const ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER: ::DWORD = 8517;
-pub const ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER: ::DWORD = 8518;
-pub const ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER: ::DWORD = 8519;
-pub const ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER: ::DWORD = 8520;
-pub const ERROR_DS_HAVE_PRIMARY_MEMBERS: ::DWORD = 8521;
-pub const ERROR_DS_STRING_SD_CONVERSION_FAILED: ::DWORD = 8522;
-pub const ERROR_DS_NAMING_MASTER_GC: ::DWORD = 8523;
-pub const ERROR_DS_DNS_LOOKUP_FAILURE: ::DWORD = 8524;
-pub const ERROR_DS_COULDNT_UPDATE_SPNS: ::DWORD = 8525;
-pub const ERROR_DS_CANT_RETRIEVE_SD: ::DWORD = 8526;
-pub const ERROR_DS_KEY_NOT_UNIQUE: ::DWORD = 8527;
-pub const ERROR_DS_WRONG_LINKED_ATT_SYNTAX: ::DWORD = 8528;
-pub const ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD: ::DWORD = 8529;
-pub const ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY: ::DWORD = 8530;
-pub const ERROR_DS_CANT_START: ::DWORD = 8531;
-pub const ERROR_DS_INIT_FAILURE: ::DWORD = 8532;
-pub const ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION: ::DWORD = 8533;
-pub const ERROR_DS_SOURCE_DOMAIN_IN_FOREST: ::DWORD = 8534;
-pub const ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST: ::DWORD = 8535;
-pub const ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED: ::DWORD = 8536;
-pub const ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN: ::DWORD = 8537;
-pub const ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER: ::DWORD = 8538;
-pub const ERROR_DS_SRC_SID_EXISTS_IN_FOREST: ::DWORD = 8539;
-pub const ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH: ::DWORD = 8540;
-pub const ERROR_SAM_INIT_FAILURE: ::DWORD = 8541;
-pub const ERROR_DS_DRA_SCHEMA_INFO_SHIP: ::DWORD = 8542;
-pub const ERROR_DS_DRA_SCHEMA_CONFLICT: ::DWORD = 8543;
-pub const ERROR_DS_DRA_EARLIER_SCHEMA_CONFLICT: ::DWORD = 8544;
-pub const ERROR_DS_DRA_OBJ_NC_MISMATCH: ::DWORD = 8545;
-pub const ERROR_DS_NC_STILL_HAS_DSAS: ::DWORD = 8546;
-pub const ERROR_DS_GC_REQUIRED: ::DWORD = 8547;
-pub const ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY: ::DWORD = 8548;
-pub const ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS: ::DWORD = 8549;
-pub const ERROR_DS_CANT_ADD_TO_GC: ::DWORD = 8550;
-pub const ERROR_DS_NO_CHECKPOINT_WITH_PDC: ::DWORD = 8551;
-pub const ERROR_DS_SOURCE_AUDITING_NOT_ENABLED: ::DWORD = 8552;
-pub const ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC: ::DWORD = 8553;
-pub const ERROR_DS_INVALID_NAME_FOR_SPN: ::DWORD = 8554;
-pub const ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS: ::DWORD = 8555;
-pub const ERROR_DS_UNICODEPWD_NOT_IN_QUOTES: ::DWORD = 8556;
-pub const ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED: ::DWORD = 8557;
-pub const ERROR_DS_MUST_BE_RUN_ON_DST_DC: ::DWORD = 8558;
-pub const ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER: ::DWORD = 8559;
-pub const ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ: ::DWORD = 8560;
-pub const ERROR_DS_INIT_FAILURE_CONSOLE: ::DWORD = 8561;
-pub const ERROR_DS_SAM_INIT_FAILURE_CONSOLE: ::DWORD = 8562;
-pub const ERROR_DS_FOREST_VERSION_TOO_HIGH: ::DWORD = 8563;
-pub const ERROR_DS_DOMAIN_VERSION_TOO_HIGH: ::DWORD = 8564;
-pub const ERROR_DS_FOREST_VERSION_TOO_LOW: ::DWORD = 8565;
-pub const ERROR_DS_DOMAIN_VERSION_TOO_LOW: ::DWORD = 8566;
-pub const ERROR_DS_INCOMPATIBLE_VERSION: ::DWORD = 8567;
-pub const ERROR_DS_LOW_DSA_VERSION: ::DWORD = 8568;
-pub const ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN: ::DWORD = 8569;
-pub const ERROR_DS_NOT_SUPPORTED_SORT_ORDER: ::DWORD = 8570;
-pub const ERROR_DS_NAME_NOT_UNIQUE: ::DWORD = 8571;
-pub const ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4: ::DWORD = 8572;
-pub const ERROR_DS_OUT_OF_VERSION_STORE: ::DWORD = 8573;
-pub const ERROR_DS_INCOMPATIBLE_CONTROLS_USED: ::DWORD = 8574;
-pub const ERROR_DS_NO_REF_DOMAIN: ::DWORD = 8575;
-pub const ERROR_DS_RESERVED_LINK_ID: ::DWORD = 8576;
-pub const ERROR_DS_LINK_ID_NOT_AVAILABLE: ::DWORD = 8577;
-pub const ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER: ::DWORD = 8578;
-pub const ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE: ::DWORD = 8579;
-pub const ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC: ::DWORD = 8580;
-pub const ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG: ::DWORD = 8581;
-pub const ERROR_DS_MODIFYDN_WRONG_GRANDPARENT: ::DWORD = 8582;
-pub const ERROR_DS_NAME_ERROR_TRUST_REFERRAL: ::DWORD = 8583;
-pub const ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER: ::DWORD = 8584;
-pub const ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD: ::DWORD = 8585;
-pub const ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE_V2: ::DWORD = 8586;
-pub const ERROR_DS_THREAD_LIMIT_EXCEEDED: ::DWORD = 8587;
-pub const ERROR_DS_NOT_CLOSEST: ::DWORD = 8588;
-pub const ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF: ::DWORD = 8589;
-pub const ERROR_DS_SINGLE_USER_MODE_FAILED: ::DWORD = 8590;
-pub const ERROR_DS_NTDSCRIPT_SYNTAX_ERROR: ::DWORD = 8591;
-pub const ERROR_DS_NTDSCRIPT_PROCESS_ERROR: ::DWORD = 8592;
-pub const ERROR_DS_DIFFERENT_REPL_EPOCHS: ::DWORD = 8593;
-pub const ERROR_DS_DRS_EXTENSIONS_CHANGED: ::DWORD = 8594;
-pub const ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR: ::DWORD = 8595;
-pub const ERROR_DS_NO_MSDS_INTID: ::DWORD = 8596;
-pub const ERROR_DS_DUP_MSDS_INTID: ::DWORD = 8597;
-pub const ERROR_DS_EXISTS_IN_RDNATTID: ::DWORD = 8598;
-pub const ERROR_DS_AUTHORIZATION_FAILED: ::DWORD = 8599;
-pub const ERROR_DS_INVALID_SCRIPT: ::DWORD = 8600;
-pub const ERROR_DS_REMOTE_CROSSREF_OP_FAILED: ::DWORD = 8601;
-pub const ERROR_DS_CROSS_REF_BUSY: ::DWORD = 8602;
-pub const ERROR_DS_CANT_DERIVE_SPN_FOR_DELETED_DOMAIN: ::DWORD = 8603;
-pub const ERROR_DS_CANT_DEMOTE_WITH_WRITEABLE_NC: ::DWORD = 8604;
-pub const ERROR_DS_DUPLICATE_ID_FOUND: ::DWORD = 8605;
-pub const ERROR_DS_INSUFFICIENT_ATTR_TO_CREATE_OBJECT: ::DWORD = 8606;
-pub const ERROR_DS_GROUP_CONVERSION_ERROR: ::DWORD = 8607;
-pub const ERROR_DS_CANT_MOVE_APP_BASIC_GROUP: ::DWORD = 8608;
-pub const ERROR_DS_CANT_MOVE_APP_QUERY_GROUP: ::DWORD = 8609;
-pub const ERROR_DS_ROLE_NOT_VERIFIED: ::DWORD = 8610;
-pub const ERROR_DS_WKO_CONTAINER_CANNOT_BE_SPECIAL: ::DWORD = 8611;
-pub const ERROR_DS_DOMAIN_RENAME_IN_PROGRESS: ::DWORD = 8612;
-pub const ERROR_DS_EXISTING_AD_CHILD_NC: ::DWORD = 8613;
-pub const ERROR_DS_REPL_LIFETIME_EXCEEDED: ::DWORD = 8614;
-pub const ERROR_DS_DISALLOWED_IN_SYSTEM_CONTAINER: ::DWORD = 8615;
-pub const ERROR_DS_LDAP_SEND_QUEUE_FULL: ::DWORD = 8616;
-pub const ERROR_DS_DRA_OUT_SCHEDULE_WINDOW: ::DWORD = 8617;
-pub const ERROR_DS_POLICY_NOT_KNOWN: ::DWORD = 8618;
-pub const ERROR_NO_SITE_SETTINGS_OBJECT: ::DWORD = 8619;
-pub const ERROR_NO_SECRETS: ::DWORD = 8620;
-pub const ERROR_NO_WRITABLE_DC_FOUND: ::DWORD = 8621;
-pub const ERROR_DS_NO_SERVER_OBJECT: ::DWORD = 8622;
-pub const ERROR_DS_NO_NTDSA_OBJECT: ::DWORD = 8623;
-pub const ERROR_DS_NON_ASQ_SEARCH: ::DWORD = 8624;
-pub const ERROR_DS_AUDIT_FAILURE: ::DWORD = 8625;
-pub const ERROR_DS_INVALID_SEARCH_FLAG_SUBTREE: ::DWORD = 8626;
-pub const ERROR_DS_INVALID_SEARCH_FLAG_TUPLE: ::DWORD = 8627;
-pub const ERROR_DS_HIERARCHY_TABLE_TOO_DEEP: ::DWORD = 8628;
-pub const ERROR_DS_DRA_CORRUPT_UTD_VECTOR: ::DWORD = 8629;
-pub const ERROR_DS_DRA_SECRETS_DENIED: ::DWORD = 8630;
-pub const ERROR_DS_RESERVED_MAPI_ID: ::DWORD = 8631;
-pub const ERROR_DS_MAPI_ID_NOT_AVAILABLE: ::DWORD = 8632;
-pub const ERROR_DS_DRA_MISSING_KRBTGT_SECRET: ::DWORD = 8633;
-pub const ERROR_DS_DOMAIN_NAME_EXISTS_IN_FOREST: ::DWORD = 8634;
-pub const ERROR_DS_FLAT_NAME_EXISTS_IN_FOREST: ::DWORD = 8635;
-pub const ERROR_INVALID_USER_PRINCIPAL_NAME: ::DWORD = 8636;
-pub const ERROR_DS_OID_MAPPED_GROUP_CANT_HAVE_MEMBERS: ::DWORD = 8637;
-pub const ERROR_DS_OID_NOT_FOUND: ::DWORD = 8638;
-pub const ERROR_DS_DRA_RECYCLED_TARGET: ::DWORD = 8639;
-pub const ERROR_DS_DISALLOWED_NC_REDIRECT: ::DWORD = 8640;
-pub const ERROR_DS_HIGH_ADLDS_FFL: ::DWORD = 8641;
-pub const ERROR_DS_HIGH_DSA_VERSION: ::DWORD = 8642;
-pub const ERROR_DS_LOW_ADLDS_FFL: ::DWORD = 8643;
-pub const ERROR_DOMAIN_SID_SAME_AS_LOCAL_WORKSTATION: ::DWORD = 8644;
-pub const ERROR_DS_UNDELETE_SAM_VALIDATION_FAILED: ::DWORD = 8645;
-pub const ERROR_INCORRECT_ACCOUNT_TYPE: ::DWORD = 8646;
-pub const ERROR_DS_SPN_VALUE_NOT_UNIQUE_IN_FOREST: ::DWORD = 8647;
-pub const ERROR_DS_UPN_VALUE_NOT_UNIQUE_IN_FOREST: ::DWORD = 8648;
-pub const DNS_ERROR_RESPONSE_CODES_BASE: ::DWORD = 9000;
-pub const DNS_ERROR_RCODE_NO_ERROR: ::DWORD = NO_ERROR;
-pub const DNS_ERROR_MASK: ::DWORD = 0x00002328;
-pub const DNS_ERROR_RCODE_FORMAT_ERROR: ::DWORD = 9001;
-pub const DNS_ERROR_RCODE_SERVER_FAILURE: ::DWORD = 9002;
-pub const DNS_ERROR_RCODE_NAME_ERROR: ::DWORD = 9003;
-pub const DNS_ERROR_RCODE_NOT_IMPLEMENTED: ::DWORD = 9004;
-pub const DNS_ERROR_RCODE_REFUSED: ::DWORD = 9005;
-pub const DNS_ERROR_RCODE_YXDOMAIN: ::DWORD = 9006;
-pub const DNS_ERROR_RCODE_YXRRSET: ::DWORD = 9007;
-pub const DNS_ERROR_RCODE_NXRRSET: ::DWORD = 9008;
-pub const DNS_ERROR_RCODE_NOTAUTH: ::DWORD = 9009;
-pub const DNS_ERROR_RCODE_NOTZONE: ::DWORD = 9010;
-pub const DNS_ERROR_RCODE_BADSIG: ::DWORD = 9016;
-pub const DNS_ERROR_RCODE_BADKEY: ::DWORD = 9017;
-pub const DNS_ERROR_RCODE_BADTIME: ::DWORD = 9018;
-pub const DNS_ERROR_RCODE_LAST: ::DWORD = DNS_ERROR_RCODE_BADTIME;
-pub const DNS_ERROR_DNSSEC_BASE: ::DWORD = 9100;
-pub const DNS_ERROR_KEYMASTER_REQUIRED: ::DWORD = 9101;
-pub const DNS_ERROR_NOT_ALLOWED_ON_SIGNED_ZONE: ::DWORD = 9102;
-pub const DNS_ERROR_NSEC3_INCOMPATIBLE_WITH_RSA_SHA1: ::DWORD = 9103;
-pub const DNS_ERROR_NOT_ENOUGH_SIGNING_KEY_DESCRIPTORS: ::DWORD = 9104;
-pub const DNS_ERROR_UNSUPPORTED_ALGORITHM: ::DWORD = 9105;
-pub const DNS_ERROR_INVALID_KEY_SIZE: ::DWORD = 9106;
-pub const DNS_ERROR_SIGNING_KEY_NOT_ACCESSIBLE: ::DWORD = 9107;
-pub const DNS_ERROR_KSP_DOES_NOT_SUPPORT_PROTECTION: ::DWORD = 9108;
-pub const DNS_ERROR_UNEXPECTED_DATA_PROTECTION_ERROR: ::DWORD = 9109;
-pub const DNS_ERROR_UNEXPECTED_CNG_ERROR: ::DWORD = 9110;
-pub const DNS_ERROR_UNKNOWN_SIGNING_PARAMETER_VERSION: ::DWORD = 9111;
-pub const DNS_ERROR_KSP_NOT_ACCESSIBLE: ::DWORD = 9112;
-pub const DNS_ERROR_TOO_MANY_SKDS: ::DWORD = 9113;
-pub const DNS_ERROR_INVALID_ROLLOVER_PERIOD: ::DWORD = 9114;
-pub const DNS_ERROR_INVALID_INITIAL_ROLLOVER_OFFSET: ::DWORD = 9115;
-pub const DNS_ERROR_ROLLOVER_IN_PROGRESS: ::DWORD = 9116;
-pub const DNS_ERROR_STANDBY_KEY_NOT_PRESENT: ::DWORD = 9117;
-pub const DNS_ERROR_NOT_ALLOWED_ON_ZSK: ::DWORD = 9118;
-pub const DNS_ERROR_NOT_ALLOWED_ON_ACTIVE_SKD: ::DWORD = 9119;
-pub const DNS_ERROR_ROLLOVER_ALREADY_QUEUED: ::DWORD = 9120;
-pub const DNS_ERROR_NOT_ALLOWED_ON_UNSIGNED_ZONE: ::DWORD = 9121;
-pub const DNS_ERROR_BAD_KEYMASTER: ::DWORD = 9122;
-pub const DNS_ERROR_INVALID_SIGNATURE_VALIDITY_PERIOD: ::DWORD = 9123;
-pub const DNS_ERROR_INVALID_NSEC3_ITERATION_COUNT: ::DWORD = 9124;
-pub const DNS_ERROR_DNSSEC_IS_DISABLED: ::DWORD = 9125;
-pub const DNS_ERROR_INVALID_XML: ::DWORD = 9126;
-pub const DNS_ERROR_NO_VALID_TRUST_ANCHORS: ::DWORD = 9127;
-pub const DNS_ERROR_ROLLOVER_NOT_POKEABLE: ::DWORD = 9128;
-pub const DNS_ERROR_NSEC3_NAME_COLLISION: ::DWORD = 9129;
-pub const DNS_ERROR_NSEC_INCOMPATIBLE_WITH_NSEC3_RSA_SHA1: ::DWORD = 9130;
-pub const DNS_ERROR_PACKET_FMT_BASE: ::DWORD = 9500;
-pub const DNS_INFO_NO_RECORDS: ::DWORD = 9501;
-pub const DNS_ERROR_BAD_PACKET: ::DWORD = 9502;
-pub const DNS_ERROR_NO_PACKET: ::DWORD = 9503;
-pub const DNS_ERROR_RCODE: ::DWORD = 9504;
-pub const DNS_ERROR_UNSECURE_PACKET: ::DWORD = 9505;
-pub const DNS_STATUS_PACKET_UNSECURE: ::DWORD = DNS_ERROR_UNSECURE_PACKET;
-pub const DNS_REQUEST_PENDING: ::DWORD = 9506;
-pub const DNS_ERROR_NO_MEMORY: ::DWORD = ERROR_OUTOFMEMORY;
-pub const DNS_ERROR_INVALID_NAME: ::DWORD = ERROR_INVALID_NAME;
-pub const DNS_ERROR_INVALID_DATA: ::DWORD = ERROR_INVALID_DATA;
-pub const DNS_ERROR_GENERAL_API_BASE: ::DWORD = 9550;
-pub const DNS_ERROR_INVALID_TYPE: ::DWORD = 9551;
-pub const DNS_ERROR_INVALID_IP_ADDRESS: ::DWORD = 9552;
-pub const DNS_ERROR_INVALID_PROPERTY: ::DWORD = 9553;
-pub const DNS_ERROR_TRY_AGAIN_LATER: ::DWORD = 9554;
-pub const DNS_ERROR_NOT_UNIQUE: ::DWORD = 9555;
-pub const DNS_ERROR_NON_RFC_NAME: ::DWORD = 9556;
-pub const DNS_STATUS_FQDN: ::DWORD = 9557;
-pub const DNS_STATUS_DOTTED_NAME: ::DWORD = 9558;
-pub const DNS_STATUS_SINGLE_PART_NAME: ::DWORD = 9559;
-pub const DNS_ERROR_INVALID_NAME_CHAR: ::DWORD = 9560;
-pub const DNS_ERROR_NUMERIC_NAME: ::DWORD = 9561;
-pub const DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER: ::DWORD = 9562;
-pub const DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION: ::DWORD = 9563;
-pub const DNS_ERROR_CANNOT_FIND_ROOT_HINTS: ::DWORD = 9564;
-pub const DNS_ERROR_INCONSISTENT_ROOT_HINTS: ::DWORD = 9565;
-pub const DNS_ERROR_DWORD_VALUE_TOO_SMALL: ::DWORD = 9566;
-pub const DNS_ERROR_DWORD_VALUE_TOO_LARGE: ::DWORD = 9567;
-pub const DNS_ERROR_BACKGROUND_LOADING: ::DWORD = 9568;
-pub const DNS_ERROR_NOT_ALLOWED_ON_RODC: ::DWORD = 9569;
-pub const DNS_ERROR_NOT_ALLOWED_UNDER_DNAME: ::DWORD = 9570;
-pub const DNS_ERROR_DELEGATION_REQUIRED: ::DWORD = 9571;
-pub const DNS_ERROR_INVALID_POLICY_TABLE: ::DWORD = 9572;
-pub const DNS_ERROR_ZONE_BASE: ::DWORD = 9600;
-pub const DNS_ERROR_ZONE_DOES_NOT_EXIST: ::DWORD = 9601;
-pub const DNS_ERROR_NO_ZONE_INFO: ::DWORD = 9602;
-pub const DNS_ERROR_INVALID_ZONE_OPERATION: ::DWORD = 9603;
-pub const DNS_ERROR_ZONE_CONFIGURATION_ERROR: ::DWORD = 9604;
-pub const DNS_ERROR_ZONE_HAS_NO_SOA_RECORD: ::DWORD = 9605;
-pub const DNS_ERROR_ZONE_HAS_NO_NS_RECORDS: ::DWORD = 9606;
-pub const DNS_ERROR_ZONE_LOCKED: ::DWORD = 9607;
-pub const DNS_ERROR_ZONE_CREATION_FAILED: ::DWORD = 9608;
-pub const DNS_ERROR_ZONE_ALREADY_EXISTS: ::DWORD = 9609;
-pub const DNS_ERROR_AUTOZONE_ALREADY_EXISTS: ::DWORD = 9610;
-pub const DNS_ERROR_INVALID_ZONE_TYPE: ::DWORD = 9611;
-pub const DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP: ::DWORD = 9612;
-pub const DNS_ERROR_ZONE_NOT_SECONDARY: ::DWORD = 9613;
-pub const DNS_ERROR_NEED_SECONDARY_ADDRESSES: ::DWORD = 9614;
-pub const DNS_ERROR_WINS_INIT_FAILED: ::DWORD = 9615;
-pub const DNS_ERROR_NEED_WINS_SERVERS: ::DWORD = 9616;
-pub const DNS_ERROR_NBSTAT_INIT_FAILED: ::DWORD = 9617;
-pub const DNS_ERROR_SOA_DELETE_INVALID: ::DWORD = 9618;
-pub const DNS_ERROR_FORWARDER_ALREADY_EXISTS: ::DWORD = 9619;
-pub const DNS_ERROR_ZONE_REQUIRES_MASTER_IP: ::DWORD = 9620;
-pub const DNS_ERROR_ZONE_IS_SHUTDOWN: ::DWORD = 9621;
-pub const DNS_ERROR_ZONE_LOCKED_FOR_SIGNING: ::DWORD = 9622;
-pub const DNS_ERROR_DATAFILE_BASE: ::DWORD = 9650;
-pub const DNS_ERROR_PRIMARY_REQUIRES_DATAFILE: ::DWORD = 9651;
-pub const DNS_ERROR_INVALID_DATAFILE_NAME: ::DWORD = 9652;
-pub const DNS_ERROR_DATAFILE_OPEN_FAILURE: ::DWORD = 9653;
-pub const DNS_ERROR_FILE_WRITEBACK_FAILED: ::DWORD = 9654;
-pub const DNS_ERROR_DATAFILE_PARSING: ::DWORD = 9655;
-pub const DNS_ERROR_DATABASE_BASE: ::DWORD = 9700;
-pub const DNS_ERROR_RECORD_DOES_NOT_EXIST: ::DWORD = 9701;
-pub const DNS_ERROR_RECORD_FORMAT: ::DWORD = 9702;
-pub const DNS_ERROR_NODE_CREATION_FAILED: ::DWORD = 9703;
-pub const DNS_ERROR_UNKNOWN_RECORD_TYPE: ::DWORD = 9704;
-pub const DNS_ERROR_RECORD_TIMED_OUT: ::DWORD = 9705;
-pub const DNS_ERROR_NAME_NOT_IN_ZONE: ::DWORD = 9706;
-pub const DNS_ERROR_CNAME_LOOP: ::DWORD = 9707;
-pub const DNS_ERROR_NODE_IS_CNAME: ::DWORD = 9708;
-pub const DNS_ERROR_CNAME_COLLISION: ::DWORD = 9709;
-pub const DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT: ::DWORD = 9710;
-pub const DNS_ERROR_RECORD_ALREADY_EXISTS: ::DWORD = 9711;
-pub const DNS_ERROR_SECONDARY_DATA: ::DWORD = 9712;
-pub const DNS_ERROR_NO_CREATE_CACHE_DATA: ::DWORD = 9713;
-pub const DNS_ERROR_NAME_DOES_NOT_EXIST: ::DWORD = 9714;
-pub const DNS_WARNING_PTR_CREATE_FAILED: ::DWORD = 9715;
-pub const DNS_WARNING_DOMAIN_UNDELETED: ::DWORD = 9716;
-pub const DNS_ERROR_DS_UNAVAILABLE: ::DWORD = 9717;
-pub const DNS_ERROR_DS_ZONE_ALREADY_EXISTS: ::DWORD = 9718;
-pub const DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE: ::DWORD = 9719;
-pub const DNS_ERROR_NODE_IS_DNAME: ::DWORD = 9720;
-pub const DNS_ERROR_DNAME_COLLISION: ::DWORD = 9721;
-pub const DNS_ERROR_ALIAS_LOOP: ::DWORD = 9722;
-pub const DNS_ERROR_OPERATION_BASE: ::DWORD = 9750;
-pub const DNS_INFO_AXFR_COMPLETE: ::DWORD = 9751;
-pub const DNS_ERROR_AXFR: ::DWORD = 9752;
-pub const DNS_INFO_ADDED_LOCAL_WINS: ::DWORD = 9753;
-pub const DNS_ERROR_SECURE_BASE: ::DWORD = 9800;
-pub const DNS_STATUS_CONTINUE_NEEDED: ::DWORD = 9801;
-pub const DNS_ERROR_SETUP_BASE: ::DWORD = 9850;
-pub const DNS_ERROR_NO_TCPIP: ::DWORD = 9851;
-pub const DNS_ERROR_NO_DNS_SERVERS: ::DWORD = 9852;
-pub const DNS_ERROR_DP_BASE: ::DWORD = 9900;
-pub const DNS_ERROR_DP_DOES_NOT_EXIST: ::DWORD = 9901;
-pub const DNS_ERROR_DP_ALREADY_EXISTS: ::DWORD = 9902;
-pub const DNS_ERROR_DP_NOT_ENLISTED: ::DWORD = 9903;
-pub const DNS_ERROR_DP_ALREADY_ENLISTED: ::DWORD = 9904;
-pub const DNS_ERROR_DP_NOT_AVAILABLE: ::DWORD = 9905;
-pub const DNS_ERROR_DP_FSMO_ERROR: ::DWORD = 9906;
-pub const DNS_ERROR_ZONESCOPE_ALREADY_EXISTS: ::DWORD = 9951;
-pub const DNS_ERROR_ZONESCOPE_DOES_NOT_EXIST: ::DWORD = 9952;
-pub const DNS_ERROR_DEFAULT_ZONESCOPE: ::DWORD = 9953;
-pub const DNS_ERROR_INVALID_ZONESCOPE_NAME: ::DWORD = 9954;
-pub const DNS_ERROR_NOT_ALLOWED_WITH_ZONESCOPES: ::DWORD = 9955;
-pub const DNS_ERROR_LOAD_ZONESCOPE_FAILED: ::DWORD = 9956;
-pub const DNS_ERROR_ZONESCOPE_FILE_WRITEBACK_FAILED: ::DWORD = 9957;
-pub const DNS_ERROR_INVALID_SCOPE_NAME: ::DWORD = 9958;
-pub const DNS_ERROR_SCOPE_DOES_NOT_EXIST: ::DWORD = 9959;
-pub const DNS_ERROR_DEFAULT_SCOPE: ::DWORD = 9960;
-pub const DNS_ERROR_INVALID_SCOPE_OPERATION: ::DWORD = 9961;
-pub const DNS_ERROR_SCOPE_LOCKED: ::DWORD = 9962;
-pub const DNS_ERROR_SCOPE_ALREADY_EXISTS: ::DWORD = 9963;
-pub const WSABASEERR: ::DWORD = 10000;
-pub const WSAEINTR: ::DWORD = 10004;
-pub const WSAEBADF: ::DWORD = 10009;
-pub const WSAEACCES: ::DWORD = 10013;
-pub const WSAEFAULT: ::DWORD = 10014;
-pub const WSAEINVAL: ::DWORD = 10022;
-pub const WSAEMFILE: ::DWORD = 10024;
-pub const WSAEWOULDBLOCK: ::DWORD = 10035;
-pub const WSAEINPROGRESS: ::DWORD = 10036;
-pub const WSAEALREADY: ::DWORD = 10037;
-pub const WSAENOTSOCK: ::DWORD = 10038;
-pub const WSAEDESTADDRREQ: ::DWORD = 10039;
-pub const WSAEMSGSIZE: ::DWORD = 10040;
-pub const WSAEPROTOTYPE: ::DWORD = 10041;
-pub const WSAENOPROTOOPT: ::DWORD = 10042;
-pub const WSAEPROTONOSUPPORT: ::DWORD = 10043;
-pub const WSAESOCKTNOSUPPORT: ::DWORD = 10044;
-pub const WSAEOPNOTSUPP: ::DWORD = 10045;
-pub const WSAEPFNOSUPPORT: ::DWORD = 10046;
-pub const WSAEAFNOSUPPORT: ::DWORD = 10047;
-pub const WSAEADDRINUSE: ::DWORD = 10048;
-pub const WSAEADDRNOTAVAIL: ::DWORD = 10049;
-pub const WSAENETDOWN: ::DWORD = 10050;
-pub const WSAENETUNREACH: ::DWORD = 10051;
-pub const WSAENETRESET: ::DWORD = 10052;
-pub const WSAECONNABORTED: ::DWORD = 10053;
-pub const WSAECONNRESET: ::DWORD = 10054;
-pub const WSAENOBUFS: ::DWORD = 10055;
-pub const WSAEISCONN: ::DWORD = 10056;
-pub const WSAENOTCONN: ::DWORD = 10057;
-pub const WSAESHUTDOWN: ::DWORD = 10058;
-pub const WSAETOOMANYREFS: ::DWORD = 10059;
-pub const WSAETIMEDOUT: ::DWORD = 10060;
-pub const WSAECONNREFUSED: ::DWORD = 10061;
-pub const WSAELOOP: ::DWORD = 10062;
-pub const WSAENAMETOOLONG: ::DWORD = 10063;
-pub const WSAEHOSTDOWN: ::DWORD = 10064;
-pub const WSAEHOSTUNREACH: ::DWORD = 10065;
-pub const WSAENOTEMPTY: ::DWORD = 10066;
-pub const WSAEPROCLIM: ::DWORD = 10067;
-pub const WSAEUSERS: ::DWORD = 10068;
-pub const WSAEDQUOT: ::DWORD = 10069;
-pub const WSAESTALE: ::DWORD = 10070;
-pub const WSAEREMOTE: ::DWORD = 10071;
-pub const WSASYSNOTREADY: ::DWORD = 10091;
-pub const WSAVERNOTSUPPORTED: ::DWORD = 10092;
-pub const WSANOTINITIALISED: ::DWORD = 10093;
-pub const WSAEDISCON: ::DWORD = 10101;
-pub const WSAENOMORE: ::DWORD = 10102;
-pub const WSAECANCELLED: ::DWORD = 10103;
-pub const WSAEINVALIDPROCTABLE: ::DWORD = 10104;
-pub const WSAEINVALIDPROVIDER: ::DWORD = 10105;
-pub const WSAEPROVIDERFAILEDINIT: ::DWORD = 10106;
-pub const WSASYSCALLFAILURE: ::DWORD = 10107;
-pub const WSASERVICE_NOT_FOUND: ::DWORD = 10108;
-pub const WSATYPE_NOT_FOUND: ::DWORD = 10109;
-pub const WSA_E_NO_MORE: ::DWORD = 10110;
-pub const WSA_E_CANCELLED: ::DWORD = 10111;
-pub const WSAEREFUSED: ::DWORD = 10112;
-pub const WSAHOST_NOT_FOUND: ::DWORD = 11001;
-pub const WSATRY_AGAIN: ::DWORD = 11002;
-pub const WSANO_RECOVERY: ::DWORD = 11003;
-pub const WSANO_DATA: ::DWORD = 11004;
-pub const WSA_QOS_RECEIVERS: ::DWORD = 11005;
-pub const WSA_QOS_SENDERS: ::DWORD = 11006;
-pub const WSA_QOS_NO_SENDERS: ::DWORD = 11007;
-pub const WSA_QOS_NO_RECEIVERS: ::DWORD = 11008;
-pub const WSA_QOS_REQUEST_CONFIRMED: ::DWORD = 11009;
-pub const WSA_QOS_ADMISSION_FAILURE: ::DWORD = 11010;
-pub const WSA_QOS_POLICY_FAILURE: ::DWORD = 11011;
-pub const WSA_QOS_BAD_STYLE: ::DWORD = 11012;
-pub const WSA_QOS_BAD_OBJECT: ::DWORD = 11013;
-pub const WSA_QOS_TRAFFIC_CTRL_ERROR: ::DWORD = 11014;
-pub const WSA_QOS_GENERIC_ERROR: ::DWORD = 11015;
-pub const WSA_QOS_ESERVICETYPE: ::DWORD = 11016;
-pub const WSA_QOS_EFLOWSPEC: ::DWORD = 11017;
-pub const WSA_QOS_EPROVSPECBUF: ::DWORD = 11018;
-pub const WSA_QOS_EFILTERSTYLE: ::DWORD = 11019;
-pub const WSA_QOS_EFILTERTYPE: ::DWORD = 11020;
-pub const WSA_QOS_EFILTERCOUNT: ::DWORD = 11021;
-pub const WSA_QOS_EOBJLENGTH: ::DWORD = 11022;
-pub const WSA_QOS_EFLOWCOUNT: ::DWORD = 11023;
-pub const WSA_QOS_EUNKOWNPSOBJ: ::DWORD = 11024;
-pub const WSA_QOS_EPOLICYOBJ: ::DWORD = 11025;
-pub const WSA_QOS_EFLOWDESC: ::DWORD = 11026;
-pub const WSA_QOS_EPSFLOWSPEC: ::DWORD = 11027;
-pub const WSA_QOS_EPSFILTERSPEC: ::DWORD = 11028;
-pub const WSA_QOS_ESDMODEOBJ: ::DWORD = 11029;
-pub const WSA_QOS_ESHAPERATEOBJ: ::DWORD = 11030;
-pub const WSA_QOS_RESERVED_PETYPE: ::DWORD = 11031;
-pub const WSA_SECURE_HOST_NOT_FOUND: ::DWORD = 11032;
-pub const WSA_IPSEC_NAME_POLICY_ERROR: ::DWORD = 11033;
-pub const ERROR_IPSEC_QM_POLICY_EXISTS: ::DWORD = 13000;
-pub const ERROR_IPSEC_QM_POLICY_NOT_FOUND: ::DWORD = 13001;
-pub const ERROR_IPSEC_QM_POLICY_IN_USE: ::DWORD = 13002;
-pub const ERROR_IPSEC_MM_POLICY_EXISTS: ::DWORD = 13003;
-pub const ERROR_IPSEC_MM_POLICY_NOT_FOUND: ::DWORD = 13004;
-pub const ERROR_IPSEC_MM_POLICY_IN_USE: ::DWORD = 13005;
-pub const ERROR_IPSEC_MM_FILTER_EXISTS: ::DWORD = 13006;
-pub const ERROR_IPSEC_MM_FILTER_NOT_FOUND: ::DWORD = 13007;
-pub const ERROR_IPSEC_TRANSPORT_FILTER_EXISTS: ::DWORD = 13008;
-pub const ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND: ::DWORD = 13009;
-pub const ERROR_IPSEC_MM_AUTH_EXISTS: ::DWORD = 13010;
-pub const ERROR_IPSEC_MM_AUTH_NOT_FOUND: ::DWORD = 13011;
-pub const ERROR_IPSEC_MM_AUTH_IN_USE: ::DWORD = 13012;
-pub const ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND: ::DWORD = 13013;
-pub const ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND: ::DWORD = 13014;
-pub const ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND: ::DWORD = 13015;
-pub const ERROR_IPSEC_TUNNEL_FILTER_EXISTS: ::DWORD = 13016;
-pub const ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND: ::DWORD = 13017;
-pub const ERROR_IPSEC_MM_FILTER_PENDING_DELETION: ::DWORD = 13018;
-pub const ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION: ::DWORD = 13019;
-pub const ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION: ::DWORD = 13020;
-pub const ERROR_IPSEC_MM_POLICY_PENDING_DELETION: ::DWORD = 13021;
-pub const ERROR_IPSEC_MM_AUTH_PENDING_DELETION: ::DWORD = 13022;
-pub const ERROR_IPSEC_QM_POLICY_PENDING_DELETION: ::DWORD = 13023;
-pub const WARNING_IPSEC_MM_POLICY_PRUNED: ::DWORD = 13024;
-pub const WARNING_IPSEC_QM_POLICY_PRUNED: ::DWORD = 13025;
-pub const ERROR_IPSEC_IKE_NEG_STATUS_BEGIN: ::DWORD = 13800;
-pub const ERROR_IPSEC_IKE_AUTH_FAIL: ::DWORD = 13801;
-pub const ERROR_IPSEC_IKE_ATTRIB_FAIL: ::DWORD = 13802;
-pub const ERROR_IPSEC_IKE_NEGOTIATION_PENDING: ::DWORD = 13803;
-pub const ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR: ::DWORD = 13804;
-pub const ERROR_IPSEC_IKE_TIMED_OUT: ::DWORD = 13805;
-pub const ERROR_IPSEC_IKE_NO_CERT: ::DWORD = 13806;
-pub const ERROR_IPSEC_IKE_SA_DELETED: ::DWORD = 13807;
-pub const ERROR_IPSEC_IKE_SA_REAPED: ::DWORD = 13808;
-pub const ERROR_IPSEC_IKE_MM_ACQUIRE_DROP: ::DWORD = 13809;
-pub const ERROR_IPSEC_IKE_QM_ACQUIRE_DROP: ::DWORD = 13810;
-pub const ERROR_IPSEC_IKE_QUEUE_DROP_MM: ::DWORD = 13811;
-pub const ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM: ::DWORD = 13812;
-pub const ERROR_IPSEC_IKE_DROP_NO_RESPONSE: ::DWORD = 13813;
-pub const ERROR_IPSEC_IKE_MM_DELAY_DROP: ::DWORD = 13814;
-pub const ERROR_IPSEC_IKE_QM_DELAY_DROP: ::DWORD = 13815;
-pub const ERROR_IPSEC_IKE_ERROR: ::DWORD = 13816;
-pub const ERROR_IPSEC_IKE_CRL_FAILED: ::DWORD = 13817;
-pub const ERROR_IPSEC_IKE_INVALID_KEY_USAGE: ::DWORD = 13818;
-pub const ERROR_IPSEC_IKE_INVALID_CERT_TYPE: ::DWORD = 13819;
-pub const ERROR_IPSEC_IKE_NO_PRIVATE_KEY: ::DWORD = 13820;
-pub const ERROR_IPSEC_IKE_SIMULTANEOUS_REKEY: ::DWORD = 13821;
-pub const ERROR_IPSEC_IKE_DH_FAIL: ::DWORD = 13822;
-pub const ERROR_IPSEC_IKE_CRITICAL_PAYLOAD_NOT_RECOGNIZED: ::DWORD = 13823;
-pub const ERROR_IPSEC_IKE_INVALID_HEADER: ::DWORD = 13824;
-pub const ERROR_IPSEC_IKE_NO_POLICY: ::DWORD = 13825;
-pub const ERROR_IPSEC_IKE_INVALID_SIGNATURE: ::DWORD = 13826;
-pub const ERROR_IPSEC_IKE_KERBEROS_ERROR: ::DWORD = 13827;
-pub const ERROR_IPSEC_IKE_NO_PUBLIC_KEY: ::DWORD = 13828;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR: ::DWORD = 13829;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_SA: ::DWORD = 13830;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_PROP: ::DWORD = 13831;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_TRANS: ::DWORD = 13832;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_KE: ::DWORD = 13833;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_ID: ::DWORD = 13834;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_CERT: ::DWORD = 13835;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ: ::DWORD = 13836;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_HASH: ::DWORD = 13837;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_SIG: ::DWORD = 13838;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_NONCE: ::DWORD = 13839;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY: ::DWORD = 13840;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_DELETE: ::DWORD = 13841;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR: ::DWORD = 13842;
-pub const ERROR_IPSEC_IKE_INVALID_PAYLOAD: ::DWORD = 13843;
-pub const ERROR_IPSEC_IKE_LOAD_SOFT_SA: ::DWORD = 13844;
-pub const ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN: ::DWORD = 13845;
-pub const ERROR_IPSEC_IKE_INVALID_COOKIE: ::DWORD = 13846;
-pub const ERROR_IPSEC_IKE_NO_PEER_CERT: ::DWORD = 13847;
-pub const ERROR_IPSEC_IKE_PEER_CRL_FAILED: ::DWORD = 13848;
-pub const ERROR_IPSEC_IKE_POLICY_CHANGE: ::DWORD = 13849;
-pub const ERROR_IPSEC_IKE_NO_MM_POLICY: ::DWORD = 13850;
-pub const ERROR_IPSEC_IKE_NOTCBPRIV: ::DWORD = 13851;
-pub const ERROR_IPSEC_IKE_SECLOADFAIL: ::DWORD = 13852;
-pub const ERROR_IPSEC_IKE_FAILSSPINIT: ::DWORD = 13853;
-pub const ERROR_IPSEC_IKE_FAILQUERYSSP: ::DWORD = 13854;
-pub const ERROR_IPSEC_IKE_SRVACQFAIL: ::DWORD = 13855;
-pub const ERROR_IPSEC_IKE_SRVQUERYCRED: ::DWORD = 13856;
-pub const ERROR_IPSEC_IKE_GETSPIFAIL: ::DWORD = 13857;
-pub const ERROR_IPSEC_IKE_INVALID_FILTER: ::DWORD = 13858;
-pub const ERROR_IPSEC_IKE_OUT_OF_MEMORY: ::DWORD = 13859;
-pub const ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED: ::DWORD = 13860;
-pub const ERROR_IPSEC_IKE_INVALID_POLICY: ::DWORD = 13861;
-pub const ERROR_IPSEC_IKE_UNKNOWN_DOI: ::DWORD = 13862;
-pub const ERROR_IPSEC_IKE_INVALID_SITUATION: ::DWORD = 13863;
-pub const ERROR_IPSEC_IKE_DH_FAILURE: ::DWORD = 13864;
-pub const ERROR_IPSEC_IKE_INVALID_GROUP: ::DWORD = 13865;
-pub const ERROR_IPSEC_IKE_ENCRYPT: ::DWORD = 13866;
-pub const ERROR_IPSEC_IKE_DECRYPT: ::DWORD = 13867;
-pub const ERROR_IPSEC_IKE_POLICY_MATCH: ::DWORD = 13868;
-pub const ERROR_IPSEC_IKE_UNSUPPORTED_ID: ::DWORD = 13869;
-pub const ERROR_IPSEC_IKE_INVALID_HASH: ::DWORD = 13870;
-pub const ERROR_IPSEC_IKE_INVALID_HASH_ALG: ::DWORD = 13871;
-pub const ERROR_IPSEC_IKE_INVALID_HASH_SIZE: ::DWORD = 13872;
-pub const ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG: ::DWORD = 13873;
-pub const ERROR_IPSEC_IKE_INVALID_AUTH_ALG: ::DWORD = 13874;
-pub const ERROR_IPSEC_IKE_INVALID_SIG: ::DWORD = 13875;
-pub const ERROR_IPSEC_IKE_LOAD_FAILED: ::DWORD = 13876;
-pub const ERROR_IPSEC_IKE_RPC_DELETE: ::DWORD = 13877;
-pub const ERROR_IPSEC_IKE_BENIGN_REINIT: ::DWORD = 13878;
-pub const ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY: ::DWORD = 13879;
-pub const ERROR_IPSEC_IKE_INVALID_MAJOR_VERSION: ::DWORD = 13880;
-pub const ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN: ::DWORD = 13881;
-pub const ERROR_IPSEC_IKE_MM_LIMIT: ::DWORD = 13882;
-pub const ERROR_IPSEC_IKE_NEGOTIATION_DISABLED: ::DWORD = 13883;
-pub const ERROR_IPSEC_IKE_QM_LIMIT: ::DWORD = 13884;
-pub const ERROR_IPSEC_IKE_MM_EXPIRED: ::DWORD = 13885;
-pub const ERROR_IPSEC_IKE_PEER_MM_ASSUMED_INVALID: ::DWORD = 13886;
-pub const ERROR_IPSEC_IKE_CERT_CHAIN_POLICY_MISMATCH: ::DWORD = 13887;
-pub const ERROR_IPSEC_IKE_UNEXPECTED_MESSAGE_ID: ::DWORD = 13888;
-pub const ERROR_IPSEC_IKE_INVALID_AUTH_PAYLOAD: ::DWORD = 13889;
-pub const ERROR_IPSEC_IKE_DOS_COOKIE_SENT: ::DWORD = 13890;
-pub const ERROR_IPSEC_IKE_SHUTTING_DOWN: ::DWORD = 13891;
-pub const ERROR_IPSEC_IKE_CGA_AUTH_FAILED: ::DWORD = 13892;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_NATOA: ::DWORD = 13893;
-pub const ERROR_IPSEC_IKE_INVALID_MM_FOR_QM: ::DWORD = 13894;
-pub const ERROR_IPSEC_IKE_QM_EXPIRED: ::DWORD = 13895;
-pub const ERROR_IPSEC_IKE_TOO_MANY_FILTERS: ::DWORD = 13896;
-pub const ERROR_IPSEC_IKE_NEG_STATUS_END: ::DWORD = 13897;
-pub const ERROR_IPSEC_IKE_KILL_DUMMY_NAP_TUNNEL: ::DWORD = 13898;
-pub const ERROR_IPSEC_IKE_INNER_IP_ASSIGNMENT_FAILURE: ::DWORD = 13899;
-pub const ERROR_IPSEC_IKE_REQUIRE_CP_PAYLOAD_MISSING: ::DWORD = 13900;
-pub const ERROR_IPSEC_KEY_MODULE_IMPERSONATION_NEGOTIATION_PENDING: ::DWORD = 13901;
-pub const ERROR_IPSEC_IKE_COEXISTENCE_SUPPRESS: ::DWORD = 13902;
-pub const ERROR_IPSEC_IKE_RATELIMIT_DROP: ::DWORD = 13903;
-pub const ERROR_IPSEC_IKE_PEER_DOESNT_SUPPORT_MOBIKE: ::DWORD = 13904;
-pub const ERROR_IPSEC_IKE_AUTHORIZATION_FAILURE: ::DWORD = 13905;
-pub const ERROR_IPSEC_IKE_STRONG_CRED_AUTHORIZATION_FAILURE: ::DWORD = 13906;
-pub const ERROR_IPSEC_IKE_AUTHORIZATION_FAILURE_WITH_OPTIONAL_RETRY: ::DWORD = 13907;
-pub const ERROR_IPSEC_IKE_STRONG_CRED_AUTHORIZATION_AND_CERTMAP_FAILURE: ::DWORD = 13908;
-pub const ERROR_IPSEC_IKE_NEG_STATUS_EXTENDED_END: ::DWORD = 13909;
-pub const ERROR_IPSEC_BAD_SPI: ::DWORD = 13910;
-pub const ERROR_IPSEC_SA_LIFETIME_EXPIRED: ::DWORD = 13911;
-pub const ERROR_IPSEC_WRONG_SA: ::DWORD = 13912;
-pub const ERROR_IPSEC_REPLAY_CHECK_FAILED: ::DWORD = 13913;
-pub const ERROR_IPSEC_INVALID_PACKET: ::DWORD = 13914;
-pub const ERROR_IPSEC_INTEGRITY_CHECK_FAILED: ::DWORD = 13915;
-pub const ERROR_IPSEC_CLEAR_TEXT_DROP: ::DWORD = 13916;
-pub const ERROR_IPSEC_AUTH_FIREWALL_DROP: ::DWORD = 13917;
-pub const ERROR_IPSEC_THROTTLE_DROP: ::DWORD = 13918;
-pub const ERROR_IPSEC_DOSP_BLOCK: ::DWORD = 13925;
-pub const ERROR_IPSEC_DOSP_RECEIVED_MULTICAST: ::DWORD = 13926;
-pub const ERROR_IPSEC_DOSP_INVALID_PACKET: ::DWORD = 13927;
-pub const ERROR_IPSEC_DOSP_STATE_LOOKUP_FAILED: ::DWORD = 13928;
-pub const ERROR_IPSEC_DOSP_MAX_ENTRIES: ::DWORD = 13929;
-pub const ERROR_IPSEC_DOSP_KEYMOD_NOT_ALLOWED: ::DWORD = 13930;
-pub const ERROR_IPSEC_DOSP_NOT_INSTALLED: ::DWORD = 13931;
-pub const ERROR_IPSEC_DOSP_MAX_PER_IP_RATELIMIT_QUEUES: ::DWORD = 13932;
-pub const ERROR_SXS_SECTION_NOT_FOUND: ::DWORD = 14000;
-pub const ERROR_SXS_CANT_GEN_ACTCTX: ::DWORD = 14001;
-pub const ERROR_SXS_INVALID_ACTCTXDATA_FORMAT: ::DWORD = 14002;
-pub const ERROR_SXS_ASSEMBLY_NOT_FOUND: ::DWORD = 14003;
-pub const ERROR_SXS_MANIFEST_FORMAT_ERROR: ::DWORD = 14004;
-pub const ERROR_SXS_MANIFEST_PARSE_ERROR: ::DWORD = 14005;
-pub const ERROR_SXS_ACTIVATION_CONTEXT_DISABLED: ::DWORD = 14006;
-pub const ERROR_SXS_KEY_NOT_FOUND: ::DWORD = 14007;
-pub const ERROR_SXS_VERSION_CONFLICT: ::DWORD = 14008;
-pub const ERROR_SXS_WRONG_SECTION_TYPE: ::DWORD = 14009;
-pub const ERROR_SXS_THREAD_QUERIES_DISABLED: ::DWORD = 14010;
-pub const ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET: ::DWORD = 14011;
-pub const ERROR_SXS_UNKNOWN_ENCODING_GROUP: ::DWORD = 14012;
-pub const ERROR_SXS_UNKNOWN_ENCODING: ::DWORD = 14013;
-pub const ERROR_SXS_INVALID_XML_NAMESPACE_URI: ::DWORD = 14014;
-pub const ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED: ::DWORD = 14015;
-pub const ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED: ::DWORD = 14016;
-pub const ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE: ::DWORD = 14017;
-pub const ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE: ::DWORD = 14018;
-pub const ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE: ::DWORD = 14019;
-pub const ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT: ::DWORD = 14020;
-pub const ERROR_SXS_DUPLICATE_DLL_NAME: ::DWORD = 14021;
-pub const ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME: ::DWORD = 14022;
-pub const ERROR_SXS_DUPLICATE_CLSID: ::DWORD = 14023;
-pub const ERROR_SXS_DUPLICATE_IID: ::DWORD = 14024;
-pub const ERROR_SXS_DUPLICATE_TLBID: ::DWORD = 14025;
-pub const ERROR_SXS_DUPLICATE_PROGID: ::DWORD = 14026;
-pub const ERROR_SXS_DUPLICATE_ASSEMBLY_NAME: ::DWORD = 14027;
-pub const ERROR_SXS_FILE_HASH_MISMATCH: ::DWORD = 14028;
-pub const ERROR_SXS_POLICY_PARSE_ERROR: ::DWORD = 14029;
-pub const ERROR_SXS_XML_E_MISSINGQUOTE: ::DWORD = 14030;
-pub const ERROR_SXS_XML_E_COMMENTSYNTAX: ::DWORD = 14031;
-pub const ERROR_SXS_XML_E_BADSTARTNAMECHAR: ::DWORD = 14032;
-pub const ERROR_SXS_XML_E_BADNAMECHAR: ::DWORD = 14033;
-pub const ERROR_SXS_XML_E_BADCHARINSTRING: ::DWORD = 14034;
-pub const ERROR_SXS_XML_E_XMLDECLSYNTAX: ::DWORD = 14035;
-pub const ERROR_SXS_XML_E_BADCHARDATA: ::DWORD = 14036;
-pub const ERROR_SXS_XML_E_MISSINGWHITESPACE: ::DWORD = 14037;
-pub const ERROR_SXS_XML_E_EXPECTINGTAGEND: ::DWORD = 14038;
-pub const ERROR_SXS_XML_E_MISSINGSEMICOLON: ::DWORD = 14039;
-pub const ERROR_SXS_XML_E_UNBALANCEDPAREN: ::DWORD = 14040;
-pub const ERROR_SXS_XML_E_INTERNALERROR: ::DWORD = 14041;
-pub const ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE: ::DWORD = 14042;
-pub const ERROR_SXS_XML_E_INCOMPLETE_ENCODING: ::DWORD = 14043;
-pub const ERROR_SXS_XML_E_MISSING_PAREN: ::DWORD = 14044;
-pub const ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE: ::DWORD = 14045;
-pub const ERROR_SXS_XML_E_MULTIPLE_COLONS: ::DWORD = 14046;
-pub const ERROR_SXS_XML_E_INVALID_DECIMAL: ::DWORD = 14047;
-pub const ERROR_SXS_XML_E_INVALID_HEXIDECIMAL: ::DWORD = 14048;
-pub const ERROR_SXS_XML_E_INVALID_UNICODE: ::DWORD = 14049;
-pub const ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK: ::DWORD = 14050;
-pub const ERROR_SXS_XML_E_UNEXPECTEDENDTAG: ::DWORD = 14051;
-pub const ERROR_SXS_XML_E_UNCLOSEDTAG: ::DWORD = 14052;
-pub const ERROR_SXS_XML_E_DUPLICATEATTRIBUTE: ::DWORD = 14053;
-pub const ERROR_SXS_XML_E_MULTIPLEROOTS: ::DWORD = 14054;
-pub const ERROR_SXS_XML_E_INVALIDATROOTLEVEL: ::DWORD = 14055;
-pub const ERROR_SXS_XML_E_BADXMLDECL: ::DWORD = 14056;
-pub const ERROR_SXS_XML_E_MISSINGROOT: ::DWORD = 14057;
-pub const ERROR_SXS_XML_E_UNEXPECTEDEOF: ::DWORD = 14058;
-pub const ERROR_SXS_XML_E_BADPEREFINSUBSET: ::DWORD = 14059;
-pub const ERROR_SXS_XML_E_UNCLOSEDSTARTTAG: ::DWORD = 14060;
-pub const ERROR_SXS_XML_E_UNCLOSEDENDTAG: ::DWORD = 14061;
-pub const ERROR_SXS_XML_E_UNCLOSEDSTRING: ::DWORD = 14062;
-pub const ERROR_SXS_XML_E_UNCLOSEDCOMMENT: ::DWORD = 14063;
-pub const ERROR_SXS_XML_E_UNCLOSEDDECL: ::DWORD = 14064;
-pub const ERROR_SXS_XML_E_UNCLOSEDCDATA: ::DWORD = 14065;
-pub const ERROR_SXS_XML_E_RESERVEDNAMESPACE: ::DWORD = 14066;
-pub const ERROR_SXS_XML_E_INVALIDENCODING: ::DWORD = 14067;
-pub const ERROR_SXS_XML_E_INVALIDSWITCH: ::DWORD = 14068;
-pub const ERROR_SXS_XML_E_BADXMLCASE: ::DWORD = 14069;
-pub const ERROR_SXS_XML_E_INVALID_STANDALONE: ::DWORD = 14070;
-pub const ERROR_SXS_XML_E_UNEXPECTED_STANDALONE: ::DWORD = 14071;
-pub const ERROR_SXS_XML_E_INVALID_VERSION: ::DWORD = 14072;
-pub const ERROR_SXS_XML_E_MISSINGEQUALS: ::DWORD = 14073;
-pub const ERROR_SXS_PROTECTION_RECOVERY_FAILED: ::DWORD = 14074;
-pub const ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT: ::DWORD = 14075;
-pub const ERROR_SXS_PROTECTION_CATALOG_NOT_VALID: ::DWORD = 14076;
-pub const ERROR_SXS_UNTRANSLATABLE_HRESULT: ::DWORD = 14077;
-pub const ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING: ::DWORD = 14078;
-pub const ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE: ::DWORD = 14079;
-pub const ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME: ::DWORD = 14080;
-pub const ERROR_SXS_ASSEMBLY_MISSING: ::DWORD = 14081;
-pub const ERROR_SXS_CORRUPT_ACTIVATION_STACK: ::DWORD = 14082;
-pub const ERROR_SXS_CORRUPTION: ::DWORD = 14083;
-pub const ERROR_SXS_EARLY_DEACTIVATION: ::DWORD = 14084;
-pub const ERROR_SXS_INVALID_DEACTIVATION: ::DWORD = 14085;
-pub const ERROR_SXS_MULTIPLE_DEACTIVATION: ::DWORD = 14086;
-pub const ERROR_SXS_PROCESS_TERMINATION_REQUESTED: ::DWORD = 14087;
-pub const ERROR_SXS_RELEASE_ACTIVATION_CONTEXT: ::DWORD = 14088;
-pub const ERROR_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY: ::DWORD = 14089;
-pub const ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE: ::DWORD = 14090;
-pub const ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME: ::DWORD = 14091;
-pub const ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE: ::DWORD = 14092;
-pub const ERROR_SXS_IDENTITY_PARSE_ERROR: ::DWORD = 14093;
-pub const ERROR_MALFORMED_SUBSTITUTION_STRING: ::DWORD = 14094;
-pub const ERROR_SXS_INCORRECT_PUBLIC_KEY_TOKEN: ::DWORD = 14095;
-pub const ERROR_UNMAPPED_SUBSTITUTION_STRING: ::DWORD = 14096;
-pub const ERROR_SXS_ASSEMBLY_NOT_LOCKED: ::DWORD = 14097;
-pub const ERROR_SXS_COMPONENT_STORE_CORRUPT: ::DWORD = 14098;
-pub const ERROR_ADVANCED_INSTALLER_FAILED: ::DWORD = 14099;
-pub const ERROR_XML_ENCODING_MISMATCH: ::DWORD = 14100;
-pub const ERROR_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT: ::DWORD = 14101;
-pub const ERROR_SXS_IDENTITIES_DIFFERENT: ::DWORD = 14102;
-pub const ERROR_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT: ::DWORD = 14103;
-pub const ERROR_SXS_FILE_NOT_PART_OF_ASSEMBLY: ::DWORD = 14104;
-pub const ERROR_SXS_MANIFEST_TOO_BIG: ::DWORD = 14105;
-pub const ERROR_SXS_SETTING_NOT_REGISTERED: ::DWORD = 14106;
-pub const ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE: ::DWORD = 14107;
-pub const ERROR_SMI_PRIMITIVE_INSTALLER_FAILED: ::DWORD = 14108;
-pub const ERROR_GENERIC_COMMAND_FAILED: ::DWORD = 14109;
-pub const ERROR_SXS_FILE_HASH_MISSING: ::DWORD = 14110;
-pub const ERROR_EVT_INVALID_CHANNEL_PATH: ::DWORD = 15000;
-pub const ERROR_EVT_INVALID_QUERY: ::DWORD = 15001;
-pub const ERROR_EVT_PUBLISHER_METADATA_NOT_FOUND: ::DWORD = 15002;
-pub const ERROR_EVT_EVENT_TEMPLATE_NOT_FOUND: ::DWORD = 15003;
-pub const ERROR_EVT_INVALID_PUBLISHER_NAME: ::DWORD = 15004;
-pub const ERROR_EVT_INVALID_EVENT_DATA: ::DWORD = 15005;
-pub const ERROR_EVT_CHANNEL_NOT_FOUND: ::DWORD = 15007;
-pub const ERROR_EVT_MALFORMED_XML_TEXT: ::DWORD = 15008;
-pub const ERROR_EVT_SUBSCRIPTION_TO_DIRECT_CHANNEL: ::DWORD = 15009;
-pub const ERROR_EVT_CONFIGURATION_ERROR: ::DWORD = 15010;
-pub const ERROR_EVT_QUERY_RESULT_STALE: ::DWORD = 15011;
-pub const ERROR_EVT_QUERY_RESULT_INVALID_POSITION: ::DWORD = 15012;
-pub const ERROR_EVT_NON_VALIDATING_MSXML: ::DWORD = 15013;
-pub const ERROR_EVT_FILTER_ALREADYSCOPED: ::DWORD = 15014;
-pub const ERROR_EVT_FILTER_NOTELTSET: ::DWORD = 15015;
-pub const ERROR_EVT_FILTER_INVARG: ::DWORD = 15016;
-pub const ERROR_EVT_FILTER_INVTEST: ::DWORD = 15017;
-pub const ERROR_EVT_FILTER_INVTYPE: ::DWORD = 15018;
-pub const ERROR_EVT_FILTER_PARSEERR: ::DWORD = 15019;
-pub const ERROR_EVT_FILTER_UNSUPPORTEDOP: ::DWORD = 15020;
-pub const ERROR_EVT_FILTER_UNEXPECTEDTOKEN: ::DWORD = 15021;
-pub const ERROR_EVT_INVALID_OPERATION_OVER_ENABLED_DIRECT_CHANNEL: ::DWORD = 15022;
-pub const ERROR_EVT_INVALID_CHANNEL_PROPERTY_VALUE: ::DWORD = 15023;
-pub const ERROR_EVT_INVALID_PUBLISHER_PROPERTY_VALUE: ::DWORD = 15024;
-pub const ERROR_EVT_CHANNEL_CANNOT_ACTIVATE: ::DWORD = 15025;
-pub const ERROR_EVT_FILTER_TOO_COMPLEX: ::DWORD = 15026;
-pub const ERROR_EVT_MESSAGE_NOT_FOUND: ::DWORD = 15027;
-pub const ERROR_EVT_MESSAGE_ID_NOT_FOUND: ::DWORD = 15028;
-pub const ERROR_EVT_UNRESOLVED_VALUE_INSERT: ::DWORD = 15029;
-pub const ERROR_EVT_UNRESOLVED_PARAMETER_INSERT: ::DWORD = 15030;
-pub const ERROR_EVT_MAX_INSERTS_REACHED: ::DWORD = 15031;
-pub const ERROR_EVT_EVENT_DEFINITION_NOT_FOUND: ::DWORD = 15032;
-pub const ERROR_EVT_MESSAGE_LOCALE_NOT_FOUND: ::DWORD = 15033;
-pub const ERROR_EVT_VERSION_TOO_OLD: ::DWORD = 15034;
-pub const ERROR_EVT_VERSION_TOO_NEW: ::DWORD = 15035;
-pub const ERROR_EVT_CANNOT_OPEN_CHANNEL_OF_QUERY: ::DWORD = 15036;
-pub const ERROR_EVT_PUBLISHER_DISABLED: ::DWORD = 15037;
-pub const ERROR_EVT_FILTER_OUT_OF_RANGE: ::DWORD = 15038;
-pub const ERROR_EC_SUBSCRIPTION_CANNOT_ACTIVATE: ::DWORD = 15080;
-pub const ERROR_EC_LOG_DISABLED: ::DWORD = 15081;
-pub const ERROR_EC_CIRCULAR_FORWARDING: ::DWORD = 15082;
-pub const ERROR_EC_CREDSTORE_FULL: ::DWORD = 15083;
-pub const ERROR_EC_CRED_NOT_FOUND: ::DWORD = 15084;
-pub const ERROR_EC_NO_ACTIVE_CHANNEL: ::DWORD = 15085;
-pub const ERROR_MUI_FILE_NOT_FOUND: ::DWORD = 15100;
-pub const ERROR_MUI_INVALID_FILE: ::DWORD = 15101;
-pub const ERROR_MUI_INVALID_RC_CONFIG: ::DWORD = 15102;
-pub const ERROR_MUI_INVALID_LOCALE_NAME: ::DWORD = 15103;
-pub const ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME: ::DWORD = 15104;
-pub const ERROR_MUI_FILE_NOT_LOADED: ::DWORD = 15105;
-pub const ERROR_RESOURCE_ENUM_USER_STOP: ::DWORD = 15106;
-pub const ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED: ::DWORD = 15107;
-pub const ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME: ::DWORD = 15108;
-pub const ERROR_MRM_RUNTIME_NO_DEFAULT_OR_NEUTRAL_RESOURCE: ::DWORD = 15110;
-pub const ERROR_MRM_INVALID_PRICONFIG: ::DWORD = 15111;
-pub const ERROR_MRM_INVALID_FILE_TYPE: ::DWORD = 15112;
-pub const ERROR_MRM_UNKNOWN_QUALIFIER: ::DWORD = 15113;
-pub const ERROR_MRM_INVALID_QUALIFIER_VALUE: ::DWORD = 15114;
-pub const ERROR_MRM_NO_CANDIDATE: ::DWORD = 15115;
-pub const ERROR_MRM_NO_MATCH_OR_DEFAULT_CANDIDATE: ::DWORD = 15116;
-pub const ERROR_MRM_RESOURCE_TYPE_MISMATCH: ::DWORD = 15117;
-pub const ERROR_MRM_DUPLICATE_MAP_NAME: ::DWORD = 15118;
-pub const ERROR_MRM_DUPLICATE_ENTRY: ::DWORD = 15119;
-pub const ERROR_MRM_INVALID_RESOURCE_IDENTIFIER: ::DWORD = 15120;
-pub const ERROR_MRM_FILEPATH_TOO_LONG: ::DWORD = 15121;
-pub const ERROR_MRM_UNSUPPORTED_DIRECTORY_TYPE: ::DWORD = 15122;
-pub const ERROR_MRM_INVALID_PRI_FILE: ::DWORD = 15126;
-pub const ERROR_MRM_NAMED_RESOURCE_NOT_FOUND: ::DWORD = 15127;
-pub const ERROR_MRM_MAP_NOT_FOUND: ::DWORD = 15135;
-pub const ERROR_MRM_UNSUPPORTED_PROFILE_TYPE: ::DWORD = 15136;
-pub const ERROR_MRM_INVALID_QUALIFIER_OPERATOR: ::DWORD = 15137;
-pub const ERROR_MRM_INDETERMINATE_QUALIFIER_VALUE: ::DWORD = 15138;
-pub const ERROR_MRM_AUTOMERGE_ENABLED: ::DWORD = 15139;
-pub const ERROR_MRM_TOO_MANY_RESOURCES: ::DWORD = 15140;
-pub const ERROR_MRM_UNSUPPORTED_FILE_TYPE_FOR_MERGE: ::DWORD = 15141;
-pub const ERROR_MRM_UNSUPPORTED_FILE_TYPE_FOR_LOAD_UNLOAD_PRI_FILE: ::DWORD = 15142;
-pub const ERROR_MRM_NO_CURRENT_VIEW_ON_THREAD: ::DWORD = 15143;
-pub const ERROR_DIFFERENT_PROFILE_RESOURCE_MANAGER_EXIST: ::DWORD = 15144;
-pub const ERROR_OPERATION_NOT_ALLOWED_FROM_SYSTEM_COMPONENT: ::DWORD = 15145;
-pub const ERROR_MRM_DIRECT_REF_TO_NON_DEFAULT_RESOURCE: ::DWORD = 15146;
-pub const ERROR_MRM_GENERATION_COUNT_MISMATCH: ::DWORD = 15147;
-pub const ERROR_MCA_INVALID_CAPABILITIES_STRING: ::DWORD = 15200;
-pub const ERROR_MCA_INVALID_VCP_VERSION: ::DWORD = 15201;
-pub const ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION: ::DWORD = 15202;
-pub const ERROR_MCA_MCCS_VERSION_MISMATCH: ::DWORD = 15203;
-pub const ERROR_MCA_UNSUPPORTED_MCCS_VERSION: ::DWORD = 15204;
-pub const ERROR_MCA_INTERNAL_ERROR: ::DWORD = 15205;
-pub const ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED: ::DWORD = 15206;
-pub const ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE: ::DWORD = 15207;
-pub const ERROR_AMBIGUOUS_SYSTEM_DEVICE: ::DWORD = 15250;
-pub const ERROR_SYSTEM_DEVICE_NOT_FOUND: ::DWORD = 15299;
-pub const ERROR_HASH_NOT_SUPPORTED: ::DWORD = 15300;
-pub const ERROR_HASH_NOT_PRESENT: ::DWORD = 15301;
-pub const ERROR_SECONDARY_IC_PROVIDER_NOT_REGISTERED: ::DWORD = 15321;
-pub const ERROR_GPIO_CLIENT_INFORMATION_INVALID: ::DWORD = 15322;
-pub const ERROR_GPIO_VERSION_NOT_SUPPORTED: ::DWORD = 15323;
-pub const ERROR_GPIO_INVALID_REGISTRATION_PACKET: ::DWORD = 15324;
-pub const ERROR_GPIO_OPERATION_DENIED: ::DWORD = 15325;
-pub const ERROR_GPIO_INCOMPATIBLE_CONNECT_MODE: ::DWORD = 15326;
-pub const ERROR_GPIO_INTERRUPT_ALREADY_UNMASKED: ::DWORD = 15327;
-pub const ERROR_CANNOT_SWITCH_RUNLEVEL: ::DWORD = 15400;
-pub const ERROR_INVALID_RUNLEVEL_SETTING: ::DWORD = 15401;
-pub const ERROR_RUNLEVEL_SWITCH_TIMEOUT: ::DWORD = 15402;
-pub const ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT: ::DWORD = 15403;
-pub const ERROR_RUNLEVEL_SWITCH_IN_PROGRESS: ::DWORD = 15404;
-pub const ERROR_SERVICES_FAILED_AUTOSTART: ::DWORD = 15405;
-pub const ERROR_COM_TASK_STOP_PENDING: ::DWORD = 15501;
-pub const ERROR_INSTALL_OPEN_PACKAGE_FAILED: ::DWORD = 15600;
-pub const ERROR_INSTALL_PACKAGE_NOT_FOUND: ::DWORD = 15601;
-pub const ERROR_INSTALL_INVALID_PACKAGE: ::DWORD = 15602;
-pub const ERROR_INSTALL_RESOLVE_DEPENDENCY_FAILED: ::DWORD = 15603;
-pub const ERROR_INSTALL_OUT_OF_DISK_SPACE: ::DWORD = 15604;
-pub const ERROR_INSTALL_NETWORK_FAILURE: ::DWORD = 15605;
-pub const ERROR_INSTALL_REGISTRATION_FAILURE: ::DWORD = 15606;
-pub const ERROR_INSTALL_DEREGISTRATION_FAILURE: ::DWORD = 15607;
-pub const ERROR_INSTALL_CANCEL: ::DWORD = 15608;
-pub const ERROR_INSTALL_FAILED: ::DWORD = 15609;
-pub const ERROR_REMOVE_FAILED: ::DWORD = 15610;
-pub const ERROR_PACKAGE_ALREADY_EXISTS: ::DWORD = 15611;
-pub const ERROR_NEEDS_REMEDIATION: ::DWORD = 15612;
-pub const ERROR_INSTALL_PREREQUISITE_FAILED: ::DWORD = 15613;
-pub const ERROR_PACKAGE_REPOSITORY_CORRUPTED: ::DWORD = 15614;
-pub const ERROR_INSTALL_POLICY_FAILURE: ::DWORD = 15615;
-pub const ERROR_PACKAGE_UPDATING: ::DWORD = 15616;
-pub const ERROR_DEPLOYMENT_BLOCKED_BY_POLICY: ::DWORD = 15617;
-pub const ERROR_PACKAGES_IN_USE: ::DWORD = 15618;
-pub const ERROR_RECOVERY_FILE_CORRUPT: ::DWORD = 15619;
-pub const ERROR_INVALID_STAGED_SIGNATURE: ::DWORD = 15620;
-pub const ERROR_DELETING_EXISTING_APPLICATIONDATA_STORE_FAILED: ::DWORD = 15621;
-pub const ERROR_INSTALL_PACKAGE_DOWNGRADE: ::DWORD = 15622;
-pub const ERROR_SYSTEM_NEEDS_REMEDIATION: ::DWORD = 15623;
-pub const ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN: ::DWORD = 15624;
-pub const ERROR_RESILIENCY_FILE_CORRUPT: ::DWORD = 15625;
-pub const ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING: ::DWORD = 15626;
-pub const APPMODEL_ERROR_NO_PACKAGE: ::DWORD = 15700;
-pub const APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT: ::DWORD = 15701;
-pub const APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT: ::DWORD = 15702;
-pub const APPMODEL_ERROR_NO_APPLICATION: ::DWORD = 15703;
-pub const APPMODEL_ERROR_DYNAMIC_PROPERTY_READ_FAILED: ::DWORD = 15704;
-pub const APPMODEL_ERROR_DYNAMIC_PROPERTY_INVALID: ::DWORD = 15705;
-pub const ERROR_STATE_LOAD_STORE_FAILED: ::DWORD = 15800;
-pub const ERROR_STATE_GET_VERSION_FAILED: ::DWORD = 15801;
-pub const ERROR_STATE_SET_VERSION_FAILED: ::DWORD = 15802;
-pub const ERROR_STATE_STRUCTURED_RESET_FAILED: ::DWORD = 15803;
-pub const ERROR_STATE_OPEN_CONTAINER_FAILED: ::DWORD = 15804;
-pub const ERROR_STATE_CREATE_CONTAINER_FAILED: ::DWORD = 15805;
-pub const ERROR_STATE_DELETE_CONTAINER_FAILED: ::DWORD = 15806;
-pub const ERROR_STATE_READ_SETTING_FAILED: ::DWORD = 15807;
-pub const ERROR_STATE_WRITE_SETTING_FAILED: ::DWORD = 15808;
-pub const ERROR_STATE_DELETE_SETTING_FAILED: ::DWORD = 15809;
-pub const ERROR_STATE_QUERY_SETTING_FAILED: ::DWORD = 15810;
-pub const ERROR_STATE_READ_COMPOSITE_SETTING_FAILED: ::DWORD = 15811;
-pub const ERROR_STATE_WRITE_COMPOSITE_SETTING_FAILED: ::DWORD = 15812;
-pub const ERROR_STATE_ENUMERATE_CONTAINER_FAILED: ::DWORD = 15813;
-pub const ERROR_STATE_ENUMERATE_SETTINGS_FAILED: ::DWORD = 15814;
-pub const ERROR_STATE_COMPOSITE_SETTING_VALUE_SIZE_LIMIT_EXCEEDED: ::DWORD = 15815;
-pub const ERROR_STATE_SETTING_VALUE_SIZE_LIMIT_EXCEEDED: ::DWORD = 15816;
-pub const ERROR_STATE_SETTING_NAME_SIZE_LIMIT_EXCEEDED: ::DWORD = 15817;
-pub const ERROR_STATE_CONTAINER_NAME_SIZE_LIMIT_EXCEEDED: ::DWORD = 15818;
-pub const ERROR_API_UNAVAILABLE: ::DWORD = 15841;
-pub const STORE_ERROR_UNLICENSED: ::DWORD = 15861;
-pub const STORE_ERROR_UNLICENSED_USER: ::DWORD = 15862;
-pub const STORE_ERROR_PENDING_COM_TRANSACTION: ::DWORD = 15863;
-pub const STORE_ERROR_LICENSE_REVOKED: ::DWORD = 15864;
-pub const SEVERITY_SUCCESS: HRESULT = 0;
-pub const SEVERITY_ERROR: HRESULT = 1;
-#[inline]
-pub fn MAKE_HRESULT(sev: HRESULT, fac: HRESULT, code: HRESULT) -> HRESULT {
-    (sev << 31) | (fac << 16) | code
-}
-pub type HRESULT = ::c_long;
-pub const NOERROR: HRESULT = 0;
-pub const E_UNEXPECTED: HRESULT = 0x8000FFFFu32 as HRESULT;
-pub const E_NOTIMPL: HRESULT = 0x80004001u32 as HRESULT;
-pub const E_OUTOFMEMORY: HRESULT = 0x8007000Eu32 as HRESULT;
-pub const E_INVALIDARG: HRESULT = 0x80070057u32 as HRESULT;
-pub const E_NOINTERFACE: HRESULT = 0x80004002u32 as HRESULT;
-pub const E_POINTER: HRESULT = 0x80004003u32 as HRESULT;
-pub const E_HANDLE: HRESULT = 0x80070006u32 as HRESULT;
-pub const E_ABORT: HRESULT = 0x80004004u32 as HRESULT;
-pub const E_FAIL: HRESULT = 0x80004005u32 as HRESULT;
-pub const E_ACCESSDENIED: HRESULT = 0x80070005u32 as HRESULT;
-pub const E_PENDING: HRESULT = 0x8000000Au32 as HRESULT;
-pub const E_BOUNDS: HRESULT = 0x8000000Bu32 as HRESULT;
-pub const E_CHANGED_STATE: HRESULT = 0x8000000Cu32 as HRESULT;
-pub const E_ILLEGAL_STATE_CHANGE: HRESULT = 0x8000000Du32 as HRESULT;
-pub const E_ILLEGAL_METHOD_CALL: HRESULT = 0x8000000Eu32 as HRESULT;
-pub const RO_E_METADATA_NAME_NOT_FOUND: HRESULT = 0x8000000Fu32 as HRESULT;
-pub const RO_E_METADATA_NAME_IS_NAMESPACE: HRESULT = 0x80000010u32 as HRESULT;
-pub const RO_E_METADATA_INVALID_TYPE_FORMAT: HRESULT = 0x80000011u32 as HRESULT;
-pub const RO_E_INVALID_METADATA_FILE: HRESULT = 0x80000012u32 as HRESULT;
-pub const RO_E_CLOSED: HRESULT = 0x80000013u32 as HRESULT;
-pub const RO_E_EXCLUSIVE_WRITE: HRESULT = 0x80000014u32 as HRESULT;
-pub const RO_E_CHANGE_NOTIFICATION_IN_PROGRESS: HRESULT = 0x80000015u32 as HRESULT;
-pub const RO_E_ERROR_STRING_NOT_FOUND: HRESULT = 0x80000016u32 as HRESULT;
-pub const E_STRING_NOT_NULL_TERMINATED: HRESULT = 0x80000017u32 as HRESULT;
-pub const E_ILLEGAL_DELEGATE_ASSIGNMENT: HRESULT = 0x80000018u32 as HRESULT;
-pub const E_ASYNC_OPERATION_NOT_STARTED: HRESULT = 0x80000019u32 as HRESULT;
-pub const E_APPLICATION_EXITING: HRESULT = 0x8000001Au32 as HRESULT;
-pub const E_APPLICATION_VIEW_EXITING: HRESULT = 0x8000001Bu32 as HRESULT;
-pub const RO_E_MUST_BE_AGILE: HRESULT = 0x8000001Cu32 as HRESULT;
-pub const RO_E_UNSUPPORTED_FROM_MTA: HRESULT = 0x8000001Du32 as HRESULT;
-pub const RO_E_COMMITTED: HRESULT = 0x8000001Eu32 as HRESULT;
-pub const RO_E_BLOCKED_CROSS_ASTA_CALL: HRESULT = 0x8000001Fu32 as HRESULT;
-pub const CO_E_INIT_TLS: HRESULT = 0x80004006u32 as HRESULT;
-pub const CO_E_INIT_SHARED_ALLOCATOR: HRESULT = 0x80004007u32 as HRESULT;
-pub const CO_E_INIT_MEMORY_ALLOCATOR: HRESULT = 0x80004008u32 as HRESULT;
-pub const CO_E_INIT_CLASS_CACHE: HRESULT = 0x80004009u32 as HRESULT;
-pub const CO_E_INIT_RPC_CHANNEL: HRESULT = 0x8000400Au32 as HRESULT;
-pub const CO_E_INIT_TLS_SET_CHANNEL_CONTROL: HRESULT = 0x8000400Bu32 as HRESULT;
-pub const CO_E_INIT_TLS_CHANNEL_CONTROL: HRESULT = 0x8000400Cu32 as HRESULT;
-pub const CO_E_INIT_UNACCEPTED_USER_ALLOCATOR: HRESULT = 0x8000400Du32 as HRESULT;
-pub const CO_E_INIT_SCM_MUTEX_EXISTS: HRESULT = 0x8000400Eu32 as HRESULT;
-pub const CO_E_INIT_SCM_FILE_MAPPING_EXISTS: HRESULT = 0x8000400Fu32 as HRESULT;
-pub const CO_E_INIT_SCM_MAP_VIEW_OF_FILE: HRESULT = 0x80004010u32 as HRESULT;
-pub const CO_E_INIT_SCM_EXEC_FAILURE: HRESULT = 0x80004011u32 as HRESULT;
-pub const CO_E_INIT_ONLY_SINGLE_THREADED: HRESULT = 0x80004012u32 as HRESULT;
-pub const CO_E_CANT_REMOTE: HRESULT = 0x80004013u32 as HRESULT;
-pub const CO_E_BAD_SERVER_NAME: HRESULT = 0x80004014u32 as HRESULT;
-pub const CO_E_WRONG_SERVER_IDENTITY: HRESULT = 0x80004015u32 as HRESULT;
-pub const CO_E_OLE1DDE_DISABLED: HRESULT = 0x80004016u32 as HRESULT;
-pub const CO_E_RUNAS_SYNTAX: HRESULT = 0x80004017u32 as HRESULT;
-pub const CO_E_CREATEPROCESS_FAILURE: HRESULT = 0x80004018u32 as HRESULT;
-pub const CO_E_RUNAS_CREATEPROCESS_FAILURE: HRESULT = 0x80004019u32 as HRESULT;
-pub const CO_E_RUNAS_LOGON_FAILURE: HRESULT = 0x8000401Au32 as HRESULT;
-pub const CO_E_LAUNCH_PERMSSION_DENIED: HRESULT = 0x8000401Bu32 as HRESULT;
-pub const CO_E_START_SERVICE_FAILURE: HRESULT = 0x8000401Cu32 as HRESULT;
-pub const CO_E_REMOTE_COMMUNICATION_FAILURE: HRESULT = 0x8000401Du32 as HRESULT;
-pub const CO_E_SERVER_START_TIMEOUT: HRESULT = 0x8000401Eu32 as HRESULT;
-pub const CO_E_CLSREG_INCONSISTENT: HRESULT = 0x8000401Fu32 as HRESULT;
-pub const CO_E_IIDREG_INCONSISTENT: HRESULT = 0x80004020u32 as HRESULT;
-pub const CO_E_NOT_SUPPORTED: HRESULT = 0x80004021u32 as HRESULT;
-pub const CO_E_RELOAD_DLL: HRESULT = 0x80004022u32 as HRESULT;
-pub const CO_E_MSI_ERROR: HRESULT = 0x80004023u32 as HRESULT;
-pub const CO_E_ATTEMPT_TO_CREATE_OUTSIDE_CLIENT_CONTEXT: HRESULT = 0x80004024u32 as HRESULT;
-pub const CO_E_SERVER_PAUSED: HRESULT = 0x80004025u32 as HRESULT;
-pub const CO_E_SERVER_NOT_PAUSED: HRESULT = 0x80004026u32 as HRESULT;
-pub const CO_E_CLASS_DISABLED: HRESULT = 0x80004027u32 as HRESULT;
-pub const CO_E_CLRNOTAVAILABLE: HRESULT = 0x80004028u32 as HRESULT;
-pub const CO_E_ASYNC_WORK_REJECTED: HRESULT = 0x80004029u32 as HRESULT;
-pub const CO_E_SERVER_INIT_TIMEOUT: HRESULT = 0x8000402Au32 as HRESULT;
-pub const CO_E_NO_SECCTX_IN_ACTIVATE: HRESULT = 0x8000402Bu32 as HRESULT;
-pub const CO_E_TRACKER_CONFIG: HRESULT = 0x80004030u32 as HRESULT;
-pub const CO_E_THREADPOOL_CONFIG: HRESULT = 0x80004031u32 as HRESULT;
-pub const CO_E_SXS_CONFIG: HRESULT = 0x80004032u32 as HRESULT;
-pub const CO_E_MALFORMED_SPN: HRESULT = 0x80004033u32 as HRESULT;
-pub const CO_E_UNREVOKED_REGISTRATION_ON_APARTMENT_SHUTDOWN: HRESULT = 0x80004034u32 as HRESULT;
-pub const CO_E_PREMATURE_STUB_RUNDOWN: HRESULT = 0x80004035u32 as HRESULT;
-pub const S_OK: HRESULT = 0;
-pub const S_FALSE: HRESULT = 1;
-pub const OLE_E_FIRST: HRESULT = 0x80040000u32 as HRESULT;
-pub const OLE_E_LAST: HRESULT = 0x800400FFu32 as HRESULT;
-pub const OLE_S_FIRST: HRESULT = 0x00040000;
-pub const OLE_S_LAST: HRESULT = 0x000400FF;
-pub const OLE_E_OLEVERB: HRESULT = 0x80040000u32 as HRESULT;
-pub const OLE_E_ADVF: HRESULT = 0x80040001u32 as HRESULT;
-pub const OLE_E_ENUM_NOMORE: HRESULT = 0x80040002u32 as HRESULT;
-pub const OLE_E_ADVISENOTSUPPORTED: HRESULT = 0x80040003u32 as HRESULT;
-pub const OLE_E_NOCONNECTION: HRESULT = 0x80040004u32 as HRESULT;
-pub const OLE_E_NOTRUNNING: HRESULT = 0x80040005u32 as HRESULT;
-pub const OLE_E_NOCACHE: HRESULT = 0x80040006u32 as HRESULT;
-pub const OLE_E_BLANK: HRESULT = 0x80040007u32 as HRESULT;
-pub const OLE_E_CLASSDIFF: HRESULT = 0x80040008u32 as HRESULT;
-pub const OLE_E_CANT_GETMONIKER: HRESULT = 0x80040009u32 as HRESULT;
-pub const OLE_E_CANT_BINDTOSOURCE: HRESULT = 0x8004000Au32 as HRESULT;
-pub const OLE_E_STATIC: HRESULT = 0x8004000Bu32 as HRESULT;
-pub const OLE_E_PROMPTSAVECANCELLED: HRESULT = 0x8004000Cu32 as HRESULT;
-pub const OLE_E_INVALIDRECT: HRESULT = 0x8004000Du32 as HRESULT;
-pub const OLE_E_WRONGCOMPOBJ: HRESULT = 0x8004000Eu32 as HRESULT;
-pub const OLE_E_INVALIDHWND: HRESULT = 0x8004000Fu32 as HRESULT;
-pub const OLE_E_NOT_INPLACEACTIVE: HRESULT = 0x80040010u32 as HRESULT;
-pub const OLE_E_CANTCONVERT: HRESULT = 0x80040011u32 as HRESULT;
-pub const OLE_E_NOSTORAGE: HRESULT = 0x80040012u32 as HRESULT;
-pub const DV_E_FORMATETC: HRESULT = 0x80040064u32 as HRESULT;
-pub const DV_E_DVTARGETDEVICE: HRESULT = 0x80040065u32 as HRESULT;
-pub const DV_E_STGMEDIUM: HRESULT = 0x80040066u32 as HRESULT;
-pub const DV_E_STATDATA: HRESULT = 0x80040067u32 as HRESULT;
-pub const DV_E_LINDEX: HRESULT = 0x80040068u32 as HRESULT;
-pub const DV_E_TYMED: HRESULT = 0x80040069u32 as HRESULT;
-pub const DV_E_CLIPFORMAT: HRESULT = 0x8004006Au32 as HRESULT;
-pub const DV_E_DVASPECT: HRESULT = 0x8004006Bu32 as HRESULT;
-pub const DV_E_DVTARGETDEVICE_SIZE: HRESULT = 0x8004006Cu32 as HRESULT;
-pub const DV_E_NOIVIEWOBJECT: HRESULT = 0x8004006Du32 as HRESULT;
-pub const DRAGDROP_E_FIRST: HRESULT = 0x80040100u32 as HRESULT;
-pub const DRAGDROP_E_LAST: HRESULT = 0x8004010Fu32 as HRESULT;
-pub const DRAGDROP_S_FIRST: HRESULT = 0x00040100;
-pub const DRAGDROP_S_LAST: HRESULT = 0x0004010F;
-pub const DRAGDROP_E_NOTREGISTERED: HRESULT = 0x80040100u32 as HRESULT;
-pub const DRAGDROP_E_ALREADYREGISTERED: HRESULT = 0x80040101u32 as HRESULT;
-pub const DRAGDROP_E_INVALIDHWND: HRESULT = 0x80040102u32 as HRESULT;
-pub const DRAGDROP_E_CONCURRENT_DRAG_ATTEMPTED: HRESULT = 0x80040103u32 as HRESULT;
-pub const CLASSFACTORY_E_FIRST: HRESULT = 0x80040110u32 as HRESULT;
-pub const CLASSFACTORY_E_LAST: HRESULT = 0x8004011Fu32 as HRESULT;
-pub const CLASSFACTORY_S_FIRST: HRESULT = 0x00040110;
-pub const CLASSFACTORY_S_LAST: HRESULT = 0x0004011F;
-pub const CLASS_E_NOAGGREGATION: HRESULT = 0x80040110u32 as HRESULT;
-pub const CLASS_E_CLASSNOTAVAILABLE: HRESULT = 0x80040111u32 as HRESULT;
-pub const CLASS_E_NOTLICENSED: HRESULT = 0x80040112u32 as HRESULT;
-pub const MARSHAL_E_FIRST: HRESULT = 0x80040120u32 as HRESULT;
-pub const MARSHAL_E_LAST: HRESULT = 0x8004012Fu32 as HRESULT;
-pub const MARSHAL_S_FIRST: HRESULT = 0x00040120;
-pub const MARSHAL_S_LAST: HRESULT = 0x0004012F;
-pub const DATA_E_FIRST: HRESULT = 0x80040130u32 as HRESULT;
-pub const DATA_E_LAST: HRESULT = 0x8004013Fu32 as HRESULT;
-pub const DATA_S_FIRST: HRESULT = 0x00040130;
-pub const DATA_S_LAST: HRESULT = 0x0004013F;
-pub const VIEW_E_FIRST: HRESULT = 0x80040140u32 as HRESULT;
-pub const VIEW_E_LAST: HRESULT = 0x8004014Fu32 as HRESULT;
-pub const VIEW_S_FIRST: HRESULT = 0x00040140;
-pub const VIEW_S_LAST: HRESULT = 0x0004014F;
-pub const VIEW_E_DRAW: HRESULT = 0x80040140u32 as HRESULT;
-pub const REGDB_E_FIRST: HRESULT = 0x80040150u32 as HRESULT;
-pub const REGDB_E_LAST: HRESULT = 0x8004015Fu32 as HRESULT;
-pub const REGDB_S_FIRST: HRESULT = 0x00040150;
-pub const REGDB_S_LAST: HRESULT = 0x0004015F;
-pub const REGDB_E_READREGDB: HRESULT = 0x80040150u32 as HRESULT;
-pub const REGDB_E_WRITEREGDB: HRESULT = 0x80040151u32 as HRESULT;
-pub const REGDB_E_KEYMISSING: HRESULT = 0x80040152u32 as HRESULT;
-pub const REGDB_E_INVALIDVALUE: HRESULT = 0x80040153u32 as HRESULT;
-pub const REGDB_E_CLASSNOTREG: HRESULT = 0x80040154u32 as HRESULT;
-pub const REGDB_E_IIDNOTREG: HRESULT = 0x80040155u32 as HRESULT;
-pub const REGDB_E_BADTHREADINGMODEL: HRESULT = 0x80040156u32 as HRESULT;
-pub const CAT_E_FIRST: HRESULT = 0x80040160u32 as HRESULT;
-pub const CAT_E_LAST: HRESULT = 0x80040161u32 as HRESULT;
-pub const CAT_E_CATIDNOEXIST: HRESULT = 0x80040160u32 as HRESULT;
-pub const CAT_E_NODESCRIPTION: HRESULT = 0x80040161u32 as HRESULT;
-pub const CS_E_FIRST: HRESULT = 0x80040164u32 as HRESULT;
-pub const CS_E_LAST: HRESULT = 0x8004016Fu32 as HRESULT;
-pub const CS_E_PACKAGE_NOTFOUND: HRESULT = 0x80040164u32 as HRESULT;
-pub const CS_E_NOT_DELETABLE: HRESULT = 0x80040165u32 as HRESULT;
-pub const CS_E_CLASS_NOTFOUND: HRESULT = 0x80040166u32 as HRESULT;
-pub const CS_E_INVALID_VERSION: HRESULT = 0x80040167u32 as HRESULT;
-pub const CS_E_NO_CLASSSTORE: HRESULT = 0x80040168u32 as HRESULT;
-pub const CS_E_OBJECT_NOTFOUND: HRESULT = 0x80040169u32 as HRESULT;
-pub const CS_E_OBJECT_ALREADY_EXISTS: HRESULT = 0x8004016Au32 as HRESULT;
-pub const CS_E_INVALID_PATH: HRESULT = 0x8004016Bu32 as HRESULT;
-pub const CS_E_NETWORK_ERROR: HRESULT = 0x8004016Cu32 as HRESULT;
-pub const CS_E_ADMIN_LIMIT_EXCEEDED: HRESULT = 0x8004016Du32 as HRESULT;
-pub const CS_E_SCHEMA_MISMATCH: HRESULT = 0x8004016Eu32 as HRESULT;
-pub const CS_E_INTERNAL_ERROR: HRESULT = 0x8004016Fu32 as HRESULT;
-pub const CACHE_E_FIRST: HRESULT = 0x80040170u32 as HRESULT;
-pub const CACHE_E_LAST: HRESULT = 0x8004017Fu32 as HRESULT;
-pub const CACHE_S_FIRST: HRESULT = 0x00040170;
-pub const CACHE_S_LAST: HRESULT = 0x0004017F;
-pub const CACHE_E_NOCACHE_UPDATED: HRESULT = 0x80040170u32 as HRESULT;
-pub const OLEOBJ_E_FIRST: HRESULT = 0x80040180u32 as HRESULT;
-pub const OLEOBJ_E_LAST: HRESULT = 0x8004018Fu32 as HRESULT;
-pub const OLEOBJ_S_FIRST: HRESULT = 0x00040180;
-pub const OLEOBJ_S_LAST: HRESULT = 0x0004018F;
-pub const OLEOBJ_E_NOVERBS: HRESULT = 0x80040180u32 as HRESULT;
-pub const OLEOBJ_E_INVALIDVERB: HRESULT = 0x80040181u32 as HRESULT;
-pub const CLIENTSITE_E_FIRST: HRESULT = 0x80040190u32 as HRESULT;
-pub const CLIENTSITE_E_LAST: HRESULT = 0x8004019Fu32 as HRESULT;
-pub const CLIENTSITE_S_FIRST: HRESULT = 0x00040190;
-pub const CLIENTSITE_S_LAST: HRESULT = 0x0004019F;
-pub const INPLACE_E_NOTUNDOABLE: HRESULT = 0x800401A0u32 as HRESULT;
-pub const INPLACE_E_NOTOOLSPACE: HRESULT = 0x800401A1u32 as HRESULT;
-pub const INPLACE_E_FIRST: HRESULT = 0x800401A0u32 as HRESULT;
-pub const INPLACE_E_LAST: HRESULT = 0x800401AFu32 as HRESULT;
-pub const INPLACE_S_FIRST: HRESULT = 0x000401A0;
-pub const INPLACE_S_LAST: HRESULT = 0x000401AF;
-pub const ENUM_E_FIRST: HRESULT = 0x800401B0u32 as HRESULT;
-pub const ENUM_E_LAST: HRESULT = 0x800401BFu32 as HRESULT;
-pub const ENUM_S_FIRST: HRESULT = 0x000401B0;
-pub const ENUM_S_LAST: HRESULT = 0x000401BF;
-pub const CONVERT10_E_FIRST: HRESULT = 0x800401C0u32 as HRESULT;
-pub const CONVERT10_E_LAST: HRESULT = 0x800401CFu32 as HRESULT;
-pub const CONVERT10_S_FIRST: HRESULT = 0x000401C0;
-pub const CONVERT10_S_LAST: HRESULT = 0x000401CF;
-pub const CONVERT10_E_OLESTREAM_GET: HRESULT = 0x800401C0u32 as HRESULT;
-pub const CONVERT10_E_OLESTREAM_PUT: HRESULT = 0x800401C1u32 as HRESULT;
-pub const CONVERT10_E_OLESTREAM_FMT: HRESULT = 0x800401C2u32 as HRESULT;
-pub const CONVERT10_E_OLESTREAM_BITMAP_TO_DIB: HRESULT = 0x800401C3u32 as HRESULT;
-pub const CONVERT10_E_STG_FMT: HRESULT = 0x800401C4u32 as HRESULT;
-pub const CONVERT10_E_STG_NO_STD_STREAM: HRESULT = 0x800401C5u32 as HRESULT;
-pub const CONVERT10_E_STG_DIB_TO_BITMAP: HRESULT = 0x800401C6u32 as HRESULT;
-pub const CLIPBRD_E_FIRST: HRESULT = 0x800401D0u32 as HRESULT;
-pub const CLIPBRD_E_LAST: HRESULT = 0x800401DFu32 as HRESULT;
-pub const CLIPBRD_S_FIRST: HRESULT = 0x000401D0;
-pub const CLIPBRD_S_LAST: HRESULT = 0x000401DF;
-pub const CLIPBRD_E_CANT_OPEN: HRESULT = 0x800401D0u32 as HRESULT;
-pub const CLIPBRD_E_CANT_EMPTY: HRESULT = 0x800401D1u32 as HRESULT;
-pub const CLIPBRD_E_CANT_SET: HRESULT = 0x800401D2u32 as HRESULT;
-pub const CLIPBRD_E_BAD_DATA: HRESULT = 0x800401D3u32 as HRESULT;
-pub const CLIPBRD_E_CANT_CLOSE: HRESULT = 0x800401D4u32 as HRESULT;
-pub const MK_E_FIRST: HRESULT = 0x800401E0u32 as HRESULT;
-pub const MK_E_LAST: HRESULT = 0x800401EFu32 as HRESULT;
-pub const MK_S_FIRST: HRESULT = 0x000401E0;
-pub const MK_S_LAST: HRESULT = 0x000401EF;
-pub const MK_E_CONNECTMANUALLY: HRESULT = 0x800401E0u32 as HRESULT;
-pub const MK_E_EXCEEDEDDEADLINE: HRESULT = 0x800401E1u32 as HRESULT;
-pub const MK_E_NEEDGENERIC: HRESULT = 0x800401E2u32 as HRESULT;
-pub const MK_E_UNAVAILABLE: HRESULT = 0x800401E3u32 as HRESULT;
-pub const MK_E_SYNTAX: HRESULT = 0x800401E4u32 as HRESULT;
-pub const MK_E_NOOBJECT: HRESULT = 0x800401E5u32 as HRESULT;
-pub const MK_E_INVALIDEXTENSION: HRESULT = 0x800401E6u32 as HRESULT;
-pub const MK_E_INTERMEDIATEINTERFACENOTSUPPORTED: HRESULT = 0x800401E7u32 as HRESULT;
-pub const MK_E_NOTBINDABLE: HRESULT = 0x800401E8u32 as HRESULT;
-pub const MK_E_NOTBOUND: HRESULT = 0x800401E9u32 as HRESULT;
-pub const MK_E_CANTOPENFILE: HRESULT = 0x800401EAu32 as HRESULT;
-pub const MK_E_MUSTBOTHERUSER: HRESULT = 0x800401EBu32 as HRESULT;
-pub const MK_E_NOINVERSE: HRESULT = 0x800401ECu32 as HRESULT;
-pub const MK_E_NOSTORAGE: HRESULT = 0x800401EDu32 as HRESULT;
-pub const MK_E_NOPREFIX: HRESULT = 0x800401EEu32 as HRESULT;
-pub const MK_E_ENUMERATION_FAILED: HRESULT = 0x800401EFu32 as HRESULT;
-pub const CO_E_FIRST: HRESULT = 0x800401F0u32 as HRESULT;
-pub const CO_E_LAST: HRESULT = 0x800401FFu32 as HRESULT;
-pub const CO_S_FIRST: HRESULT = 0x000401F0;
-pub const CO_S_LAST: HRESULT = 0x000401FF;
-pub const CO_E_NOTINITIALIZED: HRESULT = 0x800401F0u32 as HRESULT;
-pub const CO_E_ALREADYINITIALIZED: HRESULT = 0x800401F1u32 as HRESULT;
-pub const CO_E_CANTDETERMINECLASS: HRESULT = 0x800401F2u32 as HRESULT;
-pub const CO_E_CLASSSTRING: HRESULT = 0x800401F3u32 as HRESULT;
-pub const CO_E_IIDSTRING: HRESULT = 0x800401F4u32 as HRESULT;
-pub const CO_E_APPNOTFOUND: HRESULT = 0x800401F5u32 as HRESULT;
-pub const CO_E_APPSINGLEUSE: HRESULT = 0x800401F6u32 as HRESULT;
-pub const CO_E_ERRORINAPP: HRESULT = 0x800401F7u32 as HRESULT;
-pub const CO_E_DLLNOTFOUND: HRESULT = 0x800401F8u32 as HRESULT;
-pub const CO_E_ERRORINDLL: HRESULT = 0x800401F9u32 as HRESULT;
-pub const CO_E_WRONGOSFORAPP: HRESULT = 0x800401FAu32 as HRESULT;
-pub const CO_E_OBJNOTREG: HRESULT = 0x800401FBu32 as HRESULT;
-pub const CO_E_OBJISREG: HRESULT = 0x800401FCu32 as HRESULT;
-pub const CO_E_OBJNOTCONNECTED: HRESULT = 0x800401FDu32 as HRESULT;
-pub const CO_E_APPDIDNTREG: HRESULT = 0x800401FEu32 as HRESULT;
-pub const CO_E_RELEASED: HRESULT = 0x800401FFu32 as HRESULT;
-pub const EVENT_E_FIRST: HRESULT = 0x80040200u32 as HRESULT;
-pub const EVENT_E_LAST: HRESULT = 0x8004021Fu32 as HRESULT;
-pub const EVENT_S_FIRST: HRESULT = 0x00040200;
-pub const EVENT_S_LAST: HRESULT = 0x0004021F;
-pub const EVENT_S_SOME_SUBSCRIBERS_FAILED: HRESULT = 0x00040200;
-pub const EVENT_E_ALL_SUBSCRIBERS_FAILED: HRESULT = 0x80040201u32 as HRESULT;
-pub const EVENT_S_NOSUBSCRIBERS: HRESULT = 0x00040202;
-pub const EVENT_E_QUERYSYNTAX: HRESULT = 0x80040203u32 as HRESULT;
-pub const EVENT_E_QUERYFIELD: HRESULT = 0x80040204u32 as HRESULT;
-pub const EVENT_E_INTERNALEXCEPTION: HRESULT = 0x80040205u32 as HRESULT;
-pub const EVENT_E_INTERNALERROR: HRESULT = 0x80040206u32 as HRESULT;
-pub const EVENT_E_INVALID_PER_USER_SID: HRESULT = 0x80040207u32 as HRESULT;
-pub const EVENT_E_USER_EXCEPTION: HRESULT = 0x80040208u32 as HRESULT;
-pub const EVENT_E_TOO_MANY_METHODS: HRESULT = 0x80040209u32 as HRESULT;
-pub const EVENT_E_MISSING_EVENTCLASS: HRESULT = 0x8004020Au32 as HRESULT;
-pub const EVENT_E_NOT_ALL_REMOVED: HRESULT = 0x8004020Bu32 as HRESULT;
-pub const EVENT_E_COMPLUS_NOT_INSTALLED: HRESULT = 0x8004020Cu32 as HRESULT;
-pub const EVENT_E_CANT_MODIFY_OR_DELETE_UNCONFIGURED_OBJECT: HRESULT = 0x8004020Du32 as HRESULT;
-pub const EVENT_E_CANT_MODIFY_OR_DELETE_CONFIGURED_OBJECT: HRESULT = 0x8004020Eu32 as HRESULT;
-pub const EVENT_E_INVALID_EVENT_CLASS_PARTITION: HRESULT = 0x8004020Fu32 as HRESULT;
-pub const EVENT_E_PER_USER_SID_NOT_LOGGED_ON: HRESULT = 0x80040210u32 as HRESULT;
-pub const TPC_E_INVALID_PROPERTY: HRESULT = 0x80040241u32 as HRESULT;
-pub const TPC_E_NO_DEFAULT_TABLET: HRESULT = 0x80040212u32 as HRESULT;
-pub const TPC_E_UNKNOWN_PROPERTY: HRESULT = 0x8004021Bu32 as HRESULT;
-pub const TPC_E_INVALID_INPUT_RECT: HRESULT = 0x80040219u32 as HRESULT;
-pub const TPC_E_INVALID_STROKE: HRESULT = 0x80040222u32 as HRESULT;
-pub const TPC_E_INITIALIZE_FAIL: HRESULT = 0x80040223u32 as HRESULT;
-pub const TPC_E_NOT_RELEVANT: HRESULT = 0x80040232u32 as HRESULT;
-pub const TPC_E_INVALID_PACKET_DESCRIPTION: HRESULT = 0x80040233u32 as HRESULT;
-pub const TPC_E_RECOGNIZER_NOT_REGISTERED: HRESULT = 0x80040235u32 as HRESULT;
-pub const TPC_E_INVALID_RIGHTS: HRESULT = 0x80040236u32 as HRESULT;
-pub const TPC_E_OUT_OF_ORDER_CALL: HRESULT = 0x80040237u32 as HRESULT;
-pub const TPC_E_QUEUE_FULL: HRESULT = 0x80040238u32 as HRESULT;
-pub const TPC_E_INVALID_CONFIGURATION: HRESULT = 0x80040239u32 as HRESULT;
-pub const TPC_E_INVALID_DATA_FROM_RECOGNIZER: HRESULT = 0x8004023Au32 as HRESULT;
-pub const TPC_S_TRUNCATED: HRESULT = 0x00040252;
-pub const TPC_S_INTERRUPTED: HRESULT = 0x00040253;
-pub const TPC_S_NO_DATA_TO_PROCESS: HRESULT = 0x00040254;
-pub const XACT_E_FIRST: HRESULT = 0x8004D000u32 as HRESULT;
-pub const XACT_E_LAST: HRESULT = 0x8004D02Bu32 as HRESULT;
-pub const XACT_S_FIRST: HRESULT = 0x0004D000;
-pub const XACT_S_LAST: HRESULT = 0x0004D010;
-pub const XACT_E_ALREADYOTHERSINGLEPHASE: HRESULT = 0x8004D000u32 as HRESULT;
-pub const XACT_E_CANTRETAIN: HRESULT = 0x8004D001u32 as HRESULT;
-pub const XACT_E_COMMITFAILED: HRESULT = 0x8004D002u32 as HRESULT;
-pub const XACT_E_COMMITPREVENTED: HRESULT = 0x8004D003u32 as HRESULT;
-pub const XACT_E_HEURISTICABORT: HRESULT = 0x8004D004u32 as HRESULT;
-pub const XACT_E_HEURISTICCOMMIT: HRESULT = 0x8004D005u32 as HRESULT;
-pub const XACT_E_HEURISTICDAMAGE: HRESULT = 0x8004D006u32 as HRESULT;
-pub const XACT_E_HEURISTICDANGER: HRESULT = 0x8004D007u32 as HRESULT;
-pub const XACT_E_ISOLATIONLEVEL: HRESULT = 0x8004D008u32 as HRESULT;
-pub const XACT_E_NOASYNC: HRESULT = 0x8004D009u32 as HRESULT;
-pub const XACT_E_NOENLIST: HRESULT = 0x8004D00Au32 as HRESULT;
-pub const XACT_E_NOISORETAIN: HRESULT = 0x8004D00Bu32 as HRESULT;
-pub const XACT_E_NORESOURCE: HRESULT = 0x8004D00Cu32 as HRESULT;
-pub const XACT_E_NOTCURRENT: HRESULT = 0x8004D00Du32 as HRESULT;
-pub const XACT_E_NOTRANSACTION: HRESULT = 0x8004D00Eu32 as HRESULT;
-pub const XACT_E_NOTSUPPORTED: HRESULT = 0x8004D00Fu32 as HRESULT;
-pub const XACT_E_UNKNOWNRMGRID: HRESULT = 0x8004D010u32 as HRESULT;
-pub const XACT_E_WRONGSTATE: HRESULT = 0x8004D011u32 as HRESULT;
-pub const XACT_E_WRONGUOW: HRESULT = 0x8004D012u32 as HRESULT;
-pub const XACT_E_XTIONEXISTS: HRESULT = 0x8004D013u32 as HRESULT;
-pub const XACT_E_NOIMPORTOBJECT: HRESULT = 0x8004D014u32 as HRESULT;
-pub const XACT_E_INVALIDCOOKIE: HRESULT = 0x8004D015u32 as HRESULT;
-pub const XACT_E_INDOUBT: HRESULT = 0x8004D016u32 as HRESULT;
-pub const XACT_E_NOTIMEOUT: HRESULT = 0x8004D017u32 as HRESULT;
-pub const XACT_E_ALREADYINPROGRESS: HRESULT = 0x8004D018u32 as HRESULT;
-pub const XACT_E_ABORTED: HRESULT = 0x8004D019u32 as HRESULT;
-pub const XACT_E_LOGFULL: HRESULT = 0x8004D01Au32 as HRESULT;
-pub const XACT_E_TMNOTAVAILABLE: HRESULT = 0x8004D01Bu32 as HRESULT;
-pub const XACT_E_CONNECTION_DOWN: HRESULT = 0x8004D01Cu32 as HRESULT;
-pub const XACT_E_CONNECTION_DENIED: HRESULT = 0x8004D01Du32 as HRESULT;
-pub const XACT_E_REENLISTTIMEOUT: HRESULT = 0x8004D01Eu32 as HRESULT;
-pub const XACT_E_TIP_CONNECT_FAILED: HRESULT = 0x8004D01Fu32 as HRESULT;
-pub const XACT_E_TIP_PROTOCOL_ERROR: HRESULT = 0x8004D020u32 as HRESULT;
-pub const XACT_E_TIP_PULL_FAILED: HRESULT = 0x8004D021u32 as HRESULT;
-pub const XACT_E_DEST_TMNOTAVAILABLE: HRESULT = 0x8004D022u32 as HRESULT;
-pub const XACT_E_TIP_DISABLED: HRESULT = 0x8004D023u32 as HRESULT;
-pub const XACT_E_NETWORK_TX_DISABLED: HRESULT = 0x8004D024u32 as HRESULT;
-pub const XACT_E_PARTNER_NETWORK_TX_DISABLED: HRESULT = 0x8004D025u32 as HRESULT;
-pub const XACT_E_XA_TX_DISABLED: HRESULT = 0x8004D026u32 as HRESULT;
-pub const XACT_E_UNABLE_TO_READ_DTC_CONFIG: HRESULT = 0x8004D027u32 as HRESULT;
-pub const XACT_E_UNABLE_TO_LOAD_DTC_PROXY: HRESULT = 0x8004D028u32 as HRESULT;
-pub const XACT_E_ABORTING: HRESULT = 0x8004D029u32 as HRESULT;
-pub const XACT_E_PUSH_COMM_FAILURE: HRESULT = 0x8004D02Au32 as HRESULT;
-pub const XACT_E_PULL_COMM_FAILURE: HRESULT = 0x8004D02Bu32 as HRESULT;
-pub const XACT_E_LU_TX_DISABLED: HRESULT = 0x8004D02Cu32 as HRESULT;
-pub const XACT_E_CLERKNOTFOUND: HRESULT = 0x8004D080u32 as HRESULT;
-pub const XACT_E_CLERKEXISTS: HRESULT = 0x8004D081u32 as HRESULT;
-pub const XACT_E_RECOVERYINPROGRESS: HRESULT = 0x8004D082u32 as HRESULT;
-pub const XACT_E_TRANSACTIONCLOSED: HRESULT = 0x8004D083u32 as HRESULT;
-pub const XACT_E_INVALIDLSN: HRESULT = 0x8004D084u32 as HRESULT;
-pub const XACT_E_REPLAYREQUEST: HRESULT = 0x8004D085u32 as HRESULT;
-pub const XACT_S_ASYNC: HRESULT = 0x0004D000;
-pub const XACT_S_DEFECT: HRESULT = 0x0004D001;
-pub const XACT_S_READONLY: HRESULT = 0x0004D002;
-pub const XACT_S_SOMENORETAIN: HRESULT = 0x0004D003;
-pub const XACT_S_OKINFORM: HRESULT = 0x0004D004;
-pub const XACT_S_MADECHANGESCONTENT: HRESULT = 0x0004D005;
-pub const XACT_S_MADECHANGESINFORM: HRESULT = 0x0004D006;
-pub const XACT_S_ALLNORETAIN: HRESULT = 0x0004D007;
-pub const XACT_S_ABORTING: HRESULT = 0x0004D008;
-pub const XACT_S_SINGLEPHASE: HRESULT = 0x0004D009;
-pub const XACT_S_LOCALLY_OK: HRESULT = 0x0004D00A;
-pub const XACT_S_LASTRESOURCEMANAGER: HRESULT = 0x0004D010;
-pub const CONTEXT_E_FIRST: HRESULT = 0x8004E000u32 as HRESULT;
-pub const CONTEXT_E_LAST: HRESULT = 0x8004E02Fu32 as HRESULT;
-pub const CONTEXT_S_FIRST: HRESULT = 0x0004E000;
-pub const CONTEXT_S_LAST: HRESULT = 0x0004E02F;
-pub const CONTEXT_E_ABORTED: HRESULT = 0x8004E002u32 as HRESULT;
-pub const CONTEXT_E_ABORTING: HRESULT = 0x8004E003u32 as HRESULT;
-pub const CONTEXT_E_NOCONTEXT: HRESULT = 0x8004E004u32 as HRESULT;
-pub const CONTEXT_E_WOULD_DEADLOCK: HRESULT = 0x8004E005u32 as HRESULT;
-pub const CONTEXT_E_SYNCH_TIMEOUT: HRESULT = 0x8004E006u32 as HRESULT;
-pub const CONTEXT_E_OLDREF: HRESULT = 0x8004E007u32 as HRESULT;
-pub const CONTEXT_E_ROLENOTFOUND: HRESULT = 0x8004E00Cu32 as HRESULT;
-pub const CONTEXT_E_TMNOTAVAILABLE: HRESULT = 0x8004E00Fu32 as HRESULT;
-pub const CO_E_ACTIVATIONFAILED: HRESULT = 0x8004E021u32 as HRESULT;
-pub const CO_E_ACTIVATIONFAILED_EVENTLOGGED: HRESULT = 0x8004E022u32 as HRESULT;
-pub const CO_E_ACTIVATIONFAILED_CATALOGERROR: HRESULT = 0x8004E023u32 as HRESULT;
-pub const CO_E_ACTIVATIONFAILED_TIMEOUT: HRESULT = 0x8004E024u32 as HRESULT;
-pub const CO_E_INITIALIZATIONFAILED: HRESULT = 0x8004E025u32 as HRESULT;
-pub const CONTEXT_E_NOJIT: HRESULT = 0x8004E026u32 as HRESULT;
-pub const CONTEXT_E_NOTRANSACTION: HRESULT = 0x8004E027u32 as HRESULT;
-pub const CO_E_THREADINGMODEL_CHANGED: HRESULT = 0x8004E028u32 as HRESULT;
-pub const CO_E_NOIISINTRINSICS: HRESULT = 0x8004E029u32 as HRESULT;
-pub const CO_E_NOCOOKIES: HRESULT = 0x8004E02Au32 as HRESULT;
-pub const CO_E_DBERROR: HRESULT = 0x8004E02Bu32 as HRESULT;
-pub const CO_E_NOTPOOLED: HRESULT = 0x8004E02Cu32 as HRESULT;
-pub const CO_E_NOTCONSTRUCTED: HRESULT = 0x8004E02Du32 as HRESULT;
-pub const CO_E_NOSYNCHRONIZATION: HRESULT = 0x8004E02Eu32 as HRESULT;
-pub const CO_E_ISOLEVELMISMATCH: HRESULT = 0x8004E02Fu32 as HRESULT;
-pub const CO_E_CALL_OUT_OF_TX_SCOPE_NOT_ALLOWED: HRESULT = 0x8004E030u32 as HRESULT;
-pub const CO_E_EXIT_TRANSACTION_SCOPE_NOT_CALLED: HRESULT = 0x8004E031u32 as HRESULT;
-pub const OLE_S_USEREG: HRESULT = 0x00040000;
-pub const OLE_S_STATIC: HRESULT = 0x00040001;
-pub const OLE_S_MAC_CLIPFORMAT: HRESULT = 0x00040002;
-pub const DRAGDROP_S_DROP: HRESULT = 0x00040100;
-pub const DRAGDROP_S_CANCEL: HRESULT = 0x00040101;
-pub const DRAGDROP_S_USEDEFAULTCURSORS: HRESULT = 0x00040102;
-pub const DATA_S_SAMEFORMATETC: HRESULT = 0x00040130;
-pub const VIEW_S_ALREADY_FROZEN: HRESULT = 0x00040140;
-pub const CACHE_S_FORMATETC_NOTSUPPORTED: HRESULT = 0x00040170;
-pub const CACHE_S_SAMECACHE: HRESULT = 0x00040171;
-pub const CACHE_S_SOMECACHES_NOTUPDATED: HRESULT = 0x00040172;
-pub const OLEOBJ_S_INVALIDVERB: HRESULT = 0x00040180;
-pub const OLEOBJ_S_CANNOT_DOVERB_NOW: HRESULT = 0x00040181;
-pub const OLEOBJ_S_INVALIDHWND: HRESULT = 0x00040182;
-pub const INPLACE_S_TRUNCATED: HRESULT = 0x000401A0;
-pub const CONVERT10_S_NO_PRESENTATION: HRESULT = 0x000401C0;
-pub const MK_S_REDUCED_TO_SELF: HRESULT = 0x000401E2;
-pub const MK_S_ME: HRESULT = 0x000401E4;
-pub const MK_S_HIM: HRESULT = 0x000401E5;
-pub const MK_S_US: HRESULT = 0x000401E6;
-pub const MK_S_MONIKERALREADYREGISTERED: HRESULT = 0x000401E7;
-pub const SCHED_S_TASK_READY: HRESULT = 0x00041300;
-pub const SCHED_S_TASK_RUNNING: HRESULT = 0x00041301;
-pub const SCHED_S_TASK_DISABLED: HRESULT = 0x00041302;
-pub const SCHED_S_TASK_HAS_NOT_RUN: HRESULT = 0x00041303;
-pub const SCHED_S_TASK_NO_MORE_RUNS: HRESULT = 0x00041304;
-pub const SCHED_S_TASK_NOT_SCHEDULED: HRESULT = 0x00041305;
-pub const SCHED_S_TASK_TERMINATED: HRESULT = 0x00041306;
-pub const SCHED_S_TASK_NO_VALID_TRIGGERS: HRESULT = 0x00041307;
-pub const SCHED_S_EVENT_TRIGGER: HRESULT = 0x00041308;
-pub const SCHED_E_TRIGGER_NOT_FOUND: HRESULT = 0x80041309u32 as HRESULT;
-pub const SCHED_E_TASK_NOT_READY: HRESULT = 0x8004130Au32 as HRESULT;
-pub const SCHED_E_TASK_NOT_RUNNING: HRESULT = 0x8004130Bu32 as HRESULT;
-pub const SCHED_E_SERVICE_NOT_INSTALLED: HRESULT = 0x8004130Cu32 as HRESULT;
-pub const SCHED_E_CANNOT_OPEN_TASK: HRESULT = 0x8004130Du32 as HRESULT;
-pub const SCHED_E_INVALID_TASK: HRESULT = 0x8004130Eu32 as HRESULT;
-pub const SCHED_E_ACCOUNT_INFORMATION_NOT_SET: HRESULT = 0x8004130Fu32 as HRESULT;
-pub const SCHED_E_ACCOUNT_NAME_NOT_FOUND: HRESULT = 0x80041310u32 as HRESULT;
-pub const SCHED_E_ACCOUNT_DBASE_CORRUPT: HRESULT = 0x80041311u32 as HRESULT;
-pub const SCHED_E_NO_SECURITY_SERVICES: HRESULT = 0x80041312u32 as HRESULT;
-pub const SCHED_E_UNKNOWN_OBJECT_VERSION: HRESULT = 0x80041313u32 as HRESULT;
-pub const SCHED_E_UNSUPPORTED_ACCOUNT_OPTION: HRESULT = 0x80041314u32 as HRESULT;
-pub const SCHED_E_SERVICE_NOT_RUNNING: HRESULT = 0x80041315u32 as HRESULT;
-pub const SCHED_E_UNEXPECTEDNODE: HRESULT = 0x80041316u32 as HRESULT;
-pub const SCHED_E_NAMESPACE: HRESULT = 0x80041317u32 as HRESULT;
-pub const SCHED_E_INVALIDVALUE: HRESULT = 0x80041318u32 as HRESULT;
-pub const SCHED_E_MISSINGNODE: HRESULT = 0x80041319u32 as HRESULT;
-pub const SCHED_E_MALFORMEDXML: HRESULT = 0x8004131Au32 as HRESULT;
-pub const SCHED_S_SOME_TRIGGERS_FAILED: HRESULT = 0x0004131B;
-pub const SCHED_S_BATCH_LOGON_PROBLEM: HRESULT = 0x0004131C;
-pub const SCHED_E_TOO_MANY_NODES: HRESULT = 0x8004131Du32 as HRESULT;
-pub const SCHED_E_PAST_END_BOUNDARY: HRESULT = 0x8004131Eu32 as HRESULT;
-pub const SCHED_E_ALREADY_RUNNING: HRESULT = 0x8004131Fu32 as HRESULT;
-pub const SCHED_E_USER_NOT_LOGGED_ON: HRESULT = 0x80041320u32 as HRESULT;
-pub const SCHED_E_INVALID_TASK_HASH: HRESULT = 0x80041321u32 as HRESULT;
-pub const SCHED_E_SERVICE_NOT_AVAILABLE: HRESULT = 0x80041322u32 as HRESULT;
-pub const SCHED_E_SERVICE_TOO_BUSY: HRESULT = 0x80041323u32 as HRESULT;
-pub const SCHED_E_TASK_ATTEMPTED: HRESULT = 0x80041324u32 as HRESULT;
-pub const SCHED_S_TASK_QUEUED: HRESULT = 0x00041325;
-pub const SCHED_E_TASK_DISABLED: HRESULT = 0x80041326u32 as HRESULT;
-pub const SCHED_E_TASK_NOT_V1_COMPAT: HRESULT = 0x80041327u32 as HRESULT;
-pub const SCHED_E_START_ON_DEMAND: HRESULT = 0x80041328u32 as HRESULT;
-pub const SCHED_E_TASK_NOT_UBPM_COMPAT: HRESULT = 0x80041329u32 as HRESULT;
-pub const SCHED_E_DEPRECATED_FEATURE_USED: HRESULT = 0x80041330u32 as HRESULT;
-pub const CO_E_CLASS_CREATE_FAILED: HRESULT = 0x80080001u32 as HRESULT;
-pub const CO_E_SCM_ERROR: HRESULT = 0x80080002u32 as HRESULT;
-pub const CO_E_SCM_RPC_FAILURE: HRESULT = 0x80080003u32 as HRESULT;
-pub const CO_E_BAD_PATH: HRESULT = 0x80080004u32 as HRESULT;
-pub const CO_E_SERVER_EXEC_FAILURE: HRESULT = 0x80080005u32 as HRESULT;
-pub const CO_E_OBJSRV_RPC_FAILURE: HRESULT = 0x80080006u32 as HRESULT;
-pub const MK_E_NO_NORMALIZED: HRESULT = 0x80080007u32 as HRESULT;
-pub const CO_E_SERVER_STOPPING: HRESULT = 0x80080008u32 as HRESULT;
-pub const MEM_E_INVALID_ROOT: HRESULT = 0x80080009u32 as HRESULT;
-pub const MEM_E_INVALID_LINK: HRESULT = 0x80080010u32 as HRESULT;
-pub const MEM_E_INVALID_SIZE: HRESULT = 0x80080011u32 as HRESULT;
-pub const CO_S_NOTALLINTERFACES: HRESULT = 0x00080012;
-pub const CO_S_MACHINENAMENOTFOUND: HRESULT = 0x00080013;
-pub const CO_E_MISSING_DISPLAYNAME: HRESULT = 0x80080015u32 as HRESULT;
-pub const CO_E_RUNAS_VALUE_MUST_BE_AAA: HRESULT = 0x80080016u32 as HRESULT;
-pub const CO_E_ELEVATION_DISABLED: HRESULT = 0x80080017u32 as HRESULT;
-pub const APPX_E_PACKAGING_INTERNAL: HRESULT = 0x80080200u32 as HRESULT;
-pub const APPX_E_INTERLEAVING_NOT_ALLOWED: HRESULT = 0x80080201u32 as HRESULT;
-pub const APPX_E_RELATIONSHIPS_NOT_ALLOWED: HRESULT = 0x80080202u32 as HRESULT;
-pub const APPX_E_MISSING_REQUIRED_FILE: HRESULT = 0x80080203u32 as HRESULT;
-pub const APPX_E_INVALID_MANIFEST: HRESULT = 0x80080204u32 as HRESULT;
-pub const APPX_E_INVALID_BLOCKMAP: HRESULT = 0x80080205u32 as HRESULT;
-pub const APPX_E_CORRUPT_CONTENT: HRESULT = 0x80080206u32 as HRESULT;
-pub const APPX_E_BLOCK_HASH_INVALID: HRESULT = 0x80080207u32 as HRESULT;
-pub const APPX_E_REQUESTED_RANGE_TOO_LARGE: HRESULT = 0x80080208u32 as HRESULT;
-pub const APPX_E_INVALID_SIP_CLIENT_DATA: HRESULT = 0x80080209u32 as HRESULT;
-pub const BT_E_SPURIOUS_ACTIVATION: HRESULT = 0x80080300u32 as HRESULT;
-pub const DISP_E_UNKNOWNINTERFACE: HRESULT = 0x80020001u32 as HRESULT;
-pub const DISP_E_MEMBERNOTFOUND: HRESULT = 0x80020003u32 as HRESULT;
-pub const DISP_E_PARAMNOTFOUND: HRESULT = 0x80020004u32 as HRESULT;
-pub const DISP_E_TYPEMISMATCH: HRESULT = 0x80020005u32 as HRESULT;
-pub const DISP_E_UNKNOWNNAME: HRESULT = 0x80020006u32 as HRESULT;
-pub const DISP_E_NONAMEDARGS: HRESULT = 0x80020007u32 as HRESULT;
-pub const DISP_E_BADVARTYPE: HRESULT = 0x80020008u32 as HRESULT;
-pub const DISP_E_EXCEPTION: HRESULT = 0x80020009u32 as HRESULT;
-pub const DISP_E_OVERFLOW: HRESULT = 0x8002000Au32 as HRESULT;
-pub const DISP_E_BADINDEX: HRESULT = 0x8002000Bu32 as HRESULT;
-pub const DISP_E_UNKNOWNLCID: HRESULT = 0x8002000Cu32 as HRESULT;
-pub const DISP_E_ARRAYISLOCKED: HRESULT = 0x8002000Du32 as HRESULT;
-pub const DISP_E_BADPARAMCOUNT: HRESULT = 0x8002000Eu32 as HRESULT;
-pub const DISP_E_PARAMNOTOPTIONAL: HRESULT = 0x8002000Fu32 as HRESULT;
-pub const DISP_E_BADCALLEE: HRESULT = 0x80020010u32 as HRESULT;
-pub const DISP_E_NOTACOLLECTION: HRESULT = 0x80020011u32 as HRESULT;
-pub const DISP_E_DIVBYZERO: HRESULT = 0x80020012u32 as HRESULT;
-pub const DISP_E_BUFFERTOOSMALL: HRESULT = 0x80020013u32 as HRESULT;
-pub const TYPE_E_BUFFERTOOSMALL: HRESULT = 0x80028016u32 as HRESULT;
-pub const TYPE_E_FIELDNOTFOUND: HRESULT = 0x80028017u32 as HRESULT;
-pub const TYPE_E_INVDATAREAD: HRESULT = 0x80028018u32 as HRESULT;
-pub const TYPE_E_UNSUPFORMAT: HRESULT = 0x80028019u32 as HRESULT;
-pub const TYPE_E_REGISTRYACCESS: HRESULT = 0x8002801Cu32 as HRESULT;
-pub const TYPE_E_LIBNOTREGISTERED: HRESULT = 0x8002801Du32 as HRESULT;
-pub const TYPE_E_UNDEFINEDTYPE: HRESULT = 0x80028027u32 as HRESULT;
-pub const TYPE_E_QUALIFIEDNAMEDISALLOWED: HRESULT = 0x80028028u32 as HRESULT;
-pub const TYPE_E_INVALIDSTATE: HRESULT = 0x80028029u32 as HRESULT;
-pub const TYPE_E_WRONGTYPEKIND: HRESULT = 0x8002802Au32 as HRESULT;
-pub const TYPE_E_ELEMENTNOTFOUND: HRESULT = 0x8002802Bu32 as HRESULT;
-pub const TYPE_E_AMBIGUOUSNAME: HRESULT = 0x8002802Cu32 as HRESULT;
-pub const TYPE_E_NAMECONFLICT: HRESULT = 0x8002802Du32 as HRESULT;
-pub const TYPE_E_UNKNOWNLCID: HRESULT = 0x8002802Eu32 as HRESULT;
-pub const TYPE_E_DLLFUNCTIONNOTFOUND: HRESULT = 0x8002802Fu32 as HRESULT;
-pub const TYPE_E_BADMODULEKIND: HRESULT = 0x800288BDu32 as HRESULT;
-pub const TYPE_E_SIZETOOBIG: HRESULT = 0x800288C5u32 as HRESULT;
-pub const TYPE_E_DUPLICATEID: HRESULT = 0x800288C6u32 as HRESULT;
-pub const TYPE_E_INVALIDID: HRESULT = 0x800288CFu32 as HRESULT;
-pub const TYPE_E_TYPEMISMATCH: HRESULT = 0x80028CA0u32 as HRESULT;
-pub const TYPE_E_OUTOFBOUNDS: HRESULT = 0x80028CA1u32 as HRESULT;
-pub const TYPE_E_IOERROR: HRESULT = 0x80028CA2u32 as HRESULT;
-pub const TYPE_E_CANTCREATETMPFILE: HRESULT = 0x80028CA3u32 as HRESULT;
-pub const TYPE_E_CANTLOADLIBRARY: HRESULT = 0x80029C4Au32 as HRESULT;
-pub const TYPE_E_INCONSISTENTPROPFUNCS: HRESULT = 0x80029C83u32 as HRESULT;
-pub const TYPE_E_CIRCULARTYPE: HRESULT = 0x80029C84u32 as HRESULT;
-pub const STG_E_INVALIDFUNCTION: HRESULT = 0x80030001u32 as HRESULT;
-pub const STG_E_FILENOTFOUND: HRESULT = 0x80030002u32 as HRESULT;
-pub const STG_E_PATHNOTFOUND: HRESULT = 0x80030003u32 as HRESULT;
-pub const STG_E_TOOMANYOPENFILES: HRESULT = 0x80030004u32 as HRESULT;
-pub const STG_E_ACCESSDENIED: HRESULT = 0x80030005u32 as HRESULT;
-pub const STG_E_INVALIDHANDLE: HRESULT = 0x80030006u32 as HRESULT;
-pub const STG_E_INSUFFICIENTMEMORY: HRESULT = 0x80030008u32 as HRESULT;
-pub const STG_E_INVALIDPOINTER: HRESULT = 0x80030009u32 as HRESULT;
-pub const STG_E_NOMOREFILES: HRESULT = 0x80030012u32 as HRESULT;
-pub const STG_E_DISKISWRITEPROTECTED: HRESULT = 0x80030013u32 as HRESULT;
-pub const STG_E_SEEKERROR: HRESULT = 0x80030019u32 as HRESULT;
-pub const STG_E_WRITEFAULT: HRESULT = 0x8003001Du32 as HRESULT;
-pub const STG_E_READFAULT: HRESULT = 0x8003001Eu32 as HRESULT;
-pub const STG_E_SHAREVIOLATION: HRESULT = 0x80030020u32 as HRESULT;
-pub const STG_E_LOCKVIOLATION: HRESULT = 0x80030021u32 as HRESULT;
-pub const STG_E_FILEALREADYEXISTS: HRESULT = 0x80030050u32 as HRESULT;
-pub const STG_E_INVALIDPARAMETER: HRESULT = 0x80030057u32 as HRESULT;
-pub const STG_E_MEDIUMFULL: HRESULT = 0x80030070u32 as HRESULT;
-pub const STG_E_PROPSETMISMATCHED: HRESULT = 0x800300F0u32 as HRESULT;
-pub const STG_E_ABNORMALAPIEXIT: HRESULT = 0x800300FAu32 as HRESULT;
-pub const STG_E_INVALIDHEADER: HRESULT = 0x800300FBu32 as HRESULT;
-pub const STG_E_INVALIDNAME: HRESULT = 0x800300FCu32 as HRESULT;
-pub const STG_E_UNKNOWN: HRESULT = 0x800300FDu32 as HRESULT;
-pub const STG_E_UNIMPLEMENTEDFUNCTION: HRESULT = 0x800300FEu32 as HRESULT;
-pub const STG_E_INVALIDFLAG: HRESULT = 0x800300FFu32 as HRESULT;
-pub const STG_E_INUSE: HRESULT = 0x80030100u32 as HRESULT;
-pub const STG_E_NOTCURRENT: HRESULT = 0x80030101u32 as HRESULT;
-pub const STG_E_REVERTED: HRESULT = 0x80030102u32 as HRESULT;
-pub const STG_E_CANTSAVE: HRESULT = 0x80030103u32 as HRESULT;
-pub const STG_E_OLDFORMAT: HRESULT = 0x80030104u32 as HRESULT;
-pub const STG_E_OLDDLL: HRESULT = 0x80030105u32 as HRESULT;
-pub const STG_E_SHAREREQUIRED: HRESULT = 0x80030106u32 as HRESULT;
-pub const STG_E_NOTFILEBASEDSTORAGE: HRESULT = 0x80030107u32 as HRESULT;
-pub const STG_E_EXTANTMARSHALLINGS: HRESULT = 0x80030108u32 as HRESULT;
-pub const STG_E_DOCFILECORRUPT: HRESULT = 0x80030109u32 as HRESULT;
-pub const STG_E_BADBASEADDRESS: HRESULT = 0x80030110u32 as HRESULT;
-pub const STG_E_DOCFILETOOLARGE: HRESULT = 0x80030111u32 as HRESULT;
-pub const STG_E_NOTSIMPLEFORMAT: HRESULT = 0x80030112u32 as HRESULT;
-pub const STG_E_INCOMPLETE: HRESULT = 0x80030201u32 as HRESULT;
-pub const STG_E_TERMINATED: HRESULT = 0x80030202u32 as HRESULT;
-pub const STG_S_CONVERTED: HRESULT = 0x00030200;
-pub const STG_S_BLOCK: HRESULT = 0x00030201;
-pub const STG_S_RETRYNOW: HRESULT = 0x00030202;
-pub const STG_S_MONITORING: HRESULT = 0x00030203;
-pub const STG_S_MULTIPLEOPENS: HRESULT = 0x00030204;
-pub const STG_S_CONSOLIDATIONFAILED: HRESULT = 0x00030205;
-pub const STG_S_CANNOTCONSOLIDATE: HRESULT = 0x00030206;
-pub const STG_E_STATUS_COPY_PROTECTION_FAILURE: HRESULT = 0x80030305u32 as HRESULT;
-pub const STG_E_CSS_AUTHENTICATION_FAILURE: HRESULT = 0x80030306u32 as HRESULT;
-pub const STG_E_CSS_KEY_NOT_PRESENT: HRESULT = 0x80030307u32 as HRESULT;
-pub const STG_E_CSS_KEY_NOT_ESTABLISHED: HRESULT = 0x80030308u32 as HRESULT;
-pub const STG_E_CSS_SCRAMBLED_SECTOR: HRESULT = 0x80030309u32 as HRESULT;
-pub const STG_E_CSS_REGION_MISMATCH: HRESULT = 0x8003030Au32 as HRESULT;
-pub const STG_E_RESETS_EXHAUSTED: HRESULT = 0x8003030Bu32 as HRESULT;
-pub const RPC_E_CALL_REJECTED: HRESULT = 0x80010001u32 as HRESULT;
-pub const RPC_E_CALL_CANCELED: HRESULT = 0x80010002u32 as HRESULT;
-pub const RPC_E_CANTPOST_INSENDCALL: HRESULT = 0x80010003u32 as HRESULT;
-pub const RPC_E_CANTCALLOUT_INASYNCCALL: HRESULT = 0x80010004u32 as HRESULT;
-pub const RPC_E_CANTCALLOUT_INEXTERNALCALL: HRESULT = 0x80010005u32 as HRESULT;
-pub const RPC_E_CONNECTION_TERMINATED: HRESULT = 0x80010006u32 as HRESULT;
-pub const RPC_E_SERVER_DIED: HRESULT = 0x80010007u32 as HRESULT;
-pub const RPC_E_CLIENT_DIED: HRESULT = 0x80010008u32 as HRESULT;
-pub const RPC_E_INVALID_DATAPACKET: HRESULT = 0x80010009u32 as HRESULT;
-pub const RPC_E_CANTTRANSMIT_CALL: HRESULT = 0x8001000Au32 as HRESULT;
-pub const RPC_E_CLIENT_CANTMARSHAL_DATA: HRESULT = 0x8001000Bu32 as HRESULT;
-pub const RPC_E_CLIENT_CANTUNMARSHAL_DATA: HRESULT = 0x8001000Cu32 as HRESULT;
-pub const RPC_E_SERVER_CANTMARSHAL_DATA: HRESULT = 0x8001000Du32 as HRESULT;
-pub const RPC_E_SERVER_CANTUNMARSHAL_DATA: HRESULT = 0x8001000Eu32 as HRESULT;
-pub const RPC_E_INVALID_DATA: HRESULT = 0x8001000Fu32 as HRESULT;
-pub const RPC_E_INVALID_PARAMETER: HRESULT = 0x80010010u32 as HRESULT;
-pub const RPC_E_CANTCALLOUT_AGAIN: HRESULT = 0x80010011u32 as HRESULT;
-pub const RPC_E_SERVER_DIED_DNE: HRESULT = 0x80010012u32 as HRESULT;
-pub const RPC_E_SYS_CALL_FAILED: HRESULT = 0x80010100u32 as HRESULT;
-pub const RPC_E_OUT_OF_RESOURCES: HRESULT = 0x80010101u32 as HRESULT;
-pub const RPC_E_ATTEMPTED_MULTITHREAD: HRESULT = 0x80010102u32 as HRESULT;
-pub const RPC_E_NOT_REGISTERED: HRESULT = 0x80010103u32 as HRESULT;
-pub const RPC_E_FAULT: HRESULT = 0x80010104u32 as HRESULT;
-pub const RPC_E_SERVERFAULT: HRESULT = 0x80010105u32 as HRESULT;
-pub const RPC_E_CHANGED_MODE: HRESULT = 0x80010106u32 as HRESULT;
-pub const RPC_E_INVALIDMETHOD: HRESULT = 0x80010107u32 as HRESULT;
-pub const RPC_E_DISCONNECTED: HRESULT = 0x80010108u32 as HRESULT;
-pub const RPC_E_RETRY: HRESULT = 0x80010109u32 as HRESULT;
-pub const RPC_E_SERVERCALL_RETRYLATER: HRESULT = 0x8001010Au32 as HRESULT;
-pub const RPC_E_SERVERCALL_REJECTED: HRESULT = 0x8001010Bu32 as HRESULT;
-pub const RPC_E_INVALID_CALLDATA: HRESULT = 0x8001010Cu32 as HRESULT;
-pub const RPC_E_CANTCALLOUT_ININPUTSYNCCALL: HRESULT = 0x8001010Du32 as HRESULT;
-pub const RPC_E_WRONG_THREAD: HRESULT = 0x8001010Eu32 as HRESULT;
-pub const RPC_E_THREAD_NOT_INIT: HRESULT = 0x8001010Fu32 as HRESULT;
-pub const RPC_E_VERSION_MISMATCH: HRESULT = 0x80010110u32 as HRESULT;
-pub const RPC_E_INVALID_HEADER: HRESULT = 0x80010111u32 as HRESULT;
-pub const RPC_E_INVALID_EXTENSION: HRESULT = 0x80010112u32 as HRESULT;
-pub const RPC_E_INVALID_IPID: HRESULT = 0x80010113u32 as HRESULT;
-pub const RPC_E_INVALID_OBJECT: HRESULT = 0x80010114u32 as HRESULT;
-pub const RPC_S_CALLPENDING: HRESULT = 0x80010115u32 as HRESULT;
-pub const RPC_S_WAITONTIMER: HRESULT = 0x80010116u32 as HRESULT;
-pub const RPC_E_CALL_COMPLETE: HRESULT = 0x80010117u32 as HRESULT;
-pub const RPC_E_UNSECURE_CALL: HRESULT = 0x80010118u32 as HRESULT;
-pub const RPC_E_TOO_LATE: HRESULT = 0x80010119u32 as HRESULT;
-pub const RPC_E_NO_GOOD_SECURITY_PACKAGES: HRESULT = 0x8001011Au32 as HRESULT;
-pub const RPC_E_ACCESS_DENIED: HRESULT = 0x8001011Bu32 as HRESULT;
-pub const RPC_E_REMOTE_DISABLED: HRESULT = 0x8001011Cu32 as HRESULT;
-pub const RPC_E_INVALID_OBJREF: HRESULT = 0x8001011Du32 as HRESULT;
-pub const RPC_E_NO_CONTEXT: HRESULT = 0x8001011Eu32 as HRESULT;
-pub const RPC_E_TIMEOUT: HRESULT = 0x8001011Fu32 as HRESULT;
-pub const RPC_E_NO_SYNC: HRESULT = 0x80010120u32 as HRESULT;
-pub const RPC_E_FULLSIC_REQUIRED: HRESULT = 0x80010121u32 as HRESULT;
-pub const RPC_E_INVALID_STD_NAME: HRESULT = 0x80010122u32 as HRESULT;
-pub const CO_E_FAILEDTOIMPERSONATE: HRESULT = 0x80010123u32 as HRESULT;
-pub const CO_E_FAILEDTOGETSECCTX: HRESULT = 0x80010124u32 as HRESULT;
-pub const CO_E_FAILEDTOOPENTHREADTOKEN: HRESULT = 0x80010125u32 as HRESULT;
-pub const CO_E_FAILEDTOGETTOKENINFO: HRESULT = 0x80010126u32 as HRESULT;
-pub const CO_E_TRUSTEEDOESNTMATCHCLIENT: HRESULT = 0x80010127u32 as HRESULT;
-pub const CO_E_FAILEDTOQUERYCLIENTBLANKET: HRESULT = 0x80010128u32 as HRESULT;
-pub const CO_E_FAILEDTOSETDACL: HRESULT = 0x80010129u32 as HRESULT;
-pub const CO_E_ACCESSCHECKFAILED: HRESULT = 0x8001012Au32 as HRESULT;
-pub const CO_E_NETACCESSAPIFAILED: HRESULT = 0x8001012Bu32 as HRESULT;
-pub const CO_E_WRONGTRUSTEENAMESYNTAX: HRESULT = 0x8001012Cu32 as HRESULT;
-pub const CO_E_INVALIDSID: HRESULT = 0x8001012Du32 as HRESULT;
-pub const CO_E_CONVERSIONFAILED: HRESULT = 0x8001012Eu32 as HRESULT;
-pub const CO_E_NOMATCHINGSIDFOUND: HRESULT = 0x8001012Fu32 as HRESULT;
-pub const CO_E_LOOKUPACCSIDFAILED: HRESULT = 0x80010130u32 as HRESULT;
-pub const CO_E_NOMATCHINGNAMEFOUND: HRESULT = 0x80010131u32 as HRESULT;
-pub const CO_E_LOOKUPACCNAMEFAILED: HRESULT = 0x80010132u32 as HRESULT;
-pub const CO_E_SETSERLHNDLFAILED: HRESULT = 0x80010133u32 as HRESULT;
-pub const CO_E_FAILEDTOGETWINDIR: HRESULT = 0x80010134u32 as HRESULT;
-pub const CO_E_PATHTOOLONG: HRESULT = 0x80010135u32 as HRESULT;
-pub const CO_E_FAILEDTOGENUUID: HRESULT = 0x80010136u32 as HRESULT;
-pub const CO_E_FAILEDTOCREATEFILE: HRESULT = 0x80010137u32 as HRESULT;
-pub const CO_E_FAILEDTOCLOSEHANDLE: HRESULT = 0x80010138u32 as HRESULT;
-pub const CO_E_EXCEEDSYSACLLIMIT: HRESULT = 0x80010139u32 as HRESULT;
-pub const CO_E_ACESINWRONGORDER: HRESULT = 0x8001013Au32 as HRESULT;
-pub const CO_E_INCOMPATIBLESTREAMVERSION: HRESULT = 0x8001013Bu32 as HRESULT;
-pub const CO_E_FAILEDTOOPENPROCESSTOKEN: HRESULT = 0x8001013Cu32 as HRESULT;
-pub const CO_E_DECODEFAILED: HRESULT = 0x8001013Du32 as HRESULT;
-pub const CO_E_ACNOTINITIALIZED: HRESULT = 0x8001013Fu32 as HRESULT;
-pub const CO_E_CANCEL_DISABLED: HRESULT = 0x80010140u32 as HRESULT;
-pub const RPC_E_UNEXPECTED: HRESULT = 0x8001FFFFu32 as HRESULT;
-pub const ERROR_AUDITING_DISABLED: HRESULT = 0xC0090001u32 as HRESULT;
-pub const ERROR_ALL_SIDS_FILTERED: HRESULT = 0xC0090002u32 as HRESULT;
-pub const ERROR_BIZRULES_NOT_ENABLED: HRESULT = 0xC0090003u32 as HRESULT;
-pub const NTE_BAD_UID: HRESULT = 0x80090001u32 as HRESULT;
-pub const NTE_BAD_HASH: HRESULT = 0x80090002u32 as HRESULT;
-pub const NTE_BAD_KEY: HRESULT = 0x80090003u32 as HRESULT;
-pub const NTE_BAD_LEN: HRESULT = 0x80090004u32 as HRESULT;
-pub const NTE_BAD_DATA: HRESULT = 0x80090005u32 as HRESULT;
-pub const NTE_BAD_SIGNATURE: HRESULT = 0x80090006u32 as HRESULT;
-pub const NTE_BAD_VER: HRESULT = 0x80090007u32 as HRESULT;
-pub const NTE_BAD_ALGID: HRESULT = 0x80090008u32 as HRESULT;
-pub const NTE_BAD_FLAGS: HRESULT = 0x80090009u32 as HRESULT;
-pub const NTE_BAD_TYPE: HRESULT = 0x8009000Au32 as HRESULT;
-pub const NTE_BAD_KEY_STATE: HRESULT = 0x8009000Bu32 as HRESULT;
-pub const NTE_BAD_HASH_STATE: HRESULT = 0x8009000Cu32 as HRESULT;
-pub const NTE_NO_KEY: HRESULT = 0x8009000Du32 as HRESULT;
-pub const NTE_NO_MEMORY: HRESULT = 0x8009000Eu32 as HRESULT;
-pub const NTE_EXISTS: HRESULT = 0x8009000Fu32 as HRESULT;
-pub const NTE_PERM: HRESULT = 0x80090010u32 as HRESULT;
-pub const NTE_NOT_FOUND: HRESULT = 0x80090011u32 as HRESULT;
-pub const NTE_DOUBLE_ENCRYPT: HRESULT = 0x80090012u32 as HRESULT;
-pub const NTE_BAD_PROVIDER: HRESULT = 0x80090013u32 as HRESULT;
-pub const NTE_BAD_PROV_TYPE: HRESULT = 0x80090014u32 as HRESULT;
-pub const NTE_BAD_PUBLIC_KEY: HRESULT = 0x80090015u32 as HRESULT;
-pub const NTE_BAD_KEYSET: HRESULT = 0x80090016u32 as HRESULT;
-pub const NTE_PROV_TYPE_NOT_DEF: HRESULT = 0x80090017u32 as HRESULT;
-pub const NTE_PROV_TYPE_ENTRY_BAD: HRESULT = 0x80090018u32 as HRESULT;
-pub const NTE_KEYSET_NOT_DEF: HRESULT = 0x80090019u32 as HRESULT;
-pub const NTE_KEYSET_ENTRY_BAD: HRESULT = 0x8009001Au32 as HRESULT;
-pub const NTE_PROV_TYPE_NO_MATCH: HRESULT = 0x8009001Bu32 as HRESULT;
-pub const NTE_SIGNATURE_FILE_BAD: HRESULT = 0x8009001Cu32 as HRESULT;
-pub const NTE_PROVIDER_DLL_FAIL: HRESULT = 0x8009001Du32 as HRESULT;
-pub const NTE_PROV_DLL_NOT_FOUND: HRESULT = 0x8009001Eu32 as HRESULT;
-pub const NTE_BAD_KEYSET_PARAM: HRESULT = 0x8009001Fu32 as HRESULT;
-pub const NTE_FAIL: HRESULT = 0x80090020u32 as HRESULT;
-pub const NTE_SYS_ERR: HRESULT = 0x80090021u32 as HRESULT;
-pub const NTE_SILENT_CONTEXT: HRESULT = 0x80090022u32 as HRESULT;
-pub const NTE_TOKEN_KEYSET_STORAGE_FULL: HRESULT = 0x80090023u32 as HRESULT;
-pub const NTE_TEMPORARY_PROFILE: HRESULT = 0x80090024u32 as HRESULT;
-pub const NTE_FIXEDPARAMETER: HRESULT = 0x80090025u32 as HRESULT;
-pub const NTE_INVALID_HANDLE: HRESULT = 0x80090026u32 as HRESULT;
-pub const NTE_INVALID_PARAMETER: HRESULT = 0x80090027u32 as HRESULT;
-pub const NTE_BUFFER_TOO_SMALL: HRESULT = 0x80090028u32 as HRESULT;
-pub const NTE_NOT_SUPPORTED: HRESULT = 0x80090029u32 as HRESULT;
-pub const NTE_NO_MORE_ITEMS: HRESULT = 0x8009002Au32 as HRESULT;
-pub const NTE_BUFFERS_OVERLAP: HRESULT = 0x8009002Bu32 as HRESULT;
-pub const NTE_DECRYPTION_FAILURE: HRESULT = 0x8009002Cu32 as HRESULT;
-pub const NTE_INTERNAL_ERROR: HRESULT = 0x8009002Du32 as HRESULT;
-pub const NTE_UI_REQUIRED: HRESULT = 0x8009002Eu32 as HRESULT;
-pub const NTE_HMAC_NOT_SUPPORTED: HRESULT = 0x8009002Fu32 as HRESULT;
-pub const NTE_DEVICE_NOT_READY: HRESULT = 0x80090030u32 as HRESULT;
-pub const NTE_AUTHENTICATION_IGNORED: HRESULT = 0x80090031u32 as HRESULT;
-pub const NTE_VALIDATION_FAILED: HRESULT = 0x80090032u32 as HRESULT;
-pub const NTE_INCORRECT_PASSWORD: HRESULT = 0x80090033u32 as HRESULT;
-pub const NTE_ENCRYPTION_FAILURE: HRESULT = 0x80090034u32 as HRESULT;
-pub const NTE_DEVICE_NOT_FOUND: HRESULT = 0x80090035u32 as HRESULT;
-pub const SEC_E_INSUFFICIENT_MEMORY: HRESULT = 0x80090300u32 as HRESULT;
-pub const SEC_E_INVALID_HANDLE: HRESULT = 0x80090301u32 as HRESULT;
-pub const SEC_E_UNSUPPORTED_FUNCTION: HRESULT = 0x80090302u32 as HRESULT;
-pub const SEC_E_TARGET_UNKNOWN: HRESULT = 0x80090303u32 as HRESULT;
-pub const SEC_E_INTERNAL_ERROR: HRESULT = 0x80090304u32 as HRESULT;
-pub const SEC_E_SECPKG_NOT_FOUND: HRESULT = 0x80090305u32 as HRESULT;
-pub const SEC_E_NOT_OWNER: HRESULT = 0x80090306u32 as HRESULT;
-pub const SEC_E_CANNOT_INSTALL: HRESULT = 0x80090307u32 as HRESULT;
-pub const SEC_E_INVALID_TOKEN: HRESULT = 0x80090308u32 as HRESULT;
-pub const SEC_E_CANNOT_PACK: HRESULT = 0x80090309u32 as HRESULT;
-pub const SEC_E_QOP_NOT_SUPPORTED: HRESULT = 0x8009030Au32 as HRESULT;
-pub const SEC_E_NO_IMPERSONATION: HRESULT = 0x8009030Bu32 as HRESULT;
-pub const SEC_E_LOGON_DENIED: HRESULT = 0x8009030Cu32 as HRESULT;
-pub const SEC_E_UNKNOWN_CREDENTIALS: HRESULT = 0x8009030Du32 as HRESULT;
-pub const SEC_E_NO_CREDENTIALS: HRESULT = 0x8009030Eu32 as HRESULT;
-pub const SEC_E_MESSAGE_ALTERED: HRESULT = 0x8009030Fu32 as HRESULT;
-pub const SEC_E_OUT_OF_SEQUENCE: HRESULT = 0x80090310u32 as HRESULT;
-pub const SEC_E_NO_AUTHENTICATING_AUTHORITY: HRESULT = 0x80090311u32 as HRESULT;
-pub const SEC_I_CONTINUE_NEEDED: HRESULT = 0x00090312;
-pub const SEC_I_COMPLETE_NEEDED: HRESULT = 0x00090313;
-pub const SEC_I_COMPLETE_AND_CONTINUE: HRESULT = 0x00090314;
-pub const SEC_I_LOCAL_LOGON: HRESULT = 0x00090315;
-pub const SEC_E_BAD_PKGID: HRESULT = 0x80090316u32 as HRESULT;
-pub const SEC_E_CONTEXT_EXPIRED: HRESULT = 0x80090317u32 as HRESULT;
-pub const SEC_I_CONTEXT_EXPIRED: HRESULT = 0x00090317;
-pub const SEC_E_INCOMPLETE_MESSAGE: HRESULT = 0x80090318u32 as HRESULT;
-pub const SEC_E_INCOMPLETE_CREDENTIALS: HRESULT = 0x80090320u32 as HRESULT;
-pub const SEC_E_BUFFER_TOO_SMALL: HRESULT = 0x80090321u32 as HRESULT;
-pub const SEC_I_INCOMPLETE_CREDENTIALS: HRESULT = 0x00090320;
-pub const SEC_I_RENEGOTIATE: HRESULT = 0x00090321;
-pub const SEC_E_WRONG_PRINCIPAL: HRESULT = 0x80090322u32 as HRESULT;
-pub const SEC_I_NO_LSA_CONTEXT: HRESULT = 0x00090323;
-pub const SEC_E_TIME_SKEW: HRESULT = 0x80090324u32 as HRESULT;
-pub const SEC_E_UNTRUSTED_ROOT: HRESULT = 0x80090325u32 as HRESULT;
-pub const SEC_E_ILLEGAL_MESSAGE: HRESULT = 0x80090326u32 as HRESULT;
-pub const SEC_E_CERT_UNKNOWN: HRESULT = 0x80090327u32 as HRESULT;
-pub const SEC_E_CERT_EXPIRED: HRESULT = 0x80090328u32 as HRESULT;
-pub const SEC_E_ENCRYPT_FAILURE: HRESULT = 0x80090329u32 as HRESULT;
-pub const SEC_E_DECRYPT_FAILURE: HRESULT = 0x80090330u32 as HRESULT;
-pub const SEC_E_ALGORITHM_MISMATCH: HRESULT = 0x80090331u32 as HRESULT;
-pub const SEC_E_SECURITY_QOS_FAILED: HRESULT = 0x80090332u32 as HRESULT;
-pub const SEC_E_UNFINISHED_CONTEXT_DELETED: HRESULT = 0x80090333u32 as HRESULT;
-pub const SEC_E_NO_TGT_REPLY: HRESULT = 0x80090334u32 as HRESULT;
-pub const SEC_E_NO_IP_ADDRESSES: HRESULT = 0x80090335u32 as HRESULT;
-pub const SEC_E_WRONG_CREDENTIAL_HANDLE: HRESULT = 0x80090336u32 as HRESULT;
-pub const SEC_E_CRYPTO_SYSTEM_INVALID: HRESULT = 0x80090337u32 as HRESULT;
-pub const SEC_E_MAX_REFERRALS_EXCEEDED: HRESULT = 0x80090338u32 as HRESULT;
-pub const SEC_E_MUST_BE_KDC: HRESULT = 0x80090339u32 as HRESULT;
-pub const SEC_E_STRONG_CRYPTO_NOT_SUPPORTED: HRESULT = 0x8009033Au32 as HRESULT;
-pub const SEC_E_TOO_MANY_PRINCIPALS: HRESULT = 0x8009033Bu32 as HRESULT;
-pub const SEC_E_NO_PA_DATA: HRESULT = 0x8009033Cu32 as HRESULT;
-pub const SEC_E_PKINIT_NAME_MISMATCH: HRESULT = 0x8009033Du32 as HRESULT;
-pub const SEC_E_SMARTCARD_LOGON_REQUIRED: HRESULT = 0x8009033Eu32 as HRESULT;
-pub const SEC_E_SHUTDOWN_IN_PROGRESS: HRESULT = 0x8009033Fu32 as HRESULT;
-pub const SEC_E_KDC_INVALID_REQUEST: HRESULT = 0x80090340u32 as HRESULT;
-pub const SEC_E_KDC_UNABLE_TO_REFER: HRESULT = 0x80090341u32 as HRESULT;
-pub const SEC_E_KDC_UNKNOWN_ETYPE: HRESULT = 0x80090342u32 as HRESULT;
-pub const SEC_E_UNSUPPORTED_PREAUTH: HRESULT = 0x80090343u32 as HRESULT;
-pub const SEC_E_DELEGATION_REQUIRED: HRESULT = 0x80090345u32 as HRESULT;
-pub const SEC_E_BAD_BINDINGS: HRESULT = 0x80090346u32 as HRESULT;
-pub const SEC_E_MULTIPLE_ACCOUNTS: HRESULT = 0x80090347u32 as HRESULT;
-pub const SEC_E_NO_KERB_KEY: HRESULT = 0x80090348u32 as HRESULT;
-pub const SEC_E_CERT_WRONG_USAGE: HRESULT = 0x80090349u32 as HRESULT;
-pub const SEC_E_DOWNGRADE_DETECTED: HRESULT = 0x80090350u32 as HRESULT;
-pub const SEC_E_SMARTCARD_CERT_REVOKED: HRESULT = 0x80090351u32 as HRESULT;
-pub const SEC_E_ISSUING_CA_UNTRUSTED: HRESULT = 0x80090352u32 as HRESULT;
-pub const SEC_E_REVOCATION_OFFLINE_C: HRESULT = 0x80090353u32 as HRESULT;
-pub const SEC_E_PKINIT_CLIENT_FAILURE: HRESULT = 0x80090354u32 as HRESULT;
-pub const SEC_E_SMARTCARD_CERT_EXPIRED: HRESULT = 0x80090355u32 as HRESULT;
-pub const SEC_E_NO_S4U_PROT_SUPPORT: HRESULT = 0x80090356u32 as HRESULT;
-pub const SEC_E_CROSSREALM_DELEGATION_FAILURE: HRESULT = 0x80090357u32 as HRESULT;
-pub const SEC_E_REVOCATION_OFFLINE_KDC: HRESULT = 0x80090358u32 as HRESULT;
-pub const SEC_E_ISSUING_CA_UNTRUSTED_KDC: HRESULT = 0x80090359u32 as HRESULT;
-pub const SEC_E_KDC_CERT_EXPIRED: HRESULT = 0x8009035Au32 as HRESULT;
-pub const SEC_E_KDC_CERT_REVOKED: HRESULT = 0x8009035Bu32 as HRESULT;
-pub const SEC_I_SIGNATURE_NEEDED: HRESULT = 0x0009035C;
-pub const SEC_E_INVALID_PARAMETER: HRESULT = 0x8009035Du32 as HRESULT;
-pub const SEC_E_DELEGATION_POLICY: HRESULT = 0x8009035Eu32 as HRESULT;
-pub const SEC_E_POLICY_NLTM_ONLY: HRESULT = 0x8009035Fu32 as HRESULT;
-pub const SEC_I_NO_RENEGOTIATION: HRESULT = 0x00090360;
-pub const SEC_E_NO_CONTEXT: HRESULT = 0x80090361u32 as HRESULT;
-pub const SEC_E_PKU2U_CERT_FAILURE: HRESULT = 0x80090362u32 as HRESULT;
-pub const SEC_E_MUTUAL_AUTH_FAILED: HRESULT = 0x80090363u32 as HRESULT;
-pub const SEC_I_MESSAGE_FRAGMENT: HRESULT = 0x00090364;
-pub const SEC_E_ONLY_HTTPS_ALLOWED: HRESULT = 0x80090365u32 as HRESULT;
-pub const SEC_I_CONTINUE_NEEDED_MESSAGE_OK: HRESULT = 0x00090366;
-pub const SEC_E_APPLICATION_PROTOCOL_MISMATCH: HRESULT = 0x80090367u32 as HRESULT;
-pub const SEC_E_NO_SPM: HRESULT = SEC_E_INTERNAL_ERROR;
-pub const SEC_E_NOT_SUPPORTED: HRESULT = SEC_E_UNSUPPORTED_FUNCTION;
-pub const CRYPT_E_MSG_ERROR: HRESULT = 0x80091001u32 as HRESULT;
-pub const CRYPT_E_UNKNOWN_ALGO: HRESULT = 0x80091002u32 as HRESULT;
-pub const CRYPT_E_OID_FORMAT: HRESULT = 0x80091003u32 as HRESULT;
-pub const CRYPT_E_INVALID_MSG_TYPE: HRESULT = 0x80091004u32 as HRESULT;
-pub const CRYPT_E_UNEXPECTED_ENCODING: HRESULT = 0x80091005u32 as HRESULT;
-pub const CRYPT_E_AUTH_ATTR_MISSING: HRESULT = 0x80091006u32 as HRESULT;
-pub const CRYPT_E_HASH_VALUE: HRESULT = 0x80091007u32 as HRESULT;
-pub const CRYPT_E_INVALID_INDEX: HRESULT = 0x80091008u32 as HRESULT;
-pub const CRYPT_E_ALREADY_DECRYPTED: HRESULT = 0x80091009u32 as HRESULT;
-pub const CRYPT_E_NOT_DECRYPTED: HRESULT = 0x8009100Au32 as HRESULT;
-pub const CRYPT_E_RECIPIENT_NOT_FOUND: HRESULT = 0x8009100Bu32 as HRESULT;
-pub const CRYPT_E_CONTROL_TYPE: HRESULT = 0x8009100Cu32 as HRESULT;
-pub const CRYPT_E_ISSUER_SERIALNUMBER: HRESULT = 0x8009100Du32 as HRESULT;
-pub const CRYPT_E_SIGNER_NOT_FOUND: HRESULT = 0x8009100Eu32 as HRESULT;
-pub const CRYPT_E_ATTRIBUTES_MISSING: HRESULT = 0x8009100Fu32 as HRESULT;
-pub const CRYPT_E_STREAM_MSG_NOT_READY: HRESULT = 0x80091010u32 as HRESULT;
-pub const CRYPT_E_STREAM_INSUFFICIENT_DATA: HRESULT = 0x80091011u32 as HRESULT;
-pub const CRYPT_I_NEW_PROTECTION_REQUIRED: HRESULT = 0x00091012;
-pub const CRYPT_E_BAD_LEN: HRESULT = 0x80092001u32 as HRESULT;
-pub const CRYPT_E_BAD_ENCODE: HRESULT = 0x80092002u32 as HRESULT;
-pub const CRYPT_E_FILE_ERROR: HRESULT = 0x80092003u32 as HRESULT;
-pub const CRYPT_E_NOT_FOUND: HRESULT = 0x80092004u32 as HRESULT;
-pub const CRYPT_E_EXISTS: HRESULT = 0x80092005u32 as HRESULT;
-pub const CRYPT_E_NO_PROVIDER: HRESULT = 0x80092006u32 as HRESULT;
-pub const CRYPT_E_SELF_SIGNED: HRESULT = 0x80092007u32 as HRESULT;
-pub const CRYPT_E_DELETED_PREV: HRESULT = 0x80092008u32 as HRESULT;
-pub const CRYPT_E_NO_MATCH: HRESULT = 0x80092009u32 as HRESULT;
-pub const CRYPT_E_UNEXPECTED_MSG_TYPE: HRESULT = 0x8009200Au32 as HRESULT;
-pub const CRYPT_E_NO_KEY_PROPERTY: HRESULT = 0x8009200Bu32 as HRESULT;
-pub const CRYPT_E_NO_DECRYPT_CERT: HRESULT = 0x8009200Cu32 as HRESULT;
-pub const CRYPT_E_BAD_MSG: HRESULT = 0x8009200Du32 as HRESULT;
-pub const CRYPT_E_NO_SIGNER: HRESULT = 0x8009200Eu32 as HRESULT;
-pub const CRYPT_E_PENDING_CLOSE: HRESULT = 0x8009200Fu32 as HRESULT;
-pub const CRYPT_E_REVOKED: HRESULT = 0x80092010u32 as HRESULT;
-pub const CRYPT_E_NO_REVOCATION_DLL: HRESULT = 0x80092011u32 as HRESULT;
-pub const CRYPT_E_NO_REVOCATION_CHECK: HRESULT = 0x80092012u32 as HRESULT;
-pub const CRYPT_E_REVOCATION_OFFLINE: HRESULT = 0x80092013u32 as HRESULT;
-pub const CRYPT_E_NOT_IN_REVOCATION_DATABASE: HRESULT = 0x80092014u32 as HRESULT;
-pub const CRYPT_E_INVALID_NUMERIC_STRING: HRESULT = 0x80092020u32 as HRESULT;
-pub const CRYPT_E_INVALID_PRINTABLE_STRING: HRESULT = 0x80092021u32 as HRESULT;
-pub const CRYPT_E_INVALID_IA5_STRING: HRESULT = 0x80092022u32 as HRESULT;
-pub const CRYPT_E_INVALID_X500_STRING: HRESULT = 0x80092023u32 as HRESULT;
-pub const CRYPT_E_NOT_CHAR_STRING: HRESULT = 0x80092024u32 as HRESULT;
-pub const CRYPT_E_FILERESIZED: HRESULT = 0x80092025u32 as HRESULT;
-pub const CRYPT_E_SECURITY_SETTINGS: HRESULT = 0x80092026u32 as HRESULT;
-pub const CRYPT_E_NO_VERIFY_USAGE_DLL: HRESULT = 0x80092027u32 as HRESULT;
-pub const CRYPT_E_NO_VERIFY_USAGE_CHECK: HRESULT = 0x80092028u32 as HRESULT;
-pub const CRYPT_E_VERIFY_USAGE_OFFLINE: HRESULT = 0x80092029u32 as HRESULT;
-pub const CRYPT_E_NOT_IN_CTL: HRESULT = 0x8009202Au32 as HRESULT;
-pub const CRYPT_E_NO_TRUSTED_SIGNER: HRESULT = 0x8009202Bu32 as HRESULT;
-pub const CRYPT_E_MISSING_PUBKEY_PARA: HRESULT = 0x8009202Cu32 as HRESULT;
-pub const CRYPT_E_OBJECT_LOCATOR_OBJECT_NOT_FOUND: HRESULT = 0x8009202Du32 as HRESULT;
-pub const CRYPT_E_OSS_ERROR: HRESULT = 0x80093000u32 as HRESULT;
-pub const OSS_MORE_BUF: HRESULT = 0x80093001u32 as HRESULT;
-pub const OSS_NEGATIVE_UINTEGER: HRESULT = 0x80093002u32 as HRESULT;
-pub const OSS_PDU_RANGE: HRESULT = 0x80093003u32 as HRESULT;
-pub const OSS_MORE_INPUT: HRESULT = 0x80093004u32 as HRESULT;
-pub const OSS_DATA_ERROR: HRESULT = 0x80093005u32 as HRESULT;
-pub const OSS_BAD_ARG: HRESULT = 0x80093006u32 as HRESULT;
-pub const OSS_BAD_VERSION: HRESULT = 0x80093007u32 as HRESULT;
-pub const OSS_OUT_MEMORY: HRESULT = 0x80093008u32 as HRESULT;
-pub const OSS_PDU_MISMATCH: HRESULT = 0x80093009u32 as HRESULT;
-pub const OSS_LIMITED: HRESULT = 0x8009300Au32 as HRESULT;
-pub const OSS_BAD_PTR: HRESULT = 0x8009300Bu32 as HRESULT;
-pub const OSS_BAD_TIME: HRESULT = 0x8009300Cu32 as HRESULT;
-pub const OSS_INDEFINITE_NOT_SUPPORTED: HRESULT = 0x8009300Du32 as HRESULT;
-pub const OSS_MEM_ERROR: HRESULT = 0x8009300Eu32 as HRESULT;
-pub const OSS_BAD_TABLE: HRESULT = 0x8009300Fu32 as HRESULT;
-pub const OSS_TOO_LONG: HRESULT = 0x80093010u32 as HRESULT;
-pub const OSS_CONSTRAINT_VIOLATED: HRESULT = 0x80093011u32 as HRESULT;
-pub const OSS_FATAL_ERROR: HRESULT = 0x80093012u32 as HRESULT;
-pub const OSS_ACCESS_SERIALIZATION_ERROR: HRESULT = 0x80093013u32 as HRESULT;
-pub const OSS_NULL_TBL: HRESULT = 0x80093014u32 as HRESULT;
-pub const OSS_NULL_FCN: HRESULT = 0x80093015u32 as HRESULT;
-pub const OSS_BAD_ENCRULES: HRESULT = 0x80093016u32 as HRESULT;
-pub const OSS_UNAVAIL_ENCRULES: HRESULT = 0x80093017u32 as HRESULT;
-pub const OSS_CANT_OPEN_TRACE_WINDOW: HRESULT = 0x80093018u32 as HRESULT;
-pub const OSS_UNIMPLEMENTED: HRESULT = 0x80093019u32 as HRESULT;
-pub const OSS_OID_DLL_NOT_LINKED: HRESULT = 0x8009301Au32 as HRESULT;
-pub const OSS_CANT_OPEN_TRACE_FILE: HRESULT = 0x8009301Bu32 as HRESULT;
-pub const OSS_TRACE_FILE_ALREADY_OPEN: HRESULT = 0x8009301Cu32 as HRESULT;
-pub const OSS_TABLE_MISMATCH: HRESULT = 0x8009301Du32 as HRESULT;
-pub const OSS_TYPE_NOT_SUPPORTED: HRESULT = 0x8009301Eu32 as HRESULT;
-pub const OSS_REAL_DLL_NOT_LINKED: HRESULT = 0x8009301Fu32 as HRESULT;
-pub const OSS_REAL_CODE_NOT_LINKED: HRESULT = 0x80093020u32 as HRESULT;
-pub const OSS_OUT_OF_RANGE: HRESULT = 0x80093021u32 as HRESULT;
-pub const OSS_COPIER_DLL_NOT_LINKED: HRESULT = 0x80093022u32 as HRESULT;
-pub const OSS_CONSTRAINT_DLL_NOT_LINKED: HRESULT = 0x80093023u32 as HRESULT;
-pub const OSS_COMPARATOR_DLL_NOT_LINKED: HRESULT = 0x80093024u32 as HRESULT;
-pub const OSS_COMPARATOR_CODE_NOT_LINKED: HRESULT = 0x80093025u32 as HRESULT;
-pub const OSS_MEM_MGR_DLL_NOT_LINKED: HRESULT = 0x80093026u32 as HRESULT;
-pub const OSS_PDV_DLL_NOT_LINKED: HRESULT = 0x80093027u32 as HRESULT;
-pub const OSS_PDV_CODE_NOT_LINKED: HRESULT = 0x80093028u32 as HRESULT;
-pub const OSS_API_DLL_NOT_LINKED: HRESULT = 0x80093029u32 as HRESULT;
-pub const OSS_BERDER_DLL_NOT_LINKED: HRESULT = 0x8009302Au32 as HRESULT;
-pub const OSS_PER_DLL_NOT_LINKED: HRESULT = 0x8009302Bu32 as HRESULT;
-pub const OSS_OPEN_TYPE_ERROR: HRESULT = 0x8009302Cu32 as HRESULT;
-pub const OSS_MUTEX_NOT_CREATED: HRESULT = 0x8009302Du32 as HRESULT;
-pub const OSS_CANT_CLOSE_TRACE_FILE: HRESULT = 0x8009302Eu32 as HRESULT;
-pub const CRYPT_E_ASN1_ERROR: HRESULT = 0x80093100u32 as HRESULT;
-pub const CRYPT_E_ASN1_INTERNAL: HRESULT = 0x80093101u32 as HRESULT;
-pub const CRYPT_E_ASN1_EOD: HRESULT = 0x80093102u32 as HRESULT;
-pub const CRYPT_E_ASN1_CORRUPT: HRESULT = 0x80093103u32 as HRESULT;
-pub const CRYPT_E_ASN1_LARGE: HRESULT = 0x80093104u32 as HRESULT;
-pub const CRYPT_E_ASN1_CONSTRAINT: HRESULT = 0x80093105u32 as HRESULT;
-pub const CRYPT_E_ASN1_MEMORY: HRESULT = 0x80093106u32 as HRESULT;
-pub const CRYPT_E_ASN1_OVERFLOW: HRESULT = 0x80093107u32 as HRESULT;
-pub const CRYPT_E_ASN1_BADPDU: HRESULT = 0x80093108u32 as HRESULT;
-pub const CRYPT_E_ASN1_BADARGS: HRESULT = 0x80093109u32 as HRESULT;
-pub const CRYPT_E_ASN1_BADREAL: HRESULT = 0x8009310Au32 as HRESULT;
-pub const CRYPT_E_ASN1_BADTAG: HRESULT = 0x8009310Bu32 as HRESULT;
-pub const CRYPT_E_ASN1_CHOICE: HRESULT = 0x8009310Cu32 as HRESULT;
-pub const CRYPT_E_ASN1_RULE: HRESULT = 0x8009310Du32 as HRESULT;
-pub const CRYPT_E_ASN1_UTF8: HRESULT = 0x8009310Eu32 as HRESULT;
-pub const CRYPT_E_ASN1_PDU_TYPE: HRESULT = 0x80093133u32 as HRESULT;
-pub const CRYPT_E_ASN1_NYI: HRESULT = 0x80093134u32 as HRESULT;
-pub const CRYPT_E_ASN1_EXTENDED: HRESULT = 0x80093201u32 as HRESULT;
-pub const CRYPT_E_ASN1_NOEOD: HRESULT = 0x80093202u32 as HRESULT;
-pub const CERTSRV_E_BAD_REQUESTSUBJECT: HRESULT = 0x80094001u32 as HRESULT;
-pub const CERTSRV_E_NO_REQUEST: HRESULT = 0x80094002u32 as HRESULT;
-pub const CERTSRV_E_BAD_REQUESTSTATUS: HRESULT = 0x80094003u32 as HRESULT;
-pub const CERTSRV_E_PROPERTY_EMPTY: HRESULT = 0x80094004u32 as HRESULT;
-pub const CERTSRV_E_INVALID_CA_CERTIFICATE: HRESULT = 0x80094005u32 as HRESULT;
-pub const CERTSRV_E_SERVER_SUSPENDED: HRESULT = 0x80094006u32 as HRESULT;
-pub const CERTSRV_E_ENCODING_LENGTH: HRESULT = 0x80094007u32 as HRESULT;
-pub const CERTSRV_E_ROLECONFLICT: HRESULT = 0x80094008u32 as HRESULT;
-pub const CERTSRV_E_RESTRICTEDOFFICER: HRESULT = 0x80094009u32 as HRESULT;
-pub const CERTSRV_E_KEY_ARCHIVAL_NOT_CONFIGURED: HRESULT = 0x8009400Au32 as HRESULT;
-pub const CERTSRV_E_NO_VALID_KRA: HRESULT = 0x8009400Bu32 as HRESULT;
-pub const CERTSRV_E_BAD_REQUEST_KEY_ARCHIVAL: HRESULT = 0x8009400Cu32 as HRESULT;
-pub const CERTSRV_E_NO_CAADMIN_DEFINED: HRESULT = 0x8009400Du32 as HRESULT;
-pub const CERTSRV_E_BAD_RENEWAL_CERT_ATTRIBUTE: HRESULT = 0x8009400Eu32 as HRESULT;
-pub const CERTSRV_E_NO_DB_SESSIONS: HRESULT = 0x8009400Fu32 as HRESULT;
-pub const CERTSRV_E_ALIGNMENT_FAULT: HRESULT = 0x80094010u32 as HRESULT;
-pub const CERTSRV_E_ENROLL_DENIED: HRESULT = 0x80094011u32 as HRESULT;
-pub const CERTSRV_E_TEMPLATE_DENIED: HRESULT = 0x80094012u32 as HRESULT;
-pub const CERTSRV_E_DOWNLEVEL_DC_SSL_OR_UPGRADE: HRESULT = 0x80094013u32 as HRESULT;
-pub const CERTSRV_E_ADMIN_DENIED_REQUEST: HRESULT = 0x80094014u32 as HRESULT;
-pub const CERTSRV_E_NO_POLICY_SERVER: HRESULT = 0x80094015u32 as HRESULT;
-pub const CERTSRV_E_WEAK_SIGNATURE_OR_KEY: HRESULT = 0x80094016u32 as HRESULT;
-pub const CERTSRV_E_KEY_ATTESTATION_NOT_SUPPORTED: HRESULT = 0x80094017u32 as HRESULT;
-pub const CERTSRV_E_ENCRYPTION_CERT_REQUIRED: HRESULT = 0x80094018u32 as HRESULT;
-pub const CERTSRV_E_UNSUPPORTED_CERT_TYPE: HRESULT = 0x80094800u32 as HRESULT;
-pub const CERTSRV_E_NO_CERT_TYPE: HRESULT = 0x80094801u32 as HRESULT;
-pub const CERTSRV_E_TEMPLATE_CONFLICT: HRESULT = 0x80094802u32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_ALT_NAME_REQUIRED: HRESULT = 0x80094803u32 as HRESULT;
-pub const CERTSRV_E_ARCHIVED_KEY_REQUIRED: HRESULT = 0x80094804u32 as HRESULT;
-pub const CERTSRV_E_SMIME_REQUIRED: HRESULT = 0x80094805u32 as HRESULT;
-pub const CERTSRV_E_BAD_RENEWAL_SUBJECT: HRESULT = 0x80094806u32 as HRESULT;
-pub const CERTSRV_E_BAD_TEMPLATE_VERSION: HRESULT = 0x80094807u32 as HRESULT;
-pub const CERTSRV_E_TEMPLATE_POLICY_REQUIRED: HRESULT = 0x80094808u32 as HRESULT;
-pub const CERTSRV_E_SIGNATURE_POLICY_REQUIRED: HRESULT = 0x80094809u32 as HRESULT;
-pub const CERTSRV_E_SIGNATURE_COUNT: HRESULT = 0x8009480Au32 as HRESULT;
-pub const CERTSRV_E_SIGNATURE_REJECTED: HRESULT = 0x8009480Bu32 as HRESULT;
-pub const CERTSRV_E_ISSUANCE_POLICY_REQUIRED: HRESULT = 0x8009480Cu32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_UPN_REQUIRED: HRESULT = 0x8009480Du32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_DIRECTORY_GUID_REQUIRED: HRESULT = 0x8009480Eu32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_DNS_REQUIRED: HRESULT = 0x8009480Fu32 as HRESULT;
-pub const CERTSRV_E_ARCHIVED_KEY_UNEXPECTED: HRESULT = 0x80094810u32 as HRESULT;
-pub const CERTSRV_E_KEY_LENGTH: HRESULT = 0x80094811u32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_EMAIL_REQUIRED: HRESULT = 0x80094812u32 as HRESULT;
-pub const CERTSRV_E_UNKNOWN_CERT_TYPE: HRESULT = 0x80094813u32 as HRESULT;
-pub const CERTSRV_E_CERT_TYPE_OVERLAP: HRESULT = 0x80094814u32 as HRESULT;
-pub const CERTSRV_E_TOO_MANY_SIGNATURES: HRESULT = 0x80094815u32 as HRESULT;
-pub const CERTSRV_E_RENEWAL_BAD_PUBLIC_KEY: HRESULT = 0x80094816u32 as HRESULT;
-pub const CERTSRV_E_INVALID_EK: HRESULT = 0x80094817u32 as HRESULT;
-pub const CERTSRV_E_INVALID_IDBINDING: HRESULT = 0x80094818u32 as HRESULT;
-pub const CERTSRV_E_INVALID_ATTESTATION: HRESULT = 0x80094819u32 as HRESULT;
-pub const CERTSRV_E_KEY_ATTESTATION: HRESULT = 0x8009481Au32 as HRESULT;
-pub const CERTSRV_E_CORRUPT_KEY_ATTESTATION: HRESULT = 0x8009481Bu32 as HRESULT;
-pub const CERTSRV_E_EXPIRED_CHALLENGE: HRESULT = 0x8009481Cu32 as HRESULT;
-pub const CERTSRV_E_INVALID_RESPONSE: HRESULT = 0x8009481Du32 as HRESULT;
-pub const CERTSRV_E_INVALID_REQUESTID: HRESULT = 0x8009481Eu32 as HRESULT;
-pub const XENROLL_E_KEY_NOT_EXPORTABLE: HRESULT = 0x80095000u32 as HRESULT;
-pub const XENROLL_E_CANNOT_ADD_ROOT_CERT: HRESULT = 0x80095001u32 as HRESULT;
-pub const XENROLL_E_RESPONSE_KA_HASH_NOT_FOUND: HRESULT = 0x80095002u32 as HRESULT;
-pub const XENROLL_E_RESPONSE_UNEXPECTED_KA_HASH: HRESULT = 0x80095003u32 as HRESULT;
-pub const XENROLL_E_RESPONSE_KA_HASH_MISMATCH: HRESULT = 0x80095004u32 as HRESULT;
-pub const XENROLL_E_KEYSPEC_SMIME_MISMATCH: HRESULT = 0x80095005u32 as HRESULT;
-pub const TRUST_E_SYSTEM_ERROR: HRESULT = 0x80096001u32 as HRESULT;
-pub const TRUST_E_NO_SIGNER_CERT: HRESULT = 0x80096002u32 as HRESULT;
-pub const TRUST_E_COUNTER_SIGNER: HRESULT = 0x80096003u32 as HRESULT;
-pub const TRUST_E_CERT_SIGNATURE: HRESULT = 0x80096004u32 as HRESULT;
-pub const TRUST_E_TIME_STAMP: HRESULT = 0x80096005u32 as HRESULT;
-pub const TRUST_E_BAD_DIGEST: HRESULT = 0x80096010u32 as HRESULT;
-pub const TRUST_E_BASIC_CONSTRAINTS: HRESULT = 0x80096019u32 as HRESULT;
-pub const TRUST_E_FINANCIAL_CRITERIA: HRESULT = 0x8009601Eu32 as HRESULT;
-pub const MSSIPOTF_E_OUTOFMEMRANGE: HRESULT = 0x80097001u32 as HRESULT;
-pub const MSSIPOTF_E_CANTGETOBJECT: HRESULT = 0x80097002u32 as HRESULT;
-pub const MSSIPOTF_E_NOHEADTABLE: HRESULT = 0x80097003u32 as HRESULT;
-pub const MSSIPOTF_E_BAD_MAGICNUMBER: HRESULT = 0x80097004u32 as HRESULT;
-pub const MSSIPOTF_E_BAD_OFFSET_TABLE: HRESULT = 0x80097005u32 as HRESULT;
-pub const MSSIPOTF_E_TABLE_TAGORDER: HRESULT = 0x80097006u32 as HRESULT;
-pub const MSSIPOTF_E_TABLE_LONGWORD: HRESULT = 0x80097007u32 as HRESULT;
-pub const MSSIPOTF_E_BAD_FIRST_TABLE_PLACEMENT: HRESULT = 0x80097008u32 as HRESULT;
-pub const MSSIPOTF_E_TABLES_OVERLAP: HRESULT = 0x80097009u32 as HRESULT;
-pub const MSSIPOTF_E_TABLE_PADBYTES: HRESULT = 0x8009700Au32 as HRESULT;
-pub const MSSIPOTF_E_FILETOOSMALL: HRESULT = 0x8009700Bu32 as HRESULT;
-pub const MSSIPOTF_E_TABLE_CHECKSUM: HRESULT = 0x8009700Cu32 as HRESULT;
-pub const MSSIPOTF_E_FILE_CHECKSUM: HRESULT = 0x8009700Du32 as HRESULT;
-pub const MSSIPOTF_E_FAILED_POLICY: HRESULT = 0x80097010u32 as HRESULT;
-pub const MSSIPOTF_E_FAILED_HINTS_CHECK: HRESULT = 0x80097011u32 as HRESULT;
-pub const MSSIPOTF_E_NOT_OPENTYPE: HRESULT = 0x80097012u32 as HRESULT;
-pub const MSSIPOTF_E_FILE: HRESULT = 0x80097013u32 as HRESULT;
-pub const MSSIPOTF_E_CRYPT: HRESULT = 0x80097014u32 as HRESULT;
-pub const MSSIPOTF_E_BADVERSION: HRESULT = 0x80097015u32 as HRESULT;
-pub const MSSIPOTF_E_DSIG_STRUCTURE: HRESULT = 0x80097016u32 as HRESULT;
-pub const MSSIPOTF_E_PCONST_CHECK: HRESULT = 0x80097017u32 as HRESULT;
-pub const MSSIPOTF_E_STRUCTURE: HRESULT = 0x80097018u32 as HRESULT;
-pub const ERROR_CRED_REQUIRES_CONFIRMATION: HRESULT = 0x80097019u32 as HRESULT;
-pub const NTE_OP_OK: HRESULT = 0;
-pub const TRUST_E_PROVIDER_UNKNOWN: HRESULT = 0x800B0001u32 as HRESULT;
-pub const TRUST_E_ACTION_UNKNOWN: HRESULT = 0x800B0002u32 as HRESULT;
-pub const TRUST_E_SUBJECT_FORM_UNKNOWN: HRESULT = 0x800B0003u32 as HRESULT;
-pub const TRUST_E_SUBJECT_NOT_TRUSTED: HRESULT = 0x800B0004u32 as HRESULT;
-pub const DIGSIG_E_ENCODE: HRESULT = 0x800B0005u32 as HRESULT;
-pub const DIGSIG_E_DECODE: HRESULT = 0x800B0006u32 as HRESULT;
-pub const DIGSIG_E_EXTENSIBILITY: HRESULT = 0x800B0007u32 as HRESULT;
-pub const DIGSIG_E_CRYPTO: HRESULT = 0x800B0008u32 as HRESULT;
-pub const PERSIST_E_SIZEDEFINITE: HRESULT = 0x800B0009u32 as HRESULT;
-pub const PERSIST_E_SIZEINDEFINITE: HRESULT = 0x800B000Au32 as HRESULT;
-pub const PERSIST_E_NOTSELFSIZING: HRESULT = 0x800B000Bu32 as HRESULT;
-pub const TRUST_E_NOSIGNATURE: HRESULT = 0x800B0100u32 as HRESULT;
-pub const CERT_E_EXPIRED: HRESULT = 0x800B0101u32 as HRESULT;
-pub const CERT_E_VALIDITYPERIODNESTING: HRESULT = 0x800B0102u32 as HRESULT;
-pub const CERT_E_ROLE: HRESULT = 0x800B0103u32 as HRESULT;
-pub const CERT_E_PATHLENCONST: HRESULT = 0x800B0104u32 as HRESULT;
-pub const CERT_E_CRITICAL: HRESULT = 0x800B0105u32 as HRESULT;
-pub const CERT_E_PURPOSE: HRESULT = 0x800B0106u32 as HRESULT;
-pub const CERT_E_ISSUERCHAINING: HRESULT = 0x800B0107u32 as HRESULT;
-pub const CERT_E_MALFORMED: HRESULT = 0x800B0108u32 as HRESULT;
-pub const CERT_E_UNTRUSTEDROOT: HRESULT = 0x800B0109u32 as HRESULT;
-pub const CERT_E_CHAINING: HRESULT = 0x800B010Au32 as HRESULT;
-pub const TRUST_E_FAIL: HRESULT = 0x800B010Bu32 as HRESULT;
-pub const CERT_E_REVOKED: HRESULT = 0x800B010Cu32 as HRESULT;
-pub const CERT_E_UNTRUSTEDTESTROOT: HRESULT = 0x800B010Du32 as HRESULT;
-pub const CERT_E_REVOCATION_FAILURE: HRESULT = 0x800B010Eu32 as HRESULT;
-pub const CERT_E_CN_NO_MATCH: HRESULT = 0x800B010Fu32 as HRESULT;
-pub const CERT_E_WRONG_USAGE: HRESULT = 0x800B0110u32 as HRESULT;
-pub const TRUST_E_EXPLICIT_DISTRUST: HRESULT = 0x800B0111u32 as HRESULT;
-pub const CERT_E_UNTRUSTEDCA: HRESULT = 0x800B0112u32 as HRESULT;
-pub const CERT_E_INVALID_POLICY: HRESULT = 0x800B0113u32 as HRESULT;
-pub const CERT_E_INVALID_NAME: HRESULT = 0x800B0114u32 as HRESULT;
-pub const SPAPI_E_EXPECTED_SECTION_NAME: HRESULT = 0x800F0000u32 as HRESULT;
-pub const SPAPI_E_BAD_SECTION_NAME_LINE: HRESULT = 0x800F0001u32 as HRESULT;
-pub const SPAPI_E_SECTION_NAME_TOO_LONG: HRESULT = 0x800F0002u32 as HRESULT;
-pub const SPAPI_E_GENERAL_SYNTAX: HRESULT = 0x800F0003u32 as HRESULT;
-pub const SPAPI_E_WRONG_INF_STYLE: HRESULT = 0x800F0100u32 as HRESULT;
-pub const SPAPI_E_SECTION_NOT_FOUND: HRESULT = 0x800F0101u32 as HRESULT;
-pub const SPAPI_E_LINE_NOT_FOUND: HRESULT = 0x800F0102u32 as HRESULT;
-pub const SPAPI_E_NO_BACKUP: HRESULT = 0x800F0103u32 as HRESULT;
-pub const SPAPI_E_NO_ASSOCIATED_CLASS: HRESULT = 0x800F0200u32 as HRESULT;
-pub const SPAPI_E_CLASS_MISMATCH: HRESULT = 0x800F0201u32 as HRESULT;
-pub const SPAPI_E_DUPLICATE_FOUND: HRESULT = 0x800F0202u32 as HRESULT;
-pub const SPAPI_E_NO_DRIVER_SELECTED: HRESULT = 0x800F0203u32 as HRESULT;
-pub const SPAPI_E_KEY_DOES_NOT_EXIST: HRESULT = 0x800F0204u32 as HRESULT;
-pub const SPAPI_E_INVALID_DEVINST_NAME: HRESULT = 0x800F0205u32 as HRESULT;
-pub const SPAPI_E_INVALID_CLASS: HRESULT = 0x800F0206u32 as HRESULT;
-pub const SPAPI_E_DEVINST_ALREADY_EXISTS: HRESULT = 0x800F0207u32 as HRESULT;
-pub const SPAPI_E_DEVINFO_NOT_REGISTERED: HRESULT = 0x800F0208u32 as HRESULT;
-pub const SPAPI_E_INVALID_REG_PROPERTY: HRESULT = 0x800F0209u32 as HRESULT;
-pub const SPAPI_E_NO_INF: HRESULT = 0x800F020Au32 as HRESULT;
-pub const SPAPI_E_NO_SUCH_DEVINST: HRESULT = 0x800F020Bu32 as HRESULT;
-pub const SPAPI_E_CANT_LOAD_CLASS_ICON: HRESULT = 0x800F020Cu32 as HRESULT;
-pub const SPAPI_E_INVALID_CLASS_INSTALLER: HRESULT = 0x800F020Du32 as HRESULT;
-pub const SPAPI_E_DI_DO_DEFAULT: HRESULT = 0x800F020Eu32 as HRESULT;
-pub const SPAPI_E_DI_NOFILECOPY: HRESULT = 0x800F020Fu32 as HRESULT;
-pub const SPAPI_E_INVALID_HWPROFILE: HRESULT = 0x800F0210u32 as HRESULT;
-pub const SPAPI_E_NO_DEVICE_SELECTED: HRESULT = 0x800F0211u32 as HRESULT;
-pub const SPAPI_E_DEVINFO_LIST_LOCKED: HRESULT = 0x800F0212u32 as HRESULT;
-pub const SPAPI_E_DEVINFO_DATA_LOCKED: HRESULT = 0x800F0213u32 as HRESULT;
-pub const SPAPI_E_DI_BAD_PATH: HRESULT = 0x800F0214u32 as HRESULT;
-pub const SPAPI_E_NO_CLASSINSTALL_PARAMS: HRESULT = 0x800F0215u32 as HRESULT;
-pub const SPAPI_E_FILEQUEUE_LOCKED: HRESULT = 0x800F0216u32 as HRESULT;
-pub const SPAPI_E_BAD_SERVICE_INSTALLSECT: HRESULT = 0x800F0217u32 as HRESULT;
-pub const SPAPI_E_NO_CLASS_DRIVER_LIST: HRESULT = 0x800F0218u32 as HRESULT;
-pub const SPAPI_E_NO_ASSOCIATED_SERVICE: HRESULT = 0x800F0219u32 as HRESULT;
-pub const SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE: HRESULT = 0x800F021Au32 as HRESULT;
-pub const SPAPI_E_DEVICE_INTERFACE_ACTIVE: HRESULT = 0x800F021Bu32 as HRESULT;
-pub const SPAPI_E_DEVICE_INTERFACE_REMOVED: HRESULT = 0x800F021Cu32 as HRESULT;
-pub const SPAPI_E_BAD_INTERFACE_INSTALLSECT: HRESULT = 0x800F021Du32 as HRESULT;
-pub const SPAPI_E_NO_SUCH_INTERFACE_CLASS: HRESULT = 0x800F021Eu32 as HRESULT;
-pub const SPAPI_E_INVALID_REFERENCE_STRING: HRESULT = 0x800F021Fu32 as HRESULT;
-pub const SPAPI_E_INVALID_MACHINENAME: HRESULT = 0x800F0220u32 as HRESULT;
-pub const SPAPI_E_REMOTE_COMM_FAILURE: HRESULT = 0x800F0221u32 as HRESULT;
-pub const SPAPI_E_MACHINE_UNAVAILABLE: HRESULT = 0x800F0222u32 as HRESULT;
-pub const SPAPI_E_NO_CONFIGMGR_SERVICES: HRESULT = 0x800F0223u32 as HRESULT;
-pub const SPAPI_E_INVALID_PROPPAGE_PROVIDER: HRESULT = 0x800F0224u32 as HRESULT;
-pub const SPAPI_E_NO_SUCH_DEVICE_INTERFACE: HRESULT = 0x800F0225u32 as HRESULT;
-pub const SPAPI_E_DI_POSTPROCESSING_REQUIRED: HRESULT = 0x800F0226u32 as HRESULT;
-pub const SPAPI_E_INVALID_COINSTALLER: HRESULT = 0x800F0227u32 as HRESULT;
-pub const SPAPI_E_NO_COMPAT_DRIVERS: HRESULT = 0x800F0228u32 as HRESULT;
-pub const SPAPI_E_NO_DEVICE_ICON: HRESULT = 0x800F0229u32 as HRESULT;
-pub const SPAPI_E_INVALID_INF_LOGCONFIG: HRESULT = 0x800F022Au32 as HRESULT;
-pub const SPAPI_E_DI_DONT_INSTALL: HRESULT = 0x800F022Bu32 as HRESULT;
-pub const SPAPI_E_INVALID_FILTER_DRIVER: HRESULT = 0x800F022Cu32 as HRESULT;
-pub const SPAPI_E_NON_WINDOWS_NT_DRIVER: HRESULT = 0x800F022Du32 as HRESULT;
-pub const SPAPI_E_NON_WINDOWS_DRIVER: HRESULT = 0x800F022Eu32 as HRESULT;
-pub const SPAPI_E_NO_CATALOG_FOR_OEM_INF: HRESULT = 0x800F022Fu32 as HRESULT;
-pub const SPAPI_E_DEVINSTALL_QUEUE_NONNATIVE: HRESULT = 0x800F0230u32 as HRESULT;
-pub const SPAPI_E_NOT_DISABLEABLE: HRESULT = 0x800F0231u32 as HRESULT;
-pub const SPAPI_E_CANT_REMOVE_DEVINST: HRESULT = 0x800F0232u32 as HRESULT;
-pub const SPAPI_E_INVALID_TARGET: HRESULT = 0x800F0233u32 as HRESULT;
-pub const SPAPI_E_DRIVER_NONNATIVE: HRESULT = 0x800F0234u32 as HRESULT;
-pub const SPAPI_E_IN_WOW64: HRESULT = 0x800F0235u32 as HRESULT;
-pub const SPAPI_E_SET_SYSTEM_RESTORE_POINT: HRESULT = 0x800F0236u32 as HRESULT;
-pub const SPAPI_E_INCORRECTLY_COPIED_INF: HRESULT = 0x800F0237u32 as HRESULT;
-pub const SPAPI_E_SCE_DISABLED: HRESULT = 0x800F0238u32 as HRESULT;
-pub const SPAPI_E_UNKNOWN_EXCEPTION: HRESULT = 0x800F0239u32 as HRESULT;
-pub const SPAPI_E_PNP_REGISTRY_ERROR: HRESULT = 0x800F023Au32 as HRESULT;
-pub const SPAPI_E_REMOTE_REQUEST_UNSUPPORTED: HRESULT = 0x800F023Bu32 as HRESULT;
-pub const SPAPI_E_NOT_AN_INSTALLED_OEM_INF: HRESULT = 0x800F023Cu32 as HRESULT;
-pub const SPAPI_E_INF_IN_USE_BY_DEVICES: HRESULT = 0x800F023Du32 as HRESULT;
-pub const SPAPI_E_DI_FUNCTION_OBSOLETE: HRESULT = 0x800F023Eu32 as HRESULT;
-pub const SPAPI_E_NO_AUTHENTICODE_CATALOG: HRESULT = 0x800F023Fu32 as HRESULT;
-pub const SPAPI_E_AUTHENTICODE_DISALLOWED: HRESULT = 0x800F0240u32 as HRESULT;
-pub const SPAPI_E_AUTHENTICODE_TRUSTED_PUBLISHER: HRESULT = 0x800F0241u32 as HRESULT;
-pub const SPAPI_E_AUTHENTICODE_TRUST_NOT_ESTABLISHED: HRESULT = 0x800F0242u32 as HRESULT;
-pub const SPAPI_E_AUTHENTICODE_PUBLISHER_NOT_TRUSTED: HRESULT = 0x800F0243u32 as HRESULT;
-pub const SPAPI_E_SIGNATURE_OSATTRIBUTE_MISMATCH: HRESULT = 0x800F0244u32 as HRESULT;
-pub const SPAPI_E_ONLY_VALIDATE_VIA_AUTHENTICODE: HRESULT = 0x800F0245u32 as HRESULT;
-pub const SPAPI_E_DEVICE_INSTALLER_NOT_READY: HRESULT = 0x800F0246u32 as HRESULT;
-pub const SPAPI_E_DRIVER_STORE_ADD_FAILED: HRESULT = 0x800F0247u32 as HRESULT;
-pub const SPAPI_E_DEVICE_INSTALL_BLOCKED: HRESULT = 0x800F0248u32 as HRESULT;
-pub const SPAPI_E_DRIVER_INSTALL_BLOCKED: HRESULT = 0x800F0249u32 as HRESULT;
-pub const SPAPI_E_WRONG_INF_TYPE: HRESULT = 0x800F024Au32 as HRESULT;
-pub const SPAPI_E_FILE_HASH_NOT_IN_CATALOG: HRESULT = 0x800F024Bu32 as HRESULT;
-pub const SPAPI_E_DRIVER_STORE_DELETE_FAILED: HRESULT = 0x800F024Cu32 as HRESULT;
-pub const SPAPI_E_UNRECOVERABLE_STACK_OVERFLOW: HRESULT = 0x800F0300u32 as HRESULT;
-pub const SPAPI_E_ERROR_NOT_INSTALLED: HRESULT = 0x800F1000u32 as HRESULT;
-pub const SCARD_S_SUCCESS: HRESULT = NO_ERROR as HRESULT;
-pub const SCARD_F_INTERNAL_ERROR: HRESULT = 0x80100001u32 as HRESULT;
-pub const SCARD_E_CANCELLED: HRESULT = 0x80100002u32 as HRESULT;
-pub const SCARD_E_INVALID_HANDLE: HRESULT = 0x80100003u32 as HRESULT;
-pub const SCARD_E_INVALID_PARAMETER: HRESULT = 0x80100004u32 as HRESULT;
-pub const SCARD_E_INVALID_TARGET: HRESULT = 0x80100005u32 as HRESULT;
-pub const SCARD_E_NO_MEMORY: HRESULT = 0x80100006u32 as HRESULT;
-pub const SCARD_F_WAITED_TOO_LONG: HRESULT = 0x80100007u32 as HRESULT;
-pub const SCARD_E_INSUFFICIENT_BUFFER: HRESULT = 0x80100008u32 as HRESULT;
-pub const SCARD_E_UNKNOWN_READER: HRESULT = 0x80100009u32 as HRESULT;
-pub const SCARD_E_TIMEOUT: HRESULT = 0x8010000Au32 as HRESULT;
-pub const SCARD_E_SHARING_VIOLATION: HRESULT = 0x8010000Bu32 as HRESULT;
-pub const SCARD_E_NO_SMARTCARD: HRESULT = 0x8010000Cu32 as HRESULT;
-pub const SCARD_E_UNKNOWN_CARD: HRESULT = 0x8010000Du32 as HRESULT;
-pub const SCARD_E_CANT_DISPOSE: HRESULT = 0x8010000Eu32 as HRESULT;
-pub const SCARD_E_PROTO_MISMATCH: HRESULT = 0x8010000Fu32 as HRESULT;
-pub const SCARD_E_NOT_READY: HRESULT = 0x80100010u32 as HRESULT;
-pub const SCARD_E_INVALID_VALUE: HRESULT = 0x80100011u32 as HRESULT;
-pub const SCARD_E_SYSTEM_CANCELLED: HRESULT = 0x80100012u32 as HRESULT;
-pub const SCARD_F_COMM_ERROR: HRESULT = 0x80100013u32 as HRESULT;
-pub const SCARD_F_UNKNOWN_ERROR: HRESULT = 0x80100014u32 as HRESULT;
-pub const SCARD_E_INVALID_ATR: HRESULT = 0x80100015u32 as HRESULT;
-pub const SCARD_E_NOT_TRANSACTED: HRESULT = 0x80100016u32 as HRESULT;
-pub const SCARD_E_READER_UNAVAILABLE: HRESULT = 0x80100017u32 as HRESULT;
-pub const SCARD_P_SHUTDOWN: HRESULT = 0x80100018u32 as HRESULT;
-pub const SCARD_E_PCI_TOO_SMALL: HRESULT = 0x80100019u32 as HRESULT;
-pub const SCARD_E_READER_UNSUPPORTED: HRESULT = 0x8010001Au32 as HRESULT;
-pub const SCARD_E_DUPLICATE_READER: HRESULT = 0x8010001Bu32 as HRESULT;
-pub const SCARD_E_CARD_UNSUPPORTED: HRESULT = 0x8010001Cu32 as HRESULT;
-pub const SCARD_E_NO_SERVICE: HRESULT = 0x8010001Du32 as HRESULT;
-pub const SCARD_E_SERVICE_STOPPED: HRESULT = 0x8010001Eu32 as HRESULT;
-pub const SCARD_E_UNEXPECTED: HRESULT = 0x8010001Fu32 as HRESULT;
-pub const SCARD_E_ICC_INSTALLATION: HRESULT = 0x80100020u32 as HRESULT;
-pub const SCARD_E_ICC_CREATEORDER: HRESULT = 0x80100021u32 as HRESULT;
-pub const SCARD_E_UNSUPPORTED_FEATURE: HRESULT = 0x80100022u32 as HRESULT;
-pub const SCARD_E_DIR_NOT_FOUND: HRESULT = 0x80100023u32 as HRESULT;
-pub const SCARD_E_FILE_NOT_FOUND: HRESULT = 0x80100024u32 as HRESULT;
-pub const SCARD_E_NO_DIR: HRESULT = 0x80100025u32 as HRESULT;
-pub const SCARD_E_NO_FILE: HRESULT = 0x80100026u32 as HRESULT;
-pub const SCARD_E_NO_ACCESS: HRESULT = 0x80100027u32 as HRESULT;
-pub const SCARD_E_WRITE_TOO_MANY: HRESULT = 0x80100028u32 as HRESULT;
-pub const SCARD_E_BAD_SEEK: HRESULT = 0x80100029u32 as HRESULT;
-pub const SCARD_E_INVALID_CHV: HRESULT = 0x8010002Au32 as HRESULT;
-pub const SCARD_E_UNKNOWN_RES_MNG: HRESULT = 0x8010002Bu32 as HRESULT;
-pub const SCARD_E_NO_SUCH_CERTIFICATE: HRESULT = 0x8010002Cu32 as HRESULT;
-pub const SCARD_E_CERTIFICATE_UNAVAILABLE: HRESULT = 0x8010002Du32 as HRESULT;
-pub const SCARD_E_NO_READERS_AVAILABLE: HRESULT = 0x8010002Eu32 as HRESULT;
-pub const SCARD_E_COMM_DATA_LOST: HRESULT = 0x8010002Fu32 as HRESULT;
-pub const SCARD_E_NO_KEY_CONTAINER: HRESULT = 0x80100030u32 as HRESULT;
-pub const SCARD_E_SERVER_TOO_BUSY: HRESULT = 0x80100031u32 as HRESULT;
-pub const SCARD_E_PIN_CACHE_EXPIRED: HRESULT = 0x80100032u32 as HRESULT;
-pub const SCARD_E_NO_PIN_CACHE: HRESULT = 0x80100033u32 as HRESULT;
-pub const SCARD_E_READ_ONLY_CARD: HRESULT = 0x80100034u32 as HRESULT;
-pub const SCARD_W_UNSUPPORTED_CARD: HRESULT = 0x80100065u32 as HRESULT;
-pub const SCARD_W_UNRESPONSIVE_CARD: HRESULT = 0x80100066u32 as HRESULT;
-pub const SCARD_W_UNPOWERED_CARD: HRESULT = 0x80100067u32 as HRESULT;
-pub const SCARD_W_RESET_CARD: HRESULT = 0x80100068u32 as HRESULT;
-pub const SCARD_W_REMOVED_CARD: HRESULT = 0x80100069u32 as HRESULT;
-pub const SCARD_W_SECURITY_VIOLATION: HRESULT = 0x8010006Au32 as HRESULT;
-pub const SCARD_W_WRONG_CHV: HRESULT = 0x8010006Bu32 as HRESULT;
-pub const SCARD_W_CHV_BLOCKED: HRESULT = 0x8010006Cu32 as HRESULT;
-pub const SCARD_W_EOF: HRESULT = 0x8010006Du32 as HRESULT;
-pub const SCARD_W_CANCELLED_BY_USER: HRESULT = 0x8010006Eu32 as HRESULT;
-pub const SCARD_W_CARD_NOT_AUTHENTICATED: HRESULT = 0x8010006Fu32 as HRESULT;
-pub const SCARD_W_CACHE_ITEM_NOT_FOUND: HRESULT = 0x80100070u32 as HRESULT;
-pub const SCARD_W_CACHE_ITEM_STALE: HRESULT = 0x80100071u32 as HRESULT;
-pub const SCARD_W_CACHE_ITEM_TOO_BIG: HRESULT = 0x80100072u32 as HRESULT;
-pub const COMADMIN_E_OBJECTERRORS: HRESULT = 0x80110401u32 as HRESULT;
-pub const COMADMIN_E_OBJECTINVALID: HRESULT = 0x80110402u32 as HRESULT;
-pub const COMADMIN_E_KEYMISSING: HRESULT = 0x80110403u32 as HRESULT;
-pub const COMADMIN_E_ALREADYINSTALLED: HRESULT = 0x80110404u32 as HRESULT;
-pub const COMADMIN_E_APP_FILE_WRITEFAIL: HRESULT = 0x80110407u32 as HRESULT;
-pub const COMADMIN_E_APP_FILE_READFAIL: HRESULT = 0x80110408u32 as HRESULT;
-pub const COMADMIN_E_APP_FILE_VERSION: HRESULT = 0x80110409u32 as HRESULT;
-pub const COMADMIN_E_BADPATH: HRESULT = 0x8011040Au32 as HRESULT;
-pub const COMADMIN_E_APPLICATIONEXISTS: HRESULT = 0x8011040Bu32 as HRESULT;
-pub const COMADMIN_E_ROLEEXISTS: HRESULT = 0x8011040Cu32 as HRESULT;
-pub const COMADMIN_E_CANTCOPYFILE: HRESULT = 0x8011040Du32 as HRESULT;
-pub const COMADMIN_E_NOUSER: HRESULT = 0x8011040Fu32 as HRESULT;
-pub const COMADMIN_E_INVALIDUSERIDS: HRESULT = 0x80110410u32 as HRESULT;
-pub const COMADMIN_E_NOREGISTRYCLSID: HRESULT = 0x80110411u32 as HRESULT;
-pub const COMADMIN_E_BADREGISTRYPROGID: HRESULT = 0x80110412u32 as HRESULT;
-pub const COMADMIN_E_AUTHENTICATIONLEVEL: HRESULT = 0x80110413u32 as HRESULT;
-pub const COMADMIN_E_USERPASSWDNOTVALID: HRESULT = 0x80110414u32 as HRESULT;
-pub const COMADMIN_E_CLSIDORIIDMISMATCH: HRESULT = 0x80110418u32 as HRESULT;
-pub const COMADMIN_E_REMOTEINTERFACE: HRESULT = 0x80110419u32 as HRESULT;
-pub const COMADMIN_E_DLLREGISTERSERVER: HRESULT = 0x8011041Au32 as HRESULT;
-pub const COMADMIN_E_NOSERVERSHARE: HRESULT = 0x8011041Bu32 as HRESULT;
-pub const COMADMIN_E_DLLLOADFAILED: HRESULT = 0x8011041Du32 as HRESULT;
-pub const COMADMIN_E_BADREGISTRYLIBID: HRESULT = 0x8011041Eu32 as HRESULT;
-pub const COMADMIN_E_APPDIRNOTFOUND: HRESULT = 0x8011041Fu32 as HRESULT;
-pub const COMADMIN_E_REGISTRARFAILED: HRESULT = 0x80110423u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_DOESNOTEXIST: HRESULT = 0x80110424u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_LOADDLLFAIL: HRESULT = 0x80110425u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_GETCLASSOBJ: HRESULT = 0x80110426u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_CLASSNOTAVAIL: HRESULT = 0x80110427u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_BADTLB: HRESULT = 0x80110428u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_NOTINSTALLABLE: HRESULT = 0x80110429u32 as HRESULT;
-pub const COMADMIN_E_NOTCHANGEABLE: HRESULT = 0x8011042Au32 as HRESULT;
-pub const COMADMIN_E_NOTDELETEABLE: HRESULT = 0x8011042Bu32 as HRESULT;
-pub const COMADMIN_E_SESSION: HRESULT = 0x8011042Cu32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_LOCKED: HRESULT = 0x8011042Du32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_BAD_DEST: HRESULT = 0x8011042Eu32 as HRESULT;
-pub const COMADMIN_E_REGISTERTLB: HRESULT = 0x80110430u32 as HRESULT;
-pub const COMADMIN_E_SYSTEMAPP: HRESULT = 0x80110433u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_NOREGISTRAR: HRESULT = 0x80110434u32 as HRESULT;
-pub const COMADMIN_E_COREQCOMPINSTALLED: HRESULT = 0x80110435u32 as HRESULT;
-pub const COMADMIN_E_SERVICENOTINSTALLED: HRESULT = 0x80110436u32 as HRESULT;
-pub const COMADMIN_E_PROPERTYSAVEFAILED: HRESULT = 0x80110437u32 as HRESULT;
-pub const COMADMIN_E_OBJECTEXISTS: HRESULT = 0x80110438u32 as HRESULT;
-pub const COMADMIN_E_COMPONENTEXISTS: HRESULT = 0x80110439u32 as HRESULT;
-pub const COMADMIN_E_REGFILE_CORRUPT: HRESULT = 0x8011043Bu32 as HRESULT;
-pub const COMADMIN_E_PROPERTY_OVERFLOW: HRESULT = 0x8011043Cu32 as HRESULT;
-pub const COMADMIN_E_NOTINREGISTRY: HRESULT = 0x8011043Eu32 as HRESULT;
-pub const COMADMIN_E_OBJECTNOTPOOLABLE: HRESULT = 0x8011043Fu32 as HRESULT;
-pub const COMADMIN_E_APPLID_MATCHES_CLSID: HRESULT = 0x80110446u32 as HRESULT;
-pub const COMADMIN_E_ROLE_DOES_NOT_EXIST: HRESULT = 0x80110447u32 as HRESULT;
-pub const COMADMIN_E_START_APP_NEEDS_COMPONENTS: HRESULT = 0x80110448u32 as HRESULT;
-pub const COMADMIN_E_REQUIRES_DIFFERENT_PLATFORM: HRESULT = 0x80110449u32 as HRESULT;
-pub const COMADMIN_E_CAN_NOT_EXPORT_APP_PROXY: HRESULT = 0x8011044Au32 as HRESULT;
-pub const COMADMIN_E_CAN_NOT_START_APP: HRESULT = 0x8011044Bu32 as HRESULT;
-pub const COMADMIN_E_CAN_NOT_EXPORT_SYS_APP: HRESULT = 0x8011044Cu32 as HRESULT;
-pub const COMADMIN_E_CANT_SUBSCRIBE_TO_COMPONENT: HRESULT = 0x8011044Du32 as HRESULT;
-pub const COMADMIN_E_EVENTCLASS_CANT_BE_SUBSCRIBER: HRESULT = 0x8011044Eu32 as HRESULT;
-pub const COMADMIN_E_LIB_APP_PROXY_INCOMPATIBLE: HRESULT = 0x8011044Fu32 as HRESULT;
-pub const COMADMIN_E_BASE_PARTITION_ONLY: HRESULT = 0x80110450u32 as HRESULT;
-pub const COMADMIN_E_START_APP_DISABLED: HRESULT = 0x80110451u32 as HRESULT;
-pub const COMADMIN_E_CAT_DUPLICATE_PARTITION_NAME: HRESULT = 0x80110457u32 as HRESULT;
-pub const COMADMIN_E_CAT_INVALID_PARTITION_NAME: HRESULT = 0x80110458u32 as HRESULT;
-pub const COMADMIN_E_CAT_PARTITION_IN_USE: HRESULT = 0x80110459u32 as HRESULT;
-pub const COMADMIN_E_FILE_PARTITION_DUPLICATE_FILES: HRESULT = 0x8011045Au32 as HRESULT;
-pub const COMADMIN_E_CAT_IMPORTED_COMPONENTS_NOT_ALLOWED: HRESULT = 0x8011045Bu32 as HRESULT;
-pub const COMADMIN_E_AMBIGUOUS_APPLICATION_NAME: HRESULT = 0x8011045Cu32 as HRESULT;
-pub const COMADMIN_E_AMBIGUOUS_PARTITION_NAME: HRESULT = 0x8011045Du32 as HRESULT;
-pub const COMADMIN_E_REGDB_NOTINITIALIZED: HRESULT = 0x80110472u32 as HRESULT;
-pub const COMADMIN_E_REGDB_NOTOPEN: HRESULT = 0x80110473u32 as HRESULT;
-pub const COMADMIN_E_REGDB_SYSTEMERR: HRESULT = 0x80110474u32 as HRESULT;
-pub const COMADMIN_E_REGDB_ALREADYRUNNING: HRESULT = 0x80110475u32 as HRESULT;
-pub const COMADMIN_E_MIG_VERSIONNOTSUPPORTED: HRESULT = 0x80110480u32 as HRESULT;
-pub const COMADMIN_E_MIG_SCHEMANOTFOUND: HRESULT = 0x80110481u32 as HRESULT;
-pub const COMADMIN_E_CAT_BITNESSMISMATCH: HRESULT = 0x80110482u32 as HRESULT;
-pub const COMADMIN_E_CAT_UNACCEPTABLEBITNESS: HRESULT = 0x80110483u32 as HRESULT;
-pub const COMADMIN_E_CAT_WRONGAPPBITNESS: HRESULT = 0x80110484u32 as HRESULT;
-pub const COMADMIN_E_CAT_PAUSE_RESUME_NOT_SUPPORTED: HRESULT = 0x80110485u32 as HRESULT;
-pub const COMADMIN_E_CAT_SERVERFAULT: HRESULT = 0x80110486u32 as HRESULT;
-pub const COMQC_E_APPLICATION_NOT_QUEUED: HRESULT = 0x80110600u32 as HRESULT;
-pub const COMQC_E_NO_QUEUEABLE_INTERFACES: HRESULT = 0x80110601u32 as HRESULT;
-pub const COMQC_E_QUEUING_SERVICE_NOT_AVAILABLE: HRESULT = 0x80110602u32 as HRESULT;
-pub const COMQC_E_NO_IPERSISTSTREAM: HRESULT = 0x80110603u32 as HRESULT;
-pub const COMQC_E_BAD_MESSAGE: HRESULT = 0x80110604u32 as HRESULT;
-pub const COMQC_E_UNAUTHENTICATED: HRESULT = 0x80110605u32 as HRESULT;
-pub const COMQC_E_UNTRUSTED_ENQUEUER: HRESULT = 0x80110606u32 as HRESULT;
-pub const MSDTC_E_DUPLICATE_RESOURCE: HRESULT = 0x80110701u32 as HRESULT;
-pub const COMADMIN_E_OBJECT_PARENT_MISSING: HRESULT = 0x80110808u32 as HRESULT;
-pub const COMADMIN_E_OBJECT_DOES_NOT_EXIST: HRESULT = 0x80110809u32 as HRESULT;
-pub const COMADMIN_E_APP_NOT_RUNNING: HRESULT = 0x8011080Au32 as HRESULT;
-pub const COMADMIN_E_INVALID_PARTITION: HRESULT = 0x8011080Bu32 as HRESULT;
-pub const COMADMIN_E_SVCAPP_NOT_POOLABLE_OR_RECYCLABLE: HRESULT = 0x8011080Du32 as HRESULT;
-pub const COMADMIN_E_USER_IN_SET: HRESULT = 0x8011080Eu32 as HRESULT;
-pub const COMADMIN_E_CANTRECYCLELIBRARYAPPS: HRESULT = 0x8011080Fu32 as HRESULT;
-pub const COMADMIN_E_CANTRECYCLESERVICEAPPS: HRESULT = 0x80110811u32 as HRESULT;
-pub const COMADMIN_E_PROCESSALREADYRECYCLED: HRESULT = 0x80110812u32 as HRESULT;
-pub const COMADMIN_E_PAUSEDPROCESSMAYNOTBERECYCLED: HRESULT = 0x80110813u32 as HRESULT;
-pub const COMADMIN_E_CANTMAKEINPROCSERVICE: HRESULT = 0x80110814u32 as HRESULT;
-pub const COMADMIN_E_PROGIDINUSEBYCLSID: HRESULT = 0x80110815u32 as HRESULT;
-pub const COMADMIN_E_DEFAULT_PARTITION_NOT_IN_SET: HRESULT = 0x80110816u32 as HRESULT;
-pub const COMADMIN_E_RECYCLEDPROCESSMAYNOTBEPAUSED: HRESULT = 0x80110817u32 as HRESULT;
-pub const COMADMIN_E_PARTITION_ACCESSDENIED: HRESULT = 0x80110818u32 as HRESULT;
-pub const COMADMIN_E_PARTITION_MSI_ONLY: HRESULT = 0x80110819u32 as HRESULT;
-pub const COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_1_0_FORMAT: HRESULT = 0x8011081Au32 as HRESULT;
-pub const COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_NONBASE_PARTITIONS: HRESULT = 0x8011081Bu32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_SOURCE: HRESULT = 0x8011081Cu32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_DEST: HRESULT = 0x8011081Du32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_PRIVATE: HRESULT = 0x8011081Eu32 as HRESULT;
-pub const COMADMIN_E_BASEPARTITION_REQUIRED_IN_SET: HRESULT = 0x8011081Fu32 as HRESULT;
-pub const COMADMIN_E_CANNOT_ALIAS_EVENTCLASS: HRESULT = 0x80110820u32 as HRESULT;
-pub const COMADMIN_E_PRIVATE_ACCESSDENIED: HRESULT = 0x80110821u32 as HRESULT;
-pub const COMADMIN_E_SAFERINVALID: HRESULT = 0x80110822u32 as HRESULT;
-pub const COMADMIN_E_REGISTRY_ACCESSDENIED: HRESULT = 0x80110823u32 as HRESULT;
-pub const COMADMIN_E_PARTITIONS_DISABLED: HRESULT = 0x80110824u32 as HRESULT;
-pub const WER_S_REPORT_DEBUG: HRESULT = 0x001B0000;
-pub const WER_S_REPORT_UPLOADED: HRESULT = 0x001B0001;
-pub const WER_S_REPORT_QUEUED: HRESULT = 0x001B0002;
-pub const WER_S_DISABLED: HRESULT = 0x001B0003;
-pub const WER_S_SUSPENDED_UPLOAD: HRESULT = 0x001B0004;
-pub const WER_S_DISABLED_QUEUE: HRESULT = 0x001B0005;
-pub const WER_S_DISABLED_ARCHIVE: HRESULT = 0x001B0006;
-pub const WER_S_REPORT_ASYNC: HRESULT = 0x001B0007;
-pub const WER_S_IGNORE_ASSERT_INSTANCE: HRESULT = 0x001B0008;
-pub const WER_S_IGNORE_ALL_ASSERTS: HRESULT = 0x001B0009;
-pub const WER_S_ASSERT_CONTINUE: HRESULT = 0x001B000A;
-pub const WER_S_THROTTLED: HRESULT = 0x001B000B;
-pub const WER_E_CRASH_FAILURE: HRESULT = 0x801B8000u32 as HRESULT;
-pub const WER_E_CANCELED: HRESULT = 0x801B8001u32 as HRESULT;
-pub const WER_E_NETWORK_FAILURE: HRESULT = 0x801B8002u32 as HRESULT;
-pub const WER_E_NOT_INITIALIZED: HRESULT = 0x801B8003u32 as HRESULT;
-pub const WER_E_ALREADY_REPORTING: HRESULT = 0x801B8004u32 as HRESULT;
-pub const WER_E_DUMP_THROTTLED: HRESULT = 0x801B8005u32 as HRESULT;
-pub const ERROR_FLT_IO_COMPLETE: HRESULT = 0x001F0001;
-pub const ERROR_FLT_NO_HANDLER_DEFINED: HRESULT = 0x801F0001u32 as HRESULT;
-pub const ERROR_FLT_CONTEXT_ALREADY_DEFINED: HRESULT = 0x801F0002u32 as HRESULT;
-pub const ERROR_FLT_INVALID_ASYNCHRONOUS_REQUEST: HRESULT = 0x801F0003u32 as HRESULT;
-pub const ERROR_FLT_DISALLOW_FAST_IO: HRESULT = 0x801F0004u32 as HRESULT;
-pub const ERROR_FLT_INVALID_NAME_REQUEST: HRESULT = 0x801F0005u32 as HRESULT;
-pub const ERROR_FLT_NOT_SAFE_TO_POST_OPERATION: HRESULT = 0x801F0006u32 as HRESULT;
-pub const ERROR_FLT_NOT_INITIALIZED: HRESULT = 0x801F0007u32 as HRESULT;
-pub const ERROR_FLT_FILTER_NOT_READY: HRESULT = 0x801F0008u32 as HRESULT;
-pub const ERROR_FLT_POST_OPERATION_CLEANUP: HRESULT = 0x801F0009u32 as HRESULT;
-pub const ERROR_FLT_INTERNAL_ERROR: HRESULT = 0x801F000Au32 as HRESULT;
-pub const ERROR_FLT_DELETING_OBJECT: HRESULT = 0x801F000Bu32 as HRESULT;
-pub const ERROR_FLT_MUST_BE_NONPAGED_POOL: HRESULT = 0x801F000Cu32 as HRESULT;
-pub const ERROR_FLT_DUPLICATE_ENTRY: HRESULT = 0x801F000Du32 as HRESULT;
-pub const ERROR_FLT_CBDQ_DISABLED: HRESULT = 0x801F000Eu32 as HRESULT;
-pub const ERROR_FLT_DO_NOT_ATTACH: HRESULT = 0x801F000Fu32 as HRESULT;
-pub const ERROR_FLT_DO_NOT_DETACH: HRESULT = 0x801F0010u32 as HRESULT;
-pub const ERROR_FLT_INSTANCE_ALTITUDE_COLLISION: HRESULT = 0x801F0011u32 as HRESULT;
-pub const ERROR_FLT_INSTANCE_NAME_COLLISION: HRESULT = 0x801F0012u32 as HRESULT;
-pub const ERROR_FLT_FILTER_NOT_FOUND: HRESULT = 0x801F0013u32 as HRESULT;
-pub const ERROR_FLT_VOLUME_NOT_FOUND: HRESULT = 0x801F0014u32 as HRESULT;
-pub const ERROR_FLT_INSTANCE_NOT_FOUND: HRESULT = 0x801F0015u32 as HRESULT;
-pub const ERROR_FLT_CONTEXT_ALLOCATION_NOT_FOUND: HRESULT = 0x801F0016u32 as HRESULT;
-pub const ERROR_FLT_INVALID_CONTEXT_REGISTRATION: HRESULT = 0x801F0017u32 as HRESULT;
-pub const ERROR_FLT_NAME_CACHE_MISS: HRESULT = 0x801F0018u32 as HRESULT;
-pub const ERROR_FLT_NO_DEVICE_OBJECT: HRESULT = 0x801F0019u32 as HRESULT;
-pub const ERROR_FLT_VOLUME_ALREADY_MOUNTED: HRESULT = 0x801F001Au32 as HRESULT;
-pub const ERROR_FLT_ALREADY_ENLISTED: HRESULT = 0x801F001Bu32 as HRESULT;
-pub const ERROR_FLT_CONTEXT_ALREADY_LINKED: HRESULT = 0x801F001Cu32 as HRESULT;
-pub const ERROR_FLT_NO_WAITER_FOR_REPLY: HRESULT = 0x801F0020u32 as HRESULT;
-pub const ERROR_FLT_REGISTRATION_BUSY: HRESULT = 0x801F0023u32 as HRESULT;
-pub const ERROR_HUNG_DISPLAY_DRIVER_THREAD: HRESULT = 0x80260001u32 as HRESULT;
-pub const DWM_E_COMPOSITIONDISABLED: HRESULT = 0x80263001u32 as HRESULT;
-pub const DWM_E_REMOTING_NOT_SUPPORTED: HRESULT = 0x80263002u32 as HRESULT;
-pub const DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE: HRESULT = 0x80263003u32 as HRESULT;
-pub const DWM_E_NOT_QUEUING_PRESENTS: HRESULT = 0x80263004u32 as HRESULT;
-pub const DWM_E_ADAPTER_NOT_FOUND: HRESULT = 0x80263005u32 as HRESULT;
-pub const DWM_S_GDI_REDIRECTION_SURFACE: HRESULT = 0x00263005;
-pub const DWM_E_TEXTURE_TOO_LARGE: HRESULT = 0x80263007u32 as HRESULT;
-pub const ERROR_MONITOR_NO_DESCRIPTOR: HRESULT = 0x80261001u32 as HRESULT;
-pub const ERROR_MONITOR_UNKNOWN_DESCRIPTOR_FORMAT: HRESULT = 0x80261002u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_DESCRIPTOR_CHECKSUM: HRESULT = 0xC0261003u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_STANDARD_TIMING_BLOCK: HRESULT = 0xC0261004u32 as HRESULT;
-pub const ERROR_MONITOR_WMI_DATABLOCK_REGISTRATION_FAILED: HRESULT = 0xC0261005u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_SERIAL_NUMBER_MONDSC_BLOCK: HRESULT = 0xC0261006u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_USER_FRIENDLY_MONDSC_BLOCK: HRESULT = 0xC0261007u32 as HRESULT;
-pub const ERROR_MONITOR_NO_MORE_DESCRIPTOR_DATA: HRESULT = 0xC0261008u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_DETAILED_TIMING_BLOCK: HRESULT = 0xC0261009u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_MANUFACTURE_DATE: HRESULT = 0xC026100Au32 as HRESULT;
-pub const ERROR_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER: HRESULT = 0xC0262000u32 as HRESULT;
-pub const ERROR_GRAPHICS_INSUFFICIENT_DMA_BUFFER: HRESULT = 0xC0262001u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_DISPLAY_ADAPTER: HRESULT = 0xC0262002u32 as HRESULT;
-pub const ERROR_GRAPHICS_ADAPTER_WAS_RESET: HRESULT = 0xC0262003u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_DRIVER_MODEL: HRESULT = 0xC0262004u32 as HRESULT;
-pub const ERROR_GRAPHICS_PRESENT_MODE_CHANGED: HRESULT = 0xC0262005u32 as HRESULT;
-pub const ERROR_GRAPHICS_PRESENT_OCCLUDED: HRESULT = 0xC0262006u32 as HRESULT;
-pub const ERROR_GRAPHICS_PRESENT_DENIED: HRESULT = 0xC0262007u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANNOTCOLORCONVERT: HRESULT = 0xC0262008u32 as HRESULT;
-pub const ERROR_GRAPHICS_DRIVER_MISMATCH: HRESULT = 0xC0262009u32 as HRESULT;
-pub const ERROR_GRAPHICS_PARTIAL_DATA_POPULATED: HRESULT = 0x4026200A;
-pub const ERROR_GRAPHICS_PRESENT_REDIRECTION_DISABLED: HRESULT = 0xC026200Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_PRESENT_UNOCCLUDED: HRESULT = 0xC026200Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_WINDOWDC_NOT_AVAILABLE: HRESULT = 0xC026200Du32 as HRESULT;
-pub const ERROR_GRAPHICS_WINDOWLESS_PRESENT_DISABLED: HRESULT = 0xC026200Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_VIDEO_MEMORY: HRESULT = 0xC0262100u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANT_LOCK_MEMORY: HRESULT = 0xC0262101u32 as HRESULT;
-pub const ERROR_GRAPHICS_ALLOCATION_BUSY: HRESULT = 0xC0262102u32 as HRESULT;
-pub const ERROR_GRAPHICS_TOO_MANY_REFERENCES: HRESULT = 0xC0262103u32 as HRESULT;
-pub const ERROR_GRAPHICS_TRY_AGAIN_LATER: HRESULT = 0xC0262104u32 as HRESULT;
-pub const ERROR_GRAPHICS_TRY_AGAIN_NOW: HRESULT = 0xC0262105u32 as HRESULT;
-pub const ERROR_GRAPHICS_ALLOCATION_INVALID: HRESULT = 0xC0262106u32 as HRESULT;
-pub const ERROR_GRAPHICS_UNSWIZZLING_APERTURE_UNAVAILABLE: HRESULT = 0xC0262107u32 as HRESULT;
-pub const ERROR_GRAPHICS_UNSWIZZLING_APERTURE_UNSUPPORTED: HRESULT = 0xC0262108u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANT_EVICT_PINNED_ALLOCATION: HRESULT = 0xC0262109u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_ALLOCATION_USAGE: HRESULT = 0xC0262110u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANT_RENDER_LOCKED_ALLOCATION: HRESULT = 0xC0262111u32 as HRESULT;
-pub const ERROR_GRAPHICS_ALLOCATION_CLOSED: HRESULT = 0xC0262112u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_ALLOCATION_INSTANCE: HRESULT = 0xC0262113u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_ALLOCATION_HANDLE: HRESULT = 0xC0262114u32 as HRESULT;
-pub const ERROR_GRAPHICS_WRONG_ALLOCATION_DEVICE: HRESULT = 0xC0262115u32 as HRESULT;
-pub const ERROR_GRAPHICS_ALLOCATION_CONTENT_LOST: HRESULT = 0xC0262116u32 as HRESULT;
-pub const ERROR_GRAPHICS_GPU_EXCEPTION_ON_DEVICE: HRESULT = 0xC0262200u32 as HRESULT;
-pub const ERROR_GRAPHICS_SKIP_ALLOCATION_PREPARATION: HRESULT = 0x40262201;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_TOPOLOGY: HRESULT = 0xC0262300u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDPN_TOPOLOGY_NOT_SUPPORTED: HRESULT = 0xC0262301u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDPN_TOPOLOGY_CURRENTLY_NOT_SUPPORTED: HRESULT = 0xC0262302u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDPN: HRESULT = 0xC0262303u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE: HRESULT = 0xC0262304u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET: HRESULT = 0xC0262305u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDPN_MODALITY_NOT_SUPPORTED: HRESULT = 0xC0262306u32 as HRESULT;
-pub const ERROR_GRAPHICS_MODE_NOT_PINNED: HRESULT = 0x00262307;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_SOURCEMODESET: HRESULT = 0xC0262308u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_TARGETMODESET: HRESULT = 0xC0262309u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_FREQUENCY: HRESULT = 0xC026230Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_ACTIVE_REGION: HRESULT = 0xC026230Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_TOTAL_REGION: HRESULT = 0xC026230Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE_MODE: HRESULT = 0xC0262310u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET_MODE: HRESULT = 0xC0262311u32 as HRESULT;
-pub const ERROR_GRAPHICS_PINNED_MODE_MUST_REMAIN_IN_SET: HRESULT = 0xC0262312u32 as HRESULT;
-pub const ERROR_GRAPHICS_PATH_ALREADY_IN_TOPOLOGY: HRESULT = 0xC0262313u32 as HRESULT;
-pub const ERROR_GRAPHICS_MODE_ALREADY_IN_MODESET: HRESULT = 0xC0262314u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEOPRESENTSOURCESET: HRESULT = 0xC0262315u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEOPRESENTTARGETSET: HRESULT = 0xC0262316u32 as HRESULT;
-pub const ERROR_GRAPHICS_SOURCE_ALREADY_IN_SET: HRESULT = 0xC0262317u32 as HRESULT;
-pub const ERROR_GRAPHICS_TARGET_ALREADY_IN_SET: HRESULT = 0xC0262318u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_PRESENT_PATH: HRESULT = 0xC0262319u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_RECOMMENDED_VIDPN_TOPOLOGY: HRESULT = 0xC026231Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGESET: HRESULT = 0xC026231Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE: HRESULT = 0xC026231Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_FREQUENCYRANGE_NOT_IN_SET: HRESULT = 0xC026231Du32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_PREFERRED_MODE: HRESULT = 0x0026231E;
-pub const ERROR_GRAPHICS_FREQUENCYRANGE_ALREADY_IN_SET: HRESULT = 0xC026231Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_STALE_MODESET: HRESULT = 0xC0262320u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_SOURCEMODESET: HRESULT = 0xC0262321u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_SOURCE_MODE: HRESULT = 0xC0262322u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_RECOMMENDED_FUNCTIONAL_VIDPN: HRESULT = 0xC0262323u32 as HRESULT;
-pub const ERROR_GRAPHICS_MODE_ID_MUST_BE_UNIQUE: HRESULT = 0xC0262324u32 as HRESULT;
-pub const ERROR_GRAPHICS_EMPTY_ADAPTER_MONITOR_MODE_SUPPORT_INTERSECTION: HRESULT = 0xC0262325u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDEO_PRESENT_TARGETS_LESS_THAN_SOURCES: HRESULT = 0xC0262326u32 as HRESULT;
-pub const ERROR_GRAPHICS_PATH_NOT_IN_TOPOLOGY: HRESULT = 0xC0262327u32 as HRESULT;
-pub const ERROR_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_SOURCE: HRESULT = 0xC0262328u32 as HRESULT;
-pub const ERROR_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_TARGET: HRESULT = 0xC0262329u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITORDESCRIPTORSET: HRESULT = 0xC026232Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITORDESCRIPTOR: HRESULT = 0xC026232Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITORDESCRIPTOR_NOT_IN_SET: HRESULT = 0xC026232Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITORDESCRIPTOR_ALREADY_IN_SET: HRESULT = 0xC026232Du32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITORDESCRIPTOR_ID_MUST_BE_UNIQUE: HRESULT = 0xC026232Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_TARGET_SUBSET_TYPE: HRESULT = 0xC026232Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_RESOURCES_NOT_RELATED: HRESULT = 0xC0262330u32 as HRESULT;
-pub const ERROR_GRAPHICS_SOURCE_ID_MUST_BE_UNIQUE: HRESULT = 0xC0262331u32 as HRESULT;
-pub const ERROR_GRAPHICS_TARGET_ID_MUST_BE_UNIQUE: HRESULT = 0xC0262332u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_AVAILABLE_VIDPN_TARGET: HRESULT = 0xC0262333u32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITOR_COULD_NOT_BE_ASSOCIATED_WITH_ADAPTER: HRESULT = 0xC0262334u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_VIDPNMGR: HRESULT = 0xC0262335u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_ACTIVE_VIDPN: HRESULT = 0xC0262336u32 as HRESULT;
-pub const ERROR_GRAPHICS_STALE_VIDPN_TOPOLOGY: HRESULT = 0xC0262337u32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITOR_NOT_CONNECTED: HRESULT = 0xC0262338u32 as HRESULT;
-pub const ERROR_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY: HRESULT = 0xC0262339u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PRIMARYSURFACE_SIZE: HRESULT = 0xC026233Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VISIBLEREGION_SIZE: HRESULT = 0xC026233Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_STRIDE: HRESULT = 0xC026233Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PIXELFORMAT: HRESULT = 0xC026233Du32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_COLORBASIS: HRESULT = 0xC026233Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PIXELVALUEACCESSMODE: HRESULT = 0xC026233Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_TARGET_NOT_IN_TOPOLOGY: HRESULT = 0xC0262340u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_DISPLAY_MODE_MANAGEMENT_SUPPORT: HRESULT = 0xC0262341u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE: HRESULT = 0xC0262342u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANT_ACCESS_ACTIVE_VIDPN: HRESULT = 0xC0262343u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PATH_IMPORTANCE_ORDINAL: HRESULT = 0xC0262344u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PATH_CONTENT_GEOMETRY_TRANSFORMATION: HRESULT = 0xC0262345u32 as HRESULT;
-pub const ERROR_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_SUPPORTED: HRESULT = 0xC0262346u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_GAMMA_RAMP: HRESULT = 0xC0262347u32 as HRESULT;
-pub const ERROR_GRAPHICS_GAMMA_RAMP_NOT_SUPPORTED: HRESULT = 0xC0262348u32 as HRESULT;
-pub const ERROR_GRAPHICS_MULTISAMPLING_NOT_SUPPORTED: HRESULT = 0xC0262349u32 as HRESULT;
-pub const ERROR_GRAPHICS_MODE_NOT_IN_MODESET: HRESULT = 0xC026234Au32 as HRESULT;
-pub const ERROR_GRAPHICS_DATASET_IS_EMPTY: HRESULT = 0x0026234B;
-pub const ERROR_GRAPHICS_NO_MORE_ELEMENTS_IN_DATASET: HRESULT = 0x0026234C;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_TOPOLOGY_RECOMMENDATION_REASON: HRESULT = 0xC026234Du32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PATH_CONTENT_TYPE: HRESULT = 0xC026234Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_COPYPROTECTION_TYPE: HRESULT = 0xC026234Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_UNASSIGNED_MODESET_ALREADY_EXISTS: HRESULT = 0xC0262350u32 as HRESULT;
-pub const ERROR_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_PINNED: HRESULT = 0x00262351;
-pub const ERROR_GRAPHICS_INVALID_SCANLINE_ORDERING: HRESULT = 0xC0262352u32 as HRESULT;
-pub const ERROR_GRAPHICS_TOPOLOGY_CHANGES_NOT_ALLOWED: HRESULT = 0xC0262353u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_AVAILABLE_IMPORTANCE_ORDINALS: HRESULT = 0xC0262354u32 as HRESULT;
-pub const ERROR_GRAPHICS_INCOMPATIBLE_PRIVATE_FORMAT: HRESULT = 0xC0262355u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MODE_PRUNING_ALGORITHM: HRESULT = 0xC0262356u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_CAPABILITY_ORIGIN: HRESULT = 0xC0262357u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE_CONSTRAINT: HRESULT = 0xC0262358u32 as HRESULT;
-pub const ERROR_GRAPHICS_MAX_NUM_PATHS_REACHED: HRESULT = 0xC0262359u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANCEL_VIDPN_TOPOLOGY_AUGMENTATION: HRESULT = 0xC026235Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_CLIENT_TYPE: HRESULT = 0xC026235Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_CLIENTVIDPN_NOT_SET: HRESULT = 0xC026235Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_SPECIFIED_CHILD_ALREADY_CONNECTED: HRESULT = 0xC0262400u32 as HRESULT;
-pub const ERROR_GRAPHICS_CHILD_DESCRIPTOR_NOT_SUPPORTED: HRESULT = 0xC0262401u32 as HRESULT;
-pub const ERROR_GRAPHICS_UNKNOWN_CHILD_STATUS: HRESULT = 0x4026242F;
-pub const ERROR_GRAPHICS_NOT_A_LINKED_ADAPTER: HRESULT = 0xC0262430u32 as HRESULT;
-pub const ERROR_GRAPHICS_LEADLINK_NOT_ENUMERATED: HRESULT = 0xC0262431u32 as HRESULT;
-pub const ERROR_GRAPHICS_CHAINLINKS_NOT_ENUMERATED: HRESULT = 0xC0262432u32 as HRESULT;
-pub const ERROR_GRAPHICS_ADAPTER_CHAIN_NOT_READY: HRESULT = 0xC0262433u32 as HRESULT;
-pub const ERROR_GRAPHICS_CHAINLINKS_NOT_STARTED: HRESULT = 0xC0262434u32 as HRESULT;
-pub const ERROR_GRAPHICS_CHAINLINKS_NOT_POWERED_ON: HRESULT = 0xC0262435u32 as HRESULT;
-pub const ERROR_GRAPHICS_INCONSISTENT_DEVICE_LINK_STATE: HRESULT = 0xC0262436u32 as HRESULT;
-pub const ERROR_GRAPHICS_LEADLINK_START_DEFERRED: HRESULT = 0x40262437;
-pub const ERROR_GRAPHICS_NOT_POST_DEVICE_DRIVER: HRESULT = 0xC0262438u32 as HRESULT;
-pub const ERROR_GRAPHICS_POLLING_TOO_FREQUENTLY: HRESULT = 0x40262439;
-pub const ERROR_GRAPHICS_START_DEFERRED: HRESULT = 0x4026243A;
-pub const ERROR_GRAPHICS_ADAPTER_ACCESS_NOT_EXCLUDED: HRESULT = 0xC026243Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_NOT_SUPPORTED: HRESULT = 0xC0262500u32 as HRESULT;
-pub const ERROR_GRAPHICS_COPP_NOT_SUPPORTED: HRESULT = 0xC0262501u32 as HRESULT;
-pub const ERROR_GRAPHICS_UAB_NOT_SUPPORTED: HRESULT = 0xC0262502u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_ENCRYPTED_PARAMETERS: HRESULT = 0xC0262503u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_NO_VIDEO_OUTPUTS_EXIST: HRESULT = 0xC0262505u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INTERNAL_ERROR: HRESULT = 0xC026250Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_HANDLE: HRESULT = 0xC026250Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_PVP_INVALID_CERTIFICATE_LENGTH: HRESULT = 0xC026250Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_SPANNING_MODE_ENABLED: HRESULT = 0xC026250Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_THEATER_MODE_ENABLED: HRESULT = 0xC0262510u32 as HRESULT;
-pub const ERROR_GRAPHICS_PVP_HFS_FAILED: HRESULT = 0xC0262511u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_SRM: HRESULT = 0xC0262512u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_HDCP: HRESULT = 0xC0262513u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_ACP: HRESULT = 0xC0262514u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_CGMSA: HRESULT = 0xC0262515u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_HDCP_SRM_NEVER_SET: HRESULT = 0xC0262516u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_RESOLUTION_TOO_HIGH: HRESULT = 0xC0262517u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_ALL_HDCP_HARDWARE_ALREADY_IN_USE: HRESULT = 0xC0262518u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_NO_LONGER_EXISTS: HRESULT = 0xC026251Au32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_SESSION_TYPE_CHANGE_IN_PROGRESS: HRESULT = 0xC026251Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_DOES_NOT_HAVE_COPP_SEMANTICS: HRESULT = 0xC026251Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_INFORMATION_REQUEST: HRESULT = 0xC026251Du32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_DRIVER_INTERNAL_ERROR: HRESULT = 0xC026251Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_DOES_NOT_HAVE_OPM_SEMANTICS: HRESULT = 0xC026251Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_SIGNALING_NOT_SUPPORTED: HRESULT = 0xC0262520u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_CONFIGURATION_REQUEST: HRESULT = 0xC0262521u32 as HRESULT;
-pub const ERROR_GRAPHICS_I2C_NOT_SUPPORTED: HRESULT = 0xC0262580u32 as HRESULT;
-pub const ERROR_GRAPHICS_I2C_DEVICE_DOES_NOT_EXIST: HRESULT = 0xC0262581u32 as HRESULT;
-pub const ERROR_GRAPHICS_I2C_ERROR_TRANSMITTING_DATA: HRESULT = 0xC0262582u32 as HRESULT;
-pub const ERROR_GRAPHICS_I2C_ERROR_RECEIVING_DATA: HRESULT = 0xC0262583u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED: HRESULT = 0xC0262584u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_INVALID_DATA: HRESULT = 0xC0262585u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_MONITOR_RETURNED_INVALID_TIMING_STATUS_BYTE: HRESULT = 0xC0262586u32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_INVALID_CAPABILITIES_STRING: HRESULT = 0xC0262587u32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_INTERNAL_ERROR: HRESULT = 0xC0262588u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_COMMAND: HRESULT = 0xC0262589u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_LENGTH: HRESULT = 0xC026258Au32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM: HRESULT = 0xC026258Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PHYSICAL_MONITOR_HANDLE: HRESULT = 0xC026258Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITOR_NO_LONGER_EXISTS: HRESULT = 0xC026258Du32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_CURRENT_CURRENT_VALUE_GREATER_THAN_MAXIMUM_VALUE: HRESULT = 0xC02625D8u32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_INVALID_VCP_VERSION: HRESULT = 0xC02625D9u32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION: HRESULT = 0xC02625DAu32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_MCCS_VERSION_MISMATCH: HRESULT = 0xC02625DBu32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_UNSUPPORTED_MCCS_VERSION: HRESULT = 0xC02625DCu32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED: HRESULT = 0xC02625DEu32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_UNSUPPORTED_COLOR_TEMPERATURE: HRESULT = 0xC02625DFu32 as HRESULT;
-pub const ERROR_GRAPHICS_ONLY_CONSOLE_SESSION_SUPPORTED: HRESULT = 0xC02625E0u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_DISPLAY_DEVICE_CORRESPONDS_TO_NAME: HRESULT = 0xC02625E1u32 as HRESULT;
-pub const ERROR_GRAPHICS_DISPLAY_DEVICE_NOT_ATTACHED_TO_DESKTOP: HRESULT = 0xC02625E2u32 as HRESULT;
-pub const ERROR_GRAPHICS_MIRRORING_DEVICES_NOT_SUPPORTED: HRESULT = 0xC02625E3u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_POINTER: HRESULT = 0xC02625E4u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_MONITORS_CORRESPOND_TO_DISPLAY_DEVICE: HRESULT = 0xC02625E5u32 as HRESULT;
-pub const ERROR_GRAPHICS_PARAMETER_ARRAY_TOO_SMALL: HRESULT = 0xC02625E6u32 as HRESULT;
-pub const ERROR_GRAPHICS_INTERNAL_ERROR: HRESULT = 0xC02625E7u32 as HRESULT;
-pub const ERROR_GRAPHICS_SESSION_TYPE_CHANGE_IN_PROGRESS: HRESULT = 0xC02605E8u32 as HRESULT;
-pub const NAP_E_INVALID_PACKET: HRESULT = 0x80270001u32 as HRESULT;
-pub const NAP_E_MISSING_SOH: HRESULT = 0x80270002u32 as HRESULT;
-pub const NAP_E_CONFLICTING_ID: HRESULT = 0x80270003u32 as HRESULT;
-pub const NAP_E_NO_CACHED_SOH: HRESULT = 0x80270004u32 as HRESULT;
-pub const NAP_E_STILL_BOUND: HRESULT = 0x80270005u32 as HRESULT;
-pub const NAP_E_NOT_REGISTERED: HRESULT = 0x80270006u32 as HRESULT;
-pub const NAP_E_NOT_INITIALIZED: HRESULT = 0x80270007u32 as HRESULT;
-pub const NAP_E_MISMATCHED_ID: HRESULT = 0x80270008u32 as HRESULT;
-pub const NAP_E_NOT_PENDING: HRESULT = 0x80270009u32 as HRESULT;
-pub const NAP_E_ID_NOT_FOUND: HRESULT = 0x8027000Au32 as HRESULT;
-pub const NAP_E_MAXSIZE_TOO_SMALL: HRESULT = 0x8027000Bu32 as HRESULT;
-pub const NAP_E_SERVICE_NOT_RUNNING: HRESULT = 0x8027000Cu32 as HRESULT;
-pub const NAP_S_CERT_ALREADY_PRESENT: HRESULT = 0x0027000D;
-pub const NAP_E_ENTITY_DISABLED: HRESULT = 0x8027000Eu32 as HRESULT;
-pub const NAP_E_NETSH_GROUPPOLICY_ERROR: HRESULT = 0x8027000Fu32 as HRESULT;
-pub const NAP_E_TOO_MANY_CALLS: HRESULT = 0x80270010u32 as HRESULT;
-pub const NAP_E_SHV_CONFIG_EXISTED: HRESULT = 0x80270011u32 as HRESULT;
-pub const NAP_E_SHV_CONFIG_NOT_FOUND: HRESULT = 0x80270012u32 as HRESULT;
-pub const NAP_E_SHV_TIMEOUT: HRESULT = 0x80270013u32 as HRESULT;
-pub const TPM_E_ERROR_MASK: HRESULT = 0x80280000u32 as HRESULT;
-pub const TPM_E_AUTHFAIL: HRESULT = 0x80280001u32 as HRESULT;
-pub const TPM_E_BADINDEX: HRESULT = 0x80280002u32 as HRESULT;
-pub const TPM_E_BAD_PARAMETER: HRESULT = 0x80280003u32 as HRESULT;
-pub const TPM_E_AUDITFAILURE: HRESULT = 0x80280004u32 as HRESULT;
-pub const TPM_E_CLEAR_DISABLED: HRESULT = 0x80280005u32 as HRESULT;
-pub const TPM_E_DEACTIVATED: HRESULT = 0x80280006u32 as HRESULT;
-pub const TPM_E_DISABLED: HRESULT = 0x80280007u32 as HRESULT;
-pub const TPM_E_DISABLED_CMD: HRESULT = 0x80280008u32 as HRESULT;
-pub const TPM_E_FAIL: HRESULT = 0x80280009u32 as HRESULT;
-pub const TPM_E_BAD_ORDINAL: HRESULT = 0x8028000Au32 as HRESULT;
-pub const TPM_E_INSTALL_DISABLED: HRESULT = 0x8028000Bu32 as HRESULT;
-pub const TPM_E_INVALID_KEYHANDLE: HRESULT = 0x8028000Cu32 as HRESULT;
-pub const TPM_E_KEYNOTFOUND: HRESULT = 0x8028000Du32 as HRESULT;
-pub const TPM_E_INAPPROPRIATE_ENC: HRESULT = 0x8028000Eu32 as HRESULT;
-pub const TPM_E_MIGRATEFAIL: HRESULT = 0x8028000Fu32 as HRESULT;
-pub const TPM_E_INVALID_PCR_INFO: HRESULT = 0x80280010u32 as HRESULT;
-pub const TPM_E_NOSPACE: HRESULT = 0x80280011u32 as HRESULT;
-pub const TPM_E_NOSRK: HRESULT = 0x80280012u32 as HRESULT;
-pub const TPM_E_NOTSEALED_BLOB: HRESULT = 0x80280013u32 as HRESULT;
-pub const TPM_E_OWNER_SET: HRESULT = 0x80280014u32 as HRESULT;
-pub const TPM_E_RESOURCES: HRESULT = 0x80280015u32 as HRESULT;
-pub const TPM_E_SHORTRANDOM: HRESULT = 0x80280016u32 as HRESULT;
-pub const TPM_E_SIZE: HRESULT = 0x80280017u32 as HRESULT;
-pub const TPM_E_WRONGPCRVAL: HRESULT = 0x80280018u32 as HRESULT;
-pub const TPM_E_BAD_PARAM_SIZE: HRESULT = 0x80280019u32 as HRESULT;
-pub const TPM_E_SHA_THREAD: HRESULT = 0x8028001Au32 as HRESULT;
-pub const TPM_E_SHA_ERROR: HRESULT = 0x8028001Bu32 as HRESULT;
-pub const TPM_E_FAILEDSELFTEST: HRESULT = 0x8028001Cu32 as HRESULT;
-pub const TPM_E_AUTH2FAIL: HRESULT = 0x8028001Du32 as HRESULT;
-pub const TPM_E_BADTAG: HRESULT = 0x8028001Eu32 as HRESULT;
-pub const TPM_E_IOERROR: HRESULT = 0x8028001Fu32 as HRESULT;
-pub const TPM_E_ENCRYPT_ERROR: HRESULT = 0x80280020u32 as HRESULT;
-pub const TPM_E_DECRYPT_ERROR: HRESULT = 0x80280021u32 as HRESULT;
-pub const TPM_E_INVALID_AUTHHANDLE: HRESULT = 0x80280022u32 as HRESULT;
-pub const TPM_E_NO_ENDORSEMENT: HRESULT = 0x80280023u32 as HRESULT;
-pub const TPM_E_INVALID_KEYUSAGE: HRESULT = 0x80280024u32 as HRESULT;
-pub const TPM_E_WRONG_ENTITYTYPE: HRESULT = 0x80280025u32 as HRESULT;
-pub const TPM_E_INVALID_POSTINIT: HRESULT = 0x80280026u32 as HRESULT;
-pub const TPM_E_INAPPROPRIATE_SIG: HRESULT = 0x80280027u32 as HRESULT;
-pub const TPM_E_BAD_KEY_PROPERTY: HRESULT = 0x80280028u32 as HRESULT;
-pub const TPM_E_BAD_MIGRATION: HRESULT = 0x80280029u32 as HRESULT;
-pub const TPM_E_BAD_SCHEME: HRESULT = 0x8028002Au32 as HRESULT;
-pub const TPM_E_BAD_DATASIZE: HRESULT = 0x8028002Bu32 as HRESULT;
-pub const TPM_E_BAD_MODE: HRESULT = 0x8028002Cu32 as HRESULT;
-pub const TPM_E_BAD_PRESENCE: HRESULT = 0x8028002Du32 as HRESULT;
-pub const TPM_E_BAD_VERSION: HRESULT = 0x8028002Eu32 as HRESULT;
-pub const TPM_E_NO_WRAP_TRANSPORT: HRESULT = 0x8028002Fu32 as HRESULT;
-pub const TPM_E_AUDITFAIL_UNSUCCESSFUL: HRESULT = 0x80280030u32 as HRESULT;
-pub const TPM_E_AUDITFAIL_SUCCESSFUL: HRESULT = 0x80280031u32 as HRESULT;
-pub const TPM_E_NOTRESETABLE: HRESULT = 0x80280032u32 as HRESULT;
-pub const TPM_E_NOTLOCAL: HRESULT = 0x80280033u32 as HRESULT;
-pub const TPM_E_BAD_TYPE: HRESULT = 0x80280034u32 as HRESULT;
-pub const TPM_E_INVALID_RESOURCE: HRESULT = 0x80280035u32 as HRESULT;
-pub const TPM_E_NOTFIPS: HRESULT = 0x80280036u32 as HRESULT;
-pub const TPM_E_INVALID_FAMILY: HRESULT = 0x80280037u32 as HRESULT;
-pub const TPM_E_NO_NV_PERMISSION: HRESULT = 0x80280038u32 as HRESULT;
-pub const TPM_E_REQUIRES_SIGN: HRESULT = 0x80280039u32 as HRESULT;
-pub const TPM_E_KEY_NOTSUPPORTED: HRESULT = 0x8028003Au32 as HRESULT;
-pub const TPM_E_AUTH_CONFLICT: HRESULT = 0x8028003Bu32 as HRESULT;
-pub const TPM_E_AREA_LOCKED: HRESULT = 0x8028003Cu32 as HRESULT;
-pub const TPM_E_BAD_LOCALITY: HRESULT = 0x8028003Du32 as HRESULT;
-pub const TPM_E_READ_ONLY: HRESULT = 0x8028003Eu32 as HRESULT;
-pub const TPM_E_PER_NOWRITE: HRESULT = 0x8028003Fu32 as HRESULT;
-pub const TPM_E_FAMILYCOUNT: HRESULT = 0x80280040u32 as HRESULT;
-pub const TPM_E_WRITE_LOCKED: HRESULT = 0x80280041u32 as HRESULT;
-pub const TPM_E_BAD_ATTRIBUTES: HRESULT = 0x80280042u32 as HRESULT;
-pub const TPM_E_INVALID_STRUCTURE: HRESULT = 0x80280043u32 as HRESULT;
-pub const TPM_E_KEY_OWNER_CONTROL: HRESULT = 0x80280044u32 as HRESULT;
-pub const TPM_E_BAD_COUNTER: HRESULT = 0x80280045u32 as HRESULT;
-pub const TPM_E_NOT_FULLWRITE: HRESULT = 0x80280046u32 as HRESULT;
-pub const TPM_E_CONTEXT_GAP: HRESULT = 0x80280047u32 as HRESULT;
-pub const TPM_E_MAXNVWRITES: HRESULT = 0x80280048u32 as HRESULT;
-pub const TPM_E_NOOPERATOR: HRESULT = 0x80280049u32 as HRESULT;
-pub const TPM_E_RESOURCEMISSING: HRESULT = 0x8028004Au32 as HRESULT;
-pub const TPM_E_DELEGATE_LOCK: HRESULT = 0x8028004Bu32 as HRESULT;
-pub const TPM_E_DELEGATE_FAMILY: HRESULT = 0x8028004Cu32 as HRESULT;
-pub const TPM_E_DELEGATE_ADMIN: HRESULT = 0x8028004Du32 as HRESULT;
-pub const TPM_E_TRANSPORT_NOTEXCLUSIVE: HRESULT = 0x8028004Eu32 as HRESULT;
-pub const TPM_E_OWNER_CONTROL: HRESULT = 0x8028004Fu32 as HRESULT;
-pub const TPM_E_DAA_RESOURCES: HRESULT = 0x80280050u32 as HRESULT;
-pub const TPM_E_DAA_INPUT_DATA0: HRESULT = 0x80280051u32 as HRESULT;
-pub const TPM_E_DAA_INPUT_DATA1: HRESULT = 0x80280052u32 as HRESULT;
-pub const TPM_E_DAA_ISSUER_SETTINGS: HRESULT = 0x80280053u32 as HRESULT;
-pub const TPM_E_DAA_TPM_SETTINGS: HRESULT = 0x80280054u32 as HRESULT;
-pub const TPM_E_DAA_STAGE: HRESULT = 0x80280055u32 as HRESULT;
-pub const TPM_E_DAA_ISSUER_VALIDITY: HRESULT = 0x80280056u32 as HRESULT;
-pub const TPM_E_DAA_WRONG_W: HRESULT = 0x80280057u32 as HRESULT;
-pub const TPM_E_BAD_HANDLE: HRESULT = 0x80280058u32 as HRESULT;
-pub const TPM_E_BAD_DELEGATE: HRESULT = 0x80280059u32 as HRESULT;
-pub const TPM_E_BADCONTEXT: HRESULT = 0x8028005Au32 as HRESULT;
-pub const TPM_E_TOOMANYCONTEXTS: HRESULT = 0x8028005Bu32 as HRESULT;
-pub const TPM_E_MA_TICKET_SIGNATURE: HRESULT = 0x8028005Cu32 as HRESULT;
-pub const TPM_E_MA_DESTINATION: HRESULT = 0x8028005Du32 as HRESULT;
-pub const TPM_E_MA_SOURCE: HRESULT = 0x8028005Eu32 as HRESULT;
-pub const TPM_E_MA_AUTHORITY: HRESULT = 0x8028005Fu32 as HRESULT;
-pub const TPM_E_PERMANENTEK: HRESULT = 0x80280061u32 as HRESULT;
-pub const TPM_E_BAD_SIGNATURE: HRESULT = 0x80280062u32 as HRESULT;
-pub const TPM_E_NOCONTEXTSPACE: HRESULT = 0x80280063u32 as HRESULT;
-pub const TPM_E_COMMAND_BLOCKED: HRESULT = 0x80280400u32 as HRESULT;
-pub const TPM_E_INVALID_HANDLE: HRESULT = 0x80280401u32 as HRESULT;
-pub const TPM_E_DUPLICATE_VHANDLE: HRESULT = 0x80280402u32 as HRESULT;
-pub const TPM_E_EMBEDDED_COMMAND_BLOCKED: HRESULT = 0x80280403u32 as HRESULT;
-pub const TPM_E_EMBEDDED_COMMAND_UNSUPPORTED: HRESULT = 0x80280404u32 as HRESULT;
-pub const TPM_E_RETRY: HRESULT = 0x80280800u32 as HRESULT;
-pub const TPM_E_NEEDS_SELFTEST: HRESULT = 0x80280801u32 as HRESULT;
-pub const TPM_E_DOING_SELFTEST: HRESULT = 0x80280802u32 as HRESULT;
-pub const TPM_E_DEFEND_LOCK_RUNNING: HRESULT = 0x80280803u32 as HRESULT;
-pub const TBS_E_INTERNAL_ERROR: HRESULT = 0x80284001u32 as HRESULT;
-pub const TBS_E_BAD_PARAMETER: HRESULT = 0x80284002u32 as HRESULT;
-pub const TBS_E_INVALID_OUTPUT_POINTER: HRESULT = 0x80284003u32 as HRESULT;
-pub const TBS_E_INVALID_CONTEXT: HRESULT = 0x80284004u32 as HRESULT;
-pub const TBS_E_INSUFFICIENT_BUFFER: HRESULT = 0x80284005u32 as HRESULT;
-pub const TBS_E_IOERROR: HRESULT = 0x80284006u32 as HRESULT;
-pub const TBS_E_INVALID_CONTEXT_PARAM: HRESULT = 0x80284007u32 as HRESULT;
-pub const TBS_E_SERVICE_NOT_RUNNING: HRESULT = 0x80284008u32 as HRESULT;
-pub const TBS_E_TOO_MANY_TBS_CONTEXTS: HRESULT = 0x80284009u32 as HRESULT;
-pub const TBS_E_TOO_MANY_RESOURCES: HRESULT = 0x8028400Au32 as HRESULT;
-pub const TBS_E_SERVICE_START_PENDING: HRESULT = 0x8028400Bu32 as HRESULT;
-pub const TBS_E_PPI_NOT_SUPPORTED: HRESULT = 0x8028400Cu32 as HRESULT;
-pub const TBS_E_COMMAND_CANCELED: HRESULT = 0x8028400Du32 as HRESULT;
-pub const TBS_E_BUFFER_TOO_LARGE: HRESULT = 0x8028400Eu32 as HRESULT;
-pub const TBS_E_TPM_NOT_FOUND: HRESULT = 0x8028400Fu32 as HRESULT;
-pub const TBS_E_SERVICE_DISABLED: HRESULT = 0x80284010u32 as HRESULT;
-pub const TBS_E_NO_EVENT_LOG: HRESULT = 0x80284011u32 as HRESULT;
-pub const TBS_E_ACCESS_DENIED: HRESULT = 0x80284012u32 as HRESULT;
-pub const TBS_E_PROVISIONING_NOT_ALLOWED: HRESULT = 0x80284013u32 as HRESULT;
-pub const TBS_E_PPI_FUNCTION_UNSUPPORTED: HRESULT = 0x80284014u32 as HRESULT;
-pub const TBS_E_OWNERAUTH_NOT_FOUND: HRESULT = 0x80284015u32 as HRESULT;
-pub const TBS_E_PROVISIONING_INCOMPLETE: HRESULT = 0x80284016u32 as HRESULT;
-pub const TPMAPI_E_INVALID_STATE: HRESULT = 0x80290100u32 as HRESULT;
-pub const TPMAPI_E_NOT_ENOUGH_DATA: HRESULT = 0x80290101u32 as HRESULT;
-pub const TPMAPI_E_TOO_MUCH_DATA: HRESULT = 0x80290102u32 as HRESULT;
-pub const TPMAPI_E_INVALID_OUTPUT_POINTER: HRESULT = 0x80290103u32 as HRESULT;
-pub const TPMAPI_E_INVALID_PARAMETER: HRESULT = 0x80290104u32 as HRESULT;
-pub const TPMAPI_E_OUT_OF_MEMORY: HRESULT = 0x80290105u32 as HRESULT;
-pub const TPMAPI_E_BUFFER_TOO_SMALL: HRESULT = 0x80290106u32 as HRESULT;
-pub const TPMAPI_E_INTERNAL_ERROR: HRESULT = 0x80290107u32 as HRESULT;
-pub const TPMAPI_E_ACCESS_DENIED: HRESULT = 0x80290108u32 as HRESULT;
-pub const TPMAPI_E_AUTHORIZATION_FAILED: HRESULT = 0x80290109u32 as HRESULT;
-pub const TPMAPI_E_INVALID_CONTEXT_HANDLE: HRESULT = 0x8029010Au32 as HRESULT;
-pub const TPMAPI_E_TBS_COMMUNICATION_ERROR: HRESULT = 0x8029010Bu32 as HRESULT;
-pub const TPMAPI_E_TPM_COMMAND_ERROR: HRESULT = 0x8029010Cu32 as HRESULT;
-pub const TPMAPI_E_MESSAGE_TOO_LARGE: HRESULT = 0x8029010Du32 as HRESULT;
-pub const TPMAPI_E_INVALID_ENCODING: HRESULT = 0x8029010Eu32 as HRESULT;
-pub const TPMAPI_E_INVALID_KEY_SIZE: HRESULT = 0x8029010Fu32 as HRESULT;
-pub const TPMAPI_E_ENCRYPTION_FAILED: HRESULT = 0x80290110u32 as HRESULT;
-pub const TPMAPI_E_INVALID_KEY_PARAMS: HRESULT = 0x80290111u32 as HRESULT;
-pub const TPMAPI_E_INVALID_MIGRATION_AUTHORIZATION_BLOB: HRESULT = 0x80290112u32 as HRESULT;
-pub const TPMAPI_E_INVALID_PCR_INDEX: HRESULT = 0x80290113u32 as HRESULT;
-pub const TPMAPI_E_INVALID_DELEGATE_BLOB: HRESULT = 0x80290114u32 as HRESULT;
-pub const TPMAPI_E_INVALID_CONTEXT_PARAMS: HRESULT = 0x80290115u32 as HRESULT;
-pub const TPMAPI_E_INVALID_KEY_BLOB: HRESULT = 0x80290116u32 as HRESULT;
-pub const TPMAPI_E_INVALID_PCR_DATA: HRESULT = 0x80290117u32 as HRESULT;
-pub const TPMAPI_E_INVALID_OWNER_AUTH: HRESULT = 0x80290118u32 as HRESULT;
-pub const TPMAPI_E_FIPS_RNG_CHECK_FAILED: HRESULT = 0x80290119u32 as HRESULT;
-pub const TPMAPI_E_EMPTY_TCG_LOG: HRESULT = 0x8029011Au32 as HRESULT;
-pub const TPMAPI_E_INVALID_TCG_LOG_ENTRY: HRESULT = 0x8029011Bu32 as HRESULT;
-pub const TPMAPI_E_TCG_SEPARATOR_ABSENT: HRESULT = 0x8029011Cu32 as HRESULT;
-pub const TPMAPI_E_TCG_INVALID_DIGEST_ENTRY: HRESULT = 0x8029011Du32 as HRESULT;
-pub const TPMAPI_E_POLICY_DENIES_OPERATION: HRESULT = 0x8029011Eu32 as HRESULT;
-pub const TBSIMP_E_BUFFER_TOO_SMALL: HRESULT = 0x80290200u32 as HRESULT;
-pub const TBSIMP_E_CLEANUP_FAILED: HRESULT = 0x80290201u32 as HRESULT;
-pub const TBSIMP_E_INVALID_CONTEXT_HANDLE: HRESULT = 0x80290202u32 as HRESULT;
-pub const TBSIMP_E_INVALID_CONTEXT_PARAM: HRESULT = 0x80290203u32 as HRESULT;
-pub const TBSIMP_E_TPM_ERROR: HRESULT = 0x80290204u32 as HRESULT;
-pub const TBSIMP_E_HASH_BAD_KEY: HRESULT = 0x80290205u32 as HRESULT;
-pub const TBSIMP_E_DUPLICATE_VHANDLE: HRESULT = 0x80290206u32 as HRESULT;
-pub const TBSIMP_E_INVALID_OUTPUT_POINTER: HRESULT = 0x80290207u32 as HRESULT;
-pub const TBSIMP_E_INVALID_PARAMETER: HRESULT = 0x80290208u32 as HRESULT;
-pub const TBSIMP_E_RPC_INIT_FAILED: HRESULT = 0x80290209u32 as HRESULT;
-pub const TBSIMP_E_SCHEDULER_NOT_RUNNING: HRESULT = 0x8029020Au32 as HRESULT;
-pub const TBSIMP_E_COMMAND_CANCELED: HRESULT = 0x8029020Bu32 as HRESULT;
-pub const TBSIMP_E_OUT_OF_MEMORY: HRESULT = 0x8029020Cu32 as HRESULT;
-pub const TBSIMP_E_LIST_NO_MORE_ITEMS: HRESULT = 0x8029020Du32 as HRESULT;
-pub const TBSIMP_E_LIST_NOT_FOUND: HRESULT = 0x8029020Eu32 as HRESULT;
-pub const TBSIMP_E_NOT_ENOUGH_SPACE: HRESULT = 0x8029020Fu32 as HRESULT;
-pub const TBSIMP_E_NOT_ENOUGH_TPM_CONTEXTS: HRESULT = 0x80290210u32 as HRESULT;
-pub const TBSIMP_E_COMMAND_FAILED: HRESULT = 0x80290211u32 as HRESULT;
-pub const TBSIMP_E_UNKNOWN_ORDINAL: HRESULT = 0x80290212u32 as HRESULT;
-pub const TBSIMP_E_RESOURCE_EXPIRED: HRESULT = 0x80290213u32 as HRESULT;
-pub const TBSIMP_E_INVALID_RESOURCE: HRESULT = 0x80290214u32 as HRESULT;
-pub const TBSIMP_E_NOTHING_TO_UNLOAD: HRESULT = 0x80290215u32 as HRESULT;
-pub const TBSIMP_E_HASH_TABLE_FULL: HRESULT = 0x80290216u32 as HRESULT;
-pub const TBSIMP_E_TOO_MANY_TBS_CONTEXTS: HRESULT = 0x80290217u32 as HRESULT;
-pub const TBSIMP_E_TOO_MANY_RESOURCES: HRESULT = 0x80290218u32 as HRESULT;
-pub const TBSIMP_E_PPI_NOT_SUPPORTED: HRESULT = 0x80290219u32 as HRESULT;
-pub const TBSIMP_E_TPM_INCOMPATIBLE: HRESULT = 0x8029021Au32 as HRESULT;
-pub const TBSIMP_E_NO_EVENT_LOG: HRESULT = 0x8029021Bu32 as HRESULT;
-pub const TPM_E_PPI_ACPI_FAILURE: HRESULT = 0x80290300u32 as HRESULT;
-pub const TPM_E_PPI_USER_ABORT: HRESULT = 0x80290301u32 as HRESULT;
-pub const TPM_E_PPI_BIOS_FAILURE: HRESULT = 0x80290302u32 as HRESULT;
-pub const TPM_E_PPI_NOT_SUPPORTED: HRESULT = 0x80290303u32 as HRESULT;
-pub const TPM_E_PPI_BLOCKED_IN_BIOS: HRESULT = 0x80290304u32 as HRESULT;
-pub const TPM_E_PCP_ERROR_MASK: HRESULT = 0x80290400u32 as HRESULT;
-pub const TPM_E_PCP_DEVICE_NOT_READY: HRESULT = 0x80290401u32 as HRESULT;
-pub const TPM_E_PCP_INVALID_HANDLE: HRESULT = 0x80290402u32 as HRESULT;
-pub const TPM_E_PCP_INVALID_PARAMETER: HRESULT = 0x80290403u32 as HRESULT;
-pub const TPM_E_PCP_FLAG_NOT_SUPPORTED: HRESULT = 0x80290404u32 as HRESULT;
-pub const TPM_E_PCP_NOT_SUPPORTED: HRESULT = 0x80290405u32 as HRESULT;
-pub const TPM_E_PCP_BUFFER_TOO_SMALL: HRESULT = 0x80290406u32 as HRESULT;
-pub const TPM_E_PCP_INTERNAL_ERROR: HRESULT = 0x80290407u32 as HRESULT;
-pub const TPM_E_PCP_AUTHENTICATION_FAILED: HRESULT = 0x80290408u32 as HRESULT;
-pub const TPM_E_PCP_AUTHENTICATION_IGNORED: HRESULT = 0x80290409u32 as HRESULT;
-pub const TPM_E_PCP_POLICY_NOT_FOUND: HRESULT = 0x8029040Au32 as HRESULT;
-pub const TPM_E_PCP_PROFILE_NOT_FOUND: HRESULT = 0x8029040Bu32 as HRESULT;
-pub const TPM_E_PCP_VALIDATION_FAILED: HRESULT = 0x8029040Cu32 as HRESULT;
-pub const PLA_E_DCS_NOT_FOUND: HRESULT = 0x80300002u32 as HRESULT;
-pub const PLA_E_DCS_IN_USE: HRESULT = 0x803000AAu32 as HRESULT;
-pub const PLA_E_TOO_MANY_FOLDERS: HRESULT = 0x80300045u32 as HRESULT;
-pub const PLA_E_NO_MIN_DISK: HRESULT = 0x80300070u32 as HRESULT;
-pub const PLA_E_DCS_ALREADY_EXISTS: HRESULT = 0x803000B7u32 as HRESULT;
-pub const PLA_S_PROPERTY_IGNORED: HRESULT = 0x00300100;
-pub const PLA_E_PROPERTY_CONFLICT: HRESULT = 0x80300101u32 as HRESULT;
-pub const PLA_E_DCS_SINGLETON_REQUIRED: HRESULT = 0x80300102u32 as HRESULT;
-pub const PLA_E_CREDENTIALS_REQUIRED: HRESULT = 0x80300103u32 as HRESULT;
-pub const PLA_E_DCS_NOT_RUNNING: HRESULT = 0x80300104u32 as HRESULT;
-pub const PLA_E_CONFLICT_INCL_EXCL_API: HRESULT = 0x80300105u32 as HRESULT;
-pub const PLA_E_NETWORK_EXE_NOT_VALID: HRESULT = 0x80300106u32 as HRESULT;
-pub const PLA_E_EXE_ALREADY_CONFIGURED: HRESULT = 0x80300107u32 as HRESULT;
-pub const PLA_E_EXE_PATH_NOT_VALID: HRESULT = 0x80300108u32 as HRESULT;
-pub const PLA_E_DC_ALREADY_EXISTS: HRESULT = 0x80300109u32 as HRESULT;
-pub const PLA_E_DCS_START_WAIT_TIMEOUT: HRESULT = 0x8030010Au32 as HRESULT;
-pub const PLA_E_DC_START_WAIT_TIMEOUT: HRESULT = 0x8030010Bu32 as HRESULT;
-pub const PLA_E_REPORT_WAIT_TIMEOUT: HRESULT = 0x8030010Cu32 as HRESULT;
-pub const PLA_E_NO_DUPLICATES: HRESULT = 0x8030010Du32 as HRESULT;
-pub const PLA_E_EXE_FULL_PATH_REQUIRED: HRESULT = 0x8030010Eu32 as HRESULT;
-pub const PLA_E_INVALID_SESSION_NAME: HRESULT = 0x8030010Fu32 as HRESULT;
-pub const PLA_E_PLA_CHANNEL_NOT_ENABLED: HRESULT = 0x80300110u32 as HRESULT;
-pub const PLA_E_TASKSCHED_CHANNEL_NOT_ENABLED: HRESULT = 0x80300111u32 as HRESULT;
-pub const PLA_E_RULES_MANAGER_FAILED: HRESULT = 0x80300112u32 as HRESULT;
-pub const PLA_E_CABAPI_FAILURE: HRESULT = 0x80300113u32 as HRESULT;
-pub const FVE_E_LOCKED_VOLUME: HRESULT = 0x80310000u32 as HRESULT;
-pub const FVE_E_NOT_ENCRYPTED: HRESULT = 0x80310001u32 as HRESULT;
-pub const FVE_E_NO_TPM_BIOS: HRESULT = 0x80310002u32 as HRESULT;
-pub const FVE_E_NO_MBR_METRIC: HRESULT = 0x80310003u32 as HRESULT;
-pub const FVE_E_NO_BOOTSECTOR_METRIC: HRESULT = 0x80310004u32 as HRESULT;
-pub const FVE_E_NO_BOOTMGR_METRIC: HRESULT = 0x80310005u32 as HRESULT;
-pub const FVE_E_WRONG_BOOTMGR: HRESULT = 0x80310006u32 as HRESULT;
-pub const FVE_E_SECURE_KEY_REQUIRED: HRESULT = 0x80310007u32 as HRESULT;
-pub const FVE_E_NOT_ACTIVATED: HRESULT = 0x80310008u32 as HRESULT;
-pub const FVE_E_ACTION_NOT_ALLOWED: HRESULT = 0x80310009u32 as HRESULT;
-pub const FVE_E_AD_SCHEMA_NOT_INSTALLED: HRESULT = 0x8031000Au32 as HRESULT;
-pub const FVE_E_AD_INVALID_DATATYPE: HRESULT = 0x8031000Bu32 as HRESULT;
-pub const FVE_E_AD_INVALID_DATASIZE: HRESULT = 0x8031000Cu32 as HRESULT;
-pub const FVE_E_AD_NO_VALUES: HRESULT = 0x8031000Du32 as HRESULT;
-pub const FVE_E_AD_ATTR_NOT_SET: HRESULT = 0x8031000Eu32 as HRESULT;
-pub const FVE_E_AD_GUID_NOT_FOUND: HRESULT = 0x8031000Fu32 as HRESULT;
-pub const FVE_E_BAD_INFORMATION: HRESULT = 0x80310010u32 as HRESULT;
-pub const FVE_E_TOO_SMALL: HRESULT = 0x80310011u32 as HRESULT;
-pub const FVE_E_SYSTEM_VOLUME: HRESULT = 0x80310012u32 as HRESULT;
-pub const FVE_E_FAILED_WRONG_FS: HRESULT = 0x80310013u32 as HRESULT;
-pub const FVE_E_BAD_PARTITION_SIZE: HRESULT = 0x80310014u32 as HRESULT;
-pub const FVE_E_NOT_SUPPORTED: HRESULT = 0x80310015u32 as HRESULT;
-pub const FVE_E_BAD_DATA: HRESULT = 0x80310016u32 as HRESULT;
-pub const FVE_E_VOLUME_NOT_BOUND: HRESULT = 0x80310017u32 as HRESULT;
-pub const FVE_E_TPM_NOT_OWNED: HRESULT = 0x80310018u32 as HRESULT;
-pub const FVE_E_NOT_DATA_VOLUME: HRESULT = 0x80310019u32 as HRESULT;
-pub const FVE_E_AD_INSUFFICIENT_BUFFER: HRESULT = 0x8031001Au32 as HRESULT;
-pub const FVE_E_CONV_READ: HRESULT = 0x8031001Bu32 as HRESULT;
-pub const FVE_E_CONV_WRITE: HRESULT = 0x8031001Cu32 as HRESULT;
-pub const FVE_E_KEY_REQUIRED: HRESULT = 0x8031001Du32 as HRESULT;
-pub const FVE_E_CLUSTERING_NOT_SUPPORTED: HRESULT = 0x8031001Eu32 as HRESULT;
-pub const FVE_E_VOLUME_BOUND_ALREADY: HRESULT = 0x8031001Fu32 as HRESULT;
-pub const FVE_E_OS_NOT_PROTECTED: HRESULT = 0x80310020u32 as HRESULT;
-pub const FVE_E_PROTECTION_DISABLED: HRESULT = 0x80310021u32 as HRESULT;
-pub const FVE_E_RECOVERY_KEY_REQUIRED: HRESULT = 0x80310022u32 as HRESULT;
-pub const FVE_E_FOREIGN_VOLUME: HRESULT = 0x80310023u32 as HRESULT;
-pub const FVE_E_OVERLAPPED_UPDATE: HRESULT = 0x80310024u32 as HRESULT;
-pub const FVE_E_TPM_SRK_AUTH_NOT_ZERO: HRESULT = 0x80310025u32 as HRESULT;
-pub const FVE_E_FAILED_SECTOR_SIZE: HRESULT = 0x80310026u32 as HRESULT;
-pub const FVE_E_FAILED_AUTHENTICATION: HRESULT = 0x80310027u32 as HRESULT;
-pub const FVE_E_NOT_OS_VOLUME: HRESULT = 0x80310028u32 as HRESULT;
-pub const FVE_E_AUTOUNLOCK_ENABLED: HRESULT = 0x80310029u32 as HRESULT;
-pub const FVE_E_WRONG_BOOTSECTOR: HRESULT = 0x8031002Au32 as HRESULT;
-pub const FVE_E_WRONG_SYSTEM_FS: HRESULT = 0x8031002Bu32 as HRESULT;
-pub const FVE_E_POLICY_PASSWORD_REQUIRED: HRESULT = 0x8031002Cu32 as HRESULT;
-pub const FVE_E_CANNOT_SET_FVEK_ENCRYPTED: HRESULT = 0x8031002Du32 as HRESULT;
-pub const FVE_E_CANNOT_ENCRYPT_NO_KEY: HRESULT = 0x8031002Eu32 as HRESULT;
-pub const FVE_E_BOOTABLE_CDDVD: HRESULT = 0x80310030u32 as HRESULT;
-pub const FVE_E_PROTECTOR_EXISTS: HRESULT = 0x80310031u32 as HRESULT;
-pub const FVE_E_RELATIVE_PATH: HRESULT = 0x80310032u32 as HRESULT;
-pub const FVE_E_PROTECTOR_NOT_FOUND: HRESULT = 0x80310033u32 as HRESULT;
-pub const FVE_E_INVALID_KEY_FORMAT: HRESULT = 0x80310034u32 as HRESULT;
-pub const FVE_E_INVALID_PASSWORD_FORMAT: HRESULT = 0x80310035u32 as HRESULT;
-pub const FVE_E_FIPS_RNG_CHECK_FAILED: HRESULT = 0x80310036u32 as HRESULT;
-pub const FVE_E_FIPS_PREVENTS_RECOVERY_PASSWORD: HRESULT = 0x80310037u32 as HRESULT;
-pub const FVE_E_FIPS_PREVENTS_EXTERNAL_KEY_EXPORT: HRESULT = 0x80310038u32 as HRESULT;
-pub const FVE_E_NOT_DECRYPTED: HRESULT = 0x80310039u32 as HRESULT;
-pub const FVE_E_INVALID_PROTECTOR_TYPE: HRESULT = 0x8031003Au32 as HRESULT;
-pub const FVE_E_NO_PROTECTORS_TO_TEST: HRESULT = 0x8031003Bu32 as HRESULT;
-pub const FVE_E_KEYFILE_NOT_FOUND: HRESULT = 0x8031003Cu32 as HRESULT;
-pub const FVE_E_KEYFILE_INVALID: HRESULT = 0x8031003Du32 as HRESULT;
-pub const FVE_E_KEYFILE_NO_VMK: HRESULT = 0x8031003Eu32 as HRESULT;
-pub const FVE_E_TPM_DISABLED: HRESULT = 0x8031003Fu32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_IN_SAFE_MODE: HRESULT = 0x80310040u32 as HRESULT;
-pub const FVE_E_TPM_INVALID_PCR: HRESULT = 0x80310041u32 as HRESULT;
-pub const FVE_E_TPM_NO_VMK: HRESULT = 0x80310042u32 as HRESULT;
-pub const FVE_E_PIN_INVALID: HRESULT = 0x80310043u32 as HRESULT;
-pub const FVE_E_AUTH_INVALID_APPLICATION: HRESULT = 0x80310044u32 as HRESULT;
-pub const FVE_E_AUTH_INVALID_CONFIG: HRESULT = 0x80310045u32 as HRESULT;
-pub const FVE_E_FIPS_DISABLE_PROTECTION_NOT_ALLOWED: HRESULT = 0x80310046u32 as HRESULT;
-pub const FVE_E_FS_NOT_EXTENDED: HRESULT = 0x80310047u32 as HRESULT;
-pub const FVE_E_FIRMWARE_TYPE_NOT_SUPPORTED: HRESULT = 0x80310048u32 as HRESULT;
-pub const FVE_E_NO_LICENSE: HRESULT = 0x80310049u32 as HRESULT;
-pub const FVE_E_NOT_ON_STACK: HRESULT = 0x8031004Au32 as HRESULT;
-pub const FVE_E_FS_MOUNTED: HRESULT = 0x8031004Bu32 as HRESULT;
-pub const FVE_E_TOKEN_NOT_IMPERSONATED: HRESULT = 0x8031004Cu32 as HRESULT;
-pub const FVE_E_DRY_RUN_FAILED: HRESULT = 0x8031004Du32 as HRESULT;
-pub const FVE_E_REBOOT_REQUIRED: HRESULT = 0x8031004Eu32 as HRESULT;
-pub const FVE_E_DEBUGGER_ENABLED: HRESULT = 0x8031004Fu32 as HRESULT;
-pub const FVE_E_RAW_ACCESS: HRESULT = 0x80310050u32 as HRESULT;
-pub const FVE_E_RAW_BLOCKED: HRESULT = 0x80310051u32 as HRESULT;
-pub const FVE_E_BCD_APPLICATIONS_PATH_INCORRECT: HRESULT = 0x80310052u32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_IN_VERSION: HRESULT = 0x80310053u32 as HRESULT;
-pub const FVE_E_NO_AUTOUNLOCK_MASTER_KEY: HRESULT = 0x80310054u32 as HRESULT;
-pub const FVE_E_MOR_FAILED: HRESULT = 0x80310055u32 as HRESULT;
-pub const FVE_E_HIDDEN_VOLUME: HRESULT = 0x80310056u32 as HRESULT;
-pub const FVE_E_TRANSIENT_STATE: HRESULT = 0x80310057u32 as HRESULT;
-pub const FVE_E_PUBKEY_NOT_ALLOWED: HRESULT = 0x80310058u32 as HRESULT;
-pub const FVE_E_VOLUME_HANDLE_OPEN: HRESULT = 0x80310059u32 as HRESULT;
-pub const FVE_E_NO_FEATURE_LICENSE: HRESULT = 0x8031005Au32 as HRESULT;
-pub const FVE_E_INVALID_STARTUP_OPTIONS: HRESULT = 0x8031005Bu32 as HRESULT;
-pub const FVE_E_POLICY_RECOVERY_PASSWORD_NOT_ALLOWED: HRESULT = 0x8031005Cu32 as HRESULT;
-pub const FVE_E_POLICY_RECOVERY_PASSWORD_REQUIRED: HRESULT = 0x8031005Du32 as HRESULT;
-pub const FVE_E_POLICY_RECOVERY_KEY_NOT_ALLOWED: HRESULT = 0x8031005Eu32 as HRESULT;
-pub const FVE_E_POLICY_RECOVERY_KEY_REQUIRED: HRESULT = 0x8031005Fu32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_PIN_NOT_ALLOWED: HRESULT = 0x80310060u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_PIN_REQUIRED: HRESULT = 0x80310061u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_KEY_NOT_ALLOWED: HRESULT = 0x80310062u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_KEY_REQUIRED: HRESULT = 0x80310063u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_PIN_KEY_NOT_ALLOWED: HRESULT = 0x80310064u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_PIN_KEY_REQUIRED: HRESULT = 0x80310065u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_TPM_NOT_ALLOWED: HRESULT = 0x80310066u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_TPM_REQUIRED: HRESULT = 0x80310067u32 as HRESULT;
-pub const FVE_E_POLICY_INVALID_PIN_LENGTH: HRESULT = 0x80310068u32 as HRESULT;
-pub const FVE_E_KEY_PROTECTOR_NOT_SUPPORTED: HRESULT = 0x80310069u32 as HRESULT;
-pub const FVE_E_POLICY_PASSPHRASE_NOT_ALLOWED: HRESULT = 0x8031006Au32 as HRESULT;
-pub const FVE_E_POLICY_PASSPHRASE_REQUIRED: HRESULT = 0x8031006Bu32 as HRESULT;
-pub const FVE_E_FIPS_PREVENTS_PASSPHRASE: HRESULT = 0x8031006Cu32 as HRESULT;
-pub const FVE_E_OS_VOLUME_PASSPHRASE_NOT_ALLOWED: HRESULT = 0x8031006Du32 as HRESULT;
-pub const FVE_E_INVALID_BITLOCKER_OID: HRESULT = 0x8031006Eu32 as HRESULT;
-pub const FVE_E_VOLUME_TOO_SMALL: HRESULT = 0x8031006Fu32 as HRESULT;
-pub const FVE_E_DV_NOT_SUPPORTED_ON_FS: HRESULT = 0x80310070u32 as HRESULT;
-pub const FVE_E_DV_NOT_ALLOWED_BY_GP: HRESULT = 0x80310071u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CERTIFICATE_NOT_ALLOWED: HRESULT = 0x80310072u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CERTIFICATE_REQUIRED: HRESULT = 0x80310073u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CERT_MUST_BE_HW: HRESULT = 0x80310074u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CONFIGURE_FDV_AUTOUNLOCK_NOT_ALLOWED: HRESULT = 0x80310075u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CONFIGURE_RDV_AUTOUNLOCK_NOT_ALLOWED: HRESULT = 0x80310076u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CONFIGURE_RDV_NOT_ALLOWED: HRESULT = 0x80310077u32 as HRESULT;
-pub const FVE_E_POLICY_USER_ENABLE_RDV_NOT_ALLOWED: HRESULT = 0x80310078u32 as HRESULT;
-pub const FVE_E_POLICY_USER_DISABLE_RDV_NOT_ALLOWED: HRESULT = 0x80310079u32 as HRESULT;
-pub const FVE_E_POLICY_INVALID_PASSPHRASE_LENGTH: HRESULT = 0x80310080u32 as HRESULT;
-pub const FVE_E_POLICY_PASSPHRASE_TOO_SIMPLE: HRESULT = 0x80310081u32 as HRESULT;
-pub const FVE_E_RECOVERY_PARTITION: HRESULT = 0x80310082u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_FDV_RK_OFF_AUK_ON: HRESULT = 0x80310083u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_RDV_RK_OFF_AUK_ON: HRESULT = 0x80310084u32 as HRESULT;
-pub const FVE_E_NON_BITLOCKER_OID: HRESULT = 0x80310085u32 as HRESULT;
-pub const FVE_E_POLICY_PROHIBITS_SELFSIGNED: HRESULT = 0x80310086u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_RO_AND_STARTUP_KEY_REQUIRED: HRESULT = 0x80310087u32 as HRESULT;
-pub const FVE_E_CONV_RECOVERY_FAILED: HRESULT = 0x80310088u32 as HRESULT;
-pub const FVE_E_VIRTUALIZED_SPACE_TOO_BIG: HRESULT = 0x80310089u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_OSV_RP_OFF_ADB_ON: HRESULT = 0x80310090u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_FDV_RP_OFF_ADB_ON: HRESULT = 0x80310091u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_RDV_RP_OFF_ADB_ON: HRESULT = 0x80310092u32 as HRESULT;
-pub const FVE_E_NON_BITLOCKER_KU: HRESULT = 0x80310093u32 as HRESULT;
-pub const FVE_E_PRIVATEKEY_AUTH_FAILED: HRESULT = 0x80310094u32 as HRESULT;
-pub const FVE_E_REMOVAL_OF_DRA_FAILED: HRESULT = 0x80310095u32 as HRESULT;
-pub const FVE_E_OPERATION_NOT_SUPPORTED_ON_VISTA_VOLUME: HRESULT = 0x80310096u32 as HRESULT;
-pub const FVE_E_CANT_LOCK_AUTOUNLOCK_ENABLED_VOLUME: HRESULT = 0x80310097u32 as HRESULT;
-pub const FVE_E_FIPS_HASH_KDF_NOT_ALLOWED: HRESULT = 0x80310098u32 as HRESULT;
-pub const FVE_E_ENH_PIN_INVALID: HRESULT = 0x80310099u32 as HRESULT;
-pub const FVE_E_INVALID_PIN_CHARS: HRESULT = 0x8031009Au32 as HRESULT;
-pub const FVE_E_INVALID_DATUM_TYPE: HRESULT = 0x8031009Bu32 as HRESULT;
-pub const FVE_E_EFI_ONLY: HRESULT = 0x8031009Cu32 as HRESULT;
-pub const FVE_E_MULTIPLE_NKP_CERTS: HRESULT = 0x8031009Du32 as HRESULT;
-pub const FVE_E_REMOVAL_OF_NKP_FAILED: HRESULT = 0x8031009Eu32 as HRESULT;
-pub const FVE_E_INVALID_NKP_CERT: HRESULT = 0x8031009Fu32 as HRESULT;
-pub const FVE_E_NO_EXISTING_PIN: HRESULT = 0x803100A0u32 as HRESULT;
-pub const FVE_E_PROTECTOR_CHANGE_PIN_MISMATCH: HRESULT = 0x803100A1u32 as HRESULT;
-pub const FVE_E_PIN_PROTECTOR_CHANGE_BY_STD_USER_DISALLOWED: HRESULT = 0x803100A2u32 as HRESULT;
-pub const FVE_E_PROTECTOR_CHANGE_MAX_PIN_CHANGE_ATTEMPTS_REACHED: HRESULT = 0x803100A3u32 as HRESULT;
-pub const FVE_E_POLICY_PASSPHRASE_REQUIRES_ASCII: HRESULT = 0x803100A4u32 as HRESULT;
-pub const FVE_E_FULL_ENCRYPTION_NOT_ALLOWED_ON_TP_STORAGE: HRESULT = 0x803100A5u32 as HRESULT;
-pub const FVE_E_WIPE_NOT_ALLOWED_ON_TP_STORAGE: HRESULT = 0x803100A6u32 as HRESULT;
-pub const FVE_E_KEY_LENGTH_NOT_SUPPORTED_BY_EDRIVE: HRESULT = 0x803100A7u32 as HRESULT;
-pub const FVE_E_NO_EXISTING_PASSPHRASE: HRESULT = 0x803100A8u32 as HRESULT;
-pub const FVE_E_PROTECTOR_CHANGE_PASSPHRASE_MISMATCH: HRESULT = 0x803100A9u32 as HRESULT;
-pub const FVE_E_PASSPHRASE_TOO_LONG: HRESULT = 0x803100AAu32 as HRESULT;
-pub const FVE_E_NO_PASSPHRASE_WITH_TPM: HRESULT = 0x803100ABu32 as HRESULT;
-pub const FVE_E_NO_TPM_WITH_PASSPHRASE: HRESULT = 0x803100ACu32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_ON_CSV_STACK: HRESULT = 0x803100ADu32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_ON_CLUSTER: HRESULT = 0x803100AEu32 as HRESULT;
-pub const FVE_E_EDRIVE_NO_FAILOVER_TO_SW: HRESULT = 0x803100AFu32 as HRESULT;
-pub const FVE_E_EDRIVE_BAND_IN_USE: HRESULT = 0x803100B0u32 as HRESULT;
-pub const FVE_E_EDRIVE_DISALLOWED_BY_GP: HRESULT = 0x803100B1u32 as HRESULT;
-pub const FVE_E_EDRIVE_INCOMPATIBLE_VOLUME: HRESULT = 0x803100B2u32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_TO_UPGRADE_WHILE_CONVERTING: HRESULT = 0x803100B3u32 as HRESULT;
-pub const FVE_E_EDRIVE_DV_NOT_SUPPORTED: HRESULT = 0x803100B4u32 as HRESULT;
-pub const FVE_E_NO_PREBOOT_KEYBOARD_DETECTED: HRESULT = 0x803100B5u32 as HRESULT;
-pub const FVE_E_NO_PREBOOT_KEYBOARD_OR_WINRE_DETECTED: HRESULT = 0x803100B6u32 as HRESULT;
-pub const FVE_E_POLICY_REQUIRES_STARTUP_PIN_ON_TOUCH_DEVICE: HRESULT = 0x803100B7u32 as HRESULT;
-pub const FVE_E_POLICY_REQUIRES_RECOVERY_PASSWORD_ON_TOUCH_DEVICE: HRESULT = 0x803100B8u32 as HRESULT;
-pub const FVE_E_WIPE_CANCEL_NOT_APPLICABLE: HRESULT = 0x803100B9u32 as HRESULT;
-pub const FVE_E_SECUREBOOT_DISABLED: HRESULT = 0x803100BAu32 as HRESULT;
-pub const FVE_E_SECUREBOOT_CONFIGURATION_INVALID: HRESULT = 0x803100BBu32 as HRESULT;
-pub const FVE_E_EDRIVE_DRY_RUN_FAILED: HRESULT = 0x803100BCu32 as HRESULT;
-pub const FVE_E_SHADOW_COPY_PRESENT: HRESULT = 0x803100BDu32 as HRESULT;
-pub const FVE_E_POLICY_INVALID_ENHANCED_BCD_SETTINGS: HRESULT = 0x803100BEu32 as HRESULT;
-pub const FVE_E_EDRIVE_INCOMPATIBLE_FIRMWARE: HRESULT = 0x803100BFu32 as HRESULT;
-pub const FVE_E_PROTECTOR_CHANGE_MAX_PASSPHRASE_CHANGE_ATTEMPTS_REACHED: HRESULT = 0x803100C0u32 as HRESULT;
-pub const FVE_E_PASSPHRASE_PROTECTOR_CHANGE_BY_STD_USER_DISALLOWED: HRESULT = 0x803100C1u32 as HRESULT;
-pub const FVE_E_LIVEID_ACCOUNT_SUSPENDED: HRESULT = 0x803100C2u32 as HRESULT;
-pub const FVE_E_LIVEID_ACCOUNT_BLOCKED: HRESULT = 0x803100C3u32 as HRESULT;
-pub const FVE_E_NOT_PROVISIONED_ON_ALL_VOLUMES: HRESULT = 0x803100C4u32 as HRESULT;
-pub const FVE_E_DE_FIXED_DATA_NOT_SUPPORTED: HRESULT = 0x803100C5u32 as HRESULT;
-pub const FVE_E_DE_HARDWARE_NOT_COMPLIANT: HRESULT = 0x803100C6u32 as HRESULT;
-pub const FVE_E_DE_WINRE_NOT_CONFIGURED: HRESULT = 0x803100C7u32 as HRESULT;
-pub const FVE_E_DE_PROTECTION_SUSPENDED: HRESULT = 0x803100C8u32 as HRESULT;
-pub const FVE_E_DE_OS_VOLUME_NOT_PROTECTED: HRESULT = 0x803100C9u32 as HRESULT;
-pub const FVE_E_DE_DEVICE_LOCKEDOUT: HRESULT = 0x803100CAu32 as HRESULT;
-pub const FVE_E_DE_PROTECTION_NOT_YET_ENABLED: HRESULT = 0x803100CBu32 as HRESULT;
-pub const FVE_E_INVALID_PIN_CHARS_DETAILED: HRESULT = 0x803100CCu32 as HRESULT;
-pub const FVE_E_DEVICE_LOCKOUT_COUNTER_UNAVAILABLE: HRESULT = 0x803100CDu32 as HRESULT;
-pub const FVE_E_DEVICELOCKOUT_COUNTER_MISMATCH: HRESULT = 0x803100CEu32 as HRESULT;
-pub const FVE_E_BUFFER_TOO_LARGE: HRESULT = 0x803100CFu32 as HRESULT;
-pub const FVE_E_NO_SUCH_CAPABILITY_ON_TARGET: HRESULT = 0x803100D0u32 as HRESULT;
-pub const FVE_E_DE_PREVENTED_FOR_OS: HRESULT = 0x803100D1u32 as HRESULT;
-pub const FVE_E_DE_VOLUME_OPTED_OUT: HRESULT = 0x803100D2u32 as HRESULT;
-pub const FVE_E_DE_VOLUME_NOT_SUPPORTED: HRESULT = 0x803100D3u32 as HRESULT;
-pub const FVE_E_EOW_NOT_SUPPORTED_IN_VERSION: HRESULT = 0x803100D4u32 as HRESULT;
-pub const FVE_E_ADBACKUP_NOT_ENABLED: HRESULT = 0x803100D5u32 as HRESULT;
-pub const FVE_E_VOLUME_EXTEND_PREVENTS_EOW_DECRYPT: HRESULT = 0x803100D6u32 as HRESULT;
-pub const FVE_E_NOT_DE_VOLUME: HRESULT = 0x803100D7u32 as HRESULT;
-pub const FVE_E_PROTECTION_CANNOT_BE_DISABLED: HRESULT = 0x803100D8u32 as HRESULT;
-pub const FWP_E_CALLOUT_NOT_FOUND: HRESULT = 0x80320001u32 as HRESULT;
-pub const FWP_E_CONDITION_NOT_FOUND: HRESULT = 0x80320002u32 as HRESULT;
-pub const FWP_E_FILTER_NOT_FOUND: HRESULT = 0x80320003u32 as HRESULT;
-pub const FWP_E_LAYER_NOT_FOUND: HRESULT = 0x80320004u32 as HRESULT;
-pub const FWP_E_PROVIDER_NOT_FOUND: HRESULT = 0x80320005u32 as HRESULT;
-pub const FWP_E_PROVIDER_CONTEXT_NOT_FOUND: HRESULT = 0x80320006u32 as HRESULT;
-pub const FWP_E_SUBLAYER_NOT_FOUND: HRESULT = 0x80320007u32 as HRESULT;
-pub const FWP_E_NOT_FOUND: HRESULT = 0x80320008u32 as HRESULT;
-pub const FWP_E_ALREADY_EXISTS: HRESULT = 0x80320009u32 as HRESULT;
-pub const FWP_E_IN_USE: HRESULT = 0x8032000Au32 as HRESULT;
-pub const FWP_E_DYNAMIC_SESSION_IN_PROGRESS: HRESULT = 0x8032000Bu32 as HRESULT;
-pub const FWP_E_WRONG_SESSION: HRESULT = 0x8032000Cu32 as HRESULT;
-pub const FWP_E_NO_TXN_IN_PROGRESS: HRESULT = 0x8032000Du32 as HRESULT;
-pub const FWP_E_TXN_IN_PROGRESS: HRESULT = 0x8032000Eu32 as HRESULT;
-pub const FWP_E_TXN_ABORTED: HRESULT = 0x8032000Fu32 as HRESULT;
-pub const FWP_E_SESSION_ABORTED: HRESULT = 0x80320010u32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_TXN: HRESULT = 0x80320011u32 as HRESULT;
-pub const FWP_E_TIMEOUT: HRESULT = 0x80320012u32 as HRESULT;
-pub const FWP_E_NET_EVENTS_DISABLED: HRESULT = 0x80320013u32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_LAYER: HRESULT = 0x80320014u32 as HRESULT;
-pub const FWP_E_KM_CLIENTS_ONLY: HRESULT = 0x80320015u32 as HRESULT;
-pub const FWP_E_LIFETIME_MISMATCH: HRESULT = 0x80320016u32 as HRESULT;
-pub const FWP_E_BUILTIN_OBJECT: HRESULT = 0x80320017u32 as HRESULT;
-pub const FWP_E_TOO_MANY_CALLOUTS: HRESULT = 0x80320018u32 as HRESULT;
-pub const FWP_E_NOTIFICATION_DROPPED: HRESULT = 0x80320019u32 as HRESULT;
-pub const FWP_E_TRAFFIC_MISMATCH: HRESULT = 0x8032001Au32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_SA_STATE: HRESULT = 0x8032001Bu32 as HRESULT;
-pub const FWP_E_NULL_POINTER: HRESULT = 0x8032001Cu32 as HRESULT;
-pub const FWP_E_INVALID_ENUMERATOR: HRESULT = 0x8032001Du32 as HRESULT;
-pub const FWP_E_INVALID_FLAGS: HRESULT = 0x8032001Eu32 as HRESULT;
-pub const FWP_E_INVALID_NET_MASK: HRESULT = 0x8032001Fu32 as HRESULT;
-pub const FWP_E_INVALID_RANGE: HRESULT = 0x80320020u32 as HRESULT;
-pub const FWP_E_INVALID_INTERVAL: HRESULT = 0x80320021u32 as HRESULT;
-pub const FWP_E_ZERO_LENGTH_ARRAY: HRESULT = 0x80320022u32 as HRESULT;
-pub const FWP_E_NULL_DISPLAY_NAME: HRESULT = 0x80320023u32 as HRESULT;
-pub const FWP_E_INVALID_ACTION_TYPE: HRESULT = 0x80320024u32 as HRESULT;
-pub const FWP_E_INVALID_WEIGHT: HRESULT = 0x80320025u32 as HRESULT;
-pub const FWP_E_MATCH_TYPE_MISMATCH: HRESULT = 0x80320026u32 as HRESULT;
-pub const FWP_E_TYPE_MISMATCH: HRESULT = 0x80320027u32 as HRESULT;
-pub const FWP_E_OUT_OF_BOUNDS: HRESULT = 0x80320028u32 as HRESULT;
-pub const FWP_E_RESERVED: HRESULT = 0x80320029u32 as HRESULT;
-pub const FWP_E_DUPLICATE_CONDITION: HRESULT = 0x8032002Au32 as HRESULT;
-pub const FWP_E_DUPLICATE_KEYMOD: HRESULT = 0x8032002Bu32 as HRESULT;
-pub const FWP_E_ACTION_INCOMPATIBLE_WITH_LAYER: HRESULT = 0x8032002Cu32 as HRESULT;
-pub const FWP_E_ACTION_INCOMPATIBLE_WITH_SUBLAYER: HRESULT = 0x8032002Du32 as HRESULT;
-pub const FWP_E_CONTEXT_INCOMPATIBLE_WITH_LAYER: HRESULT = 0x8032002Eu32 as HRESULT;
-pub const FWP_E_CONTEXT_INCOMPATIBLE_WITH_CALLOUT: HRESULT = 0x8032002Fu32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_AUTH_METHOD: HRESULT = 0x80320030u32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_DH_GROUP: HRESULT = 0x80320031u32 as HRESULT;
-pub const FWP_E_EM_NOT_SUPPORTED: HRESULT = 0x80320032u32 as HRESULT;
-pub const FWP_E_NEVER_MATCH: HRESULT = 0x80320033u32 as HRESULT;
-pub const FWP_E_PROVIDER_CONTEXT_MISMATCH: HRESULT = 0x80320034u32 as HRESULT;
-pub const FWP_E_INVALID_PARAMETER: HRESULT = 0x80320035u32 as HRESULT;
-pub const FWP_E_TOO_MANY_SUBLAYERS: HRESULT = 0x80320036u32 as HRESULT;
-pub const FWP_E_CALLOUT_NOTIFICATION_FAILED: HRESULT = 0x80320037u32 as HRESULT;
-pub const FWP_E_INVALID_AUTH_TRANSFORM: HRESULT = 0x80320038u32 as HRESULT;
-pub const FWP_E_INVALID_CIPHER_TRANSFORM: HRESULT = 0x80320039u32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_CIPHER_TRANSFORM: HRESULT = 0x8032003Au32 as HRESULT;
-pub const FWP_E_INVALID_TRANSFORM_COMBINATION: HRESULT = 0x8032003Bu32 as HRESULT;
-pub const FWP_E_DUPLICATE_AUTH_METHOD: HRESULT = 0x8032003Cu32 as HRESULT;
-pub const FWP_E_INVALID_TUNNEL_ENDPOINT: HRESULT = 0x8032003Du32 as HRESULT;
-pub const FWP_E_L2_DRIVER_NOT_READY: HRESULT = 0x8032003Eu32 as HRESULT;
-pub const FWP_E_KEY_DICTATOR_ALREADY_REGISTERED: HRESULT = 0x8032003Fu32 as HRESULT;
-pub const FWP_E_KEY_DICTATION_INVALID_KEYING_MATERIAL: HRESULT = 0x80320040u32 as HRESULT;
-pub const FWP_E_CONNECTIONS_DISABLED: HRESULT = 0x80320041u32 as HRESULT;
-pub const FWP_E_INVALID_DNS_NAME: HRESULT = 0x80320042u32 as HRESULT;
-pub const FWP_E_STILL_ON: HRESULT = 0x80320043u32 as HRESULT;
-pub const FWP_E_IKEEXT_NOT_RUNNING: HRESULT = 0x80320044u32 as HRESULT;
-pub const FWP_E_DROP_NOICMP: HRESULT = 0x80320104u32 as HRESULT;
-pub const WS_S_ASYNC: HRESULT = 0x003D0000;
-pub const WS_S_END: HRESULT = 0x003D0001;
-pub const WS_E_INVALID_FORMAT: HRESULT = 0x803D0000u32 as HRESULT;
-pub const WS_E_OBJECT_FAULTED: HRESULT = 0x803D0001u32 as HRESULT;
-pub const WS_E_NUMERIC_OVERFLOW: HRESULT = 0x803D0002u32 as HRESULT;
-pub const WS_E_INVALID_OPERATION: HRESULT = 0x803D0003u32 as HRESULT;
-pub const WS_E_OPERATION_ABORTED: HRESULT = 0x803D0004u32 as HRESULT;
-pub const WS_E_ENDPOINT_ACCESS_DENIED: HRESULT = 0x803D0005u32 as HRESULT;
-pub const WS_E_OPERATION_TIMED_OUT: HRESULT = 0x803D0006u32 as HRESULT;
-pub const WS_E_OPERATION_ABANDONED: HRESULT = 0x803D0007u32 as HRESULT;
-pub const WS_E_QUOTA_EXCEEDED: HRESULT = 0x803D0008u32 as HRESULT;
-pub const WS_E_NO_TRANSLATION_AVAILABLE: HRESULT = 0x803D0009u32 as HRESULT;
-pub const WS_E_SECURITY_VERIFICATION_FAILURE: HRESULT = 0x803D000Au32 as HRESULT;
-pub const WS_E_ADDRESS_IN_USE: HRESULT = 0x803D000Bu32 as HRESULT;
-pub const WS_E_ADDRESS_NOT_AVAILABLE: HRESULT = 0x803D000Cu32 as HRESULT;
-pub const WS_E_ENDPOINT_NOT_FOUND: HRESULT = 0x803D000Du32 as HRESULT;
-pub const WS_E_ENDPOINT_NOT_AVAILABLE: HRESULT = 0x803D000Eu32 as HRESULT;
-pub const WS_E_ENDPOINT_FAILURE: HRESULT = 0x803D000Fu32 as HRESULT;
-pub const WS_E_ENDPOINT_UNREACHABLE: HRESULT = 0x803D0010u32 as HRESULT;
-pub const WS_E_ENDPOINT_ACTION_NOT_SUPPORTED: HRESULT = 0x803D0011u32 as HRESULT;
-pub const WS_E_ENDPOINT_TOO_BUSY: HRESULT = 0x803D0012u32 as HRESULT;
-pub const WS_E_ENDPOINT_FAULT_RECEIVED: HRESULT = 0x803D0013u32 as HRESULT;
-pub const WS_E_ENDPOINT_DISCONNECTED: HRESULT = 0x803D0014u32 as HRESULT;
-pub const WS_E_PROXY_FAILURE: HRESULT = 0x803D0015u32 as HRESULT;
-pub const WS_E_PROXY_ACCESS_DENIED: HRESULT = 0x803D0016u32 as HRESULT;
-pub const WS_E_NOT_SUPPORTED: HRESULT = 0x803D0017u32 as HRESULT;
-pub const WS_E_PROXY_REQUIRES_BASIC_AUTH: HRESULT = 0x803D0018u32 as HRESULT;
-pub const WS_E_PROXY_REQUIRES_DIGEST_AUTH: HRESULT = 0x803D0019u32 as HRESULT;
-pub const WS_E_PROXY_REQUIRES_NTLM_AUTH: HRESULT = 0x803D001Au32 as HRESULT;
-pub const WS_E_PROXY_REQUIRES_NEGOTIATE_AUTH: HRESULT = 0x803D001Bu32 as HRESULT;
-pub const WS_E_SERVER_REQUIRES_BASIC_AUTH: HRESULT = 0x803D001Cu32 as HRESULT;
-pub const WS_E_SERVER_REQUIRES_DIGEST_AUTH: HRESULT = 0x803D001Du32 as HRESULT;
-pub const WS_E_SERVER_REQUIRES_NTLM_AUTH: HRESULT = 0x803D001Eu32 as HRESULT;
-pub const WS_E_SERVER_REQUIRES_NEGOTIATE_AUTH: HRESULT = 0x803D001Fu32 as HRESULT;
-pub const WS_E_INVALID_ENDPOINT_URL: HRESULT = 0x803D0020u32 as HRESULT;
-pub const WS_E_OTHER: HRESULT = 0x803D0021u32 as HRESULT;
-pub const WS_E_SECURITY_TOKEN_EXPIRED: HRESULT = 0x803D0022u32 as HRESULT;
-pub const WS_E_SECURITY_SYSTEM_FAILURE: HRESULT = 0x803D0023u32 as HRESULT;
-pub const ERROR_NDIS_INTERFACE_CLOSING: HRESULT = 0x80340002u32 as HRESULT;
-pub const ERROR_NDIS_BAD_VERSION: HRESULT = 0x80340004u32 as HRESULT;
-pub const ERROR_NDIS_BAD_CHARACTERISTICS: HRESULT = 0x80340005u32 as HRESULT;
-pub const ERROR_NDIS_ADAPTER_NOT_FOUND: HRESULT = 0x80340006u32 as HRESULT;
-pub const ERROR_NDIS_OPEN_FAILED: HRESULT = 0x80340007u32 as HRESULT;
-pub const ERROR_NDIS_DEVICE_FAILED: HRESULT = 0x80340008u32 as HRESULT;
-pub const ERROR_NDIS_MULTICAST_FULL: HRESULT = 0x80340009u32 as HRESULT;
-pub const ERROR_NDIS_MULTICAST_EXISTS: HRESULT = 0x8034000Au32 as HRESULT;
-pub const ERROR_NDIS_MULTICAST_NOT_FOUND: HRESULT = 0x8034000Bu32 as HRESULT;
-pub const ERROR_NDIS_REQUEST_ABORTED: HRESULT = 0x8034000Cu32 as HRESULT;
-pub const ERROR_NDIS_RESET_IN_PROGRESS: HRESULT = 0x8034000Du32 as HRESULT;
-pub const ERROR_NDIS_NOT_SUPPORTED: HRESULT = 0x803400BBu32 as HRESULT;
-pub const ERROR_NDIS_INVALID_PACKET: HRESULT = 0x8034000Fu32 as HRESULT;
-pub const ERROR_NDIS_ADAPTER_NOT_READY: HRESULT = 0x80340011u32 as HRESULT;
-pub const ERROR_NDIS_INVALID_LENGTH: HRESULT = 0x80340014u32 as HRESULT;
-pub const ERROR_NDIS_INVALID_DATA: HRESULT = 0x80340015u32 as HRESULT;
-pub const ERROR_NDIS_BUFFER_TOO_SHORT: HRESULT = 0x80340016u32 as HRESULT;
-pub const ERROR_NDIS_INVALID_OID: HRESULT = 0x80340017u32 as HRESULT;
-pub const ERROR_NDIS_ADAPTER_REMOVED: HRESULT = 0x80340018u32 as HRESULT;
-pub const ERROR_NDIS_UNSUPPORTED_MEDIA: HRESULT = 0x80340019u32 as HRESULT;
-pub const ERROR_NDIS_GROUP_ADDRESS_IN_USE: HRESULT = 0x8034001Au32 as HRESULT;
-pub const ERROR_NDIS_FILE_NOT_FOUND: HRESULT = 0x8034001Bu32 as HRESULT;
-pub const ERROR_NDIS_ERROR_READING_FILE: HRESULT = 0x8034001Cu32 as HRESULT;
-pub const ERROR_NDIS_ALREADY_MAPPED: HRESULT = 0x8034001Du32 as HRESULT;
-pub const ERROR_NDIS_RESOURCE_CONFLICT: HRESULT = 0x8034001Eu32 as HRESULT;
-pub const ERROR_NDIS_MEDIA_DISCONNECTED: HRESULT = 0x8034001Fu32 as HRESULT;
-pub const ERROR_NDIS_INVALID_ADDRESS: HRESULT = 0x80340022u32 as HRESULT;
-pub const ERROR_NDIS_INVALID_DEVICE_REQUEST: HRESULT = 0x80340010u32 as HRESULT;
-pub const ERROR_NDIS_PAUSED: HRESULT = 0x8034002Au32 as HRESULT;
-pub const ERROR_NDIS_INTERFACE_NOT_FOUND: HRESULT = 0x8034002Bu32 as HRESULT;
-pub const ERROR_NDIS_UNSUPPORTED_REVISION: HRESULT = 0x8034002Cu32 as HRESULT;
-pub const ERROR_NDIS_INVALID_PORT: HRESULT = 0x8034002Du32 as HRESULT;
-pub const ERROR_NDIS_INVALID_PORT_STATE: HRESULT = 0x8034002Eu32 as HRESULT;
-pub const ERROR_NDIS_LOW_POWER_STATE: HRESULT = 0x8034002Fu32 as HRESULT;
-pub const ERROR_NDIS_REINIT_REQUIRED: HRESULT = 0x80340030u32 as HRESULT;
-pub const ERROR_NDIS_DOT11_AUTO_CONFIG_ENABLED: HRESULT = 0x80342000u32 as HRESULT;
-pub const ERROR_NDIS_DOT11_MEDIA_IN_USE: HRESULT = 0x80342001u32 as HRESULT;
-pub const ERROR_NDIS_DOT11_POWER_STATE_INVALID: HRESULT = 0x80342002u32 as HRESULT;
-pub const ERROR_NDIS_PM_WOL_PATTERN_LIST_FULL: HRESULT = 0x80342003u32 as HRESULT;
-pub const ERROR_NDIS_PM_PROTOCOL_OFFLOAD_LIST_FULL: HRESULT = 0x80342004u32 as HRESULT;
-pub const ERROR_NDIS_INDICATION_REQUIRED: HRESULT = 0x00340001;
-pub const ERROR_NDIS_OFFLOAD_POLICY: HRESULT = 0xC034100Fu32 as HRESULT;
-pub const ERROR_NDIS_OFFLOAD_CONNECTION_REJECTED: HRESULT = 0xC0341012u32 as HRESULT;
-pub const ERROR_NDIS_OFFLOAD_PATH_REJECTED: HRESULT = 0xC0341013u32 as HRESULT;
-pub const ERROR_HV_INVALID_HYPERCALL_CODE: HRESULT = 0xC0350002u32 as HRESULT;
-pub const ERROR_HV_INVALID_HYPERCALL_INPUT: HRESULT = 0xC0350003u32 as HRESULT;
-pub const ERROR_HV_INVALID_ALIGNMENT: HRESULT = 0xC0350004u32 as HRESULT;
-pub const ERROR_HV_INVALID_PARAMETER: HRESULT = 0xC0350005u32 as HRESULT;
-pub const ERROR_HV_ACCESS_DENIED: HRESULT = 0xC0350006u32 as HRESULT;
-pub const ERROR_HV_INVALID_PARTITION_STATE: HRESULT = 0xC0350007u32 as HRESULT;
-pub const ERROR_HV_OPERATION_DENIED: HRESULT = 0xC0350008u32 as HRESULT;
-pub const ERROR_HV_UNKNOWN_PROPERTY: HRESULT = 0xC0350009u32 as HRESULT;
-pub const ERROR_HV_PROPERTY_VALUE_OUT_OF_RANGE: HRESULT = 0xC035000Au32 as HRESULT;
-pub const ERROR_HV_INSUFFICIENT_MEMORY: HRESULT = 0xC035000Bu32 as HRESULT;
-pub const ERROR_HV_PARTITION_TOO_DEEP: HRESULT = 0xC035000Cu32 as HRESULT;
-pub const ERROR_HV_INVALID_PARTITION_ID: HRESULT = 0xC035000Du32 as HRESULT;
-pub const ERROR_HV_INVALID_VP_INDEX: HRESULT = 0xC035000Eu32 as HRESULT;
-pub const ERROR_HV_INVALID_PORT_ID: HRESULT = 0xC0350011u32 as HRESULT;
-pub const ERROR_HV_INVALID_CONNECTION_ID: HRESULT = 0xC0350012u32 as HRESULT;
-pub const ERROR_HV_INSUFFICIENT_BUFFERS: HRESULT = 0xC0350013u32 as HRESULT;
-pub const ERROR_HV_NOT_ACKNOWLEDGED: HRESULT = 0xC0350014u32 as HRESULT;
-pub const ERROR_HV_ACKNOWLEDGED: HRESULT = 0xC0350016u32 as HRESULT;
-pub const ERROR_HV_INVALID_SAVE_RESTORE_STATE: HRESULT = 0xC0350017u32 as HRESULT;
-pub const ERROR_HV_INVALID_SYNIC_STATE: HRESULT = 0xC0350018u32 as HRESULT;
-pub const ERROR_HV_OBJECT_IN_USE: HRESULT = 0xC0350019u32 as HRESULT;
-pub const ERROR_HV_INVALID_PROXIMITY_DOMAIN_INFO: HRESULT = 0xC035001Au32 as HRESULT;
-pub const ERROR_HV_NO_DATA: HRESULT = 0xC035001Bu32 as HRESULT;
-pub const ERROR_HV_INACTIVE: HRESULT = 0xC035001Cu32 as HRESULT;
-pub const ERROR_HV_NO_RESOURCES: HRESULT = 0xC035001Du32 as HRESULT;
-pub const ERROR_HV_FEATURE_UNAVAILABLE: HRESULT = 0xC035001Eu32 as HRESULT;
-pub const ERROR_HV_INSUFFICIENT_BUFFER: HRESULT = 0xC0350033u32 as HRESULT;
-pub const ERROR_HV_INSUFFICIENT_DEVICE_DOMAINS: HRESULT = 0xC0350038u32 as HRESULT;
-pub const ERROR_HV_INVALID_LP_INDEX: HRESULT = 0xC0350041u32 as HRESULT;
-pub const ERROR_HV_NOT_PRESENT: HRESULT = 0xC0351000u32 as HRESULT;
-pub const ERROR_VID_DUPLICATE_HANDLER: HRESULT = 0xC0370001u32 as HRESULT;
-pub const ERROR_VID_TOO_MANY_HANDLERS: HRESULT = 0xC0370002u32 as HRESULT;
-pub const ERROR_VID_QUEUE_FULL: HRESULT = 0xC0370003u32 as HRESULT;
-pub const ERROR_VID_HANDLER_NOT_PRESENT: HRESULT = 0xC0370004u32 as HRESULT;
-pub const ERROR_VID_INVALID_OBJECT_NAME: HRESULT = 0xC0370005u32 as HRESULT;
-pub const ERROR_VID_PARTITION_NAME_TOO_LONG: HRESULT = 0xC0370006u32 as HRESULT;
-pub const ERROR_VID_MESSAGE_QUEUE_NAME_TOO_LONG: HRESULT = 0xC0370007u32 as HRESULT;
-pub const ERROR_VID_PARTITION_ALREADY_EXISTS: HRESULT = 0xC0370008u32 as HRESULT;
-pub const ERROR_VID_PARTITION_DOES_NOT_EXIST: HRESULT = 0xC0370009u32 as HRESULT;
-pub const ERROR_VID_PARTITION_NAME_NOT_FOUND: HRESULT = 0xC037000Au32 as HRESULT;
-pub const ERROR_VID_MESSAGE_QUEUE_ALREADY_EXISTS: HRESULT = 0xC037000Bu32 as HRESULT;
-pub const ERROR_VID_EXCEEDED_MBP_ENTRY_MAP_LIMIT: HRESULT = 0xC037000Cu32 as HRESULT;
-pub const ERROR_VID_MB_STILL_REFERENCED: HRESULT = 0xC037000Du32 as HRESULT;
-pub const ERROR_VID_CHILD_GPA_PAGE_SET_CORRUPTED: HRESULT = 0xC037000Eu32 as HRESULT;
-pub const ERROR_VID_INVALID_NUMA_SETTINGS: HRESULT = 0xC037000Fu32 as HRESULT;
-pub const ERROR_VID_INVALID_NUMA_NODE_INDEX: HRESULT = 0xC0370010u32 as HRESULT;
-pub const ERROR_VID_NOTIFICATION_QUEUE_ALREADY_ASSOCIATED: HRESULT = 0xC0370011u32 as HRESULT;
-pub const ERROR_VID_INVALID_MEMORY_BLOCK_HANDLE: HRESULT = 0xC0370012u32 as HRESULT;
-pub const ERROR_VID_PAGE_RANGE_OVERFLOW: HRESULT = 0xC0370013u32 as HRESULT;
-pub const ERROR_VID_INVALID_MESSAGE_QUEUE_HANDLE: HRESULT = 0xC0370014u32 as HRESULT;
-pub const ERROR_VID_INVALID_GPA_RANGE_HANDLE: HRESULT = 0xC0370015u32 as HRESULT;
-pub const ERROR_VID_NO_MEMORY_BLOCK_NOTIFICATION_QUEUE: HRESULT = 0xC0370016u32 as HRESULT;
-pub const ERROR_VID_MEMORY_BLOCK_LOCK_COUNT_EXCEEDED: HRESULT = 0xC0370017u32 as HRESULT;
-pub const ERROR_VID_INVALID_PPM_HANDLE: HRESULT = 0xC0370018u32 as HRESULT;
-pub const ERROR_VID_MBPS_ARE_LOCKED: HRESULT = 0xC0370019u32 as HRESULT;
-pub const ERROR_VID_MESSAGE_QUEUE_CLOSED: HRESULT = 0xC037001Au32 as HRESULT;
-pub const ERROR_VID_VIRTUAL_PROCESSOR_LIMIT_EXCEEDED: HRESULT = 0xC037001Bu32 as HRESULT;
-pub const ERROR_VID_STOP_PENDING: HRESULT = 0xC037001Cu32 as HRESULT;
-pub const ERROR_VID_INVALID_PROCESSOR_STATE: HRESULT = 0xC037001Du32 as HRESULT;
-pub const ERROR_VID_EXCEEDED_KM_CONTEXT_COUNT_LIMIT: HRESULT = 0xC037001Eu32 as HRESULT;
-pub const ERROR_VID_KM_INTERFACE_ALREADY_INITIALIZED: HRESULT = 0xC037001Fu32 as HRESULT;
-pub const ERROR_VID_MB_PROPERTY_ALREADY_SET_RESET: HRESULT = 0xC0370020u32 as HRESULT;
-pub const ERROR_VID_MMIO_RANGE_DESTROYED: HRESULT = 0xC0370021u32 as HRESULT;
-pub const ERROR_VID_INVALID_CHILD_GPA_PAGE_SET: HRESULT = 0xC0370022u32 as HRESULT;
-pub const ERROR_VID_RESERVE_PAGE_SET_IS_BEING_USED: HRESULT = 0xC0370023u32 as HRESULT;
-pub const ERROR_VID_RESERVE_PAGE_SET_TOO_SMALL: HRESULT = 0xC0370024u32 as HRESULT;
-pub const ERROR_VID_MBP_ALREADY_LOCKED_USING_RESERVED_PAGE: HRESULT = 0xC0370025u32 as HRESULT;
-pub const ERROR_VID_MBP_COUNT_EXCEEDED_LIMIT: HRESULT = 0xC0370026u32 as HRESULT;
-pub const ERROR_VID_SAVED_STATE_CORRUPT: HRESULT = 0xC0370027u32 as HRESULT;
-pub const ERROR_VID_SAVED_STATE_UNRECOGNIZED_ITEM: HRESULT = 0xC0370028u32 as HRESULT;
-pub const ERROR_VID_SAVED_STATE_INCOMPATIBLE: HRESULT = 0xC0370029u32 as HRESULT;
-pub const ERROR_VID_REMOTE_NODE_PARENT_GPA_PAGES_USED: HRESULT = 0x80370001u32 as HRESULT;
-pub const ERROR_VOLMGR_INCOMPLETE_REGENERATION: HRESULT = 0x80380001u32 as HRESULT;
-pub const ERROR_VOLMGR_INCOMPLETE_DISK_MIGRATION: HRESULT = 0x80380002u32 as HRESULT;
-pub const ERROR_VOLMGR_DATABASE_FULL: HRESULT = 0xC0380001u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_CONFIGURATION_CORRUPTED: HRESULT = 0xC0380002u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_CONFIGURATION_NOT_IN_SYNC: HRESULT = 0xC0380003u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_CONFIG_UPDATE_FAILED: HRESULT = 0xC0380004u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_CONTAINS_NON_SIMPLE_VOLUME: HRESULT = 0xC0380005u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_DUPLICATE: HRESULT = 0xC0380006u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_DYNAMIC: HRESULT = 0xC0380007u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_ID_INVALID: HRESULT = 0xC0380008u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_INVALID: HRESULT = 0xC0380009u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAST_VOTER: HRESULT = 0xC038000Au32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_INVALID: HRESULT = 0xC038000Bu32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_NON_BASIC_BETWEEN_BASIC_PARTITIONS: HRESULT = 0xC038000Cu32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_NOT_CYLINDER_ALIGNED: HRESULT = 0xC038000Du32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_PARTITIONS_TOO_SMALL: HRESULT = 0xC038000Eu32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_PRIMARY_BETWEEN_LOGICAL_PARTITIONS: HRESULT = 0xC038000Fu32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_TOO_MANY_PARTITIONS: HRESULT = 0xC0380010u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_MISSING: HRESULT = 0xC0380011u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_NOT_EMPTY: HRESULT = 0xC0380012u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_NOT_ENOUGH_SPACE: HRESULT = 0xC0380013u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_REVECTORING_FAILED: HRESULT = 0xC0380014u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_SECTOR_SIZE_INVALID: HRESULT = 0xC0380015u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_SET_NOT_CONTAINED: HRESULT = 0xC0380016u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_USED_BY_MULTIPLE_MEMBERS: HRESULT = 0xC0380017u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_USED_BY_MULTIPLE_PLEXES: HRESULT = 0xC0380018u32 as HRESULT;
-pub const ERROR_VOLMGR_DYNAMIC_DISK_NOT_SUPPORTED: HRESULT = 0xC0380019u32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_ALREADY_USED: HRESULT = 0xC038001Au32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_NOT_CONTIGUOUS: HRESULT = 0xC038001Bu32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_NOT_IN_PUBLIC_REGION: HRESULT = 0xC038001Cu32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_NOT_SECTOR_ALIGNED: HRESULT = 0xC038001Du32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_OVERLAPS_EBR_PARTITION: HRESULT = 0xC038001Eu32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_VOLUME_LENGTHS_DO_NOT_MATCH: HRESULT = 0xC038001Fu32 as HRESULT;
-pub const ERROR_VOLMGR_FAULT_TOLERANT_NOT_SUPPORTED: HRESULT = 0xC0380020u32 as HRESULT;
-pub const ERROR_VOLMGR_INTERLEAVE_LENGTH_INVALID: HRESULT = 0xC0380021u32 as HRESULT;
-pub const ERROR_VOLMGR_MAXIMUM_REGISTERED_USERS: HRESULT = 0xC0380022u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_IN_SYNC: HRESULT = 0xC0380023u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_INDEX_DUPLICATE: HRESULT = 0xC0380024u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_INDEX_INVALID: HRESULT = 0xC0380025u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_MISSING: HRESULT = 0xC0380026u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_NOT_DETACHED: HRESULT = 0xC0380027u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_REGENERATING: HRESULT = 0xC0380028u32 as HRESULT;
-pub const ERROR_VOLMGR_ALL_DISKS_FAILED: HRESULT = 0xC0380029u32 as HRESULT;
-pub const ERROR_VOLMGR_NO_REGISTERED_USERS: HRESULT = 0xC038002Au32 as HRESULT;
-pub const ERROR_VOLMGR_NO_SUCH_USER: HRESULT = 0xC038002Bu32 as HRESULT;
-pub const ERROR_VOLMGR_NOTIFICATION_RESET: HRESULT = 0xC038002Cu32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_MEMBERS_INVALID: HRESULT = 0xC038002Du32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_PLEXES_INVALID: HRESULT = 0xC038002Eu32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_DUPLICATE: HRESULT = 0xC038002Fu32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_ID_INVALID: HRESULT = 0xC0380030u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_INVALID: HRESULT = 0xC0380031u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_NAME_INVALID: HRESULT = 0xC0380032u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_OFFLINE: HRESULT = 0xC0380033u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_HAS_QUORUM: HRESULT = 0xC0380034u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_WITHOUT_QUORUM: HRESULT = 0xC0380035u32 as HRESULT;
-pub const ERROR_VOLMGR_PARTITION_STYLE_INVALID: HRESULT = 0xC0380036u32 as HRESULT;
-pub const ERROR_VOLMGR_PARTITION_UPDATE_FAILED: HRESULT = 0xC0380037u32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_IN_SYNC: HRESULT = 0xC0380038u32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_INDEX_DUPLICATE: HRESULT = 0xC0380039u32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_INDEX_INVALID: HRESULT = 0xC038003Au32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_LAST_ACTIVE: HRESULT = 0xC038003Bu32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_MISSING: HRESULT = 0xC038003Cu32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_REGENERATING: HRESULT = 0xC038003Du32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_TYPE_INVALID: HRESULT = 0xC038003Eu32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_NOT_RAID5: HRESULT = 0xC038003Fu32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_NOT_SIMPLE: HRESULT = 0xC0380040u32 as HRESULT;
-pub const ERROR_VOLMGR_STRUCTURE_SIZE_INVALID: HRESULT = 0xC0380041u32 as HRESULT;
-pub const ERROR_VOLMGR_TOO_MANY_NOTIFICATION_REQUESTS: HRESULT = 0xC0380042u32 as HRESULT;
-pub const ERROR_VOLMGR_TRANSACTION_IN_PROGRESS: HRESULT = 0xC0380043u32 as HRESULT;
-pub const ERROR_VOLMGR_UNEXPECTED_DISK_LAYOUT_CHANGE: HRESULT = 0xC0380044u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_CONTAINS_MISSING_DISK: HRESULT = 0xC0380045u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_ID_INVALID: HRESULT = 0xC0380046u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_LENGTH_INVALID: HRESULT = 0xC0380047u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_LENGTH_NOT_SECTOR_SIZE_MULTIPLE: HRESULT = 0xC0380048u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_NOT_MIRRORED: HRESULT = 0xC0380049u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_NOT_RETAINED: HRESULT = 0xC038004Au32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_OFFLINE: HRESULT = 0xC038004Bu32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_RETAINED: HRESULT = 0xC038004Cu32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_EXTENTS_INVALID: HRESULT = 0xC038004Du32 as HRESULT;
-pub const ERROR_VOLMGR_DIFFERENT_SECTOR_SIZE: HRESULT = 0xC038004Eu32 as HRESULT;
-pub const ERROR_VOLMGR_BAD_BOOT_DISK: HRESULT = 0xC038004Fu32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_CONFIG_OFFLINE: HRESULT = 0xC0380050u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_CONFIG_ONLINE: HRESULT = 0xC0380051u32 as HRESULT;
-pub const ERROR_VOLMGR_NOT_PRIMARY_PACK: HRESULT = 0xC0380052u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_LOG_UPDATE_FAILED: HRESULT = 0xC0380053u32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_DISKS_IN_PLEX_INVALID: HRESULT = 0xC0380054u32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_DISKS_IN_MEMBER_INVALID: HRESULT = 0xC0380055u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_MIRRORED: HRESULT = 0xC0380056u32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_NOT_SIMPLE_SPANNED: HRESULT = 0xC0380057u32 as HRESULT;
-pub const ERROR_VOLMGR_NO_VALID_LOG_COPIES: HRESULT = 0xC0380058u32 as HRESULT;
-pub const ERROR_VOLMGR_PRIMARY_PACK_PRESENT: HRESULT = 0xC0380059u32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_DISKS_INVALID: HRESULT = 0xC038005Au32 as HRESULT;
-pub const ERROR_VOLMGR_MIRROR_NOT_SUPPORTED: HRESULT = 0xC038005Bu32 as HRESULT;
-pub const ERROR_VOLMGR_RAID5_NOT_SUPPORTED: HRESULT = 0xC038005Cu32 as HRESULT;
-pub const ERROR_BCD_NOT_ALL_ENTRIES_IMPORTED: HRESULT = 0x80390001u32 as HRESULT;
-pub const ERROR_BCD_TOO_MANY_ELEMENTS: HRESULT = 0xC0390002u32 as HRESULT;
-pub const ERROR_BCD_NOT_ALL_ENTRIES_SYNCHRONIZED: HRESULT = 0x80390003u32 as HRESULT;
-pub const ERROR_VHD_DRIVE_FOOTER_MISSING: HRESULT = 0xC03A0001u32 as HRESULT;
-pub const ERROR_VHD_DRIVE_FOOTER_CHECKSUM_MISMATCH: HRESULT = 0xC03A0002u32 as HRESULT;
-pub const ERROR_VHD_DRIVE_FOOTER_CORRUPT: HRESULT = 0xC03A0003u32 as HRESULT;
-pub const ERROR_VHD_FORMAT_UNKNOWN: HRESULT = 0xC03A0004u32 as HRESULT;
-pub const ERROR_VHD_FORMAT_UNSUPPORTED_VERSION: HRESULT = 0xC03A0005u32 as HRESULT;
-pub const ERROR_VHD_SPARSE_HEADER_CHECKSUM_MISMATCH: HRESULT = 0xC03A0006u32 as HRESULT;
-pub const ERROR_VHD_SPARSE_HEADER_UNSUPPORTED_VERSION: HRESULT = 0xC03A0007u32 as HRESULT;
-pub const ERROR_VHD_SPARSE_HEADER_CORRUPT: HRESULT = 0xC03A0008u32 as HRESULT;
-pub const ERROR_VHD_BLOCK_ALLOCATION_FAILURE: HRESULT = 0xC03A0009u32 as HRESULT;
-pub const ERROR_VHD_BLOCK_ALLOCATION_TABLE_CORRUPT: HRESULT = 0xC03A000Au32 as HRESULT;
-pub const ERROR_VHD_INVALID_BLOCK_SIZE: HRESULT = 0xC03A000Bu32 as HRESULT;
-pub const ERROR_VHD_BITMAP_MISMATCH: HRESULT = 0xC03A000Cu32 as HRESULT;
-pub const ERROR_VHD_PARENT_VHD_NOT_FOUND: HRESULT = 0xC03A000Du32 as HRESULT;
-pub const ERROR_VHD_CHILD_PARENT_ID_MISMATCH: HRESULT = 0xC03A000Eu32 as HRESULT;
-pub const ERROR_VHD_CHILD_PARENT_TIMESTAMP_MISMATCH: HRESULT = 0xC03A000Fu32 as HRESULT;
-pub const ERROR_VHD_METADATA_READ_FAILURE: HRESULT = 0xC03A0010u32 as HRESULT;
-pub const ERROR_VHD_METADATA_WRITE_FAILURE: HRESULT = 0xC03A0011u32 as HRESULT;
-pub const ERROR_VHD_INVALID_SIZE: HRESULT = 0xC03A0012u32 as HRESULT;
-pub const ERROR_VHD_INVALID_FILE_SIZE: HRESULT = 0xC03A0013u32 as HRESULT;
-pub const ERROR_VIRTDISK_PROVIDER_NOT_FOUND: HRESULT = 0xC03A0014u32 as HRESULT;
-pub const ERROR_VIRTDISK_NOT_VIRTUAL_DISK: HRESULT = 0xC03A0015u32 as HRESULT;
-pub const ERROR_VHD_PARENT_VHD_ACCESS_DENIED: HRESULT = 0xC03A0016u32 as HRESULT;
-pub const ERROR_VHD_CHILD_PARENT_SIZE_MISMATCH: HRESULT = 0xC03A0017u32 as HRESULT;
-pub const ERROR_VHD_DIFFERENCING_CHAIN_CYCLE_DETECTED: HRESULT = 0xC03A0018u32 as HRESULT;
-pub const ERROR_VHD_DIFFERENCING_CHAIN_ERROR_IN_PARENT: HRESULT = 0xC03A0019u32 as HRESULT;
-pub const ERROR_VIRTUAL_DISK_LIMITATION: HRESULT = 0xC03A001Au32 as HRESULT;
-pub const ERROR_VHD_INVALID_TYPE: HRESULT = 0xC03A001Bu32 as HRESULT;
-pub const ERROR_VHD_INVALID_STATE: HRESULT = 0xC03A001Cu32 as HRESULT;
-pub const ERROR_VIRTDISK_UNSUPPORTED_DISK_SECTOR_SIZE: HRESULT = 0xC03A001Du32 as HRESULT;
-pub const ERROR_VIRTDISK_DISK_ALREADY_OWNED: HRESULT = 0xC03A001Eu32 as HRESULT;
-pub const ERROR_VIRTDISK_DISK_ONLINE_AND_WRITABLE: HRESULT = 0xC03A001Fu32 as HRESULT;
-pub const ERROR_CTLOG_TRACKING_NOT_INITIALIZED: HRESULT = 0xC03A0020u32 as HRESULT;
-pub const ERROR_CTLOG_LOGFILE_SIZE_EXCEEDED_MAXSIZE: HRESULT = 0xC03A0021u32 as HRESULT;
-pub const ERROR_CTLOG_VHD_CHANGED_OFFLINE: HRESULT = 0xC03A0022u32 as HRESULT;
-pub const ERROR_CTLOG_INVALID_TRACKING_STATE: HRESULT = 0xC03A0023u32 as HRESULT;
-pub const ERROR_CTLOG_INCONSISTENT_TRACKING_FILE: HRESULT = 0xC03A0024u32 as HRESULT;
-pub const ERROR_VHD_RESIZE_WOULD_TRUNCATE_DATA: HRESULT = 0xC03A0025u32 as HRESULT;
-pub const ERROR_VHD_COULD_NOT_COMPUTE_MINIMUM_VIRTUAL_SIZE: HRESULT = 0xC03A0026u32 as HRESULT;
-pub const ERROR_VHD_ALREADY_AT_OR_BELOW_MINIMUM_VIRTUAL_SIZE: HRESULT = 0xC03A0027u32 as HRESULT;
-pub const ERROR_VHD_METADATA_FULL: HRESULT = 0xC03A0028u32 as HRESULT;
-pub const ERROR_QUERY_STORAGE_ERROR: HRESULT = 0x803A0001u32 as HRESULT;
-pub const SDIAG_E_CANCELLED: HRESULT = 0x803C0100u32 as HRESULT;
-pub const SDIAG_E_SCRIPT: HRESULT = 0x803C0101u32 as HRESULT;
-pub const SDIAG_E_POWERSHELL: HRESULT = 0x803C0102u32 as HRESULT;
-pub const SDIAG_E_MANAGEDHOST: HRESULT = 0x803C0103u32 as HRESULT;
-pub const SDIAG_E_NOVERIFIER: HRESULT = 0x803C0104u32 as HRESULT;
-pub const SDIAG_S_CANNOTRUN: HRESULT = 0x003C0105;
-pub const SDIAG_E_DISABLED: HRESULT = 0x803C0106u32 as HRESULT;
-pub const SDIAG_E_TRUST: HRESULT = 0x803C0107u32 as HRESULT;
-pub const SDIAG_E_CANNOTRUN: HRESULT = 0x803C0108u32 as HRESULT;
-pub const SDIAG_E_VERSION: HRESULT = 0x803C0109u32 as HRESULT;
-pub const SDIAG_E_RESOURCE: HRESULT = 0x803C010Au32 as HRESULT;
-pub const SDIAG_E_ROOTCAUSE: HRESULT = 0x803C010Bu32 as HRESULT;
-pub const WPN_E_CHANNEL_CLOSED: HRESULT = 0x803E0100u32 as HRESULT;
-pub const WPN_E_CHANNEL_REQUEST_NOT_COMPLETE: HRESULT = 0x803E0101u32 as HRESULT;
-pub const WPN_E_INVALID_APP: HRESULT = 0x803E0102u32 as HRESULT;
-pub const WPN_E_OUTSTANDING_CHANNEL_REQUEST: HRESULT = 0x803E0103u32 as HRESULT;
-pub const WPN_E_DUPLICATE_CHANNEL: HRESULT = 0x803E0104u32 as HRESULT;
-pub const WPN_E_PLATFORM_UNAVAILABLE: HRESULT = 0x803E0105u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_POSTED: HRESULT = 0x803E0106u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_HIDDEN: HRESULT = 0x803E0107u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_NOT_POSTED: HRESULT = 0x803E0108u32 as HRESULT;
-pub const WPN_E_CLOUD_DISABLED: HRESULT = 0x803E0109u32 as HRESULT;
-pub const WPN_E_CLOUD_INCAPABLE: HRESULT = 0x803E0110u32 as HRESULT;
-pub const WPN_E_CLOUD_AUTH_UNAVAILABLE: HRESULT = 0x803E011Au32 as HRESULT;
-pub const WPN_E_CLOUD_SERVICE_UNAVAILABLE: HRESULT = 0x803E011Bu32 as HRESULT;
-pub const WPN_E_FAILED_LOCK_SCREEN_UPDATE_INTIALIZATION: HRESULT = 0x803E011Cu32 as HRESULT;
-pub const WPN_E_NOTIFICATION_DISABLED: HRESULT = 0x803E0111u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_INCAPABLE: HRESULT = 0x803E0112u32 as HRESULT;
-pub const WPN_E_INTERNET_INCAPABLE: HRESULT = 0x803E0113u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_TYPE_DISABLED: HRESULT = 0x803E0114u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_SIZE: HRESULT = 0x803E0115u32 as HRESULT;
-pub const WPN_E_TAG_SIZE: HRESULT = 0x803E0116u32 as HRESULT;
-pub const WPN_E_ACCESS_DENIED: HRESULT = 0x803E0117u32 as HRESULT;
-pub const WPN_E_DUPLICATE_REGISTRATION: HRESULT = 0x803E0118u32 as HRESULT;
-pub const WPN_E_PUSH_NOTIFICATION_INCAPABLE: HRESULT = 0x803E0119u32 as HRESULT;
-pub const WPN_E_DEV_ID_SIZE: HRESULT = 0x803E0120u32 as HRESULT;
-pub const WPN_E_TAG_ALPHANUMERIC: HRESULT = 0x803E012Au32 as HRESULT;
-pub const WPN_E_INVALID_HTTP_STATUS_CODE: HRESULT = 0x803E012Bu32 as HRESULT;
-pub const WPN_E_OUT_OF_SESSION: HRESULT = 0x803E0200u32 as HRESULT;
-pub const WPN_E_POWER_SAVE: HRESULT = 0x803E0201u32 as HRESULT;
-pub const WPN_E_IMAGE_NOT_FOUND_IN_CACHE: HRESULT = 0x803E0202u32 as HRESULT;
-pub const WPN_E_ALL_URL_NOT_COMPLETED: HRESULT = 0x803E0203u32 as HRESULT;
-pub const WPN_E_INVALID_CLOUD_IMAGE: HRESULT = 0x803E0204u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_ID_MATCHED: HRESULT = 0x803E0205u32 as HRESULT;
-pub const WPN_E_CALLBACK_ALREADY_REGISTERED: HRESULT = 0x803E0206u32 as HRESULT;
-pub const WPN_E_TOAST_NOTIFICATION_DROPPED: HRESULT = 0x803E0207u32 as HRESULT;
-pub const WPN_E_STORAGE_LOCKED: HRESULT = 0x803E0208u32 as HRESULT;
-pub const E_MBN_CONTEXT_NOT_ACTIVATED: HRESULT = 0x80548201u32 as HRESULT;
-pub const E_MBN_BAD_SIM: HRESULT = 0x80548202u32 as HRESULT;
-pub const E_MBN_DATA_CLASS_NOT_AVAILABLE: HRESULT = 0x80548203u32 as HRESULT;
-pub const E_MBN_INVALID_ACCESS_STRING: HRESULT = 0x80548204u32 as HRESULT;
-pub const E_MBN_MAX_ACTIVATED_CONTEXTS: HRESULT = 0x80548205u32 as HRESULT;
-pub const E_MBN_PACKET_SVC_DETACHED: HRESULT = 0x80548206u32 as HRESULT;
-pub const E_MBN_PROVIDER_NOT_VISIBLE: HRESULT = 0x80548207u32 as HRESULT;
-pub const E_MBN_RADIO_POWER_OFF: HRESULT = 0x80548208u32 as HRESULT;
-pub const E_MBN_SERVICE_NOT_ACTIVATED: HRESULT = 0x80548209u32 as HRESULT;
-pub const E_MBN_SIM_NOT_INSERTED: HRESULT = 0x8054820Au32 as HRESULT;
-pub const E_MBN_VOICE_CALL_IN_PROGRESS: HRESULT = 0x8054820Bu32 as HRESULT;
-pub const E_MBN_INVALID_CACHE: HRESULT = 0x8054820Cu32 as HRESULT;
-pub const E_MBN_NOT_REGISTERED: HRESULT = 0x8054820Du32 as HRESULT;
-pub const E_MBN_PROVIDERS_NOT_FOUND: HRESULT = 0x8054820Eu32 as HRESULT;
-pub const E_MBN_PIN_NOT_SUPPORTED: HRESULT = 0x8054820Fu32 as HRESULT;
-pub const E_MBN_PIN_REQUIRED: HRESULT = 0x80548210u32 as HRESULT;
-pub const E_MBN_PIN_DISABLED: HRESULT = 0x80548211u32 as HRESULT;
-pub const E_MBN_FAILURE: HRESULT = 0x80548212u32 as HRESULT;
-pub const E_MBN_INVALID_PROFILE: HRESULT = 0x80548218u32 as HRESULT;
-pub const E_MBN_DEFAULT_PROFILE_EXIST: HRESULT = 0x80548219u32 as HRESULT;
-pub const E_MBN_SMS_ENCODING_NOT_SUPPORTED: HRESULT = 0x80548220u32 as HRESULT;
-pub const E_MBN_SMS_FILTER_NOT_SUPPORTED: HRESULT = 0x80548221u32 as HRESULT;
-pub const E_MBN_SMS_INVALID_MEMORY_INDEX: HRESULT = 0x80548222u32 as HRESULT;
-pub const E_MBN_SMS_LANG_NOT_SUPPORTED: HRESULT = 0x80548223u32 as HRESULT;
-pub const E_MBN_SMS_MEMORY_FAILURE: HRESULT = 0x80548224u32 as HRESULT;
-pub const E_MBN_SMS_NETWORK_TIMEOUT: HRESULT = 0x80548225u32 as HRESULT;
-pub const E_MBN_SMS_UNKNOWN_SMSC_ADDRESS: HRESULT = 0x80548226u32 as HRESULT;
-pub const E_MBN_SMS_FORMAT_NOT_SUPPORTED: HRESULT = 0x80548227u32 as HRESULT;
-pub const E_MBN_SMS_OPERATION_NOT_ALLOWED: HRESULT = 0x80548228u32 as HRESULT;
-pub const E_MBN_SMS_MEMORY_FULL: HRESULT = 0x80548229u32 as HRESULT;
-pub const PEER_E_IPV6_NOT_INSTALLED: HRESULT = 0x80630001u32 as HRESULT;
-pub const PEER_E_NOT_INITIALIZED: HRESULT = 0x80630002u32 as HRESULT;
-pub const PEER_E_CANNOT_START_SERVICE: HRESULT = 0x80630003u32 as HRESULT;
-pub const PEER_E_NOT_LICENSED: HRESULT = 0x80630004u32 as HRESULT;
-pub const PEER_E_INVALID_GRAPH: HRESULT = 0x80630010u32 as HRESULT;
-pub const PEER_E_DBNAME_CHANGED: HRESULT = 0x80630011u32 as HRESULT;
-pub const PEER_E_DUPLICATE_GRAPH: HRESULT = 0x80630012u32 as HRESULT;
-pub const PEER_E_GRAPH_NOT_READY: HRESULT = 0x80630013u32 as HRESULT;
-pub const PEER_E_GRAPH_SHUTTING_DOWN: HRESULT = 0x80630014u32 as HRESULT;
-pub const PEER_E_GRAPH_IN_USE: HRESULT = 0x80630015u32 as HRESULT;
-pub const PEER_E_INVALID_DATABASE: HRESULT = 0x80630016u32 as HRESULT;
-pub const PEER_E_TOO_MANY_ATTRIBUTES: HRESULT = 0x80630017u32 as HRESULT;
-pub const PEER_E_CONNECTION_NOT_FOUND: HRESULT = 0x80630103u32 as HRESULT;
-pub const PEER_E_CONNECT_SELF: HRESULT = 0x80630106u32 as HRESULT;
-pub const PEER_E_ALREADY_LISTENING: HRESULT = 0x80630107u32 as HRESULT;
-pub const PEER_E_NODE_NOT_FOUND: HRESULT = 0x80630108u32 as HRESULT;
-pub const PEER_E_CONNECTION_FAILED: HRESULT = 0x80630109u32 as HRESULT;
-pub const PEER_E_CONNECTION_NOT_AUTHENTICATED: HRESULT = 0x8063010Au32 as HRESULT;
-pub const PEER_E_CONNECTION_REFUSED: HRESULT = 0x8063010Bu32 as HRESULT;
-pub const PEER_E_CLASSIFIER_TOO_LONG: HRESULT = 0x80630201u32 as HRESULT;
-pub const PEER_E_TOO_MANY_IDENTITIES: HRESULT = 0x80630202u32 as HRESULT;
-pub const PEER_E_NO_KEY_ACCESS: HRESULT = 0x80630203u32 as HRESULT;
-pub const PEER_E_GROUPS_EXIST: HRESULT = 0x80630204u32 as HRESULT;
-pub const PEER_E_RECORD_NOT_FOUND: HRESULT = 0x80630301u32 as HRESULT;
-pub const PEER_E_DATABASE_ACCESSDENIED: HRESULT = 0x80630302u32 as HRESULT;
-pub const PEER_E_DBINITIALIZATION_FAILED: HRESULT = 0x80630303u32 as HRESULT;
-pub const PEER_E_MAX_RECORD_SIZE_EXCEEDED: HRESULT = 0x80630304u32 as HRESULT;
-pub const PEER_E_DATABASE_ALREADY_PRESENT: HRESULT = 0x80630305u32 as HRESULT;
-pub const PEER_E_DATABASE_NOT_PRESENT: HRESULT = 0x80630306u32 as HRESULT;
-pub const PEER_E_IDENTITY_NOT_FOUND: HRESULT = 0x80630401u32 as HRESULT;
-pub const PEER_E_EVENT_HANDLE_NOT_FOUND: HRESULT = 0x80630501u32 as HRESULT;
-pub const PEER_E_INVALID_SEARCH: HRESULT = 0x80630601u32 as HRESULT;
-pub const PEER_E_INVALID_ATTRIBUTES: HRESULT = 0x80630602u32 as HRESULT;
-pub const PEER_E_INVITATION_NOT_TRUSTED: HRESULT = 0x80630701u32 as HRESULT;
-pub const PEER_E_CHAIN_TOO_LONG: HRESULT = 0x80630703u32 as HRESULT;
-pub const PEER_E_INVALID_TIME_PERIOD: HRESULT = 0x80630705u32 as HRESULT;
-pub const PEER_E_CIRCULAR_CHAIN_DETECTED: HRESULT = 0x80630706u32 as HRESULT;
-pub const PEER_E_CERT_STORE_CORRUPTED: HRESULT = 0x80630801u32 as HRESULT;
-pub const PEER_E_NO_CLOUD: HRESULT = 0x80631001u32 as HRESULT;
-pub const PEER_E_CLOUD_NAME_AMBIGUOUS: HRESULT = 0x80631005u32 as HRESULT;
-pub const PEER_E_INVALID_RECORD: HRESULT = 0x80632010u32 as HRESULT;
-pub const PEER_E_NOT_AUTHORIZED: HRESULT = 0x80632020u32 as HRESULT;
-pub const PEER_E_PASSWORD_DOES_NOT_MEET_POLICY: HRESULT = 0x80632021u32 as HRESULT;
-pub const PEER_E_DEFERRED_VALIDATION: HRESULT = 0x80632030u32 as HRESULT;
-pub const PEER_E_INVALID_GROUP_PROPERTIES: HRESULT = 0x80632040u32 as HRESULT;
-pub const PEER_E_INVALID_PEER_NAME: HRESULT = 0x80632050u32 as HRESULT;
-pub const PEER_E_INVALID_CLASSIFIER: HRESULT = 0x80632060u32 as HRESULT;
-pub const PEER_E_INVALID_FRIENDLY_NAME: HRESULT = 0x80632070u32 as HRESULT;
-pub const PEER_E_INVALID_ROLE_PROPERTY: HRESULT = 0x80632071u32 as HRESULT;
-pub const PEER_E_INVALID_CLASSIFIER_PROPERTY: HRESULT = 0x80632072u32 as HRESULT;
-pub const PEER_E_INVALID_RECORD_EXPIRATION: HRESULT = 0x80632080u32 as HRESULT;
-pub const PEER_E_INVALID_CREDENTIAL_INFO: HRESULT = 0x80632081u32 as HRESULT;
-pub const PEER_E_INVALID_CREDENTIAL: HRESULT = 0x80632082u32 as HRESULT;
-pub const PEER_E_INVALID_RECORD_SIZE: HRESULT = 0x80632083u32 as HRESULT;
-pub const PEER_E_UNSUPPORTED_VERSION: HRESULT = 0x80632090u32 as HRESULT;
-pub const PEER_E_GROUP_NOT_READY: HRESULT = 0x80632091u32 as HRESULT;
-pub const PEER_E_GROUP_IN_USE: HRESULT = 0x80632092u32 as HRESULT;
-pub const PEER_E_INVALID_GROUP: HRESULT = 0x80632093u32 as HRESULT;
-pub const PEER_E_NO_MEMBERS_FOUND: HRESULT = 0x80632094u32 as HRESULT;
-pub const PEER_E_NO_MEMBER_CONNECTIONS: HRESULT = 0x80632095u32 as HRESULT;
-pub const PEER_E_UNABLE_TO_LISTEN: HRESULT = 0x80632096u32 as HRESULT;
-pub const PEER_E_IDENTITY_DELETED: HRESULT = 0x806320A0u32 as HRESULT;
-pub const PEER_E_SERVICE_NOT_AVAILABLE: HRESULT = 0x806320A1u32 as HRESULT;
-pub const PEER_E_CONTACT_NOT_FOUND: HRESULT = 0x80636001u32 as HRESULT;
-pub const PEER_S_GRAPH_DATA_CREATED: HRESULT = 0x00630001;
-pub const PEER_S_NO_EVENT_DATA: HRESULT = 0x00630002;
-pub const PEER_S_ALREADY_CONNECTED: HRESULT = 0x00632000;
-pub const PEER_S_SUBSCRIPTION_EXISTS: HRESULT = 0x00636000;
-pub const PEER_S_NO_CONNECTIVITY: HRESULT = 0x00630005;
-pub const PEER_S_ALREADY_A_MEMBER: HRESULT = 0x00630006;
-pub const PEER_E_CANNOT_CONVERT_PEER_NAME: HRESULT = 0x80634001u32 as HRESULT;
-pub const PEER_E_INVALID_PEER_HOST_NAME: HRESULT = 0x80634002u32 as HRESULT;
-pub const PEER_E_NO_MORE: HRESULT = 0x80634003u32 as HRESULT;
-pub const PEER_E_PNRP_DUPLICATE_PEER_NAME: HRESULT = 0x80634005u32 as HRESULT;
-pub const PEER_E_INVITE_CANCELLED: HRESULT = 0x80637000u32 as HRESULT;
-pub const PEER_E_INVITE_RESPONSE_NOT_AVAILABLE: HRESULT = 0x80637001u32 as HRESULT;
-pub const PEER_E_NOT_SIGNED_IN: HRESULT = 0x80637003u32 as HRESULT;
-pub const PEER_E_PRIVACY_DECLINED: HRESULT = 0x80637004u32 as HRESULT;
-pub const PEER_E_TIMEOUT: HRESULT = 0x80637005u32 as HRESULT;
-pub const PEER_E_INVALID_ADDRESS: HRESULT = 0x80637007u32 as HRESULT;
-pub const PEER_E_FW_EXCEPTION_DISABLED: HRESULT = 0x80637008u32 as HRESULT;
-pub const PEER_E_FW_BLOCKED_BY_POLICY: HRESULT = 0x80637009u32 as HRESULT;
-pub const PEER_E_FW_BLOCKED_BY_SHIELDS_UP: HRESULT = 0x8063700Au32 as HRESULT;
-pub const PEER_E_FW_DECLINED: HRESULT = 0x8063700Bu32 as HRESULT;
-pub const UI_E_CREATE_FAILED: HRESULT = 0x802A0001u32 as HRESULT;
-pub const UI_E_SHUTDOWN_CALLED: HRESULT = 0x802A0002u32 as HRESULT;
-pub const UI_E_ILLEGAL_REENTRANCY: HRESULT = 0x802A0003u32 as HRESULT;
-pub const UI_E_OBJECT_SEALED: HRESULT = 0x802A0004u32 as HRESULT;
-pub const UI_E_VALUE_NOT_SET: HRESULT = 0x802A0005u32 as HRESULT;
-pub const UI_E_VALUE_NOT_DETERMINED: HRESULT = 0x802A0006u32 as HRESULT;
-pub const UI_E_INVALID_OUTPUT: HRESULT = 0x802A0007u32 as HRESULT;
-pub const UI_E_BOOLEAN_EXPECTED: HRESULT = 0x802A0008u32 as HRESULT;
-pub const UI_E_DIFFERENT_OWNER: HRESULT = 0x802A0009u32 as HRESULT;
-pub const UI_E_AMBIGUOUS_MATCH: HRESULT = 0x802A000Au32 as HRESULT;
-pub const UI_E_FP_OVERFLOW: HRESULT = 0x802A000Bu32 as HRESULT;
-pub const UI_E_WRONG_THREAD: HRESULT = 0x802A000Cu32 as HRESULT;
-pub const UI_E_STORYBOARD_ACTIVE: HRESULT = 0x802A0101u32 as HRESULT;
-pub const UI_E_STORYBOARD_NOT_PLAYING: HRESULT = 0x802A0102u32 as HRESULT;
-pub const UI_E_START_KEYFRAME_AFTER_END: HRESULT = 0x802A0103u32 as HRESULT;
-pub const UI_E_END_KEYFRAME_NOT_DETERMINED: HRESULT = 0x802A0104u32 as HRESULT;
-pub const UI_E_LOOPS_OVERLAP: HRESULT = 0x802A0105u32 as HRESULT;
-pub const UI_E_TRANSITION_ALREADY_USED: HRESULT = 0x802A0106u32 as HRESULT;
-pub const UI_E_TRANSITION_NOT_IN_STORYBOARD: HRESULT = 0x802A0107u32 as HRESULT;
-pub const UI_E_TRANSITION_ECLIPSED: HRESULT = 0x802A0108u32 as HRESULT;
-pub const UI_E_TIME_BEFORE_LAST_UPDATE: HRESULT = 0x802A0109u32 as HRESULT;
-pub const UI_E_TIMER_CLIENT_ALREADY_CONNECTED: HRESULT = 0x802A010Au32 as HRESULT;
-pub const UI_E_INVALID_DIMENSION: HRESULT = 0x802A010Bu32 as HRESULT;
-pub const UI_E_PRIMITIVE_OUT_OF_BOUNDS: HRESULT = 0x802A010Cu32 as HRESULT;
-pub const UI_E_WINDOW_CLOSED: HRESULT = 0x802A0201u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INVALID_HANDLE: HRESULT = 0x80650001u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_READ_NOT_PERMITTED: HRESULT = 0x80650002u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_WRITE_NOT_PERMITTED: HRESULT = 0x80650003u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INVALID_PDU: HRESULT = 0x80650004u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_AUTHENTICATION: HRESULT = 0x80650005u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_REQUEST_NOT_SUPPORTED: HRESULT = 0x80650006u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INVALID_OFFSET: HRESULT = 0x80650007u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_AUTHORIZATION: HRESULT = 0x80650008u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_PREPARE_QUEUE_FULL: HRESULT = 0x80650009u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_ATTRIBUTE_NOT_FOUND: HRESULT = 0x8065000Au32 as HRESULT;
-pub const E_BLUETOOTH_ATT_ATTRIBUTE_NOT_LONG: HRESULT = 0x8065000Bu32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_ENCRYPTION_KEY_SIZE: HRESULT = 0x8065000Cu32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INVALID_ATTRIBUTE_VALUE_LENGTH: HRESULT = 0x8065000Du32 as HRESULT;
-pub const E_BLUETOOTH_ATT_UNLIKELY: HRESULT = 0x8065000Eu32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_ENCRYPTION: HRESULT = 0x8065000Fu32 as HRESULT;
-pub const E_BLUETOOTH_ATT_UNSUPPORTED_GROUP_TYPE: HRESULT = 0x80650010u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_RESOURCES: HRESULT = 0x80650011u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_UNKNOWN_ERROR: HRESULT = 0x80651000u32 as HRESULT;
-pub const E_AUDIO_ENGINE_NODE_NOT_FOUND: HRESULT = 0x80660001u32 as HRESULT;
-pub const E_HDAUDIO_EMPTY_CONNECTION_LIST: HRESULT = 0x80660002u32 as HRESULT;
-pub const E_HDAUDIO_CONNECTION_LIST_NOT_SUPPORTED: HRESULT = 0x80660003u32 as HRESULT;
-pub const E_HDAUDIO_NO_LOGICAL_DEVICES_CREATED: HRESULT = 0x80660004u32 as HRESULT;
-pub const E_HDAUDIO_NULL_LINKED_LIST_ENTRY: HRESULT = 0x80660005u32 as HRESULT;
-pub const ERROR_SPACES_POOL_WAS_DELETED: HRESULT = 0x00E70001;
-pub const ERROR_SPACES_RESILIENCY_TYPE_INVALID: HRESULT = 0x80E70003u32 as HRESULT;
-pub const ERROR_SPACES_DRIVE_SECTOR_SIZE_INVALID: HRESULT = 0x80E70004u32 as HRESULT;
-pub const ERROR_SPACES_DRIVE_REDUNDANCY_INVALID: HRESULT = 0x80E70006u32 as HRESULT;
-pub const ERROR_SPACES_NUMBER_OF_DATA_COPIES_INVALID: HRESULT = 0x80E70007u32 as HRESULT;
-pub const ERROR_SPACES_PARITY_LAYOUT_INVALID: HRESULT = 0x80E70008u32 as HRESULT;
-pub const ERROR_SPACES_INTERLEAVE_LENGTH_INVALID: HRESULT = 0x80E70009u32 as HRESULT;
-pub const ERROR_SPACES_NUMBER_OF_COLUMNS_INVALID: HRESULT = 0x80E7000Au32 as HRESULT;
-pub const ERROR_SPACES_NOT_ENOUGH_DRIVES: HRESULT = 0x80E7000Bu32 as HRESULT;
-pub const ERROR_VOLSNAP_BOOTFILE_NOT_VALID: HRESULT = 0x80820001u32 as HRESULT;
-pub const ERROR_TIERING_NOT_SUPPORTED_ON_VOLUME: HRESULT = 0x80830001u32 as HRESULT;
-pub const ERROR_TIERING_VOLUME_DISMOUNT_IN_PROGRESS: HRESULT = 0x80830002u32 as HRESULT;
-pub const ERROR_TIERING_STORAGE_TIER_NOT_FOUND: HRESULT = 0x80830003u32 as HRESULT;
-pub const ERROR_TIERING_INVALID_FILE_ID: HRESULT = 0x80830004u32 as HRESULT;
-pub const ERROR_TIERING_WRONG_CLUSTER_NODE: HRESULT = 0x80830005u32 as HRESULT;
-pub const ERROR_TIERING_ALREADY_PROCESSING: HRESULT = 0x80830006u32 as HRESULT;
-pub const ERROR_TIERING_CANNOT_PIN_OBJECT: HRESULT = 0x80830007u32 as HRESULT;
-pub const DXGI_STATUS_OCCLUDED: HRESULT = 0x087A0001;
-pub const DXGI_STATUS_CLIPPED: HRESULT = 0x087A0002;
-pub const DXGI_STATUS_NO_REDIRECTION: HRESULT = 0x087A0004;
-pub const DXGI_STATUS_NO_DESKTOP_ACCESS: HRESULT = 0x087A0005;
-pub const DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE: HRESULT = 0x087A0006;
-pub const DXGI_STATUS_MODE_CHANGED: HRESULT = 0x087A0007;
-pub const DXGI_STATUS_MODE_CHANGE_IN_PROGRESS: HRESULT = 0x087A0008;
-pub const DXGI_ERROR_INVALID_CALL: HRESULT = 0x887A0001u32 as HRESULT;
-pub const DXGI_ERROR_NOT_FOUND: HRESULT = 0x887A0002u32 as HRESULT;
-pub const DXGI_ERROR_MORE_DATA: HRESULT = 0x887A0003u32 as HRESULT;
-pub const DXGI_ERROR_UNSUPPORTED: HRESULT = 0x887A0004u32 as HRESULT;
-pub const DXGI_ERROR_DEVICE_REMOVED: HRESULT = 0x887A0005u32 as HRESULT;
-pub const DXGI_ERROR_DEVICE_HUNG: HRESULT = 0x887A0006u32 as HRESULT;
-pub const DXGI_ERROR_DEVICE_RESET: HRESULT = 0x887A0007u32 as HRESULT;
-pub const DXGI_ERROR_WAS_STILL_DRAWING: HRESULT = 0x887A000Au32 as HRESULT;
-pub const DXGI_ERROR_FRAME_STATISTICS_DISJOINT: HRESULT = 0x887A000Bu32 as HRESULT;
-pub const DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE: HRESULT = 0x887A000Cu32 as HRESULT;
-pub const DXGI_ERROR_DRIVER_INTERNAL_ERROR: HRESULT = 0x887A0020u32 as HRESULT;
-pub const DXGI_ERROR_NONEXCLUSIVE: HRESULT = 0x887A0021u32 as HRESULT;
-pub const DXGI_ERROR_NOT_CURRENTLY_AVAILABLE: HRESULT = 0x887A0022u32 as HRESULT;
-pub const DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED: HRESULT = 0x887A0023u32 as HRESULT;
-pub const DXGI_ERROR_REMOTE_OUTOFMEMORY: HRESULT = 0x887A0024u32 as HRESULT;
-pub const DXGI_ERROR_ACCESS_LOST: HRESULT = 0x887A0026u32 as HRESULT;
-pub const DXGI_ERROR_WAIT_TIMEOUT: HRESULT = 0x887A0027u32 as HRESULT;
-pub const DXGI_ERROR_SESSION_DISCONNECTED: HRESULT = 0x887A0028u32 as HRESULT;
-pub const DXGI_ERROR_RESTRICT_TO_OUTPUT_STALE: HRESULT = 0x887A0029u32 as HRESULT;
-pub const DXGI_ERROR_CANNOT_PROTECT_CONTENT: HRESULT = 0x887A002Au32 as HRESULT;
-pub const DXGI_ERROR_ACCESS_DENIED: HRESULT = 0x887A002Bu32 as HRESULT;
-pub const DXGI_ERROR_NAME_ALREADY_EXISTS: HRESULT = 0x887A002Cu32 as HRESULT;
-pub const DXGI_ERROR_SDK_COMPONENT_MISSING: HRESULT = 0x887A002Du32 as HRESULT;
-pub const DXGI_STATUS_UNOCCLUDED: HRESULT = 0x087A0009;
-pub const DXGI_STATUS_DDA_WAS_STILL_DRAWING: HRESULT = 0x087A000A;
-pub const DXGI_ERROR_MODE_CHANGE_IN_PROGRESS: HRESULT = 0x887A0025u32 as HRESULT;
-pub const DXGI_DDI_ERR_WASSTILLDRAWING: HRESULT = 0x887B0001u32 as HRESULT;
-pub const DXGI_DDI_ERR_UNSUPPORTED: HRESULT = 0x887B0002u32 as HRESULT;
-pub const DXGI_DDI_ERR_NONEXCLUSIVE: HRESULT = 0x887B0003u32 as HRESULT;
-pub const D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS: HRESULT = 0x88790001u32 as HRESULT;
-pub const D3D10_ERROR_FILE_NOT_FOUND: HRESULT = 0x88790002u32 as HRESULT;
-pub const D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS: HRESULT = 0x887C0001u32 as HRESULT;
-pub const D3D11_ERROR_FILE_NOT_FOUND: HRESULT = 0x887C0002u32 as HRESULT;
-pub const D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS: HRESULT = 0x887C0003u32 as HRESULT;
-pub const D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD: HRESULT = 0x887C0004u32 as HRESULT;
-pub const D2DERR_WRONG_STATE: HRESULT = 0x88990001u32 as HRESULT;
-pub const D2DERR_NOT_INITIALIZED: HRESULT = 0x88990002u32 as HRESULT;
-pub const D2DERR_UNSUPPORTED_OPERATION: HRESULT = 0x88990003u32 as HRESULT;
-pub const D2DERR_SCANNER_FAILED: HRESULT = 0x88990004u32 as HRESULT;
-pub const D2DERR_SCREEN_ACCESS_DENIED: HRESULT = 0x88990005u32 as HRESULT;
-pub const D2DERR_DISPLAY_STATE_INVALID: HRESULT = 0x88990006u32 as HRESULT;
-pub const D2DERR_ZERO_VECTOR: HRESULT = 0x88990007u32 as HRESULT;
-pub const D2DERR_INTERNAL_ERROR: HRESULT = 0x88990008u32 as HRESULT;
-pub const D2DERR_DISPLAY_FORMAT_NOT_SUPPORTED: HRESULT = 0x88990009u32 as HRESULT;
-pub const D2DERR_INVALID_CALL: HRESULT = 0x8899000Au32 as HRESULT;
-pub const D2DERR_NO_HARDWARE_DEVICE: HRESULT = 0x8899000Bu32 as HRESULT;
-pub const D2DERR_RECREATE_TARGET: HRESULT = 0x8899000Cu32 as HRESULT;
-pub const D2DERR_TOO_MANY_SHADER_ELEMENTS: HRESULT = 0x8899000Du32 as HRESULT;
-pub const D2DERR_SHADER_COMPILE_FAILED: HRESULT = 0x8899000Eu32 as HRESULT;
-pub const D2DERR_MAX_TEXTURE_SIZE_EXCEEDED: HRESULT = 0x8899000Fu32 as HRESULT;
-pub const D2DERR_UNSUPPORTED_VERSION: HRESULT = 0x88990010u32 as HRESULT;
-pub const D2DERR_BAD_NUMBER: HRESULT = 0x88990011u32 as HRESULT;
-pub const D2DERR_WRONG_FACTORY: HRESULT = 0x88990012u32 as HRESULT;
-pub const D2DERR_LAYER_ALREADY_IN_USE: HRESULT = 0x88990013u32 as HRESULT;
-pub const D2DERR_POP_CALL_DID_NOT_MATCH_PUSH: HRESULT = 0x88990014u32 as HRESULT;
-pub const D2DERR_WRONG_RESOURCE_DOMAIN: HRESULT = 0x88990015u32 as HRESULT;
-pub const D2DERR_PUSH_POP_UNBALANCED: HRESULT = 0x88990016u32 as HRESULT;
-pub const D2DERR_RENDER_TARGET_HAS_LAYER_OR_CLIPRECT: HRESULT = 0x88990017u32 as HRESULT;
-pub const D2DERR_INCOMPATIBLE_BRUSH_TYPES: HRESULT = 0x88990018u32 as HRESULT;
-pub const D2DERR_WIN32_ERROR: HRESULT = 0x88990019u32 as HRESULT;
-pub const D2DERR_TARGET_NOT_GDI_COMPATIBLE: HRESULT = 0x8899001Au32 as HRESULT;
-pub const D2DERR_TEXT_EFFECT_IS_WRONG_TYPE: HRESULT = 0x8899001Bu32 as HRESULT;
-pub const D2DERR_TEXT_RENDERER_NOT_RELEASED: HRESULT = 0x8899001Cu32 as HRESULT;
-pub const D2DERR_EXCEEDS_MAX_BITMAP_SIZE: HRESULT = 0x8899001Du32 as HRESULT;
-pub const D2DERR_INVALID_GRAPH_CONFIGURATION: HRESULT = 0x8899001Eu32 as HRESULT;
-pub const D2DERR_INVALID_INTERNAL_GRAPH_CONFIGURATION: HRESULT = 0x8899001Fu32 as HRESULT;
-pub const D2DERR_CYCLIC_GRAPH: HRESULT = 0x88990020u32 as HRESULT;
-pub const D2DERR_BITMAP_CANNOT_DRAW: HRESULT = 0x88990021u32 as HRESULT;
-pub const D2DERR_OUTSTANDING_BITMAP_REFERENCES: HRESULT = 0x88990022u32 as HRESULT;
-pub const D2DERR_ORIGINAL_TARGET_NOT_BOUND: HRESULT = 0x88990023u32 as HRESULT;
-pub const D2DERR_INVALID_TARGET: HRESULT = 0x88990024u32 as HRESULT;
-pub const D2DERR_BITMAP_BOUND_AS_TARGET: HRESULT = 0x88990025u32 as HRESULT;
-pub const D2DERR_INSUFFICIENT_DEVICE_CAPABILITIES: HRESULT = 0x88990026u32 as HRESULT;
-pub const D2DERR_INTERMEDIATE_TOO_LARGE: HRESULT = 0x88990027u32 as HRESULT;
-pub const D2DERR_EFFECT_IS_NOT_REGISTERED: HRESULT = 0x88990028u32 as HRESULT;
-pub const D2DERR_INVALID_PROPERTY: HRESULT = 0x88990029u32 as HRESULT;
-pub const D2DERR_NO_SUBPROPERTIES: HRESULT = 0x8899002Au32 as HRESULT;
-pub const D2DERR_PRINT_JOB_CLOSED: HRESULT = 0x8899002Bu32 as HRESULT;
-pub const D2DERR_PRINT_FORMAT_NOT_SUPPORTED: HRESULT = 0x8899002Cu32 as HRESULT;
-pub const D2DERR_TOO_MANY_TRANSFORM_INPUTS: HRESULT = 0x8899002Du32 as HRESULT;
-pub const DWRITE_E_FILEFORMAT: HRESULT = 0x88985000u32 as HRESULT;
-pub const DWRITE_E_UNEXPECTED: HRESULT = 0x88985001u32 as HRESULT;
-pub const DWRITE_E_NOFONT: HRESULT = 0x88985002u32 as HRESULT;
-pub const DWRITE_E_FILENOTFOUND: HRESULT = 0x88985003u32 as HRESULT;
-pub const DWRITE_E_FILEACCESS: HRESULT = 0x88985004u32 as HRESULT;
-pub const DWRITE_E_FONTCOLLECTIONOBSOLETE: HRESULT = 0x88985005u32 as HRESULT;
-pub const DWRITE_E_ALREADYREGISTERED: HRESULT = 0x88985006u32 as HRESULT;
-pub const DWRITE_E_CACHEFORMAT: HRESULT = 0x88985007u32 as HRESULT;
-pub const DWRITE_E_CACHEVERSION: HRESULT = 0x88985008u32 as HRESULT;
-pub const DWRITE_E_UNSUPPORTEDOPERATION: HRESULT = 0x88985009u32 as HRESULT;
-pub const DWRITE_E_TEXTRENDERERINCOMPATIBLE: HRESULT = 0x8898500Au32 as HRESULT;
-pub const DWRITE_E_FLOWDIRECTIONCONFLICTS: HRESULT = 0x8898500Bu32 as HRESULT;
-pub const DWRITE_E_NOCOLOR: HRESULT = 0x8898500Cu32 as HRESULT;
-pub const WINCODEC_ERR_WRONGSTATE: HRESULT = 0x88982F04u32 as HRESULT;
-pub const WINCODEC_ERR_VALUEOUTOFRANGE: HRESULT = 0x88982F05u32 as HRESULT;
-pub const WINCODEC_ERR_UNKNOWNIMAGEFORMAT: HRESULT = 0x88982F07u32 as HRESULT;
-pub const WINCODEC_ERR_UNSUPPORTEDVERSION: HRESULT = 0x88982F0Bu32 as HRESULT;
-pub const WINCODEC_ERR_NOTINITIALIZED: HRESULT = 0x88982F0Cu32 as HRESULT;
-pub const WINCODEC_ERR_ALREADYLOCKED: HRESULT = 0x88982F0Du32 as HRESULT;
-pub const WINCODEC_ERR_PROPERTYNOTFOUND: HRESULT = 0x88982F40u32 as HRESULT;
-pub const WINCODEC_ERR_PROPERTYNOTSUPPORTED: HRESULT = 0x88982F41u32 as HRESULT;
-pub const WINCODEC_ERR_PROPERTYSIZE: HRESULT = 0x88982F42u32 as HRESULT;
-pub const WINCODEC_ERR_CODECPRESENT: HRESULT = 0x88982F43u32 as HRESULT;
-pub const WINCODEC_ERR_CODECNOTHUMBNAIL: HRESULT = 0x88982F44u32 as HRESULT;
-pub const WINCODEC_ERR_PALETTEUNAVAILABLE: HRESULT = 0x88982F45u32 as HRESULT;
-pub const WINCODEC_ERR_CODECTOOMANYSCANLINES: HRESULT = 0x88982F46u32 as HRESULT;
-pub const WINCODEC_ERR_INTERNALERROR: HRESULT = 0x88982F48u32 as HRESULT;
-pub const WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS: HRESULT = 0x88982F49u32 as HRESULT;
-pub const WINCODEC_ERR_COMPONENTNOTFOUND: HRESULT = 0x88982F50u32 as HRESULT;
-pub const WINCODEC_ERR_IMAGESIZEOUTOFRANGE: HRESULT = 0x88982F51u32 as HRESULT;
-pub const WINCODEC_ERR_TOOMUCHMETADATA: HRESULT = 0x88982F52u32 as HRESULT;
-pub const WINCODEC_ERR_BADIMAGE: HRESULT = 0x88982F60u32 as HRESULT;
-pub const WINCODEC_ERR_BADHEADER: HRESULT = 0x88982F61u32 as HRESULT;
-pub const WINCODEC_ERR_FRAMEMISSING: HRESULT = 0x88982F62u32 as HRESULT;
-pub const WINCODEC_ERR_BADMETADATAHEADER: HRESULT = 0x88982F63u32 as HRESULT;
-pub const WINCODEC_ERR_BADSTREAMDATA: HRESULT = 0x88982F70u32 as HRESULT;
-pub const WINCODEC_ERR_STREAMWRITE: HRESULT = 0x88982F71u32 as HRESULT;
-pub const WINCODEC_ERR_STREAMREAD: HRESULT = 0x88982F72u32 as HRESULT;
-pub const WINCODEC_ERR_STREAMNOTAVAILABLE: HRESULT = 0x88982F73u32 as HRESULT;
-pub const WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT: HRESULT = 0x88982F80u32 as HRESULT;
-pub const WINCODEC_ERR_UNSUPPORTEDOPERATION: HRESULT = 0x88982F81u32 as HRESULT;
-pub const WINCODEC_ERR_INVALIDREGISTRATION: HRESULT = 0x88982F8Au32 as HRESULT;
-pub const WINCODEC_ERR_COMPONENTINITIALIZEFAILURE: HRESULT = 0x88982F8Bu32 as HRESULT;
-pub const WINCODEC_ERR_INSUFFICIENTBUFFER: HRESULT = 0x88982F8Cu32 as HRESULT;
-pub const WINCODEC_ERR_DUPLICATEMETADATAPRESENT: HRESULT = 0x88982F8Du32 as HRESULT;
-pub const WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE: HRESULT = 0x88982F8Eu32 as HRESULT;
-pub const WINCODEC_ERR_UNEXPECTEDSIZE: HRESULT = 0x88982F8Fu32 as HRESULT;
-pub const WINCODEC_ERR_INVALIDQUERYREQUEST: HRESULT = 0x88982F90u32 as HRESULT;
-pub const WINCODEC_ERR_UNEXPECTEDMETADATATYPE: HRESULT = 0x88982F91u32 as HRESULT;
-pub const WINCODEC_ERR_REQUESTONLYVALIDATMETADATAROOT: HRESULT = 0x88982F92u32 as HRESULT;
-pub const WINCODEC_ERR_INVALIDQUERYCHARACTER: HRESULT = 0x88982F93u32 as HRESULT;
-pub const WINCODEC_ERR_WIN32ERROR: HRESULT = 0x88982F94u32 as HRESULT;
-pub const WINCODEC_ERR_INVALIDPROGRESSIVELEVEL: HRESULT = 0x88982F95u32 as HRESULT;
-pub const MILERR_OBJECTBUSY: HRESULT = 0x88980001u32 as HRESULT;
-pub const MILERR_INSUFFICIENTBUFFER: HRESULT = 0x88980002u32 as HRESULT;
-pub const MILERR_WIN32ERROR: HRESULT = 0x88980003u32 as HRESULT;
-pub const MILERR_SCANNER_FAILED: HRESULT = 0x88980004u32 as HRESULT;
-pub const MILERR_SCREENACCESSDENIED: HRESULT = 0x88980005u32 as HRESULT;
-pub const MILERR_DISPLAYSTATEINVALID: HRESULT = 0x88980006u32 as HRESULT;
-pub const MILERR_NONINVERTIBLEMATRIX: HRESULT = 0x88980007u32 as HRESULT;
-pub const MILERR_ZEROVECTOR: HRESULT = 0x88980008u32 as HRESULT;
-pub const MILERR_TERMINATED: HRESULT = 0x88980009u32 as HRESULT;
-pub const MILERR_BADNUMBER: HRESULT = 0x8898000Au32 as HRESULT;
-pub const MILERR_INTERNALERROR: HRESULT = 0x88980080u32 as HRESULT;
-pub const MILERR_DISPLAYFORMATNOTSUPPORTED: HRESULT = 0x88980084u32 as HRESULT;
-pub const MILERR_INVALIDCALL: HRESULT = 0x88980085u32 as HRESULT;
-pub const MILERR_ALREADYLOCKED: HRESULT = 0x88980086u32 as HRESULT;
-pub const MILERR_NOTLOCKED: HRESULT = 0x88980087u32 as HRESULT;
-pub const MILERR_DEVICECANNOTRENDERTEXT: HRESULT = 0x88980088u32 as HRESULT;
-pub const MILERR_GLYPHBITMAPMISSED: HRESULT = 0x88980089u32 as HRESULT;
-pub const MILERR_MALFORMEDGLYPHCACHE: HRESULT = 0x8898008Au32 as HRESULT;
-pub const MILERR_GENERIC_IGNORE: HRESULT = 0x8898008Bu32 as HRESULT;
-pub const MILERR_MALFORMED_GUIDELINE_DATA: HRESULT = 0x8898008Cu32 as HRESULT;
-pub const MILERR_NO_HARDWARE_DEVICE: HRESULT = 0x8898008Du32 as HRESULT;
-pub const MILERR_NEED_RECREATE_AND_PRESENT: HRESULT = 0x8898008Eu32 as HRESULT;
-pub const MILERR_ALREADY_INITIALIZED: HRESULT = 0x8898008Fu32 as HRESULT;
-pub const MILERR_MISMATCHED_SIZE: HRESULT = 0x88980090u32 as HRESULT;
-pub const MILERR_NO_REDIRECTION_SURFACE_AVAILABLE: HRESULT = 0x88980091u32 as HRESULT;
-pub const MILERR_REMOTING_NOT_SUPPORTED: HRESULT = 0x88980092u32 as HRESULT;
-pub const MILERR_QUEUED_PRESENT_NOT_SUPPORTED: HRESULT = 0x88980093u32 as HRESULT;
-pub const MILERR_NOT_QUEUING_PRESENTS: HRESULT = 0x88980094u32 as HRESULT;
-pub const MILERR_NO_REDIRECTION_SURFACE_RETRY_LATER: HRESULT = 0x88980095u32 as HRESULT;
-pub const MILERR_TOOMANYSHADERELEMNTS: HRESULT = 0x88980096u32 as HRESULT;
-pub const MILERR_MROW_READLOCK_FAILED: HRESULT = 0x88980097u32 as HRESULT;
-pub const MILERR_MROW_UPDATE_FAILED: HRESULT = 0x88980098u32 as HRESULT;
-pub const MILERR_SHADER_COMPILE_FAILED: HRESULT = 0x88980099u32 as HRESULT;
-pub const MILERR_MAX_TEXTURE_SIZE_EXCEEDED: HRESULT = 0x8898009Au32 as HRESULT;
-pub const MILERR_QPC_TIME_WENT_BACKWARD: HRESULT = 0x8898009Bu32 as HRESULT;
-pub const MILERR_DXGI_ENUMERATION_OUT_OF_SYNC: HRESULT = 0x8898009Du32 as HRESULT;
-pub const MILERR_ADAPTER_NOT_FOUND: HRESULT = 0x8898009Eu32 as HRESULT;
-pub const MILERR_COLORSPACE_NOT_SUPPORTED: HRESULT = 0x8898009Fu32 as HRESULT;
-pub const MILERR_PREFILTER_NOT_SUPPORTED: HRESULT = 0x889800A0u32 as HRESULT;
-pub const MILERR_DISPLAYID_ACCESS_DENIED: HRESULT = 0x889800A1u32 as HRESULT;
-pub const UCEERR_INVALIDPACKETHEADER: HRESULT = 0x88980400u32 as HRESULT;
-pub const UCEERR_UNKNOWNPACKET: HRESULT = 0x88980401u32 as HRESULT;
-pub const UCEERR_ILLEGALPACKET: HRESULT = 0x88980402u32 as HRESULT;
-pub const UCEERR_MALFORMEDPACKET: HRESULT = 0x88980403u32 as HRESULT;
-pub const UCEERR_ILLEGALHANDLE: HRESULT = 0x88980404u32 as HRESULT;
-pub const UCEERR_HANDLELOOKUPFAILED: HRESULT = 0x88980405u32 as HRESULT;
-pub const UCEERR_RENDERTHREADFAILURE: HRESULT = 0x88980406u32 as HRESULT;
-pub const UCEERR_CTXSTACKFRSTTARGETNULL: HRESULT = 0x88980407u32 as HRESULT;
-pub const UCEERR_CONNECTIONIDLOOKUPFAILED: HRESULT = 0x88980408u32 as HRESULT;
-pub const UCEERR_BLOCKSFULL: HRESULT = 0x88980409u32 as HRESULT;
-pub const UCEERR_MEMORYFAILURE: HRESULT = 0x8898040Au32 as HRESULT;
-pub const UCEERR_PACKETRECORDOUTOFRANGE: HRESULT = 0x8898040Bu32 as HRESULT;
-pub const UCEERR_ILLEGALRECORDTYPE: HRESULT = 0x8898040Cu32 as HRESULT;
-pub const UCEERR_OUTOFHANDLES: HRESULT = 0x8898040Du32 as HRESULT;
-pub const UCEERR_UNCHANGABLE_UPDATE_ATTEMPTED: HRESULT = 0x8898040Eu32 as HRESULT;
-pub const UCEERR_NO_MULTIPLE_WORKER_THREADS: HRESULT = 0x8898040Fu32 as HRESULT;
-pub const UCEERR_REMOTINGNOTSUPPORTED: HRESULT = 0x88980410u32 as HRESULT;
-pub const UCEERR_MISSINGENDCOMMAND: HRESULT = 0x88980411u32 as HRESULT;
-pub const UCEERR_MISSINGBEGINCOMMAND: HRESULT = 0x88980412u32 as HRESULT;
-pub const UCEERR_CHANNELSYNCTIMEDOUT: HRESULT = 0x88980413u32 as HRESULT;
-pub const UCEERR_CHANNELSYNCABANDONED: HRESULT = 0x88980414u32 as HRESULT;
-pub const UCEERR_UNSUPPORTEDTRANSPORTVERSION: HRESULT = 0x88980415u32 as HRESULT;
-pub const UCEERR_TRANSPORTUNAVAILABLE: HRESULT = 0x88980416u32 as HRESULT;
-pub const UCEERR_FEEDBACK_UNSUPPORTED: HRESULT = 0x88980417u32 as HRESULT;
-pub const UCEERR_COMMANDTRANSPORTDENIED: HRESULT = 0x88980418u32 as HRESULT;
-pub const UCEERR_GRAPHICSSTREAMUNAVAILABLE: HRESULT = 0x88980419u32 as HRESULT;
-pub const UCEERR_GRAPHICSSTREAMALREADYOPEN: HRESULT = 0x88980420u32 as HRESULT;
-pub const UCEERR_TRANSPORTDISCONNECTED: HRESULT = 0x88980421u32 as HRESULT;
-pub const UCEERR_TRANSPORTOVERLOADED: HRESULT = 0x88980422u32 as HRESULT;
-pub const UCEERR_PARTITION_ZOMBIED: HRESULT = 0x88980423u32 as HRESULT;
-pub const MILAVERR_NOCLOCK: HRESULT = 0x88980500u32 as HRESULT;
-pub const MILAVERR_NOMEDIATYPE: HRESULT = 0x88980501u32 as HRESULT;
-pub const MILAVERR_NOVIDEOMIXER: HRESULT = 0x88980502u32 as HRESULT;
-pub const MILAVERR_NOVIDEOPRESENTER: HRESULT = 0x88980503u32 as HRESULT;
-pub const MILAVERR_NOREADYFRAMES: HRESULT = 0x88980504u32 as HRESULT;
-pub const MILAVERR_MODULENOTLOADED: HRESULT = 0x88980505u32 as HRESULT;
-pub const MILAVERR_WMPFACTORYNOTREGISTERED: HRESULT = 0x88980506u32 as HRESULT;
-pub const MILAVERR_INVALIDWMPVERSION: HRESULT = 0x88980507u32 as HRESULT;
-pub const MILAVERR_INSUFFICIENTVIDEORESOURCES: HRESULT = 0x88980508u32 as HRESULT;
-pub const MILAVERR_VIDEOACCELERATIONNOTAVAILABLE: HRESULT = 0x88980509u32 as HRESULT;
-pub const MILAVERR_REQUESTEDTEXTURETOOBIG: HRESULT = 0x8898050Au32 as HRESULT;
-pub const MILAVERR_SEEKFAILED: HRESULT = 0x8898050Bu32 as HRESULT;
-pub const MILAVERR_UNEXPECTEDWMPFAILURE: HRESULT = 0x8898050Cu32 as HRESULT;
-pub const MILAVERR_MEDIAPLAYERCLOSED: HRESULT = 0x8898050Du32 as HRESULT;
-pub const MILAVERR_UNKNOWNHARDWAREERROR: HRESULT = 0x8898050Eu32 as HRESULT;
-pub const MILEFFECTSERR_UNKNOWNPROPERTY: HRESULT = 0x8898060Eu32 as HRESULT;
-pub const MILEFFECTSERR_EFFECTNOTPARTOFGROUP: HRESULT = 0x8898060Fu32 as HRESULT;
-pub const MILEFFECTSERR_NOINPUTSOURCEATTACHED: HRESULT = 0x88980610u32 as HRESULT;
-pub const MILEFFECTSERR_CONNECTORNOTCONNECTED: HRESULT = 0x88980611u32 as HRESULT;
-pub const MILEFFECTSERR_CONNECTORNOTASSOCIATEDWITHEFFECT: HRESULT = 0x88980612u32 as HRESULT;
-pub const MILEFFECTSERR_RESERVED: HRESULT = 0x88980613u32 as HRESULT;
-pub const MILEFFECTSERR_CYCLEDETECTED: HRESULT = 0x88980614u32 as HRESULT;
-pub const MILEFFECTSERR_EFFECTINMORETHANONEGRAPH: HRESULT = 0x88980615u32 as HRESULT;
-pub const MILEFFECTSERR_EFFECTALREADYINAGRAPH: HRESULT = 0x88980616u32 as HRESULT;
-pub const MILEFFECTSERR_EFFECTHASNOCHILDREN: HRESULT = 0x88980617u32 as HRESULT;
-pub const MILEFFECTSERR_ALREADYATTACHEDTOLISTENER: HRESULT = 0x88980618u32 as HRESULT;
-pub const MILEFFECTSERR_NOTAFFINETRANSFORM: HRESULT = 0x88980619u32 as HRESULT;
-pub const MILEFFECTSERR_EMPTYBOUNDS: HRESULT = 0x8898061Au32 as HRESULT;
-pub const MILEFFECTSERR_OUTPUTSIZETOOLARGE: HRESULT = 0x8898061Bu32 as HRESULT;
-pub const DWMERR_STATE_TRANSITION_FAILED: HRESULT = 0x88980700u32 as HRESULT;
-pub const DWMERR_THEME_FAILED: HRESULT = 0x88980701u32 as HRESULT;
-pub const DWMERR_CATASTROPHIC_FAILURE: HRESULT = 0x88980702u32 as HRESULT;
-pub const DCOMPOSITION_ERROR_WINDOW_ALREADY_COMPOSED: HRESULT = 0x88980800u32 as HRESULT;
-pub const DCOMPOSITION_ERROR_SURFACE_BEING_RENDERED: HRESULT = 0x88980801u32 as HRESULT;
-pub const DCOMPOSITION_ERROR_SURFACE_NOT_BEING_RENDERED: HRESULT = 0x88980802u32 as HRESULT;
-pub const ONL_E_INVALID_AUTHENTICATION_TARGET: HRESULT = 0x80860001u32 as HRESULT;
-pub const ONL_E_ACCESS_DENIED_BY_TOU: HRESULT = 0x80860002u32 as HRESULT;
-pub const ONL_E_INVALID_APPLICATION: HRESULT = 0x80860003u32 as HRESULT;
-pub const ONL_E_PASSWORD_UPDATE_REQUIRED: HRESULT = 0x80860004u32 as HRESULT;
-pub const ONL_E_ACCOUNT_UPDATE_REQUIRED: HRESULT = 0x80860005u32 as HRESULT;
-pub const ONL_E_FORCESIGNIN: HRESULT = 0x80860006u32 as HRESULT;
-pub const ONL_E_ACCOUNT_LOCKED: HRESULT = 0x80860007u32 as HRESULT;
-pub const ONL_E_PARENTAL_CONSENT_REQUIRED: HRESULT = 0x80860008u32 as HRESULT;
-pub const ONL_E_EMAIL_VERIFICATION_REQUIRED: HRESULT = 0x80860009u32 as HRESULT;
-pub const ONL_E_ACCOUNT_SUSPENDED_COMPROIMISE: HRESULT = 0x8086000Au32 as HRESULT;
-pub const ONL_E_ACCOUNT_SUSPENDED_ABUSE: HRESULT = 0x8086000Bu32 as HRESULT;
-pub const ONL_E_ACTION_REQUIRED: HRESULT = 0x8086000Cu32 as HRESULT;
-pub const ONL_CONNECTION_COUNT_LIMIT: HRESULT = 0x8086000Du32 as HRESULT;
-pub const ONL_E_CONNECTED_ACCOUNT_CAN_NOT_SIGNOUT: HRESULT = 0x8086000Eu32 as HRESULT;
-pub const ONL_E_USER_AUTHENTICATION_REQUIRED: HRESULT = 0x8086000Fu32 as HRESULT;
-pub const ONL_E_REQUEST_THROTTLED: HRESULT = 0x80860010u32 as HRESULT;
-pub const FA_E_MAX_PERSISTED_ITEMS_REACHED: HRESULT = 0x80270220u32 as HRESULT;
-pub const FA_E_HOMEGROUP_NOT_AVAILABLE: HRESULT = 0x80270222u32 as HRESULT;
-pub const E_MONITOR_RESOLUTION_TOO_LOW: HRESULT = 0x80270250u32 as HRESULT;
-pub const E_ELEVATED_ACTIVATION_NOT_SUPPORTED: HRESULT = 0x80270251u32 as HRESULT;
-pub const E_UAC_DISABLED: HRESULT = 0x80270252u32 as HRESULT;
-pub const E_FULL_ADMIN_NOT_SUPPORTED: HRESULT = 0x80270253u32 as HRESULT;
-pub const E_APPLICATION_NOT_REGISTERED: HRESULT = 0x80270254u32 as HRESULT;
-pub const E_MULTIPLE_EXTENSIONS_FOR_APPLICATION: HRESULT = 0x80270255u32 as HRESULT;
-pub const E_MULTIPLE_PACKAGES_FOR_FAMILY: HRESULT = 0x80270256u32 as HRESULT;
-pub const E_APPLICATION_MANAGER_NOT_RUNNING: HRESULT = 0x80270257u32 as HRESULT;
-pub const S_STORE_LAUNCHED_FOR_REMEDIATION: HRESULT = 0x00270258;
-pub const S_APPLICATION_ACTIVATION_ERROR_HANDLED_BY_DIALOG: HRESULT = 0x00270259;
-pub const E_APPLICATION_ACTIVATION_TIMED_OUT: HRESULT = 0x8027025Au32 as HRESULT;
-pub const E_APPLICATION_ACTIVATION_EXEC_FAILURE: HRESULT = 0x8027025Bu32 as HRESULT;
-pub const E_APPLICATION_TEMPORARY_LICENSE_ERROR: HRESULT = 0x8027025Cu32 as HRESULT;
-pub const E_APPLICATION_TRIAL_LICENSE_EXPIRED: HRESULT = 0x8027025Du32 as HRESULT;
-pub const E_SKYDRIVE_ROOT_TARGET_FILE_SYSTEM_NOT_SUPPORTED: HRESULT = 0x80270260u32 as HRESULT;
-pub const E_SKYDRIVE_ROOT_TARGET_OVERLAP: HRESULT = 0x80270261u32 as HRESULT;
-pub const E_SKYDRIVE_ROOT_TARGET_CANNOT_INDEX: HRESULT = 0x80270262u32 as HRESULT;
-pub const E_SKYDRIVE_FILE_NOT_UPLOADED: HRESULT = 0x80270263u32 as HRESULT;
-pub const E_SKYDRIVE_UPDATE_AVAILABILITY_FAIL: HRESULT = 0x80270264u32 as HRESULT;
-pub const E_SKYDRIVE_ROOT_TARGET_VOLUME_ROOT_NOT_SUPPORTED: HRESULT = 0x80270265u32 as HRESULT;
-pub const E_SYNCENGINE_FILE_SIZE_OVER_LIMIT: HRESULT = 0x8802B001u32 as HRESULT;
-pub const E_SYNCENGINE_FILE_SIZE_EXCEEDS_REMAINING_QUOTA: HRESULT = 0x8802B002u32 as HRESULT;
-pub const E_SYNCENGINE_UNSUPPORTED_FILE_NAME: HRESULT = 0x8802B003u32 as HRESULT;
-pub const E_SYNCENGINE_FOLDER_ITEM_COUNT_LIMIT_EXCEEDED: HRESULT = 0x8802B004u32 as HRESULT;
-pub const E_SYNCENGINE_FILE_SYNC_PARTNER_ERROR: HRESULT = 0x8802B005u32 as HRESULT;
-pub const E_SYNCENGINE_SYNC_PAUSED_BY_SERVICE: HRESULT = 0x8802B006u32 as HRESULT;
-pub const E_SYNCENGINE_FILE_IDENTIFIER_UNKNOWN: HRESULT = 0x8802C002u32 as HRESULT;
-pub const E_SYNCENGINE_SERVICE_AUTHENTICATION_FAILED: HRESULT = 0x8802C003u32 as HRESULT;
-pub const E_SYNCENGINE_UNKNOWN_SERVICE_ERROR: HRESULT = 0x8802C004u32 as HRESULT;
-pub const E_SYNCENGINE_SERVICE_RETURNED_UNEXPECTED_SIZE: HRESULT = 0x8802C005u32 as HRESULT;
-pub const E_SYNCENGINE_REQUEST_BLOCKED_BY_SERVICE: HRESULT = 0x8802C006u32 as HRESULT;
-pub const E_SYNCENGINE_REQUEST_BLOCKED_DUE_TO_CLIENT_ERROR: HRESULT = 0x8802C007u32 as HRESULT;
-pub const E_SYNCENGINE_FOLDER_INACCESSIBLE: HRESULT = 0x8802D001u32 as HRESULT;
-pub const E_SYNCENGINE_UNSUPPORTED_FOLDER_NAME: HRESULT = 0x8802D002u32 as HRESULT;
-pub const E_SYNCENGINE_UNSUPPORTED_MARKET: HRESULT = 0x8802D003u32 as HRESULT;
-pub const E_SYNCENGINE_PATH_LENGTH_LIMIT_EXCEEDED: HRESULT = 0x8802D004u32 as HRESULT;
-pub const E_SYNCENGINE_REMOTE_PATH_LENGTH_LIMIT_EXCEEDED: HRESULT = 0x8802D005u32 as HRESULT;
-pub const E_SYNCENGINE_CLIENT_UPDATE_NEEDED: HRESULT = 0x8802D006u32 as HRESULT;
-pub const E_SYNCENGINE_PROXY_AUTHENTICATION_REQUIRED: HRESULT = 0x8802D007u32 as HRESULT;
-pub const E_SYNCENGINE_STORAGE_SERVICE_PROVISIONING_FAILED: HRESULT = 0x8802D008u32 as HRESULT;
-pub const E_SYNCENGINE_UNSUPPORTED_REPARSE_POINT: HRESULT = 0x8802D009u32 as HRESULT;
-pub const E_SYNCENGINE_STORAGE_SERVICE_BLOCKED: HRESULT = 0x8802D00Au32 as HRESULT;
-pub const E_SYNCENGINE_FOLDER_IN_REDIRECTION: HRESULT = 0x8802D00Bu32 as HRESULT;
-pub const EAS_E_POLICY_NOT_MANAGED_BY_OS: HRESULT = 0x80550001u32 as HRESULT;
-pub const EAS_E_POLICY_COMPLIANT_WITH_ACTIONS: HRESULT = 0x80550002u32 as HRESULT;
-pub const EAS_E_REQUESTED_POLICY_NOT_ENFORCEABLE: HRESULT = 0x80550003u32 as HRESULT;
-pub const EAS_E_CURRENT_USER_HAS_BLANK_PASSWORD: HRESULT = 0x80550004u32 as HRESULT;
-pub const EAS_E_REQUESTED_POLICY_PASSWORD_EXPIRATION_INCOMPATIBLE: HRESULT = 0x80550005u32 as HRESULT;
-pub const EAS_E_USER_CANNOT_CHANGE_PASSWORD: HRESULT = 0x80550006u32 as HRESULT;
-pub const EAS_E_ADMINS_HAVE_BLANK_PASSWORD: HRESULT = 0x80550007u32 as HRESULT;
-pub const EAS_E_ADMINS_CANNOT_CHANGE_PASSWORD: HRESULT = 0x80550008u32 as HRESULT;
-pub const EAS_E_LOCAL_CONTROLLED_USERS_CANNOT_CHANGE_PASSWORD: HRESULT = 0x80550009u32 as HRESULT;
-pub const EAS_E_PASSWORD_POLICY_NOT_ENFORCEABLE_FOR_CONNECTED_ADMINS: HRESULT = 0x8055000Au32 as HRESULT;
-pub const EAS_E_CONNECTED_ADMINS_NEED_TO_CHANGE_PASSWORD: HRESULT = 0x8055000Bu32 as HRESULT;
-pub const EAS_E_PASSWORD_POLICY_NOT_ENFORCEABLE_FOR_CURRENT_CONNECTED_USER: HRESULT = 0x8055000Cu32 as HRESULT;
-pub const EAS_E_CURRENT_CONNECTED_USER_NEED_TO_CHANGE_PASSWORD: HRESULT = 0x8055000Du32 as HRESULT;
-pub const WEB_E_UNSUPPORTED_FORMAT: HRESULT = 0x83750001u32 as HRESULT;
-pub const WEB_E_INVALID_XML: HRESULT = 0x83750002u32 as HRESULT;
-pub const WEB_E_MISSING_REQUIRED_ELEMENT: HRESULT = 0x83750003u32 as HRESULT;
-pub const WEB_E_MISSING_REQUIRED_ATTRIBUTE: HRESULT = 0x83750004u32 as HRESULT;
-pub const WEB_E_UNEXPECTED_CONTENT: HRESULT = 0x83750005u32 as HRESULT;
-pub const WEB_E_RESOURCE_TOO_LARGE: HRESULT = 0x83750006u32 as HRESULT;
-pub const WEB_E_INVALID_JSON_STRING: HRESULT = 0x83750007u32 as HRESULT;
-pub const WEB_E_INVALID_JSON_NUMBER: HRESULT = 0x83750008u32 as HRESULT;
-pub const WEB_E_JSON_VALUE_NOT_FOUND: HRESULT = 0x83750009u32 as HRESULT;
-pub const HTTP_E_STATUS_UNEXPECTED: HRESULT = 0x80190001u32 as HRESULT;
-pub const HTTP_E_STATUS_UNEXPECTED_REDIRECTION: HRESULT = 0x80190003u32 as HRESULT;
-pub const HTTP_E_STATUS_UNEXPECTED_CLIENT_ERROR: HRESULT = 0x80190004u32 as HRESULT;
-pub const HTTP_E_STATUS_UNEXPECTED_SERVER_ERROR: HRESULT = 0x80190005u32 as HRESULT;
-pub const HTTP_E_STATUS_AMBIGUOUS: HRESULT = 0x8019012Cu32 as HRESULT;
-pub const HTTP_E_STATUS_MOVED: HRESULT = 0x8019012Du32 as HRESULT;
-pub const HTTP_E_STATUS_REDIRECT: HRESULT = 0x8019012Eu32 as HRESULT;
-pub const HTTP_E_STATUS_REDIRECT_METHOD: HRESULT = 0x8019012Fu32 as HRESULT;
-pub const HTTP_E_STATUS_NOT_MODIFIED: HRESULT = 0x80190130u32 as HRESULT;
-pub const HTTP_E_STATUS_USE_PROXY: HRESULT = 0x80190131u32 as HRESULT;
-pub const HTTP_E_STATUS_REDIRECT_KEEP_VERB: HRESULT = 0x80190133u32 as HRESULT;
-pub const HTTP_E_STATUS_BAD_REQUEST: HRESULT = 0x80190190u32 as HRESULT;
-pub const HTTP_E_STATUS_DENIED: HRESULT = 0x80190191u32 as HRESULT;
-pub const HTTP_E_STATUS_PAYMENT_REQ: HRESULT = 0x80190192u32 as HRESULT;
-pub const HTTP_E_STATUS_FORBIDDEN: HRESULT = 0x80190193u32 as HRESULT;
-pub const HTTP_E_STATUS_NOT_FOUND: HRESULT = 0x80190194u32 as HRESULT;
-pub const HTTP_E_STATUS_BAD_METHOD: HRESULT = 0x80190195u32 as HRESULT;
-pub const HTTP_E_STATUS_NONE_ACCEPTABLE: HRESULT = 0x80190196u32 as HRESULT;
-pub const HTTP_E_STATUS_PROXY_AUTH_REQ: HRESULT = 0x80190197u32 as HRESULT;
-pub const HTTP_E_STATUS_REQUEST_TIMEOUT: HRESULT = 0x80190198u32 as HRESULT;
-pub const HTTP_E_STATUS_CONFLICT: HRESULT = 0x80190199u32 as HRESULT;
-pub const HTTP_E_STATUS_GONE: HRESULT = 0x8019019Au32 as HRESULT;
-pub const HTTP_E_STATUS_LENGTH_REQUIRED: HRESULT = 0x8019019Bu32 as HRESULT;
-pub const HTTP_E_STATUS_PRECOND_FAILED: HRESULT = 0x8019019Cu32 as HRESULT;
-pub const HTTP_E_STATUS_REQUEST_TOO_LARGE: HRESULT = 0x8019019Du32 as HRESULT;
-pub const HTTP_E_STATUS_URI_TOO_LONG: HRESULT = 0x8019019Eu32 as HRESULT;
-pub const HTTP_E_STATUS_UNSUPPORTED_MEDIA: HRESULT = 0x8019019Fu32 as HRESULT;
-pub const HTTP_E_STATUS_RANGE_NOT_SATISFIABLE: HRESULT = 0x801901A0u32 as HRESULT;
-pub const HTTP_E_STATUS_EXPECTATION_FAILED: HRESULT = 0x801901A1u32 as HRESULT;
-pub const HTTP_E_STATUS_SERVER_ERROR: HRESULT = 0x801901F4u32 as HRESULT;
-pub const HTTP_E_STATUS_NOT_SUPPORTED: HRESULT = 0x801901F5u32 as HRESULT;
-pub const HTTP_E_STATUS_BAD_GATEWAY: HRESULT = 0x801901F6u32 as HRESULT;
-pub const HTTP_E_STATUS_SERVICE_UNAVAIL: HRESULT = 0x801901F7u32 as HRESULT;
-pub const HTTP_E_STATUS_GATEWAY_TIMEOUT: HRESULT = 0x801901F8u32 as HRESULT;
-pub const HTTP_E_STATUS_VERSION_NOT_SUP: HRESULT = 0x801901F9u32 as HRESULT;
-pub const E_INVALID_PROTOCOL_OPERATION: HRESULT = 0x83760001u32 as HRESULT;
-pub const E_INVALID_PROTOCOL_FORMAT: HRESULT = 0x83760002u32 as HRESULT;
-pub const E_PROTOCOL_EXTENSIONS_NOT_SUPPORTED: HRESULT = 0x83760003u32 as HRESULT;
-pub const E_SUBPROTOCOL_NOT_SUPPORTED: HRESULT = 0x83760004u32 as HRESULT;
-pub const E_PROTOCOL_VERSION_NOT_SUPPORTED: HRESULT = 0x83760005u32 as HRESULT;
-pub const INPUT_E_OUT_OF_ORDER: HRESULT = 0x80400000u32 as HRESULT;
-pub const INPUT_E_REENTRANCY: HRESULT = 0x80400001u32 as HRESULT;
-pub const INPUT_E_MULTIMODAL: HRESULT = 0x80400002u32 as HRESULT;
-pub const INPUT_E_PACKET: HRESULT = 0x80400003u32 as HRESULT;
-pub const INPUT_E_FRAME: HRESULT = 0x80400004u32 as HRESULT;
-pub const INPUT_E_HISTORY: HRESULT = 0x80400005u32 as HRESULT;
-pub const INPUT_E_DEVICE_INFO: HRESULT = 0x80400006u32 as HRESULT;
-pub const INPUT_E_TRANSFORM: HRESULT = 0x80400007u32 as HRESULT;
-pub const INPUT_E_DEVICE_PROPERTY: HRESULT = 0x80400008u32 as HRESULT;
-pub const INET_E_INVALID_URL: HRESULT = 0x800C0002u32 as HRESULT;
-pub const INET_E_NO_SESSION: HRESULT = 0x800C0003u32 as HRESULT;
-pub const INET_E_CANNOT_CONNECT: HRESULT = 0x800C0004u32 as HRESULT;
-pub const INET_E_RESOURCE_NOT_FOUND: HRESULT = 0x800C0005u32 as HRESULT;
-pub const INET_E_OBJECT_NOT_FOUND: HRESULT = 0x800C0006u32 as HRESULT;
-pub const INET_E_DATA_NOT_AVAILABLE: HRESULT = 0x800C0007u32 as HRESULT;
-pub const INET_E_DOWNLOAD_FAILURE: HRESULT = 0x800C0008u32 as HRESULT;
-pub const INET_E_AUTHENTICATION_REQUIRED: HRESULT = 0x800C0009u32 as HRESULT;
-pub const INET_E_NO_VALID_MEDIA: HRESULT = 0x800C000Au32 as HRESULT;
-pub const INET_E_CONNECTION_TIMEOUT: HRESULT = 0x800C000Bu32 as HRESULT;
-pub const INET_E_INVALID_REQUEST: HRESULT = 0x800C000Cu32 as HRESULT;
-pub const INET_E_UNKNOWN_PROTOCOL: HRESULT = 0x800C000Du32 as HRESULT;
-pub const INET_E_SECURITY_PROBLEM: HRESULT = 0x800C000Eu32 as HRESULT;
-pub const INET_E_CANNOT_LOAD_DATA: HRESULT = 0x800C000Fu32 as HRESULT;
-pub const INET_E_CANNOT_INSTANTIATE_OBJECT: HRESULT = 0x800C0010u32 as HRESULT;
-pub const INET_E_INVALID_CERTIFICATE: HRESULT = 0x800C0019u32 as HRESULT;
-pub const INET_E_REDIRECT_FAILED: HRESULT = 0x800C0014u32 as HRESULT;
-pub const INET_E_REDIRECT_TO_DIR: HRESULT = 0x800C0015u32 as HRESULT;
-pub const ERROR_DBG_CREATE_PROCESS_FAILURE_LOCKDOWN: HRESULT = 0x80B00001u32 as HRESULT;
-pub const ERROR_DBG_ATTACH_PROCESS_FAILURE_LOCKDOWN: HRESULT = 0x80B00002u32 as HRESULT;
-pub const ERROR_DBG_CONNECT_SERVER_FAILURE_LOCKDOWN: HRESULT = 0x80B00003u32 as HRESULT;
-pub const ERROR_DBG_START_SERVER_FAILURE_LOCKDOWN: HRESULT = 0x80B00004u32 as HRESULT;
-pub const ERROR_IO_PREEMPTED: HRESULT = 0x89010001u32 as HRESULT;
-pub const JSCRIPT_E_CANTEXECUTE: HRESULT = 0x89020001u32 as HRESULT;
-pub const WEP_E_NOT_PROVISIONED_ON_ALL_VOLUMES: HRESULT = 0x88010001u32 as HRESULT;
-pub const WEP_E_FIXED_DATA_NOT_SUPPORTED: HRESULT = 0x88010002u32 as HRESULT;
-pub const WEP_E_HARDWARE_NOT_COMPLIANT: HRESULT = 0x88010003u32 as HRESULT;
-pub const WEP_E_LOCK_NOT_CONFIGURED: HRESULT = 0x88010004u32 as HRESULT;
-pub const WEP_E_PROTECTION_SUSPENDED: HRESULT = 0x88010005u32 as HRESULT;
-pub const WEP_E_NO_LICENSE: HRESULT = 0x88010006u32 as HRESULT;
-pub const WEP_E_OS_NOT_PROTECTED: HRESULT = 0x88010007u32 as HRESULT;
-pub const WEP_E_UNEXPECTED_FAIL: HRESULT = 0x88010008u32 as HRESULT;
-pub const WEP_E_BUFFER_TOO_LARGE: HRESULT = 0x88010009u32 as HRESULT;
-pub const ERROR_SVHDX_ERROR_STORED: HRESULT = 0xC05C0000u32 as HRESULT;
-pub const ERROR_SVHDX_ERROR_NOT_AVAILABLE: HRESULT = 0xC05CFF00u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_AVAILABLE: HRESULT = 0xC05CFF01u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_CAPACITY_DATA_CHANGED: HRESULT = 0xC05CFF02u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_RESERVATIONS_PREEMPTED: HRESULT = 0xC05CFF03u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_RESERVATIONS_RELEASED: HRESULT = 0xC05CFF04u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_REGISTRATIONS_PREEMPTED: HRESULT = 0xC05CFF05u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_OPERATING_DEFINITION_CHANGED: HRESULT = 0xC05CFF06u32 as HRESULT;
-pub const ERROR_SVHDX_RESERVATION_CONFLICT: HRESULT = 0xC05CFF07u32 as HRESULT;
-pub const ERROR_SVHDX_WRONG_FILE_TYPE: HRESULT = 0xC05CFF08u32 as HRESULT;
-pub const ERROR_SVHDX_VERSION_MISMATCH: HRESULT = 0xC05CFF09u32 as HRESULT;
-pub const ERROR_VHD_SHARED: HRESULT = 0xC05CFF0Au32 as HRESULT;
-pub const WININET_E_OUT_OF_HANDLES: HRESULT = 0x80072EE1u32 as HRESULT;
-pub const WININET_E_TIMEOUT: HRESULT = 0x80072EE2u32 as HRESULT;
-pub const WININET_E_EXTENDED_ERROR: HRESULT = 0x80072EE3u32 as HRESULT;
-pub const WININET_E_INTERNAL_ERROR: HRESULT = 0x80072EE4u32 as HRESULT;
-pub const WININET_E_INVALID_URL: HRESULT = 0x80072EE5u32 as HRESULT;
-pub const WININET_E_UNRECOGNIZED_SCHEME: HRESULT = 0x80072EE6u32 as HRESULT;
-pub const WININET_E_NAME_NOT_RESOLVED: HRESULT = 0x80072EE7u32 as HRESULT;
-pub const WININET_E_PROTOCOL_NOT_FOUND: HRESULT = 0x80072EE8u32 as HRESULT;
-pub const WININET_E_INVALID_OPTION: HRESULT = 0x80072EE9u32 as HRESULT;
-pub const WININET_E_BAD_OPTION_LENGTH: HRESULT = 0x80072EEAu32 as HRESULT;
-pub const WININET_E_OPTION_NOT_SETTABLE: HRESULT = 0x80072EEBu32 as HRESULT;
-pub const WININET_E_SHUTDOWN: HRESULT = 0x80072EECu32 as HRESULT;
-pub const WININET_E_INCORRECT_USER_NAME: HRESULT = 0x80072EEDu32 as HRESULT;
-pub const WININET_E_INCORRECT_PASSWORD: HRESULT = 0x80072EEEu32 as HRESULT;
-pub const WININET_E_LOGIN_FAILURE: HRESULT = 0x80072EEFu32 as HRESULT;
-pub const WININET_E_INVALID_OPERATION: HRESULT = 0x80072EF0u32 as HRESULT;
-pub const WININET_E_OPERATION_CANCELLED: HRESULT = 0x80072EF1u32 as HRESULT;
-pub const WININET_E_INCORRECT_HANDLE_TYPE: HRESULT = 0x80072EF2u32 as HRESULT;
-pub const WININET_E_INCORRECT_HANDLE_STATE: HRESULT = 0x80072EF3u32 as HRESULT;
-pub const WININET_E_NOT_PROXY_REQUEST: HRESULT = 0x80072EF4u32 as HRESULT;
-pub const WININET_E_REGISTRY_VALUE_NOT_FOUND: HRESULT = 0x80072EF5u32 as HRESULT;
-pub const WININET_E_BAD_REGISTRY_PARAMETER: HRESULT = 0x80072EF6u32 as HRESULT;
-pub const WININET_E_NO_DIRECT_ACCESS: HRESULT = 0x80072EF7u32 as HRESULT;
-pub const WININET_E_NO_CONTEXT: HRESULT = 0x80072EF8u32 as HRESULT;
-pub const WININET_E_NO_CALLBACK: HRESULT = 0x80072EF9u32 as HRESULT;
-pub const WININET_E_REQUEST_PENDING: HRESULT = 0x80072EFAu32 as HRESULT;
-pub const WININET_E_INCORRECT_FORMAT: HRESULT = 0x80072EFBu32 as HRESULT;
-pub const WININET_E_ITEM_NOT_FOUND: HRESULT = 0x80072EFCu32 as HRESULT;
-pub const WININET_E_CANNOT_CONNECT: HRESULT = 0x80072EFDu32 as HRESULT;
-pub const WININET_E_CONNECTION_ABORTED: HRESULT = 0x80072EFEu32 as HRESULT;
-pub const WININET_E_CONNECTION_RESET: HRESULT = 0x80072EFFu32 as HRESULT;
-pub const WININET_E_FORCE_RETRY: HRESULT = 0x80072F00u32 as HRESULT;
-pub const WININET_E_INVALID_PROXY_REQUEST: HRESULT = 0x80072F01u32 as HRESULT;
-pub const WININET_E_NEED_UI: HRESULT = 0x80072F02u32 as HRESULT;
-pub const WININET_E_HANDLE_EXISTS: HRESULT = 0x80072F04u32 as HRESULT;
-pub const WININET_E_SEC_CERT_DATE_INVALID: HRESULT = 0x80072F05u32 as HRESULT;
-pub const WININET_E_SEC_CERT_CN_INVALID: HRESULT = 0x80072F06u32 as HRESULT;
-pub const WININET_E_HTTP_TO_HTTPS_ON_REDIR: HRESULT = 0x80072F07u32 as HRESULT;
-pub const WININET_E_HTTPS_TO_HTTP_ON_REDIR: HRESULT = 0x80072F08u32 as HRESULT;
-pub const WININET_E_MIXED_SECURITY: HRESULT = 0x80072F09u32 as HRESULT;
-pub const WININET_E_CHG_POST_IS_NON_SECURE: HRESULT = 0x80072F0Au32 as HRESULT;
-pub const WININET_E_POST_IS_NON_SECURE: HRESULT = 0x80072F0Bu32 as HRESULT;
-pub const WININET_E_CLIENT_AUTH_CERT_NEEDED: HRESULT = 0x80072F0Cu32 as HRESULT;
-pub const WININET_E_INVALID_CA: HRESULT = 0x80072F0Du32 as HRESULT;
-pub const WININET_E_CLIENT_AUTH_NOT_SETUP: HRESULT = 0x80072F0Eu32 as HRESULT;
-pub const WININET_E_ASYNC_THREAD_FAILED: HRESULT = 0x80072F0Fu32 as HRESULT;
-pub const WININET_E_REDIRECT_SCHEME_CHANGE: HRESULT = 0x80072F10u32 as HRESULT;
-pub const WININET_E_DIALOG_PENDING: HRESULT = 0x80072F11u32 as HRESULT;
-pub const WININET_E_RETRY_DIALOG: HRESULT = 0x80072F12u32 as HRESULT;
-pub const WININET_E_NO_NEW_CONTAINERS: HRESULT = 0x80072F13u32 as HRESULT;
-pub const WININET_E_HTTPS_HTTP_SUBMIT_REDIR: HRESULT = 0x80072F14u32 as HRESULT;
-pub const WININET_E_SEC_CERT_ERRORS: HRESULT = 0x80072F17u32 as HRESULT;
-pub const WININET_E_SEC_CERT_REV_FAILED: HRESULT = 0x80072F19u32 as HRESULT;
-pub const WININET_E_HEADER_NOT_FOUND: HRESULT = 0x80072F76u32 as HRESULT;
-pub const WININET_E_DOWNLEVEL_SERVER: HRESULT = 0x80072F77u32 as HRESULT;
-pub const WININET_E_INVALID_SERVER_RESPONSE: HRESULT = 0x80072F78u32 as HRESULT;
-pub const WININET_E_INVALID_HEADER: HRESULT = 0x80072F79u32 as HRESULT;
-pub const WININET_E_INVALID_QUERY_REQUEST: HRESULT = 0x80072F7Au32 as HRESULT;
-pub const WININET_E_HEADER_ALREADY_EXISTS: HRESULT = 0x80072F7Bu32 as HRESULT;
-pub const WININET_E_REDIRECT_FAILED: HRESULT = 0x80072F7Cu32 as HRESULT;
-pub const WININET_E_SECURITY_CHANNEL_ERROR: HRESULT = 0x80072F7Du32 as HRESULT;
-pub const WININET_E_UNABLE_TO_CACHE_FILE: HRESULT = 0x80072F7Eu32 as HRESULT;
-pub const WININET_E_TCPIP_NOT_INSTALLED: HRESULT = 0x80072F7Fu32 as HRESULT;
-pub const WININET_E_DISCONNECTED: HRESULT = 0x80072F83u32 as HRESULT;
-pub const WININET_E_SERVER_UNREACHABLE: HRESULT = 0x80072F84u32 as HRESULT;
-pub const WININET_E_PROXY_SERVER_UNREACHABLE: HRESULT = 0x80072F85u32 as HRESULT;
-pub const WININET_E_BAD_AUTO_PROXY_SCRIPT: HRESULT = 0x80072F86u32 as HRESULT;
-pub const WININET_E_UNABLE_TO_DOWNLOAD_SCRIPT: HRESULT = 0x80072F87u32 as HRESULT;
-pub const WININET_E_SEC_INVALID_CERT: HRESULT = 0x80072F89u32 as HRESULT;
-pub const WININET_E_SEC_CERT_REVOKED: HRESULT = 0x80072F8Au32 as HRESULT;
-pub const WININET_E_FAILED_DUETOSECURITYCHECK: HRESULT = 0x80072F8Bu32 as HRESULT;
-pub const WININET_E_NOT_INITIALIZED: HRESULT = 0x80072F8Cu32 as HRESULT;
-pub const WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY: HRESULT = 0x80072F8Eu32 as HRESULT;
-pub const WININET_E_DECODING_FAILED: HRESULT = 0x80072F8Fu32 as HRESULT;
-pub const WININET_E_NOT_REDIRECTED: HRESULT = 0x80072F80u32 as HRESULT;
-pub const WININET_E_COOKIE_NEEDS_CONFIRMATION: HRESULT = 0x80072F81u32 as HRESULT;
-pub const WININET_E_COOKIE_DECLINED: HRESULT = 0x80072F82u32 as HRESULT;
-pub const WININET_E_REDIRECT_NEEDS_CONFIRMATION: HRESULT = 0x80072F88u32 as HRESULT;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winevt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winevt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winevt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winevt.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Windows Events API
-pub type EVT_HANDLE = ::HANDLE;
-pub type PEVT_HANDLE = *mut ::HANDLE;
-ENUM!{enum EVT_VARIANT_TYPE {
-    EvtVarTypeNull = 0,
-    EvtVarTypeString = 1,
-    EvtVarTypeAnsiString = 2,
-    EvtVarTypeSByte = 3,
-    EvtVarTypeByte = 4,
-    EvtVarTypeInt16 = 5,
-    EvtVarTypeUInt16 = 6,
-    EvtVarTypeInt32 = 7,
-    EvtVarTypeUInt32 = 8,
-    EvtVarTypeInt64 = 9,
-    EvtVarTypeUInt64 = 10,
-    EvtVarTypeSingle = 11,
-    EvtVarTypeDouble = 12,
-    EvtVarTypeBoolean = 13,
-    EvtVarTypeBinary = 14,
-    EvtVarTypeGuid = 15,
-    EvtVarTypeSizeT = 16,
-    EvtVarTypeFileTime = 17,
-    EvtVarTypeSysTime = 18,
-    EvtVarTypeSid = 19,
-    EvtVarTypeHexInt32 = 20,
-    EvtVarTypeHexInt64 = 21,
-    EvtVarTypeEvtHandle = 32,
-    EvtVarTypeEvtXml = 35,
-}}
-pub const EVT_VARIANT_TYPE_MASK: ::DWORD = 0x7f;
-pub const EVT_VARIANT_TYPE_ARRAY: ::DWORD = 128;
-STRUCT!{struct EVT_VARIANT {
-    u: u64,
-    Count: ::DWORD,
-    Type: ::DWORD,
-}}
-// TODO - All the UNION! for each variant
-// TODO - The rest of this header
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wingdi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wingdi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wingdi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wingdi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1238 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! GDI procedure declarations, constant definitions and macros
-pub const DISPLAY_DEVICE_ATTACHED_TO_DESKTOP: ::DWORD = 0x00000001;
-pub const DISPLAY_DEVICE_MULTI_DRIVER: ::DWORD = 0x00000002;
-pub const DISPLAY_DEVICE_PRIMARY_DEVICE: ::DWORD = 0x00000004;
-pub const DISPLAY_DEVICE_MIRRORING_DRIVER: ::DWORD = 0x00000008;
-pub const DISPLAY_DEVICE_VGA_COMPATIBLE: ::DWORD = 0x00000010;
-pub const DISPLAY_DEVICE_REMOVABLE: ::DWORD = 0x00000020;
-pub const DISPLAY_DEVICE_ACC_DRIVER: ::DWORD = 0x00000040;
-pub const DISPLAY_DEVICE_MODESPRUNED: ::DWORD = 0x08000000;
-pub const DISPLAY_DEVICE_REMOTE: ::DWORD = 0x04000000;
-pub const DISPLAY_DEVICE_DISCONNECT: ::DWORD = 0x02000000;
-pub const DISPLAY_DEVICE_TS_COMPATIBLE: ::DWORD = 0x00200000;
-pub const DISPLAY_DEVICE_UNSAFE_MODES_ON: ::DWORD = 0x00080000;
-pub const DISPLAY_DEVICE_ACTIVE: ::DWORD = 0x00000001;
-pub const DISPLAY_DEVICE_ATTACHED: ::DWORD = 0x00000002;
-pub const DM_ORIENTATION: ::DWORD = 0x00000001;
-pub const DM_PAPERSIZE: ::DWORD = 0x00000002;
-pub const DM_PAPERLENGTH: ::DWORD = 0x00000004;
-pub const DM_PAPERWIDTH: ::DWORD = 0x00000008;
-pub const DM_SCALE: ::DWORD = 0x00000010;
-pub const DM_POSITION: ::DWORD = 0x00000020;
-pub const DM_NUP: ::DWORD = 0x00000040;
-pub const DM_DISPLAYORIENTATION: ::DWORD = 0x00000080;
-pub const DM_COPIES: ::DWORD = 0x00000100;
-pub const DM_DEFAULTSOURCE: ::DWORD = 0x00000200;
-pub const DM_PRINTQUALITY: ::DWORD = 0x00000400;
-pub const DM_COLOR: ::DWORD = 0x00000800;
-pub const DM_DUPLEX: ::DWORD = 0x00001000;
-pub const DM_YRESOLUTION: ::DWORD = 0x00002000;
-pub const DM_TTOPTION: ::DWORD = 0x00004000;
-pub const DM_COLLATE: ::DWORD = 0x00008000;
-pub const DM_FORMNAME: ::DWORD = 0x00010000;
-pub const DM_LOGPIXELS: ::DWORD = 0x00020000;
-pub const DM_BITSPERPEL: ::DWORD = 0x00040000;
-pub const DM_PELSWIDTH: ::DWORD = 0x00080000;
-pub const DM_PELSHEIGHT: ::DWORD = 0x00100000;
-pub const DM_DISPLAYFLAGS: ::DWORD = 0x00200000;
-pub const DM_DISPLAYFREQUENCY: ::DWORD = 0x00400000;
-pub const DM_ICMMETHOD: ::DWORD = 0x00800000;
-pub const DM_ICMINTENT: ::DWORD = 0x01000000;
-pub const DM_MEDIATYPE: ::DWORD = 0x02000000;
-pub const DM_DITHERTYPE: ::DWORD = 0x04000000;
-pub const DM_PANNINGWIDTH: ::DWORD = 0x08000000;
-pub const DM_PANNINGHEIGHT: ::DWORD = 0x10000000;
-pub const DM_DISPLAYFIXEDOUTPUT: ::DWORD = 0x20000000;
-pub const PFD_TYPE_RGBA: ::BYTE = 0;
-pub const PFD_TYPE_COLORINDEX: ::BYTE = 1;
-pub const PFD_MAIN_PLANE: ::BYTE = 0;
-pub const PFD_OVERLAY_PLANE: ::BYTE = 1;
-pub const PFD_UNDERLAY_PLANE: ::BYTE = 0xFF;
-pub const PFD_DOUBLEBUFFER: ::DWORD = 0x00000001;
-pub const PFD_STEREO: ::DWORD = 0x00000002;
-pub const PFD_DRAW_TO_WINDOW: ::DWORD = 0x00000004;
-pub const PFD_DRAW_TO_BITMAP: ::DWORD = 0x00000008;
-pub const PFD_SUPPORT_GDI: ::DWORD = 0x00000010;
-pub const PFD_SUPPORT_OPENGL: ::DWORD = 0x00000020;
-pub const PFD_GENERIC_FORMAT: ::DWORD = 0x00000040;
-pub const PFD_NEED_PALETTE: ::DWORD = 0x00000080;
-pub const PFD_NEED_SYSTEM_PALETTE: ::DWORD = 0x00000100;
-pub const PFD_SWAP_EXCHANGE: ::DWORD = 0x00000200;
-pub const PFD_SWAP_COPY: ::DWORD = 0x00000400;
-pub const PFD_SWAP_LAYER_BUFFERS: ::DWORD = 0x00000800;
-pub const PFD_GENERIC_ACCELERATED: ::DWORD = 0x00001000;
-pub const PFD_SUPPORT_DIRECTDRAW: ::DWORD = 0x00002000;
-pub const PFD_DIRECT3D_ACCELERATED: ::DWORD = 0x00004000;
-pub const PFD_SUPPORT_COMPOSITION: ::DWORD = 0x00008000;
-pub const PFD_DEPTH_DONTCARE: ::DWORD = 0x20000000;
-pub const PFD_DOUBLEBUFFER_DONTCARE: ::DWORD = 0x40000000;
-pub const PFD_STEREO_DONTCARE: ::DWORD = 0x80000000;
-pub const CCHFORMNAME: usize = 32;
-STRUCT!{struct DEVMODEA {
-    dmDeviceName: [::CHAR; ::CCHDEVICENAME],
-    dmSpecVersion: ::WORD,
-    dmDriverVersion: ::WORD,
-    dmSize: ::WORD,
-    dmDriverExtra: ::WORD,
-    dmFields: ::DWORD,
-    union1: [u8; 16],
-    dmColor: ::c_short,
-    dmDuplex: ::c_short,
-    dmYResolution: ::c_short,
-    dmTTOption: ::c_short,
-    dmCollate: ::c_short,
-    dmFormName: [::CHAR; CCHFORMNAME],
-    dmLogPixels: ::WORD,
-    dmBitsPerPel: ::DWORD,
-    dmPelsWidth: ::DWORD,
-    dmPelsHeight: ::DWORD,
-    dmDisplayFlags: ::DWORD,
-    dmDisplayFrequency: ::DWORD,
-    dmICMMethod: ::DWORD,
-    dmICMIntent: ::DWORD,
-    dmMediaType: ::DWORD,
-    dmDitherType: ::DWORD,
-    dmReserved1: ::DWORD,
-    dmReserved2: ::DWORD,
-    dmPanningWidth: ::DWORD,
-    dmPanningHeight: ::DWORD,
-}}
-pub type PDEVMODEA = *mut DEVMODEA;
-pub type NPDEVMODEA = *mut DEVMODEA;
-pub type LPDEVMODEA = *mut DEVMODEA;
-STRUCT!{struct DEVMODEW {
-    dmDeviceName: [::WCHAR; ::CCHDEVICENAME],
-    dmSpecVersion: ::WORD,
-    dmDriverVersion: ::WORD,
-    dmSize: ::WORD,
-    dmDriverExtra: ::WORD,
-    dmFields: ::DWORD,
-    union1: [u8; 16],
-    dmColor: ::c_short,
-    dmDuplex: ::c_short,
-    dmYResolution: ::c_short,
-    dmTTOption: ::c_short,
-    dmCollate: ::c_short,
-    dmFormName: [::WCHAR; CCHFORMNAME],
-    dmLogPixels: ::WORD,
-    dmBitsPerPel: ::DWORD,
-    dmPelsWidth: ::DWORD,
-    dmPelsHeight: ::DWORD,
-    dmDisplayFlags: ::DWORD,
-    dmDisplayFrequency: ::DWORD,
-    dmICMMethod: ::DWORD,
-    dmICMIntent: ::DWORD,
-    dmMediaType: ::DWORD,
-    dmDitherType: ::DWORD,
-    dmReserved1: ::DWORD,
-    dmReserved2: ::DWORD,
-    dmPanningWidth: ::DWORD,
-    dmPanningHeight: ::DWORD,
-}}
-pub type PDEVMODEW = *mut DEVMODEW;
-pub type NPDEVMODEW = *mut DEVMODEW;
-pub type LPDEVMODEW = *mut DEVMODEW;
-STRUCT!{nodebug struct DISPLAY_DEVICEW {
-    cb: ::DWORD,
-    DeviceName: [::WCHAR; 32],
-    DeviceString: [::WCHAR; 128],
-    StateFlags: ::DWORD,
-    DeviceID: [::WCHAR; 128],
-    DeviceKey: [::WCHAR; 128],
-}}
-pub type PDISPLAY_DEVICEW = *mut DISPLAY_DEVICEW;
-pub type LPDISPLAY_DEVICEW = *mut DISPLAY_DEVICEW;
-STRUCT!{nodebug struct DISPLAY_DEVICEA {
-    cb: ::DWORD,
-    DeviceName: [::CHAR; 32],
-    DeviceString: [::CHAR; 128],
-    StateFlags: ::DWORD,
-    DeviceID: [::CHAR; 128],
-    DeviceKey: [::CHAR; 128],
-}}
-pub type PDISPLAY_DEVICEA = *mut DISPLAY_DEVICEA;
-pub type LPDISPLAY_DEVICEA = *mut DISPLAY_DEVICEA;
-STRUCT!{struct PIXELFORMATDESCRIPTOR {
-    nSize: ::WORD,
-    nVersion: ::WORD,
-    dwFlags: ::DWORD,
-    iPixelType: ::BYTE,
-    cColorBits: ::BYTE,
-    cRedBits: ::BYTE,
-    cRedShift: ::BYTE,
-    cGreenBits: ::BYTE,
-    cGreenShift: ::BYTE,
-    cBlueBits: ::BYTE,
-    cBlueShift: ::BYTE,
-    cAlphaBits: ::BYTE,
-    cAlphaShift: ::BYTE,
-    cAccumBits: ::BYTE,
-    cAccumRedBits: ::BYTE,
-    cAccumGreenBits: ::BYTE,
-    cAccumBlueBits: ::BYTE,
-    cAccumAlphaBits: ::BYTE,
-    cDepthBits: ::BYTE,
-    cStencilBits: ::BYTE,
-    cAuxBuffers: ::BYTE,
-    iLayerType: ::BYTE,
-    bReserved: ::BYTE,
-    dwLayerMask: ::DWORD,
-    dwVisibleMask: ::DWORD,
-    dwDamageMask: ::DWORD,
-}}
-pub type PPIXELFORMATDESCRIPTOR = *mut PIXELFORMATDESCRIPTOR;
-pub type LPPIXELFORMATDESCRIPTOR = *mut PIXELFORMATDESCRIPTOR;
-pub const R2_BLACK: ::c_int = 1;
-pub const R2_NOTMERGEPEN: ::c_int = 2;
-pub const R2_MASKNOTPEN: ::c_int = 3;
-pub const R2_NOTCOPYPEN: ::c_int = 4;
-pub const R2_MASKPENNOT: ::c_int = 5;
-pub const R2_NOT: ::c_int = 6;
-pub const R2_XORPEN: ::c_int = 7;
-pub const R2_NOTMASKPEN: ::c_int = 8;
-pub const R2_MASKPEN: ::c_int = 9;
-pub const R2_NOTXORPEN: ::c_int = 10;
-pub const R2_NOP: ::c_int = 11;
-pub const R2_MERGENOTPEN: ::c_int = 12;
-pub const R2_COPYPEN: ::c_int = 13;
-pub const R2_MERGEPENNOT: ::c_int = 14;
-pub const R2_MERGEPEN: ::c_int = 15;
-pub const R2_WHITE: ::c_int = 16;
-pub const R2_LAST: ::c_int = 16;
-//83
-pub const SRCCOPY: ::DWORD = 0x00CC0020;
-pub const SRCPAINT: ::DWORD = 0x00EE0086;
-pub const SRCAND: ::DWORD = 0x008800C6;
-pub const SRCINVERT: ::DWORD = 0x00660046;
-pub const SRCERASE: ::DWORD = 0x00440328;
-pub const NOTSRCCOPY: ::DWORD = 0x00330008;
-pub const NOTSRCERASE: ::DWORD = 0x001100A6;
-pub const MERGECOPY: ::DWORD = 0x00C000CA;
-pub const MERGEPAINT: ::DWORD = 0x00BB0226;
-pub const PATCOPY: ::DWORD = 0x00F00021;
-pub const PATPAINT: ::DWORD = 0x00FB0A09;
-pub const PATINVERT: ::DWORD = 0x005A0049;
-pub const DSTINVERT: ::DWORD = 0x00550009;
-pub const BLACKNESS: ::DWORD = 0x00000042;
-pub const WHITENESS: ::DWORD = 0x00FF0062;
-//121
-// fnCombineMode values for CombineRgn
-pub const RGN_AND: ::c_int = 1;
-pub const RGN_OR: ::c_int = 2;
-pub const RGN_XOR: ::c_int = 3;
-pub const RGN_DIFF: ::c_int = 4;
-pub const RGN_COPY: ::c_int = 5;
-pub const RGN_MIN: ::c_int = RGN_AND;
-pub const RGN_MAX: ::c_int = RGN_COPY;
-//572 (Win 7 SDK)
-STRUCT!{struct BITMAP {
-    bmType: ::LONG,
-    bmWidth: ::LONG,
-    bmHeight: ::LONG,
-    bmWidthBytes: ::LONG,
-    bmPlanes: ::WORD,
-    bmBitsPixel: ::WORD,
-    bmBits: ::LPVOID,
-}}
-pub type PBITMAP = *mut BITMAP;
-pub type NPBITMAP = *mut BITMAP;
-pub type LPBITMAP = *mut BITMAP;
-STRUCT!{struct RGBQUAD {
-    rgbBlue: ::BYTE,
-    rgbGreen: ::BYTE,
-    rgbRed: ::BYTE,
-    rgbReserved: ::BYTE,
-}}
-pub type LPRGBQUAD = *mut RGBQUAD;
-pub const CS_ENABLE: ::DWORD = 0x00000001;
-pub const CS_DISABLE: ::DWORD = 0x00000002;
-pub const CS_DELETE_TRANSFORM: ::DWORD = 0x00000003;
-pub const LCS_SIGNATURE: ::DWORD = 0x5053_4F43; // 'PSOC'
-pub const LCS_sRGB: LCSCSTYPE = 0x7352_4742; // 'sRGB'
-pub const LCS_WINDOWS_COLOR_SPACE: LCSCSTYPE = 0x5769_6E20; // 'Win '
-pub type LCSCSTYPE = ::LONG;
-pub const LCS_CALIBRATED_RGB: LCSCSTYPE = 0x00000000;
-pub type LCSGAMUTMATCH = ::LONG;
-pub const LCS_GM_BUSINESS: LCSGAMUTMATCH = 0x00000001;
-pub const LCS_GM_GRAPHICS: LCSGAMUTMATCH = 0x00000002;
-pub const LCS_GM_IMAGES: LCSGAMUTMATCH = 0x00000004;
-pub const LCS_GM_ABS_COLORIMETRIC: LCSGAMUTMATCH = 0x00000008;
-pub const CM_OUT_OF_GAMUT: ::BYTE = 255;
-pub const CM_IN_GAMUT: ::BYTE = 0;
-pub const ICM_ADDPROFILE: ::UINT = 1;
-pub const ICM_DELETEPROFILE: ::UINT = 2;
-pub const ICM_QUERYPROFILE: ::UINT = 3;
-pub const ICM_SETDEFAULTPROFILE: ::UINT = 4;
-pub const ICM_REGISTERICMATCHER: ::UINT = 5;
-pub const ICM_UNREGISTERICMATCHER: ::UINT = 6;
-pub const ICM_QUERYMATCH: ::UINT = 7;
-pub type FXPT16DOT16 = ::c_long;
-pub type LPFXPT16DOT16 = *mut ::c_long;
-pub type FXPT2DOT30 = ::c_long;
-pub type LPFXPT2DOT30 = *mut ::c_long;
-STRUCT!{struct CIEXYZ {
-    ciexyzX: FXPT2DOT30,
-    ciexyzY: FXPT2DOT30,
-    ciexyzZ: FXPT2DOT30,
-}}
-pub type LPCIEXYZ = *mut CIEXYZ;
-STRUCT!{struct CIEXYZTRIPLE {
-    ciexyzRed: CIEXYZ,
-    ciexyzGreen: CIEXYZ,
-    ciexyzBlue: CIEXYZ,
-}}
-pub type LPCIEXYZTRIPLE = *mut CIEXYZTRIPLE;
-//716 (Win 7 SDK)
-STRUCT!{struct BITMAPINFOHEADER {
-    biSize: ::DWORD,
-    biWidth: ::LONG,
-    biHeight: ::LONG,
-    biPlanes: ::WORD,
-    biBitCount: ::WORD,
-    biCompression: ::DWORD,
-    biSizeImage: ::DWORD,
-    biXPelsPerMeter: ::LONG,
-    biYPelsPerMeter: ::LONG,
-    biClrUsed: ::DWORD,
-    biClrImportant: ::DWORD,
-}}
-pub type LPBITMAPINFOHEADER = *mut BITMAPINFOHEADER;
-pub type PBITMAPINFOHEADER = *mut BITMAPINFOHEADER;
-STRUCT!{struct BITMAPV5HEADER {
-    bV5Size: ::DWORD,
-    bV5Width: ::LONG,
-    bV5Height: ::LONG,
-    bV5Planes: ::WORD,
-    bV5BitCount: ::WORD,
-    bV5Compression: ::DWORD,
-    bV5SizeImage: ::DWORD,
-    bV5XPelsPerMeter: ::LONG,
-    bV5YPelsPerMeter: ::LONG,
-    bV5ClrUsed: ::DWORD,
-    bV5ClrImportant: ::DWORD,
-    bV5RedMask: ::DWORD,
-    bV5GreenMask: ::DWORD,
-    bV5BlueMask: ::DWORD,
-    bV5AlphaMask: ::DWORD,
-    bV5CSType: ::LONG, // LONG to match LOGCOLORSPACE
-    bV5Endpoints: CIEXYZTRIPLE,
-    bV5GammaRed: ::DWORD,
-    bV5GammaGreen: ::DWORD,
-    bV5GammaBlue: ::DWORD,
-    bV5Intent: ::LONG, // LONG to match LOGCOLORSPACE
-    bV5ProfileData: ::DWORD,
-    bV5ProfileSize: ::DWORD,
-    bV5Reserved: ::DWORD,
-}}
-pub type LPBITMAPV5HEADER = *mut BITMAPV5HEADER;
-pub type PBITMAPV5HEADER = *mut BITMAPV5HEADER;
-pub const PROFILE_LINKED: ::LONG = 0x4C49_4E4B; // 'LINK'
-pub const PROFILE_EMBEDDED: ::LONG = 0x4D42_4544; // 'MBED'
-pub const BI_RGB: ::DWORD = 0;
-pub const BI_RLE8: ::DWORD = 1;
-pub const BI_RLE4: ::DWORD = 2;
-pub const BI_BITFIELDS: ::DWORD = 3;
-pub const BI_JPEG: ::DWORD = 4;
-pub const BI_PNG: ::DWORD = 5;
-STRUCT!{struct BITMAPINFO {
-    bmiHeader: BITMAPINFOHEADER,
-    bmiColors: [RGBQUAD; 0],
-}}
-pub type LPBITMAPINFO = *mut BITMAPINFO;
-pub type PBITMAPINFO = *mut BITMAPINFO;
-//1438
-pub const LF_FACESIZE: usize = 32;
-STRUCT!{nodebug struct LOGFONTA {
-    lfHeight: ::LONG,
-    lfWidth: ::LONG,
-    lfEscapement: ::LONG,
-    lfOrientation: ::LONG,
-    lfWeight: ::LONG,
-    lfItalic: ::BYTE,
-    lfUnderline: ::BYTE,
-    lfStrikeOut: ::BYTE,
-    lfCharSet: ::BYTE,
-    lfOutPrecision: ::BYTE,
-    lfClipPrecision: ::BYTE,
-    lfQuality: ::BYTE,
-    lfPitchAndFamily: ::BYTE,
-    lfFaceName: [::CHAR; LF_FACESIZE],
-}}
-pub type LPLOGFONTA = *mut LOGFONTA;
-STRUCT!{nodebug struct LOGFONTW {
-    lfHeight: ::LONG,
-    lfWidth: ::LONG,
-    lfEscapement: ::LONG,
-    lfOrientation: ::LONG,
-    lfWeight: ::LONG,
-    lfItalic: ::BYTE,
-    lfUnderline: ::BYTE,
-    lfStrikeOut: ::BYTE,
-    lfCharSet: ::BYTE,
-    lfOutPrecision: ::BYTE,
-    lfClipPrecision: ::BYTE,
-    lfQuality: ::BYTE,
-    lfPitchAndFamily: ::BYTE,
-    lfFaceName: [::WCHAR; LF_FACESIZE],
-}}
-pub type LPLOGFONTW = *mut LOGFONTW;
-//1595
-#[inline]
-pub fn RGB (r: ::BYTE, g: ::BYTE, b: ::BYTE) -> ::COLORREF {
-  r as ::COLORREF | ((g as ::COLORREF) << 8) | ((b as ::COLORREF) << 16)
-}
-//
-pub const DRIVERVERSION: ::c_int = 0;
-pub const TECHNOLOGY: ::c_int = 2;
-pub const HORZSIZE: ::c_int = 4;
-pub const VERTSIZE: ::c_int = 6;
-pub const HORZRES: ::c_int = 8;
-pub const VERTRES: ::c_int = 10;
-pub const BITSPIXEL: ::c_int = 12;
-pub const PLANES: ::c_int = 14;
-pub const NUMBRUSHES: ::c_int = 16;
-pub const NUMPENS: ::c_int = 18;
-pub const NUMMARKERS: ::c_int = 20;
-pub const NUMFONTS: ::c_int = 22;
-pub const NUMCOLORS: ::c_int = 24;
-pub const PDEVICESIZE: ::c_int = 26;
-pub const CURVECAPS: ::c_int = 28;
-pub const LINECAPS: ::c_int = 30;
-pub const POLYGONALCAPS: ::c_int = 32;
-pub const TEXTCAPS: ::c_int = 34;
-pub const CLIPCAPS: ::c_int = 36;
-pub const RASTERCAPS: ::c_int = 38;
-pub const ASPECTX: ::c_int = 40;
-pub const ASPECTY: ::c_int = 42;
-pub const ASPECTXY: ::c_int = 44;
-pub const LOGPIXELSX: ::c_int = 88;
-pub const LOGPIXELSY: ::c_int = 90;
-pub const SIZEPALETTE: ::c_int = 104;
-pub const NUMRESERVED: ::c_int = 106;
-pub const COLORRES: ::c_int = 108;
-pub const PHYSICALWIDTH: ::c_int = 110;
-pub const PHYSICALHEIGHT: ::c_int = 111;
-pub const PHYSICALOFFSETX: ::c_int = 112;
-pub const PHYSICALOFFSETY: ::c_int = 113;
-pub const SCALINGFACTORX: ::c_int = 114;
-pub const SCALINGFACTORY: ::c_int = 115;
-pub const VREFRESH: ::c_int = 116;
-pub const DESKTOPVERTRES: ::c_int = 117;
-pub const DESKTOPHORZRES: ::c_int = 118;
-pub const BLTALIGNMENT: ::c_int = 119;
-pub const SHADEBLENDCAPS: ::c_int = 120;
-pub const COLORMGMTCAPS: ::c_int = 121;
-//1906
-pub const DIB_RGB_COLORS: ::UINT = 0;
-pub const DIB_PAL_COLORS: ::UINT = 1;
-pub const CBM_INIT: ::DWORD = 4;
-STRUCT!{struct RGNDATAHEADER {
-    dwSize: ::DWORD,
-    iType: ::DWORD,
-    nCount: ::DWORD,
-    nRgnSize: ::DWORD,
-    rcBound: ::RECT,
-}}
-pub type PRGNDATAHEADER = *mut RGNDATAHEADER;
-STRUCT!{nodebug struct RGNDATA {
-    rdh: RGNDATAHEADER,
-    Buffer: [::c_char; 0],
-}}
-pub type PRGNDATA = *mut RGNDATA;
-pub type NPRGNDATA = *mut RGNDATA;
-pub type LPRGNDATA = *mut RGNDATA;
-STRUCT!{struct PALETTEENTRY {
-    peRed: ::BYTE,
-    peGreen: ::BYTE,
-    peBlue: ::BYTE,
-    peFlags: ::BYTE,
-}}
-pub type PPALETTEENTRY = *mut PALETTEENTRY;
-pub type LPPALETTEENTRY = *mut PALETTEENTRY;
-//2824 (Win 7 SDK)
-STRUCT!{struct ABC {
-    abcA: ::c_int,
-    abcB: ::UINT,
-    abcC: ::c_int,
-}}
-pub type PABC = *mut ABC;
-pub type NPABC = *mut ABC;
-pub type LPABC = *mut ABC;
-STRUCT!{struct ABCFLOAT {
-    abcfA: ::FLOAT,
-    abcfB: ::FLOAT,
-    abcfC: ::FLOAT,
-}}
-pub type PABCFLOAT = *mut ABCFLOAT;
-pub type NPABCFLOAT = *mut ABCFLOAT;
-pub type LPABCFLOAT = *mut ABCFLOAT;
-//3581
-pub type LINEDDAPROC = Option<unsafe extern "system" fn(::c_int, ::c_int, ::LPARAM)>;
-STRUCT!{struct XFORM {
-    eM11: ::FLOAT,
-    eM12: ::FLOAT,
-    eM21: ::FLOAT,
-    eM22: ::FLOAT,
-    eDx: ::FLOAT,
-    eDy: ::FLOAT,
-}}
-pub type PXFORM = *mut XFORM;
-pub type LPXFORM = *mut XFORM;
-STRUCT!{struct LOGBRUSH {
-    lbStyle: ::UINT,
-    lbColor: ::COLORREF,
-    lbHatch: ::ULONG_PTR,
-}}
-pub type PLOGBRUSH = *mut LOGBRUSH;
-STRUCT!{nodebug struct LOGCOLORSPACEA {
-    lcsSignature: ::DWORD,
-    lcsVersion: ::DWORD,
-    lcsSize: ::DWORD,
-    lcsCSType: LCSCSTYPE,
-    lcsIntent: LCSGAMUTMATCH,
-    lcsEndpoints: CIEXYZTRIPLE,
-    lcsGammaRed: ::DWORD,
-    lcsGammaGreen: ::DWORD,
-    lcsGammaBlue: ::DWORD,
-    lcsFilename: [::CHAR; ::MAX_PATH],
-}}
-pub type LPLOGCOLORSPACEA = *mut LOGCOLORSPACEA;
-STRUCT!{nodebug struct LOGCOLORSPACEW {
-    lcsSignature: ::DWORD,
-    lcsVersion: ::DWORD,
-    lcsSize: ::DWORD,
-    lcsCSType: LCSCSTYPE,
-    lcsIntent: LCSGAMUTMATCH,
-    lcsEndpoints: CIEXYZTRIPLE,
-    lcsGammaRed: ::DWORD,
-    lcsGammaGreen: ::DWORD,
-    lcsGammaBlue: ::DWORD,
-    lcsFilename: [::WCHAR; ::MAX_PATH],
-}}
-pub type LPLOGCOLORSPACEW = *mut LOGCOLORSPACEW;
-pub const LF_FULLFACESIZE: usize = 64;
-STRUCT!{nodebug struct ENUMLOGFONTEXA {
-    elfLogFont: LOGFONTA,
-    elfFullName: [::BYTE; LF_FULLFACESIZE],
-    elfStyle: [::BYTE; LF_FACESIZE],
-    elfScript: [::BYTE; LF_FACESIZE],
-}}
-pub type LPENUMLOGFONTEXA = *mut ENUMLOGFONTEXA;
-STRUCT!{nodebug struct ENUMLOGFONTEXW {
-    elfLogFont: LOGFONTW,
-    elfFullName: [::WCHAR; LF_FULLFACESIZE],
-    elfStyle: [::WCHAR; LF_FACESIZE],
-    elfScript: [::WCHAR; LF_FACESIZE],
-}}
-pub type LPENUMLOGFONTEXW = *mut ENUMLOGFONTEXW;
-pub const MM_MAX_NUMAXES: usize = 16;
-STRUCT!{struct DESIGNVECTOR {
-    dvReserved: ::DWORD,
-    dvNumAxes: ::DWORD,
-    dvValues: [::LONG; MM_MAX_NUMAXES],
-}}
-pub type PDESIGNVECTOR = *mut DESIGNVECTOR;
-pub type LPDESIGNVECTOR = *mut DESIGNVECTOR;
-STRUCT!{nodebug struct ENUMLOGFONTEXDVA {
-    elfEnumLogfontEx: ENUMLOGFONTEXA,
-    elfDesignVector: DESIGNVECTOR,
-}}
-pub type PENUMLOGFONTEXDVA = *mut ENUMLOGFONTEXDVA;
-pub type LPENUMLOGFONTEXDVA = *mut ENUMLOGFONTEXDVA;
-STRUCT!{nodebug struct ENUMLOGFONTEXDVW {
-    elfEnumLogfontEx: ENUMLOGFONTEXW,
-    elfDesignVector: DESIGNVECTOR,
-}}
-pub type PENUMLOGFONTEXDVW = *mut ENUMLOGFONTEXDVW;
-pub type LPENUMLOGFONTEXDVW = *mut ENUMLOGFONTEXDVW;
-STRUCT!{struct LOGPALETTE {
-    palVersion: ::WORD,
-    palNumEntries: ::WORD,
-    palPalEntry: [PALETTEENTRY; 1],
-}}
-pub type PLOGPALETTE = *mut LOGPALETTE;
-pub type NPLOGPALETTE = *mut LOGPALETTE;
-pub type LPLOGPALETTE = *mut LOGPALETTE;
-STRUCT!{struct LOGPEN {
-    lopnStyle: ::UINT,
-    lopnWidth: ::POINT,
-    lopnColor: ::COLORREF,
-}}
-pub type PLOGPEN = *mut LOGPEN;
-pub type NPLOGPEN = *mut LOGPEN;
-pub type LPLOGPEN = *mut LOGPEN;
-STRUCT!{struct BLENDFUNCTION {
-    BlendOp: ::BYTE,
-    BlendFlags: ::BYTE,
-    SourceConstantAlpha: ::BYTE,
-    AlphaFormat: ::BYTE,
-}}
-pub type PBLENDFUNCTION = *mut BLENDFUNCTION;
-pub const TMPF_FIXED_PITCH: ::BYTE = 0x01;
-pub const TMPF_VECTOR: ::BYTE = 0x02;
-pub const TMPF_DEVICE: ::BYTE = 0x08;
-pub const TMPF_TRUETYPE: ::BYTE = 0x04;
-STRUCT!{struct TEXTMETRICA {
-    tmHeight: ::LONG,
-    tmAscent: ::LONG,
-    tmDescent: ::LONG,
-    tmInternalLeading: ::LONG,
-    tmExternalLeading: ::LONG,
-    tmAveCharWidth: ::LONG,
-    tmMaxCharWidth: ::LONG,
-    tmWeight: ::LONG,
-    tmOverhang: ::LONG,
-    tmDigitizedAspectX: ::LONG,
-    tmDigitizedAspectY: ::LONG,
-    tmFirstChar: ::BYTE,
-    tmLastChar: ::BYTE,
-    tmDefaultChar: ::BYTE,
-    tmBreakChar: ::BYTE,
-    tmItalic: ::BYTE,
-    tmUnderlined: ::BYTE,
-    tmStruckOut: ::BYTE,
-    tmPitchAndFamily: ::BYTE,
-    tmCharSet: ::BYTE,
-}}
-pub type PTEXTMETRICA = *mut TEXTMETRICA;
-pub type NPTEXTMETRICA = *mut TEXTMETRICA;
-pub type LPTEXTMETRICA = *mut TEXTMETRICA;
-STRUCT!{struct TEXTMETRICW {
-    tmHeight: ::LONG,
-    tmAscent: ::LONG,
-    tmDescent: ::LONG,
-    tmInternalLeading: ::LONG,
-    tmExternalLeading: ::LONG,
-    tmAveCharWidth: ::LONG,
-    tmMaxCharWidth: ::LONG,
-    tmWeight: ::LONG,
-    tmOverhang: ::LONG,
-    tmDigitizedAspectX: ::LONG,
-    tmDigitizedAspectY: ::LONG,
-    tmFirstChar: ::WCHAR,
-    tmLastChar: ::WCHAR,
-    tmDefaultChar: ::WCHAR,
-    tmBreakChar: ::WCHAR,
-    tmItalic: ::BYTE,
-    tmUnderlined: ::BYTE,
-    tmStruckOut: ::BYTE,
-    tmPitchAndFamily: ::BYTE,
-    tmCharSet: ::BYTE,
-}}
-pub type PTEXTMETRICW = *mut TEXTMETRICW;
-pub type NPTEXTMETRICW = *mut TEXTMETRICW;
-pub type LPTEXTMETRICW = *mut TEXTMETRICW;
-pub const TA_NOUPDATECP: ::UINT = 0;
-pub const TA_UPDATECP: ::UINT = 1;
-pub const TA_LEFT: ::UINT = 0;
-pub const TA_RIGHT: ::UINT = 2;
-pub const TA_CENTER: ::UINT = 6;
-pub const TA_TOP: ::UINT = 0;
-pub const TA_BOTTOM: ::UINT = 8;
-pub const TA_BASELINE: ::UINT = 24;
-pub const TA_RTLREADING: ::UINT = 256;
-pub const TA_MASK: ::UINT = TA_BASELINE + TA_CENTER + TA_UPDATECP + TA_RTLREADING;
-pub const WHITE_BRUSH: ::c_int = 0;
-pub const LTGRAY_BRUSH: ::c_int = 1;
-pub const GRAY_BRUSH: ::c_int = 2;
-pub const DKGRAY_BRUSH: ::c_int = 3;
-pub const BLACK_BRUSH: ::c_int = 4;
-pub const NULL_BRUSH: ::c_int = 5;
-pub const HOLLOW_BRUSH: ::c_int = 5;
-pub const WHITE_PEN: ::c_int = 6;
-pub const BLACK_PEN: ::c_int = 7;
-pub const NULL_PEN: ::c_int = 8;
-pub const OEM_FIXED_FONT: ::c_int = 10;
-pub const ANSI_FIXED_FONT: ::c_int = 11;
-pub const ANSI_VAR_FONT: ::c_int = 12;
-pub const SYSTEM_FONT: ::c_int = 13;
-pub const DEVICE_DEFAULT_FONT: ::c_int = 14;
-pub const DEFAULT_PALETTE: ::c_int = 15;
-pub const SYSTEM_FIXED_FONT: ::c_int = 16;
-pub const DEFAULT_GUI_FONT: ::c_int = 17;
-pub const DC_BRUSH: ::c_int = 18;
-pub const DC_PEN: ::c_int = 19;
-pub const STOCK_LAST: ::c_int = 19;pub const PS_SOLID: ::c_int = 0;
-pub const PS_DASH: ::c_int = 1;
-pub const PS_DOT: ::c_int = 2;
-pub const PS_DASHDOT: ::c_int = 3;
-pub const PS_DASHDOTDOT: ::c_int = 4;
-pub const PS_NULL: ::c_int = 5;
-pub const PS_INSIDEFRAME: ::c_int = 6;
-pub const PS_USERSTYLE: ::c_int = 7;
-pub const PS_ALTERNATE: ::c_int = 8;
-pub const TRANSPARENT: ::c_int = 1;
-pub const OPAQUE: ::c_int = 2;
-pub const BKMODE_LAST: ::c_int = 2;
-pub const MM_TEXT: ::c_int = 1;
-pub const MM_LOMETRIC: ::c_int = 2;
-pub const MM_HIMETRIC: ::c_int = 3;
-pub const MM_LOENGLISH: ::c_int = 4;
-pub const MM_HIENGLISH: ::c_int = 5;
-pub const MM_TWIPS: ::c_int = 6;
-pub const MM_ISOTROPIC: ::c_int = 7;
-pub const MM_ANISOTROPIC: ::c_int = 8;
-pub const ALTERNATE: ::c_int = 1;
-pub const WINDING: ::c_int = 2;
-pub const POLYFILL_LAST: ::c_int = 2;
-pub const OUT_DEFAULT_PRECIS: ::DWORD = 0;
-pub const OUT_STRING_PRECIS: ::DWORD = 1;
-pub const OUT_CHARACTER_PRECIS: ::DWORD = 2;
-pub const OUT_STROKE_PRECIS: ::DWORD = 3;
-pub const OUT_TT_PRECIS: ::DWORD = 4;
-pub const OUT_DEVICE_PRECIS: ::DWORD = 5;
-pub const OUT_RASTER_PRECIS: ::DWORD = 6;
-pub const OUT_TT_ONLY_PRECIS: ::DWORD = 7;
-pub const OUT_OUTLINE_PRECIS: ::DWORD = 8;
-pub const OUT_SCREEN_OUTLINE_PRECIS: ::DWORD = 9;
-pub const OUT_PS_ONLY_PRECIS: ::DWORD = 10;
-pub const CLIP_DEFAULT_PRECIS: ::DWORD = 0;
-pub const CLIP_CHARACTER_PRECIS: ::DWORD = 1;
-pub const CLIP_STROKE_PRECIS: ::DWORD = 2;
-pub const CLIP_MASK: ::DWORD = 0xf;
-pub const CLIP_LH_ANGLES: ::DWORD = 1 << 4;
-pub const CLIP_TT_ALWAYS: ::DWORD = 2 << 4;
-pub const CLIP_DFA_DISABLE: ::DWORD = 4 << 4;
-pub const CLIP_EMBEDDED: ::DWORD = 8 << 4;
-pub const DEFAULT_QUALITY: ::DWORD = 0;
-pub const DRAFT_QUALITY: ::DWORD = 1;
-pub const PROOF_QUALITY: ::DWORD = 2;
-pub const NONANTIALIASED_QUALITY: ::DWORD = 3;
-pub const ANTIALIASED_QUALITY: ::DWORD = 4;
-pub const CLEARTYPE_QUALITY: ::DWORD = 5;
-pub const CLEARTYPE_NATURAL_QUALITY: ::DWORD = 6;
-pub const DEFAULT_PITCH: ::DWORD = 0;
-pub const FIXED_PITCH: ::DWORD = 1;
-pub const VARIABLE_PITCH: ::DWORD = 2;
-pub const FF_DONTCARE: ::DWORD = 0 << 4;
-pub const FF_ROMAN: ::DWORD = 1 << 4;
-pub const FF_SWISS: ::DWORD = 2 << 4;
-pub const FF_MODERN: ::DWORD = 3 << 4;
-pub const FF_SCRIPT: ::DWORD = 4 << 4;
-pub const FF_DECORATIVE: ::DWORD = 5 << 4;
-pub const MONO_FONT: ::DWORD = 8;
-pub const ANSI_CHARSET: ::DWORD = 0;
-pub const DEFAULT_CHARSET: ::DWORD = 1;
-pub const SYMBOL_CHARSET: ::DWORD = 2;
-pub const SHIFTJIS_CHARSET: ::DWORD = 128;
-pub const HANGEUL_CHARSET: ::DWORD = 129;
-pub const HANGUL_CHARSET: ::DWORD = 129;
-pub const GB2312_CHARSET: ::DWORD = 134;
-pub const CHINESEBIG5_CHARSET: ::DWORD = 136;
-pub const OEM_CHARSET: ::DWORD = 255;
-pub const JOHAB_CHARSET: ::DWORD = 130;
-pub const HEBREW_CHARSET: ::DWORD = 177;
-pub const ARABIC_CHARSET: ::DWORD = 178;
-pub const GREEK_CHARSET: ::DWORD = 161;
-pub const TURKISH_CHARSET: ::DWORD = 162;
-pub const VIETNAMESE_CHARSET: ::DWORD = 163;
-pub const THAI_CHARSET: ::DWORD = 222;
-pub const EASTEUROPE_CHARSET: ::DWORD = 238;
-pub const RUSSIAN_CHARSET: ::DWORD = 204;
-pub const MAC_CHARSET: ::DWORD = 77;
-pub const BALTIC_CHARSET: ::DWORD = 186;
-pub const FS_LATIN1: ::DWORD = 0x00000001;
-pub const FS_LATIN2: ::DWORD = 0x00000002;
-pub const FS_CYRILLIC: ::DWORD = 0x00000004;
-pub const FS_GREEK: ::DWORD = 0x00000008;
-pub const FS_TURKISH: ::DWORD = 0x00000010;
-pub const FS_HEBREW: ::DWORD = 0x00000020;
-pub const FS_ARABIC: ::DWORD = 0x00000040;
-pub const FS_BALTIC: ::DWORD = 0x00000080;
-pub const FS_VIETNAMESE: ::DWORD = 0x00000100;
-pub const FS_THAI: ::DWORD = 0x00010000;
-pub const FS_JISJAPAN: ::DWORD = 0x00020000;
-pub const FS_CHINESESIMP: ::DWORD = 0x00040000;
-pub const FS_WANSUNG: ::DWORD = 0x00080000;
-pub const FS_CHINESETRAD: ::DWORD = 0x00100000;
-pub const FS_JOHAB: ::DWORD = 0x00200000;
-pub const FS_SYMBOL: ::DWORD = 0x80000000;
-pub const FW_DONTCARE: ::c_int = 0;
-pub const FW_THIN: ::c_int = 100;
-pub const FW_EXTRALIGHT: ::c_int = 200;
-pub const FW_LIGHT: ::c_int = 300;
-pub const FW_NORMAL: ::c_int = 400;
-pub const FW_MEDIUM: ::c_int = 500;
-pub const FW_SEMIBOLD: ::c_int = 600;
-pub const FW_BOLD: ::c_int = 700;
-pub const FW_EXTRABOLD: ::c_int = 800;
-pub const FW_HEAVY: ::c_int = 900;
-pub const FW_ULTRALIGHT: ::c_int = FW_EXTRALIGHT;
-pub const FW_REGULAR: ::c_int = FW_NORMAL;
-pub const FW_DEMIBOLD: ::c_int = FW_SEMIBOLD;
-pub const FW_ULTRABOLD: ::c_int = FW_EXTRABOLD;
-pub const FW_BLACK: ::c_int = FW_HEAVY;
-pub type COLOR16 = ::c_ushort;
-STRUCT!{struct TRIVERTEX {
-    x: ::LONG,
-    y: ::LONG,
-    Red: COLOR16,
-    Green: COLOR16,
-    Blue: COLOR16,
-    Alpha: COLOR16,
-}}
-pub type PTRIVERTEX = *mut TRIVERTEX;
-pub type LPTRIVERTEX = *mut TRIVERTEX;
-STRUCT!{struct GRADIENT_RECT {
-    UpperLeft: ::ULONG,
-    LowerRight: ::ULONG,
-}}
-pub type PGRADIENT_RECT = *mut GRADIENT_RECT;
-pub type LPGRADIENT_RECT = *mut GRADIENT_RECT;
-/* Object Definitions for EnumObjects() */
-pub const OBJ_PEN: ::UINT = 1;
-pub const OBJ_BRUSH: ::UINT = 2;
-pub const OBJ_DC: ::UINT = 3;
-pub const OBJ_METADC: ::UINT = 4;
-pub const OBJ_PAL: ::UINT = 5;
-pub const OBJ_FONT: ::UINT = 6;
-pub const OBJ_BITMAP: ::UINT = 7;
-pub const OBJ_REGION: ::UINT = 8;
-pub const OBJ_METAFILE: ::UINT = 9;
-pub const OBJ_MEMDC: ::UINT = 10;
-pub const OBJ_EXTPEN: ::UINT = 11;
-pub const OBJ_ENHMETADC: ::UINT = 12;
-pub const OBJ_ENHMETAFILE: ::UINT = 13;
-pub const OBJ_COLORSPACE: ::UINT = 14;
-pub const GDI_OBJ_LAST: ::UINT = OBJ_COLORSPACE;
-STRUCT!{struct COLORADJUSTMENT {
-    caSize: ::WORD,
-    caFlags: ::WORD,
-    caIlluminantIndex: ::WORD,
-    caRedGamma: ::WORD,
-    caGreenGamma: ::WORD,
-    caBlueGamma: ::WORD,
-    caReferenceBlack: ::WORD,
-    caReferenceWhite: ::WORD,
-    caContrast: ::SHORT,
-    caBrightness: ::SHORT,
-    caColorfulness: ::SHORT,
-    caRedGreenTint: ::SHORT,
-}}
-pub type PCOLORADJUSTMENT = *mut COLORADJUSTMENT;
-pub type LPCOLORADJUSTMENT = *mut COLORADJUSTMENT;
-pub type OLDFONTENUMPROCA = Option<unsafe extern "system" fn(
-    *const LOGFONTA, *const ::VOID, ::DWORD, ::LPARAM
-) -> ::c_int>;
-pub type OLDFONTENUMPROCW = Option<unsafe extern "system" fn(
-    *const LOGFONTW, *const ::VOID, ::DWORD, ::LPARAM
-) -> ::c_int>;
-pub type FONTENUMPROCA = OLDFONTENUMPROCA;
-pub type FONTENUMPROCW = OLDFONTENUMPROCW;
-STRUCT!{struct WCRANGE {
-    wcLow: ::WCHAR,
-    cGlyphs: ::USHORT,
-}}
-pub type PWCRANGE = *mut WCRANGE;
-pub type LPWCRANGE = *mut WCRANGE;
-STRUCT!{struct GLYPHSET {
-    cbThis: ::DWORD,
-    flAccel: ::DWORD,
-    cGlyphsSupported: ::DWORD,
-    cRanges: ::DWORD,
-    ranges: [WCRANGE;1],
-}}
-pub type PGLYPHSET = *mut GLYPHSET;
-pub type LPGLYPHSET = *mut GLYPHSET;
-pub type ABORTPROC = Option<unsafe extern "system" fn(::HDC, ::c_int) -> ::BOOL>;
-STRUCT!{struct DOCINFOA {
-    cbSize: ::c_int,
-    lpszDocName: ::LPCSTR,
-    lpszOutput: ::LPCSTR,
-    lpszDatatype: ::LPCSTR,
-    fwType: ::DWORD,
-}}
-pub type LPDOCINFOA = *mut DOCINFOA;
-STRUCT!{struct DOCINFOW {
-    cbSize: ::c_int,
-    lpszDocName: ::LPCWSTR,
-    lpszOutput: ::LPCWSTR,
-    lpszDatatype: ::LPCWSTR,
-    fwType: ::DWORD,
-}}
-pub type LPDOCINFOW = *mut DOCINFOW;
-pub type ICMENUMPROCA = Option<unsafe extern "system" fn(::LPSTR, ::LPARAM) -> ::c_int>;
-pub type ICMENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR, ::LPARAM) -> ::c_int>;
-STRUCT!{struct HANDLETABLE {
-    objectHandle: [::HGDIOBJ; 1],
-}}
-pub type LPHANDLETABLE = *mut HANDLETABLE;
-pub type PHANDLETABLE = *mut HANDLETABLE;
-STRUCT!{struct METARECORD {
-    rdSize: ::DWORD,
-    rdFunction: ::WORD,
-    rdParm: [::WORD; 1],
-}}
-pub type PMETARECORD = *mut METARECORD;
-pub type LPMETARECORD = *mut METARECORD;
-pub type MFENUMPROC = Option<unsafe extern "system" fn(
-    hdc: ::HDC, lpht: *mut ::HANDLETABLE, lpMR: *mut ::METARECORD, nObj: ::c_int, param: ::LPARAM
-) -> ::c_int>;
-pub type GOBJENUMPROC = Option<unsafe extern "system" fn(::LPVOID, ::LPARAM) -> ::c_int>;
-STRUCT!{struct GCP_RESULTSA {
-    lStructSize: ::DWORD,
-    lpOutString: ::LPSTR,
-    lpOrder: *const ::UINT,
-    lpDx: *const ::c_int,
-    lpCaretPos: *const ::c_int,
-    lpClass: ::LPSTR,
-    lpGlyphs: ::LPWSTR,
-    nGlyphs: ::UINT,
-    nMaxFit: ::c_int,
-}}
-pub type LPGCP_RESULTSA = *mut GCP_RESULTSA;
-STRUCT!{struct GCP_RESULTSW {
-    lStructSize: ::DWORD,
-    lpOutString: ::LPWSTR,
-    lpOrder: *const ::UINT,
-    lpDx: *const ::c_int,
-    lpCaretPos: *const ::c_int,
-    lpClass: ::LPSTR,
-    lpGlyphs: ::LPWSTR,
-    nGlyphs: ::UINT,
-    nMaxFit: ::c_int,
-}}
-pub type LPGCP_RESULTSW = *mut GCP_RESULTSW;
-STRUCT!{struct FONTSIGNATURE {
-    fsUsb: [::DWORD; 4],
-    fsCsb: [::DWORD; 2],
-}}
-pub type LPFONTSIGNATURE = *mut FONTSIGNATURE;
-pub type PFONTSIGNATURE = *mut FONTSIGNATURE;
-STRUCT!{struct POLYTEXTA {
-    x: ::c_int,
-    y: ::c_int,
-    n: ::UINT,
-    lpstr: ::LPCSTR,
-    uiFlags: ::UINT,
-    rcl: ::RECT,
-    pdx: *const ::c_int,
-}}
-pub type PPOLYTEXTA = *mut POLYTEXTA;
-pub type NPPOLYTEXTA = *mut POLYTEXTA;
-pub type LPPOLYTEXTA = *mut POLYTEXTA;
-STRUCT!{struct POLYTEXTW {
-    x: ::c_int,
-    y: ::c_int,
-    n: ::UINT,
-    lpstr: ::LPCWSTR,
-    uiFlags: ::UINT,
-    rcl: ::RECT,
-    pdx: *const ::c_int,
-}}
-pub type PPOLYTEXTW = *mut POLYTEXTW;
-pub type NPPOLYTEXTW = *mut POLYTEXTW;
-pub type LPPOLYTEXTW = *mut POLYTEXTW;
-STRUCT!{struct CHARSETINFO {
-    ciCharset: ::UINT,
-    ciACP: ::UINT,
-    fs: ::FONTSIGNATURE,
-}}
-pub type PCHARSETINFO = *mut CHARSETINFO;
-pub type NPCHARSETINFO = *mut CHARSETINFO;
-pub type LPCHARSETINFO = *mut CHARSETINFO;
-pub const GRADIENT_FILL_RECT_H: ::ULONG = 0x00000000;
-pub const GRADIENT_FILL_RECT_V: ::ULONG = 0x00000001;
-pub const GRADIENT_FILL_TRIANGLE: ::ULONG = 0x00000002;
-pub const GRADIENT_FILL_OP_FLAG: ::ULONG = 0x000000ff;
-STRUCT!{struct LAYERPLANEDESCRIPTOR {
-    nSize: ::WORD,
-    nVersion: ::WORD,
-    dwFlags: ::DWORD,
-    iPixelType: ::BYTE,
-    cColorBits: ::BYTE,
-    cRedBits: ::BYTE,
-    cRedShift: ::BYTE,
-    cGreenBits: ::BYTE,
-    cGreenShift: ::BYTE,
-    cBlueBits: ::BYTE,
-    cBlueShift: ::BYTE,
-    cAlphaBits: ::BYTE,
-    cAlphaShift: ::BYTE,
-    cAccumBits: ::BYTE,
-    cAccumRedBits: ::BYTE,
-    cAccumGreenBits: ::BYTE,
-    cAccumBlueBits: ::BYTE,
-    cAccumAlphaBits: ::BYTE,
-    cDepthBits: ::BYTE,
-    cStencilBits: ::BYTE,
-    cAuxBuffers: ::BYTE,
-    iLayerPlane: ::BYTE,
-    bReserved: ::BYTE,
-    crTransparent: ::COLORREF,
-}}
-pub type PLAYERPLANEDESCRIPTOR = *mut LAYERPLANEDESCRIPTOR;
-pub type LPLAYERPLANEDESCRIPTOR = *mut LAYERPLANEDESCRIPTOR;
-STRUCT!{struct ENHMETAHEADER {
-    iType: ::DWORD,
-    nSize: ::DWORD,
-    rclBounds: ::RECTL,
-    rclFrame: ::RECTL,
-    dSignature: ::DWORD,
-    nVersion: ::DWORD,
-    nBytes: ::DWORD,
-    nRecords: ::DWORD,
-    nHandles: ::WORD,
-    sReserved: ::WORD,
-    nDescription: ::DWORD,
-    offDescription: ::DWORD,
-    nPalEntries: ::DWORD,
-    szlDevice: ::SIZEL,
-    szlMillimeters: ::SIZEL,
-    cbPixelFormat: ::DWORD,
-    offPixelFormat: ::DWORD,
-    bOpenGL: ::DWORD,
-    szlMicrometers: ::SIZEL,
-}}
-pub type PENHMETAHEADER = *mut ENHMETAHEADER;
-pub type LPENHMETAHEADER = *mut ENHMETAHEADER;
-STRUCT!{struct FIXED {
-    fract: ::WORD,
-    value: ::c_short,
-}}
-STRUCT!{struct MAT2 {
-    eM11: FIXED,
-    eM12: FIXED,
-    eM21: FIXED,
-    eM22: FIXED,
-}}
-pub type LPMAT2 = *mut MAT2;
-STRUCT!{struct GLYPHMETRICS {
-    gmBlackBoxX: ::UINT,
-    gmBlackBoxY: ::UINT,
-    gmptGlyphOrigin: ::POINT,
-    gmCellIncX: ::c_short,
-    gmCellIncY: ::c_short,
-}}
-pub type LPGLYPHMETRICS = *mut GLYPHMETRICS;
-STRUCT!{struct KERNINGPAIR {
-     wFirst: ::WORD,
-     wSecond: ::WORD,
-     iKernAmount: ::c_int,
-}}
-pub type LPKERNINGPAIR = *mut KERNINGPAIR;
-STRUCT!{struct PANOSE {
-    bFamilyType: ::BYTE,
-    bSerifStyle: ::BYTE,
-    bWeight: ::BYTE,
-    bProportion: ::BYTE,
-    bContrast: ::BYTE,
-    bStrokeVariation: ::BYTE,
-    bArmStyle: ::BYTE,
-    bLetterform: ::BYTE,
-    bMidline: ::BYTE,
-    bXHeight: ::BYTE,
-}}
-pub type LPPANOSE = *mut PANOSE;
-STRUCT!{struct OUTLINETEXTMETRICA {
-    otmSize: ::UINT,
-    otmTextMetrics: TEXTMETRICA,
-    otmFiller: ::BYTE,
-    otmPanoseNumber: ::PANOSE,
-    otmfsSelection: ::UINT,
-    otmfsType: ::UINT,
-    otmsCharSlopeRise: ::c_int,
-    otmsCharSlopeRun: ::c_int,
-    otmItalicAngle: ::c_int,
-    otmEMSquare: ::UINT,
-    otmAscent: ::c_int,
-    otmDescent: ::c_int,
-    otmLineGap: ::UINT,
-    otmsCapEmHeight: ::UINT,
-    otmsXHeight: ::UINT,
-    otmrcFontBox: ::RECT,
-    otmMacAscent: ::c_int,
-    otmMacDescent: ::c_int,
-    otmMacLineGap: ::UINT,
-    otmusMinimumPPEM: ::UINT,
-    otmptSubscriptSize: ::POINT,
-    otmptSubscriptOffset: ::POINT,
-    otmptSuperscriptSize: ::POINT,
-    otmptSuperscriptOffset: ::POINT,
-    otmsStrikeoutSize: ::UINT,
-    otmsStrikeoutPosition: ::c_int,
-    otmsUnderscoreSize: ::c_int,
-    otmsUnderscorePosition: ::c_int,
-    otmpFamilyName: ::PSTR,
-    otmpFaceName: ::PSTR,
-    otmpStyleName: ::PSTR,
-    otmpFullName: ::PSTR,
-}}
-pub type POUTLINETEXTMETRICA = *mut OUTLINETEXTMETRICA;
-pub type NPOUTLINETEXTMETRICA = *mut OUTLINETEXTMETRICA;
-pub type LPOUTLINETEXTMETRICA = *mut OUTLINETEXTMETRICA;
-STRUCT!{struct OUTLINETEXTMETRICW {
-    otmSize: ::UINT,
-    otmTextMetrics: TEXTMETRICW,
-    otmFiller: ::BYTE,
-    otmPanoseNumber: ::PANOSE,
-    otmfsSelection: ::UINT,
-    otmfsType: ::UINT,
-    otmsCharSlopeRise: ::c_int,
-    otmsCharSlopeRun: ::c_int,
-    otmItalicAngle: ::c_int,
-    otmEMSquare: ::UINT,
-    otmAscent: ::c_int,
-    otmDescent: ::c_int,
-    otmLineGap: ::UINT,
-    otmsCapEmHeight: ::UINT,
-    otmsXHeight: ::UINT,
-    otmrcFontBox: ::RECT,
-    otmMacAscent: ::c_int,
-    otmMacDescent: ::c_int,
-    otmMacLineGap: ::UINT,
-    otmusMinimumPPEM: ::UINT,
-    otmptSubscriptSize: ::POINT,
-    otmptSubscriptOffset: ::POINT,
-    otmptSuperscriptSize: ::POINT,
-    otmptSuperscriptOffset: ::POINT,
-    otmsStrikeoutSize: ::UINT,
-    otmsStrikeoutPosition: ::c_int,
-    otmsUnderscoreSize: ::c_int,
-    otmsUnderscorePosition: ::c_int,
-    otmpFamilyName: ::PSTR,
-    otmpFaceName: ::PSTR,
-    otmpStyleName: ::PSTR,
-    otmpFullName: ::PSTR,
-}}
-pub type POUTLINETEXTMETRICW = *mut OUTLINETEXTMETRICW;
-pub type NPOUTLINETEXTMETRICW = *mut OUTLINETEXTMETRICW;
-pub type LPOUTLINETEXTMETRICW = *mut OUTLINETEXTMETRICW;
-STRUCT!{struct RASTERIZER_STATUS {
-    nSize: ::c_short,
-    wFlags: ::c_short,
-    nLanguageID: ::c_short,
-}}
-pub type LPRASTERIZER_STATUS = *mut RASTERIZER_STATUS;
-STRUCT!{struct ENHMETARECORD {
-    iType: ::DWORD,
-    nSize: ::DWORD,
-    dParm: [::DWORD; 1],
-}}
-pub type PENHMETARECORD = *mut ENHMETARECORD;
-pub type LPENHMETARECORD = *mut ENHMETARECORD;
-STRUCT!{struct METAFILEPICT {
-    mm: ::LONG,
-    xExt: ::LONG,
-    yExt: ::LONG,
-    hMF: ::HMETAFILE,
-}}
-pub type LPMETAFILEPICT = *mut METAFILEPICT;
-STRUCT!{struct POINTFLOAT {
-    x: ::FLOAT,
-    y: ::FLOAT,
-}}
-pub type PPOINTFLOAT = *mut POINTFLOAT;
-STRUCT!{struct GLYPHMETRICSFLOAT {
-    gmfBlackBoxX: ::FLOAT,
-    gmfBlackBoxY: ::FLOAT,
-    gmfptGlyphOrigin: POINTFLOAT,
-    gmfCellIncX: ::FLOAT,
-    gmfCellIncY: ::FLOAT,
-}}
-pub type PGLYPHMETRICSFLOAT = *mut GLYPHMETRICSFLOAT;
-pub type LPGLYPHMETRICSFLOAT = *mut GLYPHMETRICSFLOAT;
-pub const DT_PLOTTER: ::c_int = 0;
-pub const DT_RASDISPLAY: ::c_int = 1;
-pub const DT_RASPRINTER: ::c_int = 2;
-pub const DT_RASCAMERA: ::c_int = 3;
-pub const DT_CHARSTREAM: ::c_int = 4;
-pub const DT_METAFILE: ::c_int = 5;
-pub const DT_DISPFILE: ::c_int = 6;
-pub const CLR_INVALID: ::COLORREF = 0xFFFFFFFF;
-pub const ETO_OPAQUE: ::UINT = 0x0002;
-pub const ETO_CLIPPED: ::UINT = 0x0004;
-pub const ETO_GLYPH_INDEX: ::UINT = 0x0010;
-pub const ETO_RTLREADING: ::UINT = 0x0080;
-pub const ETO_NUMERICSLOCAL: ::UINT = 0x0400;
-pub const ETO_NUMERICSLATIN: ::UINT = 0x0800;
-pub const ETO_IGNORELANGUAGE: ::UINT = 0x1000;
-pub const ETO_PDY: ::UINT = 0x2000;
-pub const ETO_REVERSE_INDEX_MAP: ::UINT = 0x10000;
-STRUCT!{struct EXTLOGPEN {
-    elpPenStyle: ::DWORD,
-    elpWidth: ::DWORD,
-    elpBrushStyle: ::UINT,
-    elpColor: ::COLORREF,
-    elpHatch: ::ULONG_PTR,
-    elpNumEntries: ::DWORD,
-    elpStyleEntry: [::DWORD; 1],
-}}
-pub type PEXTLOGPEN = *mut EXTLOGPEN;
-pub type NPEXTLOGPEN = *mut EXTLOGPEN;
-pub type LPEXTLOGPEN = *mut EXTLOGPEN;
-pub type ENHMFENUMPROC = Option<unsafe extern "system" fn(
-    hdc: ::HDC, lpht: HANDLETABLE, lpmr: *const ENHMETARECORD, nHandles: ::c_int, data: ::LPARAM
-) -> ::c_int>;
-/* Metafile Functions */
-pub const META_SETBKCOLOR: ::WORD = 0x0201;
-pub const META_SETBKMODE: ::WORD = 0x0102;
-pub const META_SETMAPMODE: ::WORD = 0x0103;
-pub const META_SETROP2: ::WORD = 0x0104;
-pub const META_SETRELABS: ::WORD = 0x0105;
-pub const META_SETPOLYFILLMODE: ::WORD = 0x0106;
-pub const META_SETSTRETCHBLTMODE: ::WORD = 0x0107;
-pub const META_SETTEXTCHAREXTRA: ::WORD = 0x0108;
-pub const META_SETTEXTCOLOR: ::WORD = 0x0209;
-pub const META_SETTEXTJUSTIFICATION: ::WORD = 0x020A;
-pub const META_SETWINDOWORG: ::WORD = 0x020B;
-pub const META_SETWINDOWEXT: ::WORD = 0x020C;
-pub const META_SETVIEWPORTORG: ::WORD = 0x020D;
-pub const META_SETVIEWPORTEXT: ::WORD = 0x020E;
-pub const META_OFFSETWINDOWORG: ::WORD = 0x020F;
-pub const META_SCALEWINDOWEXT: ::WORD = 0x0410;
-pub const META_OFFSETVIEWPORTORG: ::WORD = 0x0211;
-pub const META_SCALEVIEWPORTEXT: ::WORD = 0x0412;
-pub const META_LINETO: ::WORD = 0x0213;
-pub const META_MOVETO: ::WORD = 0x0214;
-pub const META_EXCLUDECLIPRECT: ::WORD = 0x0415;
-pub const META_INTERSECTCLIPRECT: ::WORD = 0x0416;
-pub const META_ARC: ::WORD = 0x0817;
-pub const META_ELLIPSE: ::WORD = 0x0418;
-pub const META_FLOODFILL: ::WORD = 0x0419;
-pub const META_PIE: ::WORD = 0x081A;
-pub const META_RECTANGLE: ::WORD = 0x041B;
-pub const META_ROUNDRECT: ::WORD = 0x061C;
-pub const META_PATBLT: ::WORD = 0x061D;
-pub const META_SAVEDC: ::WORD = 0x001E;
-pub const META_SETPIXEL: ::WORD = 0x041F;
-pub const META_OFFSETCLIPRGN: ::WORD = 0x0220;
-pub const META_TEXTOUT: ::WORD = 0x0521;
-pub const META_BITBLT: ::WORD = 0x0922;
-pub const META_STRETCHBLT: ::WORD = 0x0B23;
-pub const META_POLYGON: ::WORD = 0x0324;
-pub const META_POLYLINE: ::WORD = 0x0325;
-pub const META_ESCAPE: ::WORD = 0x0626;
-pub const META_RESTOREDC: ::WORD = 0x0127;
-pub const META_FILLREGION: ::WORD = 0x0228;
-pub const META_FRAMEREGION: ::WORD = 0x0429;
-pub const META_INVERTREGION: ::WORD = 0x012A;
-pub const META_PAINTREGION: ::WORD = 0x012B;
-pub const META_SELECTCLIPREGION: ::WORD = 0x012C;
-pub const META_SELECTOBJECT: ::WORD = 0x012D;
-pub const META_SETTEXTALIGN: ::WORD = 0x012E;
-pub const META_CHORD: ::WORD = 0x0830;
-pub const META_SETMAPPERFLAGS: ::WORD = 0x0231;
-pub const META_EXTTEXTOUT: ::WORD = 0x0a32;
-pub const META_SETDIBTODEV: ::WORD = 0x0d33;
-pub const META_SELECTPALETTE: ::WORD = 0x0234;
-pub const META_REALIZEPALETTE: ::WORD = 0x0035;
-pub const META_ANIMATEPALETTE: ::WORD = 0x0436;
-pub const META_SETPALENTRIES: ::WORD = 0x0037;
-pub const META_POLYPOLYGON: ::WORD = 0x0538;
-pub const META_RESIZEPALETTE: ::WORD = 0x0139;
-pub const META_DIBBITBLT: ::WORD = 0x0940;
-pub const META_DIBSTRETCHBLT: ::WORD = 0x0b41;
-pub const META_DIBCREATEPATTERNBRUSH: ::WORD = 0x0142;
-pub const META_STRETCHDIB: ::WORD = 0x0f43;
-pub const META_EXTFLOODFILL: ::WORD = 0x0548;
-pub const META_SETLAYOUT: ::WORD = 0x0149;
-pub const META_DELETEOBJECT: ::WORD = 0x01f0;
-pub const META_CREATEPALETTE: ::WORD = 0x00f7;
-pub const META_CREATEPATTERNBRUSH: ::WORD = 0x01F9;
-pub const META_CREATEPENINDIRECT: ::WORD = 0x02FA;
-pub const META_CREATEFONTINDIRECT: ::WORD = 0x02FB;
-pub const META_CREATEBRUSHINDIRECT: ::WORD = 0x02FC;
-pub const META_CREATEREGION: ::WORD = 0x06FF;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winhttp.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winhttp.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winhttp.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winhttp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,441 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Windows HTTP Services API constant definitions and macros
-//54
-pub type HINTERNET = ::LPVOID;
-pub type LPHINTERNET = *mut HINTERNET;
-pub type INTERNET_PORT = ::WORD;
-pub type LPINTERNET_PORT = *mut INTERNET_PORT;
-pub const INTERNET_DEFAULT_PORT: INTERNET_PORT = 0;
-pub const INTERNET_DEFAULT_HTTP_PORT: INTERNET_PORT = 80;
-pub const INTERNET_DEFAULT_HTTPS_PORT: INTERNET_PORT = 443;
-pub const WINHTTP_FLAG_ASYNC: ::DWORD = 0x10000000;
-pub const WINHTTP_FLAG_SECURE: ::DWORD = 0x00800000;
-pub const WINHTTP_FLAG_ESCAPE_PERCENT: ::DWORD = 0x00000004;
-pub const WINHTTP_FLAG_NULL_CODEPAGE: ::DWORD = 0x00000008;
-pub const WINHTTP_FLAG_BYPASS_PROXY_CACHE: ::DWORD = 0x00000100;
-pub const WINHTTP_FLAG_REFRESH: ::DWORD = WINHTTP_FLAG_BYPASS_PROXY_CACHE;
-pub const WINHTTP_FLAG_ESCAPE_DISABLE: ::DWORD = 0x00000040;
-pub const WINHTTP_FLAG_ESCAPE_DISABLE_QUERY: ::DWORD = 0x00000080;
-STRUCT!{struct WINHTTP_ASYNC_RESULT {
-    dwResult: ::DWORD_PTR,
-    dwError: ::DWORD,
-}}
-pub type LPWINHTTP_ASYNC_RESULT = *mut WINHTTP_ASYNC_RESULT;
-pub type INTERNET_SCHEME = ::c_int;
-pub type LPINTERNET_SCHEME = *mut ::c_int;
-pub const INTERNET_SCHEME_HTTP: INTERNET_SCHEME = 1;
-pub const INTERNET_SCHEME_HTTPS: INTERNET_SCHEME = 2;
-pub const INTERNET_SCHEME_FTP: INTERNET_SCHEME = 3;
-pub const INTERNET_SCHEME_SOCKS: INTERNET_SCHEME = 4;
-STRUCT!{struct URL_COMPONENTS {
-    dwStructSize: ::DWORD,
-    lpszScheme: ::LPWSTR,
-    dwSchemeLength: ::DWORD,
-    nScheme: INTERNET_SCHEME,
-    lpszHostName: ::LPWSTR,
-    dwHostNameLength: ::DWORD,
-    nPort: INTERNET_PORT,
-    lpszUserName: ::LPWSTR,
-    dwUserNameLength: ::DWORD,
-    lpszPassword: ::LPWSTR,
-    dwPasswordLength: ::DWORD,
-    lpszUrlPath: ::LPWSTR,
-    dwUrlPathLength: ::DWORD,
-    lpszExtraInfo: ::LPWSTR,
-    dwExtraInfoLength: ::DWORD,
-}}
-pub type LPURL_COMPONENTS = *mut URL_COMPONENTS;
-pub type URL_COMPONENTSW = URL_COMPONENTS;
-pub type LPURL_COMPONENTSW = LPURL_COMPONENTS;
-STRUCT!{struct WINHTTP_PROXY_INFO {
-    dwAccessType: ::DWORD,
-    lpszProxy: ::LPWSTR,
-    lpszProxyBypass: ::LPWSTR,
-}}
-pub type LPWINHTTP_PROXY_INFO = *mut WINHTTP_PROXY_INFO;
-pub type WINHTTP_PROXY_INFOW = WINHTTP_PROXY_INFO;
-pub type LPWINHTTP_PROXY_INFOW = LPWINHTTP_PROXY_INFO;
-STRUCT!{struct WINHTTP_AUTOPROXY_OPTIONS {
-    dwFlags: ::DWORD,
-    dwAutoDetectFlags: ::DWORD,
-    lpszAutoConfigUrl: ::LPCWSTR,
-    lpvReserved: ::LPVOID,
-    dwReserved: ::DWORD,
-    fAutoLogonIfChallenged: ::BOOL,
-}}
-pub const WINHTTP_AUTOPROXY_AUTO_DETECT: ::DWORD = 0x00000001;
-pub const WINHTTP_AUTOPROXY_CONFIG_URL: ::DWORD = 0x00000002;
-pub const WINHTTP_AUTOPROXY_HOST_KEEPCASE: ::DWORD = 0x00000004;
-pub const WINHTTP_AUTOPROXY_HOST_LOWERCASE: ::DWORD = 0x00000008;
-pub const WINHTTP_AUTOPROXY_RUN_INPROCESS: ::DWORD = 0x00010000;
-pub const WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY: ::DWORD = 0x00020000;
-pub const WINHTTP_AUTOPROXY_NO_DIRECTACCESS: ::DWORD = 0x00040000;
-pub const WINHTTP_AUTOPROXY_NO_CACHE_CLIENT: ::DWORD = 0x00080000;
-pub const WINHTTP_AUTOPROXY_NO_CACHE_SVC: ::DWORD = 0x00100000;
-pub const WINHTTP_AUTOPROXY_SORT_RESULTS: ::DWORD = 0x00400000;
-pub const WINHTTP_AUTO_DETECT_TYPE_DHCP: ::DWORD = 0x00000001;
-pub const WINHTTP_AUTO_DETECT_TYPE_DNS_A: ::DWORD = 0x00000002;
-STRUCT!{struct WINHTTP_PROXY_RESULT_ENTRY {
-    fProxy: ::BOOL,
-    fBypass: ::BOOL,
-    ProxyScheme: INTERNET_SCHEME,
-    pwszProxy: ::PWSTR,
-    ProxyPort: INTERNET_PORT,
-}}
-STRUCT!{struct WINHTTP_PROXY_RESULT {
-    cEntries: ::DWORD,
-    pEntries: *mut WINHTTP_PROXY_RESULT_ENTRY,
-}}
-pub const WINHTTP_FIRST_OPTION: ::DWORD = WINHTTP_OPTION_CALLBACK;
-pub const WINHTTP_OPTION_CALLBACK: ::DWORD = 1;
-pub const WINHTTP_OPTION_RESOLVE_TIMEOUT: ::DWORD = 2;
-pub const WINHTTP_OPTION_CONNECT_TIMEOUT: ::DWORD = 3;
-pub const WINHTTP_OPTION_CONNECT_RETRIES: ::DWORD = 4;
-pub const WINHTTP_OPTION_SEND_TIMEOUT: ::DWORD = 5;
-pub const WINHTTP_OPTION_RECEIVE_TIMEOUT: ::DWORD = 6;
-pub const WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: ::DWORD = 7;
-pub const WINHTTP_OPTION_HANDLE_TYPE: ::DWORD = 9;
-pub const WINHTTP_OPTION_READ_BUFFER_SIZE: ::DWORD = 12;
-pub const WINHTTP_OPTION_WRITE_BUFFER_SIZE: ::DWORD = 13;
-pub const WINHTTP_OPTION_PARENT_HANDLE: ::DWORD = 21;
-pub const WINHTTP_OPTION_EXTENDED_ERROR: ::DWORD = 24;
-pub const WINHTTP_OPTION_SECURITY_FLAGS: ::DWORD = 31;
-pub const WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT: ::DWORD = 32;
-pub const WINHTTP_OPTION_URL: ::DWORD = 34;
-pub const WINHTTP_OPTION_SECURITY_KEY_BITNESS: ::DWORD = 36;
-pub const WINHTTP_OPTION_PROXY: ::DWORD = 38;
-pub const WINHTTP_OPTION_PROXY_RESULT_ENTRY: ::DWORD = 39;
-pub const WINHTTP_OPTION_USER_AGENT: ::DWORD = 41;
-pub const WINHTTP_OPTION_CONTEXT_VALUE: ::DWORD = 45;
-pub const WINHTTP_OPTION_CLIENT_CERT_CONTEXT: ::DWORD = 47;
-pub const WINHTTP_OPTION_REQUEST_PRIORITY: ::DWORD = 58;
-pub const WINHTTP_OPTION_HTTP_VERSION: ::DWORD = 59;
-pub const WINHTTP_OPTION_DISABLE_FEATURE: ::DWORD = 63;
-pub const WINHTTP_OPTION_CODEPAGE: ::DWORD = 68;
-pub const WINHTTP_OPTION_MAX_CONNS_PER_SERVER: ::DWORD = 73;
-pub const WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: ::DWORD = 74;
-pub const WINHTTP_OPTION_AUTOLOGON_POLICY: ::DWORD = 77;
-pub const WINHTTP_OPTION_SERVER_CERT_CONTEXT: ::DWORD = 78;
-pub const WINHTTP_OPTION_ENABLE_FEATURE: ::DWORD = 79;
-pub const WINHTTP_OPTION_WORKER_THREAD_COUNT: ::DWORD = 80;
-pub const WINHTTP_OPTION_PASSPORT_COBRANDING_TEXT: ::DWORD = 81;
-pub const WINHTTP_OPTION_PASSPORT_COBRANDING_URL: ::DWORD = 82;
-pub const WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: ::DWORD = 83;
-pub const WINHTTP_OPTION_SECURE_PROTOCOLS: ::DWORD = 84;
-pub const WINHTTP_OPTION_ENABLETRACING: ::DWORD = 85;
-pub const WINHTTP_OPTION_PASSPORT_SIGN_OUT: ::DWORD = 86;
-pub const WINHTTP_OPTION_PASSPORT_RETURN_URL: ::DWORD = 87;
-pub const WINHTTP_OPTION_REDIRECT_POLICY: ::DWORD = 88;
-pub const WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS: ::DWORD = 89;
-pub const WINHTTP_OPTION_MAX_HTTP_STATUS_CONTINUE: ::DWORD = 90;
-pub const WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE: ::DWORD = 91;
-pub const WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE: ::DWORD = 92;
-pub const WINHTTP_OPTION_CONNECTION_INFO: ::DWORD = 93;
-pub const WINHTTP_OPTION_CLIENT_CERT_ISSUER_LIST: ::DWORD = 94;
-pub const WINHTTP_OPTION_SPN: ::DWORD = 96;
-pub const WINHTTP_OPTION_GLOBAL_PROXY_CREDS: ::DWORD = 97;
-pub const WINHTTP_OPTION_GLOBAL_SERVER_CREDS: ::DWORD = 98;
-pub const WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: ::DWORD = 99;
-pub const WINHTTP_OPTION_REJECT_USERPWD_IN_URL: ::DWORD = 100;
-pub const WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS: ::DWORD = 101;
-pub const WINHTTP_OPTION_RECEIVE_PROXY_CONNECT_RESPONSE: ::DWORD = 103;
-pub const WINHTTP_OPTION_IS_PROXY_CONNECT_RESPONSE: ::DWORD = 104;
-pub const WINHTTP_OPTION_SERVER_SPN_USED: ::DWORD = 106;
-pub const WINHTTP_OPTION_PROXY_SPN_USED: ::DWORD = 107;
-pub const WINHTTP_OPTION_SERVER_CBT: ::DWORD = 108;
-pub const WINHTTP_OPTION_UNSAFE_HEADER_PARSING: ::DWORD = 110;
-pub const WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS: ::DWORD = 111;
-pub const WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET: ::DWORD = 114;
-pub const WINHTTP_OPTION_WEB_SOCKET_CLOSE_TIMEOUT: ::DWORD = 115;
-pub const WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL: ::DWORD = 116;
-pub const WINHTTP_OPTION_DECOMPRESSION: ::DWORD = 118;
-pub const WINHTTP_OPTION_WEB_SOCKET_RECEIVE_BUFFER_SIZE: ::DWORD = 122;
-pub const WINHTTP_OPTION_WEB_SOCKET_SEND_BUFFER_SIZE: ::DWORD = 123;
-pub const WINHTTP_LAST_OPTION: ::DWORD = WINHTTP_OPTION_WEB_SOCKET_SEND_BUFFER_SIZE;
-pub const WINHTTP_OPTION_USERNAME: ::DWORD = 0x1000;
-pub const WINHTTP_OPTION_PASSWORD: ::DWORD = 0x1001;
-pub const WINHTTP_OPTION_PROXY_USERNAME: ::DWORD = 0x1002;
-pub const WINHTTP_OPTION_PROXY_PASSWORD: ::DWORD = 0x1003;
-//552
-pub type WINHTTP_STATUS_CALLBACK = Option<unsafe extern "system" fn(
-    hInternet: HINTERNET, dwContext: ::DWORD_PTR, dwInternetStatus: ::DWORD,
-    lpvStatusInformation: ::LPVOID, dwStatusInformationLength: ::DWORD,
-)>;
-pub type LPWINHTTP_STATUS_CALLBACK = *mut WINHTTP_STATUS_CALLBACK;
-pub const WINHTTP_CALLBACK_STATUS_RESOLVING_NAME: ::DWORD = 0x00000001;
-pub const WINHTTP_CALLBACK_STATUS_NAME_RESOLVED: ::DWORD = 0x00000002;
-pub const WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER: ::DWORD = 0x00000004;
-pub const WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER: ::DWORD = 0x00000008;
-pub const WINHTTP_CALLBACK_STATUS_SENDING_REQUEST: ::DWORD = 0x00000010;
-pub const WINHTTP_CALLBACK_STATUS_REQUEST_SENT: ::DWORD = 0x00000020;
-pub const WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE: ::DWORD = 0x00000040;
-pub const WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED: ::DWORD = 0x00000080;
-pub const WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION: ::DWORD = 0x00000100;
-pub const WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED: ::DWORD = 0x00000200;
-pub const WINHTTP_CALLBACK_STATUS_HANDLE_CREATED: ::DWORD = 0x00000400;
-pub const WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING: ::DWORD = 0x00000800;
-pub const WINHTTP_CALLBACK_STATUS_DETECTING_PROXY: ::DWORD = 0x00001000;
-pub const WINHTTP_CALLBACK_STATUS_REDIRECT: ::DWORD = 0x00004000;
-pub const WINHTTP_CALLBACK_STATUS_INTERMEDIATE_RESPONSE: ::DWORD = 0x00008000;
-pub const WINHTTP_CALLBACK_STATUS_SECURE_FAILURE: ::DWORD = 0x00010000;
-pub const WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: ::DWORD = 0x00020000;
-pub const WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE: ::DWORD = 0x00040000;
-pub const WINHTTP_CALLBACK_STATUS_READ_COMPLETE: ::DWORD = 0x00080000;
-pub const WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE: ::DWORD = 0x00100000;
-pub const WINHTTP_CALLBACK_STATUS_REQUEST_ERROR: ::DWORD = 0x00200000;
-pub const WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: ::DWORD = 0x00400000;
-pub const WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE: ::DWORD = 0x01000000;
-pub const WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE: ::DWORD = 0x02000000;
-pub const WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE: ::DWORD = 0x04000000;
-pub const WINHTTP_CALLBACK_FLAG_RESOLVE_NAME: ::DWORD = WINHTTP_CALLBACK_STATUS_RESOLVING_NAME
-    | WINHTTP_CALLBACK_STATUS_NAME_RESOLVED;
-pub const WINHTTP_CALLBACK_FLAG_CONNECT_TO_SERVER: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER | WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER;
-pub const WINHTTP_CALLBACK_FLAG_SEND_REQUEST: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_SENDING_REQUEST | WINHTTP_CALLBACK_STATUS_REQUEST_SENT;
-pub const WINHTTP_CALLBACK_FLAG_RECEIVE_RESPONSE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE | WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED;
-pub const WINHTTP_CALLBACK_FLAG_CLOSE_CONNECTION: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION | WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED;
-pub const WINHTTP_CALLBACK_FLAG_HANDLES: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_HANDLE_CREATED | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING;
-pub const WINHTTP_CALLBACK_FLAG_DETECTING_PROXY: ::DWORD = WINHTTP_CALLBACK_STATUS_DETECTING_PROXY;
-pub const WINHTTP_CALLBACK_FLAG_REDIRECT: ::DWORD = WINHTTP_CALLBACK_STATUS_REDIRECT;
-pub const WINHTTP_CALLBACK_FLAG_INTERMEDIATE_RESPONSE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_INTERMEDIATE_RESPONSE;
-pub const WINHTTP_CALLBACK_FLAG_SECURE_FAILURE: ::DWORD = WINHTTP_CALLBACK_STATUS_SECURE_FAILURE;
-pub const WINHTTP_CALLBACK_FLAG_SENDREQUEST_COMPLETE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_HEADERS_AVAILABLE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE;
-pub const WINHTTP_CALLBACK_FLAG_DATA_AVAILABLE: ::DWORD = WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE;
-pub const WINHTTP_CALLBACK_FLAG_READ_COMPLETE: ::DWORD = WINHTTP_CALLBACK_STATUS_READ_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE: ::DWORD = WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_REQUEST_ERROR: ::DWORD = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR;
-pub const WINHTTP_CALLBACK_FLAG_GETPROXYFORURL_COMPLETE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE | WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE
-    | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE
-    | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR
-    | WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS: ::DWORD = 0xffffffff;
-pub const WINHTTP_QUERY_MIME_VERSION: ::DWORD = 0;
-pub const WINHTTP_QUERY_CONTENT_TYPE: ::DWORD = 1;
-pub const WINHTTP_QUERY_CONTENT_TRANSFER_ENCODING: ::DWORD = 2;
-pub const WINHTTP_QUERY_CONTENT_ID: ::DWORD = 3;
-pub const WINHTTP_QUERY_CONTENT_DESCRIPTION: ::DWORD = 4;
-pub const WINHTTP_QUERY_CONTENT_LENGTH: ::DWORD = 5;
-pub const WINHTTP_QUERY_CONTENT_LANGUAGE: ::DWORD = 6;
-pub const WINHTTP_QUERY_ALLOW: ::DWORD = 7;
-pub const WINHTTP_QUERY_PUBLIC: ::DWORD = 8;
-pub const WINHTTP_QUERY_DATE: ::DWORD = 9;
-pub const WINHTTP_QUERY_EXPIRES: ::DWORD = 10;
-pub const WINHTTP_QUERY_LAST_MODIFIED: ::DWORD = 11;
-pub const WINHTTP_QUERY_MESSAGE_ID: ::DWORD = 12;
-pub const WINHTTP_QUERY_URI: ::DWORD = 13;
-pub const WINHTTP_QUERY_DERIVED_FROM: ::DWORD = 14;
-pub const WINHTTP_QUERY_COST: ::DWORD = 15;
-pub const WINHTTP_QUERY_LINK: ::DWORD = 16;
-pub const WINHTTP_QUERY_PRAGMA: ::DWORD = 17;
-pub const WINHTTP_QUERY_VERSION: ::DWORD = 18;
-pub const WINHTTP_QUERY_STATUS_CODE: ::DWORD = 19;
-pub const WINHTTP_QUERY_STATUS_TEXT: ::DWORD = 20;
-pub const WINHTTP_QUERY_RAW_HEADERS: ::DWORD = 21;
-pub const WINHTTP_QUERY_RAW_HEADERS_CRLF: ::DWORD = 22;
-pub const WINHTTP_QUERY_CONNECTION: ::DWORD = 23;
-pub const WINHTTP_QUERY_ACCEPT: ::DWORD = 24;
-pub const WINHTTP_QUERY_ACCEPT_CHARSET: ::DWORD = 25;
-pub const WINHTTP_QUERY_ACCEPT_ENCODING: ::DWORD = 26;
-pub const WINHTTP_QUERY_ACCEPT_LANGUAGE: ::DWORD = 27;
-pub const WINHTTP_QUERY_AUTHORIZATION: ::DWORD = 28;
-pub const WINHTTP_QUERY_CONTENT_ENCODING: ::DWORD = 29;
-pub const WINHTTP_QUERY_FORWARDED: ::DWORD = 30;
-pub const WINHTTP_QUERY_FROM: ::DWORD = 31;
-pub const WINHTTP_QUERY_IF_MODIFIED_SINCE: ::DWORD = 32;
-pub const WINHTTP_QUERY_LOCATION: ::DWORD = 33;
-pub const WINHTTP_QUERY_ORIG_URI: ::DWORD = 34;
-pub const WINHTTP_QUERY_REFERER: ::DWORD = 35;
-pub const WINHTTP_QUERY_RETRY_AFTER: ::DWORD = 36;
-pub const WINHTTP_QUERY_SERVER: ::DWORD = 37;
-pub const WINHTTP_QUERY_TITLE: ::DWORD = 38;
-pub const WINHTTP_QUERY_USER_AGENT: ::DWORD = 39;
-pub const WINHTTP_QUERY_WWW_AUTHENTICATE: ::DWORD = 40;
-pub const WINHTTP_QUERY_PROXY_AUTHENTICATE: ::DWORD = 41;
-pub const WINHTTP_QUERY_ACCEPT_RANGES: ::DWORD = 42;
-pub const WINHTTP_QUERY_SET_COOKIE: ::DWORD = 43;
-pub const WINHTTP_QUERY_COOKIE: ::DWORD = 44;
-pub const WINHTTP_QUERY_REQUEST_METHOD: ::DWORD = 45;
-pub const WINHTTP_QUERY_REFRESH: ::DWORD = 46;
-pub const WINHTTP_QUERY_CONTENT_DISPOSITION: ::DWORD = 47;
-pub const WINHTTP_QUERY_AGE: ::DWORD = 48;
-pub const WINHTTP_QUERY_CACHE_CONTROL: ::DWORD = 49;
-pub const WINHTTP_QUERY_CONTENT_BASE: ::DWORD = 50;
-pub const WINHTTP_QUERY_CONTENT_LOCATION: ::DWORD = 51;
-pub const WINHTTP_QUERY_CONTENT_MD5: ::DWORD = 52;
-pub const WINHTTP_QUERY_CONTENT_RANGE: ::DWORD = 53;
-pub const WINHTTP_QUERY_ETAG: ::DWORD = 54;
-pub const WINHTTP_QUERY_HOST: ::DWORD = 55;
-pub const WINHTTP_QUERY_IF_MATCH: ::DWORD = 56;
-pub const WINHTTP_QUERY_IF_NONE_MATCH: ::DWORD = 57;
-pub const WINHTTP_QUERY_IF_RANGE: ::DWORD = 58;
-pub const WINHTTP_QUERY_IF_UNMODIFIED_SINCE: ::DWORD = 59;
-pub const WINHTTP_QUERY_MAX_FORWARDS: ::DWORD = 60;
-pub const WINHTTP_QUERY_PROXY_AUTHORIZATION: ::DWORD = 61;
-pub const WINHTTP_QUERY_RANGE: ::DWORD = 62;
-pub const WINHTTP_QUERY_TRANSFER_ENCODING: ::DWORD = 63;
-pub const WINHTTP_QUERY_UPGRADE: ::DWORD = 64;
-pub const WINHTTP_QUERY_VARY: ::DWORD = 65;
-pub const WINHTTP_QUERY_VIA: ::DWORD = 66;
-pub const WINHTTP_QUERY_WARNING: ::DWORD = 67;
-pub const WINHTTP_QUERY_EXPECT: ::DWORD = 68;
-pub const WINHTTP_QUERY_PROXY_CONNECTION: ::DWORD = 69;
-pub const WINHTTP_QUERY_UNLESS_MODIFIED_SINCE: ::DWORD = 70;
-pub const WINHTTP_QUERY_PROXY_SUPPORT: ::DWORD = 75;
-pub const WINHTTP_QUERY_AUTHENTICATION_INFO: ::DWORD = 76;
-pub const WINHTTP_QUERY_PASSPORT_URLS: ::DWORD = 77;
-pub const WINHTTP_QUERY_PASSPORT_CONFIG: ::DWORD = 78;
-pub const WINHTTP_QUERY_MAX: ::DWORD = 78;
-pub const WINHTTP_QUERY_CUSTOM: ::DWORD = 65535;
-pub const WINHTTP_QUERY_FLAG_REQUEST_HEADERS: ::DWORD = 0x80000000;
-pub const WINHTTP_QUERY_FLAG_SYSTEMTIME: ::DWORD = 0x40000000;
-pub const WINHTTP_QUERY_FLAG_NUMBER: ::DWORD = 0x20000000;
-pub const HTTP_STATUS_CONTINUE: ::DWORD = 100;
-pub const HTTP_STATUS_SWITCH_PROTOCOLS: ::DWORD = 101;
-pub const HTTP_STATUS_OK: ::DWORD = 200;
-pub const HTTP_STATUS_CREATED: ::DWORD = 201;
-pub const HTTP_STATUS_ACCEPTED: ::DWORD = 202;
-pub const HTTP_STATUS_PARTIAL: ::DWORD = 203;
-pub const HTTP_STATUS_NO_CONTENT: ::DWORD = 204;
-pub const HTTP_STATUS_RESET_CONTENT: ::DWORD = 205;
-pub const HTTP_STATUS_PARTIAL_CONTENT: ::DWORD = 206;
-pub const HTTP_STATUS_WEBDAV_MULTI_STATUS: ::DWORD = 207;
-pub const HTTP_STATUS_AMBIGUOUS: ::DWORD = 300;
-pub const HTTP_STATUS_MOVED: ::DWORD = 301;
-pub const HTTP_STATUS_REDIRECT: ::DWORD = 302;
-pub const HTTP_STATUS_REDIRECT_METHOD: ::DWORD = 303;
-pub const HTTP_STATUS_NOT_MODIFIED: ::DWORD = 304;
-pub const HTTP_STATUS_USE_PROXY: ::DWORD = 305;
-pub const HTTP_STATUS_REDIRECT_KEEP_VERB: ::DWORD = 307;
-pub const HTTP_STATUS_BAD_REQUEST: ::DWORD = 400;
-pub const HTTP_STATUS_DENIED: ::DWORD = 401;
-pub const HTTP_STATUS_PAYMENT_REQ: ::DWORD = 402;
-pub const HTTP_STATUS_FORBIDDEN: ::DWORD = 403;
-pub const HTTP_STATUS_NOT_FOUND: ::DWORD = 404;
-pub const HTTP_STATUS_BAD_METHOD: ::DWORD = 405;
-pub const HTTP_STATUS_NONE_ACCEPTABLE: ::DWORD = 406;
-pub const HTTP_STATUS_PROXY_AUTH_REQ: ::DWORD = 407;
-pub const HTTP_STATUS_REQUEST_TIMEOUT: ::DWORD = 408;
-pub const HTTP_STATUS_CONFLICT: ::DWORD = 409;
-pub const HTTP_STATUS_GONE: ::DWORD = 410;
-pub const HTTP_STATUS_LENGTH_REQUIRED: ::DWORD = 411;
-pub const HTTP_STATUS_PRECOND_FAILED: ::DWORD = 412;
-pub const HTTP_STATUS_REQUEST_TOO_LARGE: ::DWORD = 413;
-pub const HTTP_STATUS_URI_TOO_LONG: ::DWORD = 414;
-pub const HTTP_STATUS_UNSUPPORTED_MEDIA: ::DWORD = 415;
-pub const HTTP_STATUS_RETRY_WITH: ::DWORD = 449;
-pub const HTTP_STATUS_SERVER_ERROR: ::DWORD = 500;
-pub const HTTP_STATUS_NOT_SUPPORTED: ::DWORD = 501;
-pub const HTTP_STATUS_BAD_GATEWAY: ::DWORD = 502;
-pub const HTTP_STATUS_SERVICE_UNAVAIL: ::DWORD = 503;
-pub const HTTP_STATUS_GATEWAY_TIMEOUT: ::DWORD = 504;
-pub const HTTP_STATUS_VERSION_NOT_SUP: ::DWORD = 505;
-pub const HTTP_STATUS_FIRST: ::DWORD = HTTP_STATUS_CONTINUE;
-pub const HTTP_STATUS_LAST: ::DWORD = HTTP_STATUS_VERSION_NOT_SUP;
-pub const WINHTTP_ACCESS_TYPE_DEFAULT_PROXY: ::DWORD = 0;
-pub const WINHTTP_ACCESS_TYPE_NO_PROXY: ::DWORD = 1;
-pub const WINHTTP_ACCESS_TYPE_NAMED_PROXY: ::DWORD = 3;
-pub const WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY: ::DWORD = 4;
-pub const WINHTTP_ERROR_BASE: ::DWORD = 12000;
-pub const ERROR_WINHTTP_OUT_OF_HANDLES: ::DWORD = WINHTTP_ERROR_BASE + 1;
-pub const ERROR_WINHTTP_TIMEOUT: ::DWORD = WINHTTP_ERROR_BASE + 2;
-pub const ERROR_WINHTTP_INTERNAL_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 4;
-pub const ERROR_WINHTTP_INVALID_URL: ::DWORD = WINHTTP_ERROR_BASE + 5;
-pub const ERROR_WINHTTP_UNRECOGNIZED_SCHEME: ::DWORD = WINHTTP_ERROR_BASE + 6;
-pub const ERROR_WINHTTP_NAME_NOT_RESOLVED: ::DWORD = WINHTTP_ERROR_BASE + 7;
-pub const ERROR_WINHTTP_INVALID_OPTION: ::DWORD = WINHTTP_ERROR_BASE + 9;
-pub const ERROR_WINHTTP_OPTION_NOT_SETTABLE: ::DWORD = WINHTTP_ERROR_BASE + 11;
-pub const ERROR_WINHTTP_SHUTDOWN: ::DWORD = WINHTTP_ERROR_BASE + 12;
-pub const ERROR_WINHTTP_LOGIN_FAILURE: ::DWORD = WINHTTP_ERROR_BASE + 15;
-pub const ERROR_WINHTTP_OPERATION_CANCELLED: ::DWORD = WINHTTP_ERROR_BASE + 17;
-pub const ERROR_WINHTTP_INCORRECT_HANDLE_TYPE: ::DWORD = WINHTTP_ERROR_BASE + 18;
-pub const ERROR_WINHTTP_INCORRECT_HANDLE_STATE: ::DWORD = WINHTTP_ERROR_BASE + 19;
-pub const ERROR_WINHTTP_CANNOT_CONNECT: ::DWORD = WINHTTP_ERROR_BASE + 29;
-pub const ERROR_WINHTTP_CONNECTION_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 30;
-pub const ERROR_WINHTTP_RESEND_REQUEST: ::DWORD = WINHTTP_ERROR_BASE + 32;
-pub const ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED: ::DWORD = WINHTTP_ERROR_BASE + 44;
-pub const ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN: ::DWORD = WINHTTP_ERROR_BASE + 100;
-pub const ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND: ::DWORD = WINHTTP_ERROR_BASE + 101;
-pub const ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND: ::DWORD = WINHTTP_ERROR_BASE + 102;
-pub const ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN: ::DWORD = WINHTTP_ERROR_BASE + 103;
-pub const ERROR_WINHTTP_HEADER_NOT_FOUND: ::DWORD = WINHTTP_ERROR_BASE + 150;
-pub const ERROR_WINHTTP_INVALID_SERVER_RESPONSE: ::DWORD = WINHTTP_ERROR_BASE + 152;
-pub const ERROR_WINHTTP_INVALID_HEADER: ::DWORD = WINHTTP_ERROR_BASE + 153;
-pub const ERROR_WINHTTP_INVALID_QUERY_REQUEST: ::DWORD = WINHTTP_ERROR_BASE + 154;
-pub const ERROR_WINHTTP_HEADER_ALREADY_EXISTS: ::DWORD = WINHTTP_ERROR_BASE + 155;
-pub const ERROR_WINHTTP_REDIRECT_FAILED: ::DWORD = WINHTTP_ERROR_BASE + 156;
-pub const ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 178;
-pub const ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT: ::DWORD = WINHTTP_ERROR_BASE + 166;
-pub const ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT: ::DWORD = WINHTTP_ERROR_BASE + 167;
-pub const ERROR_WINHTTP_UNHANDLED_SCRIPT_TYPE: ::DWORD = WINHTTP_ERROR_BASE + 176;
-pub const ERROR_WINHTTP_SCRIPT_EXECUTION_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 177;
-pub const ERROR_WINHTTP_NOT_INITIALIZED: ::DWORD = WINHTTP_ERROR_BASE + 172;
-pub const ERROR_WINHTTP_SECURE_FAILURE: ::DWORD = WINHTTP_ERROR_BASE + 175;
-pub const ERROR_WINHTTP_SECURE_CERT_DATE_INVALID: ::DWORD = WINHTTP_ERROR_BASE + 37;
-pub const ERROR_WINHTTP_SECURE_CERT_CN_INVALID: ::DWORD = WINHTTP_ERROR_BASE + 38;
-pub const ERROR_WINHTTP_SECURE_INVALID_CA: ::DWORD = WINHTTP_ERROR_BASE + 45;
-pub const ERROR_WINHTTP_SECURE_CERT_REV_FAILED: ::DWORD = WINHTTP_ERROR_BASE + 57;
-pub const ERROR_WINHTTP_SECURE_CHANNEL_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 157;
-pub const ERROR_WINHTTP_SECURE_INVALID_CERT: ::DWORD = WINHTTP_ERROR_BASE + 169;
-pub const ERROR_WINHTTP_SECURE_CERT_REVOKED: ::DWORD = WINHTTP_ERROR_BASE + 170;
-pub const ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE: ::DWORD = WINHTTP_ERROR_BASE + 179;
-pub const ERROR_WINHTTP_AUTODETECTION_FAILED: ::DWORD = WINHTTP_ERROR_BASE + 180;
-pub const ERROR_WINHTTP_HEADER_COUNT_EXCEEDED: ::DWORD = WINHTTP_ERROR_BASE + 181;
-pub const ERROR_WINHTTP_HEADER_SIZE_OVERFLOW: ::DWORD = WINHTTP_ERROR_BASE + 182;
-pub const ERROR_WINHTTP_CHUNKED_ENCODING_HEADER_SIZE_OVERFLOW: ::DWORD = WINHTTP_ERROR_BASE + 183;
-pub const ERROR_WINHTTP_RESPONSE_DRAIN_OVERFLOW: ::DWORD = WINHTTP_ERROR_BASE + 184;
-pub const ERROR_WINHTTP_CLIENT_CERT_NO_PRIVATE_KEY: ::DWORD = WINHTTP_ERROR_BASE + 185;
-pub const ERROR_WINHTTP_CLIENT_CERT_NO_ACCESS_PRIVATE_KEY: ::DWORD = WINHTTP_ERROR_BASE + 186;
-pub const WINHTTP_ERROR_LAST: ::DWORD = WINHTTP_ERROR_BASE + 186;
-pub const WINHTTP_RESET_STATE: ::DWORD = 0x00000001;
-pub const WINHTTP_RESET_SWPAD_CURRENT_NETWORK: ::DWORD = 0x00000002;
-pub const WINHTTP_RESET_SWPAD_ALL: ::DWORD = 0x00000004;
-pub const WINHTTP_RESET_SCRIPT_CACHE: ::DWORD = 0x00000008;
-pub const WINHTTP_RESET_ALL: ::DWORD = 0x0000FFFF;
-pub const WINHTTP_RESET_NOTIFY_NETWORK_CHANGED: ::DWORD = 0x00010000;
-pub const WINHTTP_RESET_OUT_OF_PROC: ::DWORD = 0x00020000;
-STRUCT!{struct WINHTTP_CURRENT_USER_IE_PROXY_CONFIG {
-    fAutoDetect: ::BOOL,
-    lpszAutoConfigUrl: ::LPWSTR,
-    lpszProxy: ::LPWSTR,
-    lpszProxyBypass: ::LPWSTR,
-}}
-//1370
-ENUM!{enum WINHTTP_WEB_SOCKET_OPERATION {
-    WINHTTP_WEB_SOCKET_SEND_OPERATION = 0,
-    WINHTTP_WEB_SOCKET_RECEIVE_OPERATION = 1,
-    WINHTTP_WEB_SOCKET_CLOSE_OPERATION = 2,
-    WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION = 3,
-}}
-ENUM!{enum WINHTTP_WEB_SOCKET_BUFFER_TYPE {
-    WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE = 0,
-    WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE = 1,
-    WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE = 2,
-    WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE = 3,
-    WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE = 4,
-}}
-ENUM!{enum WINHTTP_WEB_SOCKET_CLOSE_STATUS {
-    WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS = 1000,
-    WINHTTP_WEB_SOCKET_ENDPOINT_TERMINATED_CLOSE_STATUS = 1001,
-    WINHTTP_WEB_SOCKET_PROTOCOL_ERROR_CLOSE_STATUS = 1002,
-    WINHTTP_WEB_SOCKET_INVALID_DATA_TYPE_CLOSE_STATUS = 1003,
-    WINHTTP_WEB_SOCKET_EMPTY_CLOSE_STATUS = 1005,
-    WINHTTP_WEB_SOCKET_ABORTED_CLOSE_STATUS = 1006,
-    WINHTTP_WEB_SOCKET_INVALID_PAYLOAD_CLOSE_STATUS = 1007,
-    WINHTTP_WEB_SOCKET_POLICY_VIOLATION_CLOSE_STATUS = 1008,
-    WINHTTP_WEB_SOCKET_MESSAGE_TOO_BIG_CLOSE_STATUS = 1009,
-    WINHTTP_WEB_SOCKET_UNSUPPORTED_EXTENSIONS_CLOSE_STATUS = 1010,
-    WINHTTP_WEB_SOCKET_SERVER_ERROR_CLOSE_STATUS = 1011,
-    WINHTTP_WEB_SOCKET_SECURE_HANDSHAKE_ERROR_CLOSE_STATUS = 1015,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winioctl.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winioctl.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winioctl.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winioctl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,754 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the 32-Bit Windows Device I/O control codes.
-//123
-pub const FILE_DEVICE_BEEP: ::DWORD = 0x00000001;
-pub const FILE_DEVICE_CD_ROM: ::DWORD = 0x00000002;
-pub const FILE_DEVICE_CD_ROM_FILE_SYSTEM: ::DWORD = 0x00000003;
-pub const FILE_DEVICE_CONTROLLER: ::DWORD = 0x00000004;
-pub const FILE_DEVICE_DATALINK: ::DWORD = 0x00000005;
-pub const FILE_DEVICE_DFS: ::DWORD = 0x00000006;
-pub const FILE_DEVICE_DISK: ::DWORD = 0x00000007;
-pub const FILE_DEVICE_DISK_FILE_SYSTEM: ::DWORD = 0x00000008;
-pub const FILE_DEVICE_FILE_SYSTEM: ::DWORD = 0x00000009;
-pub const FILE_DEVICE_INPORT_PORT: ::DWORD = 0x0000000a;
-pub const FILE_DEVICE_KEYBOARD: ::DWORD = 0x0000000b;
-pub const FILE_DEVICE_MAILSLOT: ::DWORD = 0x0000000c;
-pub const FILE_DEVICE_MIDI_IN: ::DWORD = 0x0000000d;
-pub const FILE_DEVICE_MIDI_OUT: ::DWORD = 0x0000000e;
-pub const FILE_DEVICE_MOUSE: ::DWORD = 0x0000000f;
-pub const FILE_DEVICE_MULTI_UNC_PROVIDER: ::DWORD = 0x00000010;
-pub const FILE_DEVICE_NAMED_PIPE: ::DWORD = 0x00000011;
-pub const FILE_DEVICE_NETWORK: ::DWORD = 0x00000012;
-pub const FILE_DEVICE_NETWORK_BROWSER: ::DWORD = 0x00000013;
-pub const FILE_DEVICE_NETWORK_FILE_SYSTEM: ::DWORD = 0x00000014;
-pub const FILE_DEVICE_NULL: ::DWORD = 0x00000015;
-pub const FILE_DEVICE_PARALLEL_PORT: ::DWORD = 0x00000016;
-pub const FILE_DEVICE_PHYSICAL_NETCARD: ::DWORD = 0x00000017;
-pub const FILE_DEVICE_PRINTER: ::DWORD = 0x00000018;
-pub const FILE_DEVICE_SCANNER: ::DWORD = 0x00000019;
-pub const FILE_DEVICE_SERIAL_MOUSE_PORT: ::DWORD = 0x0000001a;
-pub const FILE_DEVICE_SERIAL_PORT: ::DWORD = 0x0000001b;
-pub const FILE_DEVICE_SCREEN: ::DWORD = 0x0000001c;
-pub const FILE_DEVICE_SOUND: ::DWORD = 0x0000001d;
-pub const FILE_DEVICE_STREAMS: ::DWORD = 0x0000001e;
-pub const FILE_DEVICE_TAPE: ::DWORD = 0x0000001f;
-pub const FILE_DEVICE_TAPE_FILE_SYSTEM: ::DWORD = 0x00000020;
-pub const FILE_DEVICE_TRANSPORT: ::DWORD = 0x00000021;
-pub const FILE_DEVICE_UNKNOWN: ::DWORD = 0x00000022;
-pub const FILE_DEVICE_VIDEO: ::DWORD = 0x00000023;
-pub const FILE_DEVICE_VIRTUAL_DISK: ::DWORD = 0x00000024;
-pub const FILE_DEVICE_WAVE_IN: ::DWORD = 0x00000025;
-pub const FILE_DEVICE_WAVE_OUT: ::DWORD = 0x00000026;
-pub const FILE_DEVICE_8042_PORT: ::DWORD = 0x00000027;
-pub const FILE_DEVICE_NETWORK_REDIRECTOR: ::DWORD = 0x00000028;
-pub const FILE_DEVICE_BATTERY: ::DWORD = 0x00000029;
-pub const FILE_DEVICE_BUS_EXTENDER: ::DWORD = 0x0000002a;
-pub const FILE_DEVICE_MODEM: ::DWORD = 0x0000002b;
-pub const FILE_DEVICE_VDM: ::DWORD = 0x0000002c;
-pub const FILE_DEVICE_MASS_STORAGE: ::DWORD = 0x0000002d;
-pub const FILE_DEVICE_SMB: ::DWORD = 0x0000002e;
-pub const FILE_DEVICE_KS: ::DWORD = 0x0000002f;
-pub const FILE_DEVICE_CHANGER: ::DWORD = 0x00000030;
-pub const FILE_DEVICE_SMARTCARD: ::DWORD = 0x00000031;
-pub const FILE_DEVICE_ACPI: ::DWORD = 0x00000032;
-pub const FILE_DEVICE_DVD: ::DWORD = 0x00000033;
-pub const FILE_DEVICE_FULLSCREEN_VIDEO: ::DWORD = 0x00000034;
-pub const FILE_DEVICE_DFS_FILE_SYSTEM: ::DWORD = 0x00000035;
-pub const FILE_DEVICE_DFS_VOLUME: ::DWORD = 0x00000036;
-pub const FILE_DEVICE_SERENUM: ::DWORD = 0x00000037;
-pub const FILE_DEVICE_TERMSRV: ::DWORD = 0x00000038;
-pub const FILE_DEVICE_KSEC: ::DWORD = 0x00000039;
-pub const FILE_DEVICE_FIPS: ::DWORD = 0x0000003A;
-pub const FILE_DEVICE_INFINIBAND: ::DWORD = 0x0000003B;
-pub const FILE_DEVICE_VMBUS: ::DWORD = 0x0000003E;
-pub const FILE_DEVICE_CRYPT_PROVIDER: ::DWORD = 0x0000003F;
-pub const FILE_DEVICE_WPD: ::DWORD = 0x00000040;
-pub const FILE_DEVICE_BLUETOOTH: ::DWORD = 0x00000041;
-pub const FILE_DEVICE_MT_COMPOSITE: ::DWORD = 0x00000042;
-pub const FILE_DEVICE_MT_TRANSPORT: ::DWORD = 0x00000043;
-pub const FILE_DEVICE_BIOMETRIC: ::DWORD = 0x00000044;
-pub const FILE_DEVICE_PMI: ::DWORD = 0x00000045;
-pub const FILE_DEVICE_EHSTOR: ::DWORD = 0x00000046;
-pub const FILE_DEVICE_DEVAPI: ::DWORD = 0x00000047;
-pub const FILE_DEVICE_GPIO: ::DWORD = 0x00000048;
-pub const FILE_DEVICE_USBEX: ::DWORD = 0x00000049;
-pub const FILE_DEVICE_CONSOLE: ::DWORD = 0x00000050;
-pub const FILE_DEVICE_NFP: ::DWORD = 0x00000051;
-pub const FILE_DEVICE_SYSENV: ::DWORD = 0x00000052;
-pub const FILE_DEVICE_VIRTUAL_BLOCK: ::DWORD = 0x00000053;
-pub const FILE_DEVICE_POINT_OF_SERVICE: ::DWORD = 0x00000054;
-//224
-pub const METHOD_BUFFERED: ::DWORD = 0;
-pub const METHOD_IN_DIRECT: ::DWORD = 1;
-pub const METHOD_OUT_DIRECT: ::DWORD = 2;
-pub const METHOD_NEITHER: ::DWORD = 3;
-//253
-pub const FILE_ANY_ACCESS: ::DWORD = 0;
-pub const FILE_SPECIAL_ACCESS: ::DWORD = FILE_ANY_ACCESS;
-pub const FILE_READ_ACCESS: ::DWORD = 0x0001;
-pub const FILE_WRITE_ACCESS: ::DWORD = 0x0002;
-//281
-pub const IOCTL_STORAGE_BASE: ::DWORD = FILE_DEVICE_MASS_STORAGE;
-pub const IOCTL_STORAGE_CHECK_VERIFY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0200,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_CHECK_VERIFY2: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0200,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_MEDIA_REMOVAL: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0201,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_EJECT_MEDIA: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0202,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_LOAD_MEDIA: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0203,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_LOAD_MEDIA2: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0203,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_RESERVE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_RELEASE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_FIND_NEW_DEVICES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0206,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_EJECTION_CONTROL: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0250,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_MCN_CONTROL: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0251,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_MEDIA_TYPES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0300,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_MEDIA_TYPES_EX: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0301,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0304,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_HOTPLUG_INFO: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0305,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_SET_HOTPLUG_INFO: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0306,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_RESET_BUS: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_RESET_DEVICE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0401,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_BREAK_RESERVATION: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0405,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_PERSISTENT_RESERVE_IN: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0406,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_PERSISTENT_RESERVE_OUT: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0407,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_GET_DEVICE_NUMBER: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0420,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_PREDICT_FAILURE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0440,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_FAILURE_PREDICTION_CONFIG: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0441,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_READ_CAPACITY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0450,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_GET_DEVICE_TELEMETRY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0470,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_DEVICE_TELEMETRY_NOTIFY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0471,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_DEVICE_TELEMETRY_QUERY_CAPS: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE,
-    0x0472, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_GET_DEVICE_TELEMETRY_RAW: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0473,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_QUERY_PROPERTY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0500,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_MANAGE_DATA_SET_ATTRIBUTES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0501,
-    METHOD_BUFFERED, FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_GET_LB_PROVISIONING_MAP_RESOURCES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE,
-    0x0502, METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_GET_BC_PROPERTIES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0600,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_ALLOCATE_BC_STREAM: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0601,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_FREE_BC_STREAM: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0602,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_CHECK_PRIORITY_HINT_SUPPORT: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE,
-    0x0620, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_START_DATA_INTEGRITY_CHECK: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0621,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_STOP_DATA_INTEGRITY_CHECK: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0622,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const OBSOLETE_IOCTL_STORAGE_RESET_BUS: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0400,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const OBSOLETE_IOCTL_STORAGE_RESET_DEVICE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0401,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_ENABLE_IDLE_POWER: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0720,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_IDLE_POWERUP_REASON: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0721,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_POWER_ACTIVE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0722,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_POWER_IDLE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0723,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_EVENT_NOTIFICATION: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0724,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-//2627
-pub const IOCTL_DISK_BASE: ::DWORD = FILE_DEVICE_DISK;
-pub const IOCTL_DISK_GET_DRIVE_GEOMETRY: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0000,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_GET_PARTITION_INFO: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0001,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_SET_PARTITION_INFO: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0002,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_DRIVE_LAYOUT: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0003,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_SET_DRIVE_LAYOUT: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0004,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_VERIFY: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0005, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_FORMAT_TRACKS: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0006, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_REASSIGN_BLOCKS: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0007, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_PERFORMANCE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0008, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_IS_WRITABLE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0009, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_LOGGING: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000a, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_FORMAT_TRACKS_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000b,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_HISTOGRAM_STRUCTURE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000c,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_HISTOGRAM_DATA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000d, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_HISTOGRAM_RESET: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000e, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_REQUEST_STRUCTURE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000f,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_REQUEST_DATA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0010, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_PERFORMANCE_OFF: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0018, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_CONTROLLER_NUMBER: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0011,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const SMART_GET_VERSION: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const SMART_SEND_DRIVE_COMMAND: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const SMART_RCV_DRIVE_DATA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_PARTITION_INFO_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0012,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_SET_PARTITION_INFO_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0013,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_DRIVE_LAYOUT_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0014,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_SET_DRIVE_LAYOUT_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0015,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_CREATE_DISK: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0016, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_LENGTH_INFO: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0017, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0028,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_REASSIGN_BLOCKS_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0029,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_UPDATE_DRIVE_SIZE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0032,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GROW_PARTITION: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_CACHE_INFORMATION: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0035,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_SET_CACHE_INFORMATION: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0036,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_WRITE_CACHE_STATE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0037,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const OBSOLETE_DISK_GET_WRITE_CACHE_STATE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0037,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_DELETE_DRIVE_LAYOUT: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0040,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_UPDATE_PROPERTIES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0050,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_FORMAT_DRIVE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x00f3, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_SENSE_DEVICE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x00f8, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_CHECK_VERIFY: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0200, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_MEDIA_REMOVAL: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0201, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_EJECT_MEDIA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0202, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_LOAD_MEDIA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0203, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_RESERVE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_RELEASE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0205, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_FIND_NEW_DEVICES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0206,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_GET_MEDIA_TYPES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0300, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_GET_DISK_ATTRIBUTES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x003c,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_SET_DISK_ATTRIBUTES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x003d,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_RESET_SNAPSHOT_INFO: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0084,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-//3907
-pub const IOCTL_CHANGER_BASE: ::DWORD = FILE_DEVICE_CHANGER;
-pub const IOCTL_CHANGER_GET_PARAMETERS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0000,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_GET_STATUS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0001,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_GET_PRODUCT_DATA: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0002,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_SET_ACCESS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0004,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_CHANGER_GET_ELEMENT_STATUS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0005,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_CHANGER_INITIALIZE_ELEMENT_STATUS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0006,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_SET_POSITION: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0007,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_EXCHANGE_MEDIUM: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0008,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_MOVE_MEDIUM: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0009,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_REINITIALIZE_TRANSPORT: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x000A,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_QUERY_VOLUME_TAGS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x000B,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_SERIAL_LSRMST_INSERT: ::DWORD = CTL_CODE!(FILE_DEVICE_SERIAL_PORT, 31,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-pub const IOCTL_SERENUM_EXPOSE_HARDWARE: ::DWORD = CTL_CODE!(FILE_DEVICE_SERENUM, 128,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-pub const IOCTL_SERENUM_REMOVE_HARDWARE: ::DWORD = CTL_CODE!(FILE_DEVICE_SERENUM, 129,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-pub const IOCTL_SERENUM_PORT_DESC: ::DWORD = CTL_CODE!(FILE_DEVICE_SERENUM, 130,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-pub const IOCTL_SERENUM_GET_PORT_NAME: ::DWORD = CTL_CODE!(FILE_DEVICE_SERENUM, 131,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-//4690
-pub const FSCTL_REQUEST_OPLOCK_LEVEL_1: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 0,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_REQUEST_OPLOCK_LEVEL_2: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 1,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_REQUEST_BATCH_OPLOCK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 2,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_OPLOCK_BREAK_ACKNOWLEDGE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 3,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_OPBATCH_ACK_CLOSE_PENDING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 4,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_OPLOCK_BREAK_NOTIFY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 5,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_LOCK_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 6, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_UNLOCK_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 7, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_DISMOUNT_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 8, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_IS_VOLUME_MOUNTED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 10,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_IS_PATHNAME_VALID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 11,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_MARK_VOLUME_DIRTY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 12,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_RETRIEVAL_POINTERS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 14,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_GET_COMPRESSION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SET_COMPRESSION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED,
-    ::FILE_READ_DATA | ::FILE_WRITE_DATA);
-pub const FSCTL_SET_BOOTLOADER_ACCESSED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 19,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_MARK_AS_SYSTEM_HIVE: ::DWORD = FSCTL_SET_BOOTLOADER_ACCESSED;
-pub const FSCTL_OPLOCK_BREAK_ACK_NO_2: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 20,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_INVALIDATE_VOLUMES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 21,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_FAT_BPB: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 22, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_REQUEST_FILTER_OPLOCK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 23,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_FILESYSTEM_GET_STATISTICS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 24,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_NTFS_VOLUME_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 25,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_NTFS_FILE_RECORD: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 26,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_VOLUME_BITMAP: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 27, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_GET_RETRIEVAL_POINTERS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 28,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_MOVE_FILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_IS_VOLUME_DIRTY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_ALLOW_EXTENDED_DASD_IO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 32,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_FIND_FILES_BY_SID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SET_OBJECT_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_GET_OBJECT_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_DELETE_OBJECT_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_SET_REPARSE_POINT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 41,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_GET_REPARSE_POINT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 42,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DELETE_REPARSE_POINT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 43,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_ENUM_USN_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 44,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_SECURITY_ID_CHECK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER,
-    ::FILE_READ_DATA);
-pub const FSCTL_READ_USN_JOURNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SET_OBJECT_ID_EXTENDED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 47,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_CREATE_OR_GET_OBJECT_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 48,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_SPARSE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_SET_ZERO_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_QUERY_ALLOCATED_RANGES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 51,
-    METHOD_NEITHER, ::FILE_READ_DATA);
-pub const FSCTL_ENABLE_UPGRADE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 52, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_SET_ENCRYPTION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_ENCRYPTION_FSCTL_IO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 54,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_WRITE_RAW_ENCRYPTED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 55,
-    METHOD_NEITHER, FILE_SPECIAL_ACCESS);
-pub const FSCTL_READ_RAW_ENCRYPTED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 56,
-    METHOD_NEITHER, FILE_SPECIAL_ACCESS);
-pub const FSCTL_CREATE_USN_JOURNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 57,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_READ_FILE_USN_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 58,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_WRITE_USN_CLOSE_RECORD: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 59,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_EXTEND_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 60, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_USN_JOURNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 61,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DELETE_USN_JOURNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 62,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_MARK_HANDLE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SIS_COPYFILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 64, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SIS_LINK_FILES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 65, METHOD_BUFFERED,
-    ::FILE_READ_DATA | ::FILE_WRITE_DATA);
-pub const FSCTL_RECALL_FILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 69, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_READ_FROM_PLEX: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 71, METHOD_OUT_DIRECT,
-    ::FILE_READ_DATA);
-pub const FSCTL_FILE_PREFETCH: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_MAKE_MEDIA_COMPATIBLE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 76,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_SET_DEFECT_MANAGEMENT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 77,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_QUERY_SPARING_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 78,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_ON_DISK_VOLUME_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 79,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_VOLUME_COMPRESSION_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 80,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_TXFS_MODIFY_RM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 81, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_QUERY_RM_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 82,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_ROLLFORWARD_REDO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 84,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_ROLLFORWARD_UNDO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 85,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_START_RM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 86, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_SHUTDOWN_RM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 87, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_READ_BACKUP_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 88,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_WRITE_BACKUP_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 89,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_CREATE_SECONDARY_RM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 90,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_GET_METADATA_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 91,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_GET_TRANSACTED_VERSION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 92,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_SAVEPOINT_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 94,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_CREATE_MINIVERSION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 95,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_TRANSACTION_ACTIVE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 99,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_SET_ZERO_ON_DEALLOCATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 101,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_SET_REPAIR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 102, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_GET_REPAIR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 103, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_WAIT_FOR_REPAIR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 104, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_INITIATE_REPAIR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 106, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_CSC_INTERNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 107, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SHRINK_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 108, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_SET_SHORT_NAME_BEHAVIOR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 109,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DFSR_SET_GHOST_HANDLE_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 110,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_TXFS_LIST_TRANSACTION_LOCKED_FILES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM,
-    120, METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_LIST_TRANSACTIONS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 121,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_QUERY_PAGEFILE_ENCRYPTION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 122,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_RESET_VOLUME_ALLOCATION_HINTS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 123,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_DEPENDENT_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 124,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SD_GLOBAL_CHANGE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 125,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_TXFS_READ_BACKUP_INFORMATION2: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 126,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_LOOKUP_STREAM_FROM_CLUSTER: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 127,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_TXFS_WRITE_BACKUP_INFORMATION2: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 128,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_FILE_TYPE_NOTIFICATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 129,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_FILE_LEVEL_TRIM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 130, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_GET_BOOT_AREA_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 140,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_RETRIEVAL_POINTER_BASE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 141,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_PERSISTENT_VOLUME_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 142,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_PERSISTENT_VOLUME_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 143,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_REQUEST_OPLOCK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 144, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_CSV_TUNNEL_REQUEST: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 145,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_IS_CSV_FILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 146, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_FILE_SYSTEM_RECOGNITION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 147,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_GET_VOLUME_PATH_NAME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 148,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_GET_VOLUME_NAME_FOR_VOLUME_MOUNT_POINT: ::DWORD = CTL_CODE!(
-    FILE_DEVICE_FILE_SYSTEM, 149, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_GET_VOLUME_PATH_NAMES_FOR_VOLUME_NAME: ::DWORD = CTL_CODE!(
-    FILE_DEVICE_FILE_SYSTEM, 150, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_IS_FILE_ON_CSV_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 151,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CORRUPTION_HANDLING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 152,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_OFFLOAD_READ: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 153, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const FSCTL_OFFLOAD_WRITE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 154, METHOD_BUFFERED,
-    FILE_WRITE_ACCESS);
-pub const FSCTL_CSV_INTERNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 155, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SET_PURGE_FAILURE_MODE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 156,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_FILE_LAYOUT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 157,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_IS_VOLUME_OWNED_BYCSVFS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 158,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_INTEGRITY_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 159,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_INTEGRITY_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 160,
-    METHOD_BUFFERED, ::FILE_READ_DATA | ::FILE_WRITE_DATA);
-pub const FSCTL_QUERY_FILE_REGIONS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 161,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DEDUP_FILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 165, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_DEDUP_QUERY_FILE_HASHES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 166,
-    METHOD_NEITHER, ::FILE_READ_DATA);
-pub const FSCTL_DEDUP_QUERY_RANGE_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 167,
-    METHOD_NEITHER, ::FILE_READ_DATA);
-pub const FSCTL_DEDUP_QUERY_REPARSE_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 168,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_RKF_INTERNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 171, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SCRUB_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 172, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_REPAIR_COPIES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 173, METHOD_BUFFERED,
-    ::FILE_READ_DATA | ::FILE_WRITE_DATA);
-pub const FSCTL_DISABLE_LOCAL_BUFFERING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 174,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_MGMT_LOCK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 175, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_CSV_QUERY_DOWN_LEVEL_FILE_SYSTEM_CHARACTERISTICS: ::DWORD = CTL_CODE!(
-    FILE_DEVICE_FILE_SYSTEM, 176, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_ADVANCE_FILE_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 177, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_CSV_SYNC_TUNNEL_REQUEST: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 178,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_QUERY_VETO_FILE_DIRECT_IO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 179,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_WRITE_USN_REASON: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 180,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_CONTROL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 181, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_GET_REFS_VOLUME_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 182,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_H_BREAKING_SYNC_TUNNEL_REQUEST: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM,
-    185, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_STORAGE_CLASSES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 187,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_REGION_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 188,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_USN_TRACK_MODIFIED_RANGES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 189,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_SHARED_VIRTUAL_DISK_SUPPORT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM,
-    192, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SVHDX_SYNC_TUNNEL_REQUEST: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 193,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SVHDX_SET_INITIATOR_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 194,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_EXTERNAL_BACKING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 195,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_GET_EXTERNAL_BACKING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 196,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DELETE_EXTERNAL_BACKING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 197,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_ENUM_EXTERNAL_BACKING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 198,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_ENUM_OVERLAY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 199, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_ADD_OVERLAY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 204, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_REMOVE_OVERLAY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 205, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_UPDATE_OVERLAY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 206, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-// FILE_DEVICE_AVIO is defined nowhere
-//pub const IOCTL_AVIO_ALLOCATE_STREAM: ::DWORD = CTL_CODE!(FILE_DEVICE_AVIO, 1, METHOD_BUFFERED,
-//    FILE_SPECIAL_ACCESS);
-//pub const IOCTL_AVIO_FREE_STREAM: ::DWORD = CTL_CODE!(FILE_DEVICE_AVIO, 2, METHOD_BUFFERED,
-//    FILE_SPECIAL_ACCESS);
-//pub const IOCTL_AVIO_MODIFY_STREAM: ::DWORD = CTL_CODE!(FILE_DEVICE_AVIO, 3, METHOD_BUFFERED,
-//    FILE_SPECIAL_ACCESS);
-STRUCT!{struct PATHNAME_BUFFER {
-    PathNameLength: ::DWORD,
-    Name: [::WCHAR; 1],
-}}
-pub type PPATHNAME_BUFFER = *mut PATHNAME_BUFFER;
-STRUCT!{nodebug struct FSCTL_QUERY_FAT_BPB_BUFFER {
-    First0x24BytesOfBootSector: [::BYTE; 0x24],
-}}
-pub type PFSCTL_QUERY_FAT_BPB_BUFFER = *mut FSCTL_QUERY_FAT_BPB_BUFFER;
-STRUCT!{struct NTFS_VOLUME_DATA_BUFFER {
-    VolumeSerialNumber: ::LARGE_INTEGER,
-    NumberSectors: ::LARGE_INTEGER,
-    TotalClusters: ::LARGE_INTEGER,
-    FreeClusters: ::LARGE_INTEGER,
-    TotalReserved: ::LARGE_INTEGER,
-    BytesPerSector: ::DWORD,
-    BytesPerCluster: ::DWORD,
-    BytesPerFileRecordSegment: ::DWORD,
-    ClustersPerFileRecordSegment: ::DWORD,
-    MftValidDataLength: ::LARGE_INTEGER,
-    MftStartLcn: ::LARGE_INTEGER,
-    Mft2StartLcn: ::LARGE_INTEGER,
-    MftZoneStart: ::LARGE_INTEGER,
-    MftZoneEnd: ::LARGE_INTEGER,
-}}
-pub type PNTFS_VOLUME_DATA_BUFFER = *mut NTFS_VOLUME_DATA_BUFFER;
-STRUCT!{struct NTFS_EXTENDED_VOLUME_DATA {
-    ByteCount: ::DWORD,
-    MajorVersion: ::WORD,
-    MinorVersion: ::WORD,
-    BytesPerPhysicalSector: ::DWORD,
-    LfsMajorVersion: ::WORD,
-    LfsMinorVersion: ::WORD,
-}}
-pub type PNTFS_EXTENDED_VOLUME_DATA = *mut NTFS_EXTENDED_VOLUME_DATA;
-STRUCT!{struct REFS_VOLUME_DATA_BUFFER {
-    ByteCount: ::DWORD,
-    MajorVersion: ::DWORD,
-    MinorVersion: ::DWORD,
-    BytesPerPhysicalSector: ::DWORD,
-    VolumeSerialNumber: ::LARGE_INTEGER,
-    NumberSectors: ::LARGE_INTEGER,
-    TotalClusters: ::LARGE_INTEGER,
-    FreeClusters: ::LARGE_INTEGER,
-    TotalReserved: ::LARGE_INTEGER,
-    BytesPerSector: ::DWORD,
-    BytesPerCluster: ::DWORD,
-    MaximumSizeOfResidentFile: ::LARGE_INTEGER,
-    Reserved: [::LARGE_INTEGER; 10],
-}}
-pub type PREFS_VOLUME_DATA_BUFFER = *mut REFS_VOLUME_DATA_BUFFER;
-STRUCT!{struct STARTING_LCN_INPUT_BUFFER {
-    StartingLcn: ::LARGE_INTEGER,
-}}
-pub type PSTARTING_LCN_INPUT_BUFFER = *mut STARTING_LCN_INPUT_BUFFER;
-STRUCT!{struct VOLUME_BITMAP_BUFFER {
-    StartingLcn: ::LARGE_INTEGER,
-    BitmapSize: ::LARGE_INTEGER,
-    Buffer: [::BYTE; 1],
-}}
-pub type PVOLUME_BITMAP_BUFFER = *mut VOLUME_BITMAP_BUFFER;
-STRUCT!{struct STARTING_VCN_INPUT_BUFFER {
-    StartingVcn: ::LARGE_INTEGER,
-}}
-pub type PSTARTING_VCN_INPUT_BUFFER = *mut STARTING_VCN_INPUT_BUFFER;
-STRUCT!{struct RETRIEVAL_POINTERS_BUFFER_INTERNAL {
-    NextVcn: ::LARGE_INTEGER,
-    Lcn: ::LARGE_INTEGER,
-}}
-STRUCT!{struct RETRIEVAL_POINTERS_BUFFER {
-    ExtentCount: ::DWORD,
-    StartingVcn: ::LARGE_INTEGER,
-    Extents: [RETRIEVAL_POINTERS_BUFFER_INTERNAL; 1],
-}}
-pub type PRETRIEVAL_POINTERS_BUFFER = *mut RETRIEVAL_POINTERS_BUFFER;
-STRUCT!{struct NTFS_FILE_RECORD_INPUT_BUFFER {
-    FileReferenceNumber: ::LARGE_INTEGER,
-}}
-pub type PNTFS_FILE_RECORD_INPUT_BUFFER = *mut NTFS_FILE_RECORD_INPUT_BUFFER;
-STRUCT!{struct NTFS_FILE_RECORD_OUTPUT_BUFFER {
-    FileReferenceNumber: ::LARGE_INTEGER,
-    FileRecordLength: ::DWORD,
-    FileRecordBuffer: [::BYTE; 1],
-}}
-pub type PNTFS_FILE_RECORD_OUTPUT_BUFFER = *mut NTFS_FILE_RECORD_OUTPUT_BUFFER;
-STRUCT!{struct MOVE_FILE_DATA {
-    FileHandle: ::HANDLE,
-    StartingVcn: ::LARGE_INTEGER,
-    StartingLcn: ::LARGE_INTEGER,
-    ClusterCount: ::DWORD,
-}}
-pub type PMOVE_FILE_DATA = *mut MOVE_FILE_DATA;
-STRUCT!{struct MOVE_FILE_RECORD_DATA {
-    FileHandle: ::HANDLE,
-    SourceFileRecord: ::LARGE_INTEGER,
-    TargetFileRecord: ::LARGE_INTEGER,
-}}
-pub type PMOVE_FILE_RECORD_DATA = *mut MOVE_FILE_RECORD_DATA;
-//9207
-pub const IOCTL_VOLUME_BASE: ::DWORD = 0x00000056;
-pub const IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 0,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-STRUCT!{struct DISK_EXTENT {
-    DiskNumber: ::DWORD,
-    StartingOffset: ::LARGE_INTEGER,
-    ExtentLength: ::LARGE_INTEGER,
-}}
-pub type PDISK_EXTENT = *mut DISK_EXTENT;
-STRUCT!{struct VOLUME_DISK_EXTENTS {
-    NumberOfDiskExtents: ::DWORD,
-    Extents: [DISK_EXTENT; ::ANYSIZE_ARRAY],
-}}
-pub type PVOLUME_DISK_EXTENTS = *mut VOLUME_DISK_EXTENTS;
-pub const IOCTL_VOLUME_ONLINE: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 2, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_VOLUME_OFFLINE: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 3, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_VOLUME_IS_CLUSTERED: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 12, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_VOLUME_GET_GPT_ATTRIBUTES: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 14,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winnetwk.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winnetwk.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winnetwk.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winnetwk.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Standard WINNET Header File for WIN32
-pub const WNNC_NET_MSNET: ::DWORD = 0x00010000;
-pub const WNNC_NET_SMB: ::DWORD = 0x00020000;
-pub const WNNC_NET_NETWARE: ::DWORD = 0x00030000;
-pub const WNNC_NET_VINES: ::DWORD = 0x00040000;
-pub const WNNC_NET_10NET: ::DWORD = 0x00050000;
-pub const WNNC_NET_LOCUS: ::DWORD = 0x00060000;
-pub const WNNC_NET_SUN_PC_NFS: ::DWORD = 0x00070000;
-pub const WNNC_NET_LANSTEP: ::DWORD = 0x00080000;
-pub const WNNC_NET_9TILES: ::DWORD = 0x00090000;
-pub const WNNC_NET_LANTASTIC: ::DWORD = 0x000A0000;
-pub const WNNC_NET_AS400: ::DWORD = 0x000B0000;
-pub const WNNC_NET_FTP_NFS: ::DWORD = 0x000C0000;
-pub const WNNC_NET_PATHWORKS: ::DWORD = 0x000D0000;
-pub const WNNC_NET_LIFENET: ::DWORD = 0x000E0000;
-pub const WNNC_NET_POWERLAN: ::DWORD = 0x000F0000;
-pub const WNNC_NET_BWNFS: ::DWORD = 0x00100000;
-pub const WNNC_NET_COGENT: ::DWORD = 0x00110000;
-pub const WNNC_NET_FARALLON: ::DWORD = 0x00120000;
-pub const WNNC_NET_APPLETALK: ::DWORD = 0x00130000;
-pub const WNNC_NET_INTERGRAPH: ::DWORD = 0x00140000;
-pub const WNNC_NET_SYMFONET: ::DWORD = 0x00150000;
-pub const WNNC_NET_CLEARCASE: ::DWORD = 0x00160000;
-pub const WNNC_NET_FRONTIER: ::DWORD = 0x00170000;
-pub const WNNC_NET_BMC: ::DWORD = 0x00180000;
-pub const WNNC_NET_DCE: ::DWORD = 0x00190000;
-pub const WNNC_NET_AVID: ::DWORD = 0x001A0000;
-pub const WNNC_NET_DOCUSPACE: ::DWORD = 0x001B0000;
-pub const WNNC_NET_MANGOSOFT: ::DWORD = 0x001C0000;
-pub const WNNC_NET_SERNET: ::DWORD = 0x001D0000;
-pub const WNNC_NET_RIVERFRONT1: ::DWORD = 0x001E0000;
-pub const WNNC_NET_RIVERFRONT2: ::DWORD = 0x001F0000;
-pub const WNNC_NET_DECORB: ::DWORD = 0x00200000;
-pub const WNNC_NET_PROTSTOR: ::DWORD = 0x00210000;
-pub const WNNC_NET_FJ_REDIR: ::DWORD = 0x00220000;
-pub const WNNC_NET_DISTINCT: ::DWORD = 0x00230000;
-pub const WNNC_NET_TWINS: ::DWORD = 0x00240000;
-pub const WNNC_NET_RDR2SAMPLE: ::DWORD = 0x00250000;
-pub const WNNC_NET_CSC: ::DWORD = 0x00260000;
-pub const WNNC_NET_3IN1: ::DWORD = 0x00270000;
-pub const WNNC_NET_EXTENDNET: ::DWORD = 0x00290000;
-pub const WNNC_NET_STAC: ::DWORD = 0x002A0000;
-pub const WNNC_NET_FOXBAT: ::DWORD = 0x002B0000;
-pub const WNNC_NET_YAHOO: ::DWORD = 0x002C0000;
-pub const WNNC_NET_EXIFS: ::DWORD = 0x002D0000;
-pub const WNNC_NET_DAV: ::DWORD = 0x002E0000;
-pub const WNNC_NET_KNOWARE: ::DWORD = 0x002F0000;
-pub const WNNC_NET_OBJECT_DIRE: ::DWORD = 0x00300000;
-pub const WNNC_NET_MASFAX: ::DWORD = 0x00310000;
-pub const WNNC_NET_HOB_NFS: ::DWORD = 0x00320000;
-pub const WNNC_NET_SHIVA: ::DWORD = 0x00330000;
-pub const WNNC_NET_IBMAL: ::DWORD = 0x00340000;
-pub const WNNC_NET_LOCK: ::DWORD = 0x00350000;
-pub const WNNC_NET_TERMSRV: ::DWORD = 0x00360000;
-pub const WNNC_NET_SRT: ::DWORD = 0x00370000;
-pub const WNNC_NET_QUINCY: ::DWORD = 0x00380000;
-pub const WNNC_NET_OPENAFS: ::DWORD = 0x00390000;
-pub const WNNC_NET_AVID1: ::DWORD = 0x003A0000;
-pub const WNNC_NET_DFS: ::DWORD = 0x003B0000;
-pub const WNNC_NET_KWNP: ::DWORD = 0x003C0000;
-pub const WNNC_NET_ZENWORKS: ::DWORD = 0x003D0000;
-pub const WNNC_NET_DRIVEONWEB: ::DWORD = 0x003E0000;
-pub const WNNC_NET_VMWARE: ::DWORD = 0x003F0000;
-pub const WNNC_NET_RSFX: ::DWORD = 0x00400000;
-pub const WNNC_NET_MFILES: ::DWORD = 0x00410000;
-pub const WNNC_NET_MS_NFS: ::DWORD = 0x00420000;
-pub const WNNC_NET_GOOGLE: ::DWORD = 0x00430000;
-pub const WNNC_NET_NDFS: ::DWORD = 0x00440000;
-pub const WNNC_NET_DOCUSHARE: ::DWORD = 0x00450000;
-pub const WNNC_CRED_MANAGER: ::DWORD = 0xFFFF0000;
-pub const WNNC_NET_LANMAN: ::DWORD = WNNC_NET_SMB;
-pub const RESOURCE_CONNECTED: ::DWORD = 0x00000001;
-pub const RESOURCE_GLOBALNET: ::DWORD = 0x00000002;
-pub const RESOURCE_REMEMBERED: ::DWORD = 0x00000003;
-pub const RESOURCE_RECENT: ::DWORD = 0x00000004;
-pub const RESOURCE_CONTEXT: ::DWORD = 0x00000005;
-pub const RESOURCETYPE_ANY: ::DWORD = 0x00000000;
-pub const RESOURCETYPE_DISK: ::DWORD = 0x00000001;
-pub const RESOURCETYPE_PRINT: ::DWORD = 0x00000002;
-pub const RESOURCETYPE_RESERVED: ::DWORD = 0x00000008;
-pub const RESOURCETYPE_UNKNOWN: ::DWORD = 0xFFFFFFFF;
-pub const RESOURCEUSAGE_CONNECTABLE: ::DWORD = 0x00000001;
-pub const RESOURCEUSAGE_CONTAINER: ::DWORD = 0x00000002;
-pub const RESOURCEUSAGE_NOLOCALDEVICE: ::DWORD = 0x00000004;
-pub const RESOURCEUSAGE_SIBLING: ::DWORD = 0x00000008;
-pub const RESOURCEUSAGE_ATTACHED: ::DWORD = 0x00000010;
-pub const RESOURCEUSAGE_ALL: ::DWORD = RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER
-    | RESOURCEUSAGE_ATTACHED;
-pub const RESOURCEUSAGE_RESERVED: ::DWORD = 0x80000000;
-pub const RESOURCEDISPLAYTYPE_GENERIC: ::DWORD = 0x00000000;
-pub const RESOURCEDISPLAYTYPE_DOMAIN: ::DWORD = 0x00000001;
-pub const RESOURCEDISPLAYTYPE_SERVER: ::DWORD = 0x00000002;
-pub const RESOURCEDISPLAYTYPE_SHARE: ::DWORD = 0x00000003;
-pub const RESOURCEDISPLAYTYPE_FILE: ::DWORD = 0x00000004;
-pub const RESOURCEDISPLAYTYPE_GROUP: ::DWORD = 0x00000005;
-pub const RESOURCEDISPLAYTYPE_NETWORK: ::DWORD = 0x00000006;
-pub const RESOURCEDISPLAYTYPE_ROOT: ::DWORD = 0x00000007;
-pub const RESOURCEDISPLAYTYPE_SHAREADMIN: ::DWORD = 0x00000008;
-pub const RESOURCEDISPLAYTYPE_DIRECTORY: ::DWORD = 0x00000009;
-pub const RESOURCEDISPLAYTYPE_TREE: ::DWORD = 0x0000000A;
-pub const RESOURCEDISPLAYTYPE_NDSCONTAINER: ::DWORD = 0x0000000B;
-STRUCT!{struct NETRESOURCEA {
-    dwScope: ::DWORD,
-    dwType: ::DWORD,
-    dwDisplayType: ::DWORD,
-    dwUsage: ::DWORD,
-    lpLocalName: ::LPSTR,
-    lpRemoteName: ::LPSTR,
-    lpComment: ::LPSTR,
-    lpProvider: ::LPSTR,
-}}
-pub type LPNETRESOURCEA = *mut NETRESOURCEA;
-STRUCT!{struct NETRESOURCEW {
-    dwScope: ::DWORD,
-    dwType: ::DWORD,
-    dwDisplayType: ::DWORD,
-    dwUsage: ::DWORD,
-    lpLocalName: ::LPWSTR,
-    lpRemoteName: ::LPWSTR,
-    lpComment: ::LPWSTR,
-    lpProvider: ::LPWSTR,
-}}
-pub type LPNETRESOURCEW = *mut NETRESOURCEW;
-pub const NETPROPERTY_PERSISTENT: ::DWORD = 1;
-pub const CONNECT_UPDATE_PROFILE: ::DWORD = 0x00000001;
-pub const CONNECT_UPDATE_RECENT: ::DWORD = 0x00000002;
-pub const CONNECT_TEMPORARY: ::DWORD = 0x00000004;
-pub const CONNECT_INTERACTIVE: ::DWORD = 0x00000008;
-pub const CONNECT_PROMPT: ::DWORD = 0x00000010;
-pub const CONNECT_NEED_DRIVE: ::DWORD = 0x00000020;
-pub const CONNECT_REFCOUNT: ::DWORD = 0x00000040;
-pub const CONNECT_REDIRECT: ::DWORD = 0x00000080;
-pub const CONNECT_LOCALDRIVE: ::DWORD = 0x00000100;
-pub const CONNECT_CURRENT_MEDIA: ::DWORD = 0x00000200;
-pub const CONNECT_DEFERRED: ::DWORD = 0x00000400;
-pub const CONNECT_RESERVED: ::DWORD = 0xFF000000;
-pub const CONNECT_COMMANDLINE: ::DWORD = 0x00000800;
-pub const CONNECT_CMD_SAVECRED: ::DWORD = 0x00001000;
-pub const CONNECT_CRED_RESET: ::DWORD = 0x00002000;
-STRUCT!{struct CONNECTDLGSTRUCTA {
-    cbStructure: ::DWORD,
-    hwndOwner: ::HWND,
-    lpConnRes: ::LPNETRESOURCEA,
-    dwFlags: ::DWORD,
-    dwDevNum: ::DWORD,
-}}
-pub type LPCONNECTDLGSTRUCTA = *mut CONNECTDLGSTRUCTA;
-STRUCT!{struct CONNECTDLGSTRUCTW {
-    cbStructure: ::DWORD,
-    hwndOwner: ::HWND,
-    lpConnRes: ::LPNETRESOURCEW,
-    dwFlags: ::DWORD,
-    dwDevNum: ::DWORD,
-}}
-pub type LPCONNECTDLGSTRUCTW = *mut CONNECTDLGSTRUCTW;
-pub const CONNDLG_RO_PATH: ::DWORD = 0x00000001;
-pub const CONNDLG_CONN_POINT: ::DWORD = 0x00000002;
-pub const CONNDLG_USE_MRU: ::DWORD = 0x00000004;
-pub const CONNDLG_HIDE_BOX: ::DWORD = 0x00000008;
-pub const CONNDLG_PERSIST: ::DWORD = 0x00000010;
-pub const CONNDLG_NOT_PERSIST: ::DWORD = 0x00000020;
-STRUCT!{struct DISCDLGSTRUCTA {
-    cbStructure: ::DWORD,
-    hwndOwner: ::HWND,
-    lpLocalName: ::LPSTR,
-    lpRemoteName: ::LPSTR,
-    dwFlags: ::DWORD,
-}}
-pub type LPDISCDLGSTRUCTA = *mut DISCDLGSTRUCTA;
-STRUCT!{struct DISCDLGSTRUCTW {
-    cbStructure: ::DWORD,
-    hwndOwner: ::HWND,
-    lpLocalName: ::LPWSTR,
-    lpRemoteName: ::LPWSTR,
-    dwFlags: ::DWORD,
-}}
-pub type LPDISCDLGSTRUCTW = *mut DISCDLGSTRUCTW;
-pub const DISC_UPDATE_PROFILE: ::DWORD = 0x00000001;
-pub const DISC_NO_FORCE: ::DWORD = 0x00000040;
-pub const UNIVERSAL_NAME_INFO_LEVEL: ::DWORD = 0x00000001;
-pub const REMOTE_NAME_INFO_LEVEL: ::DWORD = 0x00000002;
-STRUCT!{struct UNIVERSAL_NAME_INFOA {
-    lpUniversalName: ::LPSTR,
-}}
-pub type LPUNIVERSAL_NAME_INFOA = *mut UNIVERSAL_NAME_INFOA;
-STRUCT!{struct UNIVERSAL_NAME_INFOW {
-    lpUniversalName: ::LPWSTR,
-}}
-pub type LPUNIVERSAL_NAME_INFOW = *mut UNIVERSAL_NAME_INFOW;
-STRUCT!{struct REMOTE_NAME_INFOA {
-    lpUniversalName: ::LPSTR,
-    lpConnectionName: ::LPSTR,
-    lpRemainingPath: ::LPSTR,
-}}
-pub type LPREMOTE_NAME_INFOA = *mut REMOTE_NAME_INFOA;
-STRUCT!{struct REMOTE_NAME_INFOW {
-    lpUniversalName: ::LPWSTR,
-    lpConnectionName: ::LPWSTR,
-    lpRemainingPath: ::LPWSTR,
-}}
-pub type LPREMOTE_NAME_INFOW = *mut REMOTE_NAME_INFOW;
-pub const WNFMT_MULTILINE: ::DWORD = 0x01;
-pub const WNFMT_ABBREVIATED: ::DWORD = 0x02;
-pub const WNFMT_INENUM: ::DWORD = 0x10;
-pub const WNFMT_CONNECTION: ::DWORD = 0x20;
-STRUCT!{struct NETINFOSTRUCT {
-    cbStructure: ::DWORD,
-    dwProviderVersion: ::DWORD,
-    dwStatus: ::DWORD,
-    dwCharacteristics: ::DWORD,
-    dwHandle: ::ULONG_PTR,
-    wNetType: ::WORD,
-    dwPrinters: ::DWORD,
-    dwDrives: ::DWORD,
-}}
-pub type LPNETINFOSTRUCT = *mut NETINFOSTRUCT;
-pub const NETINFO_DLL16: ::DWORD = 0x00000001;
-pub const NETINFO_DISKRED: ::DWORD = 0x00000004;
-pub const NETINFO_PRINTERRED: ::DWORD = 0x00000008;
-pub const WN_SUCCESS: ::DWORD = ::NO_ERROR;
-pub const WN_NO_ERROR: ::DWORD = ::NO_ERROR;
-pub const WN_NOT_SUPPORTED: ::DWORD = ::ERROR_NOT_SUPPORTED;
-pub const WN_CANCEL: ::DWORD = ::ERROR_CANCELLED;
-pub const WN_RETRY: ::DWORD = ::ERROR_RETRY;
-pub const WN_NET_ERROR: ::DWORD = ::ERROR_UNEXP_NET_ERR;
-pub const WN_MORE_DATA: ::DWORD = ::ERROR_MORE_DATA;
-pub const WN_BAD_POINTER: ::DWORD = ::ERROR_INVALID_ADDRESS;
-pub const WN_BAD_VALUE: ::DWORD = ::ERROR_INVALID_PARAMETER;
-pub const WN_BAD_USER: ::DWORD = ::ERROR_BAD_USERNAME;
-pub const WN_BAD_PASSWORD: ::DWORD = ::ERROR_INVALID_PASSWORD;
-pub const WN_ACCESS_DENIED: ::DWORD = ::ERROR_ACCESS_DENIED;
-pub const WN_FUNCTION_BUSY: ::DWORD = ::ERROR_BUSY;
-pub const WN_WINDOWS_ERROR: ::DWORD = ::ERROR_UNEXP_NET_ERR;
-pub const WN_OUT_OF_MEMORY: ::DWORD = ::ERROR_NOT_ENOUGH_MEMORY;
-pub const WN_NO_NETWORK: ::DWORD = ::ERROR_NO_NETWORK;
-pub const WN_EXTENDED_ERROR: ::DWORD = ::ERROR_EXTENDED_ERROR;
-pub const WN_BAD_LEVEL: ::DWORD = ::ERROR_INVALID_LEVEL;
-pub const WN_BAD_HANDLE: ::DWORD = ::ERROR_INVALID_HANDLE;
-pub const WN_NOT_INITIALIZING: ::DWORD = ::ERROR_ALREADY_INITIALIZED;
-pub const WN_NO_MORE_DEVICES: ::DWORD = ::ERROR_NO_MORE_DEVICES;
-pub const WN_NOT_CONNECTED: ::DWORD = ::ERROR_NOT_CONNECTED;
-pub const WN_OPEN_FILES: ::DWORD = ::ERROR_OPEN_FILES;
-pub const WN_DEVICE_IN_USE: ::DWORD = ::ERROR_DEVICE_IN_USE;
-pub const WN_BAD_NETNAME: ::DWORD = ::ERROR_BAD_NET_NAME;
-pub const WN_BAD_LOCALNAME: ::DWORD = ::ERROR_BAD_DEVICE;
-pub const WN_ALREADY_CONNECTED: ::DWORD = ::ERROR_ALREADY_ASSIGNED;
-pub const WN_DEVICE_ERROR: ::DWORD = ::ERROR_GEN_FAILURE;
-pub const WN_CONNECTION_CLOSED: ::DWORD = ::ERROR_CONNECTION_UNAVAIL;
-pub const WN_NO_NET_OR_BAD_PATH: ::DWORD = ::ERROR_NO_NET_OR_BAD_PATH;
-pub const WN_BAD_PROVIDER: ::DWORD = ::ERROR_BAD_PROVIDER;
-pub const WN_CANNOT_OPEN_PROFILE: ::DWORD = ::ERROR_CANNOT_OPEN_PROFILE;
-pub const WN_BAD_PROFILE: ::DWORD = ::ERROR_BAD_PROFILE;
-pub const WN_BAD_DEV_TYPE: ::DWORD = ::ERROR_BAD_DEV_TYPE;
-pub const WN_DEVICE_ALREADY_REMEMBERED: ::DWORD = ::ERROR_DEVICE_ALREADY_REMEMBERED;
-pub const WN_CONNECTED_OTHER_PASSWORD: ::DWORD = ::ERROR_CONNECTED_OTHER_PASSWORD;
-pub const WN_CONNECTED_OTHER_PASSWORD_DEFAULT: ::DWORD = ::ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT;
-pub const WN_NO_MORE_ENTRIES: ::DWORD = ::ERROR_NO_MORE_ITEMS;
-pub const WN_NOT_CONTAINER: ::DWORD = ::ERROR_NOT_CONTAINER;
-pub const WN_NOT_AUTHENTICATED: ::DWORD = ::ERROR_NOT_AUTHENTICATED;
-pub const WN_NOT_LOGGED_ON: ::DWORD = ::ERROR_NOT_LOGGED_ON;
-pub const WN_NOT_VALIDATED: ::DWORD = ::ERROR_NO_LOGON_SERVERS;
-STRUCT!{struct NETCONNECTINFOSTRUCT {
-    cbStructure: ::DWORD,
-    dwFlags: ::DWORD,
-    dwSpeed: ::DWORD,
-    dwDelay: ::DWORD,
-    dwOptDataSize: ::DWORD,
-}}
-pub type LPNETCONNECTINFOSTRUCT = *mut NETCONNECTINFOSTRUCT;
-pub const WNCON_FORNETCARD: ::DWORD = 0x00000001;
-pub const WNCON_NOTROUTED: ::DWORD = 0x00000002;
-pub const WNCON_SLOWLINK: ::DWORD = 0x00000004;
-pub const WNCON_DYNAMIC: ::DWORD = 0x00000008;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winnls.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winnls.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winnls.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winnls.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Procedure declarations, constant definitions, and macros for the NLS component.
-pub const CP_ACP: ::DWORD = 0;
-pub const CP_OEMCP: ::DWORD = 1;
-pub const CP_MACCP: ::DWORD = 2;
-pub const CP_THREAD_ACP: ::DWORD = 3;
-pub const CP_SYMBOL: ::DWORD = 42;
-pub const CP_UTF7: ::DWORD = 65000;
-pub const CP_UTF8: ::DWORD = 65001;
-pub const MAX_LEADBYTES: usize = 12;
-pub const MAX_DEFAULTCHAR: usize = 2;
-pub type LGRPID = ::DWORD;
-pub type LCTYPE = ::DWORD;
-pub type CALTYPE = ::DWORD;
-pub type CALID = ::DWORD;
-pub type GEOID = ::LONG;
-pub type GEOTYPE = ::DWORD;
-pub type GEOCLASS = ::DWORD;
-STRUCT!{struct NLSVERSIONINFO {
-    dwNLSVersionInfoSize: ::DWORD,
-    dwNLSVersion: ::DWORD,
-    dwDefinedVersion: ::DWORD,
-    dwEffectiveId: ::DWORD,
-    guidCustomVersion: ::GUID,
-}}
-pub type LPNLSVERSIONINFO = *mut NLSVERSIONINFO;
-STRUCT!{struct NLSVERSIONINFOEX {
-    dwNLSVersionInfoSize: ::DWORD,
-    dwNLSVersion: ::DWORD,
-    dwDefinedVersion: ::DWORD,
-    dwEffectiveId: ::DWORD,
-    guidCustomVersion: ::GUID,
-}}
-pub type LPNLSVERSIONINFOEX = *mut NLSVERSIONINFOEX;
-ENUM!{enum NORM_FORM {
-    NormalizationOther = 0,
-    NormalizationC = 0x1,
-    NormalizationD = 0x2,
-    NormalizationKC = 0x5,
-    NormalizationKD = 0x6,
-}}
-pub type LANGUAGEGROUP_ENUMPROCA = Option<unsafe extern "system" fn(
-    ::LGRPID, ::LPSTR, ::LPSTR, ::DWORD, ::LONG_PTR,
-) -> ::BOOL>;
-pub type LANGGROUPLOCALE_ENUMPROCA = Option<unsafe extern "system" fn(
-    ::LGRPID, ::LCID, ::LPSTR, ::LONG_PTR,
-) -> ::BOOL>;
-pub type UILANGUAGE_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR, ::LONG_PTR) -> ::BOOL>;
-pub type CODEPAGE_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCEXA = Option<unsafe extern "system" fn(::LPSTR, ::CALID) -> ::BOOL>;
-pub type TIMEFMT_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type CALINFO_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type CALINFO_ENUMPROCEXA = Option<unsafe extern "system" fn(::LPSTR, ::CALID) -> ::BOOL>;
-pub type LOCALE_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type LOCALE_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type LANGUAGEGROUP_ENUMPROCW = Option<unsafe extern "system" fn(
-    ::LGRPID, ::LPWSTR, ::LPWSTR, ::DWORD, ::LONG_PTR,
-) -> ::BOOL>;
-pub type LANGGROUPLOCALE_ENUMPROCW = Option<unsafe extern "system" fn(
-    ::LGRPID, ::LCID, ::LPWSTR, ::LONG_PTR,
-) -> ::BOOL>;
-pub type UILANGUAGE_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR, ::LONG_PTR) -> ::BOOL>;
-pub type CODEPAGE_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCEXW = Option<unsafe extern "system" fn(::LPWSTR, ::CALID) -> ::BOOL>;
-pub type TIMEFMT_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type CALINFO_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type CALINFO_ENUMPROCEXW = Option<unsafe extern "system" fn(::LPWSTR, ::CALID) -> ::BOOL>;
-pub type GEO_ENUMPROC = Option<unsafe extern "system" fn(GEOID) -> ::BOOL>;
-STRUCT!{struct CPINFO {
-    MaxCharSize: ::UINT,
-    DefaultChar: [::BYTE; MAX_DEFAULTCHAR],
-    LeadByte: [::BYTE; MAX_LEADBYTES],
-}}
-pub type LPCPINFO = *mut CPINFO;
-STRUCT!{nodebug struct CPINFOEXA {
-    MaxCharSize: ::UINT,
-    DefaultChar: [::BYTE; MAX_DEFAULTCHAR],
-    LeadByte: [::BYTE; MAX_LEADBYTES],
-    UnicodeDefaultChar: ::WCHAR,
-    CodePage: ::UINT,
-    CodePageName: [::CHAR; ::MAX_PATH],
-}}
-pub type LPCPINFOEXA = *mut CPINFOEXA;
-STRUCT!{nodebug struct CPINFOEXW {
-    MaxCharSize: ::UINT,
-    DefaultChar: [::BYTE; MAX_DEFAULTCHAR],
-    LeadByte: [::BYTE; MAX_LEADBYTES],
-    UnicodeDefaultChar: ::WCHAR,
-    CodePage: ::UINT,
-    CodePageName: [::WCHAR; ::MAX_PATH],
-}}
-pub type LPCPINFOEXW = *mut CPINFOEXW;
-STRUCT!{struct NUMBERFMTA {
-    NumDigits: ::UINT,
-    LeadingZero: ::UINT,
-    Grouping: ::UINT,
-    lpDecimalSep: ::LPSTR,
-    lpThousandSep: ::LPSTR,
-    NegativeOrder: ::UINT,
-}}
-pub type LPNUMBERFMTA = *mut NUMBERFMTA;
-STRUCT!{struct NUMBERFMTW {
-    NumDigits: ::UINT,
-    LeadingZero: ::UINT,
-    Grouping: ::UINT,
-    lpDecimalSep: ::LPWSTR,
-    lpThousandSep: ::LPWSTR,
-    NegativeOrder: ::UINT,
-}}
-pub type LPNUMBERFMTW = *mut NUMBERFMTW;
-STRUCT!{struct CURRENCYFMTA {
-    NumDigits: ::UINT,
-    LeadingZero: ::UINT,
-    Grouping: ::UINT,
-    lpDecimalSep: ::LPSTR,
-    lpThousandSep: ::LPSTR,
-    NegativeOrder: ::UINT,
-    PositiveOrder: ::UINT,
-    lpCurrencySymbol: ::LPSTR,
-}}
-pub type LPCURRENCYFMTA = *mut CURRENCYFMTA;
-STRUCT!{struct CURRENCYFMTW {
-    NumDigits: ::UINT,
-    LeadingZero: ::UINT,
-    Grouping: ::UINT,
-    lpDecimalSep: ::LPWSTR,
-    lpThousandSep: ::LPWSTR,
-    NegativeOrder: ::UINT,
-    PositiveOrder: ::UINT,
-    lpCurrencySymbol: ::LPWSTR,
-}}
-pub type LPCURRENCYFMTW = *mut CURRENCYFMTW;
-pub type NLS_FUNCTION = ::DWORD;
-STRUCT!{struct FILEMUIINFO {
-    dwSize: ::DWORD,
-    dwVersion: ::DWORD,
-    dwFileType: ::DWORD,
-    pChecksum: [::BYTE; 16],
-    pServiceChecksum: [::BYTE; 16],
-    dwLanguageNameOffset: ::DWORD,
-    dwTypeIDMainSize: ::DWORD,
-    dwTypeIDMainOffset: ::DWORD,
-    dwTypeNameMainOffset: ::DWORD,
-    dwTypeIDMUISize: ::DWORD,
-    dwTypeIDMUIOffset: ::DWORD,
-    dwTypeNameMUIOffset: ::DWORD,
-    abBuffer: [::BYTE; 8],
-}}
-pub type PFILEMUIINFO = *mut FILEMUIINFO;
-pub type CALINFO_ENUMPROCEXEX = Option<unsafe extern "system" fn(
-    ::LPWSTR, ::CALID, ::LPWSTR, ::LPARAM,
-) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCEXEX = Option<unsafe extern "system" fn(
-    ::LPWSTR, ::CALID, ::LPARAM,
-) -> ::BOOL>;
-pub type TIMEFMT_ENUMPROCEX = Option<unsafe extern "system" fn(
-    ::LPWSTR, ::LPARAM,
-) -> ::BOOL>;
-pub type LOCALE_ENUMPROCEX = Option<unsafe extern "system" fn(
-    ::LPWSTR, ::DWORD, ::LPARAM,
-) -> ::BOOL>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winnt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winnt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winnt.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winnt.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2368 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the 32-Bit Windows types and constants that are defined by NT, but exposed
-//! through the Win32 API.
-pub const ANYSIZE_ARRAY: usize = 1;
-//341
-pub type PVOID = *mut ::c_void;
-pub type PVOID64 = u64; // This is a 64-bit pointer, even when in 32-bit
-//382
-pub type VOID = ::c_void;
-pub type CHAR = ::c_char;
-pub type SHORT = ::c_short;
-pub type LONG = ::c_long;
-// pub type INT = ::c_int; // Already defined by minwindef.h
-pub type WCHAR = ::wchar_t;
-pub type PWCHAR = *mut WCHAR;
-pub type LPWCH = *mut WCHAR;
-pub type PWCH = *mut WCHAR;
-pub type LPCWCH = *const WCHAR;
-pub type PCWCH = *const WCHAR;
-pub type NWPSTR = *mut WCHAR;
-pub type LPWSTR = *mut WCHAR;
-pub type PWSTR = *mut WCHAR;
-pub type PZPWSTR = *mut PWSTR;
-pub type PCZPWSTR = *const PWSTR;
-pub type LPUWSTR = *mut WCHAR;
-pub type PUWSTR = *mut WCHAR;
-pub type LPCWSTR = *const WCHAR;
-pub type PCWSTR = *const WCHAR;
-pub type PZPCWSTR= *mut PCWSTR;
-pub type PCZPCWSTR = *const PCWSTR;
-pub type LPCUWSTR = *const WCHAR;
-pub type PCUWSTR = *const WCHAR;
-pub type PZZWSTR= *mut WCHAR;
-pub type PCZZWSTR = *const WCHAR;
-pub type PUZZWSTR = *mut WCHAR;
-pub type PCUZZWSTR = *const WCHAR;
-pub type PNZWCH = *mut WCHAR;
-pub type PCNZWCH = *const WCHAR;
-pub type PUNZWCH = *mut WCHAR;
-pub type PCUNZWCH = *const WCHAR;
-pub type LPCWCHAR = *const WCHAR;
-pub type PCWCHAR = *const WCHAR;
-pub type LPCUWCHAR = *const WCHAR;
-pub type PCUWCHAR = *const WCHAR;
-pub type UCSCHAR = ::c_ulong;
-pub type PUCSCHAR = *mut UCSCHAR;
-pub type PCUCSCHAR = *const UCSCHAR;
-pub type PUCSSTR = *mut UCSCHAR;
-pub type PUUCSSTR = *mut UCSCHAR;
-pub type PCUCSSTR = *const UCSCHAR;
-pub type PCUUCSSTR = *const UCSCHAR;
-pub type PUUCSCHAR = *mut UCSCHAR;
-pub type PCUUCSCHAR = *const UCSCHAR;
-pub type PCHAR = *mut CHAR;
-pub type LPCH = *mut CHAR;
-pub type PCH = *mut CHAR;
-pub type LPCCH = *const CHAR;
-pub type PCCH = *const CHAR;
-pub type NPSTR = *mut CHAR;
-pub type LPSTR = *mut CHAR;
-pub type PSTR = *mut CHAR;
-pub type PZPSTR = *mut PSTR;
-pub type PCZPSTR = *const PSTR;
-pub type LPCSTR = *const CHAR;
-pub type PCSTR = *const CHAR;
-pub type PZPCSTR = *mut PCSTR;
-pub type PCZPCSTR = *const PCSTR;
-pub type PZZSTR = *mut CHAR;
-pub type PCZZSTR = *const CHAR;
-pub type PNZCH = *mut CHAR;
-pub type PCNZCH = *const CHAR;
-// Skipping TCHAR things
-pub type PSHORT = *mut SHORT;
-pub type PLONG = *mut LONG;
-STRUCT!{struct PROCESSOR_NUMBER {
-    Group: ::WORD,
-    Number: ::BYTE,
-    Reserved: ::BYTE,
-}}
-pub type PPROCESSOR_NUMBER = *mut PROCESSOR_NUMBER;
-STRUCT!{struct GROUP_AFFINITY {
-    Mask: ::KAFFINITY,
-    Group: ::WORD,
-    Reserved: [::WORD; 3],
-}}
-pub type PGROUP_AFFINITY = *mut GROUP_AFFINITY;
-pub type HANDLE = *mut ::c_void;
-pub type PHANDLE = *mut HANDLE;
-pub type FCHAR = ::BYTE;
-pub type FSHORT = ::WORD;
-pub type FLONG = ::DWORD;
-//667
-pub type CCHAR = ::c_char;
-pub type LCID = ::DWORD;
-pub type PLCID = ::PDWORD;
-pub type LANGID = ::WORD;
-ENUM!{enum COMPARTMENT_ID {
-    UNSPECIFIED_COMPARTMENT_ID = 0,
-    DEFAULT_COMPARTMENT_ID = 1,
-}}
-pub type PCOMPARTMENT_ID = *mut COMPARTMENT_ID;
-pub const APPLICATION_ERROR_MASK: ::DWORD = 0x20000000;
-pub const ERROR_SEVERITY_SUCCESS: ::DWORD = 0x00000000;
-pub const ERROR_SEVERITY_INFORMATIONAL: ::DWORD = 0x40000000;
-pub const ERROR_SEVERITY_WARNING: ::DWORD = 0x80000000;
-pub const ERROR_SEVERITY_ERROR: ::DWORD = 0xC0000000;
-//710
-STRUCT!{struct FLOAT128 {
-    LowPart: ::__int64,
-    HighPart: ::__int64,
-}}
-pub type PFLOAT128 = *mut FLOAT128;
-pub type LONGLONG = ::__int64;
-pub type ULONGLONG = ::__uint64;
-pub type PLONGLONG = *mut LONGLONG;
-pub type PULONGLONG = *mut ULONGLONG;
-pub type USN = LONGLONG;
-pub type LARGE_INTEGER = LONGLONG;
-pub type PLARGE_INTEGER = *mut LARGE_INTEGER;
-pub type ULARGE_INTEGER = ULONGLONG;
-pub type PULARGE_INTEGER= *mut ULARGE_INTEGER;
-pub type RTL_REFERENCE_COUNT = ::LONG_PTR;
-pub type PRTL_REFERENCE_COUNT = *mut ::LONG_PTR;
-STRUCT!{struct LUID {
-    LowPart: ::DWORD,
-    HighPart: LONG,
-}}
-pub type PLUID = *mut LUID;
-pub type DWORDLONG = ULONGLONG;
-pub type PDWORDLONG = *mut DWORDLONG;
-//1042
-pub type BOOLEAN = ::BYTE;
-pub type PBOOLEAN = *mut BOOLEAN;
-STRUCT!{struct LIST_ENTRY {
-    Flink: *mut LIST_ENTRY,
-    Blink: *mut LIST_ENTRY,
-}}
-pub type PLIST_ENTRY = *mut LIST_ENTRY;
-STRUCT!{struct SINGLE_LIST_ENTRY {
-    Next: *mut SINGLE_LIST_ENTRY,
-}}
-pub type PSINGLE_LIST_ENTRY = *mut SINGLE_LIST_ENTRY;
-STRUCT!{struct LIST_ENTRY32 {
-    Flink: ::DWORD,
-    Blink: ::DWORD,
-}}
-pub type PLIST_ENTRY32 = *mut LIST_ENTRY32;
-STRUCT!{struct LIST_ENTRY64 {
-    Flink: ULONGLONG,
-    Blink: ULONGLONG,
-}}
-pub type PLIST_ENTRY64 = *mut LIST_ENTRY64;
-STRUCT!{struct OBJECTID {
-    Lineage: ::GUID,
-    Uniquifier: ::DWORD,
-}}
-pub const MINCHAR: ::CHAR = 0x80u8 as ::CHAR;
-pub const MAXCHAR: ::CHAR = 0x7f;
-pub const MINSHORT: ::SHORT = 0x8000u16 as ::SHORT;
-pub const MAXSHORT: ::SHORT = 0x7fff;
-pub const MINLONG: ::LONG = 0x80000000u32 as ::LONG;
-pub const MAXLONG: ::LONG = 0x7fffffff;
-pub const MAXBYTE: ::BYTE = 0xff;
-pub const MAXWORD: ::WORD = 0xffff;
-pub const MAXDWORD: ::DWORD = 0xffffffff;
-//1300
-pub type PEXCEPTION_ROUTINE = Option<unsafe extern "system" fn(
-    ExceptionRecord: *mut EXCEPTION_RECORD, EstablisherFrame: PVOID, ContextRecord: *mut CONTEXT,
-    DispatcherContext: PVOID,
-) -> ::EXCEPTION_DISPOSITION>;
-//1498
-pub const LANG_NEUTRAL: ::WORD = 0x00;
-pub const LANG_INVARIANT: ::WORD = 0x7f;
-pub const LANG_AFRIKAANS: ::WORD = 0x36;
-pub const LANG_ALBANIAN: ::WORD = 0x1c;
-pub const LANG_ALSATIAN: ::WORD = 0x84;
-pub const LANG_AMHARIC: ::WORD = 0x5e;
-pub const LANG_ARABIC: ::WORD = 0x01;
-pub const LANG_ARMENIAN: ::WORD = 0x2b;
-pub const LANG_ASSAMESE: ::WORD = 0x4d;
-pub const LANG_AZERI: ::WORD = 0x2c;
-pub const LANG_AZERBAIJANI: ::WORD = 0x2c;
-pub const LANG_BANGLA: ::WORD = 0x45;
-pub const LANG_BASHKIR: ::WORD = 0x6d;
-pub const LANG_BASQUE: ::WORD = 0x2d;
-pub const LANG_BELARUSIAN: ::WORD = 0x23;
-pub const LANG_BENGALI: ::WORD = 0x45;
-pub const LANG_BRETON: ::WORD = 0x7e;
-pub const LANG_BOSNIAN: ::WORD = 0x1a;
-pub const LANG_BOSNIAN_NEUTRAL: ::WORD = 0x781a;
-pub const LANG_BULGARIAN: ::WORD = 0x02;
-pub const LANG_CATALAN: ::WORD = 0x03;
-pub const LANG_CENTRAL_KURDISH: ::WORD = 0x92;
-pub const LANG_CHEROKEE: ::WORD = 0x5c;
-pub const LANG_CHINESE: ::WORD = 0x04;
-pub const LANG_CHINESE_SIMPLIFIED: ::WORD = 0x04;
-pub const LANG_CHINESE_TRADITIONAL: ::WORD = 0x7c04;
-pub const LANG_CORSICAN: ::WORD = 0x83;
-pub const LANG_CROATIAN: ::WORD = 0x1a;
-pub const LANG_CZECH: ::WORD = 0x05;
-pub const LANG_DANISH: ::WORD = 0x06;
-pub const LANG_DARI: ::WORD = 0x8c;
-pub const LANG_DIVEHI: ::WORD = 0x65;
-pub const LANG_DUTCH: ::WORD = 0x13;
-pub const LANG_ENGLISH: ::WORD = 0x09;
-pub const LANG_ESTONIAN: ::WORD = 0x25;
-pub const LANG_FAEROESE: ::WORD = 0x38;
-pub const LANG_FARSI: ::WORD = 0x29;
-pub const LANG_FILIPINO: ::WORD = 0x64;
-pub const LANG_FINNISH: ::WORD = 0x0b;
-pub const LANG_FRENCH: ::WORD = 0x0c;
-pub const LANG_FRISIAN: ::WORD = 0x62;
-pub const LANG_FULAH: ::WORD = 0x67;
-pub const LANG_GALICIAN: ::WORD = 0x56;
-pub const LANG_GEORGIAN: ::WORD = 0x37;
-pub const LANG_GERMAN: ::WORD = 0x07;
-pub const LANG_GREEK: ::WORD = 0x08;
-pub const LANG_GREENLANDIC: ::WORD = 0x6f;
-pub const LANG_GUJARATI: ::WORD = 0x47;
-pub const LANG_HAUSA: ::WORD = 0x68;
-pub const LANG_HAWAIIAN: ::WORD = 0x75;
-pub const LANG_HEBREW: ::WORD = 0x0d;
-pub const LANG_HINDI: ::WORD = 0x39;
-pub const LANG_HUNGARIAN: ::WORD = 0x0e;
-pub const LANG_ICELANDIC: ::WORD = 0x0f;
-pub const LANG_IGBO: ::WORD = 0x70;
-pub const LANG_INDONESIAN: ::WORD = 0x21;
-pub const LANG_INUKTITUT: ::WORD = 0x5d;
-pub const LANG_IRISH: ::WORD = 0x3c;
-pub const LANG_ITALIAN: ::WORD = 0x10;
-pub const LANG_JAPANESE: ::WORD = 0x11;
-pub const LANG_KANNADA: ::WORD = 0x4b;
-pub const LANG_KASHMIRI: ::WORD = 0x60;
-pub const LANG_KAZAK: ::WORD = 0x3f;
-pub const LANG_KHMER: ::WORD = 0x53;
-pub const LANG_KICHE: ::WORD = 0x86;
-pub const LANG_KINYARWANDA: ::WORD = 0x87;
-pub const LANG_KONKANI: ::WORD = 0x57;
-pub const LANG_KOREAN: ::WORD = 0x12;
-pub const LANG_KYRGYZ: ::WORD = 0x40;
-pub const LANG_LAO: ::WORD = 0x54;
-pub const LANG_LATVIAN: ::WORD = 0x26;
-pub const LANG_LITHUANIAN: ::WORD = 0x27;
-pub const LANG_LOWER_SORBIAN: ::WORD = 0x2e;
-pub const LANG_LUXEMBOURGISH: ::WORD = 0x6e;
-pub const LANG_MACEDONIAN: ::WORD = 0x2f;
-pub const LANG_MALAY: ::WORD = 0x3e;
-pub const LANG_MALAYALAM: ::WORD = 0x4c;
-pub const LANG_MALTESE: ::WORD = 0x3a;
-pub const LANG_MANIPURI: ::WORD = 0x58;
-pub const LANG_MAORI: ::WORD = 0x81;
-pub const LANG_MAPUDUNGUN: ::WORD = 0x7a;
-pub const LANG_MARATHI: ::WORD = 0x4e;
-pub const LANG_MOHAWK: ::WORD = 0x7c;
-pub const LANG_MONGOLIAN: ::WORD = 0x50;
-pub const LANG_NEPALI: ::WORD = 0x61;
-pub const LANG_NORWEGIAN: ::WORD = 0x14;
-pub const LANG_OCCITAN: ::WORD = 0x82;
-pub const LANG_ODIA: ::WORD = 0x48;
-pub const LANG_ORIYA: ::WORD = 0x48;
-pub const LANG_PASHTO: ::WORD = 0x63;
-pub const LANG_PERSIAN: ::WORD = 0x29;
-pub const LANG_POLISH: ::WORD = 0x15;
-pub const LANG_PORTUGUESE: ::WORD = 0x16;
-pub const LANG_PULAR: ::WORD = 0x67;
-pub const LANG_PUNJABI: ::WORD = 0x46;
-pub const LANG_QUECHUA: ::WORD = 0x6b;
-pub const LANG_ROMANIAN: ::WORD = 0x18;
-pub const LANG_ROMANSH: ::WORD = 0x17;
-pub const LANG_RUSSIAN: ::WORD = 0x19;
-pub const LANG_SAKHA: ::WORD = 0x85;
-pub const LANG_SAMI: ::WORD = 0x3b;
-pub const LANG_SANSKRIT: ::WORD = 0x4f;
-pub const LANG_SCOTTISH_GAELIC: ::WORD = 0x91;
-pub const LANG_SERBIAN: ::WORD = 0x1a;
-pub const LANG_SERBIAN_NEUTRAL: ::WORD = 0x7c1a;
-pub const LANG_SINDHI: ::WORD = 0x59;
-pub const LANG_SINHALESE: ::WORD = 0x5b;
-pub const LANG_SLOVAK: ::WORD = 0x1b;
-pub const LANG_SLOVENIAN: ::WORD = 0x24;
-pub const LANG_SOTHO: ::WORD = 0x6c;
-pub const LANG_SPANISH: ::WORD = 0x0a;
-pub const LANG_SWAHILI: ::WORD = 0x41;
-pub const LANG_SWEDISH: ::WORD = 0x1d;
-pub const LANG_SYRIAC: ::WORD = 0x5a;
-pub const LANG_TAJIK: ::WORD = 0x28;
-pub const LANG_TAMAZIGHT: ::WORD = 0x5f;
-pub const LANG_TAMIL: ::WORD = 0x49;
-pub const LANG_TATAR: ::WORD = 0x44;
-pub const LANG_TELUGU: ::WORD = 0x4a;
-pub const LANG_THAI: ::WORD = 0x1e;
-pub const LANG_TIBETAN: ::WORD = 0x51;
-pub const LANG_TIGRIGNA: ::WORD = 0x73;
-pub const LANG_TIGRINYA: ::WORD = 0x73;
-pub const LANG_TSWANA: ::WORD = 0x32;
-pub const LANG_TURKISH: ::WORD = 0x1f;
-pub const LANG_TURKMEN: ::WORD = 0x42;
-pub const LANG_UIGHUR: ::WORD = 0x80;
-pub const LANG_UKRAINIAN: ::WORD = 0x22;
-pub const LANG_UPPER_SORBIAN: ::WORD = 0x2e;
-pub const LANG_URDU: ::WORD = 0x20;
-pub const LANG_UZBEK: ::WORD = 0x43;
-pub const LANG_VALENCIAN: ::WORD = 0x03;
-pub const LANG_VIETNAMESE: ::WORD = 0x2a;
-pub const LANG_WELSH: ::WORD = 0x52;
-pub const LANG_WOLOF: ::WORD = 0x88;
-pub const LANG_XHOSA: ::WORD = 0x34;
-pub const LANG_YAKUT: ::WORD = 0x85;
-pub const LANG_YI: ::WORD = 0x78;
-pub const LANG_YORUBA: ::WORD = 0x6a;
-pub const LANG_ZULU: ::WORD = 0x35;
-//1651
-pub const SUBLANG_NEUTRAL: ::WORD = 0x00;
-pub const SUBLANG_DEFAULT: ::WORD = 0x01;
-pub const SUBLANG_SYS_DEFAULT: ::WORD = 0x02;
-pub const SUBLANG_CUSTOM_DEFAULT: ::WORD = 0x03;
-pub const SUBLANG_CUSTOM_UNSPECIFIED: ::WORD = 0x04;
-pub const SUBLANG_UI_CUSTOM_DEFAULT: ::WORD = 0x05;
-pub const SUBLANG_AFRIKAANS_SOUTH_AFRICA: ::WORD = 0x01;
-pub const SUBLANG_ALBANIAN_ALBANIA: ::WORD = 0x01;
-pub const SUBLANG_ALSATIAN_FRANCE: ::WORD = 0x01;
-pub const SUBLANG_AMHARIC_ETHIOPIA: ::WORD = 0x01;
-pub const SUBLANG_ARABIC_SAUDI_ARABIA: ::WORD = 0x01;
-pub const SUBLANG_ARABIC_IRAQ: ::WORD = 0x02;
-pub const SUBLANG_ARABIC_EGYPT: ::WORD = 0x03;
-pub const SUBLANG_ARABIC_LIBYA: ::WORD = 0x04;
-pub const SUBLANG_ARABIC_ALGERIA: ::WORD = 0x05;
-pub const SUBLANG_ARABIC_MOROCCO: ::WORD = 0x06;
-pub const SUBLANG_ARABIC_TUNISIA: ::WORD = 0x07;
-pub const SUBLANG_ARABIC_OMAN: ::WORD = 0x08;
-pub const SUBLANG_ARABIC_YEMEN: ::WORD = 0x09;
-pub const SUBLANG_ARABIC_SYRIA: ::WORD = 0x0a;
-pub const SUBLANG_ARABIC_JORDAN: ::WORD = 0x0b;
-pub const SUBLANG_ARABIC_LEBANON: ::WORD = 0x0c;
-pub const SUBLANG_ARABIC_KUWAIT: ::WORD = 0x0d;
-pub const SUBLANG_ARABIC_UAE: ::WORD = 0x0e;
-pub const SUBLANG_ARABIC_BAHRAIN: ::WORD = 0x0f;
-pub const SUBLANG_ARABIC_QATAR: ::WORD = 0x10;
-pub const SUBLANG_ARMENIAN_ARMENIA: ::WORD = 0x01;
-pub const SUBLANG_ASSAMESE_INDIA: ::WORD = 0x01;
-pub const SUBLANG_AZERI_LATIN: ::WORD = 0x01;
-pub const SUBLANG_AZERI_CYRILLIC: ::WORD = 0x02;
-pub const SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN: ::WORD = 0x01;
-pub const SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC: ::WORD = 0x02;
-pub const SUBLANG_BANGLA_INDIA: ::WORD = 0x01;
-pub const SUBLANG_BANGLA_BANGLADESH: ::WORD = 0x02;
-pub const SUBLANG_BASHKIR_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_BASQUE_BASQUE: ::WORD = 0x01;
-pub const SUBLANG_BELARUSIAN_BELARUS: ::WORD = 0x01;
-pub const SUBLANG_BENGALI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_BENGALI_BANGLADESH: ::WORD = 0x02;
-pub const SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN: ::WORD = 0x05;
-pub const SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC: ::WORD = 0x08;
-pub const SUBLANG_BRETON_FRANCE: ::WORD = 0x01;
-pub const SUBLANG_BULGARIAN_BULGARIA: ::WORD = 0x01;
-pub const SUBLANG_CATALAN_CATALAN: ::WORD = 0x01;
-pub const SUBLANG_CENTRAL_KURDISH_IRAQ: ::WORD = 0x01;
-pub const SUBLANG_CHEROKEE_CHEROKEE: ::WORD = 0x01;
-pub const SUBLANG_CHINESE_TRADITIONAL: ::WORD = 0x01;
-pub const SUBLANG_CHINESE_SIMPLIFIED: ::WORD = 0x02;
-pub const SUBLANG_CHINESE_HONGKONG: ::WORD = 0x03;
-pub const SUBLANG_CHINESE_SINGAPORE: ::WORD = 0x04;
-pub const SUBLANG_CHINESE_MACAU: ::WORD = 0x05;
-pub const SUBLANG_CORSICAN_FRANCE: ::WORD = 0x01;
-pub const SUBLANG_CZECH_CZECH_REPUBLIC: ::WORD = 0x01;
-pub const SUBLANG_CROATIAN_CROATIA: ::WORD = 0x01;
-pub const SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN: ::WORD = 0x04;
-pub const SUBLANG_DANISH_DENMARK: ::WORD = 0x01;
-pub const SUBLANG_DARI_AFGHANISTAN: ::WORD = 0x01;
-pub const SUBLANG_DIVEHI_MALDIVES: ::WORD = 0x01;
-pub const SUBLANG_DUTCH: ::WORD = 0x01;
-pub const SUBLANG_DUTCH_BELGIAN: ::WORD = 0x02;
-pub const SUBLANG_ENGLISH_US: ::WORD = 0x01;
-pub const SUBLANG_ENGLISH_UK: ::WORD = 0x02;
-pub const SUBLANG_ENGLISH_AUS: ::WORD = 0x03;
-pub const SUBLANG_ENGLISH_CAN: ::WORD = 0x04;
-pub const SUBLANG_ENGLISH_NZ: ::WORD = 0x05;
-pub const SUBLANG_ENGLISH_EIRE: ::WORD = 0x06;
-pub const SUBLANG_ENGLISH_SOUTH_AFRICA: ::WORD = 0x07;
-pub const SUBLANG_ENGLISH_JAMAICA: ::WORD = 0x08;
-pub const SUBLANG_ENGLISH_CARIBBEAN: ::WORD = 0x09;
-pub const SUBLANG_ENGLISH_BELIZE: ::WORD = 0x0a;
-pub const SUBLANG_ENGLISH_TRINIDAD: ::WORD = 0x0b;
-pub const SUBLANG_ENGLISH_ZIMBABWE: ::WORD = 0x0c;
-pub const SUBLANG_ENGLISH_PHILIPPINES: ::WORD = 0x0d;
-pub const SUBLANG_ENGLISH_INDIA: ::WORD = 0x10;
-pub const SUBLANG_ENGLISH_MALAYSIA: ::WORD = 0x11;
-pub const SUBLANG_ENGLISH_SINGAPORE: ::WORD = 0x12;
-pub const SUBLANG_ESTONIAN_ESTONIA: ::WORD = 0x01;
-pub const SUBLANG_FAEROESE_FAROE_ISLANDS: ::WORD = 0x01;
-pub const SUBLANG_FILIPINO_PHILIPPINES: ::WORD = 0x01;
-pub const SUBLANG_FINNISH_FINLAND: ::WORD = 0x01;
-pub const SUBLANG_FRENCH: ::WORD = 0x01;
-pub const SUBLANG_FRENCH_BELGIAN: ::WORD = 0x02;
-pub const SUBLANG_FRENCH_CANADIAN: ::WORD = 0x03;
-pub const SUBLANG_FRENCH_SWISS: ::WORD = 0x04;
-pub const SUBLANG_FRENCH_LUXEMBOURG: ::WORD = 0x05;
-pub const SUBLANG_FRENCH_MONACO: ::WORD = 0x06;
-pub const SUBLANG_FRISIAN_NETHERLANDS: ::WORD = 0x01;
-pub const SUBLANG_FULAH_SENEGAL: ::WORD = 0x02;
-pub const SUBLANG_GALICIAN_GALICIAN: ::WORD = 0x01;
-pub const SUBLANG_GEORGIAN_GEORGIA: ::WORD = 0x01;
-pub const SUBLANG_GERMAN: ::WORD = 0x01;
-pub const SUBLANG_GERMAN_SWISS: ::WORD = 0x02;
-pub const SUBLANG_GERMAN_AUSTRIAN: ::WORD = 0x03;
-pub const SUBLANG_GERMAN_LUXEMBOURG: ::WORD = 0x04;
-pub const SUBLANG_GERMAN_LIECHTENSTEIN: ::WORD = 0x05;
-pub const SUBLANG_GREEK_GREECE: ::WORD = 0x01;
-pub const SUBLANG_GREENLANDIC_GREENLAND: ::WORD = 0x01;
-pub const SUBLANG_GUJARATI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_HAUSA_NIGERIA_LATIN: ::WORD = 0x01;
-pub const SUBLANG_HAWAIIAN_US: ::WORD = 0x01;
-pub const SUBLANG_HEBREW_ISRAEL: ::WORD = 0x01;
-pub const SUBLANG_HINDI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_HUNGARIAN_HUNGARY: ::WORD = 0x01;
-pub const SUBLANG_ICELANDIC_ICELAND: ::WORD = 0x01;
-pub const SUBLANG_IGBO_NIGERIA: ::WORD = 0x01;
-pub const SUBLANG_INDONESIAN_INDONESIA: ::WORD = 0x01;
-pub const SUBLANG_INUKTITUT_CANADA: ::WORD = 0x01;
-pub const SUBLANG_INUKTITUT_CANADA_LATIN: ::WORD = 0x02;
-pub const SUBLANG_IRISH_IRELAND: ::WORD = 0x02;
-pub const SUBLANG_ITALIAN: ::WORD = 0x01;
-pub const SUBLANG_ITALIAN_SWISS: ::WORD = 0x02;
-pub const SUBLANG_JAPANESE_JAPAN: ::WORD = 0x01;
-pub const SUBLANG_KANNADA_INDIA: ::WORD = 0x01;
-pub const SUBLANG_KASHMIRI_SASIA: ::WORD = 0x02;
-pub const SUBLANG_KASHMIRI_INDIA: ::WORD = 0x02;
-pub const SUBLANG_KAZAK_KAZAKHSTAN: ::WORD = 0x01;
-pub const SUBLANG_KHMER_CAMBODIA: ::WORD = 0x01;
-pub const SUBLANG_KICHE_GUATEMALA: ::WORD = 0x01;
-pub const SUBLANG_KINYARWANDA_RWANDA: ::WORD = 0x01;
-pub const SUBLANG_KONKANI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_KOREAN: ::WORD = 0x01;
-pub const SUBLANG_KYRGYZ_KYRGYZSTAN: ::WORD = 0x01;
-pub const SUBLANG_LAO_LAO: ::WORD = 0x01;
-pub const SUBLANG_LATVIAN_LATVIA: ::WORD = 0x01;
-pub const SUBLANG_LITHUANIAN: ::WORD = 0x01;
-pub const SUBLANG_LOWER_SORBIAN_GERMANY: ::WORD = 0x02;
-pub const SUBLANG_LUXEMBOURGISH_LUXEMBOURG: ::WORD = 0x01;
-pub const SUBLANG_MACEDONIAN_MACEDONIA: ::WORD = 0x01;
-pub const SUBLANG_MALAY_MALAYSIA: ::WORD = 0x01;
-pub const SUBLANG_MALAY_BRUNEI_DARUSSALAM: ::WORD = 0x02;
-pub const SUBLANG_MALAYALAM_INDIA: ::WORD = 0x01;
-pub const SUBLANG_MALTESE_MALTA: ::WORD = 0x01;
-pub const SUBLANG_MAORI_NEW_ZEALAND: ::WORD = 0x01;
-pub const SUBLANG_MAPUDUNGUN_CHILE: ::WORD = 0x01;
-pub const SUBLANG_MARATHI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_MOHAWK_MOHAWK: ::WORD = 0x01;
-pub const SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA: ::WORD = 0x01;
-pub const SUBLANG_MONGOLIAN_PRC: ::WORD = 0x02;
-pub const SUBLANG_NEPALI_INDIA: ::WORD = 0x02;
-pub const SUBLANG_NEPALI_NEPAL: ::WORD = 0x01;
-pub const SUBLANG_NORWEGIAN_BOKMAL: ::WORD = 0x01;
-pub const SUBLANG_NORWEGIAN_NYNORSK: ::WORD = 0x02;
-pub const SUBLANG_OCCITAN_FRANCE: ::WORD = 0x01;
-pub const SUBLANG_ODIA_INDIA: ::WORD = 0x01;
-pub const SUBLANG_ORIYA_INDIA: ::WORD = 0x01;
-pub const SUBLANG_PASHTO_AFGHANISTAN: ::WORD = 0x01;
-pub const SUBLANG_PERSIAN_IRAN: ::WORD = 0x01;
-pub const SUBLANG_POLISH_POLAND: ::WORD = 0x01;
-pub const SUBLANG_PORTUGUESE: ::WORD = 0x02;
-pub const SUBLANG_PORTUGUESE_BRAZILIAN: ::WORD = 0x01;
-pub const SUBLANG_PULAR_SENEGAL: ::WORD = 0x02;
-pub const SUBLANG_PUNJABI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_PUNJABI_PAKISTAN: ::WORD = 0x02;
-pub const SUBLANG_QUECHUA_BOLIVIA: ::WORD = 0x01;
-pub const SUBLANG_QUECHUA_ECUADOR: ::WORD = 0x02;
-pub const SUBLANG_QUECHUA_PERU: ::WORD = 0x03;
-pub const SUBLANG_ROMANIAN_ROMANIA: ::WORD = 0x01;
-pub const SUBLANG_ROMANSH_SWITZERLAND: ::WORD = 0x01;
-pub const SUBLANG_RUSSIAN_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_SAKHA_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_SAMI_NORTHERN_NORWAY: ::WORD = 0x01;
-pub const SUBLANG_SAMI_NORTHERN_SWEDEN: ::WORD = 0x02;
-pub const SUBLANG_SAMI_NORTHERN_FINLAND: ::WORD = 0x03;
-pub const SUBLANG_SAMI_LULE_NORWAY: ::WORD = 0x04;
-pub const SUBLANG_SAMI_LULE_SWEDEN: ::WORD = 0x05;
-pub const SUBLANG_SAMI_SOUTHERN_NORWAY: ::WORD = 0x06;
-pub const SUBLANG_SAMI_SOUTHERN_SWEDEN: ::WORD = 0x07;
-pub const SUBLANG_SAMI_SKOLT_FINLAND: ::WORD = 0x08;
-pub const SUBLANG_SAMI_INARI_FINLAND: ::WORD = 0x09;
-pub const SUBLANG_SANSKRIT_INDIA: ::WORD = 0x01;
-pub const SUBLANG_SCOTTISH_GAELIC: ::WORD = 0x01;
-pub const SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_LATIN: ::WORD = 0x06;
-pub const SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_CYRILLIC: ::WORD = 0x07;
-pub const SUBLANG_SERBIAN_MONTENEGRO_LATIN: ::WORD = 0x0b;
-pub const SUBLANG_SERBIAN_MONTENEGRO_CYRILLIC: ::WORD = 0x0c;
-pub const SUBLANG_SERBIAN_SERBIA_LATIN: ::WORD = 0x09;
-pub const SUBLANG_SERBIAN_SERBIA_CYRILLIC: ::WORD = 0x0a;
-pub const SUBLANG_SERBIAN_CROATIA: ::WORD = 0x01;
-pub const SUBLANG_SERBIAN_LATIN: ::WORD = 0x02;
-pub const SUBLANG_SERBIAN_CYRILLIC: ::WORD = 0x03;
-pub const SUBLANG_SINDHI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_SINDHI_PAKISTAN: ::WORD = 0x02;
-pub const SUBLANG_SINDHI_AFGHANISTAN: ::WORD = 0x02;
-pub const SUBLANG_SINHALESE_SRI_LANKA: ::WORD = 0x01;
-pub const SUBLANG_SOTHO_NORTHERN_SOUTH_AFRICA: ::WORD = 0x01;
-pub const SUBLANG_SLOVAK_SLOVAKIA: ::WORD = 0x01;
-pub const SUBLANG_SLOVENIAN_SLOVENIA: ::WORD = 0x01;
-pub const SUBLANG_SPANISH: ::WORD = 0x01;
-pub const SUBLANG_SPANISH_MEXICAN: ::WORD = 0x02;
-pub const SUBLANG_SPANISH_MODERN: ::WORD = 0x03;
-pub const SUBLANG_SPANISH_GUATEMALA: ::WORD = 0x04;
-pub const SUBLANG_SPANISH_COSTA_RICA: ::WORD = 0x05;
-pub const SUBLANG_SPANISH_PANAMA: ::WORD = 0x06;
-pub const SUBLANG_SPANISH_DOMINICAN_REPUBLIC: ::WORD = 0x07;
-pub const SUBLANG_SPANISH_VENEZUELA: ::WORD = 0x08;
-pub const SUBLANG_SPANISH_COLOMBIA: ::WORD = 0x09;
-pub const SUBLANG_SPANISH_PERU: ::WORD = 0x0a;
-pub const SUBLANG_SPANISH_ARGENTINA: ::WORD = 0x0b;
-pub const SUBLANG_SPANISH_ECUADOR: ::WORD = 0x0c;
-pub const SUBLANG_SPANISH_CHILE: ::WORD = 0x0d;
-pub const SUBLANG_SPANISH_URUGUAY: ::WORD = 0x0e;
-pub const SUBLANG_SPANISH_PARAGUAY: ::WORD = 0x0f;
-pub const SUBLANG_SPANISH_BOLIVIA: ::WORD = 0x10;
-pub const SUBLANG_SPANISH_EL_SALVADOR: ::WORD = 0x11;
-pub const SUBLANG_SPANISH_HONDURAS: ::WORD = 0x12;
-pub const SUBLANG_SPANISH_NICARAGUA: ::WORD = 0x13;
-pub const SUBLANG_SPANISH_PUERTO_RICO: ::WORD = 0x14;
-pub const SUBLANG_SPANISH_US: ::WORD = 0x15;
-pub const SUBLANG_SWAHILI_KENYA: ::WORD = 0x01;
-pub const SUBLANG_SWEDISH: ::WORD = 0x01;
-pub const SUBLANG_SWEDISH_FINLAND: ::WORD = 0x02;
-pub const SUBLANG_SYRIAC_SYRIA: ::WORD = 0x01;
-pub const SUBLANG_TAJIK_TAJIKISTAN: ::WORD = 0x01;
-pub const SUBLANG_TAMAZIGHT_ALGERIA_LATIN: ::WORD = 0x02;
-pub const SUBLANG_TAMAZIGHT_MOROCCO_TIFINAGH: ::WORD = 0x04;
-pub const SUBLANG_TAMIL_INDIA: ::WORD = 0x01;
-pub const SUBLANG_TAMIL_SRI_LANKA: ::WORD = 0x02;
-pub const SUBLANG_TATAR_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_TELUGU_INDIA: ::WORD = 0x01;
-pub const SUBLANG_THAI_THAILAND: ::WORD = 0x01;
-pub const SUBLANG_TIBETAN_PRC: ::WORD = 0x01;
-pub const SUBLANG_TIGRIGNA_ERITREA: ::WORD = 0x02;
-pub const SUBLANG_TIGRINYA_ERITREA: ::WORD = 0x02;
-pub const SUBLANG_TIGRINYA_ETHIOPIA: ::WORD = 0x01;
-pub const SUBLANG_TSWANA_BOTSWANA: ::WORD = 0x02;
-pub const SUBLANG_TSWANA_SOUTH_AFRICA: ::WORD = 0x01;
-pub const SUBLANG_TURKISH_TURKEY: ::WORD = 0x01;
-pub const SUBLANG_TURKMEN_TURKMENISTAN: ::WORD = 0x01;
-pub const SUBLANG_UIGHUR_PRC: ::WORD = 0x01;
-pub const SUBLANG_UKRAINIAN_UKRAINE: ::WORD = 0x01;
-pub const SUBLANG_UPPER_SORBIAN_GERMANY: ::WORD = 0x01;
-pub const SUBLANG_URDU_PAKISTAN: ::WORD = 0x01;
-pub const SUBLANG_URDU_INDIA: ::WORD = 0x02;
-pub const SUBLANG_UZBEK_LATIN: ::WORD = 0x01;
-pub const SUBLANG_UZBEK_CYRILLIC: ::WORD = 0x02;
-pub const SUBLANG_VALENCIAN_VALENCIA: ::WORD = 0x02;
-pub const SUBLANG_VIETNAMESE_VIETNAM: ::WORD = 0x01;
-pub const SUBLANG_WELSH_UNITED_KINGDOM: ::WORD = 0x01;
-pub const SUBLANG_WOLOF_SENEGAL: ::WORD = 0x01;
-pub const SUBLANG_XHOSA_SOUTH_AFRICA: ::WORD = 0x01;
-pub const SUBLANG_YAKUT_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_YI_PRC: ::WORD = 0x01;
-pub const SUBLANG_YORUBA_NIGERIA: ::WORD = 0x01;
-pub const SUBLANG_ZULU_SOUTH_AFRICA: ::WORD = 0x01;
-//1962
-// FIXME: Once feature(const_fn) or some CTFE alternative becomes stable, MAKELANGID! can go
-// unless we want to #[macro_export] it ...
-macro_rules! MAKELANGID { ($p:expr, $s:expr) => ($s << 10 | $p) }
-pub fn MAKELANGID(p: ::WORD, s: ::WORD) -> ::LANGID { MAKELANGID!(p, s) }
-pub fn PRIMARYLANGID(lgid: ::LANGID) -> ::WORD { lgid & 0x3ff }
-pub fn SUBLANGID(lgid: ::LANGID) -> ::WORD { lgid >> 10 }
-//2019
-pub const LANG_SYSTEM_DEFAULT: LANGID = MAKELANGID!(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT);
-pub const LANG_USER_DEFAULT: LANGID = MAKELANGID!(LANG_NEUTRAL, SUBLANG_DEFAULT);
-//2214
-pub const MAXIMUM_WAIT_OBJECTS: ::DWORD = 64;
-pub const MAXIMUM_SUSPEND_COUNT: ::CHAR = MAXCHAR;
-//2277
-pub type KSPIN_LOCK = ::ULONG_PTR;
-pub type PKSPIN_LOCK = *mut KSPIN_LOCK;
-STRUCT!{struct M128A { // FIXME align 16
-    Low: ULONGLONG,
-    High: LONGLONG,
-}}
-pub type PM128A = *mut M128A;
-#[cfg(target_arch = "x86")]
-STRUCT!{nodebug struct XSAVE_FORMAT { // FIXME align 16
-    ControlWord: ::WORD,
-    StatusWord: ::WORD,
-    TagWord: ::BYTE,
-    Reserved1: ::BYTE,
-    ErrorOpcode: ::WORD,
-    ErrorOffset: ::DWORD,
-    ErrorSelector: ::WORD,
-    Reserved2: ::WORD,
-    DataOffset: ::DWORD,
-    DataSelector: ::WORD,
-    Reserved3: ::WORD,
-    MxCsr: ::DWORD,
-    MxCsr_Mask: ::DWORD,
-    FloatRegisters: [M128A; 8],
-    XmmRegisters: [M128A; 8],
-    Reserved4: [::BYTE; 224],
-}}
-#[cfg(target_arch = "x86_64")]
-STRUCT!{nodebug struct XSAVE_FORMAT { // FIXME align 16
-    ControlWord: ::WORD,
-    StatusWord: ::WORD,
-    TagWord: ::BYTE,
-    Reserved1: ::BYTE,
-    ErrorOpcode: ::WORD,
-    ErrorOffset: ::DWORD,
-    ErrorSelector: ::WORD,
-    Reserved2: ::WORD,
-    DataOffset: ::DWORD,
-    DataSelector: ::WORD,
-    Reserved3: ::WORD,
-    MxCsr: ::DWORD,
-    MxCsr_Mask: ::DWORD,
-    FloatRegisters: [M128A; 8],
-    XmmRegisters: [M128A; 16],
-    Reserved4: [::BYTE; 96],
-}}
-//3563
-#[cfg(target_arch = "x86")]
-pub const SIZE_OF_80387_REGISTERS: usize = 80;
-#[cfg(target_arch = "x86")]
-STRUCT!{nodebug struct FLOATING_SAVE_AREA {
-    ControlWord: ::DWORD,
-    StatusWord: ::DWORD,
-    TagWord: ::DWORD,
-    ErrorOffset: ::DWORD,
-    ErrorSelector: ::DWORD,
-    DataOffset: ::DWORD,
-    DataSelector: ::DWORD,
-    RegisterArea: [::BYTE; SIZE_OF_80387_REGISTERS],
-    Spare0: ::DWORD,
-}}
-#[cfg(target_arch = "x86")]
-pub type PFLOATING_SAVE_AREA = *mut FLOATING_SAVE_AREA;
-#[cfg(target_arch = "x86")]
-pub const MAXIMUM_SUPPORTED_EXTENSION: usize = 512;
-#[cfg(target_arch = "x86")]
-STRUCT!{nodebug struct CONTEXT {
-    ContextFlags: ::DWORD,
-    Dr0: ::DWORD,
-    Dr1: ::DWORD,
-    Dr2: ::DWORD,
-    Dr3: ::DWORD,
-    Dr6: ::DWORD,
-    Dr7: ::DWORD,
-    FloatSave: FLOATING_SAVE_AREA,
-    SegGs: ::DWORD,
-    SegFs: ::DWORD,
-    SegEs: ::DWORD,
-    SegDs: ::DWORD,
-    Edi: ::DWORD,
-    Esi: ::DWORD,
-    Ebx: ::DWORD,
-    Edx: ::DWORD,
-    Ecx: ::DWORD,
-    Eax: ::DWORD,
-    Ebp: ::DWORD,
-    Eip: ::DWORD,
-    SegCs: ::DWORD,
-    EFlags: ::DWORD,
-    Esp: ::DWORD,
-    SegSs: ::DWORD,
-    ExtendedRegisters: [::BYTE; MAXIMUM_SUPPORTED_EXTENSION],
-}}
-#[cfg(target_arch = "x86_64")]
-pub type XMM_SAVE_AREA32 = XSAVE_FORMAT;
-pub type PXMM_SAVE_AREA32 = *mut XSAVE_FORMAT;
-// FIXME - Align 16
-#[cfg(target_arch = "x86_64")]
-STRUCT!{nodebug struct CONTEXT {
-    P1Home: ::DWORD64,
-    P2Home: ::DWORD64,
-    P3Home: ::DWORD64,
-    P4Home: ::DWORD64,
-    P5Home: ::DWORD64,
-    P6Home: ::DWORD64,
-    ContextFlags: ::DWORD,
-    MxCsr: ::DWORD,
-    SegCs: ::WORD,
-    SegDs: ::WORD,
-    SegEs: ::WORD,
-    SegFs: ::WORD,
-    SegGs: ::WORD,
-    SegSs: ::WORD,
-    EFlags: ::DWORD,
-    Dr0: ::DWORD64,
-    Dr1: ::DWORD64,
-    Dr2: ::DWORD64,
-    Dr3: ::DWORD64,
-    Dr6: ::DWORD64,
-    Dr7: ::DWORD64,
-    Rax: ::DWORD64,
-    Rcx: ::DWORD64,
-    Rdx: ::DWORD64,
-    Rbx: ::DWORD64,
-    Rsp: ::DWORD64,
-    Rbp: ::DWORD64,
-    Rsi: ::DWORD64,
-    Rdi: ::DWORD64,
-    R8: ::DWORD64,
-    R9: ::DWORD64,
-    R10: ::DWORD64,
-    R11: ::DWORD64,
-    R12: ::DWORD64,
-    R13: ::DWORD64,
-    R14: ::DWORD64,
-    R15: ::DWORD64,
-    Rip: ::DWORD64,
-    FltSave: XMM_SAVE_AREA32,
-    VectorRegister: [::M128A; 26],
-    VectorControl: ::DWORD64,
-    DebugControl: ::DWORD64,
-    LastBranchToRip: ::DWORD64,
-    LastBranchFromRip: ::DWORD64,
-    LastExceptionToRip: ::DWORD64,
-    LastExceptionFromRip: ::DWORD64,
-}}
-pub type PCONTEXT = *mut CONTEXT;
-#[test]
-fn test_CONTEXT_size() {
-    use std::mem::size_of;
-    if cfg!(target_arch = "x86_64") {
-        assert_eq!(size_of::<CONTEXT>(), 1232)
-    } else if cfg!(target_arch = "x86") {
-        assert_eq!(size_of::<CONTEXT>(), 716)
-    }
-}
-pub type RUNTIME_FUNCTION = IMAGE_RUNTIME_FUNCTION_ENTRY;
-pub type PRUNTIME_FUNCTION = *mut RUNTIME_FUNCTION;
-pub const UNWIND_HISTORY_TABLE_SIZE: usize = 12;
-STRUCT!{struct UNWIND_HISTORY_TABLE_ENTRY {
-    ImageBase: ::DWORD64,
-    FunctionEntry: PRUNTIME_FUNCTION,
-}}
-pub type PUNWIND_HISTORY_TABLE_ENTRY = *mut UNWIND_HISTORY_TABLE_ENTRY;
-STRUCT!{struct UNWIND_HISTORY_TABLE {
-    Count: ::DWORD,
-    LocalHint: ::BYTE,
-    GlobalHint: ::BYTE,
-    Search: ::BYTE,
-    Once: ::BYTE,
-    LowAddress: ::DWORD64,
-    HighAddress: ::DWORD64,
-    Entry: [UNWIND_HISTORY_TABLE_ENTRY; UNWIND_HISTORY_TABLE_SIZE],
-}}
-pub type PUNWIND_HISTORY_TABLE = *mut UNWIND_HISTORY_TABLE;
-pub type PGET_RUNTIME_FUNCTION_CALLBACK = Option<unsafe extern "system" fn(
-    ControlPc: ::DWORD64, Context: ::PVOID,
-) -> PRUNTIME_FUNCTION>;
-STRUCT!{struct KNONVOLATILE_CONTEXT_POINTERS_u1 {
-    Xmm0: PM128A,
-    Xmm1: PM128A,
-    Xmm2: PM128A,
-    Xmm3: PM128A,
-    Xmm4: PM128A,
-    Xmm5: PM128A,
-    Xmm6: PM128A,
-    Xmm7: PM128A,
-    Xmm8: PM128A,
-    Xmm9: PM128A,
-    Xmm10: PM128A,
-    Xmm11: PM128A,
-    Xmm12: PM128A,
-    Xmm14: PM128A,
-    Xmm15: PM128A,
-}}
-STRUCT!{struct KNONVOLATILE_CONTEXT_POINTERS_u2 {
-    Rax: ::DWORD64,
-    Rcx: ::DWORD64,
-    Rdx: ::DWORD64,
-    Rbx: ::DWORD64,
-    Rsp: ::DWORD64,
-    Rbp: ::DWORD64,
-    Rsi: ::DWORD64,
-    Rdi: ::DWORD64,
-    R8: ::DWORD64,
-    R9: ::DWORD64,
-    R10: ::DWORD64,
-    R11: ::DWORD64,
-    R12: ::DWORD64,
-    R13: ::DWORD64,
-    R14: ::DWORD64,
-    R15: ::DWORD64,
-}}
-STRUCT!{struct KNONVOLATILE_CONTEXT_POINTERS {
-    FloatingContext: [PM128A; 16],
-    IntegerContext: [::PDWORD64; 16],
-}}
-// FIXME: all unions are untagged
-UNION!(
-    KNONVOLATILE_CONTEXT_POINTERS, FloatingContext, Xmms, Xmms_mut,
-    KNONVOLATILE_CONTEXT_POINTERS_u1
-);
-UNION!(
-    KNONVOLATILE_CONTEXT_POINTERS, IntegerContext, Regs, Regs_mut,
-    KNONVOLATILE_CONTEXT_POINTERS_u2
-);
-pub type PKNONVOLATILE_CONTEXT_POINTERS = *mut KNONVOLATILE_CONTEXT_POINTERS;
-//8983
-pub const EXCEPTION_MAXIMUM_PARAMETERS: usize = 15;
-STRUCT!{struct EXCEPTION_RECORD {
-    ExceptionCode: ::DWORD,
-    ExceptionFlags: ::DWORD,
-    ExceptionRecord: *mut EXCEPTION_RECORD,
-    ExceptionAddress: ::PVOID,
-    NumberParameters: ::DWORD,
-    ExceptionInformation: [::ULONG_PTR; EXCEPTION_MAXIMUM_PARAMETERS],
-}}
-pub type PEXCEPTION_RECORD = *mut EXCEPTION_RECORD;
-//9023
-STRUCT!{struct EXCEPTION_POINTERS {
-    ExceptionRecord: PEXCEPTION_RECORD,
-    ContextRecord: PCONTEXT,
-}}
-pub type PEXCEPTION_POINTERS = *mut EXCEPTION_POINTERS;
-pub type PACCESS_TOKEN = ::PVOID;
-pub type PSECURITY_DESCRIPTOR = ::PVOID;
-pub type PSID = ::PVOID;
-pub type PCLAIMS_BLOB = ::PVOID;
-//9091
-pub type ACCESS_MASK = ::DWORD;
-pub type PACCESS_MASK = *mut ACCESS_MASK;
-pub const DELETE: ::DWORD = 0x00010000;
-pub const READ_CONTROL: ::DWORD = 0x00020000;
-pub const WRITE_DAC: ::DWORD = 0x00040000;
-pub const WRITE_OWNER: ::DWORD = 0x00080000;
-pub const SYNCHRONIZE: ::DWORD = 0x00100000;
-pub const STANDARD_RIGHTS_REQUIRED: ::DWORD = 0x000F0000;
-pub const STANDARD_RIGHTS_READ: ::DWORD = READ_CONTROL;
-pub const STANDARD_RIGHTS_WRITE: ::DWORD = READ_CONTROL;
-pub const STANDARD_RIGHTS_EXECUTE: ::DWORD = READ_CONTROL;
-pub const STANDARD_RIGHTS_ALL: ::DWORD = 0x001F0000;
-pub const SPECIFIC_RIGHTS_ALL: ::DWORD = 0x0000FFFF;
-pub const ACCESS_SYSTEM_SECURITY: ::DWORD = 0x01000000;
-pub const MAXIMUM_ALLOWED: ::DWORD = 0x02000000;
-pub const GENERIC_READ: ::DWORD = 0x80000000;
-pub const GENERIC_WRITE: ::DWORD = 0x40000000;
-pub const GENERIC_EXECUTE: ::DWORD = 0x20000000;
-pub const GENERIC_ALL: ::DWORD = 0x10000000;
-//9170
-STRUCT!{struct LUID_AND_ATTRIBUTES {
-    Luid: LUID,
-    Attributes: ::DWORD,
-}}
-pub type PLUID_AND_ATTRIBUTES = *mut LUID_AND_ATTRIBUTES;
-//9243
-ENUM!{enum SID_NAME_USE {
-    SidTypeUser = 1,
-    SidTypeGroup,
-    SidTypeDomain,
-    SidTypeAlias,
-    SidTypeWellKnownGroup,
-    SidTypeDeletedAccount,
-    SidTypeInvalid,
-    SidTypeUnknown,
-    SidTypeComputer,
-    SidTypeLabel,
-}}
-pub type PSID_NAME_USE = *mut SID_NAME_USE;
-STRUCT!{struct SID_AND_ATTRIBUTES {
-    Sid: PSID,
-    Attributes: ::DWORD,
-}}
-pub type PSID_AND_ATTRIBUTES = *mut SID_AND_ATTRIBUTES;
-//9802
-pub const ACL_REVISION: ::BYTE = 2;
-pub const ACL_REVISION_DS: ::BYTE = 4;
-pub const ACL_REVISION1: ::BYTE = 1;
-pub const MIN_ACL_REVISION: ::BYTE = ACL_REVISION2;
-pub const ACL_REVISION2: ::BYTE = 2;
-pub const ACL_REVISION3: ::BYTE = 3;
-pub const ACL_REVISION4: ::BYTE = 4;
-pub const MAX_ACL_REVISION: ::BYTE = ACL_REVISION4;
-STRUCT!{struct ACL {
-    AclRevision: ::BYTE,
-    Sbz1: ::BYTE,
-    AclSize: ::WORD,
-    AceCount: ::WORD,
-    Sbz2: ::WORD,
-}}
-pub type PACL = *mut ACL;
-//9888
-pub const SE_PRIVILEGE_ENABLED_BY_DEFAULT: ::DWORD = 0x00000001;
-pub const SE_PRIVILEGE_ENABLED: ::DWORD = 0x00000002;
-pub const SE_PRIVILEGE_REMOVED: ::DWORD = 0x00000004;
-pub const SE_PRIVILEGE_USED_FOR_ACCESS: ::DWORD = 0x80000000;
-pub const SE_PRIVILEGE_VALID_ATTRIBUTES: ::DWORD = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_REMOVED | SE_PRIVILEGE_USED_FOR_ACCESS;
-pub const PRIVILEGE_SET_ALL_NECESSARY: ::DWORD = 1;
-//10689
-pub const TOKEN_ASSIGN_PRIMARY: ::DWORD = 0x0001;
-pub const TOKEN_DUPLICATE: ::DWORD = 0x0002;
-pub const TOKEN_IMPERSONATE: ::DWORD = 0x0004;
-pub const TOKEN_QUERY: ::DWORD = 0x0008;
-pub const TOKEN_QUERY_SOURCE: ::DWORD = 0x0010;
-pub const TOKEN_ADJUST_PRIVILEGES: ::DWORD = 0x0020;
-pub const TOKEN_ADJUST_GROUPS: ::DWORD = 0x0040;
-pub const TOKEN_ADJUST_DEFAULT: ::DWORD = 0x0080;
-pub const TOKEN_ADJUST_SESSIONID: ::DWORD = 0x0100;
-pub const TOKEN_ALL_ACCESS_P: ::DWORD = STANDARD_RIGHTS_REQUIRED | TOKEN_ASSIGN_PRIMARY
-    | TOKEN_DUPLICATE | TOKEN_IMPERSONATE | TOKEN_QUERY | TOKEN_QUERY_SOURCE
-    | TOKEN_ADJUST_PRIVILEGES | TOKEN_ADJUST_GROUPS | TOKEN_ADJUST_DEFAULT;
-pub const TOKEN_ALL_ACCESS: ::DWORD = TOKEN_ALL_ACCESS_P | TOKEN_ADJUST_SESSIONID;
-pub const TOKEN_READ: ::DWORD = STANDARD_RIGHTS_READ | TOKEN_QUERY;
-pub const TOKEN_WRITE: ::DWORD = STANDARD_RIGHTS_WRITE | TOKEN_ADJUST_PRIVILEGES
-    | TOKEN_ADJUST_GROUPS | TOKEN_ADJUST_DEFAULT;
-pub const TOKEN_EXECUTE: ::DWORD = STANDARD_RIGHTS_EXECUTE;
-//10823
-STRUCT!{nodebug struct TOKEN_PRIVILEGES {
-    PrivilegeCount: ::DWORD,
-    Privileges: [LUID_AND_ATTRIBUTES; 0],
-}}
-pub type PTOKEN_PRIVILEGES = *mut TOKEN_PRIVILEGES;
-//10965
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_INVALID: ::WORD = 0x00;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_INT64: ::WORD = 0x01;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_UINT64: ::WORD = 0x02;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_STRING: ::WORD = 0x03;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE {
-    Version: ::DWORD64,
-    Name: ::PWSTR,
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE = *mut CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_FQBN: ::WORD = 0x04;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_SID: ::WORD = 0x05;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_BOOLEAN: ::WORD = 0x06;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE {
-    pValue: ::PVOID,
-    ValueLength: ::DWORD,
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE =
-    *mut CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_OCTET_STRING: ::WORD = 0x10;
-pub const CLAIM_SECURITY_ATTRIBUTE_NON_INHERITABLE: ::DWORD = 0x0001;
-pub const CLAIM_SECURITY_ATTRIBUTE_VALUE_CASE_SENSITIVE: ::DWORD = 0x0002;
-pub const CLAIM_SECURITY_ATTRIBUTE_USE_FOR_DENY_ONLY: ::DWORD = 0x0004;
-pub const CLAIM_SECURITY_ATTRIBUTE_DISABLED_BY_DEFAULT: ::DWORD = 0x0008;
-pub const CLAIM_SECURITY_ATTRIBUTE_DISABLED: ::DWORD = 0x0010;
-pub const CLAIM_SECURITY_ATTRIBUTE_MANDATORY: ::DWORD = 0x0020;
-pub const CLAIM_SECURITY_ATTRIBUTE_VALID_FLAGS: ::DWORD = CLAIM_SECURITY_ATTRIBUTE_NON_INHERITABLE
-    | CLAIM_SECURITY_ATTRIBUTE_VALUE_CASE_SENSITIVE | CLAIM_SECURITY_ATTRIBUTE_USE_FOR_DENY_ONLY
-    | CLAIM_SECURITY_ATTRIBUTE_DISABLED_BY_DEFAULT | CLAIM_SECURITY_ATTRIBUTE_DISABLED
-    | CLAIM_SECURITY_ATTRIBUTE_MANDATORY;
-pub const CLAIM_SECURITY_ATTRIBUTE_CUSTOM_FLAGS: ::DWORD = 0xFFFF0000;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTE_V1 {
-    Name: ::PWSTR,
-    ValueType: ::WORD,
-    Reserved: ::WORD,
-    Flags: ::DWORD,
-    ValueCount: ::DWORD,
-    // Put data here
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTE_V1 = *mut CLAIM_SECURITY_ATTRIBUTE_V1;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 {
-    Name: ::DWORD,
-    ValueType: ::WORD,
-    Reserved: ::WORD,
-    Flags: ::DWORD,
-    ValueCount: ::DWORD,
-    // Put array here
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 = *mut CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1;
-pub const CLAIM_SECURITY_ATTRIBUTES_INFORMATION_VERSION_V1: ::WORD = 1;
-pub const CLAIM_SECURITY_ATTRIBUTES_INFORMATION_VERSION: ::WORD =
-    CLAIM_SECURITY_ATTRIBUTES_INFORMATION_VERSION_V1;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTES_INFORMATION {
-    Version: ::WORD,
-    Reserved: ::WORD,
-    AttributeCount: ::DWORD,
-    pAttributeV1: PCLAIM_SECURITY_ATTRIBUTE_V1,
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTES_INFORMATION = *mut CLAIM_SECURITY_ATTRIBUTES_INFORMATION;
-//11257
-pub type SECURITY_INFORMATION = ::DWORD;
-pub type PSECURITY_INFORMATION = *mut ::DWORD;
-pub const OWNER_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000001;
-pub const GROUP_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000002;
-pub const DACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000004;
-pub const SACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000008;
-pub const LABEL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000010;
-pub const ATTRIBUTE_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000020;
-pub const SCOPE_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000040;
-pub const PROCESS_TRUST_LABEL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000080;
-pub const BACKUP_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00010000;
-pub const PROTECTED_DACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x80000000;
-pub const PROTECTED_SACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x40000000;
-pub const UNPROTECTED_DACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x20000000;
-pub const UNPROTECTED_SACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x10000000;
-ENUM!{enum SE_LEARNING_MODE_DATA_TYPE {
-    SeLearningModeInvalidType = 0,
-    SeLearningModeSettings,
-    SeLearningModeMax,
-}}
-STRUCT!{struct SECURITY_CAPABILITIES {
-    AppContainerSid: PSID,
-    Capabilities: PSID_AND_ATTRIBUTES,
-    CapabilityCount: ::DWORD,
-    Reserved: ::DWORD,
-}}
-pub type PSECURITY_CAPABILITIES = *mut SECURITY_CAPABILITIES;
-pub type LPSECURITY_CAPABILITIES = *mut SECURITY_CAPABILITIES;
-pub const PROCESS_TERMINATE: ::DWORD = 0x0001;
-pub const PROCESS_CREATE_THREAD: ::DWORD = 0x0002;
-pub const PROCESS_SET_SESSIONID: ::DWORD = 0x0004;
-pub const PROCESS_VM_OPERATION: ::DWORD = 0x0008;
-pub const PROCESS_VM_READ: ::DWORD = 0x0010;
-pub const PROCESS_VM_WRITE: ::DWORD = 0x0020;
-pub const PROCESS_DUP_HANDLE: ::DWORD = 0x0040;
-pub const PROCESS_CREATE_PROCESS: ::DWORD = 0x0080;
-pub const PROCESS_SET_QUOTA: ::DWORD = 0x0100;
-pub const PROCESS_SET_INFORMATION: ::DWORD = 0x0200;
-pub const PROCESS_QUERY_INFORMATION: ::DWORD = 0x0400;
-pub const PROCESS_SUSPEND_RESUME: ::DWORD = 0x0800;
-pub const PROCESS_QUERY_LIMITED_INFORMATION: ::DWORD = 0x1000;
-pub const PROCESS_SET_LIMITED_INFORMATION: ::DWORD = 0x2000;
-pub const PROCESS_ALL_ACCESS: ::DWORD = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFFF;
-//11007
-pub const THREAD_BASE_PRIORITY_LOWRT: ::DWORD = 15;
-pub const THREAD_BASE_PRIORITY_MAX: ::DWORD = 2;
-pub const THREAD_BASE_PRIORITY_MIN: ::DWORD = -2i32 as ::DWORD;
-pub const THREAD_BASE_PRIORITY_IDLE: ::DWORD = -15i32 as ::DWORD;
-//11018
-STRUCT!{struct QUOTA_LIMITS {
-    PagedPoolLimit: ::SIZE_T,
-    NonPagedPoolLimit: ::SIZE_T,
-    MinimumWorkingSetSize: ::SIZE_T,
-    MaximumWorkingSetSize: ::SIZE_T,
-    PagefileLimit: ::SIZE_T,
-    TimeLimit: ::LARGE_INTEGER,
-}}
-pub type PQUOTA_LIMITS = *mut QUOTA_LIMITS;
-pub const QUOTA_LIMITS_HARDWS_MIN_ENABLE: ::DWORD = 0x00000001;
-pub const QUOTA_LIMITS_HARDWS_MIN_DISABLE: ::DWORD = 0x00000002;
-pub const QUOTA_LIMITS_HARDWS_MAX_ENABLE: ::DWORD = 0x00000004;
-pub const QUOTA_LIMITS_HARDWS_MAX_DISABLE: ::DWORD = 0x00000008;
-pub const QUOTA_LIMITS_USE_DEFAULT_LIMITS: ::DWORD = 0x00000010;
-STRUCT!{struct RATE_QUOTA_LIMIT {
-    RateData: ::DWORD,
-    BitFields: ::DWORD,
-}}
-BITFIELD!(RATE_QUOTA_LIMIT BitFields: ::DWORD [
-    RatePercent set_RatePercent[0..7],
-    Reserved0 set_Reserved0[7..32],
-]);
-pub type PRATE_QUOTA_LIMIT = *mut RATE_QUOTA_LIMIT;
-STRUCT!{struct QUOTA_LIMITS_EX {
-    PagedPoolLimit: ::SIZE_T,
-    NonPagedPoolLimit: ::SIZE_T,
-    MinimumWorkingSetSize: ::SIZE_T,
-    MaximumWorkingSetSize: ::SIZE_T,
-    PagefileLimit: ::SIZE_T,
-    TimeLimit: ::LARGE_INTEGER,
-    WorkingSetLimit: ::SIZE_T,
-    Reserved2: ::SIZE_T,
-    Reserved3: ::SIZE_T,
-    Reserved4: ::SIZE_T,
-    Flags: ::DWORD,
-    CpuRateLimit: RATE_QUOTA_LIMIT,
-}}
-pub type PQUOTA_LIMITS_EX = *mut QUOTA_LIMITS_EX;
-STRUCT!{struct IO_COUNTERS {
-    ReadOperationCount: ::ULONGLONG,
-    WriteOperationCount: ::ULONGLONG,
-    OtherOperationCount: ::ULONGLONG,
-    ReadTransferCount: ::ULONGLONG,
-    WriteTransferCount: ::ULONGLONG,
-    OtherTransferCount: ::ULONGLONG,
-}}
-pub type PIO_COUNTERS = *mut IO_COUNTERS;
-//11192
-STRUCT!{struct JOBOBJECT_BASIC_LIMIT_INFORMATION {
-    PerProcessUserTimeLimit: ::LARGE_INTEGER,
-    PerJobUserTimeLimit: ::LARGE_INTEGER,
-    LimitFlags: ::DWORD,
-    MinimumWorkingSetSize: ::SIZE_T,
-    MaximumWorkingSetSize: ::SIZE_T,
-    ActiveProcessLimit: ::DWORD,
-    Affinity: ::ULONG_PTR,
-    PriorityClass: ::DWORD,
-    SchedulingClass: ::DWORD,
-}}
-pub type PJOBOBJECT_BASIC_LIMIT_INFORMATION = *mut JOBOBJECT_BASIC_LIMIT_INFORMATION;
-STRUCT!{struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION {
-    BasicLimitInformation: JOBOBJECT_BASIC_LIMIT_INFORMATION,
-    IoInfo: IO_COUNTERS,
-    ProcessMemoryLimit: ::SIZE_T,
-    JobMemoryLimit: ::SIZE_T,
-    PeakProcessMemoryUsed: ::SIZE_T,
-    PeakJobMemoryUsed: ::SIZE_T,
-}}
-pub type PJOBOBJECT_EXTENDED_LIMIT_INFORMATION = *mut JOBOBJECT_EXTENDED_LIMIT_INFORMATION;
-STRUCT!{struct JOBOBJECT_BASIC_PROCESS_ID_LIST {
-    NumberOfAssignedProcesses: ::DWORD,
-    NumberOfProcessIdsInList: ::DWORD,
-    ProcessIdList: [::ULONG_PTR; 0],
-}}
-//11712
-pub const JOB_OBJECT_TERMINATE_AT_END_OF_JOB: ::DWORD = 0;
-pub const JOB_OBJECT_POST_AT_END_OF_JOB: ::DWORD = 1;
-pub const JOB_OBJECT_MSG_END_OF_JOB_TIME: ::DWORD = 1;
-pub const JOB_OBJECT_MSG_END_OF_PROCESS_TIME: ::DWORD = 2;
-pub const JOB_OBJECT_MSG_ACTIVE_PROCESS_LIMIT: ::DWORD = 3;
-pub const JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO: ::DWORD = 4;
-pub const JOB_OBJECT_MSG_NEW_PROCESS: ::DWORD = 6;
-pub const JOB_OBJECT_MSG_EXIT_PROCESS: ::DWORD = 7;
-pub const JOB_OBJECT_MSG_ABNORMAL_EXIT_PROCESS: ::DWORD = 8;
-pub const JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT: ::DWORD = 9;
-pub const JOB_OBJECT_MSG_JOB_MEMORY_LIMIT: ::DWORD = 10;
-pub const JOB_OBJECT_MSG_NOTIFICATION_LIMIT: ::DWORD = 11;
-pub const JOB_OBJECT_MSG_JOB_CYCLE_TIME_LIMIT: ::DWORD = 12;
-pub const JOB_OBJECT_MSG_MINIMUM: ::DWORD = 1;
-pub const JOB_OBJECT_MSG_MAXIMUM: ::DWORD = 12;
-pub const JOB_OBJECT_VALID_COMPLETION_FILTER: ::DWORD = ((1 << (JOB_OBJECT_MSG_MAXIMUM + 1)) - 1)
-    - ((1 << JOB_OBJECT_MSG_MINIMUM) - 1);
-pub const JOB_OBJECT_LIMIT_WORKINGSET: ::DWORD = 0x00000001;
-pub const JOB_OBJECT_LIMIT_PROCESS_TIME: ::DWORD = 0x00000002;
-pub const JOB_OBJECT_LIMIT_JOB_TIME: ::DWORD = 0x00000004;
-pub const JOB_OBJECT_LIMIT_ACTIVE_PROCESS: ::DWORD = 0x00000008;
-pub const JOB_OBJECT_LIMIT_AFFINITY: ::DWORD = 0x00000010;
-pub const JOB_OBJECT_LIMIT_PRIORITY_CLASS: ::DWORD = 0x00000020;
-pub const JOB_OBJECT_LIMIT_PRESERVE_JOB_TIME: ::DWORD = 0x00000040;
-pub const JOB_OBJECT_LIMIT_SCHEDULING_CLASS: ::DWORD = 0x00000080;
-pub const JOB_OBJECT_LIMIT_PROCESS_MEMORY: ::DWORD = 0x00000100;
-pub const JOB_OBJECT_LIMIT_JOB_MEMORY: ::DWORD = 0x00000200;
-pub const JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION: ::DWORD = 0x00000400;
-pub const JOB_OBJECT_LIMIT_BREAKAWAY_OK: ::DWORD = 0x00000800;
-pub const JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK: ::DWORD = 0x00001000;
-pub const JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE: ::DWORD = 0x00002000;
-pub const JOB_OBJECT_LIMIT_SUBSET_AFFINITY: ::DWORD = 0x00004000;
-pub const JOB_OBJECT_LIMIT_JOB_READ_BYTES: ::DWORD = 0x00010000;
-pub const JOB_OBJECT_LIMIT_JOB_WRITE_BYTES: ::DWORD = 0x00020000;
-pub const JOB_OBJECT_LIMIT_RATE_CONTROL: ::DWORD = 0x00040000;
-pub const JOB_OBJECT_LIMIT_RESERVED3: ::DWORD = 0x00008000;
-pub const JOB_OBJECT_LIMIT_VALID_FLAGS: ::DWORD = 0x0007ffff;
-pub const JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS: ::DWORD = 0x000000ff;
-pub const JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS: ::DWORD = 0x00007fff;
-pub const JOB_OBJECT_NOTIFICATION_LIMIT_VALID_FLAGS: ::DWORD = 0x00070204;
-pub const JOB_OBJECT_RESERVED_LIMIT_VALID_FLAGS: ::DWORD = 0x0007ffff;
-pub const JOB_OBJECT_UILIMIT_NONE: ::DWORD = 0x00000000;
-pub const JOB_OBJECT_UILIMIT_HANDLES: ::DWORD = 0x00000001;
-pub const JOB_OBJECT_UILIMIT_READCLIPBOARD: ::DWORD = 0x00000002;
-pub const JOB_OBJECT_UILIMIT_WRITECLIPBOARD: ::DWORD = 0x00000004;
-pub const JOB_OBJECT_UILIMIT_SYSTEMPARAMETERS: ::DWORD = 0x00000008;
-pub const JOB_OBJECT_UILIMIT_DISPLAYSETTINGS: ::DWORD = 0x00000010;
-pub const JOB_OBJECT_UILIMIT_GLOBALATOMS: ::DWORD = 0x00000020;
-pub const JOB_OBJECT_UILIMIT_DESKTOP: ::DWORD = 0x00000040;
-pub const JOB_OBJECT_UILIMIT_EXITWINDOWS: ::DWORD = 0x00000080;
-pub const JOB_OBJECT_UILIMIT_ALL: ::DWORD = 0x000000FF;
-pub const JOB_OBJECT_UI_VALID_FLAGS: ::DWORD = 0x000000FF;
-pub const JOB_OBJECT_SECURITY_NO_ADMIN: ::DWORD = 0x00000001;
-pub const JOB_OBJECT_SECURITY_RESTRICTED_TOKEN: ::DWORD = 0x00000002;
-pub const JOB_OBJECT_SECURITY_ONLY_TOKEN: ::DWORD = 0x00000004;
-pub const JOB_OBJECT_SECURITY_FILTER_TOKENS: ::DWORD = 0x00000008;
-pub const JOB_OBJECT_SECURITY_VALID_FLAGS: ::DWORD = 0x0000000f;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_ENABLE: ::DWORD = 0x1;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_WEIGHT_BASED: ::DWORD = 0x2;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_HARD_CAP: ::DWORD = 0x4;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_NOTIFY: ::DWORD = 0x8;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_VALID_FLAGS: ::DWORD = 0xf;
-ENUM!{enum JOBOBJECTINFOCLASS {
-    JobObjectBasicAccountingInformation = 1,
-    JobObjectBasicLimitInformation,
-    JobObjectBasicProcessIdList,
-    JobObjectBasicUIRestrictions,
-    JobObjectSecurityLimitInformation,
-    JobObjectEndOfJobTimeInformation,
-    JobObjectAssociateCompletionPortInformation,
-    JobObjectBasicAndIoAccountingInformation,
-    JobObjectExtendedLimitInformation,
-    JobObjectJobSetInformation,
-    JobObjectGroupInformation,
-    JobObjectNotificationLimitInformation,
-    JobObjectLimitViolationInformation,
-    JobObjectGroupInformationEx,
-    JobObjectCpuRateControlInformation,
-    JobObjectCompletionFilter,
-    JobObjectCompletionCounter,
-    JobObjectReserved1Information = 18,
-    JobObjectReserved2Information,
-    JobObjectReserved3Information,
-    JobObjectReserved4Information,
-    JobObjectReserved5Information,
-    JobObjectReserved6Information,
-    JobObjectReserved7Information,
-    JobObjectReserved8Information,
-    JobObjectReserved9Information,
-    MaxJobObjectInfoClass,
-}}
-//12063
-pub const SECTION_QUERY: ::DWORD = 0x0001;
-pub const SECTION_MAP_WRITE: ::DWORD = 0x0002;
-pub const SECTION_MAP_READ: ::DWORD = 0x0004;
-pub const SECTION_MAP_EXECUTE: ::DWORD = 0x0008;
-pub const SECTION_EXTEND_SIZE: ::DWORD = 0x0010;
-pub const SECTION_MAP_EXECUTE_EXPLICIT: ::DWORD = 0x0020;
-pub const SECTION_ALL_ACCESS: ::DWORD = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY
-    | SECTION_MAP_WRITE | SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_EXTEND_SIZE;
-//12100
-pub const PAGE_NOACCESS: ::DWORD = 0x01;
-pub const PAGE_READONLY: ::DWORD = 0x02;
-pub const PAGE_READWRITE: ::DWORD = 0x04;
-pub const PAGE_WRITECOPY: ::DWORD = 0x08;
-pub const PAGE_EXECUTE: ::DWORD = 0x10;
-pub const PAGE_EXECUTE_READ: ::DWORD = 0x20;
-pub const PAGE_EXECUTE_READWRITE: ::DWORD = 0x40;
-pub const PAGE_EXECUTE_WRITECOPY: ::DWORD = 0x80;
-pub const PAGE_GUARD: ::DWORD = 0x100;
-pub const PAGE_NOCACHE: ::DWORD = 0x200;
-pub const PAGE_WRITECOMBINE: ::DWORD = 0x400;
-pub const PAGE_REVERT_TO_FILE_MAP: ::DWORD = 0x80000000;
-pub const PAGE_TARGETS_NO_UPDATE: ::DWORD = 0x40000000;
-pub const PAGE_TARGETS_INVALID: ::DWORD = 0x40000000;
-pub const MEM_COMMIT: ::DWORD = 0x1000;
-pub const MEM_RESERVE: ::DWORD = 0x2000;
-pub const MEM_DECOMMIT: ::DWORD = 0x4000;
-pub const MEM_RELEASE: ::DWORD = 0x8000;
-pub const MEM_FREE: ::DWORD = 0x10000;
-pub const MEM_PRIVATE: ::DWORD = 0x20000;
-pub const MEM_MAPPED: ::DWORD = 0x40000;
-pub const MEM_RESET: ::DWORD = 0x80000;
-pub const MEM_TOP_DOWN: ::DWORD = 0x100000;
-pub const MEM_WRITE_WATCH: ::DWORD = 0x200000;
-pub const MEM_PHYSICAL: ::DWORD = 0x400000;
-pub const MEM_ROTATE: ::DWORD = 0x800000;
-pub const MEM_DIFFERENT_IMAGE_BASE_OK: ::DWORD = 0x800000;
-pub const MEM_RESET_UNDO: ::DWORD = 0x1000000;
-pub const MEM_LARGE_PAGES: ::DWORD = 0x20000000;
-pub const MEM_4MB_PAGES: ::DWORD = 0x80000000;
-pub const SEC_FILE: ::DWORD = 0x800000;
-pub const SEC_IMAGE: ::DWORD = 0x1000000;
-pub const SEC_PROTECTED_IMAGE: ::DWORD = 0x2000000;
-pub const SEC_RESERVE: ::DWORD = 0x4000000;
-pub const SEC_COMMIT: ::DWORD = 0x8000000;
-pub const SEC_NOCACHE: ::DWORD = 0x10000000;
-pub const SEC_WRITECOMBINE: ::DWORD = 0x40000000;
-pub const SEC_LARGE_PAGES: ::DWORD = 0x80000000;
-pub const SEC_IMAGE_NO_EXECUTE: ::DWORD = (SEC_IMAGE | SEC_NOCACHE);
-pub const MEM_IMAGE: ::DWORD = SEC_IMAGE;
-pub const WRITE_WATCH_FLAG_RESET: ::DWORD = 0x01;
-pub const MEM_UNMAP_WITH_TRANSIENT_BOOST: ::DWORD = 0x01;
-//12217
-pub const FILE_READ_DATA: ::DWORD = 0x0001;
-pub const FILE_LIST_DIRECTORY: ::DWORD = 0x0001;
-pub const FILE_WRITE_DATA: ::DWORD = 0x0002;
-pub const FILE_ADD_FILE: ::DWORD = 0x0002;
-pub const FILE_APPEND_DATA: ::DWORD = 0x0004;
-pub const FILE_ADD_SUBDIRECTORY: ::DWORD = 0x0004;
-pub const FILE_CREATE_PIPE_INSTANCE: ::DWORD = 0x0004;
-pub const FILE_READ_EA: ::DWORD = 0x0008;
-pub const FILE_WRITE_EA: ::DWORD = 0x0010;
-pub const FILE_EXECUTE: ::DWORD = 0x0020;
-pub const FILE_TRAVERSE: ::DWORD = 0x0020;
-pub const FILE_DELETE_CHILD: ::DWORD = 0x0040;
-pub const FILE_READ_ATTRIBUTES: ::DWORD = 0x0080;
-pub const FILE_WRITE_ATTRIBUTES: ::DWORD = 0x0100;
-pub const FILE_ALL_ACCESS: ::DWORD = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF;
-pub const FILE_GENERIC_READ: ::DWORD = STANDARD_RIGHTS_READ | FILE_READ_DATA
-    | FILE_READ_ATTRIBUTES | FILE_READ_EA | SYNCHRONIZE;
-pub const FILE_GENERIC_WRITE: ::DWORD = STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA
-    | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | SYNCHRONIZE;
-pub const FILE_GENERIC_EXECUTE: ::DWORD = STANDARD_RIGHTS_EXECUTE | FILE_READ_ATTRIBUTES
-    | FILE_EXECUTE | SYNCHRONIZE;
-pub const FILE_SHARE_READ: ::DWORD = 0x00000001;
-pub const FILE_SHARE_WRITE: ::DWORD = 0x00000002;
-pub const FILE_SHARE_DELETE: ::DWORD = 0x00000004;
-pub const FILE_ATTRIBUTE_READONLY: ::DWORD = 0x00000001;
-pub const FILE_ATTRIBUTE_HIDDEN: ::DWORD = 0x00000002;
-pub const FILE_ATTRIBUTE_SYSTEM: ::DWORD = 0x00000004;
-pub const FILE_ATTRIBUTE_DIRECTORY: ::DWORD = 0x00000010;
-pub const FILE_ATTRIBUTE_ARCHIVE: ::DWORD = 0x00000020;
-pub const FILE_ATTRIBUTE_DEVICE: ::DWORD = 0x00000040;
-pub const FILE_ATTRIBUTE_NORMAL: ::DWORD = 0x00000080;
-pub const FILE_ATTRIBUTE_TEMPORARY: ::DWORD = 0x00000100;
-pub const FILE_ATTRIBUTE_SPARSE_FILE: ::DWORD = 0x00000200;
-pub const FILE_ATTRIBUTE_REPARSE_POINT: ::DWORD = 0x00000400;
-pub const FILE_ATTRIBUTE_COMPRESSED: ::DWORD = 0x00000800;
-pub const FILE_ATTRIBUTE_OFFLINE: ::DWORD = 0x00001000;
-pub const FILE_ATTRIBUTE_NOT_CONTENT_INDEXED: ::DWORD = 0x00002000;
-pub const FILE_ATTRIBUTE_ENCRYPTED: ::DWORD = 0x00004000;
-pub const FILE_ATTRIBUTE_INTEGRITY_STREAM: ::DWORD = 0x00008000;
-pub const FILE_ATTRIBUTE_VIRTUAL: ::DWORD = 0x00010000;
-pub const FILE_ATTRIBUTE_NO_SCRUB_DATA: ::DWORD = 0x00020000;
-pub const FILE_ATTRIBUTE_EA: ::DWORD = 0x00040000;
-pub const FILE_NOTIFY_CHANGE_FILE_NAME: ::DWORD = 0x00000001;
-pub const FILE_NOTIFY_CHANGE_DIR_NAME: ::DWORD = 0x00000002;
-pub const FILE_NOTIFY_CHANGE_ATTRIBUTES: ::DWORD = 0x00000004;
-pub const FILE_NOTIFY_CHANGE_SIZE: ::DWORD = 0x00000008;
-pub const FILE_NOTIFY_CHANGE_LAST_WRITE: ::DWORD = 0x00000010;
-pub const FILE_NOTIFY_CHANGE_LAST_ACCESS: ::DWORD = 0x00000020;
-pub const FILE_NOTIFY_CHANGE_CREATION: ::DWORD = 0x00000040;
-pub const FILE_NOTIFY_CHANGE_SECURITY: ::DWORD = 0x00000100;
-pub const FILE_ACTION_ADDED: ::DWORD = 0x00000001;
-pub const FILE_ACTION_REMOVED: ::DWORD = 0x00000002;
-pub const FILE_ACTION_MODIFIED: ::DWORD = 0x00000003;
-pub const FILE_ACTION_RENAMED_OLD_NAME: ::DWORD = 0x00000004;
-pub const FILE_ACTION_RENAMED_NEW_NAME: ::DWORD = 0x00000005;
-pub const MAILSLOT_NO_MESSAGE: ::DWORD = 0xFFFFFFFF;
-pub const MAILSLOT_WAIT_FOREVER: ::DWORD = 0xFFFFFFFF;
-pub const FILE_CASE_SENSITIVE_SEARCH: ::DWORD = 0x00000001;
-pub const FILE_CASE_PRESERVED_NAMES: ::DWORD = 0x00000002;
-pub const FILE_UNICODE_ON_DISK: ::DWORD = 0x00000004;
-pub const FILE_PERSISTENT_ACLS: ::DWORD = 0x00000008;
-pub const FILE_FILE_COMPRESSION: ::DWORD = 0x00000010;
-pub const FILE_VOLUME_QUOTAS: ::DWORD = 0x00000020;
-pub const FILE_SUPPORTS_SPARSE_FILES: ::DWORD = 0x00000040;
-pub const FILE_SUPPORTS_REPARSE_POINTS: ::DWORD = 0x00000080;
-pub const FILE_SUPPORTS_REMOTE_STORAGE: ::DWORD = 0x00000100;
-pub const FILE_VOLUME_IS_COMPRESSED: ::DWORD = 0x00008000;
-pub const FILE_SUPPORTS_OBJECT_IDS: ::DWORD = 0x00010000;
-pub const FILE_SUPPORTS_ENCRYPTION: ::DWORD = 0x00020000;
-pub const FILE_NAMED_STREAMS: ::DWORD = 0x00040000;
-pub const FILE_READ_ONLY_VOLUME: ::DWORD = 0x00080000;
-pub const FILE_SEQUENTIAL_WRITE_ONCE: ::DWORD = 0x00100000;
-pub const FILE_SUPPORTS_TRANSACTIONS: ::DWORD = 0x00200000;
-pub const FILE_SUPPORTS_HARD_LINKS: ::DWORD = 0x00400000;
-pub const FILE_SUPPORTS_EXTENDED_ATTRIBUTES: ::DWORD = 0x00800000;
-pub const FILE_SUPPORTS_OPEN_BY_FILE_ID: ::DWORD = 0x01000000;
-pub const FILE_SUPPORTS_USN_JOURNAL: ::DWORD = 0x02000000;
-pub const FILE_SUPPORTS_INTEGRITY_STREAMS: ::DWORD = 0x04000000;
-pub const FILE_INVALID_FILE_ID: ::LONGLONG = -1;
-STRUCT!{struct FILE_ID_128 {
-    Identifier: [::BYTE; 16],
-}}
-pub type PFILE_ID_128 = *mut FILE_ID_128;
-STRUCT!{struct FILE_NOTIFY_INFORMATION {
-    NextEntryOffset: ::DWORD,
-    Action: ::DWORD,
-    FileNameLength: ::DWORD,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_SEGMENT_ELEMENT {
-    Buffer: ::PVOID64,
-    Alignment: ::ULONGLONG,
-}}
-pub type PFILE_SEGMENT_ELEMENT = *mut FILE_SEGMENT_ELEMENT;
-//12475
-pub const IO_REPARSE_TAG_MOUNT_POINT: ::DWORD = 0xA0000003;
-pub const IO_REPARSE_TAG_HSM: ::DWORD = 0xC0000004;
-pub const IO_REPARSE_TAG_HSM2: ::DWORD = 0x80000006;
-pub const IO_REPARSE_TAG_SIS: ::DWORD = 0x80000007;
-pub const IO_REPARSE_TAG_WIM: ::DWORD = 0x80000008;
-pub const IO_REPARSE_TAG_CSV: ::DWORD = 0x80000009;
-pub const IO_REPARSE_TAG_DFS: ::DWORD = 0x8000000A;
-pub const IO_REPARSE_TAG_SYMLINK: ::DWORD = 0xA000000C;
-pub const IO_REPARSE_TAG_DFSR: ::DWORD = 0x80000012;
-pub const IO_REPARSE_TAG_DEDUP: ::DWORD = 0x80000013;
-pub const IO_REPARSE_TAG_NFS: ::DWORD = 0x80000014;
-pub const IO_REPARSE_TAG_FILE_PLACEHOLDER: ::DWORD = 0x80000015;
-pub const IO_REPARSE_TAG_WOF: ::DWORD = 0x80000017;
-//12788
-pub const DUPLICATE_CLOSE_SOURCE: ::DWORD = 0x00000001;
-pub const DUPLICATE_SAME_ACCESS: ::DWORD = 0x00000002;
-//14708
-STRUCT!{struct PROCESSOR_POWER_POLICY_INFO {
-    TimeCheck: ::DWORD,
-    DemoteLimit: ::DWORD,
-    PromoteLimit: ::DWORD,
-    DemotePercent: ::BYTE,
-    PromotePercent: ::BYTE,
-    Spare: [::BYTE; 2],
-    Reserved: ::DWORD,
-}}
-BITFIELD!(PROCESSOR_POWER_POLICY_INFO Reserved: ::DWORD [
-    AllowDemotion set_AllowDemotion[0..1],
-    AllowPromotion set_AllowPromotion[1..2],
-]);
-pub type PPROCESSOR_POWER_POLICY_INFO = *mut PROCESSOR_POWER_POLICY_INFO;
-//15000
-STRUCT!{struct IMAGE_FILE_HEADER {
-    Machine: ::WORD,
-    NumberOfSections: ::WORD,
-    TimeDateStamp: ::DWORD,
-    PointerToSymbolTable: ::DWORD,
-    NumberOfSymbols: ::DWORD,
-    SizeOfOptionalHeader: ::WORD,
-    Characteristics: ::WORD,
-}}
-pub type PIMAGE_FILE_HEADER = *mut IMAGE_FILE_HEADER;
-pub const IMAGE_SIZEOF_FILE_HEADER: usize = 20;
-pub const IMAGE_FILE_RELOCS_STRIPPED: ::WORD = 0x0001;
-pub const IMAGE_FILE_EXECUTABLE_IMAGE: ::WORD = 0x0002;
-pub const IMAGE_FILE_LINE_NUMS_STRIPPED: ::WORD = 0x0004;
-pub const IMAGE_FILE_LOCAL_SYMS_STRIPPED: ::WORD = 0x0008;
-pub const IMAGE_FILE_AGGRESIVE_WS_TRIM: ::WORD = 0x0010;
-pub const IMAGE_FILE_LARGE_ADDRESS_AWARE: ::WORD = 0x0020;
-pub const IMAGE_FILE_BYTES_REVERSED_LO: ::WORD = 0x0080;
-pub const IMAGE_FILE_32BIT_MACHINE: ::WORD = 0x0100;
-pub const IMAGE_FILE_DEBUG_STRIPPED: ::WORD = 0x0200;
-pub const IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP: ::WORD = 0x0400;
-pub const IMAGE_FILE_NET_RUN_FROM_SWAP: ::WORD = 0x0800;
-pub const IMAGE_FILE_SYSTEM: ::WORD = 0x1000;
-pub const IMAGE_FILE_DLL: ::WORD = 0x2000;
-pub const IMAGE_FILE_UP_SYSTEM_ONLY: ::WORD = 0x4000;
-pub const IMAGE_FILE_BYTES_REVERSED_HI: ::WORD = 0x8000;
-pub const IMAGE_FILE_MACHINE_UNKNOWN: ::WORD = 0;
-pub const IMAGE_FILE_MACHINE_I386: ::WORD = 0x014c;
-pub const IMAGE_FILE_MACHINE_R3000: ::WORD = 0x0162;
-pub const IMAGE_FILE_MACHINE_R4000: ::WORD = 0x0166;
-pub const IMAGE_FILE_MACHINE_R10000: ::WORD = 0x0168;
-pub const IMAGE_FILE_MACHINE_WCEMIPSV2: ::WORD = 0x0169;
-pub const IMAGE_FILE_MACHINE_ALPHA: ::WORD = 0x0184;
-pub const IMAGE_FILE_MACHINE_SH3: ::WORD = 0x01a2;
-pub const IMAGE_FILE_MACHINE_SH3DSP: ::WORD = 0x01a3;
-pub const IMAGE_FILE_MACHINE_SH3E: ::WORD = 0x01a4;
-pub const IMAGE_FILE_MACHINE_SH4: ::WORD = 0x01a6;
-pub const IMAGE_FILE_MACHINE_SH5: ::WORD = 0x01a8;
-pub const IMAGE_FILE_MACHINE_ARM: ::WORD = 0x01c0;
-pub const IMAGE_FILE_MACHINE_THUMB: ::WORD = 0x01c2;
-pub const IMAGE_FILE_MACHINE_ARMNT: ::WORD = 0x01c4;
-pub const IMAGE_FILE_MACHINE_AM33: ::WORD = 0x01d3;
-pub const IMAGE_FILE_MACHINE_POWERPC: ::WORD = 0x01F0;
-pub const IMAGE_FILE_MACHINE_POWERPCFP: ::WORD = 0x01f1;
-pub const IMAGE_FILE_MACHINE_IA64: ::WORD = 0x0200;
-pub const IMAGE_FILE_MACHINE_MIPS16: ::WORD = 0x0266;
-pub const IMAGE_FILE_MACHINE_ALPHA64: ::WORD = 0x0284;
-pub const IMAGE_FILE_MACHINE_MIPSFPU: ::WORD = 0x0366;
-pub const IMAGE_FILE_MACHINE_MIPSFPU16: ::WORD = 0x0466;
-pub const IMAGE_FILE_MACHINE_AXP64: ::WORD = IMAGE_FILE_MACHINE_ALPHA64;
-pub const IMAGE_FILE_MACHINE_TRICORE: ::WORD = 0x0520;
-pub const IMAGE_FILE_MACHINE_CEF: ::WORD = 0x0CEF;
-pub const IMAGE_FILE_MACHINE_EBC: ::WORD = 0x0EBC;
-pub const IMAGE_FILE_MACHINE_AMD64: ::WORD = 0x8664;
-pub const IMAGE_FILE_MACHINE_M32R: ::WORD = 0x9041;
-pub const IMAGE_FILE_MACHINE_CEE: ::WORD = 0xC0EE;
-STRUCT!{struct IMAGE_DATA_DIRECTORY {
-    VirtualAddress: ::DWORD,
-    Size: ::DWORD,
-}}
-pub type PIMAGE_DATA_DIRECTORY = *mut IMAGE_DATA_DIRECTORY;
-pub const IMAGE_NUMBEROF_DIRECTORY_ENTRIES: usize = 16;
-STRUCT!{struct IMAGE_OPTIONAL_HEADER32 {
-    Magic: ::WORD,
-    MajorLinkerVersion: ::BYTE,
-    MinorLinkerVersion: ::BYTE,
-    SizeOfCode: ::DWORD,
-    SizeOfInitializedData: ::DWORD,
-    SizeOfUninitializedData: ::DWORD,
-    AddressOfEntryPoint: ::DWORD,
-    BaseOfCode: ::DWORD,
-    BaseOfData: ::DWORD,
-    ImageBase: ::DWORD,
-    SectionAlignment: ::DWORD,
-    FileAlignment: ::DWORD,
-    MajorOperatingSystemVersion: ::WORD,
-    MinorOperatingSystemVersion: ::WORD,
-    MajorImageVersion: ::WORD,
-    MinorImageVersion: ::WORD,
-    MajorSubsystemVersion: ::WORD,
-    MinorSubsystemVersion: ::WORD,
-    Win32VersionValue: ::DWORD,
-    SizeOfImage: ::DWORD,
-    SizeOfHeaders: ::DWORD,
-    CheckSum: ::DWORD,
-    Subsystem: ::WORD,
-    DllCharacteristics: ::WORD,
-    SizeOfStackReserve: ::DWORD,
-    SizeOfStackCommit: ::DWORD,
-    SizeOfHeapReserve: ::DWORD,
-    SizeOfHeapCommit: ::DWORD,
-    LoaderFlags: ::DWORD,
-    NumberOfRvaAndSizes: ::DWORD,
-    DataDirectory: [IMAGE_DATA_DIRECTORY; IMAGE_NUMBEROF_DIRECTORY_ENTRIES],
-}}
-pub type PIMAGE_OPTIONAL_HEADER32 = *mut IMAGE_OPTIONAL_HEADER32;
-STRUCT!{struct IMAGE_ROM_OPTIONAL_HEADER {
-    Magic: ::WORD,
-    MajorLinkerVersion: ::BYTE,
-    MinorLinkerVersion: ::BYTE,
-    SizeOfCode: ::DWORD,
-    SizeOfInitializedData: ::DWORD,
-    SizeOfUninitializedData: ::DWORD,
-    AddressOfEntryPoint: ::DWORD,
-    BaseOfCode: ::DWORD,
-    BaseOfData: ::DWORD,
-    BaseOfBss: ::DWORD,
-    GprMask: ::DWORD,
-    CprMask: [::DWORD; 4],
-    GpValue: ::DWORD,
-}}
-pub type PIMAGE_ROM_OPTIONAL_HEADER = *mut IMAGE_ROM_OPTIONAL_HEADER;
-STRUCT!{struct IMAGE_OPTIONAL_HEADER64 {
-    Magic: ::WORD,
-    MajorLinkerVersion: ::BYTE,
-    MinorLinkerVersion: ::BYTE,
-    SizeOfCode: ::DWORD,
-    SizeOfInitializedData: ::DWORD,
-    SizeOfUninitializedData: ::DWORD,
-    AddressOfEntryPoint: ::DWORD,
-    BaseOfCode: ::DWORD,
-    ImageBase: ::ULONGLONG,
-    SectionAlignment: ::DWORD,
-    FileAlignment: ::DWORD,
-    MajorOperatingSystemVersion: ::WORD,
-    MinorOperatingSystemVersion: ::WORD,
-    MajorImageVersion: ::WORD,
-    MinorImageVersion: ::WORD,
-    MajorSubsystemVersion: ::WORD,
-    MinorSubsystemVersion: ::WORD,
-    Win32VersionValue: ::DWORD,
-    SizeOfImage: ::DWORD,
-    SizeOfHeaders: ::DWORD,
-    CheckSum: ::DWORD,
-    Subsystem: ::WORD,
-    DllCharacteristics: ::WORD,
-    SizeOfStackReserve: ULONGLONG,
-    SizeOfStackCommit: ULONGLONG,
-    SizeOfHeapReserve: ULONGLONG,
-    SizeOfHeapCommit: ULONGLONG,
-    LoaderFlags: ::DWORD,
-    NumberOfRvaAndSizes: ::DWORD,
-    DataDirectory: [IMAGE_DATA_DIRECTORY; IMAGE_NUMBEROF_DIRECTORY_ENTRIES],
-}}
-pub type PIMAGE_OPTIONAL_HEADER64 = *mut IMAGE_OPTIONAL_HEADER64;
-pub const IMAGE_NT_OPTIONAL_HDR32_MAGIC: ::WORD = 0x10b;
-pub const IMAGE_NT_OPTIONAL_HDR64_MAGIC: ::WORD = 0x20b;
-pub const IMAGE_ROM_OPTIONAL_HDR_MAGIC: ::WORD = 0x107;
-#[cfg(target_arch = "x86_64")]
-pub type IMAGE_OPTIONAL_HEADER = IMAGE_OPTIONAL_HEADER64;
-#[cfg(target_arch = "x86_64")]
-pub type PIMAGE_OPTIONAL_HEADER = PIMAGE_OPTIONAL_HEADER64;
-#[cfg(target_arch = "x86")]
-pub type IMAGE_OPTIONAL_HEADER = IMAGE_OPTIONAL_HEADER32;
-#[cfg(target_arch = "x86")]
-pub type PIMAGE_OPTIONAL_HEADER = PIMAGE_OPTIONAL_HEADER32;
-STRUCT!{struct IMAGE_NT_HEADERS64 {
-    Signature: ::DWORD,
-    FileHeader: IMAGE_FILE_HEADER,
-    OptionalHeader: IMAGE_OPTIONAL_HEADER64,
-}}
-pub type PIMAGE_NT_HEADERS64 = *mut IMAGE_NT_HEADERS64;
-STRUCT!{struct IMAGE_NT_HEADERS32 {
-    Signature: ::DWORD,
-    FileHeader: IMAGE_FILE_HEADER,
-    OptionalHeader: IMAGE_OPTIONAL_HEADER32,
-}}
-pub type PIMAGE_NT_HEADERS32 = *mut IMAGE_NT_HEADERS32;
-STRUCT!{struct IMAGE_ROM_HEADERS {
-    FileHeader: IMAGE_FILE_HEADER,
-    OptionalHeader: IMAGE_ROM_OPTIONAL_HEADER,
-}}
-pub type PIMAGE_ROM_HEADERS = *mut IMAGE_ROM_HEADERS;
-#[cfg(target_arch = "x86_64")]
-pub type IMAGE_NT_HEADERS = IMAGE_NT_HEADERS64;
-#[cfg(target_arch = "x86_64")]
-pub type PIMAGE_NT_HEADERS = PIMAGE_NT_HEADERS64;
-#[cfg(target_arch = "x86")]
-pub type IMAGE_NT_HEADERS = IMAGE_NT_HEADERS32;
-#[cfg(target_arch = "x86")]
-pub type PIMAGE_NT_HEADERS = PIMAGE_NT_HEADERS32;
-pub const IMAGE_SUBSYSTEM_UNKNOWN: ::WORD = 0;
-pub const IMAGE_SUBSYSTEM_NATIVE: ::WORD = 1;
-pub const IMAGE_SUBSYSTEM_WINDOWS_GUI: ::WORD = 2;
-pub const IMAGE_SUBSYSTEM_WINDOWS_CUI: ::WORD = 3;
-pub const IMAGE_SUBSYSTEM_OS2_CUI: ::WORD = 5;
-pub const IMAGE_SUBSYSTEM_POSIX_CUI: ::WORD = 7;
-pub const IMAGE_SUBSYSTEM_NATIVE_WINDOWS: ::WORD = 8;
-pub const IMAGE_SUBSYSTEM_WINDOWS_CE_GUI: ::WORD = 9;
-pub const IMAGE_SUBSYSTEM_EFI_APPLICATION: ::WORD = 10;
-pub const IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER: ::WORD = 11;
-pub const IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: ::WORD = 12;
-pub const IMAGE_SUBSYSTEM_EFI_ROM: ::WORD = 13;
-pub const IMAGE_SUBSYSTEM_XBOX: ::WORD = 14;
-pub const IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION: ::WORD = 16;
-pub const IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA: ::WORD = 0x0020;
-pub const IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE: ::WORD = 0x0040;
-pub const IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY: ::WORD = 0x0080;
-pub const IMAGE_DLLCHARACTERISTICS_NX_COMPAT: ::WORD = 0x0100;
-pub const IMAGE_DLLCHARACTERISTICS_NO_ISOLATION: ::WORD = 0x0200;
-pub const IMAGE_DLLCHARACTERISTICS_NO_SEH: ::WORD = 0x0400;
-pub const IMAGE_DLLCHARACTERISTICS_NO_BIND: ::WORD = 0x0800;
-pub const IMAGE_DLLCHARACTERISTICS_APPCONTAINER: ::WORD = 0x1000;
-pub const IMAGE_DLLCHARACTERISTICS_WDM_DRIVER: ::WORD = 0x2000;
-pub const IMAGE_DLLCHARACTERISTICS_GUARD_CF: ::WORD = 0x4000;
-pub const IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE: ::WORD = 0x8000;
-pub const IMAGE_DIRECTORY_ENTRY_EXPORT: ::WORD = 0;
-pub const IMAGE_DIRECTORY_ENTRY_IMPORT: ::WORD = 1;
-pub const IMAGE_DIRECTORY_ENTRY_RESOURCE: ::WORD = 2;
-pub const IMAGE_DIRECTORY_ENTRY_EXCEPTION: ::WORD = 3;
-pub const IMAGE_DIRECTORY_ENTRY_SECURITY: ::WORD = 4;
-pub const IMAGE_DIRECTORY_ENTRY_BASERELOC: ::WORD = 5;
-pub const IMAGE_DIRECTORY_ENTRY_DEBUG: ::WORD = 6;
-pub const IMAGE_DIRECTORY_ENTRY_ARCHITECTURE: ::WORD = 7;
-pub const IMAGE_DIRECTORY_ENTRY_GLOBALPTR: ::WORD = 8;
-pub const IMAGE_DIRECTORY_ENTRY_TLS: ::WORD = 9;
-pub const IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG: ::WORD = 10;
-pub const IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT: ::WORD = 11;
-pub const IMAGE_DIRECTORY_ENTRY_IAT: ::WORD = 12;
-pub const IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT: ::WORD = 13;
-pub const IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR: ::WORD = 14;
-STRUCT!{struct ANON_OBJECT_HEADER {
-    Sig1: ::WORD,
-    Sig2: ::WORD,
-    Version: ::WORD,
-    Machine: ::WORD,
-    TimeDateStamp: ::DWORD,
-    ClassID: ::CLSID,
-    SizeOfData: ::DWORD,
-}}
-STRUCT!{struct ANON_OBJECT_HEADER_V2 {
-    Sig1: ::WORD,
-    Sig2: ::WORD,
-    Version: ::WORD,
-    Machine: ::WORD,
-    TimeDateStamp: ::DWORD,
-    ClassID: ::CLSID,
-    SizeOfData: ::DWORD,
-    Flags: ::DWORD,
-    MetaDataSize: ::DWORD,
-    MetaDataOffset: ::DWORD,
-}}
-STRUCT!{struct ANON_OBJECT_HEADER_BIGOBJ {
-    Sig1: ::WORD,
-    Sig2: ::WORD,
-    Version: ::WORD,
-    Machine: ::WORD,
-    TimeDateStamp: ::DWORD,
-    ClassID: ::CLSID,
-    SizeOfData: ::DWORD,
-    Flags: ::DWORD,
-    MetaDataSize: ::DWORD,
-    MetaDataOffset: ::DWORD,
-    NumberOfSections: ::DWORD,
-    PointerToSymbolTable: ::DWORD,
-    NumberOfSymbols: ::DWORD,
-}}
-pub const IMAGE_SIZEOF_SHORT_NAME: usize = 8;
-STRUCT!{struct IMAGE_SECTION_HEADER {
-    Name: [::BYTE; IMAGE_SIZEOF_SHORT_NAME],
-    PhysicalAddressOrVirtualSize: ::DWORD,
-    VirtualAddress: ::DWORD,
-    SizeOfRawData: ::DWORD,
-    PointerToRawData: ::DWORD,
-    PointerToRelocations: ::DWORD,
-    PointerToLinenumbers: ::DWORD,
-    NumberOfRelocations: ::WORD,
-    NumberOfLinenumbers: ::WORD,
-    Characteristics: ::DWORD,
-}}
-pub type PIMAGE_SECTION_HEADER = *mut IMAGE_SECTION_HEADER;
-pub const IMAGE_SIZEOF_SECTION_HEADER: usize = 40;
-pub const IMAGE_SCN_TYPE_NO_PAD: ::DWORD = 0x00000008;
-pub const IMAGE_SCN_CNT_CODE: ::DWORD = 0x00000020;
-pub const IMAGE_SCN_CNT_INITIALIZED_DATA: ::DWORD = 0x00000040;
-pub const IMAGE_SCN_CNT_UNINITIALIZED_DATA: ::DWORD = 0x00000080;
-pub const IMAGE_SCN_LNK_OTHER: ::DWORD = 0x00000100;
-pub const IMAGE_SCN_LNK_INFO: ::DWORD = 0x00000200;
-pub const IMAGE_SCN_LNK_REMOVE: ::DWORD = 0x00000800;
-pub const IMAGE_SCN_LNK_COMDAT: ::DWORD = 0x00001000;
-pub const IMAGE_SCN_NO_DEFER_SPEC_EXC: ::DWORD = 0x00004000;
-pub const IMAGE_SCN_GPREL: ::DWORD = 0x00008000;
-pub const IMAGE_SCN_MEM_FARDATA: ::DWORD = 0x00008000;
-pub const IMAGE_SCN_MEM_PURGEABLE: ::DWORD = 0x00020000;
-pub const IMAGE_SCN_MEM_16BIT: ::DWORD = 0x00020000;
-pub const IMAGE_SCN_MEM_LOCKED: ::DWORD = 0x00040000;
-pub const IMAGE_SCN_MEM_PRELOAD: ::DWORD = 0x00080000;
-pub const IMAGE_SCN_ALIGN_1BYTES: ::DWORD = 0x00100000;
-pub const IMAGE_SCN_ALIGN_2BYTES: ::DWORD = 0x00200000;
-pub const IMAGE_SCN_ALIGN_4BYTES: ::DWORD = 0x00300000;
-pub const IMAGE_SCN_ALIGN_8BYTES: ::DWORD = 0x00400000;
-pub const IMAGE_SCN_ALIGN_16BYTES: ::DWORD = 0x00500000;
-pub const IMAGE_SCN_ALIGN_32BYTES: ::DWORD = 0x00600000;
-pub const IMAGE_SCN_ALIGN_64BYTES: ::DWORD = 0x00700000;
-pub const IMAGE_SCN_ALIGN_128BYTES: ::DWORD = 0x00800000;
-pub const IMAGE_SCN_ALIGN_256BYTES: ::DWORD = 0x00900000;
-pub const IMAGE_SCN_ALIGN_512BYTES: ::DWORD = 0x00A00000;
-pub const IMAGE_SCN_ALIGN_1024BYTES: ::DWORD = 0x00B00000;
-pub const IMAGE_SCN_ALIGN_2048BYTES: ::DWORD = 0x00C00000;
-pub const IMAGE_SCN_ALIGN_4096BYTES: ::DWORD = 0x00D00000;
-pub const IMAGE_SCN_ALIGN_8192BYTES: ::DWORD = 0x00E00000;
-pub const IMAGE_SCN_ALIGN_MASK: ::DWORD = 0x00F00000;
-pub const IMAGE_SCN_LNK_NRELOC_OVFL: ::DWORD = 0x01000000;
-pub const IMAGE_SCN_MEM_DISCARDABLE: ::DWORD = 0x02000000;
-pub const IMAGE_SCN_MEM_NOT_CACHED: ::DWORD = 0x04000000;
-pub const IMAGE_SCN_MEM_NOT_PAGED: ::DWORD = 0x08000000;
-pub const IMAGE_SCN_MEM_SHARED: ::DWORD = 0x10000000;
-pub const IMAGE_SCN_MEM_EXECUTE: ::DWORD = 0x20000000;
-pub const IMAGE_SCN_MEM_READ: ::DWORD = 0x40000000;
-pub const IMAGE_SCN_MEM_WRITE: ::DWORD = 0x80000000;
-pub const IMAGE_SCN_SCALE_INDEX: ::DWORD = 0x00000001;
-//16590
-STRUCT!{struct IMAGE_DEBUG_DIRECTORY {
-    Characteristics: ::DWORD,
-    TimeDateStamp: ::DWORD,
-    MajorVersion: ::WORD,
-    MinorVersion: ::WORD,
-    Type: ::DWORD,
-    SizeOfData: ::DWORD,
-    AddressOfRawData: ::DWORD,
-    PointerToRawData: ::DWORD,
-}}
-pub type PIMAGE_DEBUG_DIRECTORY = *mut IMAGE_DEBUG_DIRECTORY;
-pub const IMAGE_DEBUG_TYPE_UNKNOWN: ::DWORD = 0;
-pub const IMAGE_DEBUG_TYPE_COFF: ::DWORD = 1;
-pub const IMAGE_DEBUG_TYPE_CODEVIEW: ::DWORD = 2;
-pub const IMAGE_DEBUG_TYPE_FPO: ::DWORD = 3;
-pub const IMAGE_DEBUG_TYPE_MISC: ::DWORD = 4;
-pub const IMAGE_DEBUG_TYPE_EXCEPTION: ::DWORD = 5;
-pub const IMAGE_DEBUG_TYPE_FIXUP: ::DWORD = 6;
-pub const IMAGE_DEBUG_TYPE_OMAP_TO_SRC: ::DWORD = 7;
-pub const IMAGE_DEBUG_TYPE_OMAP_FROM_SRC: ::DWORD = 8;
-pub const IMAGE_DEBUG_TYPE_BORLAND: ::DWORD = 9;
-pub const IMAGE_DEBUG_TYPE_RESERVED10: ::DWORD = 10;
-pub const IMAGE_DEBUG_TYPE_CLSID: ::DWORD = 11;
-STRUCT!{struct IMAGE_COFF_SYMBOLS_HEADER {
-    NumberOfSymbols: ::DWORD,
-    LvaToFirstSymbol: ::DWORD,
-    NumberOfLinenumbers: ::DWORD,
-    LvaToFirstLinenumber: ::DWORD,
-    RvaToFirstByteOfCode: ::DWORD,
-    RvaToLastByteOfCode: ::DWORD,
-    RvaToFirstByteOfData: ::DWORD,
-    RvaToLastByteOfData: ::DWORD,
-}}
-pub type PIMAGE_COFF_SYMBOLS_HEADER = *mut IMAGE_COFF_SYMBOLS_HEADER;
-STRUCT!{struct IMAGE_RUNTIME_FUNCTION_ENTRY {
-    BeginAddress: ::DWORD,
-    EndAddress: ::DWORD,
-    UnwindInfoAddress: ::DWORD,
-}}
-UNION!(IMAGE_RUNTIME_FUNCTION_ENTRY, UnwindInfoAddress, UnwindData, UnwindData_mut, ::DWORD);
-pub type PIMAGE_RUNTIME_FUNCTION_ENTRY = *mut IMAGE_RUNTIME_FUNCTION_ENTRY;
-pub const FRAME_FPO: ::WORD = 0;
-pub const FRAME_TRAP: ::WORD = 1;
-pub const FRAME_TSS: ::WORD = 2;
-pub const FRAME_NONFPO: ::WORD = 3;
-STRUCT!{struct FPO_DATA {
-    ulOffStart: ::DWORD,
-    cbProcSize: ::DWORD,
-    cdwLocals: ::DWORD,
-    cdwParams: ::WORD,
-    bitfield: ::WORD,
-}}
-pub type PFPO_DATA = *mut FPO_DATA;
-pub const SIZEOF_RFPO_DATA: usize = 16;
-pub const IMAGE_DEBUG_MISC_EXENAME: ::DWORD = 1;
-STRUCT!{struct IMAGE_DEBUG_MISC {
-    DataType: ::DWORD,
-    Length: ::DWORD,
-    Unicode: ::BOOLEAN,
-    Reserved: [::BYTE; 3],
-    Data: [::BYTE; 0],
-}}
-pub type PIMAGE_DEBUG_MISC = *mut IMAGE_DEBUG_MISC;
-STRUCT!{struct IMAGE_FUNCTION_ENTRY {
-    StartingAddress: ::DWORD,
-    EndingAddress: ::DWORD,
-    EndOfPrologue: ::DWORD,
-}}
-pub type PIMAGE_FUNCTION_ENTRY = *mut IMAGE_FUNCTION_ENTRY;
-STRUCT!{struct IMAGE_FUNCTION_ENTRY64 {
-    StartingAddress: ::ULONGLONG,
-    EndingAddress: ::ULONGLONG,
-    EndOfPrologueOrUnwindInfoAddress: ::ULONGLONG,
-}}
-pub type PIMAGE_FUNCTION_ENTRY64 = *mut IMAGE_FUNCTION_ENTRY64;
-//18245
-pub const HEAP_NO_SERIALIZE: ::DWORD = 0x00000001;
-pub const HEAP_GROWABLE: ::DWORD = 0x00000002;
-pub const HEAP_GENERATE_EXCEPTIONS: ::DWORD = 0x00000004;
-pub const HEAP_ZERO_MEMORY: ::DWORD = 0x00000008;
-pub const HEAP_REALLOC_IN_PLACE_ONLY: ::DWORD = 0x00000010;
-pub const HEAP_TAIL_CHECKING_ENABLED: ::DWORD = 0x00000020;
-pub const HEAP_FREE_CHECKING_ENABLED: ::DWORD = 0x00000040;
-pub const HEAP_DISABLE_COALESCE_ON_FREE: ::DWORD = 0x00000080;
-pub const HEAP_CREATE_ALIGN_16: ::DWORD = 0x00010000;
-pub const HEAP_CREATE_ENABLE_TRACING: ::DWORD = 0x00020000;
-pub const HEAP_CREATE_ENABLE_EXECUTE: ::DWORD = 0x00040000;
-pub const HEAP_MAXIMUM_TAG: ::DWORD = 0x0FFF;
-pub const HEAP_PSEUDO_TAG_FLAG: ::DWORD = 0x8000;
-pub const HEAP_TAG_SHIFT: ::DWORD = 18;
-//18145
-STRUCT!{struct RTL_CRITICAL_SECTION_DEBUG {
-    Type: ::WORD,
-    CreatorBackTraceIndex: ::WORD,
-    CriticalSection: *mut ::RTL_CRITICAL_SECTION,
-    ProcessLocksList: ::LIST_ENTRY,
-    EntryCount: ::DWORD,
-    ContentionCount: ::DWORD,
-    Flags: ::DWORD,
-    CreatorBackTraceIndexHigh: ::WORD,
-    SpareWORD: ::WORD,
-}}
-pub type PRTL_CRITICAL_SECTION_DEBUG = *mut RTL_CRITICAL_SECTION_DEBUG;
-pub type RTL_RESOURCE_DEBUG = RTL_CRITICAL_SECTION_DEBUG;
-pub type PRTL_RESOURCE_DEBUG = *mut RTL_CRITICAL_SECTION_DEBUG;
-pub const RTL_CRITSECT_TYPE: ::WORD = 0;
-pub const RTL_RESOURCE_TYPE: ::WORD = 1;
-pub const RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO: ::ULONG_PTR = 0x01000000;
-pub const RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN: ::ULONG_PTR = 0x02000000;
-pub const RTL_CRITICAL_SECTION_FLAG_STATIC_INIT: ::ULONG_PTR = 0x04000000;
-pub const RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE: ::ULONG_PTR = 0x08000000;
-pub const RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO: ::ULONG_PTR = 0x10000000;
-pub const RTL_CRITICAL_SECTION_ALL_FLAG_BITS: ::ULONG_PTR = 0xFF000000;
-pub const RTL_CRITICAL_SECTION_FLAG_RESERVED: ::ULONG_PTR = RTL_CRITICAL_SECTION_ALL_FLAG_BITS & !(RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO | RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN | RTL_CRITICAL_SECTION_FLAG_STATIC_INIT | RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE | RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
-pub const RTL_CRITICAL_SECTION_DEBUG_FLAG_STATIC_INIT: ::DWORD = 0x00000001;
-STRUCT!{struct RTL_CRITICAL_SECTION {
-    DebugInfo: ::PRTL_CRITICAL_SECTION_DEBUG,
-    LockCount: ::LONG,
-    RecursionCount: ::LONG,
-    OwningThread: ::HANDLE,
-    LockSemaphore: ::HANDLE,
-    SpinCount: ::ULONG_PTR,
-}}
-pub type PRTL_CRITICAL_SECTION = *mut RTL_CRITICAL_SECTION;
-STRUCT!{struct RTL_SRWLOCK {
-    Ptr: ::PVOID,
-}}
-pub type PRTL_SRWLOCK = *mut RTL_SRWLOCK;
-pub const RTL_SRWLOCK_INIT: RTL_SRWLOCK = RTL_SRWLOCK { Ptr: 0 as PVOID };
-STRUCT!{struct RTL_CONDITION_VARIABLE {
-    Ptr: ::PVOID,
-}}
-pub type PRTL_CONDITION_VARIABLE = *mut RTL_CONDITION_VARIABLE;
-pub const RTL_CONDITION_VARIABLE_INIT: RTL_CONDITION_VARIABLE = RTL_CONDITION_VARIABLE {
-    Ptr: 0 as PVOID
-};
-//18204
-pub type PAPCFUNC = Option<unsafe extern "system" fn(Parameter: ::ULONG_PTR)>;
-pub type PVECTORED_EXCEPTION_HANDLER = Option<unsafe extern "system" fn(
-    ExceptionInfo: *mut EXCEPTION_POINTERS,
-) -> ::LONG>;
-ENUM!{enum HEAP_INFORMATION_CLASS {
-    HeapCompatibilityInformation = 0,
-    HeapEnableTerminationOnCorruption = 1,
-    HeapOptimizeResources = 3,
-}}
-//pub use self::HEAP_INFORMATION_CLASS::*;
-pub const HEAP_OPTIMIZE_RESOURCES_CURRENT_VERSION: ::DWORD = 1;
-STRUCT!{struct HEAP_OPTIMIZE_RESOURCES_INFORMATION {
-    Version: ::DWORD,
-    Flags: ::DWORD,
-}}
-pub type PHEAP_OPTIMIZE_RESOURCES_INFORMATION = *mut HEAP_OPTIMIZE_RESOURCES_INFORMATION;
-pub const WT_EXECUTEDEFAULT: ::ULONG = 0x00000000;
-pub const WT_EXECUTEINIOTHREAD: ::ULONG = 0x00000001;
-pub const WT_EXECUTEINUITHREAD: ::ULONG = 0x00000002;
-pub const WT_EXECUTEINWAITTHREAD: ::ULONG = 0x00000004;
-pub const WT_EXECUTEONLYONCE: ::ULONG = 0x00000008;
-pub const WT_EXECUTEINTIMERTHREAD: ::ULONG = 0x00000020;
-pub const WT_EXECUTELONGFUNCTION: ::ULONG = 0x00000010;
-pub const WT_EXECUTEINPERSISTENTIOTHREAD: ::ULONG = 0x00000040;
-pub const WT_EXECUTEINPERSISTENTTHREAD: ::ULONG = 0x00000080;
-pub const WT_TRANSFER_IMPERSONATION: ::ULONG = 0x00000100;
-pub type WAITORTIMERCALLBACKFUNC = Option<unsafe extern "system" fn(::PVOID, ::BOOLEAN)>;
-pub type WORKERCALLBACKFUNC = Option<unsafe extern "system" fn(::PVOID)>;
-pub type APC_CALLBACK_FUNCTION = Option<unsafe extern "system" fn(::DWORD, ::PVOID, ::PVOID)>;
-pub type WAITORTIMERCALLBACK = WAITORTIMERCALLBACKFUNC;
-pub type PFLS_CALLBACK_FUNCTION = Option<unsafe extern "system" fn(lpFlsData: ::PVOID)>;
-pub type PSECURE_MEMORY_CACHE_CALLBACK = Option<unsafe extern "system" fn(
-    Addr: ::PVOID, Range: ::SIZE_T,
-) -> ::BOOLEAN>;
-pub const WT_EXECUTEINLONGTHREAD: ::ULONG = 0x00000010;
-pub const WT_EXECUTEDELETEWAIT: ::ULONG = 0x00000008;
-//18570
-pub const KEY_QUERY_VALUE: ::REGSAM = 0x0001;
-pub const KEY_SET_VALUE: ::REGSAM = 0x0002;
-pub const KEY_CREATE_SUB_KEY: ::REGSAM = 0x0004;
-pub const KEY_ENUMERATE_SUB_KEYS: ::REGSAM = 0x0008;
-pub const KEY_NOTIFY: ::REGSAM = 0x0010;
-pub const KEY_CREATE_LINK: ::REGSAM = 0x0020;
-pub const KEY_WOW64_32KEY: ::REGSAM = 0x0200;
-pub const KEY_WOW64_64KEY: ::REGSAM = 0x0100;
-pub const KEY_WOW64_RES: ::REGSAM = 0x0300;
-pub const KEY_READ: ::REGSAM = (
-        STANDARD_RIGHTS_READ |
-        KEY_QUERY_VALUE |
-        KEY_ENUMERATE_SUB_KEYS |
-        KEY_NOTIFY
-    ) & (!SYNCHRONIZE);
-pub const KEY_WRITE: ::REGSAM = (STANDARD_RIGHTS_WRITE | KEY_SET_VALUE | KEY_CREATE_SUB_KEY) & (!SYNCHRONIZE);
-pub const KEY_EXECUTE: ::REGSAM = KEY_READ & (!SYNCHRONIZE);
-pub const KEY_ALL_ACCESS: ::REGSAM = (
-        STANDARD_RIGHTS_ALL |
-        KEY_QUERY_VALUE |
-        KEY_SET_VALUE |
-        KEY_CREATE_SUB_KEY |
-        KEY_ENUMERATE_SUB_KEYS |
-        KEY_NOTIFY |
-        KEY_CREATE_LINK
-    ) & (!SYNCHRONIZE);
-pub const REG_CREATED_NEW_KEY: ::DWORD = 0x00000001;
-pub const REG_OPENED_EXISTING_KEY: ::DWORD = 0x00000002;
-pub const REG_NOTIFY_CHANGE_NAME: ::DWORD = 0x00000001;
-pub const REG_NOTIFY_CHANGE_ATTRIBUTES: ::DWORD = 0x00000002;
-pub const REG_NOTIFY_CHANGE_LAST_SET: ::DWORD = 0x00000004;
-pub const REG_NOTIFY_CHANGE_SECURITY: ::DWORD = 0x00000008;
-pub const REG_LEGAL_CHANGE_FILTER: ::DWORD = REG_NOTIFY_CHANGE_NAME |
-    REG_NOTIFY_CHANGE_ATTRIBUTES |
-    REG_NOTIFY_CHANGE_LAST_SET |
-    REG_NOTIFY_CHANGE_SECURITY;
-pub const REG_NOTIFY_THREAD_AGNOSTIC: ::DWORD = 0x10000000; //supported only on Windows 8 and later
-pub const REG_OPTION_RESERVED: ::DWORD = 0x00000000;
-pub const REG_OPTION_NON_VOLATILE: ::DWORD = 0x00000000;
-pub const REG_OPTION_VOLATILE: ::DWORD = 0x00000001;
-pub const REG_OPTION_CREATE_LINK: ::DWORD = 0x00000002;
-pub const REG_OPTION_BACKUP_RESTORE: ::DWORD = 0x00000004;
-pub const REG_OPTION_OPEN_LINK: ::DWORD = 0x00000008;
-pub const REG_NONE: ::DWORD = 0;
-pub const REG_SZ: ::DWORD = 1;
-pub const REG_EXPAND_SZ: ::DWORD = 2;
-pub const REG_BINARY: ::DWORD = 3;
-pub const REG_DWORD: ::DWORD = 4;
-pub const REG_DWORD_LITTLE_ENDIAN: ::DWORD = 4;
-pub const REG_DWORD_BIG_ENDIAN: ::DWORD = 5;
-pub const REG_LINK: ::DWORD = 6;
-pub const REG_MULTI_SZ: ::DWORD = 7;
-pub const REG_RESOURCE_LIST: ::DWORD = 8;
-pub const REG_FULL_RESOURCE_DESCRIPTOR: ::DWORD = 9;
-pub const REG_RESOURCE_REQUIREMENTS_LIST: ::DWORD = 10;
-pub const REG_QWORD: ::DWORD = 11;
-pub const REG_QWORD_LITTLE_ENDIAN: ::DWORD = 11;
-//18720
-pub const SERVICE_KERNEL_DRIVER: ::DWORD = 0x00000001;
-pub const SERVICE_FILE_SYSTEM_DRIVER: ::DWORD = 0x00000002;
-pub const SERVICE_ADAPTER: ::DWORD = 0x00000004;
-pub const SERVICE_RECOGNIZER_DRIVER: ::DWORD = 0x00000008;
-pub const SERVICE_DRIVER: ::DWORD = SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER
-    | SERVICE_RECOGNIZER_DRIVER;
-pub const SERVICE_WIN32_OWN_PROCESS: ::DWORD = 0x00000010;
-pub const SERVICE_WIN32_SHARE_PROCESS: ::DWORD = 0x00000020;
-pub const SERVICE_WIN32: ::DWORD = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS;
-pub const SERVICE_INTERACTIVE_PROCESS: ::DWORD = 0x00000100;
-pub const SERVICE_TYPE_ALL: ::DWORD = SERVICE_WIN32 | SERVICE_ADAPTER | SERVICE_DRIVER
-    | SERVICE_INTERACTIVE_PROCESS;
-STRUCT!{struct TP_CALLBACK_INSTANCE {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_CALLBACK_INSTANCE = *mut TP_CALLBACK_INSTANCE;
-STRUCT!{struct TP_IO {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_IO = *mut TP_IO;
-STRUCT!{struct TP_POOL {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_POOL = *mut TP_POOL;
-STRUCT!{struct TP_CLEANUP_GROUP {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_CLEANUP_GROUP = *mut TP_CLEANUP_GROUP;
-STRUCT!{struct TP_TIMER {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_TIMER = *mut TP_TIMER;
-STRUCT!{struct TP_WAIT {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_WAIT = *mut TP_WAIT;
-STRUCT!{struct TP_WORK {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_WORK = *mut TP_WORK;
-STRUCT!{struct ACTIVATION_CONTEXT {
-    dummy: *mut ::c_void,
-}}
-ENUM!{enum TP_CALLBACK_PRIORITY {
-    TP_CALLBACK_PRIORITY_HIGH,
-    TP_CALLBACK_PRIORITY_NORMAL,
-    TP_CALLBACK_PRIORITY_LOW,
-    TP_CALLBACK_PRIORITY_INVALID,
-    TP_CALLBACK_PRIORITY_COUNT = 4,
-}}
-pub type PTP_CLEANUP_GROUP_CANCEL_CALLBACK = Option<unsafe extern "system" fn(
-    ObjectContext: ::PVOID, CleanupContext: ::PVOID,
-)>;
-pub type PTP_SIMPLE_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: PTP_CALLBACK_INSTANCE, Context: ::PVOID,
-)>;
-pub type PTP_WORK_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: PTP_CALLBACK_INSTANCE, Context: ::PVOID, Work: PTP_WORK,
-)>;
-pub type PTP_TIMER_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: PTP_CALLBACK_INSTANCE, Context: ::PVOID, Timer: PTP_TIMER,
-)>;
-pub type TP_WAIT_RESULT = ::DWORD;
-pub type PTP_WAIT_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: PTP_CALLBACK_INSTANCE, Context: ::PVOID, Wait: PTP_WAIT, WaitResult: TP_WAIT_RESULT,
-)>;
-pub type TP_VERSION = ::DWORD;
-pub type PTP_VERSION = *mut ::DWORD;
-STRUCT!{struct TP_POOL_STACK_INFORMATION {
-    StackReserve: ::SIZE_T,
-    StackCommit: ::SIZE_T,
-}}
-pub type PTP_POOL_STACK_INFORMATION = *mut TP_POOL_STACK_INFORMATION;
-STRUCT!{struct TP_CALLBACK_ENVIRON_V3_s {
-    BitFields: ::DWORD,
-}}
-BITFIELD!(TP_CALLBACK_ENVIRON_V3_s BitFields: ::DWORD [
-    LongFunction set_LongFunction[0..1],
-    Persistent set_Persistent[1..2],
-    Private set_Private[2..32],
-]);
-STRUCT!{nodebug struct TP_CALLBACK_ENVIRON_V3 {
-    Version: TP_VERSION,
-    Pool: PTP_POOL,
-    CleanupGroup: PTP_CLEANUP_GROUP,
-    CleanupGroupCancelCallback: PTP_CLEANUP_GROUP_CANCEL_CALLBACK,
-    RaceDll: ::PVOID,
-    ActivationContext: *mut ACTIVATION_CONTEXT,
-    FinalizationCallback: PTP_SIMPLE_CALLBACK,
-    u: ::DWORD,
-    CallbackPriority: TP_CALLBACK_PRIORITY,
-    Size: ::DWORD,
-}}
-UNION!(TP_CALLBACK_ENVIRON_V3, u, Flags, Flags_mut, ::DWORD);
-UNION!(TP_CALLBACK_ENVIRON_V3, u, s, s_mut, TP_CALLBACK_ENVIRON_V3_s);
-pub type TP_CALLBACK_ENVIRON = TP_CALLBACK_ENVIRON_V3;
-pub type PTP_CALLBACK_ENVIRON = *mut TP_CALLBACK_ENVIRON_V3;
-STRUCT!{struct JOB_SET_ARRAY {
-    JobHandle: ::HANDLE,
-    MemberLevel: ::DWORD,
-    Flags: ::DWORD,
-}}
-pub type PJOB_SET_ARRAY = *mut JOB_SET_ARRAY;
-STRUCT!{struct RTL_BARRIER {
-    Reserved1: ::DWORD,
-    Reserved2: ::DWORD,
-    Reserved3: [::ULONG_PTR; 2],
-    Reserved4: ::DWORD,
-    Reserved5: ::DWORD,
-}}
-pub type PRTL_BARRIER = *mut RTL_BARRIER;
-STRUCT!{struct RTL_RUN_ONCE {
-    Ptr: ::PVOID,
-}}
-pub type PRTL_RUN_ONCE = *mut RTL_RUN_ONCE;
-ENUM!{enum RTL_UMS_THREAD_INFO_CLASS {
-    UmsThreadInvalidInfoClass = 0,
-    UmsThreadUserContext,
-    UmsThreadPriority,              // Reserved
-    UmsThreadAffinity,              // Reserved
-    UmsThreadTeb,
-    UmsThreadIsSuspended,
-    UmsThreadIsTerminated,
-    UmsThreadMaxInfoClass,
-}}
-ENUM!{enum RTL_UMS_SCHEDULER_REASON {
-    UmsSchedulerStartup = 0,
-    UmsSchedulerThreadBlocked,
-    UmsSchedulerThreadYield,
-}}
-pub type PRTL_UMS_SCHEDULER_ENTRY_POINT = Option<unsafe extern "system" fn(
-    Reason: RTL_UMS_SCHEDULER_REASON, ActivationPayload: ::ULONG_PTR, SchedulerParam: ::PVOID,
-)>;
-ENUM!{enum FIRMWARE_TYPE {
-    FirmwareTypeUnknown,
-    FirmwareTypeBios,
-    FirmwareTypeUefi,
-    FirmwareTypeMax,
-}}
-pub type PFIRMWARE_TYPE = *mut FIRMWARE_TYPE;
-ENUM!{enum LOGICAL_PROCESSOR_RELATIONSHIP {
-    RelationProcessorCore,
-    RelationNumaNode,
-    RelationCache,
-    RelationProcessorPackage,
-    RelationGroup,
-    RelationAll = 0xffff,
-}}
-ENUM!{enum PROCESSOR_CACHE_TYPE {
-    CacheUnified,
-    CacheInstruction,
-    CacheData,
-    CacheTrace,
-}}
-STRUCT!{struct CACHE_DESCRIPTOR {
-    Level: ::BYTE,
-    Associativity: ::BYTE,
-    LineSize: ::WORD,
-    Size: ::DWORD,
-    Type: PROCESSOR_CACHE_TYPE,
-}}
-pub type PCACHE_DESCRIPTOR = *mut CACHE_DESCRIPTOR;
-STRUCT!{struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION_ProcessorCore {
-    Flags: ::BYTE,
-}}
-STRUCT!{struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION_NumaNode {
-    NodeNumber: ::DWORD,
-}}
-STRUCT!{struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION {
-    ProcessorMask: ::ULONG_PTR,
-    Relationship: LOGICAL_PROCESSOR_RELATIONSHIP,
-    Reserved: [::ULONGLONG; 2],
-}}
-UNION!(
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION, Reserved, ProcessorCore, ProcessorCore_mut,
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION_ProcessorCore
-);
-UNION!(
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION, Reserved, NumaNode, NumaNode_mut,
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION_NumaNode
-);
-UNION!(SYSTEM_LOGICAL_PROCESSOR_INFORMATION, Reserved, Cache, Cache_mut, CACHE_DESCRIPTOR);
-pub type PSYSTEM_LOGICAL_PROCESSOR_INFORMATION = *mut SYSTEM_LOGICAL_PROCESSOR_INFORMATION;
-STRUCT!{struct SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION {
-    CycleTime: ::DWORD64,
-}}
-pub type PSYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION = *mut SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION;
-ENUM!{enum HARDWARE_COUNTER_TYPE {
-    PMCCounter,
-    MaxHardwareCounterType,
-}}
-pub type PHARDWARE_COUNTER_TYPE = *mut HARDWARE_COUNTER_TYPE;
-ENUM!{enum PROCESS_MITIGATION_POLICY {
-    ProcessDEPPolicy,
-    ProcessASLRPolicy,
-    ProcessDynamicCodePolicy,
-    ProcessStrictHandleCheckPolicy,
-    ProcessSystemCallDisablePolicy,
-    ProcessMitigationOptionsMask,
-    ProcessExtensionPointDisablePolicy,
-    ProcessReserved1Policy,
-    ProcessSignaturePolicy,
-    MaxProcessMitigationPolicy,
-}}
-STRUCT!{nodebug struct OSVERSIONINFOA {
-    dwOSVersionInfoSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    dwBuildNumber: ::DWORD,
-    dwPlatformId: ::DWORD,
-    szCSDVersion: [::CHAR; 128],
-}}
-pub type POSVERSIONINFOA = *mut OSVERSIONINFOA;
-pub type LPOSVERSIONINFOA = *mut OSVERSIONINFOA;
-STRUCT!{nodebug struct OSVERSIONINFOW {
-    dwOSVersionInfoSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    dwBuildNumber: ::DWORD,
-    dwPlatformId: ::DWORD,
-    szCSDVersion: [::WCHAR; 128],
-}}
-pub type POSVERSIONINFOW = *mut OSVERSIONINFOW;
-pub type LPOSVERSIONINFOW = *mut OSVERSIONINFOW;
-STRUCT!{nodebug struct OSVERSIONINFOEXA {
-    dwOSVersionInfoSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    dwBuildNumber: ::DWORD,
-    dwPlatformId: ::DWORD,
-    szCSDVersion: [::CHAR; 128],
-    wServicePackMajor: ::WORD,
-    wServicePackMinor: ::WORD,
-    wSuiteMask: ::WORD,
-    wProductType: ::BYTE,
-    wReserved: ::BYTE,
-}}
-pub type POSVERSIONINFOEXA = *mut OSVERSIONINFOEXA;
-pub type LPOSVERSIONINFOEXA = *mut OSVERSIONINFOEXA;
-STRUCT!{nodebug struct OSVERSIONINFOEXW {
-    dwOSVersionInfoSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    dwBuildNumber: ::DWORD,
-    dwPlatformId: ::DWORD,
-    szCSDVersion: [::WCHAR; 128],
-    wServicePackMajor: ::WORD,
-    wServicePackMinor: ::WORD,
-    wSuiteMask: ::WORD,
-    wProductType: ::BYTE,
-    wReserved: ::BYTE,
-}}
-pub type POSVERSIONINFOEXW = *mut OSVERSIONINFOEXW;
-pub type LPOSVERSIONINFOEXW = *mut OSVERSIONINFOEXW;
-STRUCT!{struct SLIST_ENTRY {
-    Next: *mut SLIST_ENTRY,
-}}
-pub type PSLIST_ENTRY = *mut SLIST_ENTRY;
-STRUCT!{struct SLIST_HEADER_HeaderX64 {
-    BitFields1: ::ULONGLONG,
-    BitFields2: ::ULONGLONG,
-}}
-BITFIELD!(SLIST_HEADER_HeaderX64 BitFields1: ::ULONGLONG [
-    Depth set_Depth[0..16],
-    Sequence set_Sequence[16..64],
-]);
-BITFIELD!(SLIST_HEADER_HeaderX64 BitFields2: ::ULONGLONG [
-    Reserved set_Reserved[0..4],
-    NextEntry set_NextEntry[4..64],
-]);
-STRUCT!{struct SLIST_HEADER {
-    Alignment: ::ULONGLONG,
-    Region: ::ULONGLONG,
-}}
-UNION!(SLIST_HEADER, Alignment, HeaderX64, HeaderX64_mut, SLIST_HEADER_HeaderX64);
-pub type PSLIST_HEADER = *mut SLIST_HEADER;
-ENUM!{enum SYSTEM_POWER_STATE {
-    PowerSystemUnspecified = 0,
-    PowerSystemWorking = 1,
-    PowerSystemSleeping1 = 2,
-    PowerSystemSleeping2 = 3,
-    PowerSystemSleeping3 = 4,
-    PowerSystemHibernate = 5,
-    PowerSystemShutdown = 6,
-    PowerSystemMaximum = 7,
-}}
-pub type PSYSTEM_POWER_STATE = *mut SYSTEM_POWER_STATE;
-ENUM!{enum POWER_ACTION {
-    PowerActionNone = 0,
-    PowerActionReserved,
-    PowerActionSleep,
-    PowerActionHibernate,
-    PowerActionShutdown,
-    PowerActionShutdownReset,
-    PowerActionShutdownOff,
-    PowerActionWarmEject,
-}}
-pub type PPOWER_ACTION = *mut POWER_ACTION;
-ENUM!{enum DEVICE_POWER_STATE {
-    PowerDeviceUnspecified = 0,
-    PowerDeviceD0,
-    PowerDeviceD1,
-    PowerDeviceD2,
-    PowerDeviceD3,
-    PowerDeviceMaximum,
-}}
-pub type PDEVICE_POWER_STATE = *mut DEVICE_POWER_STATE;
-ENUM!{enum MONITOR_DISPLAY_STATE {
-    PowerMonitorOff = 0,
-    PowerMonitorOn,
-    PowerMonitorDim,
-}}
-pub type PMONITOR_DISPLAY_STATE = *mut MONITOR_DISPLAY_STATE;
-ENUM!{enum USER_ACTIVITY_PRESENCE {
-    PowerUserPresent = 0,
-    PowerUserNotPresent,
-    PowerUserInactive,
-    PowerUserMaximum,
-    //PowerUserInvalid = 3,
-}}
-pub type PUSER_ACTIVITY_PRESENCE = *mut USER_ACTIVITY_PRESENCE;
-pub type EXECUTION_STATE = ::DWORD;
-pub type PEXECUTION_STATE = *mut ::DWORD;
-ENUM!{enum LATENCY_TIME {
-    LT_DONT_CARE,
-    LT_LOWEST_LATENCY,
-}}
-ENUM!{enum POWER_REQUEST_TYPE {
-    PowerRequestDisplayRequired,
-    PowerRequestSystemRequired,
-    PowerRequestAwayModeRequired,
-    PowerRequestExecutionRequired,
-}}
-pub type PPOWER_REQUEST_TYPE = *mut POWER_REQUEST_TYPE;
-pub const MAX_HW_COUNTERS: usize = 16;
-STRUCT!{struct HARDWARE_COUNTER_DATA {
-    Type: HARDWARE_COUNTER_TYPE,
-    Reserved: ::DWORD,
-    Value: ::DWORD64,
-}}
-pub type PHARDWARE_COUNTER_DATA = *mut HARDWARE_COUNTER_DATA;
-STRUCT!{struct PERFORMANCE_DATA {
-    Size: ::WORD,
-    Version: ::BYTE,
-    HwCountersCount: ::BYTE,
-    ContextSwitchCount: ::DWORD,
-    WaitReasonBitMap: ::DWORD64,
-    CycleTime: ::DWORD64,
-    RetryCount: ::DWORD,
-    Reserved: ::DWORD,
-    HwCounters: [HARDWARE_COUNTER_DATA; MAX_HW_COUNTERS],
-}}
-pub type PPERFORMANCE_DATA = *mut PERFORMANCE_DATA;
-STRUCT!{struct MEMORY_BASIC_INFORMATION {
-    BaseAddress: ::PVOID,
-    AllocationBase: ::PVOID,
-    AllocationProtect: ::DWORD,
-    RegionSize: ::SIZE_T,
-    State: ::DWORD,
-    Protect: ::DWORD,
-    Type: ::DWORD,
-}}
-pub type PMEMORY_BASIC_INFORMATION = *mut MEMORY_BASIC_INFORMATION;
-STRUCT!{struct MEMORY_BASIC_INFORMATION32 {
-    BaseAddress: ::DWORD,
-    AllocationBase: ::DWORD,
-    AllocationProtect: ::DWORD,
-    RegionSize: ::DWORD,
-    State: ::DWORD,
-    Protect: ::DWORD,
-    Type: ::DWORD,
-}}
-pub type PMEMORY_BASIC_INFORMATION32 = *mut MEMORY_BASIC_INFORMATION32;
-STRUCT!{struct MEMORY_BASIC_INFORMATION64 { // FIXME: align 16
-    BaseAddress: ::ULONGLONG,
-    AllocationBase: ::ULONGLONG,
-    AllocationProtect: ::DWORD,
-    __alignment1: ::DWORD,
-    RegionSize: ::ULONGLONG,
-    State: ::DWORD,
-    Protect: ::DWORD,
-    Type: ::DWORD,
-    __alignment2: ::DWORD,
-}}
-pub type PMEMORY_BASIC_INFORMATION64 = *mut MEMORY_BASIC_INFORMATION64;
-pub const WOW64_SIZE_OF_80387_REGISTERS: usize = 80;
-pub const WOW64_MAXIMUM_SUPPORTED_EXTENSION: usize = 512;
-STRUCT!{nodebug struct WOW64_FLOATING_SAVE_AREA {
-    ControlWord: ::DWORD,
-    StatusWord: ::DWORD,
-    TagWord: ::DWORD,
-    ErrorOffset: ::DWORD,
-    ErrorSelector: ::DWORD,
-    DataOffset: ::DWORD,
-    DataSelector: ::DWORD,
-    RegisterArea: [::BYTE; WOW64_SIZE_OF_80387_REGISTERS],
-    Cr0NpxState: ::DWORD,
-}}
-pub type PWOW64_FLOATING_SAVE_AREA = *mut WOW64_FLOATING_SAVE_AREA;
-STRUCT!{nodebug struct WOW64_CONTEXT {
-    ContextFlags: ::DWORD,
-    Dr0: ::DWORD,
-    Dr1: ::DWORD,
-    Dr2: ::DWORD,
-    Dr3: ::DWORD,
-    Dr4: ::DWORD,
-    Dr5: ::DWORD,
-    Dr6: ::DWORD,
-    Dr7: ::DWORD,
-    FloatSave: WOW64_FLOATING_SAVE_AREA,
-    SegGs: ::DWORD,
-    SegFs: ::DWORD,
-    SegEs: ::DWORD,
-    SegDs: ::DWORD,
-    Edi: ::DWORD,
-    Esi: ::DWORD,
-    Ebx: ::DWORD,
-    Edx: ::DWORD,
-    Ecx: ::DWORD,
-    Eax: ::DWORD,
-    Ebp: ::DWORD,
-    Eip: ::DWORD,
-    SegCs: ::DWORD,
-    EFlags: ::DWORD,
-    Esp: ::DWORD,
-    SegSs: ::DWORD,
-    ExtendedRegisters: [::BYTE; WOW64_MAXIMUM_SUPPORTED_EXTENSION],
-}}
-pub type PWOW64_CONTEXT = *mut WOW64_CONTEXT;
-STRUCT!{struct WOW64_LDT_ENTRY_Bytes {
-    BaseMid: ::BYTE,
-    Flags1: ::BYTE,
-    Flags2: ::BYTE,
-    BaseHi: ::BYTE,
-}}
-STRUCT!{struct WOW64_LDT_ENTRY_Bits {
-    BitFields: ::DWORD,
-}}
-BITFIELD!(WOW64_LDT_ENTRY_Bits BitFields: ::DWORD [
-    BaseMid set_BaseMid[0..8],
-    Type set_Type[8..13],
-    Dpl set_Dpl[13..15],
-    Pres set_Pres[15..16],
-    LimitHi set_LimitHi[16..20],
-    Sys set_Sys[20..21],
-    Reserved_0 set_Reserved_0[21..22],
-    Default_Big set_Default_Big[22..23],
-    Granularity set_Granularity[23..24],
-    BaseHi set_BaseHi[24..32],
-]);
-STRUCT!{struct WOW64_LDT_ENTRY {
-    LimitLow: ::WORD,
-    BaseLow: ::WORD,
-    HighWord: ::DWORD,
-}}
-UNION!(WOW64_LDT_ENTRY, HighWord, Bytes, Bytes_mut, WOW64_LDT_ENTRY_Bytes);
-UNION!(WOW64_LDT_ENTRY, HighWord, Bits, Bits_mut, WOW64_LDT_ENTRY_Bits);
-pub type PWOW64_LDT_ENTRY = *mut WOW64_LDT_ENTRY;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winreg.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winreg.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winreg.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winreg.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub type REGSAM = ACCESS_MASK;
-STRUCT!{struct VALENTA {
-    ve_valuename: LPSTR,
-    ve_valuelen: DWORD,
-    ve_valueptr: DWORD_PTR,
-    ve_type: DWORD,
-}}
-pub type PVALENTA = *mut VALENTA;
-STRUCT!{struct VALENTW {
-    ve_valuename: LPWSTR,
-    ve_valuelen: DWORD,
-    ve_valueptr: DWORD_PTR,
-    ve_type: DWORD,
-}}
-pub type PVALENTW = *mut VALENTW;
-pub const HKEY_CLASSES_ROOT: HKEY = 0x80000000 as HKEY;
-pub const HKEY_CURRENT_USER: HKEY = 0x80000001 as HKEY;
-pub const HKEY_LOCAL_MACHINE: HKEY = 0x80000002 as HKEY;
-pub const HKEY_USERS: HKEY = 0x80000003 as HKEY;
-pub const HKEY_PERFORMANCE_DATA: HKEY = 0x80000004 as HKEY;
-pub const HKEY_PERFORMANCE_TEXT: HKEY = 0x80000050 as HKEY;
-pub const HKEY_PERFORMANCE_NLSTEXT: HKEY = 0x80000060 as HKEY;
-pub const HKEY_CURRENT_CONFIG: HKEY = 0x80000005 as HKEY;
-pub const HKEY_DYN_DATA: HKEY = 0x80000006 as HKEY;
-pub const HKEY_CURRENT_USER_LOCAL_SETTINGS: HKEY = 0x80000007 as HKEY;
-pub const REG_MUI_STRING_TRUNCATE: DWORD = 0x00000001;
-pub const RRF_RT_REG_NONE: DWORD = 0x00000001;
-pub const RRF_RT_REG_SZ: DWORD = 0x00000002;
-pub const RRF_RT_REG_EXPAND_SZ: DWORD = 0x00000004;
-pub const RRF_RT_REG_BINARY: DWORD = 0x00000008;
-pub const RRF_RT_REG_DWORD: DWORD = 0x00000010;
-pub const RRF_RT_REG_MULTI_SZ: DWORD = 0x00000020;
-pub const RRF_RT_REG_QWORD: DWORD = 0x00000040;
-pub const RRF_RT_DWORD: DWORD = RRF_RT_REG_BINARY|RRF_RT_REG_DWORD;
-pub const RRF_RT_QWORD: DWORD = RRF_RT_REG_BINARY|RRF_RT_REG_QWORD;
-pub const RRF_RT_ANY: DWORD = 0x0000ffff;
-pub const RRF_NOEXPAND: DWORD = 0x10000000;
-pub const RRF_ZEROONFAILURE: DWORD = 0x20000000;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winscard.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winscard.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winscard.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winscard.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Data Protection API Prototypes and Definitions
-// This header file provides the definitions and symbols necessary for an
-// Application or Smart Card Service Provider to access the Smartcard Subsystem.
-pub type LPCBYTE = *const ::BYTE;
-pub type SCARDCONTEXT = ::ULONG_PTR;
-pub type PSCARDCONTEXT = *mut SCARDCONTEXT;
-pub type LPSCARDCONTEXT = *mut SCARDCONTEXT;
-pub type SCARDHANDLE = ::ULONG_PTR;
-pub type PSCARDHANDLE = *mut SCARDHANDLE;
-pub type LPSCARDHANDLE = *mut SCARDHANDLE;
-pub const SCARD_AUTOALLOCATE: ::DWORD = -1i32 as ::DWORD;
-pub const SCARD_SCOPE_USER: ::DWORD = 0;
-pub const SCARD_SCOPE_TERMINAL: ::DWORD = 1;
-pub const SCARD_SCOPE_SYSTEM: ::DWORD = 2;
-pub const SCARD_PROVIDER_PRIMARY: ::DWORD = 1;
-pub const SCARD_PROVIDER_CSP: ::DWORD = 2;
-pub const SCARD_PROVIDER_KSP: ::DWORD = 3;
-STRUCT!{nodebug struct SCARD_READERSTATEA {
-    szReader: ::LPCSTR,
-    pvUserData: ::LPVOID,
-    dwCurrentState: ::DWORD,
-    dwEventState: ::DWORD,
-    cbAtr: ::DWORD,
-    rgbAtr: [::BYTE; 36],
-}}
-pub type PSCARD_READERSTATEA = *mut SCARD_READERSTATEA;
-pub type LPSCARD_READERSTATEA = *mut SCARD_READERSTATEA;
-STRUCT!{nodebug struct SCARD_READERSTATEW {
-    szReader: ::LPCWSTR,
-    pvUserData: ::LPVOID,
-    dwCurrentState: ::DWORD,
-    dwEventState: ::DWORD,
-    cbAtr: ::DWORD,
-    rgbAtr: [::BYTE; 36],
-}}
-pub type PSCARD_READERSTATEW = *mut SCARD_READERSTATEW;
-pub type LPSCARD_READERSTATEW = *mut SCARD_READERSTATEW;
-pub type SCARD_READERSTATE_A = SCARD_READERSTATEA;
-pub type SCARD_READERSTATE_W = SCARD_READERSTATEW;
-pub type PSCARD_READERSTATE_A = PSCARD_READERSTATEA;
-pub type PSCARD_READERSTATE_W = PSCARD_READERSTATEW;
-pub type LPSCARD_READERSTATE_A = LPSCARD_READERSTATEA;
-pub type LPSCARD_READERSTATE_W = LPSCARD_READERSTATEW;
-pub const SCARD_STATE_UNAWARE: ::DWORD = 0x00000000;
-pub const SCARD_STATE_IGNORE: ::DWORD = 0x00000001;
-pub const SCARD_STATE_CHANGED: ::DWORD = 0x00000002;
-pub const SCARD_STATE_UNKNOWN: ::DWORD = 0x00000004;
-pub const SCARD_STATE_UNAVAILABLE: ::DWORD = 0x00000008;
-pub const SCARD_STATE_EMPTY: ::DWORD = 0x00000010;
-pub const SCARD_STATE_PRESENT: ::DWORD = 0x00000020;
-pub const SCARD_STATE_ATRMATCH: ::DWORD = 0x00000040;
-pub const SCARD_STATE_EXCLUSIVE: ::DWORD = 0x00000080;
-pub const SCARD_STATE_INUSE: ::DWORD = 0x00000100;
-pub const SCARD_STATE_MUTE: ::DWORD = 0x00000200;
-pub const SCARD_STATE_UNPOWERED: ::DWORD = 0x00000400;
-STRUCT!{nodebug struct SCARD_ATRMASK {
-    cbAtr: ::DWORD,
-    rgbAtr: [::BYTE; 36],
-    rgbMask: [::BYTE; 36],
-}}
-pub type PSCARD_ATRMASK = *mut SCARD_ATRMASK;
-pub type LPSCARD_ATRMASK = *mut SCARD_ATRMASK;
-pub const SCARD_SHARE_EXCLUSIVE: ::DWORD = 1;
-pub const SCARD_SHARE_SHARED: ::DWORD = 2;
-pub const SCARD_SHARE_DIRECT: ::DWORD = 3;
-pub const SCARD_LEAVE_CARD: ::DWORD = 0;
-pub const SCARD_RESET_CARD: ::DWORD = 1;
-pub const SCARD_UNPOWER_CARD: ::DWORD = 2;
-pub const SCARD_EJECT_CARD: ::DWORD = 3;
-pub const SC_DLG_MINIMAL_UI: ::DWORD = 0x01;
-pub const SC_DLG_NO_UI: ::DWORD = 0x02;
-pub const SC_DLG_FORCE_UI: ::DWORD = 0x04;
-pub const SCERR_NOCARDNAME: ::DWORD = 0x4000;
-pub const SCERR_NOGUIDS: ::DWORD = 0x8000;
-pub type LPOCNCONNPROCA = Option<unsafe extern "system" fn(
-    SCARDCONTEXT, ::LPSTR, ::LPSTR, ::PVOID,
-) -> SCARDHANDLE>;
-pub type LPOCNCONNPROCW = Option<unsafe extern "system" fn(
-    SCARDCONTEXT, ::LPWSTR, ::LPWSTR, ::PVOID,
-) -> SCARDHANDLE>;
-pub type LPOCNCHKPROC = Option<unsafe extern "system" fn(
-    SCARDCONTEXT, SCARDHANDLE, ::PVOID,
-) -> ::BOOL>;
-pub type LPOCNDSCPROC = Option<unsafe extern "system" fn(SCARDCONTEXT, SCARDHANDLE, ::PVOID)>;
-STRUCT!{nodebug struct OPENCARD_SEARCH_CRITERIAA {
-    dwStructSize: ::DWORD,
-    lpstrGroupNames: ::LPSTR,
-    nMaxGroupNames: ::DWORD,
-    rgguidInterfaces: ::LPCGUID,
-    cguidInterfaces: ::DWORD,
-    lpstrCardNames: ::LPSTR,
-    nMaxCardNames: ::DWORD,
-    lpfnCheck: LPOCNCHKPROC,
-    lpfnConnect: LPOCNCONNPROCA,
-    lpfnDisconnect: LPOCNDSCPROC,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-}}
-pub type POPENCARD_SEARCH_CRITERIAA = *mut OPENCARD_SEARCH_CRITERIAA;
-pub type LPOPENCARD_SEARCH_CRITERIAA = *mut OPENCARD_SEARCH_CRITERIAA;
-STRUCT!{nodebug struct OPENCARD_SEARCH_CRITERIAW {
-    dwStructSize: ::DWORD,
-    lpstrGroupNames: ::LPWSTR,
-    nMaxGroupNames: ::DWORD,
-    rgguidInterfaces: ::LPCGUID,
-    cguidInterfaces: ::DWORD,
-    lpstrCardNames: ::LPWSTR,
-    nMaxCardNames: ::DWORD,
-    lpfnCheck: LPOCNCHKPROC,
-    lpfnConnect: LPOCNCONNPROCW,
-    lpfnDisconnect: LPOCNDSCPROC,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-}}
-pub type POPENCARD_SEARCH_CRITERIAW = *mut OPENCARD_SEARCH_CRITERIAW;
-pub type LPOPENCARD_SEARCH_CRITERIAW = *mut OPENCARD_SEARCH_CRITERIAW;
-STRUCT!{nodebug struct OPENCARDNAME_EXA {
-    dwStructSize: ::DWORD,
-    hSCardContext: SCARDCONTEXT,
-    hwndOwner: ::HWND,
-    dwFlags: ::DWORD,
-    lpstrTitle: ::LPCSTR,
-    lpstrSearchDesc: ::LPCSTR,
-    hIcon: ::HICON,
-    pOpenCardSearchCriteria: POPENCARD_SEARCH_CRITERIAA,
-    lpfnConnect: LPOCNCONNPROCA,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    lpstrRdr: ::LPSTR,
-    nMaxRdr: ::DWORD,
-    lpstrCard: ::LPSTR,
-    nMaxCard: ::DWORD,
-    dwActiveProtocol: ::DWORD,
-    hCardHandle: SCARDHANDLE,
-}}
-pub type POPENCARDNAME_EXA = *mut OPENCARDNAME_EXA;
-pub type LPOPENCARDNAME_EXA = *mut OPENCARDNAME_EXA;
-STRUCT!{nodebug struct OPENCARDNAME_EXW {
-    dwStructSize: ::DWORD,
-    hSCardContext: SCARDCONTEXT,
-    hwndOwner: ::HWND,
-    dwFlags: ::DWORD,
-    lpstrTitle: ::LPCWSTR,
-    lpstrSearchDesc: ::LPCWSTR,
-    hIcon: ::HICON,
-    pOpenCardSearchCriteria: POPENCARD_SEARCH_CRITERIAW,
-    lpfnConnect: LPOCNCONNPROCW,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    lpstrRdr: ::LPWSTR,
-    nMaxRdr: ::DWORD,
-    lpstrCard: ::LPWSTR,
-    nMaxCard: ::DWORD,
-    dwActiveProtocol: ::DWORD,
-    hCardHandle: SCARDHANDLE,
-}}
-pub type POPENCARDNAME_EXW = *mut OPENCARDNAME_EXW;
-pub type LPOPENCARDNAME_EXW = *mut OPENCARDNAME_EXW;
-pub type OPENCARDNAMEA_EX = OPENCARDNAME_EXA;
-pub type OPENCARDNAMEW_EX = OPENCARDNAME_EXW;
-pub type POPENCARDNAMEA_EX = POPENCARDNAME_EXA;
-pub type POPENCARDNAMEW_EX = POPENCARDNAME_EXW;
-pub type LPOPENCARDNAMEA_EX = LPOPENCARDNAME_EXA;
-pub type LPOPENCARDNAMEW_EX = LPOPENCARDNAME_EXW;
-pub const SCARD_READER_SEL_AUTH_PACKAGE: ::DWORD = -629i32 as ::DWORD;
-ENUM!{enum READER_SEL_REQUEST_MATCH_TYPE {
-    RSR_MATCH_TYPE_READER_AND_CONTAINER = 1,
-    RSR_MATCH_TYPE_SERIAL_NUMBER,
-    RSR_MATCH_TYPE_ALL_CARDS,
-}}
-STRUCT!{struct READER_SEL_REQUEST_ReaderAndContainerParameter {
-    cbReaderNameOffset: ::DWORD,
-    cchReaderNameLength: ::DWORD,
-    cbContainerNameOffset: ::DWORD,
-    cchContainerNameLength: ::DWORD,
-    dwDesiredCardModuleVersion: ::DWORD,
-    dwCspFlags: ::DWORD,
-}}
-STRUCT!{struct READER_SEL_REQUEST_SerialNumberParameter {
-    cbSerialNumberOffset: ::DWORD,
-    cbSerialNumberLength: ::DWORD,
-    dwDesiredCardModuleVersion: ::DWORD,
-}}
-STRUCT!{struct READER_SEL_REQUEST {
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    MatchType: READER_SEL_REQUEST_MATCH_TYPE,
-    ReaderAndContainerParameter: READER_SEL_REQUEST_ReaderAndContainerParameter,
-}}
-UNION!(
-    READER_SEL_REQUEST, ReaderAndContainerParameter, SerialNumberParameter,
-    SerialNumberParameter_mut, READER_SEL_REQUEST_SerialNumberParameter
-);
-pub type PREADER_SEL_REQUEST = *mut READER_SEL_REQUEST;
-STRUCT!{struct READER_SEL_RESPONSE {
-    cbReaderNameOffset: ::DWORD,
-    cchReaderNameLength: ::DWORD,
-    cbCardNameOffset: ::DWORD,
-    cchCardNameLength: ::DWORD,
-}}
-pub type PREADER_SEL_RESPONSE = *mut READER_SEL_RESPONSE;
-STRUCT!{nodebug struct OPENCARDNAMEA {
-    dwStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hSCardContext: SCARDCONTEXT,
-    lpstrGroupNames: ::LPSTR,
-    nMaxGroupNames: ::DWORD,
-    lpstrCardNames: ::LPSTR,
-    nMaxCardNames: ::DWORD,
-    rgguidInterfaces: ::LPCGUID,
-    cguidInterfaces: ::DWORD,
-    lpstrRdr: ::LPSTR,
-    nMaxRdr: ::DWORD,
-    lpstrCard: ::LPSTR,
-    nMaxCard: ::DWORD,
-    lpstrTitle: ::LPCSTR,
-    dwFlags: ::DWORD,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    dwActiveProtocol: ::DWORD,
-    lpfnConnect: LPOCNCONNPROCA,
-    lpfnCheck: LPOCNCHKPROC,
-    lpfnDisconnect: LPOCNDSCPROC,
-    hCardHandle: SCARDHANDLE,
-}}
-pub type POPENCARDNAMEA = *mut OPENCARDNAMEA;
-pub type LPOPENCARDNAMEA = *mut OPENCARDNAMEA;
-STRUCT!{nodebug struct OPENCARDNAMEW {
-    dwStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hSCardContext: SCARDCONTEXT,
-    lpstrGroupNames: ::LPWSTR,
-    nMaxGroupNames: ::DWORD,
-    lpstrCardNames: ::LPWSTR,
-    nMaxCardNames: ::DWORD,
-    rgguidInterfaces: ::LPCGUID,
-    cguidInterfaces: ::DWORD,
-    lpstrRdr: ::LPWSTR,
-    nMaxRdr: ::DWORD,
-    lpstrCard: ::LPWSTR,
-    nMaxCard: ::DWORD,
-    lpstrTitle: ::LPCWSTR,
-    dwFlags: ::DWORD,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    dwActiveProtocol: ::DWORD,
-    lpfnConnect: LPOCNCONNPROCW,
-    lpfnCheck: LPOCNCHKPROC,
-    lpfnDisconnect: LPOCNDSCPROC,
-    hCardHandle: SCARDHANDLE,
-}}
-pub type POPENCARDNAMEW = *mut OPENCARDNAMEW;
-pub type LPOPENCARDNAMEW = *mut OPENCARDNAMEW;
-pub type OPENCARDNAME_A = OPENCARDNAMEA;
-pub type OPENCARDNAME_W = OPENCARDNAMEW;
-pub type POPENCARDNAME_A = POPENCARDNAMEA;
-pub type POPENCARDNAME_W = POPENCARDNAMEW;
-pub type LPOPENCARDNAME_A = LPOPENCARDNAMEA;
-pub type LPOPENCARDNAME_W = LPOPENCARDNAMEW;
-pub const SCARD_AUDIT_CHV_FAILURE: ::DWORD = 0x0;
-pub const SCARD_AUDIT_CHV_SUCCESS: ::DWORD = 0x1;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winsmcrd.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winsmcrd.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winsmcrd.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winsmcrd.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// Smart Card class/port IOCTL codes.
-pub type UWORD = ::WORD;
-DEFINE_GUID!(GUID_DEVINTERFACE_SMARTCARD_READER, 0x50DD5230, 0xBA8A, 0x11D1,
-    0xBF, 0x5D, 0x00, 0x00, 0xF8, 0x05, 0xF5, 0x30);
-pub const SCARD_ATR_LENGTHL: ::DWORD = 33;
-pub const SCARD_PROTOCOL_UNDEFINED: ::DWORD = 0x00000000;
-pub const SCARD_PROTOCOL_T0: ::DWORD = 0x00000001;
-pub const SCARD_PROTOCOL_T1: ::DWORD = 0x00000002;
-pub const SCARD_PROTOCOL_RAW: ::DWORD = 0x00010000;
-pub const SCARD_PROTOCOL_Tx: ::DWORD = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1;
-pub const SCARD_PROTOCOL_DEFAULT: ::DWORD = 0x80000000;
-pub const SCARD_PROTOCOL_OPTIMAL: ::DWORD = 0x00000000;
-pub const SCARD_POWER_DOWN: ::DWORD = 0;
-pub const SCARD_COLD_RESET: ::DWORD = 1;
-pub const SCARD_WARM_RESET: ::DWORD = 2;
-pub const IOCTL_SMARTCARD_POWER: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 1, ::METHOD_BUFFERED,
-    ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_GET_ATTRIBUTE: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 2,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_SET_ATTRIBUTE: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 3,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_CONFISCATE: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 4,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_TRANSMIT: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 5,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_EJECT: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 6, ::METHOD_BUFFERED,
-    ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_SWALLOW: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 7,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_IS_PRESENT: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 10,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_IS_ABSENT: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 11,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_SET_PROTOCOL: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 12,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_GET_STATE: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 14,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_GET_LAST_ERROR: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 15,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_GET_PERF_CNTR: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 16,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const MAXIMUM_ATTR_STRING_LENGTH: ::DWORD = 32;
-pub const MAXIMUM_SMARTCARD_READERS: ::DWORD = 10;
-pub const SCARD_CLASS_VENDOR_INFO: ::ULONG = 1;
-pub const SCARD_CLASS_COMMUNICATIONS: ::ULONG = 2;
-pub const SCARD_CLASS_PROTOCOL: ::ULONG = 3;
-pub const SCARD_CLASS_POWER_MGMT: ::ULONG = 4;
-pub const SCARD_CLASS_SECURITY: ::ULONG = 5;
-pub const SCARD_CLASS_MECHANICAL: ::ULONG = 6;
-pub const SCARD_CLASS_VENDOR_DEFINED: ::ULONG = 7;
-pub const SCARD_CLASS_IFD_PROTOCOL: ::ULONG = 8;
-pub const SCARD_CLASS_ICC_STATE: ::ULONG = 9;
-pub const SCARD_CLASS_PERF: ::ULONG = 0x7ffe;
-pub const SCARD_CLASS_SYSTEM: ::ULONG = 0x7fff;
-pub const SCARD_ATTR_VENDOR_NAME: ::ULONG = SCARD_CLASS_VENDOR_INFO << 16 | 0x0100;
-pub const SCARD_ATTR_VENDOR_IFD_TYPE: ::ULONG = SCARD_CLASS_VENDOR_INFO << 16 | 0x0101;
-pub const SCARD_ATTR_VENDOR_IFD_VERSION: ::ULONG = SCARD_CLASS_VENDOR_INFO << 16 | 0x0102;
-pub const SCARD_ATTR_VENDOR_IFD_SERIAL_NO: ::ULONG = SCARD_CLASS_VENDOR_INFO << 16 | 0x0103;
-pub const SCARD_ATTR_CHANNEL_ID: ::ULONG = SCARD_CLASS_COMMUNICATIONS << 16 | 0x0110;
-pub const SCARD_ATTR_PROTOCOL_TYPES: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0120;
-pub const SCARD_ATTR_DEFAULT_CLK: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0121;
-pub const SCARD_ATTR_MAX_CLK: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0122;
-pub const SCARD_ATTR_DEFAULT_DATA_RATE: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0123;
-pub const SCARD_ATTR_MAX_DATA_RATE: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0124;
-pub const SCARD_ATTR_MAX_IFSD: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0125;
-pub const SCARD_ATTR_POWER_MGMT_SUPPORT: ::ULONG = SCARD_CLASS_POWER_MGMT << 16 | 0x0131;
-pub const SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE: ::ULONG = SCARD_CLASS_SECURITY << 16 | 0x0140;
-pub const SCARD_ATTR_USER_AUTH_INPUT_DEVICE: ::ULONG = SCARD_CLASS_SECURITY << 16 | 0x0142;
-pub const SCARD_ATTR_CHARACTERISTICS: ::ULONG = SCARD_CLASS_MECHANICAL << 16 | 0x0150;
-pub const SCARD_ATTR_CURRENT_PROTOCOL_TYPE: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0201;
-pub const SCARD_ATTR_CURRENT_CLK: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0202;
-pub const SCARD_ATTR_CURRENT_F: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0203;
-pub const SCARD_ATTR_CURRENT_D: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0204;
-pub const SCARD_ATTR_CURRENT_N: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0205;
-pub const SCARD_ATTR_CURRENT_W: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0206;
-pub const SCARD_ATTR_CURRENT_IFSC: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0207;
-pub const SCARD_ATTR_CURRENT_IFSD: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0208;
-pub const SCARD_ATTR_CURRENT_BWT: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0209;
-pub const SCARD_ATTR_CURRENT_CWT: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x020a;
-pub const SCARD_ATTR_CURRENT_EBC_ENCODING: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x020b;
-pub const SCARD_ATTR_EXTENDED_BWT: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x020c;
-pub const SCARD_ATTR_ICC_PRESENCE: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0300;
-pub const SCARD_ATTR_ICC_INTERFACE_STATUS: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0301;
-pub const SCARD_ATTR_CURRENT_IO_STATE: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0302;
-pub const SCARD_ATTR_ATR_STRING: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0303;
-pub const SCARD_ATTR_ICC_TYPE_PER_ATR: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0304;
-pub const SCARD_ATTR_ESC_RESET: ::ULONG = SCARD_CLASS_VENDOR_DEFINED << 16 | 0xA000;
-pub const SCARD_ATTR_ESC_CANCEL: ::ULONG = SCARD_CLASS_VENDOR_DEFINED << 16 | 0xA003;
-pub const SCARD_ATTR_ESC_AUTHREQUEST: ::ULONG = SCARD_CLASS_VENDOR_DEFINED << 16 | 0xA005;
-pub const SCARD_ATTR_MAXINPUT: ::ULONG = SCARD_CLASS_VENDOR_DEFINED << 16 | 0xA007;
-pub const SCARD_ATTR_DEVICE_UNIT: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0001;
-pub const SCARD_ATTR_DEVICE_IN_USE: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0002;
-pub const SCARD_ATTR_DEVICE_FRIENDLY_NAME_A: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0003;
-pub const SCARD_ATTR_DEVICE_SYSTEM_NAME_A: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0004;
-pub const SCARD_ATTR_DEVICE_FRIENDLY_NAME_W: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0005;
-pub const SCARD_ATTR_DEVICE_SYSTEM_NAME_W: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0006;
-pub const SCARD_ATTR_SUPRESS_T1_IFS_REQUEST: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0007;
-pub const SCARD_PERF_NUM_TRANSMISSIONS: ::ULONG = SCARD_CLASS_PERF << 16 | 0x0001;
-pub const SCARD_PERF_BYTES_TRANSMITTED: ::ULONG = SCARD_CLASS_PERF << 16 | 0x0002;
-pub const SCARD_PERF_TRANSMISSION_TIME: ::ULONG = SCARD_CLASS_PERF << 16 | 0x0003;
-pub const SCARD_T0_HEADER_LENGTH: ::DWORD = 7;
-pub const SCARD_T0_CMD_LENGTH: ::DWORD = 5;
-pub const SCARD_T1_PROLOGUE_LENGTH: ::DWORD = 3;
-pub const SCARD_T1_EPILOGUE_LENGTH: ::DWORD = 2;
-pub const SCARD_T1_MAX_IFS: ::DWORD = 254;
-pub const SCARD_UNKNOWN: ::ULONG = 0;
-pub const SCARD_ABSENT: ::ULONG = 1;
-pub const SCARD_PRESENT: ::ULONG = 2;
-pub const SCARD_SWALLOWED: ::ULONG = 3;
-pub const SCARD_POWERED: ::ULONG = 4;
-pub const SCARD_NEGOTIABLE: ::ULONG = 5;
-pub const SCARD_SPECIFIC: ::ULONG = 6;
-STRUCT!{struct SCARD_IO_REQUEST {
-    dwProtocol: ::DWORD,
-    cbPciLength: ::DWORD,
-}}
-pub type PSCARD_IO_REQUEST = *mut SCARD_IO_REQUEST;
-pub type LPSCARD_IO_REQUEST = *mut SCARD_IO_REQUEST;
-pub type LPCSCARD_IO_REQUEST = *const SCARD_IO_REQUEST;
-STRUCT!{struct SCARD_T0_COMMAND {
-    bCla: ::BYTE,
-    bIns: ::BYTE,
-    bP1: ::BYTE,
-    bP2: ::BYTE,
-    bP3: ::BYTE,
-}}
-pub type LPSCARD_T0_COMMAND = *mut SCARD_T0_COMMAND;
-STRUCT!{struct SCARD_T0_REQUEST {
-    ioRequest: SCARD_IO_REQUEST,
-    bSw1: ::BYTE,
-    bSw2: ::BYTE,
-    CmdBytes: SCARD_T0_COMMAND,
-}}
-UNION!(SCARD_T0_REQUEST, CmdBytes, rgbHeader, rgbHeader_mut, [::BYTE; 5]);
-pub type PSCARD_T0_REQUEST = *mut SCARD_T0_REQUEST;
-pub type LPSCARD_T0_REQUEST = *mut SCARD_T0_REQUEST;
-STRUCT!{struct SCARD_T1_REQUEST {
-    ioRequest: SCARD_IO_REQUEST,
-}}
-pub type PSCARD_T1_REQUEST = *mut SCARD_T1_REQUEST;
-pub type LPSCARD_T1_REQUEST = *mut SCARD_T1_REQUEST;
-pub const SCARD_READER_SWALLOWS: ::ULONG = 0x00000001;
-pub const SCARD_READER_EJECTS: ::ULONG = 0x00000002;
-pub const SCARD_READER_CONFISCATES: ::ULONG = 0x00000004;
-pub const SCARD_READER_TYPE_SERIAL: ::ULONG = 0x01;
-pub const SCARD_READER_TYPE_PARALELL: ::ULONG = 0x02;
-pub const SCARD_READER_TYPE_KEYBOARD: ::ULONG = 0x04;
-pub const SCARD_READER_TYPE_SCSI: ::ULONG = 0x08;
-pub const SCARD_READER_TYPE_IDE: ::ULONG = 0x10;
-pub const SCARD_READER_TYPE_USB: ::ULONG = 0x20;
-pub const SCARD_READER_TYPE_PCMCIA: ::ULONG = 0x40;
-pub const SCARD_READER_TYPE_TPM: ::ULONG = 0x80;
-pub const SCARD_READER_TYPE_NFC: ::ULONG = 0x100;
-pub const SCARD_READER_TYPE_UICC: ::ULONG = 0x200;
-pub const SCARD_READER_TYPE_VENDOR: ::ULONG = 0xF0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winsock2.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winsock2.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winsock2.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winsock2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,429 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! definitions to be used with the WinSock 2 DLL and WinSock 2 applications.
-//!
-//! This header file corresponds to version 2.2.x of the WinSock API specification.
-pub const WINSOCK_VERSION: ::WORD = 2 | (2 << 8);
-pub type u_char = ::c_uchar;
-pub type u_short = ::c_ushort;
-pub type u_int = ::c_uint;
-pub type u_long = ::c_ulong;
-pub type u_int64 = ::__uint64;
-pub type SOCKET = ::UINT_PTR;
-pub type GROUP = ::c_uint;
-pub const FD_SETSIZE: usize = 64;
-pub const FD_MAX_EVENTS: usize = 10;
-STRUCT!{nodebug struct fd_set {
-    fd_count: u_int,
-    fd_array: [SOCKET; FD_SETSIZE],
-}}
-STRUCT!{struct timeval {
-    tv_sec: ::c_long,
-    tv_usec: ::c_long,
-}}
-STRUCT!{struct hostent {
-    h_name: *mut ::c_char,
-    h_aliases: *mut *mut ::c_char,
-    h_addrtype: ::c_short,
-    h_length: ::c_short,
-    h_addr_list: *mut *mut ::c_char,
-}}
-STRUCT!{struct netent {
-    n_name: *mut ::c_char,
-    n_aliases: *mut *mut ::c_char,
-    n_addrtype: ::c_short,
-    n_net: u_long,
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{struct servent {
-    s_name: *mut ::c_char,
-    s_aliases: *mut *mut ::c_char,
-    s_port: ::c_short,
-    s_proto: *mut ::c_char,
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{struct servent {
-    s_name: *mut ::c_char,
-    s_aliases: *mut *mut ::c_char,
-    s_proto: *mut ::c_char,
-    s_port: ::c_short,
-}}
-STRUCT!{struct protoent {
-    p_name: *mut ::c_char,
-    p_aliases: *mut *mut ::c_char,
-    p_proto: ::c_short,
-}}
-pub const WSADESCRIPTION_LEN: usize = 256;
-pub const WSASYS_STATUS_LEN: usize = 128;
-#[cfg(target_arch="x86")]
-STRUCT!{nodebug struct WSADATA {
-    wVersion: ::WORD,
-    wHighVersion: ::WORD,
-    szDescription: [::c_char; WSADESCRIPTION_LEN + 1],
-    szSystemStatus: [::c_char; WSASYS_STATUS_LEN + 1],
-    iMaxSockets: ::c_ushort,
-    iMaxUdpDg: ::c_ushort,
-    lpVendorInfo: *mut ::c_char,
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{nodebug struct WSADATA {
-    wVersion: ::WORD,
-    wHighVersion: ::WORD,
-    iMaxSockets: ::c_ushort,
-    iMaxUdpDg: ::c_ushort,
-    lpVendorInfo: *mut ::c_char,
-    szDescription: [::c_char; WSADESCRIPTION_LEN + 1],
-    szSystemStatus: [::c_char; WSASYS_STATUS_LEN + 1],
-}}
-pub type LPWSADATA = *mut WSADATA;
-//391
-pub const INVALID_SOCKET: SOCKET = !0;
-pub const SOCKET_ERROR: ::c_int = -1;
-STRUCT!{struct sockproto {
-    sp_family: u_short,
-    sp_protocol: u_short,
-}}
-pub const PF_UNSPEC: ::c_int = ::AF_UNSPEC;
-pub const PF_UNIX: ::c_int = ::AF_UNIX;
-pub const PF_INET: ::c_int = ::AF_INET;
-pub const PF_IMPLINK: ::c_int = ::AF_IMPLINK;
-pub const PF_PUP: ::c_int = ::AF_PUP;
-pub const PF_CHAOS: ::c_int = ::AF_CHAOS;
-pub const PF_NS: ::c_int = ::AF_NS;
-pub const PF_IPX: ::c_int = ::AF_IPX;
-pub const PF_ISO: ::c_int = ::AF_ISO;
-pub const PF_OSI: ::c_int = ::AF_OSI;
-pub const PF_ECMA: ::c_int = ::AF_ECMA;
-pub const PF_DATAKIT: ::c_int = ::AF_DATAKIT;
-pub const PF_CCITT: ::c_int = ::AF_CCITT;
-pub const PF_SNA: ::c_int = ::AF_SNA;
-pub const PF_DECnet: ::c_int = ::AF_DECnet;
-pub const PF_DLI: ::c_int = ::AF_DLI;
-pub const PF_LAT: ::c_int = ::AF_LAT;
-pub const PF_HYLINK: ::c_int = ::AF_HYLINK;
-pub const PF_APPLETALK: ::c_int = ::AF_APPLETALK;
-pub const PF_VOICEVIEW: ::c_int = ::AF_VOICEVIEW;
-pub const PF_FIREFOX: ::c_int = ::AF_FIREFOX;
-pub const PF_UNKNOWN1: ::c_int = ::AF_UNKNOWN1;
-pub const PF_BAN: ::c_int = ::AF_BAN;
-pub const PF_ATM: ::c_int = ::AF_ATM;
-pub const PF_INET6: ::c_int = ::AF_INET6;
-pub const PF_BTH: ::c_int = ::AF_BTH;
-pub const PF_MAX: ::c_int = ::AF_MAX;
-STRUCT!{struct linger {
-    l_onoff: u_short,
-    l_linger: u_short,
-}}
-pub const SOMAXCONN: ::c_int = 0x7fffffff;
-pub type WSAEVENT = ::HANDLE;
-pub type LPWSAEVENT = ::LPHANDLE;
-pub type WSAOVERLAPPED = ::OVERLAPPED;
-pub type LPWSAOVERLAPPED = *mut ::OVERLAPPED;
-pub const WSA_IO_PENDING: ::DWORD = ::ERROR_IO_PENDING;
-pub const WSA_IO_INCOMPLETE: ::DWORD = ::ERROR_IO_INCOMPLETE;
-pub const WSA_INVALID_HANDLE: ::DWORD = ::ERROR_INVALID_HANDLE;
-pub const WSA_INVALID_PARAMETER: ::DWORD = ::ERROR_INVALID_PARAMETER;
-pub const WSA_NOT_ENOUGH_MEMORY: ::DWORD = ::ERROR_NOT_ENOUGH_MEMORY;
-pub const WSA_OPERATION_ABORTED: ::DWORD = ::ERROR_OPERATION_ABORTED;
-STRUCT!{struct QOS {
-    SendingFlowspec: ::FLOWSPEC,
-    FLOWSPEC: ::FLOWSPEC,
-    ProviderSpecific: ::WSABUF,
-}}
-pub type LPQOS = *mut QOS;
-STRUCT!{struct WSANETWORKEVENTS {
-    lNetworkEvents: ::c_long,
-    iErrorCode: [::c_int; FD_MAX_EVENTS],
-}}
-pub type LPWSANETWORKEVENTS = *mut WSANETWORKEVENTS;
-pub const MAX_PROTOCOL_CHAIN: usize = 7;
-STRUCT!{struct WSAPROTOCOLCHAIN {
-    ChainLen: ::c_int,
-    ChainEntries: [::DWORD; MAX_PROTOCOL_CHAIN],
-}}
-pub type LPWSAPROTOCOLCHAIN = *mut WSAPROTOCOLCHAIN;
-pub const WSAPROTOCOL_LEN: usize = 255;
-STRUCT!{nodebug struct WSAPROTOCOL_INFOA {
-    dwServiceFlags1: ::DWORD,
-    dwServiceFlags2: ::DWORD,
-    dwServiceFlags3: ::DWORD,
-    dwServiceFlags4: ::DWORD,
-    dwServiceFlags5: ::DWORD,
-    ProviderId: ::GUID,
-    dwCatalogEntryId: ::DWORD,
-    ProtocolChain: WSAPROTOCOLCHAIN,
-    iVersion: ::c_int,
-    iAddressFamily: ::c_int,
-    iMaxSockAddr: ::c_int,
-    iMinSockAddr: ::c_int,
-    iSocketType: ::c_int,
-    iProtocol: ::c_int,
-    iProtocolMaxOffset: ::c_int,
-    iNetworkByteOrder: ::c_int,
-    iSecurityScheme: ::c_int,
-    dwMessageSize: ::DWORD,
-    dwProviderReserved: ::DWORD,
-    szProtocol: [::CHAR; WSAPROTOCOL_LEN + 1],
-}}
-pub type LPWSAPROTOCOL_INFOA = *mut WSAPROTOCOL_INFOA;
-STRUCT!{nodebug struct WSAPROTOCOL_INFOW {
-    dwServiceFlags1: ::DWORD,
-    dwServiceFlags2: ::DWORD,
-    dwServiceFlags3: ::DWORD,
-    dwServiceFlags4: ::DWORD,
-    dwServiceFlags5: ::DWORD,
-    ProviderId: ::GUID,
-    dwCatalogEntryId: ::DWORD,
-    ProtocolChain: WSAPROTOCOLCHAIN,
-    iVersion: ::c_int,
-    iAddressFamily: ::c_int,
-    iMaxSockAddr: ::c_int,
-    iMinSockAddr: ::c_int,
-    iSocketType: ::c_int,
-    iProtocol: ::c_int,
-    iProtocolMaxOffset: ::c_int,
-    iNetworkByteOrder: ::c_int,
-    iSecurityScheme: ::c_int,
-    dwMessageSize: ::DWORD,
-    dwProviderReserved: ::DWORD,
-    szProtocol: [::WCHAR; WSAPROTOCOL_LEN + 1],
-}}
-pub type LPWSAPROTOCOL_INFOW = *mut WSAPROTOCOL_INFOW;
-pub type LPCONDITIONPROC = Option<unsafe extern "system" fn(
-    lpCallerId: ::LPWSABUF, lpCallerData: ::LPWSABUF, lpSQOS: LPQOS, lpGQOS: LPQOS,
-    lpCalleeId: ::LPWSABUF, lpCalleeData: ::LPWSABUF, g: *mut GROUP, dwCallbackData: ::DWORD,
-) -> ::c_int>;
-pub type LPWSAOVERLAPPED_COMPLETION_ROUTINE = Option<unsafe extern "system" fn(
-    dwError: ::DWORD, cbTransferred: ::DWORD, lpOverlapped: LPWSAOVERLAPPED, dwFlags: ::DWORD,
-)>;
-ENUM!{enum WSACOMPLETIONTYPE {
-    NSP_NOTIFY_IMMEDIATELY = 0,
-    NSP_NOTIFY_HWND,
-    NSP_NOTIFY_EVENT,
-    NSP_NOTIFY_PORT,
-    NSP_NOTIFY_APC,
-}}
-pub type PWSACOMPLETIONTYPE = *mut WSACOMPLETIONTYPE;
-pub type LPWSACOMPLETIONTYPE = *mut WSACOMPLETIONTYPE;
-STRUCT!{struct WSACOMPLETION_WindowMessage {
-    hWnd: ::HWND,
-    uMsg: ::UINT,
-    context: ::WPARAM,
-}}
-STRUCT!{struct WSACOMPLETION_Event {
-    lpOverlapped: LPWSAOVERLAPPED,
-}}
-STRUCT!{nodebug struct WSACOMPLETION_Apc {
-    lpOverlapped: LPWSAOVERLAPPED,
-    lpfnCompletionProc: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-}}
-STRUCT!{struct WSACOMPLETION_Port {
-    lpOverlapped: LPWSAOVERLAPPED,
-    hPort: ::HANDLE,
-    Key: ::ULONG_PTR,
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{struct WSACOMPLETION {
-    Type: WSACOMPLETIONTYPE,
-    Parameters: [u8; 12],
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{struct WSACOMPLETION {
-    Type: WSACOMPLETIONTYPE,
-    Parameters: [u8; 24],
-}}
-UNION!(WSACOMPLETION, Parameters, WindowMessage, WindowMessage_mut, WSACOMPLETION_WindowMessage);
-UNION!(WSACOMPLETION, Parameters, Event, Event_mut, WSACOMPLETION_Event);
-UNION!(WSACOMPLETION, Parameters, Apc, Apc_mut, WSACOMPLETION_Apc);
-UNION!(WSACOMPLETION, Parameters, Port, Port_mut, WSACOMPLETION_Port);
-pub type PWSACOMPLETION = *mut WSACOMPLETION;
-pub type LPWSACOMPLETION = *mut WSACOMPLETION;
-STRUCT!{struct AFPROTOCOLS {
-    iAddressFamily: ::INT,
-    iProtocol: ::INT,
-}}
-pub type PAFPROTOCOLS = *mut AFPROTOCOLS;
-pub type LPAFPROTOCOLS = *mut AFPROTOCOLS;
-ENUM!{enum WSAECOMPARATOR {
-    COMP_EQUAL = 0,
-    COMP_NOTLESS,
-}}
-pub type PWSAECOMPARATOR = *mut WSAECOMPARATOR;
-pub type LPWSAECOMPARATOR = *mut WSAECOMPARATOR;
-STRUCT!{struct WSAVERSION {
-    dwVersion: ::DWORD,
-    ecHow: WSAECOMPARATOR,
-}}
-pub type PWSAVERSION = *mut WSAVERSION;
-pub type LPWSAVERSION = *mut WSAVERSION;
-STRUCT!{struct WSAQUERYSETA {
-    dwSize: ::DWORD,
-    lpszServiceInstanceName: ::LPSTR,
-    lpServiceClassId: ::LPGUID,
-    lpVersion: LPWSAVERSION,
-    lpszComment: ::LPSTR,
-    dwNameSpace: ::DWORD,
-    lpNSProviderId: ::LPGUID,
-    lpszContext: ::LPSTR,
-    dwNumberOfProtocols: ::DWORD,
-    lpafpProtocols: LPAFPROTOCOLS,
-    lpszQueryString: ::LPSTR,
-    dwNumberOfCsAddrs: ::DWORD,
-    lpcsaBuffer: ::LPCSADDR_INFO,
-    dwOutputFlags: ::DWORD,
-    lpBlob: ::LPBLOB,
-}}
-pub type PWSAQUERYSETA = *mut WSAQUERYSETA;
-pub type LPWSAQUERYSETA = *mut WSAQUERYSETA;
-STRUCT!{struct WSAQUERYSETW {
-    dwSize: ::DWORD,
-    lpszServiceInstanceName: ::LPWSTR,
-    lpServiceClassId: ::LPGUID,
-    lpVersion: LPWSAVERSION,
-    lpszComment: ::LPWSTR,
-    dwNameSpace: ::DWORD,
-    lpNSProviderId: ::LPGUID,
-    lpszContext: ::LPWSTR,
-    dwNumberOfProtocols: ::DWORD,
-    lpafpProtocols: LPAFPROTOCOLS,
-    lpszQueryString: ::LPWSTR,
-    dwNumberOfCsAddrs: ::DWORD,
-    lpcsaBuffer: ::LPCSADDR_INFO,
-    dwOutputFlags: ::DWORD,
-    lpBlob: ::LPBLOB,
-}}
-pub type PWSAQUERYSETW = *mut WSAQUERYSETW;
-pub type LPWSAQUERYSETW = *mut WSAQUERYSETW;
-STRUCT!{struct WSAQUERYSET2A {
-    dwSize: ::DWORD,
-    lpszServiceInstanceName: ::LPSTR,
-    lpVersion: LPWSAVERSION,
-    lpszComment: ::LPSTR,
-    dwNameSpace: ::DWORD,
-    lpNSProviderId: ::LPGUID,
-    lpszContext: ::LPSTR,
-    dwNumberOfProtocols: ::DWORD,
-    lpafpProtocols: LPAFPROTOCOLS,
-    lpszQueryString: ::LPSTR,
-    dwNumberOfCsAddrs: ::DWORD,
-    lpcsaBuffer: ::LPCSADDR_INFO,
-    dwOutputFlags: ::DWORD,
-    lpBlob: ::LPBLOB,
-}}
-pub type PWSAQUERYSET2A = *mut WSAQUERYSET2A;
-pub type LPWSAQUERYSET2A = *mut WSAQUERYSET2A;
-STRUCT!{struct WSAQUERYSET2W {
-    dwSize: ::DWORD,
-    lpszServiceInstanceName: ::LPWSTR,
-    lpVersion: LPWSAVERSION,
-    lpszComment: ::LPWSTR,
-    dwNameSpace: ::DWORD,
-    lpNSProviderId: ::LPGUID,
-    lpszContext: ::LPWSTR,
-    dwNumberOfProtocols: ::DWORD,
-    lpafpProtocols: LPAFPROTOCOLS,
-    lpszQueryString: ::LPWSTR,
-    dwNumberOfCsAddrs: ::DWORD,
-    lpcsaBuffer: ::LPCSADDR_INFO,
-    dwOutputFlags: ::DWORD,
-    lpBlob: ::LPBLOB,
-}}
-pub type PWSAQUERYSET2W = *mut WSAQUERYSET2W;
-pub type LPWSAQUERYSET2W = *mut WSAQUERYSET2W;
-ENUM!{enum WSAESETSERVICEOP {
-    RNRSERVICE_REGISTER = 0,
-    RNRSERVICE_DEREGISTER,
-    RNRSERVICE_DELETE,
-}}
-pub type PWSAESETSERVICEOP = *mut WSAESETSERVICEOP;
-pub type LPWSAESETSERVICEOP = *mut WSAESETSERVICEOP;
-STRUCT!{struct WSANSCLASSINFOA {
-    lpszName: ::LPSTR,
-    dwNameSpace: ::DWORD,
-    dwValueType: ::DWORD,
-    dwValueSize: ::DWORD,
-    lpValue: ::LPVOID,
-}}
-pub type PWSANSCLASSINFOA = *mut WSANSCLASSINFOA;
-pub type LPWSANSCLASSINFOA = *mut WSANSCLASSINFOA;
-STRUCT!{struct WSANSCLASSINFOW {
-    lpszName: ::LPWSTR,
-    dwNameSpace: ::DWORD,
-    dwValueType: ::DWORD,
-    dwValueSize: ::DWORD,
-    lpValue: ::LPVOID,
-}}
-pub type PWSANSCLASSINFOW = *mut WSANSCLASSINFOW;
-pub type LPWSANSCLASSINFOW = *mut WSANSCLASSINFOW;
-STRUCT!{struct WSASERVICECLASSINFOA {
-    lpServiceClassId: ::LPGUID,
-    lpszServiceClassName: ::LPSTR,
-    dwCount: ::DWORD,
-    lpClassInfos: LPWSANSCLASSINFOA,
-}}
-pub type PWSASERVICECLASSINFOA = *mut WSASERVICECLASSINFOA;
-pub type LPWSASERVICECLASSINFOA = *mut WSASERVICECLASSINFOA;
-STRUCT!{struct WSASERVICECLASSINFOW {
-    lpServiceClassId: ::LPGUID,
-    lpszServiceClassName: ::LPWSTR,
-    dwCount: ::DWORD,
-    lpClassInfos: LPWSANSCLASSINFOW,
-}}
-pub type PWSASERVICECLASSINFOW = *mut WSASERVICECLASSINFOW;
-pub type LPWSASERVICECLASSINFOW = *mut WSASERVICECLASSINFOW;
-STRUCT!{struct WSANAMESPACE_INFOA {
-    NSProviderId: ::GUID,
-    dwNameSpace: ::DWORD,
-    fActive: ::BOOL,
-    dwVersion: ::DWORD,
-    lpszIdentifier: ::LPSTR,
-}}
-pub type PWSANAMESPACE_INFOA = *mut WSANAMESPACE_INFOA;
-pub type LPWSANAMESPACE_INFOA = *mut WSANAMESPACE_INFOA;
-STRUCT!{struct WSANAMESPACE_INFOW {
-    NSProviderId: ::GUID,
-    dwNameSpace: ::DWORD,
-    fActive: ::BOOL,
-    dwVersion: ::DWORD,
-    lpszIdentifier: ::LPWSTR,
-}}
-pub type PWSANAMESPACE_INFOW = *mut WSANAMESPACE_INFOW;
-pub type LPWSANAMESPACE_INFOW = *mut WSANAMESPACE_INFOW;
-STRUCT!{struct WSANAMESPACE_INFOEXA {
-    NSProviderId: ::GUID,
-    dwNameSpace: ::DWORD,
-    fActive: ::BOOL,
-    dwVersion: ::DWORD,
-    lpszIdentifier: ::LPSTR,
-    ProviderSpecific: ::BLOB,
-}}
-pub type PWSANAMESPACE_INFOEXA = *mut WSANAMESPACE_INFOEXA;
-pub type LPWSANAMESPACE_INFOEXA = *mut WSANAMESPACE_INFOEXA;
-STRUCT!{struct WSANAMESPACE_INFOEXW {
-    NSProviderId: ::GUID,
-    dwNameSpace: ::DWORD,
-    fActive: ::BOOL,
-    dwVersion: ::DWORD,
-    lpszIdentifier: ::LPWSTR,
-    ProviderSpecific: ::BLOB,
-}}
-pub type PWSANAMESPACE_INFOEXW = *mut WSANAMESPACE_INFOEXW;
-pub type LPWSANAMESPACE_INFOEXW = *mut WSANAMESPACE_INFOEXW;
-pub const POLLRDNORM: ::SHORT = 0x0100;
-pub const POLLRDBAND: ::SHORT = 0x0200;
-pub const POLLIN: ::SHORT = POLLRDNORM | POLLRDBAND;
-pub const POLLPRI: ::SHORT = 0x0400;
-pub const POLLWRNORM: ::SHORT = 0x0010;
-pub const POLLOUT: ::SHORT = POLLWRNORM;
-pub const POLLWRBAND: ::SHORT = 0x0020;
-pub const POLLERR: ::SHORT = 0x0001;
-pub const POLLHUP: ::SHORT = 0x0002;
-pub const POLLNVAL: ::SHORT = 0x0004;
-STRUCT!{struct WSAPOLLFD {
-    fd: ::SOCKET,
-    events: ::SHORT,
-    revents: ::SHORT,
-}}
-pub type PWSAPOLLFD = *mut WSAPOLLFD;
-pub type LPWSAPOLLFD = *mut WSAPOLLFD;
-pub const FIONBIO: ::c_ulong = 0x8004667e;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winspool.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winspool.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winspool.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winspool.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Winspool header file
-STRUCT!{struct PRINTER_DEFAULTSA {
-    pDataType: ::LPSTR,
-    pDevMode: ::LPDEVMODEA,
-    DesiredAccess: ::ACCESS_MASK,
-}}
-pub type PPRINTER_DEFAULTSA = *mut PRINTER_DEFAULTSA;
-pub type LPPRINTER_DEFAULTSA = *mut PRINTER_DEFAULTSA;
-STRUCT!{struct PRINTER_DEFAULTSW {
-    pDataType: ::LPWSTR,
-    pDevMode: ::LPDEVMODEW,
-    DesiredAccess: ::ACCESS_MASK,
-}}
-pub type PPRINTER_DEFAULTSW = *mut PRINTER_DEFAULTSW;
-pub type LPPRINTER_DEFAULTSW = *mut PRINTER_DEFAULTSW;
-STRUCT!{struct PRINTER_OPTIONSA {
-    cbSize: ::UINT,
-    dwFlags: ::DWORD,
-}}
-pub type PPRINTER_OPTIONSA = *mut PRINTER_OPTIONSA;
-pub type LPPRINTER_OPTIONSA = *mut PRINTER_OPTIONSA;
-STRUCT!{struct PRINTER_OPTIONSW {
-    cbSize: ::UINT,
-    dwFlags: ::DWORD,
-}}
-pub type PPRINTER_OPTIONSW = *mut PRINTER_OPTIONSW;
-pub type LPPRINTER_OPTIONSW = *mut PRINTER_OPTIONSW;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winstring.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winstring.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winstring.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winstring.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-pub type PINSPECT_HSTRING_CALLBACK = Option<unsafe extern "system" fn(
-    *const ::VOID, ::UINT_PTR, ::UINT32, *mut ::BYTE,
-) -> ::HRESULT>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winsvc.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winsvc.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winsvc.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winsvc.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,200 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Header file for the Service Control Manager
-//80
-pub const SERVICE_NO_CHANGE: ::DWORD = 0xffffffff;
-pub const SERVICE_ACTIVE: ::DWORD = 0x00000001;
-pub const SERVICE_INACTIVE: ::DWORD = 0x00000002;
-pub const SERVICE_STATE_ALL: ::DWORD = SERVICE_ACTIVE | SERVICE_INACTIVE;
-pub const SERVICE_CONTROL_STOP: ::DWORD = 0x00000001;
-pub const SERVICE_CONTROL_PAUSE: ::DWORD = 0x00000002;
-pub const SERVICE_CONTROL_CONTINUE: ::DWORD = 0x00000003;
-pub const SERVICE_CONTROL_INTERROGATE: ::DWORD = 0x00000004;
-pub const SERVICE_CONTROL_SHUTDOWN: ::DWORD = 0x00000005;
-pub const SERVICE_CONTROL_PARAMCHANGE: ::DWORD = 0x00000006;
-pub const SERVICE_CONTROL_NETBINDADD: ::DWORD = 0x00000007;
-pub const SERVICE_CONTROL_NETBINDREMOVE: ::DWORD = 0x00000008;
-pub const SERVICE_CONTROL_NETBINDENABLE: ::DWORD = 0x00000009;
-pub const SERVICE_CONTROL_NETBINDDISABLE: ::DWORD = 0x0000000A;
-pub const SERVICE_CONTROL_DEVICEEVENT: ::DWORD = 0x0000000B;
-pub const SERVICE_CONTROL_HARDWAREPROFILECHANGE: ::DWORD = 0x0000000C;
-pub const SERVICE_CONTROL_POWEREVENT: ::DWORD = 0x0000000D;
-pub const SERVICE_CONTROL_SESSIONCHANGE: ::DWORD = 0x0000000E;
-pub const SERVICE_CONTROL_PRESHUTDOWN: ::DWORD = 0x0000000F;
-pub const SERVICE_CONTROL_TIMECHANGE: ::DWORD = 0x00000010;
-pub const SERVICE_CONTROL_TRIGGEREVENT: ::DWORD = 0x00000020;
-pub const SERVICE_STOPPED: ::DWORD = 0x00000001;
-pub const SERVICE_START_PENDING: ::DWORD = 0x00000002;
-pub const SERVICE_STOP_PENDING: ::DWORD = 0x00000003;
-pub const SERVICE_RUNNING: ::DWORD = 0x00000004;
-pub const SERVICE_CONTINUE_PENDING: ::DWORD = 0x00000005;
-pub const SERVICE_PAUSE_PENDING: ::DWORD = 0x00000006;
-pub const SERVICE_PAUSED: ::DWORD = 0x00000007;
-pub const SERVICE_ACCEPT_STOP: ::DWORD = 0x00000001;
-pub const SERVICE_ACCEPT_PAUSE_CONTINUE: ::DWORD = 0x00000002;
-pub const SERVICE_ACCEPT_SHUTDOWN: ::DWORD = 0x00000004;
-pub const SERVICE_ACCEPT_PARAMCHANGE: ::DWORD = 0x00000008;
-pub const SERVICE_ACCEPT_NETBINDCHANGE: ::DWORD = 0x00000010;
-pub const SERVICE_ACCEPT_HARDWAREPROFILECHANGE: ::DWORD = 0x00000020;
-pub const SERVICE_ACCEPT_POWEREVENT: ::DWORD = 0x00000040;
-pub const SERVICE_ACCEPT_SESSIONCHANGE: ::DWORD = 0x00000080;
-pub const SERVICE_ACCEPT_PRESHUTDOWN: ::DWORD = 0x00000100;
-pub const SERVICE_ACCEPT_TIMECHANGE: ::DWORD = 0x00000200;
-pub const SERVICE_ACCEPT_TRIGGEREVENT: ::DWORD = 0x00000400;
-pub const SC_MANAGER_CONNECT: ::DWORD = 0x0001;
-pub const SC_MANAGER_CREATE_SERVICE: ::DWORD = 0x0002;
-pub const SC_MANAGER_ENUMERATE_SERVICE: ::DWORD = 0x0004;
-pub const SC_MANAGER_LOCK: ::DWORD = 0x0008;
-pub const SC_MANAGER_QUERY_LOCK_STATUS: ::DWORD = 0x0010;
-pub const SC_MANAGER_MODIFY_BOOT_CONFIG: ::DWORD = 0x0020;
-pub const SC_MANAGER_ALL_ACCESS: ::DWORD = ::STANDARD_RIGHTS_REQUIRED | SC_MANAGER_CONNECT
-    | SC_MANAGER_CREATE_SERVICE | SC_MANAGER_ENUMERATE_SERVICE | SC_MANAGER_LOCK
-    | SC_MANAGER_QUERY_LOCK_STATUS | SC_MANAGER_MODIFY_BOOT_CONFIG;
-pub const SERVICE_QUERY_CONFIG: ::DWORD = 0x0001;
-pub const SERVICE_CHANGE_CONFIG: ::DWORD = 0x0002;
-pub const SERVICE_QUERY_STATUS: ::DWORD = 0x0004;
-pub const SERVICE_ENUMERATE_DEPENDENTS: ::DWORD = 0x0008;
-pub const SERVICE_START: ::DWORD = 0x0010;
-pub const SERVICE_STOP: ::DWORD = 0x0020;
-pub const SERVICE_PAUSE_CONTINUE: ::DWORD = 0x0040;
-pub const SERVICE_INTERROGATE: ::DWORD = 0x0080;
-pub const SERVICE_USER_DEFINED_CONTROL: ::DWORD = 0x0100;
-pub const SERVICE_ALL_ACCESS: ::DWORD = ::STANDARD_RIGHTS_REQUIRED | SERVICE_QUERY_CONFIG
-    | SERVICE_CHANGE_CONFIG | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_START
-    | SERVICE_STOP | SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_USER_DEFINED_CONTROL;
-pub const SERVICE_RUNS_IN_SYSTEM_PROCESS: ::DWORD = 0x00000001;
-pub const SERVICE_CONFIG_DESCRIPTION: ::DWORD = 1;
-pub const SERVICE_CONFIG_FAILURE_ACTIONS: ::DWORD = 2;
-pub const SERVICE_CONFIG_DELAYED_AUTO_START_INFO: ::DWORD = 3;
-pub const SERVICE_CONFIG_FAILURE_ACTIONS_FLAG: ::DWORD = 4;
-pub const SERVICE_CONFIG_SERVICE_SID_INFO: ::DWORD = 5;
-pub const SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO: ::DWORD = 6;
-pub const SERVICE_CONFIG_PRESHUTDOWN_INFO: ::DWORD = 7;
-pub const SERVICE_CONFIG_TRIGGER_INFO: ::DWORD = 8;
-pub const SERVICE_CONFIG_PREFERRED_NODE: ::DWORD = 9;
-pub const SERVICE_CONFIG_LAUNCH_PROTECTED: ::DWORD = 12;
-pub const SERVICE_NOTIFY_STATUS_CHANGE_1: ::DWORD = 1;
-pub const SERVICE_NOTIFY_STATUS_CHANGE_2: ::DWORD = 2;
-pub const SERVICE_NOTIFY_STATUS_CHANGE: ::DWORD = SERVICE_NOTIFY_STATUS_CHANGE_2;
-pub const SERVICE_NOTIFY_STOPPED: ::DWORD = 0x00000001;
-pub const SERVICE_NOTIFY_START_PENDING: ::DWORD = 0x00000002;
-pub const SERVICE_NOTIFY_STOP_PENDING: ::DWORD = 0x00000004;
-pub const SERVICE_NOTIFY_RUNNING: ::DWORD = 0x00000008;
-pub const SERVICE_NOTIFY_CONTINUE_PENDING: ::DWORD = 0x00000010;
-pub const SERVICE_NOTIFY_PAUSE_PENDING: ::DWORD = 0x00000020;
-pub const SERVICE_NOTIFY_PAUSED: ::DWORD = 0x00000040;
-pub const SERVICE_NOTIFY_CREATED: ::DWORD = 0x00000080;
-pub const SERVICE_NOTIFY_DELETED: ::DWORD = 0x00000100;
-pub const SERVICE_NOTIFY_DELETE_PENDING: ::DWORD = 0x00000200;
-pub const SERVICE_STOP_REASON_FLAG_MIN: ::DWORD = 0x00000000;
-pub const SERVICE_STOP_REASON_FLAG_UNPLANNED: ::DWORD = 0x10000000;
-pub const SERVICE_STOP_REASON_FLAG_CUSTOM: ::DWORD = 0x20000000;
-pub const SERVICE_STOP_REASON_FLAG_PLANNED: ::DWORD = 0x40000000;
-pub const SERVICE_STOP_REASON_FLAG_MAX: ::DWORD = 0x80000000;
-pub const SERVICE_STOP_REASON_MAJOR_MIN: ::DWORD = 0x00000000;
-pub const SERVICE_STOP_REASON_MAJOR_OTHER: ::DWORD = 0x00010000;
-pub const SERVICE_STOP_REASON_MAJOR_HARDWARE: ::DWORD = 0x00020000;
-pub const SERVICE_STOP_REASON_MAJOR_OPERATINGSYSTEM: ::DWORD = 0x00030000;
-pub const SERVICE_STOP_REASON_MAJOR_SOFTWARE: ::DWORD = 0x00040000;
-pub const SERVICE_STOP_REASON_MAJOR_APPLICATION: ::DWORD = 0x00050000;
-pub const SERVICE_STOP_REASON_MAJOR_NONE: ::DWORD = 0x00060000;
-pub const SERVICE_STOP_REASON_MAJOR_MAX: ::DWORD = 0x00070000;
-pub const SERVICE_STOP_REASON_MAJOR_MIN_CUSTOM: ::DWORD = 0x00400000;
-pub const SERVICE_STOP_REASON_MAJOR_MAX_CUSTOM: ::DWORD = 0x00ff0000;
-pub const SERVICE_STOP_REASON_MINOR_MIN: ::DWORD = 0x00000000;
-pub const SERVICE_STOP_REASON_MINOR_OTHER: ::DWORD = 0x00000001;
-pub const SERVICE_STOP_REASON_MINOR_MAINTENANCE: ::DWORD = 0x00000002;
-pub const SERVICE_STOP_REASON_MINOR_INSTALLATION: ::DWORD = 0x00000003;
-pub const SERVICE_STOP_REASON_MINOR_UPGRADE: ::DWORD = 0x00000004;
-pub const SERVICE_STOP_REASON_MINOR_RECONFIG: ::DWORD = 0x00000005;
-pub const SERVICE_STOP_REASON_MINOR_HUNG: ::DWORD = 0x00000006;
-pub const SERVICE_STOP_REASON_MINOR_UNSTABLE: ::DWORD = 0x00000007;
-pub const SERVICE_STOP_REASON_MINOR_DISK: ::DWORD = 0x00000008;
-pub const SERVICE_STOP_REASON_MINOR_NETWORKCARD: ::DWORD = 0x00000009;
-pub const SERVICE_STOP_REASON_MINOR_ENVIRONMENT: ::DWORD = 0x0000000a;
-pub const SERVICE_STOP_REASON_MINOR_HARDWARE_DRIVER: ::DWORD = 0x0000000b;
-pub const SERVICE_STOP_REASON_MINOR_OTHERDRIVER: ::DWORD = 0x0000000c;
-pub const SERVICE_STOP_REASON_MINOR_SERVICEPACK: ::DWORD = 0x0000000d;
-pub const SERVICE_STOP_REASON_MINOR_SOFTWARE_UPDATE: ::DWORD = 0x0000000e;
-pub const SERVICE_STOP_REASON_MINOR_SECURITYFIX: ::DWORD = 0x0000000f;
-pub const SERVICE_STOP_REASON_MINOR_SECURITY: ::DWORD = 0x00000010;
-pub const SERVICE_STOP_REASON_MINOR_NETWORK_CONNECTIVITY: ::DWORD = 0x00000011;
-pub const SERVICE_STOP_REASON_MINOR_WMI: ::DWORD = 0x00000012;
-pub const SERVICE_STOP_REASON_MINOR_SERVICEPACK_UNINSTALL: ::DWORD = 0x00000013;
-pub const SERVICE_STOP_REASON_MINOR_SOFTWARE_UPDATE_UNINSTALL: ::DWORD = 0x00000014;
-pub const SERVICE_STOP_REASON_MINOR_SECURITYFIX_UNINSTALL: ::DWORD = 0x00000015;
-pub const SERVICE_STOP_REASON_MINOR_MMC: ::DWORD = 0x00000016;
-pub const SERVICE_STOP_REASON_MINOR_NONE: ::DWORD = 0x00000017;
-pub const SERVICE_STOP_REASON_MINOR_MAX: ::DWORD = 0x00000018;
-pub const SERVICE_STOP_REASON_MINOR_MIN_CUSTOM: ::DWORD = 0x00000100;
-pub const SERVICE_STOP_REASON_MINOR_MAX_CUSTOM: ::DWORD = 0x0000FFFF;
-pub const SERVICE_CONTROL_STATUS_REASON_INFO: ::DWORD = 1;
-pub const SERVICE_SID_TYPE_NONE: ::DWORD = 0x00000000;
-pub const SERVICE_SID_TYPE_UNRESTRICTED: ::DWORD = 0x00000001;
-pub const SERVICE_SID_TYPE_RESTRICTED: ::DWORD = 0x00000002 | SERVICE_SID_TYPE_UNRESTRICTED;
-pub const SERVICE_TRIGGER_TYPE_DEVICE_INTERFACE_ARRIVAL: ::DWORD = 1;
-pub const SERVICE_TRIGGER_TYPE_IP_ADDRESS_AVAILABILITY: ::DWORD = 2;
-pub const SERVICE_TRIGGER_TYPE_DOMAIN_JOIN: ::DWORD = 3;
-pub const SERVICE_TRIGGER_TYPE_FIREWALL_PORT_EVENT: ::DWORD = 4;
-pub const SERVICE_TRIGGER_TYPE_GROUP_POLICY: ::DWORD = 5;
-pub const SERVICE_TRIGGER_TYPE_NETWORK_ENDPOINT: ::DWORD = 6;
-pub const SERVICE_TRIGGER_TYPE_CUSTOM_SYSTEM_STATE_CHANGE: ::DWORD = 7;
-pub const SERVICE_TRIGGER_TYPE_CUSTOM: ::DWORD = 20;
-pub const SERVICE_TRIGGER_DATA_TYPE_BINARY: ::DWORD = 1;
-pub const SERVICE_TRIGGER_DATA_TYPE_STRING: ::DWORD = 2;
-pub const SERVICE_TRIGGER_DATA_TYPE_LEVEL: ::DWORD = 3;
-pub const SERVICE_TRIGGER_DATA_TYPE_KEYWORD_ANY: ::DWORD = 4;
-pub const SERVICE_TRIGGER_DATA_TYPE_KEYWORD_ALL: ::DWORD = 5;
-pub const SERVICE_START_REASON_DEMAND: ::DWORD = 0x00000001;
-pub const SERVICE_START_REASON_AUTO: ::DWORD = 0x00000002;
-pub const SERVICE_START_REASON_TRIGGER: ::DWORD = 0x00000004;
-pub const SERVICE_START_REASON_RESTART_ON_FAILURE: ::DWORD = 0x00000008;
-pub const SERVICE_START_REASON_DELAYEDAUTO: ::DWORD = 0x00000010;
-pub const SERVICE_DYNAMIC_INFORMATION_LEVEL_START_REASON: ::DWORD = 1;
-pub const SERVICE_LAUNCH_PROTECTED_NONE: ::DWORD = 0;
-pub const SERVICE_LAUNCH_PROTECTED_WINDOWS: ::DWORD = 1;
-pub const SERVICE_LAUNCH_PROTECTED_WINDOWS_LIGHT: ::DWORD = 2;
-pub const SERVICE_LAUNCH_PROTECTED_ANTIMALWARE_LIGHT: ::DWORD = 3;
-//678
-DECLARE_HANDLE!(SC_HANDLE, SC_HANDLE__);
-pub type LPSC_HANDLE = *mut SC_HANDLE;
-DECLARE_HANDLE!(SERVICE_STATUS_HANDLE, SERVICE_STATUS_HANDLE__);
-ENUM!{enum SC_STATUS_TYPE {
-    SC_STATUS_PROCESS_INFO = 0,
-}}
-ENUM!{enum _SC_ENUM_TYPE {
-    SC_ENUM_PROCESS_INFO = 0,
-}}
-//700
-STRUCT!{struct SERVICE_STATUS {
-    dwServiceType: ::DWORD,
-    dwCurrentState: ::DWORD,
-    dwControlsAccepted: ::DWORD,
-    dwWin32ExitCode: ::DWORD,
-    dwServiceSpecificExitCode: ::DWORD,
-    dwCheckPoint: ::DWORD,
-    dwWaitHint: ::DWORD,
-}}
-pub type LPSERVICE_STATUS = *mut SERVICE_STATUS;
-//848
-pub type LPSERVICE_MAIN_FUNCTIONW = Option<unsafe extern "system" fn(
-    dwNumServicesArgs: ::DWORD, lpServiceArgVectors: *mut ::LPWSTR,
-)>;
-pub type LPSERVICE_MAIN_FUNCTIONA = Option<unsafe extern "system" fn(
-    dwNumServicesArgs: ::DWORD, lpServiceArgVectors: *mut ::LPSTR,
-)>;
-STRUCT!{nodebug struct SERVICE_TABLE_ENTRYA {
-    lpServiceName: ::LPCSTR,
-    lpServiceProc: LPSERVICE_MAIN_FUNCTIONA,
-}}
-pub type LPSERVICE_TABLE_ENTRYA = *mut SERVICE_TABLE_ENTRYA;
-STRUCT!{nodebug struct SERVICE_TABLE_ENTRYW {
-    lpServiceName: ::LPCWSTR,
-    lpServiceProc: LPSERVICE_MAIN_FUNCTIONW,
-}}
-pub type LPSERVICE_TABLE_ENTRYW = *mut SERVICE_TABLE_ENTRYW;
-//900
-pub type LPHANDLER_FUNCTION = Option<unsafe extern "system" fn(dwControl: ::DWORD)>;
-pub type LPHANDLER_FUNCTION_EX = Option<unsafe extern "system" fn(
-    dwControl: ::DWORD, dwEventType: ::DWORD, lpEventData: ::LPVOID, lpContext: ::LPVOID,
-) -> ::DWORD>;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winusbio.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winusbio.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winusbio.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winusbio.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// Copyright © 2016, bitbegin
-// Licensed under the MIT License <LICENSE.md>
-//! USBIO Definitions.
-STRUCT!{struct WINUSB_PIPE_INFORMATION {
-	PipeType: ::USBD_PIPE_TYPE,
-	PipeId: ::UCHAR,
-	MaximumPacketSize: ::USHORT,
-	Interval: ::UCHAR,
-}}
-pub type PWINUSB_PIPE_INFORMATION = *mut WINUSB_PIPE_INFORMATION;
-STRUCT!{struct WINUSB_PIPE_INFORMATION_EX {
-	PipeType: ::USBD_PIPE_TYPE,
-	PipeId: ::UCHAR,
-	MaximumPacketSize: ::USHORT,
-	Interval: ::UCHAR,
-	MaximumBytesPerInterval: ::ULONG,
-}}
-pub type PWINUSB_PIPE_INFORMATION_EX = *mut WINUSB_PIPE_INFORMATION_EX;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winusb.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winusb.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winusb.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winusb.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-// Copyright © 2016, bitbegin
-// Licensed under the MIT License <LICENSE.md>
-//! FFI bindings to winusb.
-pub type WINUSB_INTERFACE_HANDLE = ::PVOID;
-pub type PWINUSB_INTERFACE_HANDLE = *mut ::PVOID;
-pub type WINUSB_ISOCH_BUFFER_HANDLE = ::PVOID;
-pub type PWINUSB_ISOCH_BUFFER_HANDLE = *mut ::PVOID;
-STRUCT!{#[repr(packed)] struct WINUSB_SETUP_PACKET {
-	RequestType: ::UCHAR,
-	Request: ::UCHAR,
-	Value: ::USHORT,
-	Index: ::USHORT,
-	Length: ::USHORT,
-}}
-pub type PWINUSB_SETUP_PACKET = *mut WINUSB_SETUP_PACKET;
-
-STRUCT!{struct USB_INTERFACE_DESCRIPTOR {
-	bLength: ::UCHAR,
-	bDescriptorType: ::UCHAR,
-	bInterfaceNumber: ::UCHAR,
-	bAlternateSetting: ::UCHAR,
-	bNumEndpoints: ::UCHAR,
-	bInterfaceClass: ::UCHAR,
-	bInterfaceSubClass: ::UCHAR,
-	bInterfaceProtocol: ::UCHAR,
-	iInterface: ::UCHAR,
-}}
-pub type PUSB_INTERFACE_DESCRIPTOR = *mut USB_INTERFACE_DESCRIPTOR;
-#[test]
-fn test_USB_INTERFACE_DESCRIPTOR_size() {
-    use std::mem::size_of;
-    assert_eq!(size_of::<USB_INTERFACE_DESCRIPTOR>(), 9)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winuser.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winuser.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/winuser.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/winuser.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2334 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! USER procedure declarations, constant definitions and macros
-
-// Edit Control Styles
-//
-pub const ES_LEFT: ::DWORD = 0x0000;
-pub const ES_CENTER: ::DWORD = 0x0001;
-pub const ES_RIGHT: ::DWORD = 0x0002;
-pub const ES_MULTILINE: ::DWORD = 0x0004;
-pub const ES_UPPERCASE: ::DWORD = 0x0008;
-pub const ES_LOWERCASE: ::DWORD = 0x0010;
-pub const ES_PASSWORD: ::DWORD = 0x0020;
-pub const ES_AUTOVSCROLL: ::DWORD = 0x0040;
-pub const ES_AUTOHSCROLL: ::DWORD = 0x0080;
-pub const ES_NOHIDESEL: ::DWORD = 0x0100;
-pub const ES_OEMCONVERT: ::DWORD = 0x0400;
-pub const ES_READONLY: ::DWORD = 0x0800;
-pub const ES_WANTRETURN: ::DWORD = 0x1000;
-pub const ES_NUMBER: ::DWORD = 0x2000;
-
-// Edit Control Notification Codes
-//
-pub const EN_SETFOCUS: ::WORD = 0x0100;
-pub const EN_KILLFOCUS: ::WORD = 0x0200;
-pub const EN_CHANGE: ::WORD = 0x0300;
-pub const EN_UPDATE: ::WORD = 0x0400;
-pub const EN_ERRSPACE: ::WORD = 0x0500;
-pub const EN_MAXTEXT: ::WORD = 0x0501;
-pub const EN_HSCROLL: ::WORD = 0x0601;
-pub const EN_VSCROLL: ::WORD = 0x0602;
-
-pub const EN_ALIGN_LTR_EC: ::WORD = 0x0700;
-pub const EN_ALIGN_RTL_EC: ::WORD = 0x0701;
-
-// Edit control EM_SETMARGIN parameters
-pub const EC_LEFTMARGIN: ::WORD = 0x0001;
-pub const EC_RIGHTMARGIN: ::WORD = 0x0002;
-pub const EC_USEFONTINFO: ::WORD = 0xffff;
-
-// wParam of EM_GET/SETIMESTATUS
-pub const EMSIS_COMPOSITIONSTRING: ::WORD = 0x0001;
-
-// lParam for EMSIS_COMPOSITIONSTRING
-pub const EIMES_GETCOMPSTRATONCE: ::WORD = 0x0001;
-pub const EIMES_CANCELCOMPSTRINFOCUS: ::WORD = 0x0002;
-pub const EIMES_COMPLETECOMPSTRKILLFOCUS: ::WORD = 0x0004;
-
-// Edit Control Messages
-//
-pub const EM_GETSEL: ::WORD = 0x00B0;
-pub const EM_SETSEL: ::WORD = 0x00B1;
-pub const EM_GETRECT: ::WORD = 0x00B2;
-pub const EM_SETRECT: ::WORD = 0x00B3;
-pub const EM_SETRECTNP: ::WORD = 0x00B4;
-pub const EM_SCROLL: ::WORD = 0x00B5;
-pub const EM_LINESCROLL: ::WORD = 0x00B6;
-pub const EM_SCROLLCARET: ::WORD = 0x00B7;
-pub const EM_GETMODIFY: ::WORD = 0x00B8;
-pub const EM_SETMODIFY: ::WORD = 0x00B9;
-pub const EM_GETLINECOUNT: ::WORD = 0x00BA;
-pub const EM_LINEINDEX: ::WORD = 0x00BB;
-pub const EM_SETHANDLE: ::WORD = 0x00BC;
-pub const EM_GETHANDLE: ::WORD = 0x00BD;
-pub const EM_GETTHUMB: ::WORD = 0x00BE;
-pub const EM_LINELENGTH: ::WORD = 0x00C1;
-pub const EM_REPLACESEL: ::WORD = 0x00C2;
-pub const EM_GETLINE: ::WORD = 0x00C4;
-pub const EM_LIMITTEXT: ::WORD = 0x00C5;
-pub const EM_CANUNDO: ::WORD = 0x00C6;
-pub const EM_UNDO: ::WORD = 0x00C7;
-pub const EM_FMTLINES: ::WORD = 0x00C8;
-pub const EM_LINEFROMCHAR: ::WORD = 0x00C9;
-pub const EM_SETTABSTOPS: ::WORD = 0x00CB;
-pub const EM_SETPASSWORDCHAR: ::WORD = 0x00CC;
-pub const EM_EMPTYUNDOBUFFER: ::WORD = 0x00CD;
-pub const EM_GETFIRSTVISIBLELINE: ::WORD = 0x00CE;
-pub const EM_SETREADONLY: ::WORD = 0x00CF;
-pub const EM_SETWORDBREAKPROC: ::WORD = 0x00D0;
-pub const EM_GETWORDBREAKPROC: ::WORD = 0x00D1;
-pub const EM_GETPASSWORDCHAR: ::WORD = 0x00D2;
-
-pub const EM_SETMARGINS: ::WORD = 0x00D3;
-pub const EM_GETMARGINS: ::WORD = 0x00D4;
-pub const EM_SETLIMITTEXT: ::WORD = EM_LIMITTEXT;
-pub const EM_GETLIMITTEXT: ::WORD = 0x00D5;
-pub const EM_POSFROMCHAR: ::WORD = 0x00D6;
-pub const EM_CHARFROMPOS: ::WORD = 0x00D7;
-
-pub const EM_SETIMESTATUS: ::WORD = 0x00D8;
-pub const EM_GETIMESTATUS: ::WORD = 0x00D9;
-
-// EDITWORDBREAKPROC code values
-//
-pub const WB_LEFT: ::WORD = 0;
-pub const WB_RIGHT: ::WORD = 1;
-pub const WB_ISDELIMITER: ::WORD = 2;
-
-pub const BN_CLICKED: ::WORD = 0;
-pub const BN_PAINT: ::WORD = 1;
-pub const BN_HILITE: ::WORD = 2;
-pub const BN_UNHILITE: ::WORD = 3;
-pub const BN_DISABLE: ::WORD = 4;
-pub const BN_DOUBLECLICKED: ::WORD = 5;
-pub const BN_PUSHED: ::WORD = BN_HILITE;
-pub const BN_UNPUSHED: ::WORD = BN_UNHILITE;
-pub const BN_DBLCLK: ::WORD = BN_DOUBLECLICKED;
-pub const BN_SETFOCUS: ::WORD = 6;
-pub const BN_KILLFOCUS: ::WORD = 7;
-pub const BS_PUSHBUTTON: ::DWORD = 0x00000000;
-pub const BS_DEFPUSHBUTTON: ::DWORD = 0x00000001;
-pub const BS_CHECKBOX: ::DWORD = 0x00000002;
-pub const BS_AUTOCHECKBOX: ::DWORD = 0x00000003;
-pub const BS_RADIOBUTTON: ::DWORD = 0x00000004;
-pub const BS_3STATE: ::DWORD = 0x00000005;
-pub const BS_AUTO3STATE: ::DWORD = 0x00000006;
-pub const BS_GROUPBOX: ::DWORD = 0x00000007;
-pub const BS_USERBUTTON: ::DWORD = 0x00000008;
-pub const BS_AUTORADIOBUTTON: ::DWORD = 0x00000009;
-pub const BS_PUSHBOX: ::DWORD = 0x0000000A;
-pub const BS_OWNERDRAW: ::DWORD = 0x0000000B;
-pub const BS_TYPEMASK: ::DWORD = 0x0000000F;
-pub const BS_LEFTTEXT: ::DWORD = 0x00000020;
-pub const BS_TEXT: ::DWORD = 0x00000000;
-pub const BS_ICON: ::DWORD = 0x00000040;
-pub const BS_BITMAP: ::DWORD = 0x00000080;
-pub const BS_LEFT: ::DWORD = 0x00000100;
-pub const BS_RIGHT: ::DWORD = 0x00000200;
-pub const BS_CENTER: ::DWORD = 0x00000300;
-pub const BS_TOP: ::DWORD = 0x00000400;
-pub const BS_BOTTOM: ::DWORD = 0x00000800;
-pub const BS_VCENTER: ::DWORD = 0x00000C00;
-pub const BS_PUSHLIKE: ::DWORD = 0x00001000;
-pub const BS_MULTILINE: ::DWORD = 0x00002000;
-pub const BS_NOTIFY: ::DWORD = 0x00004000;
-pub const BS_FLAT: ::DWORD = 0x00008000;
-pub const BS_RIGHTBUTTON: ::DWORD = BS_LEFTTEXT;
-pub const CCHILDREN_SCROLLBAR: usize = 5;
-pub const CDS_UPDATEREGISTRY: ::DWORD = 0x00000001;
-pub const CDS_TEST: ::DWORD = 0x00000002;
-pub const CDS_FULLSCREEN: ::DWORD = 0x00000004;
-pub const CDS_GLOBAL: ::DWORD = 0x00000008;
-pub const CDS_SET_PRIMARY: ::DWORD = 0x00000010;
-pub const CDS_VIDEOPARAMETERS: ::DWORD = 0x00000020;
-pub const CDS_ENABLE_UNSAFE_MODES: ::DWORD = 0x00000100;
-pub const CDS_DISABLE_UNSAFE_MODES: ::DWORD = 0x00000200;
-pub const CDS_RESET: ::DWORD = 0x40000000;
-pub const CDS_RESET_EX: ::DWORD = 0x20000000;
-pub const CDS_NORESET: ::DWORD = 0x10000000;
-pub const CF_TEXT: ::UINT = 1;
-pub const CF_BITMAP: ::UINT = 2;
-pub const CF_METAFILEPICT: ::UINT = 3;
-pub const CF_SYLK: ::UINT = 4;
-pub const CF_DIF: ::UINT = 5;
-pub const CF_TIFF: ::UINT = 6;
-pub const CF_OEMTEXT: ::UINT = 7;
-pub const CF_DIB: ::UINT = 8;
-pub const CF_PALETTE: ::UINT = 9;
-pub const CF_PENDATA: ::UINT = 10;
-pub const CF_RIFF: ::UINT = 11;
-pub const CF_WAVE: ::UINT = 12;
-pub const CF_UNICODETEXT: ::UINT = 13;
-pub const CF_ENHMETAFILE: ::UINT = 14;
-pub const CF_HDROP: ::UINT = 15;
-pub const CF_LOCALE: ::UINT = 16;
-pub const CF_DIBV5: ::UINT = 17;
-pub const CF_OWNERDISPLAY: ::UINT = 0x0080;
-pub const CF_DSPTEXT: ::UINT = 0x0081;
-pub const CF_DSPBITMAP: ::UINT = 0x0082;
-pub const CF_DSPENHMETAFILE: ::UINT = 0x008E;
-pub const CF_DSPMETAFILEPICT: ::UINT = 0x0083;
-pub const CF_PRIVATEFIRST: ::UINT = 0x0200;
-pub const CF_PRIVATELAST: ::UINT = 0x02FF;
-pub const CF_GDIOBJFIRST: ::UINT = 0x0300;
-pub const CF_GDIOBJLAST: ::UINT = 0x03FF;
-pub const CS_VREDRAW: ::DWORD = 0x0001;
-pub const CS_HREDRAW: ::DWORD = 0x0002;
-pub const CS_DBLCLKS: ::DWORD = 0x0008;
-pub const CS_OWNDC: ::DWORD = 0x0020;
-pub const CS_CLASSDC: ::DWORD = 0x0040;
-pub const CS_PARENTDC: ::DWORD = 0x0080;
-pub const CS_NOCLOSE: ::DWORD = 0x0200;
-pub const CS_SAVEBITS: ::DWORD = 0x0800;
-pub const CS_BYTEALIGNCLIENT: ::DWORD = 0x1000;
-pub const CS_BYTEALIGNWINDOW: ::DWORD = 0x2000;
-pub const CS_GLOBALCLASS: ::DWORD = 0x4000;
-pub const CS_IME: ::DWORD = 0x00010000;
-pub const CS_DROPSHADOW: ::DWORD = 0x00020000;
-pub const DFC_CAPTION: ::UINT = 1;
-pub const DFC_MENU: ::UINT = 2;
-pub const DFC_SCROLL: ::UINT = 3;
-pub const DFC_BUTTON: ::UINT = 4;
-pub const DFCS_CAPTIONCLOSE: ::UINT = 0x0000;
-pub const DFCS_CAPTIONMIN: ::UINT = 0x0001;
-pub const DFCS_CAPTIONMAX: ::UINT = 0x0002;
-pub const DFCS_CAPTIONRESTORE: ::UINT = 0x0003;
-pub const DFCS_CAPTIONHELP: ::UINT = 0x0004;
-pub const DFCS_MENUARROW: ::UINT = 0x0000;
-pub const DFCS_MENUCHECK: ::UINT = 0x0001;
-pub const DFCS_MENUBULLET: ::UINT = 0x0002;
-pub const DFCS_MENUARROWRIGHT: ::UINT = 0x0004;
-pub const DFCS_SCROLLUP: ::UINT = 0x0000;
-pub const DFCS_SCROLLDOWN: ::UINT = 0x0001;
-pub const DFCS_SCROLLLEFT: ::UINT = 0x0002;
-pub const DFCS_SCROLLRIGHT: ::UINT = 0x0003;
-pub const DFCS_SCROLLCOMBOBOX: ::UINT = 0x0005;
-pub const DFCS_SCROLLSIZEGRIP: ::UINT = 0x0008;
-pub const DFCS_SCROLLSIZEGRIPRIGHT: ::UINT = 0x0010;
-pub const DFCS_BUTTONCHECK: ::UINT = 0x0000;
-pub const DFCS_BUTTONRADIOIMAGE: ::UINT = 0x0001;
-pub const DFCS_BUTTONRADIOMASK: ::UINT = 0x0002;
-pub const DFCS_BUTTONRADIO: ::UINT = 0x0004;
-pub const DFCS_BUTTON3STATE: ::UINT = 0x0008;
-pub const DFCS_BUTTONPUSH: ::UINT = 0x0010;
-pub const DFCS_INACTIVE: ::UINT = 0x0100;
-pub const DFCS_PUSHED: ::UINT = 0x0200;
-pub const DFCS_CHECKED: ::UINT = 0x0400;
-// if WINVER >= 0x0500
-pub const DFCS_TRANSPARENT: ::UINT = 0x0800;
-pub const DFCS_HOT: ::UINT = 0x1000;
-// end if WINVER >= 0x0500
-pub const DFCS_ADJUSTRECT: ::UINT = 0x2000;
-pub const DFCS_FLAT: ::UINT = 0x4000;
-pub const DFCS_MONO: ::UINT = 0x8000;
-pub const CW_USEDEFAULT: ::c_int = 0x80000000u32 as ::c_int;
-pub const DISP_CHANGE_SUCCESSFUL: ::LONG = 0;
-pub const DISP_CHANGE_RESTART: ::LONG = 1;
-pub const DISP_CHANGE_FAILED: ::LONG = -1;
-pub const DISP_CHANGE_BADMODE: ::LONG = -2;
-pub const DISP_CHANGE_NOTUPDATED: ::LONG = -3;
-pub const DISP_CHANGE_BADFLAGS: ::LONG = -4;
-pub const DISP_CHANGE_BADPARAM: ::LONG = -5;
-pub const DISP_CHANGE_BADDUALVIEW: ::LONG = -6;
-pub const EDD_GET_DEVICE_INTERFACE_NAME: ::DWORD = 0x00000001;
-pub const ENUM_CURRENT_SETTINGS: ::DWORD = 0xFFFFFFFF;
-pub const ENUM_REGISTRY_SETTINGS: ::DWORD = 0xFFFFFFFE;
-pub const GW_HWNDFIRST: ::UINT = 0;
-pub const GW_HWNDLAST: ::UINT = 1;
-pub const GW_HWNDNEXT: ::UINT = 2;
-pub const GW_HWNDPREV: ::UINT = 3;
-pub const GW_OWNER: ::UINT = 4;
-pub const GW_CHILD: ::UINT = 5;
-pub const GW_ENABLEDPOPUP: ::UINT = 6;
-pub const GW_MAX: ::UINT = 6;
-pub const HTERROR: ::c_int = -2;
-pub const HTTRANSPARENT: ::c_int = -1;
-pub const HTNOWHERE: ::c_int = 0;
-pub const HTCLIENT: ::c_int = 1;
-pub const HTCAPTION: ::c_int = 2;
-pub const HTSYSMENU: ::c_int = 3;
-pub const HTGROWBOX: ::c_int = 4;
-pub const HTSIZE: ::c_int = HTGROWBOX;
-pub const HTMENU: ::c_int = 5;
-pub const HTHSCROLL: ::c_int = 6;
-pub const HTVSCROLL: ::c_int = 7;
-pub const HTMINBUTTON: ::c_int = 8;
-pub const HTMAXBUTTON: ::c_int = 9;
-pub const HTLEFT: ::c_int = 10;
-pub const HTRIGHT: ::c_int = 11;
-pub const HTTOP: ::c_int = 12;
-pub const HTTOPLEFT: ::c_int = 13;
-pub const HTTOPRIGHT: ::c_int = 14;
-pub const HTBOTTOM: ::c_int = 15;
-pub const HTBOTTOMLEFT: ::c_int = 16;
-pub const HTBOTTOMRIGHT: ::c_int = 17;
-pub const HTBORDER: ::c_int = 18;
-pub const HTREDUCE: ::c_int = HTMINBUTTON;
-pub const HTZOOM: ::c_int = HTMAXBUTTON;
-pub const HTSIZEFIRST: ::c_int = HTLEFT;
-pub const HTSIZELAST: ::c_int = HTBOTTOMRIGHT;
-pub const HTOBJECT: ::c_int = 19;
-pub const HTCLOSE: ::c_int = 20;
-pub const HTHELP: ::c_int = 21;
-pub const LSFW_LOCK: ::UINT = 1;
-pub const LSFW_UNLOCK: ::UINT = 2;
-pub const MDITILE_VERTICAL: ::UINT = 0x0000;
-pub const MDITILE_HORIZONTAL: ::UINT = 0x0001;
-pub const MDITILE_SKIPDISABLED: ::UINT = 0x0002;
-pub const MDITILE_ZORDER: ::UINT = 0x0004;
-pub const MB_OK: ::DWORD = 0x00000000;
-pub const MB_OKCANCEL: ::DWORD = 0x00000001;
-pub const MB_ABORTRETRYIGNORE: ::DWORD = 0x00000002;
-pub const MB_YESNOCANCEL: ::DWORD = 0x00000003;
-pub const MB_YESNO: ::DWORD = 0x00000004;
-pub const MB_RETRYCANCEL: ::DWORD = 0x00000005;
-pub const MB_CANCELTRYCONTINUE: ::DWORD = 0x00000006;
-pub const MB_ICONHAND: ::DWORD = 0x00000010;
-pub const MB_ICONQUESTION: ::DWORD = 0x00000020;
-pub const MB_ICONEXCLAMATION: ::DWORD = 0x00000030;
-pub const MB_ICONASTERISK: ::DWORD = 0x00000040;
-pub const MB_USERICON: ::DWORD = 0x00000080;
-pub const MB_ICONWARNING: ::DWORD = MB_ICONEXCLAMATION;
-pub const MB_ICONERROR: ::DWORD = MB_ICONHAND;
-pub const MB_ICONINFORMATION: ::DWORD = MB_ICONASTERISK;
-pub const MB_ICONSTOP: ::DWORD = MB_ICONHAND;
-pub const MB_DEFBUTTON1: ::DWORD = 0x00000000;
-pub const MB_DEFBUTTON2: ::DWORD = 0x00000100;
-pub const MB_DEFBUTTON3: ::DWORD = 0x00000200;
-pub const MB_DEFBUTTON4: ::DWORD = 0x00000300;
-pub const MB_APPLMODAL: ::DWORD = 0x00000000;
-pub const MB_SYSTEMMODAL: ::DWORD = 0x00001000;
-pub const MB_TASKMODAL: ::DWORD = 0x00002000;
-pub const MB_HELP: ::DWORD = 0x00004000;
-pub const MB_NOFOCUS: ::DWORD = 0x00008000;
-pub const MB_SETFOREGROUND: ::DWORD = 0x00010000;
-pub const MB_DEFAULT_DESKTOP_ONLY: ::DWORD = 0x00020000;
-pub const MB_TOPMOST: ::DWORD = 0x00040000;
-pub const MB_RIGHT: ::DWORD = 0x00080000;
-pub const MB_RTLREADING: ::DWORD = 0x00100000;
-pub const MB_SERVICE_NOTIFICATION: ::DWORD = 0x00200000;
-pub const MB_SERVICE_NOTIFICATION_NT3X: ::DWORD = 0x00040000;
-pub const MB_TYPEMASK: ::DWORD = 0x0000000F;
-pub const MB_ICONMASK: ::DWORD = 0x000000F0;
-pub const MB_DEFMASK: ::DWORD = 0x00000F00;
-pub const MB_MODEMASK: ::DWORD = 0x00003000;
-pub const MB_MISCMASK: ::DWORD = 0x0000C000;
-pub const MF_BITMAP: ::UINT = 0x00000004;
-pub const MF_CHECKED: ::UINT = 0x00000008;
-pub const MF_DISABLED: ::UINT = 0x00000002;
-pub const MF_ENABLED: ::UINT = 0x00000000;
-pub const MF_GRAYED: ::UINT = 0x00000001;
-pub const MF_MENUBARBREAK: ::UINT = 0x00000020;
-pub const MF_MENUBREAK: ::UINT = 0x00000040;
-pub const MF_OWNERDRAW: ::UINT = 0x00000100;
-pub const MF_POPUP: ::UINT = 0x00000010;
-pub const MF_SEPARATOR: ::UINT = 0x00000800;
-pub const MF_STRING: ::UINT = 0x00000000;
-pub const MF_UNCHECKED: ::UINT = 0x00000000;
-pub const SB_HORZ: ::c_int = 0;
-pub const SB_VERT: ::c_int = 1;
-pub const SB_CTL: ::c_int = 2;
-pub const SB_BOTH: ::c_int = 3;
-pub const SW_HIDE: ::c_int = 0;
-pub const SW_SHOWNORMAL: ::c_int = 1;
-pub const SW_NORMAL: ::c_int = 1;
-pub const SW_SHOWMINIMIZED: ::c_int = 2;
-pub const SW_SHOWMAXIMIZED: ::c_int = 3;
-pub const SW_MAXIMIZE: ::c_int = 3;
-pub const SW_SHOWNOACTIVATE: ::c_int = 4;
-pub const SW_SHOW: ::c_int = 5;
-pub const SW_MINIMIZE: ::c_int = 6;
-pub const SW_SHOWMINNOACTIVE: ::c_int = 7;
-pub const SW_SHOWNA: ::c_int = 8;
-pub const SW_RESTORE: ::c_int = 9;
-pub const SW_SHOWDEFAULT: ::c_int = 10;
-pub const SW_FORCEMINIMIZE: ::c_int = 11;
-pub const SW_MAX: ::c_int = 11;
-pub const SWP_NOSIZE: ::UINT = 0x0001;
-pub const SWP_NOMOVE: ::UINT = 0x0002;
-pub const SWP_NOZORDER: ::UINT = 0x0004;
-pub const SWP_NOREDRAW: ::UINT = 0x0008;
-pub const SWP_NOACTIVATE: ::UINT = 0x0010;
-pub const SWP_FRAMECHANGED: ::UINT = 0x0020;
-pub const SWP_SHOWWINDOW: ::UINT = 0x0040;
-pub const SWP_HIDEWINDOW: ::UINT = 0x0080;
-pub const SWP_NOCOPYBITS: ::UINT = 0x0100;
-pub const SWP_NOOWNERZORDER: ::UINT = 0x0200;
-pub const SWP_NOSENDCHANGING: ::UINT = 0x0400;
-pub const SWP_DRAWFRAME: ::UINT = SWP_FRAMECHANGED;
-pub const SWP_NOREPOSITION: ::UINT = SWP_NOOWNERZORDER;
-pub const SWP_DEFERERASE: ::UINT = 0x2000;
-pub const SWP_ASYNCWINDOWPOS: ::UINT = 0x4000;
-pub const VK_LBUTTON: ::c_int = 0x01;
-pub const VK_RBUTTON: ::c_int = 0x02;
-pub const VK_CANCEL: ::c_int = 0x03;
-pub const VK_MBUTTON: ::c_int = 0x04;
-pub const VK_XBUTTON1: ::c_int = 0x05;
-pub const VK_XBUTTON2: ::c_int = 0x06;
-pub const VK_BACK: ::c_int = 0x08;
-pub const VK_TAB: ::c_int = 0x09;
-pub const VK_CLEAR: ::c_int = 0x0C;
-pub const VK_RETURN: ::c_int = 0x0D;
-pub const VK_SHIFT: ::c_int = 0x10;
-pub const VK_CONTROL: ::c_int = 0x11;
-pub const VK_MENU: ::c_int = 0x12;
-pub const VK_PAUSE: ::c_int = 0x13;
-pub const VK_CAPITAL: ::c_int = 0x14;
-pub const VK_KANA: ::c_int = 0x15;
-pub const VK_HANGUEL: ::c_int = 0x15;
-pub const VK_HANGUL: ::c_int = 0x15;
-pub const VK_JUNJA: ::c_int = 0x17;
-pub const VK_FINAL: ::c_int = 0x18;
-pub const VK_HANJA: ::c_int = 0x19;
-pub const VK_KANJI: ::c_int = 0x19;
-pub const VK_ESCAPE: ::c_int = 0x1B;
-pub const VK_CONVERT: ::c_int = 0x1C;
-pub const VK_NONCONVERT: ::c_int = 0x1D;
-pub const VK_ACCEPT: ::c_int = 0x1E;
-pub const VK_MODECHANGE: ::c_int = 0x1F;
-pub const VK_SPACE: ::c_int = 0x20;
-pub const VK_PRIOR: ::c_int = 0x21;
-pub const VK_NEXT: ::c_int = 0x22;
-pub const VK_END: ::c_int = 0x23;
-pub const VK_HOME: ::c_int = 0x24;
-pub const VK_LEFT: ::c_int = 0x25;
-pub const VK_UP: ::c_int = 0x26;
-pub const VK_RIGHT: ::c_int = 0x27;
-pub const VK_DOWN: ::c_int = 0x28;
-pub const VK_SELECT: ::c_int = 0x29;
-pub const VK_PRINT: ::c_int = 0x2A;
-pub const VK_EXECUTE: ::c_int = 0x2B;
-pub const VK_SNAPSHOT: ::c_int = 0x2C;
-pub const VK_INSERT: ::c_int = 0x2D;
-pub const VK_DELETE: ::c_int = 0x2E;
-pub const VK_HELP: ::c_int = 0x2F;
-pub const VK_LWIN: ::c_int = 0x5B;
-pub const VK_RWIN: ::c_int = 0x5C;
-pub const VK_APPS: ::c_int = 0x5D;
-pub const VK_SLEEP: ::c_int = 0x5F;
-pub const VK_NUMPAD0: ::c_int = 0x60;
-pub const VK_NUMPAD1: ::c_int = 0x61;
-pub const VK_NUMPAD2: ::c_int = 0x62;
-pub const VK_NUMPAD3: ::c_int = 0x63;
-pub const VK_NUMPAD4: ::c_int = 0x64;
-pub const VK_NUMPAD5: ::c_int = 0x65;
-pub const VK_NUMPAD6: ::c_int = 0x66;
-pub const VK_NUMPAD7: ::c_int = 0x67;
-pub const VK_NUMPAD8: ::c_int = 0x68;
-pub const VK_NUMPAD9: ::c_int = 0x69;
-pub const VK_MULTIPLY: ::c_int = 0x6A;
-pub const VK_ADD: ::c_int = 0x6B;
-pub const VK_SEPARATOR: ::c_int = 0x6C;
-pub const VK_SUBTRACT: ::c_int = 0x6D;
-pub const VK_DECIMAL: ::c_int = 0x6E;
-pub const VK_DIVIDE: ::c_int = 0x6F;
-pub const VK_F1: ::c_int = 0x70;
-pub const VK_F2: ::c_int = 0x71;
-pub const VK_F3: ::c_int = 0x72;
-pub const VK_F4: ::c_int = 0x73;
-pub const VK_F5: ::c_int = 0x74;
-pub const VK_F6: ::c_int = 0x75;
-pub const VK_F7: ::c_int = 0x76;
-pub const VK_F8: ::c_int = 0x77;
-pub const VK_F9: ::c_int = 0x78;
-pub const VK_F10: ::c_int = 0x79;
-pub const VK_F11: ::c_int = 0x7A;
-pub const VK_F12: ::c_int = 0x7B;
-pub const VK_F13: ::c_int = 0x7C;
-pub const VK_F14: ::c_int = 0x7D;
-pub const VK_F15: ::c_int = 0x7E;
-pub const VK_F16: ::c_int = 0x7F;
-pub const VK_F17: ::c_int = 0x80;
-pub const VK_F18: ::c_int = 0x81;
-pub const VK_F19: ::c_int = 0x82;
-pub const VK_F20: ::c_int = 0x83;
-pub const VK_F21: ::c_int = 0x84;
-pub const VK_F22: ::c_int = 0x85;
-pub const VK_F23: ::c_int = 0x86;
-pub const VK_F24: ::c_int = 0x87;
-pub const VK_NUMLOCK: ::c_int = 0x90;
-pub const VK_SCROLL: ::c_int = 0x91;
-pub const VK_OEM_NEC_EQUAL: ::c_int = 0x92;
-pub const VK_OEM_FJ_JISHO: ::c_int = 0x92;
-pub const VK_OEM_FJ_MASSHOU: ::c_int = 0x93;
-pub const VK_OEM_FJ_TOUROKU: ::c_int = 0x94;
-pub const VK_OEM_FJ_LOYA: ::c_int = 0x95;
-pub const VK_OEM_FJ_ROYA: ::c_int = 0x96;
-pub const VK_LSHIFT: ::c_int = 0xA0;
-pub const VK_RSHIFT: ::c_int = 0xA1;
-pub const VK_LCONTROL: ::c_int = 0xA2;
-pub const VK_RCONTROL: ::c_int = 0xA3;
-pub const VK_LMENU: ::c_int = 0xA4;
-pub const VK_RMENU: ::c_int = 0xA5;
-pub const VK_BROWSER_BACK: ::c_int = 0xA6;
-pub const VK_BROWSER_FORWARD: ::c_int = 0xA7;
-pub const VK_BROWSER_REFRESH: ::c_int = 0xA8;
-pub const VK_BROWSER_STOP: ::c_int = 0xA9;
-pub const VK_BROWSER_SEARCH: ::c_int = 0xAA;
-pub const VK_BROWSER_FAVORITES: ::c_int = 0xAB;
-pub const VK_BROWSER_HOME: ::c_int = 0xAC;
-pub const VK_VOLUME_MUTE: ::c_int = 0xAD;
-pub const VK_VOLUME_DOWN: ::c_int = 0xAE;
-pub const VK_VOLUME_UP: ::c_int = 0xAF;
-pub const VK_MEDIA_NEXT_TRACK: ::c_int = 0xB0;
-pub const VK_MEDIA_PREV_TRACK: ::c_int = 0xB1;
-pub const VK_MEDIA_STOP: ::c_int = 0xB2;
-pub const VK_MEDIA_PLAY_PAUSE: ::c_int = 0xB3;
-pub const VK_LAUNCH_MAIL: ::c_int = 0xB4;
-pub const VK_LAUNCH_MEDIA_SELECT: ::c_int = 0xB5;
-pub const VK_LAUNCH_APP1: ::c_int = 0xB6;
-pub const VK_LAUNCH_APP2: ::c_int = 0xB7;
-pub const VK_OEM_1: ::c_int = 0xBA;
-pub const VK_OEM_PLUS: ::c_int = 0xBB;
-pub const VK_OEM_COMMA: ::c_int = 0xBC;
-pub const VK_OEM_MINUS: ::c_int = 0xBD;
-pub const VK_OEM_PERIOD: ::c_int = 0xBE;
-pub const VK_OEM_2: ::c_int = 0xBF;
-pub const VK_OEM_3: ::c_int = 0xC0;
-pub const VK_OEM_4: ::c_int = 0xDB;
-pub const VK_OEM_5: ::c_int = 0xDC;
-pub const VK_OEM_6: ::c_int = 0xDD;
-pub const VK_OEM_7: ::c_int = 0xDE;
-pub const VK_OEM_8: ::c_int = 0xDF;
-pub const VK_OEM_AX: ::c_int = 0xE1;
-pub const VK_OEM_102: ::c_int = 0xE2;
-pub const VK_ICO_HELP: ::c_int = 0xE3;
-pub const VK_ICO_00: ::c_int = 0xE4;
-pub const VK_PROCESSKEY: ::c_int = 0xE5;
-pub const VK_ICO_CLEAR: ::c_int = 0xE6;
-pub const VK_PACKET: ::c_int = 0xE7;
-pub const VK_OEM_RESET: ::c_int = 0xE9;
-pub const VK_OEM_JUMP: ::c_int = 0xEA;
-pub const VK_OEM_PA1: ::c_int = 0xEB;
-pub const VK_OEM_PA2: ::c_int = 0xEC;
-pub const VK_OEM_PA3: ::c_int = 0xED;
-pub const VK_OEM_WSCTRL: ::c_int = 0xEE;
-pub const VK_OEM_CUSEL: ::c_int = 0xEF;
-pub const VK_OEM_ATTN: ::c_int = 0xF0;
-pub const VK_OEM_FINISH: ::c_int = 0xF1;
-pub const VK_OEM_COPY: ::c_int = 0xF2;
-pub const VK_OEM_AUTO: ::c_int = 0xF3;
-pub const VK_OEM_ENLW: ::c_int = 0xF4;
-pub const VK_OEM_BACKTAB: ::c_int = 0xF5;
-pub const VK_ATTN: ::c_int = 0xF6;
-pub const VK_CRSEL: ::c_int = 0xF7;
-pub const VK_EXSEL: ::c_int = 0xF8;
-pub const VK_EREOF: ::c_int = 0xF9;
-pub const VK_PLAY: ::c_int = 0xFA;
-pub const VK_ZOOM: ::c_int = 0xFB;
-pub const VK_NONAME: ::c_int = 0xFC;
-pub const VK_PA1: ::c_int = 0xFD;
-pub const VK_OEM_CLEAR: ::c_int = 0xFE;
-// if _WIN32_WINNT >= 0x0500
-pub const APPCOMMAND_BROWSER_BACKWARD: ::c_short = 1;
-pub const APPCOMMAND_BROWSER_FORWARD: ::c_short = 2;
-pub const APPCOMMAND_BROWSER_REFRESH: ::c_short = 3;
-pub const APPCOMMAND_BROWSER_STOP: ::c_short = 4;
-pub const APPCOMMAND_BROWSER_SEARCH: ::c_short = 5;
-pub const APPCOMMAND_BROWSER_FAVORITES: ::c_short = 6;
-pub const APPCOMMAND_BROWSER_HOME: ::c_short = 7;
-pub const APPCOMMAND_VOLUME_MUTE: ::c_short = 8;
-pub const APPCOMMAND_VOLUME_DOWN: ::c_short = 9;
-pub const APPCOMMAND_VOLUME_UP: ::c_short = 10;
-pub const APPCOMMAND_MEDIA_NEXTTRACK: ::c_short = 11;
-pub const APPCOMMAND_MEDIA_PREVIOUSTRACK: ::c_short = 12;
-pub const APPCOMMAND_MEDIA_STOP: ::c_short = 13;
-pub const APPCOMMAND_MEDIA_PLAY_PAUSE: ::c_short = 14;
-pub const APPCOMMAND_LAUNCH_MAIL: ::c_short = 15;
-pub const APPCOMMAND_LAUNCH_MEDIA_SELECT: ::c_short = 16;
-pub const APPCOMMAND_LAUNCH_APP1: ::c_short = 17;
-pub const APPCOMMAND_LAUNCH_APP2: ::c_short = 18;
-pub const APPCOMMAND_BASS_DOWN: ::c_short = 19;
-pub const APPCOMMAND_BASS_BOOST: ::c_short = 20;
-pub const APPCOMMAND_BASS_UP: ::c_short = 21;
-pub const APPCOMMAND_TREBLE_DOWN: ::c_short = 22;
-pub const APPCOMMAND_TREBLE_UP: ::c_short = 23;
-// if _WIN32_WINNT >= 0x0501
-pub const APPCOMMAND_MICROPHONE_VOLUME_MUTE: ::c_short = 24;
-pub const APPCOMMAND_MICROPHONE_VOLUME_DOWN: ::c_short = 25;
-pub const APPCOMMAND_MICROPHONE_VOLUME_UP: ::c_short = 26;
-pub const APPCOMMAND_HELP: ::c_short = 27;
-pub const APPCOMMAND_FIND: ::c_short = 28;
-pub const APPCOMMAND_NEW: ::c_short = 29;
-pub const APPCOMMAND_OPEN: ::c_short = 30;
-pub const APPCOMMAND_CLOSE: ::c_short = 31;
-pub const APPCOMMAND_SAVE: ::c_short = 32;
-pub const APPCOMMAND_PRINT: ::c_short = 33;
-pub const APPCOMMAND_UNDO: ::c_short = 34;
-pub const APPCOMMAND_REDO: ::c_short = 35;
-pub const APPCOMMAND_COPY: ::c_short = 36;
-pub const APPCOMMAND_CUT: ::c_short = 37;
-pub const APPCOMMAND_PASTE: ::c_short = 38;
-pub const APPCOMMAND_REPLY_TO_MAIL: ::c_short = 39;
-pub const APPCOMMAND_FORWARD_MAIL: ::c_short = 40;
-pub const APPCOMMAND_SEND_MAIL: ::c_short = 41;
-pub const APPCOMMAND_SPELL_CHECK: ::c_short = 42;
-pub const APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE: ::c_short = 43;
-pub const APPCOMMAND_MIC_ON_OFF_TOGGLE: ::c_short = 44;
-pub const APPCOMMAND_CORRECTION_LIST: ::c_short = 45;
-pub const APPCOMMAND_MEDIA_PLAY: ::c_short = 46;
-pub const APPCOMMAND_MEDIA_PAUSE: ::c_short = 47;
-pub const APPCOMMAND_MEDIA_RECORD: ::c_short = 48;
-pub const APPCOMMAND_MEDIA_FAST_FORWARD: ::c_short = 49;
-pub const APPCOMMAND_MEDIA_REWIND: ::c_short = 50;
-pub const APPCOMMAND_MEDIA_CHANNEL_UP: ::c_short = 51;
-pub const APPCOMMAND_MEDIA_CHANNEL_DOWN: ::c_short = 52;
-// end if _WIN32_WINNT >= 0x0501
-// if _WIN32_WINNT >= 0x0600
-pub const APPCOMMAND_DELETE: ::c_short = 53;
-pub const APPCOMMAND_DWM_FLIP3D: ::c_short = 54;
-// end if _WIN32_WINNT >= 0x0600
-pub const WM_NULL: ::UINT = 0x0000;
-pub const WM_CREATE: ::UINT = 0x0001;
-pub const WM_DESTROY: ::UINT = 0x0002;
-pub const WM_MOVE: ::UINT = 0x0003;
-pub const WM_SIZE: ::UINT = 0x0005;
-pub const WM_ACTIVATE: ::UINT = 0x0006;
-pub const WM_SETFOCUS: ::UINT = 0x0007;
-pub const WM_KILLFOCUS: ::UINT = 0x0008;
-pub const WM_ENABLE: ::UINT = 0x000A;
-pub const WM_SETREDRAW: ::UINT = 0x000B;
-pub const WM_SETTEXT: ::UINT = 0x000C;
-pub const WM_GETTEXT: ::UINT = 0x000D;
-pub const WM_GETTEXTLENGTH: ::UINT = 0x000E;
-pub const WM_PAINT: ::UINT = 0x000F;
-pub const WM_CLOSE: ::UINT = 0x0010;
-pub const WM_QUERYENDSESSION: ::UINT = 0x0011;
-pub const WM_QUERYOPEN: ::UINT = 0x0013;
-pub const WM_ENDSESSION: ::UINT = 0x0016;
-pub const WM_QUIT: ::UINT = 0x0012;
-pub const WM_ERASEBKGND: ::UINT = 0x0014;
-pub const WM_SYSCOLORCHANGE: ::UINT = 0x0015;
-pub const WM_SHOWWINDOW: ::UINT = 0x0018;
-pub const WM_WININICHANGE: ::UINT = 0x001A;
-pub const WM_SETTINGCHANGE: ::UINT = WM_WININICHANGE;
-pub const WM_DEVMODECHANGE: ::UINT = 0x001B;
-pub const WM_ACTIVATEAPP: ::UINT = 0x001C;
-pub const WM_FONTCHANGE: ::UINT = 0x001D;
-pub const WM_TIMECHANGE: ::UINT = 0x001E;
-pub const WM_CANCELMODE: ::UINT = 0x001F;
-pub const WM_SETCURSOR: ::UINT = 0x0020;
-pub const WM_MOUSEACTIVATE: ::UINT = 0x0021;
-pub const WM_CHILDACTIVATE: ::UINT = 0x0022;
-pub const WM_QUEUESYNC: ::UINT = 0x0023;
-pub const WM_GETMINMAXINFO: ::UINT = 0x0024;
-pub const WM_PAINTICON: ::UINT = 0x0026;
-pub const WM_ICONERASEBKGND: ::UINT = 0x0027;
-pub const WM_NEXTDLGCTL: ::UINT = 0x0028;
-pub const WM_SPOOLERSTATUS: ::UINT = 0x002A;
-pub const WM_DRAWITEM: ::UINT = 0x002B;
-pub const WM_MEASUREITEM: ::UINT = 0x002C;
-pub const WM_DELETEITEM: ::UINT = 0x002D;
-pub const WM_VKEYTOITEM: ::UINT = 0x002E;
-pub const WM_CHARTOITEM: ::UINT = 0x002F;
-pub const WM_SETFONT: ::UINT = 0x0030;
-pub const WM_GETFONT: ::UINT = 0x0031;
-pub const WM_SETHOTKEY: ::UINT = 0x0032;
-pub const WM_GETHOTKEY: ::UINT = 0x0033;
-pub const WM_QUERYDRAGICON: ::UINT = 0x0037;
-pub const WM_COMPAREITEM: ::UINT = 0x0039;
-pub const WM_GETOBJECT: ::UINT = 0x003D;
-pub const WM_COMPACTING: ::UINT = 0x0041;
-pub const WM_COMMNOTIFY: ::UINT = 0x0044;
-pub const WM_WINDOWPOSCHANGING: ::UINT = 0x0046;
-pub const WM_WINDOWPOSCHANGED: ::UINT = 0x0047;
-pub const WM_POWER: ::UINT = 0x0048;
-pub const WM_COPYDATA: ::UINT = 0x004A;
-pub const WM_CANCELJOURNAL: ::UINT = 0x004B;
-pub const WM_NOTIFY: ::UINT = 0x004E;
-pub const WM_INPUTLANGCHANGEREQUEST: ::UINT = 0x0050;
-pub const WM_INPUTLANGCHANGE: ::UINT = 0x0051;
-pub const WM_TCARD: ::UINT = 0x0052;
-pub const WM_HELP: ::UINT = 0x0053;
-pub const WM_USERCHANGED: ::UINT = 0x0054;
-pub const WM_NOTIFYFORMAT: ::UINT = 0x0055;
-pub const WM_CONTEXTMENU: ::UINT = 0x007B;
-pub const WM_STYLECHANGING: ::UINT = 0x007C;
-pub const WM_STYLECHANGED: ::UINT = 0x007D;
-pub const WM_DISPLAYCHANGE: ::UINT = 0x007E;
-pub const WM_GETICON: ::UINT = 0x007F;
-pub const WM_SETICON: ::UINT = 0x0080;
-pub const WM_NCCREATE: ::UINT = 0x0081;
-pub const WM_NCDESTROY: ::UINT = 0x0082;
-pub const WM_NCCALCSIZE: ::UINT = 0x0083;
-pub const WM_NCHITTEST: ::UINT = 0x0084;
-pub const WM_NCPAINT: ::UINT = 0x0085;
-pub const WM_NCACTIVATE: ::UINT = 0x0086;
-pub const WM_GETDLGCODE: ::UINT = 0x0087;
-pub const WM_SYNCPAINT: ::UINT = 0x0088;
-pub const WM_NCMOUSEMOVE: ::UINT = 0x00A0;
-pub const WM_NCLBUTTONDOWN: ::UINT = 0x00A1;
-pub const WM_NCLBUTTONUP: ::UINT = 0x00A2;
-pub const WM_NCLBUTTONDBLCLK: ::UINT = 0x00A3;
-pub const WM_NCRBUTTONDOWN: ::UINT = 0x00A4;
-pub const WM_NCRBUTTONUP: ::UINT = 0x00A5;
-pub const WM_NCRBUTTONDBLCLK: ::UINT = 0x00A6;
-pub const WM_NCMBUTTONDOWN: ::UINT = 0x00A7;
-pub const WM_NCMBUTTONUP: ::UINT = 0x00A8;
-pub const WM_NCMBUTTONDBLCLK: ::UINT = 0x00A9;
-pub const WM_NCXBUTTONDOWN: ::UINT = 0x00AB;
-pub const WM_NCXBUTTONUP: ::UINT = 0x00AC;
-pub const WM_NCXBUTTONDBLCLK: ::UINT = 0x00AD;
-pub const WM_INPUT_DEVICE_CHANGE: ::UINT = 0x00FE;
-pub const WM_INPUT: ::UINT = 0x00FF;
-pub const WM_KEYFIRST: ::UINT = 0x0100;
-pub const WM_KEYDOWN: ::UINT = 0x0100;
-pub const WM_KEYUP: ::UINT = 0x0101;
-pub const WM_CHAR: ::UINT = 0x0102;
-pub const WM_DEADCHAR: ::UINT = 0x0103;
-pub const WM_SYSKEYDOWN: ::UINT = 0x0104;
-pub const WM_SYSKEYUP: ::UINT = 0x0105;
-pub const WM_SYSCHAR: ::UINT = 0x0106;
-pub const WM_SYSDEADCHAR: ::UINT = 0x0107;
-pub const WM_UNICHAR: ::UINT = 0x0109;
-pub const WM_KEYLAST: ::UINT = 0x0109;
-pub const WM_IME_STARTCOMPOSITION: ::UINT = 0x010D;
-pub const WM_IME_ENDCOMPOSITION: ::UINT = 0x010E;
-pub const WM_IME_COMPOSITION: ::UINT = 0x010F;
-pub const WM_IME_KEYLAST: ::UINT = 0x010F;
-pub const WM_INITDIALOG: ::UINT = 0x0110;
-pub const WM_COMMAND: ::UINT = 0x0111;
-pub const WM_SYSCOMMAND: ::UINT = 0x0112;
-pub const WM_TIMER: ::UINT = 0x0113;
-pub const WM_HSCROLL: ::UINT = 0x0114;
-pub const WM_VSCROLL: ::UINT = 0x0115;
-pub const WM_INITMENU: ::UINT = 0x0116;
-pub const WM_INITMENUPOPUP: ::UINT = 0x0117;
-pub const WM_GESTURE: ::UINT = 0x0119;
-pub const WM_GESTURENOTIFY: ::UINT = 0x011A;
-pub const WM_MENUSELECT: ::UINT = 0x011F;
-pub const WM_MENUCHAR: ::UINT = 0x0120;
-pub const WM_ENTERIDLE: ::UINT = 0x0121;
-pub const WM_MENURBUTTONUP: ::UINT = 0x0122;
-pub const WM_MENUDRAG: ::UINT = 0x0123;
-pub const WM_MENUGETOBJECT: ::UINT = 0x0124;
-pub const WM_UNINITMENUPOPUP: ::UINT = 0x0125;
-pub const WM_MENUCOMMAND: ::UINT = 0x0126;
-pub const WM_CHANGEUISTATE: ::UINT = 0x0127;
-pub const WM_UPDATEUISTATE: ::UINT = 0x0128;
-pub const WM_QUERYUISTATE: ::UINT = 0x0129;
-pub const WM_CTLCOLORMSGBOX: ::UINT = 0x0132;
-pub const WM_CTLCOLOREDIT: ::UINT = 0x0133;
-pub const WM_CTLCOLORLISTBOX: ::UINT = 0x0134;
-pub const WM_CTLCOLORBTN: ::UINT = 0x0135;
-pub const WM_CTLCOLORDLG: ::UINT = 0x0136;
-pub const WM_CTLCOLORSCROLLBAR: ::UINT = 0x0137;
-pub const WM_CTLCOLORSTATIC: ::UINT = 0x0138;
-pub const WM_MOUSEFIRST: ::UINT = 0x0200;
-pub const WM_MOUSEMOVE: ::UINT = 0x0200;
-pub const WM_LBUTTONDOWN: ::UINT = 0x0201;
-pub const WM_LBUTTONUP: ::UINT = 0x0202;
-pub const WM_LBUTTONDBLCLK: ::UINT = 0x0203;
-pub const WM_RBUTTONDOWN: ::UINT = 0x0204;
-pub const WM_RBUTTONUP: ::UINT = 0x0205;
-pub const WM_RBUTTONDBLCLK: ::UINT = 0x0206;
-pub const WM_MBUTTONDOWN: ::UINT = 0x0207;
-pub const WM_MBUTTONUP: ::UINT = 0x0208;
-pub const WM_MBUTTONDBLCLK: ::UINT = 0x0209;
-pub const WM_MOUSEWHEEL: ::UINT = 0x020A;
-pub const WM_XBUTTONDOWN: ::UINT = 0x020B;
-pub const WM_XBUTTONUP: ::UINT = 0x020C;
-pub const WM_XBUTTONDBLCLK: ::UINT = 0x020D;
-pub const WM_MOUSEHWHEEL: ::UINT = 0x020E;
-pub const WM_MOUSELAST: ::UINT = 0x020E;
-pub const WM_PARENTNOTIFY: ::UINT = 0x0210;
-pub const WM_ENTERMENULOOP: ::UINT = 0x0211;
-pub const WM_EXITMENULOOP: ::UINT = 0x0212;
-pub const WM_NEXTMENU: ::UINT = 0x0213;
-pub const WM_SIZING: ::UINT = 0x0214;
-pub const WM_CAPTURECHANGED: ::UINT = 0x0215;
-pub const WM_MOVING: ::UINT = 0x0216;
-pub const WM_POWERBROADCAST: ::UINT = 0x0218;
-pub const WM_DEVICECHANGE: ::UINT = 0x0219;
-pub const WM_MDICREATE: ::UINT = 0x0220;
-pub const WM_MDIDESTROY: ::UINT = 0x0221;
-pub const WM_MDIACTIVATE: ::UINT = 0x0222;
-pub const WM_MDIRESTORE: ::UINT = 0x0223;
-pub const WM_MDINEXT: ::UINT = 0x0224;
-pub const WM_MDIMAXIMIZE: ::UINT = 0x0225;
-pub const WM_MDITILE: ::UINT = 0x0226;
-pub const WM_MDICASCADE: ::UINT = 0x0227;
-pub const WM_MDIICONARRANGE: ::UINT = 0x0228;
-pub const WM_MDIGETACTIVE: ::UINT = 0x0229;
-pub const WM_MDISETMENU: ::UINT = 0x0230;
-pub const WM_ENTERSIZEMOVE: ::UINT = 0x0231;
-pub const WM_EXITSIZEMOVE: ::UINT = 0x0232;
-pub const WM_DROPFILES: ::UINT = 0x0233;
-pub const WM_MDIREFRESHMENU: ::UINT = 0x0234;
-pub const WM_POINTERDEVICECHANGE: ::UINT = 0x238;
-pub const WM_POINTERDEVICEINRANGE: ::UINT = 0x239;
-pub const WM_POINTERDEVICEOUTOFRANGE: ::UINT = 0x23A;
-pub const WM_TOUCH: ::UINT = 0x0240;
-pub const WM_NCPOINTERUPDATE: ::UINT = 0x0241;
-pub const WM_NCPOINTERDOWN: ::UINT = 0x0242;
-pub const WM_NCPOINTERUP: ::UINT = 0x0243;
-pub const WM_POINTERUPDATE: ::UINT = 0x0245;
-pub const WM_POINTERDOWN: ::UINT = 0x0246;
-pub const WM_POINTERUP: ::UINT = 0x0247;
-pub const WM_POINTERENTER: ::UINT = 0x0249;
-pub const WM_POINTERLEAVE: ::UINT = 0x024A;
-pub const WM_POINTERACTIVATE: ::UINT = 0x024B;
-pub const WM_POINTERCAPTURECHANGED: ::UINT = 0x024C;
-pub const WM_TOUCHHITTESTING: ::UINT = 0x024D;
-pub const WM_POINTERWHEEL: ::UINT = 0x024E;
-pub const WM_POINTERHWHEEL: ::UINT = 0x024F;
-pub const WM_IME_SETCONTEXT: ::UINT = 0x0281;
-pub const WM_IME_NOTIFY: ::UINT = 0x0282;
-pub const WM_IME_CONTROL: ::UINT = 0x0283;
-pub const WM_IME_COMPOSITIONFULL: ::UINT = 0x0284;
-pub const WM_IME_SELECT: ::UINT = 0x0285;
-pub const WM_IME_CHAR: ::UINT = 0x0286;
-pub const WM_IME_REQUEST: ::UINT = 0x0288;
-pub const WM_IME_KEYDOWN: ::UINT = 0x0290;
-pub const WM_IME_KEYUP: ::UINT = 0x0291;
-pub const WM_MOUSEHOVER: ::UINT = 0x02A1;
-pub const WM_MOUSELEAVE: ::UINT = 0x02A3;
-pub const WM_NCMOUSEHOVER: ::UINT = 0x02A0;
-pub const WM_NCMOUSELEAVE: ::UINT = 0x02A2;
-pub const WM_WTSSESSION_CHANGE: ::UINT = 0x02B1;
-pub const WM_TABLET_FIRST: ::UINT = 0x02c0;
-pub const WM_TABLET_LAST: ::UINT = 0x02df;
-pub const WM_DPICHANGED: ::UINT = 0x02E0;
-pub const WM_CUT: ::UINT = 0x0300;
-pub const WM_COPY: ::UINT = 0x0301;
-pub const WM_PASTE: ::UINT = 0x0302;
-pub const WM_CLEAR: ::UINT = 0x0303;
-pub const WM_UNDO: ::UINT = 0x0304;
-pub const WM_RENDERFORMAT: ::UINT = 0x0305;
-pub const WM_RENDERALLFORMATS: ::UINT = 0x0306;
-pub const WM_DESTROYCLIPBOARD: ::UINT = 0x0307;
-pub const WM_DRAWCLIPBOARD: ::UINT = 0x0308;
-pub const WM_PAINTCLIPBOARD: ::UINT = 0x0309;
-pub const WM_VSCROLLCLIPBOARD: ::UINT = 0x030A;
-pub const WM_SIZECLIPBOARD: ::UINT = 0x030B;
-pub const WM_ASKCBFORMATNAME: ::UINT = 0x030C;
-pub const WM_CHANGECBCHAIN: ::UINT = 0x030D;
-pub const WM_HSCROLLCLIPBOARD: ::UINT = 0x030E;
-pub const WM_QUERYNEWPALETTE: ::UINT = 0x030F;
-pub const WM_PALETTEISCHANGING: ::UINT = 0x0310;
-pub const WM_PALETTECHANGED: ::UINT = 0x0311;
-pub const WM_HOTKEY: ::UINT = 0x0312;
-pub const WM_PRINT: ::UINT = 0x0317;
-pub const WM_PRINTCLIENT: ::UINT = 0x0318;
-pub const WM_APPCOMMAND: ::UINT = 0x0319;
-pub const WM_THEMECHANGED: ::UINT = 0x031A;
-pub const WM_CLIPBOARDUPDATE: ::UINT = 0x031D;
-pub const WM_DWMCOMPOSITIONCHANGED: ::UINT = 0x031E;
-pub const WM_DWMNCRENDERINGCHANGED: ::UINT = 0x031F;
-pub const WM_DWMCOLORIZATIONCOLORCHANGED: ::UINT = 0x0320;
-pub const WM_DWMWINDOWMAXIMIZEDCHANGE: ::UINT = 0x0321;
-pub const WM_DWMSENDICONICTHUMBNAIL: ::UINT = 0x0323;
-pub const WM_DWMSENDICONICLIVEPREVIEWBITMAP: ::UINT = 0x0326;
-pub const WM_GETTITLEBARINFOEX: ::UINT = 0x033F;
-pub const WM_HANDHELDFIRST: ::UINT = 0x0358;
-pub const WM_HANDHELDLAST: ::UINT = 0x035F;
-pub const WM_AFXFIRST: ::UINT = 0x0360;
-pub const WM_AFXLAST: ::UINT = 0x037F;
-pub const WM_PENWINFIRST: ::UINT = 0x0380;
-pub const WM_PENWINLAST: ::UINT = 0x038F;
-pub const WM_APP: ::UINT = 0x8000;
-pub const WM_USER: ::UINT = 0x0400;
-pub const WMSZ_LEFT: ::UINT = 1;
-pub const WMSZ_RIGHT: ::UINT = 2;
-pub const WMSZ_TOP: ::UINT = 3;
-pub const WMSZ_TOPLEFT: ::UINT = 4;
-pub const WMSZ_TOPRIGHT: ::UINT = 5;
-pub const WMSZ_BOTTOM: ::UINT = 6;
-pub const WMSZ_BOTTOMLEFT: ::UINT = 7;
-pub const WMSZ_BOTTOMRIGHT: ::UINT = 8;
-pub const SMTO_NORMAL: ::UINT = 0x0000;
-pub const SMTO_BLOCK: ::UINT = 0x0001;
-pub const SMTO_ABORTIFHUNG: ::UINT = 0x0002;
-pub const SMTO_NOTIMEOUTIFNOTHUNG: ::UINT = 0x0008;
-pub const SMTO_ERRORONEXIT: ::UINT = 0x0020;
-pub const MA_ACTIVATE: ::UINT = 1;
-pub const MA_ACTIVATEANDEAT: ::UINT = 2;
-pub const MA_NOACTIVATE: ::UINT = 3;
-pub const MA_NOACTIVATEANDEAT: ::UINT = 4;
-pub const ICON_SMALL: ::UINT = 0;
-pub const ICON_BIG: ::UINT = 1;
-pub const ICON_SMALL2: ::UINT = 2;
-pub const SIZE_RESTORED: ::UINT = 0;
-pub const SIZE_MINIMIZED: ::UINT = 1;
-pub const SIZE_MAXIMIZED: ::UINT = 2;
-pub const SIZE_MAXSHOW: ::UINT = 3;
-pub const SIZE_MAXHIDE: ::UINT = 4;
-pub const SIZENORMAL: ::UINT = SIZE_RESTORED;
-pub const SIZEICONIC: ::UINT = SIZE_MINIMIZED;
-pub const SIZEFULLSCREEN: ::UINT = SIZE_MAXIMIZED;
-pub const SIZEZOOMSHOW: ::UINT = SIZE_MAXSHOW;
-pub const SIZEZOOMHIDE: ::UINT = SIZE_MAXHIDE;
-STRUCT!{struct NCCALCSIZE_PARAMS {
-    rgrc: [::RECT; 3],
-    lppos: PWINDOWPOS,
-}}
-pub type PNCCALCSIZE_PARAMS = *mut NCCALCSIZE_PARAMS;
-pub type NPNCCALCSIZE_PARAMS = *mut NCCALCSIZE_PARAMS;
-pub type LPNCCALCSIZE_PARAMS = *mut NCCALCSIZE_PARAMS;
-pub const WVR_ALIGNTOP: ::UINT = 0x0010;
-pub const WVR_ALIGNLEFT: ::UINT = 0x0020;
-pub const WVR_ALIGNBOTTOM: ::UINT = 0x0040;
-pub const WVR_ALIGNRIGHT: ::UINT = 0x0080;
-pub const WVR_HREDRAW: ::UINT = 0x0100;
-pub const WVR_VREDRAW: ::UINT = 0x0200;
-pub const WVR_REDRAW: ::UINT = WVR_HREDRAW | WVR_VREDRAW;
-pub const WVR_VALIDRECTS: ::UINT = 0x0400;
-pub const HOVER_DEFAULT: ::UINT = 0xFFFFFFFF;
-pub const WS_OVERLAPPED: ::DWORD = 0x00000000;
-pub const WS_POPUP: ::DWORD = 0x80000000;
-pub const WS_CHILD: ::DWORD = 0x40000000;
-pub const WS_MINIMIZE: ::DWORD = 0x20000000;
-pub const WS_VISIBLE: ::DWORD = 0x10000000;
-pub const WS_DISABLED: ::DWORD = 0x08000000;
-pub const WS_CLIPSIBLINGS: ::DWORD = 0x04000000;
-pub const WS_CLIPCHILDREN: ::DWORD = 0x02000000;
-pub const WS_MAXIMIZE: ::DWORD = 0x01000000;
-pub const WS_CAPTION: ::DWORD = 0x00C00000;
-pub const WS_BORDER: ::DWORD = 0x00800000;
-pub const WS_DLGFRAME: ::DWORD = 0x00400000;
-pub const WS_VSCROLL: ::DWORD = 0x00200000;
-pub const WS_HSCROLL: ::DWORD = 0x00100000;
-pub const WS_SYSMENU: ::DWORD = 0x00080000;
-pub const WS_THICKFRAME: ::DWORD = 0x00040000;
-pub const WS_GROUP: ::DWORD = 0x00020000;
-pub const WS_TABSTOP: ::DWORD = 0x00010000;
-pub const WS_MINIMIZEBOX: ::DWORD = 0x00020000;
-pub const WS_MAXIMIZEBOX: ::DWORD = 0x00010000;
-pub const WS_TILED: ::DWORD = WS_OVERLAPPED;
-pub const WS_ICONIC: ::DWORD = WS_MINIMIZE;
-pub const WS_SIZEBOX: ::DWORD = WS_THICKFRAME;
-pub const WS_TILEDWINDOW: ::DWORD = WS_OVERLAPPEDWINDOW;
-pub const WS_OVERLAPPEDWINDOW: ::DWORD = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
-pub const WS_POPUPWINDOW: ::DWORD = WS_POPUP | WS_BORDER | WS_SYSMENU;
-pub const WS_CHILDWINDOW: ::DWORD = WS_CHILD;
-pub const WS_EX_DLGMODALFRAME: ::DWORD = 0x00000001;
-pub const WS_EX_NOPARENTNOTIFY: ::DWORD = 0x00000004;
-pub const WS_EX_TOPMOST: ::DWORD = 0x00000008;
-pub const WS_EX_ACCEPTFILES: ::DWORD = 0x00000010;
-pub const WS_EX_TRANSPARENT: ::DWORD = 0x00000020;
-pub const WS_EX_MDICHILD: ::DWORD = 0x00000040;
-pub const WS_EX_TOOLWINDOW: ::DWORD = 0x00000080;
-pub const WS_EX_WINDOWEDGE: ::DWORD = 0x00000100;
-pub const WS_EX_CLIENTEDGE: ::DWORD = 0x00000200;
-pub const WS_EX_CONTEXTHELP: ::DWORD = 0x00000400;
-pub const WS_EX_RIGHT: ::DWORD = 0x00001000;
-pub const WS_EX_LEFT: ::DWORD = 0x00000000;
-pub const WS_EX_RTLREADING: ::DWORD = 0x00002000;
-pub const WS_EX_LTRREADING: ::DWORD = 0x00000000;
-pub const WS_EX_LEFTSCROLLBAR: ::DWORD = 0x00004000;
-pub const WS_EX_RIGHTSCROLLBAR: ::DWORD = 0x00000000;
-pub const WS_EX_CONTROLPARENT: ::DWORD = 0x00010000;
-pub const WS_EX_STATICEDGE: ::DWORD = 0x00020000;
-pub const WS_EX_APPWINDOW: ::DWORD = 0x00040000;
-pub const WS_EX_OVERLAPPEDWINDOW: ::DWORD = WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE;
-pub const WS_EX_PALETTEWINDOW: ::DWORD = WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
-pub const WS_EX_LAYERED: ::DWORD = 0x00080000;
-pub const WS_EX_NOINHERITLAYOUT: ::DWORD = 0x00100000;
-pub const WS_EX_NOREDIRECTIONBITMAP: ::DWORD = 0x00200000;
-pub const WS_EX_LAYOUTRTL: ::DWORD = 0x00400000;
-pub const WS_EX_COMPOSITED: ::DWORD = 0x02000000;
-pub const WS_EX_NOACTIVATE: ::DWORD = 0x08000000;
-pub type NAMEENUMPROCA = Option<unsafe extern "system" fn(::LPSTR, ::LPARAM) -> ::BOOL>;
-pub type NAMEENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR, ::LPARAM) -> ::BOOL>;
-pub type DESKTOPENUMPROCA = NAMEENUMPROCA;
-pub type DESKTOPENUMPROCW = NAMEENUMPROCW;
-pub type WINSTAENUMPROCA = NAMEENUMPROCA;
-pub type WINSTAENUMPROCW = NAMEENUMPROCW;
-pub type WNDENUMPROC = Option<unsafe extern "system" fn(::HWND, ::LPARAM) -> ::BOOL>;
-pub type WNDPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::LRESULT>;
-pub type DLGPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::INT_PTR>;
-pub type HOOKPROC = Option<unsafe extern "system" fn(
-    code: ::c_int, wParam: ::WPARAM, lParam: ::LPARAM,
-) -> ::LRESULT>;
-pub type TimerProc = Option<unsafe extern "system" fn(
-    hwnd: ::HWND, uMsg: ::UINT, idEvent: ::UINT_PTR, dwTime: ::DWORD,
-)>;
-pub type DRAWSTATEPROC = Option<unsafe extern "system" fn(
-    ::HDC, ::LPARAM, ::WPARAM, ::c_int, ::c_int,
-) -> ::BOOL>;
-pub type PROPENUMPROCA = Option<unsafe extern "system" fn(::HWND, ::LPCSTR, ::HANDLE) -> ::BOOL>;
-pub type PROPENUMPROCW = Option<unsafe extern "system" fn(::HWND, ::LPCWSTR, ::HANDLE) -> ::BOOL>;
-pub type GRAYSTRINGPROC = Option<unsafe extern "system" fn(::HDC, ::LPARAM, ::c_int) -> ::BOOL>;
-pub type MSGBOXCALLBACK = Option<unsafe extern "system" fn(LPHELPINFO)>;
-pub type WINEVENTPROC = Option<unsafe extern "system" fn(
-    ::HWINEVENTHOOK, ::DWORD, ::HWND, ::LONG, ::LONG, ::DWORD, ::DWORD,
-)>;
-pub type HDEVNOTIFY = ::PVOID;
-pub type MENUTEMPLATEA = ::VOID;
-pub type MENUTEMPLATEW = ::VOID;
-STRUCT!{struct MSG {
-    hwnd: ::HWND,
-    message: ::UINT,
-    wParam: ::WPARAM,
-    lParam: ::LPARAM,
-    time: ::DWORD,
-    pt: ::POINT,
-}}
-pub type PMSG = *mut MSG;
-pub type NPMSG = *mut MSG;
-pub type LPMSG = *mut MSG;
-STRUCT!{struct PAINTSTRUCT {
-    hdc: ::HDC,
-    fErase: ::BOOL,
-    rcPaint: ::RECT,
-    fRestore: ::BOOL,
-    fIncUpdate: ::BOOL,
-    rgbReserved: [::BYTE; 32],
-}}
-pub type PPAINTSTRUCT = *mut PAINTSTRUCT;
-pub type NPPAINTSTRUCT = *mut PAINTSTRUCT;
-pub type LPPAINTSTRUCT = *mut PAINTSTRUCT;
-STRUCT!{struct WINDOWPLACEMENT {
-    length: ::UINT,
-    flags: ::UINT,
-    showCmd: ::UINT,
-    ptMinPosition: ::POINT,
-    ptMaxPosition: ::POINT,
-    rcNormalPosition: ::RECT,
-}}
-pub type PWINDOWPLACEMENT = *mut WINDOWPLACEMENT;
-pub type LPWINDOWPLACEMENT = *mut WINDOWPLACEMENT;
-STRUCT!{nodebug struct WNDCLASSEXW {
-    cbSize: ::UINT,
-    style: ::UINT,
-    lpfnWndProc: WNDPROC,
-    cbClsExtra: ::c_int,
-    cbWndExtra: ::c_int,
-    hInstance: ::HINSTANCE,
-    hIcon: ::HICON,
-    hCursor: ::HCURSOR,
-    hbrBackground: ::HBRUSH,
-    lpszMenuName: ::LPCWSTR,
-    lpszClassName: ::LPCWSTR,
-    hIconSm: ::HICON,
-}}
-pub type PWNDCLASSEXW = *mut WNDCLASSEXW;
-pub type NPWNDCLASSEXW = *mut WNDCLASSEXW;
-pub type LPWNDCLASSEXW = *mut WNDCLASSEXW;
-STRUCT!{nodebug struct WNDCLASSW {
-    style: ::UINT,
-    lpfnWndProc: WNDPROC,
-    cbClsExtra: ::c_int,
-    cbWndExtra: ::c_int,
-    hInstance: ::HINSTANCE,
-    hIcon: ::HICON,
-    hCursor: ::HCURSOR,
-    hbrBackground: ::HBRUSH,
-    lpszMenuName: ::LPCWSTR,
-    lpszClassName: ::LPCWSTR,
-}}
-pub type PWNDCLASSW = *mut WNDCLASSW;
-pub type NPWNDCLASSW = *mut WNDCLASSW;
-pub type LPWNDCLASSW = *mut WNDCLASSW;
-STRUCT!{struct MINMAXINFO {
-    ptReserved: ::POINT,
-    ptMaxSize: ::POINT,
-    ptMaxPosition: ::POINT,
-    ptMinTrackSize: ::POINT,
-    ptMaxTrackSize: ::POINT,
-}}
-STRUCT!{struct SCROLLBARINFO {
-    cbSize: ::DWORD,
-    rcScrollBar: ::RECT,
-    dxyLineButton: ::c_int,
-    xyThumbTop: ::c_int,
-    xyThumbBottom: ::c_int,
-    reserved: ::c_int,
-    rgstate: [::DWORD; CCHILDREN_SCROLLBAR + 1],
-}}
-pub type PSCROLLBARINFO = *mut SCROLLBARINFO;
-pub type LPSCROLLBARINFO = *mut SCROLLBARINFO;
-STRUCT!{struct SCROLLINFO {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    nMin: ::c_int,
-    nMax: ::c_int,
-    nPage: ::UINT,
-    nPos: ::c_int,
-    nTrackPos: ::c_int,
-}}
-pub type LPSCROLLINFO = *mut SCROLLINFO;
-pub type LPCSCROLLINFO = *const SCROLLINFO;
-STRUCT!{struct SIZE {
-    cx: ::LONG,
-    cy: ::LONG,
-}}
-pub type PSIZE = *mut SIZE;
-pub type LPSIZE = *mut SIZE;
-pub type SIZEL = SIZE;
-pub type PSIZEL = *mut SIZEL;
-pub type LPSIZEL = *mut SIZEL;
-//1913
-pub const UNICODE_NOCHAR: ::WPARAM = 0xffff;
-pub type HDWP = *mut ::HANDLE;
-//2193
-pub const WHEEL_DELTA: ::DWORD = 120;
-//2206
-pub const XBUTTON1: ::DWORD = 0x0001;
-pub const XBUTTON2: ::DWORD = 0x0002;
-//2392
-pub const MK_LBUTTON: ::WPARAM = 0x0001;
-pub const MK_RBUTTON: ::WPARAM = 0x0002;
-pub const MK_SHIFT: ::WPARAM = 0x0004;
-pub const MK_CONTROL: ::WPARAM = 0x0008;
-pub const MK_MBUTTON: ::WPARAM = 0x0010;
-pub const MK_XBUTTON1: ::WPARAM = 0x0020;
-pub const MK_XBUTTON2: ::WPARAM = 0x0040;
-//2408
-pub const TME_HOVER: ::DWORD = 0x0000_0001;
-pub const TME_LEAVE: ::DWORD = 0x0000_0002;
-pub const TME_NONCLIENT: ::DWORD = 0x0000_0010;
-pub const TME_QUERY: ::DWORD = 0x4000_0000;
-pub const TME_CANCEL: ::DWORD = 0x8000_0000;
-pub const HWND_BROADCAST: ::HWND = 0xFFFF as ::HWND;
-pub const HWND_MESSAGE: ::HWND = -3isize as ::HWND;
-STRUCT!{struct TRACKMOUSEEVENT {
-    cbSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hwndTrack: ::HWND,
-    dwHoverTime: ::DWORD,
-}}
-pub type LPTRACKMOUSEEVENT = *mut TRACKMOUSEEVENT;
-//2575
-STRUCT!{nodebug struct WINDOWPOS {
-    hwnd: ::HWND,
-    hwndInsertAfter: ::HWND,
-    x: ::c_int,
-    y: ::c_int,
-    cx: ::c_int,
-    cy: ::c_int,
-    flags: ::UINT,
-}}
-pub type LPWINDOWPOS = *mut WINDOWPOS;
-pub type PWINDOWPOS = *mut WINDOWPOS;
-//3082
-STRUCT!{struct CREATESTRUCTA {
-    lpCreateParams: ::LPVOID,
-    hInstance: ::HINSTANCE,
-    hMenu: ::HMENU,
-    hwndParent: ::HWND,
-    cy: ::c_int,
-    cx: ::c_int,
-    y: ::c_int,
-    x: ::c_int,
-    style: ::LONG,
-    lpszName: ::LPCSTR,
-    lpszClass: ::LPCSTR,
-    dwExStyle: ::DWORD,
-}}
-pub type LPCREATESTRUCTA = *mut CREATESTRUCTA;
-STRUCT!{struct CREATESTRUCTW {
-    lpCreateParams: ::LPVOID,
-    hInstance: ::HINSTANCE,
-    hMenu: ::HMENU,
-    hwndParent: ::HWND,
-    cy: ::c_int,
-    cx: ::c_int,
-    y: ::c_int,
-    x: ::c_int,
-    style: ::LONG,
-    lpszName: ::LPCWSTR,
-    lpszClass: ::LPCWSTR,
-    dwExStyle: ::DWORD,
-}}
-pub type LPCREATESTRUCTW = *mut CREATESTRUCTW;
-//3145
-STRUCT!{struct NMHDR {
-    hwndFrom: ::HWND,
-    idFrom: ::UINT_PTR,
-    code: ::UINT,  // NM_ code
-}}
-pub type LPNMHDR = *mut NMHDR;
-//3400
-pub const PM_NOREMOVE: ::UINT = 0x0000;
-pub const PM_REMOVE: ::UINT = 0x0001;
-pub const PM_NOYIELD: ::UINT = 0x0002;
-pub const PM_QS_INPUT: ::UINT = QS_INPUT << 16;
-pub const PM_QS_POSTMESSAGE: ::UINT = (QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER) << 16;
-pub const PM_QS_PAINT: ::UINT = QS_PAINT << 16;
-pub const PM_QS_SENDMESSAGE: ::UINT = QS_SENDMESSAGE << 16;
-//
-pub const LWA_COLORKEY: ::DWORD = 0x00000001;
-pub const LWA_ALPHA: ::DWORD = 0x00000002;
-//3469
-pub const EWX_LOGOFF: ::UINT = 0x00000000;
-pub const EWX_SHUTDOWN: ::UINT = 0x00000001;
-pub const EWX_REBOOT: ::UINT = 0x00000002;
-pub const EWX_FORCE: ::UINT = 0x00000004;
-pub const EWX_POWEROFF: ::UINT = 0x00000008;
-pub const EWX_FORCEIFHUNG: ::UINT = 0x00000010;
-pub const EWX_QUICKRESOLVE: ::UINT = 0x00000020;
-pub const EWX_RESTARTAPPS: ::UINT = 0x00000040;
-pub const EWX_HYBRID_SHUTDOWN: ::UINT = 0x00400000;
-pub const EWX_BOOTOPTIONS: ::UINT = 0x01000000;
-//4054 (Win 7 SDK)
-STRUCT!{struct FLASHWINFO {
-    cbSize: ::UINT,
-    hwnd: ::HWND,
-    dwFlags: ::DWORD,
-    uCount: ::UINT,
-    dwTimeout: ::DWORD,
-}}
-pub type PFLASHWINFO = *mut FLASHWINFO;
-pub const FLASHW_STOP: ::DWORD = 0;
-pub const FLASHW_CAPTION: ::DWORD = 0x00000001;
-pub const FLASHW_TRAY: ::DWORD = 0x00000002;
-pub const FLASHW_ALL: ::DWORD = FLASHW_CAPTION | FLASHW_TRAY;
-pub const FLASHW_TIMER: ::DWORD = 0x00000004;
-pub const FLASHW_TIMERNOFG: ::DWORD = 0x0000000C;
-// 4674
-pub const HWND_TOP: ::HWND = 0 as ::HWND;
-pub const HWND_BOTTOM: ::HWND = 1 as ::HWND;
-pub const HWND_TOPMOST: ::HWND = -1isize as ::HWND;
-pub const HWND_NOTOPMOST: ::HWND = -2isize as ::HWND;
-//5499
-pub const MAPVK_VK_TO_VSC: ::UINT = 0;
-pub const MAPVK_VSC_TO_VK: ::UINT = 1;
-pub const MAPVK_VK_TO_CHAR: ::UINT = 2;
-pub const MAPVK_VSC_TO_VK_EX: ::UINT = 3;
-pub const MAPVK_VK_TO_VSC_EX: ::UINT = 4;
-//5741
-pub const KEYEVENTF_EXTENDEDKEY: ::DWORD = 0x0001;
-pub const KEYEVENTF_KEYUP: ::DWORD = 0x0002;
-pub const KEYEVENTF_UNICODE: ::DWORD = 0x0004;
-pub const KEYEVENTF_SCANCODE: ::DWORD = 0x0008;
-pub const MOUSEEVENTF_MOVE: ::DWORD = 0x0001;
-pub const MOUSEEVENTF_LEFTDOWN: ::DWORD = 0x0002;
-pub const MOUSEEVENTF_LEFTUP: ::DWORD = 0x0004;
-pub const MOUSEEVENTF_RIGHTDOWN: ::DWORD = 0x0008;
-pub const MOUSEEVENTF_RIGHTUP: ::DWORD = 0x0010;
-pub const MOUSEEVENTF_MIDDLEDOWN: ::DWORD = 0x0020;
-pub const MOUSEEVENTF_MIDDLEUP: ::DWORD = 0x0040;
-pub const MOUSEEVENTF_XDOWN: ::DWORD = 0x0080;
-pub const MOUSEEVENTF_XUP: ::DWORD = 0x0100;
-pub const MOUSEEVENTF_WHEEL: ::DWORD = 0x0800;
-pub const MOUSEEVENTF_HWHEEL: ::DWORD = 0x01000;
-pub const MOUSEEVENTF_MOVE_NOCOALESCE: ::DWORD = 0x2000;
-pub const MOUSEEVENTF_VIRTUALDESK: ::DWORD = 0x4000;
-pub const MOUSEEVENTF_ABSOLUTE: ::DWORD = 0x8000;
-STRUCT!{struct MOUSEINPUT {
-    dx: ::LONG,
-    dy: ::LONG,
-    mouseData: ::DWORD,
-    dwFlags: ::DWORD,
-    time: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-}}
-pub type PMOUSEINPUT = *mut MOUSEINPUT;
-pub type LPMOUSEINPUT = *mut MOUSEINPUT;
-STRUCT!{struct KEYBDINPUT {
-    wVk: ::WORD,
-    wScan: ::WORD,
-    dwFlags: ::DWORD,
-    time: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-}}
-pub type PKEYBDINPUT = *mut KEYBDINPUT;
-pub type LPKEYBDINPUT = *mut KEYBDINPUT;
-STRUCT!{struct HARDWAREINPUT {
-    uMsg: ::DWORD,
-    wParamL: ::WORD,
-    wParamH: ::WORD,
-}}
-pub type PHARDWAREINPUT = *mut HARDWAREINPUT;
-pub type LPHARDWAREINPUT= *mut HARDWAREINPUT;
-pub const INPUT_MOUSE: ::DWORD = 0;
-pub const INPUT_KEYBOARD: ::DWORD = 1;
-pub const INPUT_HARDWARE: ::DWORD = 2;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct INPUT {
-    type_: ::DWORD,
-    u: [u32; 6],
-}}
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct INPUT {
-    type_: ::DWORD,
-    u: [u64; 4],
-}}
-UNION!{INPUT, u, mi, mi_mut, MOUSEINPUT}
-UNION!{INPUT, u, ki, ki_mut, KEYBDINPUT}
-UNION!{INPUT, u, hi, hi_mut, HARDWAREINPUT}
-pub type PINPUT = *mut INPUT;
-pub type LPINPUT = *mut INPUT;
-// if WINVER >= 0x0601
-DECLARE_HANDLE!(HTOUCHINPUT, HTOUCHINPUT__);
-STRUCT!{struct TOUCHINPUT {
-    x: ::LONG,
-    y: ::LONG,
-    hSource: ::HANDLE,
-    dwID: ::DWORD,
-    dwFlags: ::DWORD,
-    dwMask: ::DWORD,
-    dwTime: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-    cxContact: ::DWORD,
-    cyContact: ::DWORD,
-}}
-pub type PTOUCHINPUT = *mut TOUCHINPUT;
-pub type PCTOUCHINPUT = *const TOUCHINPUT;
-//Touch input flag values (TOUCHINPUT.dwFlags)
-pub const TOUCHEVENTF_MOVE: ::DWORD = 0x0001;
-pub const TOUCHEVENTF_DOWN: ::DWORD = 0x0002;
-pub const TOUCHEVENTF_UP: ::DWORD = 0x0004;
-pub const TOUCHEVENTF_INRANGE: ::DWORD = 0x0008;
-pub const TOUCHEVENTF_PRIMARY: ::DWORD = 0x0010;
-pub const TOUCHEVENTF_NOCOALESCE: ::DWORD = 0x0020;
-pub const TOUCHEVENTF_PEN: ::DWORD = 0x0040;
-pub const TOUCHEVENTF_PALM: ::DWORD = 0x0080;
-//Touch input mask values (TOUCHINPUT.dwMask)
-pub const TOUCHINPUTMASKF_TIMEFROMSYSTEM: ::DWORD = 0x0001;
-pub const TOUCHINPUTMASKF_EXTRAINFO: ::DWORD = 0x0002;
-pub const TOUCHINPUTMASKF_CONTACTAREA: ::DWORD = 0x0004;
-//RegisterTouchWindow flag values
-pub const TWF_FINETOUCH: ::ULONG = 0x00000001;
-pub const TWF_WANTPALM: ::ULONG = 0x00000002;
-// end if WINVER >= 0x0601
-//Indices for GetWindowLong etc.
-pub const GWL_EXSTYLE: ::c_int = -20;
-pub const GWL_STYLE: ::c_int = -16;
-pub const GWL_WNDPROC: ::c_int = -4;
-pub const GWLP_WNDPROC: ::c_int = -4;
-pub const GWL_HINSTANCE: ::c_int = -6;
-pub const GWLP_HINSTANCE: ::c_int = -6;
-pub const GWL_HWNDPARENT: ::c_int = -8;
-pub const GWLP_HWNDPARENT: ::c_int = -8;
-pub const GWL_ID: ::c_int = -12;
-pub const GWLP_ID: ::c_int = -12;
-pub const GWL_USERDATA: ::c_int = -21;
-pub const GWLP_USERDATA: ::c_int = -21;
-//5976
-ENUM!{enum POINTER_INPUT_TYPE {
-    PT_POINTER = 0x00000001,
-    PT_TOUCH = 0x00000002,
-    PT_PEN = 0x00000003,
-    PT_MOUSE = 0x00000004,
-    PT_TOUCHPAD = 0x00000005,
-}}
-//6566
-// flags for MsgWaitForMultipleObjectsEx
-pub const MWMO_WAITALL: ::DWORD = 0x0001;
-pub const MWMO_ALERTABLE: ::DWORD = 0x0002;
-pub const MWMO_INPUTAVAILABLE: ::DWORD = 0x0004;
-//6573
-pub const QS_KEY: ::UINT = 0x0001;
-pub const QS_MOUSEMOVE: ::UINT = 0x0002;
-pub const QS_MOUSEBUTTON: ::UINT = 0x0004;
-pub const QS_POSTMESSAGE: ::UINT = 0x0008;
-pub const QS_TIMER: ::UINT = 0x0010;
-pub const QS_PAINT: ::UINT = 0x0020;
-pub const QS_SENDMESSAGE: ::UINT = 0x0040;
-pub const QS_HOTKEY: ::UINT = 0x0080;
-pub const QS_ALLPOSTMESSAGE: ::UINT = 0x0100;
-pub const QS_RAWINPUT: ::UINT = 0x0400;
-pub const QS_TOUCH: ::UINT = 0x0800;
-pub const QS_POINTER: ::UINT = 0x1000;
-pub const QS_MOUSE: ::UINT = QS_MOUSEMOVE | QS_MOUSEBUTTON;
-pub const QS_INPUT: ::UINT = QS_MOUSE | QS_KEY | QS_RAWINPUT | QS_TOUCH | QS_POINTER;
-pub const QS_ALLEVENTS: ::UINT = QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY;
-pub const QS_ALLINPUT: ::UINT = QS_INPUT | QS_POSTMESSAGE | QS_TIMER
-    | QS_PAINT | QS_HOTKEY | QS_SENDMESSAGE;
-//6789
-pub const SM_CXSCREEN: ::c_int = 0;
-pub const SM_CYSCREEN: ::c_int = 1;
-pub const SM_CXVSCROLL: ::c_int = 2;
-pub const SM_CYHSCROLL: ::c_int = 3;
-pub const SM_CYCAPTION: ::c_int = 4;
-pub const SM_CXBORDER: ::c_int = 5;
-pub const SM_CYBORDER: ::c_int = 6;
-pub const SM_CXDLGFRAME: ::c_int = 7;
-pub const SM_CYDLGFRAME: ::c_int = 8;
-pub const SM_CYVTHUMB: ::c_int = 9;
-pub const SM_CXHTHUMB: ::c_int = 10;
-pub const SM_CXICON: ::c_int = 11;
-pub const SM_CYICON: ::c_int = 12;
-pub const SM_CXCURSOR: ::c_int = 13;
-pub const SM_CYCURSOR: ::c_int = 14;
-pub const SM_CYMENU: ::c_int = 15;
-pub const SM_CXFULLSCREEN: ::c_int = 16;
-pub const SM_CYFULLSCREEN: ::c_int = 17;
-pub const SM_CYKANJIWINDOW: ::c_int = 18;
-pub const SM_MOUSEPRESENT: ::c_int = 19;
-pub const SM_CYVSCROLL: ::c_int = 20;
-pub const SM_CXHSCROLL: ::c_int = 21;
-pub const SM_DEBUG: ::c_int = 22;
-pub const SM_SWAPBUTTON: ::c_int = 23;
-pub const SM_RESERVED1: ::c_int = 24;
-pub const SM_RESERVED2: ::c_int = 25;
-pub const SM_RESERVED3: ::c_int = 26;
-pub const SM_RESERVED4: ::c_int = 27;
-pub const SM_CXMIN: ::c_int = 28;
-pub const SM_CYMIN: ::c_int = 29;
-pub const SM_CXSIZE: ::c_int = 30;
-pub const SM_CYSIZE: ::c_int = 31;
-pub const SM_CXFRAME: ::c_int = 32;
-pub const SM_CYFRAME: ::c_int = 33;
-pub const SM_CXMINTRACK: ::c_int = 34;
-pub const SM_CYMINTRACK: ::c_int = 35;
-pub const SM_CXDOUBLECLK: ::c_int = 36;
-pub const SM_CYDOUBLECLK: ::c_int = 37;
-pub const SM_CXICONSPACING: ::c_int = 38;
-pub const SM_CYICONSPACING: ::c_int = 39;
-pub const SM_MENUDROPALIGNMENT: ::c_int = 40;
-pub const SM_PENWINDOWS: ::c_int = 41;
-pub const SM_DBCSENABLED: ::c_int = 42;
-pub const SM_CMOUSEBUTTONS: ::c_int = 43;
-pub const SM_CXFIXEDFRAME: ::c_int = SM_CXDLGFRAME;
-pub const SM_CYFIXEDFRAME: ::c_int = SM_CYDLGFRAME;
-pub const SM_CXSIZEFRAME: ::c_int = SM_CXFRAME;
-pub const SM_CYSIZEFRAME: ::c_int = SM_CYFRAME;
-pub const SM_SECURE: ::c_int = 44;
-pub const SM_CXEDGE: ::c_int = 45;
-pub const SM_CYEDGE: ::c_int = 46;
-pub const SM_CXMINSPACING: ::c_int = 47;
-pub const SM_CYMINSPACING: ::c_int = 48;
-pub const SM_CXSMICON: ::c_int = 49;
-pub const SM_CYSMICON: ::c_int = 50;
-pub const SM_CYSMCAPTION: ::c_int = 51;
-pub const SM_CXSMSIZE: ::c_int = 52;
-pub const SM_CYSMSIZE: ::c_int = 53;
-pub const SM_CXMENUSIZE: ::c_int = 54;
-pub const SM_CYMENUSIZE: ::c_int = 55;
-pub const SM_ARRANGE: ::c_int = 56;
-pub const SM_CXMINIMIZED: ::c_int = 57;
-pub const SM_CYMINIMIZED: ::c_int = 58;
-pub const SM_CXMAXTRACK: ::c_int = 59;
-pub const SM_CYMAXTRACK: ::c_int = 60;
-pub const SM_CXMAXIMIZED: ::c_int = 61;
-pub const SM_CYMAXIMIZED: ::c_int = 62;
-pub const SM_NETWORK: ::c_int = 63;
-pub const SM_CLEANBOOT: ::c_int = 67;
-pub const SM_CXDRAG: ::c_int = 68;
-pub const SM_CYDRAG: ::c_int = 69;
-pub const SM_SHOWSOUNDS: ::c_int = 70;
-pub const SM_CXMENUCHECK: ::c_int = 71;
-pub const SM_CYMENUCHECK: ::c_int = 72;
-pub const SM_SLOWMACHINE: ::c_int = 73;
-pub const SM_MIDEASTENABLED: ::c_int = 74;
-pub const SM_MOUSEWHEELPRESENT: ::c_int = 75;
-pub const SM_XVIRTUALSCREEN: ::c_int = 76;
-pub const SM_YVIRTUALSCREEN: ::c_int = 77;
-pub const SM_CXVIRTUALSCREEN: ::c_int = 78;
-pub const SM_CYVIRTUALSCREEN: ::c_int = 79;
-pub const SM_CMONITORS: ::c_int = 80;
-pub const SM_SAMEDISPLAYFORMAT: ::c_int = 81;
-pub const SM_IMMENABLED: ::c_int = 82;
-pub const SM_CXFOCUSBORDER: ::c_int = 83;
-pub const SM_CYFOCUSBORDER: ::c_int = 84;
-pub const SM_TABLETPC: ::c_int = 86;
-pub const SM_MEDIACENTER: ::c_int = 87;
-pub const SM_STARTER: ::c_int = 88;
-pub const SM_SERVERR2: ::c_int = 89;
-pub const SM_MOUSEHORIZONTALWHEELPRESENT: ::c_int = 91;
-pub const SM_CXPADDEDBORDER: ::c_int = 92;
-pub const SM_DIGITIZER: ::c_int = 94;
-pub const SM_MAXIMUMTOUCHES: ::c_int = 95;
-pub const SM_CMETRICS: ::c_int = 97;
-pub const SM_REMOTESESSION: ::c_int = 0x1000;
-pub const SM_SHUTTINGDOWN: ::c_int = 0x2000;
-pub const SM_REMOTECONTROL: ::c_int = 0x2001;
-pub const SM_CARETBLINKINGENABLED: ::c_int = 0x2002;
-pub const SM_CONVERTIBLESLATEMODE: ::c_int = 0x2003;
-pub const SM_SYSTEMDOCKED: ::c_int = 0x2004;
-//8855 (Win 7 SDK)
-STRUCT!{struct ICONINFO {
-    fIcon: ::BOOL,
-    xHotspot: ::DWORD,
-    yHotspot: ::DWORD,
-    hbmMask: ::HBITMAP,
-    hbmColor: ::HBITMAP,
-}}
-pub type PICONINFO = *mut ICONINFO;
-//9066
-// Color indexes for use in GetSysColor and SetSysColor
-// 0-18 (after incrementing) are also valid in RegisterClass's WNDCLASS
-pub const COLOR_SCROLLBAR: ::c_int = 0;
-pub const COLOR_BACKGROUND: ::c_int = 1;
-pub const COLOR_ACTIVECAPTION: ::c_int = 2;
-pub const COLOR_INACTIVECAPTION: ::c_int = 3;
-pub const COLOR_MENU: ::c_int = 4;
-pub const COLOR_WINDOW: ::c_int = 5;
-pub const COLOR_WINDOWFRAME: ::c_int = 6;
-pub const COLOR_MENUTEXT: ::c_int = 7;
-pub const COLOR_WINDOWTEXT: ::c_int = 8;
-pub const COLOR_CAPTIONTEXT: ::c_int = 9;
-pub const COLOR_ACTIVEBORDER: ::c_int = 10;
-pub const COLOR_INACTIVEBORDER: ::c_int = 11;
-pub const COLOR_APPWORKSPACE: ::c_int = 12;
-pub const COLOR_HIGHLIGHT: ::c_int = 13;
-pub const COLOR_HIGHLIGHTTEXT: ::c_int = 14;
-pub const COLOR_BTNFACE: ::c_int = 15;
-pub const COLOR_BTNSHADOW: ::c_int = 16;
-pub const COLOR_GRAYTEXT: ::c_int = 17;
-pub const COLOR_BTNTEXT: ::c_int = 18;
-pub const COLOR_INACTIVECAPTIONTEXT: ::c_int = 19;
-pub const COLOR_BTNHIGHLIGHT: ::c_int = 20;
-// Introduced in Windows 95 (winver 0x0400):
-pub const COLOR_3DDKSHADOW: ::c_int = 21;
-pub const COLOR_3DLIGHT: ::c_int = 22;
-pub const COLOR_INFOTEXT: ::c_int = 23;
-pub const COLOR_INFOBK: ::c_int = 24;
-pub const COLOR_DESKTOP: ::c_int = COLOR_BACKGROUND;
-pub const COLOR_3DFACE: ::c_int = COLOR_BTNFACE;
-pub const COLOR_3DSHADOW: ::c_int = COLOR_BTNSHADOW;
-pub const COLOR_3DHIGHLIGHT: ::c_int = COLOR_BTNHIGHLIGHT;
-pub const COLOR_3DHILIGHT: ::c_int = COLOR_BTNHIGHLIGHT;
-pub const COLOR_BTNHILIGHT: ::c_int = COLOR_BTNHIGHLIGHT;
-// Introduced in Windows 2000 (winver 0x0500)
-pub const COLOR_HOTLIGHT: ::c_int = 26;
-pub const COLOR_GRADIENTACTIVECAPTION: ::c_int = 27;
-pub const COLOR_GRADIENTINACTIVECAPTION: ::c_int = 28;
-// Introduced in Windows XP (winver 0x0501)
-pub const COLOR_MENUHILIGHT: ::c_int = 29;
-pub const COLOR_MENUBAR: ::c_int = 30;
-//10069
-pub const IDC_ARROW: ::LPCWSTR = 32512 as ::LPCWSTR;
-pub const IDC_IBEAM: ::LPCWSTR = 32513 as ::LPCWSTR;
-pub const IDC_WAIT: ::LPCWSTR = 32514 as ::LPCWSTR;
-pub const IDC_CROSS: ::LPCWSTR = 32515 as ::LPCWSTR;
-pub const IDC_UPARROW: ::LPCWSTR = 32516 as ::LPCWSTR;
-pub const IDC_SIZE: ::LPCWSTR = 32640 as ::LPCWSTR;
-pub const IDC_ICON: ::LPCWSTR = 32641 as ::LPCWSTR;
-pub const IDC_SIZENWSE: ::LPCWSTR = 32642 as ::LPCWSTR;
-pub const IDC_SIZENESW: ::LPCWSTR = 32643 as ::LPCWSTR;
-pub const IDC_SIZEWE: ::LPCWSTR = 32644 as ::LPCWSTR;
-pub const IDC_SIZENS: ::LPCWSTR = 32645 as ::LPCWSTR;
-pub const IDC_SIZEALL: ::LPCWSTR = 32646 as ::LPCWSTR;
-pub const IDC_NO: ::LPCWSTR = 32648 as ::LPCWSTR;
-pub const IDC_HAND: ::LPCWSTR = 32649 as ::LPCWSTR;
-pub const IDC_APPSTARTING: ::LPCWSTR = 32650 as ::LPCWSTR;
-pub const IDC_HELP: ::LPCWSTR = 32651 as ::LPCWSTR;
-//10492
-pub const IDI_APPLICATION: ::LPCWSTR = 32512 as ::LPCWSTR;
-pub const IDI_HAND: ::LPCWSTR = 32513 as ::LPCWSTR;
-pub const IDI_QUESTION: ::LPCWSTR = 32514 as ::LPCWSTR;
-pub const IDI_EXCLAMATION: ::LPCWSTR = 32515 as ::LPCWSTR;
-pub const IDI_ASTERISK: ::LPCWSTR = 32516 as ::LPCWSTR;
-pub const IDI_WINLOGO: ::LPCWSTR = 32517 as ::LPCWSTR;
-pub const IDI_SHIELD: ::LPCWSTR = 32518 as ::LPCWSTR;
-pub const IDI_WARNING: ::LPCWSTR = IDI_EXCLAMATION;
-pub const IDI_ERROR: ::LPCWSTR = IDI_HAND;
-pub const IDI_INFORMATION: ::LPCWSTR = IDI_ASTERISK;
-pub const SPI_GETBEEP: ::UINT = 0x0001;
-pub const SPI_SETBEEP: ::UINT = 0x0002;
-pub const SPI_GETMOUSE: ::UINT = 0x0003;
-pub const SPI_SETMOUSE: ::UINT = 0x0004;
-pub const SPI_GETBORDER: ::UINT = 0x0005;
-pub const SPI_SETBORDER: ::UINT = 0x0006;
-pub const SPI_GETKEYBOARDSPEED: ::UINT = 0x000A;
-pub const SPI_SETKEYBOARDSPEED: ::UINT = 0x000B;
-pub const SPI_LANGDRIVER: ::UINT = 0x000C;
-pub const SPI_ICONHORIZONTALSPACING: ::UINT = 0x000D;
-pub const SPI_GETSCREENSAVETIMEOUT: ::UINT = 0x000E;
-pub const SPI_SETSCREENSAVETIMEOUT: ::UINT = 0x000F;
-pub const SPI_GETSCREENSAVEACTIVE: ::UINT = 0x0010;
-pub const SPI_SETSCREENSAVEACTIVE: ::UINT = 0x0011;
-pub const SPI_GETGRIDGRANULARITY: ::UINT = 0x0012;
-pub const SPI_SETGRIDGRANULARITY: ::UINT = 0x0013;
-pub const SPI_SETDESKWALLPAPER: ::UINT = 0x0014;
-pub const SPI_SETDESKPATTERN: ::UINT = 0x0015;
-pub const SPI_GETKEYBOARDDELAY: ::UINT = 0x0016;
-pub const SPI_SETKEYBOARDDELAY: ::UINT = 0x0017;
-pub const SPI_ICONVERTICALSPACING: ::UINT = 0x0018;
-pub const SPI_GETICONTITLEWRAP: ::UINT = 0x0019;
-pub const SPI_SETICONTITLEWRAP: ::UINT = 0x001A;
-pub const SPI_GETMENUDROPALIGNMENT: ::UINT = 0x001B;
-pub const SPI_SETMENUDROPALIGNMENT: ::UINT = 0x001C;
-pub const SPI_SETDOUBLECLKWIDTH: ::UINT = 0x001D;
-pub const SPI_SETDOUBLECLKHEIGHT: ::UINT = 0x001E;
-pub const SPI_GETICONTITLELOGFONT: ::UINT = 0x001F;
-pub const SPI_SETDOUBLECLICKTIME: ::UINT = 0x0020;
-pub const SPI_SETMOUSEBUTTONSWAP: ::UINT = 0x0021;
-pub const SPI_SETICONTITLELOGFONT: ::UINT = 0x0022;
-pub const SPI_GETFASTTASKSWITCH: ::UINT = 0x0023;
-pub const SPI_SETFASTTASKSWITCH: ::UINT = 0x0024;
-pub const SPI_SETDRAGFULLWINDOWS: ::UINT = 0x0025;
-pub const SPI_GETDRAGFULLWINDOWS: ::UINT = 0x0026;
-pub const SPI_GETNONCLIENTMETRICS: ::UINT = 0x0029;
-pub const SPI_SETNONCLIENTMETRICS: ::UINT = 0x002A;
-pub const SPI_GETMINIMIZEDMETRICS: ::UINT = 0x002B;
-pub const SPI_SETMINIMIZEDMETRICS: ::UINT = 0x002C;
-pub const SPI_GETICONMETRICS: ::UINT = 0x002D;
-pub const SPI_SETICONMETRICS: ::UINT = 0x002E;
-pub const SPI_SETWORKAREA: ::UINT = 0x002F;
-pub const SPI_GETWORKAREA: ::UINT = 0x0030;
-pub const SPI_SETPENWINDOWS: ::UINT = 0x0031;
-pub const SPI_GETHIGHCONTRAST: ::UINT = 0x0042;
-pub const SPI_SETHIGHCONTRAST: ::UINT = 0x0043;
-pub const SPI_GETKEYBOARDPREF: ::UINT = 0x0044;
-pub const SPI_SETKEYBOARDPREF: ::UINT = 0x0045;
-pub const SPI_GETSCREENREADER: ::UINT = 0x0046;
-pub const SPI_SETSCREENREADER: ::UINT = 0x0047;
-pub const SPI_GETANIMATION: ::UINT = 0x0048;
-pub const SPI_SETANIMATION: ::UINT = 0x0049;
-pub const SPI_GETFONTSMOOTHING: ::UINT = 0x004A;
-pub const SPI_SETFONTSMOOTHING: ::UINT = 0x004B;
-pub const SPI_SETDRAGWIDTH: ::UINT = 0x004C;
-pub const SPI_SETDRAGHEIGHT: ::UINT = 0x004D;
-pub const SPI_SETHANDHELD: ::UINT = 0x004E;
-pub const SPI_GETLOWPOWERTIMEOUT: ::UINT = 0x004F;
-pub const SPI_GETPOWEROFFTIMEOUT: ::UINT = 0x0050;
-pub const SPI_SETLOWPOWERTIMEOUT: ::UINT = 0x0051;
-pub const SPI_SETPOWEROFFTIMEOUT: ::UINT = 0x0052;
-pub const SPI_GETLOWPOWERACTIVE: ::UINT = 0x0053;
-pub const SPI_GETPOWEROFFACTIVE: ::UINT = 0x0054;
-pub const SPI_SETLOWPOWERACTIVE: ::UINT = 0x0055;
-pub const SPI_SETPOWEROFFACTIVE: ::UINT = 0x0056;
-pub const SPI_SETCURSORS: ::UINT = 0x0057;
-pub const SPI_SETICONS: ::UINT = 0x0058;
-pub const SPI_GETDEFAULTINPUTLANG: ::UINT = 0x0059;
-pub const SPI_SETDEFAULTINPUTLANG: ::UINT = 0x005A;
-pub const SPI_SETLANGTOGGLE: ::UINT = 0x005B;
-pub const SPI_GETWINDOWSEXTENSION: ::UINT = 0x005C;
-pub const SPI_SETMOUSETRAILS: ::UINT = 0x005D;
-pub const SPI_GETMOUSETRAILS: ::UINT = 0x005E;
-pub const SPI_SETSCREENSAVERRUNNING: ::UINT = 0x0061;
-pub const SPI_SCREENSAVERRUNNING: ::UINT = SPI_SETSCREENSAVERRUNNING;
-pub const SPI_GETFILTERKEYS: ::UINT = 0x0032;
-pub const SPI_SETFILTERKEYS: ::UINT = 0x0033;
-pub const SPI_GETTOGGLEKEYS: ::UINT = 0x0034;
-pub const SPI_SETTOGGLEKEYS: ::UINT = 0x0035;
-pub const SPI_GETMOUSEKEYS: ::UINT = 0x0036;
-pub const SPI_SETMOUSEKEYS: ::UINT = 0x0037;
-pub const SPI_GETSHOWSOUNDS: ::UINT = 0x0038;
-pub const SPI_SETSHOWSOUNDS: ::UINT = 0x0039;
-pub const SPI_GETSTICKYKEYS: ::UINT = 0x003A;
-pub const SPI_SETSTICKYKEYS: ::UINT = 0x003B;
-pub const SPI_GETACCESSTIMEOUT: ::UINT = 0x003C;
-pub const SPI_SETACCESSTIMEOUT: ::UINT = 0x003D;
-pub const SPI_GETSERIALKEYS: ::UINT = 0x003E;
-pub const SPI_SETSERIALKEYS: ::UINT = 0x003F;
-pub const SPI_GETSOUNDSENTRY: ::UINT = 0x0040;
-pub const SPI_SETSOUNDSENTRY: ::UINT = 0x0041;
-pub const SPI_GETSNAPTODEFBUTTON: ::UINT = 0x005F;
-pub const SPI_SETSNAPTODEFBUTTON: ::UINT = 0x0060;
-pub const SPI_GETMOUSEHOVERWIDTH: ::UINT = 0x0062;
-pub const SPI_SETMOUSEHOVERWIDTH: ::UINT = 0x0063;
-pub const SPI_GETMOUSEHOVERHEIGHT: ::UINT = 0x0064;
-pub const SPI_SETMOUSEHOVERHEIGHT: ::UINT = 0x0065;
-pub const SPI_GETMOUSEHOVERTIME: ::UINT = 0x0066;
-pub const SPI_SETMOUSEHOVERTIME: ::UINT = 0x0067;
-pub const SPI_GETWHEELSCROLLLINES: ::UINT = 0x0068;
-pub const SPI_SETWHEELSCROLLLINES: ::UINT = 0x0069;
-pub const SPI_GETMENUSHOWDELAY: ::UINT = 0x006A;
-pub const SPI_SETMENUSHOWDELAY: ::UINT = 0x006B;
-pub const SPI_GETWHEELSCROLLCHARS: ::UINT = 0x006C;
-pub const SPI_SETWHEELSCROLLCHARS: ::UINT = 0x006D;
-pub const SPI_GETSHOWIMEUI: ::UINT = 0x006E;
-pub const SPI_SETSHOWIMEUI: ::UINT = 0x006F;
-pub const SPI_GETMOUSESPEED: ::UINT = 0x0070;
-pub const SPI_SETMOUSESPEED: ::UINT = 0x0071;
-pub const SPI_GETSCREENSAVERRUNNING: ::UINT = 0x0072;
-pub const SPI_GETDESKWALLPAPER: ::UINT = 0x0073;
-pub const SPI_GETAUDIODESCRIPTION: ::UINT = 0x0074;
-pub const SPI_SETAUDIODESCRIPTION: ::UINT = 0x0075;
-pub const SPI_GETSCREENSAVESECURE: ::UINT = 0x0076;
-pub const SPI_SETSCREENSAVESECURE: ::UINT = 0x0077;
-pub const SPI_GETHUNGAPPTIMEOUT: ::UINT = 0x0078;
-pub const SPI_SETHUNGAPPTIMEOUT: ::UINT = 0x0079;
-pub const SPI_GETWAITTOKILLTIMEOUT: ::UINT = 0x007A;
-pub const SPI_SETWAITTOKILLTIMEOUT: ::UINT = 0x007B;
-pub const SPI_GETWAITTOKILLSERVICETIMEOUT: ::UINT = 0x007C;
-pub const SPI_SETWAITTOKILLSERVICETIMEOUT: ::UINT = 0x007D;
-pub const SPI_GETMOUSEDOCKTHRESHOLD: ::UINT = 0x007E;
-pub const SPI_SETMOUSEDOCKTHRESHOLD: ::UINT = 0x007F;
-pub const SPI_GETPENDOCKTHRESHOLD: ::UINT = 0x0080;
-pub const SPI_SETPENDOCKTHRESHOLD: ::UINT = 0x0081;
-pub const SPI_GETWINARRANGING: ::UINT = 0x0082;
-pub const SPI_SETWINARRANGING: ::UINT = 0x0083;
-pub const SPI_GETMOUSEDRAGOUTTHRESHOLD: ::UINT = 0x0084;
-pub const SPI_SETMOUSEDRAGOUTTHRESHOLD: ::UINT = 0x0085;
-pub const SPI_GETPENDRAGOUTTHRESHOLD: ::UINT = 0x0086;
-pub const SPI_SETPENDRAGOUTTHRESHOLD: ::UINT = 0x0087;
-pub const SPI_GETMOUSESIDEMOVETHRESHOLD: ::UINT = 0x0088;
-pub const SPI_SETMOUSESIDEMOVETHRESHOLD: ::UINT = 0x0089;
-pub const SPI_GETPENSIDEMOVETHRESHOLD: ::UINT = 0x008A;
-pub const SPI_SETPENSIDEMOVETHRESHOLD: ::UINT = 0x008B;
-pub const SPI_GETDRAGFROMMAXIMIZE: ::UINT = 0x008C;
-pub const SPI_SETDRAGFROMMAXIMIZE: ::UINT = 0x008D;
-pub const SPI_GETSNAPSIZING: ::UINT = 0x008E;
-pub const SPI_SETSNAPSIZING: ::UINT = 0x008F;
-pub const SPI_GETDOCKMOVING: ::UINT = 0x0090;
-pub const SPI_SETDOCKMOVING: ::UINT = 0x0091;
-pub const SPI_GETACTIVEWINDOWTRACKING: ::UINT = 0x1000;
-pub const SPI_SETACTIVEWINDOWTRACKING: ::UINT = 0x1001;
-pub const SPI_GETMENUANIMATION: ::UINT = 0x1002;
-pub const SPI_SETMENUANIMATION: ::UINT = 0x1003;
-pub const SPI_GETCOMBOBOXANIMATION: ::UINT = 0x1004;
-pub const SPI_SETCOMBOBOXANIMATION: ::UINT = 0x1005;
-pub const SPI_GETLISTBOXSMOOTHSCROLLING: ::UINT = 0x1006;
-pub const SPI_SETLISTBOXSMOOTHSCROLLING: ::UINT = 0x1007;
-pub const SPI_GETGRADIENTCAPTIONS: ::UINT = 0x1008;
-pub const SPI_SETGRADIENTCAPTIONS: ::UINT = 0x1009;
-pub const SPI_GETKEYBOARDCUES: ::UINT = 0x100A;
-pub const SPI_SETKEYBOARDCUES: ::UINT = 0x100B;
-pub const SPI_GETMENUUNDERLINES: ::UINT = SPI_GETKEYBOARDCUES;
-pub const SPI_SETMENUUNDERLINES: ::UINT = SPI_SETKEYBOARDCUES;
-pub const SPI_GETACTIVEWNDTRKZORDER: ::UINT = 0x100C;
-pub const SPI_SETACTIVEWNDTRKZORDER: ::UINT = 0x100D;
-pub const SPI_GETHOTTRACKING: ::UINT = 0x100E;
-pub const SPI_SETHOTTRACKING: ::UINT = 0x100F;
-pub const SPI_GETMENUFADE: ::UINT = 0x1012;
-pub const SPI_SETMENUFADE: ::UINT = 0x1013;
-pub const SPI_GETSELECTIONFADE: ::UINT = 0x1014;
-pub const SPI_SETSELECTIONFADE: ::UINT = 0x1015;
-pub const SPI_GETTOOLTIPANIMATION: ::UINT = 0x1016;
-pub const SPI_SETTOOLTIPANIMATION: ::UINT = 0x1017;
-pub const SPI_GETTOOLTIPFADE: ::UINT = 0x1018;
-pub const SPI_SETTOOLTIPFADE: ::UINT = 0x1019;
-pub const SPI_GETCURSORSHADOW: ::UINT = 0x101A;
-pub const SPI_SETCURSORSHADOW: ::UINT = 0x101B;
-pub const SPI_GETMOUSESONAR: ::UINT = 0x101C;
-pub const SPI_SETMOUSESONAR: ::UINT = 0x101D;
-pub const SPI_GETMOUSECLICKLOCK: ::UINT = 0x101E;
-pub const SPI_SETMOUSECLICKLOCK: ::UINT = 0x101F;
-pub const SPI_GETMOUSEVANISH: ::UINT = 0x1020;
-pub const SPI_SETMOUSEVANISH: ::UINT = 0x1021;
-pub const SPI_GETFLATMENU: ::UINT = 0x1022;
-pub const SPI_SETFLATMENU: ::UINT = 0x1023;
-pub const SPI_GETDROPSHADOW: ::UINT = 0x1024;
-pub const SPI_SETDROPSHADOW: ::UINT = 0x1025;
-pub const SPI_GETBLOCKSENDINPUTRESETS: ::UINT = 0x1026;
-pub const SPI_SETBLOCKSENDINPUTRESETS: ::UINT = 0x1027;
-pub const SPI_GETUIEFFECTS: ::UINT = 0x103E;
-pub const SPI_SETUIEFFECTS: ::UINT = 0x103F;
-pub const SPI_GETDISABLEOVERLAPPEDCONTENT: ::UINT = 0x1040;
-pub const SPI_SETDISABLEOVERLAPPEDCONTENT: ::UINT = 0x1041;
-pub const SPI_GETCLIENTAREAANIMATION: ::UINT = 0x1042;
-pub const SPI_SETCLIENTAREAANIMATION: ::UINT = 0x1043;
-pub const SPI_GETCLEARTYPE: ::UINT = 0x1048;
-pub const SPI_SETCLEARTYPE: ::UINT = 0x1049;
-pub const SPI_GETSPEECHRECOGNITION: ::UINT = 0x104A;
-pub const SPI_SETSPEECHRECOGNITION: ::UINT = 0x104B;
-pub const SPI_GETFOREGROUNDLOCKTIMEOUT: ::UINT = 0x2000;
-pub const SPI_SETFOREGROUNDLOCKTIMEOUT: ::UINT = 0x2001;
-pub const SPI_GETACTIVEWNDTRKTIMEOUT: ::UINT = 0x2002;
-pub const SPI_SETACTIVEWNDTRKTIMEOUT: ::UINT = 0x2003;
-pub const SPI_GETFOREGROUNDFLASHCOUNT: ::UINT = 0x2004;
-pub const SPI_SETFOREGROUNDFLASHCOUNT: ::UINT = 0x2005;
-pub const SPI_GETCARETWIDTH: ::UINT = 0x2006;
-pub const SPI_SETCARETWIDTH: ::UINT = 0x2007;
-pub const SPI_GETMOUSECLICKLOCKTIME: ::UINT = 0x2008;
-pub const SPI_SETMOUSECLICKLOCKTIME: ::UINT = 0x2009;
-pub const SPI_GETFONTSMOOTHINGTYPE: ::UINT = 0x200A;
-pub const SPI_SETFONTSMOOTHINGTYPE: ::UINT = 0x200B;
-pub const FE_FONTSMOOTHINGSTANDARD: ::UINT = 0x0001;
-pub const FE_FONTSMOOTHINGCLEARTYPE: ::UINT = 0x0002;
-pub const SPI_GETFONTSMOOTHINGCONTRAST: ::UINT = 0x200C;
-pub const SPI_SETFONTSMOOTHINGCONTRAST: ::UINT = 0x200D;
-pub const SPI_GETFOCUSBORDERWIDTH: ::UINT = 0x200E;
-pub const SPI_SETFOCUSBORDERWIDTH: ::UINT = 0x200F;
-pub const SPI_GETFOCUSBORDERHEIGHT: ::UINT = 0x2010;
-pub const SPI_SETFOCUSBORDERHEIGHT: ::UINT = 0x2011;
-pub const SPI_GETFONTSMOOTHINGORIENTATION: ::UINT = 0x2012;
-pub const SPI_SETFONTSMOOTHINGORIENTATION: ::UINT = 0x2013;
-pub const FE_FONTSMOOTHINGORIENTATIONBGR: ::UINT = 0x0000;
-pub const FE_FONTSMOOTHINGORIENTATIONRGB: ::UINT = 0x0001;
-pub const SPI_GETMINIMUMHITRADIUS: ::UINT = 0x2014;
-pub const SPI_SETMINIMUMHITRADIUS: ::UINT = 0x2015;
-pub const SPI_GETMESSAGEDURATION: ::UINT = 0x2016;
-pub const SPI_SETMESSAGEDURATION: ::UINT = 0x2017;
-//11264
-pub const CB_GETEDITSEL: ::UINT = 0x0140;
-pub const CB_LIMITTEXT: ::UINT = 0x0141;
-pub const CB_SETEDITSEL: ::UINT = 0x0142;
-pub const CB_ADDSTRING: ::UINT = 0x0143;
-pub const CB_DELETESTRING: ::UINT = 0x0144;
-pub const CB_DIR: ::UINT = 0x0145;
-pub const CB_GETCOUNT: ::UINT = 0x0146;
-pub const CB_GETCURSEL: ::UINT = 0x0147;
-pub const CB_GETLBTEXT: ::UINT = 0x0148;
-pub const CB_GETLBTEXTLEN: ::UINT = 0x0149;
-pub const CB_INSERTSTRING: ::UINT = 0x014A;
-pub const CB_RESETCONTENT: ::UINT = 0x014B;
-pub const CB_FINDSTRING: ::UINT = 0x014C;
-pub const CB_SELECTSTRING: ::UINT = 0x014D;
-pub const CB_SETCURSEL: ::UINT = 0x014E;
-pub const CB_SHOWDROPDOWN: ::UINT = 0x014F;
-pub const CB_GETITEMDATA: ::UINT = 0x0150;
-pub const CB_SETITEMDATA: ::UINT = 0x0151;
-pub const CB_GETDROPPEDCONTROLRECT: ::UINT = 0x0152;
-pub const CB_SETITEMHEIGHT: ::UINT = 0x0153;
-pub const CB_GETITEMHEIGHT: ::UINT = 0x0154;
-pub const CB_SETEXTENDEDUI: ::UINT = 0x0155;
-pub const CB_GETEXTENDEDUI: ::UINT = 0x0156;
-pub const CB_GETDROPPEDSTATE: ::UINT = 0x0157;
-pub const CB_FINDSTRINGEXACT: ::UINT = 0x0158;
-pub const CB_SETLOCALE: ::UINT = 0x0159;
-pub const CB_GETLOCALE: ::UINT = 0x015A;
-pub const CB_GETTOPINDEX: ::UINT = 0x015b;
-pub const CB_SETTOPINDEX: ::UINT = 0x015c;
-pub const CB_GETHORIZONTALEXTENT: ::UINT = 0x015d;
-pub const CB_SETHORIZONTALEXTENT: ::UINT = 0x015e;
-pub const CB_GETDROPPEDWIDTH: ::UINT = 0x015f;
-pub const CB_SETDROPPEDWIDTH: ::UINT = 0x0160;
-pub const CB_INITSTORAGE: ::UINT = 0x0161;
-//12141
-STRUCT!{nodebug struct NONCLIENTMETRICSA {
-    cbSize: ::UINT,
-    iBorderWidth: ::c_int,
-    iScrollWidth: ::c_int,
-    iScrollHeight: ::c_int,
-    iCaptionWidth: ::c_int,
-    iCaptionHeight: ::c_int,
-    lfCaptionFont: ::LOGFONTA,
-    iSmCaptionWidth: ::c_int,
-    iSmCaptionHeight: ::c_int,
-    lfSmCaptionFont: ::LOGFONTA,
-    iMenuWidth: ::c_int,
-    iMenuHeight: ::c_int,
-    lfMenuFont: ::LOGFONTA,
-    lfStatusFont: ::LOGFONTA,
-    lfMessageFont: ::LOGFONTA,
-    iPaddedBorderWidth: ::c_int,
-}}
-pub type LPNONCLIENTMETRICSA = *mut NONCLIENTMETRICSA;
-STRUCT!{nodebug struct NONCLIENTMETRICSW {
-    cbSize: ::UINT,
-    iBorderWidth: ::c_int,
-    iScrollWidth: ::c_int,
-    iScrollHeight: ::c_int,
-    iCaptionWidth: ::c_int,
-    iCaptionHeight: ::c_int,
-    lfCaptionFont: ::LOGFONTW,
-    iSmCaptionWidth: ::c_int,
-    iSmCaptionHeight: ::c_int,
-    lfSmCaptionFont: ::LOGFONTW,
-    iMenuWidth: ::c_int,
-    iMenuHeight: ::c_int,
-    lfMenuFont: ::LOGFONTW,
-    lfStatusFont: ::LOGFONTW,
-    lfMessageFont: ::LOGFONTW,
-    iPaddedBorderWidth: ::c_int,
-}}
-pub type LPNONCLIENTMETRICSW = *mut NONCLIENTMETRICSW;
-//12869
-pub const MONITOR_DEFAULTTONULL: ::DWORD = 0x00000000;
-pub const MONITOR_DEFAULTTOPRIMARY: ::DWORD = 0x00000001;
-pub const MONITOR_DEFAULTTONEAREST: ::DWORD = 0x00000002;
-//12900
-pub const MONITORINFOF_PRIMARY: ::DWORD = 1;
-pub const CCHDEVICENAME: usize = 32;
-STRUCT!{struct MONITORINFO {
-    cbSize: ::DWORD,
-    rcMonitor: ::RECT,
-    rcWork: ::RECT,
-    dwFlags: ::DWORD,
-}}
-pub type LPMONITORINFO = *mut MONITORINFO;
-STRUCT!{struct MONITORINFOEXA {
-    cbSize: ::DWORD,
-    rcMonitor: ::RECT,
-    rcWork: ::RECT,
-    dwFlags: ::DWORD,
-    szDevice: [::CHAR; ::CCHDEVICENAME],
-}}
-pub type LPMONITORINFOEXA = *mut MONITORINFOEXA;
-STRUCT!{struct MONITORINFOEXW {
-    cbSize: ::DWORD,
-    rcMonitor: ::RECT,
-    rcWork: ::RECT,
-    dwFlags: ::DWORD,
-    szDevice: [::WCHAR; ::CCHDEVICENAME],
-}}
-pub type LPMONITORINFOEXW = *mut MONITORINFOEXW;
-//12971
-pub type MONITORENUMPROC = Option<unsafe extern "system" fn(
-    ::HMONITOR, ::HDC, ::LPRECT, ::LPARAM,
-) -> ::BOOL>;
-//14098
-DECLARE_HANDLE!(HRAWINPUT, HRAWINPUT__);
-pub fn GET_RAWINPUT_CODE_WPARAM(wParam: ::WPARAM) -> ::WPARAM { wParam & 0xff }
-pub const RIM_INPUT: ::WPARAM = 0;
-pub const RIM_INPUTSINK: ::WPARAM = 1;
-STRUCT!{struct RAWINPUTHEADER {
-    dwType: ::DWORD,
-    dwSize: ::DWORD,
-    hDevice: ::HANDLE,
-    wParam: ::WPARAM,
-}}
-pub type PRAWINPUTHEADER = *mut RAWINPUTHEADER;
-pub type LPRAWINPUTHEADER = *mut RAWINPUTHEADER;
-pub const RIM_TYPEMOUSE: ::DWORD = 0;
-pub const RIM_TYPEKEYBOARD: ::DWORD = 1;
-pub const RIM_TYPEHID: ::DWORD = 2;
-STRUCT!{struct RAWMOUSE {
-    usFlags: ::USHORT,
-    memory_padding: ::USHORT, // 16bit Padding for 32bit align in following union
-    usButtonFlags: ::USHORT,
-    usButtonData: ::USHORT,
-    ulRawButtons: ::ULONG,
-    lLastX: ::LONG,
-    lLastY: ::LONG,
-    ulExtraInformation: ::ULONG,
-}}
-pub type PRAWMOUSE = *mut RAWMOUSE;
-pub type LPRAWMOUSE = *mut RAWMOUSE;
-pub const RI_MOUSE_LEFT_BUTTON_DOWN: ::USHORT = 0x0001;
-pub const RI_MOUSE_LEFT_BUTTON_UP: ::USHORT = 0x0002;
-pub const RI_MOUSE_RIGHT_BUTTON_DOWN: ::USHORT = 0x0004;
-pub const RI_MOUSE_RIGHT_BUTTON_UP: ::USHORT = 0x0008;
-pub const RI_MOUSE_MIDDLE_BUTTON_DOWN: ::USHORT = 0x0010;
-pub const RI_MOUSE_MIDDLE_BUTTON_UP: ::USHORT = 0x0020;
-pub const RI_MOUSE_BUTTON_1_DOWN: ::USHORT = RI_MOUSE_LEFT_BUTTON_DOWN;
-pub const RI_MOUSE_BUTTON_1_UP: ::USHORT = RI_MOUSE_LEFT_BUTTON_UP;
-pub const RI_MOUSE_BUTTON_2_DOWN: ::USHORT = RI_MOUSE_RIGHT_BUTTON_DOWN;
-pub const RI_MOUSE_BUTTON_2_UP: ::USHORT = RI_MOUSE_RIGHT_BUTTON_UP;
-pub const RI_MOUSE_BUTTON_3_DOWN: ::USHORT = RI_MOUSE_MIDDLE_BUTTON_DOWN;
-pub const RI_MOUSE_BUTTON_3_UP: ::USHORT = RI_MOUSE_MIDDLE_BUTTON_UP;
-pub const RI_MOUSE_BUTTON_4_DOWN: ::USHORT = 0x0040;
-pub const RI_MOUSE_BUTTON_4_UP: ::USHORT = 0x0080;
-pub const RI_MOUSE_BUTTON_5_DOWN: ::USHORT = 0x0100;
-pub const RI_MOUSE_BUTTON_5_UP: ::USHORT = 0x0200;
-pub const RI_MOUSE_WHEEL: ::USHORT = 0x0400;
-pub const MOUSE_MOVE_RELATIVE: ::USHORT = 0;
-pub const MOUSE_MOVE_ABSOLUTE: ::USHORT = 1;
-pub const MOUSE_VIRTUAL_DESKTOP: ::USHORT = 0x02;
-pub const MOUSE_ATTRIBUTES_CHANGED: ::USHORT = 0x04;
-pub const MOUSE_MOVE_NOCOALESCE: ::USHORT = 0x08;
-STRUCT!{struct RAWKEYBOARD {
-    MakeCode: ::USHORT,
-    Flags: ::USHORT,
-    Reserved: ::USHORT,
-    VKey: ::USHORT,
-    Message: ::UINT,
-    ExtraInformation: ::ULONG,
-}}
-pub type PRAWKEYBOARD = *mut RAWKEYBOARD;
-pub type LPRAWKEYBOARD = *mut RAWKEYBOARD;
-pub const KEYBOARD_OVERRUN_MAKE_CODE: ::DWORD = 0xFF;
-pub const RI_KEY_MAKE: ::DWORD = 0;
-pub const RI_KEY_BREAK: ::DWORD = 1;
-pub const RI_KEY_E0: ::DWORD = 2;
-pub const RI_KEY_E1: ::DWORD = 4;
-pub const RI_KEY_TERMSRV_SET_LED: ::DWORD = 8;
-pub const RI_KEY_TERMSRV_SHADOW: ::DWORD = 0x10;
-STRUCT!{struct RAWHID {
-    dwSizeHid: ::DWORD,
-    dwCount: ::DWORD,
-    bRawData: [::BYTE; 0],
-}}
-pub type PRAWHID = *mut RAWHID;
-pub type LPRAWHID = *mut RAWHID;
-STRUCT!{struct RAWINPUT {
-    header: RAWINPUTHEADER,
-    mouse: RAWMOUSE,
-}}
-UNION!(RAWINPUT, mouse, mouse, mouse_mut, RAWMOUSE);
-UNION!(RAWINPUT, mouse, keyboard, keyboard_mut, RAWKEYBOARD);
-UNION!(RAWINPUT, mouse, hid, hid_mut, RAWHID);
-#[test]
-fn test_RAWINPUT() {
-    use std::mem::{size_of, align_of};
-    assert!(size_of::<RAWMOUSE>() >= size_of::<RAWMOUSE>());
-    assert!(size_of::<RAWMOUSE>() >= size_of::<RAWKEYBOARD>());
-    assert!(size_of::<RAWMOUSE>() >= size_of::<RAWHID>());
-    assert!(align_of::<RAWMOUSE>() >= align_of::<RAWMOUSE>());
-    assert!(align_of::<RAWMOUSE>() >= align_of::<RAWKEYBOARD>());
-    assert!(align_of::<RAWMOUSE>() >= align_of::<RAWHID>());
-}
-pub type PRAWINPUT = *mut RAWINPUT;
-pub type LPRAWINPUT = *mut RAWINPUT;
-pub const RID_INPUT: ::DWORD = 0x10000003;
-pub const RID_HEADER: ::DWORD = 0x10000005;
-pub const RIDI_PREPARSEDDATA: ::DWORD = 0x20000005;
-pub const RIDI_DEVICENAME: ::DWORD = 0x20000007;
-pub const RIDI_DEVICEINFO: ::DWORD = 0x2000000b;
-STRUCT!{struct RID_DEVICE_INFO_MOUSE {
-    dwId: ::DWORD,
-    dwNumberOfButtons: ::DWORD,
-    dwSampleRate: ::DWORD,
-    fHasHorizontalWheel: ::BOOL,
-}}
-pub type PRID_DEVICE_INFO_MOUSE = *mut RID_DEVICE_INFO_MOUSE;
-STRUCT!{struct RID_DEVICE_INFO_KEYBOARD {
-    dwType: ::DWORD,
-    dwSubType: ::DWORD,
-    dwKeyboardMode: ::DWORD,
-    dwNumberOfFunctionKeys: ::DWORD,
-    dwNumberOfIndicators: ::DWORD,
-    dwNumberOfKeysTotal: ::DWORD,
-}}
-pub type PRID_DEVICE_INFO_KEYBOARD = *mut RID_DEVICE_INFO_KEYBOARD;
-STRUCT!{struct RID_DEVICE_INFO_HID {
-    dwVendorId: ::DWORD,
-    dwProductId: ::DWORD,
-    dwVersionNumber: ::DWORD,
-    usUsagePage: ::USHORT,
-    usUsage: ::USHORT,
-}}
-pub type PRID_DEVICE_INFO_HID = *mut RID_DEVICE_INFO_HID;
-STRUCT!{struct RID_DEVICE_INFO {
-    cbSize: ::DWORD,
-    dwType: ::DWORD,
-    keyboard: RID_DEVICE_INFO_KEYBOARD,
-}}
-UNION!(RID_DEVICE_INFO, keyboard, mouse, mouse_mut, RID_DEVICE_INFO_MOUSE);
-UNION!(RID_DEVICE_INFO, keyboard, keyboard, keyboard_mut, RID_DEVICE_INFO_KEYBOARD);
-UNION!(RID_DEVICE_INFO, keyboard, hid, hid_mut, RID_DEVICE_INFO_HID);
-#[test]
-fn test_RID_DEVICE_INFO() {
-    use std::mem::{size_of, align_of};
-    assert!(size_of::<RID_DEVICE_INFO_KEYBOARD>() >= size_of::<RID_DEVICE_INFO_MOUSE>());
-    assert!(size_of::<RID_DEVICE_INFO_KEYBOARD>() >= size_of::<RID_DEVICE_INFO_KEYBOARD>());
-    assert!(size_of::<RID_DEVICE_INFO_KEYBOARD>() >= size_of::<RID_DEVICE_INFO_HID>());
-    assert!(align_of::<RID_DEVICE_INFO_KEYBOARD>() >= align_of::<RID_DEVICE_INFO_MOUSE>());
-    assert!(align_of::<RID_DEVICE_INFO_KEYBOARD>()
-        >= align_of::<RID_DEVICE_INFO_KEYBOARD>());
-    assert!(align_of::<RID_DEVICE_INFO_KEYBOARD>() >= align_of::<RID_DEVICE_INFO_HID>());
-}
-pub type PRID_DEVICE_INFO = *mut RID_DEVICE_INFO;
-pub type LPRID_DEVICE_INFO = *mut RID_DEVICE_INFO;
-STRUCT!{struct RAWINPUTDEVICE {
-    usUsagePage: ::USHORT,
-    usUsage: ::USHORT,
-    dwFlags: ::DWORD,
-    hwndTarget: ::HWND,
-}}
-pub type PRAWINPUTDEVICE = *mut RAWINPUTDEVICE;
-pub type LPRAWINPUTDEVICE = *mut RAWINPUTDEVICE;
-pub type PCRAWINPUTDEVICE = *const RAWINPUTDEVICE;
-pub const RIDEV_REMOVE: ::DWORD = 0x00000001;
-pub const RIDEV_EXCLUDE: ::DWORD = 0x00000010;
-pub const RIDEV_PAGEONLY: ::DWORD = 0x00000020;
-pub const RIDEV_NOLEGACY: ::DWORD = 0x00000030;
-pub const RIDEV_INPUTSINK: ::DWORD = 0x00000100;
-pub const RIDEV_CAPTUREMOUSE: ::DWORD = 0x00000200;
-pub const RIDEV_NOHOTKEYS: ::DWORD = 0x00000200;
-pub const RIDEV_APPKEYS: ::DWORD = 0x00000400;
-pub const RIDEV_EXINPUTSINK: ::DWORD = 0x00001000;
-pub const RIDEV_DEVNOTIFY: ::DWORD = 0x00002000;
-pub const RIDEV_EXMODEMASK: ::DWORD = 0x000000F0;
-pub const GIDC_ARRIVAL: ::DWORD = 1;
-pub const GIDC_REMOVAL: ::DWORD = 2;
-STRUCT!{struct RAWINPUTDEVICELIST {
-    hDevice: ::HANDLE,
-    dwType: ::DWORD,
-}}
-pub type PRAWINPUTDEVICELIST = *mut RAWINPUTDEVICELIST;
-STRUCT!{struct CHANGEFILTERSTRUCT {
-    cbSize: ::DWORD,
-    ExtStatus: ::DWORD,
-}}
-pub type PCHANGEFILTERSTRUCT = *mut CHANGEFILTERSTRUCT;
-STRUCT!{struct DLGTEMPLATE {
-    style: ::DWORD,
-    dwExtendedStyle: ::DWORD,
-    cdit: ::WORD,
-    x: ::c_short,
-    y: ::c_short,
-    cx: ::c_short,
-    cy: ::c_short,
-}}
-pub type LPDLGTEMPLATEA = *mut DLGTEMPLATE;
-pub type LPDLGTEMPLATEW = *mut DLGTEMPLATE;
-pub type LPCDLGTEMPLATEA = *const DLGTEMPLATE;
-pub type LPCDLGTEMPLATEW = *const DLGTEMPLATE;
-STRUCT!{struct DRAWTEXTPARAMS {
-    cbSize: ::UINT,
-    iTabLength: ::c_int,
-    iLeftMargin: ::c_int,
-    iRightMargin: ::c_int,
-    uiLengthDrawn: ::UINT,
-}}
-pub type LPDRAWTEXTPARAMS = *mut DRAWTEXTPARAMS;
-STRUCT!{struct ACCEL {
-    fVirt: ::BYTE,
-    key: ::WORD,
-    cmd: ::WORD,
-}}
-pub type LPACCEL = *mut ACCEL;
-STRUCT!{struct MENUITEMINFOA {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    fType: ::UINT,
-    fState: ::UINT,
-    wID: ::UINT,
-    hSubMenu: ::HMENU,
-    hbmpChecked: ::HBITMAP,
-    hbmpUnchecked: ::HBITMAP,
-    dwItemData: ::ULONG_PTR,
-    dwTypeData: ::LPSTR,
-    cch: ::UINT,
-    hbmpItem: ::HBITMAP,
-}}
-pub type LPMENUITEMINFOA = *mut MENUITEMINFOA;
-pub type LPCMENUITEMINFOA = *const MENUITEMINFOA;
-STRUCT!{struct MENUITEMINFOW {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    fType: ::UINT,
-    fState: ::UINT,
-    wID: ::UINT,
-    hSubMenu: ::HMENU,
-    hbmpChecked: ::HBITMAP,
-    hbmpUnchecked: ::HBITMAP,
-    dwItemData: ::ULONG_PTR,
-    dwTypeData: ::LPWSTR,
-    cch: ::UINT,
-    hbmpItem: ::HBITMAP,
-}}
-pub type LPMENUITEMINFOW = *mut MENUITEMINFOW;
-pub type LPCMENUITEMINFOW = *const MENUITEMINFOW;
-STRUCT!{nodebug struct MSGBOXPARAMSA {
-    cbSize: ::UINT,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpszText: ::LPCSTR,
-    lpszCaption: ::LPCSTR,
-    dwStyle: ::DWORD,
-    lpszIcon: ::LPCSTR,
-    dwContextHelpId: ::DWORD_PTR,
-    lpfnMsgBoxCallback: ::MSGBOXCALLBACK,
-    dwLanguageId: ::DWORD,
-}}
-pub type PMSGBOXPARAMSA = *mut MSGBOXPARAMSA;
-pub type LPMSGBOXPARAMSA = *mut MSGBOXPARAMSA;
-STRUCT!{nodebug struct MSGBOXPARAMSW {
-    cbSize: ::UINT,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpszText: ::LPCWSTR,
-    lpszCaption: ::LPCWSTR,
-    dwStyle: ::DWORD,
-    lpszIcon: ::LPCWSTR,
-    dwContextHelpId: ::DWORD_PTR,
-    lpfnMsgBoxCallback: ::MSGBOXCALLBACK,
-    dwLanguageId: ::DWORD,
-}}
-pub type PMSGBOXPARAMSW = *mut MSGBOXPARAMSW;
-pub type LPMSGBOXPARAMSW = *mut MSGBOXPARAMSW;
-STRUCT!{struct HELPINFO {
-    cbSize: ::UINT,
-    iContextType: ::c_int,
-    iCtrlId: ::c_int,
-    hItemHandle: ::HANDLE,
-    dwContextId: ::DWORD,
-    MousePos: ::POINT,
-}}
-pub type LPHELPINFO = *mut HELPINFO;
-#[allow(trivial_numeric_casts)]
-pub fn GET_WHEEL_DELTA_WPARAM(wParam: ::WPARAM) -> ::c_short {
-    ::HIWORD(wParam as ::DWORD) as ::c_short
-}
-#[allow(trivial_numeric_casts)]
-pub fn GET_KEYSTATE_WPARAM(wparam: ::WPARAM) -> ::c_int {
-    ::LOWORD(wparam as ::DWORD) as ::c_short as ::c_int
-}
-#[allow(trivial_numeric_casts)]
-pub fn GET_XBUTTON_WPARAM(wparam: ::WPARAM) -> ::c_int {
-    ::HIWORD(wparam as ::DWORD) as ::c_int
-}
-pub const SIF_RANGE: ::UINT = 0x0001;
-pub const SIF_PAGE: ::UINT = 0x0002;
-pub const SIF_POS: ::UINT = 0x0004;
-pub const SIF_DISABLENOSCROLL: ::UINT = 0x0008;
-pub const SIF_TRACKPOS: ::UINT = 0x0010;
-pub const SIF_ALL: ::UINT = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS;
-pub const SW_SCROLLCHILDREN: ::UINT = 0x0001;
-pub const SW_INVALIDATE: ::UINT = 0x0002;
-pub const SW_ERASE: ::UINT = 0x0004;
-pub const SW_SMOOTHSCROLL: ::UINT = 0x0010;
-pub const SB_LINEUP: ::c_int = 0;
-pub const SB_LINELEFT: ::c_int = 0;
-pub const SB_LINEDOWN: ::c_int = 1;
-pub const SB_LINERIGHT: ::c_int = 1;
-pub const SB_PAGEUP: ::c_int = 2;
-pub const SB_PAGELEFT: ::c_int = 2;
-pub const SB_PAGEDOWN: ::c_int = 3;
-pub const SB_PAGERIGHT: ::c_int = 3;
-pub const SB_THUMBPOSITION: ::c_int = 4;
-pub const SB_THUMBTRACK: ::c_int = 5;
-pub const SB_TOP: ::c_int = 6;
-pub const SB_LEFT: ::c_int = 6;
-pub const SB_BOTTOM: ::c_int = 7;
-pub const SB_RIGHT: ::c_int = 7;
-pub const SB_ENDSCROLL: ::c_int = 8;
-pub const LR_DEFAULTCOLOR: ::UINT = 0x00000000;
-pub const LR_MONOCHROME: ::UINT = 0x00000001;
-pub const LR_COLOR: ::UINT = 0x00000002;
-pub const LR_COPYRETURNORG: ::UINT = 0x00000004;
-pub const LR_COPYDELETEORG: ::UINT = 0x00000008;
-pub const LR_LOADFROMFILE: ::UINT = 0x00000010;
-pub const LR_LOADTRANSPARENT: ::UINT = 0x00000020;
-pub const LR_DEFAULTSIZE: ::UINT = 0x00000040;
-pub const LR_VGACOLOR: ::UINT = 0x00000080;
-pub const LR_LOADMAP3DCOLORS: ::UINT = 0x00001000;
-pub const LR_CREATEDIBSECTION: ::UINT = 0x00002000;
-pub const LR_COPYFROMRESOURCE: ::UINT = 0x00004000;
-pub const LR_SHARED: ::UINT = 0x00008000;
-pub const IMAGE_BITMAP: ::UINT = 0;
-pub const IMAGE_ICON: ::UINT = 1;
-pub const IMAGE_CURSOR: ::UINT = 2;
-pub const IMAGE_ENHMETAFILE: ::UINT = 3;
-pub const DT_TOP: ::UINT = 0x00000000;
-pub const DT_LEFT: ::UINT = 0x00000000;
-pub const DT_CENTER: ::UINT = 0x00000001;
-pub const DT_RIGHT: ::UINT = 0x00000002;
-pub const DT_VCENTER: ::UINT = 0x00000004;
-pub const DT_BOTTOM: ::UINT = 0x00000008;
-pub const DT_WORDBREAK: ::UINT = 0x00000010;
-pub const DT_SINGLELINE: ::UINT = 0x00000020;
-pub const DT_EXPANDTABS: ::UINT = 0x00000040;
-pub const DT_TABSTOP: ::UINT = 0x00000080;
-pub const DT_NOCLIP: ::UINT = 0x00000100;
-pub const DT_EXTERNALLEADING: ::UINT = 0x00000200;
-pub const DT_CALCRECT: ::UINT = 0x00000400;
-pub const DT_NOPREFIX: ::UINT = 0x00000800;
-pub const DT_INTERNAL: ::UINT = 0x00001000;
-pub const DT_EDITCONTROL: ::UINT = 0x00002000;
-pub const DT_PATH_ELLIPSIS: ::UINT = 0x00004000;
-pub const DT_END_ELLIPSIS: ::UINT = 0x00008000;
-pub const DT_MODIFYSTRING: ::UINT = 0x00010000;
-pub const DT_RTLREADING: ::UINT = 0x00020000;
-pub const DT_WORD_ELLIPSIS: ::UINT = 0x00040000;
-pub const DT_NOFULLWIDTHCHARBREAK: ::UINT = 0x00080000;
-pub const DT_HIDEPREFIX: ::UINT = 0x00100000;
-pub const DT_PREFIXONLY: ::UINT = 0x00200000;
-STRUCT!{struct KBDLLHOOKSTRUCT {
-    vkCode: ::DWORD,
-    scanCode: ::DWORD,
-    flags: ::DWORD,
-    time: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-}}
-pub type PKBDLLHOOKSTRUCT = *mut KBDLLHOOKSTRUCT;
-pub type LPKBDLLHOOKSTRUCT = *mut KBDLLHOOKSTRUCT;
-STRUCT!{struct MSLLHOOKSTRUCT {
-    pt: ::POINT,
-    mouseData: ::DWORD,
-    flags: ::DWORD,
-    time: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-}}
-pub type PMSLLHOOKSTRUCT = *mut MSLLHOOKSTRUCT;
-pub type LPMSLLHOOKSTRUCT = *mut MSLLHOOKSTRUCT;
-pub const WH_MIN: ::c_int = -1;
-pub const WH_MSGFILTER: ::c_int = -1;
-pub const WH_JOURNALRECORD: ::c_int = 0;
-pub const WH_JOURNALPLAYBACK: ::c_int = 1;
-pub const WH_KEYBOARD: ::c_int = 2;
-pub const WH_GETMESSAGE: ::c_int = 3;
-pub const WH_CALLWNDPROC: ::c_int = 4;
-pub const WH_CBT: ::c_int = 5;
-pub const WH_SYSMSGFILTER: ::c_int = 6;
-pub const WH_MOUSE: ::c_int = 7;
-pub const WH_HARDWARE: ::c_int = 8;
-pub const WH_DEBUG: ::c_int = 9;
-pub const WH_SHELL: ::c_int = 10;
-pub const WH_FOREGROUNDIDLE: ::c_int = 11;
-pub const WH_CALLWNDPROCRET: ::c_int = 12;
-pub const WH_KEYBOARD_LL: ::c_int = 13;
-pub const WH_MOUSE_LL: ::c_int = 14;
-pub const WH_MAX: ::c_int = 14;
-pub const WH_MINHOOK: ::c_int = WH_MIN;
-pub const WH_MAXHOOK: ::c_int = WH_MAX;
-pub const KLF_ACTIVATE: ::UINT = 1;
-pub const KLF_SUBSTITUTE_OK: ::UINT = 2;
-pub const KLF_UNLOADPREVIOUS: ::UINT = 4;
-pub const KLF_REORDER: ::UINT = 8;
-pub const KLF_REPLACELANG: ::UINT = 16;
-pub const KLF_NOTELLSHELL: ::UINT = 128;
-pub const KLF_SETFORPROCESS: ::UINT = 256;
-//RedrawWindow() flags
-pub const RDW_INVALIDATE: ::UINT = 0x0001;
-pub const RDW_INTERNALPAINT: ::UINT = 0x0002;
-pub const RDW_ERASE: ::UINT = 0x0004;
-pub const RDW_VALIDATE: ::UINT = 0x0008;
-pub const RDW_NOINTERNALPAINT: ::UINT = 0x0010;
-pub const RDW_NOERASE: ::UINT = 0x0020;
-pub const RDW_NOCHILDREN: ::UINT = 0x0040;
-pub const RDW_ALLCHILDREN: ::UINT = 0x0080;
-pub const RDW_UPDATENOW: ::UINT = 0x0100;
-pub const RDW_ERASENOW: ::UINT = 0x0200;
-pub const RDW_FRAME: ::UINT = 0x0400;
-pub const RDW_NOFRAME: ::UINT = 0x0800;
-STRUCT!{struct MEASUREITEMSTRUCT {
-    CtlType: ::UINT,
-    CtlID: ::UINT,
-    itemID: ::UINT,
-    itemWidth: ::UINT,
-    itemHeight: ::UINT,
-    itemData: ::ULONG_PTR,
-}}
-pub type LPMEASUREITEMSTRUCT = *mut MEASUREITEMSTRUCT;
-STRUCT!{struct DRAWITEMSTRUCT {
-    CtlType: ::UINT,
-    CtlID: ::UINT,
-    itemID: ::UINT,
-    itemAction: ::UINT,
-    itemState: ::UINT,
-    hwndItem: ::HWND,
-    hDC: ::HDC,
-    rcItem: ::RECT,
-    itemData: ::ULONG_PTR,
-}}
-pub type LPDRAWITEMSTRUCT = *mut DRAWITEMSTRUCT;
-STRUCT!{struct DELETEITEMSTRUCT {
-    CtlType: ::UINT,
-    CtlID: ::UINT,
-    itemID: ::UINT,
-    hwndItem: ::HWND,
-    itemData: ::ULONG_PTR,
-}}
-pub type LPDELETEITEMSTRUCT = *mut DELETEITEMSTRUCT;
-STRUCT!{struct COMPAREITEMSTRUCT {
-    CtlType: ::UINT,
-    CtlID: ::UINT,
-    hwndItem: ::HWND,
-    itemID1: ::UINT,
-    itemData1: ::ULONG_PTR,
-    itemID2: ::UINT,
-    itemData2: ::ULONG_PTR,
-    dwLocaleId: ::DWORD,
-}}
-pub type LPCOMPAREITEMSTRUCT = *mut COMPAREITEMSTRUCT;
-/* Image type */
-pub const DST_COMPLEX: ::UINT = 0x0000;
-pub const DST_TEXT: ::UINT = 0x0001;
-pub const DST_PREFIXTEXT: ::UINT = 0x0002;
-pub const DST_ICON: ::UINT = 0x0003;
-pub const DST_BITMAP: ::UINT = 0x0004;
-pub const DI_MASK: ::UINT = 0x0001;
-pub const DI_IMAGE: ::UINT = 0x0002;
-pub const DI_NORMAL: ::UINT = 0x0003;
-pub const DI_COMPAT: ::UINT = 0x0004;
-pub const DI_DEFAULTSIZE: ::UINT = 0x0008;
-// if WINVER >= 0x0601
-// GetSystemMetrics(SM_DIGITIZER) flag values
-pub const NID_INTEGRATED_TOUCH: ::UINT = 0x00000001;
-pub const NID_EXTERNAL_TOUCH: ::UINT = 0x00000002;
-pub const NID_INTEGRATED_PEN: ::UINT = 0x00000004;
-pub const NID_EXTERNAL_PEN: ::UINT = 0x00000008;
-pub const NID_MULTI_INPUT: ::UINT = 0x00000040;
-pub const NID_READY: ::UINT = 0x00000080;
-// end if WINVER >= 0x0601
-
-// System Menu Command Values
-//
-pub const SC_SIZE: ::WPARAM = 0xF000;
-pub const SC_MOVE: ::WPARAM = 0xF010;
-pub const SC_MINIMIZE: ::WPARAM = 0xF020;
-pub const SC_MAXIMIZE: ::WPARAM = 0xF030;
-pub const SC_NEXTWINDOW: ::WPARAM = 0xF040;
-pub const SC_PREVWINDOW: ::WPARAM = 0xF050;
-pub const SC_CLOSE: ::WPARAM = 0xF060;
-pub const SC_VSCROLL: ::WPARAM = 0xF070;
-pub const SC_HSCROLL: ::WPARAM = 0xF080;
-pub const SC_MOUSEMENU: ::WPARAM = 0xF090;
-pub const SC_KEYMENU: ::WPARAM = 0xF100;
-pub const SC_ARRANGE: ::WPARAM = 0xF110;
-pub const SC_RESTORE: ::WPARAM = 0xF120;
-pub const SC_TASKLIST: ::WPARAM = 0xF130;
-pub const SC_SCREENSAVE: ::WPARAM = 0xF140;
-pub const SC_HOTKEY: ::WPARAM = 0xF150;
-// if WINVER >= 0x0400
-pub const SC_DEFAULT: ::WPARAM = 0xF160;
-pub const SC_MONITORPOWER: ::WPARAM = 0xF170;
-pub const SC_CONTEXTHELP: ::WPARAM = 0xF180;
-pub const SC_SEPARATOR: ::WPARAM = 0xF00F;
-// endif WINVER >= 0x0400
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2def.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2def.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2def.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2def.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,279 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This file contains the core definitions for the Winsock2 specification that can be used by
-//! both user-mode and kernel mode modules.
-pub type ADDRESS_FAMILY = ::USHORT;
-pub const AF_UNSPEC: ::c_int = 0;
-pub const AF_UNIX: ::c_int = 1;
-pub const AF_INET: ::c_int = 2;
-pub const AF_IMPLINK: ::c_int = 3;
-pub const AF_PUP: ::c_int = 4;
-pub const AF_CHAOS: ::c_int = 5;
-pub const AF_NS: ::c_int = 6;
-pub const AF_IPX: ::c_int = AF_NS;
-pub const AF_ISO: ::c_int = 7;
-pub const AF_OSI: ::c_int = AF_ISO;
-pub const AF_ECMA: ::c_int = 8;
-pub const AF_DATAKIT: ::c_int = 9;
-pub const AF_CCITT: ::c_int = 10;
-pub const AF_SNA: ::c_int = 11;
-pub const AF_DECnet: ::c_int = 12;
-pub const AF_DLI: ::c_int = 13;
-pub const AF_LAT: ::c_int = 14;
-pub const AF_HYLINK: ::c_int = 15;
-pub const AF_APPLETALK: ::c_int = 16;
-pub const AF_NETBIOS: ::c_int = 17;
-pub const AF_VOICEVIEW: ::c_int = 18;
-pub const AF_FIREFOX: ::c_int = 19;
-pub const AF_UNKNOWN1: ::c_int = 20;
-pub const AF_BAN: ::c_int = 21;
-pub const AF_ATM: ::c_int = 22;
-pub const AF_INET6: ::c_int = 23;
-pub const AF_CLUSTER: ::c_int = 24;
-pub const AF_12844: ::c_int = 25;
-pub const AF_IRDA: ::c_int = 26;
-pub const AF_NETDES: ::c_int = 28;
-pub const AF_TCNPROCESS: ::c_int = 29;
-pub const AF_TCNMESSAGE: ::c_int = 30;
-pub const AF_ICLFXBM: ::c_int = 31;
-pub const AF_BTH: ::c_int = 32;
-pub const AF_LINK: ::c_int = 33;
-pub const AF_MAX: ::c_int = 34;
-pub const SOCK_STREAM: ::c_int = 1;
-pub const SOCK_DGRAM: ::c_int = 2;
-pub const SOCK_RAW: ::c_int = 3;
-pub const SOCK_RDM: ::c_int = 4;
-pub const SOCK_SEQPACKET: ::c_int = 5;
-pub const SOL_SOCKET: ::c_int = 0xffff;
-pub const SO_DEBUG: ::c_int = 0x0001;
-pub const SO_ACCEPTCONN: ::c_int = 0x0002;
-pub const SO_REUSEADDR: ::c_int = 0x0004;
-pub const SO_KEEPALIVE: ::c_int = 0x0008;
-pub const SO_DONTROUTE: ::c_int = 0x0010;
-pub const SO_BROADCAST: ::c_int = 0x0020;
-pub const SO_USELOOPBACK: ::c_int = 0x0040;
-pub const SO_LINGER: ::c_int = 0x0080;
-pub const SO_OOBINLINE: ::c_int = 0x0100;
-pub const SO_DONTLINGER: ::c_int = !SO_LINGER;
-pub const SO_EXCLUSIVEADDRUSE: ::c_int = !SO_REUSEADDR;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDLOWAT: ::c_int = 0x1003;
-pub const SO_RCVLOWAT: ::c_int = 0x1004;
-pub const SO_SNDTIMEO: ::c_int = 0x1005;
-pub const SO_RCVTIMEO: ::c_int = 0x1006;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_BSP_STATE: ::c_int = 0x1009;
-pub const SO_GROUP_ID: ::c_int = 0x2001;
-pub const SO_GROUP_PRIORITY: ::c_int = 0x2002;
-pub const SO_MAX_MSG_SIZE: ::c_int = 0x2003;
-pub const SO_CONDITIONAL_ACCEPT: ::c_int = 0x3002;
-pub const SO_PAUSE_ACCEPT: ::c_int = 0x3003;
-pub const SO_COMPARTMENT_ID: ::c_int = 0x3004;
-pub const SO_RANDOMIZE_PORT: ::c_int = 0x3005;
-pub const SO_PORT_SCALABILITY: ::c_int = 0x3006;
-pub const WSK_SO_BASE: ::c_int = 0x4000;
-pub const TCP_NODELAY: ::c_int = 0x0001;
-STRUCT!{struct SOCKADDR {
-    sa_family: ADDRESS_FAMILY,
-    sa_data: [::CHAR; 14],
-}}
-pub type PSOCKADDR = *mut SOCKADDR;
-pub type LPSOCKADDR = *mut SOCKADDR;
-STRUCT!{struct SOCKET_ADDRESS {
-    lpSockaddr: LPSOCKADDR,
-    iSockaddrLength: ::INT,
-}}
-pub type PSOCKET_ADDRESS = *mut SOCKET_ADDRESS;
-pub type LPSOCKET_ADDRESS = *mut SOCKET_ADDRESS;
-STRUCT!{nodebug struct SOCKET_ADDRESS_LIST {
-    iAddressCount: ::INT,
-    Address: [SOCKET_ADDRESS; 0],
-}}
-pub type PSOCKET_ADDRESS_LIST = *mut SOCKET_ADDRESS_LIST;
-pub type LPSOCKET_ADDRESS_LIST = *mut SOCKET_ADDRESS_LIST;
-STRUCT!{struct CSADDR_INFO {
-    LocalAddr: SOCKET_ADDRESS,
-    RemoteAddr: SOCKET_ADDRESS,
-    iSocketType: ::INT,
-    iProtocol: ::INT,
-}}
-pub type PCSADDR_INFO = *mut CSADDR_INFO;
-pub type LPCSADDR_INFO = *mut CSADDR_INFO;
-STRUCT!{nodebug struct SOCKADDR_STORAGE_LH {
-    ss_family: ADDRESS_FAMILY,
-    __ss_pad1: [::CHAR; 6],
-    __ss_align: ::__int64,
-    __ss_pad2: [::CHAR; 112],
-}}
-pub type PSOCKADDR_STORAGE_LH = *mut SOCKADDR_STORAGE_LH;
-pub type LPSOCKADDR_STORAGE_LH = *mut SOCKADDR_STORAGE_LH;
-STRUCT!{nodebug struct SOCKADDR_STORAGE_XP {
-    ss_family: ::c_short,
-    __ss_pad1: [::CHAR; 6],
-    __ss_align: ::__int64,
-    __ss_pad2: [::CHAR; 112],
-}}
-pub type PSOCKADDR_STORAGE_XP = *mut SOCKADDR_STORAGE_XP;
-pub type LPSOCKADDR_STORAGE_XP = *mut SOCKADDR_STORAGE_XP;
-pub type SOCKADDR_STORAGE = SOCKADDR_STORAGE_LH;
-pub type PSOCKADDR_STORAGE = *mut SOCKADDR_STORAGE;
-pub type LPSOCKADDR_STORAGE = *mut SOCKADDR_STORAGE;
-STRUCT!{struct SOCKET_PROCESSOR_AFFINITY {
-    Processor: ::PROCESSOR_NUMBER,
-    NumaNodeId: ::USHORT,
-    Reserved: ::USHORT,
-}}
-pub type PSOCKET_PROCESSOR_AFFINITY = *mut SOCKET_PROCESSOR_AFFINITY;
-pub const IOC_UNIX: ::DWORD = 0x00000000;
-pub const IOC_WS2: ::DWORD = 0x08000000;
-pub const IOC_PROTOCOL: ::DWORD = 0x10000000;
-pub const IOC_VENDOR: ::DWORD = 0x18000000;
-pub const IOC_WSK: ::DWORD = IOC_WS2 | 0x07000000;
-macro_rules! _WSAIO { ($x:expr, $y:expr) => { IOC_VOID | $x | $y } }
-macro_rules! _WSAIOR { ($x:expr, $y:expr) => { IOC_OUT | $x | $y } }
-macro_rules! _WSAIOW { ($x:expr, $y:expr) => { IOC_IN | $x | $y } }
-macro_rules! _WSAIORW { ($x:expr, $y:expr) => { IOC_INOUT | $x | $y } }
-pub const SIO_ASSOCIATE_HANDLE: ::DWORD = _WSAIOW!(IOC_WS2, 1);
-pub const SIO_ENABLE_CIRCULAR_QUEUEING: ::DWORD = _WSAIO!(IOC_WS2, 2);
-pub const SIO_FIND_ROUTE: ::DWORD = _WSAIOR!(IOC_WS2, 3);
-pub const SIO_FLUSH: ::DWORD = _WSAIO!(IOC_WS2, 4);
-pub const SIO_GET_BROADCAST_ADDRESS: ::DWORD = _WSAIOR!(IOC_WS2, 5);
-pub const SIO_GET_EXTENSION_FUNCTION_POINTER: ::DWORD = _WSAIORW!(IOC_WS2, 6);
-pub const SIO_GET_QOS: ::DWORD = _WSAIORW!(IOC_WS2, 7);
-pub const SIO_GET_GROUP_QOS: ::DWORD = _WSAIORW!(IOC_WS2, 8);
-pub const SIO_MULTIPOINT_LOOPBACK: ::DWORD = _WSAIOW!(IOC_WS2, 9);
-pub const SIO_MULTICAST_SCOPE: ::DWORD = _WSAIOW!(IOC_WS2, 10);
-pub const SIO_SET_QOS: ::DWORD = _WSAIOW!(IOC_WS2, 11);
-pub const SIO_SET_GROUP_QOS: ::DWORD = _WSAIOW!(IOC_WS2, 12);
-pub const SIO_TRANSLATE_HANDLE: ::DWORD = _WSAIORW!(IOC_WS2, 13);
-pub const SIO_ROUTING_INTERFACE_QUERY: ::DWORD = _WSAIORW!(IOC_WS2, 20);
-pub const SIO_ROUTING_INTERFACE_CHANGE: ::DWORD = _WSAIOW!(IOC_WS2, 21);
-pub const SIO_ADDRESS_LIST_QUERY: ::DWORD = _WSAIOR!(IOC_WS2, 22);
-pub const SIO_ADDRESS_LIST_CHANGE: ::DWORD = _WSAIO!(IOC_WS2, 23);
-pub const SIO_QUERY_TARGET_PNP_HANDLE: ::DWORD = _WSAIOR!(IOC_WS2, 24);
-pub const SIO_QUERY_RSS_PROCESSOR_INFO: ::DWORD = _WSAIOR!(IOC_WS2, 37);
-pub const SIO_ADDRESS_LIST_SORT: ::DWORD = _WSAIORW!(IOC_WS2, 25);
-pub const SIO_RESERVED_1: ::DWORD = _WSAIOW!(IOC_WS2, 26);
-pub const SIO_RESERVED_2: ::DWORD = _WSAIOW!(IOC_WS2, 33);
-pub const SIO_GET_MULTIPLE_EXTENSION_FUNCTION_POINTER: ::DWORD = _WSAIORW!(IOC_WS2, 36);
-pub const IPPROTO_IP: ::c_int = 0;
-ENUM!{enum IPPROTO {
-    IPPROTO_HOPOPTS = 0,  // IPv6 Hop-by-Hop options
-    IPPROTO_ICMP = 1,
-    IPPROTO_IGMP = 2,
-    IPPROTO_GGP = 3,
-    IPPROTO_IPV4 = 4,
-    IPPROTO_ST = 5,
-    IPPROTO_TCP = 6,
-    IPPROTO_CBT = 7,
-    IPPROTO_EGP = 8,
-    IPPROTO_IGP = 9,
-    IPPROTO_PUP = 12,
-    IPPROTO_UDP = 17,
-    IPPROTO_IDP = 22,
-    IPPROTO_RDP = 27,
-    IPPROTO_IPV6 = 41, // IPv6 header
-    IPPROTO_ROUTING = 43, // IPv6 Routing header
-    IPPROTO_FRAGMENT = 44, // IPv6 fragmentation header
-    IPPROTO_ESP = 50, // encapsulating security payload
-    IPPROTO_AH = 51, // authentication header
-    IPPROTO_ICMPV6 = 58, // ICMPv6
-    IPPROTO_NONE = 59, // IPv6 no next header
-    IPPROTO_DSTOPTS = 60, // IPv6 Destination options
-    IPPROTO_ND = 77,
-    IPPROTO_ICLFXBM = 78,
-    IPPROTO_PIM = 103,
-    IPPROTO_PGM = 113,
-    IPPROTO_L2TP = 115,
-    IPPROTO_SCTP = 132,
-    IPPROTO_RAW = 255,
-    IPPROTO_MAX = 256,
-    IPPROTO_RESERVED_RAW  = 257,
-    IPPROTO_RESERVED_IPSEC = 258,
-    IPPROTO_RESERVED_IPSECOFFLOAD = 259,
-    IPPROTO_RESERVED_WNV = 260,
-    IPPROTO_RESERVED_MAX = 261,
-}}
-pub type PIPPROTO = *mut IPPROTO;
-STRUCT!{struct SOCKADDR_IN {
-    sin_family: ADDRESS_FAMILY,
-    sin_port: ::USHORT,
-    sin_addr: ::IN_ADDR,
-    sin_zero: [::CHAR; 8],
-}}
-pub type PSOCKADDR_IN = *mut SOCKADDR_IN;
-//645
-pub const IOCPARM_MASK: ::DWORD = 0x7f;
-pub const IOC_VOID: ::DWORD = 0x20000000;
-pub const IOC_OUT: ::DWORD = 0x40000000;
-pub const IOC_IN: ::DWORD = 0x80000000;
-pub const IOC_INOUT: ::DWORD = IOC_IN | IOC_OUT;
-STRUCT!{struct WSABUF {
-    len: ::ULONG,
-    buf: *mut ::CHAR,
-}}
-pub type LPWSABUF = *mut WSABUF;
-STRUCT!{struct WSAMSG {
-    name: LPSOCKADDR,
-    namelen: ::INT,
-    lpBuffers: LPWSABUF,
-    dwBufferCount: ::ULONG,
-    Control: WSABUF,
-    dwFlags: ::ULONG,
-}}
-pub type PWSAMSG = *mut WSAMSG;
-pub type LPWSAMSG = *mut WSAMSG;
-STRUCT!{struct ADDRINFOA {
-    ai_flags: ::c_int,
-    ai_family: ::c_int,
-    ai_socktype: ::c_int,
-    ai_protocol: ::c_int,
-    ai_addrlen: ::size_t,
-    ai_canonname: *mut ::c_char,
-    ai_addr: *mut SOCKADDR,
-    ai_next: *mut ADDRINFOA,
-}}
-pub type PADDRINFOA = *mut ADDRINFOA;
-STRUCT!{struct ADDRINFOW {
-    ai_flags: ::c_int,
-    ai_family: ::c_int,
-    ai_socktype: ::c_int,
-    ai_protocol: ::c_int,
-    ai_addrlen: ::size_t,
-    ai_canonname: ::PWSTR,
-    ai_addr: *mut SOCKADDR,
-    ai_next: *mut ADDRINFOW,
-}}
-pub type PADDRINFOW = *mut ADDRINFOW;
-STRUCT!{struct ADDRINFOEXA {
-    ai_flags: ::c_int,
-    ai_family: ::c_int,
-    ai_socktype: ::c_int,
-    ai_protocol: ::c_int,
-    ai_addrlen: ::size_t,
-    ai_canonname: *mut ::c_char,
-    ai_addr: *mut SOCKADDR,
-    ai_blob: *mut ::c_void,
-    ai_bloblen: ::size_t,
-    ai_provider: ::LPGUID,
-    ai_next: *mut ADDRINFOEXW,
-}}
-pub type PADDRINFOEXA = *mut ADDRINFOEXA;
-pub type LPADDRINFOEXA = *mut ADDRINFOEXA;
-STRUCT!{struct ADDRINFOEXW {
-    ai_flags: ::c_int,
-    ai_family: ::c_int,
-    ai_socktype: ::c_int,
-    ai_protocol: ::c_int,
-    ai_addrlen: ::size_t,
-    ai_canonname: ::PWSTR,
-    ai_addr: *mut SOCKADDR,
-    ai_blob: *mut ::c_void,
-    ai_bloblen: ::size_t,
-    ai_provider: ::LPGUID,
-    ai_next: *mut ADDRINFOEXW,
-}}
-pub type PADDRINFOEXW = *mut ADDRINFOEXW;
-pub type LPADDRINFOEXW = *mut ADDRINFOEXW;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2ipdef.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2ipdef.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2ipdef.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2ipdef.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub const IPV6_HOPOPTS: ::c_int = 1;
-pub const IPV6_HDRINCL: ::c_int = 2;
-pub const IPV6_UNICAST_HOPS: ::c_int = 4;
-pub const IPV6_MULTICAST_IF: ::c_int = 9;
-pub const IPV6_MULTICAST_HOPS: ::c_int = 10;
-pub const IPV6_MULTICAST_LOOP: ::c_int = 11;
-pub const IPV6_ADD_MEMBERSHIP: ::c_int = 12;
-pub const IPV6_JOIN_GROUP: ::c_int = IPV6_ADD_MEMBERSHIP;
-pub const IPV6_DROP_MEMBERSHIP: ::c_int = 13;
-pub const IPV6_LEAVE_GROUP: ::c_int = IPV6_DROP_MEMBERSHIP;
-pub const IPV6_DONTFRAG: ::c_int = 14;
-pub const IPV6_PKTINFO: ::c_int = 19;
-pub const IPV6_HOPLIMIT: ::c_int = 21;
-pub const IPV6_PROTECTION_LEVEL: ::c_int = 23;
-pub const IPV6_RECVIF: ::c_int = 24;
-pub const IPV6_RECVDSTADDR: ::c_int = 25;
-pub const IPV6_CHECKSUM: ::c_int = 26;
-pub const IPV6_V6ONLY: ::c_int = 27;
-pub const IPV6_IFLIST: ::c_int = 28;
-pub const IPV6_ADD_IFLIST: ::c_int = 29;
-pub const IPV6_DEL_IFLIST: ::c_int = 30;
-pub const IPV6_UNICAST_IF: ::c_int = 31;
-pub const IPV6_RTHDR: ::c_int = 32;
-pub const IPV6_RECVRTHDR: ::c_int = 38;
-pub const IPV6_TCLASS: ::c_int = 39;
-pub const IPV6_RECVTCLASS: ::c_int = 40;
-STRUCT!{struct ipv6_mreq {
-    ipv6mr_multiaddr: in6_addr,
-    ipv6mr_interface: ::c_uint,
-}}
-STRUCT!{struct in6_addr {
-    s6_addr: [u8; 16],
-}}
-STRUCT!{struct sockaddr_in6 {
-    sin6_family: ::c_short,
-    sin6_port: ::c_ushort,
-    sin6_flowinfo: ::c_ulong,
-    sin6_addr: in6_addr,
-    sin6_scope_id: ::c_ulong,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2spi.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2spi.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2spi.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2spi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Definitions to be used with the WinSock service provider
-pub const WSPDESCRIPTION_LEN: usize = 255;
-STRUCT!{nodebug struct WSPDATA {
-    wVersion: ::WORD,
-    wHighVersion: ::WORD,
-    szDescription: [::WCHAR; WSPDESCRIPTION_LEN + 1],
-}}
-pub type LPWSPDATA = *mut WSPDATA;
-STRUCT!{struct WSATHREADID {
-    ThreadHandle: ::HANDLE,
-    Reserved: ::DWORD_PTR,
-}}
-pub type LPWSATHREADID = *mut WSATHREADID;
-pub type LPNSPV2STARTUP = Option<unsafe extern "system" fn(
-    lpProviderId: ::LPGUID, ppvClientSessionArg: *mut ::LPVOID,
-) -> ::INT>;
-pub type LPNSPV2CLEANUP = Option<unsafe extern "system" fn(
-    lpProviderId: ::LPGUID, pvClientSessionArg: ::LPVOID,
-) -> ::INT>;
-pub type LPNSPV2LOOKUPSERVICEBEGIN = Option<unsafe extern "system" fn(
-    lpProviderId: ::LPGUID, lpqsRestrictions: ::LPWSAQUERYSET2W, dwControlFlags: ::DWORD,
-    lpvClientSessionArg: ::LPVOID, lphLookup: ::LPHANDLE,
-) -> ::INT>;
-pub type LPNSPV2LOOKUPSERVICENEXTEX = Option<unsafe extern "system" fn(
-    hAsyncCall: ::HANDLE, hLookup: ::HANDLE, dwControlFlags: ::DWORD, lpdwBufferLength: ::LPDWORD,
-    lpqsResults: ::LPWSAQUERYSET2W
-)>;
-pub type LPNSPV2LOOKUPSERVICEEND = Option<unsafe extern "system" fn(hLookup: ::HANDLE) -> ::INT>;
-pub type LPNSPV2SETSERVICEEX = Option<unsafe extern "system" fn(
-    hAsyncCall: ::HANDLE, lpProviderId: ::LPGUID, lpqsRegInfo: ::LPWSAQUERYSET2W,
-    essOperation: ::WSAESETSERVICEOP, dwControlFlags: ::DWORD, lpvClientSessionArg: ::LPVOID,
-)>;
-pub type LPNSPV2CLIENTSESSIONRUNDOWN = Option<unsafe extern "system" fn(
-    lpProviderId: ::LPGUID, pvClientSessionArg: ::LPVOID,
-)>;
-STRUCT!{nodebug struct NSPV2_ROUTINE {
-    cbSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    NSPv2Startup: LPNSPV2STARTUP,
-    NSPv2Cleanup: LPNSPV2CLEANUP,
-    NSPv2LookupServiceBegin: LPNSPV2LOOKUPSERVICEBEGIN,
-    NSPv2LookupServiceNextEx: LPNSPV2LOOKUPSERVICENEXTEX,
-    NSPv2LookupServiceEnd: LPNSPV2LOOKUPSERVICEEND,
-    NSPv2SetServiceEx: LPNSPV2SETSERVICEEX,
-    NSPv2ClientSessionRundown: LPNSPV2CLIENTSESSIONRUNDOWN,
-}}
-pub type PNSPV2_ROUTINE = *mut NSPV2_ROUTINE;
-pub type LPNSPV2_ROUTINE = *mut NSPV2_ROUTINE;
-pub type PCNSPV2_ROUTINE = *const NSPV2_ROUTINE;
-pub type LPCNSPV2_ROUTINE = *const NSPV2_ROUTINE;
-ENUM!{enum WSC_PROVIDER_INFO_TYPE {
-    ProviderInfoLspCategories,
-    ProviderInfoAudit,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2tcpip.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2tcpip.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2tcpip.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/ws2tcpip.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! WinSock2 Extension for TCP/IP protocols
-pub type LPLOOKUPSERVICE_COMPLETION_ROUTINE = Option<unsafe extern "system" fn(
-    dwError: ::DWORD, dwBytes: ::DWORD, lpOverlapped: ::LPWSAOVERLAPPED,
-)>;
-pub type socklen_t = ::c_int;
-STRUCT!{struct ip_mreq {
-    imr_multiaddr: ::in_addr,
-    imr_interface: ::in_addr,
-}}
-pub const IP_OPTIONS: ::c_int = 1;
-pub const IP_HDRINCL: ::c_int = 2;
-pub const IP_TOS: ::c_int = 3;
-pub const IP_TTL: ::c_int = 4;
-pub const IP_MULTICAST_IF: ::c_int = 9;
-pub const IP_MULTICAST_TTL: ::c_int = 10;
-pub const IP_MULTICAST_LOOP: ::c_int = 11;
-pub const IP_ADD_MEMBERSHIP: ::c_int = 12;
-pub const IP_DROP_MEMBERSHIP: ::c_int = 13;
-pub const IP_DONTFRAGMENT: ::c_int = 14;
-pub const IP_ADD_SOURCE_MEMBERSHIP: ::c_int = 15;
-pub const IP_DROP_SOURCE_MEMBERSHIP: ::c_int = 16;
-pub const IP_BLOCK_SOURCE: ::c_int = 17;
-pub const IP_UNBLOCK_SOURCE: ::c_int = 18;
-pub const IP_PKTINFO: ::c_int = 19;
-pub const IP_RECEIVE_BROADCAST: ::c_int = 22;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wtypesbase.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wtypesbase.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wtypesbase.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wtypesbase.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//114
-pub type OLECHAR = ::WCHAR;
-pub type LPOLESTR = *mut OLECHAR;
-pub type LPCOLESTR = *const OLECHAR;
-//147
-pub type DOUBLE = ::c_double;
-//281
-pub type SCODE = ::LONG;
-pub type PSCODE = *mut SCODE;
-STRUCT!{struct BLOB {
-    cbSize: ::ULONG,
-    pBlobData: *mut ::BYTE,
-}}
-pub type LPBLOB = *mut BLOB;
-STRUCT!{struct FLAGGED_WORD_BLOB {
-    fFlags: ::ULONG,
-    clSize: ::ULONG,
-    asData: [::c_ushort; 1],
-}}
-STRUCT!{struct BYTE_SIZEDARR {
-    clSize: ::ULONG,
-    pData: *mut ::BYTE,
-}}
-STRUCT!{struct WORD_SIZEDARR {
-    clSize: ::ULONG,
-    pData: *mut ::c_ushort,
-}}
-STRUCT!{struct DWORD_SIZEDARR {
-    clSize: ::ULONG,
-    pData: *mut ::ULONG,
-}}
-STRUCT!{struct HYPER_SIZEDARR {
-    clSize: ::ULONG,
-    pData: *mut i64,
-}}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wtypes.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wtypes.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/wtypes.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/wtypes.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of wstypes.h
-ENUM!{enum VARENUM {
-    VT_EMPTY = 0,
-    VT_NULL = 1,
-    VT_I2 = 2,
-    VT_I4 = 3,
-    VT_R4 = 4,
-    VT_R8 = 5,
-    VT_CY = 6,
-    VT_DATE = 7,
-    VT_BSTR = 8,
-    VT_DISPATCH = 9,
-    VT_ERROR = 10,
-    VT_BOOL = 11,
-    VT_VARIANT = 12,
-    VT_UNKNOWN = 13,
-    VT_DECIMAL = 14,
-    VT_I1 = 16,
-    VT_UI1 = 17,
-    VT_UI2 = 18,
-    VT_UI4 = 19,
-    VT_I8 = 20,
-    VT_UI8 = 21,
-    VT_INT = 22,
-    VT_UINT = 23,
-    VT_VOID = 24,
-    VT_HRESULT = 25,
-    VT_PTR = 26,
-    VT_SAFEARRAY = 27,
-    VT_CARRAY = 28,
-    VT_USERDEFINED = 29,
-    VT_LPSTR = 30,
-    VT_LPWSTR = 31,
-    VT_RECORD = 36,
-    VT_INT_PTR = 37,
-    VT_UINT_PTR = 38,
-    VT_FILETIME = 64,
-    VT_BLOB = 65,
-    VT_STREAM = 66,
-    VT_STORAGE = 67,
-    VT_STREAMED_OBJECT = 68,
-    VT_STORED_OBJECT = 69,
-    VT_BLOB_OBJECT = 70,
-    VT_CF = 71,
-    VT_CLSID = 72,
-    VT_VERSIONED_STREAM = 73,
-    VT_BSTR_BLOB = 0xfff,
-    VT_VECTOR = 0x1000,
-    VT_ARRAY = 0x2000,
-    VT_BYREF = 0x4000,
-    VT_RESERVED = 0x8000,
-    VT_ILLEGAL = 0xffff,
-}}
-pub const VT_ILLEGALMASKED: VARENUM = VT_BSTR_BLOB;
-pub const VT_TYPEMASK: VARENUM = VT_BSTR_BLOB;
-pub type DATE = ::c_double;
-STRUCT!{struct CY {
-    int64: ::LONGLONG,
-}}
-STRUCT!{struct DECIMAL {
-    wReserved: ::USHORT,
-    scale: ::BYTE,
-    sign: ::BYTE,
-    Hi32: ::ULONG,
-    Lo64: ::ULONGLONG,
-}}
-pub const DECIMAL_NEG: ::BYTE = 0x80;
-pub type LPDECIMAL = *mut DECIMAL;
-pub type VARTYPE = ::c_ushort;
-pub type wireBSTR = *mut ::FLAGGED_WORD_BLOB;
-pub type BSTR = *mut ::OLECHAR;
-pub type LPBSTR = *mut BSTR;
-pub type VARIANT_BOOL = ::c_short;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/xinput.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/xinput.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-0.2.8/src/xinput.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-0.2.8/src/xinput.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! XInput procedure declarations, constant definitions and macros
-pub const XINPUT_DEVTYPE_GAMEPAD: ::BYTE = 0x01;
-pub const XINPUT_DEVSUBTYPE_GAMEPAD: ::BYTE = 0x01;
-pub const XINPUT_DEVSUBTYPE_WHEEL: ::BYTE = 0x02;
-pub const XINPUT_DEVSUBTYPE_ARCADE_STICK: ::BYTE = 0x03;
-pub const XINPUT_DEVSUBTYPE_FLIGHT_SICK: ::BYTE = 0x04;
-pub const XINPUT_DEVSUBTYPE_DANCE_PAD: ::BYTE = 0x05;
-pub const XINPUT_DEVSUBTYPE_GUITAR: ::BYTE = 0x06;
-pub const XINPUT_DEVSUBTYPE_DRUM_KIT: ::BYTE = 0x08;
-pub const XINPUT_CAPS_VOICE_SUPPORTED: ::WORD = 0x0004;
-pub const XINPUT_GAMEPAD_DPAD_UP: ::WORD = 0x0001;
-pub const XINPUT_GAMEPAD_DPAD_DOWN: ::WORD = 0x0002;
-pub const XINPUT_GAMEPAD_DPAD_LEFT: ::WORD = 0x0004;
-pub const XINPUT_GAMEPAD_DPAD_RIGHT: ::WORD = 0x0008;
-pub const XINPUT_GAMEPAD_START: ::WORD = 0x0010;
-pub const XINPUT_GAMEPAD_BACK: ::WORD = 0x0020;
-pub const XINPUT_GAMEPAD_LEFT_THUMB: ::WORD = 0x0040;
-pub const XINPUT_GAMEPAD_RIGHT_THUMB: ::WORD = 0x0080;
-pub const XINPUT_GAMEPAD_LEFT_SHOULDER: ::WORD = 0x0100;
-pub const XINPUT_GAMEPAD_RIGHT_SHOULDER: ::WORD = 0x0200;
-pub const XINPUT_GAMEPAD_A: ::WORD = 0x1000;
-pub const XINPUT_GAMEPAD_B: ::WORD = 0x2000;
-pub const XINPUT_GAMEPAD_X: ::WORD = 0x4000;
-pub const XINPUT_GAMEPAD_Y: ::WORD = 0x8000;
-pub const XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE: ::SHORT = 7849;
-pub const XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE: ::SHORT = 8689;
-pub const XINPUT_GAMEPAD_TRIGGER_THRESHOLD: ::BYTE = 30;
-pub const XINPUT_FLAG_GAMEPAD: ::DWORD = 0x00000001;
-pub const BATTERY_DEVTYPE_GAMEPAD: ::BYTE = 0x00;
-pub const BATTERY_DEVTYPE_HEADSET: ::BYTE = 0x01;
-pub const BATTERY_TYPE_DISCONNECTED: ::BYTE = 0x00;
-pub const BATTERY_TYPE_WIRED: ::BYTE = 0x01;
-pub const BATTERY_TYPE_ALKALINE: ::BYTE = 0x02;
-pub const BATTERY_TYPE_NIMH: ::BYTE = 0x03;
-pub const BATTERY_TYPE_UNKNOWN: ::BYTE = 0xFF;
-pub const BATTERY_LEVEL_EMPTY: ::BYTE = 0x00;
-pub const BATTERY_LEVEL_LOW: ::BYTE = 0x01;
-pub const BATTERY_LEVEL_MEDIUM: ::BYTE = 0x02;
-pub const BATTERY_LEVEL_FULL: ::BYTE = 0x03;
-pub const XUSER_MAX_COUNT: ::DWORD = 4;
-pub const XUSER_INDEX_ANY: ::DWORD = 0x000000FF;
-pub const VK_PAD_A: ::WORD = 0x5800;
-pub const VK_PAD_B: ::WORD = 0x5801;
-pub const VK_PAD_X: ::WORD = 0x5802;
-pub const VK_PAD_Y: ::WORD = 0x5803;
-pub const VK_PAD_RSHOULDER: ::WORD = 0x5804;
-pub const VK_PAD_LSHOULDER: ::WORD = 0x5805;
-pub const VK_PAD_LTRIGGER: ::WORD = 0x5806;
-pub const VK_PAD_RTRIGGER: ::WORD = 0x5807;
-pub const VK_PAD_DPAD_UP: ::WORD = 0x5810;
-pub const VK_PAD_DPAD_DOWN: ::WORD = 0x5811;
-pub const VK_PAD_DPAD_LEFT: ::WORD = 0x5812;
-pub const VK_PAD_DPAD_RIGHT: ::WORD = 0x5813;
-pub const VK_PAD_START: ::WORD = 0x5814;
-pub const VK_PAD_BACK: ::WORD = 0x5815;
-pub const VK_PAD_LTHUMB_PRESS: ::WORD = 0x5816;
-pub const VK_PAD_RTHUMB_PRESS: ::WORD = 0x5817;
-pub const VK_PAD_LTHUMB_UP: ::WORD = 0x5820;
-pub const VK_PAD_LTHUMB_DOWN: ::WORD = 0x5821;
-pub const VK_PAD_LTHUMB_RIGHT: ::WORD = 0x5822;
-pub const VK_PAD_LTHUMB_LEFT: ::WORD = 0x5823;
-pub const VK_PAD_LTHUMB_UPLEFT: ::WORD = 0x5824;
-pub const VK_PAD_LTHUMB_UPRIGHT: ::WORD = 0x5825;
-pub const VK_PAD_LTHUMB_DOWNRIGHT: ::WORD = 0x5826;
-pub const VK_PAD_LTHUMB_DOWNLEFT: ::WORD = 0x5827;
-pub const VK_PAD_RTHUMB_UP: ::WORD = 0x5830;
-pub const VK_PAD_RTHUMB_DOWN: ::WORD = 0x5831;
-pub const VK_PAD_RTHUMB_RIGHT: ::WORD = 0x5832;
-pub const VK_PAD_RTHUMB_LEFT: ::WORD = 0x5833;
-pub const VK_PAD_RTHUMB_UPLEFT: ::WORD = 0x5834;
-pub const VK_PAD_RTHUMB_UPRIGHT: ::WORD = 0x5835;
-pub const VK_PAD_RTHUMB_DOWNRIGHT: ::WORD = 0x5836;
-pub const VK_PAD_RTHUMB_DOWNLEFT: ::WORD = 0x5837;
-pub const XINPUT_KEYSTROKE_KEYDOWN: ::WORD = 0x0001;
-pub const XINPUT_KEYSTROKE_KEYUP: ::WORD = 0x0002;
-pub const XINPUT_KEYSTROKE_REPEAT: ::WORD = 0x0004;
-STRUCT!{struct XINPUT_GAMEPAD {
-    wButtons: ::WORD,
-    bLeftTrigger: ::BYTE,
-    bRightTrigger: ::BYTE,
-    sThumbLX: ::SHORT,
-    sThumbLY: ::SHORT,
-    sThumbRX: ::SHORT,
-    sThumbRY: ::SHORT,
-}}
-pub type PXINPUT_GAMEPAD = *mut XINPUT_GAMEPAD;
-STRUCT!{struct XINPUT_STATE {
-    dwPacketNumber: ::DWORD,
-    Gamepad: ::XINPUT_GAMEPAD,
-}}
-pub type PXINPUT_STATE = *mut XINPUT_STATE;
-STRUCT!{struct XINPUT_VIBRATION {
-    wLeftMotorSpeed: ::WORD,
-    wRightMotorSpeed: ::WORD,
-}}
-pub type PXINPUT_VIBRATION = *mut XINPUT_VIBRATION;
-STRUCT!{struct XINPUT_CAPABILITIES {
-    Type: ::BYTE,
-    SubType: ::BYTE,
-    Flags: ::WORD,
-    Gamepad: ::XINPUT_GAMEPAD,
-    Vibration: ::XINPUT_VIBRATION,
-}}
-pub type PXINPUT_CAPABILITIES = *mut XINPUT_CAPABILITIES;
-STRUCT!{struct XINPUT_BATTERY_INFORMATION {
-    BatteryType: ::BYTE,
-    BatteryLevel: ::BYTE,
-}}
-pub type PXINPUT_BATTERY_INFORMATION = *mut XINPUT_BATTERY_INFORMATION;
-STRUCT!{struct XINPUT_KEYSTROKE {
-    VirtualKey: ::WORD,
-    Unicode: ::WCHAR,
-    UserIndex: ::BYTE,
-    HidCode: ::BYTE,
-}}
-pub type PXINPUT_KEYSTROKE = *mut XINPUT_KEYSTROKE;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-build/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-build/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-build/.cargo-checksum.json	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-build/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"982633c62ba05c95429b1768896a54c9a032a40fbd1e11049a9b087e9fd89176","src/lib.rs":"1d88932534b784973d3d87ac18cd8f2a0294ce5166cf30488c68ca90443e1750"},"package":"2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-build/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-build/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-build/Cargo.toml	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-build/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-[package]
-name = "winapi-build"
-version = "0.1.1"
-authors = ["Peter Atashian <retep998@gmail.com>"]
-description = "Common code for build.rs in WinAPI -sys crates."
-repository = "https://github.com/retep998/winapi-rs"
-keywords = ["Windows", "FFI", "WinSDK"]
-license = "MIT"
-
-[lib]
-name = "build"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-build/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-build/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/winapi-build/src/lib.rs	2021-11-19 11:57:12.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/winapi-build/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub fn link(name: &str, bundled: bool) {
-    use std::env::var;
-    let target = var("TARGET").unwrap();
-    let target: Vec<_> = target.split('-').collect();
-    if target.get(2) == Some(&"windows") {
-        println!("cargo:rustc-link-lib=dylib={}", name);
-        if bundled && target.get(3) == Some(&"gnu") {
-            let dir = var("CARGO_MANIFEST_DIR").unwrap();
-            println!("cargo:rustc-link-search=native={}/{}", dir, target[0]);
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/build.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/build.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/build.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-extern crate build;
-fn main() {
-    build::link("ws2_32", false)
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/.cargo-checksum.json	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"b5c32ebeb474fcf68bd5d6f296f12163d1627dca02dbe06341ee3d378535cdaa","README.md":"ad92627d07dcd015a10440590041e72723b1e5a3ca86f50d6d059e7e4e78433f","build.rs":"84b7d5871797983a021d1ae8cd9698687b7d2bddd4622e82b30c693218400f09","src/lib.rs":"71b9f929fe5227d63326e71ed2f49a96adb560318b8862d55927aac2d247e82d"},"package":"d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/Cargo.toml	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-[package]
-name = "ws2_32-sys"
-version = "0.2.1"
-authors = ["Peter Atashian <retep998@gmail.com>"]
-description = "Contains function definitions for the Windows API library ws2_32. See winapi for types and constants."
-documentation = "https://retep998.github.io/doc/ws2_32/"
-repository = "https://github.com/retep998/winapi-rs"
-readme = "README.md"
-keywords = ["windows", "ffi", "win32"]
-license = "MIT"
-build = "build.rs"
-[lib]
-name = "ws2_32"
-[dependencies]
-winapi = { version = "0.2.5", path = "../.." }
-[build-dependencies]
-winapi-build = { version = "0.1.1", path = "../../build" }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/README.md	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-# ws2_32 #
-Contains function definitions for the Windows API library ws2_32. See winapi for types and constants.
-
-```toml
-[dependencies]
-ws2_32-sys = "0.2.0"
-```
-
-```rust
-extern crate ws2_32;
-```
-
-[Documentation](https://retep998.github.io/doc/ws2_32/)
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/ws2_32-sys/src/lib.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/ws2_32-sys/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,483 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! FFI bindings to ws2_32.
-#![cfg(windows)]
-extern crate winapi;
-use winapi::*;
-extern "system" {
-    pub fn FreeAddrInfoEx(pAddrInfoEx: PADDRINFOEXA);
-    pub fn FreeAddrInfoExW(pAddrInfoEx: PADDRINFOEXW);
-    pub fn FreeAddrInfoW(pAddrInfo: PADDRINFOW);
-    pub fn GetAddrInfoExA(
-        pName: PCSTR, pServiceName: PCSTR, dwNameSpace: DWORD, lpNspId: LPGUID,
-        hints: *const ADDRINFOEXA, ppResult: *mut PADDRINFOEXA, timeout: *mut timeval,
-        lpOverlapped: LPOVERLAPPED, lpCompletionRoutine: LPLOOKUPSERVICE_COMPLETION_ROUTINE,
-        lpNameHandle: LPHANDLE,
-    ) -> INT;
-    pub fn GetAddrInfoExCancel(lpHandle: LPHANDLE) -> INT;
-    pub fn GetAddrInfoExOverlappedResult(lpOverlapped: LPOVERLAPPED) -> INT;
-    pub fn GetAddrInfoExW(
-        pName: PCWSTR, pServiceName: PCWSTR, dwNameSpace: DWORD, lpNspId: LPGUID,
-        hints: *const ADDRINFOEXW, ppResult: *mut PADDRINFOEXW, timeout: *mut timeval,
-        lpOverlapped: LPOVERLAPPED, lpCompletionRoutine: LPLOOKUPSERVICE_COMPLETION_ROUTINE,
-        lpNameHandle: LPHANDLE,
-    ) -> INT;
-    pub fn GetAddrInfoW(
-        pNodeName: PCWSTR, pServiceName: PCWSTR, pHints: *const ADDRINFOW,
-        ppResult: *mut PADDRINFOW,
-    ) -> INT;
-    pub fn GetHostNameW(name: PWSTR, namelen: c_int) -> c_int;
-    pub fn GetNameInfoW(
-        pSockaddr: *const SOCKADDR, SockaddrLength: socklen_t, pNodeBuffer: PWCHAR,
-        NodeBufferSize: DWORD, pServiceBuffer: PWCHAR, ServiceBufferSize: DWORD, Flags: INT,
-    ) -> INT;
-    pub fn InetNtopW(Family: INT, pAddr: PVOID, pStringBuf: PWSTR, StringBufSize: size_t) -> PCWSTR;
-    pub fn InetPtonW(Family: INT, pszAddrString: PCWSTR, pAddrBuf: PVOID) -> INT;
-    pub fn SetAddrInfoExA(
-        pName: PCSTR, pServiceName: PCSTR, pAddresses: *mut SOCKET_ADDRESS, dwAddressCount: DWORD,
-        lpBlob: LPBLOB, dwFlags: DWORD, dwNameSpace: DWORD, lpNspId: LPGUID, timeout: *mut timeval,
-        lpOverlapped: LPOVERLAPPED, lpCompletionRoutine: LPLOOKUPSERVICE_COMPLETION_ROUTINE,
-        lpNameHandle: LPHANDLE,
-    ) -> INT;
-    pub fn SetAddrInfoExW(
-        pName: PCWSTR, pServiceName: PCWSTR, pAddresses: *mut SOCKET_ADDRESS, dwAddressCount: DWORD,
-        lpBlob: LPBLOB, dwFlags: DWORD, dwNameSpace: DWORD, lpNspId: LPGUID, timeout: *mut timeval,
-        lpOverlapped: LPOVERLAPPED, lpCompletionRoutine: LPLOOKUPSERVICE_COMPLETION_ROUTINE,
-        lpNameHandle: LPHANDLE,
-    ) -> INT;
-    // pub fn WEP();
-    pub fn WPUCompleteOverlappedRequest(
-        s: SOCKET, lpOverlapped: LPWSAOVERLAPPED, dwError: DWORD, cbTransferred: DWORD,
-        lpErrno: LPINT,
-    ) -> c_int;
-    // pub fn WPUGetProviderPathEx();
-    pub fn WSAAccept(
-        s: SOCKET, addr: *mut SOCKADDR, addrlen: LPINT, lpfnCondition: LPCONDITIONPROC,
-        dwCallbackData: DWORD_PTR,
-    ) -> SOCKET;
-    pub fn WSAAddressToStringA(
-        lpsaAddress: LPSOCKADDR, dwAddressLength: DWORD, lpProtocolInfo: LPWSAPROTOCOL_INFOA,
-        lpszAddressString: LPSTR, lpdwAddressStringLength: LPDWORD,
-    ) -> INT;
-    pub fn WSAAddressToStringW(
-        lpsaAddress: LPSOCKADDR, dwAddressLength: DWORD, lpProtocolInfo: LPWSAPROTOCOL_INFOW,
-        lpszAddressString: LPWSTR, lpdwAddressStringLength: LPDWORD,
-    ) -> INT;
-    pub fn WSAAdvertiseProvider(
-        puuidProviderId: *const GUID, pNSPv2Routine: *const LPCNSPV2_ROUTINE,
-    ) -> INT;
-    pub fn WSAAsyncGetHostByAddr(
-        hWnd: HWND, wMsg: u_int, addr: *const c_char, len: c_int, _type: c_int, buf: *mut c_char,
-        buflen: c_int,
-    ) -> HANDLE;
-    pub fn WSAAsyncGetHostByName(
-        hWnd: HWND, wMsg: u_int, name: *const c_char, buf: *mut c_char, buflen: c_int,
-    ) -> HANDLE;
-    pub fn WSAAsyncGetProtoByName(
-        hWnd: HWND, wMsg: u_int, name: *const c_char, buf: *mut c_char, buflen: c_int,
-    ) -> HANDLE;
-    pub fn WSAAsyncGetProtoByNumber(
-        hWnd: HWND, wMsg: u_int, number: c_int, buf: *mut c_char, buflen: c_int,
-    ) -> HANDLE;
-    pub fn WSAAsyncGetServByName(
-        hWnd: HWND, wMsg: u_int, name: *const c_char, proto: *const c_char, buf: *mut c_char,
-        buflen: c_int,
-    ) -> HANDLE;
-    pub fn WSAAsyncGetServByPort(
-        hWnd: HWND, wMsg: u_int, port: c_int, proto: *const c_char, buf: *mut c_char, buflen: c_int,
-    ) -> HANDLE;
-    pub fn WSAAsyncSelect(s: SOCKET, hWnd: HWND, wMsg: u_int, lEvent: c_long) -> c_int;
-    pub fn WSACancelAsyncRequest(hAsyncTaskHandle: HANDLE) -> c_int;
-    pub fn WSACancelBlockingCall() -> c_int;
-    pub fn WSACleanup() -> c_int;
-    pub fn WSACloseEvent(hEvent: WSAEVENT) -> BOOL;
-    pub fn WSAConnect(
-        s: SOCKET, name: *const SOCKADDR, namelen: c_int, lpCallerData: LPWSABUF,
-        lpCalleeData: LPWSABUF, lpSQOS: LPQOS, lpGQOS: LPQOS,
-    ) -> c_int;
-    pub fn WSAConnectByList(
-        s: SOCKET, SocketAddress: PSOCKET_ADDRESS_LIST, LocalAddressLength: LPDWORD,
-        LocalAddress: LPSOCKADDR, RemoteAddressLength: LPDWORD, RemoteAddress: LPSOCKADDR,
-        timeout: *const timeval, Reserved: LPWSAOVERLAPPED,
-    ) -> BOOL;
-    pub fn WSAConnectByNameA(
-        s: SOCKET, nodename: LPCSTR, servicename: LPCSTR, LocalAddressLength: LPDWORD,
-        LocalAddress: LPSOCKADDR, RemoteAddressLength: LPDWORD, RemoteAddress: LPSOCKADDR,
-        timeout: *const timeval, Reserved: LPWSAOVERLAPPED,
-    ) -> BOOL;
-    pub fn WSAConnectByNameW(
-        s: SOCKET, nodename: LPWSTR, servicename: LPWSTR, LocalAddressLength: LPDWORD,
-        LocalAddress: LPSOCKADDR, RemoteAddressLength: LPDWORD, RemoteAddress: LPSOCKADDR,
-        timeout: *const timeval, Reserved: LPWSAOVERLAPPED,
-    ) -> BOOL;
-    pub fn WSACreateEvent() -> WSAEVENT;
-    pub fn WSADuplicateSocketA(
-        s: SOCKET, dwProcessId: DWORD, lpProtocolInfo: LPWSAPROTOCOL_INFOA,
-    ) -> c_int;
-    pub fn WSADuplicateSocketW(
-        s: SOCKET, dwProcessId: DWORD, lpProtocolInfo: LPWSAPROTOCOL_INFOW,
-    ) -> c_int;
-    pub fn WSAEnumNameSpaceProvidersA(
-        lpdwBufferLength: LPDWORD, lpnspBuffer: LPWSANAMESPACE_INFOA,
-    ) -> INT;
-    pub fn WSAEnumNameSpaceProvidersExA(
-        lpdwBufferLength: LPDWORD, lpnspBuffer: LPWSANAMESPACE_INFOEXA,
-    ) -> INT;
-    pub fn WSAEnumNameSpaceProvidersExW(
-        lpdwBufferLength: LPDWORD, lpnspBuffer: LPWSANAMESPACE_INFOEXW,
-    ) -> INT;
-    pub fn WSAEnumNameSpaceProvidersW(
-        lpdwBufferLength: LPDWORD, lpnspBuffer: LPWSANAMESPACE_INFOW,
-    ) -> INT;
-    pub fn WSAEnumNetworkEvents(
-        s: SOCKET, hEventObject: WSAEVENT, lpNetworkEvents: LPWSANETWORKEVENTS,
-    ) -> c_int;
-    pub fn WSAEnumProtocolsA(
-        lpiProtocols: LPINT, lpProtocolBuffer: LPWSAPROTOCOL_INFOA, lpdwBufferLength: LPDWORD,
-    ) -> c_int;
-    pub fn WSAEnumProtocolsW(
-        lpiProtocols: LPINT, lpProtocolBuffer: LPWSAPROTOCOL_INFOW, lpdwBufferLength: LPDWORD,
-    ) -> c_int;
-    pub fn WSAEventSelect(s: SOCKET, hEventObject: WSAEVENT, lNetworkEvents: c_long) -> c_int;
-    pub fn WSAGetLastError() -> c_int;
-    pub fn WSAGetOverlappedResult(
-        s: SOCKET, lpOverlapped: LPWSAOVERLAPPED, lpcbTransfer: LPDWORD, fWait: BOOL,
-        lpdwFlags: LPDWORD,
-    ) -> BOOL;
-    pub fn WSAGetQOSByName(s: SOCKET, lpQOSName: LPWSABUF, lpQOS: LPQOS) -> BOOL;
-    pub fn WSAGetServiceClassInfoA(
-        lpProviderId: LPGUID, lpServiceClassId: LPGUID, lpdwBufSize: LPDWORD,
-        lpServiceClassInfo: LPWSASERVICECLASSINFOA,
-    ) -> INT;
-    pub fn WSAGetServiceClassInfoW(
-        lpProviderId: LPGUID, lpServiceClassId: LPGUID, lpdwBufSize: LPDWORD,
-        lpServiceClassInfo: LPWSASERVICECLASSINFOW,
-    ) -> INT;
-    pub fn WSAGetServiceClassNameByClassIdA(
-        lpServiceClassId: LPGUID, lpszServiceClassName: LPSTR, lpdwBufferLength: LPDWORD,
-    ) -> INT;
-    pub fn WSAGetServiceClassNameByClassIdW(
-        lpServiceClassId: LPGUID, lpszServiceClassName: LPWSTR, lpdwBufferLength: LPDWORD,
-    ) -> INT;
-    pub fn WSAHtonl(s: SOCKET, hostlong: u_long, lpnetlong: *mut u_long) -> c_int;
-    pub fn WSAHtons(s: SOCKET, hostshort: u_short, lpnetshort: *mut u_short) -> c_int;
-    pub fn WSAInstallServiceClassA(lpServiceClassInfo: LPWSASERVICECLASSINFOA) -> INT;
-    pub fn WSAInstallServiceClassW(lpServiceClassInfo: LPWSASERVICECLASSINFOW) -> INT;
-    pub fn WSAIoctl(
-        s: SOCKET, dwIoControlCode: DWORD, lpvInBuffer: LPVOID, cbInBuffer: DWORD,
-        lpvOutBuffer: LPVOID, cbOutBuffer: DWORD, lpcbBytesReturned: LPDWORD,
-        lpOverlapped: LPWSAOVERLAPPED, lpCompletionRoutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> c_int;
-    pub fn WSAIsBlocking() -> BOOL;
-    pub fn WSAJoinLeaf(
-        s: SOCKET, name: *const SOCKADDR, namelen: c_int, lpCallerData: LPWSABUF,
-        lpCalleeData: LPWSABUF, lpSQOS: LPQOS, lpGQOS: LPQOS, dwFlags: DWORD,
-    ) -> SOCKET;
-    pub fn WSALookupServiceBeginA(
-        lpqsRestrictions: LPWSAQUERYSETA, dwControlFlags: DWORD, lphLookup: LPHANDLE,
-    ) -> INT;
-    pub fn WSALookupServiceBeginW(
-        lpqsRestrictions: LPWSAQUERYSETW, dwControlFlags: DWORD, lphLookup: LPHANDLE,
-    ) -> INT;
-    pub fn WSALookupServiceEnd(hLookup: HANDLE) -> INT;
-    pub fn WSALookupServiceNextA(
-        hLookup: HANDLE, dwControlFlags: DWORD, lpdwBufferLength: LPDWORD,
-        lpqsResults: LPWSAQUERYSETA,
-    ) -> INT;
-    pub fn WSALookupServiceNextW(
-        hLookup: HANDLE, dwControlFlags: DWORD, lpdwBufferLength: LPDWORD,
-        lpqsResults: LPWSAQUERYSETW,
-    ) -> INT;
-    pub fn WSANSPIoctl(
-        hLookup: HANDLE, dwControlFlags: DWORD, lpvInBuffer: LPVOID, cbInBuffer: DWORD,
-        lpvOutBuffer: LPVOID, cbOutBuffer: DWORD, lpcbBytesReturned: LPDWORD,
-        lpCompletion: LPWSACOMPLETION,
-    ) -> INT;
-    pub fn WSANtohl(s: SOCKET, netlong: u_long, lphostlong: *mut c_long) -> c_int;
-    pub fn WSANtohs(s: SOCKET, netshort: u_short, lphostshort: *mut c_short) -> c_int;
-    pub fn WSAPoll(fdArray: LPWSAPOLLFD, fds: ULONG, timeout: INT) -> c_int;
-    pub fn WSAProviderCompleteAsyncCall(hAsyncCall: HANDLE, iRetCode: INT) -> INT;
-    pub fn WSAProviderConfigChange(
-        lpNotificationHandle: LPHANDLE, lpOverlapped: LPWSAOVERLAPPED,
-        lpCompletionRoutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> INT;
-    pub fn WSARecv(
-        s: SOCKET, lpBuffers: LPWSABUF, dwBufferCount: DWORD, lpNumberOfBytesRecvd: LPDWORD,
-        lpFlags: LPDWORD, lpOverlapped: LPWSAOVERLAPPED,
-        lpCompletionRoutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> c_int;
-    pub fn WSARecvDisconnect(s: SOCKET, lpInboundDisconnectData: LPWSABUF) -> c_int;
-    pub fn WSARecvFrom(
-        s: SOCKET, lpBuffers: LPWSABUF, dwBufferCount: DWORD, lpNumberOfBytesRecvd: LPDWORD,
-        lpFlags: LPDWORD, lpFrom: *mut SOCKADDR, lpFromlen: LPINT, lpOverlapped: LPWSAOVERLAPPED,
-        lpCompletionRoutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> c_int;
-    pub fn WSARemoveServiceClass(lpServiceClassId: LPGUID) -> INT;
-    pub fn WSAResetEvent(hEvent: WSAEVENT) -> BOOL;
-    pub fn WSASend(
-        s: SOCKET, lpBuffers: LPWSABUF, dwBufferCount: DWORD, lpNumberOfBytesSent: LPDWORD,
-        dwFlags: DWORD, lpOverlapped: LPWSAOVERLAPPED,
-        lpCompletionRoutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> c_int;
-    pub fn WSASendDisconnect(s: SOCKET, lpOutboundDisconnectData: LPWSABUF) -> c_int;
-    pub fn WSASendMsg(
-        Handle: SOCKET, lpMsg: LPWSAMSG, dwFlags: DWORD, lpNumberOfBytesSent: LPDWORD,
-        lpOverlapped: LPWSAOVERLAPPED, lpCompletionRoutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> c_int;
-    pub fn WSASendTo(
-        s: SOCKET, lpBuffers: LPWSABUF, dwBufferCount: DWORD, lpNumberOfBytesSent: LPDWORD,
-        dwFlags: DWORD, lpTo: *const SOCKADDR, iToLen: c_int, lpOverlapped: LPWSAOVERLAPPED,
-        lpCompletionRoutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> c_int;
-    pub fn WSASetBlockingHook(lpBlockFunc: FARPROC) -> FARPROC;
-    pub fn WSASetEvent(hEvent: WSAEVENT) -> BOOL;
-    pub fn WSASetLastError(iError: c_int);
-    pub fn WSASetServiceA(
-        lpqsRegInfo: LPWSAQUERYSETA, essoperation: WSAESETSERVICEOP, dwControlFlags: DWORD,
-    ) -> INT;
-    pub fn WSASetServiceW(
-        lpqsRegInfo: LPWSAQUERYSETW, essoperation: WSAESETSERVICEOP, dwControlFlags: DWORD,
-    ) -> INT;
-    pub fn WSASocketA(
-        af: c_int, _type: c_int, protocol: c_int, lpProtocolInfo: LPWSAPROTOCOL_INFOA, g: GROUP,
-        dwFlags: DWORD,
-    ) -> SOCKET;
-    pub fn WSASocketW(
-        af: c_int, _type: c_int, protocol: c_int, lpProtocolInfo: LPWSAPROTOCOL_INFOW, g: GROUP,
-        dwFlags: DWORD,
-    ) -> SOCKET;
-    pub fn WSAStartup(wVersionRequested: WORD, lpWSAData: LPWSADATA) -> c_int;
-    pub fn WSAStringToAddressA(
-        AddressString: LPSTR, AddressFamily: INT, lpProtocolInfo: LPWSAPROTOCOL_INFOA,
-        lpAddress: LPSOCKADDR, lpAddressLength: LPINT,
-    ) -> INT;
-    pub fn WSAStringToAddressW(
-        AddressString: LPWSTR, AddressFamily: INT, lpProtocolInfo: LPWSAPROTOCOL_INFOW,
-        lpAddress: LPSOCKADDR, lpAddressLength: LPINT,
-    ) -> INT;
-    pub fn WSAUnadvertiseProvider(puuidProviderId: *const GUID) -> INT;
-    pub fn WSAUnhookBlockingHook() -> c_int;
-    pub fn WSAWaitForMultipleEvents(
-        cEvents: DWORD, lphEvents: *const WSAEVENT, fWaitAll: BOOL, dwTimeout: DWORD,
-        fAlertable: BOOL,
-    ) -> DWORD;
-    pub fn WSCDeinstallProvider(lpProviderId: LPGUID, lpErrno: LPINT) -> c_int;
-    // pub fn WSCDeinstallProviderEx();
-    pub fn WSCEnableNSProvider(lpProviderId: LPGUID, fEnable: BOOL) -> INT;
-    pub fn WSCEnumProtocols(
-        lpiProtocols: LPINT, lpProtocolBuffer: LPWSAPROTOCOL_INFOW, lpdwBufferLength: LPDWORD,
-        lpErrno: LPINT,
-    ) -> c_int;
-    // pub fn WSCEnumProtocolsEx();
-    pub fn WSCGetApplicationCategory(
-        Path: LPCWSTR, PathLength: DWORD, Extra: LPCWSTR, ExtraLength: DWORD,
-        pPermittedLspCategories: *mut DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    // pub fn WSCGetApplicationCategoryEx();
-    pub fn WSCGetProviderInfo(
-        lpProviderId: LPGUID, InfoType: WSC_PROVIDER_INFO_TYPE, Info: PBYTE, InfoSize: *mut size_t,
-        Flags: DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCGetProviderPath(
-        lpProviderId: LPGUID, lpszProviderDllPath: *mut WCHAR, lpProviderDllPathLen: LPINT,
-        lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCInstallNameSpace(
-        lpszIdentifier: LPWSTR, lpszPathName: LPWSTR, dwNameSpace: DWORD, dwVersion: DWORD,
-        lpProviderId: LPGUID,
-    ) -> INT;
-    pub fn WSCInstallNameSpaceEx(
-        lpszIdentifier: LPWSTR, lpszPathName: LPWSTR, dwNameSpace: DWORD, dwVersion: DWORD,
-        lpProviderId: LPGUID, lpProviderSpecific: LPBLOB,
-    ) -> INT;
-    // pub fn WSCInstallNameSpaceEx2();
-    pub fn WSCInstallProvider(
-        lpProviderId: LPGUID, lpszProviderDllPath: *const WCHAR,
-        lpProtocolInfoList: LPWSAPROTOCOL_INFOW, dwNumberOfEntries: DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    // pub fn WSCInstallProviderEx();
-    pub fn WSCSetApplicationCategory(
-        Path: LPCWSTR, PathLength: DWORD, Extra: LPCWSTR, ExtraLength: DWORD,
-        PermittedLspCategories: DWORD, pPrevPermLspCat: *mut DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    // pub fn WSCSetApplicationCategoryEx();
-    pub fn WSCSetProviderInfo(
-        lpProviderId: LPGUID, InfoType: WSC_PROVIDER_INFO_TYPE, Info: PBYTE, InfoSize: size_t,
-        Flags: DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCUnInstallNameSpace(lpProviderId: LPGUID) -> INT;
-    // pub fn WSCUnInstallNameSpaceEx2();
-    pub fn WSCUpdateProvider(
-        lpProviderId: LPGUID, lpszProviderDllPath: *const WCHAR,
-        lpProtocolInfoList: LPWSAPROTOCOL_INFOW, dwNumberOfEntries: DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    // pub fn WSCUpdateProviderEx();
-    pub fn WSCWriteNameSpaceOrder(lpProviderId: LPGUID, dwNumberOfEntries: DWORD) -> c_int;
-    pub fn WSCWriteProviderOrder(lpwdCatalogEntryId: LPDWORD, dwNumberOfEntries: DWORD) -> c_int;
-    // pub fn WSCWriteProviderOrderEx();
-    // pub fn WahCloseApcHelper();
-    // pub fn WahCloseHandleHelper();
-    // pub fn WahCloseNotificationHandleHelper();
-    // pub fn WahCloseSocketHandle();
-    // pub fn WahCloseThread();
-    // pub fn WahCompleteRequest();
-    // pub fn WahCreateHandleContextTable();
-    // pub fn WahCreateNotificationHandle();
-    // pub fn WahCreateSocketHandle();
-    // pub fn WahDestroyHandleContextTable();
-    // pub fn WahDisableNonIFSHandleSupport();
-    // pub fn WahEnableNonIFSHandleSupport();
-    // pub fn WahEnumerateHandleContexts();
-    // pub fn WahInsertHandleContext();
-    // pub fn WahNotifyAllProcesses();
-    // pub fn WahOpenApcHelper();
-    // pub fn WahOpenCurrentThread();
-    // pub fn WahOpenHandleHelper();
-    // pub fn WahOpenNotificationHandleHelper();
-    // pub fn WahQueueUserApc();
-    // pub fn WahReferenceContextByHandle();
-    // pub fn WahRemoveHandleContext();
-    // pub fn WahWaitForNotification();
-    // pub fn WahWriteLSPEvent();
-    pub fn __WSAFDIsSet(fd: SOCKET, _: *mut fd_set) -> c_int;
-    pub fn accept(s: SOCKET, addr: *mut SOCKADDR, addrlen: *mut c_int) -> SOCKET;
-    pub fn bind(s: SOCKET, name: *const SOCKADDR, namelen: c_int) -> c_int;
-    pub fn closesocket(s: SOCKET) -> c_int;
-    pub fn connect(s: SOCKET, name: *const SOCKADDR, namelen: c_int) -> c_int;
-    pub fn freeaddrinfo(pAddrInfo: PADDRINFOA);
-    pub fn getaddrinfo(
-        pNodeName: PCSTR, pServiceName: PCSTR, pHints: *const ADDRINFOA, ppResult: *mut PADDRINFOA,
-    ) -> INT;
-    pub fn gethostbyaddr(addr: *const c_char, len: c_int, _type: c_int) -> *mut hostent;
-    pub fn gethostbyname(name: *const c_char) -> *mut hostent;
-    pub fn gethostname(name: *mut c_char, namelen: c_int) -> c_int;
-    pub fn getnameinfo(
-        pSockaddr: *const SOCKADDR, SockaddrLength: socklen_t, pNodeBuffer: PCHAR,
-        NodeBufferSize: DWORD, pServiceBuffer: PCHAR, ServiceBufferSize: DWORD, Flags: INT,
-    ) -> INT;
-    pub fn getpeername(s: SOCKET, name: *mut SOCKADDR, namelen: *mut c_int) -> c_int;
-    pub fn getprotobyname(name: *const c_char) -> *mut protoent;
-    pub fn getprotobynumber(number: c_int) -> *mut protoent;
-    pub fn getservbyname(name: *const c_char, proto: *const c_char) -> *mut servent;
-    pub fn getservbyport(port: c_int, proto: *const c_char) -> *mut servent;
-    pub fn getsockname(s: SOCKET, name: *mut SOCKADDR, namelen: *mut c_int) -> c_int;
-    pub fn getsockopt(
-        s: SOCKET, level: c_int, optname: c_int, optval: *mut c_char, optlen: *mut c_int,
-    ) -> c_int;
-    pub fn htonl(hostlong: u_long) -> u_long;
-    pub fn htons(hostshort: u_short) -> u_short;
-    pub fn inet_addr(cp: *const c_char) -> c_ulong;
-    pub fn inet_ntoa(_in: in_addr) -> *mut c_char;
-    pub fn inet_ntop(Family: INT, pAddr: PVOID, pStringBuf: PSTR, StringBufSize: size_t) -> PCSTR;
-    pub fn inet_pton(Family: INT, pszAddrString: PCSTR, pAddrBuf: PVOID) -> INT;
-    pub fn ioctlsocket(s: SOCKET, cmd: c_long, argp: *mut u_long) -> c_int;
-    pub fn listen(s: SOCKET, backlog: c_int) -> c_int;
-    pub fn ntohl(netlong: u_long) -> u_long;
-    pub fn ntohs(netshort: u_short) -> u_short;
-    pub fn recv(s: SOCKET, buf: *mut c_char, len: c_int, flags: c_int) -> c_int;
-    pub fn recvfrom(
-        s: SOCKET, buf: *mut c_char, len: c_int, flags: c_int, from: *mut SOCKADDR,
-        fromlen: *mut c_int,
-    ) -> c_int;
-    pub fn select(
-        nfds: c_int, readfds: *mut fd_set, writefds: *mut fd_set, exceptfds: *mut fd_set,
-        timeout: *const timeval,
-    ) -> c_int;
-    pub fn send(s: SOCKET, buf: *const c_char, len: c_int, flags: c_int) -> c_int;
-    pub fn sendto(
-        s: SOCKET, buf: *const c_char, len: c_int, flags: c_int, to: *const SOCKADDR, tolen: c_int,
-    ) -> c_int;
-    pub fn setsockopt(
-        s: SOCKET, level: c_int, optname: c_int, optval: *const c_char, optlen: c_int,
-    ) -> c_int;
-    pub fn shutdown(s: SOCKET, how: c_int) -> c_int;
-    pub fn socket(af: c_int, _type: c_int, protocol: c_int) -> SOCKET;
-}
-#[cfg(any(target_arch = "x86", target_arch = "arm"))]
-extern "system" {
-    pub fn WSCInstallProviderAndChains(
-        lpProviderId: LPGUID, lpszProviderDllPath: LPWSTR, lpszLspName: LPWSTR,
-        dwServiceFlags: DWORD, lpProtocolInfoList: LPWSAPROTOCOL_INFOW, dwNumberOfEntries: DWORD,
-        lpdwCatalogEntryId: LPDWORD, lpErrno: LPINT,
-    ) -> c_int;
-}
-#[cfg(target_arch = "x86_64")]
-extern "system" {
-    pub fn WSCDeinstallProvider32(lpProviderId: LPGUID, lpErrno: LPINT) -> c_int;
-    pub fn WSCEnableNSProvider32(lpProviderId: LPGUID, fEnable: BOOL) -> INT;
-    pub fn WSCEnumNameSpaceProviders32(
-        lpdwBufferLength: LPDWORD, lpnspBuffer: LPWSANAMESPACE_INFOW,
-    ) -> INT;
-    pub fn WSCEnumNameSpaceProvidersEx32(
-        lpdwBufferLength: LPDWORD, lpnspBuffer: LPWSANAMESPACE_INFOEXW,
-    ) -> INT;
-    pub fn WSCEnumProtocols32(
-        lpiProtocols: LPINT, lpProtocolBuffer: LPWSAPROTOCOL_INFOW, lpdwBufferLength: LPDWORD,
-        lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCGetProviderInfo32(
-        lpProviderId: LPGUID, InfoType: WSC_PROVIDER_INFO_TYPE, Info: PBYTE, InfoSize: *mut size_t,
-        Flags: DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCGetProviderPath32(
-        lpProviderId: LPGUID, lpszProviderDllPath: *mut WCHAR, lpProviderDllPathLen: LPINT,
-        lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCInstallNameSpace32(
-        lpszIdentifier: LPWSTR, lpszPathName: LPWSTR, dwNameSpace: DWORD, dwVersion: DWORD,
-        lpProviderId: LPGUID,
-    ) -> INT;
-    pub fn WSCInstallNameSpaceEx32(
-        lpszIdentifier: LPWSTR, lpszPathName: LPWSTR, dwNameSpace: DWORD, dwVersion: DWORD,
-        lpProviderId: LPGUID, lpProviderSpecific: LPBLOB,
-    ) -> INT;
-    pub fn WSCInstallProvider64_32(
-        lpProviderId: LPGUID, lpszProviderDllPath: *const WCHAR,
-        lpProtocolInfoList: LPWSAPROTOCOL_INFOW, dwNumberOfEntries: DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCInstallProviderAndChains64_32(
-        lpProviderId: LPGUID, lpszProviderDllPath: LPWSTR, lpszProviderDllPath32: LPWSTR,
-        lpszLspName: LPWSTR, dwServiceFlags: DWORD, lpProtocolInfoList: LPWSAPROTOCOL_INFOW,
-        dwNumberOfEntries: DWORD, lpdwCatalogEntryId: LPDWORD, lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCSetProviderInfo32(
-        lpProviderId: LPGUID, InfoType: WSC_PROVIDER_INFO_TYPE, Info: PBYTE, InfoSize: size_t,
-        Flags: DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCUnInstallNameSpace32(lpProviderId: LPGUID) -> INT;
-    pub fn WSCUpdateProvider32(
-        lpProviderId: LPGUID, lpszProviderDllPath: *const WCHAR,
-        lpProtocolInfoList: LPWSAPROTOCOL_INFOW, dwNumberOfEntries: DWORD, lpErrno: LPINT,
-    ) -> c_int;
-    pub fn WSCWriteNameSpaceOrder32(lpProviderId: LPGUID, dwNumberOfEntries: DWORD) -> c_int;
-    pub fn WSCWriteProviderOrder32(lpwdCatalogEntryId: LPDWORD, dwNumberOfEntries: DWORD) -> c_int;
-}
-extern {
-    // pub static AddressFamilyInformation;
-    // pub static eui48_broadcast;
-    // pub static in4addr_alligmpv3routersonlink;
-    // pub static in4addr_allnodesonlink;
-    // pub static in4addr_allroutersonlink;
-    // pub static in4addr_allteredohostsonlink;
-    // pub static in4addr_any;
-    // pub static in4addr_broadcast;
-    // pub static in4addr_linklocalprefix;
-    // pub static in4addr_loopback;
-    // pub static in4addr_multicastprefix;
-    // pub static in6addr_6to4prefix;
-    // pub static in6addr_allmldv2routersonlink;
-    // pub static in6addr_allnodesonlink;
-    // pub static in6addr_allnodesonnode;
-    // pub static in6addr_allroutersonlink;
-    // pub static in6addr_any;
-    // pub static in6addr_linklocalprefix;
-    // pub static in6addr_loopback;
-    // pub static in6addr_multicastprefix;
-    // pub static in6addr_solicitednodemulticastprefix;
-    // pub static in6addr_teredoinitiallinklocaladdress;
-    // pub static in6addr_teredoprefix;
-    // pub static in6addr_teredoprefix_old;
-    // pub static in6addr_v4mappedprefix;
-    // pub static scopeid_unspecified;
-    // pub static sockaddr_size;
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/.cargo-checksum.json	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"6b087b6145b76d55eb222455729e3c11b98076031913dd84cd292e753c878406","src/conv.rs":"ad777f8de10a53b0c8ce112e61947a22cfa24f27358ad353b497c2251718aa8a","src/exit.rs":"ce6c5ae7a13de6e71d4d00c1fd400f565fcc789dac8e12e7a20060b8ad70e4f3","src/fmt.rs":"400582dc5571666ce383ea2a91b1ad545421c519745aa534ad29ff32a9e33b5a","src/lib.rs":"127d65f0c8fbec738d73ae48c2e74c57c3eef1bc928c81c2f71af3b8f1685adb","src/pipe.rs":"6efa57490b0a2f919f9041eee85c4267814d530e1a32227015b8fadea23b1d1e","src/tap.rs":"3d1c819f949dcf2d32c48f80151beee34c55d13616ab47ae9d1dd89e35c7de3e"},"package":"85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/Cargo.toml	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,33 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "wyz"
+version = "0.2.0"
+authors = ["myrrlyn <self@myrrlyn.dev>"]
+include = ["Cargo.toml", "src/**/*.rs"]
+description = "myrrlyn’s utility collection"
+homepage = "https://myrrlyn.net/crates/wyz"
+documentation = "https://docs.rs/wyz"
+readme = "README.md"
+keywords = []
+categories = ["no-std"]
+license = "MIT"
+repository = "https://github.com/myrrlyn/wyz"
+
+[dependencies]
+
+[features]
+alloc = []
+default = ["std"]
+std = ["alloc"]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/conv.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/conv.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/conv.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/conv.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,210 @@
+/*! Directed Type Conversion
+
+This module provides sibling traits to the `std::convert` module. The standard
+library puts the type parameter in the trait declaration, which makes those
+traits generic and suitable for constraint clauses and function calls, but not
+usable in indeterminate method-call positions. These traits put the type
+parameter in the function declaration, making the trait non-generic and allowing
+the function to be called in method-call position without ambiguity.
+!*/
+
+use core::convert::TryInto;
+
+/** Directed Type Conversion
+
+This trait is an accessory to [`From`] and [`Into`]. It works by moving the
+destination type from the trait name (`Into<Target>::into`) into the method name
+(`Conv::conv::<Target>`). This change makes `Into<_>` the correct trait to use
+in trait bounds and `.conv::<_>` the correct method to use in expressions.
+
+A `conv::<T>` method is automatically available whenever an `Into<T>`
+implementation exists for a type. `Into<T>` is most commonly implemented by
+taking advantage of the reflexive blanket implentation using `From`, but can
+also be manually implemented as desired.
+
+`.into()` cannot be used in intermediate expressions, because it is impossible
+for the compiler’s type engine to select a unique `Into<T>` implementation. This
+means that expressions like `v.into().use()` will never compile. Users can
+replace `.into()` with `.conv::<Dest>()` in order to inform the compiler of the
+type of the expression after the conversion, and make compilation succeed.
+
+`Conv` cannot be used in trait bounds, because the trait itself is not generic.
+All `Sized` types implement `Conv` by default, so specifying that a type must be
+`Conv` adds no information to the solver.
+
+# Examples
+
+## Conversion as methods
+
+Conversion with `.into()` will fail to compile, even with the type annotation:
+
+```rust,compile_fail
+let s: String = "static".into().clone();
+//              ^^^^^^^^^^^^^^^ cannot infer type for `T`
+// note: type must be known at this point
+```
+
+while the equivalent code with `.conv::<_>` does compile:
+
+```rust
+# use wyz::conv::Conv;
+let s = "static".conv::<String>().clone();
+```
+
+## Conversion as traits
+
+Bounding a type with `Conv` will not compile, because the trait itself gives no
+information:
+
+```rust,compile_fail
+# use wyz::conv::Conv;
+fn lift<T: Conv>(src: T) -> String {
+  src.conv::<String>().clone()
+//    ^^^^ the trait `From<T>` is not implemented for `String`
+// help: consider adding a `where String: From<T>` bound
+// note: required because of the requirements on the impl of `Into<String>` for `T`
+}
+```
+
+This can be fixed by adding the clause `where String: From<T>`, or by using the
+bound `Into`:
+
+```rust
+# use wyz::conv::Conv;
+fn lift<T: Into<String>>(src: T) -> String {
+  src.conv::<String>().clone()
+}
+```
+
+The `Into<T>` trait bound makes available both the `Into::<T>::into` method and
+the `Conv::conv::<T>` method.
+
+[`From`]: https://doc.rust-lang.org/std/convert/trait.From.html
+[`Into`]: https://doc.rust-lang.org/std/convert/trait.Into.html
+**/
+pub trait Conv: Sized {
+	/// Converts `self` into a target type.
+	///
+	/// This method runs `<Self as Into<T>>::into` on `self` to produce the
+	/// desired output. The only difference between using `Conv::conv` and
+	/// `Into::into` is where the target type is placed in the name; `.conv()`
+	/// can be used in intermediate positions of an expression, while `.into()`
+	/// cannot.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use wyz::conv::Conv;
+	///
+	/// let t = "hello".conv::<String>();
+	/// ```
+	fn conv<T: Sized>(self) -> T
+	where Self: Into<T> {
+		<Self as Into<T>>::into(self)
+	}
+}
+
+impl<T: Sized> Conv for T {
+}
+
+/** Directed Fallible Type Conversion
+
+This trait is an accessory to [`TryFrom`] and [`TryInto`]. It works by moving
+the destination type from the trait name (`TryInto<Target>::try_into`) into the
+method name (`TryConv::try_conv::<Target>`). This change makes `TryInto<_>` the
+correct trait to use in trait bounds and `.try_conv::<_>` the correct method to
+use in expressions.
+
+A `try_conv::<T>` method is automatically available whenever a `TryInto<T>`
+implementation exists for a type. `TryInto<T>` is most commonly implemented by
+taking advantage of the reflexive blanket implentation using `TryFrom`, but can
+also be manually implemented as desired.
+
+`.try_into()` cannot be used in intermediate expressions, because it is
+impossible for the compiler’s type engine to select a unique `TryInto<T>`
+implementation. This means that expressions like `v.try_into().use()` will never
+compile. Users can replace `.try_into()` with `.try_conv::<Dest>()` in order to
+inform the compiler of the type of the expression after the conversion, and make
+compilation succeed.
+
+`TryConv` cannot be used in trait bounds, because the trait itself is not
+generic. All `Sized` types implement `TryConv` by default, so specifying that a
+type must be `TryConv` adds no information to the solver.
+
+# Examples
+
+## Conversion as methods
+
+Conversion with `.try_into()` will fail to compile, even with the type
+annotation:
+
+```rust,ignore
+let s: String = "static".try_into().unwrap().clone();
+//              ^^^^^^^^^^^^^^^^^^^ cannot infer type for `T`
+// note: type must be known at this point
+```
+
+while the equivalent code with `.try_conv::<_>` does compile:
+
+```rust
+# use wyz::conv::TryConv;
+let s = "static".try_conv::<String>().unwrap().clone();
+```
+
+## Conversion as traits
+
+Bounding a type with `TryConv` will not compile, because the trait itself gives
+no information:
+
+```rust,ignore
+# use wyz::conv::TryConv;
+fn lift<T: TryConv>(src: T) -> String {
+  src.try_conv::<String>().clone()
+//    ^^^^^^^^ the trait `From<T>` is not implemented for `String`
+// help: consider adding a `where String: From<T>` bound
+// note: required because of the requirements on the impl of `Into<String>` for `T`
+// note: required because of the requirements on the impl of `TryFrom<T>` for `String`
+}
+```
+
+This can be fixed by adding the clause `where String: TryFrom<T>`, or by using
+the bound `TryInto`:
+
+```rust
+# use std::convert::TryInto;
+# use wyz::conv::TryConv;
+fn lift<T: TryInto<String>>(src: T) -> String {
+  src.try_conv::<String>().ok().unwrap().clone()
+}
+```
+
+The `TryInto<T>` trait bound makes available both the `TryInto::<T>::try_into`
+method and the `TryConv::try_conv::<T>` method.
+
+[`TryFrom`]: https://doc.rust-lang.org/std/convert/trait.TryFrom.html
+[`TryInto`]: https://doc.rust-lang.org/std/convert/trait.TryInto.html
+**/
+pub trait TryConv: Sized {
+	/// Attempts to convert `self` into a target type.
+	///
+	/// This method runs `<Self as TryInto<T>>::try_into` on `self` to produce
+	/// the desired output. The only difference between using
+	/// `TryConv::try_conv` and `TryInto::try_into` is where the target type is
+	/// placed in the name; `.try_conv()` can be used in intermediate positions
+	/// of an expression, while `.try_into()` cannot.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use wyz::conv::TryConv;
+	///
+	/// let t = "hello".try_conv::<String>().unwrap();
+	/// ```
+	fn try_conv<T: Sized>(self) -> Result<T, Self::Error>
+	where Self: TryInto<T> {
+		<Self as TryInto<T>>::try_into(self)
+	}
+}
+
+impl<T: Sized> TryConv for T {
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/exit.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/exit.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/exit.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/exit.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,45 @@
+/*! `exit!` macro
+
+The `exit!` macro simplifies exiting with an error code, and optionally printing
+an error message prior to exit.
+
+# Examples
+
+This example exits with status `1`.
+
+```rust,should_panic
+wyz::exit!();
+```
+
+This example exits with status `2`.
+
+```rust,should_panic
+wyz::exit!(2);
+```
+
+This example exits with status `3`, and uses `eprintln!` to print an error
+message before exiting. Note that if `stderr` has been closed, this will crash
+the program with a panic due to `SIGPIPE`, and *not* call `process::exit()`.
+
+```rust,should_panic
+wyz::exit!(3, "Error status: {}", "testing");
+!*/
+
+#![cfg(feature = "std")]
+
+/// `exit!` macro
+#[macro_export]
+macro_rules! exit {
+	() => {
+		$crate::exit!(1);
+	};
+
+	( $num:expr $(,)? ) => {
+		::std::process::exit($num);
+	};
+
+	( $num:expr, $fmt:expr $( , $arg:expr )* $(,)? ) => {{
+		eprintln!($fmt $( , $arg )*);
+		$crate::exit!($num);
+	}};
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/fmt.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/fmt.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/fmt.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/fmt.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,221 @@
+/*! Format forwarding
+
+This module provides wrapper types for each formatting trait other than `Debug`
+which, when `Debug`-formatted, forward to the original trait instead of `Debug`.
+
+Each wrapper type is a tuple struct so that it can be used as a named
+constructor, such as in `.map(FmtDisplay)`. In addition, a blanket trait adds
+extension methods `.fmt_<trait_name>>()` to provide the corresponding wrap.
+
+Any modifiers in the format template string or struct modifier are passed
+through to the desired trait implementation unchanged. The only effect of the
+forwarding types in this module is to change the `?` template character to one
+of the other trait signifiers.
+!*/
+
+use core::{
+	fmt::{
+		self,
+		Binary,
+		Debug,
+		Display,
+		Formatter,
+		LowerExp,
+		LowerHex,
+		Octal,
+		Pointer,
+		UpperExp,
+		UpperHex,
+	},
+	ops::{
+		Deref,
+		DerefMut,
+	},
+};
+
+/// Wraps any value with a format-forward to `Debug`.
+pub trait FmtForward: Sized {
+	/// Causes `self` to use its `Binary` implementation when `Debug`-formatted.
+	fn fmt_binary(self) -> FmtBinary<Self>
+	where Self: Binary {
+		FmtBinary(self)
+	}
+
+	/// Causes `self` to use its `Display` implementation when
+	/// `Debug`-formatted.
+	fn fmt_display(self) -> FmtDisplay<Self>
+	where Self: Display {
+		FmtDisplay(self)
+	}
+
+	/// Causes `self` to use its `LowerExp` implementation when
+	/// `Debug`-formatted.
+	fn fmt_lower_exp(self) -> FmtLowerExp<Self>
+	where Self: LowerExp {
+		FmtLowerExp(self)
+	}
+
+	/// Causes `self` to use its `LowerHex` implementation when
+	/// `Debug`-formatted.
+	fn fmt_lower_hex(self) -> FmtLowerHex<Self>
+	where Self: LowerHex {
+		FmtLowerHex(self)
+	}
+
+	/// Causes `self` to use its `Octal` implementation when `Debug`-formatted.
+	fn fmt_octal(self) -> FmtOctal<Self>
+	where Self: Octal {
+		FmtOctal(self)
+	}
+
+	/// Causes `self` to use its `Pointer` implementation when
+	/// `Debug`-formatted.
+	fn fmt_pointer(self) -> FmtPointer<Self>
+	where Self: Pointer {
+		FmtPointer(self)
+	}
+
+	/// Causes `self` to use its `UpperExp` implementation when
+	/// `Debug`-formatted.
+	fn fmt_upper_exp(self) -> FmtUpperExp<Self>
+	where Self: UpperExp {
+		FmtUpperExp(self)
+	}
+
+	/// Causes `self` to use its `UpperHex` implementation when
+	/// `Debug`-formatted.
+	fn fmt_upper_hex(self) -> FmtUpperHex<Self>
+	where Self: UpperHex {
+		FmtUpperHex(self)
+	}
+}
+
+impl<T: Sized> FmtForward for T {
+}
+
+/// Forwards a type’s `Binary` formatting implementation to `Debug`.
+#[repr(transparent)]
+pub struct FmtBinary<T: Binary>(pub T);
+
+/// Forwards a type’s `Display` formatting implementation to `Debug`.
+#[repr(transparent)]
+pub struct FmtDisplay<T: Display>(pub T);
+
+/// Forwards a type’s `LowerExp` formatting implementation to `Debug`.
+#[repr(transparent)]
+pub struct FmtLowerExp<T: LowerExp>(pub T);
+
+/// Forwards a type’s `LowerHex` formatting implementation to `Debug`.
+#[repr(transparent)]
+pub struct FmtLowerHex<T: LowerHex>(pub T);
+
+/// Forwards a type’s `Octal` formatting implementation to `Debug`.
+#[repr(transparent)]
+pub struct FmtOctal<T: Octal>(pub T);
+
+/// Forwards a type’s `Pointer` formatting implementation to `Debug`.
+#[repr(transparent)]
+pub struct FmtPointer<T: Pointer>(pub T);
+
+/// Forwards a type’s `UpperExp` formatting implementation to `Debug`.
+#[repr(transparent)]
+pub struct FmtUpperExp<T: UpperExp>(pub T);
+
+/// Forwards a type’s `UpperHex` formatting implementation to `Debug`.
+#[repr(transparent)]
+pub struct FmtUpperHex<T: UpperHex>(pub T);
+
+macro_rules! fmt {
+	($($w:ty => $t:ident),* $(,)?) => { $(
+		impl<T: $t + Binary> Binary for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				Binary::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t> Debug for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				<T as $t>::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t + Display> Display for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				Display::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t + LowerExp> LowerExp for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				LowerExp::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t + LowerHex> LowerHex for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				LowerHex::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t + Octal> Octal for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				Octal::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t + Pointer> Pointer for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				Pointer::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t + UpperExp> UpperExp for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				UpperExp::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t + UpperHex> UpperHex for $w {
+			fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+				UpperHex::fmt(&self.0, fmt)
+			}
+		}
+
+		impl<T: $t> Deref for $w {
+			type Target = T;
+
+			fn deref(&self) -> &Self::Target {
+				&self.0
+			}
+		}
+
+		impl<T: $t> DerefMut for $w {
+			fn deref_mut(&mut self) -> &mut Self::Target {
+				&mut self.0
+			}
+		}
+
+		impl<T: $t> AsRef<T> for $w {
+			fn as_ref(&self) -> &T {
+				&self.0
+			}
+		}
+
+		impl<T: $t> AsMut<T> for $w {
+			fn as_mut(&mut self) -> &mut T {
+				&mut self.0
+			}
+		}
+	)* };
+}
+
+fmt!(
+	FmtBinary<T> => Binary,
+	FmtDisplay<T> => Display,
+	FmtLowerExp<T> => LowerExp,
+	FmtLowerHex<T> => LowerHex,
+	FmtOctal<T> => Octal,
+	FmtPointer<T> => Pointer,
+	FmtUpperExp<T> => UpperExp,
+	FmtUpperHex<T> => UpperHex,
+);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/lib.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,35 @@
+/*! `wyz` – myrrlyn’s wyzyrdly library
+
+This crate consolidates all the small tools and conveniences I’ve built up in my
+experience building Rust crates.
+
+Each module has more documentation about what it contains. The modules are
+largely independent, and can be used individually.
+!*/
+
+#![no_std]
+#![cfg_attr(debug_assertions, warn(missing_docs))]
+#![cfg_attr(not(debug_assertions), deny(missing_docs))]
+
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod conv;
+pub mod fmt;
+pub mod pipe;
+pub mod tap;
+
+#[cfg(feature = "std")]
+#[macro_use]
+pub mod exit;
+
+pub use conv::*;
+pub use fmt::*;
+pub use pipe::*;
+pub use tap::*;
+
+#[cfg(feature = "std")]
+pub use exit::*;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/pipe.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/pipe.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/pipe.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/pipe.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,358 @@
+/*! Pipe objects into functions, even those not available for dot-call.
+
+Rust restricts the `.method()` call syntax to be available only on functions
+defined in `impl [Trait for] Type` blocks, with language-blessed `self`
+receivers.
+
+This module allows any function to be `.call()`ed, with as little overhead as
+is possible in the language.
+
+# Examples
+
+```rust
+use wyz::pipe::*;
+
+fn double(x: i32) -> i32 {
+  x * 2
+}
+
+fn double_ref(x: &i32) -> i32 {
+  *x * 2
+}
+
+assert_eq!(5.pipe(double), 10);
+assert_eq!(5.pipe_ref(double_ref), 10);
+```
+
+Rust’s automatic de/reference chasing only works for the signatures Rust already
+permits in method-call syntax; the `Pipe` trait provides methods for certain
+reference conversion chasing, but cannot otherwise take advantage of the
+language builtin support for such behavior on ordinary methods.
+
+Petition for a `|>` operator; sorry.
+!*/
+
+use core::{
+	borrow::{
+		Borrow,
+		BorrowMut,
+	},
+	ops::{
+		Deref,
+		DerefMut,
+	},
+};
+
+/** Permit suffixed call of any function on a value.
+
+This trait provides a verbose, ugly version of the functional-language operator
+`|>`. For any value, calling `.pipe(some_function)` translates to
+`some_function(value)`.
+
+Because it takes `self` by value, this trait is only implemented on `Sized`
+types.
+**/
+pub trait Pipe: Sized {
+	/// Pipes a value into a function that cannot ordinarily be called in suffix
+	/// position.
+	///
+	/// # Parameters
+	///
+	/// - `self`: Any value
+	/// - `func`: Any function, which will receive `self` as its first and only
+	///   parameter. The return value of this function is then returned from
+	///   `pipe`.
+	///
+	/// Because this is a library function, not a language feature, it is not
+	/// able to use the method-call shorthand of `function(...other_params)`. A
+	/// suffix function with other params must be called as a closure:
+	///
+	/// ```rust
+	/// use wyz::pipe::Pipe;
+	///
+	/// fn add(a: i32, b: i32) -> i32 { a + b }
+	///
+	/// assert_eq!(5.pipe(|a| add(a, 2)), 7);
+	/// ```
+	///
+	/// This is *more* verbose than calling the function in prefix position; its
+	/// only value is for fitting into suffix-call chains.
+	///
+	/// The `.p` method is a shorthand alias for `.pipe`.
+	///
+	/// # Type Parameters
+	///
+	/// - `R`: The return value of `func`, which is then returned from `.pipe`.
+	///   This is placed as a function type parameter rather than a trait type
+	///   parameter so that it can be specified in ambiguous call sites.
+	#[inline(always)]
+	fn pipe<R>(self, func: impl FnOnce(Self) -> R) -> R
+	where R: Sized {
+		func(self)
+	}
+}
+
+/** Referential piping.
+
+The `Pipe` trait passes by value; the functions in this trait pass by reference.
+As such, this trait is implemented on all types, not just `Sized`. The methods
+in this trait operate by various mechanisms, including:
+
+- normal `&`/`&mut` borrows
+- the `Borrow` and `BorrowMut` traits
+- the `AsRef` and `AsMut` traits
+- the `Deref` and `DerefMut` traits
+**/
+pub trait PipeRef {
+	/// Pipes a reference into a function that cannot ordinarily be called in
+	/// suffix position.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: A reference to any value. `.pipe_ref` takes it by reference
+	///   so that the `.pipe_ref` call will not artificially truncate the
+	///   lifetime of `self`.
+	/// - `func`: Any function, which receives `&self` as its first and only
+	///   parameter. This function may return any value, including a borrow of
+	///   `self`, as long as it has an equal or greater lifetime than `self`.
+	///
+	/// # Type Parameters
+	///
+	/// - `R`: The return value of `func`. This must have a lifetime of at least
+	///   `'a`, up to and including `'static` and unconstrained (borrow-less
+	///   value).
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The lifetime of the `self` value. `.pipe_ref` borrows `self` for
+	///   the duration `'a`, and extends it through the return value of `func`.
+	#[inline(always)]
+	fn pipe_ref<'a, R>(&'a self, func: impl FnOnce(&'a Self) -> R) -> R
+	where R: 'a + Sized {
+		func(self)
+	}
+
+	/// Pipes a mutable reference into a function that cannot ordinarily be
+	/// called in suffix position.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`: A mutable reference to any value. `.pipe_mut` takes it by
+	///   reference so that the `.pipe_mut` call will not artificially truncate
+	///   the lifetime of `self`.
+	/// - `func`: Any function, which receives `&mut self` as its first and only
+	///   parameter. This funtion may return any value, including a borrow of
+	///   `self`, as long as it has an equal or greater lifetime than `self`.
+	///
+	/// # Type Parameters
+	///
+	/// - `R`: The return value of `func`. This must have a lifetime of at least
+	///   `'a`, up to and including `'static` and unconstrained (borrow-less
+	///   value).
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The lifetime of the `self` value. `.pipe_mut` borrows `self` for
+	///   the duration `'a`, and extends it through the return value of `func`.
+	#[inline(always)]
+	fn pipe_mut<'a, R>(&'a mut self, func: impl FnOnce(&'a mut Self) -> R) -> R
+	where R: 'a + Sized {
+		func(self)
+	}
+}
+
+/// Calls the `Borrow` or `BorrowMut` traits before piping.
+pub trait PipeBorrow {
+	/// Pipes a trait borrow into a function that cannot normally be called in
+	/// suffix position.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: A borrow of the receiver. By automatically borrowing, this
+	///   pipe call ensures that the lifetime of the origin object is not
+	///   artificially truncated.
+	/// - `func`: A function which receives a trait-directed borrow of the
+	///   receiver’s value type. Before this function is called, `<Self as
+	///   Borrow<T>::borrow>` is called on the `self` reference, and the output
+	///   of that trait borrow is passed to `func`.
+	///
+	/// # Type Parameters
+	///
+	/// - `T`: The type to which `self` `Borrow`s. This is required to be
+	///   defined as a method type parameter so that you can disambiguate at
+	///   call time.
+	/// - `R`: The return type of `func`.
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The lifetime of the `self` value. `.pipe_mut` borrows `self` for
+	///   the duration `'a`, and extends it through the return value of `func`.
+	#[inline(always)]
+	fn pipe_borrow<'a, T, R>(&'a self, func: impl FnOnce(&'a T) -> R) -> R
+	where
+		Self: Borrow<T>,
+		T: 'a,
+		R: 'a + Sized,
+	{
+		func(Borrow::<T>::borrow(self))
+	}
+
+	/// Pipes a trait mutable borrow into a function that cannot normally be
+	/// called in suffix position.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`: A mutable borrow of the receiver. By automatically
+	///   borrowing, this pipe call ensures that the lifetime of the origin
+	///   object is not artificially truncated.
+	/// - `func`: A function which receives a trait-directed borrow of the
+	///   receiver’s value type. Before this function is called, `<Self as
+	///   BorrowMut<T>::borrow_mut>` is called on the `self` reference, and the
+	///   output of that trait borrow is passed to `func`.
+	///
+	/// # Type Parameters
+	///
+	/// - `T`: The type to which `self` borrows. This is required to be defined
+	///   as a method type parameter so that you can disambiguate at call time.
+	/// - `R`: The return type of `func`.
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The lifetime of the `self` value. `.pipe_mut` borrows `self` for
+	///   the duration `'a`, and extends it through the return value of `func`.
+	#[inline(always)]
+	fn pipe_borrow_mut<'a, T, R>(
+		&'a mut self,
+		func: impl FnOnce(&'a mut T) -> R,
+	) -> R
+	where
+		Self: BorrowMut<T>,
+		T: 'a,
+		R: 'a + Sized,
+	{
+		func(BorrowMut::<T>::borrow_mut(self))
+	}
+}
+
+/// Calls the `AsRef` or `AsMut` traits before piping.
+pub trait PipeAsRef {
+	/// Pipes a trait borrow into a function that cannot normally be called in
+	/// suffix position.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: This borrows `self` for the same reasons as described in the
+	///   other methods.
+	/// - `func`: A function as described in the other methods. This receives
+	///   the result of `AsRef::<T>::as_ref`.
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The lifetime of the `self` value. `.pipe_mut` borrows `self` for
+	///   the duration `'a`, and extends it through the return value of `func`.
+	#[inline(always)]
+	fn pipe_as_ref<'a, T, R>(&'a self, func: impl FnOnce(&'a T) -> R) -> R
+	where
+		Self: AsRef<T>,
+		T: 'a,
+		R: 'a + Sized,
+	{
+		func(AsRef::<T>::as_ref(self))
+	}
+
+	/// Pipes a trait mutable borrow into a function that cannot normally be
+	/// called in suffix position.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`: This borrows `self` for the same reasons as described in
+	///   the other methods.
+	/// - `func`: A function as described in the other methods. This receives
+	///   the result of `AsMut::<T>::as_mut`.
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The lifetime of the `self` value. `.pipe_mut` borrows `self` for
+	///   the duration `'a`, and extends it through the return value of `func`.
+	#[inline(always)]
+	fn pipe_as_mut<'a, T, R>(
+		&'a mut self,
+		func: impl FnOnce(&'a mut T) -> R,
+	) -> R
+	where
+		Self: AsMut<T>,
+		T: 'a,
+		R: 'a + Sized,
+	{
+		func(AsMut::<T>::as_mut(self))
+	}
+}
+
+/// Calls the `Deref` or `DerefMut` traits before piping.
+pub trait PipeDeref {
+	/// Pipes a dereference into a function that cannot normally be called in
+	/// suffix position.
+	///
+	/// # Parameters
+	///
+	/// - `&self`: This borrows `self` for the same reasons as described in the
+	/// - `func`: A function as described in the other methods. This receives
+	///   the result of `Deref::deref`.
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The lifetime of the `self` value. `.pipe_mut` borrows `self` for
+	///   the duration `'a`, and extends it through the return value of `func`.
+	#[inline(always)]
+	fn pipe_deref<'a, R>(
+		&'a self,
+		func: impl FnOnce(&'a <Self as Deref>::Target) -> R,
+	) -> R
+	where
+		Self: Deref,
+		R: 'a + Sized,
+	{
+		func(Deref::deref(self))
+	}
+
+	/// Pipes a mutable dereference into a function that cannot normally be
+	/// called in suffix position.
+	///
+	/// # Parameters
+	///
+	/// - `&mut self`: This mutably borrows `self` for the same reasons as
+	///   described in the other methods.
+	/// - `func`: A function as described in the other methods. This receives
+	///   the result of `DerefMut::deref`.
+	///
+	/// # Lifetimes
+	///
+	/// - `'a`: The lifetime of the `self` value. `.pipe_mut` borrows `self` for
+	///   the duration `'a`, and extends it through the return value of `func`.
+	#[inline(always)]
+	fn pipe_deref_mut<'a, R>(
+		&'a mut self,
+		func: impl FnOnce(&'a mut <Self as Deref>::Target) -> R,
+	) -> R
+	where
+		Self: DerefMut,
+		R: 'a + Sized,
+	{
+		func(DerefMut::deref_mut(self))
+	}
+}
+
+impl<T: Sized> Pipe for T {
+}
+
+impl<T> PipeRef for T {
+}
+
+impl<T> PipeBorrow for T {
+}
+
+impl<T> PipeAsRef for T {
+}
+
+impl<T> PipeDeref for T {
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/tap.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/tap.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/wyz/src/tap.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/wyz/src/tap.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,913 @@
+/*! Object Tapping
+
+This crate provides traits for transparently inserting operations into a method
+chain. All traits take and return the object on which they act by value, and run
+a provided function on a borrow of the value.
+
+This allows methods that do not chain (such as mutators with `&mut self -> ()`
+signatures) to be chained.
+
+The traits in this crate provide methods that run some function, `Fn(&T)` or
+`Fn(&mut T)`, on a value `T` without changing the binding status of that value.
+
+# Value Tapping
+
+The primary trait of this crate is [`Tap`], which provides two methods: [`tap`]
+and [`tap_mut`]. These provide immutable or mutable, respectively, borrows of
+the tapped value to a user-provided function. The user function must not have a
+return value.
+
+This permits using inspector-style (`Fn(&Self)`) or mutator-style
+(`Fn(&mut Self)`) functions in a method chain without breaks or reduction of
+access to the main value.
+
+Tap methods never change the type of the object on which they are called. The
+`mut`-suffixed methods *are* permitted to change the *value* of their object.
+
+# Trait Tapping
+
+Rust does not have subtyping in the object-oriented sense; rather, it uses
+traits to indicate relationships between types and bring behavior of an interior
+type to the exterior type. This crate provides taps that use the standard
+conversion traits in order to assist in running tap methods generically.
+
+## Borrowed Tapping
+
+The traits `std::borrow::Borrow` and `std::borrow::BorrowMut` allow container
+types to behave as their contained types in borrowed contexts. The [`TapBorrow`]
+trait provides methods, [`tap_borrow`] and [`tap_borrow_mut`], which depend on
+`Borrow` and `BorrowMut`, respectively, to run the user-provided function on the
+borrowed interior type.
+
+This is useful for inspecting the interior of a `Cow` or other data structures
+that abstract away the exact container type but provide uniform access to the
+underlying data.
+
+## Polymorphic Tapping
+
+The traits `std::convert::AsRef` and `std::convert::AsMut` allow composed types
+to be used by reference as their component types. The [`TapAsRef`] trait
+provides methods, [`tap_ref`] and [`tap_ref_mut`], which depend on `AsRef` and
+`AsMut`, respectively, to run the user-provided function on the referred
+component type.
+
+This is useful for working with types like `Path`, which are commonly used as
+generic targets such as `<P: AsRef<Path>>`. All such types `P` may have
+`.tap_ref` called upon them with methods implemented on `Path`.
+
+> Note: `Borrow` and `AsRef` are generic traits, which a type can implement many
+> times with different targets. As such, the referent type must be specified in
+> the tapped function. This can be done with a named method, or by marking the
+> type of the closure argument: `|x: &Referent| ...`.
+
+## Dereferenced Tapping
+
+The traits `std::ops::Deref` and `std::ops::DerefMut` may be used to make owning
+containers transparently defer to their contained data. This is used by `Vec`
+and `String`, for example, to behave like `[T]` and `str` implicitly.
+
+The [`TapDeref`] trait provides [`tap_deref`] and [`tap_deref_mut`] which call
+`Deref` or `DerefMut`, respectively, on the tapped value before running the
+provided function on the produced `Deref::Target` value.
+
+Since `Deref` may only be implemented once, this trait does not require any
+extra type information in its tap calls.
+
+# Conditional Tapping
+
+Additional traits are provided to only invoke the tap when certain conditions
+are met in the value being tapped.
+
+## Boolean Tapping
+
+The [`TapBool`] trait, with methods [`tap_true`], [`tap_false`], and their
+associated `_mut` variants, run the provided function only when the value is of
+the correct variant. This trait is implemented on `bool` by default, and is
+left open so that user crates may implement it on their own `bool`-like types.
+
+## Optional Tapping
+
+The [`TapOption`] trait, with methods [`tap_some`], [`tap_some_mut`], and
+[`tap_none`], run the provided function only when the `Option` is of the
+matching variant. The `tap_some` methods pass `&T` or `&mut T` to their
+function; `tap_none` passes nothing.
+
+Note that `tap_some_mut` may change the value of the inner object, but it cannot
+change the `Option` from `Some` to `None`. If this behavior is desired, use
+`tap_mut` to modify the `Option` wrapper directly, rather than `tap_some_mut` to
+change the interior value.
+
+## Result Tapping
+
+This acts exactly like `TapOption`, except that the alternate case has a value
+that may be modified. It thus has methods [`tap_ok`], [`tap_err`], and the
+associated `_mut` variants.
+
+## Debug Tapping
+
+All methods in the crate have a sibling method with the exact same name and
+signature, except that the name is suffixed with `_dbg`. This method runs the
+normal tap in a debug build, and is removed in release builds.
+
+```rust
+# macro_rules! debug {
+#   ( $( $t:tt )* ) => { eprintln!( $( $t )* ) };
+# }
+use wyz::tap::TapOption;
+
+Some(5i32).tap_some_dbg(|n| debug!("{}", n));
+```
+
+This emits a debug trace when the crate is built in debug mode, and does nothing
+when the crate is built in release mode.
+
+# Usage
+
+Import the trait or traits you wish to use, with `use wyz::tap::Tap;`, and then
+attach `.tap` methods on the end of any expression you want to inspect or
+modify. These methods never change the type or binding status of the object to
+which they are attached, and can be added or removed without affecting
+neighboring code.
+
+# Examples
+
+This uses `tap_mut` to modify a vector using methods that cannot be chained, and
+without converting to an iterator and re-collecting.
+
+```rust
+use wyz::tap::Tap;
+
+let v = vec![5, 1, 2, 4, 3]
+  .tap_mut(|v| v.sort())
+  .tap_mut(|v| v.iter_mut().for_each(|e| *e *= 2))
+  .tap_mut(|v| v.reverse());
+assert_eq!(&v, &[10, 8, 6, 4, 2]);
+```
+
+This uses `tap_some` to implement a conditional flag.
+
+```rust
+use wyz::tap::TapOption;
+
+let mut flag = false;
+
+let n = None::<i32>.tap_some(|_| flag = true);
+assert!(n.is_none());
+assert!(!flag);
+
+let n: Option<i32> = Some(1).tap_some(|_| flag = true);
+assert_eq!(n.unwrap(), 1);
+assert!(flag);
+```
+
+And this uses `tap_err` to log errors without suppressing them.
+
+```rust
+# use std::fmt::Display;
+use wyz::tap::TapResult;
+
+let mut err_ct = 0;
+
+{
+ let mut action = |e: &&str| {
+  err_ct += 1;
+  eprintln!("ERROR: {}", e);
+ };
+
+ Ok::<_, &str>("success").tap_err(&mut action);
+ Err::<(), _>("failure").tap_err(&mut action);
+} // I didn't want to write the closure twice
+
+assert_eq!(err_ct, 1);
+//  printed "ERROR: failure"
+```
+
+[`Tap`]: trait.Tap.html
+[`TapAsRef`]: trait.TapAsRef.html
+[`TapBorrow`]: trait.TapBorrow.html
+[`TapDeref`]: trait.TapDeref.html
+[`TapOption`]: trait.TapOption.html
+[`TapResult`]: trait.TapResult.html
+[`tap`]: trait.Tap.html#method.tap
+[`tap_borrow`]: trait.TapBorrow.html#method.tap_borrow
+[`tap_borrow_mut`]: trait.TapBorrow.html#method.tap_borrow_mut
+[`tap_deref`]: trait.TapDeref.html#method.tap_deref
+[`tap_deref_mut`]: trait.TapDeref.html#method.tap_deref_mut
+[`tap_err`]: trait.TapResult.html#method.tap_err
+[`tap_mut`]: trait.Tap.html#method.tap_mut
+[`tap_none`]: trait.TapOption.html#method.tap_none
+[`tap_ok`]: trait.TapResult.html#method.tap_ok
+[`tap_ref`]: trait.TapAsRef.html#method.tap_ref
+[`tap_ref_mut`]: trait.TapAsRef.html#method.tap_ref_mut
+[`tap_some`]: trait.TapOption.html#method.tap_some
+[`tap_some_mut`]: trait.TapOption.html#method.tap_some_mut
+!*/
+
+use core::{
+	borrow::{
+		Borrow,
+		BorrowMut,
+	},
+	ops::{
+		Deref,
+		DerefMut,
+	},
+};
+
+/** Value Tap
+
+This trait allows any function that takes a borrowed value to be run on a value
+directly, without downgrading the binding.
+
+# Examples
+
+Sorting a vector is a quintessential example of operations that break the flow
+of handling a value. It cannot be done in the middle of an operation, because it
+has the signature `&mut self -> ()`.
+
+```rust
+use wyz::tap::Tap;
+
+let v = vec![5, 1, 4, 2, 3]
+  .tap_mut(|v| v.sort())
+  .tap_mut(|v| v.reverse())
+  .tap_mut(|v| v.iter_mut().for_each(|elt| *elt *= 2));
+assert_eq!(&v, &[10, 8, 6, 4, 2]);
+```
+
+Note that because `sort` and `reverse` are actually methods on `[T: Ord]`, not
+on `Vec<T: Ord>`, they cannot be listed by name in the `tap_mut` call. Their
+signature is `&mut [T: Ord] -> ()`, but `tap_mut` provides a `&mut Vec<T: Ord>`,
+and deref-coercion does not apply to named functions. The [`TapDeref`] trait
+allows this to work.
+
+[`TapDeref`]: trait.TapDeref.html
+**/
+pub trait Tap: Sized {
+	/// Provides immutable access for inspection.
+	///
+	/// This is most useful for inserting passive inspection points into an
+	/// expression, such as for logging or counting.
+	///
+	/// # Examples
+	///
+	/// This demonstrates the use of `tap` to inspect a value and log it as it
+	/// is transformed.
+	///
+	/// ```rust
+	/// use wyz::tap::Tap;
+	///
+	/// fn make_value() -> i32 { 5 }
+	/// fn alter_value(n: i32) -> i32 { n * 3 }
+	///
+	/// let mut init_flag = false;
+	/// let mut fini_flag = false;
+	/// let finished = make_value()
+	///   .tap(|n| init_flag = *n == 5)
+	///   .tap_mut(|n| *n = alter_value(*n))
+	///   .tap(|n| fini_flag = *n == 15);
+	///
+	/// assert!(init_flag);
+	/// assert!(fini_flag);
+	/// assert_eq!(finished, 15);
+	/// ```
+	///
+	/// This example is somewhat contrived, since `tap` is most useful for
+	/// logging values with `eprintln!` or the `log` crate and those are hard to
+	/// nicely demonstrate in tests.
+	fn tap<F, R>(self, func: F) -> Self
+	where
+		F: FnOnce(&Self) -> R,
+		R: Sized,
+	{
+		func(&self);
+		self
+	}
+
+	/// Calls `tap` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	#[cfg_attr(not(debug_assertions), allow(unused_variables))]
+	fn tap_dbg<F, R>(self, func: F) -> Self
+	where
+		F: FnOnce(&Self) -> R,
+		R: Sized,
+	{
+		#[cfg(debug_assertions)]
+		return self.tap(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Provides mutable access for modification.
+	///
+	/// This is most useful for transforming mutator methods of the kind
+	/// `&mut self -> ()` and making them fit in value chains of `self -> Self`.
+	///
+	/// # Examples
+	///
+	/// Append to a string without a `let mut` statement.
+	///
+	/// ```rust
+	/// use wyz::tap::Tap;
+	/// let full: String = "Hello".to_owned()
+	///   .tap_mut(|s| s.push_str(", reader!"));
+	/// assert_eq!(full, "Hello, reader!");
+	/// ```
+	fn tap_mut<F, R>(mut self, func: F) -> Self
+	where
+		F: FnOnce(&mut Self) -> R,
+		R: Sized,
+	{
+		func(&mut self);
+		self
+	}
+
+	/// Calls `tap_mut` in debug builds, and does nothing in release builds.
+	#[allow(unused_mut, unused_variables)]
+	#[cfg_attr(not(debug_assertions), allow(unused_variables))]
+	fn tap_mut_dbg<F, R>(self, func: F) -> Self
+	where
+		F: FnOnce(&mut Self) -> R,
+		R: Sized,
+	{
+		#[cfg(debug_assertions)]
+		return self.tap_mut(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+}
+
+impl<T: Sized> Tap for T {
+}
+
+/** Borrowing Tap
+
+This trait runs the [`Borrow`] or [`BorrowMut`] trait on the caller, and passes
+the borrowed output of it to the action. This permits passing methods defined on
+a supertype to the tap of a subtype.
+
+Because a type may implement `Borrow` multiple times, the function passed to
+`.tap_borrow` must specify its argument type. This can be done by providing the
+name of an explicitly typed function, or by typing a closure’s argument.
+
+# Examples
+
+```rust
+use wyz::tap::{Tap, TapBorrow};
+let v = vec![5, 1, 4, 2, 3]
+  .tap_borrow_mut(<[i32]>::sort)
+  .tap_mut(|v| v.reverse());
+assert_eq!(&v, &[5, 4, 3, 2, 1]);
+```
+
+`tap_mut` on a `Vec<T>` cannot call functions defined in `impl [T]`;
+`tap_borrow_mut` can, because `Vec<T>` implements `Borrow<[T]>`.
+
+[`Borrow`]: https://doc.rust-lang.org/stable/core/borrow/trait.Borrow.html
+[`BorrowMut`]: https://doc.rust-lang.org/stable/core/borrow/trait.BorrowMut.html
+**/
+pub trait TapBorrow<T: ?Sized>: Sized {
+	/// Provides immutable access to the borrow for inspection.
+	///
+	/// This calls `<Self as Borrow<T>>::borrow` on `self`, and calls `func` on
+	/// the resulting borrow.
+	///
+	/// # Examples
+	///
+	/// ```rust
+	/// use std::rc::Rc;
+	/// use wyz::tap::TapBorrow;
+	///
+	/// let mut len = 0;
+	/// let text = Rc::<str>::from("hello")
+	///   .tap_borrow(|s: &str| len = s.len());
+	/// ```
+	fn tap_borrow<F, R>(self, func: F) -> Self
+	where
+		Self: Borrow<T>,
+		F: FnOnce(&T) -> R,
+		R: Sized,
+	{
+		func(Borrow::<T>::borrow(&self));
+		self
+	}
+
+	/// Calls `tap_borrow` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	#[cfg_attr(not(debug_assertions), allow(unused_variables))]
+	fn tap_borrow_dbg<F, R>(self, func: F) -> Self
+	where
+		Self: Borrow<T>,
+		F: FnOnce(&T) -> R,
+		R: Sized,
+	{
+		#[cfg(debug_assertions)]
+		return self.tap_borrow(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Provides mutable access to the borrow for modification.
+	fn tap_borrow_mut<F, R>(mut self, func: F) -> Self
+	where
+		Self: BorrowMut<T>,
+		F: FnOnce(&mut T) -> R,
+		R: Sized,
+	{
+		func(BorrowMut::<T>::borrow_mut(&mut self));
+		self
+	}
+
+	/// Calls `tap_borrow_mut` in debug builds, and does nothing in release
+	/// builds.
+	#[allow(unused_mut, unused_variables)]
+	#[cfg_attr(not(debug_assertions), allow(unused_variables))]
+	fn tap_borrow_mut_dbg<F, R>(self, func: F) -> Self
+	where
+		Self: BorrowMut<T>,
+		F: FnOnce(&mut T) -> R,
+		R: Sized,
+	{
+		#[cfg(debug_assertions)]
+		return self.tap_borrow_mut(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+}
+
+impl<T: Sized, U: ?Sized> TapBorrow<U> for T {
+}
+
+/** Referential Tap
+
+This trait runs the [`AsRef`] or [`AsMut`] trait on the caller, and passes the
+referred output of it to the action. This permits passing methods defined on a
+member value’s type to the tap of an aggregate value.
+
+Due to restrictions in the Rust type system, using these taps on types which
+have multiple implementations of `AsRef` or `AsMut` must specify which
+implementation is desired by setting the type of the receiver of the called
+function.
+
+# Examples
+
+```rust
+use wyz::tap::{Tap, TapAsRef};
+let v = vec![5, 1, 4, 2, 3]
+  .tap_ref_mut(<[i32]>::sort)
+  .tap_mut(|v| v.reverse());
+assert_eq!(&v, &[5, 4, 3, 2, 1]);
+```
+
+This example demonstrates disambiguating among multiple implementations.
+
+```rust
+use wyz::tap::TapAsRef;
+
+struct Example {
+ a: [u8; 8],
+ b: [u16; 4],
+}
+impl AsRef<[u8]> for Example {
+ fn as_ref(&self) -> &[u8] {
+  &self.a
+ }
+}
+impl AsRef<[u16]> for Example {
+ fn as_ref(&self) -> &[u16] {
+  &self.b
+ }
+}
+impl AsMut<[u8]> for Example {
+ fn as_mut(&mut self) -> &mut [u8] {
+  &mut self.a
+ }
+}
+impl AsMut<[u16]> for Example {
+ fn as_mut(&mut self) -> &mut [u16] {
+  &mut self.b
+ }
+}
+
+let mut sum = 0usize;
+let e = Example {
+ a: [0, 1, 2, 3, 4, 5, 6, 7],
+ b: [8, 9, 10, 11],
+}
+ .tap_ref(|a: &[u8]| sum += a.iter().sum::<u8>() as usize)
+ .tap_ref(|b: &[u16]| sum += b.iter().sum::<u16>() as usize)
+ .tap_ref_mut(|a: &mut [u8]| a.iter_mut().for_each(|e| *e *= 2))
+ .tap_ref_mut(|b: &mut [u16]| b.iter_mut().for_each(|e| *e *= 2));
+
+assert_eq!(sum, 66);
+assert_eq!(e.a, [0, 2, 4, 6, 8, 10, 12, 14]);
+assert_eq!(e.b, [16, 18, 20, 22]);
+```
+
+[`AsMut`]: https://doc.rust-lang.org/stable/core/convert/trait.AsMut.html
+[`AsRef`]: https://doc.rust-lang.org/stable/core/convert/trait.AsRef.html
+**/
+pub trait TapAsRef<T: ?Sized>: Sized {
+	/// Provides immutable access to the reference for inspection.
+	fn tap_ref<F, R>(self, func: F) -> Self
+	where
+		Self: AsRef<T>,
+		F: FnOnce(&T) -> R,
+	{
+		func(AsRef::<T>::as_ref(&self));
+		self
+	}
+
+	/// Calls `tap_ref` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	#[cfg_attr(not(debug_assertions), allow(unused_variables))]
+	fn tap_ref_dbg<F, R>(self, func: F) -> Self
+	where
+		Self: AsRef<T>,
+		F: FnOnce(&T) -> R,
+	{
+		#[cfg(debug_assertions)]
+		return self.tap_ref(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Provides mutable access to the reference for modification.
+	fn tap_ref_mut<F, R>(mut self, func: F) -> Self
+	where
+		Self: AsMut<T>,
+		F: FnOnce(&mut T) -> R,
+	{
+		func(AsMut::<T>::as_mut(&mut self));
+		self
+	}
+
+	/// Calls `tap_ref_mut` in debug builds, and does nothing in release builds.
+	#[allow(unused_mut, unused_variables)]
+	#[cfg_attr(not(debug_assertions), allow(unused_variables))]
+	fn tap_ref_mut_dbg<F, R>(mut self, func: F) -> Self
+	where
+		Self: AsMut<T>,
+		F: FnOnce(&mut T) -> R,
+	{
+		#[cfg(debug_assertions)]
+		return self.tap_ref_mut(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+}
+
+impl<T: Sized, U: ?Sized> TapAsRef<U> for T {
+}
+
+/** Dereferencing Tap
+
+This trait runs the [`Deref`] or [`DerefMut`] trait on the caller, and passes
+the reborrowed dereference of it to the action. This permits passing methods
+defined on the supertype to the tap of a subtype *by name*, rather than by using
+closure syntax.
+
+Note that the implementation of this trait does not require that the implementor
+also implement `Deref` or `DerefMut`, but the trait methods will cause compiler
+failures at the call site if the `Deref` or `DerefMut` traits are not present.
+
+# Examples
+
+```rust
+use wyz::tap::{Tap, TapDeref};
+let v = vec![5, 1, 4, 2, 3]
+  .tap_deref_mut(<[i32]>::sort)
+  .tap_mut(|v| v.reverse());
+assert_eq!(&v, &[5, 4, 3, 2, 1]);
+```
+
+[`Deref`]: https://doc.rust-lang.org/stable/core/ops/trait.Deref.html
+[`DerefMut`]: https://doc.rust-lang.org/stable/core/ops/trait.DerefMut.html
+**/
+pub trait TapDeref: Sized {
+	/// Immutably dereferences `self` for inspection.
+	fn tap_deref<F, R>(self, func: F) -> Self
+	where
+		Self: Deref,
+		F: FnOnce(&<Self as Deref>::Target) -> R,
+	{
+		func(Deref::deref(&self));
+		self
+	}
+
+	/// Calls `tap_deref` in debug builds, and does nothing in release builds.
+	#[cfg_attr(not(debug_assertions), allow(unused_variables))]
+	fn tap_deref_dbg<F, R>(self, func: F) -> Self
+	where
+		Self: Deref,
+		F: FnOnce(&<Self as Deref>::Target) -> R,
+	{
+		#[cfg(debug_assertions)]
+		return self.tap_deref(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Mutably dereferences `self` for modification.
+	fn tap_deref_mut<F, R>(mut self, func: F) -> Self
+	where
+		Self: DerefMut,
+		F: FnOnce(&mut <Self as Deref>::Target) -> R,
+	{
+		func(DerefMut::deref_mut(&mut self));
+		self
+	}
+
+	/// Calls `tap_deref_mut` in debug builds, and does nothing in release
+	/// builds.
+	#[cfg_attr(not(debug_assertions), allow(unused_variables))]
+	fn tap_deref_mut_dbg<F, R>(self, func: F) -> Self
+	where
+		Self: DerefMut,
+		F: FnOnce(&mut <Self as Deref>::Target) -> R,
+	{
+		#[cfg(debug_assertions)]
+		return self.tap_deref_mut(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+}
+
+impl<T: Sized> TapDeref for T {
+}
+
+/** Optional Tap
+
+This trait allows conditional tapping of `Option` wrappers. The methods only
+invoke their provided function, on the inner type, if the `Option` has the
+correct outer variant.
+**/
+pub trait TapOption<T: Sized>: Sized {
+	/// Provides the interior value for inspection if present.
+	///
+	/// This is equivalent to `.map(|v| { func(&v); v })`.
+	fn tap_some<F: FnOnce(&T) -> R, R>(self, func: F) -> Self;
+
+	/// Calls `tap_some` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	fn tap_some_dbg<F: FnOnce(&T) -> R, R>(self, func: F) -> Self {
+		#[cfg(debug_assertions)]
+		return self.tap_some(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Provides the interior value for modification if present.
+	///
+	/// This is equivalent to `.map(|mut v| { func(&mut v); v })`.
+	fn tap_some_mut<F: FnOnce(&mut T) -> R, R>(self, func: F) -> Self;
+
+	/// Calls `tap_some_mut` in debug builds, and does nothing in release
+	/// builds.
+	#[allow(unused_variables)]
+	fn tap_some_mut_dbg<F: FnOnce(&mut T) -> R, R>(self, func: F) -> Self {
+		#[cfg(debug_assertions)]
+		return self.tap_some_mut(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Runs the provided function if the `Option` is empty.
+	///
+	/// This is equivalent to `.or_else(|| { func(); None })`.
+	fn tap_none<F: FnOnce() -> R, R>(self, func: F) -> Self;
+
+	/// Calls `tap_none` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	fn tap_none_dbg<F: FnOnce() -> R, R>(self, func: F) -> Self {
+		#[cfg(debug_assertions)]
+		return self.tap_none(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+}
+
+impl<T> TapOption<T> for Option<T> {
+	fn tap_some<F: FnOnce(&T) -> R, R>(self, func: F) -> Self {
+		if let Some(val) = self.as_ref() {
+			func(val);
+		}
+		self
+	}
+
+	fn tap_some_mut<F: FnOnce(&mut T) -> R, R>(mut self, func: F) -> Self {
+		if let Some(val) = self.as_mut() {
+			func(val);
+		}
+		self
+	}
+
+	fn tap_none<F: FnOnce() -> R, R>(self, func: F) -> Self {
+		if self.is_none() {
+			func();
+		}
+		self
+	}
+}
+
+/** Result Tap
+
+This trait allows conditional tapping of `Result` wrappers. The methods only
+invoke their provided function, on the inner type, if the `Result` has the
+correct outer variant.
+
+Note that the result value of whichever function you pass to the tapper is
+discarded, so if that function returns a `Result`, an “unused must use� warning
+will be raised! You must explicitly handle or drop a `Result` value if
+your tapper’s function produces one.
+**/
+pub trait TapResult<T: Sized, E: Sized>: Sized {
+	/// Provides the inner value for inspection if the `Result` is `Ok`.
+	fn tap_ok<F: FnOnce(&T) -> R, R>(self, func: F) -> Self;
+
+	/// Calls `tap_ok` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	fn tap_ok_dbg<F: FnOnce(&T) -> R, R>(self, func: F) -> Self {
+		#[cfg(debug_assertions)]
+		return self.tap_ok(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Provides the inner value for modification if the `Result` is `Ok`.
+	fn tap_ok_mut<F: FnOnce(&mut T) -> R, R>(self, func: F) -> Self;
+
+	/// Calls `tap_ok_mut` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	fn tap_ok_mut_dbg<F: FnOnce(&mut T) -> R, R>(self, func: F) -> Self {
+		#[cfg(debug_assertions)]
+		return self.tap_ok_mut(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Provides the inner error value for inspection if the `Result` is `Err`.
+	fn tap_err<F: FnOnce(&E) -> R, R>(self, func: F) -> Self;
+
+	/// Calls `tap_err` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	fn tap_err_dbg<F: FnOnce(&E) -> R, R>(self, func: F) -> Self {
+		#[cfg(debug_assertions)]
+		return self.tap_err(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+
+	/// Provides the inner error value for modification if the `Result` is
+	/// `Err`.
+	fn tap_err_mut<F: FnOnce(&mut E) -> R, R>(self, func: F) -> Self;
+
+	/// Calls `tap_err_mut` in debug builds, and does nothing in release builds.
+	#[allow(unused_variables)]
+	fn tap_err_mut_dbg<F: FnOnce(&mut E) -> R, R>(self, func: F) -> Self {
+		#[cfg(debug_assertions)]
+		return self.tap_err_mut(func);
+		#[cfg(not(debug_assertions))]
+		return self;
+	}
+}
+
+impl<T, E> TapResult<T, E> for Result<T, E> {
+	fn tap_ok<F: FnOnce(&T) -> R, R>(self, func: F) -> Self {
+		if let Ok(val) = self.as_ref() {
+			func(val);
+		}
+		self
+	}
+
+	fn tap_ok_mut<F: FnOnce(&mut T) -> R, R>(mut self, func: F) -> Self {
+		if let Ok(val) = self.as_mut() {
+			func(val);
+		}
+		self
+	}
+
+	fn tap_err<F: FnOnce(&E) -> R, R>(self, func: F) -> Self {
+		if let Err(err) = self.as_ref() {
+			func(err);
+		}
+		self
+	}
+
+	fn tap_err_mut<F: FnOnce(&mut E) -> R, R>(mut self, func: F) -> Self {
+		if let Err(err) = self.as_mut() {
+			func(err);
+		}
+		self
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn tap() {
+		let mut trap = 0;
+		assert_eq!(5.tap(|n| trap += *n), 5);
+		assert_eq!(5.tap_mut(|n| *n += trap), 10);
+	}
+
+	#[cfg(feature = "alloc")]
+	#[test]
+	fn tap_borrow() {
+		use alloc::rc::Rc;
+
+		let mut len = 0;
+		let _ = Rc::<str>::from("hello").tap_borrow(|s: &str| len = s.len());
+		assert_eq!(len, 5);
+
+		let v = alloc::vec![5i32, 1, 2, 4, 3]
+			.tap_borrow_mut(<[i32]>::sort)
+			.tap_borrow_mut(<[i32]>::reverse);
+		assert_eq!(v, &[5, 4, 3, 2, 1])
+	}
+
+	#[test]
+	fn tap_as_ref() {
+		struct Example {
+			a: [u8; 8],
+			b: [u16; 4],
+		}
+		impl AsRef<[u8]> for Example {
+			fn as_ref(&self) -> &[u8] {
+				&self.a
+			}
+		}
+		impl AsRef<[u16]> for Example {
+			fn as_ref(&self) -> &[u16] {
+				&self.b
+			}
+		}
+		impl AsMut<[u8]> for Example {
+			fn as_mut(&mut self) -> &mut [u8] {
+				&mut self.a
+			}
+		}
+		impl AsMut<[u16]> for Example {
+			fn as_mut(&mut self) -> &mut [u16] {
+				&mut self.b
+			}
+		}
+
+		let mut sum_a = 0;
+		let mut sum_b = 0;
+		let e = Example {
+			a: [0, 1, 2, 3, 4, 5, 6, 7],
+			b: [8, 9, 10, 11],
+		}
+		.tap_ref(|a: &[u8]| sum_a = a.iter().sum())
+		.tap_ref(|b: &[u16]| sum_b = b.iter().sum())
+		.tap_ref_mut(|a: &mut [u8]| a.iter_mut().for_each(|e| *e *= 2))
+		.tap_ref_mut(|b: &mut [u16]| b.iter_mut().for_each(|e| *e *= 2));
+
+		assert_eq!(sum_a, 28);
+		assert_eq!(sum_b, 38);
+		assert_eq!(e.a, [0, 2, 4, 6, 8, 10, 12, 14]);
+		assert_eq!(e.b, [16, 18, 20, 22]);
+	}
+
+	#[cfg(feature = "alloc")]
+	#[test]
+	fn tap_deref() {
+		let mut len = 0;
+		let v = alloc::vec![5, 1, 4, 2, 3]
+			.tap_deref(|s| len = s.len())
+			.tap_deref_mut(<[i32]>::sort);
+		assert_eq!(len, 5);
+		assert_eq!(v, [1, 2, 3, 4, 5]);
+	}
+
+	#[test]
+	fn tap_option() {
+		let mut trap = 0;
+
+		None.tap_some(|x: &i32| trap += *x);
+		assert_eq!(trap, 0);
+
+		Some(5).tap_some(|x| trap += *x);
+		assert_eq!(trap, 5);
+
+		assert_eq!(Some(5).tap_some_mut(|x| *x += 5).unwrap(), 10);
+
+		assert!(Some(5).tap_mut(Option::take).is_none());
+	}
+
+	#[test]
+	fn tap_result() {
+		let mut trap = 0;
+
+		assert_eq!(Err(5).tap_ok(|x: &i32| trap += *x).unwrap_err(), 5);
+		assert_eq!(trap, 0);
+		assert_eq!(Err(5).tap_ok_mut(|x: &mut i32| *x += 5).unwrap_err(), 5);
+
+		assert_eq!(Ok::<_, i32>(5).tap_ok(|x: &i32| trap += *x).unwrap(), 5);
+		assert_eq!(trap, 5);
+		assert_eq!(Ok::<_, i32>(5).tap_ok_mut(|x| *x += 5).unwrap(), 10);
+	}
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/.cargo-checksum.json	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.lock":"3753b6af8cf389a8bb96d8efb9129f6d146570b374ff6251c65911d74baa5dc3","Cargo.toml":"95930b0ae89fba14d9070a16bc4bb0157e37514dac03aca914a579a8863390d1","Changelog.md":"743407714e4c326936e491f6fe76fd476565ad01cd808469cb3bff2674e42e12","LICENSE":"0dc18d924dc0a5f41172a393012843a5eaaef338e795b3645da9cc3b6068220b","Readme.md":"66c454517eec06c4505880f87eb0abed422a1a60153f48b337f54a5009f64983","design.md":"59eb3e89c9fe3e2c9e7dfd464ddceb56d8bb0fac7459d5b12d3f304487fdfcde","src/analyze.rs":"82260265a50ac9d0864f6fcf98e5afe2b4f7883cd9c9f82b03cb7a5994d5ac6c","src/attribute.rs":"94cb1270e8247af01114b465bda181840b053942dfb7fb6b70d83d48f37f02e2","src/common.rs":"eb992a05de601209b1ae7b84bffcf965c47c2fdad06f27deeb3c2bd8043f05a7","src/escape.rs":"7df467344114064c3bd731c9e70e45c300f7b2704d6edf6e76daf6b32775b780","src/lib.rs":"9618f9f0ea4097d5826c338aea8562b7c120588c7393f65855c7c5b39674cd9d","src/macros.rs":"8c7f9c18083fceb4af9e27a84d9130888829250c869771cb192eec19941988e0","src/name.rs":"fc0d5c0c1e11e14e06f4549a6ddc58cbf4f91f0272802f18591004daf781940a","src/namespace.rs":"d5e1b4b19025d6237f06e1dec3570f7d4f8301631610a93bb56a958d27999480","src/reader/config.rs":"d6edb01f0ba617a6a04f32998749cc0f3157024a00990bc12225668494b3670d","src/reader/error.rs":"bf6a889e9464f0b981ad5b761af46b53fed203b917265eaa0c439d5937a313f4","src/reader/events.rs":"4a07a3173f2613f6ea5b7880467152238a20de59dda42c95008d50ef80c9c3ed","src/reader/lexer.rs":"c74c6370c1a1eef9cbea847f287dc6d7a2db316c0fa10f6bd370ba166594bdb6","src/reader/mod.rs":"4b7055cb60f736b71dabc91fb99bb1e1bf8429e8bf740f83d5e6e1d64cbe2012","src/reader/parser/inside_cdata.rs":"7217ab332a7e29f8a2282d1bfd4d493465e0d6921e0f9f077634fdcedac331c9","src/reader/parser/inside_closing_tag_name.rs":"595d7888180da8a5ed2003da215be3b8b6521ee0624080b18af4eb3f4a2a6901","src/reader/parser/inside_comment.rs":"1f6b077007422562be7793df0a1d7ace3b2d2afd134e621045cd6650088a438d","src/reader/parser/inside_declaration.rs":"ea00f620e0d2d4fe9024796c80a2b325db2a651fb12467a18ea00f280d83ac48","src/reader/parser/inside_doctype.rs":"c87d1e36aea80ca8443a1a59d5cf2ee32d899c04ccbe38492ce3d02536f8fffd","src/reader/parser/inside_opening_tag.rs":"55c49634886ba41f23ac5f7a8e14f5cb02befb4bf9ea6943b4cc2c31a5569d28","src/reader/parser/inside_processing_instruction.rs":"e9cc8c1f8dd8bb065465659533cf7730d53206a88b06f7385544ccaf54e80368","src/reader/parser/inside_reference.rs":"bb508194c2d7be5540d0ddb7ed061cabee10314c26b063d365b4cfc040da63b2","src/reader/parser/mod.rs":"fcada7c13000b461ac79ad403b8eb2862e455b963074900227d75f92a250887c","src/reader/parser/outside_tag.rs":"1ef0e2b2dab8dcdd84cea00f584a98d386714c12c590dc3cfd578bdce1ddfad8","src/util.rs":"576d7db4550c2c38eb77af6545aebc42dcbe5a81eef190d472202d3ddcd7c97c","src/writer/config.rs":"5348ddda63393425b162b71327413ba6500641604dc5aada12b0f5d01beb0632","src/writer/emitter.rs":"b610bd8d6504f84af96f09cba0e50ee5ecaf9c37549f68297c51cea68d8f1fe3","src/writer/events.rs":"82db3d1c83144fe1abfa5a841de0593cfe85a1cf7b6563f611ef5dd52bb327d0","src/writer/mod.rs":"78c65cf1cf2d286bab3917c4e2c364f6289cdb665ece092422d905d00d1275f9","tests/documents/sample_1.xml":"79c9ba2d71d70906230905cef127ba8c09ae8701c60357d32cf581dbfc660237","tests/documents/sample_1_full.txt":"efc646390dd6693c4122bb4a7d0c77e31bba7fda0e5767aa1de501bddc64174f","tests/documents/sample_1_short.txt":"83ef8cca29ac8e4b20dc9aea182155ad39d090fb08b76b6abe581801211b10e4","tests/documents/sample_2.xml":"c8350272a8c205e4004fc7e10be1660a0e10d2c9dbf044395d52ad2ca08fa03a","tests/documents/sample_2_full.txt":"21a7b53ddfb8eeaf73d0f6d7a1f96b1af3188129d69f6a5fd4d21e6376f2fb7f","tests/documents/sample_2_short.txt":"b94bc0600a84acf0999775d19c5a7169d24f88c74cc605a1f30b981181bacfeb","tests/documents/sample_3.xml":"a29359438fe9ca025f09d62d4b96f51a89d4be9e634767a5bb447d555c75aef8","tests/documents/sample_3_full.txt":"3522aa83d2b0e942e963d234af0b3426ad3c08141d60ccacc18077c67e2b2194","tests/documents/sample_3_short.txt":"57a8cc41ec6fcebf854126b3c9bb933a1de8be6c5b62372e857906314bb8f13f","tests/documents/sample_4.xml":"7c0ae3ee71a9c94afe1a35480a8c3bf58ffe90b754bccf42f83784971584e9b8","tests/documents/sample_4_full.txt":"f4f2419b336b04af9746ee12ac908a9b82cebca8fc280ad5422d0ab5483ee817","tests/documents/sample_4_short.txt":"39e1b7947fc33276347031e12a0a3f0e5a70eee9e743aba7d5c45b08a454cfae","tests/documents/sample_5.xml":"356d33417665fee602eb9399a8fb58e9bfaa634bcadfcd97214302bdc32f33c4","tests/documents/sample_5_short.txt":"9b8e3a9e7a71c55ee30ee85d256b06079e2ea8029207efbfb62ca98add4ce585","tests/documents/sample_6.xml":"83b00033dd8bec7069b2985975c7d6bac11275e89c0742450c285310b1e82ed7","tests/documents/sample_6_full.txt":"4a3768fd7c216767b77962422f9818e9f108d49066eb4895a02552789f5549e2","tests/event_reader.rs":"950eb9462c7a615cd554f14bf41d8fb97ea060ad19f9919a9d7b2c6d0b160e31","tests/event_writer.rs":"6537484b2f7c3f0704583401f9412ccfce6b928417fbd36626135f78f651560f","tests/streaming.rs":"c4126d0862008079576defca591955fb6b998049c8bab1f6b316cf94b48c82ad"},"package":"d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/Cargo.lock	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,23 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.4"
+dependencies = [
+ "doc-comment",
+ "lazy_static",
+]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/Cargo.toml	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,36 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "xml-rs"
+version = "0.8.4"
+authors = ["Vladimir Matveev <vmatveev@citrine.cc>"]
+description = "An XML library in pure Rust"
+documentation = "http://docs.rs/xml-rs/"
+readme = "Readme.md"
+keywords = ["xml", "parsing", "parser"]
+categories = ["parsing"]
+license = "MIT"
+repository = "https://github.com/netvl/xml-rs"
+
+[lib]
+name = "xml"
+path = "src/lib.rs"
+
+[[bin]]
+name = "xml-analyze"
+path = "src/analyze.rs"
+[dev-dependencies.doc-comment]
+version = "0.3"
+
+[dev-dependencies.lazy_static]
+version = "1.2.0"
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/Changelog.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/Changelog.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/Changelog.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/Changelog.md	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,126 @@
+## Version 0.8.4
+
+* Fixed recognition of `?>`, `]]>` and `/>` tokens as characters.
+* Fixed writer output operations to use `write_all` to ensure that the data
+  is written fully.
+* The document declaration is now written before any characters automatically.
+
+## Version 0.8.3
+
+* Added a new parser option, `ignore_root_level_whitespace`, which makes the parser
+  skip emitting whitespace events outside of the root element when set to `true`.
+  This helps with certain tasks like canonicalization.
+
+## Version 0.8.2
+
+* Added a new parser option, `replace_unknown_entity_references`, which allows to ignore
+  invalid Unicode code points and replace them with a Unicode "replacement character"
+  during parsing. This can be helpful to deal with e.g. UTF-16 surrogate pairs.
+* Added a new emitter option, `pad_self_closing`, which determines the style of the self-closing
+  elements when they are emitted: `<a />` (`true`) vs `<a/>` (`false`).
+
+## Version 0.8.1
+
+* Fixed various issues with tests introduced by updates in Rust.
+* Adjusted the lexer to ignore contents of the `<!DOCTYPE>` tag.
+* Removed unnecessary unsafety in tests.
+* Added tests for doc comments in the readme file.
+* Switched to GitHub Actions from Travis CI.
+
+## Version 0.8.0
+
+* Same as 0.7.1, with 0.7.1 being yanked because of the incorrect semver bump.
+
+## Version 0.7.1
+
+* Removed dependency on bitflags.
+* Added the `XmlWriter::inner_mut()` method.
+* Fixed some rustdoc warnings.
+
+## Version 0.7.0
+
+* Same as 0.6.2, with 0.6.2 being yanked because of the incompatible bump of minimum required version of rustc.
+
+## Version 0.6.2
+
+* Bumped `bitflags` to 1.0.
+
+## Version 0.6.1
+
+* Fixed the writer to escape some special characters when writing attribute values.
+
+## Version 0.6.0
+
+* Changed the target type of extra entities from `char` to `String`. This is an incompatible
+  change.
+
+## Version 0.5.0
+
+* Added support for ignoring EOF errors in order to read documents from streams incrementally.
+* Bumped `bitflags` to 0.9.
+
+## Version 0.4.1
+
+* Added missing `Debug` implementation to `xml::writer::XmlEvent`.
+
+## Version 0.4.0
+
+* Bumped version number, since changes introduced in 0.3.7 break backwards compatibility.
+
+## Version 0.3.8
+
+* Fixed a problem introduced in 0.3.7 with entities in attributes causing parsing errors.
+
+## Version 0.3.7
+
+* Fixed the problem with parsing non-whitespace character entities as whitespace (issue #140).
+* Added support for configuring custom entities in the parser configuration.
+
+## Version 0.3.6
+
+* Added an `Error` implementation for `EmitterError`.
+* Fixed escaping of strings with multi-byte code points.
+
+## Version 0.3.5
+
+* Added `Debug` implementation for `XmlVersion`.
+* Fixed some failing tests.
+
+## Version 0.3.3
+
+* Updated `bitflags` to 0.7.
+
+## Version 0.3.2
+
+* Added `From<io::Error>` for `xml::reader::Error`, which improves usability of working with parsing errors.
+
+## Version 0.3.1
+
+* Bumped `bitflags` dependency to 0.4, some internal warning fixes.
+
+## Version 0.3.0
+
+* Changed error handling in `EventReader` - now I/O errors are properly bubbled up from the lexer.
+
+## Version 0.2.4
+
+* Fixed #112 - incorrect handling of namespace redefinitions when writing a document.
+
+## Version 0.2.3
+
+* Added `into_inner()` methods to `EventReader` and `EventWriter`.
+
+## Version 0.2.2
+
+* Using `join` instead of the deprecated `connect`.
+* Added a simple XML analyzer program which demonstrates library usage and can be used to check XML documents for well-formedness.
+* Fixed incorrect handling of unqualified attribute names (#107).
+* Added this changelog.
+
+## Version 0.2.1
+
+* Fixed #105 - incorrect handling of double dashes.
+
+## Version 0.2.0
+
+* Major update, includes proper document writing support and significant architecture changes.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/design.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/design.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/design.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/design.md	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,37 @@
+# Reader
+
+Basic features:
+ * [x] Parsing XML 1.0 documents and returning a stream of events
+   - [ ] Support reading embedded DTD schemas
+   - [ ] Support for embedded entities
+ * [x] Support for namespaces and emitting namespace information in events
+ * [ ] \[maybe\] push-based wrapper
+ * Missing XML features
+   - [ ] Support for different encodings
+   - [ ] Attribute values normalization
+   - [ ] EOL characters normalization
+
+Advanced features:
+ * [ ] DTD schema validation
+ * [ ] XSD schema validation
+
+# Writer
+
+Basic features:
+  * [x] Writing basic XML 1.0 documents in UTF-8
+  * [x] Writing XML 1.0 documents with namespace support
+  * [x] Support for writing elements with empty body as empty elements
+  * [x] Pretty-printed and compact output
+  * [ ] Writing XML document with embedded DTDs and DTD references
+  * Misc features:
+    - [ ] Support for different encodings
+    - [x] Support for writing CDATA as characters
+    - [ ] Checking events for invalid characters (e.g. `--` in comments)
+    - [ ] Check for namespaces more correctly, i.e. check both for prefix and namespace URI
+    - [ ] Support checking namespace prefix presence in the current namespace for events with prefix but without namespace
+    - [ ] Support checking namespace prefix for events with both prefix and namespace URI
+
+# Other
+
+DOM-based API:
+ * [ ] Basic support for DOM-based API
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/LICENSE thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/LICENSE
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/LICENSE	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Vladimir Matveev
+
+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 -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/Readme.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/Readme.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/Readme.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/Readme.md	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,236 @@
+xml-rs, an XML library for Rust
+===============================
+
+[![Build Status][build-status-img]](https://github.com/netvl/xml-rs/actions?query=workflow%3ACI)
+[![crates.io][crates-io-img]](https://crates.io/crates/xml-rs)
+[![docs][docs-img]](https://docs.rs/xml-rs/)
+
+[Documentation](https://docs.rs/xml-rs/)
+
+  [build-status-img]: https://img.shields.io/github/workflow/status/netvl/xml-rs/CI/master?style=flat-square
+  [crates-io-img]: https://img.shields.io/crates/v/xml-rs.svg?style=flat-square
+  [docs-img]: https://img.shields.io/badge/docs-latest%20release-6495ed.svg?style=flat-square
+
+xml-rs is an XML library for [Rust](http://www.rust-lang.org/) programming language.
+It is heavily inspired by Java [Streaming API for XML (StAX)][stax].
+
+  [stax]: https://en.wikipedia.org/wiki/StAX
+
+This library currently contains pull parser much like [StAX event reader][stax-reader].
+It provides iterator API, so you can leverage Rust's existing iterators library features.
+
+  [stax-reader]: http://docs.oracle.com/javase/8/docs/api/javax/xml/stream/XMLEventReader.html
+
+It also provides a streaming document writer much like [StAX event writer][stax-writer].
+This writer consumes its own set of events, but reader events can be converted to
+writer events easily, and so it is possible to write XML transformation chains in a pretty
+clean manner.
+
+  [stax-writer]: http://docs.oracle.com/javase/8/docs/api/javax/xml/stream/XMLEventWriter.html
+
+This parser is mostly full-featured, however, there are limitations:
+* no other encodings but UTF-8 are supported yet, because no stream-based encoding library
+  is available now; when (or if) one will be available, I'll try to make use of it;
+* DTD validation is not supported, `<!DOCTYPE>` declarations are completely ignored; thus no
+  support for custom entities too; internal DTD declarations are likely to cause parsing errors;
+* attribute value normalization is not performed, and end-of-line characters are not normalized too.
+
+Other than that the parser tries to be mostly XML-1.0-compliant.
+
+Writer is also mostly full-featured with the following limitations:
+* no support for encodings other than UTF-8, for the same reason as above;
+* no support for emitting `<!DOCTYPE>` declarations;
+* more validations of input are needed, for example, checking that namespace prefixes are bounded
+  or comments are well-formed.
+
+What is planned (highest priority first, approximately):
+
+0. missing features required by XML standard (e.g. aforementioned normalization and
+   proper DTD parsing);
+1. miscellaneous features of the writer;
+2. parsing into a DOM tree and its serialization back to XML text;
+3. SAX-like callback-based parser (fairly easy to implement over pull parser);
+4. DTD validation;
+5. (let's dream a bit) XML Schema validation.
+
+Building and using
+------------------
+
+xml-rs uses [Cargo](http://crates.io), so just add a dependency section in your project's manifest:
+
+```toml
+[dependencies]
+xml-rs = "0.8"
+```
+
+The package exposes a single crate called `xml`:
+
+```rust
+extern crate xml;
+```
+
+Reading XML documents
+---------------------
+
+`xml::reader::EventReader` requires a `Read` instance to read from. When a proper stream-based encoding
+library is available, it is likely that xml-rs will be switched to use whatever character stream structure
+this library would provide, but currently it is a `Read`.
+
+Using `EventReader` is very straightforward. Just provide a `Read` instance to obtain an iterator
+over events:
+
+```rust,no_run
+extern crate xml;
+
+use std::fs::File;
+use std::io::BufReader;
+
+use xml::reader::{EventReader, XmlEvent};
+
+fn indent(size: usize) -> String {
+    const INDENT: &'static str = "    ";
+    (0..size).map(|_| INDENT)
+             .fold(String::with_capacity(size*INDENT.len()), |r, s| r + s)
+}
+
+fn main() {
+    let file = File::open("file.xml").unwrap();
+    let file = BufReader::new(file);
+
+    let parser = EventReader::new(file);
+    let mut depth = 0;
+    for e in parser {
+        match e {
+            Ok(XmlEvent::StartElement { name, .. }) => {
+                println!("{}+{}", indent(depth), name);
+                depth += 1;
+            }
+            Ok(XmlEvent::EndElement { name }) => {
+                depth -= 1;
+                println!("{}-{}", indent(depth), name);
+            }
+            Err(e) => {
+                println!("Error: {}", e);
+                break;
+            }
+            _ => {}
+        }
+    }
+}
+```
+
+`EventReader` implements `IntoIterator` trait, so you can just use it in a `for` loop directly.
+Document parsing can end normally or with an error. Regardless of exact cause, the parsing
+process will be stopped, and iterator will terminate normally.
+
+You can also have finer control over when to pull the next event from the parser using its own
+`next()` method:
+
+```rust,ignore
+match parser.next() {
+    ...
+}
+```
+
+Upon the end of the document or an error the parser will remember that last event and will always
+return it in the result of `next()` call afterwards. If iterator is used, then it will yield
+error or end-of-document event once and will produce `None` afterwards.
+
+It is also possible to tweak parsing process a little using `xml::reader::ParserConfig` structure.
+See its documentation for more information and examples.
+
+You can find a more extensive example of using `EventReader` in `src/analyze.rs`, which is a
+small program (BTW, it is built with `cargo build` and can be run after that) which shows various
+statistics about specified XML document. It can also be used to check for well-formedness of
+XML documents - if a document is not well-formed, this program will exit with an error.
+
+Writing XML documents
+---------------------
+
+xml-rs also provides a streaming writer much like StAX event writer. With it you can write an
+XML document to any `Write` implementor.
+
+```rust,no_run
+extern crate xml;
+
+use std::fs::File;
+use std::io::{self, Write};
+
+use xml::writer::{EventWriter, EmitterConfig, XmlEvent, Result};
+
+fn handle_event<W: Write>(w: &mut EventWriter<W>, line: String) -> Result<()> {
+    let line = line.trim();
+    let event: XmlEvent = if line.starts_with("+") && line.len() > 1 {
+        XmlEvent::start_element(&line[1..]).into()
+    } else if line.starts_with("-") {
+        XmlEvent::end_element().into()
+    } else {
+        XmlEvent::characters(&line).into()
+    };
+    w.write(event)
+}
+
+fn main() {
+    let mut file = File::create("output.xml").unwrap();
+
+    let mut input = io::stdin();
+    let mut output = io::stdout();
+    let mut writer = EmitterConfig::new().perform_indent(true).create_writer(&mut file);
+    loop {
+        print!("> "); output.flush().unwrap();
+        let mut line = String::new();
+        match input.read_line(&mut line) {
+            Ok(0) => break,
+            Ok(_) => match handle_event(&mut writer, line) {
+                Ok(_) => {}
+                Err(e) => panic!("Write error: {}", e)
+            },
+            Err(e) => panic!("Input error: {}", e)
+        }
+    }
+}
+```
+
+The code example above also demonstrates how to create a writer out of its configuration.
+Similar thing also works with `EventReader`.
+
+The library provides an XML event building DSL which helps to construct complex events,
+e.g. ones having namespace definitions. Some examples:
+
+```rust,ignore
+// <a:hello a:param="value" xmlns:a="urn:some:document">
+XmlEvent::start_element("a:hello").attr("a:param", "value").ns("a", "urn:some:document")
+
+// <hello b:config="name" xmlns="urn:default:uri">
+XmlEvent::start_element("hello").attr("b:config", "value").default_ns("urn:defaul:uri")
+
+// <![CDATA[some unescaped text]]>
+XmlEvent::cdata("some unescaped text")
+```
+
+Of course, one can create `XmlEvent` enum variants directly instead of using the builder DSL.
+There are more examples in `xml::writer::XmlEvent` documentation.
+
+The writer has multiple configuration options; see `EmitterConfig` documentation for more
+information.
+
+Other things
+------------
+
+No performance tests or measurements are done. The implementation is rather naive, and no specific
+optimizations are made. Hopefully the library is sufficiently fast to process documents of common size.
+I intend to add benchmarks in future, but not until more important features are added.
+
+Known issues
+------------
+
+All known issues are present on GitHub issue tracker: <http://github.com/netvl/xml-rs/issues>.
+Feel free to post any found problems there.
+
+License
+-------
+
+This library is licensed under MIT license.
+
+---
+Copyright (C) Vladimir Matveev, 2014-2020
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/analyze.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/analyze.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/analyze.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/analyze.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,99 @@
+#![forbid(unsafe_code)]
+
+extern crate xml;
+
+use std::cmp;
+use std::env;
+use std::io::{self, Read, Write, BufReader};
+use std::fs::File;
+use std::collections::HashSet;
+
+use xml::ParserConfig;
+use xml::reader::XmlEvent;
+
+macro_rules! abort {
+    ($code:expr) => {::std::process::exit($code)};
+    ($code:expr, $($args:tt)+) => {{
+        writeln!(&mut ::std::io::stderr(), $($args)+).unwrap();
+        ::std::process::exit($code);
+    }}
+}
+
+fn main() {
+    let mut file;
+    let mut stdin;
+    let source: &mut Read = match env::args().nth(1) {
+        Some(file_name) => {
+            file = File::open(file_name)
+                .unwrap_or_else(|e| abort!(1, "Cannot open input file: {}", e));
+            &mut file
+        }
+        None => {
+            stdin = io::stdin();
+            &mut stdin
+        }
+    };
+
+    let reader = ParserConfig::new()
+        .whitespace_to_characters(true)
+        .ignore_comments(false)
+        .create_reader(BufReader::new(source));
+
+    let mut processing_instructions = 0;
+    let mut elements = 0;
+    let mut character_blocks = 0;
+    let mut cdata_blocks = 0;
+    let mut characters = 0;
+    let mut comment_blocks = 0;
+    let mut comment_characters = 0;
+    let mut namespaces = HashSet::new();
+    let mut depth = 0;
+    let mut max_depth = 0;
+
+    for e in reader {
+        match e {
+            Ok(e) => match e {
+                XmlEvent::StartDocument { version, encoding, standalone } =>
+                    println!(
+                        "XML document version {}, encoded in {}, {}standalone",
+                        version, encoding, if standalone.unwrap_or(false) { "" } else { "not " }
+                    ),
+                XmlEvent::EndDocument => println!("Document finished"),
+                XmlEvent::ProcessingInstruction { .. } => processing_instructions += 1,
+                XmlEvent::Whitespace(_) => {}  // can't happen due to configuration
+                XmlEvent::Characters(s) => {
+                    character_blocks += 1;
+                    characters += s.len();
+                }
+                XmlEvent::CData(s) => {
+                    cdata_blocks += 1;
+                    characters += s.len();
+                }
+                XmlEvent::Comment(s) => {
+                    comment_blocks += 1;
+                    comment_characters += s.len();
+                }
+                XmlEvent::StartElement { namespace, .. } => {
+                    depth += 1;
+                    max_depth = cmp::max(max_depth, depth);
+                    elements += 1;
+                    namespaces.extend(namespace.0.into_iter().map(|(_, ns_uri)| ns_uri));
+                }
+                XmlEvent::EndElement { .. } => {
+                    depth -= 1;
+                }
+            },
+            Err(e) => abort!(1, "Error parsing XML document: {}", e)
+        }
+    }
+    namespaces.remove(xml::namespace::NS_EMPTY_URI);
+    namespaces.remove(xml::namespace::NS_XMLNS_URI);
+    namespaces.remove(xml::namespace::NS_XML_URI);
+
+    println!("Elements: {}, maximum depth: {}", elements, max_depth);
+    println!("Namespaces (excluding built-in): {}", namespaces.len());
+    println!("Characters: {}, characters blocks: {}, CDATA blocks: {}",
+             characters, character_blocks, cdata_blocks);
+    println!("Comment blocks: {}, comment characters: {}", comment_blocks, comment_characters);
+    println!("Processing instructions (excluding built-in): {}", processing_instructions);
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/attribute.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/attribute.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/attribute.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/attribute.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,99 @@
+//! Contains XML attributes manipulation types and functions.
+//!
+
+use std::fmt;
+
+use name::{Name, OwnedName};
+use escape::escape_str_attribute;
+
+/// A borrowed version of an XML attribute.
+///
+/// Consists of a borrowed qualified name and a borrowed string value.
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct Attribute<'a> {
+    /// Attribute name.
+    pub name: Name<'a>,
+
+    /// Attribute value.
+    pub value: &'a str
+}
+
+impl<'a> fmt::Display for Attribute<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}=\"{}\"", self.name, escape_str_attribute(self.value))
+    }
+}
+
+impl<'a> Attribute<'a> {
+    /// Creates an owned attribute out of this borrowed one.
+    #[inline]
+    pub fn to_owned(&self) -> OwnedAttribute {
+        OwnedAttribute {
+            name: self.name.into(),
+            value: self.value.into(),
+        }
+    }
+
+    /// Creates a borrowed attribute using the provided borrowed name and a borrowed string value.
+    #[inline]
+    pub fn new(name: Name<'a>, value: &'a str) -> Attribute<'a> {
+        Attribute { name, value, }
+    }
+}
+
+/// An owned version of an XML attribute.
+///
+/// Consists of an owned qualified name and an owned string value.
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
+pub struct OwnedAttribute {
+    /// Attribute name.
+    pub name: OwnedName,
+
+    /// Attribute value.
+    pub value: String
+}
+
+impl OwnedAttribute {
+    /// Returns a borrowed `Attribute` out of this owned one.
+    pub fn borrow(&self) -> Attribute {
+        Attribute {
+            name: self.name.borrow(),
+            value: &*self.value,
+        }
+    }
+
+    /// Creates a new owned attribute using the provided owned name and an owned string value.
+    #[inline]
+    pub fn new<S: Into<String>>(name: OwnedName, value: S) -> OwnedAttribute {
+        OwnedAttribute {
+            name,
+            value: value.into(),
+        }
+    }
+}
+
+impl fmt::Display for OwnedAttribute {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}=\"{}\"", self.name, escape_str_attribute(&*self.value))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Attribute};
+
+    use name::Name;
+
+    #[test]
+    fn attribute_display() {
+        let attr = Attribute::new(
+            Name::qualified("attribute", "urn:namespace", Some("n")),
+            "its value with > & \" ' < weird symbols"
+        );
+
+        assert_eq!(
+            &*attr.to_string(),
+            "{urn:namespace}n:attribute=\"its value with &gt; &amp; &quot; &apos; &lt; weird symbols\""
+        )
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/common.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/common.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/common.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/common.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,142 @@
+//! Contains common types and functions used throughout the library.
+
+use std::fmt;
+
+/// Represents a position inside some textual document.
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub struct TextPosition {
+    /// Row, counting from 0
+    pub row: u64,
+    /// Column, counting from 0
+    pub column: u64,
+}
+
+impl TextPosition {
+    /// Creates a new position initialized to the beginning of the document
+    #[inline]
+    pub fn new() -> TextPosition {
+        TextPosition { row: 0, column: 0 }
+    }
+
+    /// Advances the position in a line
+    #[inline]
+    pub fn advance(&mut self, count: u8) {
+        self.column += count as u64;
+    }
+
+    /// Advances the position in a line to the next tab position
+    #[inline]
+    pub fn advance_to_tab(&mut self, width: u8) {
+        let width = width as u64;
+        self.column += width - self.column % width
+    }
+
+    /// Advances the position to the beginning of the next line
+    #[inline]
+    pub fn new_line(&mut self) {
+        self.column = 0;
+        self.row += 1;
+    }
+}
+
+impl fmt::Debug for TextPosition {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}:{}", self.row + 1, self.column + 1)
+    }
+}
+
+impl fmt::Display for TextPosition {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}:{}", self.row + 1, self.column + 1)
+    }
+}
+
+/// Get the position in the document corresponding to the object
+///
+/// This trait is implemented by parsers, lexers and errors.
+pub trait Position {
+    /// Returns the current position or a position corresponding to the object.
+    fn position(&self) -> TextPosition;
+}
+
+impl Position for TextPosition {
+    #[inline]
+    fn position(&self) -> TextPosition {
+        *self
+    }
+}
+
+/// XML version enumeration.
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub enum XmlVersion {
+    /// XML version 1.0.
+    Version10,
+
+    /// XML version 1.1.
+    Version11
+}
+
+impl fmt::Display for XmlVersion {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            XmlVersion::Version10 => write!(f, "1.0"),
+            XmlVersion::Version11 => write!(f, "1.1")
+        }
+    }
+}
+
+impl fmt::Debug for XmlVersion {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+/// Checks whether the given character is a white space character (`S`)
+/// as is defined by XML 1.1 specification, [section 2.3][1].
+///
+/// [1]: http://www.w3.org/TR/2006/REC-xml11-20060816/#sec-common-syn
+pub fn is_whitespace_char(c: char) -> bool {
+    match c {
+        '\x20' | '\x09' | '\x0d' | '\x0a' => true,
+        _ => false
+    }
+}
+
+/// Checks whether the given string is compound only by white space
+/// characters (`S`) using the previous is_whitespace_char to check
+/// all characters of this string
+pub fn is_whitespace_str(s: &str) -> bool {
+    s.chars().all(is_whitespace_char)
+}
+
+/// Checks whether the given character is a name start character (`NameStartChar`)
+/// as is defined by XML 1.1 specification, [section 2.3][1].
+///
+/// [1]: http://www.w3.org/TR/2006/REC-xml11-20060816/#sec-common-syn
+pub fn is_name_start_char(c: char) -> bool {
+    match c {
+        ':' | 'A'...'Z' | '_' | 'a'...'z' |
+        '\u{C0}'...'\u{D6}' | '\u{D8}'...'\u{F6}' | '\u{F8}'...'\u{2FF}' |
+        '\u{370}'...'\u{37D}' | '\u{37F}'...'\u{1FFF}' |
+        '\u{200C}'...'\u{200D}' | '\u{2070}'...'\u{218F}' |
+        '\u{2C00}'...'\u{2FEF}' | '\u{3001}'...'\u{D7FF}' |
+        '\u{F900}'...'\u{FDCF}' | '\u{FDF0}'...'\u{FFFD}' |
+        '\u{10000}'...'\u{EFFFF}' => true,
+        _ => false
+    }
+}
+
+/// Checks whether the given character is a name character (`NameChar`)
+/// as is defined by XML 1.1 specification, [section 2.3][1].
+///
+/// [1]: http://www.w3.org/TR/2006/REC-xml11-20060816/#sec-common-syn
+pub fn is_name_char(c: char) -> bool {
+    match c {
+        _ if is_name_start_char(c) => true,
+        '-' | '.' | '0'...'9' | '\u{B7}' |
+        '\u{300}'...'\u{36F}' | '\u{203F}'...'\u{2040}' => true,
+        _ => false
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/escape.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/escape.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/escape.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/escape.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,126 @@
+//! Contains functions for performing XML special characters escaping.
+
+use std::borrow::Cow;
+
+enum Value {
+    Char(char),
+    Str(&'static str)
+}
+
+impl Value {
+    fn dispatch_for_attribute(c: char) -> Value {
+        match c {
+            '<'  => Value::Str("&lt;"),
+            '>'  => Value::Str("&gt;"),
+            '"'  => Value::Str("&quot;"),
+            '\'' => Value::Str("&apos;"),
+            '&'  => Value::Str("&amp;"),
+            '\n' => Value::Str("&#xA;"),
+            '\r' => Value::Str("&#xD;"),
+            _    => Value::Char(c)
+        }
+    }
+
+    fn dispatch_for_pcdata(c: char) -> Value {
+        match c {
+            '<'  => Value::Str("&lt;"),
+            '&'  => Value::Str("&amp;"),
+            _    => Value::Char(c)
+        }
+    }
+}
+
+enum Process<'a> {
+    Borrowed(&'a str),
+    Owned(String)
+}
+
+impl<'a> Process<'a> {
+    fn process(&mut self, (i, next): (usize, Value)) {
+        match next {
+            Value::Str(s) => match *self {
+                Process::Owned(ref mut o) => o.push_str(s),
+                Process::Borrowed(b) => {
+                    let mut r = String::with_capacity(b.len() + s.len());
+                    r.push_str(&b[..i]);
+                    r.push_str(s);
+                    *self = Process::Owned(r);
+                }
+            },
+            Value::Char(c) => match *self {
+                Process::Borrowed(_) => {}
+                Process::Owned(ref mut o) => o.push(c)
+            }
+        }
+    }
+
+    fn into_result(self) -> Cow<'a, str> {
+        match self {
+            Process::Borrowed(b) => Cow::Borrowed(b),
+            Process::Owned(o) => Cow::Owned(o)
+        }
+    }
+}
+
+impl<'a> Extend<(usize, Value)> for Process<'a> {
+    fn extend<I: IntoIterator<Item=(usize, Value)>>(&mut self, it: I) {
+        for v in it.into_iter() {
+            self.process(v);
+        }
+    }
+}
+
+fn escape_str(s: &str, dispatch: fn(char) -> Value) -> Cow<str> {
+    let mut p = Process::Borrowed(s);
+    p.extend(s.char_indices().map(|(ind, c)| (ind, dispatch(c))));
+    p.into_result()
+}
+
+/// Performs escaping of common XML characters inside an attribute value.
+///
+/// This function replaces several important markup characters with their
+/// entity equivalents:
+///
+/// * `<` → `&lt;`
+/// * `>` → `&gt;`
+/// * `"` → `&quot;`
+/// * `'` → `&apos;`
+/// * `&` → `&amp;`
+///
+/// The resulting string is safe to use inside XML attribute values or in PCDATA sections.
+///
+/// Does not perform allocations if the given string does not contain escapable characters.
+#[inline]
+pub fn escape_str_attribute(s: &str) -> Cow<str> {
+    escape_str(s, Value::dispatch_for_attribute)
+}
+
+/// Performs escaping of common XML characters inside PCDATA.
+///
+/// This function replaces several important markup characters with their
+/// entity equivalents:
+///
+/// * `<` → `&lt;`
+/// * `&` → `&amp;`
+///
+/// The resulting string is safe to use inside PCDATA sections but NOT inside attribute values.
+///
+/// Does not perform allocations if the given string does not contain escapable characters.
+#[inline]
+pub fn escape_str_pcdata(s: &str) -> Cow<str> {
+    escape_str(s, Value::dispatch_for_pcdata)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{escape_str_pcdata, escape_str_attribute};
+
+    // TODO: add more tests
+
+    #[test]
+    fn test_escape_multibyte_code_points() {
+        assert_eq!(escape_str_attribute("☃<"), "☃&lt;");
+        assert_eq!(escape_str_pcdata("☃<"), "☃&lt;");
+    }
+}
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/lib.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,29 @@
+//#![warn(missing_doc)]
+#![allow(dead_code)]
+#![allow(unused_variables)]
+#![forbid(non_camel_case_types)]
+#![forbid(unsafe_code)]
+
+//! This crate currently provides an almost XML 1.0/1.1-compliant pull parser.
+
+#[cfg(doctest)]
+#[macro_use]
+extern crate doc_comment;
+
+#[cfg(doctest)]
+doctest!("../Readme.md");
+
+pub use reader::EventReader;
+pub use reader::ParserConfig;
+pub use writer::EventWriter;
+pub use writer::EmitterConfig;
+
+pub mod macros;
+pub mod name;
+pub mod attribute;
+pub mod common;
+pub mod escape;
+pub mod namespace;
+pub mod reader;
+pub mod writer;
+mod util;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/macros.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/macros.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/macros.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/macros.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,30 @@
+#![macro_use]
+
+//! Contains several macros used in this crate.
+
+macro_rules! gen_setter {
+    ($target:ty, $field:ident : into $t:ty) => {
+        impl $target {
+            /// Sets the field to the provided value and returns updated config object.
+            pub fn $field<T: Into<$t>>(mut self, value: T) -> $target {
+                self.$field = value.into();
+                self
+            }
+        }
+    };
+    ($target:ty, $field:ident : val $t:ty) => {
+        impl $target {
+            /// Sets the field to the provided value and returns updated config object.
+            pub fn $field(mut self, value: $t) -> $target {
+                self.$field = value;
+                self
+            }
+        }
+    }
+}
+
+macro_rules! gen_setters {
+    ($target:ty, $($field:ident : $k:tt $tpe:ty),+) => ($(
+        gen_setter! { $target, $field : $k $tpe }
+    )+)
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/name.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/name.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/name.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/name.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,301 @@
+//! Contains XML qualified names manipulation types and functions.
+//!
+
+use std::fmt;
+use std::str::FromStr;
+
+use namespace::NS_NO_PREFIX;
+
+/// Represents a qualified XML name.
+///
+/// A qualified name always consists at least of a local name. It can optionally contain
+/// a prefix; when reading an XML document, if it contains a prefix, it must also contain a
+/// namespace URI, but this is not enforced statically; see below. The name can contain a
+/// namespace without a prefix; in that case a default, empty prefix is assumed.
+///
+/// When writing XML documents, it is possible to omit the namespace URI, leaving only
+/// the prefix. In this case the writer will check that the specifed prefix is bound to some
+/// URI in the current namespace context. If both prefix and namespace URI are specified,
+/// it is checked that the current namespace context contains this exact correspondence
+/// between prefix and namespace URI.
+///
+/// # Prefixes and URIs
+///
+/// A qualified name with a prefix must always contain a proper namespace URI --- names with
+/// a prefix but without a namespace associated with that prefix are meaningless. However,
+/// it is impossible to obtain proper namespace URI by a prefix without a context, and such
+/// context is only available when parsing a document (or it can be constructed manually
+/// when writing a document). Tying a name to a context statically seems impractical. This
+/// may change in future, though.
+///
+/// # Conversions
+///
+/// `Name` implements some `From` instances for conversion from strings and tuples. For example:
+///
+/// ```rust
+/// # use xml::name::Name;
+/// let n1: Name = "p:some-name".into();
+/// let n2: Name = ("p", "some-name").into();
+///
+/// assert_eq!(n1, n2);
+/// assert_eq!(n1.local_name, "some-name");
+/// assert_eq!(n1.prefix, Some("p"));
+/// assert!(n1.namespace.is_none());
+/// ```
+///
+/// This is added to support easy specification of XML elements when writing XML documents.
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
+pub struct Name<'a> {
+    /// A local name, e.g. `string` in `xsi:string`.
+    pub local_name: &'a str,
+
+    /// A namespace URI, e.g. `http://www.w3.org/2000/xmlns/`.
+    pub namespace: Option<&'a str>,
+
+    /// A name prefix, e.g. `xsi` in `xsi:string`.
+    pub prefix: Option<&'a str>
+}
+
+impl<'a> From<&'a str> for Name<'a> {
+    fn from(s: &'a str) -> Name<'a> {
+        let mut parts = s.splitn(2, ":").fuse();
+        match (parts.next(), parts.next()) {
+            (Some(name), None) => Name::local(name),
+            (Some(prefix), Some(name)) => Name::prefixed(name, prefix),
+            _ => unreachable!()
+        }
+    }
+}
+
+impl<'a> From<(&'a str, &'a str)> for Name<'a> {
+    fn from((prefix, name): (&'a str, &'a str)) -> Name<'a> {
+        Name::prefixed(name, prefix)
+    }
+}
+
+impl<'a> fmt::Display for Name<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if let Some(namespace) = self.namespace {
+            write!(f, "{{{}}}", namespace)?;
+        }
+
+        if let Some(prefix) = self.prefix {
+            write!(f, "{}:", prefix)?;
+        }
+
+        write!(f, "{}", self.local_name)
+    }
+}
+
+impl<'a> Name<'a> {
+    /// Returns an owned variant of the qualified name.
+    pub fn to_owned(&self) -> OwnedName {
+        OwnedName {
+            local_name: self.local_name.into(),
+            namespace: self.namespace.map(|s| s.into()),
+            prefix: self.prefix.map(|s| s.into())
+        }
+    }
+
+    /// Returns a new `Name` instance representing plain local name.
+    #[inline]
+    pub fn local(local_name: &str) -> Name {
+        Name {
+            local_name,
+            prefix: None,
+            namespace: None
+        }
+    }
+
+    /// Returns a new `Name` instance with the given local name and prefix.
+    #[inline]
+    pub fn prefixed(local_name: &'a str, prefix: &'a str) -> Name<'a> {
+        Name {
+            local_name,
+            namespace: None,
+            prefix: Some(prefix)
+        }
+    }
+
+    /// Returns a new `Name` instance representing a qualified name with or without a prefix and
+    /// with a namespace URI.
+    #[inline]
+    pub fn qualified(local_name: &'a str, namespace: &'a str, prefix: Option<&'a str>) -> Name<'a> {
+        Name {
+            local_name,
+            namespace: Some(namespace),
+            prefix,
+        }
+    }
+
+    /// Returns a correct XML representation of this local name and prefix.
+    ///
+    /// This method is different from the autoimplemented `to_string()` because it does not
+    /// include namespace URI in the result.
+    pub fn to_repr(&self) -> String {
+        self.repr_display().to_string()
+    }
+
+    /// Returns a structure which can be displayed with `std::fmt` machinery to obtain this
+    /// local name and prefix.
+    ///
+    /// This method is needed for efficiency purposes in order not to create unnecessary
+    /// allocations.
+    #[inline]
+    pub fn repr_display(&self) -> ReprDisplay {
+        ReprDisplay(self)
+    }
+
+    /// Returns either a prefix of this name or `namespace::NS_NO_PREFIX` constant.
+    #[inline]
+    pub fn prefix_repr(&self) -> &str {
+        self.prefix.unwrap_or(NS_NO_PREFIX)
+    }
+}
+
+/// A wrapper around `Name` whose `Display` implementation prints the wrapped name as it is
+/// displayed in an XML document.
+pub struct ReprDisplay<'a, 'b:'a>(&'a Name<'b>);
+
+impl<'a, 'b:'a> fmt::Display for ReprDisplay<'a, 'b> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.0.prefix {
+            Some(prefix) => write!(f, "{}:{}", prefix, self.0.local_name),
+            None => write!(f, "{}", self.0.local_name)
+        }
+    }
+}
+
+/// An owned variant of `Name`.
+///
+/// Everything about `Name` applies to this structure as well.
+#[derive(Clone, PartialEq, Eq, Hash, Debug)]
+pub struct OwnedName {
+    /// A local name, e.g. `string` in `xsi:string`.
+    pub local_name: String,
+
+    /// A namespace URI, e.g. `http://www.w3.org/2000/xmlns/`.
+    pub namespace: Option<String>,
+
+    /// A name prefix, e.g. `xsi` in `xsi:string`.
+    pub prefix: Option<String>,
+}
+
+impl fmt::Display for OwnedName {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(&self.borrow(), f)
+    }
+}
+
+impl OwnedName {
+    /// Constructs a borrowed `Name` based on this owned name.
+    pub fn borrow(&self) -> Name {
+        Name {
+            local_name: &*self.local_name,
+            namespace: self.namespace.as_ref().map(|s| &**s),
+            prefix: self.prefix.as_ref().map(|s| &**s),
+        }
+    }
+
+    /// Returns a new `OwnedName` instance representing a plain local name.
+    #[inline]
+    pub fn local<S>(local_name: S) -> OwnedName where S: Into<String> {
+        OwnedName {
+            local_name: local_name.into(),
+            namespace: None,
+            prefix: None,
+        }
+    }
+
+    /// Returns a new `OwnedName` instance representing a qualified name with or without
+    /// a prefix and with a namespace URI.
+    #[inline]
+    pub fn qualified<S1, S2, S3>(local_name: S1, namespace: S2, prefix: Option<S3>) -> OwnedName
+        where S1: Into<String>, S2: Into<String>, S3: Into<String>
+    {
+        OwnedName {
+            local_name: local_name.into(),
+            namespace: Some(namespace.into()),
+            prefix: prefix.map(|v| v.into())
+        }
+    }
+
+    /// Returns an optional prefix by reference, equivalent to `self.borrow().prefix`
+    /// but avoids extra work.
+    #[inline]
+    pub fn prefix_ref(&self) -> Option<&str> {
+        self.prefix.as_ref().map(|s| &**s)
+    }
+
+    /// Returns an optional namespace by reference, equivalen to `self.borrow().namespace`
+    /// but avoids extra work.
+    #[inline]
+    pub fn namespace_ref(&self) -> Option<&str> {
+        self.namespace.as_ref().map(|s| &**s)
+    }
+}
+
+impl<'a> From<Name<'a>> for OwnedName {
+    #[inline]
+    fn from(n: Name<'a>) -> OwnedName {
+        n.to_owned()
+    }
+}
+
+impl FromStr for OwnedName {
+    type Err = ();
+
+    /// Parses the given string slice into a qualified name.
+    ///
+    /// This function, when finishes sucessfully, always return a qualified
+    /// name without a namespace (`name.namespace == None`). It should be filled later
+    /// using proper `NamespaceStack`.
+    ///
+    /// It is supposed that all characters in the argument string are correct
+    /// as defined by the XML specification. No additional checks except a check
+    /// for emptiness are done.
+    fn from_str(s: &str) -> Result<OwnedName, ()> {
+        let mut it = s.split(':');
+
+        let r = match (it.next(), it.next(), it.next()) {
+            (Some(prefix), Some(local_name), None) if !prefix.is_empty() &&
+                                                      !local_name.is_empty() =>
+                Some((local_name.into(), Some(prefix.into()))),
+            (Some(local_name), None, None) if !local_name.is_empty() =>
+                Some((local_name.into(), None)),
+            (_, _, _) => None
+        };
+        r.map(|(local_name, prefix)| OwnedName {
+            local_name,
+            namespace: None,
+            prefix
+        }).ok_or(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::OwnedName;
+
+    #[test]
+    fn test_owned_name_from_str() {
+        assert_eq!("prefix:name".parse(), Ok(OwnedName {
+            local_name: "name".into(),
+            namespace: None,
+            prefix: Some("prefix".into())
+        }));
+
+        assert_eq!("name".parse(), Ok(OwnedName {
+            local_name: "name".into(),
+            namespace: None,
+            prefix: None
+        }));
+
+        assert_eq!("".parse(), Err::<OwnedName, ()>(()));
+        assert_eq!(":".parse(), Err::<OwnedName, ()>(()));
+        assert_eq!(":a".parse(), Err::<OwnedName, ()>(()));
+        assert_eq!("a:".parse(), Err::<OwnedName, ()>(()));
+        assert_eq!("a:b:c".parse(), Err::<OwnedName, ()>(()));
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/namespace.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/namespace.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/namespace.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/namespace.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,485 @@
+//! Contains namespace manipulation types and functions.
+
+use std::iter::{Map, Rev};
+use std::collections::btree_map::{BTreeMap, Entry};
+use std::collections::btree_map::Iter as Entries;
+use std::collections::HashSet;
+use std::slice::Iter;
+
+/// Designates prefix for namespace definitions.
+///
+/// See [Namespaces in XML][namespace] spec for more information.
+///
+///   [namespace]: http://www.w3.org/TR/xml-names/#ns-decl
+pub const NS_XMLNS_PREFIX: &'static str = "xmlns";
+
+/// Designates the standard URI for `xmlns` prefix.
+///
+/// See [A Namespace Name for xmlns Attributes][1] for more information.
+///
+///   [namespace]: http://www.w3.org/2000/xmlns/
+pub const NS_XMLNS_URI: &'static str    = "http://www.w3.org/2000/xmlns/";
+
+/// Designates prefix for a namespace containing several special predefined attributes.
+///
+/// See [2.10 White Space handling][1],  [2.1 Language Identification][2],
+/// [XML Base specification][3] and [xml:id specification][4] for more information.
+///
+///   [1]: http://www.w3.org/TR/REC-xml/#sec-white-space
+///   [2]: http://www.w3.org/TR/REC-xml/#sec-lang-tag
+///   [3]: http://www.w3.org/TR/xmlbase/
+///   [4]: http://www.w3.org/TR/xml-id/
+pub const NS_XML_PREFIX: &'static str   = "xml";
+
+/// Designates the standard URI for `xml` prefix.
+///
+/// See `NS_XML_PREFIX` documentation for more information.
+pub const NS_XML_URI: &'static str      = "http://www.w3.org/XML/1998/namespace";
+
+/// Designates the absence of prefix in a qualified name.
+///
+/// This constant should be used to define or query default namespace which should be used
+/// for element or attribute names without prefix. For example, if a namespace mapping
+/// at a particular point in the document contains correspondence like
+///
+/// ```none
+///   NS_NO_PREFIX  -->  urn:some:namespace
+/// ```
+///
+/// then all names declared without an explicit prefix `urn:some:namespace` is assumed as
+/// a namespace URI.
+///
+/// By default empty prefix corresponds to absence of namespace, but this can change either
+/// when writing an XML document (manually) or when reading an XML document (based on namespace
+/// declarations).
+pub const NS_NO_PREFIX: &'static str    = "";
+
+/// Designates an empty namespace URI, which is equivalent to absence of namespace.
+///
+/// This constant should not usually be used directly; it is used to designate that
+/// empty prefix corresponds to absent namespace in `NamespaceStack` instances created with
+/// `NamespaceStack::default()`. Therefore, it can be used to restore `NS_NO_PREFIX` mapping
+/// in a namespace back to its default value.
+pub const NS_EMPTY_URI: &'static str    = "";
+
+/// Namespace is a map from prefixes to namespace URIs.
+///
+/// No prefix (i.e. default namespace) is designated by `NS_NO_PREFIX` constant.
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub struct Namespace(pub BTreeMap<String, String>);
+
+impl Namespace {
+    /// Returns an empty namespace.
+    #[inline]
+    pub fn empty() -> Namespace { Namespace(BTreeMap::new()) }
+
+    /// Checks whether this namespace is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Checks whether this namespace is essentially empty, that is, it does not contain
+    /// anything but default mappings.
+    pub fn is_essentially_empty(&self) -> bool {
+        // a shortcut for a namespace which is definitely not empty
+        if self.0.len() > 3 { return false; }
+
+        self.0.iter().all(|(k, v)| match (&**k, &**v) {
+            (NS_NO_PREFIX,    NS_EMPTY_URI) => true,
+            (NS_XMLNS_PREFIX, NS_XMLNS_URI) => true,
+            (NS_XML_PREFIX,   NS_XML_URI)   => true,
+            _ => false
+        })
+    }
+
+    /// Checks whether this namespace mapping contains the given prefix.
+    ///
+    /// # Parameters
+    /// * `prefix`  --- namespace prefix.
+    ///
+    /// # Return value
+    /// `true` if this namespace contains the given prefix, `false` otherwise.
+    #[inline]
+    pub fn contains<P: ?Sized+AsRef<str>>(&self, prefix: &P) -> bool {
+        self.0.contains_key(prefix.as_ref())
+    }
+
+    /// Puts a mapping into this namespace.
+    ///
+    /// This method does not override any already existing mappings.
+    ///
+    /// Returns a boolean flag indicating whether the map already contained
+    /// the given prefix.
+    ///
+    /// # Parameters
+    /// * `prefix` --- namespace prefix;
+    /// * `uri`    --- namespace URI.
+    ///
+    /// # Return value
+    /// `true` if `prefix` has been inserted successfully; `false` if the `prefix`
+    /// was already present in the namespace.
+    pub fn put<P, U>(&mut self, prefix: P, uri: U) -> bool
+        where P: Into<String>, U: Into<String>
+    {
+        match self.0.entry(prefix.into()) {
+            Entry::Occupied(_) => false,
+            Entry::Vacant(ve) => {
+                ve.insert(uri.into());
+                true
+            }
+        }
+    }
+
+    /// Puts a mapping into this namespace forcefully.
+    ///
+    /// This method, unlike `put()`, does replace an already existing mapping.
+    ///
+    /// Returns previous URI which was assigned to the given prefix, if it is present.
+    ///
+    /// # Parameters
+    /// * `prefix` --- namespace prefix;
+    /// * `uri`    --- namespace URI.
+    ///
+    /// # Return value
+    /// `Some(uri)` with `uri` being a previous URI assigned to the `prefix`, or
+    /// `None` if such prefix was not present in the namespace before.
+    pub fn force_put<P, U>(&mut self, prefix: P, uri: U) -> Option<String>
+        where P: Into<String>, U: Into<String>
+    {
+        self.0.insert(prefix.into(), uri.into())
+    }
+
+    /// Queries the namespace for the given prefix.
+    ///
+    /// # Parameters
+    /// * `prefix` --- namespace prefix.
+    ///
+    /// # Return value
+    /// Namespace URI corresponding to the given prefix, if it is present.
+    pub fn get<'a, P: ?Sized+AsRef<str>>(&'a self, prefix: &P) -> Option<&'a str> {
+        self.0.get(prefix.as_ref()).map(|s| &**s)
+    }
+}
+
+/// An alias for iterator type for namespace mappings contained in a namespace.
+pub type NamespaceMappings<'a> = Map<
+    Entries<'a, String, String>,
+    for<'b> fn((&'b String, &'b String)) -> UriMapping<'b>
+>;
+
+impl<'a> IntoIterator for &'a Namespace {
+    type Item = UriMapping<'a>;
+    type IntoIter = NamespaceMappings<'a>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        fn mapper<'a>((prefix, uri): (&'a String, &'a String)) -> UriMapping<'a> {
+            (&*prefix, &*uri)
+        }
+        self.0.iter().map(mapper)
+    }
+}
+
+/// Namespace stack is a sequence of namespaces.
+///
+/// Namespace stack is used to represent cumulative namespace consisting of
+/// combined namespaces from nested elements.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct NamespaceStack(pub Vec<Namespace>);
+
+impl NamespaceStack {
+    /// Returns an empty namespace stack.
+    #[inline]
+    pub fn empty() -> NamespaceStack { NamespaceStack(Vec::with_capacity(2)) }
+
+    /// Returns a namespace stack with default items in it.
+    ///
+    /// Default items are the following:
+    ///
+    /// * `xml` → `http://www.w3.org/XML/1998/namespace`;
+    /// * `xmlns` → `http://www.w3.org/2000/xmlns/`.
+    #[inline]
+    pub fn default() -> NamespaceStack {
+        let mut nst = NamespaceStack::empty();
+        nst.push_empty();
+        // xml namespace
+        nst.put(NS_XML_PREFIX, NS_XML_URI);
+        // xmlns namespace
+        nst.put(NS_XMLNS_PREFIX, NS_XMLNS_URI);
+        // empty namespace
+        nst.put(NS_NO_PREFIX, NS_EMPTY_URI);
+        nst
+    }
+
+    /// Adds an empty namespace to the top of this stack.
+    #[inline]
+    pub fn push_empty(&mut self) -> &mut NamespaceStack {
+        self.0.push(Namespace::empty());
+        self
+    }
+
+    /// Removes the topmost namespace in this stack.
+    ///
+    /// Panics if the stack is empty.
+    #[inline]
+    pub fn pop(&mut self) -> Namespace {
+        self.0.pop().unwrap()
+    }
+
+    /// Removes the topmost namespace in this stack.
+    ///
+    /// Returns `Some(namespace)` if this stack is not empty and `None` otherwise.
+    #[inline]
+    pub fn try_pop(&mut self) -> Option<Namespace> {
+        self.0.pop()
+    }
+
+    /// Borrows the topmost namespace mutably, leaving the stack intact.
+    ///
+    /// Panics if the stack is empty.
+    #[inline]
+    pub fn peek_mut(&mut self) -> &mut Namespace {
+        self.0.last_mut().unwrap()
+    }
+
+    /// Borrows the topmost namespace immutably, leaving the stack intact.
+    ///
+    /// Panics if the stack is empty.
+    #[inline]
+    pub fn peek(&self) -> &Namespace {
+        self.0.last().unwrap()
+    }
+
+    /// Puts a mapping into the topmost namespace if this stack does not already contain one.
+    ///
+    /// Returns a boolean flag indicating whether the insertion has completed successfully.
+    /// Note that both key and value are matched and the mapping is inserted if either
+    /// namespace prefix is not already mapped, or if it is mapped, but to a different URI.
+    ///
+    /// # Parameters
+    /// * `prefix` --- namespace prefix;
+    /// * `uri`    --- namespace URI.
+    ///
+    /// # Return value
+    /// `true` if `prefix` has been inserted successfully; `false` if the `prefix`
+    /// was already present in the namespace stack.
+    pub fn put_checked<P, U>(&mut self, prefix: P, uri: U) -> bool
+        where P: Into<String> + AsRef<str>,
+              U: Into<String> + AsRef<str>
+    {
+        if self.0.iter().any(|ns| ns.get(&prefix) == Some(uri.as_ref())) {
+            false
+        } else {
+            self.put(prefix, uri);
+            true
+        }
+    }
+
+    /// Puts a mapping into the topmost namespace in this stack.
+    ///
+    /// This method does not override a mapping in the topmost namespace if it is
+    /// already present, however, it does not depend on other namespaces in the stack,
+    /// so it is possible to put a mapping which is present in lower namespaces.
+    ///
+    /// Returns a boolean flag indicating whether the insertion has completed successfully.
+    ///
+    /// # Parameters
+    /// * `prefix` --- namespace prefix;
+    /// * `uri`    --- namespace URI.
+    ///
+    /// # Return value
+    /// `true` if `prefix` has been inserted successfully; `false` if the `prefix`
+    /// was already present in the namespace.
+    #[inline]
+    pub fn put<P, U>(&mut self, prefix: P, uri: U) -> bool
+        where P: Into<String>, U: Into<String>
+    {
+        self.0.last_mut().unwrap().put(prefix, uri)
+    }
+
+    /// Performs a search for the given prefix in the whole stack.
+    ///
+    /// This method walks the stack from top to bottom, querying each namespace
+    /// in order for the given prefix. If none of the namespaces contains the prefix,
+    /// `None` is returned.
+    ///
+    /// # Parameters
+    /// * `prefix` --- namespace prefix.
+    #[inline]
+    pub fn get<'a, P: ?Sized+AsRef<str>>(&'a self, prefix: &P) -> Option<&'a str> {
+        let prefix = prefix.as_ref();
+        for ns in self.0.iter().rev() {
+            match ns.get(prefix) {
+                None => {},
+                r => return r,
+            }
+        }
+        None
+    }
+
+    /// Combines this stack of namespaces into a single namespace.
+    ///
+    /// Namespaces are combined in left-to-right order, that is, rightmost namespace
+    /// elements take priority over leftmost ones.
+    pub fn squash(&self) -> Namespace {
+        let mut result = BTreeMap::new();
+        for ns in self.0.iter() {
+            result.extend(ns.0.iter().map(|(k, v)| (k.clone(), v.clone())));
+        }
+        Namespace(result)
+    }
+
+    /// Returns an object which implements `Extend` using `put_checked()` instead of `put()`.
+    ///
+    /// See `CheckedTarget` for more information.
+    #[inline]
+    pub fn checked_target(&mut self) -> CheckedTarget {
+        CheckedTarget(self)
+    }
+
+    /// Returns an iterator over all mappings in this namespace stack.
+    #[inline]
+    pub fn iter(&self) -> NamespaceStackMappings {
+        self.into_iter()
+    }
+}
+
+/// An iterator over mappings from prefixes to URIs in a namespace stack.
+///
+/// # Example
+/// ```
+/// # use xml::namespace::NamespaceStack;
+/// let mut nst = NamespaceStack::empty();
+/// nst.push_empty();
+/// nst.put("a", "urn:A");
+/// nst.put("b", "urn:B");
+/// nst.push_empty();
+/// nst.put("c", "urn:C");
+///
+/// assert_eq!(vec![("c", "urn:C"), ("a", "urn:A"), ("b", "urn:B")], nst.iter().collect::<Vec<_>>());
+/// ```
+pub struct NamespaceStackMappings<'a> {
+    namespaces: Rev<Iter<'a, Namespace>>,
+    current_namespace: Option<NamespaceMappings<'a>>,
+    used_keys: HashSet<&'a str>
+}
+
+impl<'a> NamespaceStackMappings<'a> {
+    fn go_to_next_namespace(&mut self) -> bool {
+        self.current_namespace = self.namespaces.next().map(|ns| ns.into_iter());
+        self.current_namespace.is_some()
+    }
+}
+
+impl<'a> Iterator for NamespaceStackMappings<'a> {
+    type Item = UriMapping<'a>;
+
+    fn next(&mut self) -> Option<UriMapping<'a>> {
+        // If there is no current namespace and no next namespace, we're finished
+        if self.current_namespace.is_none() && !self.go_to_next_namespace() {
+            return None;
+        }
+        let next_item = self.current_namespace.as_mut().unwrap().next();
+
+        match next_item {
+            // There is an element in the current namespace
+            Some((k, v)) => if self.used_keys.contains(&k) {
+                // If the current key is used, go to the next one
+                self.next()
+            } else {
+                // Otherwise insert the current key to the set of used keys and
+                // return the mapping
+                self.used_keys.insert(k);
+                Some((k, v))
+            },
+            // Current namespace is exhausted
+            None => if self.go_to_next_namespace() {
+                // If there is next namespace, continue from it
+                self.next()
+            } else {
+                // No next namespace, exiting
+                None
+            }
+        }
+    }
+}
+
+impl<'a> IntoIterator for &'a NamespaceStack {
+    type Item = UriMapping<'a>;
+    type IntoIter = NamespaceStackMappings<'a>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        NamespaceStackMappings {
+            namespaces: self.0.iter().rev(),
+            current_namespace: None,
+            used_keys: HashSet::new()
+        }
+    }
+}
+
+/// A type alias for a pair of `(prefix, uri)` values returned by namespace iterators.
+pub type UriMapping<'a> = (&'a str, &'a str);
+
+impl<'a> Extend<UriMapping<'a>> for Namespace {
+    fn extend<T>(&mut self, iterable: T) where T: IntoIterator<Item=UriMapping<'a>> {
+        for (prefix, uri) in iterable {
+            self.put(prefix, uri);
+        }
+    }
+}
+
+impl<'a> Extend<UriMapping<'a>> for NamespaceStack {
+    fn extend<T>(&mut self, iterable: T) where T: IntoIterator<Item=UriMapping<'a>> {
+        for (prefix, uri) in iterable {
+            self.put(prefix, uri);
+        }
+    }
+}
+
+/// A wrapper around `NamespaceStack` which implements `Extend` using `put_checked()`.
+///
+/// # Example
+///
+/// ```
+/// # use xml::namespace::NamespaceStack;
+///
+/// let mut nst = NamespaceStack::empty();
+/// nst.push_empty();
+/// nst.put("a", "urn:A");
+/// nst.put("b", "urn:B");
+/// nst.push_empty();
+/// nst.put("c", "urn:C");
+///
+/// nst.checked_target().extend(vec![("a", "urn:Z"), ("b", "urn:B"), ("c", "urn:Y"), ("d", "urn:D")]);
+/// assert_eq!(
+///     vec![("a", "urn:Z"), ("c", "urn:C"), ("d", "urn:D"), ("b", "urn:B")],
+///     nst.iter().collect::<Vec<_>>()
+/// );
+/// ```
+///
+/// Compare:
+///
+/// ```
+/// # use xml::namespace::NamespaceStack;
+/// # let mut nst = NamespaceStack::empty();
+/// # nst.push_empty();
+/// # nst.put("a", "urn:A");
+/// # nst.put("b", "urn:B");
+/// # nst.push_empty();
+/// # nst.put("c", "urn:C");
+///
+/// nst.extend(vec![("a", "urn:Z"), ("b", "urn:B"), ("c", "urn:Y"), ("d", "urn:D")]);
+/// assert_eq!(
+///     vec![("a", "urn:Z"), ("b", "urn:B"), ("c", "urn:C"), ("d", "urn:D")],
+///     nst.iter().collect::<Vec<_>>()
+/// );
+/// ```
+pub struct CheckedTarget<'a>(&'a mut NamespaceStack);
+
+impl<'a, 'b> Extend<UriMapping<'b>> for CheckedTarget<'a> {
+    fn extend<T>(&mut self, iterable: T) where T: IntoIterator<Item=UriMapping<'b>> {
+        for (prefix, uri) in iterable {
+            self.0.put_checked(prefix, uri);
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/config.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/config.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/config.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/config.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,181 @@
+//! Contains parser configuration structure.
+use std::io::Read;
+use std::collections::HashMap;
+
+use reader::EventReader;
+
+/// Parser configuration structure.
+///
+/// This structure contains various configuration options which affect
+/// behavior of the parser.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct ParserConfig {
+    /// Whether or not should whitespace in textual events be removed. Default is false.
+    ///
+    /// When true, all standalone whitespace will be removed (this means no
+    /// `Whitespace` events will be emitted), and leading and trailing whitespace
+    /// from `Character` events will be deleted. If after trimming `Characters`
+    /// event will be empty, it will also be omitted from output stream. This is
+    /// possible, however, only if `whitespace_to_characters` or
+    /// `cdata_to_characters` options are set.
+    ///
+    /// This option does not affect CDATA events, unless `cdata_to_characters`
+    /// option is also set. In that case CDATA content will also be trimmed.
+    pub trim_whitespace: bool,
+
+    /// Whether or not should whitespace be converted to characters.
+    /// Default is false.
+    ///
+    /// If true, instead of `Whitespace` events `Characters` events with the
+    /// same content will be emitted. If `trim_whitespace` is also true, these
+    /// events will be trimmed to nothing and, consequently, not emitted.
+    pub whitespace_to_characters: bool,
+
+    /// Whether or not should CDATA be converted to characters.
+    /// Default is false.
+    ///
+    /// If true, instead of `CData` events `Characters` events with the same
+    /// content will be emitted. If `trim_whitespace` is also true, these events
+    /// will be trimmed. If corresponding CDATA contained nothing but whitespace,
+    /// this event will be omitted from the stream.
+    pub cdata_to_characters: bool,
+
+    /// Whether or not should comments be omitted. Default is true.
+    ///
+    /// If true, `Comment` events will not be emitted at all.
+    pub ignore_comments: bool,
+
+    /// Whether or not should sequential `Characters` events be merged.
+    /// Default is true.
+    ///
+    /// If true, multiple sequential `Characters` events will be merged into
+    /// a single event, that is, their data will be concatenated.
+    ///
+    /// Multiple sequential `Characters` events are only possible if either
+    /// `cdata_to_characters` or `ignore_comments` are set. Otherwise character
+    /// events will always be separated by other events.
+    pub coalesce_characters: bool,
+
+    /// A map of extra entities recognized by the parser. Default is an empty map.
+    ///
+    /// By default the XML parser recognizes the entities defined in the XML spec. Sometimes,
+    /// however, it is convenient to make the parser recognize additional entities which
+    /// are also not available through the DTD definitions (especially given that at the moment
+    /// DTD parsing is not supported).
+    pub extra_entities: HashMap<String, String>,
+
+    /// Whether or not the parser should ignore the end of stream. Default is false.
+    ///
+    /// By default the parser will either error out when it encounters a premature end of
+    /// stream or complete normally if the end of stream was expected. If you want to continue
+    /// reading from a stream whose input is supplied progressively, you can set this option to true.
+    /// In this case the parser will allow you to invoke the next() method even if a supposed end
+    /// of stream has happened.
+    ///
+    /// Note that support for this functionality is incomplete; for example, the parser will fail if
+    /// the premature end of stream happens inside PCDATA. Therefore, use this option at your own risk.
+    pub ignore_end_of_stream: bool,
+
+    /// Whether or not non-unicode entity references get replaced with the replacement character
+    ///
+    /// When true, any decimal or hexadecimal character reference that cannot be converted from a
+    /// u32 to a char using [std::char::from_u32](https://doc.rust-lang.org/std/char/fn.from_u32.html)
+    /// will be converted into the unicode REPLACEMENT CHARACTER (U+FFFD).
+    pub replace_unknown_entity_references: bool,
+
+    /// Whether or not whitespace at the root level of the document is ignored. Default is true.
+    ///
+    /// By default any whitespace that is not enclosed within at least one level of elements will be
+    /// ignored. Setting this value to false will cause root level whitespace events to be emitted.
+    pub ignore_root_level_whitespace: bool,
+}
+
+impl ParserConfig {
+    /// Returns a new config with default values.
+    ///
+    /// You can tweak default values using builder-like pattern:
+    ///
+    /// ```rust
+    /// use xml::reader::ParserConfig;
+    ///
+    /// let config = ParserConfig::new()
+    ///     .trim_whitespace(true)
+    ///     .ignore_comments(true)
+    ///     .coalesce_characters(false);
+    /// ```
+    pub fn new() -> ParserConfig {
+        ParserConfig {
+            trim_whitespace: false,
+            whitespace_to_characters: false,
+            cdata_to_characters: false,
+            ignore_comments: true,
+            coalesce_characters: true,
+            extra_entities: HashMap::new(),
+            ignore_end_of_stream: false,
+            replace_unknown_entity_references: false,
+            ignore_root_level_whitespace: true,
+        }
+    }
+
+    /// Creates an XML reader with this configuration.
+    ///
+    /// This is a convenience method for configuring and creating a reader at the same time:
+    ///
+    /// ```rust
+    /// use xml::reader::ParserConfig;
+    ///
+    /// let mut source: &[u8] = b"...";
+    ///
+    /// let reader = ParserConfig::new()
+    ///     .trim_whitespace(true)
+    ///     .ignore_comments(true)
+    ///     .coalesce_characters(false)
+    ///     .create_reader(&mut source);
+    /// ```
+    ///
+    /// This method is exactly equivalent to calling `EventReader::new_with_config()` with
+    /// this configuration object.
+    #[inline]
+    pub fn create_reader<R: Read>(self, source: R) -> EventReader<R> {
+        EventReader::new_with_config(source, self)
+    }
+
+    /// Adds a new entity mapping and returns an updated config object.
+    ///
+    /// This is a convenience method for adding external entities mappings to the XML parser.
+    /// An example:
+    ///
+    /// ```rust
+    /// use xml::reader::ParserConfig;
+    ///
+    /// let mut source: &[u8] = b"...";
+    ///
+    /// let reader = ParserConfig::new()
+    ///     .add_entity("nbsp", " ")
+    ///     .add_entity("copy", "©")
+    ///     .add_entity("reg", "®")
+    ///     .create_reader(&mut source);
+    /// ```
+    pub fn add_entity<S: Into<String>, T: Into<String>>(mut self, entity: S, value: T) -> ParserConfig {
+        self.extra_entities.insert(entity.into(), value.into());
+        self
+    }
+}
+
+impl Default for ParserConfig {
+    #[inline]
+    fn default() -> ParserConfig {
+        ParserConfig::new()
+    }
+}
+
+gen_setters! { ParserConfig,
+    trim_whitespace: val bool,
+    whitespace_to_characters: val bool,
+    cdata_to_characters: val bool,
+    ignore_comments: val bool,
+    coalesce_characters: val bool,
+    ignore_end_of_stream: val bool,
+    replace_unknown_entity_references: val bool,
+    ignore_root_level_whitespace: val bool
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/error.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/error.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/error.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,121 @@
+
+use std::io;
+use std::borrow::Cow;
+use std::fmt;
+use std::error;
+use std::str;
+
+use util;
+use common::{Position, TextPosition};
+
+#[derive(Debug)]
+pub enum ErrorKind {
+    Syntax(Cow<'static, str>),
+    Io(io::Error),
+    Utf8(str::Utf8Error),
+    UnexpectedEof,
+}
+
+/// An XML parsing error.
+///
+/// Consists of a 2D position in a document and a textual message describing the error.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct Error {
+    pos: TextPosition,
+    kind: ErrorKind,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{} {}", self.pos, self.msg())
+    }
+}
+
+impl Position for Error {
+    #[inline]
+    fn position(&self) -> TextPosition { self.pos }
+}
+
+impl Error {
+    /// Returns a reference to a message which is contained inside this error.
+    #[inline]
+    pub fn msg(&self) -> &str {
+        use self::ErrorKind::*;
+        match self.kind {
+            UnexpectedEof => &"Unexpected EOF",
+            Utf8(ref reason) => error_description(reason),
+            Io(ref io_error) => error_description(io_error),
+            Syntax(ref msg) => msg.as_ref(),
+        }
+    }
+
+    pub fn kind(&self) -> &ErrorKind { &self.kind }
+}
+
+impl error::Error for Error {
+    #[inline]
+    fn description(&self) -> &str { self.msg() }
+}
+
+impl<'a, P, M> From<(&'a P, M)> for Error where P: Position, M: Into<Cow<'static, str>> {
+    fn from(orig: (&'a P, M)) -> Self {
+        Error{
+            pos: orig.0.position(),
+            kind: ErrorKind::Syntax(orig.1.into())
+        }
+    }
+}
+
+impl From<util::CharReadError> for Error {
+    fn from(e: util::CharReadError) -> Self {
+        use util::CharReadError::*;
+        Error{
+            pos: TextPosition::new(),
+            kind: match e {
+                UnexpectedEof => ErrorKind::UnexpectedEof,
+                Utf8(reason) => ErrorKind::Utf8(reason),
+                Io(io_error) => ErrorKind::Io(io_error),
+            }
+        }
+    }
+}
+
+impl From<io::Error> for Error {
+    fn from(e: io::Error) -> Self {
+        Error {
+            pos: TextPosition::new(),
+            kind: ErrorKind::Io(e),
+        }
+    }
+}
+
+impl Clone for ErrorKind {
+    fn clone(&self) -> Self {
+        use self::ErrorKind::*;
+        match *self {
+            UnexpectedEof => UnexpectedEof,
+            Utf8(ref reason) => Utf8(reason.clone()),
+            Io(ref io_error) => Io(io::Error::new(io_error.kind(), error_description(io_error))),
+            Syntax(ref msg) => Syntax(msg.clone()),
+        }
+    }
+}
+impl PartialEq for ErrorKind {
+    fn eq(&self, other: &ErrorKind) -> bool {
+        use self::ErrorKind::*;
+        match (self, other) {
+            (&UnexpectedEof, &UnexpectedEof) => true,
+            (&Utf8(ref left), &Utf8(ref right)) => left == right,
+            (&Io(ref left), &Io(ref right)) =>
+                left.kind() == right.kind() &&
+                error_description(left) == error_description(right),
+            (&Syntax(ref left), &Syntax(ref right)) =>
+                left == right,
+
+            (_, _) => false,
+        }
+    }
+}
+impl Eq for ErrorKind {}
+
+fn error_description(e: &error::Error) -> &str { e.description() }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/events.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/events.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/events.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/events.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,219 @@
+//! Contains `XmlEvent` datatype, instances of which are emitted by the parser.
+
+use std::fmt;
+use std::borrow::Cow;
+
+use name::OwnedName;
+use attribute::OwnedAttribute;
+use common::XmlVersion;
+use namespace::Namespace;
+
+/// An element of an XML input stream.
+///
+/// Items of this enum are emitted by `reader::EventReader`. They correspond to different
+/// elements of an XML document.
+#[derive(PartialEq, Clone)]
+pub enum XmlEvent {
+    /// Corresponds to XML document declaration.
+    ///
+    /// This event is always emitted before any other event. It is emitted
+    /// even if the actual declaration is not present in the document.
+    StartDocument {
+        /// XML version.
+        ///
+        /// If XML declaration is not present, defaults to `Version10`.
+        version: XmlVersion,
+
+        /// XML document encoding.
+        ///
+        /// If XML declaration is not present or does not contain `encoding` attribute,
+        /// defaults to `"UTF-8"`. This field is currently used for no other purpose than
+        /// informational.
+        encoding: String,
+
+        /// XML standalone declaration.
+        ///
+        /// If XML document is not present or does not contain `standalone` attribute,
+        /// defaults to `None`. This field is currently used for no other purpose than
+        /// informational.
+        standalone: Option<bool>
+    },
+
+    /// Denotes to the end of the document stream.
+    ///
+    /// This event is always emitted after any other event (except `Error`). After it
+    /// is emitted for the first time, it will always be emitted on next event pull attempts.
+    EndDocument,
+
+    /// Denotes an XML processing instruction.
+    ///
+    /// This event contains a processing instruction target (`name`) and opaque `data`. It
+    /// is up to the application to process them.
+    ProcessingInstruction {
+        /// Processing instruction target.
+        name: String,
+
+        /// Processing instruction content.
+        data: Option<String>
+    },
+
+    /// Denotes a beginning of an XML element.
+    ///
+    /// This event is emitted after parsing opening tags or after parsing bodiless tags. In the
+    /// latter case `EndElement` event immediately follows.
+    StartElement {
+        /// Qualified name of the element.
+        name: OwnedName,
+
+        /// A list of attributes associated with the element.
+        ///
+        /// Currently attributes are not checked for duplicates (TODO)
+        attributes: Vec<OwnedAttribute>,
+
+        /// Contents of the namespace mapping at this point of the document.
+        namespace: Namespace,
+    },
+
+    /// Denotes an end of an XML element.
+    ///
+    /// This event is emitted after parsing closing tags or after parsing bodiless tags. In the
+    /// latter case it is emitted immediately after corresponding `StartElement` event.
+    EndElement {
+        /// Qualified name of the element.
+        name: OwnedName
+    },
+
+    /// Denotes CDATA content.
+    ///
+    /// This event contains unparsed data. No unescaping will be performed.
+    ///
+    /// It is possible to configure a parser to emit `Characters` event instead of `CData`. See
+    /// `pull::ParserConfiguration` structure for more information.
+    CData(String),
+
+    /// Denotes a comment.
+    ///
+    /// It is possible to configure a parser to ignore comments, so this event will never be emitted.
+    /// See `pull::ParserConfiguration` structure for more information.
+    Comment(String),
+
+    /// Denotes character data outside of tags.
+    ///
+    /// Contents of this event will always be unescaped, so no entities like `&lt;` or `&amp;` or `&#123;`
+    /// will appear in it.
+    ///
+    /// It is possible to configure a parser to trim leading and trailing whitespace for this event.
+    /// See `pull::ParserConfiguration` structure for more information.
+    Characters(String),
+
+    /// Denotes a chunk of whitespace outside of tags.
+    ///
+    /// It is possible to configure a parser to emit `Characters` event instead of `Whitespace`.
+    /// See `pull::ParserConfiguration` structure for more information. When combined with whitespace
+    /// trimming, it will eliminate standalone whitespace from the event stream completely.
+    Whitespace(String)
+}
+
+impl fmt::Debug for XmlEvent {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            XmlEvent::StartDocument { ref version, ref encoding, ref standalone } =>
+                write!(f, "StartDocument({}, {}, {:?})", version, *encoding, *standalone),
+            XmlEvent::EndDocument =>
+                write!(f, "EndDocument"),
+            XmlEvent::ProcessingInstruction { ref name, ref data } =>
+                write!(f, "ProcessingInstruction({}{})", *name, match *data {
+                    Some(ref data) => format!(", {}", data),
+                    None       => String::new()
+                }),
+            XmlEvent::StartElement { ref name, ref attributes, namespace: Namespace(ref namespace) } =>
+                write!(f, "StartElement({}, {:?}{})", name, namespace, if attributes.is_empty() {
+                    String::new()
+                } else {
+                    let attributes: Vec<String> = attributes.iter().map(
+                        |a| format!("{} -> {}", a.name, a.value)
+                    ).collect();
+                    format!(", [{}]", attributes.join(", "))
+                }),
+            XmlEvent::EndElement { ref name } =>
+                write!(f, "EndElement({})", name),
+            XmlEvent::Comment(ref data) =>
+                write!(f, "Comment({})", data),
+            XmlEvent::CData(ref data) =>
+                write!(f, "CData({})", data),
+            XmlEvent::Characters(ref data) =>
+                write!(f, "Characters({})", data),
+            XmlEvent::Whitespace(ref data) =>
+                write!(f, "Whitespace({})", data)
+        }
+    }
+}
+
+impl XmlEvent {
+    /// Obtains a writer event from this reader event.
+    ///
+    /// This method is useful for streaming processing of XML documents where the output
+    /// is also an XML document. With this method it is possible to process some events
+    /// while passing other events through to the writer unchanged:
+    ///
+    /// ```rust
+    /// use std::str;
+    ///
+    /// use xml::{EventReader, EventWriter};
+    /// use xml::reader::XmlEvent as ReaderEvent;
+    /// use xml::writer::XmlEvent as WriterEvent;
+    ///
+    /// let mut input: &[u8] = b"<hello>world</hello>";
+    /// let mut output: Vec<u8> = Vec::new();
+    ///
+    /// {
+    ///     let mut reader = EventReader::new(&mut input);
+    ///     let mut writer = EventWriter::new(&mut output);
+    ///
+    ///     for e in reader {
+    ///         match e.unwrap() {
+    ///             ReaderEvent::Characters(s) =>
+    ///                 writer.write(WriterEvent::characters(&s.to_uppercase())).unwrap(),
+    ///             e => if let Some(e) = e.as_writer_event() {
+    ///                 writer.write(e).unwrap()
+    ///             }
+    ///         }
+    ///     }
+    /// }
+    ///
+    /// assert_eq!(
+    ///     str::from_utf8(&output).unwrap(),
+    ///     r#"<?xml version="1.0" encoding="UTF-8"?><hello>WORLD</hello>"#
+    /// );
+    /// ```
+    ///
+    /// Note that this API may change or get additions in future to improve its ergonomics.
+    pub fn as_writer_event<'a>(&'a self) -> Option<::writer::events::XmlEvent<'a>> {
+        match *self {
+            XmlEvent::StartDocument { version, ref encoding, standalone } =>
+                Some(::writer::events::XmlEvent::StartDocument {
+                    version: version,
+                    encoding: Some(encoding),
+                    standalone: standalone
+                }),
+            XmlEvent::ProcessingInstruction { ref name, ref data } =>
+                Some(::writer::events::XmlEvent::ProcessingInstruction {
+                    name: name,
+                    data: data.as_ref().map(|s| &s[..])
+                }),
+            XmlEvent::StartElement { ref name, ref attributes, ref namespace } =>
+                Some(::writer::events::XmlEvent::StartElement {
+                    name: name.borrow(),
+                    attributes: attributes.iter().map(|a| a.borrow()).collect(),
+                    namespace: Cow::Borrowed(namespace)
+                }),
+            XmlEvent::EndElement { ref name } =>
+                Some(::writer::events::XmlEvent::EndElement { name: Some(name.borrow()) }),
+            XmlEvent::Comment(ref data) => Some(::writer::events::XmlEvent::Comment(data)),
+            XmlEvent::CData(ref data) => Some(::writer::events::XmlEvent::CData(data)),
+            XmlEvent::Characters(ref data) => Some(::writer::events::XmlEvent::Characters(data)),
+            XmlEvent::Whitespace(ref data) => Some(::writer::events::XmlEvent::Characters(data)),
+            _ => None
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/lexer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/lexer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/lexer.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/lexer.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,867 @@
+//! Contains simple lexer for XML documents.
+//!
+//! This module is for internal use. Use `xml::pull` module to do parsing.
+
+use std::fmt;
+use std::collections::VecDeque;
+use std::io::Read;
+use std::result;
+use std::borrow::Cow;
+
+use common::{Position, TextPosition, is_whitespace_char, is_name_char};
+use reader::Error;
+use util;
+
+/// `Token` represents a single lexeme of an XML document. These lexemes
+/// are used to perform actual parsing.
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+pub enum Token {
+    /// `<?`
+    ProcessingInstructionStart,
+    /// `?>`
+    ProcessingInstructionEnd,
+    /// `<!DOCTYPE
+    DoctypeStart,
+    /// `<`
+    OpeningTagStart,
+    /// `</`
+    ClosingTagStart,
+    /// `>`
+    TagEnd,
+    /// `/>`
+    EmptyTagEnd,
+    /// `<!--`
+    CommentStart,
+    /// `-->`
+    CommentEnd,
+    /// A chunk of characters, used for errors recovery.
+    Chunk(&'static str),
+    /// Any non-special character except whitespace.
+    Character(char),
+    /// Whitespace character.
+    Whitespace(char),
+    /// `=`
+    EqualsSign,
+    /// `'`
+    SingleQuote,
+    /// `"`
+    DoubleQuote,
+    /// `<![CDATA[`
+    CDataStart,
+    /// `]]>`
+    CDataEnd,
+    /// `&`
+    ReferenceStart,
+    /// `;`
+    ReferenceEnd,
+}
+
+impl fmt::Display for Token {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            Token::Chunk(s)                            => write!(f, "{}", s),
+            Token::Character(c) | Token::Whitespace(c) => write!(f, "{}", c),
+            other => write!(f, "{}", match other {
+                Token::OpeningTagStart            => "<",
+                Token::ProcessingInstructionStart => "<?",
+                Token::DoctypeStart               => "<!DOCTYPE",
+                Token::ClosingTagStart            => "</",
+                Token::CommentStart               => "<!--",
+                Token::CDataStart                 => "<![CDATA[",
+                Token::TagEnd                     => ">",
+                Token::EmptyTagEnd                => "/>",
+                Token::ProcessingInstructionEnd   => "?>",
+                Token::CommentEnd                 => "-->",
+                Token::CDataEnd                   => "]]>",
+                Token::ReferenceStart             => "&",
+                Token::ReferenceEnd               => ";",
+                Token::EqualsSign                 => "=",
+                Token::SingleQuote                => "'",
+                Token::DoubleQuote                => "\"",
+                _                          => unreachable!()
+            })
+        }
+    }
+}
+
+impl Token {
+    pub fn as_static_str(&self) -> Option<&'static str> {
+        match *self {
+            Token::OpeningTagStart            => Some("<"),
+            Token::ProcessingInstructionStart => Some("<?"),
+            Token::DoctypeStart               => Some("<!DOCTYPE"),
+            Token::ClosingTagStart            => Some("</"),
+            Token::CommentStart               => Some("<!--"),
+            Token::CDataStart                 => Some("<![CDATA["),
+            Token::TagEnd                     => Some(">"),
+            Token::EmptyTagEnd                => Some("/>"),
+            Token::ProcessingInstructionEnd   => Some("?>"),
+            Token::CommentEnd                 => Some("-->"),
+            Token::CDataEnd                   => Some("]]>"),
+            Token::ReferenceStart             => Some("&"),
+            Token::ReferenceEnd               => Some(";"),
+            Token::EqualsSign                 => Some("="),
+            Token::SingleQuote                => Some("'"),
+            Token::DoubleQuote                => Some("\""),
+            Token::Chunk(s)                   => Some(s),
+            _                                 => None
+        }
+    }
+
+    // using String.push_str(token.to_string()) is simply way too slow
+    pub fn push_to_string(&self, target: &mut String) {
+        match self.as_static_str() {
+            Some(s) => { target.push_str(s); }
+            None => {
+                match *self {
+                    Token::Character(c) | Token::Whitespace(c) => target.push(c),
+                    _ => unreachable!()
+                }
+            }
+        }
+    }
+
+    /// Returns `true` if this token contains data that can be interpreted
+    /// as a part of the text. Surprisingly, this also means '>' and '=' and '"' and "'" and '-->'.
+    #[inline]
+    pub fn contains_char_data(&self) -> bool {
+        match *self {
+            Token::Whitespace(_) | Token::Chunk(_) | Token::Character(_) | Token::CommentEnd |
+            Token::TagEnd | Token::EqualsSign | Token::DoubleQuote | Token::SingleQuote | Token::CDataEnd | 
+            Token::ProcessingInstructionEnd | Token::EmptyTagEnd => true,
+            _ => false
+        }
+    }
+
+    /// Returns `true` if this token corresponds to a white space character.
+    #[inline]
+    pub fn is_whitespace(&self) -> bool {
+        match *self {
+            Token::Whitespace(_) => true,
+            _ => false
+        }
+    }
+}
+
+enum State {
+    /// Triggered on '<'
+    TagStarted,
+    /// Triggered on '<!'
+    CommentOrCDataOrDoctypeStarted,
+    /// Triggered on '<!-'
+    CommentStarted,
+    /// Triggered on '<!D' up to '<!DOCTYPE'
+    DoctypeStarted(DoctypeStartedSubstate),
+    /// Triggered after DoctypeStarted to handle sub elements
+    DoctypeFinishing(u8),
+    /// Triggered on '<![' up to '<![CDATA'
+    CDataStarted(CDataStartedSubstate),
+    /// Triggered on '?'
+    ProcessingInstructionClosing,
+    /// Triggered on '/'
+    EmptyTagClosing,
+    /// Triggered on '-' up to '--'
+    CommentClosing(ClosingSubstate),
+    /// Triggered on ']' up to ']]'
+    CDataClosing(ClosingSubstate),
+    /// Default state
+    Normal
+}
+
+#[derive(Copy, Clone)]
+enum ClosingSubstate {
+    First, Second
+}
+
+#[derive(Copy, Clone)]
+enum DoctypeStartedSubstate {
+    D, DO, DOC, DOCT, DOCTY, DOCTYP
+}
+
+#[derive(Copy, Clone)]
+enum CDataStartedSubstate {
+    E, C, CD, CDA, CDAT, CDATA
+}
+
+/// `Result` represents lexing result. It is either a token or an error message.
+pub type Result = result::Result<Option<Token>, Error>;
+
+/// Helps to set up a dispatch table for lexing large unambigous tokens like
+/// `<![CDATA[` or `<!DOCTYPE `.
+macro_rules! dispatch_on_enum_state(
+    ($_self:ident, $s:expr, $c:expr, $is:expr,
+     $($st:ident; $stc:expr ; $next_st:ident ; $chunk:expr),+;
+     $end_st:ident ; $end_c:expr ; $end_chunk:expr ; $e:expr) => (
+        match $s {
+            $(
+            $st => match $c {
+                $stc => $_self.move_to($is($next_st)),
+                _  => $_self.handle_error($chunk, $c)
+            },
+            )+
+            $end_st => match $c {
+                $end_c => $e,
+                _      => $_self.handle_error($end_chunk, $c)
+            }
+        }
+    )
+);
+
+/// `Lexer` is a lexer for XML documents, which implements pull API.
+///
+/// Main method is `next_token` which accepts an `std::io::Read` instance and
+/// tries to read the next lexeme from it.
+///
+/// When `skip_errors` flag is set, invalid lexemes will be returned as `Chunk`s.
+/// When it is not set, errors will be reported as `Err` objects with a string message.
+/// By default this flag is not set. Use `enable_errors` and `disable_errors` methods
+/// to toggle the behavior.
+pub struct Lexer {
+    pos: TextPosition,
+    head_pos: TextPosition,
+    char_queue: VecDeque<char>,
+    st: State,
+    skip_errors: bool,
+    inside_comment: bool,
+    inside_token: bool,
+    eof_handled: bool
+}
+
+impl Position for Lexer {
+    #[inline]
+    /// Returns the position of the last token produced by the lexer
+    fn position(&self) -> TextPosition { self.pos }
+}
+
+impl Lexer {
+    /// Returns a new lexer with default state.
+    pub fn new() -> Lexer {
+        Lexer {
+            pos: TextPosition::new(),
+            head_pos: TextPosition::new(),
+            char_queue: VecDeque::with_capacity(4),  // TODO: check size
+            st: State::Normal,
+            skip_errors: false,
+            inside_comment: false,
+            inside_token: false,
+            eof_handled: false
+        }
+    }
+
+    /// Enables error handling so `next_token` will return `Some(Err(..))`
+    /// upon invalid lexeme.
+    #[inline]
+    pub fn enable_errors(&mut self) { self.skip_errors = false; }
+
+    /// Disables error handling so `next_token` will return `Some(Chunk(..))`
+    /// upon invalid lexeme with this lexeme content.
+    #[inline]
+    pub fn disable_errors(&mut self) { self.skip_errors = true; }
+
+    /// Enables special handling of some lexemes which should be done when we're parsing comment
+    /// internals.
+    #[inline]
+    pub fn inside_comment(&mut self) { self.inside_comment = true; }
+
+    /// Disables the effect of `inside_comment()` method.
+    #[inline]
+    pub fn outside_comment(&mut self) { self.inside_comment = false; }
+
+    /// Reset the eof handled flag of the lexer.
+    #[inline]
+    pub fn reset_eof_handled(&mut self) { self.eof_handled = false; }
+
+    /// Tries to read the next token from the buffer.
+    ///
+    /// It is possible to pass different instaces of `BufReader` each time
+    /// this method is called, but the resulting behavior is undefined in this case.
+    ///
+    /// Return value:
+    /// * `Err(reason) where reason: reader::Error` - when an error occurs;
+    /// * `Ok(None)` - upon end of stream is reached;
+    /// * `Ok(Some(token)) where token: Token` - in case a complete-token has been read from the stream.
+    pub fn next_token<B: Read>(&mut self, b: &mut B) -> Result {
+        // Already reached end of buffer
+        if self.eof_handled {
+            return Ok(None);
+        }
+
+        if !self.inside_token {
+            self.pos = self.head_pos;
+            self.inside_token = true;
+        }
+
+        // Check if we have saved a char or two for ourselves
+        while let Some(c) = self.char_queue.pop_front() {
+            match try!(self.read_next_token(c)) {
+                Some(t) => {
+                    self.inside_token = false;
+                    return Ok(Some(t));
+                }
+                None => {}  // continue
+            }
+        }
+
+        loop {
+            // TODO: this should handle multiple encodings
+            let c = match try!(util::next_char_from(b)) {
+                Some(c) => c,   // got next char
+                None => break,  // nothing to read left
+            };
+
+            match try!(self.read_next_token(c)) {
+                Some(t) => {
+                    self.inside_token = false;
+                    return Ok(Some(t));
+                }
+                None => {
+                    // continue
+                }
+            }
+        }
+
+        // Handle end of stream
+        self.eof_handled = true;
+        self.pos = self.head_pos;
+        match self.st {
+            State::TagStarted | State::CommentOrCDataOrDoctypeStarted |
+            State::CommentStarted | State::CDataStarted(_)| State::DoctypeStarted(_) |
+            State::CommentClosing(ClosingSubstate::Second) |
+            State::DoctypeFinishing(_) =>
+                Err(self.error("Unexpected end of stream")),
+            State::ProcessingInstructionClosing =>
+                Ok(Some(Token::Character('?'))),
+            State::EmptyTagClosing =>
+                Ok(Some(Token::Character('/'))),
+            State::CommentClosing(ClosingSubstate::First) =>
+                Ok(Some(Token::Character('-'))),
+            State::CDataClosing(ClosingSubstate::First) =>
+                Ok(Some(Token::Character(']'))),
+            State::CDataClosing(ClosingSubstate::Second) =>
+                Ok(Some(Token::Chunk("]]"))),
+            State::Normal =>
+                Ok(None)
+        }
+    }
+
+    #[inline]
+    fn error<M: Into<Cow<'static, str>>>(&self, msg: M) -> Error {
+        (self, msg).into()
+    }
+
+    #[inline]
+    fn read_next_token(&mut self, c: char) -> Result {
+        let res = self.dispatch_char(c);
+        if self.char_queue.is_empty() {
+            if c == '\n' {
+                self.head_pos.new_line();
+            } else {
+                self.head_pos.advance(1);
+            }
+        }
+        res
+    }
+
+    fn dispatch_char(&mut self, c: char) -> Result {
+        match self.st {
+            State::Normal                         => self.normal(c),
+            State::TagStarted                     => self.tag_opened(c),
+            State::CommentOrCDataOrDoctypeStarted => self.comment_or_cdata_or_doctype_started(c),
+            State::CommentStarted                 => self.comment_started(c),
+            State::CDataStarted(s)                => self.cdata_started(c, s),
+            State::DoctypeStarted(s)              => self.doctype_started(c, s),
+            State::DoctypeFinishing(d)            => self.doctype_finishing(c, d),
+            State::ProcessingInstructionClosing   => self.processing_instruction_closing(c),
+            State::EmptyTagClosing                => self.empty_element_closing(c),
+            State::CommentClosing(s)              => self.comment_closing(c, s),
+            State::CDataClosing(s)                => self.cdata_closing(c, s)
+        }
+    }
+
+    #[inline]
+    fn move_to(&mut self, st: State) -> Result {
+        self.st = st;
+        Ok(None)
+    }
+
+    #[inline]
+    fn move_to_with(&mut self, st: State, token: Token) -> Result {
+        self.st = st;
+        Ok(Some(token))
+    }
+
+    #[inline]
+    fn move_to_with_unread(&mut self, st: State, cs: &[char], token: Token) -> Result {
+        self.char_queue.extend(cs.iter().cloned());
+        self.move_to_with(st, token)
+    }
+
+    fn handle_error(&mut self, chunk: &'static str, c: char) -> Result {
+        self.char_queue.push_back(c);
+        if self.skip_errors || (self.inside_comment && chunk != "--") {  // FIXME: looks hacky
+            self.move_to_with(State::Normal, Token::Chunk(chunk))
+        } else {
+            Err(self.error(format!("Unexpected token '{}' before '{}'", chunk, c)))
+        }
+    }
+
+    /// Encountered a char
+    fn normal(&mut self, c: char) -> Result {
+        match c {
+            '<'                        => self.move_to(State::TagStarted),
+            '>'                        => Ok(Some(Token::TagEnd)),
+            '/'                        => self.move_to(State::EmptyTagClosing),
+            '='                        => Ok(Some(Token::EqualsSign)),
+            '"'                        => Ok(Some(Token::DoubleQuote)),
+            '\''                       => Ok(Some(Token::SingleQuote)),
+            '?'                        => self.move_to(State::ProcessingInstructionClosing),
+            '-'                        => self.move_to(State::CommentClosing(ClosingSubstate::First)),
+            ']'                        => self.move_to(State::CDataClosing(ClosingSubstate::First)),
+            '&'                        => Ok(Some(Token::ReferenceStart)),
+            ';'                        => Ok(Some(Token::ReferenceEnd)),
+            _ if is_whitespace_char(c) => Ok(Some(Token::Whitespace(c))),
+            _                          => Ok(Some(Token::Character(c)))
+        }
+    }
+
+    /// Encountered '<'
+    fn tag_opened(&mut self, c: char) -> Result {
+        match c {
+            '?'                        => self.move_to_with(State::Normal, Token::ProcessingInstructionStart),
+            '/'                        => self.move_to_with(State::Normal, Token::ClosingTagStart),
+            '!'                        => self.move_to(State::CommentOrCDataOrDoctypeStarted),
+            _ if is_whitespace_char(c) => self.move_to_with_unread(State::Normal, &[c], Token::OpeningTagStart),
+            _ if is_name_char(c)       => self.move_to_with_unread(State::Normal, &[c], Token::OpeningTagStart),
+            _                          => self.handle_error("<", c)
+        }
+    }
+
+    /// Encountered '<!'
+    fn comment_or_cdata_or_doctype_started(&mut self, c: char) -> Result {
+        match c {
+            '-' => self.move_to(State::CommentStarted),
+            '[' => self.move_to(State::CDataStarted(CDataStartedSubstate::E)),
+            'D' => self.move_to(State::DoctypeStarted(DoctypeStartedSubstate::D)),
+            _   => self.handle_error("<!", c)
+        }
+    }
+
+    /// Encountered '<!-'
+    fn comment_started(&mut self, c: char) -> Result {
+        match c {
+            '-' => self.move_to_with(State::Normal, Token::CommentStart),
+            _   => self.handle_error("<!-", c)
+        }
+    }
+
+    /// Encountered '<!['
+    fn cdata_started(&mut self, c: char, s: CDataStartedSubstate) -> Result {
+        use self::CDataStartedSubstate::{E, C, CD, CDA, CDAT, CDATA};
+        dispatch_on_enum_state!(self, s, c, State::CDataStarted,
+            E     ; 'C' ; C     ; "<![",
+            C     ; 'D' ; CD    ; "<![C",
+            CD    ; 'A' ; CDA   ; "<![CD",
+            CDA   ; 'T' ; CDAT  ; "<![CDA",
+            CDAT  ; 'A' ; CDATA ; "<![CDAT";
+            CDATA ; '[' ; "<![CDATA" ; self.move_to_with(State::Normal, Token::CDataStart)
+        )
+    }
+
+    /// Encountered '<!D'
+    fn doctype_started(&mut self, c: char, s: DoctypeStartedSubstate) -> Result {
+        use self::DoctypeStartedSubstate::{D, DO, DOC, DOCT, DOCTY, DOCTYP};
+        dispatch_on_enum_state!(self, s, c, State::DoctypeStarted,
+            D      ; 'O' ; DO     ; "<!D",
+            DO     ; 'C' ; DOC    ; "<!DO",
+            DOC    ; 'T' ; DOCT   ; "<!DOC",
+            DOCT   ; 'Y' ; DOCTY  ; "<!DOCT",
+            DOCTY  ; 'P' ; DOCTYP ; "<!DOCTY";
+            DOCTYP ; 'E' ; "<!DOCTYP" ; self.move_to_with(State::DoctypeFinishing(1), Token::DoctypeStart)
+        )
+    }
+
+    /// State used while awaiting the closing bracket for the <!DOCTYPE tag
+    fn doctype_finishing(&mut self, c: char, d: u8) -> Result {
+        match c {
+            '<' => self.move_to(State::DoctypeFinishing(d + 1)),
+            '>' if d == 1 => self.move_to_with(State::Normal, Token::TagEnd),
+            '>' => self.move_to(State::DoctypeFinishing(d - 1)),
+            _ => Ok(None),
+        }
+    }
+
+    /// Encountered '?'
+    fn processing_instruction_closing(&mut self, c: char) -> Result {
+        match c {
+            '>' => self.move_to_with(State::Normal, Token::ProcessingInstructionEnd),
+            _   => self.move_to_with_unread(State::Normal, &[c], Token::Character('?')),
+        }
+    }
+
+    /// Encountered '/'
+    fn empty_element_closing(&mut self, c: char) -> Result {
+        match c {
+            '>' => self.move_to_with(State::Normal, Token::EmptyTagEnd),
+            _   => self.move_to_with_unread(State::Normal, &[c], Token::Character('/')),
+        }
+    }
+
+    /// Encountered '-'
+    fn comment_closing(&mut self, c: char, s: ClosingSubstate) -> Result {
+        match s {
+            ClosingSubstate::First => match c {
+                '-' => self.move_to(State::CommentClosing(ClosingSubstate::Second)),
+                _   => self.move_to_with_unread(State::Normal, &[c], Token::Character('-'))
+            },
+            ClosingSubstate::Second => match c {
+                '>'                      => self.move_to_with(State::Normal, Token::CommentEnd),
+                // double dash not followed by a greater-than is a hard error inside comment
+                _ if self.inside_comment => self.handle_error("--", c),
+                // nothing else except comment closing starts with a double dash, and comment
+                // closing can never be after another dash, and also we're outside of a comment,
+                // therefore it is safe to push only the last read character to the list of unread
+                // characters and pass the double dash directly to the output
+                _                        => self.move_to_with_unread(State::Normal, &[c], Token::Chunk("--"))
+            }
+        }
+    }
+
+    /// Encountered ']'
+    fn cdata_closing(&mut self, c: char, s: ClosingSubstate) -> Result {
+        match s {
+            ClosingSubstate::First => match c {
+                ']' => self.move_to(State::CDataClosing(ClosingSubstate::Second)),
+                _   => self.move_to_with_unread(State::Normal, &[c], Token::Character(']'))
+            },
+            ClosingSubstate::Second => match c {
+                '>' => self.move_to_with(State::Normal, Token::CDataEnd),
+                _   => self.move_to_with_unread(State::Normal, &[']', c], Token::Character(']'))
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use common::{Position};
+    use std::io::{BufReader, Cursor};
+
+    use super::{Lexer, Token};
+
+    macro_rules! assert_oks(
+        (for $lex:ident and $buf:ident ; $($e:expr)+) => ({
+            $(
+                assert_eq!(Ok(Some($e)), $lex.next_token(&mut $buf));
+             )+
+        })
+    );
+
+    macro_rules! assert_err(
+        (for $lex:ident and $buf:ident expect row $r:expr ; $c:expr, $s:expr) => ({
+            let err = $lex.next_token(&mut $buf);
+            assert!(err.is_err());
+            let err = err.unwrap_err();
+            assert_eq!($r as u64, err.position().row);
+            assert_eq!($c as u64, err.position().column);
+            assert_eq!($s, err.msg());
+        })
+    );
+
+    macro_rules! assert_none(
+        (for $lex:ident and $buf:ident) => (
+            assert_eq!(Ok(None), $lex.next_token(&mut $buf));
+        )
+    );
+
+    fn make_lex_and_buf(s: &str) -> (Lexer, BufReader<Cursor<Vec<u8>>>) {
+        (Lexer::new(), BufReader::new(Cursor::new(s.to_owned().into_bytes())))
+    }
+
+    #[test]
+    fn simple_lexer_test() {
+        let (mut lex, mut buf) = make_lex_and_buf(
+            r#"<a p='q'> x<b z="y">d	</b></a><p/> <?nm ?> <!-- a c --> &nbsp;"#
+        );
+
+        assert_oks!(for lex and buf ;
+            Token::OpeningTagStart
+            Token::Character('a')
+            Token::Whitespace(' ')
+            Token::Character('p')
+            Token::EqualsSign
+            Token::SingleQuote
+            Token::Character('q')
+            Token::SingleQuote
+            Token::TagEnd
+            Token::Whitespace(' ')
+            Token::Character('x')
+            Token::OpeningTagStart
+            Token::Character('b')
+            Token::Whitespace(' ')
+            Token::Character('z')
+            Token::EqualsSign
+            Token::DoubleQuote
+            Token::Character('y')
+            Token::DoubleQuote
+            Token::TagEnd
+            Token::Character('d')
+            Token::Whitespace('\t')
+            Token::ClosingTagStart
+            Token::Character('b')
+            Token::TagEnd
+            Token::ClosingTagStart
+            Token::Character('a')
+            Token::TagEnd
+            Token::OpeningTagStart
+            Token::Character('p')
+            Token::EmptyTagEnd
+            Token::Whitespace(' ')
+            Token::ProcessingInstructionStart
+            Token::Character('n')
+            Token::Character('m')
+            Token::Whitespace(' ')
+            Token::ProcessingInstructionEnd
+            Token::Whitespace(' ')
+            Token::CommentStart
+            Token::Whitespace(' ')
+            Token::Character('a')
+            Token::Whitespace(' ')
+            Token::Character('c')
+            Token::Whitespace(' ')
+            Token::CommentEnd
+            Token::Whitespace(' ')
+            Token::ReferenceStart
+            Token::Character('n')
+            Token::Character('b')
+            Token::Character('s')
+            Token::Character('p')
+            Token::ReferenceEnd
+        );
+        assert_none!(for lex and buf);
+    }
+
+    #[test]
+    fn special_chars_test() {
+        let (mut lex, mut buf) = make_lex_and_buf(
+            r#"?x!+ // -| ]z]]"#
+        );
+
+        assert_oks!(for lex and buf ;
+            Token::Character('?')
+            Token::Character('x')
+            Token::Character('!')
+            Token::Character('+')
+            Token::Whitespace(' ')
+            Token::Character('/')
+            Token::Character('/')
+            Token::Whitespace(' ')
+            Token::Character('-')
+            Token::Character('|')
+            Token::Whitespace(' ')
+            Token::Character(']')
+            Token::Character('z')
+            Token::Chunk("]]")
+        );
+        assert_none!(for lex and buf);
+    }
+
+    #[test]
+    fn cdata_test() {
+        let (mut lex, mut buf) = make_lex_and_buf(
+            r#"<a><![CDATA[x y ?]]> </a>"#
+        );
+
+        assert_oks!(for lex and buf ;
+            Token::OpeningTagStart
+            Token::Character('a')
+            Token::TagEnd
+            Token::CDataStart
+            Token::Character('x')
+            Token::Whitespace(' ')
+            Token::Character('y')
+            Token::Whitespace(' ')
+            Token::Character('?')
+            Token::CDataEnd
+            Token::Whitespace(' ')
+            Token::ClosingTagStart
+            Token::Character('a')
+            Token::TagEnd
+        );
+        assert_none!(for lex and buf);
+    }
+
+    #[test]
+    fn doctype_test() {
+        let (mut lex, mut buf) = make_lex_and_buf(
+            r#"<a><!DOCTYPE ab xx z> "#
+        );
+        assert_oks!(for lex and buf ;
+            Token::OpeningTagStart
+            Token::Character('a')
+            Token::TagEnd
+            Token::DoctypeStart
+            Token::TagEnd
+            Token::Whitespace(' ')
+        );
+        assert_none!(for lex and buf)
+    }
+
+    #[test]
+    fn doctype_with_internal_subset_test() {
+        let (mut lex, mut buf) = make_lex_and_buf(
+            r#"<a><!DOCTYPE ab[<!ELEMENT ba> ]> "#
+        );
+        assert_oks!(for lex and buf ;
+            Token::OpeningTagStart
+            Token::Character('a')
+            Token::TagEnd
+            Token::DoctypeStart
+            Token::TagEnd
+            Token::Whitespace(' ')
+        );
+        assert_none!(for lex and buf)
+    }
+
+    #[test]
+    fn end_of_stream_handling_ok() {
+        macro_rules! eof_check(
+            ($data:expr ; $token:expr) => ({
+                let (mut lex, mut buf) = make_lex_and_buf($data);
+                assert_oks!(for lex and buf ; $token);
+                assert_none!(for lex and buf);
+            })
+        );
+        eof_check!("?"  ; Token::Character('?'));
+        eof_check!("/"  ; Token::Character('/'));
+        eof_check!("-"  ; Token::Character('-'));
+        eof_check!("]"  ; Token::Character(']'));
+        eof_check!("]]" ; Token::Chunk("]]"));
+    }
+
+    #[test]
+    fn end_of_stream_handling_error() {
+        macro_rules! eof_check(
+            ($data:expr; $r:expr, $c:expr) => ({
+                let (mut lex, mut buf) = make_lex_and_buf($data);
+                assert_err!(for lex and buf expect row $r ; $c, "Unexpected end of stream");
+                assert_none!(for lex and buf);
+            })
+        );
+        eof_check!("<"        ; 0, 1);
+        eof_check!("<!"       ; 0, 2);
+        eof_check!("<!-"      ; 0, 3);
+        eof_check!("<!["      ; 0, 3);
+        eof_check!("<![C"     ; 0, 4);
+        eof_check!("<![CD"    ; 0, 5);
+        eof_check!("<![CDA"   ; 0, 6);
+        eof_check!("<![CDAT"  ; 0, 7);
+        eof_check!("<![CDATA" ; 0, 8);
+        eof_check!("--"       ; 0, 2);
+    }
+
+    #[test]
+    fn error_in_comment_or_cdata_prefix() {
+        let (mut lex, mut buf) = make_lex_and_buf("<!x");
+        assert_err!(for lex and buf expect row 0 ; 0,
+            "Unexpected token '<!' before 'x'"
+        );
+
+        let (mut lex, mut buf) = make_lex_and_buf("<!x");
+        lex.disable_errors();
+        assert_oks!(for lex and buf ;
+            Token::Chunk("<!")
+            Token::Character('x')
+        );
+        assert_none!(for lex and buf);
+    }
+
+    #[test]
+    fn error_in_comment_started() {
+        let (mut lex, mut buf) = make_lex_and_buf("<!-\t");
+        assert_err!(for lex and buf expect row 0 ; 0,
+            "Unexpected token '<!-' before '\t'"
+        );
+
+        let (mut lex, mut buf) = make_lex_and_buf("<!-\t");
+        lex.disable_errors();
+        assert_oks!(for lex and buf ;
+            Token::Chunk("<!-")
+            Token::Whitespace('\t')
+        );
+        assert_none!(for lex and buf);
+    }
+
+    #[test]
+    fn error_in_comment_two_dashes_not_at_end() {
+        let (mut lex, mut buf) = make_lex_and_buf("--x");
+        lex.inside_comment();
+        assert_err!(for lex and buf expect row 0; 0,
+            "Unexpected token '--' before 'x'"
+        );
+
+        let (mut lex, mut buf) = make_lex_and_buf("--x");
+        assert_oks!(for lex and buf ;
+            Token::Chunk("--")
+            Token::Character('x')
+        );
+    }
+
+    macro_rules! check_case(
+        ($chunk:expr, $app:expr; $data:expr; $r:expr, $c:expr, $s:expr) => ({
+            let (mut lex, mut buf) = make_lex_and_buf($data);
+            assert_err!(for lex and buf expect row $r ; $c, $s);
+
+            let (mut lex, mut buf) = make_lex_and_buf($data);
+            lex.disable_errors();
+            assert_oks!(for lex and buf ;
+                Token::Chunk($chunk)
+                Token::Character($app)
+            );
+            assert_none!(for lex and buf);
+        })
+    );
+
+    #[test]
+    fn error_in_cdata_started() {
+        check_case!("<![",      '['; "<![["      ; 0, 0, "Unexpected token '<![' before '['");
+        check_case!("<![C",     '['; "<![C["     ; 0, 0, "Unexpected token '<![C' before '['");
+        check_case!("<![CD",    '['; "<![CD["    ; 0, 0, "Unexpected token '<![CD' before '['");
+        check_case!("<![CDA",   '['; "<![CDA["   ; 0, 0, "Unexpected token '<![CDA' before '['");
+        check_case!("<![CDAT",  '['; "<![CDAT["  ; 0, 0, "Unexpected token '<![CDAT' before '['");
+        check_case!("<![CDATA", '|'; "<![CDATA|" ; 0, 0, "Unexpected token '<![CDATA' before '|'");
+    }
+
+    #[test]
+    fn error_in_doctype_started() {
+        check_case!("<!D",      'a'; "<!Da"      ; 0, 0, "Unexpected token '<!D' before 'a'");
+        check_case!("<!DO",     'b'; "<!DOb"     ; 0, 0, "Unexpected token '<!DO' before 'b'");
+        check_case!("<!DOC",    'c'; "<!DOCc"    ; 0, 0, "Unexpected token '<!DOC' before 'c'");
+        check_case!("<!DOCT",   'd'; "<!DOCTd"   ; 0, 0, "Unexpected token '<!DOCT' before 'd'");
+        check_case!("<!DOCTY",  'e'; "<!DOCTYe"  ; 0, 0, "Unexpected token '<!DOCTY' before 'e'");
+        check_case!("<!DOCTYP", 'f'; "<!DOCTYPf" ; 0, 0, "Unexpected token '<!DOCTYP' before 'f'");
+    }
+
+
+
+    #[test]
+    fn issue_98_cdata_ending_with_right_bracket() {
+        let (mut lex, mut buf) = make_lex_and_buf(
+            r#"<![CDATA[Foo [Bar]]]>"#
+        );
+
+        assert_oks!(for lex and buf ;
+            Token::CDataStart
+            Token::Character('F')
+            Token::Character('o')
+            Token::Character('o')
+            Token::Whitespace(' ')
+            Token::Character('[')
+            Token::Character('B')
+            Token::Character('a')
+            Token::Character('r')
+            Token::Character(']')
+            Token::CDataEnd
+        );
+        assert_none!(for lex and buf);
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/mod.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,129 @@
+//! Contains high-level interface for a pull-based XML parser.
+//!
+//! The most important type in this module is `EventReader`, which provides an iterator
+//! view for events in XML document.
+
+use std::io::{Read};
+use std::result;
+
+use common::{Position, TextPosition};
+
+pub use self::config::ParserConfig;
+pub use self::events::XmlEvent;
+
+use self::parser::PullParser;
+
+mod lexer;
+mod parser;
+mod config;
+mod events;
+
+mod error;
+pub use self::error::{Error, ErrorKind};
+
+/// A result type yielded by `XmlReader`.
+pub type Result<T> = result::Result<T, Error>;
+
+/// A wrapper around an `std::io::Read` instance which provides pull-based XML parsing.
+pub struct EventReader<R: Read> {
+    source: R,
+    parser: PullParser
+}
+
+impl<R: Read> EventReader<R> {
+    /// Creates a new reader, consuming the given stream.
+    #[inline]
+    pub fn new(source: R) -> EventReader<R> {
+        EventReader::new_with_config(source, ParserConfig::new())
+    }
+
+    /// Creates a new reader with the provded configuration, consuming the given stream.
+    #[inline]
+    pub fn new_with_config(source: R, config: ParserConfig) -> EventReader<R> {
+        EventReader { source: source, parser: PullParser::new(config) }
+    }
+
+    /// Pulls and returns next XML event from the stream.
+    ///
+    /// If returned event is `XmlEvent::Error` or `XmlEvent::EndDocument`, then
+    /// further calls to this method will return this event again.
+    #[inline]
+    pub fn next(&mut self) -> Result<XmlEvent> {
+        self.parser.next(&mut self.source)
+    }
+
+    pub fn source(&self) -> &R { &self.source }
+    pub fn source_mut(&mut self) -> &mut R { &mut self.source }
+
+    /// Unwraps this `EventReader`, returning the underlying reader.
+    ///
+    /// Note that this operation is destructive; unwrapping the reader and wrapping it
+    /// again with `EventReader::new()` will create a fresh reader which will attempt
+    /// to parse an XML document from the beginning.
+    pub fn into_inner(self) -> R {
+        self.source
+    }
+}
+
+impl<B: Read> Position for EventReader<B> {
+    /// Returns the position of the last event produced by the reader.
+    #[inline]
+    fn position(&self) -> TextPosition {
+        self.parser.position()
+    }
+}
+
+impl<R: Read> IntoIterator for EventReader<R> {
+    type Item = Result<XmlEvent>;
+    type IntoIter = Events<R>;
+
+    fn into_iter(self) -> Events<R> {
+        Events { reader: self, finished: false }
+    }
+}
+
+/// An iterator over XML events created from some type implementing `Read`.
+///
+/// When the next event is `xml::event::Error` or `xml::event::EndDocument`, then
+/// it will be returned by the iterator once, and then it will stop producing events.
+pub struct Events<R: Read> {
+    reader: EventReader<R>,
+    finished: bool
+}
+
+impl<R: Read> Events<R> {
+    /// Unwraps the iterator, returning the internal `EventReader`.
+    #[inline]
+    pub fn into_inner(self) -> EventReader<R> {
+        self.reader
+    }
+
+    pub fn source(&self) -> &R { &self.reader.source }
+    pub fn source_mut(&mut self) -> &mut R { &mut self.reader.source }
+
+}
+
+impl<R: Read> Iterator for Events<R> {
+    type Item = Result<XmlEvent>;
+
+    #[inline]
+    fn next(&mut self) -> Option<Result<XmlEvent>> {
+        if self.finished && !self.reader.parser.is_ignoring_end_of_stream() { None }
+        else {
+            let ev = self.reader.next();
+            match ev {
+                Ok(XmlEvent::EndDocument) | Err(_) => self.finished = true,
+                _ => {}
+            }
+            Some(ev)
+        }
+    }
+}
+
+impl<'r> EventReader<&'r [u8]> {
+    /// A convenience method to create an `XmlReader` from a string slice.
+    #[inline]
+    pub fn from_str(source: &'r str) -> EventReader<&'r [u8]> {
+        EventReader::new(source.as_bytes())
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_cdata.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_cdata.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_cdata.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_cdata.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,32 @@
+use reader::events::XmlEvent;
+use reader::lexer::Token;
+
+use super::{Result, PullParser, State};
+
+impl PullParser {
+    pub fn inside_cdata(&mut self, t: Token) -> Option<Result> {
+        match t {
+            Token::CDataEnd => {
+                self.lexer.enable_errors();
+                let event = if self.config.cdata_to_characters {
+                    None
+                } else {
+                    let data = self.take_buf();
+                    Some(Ok(XmlEvent::CData(data)))
+                };
+                self.into_state(State::OutsideTag, event)
+            }
+
+            Token::Whitespace(_) => {
+                t.push_to_string(&mut self.buf);
+                None
+            }
+
+            _ => {
+                self.inside_whitespace = false;
+                t.push_to_string(&mut self.buf);
+                None
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_closing_tag_name.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_closing_tag_name.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_closing_tag_name.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_closing_tag_name.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,34 @@
+use namespace;
+
+use reader::lexer::Token;
+
+use super::{Result, PullParser, State, QualifiedNameTarget, ClosingTagSubstate};
+
+impl PullParser {
+    pub fn inside_closing_tag_name(&mut self, t: Token, s: ClosingTagSubstate) -> Option<Result> {
+        match s {
+            ClosingTagSubstate::CTInsideName => self.read_qualified_name(t, QualifiedNameTarget::ClosingTagNameTarget, |this, token, name| {
+                match name.prefix_ref() {
+                    Some(prefix) if prefix == namespace::NS_XML_PREFIX ||
+                                    prefix == namespace::NS_XMLNS_PREFIX =>
+                        // TODO: {:?} is bad, need something better
+                        Some(self_error!(this; "'{:?}' cannot be an element name prefix", name.prefix)),
+                    _ => {
+                        this.data.element_name = Some(name.clone());
+                        match token {
+                            Token::Whitespace(_) => this.into_state_continue(State::InsideClosingTag(ClosingTagSubstate::CTAfterName)),
+                            Token::TagEnd => this.emit_end_element(),
+                            _ => Some(self_error!(this; "Unexpected token inside closing tag: {}", token))
+                        }
+                    }
+                }
+            }),
+            ClosingTagSubstate::CTAfterName => match t {
+                Token::Whitespace(_) => None,  //  Skip whitespace
+                Token::TagEnd => self.emit_end_element(),
+                _ => Some(self_error!(self; "Unexpected token inside closing tag: {}", t))
+            }
+        }
+    }
+
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_comment.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_comment.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_comment.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_comment.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,32 @@
+use reader::events::XmlEvent;
+use reader::lexer::Token;
+
+use super::{Result, PullParser, State};
+
+impl PullParser {
+    pub fn inside_comment(&mut self, t: Token) -> Option<Result> {
+        match t {
+            // Double dash is illegal inside a comment
+            Token::Chunk(ref s) if &s[..] == "--" => Some(self_error!(self; "Unexpected token inside a comment: --")),
+
+            Token::CommentEnd if self.config.ignore_comments => {
+                self.lexer.outside_comment();
+                self.into_state_continue(State::OutsideTag)
+            }
+
+            Token::CommentEnd => {
+                self.lexer.outside_comment();
+                let data = self.take_buf();
+                self.into_state_emit(State::OutsideTag, Ok(XmlEvent::Comment(data)))
+            }
+
+            _ if self.config.ignore_comments => None,  // Do not modify buffer if ignoring the comment
+
+            _ => {
+                t.push_to_string(&mut self.buf);
+                None
+            }
+        }
+    }
+
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_declaration.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_declaration.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_declaration.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_declaration.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,151 @@
+
+use common::XmlVersion;
+
+use reader::events::XmlEvent;
+use reader::lexer::Token;
+
+use super::{
+    Result, PullParser, State, DeclarationSubstate, QualifiedNameTarget,
+    DEFAULT_VERSION, DEFAULT_ENCODING
+};
+
+impl PullParser {
+    // TODO: remove redundancy via macros or extra methods
+    pub fn inside_declaration(&mut self, t: Token, s: DeclarationSubstate) -> Option<Result> {
+        macro_rules! unexpected_token(
+            ($this:expr; $t:expr) => (Some($this.error(format!("Unexpected token inside XML declaration: {}", $t))));
+            ($t:expr) => (unexpected_token!(self; $t));
+        );
+
+        #[inline]
+        fn emit_start_document(this: &mut PullParser) -> Option<Result> {
+            this.parsed_declaration = true;
+            let version = this.data.take_version();
+            let encoding = this.data.take_encoding();
+            let standalone = this.data.take_standalone();
+            this.into_state_emit(State::OutsideTag, Ok(XmlEvent::StartDocument {
+                version: version.unwrap_or(DEFAULT_VERSION),
+                encoding: encoding.unwrap_or(DEFAULT_ENCODING.into()),
+                standalone: standalone
+            }))
+        }
+
+        match s {
+            DeclarationSubstate::BeforeVersion => match t {
+                Token::Whitespace(_) => None,  // continue
+                Token::Character('v') => self.into_state_continue(State::InsideDeclaration(DeclarationSubstate::InsideVersion)),
+                _ => unexpected_token!(t)
+            },
+
+            DeclarationSubstate::InsideVersion => self.read_qualified_name(t, QualifiedNameTarget::AttributeNameTarget, |this, token, name| {
+                match &name.local_name[..] {
+                    "ersion" if name.namespace.is_none() =>
+                        this.into_state_continue(State::InsideDeclaration(
+                            if token == Token::EqualsSign {
+                                DeclarationSubstate::InsideVersionValue
+                            } else {
+                                DeclarationSubstate::AfterVersion
+                            }
+                        )),
+                    _ => unexpected_token!(this; name)
+                }
+            }),
+
+            DeclarationSubstate::AfterVersion => match t {
+                Token::Whitespace(_) => None,
+                Token::EqualsSign => self.into_state_continue(State::InsideDeclaration(DeclarationSubstate::InsideVersionValue)),
+                _ => unexpected_token!(t)
+            },
+
+            DeclarationSubstate::InsideVersionValue => self.read_attribute_value(t, |this, value| {
+                this.data.version = match &value[..] {
+                    "1.0" => Some(XmlVersion::Version10),
+                    "1.1" => Some(XmlVersion::Version11),
+                    _     => None
+                };
+                if this.data.version.is_some() {
+                    this.into_state_continue(State::InsideDeclaration(DeclarationSubstate::AfterVersionValue))
+                } else {
+                    Some(self_error!(this; "Unexpected XML version value: {}", value))
+                }
+            }),
+
+            DeclarationSubstate::AfterVersionValue => match t {
+                Token::Whitespace(_) => None,  // skip whitespace
+                Token::Character('e') => self.into_state_continue(State::InsideDeclaration(DeclarationSubstate::InsideEncoding)),
+                Token::Character('s') => self.into_state_continue(State::InsideDeclaration(DeclarationSubstate::InsideStandaloneDecl)),
+                Token::ProcessingInstructionEnd => emit_start_document(self),
+                _ => unexpected_token!(t)
+            },
+
+            DeclarationSubstate::InsideEncoding => self.read_qualified_name(t, QualifiedNameTarget::AttributeNameTarget, |this, token, name| {
+                match &name.local_name[..] {
+                    "ncoding" if name.namespace.is_none() =>
+                        this.into_state_continue(State::InsideDeclaration(
+                            if token == Token::EqualsSign { DeclarationSubstate::InsideEncodingValue } else { DeclarationSubstate::AfterEncoding }
+                        )),
+                    _ => unexpected_token!(this; name)
+                }
+            }),
+
+            DeclarationSubstate::AfterEncoding => match t {
+                Token::Whitespace(_) => None,
+                Token::EqualsSign => self.into_state_continue(State::InsideDeclaration(DeclarationSubstate::InsideEncodingValue)),
+                _ => unexpected_token!(t)
+            },
+
+            DeclarationSubstate::InsideEncodingValue => self.read_attribute_value(t, |this, value| {
+                this.data.encoding = Some(value);
+                this.into_state_continue(State::InsideDeclaration(DeclarationSubstate::BeforeStandaloneDecl))
+            }),
+
+            DeclarationSubstate::BeforeStandaloneDecl => match t {
+                Token::Whitespace(_) => None,  // skip whitespace
+                Token::Character('s') => self.into_state_continue(State::InsideDeclaration(DeclarationSubstate::InsideStandaloneDecl)),
+                Token::ProcessingInstructionEnd => emit_start_document(self),
+                _ => unexpected_token!(t)
+            },
+
+            DeclarationSubstate::InsideStandaloneDecl => self.read_qualified_name(t, QualifiedNameTarget::AttributeNameTarget, |this, token, name| {
+                match &name.local_name[..] {
+                    "tandalone" if name.namespace.is_none() =>
+                        this.into_state_continue(State::InsideDeclaration(
+                            if token == Token::EqualsSign {
+                                DeclarationSubstate::InsideStandaloneDeclValue
+                            } else {
+                                DeclarationSubstate::AfterStandaloneDecl
+                            }
+                        )),
+                    _ => unexpected_token!(this; name)
+                }
+            }),
+
+            DeclarationSubstate::AfterStandaloneDecl => match t {
+                Token::Whitespace(_) => None,
+                Token::EqualsSign => self.into_state_continue(State::InsideDeclaration(DeclarationSubstate::InsideStandaloneDeclValue)),
+                _ => unexpected_token!(t)
+            },
+
+            DeclarationSubstate::InsideStandaloneDeclValue => self.read_attribute_value(t, |this, value| {
+                let standalone = match &value[..] {
+                    "yes" => Some(true),
+                    "no"  => Some(false),
+                    _     => None
+                };
+                if standalone.is_some() {
+                    this.data.standalone = standalone;
+                    this.into_state_continue(State::InsideDeclaration(DeclarationSubstate::AfterStandaloneDeclValue))
+                } else {
+                    Some(self_error!(this; "Invalid standalone declaration value: {}", value))
+                }
+            }),
+
+            DeclarationSubstate::AfterStandaloneDeclValue => match t {
+                Token::Whitespace(_) => None,  // skip whitespace
+                Token::ProcessingInstructionEnd => emit_start_document(self),
+                _ => unexpected_token!(t)
+            }
+        }
+    }
+
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_doctype.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_doctype.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_doctype.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_doctype.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,16 @@
+use reader::lexer::Token;
+
+use super::{Result, PullParser, State};
+
+impl PullParser {
+    pub fn inside_doctype(&mut self, t: Token) -> Option<Result> {
+        match t {
+            Token::TagEnd => {
+                self.lexer.enable_errors();
+                self.into_state_continue(State::OutsideTag)
+            }
+
+            _ => None
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_opening_tag.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_opening_tag.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_opening_tag.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_opening_tag.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,108 @@
+use common::is_name_start_char;
+use attribute::OwnedAttribute;
+use namespace;
+
+use reader::lexer::Token;
+
+use super::{Result, PullParser, State, OpeningTagSubstate, QualifiedNameTarget};
+
+impl PullParser {
+    pub fn inside_opening_tag(&mut self, t: Token, s: OpeningTagSubstate) -> Option<Result> {
+        macro_rules! unexpected_token(($t:expr) => (Some(self_error!(self; "Unexpected token inside opening tag: {}", $t))));
+        match s {
+            OpeningTagSubstate::InsideName => self.read_qualified_name(t, QualifiedNameTarget::OpeningTagNameTarget, |this, token, name| {
+                match name.prefix_ref() {
+                    Some(prefix) if prefix == namespace::NS_XML_PREFIX ||
+                                    prefix == namespace::NS_XMLNS_PREFIX =>
+                        Some(self_error!(this; "'{:?}' cannot be an element name prefix", name.prefix)),
+                    _ => {
+                        this.data.element_name = Some(name.clone());
+                        match token {
+                            Token::TagEnd => this.emit_start_element(false),
+                            Token::EmptyTagEnd => this.emit_start_element(true),
+                            Token::Whitespace(_) => this.into_state_continue(State::InsideOpeningTag(OpeningTagSubstate::InsideTag)),
+                            _ => unreachable!()
+                        }
+                    }
+                }
+            }),
+
+            OpeningTagSubstate::InsideTag => match t {
+                Token::Whitespace(_) => None,  // skip whitespace
+                Token::Character(c) if is_name_start_char(c) => {
+                    self.buf.push(c);
+                    self.into_state_continue(State::InsideOpeningTag(OpeningTagSubstate::InsideAttributeName))
+                }
+                Token::TagEnd => self.emit_start_element(false),
+                Token::EmptyTagEnd => self.emit_start_element(true),
+                _ => unexpected_token!(t)
+            },
+
+            OpeningTagSubstate::InsideAttributeName => self.read_qualified_name(t, QualifiedNameTarget::AttributeNameTarget, |this, token, name| {
+                this.data.attr_name = Some(name);
+                match token {
+                    Token::Whitespace(_) => this.into_state_continue(State::InsideOpeningTag(OpeningTagSubstate::AfterAttributeName)),
+                    Token::EqualsSign => this.into_state_continue(State::InsideOpeningTag(OpeningTagSubstate::InsideAttributeValue)),
+                    _ => unreachable!()
+                }
+            }),
+
+            OpeningTagSubstate::AfterAttributeName => match t {
+                Token::Whitespace(_) => None,
+                Token::EqualsSign => self.into_state_continue(State::InsideOpeningTag(OpeningTagSubstate::InsideAttributeValue)),
+                _ => unexpected_token!(t)
+            },
+
+            OpeningTagSubstate::InsideAttributeValue => self.read_attribute_value(t, |this, value| {
+                let name = this.data.take_attr_name().unwrap();  // unwrap() will always succeed here
+
+                // check that no attribute with such name is already present
+                // if there is one, XML is not well-formed
+                if this.data.attributes.iter().find(|a| a.name == name).is_some() {  // TODO: looks bad
+                    // TODO: ideally this error should point to the beginning of the attribute,
+                    // TODO: not the end of its value
+                    Some(self_error!(this; "Attribute '{}' is redefined", name))
+                } else {
+                    match name.prefix_ref() {
+                        // declaring a new prefix; it is sufficient to check prefix only
+                        // because "xmlns" prefix is reserved
+                        Some(namespace::NS_XMLNS_PREFIX) => {
+                            let ln = &name.local_name[..];
+                            if ln == namespace::NS_XMLNS_PREFIX {
+                                Some(self_error!(this; "Cannot redefine prefix '{}'", namespace::NS_XMLNS_PREFIX))
+                            } else if ln == namespace::NS_XML_PREFIX && &value[..] != namespace::NS_XML_URI {
+                                Some(self_error!(this; "Prefix '{}' cannot be rebound to another value", namespace::NS_XML_PREFIX))
+                            } else if value.is_empty() {
+                                Some(self_error!(this; "Cannot undefine prefix '{}'", ln))
+                            } else {
+                                this.nst.put(name.local_name.clone(), value);
+                                this.into_state_continue(State::InsideOpeningTag(OpeningTagSubstate::InsideTag))
+                            }
+                        }
+
+                        // declaring default namespace
+                        None if &name.local_name[..] == namespace::NS_XMLNS_PREFIX =>
+                            match &value[..] {
+                                namespace::NS_XMLNS_PREFIX | namespace::NS_XML_PREFIX =>
+                                    Some(self_error!(this; "Namespace '{}' cannot be default", value)),
+                                _ => {
+                                    this.nst.put(namespace::NS_NO_PREFIX, value.clone());
+                                    this.into_state_continue(State::InsideOpeningTag(OpeningTagSubstate::InsideTag))
+                                }
+                            },
+
+                        // regular attribute
+                        _ => {
+                            this.data.attributes.push(OwnedAttribute {
+                                name: name.clone(),
+                                value: value
+                            });
+                            this.into_state_continue(State::InsideOpeningTag(OpeningTagSubstate::InsideTag))
+                        }
+                    }
+                }
+            })
+        }
+    }
+
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_processing_instruction.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_processing_instruction.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_processing_instruction.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_processing_instruction.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,96 @@
+use common::{
+    is_name_start_char, is_name_char,
+};
+
+use reader::events::XmlEvent;
+use reader::lexer::Token;
+
+use super::{Result, PullParser, State, ProcessingInstructionSubstate, DeclarationSubstate};
+
+impl PullParser {
+    pub fn inside_processing_instruction(&mut self, t: Token, s: ProcessingInstructionSubstate) -> Option<Result> {
+        match s {
+            ProcessingInstructionSubstate::PIInsideName => match t {
+                Token::Character(c) if !self.buf_has_data() && is_name_start_char(c) ||
+                                 self.buf_has_data() && is_name_char(c) => self.append_char_continue(c),
+
+                Token::ProcessingInstructionEnd => {
+                    // self.buf contains PI name
+                    let name = self.take_buf();
+
+                    // Don't need to check for declaration because it has mandatory attributes
+                    // but there is none
+                    match &name[..] {
+                        // Name is empty, it is an error
+                        "" => Some(self_error!(self; "Encountered processing instruction without name")),
+
+                        // Found <?xml-like PI not at the beginning of a document,
+                        // it is an error - see section 2.6 of XML 1.1 spec
+                        "xml"|"xmL"|"xMl"|"xML"|"Xml"|"XmL"|"XMl"|"XML" =>
+                            Some(self_error!(self; "Invalid processing instruction: <?{}", name)),
+
+                        // All is ok, emitting event
+                        _ => {
+                            self.into_state_emit(
+                                State::OutsideTag,
+                                Ok(XmlEvent::ProcessingInstruction {
+                                    name: name,
+                                    data: None
+                                })
+                            )
+                        }
+                    }
+                }
+
+                Token::Whitespace(_) => {
+                    // self.buf contains PI name
+                    let name = self.take_buf();
+
+                    match &name[..] {
+                        // We have not ever encountered an element and have not parsed XML declaration
+                        "xml" if !self.encountered_element && !self.parsed_declaration =>
+                            self.into_state_continue(State::InsideDeclaration(DeclarationSubstate::BeforeVersion)),
+
+                        // Found <?xml-like PI after the beginning of a document,
+                        // it is an error - see section 2.6 of XML 1.1 spec
+                        "xml"|"xmL"|"xMl"|"xML"|"Xml"|"XmL"|"XMl"|"XML"
+                            if self.encountered_element || self.parsed_declaration =>
+                            Some(self_error!(self; "Invalid processing instruction: <?{}", name)),
+
+                        // All is ok, starting parsing PI data
+                        _ => {
+                            self.lexer.disable_errors();  // data is arbitrary, so disable errors
+                            self.data.name = name;
+                            self.into_state_continue(State::InsideProcessingInstruction(ProcessingInstructionSubstate::PIInsideData))
+                        }
+
+                    }
+                }
+
+                _ => Some(self_error!(self; "Unexpected token: <?{}{}", self.buf, t))
+            },
+
+            ProcessingInstructionSubstate::PIInsideData => match t {
+                Token::ProcessingInstructionEnd => {
+                    self.lexer.enable_errors();
+                    let name = self.data.take_name();
+                    let data = self.take_buf();
+                    self.into_state_emit(
+                        State::OutsideTag,
+                        Ok(XmlEvent::ProcessingInstruction {
+                            name: name,
+                            data: Some(data)
+                        })
+                    )
+                },
+
+                // Any other token should be treated as plain characters
+                _ => {
+                    t.push_to_string(&mut self.buf);
+                    None
+                }
+            },
+        }
+    }
+
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_reference.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_reference.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_reference.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/inside_reference.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,89 @@
+use std::char;
+
+use common::{is_name_start_char, is_name_char, is_whitespace_str};
+
+use reader::lexer::Token;
+
+use super::{Result, PullParser, State};
+
+impl PullParser {
+    pub fn inside_reference(&mut self, t: Token, prev_st: State) -> Option<Result> {
+        match t {
+            Token::Character(c) if !self.data.ref_data.is_empty() && is_name_char(c) ||
+                             self.data.ref_data.is_empty() && (is_name_start_char(c) || c == '#') => {
+                self.data.ref_data.push(c);
+                None
+            }
+
+            Token::ReferenceEnd => {
+                // TODO: check for unicode correctness
+                let name = self.data.take_ref_data();
+                let name_len = name.len();  // compute once
+                let c = match &name[..] {
+                    "lt"   => Ok('<'.to_string()),
+                    "gt"   => Ok('>'.to_string()),
+                    "amp"  => Ok('&'.to_string()),
+                    "apos" => Ok('\''.to_string()),
+                    "quot" => Ok('"'.to_string()),
+                    ""     => Err(self_error!(self; "Encountered empty entity")),
+                    _ if name_len > 2 && name.starts_with("#x") => {
+                        let num_str = &name[2..name_len];
+                        if num_str == "0" {
+                            Err(self_error!(self; "Null character entity is not allowed"))
+                        } else {
+                            if self.config.replace_unknown_entity_references {
+                                match u32::from_str_radix(num_str, 16).ok().map(|i| char::from_u32(i).unwrap_or('\u{fffd}')) {
+                                    Some(c) => Ok(c.to_string()),
+                                    None    => Err(self_error!(self; "Invalid hexadecimal character number in an entity: {}", name))
+                                }
+                            } else {
+                                match u32::from_str_radix(num_str, 16).ok().and_then(char::from_u32) {
+                                    Some(c) => Ok(c.to_string()),
+                                    None    => Err(self_error!(self; "Invalid hexadecimal character number in an entity: {}", name))
+                                }
+                            }
+                        }
+                    }
+                    _ if name_len > 1 && name.starts_with('#') => {
+                        let num_str = &name[1..name_len];
+                        if num_str == "0" {
+                            Err(self_error!(self; "Null character entity is not allowed"))
+                        } else {
+                            if self.config.replace_unknown_entity_references {
+                                match u32::from_str_radix(num_str, 10).ok().map(|i| char::from_u32(i).unwrap_or('\u{fffd}')) {
+                                    Some(c) => Ok(c.to_string()),
+                                    None    => Err(self_error!(self; "Invalid decimal character number in an entity: {}", name))
+                                }
+                            }
+                            else {
+                                match u32::from_str_radix(num_str, 10).ok().and_then(char::from_u32) {
+                                    Some(c) => Ok(c.to_string()),
+                                    None    => Err(self_error!(self; "Invalid decimal character number in an entity: {}", name))
+                                }
+                            }
+                        }
+                    },
+                    _ => {
+                        if let Some(v) = self.config.extra_entities.get(&name) {
+                            Ok(v.clone())
+                        } else {
+                            Err(self_error!(self; "Unexpected entity: {}", name))
+                        }
+                    }
+                };
+                match c {
+                    Ok(c) => {
+                        self.buf.push_str(&c);
+                        if prev_st == State::OutsideTag && !is_whitespace_str(&c) {
+                            self.inside_whitespace = false;
+                        }
+                        self.into_state_continue(prev_st)
+                    }
+                    Err(e) => Some(e)
+                }
+            }
+
+            _ => Some(self_error!(self; "Unexpected token inside an entity: {}", t))
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/mod.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,622 @@
+//! Contains an implementation of pull-based XML parser.
+
+use std::mem;
+use std::borrow::Cow;
+use std::io::prelude::*;
+
+use common::{
+    self,
+    XmlVersion, Position, TextPosition,
+    is_name_start_char, is_name_char,
+};
+use name::OwnedName;
+use attribute::OwnedAttribute;
+use namespace::NamespaceStack;
+
+use reader::events::XmlEvent;
+use reader::config::ParserConfig;
+use reader::lexer::{Lexer, Token};
+
+macro_rules! gen_takes(
+    ($($field:ident -> $method:ident, $t:ty, $def:expr);+) => (
+        $(
+        impl MarkupData {
+            #[inline]
+            fn $method(&mut self) -> $t {
+                mem::replace(&mut self.$field, $def)
+            }
+        }
+        )+
+    )
+);
+
+gen_takes!(
+    name         -> take_name, String, String::new();
+    ref_data     -> take_ref_data, String, String::new();
+
+    version      -> take_version, Option<common::XmlVersion>, None;
+    encoding     -> take_encoding, Option<String>, None;
+    standalone   -> take_standalone, Option<bool>, None;
+
+    element_name -> take_element_name, Option<OwnedName>, None;
+
+    attr_name    -> take_attr_name, Option<OwnedName>, None;
+    attributes   -> take_attributes, Vec<OwnedAttribute>, vec!()
+);
+
+macro_rules! self_error(
+    ($this:ident; $msg:expr) => ($this.error($msg));
+    ($this:ident; $fmt:expr, $($arg:expr),+) => ($this.error(format!($fmt, $($arg),+)))
+);
+
+mod outside_tag;
+mod inside_processing_instruction;
+mod inside_declaration;
+mod inside_doctype;
+mod inside_opening_tag;
+mod inside_closing_tag_name;
+mod inside_comment;
+mod inside_cdata;
+mod inside_reference;
+
+static DEFAULT_VERSION: XmlVersion      = XmlVersion::Version10;
+static DEFAULT_ENCODING: &'static str   = "UTF-8";
+static DEFAULT_STANDALONE: Option<bool> = None;
+
+type ElementStack = Vec<OwnedName>;
+pub type Result = super::Result<XmlEvent>;
+
+/// Pull-based XML parser.
+pub struct PullParser {
+    config: ParserConfig,
+    lexer: Lexer,
+    st: State,
+    buf: String,
+    nst: NamespaceStack,
+
+    data: MarkupData,
+    final_result: Option<Result>,
+    next_event: Option<Result>,
+    est: ElementStack,
+    pos: Vec<TextPosition>,
+
+    encountered_element: bool,
+    parsed_declaration: bool,
+    inside_whitespace: bool,
+    read_prefix_separator: bool,
+    pop_namespace: bool
+}
+
+impl PullParser {
+    /// Returns a new parser using the given config.
+    pub fn new(config: ParserConfig) -> PullParser {
+        PullParser {
+            config: config,
+            lexer: Lexer::new(),
+            st: State::OutsideTag,
+            buf: String::new(),
+            nst: NamespaceStack::default(),
+
+            data: MarkupData {
+                name: String::new(),
+                version: None,
+                encoding: None,
+                standalone: None,
+                ref_data: String::new(),
+                element_name: None,
+                quote: None,
+                attr_name: None,
+                attributes: Vec::new()
+            },
+            final_result: None,
+            next_event: None,
+            est: Vec::new(),
+            pos: vec![TextPosition::new()],
+
+            encountered_element: false,
+            parsed_declaration: false,
+            inside_whitespace: true,
+            read_prefix_separator: false,
+            pop_namespace: false
+        }
+    }
+
+    /// Checks if this parser ignores the end of stream errors.
+    pub fn is_ignoring_end_of_stream(&self) -> bool { self.config.ignore_end_of_stream }
+}
+
+impl Position for PullParser {
+    /// Returns the position of the last event produced by the parser
+    #[inline]
+    fn position(&self) -> TextPosition {
+        self.pos[0]
+    }
+}
+
+#[derive(Clone, PartialEq)]
+pub enum State {
+    OutsideTag,
+    InsideOpeningTag(OpeningTagSubstate),
+    InsideClosingTag(ClosingTagSubstate),
+    InsideProcessingInstruction(ProcessingInstructionSubstate),
+    InsideComment,
+    InsideCData,
+    InsideDeclaration(DeclarationSubstate),
+    InsideDoctype,
+    InsideReference(Box<State>)
+}
+
+#[derive(Clone, PartialEq)]
+pub enum OpeningTagSubstate {
+    InsideName,
+
+    InsideTag,
+
+    InsideAttributeName,
+    AfterAttributeName,
+
+    InsideAttributeValue,
+}
+
+#[derive(Clone, PartialEq)]
+pub enum ClosingTagSubstate {
+    CTInsideName,
+    CTAfterName
+}
+
+#[derive(Clone, PartialEq)]
+pub enum ProcessingInstructionSubstate {
+    PIInsideName,
+    PIInsideData
+}
+
+#[derive(Clone, PartialEq)]
+pub enum DeclarationSubstate {
+    BeforeVersion,
+    InsideVersion,
+    AfterVersion,
+
+    InsideVersionValue,
+    AfterVersionValue,
+
+    InsideEncoding,
+    AfterEncoding,
+
+    InsideEncodingValue,
+
+    BeforeStandaloneDecl,
+    InsideStandaloneDecl,
+    AfterStandaloneDecl,
+
+    InsideStandaloneDeclValue,
+    AfterStandaloneDeclValue
+}
+
+#[derive(PartialEq)]
+enum QualifiedNameTarget {
+    AttributeNameTarget,
+    OpeningTagNameTarget,
+    ClosingTagNameTarget
+}
+
+#[derive(Copy, Clone, PartialEq, Eq)]
+enum QuoteToken {
+    SingleQuoteToken,
+    DoubleQuoteToken
+}
+
+impl QuoteToken {
+    fn from_token(t: &Token) -> QuoteToken {
+        match *t {
+            Token::SingleQuote => QuoteToken::SingleQuoteToken,
+            Token::DoubleQuote => QuoteToken::DoubleQuoteToken,
+            _ => panic!("Unexpected token: {}", t)
+        }
+    }
+
+    fn as_token(self) -> Token {
+        match self {
+            QuoteToken::SingleQuoteToken => Token::SingleQuote,
+            QuoteToken::DoubleQuoteToken => Token::DoubleQuote
+        }
+    }
+}
+
+struct MarkupData {
+    name: String,     // used for processing instruction name
+    ref_data: String,  // used for reference content
+
+    version: Option<common::XmlVersion>,  // used for XML declaration version
+    encoding: Option<String>,  // used for XML declaration encoding
+    standalone: Option<bool>,  // used for XML declaration standalone parameter
+
+    element_name: Option<OwnedName>,  // used for element name
+
+    quote: Option<QuoteToken>,  // used to hold opening quote for attribute value
+    attr_name: Option<OwnedName>,  // used to hold attribute name
+    attributes: Vec<OwnedAttribute>   // used to hold all accumulated attributes
+}
+
+impl PullParser {
+    /// Returns next event read from the given buffer.
+    ///
+    /// This method should be always called with the same buffer. If you call it
+    /// providing different buffers each time, the result will be undefined.
+    pub fn next<R: Read>(&mut self, r: &mut R) -> Result {
+        if let Some(ref ev) = self.final_result {
+            return ev.clone();
+        }
+
+        if let Some(ev) = self.next_event.take() {
+            return ev;
+        }
+
+        if self.pop_namespace {
+            self.pop_namespace = false;
+            self.nst.pop();
+        }
+
+        loop {
+            // While lexer gives us Ok(maybe_token) -- we loop.
+            // Upon having a complete XML-event -- we return from the whole function.
+            match self.lexer.next_token(r) {
+                Ok(maybe_token) =>
+                    match maybe_token {
+                        None => break,
+                        Some(token) =>
+                            match self.dispatch_token(token) {
+                                None => {} // continue
+                                Some(Ok(XmlEvent::EndDocument)) =>
+                                    return {
+                                        self.next_pos();
+                                        self.set_final_result(Ok(XmlEvent::EndDocument))
+                                    },
+                                Some(Ok(xml_event)) =>
+                                    return {
+                                        self.next_pos();
+                                        Ok(xml_event)
+                                    },
+                                Some(Err(xml_error)) =>
+                                    return {
+                                        self.next_pos();
+                                        self.set_final_result(Err(xml_error))
+                                    },
+                            }
+                    },
+                Err(lexer_error) =>
+                    return self.set_final_result(Err(lexer_error)),
+            }
+        }
+
+        // Handle end of stream
+        // Forward pos to the lexer head
+        self.next_pos();
+        let ev = if self.depth() == 0 {
+            if self.encountered_element && self.st == State::OutsideTag {  // all is ok
+                Ok(XmlEvent::EndDocument)
+            } else if !self.encountered_element {
+                self_error!(self; "Unexpected end of stream: no root element found")
+            } else {  // self.st != State::OutsideTag
+                self_error!(self; "Unexpected end of stream")  // TODO: add expected hint?
+            }
+        } else {
+            if self.config.ignore_end_of_stream {
+                self.final_result = None;
+                self.lexer.reset_eof_handled();
+                return self_error!(self; "Unexpected end of stream: still inside the root element");
+            } else {
+                self_error!(self; "Unexpected end of stream: still inside the root element")
+            }
+        };
+        self.set_final_result(ev)
+    }
+
+    // This function is to be called when a terminal event is reached.
+    // The function sets up the `self.final_result` into `Some(result)` and return `result`.
+    fn set_final_result(&mut self, result: Result) -> Result {
+        self.final_result = Some(result.clone());
+        result
+    }
+
+    #[inline]
+    fn error<M: Into<Cow<'static, str>>>(&self, msg: M) -> Result {
+        Err((&self.lexer, msg).into())
+    }
+
+    #[inline]
+    fn next_pos(&mut self) {
+        if self.pos.len() > 1 {
+            self.pos.remove(0);
+        } else {
+            self.pos[0] = self.lexer.position();
+        }
+    }
+
+    #[inline]
+    fn push_pos(&mut self) {
+        self.pos.push(self.lexer.position());
+    }
+
+    fn dispatch_token(&mut self, t: Token) -> Option<Result> {
+        match self.st.clone() {
+            State::OutsideTag                     => self.outside_tag(t),
+            State::InsideProcessingInstruction(s) => self.inside_processing_instruction(t, s),
+            State::InsideDeclaration(s)           => self.inside_declaration(t, s),
+            State::InsideDoctype                  => self.inside_doctype(t),
+            State::InsideOpeningTag(s)            => self.inside_opening_tag(t, s),
+            State::InsideClosingTag(s)            => self.inside_closing_tag_name(t, s),
+            State::InsideComment                  => self.inside_comment(t),
+            State::InsideCData                    => self.inside_cdata(t),
+            State::InsideReference(s)             => self.inside_reference(t, *s)
+        }
+    }
+
+    #[inline]
+    fn depth(&self) -> usize {
+        self.est.len()
+    }
+
+    #[inline]
+    fn buf_has_data(&self) -> bool {
+        self.buf.len() > 0
+    }
+
+    #[inline]
+    fn take_buf(&mut self) -> String {
+        mem::replace(&mut self.buf, String::new())
+    }
+
+    #[inline]
+    fn append_char_continue(&mut self, c: char) -> Option<Result> {
+        self.buf.push(c);
+        None
+    }
+
+    #[inline]
+    fn into_state(&mut self, st: State, ev: Option<Result>) -> Option<Result> {
+        self.st = st;
+        ev
+    }
+
+    #[inline]
+    fn into_state_continue(&mut self, st: State) -> Option<Result> {
+        self.into_state(st, None)
+    }
+
+    #[inline]
+    fn into_state_emit(&mut self, st: State, ev: Result) -> Option<Result> {
+        self.into_state(st, Some(ev))
+    }
+
+    /// Dispatches tokens in order to process qualified name. If qualified name cannot be parsed,
+    /// an error is returned.
+    ///
+    /// # Parameters
+    /// * `t`       --- next token;
+    /// * `on_name` --- a callback which is executed when whitespace is encountered.
+    fn read_qualified_name<F>(&mut self, t: Token, target: QualifiedNameTarget, on_name: F) -> Option<Result>
+      where F: Fn(&mut PullParser, Token, OwnedName) -> Option<Result> {
+        // We can get here for the first time only when self.data.name contains zero or one character,
+        // but first character cannot be a colon anyway
+        if self.buf.len() <= 1 {
+            self.read_prefix_separator = false;
+        }
+
+        let invoke_callback = |this: &mut PullParser, t| {
+            let name = this.take_buf();
+            match name.parse() {
+                Ok(name) => on_name(this, t, name),
+                Err(_) => Some(self_error!(this; "Qualified name is invalid: {}", name))
+            }
+        };
+
+        match t {
+            // There can be only one colon, and not as the first character
+            Token::Character(':') if self.buf_has_data() && !self.read_prefix_separator => {
+                self.buf.push(':');
+                self.read_prefix_separator = true;
+                None
+            }
+
+            Token::Character(c) if c != ':' && (!self.buf_has_data() && is_name_start_char(c) ||
+                                          self.buf_has_data() && is_name_char(c)) =>
+                self.append_char_continue(c),
+
+            Token::EqualsSign if target == QualifiedNameTarget::AttributeNameTarget => invoke_callback(self, t),
+
+            Token::EmptyTagEnd if target == QualifiedNameTarget::OpeningTagNameTarget => invoke_callback(self, t),
+
+            Token::TagEnd if target == QualifiedNameTarget::OpeningTagNameTarget ||
+                      target == QualifiedNameTarget::ClosingTagNameTarget => invoke_callback(self, t),
+
+            Token::Whitespace(_) => invoke_callback(self, t),
+
+            _ => Some(self_error!(self; "Unexpected token inside qualified name: {}", t))
+        }
+    }
+
+    /// Dispatches tokens in order to process attribute value.
+    ///
+    /// # Parameters
+    /// * `t`        --- next token;
+    /// * `on_value` --- a callback which is called when terminating quote is encountered.
+    fn read_attribute_value<F>(&mut self, t: Token, on_value: F) -> Option<Result>
+      where F: Fn(&mut PullParser, String) -> Option<Result> {
+        match t {
+            Token::Whitespace(_) if self.data.quote.is_none() => None,  // skip leading whitespace
+
+            Token::DoubleQuote | Token::SingleQuote => match self.data.quote {
+                None => {  // Entered attribute value
+                    self.data.quote = Some(QuoteToken::from_token(&t));
+                    None
+                }
+                Some(q) if q.as_token() == t => {
+                    self.data.quote = None;
+                    let value = self.take_buf();
+                    on_value(self, value)
+                }
+                _ => {
+                    t.push_to_string(&mut self.buf);
+                    None
+                }
+            },
+
+            Token::ReferenceStart => {
+                let st = Box::new(self.st.clone());
+                self.into_state_continue(State::InsideReference(st))
+            }
+
+            Token::OpeningTagStart =>
+                Some(self_error!(self; "Unexpected token inside attribute value: <")),
+
+            // Every character except " and ' and < is okay
+            _  => {
+                t.push_to_string(&mut self.buf);
+                None
+            }
+        }
+    }
+
+    fn emit_start_element(&mut self, emit_end_element: bool) -> Option<Result> {
+        let mut name = self.data.take_element_name().unwrap();
+        let mut attributes = self.data.take_attributes();
+
+        // check whether the name prefix is bound and fix its namespace
+        match self.nst.get(name.borrow().prefix_repr()) {
+            Some("") => name.namespace = None,  // default namespace
+            Some(ns) => name.namespace = Some(ns.into()),
+            None => return Some(self_error!(self; "Element {} prefix is unbound", name))
+        }
+
+        // check and fix accumulated attributes prefixes
+        for attr in attributes.iter_mut() {
+            if let Some(ref pfx) = attr.name.prefix {
+                let new_ns = match self.nst.get(pfx) {
+                    Some("") => None,  // default namespace
+                    Some(ns) => Some(ns.into()),
+                    None => return Some(self_error!(self; "Attribute {} prefix is unbound", attr.name))
+                };
+                attr.name.namespace = new_ns;
+            }
+        }
+
+        if emit_end_element {
+            self.pop_namespace = true;
+            self.next_event = Some(Ok(XmlEvent::EndElement {
+                name: name.clone()
+            }));
+        } else {
+            self.est.push(name.clone());
+        }
+        let namespace = self.nst.squash();
+        self.into_state_emit(State::OutsideTag, Ok(XmlEvent::StartElement {
+            name: name,
+            attributes: attributes,
+            namespace: namespace
+        }))
+    }
+
+    fn emit_end_element(&mut self) -> Option<Result> {
+        let mut name = self.data.take_element_name().unwrap();
+
+        // check whether the name prefix is bound and fix its namespace
+        match self.nst.get(name.borrow().prefix_repr()) {
+            Some("") => name.namespace = None,  // default namespace
+            Some(ns) => name.namespace = Some(ns.into()),
+            None => return Some(self_error!(self; "Element {} prefix is unbound", name))
+        }
+
+        let op_name = self.est.pop().unwrap();
+
+        if name == op_name {
+            self.pop_namespace = true;
+            self.into_state_emit(State::OutsideTag, Ok(XmlEvent::EndElement { name: name }))
+        } else {
+            Some(self_error!(self; "Unexpected closing tag: {}, expected {}", name, op_name))
+        }
+    }
+
+}
+
+#[cfg(test)]
+mod tests {
+    use std::io::BufReader;
+
+    use common::{Position, TextPosition};
+    use name::OwnedName;
+    use attribute::OwnedAttribute;
+    use reader::parser::PullParser;
+    use reader::ParserConfig;
+    use reader::events::XmlEvent;
+
+    fn new_parser() -> PullParser {
+        PullParser::new(ParserConfig::new())
+    }
+
+    macro_rules! expect_event(
+        ($r:expr, $p:expr, $t:pat) => (
+            match $p.next(&mut $r) {
+                $t => {}
+                e => panic!("Unexpected event: {:?}", e)
+            }
+        );
+        ($r:expr, $p:expr, $t:pat => $c:expr ) => (
+            match $p.next(&mut $r) {
+                $t if $c => {}
+                e => panic!("Unexpected event: {:?}", e)
+            }
+        )
+    );
+
+    macro_rules! test_data(
+        ($d:expr) => ({
+            static DATA: &'static str = $d;
+            let r = BufReader::new(DATA.as_bytes());
+            let p = new_parser();
+            (r, p)
+        })
+    );
+
+    #[test]
+    fn issue_3_semicolon_in_attribute_value() {
+        let (mut r, mut p) = test_data!(r#"
+            <a attr="zzz;zzz" />
+        "#);
+
+        expect_event!(r, p, Ok(XmlEvent::StartDocument { .. }));
+        expect_event!(r, p, Ok(XmlEvent::StartElement { ref name, ref attributes, ref namespace }) =>
+            *name == OwnedName::local("a") &&
+             attributes.len() == 1 &&
+             attributes[0] == OwnedAttribute::new(OwnedName::local("attr"), "zzz;zzz") &&
+             namespace.is_essentially_empty()
+        );
+        expect_event!(r, p, Ok(XmlEvent::EndElement { ref name }) => *name == OwnedName::local("a"));
+        expect_event!(r, p, Ok(XmlEvent::EndDocument));
+    }
+
+    #[test]
+    fn issue_140_entity_reference_inside_tag() {
+        let (mut r, mut p) = test_data!(r#"
+            <bla>&#9835;</bla>
+        "#);
+
+        expect_event!(r, p, Ok(XmlEvent::StartDocument { .. }));
+        expect_event!(r, p, Ok(XmlEvent::StartElement { ref name, .. }) => *name == OwnedName::local("bla"));
+        expect_event!(r, p, Ok(XmlEvent::Characters(ref s)) => s == "\u{266b}");
+        expect_event!(r, p, Ok(XmlEvent::EndElement { ref name, .. }) => *name == OwnedName::local("bla"));
+        expect_event!(r, p, Ok(XmlEvent::EndDocument));
+    }
+
+    #[test]
+    fn opening_tag_in_attribute_value() {
+        let (mut r, mut p) = test_data!(r#"
+            <a attr="zzz<zzz" />
+        "#);
+
+        expect_event!(r, p, Ok(XmlEvent::StartDocument { .. }));
+        expect_event!(r, p, Err(ref e) =>
+            e.msg() == "Unexpected token inside attribute value: <" &&
+            e.position() == TextPosition { row: 1, column: 24 }
+        );
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/outside_tag.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/outside_tag.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/reader/parser/outside_tag.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/reader/parser/outside_tag.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,130 @@
+use common::is_whitespace_char;
+
+use reader::events::XmlEvent;
+use reader::lexer::Token;
+
+use super::{
+    Result, PullParser, State, ClosingTagSubstate, OpeningTagSubstate,
+    ProcessingInstructionSubstate, DEFAULT_VERSION, DEFAULT_ENCODING, DEFAULT_STANDALONE
+};
+
+impl PullParser {
+    pub fn outside_tag(&mut self, t: Token) -> Option<Result> {
+        match t {
+            Token::ReferenceStart =>
+                self.into_state_continue(State::InsideReference(Box::new(State::OutsideTag))),
+
+            Token::Whitespace(_) if self.depth() == 0 && self.config.ignore_root_level_whitespace => None,  // skip whitespace outside of the root element
+
+            Token::Whitespace(_) if self.config.trim_whitespace && !self.buf_has_data() => None,
+
+            Token::Whitespace(c) => {
+                if !self.buf_has_data() {
+                    self.push_pos();
+                }
+                self.append_char_continue(c)
+            }
+
+            _ if t.contains_char_data() && self.depth() == 0 =>
+                Some(self_error!(self; "Unexpected characters outside the root element: {}", t)),
+
+            _ if t.contains_char_data() => {  // Non-whitespace char data
+                if !self.buf_has_data() {
+                    self.push_pos();
+                }
+                self.inside_whitespace = false;
+                t.push_to_string(&mut self.buf);
+                None
+            }
+
+            Token::ReferenceEnd => { // Semi-colon in a text outside an entity
+                self.inside_whitespace = false;
+                Token::ReferenceEnd.push_to_string(&mut self.buf);
+                None
+            }
+
+            Token::CommentStart if self.config.coalesce_characters && self.config.ignore_comments => {
+                // We need to switch the lexer into a comment mode inside comments
+                self.lexer.inside_comment();
+                self.into_state_continue(State::InsideComment)
+            }
+
+            Token::CDataStart if self.config.coalesce_characters && self.config.cdata_to_characters => {
+                if !self.buf_has_data() {
+                    self.push_pos();
+                }
+                // We need to disable lexing errors inside CDATA
+                self.lexer.disable_errors();
+                self.into_state_continue(State::InsideCData)
+            }
+
+            _ => {
+                // Encountered some markup event, flush the buffer as characters
+                // or a whitespace
+                let mut next_event = if self.buf_has_data() {
+                    let buf = self.take_buf();
+                    if self.inside_whitespace && self.config.trim_whitespace {
+                        None
+                    } else if self.inside_whitespace && !self.config.whitespace_to_characters {
+                        Some(Ok(XmlEvent::Whitespace(buf)))
+                    } else if self.config.trim_whitespace {
+                        Some(Ok(XmlEvent::Characters(buf.trim_matches(is_whitespace_char).into())))
+                    } else {
+                        Some(Ok(XmlEvent::Characters(buf)))
+                    }
+                } else { None };
+                self.inside_whitespace = true;  // Reset inside_whitespace flag
+                self.push_pos();
+                match t {
+                    Token::ProcessingInstructionStart =>
+                        self.into_state(State::InsideProcessingInstruction(ProcessingInstructionSubstate::PIInsideName), next_event),
+
+                    Token::DoctypeStart if !self.encountered_element => {
+                        // We don't have a doctype event so skip this position
+                        // FIXME: update when we have a doctype event
+                        self.next_pos();
+                        self.lexer.disable_errors();
+                        self.into_state(State::InsideDoctype, next_event)
+                    }
+
+                    Token::OpeningTagStart => {
+                        // If declaration was not parsed and we have encountered an element,
+                        // emit this declaration as the next event.
+                        if !self.parsed_declaration {
+                            self.parsed_declaration = true;
+                            let sd_event = XmlEvent::StartDocument {
+                                version: DEFAULT_VERSION,
+                                encoding: DEFAULT_ENCODING.into(),
+                                standalone: DEFAULT_STANDALONE
+                            };
+                            // next_event is always none here because we're outside of
+                            // the root element
+                            next_event = Some(Ok(sd_event));
+                            self.push_pos();
+                        }
+                        self.encountered_element = true;
+                        self.nst.push_empty();
+                        self.into_state(State::InsideOpeningTag(OpeningTagSubstate::InsideName), next_event)
+                    }
+
+                    Token::ClosingTagStart if self.depth() > 0 =>
+                        self.into_state(State::InsideClosingTag(ClosingTagSubstate::CTInsideName), next_event),
+
+                    Token::CommentStart => {
+                        // We need to switch the lexer into a comment mode inside comments
+                        self.lexer.inside_comment();
+                        self.into_state(State::InsideComment, next_event)
+                    }
+
+                    Token::CDataStart => {
+                        // We need to disable lexing errors inside CDATA
+                        self.lexer.disable_errors();
+                        self.into_state(State::InsideCData, next_event)
+                    }
+
+                    _ => Some(self_error!(self; "Unexpected token: {}", t))
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/util.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/util.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/util.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/util.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,107 @@
+use std::io::{self, Read};
+use std::str;
+use std::fmt;
+
+#[derive(Debug)]
+pub enum CharReadError {
+    UnexpectedEof,
+    Utf8(str::Utf8Error),
+    Io(io::Error)
+}
+
+impl From<str::Utf8Error> for CharReadError {
+    fn from(e: str::Utf8Error) -> CharReadError {
+        CharReadError::Utf8(e)
+    }
+}
+
+impl From<io::Error> for CharReadError {
+    fn from(e: io::Error) -> CharReadError {
+        CharReadError::Io(e)
+    }
+}
+
+impl fmt::Display for CharReadError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use self::CharReadError::*;
+        match *self {
+            UnexpectedEof => write!(f, "unexpected end of stream"),
+            Utf8(ref e) => write!(f, "UTF-8 decoding error: {}", e),
+            Io(ref e) => write!(f, "I/O error: {}", e)
+        }
+    }
+}
+
+pub fn next_char_from<R: Read>(source: &mut R) -> Result<Option<char>, CharReadError> {
+    const MAX_CODEPOINT_LEN: usize = 4;
+
+    let mut bytes = source.bytes();
+    let mut buf = [0u8; MAX_CODEPOINT_LEN];
+    let mut pos = 0;
+
+    loop {
+        let next = match bytes.next() {
+            Some(Ok(b)) => b,
+            Some(Err(e)) => return Err(e.into()),
+            None if pos == 0 => return Ok(None),
+            None => return Err(CharReadError::UnexpectedEof)
+        };
+        buf[pos] = next;
+        pos += 1;
+
+        match str::from_utf8(&buf[..pos]) {
+            Ok(s) => return Ok(s.chars().next()),  // always Some(..)
+            Err(_) if pos < MAX_CODEPOINT_LEN => {},
+            Err(e) => return Err(e.into())
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_next_char_from() {
+        use std::io;
+        use std::error::Error;
+
+        let mut bytes: &[u8] = "correct".as_bytes();    // correct ASCII
+        assert_eq!(super::next_char_from(&mut bytes).unwrap(), Some('c'));
+
+        let mut bytes: &[u8] = "правильно".as_bytes();  // correct BMP
+        assert_eq!(super::next_char_from(&mut bytes).unwrap(), Some('п'));
+
+        let mut bytes: &[u8] = "😊".as_bytes();          // correct non-BMP
+        assert_eq!(super::next_char_from(&mut bytes).unwrap(), Some('😊'));
+
+        let mut bytes: &[u8] = b"";                     // empty
+        assert_eq!(super::next_char_from(&mut bytes).unwrap(), None);
+
+        let mut bytes: &[u8] = b"\xf0\x9f\x98";         // incomplete code point
+        match super::next_char_from(&mut bytes).unwrap_err() {
+            super::CharReadError::UnexpectedEof => {},
+            e => panic!("Unexpected result: {:?}", e)
+        };
+
+        let mut bytes: &[u8] = b"\xff\x9f\x98\x32";     // invalid code point
+        match super::next_char_from(&mut bytes).unwrap_err() {
+            super::CharReadError::Utf8(_) => {},
+            e => panic!("Unexpected result: {:?}", e)
+        };
+
+
+        // error during read
+        struct ErrorReader;
+        impl io::Read for ErrorReader {
+            fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+                Err(io::Error::new(io::ErrorKind::Other, "test error"))
+            }
+        }
+
+        let mut r = ErrorReader;
+        match super::next_char_from(&mut r).unwrap_err() {
+            super::CharReadError::Io(ref e) if e.kind() == io::ErrorKind::Other &&
+                                               e.description() == "test error" => {},
+            e => panic!("Unexpected result: {:?}", e)
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/writer/config.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/writer/config.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/writer/config.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/writer/config.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,157 @@
+//! Contains emitter configuration structure.
+
+use std::io::Write;
+use std::borrow::Cow;
+
+use writer::EventWriter;
+
+/// Emitter configuration structure.
+///
+/// This structure contains various options which control XML document emitter behavior.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct EmitterConfig {
+    /// Line separator used to separate lines in formatted output. Default is `"\n"`.
+    pub line_separator: Cow<'static, str>,
+
+    /// A string which will be used for a single level of indentation. Default is `"  "`
+    /// (two spaces).
+    pub indent_string: Cow<'static, str>,
+
+    /// Whether or not the emitted document should be indented. Default is false.
+    ///
+    /// The emitter is capable to perform automatic indentation of the emitted XML document.
+    /// It is done in stream-like fashion and does not require the knowledge of the whole
+    /// document in advance.
+    ///
+    /// Sometimes, however, automatic indentation is undesirable, e.g. when you want to keep
+    /// existing layout when processing an existing XML document. Also the indentiation algorithm
+    /// is not thoroughly tested. Hence by default it is disabled.
+    pub perform_indent: bool,
+
+    /// Whether or not characters in output events will be escaped. Default is true.
+    ///
+    /// The emitter can automatically escape characters which can't appear in PCDATA sections
+    /// or element attributes of an XML document, like `<` or `"` (in attributes). This may
+    /// introduce some overhead because then every corresponding piece of character data
+    /// should be scanned for invalid characters.
+    ///
+    /// If this option is disabled, the XML writer may produce non-well-formed documents, so
+    /// use `false` value for this option with care.
+    pub perform_escaping: bool,
+
+    /// Whether or not to write XML document declaration at the beginning of a document.
+    /// Default is true.
+    ///
+    /// This option controls whether the document declaration should be emitted automatically
+    /// before a root element is written if it was not emitted explicitly by the user.
+    pub write_document_declaration: bool,
+
+    /// Whether or not to convert elements with empty content to empty elements. Default is true.
+    ///
+    /// This option allows turning elements like `<a></a>` (an element with empty content)
+    /// into `<a />` (an empty element).
+    pub normalize_empty_elements: bool,
+
+    /// Whether or not to emit CDATA events as plain characters. Default is false.
+    ///
+    /// This option forces the emitter to convert CDATA events into regular character events,
+    /// performing all the necessary escaping beforehand. This may be occasionally useful
+    /// for feeding the document into incorrect parsers which do not support CDATA.
+    pub cdata_to_characters: bool,
+
+    /// Whether or not to keep element names to support `EndElement` events without explicit names.
+    /// Default is true.
+    ///
+    /// This option makes the emitter to keep names of written elements in order to allow
+    /// omitting names when writing closing element tags. This could incur some memory overhead.
+    pub keep_element_names_stack: bool,
+
+    /// Whether or not to automatically insert leading and trailing spaces in emitted comments,
+    /// if necessary. Default is true.
+    ///
+    /// This is a convenience option in order for the user not to append spaces before and after
+    /// comments text in order to get more pretty comments: `<!-- something -->` instead of
+    /// `<!--something-->`.
+    pub autopad_comments: bool,
+
+    /// Whether or not to automatically insert spaces before the trailing `/>` in self-closing
+    /// elements. Default is true.
+    ///
+    /// This option is only meaningful if `normalize_empty_elements` is true. For example, the
+    /// element `<a></a>` would be unaffected. When `normalize_empty_elements` is true, then when
+    /// this option is also true, the same element would appear `<a />`. If this option is false,
+    /// then the same element would appear `<a/>`.
+    pub pad_self_closing: bool,
+}
+
+impl EmitterConfig {
+    /// Creates an emitter configuration with default values.
+    ///
+    /// You can tweak default options with builder-like pattern:
+    ///
+    /// ```rust
+    /// use xml::writer::EmitterConfig;
+    ///
+    /// let config = EmitterConfig::new()
+    ///     .line_separator("\r\n")
+    ///     .perform_indent(true)
+    ///     .normalize_empty_elements(false);
+    /// ```
+    #[inline]
+    pub fn new() -> EmitterConfig {
+        EmitterConfig {
+            line_separator: "\n".into(),
+            indent_string: "  ".into(),  // two spaces
+            perform_indent: false,
+            perform_escaping: true,
+            write_document_declaration: true,
+            normalize_empty_elements: true,
+            cdata_to_characters: false,
+            keep_element_names_stack: true,
+            autopad_comments: true,
+            pad_self_closing: true
+        }
+    }
+
+    /// Creates an XML writer with this configuration.
+    ///
+    /// This is a convenience method for configuring and creating a writer at the same time:
+    ///
+    /// ```rust
+    /// use xml::writer::EmitterConfig;
+    ///
+    /// let mut target: Vec<u8> = Vec::new();
+    ///
+    /// let writer = EmitterConfig::new()
+    ///     .line_separator("\r\n")
+    ///     .perform_indent(true)
+    ///     .normalize_empty_elements(false)
+    ///     .create_writer(&mut target);
+    /// ```
+    ///
+    /// This method is exactly equivalent to calling `EventWriter::new_with_config()` with
+    /// this configuration object.
+    #[inline]
+    pub fn create_writer<W: Write>(self, sink: W) -> EventWriter<W> {
+        EventWriter::new_with_config(sink, self)
+    }
+}
+
+impl Default for EmitterConfig {
+    #[inline]
+    fn default() -> EmitterConfig {
+        EmitterConfig::new()
+    }
+}
+
+gen_setters!(EmitterConfig,
+    line_separator: into Cow<'static, str>,
+    indent_string: into Cow<'static, str>,
+    perform_indent: val bool,
+    write_document_declaration: val bool,
+    normalize_empty_elements: val bool,
+    cdata_to_characters: val bool,
+    keep_element_names_stack: val bool,
+    autopad_comments: val bool,
+    pad_self_closing: val bool
+);
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/writer/emitter.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/writer/emitter.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/writer/emitter.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/writer/emitter.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,447 @@
+use std::io;
+use std::io::prelude::*;
+use std::fmt;
+use std::result;
+use std::borrow::Cow;
+use std::error::Error;
+
+use common;
+use name::{Name, OwnedName};
+use attribute::Attribute;
+use escape::{escape_str_attribute, escape_str_pcdata};
+use common::XmlVersion;
+use namespace::{NamespaceStack, NS_NO_PREFIX, NS_EMPTY_URI, NS_XMLNS_PREFIX, NS_XML_PREFIX};
+
+use writer::config::EmitterConfig;
+
+/// An error which may be returned by `XmlWriter` when writing XML events.
+#[derive(Debug)]
+pub enum EmitterError {
+    /// An I/O error occured in the underlying `Write` instance.
+    Io(io::Error),
+
+    /// Document declaration has already been written to the output stream.
+    DocumentStartAlreadyEmitted,
+
+    /// The name of the last opening element is not available.
+    LastElementNameNotAvailable,
+
+    /// The name of the last opening element is not equal to the name of the provided
+    /// closing element.
+    EndElementNameIsNotEqualToLastStartElementName,
+
+    /// End element name is not specified when it is needed, for example, when automatic
+    /// closing is not enabled in configuration.
+    EndElementNameIsNotSpecified
+}
+
+impl From<io::Error> for EmitterError {
+    fn from(err: io::Error) -> EmitterError {
+        EmitterError::Io(err)
+    }
+}
+
+impl fmt::Display for EmitterError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+
+        write!(f, "emitter error: ")?;
+        match *self {
+            EmitterError::Io(ref e) =>
+                write!(f, "I/O error: {}", e),
+            ref other =>
+                write!(f, "{}", other.description()),
+        }
+    }
+}
+
+impl Error for EmitterError {
+    fn description(&self) -> &str {
+        match *self {
+            EmitterError::Io(_) =>
+                "I/O error",
+            EmitterError::DocumentStartAlreadyEmitted =>
+                "document start event has already been emitted",
+            EmitterError::LastElementNameNotAvailable =>
+                "last element name is not available",
+            EmitterError::EndElementNameIsNotEqualToLastStartElementName =>
+                "end element name is not equal to last start element name",
+            EmitterError::EndElementNameIsNotSpecified =>
+                "end element name is not specified and can't be inferred",
+        }
+    }
+}
+
+/// A result type yielded by `XmlWriter`.
+pub type Result<T> = result::Result<T, EmitterError>;
+
+// TODO: split into a low-level fast writer without any checks and formatting logic and a
+// high-level indenting validating writer
+pub struct Emitter {
+    config: EmitterConfig,
+
+    nst: NamespaceStack,
+
+    indent_level: usize,
+    indent_stack: Vec<IndentFlags>,
+
+    element_names: Vec<OwnedName>,
+
+    start_document_emitted: bool,
+    just_wrote_start_element: bool
+}
+
+impl Emitter {
+    pub fn new(config: EmitterConfig) -> Emitter {
+        Emitter {
+            config,
+
+            nst: NamespaceStack::empty(),
+
+            indent_level: 0,
+            indent_stack: vec![IndentFlags::WroteNothing],
+
+            element_names: Vec::new(),
+
+            start_document_emitted: false,
+            just_wrote_start_element: false
+        }
+    }
+}
+
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+enum IndentFlags {
+    WroteNothing,
+    WroteMarkup,
+    WroteText,
+}
+
+impl Emitter {
+    /// Returns the current state of namespaces.
+    #[inline]
+    pub fn namespace_stack_mut(&mut self) -> &mut NamespaceStack {
+        &mut self.nst
+    }
+
+    #[inline]
+    fn wrote_text(&self) -> bool {
+        *self.indent_stack.last().unwrap() == IndentFlags::WroteText
+    }
+
+    #[inline]
+    fn wrote_markup(&self) -> bool {
+        *self.indent_stack.last().unwrap() == IndentFlags::WroteMarkup
+    }
+
+    #[inline]
+    fn set_wrote_text(&mut self) {
+        *self.indent_stack.last_mut().unwrap() = IndentFlags::WroteText;
+    }
+
+    #[inline]
+    fn set_wrote_markup(&mut self) {
+        *self.indent_stack.last_mut().unwrap() = IndentFlags::WroteMarkup;
+    }
+
+    #[inline]
+    fn reset_state(&mut self) {
+        *self.indent_stack.last_mut().unwrap() = IndentFlags::WroteNothing;
+    }
+
+    fn write_newline<W: Write>(&mut self, target: &mut W, level: usize) -> Result<()> {
+        target.write_all(self.config.line_separator.as_bytes())?;
+        for _ in 0..level {
+            target.write_all(self.config.indent_string.as_bytes())?;
+        }
+        Ok(())
+    }
+
+    fn before_markup<W: Write>(&mut self, target: &mut W) -> Result<()> {
+        if self.config.perform_indent && !self.wrote_text() &&
+           (self.indent_level > 0 || self.wrote_markup()) {
+            let indent_level = self.indent_level;
+            self.write_newline(target, indent_level)?;
+            if self.indent_level > 0 && self.config.indent_string.len() > 0 {
+                self.after_markup();
+            }
+        }
+        Ok(())
+    }
+
+    fn after_markup(&mut self) {
+        self.set_wrote_markup();
+    }
+
+    fn before_start_element<W: Write>(&mut self, target: &mut W) -> Result<()> {
+        self.before_markup(target)?;
+        self.indent_stack.push(IndentFlags::WroteNothing);
+        Ok(())
+    }
+
+    fn after_start_element(&mut self) {
+        self.after_markup();
+        self.indent_level += 1;
+    }
+
+    fn before_end_element<W: Write>(&mut self, target: &mut W) -> Result<()> {
+        if self.config.perform_indent && self.indent_level > 0 && self.wrote_markup() &&
+           !self.wrote_text() {
+            let indent_level = self.indent_level;
+            self.write_newline(target, indent_level - 1)
+        } else {
+            Ok(())
+        }
+    }
+
+    fn after_end_element(&mut self) {
+        if self.indent_level > 0 {
+            self.indent_level -= 1;
+            self.indent_stack.pop();
+        }
+        self.set_wrote_markup();
+    }
+
+    fn after_text(&mut self) {
+        self.set_wrote_text();
+    }
+
+    pub fn emit_start_document<W: Write>(&mut self, target: &mut W,
+                                         version: XmlVersion,
+                                         encoding: &str,
+                                         standalone: Option<bool>) -> Result<()> {
+        if self.start_document_emitted {
+            return Err(EmitterError::DocumentStartAlreadyEmitted);
+        }
+        self.start_document_emitted = true;
+
+        self.before_markup(target)?;
+        let result = {
+            let mut write = move || {
+                write!(target, "<?xml version=\"{}\" encoding=\"{}\"", version, encoding)?;
+
+                if let Some(standalone) = standalone {
+                    write!(target, " standalone=\"{}\"", if standalone { "yes" } else { "no" })?;
+                }
+
+                write!(target, "?>")?;
+
+                Ok(())
+            };
+            write()
+        };
+        self.after_markup();
+
+        result
+    }
+
+    fn check_document_started<W: Write>(&mut self, target: &mut W) -> Result<()> {
+        if !self.start_document_emitted && self.config.write_document_declaration {
+            self.emit_start_document(target, common::XmlVersion::Version10, "utf-8", None)
+        } else {
+            Ok(())
+        }
+    }
+
+    fn fix_non_empty_element<W: Write>(&mut self, target: &mut W) -> Result<()> {
+        if self.config.normalize_empty_elements && self.just_wrote_start_element {
+            self.just_wrote_start_element = false;
+            target.write_all(b">").map_err(From::from)
+        } else {
+            Ok(())
+        }
+    }
+
+    pub fn emit_processing_instruction<W: Write>(&mut self,
+                                                 target: &mut W,
+                                                 name: &str,
+                                                 data: Option<&str>) -> Result<()> {
+        self.check_document_started(target)?;
+        self.fix_non_empty_element(target)?;
+
+        self.before_markup(target)?;
+
+        let result = {
+            let mut write = || {
+                write!(target, "<?{}", name)?;
+
+                if let Some(data) = data {
+                    write!(target, " {}", data)?;
+                }
+
+                write!(target, "?>")?;
+
+                Ok(())
+            };
+            write()
+        };
+
+        self.after_markup();
+
+        result
+    }
+
+    fn emit_start_element_initial<W>(&mut self, target: &mut W,
+                                     name: Name,
+                                     attributes: &[Attribute]) -> Result<()>
+        where W: Write
+    {
+        self.check_document_started(target)?;
+        self.fix_non_empty_element(target)?;
+        self.before_start_element(target)?;
+        write!(target, "<{}", name.repr_display())?;
+        self.emit_current_namespace_attributes(target)?;
+        self.emit_attributes(target, attributes)?;
+        self.after_start_element();
+        Ok(())
+    }
+
+    pub fn emit_start_element<W>(&mut self, target: &mut W,
+                                 name: Name,
+                                 attributes: &[Attribute]) -> Result<()>
+        where W: Write
+    {
+        if self.config.keep_element_names_stack {
+            self.element_names.push(name.to_owned());
+        }
+
+        self.emit_start_element_initial(target, name, attributes)?;
+        self.just_wrote_start_element = true;
+
+        if !self.config.normalize_empty_elements {
+            write!(target, ">")?;
+        }
+
+        Ok(())
+    }
+
+    pub fn emit_current_namespace_attributes<W>(&mut self, target: &mut W) -> Result<()>
+        where W: Write
+    {
+        for (prefix, uri) in self.nst.peek() {
+            match prefix {
+                // internal namespaces are not emitted
+                NS_XMLNS_PREFIX | NS_XML_PREFIX => Ok(()),
+                //// there is already a namespace binding with this prefix in scope
+                //prefix if self.nst.get(prefix) == Some(uri) => Ok(()),
+                // emit xmlns only if it is overridden
+                NS_NO_PREFIX => if uri != NS_EMPTY_URI {
+                    write!(target, " xmlns=\"{}\"", uri)
+                } else { Ok(()) },
+                // everything else
+                prefix => write!(target, " xmlns:{}=\"{}\"", prefix, uri)
+            }?;
+        }
+        Ok(())
+    }
+
+    pub fn emit_attributes<W: Write>(&mut self, target: &mut W,
+                                      attributes: &[Attribute]) -> Result<()> {
+        for attr in attributes.iter() {
+            write!(
+                target, " {}=\"{}\"",
+                attr.name.repr_display(),
+                if self.config.perform_escaping { escape_str_attribute(attr.value) } else { Cow::Borrowed(attr.value) }
+            )?
+        }
+        Ok(())
+    }
+
+    pub fn emit_end_element<W: Write>(&mut self, target: &mut W,
+                                      name: Option<Name>) -> Result<()> {
+        let owned_name = if self.config.keep_element_names_stack {
+            Some(self.element_names.pop().ok_or(EmitterError::LastElementNameNotAvailable)?)
+        } else {
+            None
+        };
+
+        // Check that last started element name equals to the provided name, if there are both
+        if let Some(ref last_name) = owned_name {
+            if let Some(ref name) = name {
+                if last_name.borrow() != *name {
+                    return Err(EmitterError::EndElementNameIsNotEqualToLastStartElementName);
+                }
+            }
+        }
+
+        if let Some(name) = owned_name.as_ref().map(|n| n.borrow()).or(name) {
+            if self.config.normalize_empty_elements && self.just_wrote_start_element {
+                self.just_wrote_start_element = false;
+                let termination = if self.config.pad_self_closing { " />" } else { "/>" };
+                let result = target.write_all(termination.as_bytes()).map_err(From::from);
+                self.after_end_element();
+                result
+            } else {
+                self.just_wrote_start_element = false;
+
+                self.before_end_element(target)?;
+                let result = write!(target, "</{}>", name.repr_display()).map_err(From::from);
+                self.after_end_element();
+
+                result
+            }
+        } else {
+            Err(EmitterError::EndElementNameIsNotSpecified)
+        }
+    }
+
+    pub fn emit_cdata<W: Write>(&mut self, target: &mut W, content: &str) -> Result<()> {
+        self.fix_non_empty_element(target)?;
+        if self.config.cdata_to_characters {
+            self.emit_characters(target, content)
+        } else {
+            // TODO: escape ']]>' characters in CDATA as two adjacent CDATA blocks
+            target.write_all(b"<![CDATA[")?;
+            target.write_all(content.as_bytes())?;
+            target.write_all(b"]]>")?;
+
+            self.after_text();
+
+            Ok(())
+        }
+    }
+
+    pub fn emit_characters<W: Write>(&mut self, target: &mut W,
+                                      content: &str) -> Result<()> {
+        self.check_document_started(target)?;
+        self.fix_non_empty_element(target)?;
+        target.write_all(
+            (if self.config.perform_escaping {
+                escape_str_pcdata(content)
+            } else {
+                Cow::Borrowed(content)
+            }).as_bytes()
+        )?;
+        self.after_text();
+        Ok(())
+    }
+
+    pub fn emit_comment<W: Write>(&mut self, target: &mut W, content: &str) -> Result<()> {
+        self.fix_non_empty_element(target)?;
+
+        // TODO: add escaping dashes at the end of the comment
+
+        let autopad_comments = self.config.autopad_comments;
+        let write = |target: &mut W| -> Result<()> {
+            target.write_all(b"<!--")?;
+
+            if autopad_comments && !content.starts_with(char::is_whitespace) {
+                target.write_all(b" ")?;
+            }
+
+            target.write_all(content.as_bytes())?;
+
+            if autopad_comments && !content.ends_with(char::is_whitespace) {
+                target.write_all(b" ")?;
+            }
+
+            target.write_all(b"-->")?;
+
+            Ok(())
+        };
+
+        self.before_markup(target)?;
+        let result = write(target);
+        self.after_markup();
+
+        result
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/writer/events.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/writer/events.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/writer/events.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/writer/events.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,241 @@
+//! Contains `XmlEvent` datatype, instances of which are consumed by the writer.
+
+use std::borrow::Cow;
+
+use name::Name;
+use attribute::Attribute;
+use common::XmlVersion;
+use namespace::{Namespace, NS_NO_PREFIX};
+
+/// A part of an XML output stream.
+///
+/// Objects of this enum are consumed by `EventWriter`. They correspond to different parts of
+/// an XML document.
+#[derive(Debug)]
+pub enum XmlEvent<'a> {
+    /// Corresponds to XML document declaration.
+    ///
+    /// This event should always be written before any other event. If it is not written
+    /// at all, a default XML declaration will be outputted if the corresponding option
+    /// is set in the configuration. Otherwise an error will be returned.
+    StartDocument {
+        /// XML version.
+        ///
+        /// Defaults to `XmlVersion::Version10`.
+        version: XmlVersion,
+
+        /// XML document encoding.
+        ///
+        /// Defaults to `Some("UTF-8")`.
+        encoding: Option<&'a str>,
+
+        /// XML standalone declaration.
+        ///
+        /// Defaults to `None`.
+        standalone: Option<bool>
+    },
+
+    /// Denotes an XML processing instruction.
+    ProcessingInstruction {
+        /// Processing instruction target.
+        name: &'a str,
+
+        /// Processing instruction content.
+        data: Option<&'a str>
+    },
+
+    /// Denotes a beginning of an XML element.
+    StartElement {
+        /// Qualified name of the element.
+        name: Name<'a>,
+
+        /// A list of attributes associated with the element.
+        ///
+        /// Currently attributes are not checked for duplicates (TODO). Attribute values
+        /// will be escaped, and all characters invalid for attribute values like `"` or `<`
+        /// will be changed into character entities.
+        attributes: Cow<'a, [Attribute<'a>]>,
+
+        /// Contents of the namespace mapping at this point of the document.
+        ///
+        /// This mapping will be inspected for "new" entries, and if at this point of the document
+        /// a particular pair of prefix and namespace URI is already defined, no namespace
+        /// attributes will be emitted.
+        namespace: Cow<'a, Namespace>,
+    },
+
+    /// Denotes an end of an XML element.
+    EndElement {
+        /// Optional qualified name of the element.
+        ///
+        /// If `None`, then it is assumed that the element name should be the last valid one.
+        /// If `Some` and element names tracking is enabled, then the writer will check it for
+        /// correctness.
+        name: Option<Name<'a>>
+    },
+
+    /// Denotes CDATA content.
+    ///
+    /// This event contains unparsed data, and no escaping will be performed when writing it
+    /// to the output stream.
+    CData(&'a str),
+
+    /// Denotes a comment.
+    ///
+    /// The string will be checked for invalid sequences and error will be returned by the
+    /// write operation
+    Comment(&'a str),
+
+    /// Denotes character data outside of tags.
+    ///
+    /// Contents of this event will be escaped if `perform_escaping` option is enabled,
+    /// that is, every character invalid for PCDATA will appear as a character entity.
+    Characters(&'a str)
+}
+
+impl<'a> XmlEvent<'a> {
+    /// Returns an writer event for a processing instruction.
+    #[inline]
+    pub fn processing_instruction(name: &'a str, data: Option<&'a str>) -> XmlEvent<'a> {
+        XmlEvent::ProcessingInstruction { name: name, data: data }
+    }
+
+    /// Returns a builder for a starting element.
+    ///
+    /// This builder can then be used to tweak attributes and namespace starting at
+    /// this element.
+    #[inline]
+    pub fn start_element<S>(name: S) -> StartElementBuilder<'a> where S: Into<Name<'a>> {
+        StartElementBuilder {
+            name: name.into(),
+            attributes: Vec::new(),
+            namespace: Namespace::empty().into()
+        }
+    }
+
+    /// Returns a builder for an closing element.
+    ///
+    /// This method, unline `start_element()`, does not accept a name because by default
+    /// the writer is able to determine it automatically. However, when this functionality
+    /// is disabled, it is possible to specify the name with `name()` method on the builder.
+    #[inline]
+    pub fn end_element() -> EndElementBuilder<'a> {
+        EndElementBuilder { name: None }
+    }
+
+    /// Returns a CDATA event.
+    ///
+    /// Naturally, the provided string won't be escaped, except for closing CDATA token `]]>`
+    /// (depending on the configuration).
+    #[inline]
+    pub fn cdata(data: &'a str) -> XmlEvent<'a> { XmlEvent::CData(data) }
+
+    /// Returns a regular characters (PCDATA) event.
+    ///
+    /// All offending symbols, in particular, `&` and `<`, will be escaped by the writer.
+    #[inline]
+    pub fn characters(data: &'a str) -> XmlEvent<'a> { XmlEvent::Characters(data) }
+
+    /// Returns a comment event.
+    #[inline]
+    pub fn comment(data: &'a str) -> XmlEvent<'a> { XmlEvent::Comment(data) }
+}
+
+impl<'a> From<&'a str> for XmlEvent<'a> {
+    #[inline]
+    fn from(s: &'a str) -> XmlEvent<'a> { XmlEvent::Characters(s) }
+}
+
+pub struct EndElementBuilder<'a> {
+    name: Option<Name<'a>>
+}
+
+/// A builder for a closing element event.
+impl<'a> EndElementBuilder<'a> {
+    /// Sets the name of this closing element.
+    ///
+    /// Usually the writer is able to determine closing element names automatically. If
+    /// this functionality is enabled (by default it is), then this name is checked for correctness.
+    /// It is possible, however, to disable such behavior; then the user must ensure that
+    /// closing element name is correct manually.
+    #[inline]
+    pub fn name<N>(mut self, name: N) -> EndElementBuilder<'a> where N: Into<Name<'a>> {
+        self.name = Some(name.into());
+        self
+    }
+}
+
+impl<'a> From<EndElementBuilder<'a>> for XmlEvent<'a> {
+    fn from(b: EndElementBuilder<'a>) -> XmlEvent<'a> {
+        XmlEvent::EndElement { name: b.name }
+    }
+}
+
+/// A builder for a starting element event.
+pub struct StartElementBuilder<'a> {
+    name: Name<'a>,
+    attributes: Vec<Attribute<'a>>,
+    namespace: Namespace
+}
+
+impl<'a> StartElementBuilder<'a> {
+    /// Sets an attribute value of this element to the given string.
+    ///
+    /// This method can be used to add attributes to the starting element. Name is a qualified
+    /// name; its namespace is ignored, but its prefix is checked for correctness, that is,
+    /// it is checked that the prefix is bound to some namespace in the current context.
+    ///
+    /// Currently attributes are not checked for duplicates. Note that duplicate attributes
+    /// are a violation of XML document well-formedness.
+    ///
+    /// The writer checks that you don't specify reserved prefix names, for example `xmlns`.
+    #[inline]
+    pub fn attr<N>(mut self, name: N, value: &'a str) -> StartElementBuilder<'a>
+        where N: Into<Name<'a>>
+    {
+        self.attributes.push(Attribute::new(name.into(), value));
+        self
+    }
+
+    /// Adds a namespace to the current namespace context.
+    ///
+    /// If no namespace URI was bound to the provided prefix at this point of the document,
+    /// then the mapping from the prefix to the provided namespace URI will be written as
+    /// a part of this element attribute set.
+    ///
+    /// If the same namespace URI was bound to the provided prefix at this point of the document,
+    /// then no namespace attributes will be emitted.
+    ///
+    /// If some other namespace URI was bound to the provided prefix at this point of the document,
+    /// then another binding will be added as a part of this element attribute set, shadowing
+    /// the outer binding.
+    #[inline]
+    pub fn ns<S1, S2>(mut self, prefix: S1, uri: S2) -> StartElementBuilder<'a>
+        where S1: Into<String>, S2: Into<String>
+    {
+        self.namespace.put(prefix, uri);
+        self
+    }
+
+    /// Adds a default namespace mapping to the current namespace context.
+    ///
+    /// Same rules as for `ns()` are also valid for the default namespace mapping.
+    #[inline]
+    pub fn default_ns<S>(mut self, uri: S) -> StartElementBuilder<'a>
+        where S: Into<String>
+    {
+        self.namespace.put(NS_NO_PREFIX, uri);
+        self
+    }
+}
+
+impl<'a> From<StartElementBuilder<'a>> for XmlEvent<'a> {
+    #[inline]
+    fn from(b: StartElementBuilder<'a>) -> XmlEvent<'a> {
+        XmlEvent::StartElement {
+            name: b.name,
+            attributes: Cow::Owned(b.attributes),
+            namespace: Cow::Owned(b.namespace)
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/writer/mod.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/writer/mod.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/src/writer/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/src/writer/mod.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,93 @@
+//! Contains high-level interface for an events-based XML emitter.
+//!
+//! The most important type in this module is `EventWriter` which allows writing an XML document
+//! to some output stream.
+
+pub use self::emitter::Result;
+pub use self::emitter::EmitterError as Error;
+pub use self::config::EmitterConfig;
+pub use self::events::XmlEvent;
+
+use self::emitter::Emitter;
+
+use std::io::prelude::*;
+
+mod emitter;
+mod config;
+pub mod events;
+
+/// A wrapper around an `std::io::Write` instance which emits XML document according to provided
+/// events.
+pub struct EventWriter<W> {
+    sink: W,
+    emitter: Emitter
+}
+
+impl<W: Write> EventWriter<W> {
+    /// Creates a new `EventWriter` out of an `std::io::Write` instance using the default
+    /// configuration.
+    #[inline]
+    pub fn new(sink: W) -> EventWriter<W> {
+        EventWriter::new_with_config(sink, EmitterConfig::new())
+    }
+
+    /// Creates a new `EventWriter` out of an `std::io::Write` instance using the provided
+    /// configuration.
+    #[inline]
+    pub fn new_with_config(sink: W, config: EmitterConfig) -> EventWriter<W> {
+        EventWriter {
+            sink,
+            emitter: Emitter::new(config)
+        }
+    }
+
+    /// Writes the next piece of XML document according to the provided event.
+    ///
+    /// Note that output data may not exactly correspond to the written event because
+    /// of various configuration options. For example, `XmlEvent::EndElement` may
+    /// correspond to a separate closing element or it may cause writing an empty element.
+    /// Another example is that `XmlEvent::CData` may be represented as characters in
+    /// the output stream.
+    pub fn write<'a, E>(&mut self, event: E) -> Result<()> where E: Into<XmlEvent<'a>> {
+        match event.into() {
+            XmlEvent::StartDocument { version, encoding, standalone } =>
+                self.emitter.emit_start_document(&mut self.sink, version, encoding.unwrap_or("UTF-8"), standalone),
+            XmlEvent::ProcessingInstruction { name, data } =>
+                self.emitter.emit_processing_instruction(&mut self.sink, name, data),
+            XmlEvent::StartElement { name, attributes, namespace } => {
+                self.emitter.namespace_stack_mut().push_empty().checked_target().extend(namespace.as_ref());
+                self.emitter.emit_start_element(&mut self.sink, name, &attributes)
+            }
+            XmlEvent::EndElement { name } => {
+                let r = self.emitter.emit_end_element(&mut self.sink, name);
+                self.emitter.namespace_stack_mut().try_pop();
+                r
+            }
+            XmlEvent::Comment(content) =>
+                self.emitter.emit_comment(&mut self.sink, content),
+            XmlEvent::CData(content) =>
+                self.emitter.emit_cdata(&mut self.sink, content),
+            XmlEvent::Characters(content) =>
+                self.emitter.emit_characters(&mut self.sink, content)
+        }
+    }
+
+    /// Returns a mutable reference to the underlying `Writer`.
+    ///
+    /// Note that having a reference to the underlying sink makes it very easy to emit invalid XML
+    /// documents. Use this method with care. Valid use cases for this method include accessing
+    /// methods like `Write::flush`, which do not emit new data but rather change the state
+    /// of the stream itself.
+    pub fn inner_mut(&mut self) -> &mut W {
+        &mut self.sink
+    }
+
+    /// Unwraps this `EventWriter`, returning the underlying writer.
+    ///
+    /// Note that this is a destructive operation: unwrapping a writer and then wrapping
+    /// it again with `EventWriter::new()` will create a fresh writer whose state will be
+    /// blank; for example, accumulated namespaces will be reset.
+    pub fn into_inner(self) -> W {
+        self.sink
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1_full.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1_full.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1_full.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1_full.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,58 @@
+StartDocument(1.0, utf-8)
+StartElement(project [name="project-name"])
+Whitespace("\n    ")
+StartElement(libraries)
+Whitespace("\n        ")
+StartElement(library [groupId="org.example", artifactId="<name>", version="0.1"])
+EndElement(library)
+Whitespace("\n        ")
+StartElement(library [groupId="com.example", artifactId="\"cool-lib&", version="999"])
+EndElement(library)
+Whitespace("\n    ")
+EndElement(libraries)
+Whitespace("\n    ")
+StartElement(module [name="module-1"])
+Whitespace("\n        ")
+StartElement(files)
+Whitespace("\n            ")
+StartElement(file [name="somefile.java", type="java"])
+Characters("\n                Some <java> class\n            ")
+EndElement(file)
+Whitespace("\n            ")
+StartElement(file [name="another_file.java", type="java"])
+Characters("\n                Another \"java\" class\n            ")
+EndElement(file)
+Whitespace("\n            ")
+StartElement(file [name="config.xml", type="xml"])
+Characters("\n                Weird \'XML\' config\n            ")
+EndElement(file)
+Whitespace("\n        ")
+EndElement(files)
+Whitespace("\n        ")
+StartElement(libraries)
+Whitespace("\n            ")
+StartElement(library [groupId="junit", artifactId="junit", version="1.9.5"])
+EndElement(library)
+Whitespace("\n        ")
+EndElement(libraries)
+Whitespace("\n    ")
+EndElement(module)
+Whitespace("\n    ")
+StartElement(module [name="module-2"])
+Whitespace("\n        ")
+StartElement(files)
+Whitespace("\n            ")
+StartElement(file [name="program.js", type="javascript"])
+Characters("\n                JavaScript & program\n            ")
+EndElement(file)
+Whitespace("\n            ")
+StartElement(file [name="style.css", type="css"])
+Characters("\n                Cascading style sheet: © - ҉\n            ")
+EndElement(file)
+Whitespace("\n        ")
+EndElement(files)
+Whitespace("\n    ")
+EndElement(module)
+Whitespace("\n")
+EndElement(project)
+EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1_short.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1_short.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1_short.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1_short.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,37 @@
+StartDocument(1.0, utf-8)
+StartElement(project [name="project-name"])
+StartElement(libraries)
+StartElement(library [groupId="org.example", artifactId="<name>", version="0.1"])
+EndElement(library)
+StartElement(library [groupId="com.example", artifactId="\"cool-lib&", version="999"])
+EndElement(library)
+EndElement(libraries)
+StartElement(module [name="module-1"])
+StartElement(files)
+StartElement(file [name="somefile.java", type="java"])
+Characters("Some <java> class")
+EndElement(file)
+StartElement(file [name="another_file.java", type="java"])
+Characters("Another \"java\" class")
+EndElement(file)
+StartElement(file [name="config.xml", type="xml"])
+Characters("Weird \'XML\' config")
+EndElement(file)
+EndElement(files)
+StartElement(libraries)
+StartElement(library [groupId="junit", artifactId="junit", version="1.9.5"])
+EndElement(library)
+EndElement(libraries)
+EndElement(module)
+StartElement(module [name="module-2"])
+StartElement(files)
+StartElement(file [name="program.js", type="javascript"])
+Characters("JavaScript & program")
+EndElement(file)
+StartElement(file [name="style.css", type="css"])
+Characters("Cascading style sheet: © - ҉")
+EndElement(file)
+EndElement(files)
+EndElement(module)
+EndElement(project)
+EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1.xml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1.xml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_1.xml	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<project name="project-name">
+    <libraries>
+        <library groupId="org.example" artifactId="&lt;name&gt;" version="0.1"/>
+        <library groupId="com.example" artifactId="&quot;cool-lib&amp;" version="999"/>
+    </libraries>
+    <module name="module-1">
+        <files>
+            <file name="somefile.java" type="java">
+                Some &lt;java&gt; class
+            </file>
+            <file name="another_file.java" type="java">
+                Another &quot;java&quot; class
+            </file>
+            <file name="config.xml" type="xml">
+                Weird &apos;XML&apos; config
+            </file>
+        </files>
+        <libraries>
+            <library groupId="junit" artifactId="junit" version="1.9.5"/>
+        </libraries>
+    </module>
+    <module name="module-2">
+        <files>
+            <file name="program.js" type="javascript">
+                JavaScript &amp; program
+            </file>
+            <file name="style.css" type="css">
+                Cascading style sheet: &#xA9; - &#1161;
+            </file>
+        </files>
+    </module>
+</project>
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2_full.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2_full.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2_full.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2_full.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,41 @@
+StartDocument(1.0, utf-8)
+StartElement({urn:example:namespace}p:data)
+Whitespace("\n  ")
+StartElement({urn:example:namespace}p:datum [id="34"])
+Whitespace("\n    ")
+StartElement({urn:example:namespace}p:name)
+Characters("Name")
+EndElement({urn:example:namespace}p:name)
+Whitespace("\n    ")
+StartElement({urn:example:double}d:name)
+Characters("Another name")
+EndElement({urn:example:double}d:name)
+Whitespace("\n    ")
+StartElement({urn:example:double}d:arg)
+Characters("0.3")
+EndElement({urn:example:double}d:arg)
+Whitespace("\n    ")
+StartElement({urn:example:double}d:arg)
+Characters("0.2")
+EndElement({urn:example:double}d:arg)
+Whitespace("\n    ")
+StartElement({urn:example:namespace}p:arg)
+Characters("0.1")
+EndElement({urn:example:namespace}p:arg)
+Whitespace("\n    ")
+StartElement({urn:example:namespace}p:arg)
+Characters("0.01")
+EndElement({urn:example:namespace}p:arg)
+Whitespace("\n    ")
+StartElement({urn:example:header}h:header [name="Header-1"])
+Characters("header 1 value")
+EndElement({urn:example:header}h:header)
+Whitespace("\n    ")
+StartElement({urn:example:header}h:header [name="Header-2"])
+Characters("\n      Some bigger value\n    ")
+EndElement({urn:example:header}h:header)
+Whitespace("\n  ")
+EndElement({urn:example:namespace}p:datum)
+Whitespace("\n")
+EndElement({urn:example:namespace}p:data)
+EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2_short.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2_short.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2_short.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2_short.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,30 @@
+StartDocument(1.0, utf-8)
+StartElement({urn:example:namespace}p:data)
+StartElement({urn:example:namespace}p:datum [id="34"])
+StartElement({urn:example:namespace}p:name)
+Characters("Name")
+EndElement({urn:example:namespace}p:name)
+StartElement({urn:example:double}d:name)
+Characters("Another name")
+EndElement({urn:example:double}d:name)
+StartElement({urn:example:double}d:arg)
+Characters("0.3")
+EndElement({urn:example:double}d:arg)
+StartElement({urn:example:double}d:arg)
+Characters("0.2")
+EndElement({urn:example:double}d:arg)
+StartElement({urn:example:namespace}p:arg)
+Characters("0.1")
+EndElement({urn:example:namespace}p:arg)
+StartElement({urn:example:namespace}p:arg)
+Characters("0.01")
+EndElement({urn:example:namespace}p:arg)
+StartElement({urn:example:header}h:header [name="Header-1"])
+Characters("header 1 value")
+EndElement({urn:example:header}h:header)
+StartElement({urn:example:header}h:header [name="Header-2"])
+Characters("Some bigger value")
+EndElement({urn:example:header}h:header)
+EndElement({urn:example:namespace}p:datum)
+EndElement({urn:example:namespace}p:data)
+EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2.xml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2.xml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_2.xml	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<p:data xmlns:d="urn:example:double" xmlns:h="urn:example:header" xmlns:p="urn:example:namespace">
+  <p:datum id="34">
+    <p:name>Name</p:name>
+    <d:name>Another name</d:name>
+    <d:arg>0.3</d:arg>
+    <d:arg>0.2</d:arg>
+    <p:arg>0.1</p:arg>
+    <p:arg>0.01</p:arg>
+    <h:header name="Header-1">header 1 value</h:header>
+    <h:header name="Header-2">
+      Some bigger value
+    </h:header>
+  </p:datum>
+</p:data>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3_full.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3_full.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3_full.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3_full.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,23 @@
+1:1 StartDocument(1.0, utf-8)
+2:1 StartElement({urn:x}p:data [z=">"])
+2:31 Whitespace("\n    ")
+3:5 Comment(" abcd &lt; &gt; &amp; ")
+3:34 Whitespace("\n    ")
+4:5 StartElement(a)
+4:8 Characters("test")
+4:12 EndElement(a)
+4:16 Whitespace("\n    ")
+5:5 StartElement(b)
+5:8 Characters("kkss\" = ddd\' >")
+5:22 EndElement(b)
+5:26 Whitespace("\n    ")
+6:5 CData("\n            <a>ddddd</b>!e3--><!-- ddckx\n    ")
+8:8 Characters("\n    ")
+9:5 StartElement(c)
+9:5 EndElement(c)
+9:9 Whitespace("\n    ")
+10:5 CData("\n    <![CDATA[zzzz]]")
+11:23 CData(">")
+11:36 Characters("\n")
+12:1 EndElement({urn:x}p:data)
+14:1 EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3_short.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3_short.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3_short.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3_short.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,14 @@
+1:1 StartDocument(1.0, utf-8)
+2:1 StartElement({urn:x}p:data [z=">"])
+4:5 StartElement(a)
+4:8 Characters("test")
+4:12 EndElement(a)
+5:5 StartElement(b)
+5:8 Characters("kkss\" = ddd\' >")
+5:22 EndElement(b)
+6:5 Characters("<a>ddddd</b>!e3--><!-- ddckx")
+9:5 StartElement(c)
+9:5 EndElement(c)
+10:5 Characters("<![CDATA[zzzz]]>")
+12:1 EndElement({urn:x}p:data)
+14:1 EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3.xml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3.xml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_3.xml	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<p:data xmlns:p="urn:x" z=">">
+    <!-- abcd &lt; &gt; &amp; -->
+    <a>test</a>
+    <b>kkss" = ddd' ></b>
+    <![CDATA[
+            <a>ddddd</b>!e3--><!-- ddckx
+    ]]>
+    <c/>
+    <![CDATA[
+    <![CDATA[zzzz]]]]><![CDATA[>]]>
+</p:data>
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4_full.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4_full.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4_full.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4_full.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,23 @@
+StartDocument(1.0, utf-8)
+StartElement({urn:x}p:data [z=">"])
+Whitespace("\n    ")
+Comment(" abcd &lt; &gt; &amp; ")
+Whitespace("\n    ")
+StartElement(a)
+Characters("test")
+EndElement(a)
+Whitespace("\n    ")
+StartElement(b)
+Characters("kkss\" = ddd\' >")
+EndElement(b)
+Whitespace("\n    ")
+CData("\n            <a>ddddd</b>!e3--><!-- ddckx\n    ")
+Characters("\n    ")
+StartElement(c)
+EndElement(c)
+Whitespace("\n    ")
+CData("\n    <![CDATA[zzzz]]")
+CData(">")
+Characters("\n")
+EndElement({urn:x}p:data)
+EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4_short.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4_short.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4_short.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4_short.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,14 @@
+StartDocument(1.0, utf-8)
+StartElement({urn:x}p:data [z=">"])
+StartElement(a)
+Characters("test")
+EndElement(a)
+StartElement(b)
+Characters("kkss\" = ddd\' >")
+EndElement(b)
+Characters("<a>ddddd</b>!e3--><!-- ddckx")
+StartElement(c)
+EndElement(c)
+Characters("<![CDATA[zzzz]]>")
+EndElement({urn:x}p:data)
+EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4.xml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4.xml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_4.xml	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE data SYSTEM "abcd.dtd">
+<p:data xmlns:p="urn:x" z=">">
+    <!-- abcd &lt; &gt; &amp; -->
+    <a>test</a>
+    <b>kkss" = ddd' ></b>
+    <![CDATA[
+            <a>ddddd</b>!e3--><!-- ddckx
+    ]]>
+    <c/>
+    <![CDATA[
+    <![CDATA[zzzz]]]]><![CDATA[>]]>
+</p:data>
+
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_5_short.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_5_short.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_5_short.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_5_short.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,7 @@
+StartDocument(1.0, utf-8)
+StartElement(p)
+StartElement(a)
+Characters("test ©≂̸")
+EndElement(a)
+EndElement(p)
+EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_5.xml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_5.xml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_5.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_5.xml	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE data SYSTEM "abcd.dtd">
+<p>
+    <a>test&nbsp;&copy;&NotEqualTilde;</a>
+</p>
+
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_6_full.txt thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_6_full.txt
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_6_full.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_6_full.txt	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,8 @@
+StartDocument(1.0, UTF-8)
+Whitespace("\n")
+ProcessingInstruction(xml-stylesheet="href=\"doc.xsl\"")
+Whitespace("\n\n")
+StartElement(doc)
+Characters("Hello")
+EndElement(doc)
+EndDocument
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_6.xml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_6.xml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_6.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/documents/sample_6.xml	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="doc.xsl"?>
+
+<doc>Hello</doc>
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/event_reader.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/event_reader.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/event_reader.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/event_reader.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,587 @@
+#![forbid(unsafe_code)]
+
+extern crate xml;
+#[macro_use]
+extern crate lazy_static;
+
+use std::env;
+use std::fmt;
+use std::fs::File;
+use std::io::{BufRead, BufReader, Write, stderr};
+use std::path::Path;
+
+use xml::name::OwnedName;
+use xml::common::Position;
+use xml::reader::{Result, XmlEvent, ParserConfig, EventReader};
+
+/// Dummy function that opens a file, parses it, and returns a `Result`.
+/// There can be IO errors (from `File::open`) and XML errors (from the parser).
+/// Having `impl From<std::io::Error> for xml::reader::Error` allows the user to
+/// do this without defining their own error type.
+#[allow(dead_code)]
+fn count_event_in_file(name: &Path) -> Result<usize> {
+    let mut event_count = 0;
+    for event in EventReader::new(BufReader::new(try!(File::open(name)))) {
+        try!(event);
+        event_count += 1;
+    }
+    Ok(event_count)
+}
+
+#[test]
+fn sample_1_short() {
+    test(
+        include_bytes!("documents/sample_1.xml"),
+        include_bytes!("documents/sample_1_short.txt"),
+        ParserConfig::new()
+            .ignore_comments(true)
+            .whitespace_to_characters(true)
+            .cdata_to_characters(true)
+            .trim_whitespace(true)
+            .coalesce_characters(true),
+        false
+    );
+}
+
+#[test]
+fn sample_1_full() {
+    test(
+        include_bytes!("documents/sample_1.xml"),
+        include_bytes!("documents/sample_1_full.txt"),
+        ParserConfig::new()
+            .ignore_comments(false)
+            .whitespace_to_characters(false)
+            .cdata_to_characters(false)
+            .trim_whitespace(false)
+            .coalesce_characters(false),
+        false
+    );
+}
+
+#[test]
+fn sample_2_short() {
+    test(
+        include_bytes!("documents/sample_2.xml"),
+        include_bytes!("documents/sample_2_short.txt"),
+        ParserConfig::new()
+            .ignore_comments(true)
+            .whitespace_to_characters(true)
+            .cdata_to_characters(true)
+            .trim_whitespace(true)
+            .coalesce_characters(true),
+        false
+    );
+}
+
+#[test]
+fn sample_2_full() {
+    test(
+        include_bytes!("documents/sample_2.xml"),
+        include_bytes!("documents/sample_2_full.txt"),
+        ParserConfig::new()
+            .ignore_comments(false)
+            .whitespace_to_characters(false)
+            .cdata_to_characters(false)
+            .trim_whitespace(false)
+            .coalesce_characters(false),
+        false
+    );
+}
+
+#[test]
+fn sample_3_short() {
+    test(
+        include_bytes!("documents/sample_3.xml"),
+        include_bytes!("documents/sample_3_short.txt"),
+        ParserConfig::new()
+            .ignore_comments(true)
+            .whitespace_to_characters(true)
+            .cdata_to_characters(true)
+            .trim_whitespace(true)
+            .coalesce_characters(true),
+        true
+    );
+}
+
+#[test]
+fn sample_3_full() {
+    test(
+        include_bytes!("documents/sample_3.xml"),
+        include_bytes!("documents/sample_3_full.txt"),
+        ParserConfig::new()
+            .ignore_comments(false)
+            .whitespace_to_characters(false)
+            .cdata_to_characters(false)
+            .trim_whitespace(false)
+            .coalesce_characters(false),
+        true
+    );
+}
+
+#[test]
+fn sample_4_short() {
+    test(
+        include_bytes!("documents/sample_4.xml"),
+        include_bytes!("documents/sample_4_short.txt"),
+        ParserConfig::new()
+            .ignore_comments(true)
+            .whitespace_to_characters(true)
+            .cdata_to_characters(true)
+            .trim_whitespace(true)
+            .coalesce_characters(true),
+        false
+    );
+}
+
+#[test]
+fn sample_4_full() {
+    test(
+        include_bytes!("documents/sample_4.xml"),
+        include_bytes!("documents/sample_4_full.txt"),
+        ParserConfig::new()
+            .ignore_comments(false)
+            .whitespace_to_characters(false)
+            .cdata_to_characters(false)
+            .trim_whitespace(false)
+            .coalesce_characters(false),
+        false
+    );
+
+}
+
+#[test]
+fn sample_5_short() {
+    test(
+        include_bytes!("documents/sample_5.xml"),
+        include_bytes!("documents/sample_5_short.txt"),
+        ParserConfig::new()
+            .ignore_comments(true)
+            .whitespace_to_characters(true)
+            .cdata_to_characters(true)
+            .trim_whitespace(true)
+            .coalesce_characters(true)
+            .add_entity("nbsp", " ")
+            .add_entity("copy", "©")
+            .add_entity("NotEqualTilde", "≂̸"),
+        false
+    );
+}
+
+#[test]
+fn sample_6_full() {
+    test(
+        include_bytes!("documents/sample_6.xml"),
+        include_bytes!("documents/sample_6_full.txt"),
+        ParserConfig::new()
+            .ignore_root_level_whitespace(false)
+            .ignore_comments(false)
+            .whitespace_to_characters(false)
+            .cdata_to_characters(false)
+            .trim_whitespace(false)
+            .coalesce_characters(false),
+        false
+    );
+}
+
+#[test]
+fn eof_1() {
+    test(
+        br#"<?xml"#,
+        br#"1:6 Unexpected end of stream: no root element found"#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn bad_1() {
+    test(
+        br#"<?xml&.,"#,
+        br#"1:6 Unexpected token: <?xml&"#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn dashes_in_comments() {
+    test(
+        br#"<!-- comment -- --><hello/>"#,
+        br#"
+            |1:14 Unexpected token '--' before ' '
+        "#,
+        ParserConfig::new(),
+        false
+    );
+
+    test(
+        br#"<!-- comment ---><hello/>"#,
+        br#"
+            |1:14 Unexpected token '--' before '-'
+        "#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn tabs_1() {
+    test(
+        b"\t<a>\t<b/></a>",
+        br#"
+            |1:2 StartDocument(1.0, UTF-8)
+            |1:2 StartElement(a)
+            |1:6 StartElement(b)
+            |1:6 EndElement(b)
+            |1:10 EndElement(a)
+            |1:14 EndDocument
+        "#,
+        ParserConfig::new()
+            .trim_whitespace(true),
+        true
+    );
+}
+
+#[test]
+fn issue_32_unescaped_cdata_end() {
+    test(
+        br#"<hello>]]></hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |Characters("]]>")
+            |EndElement(hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn issue_unescaped_processing_instruction_end() {
+    test(
+        br#"<hello>?></hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |Characters("?>")
+            |EndElement(hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn issue_unescaped_empty_tag_end() {
+    test(
+        br#"<hello>/></hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |Characters("/>")
+            |EndElement(hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn issue_83_duplicate_attributes() {
+    test(
+        br#"<hello><some-tag a='10' a="20"></hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |1:30 Attribute 'a' is redefined
+        "#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn issue_93_large_characters_in_entity_references() {
+    test(
+        r#"<hello>&𤶼;</hello>"#.as_bytes(),
+        r#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |1:10 Unexpected entity: 𤶼
+        "#.as_bytes(),  // FIXME: it shouldn't be 10, looks like indices are off slightly
+        ParserConfig::new(),
+        false
+    )
+}
+
+#[test]
+fn issue_98_cdata_ending_with_right_bracket() {
+    test(
+        br#"<hello><![CDATA[Foo [Bar]]]></hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |CData("Foo [Bar]")
+            |EndElement(hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    )
+}
+
+#[test]
+fn issue_105_unexpected_double_dash() {
+    test(
+        br#"<hello>-- </hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |Characters("-- ")
+            |EndElement(hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    );
+
+    test(
+        br#"<hello>--</hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |Characters("--")
+            |EndElement(hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    );
+
+    test(
+        br#"<hello>--></hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |Characters("-->")
+            |EndElement(hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    );
+
+    test(
+        br#"<hello><![CDATA[--]]></hello>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(hello)
+            |CData("--")
+            |EndElement(hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn issue_attribues_have_no_default_namespace () {
+    test(
+        br#"<hello xmlns="urn:foo" x="y"/>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement({urn:foo}hello [x="y"])
+            |EndElement({urn:foo}hello)
+            |EndDocument
+        "#,
+        ParserConfig::new(),
+        false
+    );
+}
+
+#[test]
+fn issue_replacement_character_entity_reference() {
+    test(
+        br#"<doc>&#55357;&#56628;</doc>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(doc)
+            |1:13 Invalid decimal character number in an entity: #55357
+        "#,
+        ParserConfig::new(),
+        false,
+    );
+
+    test(
+        br#"<doc>&#xd83d;&#xdd34;</doc>"#,
+        br#"
+            |StartDocument(1.0, UTF-8)
+            |StartElement(doc)
+            |1:13 Invalid hexadecimal character number in an entity: #xd83d
+        "#,
+        ParserConfig::new(),
+        false,
+    );
+
+    test(
+        br#"<doc>&#55357;&#56628;</doc>"#,
+        format!(
+            r#"
+                |StartDocument(1.0, UTF-8)
+                |StartElement(doc)
+                |Characters("{replacement_character}{replacement_character}")
+                |EndElement(doc)
+                |EndDocument
+            "#,
+            replacement_character = "\u{fffd}"
+        )
+        .as_bytes(),
+        ParserConfig::new()
+            .replace_unknown_entity_references(true),
+        false,
+    );
+
+    test(
+        br#"<doc>&#xd83d;&#xdd34;</doc>"#,
+        format!(
+            r#"
+                |StartDocument(1.0, UTF-8)
+                |StartElement(doc)
+                |Characters("{replacement_character}{replacement_character}")
+                |EndElement(doc)
+                |EndDocument
+            "#,
+            replacement_character = "\u{fffd}"
+        )
+        .as_bytes(),
+        ParserConfig::new()
+            .replace_unknown_entity_references(true),
+        false,
+    );
+}
+
+lazy_static! {
+    // If PRINT_SPEC env variable is set, print the lines
+    // to stderr instead of comparing with the output
+    // it can be used like this:
+    // PRINT_SPEC=1 cargo test --test event_reader sample_1_full 2> sample_1_full.txt
+    static ref PRINT: bool = {
+        for (key, value) in env::vars() {
+            if key == "PRINT_SPEC" && value == "1" {
+                return true;
+            }
+        }
+        false
+    };
+}
+
+// clones a lot but that's fine
+fn trim_until_bar(s: String) -> String {
+    match s.trim() {
+        ts if ts.starts_with('|') => return ts[1..].to_owned(),
+        _ => {}
+    }
+    s
+}
+
+fn test(input: &[u8], output: &[u8], config: ParserConfig, test_position: bool) {
+    let mut reader = config.create_reader(input);
+    let mut spec_lines = BufReader::new(output).lines()
+        .map(|line| line.unwrap())
+        .enumerate()
+        .map(|(i, line)| (i, trim_until_bar(line)))
+        .filter(|&(_, ref line)| !line.trim().is_empty());
+
+    loop {
+        let e = reader.next();
+        let line =
+            if test_position {
+                format!("{} {}", reader.position(), Event(&e))
+            } else {
+                format!("{}", Event(&e))
+            };
+
+        if *PRINT {
+            writeln!(&mut stderr(), "{}", line).unwrap();
+        } else {
+            if let Some((n, spec)) = spec_lines.next() {
+                if line != spec {
+                    const SPLITTER: &'static str = "-------------------";
+                    panic!("\n{}\nUnexpected event at line {}:\nExpected: {}\nFound:    {}\n{}\n",
+                           SPLITTER, n + 1, spec, line, std::str::from_utf8(output).unwrap());
+                }
+            } else {
+                panic!("Unexpected event: {}", line);
+            }
+        }
+
+        match e {
+            Ok(XmlEvent::EndDocument) | Err(_) => break,
+            _ => {},
+        }
+    }
+}
+
+// Here we define our own string representation of events so we don't depend
+// on the specifics of Display implementation for XmlEvent and OwnedName.
+
+struct Name<'a>(&'a OwnedName);
+
+impl <'a> fmt::Display for Name<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if let Some(ref namespace) = self.0.namespace {
+            try! { write!(f, "{{{}}}", namespace) }
+        }
+
+        if let Some(ref prefix) = self.0.prefix {
+            try! { write!(f, "{}:", prefix) }
+        }
+
+        write!(f, "{}", self.0.local_name)
+    }
+}
+
+struct Event<'a>(&'a Result<XmlEvent>);
+
+impl<'a> fmt::Display for Event<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let empty = String::new();
+        match *self.0 {
+            Ok(ref e) => match *e {
+                XmlEvent::StartDocument { ref version, ref encoding, .. } =>
+                    write!(f, "StartDocument({}, {})", version, encoding),
+                XmlEvent::EndDocument =>
+                    write!(f, "EndDocument"),
+                XmlEvent::ProcessingInstruction { ref name, ref data } =>
+                    write!(f, "ProcessingInstruction({}={:?})", name,
+                        data.as_ref().unwrap_or(&empty)),
+                XmlEvent::StartElement { ref name, ref attributes, .. } => {
+                    if attributes.is_empty() {
+                        write!(f, "StartElement({})", Name(name))
+                    }
+                    else {
+                        let attrs: Vec<_> = attributes.iter()
+                            .map(|a| format!("{}={:?}", Name(&a.name), a.value)) .collect();
+                        write!(f, "StartElement({} [{}])", Name(name), attrs.join(", "))
+                    }
+                },
+                XmlEvent::EndElement { ref name } =>
+                    write!(f, "EndElement({})", Name(name)),
+                XmlEvent::Comment(ref data) =>
+                    write!(f, r#"Comment("{}")"#, data.escape_debug()),
+                XmlEvent::CData(ref data) =>
+                    write!(f, r#"CData("{}")"#, data.escape_debug()),
+                XmlEvent::Characters(ref data) =>
+                    write!(f, r#"Characters("{}")"#, data.escape_debug()),
+                XmlEvent::Whitespace(ref data) =>
+                    write!(f, r#"Whitespace("{}")"#, data.escape_debug()),
+            },
+            Err(ref e) => e.fmt(f),
+        }
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/event_writer.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/event_writer.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/event_writer.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/event_writer.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,269 @@
+#![forbid(unsafe_code)]
+
+extern crate xml;
+
+use std::io::{BufReader, SeekFrom};
+use std::io::prelude::*;
+use std::fs::File;
+use std::str;
+
+use xml::reader::EventReader;
+use xml::writer::EmitterConfig;
+
+macro_rules! unwrap_all {
+    ($($e:expr);+) => {{
+        $($e.unwrap();)+
+    }}
+}
+
+#[test]
+fn reading_writing_equal_with_namespaces() {
+    let mut f = File::open("tests/documents/sample_2.xml").unwrap();
+    let mut b = Vec::new();
+
+    {
+        let r = EventReader::new(BufReader::new(&mut f));
+        let mut w = EmitterConfig::default().perform_indent(true).create_writer(&mut b);
+
+        for e in r {
+            match e {
+                Ok(e) => if let Some(e) = e.as_writer_event() {
+                    match w.write(e) {
+                        Ok(_) => {},
+                        Err(e) => panic!("Writer error: {:?}", e)
+                    }
+                },
+                Err(e) => panic!("Error: {}", e)
+            }
+        }
+    }
+
+    f.seek(SeekFrom::Start(0)).unwrap();
+    let mut fs = String::new();
+    f.read_to_string(&mut fs).unwrap();
+
+    let bs = String::from_utf8(b).unwrap();
+
+    assert_eq!(fs.trim(), bs.trim());
+}
+
+#[test]
+fn writing_simple() {
+    use xml::writer::XmlEvent;
+
+    let mut b = Vec::new();
+
+    {
+        let mut w = EmitterConfig::new().write_document_declaration(false).create_writer(&mut b);
+
+        w.write(XmlEvent::start_element("h:hello").ns("h", "urn:hello-world")).unwrap();
+        w.write("hello world").unwrap();
+        w.write(XmlEvent::end_element()).unwrap();
+    }
+
+    assert_eq!(
+        str::from_utf8(&b).unwrap(),
+        r#"<h:hello xmlns:h="urn:hello-world">hello world</h:hello>"#
+    );
+}
+
+#[test]
+fn writing_empty_elements_with_normalizing() {
+    use xml::writer::XmlEvent;
+
+    let mut b = Vec::new();
+
+    {
+        let mut w = EmitterConfig::new().write_document_declaration(false).create_writer(&mut b);
+
+        unwrap_all! {
+            w.write(XmlEvent::start_element("hello"));
+            w.write(XmlEvent::start_element("world"));
+            w.write(XmlEvent::end_element());
+            w.write(XmlEvent::end_element())
+        }
+    }
+
+    assert_eq!(str::from_utf8(&b).unwrap(), r#"<hello><world /></hello>"#);
+}
+
+#[test]
+fn writing_empty_elements_without_normalizing() {
+    use xml::writer::XmlEvent;
+
+    let mut b = Vec::new();
+
+    {
+        let mut w = EmitterConfig::new()
+            .write_document_declaration(false)
+            .normalize_empty_elements(false)
+            .create_writer(&mut b);
+
+        unwrap_all! {
+            w.write(XmlEvent::start_element("hello"));
+            w.write(XmlEvent::start_element("world"));
+            w.write(XmlEvent::end_element());
+            w.write(XmlEvent::end_element())
+        }
+    }
+
+    assert_eq!(str::from_utf8(&b).unwrap(), r#"<hello><world></world></hello>"#);
+}
+
+#[test]
+fn writing_empty_elements_without_pad_self_closing() {
+    use xml::writer::XmlEvent;
+
+    let mut b = Vec::new();
+
+    {
+        let mut w = EmitterConfig::new()
+            .write_document_declaration(false)
+            .pad_self_closing(false)
+            .create_writer(&mut b);
+
+        unwrap_all! {
+            w.write(XmlEvent::start_element("hello"));
+            w.write(XmlEvent::start_element("world"));
+            w.write(XmlEvent::end_element());
+            w.write(XmlEvent::end_element())
+        }
+    }
+
+    assert_eq!(str::from_utf8(&b).unwrap(), r#"<hello><world/></hello>"#);
+}
+#[test]
+fn writing_empty_elements_pad_self_closing_explicit() {
+    use xml::writer::XmlEvent;
+
+    let mut b = Vec::new();
+
+    {
+        let mut w = EmitterConfig::new()
+            .write_document_declaration(false)
+            .pad_self_closing(true)
+            .create_writer(&mut b);
+
+        unwrap_all! {
+            w.write(XmlEvent::start_element("hello"));
+            w.write(XmlEvent::start_element("world"));
+            w.write(XmlEvent::end_element());
+            w.write(XmlEvent::end_element())
+        }
+    }
+
+    assert_eq!(str::from_utf8(&b).unwrap(), r#"<hello><world /></hello>"#);
+}
+
+#[test]
+fn writing_comments_with_indentation() {
+    use xml::writer::XmlEvent;
+
+    let mut b = Vec::new();
+
+    {
+        let mut w = EmitterConfig::new()
+            .write_document_declaration(false)
+            .perform_indent(true)
+            .create_writer(&mut b);
+
+        unwrap_all! {
+            w.write(XmlEvent::start_element("hello"));
+            w.write(XmlEvent::start_element("world"));
+            w.write(XmlEvent::comment("  this is a manually padded comment\t"));
+            w.write(XmlEvent::comment("this is an unpadded comment"));
+            w.write(XmlEvent::end_element());
+            w.write(XmlEvent::end_element())
+        }
+    }
+
+    assert_eq!(
+        str::from_utf8(&b).unwrap(),
+        "<hello>
+  <world>
+    <!--  this is a manually padded comment\t-->
+    <!-- this is an unpadded comment -->
+  </world>
+</hello>");
+}
+
+#[test]
+fn issue_112_overriding_namepace_prefix() {
+    use xml::writer::XmlEvent;
+
+    let mut b = Vec::new();
+
+    {
+        let mut w = EmitterConfig::new()
+            .write_document_declaration(false)
+            .create_writer(&mut b);
+
+        unwrap_all! {
+            w.write(XmlEvent::start_element("iq").ns("", "jabber:client").ns("a", "urn:A"));
+            w.write(XmlEvent::start_element("bind").ns("", "urn:ietf:params:xml:ns:xmpp-bind"));
+            w.write(XmlEvent::end_element());
+            w.write(XmlEvent::start_element("whatever").ns("a", "urn:X"));
+            w.write(XmlEvent::end_element());
+            w.write(XmlEvent::end_element())
+        }
+    }
+
+    assert_eq!(
+        str::from_utf8(&b).unwrap(),
+        r#"<iq xmlns="jabber:client" xmlns:a="urn:A"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind" /><whatever xmlns:a="urn:X" /></iq>"#
+    )
+}
+
+#[test]
+fn attribute_escaping() {
+    use xml::writer::XmlEvent;
+
+    let mut b = Vec::new();
+
+    {
+        let mut w = EmitterConfig::new()
+            .write_document_declaration(false)
+            .perform_indent(true)
+            .create_writer(&mut b);
+
+        unwrap_all! {
+            w.write(
+                XmlEvent::start_element("hello")
+                    .attr("testLt", "<")
+                    .attr("testGt", ">")
+            );
+            w.write(XmlEvent::end_element());
+            w.write(
+                XmlEvent::start_element("hello")
+                    .attr("testQuot", "\"")
+                    .attr("testApos", "\'")
+            );
+            w.write(XmlEvent::end_element());
+            w.write(
+                XmlEvent::start_element("hello")
+                    .attr("testAmp", "&")
+            );
+            w.write(XmlEvent::end_element());
+            w.write(
+                XmlEvent::start_element("hello")
+                    .attr("testNl", "\n")
+                    .attr("testCr", "\r")
+            );
+            w.write(XmlEvent::end_element());
+            w.write(
+                XmlEvent::start_element("hello")
+                    .attr("testNl", "\\n")
+                    .attr("testCr", "\\r")
+            );
+            w.write(XmlEvent::end_element())
+        }
+    }
+    assert_eq!(
+        str::from_utf8(&b).unwrap(),
+        "<hello testLt=\"&lt;\" testGt=\"&gt;\" />
+<hello testQuot=\"&quot;\" testApos=\"&apos;\" />
+<hello testAmp=\"&amp;\" />
+<hello testNl=\"&#xA;\" testCr=\"&#xD;\" />
+<hello testNl=\"\\n\" testCr=\"\\r\" />"
+    );
+}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/streaming.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/streaming.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/xml-rs/tests/streaming.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/xml-rs/tests/streaming.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,103 @@
+#![forbid(unsafe_code)]
+
+extern crate xml;
+
+use std::io::{Cursor, Write};
+
+use xml::EventReader;
+use xml::reader::ParserConfig;
+use xml::reader::XmlEvent;
+
+macro_rules! assert_match {
+    ($actual:expr, $expected:pat) => {
+        match $actual {
+            $expected => {},
+            _ => panic!("assertion failed: `(left matches right)` \
+                        (left: `{:?}`, right: `{}`", $actual, stringify!($expected))
+        }
+    };
+    ($actual:expr, $expected:pat if $guard:expr) => {
+        match $actual {
+            $expected if $guard => {},
+            _ => panic!("assertion failed: `(left matches right)` \
+                        (left: `{:?}`, right: `{} if {}`",
+                        $actual, stringify!($expected), stringify!($guard))
+        }
+    }
+}
+
+fn write_and_reset_position<W>(c: &mut Cursor<W>, data: &[u8]) where Cursor<W>: Write {
+    let p = c.position();
+    c.write_all(data).unwrap();
+    c.set_position(p);
+}
+
+#[test]
+fn reading_streamed_content() {
+    let buf = Cursor::new(b"<root>".to_vec());
+    let reader = EventReader::new(buf);
+
+    let mut it = reader.into_iter();
+
+    assert_match!(it.next(), Some(Ok(XmlEvent::StartDocument { .. })));
+    assert_match!(it.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "root");
+
+    write_and_reset_position(it.source_mut(), b"<child-1>content</child-1>");
+    assert_match!(it.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "child-1");
+    assert_match!(it.next(), Some(Ok(XmlEvent::Characters(ref c))) if c == "content");
+    assert_match!(it.next(), Some(Ok(XmlEvent::EndElement { ref name })) if name.local_name == "child-1");
+
+    write_and_reset_position(it.source_mut(), b"<child-2/>");
+    assert_match!(it.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "child-2");
+    assert_match!(it.next(), Some(Ok(XmlEvent::EndElement { ref name })) if name.local_name == "child-2");
+
+    write_and_reset_position(it.source_mut(), b"<child-3/>");
+    assert_match!(it.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "child-3");
+    assert_match!(it.next(), Some(Ok(XmlEvent::EndElement { ref name })) if name.local_name == "child-3");
+    // doesn't seem to work because of how tags parsing is done
+//    write_and_reset_position(it.source_mut(), b"some text");
+   // assert_match!(it.next(), Some(Ok(XmlEvent::Characters(ref c))) if c == "some text");
+
+    write_and_reset_position(it.source_mut(), b"</root>");
+    assert_match!(it.next(), Some(Ok(XmlEvent::EndElement { ref name })) if name.local_name == "root");
+    assert_match!(it.next(), Some(Ok(XmlEvent::EndDocument)));
+    assert_match!(it.next(), None);
+}
+
+#[test]
+fn reading_streamed_content2() {
+    let buf = Cursor::new(b"<root>".to_vec());
+    let mut config = ParserConfig::new();
+    config.ignore_end_of_stream = true;
+    let readerb = EventReader::new_with_config(buf, config);
+
+    let mut reader = readerb.into_iter();
+
+    assert_match!(reader.next(), Some(Ok(XmlEvent::StartDocument { .. })));
+    assert_match!(reader.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "root");
+
+    write_and_reset_position(reader.source_mut(), b"<child-1>content</child-1>");
+    assert_match!(reader.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "child-1");
+    assert_match!(reader.next(), Some(Ok(XmlEvent::Characters(ref c))) if c == "content");
+    assert_match!(reader.next(), Some(Ok(XmlEvent::EndElement { ref name })) if name.local_name == "child-1");
+
+    write_and_reset_position(reader.source_mut(), b"<child-2>content</child-2>");
+
+    assert_match!(reader.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "child-2");
+    assert_match!(reader.next(), Some(Ok(XmlEvent::Characters(ref c))) if c == "content");
+    assert_match!(reader.next(), Some(Ok(XmlEvent::EndElement { ref name })) if name.local_name == "child-2");
+    assert_match!(reader.next(), Some(Err(_)));
+    write_and_reset_position(reader.source_mut(), b"<child-3></child-3>");
+    assert_match!(reader.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "child-3");
+    write_and_reset_position(reader.source_mut(), b"<child-4 type='get'");
+    match reader.next() {
+       None |
+       Some(Ok(_)) => {
+          panic!("At this point, parser must not detect something.");
+       },
+       Some(Err(_)) => {}
+    };
+    write_and_reset_position(reader.source_mut(), b" />");
+    assert_match!(reader.next(), Some(Ok(XmlEvent::StartElement { ref name, .. })) if name.local_name == "child-4");
+}
+
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/appveyor.yml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/appveyor.yml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/appveyor.yml	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-# Appveyor configuration template for Rust using rustup for Rust installation
-# https://github.com/starkat99/appveyor-rust
-
-os: Visual Studio 2015
-
-environment:
-  matrix:
-
-  # Stable 64-bit MSVC
-    - channel: stable
-      target: x86_64-pc-windows-msvc
-  # Stable 32-bit MSVC
-    - channel: stable
-      target: i686-pc-windows-msvc
-  # Stable 64-bit GNU
-    - channel: stable
-      target: x86_64-pc-windows-gnu
-  # Stable 32-bit GNU
-    - channel: stable
-      target: i686-pc-windows-gnu
-
-install:
-  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init -yv --default-toolchain %channel% --default-host %target%
-  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
-  - ps: |
-      if ($env:target -like "*-gnu" -And $env:target -like "x86_64-*") {
-          Start-FileDownload "http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.1.0/threads-win32/seh/x86_64-5.1.0-release-win32-seh-rt_v4-rev0.7z/download" -FileName mingw64.7z
-          7z x -oC:\ mingw64.7z > $null
-          $env:path = "C:\mingw64\bin;" + $env:path
-          gcc --version
-      }
-      elseif ($env:target -like "*-gnu") {
-          $env:path = "C:\mingw\bin;" + $env:path
-          gcc --version
-      }
-  - rustc -vV
-  - cargo -vV
-
-build: false
-
-test_script:
-  - cargo test
-  - cargo test --no-default-features
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/benches/read_entry.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/benches/read_entry.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/benches/read_entry.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/benches/read_entry.rs	2021-12-09 12:01:27.000000000 +0000
@@ -9,8 +9,8 @@
 fn generate_random_archive(size: usize) -> Vec<u8> {
     let data = Vec::new();
     let mut writer = ZipWriter::new(Cursor::new(data));
-    let options = zip::write::FileOptions::default()
-        .compression_method(zip::CompressionMethod::Stored);
+    let options =
+        zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Stored);
 
     writer.start_file("random.dat", options).unwrap();
     let mut bytes = vec![0u8; size];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/.cargo-checksum.json	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/.cargo-checksum.json	2021-12-09 12:01:27.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"ffa7d451d769bca5d9970a6ad07260d3715ca67dd76dbc87f5e28d9f253d9109","Cargo.toml":"49eda1b572b8da842a3b1038ed88252a06eae5caef147fe8a5212437d591c080","LICENSE":"6ac8711fb340c62ce0a4ecd463342d3fa0e8e70de697c863a2e1c0c53006003c","README.md":"d158faf3d2a572aa73b2e731ba80a2aeb6a39409a8f0b2dd9a13c540ff14e7b1","appveyor.yml":"53ebe35598907954204812614a160355f36750ede4546bc69027cbaf7643d34c","benches/read_entry.rs":"8ecdca05e7944c0ab09a93a174b40075338b23a15b2a9e94725a5e69409ec088","examples/extract.rs":"8ad0188eb05069e9976ca55c8f3cdba18cb44b7029d833c839a33ecaed42d8da","examples/extract_lorem.rs":"c5120d3930dd70891e9d7560f157e993b9e8e938aeba8a4a0f652997e5d6618c","examples/file_info.rs":"895f1f387c81206bf327d09163048c7ffd654a27aba22be648ccd11d35cced29","examples/stdin_info.rs":"3fd967652fd63562e3f7bbc08ed738b8db65671eba3667195d53a6fb3461b1cb","examples/write_dir.rs":"67903fbcd1adfc482cdcf7b670b02abb3a0ff6fed482f35f85303eb201026e39","examples/write_sample.rs":"fdfc0f7a8a295c55c5e9cb0c81ef5e466afad4f03a8f6defabf4270c6ff74c24","script/doc-upload.cfg":"10684c8f5ef7e7388cfc4742ab9a060fe8f7fc1c51a63ede3c2443260ecc2d5e","src/compression.rs":"66f776bd74417e492a5c5681df107c76ccbdc5ee21bd319f5c6989cc69d7e615","src/cp437.rs":"92e468e3c866e315bc22461c59c810d20556d8c7ae597dfc4d77ac34bc3cb7f5","src/crc32.rs":"5129a7ab76dc2cc9799bb64107657cb4278b581e22ae3410806467e70dee4b65","src/lib.rs":"d78c933c9e2b106e87cca7b8c0c978bf3d4680d14a6ea37a7a2783fcf6ee4008","src/read.rs":"72abe142f1f0d4cade44a0beb1cbd290773674c7da5499b75df0f21b79cc876f","src/result.rs":"a2e7b2739eec430ef2913cc23f0a210893ac0e97abb5648a8c927c2ca2d43af4","src/spec.rs":"ce1f41f15340e8c5882134c2ae968f353c9bb1fe5bf723e21d9e2fc8a7c8a7c5","src/types.rs":"ef55467a1f2f815aebc2d4b223dc1cb5db8e2912d9c17bf789ca0e00d33b8000","src/write.rs":"e5599eafbc43dea0e8dfd79f71b796d9a63ffc7246b82c88a2823cc798f1d3cb","tests/data/files_and_dirs.zip":"e54cd8d084739f8d0b119d769c1263507b4da915cc38e4e2d3e4ef17c718f317","tests/data/invalid_offset.zip":"c5534a1803145f6344b04c437d436bd583852c78dd3937f4a73a2a39aa2d76b2","tests/data/mimetype.zip":"4bc6fd161d3e844b3e2b7f10fd0f9077ff565bb39fd2bfa34e7f8e9cd62db06d","tests/data/zip64_demo.zip":"223072a480f60d6a700e427b294e575ae2d6265f3e9881b647927f31d96c7e01","tests/end_to_end.rs":"905b59fe4ab238ce698badb5322ecbca7a54b1ed99c1e2eab62074fc8148327b","tests/invalid_date.rs":"60210a7c15edacfb7fe891f81f84ce491d83aedd996a1386ea648267e03ce589","tests/zip64_large.rs":"83b559b63dcb3759a2479aa9d32f795e4c33bdd7d4e207975ad90916054a3183"},"package":"58287c28d78507f5f91f2a4cf1e8310e2c76fd4c6932f93ac60fd1ceb402db7d"}
\ No newline at end of file
+{"files":{"CODE_OF_CONDUCT.md":"b8a7d78b9dcbc47fd87bf26d8b0175fee052d9f5a869217b5943c0a2e6949c7c","Cargo.lock":"1bd628f555afa667cc802104bcdb9c83ddd07af0db84fa986bcc77603cac0941","Cargo.toml":"60dc33767e115b4b0044693cc25f603a402ddd052f986a35fcc8a745d391676d","LICENSE":"6ac8711fb340c62ce0a4ecd463342d3fa0e8e70de697c863a2e1c0c53006003c","README.md":"611a1b47bffb4ecf1a3452e459811e464825cb6991fbb43db2d54bd38fb60dff","benches/read_entry.rs":"880870f5f2fcfc9b0a09bb2da638745c64e0383ffe00b44634c7f7faf8c944f9","examples/extract.rs":"78405e6adb4be2dd879ce8ffeb646228ecfd4b006e5fb6b6693ba13d187208b5","examples/extract_lorem.rs":"2bd423ebbb6daf77c083a94b729b09db58f2642054c0aed7d5da50ce31d3c2e5","examples/file_info.rs":"fc2c14dff179a185c4a4ca86dd64050657f271098b4491253ae33f51f99650e9","examples/stdin_info.rs":"db4e63fb620ac4600ebe17bf93b9a3aa9d9b4eed827c6b80f46910a8e6222dc0","examples/write_dir.rs":"496f78f5a018d0313c28901fd59aab71107a0658e09f57f3fbab308995ec44a0","examples/write_sample.rs":"275de31c6f79d934d12570a4195c75e5f55f1753ac4e7bbbe48f13a31ea3b6ca","src/compression.rs":"5b14631f6ef6152fa33db5a0ae71091a13096602adb4a97072ecc20e419a0884","src/cp437.rs":"c77ca2b721f12558e330f1365461db9d06a31eca352faa6ad637b43307814a90","src/crc32.rs":"d459ec2db3c4d569edd27825ade6018fd7b6b3903a36f50a4d4d4583a3ff3e77","src/lib.rs":"331ca82b75d70111b902bf3b1b40615c0e183470aed7e40dbcf3cea9b2ef3b3b","src/read.rs":"fa33f3184f1de53fbd9421966cb70d9a0edcbe650cede37c98a8ec02462be5ab","src/result.rs":"4ecde46792284441bc08cb2b22b2295e0d627ee49d9a5dad8f38e47b8b8b4f52","src/spec.rs":"0af50f94b26c94d15b0b27eee9d5e74ce575d391125c196b5b1c09d0f3b2a163","src/types.rs":"afe735720ec8c2c2ae6a09f24b033113121c4919b086bd52bb9963df8ea692a4","src/write.rs":"31035f6cb6f3e65f7ea0db6ab5f69ecdb08374e86dec361d3e9bba96d8c131ac","src/zipcrypto.rs":"631a89bfc784d92fe2a790a1f11000e4f6a49eb029f04a9fcd4db2058ea8f0dc","tests/data/comment_garbage.zip":"4a908af18691e50fc7773b34669a8ab6cb60875bee4d60fb7cd66d90eed55d2b","tests/data/files_and_dirs.zip":"e54cd8d084739f8d0b119d769c1263507b4da915cc38e4e2d3e4ef17c718f317","tests/data/invalid_offset.zip":"c5534a1803145f6344b04c437d436bd583852c78dd3937f4a73a2a39aa2d76b2","tests/data/invalid_offset2.zip":"0f0f3d654f303eaf90f599c0b0266be476ce34857cff932070a86e9853dcb4f9","tests/data/mimetype.zip":"aad4289745bd89016181a35653c9a483c6b9b632e06d002736c7040d61c562a2","tests/data/zip64_demo.zip":"223072a480f60d6a700e427b294e575ae2d6265f3e9881b647927f31d96c7e01","tests/end_to_end.rs":"16a7470b693b621a65a086e8deac60ddf0d25a98495d0056ba5fb128d07be49b","tests/invalid_date.rs":"72d5425ffe2887e05646ba56f5116ac760cbeeb7889da5c9be612fe57477bc94","tests/zip64_large.rs":"083f070ae566e0a3b317bd94d51186b37f2ff88f225deae721b0b56be838da1c","tests/zip_comment_garbage.rs":"ab0e2e3ace1ca5459977a092ee96836f58c7f7a7cfc8de258ab448d8d24f1cbb","tests/zip_crypto.rs":"7f4f9670e5d971ac4234c7ab2cafecf43801baf0be0cfca6e34c651f6fc6a80d"},"package":"93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/Cargo.lock thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/Cargo.lock	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/Cargo.lock	2021-12-09 12:01:27.000000000 +0000
@@ -2,246 +2,320 @@
 # It is not intended for manual editing.
 [[package]]
 name = "adler32"
-version = "1.0.4"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
 [[package]]
 name = "bencher"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5"
+
+[[package]]
+name = "byteorder"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
 
 [[package]]
 name = "bzip2"
-version = "0.3.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf8012c8a15d5df745fcf258d93e6149dcf102882c8d8702d9cff778eab43a8"
 dependencies = [
- "bzip2-sys 0.1.9+1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bzip2-sys",
+ "libc",
 ]
 
 [[package]]
 name = "bzip2-sys"
-version = "0.1.9+1.0.8"
+version = "0.1.10+1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c"
 dependencies = [
- "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.54"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
 
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "flate2"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10",
+ "crc32fast",
+ "libc",
+ "libz-sys",
+ "miniz_oxide",
 ]
 
 [[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
+name = "getrandom"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.71"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
 
 [[package]]
 name = "libz-sys"
-version = "1.0.25"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
 dependencies = [
- "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
 ]
 
 [[package]]
 name = "miniz_oxide"
 version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
 dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "adler32",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.17"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
 
 [[package]]
-name = "podio"
-version = "0.1.7"
+name = "ppv-lite86"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
 
 [[package]]
 name = "rand"
-version = "0.4.6"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.3.1"
+name = "rand_chacha"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 dependencies = [
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.4.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom",
+]
 
 [[package]]
-name = "rdrand"
-version = "0.4.0"
+name = "rand_hc"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core",
 ]
 
 [[package]]
 name = "same-file"
-version = "0.1.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
 ]
 
 [[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
 name = "vcpkg"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
 
 [[package]]
 name = "walkdir"
-version = "1.0.7"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file",
+ "winapi",
+ "winapi-util",
 ]
 
 [[package]]
-name = "winapi"
-version = "0.2.8"
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "winapi"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
-name = "winapi-build"
-version = "0.1.1"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
+name = "winapi-util"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "zip"
-version = "0.5.6"
+version = "0.5.13"
 dependencies = [
- "bencher 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "podio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[metadata]
-"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-"checksum bencher 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5"
-"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
-"checksum bzip2-sys 0.1.9+1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e"
-"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-"checksum flate2 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42"
-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
-"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
-"checksum miniz_oxide 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
-"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum podio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19"
-"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
-"checksum time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-"checksum vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
-"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+ "bencher",
+ "byteorder",
+ "bzip2",
+ "crc32fast",
+ "flate2",
+ "rand",
+ "thiserror",
+ "time",
+ "walkdir",
+]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/Cargo.toml thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/Cargo.toml	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/Cargo.toml	2021-12-09 12:01:27.000000000 +0000
@@ -13,31 +13,33 @@
 [package]
 edition = "2018"
 name = "zip"
-version = "0.5.6"
-authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>"]
+version = "0.5.13"
+authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>", "Marli Frost <marli@frost.red>", "Ryan Levick <ryan.levick@gmail.com>"]
 description = "Library to support the reading and writing of zip files.\n"
-documentation = "http://mvdnes.github.io/rust-docs/zip-rs/zip/index.html"
 keywords = ["zip", "archive"]
 license = "MIT"
-repository = "https://github.com/mvdnes/zip-rs.git"
+repository = "https://github.com/zip-rs/zip.git"
 
 [[bench]]
 name = "read_entry"
 harness = false
+[dependencies.byteorder]
+version = "1.3"
+
 [dependencies.bzip2]
-version = "0.3"
+version = "0.4"
 optional = true
 
 [dependencies.crc32fast]
 version = "1.0"
 
 [dependencies.flate2]
-version = "1.0"
+version = "1.0.0"
 optional = true
 default-features = false
 
-[dependencies.podio]
-version = "0.1"
+[dependencies.thiserror]
+version = "1.0"
 
 [dependencies.time]
 version = "0.1"
@@ -46,13 +48,14 @@
 version = "0.1"
 
 [dev-dependencies.rand]
-version = "0.4"
+version = "0.7"
 
 [dev-dependencies.walkdir]
-version = "1.0"
+version = "2"
 
 [features]
 default = ["bzip2", "deflate", "time"]
 deflate = ["flate2/rust_backend"]
 deflate-miniz = ["flate2/default"]
 deflate-zlib = ["flate2/zlib"]
+unreserved = []
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/CODE_OF_CONDUCT.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/CODE_OF_CONDUCT.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/CODE_OF_CONDUCT.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/CODE_OF_CONDUCT.md	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,77 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at ryan.levick@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/extract_lorem.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/extract_lorem.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/extract_lorem.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/extract_lorem.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,12 +1,10 @@
 use std::io::prelude::*;
 
-fn main()
-{
+fn main() {
     std::process::exit(real_main());
 }
 
-fn real_main() -> i32
-{
+fn real_main() -> i32 {
     let args: Vec<_> = std::env::args().collect();
     if args.len() < 2 {
         println!("Usage: {} <filename>", args[0]);
@@ -16,11 +14,13 @@
     let zipfile = std::fs::File::open(&fname).unwrap();
 
     let mut archive = zip::ZipArchive::new(zipfile).unwrap();
-    
-    let mut file = match archive.by_name("test/lorem_ipsum.txt")
-    {
+
+    let mut file = match archive.by_name("test/lorem_ipsum.txt") {
         Ok(file) => file,
-        Err(..) => { println!("File test/lorem_ipsum.txt not found"); return 2;}
+        Err(..) => {
+            println!("File test/lorem_ipsum.txt not found");
+            return 2;
+        }
     };
 
     let mut contents = String::new();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/extract.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/extract.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/extract.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/extract.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,5 +1,5 @@
-use std::io;
 use std::fs;
+use std::io;
 
 fn main() {
     std::process::exit(real_main());
@@ -18,7 +18,10 @@
 
     for i in 0..archive.len() {
         let mut file = archive.by_index(i).unwrap();
-        let outpath = file.sanitized_name();
+        let outpath = match file.enclosed_name() {
+            Some(path) => path.to_owned(),
+            None => continue,
+        };
 
         {
             let comment = file.comment();
@@ -28,10 +31,15 @@
         }
 
         if (&*file.name()).ends_with('/') {
-            println!("File {} extracted to \"{}\"", i, outpath.as_path().display());
+            println!("File {} extracted to \"{}\"", i, outpath.display());
             fs::create_dir_all(&outpath).unwrap();
         } else {
-            println!("File {} extracted to \"{}\" ({} bytes)", i, outpath.as_path().display(), file.size());
+            println!(
+                "File {} extracted to \"{}\" ({} bytes)",
+                i,
+                outpath.display(),
+                file.size()
+            );
             if let Some(p) = outpath.parent() {
                 if !p.exists() {
                     fs::create_dir_all(&p).unwrap();
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/file_info.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/file_info.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/file_info.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/file_info.rs	2021-12-09 12:01:27.000000000 +0000
@@ -19,7 +19,13 @@
 
     for i in 0..archive.len() {
         let file = archive.by_index(i).unwrap();
-        let outpath = file.sanitized_name();
+        let outpath = match file.enclosed_name() {
+            Some(path) => path,
+            None => {
+                println!("Entry {} has a suspicious path", file.name());
+                continue;
+            }
+        };
 
         {
             let comment = file.comment();
@@ -29,9 +35,18 @@
         }
 
         if (&*file.name()).ends_with('/') {
-            println!("Entry {} is a directory with name \"{}\"", i, outpath.as_path().display());
+            println!(
+                "Entry {} is a directory with name \"{}\"",
+                i,
+                outpath.display()
+            );
         } else {
-            println!("Entry {} is a file with name \"{}\" ({} bytes)", i, outpath.as_path().display(), file.size());
+            println!(
+                "Entry {} is a file with name \"{}\" ({} bytes)",
+                i,
+                outpath.display(),
+                file.size()
+            );
         }
     }
     return 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/stdin_info.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/stdin_info.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/stdin_info.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/stdin_info.rs	2021-12-09 12:01:27.000000000 +0000
@@ -12,17 +12,22 @@
     loop {
         match zip::read::read_zipfile_from_stream(&mut stdin_handle) {
             Ok(Some(mut file)) => {
-                println!("{}: {} bytes ({} bytes packed)", file.name(), file.size(), file.compressed_size());
+                println!(
+                    "{}: {} bytes ({} bytes packed)",
+                    file.name(),
+                    file.size(),
+                    file.compressed_size()
+                );
                 match file.read(&mut buf) {
                     Ok(n) => println!("The first {} bytes are: {:?}", n, &buf[0..n]),
                     Err(e) => println!("Could not read the file: {:?}", e),
                 };
-            },
+            }
             Ok(None) => break,
             Err(e) => {
                 println!("Error encountered while reading zip: {:?}", e);
                 return 1;
-            },
+            }
         }
     }
     return 0;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/write_dir.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/write_dir.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/write_dir.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/write_dir.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,42 +1,53 @@
-
 use std::io::prelude::*;
-use std::io::{Write, Seek};
+use std::io::{Seek, Write};
 use std::iter::Iterator;
-use zip::write::FileOptions;
 use zip::result::ZipError;
+use zip::write::FileOptions;
 
-use walkdir::{WalkDir, DirEntry};
-use std::path::Path;
 use std::fs::File;
+use std::path::Path;
+use walkdir::{DirEntry, WalkDir};
 
 fn main() {
     std::process::exit(real_main());
 }
 
-const METHOD_STORED : Option<zip::CompressionMethod> = Some(zip::CompressionMethod::Stored);
+const METHOD_STORED: Option<zip::CompressionMethod> = Some(zip::CompressionMethod::Stored);
 
-#[cfg(feature = "deflate")]
-const METHOD_DEFLATED : Option<zip::CompressionMethod> = Some(zip::CompressionMethod::Deflated);
-#[cfg(not(feature = "deflate"))]
-const METHOD_DEFLATED : Option<zip::CompressionMethod> = None;
+#[cfg(any(
+    feature = "deflate",
+    feature = "deflate-miniz",
+    feature = "deflate-zlib"
+))]
+const METHOD_DEFLATED: Option<zip::CompressionMethod> = Some(zip::CompressionMethod::Deflated);
+#[cfg(not(any(
+    feature = "deflate",
+    feature = "deflate-miniz",
+    feature = "deflate-zlib"
+)))]
+const METHOD_DEFLATED: Option<zip::CompressionMethod> = None;
 
 #[cfg(feature = "bzip2")]
-const METHOD_BZIP2 : Option<zip::CompressionMethod> = Some(zip::CompressionMethod::Bzip2);
+const METHOD_BZIP2: Option<zip::CompressionMethod> = Some(zip::CompressionMethod::Bzip2);
 #[cfg(not(feature = "bzip2"))]
-const METHOD_BZIP2 : Option<zip::CompressionMethod> = None;
+const METHOD_BZIP2: Option<zip::CompressionMethod> = None;
 
 fn real_main() -> i32 {
     let args: Vec<_> = std::env::args().collect();
     if args.len() < 3 {
-        println!("Usage: {} <source_directory> <destination_zipfile>",
-                 args[0]);
+        println!(
+            "Usage: {} <source_directory> <destination_zipfile>",
+            args[0]
+        );
         return 1;
     }
 
     let src_dir = &*args[1];
     let dst_file = &*args[2];
     for &method in [METHOD_STORED, METHOD_DEFLATED, METHOD_BZIP2].iter() {
-        if method.is_none() { continue }
+        if method.is_none() {
+            continue;
+        }
         match doit(src_dir, dst_file, method.unwrap()) {
             Ok(_) => println!("done: {} written to {}", src_dir, dst_file),
             Err(e) => println!("Error: {:?}", e),
@@ -46,9 +57,14 @@
     return 0;
 }
 
-fn zip_dir<T>(it: &mut dyn Iterator<Item=DirEntry>, prefix: &str, writer: T, method: zip::CompressionMethod)
-              -> zip::result::ZipResult<()>
-    where T: Write+Seek
+fn zip_dir<T>(
+    it: &mut dyn Iterator<Item = DirEntry>,
+    prefix: &str,
+    writer: T,
+    method: zip::CompressionMethod,
+) -> zip::result::ZipResult<()>
+where
+    T: Write + Seek,
 {
     let mut zip = zip::ZipWriter::new(writer);
     let options = FileOptions::default()
@@ -64,6 +80,7 @@
         // Some unzip tools unzip files with directory paths correctly, some do not!
         if path.is_file() {
             println!("adding file {:?} as {:?} ...", path, name);
+            #[allow(deprecated)]
             zip.start_file_from_path(name, options)?;
             let mut f = File::open(path)?;
 
@@ -74,6 +91,7 @@
             // Only if not root! Avoids path spec / warning
             // and mapname conversion failed error on unzip
             println!("adding dir {:?} as {:?} ...", path, name);
+            #[allow(deprecated)]
             zip.add_directory_from_path(name, options)?;
         }
     }
@@ -81,7 +99,11 @@
     Result::Ok(())
 }
 
-fn doit(src_dir: &str, dst_file: &str, method: zip::CompressionMethod) -> zip::result::ZipResult<()> {
+fn doit(
+    src_dir: &str,
+    dst_file: &str,
+    method: zip::CompressionMethod,
+) -> zip::result::ZipResult<()> {
     if !Path::new(src_dir).is_dir() {
         return Err(ZipError::FileNotFound);
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/write_sample.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/write_sample.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/examples/write_sample.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/examples/write_sample.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,13 +1,11 @@
 use std::io::prelude::*;
 use zip::write::FileOptions;
 
-fn main()
-{
+fn main() {
     std::process::exit(real_main());
 }
 
-fn real_main() -> i32
-{
+fn real_main() -> i32 {
     let args: Vec<_> = std::env::args().collect();
     if args.len() < 2 {
         println!("Usage: {} <filename>", args[0]);
@@ -15,8 +13,7 @@
     }
 
     let filename = &*args[1];
-    match doit(filename)
-    {
+    match doit(filename) {
         Ok(_) => println!("File written to {}", filename),
         Err(e) => println!("Error: {:?}", e),
     }
@@ -24,8 +21,7 @@
     return 0;
 }
 
-fn doit(filename: &str) -> zip::result::ZipResult<()>
-{
+fn doit(filename: &str) -> zip::result::ZipResult<()> {
     let path = std::path::Path::new(filename);
     let file = std::fs::File::create(&path).unwrap();
 
@@ -33,7 +29,9 @@
 
     zip.add_directory("test/", Default::default())?;
 
-    let options = FileOptions::default().compression_method(zip::CompressionMethod::Stored).unix_permissions(0o755);
+    let options = FileOptions::default()
+        .compression_method(zip::CompressionMethod::Stored)
+        .unix_permissions(0o755);
     zip.start_file("test/☃.txt", options)?;
     zip.write_all(b"Hello, World!\n")?;
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/README.md thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/README.md
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/README.md	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/README.md	2021-12-09 12:01:27.000000000 +0000
@@ -1,13 +1,10 @@
-**Unfortunately, due to a lack of time and loss of interest, this project will no longer be actively maintained.**
-
 zip-rs
 ======
 
-[![Build Status](https://travis-ci.org/mvdnes/zip-rs.svg?branch=master)](https://travis-ci.org/mvdnes/zip-rs)
-[![Build status](https://ci.appveyor.com/api/projects/status/gsnpqcodg19iu253/branch/master?svg=true)](https://ci.appveyor.com/project/mvdnes/zip-rs/branch/master)
+[![Build Status](https://img.shields.io/github/workflow/status/zip-rs/zip/CI)](https://github.com/zip-rs/zip/actions?query=branch%3Amaster+workflow%3ACI)
 [![Crates.io version](https://img.shields.io/crates/v/zip.svg)](https://crates.io/crates/zip)
 
-[Documentation](http://mvdnes.github.io/rust-docs/zip-rs/zip/index.html)
+[Documentation](https://docs.rs/zip/0.5.13/zip/)
 
 
 Info
@@ -51,12 +48,23 @@
 
 All of these are enabled by default.
 
+MSRV
+----
+
+Our current Minimum Supported Rust Version is **1.36.0**. When adding features,
+we will follow these guidelines:
+
+- We will always support the latest four minor Rust versions. This gives you a 6
+  month window to upgrade your compiler.
+- Any change to the MSRV will be accompanied with a **minor** version bump
+   - While the crate is pre-1.0, this will be a change to the PATCH version.
+
 Examples
 --------
 
 See the [examples directory](examples) for:
    * How to write a file to a zip.
-   * how to write a directory of files to a zip (using [walkdir](https://github.com/BurntSushi/walkdir)).
+   * How to write a directory of files to a zip (using [walkdir](https://github.com/BurntSushi/walkdir)).
    * How to extract a zip file.
    * How to extract a single file from a zip.
    * How to read a zip from the standard input.
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/script/doc-upload.cfg thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/script/doc-upload.cfg
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/script/doc-upload.cfg	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/script/doc-upload.cfg	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-PROJECT_NAME=zip-rs
-DOCS_REPO=mvdnes/rust-docs.git
-DOC_RUST_VERSION=stable
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/compression.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/compression.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/compression.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/compression.rs	2021-12-09 12:01:27.000000000 +0000
@@ -2,40 +2,108 @@
 
 use std::fmt;
 
-/// Compression methods for the contents of a ZIP file.
-#[derive(Copy, Clone, PartialEq, Debug)]
-pub enum CompressionMethod
-{
-    /// The file is stored (no compression)
+#[allow(deprecated)]
+/// Identifies the storage format used to compress a file within a ZIP archive.
+///
+/// Each file's compression method is stored alongside it, allowing the
+/// contents to be read without context.
+///
+/// When creating ZIP files, you may choose the method to use with
+/// [`zip::write::FileOptions::compression_method`]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+pub enum CompressionMethod {
+    /// Store the file as is
     Stored,
-    /// Deflate in pure rust
-    #[cfg(feature = "deflate")]
+    /// Compress the file using Deflate
+    #[cfg(any(
+        feature = "deflate",
+        feature = "deflate-miniz",
+        feature = "deflate-zlib"
+    ))]
     Deflated,
-    /// File is compressed using BZIP2 algorithm
+    /// Compress the file using BZIP2
     #[cfg(feature = "bzip2")]
     Bzip2,
     /// Unsupported compression method
+    #[deprecated(since = "0.5.7", note = "use the constants instead")]
     Unsupported(u16),
 }
-
+#[allow(deprecated, missing_docs)]
+/// All compression methods defined for the ZIP format
+impl CompressionMethod {
+    pub const STORE: Self = CompressionMethod::Stored;
+    pub const SHRINK: Self = CompressionMethod::Unsupported(1);
+    pub const REDUCE_1: Self = CompressionMethod::Unsupported(2);
+    pub const REDUCE_2: Self = CompressionMethod::Unsupported(3);
+    pub const REDUCE_3: Self = CompressionMethod::Unsupported(4);
+    pub const REDUCE_4: Self = CompressionMethod::Unsupported(5);
+    pub const IMPLODE: Self = CompressionMethod::Unsupported(6);
+    #[cfg(any(
+        feature = "deflate",
+        feature = "deflate-miniz",
+        feature = "deflate-zlib"
+    ))]
+    pub const DEFLATE: Self = CompressionMethod::Deflated;
+    #[cfg(not(any(
+        feature = "deflate",
+        feature = "deflate-miniz",
+        feature = "deflate-zlib"
+    )))]
+    pub const DEFLATE: Self = CompressionMethod::Unsupported(8);
+    pub const DEFLATE64: Self = CompressionMethod::Unsupported(9);
+    pub const PKWARE_IMPLODE: Self = CompressionMethod::Unsupported(10);
+    #[cfg(feature = "bzip2")]
+    pub const BZIP2: Self = CompressionMethod::Bzip2;
+    #[cfg(not(feature = "bzip2"))]
+    pub const BZIP2: Self = CompressionMethod::Unsupported(12);
+    pub const LZMA: Self = CompressionMethod::Unsupported(14);
+    pub const IBM_ZOS_CMPSC: Self = CompressionMethod::Unsupported(16);
+    pub const IBM_TERSE: Self = CompressionMethod::Unsupported(18);
+    pub const ZSTD_DEPRECATED: Self = CompressionMethod::Unsupported(20);
+    pub const ZSTD: Self = CompressionMethod::Unsupported(93);
+    pub const MP3: Self = CompressionMethod::Unsupported(94);
+    pub const XZ: Self = CompressionMethod::Unsupported(95);
+    pub const JPEG: Self = CompressionMethod::Unsupported(96);
+    pub const WAVPACK: Self = CompressionMethod::Unsupported(97);
+    pub const PPMD: Self = CompressionMethod::Unsupported(98);
+}
 impl CompressionMethod {
     /// Converts an u16 to its corresponding CompressionMethod
+    #[deprecated(
+        since = "0.5.7",
+        note = "use a constant to construct a compression method"
+    )]
     pub fn from_u16(val: u16) -> CompressionMethod {
+        #[allow(deprecated)]
         match val {
             0 => CompressionMethod::Stored,
-            #[cfg(feature = "deflate")]
+            #[cfg(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            ))]
             8 => CompressionMethod::Deflated,
             #[cfg(feature = "bzip2")]
             12 => CompressionMethod::Bzip2,
+
             v => CompressionMethod::Unsupported(v),
         }
     }
 
     /// Converts a CompressionMethod to a u16
+    #[deprecated(
+        since = "0.5.7",
+        note = "to match on other compression methods, use a constant"
+    )]
     pub fn to_u16(self) -> u16 {
+        #[allow(deprecated)]
         match self {
             CompressionMethod::Stored => 0,
-            #[cfg(feature = "deflate")]
+            #[cfg(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            ))]
             CompressionMethod::Deflated => 8,
             #[cfg(feature = "bzip2")]
             CompressionMethod::Bzip2 => 12,
@@ -57,9 +125,10 @@
 
     #[test]
     fn from_eq_to() {
-        for v in 0..(::std::u16::MAX as u32 + 1)
-        {
+        for v in 0..(::std::u16::MAX as u32 + 1) {
+            #[allow(deprecated)]
             let from = CompressionMethod::from_u16(v as u16);
+            #[allow(deprecated)]
             let to = from.to_u16() as u32;
             assert_eq!(v, to);
         }
@@ -68,17 +137,25 @@
     fn methods() -> Vec<CompressionMethod> {
         let mut methods = Vec::new();
         methods.push(CompressionMethod::Stored);
-        #[cfg(feature="deflate")] methods.push(CompressionMethod::Deflated);
-        #[cfg(feature="bzip2")] methods.push(CompressionMethod::Bzip2);
+        #[cfg(any(
+            feature = "deflate",
+            feature = "deflate-miniz",
+            feature = "deflate-zlib"
+        ))]
+        methods.push(CompressionMethod::Deflated);
+        #[cfg(feature = "bzip2")]
+        methods.push(CompressionMethod::Bzip2);
         methods
     }
 
-
     #[test]
     fn to_eq_from() {
         fn check_match(method: CompressionMethod) {
+            #[allow(deprecated)]
             let to = method.to_u16();
+            #[allow(deprecated)]
             let from = CompressionMethod::from_u16(to);
+            #[allow(deprecated)]
             let back = from.to_u16();
             assert_eq!(to, back);
         }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/cp437.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/cp437.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/cp437.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/cp437.rs	2021-12-09 12:01:27.000000000 +0000
@@ -13,12 +13,10 @@
 impl<'a> FromCp437 for &'a [u8] {
     type Target = ::std::borrow::Cow<'a, str>;
 
-    fn from_cp437(self) -> Self::Target
-    {
+    fn from_cp437(self) -> Self::Target {
         if self.iter().all(|c| *c < 0x80) {
             ::std::str::from_utf8(self).unwrap().into()
-        }
-        else {
+        } else {
             self.iter().map(|c| to_char(*c)).collect::<String>().into()
         }
     }
@@ -30,18 +28,15 @@
     fn from_cp437(self) -> Self::Target {
         if self.iter().all(|c| *c < 0x80) {
             String::from_utf8(self).unwrap()
-        }
-        else {
-            self.into_iter().map(|c| to_char(c)).collect()
+        } else {
+            self.into_iter().map(to_char).collect()
         }
     }
 }
 
-fn to_char(input: u8) -> char
-{
-    let output = match input
-    {
-        0x00 ..= 0x7f => input as u32,
+fn to_char(input: u8) -> char {
+    let output = match input {
+        0x00..=0x7f => input as u32,
         0x80 => 0x00c7,
         0x81 => 0x00fc,
         0x82 => 0x00e9,
@@ -175,20 +170,17 @@
 }
 
 #[cfg(test)]
-mod test
-{
+mod test {
     #[test]
-    fn to_char_valid()
-    {
-        for i in 0x00_u32 .. 0x100
-        {
+    fn to_char_valid() {
+        for i in 0x00_u32..0x100 {
             super::to_char(i as u8);
         }
     }
 
     #[test]
     fn ascii() {
-        for i in 0x00 .. 0x80 {
+        for i in 0x00..0x80 {
             assert_eq!(super::to_char(i), i as char);
         }
     }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/crc32.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/crc32.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/crc32.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/crc32.rs	2021-12-09 12:01:27.000000000 +0000
@@ -6,28 +6,23 @@
 use crc32fast::Hasher;
 
 /// Reader that validates the CRC32 when it reaches the EOF.
-pub struct Crc32Reader<R>
-{
+pub struct Crc32Reader<R> {
     inner: R,
     hasher: Hasher,
     check: u32,
 }
 
-impl<R> Crc32Reader<R>
-{
+impl<R> Crc32Reader<R> {
     /// Get a new Crc32Reader which check the inner reader against checksum.
-    pub fn new(inner: R, checksum: u32) -> Crc32Reader<R>
-    {
-        Crc32Reader
-        {
-            inner: inner,
+    pub fn new(inner: R, checksum: u32) -> Crc32Reader<R> {
+        Crc32Reader {
+            inner,
             hasher: Hasher::new(),
             check: checksum,
         }
     }
 
-    fn check_matches(&self) -> bool
-    {
+    fn check_matches(&self) -> bool {
         self.check == self.hasher.clone().finalize()
     }
 
@@ -36,13 +31,12 @@
     }
 }
 
-impl<R: Read> Read for Crc32Reader<R>
-{
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize>
-    {
-        let count = match self.inner.read(buf)
-        {
-            Ok(0) if !buf.is_empty() && !self.check_matches() => { return Err(io::Error::new(io::ErrorKind::Other, "Invalid checksum")) },
+impl<R: Read> Read for Crc32Reader<R> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let count = match self.inner.read(buf) {
+            Ok(0) if !buf.is_empty() && !self.check_matches() => {
+                return Err(io::Error::new(io::ErrorKind::Other, "Invalid checksum"))
+            }
             Ok(n) => n,
             Err(e) => return Err(e),
         };
@@ -52,14 +46,12 @@
 }
 
 #[cfg(test)]
-mod test
-{
+mod test {
     use super::*;
     use std::io::Read;
 
     #[test]
-    fn test_empty_reader()
-    {
+    fn test_empty_reader() {
         let data: &[u8] = b"";
         let mut buf = [0; 1];
 
@@ -67,12 +59,15 @@
         assert_eq!(reader.read(&mut buf).unwrap(), 0);
 
         let mut reader = Crc32Reader::new(data, 1);
-        assert!(reader.read(&mut buf).unwrap_err().to_string().contains("Invalid checksum"));
+        assert!(reader
+            .read(&mut buf)
+            .unwrap_err()
+            .to_string()
+            .contains("Invalid checksum"));
     }
 
     #[test]
-    fn test_byte_by_byte()
-    {
+    fn test_byte_by_byte() {
         let data: &[u8] = b"1234";
         let mut buf = [0; 1];
 
@@ -87,8 +82,7 @@
     }
 
     #[test]
-    fn test_zero_read()
-    {
+    fn test_zero_read() {
         let data: &[u8] = b"1234";
         let mut buf = [0; 5];
 
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/lib.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/lib.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/lib.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,17 +1,21 @@
-//! A basic ZipReader/Writer crate
+//! An ergonomic API for reading and writing ZIP files.
+//!
+//! The current implementation is based on [PKWARE's APPNOTE.TXT v6.3.9](https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT)
+// TODO(#184): Decide on the crate's bias: Do we prioritise permissiveness/correctness/speed/ergonomics?
 
 #![warn(missing_docs)]
 
-pub use crate::read::ZipArchive;
-pub use crate::write::ZipWriter;
 pub use crate::compression::CompressionMethod;
+pub use crate::read::ZipArchive;
 pub use crate::types::DateTime;
+pub use crate::write::ZipWriter;
 
-mod spec;
-mod crc32;
-mod types;
-pub mod read;
 mod compression;
-pub mod write;
 mod cp437;
+mod crc32;
+pub mod read;
 pub mod result;
+mod spec;
+mod types;
+pub mod write;
+mod zipcrypto;
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/read.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/read.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/read.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/read.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,19 +1,24 @@
-//! Structs for reading a ZIP archive
+//! Types for reading ZIP archives
 
-use crate::crc32::Crc32Reader;
 use crate::compression::CompressionMethod;
+use crate::crc32::Crc32Reader;
+use crate::result::{InvalidPassword, ZipError, ZipResult};
 use crate::spec;
-use crate::result::{ZipResult, ZipError};
-use std::io;
-use std::io::prelude::*;
-use std::collections::HashMap;
+use crate::zipcrypto::{ZipCryptoReader, ZipCryptoReaderValid, ZipCryptoValidator};
 use std::borrow::Cow;
+use std::collections::HashMap;
+use std::io::{self, prelude::*};
+use std::path::{Component, Path};
 
-use podio::{ReadPodExt, LittleEndian};
-use crate::types::{ZipFileData, System, DateTime};
 use crate::cp437::FromCp437;
+use crate::types::{DateTime, System, ZipFileData};
+use byteorder::{LittleEndian, ReadBytesExt};
 
-#[cfg(feature = "deflate")]
+#[cfg(any(
+    feature = "deflate",
+    feature = "deflate-miniz",
+    feature = "deflate-zlib"
+))]
 use flate2::read::DeflateDecoder;
 
 #[cfg(feature = "bzip2")]
@@ -24,35 +29,24 @@
     pub const S_IFREG: u32 = 0o0100000;
 }
 
-/// Wrapper for reading the contents of a ZIP file.
-///
-/// ```
-/// fn doit() -> zip::result::ZipResult<()>
-/// {
-///     use std::io::prelude::*;
-///
-///     // For demonstration purposes we read from an empty buffer.
-///     // Normally a File object would be used.
-///     let buf: &[u8] = &[0u8; 128];
-///     let mut reader = std::io::Cursor::new(buf);
+/// ZIP archive reader
 ///
+/// ```no_run
+/// use std::io::prelude::*;
+/// fn list_zip_contents(reader: impl Read + Seek) -> zip::result::ZipResult<()> {
 ///     let mut zip = zip::ZipArchive::new(reader)?;
 ///
-///     for i in 0..zip.len()
-///     {
-///         let mut file = zip.by_index(i).unwrap();
+///     for i in 0..zip.len() {
+///         let mut file = zip.by_index(i)?;
 ///         println!("Filename: {}", file.name());
-///         let first_byte = file.bytes().next().unwrap()?;
-///         println!("{}", first_byte);
+///         std::io::copy(&mut file, &mut std::io::stdout());
 ///     }
+///
 ///     Ok(())
 /// }
-///
-/// println!("Result: {:?}", doit());
 /// ```
 #[derive(Clone, Debug)]
-pub struct ZipArchive<R: Read + io::Seek>
-{
+pub struct ZipArchive<R> {
     reader: R,
     files: Vec<ZipFileData>,
     names_map: HashMap<String, usize>,
@@ -60,85 +54,196 @@
     comment: Vec<u8>,
 }
 
+enum CryptoReader<'a> {
+    Plaintext(io::Take<&'a mut dyn Read>),
+    ZipCrypto(ZipCryptoReaderValid<io::Take<&'a mut dyn Read>>),
+}
+
+impl<'a> Read for CryptoReader<'a> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        match self {
+            CryptoReader::Plaintext(r) => r.read(buf),
+            CryptoReader::ZipCrypto(r) => r.read(buf),
+        }
+    }
+}
+
+impl<'a> CryptoReader<'a> {
+    /// Consumes this decoder, returning the underlying reader.
+    pub fn into_inner(self) -> io::Take<&'a mut dyn Read> {
+        match self {
+            CryptoReader::Plaintext(r) => r,
+            CryptoReader::ZipCrypto(r) => r.into_inner(),
+        }
+    }
+}
+
 enum ZipFileReader<'a> {
     NoReader,
-    Stored(Crc32Reader<io::Take<&'a mut dyn Read>>),
-    #[cfg(feature = "deflate")]
-    Deflated(Crc32Reader<flate2::read::DeflateDecoder<io::Take<&'a mut dyn Read>>>),
+    Raw(io::Take<&'a mut dyn io::Read>),
+    Stored(Crc32Reader<CryptoReader<'a>>),
+    #[cfg(any(
+        feature = "deflate",
+        feature = "deflate-miniz",
+        feature = "deflate-zlib"
+    ))]
+    Deflated(Crc32Reader<flate2::read::DeflateDecoder<CryptoReader<'a>>>),
     #[cfg(feature = "bzip2")]
-    Bzip2(Crc32Reader<BzDecoder<io::Take<&'a mut dyn Read>>>),
+    Bzip2(Crc32Reader<BzDecoder<CryptoReader<'a>>>),
+}
+
+impl<'a> Read for ZipFileReader<'a> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        match self {
+            ZipFileReader::NoReader => panic!("ZipFileReader was in an invalid state"),
+            ZipFileReader::Raw(r) => r.read(buf),
+            ZipFileReader::Stored(r) => r.read(buf),
+            #[cfg(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            ))]
+            ZipFileReader::Deflated(r) => r.read(buf),
+            #[cfg(feature = "bzip2")]
+            ZipFileReader::Bzip2(r) => r.read(buf),
+        }
+    }
+}
+
+impl<'a> ZipFileReader<'a> {
+    /// Consumes this decoder, returning the underlying reader.
+    pub fn into_inner(self) -> io::Take<&'a mut dyn Read> {
+        match self {
+            ZipFileReader::NoReader => panic!("ZipFileReader was in an invalid state"),
+            ZipFileReader::Raw(r) => r,
+            ZipFileReader::Stored(r) => r.into_inner().into_inner(),
+            #[cfg(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            ))]
+            ZipFileReader::Deflated(r) => r.into_inner().into_inner().into_inner(),
+            #[cfg(feature = "bzip2")]
+            ZipFileReader::Bzip2(r) => r.into_inner().into_inner().into_inner(),
+        }
+    }
 }
 
 /// A struct for reading a zip file
 pub struct ZipFile<'a> {
     data: Cow<'a, ZipFileData>,
+    crypto_reader: Option<CryptoReader<'a>>,
     reader: ZipFileReader<'a>,
 }
 
-fn unsupported_zip_error<T>(detail: &'static str) -> ZipResult<T>
-{
-    Err(ZipError::UnsupportedArchive(detail))
-}
+fn find_content<'a>(
+    data: &mut ZipFileData,
+    reader: &'a mut (impl Read + Seek),
+) -> ZipResult<io::Take<&'a mut dyn Read>> {
+    // Parse local header
+    reader.seek(io::SeekFrom::Start(data.header_start))?;
+    let signature = reader.read_u32::<LittleEndian>()?;
+    if signature != spec::LOCAL_FILE_HEADER_SIGNATURE {
+        return Err(ZipError::InvalidArchive("Invalid local file header"));
+    }
 
+    reader.seek(io::SeekFrom::Current(22))?;
+    let file_name_length = reader.read_u16::<LittleEndian>()? as u64;
+    let extra_field_length = reader.read_u16::<LittleEndian>()? as u64;
+    let magic_and_header = 4 + 22 + 2 + 2;
+    data.data_start = data.header_start + magic_and_header + file_name_length + extra_field_length;
 
-fn make_reader<'a>(
+    reader.seek(io::SeekFrom::Start(data.data_start))?;
+    Ok((reader as &mut dyn Read).take(data.compressed_size))
+}
+
+fn make_crypto_reader<'a>(
     compression_method: crate::compression::CompressionMethod,
     crc32: u32,
-    reader: io::Take<&'a mut dyn io::Read>)
-        -> ZipResult<ZipFileReader<'a>> {
+    last_modified_time: DateTime,
+    using_data_descriptor: bool,
+    reader: io::Take<&'a mut dyn io::Read>,
+    password: Option<&[u8]>,
+) -> ZipResult<Result<CryptoReader<'a>, InvalidPassword>> {
+    #[allow(deprecated)]
+    {
+        if let CompressionMethod::Unsupported(_) = compression_method {
+            return unsupported_zip_error("Compression method not supported");
+        }
+    }
 
+    let reader = match password {
+        None => CryptoReader::Plaintext(reader),
+        Some(password) => {
+            let validator = if using_data_descriptor {
+                ZipCryptoValidator::InfoZipMsdosTime(last_modified_time.timepart())
+            } else {
+                ZipCryptoValidator::PkzipCrc32(crc32)
+            };
+            match ZipCryptoReader::new(reader, password).validate(validator)? {
+                None => return Ok(Err(InvalidPassword)),
+                Some(r) => CryptoReader::ZipCrypto(r),
+            }
+        }
+    };
+    Ok(Ok(reader))
+}
+
+fn make_reader<'a>(
+    compression_method: CompressionMethod,
+    crc32: u32,
+    reader: CryptoReader<'a>,
+) -> ZipFileReader<'a> {
     match compression_method {
-        CompressionMethod::Stored =>
-        {
-            Ok(ZipFileReader::Stored(Crc32Reader::new(
-                reader,
-                crc32)))
-        },
-        #[cfg(feature = "deflate")]
-        CompressionMethod::Deflated =>
-        {
+        CompressionMethod::Stored => ZipFileReader::Stored(Crc32Reader::new(reader, crc32)),
+        #[cfg(any(
+            feature = "deflate",
+            feature = "deflate-miniz",
+            feature = "deflate-zlib"
+        ))]
+        CompressionMethod::Deflated => {
             let deflate_reader = DeflateDecoder::new(reader);
-            Ok(ZipFileReader::Deflated(Crc32Reader::new(
-                deflate_reader,
-                crc32)))
-        },
+            ZipFileReader::Deflated(Crc32Reader::new(deflate_reader, crc32))
+        }
         #[cfg(feature = "bzip2")]
-        CompressionMethod::Bzip2 =>
-        {
+        CompressionMethod::Bzip2 => {
             let bzip2_reader = BzDecoder::new(reader);
-            Ok(ZipFileReader::Bzip2(Crc32Reader::new(
-                bzip2_reader,
-                crc32)))
-        },
-        _ => unsupported_zip_error("Compression method not supported"),
+            ZipFileReader::Bzip2(Crc32Reader::new(bzip2_reader, crc32))
+        }
+        _ => panic!("Compression method not supported"),
     }
 }
 
-impl<R: Read+io::Seek> ZipArchive<R>
-{
+impl<R: Read + io::Seek> ZipArchive<R> {
     /// Get the directory start offset and number of files. This is done in a
     /// separate function to ease the control flow design.
-    fn get_directory_counts(reader: &mut R,
-                            footer: &spec::CentralDirectoryEnd,
-                            cde_start_pos: u64) -> ZipResult<(u64, u64, usize)> {
+    pub(crate) fn get_directory_counts(
+        reader: &mut R,
+        footer: &spec::CentralDirectoryEnd,
+        cde_start_pos: u64,
+    ) -> ZipResult<(u64, u64, usize)> {
         // See if there's a ZIP64 footer. The ZIP64 locator if present will
         // have its signature 20 bytes in front of the standard footer. The
         // standard footer, in turn, is 22+N bytes large, where N is the
         // comment length. Therefore:
-        let zip64locator = if reader.seek(io::SeekFrom::End(-(20 + 22 + footer.zip_file_comment.len() as i64))).is_ok() {
+        let zip64locator = if reader
+            .seek(io::SeekFrom::End(
+                -(20 + 22 + footer.zip_file_comment.len() as i64),
+            ))
+            .is_ok()
+        {
             match spec::Zip64CentralDirectoryEndLocator::parse(reader) {
                 Ok(loc) => Some(loc),
                 Err(ZipError::InvalidArchive(_)) => {
                     // No ZIP64 header; that's actually fine. We're done here.
                     None
-                },
+                }
                 Err(e) => {
                     // Yikes, a real problem
                     return Err(e);
                 }
             }
-        }
-        else {
+        } else {
             // Empty Zip files will have nothing else so this error might be fine. If
             // not, we'll find out soon.
             None
@@ -150,19 +255,24 @@
                 // offsets all being too small. Get the amount of error by comparing
                 // the actual file position we found the CDE at with the offset
                 // recorded in the CDE.
-                let archive_offset = cde_start_pos.checked_sub(footer.central_directory_size as u64)
+                let archive_offset = cde_start_pos
+                    .checked_sub(footer.central_directory_size as u64)
                     .and_then(|x| x.checked_sub(footer.central_directory_offset as u64))
-                    .ok_or(ZipError::InvalidArchive("Invalid central directory size or offset"))?;
+                    .ok_or(ZipError::InvalidArchive(
+                        "Invalid central directory size or offset",
+                    ))?;
 
                 let directory_start = footer.central_directory_offset as u64 + archive_offset;
                 let number_of_files = footer.number_of_files_on_this_disk as usize;
-                return Ok((archive_offset, directory_start, number_of_files));
-            },
+                Ok((archive_offset, directory_start, number_of_files))
+            }
             Some(locator64) => {
                 // If we got here, this is indeed a ZIP64 file.
 
                 if footer.disk_number as u32 != locator64.disk_with_central_directory {
-                    return unsupported_zip_error("Support for multi-disk files is not implemented")
+                    return unsupported_zip_error(
+                        "Support for multi-disk files is not implemented",
+                    );
                 }
 
                 // We need to reassess `archive_offset`. We know where the ZIP64
@@ -175,29 +285,45 @@
 
                 let search_upper_bound = cde_start_pos
                     .checked_sub(60) // minimum size of Zip64CentralDirectoryEnd + Zip64CentralDirectoryEndLocator
-                    .ok_or(ZipError::InvalidArchive("File cannot contain ZIP64 central directory end"))?;
+                    .ok_or(ZipError::InvalidArchive(
+                        "File cannot contain ZIP64 central directory end",
+                    ))?;
                 let (footer, archive_offset) = spec::Zip64CentralDirectoryEnd::find_and_parse(
                     reader,
                     locator64.end_of_central_directory_offset,
-                    search_upper_bound)?;
+                    search_upper_bound,
+                )?;
 
                 if footer.disk_number != footer.disk_with_central_directory {
-                    return unsupported_zip_error("Support for multi-disk files is not implemented")
+                    return unsupported_zip_error(
+                        "Support for multi-disk files is not implemented",
+                    );
                 }
 
-                let directory_start = footer.central_directory_offset + archive_offset;
-                Ok((archive_offset, directory_start, footer.number_of_files as usize))
-            },
+                let directory_start = footer
+                    .central_directory_offset
+                    .checked_add(archive_offset)
+                    .ok_or_else(|| {
+                        ZipError::InvalidArchive("Invalid central directory size or offset")
+                    })?;
+
+                Ok((
+                    archive_offset,
+                    directory_start,
+                    footer.number_of_files as usize,
+                ))
+            }
         }
     }
 
-    /// Opens a Zip archive and parses the central directory
+    /// Read a ZIP archive, collecting the files it contains
+    ///
+    /// This uses the central directory record of the ZIP file, and ignores local file headers
     pub fn new(mut reader: R) -> ZipResult<ZipArchive<R>> {
         let (footer, cde_start_pos) = spec::CentralDirectoryEnd::find_and_parse(&mut reader)?;
 
-        if footer.disk_number != footer.disk_with_central_directory
-        {
-            return unsupported_zip_error("Support for multi-disk files is not implemented")
+        if footer.disk_number != footer.disk_with_central_directory {
+            return unsupported_zip_error("Support for multi-disk files is not implemented");
         }
 
         let (archive_offset, directory_start, number_of_files) =
@@ -207,42 +333,74 @@
         let mut names_map = HashMap::new();
 
         if let Err(_) = reader.seek(io::SeekFrom::Start(directory_start)) {
-            return Err(ZipError::InvalidArchive("Could not seek to start of central directory"));
+            return Err(ZipError::InvalidArchive(
+                "Could not seek to start of central directory",
+            ));
         }
 
-        for _ in 0 .. number_of_files
-        {
+        for _ in 0..number_of_files {
             let file = central_header_to_zip_file(&mut reader, archive_offset)?;
             names_map.insert(file.file_name.clone(), files.len());
             files.push(file);
         }
 
         Ok(ZipArchive {
-            reader: reader,
-            files: files,
-            names_map: names_map,
+            reader,
+            files,
+            names_map,
             offset: archive_offset,
             comment: footer.zip_file_comment,
         })
     }
+    /// Extract a Zip archive into a directory, overwriting files if they
+    /// already exist. Paths are sanitized with [`ZipFile::enclosed_name`].
+    ///
+    /// Extraction is not atomic; If an error is encountered, some of the files
+    /// may be left on disk.
+    pub fn extract<P: AsRef<Path>>(&mut self, directory: P) -> ZipResult<()> {
+        use std::fs;
+
+        for i in 0..self.len() {
+            let mut file = self.by_index(i)?;
+            let filepath = file
+                .enclosed_name()
+                .ok_or(ZipError::InvalidArchive("Invalid file path"))?;
+
+            let outpath = directory.as_ref().join(filepath);
+
+            if file.name().ends_with('/') {
+                fs::create_dir_all(&outpath)?;
+            } else {
+                if let Some(p) = outpath.parent() {
+                    if !p.exists() {
+                        fs::create_dir_all(&p)?;
+                    }
+                }
+                let mut outfile = fs::File::create(&outpath)?;
+                io::copy(&mut file, &mut outfile)?;
+            }
+            // Get and Set permissions
+            #[cfg(unix)]
+            {
+                use std::os::unix::fs::PermissionsExt;
+                if let Some(mode) = file.unix_mode() {
+                    fs::set_permissions(&outpath, fs::Permissions::from_mode(mode))?;
+                }
+            }
+        }
+        Ok(())
+    }
 
     /// Number of files contained in this zip.
-    ///
-    /// ```
-    /// fn iter() {
-    ///     let mut zip = zip::ZipArchive::new(std::io::Cursor::new(vec![])).unwrap();
-    ///
-    ///     for i in 0..zip.len() {
-    ///         let mut file = zip.by_index(i).unwrap();
-    ///         // Do something with file i
-    ///     }
-    /// }
-    /// ```
-    pub fn len(&self) -> usize
-    {
+    pub fn len(&self) -> usize {
         self.files.len()
     }
 
+    /// Whether this zip archive contains no files
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
     /// Get the offset from the beginning of the underlying reader that this zip begins at, in bytes.
     ///
     /// Normally this value is zero, but if the zip has arbitrary data prepended to it, then this value will be the size
@@ -261,63 +419,122 @@
         self.names_map.keys().map(|s| s.as_str())
     }
 
+    /// Search for a file entry by name, decrypt with given password
+    pub fn by_name_decrypt<'a>(
+        &'a mut self,
+        name: &str,
+        password: &[u8],
+    ) -> ZipResult<Result<ZipFile<'a>, InvalidPassword>> {
+        self.by_name_with_optional_password(name, Some(password))
+    }
+
     /// Search for a file entry by name
-    pub fn by_name<'a>(&'a mut self, name: &str) -> ZipResult<ZipFile<'a>>
-    {
+    pub fn by_name<'a>(&'a mut self, name: &str) -> ZipResult<ZipFile<'a>> {
+        Ok(self.by_name_with_optional_password(name, None)?.unwrap())
+    }
+
+    fn by_name_with_optional_password<'a>(
+        &'a mut self,
+        name: &str,
+        password: Option<&[u8]>,
+    ) -> ZipResult<Result<ZipFile<'a>, InvalidPassword>> {
         let index = match self.names_map.get(name) {
             Some(index) => *index,
-            None => { return Err(ZipError::FileNotFound); },
+            None => {
+                return Err(ZipError::FileNotFound);
+            }
         };
-        self.by_index(index)
+        self.by_index_with_optional_password(index, password)
     }
 
-    /// Get a contained file by index
-    pub fn by_index<'a>(&'a mut self, file_number: usize) -> ZipResult<ZipFile<'a>>
-    {
-        if file_number >= self.files.len() { return Err(ZipError::FileNotFound); }
-        let ref mut data = self.files[file_number];
+    /// Get a contained file by index, decrypt with given password
+    pub fn by_index_decrypt<'a>(
+        &'a mut self,
+        file_number: usize,
+        password: &[u8],
+    ) -> ZipResult<Result<ZipFile<'a>, InvalidPassword>> {
+        self.by_index_with_optional_password(file_number, Some(password))
+    }
 
-        if data.encrypted
-        {
-            return unsupported_zip_error("Encrypted files are not supported")
+    /// Get a contained file by index
+    pub fn by_index<'a>(&'a mut self, file_number: usize) -> ZipResult<ZipFile<'a>> {
+        Ok(self
+            .by_index_with_optional_password(file_number, None)?
+            .unwrap())
+    }
+
+    /// Get a contained file by index without decompressing it
+    pub fn by_index_raw<'a>(&'a mut self, file_number: usize) -> ZipResult<ZipFile<'a>> {
+        let reader = &mut self.reader;
+        self.files
+            .get_mut(file_number)
+            .ok_or(ZipError::FileNotFound)
+            .and_then(move |data| {
+                Ok(ZipFile {
+                    crypto_reader: None,
+                    reader: ZipFileReader::Raw(find_content(data, reader)?),
+                    data: Cow::Borrowed(data),
+                })
+            })
+    }
+
+    fn by_index_with_optional_password<'a>(
+        &'a mut self,
+        file_number: usize,
+        mut password: Option<&[u8]>,
+    ) -> ZipResult<Result<ZipFile<'a>, InvalidPassword>> {
+        if file_number >= self.files.len() {
+            return Err(ZipError::FileNotFound);
         }
+        let data = &mut self.files[file_number];
 
-        // Parse local header
-        self.reader.seek(io::SeekFrom::Start(data.header_start))?;
-        let signature = self.reader.read_u32::<LittleEndian>()?;
-        if signature != spec::LOCAL_FILE_HEADER_SIGNATURE
-        {
-            return Err(ZipError::InvalidArchive("Invalid local file header"))
+        match (password, data.encrypted) {
+            (None, true) => return Err(ZipError::UnsupportedArchive(ZipError::PASSWORD_REQUIRED)),
+            (Some(_), false) => password = None, //Password supplied, but none needed! Discard.
+            _ => {}
         }
+        let limit_reader = find_content(data, &mut self.reader)?;
 
-        self.reader.seek(io::SeekFrom::Current(22))?;
-        let file_name_length = self.reader.read_u16::<LittleEndian>()? as u64;
-        let extra_field_length = self.reader.read_u16::<LittleEndian>()? as u64;
-        let magic_and_header = 4 + 22 + 2 + 2;
-        data.data_start = data.header_start + magic_and_header + file_name_length + extra_field_length;
-
-        self.reader.seek(io::SeekFrom::Start(data.data_start))?;
-        let limit_reader = (self.reader.by_ref() as &mut dyn Read).take(data.compressed_size);
-
-        Ok(ZipFile { reader: make_reader(data.compression_method, data.crc32, limit_reader)?, data: Cow::Borrowed(data) })
+        match make_crypto_reader(
+            data.compression_method,
+            data.crc32,
+            data.last_modified_time,
+            data.using_data_descriptor,
+            limit_reader,
+            password,
+        ) {
+            Ok(Ok(crypto_reader)) => Ok(Ok(ZipFile {
+                crypto_reader: Some(crypto_reader),
+                reader: ZipFileReader::NoReader,
+                data: Cow::Borrowed(data),
+            })),
+            Err(e) => Err(e),
+            Ok(Err(e)) => Ok(Err(e)),
+        }
     }
 
     /// Unwrap and return the inner reader object
     ///
     /// The position of the reader is undefined.
-    pub fn into_inner(self) -> R
-    {
+    pub fn into_inner(self) -> R {
         self.reader
     }
 }
 
-fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R, archive_offset: u64) -> ZipResult<ZipFileData>
-{
+fn unsupported_zip_error<T>(detail: &'static str) -> ZipResult<T> {
+    Err(ZipError::UnsupportedArchive(detail))
+}
+
+/// Parse a central directory entry to collect the information for the file.
+pub(crate) fn central_header_to_zip_file<R: Read + io::Seek>(
+    reader: &mut R,
+    archive_offset: u64,
+) -> ZipResult<ZipFileData> {
+    let central_header_start = reader.seek(io::SeekFrom::Current(0))?;
     // Parse central header
     let signature = reader.read_u32::<LittleEndian>()?;
-    if signature != spec::CENTRAL_DIRECTORY_HEADER_SIGNATURE
-    {
-        return Err(ZipError::InvalidArchive("Invalid Central Directory header"))
+    if signature != spec::CENTRAL_DIRECTORY_HEADER_SIGNATURE {
+        return Err(ZipError::InvalidArchive("Invalid Central Directory header"));
     }
 
     let version_made_by = reader.read_u16::<LittleEndian>()?;
@@ -325,6 +542,7 @@
     let flags = reader.read_u16::<LittleEndian>()?;
     let encrypted = flags & 1 == 1;
     let is_utf8 = flags & (1 << 11) != 0;
+    let using_data_descriptor = flags & (1 << 3) != 0;
     let compression_method = reader.read_u16::<LittleEndian>()?;
     let last_mod_time = reader.read_u16::<LittleEndian>()?;
     let last_mod_date = reader.read_u16::<LittleEndian>()?;
@@ -338,43 +556,50 @@
     let _internal_file_attributes = reader.read_u16::<LittleEndian>()?;
     let external_file_attributes = reader.read_u32::<LittleEndian>()?;
     let offset = reader.read_u32::<LittleEndian>()? as u64;
-    let file_name_raw = ReadPodExt::read_exact(reader, file_name_length)?;
-    let extra_field = ReadPodExt::read_exact(reader, extra_field_length)?;
-    let file_comment_raw  = ReadPodExt::read_exact(reader, file_comment_length)?;
+    let mut file_name_raw = vec![0; file_name_length];
+    reader.read_exact(&mut file_name_raw)?;
+    let mut extra_field = vec![0; extra_field_length];
+    reader.read_exact(&mut extra_field)?;
+    let mut file_comment_raw = vec![0; file_comment_length];
+    reader.read_exact(&mut file_comment_raw)?;
 
-    let file_name = match is_utf8
-    {
+    let file_name = match is_utf8 {
         true => String::from_utf8_lossy(&*file_name_raw).into_owned(),
         false => file_name_raw.clone().from_cp437(),
     };
-    let file_comment = match is_utf8
-    {
+    let file_comment = match is_utf8 {
         true => String::from_utf8_lossy(&*file_comment_raw).into_owned(),
         false => file_comment_raw.from_cp437(),
     };
 
     // Construct the result
-    let mut result = ZipFileData
-    {
+    let mut result = ZipFileData {
         system: System::from_u8((version_made_by >> 8) as u8),
         version_made_by: version_made_by as u8,
-        encrypted: encrypted,
-        compression_method: CompressionMethod::from_u16(compression_method),
+        encrypted,
+        using_data_descriptor,
+        compression_method: {
+            #[allow(deprecated)]
+            CompressionMethod::from_u16(compression_method)
+        },
         last_modified_time: DateTime::from_msdos(last_mod_date, last_mod_time),
-        crc32: crc32,
+        crc32,
         compressed_size: compressed_size as u64,
         uncompressed_size: uncompressed_size as u64,
-        file_name: file_name,
-        file_name_raw: file_name_raw,
-        file_comment: file_comment,
+        file_name,
+        file_name_raw,
+        extra_field,
+        file_comment,
         header_start: offset,
+        central_header_start,
         data_start: 0,
         external_attributes: external_file_attributes,
+        large_file: false,
     };
 
-    match parse_extra_field(&mut result, &*extra_field) {
-        Ok(..) | Err(ZipError::Io(..)) => {},
-        Err(e) => Err(e)?,
+    match parse_extra_field(&mut result) {
+        Ok(..) | Err(ZipError::Io(..)) => {}
+        Err(e) => return Err(e),
     }
 
     // Account for shifted zip offsets.
@@ -383,35 +608,31 @@
     Ok(result)
 }
 
-fn parse_extra_field(file: &mut ZipFileData, data: &[u8]) -> ZipResult<()>
-{
-    let mut reader = io::Cursor::new(data);
+fn parse_extra_field(file: &mut ZipFileData) -> ZipResult<()> {
+    let mut reader = io::Cursor::new(&file.extra_field);
 
-    while (reader.position() as usize) < data.len()
-    {
+    while (reader.position() as usize) < file.extra_field.len() {
         let kind = reader.read_u16::<LittleEndian>()?;
         let len = reader.read_u16::<LittleEndian>()?;
         let mut len_left = len as i64;
-        match kind
-        {
-            // Zip64 extended information extra field
-            0x0001 => {
-                if file.uncompressed_size == 0xFFFFFFFF {
-                    file.uncompressed_size = reader.read_u64::<LittleEndian>()?;
-                    len_left -= 8;
-                }
-                if file.compressed_size == 0xFFFFFFFF {
-                    file.compressed_size = reader.read_u64::<LittleEndian>()?;
-                    len_left -= 8;
-                }
-                if file.header_start == 0xFFFFFFFF {
-                    file.header_start = reader.read_u64::<LittleEndian>()?;
-                    len_left -= 8;
-                }
-                // Unparsed fields:
-                // u32: disk start number
-            },
-            _ => {},
+        // Zip64 extended information extra field
+        if kind == 0x0001 {
+            if file.uncompressed_size == 0xFFFFFFFF {
+                file.large_file = true;
+                file.uncompressed_size = reader.read_u64::<LittleEndian>()?;
+                len_left -= 8;
+            }
+            if file.compressed_size == 0xFFFFFFFF {
+                file.large_file = true;
+                file.compressed_size = reader.read_u64::<LittleEndian>()?;
+                len_left -= 8;
+            }
+            if file.header_start == 0xFFFFFFFF {
+                file.header_start = reader.read_u64::<LittleEndian>()?;
+                len_left -= 8;
+            }
+            // Unparsed fields:
+            // u32: disk start number
         }
 
         // We could also check for < 0 to check for errors
@@ -422,67 +643,148 @@
     Ok(())
 }
 
-fn get_reader<'a>(reader: &'a mut ZipFileReader<'_>) -> &'a mut dyn Read {
-    match *reader {
-        ZipFileReader::NoReader => panic!("ZipFileReader was in an invalid state"),
-        ZipFileReader::Stored(ref mut r) => r as &mut dyn Read,
-        #[cfg(feature = "deflate")]
-        ZipFileReader::Deflated(ref mut r) => r as &mut dyn Read,
-        #[cfg(feature = "bzip2")]
-        ZipFileReader::Bzip2(ref mut r) => r as &mut dyn Read,
-    }
-}
-
 /// Methods for retrieving information on zip files
 impl<'a> ZipFile<'a> {
-    fn get_reader(&mut self) -> &mut dyn Read {
-        get_reader(&mut self.reader)
+    fn get_reader(&mut self) -> &mut ZipFileReader<'a> {
+        if let ZipFileReader::NoReader = self.reader {
+            let data = &self.data;
+            let crypto_reader = self.crypto_reader.take().expect("Invalid reader state");
+            self.reader = make_reader(data.compression_method, data.crc32, crypto_reader)
+        }
+        &mut self.reader
+    }
+
+    pub(crate) fn get_raw_reader(&mut self) -> &mut dyn Read {
+        if let ZipFileReader::NoReader = self.reader {
+            let crypto_reader = self.crypto_reader.take().expect("Invalid reader state");
+            self.reader = ZipFileReader::Raw(crypto_reader.into_inner())
+        }
+        &mut self.reader
     }
+
     /// Get the version of the file
     pub fn version_made_by(&self) -> (u8, u8) {
-        (self.data.version_made_by / 10, self.data.version_made_by % 10)
+        (
+            self.data.version_made_by / 10,
+            self.data.version_made_by % 10,
+        )
     }
+
     /// Get the name of the file
+    ///
+    /// # Warnings
+    ///
+    /// It is dangerous to use this name directly when extracting an archive.
+    /// It may contain an absolute path (`/etc/shadow`), or break out of the
+    /// current directory (`../runtime`). Carelessly writing to these paths
+    /// allows an attacker to craft a ZIP archive that will overwrite critical
+    /// files.
+    ///
+    /// You can use the [`ZipFile::enclosed_name`] method to validate the name
+    /// as a safe path.
     pub fn name(&self) -> &str {
-        &*self.data.file_name
+        &self.data.file_name
     }
+
     /// Get the name of the file, in the raw (internal) byte representation.
+    ///
+    /// The encoding of this data is currently undefined.
     pub fn name_raw(&self) -> &[u8] {
-        &*self.data.file_name_raw
+        &self.data.file_name_raw
     }
+
     /// Get the name of the file in a sanitized form. It truncates the name to the first NULL byte,
     /// removes a leading '/' and removes '..' parts.
+    #[deprecated(
+        since = "0.5.7",
+        note = "by stripping `..`s from the path, the meaning of paths can change.
+                `mangled_name` can be used if this behaviour is desirable"
+    )]
     pub fn sanitized_name(&self) -> ::std::path::PathBuf {
+        self.mangled_name()
+    }
+
+    /// Rewrite the path, ignoring any path components with special meaning.
+    ///
+    /// - Absolute paths are made relative
+    /// - [`ParentDir`]s are ignored
+    /// - Truncates the filename at a NULL byte
+    ///
+    /// This is appropriate if you need to be able to extract *something* from
+    /// any archive, but will easily misrepresent trivial paths like
+    /// `foo/../bar` as `foo/bar` (instead of `bar`). Because of this,
+    /// [`ZipFile::enclosed_name`] is the better option in most scenarios.
+    ///
+    /// [`ParentDir`]: `Component::ParentDir`
+    pub fn mangled_name(&self) -> ::std::path::PathBuf {
         self.data.file_name_sanitized()
     }
+
+    /// Ensure the file path is safe to use as a [`Path`].
+    ///
+    /// - It can't contain NULL bytes
+    /// - It can't resolve to a path outside the current directory
+    ///   > `foo/../bar` is fine, `foo/../../bar` is not.
+    /// - It can't be an absolute path
+    ///
+    /// This will read well-formed ZIP files correctly, and is resistant
+    /// to path-based exploits. It is recommended over
+    /// [`ZipFile::mangled_name`].
+    pub fn enclosed_name(&self) -> Option<&Path> {
+        if self.data.file_name.contains('\0') {
+            return None;
+        }
+        let path = Path::new(&self.data.file_name);
+        let mut depth = 0usize;
+        for component in path.components() {
+            match component {
+                Component::Prefix(_) | Component::RootDir => return None,
+                Component::ParentDir => depth = depth.checked_sub(1)?,
+                Component::Normal(_) => depth += 1,
+                Component::CurDir => (),
+            }
+        }
+        Some(path)
+    }
+
     /// Get the comment of the file
     pub fn comment(&self) -> &str {
-        &*self.data.file_comment
+        &self.data.file_comment
     }
+
     /// Get the compression method used to store the file
     pub fn compression(&self) -> CompressionMethod {
         self.data.compression_method
     }
+
     /// Get the size of the file in the archive
     pub fn compressed_size(&self) -> u64 {
         self.data.compressed_size
     }
+
     /// Get the size of the file when uncompressed
     pub fn size(&self) -> u64 {
         self.data.uncompressed_size
     }
+
     /// Get the time the file was last modified
     pub fn last_modified(&self) -> DateTime {
         self.data.last_modified_time
     }
     /// Returns whether the file is actually a directory
     pub fn is_dir(&self) -> bool {
-        self.name().chars().rev().next().map_or(false, |c| c == '/' || c == '\\')
+        self.name()
+            .chars()
+            .rev()
+            .next()
+            .map_or(false, |c| c == '/' || c == '\\')
     }
+
     /// Returns whether the file is a regular file
     pub fn is_file(&self) -> bool {
         !self.is_dir()
     }
+
     /// Get unix mode for the file
     pub fn unix_mode(&self) -> Option<u32> {
         if self.data.external_attributes == 0 {
@@ -490,9 +792,7 @@
         }
 
         match self.data.system {
-            System::Unix => {
-                Some(self.data.external_attributes >> 16)
-            },
+            System::Unix => Some(self.data.external_attributes >> 16),
             System::Dos => {
                 // Interpret MSDOS directory bit
                 let mut mode = if 0x10 == (self.data.external_attributes & 0x10) {
@@ -505,25 +805,40 @@
                     mode &= 0o0555;
                 }
                 Some(mode)
-            },
+            }
             _ => None,
         }
     }
+
     /// Get the CRC32 hash of the original file
     pub fn crc32(&self) -> u32 {
         self.data.crc32
     }
 
+    /// Get the extra data of the zip header for this file
+    pub fn extra_data(&self) -> &[u8] {
+        &self.data.extra_field
+    }
+
     /// Get the starting offset of the data of the compressed file
     pub fn data_start(&self) -> u64 {
         self.data.data_start
     }
+
+    /// Get the starting offset of the zip header for this file
+    pub fn header_start(&self) -> u64 {
+        self.data.header_start
+    }
+    /// Get the starting offset of the zip header in the central directory for this file
+    pub fn central_header_start(&self) -> u64 {
+        self.data.central_header_start
+    }
 }
 
 impl<'a> Read for ZipFile<'a> {
-     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-         self.get_reader().read(buf)
-     }
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        self.get_reader().read(buf)
+    }
 }
 
 impl<'a> Drop for ZipFile<'a> {
@@ -531,24 +846,28 @@
         // self.data is Owned, this reader is constructed by a streaming reader.
         // In this case, we want to exhaust the reader so that the next file is accessible.
         if let Cow::Owned(_) = self.data {
-            let mut buffer = [0; 1<<16];
+            let mut buffer = [0; 1 << 16];
 
-            // Get the inner `Take` reader so all decompression and CRC calculation is skipped.
-            let innerreader = ::std::mem::replace(&mut self.reader, ZipFileReader::NoReader);
-            let mut reader = match innerreader {
-                ZipFileReader::NoReader => panic!("ZipFileReader was in an invalid state"),
-                ZipFileReader::Stored(crcreader) => crcreader.into_inner(),
-                #[cfg(feature = "deflate")]
-                ZipFileReader::Deflated(crcreader) => crcreader.into_inner().into_inner(),
-                #[cfg(feature = "bzip2")]
-                ZipFileReader::Bzip2(crcreader) => crcreader.into_inner().into_inner(),
+            // Get the inner `Take` reader so all decryption, decompression and CRC calculation is skipped.
+            let mut reader: std::io::Take<&mut dyn std::io::Read> = match &mut self.reader {
+                ZipFileReader::NoReader => {
+                    let innerreader = ::std::mem::replace(&mut self.crypto_reader, None);
+                    innerreader.expect("Invalid reader state").into_inner()
+                }
+                reader => {
+                    let innerreader = ::std::mem::replace(reader, ZipFileReader::NoReader);
+                    innerreader.into_inner()
+                }
             };
 
             loop {
                 match reader.read(&mut buffer) {
                     Ok(0) => break,
                     Ok(_) => (),
-                    Err(e) => panic!("Could not consume all of the output of the current ZipFile: {:?}", e),
+                    Err(e) => panic!(
+                        "Could not consume all of the output of the current ZipFile: {:?}",
+                        e
+                    ),
                 }
             }
         }
@@ -571,7 +890,9 @@
 /// * `comment`: set to an empty string
 /// * `data_start`: set to 0
 /// * `external_attributes`: `unix_mode()`: will return None
-pub fn read_zipfile_from_stream<'a, R: io::Read>(reader: &'a mut R) -> ZipResult<Option<ZipFile<'_>>> {
+pub fn read_zipfile_from_stream<'a, R: io::Read>(
+    reader: &'a mut R,
+) -> ZipResult<Option<ZipFile<'_>>> {
     let signature = reader.read_u32::<LittleEndian>()?;
 
     match signature {
@@ -585,6 +906,7 @@
     let encrypted = flags & 1 == 1;
     let is_utf8 = flags & (1 << 11) != 0;
     let using_data_descriptor = flags & (1 << 3) != 0;
+    #[allow(deprecated)]
     let compression_method = CompressionMethod::from_u16(reader.read_u16::<LittleEndian>()?);
     let last_mod_time = reader.read_u16::<LittleEndian>()?;
     let last_mod_date = reader.read_u16::<LittleEndian>()?;
@@ -594,45 +916,49 @@
     let file_name_length = reader.read_u16::<LittleEndian>()? as usize;
     let extra_field_length = reader.read_u16::<LittleEndian>()? as usize;
 
-    let file_name_raw = ReadPodExt::read_exact(reader, file_name_length)?;
-    let extra_field = ReadPodExt::read_exact(reader, extra_field_length)?;
+    let mut file_name_raw = vec![0; file_name_length];
+    reader.read_exact(&mut file_name_raw)?;
+    let mut extra_field = vec![0; extra_field_length];
+    reader.read_exact(&mut extra_field)?;
 
-    let file_name = match is_utf8
-    {
+    let file_name = match is_utf8 {
         true => String::from_utf8_lossy(&*file_name_raw).into_owned(),
         false => file_name_raw.clone().from_cp437(),
     };
 
-    let mut result = ZipFileData
-    {
+    let mut result = ZipFileData {
         system: System::from_u8((version_made_by >> 8) as u8),
         version_made_by: version_made_by as u8,
-        encrypted: encrypted,
-        compression_method: compression_method,
+        encrypted,
+        using_data_descriptor,
+        compression_method,
         last_modified_time: DateTime::from_msdos(last_mod_date, last_mod_time),
-        crc32: crc32,
+        crc32,
         compressed_size: compressed_size as u64,
         uncompressed_size: uncompressed_size as u64,
-        file_name: file_name,
-        file_name_raw: file_name_raw,
-        file_comment: String::new(),  // file comment is only available in the central directory
+        file_name,
+        file_name_raw,
+        extra_field,
+        file_comment: String::new(), // file comment is only available in the central directory
         // header_start and data start are not available, but also don't matter, since seeking is
         // not available.
         header_start: 0,
         data_start: 0,
+        central_header_start: 0,
         // The external_attributes field is only available in the central directory.
         // We set this to zero, which should be valid as the docs state 'If input came
         // from standard input, this field is set to zero.'
         external_attributes: 0,
+        large_file: false,
     };
 
-    match parse_extra_field(&mut result, &extra_field) {
-        Ok(..) | Err(ZipError::Io(..)) => {},
-        Err(e) => Err(e)?,
+    match parse_extra_field(&mut result) {
+        Ok(..) | Err(ZipError::Io(..)) => {}
+        Err(e) => return Err(e),
     }
 
     if encrypted {
-        return unsupported_zip_error("Encrypted files are not supported")
+        return unsupported_zip_error("Encrypted files are not supported");
     }
     if using_data_descriptor {
         return unsupported_zip_error("The file length is not available in the local header");
@@ -642,9 +968,20 @@
 
     let result_crc32 = result.crc32;
     let result_compression_method = result.compression_method;
+    let crypto_reader = make_crypto_reader(
+        result_compression_method,
+        result_crc32,
+        result.last_modified_time,
+        result.using_data_descriptor,
+        limit_reader,
+        None,
+    )?
+    .unwrap();
+
     Ok(Some(ZipFile {
         data: Cow::Owned(result),
-        reader: make_reader(result_compression_method, result_crc32, limit_reader)?
+        crypto_reader: None,
+        reader: make_reader(result_compression_method, result_crc32, crypto_reader),
     }))
 }
 
@@ -652,8 +989,8 @@
 mod test {
     #[test]
     fn invalid_offset() {
-        use std::io;
         use super::ZipArchive;
+        use std::io;
 
         let mut v = Vec::new();
         v.extend_from_slice(include_bytes!("../tests/data/invalid_offset.zip"));
@@ -662,9 +999,20 @@
     }
 
     #[test]
-    fn zip64_with_leading_junk() {
+    fn invalid_offset2() {
+        use super::ZipArchive;
         use std::io;
+
+        let mut v = Vec::new();
+        v.extend_from_slice(include_bytes!("../tests/data/invalid_offset2.zip"));
+        let reader = ZipArchive::new(io::Cursor::new(v));
+        assert!(reader.is_err());
+    }
+
+    #[test]
+    fn zip64_with_leading_junk() {
         use super::ZipArchive;
+        use std::io;
 
         let mut v = Vec::new();
         v.extend_from_slice(include_bytes!("../tests/data/zip64_demo.zip"));
@@ -673,20 +1021,21 @@
     }
 
     #[test]
-    fn zip_comment() {
-        use std::io;
+    fn zip_contents() {
         use super::ZipArchive;
+        use std::io;
 
         let mut v = Vec::new();
         v.extend_from_slice(include_bytes!("../tests/data/mimetype.zip"));
-        let reader = ZipArchive::new(io::Cursor::new(v)).unwrap();
-        assert!(reader.comment() == b"zip-rs");
+        let mut reader = ZipArchive::new(io::Cursor::new(v)).unwrap();
+        assert!(reader.comment() == b"");
+        assert_eq!(reader.by_index(0).unwrap().central_header_start(), 77);
     }
 
     #[test]
     fn zip_read_streaming() {
-        use std::io;
         use super::read_zipfile_from_stream;
+        use std::io;
 
         let mut v = Vec::new();
         v.extend_from_slice(include_bytes!("../tests/data/mimetype.zip"));
@@ -701,8 +1050,8 @@
 
     #[test]
     fn zip_clone() {
-        use std::io::{self, Read};
         use super::ZipArchive;
+        use std::io::{self, Read};
 
         let mut v = Vec::new();
         v.extend_from_slice(include_bytes!("../tests/data/mimetype.zip"));
@@ -713,7 +1062,17 @@
         let mut file2 = reader2.by_index(0).unwrap();
 
         let t = file1.last_modified();
-        assert_eq!((t.year(), t.month(), t.day(), t.hour(), t.minute(), t.second()), (1980, 1, 1, 0, 0, 0));
+        assert_eq!(
+            (
+                t.year(),
+                t.month(),
+                t.day(),
+                t.hour(),
+                t.minute(),
+                t.second()
+            ),
+            (1980, 1, 1, 0, 0, 0)
+        );
 
         let mut buf1 = [0; 5];
         let mut buf2 = [0; 5];
@@ -741,7 +1100,7 @@
 
         for i in 0..zip.len() {
             let zip_file = zip.by_index(i).unwrap();
-            let full_name = zip_file.sanitized_name();
+            let full_name = zip_file.enclosed_name().unwrap();
             let file_name = full_name.file_name().unwrap().to_str().unwrap();
             assert!(
                 (file_name.starts_with("dir") && zip_file.is_dir())
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/result.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/result.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/result.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/result.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,94 +1,54 @@
 //! Error types that can be emitted from this library
 
-use std::convert;
-use std::error;
-use std::fmt;
 use std::io;
 
+use thiserror::Error;
+
 /// Generic result type with ZipError as its error variant
 pub type ZipResult<T> = Result<T, ZipError>;
 
+/// The given password is wrong
+#[derive(Error, Debug)]
+#[error("invalid password for file in archive")]
+pub struct InvalidPassword;
+
 /// Error type for Zip
-#[derive(Debug)]
-pub enum ZipError
-{
+#[derive(Debug, Error)]
+pub enum ZipError {
     /// An Error caused by I/O
-    Io(io::Error),
+    #[error(transparent)]
+    Io(#[from] io::Error),
 
     /// This file is probably not a zip archive
+    #[error("invalid Zip archive")]
     InvalidArchive(&'static str),
 
     /// This archive is not supported
+    #[error("unsupported Zip archive")]
     UnsupportedArchive(&'static str),
 
     /// The requested file could not be found in the archive
+    #[error("specified file not found in archive")]
     FileNotFound,
 }
 
-impl ZipError
-{
-    fn detail(&self) -> ::std::borrow::Cow<'_, str>
-    {
-        use std::error::Error;
-
-        match *self
-        {
-            ZipError::Io(ref io_err) => {
-                ("Io Error: ".to_string() + (io_err as &dyn error::Error).description()).into()
-            },
-            ZipError::InvalidArchive(msg) | ZipError::UnsupportedArchive(msg) => {
-                (self.description().to_string() + ": " + msg).into()
-            },
-            ZipError::FileNotFound => {
-                self.description().into()
-            },
-        }
-    }
+impl ZipError {
+    /// The text used as an error when a password is required and not supplied
+    ///
+    /// ```rust,no_run
+    /// # use zip::result::ZipError;
+    /// # let mut archive = zip::ZipArchive::new(std::io::Cursor::new(&[])).unwrap();
+    /// match archive.by_index(1) {
+    ///     Err(ZipError::UnsupportedArchive(ZipError::PASSWORD_REQUIRED)) => eprintln!("a password is needed to unzip this file"),
+    ///     _ => (),
+    /// }
+    /// # ()
+    /// ```
+    pub const PASSWORD_REQUIRED: &'static str = "Password required to decrypt file";
 }
 
-impl convert::From<io::Error> for ZipError
-{
-    fn from(err: io::Error) -> ZipError
-    {
-        ZipError::Io(err)
-    }
-}
-
-impl convert::From<ZipError> for io::Error
-{
-    fn from(err: ZipError) -> io::Error
-    {
+impl From<ZipError> for io::Error {
+    fn from(err: ZipError) -> io::Error {
         io::Error::new(io::ErrorKind::Other, err)
     }
 }
-
-impl fmt::Display for ZipError
-{
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error>
-    {
-        fmt.write_str(&*self.detail())
-    }
-}
-
-impl error::Error for ZipError
-{
-    fn description(&self) -> &str
-    {
-        match *self
-        {
-            ZipError::Io(ref io_err) => (io_err as &dyn error::Error).description(),
-            ZipError::InvalidArchive(..) => "Invalid Zip archive",
-            ZipError::UnsupportedArchive(..) => "Unsupported Zip archive",
-            ZipError::FileNotFound => "Specified file not found in archive",
-        }
-    }
-
-    fn cause(&self) -> Option<&dyn error::Error>
-    {
-        match *self
-        {
-            ZipError::Io(ref io_err) => Some(io_err as &dyn error::Error),
-            _ => None,
-        }
-    }
-}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/spec.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/spec.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/spec.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/spec.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,16 +1,15 @@
+use crate::result::{ZipError, ZipResult};
+use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use std::io;
 use std::io::prelude::*;
-use crate::result::{ZipResult, ZipError};
-use podio::{ReadPodExt, WritePodExt, LittleEndian};
 
-pub const LOCAL_FILE_HEADER_SIGNATURE : u32 = 0x04034b50;
-pub const CENTRAL_DIRECTORY_HEADER_SIGNATURE : u32 = 0x02014b50;
-const CENTRAL_DIRECTORY_END_SIGNATURE : u32 = 0x06054b50;
-pub const ZIP64_CENTRAL_DIRECTORY_END_SIGNATURE : u32 = 0x06064b50;
-const ZIP64_CENTRAL_DIRECTORY_END_LOCATOR_SIGNATURE : u32 = 0x07064b50;
+pub const LOCAL_FILE_HEADER_SIGNATURE: u32 = 0x04034b50;
+pub const CENTRAL_DIRECTORY_HEADER_SIGNATURE: u32 = 0x02014b50;
+const CENTRAL_DIRECTORY_END_SIGNATURE: u32 = 0x06054b50;
+pub const ZIP64_CENTRAL_DIRECTORY_END_SIGNATURE: u32 = 0x06064b50;
+const ZIP64_CENTRAL_DIRECTORY_END_LOCATOR_SIGNATURE: u32 = 0x07064b50;
 
-pub struct CentralDirectoryEnd
-{
+pub struct CentralDirectoryEnd {
     pub disk_number: u16,
     pub disk_with_central_directory: u16,
     pub number_of_files_on_this_disk: u16,
@@ -20,14 +19,11 @@
     pub zip_file_comment: Vec<u8>,
 }
 
-impl CentralDirectoryEnd
-{
-    pub fn parse<T: Read>(reader: &mut T) -> ZipResult<CentralDirectoryEnd>
-    {
+impl CentralDirectoryEnd {
+    pub fn parse<T: Read>(reader: &mut T) -> ZipResult<CentralDirectoryEnd> {
         let magic = reader.read_u32::<LittleEndian>()?;
-        if magic != CENTRAL_DIRECTORY_END_SIGNATURE
-        {
-            return Err(ZipError::InvalidArchive("Invalid digital signature header"))
+        if magic != CENTRAL_DIRECTORY_END_SIGNATURE {
+            return Err(ZipError::InvalidArchive("Invalid digital signature header"));
         }
         let disk_number = reader.read_u16::<LittleEndian>()?;
         let disk_with_central_directory = reader.read_u16::<LittleEndian>()?;
@@ -36,56 +32,54 @@
         let central_directory_size = reader.read_u32::<LittleEndian>()?;
         let central_directory_offset = reader.read_u32::<LittleEndian>()?;
         let zip_file_comment_length = reader.read_u16::<LittleEndian>()? as usize;
-        let zip_file_comment = ReadPodExt::read_exact(reader, zip_file_comment_length)?;
+        let mut zip_file_comment = vec![0; zip_file_comment_length];
+        reader.read_exact(&mut zip_file_comment)?;
 
-        Ok(CentralDirectoryEnd
-           {
-               disk_number: disk_number,
-               disk_with_central_directory: disk_with_central_directory,
-               number_of_files_on_this_disk: number_of_files_on_this_disk,
-               number_of_files: number_of_files,
-               central_directory_size: central_directory_size,
-               central_directory_offset: central_directory_offset,
-               zip_file_comment: zip_file_comment,
-           })
+        Ok(CentralDirectoryEnd {
+            disk_number,
+            disk_with_central_directory,
+            number_of_files_on_this_disk,
+            number_of_files,
+            central_directory_size,
+            central_directory_offset,
+            zip_file_comment,
+        })
     }
 
-    pub fn find_and_parse<T: Read+io::Seek>(reader: &mut T) -> ZipResult<(CentralDirectoryEnd, u64)>
-    {
+    pub fn find_and_parse<T: Read + io::Seek>(
+        reader: &mut T,
+    ) -> ZipResult<(CentralDirectoryEnd, u64)> {
         const HEADER_SIZE: u64 = 22;
         const BYTES_BETWEEN_MAGIC_AND_COMMENT_SIZE: u64 = HEADER_SIZE - 6;
         let file_length = reader.seek(io::SeekFrom::End(0))?;
 
-        let search_upper_bound = file_length.checked_sub(HEADER_SIZE + ::std::u16::MAX as u64).unwrap_or(0);
+        let search_upper_bound = file_length.saturating_sub(HEADER_SIZE + ::std::u16::MAX as u64);
 
         if file_length < HEADER_SIZE {
             return Err(ZipError::InvalidArchive("Invalid zip header"));
         }
 
         let mut pos = file_length - HEADER_SIZE;
-        while pos >= search_upper_bound
-        {
+        while pos >= search_upper_bound {
             reader.seek(io::SeekFrom::Start(pos as u64))?;
-            if reader.read_u32::<LittleEndian>()? == CENTRAL_DIRECTORY_END_SIGNATURE
-            {
-                reader.seek(io::SeekFrom::Current(BYTES_BETWEEN_MAGIC_AND_COMMENT_SIZE as i64))?;
-                let comment_length = reader.read_u16::<LittleEndian>()? as u64;
-                if file_length - pos - HEADER_SIZE == comment_length
-                {
-                    let cde_start_pos = reader.seek(io::SeekFrom::Start(pos as u64))?;
-                    return CentralDirectoryEnd::parse(reader).map(|cde| (cde, cde_start_pos));
-                }
+            if reader.read_u32::<LittleEndian>()? == CENTRAL_DIRECTORY_END_SIGNATURE {
+                reader.seek(io::SeekFrom::Current(
+                    BYTES_BETWEEN_MAGIC_AND_COMMENT_SIZE as i64,
+                ))?;
+                let cde_start_pos = reader.seek(io::SeekFrom::Start(pos as u64))?;
+                return CentralDirectoryEnd::parse(reader).map(|cde| (cde, cde_start_pos));
             }
             pos = match pos.checked_sub(1) {
                 Some(p) => p,
                 None => break,
             };
         }
-        Err(ZipError::InvalidArchive("Could not find central directory end"))
+        Err(ZipError::InvalidArchive(
+            "Could not find central directory end",
+        ))
     }
 
-    pub fn write<T: Write>(&self, writer: &mut T) -> ZipResult<()>
-    {
+    pub fn write<T: Write>(&self, writer: &mut T) -> ZipResult<()> {
         writer.write_u32::<LittleEndian>(CENTRAL_DIRECTORY_END_SIGNATURE)?;
         writer.write_u16::<LittleEndian>(self.disk_number)?;
         writer.write_u16::<LittleEndian>(self.disk_with_central_directory)?;
@@ -99,37 +93,41 @@
     }
 }
 
-pub struct Zip64CentralDirectoryEndLocator
-{
+pub struct Zip64CentralDirectoryEndLocator {
     pub disk_with_central_directory: u32,
     pub end_of_central_directory_offset: u64,
     pub number_of_disks: u32,
 }
 
-impl Zip64CentralDirectoryEndLocator
-{
-    pub fn parse<T: Read>(reader: &mut T) -> ZipResult<Zip64CentralDirectoryEndLocator>
-    {
+impl Zip64CentralDirectoryEndLocator {
+    pub fn parse<T: Read>(reader: &mut T) -> ZipResult<Zip64CentralDirectoryEndLocator> {
         let magic = reader.read_u32::<LittleEndian>()?;
-        if magic != ZIP64_CENTRAL_DIRECTORY_END_LOCATOR_SIGNATURE
-        {
-            return Err(ZipError::InvalidArchive("Invalid zip64 locator digital signature header"))
+        if magic != ZIP64_CENTRAL_DIRECTORY_END_LOCATOR_SIGNATURE {
+            return Err(ZipError::InvalidArchive(
+                "Invalid zip64 locator digital signature header",
+            ));
         }
         let disk_with_central_directory = reader.read_u32::<LittleEndian>()?;
         let end_of_central_directory_offset = reader.read_u64::<LittleEndian>()?;
         let number_of_disks = reader.read_u32::<LittleEndian>()?;
 
-        Ok(Zip64CentralDirectoryEndLocator
-           {
-               disk_with_central_directory: disk_with_central_directory,
-               end_of_central_directory_offset: end_of_central_directory_offset,
-               number_of_disks: number_of_disks,
-           })
+        Ok(Zip64CentralDirectoryEndLocator {
+            disk_with_central_directory,
+            end_of_central_directory_offset,
+            number_of_disks,
+        })
+    }
+
+    pub fn write<T: Write>(&self, writer: &mut T) -> ZipResult<()> {
+        writer.write_u32::<LittleEndian>(ZIP64_CENTRAL_DIRECTORY_END_LOCATOR_SIGNATURE)?;
+        writer.write_u32::<LittleEndian>(self.disk_with_central_directory)?;
+        writer.write_u64::<LittleEndian>(self.end_of_central_directory_offset)?;
+        writer.write_u32::<LittleEndian>(self.number_of_disks)?;
+        Ok(())
     }
 }
 
-pub struct Zip64CentralDirectoryEnd
-{
+pub struct Zip64CentralDirectoryEnd {
     pub version_made_by: u16,
     pub version_needed_to_extract: u16,
     pub disk_number: u32,
@@ -141,20 +139,18 @@
     //pub extensible_data_sector: Vec<u8>, <-- We don't do anything with this at the moment.
 }
 
-impl Zip64CentralDirectoryEnd
-{
-    pub fn find_and_parse<T: Read+io::Seek>(reader: &mut T,
-                                            nominal_offset: u64,
-                                            search_upper_bound: u64) -> ZipResult<(Zip64CentralDirectoryEnd, u64)>
-    {
+impl Zip64CentralDirectoryEnd {
+    pub fn find_and_parse<T: Read + io::Seek>(
+        reader: &mut T,
+        nominal_offset: u64,
+        search_upper_bound: u64,
+    ) -> ZipResult<(Zip64CentralDirectoryEnd, u64)> {
         let mut pos = nominal_offset;
 
-        while pos <= search_upper_bound
-        {
+        while pos <= search_upper_bound {
             reader.seek(io::SeekFrom::Start(pos))?;
 
-            if reader.read_u32::<LittleEndian>()? == ZIP64_CENTRAL_DIRECTORY_END_SIGNATURE
-            {
+            if reader.read_u32::<LittleEndian>()? == ZIP64_CENTRAL_DIRECTORY_END_SIGNATURE {
                 let archive_offset = pos - nominal_offset;
 
                 let _record_size = reader.read_u64::<LittleEndian>()?;
@@ -169,22 +165,40 @@
                 let central_directory_size = reader.read_u64::<LittleEndian>()?;
                 let central_directory_offset = reader.read_u64::<LittleEndian>()?;
 
-                return Ok((Zip64CentralDirectoryEnd
-                          {
-                              version_made_by: version_made_by,
-                              version_needed_to_extract: version_needed_to_extract,
-                              disk_number: disk_number,
-                              disk_with_central_directory: disk_with_central_directory,
-                              number_of_files_on_this_disk: number_of_files_on_this_disk,
-                              number_of_files: number_of_files,
-                              central_directory_size: central_directory_size,
-                              central_directory_offset: central_directory_offset,
-                          }, archive_offset));
+                return Ok((
+                    Zip64CentralDirectoryEnd {
+                        version_made_by,
+                        version_needed_to_extract,
+                        disk_number,
+                        disk_with_central_directory,
+                        number_of_files_on_this_disk,
+                        number_of_files,
+                        central_directory_size,
+                        central_directory_offset,
+                    },
+                    archive_offset,
+                ));
             }
 
             pos += 1;
         }
 
-        Err(ZipError::InvalidArchive("Could not find ZIP64 central directory end"))
+        Err(ZipError::InvalidArchive(
+            "Could not find ZIP64 central directory end",
+        ))
+    }
+
+    pub fn write<T: Write>(&self, writer: &mut T) -> ZipResult<()> {
+        writer.write_u32::<LittleEndian>(ZIP64_CENTRAL_DIRECTORY_END_SIGNATURE)?;
+        writer.write_u64::<LittleEndian>(44)?; // record size
+        writer.write_u16::<LittleEndian>(self.version_made_by)?;
+        writer.write_u16::<LittleEndian>(self.version_needed_to_extract)?;
+        writer.write_u32::<LittleEndian>(self.disk_number)?;
+        writer.write_u32::<LittleEndian>(self.disk_with_central_directory)?;
+        writer.write_u64::<LittleEndian>(self.number_of_files_on_this_disk)?;
+        writer.write_u64::<LittleEndian>(self.number_of_files)?;
+        writer.write_u64::<LittleEndian>(self.central_directory_size)?;
+        writer.write_u64::<LittleEndian>(self.central_directory_offset)?;
+        Ok(())
     }
 }
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/types.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/types.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/types.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/types.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,18 +1,14 @@
 //! Types that specify what is contained in a ZIP.
 
 #[derive(Clone, Copy, Debug, PartialEq)]
-pub enum System
-{
+pub enum System {
     Dos = 0,
     Unix = 3,
     Unknown,
-    #[doc(hidden)]
-    __Nonexhaustive,
 }
 
 impl System {
-    pub fn from_u8(system: u8) -> System
-    {
+    pub fn from_u8(system: u8) -> System {
         use self::System::*;
 
         match system {
@@ -30,6 +26,12 @@
 /// When constructed manually from a date and time, it will also check if the input is sensible
 /// (e.g. months are from [1, 12]), but when read from a zip some parts may be out of their normal
 /// bounds (e.g. month 0, or hour 31).
+///
+/// # Warning
+///
+/// Some utilities use alternative timestamps to improve the accuracy of their
+/// ZIPs, but we don't parse them yet. [We're working on this](https://github.com/zip-rs/zip/issues/156#issuecomment-652981904),
+/// however this API shouldn't be considered complete.
 #[derive(Debug, Clone, Copy)]
 pub struct DateTime {
     year: u16,
@@ -59,10 +61,10 @@
     pub fn from_msdos(datepart: u16, timepart: u16) -> DateTime {
         let seconds = (timepart & 0b0000000000011111) << 1;
         let minutes = (timepart & 0b0000011111100000) >> 5;
-        let hours =   (timepart & 0b1111100000000000) >> 11;
-        let days =    (datepart & 0b0000000000011111) >> 0;
-        let months =  (datepart & 0b0000000111100000) >> 5;
-        let years =   (datepart & 0b1111111000000000) >> 9;
+        let hours = (timepart & 0b1111100000000000) >> 11;
+        let days = (datepart & 0b0000000000011111) >> 0;
+        let months = (datepart & 0b0000000111100000) >> 5;
+        let years = (datepart & 0b1111111000000000) >> 9;
 
         DateTime {
             year: (years + 1980) as u16,
@@ -83,24 +85,33 @@
     /// * hour: [0, 23]
     /// * minute: [0, 59]
     /// * second: [0, 60]
-    pub fn from_date_and_time(year: u16, month: u8, day: u8, hour: u8, minute: u8, second: u8) -> Result<DateTime, ()> {
-        if year >= 1980 && year <= 2107
-            && month >= 1 && month <= 12
-            && day >= 1 && day <= 31
+    pub fn from_date_and_time(
+        year: u16,
+        month: u8,
+        day: u8,
+        hour: u8,
+        minute: u8,
+        second: u8,
+    ) -> Result<DateTime, ()> {
+        if year >= 1980
+            && year <= 2107
+            && month >= 1
+            && month <= 12
+            && day >= 1
+            && day <= 31
             && hour <= 23
             && minute <= 59
             && second <= 60
         {
             Ok(DateTime {
-                year: year,
-                month: month,
-                day: day,
-                hour: hour,
-                minute: minute,
-                second: second,
+                year,
+                month,
+                day,
+                hour,
+                minute,
+                second,
             })
-        }
-        else {
+        } else {
             Err(())
         }
     }
@@ -110,12 +121,18 @@
     ///
     /// Returns `Err` when this object is out of bounds
     pub fn from_time(tm: ::time::Tm) -> Result<DateTime, ()> {
-        if tm.tm_year >= 80 && tm.tm_year <= 207
-            && tm.tm_mon >= 0 && tm.tm_mon <= 11
-            && tm.tm_mday >= 1 && tm.tm_mday <= 31
-            && tm.tm_hour >= 0 && tm.tm_hour <= 23
-            && tm.tm_min >= 0 && tm.tm_min <= 59
-            && tm.tm_sec >= 0 && tm.tm_sec <= 60
+        if tm.tm_year >= 80
+            && tm.tm_year <= 207
+            && tm.tm_mon >= 0
+            && tm.tm_mon <= 11
+            && tm.tm_mday >= 1
+            && tm.tm_mday <= 31
+            && tm.tm_hour >= 0
+            && tm.tm_hour <= 23
+            && tm.tm_min >= 0
+            && tm.tm_min <= 59
+            && tm.tm_sec >= 0
+            && tm.tm_sec <= 60
         {
             Ok(DateTime {
                 year: (tm.tm_year + 1900) as u16,
@@ -125,8 +142,7 @@
                 minute: tm.tm_min as u8,
                 second: tm.tm_sec as u8,
             })
-        }
-        else {
+        } else {
             Err(())
         }
     }
@@ -154,7 +170,7 @@
             tm_mon: self.month as i32 - 1,
             tm_year: self.year as i32 - 1900,
             tm_isdst: -1,
-            .. ::time::empty_tm()
+            ..::time::empty_tm()
         }
     }
 
@@ -193,14 +209,15 @@
 
 /// Structure representing a ZIP file.
 #[derive(Debug, Clone)]
-pub struct ZipFileData
-{
+pub struct ZipFileData {
     /// Compatibility of the file attribute information
     pub system: System,
     /// Specification version
     pub version_made_by: u8,
     /// True if the file is encrypted.
     pub encrypted: bool,
+    /// True if the file uses a data-descriptor section
+    pub using_data_descriptor: bool,
     /// Compression method used to store the file
     pub compression_method: crate::compression::CompressionMethod,
     /// Last modified time. This will only have a 2 second precision.
@@ -215,14 +232,22 @@
     pub file_name: String,
     /// Raw file name. To be used when file_name was incorrectly decoded.
     pub file_name_raw: Vec<u8>,
+    /// Extra field usually used for storage expansion
+    pub extra_field: Vec<u8>,
     /// File comment
     pub file_comment: String,
     /// Specifies where the local header of the file starts
     pub header_start: u64,
+    /// Specifies where the central header of the file starts
+    ///
+    /// Note that when this is not known, it is set to 0
+    pub central_header_start: u64,
     /// Specifies where the compressed data of the file starts
     pub data_start: u64,
     /// External file attributes
     pub external_attributes: u32,
+    /// Reserve local ZIP64 extra field
+    pub large_file: bool,
 }
 
 impl ZipFileData {
@@ -230,7 +255,8 @@
         let no_null_filename = match self.file_name.find('\0') {
             Some(index) => &self.file_name[0..index],
             None => &self.file_name,
-        }.to_string();
+        }
+        .to_string();
 
         // zip files can contain both / and \ as separators regardless of the OS
         // and as we want to return a sanitized PathBuf that only supports the
@@ -238,7 +264,7 @@
         let separator = ::std::path::MAIN_SEPARATOR;
         let opposite_separator = match separator {
             '/' => '\\',
-            '\\' | _ => '/',
+            _ => '/',
         };
         let filename =
             no_null_filename.replace(&opposite_separator.to_string(), &separator.to_string());
@@ -255,10 +281,18 @@
             })
     }
 
+    pub fn zip64_extension(&self) -> bool {
+        self.uncompressed_size > 0xFFFFFFFF
+            || self.compressed_size > 0xFFFFFFFF
+            || self.header_start > 0xFFFFFFFF
+    }
+
     pub fn version_needed(&self) -> u16 {
-        match self.compression_method {
+        // higher versions matched first
+        match (self.zip64_extension(), self.compression_method) {
             #[cfg(feature = "bzip2")]
-            crate::compression::CompressionMethod::Bzip2 => 46,
+            (_, crate::compression::CompressionMethod::Bzip2) => 46,
+            (true, _) => 45,
             _ => 20,
         }
     }
@@ -283,6 +317,7 @@
             system: System::Dos,
             version_made_by: 0,
             encrypted: false,
+            using_data_descriptor: false,
             compression_method: crate::compression::CompressionMethod::Stored,
             last_modified_time: DateTime::default(),
             crc32: 0,
@@ -290,12 +325,18 @@
             uncompressed_size: 0,
             file_name: file_name.clone(),
             file_name_raw: file_name.into_bytes(),
+            extra_field: Vec::new(),
             file_comment: String::new(),
             header_start: 0,
             data_start: 0,
+            central_header_start: 0,
             external_attributes: 0,
+            large_file: false,
         };
-        assert_eq!(data.file_name_sanitized(), ::std::path::PathBuf::from("path/etc/passwd"));
+        assert_eq!(
+            data.file_name_sanitized(),
+            ::std::path::PathBuf::from("path/etc/passwd")
+        );
     }
 
     #[test]
@@ -399,7 +440,10 @@
         assert_eq!(dt.second(), 30);
 
         #[cfg(feature = "time")]
-        assert_eq!(format!("{}", dt.to_time().rfc3339()), "2018-11-17T10:38:30Z");
+        assert_eq!(
+            format!("{}", dt.to_time().rfc3339()),
+            "2018-11-17T10:38:30Z"
+        );
     }
 
     #[test]
@@ -414,7 +458,10 @@
         assert_eq!(dt.second(), 62);
 
         #[cfg(feature = "time")]
-        assert_eq!(format!("{}", dt.to_time().rfc3339()), "2107-15-31T31:63:62Z");
+        assert_eq!(
+            format!("{}", dt.to_time().rfc3339()),
+            "2107-15-31T31:63:62Z"
+        );
 
         let dt = DateTime::from_msdos(0x0000, 0x0000);
         assert_eq!(dt.year(), 1980);
@@ -425,7 +472,10 @@
         assert_eq!(dt.second(), 0);
 
         #[cfg(feature = "time")]
-        assert_eq!(format!("{}", dt.to_time().rfc3339()), "1980-00-00T00:00:00Z");
+        assert_eq!(
+            format!("{}", dt.to_time().rfc3339()),
+            "1980-00-00T00:00:00Z"
+        );
     }
 
     #[cfg(feature = "time")]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/write.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/write.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/write.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/write.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,90 +1,123 @@
-//! Structs for creating a new zip archive
+//! Types for creating ZIP archives
 
 use crate::compression::CompressionMethod;
-use crate::types::{ZipFileData, System, DEFAULT_VERSION, DateTime};
+use crate::read::{central_header_to_zip_file, ZipArchive, ZipFile};
+use crate::result::{ZipError, ZipResult};
 use crate::spec;
+use crate::types::{DateTime, System, ZipFileData, DEFAULT_VERSION};
+use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use crc32fast::Hasher;
-use crate::result::{ZipResult, ZipError};
 use std::default::Default;
 use std::io;
 use std::io::prelude::*;
 use std::mem;
-use podio::{WritePodExt, LittleEndian};
 
-#[cfg(feature = "deflate")]
+#[cfg(any(
+    feature = "deflate",
+    feature = "deflate-miniz",
+    feature = "deflate-zlib"
+))]
 use flate2::write::DeflateEncoder;
 
 #[cfg(feature = "bzip2")]
 use bzip2::write::BzEncoder;
 
-enum GenericZipWriter<W: Write + io::Seek>
-{
+enum GenericZipWriter<W: Write + io::Seek> {
     Closed,
     Storer(W),
-    #[cfg(feature = "deflate")]
+    #[cfg(any(
+        feature = "deflate",
+        feature = "deflate-miniz",
+        feature = "deflate-zlib"
+    ))]
     Deflater(DeflateEncoder<W>),
     #[cfg(feature = "bzip2")]
     Bzip2(BzEncoder<W>),
 }
 
-/// Generator for ZIP files.
+/// ZIP archive generator
 ///
-/// ```
-/// fn doit() -> zip::result::ZipResult<()>
-/// {
-///     use std::io::Write;
+/// Handles the bookkeeping involved in building an archive, and provides an
+/// API to edit its contents.
 ///
-///     // For this example we write to a buffer, but normally you should use a File
-///     let mut buf: &mut [u8] = &mut [0u8; 65536];
-///     let mut w = std::io::Cursor::new(buf);
-///     let mut zip = zip::ZipWriter::new(w);
+/// ```
+/// # fn doit() -> zip::result::ZipResult<()>
+/// # {
+/// # use zip::ZipWriter;
+/// use std::io::Write;
+/// use zip::write::FileOptions;
 ///
-///     let options = zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Stored);
-///     zip.start_file("hello_world.txt", options)?;
-///     zip.write(b"Hello, World!")?;
+/// // We use a buffer here, though you'd normally use a `File`
+/// let mut buf = [0; 65536];
+/// let mut zip = zip::ZipWriter::new(std::io::Cursor::new(&mut buf[..]));
 ///
-///     // Optionally finish the zip. (this is also done on drop)
-///     zip.finish()?;
+/// let options = zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Stored);
+/// zip.start_file("hello_world.txt", options)?;
+/// zip.write(b"Hello, World!")?;
 ///
-///     Ok(())
-/// }
+/// // Apply the changes you've made.
+/// // Dropping the `ZipWriter` will have the same effect, but may silently fail
+/// zip.finish()?;
 ///
-/// println!("Result: {:?}", doit().unwrap());
+/// # Ok(())
+/// # }
+/// # doit().unwrap();
 /// ```
-pub struct ZipWriter<W: Write + io::Seek>
-{
+pub struct ZipWriter<W: Write + io::Seek> {
     inner: GenericZipWriter<W>,
     files: Vec<ZipFileData>,
     stats: ZipWriterStats,
     writing_to_file: bool,
-    comment: String,
+    writing_to_extra_field: bool,
+    writing_to_central_extra_field_only: bool,
+    writing_raw: bool,
+    comment: Vec<u8>,
 }
 
 #[derive(Default)]
-struct ZipWriterStats
-{
+struct ZipWriterStats {
     hasher: Hasher,
     start: u64,
     bytes_written: u64,
 }
 
+struct ZipRawValues {
+    crc32: u32,
+    compressed_size: u64,
+    uncompressed_size: u64,
+}
+
 /// Metadata for a file to be written
 #[derive(Copy, Clone)]
 pub struct FileOptions {
     compression_method: CompressionMethod,
     last_modified_time: DateTime,
     permissions: Option<u32>,
+    large_file: bool,
 }
 
 impl FileOptions {
     /// Construct a new FileOptions object
     pub fn default() -> FileOptions {
         FileOptions {
-            #[cfg(feature = "deflate")]      compression_method: CompressionMethod::Deflated,
-            #[cfg(not(feature = "deflate"))] compression_method: CompressionMethod::Stored,
-            #[cfg(feature = "time")]      last_modified_time: DateTime::from_time(time::now()).unwrap_or(DateTime::default()),
-            #[cfg(not(feature = "time"))] last_modified_time: DateTime::default(),
+            #[cfg(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            ))]
+            compression_method: CompressionMethod::Deflated,
+            #[cfg(not(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            )))]
+            compression_method: CompressionMethod::Stored,
+            #[cfg(feature = "time")]
+            last_modified_time: DateTime::from_time(time::now()).unwrap_or_default(),
+            #[cfg(not(feature = "time"))]
+            last_modified_time: DateTime::default(),
             permissions: None,
+            large_file: false,
         }
     }
 
@@ -92,7 +125,6 @@
     ///
     /// The default is `CompressionMethod::Deflated`. If the deflate compression feature is
     /// disabled, `CompressionMethod::Stored` becomes the default.
-    /// otherwise.
     pub fn compression_method(mut self, method: CompressionMethod) -> FileOptions {
         self.compression_method = method;
         self
@@ -116,6 +148,16 @@
         self.permissions = Some(mode & 0o777);
         self
     }
+
+    /// Set whether the new file's compressed and uncompressed size is less than 4 GiB.
+    ///
+    /// If set to `false` and the file exceeds the limit, an I/O error is thrown. If set to `true`,
+    /// readers will require ZIP64 support and if the file does not exceed the limit, 20 B are
+    /// wasted. The default is `false`.
+    pub fn large_file(mut self, large: bool) -> FileOptions {
+        self.large_file = large;
+        self
+    }
 }
 
 impl Default for FileOptions {
@@ -124,95 +166,174 @@
     }
 }
 
-impl<W: Write+io::Seek> Write for ZipWriter<W>
-{
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize>
-    {
-        if !self.writing_to_file { return Err(io::Error::new(io::ErrorKind::Other, "No file has been started")) }
-        match self.inner.ref_mut()
-        {
+impl<W: Write + io::Seek> Write for ZipWriter<W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        if !self.writing_to_file {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "No file has been started",
+            ));
+        }
+        match self.inner.ref_mut() {
             Some(ref mut w) => {
-                let write_result = w.write(buf);
-                if let Ok(count) = write_result {
-                    self.stats.update(&buf[0..count]);
+                if self.writing_to_extra_field {
+                    self.files.last_mut().unwrap().extra_field.write(buf)
+                } else {
+                    let write_result = w.write(buf);
+                    if let Ok(count) = write_result {
+                        self.stats.update(&buf[0..count]);
+                        if self.stats.bytes_written > 0xFFFFFFFF
+                            && !self.files.last_mut().unwrap().large_file
+                        {
+                            let _inner = mem::replace(&mut self.inner, GenericZipWriter::Closed);
+                            return Err(io::Error::new(
+                                io::ErrorKind::Other,
+                                "Large file option has not been set",
+                            ));
+                        }
+                    }
+                    write_result
                 }
-                write_result
-
             }
-            None => Err(io::Error::new(io::ErrorKind::BrokenPipe, "ZipWriter was already closed")),
+            None => Err(io::Error::new(
+                io::ErrorKind::BrokenPipe,
+                "ZipWriter was already closed",
+            )),
         }
     }
 
-    fn flush(&mut self) -> io::Result<()>
-    {
-        match self.inner.ref_mut()
-        {
+    fn flush(&mut self) -> io::Result<()> {
+        match self.inner.ref_mut() {
             Some(ref mut w) => w.flush(),
-            None => Err(io::Error::new(io::ErrorKind::BrokenPipe, "ZipWriter was already closed")),
+            None => Err(io::Error::new(
+                io::ErrorKind::BrokenPipe,
+                "ZipWriter was already closed",
+            )),
         }
     }
 }
 
-impl ZipWriterStats
-{
-    fn update(&mut self, buf: &[u8])
-    {
+impl ZipWriterStats {
+    fn update(&mut self, buf: &[u8]) {
         self.hasher.update(buf);
         self.bytes_written += buf.len() as u64;
     }
 }
 
-impl<W: Write+io::Seek> ZipWriter<W>
-{
-    /// Initializes the ZipWriter.
+impl<A: Read + Write + io::Seek> ZipWriter<A> {
+    /// Initializes the archive from an existing ZIP archive, making it ready for append.
+    pub fn new_append(mut readwriter: A) -> ZipResult<ZipWriter<A>> {
+        let (footer, cde_start_pos) = spec::CentralDirectoryEnd::find_and_parse(&mut readwriter)?;
+
+        if footer.disk_number != footer.disk_with_central_directory {
+            return Err(ZipError::UnsupportedArchive(
+                "Support for multi-disk files is not implemented",
+            ));
+        }
+
+        let (archive_offset, directory_start, number_of_files) =
+            ZipArchive::get_directory_counts(&mut readwriter, &footer, cde_start_pos)?;
+
+        if let Err(_) = readwriter.seek(io::SeekFrom::Start(directory_start)) {
+            return Err(ZipError::InvalidArchive(
+                "Could not seek to start of central directory",
+            ));
+        }
+
+        let files = (0..number_of_files)
+            .map(|_| central_header_to_zip_file(&mut readwriter, archive_offset))
+            .collect::<Result<Vec<_>, _>>()?;
+
+        let _ = readwriter.seek(io::SeekFrom::Start(directory_start)); // seek directory_start to overwrite it
+
+        Ok(ZipWriter {
+            inner: GenericZipWriter::Storer(readwriter),
+            files,
+            stats: Default::default(),
+            writing_to_file: false,
+            writing_to_extra_field: false,
+            writing_to_central_extra_field_only: false,
+            comment: footer.zip_file_comment,
+            writing_raw: true, // avoid recomputing the last file's header
+        })
+    }
+}
+
+impl<W: Write + io::Seek> ZipWriter<W> {
+    /// Initializes the archive.
     ///
-    /// Before writing to this object, the start_file command should be called.
-    pub fn new(inner: W) -> ZipWriter<W>
-    {
-        ZipWriter
-        {
+    /// Before writing to this object, the [`ZipWriter::start_file`] function should be called.
+    pub fn new(inner: W) -> ZipWriter<W> {
+        ZipWriter {
             inner: GenericZipWriter::Storer(inner),
             files: Vec::new(),
             stats: Default::default(),
             writing_to_file: false,
-            comment: "zip-rs".into(),
+            writing_to_extra_field: false,
+            writing_to_central_extra_field_only: false,
+            writing_raw: false,
+            comment: Vec::new(),
         }
     }
 
-    /// Set ZIP archive comment. Defaults to 'zip-rs' if not set.
-    pub fn set_comment<S>(&mut self, comment: S) where S: Into<String> {
-        self.comment = comment.into();
+    /// Set ZIP archive comment.
+    pub fn set_comment<S>(&mut self, comment: S)
+    where
+        S: Into<String>,
+    {
+        self.set_raw_comment(comment.into().into())
+    }
+
+    /// Set ZIP archive comment.
+    ///
+    /// This sets the raw bytes of the comment. The comment
+    /// is typically expected to be encoded in UTF-8
+    pub fn set_raw_comment(&mut self, comment: Vec<u8>) {
+        self.comment = comment;
     }
 
     /// Start a new file for with the requested options.
-    fn start_entry<S>(&mut self, name: S, options: FileOptions) -> ZipResult<()>
-        where S: Into<String>
+    fn start_entry<S>(
+        &mut self,
+        name: S,
+        options: FileOptions,
+        raw_values: Option<ZipRawValues>,
+    ) -> ZipResult<()>
+    where
+        S: Into<String>,
     {
         self.finish_file()?;
 
+        let raw_values = raw_values.unwrap_or_else(|| ZipRawValues {
+            crc32: 0,
+            compressed_size: 0,
+            uncompressed_size: 0,
+        });
+
         {
             let writer = self.inner.get_plain();
             let header_start = writer.seek(io::SeekFrom::Current(0))?;
 
             let permissions = options.permissions.unwrap_or(0o100644);
-            let file_name = name.into();
-            let file_name_raw = file_name.clone().into_bytes();
-            let mut file = ZipFileData
-            {
+            let mut file = ZipFileData {
                 system: System::Unix,
                 version_made_by: DEFAULT_VERSION,
                 encrypted: false,
+                using_data_descriptor: false,
                 compression_method: options.compression_method,
                 last_modified_time: options.last_modified_time,
-                crc32: 0,
-                compressed_size: 0,
-                uncompressed_size: 0,
-                file_name: file_name,
-                file_name_raw: file_name_raw,
+                crc32: raw_values.crc32,
+                compressed_size: raw_values.compressed_size,
+                uncompressed_size: raw_values.uncompressed_size,
+                file_name: name.into(),
+                file_name_raw: Vec::new(), // Never used for saving
+                extra_field: Vec::new(),
                 file_comment: String::new(),
-                header_start: header_start,
+                header_start,
                 data_start: 0,
+                central_header_start: 0,
                 external_attributes: permissions << 16,
+                large_file: options.large_file,
             };
             write_local_file_header(writer, &file)?;
 
@@ -226,60 +347,318 @@
             self.files.push(file);
         }
 
-        self.inner.switch_to(options.compression_method)?;
-
         Ok(())
     }
 
-    fn finish_file(&mut self) -> ZipResult<()>
-    {
+    fn finish_file(&mut self) -> ZipResult<()> {
+        if self.writing_to_extra_field {
+            // Implicitly calling [`ZipWriter::end_extra_data`] for empty files.
+            self.end_extra_data()?;
+        }
         self.inner.switch_to(CompressionMethod::Stored)?;
         let writer = self.inner.get_plain();
 
-        let file = match self.files.last_mut()
-        {
-            None => return Ok(()),
-            Some(f) => f,
-        };
-        file.crc32 = self.stats.hasher.clone().finalize();
-        file.uncompressed_size = self.stats.bytes_written;
+        if !self.writing_raw {
+            let file = match self.files.last_mut() {
+                None => return Ok(()),
+                Some(f) => f,
+            };
+            file.crc32 = self.stats.hasher.clone().finalize();
+            file.uncompressed_size = self.stats.bytes_written;
 
-        let file_end = writer.seek(io::SeekFrom::Current(0))?;
-        file.compressed_size = file_end - self.stats.start;
+            let file_end = writer.seek(io::SeekFrom::Current(0))?;
+            file.compressed_size = file_end - self.stats.start;
 
-        update_local_file_header(writer, file)?;
-        writer.seek(io::SeekFrom::Start(file_end))?;
+            update_local_file_header(writer, file)?;
+            writer.seek(io::SeekFrom::Start(file_end))?;
+        }
 
         self.writing_to_file = false;
+        self.writing_raw = false;
         Ok(())
     }
 
-    /// Starts a file.
+    /// Create a file in the archive and start writing its' contents.
+    ///
+    /// The data should be written using the [`io::Write`] implementation on this [`ZipWriter`]
     pub fn start_file<S>(&mut self, name: S, mut options: FileOptions) -> ZipResult<()>
-        where S: Into<String>
+    where
+        S: Into<String>,
     {
         if options.permissions.is_none() {
             options.permissions = Some(0o644);
         }
         *options.permissions.as_mut().unwrap() |= 0o100000;
-        self.start_entry(name, options)?;
+        self.start_entry(name, options, None)?;
+        self.inner.switch_to(options.compression_method)?;
         self.writing_to_file = true;
         Ok(())
     }
 
     /// Starts a file, taking a Path as argument.
     ///
-    /// This function ensures that the '/' path seperator is used. It also ignores all non 'Normal'
+    /// This function ensures that the '/' path separator is used. It also ignores all non 'Normal'
     /// Components, such as a starting '/' or '..' and '.'.
-    pub fn start_file_from_path(&mut self, path: &std::path::Path, options: FileOptions) -> ZipResult<()> {
+    #[deprecated(
+        since = "0.5.7",
+        note = "by stripping `..`s from the path, the meaning of paths can change. Use `start_file` instead."
+    )]
+    pub fn start_file_from_path(
+        &mut self,
+        path: &std::path::Path,
+        options: FileOptions,
+    ) -> ZipResult<()> {
         self.start_file(path_to_string(path), options)
     }
 
+    /// Create an aligned file in the archive and start writing its' contents.
+    ///
+    /// Returns the number of padding bytes required to align the file.
+    ///
+    /// The data should be written using the [`io::Write`] implementation on this [`ZipWriter`]
+    pub fn start_file_aligned<S>(
+        &mut self,
+        name: S,
+        options: FileOptions,
+        align: u16,
+    ) -> Result<u64, ZipError>
+    where
+        S: Into<String>,
+    {
+        let data_start = self.start_file_with_extra_data(name, options)?;
+        let align = align as u64;
+        if align > 1 && data_start % align != 0 {
+            let pad_length = (align - (data_start + 4) % align) % align;
+            let pad = vec![0; pad_length as usize];
+            self.write_all(b"za").map_err(ZipError::from)?; // 0x617a
+            self.write_u16::<LittleEndian>(pad.len() as u16)
+                .map_err(ZipError::from)?;
+            self.write_all(&pad).map_err(ZipError::from)?;
+            assert_eq!(self.end_local_start_central_extra_data()? % align, 0);
+        }
+        let extra_data_end = self.end_extra_data()?;
+        Ok(extra_data_end - data_start)
+    }
+
+    /// Create a file in the archive and start writing its extra data first.
+    ///
+    /// Finish writing extra data and start writing file data with [`ZipWriter::end_extra_data`].
+    /// Optionally, distinguish local from central extra data with
+    /// [`ZipWriter::end_local_start_central_extra_data`].
+    ///
+    /// Returns the preliminary starting offset of the file data without any extra data allowing to
+    /// align the file data by calculating a pad length to be prepended as part of the extra data.
+    ///
+    /// The data should be written using the [`io::Write`] implementation on this [`ZipWriter`]
+    ///
+    /// ```
+    /// use byteorder::{LittleEndian, WriteBytesExt};
+    /// use zip::{ZipArchive, ZipWriter, result::ZipResult};
+    /// use zip::{write::FileOptions, CompressionMethod};
+    /// use std::io::{Write, Cursor};
+    ///
+    /// # fn main() -> ZipResult<()> {
+    /// let mut archive = Cursor::new(Vec::new());
+    ///
+    /// {
+    ///     let mut zip = ZipWriter::new(&mut archive);
+    ///     let options = FileOptions::default()
+    ///         .compression_method(CompressionMethod::Stored);
+    ///
+    ///     zip.start_file_with_extra_data("identical_extra_data.txt", options)?;
+    ///     let extra_data = b"local and central extra data";
+    ///     zip.write_u16::<LittleEndian>(0xbeef)?;
+    ///     zip.write_u16::<LittleEndian>(extra_data.len() as u16)?;
+    ///     zip.write_all(extra_data)?;
+    ///     zip.end_extra_data()?;
+    ///     zip.write_all(b"file data")?;
+    ///
+    ///     let data_start = zip.start_file_with_extra_data("different_extra_data.txt", options)?;
+    ///     let extra_data = b"local extra data";
+    ///     zip.write_u16::<LittleEndian>(0xbeef)?;
+    ///     zip.write_u16::<LittleEndian>(extra_data.len() as u16)?;
+    ///     zip.write_all(extra_data)?;
+    ///     let data_start = data_start as usize + 4 + extra_data.len() + 4;
+    ///     let align = 64;
+    ///     let pad_length = (align - data_start % align) % align;
+    ///     assert_eq!(pad_length, 19);
+    ///     zip.write_u16::<LittleEndian>(0xdead)?;
+    ///     zip.write_u16::<LittleEndian>(pad_length as u16)?;
+    ///     zip.write_all(&vec![0; pad_length])?;
+    ///     let data_start = zip.end_local_start_central_extra_data()?;
+    ///     assert_eq!(data_start as usize % align, 0);
+    ///     let extra_data = b"central extra data";
+    ///     zip.write_u16::<LittleEndian>(0xbeef)?;
+    ///     zip.write_u16::<LittleEndian>(extra_data.len() as u16)?;
+    ///     zip.write_all(extra_data)?;
+    ///     zip.end_extra_data()?;
+    ///     zip.write_all(b"file data")?;
+    ///
+    ///     zip.finish()?;
+    /// }
+    ///
+    /// let mut zip = ZipArchive::new(archive)?;
+    /// assert_eq!(&zip.by_index(0)?.extra_data()[4..], b"local and central extra data");
+    /// assert_eq!(&zip.by_index(1)?.extra_data()[4..], b"central extra data");
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn start_file_with_extra_data<S>(
+        &mut self,
+        name: S,
+        mut options: FileOptions,
+    ) -> ZipResult<u64>
+    where
+        S: Into<String>,
+    {
+        if options.permissions.is_none() {
+            options.permissions = Some(0o644);
+        }
+        *options.permissions.as_mut().unwrap() |= 0o100000;
+        self.start_entry(name, options, None)?;
+        self.writing_to_file = true;
+        self.writing_to_extra_field = true;
+        Ok(self.files.last().unwrap().data_start)
+    }
+
+    /// End local and start central extra data. Requires [`ZipWriter::start_file_with_extra_data`].
+    ///
+    /// Returns the final starting offset of the file data.
+    pub fn end_local_start_central_extra_data(&mut self) -> ZipResult<u64> {
+        let data_start = self.end_extra_data()?;
+        self.files.last_mut().unwrap().extra_field.clear();
+        self.writing_to_extra_field = true;
+        self.writing_to_central_extra_field_only = true;
+        Ok(data_start)
+    }
+
+    /// End extra data and start file data. Requires [`ZipWriter::start_file_with_extra_data`].
+    ///
+    /// Returns the final starting offset of the file data.
+    pub fn end_extra_data(&mut self) -> ZipResult<u64> {
+        // Require `start_file_with_extra_data()`. Ensures `file` is some.
+        if !self.writing_to_extra_field {
+            return Err(ZipError::Io(io::Error::new(
+                io::ErrorKind::Other,
+                "Not writing to extra field",
+            )));
+        }
+        let file = self.files.last_mut().unwrap();
+
+        validate_extra_data(&file)?;
+
+        if !self.writing_to_central_extra_field_only {
+            let writer = self.inner.get_plain();
+
+            // Append extra data to local file header and keep it for central file header.
+            writer.write_all(&file.extra_field)?;
+
+            // Update final `data_start`.
+            let header_end = file.data_start + file.extra_field.len() as u64;
+            self.stats.start = header_end;
+            file.data_start = header_end;
+
+            // Update extra field length in local file header.
+            let extra_field_length =
+                if file.large_file { 20 } else { 0 } + file.extra_field.len() as u16;
+            writer.seek(io::SeekFrom::Start(file.header_start + 28))?;
+            writer.write_u16::<LittleEndian>(extra_field_length)?;
+            writer.seek(io::SeekFrom::Start(header_end))?;
+
+            self.inner.switch_to(file.compression_method)?;
+        }
+
+        self.writing_to_extra_field = false;
+        self.writing_to_central_extra_field_only = false;
+        Ok(file.data_start)
+    }
+
+    /// Add a new file using the already compressed data from a ZIP file being read and renames it, this
+    /// allows faster copies of the `ZipFile` since there is no need to decompress and compress it again.
+    /// Any `ZipFile` metadata is copied and not checked, for example the file CRC.
+
+    /// ```no_run
+    /// use std::fs::File;
+    /// use std::io::{Read, Seek, Write};
+    /// use zip::{ZipArchive, ZipWriter};
+    ///
+    /// fn copy_rename<R, W>(
+    ///     src: &mut ZipArchive<R>,
+    ///     dst: &mut ZipWriter<W>,
+    /// ) -> zip::result::ZipResult<()>
+    /// where
+    ///     R: Read + Seek,
+    ///     W: Write + Seek,
+    /// {
+    ///     // Retrieve file entry by name
+    ///     let file = src.by_name("src_file.txt")?;
+    ///
+    ///     // Copy and rename the previously obtained file entry to the destination zip archive
+    ///     dst.raw_copy_file_rename(file, "new_name.txt")?;
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn raw_copy_file_rename<S>(&mut self, mut file: ZipFile, name: S) -> ZipResult<()>
+    where
+        S: Into<String>,
+    {
+        let options = FileOptions::default()
+            .last_modified_time(file.last_modified())
+            .compression_method(file.compression());
+        if let Some(perms) = file.unix_mode() {
+            options.unix_permissions(perms);
+        }
+
+        let raw_values = ZipRawValues {
+            crc32: file.crc32(),
+            compressed_size: file.compressed_size(),
+            uncompressed_size: file.size(),
+        };
+
+        self.start_entry(name, options, Some(raw_values))?;
+        self.writing_to_file = true;
+        self.writing_raw = true;
+
+        io::copy(file.get_raw_reader(), self)?;
+
+        Ok(())
+    }
+
+    /// Add a new file using the already compressed data from a ZIP file being read, this allows faster
+    /// copies of the `ZipFile` since there is no need to decompress and compress it again. Any `ZipFile`
+    /// metadata is copied and not checked, for example the file CRC.
+    ///
+    /// ```no_run
+    /// use std::fs::File;
+    /// use std::io::{Read, Seek, Write};
+    /// use zip::{ZipArchive, ZipWriter};
+    ///
+    /// fn copy<R, W>(src: &mut ZipArchive<R>, dst: &mut ZipWriter<W>) -> zip::result::ZipResult<()>
+    /// where
+    ///     R: Read + Seek,
+    ///     W: Write + Seek,
+    /// {
+    ///     // Retrieve file entry by name
+    ///     let file = src.by_name("src_file.txt")?;
+    ///
+    ///     // Copy the previously obtained file entry to the destination zip archive
+    ///     dst.raw_copy_file(file)?;
+    ///
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn raw_copy_file(&mut self, file: ZipFile) -> ZipResult<()> {
+        let name = file.name().to_owned();
+        self.raw_copy_file_rename(file, name)
+    }
+
     /// Add a directory entry.
     ///
     /// You can't write data to the file afterwards.
     pub fn add_directory<S>(&mut self, name: S, mut options: FileOptions) -> ZipResult<()>
-        where S: Into<String>
+    where
+        S: Into<String>,
     {
         if options.permissions.is_none() {
             options.permissions = Some(0o755);
@@ -294,7 +673,7 @@
             _ => name_as_string + "/",
         };
 
-        self.start_entry(name_with_slash, options)?;
+        self.start_entry(name_with_slash, options, None)?;
         self.writing_to_file = false;
         Ok(())
     }
@@ -303,44 +682,85 @@
     ///
     /// This function ensures that the '/' path seperator is used. It also ignores all non 'Normal'
     /// Components, such as a starting '/' or '..' and '.'.
-    pub fn add_directory_from_path(&mut self, path: &std::path::Path, options: FileOptions) -> ZipResult<()> {
-        self.add_directory(path_to_string(path.into()), options)
+    #[deprecated(
+        since = "0.5.7",
+        note = "by stripping `..`s from the path, the meaning of paths can change. Use `add_directory` instead."
+    )]
+    pub fn add_directory_from_path(
+        &mut self,
+        path: &std::path::Path,
+        options: FileOptions,
+    ) -> ZipResult<()> {
+        self.add_directory(path_to_string(path), options)
     }
 
     /// Finish the last file and write all other zip-structures
     ///
     /// This will return the writer, but one should normally not append any data to the end of the file.
     /// Note that the zipfile will also be finished on drop.
-    pub fn finish(&mut self) -> ZipResult<W>
-    {
+    pub fn finish(&mut self) -> ZipResult<W> {
         self.finalize()?;
         let inner = mem::replace(&mut self.inner, GenericZipWriter::Closed);
         Ok(inner.unwrap())
     }
 
-    fn finalize(&mut self) -> ZipResult<()>
-    {
+    fn finalize(&mut self) -> ZipResult<()> {
         self.finish_file()?;
 
         {
             let writer = self.inner.get_plain();
 
             let central_start = writer.seek(io::SeekFrom::Current(0))?;
-            for file in self.files.iter()
-            {
+            for file in self.files.iter() {
                 write_central_directory_header(writer, file)?;
             }
             let central_size = writer.seek(io::SeekFrom::Current(0))? - central_start;
 
-            let footer = spec::CentralDirectoryEnd
+            if self.files.len() > 0xFFFF || central_size > 0xFFFFFFFF || central_start > 0xFFFFFFFF
             {
+                let zip64_footer = spec::Zip64CentralDirectoryEnd {
+                    version_made_by: DEFAULT_VERSION as u16,
+                    version_needed_to_extract: DEFAULT_VERSION as u16,
+                    disk_number: 0,
+                    disk_with_central_directory: 0,
+                    number_of_files_on_this_disk: self.files.len() as u64,
+                    number_of_files: self.files.len() as u64,
+                    central_directory_size: central_size,
+                    central_directory_offset: central_start,
+                };
+
+                zip64_footer.write(writer)?;
+
+                let zip64_footer = spec::Zip64CentralDirectoryEndLocator {
+                    disk_with_central_directory: 0,
+                    end_of_central_directory_offset: central_start + central_size,
+                    number_of_disks: 1,
+                };
+
+                zip64_footer.write(writer)?;
+            }
+
+            let number_of_files = if self.files.len() > 0xFFFF {
+                0xFFFF
+            } else {
+                self.files.len() as u16
+            };
+            let footer = spec::CentralDirectoryEnd {
                 disk_number: 0,
                 disk_with_central_directory: 0,
-                number_of_files_on_this_disk: self.files.len() as u16,
-                number_of_files: self.files.len() as u16,
-                central_directory_size: central_size as u32,
-                central_directory_offset: central_start as u32,
-                zip_file_comment: self.comment.as_bytes().to_vec(),
+                zip_file_comment: self.comment.clone(),
+                number_of_files_on_this_disk: number_of_files,
+                number_of_files,
+                central_directory_size: if central_size > 0xFFFFFFFF {
+                    0xFFFFFFFF
+                } else {
+                    central_size as u32
+                },
+                central_directory_offset: if central_start > 0xFFFFFFFF {
+                    0xFFFFFFFF
+                } else {
+                    central_start as u32
+                },
             };
 
             footer.write(writer)?;
@@ -350,12 +770,9 @@
     }
 }
 
-impl<W: Write+io::Seek> Drop for ZipWriter<W>
-{
-    fn drop(&mut self)
-    {
-        if !self.inner.is_closed()
-        {
+impl<W: Write + io::Seek> Drop for ZipWriter<W> {
+    fn drop(&mut self) {
+        if !self.inner.is_closed() {
             if let Err(e) = self.finalize() {
                 let _ = write!(&mut io::stderr(), "ZipWriter drop failed: {:?}", e);
             }
@@ -363,34 +780,60 @@
     }
 }
 
-impl<W: Write+io::Seek> GenericZipWriter<W>
-{
-    fn switch_to(&mut self, compression: CompressionMethod) -> ZipResult<()>
-    {
+impl<W: Write + io::Seek> GenericZipWriter<W> {
+    fn switch_to(&mut self, compression: CompressionMethod) -> ZipResult<()> {
         match self.current_compression() {
             Some(method) if method == compression => return Ok(()),
-            None => Err(io::Error::new(io::ErrorKind::BrokenPipe, "ZipWriter was already closed"))?,
-            _ => {},
+            None => {
+                return Err(io::Error::new(
+                    io::ErrorKind::BrokenPipe,
+                    "ZipWriter was already closed",
+                )
+                .into())
+            }
+            _ => {}
         }
 
-        let bare = match mem::replace(self, GenericZipWriter::Closed)
-        {
+        let bare = match mem::replace(self, GenericZipWriter::Closed) {
             GenericZipWriter::Storer(w) => w,
-            #[cfg(feature = "deflate")]
+            #[cfg(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            ))]
             GenericZipWriter::Deflater(w) => w.finish()?,
             #[cfg(feature = "bzip2")]
             GenericZipWriter::Bzip2(w) => w.finish()?,
-            GenericZipWriter::Closed => Err(io::Error::new(io::ErrorKind::BrokenPipe, "ZipWriter was already closed"))?,
+            GenericZipWriter::Closed => {
+                return Err(io::Error::new(
+                    io::ErrorKind::BrokenPipe,
+                    "ZipWriter was already closed",
+                )
+                .into())
+            }
         };
 
-        *self = match compression
-        {
-            CompressionMethod::Stored => GenericZipWriter::Storer(bare),
-            #[cfg(feature = "deflate")]
-            CompressionMethod::Deflated => GenericZipWriter::Deflater(DeflateEncoder::new(bare, flate2::Compression::default())),
-            #[cfg(feature = "bzip2")]
-            CompressionMethod::Bzip2 => GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::Default)),
-            CompressionMethod::Unsupported(..) => return Err(ZipError::UnsupportedArchive("Unsupported compression")),
+        *self = {
+            #[allow(deprecated)]
+            match compression {
+                CompressionMethod::Stored => GenericZipWriter::Storer(bare),
+                #[cfg(any(
+                    feature = "deflate",
+                    feature = "deflate-miniz",
+                    feature = "deflate-zlib"
+                ))]
+                CompressionMethod::Deflated => GenericZipWriter::Deflater(DeflateEncoder::new(
+                    bare,
+                    flate2::Compression::default(),
+                )),
+                #[cfg(feature = "bzip2")]
+                CompressionMethod::Bzip2 => {
+                    GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::default()))
+                }
+                CompressionMethod::Unsupported(..) => {
+                    return Err(ZipError::UnsupportedArchive("Unsupported compression"))
+                }
+            }
         };
 
         Ok(())
@@ -399,7 +842,11 @@
     fn ref_mut(&mut self) -> Option<&mut dyn Write> {
         match *self {
             GenericZipWriter::Storer(ref mut w) => Some(w as &mut dyn Write),
-            #[cfg(feature = "deflate")]
+            #[cfg(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            ))]
             GenericZipWriter::Deflater(ref mut w) => Some(w as &mut dyn Write),
             #[cfg(feature = "bzip2")]
             GenericZipWriter::Bzip2(ref mut w) => Some(w as &mut dyn Write),
@@ -407,19 +854,15 @@
         }
     }
 
-    fn is_closed(&self) -> bool
-    {
-        match *self
-        {
+    fn is_closed(&self) -> bool {
+        match *self {
             GenericZipWriter::Closed => true,
             _ => false,
         }
     }
 
-    fn get_plain(&mut self) -> &mut W
-    {
-        match *self
-        {
+    fn get_plain(&mut self) -> &mut W {
+        match *self {
             GenericZipWriter::Storer(ref mut w) => w,
             _ => panic!("Should have switched to stored beforehand"),
         }
@@ -428,7 +871,11 @@
     fn current_compression(&self) -> Option<CompressionMethod> {
         match *self {
             GenericZipWriter::Storer(..) => Some(CompressionMethod::Stored),
-            #[cfg(feature = "deflate")]
+            #[cfg(any(
+                feature = "deflate",
+                feature = "deflate-miniz",
+                feature = "deflate-zlib"
+            ))]
             GenericZipWriter::Deflater(..) => Some(CompressionMethod::Deflated),
             #[cfg(feature = "bzip2")]
             GenericZipWriter::Bzip2(..) => Some(CompressionMethod::Bzip2),
@@ -436,26 +883,28 @@
         }
     }
 
-    fn unwrap(self) -> W
-    {
-        match self
-        {
+    fn unwrap(self) -> W {
+        match self {
             GenericZipWriter::Storer(w) => w,
             _ => panic!("Should have switched to stored beforehand"),
         }
     }
 }
 
-fn write_local_file_header<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipResult<()>
-{
+fn write_local_file_header<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipResult<()> {
     // local file header signature
     writer.write_u32::<LittleEndian>(spec::LOCAL_FILE_HEADER_SIGNATURE)?;
     // version needed to extract
     writer.write_u16::<LittleEndian>(file.version_needed())?;
     // general purpose bit flag
-    let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 };
+    let flag = if !file.file_name.is_ascii() {
+        1u16 << 11
+    } else {
+        0
+    };
     writer.write_u16::<LittleEndian>(flag)?;
     // Compression method
+    #[allow(deprecated)]
     writer.write_u16::<LittleEndian>(file.compression_method.to_u16())?;
     // last mod file time and last mod file date
     writer.write_u16::<LittleEndian>(file.last_modified_time.timepart())?;
@@ -463,34 +912,70 @@
     // crc-32
     writer.write_u32::<LittleEndian>(file.crc32)?;
     // compressed size
-    writer.write_u32::<LittleEndian>(file.compressed_size as u32)?;
+    writer.write_u32::<LittleEndian>(if file.compressed_size > 0xFFFFFFFF {
+        0xFFFFFFFF
+    } else {
+        file.compressed_size as u32
+    })?;
     // uncompressed size
-    writer.write_u32::<LittleEndian>(file.uncompressed_size as u32)?;
+    writer.write_u32::<LittleEndian>(if file.uncompressed_size > 0xFFFFFFFF {
+        0xFFFFFFFF
+    } else {
+        file.uncompressed_size as u32
+    })?;
     // file name length
     writer.write_u16::<LittleEndian>(file.file_name.as_bytes().len() as u16)?;
     // extra field length
-    let extra_field = build_extra_field(file)?;
-    writer.write_u16::<LittleEndian>(extra_field.len() as u16)?;
+    let extra_field_length = if file.large_file { 20 } else { 0 } + file.extra_field.len() as u16;
+    writer.write_u16::<LittleEndian>(extra_field_length)?;
     // file name
     writer.write_all(file.file_name.as_bytes())?;
-    // extra field
-    writer.write_all(&extra_field)?;
+    // zip64 extra field
+    if file.large_file {
+        write_local_zip64_extra_field(writer, &file)?;
+    }
 
     Ok(())
 }
 
-fn update_local_file_header<T: Write+io::Seek>(writer: &mut T, file: &ZipFileData) -> ZipResult<()>
-{
-    const CRC32_OFFSET : u64 = 14;
+fn update_local_file_header<T: Write + io::Seek>(
+    writer: &mut T,
+    file: &ZipFileData,
+) -> ZipResult<()> {
+    const CRC32_OFFSET: u64 = 14;
     writer.seek(io::SeekFrom::Start(file.header_start + CRC32_OFFSET))?;
     writer.write_u32::<LittleEndian>(file.crc32)?;
-    writer.write_u32::<LittleEndian>(file.compressed_size as u32)?;
-    writer.write_u32::<LittleEndian>(file.uncompressed_size as u32)?;
+    writer.write_u32::<LittleEndian>(if file.compressed_size > 0xFFFFFFFF {
+        if file.large_file {
+            0xFFFFFFFF
+        } else {
+            // compressed size can be slightly larger than uncompressed size
+            return Err(ZipError::Io(io::Error::new(
+                io::ErrorKind::Other,
+                "Large file option has not been set",
+            )));
+        }
+    } else {
+        file.compressed_size as u32
+    })?;
+    writer.write_u32::<LittleEndian>(if file.uncompressed_size > 0xFFFFFFFF {
+        // uncompressed size is checked on write to catch it as soon as possible
+        0xFFFFFFFF
+    } else {
+        file.uncompressed_size as u32
+    })?;
+    if file.large_file {
+        update_local_zip64_extra_field(writer, file)?;
+    }
     Ok(())
 }
 
-fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipResult<()>
-{
+fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipResult<()> {
+    // buffer zip64 extra field to determine its variable length
+    let mut zip64_extra_field = [0; 28];
+    let zip64_extra_field_length =
+        write_central_zip64_extra_field(&mut zip64_extra_field.as_mut(), file)?;
+
     // central file header signature
     writer.write_u32::<LittleEndian>(spec::CENTRAL_DIRECTORY_HEADER_SIGNATURE)?;
     // version made by
@@ -499,9 +984,14 @@
     // version needed to extract
     writer.write_u16::<LittleEndian>(file.version_needed())?;
     // general puprose bit flag
-    let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 };
+    let flag = if !file.file_name.is_ascii() {
+        1u16 << 11
+    } else {
+        0
+    };
     writer.write_u16::<LittleEndian>(flag)?;
     // compression method
+    #[allow(deprecated)]
     writer.write_u16::<LittleEndian>(file.compression_method.to_u16())?;
     // last mod file time + date
     writer.write_u16::<LittleEndian>(file.last_modified_time.timepart())?;
@@ -509,14 +999,21 @@
     // crc-32
     writer.write_u32::<LittleEndian>(file.crc32)?;
     // compressed size
-    writer.write_u32::<LittleEndian>(file.compressed_size as u32)?;
+    writer.write_u32::<LittleEndian>(if file.compressed_size > 0xFFFFFFFF {
+        0xFFFFFFFF
+    } else {
+        file.compressed_size as u32
+    })?;
     // uncompressed size
-    writer.write_u32::<LittleEndian>(file.uncompressed_size as u32)?;
+    writer.write_u32::<LittleEndian>(if file.uncompressed_size > 0xFFFFFFFF {
+        0xFFFFFFFF
+    } else {
+        file.uncompressed_size as u32
+    })?;
     // file name length
     writer.write_u16::<LittleEndian>(file.file_name.as_bytes().len() as u16)?;
     // extra field length
-    let extra_field = build_extra_field(file)?;
-    writer.write_u16::<LittleEndian>(extra_field.len() as u16)?;
+    writer.write_u16::<LittleEndian>(zip64_extra_field_length + file.extra_field.len() as u16)?;
     // file comment length
     writer.write_u16::<LittleEndian>(0)?;
     // disk number start
@@ -526,35 +1023,149 @@
     // external file attributes
     writer.write_u32::<LittleEndian>(file.external_attributes)?;
     // relative offset of local header
-    writer.write_u32::<LittleEndian>(file.header_start as u32)?;
+    writer.write_u32::<LittleEndian>(if file.header_start > 0xFFFFFFFF {
+        0xFFFFFFFF
+    } else {
+        file.header_start as u32
+    })?;
     // file name
     writer.write_all(file.file_name.as_bytes())?;
+    // zip64 extra field
+    writer.write_all(&zip64_extra_field[..zip64_extra_field_length as usize])?;
     // extra field
-    writer.write_all(&extra_field)?;
+    writer.write_all(&file.extra_field)?;
     // file comment
     // <none>
 
     Ok(())
 }
 
-fn build_extra_field(_file: &ZipFileData) -> ZipResult<Vec<u8>>
-{
-    let writer = Vec::new();
-    // Future work
-    Ok(writer)
+fn validate_extra_data(file: &ZipFileData) -> ZipResult<()> {
+    let mut data = file.extra_field.as_slice();
+
+    if data.len() > 0xFFFF {
+        return Err(ZipError::Io(io::Error::new(
+            io::ErrorKind::InvalidData,
+            "Extra data exceeds extra field",
+        )));
+    }
+
+    while data.len() > 0 {
+        let left = data.len();
+        if left < 4 {
+            return Err(ZipError::Io(io::Error::new(
+                io::ErrorKind::Other,
+                "Incomplete extra data header",
+            )));
+        }
+        let kind = data.read_u16::<LittleEndian>()?;
+        let size = data.read_u16::<LittleEndian>()? as usize;
+        let left = left - 4;
+
+        if kind == 0x0001 {
+            return Err(ZipError::Io(io::Error::new(
+                io::ErrorKind::Other,
+                "No custom ZIP64 extra data allowed",
+            )));
+        }
+
+        #[cfg(not(feature = "unreserved"))]
+        {
+            if kind <= 31 || EXTRA_FIELD_MAPPING.iter().any(|&mapped| mapped == kind) {
+                return Err(ZipError::Io(io::Error::new(
+                    io::ErrorKind::Other,
+                    format!(
+                        "Extra data header ID {:#06} requires crate feature \"unreserved\"",
+                        kind,
+                    ),
+                )));
+            }
+        }
+
+        if size > left {
+            return Err(ZipError::Io(io::Error::new(
+                io::ErrorKind::Other,
+                "Extra data size exceeds extra field",
+            )));
+        }
+
+        data = &data[size..];
+    }
+
+    Ok(())
+}
+
+fn write_local_zip64_extra_field<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipResult<()> {
+    // This entry in the Local header MUST include BOTH original
+    // and compressed file size fields.
+    writer.write_u16::<LittleEndian>(0x0001)?;
+    writer.write_u16::<LittleEndian>(16)?;
+    writer.write_u64::<LittleEndian>(file.uncompressed_size)?;
+    writer.write_u64::<LittleEndian>(file.compressed_size)?;
+    // Excluded fields:
+    // u32: disk start number
+    Ok(())
+}
+
+fn update_local_zip64_extra_field<T: Write + io::Seek>(
+    writer: &mut T,
+    file: &ZipFileData,
+) -> ZipResult<()> {
+    let zip64_extra_field = file.header_start + 30 + file.file_name.as_bytes().len() as u64;
+    writer.seek(io::SeekFrom::Start(zip64_extra_field + 4))?;
+    writer.write_u64::<LittleEndian>(file.uncompressed_size)?;
+    writer.write_u64::<LittleEndian>(file.compressed_size)?;
+    // Excluded fields:
+    // u32: disk start number
+    Ok(())
+}
+
+fn write_central_zip64_extra_field<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipResult<u16> {
+    // The order of the fields in the zip64 extended
+    // information record is fixed, but the fields MUST
+    // only appear if the corresponding Local or Central
+    // directory record field is set to 0xFFFF or 0xFFFFFFFF.
+    let mut size = 0;
+    let uncompressed_size = file.uncompressed_size > 0xFFFFFFFF;
+    let compressed_size = file.compressed_size > 0xFFFFFFFF;
+    let header_start = file.header_start > 0xFFFFFFFF;
+    if uncompressed_size {
+        size += 8;
+    }
+    if compressed_size {
+        size += 8;
+    }
+    if header_start {
+        size += 8;
+    }
+    if size > 0 {
+        writer.write_u16::<LittleEndian>(0x0001)?;
+        writer.write_u16::<LittleEndian>(size)?;
+        size += 4;
+
+        if uncompressed_size {
+            writer.write_u64::<LittleEndian>(file.uncompressed_size)?;
+        }
+        if compressed_size {
+            writer.write_u64::<LittleEndian>(file.compressed_size)?;
+        }
+        if header_start {
+            writer.write_u64::<LittleEndian>(file.header_start)?;
+        }
+        // Excluded fields:
+        // u32: disk start number
+    }
+    Ok(size)
 }
 
 fn path_to_string(path: &std::path::Path) -> String {
     let mut path_str = String::new();
     for component in path.components() {
-        match component {
-            std::path::Component::Normal(os_str) => {
-                if path_str.len() != 0 {
-                    path_str.push('/');
-                }
-                path_str.push_str(&*os_str.to_string_lossy());
+        if let std::path::Component::Normal(os_str) = component {
+            if !path_str.is_empty() {
+                path_str.push('/');
             }
-            _ => (),
+            path_str.push_str(&*os_str.to_string_lossy());
         }
     }
     path_str
@@ -562,11 +1173,11 @@
 
 #[cfg(test)]
 mod test {
-    use std::io;
-    use std::io::Write;
-    use crate::types::DateTime;
     use super::{FileOptions, ZipWriter};
     use crate::compression::CompressionMethod;
+    use crate::types::DateTime;
+    use std::io;
+    use std::io::Write;
 
     #[test]
     fn write_empty_zip() {
@@ -574,24 +1185,38 @@
         writer.set_comment("ZIP");
         let result = writer.finish().unwrap();
         assert_eq!(result.get_ref().len(), 25);
-        assert_eq!(*result.get_ref(), [80, 75, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 90, 73, 80]);
+        assert_eq!(
+            *result.get_ref(),
+            [80, 75, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 90, 73, 80]
+        );
     }
 
     #[test]
     fn write_zip_dir() {
         let mut writer = ZipWriter::new(io::Cursor::new(Vec::new()));
-        writer.add_directory("test", FileOptions::default().last_modified_time(
-            DateTime::from_date_and_time(2018, 8, 15, 20, 45, 6).unwrap()
-        )).unwrap();
-        assert!(writer.write(b"writing to a directory is not allowed, and will not write any data").is_err());
+        writer
+            .add_directory(
+                "test",
+                FileOptions::default().last_modified_time(
+                    DateTime::from_date_and_time(2018, 8, 15, 20, 45, 6).unwrap(),
+                ),
+            )
+            .unwrap();
+        assert!(writer
+            .write(b"writing to a directory is not allowed, and will not write any data")
+            .is_err());
         let result = writer.finish().unwrap();
-        assert_eq!(result.get_ref().len(), 114);
-        assert_eq!(*result.get_ref(), &[
-            80u8, 75, 3, 4, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 116,
-            101, 115, 116, 47, 80, 75, 1, 2, 46, 3, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 237, 65, 0, 0, 0, 0, 116, 101, 115, 116, 47, 80, 75, 5, 6,
-            0, 0, 0, 0, 1, 0, 1, 0, 51, 0, 0, 0, 35, 0, 0, 0, 6, 0, 122, 105, 112, 45, 114, 115
-        ] as &[u8]);
+        assert_eq!(result.get_ref().len(), 108);
+        assert_eq!(
+            *result.get_ref(),
+            &[
+                80u8, 75, 3, 4, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 5, 0, 0, 0, 116, 101, 115, 116, 47, 80, 75, 1, 2, 46, 3, 20, 0, 0, 0, 0, 0,
+                163, 165, 15, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 237, 65, 0, 0, 0, 0, 116, 101, 115, 116, 47, 80, 75, 5, 6, 0, 0, 0, 0, 1, 0,
+                1, 0, 51, 0, 0, 0, 35, 0, 0, 0, 0, 0,
+            ] as &[u8]
+        );
     }
 
     #[test]
@@ -601,11 +1226,15 @@
             compression_method: CompressionMethod::Stored,
             last_modified_time: DateTime::default(),
             permissions: Some(33188),
+            large_file: false,
         };
         writer.start_file("mimetype", options).unwrap();
-        writer.write(b"application/vnd.oasis.opendocument.text").unwrap();
+        writer
+            .write(b"application/vnd.oasis.opendocument.text")
+            .unwrap();
         let result = writer.finish().unwrap();
-        assert_eq!(result.get_ref().len(), 159);
+
+        assert_eq!(result.get_ref().len(), 153);
         let mut v = Vec::new();
         v.extend_from_slice(include_bytes!("../tests/data/mimetype.zip"));
         assert_eq!(result.get_ref(), &v);
@@ -614,8 +1243,10 @@
     #[test]
     fn path_to_string() {
         let mut path = std::path::PathBuf::new();
-        #[cfg(windows)] path.push(r"C:\");
-        #[cfg(unix)] path.push("/");
+        #[cfg(windows)]
+        path.push(r"C:\");
+        #[cfg(unix)]
+        path.push("/");
         path.push("windows");
         path.push("..");
         path.push(".");
@@ -624,3 +1255,12 @@
         assert_eq!(path_str, "windows/system32");
     }
 }
+
+#[cfg(not(feature = "unreserved"))]
+const EXTRA_FIELD_MAPPING: [u16; 49] = [
+    0x0001, 0x0007, 0x0008, 0x0009, 0x000a, 0x000c, 0x000d, 0x000e, 0x000f, 0x0014, 0x0015, 0x0016,
+    0x0017, 0x0018, 0x0019, 0x0020, 0x0021, 0x0022, 0x0023, 0x0065, 0x0066, 0x4690, 0x07c8, 0x2605,
+    0x2705, 0x2805, 0x334d, 0x4341, 0x4453, 0x4704, 0x470f, 0x4b46, 0x4c41, 0x4d49, 0x4f4c, 0x5356,
+    0x5455, 0x554e, 0x5855, 0x6375, 0x6542, 0x7075, 0x756e, 0x7855, 0xa11e, 0xa220, 0xfd4a, 0x9901,
+    0x9902,
+];
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/zipcrypto.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/zipcrypto.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/src/zipcrypto.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/src/zipcrypto.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,184 @@
+//! Implementation of the ZipCrypto algorithm
+//!
+//! The following paper was used to implement the ZipCrypto algorithm:
+//! [https://courses.cs.ut.ee/MTAT.07.022/2015_fall/uploads/Main/dmitri-report-f15-16.pdf](https://courses.cs.ut.ee/MTAT.07.022/2015_fall/uploads/Main/dmitri-report-f15-16.pdf)
+
+use std::num::Wrapping;
+
+/// A container to hold the current key state
+struct ZipCryptoKeys {
+    key_0: Wrapping<u32>,
+    key_1: Wrapping<u32>,
+    key_2: Wrapping<u32>,
+}
+
+impl ZipCryptoKeys {
+    fn new() -> ZipCryptoKeys {
+        ZipCryptoKeys {
+            key_0: Wrapping(0x12345678),
+            key_1: Wrapping(0x23456789),
+            key_2: Wrapping(0x34567890),
+        }
+    }
+
+    fn update(&mut self, input: u8) {
+        self.key_0 = ZipCryptoKeys::crc32(self.key_0, input);
+        self.key_1 =
+            (self.key_1 + (self.key_0 & Wrapping(0xff))) * Wrapping(0x08088405) + Wrapping(1);
+        self.key_2 = ZipCryptoKeys::crc32(self.key_2, (self.key_1 >> 24).0 as u8);
+    }
+
+    fn stream_byte(&mut self) -> u8 {
+        let temp: Wrapping<u16> = Wrapping(self.key_2.0 as u16) | Wrapping(3);
+        ((temp * (temp ^ Wrapping(1))) >> 8).0 as u8
+    }
+
+    fn decrypt_byte(&mut self, cipher_byte: u8) -> u8 {
+        let plain_byte: u8 = self.stream_byte() ^ cipher_byte;
+        self.update(plain_byte);
+        plain_byte
+    }
+
+    #[allow(dead_code)]
+    fn encrypt_byte(&mut self, plain_byte: u8) -> u8 {
+        let cipher_byte: u8 = self.stream_byte() ^ plain_byte;
+        self.update(plain_byte);
+        cipher_byte
+    }
+
+    fn crc32(crc: Wrapping<u32>, input: u8) -> Wrapping<u32> {
+        return (crc >> 8) ^ Wrapping(CRCTABLE[((crc & Wrapping(0xff)).0 as u8 ^ input) as usize]);
+    }
+}
+
+/// A ZipCrypto reader with unverified password
+pub struct ZipCryptoReader<R> {
+    file: R,
+    keys: ZipCryptoKeys,
+}
+
+pub enum ZipCryptoValidator {
+    PkzipCrc32(u32),
+    InfoZipMsdosTime(u16),
+}
+
+impl<R: std::io::Read> ZipCryptoReader<R> {
+    /// Note: The password is `&[u8]` and not `&str` because the
+    /// [zip specification](https://pkware.cachefly.net/webdocs/APPNOTE/APPNOTE-6.3.3.TXT)
+    /// does not specify password encoding (see function `update_keys` in the specification).
+    /// Therefore, if `&str` was used, the password would be UTF-8 and it
+    /// would be impossible to decrypt files that were encrypted with a
+    /// password byte sequence that is unrepresentable in UTF-8.
+    pub fn new(file: R, password: &[u8]) -> ZipCryptoReader<R> {
+        let mut result = ZipCryptoReader {
+            file: file,
+            keys: ZipCryptoKeys::new(),
+        };
+
+        // Key the cipher by updating the keys with the password.
+        for byte in password.iter() {
+            result.keys.update(*byte);
+        }
+
+        result
+    }
+
+    /// Read the ZipCrypto header bytes and validate the password.
+    pub fn validate(
+        mut self,
+        validator: ZipCryptoValidator,
+    ) -> Result<Option<ZipCryptoReaderValid<R>>, std::io::Error> {
+        // ZipCrypto prefixes a file with a 12 byte header
+        let mut header_buf = [0u8; 12];
+        self.file.read_exact(&mut header_buf)?;
+        for byte in header_buf.iter_mut() {
+            *byte = self.keys.decrypt_byte(*byte);
+        }
+
+        match validator {
+            ZipCryptoValidator::PkzipCrc32(crc32_plaintext) => {
+                // PKZIP before 2.0 used 2 byte CRC check.
+                // PKZIP 2.0+ used 1 byte CRC check. It's more secure.
+                // We also use 1 byte CRC.
+
+                if (crc32_plaintext >> 24) as u8 != header_buf[11] {
+                    return Ok(None); // Wrong password
+                }
+            }
+            ZipCryptoValidator::InfoZipMsdosTime(last_mod_time) => {
+                // Info-ZIP modification to ZipCrypto format:
+                // If bit 3 of the general purpose bit flag is set
+                // (indicates that the file uses a data-descriptor section),
+                // it uses high byte of 16-bit File Time.
+                // Info-ZIP code probably writes 2 bytes of File Time.
+                // We check only 1 byte.
+
+                if (last_mod_time >> 8) as u8 != header_buf[11] {
+                    return Ok(None); // Wrong password
+                }
+            }
+        }
+
+        Ok(Some(ZipCryptoReaderValid { reader: self }))
+    }
+}
+
+/// A ZipCrypto reader with verified password
+pub struct ZipCryptoReaderValid<R> {
+    reader: ZipCryptoReader<R>,
+}
+
+impl<R: std::io::Read> std::io::Read for ZipCryptoReaderValid<R> {
+    fn read(&mut self, mut buf: &mut [u8]) -> std::io::Result<usize> {
+        // Note: There might be potential for optimization. Inspiration can be found at:
+        // https://github.com/kornelski/7z/blob/master/CPP/7zip/Crypto/ZipCrypto.cpp
+
+        let result = self.reader.file.read(&mut buf);
+        for byte in buf.iter_mut() {
+            *byte = self.reader.keys.decrypt_byte(*byte);
+        }
+        result
+    }
+}
+
+impl<R: std::io::Read> ZipCryptoReaderValid<R> {
+    /// Consumes this decoder, returning the underlying reader.
+    pub fn into_inner(self) -> R {
+        self.reader.file
+    }
+}
+
+static CRCTABLE: [u32; 256] = [
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+    0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+    0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+    0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+    0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+    0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+    0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+    0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+    0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+    0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+    0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+    0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+    0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+    0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+    0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+    0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+    0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+    0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
+];
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/data/comment_garbage.zip and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/data/comment_garbage.zip differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/data/invalid_offset2.zip and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/data/invalid_offset2.zip differ
Binary files /tmp/tmpcp8tdlnd/ZWldB0Aj0I/thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/data/mimetype.zip and /tmp/tmpcp8tdlnd/xD02FT554j/thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/data/mimetype.zip differ
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/end_to_end.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/end_to_end.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/end_to_end.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/end_to_end.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,8 +1,10 @@
+use byteorder::{LittleEndian, WriteBytesExt};
+use std::collections::HashSet;
 use std::io::prelude::*;
-use zip::write::FileOptions;
-use std::io::Cursor;
+use std::io::{Cursor, Seek};
 use std::iter::FromIterator;
-use std::collections::HashSet;
+use zip::write::FileOptions;
+use zip::CompressionMethod;
 
 // This test asserts that after creating a zip file, then reading its contents back out,
 // the extracted data will *always* be exactly the same as the original data.
@@ -10,49 +12,140 @@
 fn end_to_end() {
     let file = &mut Cursor::new(Vec::new());
 
-    write_to_zip_file(file).expect("file written");
+    write_to_zip(file).expect("file written");
 
-    let file_contents: String = read_zip_file(file).unwrap();
+    check_zip_contents(file, ENTRY_NAME);
+}
 
-    assert!(file_contents.as_bytes() == LOREM_IPSUM);
+// This test asserts that after copying a `ZipFile` to a new `ZipWriter`, then reading its
+// contents back out, the extracted data will *always* be exactly the same as the original data.
+#[test]
+fn copy() {
+    let src_file = &mut Cursor::new(Vec::new());
+    write_to_zip(src_file).expect("file written");
+
+    let mut tgt_file = &mut Cursor::new(Vec::new());
+
+    {
+        let mut src_archive = zip::ZipArchive::new(src_file).unwrap();
+        let mut zip = zip::ZipWriter::new(&mut tgt_file);
+
+        {
+            let file = src_archive.by_name(ENTRY_NAME).expect("file found");
+            zip.raw_copy_file(file).unwrap();
+        }
+
+        {
+            let file = src_archive.by_name(ENTRY_NAME).expect("file found");
+            zip.raw_copy_file_rename(file, COPY_ENTRY_NAME).unwrap();
+        }
+    }
+
+    let mut tgt_archive = zip::ZipArchive::new(tgt_file).unwrap();
+
+    check_zip_file_contents(&mut tgt_archive, ENTRY_NAME);
+    check_zip_file_contents(&mut tgt_archive, COPY_ENTRY_NAME);
+}
+
+// This test asserts that after appending to a `ZipWriter`, then reading its contents back out,
+// both the prior data and the appended data will be exactly the same as their originals.
+#[test]
+fn append() {
+    let mut file = &mut Cursor::new(Vec::new());
+    write_to_zip(file).expect("file written");
+
+    {
+        let mut zip = zip::ZipWriter::new_append(&mut file).unwrap();
+        zip.start_file(COPY_ENTRY_NAME, Default::default()).unwrap();
+        zip.write_all(LOREM_IPSUM).unwrap();
+        zip.finish().unwrap();
+    }
+
+    let mut zip = zip::ZipArchive::new(&mut file).unwrap();
+    check_zip_file_contents(&mut zip, ENTRY_NAME);
+    check_zip_file_contents(&mut zip, COPY_ENTRY_NAME);
 }
 
-fn write_to_zip_file(file: &mut Cursor<Vec<u8>>) -> zip::result::ZipResult<()> {
+fn write_to_zip(file: &mut Cursor<Vec<u8>>) -> zip::result::ZipResult<()> {
     let mut zip = zip::ZipWriter::new(file);
 
     zip.add_directory("test/", Default::default())?;
 
     let options = FileOptions::default()
-        .compression_method(zip::CompressionMethod::Stored)
+        .compression_method(CompressionMethod::Stored)
         .unix_permissions(0o755);
     zip.start_file("test/☃.txt", options)?;
     zip.write_all(b"Hello, World!\n")?;
 
-    zip.start_file("test/lorem_ipsum.txt", Default::default())?;
+    zip.start_file_with_extra_data("test_with_extra_data/�.txt", Default::default())?;
+    zip.write_u16::<LittleEndian>(0xbeef)?;
+    zip.write_u16::<LittleEndian>(EXTRA_DATA.len() as u16)?;
+    zip.write_all(EXTRA_DATA)?;
+    zip.end_extra_data()?;
+    zip.write_all(b"Hello, World! Again.\n")?;
+
+    zip.start_file(ENTRY_NAME, Default::default())?;
     zip.write_all(LOREM_IPSUM)?;
 
     zip.finish()?;
     Ok(())
 }
 
-fn read_zip_file(zip_file: &mut Cursor<Vec<u8>>) -> zip::result::ZipResult<String> {
+fn read_zip<R: Read + Seek>(zip_file: R) -> zip::result::ZipResult<zip::ZipArchive<R>> {
     let mut archive = zip::ZipArchive::new(zip_file).unwrap();
 
-    let expected_file_names = [ "test/", "test/☃.txt", "test/lorem_ipsum.txt" ];
-    let expected_file_names = HashSet::from_iter(expected_file_names.iter().copied());
+    let expected_file_names = [
+        "test/",
+        "test/☃.txt",
+        "test_with_extra_data/�.txt",
+        ENTRY_NAME,
+    ];
+    let expected_file_names = HashSet::from_iter(expected_file_names.iter().map(|&v| v));
     let file_names = archive.file_names().collect::<HashSet<_>>();
     assert_eq!(file_names, expected_file_names);
 
-    let mut file = archive.by_name("test/lorem_ipsum.txt")?;
+    {
+        let file_with_extra_data = archive.by_name("test_with_extra_data/�.txt")?;
+        let mut extra_data = Vec::new();
+        extra_data.write_u16::<LittleEndian>(0xbeef)?;
+        extra_data.write_u16::<LittleEndian>(EXTRA_DATA.len() as u16)?;
+        extra_data.write_all(EXTRA_DATA)?;
+        assert_eq!(file_with_extra_data.extra_data(), extra_data.as_slice());
+    }
+
+    Ok(archive)
+}
+
+fn read_zip_file<R: Read + Seek>(
+    archive: &mut zip::ZipArchive<R>,
+    name: &str,
+) -> zip::result::ZipResult<String> {
+    let mut file = archive.by_name(name)?;
 
     let mut contents = String::new();
     file.read_to_string(&mut contents).unwrap();
     Ok(contents)
 }
 
+fn check_zip_contents(zip_file: &mut Cursor<Vec<u8>>, name: &str) {
+    let mut archive = read_zip(zip_file).unwrap();
+    check_zip_file_contents(&mut archive, name);
+}
+
+fn check_zip_file_contents<R: Read + Seek>(archive: &mut zip::ZipArchive<R>, name: &str) {
+    let file_contents: String = read_zip_file(archive, name).unwrap();
+    assert!(file_contents.as_bytes() == LOREM_IPSUM);
+}
+
 const LOREM_IPSUM : &'static [u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tellus elit, tristique vitae mattis egestas, ultricies vitae risus. Quisque sit amet quam ut urna aliquet
 molestie. Proin blandit ornare dui, a tempor nisl accumsan in. Praesent a consequat felis. Morbi metus diam, auctor in auctor vel, feugiat id odio. Curabitur ex ex,
 dictum quis auctor quis, suscipit id lorem. Aliquam vestibulum dolor nec enim vehicula, porta tristique augue tincidunt. Vivamus ut gravida est. Sed pellentesque, dolor
 vitae tristique consectetur, neque lectus pulvinar dui, sed feugiat purus diam id lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
 inceptos himenaeos. Maecenas feugiat velit in ex ultrices scelerisque id id neque.
 ";
+
+const EXTRA_DATA: &'static [u8] = b"Extra Data";
+
+const ENTRY_NAME: &str = "test/lorem_ipsum.txt";
+
+const COPY_ENTRY_NAME: &str = "test/lorem_ipsum_renamed.txt";
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/invalid_date.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/invalid_date.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/invalid_date.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/invalid_date.rs	2021-12-09 12:01:27.000000000 +0000
@@ -1,26 +1,21 @@
-use zip::read::ZipArchive;
 use std::io::Cursor;
+use zip::read::ZipArchive;
 
-const BUF : &[u8] = &[
-  0x50, 0x4b, 0x03, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69,
-  0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2f,
-  0x55, 0x54, 0x09, 0x00, 0x03, 0xf4, 0x5c, 0x88, 0x5a, 0xf4, 0x5c, 0x88,
-  0x5a, 0x75, 0x78, 0x0b, 0x00, 0x01, 0x04, 0xe8, 0x03, 0x00, 0x00, 0x04,
-  0x0a, 0x00, 0x00, 0x00, 0x50, 0x4b, 0x01, 0x02, 0x1e, 0x03, 0x0a, 0x00,
-  0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, // time part: 0 seconds, 0 minutes, 0 hours
-  0x00, 0x00, // date part: day 0 (invalid), month 0 (invalid), year 0 (1980)
-  0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x18, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xed, 0x41, 0x00, 0x00,
-  0x00, 0x00, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x74, 0x69,
-  0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2f, 0x55, 0x54, 0x05, 0x00,
-  0x03, 0xf4, 0x5c, 0x88, 0x5a, 0x75, 0x78, 0x0b, 0x00, 0x01, 0x04, 0xe8,
-  0x03, 0x00, 0x00, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x50, 0x4b, 0x05, 0x06,
-  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x58, 0x00, 0x00, 0x00,
-  0x4c, 0x00, 0x00, 0x00, 0x00, 0x00
+const BUF: &[u8] = &[
+    0x50, 0x4b, 0x03, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x69, 0x6e,
+    0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2f,
+    0x55, 0x54, 0x09, 0x00, 0x03, 0xf4, 0x5c, 0x88, 0x5a, 0xf4, 0x5c, 0x88, 0x5a, 0x75, 0x78, 0x0b,
+    0x00, 0x01, 0x04, 0xe8, 0x03, 0x00, 0x00, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x50, 0x4b, 0x01, 0x02,
+    0x1e, 0x03, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, // time part: 0 seconds, 0 minutes, 0 hours
+    0x00, 0x00, // date part: day 0 (invalid), month 0 (invalid), year 0 (1980)
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x18, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xed, 0x41, 0x00, 0x00, 0x00, 0x00, 0x69, 0x6e,
+    0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2f,
+    0x55, 0x54, 0x05, 0x00, 0x03, 0xf4, 0x5c, 0x88, 0x5a, 0x75, 0x78, 0x0b, 0x00, 0x01, 0x04, 0xe8,
+    0x03, 0x00, 0x00, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x00, 0x01, 0x00, 0x58, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00,
 ];
 
 #[test]
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/zip64_large.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/zip64_large.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/zip64_large.rs	2021-11-19 11:57:13.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/zip64_large.rs	2021-12-09 12:01:27.000000000 +0000
@@ -53,10 +53,10 @@
 // 22c400260  00 00 50 4b 05 06 00 00  00 00 03 00 03 00 27 01  |..PK..........'.|
 // 22c400270  00 00 ff ff ff ff 00 00                           |........|
 // 22c400278
-use std::io::{self, Seek, SeekFrom, Read};
+use std::io::{self, Read, Seek, SeekFrom};
 
-const BLOCK1_LENGTH : u64 = 0x60;
-const BLOCK1 : [u8; BLOCK1_LENGTH as usize] = [
+const BLOCK1_LENGTH: u64 = 0x60;
+const BLOCK1: [u8; BLOCK1_LENGTH as usize] = [
     0x50, 0x4b, 0x03, 0x04, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x6e, 0x51, 0x4d, 0x66, 0x82,
     0x13, 0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x08, 0x00, 0x30, 0x00, 0x7a, 0x65,
     0x72, 0x6f, 0x34, 0x34, 0x30, 0x30, 0x55, 0x54, 0x09, 0x00, 0x03, 0xa5, 0x21, 0xc7, 0x5b, 0xdb,
@@ -65,8 +65,8 @@
     0x00, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 ];
 
-const BLOCK2_LENGTH : u64 = 0x50;
-const BLOCK2 : [u8; BLOCK2_LENGTH as usize] = [
+const BLOCK2_LENGTH: u64 = 0x50;
+const BLOCK2: [u8; BLOCK2_LENGTH as usize] = [
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x4b, 0x03, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x2b, 0x6e, 0x51, 0x4d, 0x98, 0x23, 0x28, 0x4b, 0x00, 0x00, 0x40, 0x06, 0x00, 0x00, 0x40, 0x06,
     0x07, 0x00, 0x1c, 0x00, 0x7a, 0x65, 0x72, 0x6f, 0x31, 0x30, 0x30, 0x55, 0x54, 0x09, 0x00, 0x03,
@@ -74,8 +74,8 @@
     0x00, 0x00, 0x04, 0xe8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 ];
 
-const BLOCK3_LENGTH : u64 = 0x60;
-const BLOCK3 : [u8; BLOCK3_LENGTH as usize] = [
+const BLOCK3_LENGTH: u64 = 0x60;
+const BLOCK3: [u8; BLOCK3_LENGTH as usize] = [
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x4b, 0x03, 0x04, 0x2d, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x3b, 0x6e, 0x51, 0x4d, 0x66, 0x82, 0x13, 0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0x0a, 0x00, 0x30, 0x00, 0x7a, 0x65, 0x72, 0x6f, 0x34, 0x34, 0x30, 0x30, 0x5f, 0x32, 0x55,
@@ -84,8 +84,8 @@
     0x00, 0x00, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00,
 ];
 
-const BLOCK4_LENGTH : u64 = 0x198;
-const BLOCK4 : [u8; BLOCK4_LENGTH as usize] = [
+const BLOCK4_LENGTH: u64 = 0x198;
+const BLOCK4: [u8; BLOCK4_LENGTH as usize] = [
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
     0x4b, 0x01, 0x02, 0x1e, 0x03, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x6e, 0x51, 0x4d, 0x66,
     0x82, 0x13, 0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x08, 0x00, 0x2c, 0x00, 0x00,
@@ -114,17 +114,17 @@
     0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
 ];
 
-const BLOCK1_START : u64 = 0x000000000;
-const BLOCK2_START : u64 = 0x113000050;
-const BLOCK3_START : u64 = 0x119400090;
-const BLOCK4_START : u64 = 0x22c4000e0;
-
-const BLOCK1_END : u64 = BLOCK1_START + BLOCK1_LENGTH - 1;
-const BLOCK2_END : u64 = BLOCK2_START + BLOCK2_LENGTH - 1;
-const BLOCK3_END : u64 = BLOCK3_START + BLOCK3_LENGTH - 1;
-const BLOCK4_END : u64 = BLOCK4_START + BLOCK4_LENGTH - 1;
+const BLOCK1_START: u64 = 0x000000000;
+const BLOCK2_START: u64 = 0x113000050;
+const BLOCK3_START: u64 = 0x119400090;
+const BLOCK4_START: u64 = 0x22c4000e0;
+
+const BLOCK1_END: u64 = BLOCK1_START + BLOCK1_LENGTH - 1;
+const BLOCK2_END: u64 = BLOCK2_START + BLOCK2_LENGTH - 1;
+const BLOCK3_END: u64 = BLOCK3_START + BLOCK3_LENGTH - 1;
+const BLOCK4_END: u64 = BLOCK4_START + BLOCK4_LENGTH - 1;
 
-const TOTAL_LENGTH : u64 = BLOCK4_START + BLOCK4_LENGTH;
+const TOTAL_LENGTH: u64 = BLOCK4_START + BLOCK4_LENGTH;
 
 struct Zip64File {
     pointer: u64,
@@ -139,20 +139,22 @@
 impl Seek for Zip64File {
     fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
         match pos {
-            SeekFrom::Start(offset) => { self.pointer = offset; },
+            SeekFrom::Start(offset) => {
+                self.pointer = offset;
+            }
             SeekFrom::End(offset) => {
                 if offset > 0 || offset < -(TOTAL_LENGTH as i64) {
                     return Err(io::Error::new(io::ErrorKind::Other, "Invalid seek offset"));
                 }
                 self.pointer = (TOTAL_LENGTH as i64 + offset) as u64;
-            },
+            }
             SeekFrom::Current(offset) => {
                 let seekpos = self.pointer as i64 + offset;
                 if seekpos < 0 || seekpos as u64 > TOTAL_LENGTH {
                     return Err(io::Error::new(io::ErrorKind::Other, "Invalid seek offset"));
                 }
                 self.pointer = seekpos as u64;
-            },
+            }
         }
         Ok(self.pointer)
     }
@@ -164,21 +166,21 @@
             return Ok(0);
         }
         match self.pointer {
-            BLOCK1_START ..= BLOCK1_END => {
+            BLOCK1_START..=BLOCK1_END => {
                 buf[0] = BLOCK1[(self.pointer - BLOCK1_START) as usize];
-            },
-            BLOCK2_START ..= BLOCK2_END => {
+            }
+            BLOCK2_START..=BLOCK2_END => {
                 buf[0] = BLOCK2[(self.pointer - BLOCK2_START) as usize];
-            },
-            BLOCK3_START ..= BLOCK3_END => {
+            }
+            BLOCK3_START..=BLOCK3_END => {
                 buf[0] = BLOCK3[(self.pointer - BLOCK3_START) as usize];
-            },
-            BLOCK4_START ..= BLOCK4_END => {
+            }
+            BLOCK4_START..=BLOCK4_END => {
                 buf[0] = BLOCK4[(self.pointer - BLOCK4_START) as usize];
-            },
+            }
             _ => {
                 buf[0] = 0;
-            },
+            }
         }
         self.pointer += 1;
         Ok(1)
@@ -193,8 +195,13 @@
 
     for i in 0..archive.len() {
         let mut file = archive.by_index(i).unwrap();
-        let outpath = file.sanitized_name();
-        println!("Entry {} has name \"{}\" ({} bytes)", i, outpath.as_path().display(), file.size());
+        let outpath = file.enclosed_name().unwrap();
+        println!(
+            "Entry {} has name \"{}\" ({} bytes)",
+            i,
+            outpath.display(),
+            file.size()
+        );
 
         match file.read_exact(&mut buf) {
             Ok(()) => println!("The first {} bytes are: {:?}", buf.len(), buf),
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/zip_comment_garbage.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/zip_comment_garbage.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/zip_comment_garbage.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/zip_comment_garbage.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,30 @@
+// Some zip files can contain garbage after the comment. For example, python zipfile generates
+// it when opening a zip in 'a' mode:
+//
+// >>> from zipfile import ZipFile
+// >>> with ZipFile('comment_garbage.zip', 'a') as z:
+// ...     z.comment = b'long comment bla bla bla'
+// ...
+// >>> with ZipFile('comment_garbage.zip', 'a') as z:
+// ...     z.comment = b'short.'
+// ...
+// >>>
+//
+// Hexdump:
+//
+// 00000000  50 4b 05 06 00 00 00 00  00 00 00 00 00 00 00 00  |PK..............|
+// 00000010  00 00 00 00 06 00 73 68  6f 72 74 2e 6f 6d 6d 65  |......short.omme|
+// 00000020  6e 74 20 62 6c 61 20 62  6c 61 20 62 6c 61        |nt bla bla bla|
+// 0000002e
+
+use std::io;
+use zip::ZipArchive;
+
+#[test]
+fn correctly_handle_zip_with_garbage_after_comment() {
+    let mut v = Vec::new();
+    v.extend_from_slice(include_bytes!("../tests/data/comment_garbage.zip"));
+    let archive = ZipArchive::new(io::Cursor::new(v)).expect("couldn't open test zip file");
+
+    assert_eq!(archive.comment(), "short.".as_bytes());
+}
diff -Nru thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/zip_crypto.rs thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/zip_crypto.rs
--- thunderbird-91.3.2+build1/third_party/dump_syms/vendor/zip/tests/zip_crypto.rs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/dump_syms/vendor/zip/tests/zip_crypto.rs	2021-12-09 12:01:27.000000000 +0000
@@ -0,0 +1,85 @@
+// The following is a hexdump of a zip file containing the following
+// ZipCrypto encrypted file:
+// test.txt: 35 bytes, contents: `abcdefghijklmnopqrstuvwxyz123456789`, password: `test`
+//
+// 00000000  50 4b 03 04 14 00 01 00  00 00 54 bd b5 50 2f 20  |PK........T..P/ |
+// 00000010  79 55 2f 00 00 00 23 00  00 00 08 00 00 00 74 65  |yU/...#.......te|
+// 00000020  73 74 2e 74 78 74 ca 2d  1d 27 19 19 63 43 77 9a  |st.txt.-.'..cCw.|
+// 00000030  71 76 c9 ec d1 6f d9 f5  22 67 b3 8f 52 b5 41 bc  |qv...o.."g..R.A.|
+// 00000040  5c 36 f2 1d 84 c3 c0 28  3b fd e1 70 c2 cc 0c 11  |\6.....(;..p....|
+// 00000050  0c c5 95 2f a4 50 4b 01  02 3f 00 14 00 01 00 00  |.../.PK..?......|
+// 00000060  00 54 bd b5 50 2f 20 79  55 2f 00 00 00 23 00 00  |.T..P/ yU/...#..|
+// 00000070  00 08 00 24 00 00 00 00  00 00 00 20 00 00 00 00  |...$....... ....|
+// 00000080  00 00 00 74 65 73 74 2e  74 78 74 0a 00 20 00 00  |...test.txt.. ..|
+// 00000090  00 00 00 01 00 18 00 31  b2 3b bf b8 2f d6 01 31  |.......1.;../..1|
+// 000000a0  b2 3b bf b8 2f d6 01 a8  c4 45 bd b8 2f d6 01 50  |.;../....E../..P|
+// 000000b0  4b 05 06 00 00 00 00 01  00 01 00 5a 00 00 00 55  |K..........Z...U|
+// 000000c0  00 00 00 00 00                                    |.....|
+// 000000c5
+
+use std::io::Cursor;
+use std::io::Read;
+
+#[test]
+fn encrypted_file() {
+    let zip_file_bytes = &mut Cursor::new(vec![
+        0x50, 0x4b, 0x03, 0x04, 0x14, 0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0xbd, 0xb5, 0x50, 0x2f,
+        0x20, 0x79, 0x55, 0x2f, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+        0x74, 0x65, 0x73, 0x74, 0x2e, 0x74, 0x78, 0x74, 0xca, 0x2d, 0x1d, 0x27, 0x19, 0x19, 0x63,
+        0x43, 0x77, 0x9a, 0x71, 0x76, 0xc9, 0xec, 0xd1, 0x6f, 0xd9, 0xf5, 0x22, 0x67, 0xb3, 0x8f,
+        0x52, 0xb5, 0x41, 0xbc, 0x5c, 0x36, 0xf2, 0x1d, 0x84, 0xc3, 0xc0, 0x28, 0x3b, 0xfd, 0xe1,
+        0x70, 0xc2, 0xcc, 0x0c, 0x11, 0x0c, 0xc5, 0x95, 0x2f, 0xa4, 0x50, 0x4b, 0x01, 0x02, 0x3f,
+        0x00, 0x14, 0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0xbd, 0xb5, 0x50, 0x2f, 0x20, 0x79, 0x55,
+        0x2f, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x08, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x65, 0x73, 0x74,
+        0x2e, 0x74, 0x78, 0x74, 0x0a, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18,
+        0x00, 0x31, 0xb2, 0x3b, 0xbf, 0xb8, 0x2f, 0xd6, 0x01, 0x31, 0xb2, 0x3b, 0xbf, 0xb8, 0x2f,
+        0xd6, 0x01, 0xa8, 0xc4, 0x45, 0xbd, 0xb8, 0x2f, 0xd6, 0x01, 0x50, 0x4b, 0x05, 0x06, 0x00,
+        0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ]);
+
+    let mut archive = zip::ZipArchive::new(zip_file_bytes).unwrap();
+
+    assert_eq!(archive.len(), 1); //Only one file inside archive: `test.txt`
+
+    {
+        // No password
+        let file = archive.by_index(0);
+        match file {
+            Err(zip::result::ZipError::UnsupportedArchive(
+                zip::result::ZipError::PASSWORD_REQUIRED,
+            )) => (),
+            Err(_) => panic!(
+                "Expected PasswordRequired error when opening encrypted file without password"
+            ),
+            Ok(_) => panic!("Error: Successfully opened encrypted file without password?!"),
+        }
+    }
+
+    {
+        // Wrong password
+        let file = archive.by_index_decrypt(0, b"wrong password");
+        match file {
+            Ok(Err(zip::result::InvalidPassword)) => (),
+            Err(_) => panic!(
+                "Expected InvalidPassword error when opening encrypted file with wrong password"
+            ),
+            Ok(Ok(_)) => panic!("Error: Successfully opened encrypted file with wrong password?!"),
+        }
+    }
+
+    {
+        // Correct password, read contents
+        let mut file = archive
+            .by_index_decrypt(0, "test".as_bytes())
+            .unwrap()
+            .unwrap();
+        let file_name = file.enclosed_name().unwrap();
+        assert_eq!(file_name, std::path::PathBuf::from("test.txt"));
+
+        let mut data = Vec::new();
+        file.read_to_end(&mut data).unwrap();
+        assert_eq!(data, "abcdefghijklmnopqrstuvwxyz123456789".as_bytes());
+    }
+}
diff -Nru thunderbird-91.3.2+build1/third_party/rust/cc/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/rust/cc/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/rust/cc/.cargo-checksum.json	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/rust/cc/.cargo-checksum.json	2021-12-09 12:00:09.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"24720bf62cfad67ca24dfc9192a8f1c11a0f262655c087795605f188cee5c5f0","Cargo.toml":"84ef3b052c7b9ba469573df3ee45d89d426f2cd30d350f43198f115b9c5691fc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"9916275542d23bfa0815b1f48d4546e514739fadc79775500de6a81cf17aac09","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"20d349f8528f191a4cf04a5a42daaaa8085c4e00885c78456ebada92dc39b7fb","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"090b5de68e19dab9e1884175dc2a6866f697bd043d6b3a0d4b3836c9d6812569","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"16274867f23871e9b07614eda4c7344da13d1751fed63d4f633857e40be86394","tests/test.rs":"65c073e0e2cf4aa0433066102788e9f57442719e6f32f5ad5248aa7132bb4597"},"package":"4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"}
\ No newline at end of file
+{"files":{"Cargo.toml":"c5c25a7f7994d67c8fc25cb5add9c54d4d75c186cd605353ff021b634032aab7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"1fd66e1fe6d618030b9452c667e89d7a31b27331ad831d83b41f9762fd6858d4","src/bin/gcc-shim.rs":"b77907875029494b6288841c3aed2e4939ed40708c7f597fca5c9e2570490ca6","src/com.rs":"bcdaf1c28b71e6ef889c6b08d1ce9d7c0761344a677f523bc4c3cd297957f804","src/lib.rs":"20f6fce88058fe2c338a8a7bb21570c796425a6f0c2f997cd64740835c1b328c","src/registry.rs":"3cc1b5a50879fa751572878ae1d0afbfc960c11665258492754b2c8bccb0ff5d","src/setup_config.rs":"7014103587d3382eac599cb76f016e2609b8140970861b2237982d1db24af265","src/vs_instances.rs":"2d3f8278a803b0e7052f4eeb1979b29f963dd0143f4458e2cb5f33c4e5f0963b","src/winapi.rs":"ea8b7edbb9ff87957254f465c2334e714c5d6b3b19a8d757c48ea7ca0881c50c","src/windows_registry.rs":"d8f3014140d637b50a1fa4a9739b3617299ab43f829e65b2728f515a969a5376","tests/cc_env.rs":"e02b3b0824ad039b47e4462c5ef6dbe6c824c28e7953af94a0f28f7b5158042e","tests/cflags.rs":"57f06eb5ce1557e5b4a032d0c4673e18fbe6f8d26c1deb153126e368b96b41b3","tests/cxxflags.rs":"c2c6c6d8a0d7146616fa1caed26876ee7bc9fcfffd525eb4743593cade5f3371","tests/support/mod.rs":"16274867f23871e9b07614eda4c7344da13d1751fed63d4f633857e40be86394","tests/test.rs":"65c073e0e2cf4aa0433066102788e9f57442719e6f32f5ad5248aa7132bb4597"},"package":null}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/rust/cc/Cargo.lock thunderbird-91.4.0+build2/third_party/rust/cc/Cargo.lock
--- thunderbird-91.3.2+build1/third_party/rust/cc/Cargo.lock	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/rust/cc/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "cc"
-version = "1.0.68"
-dependencies = [
- "jobserver",
- "tempfile",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "getrandom"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "jobserver"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-dependencies = [
- "cfg-if",
- "libc",
- "rand",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru thunderbird-91.3.2+build1/third_party/rust/cc/Cargo.toml thunderbird-91.4.0+build2/third_party/rust/cc/Cargo.toml
--- thunderbird-91.3.2+build1/third_party/rust/cc/Cargo.toml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/rust/cc/Cargo.toml	2021-12-09 12:00:08.000000000 +0000
@@ -1,34 +1,27 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
 [package]
-edition = "2018"
 name = "cc"
-version = "1.0.68"
+version = "1.0.71"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-exclude = ["/.github", "/.travis.yml", "/appveyor.yml"]
-description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/alexcrichton/cc-rs"
 homepage = "https://github.com/alexcrichton/cc-rs"
 documentation = "https://docs.rs/cc"
-readme = "README.md"
+description = """
+A build-time dependency for Cargo build scripts to assist in invoking the native
+C compiler to compile native C code into a static archive to be linked into Rust
+code.
+"""
 keywords = ["build-dependencies"]
+readme = "README.md"
 categories = ["development-tools::build-utils"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/alexcrichton/cc-rs"
-[dependencies.jobserver]
-version = "0.1.16"
-optional = true
-[dev-dependencies.tempfile]
-version = "3"
+exclude = ["/.github", "/.travis.yml", "/appveyor.yml"]
+edition = "2018"
+
+[dependencies]
+jobserver = { version = "0.1.16", optional = true }
 
 [features]
 parallel = ["jobserver"]
+
+[dev-dependencies]
+tempfile = "3"
diff -Nru thunderbird-91.3.2+build1/third_party/rust/cc/README.md thunderbird-91.4.0+build2/third_party/rust/cc/README.md
--- thunderbird-91.3.2+build1/third_party/rust/cc/README.md	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/rust/cc/README.md	2021-12-09 12:00:09.000000000 +0000
@@ -189,6 +189,7 @@
     cc::Build::new()
         // Switch to CUDA C++ library compilation using NVCC.
         .cuda(true)
+        .cudart("static")
         // Generate code for Maxwell (GTX 970, 980, 980 Ti, Titan X).
         .flag("-gencode").flag("arch=compute_52,code=sm_52")
         // Generate code for Maxwell (Jetson TX1).
diff -Nru thunderbird-91.3.2+build1/third_party/rust/cc/src/lib.rs thunderbird-91.4.0+build2/third_party/rust/cc/src/lib.rs
--- thunderbird-91.3.2+build1/third_party/rust/cc/src/lib.rs	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/rust/cc/src/lib.rs	2021-12-09 12:00:09.000000000 +0000
@@ -103,6 +103,7 @@
     cpp_link_stdlib: Option<Option<String>>,
     cpp_set_stdlib: Option<String>,
     cuda: bool,
+    cudart: Option<String>,
     target: Option<String>,
     host: Option<String>,
     out_dir: Option<PathBuf>,
@@ -298,6 +299,7 @@
             cpp_link_stdlib: None,
             cpp_set_stdlib: None,
             cuda: false,
+            cudart: None,
             target: None,
             host: None,
             out_dir: None,
@@ -611,6 +613,20 @@
         self.cuda = cuda;
         if cuda {
             self.cpp = true;
+            self.cudart = Some("static".to_string());
+        }
+        self
+    }
+
+    /// Link CUDA run-time.
+    ///
+    /// This option mimics the `--cudart` NVCC command-line option. Just like
+    /// the original it accepts `{none|shared|static}`, with default being
+    /// `static`. The method has to be invoked after `.cuda(true)`, or not
+    /// at all, if the default is right for the project.
+    pub fn cudart(&mut self, cudart: &str) -> &mut Build {
+        if self.cuda {
+            self.cudart = Some(cudart.to_string());
         }
         self
     }
@@ -732,7 +748,7 @@
     /// This option sets the `-stdlib` flag, which is only supported by some
     /// compilers (clang, icc) but not by others (gcc). The library will not
     /// detect which compiler is used, as such it is the responsibility of the
-    /// caller to ensure that this option is only used in conjuction with a
+    /// caller to ensure that this option is only used in conjunction with a
     /// compiler which supports the `-stdlib` flag.
     ///
     /// A value of `None` indicates that no specific C++ standard library should
@@ -996,6 +1012,56 @@
             }
         }
 
+        let cudart = match &self.cudart {
+            Some(opt) => opt.as_str(), // {none|shared|static}
+            None => "none",
+        };
+        if cudart != "none" {
+            if let Some(nvcc) = which(&self.get_compiler().path) {
+                // Try to figure out the -L search path. If it fails,
+                // it's on user to specify one by passing it through
+                // RUSTFLAGS environment variable.
+                let mut libtst = false;
+                let mut libdir = nvcc;
+                libdir.pop(); // remove 'nvcc'
+                libdir.push("..");
+                let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+                if cfg!(target_os = "linux") {
+                    libdir.push("targets");
+                    libdir.push(target_arch.to_owned() + "-linux");
+                    libdir.push("lib");
+                    libtst = true;
+                } else if cfg!(target_env = "msvc") {
+                    libdir.push("lib");
+                    match target_arch.as_str() {
+                        "x86_64" => {
+                            libdir.push("x64");
+                            libtst = true;
+                        }
+                        "x86" => {
+                            libdir.push("Win32");
+                            libtst = true;
+                        }
+                        _ => libtst = false,
+                    }
+                }
+                if libtst && libdir.is_dir() {
+                    println!(
+                        "cargo:rustc-link-search=native={}",
+                        libdir.to_str().unwrap()
+                    );
+                }
+
+                // And now the -l flag.
+                let lib = match cudart {
+                    "shared" => "cudart",
+                    "static" => "cudart_static",
+                    bad => panic!("unsupported cudart option: {}", bad),
+                };
+                println!("cargo:rustc-link-lib={}", lib);
+            }
+        }
+
         Ok(())
     }
 
@@ -1205,6 +1271,9 @@
         if !msvc || !is_asm || !is_arm {
             cmd.arg("-c");
         }
+        if self.cuda && self.files.len() > 1 {
+            cmd.arg("--device-c");
+        }
         cmd.arg(&obj.src);
         if cfg!(target_os = "macos") {
             self.fix_env_for_apple_os(&mut cmd)?;
@@ -1421,10 +1490,11 @@
                     cmd.push_cc_arg("-fdata-sections".into());
                 }
                 // Disable generation of PIC on bare-metal for now: rust-lld doesn't support this yet
-                if self
-                    .pic
-                    .unwrap_or(!target.contains("windows") && !target.contains("-none-"))
-                {
+                if self.pic.unwrap_or(
+                    !target.contains("windows")
+                        && !target.contains("-none-")
+                        && !target.contains("uefi"),
+                ) {
                     cmd.push_cc_arg("-fPIC".into());
                     // PLT only applies if code is compiled with PIC support,
                     // and only for ELF targets.
@@ -1466,9 +1536,8 @@
                         if let Some(arch) =
                             map_darwin_target_from_rust_to_compiler_architecture(target)
                         {
-                            let ios = if arch == "arm64" { "ios" } else { "ios13.0" };
                             cmd.args
-                                .push(format!("--target={}-apple-{}-macabi", arch, ios).into());
+                                .push(format!("--target={}-apple-ios13.0-macabi", arch).into());
                         }
                     } else if target.contains("ios-sim") {
                         if let Some(arch) =
@@ -1484,6 +1553,16 @@
                                 .into(),
                             );
                         }
+                    } else if target.starts_with("riscv64gc-") {
+                        cmd.args.push(
+                            format!("--target={}", target.replace("riscv64gc", "riscv64")).into(),
+                        );
+                    } else if target.contains("uefi") {
+                        if target.contains("x86_64") {
+                            cmd.args.push("--target=x86_64-unknown-windows-gnu".into());
+                        } else if target.contains("i686") {
+                            cmd.args.push("--target=i686-unknown-windows-gnu".into())
+                        }
                     } else {
                         cmd.args.push(format!("--target={}", target).into());
                     }
@@ -1541,6 +1620,10 @@
                     }
                 }
 
+                if target.contains("-kmc-solid_") {
+                    cmd.args.push("-finput-charset=utf-8".into());
+                }
+
                 if self.static_flag.is_none() {
                     let features = self
                         .getenv("CARGO_CFG_TARGET_FEATURE")
@@ -1552,9 +1635,14 @@
 
                 // armv7 targets get to use armv7 instructions
                 if (target.starts_with("armv7") || target.starts_with("thumbv7"))
-                    && target.contains("-linux-")
+                    && (target.contains("-linux-") || target.contains("-kmc-solid_"))
                 {
                     cmd.args.push("-march=armv7-a".into());
+
+                    if target.ends_with("eabihf") {
+                        // lowest common denominator FPU
+                        cmd.args.push("-mfpu=vfpv3-d16".into());
+                    }
                 }
 
                 // (x86 Android doesn't say "eabi")
@@ -1807,6 +1895,21 @@
             self.assemble_progressive(dst, chunk)?;
         }
 
+        if self.cuda {
+            // Link the device-side code and add it to the target library,
+            // so that non-CUDA linker can link the final binary.
+
+            let out_dir = self.get_out_dir()?;
+            let dlink = out_dir.join(lib_name.to_owned() + "_dlink.o");
+            let mut nvcc = self.get_compiler().to_command();
+            nvcc.arg("--device-link")
+                .arg("-o")
+                .arg(dlink.clone())
+                .arg(dst);
+            run(&mut nvcc, "nvcc")?;
+            self.assemble_progressive(dst, &[dlink])?;
+        }
+
         let target = self.get_target()?;
         if target.contains("msvc") {
             // The Rust compiler will look for libfoo.a and foo.lib, but the
@@ -1849,7 +1952,7 @@
             for flag in self.ar_flags.iter() {
                 cmd.arg(flag);
             }
-            // If the library file already exists, add the libary name
+            // If the library file already exists, add the library name
             // as an argument to let lib.exe know we are appending the objs.
             if dst.exists() {
                 cmd.arg(dst);
@@ -1911,6 +2014,11 @@
             None => false,
         };
 
+        let is_sim = match target.split('-').nth(3) {
+            Some(v) => v == "sim",
+            None => false,
+        };
+
         let arch = if is_catalyst {
             match arch {
                 "arm64e" => ArchSpec::Catalyst("arm64e"),
@@ -1923,6 +2031,16 @@
                     ));
                 }
             }
+        } else if is_sim {
+            match arch {
+                "arm64" | "aarch64" => ArchSpec::Simulator("-arch arm64"),
+                _ => {
+                    return Err(Error::new(
+                        ErrorKind::ArchitectureInvalid,
+                        "Unknown architecture for iOS simulator target.",
+                    ));
+                }
+            }
         } else {
             match arch {
                 "arm" | "armv7" | "thumbv7" => ArchSpec::Device("armv7"),
@@ -2078,6 +2196,10 @@
                     } else {
                         "wr-cc".to_string()
                     }
+                } else if target.starts_with("armv7a-kmc-solid_") {
+                    format!("arm-kmc-eabi-{}", gnu)
+                } else if target.starts_with("aarch64-kmc-solid_") {
+                    format!("aarch64-kmc-elf-{}", gnu)
                 } else if self.get_host()? != target {
                     let prefix = self.prefix_for_target(&target);
                     match prefix {
@@ -2124,7 +2246,7 @@
         //
         // As the shell script calls the main clang binary, the command line limit length
         // on Windows is restricted to around 8k characters instead of around 32k characters.
-        // To remove this limit, we call the main clang binary directly and contruct the
+        // To remove this limit, we call the main clang binary directly and construct the
         // `--target=` ourselves.
         if host.contains("windows") && android_clang_compiler_uses_target_arg_internally(&tool.path)
         {
@@ -2206,13 +2328,13 @@
         // No explicit CC wrapper was detected, but check if RUSTC_WRAPPER
         // is defined and is a build accelerator that is compatible with
         // C/C++ compilers (e.g. sccache)
-        let valid_wrappers = ["sccache"];
+        const VALID_WRAPPERS: &[&'static str] = &["sccache", "cachepot"];
 
         let rustc_wrapper = std::env::var_os("RUSTC_WRAPPER")?;
         let wrapper_path = Path::new(&rustc_wrapper);
         let wrapper_stem = wrapper_path.file_stem()?;
 
-        if valid_wrappers.contains(&wrapper_stem.to_str()?) {
+        if VALID_WRAPPERS.contains(&wrapper_stem.to_str()?) {
             Some(rustc_wrapper.to_str()?.to_owned())
         } else {
             None
@@ -2253,7 +2375,7 @@
         //
         // It's true that everything here is a bit of a pain, but apparently if
         // you're not literally make or bash then you get a lot of bug reports.
-        let known_wrappers = ["ccache", "distcc", "sccache", "icecc"];
+        let known_wrappers = ["ccache", "distcc", "sccache", "icecc", "cachepot"];
 
         let mut parts = tool.split_whitespace();
         let maybe_wrapper = match parts.next() {
@@ -2402,6 +2524,10 @@
             "i586-unknown-linux-musl" => Some("musl"),
             "i686-pc-windows-gnu" => Some("i686-w64-mingw32"),
             "i686-uwp-windows-gnu" => Some("i686-w64-mingw32"),
+            "i686-unknown-linux-gnu" => self.find_working_gnu_prefix(&[
+                "i686-linux-gnu",
+                "x86_64-linux-gnu", // transparently support gcc-multilib
+            ]), // explicit None if not found, so caller knows to fall back
             "i686-unknown-linux-musl" => Some("musl"),
             "i686-unknown-netbsd" => Some("i486--netbsdelf"),
             "mips-unknown-linux-gnu" => Some("mips-linux-gnu"),
@@ -2469,6 +2595,9 @@
             "x86_64-pc-windows-gnu" => Some("x86_64-w64-mingw32"),
             "x86_64-uwp-windows-gnu" => Some("x86_64-w64-mingw32"),
             "x86_64-rumprun-netbsd" => Some("x86_64-rumprun-netbsd"),
+            "x86_64-unknown-linux-gnu" => self.find_working_gnu_prefix(&[
+                "x86_64-linux-gnu", // rustfmt wrap
+            ]), // explicit None if not found, so caller knows to fall back
             "x86_64-unknown-linux-musl" => Some("musl"),
             "x86_64-unknown-netbsd" => Some("x86_64--netbsd"),
             _ => None,
@@ -2652,7 +2781,7 @@
     }
 
     #[cfg(windows)]
-    /// Explictly set the `ToolFamily`, skipping name-based detection.
+    /// Explicitly set the `ToolFamily`, skipping name-based detection.
     fn with_family(path: PathBuf, family: ToolFamily) -> Self {
         Self {
             path: path,
@@ -2953,9 +3082,12 @@
                 &format!("Failed to find tool. Is `{}` installed?{}", program, extra),
             ))
         }
-        Err(_) => Err(Error::new(
+        Err(ref e) => Err(Error::new(
             ErrorKind::ToolExecError,
-            &format!("Command {:?} with args {:?} failed to start.", cmd, program),
+            &format!(
+                "Command {:?} with args {:?} failed to start: {:?}",
+                cmd, program, e
+            ),
         )),
     }
 }
@@ -3086,7 +3218,33 @@
         Some("arm64e")
     } else if target.contains("aarch64") {
         Some("arm64")
+    } else if target.contains("i686") {
+        Some("i386")
+    } else if target.contains("powerpc") {
+        Some("ppc")
+    } else if target.contains("powerpc64") {
+        Some("ppc64")
     } else {
         None
     }
 }
+
+fn which(tool: &Path) -> Option<PathBuf> {
+    fn check_exe(exe: &mut PathBuf) -> bool {
+        let exe_ext = std::env::consts::EXE_EXTENSION;
+        exe.exists() || (!exe_ext.is_empty() && exe.set_extension(exe_ext) && exe.exists())
+    }
+
+    // If |tool| is not just one "word," assume it's an actual path...
+    if tool.components().count() > 1 {
+        let mut exe = PathBuf::from(tool);
+        return if check_exe(&mut exe) { Some(exe) } else { None };
+    }
+
+    // Loop through PATH entries searching for the |tool|.
+    let path_entries = env::var_os("PATH")?;
+    env::split_paths(&path_entries).find_map(|path_entry| {
+        let mut exe = path_entry.join(tool);
+        return if check_exe(&mut exe) { Some(exe) } else { None };
+    })
+}
diff -Nru thunderbird-91.3.2+build1/third_party/rust/cc/src/windows_registry.rs thunderbird-91.4.0+build2/third_party/rust/cc/src/windows_registry.rs
--- thunderbird-91.3.2+build1/third_party/rust/cc/src/windows_registry.rs	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/rust/cc/src/windows_registry.rs	2021-12-09 12:00:09.000000000 +0000
@@ -129,7 +129,7 @@
             )),
         },
         _ => {
-            // Check for the presense of a specific registry key
+            // Check for the presence of a specific registry key
             // that indicates visual studio is installed.
             if impl_::has_msbuild_version("16.0") {
                 Ok(VsVers::Vs16)
@@ -277,6 +277,9 @@
                 if target.contains("x86_64") {
                     tool.env.push(("Platform".into(), "X64".into()));
                 }
+                if target.contains("aarch64") {
+                    tool.env.push(("Platform".into(), "ARM64".into()));
+                }
                 Some(tool)
             })
             .next()
@@ -407,6 +410,9 @@
             if target.contains("x86_64") {
                 tool.env.push(("Platform".into(), "X64".into()));
             }
+            if target.contains("aarch64") {
+                tool.env.push(("Platform".into(), "ARM64".into()));
+            }
             tool
         })
     }
@@ -676,7 +682,7 @@
 
     // Interestingly there are several subdirectories, `win7` `win8` and
     // `winv6.3`. Vcvars seems to only care about `winv6.3` though, so the same
-    // applies to us. Note that if we were targetting kernel mode drivers
+    // applies to us. Note that if we were targeting kernel mode drivers
     // instead of user mode applications, we would care.
     fn get_sdk81_dir() -> Option<PathBuf> {
         let key = r"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1";
@@ -810,10 +816,12 @@
             "16.0" => {
                 find_msbuild_vs16("x86_64-pc-windows-msvc").is_some()
                     || find_msbuild_vs16("i686-pc-windows-msvc").is_some()
+                    || find_msbuild_vs16("aarch64-pc-windows-msvc").is_some()
             }
             "15.0" => {
                 find_msbuild_vs15("x86_64-pc-windows-msvc").is_some()
                     || find_msbuild_vs15("i686-pc-windows-msvc").is_some()
+                    || find_msbuild_vs15("aarch64-pc-windows-msvc").is_some()
             }
             "12.0" | "14.0" => LOCAL_MACHINE
                 .open(&OsString::from(format!(
diff -Nru thunderbird-91.3.2+build1/third_party/rust/cubeb-pulse/.cargo-checksum.json thunderbird-91.4.0+build2/third_party/rust/cubeb-pulse/.cargo-checksum.json
--- thunderbird-91.3.2+build1/third_party/rust/cubeb-pulse/.cargo-checksum.json	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/rust/cubeb-pulse/.cargo-checksum.json	2021-12-09 12:00:08.000000000 +0000
@@ -1 +1 @@
-{"files":{".editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858",".travis.yml":"0394e2adb041175457685cde5ee05ff04bdab8885fd8a62551f2ff43d9e48872","AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","Cargo.toml":"56e90cb82ec36ead07e551a28fc2455fa658fa8308c3d73f8d856d85bfcd2122","LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","README.md":"e6a98ee5630b9ce1a096a2907d095454f2770e298a5b0976ab552cc53ca96cfc","src/backend/context.rs":"33d9fdf1504fe1ae43d301e288daf6eaeabeb47aa0ef86efa135c6d984425fc4","src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","src/backend/intern.rs":"374a9a3bd79fddc47739dda1dbfc5929aea5a91946794fe65fba3c8d130fbda9","src/backend/mod.rs":"06ce9250865abf0ea461f215b128470636d072a6776821efef3caf5a7b992fb9","src/backend/stream.rs":"b8700fffb4d1537bc2fd3f0e26e7bbb16bc6e7cc7a803723e06704610ca1f6f5","src/capi.rs":"b2c1be8128cadd36caa65c80950440f9d6f2aa0c24cc7bae6a9eaf6347ac454d","src/lib.rs":"7282560d84b134b09acfd8d6282600982e42fb3557f72454c535637cc26c7bf6"},"package":null}
\ No newline at end of file
+{"files":{".editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858",".travis.yml":"0394e2adb041175457685cde5ee05ff04bdab8885fd8a62551f2ff43d9e48872","AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","Cargo.toml":"56e90cb82ec36ead07e551a28fc2455fa658fa8308c3d73f8d856d85bfcd2122","LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","README.md":"e6a98ee5630b9ce1a096a2907d095454f2770e298a5b0976ab552cc53ca96cfc","src/backend/context.rs":"33d9fdf1504fe1ae43d301e288daf6eaeabeb47aa0ef86efa135c6d984425fc4","src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","src/backend/intern.rs":"374a9a3bd79fddc47739dda1dbfc5929aea5a91946794fe65fba3c8d130fbda9","src/backend/mod.rs":"06ce9250865abf0ea461f215b128470636d072a6776821efef3caf5a7b992fb9","src/backend/stream.rs":"07a29b8086774123e22dff2252a5cd2ee4c337a55e72beee1d60c4164b75280e","src/capi.rs":"b2c1be8128cadd36caa65c80950440f9d6f2aa0c24cc7bae6a9eaf6347ac454d","src/lib.rs":"7282560d84b134b09acfd8d6282600982e42fb3557f72454c535637cc26c7bf6"},"package":null}
\ No newline at end of file
diff -Nru thunderbird-91.3.2+build1/third_party/rust/cubeb-pulse/src/backend/stream.rs thunderbird-91.4.0+build2/third_party/rust/cubeb-pulse/src/backend/stream.rs
--- thunderbird-91.3.2+build1/third_party/rust/cubeb-pulse/src/backend/stream.rs	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/third_party/rust/cubeb-pulse/src/backend/stream.rs	2021-12-09 12:00:09.000000000 +0000
@@ -13,7 +13,7 @@
 use std::ffi::{CStr, CString};
 use std::os::raw::{c_long, c_void};
 use std::slice;
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
 use ringbuf::RingBuffer;
 
 use self::RingBufferConsumer::*;
@@ -267,7 +267,7 @@
     input_stream: Option<pulse::Stream>,
     data_callback: ffi::cubeb_data_callback,
     state_callback: ffi::cubeb_state_callback,
-    drain_timer: *mut pa_time_event,
+    drain_timer: AtomicPtr<pa_time_event>,
     output_sample_spec: pulse::SampleSpec,
     input_sample_spec: pulse::SampleSpec,
     output_frame_count: AtomicUsize,
@@ -399,7 +399,7 @@
             data_callback: data_callback,
             state_callback: state_callback,
             user_ptr: user_ptr,
-            drain_timer: ptr::null_mut(),
+            drain_timer: AtomicPtr::new(ptr::null_mut()),
             output_sample_spec: pulse::SampleSpec::default(),
             input_sample_spec: pulse::SampleSpec::default(),
             output_frame_count: AtomicUsize::new(0),
@@ -564,9 +564,10 @@
         self.context.mainloop.lock();
         {
             if let Some(stm) = self.output_stream.take() {
-                if !self.drain_timer.is_null() {
+                let drain_timer = self.drain_timer.load(Ordering::Acquire);
+                if !drain_timer.is_null() {
                     /* there's no pa_rttime_free, so use this instead. */
-                    self.context.mainloop.get_api().time_free(self.drain_timer);
+                    self.context.mainloop.get_api().time_free(drain_timer);
                 }
                 stm.clear_state_callback();
                 stm.clear_write_callback();
@@ -626,7 +627,7 @@
             self.context.mainloop.lock();
             self.shutdown = true;
             // If draining is taking place wait to finish
-            while !self.drain_timer.is_null() {
+            while !self.drain_timer.load(Ordering::Acquire).is_null() {
                 self.context.mainloop.wait();
             }
             self.context.mainloop.unlock();
@@ -974,11 +975,12 @@
             u: *mut c_void,
         ) {
             let stm = unsafe { &mut *(u as *mut PulseStream) };
-            debug_assert_eq!(stm.drain_timer, e);
+            let drain_timer = stm.drain_timer.load(Ordering::Acquire);
+            debug_assert_eq!(drain_timer, e);
             stm.state_change_callback(ffi::CUBEB_STATE_DRAINED);
             /* there's no pa_rttime_free, so use this instead. */
-            a.time_free(stm.drain_timer);
-            stm.drain_timer = ptr::null_mut();
+            a.time_free(drain_timer);
+            stm.drain_timer.store(ptr::null_mut(), Ordering::Release);
             stm.context.mainloop.signal();
         }
 
@@ -1070,13 +1072,16 @@
 
                             /* pa_stream_drain is useless, see PA bug# 866. this is a workaround. */
                             /* arbitrary safety margin: double the current latency. */
-                            debug_assert!(self.drain_timer.is_null());
+                            debug_assert!(self.drain_timer.load(Ordering::Acquire).is_null());
                             let stream_ptr = self as *const _ as *mut _;
                             if let Some(ref context) = self.context.context {
-                                self.drain_timer = context.rttime_new(
-                                    pulse::rtclock_now() + 2 * latency,
-                                    drained_cb,
-                                    stream_ptr,
+                                self.drain_timer.store(
+                                    context.rttime_new(
+                                        pulse::rtclock_now() + 2 * latency,
+                                        drained_cb,
+                                        stream_ptr,
+                                    ),
+                                    Ordering::Release,
                                 );
                             }
                             self.shutdown = true;
diff -Nru thunderbird-91.3.2+build1/toolkit/actors/AutoScrollChild.jsm thunderbird-91.4.0+build2/toolkit/actors/AutoScrollChild.jsm
--- thunderbird-91.3.2+build1/toolkit/actors/AutoScrollChild.jsm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/actors/AutoScrollChild.jsm	2021-12-09 12:00:10.000000000 +0000
@@ -3,9 +3,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+var EXPORTED_SYMBOLS = ["AutoScrollChild"];
+
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-var EXPORTED_SYMBOLS = ["AutoScrollChild"];
+ChromeUtils.defineModuleGetter(
+  this,
+  "BrowserUtils",
+  "resource://gre/modules/BrowserUtils.jsm"
+);
 
 class AutoScrollChild extends JSWindowActorChild {
   constructor() {
@@ -25,11 +31,12 @@
     this.autoscrollLoop = this.autoscrollLoop.bind(this);
   }
 
-  isAutoscrollBlocker(node) {
+  isAutoscrollBlocker(event) {
     let mmPaste = Services.prefs.getBoolPref("middlemouse.paste");
     let mmScrollbarPosition = Services.prefs.getBoolPref(
       "middlemouse.scrollbarPosition"
     );
+    let node = event.originalTarget;
     let content = node.ownerGlobal;
 
     // If the node is in editable document or content, we don't want to start
@@ -45,34 +52,27 @@
       }
     }
 
-    while (node) {
-      if (
-        (node instanceof content.HTMLAnchorElement ||
-          node instanceof content.HTMLAreaElement) &&
-        node.hasAttribute("href")
-      ) {
-        return true;
-      }
-
-      if (
-        mmPaste &&
-        (node instanceof content.HTMLInputElement ||
-          node instanceof content.HTMLTextAreaElement)
-      ) {
-        return true;
-      }
+    // Don't start if we're on a link.
+    let [href] = BrowserUtils.hrefAndLinkNodeForClickEvent(event);
+    if (href) {
+      return true;
+    }
 
-      if (
-        node instanceof content.XULElement &&
-        ((mmScrollbarPosition &&
-          (node.localName == "scrollbar" ||
-            node.localName == "scrollcorner")) ||
-          node.localName == "treechildren")
-      ) {
-        return true;
-      }
+    // Or if we're pasting into an input field of sorts.
+    if (
+      mmPaste &&
+      node.closest("input,textarea")?.constructor.name.startsWith("HTML")
+    ) {
+      return true;
+    }
 
-      node = node.parentNode;
+    // Or if we're on a scrollbar or XUL <tree>
+    if (
+      (mmScrollbarPosition &&
+        node.closest("scrollbar,scrollcorner") instanceof content.XULElement) ||
+      node.closest("treechildren") instanceof content.XULElement
+    ) {
+      return true;
     }
     return false;
   }
@@ -377,7 +377,7 @@
         if (
           this.canStartAutoScrollWith(event) &&
           !this._scrollable &&
-          !this.isAutoscrollBlocker(event.originalTarget)
+          !this.isAutoscrollBlocker(event)
         ) {
           this.startScroll(event);
         }
diff -Nru thunderbird-91.3.2+build1/toolkit/components/extensions/Extension.jsm thunderbird-91.4.0+build2/toolkit/components/extensions/Extension.jsm
--- thunderbird-91.3.2+build1/toolkit/components/extensions/Extension.jsm	2021-11-19 11:55:57.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/extensions/Extension.jsm	2021-12-09 12:00:10.000000000 +0000
@@ -2951,6 +2951,22 @@
 
   async startup(reason) {
     this.chromeRegistryHandle = null;
+
+    // If this langpack overlaps with a packaged locale, then bail out of
+    // starting up this langpack. Registering the same locale multiple times
+    // wreaks havoc.
+    if (
+      this.startupData.languages.some(lang =>
+        Services.locale.packagedLocales.includes(lang)
+      )
+    ) {
+      Services.obs.notifyObservers(
+        { wrappedJSObject: { langpack: this } },
+        "webextension-langpack-startup-aborted"
+      );
+      return;
+    }
+
     if (this.startupData.chromeEntries.length) {
       const manifestURI = Services.io.newURI(
         "manifest.json",
diff -Nru thunderbird-91.3.2+build1/toolkit/components/extensions/test/mochitest/chrome.ini thunderbird-91.4.0+build2/toolkit/components/extensions/test/mochitest/chrome.ini
--- thunderbird-91.3.2+build1/toolkit/components/extensions/test/mochitest/chrome.ini	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/extensions/test/mochitest/chrome.ini	2021-12-09 12:00:10.000000000 +0000
@@ -22,8 +22,9 @@
 [test_chrome_ext_contentscript_unrecognizedprop_warning.html]
 [test_chrome_ext_downloads_open.html]
 [test_chrome_ext_downloads_saveAs.html]
-skip-if = (verify && !debug && (os == 'win')) || (os == 'android')
+skip-if = (verify && !debug && (os == 'win')) || (os == 'android') || (os == 'win' && os_version == '10.0' && webrender) # Bug 1695612
 [test_chrome_ext_downloads_uniquify.html]
+skip-if = os == 'win' && os_version == '10.0' && webrender # Bug 1695612
 [test_chrome_ext_permissions.html]
 skip-if = os == 'android' # Bug 1350559
 [test_chrome_ext_svg_context_fill.html]
diff -Nru thunderbird-91.3.2+build1/toolkit/components/extensions/test/mochitest/test_ext_contentscript_fission_frame.html thunderbird-91.4.0+build2/toolkit/components/extensions/test/mochitest/test_ext_contentscript_fission_frame.html
--- thunderbird-91.3.2+build1/toolkit/components/extensions/test/mochitest/test_ext_contentscript_fission_frame.html	2021-11-19 11:55:57.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/extensions/test/mochitest/test_ext_contentscript_fission_frame.html	2021-12-09 12:00:11.000000000 +0000
@@ -58,7 +58,7 @@
 
     files: {
       "cs.js"() {
-        let text = document.body.innerText;
+        let text = document.getElementById("test").textContent;
         browser.test.assertEq(text, "Sample text", "CS can access page DOM");
 
         let manifest = browser.runtime.getManifest();
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/build/pdf.js thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/build/pdf.js
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/build/pdf.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/build/pdf.js	2021-12-09 12:00:10.000000000 +0000
@@ -51,7 +51,7 @@
 exports.isPdfFile = isPdfFile;
 exports.isValidFetchUrl = isValidFetchUrl;
 exports.loadScript = loadScript;
-exports.StatTimer = exports.RenderingCancelledException = exports.PDFDateString = exports.PageViewport = exports.LinkTarget = exports.DOMSVGFactory = exports.DOMStandardFontDataFactory = exports.DOMCMapReaderFactory = exports.DOMCanvasFactory = exports.DEFAULT_LINK_REL = void 0;
+exports.StatTimer = exports.RenderingCancelledException = exports.PixelsPerInch = exports.PDFDateString = exports.PageViewport = exports.LinkTarget = exports.DOMSVGFactory = exports.DOMStandardFontDataFactory = exports.DOMCMapReaderFactory = exports.DOMCanvasFactory = exports.DEFAULT_LINK_REL = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
@@ -60,6 +60,16 @@
 const DEFAULT_LINK_REL = "noopener noreferrer nofollow";
 exports.DEFAULT_LINK_REL = DEFAULT_LINK_REL;
 const SVG_NS = "http://www.w3.org/2000/svg";
+const PixelsPerInch = {
+  CSS: 96.0,
+  PDF: 72.0,
+
+  get PDF_TO_CSS_UNITS() {
+    return (0, _util.shadow)(this, "PDF_TO_CSS_UNITS", this.CSS / this.PDF);
+  }
+
+};
+exports.PixelsPerInch = PixelsPerInch;
 
 class DOMCanvasFactory extends _base_factory.BaseCanvasFactory {
   constructor({
@@ -243,7 +253,7 @@
 
 class RenderingCancelledException extends _util.BaseException {
   constructor(msg, type) {
-    super(msg);
+    super(msg, "RenderingCancelledException");
     this.type = type;
   }
 
@@ -549,7 +559,7 @@
 exports.unreachable = unreachable;
 exports.utf8StringToString = utf8StringToString;
 exports.warn = warn;
-exports.VerbosityLevel = exports.Util = exports.UNSUPPORTED_FEATURES = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.IsLittleEndianCached = exports.IsEvalSupportedCached = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FontType = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.AnnotationType = exports.AnnotationStateModelType = exports.AnnotationReviewState = exports.AnnotationReplyType = exports.AnnotationMarkedState = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
+exports.VerbosityLevel = exports.Util = exports.UNSUPPORTED_FEATURES = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.RenderingIntentFlag = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.IsLittleEndianCached = exports.IsEvalSupportedCached = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FontType = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.AnnotationType = exports.AnnotationStateModelType = exports.AnnotationReviewState = exports.AnnotationReplyType = exports.AnnotationMode = exports.AnnotationMarkedState = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
 
 __w_pdfjs_require__(3);
 
@@ -557,6 +567,23 @@
 exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
 const FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
 exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
+const RenderingIntentFlag = {
+  ANY: 0x01,
+  DISPLAY: 0x02,
+  PRINT: 0x04,
+  ANNOTATIONS_FORMS: 0x10,
+  ANNOTATIONS_STORAGE: 0x20,
+  ANNOTATIONS_DISABLE: 0x40,
+  OPLIST: 0x100
+};
+exports.RenderingIntentFlag = RenderingIntentFlag;
+const AnnotationMode = {
+  DISABLE: 0,
+  ENABLE: 1,
+  ENABLE_FORMS: 2,
+  ENABLE_STORAGE: 3
+};
+exports.AnnotationMode = AnnotationMode;
 const PermissionFlag = {
   PRINT: 0x04,
   MODIFY_CONTENTS: 0x08,
@@ -972,13 +999,13 @@
 }
 
 const BaseException = function BaseExceptionClosure() {
-  function BaseException(message) {
+  function BaseException(message, name) {
     if (this.constructor === BaseException) {
       unreachable("Cannot initialize BaseException.");
     }
 
     this.message = message;
-    this.name = this.constructor.name;
+    this.name = name;
   }
 
   BaseException.prototype = new Error();
@@ -990,7 +1017,7 @@
 
 class PasswordException extends BaseException {
   constructor(msg, code) {
-    super(msg);
+    super(msg, "PasswordException");
     this.code = code;
   }
 
@@ -1000,7 +1027,7 @@
 
 class UnknownErrorException extends BaseException {
   constructor(msg, details) {
-    super(msg);
+    super(msg, "UnknownErrorException");
     this.details = details;
   }
 
@@ -1008,17 +1035,27 @@
 
 exports.UnknownErrorException = UnknownErrorException;
 
-class InvalidPDFException extends BaseException {}
+class InvalidPDFException extends BaseException {
+  constructor(msg) {
+    super(msg, "InvalidPDFException");
+  }
+
+}
 
 exports.InvalidPDFException = InvalidPDFException;
 
-class MissingPDFException extends BaseException {}
+class MissingPDFException extends BaseException {
+  constructor(msg) {
+    super(msg, "MissingPDFException");
+  }
+
+}
 
 exports.MissingPDFException = MissingPDFException;
 
 class UnexpectedResponseException extends BaseException {
   constructor(msg, status) {
-    super(msg);
+    super(msg, "UnexpectedResponseException");
     this.status = status;
   }
 
@@ -1026,11 +1063,21 @@
 
 exports.UnexpectedResponseException = UnexpectedResponseException;
 
-class FormatError extends BaseException {}
+class FormatError extends BaseException {
+  constructor(msg) {
+    super(msg, "FormatError");
+  }
+
+}
 
 exports.FormatError = FormatError;
 
-class AbortException extends BaseException {}
+class AbortException extends BaseException {
+  constructor(msg) {
+    super(msg, "AbortException");
+  }
+
+}
 
 exports.AbortException = AbortException;
 const NullCharactersRegExp = /\x00/g;
@@ -1623,7 +1670,7 @@
 }));
 exports.getDocument = getDocument;
 exports.setPDFNetworkStreamFactory = setPDFNetworkStreamFactory;
-exports.version = exports.PDFWorker = exports.PDFPageProxy = exports.PDFDocumentProxy = exports.PDFDataRangeTransport = exports.LoopbackPort = exports.DefaultStandardFontDataFactory = exports.DefaultCMapReaderFactory = exports.DefaultCanvasFactory = exports.build = void 0;
+exports.version = exports.RenderTask = exports.PDFWorker = exports.PDFPageProxy = exports.PDFDocumentProxy = exports.PDFDocumentLoadingTask = exports.PDFDataRangeTransport = exports.LoopbackPort = exports.DefaultStandardFontDataFactory = exports.DefaultCMapReaderFactory = exports.DefaultCanvasFactory = exports.build = void 0;
 
 var _util = __w_pdfjs_require__(2);
 
@@ -1649,6 +1696,8 @@
 
 var _transport_stream = __w_pdfjs_require__(16);
 
+var _xfa_text = __w_pdfjs_require__(17);
+
 const DEFAULT_RANGE_CHUNK_SIZE = 65536;
 const RENDERING_CANCELLED_TIMEOUT = 100;
 const DefaultCanvasFactory = _display_utils.DOMCanvasFactory;
@@ -1849,9 +1898,9 @@
   return task;
 }
 
-function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
+async function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
   if (worker.destroyed) {
-    return Promise.reject(new Error("Worker was destroyed"));
+    throw new Error("Worker was destroyed");
   }
 
   if (pdfDataRangeTransport) {
@@ -1861,9 +1910,9 @@
     source.contentDispositionFilename = pdfDataRangeTransport.contentDispositionFilename;
   }
 
-  return worker.messageHandler.sendWithPromise("GetDocRequest", {
+  const workerId = await worker.messageHandler.sendWithPromise("GetDocRequest", {
     docId,
-    apiVersion: '2.11.22',
+    apiVersion: '2.11.298',
     source: {
       data: source.data,
       url: source.url,
@@ -1883,52 +1932,52 @@
     useSystemFonts: source.useSystemFonts,
     cMapUrl: source.useWorkerFetch ? source.cMapUrl : null,
     standardFontDataUrl: source.useWorkerFetch ? source.standardFontDataUrl : null
-  }).then(function (workerId) {
-    if (worker.destroyed) {
-      throw new Error("Worker was destroyed");
-    }
-
-    return workerId;
   });
+
+  if (worker.destroyed) {
+    throw new Error("Worker was destroyed");
+  }
+
+  return workerId;
 }
 
-const PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() {
-  let nextDocumentId = 0;
+class PDFDocumentLoadingTask {
+  static get idCounters() {
+    return (0, _util.shadow)(this, "idCounters", {
+      doc: 0
+    });
+  }
 
-  class PDFDocumentLoadingTask {
-    constructor() {
-      this._capability = (0, _util.createPromiseCapability)();
-      this._transport = null;
-      this._worker = null;
-      this.docId = "d" + nextDocumentId++;
-      this.destroyed = false;
-      this.onPassword = null;
-      this.onProgress = null;
-      this.onUnsupportedFeature = null;
-    }
+  constructor() {
+    this._capability = (0, _util.createPromiseCapability)();
+    this._transport = null;
+    this._worker = null;
+    this.docId = `d${PDFDocumentLoadingTask.idCounters.doc++}`;
+    this.destroyed = false;
+    this.onPassword = null;
+    this.onProgress = null;
+    this.onUnsupportedFeature = null;
+  }
 
-    get promise() {
-      return this._capability.promise;
-    }
+  get promise() {
+    return this._capability.promise;
+  }
 
-    destroy() {
-      this.destroyed = true;
-      const transportDestroyed = !this._transport ? Promise.resolve() : this._transport.destroy();
-      return transportDestroyed.then(() => {
-        this._transport = null;
+  async destroy() {
+    this.destroyed = true;
+    await this._transport?.destroy();
+    this._transport = null;
 
-        if (this._worker) {
-          this._worker.destroy();
+    if (this._worker) {
+      this._worker.destroy();
 
-          this._worker = null;
-        }
-      });
+      this._worker = null;
     }
-
   }
 
-  return PDFDocumentLoadingTask;
-}();
+}
+
+exports.PDFDocumentLoadingTask = PDFDocumentLoadingTask;
 
 class PDFDataRangeTransport {
   constructor(length, initialData, progressiveDone = false, contentDispositionFilename = null) {
@@ -2158,6 +2207,7 @@
     this.cleanupAfterRender = false;
     this.pendingCleanup = false;
     this._intentStates = new Map();
+    this._annotationPromises = new Map();
     this.destroyed = false;
   }
 
@@ -2199,16 +2249,19 @@
   }
 
   getAnnotations({
-    intent = null
+    intent = "display"
   } = {}) {
-    const renderingIntent = intent === "display" || intent === "print" ? intent : null;
+    const intentArgs = this._transport.getRenderingIntent(intent);
+
+    let promise = this._annotationPromises.get(intentArgs.cacheKey);
 
-    if (!this._annotationsPromise || this._annotationsIntent !== renderingIntent) {
-      this._annotationsPromise = this._transport.getAnnotations(this._pageIndex, renderingIntent);
-      this._annotationsIntent = renderingIntent;
+    if (!promise) {
+      promise = this._transport.getAnnotations(this._pageIndex, intentArgs.renderingIntent);
+
+      this._annotationPromises.set(intentArgs.cacheKey, promise);
     }
 
-    return this._annotationsPromise;
+    return promise;
   }
 
   getJSActions() {
@@ -2223,31 +2276,31 @@
     canvasContext,
     viewport,
     intent = "display",
-    renderInteractiveForms = false,
+    annotationMode = _util.AnnotationMode.ENABLE,
     transform = null,
     imageLayer = null,
     canvasFactory = null,
     background = null,
-    includeAnnotationStorage = false,
     optionalContentConfigPromise = null
   }) {
     if (this._stats) {
       this._stats.time("Overall");
     }
 
-    const renderingIntent = intent === "print" ? "print" : "display";
+    const intentArgs = this._transport.getRenderingIntent(intent, annotationMode);
+
     this.pendingCleanup = false;
 
     if (!optionalContentConfigPromise) {
       optionalContentConfigPromise = this._transport.getOptionalContentConfig();
     }
 
-    let intentState = this._intentStates.get(renderingIntent);
+    let intentState = this._intentStates.get(intentArgs.cacheKey);
 
     if (!intentState) {
       intentState = Object.create(null);
 
-      this._intentStates.set(renderingIntent, intentState);
+      this._intentStates.set(intentArgs.cacheKey, intentState);
     }
 
     if (intentState.streamReaderCancelTimeout) {
@@ -2258,7 +2311,7 @@
     const canvasFactoryInstance = canvasFactory || new DefaultCanvasFactory({
       ownerDocument: this._ownerDocument
     });
-    const annotationStorage = includeAnnotationStorage ? this._transport.annotationStorage.serializable : null;
+    const intentPrint = !!(intentArgs.renderingIntent & _util.RenderingIntentFlag.PRINT);
 
     if (!intentState.displayReadyCapability) {
       intentState.displayReadyCapability = (0, _util.createPromiseCapability)();
@@ -2272,18 +2325,13 @@
         this._stats.time("Page Request");
       }
 
-      this._pumpOperatorList({
-        pageIndex: this._pageIndex,
-        intent: renderingIntent,
-        renderInteractiveForms: renderInteractiveForms === true,
-        annotationStorage
-      });
+      this._pumpOperatorList(intentArgs);
     }
 
     const complete = error => {
       intentState.renderTasks.delete(internalRenderTask);
 
-      if (this.cleanupAfterRender || renderingIntent === "print") {
+      if (this.cleanupAfterRender || intentPrint) {
         this.pendingCleanup = true;
       }
 
@@ -2294,7 +2342,7 @@
 
         this._abortOperatorList({
           intentState,
-          reason: error
+          reason: error instanceof Error ? error : new Error(error)
         });
       } else {
         internalRenderTask.capability.resolve();
@@ -2321,7 +2369,7 @@
       operatorList: intentState.operatorList,
       pageIndex: this._pageIndex,
       canvasFactory: canvasFactoryInstance,
-      useRequestAnimationFrame: renderingIntent !== "print",
+      useRequestAnimationFrame: !intentPrint,
       pdfBug: this._pdfBug
     });
     (intentState.renderTasks ||= new Set()).add(internalRenderTask);
@@ -2346,7 +2394,8 @@
   }
 
   getOperatorList({
-    intent = "display"
+    intent = "display",
+    annotationMode = _util.AnnotationMode.ENABLE
   } = {}) {
     function operatorListChanged() {
       if (intentState.operatorList.lastChunk) {
@@ -2355,14 +2404,14 @@
       }
     }
 
-    const renderingIntent = `oplist-${intent === "print" ? "print" : "display"}`;
+    const intentArgs = this._transport.getRenderingIntent(intent, annotationMode, true);
 
-    let intentState = this._intentStates.get(renderingIntent);
+    let intentState = this._intentStates.get(intentArgs.cacheKey);
 
     if (!intentState) {
       intentState = Object.create(null);
 
-      this._intentStates.set(renderingIntent, intentState);
+      this._intentStates.set(intentArgs.cacheKey, intentState);
     }
 
     let opListTask;
@@ -2382,10 +2431,7 @@
         this._stats.time("Page Request");
       }
 
-      this._pumpOperatorList({
-        pageIndex: this._pageIndex,
-        intent: renderingIntent
-      });
+      this._pumpOperatorList(intentArgs);
     }
 
     return intentState.opListReadCapability.promise;
@@ -2413,6 +2459,12 @@
   }
 
   getTextContent(params = {}) {
+    if (this._transport._htmlForXfa) {
+      return this.getXfa().then(xfa => {
+        return _xfa_text.XfaText.textContent(xfa);
+      });
+    }
+
     const readableStream = this.streamTextContent(params);
     return new Promise(function (resolve, reject) {
       function pump() {
@@ -2449,14 +2501,14 @@
     this._transport.pageCache[this._pageIndex] = null;
     const waitOn = [];
 
-    for (const [intent, intentState] of this._intentStates) {
+    for (const intentState of this._intentStates.values()) {
       this._abortOperatorList({
         intentState,
         reason: new Error("Page was destroyed."),
         force: true
       });
 
-      if (intent.startsWith("oplist-")) {
+      if (intentState.opListReadCapability) {
         continue;
       }
 
@@ -2467,7 +2519,9 @@
     }
 
     this.objs.clear();
-    this._annotationsPromise = null;
+
+    this._annotationPromises.clear();
+
     this._jsActionsPromise = null;
     this._structTreePromise = null;
     this.pendingCleanup = false;
@@ -2496,7 +2550,9 @@
     this._intentStates.clear();
 
     this.objs.clear();
-    this._annotationsPromise = null;
+
+    this._annotationPromises.clear();
+
     this._jsActionsPromise = null;
     this._structTreePromise = null;
 
@@ -2508,8 +2564,8 @@
     return true;
   }
 
-  _startRenderPage(transparency, intent) {
-    const intentState = this._intentStates.get(intent);
+  _startRenderPage(transparency, cacheKey) {
+    const intentState = this._intentStates.get(cacheKey);
 
     if (!intentState) {
       return;
@@ -2541,14 +2597,20 @@
     }
   }
 
-  _pumpOperatorList(args) {
-    (0, _util.assert)(args.intent, 'PDFPageProxy._pumpOperatorList: Expected "intent" argument.');
-
-    const readableStream = this._transport.messageHandler.sendWithStream("GetOperatorList", args);
+  _pumpOperatorList({
+    renderingIntent,
+    cacheKey
+  }) {
+    const readableStream = this._transport.messageHandler.sendWithStream("GetOperatorList", {
+      pageIndex: this._pageIndex,
+      intent: renderingIntent,
+      cacheKey,
+      annotationStorage: renderingIntent & _util.RenderingIntentFlag.ANNOTATIONS_STORAGE ? this._transport.annotationStorage.serializable : null
+    });
 
     const reader = readableStream.getReader();
 
-    const intentState = this._intentStates.get(args.intent);
+    const intentState = this._intentStates.get(cacheKey);
 
     intentState.streamReader = reader;
 
@@ -2604,8 +2666,6 @@
     reason,
     force = false
   }) {
-    (0, _util.assert)(reason instanceof Error || typeof reason === "object" && reason !== null, 'PDFPageProxy._abortOperatorList: Expected "reason" argument.');
-
     if (!intentState.streamReader) {
       return;
     }
@@ -2629,16 +2689,16 @@
       }
     }
 
-    intentState.streamReader.cancel(new _util.AbortException(reason?.message));
+    intentState.streamReader.cancel(new _util.AbortException(reason.message)).catch(() => {});
     intentState.streamReader = null;
 
     if (this._transport.destroyed) {
       return;
     }
 
-    for (const [intent, curIntentState] of this._intentStates) {
+    for (const [curCacheKey, curIntentState] of this._intentStates) {
       if (curIntentState === intentState) {
-        this._intentStates.delete(intent);
+        this._intentStates.delete(curCacheKey);
 
         break;
       }
@@ -2764,283 +2824,267 @@
 }
 
 exports.LoopbackPort = LoopbackPort;
+const PDFWorkerUtil = {
+  isWorkerDisabled: false,
+  fallbackWorkerSrc: null,
+  fakeWorkerId: 0
+};
+;
 
-const PDFWorker = function PDFWorkerClosure() {
-  const pdfWorkerPorts = new WeakMap();
-  let isWorkerDisabled = false;
-  let fallbackWorkerSrc;
-  let nextFakeWorkerId = 0;
-  let fakeWorkerCapability;
+class PDFWorker {
+  static get _workerPorts() {
+    return (0, _util.shadow)(this, "_workerPorts", new WeakMap());
+  }
 
-  function getWorkerSrc() {
-    if (_worker_options.GlobalWorkerOptions.workerSrc) {
-      return _worker_options.GlobalWorkerOptions.workerSrc;
+  constructor({
+    name = null,
+    port = null,
+    verbosity = (0, _util.getVerbosityLevel)()
+  } = {}) {
+    if (port && PDFWorker._workerPorts.has(port)) {
+      throw new Error("Cannot use more than one PDFWorker per port.");
     }
 
-    if (typeof fallbackWorkerSrc !== "undefined") {
-      if (!_is_node.isNodeJS) {
-        (0, _display_utils.deprecated)('No "GlobalWorkerOptions.workerSrc" specified.');
-      }
-
-      return fallbackWorkerSrc;
-    }
+    this.name = name;
+    this.destroyed = false;
+    this.postMessageTransfers = true;
+    this.verbosity = verbosity;
+    this._readyCapability = (0, _util.createPromiseCapability)();
+    this._port = null;
+    this._webWorker = null;
+    this._messageHandler = null;
 
-    throw new Error('No "GlobalWorkerOptions.workerSrc" specified.');
-  }
+    if (port) {
+      PDFWorker._workerPorts.set(port, this);
 
-  function getMainThreadWorkerMessageHandler() {
-    let mainWorkerMessageHandler;
+      this._initializeFromPort(port);
 
-    try {
-      mainWorkerMessageHandler = globalThis.pdfjsWorker?.WorkerMessageHandler;
-    } catch (ex) {}
+      return;
+    }
 
-    return mainWorkerMessageHandler || null;
+    this._initialize();
   }
 
-  function setupFakeWorkerGlobal() {
-    if (fakeWorkerCapability) {
-      return fakeWorkerCapability.promise;
-    }
+  get promise() {
+    return this._readyCapability.promise;
+  }
 
-    fakeWorkerCapability = (0, _util.createPromiseCapability)();
+  get port() {
+    return this._port;
+  }
 
-    const loader = async function () {
-      const mainWorkerMessageHandler = getMainThreadWorkerMessageHandler();
+  get messageHandler() {
+    return this._messageHandler;
+  }
 
-      if (mainWorkerMessageHandler) {
-        return mainWorkerMessageHandler;
-      }
+  _initializeFromPort(port) {
+    this._port = port;
+    this._messageHandler = new _message_handler.MessageHandler("main", "worker", port);
 
-      await (0, _display_utils.loadScript)(getWorkerSrc());
-      return window.pdfjsWorker.WorkerMessageHandler;
-    };
+    this._messageHandler.on("ready", function () {});
 
-    loader().then(fakeWorkerCapability.resolve, fakeWorkerCapability.reject);
-    return fakeWorkerCapability.promise;
+    this._readyCapability.resolve();
   }
 
-  function createCDNWrapper(url) {
-    const wrapper = "importScripts('" + url + "');";
-    return URL.createObjectURL(new Blob([wrapper]));
-  }
-
-  class PDFWorker {
-    constructor({
-      name = null,
-      port = null,
-      verbosity = (0, _util.getVerbosityLevel)()
-    } = {}) {
-      if (port && pdfWorkerPorts.has(port)) {
-        throw new Error("Cannot use more than one PDFWorker per port");
-      }
-
-      this.name = name;
-      this.destroyed = false;
-      this.postMessageTransfers = true;
-      this.verbosity = verbosity;
-      this._readyCapability = (0, _util.createPromiseCapability)();
-      this._port = null;
-      this._webWorker = null;
-      this._messageHandler = null;
-
-      if (port) {
-        pdfWorkerPorts.set(port, this);
+  _initialize() {
+    if (typeof Worker !== "undefined" && !PDFWorkerUtil.isWorkerDisabled && !PDFWorker._mainThreadWorkerMessageHandler) {
+      let workerSrc = PDFWorker.workerSrc;
 
-        this._initializeFromPort(port);
+      try {
+        const worker = new Worker(workerSrc);
+        const messageHandler = new _message_handler.MessageHandler("main", "worker", worker);
 
-        return;
-      }
+        const terminateEarly = () => {
+          worker.removeEventListener("error", onWorkerError);
+          messageHandler.destroy();
+          worker.terminate();
 
-      this._initialize();
-    }
-
-    get promise() {
-      return this._readyCapability.promise;
-    }
+          if (this.destroyed) {
+            this._readyCapability.reject(new Error("Worker was destroyed"));
+          } else {
+            this._setupFakeWorker();
+          }
+        };
 
-    get port() {
-      return this._port;
-    }
+        const onWorkerError = () => {
+          if (!this._webWorker) {
+            terminateEarly();
+          }
+        };
 
-    get messageHandler() {
-      return this._messageHandler;
-    }
+        worker.addEventListener("error", onWorkerError);
+        messageHandler.on("test", data => {
+          worker.removeEventListener("error", onWorkerError);
 
-    _initializeFromPort(port) {
-      this._port = port;
-      this._messageHandler = new _message_handler.MessageHandler("main", "worker", port);
+          if (this.destroyed) {
+            terminateEarly();
+            return;
+          }
 
-      this._messageHandler.on("ready", function () {});
+          if (data) {
+            this._messageHandler = messageHandler;
+            this._port = worker;
+            this._webWorker = worker;
 
-      this._readyCapability.resolve();
-    }
+            if (!data.supportTransfers) {
+              this.postMessageTransfers = false;
+            }
 
-    _initialize() {
-      if (typeof Worker !== "undefined" && !isWorkerDisabled && !getMainThreadWorkerMessageHandler()) {
-        let workerSrc = getWorkerSrc();
+            this._readyCapability.resolve();
 
-        try {
-          const worker = new Worker(workerSrc);
-          const messageHandler = new _message_handler.MessageHandler("main", "worker", worker);
+            messageHandler.send("configure", {
+              verbosity: this.verbosity
+            });
+          } else {
+            this._setupFakeWorker();
 
-          const terminateEarly = () => {
-            worker.removeEventListener("error", onWorkerError);
             messageHandler.destroy();
             worker.terminate();
+          }
+        });
+        messageHandler.on("ready", data => {
+          worker.removeEventListener("error", onWorkerError);
 
-            if (this.destroyed) {
-              this._readyCapability.reject(new Error("Worker was destroyed"));
-            } else {
-              this._setupFakeWorker();
-            }
-          };
+          if (this.destroyed) {
+            terminateEarly();
+            return;
+          }
 
-          const onWorkerError = () => {
-            if (!this._webWorker) {
-              terminateEarly();
-            }
-          };
+          try {
+            sendTest();
+          } catch (e) {
+            this._setupFakeWorker();
+          }
+        });
 
-          worker.addEventListener("error", onWorkerError);
-          messageHandler.on("test", data => {
-            worker.removeEventListener("error", onWorkerError);
-
-            if (this.destroyed) {
-              terminateEarly();
-              return;
-            }
+        const sendTest = () => {
+          const testObj = new Uint8Array([this.postMessageTransfers ? 255 : 0]);
 
-            if (data) {
-              this._messageHandler = messageHandler;
-              this._port = worker;
-              this._webWorker = worker;
+          try {
+            messageHandler.send("test", testObj, [testObj.buffer]);
+          } catch (ex) {
+            (0, _util.warn)("Cannot use postMessage transfers.");
+            testObj[0] = 0;
+            messageHandler.send("test", testObj);
+          }
+        };
 
-              if (!data.supportTransfers) {
-                this.postMessageTransfers = false;
-              }
+        sendTest();
+        return;
+      } catch (e) {
+        (0, _util.info)("The worker has been disabled.");
+      }
+    }
 
-              this._readyCapability.resolve();
+    this._setupFakeWorker();
+  }
 
-              messageHandler.send("configure", {
-                verbosity: this.verbosity
-              });
-            } else {
-              this._setupFakeWorker();
+  _setupFakeWorker() {
+    if (!PDFWorkerUtil.isWorkerDisabled) {
+      (0, _util.warn)("Setting up fake worker.");
+      PDFWorkerUtil.isWorkerDisabled = true;
+    }
 
-              messageHandler.destroy();
-              worker.terminate();
-            }
-          });
-          messageHandler.on("ready", data => {
-            worker.removeEventListener("error", onWorkerError);
+    PDFWorker._setupFakeWorkerGlobal.then(WorkerMessageHandler => {
+      if (this.destroyed) {
+        this._readyCapability.reject(new Error("Worker was destroyed"));
 
-            if (this.destroyed) {
-              terminateEarly();
-              return;
-            }
+        return;
+      }
 
-            try {
-              sendTest();
-            } catch (e) {
-              this._setupFakeWorker();
-            }
-          });
+      const port = new LoopbackPort();
+      this._port = port;
+      const id = `fake${PDFWorkerUtil.fakeWorkerId++}`;
+      const workerHandler = new _message_handler.MessageHandler(id + "_worker", id, port);
+      WorkerMessageHandler.setup(workerHandler, port);
+      const messageHandler = new _message_handler.MessageHandler(id, id + "_worker", port);
+      this._messageHandler = messageHandler;
 
-          const sendTest = () => {
-            const testObj = new Uint8Array([this.postMessageTransfers ? 255 : 0]);
+      this._readyCapability.resolve();
 
-            try {
-              messageHandler.send("test", testObj, [testObj.buffer]);
-            } catch (ex) {
-              (0, _util.warn)("Cannot use postMessage transfers.");
-              testObj[0] = 0;
-              messageHandler.send("test", testObj);
-            }
-          };
+      messageHandler.send("configure", {
+        verbosity: this.verbosity
+      });
+    }).catch(reason => {
+      this._readyCapability.reject(new Error(`Setting up fake worker failed: "${reason.message}".`));
+    });
+  }
 
-          sendTest();
-          return;
-        } catch (e) {
-          (0, _util.info)("The worker has been disabled.");
-        }
-      }
+  destroy() {
+    this.destroyed = true;
+
+    if (this._webWorker) {
+      this._webWorker.terminate();
 
-      this._setupFakeWorker();
+      this._webWorker = null;
     }
 
-    _setupFakeWorker() {
-      if (!isWorkerDisabled) {
-        (0, _util.warn)("Setting up fake worker.");
-        isWorkerDisabled = true;
-      }
+    PDFWorker._workerPorts.delete(this._port);
 
-      setupFakeWorkerGlobal().then(WorkerMessageHandler => {
-        if (this.destroyed) {
-          this._readyCapability.reject(new Error("Worker was destroyed"));
+    this._port = null;
 
-          return;
-        }
+    if (this._messageHandler) {
+      this._messageHandler.destroy();
 
-        const port = new LoopbackPort();
-        this._port = port;
-        const id = "fake" + nextFakeWorkerId++;
-        const workerHandler = new _message_handler.MessageHandler(id + "_worker", id, port);
-        WorkerMessageHandler.setup(workerHandler, port);
-        const messageHandler = new _message_handler.MessageHandler(id, id + "_worker", port);
-        this._messageHandler = messageHandler;
+      this._messageHandler = null;
+    }
+  }
 
-        this._readyCapability.resolve();
+  static fromPort(params) {
+    if (!params?.port) {
+      throw new Error("PDFWorker.fromPort - invalid method signature.");
+    }
 
-        messageHandler.send("configure", {
-          verbosity: this.verbosity
-        });
-      }).catch(reason => {
-        this._readyCapability.reject(new Error(`Setting up fake worker failed: "${reason.message}".`));
-      });
+    if (this._workerPorts.has(params.port)) {
+      return this._workerPorts.get(params.port);
     }
 
-    destroy() {
-      this.destroyed = true;
+    return new PDFWorker(params);
+  }
 
-      if (this._webWorker) {
-        this._webWorker.terminate();
+  static get workerSrc() {
+    if (_worker_options.GlobalWorkerOptions.workerSrc) {
+      return _worker_options.GlobalWorkerOptions.workerSrc;
+    }
 
-        this._webWorker = null;
+    if (PDFWorkerUtil.fallbackWorkerSrc !== null) {
+      if (!_is_node.isNodeJS) {
+        (0, _display_utils.deprecated)('No "GlobalWorkerOptions.workerSrc" specified.');
       }
 
-      pdfWorkerPorts.delete(this._port);
-      this._port = null;
+      return PDFWorkerUtil.fallbackWorkerSrc;
+    }
 
-      if (this._messageHandler) {
-        this._messageHandler.destroy();
+    throw new Error('No "GlobalWorkerOptions.workerSrc" specified.');
+  }
 
-        this._messageHandler = null;
-      }
+  static get _mainThreadWorkerMessageHandler() {
+    try {
+      return globalThis.pdfjsWorker?.WorkerMessageHandler || null;
+    } catch (ex) {
+      return null;
     }
+  }
 
-    static fromPort(params) {
-      if (!params || !params.port) {
-        throw new Error("PDFWorker.fromPort - invalid method signature.");
-      }
+  static get _setupFakeWorkerGlobal() {
+    const loader = async () => {
+      const mainWorkerMessageHandler = this._mainThreadWorkerMessageHandler;
 
-      if (pdfWorkerPorts.has(params.port)) {
-        return pdfWorkerPorts.get(params.port);
+      if (mainWorkerMessageHandler) {
+        return mainWorkerMessageHandler;
       }
 
-      return new PDFWorker(params);
-    }
-
-    static getWorkerSrc() {
-      return getWorkerSrc();
-    }
+      await (0, _display_utils.loadScript)(this.workerSrc);
+      return window.pdfjsWorker.WorkerMessageHandler;
+    };
 
+    return (0, _util.shadow)(this, "_setupFakeWorkerGlobal", loader());
   }
 
-  return PDFWorker;
-}();
+}
 
 exports.PDFWorker = PDFWorker;
+;
 
 class WorkerTransport {
   constructor(messageHandler, loadingTask, networkStream, params) {
@@ -3081,6 +3125,57 @@
     return (0, _util.shadow)(this, "annotationStorage", new _annotation_storage.AnnotationStorage());
   }
 
+  getRenderingIntent(intent, annotationMode = _util.AnnotationMode.ENABLE, isOpList = false) {
+    let renderingIntent = _util.RenderingIntentFlag.DISPLAY;
+    let lastModified = "";
+
+    switch (intent) {
+      case "any":
+        renderingIntent = _util.RenderingIntentFlag.ANY;
+        break;
+
+      case "display":
+        break;
+
+      case "print":
+        renderingIntent = _util.RenderingIntentFlag.PRINT;
+        break;
+
+      default:
+        (0, _util.warn)(`getRenderingIntent - invalid intent: ${intent}`);
+    }
+
+    switch (annotationMode) {
+      case _util.AnnotationMode.DISABLE:
+        renderingIntent += _util.RenderingIntentFlag.ANNOTATIONS_DISABLE;
+        break;
+
+      case _util.AnnotationMode.ENABLE:
+        break;
+
+      case _util.AnnotationMode.ENABLE_FORMS:
+        renderingIntent += _util.RenderingIntentFlag.ANNOTATIONS_FORMS;
+        break;
+
+      case _util.AnnotationMode.ENABLE_STORAGE:
+        renderingIntent += _util.RenderingIntentFlag.ANNOTATIONS_STORAGE;
+        lastModified = this.annotationStorage.lastModified;
+        break;
+
+      default:
+        (0, _util.warn)(`getRenderingIntent - invalid annotationMode: ${annotationMode}`);
+    }
+
+    if (isOpList) {
+      renderingIntent += _util.RenderingIntentFlag.OPLIST;
+    }
+
+    return {
+      renderingIntent,
+      cacheKey: `${renderingIntent}_${lastModified}`
+    };
+  }
+
   destroy() {
     if (this.destroyCapability) {
       return this.destroyCapability.promise;
@@ -3113,6 +3208,7 @@
     Promise.all(waitOn).then(() => {
       this.commonObjs.clear();
       this.fontLoader.clear();
+      this._getFieldObjectsPromise = null;
       this._hasJSActionsPromise = null;
 
       if (this._networkStream) {
@@ -3271,11 +3367,9 @@
         case "UnknownErrorException":
           reason = new _util.UnknownErrorException(ex.message, ex.details);
           break;
-      }
 
-      if (!(reason instanceof Error)) {
-        const msg = "DocException - expected a valid Error.";
-        (0, _util.warn)(msg);
+        default:
+          (0, _util.unreachable)("DocException - expected a valid Error.");
       }
 
       loadingTask._capability.reject(reason);
@@ -3318,7 +3412,7 @@
 
       const page = this.pageCache[data.pageIndex];
 
-      page._startRenderPage(data.transparency, data.intent);
+      page._startRenderPage(data.transparency, data.cacheKey);
     });
     messageHandler.on("commonobj", data => {
       if (this.destroyed) {
@@ -3497,8 +3591,6 @@
   getPageIndex(ref) {
     return this.messageHandler.sendWithPromise("GetPageIndex", {
       ref
-    }).catch(function (reason) {
-      return Promise.reject(new Error(reason));
     });
   }
 
@@ -3521,7 +3613,7 @@
   }
 
   getFieldObjects() {
-    return this.messageHandler.sendWithPromise("GetFieldObjects", null);
+    return this._getFieldObjectsPromise ||= this.messageHandler.sendWithPromise("GetFieldObjects", null);
   }
 
   hasJSActions() {
@@ -3650,13 +3742,15 @@
       this.fontLoader.clear();
     }
 
+    this._getFieldObjectsPromise = null;
     this._hasJSActionsPromise = null;
   }
 
   get loadingParams() {
     const params = this._params;
     return (0, _util.shadow)(this, "loadingParams", {
-      disableAutoFetch: params.disableAutoFetch
+      disableAutoFetch: params.disableAutoFetch,
+      enableXfa: params.enableXfa
     });
   }
 
@@ -3730,181 +3824,181 @@
 
 }
 
-const InternalRenderTask = function InternalRenderTaskClosure() {
-  const canvasInRendering = new WeakSet();
+exports.RenderTask = RenderTask;
 
-  class InternalRenderTask {
-    constructor({
-      callback,
-      params,
-      objs,
-      commonObjs,
-      operatorList,
-      pageIndex,
-      canvasFactory,
-      useRequestAnimationFrame = false,
-      pdfBug = false
-    }) {
-      this.callback = callback;
-      this.params = params;
-      this.objs = objs;
-      this.commonObjs = commonObjs;
-      this.operatorListIdx = null;
-      this.operatorList = operatorList;
-      this._pageIndex = pageIndex;
-      this.canvasFactory = canvasFactory;
-      this._pdfBug = pdfBug;
-      this.running = false;
-      this.graphicsReadyCallback = null;
-      this.graphicsReady = false;
-      this._useRequestAnimationFrame = useRequestAnimationFrame === true && typeof window !== "undefined";
-      this.cancelled = false;
-      this.capability = (0, _util.createPromiseCapability)();
-      this.task = new RenderTask(this);
-      this._cancelBound = this.cancel.bind(this);
-      this._continueBound = this._continue.bind(this);
-      this._scheduleNextBound = this._scheduleNext.bind(this);
-      this._nextBound = this._next.bind(this);
-      this._canvas = params.canvasContext.canvas;
-    }
-
-    get completed() {
-      return this.capability.promise.catch(function () {});
-    }
-
-    initializeGraphics({
-      transparency = false,
-      optionalContentConfig
-    }) {
-      if (this.cancelled) {
-        return;
-      }
+class InternalRenderTask {
+  static get canvasInUse() {
+    return (0, _util.shadow)(this, "canvasInUse", new WeakSet());
+  }
 
-      if (this._canvas) {
-        if (canvasInRendering.has(this._canvas)) {
-          throw new Error("Cannot use the same canvas during multiple render() operations. " + "Use different canvas or ensure previous operations were " + "cancelled or completed.");
-        }
+  constructor({
+    callback,
+    params,
+    objs,
+    commonObjs,
+    operatorList,
+    pageIndex,
+    canvasFactory,
+    useRequestAnimationFrame = false,
+    pdfBug = false
+  }) {
+    this.callback = callback;
+    this.params = params;
+    this.objs = objs;
+    this.commonObjs = commonObjs;
+    this.operatorListIdx = null;
+    this.operatorList = operatorList;
+    this._pageIndex = pageIndex;
+    this.canvasFactory = canvasFactory;
+    this._pdfBug = pdfBug;
+    this.running = false;
+    this.graphicsReadyCallback = null;
+    this.graphicsReady = false;
+    this._useRequestAnimationFrame = useRequestAnimationFrame === true && typeof window !== "undefined";
+    this.cancelled = false;
+    this.capability = (0, _util.createPromiseCapability)();
+    this.task = new RenderTask(this);
+    this._cancelBound = this.cancel.bind(this);
+    this._continueBound = this._continue.bind(this);
+    this._scheduleNextBound = this._scheduleNext.bind(this);
+    this._nextBound = this._next.bind(this);
+    this._canvas = params.canvasContext.canvas;
+  }
 
-        canvasInRendering.add(this._canvas);
-      }
+  get completed() {
+    return this.capability.promise.catch(function () {});
+  }
+
+  initializeGraphics({
+    transparency = false,
+    optionalContentConfig
+  }) {
+    if (this.cancelled) {
+      return;
+    }
 
-      if (this._pdfBug && globalThis.StepperManager?.enabled) {
-        this.stepper = globalThis.StepperManager.create(this._pageIndex);
-        this.stepper.init(this.operatorList);
-        this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
+    if (this._canvas) {
+      if (InternalRenderTask.canvasInUse.has(this._canvas)) {
+        throw new Error("Cannot use the same canvas during multiple render() operations. " + "Use different canvas or ensure previous operations were " + "cancelled or completed.");
       }
 
-      const {
-        canvasContext,
-        viewport,
-        transform,
-        imageLayer,
-        background
-      } = this.params;
-      this.gfx = new _canvas.CanvasGraphics(canvasContext, this.commonObjs, this.objs, this.canvasFactory, imageLayer, optionalContentConfig);
-      this.gfx.beginDrawing({
-        transform,
-        viewport,
-        transparency,
-        background
-      });
-      this.operatorListIdx = 0;
-      this.graphicsReady = true;
+      InternalRenderTask.canvasInUse.add(this._canvas);
+    }
 
-      if (this.graphicsReadyCallback) {
-        this.graphicsReadyCallback();
-      }
+    if (this._pdfBug && globalThis.StepperManager?.enabled) {
+      this.stepper = globalThis.StepperManager.create(this._pageIndex);
+      this.stepper.init(this.operatorList);
+      this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
     }
 
-    cancel(error = null) {
-      this.running = false;
-      this.cancelled = true;
+    const {
+      canvasContext,
+      viewport,
+      transform,
+      imageLayer,
+      background
+    } = this.params;
+    this.gfx = new _canvas.CanvasGraphics(canvasContext, this.commonObjs, this.objs, this.canvasFactory, imageLayer, optionalContentConfig);
+    this.gfx.beginDrawing({
+      transform,
+      viewport,
+      transparency,
+      background
+    });
+    this.operatorListIdx = 0;
+    this.graphicsReady = true;
 
-      if (this.gfx) {
-        this.gfx.endDrawing();
-      }
+    if (this.graphicsReadyCallback) {
+      this.graphicsReadyCallback();
+    }
+  }
 
-      if (this._canvas) {
-        canvasInRendering.delete(this._canvas);
-      }
+  cancel(error = null) {
+    this.running = false;
+    this.cancelled = true;
 
-      this.callback(error || new _display_utils.RenderingCancelledException(`Rendering cancelled, page ${this._pageIndex + 1}`, "canvas"));
+    if (this.gfx) {
+      this.gfx.endDrawing();
     }
 
-    operatorListChanged() {
-      if (!this.graphicsReady) {
-        if (!this.graphicsReadyCallback) {
-          this.graphicsReadyCallback = this._continueBound;
-        }
+    if (this._canvas) {
+      InternalRenderTask.canvasInUse.delete(this._canvas);
+    }
 
-        return;
-      }
+    this.callback(error || new _display_utils.RenderingCancelledException(`Rendering cancelled, page ${this._pageIndex + 1}`, "canvas"));
+  }
 
-      if (this.stepper) {
-        this.stepper.updateOperatorList(this.operatorList);
+  operatorListChanged() {
+    if (!this.graphicsReady) {
+      if (!this.graphicsReadyCallback) {
+        this.graphicsReadyCallback = this._continueBound;
       }
 
-      if (this.running) {
-        return;
-      }
+      return;
+    }
 
-      this._continue();
+    if (this.stepper) {
+      this.stepper.updateOperatorList(this.operatorList);
     }
 
-    _continue() {
-      this.running = true;
+    if (this.running) {
+      return;
+    }
 
-      if (this.cancelled) {
-        return;
-      }
+    this._continue();
+  }
 
-      if (this.task.onContinue) {
-        this.task.onContinue(this._scheduleNextBound);
-      } else {
-        this._scheduleNext();
-      }
+  _continue() {
+    this.running = true;
+
+    if (this.cancelled) {
+      return;
     }
 
-    _scheduleNext() {
-      if (this._useRequestAnimationFrame) {
-        window.requestAnimationFrame(() => {
-          this._nextBound().catch(this._cancelBound);
-        });
-      } else {
-        Promise.resolve().then(this._nextBound).catch(this._cancelBound);
-      }
+    if (this.task.onContinue) {
+      this.task.onContinue(this._scheduleNextBound);
+    } else {
+      this._scheduleNext();
     }
+  }
 
-    async _next() {
-      if (this.cancelled) {
-        return;
-      }
+  _scheduleNext() {
+    if (this._useRequestAnimationFrame) {
+      window.requestAnimationFrame(() => {
+        this._nextBound().catch(this._cancelBound);
+      });
+    } else {
+      Promise.resolve().then(this._nextBound).catch(this._cancelBound);
+    }
+  }
 
-      this.operatorListIdx = this.gfx.executeOperatorList(this.operatorList, this.operatorListIdx, this._continueBound, this.stepper);
+  async _next() {
+    if (this.cancelled) {
+      return;
+    }
 
-      if (this.operatorListIdx === this.operatorList.argsArray.length) {
-        this.running = false;
+    this.operatorListIdx = this.gfx.executeOperatorList(this.operatorList, this.operatorListIdx, this._continueBound, this.stepper);
 
-        if (this.operatorList.lastChunk) {
-          this.gfx.endDrawing();
+    if (this.operatorListIdx === this.operatorList.argsArray.length) {
+      this.running = false;
 
-          if (this._canvas) {
-            canvasInRendering.delete(this._canvas);
-          }
+      if (this.operatorList.lastChunk) {
+        this.gfx.endDrawing();
 
-          this.callback();
+        if (this._canvas) {
+          InternalRenderTask.canvasInUse.delete(this._canvas);
         }
+
+        this.callback();
       }
     }
-
   }
 
-  return InternalRenderTask;
-}();
+}
 
-const version = '2.11.22';
+const version = '2.11.298';
 exports.version = version;
-const build = '4ad5c5d52';
+const build = 'd370a281c';
 exports.build = build;
 
 /***/ }),
@@ -4232,15 +4326,20 @@
 class AnnotationStorage {
   constructor() {
     this._storage = new Map();
+    this._timeStamp = Date.now();
     this._modified = false;
     this.onSetModified = null;
     this.onResetModified = null;
   }
 
   getValue(key, defaultValue) {
-    const obj = this._storage.get(key);
+    const value = this._storage.get(key);
+
+    if (value === undefined) {
+      return defaultValue;
+    }
 
-    return obj !== undefined ? obj : defaultValue;
+    return Object.assign(defaultValue, value);
   }
 
   setValue(key, value) {
@@ -4256,12 +4355,14 @@
         }
       }
     } else {
-      this._storage.set(key, value);
-
       modified = true;
+
+      this._storage.set(key, value);
     }
 
     if (modified) {
+      this._timeStamp = Date.now();
+
       this._setModified();
     }
   }
@@ -4298,6 +4399,10 @@
     return this._storage.size > 0 ? this._storage : null;
   }
 
+  get lastModified() {
+    return this._timeStamp.toString();
+  }
+
 }
 
 exports.AnnotationStorage = AnnotationStorage;
@@ -4317,6 +4422,8 @@
 
 var _pattern_helper = __w_pdfjs_require__(11);
 
+var _display_utils = __w_pdfjs_require__(1);
+
 const MIN_FONT_SIZE = 16;
 const MAX_FONT_SIZE = 100;
 const MAX_GROUP_SIZE = 4096;
@@ -5059,6 +5166,22 @@
   ctx.drawImage(mask, 0, 0);
 }
 
+function getImageSmoothingEnabled(transform, interpolate) {
+  const scale = _util.Util.singularValueDecompose2dScale(transform);
+
+  scale[0] = Math.fround(scale[0]);
+  scale[1] = Math.fround(scale[1]);
+  const actualScale = Math.fround((globalThis.devicePixelRatio || 1) * _display_utils.PixelsPerInch.PDF_TO_CSS_UNITS);
+
+  if (interpolate !== undefined) {
+    return interpolate;
+  } else if (scale[0] <= actualScale || scale[1] <= actualScale) {
+    return true;
+  }
+
+  return false;
+}
+
 const LINE_CAP_STYLES = ["butt", "round", "square"];
 const LINE_JOIN_STYLES = ["miter", "round", "bevel"];
 const NORMAL_CLIP = {};
@@ -5290,6 +5413,7 @@
 
     const scaled = this._scaleImage(maskCanvas.canvas, fillCtx.mozCurrentTransformInverse);
 
+    fillCtx.imageSmoothingEnabled = getImageSmoothingEnabled(fillCtx.mozCurrentTransform, img.interpolate);
     fillCtx.drawImage(scaled.img, 0, 0, scaled.img.width, scaled.img.height, 0, 0, width, height);
     fillCtx.globalCompositeOperation = "source-in";
 
@@ -6360,12 +6484,7 @@
     this.groupLevel--;
     const groupCtx = this.ctx;
     this.ctx = this.groupStack.pop();
-
-    if (this.ctx.imageSmoothingEnabled !== undefined) {
-      this.ctx.imageSmoothingEnabled = false;
-    } else {
-      this.ctx.mozImageSmoothingEnabled = false;
-    }
+    this.ctx.imageSmoothingEnabled = false;
 
     if (group.smask) {
       this.tempSMask = this.smaskStack.pop();
@@ -6566,6 +6685,7 @@
 
     const scaled = this._scaleImage(imgToPaint, ctx.mozCurrentTransformInverse);
 
+    ctx.imageSmoothingEnabled = getImageSmoothingEnabled(ctx.mozCurrentTransform, imgData.interpolate);
     ctx.drawImage(scaled.img, 0, 0, scaled.paintWidth, scaled.paintHeight, 0, -height, width, height);
 
     if (this.imageLayer) {
@@ -7318,7 +7438,8 @@
 };
 
 function wrapReason(reason) {
-  if (typeof reason !== "object" || reason === null) {
+  if (!(reason instanceof Error || typeof reason === "object" && reason !== null)) {
+    (0, _util.warn)('wrapReason: Expected "reason" to be a (possibly cloned) Error.');
     return reason;
   }
 
@@ -7329,6 +7450,9 @@
     case "MissingPDFException":
       return new _util.MissingPDFException(reason.message);
 
+    case "PasswordException":
+      return new _util.PasswordException(reason.message, reason.code);
+
     case "UnexpectedResponseException":
       return new _util.UnexpectedResponseException(reason.message, reason.status);
 
@@ -7662,7 +7786,7 @@
         this.streamSinks[streamId].desiredSize = data.desiredSize;
         const {
           onPull
-        } = this.streamSinks[data.streamId];
+        } = this.streamSinks[streamId];
         new Promise(function (resolve) {
           resolve(onPull && onPull());
         }).then(function () {
@@ -7734,7 +7858,7 @@
 
         const {
           onCancel
-        } = this.streamSinks[data.streamId];
+        } = this.streamSinks[streamId];
         new Promise(function (resolve) {
           resolve(onCancel && onCancel(wrapReason(data.reason)));
         }).then(function () {
@@ -7934,6 +8058,15 @@
   }
 
   isVisible(group) {
+    if (this._groups.size === 0) {
+      return true;
+    }
+
+    if (!group) {
+      (0, _util.warn)("Optional content group not defined.");
+      return true;
+    }
+
     if (group.type === "OCG") {
       if (!this._groups.has(group.id)) {
         (0, _util.warn)(`Optional content group not found: ${group.id}`);
@@ -8398,6 +8531,70 @@
 
 /***/ }),
 /* 17 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.XfaText = void 0;
+
+class XfaText {
+  static textContent(xfa) {
+    const items = [];
+    const output = {
+      items,
+      styles: Object.create(null)
+    };
+
+    function walk(node) {
+      if (!node) {
+        return;
+      }
+
+      let str = null;
+      const name = node.name;
+
+      if (name === "#text") {
+        str = node.value;
+      } else if (!XfaText.shouldBuildText(name)) {
+        return;
+      } else if (node?.attributes?.textContent) {
+        str = node.attributes.textContent;
+      } else if (node.value) {
+        str = node.value;
+      }
+
+      if (str !== null) {
+        items.push({
+          str
+        });
+      }
+
+      if (!node.children) {
+        return;
+      }
+
+      for (const child of node.children) {
+        walk(child);
+      }
+    }
+
+    walk(xfa);
+    return output;
+  }
+
+  static shouldBuildText(name) {
+    return !(name === "textarea" || name === "input" || name === "option" || name === "select");
+  }
+
+}
+
+exports.XfaText = XfaText;
+
+/***/ }),
+/* 18 */
 /***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
@@ -8413,7 +8610,10 @@
 
 var _annotation_storage = __w_pdfjs_require__(9);
 
-var _scripting_utils = __w_pdfjs_require__(18);
+var _scripting_utils = __w_pdfjs_require__(19);
+
+const DEFAULT_TAB_INDEX = 1000;
+const GetElementsByNameSet = new WeakSet();
 
 class AnnotationElementFactory {
   static create(parameters) {
@@ -8514,11 +8714,12 @@
     this.linkService = parameters.linkService;
     this.downloadManager = parameters.downloadManager;
     this.imageResourcesPath = parameters.imageResourcesPath;
-    this.renderInteractiveForms = parameters.renderInteractiveForms;
+    this.renderForms = parameters.renderForms;
     this.svgFactory = parameters.svgFactory;
     this.annotationStorage = parameters.annotationStorage;
     this.enableScripting = parameters.enableScripting;
     this.hasJSActions = parameters.hasJSActions;
+    this._fieldObjects = parameters.fieldObjects;
     this._mouseState = parameters.mouseState;
 
     if (isRenderable) {
@@ -8657,6 +8858,69 @@
     (0, _util.unreachable)("Abstract method `AnnotationElement.render` called");
   }
 
+  _getElementsByName(name, skipId = null) {
+    const fields = [];
+
+    if (this._fieldObjects) {
+      const fieldObj = this._fieldObjects[name];
+
+      if (fieldObj) {
+        for (const {
+          page,
+          id,
+          exportValues
+        } of fieldObj) {
+          if (page === -1) {
+            continue;
+          }
+
+          if (id === skipId) {
+            continue;
+          }
+
+          const exportValue = typeof exportValues === "string" ? exportValues : null;
+          const domElement = document.getElementById(id);
+
+          if (domElement && !GetElementsByNameSet.has(domElement)) {
+            (0, _util.warn)(`_getElementsByName - element not allowed: ${id}`);
+            continue;
+          }
+
+          fields.push({
+            id,
+            exportValue,
+            domElement
+          });
+        }
+      }
+
+      return fields;
+    }
+
+    for (const domElement of document.getElementsByName(name)) {
+      const {
+        id,
+        exportValue
+      } = domElement;
+
+      if (id === skipId) {
+        continue;
+      }
+
+      if (!GetElementsByNameSet.has(domElement)) {
+        continue;
+      }
+
+      fields.push({
+        id,
+        exportValue,
+        domElement
+      });
+    }
+
+    return fields;
+  }
+
   static get platform() {
     const platform = typeof navigator !== "undefined" ? navigator.platform : "";
     return (0, _util.shadow)(this, "platform", {
@@ -8763,6 +9027,10 @@
       };
     }
 
+    if (!link.onclick) {
+      link.onclick = () => false;
+    }
+
     link.className = "internalLink";
   }
 
@@ -8932,7 +9200,7 @@
 
 class TextWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
-    const isRenderable = parameters.renderInteractiveForms || !parameters.data.hasAppearance && !!parameters.data.fieldValue;
+    const isRenderable = parameters.renderForms || !parameters.data.hasAppearance && !!parameters.data.fieldValue;
     super(parameters, {
       isRenderable
     });
@@ -8941,13 +9209,14 @@
   setPropertyOnSiblings(base, key, value, keyInStorage) {
     const storage = this.annotationStorage;
 
-    for (const element of document.getElementsByName(base.name)) {
-      if (element !== base) {
-        element[key] = value;
-        const data = Object.create(null);
-        data[keyInStorage] = value;
-        storage.setValue(element.getAttribute("id"), data);
+    for (const element of this._getElementsByName(base.name, base.id)) {
+      if (element.domElement) {
+        element.domElement[key] = value;
       }
+
+      storage.setValue(element.id, {
+        [keyInStorage]: value
+      });
     }
   }
 
@@ -8957,7 +9226,7 @@
     this.container.className = "textWidgetAnnotation";
     let element = null;
 
-    if (this.renderInteractiveForms) {
+    if (this.renderForms) {
       const storedData = storage.getValue(id, {
         value: this.data.fieldValue,
         valueAsString: this.data.fieldValue
@@ -8979,6 +9248,10 @@
         element.setAttribute("value", textContent);
       }
 
+      GetElementsByNameSet.add(element);
+      element.disabled = this.data.readOnly;
+      element.name = this.data.fieldName;
+      element.tabIndex = DEFAULT_TAB_INDEX;
       elementData.userValue = textContent;
       element.setAttribute("id", id);
       element.addEventListener("input", event => {
@@ -9135,9 +9408,6 @@
         element.addEventListener("blur", blurListener);
       }
 
-      element.disabled = this.data.readOnly;
-      element.name = this.data.fieldName;
-
       if (this.data.maxLen !== null) {
         element.maxLength = this.data.maxLen;
       }
@@ -9185,7 +9455,7 @@
 class CheckboxWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
     super(parameters, {
-      isRenderable: parameters.renderInteractiveForms
+      isRenderable: parameters.renderForms
     });
   }
 
@@ -9206,29 +9476,38 @@
 
     this.container.className = "buttonWidgetAnnotation checkBox";
     const element = document.createElement("input");
+    GetElementsByNameSet.add(element);
     element.disabled = data.readOnly;
     element.type = "checkbox";
-    element.name = this.data.fieldName;
+    element.name = data.fieldName;
 
     if (value) {
       element.setAttribute("checked", true);
     }
 
     element.setAttribute("id", id);
-    element.addEventListener("change", function (event) {
-      const name = event.target.name;
+    element.setAttribute("exportValue", data.exportValue);
+    element.tabIndex = DEFAULT_TAB_INDEX;
+    element.addEventListener("change", event => {
+      const {
+        name,
+        checked
+      } = event.target;
 
-      for (const checkbox of document.getElementsByName(name)) {
-        if (checkbox !== event.target) {
-          checkbox.checked = false;
-          storage.setValue(checkbox.parentNode.getAttribute("data-annotation-id"), {
-            value: false
-          });
+      for (const checkbox of this._getElementsByName(name, id)) {
+        const curChecked = checked && checkbox.exportValue === data.exportValue;
+
+        if (checkbox.domElement) {
+          checkbox.domElement.checked = curChecked;
         }
+
+        storage.setValue(checkbox.id, {
+          value: curChecked
+        });
       }
 
       storage.setValue(id, {
-        value: event.target.checked
+        value: checked
       });
     });
 
@@ -9259,7 +9538,7 @@
 class RadioButtonWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
     super(parameters, {
-      isRenderable: parameters.renderInteractiveForms
+      isRenderable: parameters.renderForms
     });
   }
 
@@ -9280,6 +9559,7 @@
     }
 
     const element = document.createElement("input");
+    GetElementsByNameSet.add(element);
     element.disabled = data.readOnly;
     element.type = "radio";
     element.name = data.fieldName;
@@ -9289,21 +9569,21 @@
     }
 
     element.setAttribute("id", id);
-    element.addEventListener("change", function (event) {
+    element.tabIndex = DEFAULT_TAB_INDEX;
+    element.addEventListener("change", event => {
       const {
-        target
-      } = event;
-
-      for (const radio of document.getElementsByName(target.name)) {
-        if (radio !== target) {
-          storage.setValue(radio.getAttribute("id"), {
-            value: false
-          });
-        }
+        name,
+        checked
+      } = event.target;
+
+      for (const radio of this._getElementsByName(name, id)) {
+        storage.setValue(radio.id, {
+          value: false
+        });
       }
 
       storage.setValue(id, {
-        value: target.checked
+        value: checked
       });
     });
 
@@ -9311,18 +9591,21 @@
       const pdfButtonValue = data.buttonValue;
       element.addEventListener("updatefromsandbox", jsEvent => {
         const actions = {
-          value(event) {
+          value: event => {
             const checked = pdfButtonValue === event.detail.value;
 
-            for (const radio of document.getElementsByName(event.target.name)) {
-              const radioId = radio.getAttribute("id");
-              radio.checked = radioId === id && checked;
-              storage.setValue(radioId, {
-                value: radio.checked
+            for (const radio of this._getElementsByName(event.target.name)) {
+              const curChecked = checked && radio.id === id;
+
+              if (radio.domElement) {
+                radio.domElement.checked = curChecked;
+              }
+
+              storage.setValue(radio.id, {
+                value: curChecked
               });
             }
           }
-
         };
 
         this._dispatchEventFromSandbox(actions, jsEvent);
@@ -9354,7 +9637,7 @@
 class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
     super(parameters, {
-      isRenderable: parameters.renderInteractiveForms
+      isRenderable: parameters.renderForms
     });
   }
 
@@ -9365,10 +9648,22 @@
     storage.getValue(id, {
       value: this.data.fieldValue.length > 0 ? this.data.fieldValue[0] : undefined
     });
+    let {
+      fontSize
+    } = this.data.defaultAppearanceData;
+
+    if (!fontSize) {
+      fontSize = 9;
+    }
+
+    const fontSizeStyle = `calc(${fontSize}px * var(--zoom-factor))`;
     const selectElement = document.createElement("select");
+    GetElementsByNameSet.add(selectElement);
     selectElement.disabled = this.data.readOnly;
     selectElement.name = this.data.fieldName;
     selectElement.setAttribute("id", id);
+    selectElement.tabIndex = DEFAULT_TAB_INDEX;
+    selectElement.style.fontSize = `${fontSize}px`;
 
     if (!this.data.combo) {
       selectElement.size = this.data.options.length;
@@ -9383,6 +9678,10 @@
       optionElement.textContent = option.displayValue;
       optionElement.value = option.exportValue;
 
+      if (this.data.combo) {
+        optionElement.style.fontSize = fontSizeStyle;
+      }
+
       if (this.data.fieldValue.includes(option.exportValue)) {
         optionElement.setAttribute("selected", true);
       }
@@ -10149,11 +10448,12 @@
         linkService: parameters.linkService,
         downloadManager: parameters.downloadManager,
         imageResourcesPath: parameters.imageResourcesPath || "",
-        renderInteractiveForms: parameters.renderInteractiveForms !== false,
+        renderForms: parameters.renderForms !== false,
         svgFactory: new _display_utils.DOMSVGFactory(),
         annotationStorage: parameters.annotationStorage || new _annotation_storage.AnnotationStorage(),
         enableScripting: parameters.enableScripting,
         hasJSActions: parameters.hasJSActions,
+        fieldObjects: parameters.fieldObjects,
         mouseState: parameters.mouseState || {
           isDown: false
         }
@@ -10202,7 +10502,7 @@
 exports.AnnotationLayer = AnnotationLayer;
 
 /***/ }),
-/* 18 */
+/* 19 */
 /***/ ((__unused_webpack_module, exports) => {
 
 
@@ -10270,7 +10570,7 @@
 exports.ColorConverters = ColorConverters;
 
 /***/ }),
-/* 19 */
+/* 20 */
 /***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
@@ -10347,7 +10647,7 @@
 
 function appendText(task, geom, styles, ctx) {
   const textDiv = document.createElement("span");
-  const textDivProperties = {
+  const textDivProperties = task._enhanceTextSelection ? {
     angle: 0,
     canvasWidth: 0,
     hasText: geom.str !== "",
@@ -10358,6 +10658,11 @@
     paddingRight: 0,
     paddingTop: 0,
     scale: 1
+  } : {
+    angle: 0,
+    canvasWidth: 0,
+    hasText: geom.str !== "",
+    hasEOL: geom.hasEOL
   };
 
   task._textDivs.push(textDiv);
@@ -10786,6 +11091,10 @@
     this._bounds = [];
 
     this._capability.promise.finally(() => {
+      if (!this._enhanceTextSelection) {
+        this._textDivProperties = null;
+      }
+
       if (this._layoutTextCtx) {
         this._layoutTextCtx.canvas.width = 0;
         this._layoutTextCtx.canvas.height = 0;
@@ -10802,7 +11111,7 @@
     this._canceled = true;
 
     if (this._reader) {
-      this._reader.cancel(new _util.AbortException("TextLayer task cancelled."));
+      this._reader.cancel(new _util.AbortException("TextLayer task cancelled.")).catch(() => {});
 
       this._reader = null;
     }
@@ -10864,8 +11173,13 @@
       } = this._layoutTextCtx.measureText(textDiv.textContent);
 
       if (width > 0) {
-        textDivProperties.scale = textDivProperties.canvasWidth / width;
-        transform = `scaleX(${textDivProperties.scale})`;
+        const scale = textDivProperties.canvasWidth / width;
+
+        if (this._enhanceTextSelection) {
+          textDivProperties.scale = scale;
+        }
+
+        transform = `scaleX(${scale})`;
       }
     }
 
@@ -10934,7 +11248,7 @@
       this._reader = this._textContentStream.getReader();
       pump();
     } else {
-      throw new Error('Neither "textContent" nor "textContentStream"' + " parameters specified.");
+      throw new Error('Neither "textContent" nor "textContentStream" parameters specified.');
     }
 
     capability.promise.then(() => {
@@ -11038,7 +11352,7 @@
 }
 
 /***/ }),
-/* 20 */
+/* 21 */
 /***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
@@ -11064,8 +11378,8 @@
 ;
 
 /***/ }),
-/* 21 */
-/***/ ((__unused_webpack_module, exports) => {
+/* 22 */
+/***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
 
@@ -11074,6 +11388,8 @@
 }));
 exports.XfaLayer = void 0;
 
+var _xfa_text = __w_pdfjs_require__(17);
+
 class XfaLayer {
   static setupStorage(html, id, element, storage, intent) {
     const storedData = storage.getValue(id, {
@@ -11101,6 +11417,8 @@
         if (element.attributes.type === "radio" || element.attributes.type === "checkbox") {
           if (storedData.value === element.attributes.xfaOn) {
             html.setAttribute("checked", true);
+          } else if (storedData.value === element.attributes.xfaOff) {
+            html.removeAttribute("checked");
           }
 
           if (intent === "print") {
@@ -11109,7 +11427,7 @@
 
           html.addEventListener("change", event => {
             storage.setValue(id, {
-              value: event.target.getAttribute("xfaOn")
+              value: event.target.checked ? event.target.getAttribute("xfaOn") : event.target.getAttribute("xfaOff")
             });
           });
         } else {
@@ -11198,6 +11516,7 @@
     const transform = `matrix(${parameters.viewport.transform.join(",")})`;
     rootDiv.style.transform = transform;
     rootDiv.setAttribute("class", "xfaLayer xfaFont");
+    const textDivs = [];
 
     while (stack.length > 0) {
       const [parent, i, html] = stack[stack.length - 1];
@@ -11218,7 +11537,9 @@
       } = child;
 
       if (name === "#text") {
-        html.appendChild(document.createTextNode(child.value));
+        const node = document.createTextNode(child.value);
+        textDivs.push(node);
+        html.appendChild(node);
         continue;
       }
 
@@ -11239,13 +11560,23 @@
       if (child.children && child.children.length > 0) {
         stack.push([child, -1, childHtml]);
       } else if (child.value) {
-        childHtml.appendChild(document.createTextNode(child.value));
+        const node = document.createTextNode(child.value);
+
+        if (_xfa_text.XfaText.shouldBuildText(name)) {
+          textDivs.push(node);
+        }
+
+        childHtml.appendChild(node);
       }
     }
 
     for (const el of rootDiv.querySelectorAll(".xfaNonInteractive input, .xfaNonInteractive textarea")) {
       el.setAttribute("readOnly", true);
     }
+
+    return {
+      textDivs
+    };
   }
 
   static update(parameters) {
@@ -11343,46 +11674,22 @@
     return _display_utils.PDFDateString;
   }
 }));
-Object.defineProperty(exports, "RenderingCancelledException", ({
-  enumerable: true,
-  get: function () {
-    return _display_utils.RenderingCancelledException;
-  }
-}));
-Object.defineProperty(exports, "build", ({
-  enumerable: true,
-  get: function () {
-    return _api.build;
-  }
-}));
-Object.defineProperty(exports, "getDocument", ({
-  enumerable: true,
-  get: function () {
-    return _api.getDocument;
-  }
-}));
-Object.defineProperty(exports, "LoopbackPort", ({
-  enumerable: true,
-  get: function () {
-    return _api.LoopbackPort;
-  }
-}));
-Object.defineProperty(exports, "PDFDataRangeTransport", ({
+Object.defineProperty(exports, "PixelsPerInch", ({
   enumerable: true,
   get: function () {
-    return _api.PDFDataRangeTransport;
+    return _display_utils.PixelsPerInch;
   }
 }));
-Object.defineProperty(exports, "PDFWorker", ({
+Object.defineProperty(exports, "RenderingCancelledException", ({
   enumerable: true,
   get: function () {
-    return _api.PDFWorker;
+    return _display_utils.RenderingCancelledException;
   }
 }));
-Object.defineProperty(exports, "version", ({
+Object.defineProperty(exports, "AnnotationMode", ({
   enumerable: true,
   get: function () {
-    return _api.version;
+    return _util.AnnotationMode;
   }
 }));
 Object.defineProperty(exports, "CMapCompressionType", ({
@@ -11475,6 +11782,42 @@
     return _util.VerbosityLevel;
   }
 }));
+Object.defineProperty(exports, "build", ({
+  enumerable: true,
+  get: function () {
+    return _api.build;
+  }
+}));
+Object.defineProperty(exports, "getDocument", ({
+  enumerable: true,
+  get: function () {
+    return _api.getDocument;
+  }
+}));
+Object.defineProperty(exports, "LoopbackPort", ({
+  enumerable: true,
+  get: function () {
+    return _api.LoopbackPort;
+  }
+}));
+Object.defineProperty(exports, "PDFDataRangeTransport", ({
+  enumerable: true,
+  get: function () {
+    return _api.PDFDataRangeTransport;
+  }
+}));
+Object.defineProperty(exports, "PDFWorker", ({
+  enumerable: true,
+  get: function () {
+    return _api.PDFWorker;
+  }
+}));
+Object.defineProperty(exports, "version", ({
+  enumerable: true,
+  get: function () {
+    return _api.version;
+  }
+}));
 Object.defineProperty(exports, "AnnotationLayer", ({
   enumerable: true,
   get: function () {
@@ -11508,24 +11851,24 @@
 
 var _display_utils = __w_pdfjs_require__(1);
 
-var _api = __w_pdfjs_require__(6);
-
 var _util = __w_pdfjs_require__(2);
 
-var _annotation_layer = __w_pdfjs_require__(17);
+var _api = __w_pdfjs_require__(6);
+
+var _annotation_layer = __w_pdfjs_require__(18);
 
 var _worker_options = __w_pdfjs_require__(12);
 
 var _is_node = __w_pdfjs_require__(4);
 
-var _text_layer = __w_pdfjs_require__(19);
+var _text_layer = __w_pdfjs_require__(20);
 
-var _svg = __w_pdfjs_require__(20);
+var _svg = __w_pdfjs_require__(21);
 
-var _xfa_layer = __w_pdfjs_require__(21);
+var _xfa_layer = __w_pdfjs_require__(22);
 
-const pdfjsVersion = '2.11.22';
-const pdfjsBuild = '4ad5c5d52';
+const pdfjsVersion = '2.11.298';
+const pdfjsBuild = 'd370a281c';
 ;
 })();
 
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/build/pdf.scripting.js thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/build/pdf.scripting.js
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/build/pdf.scripting.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/build/pdf.scripting.js	2021-12-09 12:00:10.000000000 +0000
@@ -1436,7 +1436,7 @@
       str = `0${str}`;
     }
 
-    const numbers = str.match(/([0-9]+)/g);
+    const numbers = str.match(/(\d+)/g);
 
     if (numbers.length === 0) {
       return null;
@@ -1538,9 +1538,9 @@
     let pattern;
 
     if (sepStyle > 1) {
-      pattern = event.willCommit ? /^[+-]?([0-9]+(,[0-9]*)?|,[0-9]+)$/ : /^[+-]?[0-9]*,?[0-9]*$/;
+      pattern = event.willCommit ? /^[+-]?(\d+(,\d*)?|,\d+)$/ : /^[+-]?\d*,?\d*$/;
     } else {
-      pattern = event.willCommit ? /^[+-]?([0-9]+(\.[0-9]*)?|\.[0-9]+)$/ : /^[+-]?[0-9]*\.?[0-9]*$/;
+      pattern = event.willCommit ? /^[+-]?(\d+(\.\d*)?|\.\d+)$/ : /^[+-]?\d*\.?\d*$/;
     }
 
     if (!pattern.test(value)) {
@@ -2435,7 +2435,37 @@
 
   execDialog() {}
 
-  execMenuItem() {}
+  execMenuItem(item) {
+    switch (item) {
+      case "SaveAs":
+      case "FirstPage":
+      case "LastPage":
+      case "NextPage":
+      case "PrevPage":
+      case "ZoomViewIn":
+      case "ZoomViewOut":
+        this._send({
+          command: item
+        });
+
+        break;
+
+      case "FitPage":
+        this._send({
+          command: "zoom",
+          value: "page-fit"
+        });
+
+        break;
+
+      case "Print":
+        this._send({
+          command: "print"
+        });
+
+        break;
+    }
+  }
 
   getNthPlugInName() {}
 
@@ -4330,7 +4360,7 @@
       throw new TypeError("First argument of printf must be a string");
     }
 
-    const pattern = /%(,[0-4])?([+ 0#]+)?([0-9]+)?(\.[0-9]+)?(.)/g;
+    const pattern = /%(,[0-4])?([+ 0#]+)?(\d+)?(\.\d+)?(.)/g;
     const PLUS = 1;
     const SPACE = 2;
     const ZERO = 4;
@@ -4696,13 +4726,13 @@
           }
         },
         mm: {
-          pattern: `([0-9]{2})`,
+          pattern: `(\\d{2})`,
           action: (value, data) => {
             data.month = parseInt(value) - 1;
           }
         },
         m: {
-          pattern: `([0-9]{1,2})`,
+          pattern: `(\\d{1,2})`,
           action: (value, data) => {
             data.month = parseInt(value) - 1;
           }
@@ -4720,73 +4750,73 @@
           }
         },
         dd: {
-          pattern: "([0-9]{2})",
+          pattern: "(\\d{2})",
           action: (value, data) => {
             data.day = parseInt(value);
           }
         },
         d: {
-          pattern: "([0-9]{1,2})",
+          pattern: "(\\d{1,2})",
           action: (value, data) => {
             data.day = parseInt(value);
           }
         },
         yyyy: {
-          pattern: "([0-9]{4})",
+          pattern: "(\\d{4})",
           action: (value, data) => {
             data.year = parseInt(value);
           }
         },
         yy: {
-          pattern: "([0-9]{2})",
+          pattern: "(\\d{2})",
           action: (value, data) => {
             data.year = 2000 + parseInt(value);
           }
         },
         HH: {
-          pattern: "([0-9]{2})",
+          pattern: "(\\d{2})",
           action: (value, data) => {
             data.hours = parseInt(value);
           }
         },
         H: {
-          pattern: "([0-9]{1,2})",
+          pattern: "(\\d{1,2})",
           action: (value, data) => {
             data.hours = parseInt(value);
           }
         },
         hh: {
-          pattern: "([0-9]{2})",
+          pattern: "(\\d{2})",
           action: (value, data) => {
             data.hours = parseInt(value);
           }
         },
         h: {
-          pattern: "([0-9]{1,2})",
+          pattern: "(\\d{1,2})",
           action: (value, data) => {
             data.hours = parseInt(value);
           }
         },
         MM: {
-          pattern: "([0-9]{2})",
+          pattern: "(\\d{2})",
           action: (value, data) => {
             data.minutes = parseInt(value);
           }
         },
         M: {
-          pattern: "([0-9]{1,2})",
+          pattern: "(\\d{1,2})",
           action: (value, data) => {
             data.minutes = parseInt(value);
           }
         },
         ss: {
-          pattern: "([0-9]{2})",
+          pattern: "(\\d{2})",
           action: (value, data) => {
             data.seconds = parseInt(value);
           }
         },
         s: {
-          pattern: "([0-9]{1,2})",
+          pattern: "(\\d{1,2})",
           action: (value, data) => {
             data.seconds = parseInt(value);
           }
@@ -4902,8 +4932,8 @@
 
 var _initialization = __w_pdfjs_require__(1);
 
-const pdfjsVersion = '2.11.22';
-const pdfjsBuild = '4ad5c5d52';
+const pdfjsVersion = '2.11.298';
+const pdfjsBuild = 'd370a281c';
 })();
 
 /******/ 	return __webpack_exports__;
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/build/pdf.worker.js thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/build/pdf.worker.js
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/build/pdf.worker.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/build/pdf.worker.js	2021-12-09 12:00:11.000000000 +0000
@@ -125,7 +125,7 @@
     const WorkerTasks = [];
     const verbosity = (0, _util.getVerbosityLevel)();
     const apiVersion = docParams.apiVersion;
-    const workerVersion = '2.11.22';
+    const workerVersion = '2.11.298';
 
     if (apiVersion !== workerVersion) {
       throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);
@@ -481,7 +481,7 @@
       filename
     }) {
       pdfManager.requestLoadedStream();
-      const promises = [pdfManager.onLoadedStream(), pdfManager.ensureCatalog("acroForm"), pdfManager.ensureDoc("xref"), pdfManager.ensureDoc("startXRef")];
+      const promises = [pdfManager.onLoadedStream(), pdfManager.ensureCatalog("acroForm"), pdfManager.ensureCatalog("acroFormRef"), pdfManager.ensureDoc("xref"), pdfManager.ensureDoc("startXRef")];
 
       if (isPureXfa) {
         promises.push(pdfManager.serializeXfaData(annotationStorage));
@@ -496,7 +496,7 @@
         }
       }
 
-      return Promise.all(promises).then(function ([stream, acroForm, xref, startXRef, ...refs]) {
+      return Promise.all(promises).then(function ([stream, acroForm, acroFormRef, xref, startXRef, ...refs]) {
         let newRefs = [];
         let xfaData = null;
 
@@ -516,16 +516,24 @@
           }
         }
 
-        const xfa = acroForm instanceof _primitives.Dict && acroForm.get("XFA") || [];
-        let xfaDatasets = null;
+        const xfa = acroForm instanceof _primitives.Dict && acroForm.get("XFA") || null;
+        let xfaDatasetsRef = null;
+        let hasXfaDatasetsEntry = false;
 
         if (Array.isArray(xfa)) {
           for (let i = 0, ii = xfa.length; i < ii; i += 2) {
             if (xfa[i] === "datasets") {
-              xfaDatasets = xfa[i + 1];
+              xfaDatasetsRef = xfa[i + 1];
+              acroFormRef = null;
+              hasXfaDatasetsEntry = true;
             }
           }
-        } else {
+
+          if (xfaDatasetsRef === null) {
+            xfaDatasetsRef = xref.getNewRef();
+          }
+        } else if (xfa) {
+          acroFormRef = null;
           (0, _util.warn)("Unsupported XFA type.");
         }
 
@@ -561,7 +569,11 @@
           xrefInfo: newXrefInfo,
           newRefs,
           xref,
-          datasetsRef: xfaDatasets,
+          hasXfa: !!xfa,
+          xfaDatasetsRef,
+          hasXfaDatasetsEntry,
+          acroFormRef,
+          acroForm,
           xfaData
         });
       });
@@ -577,7 +589,7 @@
           sink,
           task,
           intent: data.intent,
-          renderInteractiveForms: data.renderInteractiveForms,
+          cacheKey: data.cacheKey,
           annotationStorage: data.annotationStorage
         }).then(function (operatorListInfo) {
           finishWorkerTask(task);
@@ -603,11 +615,6 @@
     });
     handler.on("GetTextContent", function wphExtractText(data, sink) {
       const pageIndex = data.pageIndex;
-
-      sink.onPull = function (desiredSize) {};
-
-      sink.onCancel = function (reason) {};
-
       pdfManager.getPage(pageIndex).then(function (page) {
         const task = new WorkerTask("GetTextContent: page " + pageIndex);
         startWorkerTask(task);
@@ -741,7 +748,7 @@
 exports.unreachable = unreachable;
 exports.utf8StringToString = utf8StringToString;
 exports.warn = warn;
-exports.VerbosityLevel = exports.Util = exports.UNSUPPORTED_FEATURES = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.IsLittleEndianCached = exports.IsEvalSupportedCached = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FontType = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.AnnotationType = exports.AnnotationStateModelType = exports.AnnotationReviewState = exports.AnnotationReplyType = exports.AnnotationMarkedState = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
+exports.VerbosityLevel = exports.Util = exports.UNSUPPORTED_FEATURES = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.RenderingIntentFlag = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.IsLittleEndianCached = exports.IsEvalSupportedCached = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FontType = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.AnnotationType = exports.AnnotationStateModelType = exports.AnnotationReviewState = exports.AnnotationReplyType = exports.AnnotationMode = exports.AnnotationMarkedState = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
 
 __w_pdfjs_require__(3);
 
@@ -749,6 +756,23 @@
 exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
 const FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
 exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
+const RenderingIntentFlag = {
+  ANY: 0x01,
+  DISPLAY: 0x02,
+  PRINT: 0x04,
+  ANNOTATIONS_FORMS: 0x10,
+  ANNOTATIONS_STORAGE: 0x20,
+  ANNOTATIONS_DISABLE: 0x40,
+  OPLIST: 0x100
+};
+exports.RenderingIntentFlag = RenderingIntentFlag;
+const AnnotationMode = {
+  DISABLE: 0,
+  ENABLE: 1,
+  ENABLE_FORMS: 2,
+  ENABLE_STORAGE: 3
+};
+exports.AnnotationMode = AnnotationMode;
 const PermissionFlag = {
   PRINT: 0x04,
   MODIFY_CONTENTS: 0x08,
@@ -1164,13 +1188,13 @@
 }
 
 const BaseException = function BaseExceptionClosure() {
-  function BaseException(message) {
+  function BaseException(message, name) {
     if (this.constructor === BaseException) {
       unreachable("Cannot initialize BaseException.");
     }
 
     this.message = message;
-    this.name = this.constructor.name;
+    this.name = name;
   }
 
   BaseException.prototype = new Error();
@@ -1182,7 +1206,7 @@
 
 class PasswordException extends BaseException {
   constructor(msg, code) {
-    super(msg);
+    super(msg, "PasswordException");
     this.code = code;
   }
 
@@ -1192,7 +1216,7 @@
 
 class UnknownErrorException extends BaseException {
   constructor(msg, details) {
-    super(msg);
+    super(msg, "UnknownErrorException");
     this.details = details;
   }
 
@@ -1200,17 +1224,27 @@
 
 exports.UnknownErrorException = UnknownErrorException;
 
-class InvalidPDFException extends BaseException {}
+class InvalidPDFException extends BaseException {
+  constructor(msg) {
+    super(msg, "InvalidPDFException");
+  }
+
+}
 
 exports.InvalidPDFException = InvalidPDFException;
 
-class MissingPDFException extends BaseException {}
+class MissingPDFException extends BaseException {
+  constructor(msg) {
+    super(msg, "MissingPDFException");
+  }
+
+}
 
 exports.MissingPDFException = MissingPDFException;
 
 class UnexpectedResponseException extends BaseException {
   constructor(msg, status) {
-    super(msg);
+    super(msg, "UnexpectedResponseException");
     this.status = status;
   }
 
@@ -1218,11 +1252,21 @@
 
 exports.UnexpectedResponseException = UnexpectedResponseException;
 
-class FormatError extends BaseException {}
+class FormatError extends BaseException {
+  constructor(msg) {
+    super(msg, "FormatError");
+  }
+
+}
 
 exports.FormatError = FormatError;
 
-class AbortException extends BaseException {}
+class AbortException extends BaseException {
+  constructor(msg) {
+    super(msg, "AbortException");
+  }
+
+}
 
 exports.AbortException = AbortException;
 const NullCharactersRegExp = /\x00/g;
@@ -1638,7 +1682,6 @@
 exports.clearPrimitiveCaches = clearPrimitiveCaches;
 exports.isCmd = isCmd;
 exports.isDict = isDict;
-exports.isEOF = isEOF;
 exports.isName = isName;
 exports.isRef = isRef;
 exports.isRefsEqual = isRefsEqual;
@@ -1649,7 +1692,7 @@
 
 var _base_stream = __w_pdfjs_require__(6);
 
-const EOF = {};
+const EOF = Symbol("EOF");
 exports.EOF = EOF;
 
 const Name = function NameClosure() {
@@ -1840,7 +1883,7 @@
         if (property === undefined) {
           property = [];
           properties.set(key, property);
-        } else if (!mergeSubDicts) {
+        } else if (!mergeSubDicts || !(value instanceof Dict)) {
           continue;
         }
 
@@ -1857,10 +1900,6 @@
       const subDict = new Dict(xref);
 
       for (const dict of values) {
-        if (!(dict instanceof Dict)) {
-          continue;
-        }
-
         for (const [key, value] of Object.entries(dict._map)) {
           if (subDict._map[key] === undefined) {
             subDict._map[key] = value;
@@ -1985,10 +2024,6 @@
 
 exports.RefSetCache = RefSetCache;
 
-function isEOF(v) {
-  return v === EOF;
-}
-
 function isName(v, name) {
   return v instanceof Name && (name === undefined || v.name === name);
 }
@@ -2634,7 +2669,7 @@
 
     let chunks = [],
         loaded = 0;
-    const promise = new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       const readChunk = chunk => {
         try {
           if (!chunk.done) {
@@ -2661,8 +2696,7 @@
       };
 
       rangeReader.read().then(readChunk, reject);
-    });
-    promise.then(data => {
+    }).then(data => {
       if (this.aborted) {
         return;
       }
@@ -2724,7 +2758,7 @@
       for (const groupedChunk of groupedChunksToRequest) {
         const begin = groupedChunk.beginChunk * this.chunkSize;
         const end = Math.min(groupedChunk.endChunk * this.chunkSize, this.length);
-        this.sendRequest(begin, end);
+        this.sendRequest(begin, end).catch(capability.reject);
       }
     }
 
@@ -2928,6 +2962,7 @@
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
+exports.addDefaultProtocolToUrl = addDefaultProtocolToUrl;
 exports.collectActions = collectActions;
 exports.encodeToXmlString = encodeToXmlString;
 exports.escapePDFName = escapePDFName;
@@ -2941,6 +2976,7 @@
 exports.readUint16 = readUint16;
 exports.readUint32 = readUint32;
 exports.toRomanNumerals = toRomanNumerals;
+exports.tryConvertUrlEncoding = tryConvertUrlEncoding;
 exports.validateCSSFont = validateCSSFont;
 exports.XRefParseException = exports.XRefEntryException = exports.ParserEOFException = exports.MissingDataException = void 0;
 
@@ -2982,7 +3018,7 @@
 
 class MissingDataException extends _util.BaseException {
   constructor(begin, end) {
-    super(`Missing data [${begin}, ${end})`);
+    super(`Missing data [${begin}, ${end})`, "MissingDataException");
     this.begin = begin;
     this.end = end;
   }
@@ -2991,15 +3027,30 @@
 
 exports.MissingDataException = MissingDataException;
 
-class ParserEOFException extends _util.BaseException {}
+class ParserEOFException extends _util.BaseException {
+  constructor(msg) {
+    super(msg, "ParserEOFException");
+  }
+
+}
 
 exports.ParserEOFException = ParserEOFException;
 
-class XRefEntryException extends _util.BaseException {}
+class XRefEntryException extends _util.BaseException {
+  constructor(msg) {
+    super(msg, "XRefEntryException");
+  }
+
+}
 
 exports.XRefEntryException = XRefEntryException;
 
-class XRefParseException extends _util.BaseException {}
+class XRefParseException extends _util.BaseException {
+  constructor(msg) {
+    super(msg, "XRefParseException");
+  }
+
+}
 
 exports.XRefParseException = XRefParseException;
 
@@ -3085,7 +3136,7 @@
 }
 
 function parseXFAPath(path) {
-  const positionPattern = /(.+)\[([0-9]+)\]$/;
+  const positionPattern = /(.+)\[(\d+)\]$/;
   return path.split(".").map(component => {
     const m = component.match(positionPattern);
 
@@ -3303,7 +3354,7 @@
     }
   } else {
     for (const ident of fontFamily.split(/[ \t]+/)) {
-      if (/^([0-9]|(-([0-9]|-)))/.test(ident) || !/^[a-zA-Z0-9\-_\\]+$/.test(ident)) {
+      if (/^(\d|(-(\d|-)))/.test(ident) || !/^[\w-\\]+$/.test(ident)) {
         (0, _util.warn)(`XFA - FontFamily contains some invalid <custom-ident>: ${fontFamily}.`);
         return false;
       }
@@ -3317,6 +3368,18 @@
   return true;
 }
 
+function addDefaultProtocolToUrl(url) {
+  return url.startsWith("www.") ? `http://${url}` : url;
+}
+
+function tryConvertUrlEncoding(url) {
+  try {
+    return (0, _util.stringToUTF8String)(url);
+  } catch (e) {
+    return url;
+  }
+}
+
 /***/ }),
 /* 10 */
 /***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
@@ -3700,8 +3763,8 @@
     sink,
     task,
     intent,
-    renderInteractiveForms,
-    annotationStorage
+    cacheKey,
+    annotationStorage = null
   }) {
     const contentStreamPromise = this.getContentStream(handler);
     const resourcesPromise = this.loadResources(["ColorSpace", "ExtGState", "Font", "Pattern", "Properties", "Shading", "XObject"]);
@@ -3722,7 +3785,7 @@
       handler.send("StartRenderPage", {
         transparency: partialEvaluator.hasBlendModes(this.resources, this.nonBlendModesSet),
         pageIndex: this.pageIndex,
-        intent
+        cacheKey
       });
       return partialEvaluator.getOperatorList({
         stream: contentStream,
@@ -3734,19 +3797,22 @@
       });
     });
     return Promise.all([pageListPromise, this._parsedAnnotations]).then(function ([pageOpList, annotations]) {
-      if (annotations.length === 0) {
+      if (annotations.length === 0 || intent & _util.RenderingIntentFlag.ANNOTATIONS_DISABLE) {
         pageOpList.flush(true);
         return {
           length: pageOpList.totalLength
         };
       }
 
-      const annotationIntent = intent.startsWith("oplist-") ? intent.split("-")[1] : intent;
+      const renderForms = !!(intent & _util.RenderingIntentFlag.ANNOTATIONS_FORMS),
+            intentAny = !!(intent & _util.RenderingIntentFlag.ANY),
+            intentDisplay = !!(intent & _util.RenderingIntentFlag.DISPLAY),
+            intentPrint = !!(intent & _util.RenderingIntentFlag.PRINT);
       const opListPromises = [];
 
       for (const annotation of annotations) {
-        if (annotationIntent === "display" && annotation.mustBeViewed(annotationStorage) || annotationIntent === "print" && annotation.mustBePrinted(annotationStorage)) {
-          opListPromises.push(annotation.getOperatorList(partialEvaluator, task, renderInteractiveForms, annotationStorage).catch(function (reason) {
+        if (intentAny || intentDisplay && annotation.mustBeViewed(annotationStorage) || intentPrint && annotation.mustBePrinted(annotationStorage)) {
+          opListPromises.push(annotation.getOperatorList(partialEvaluator, task, renderForms, annotationStorage).catch(function (reason) {
             (0, _util.warn)("getOperatorList - ignoring annotation data during " + `"${task.name}" task: "${reason}".`);
             return null;
           }));
@@ -3825,9 +3891,17 @@
     return this._parsedAnnotations.then(function (annotations) {
       const annotationsData = [];
 
-      for (let i = 0, ii = annotations.length; i < ii; i++) {
-        if (!intent || intent === "display" && annotations[i].viewable || intent === "print" && annotations[i].printable) {
-          annotationsData.push(annotations[i].data);
+      if (annotations.length === 0) {
+        return annotationsData;
+      }
+
+      const intentAny = !!(intent & _util.RenderingIntentFlag.ANY),
+            intentDisplay = !!(intent & _util.RenderingIntentFlag.DISPLAY),
+            intentPrint = !!(intent & _util.RenderingIntentFlag.PRINT);
+
+      for (const annotation of annotations) {
+        if (intentAny || intentDisplay && annotation.viewable || intentPrint && annotation.printable) {
+          annotationsData.push(annotation.data);
         }
       }
 
@@ -3872,7 +3946,7 @@
 const ENDOBJ_SIGNATURE = new Uint8Array([0x65, 0x6e, 0x64, 0x6f, 0x62, 0x6a]);
 const FINGERPRINT_FIRST_BYTES = 1024;
 const EMPTY_FINGERPRINT = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
-const PDF_HEADER_VERSION_REGEXP = /^[1-9]\.[0-9]$/;
+const PDF_HEADER_VERSION_REGEXP = /^[1-9]\.\d$/;
 
 function find(stream, signature, limit = 1024, backwards = false) {
   const signatureLength = signature.length;
@@ -4181,7 +4255,7 @@
   }
 
   get xfaFactory() {
-    if (this.pdfManager.enableXfa && this.formInfo.hasXfa && !this.formInfo.hasAcroForm) {
+    if (this.pdfManager.enableXfa && this.catalog.needsRendering && this.formInfo.hasXfa && !this.formInfo.hasAcroForm) {
       const data = this.xfaData;
       return (0, _util.shadow)(this, "xfaFactory", data ? new _factory.XFAFactory(data) : null);
     }
@@ -4289,7 +4363,7 @@
       }
 
       let fontFamily = descriptor.get("FontFamily");
-      fontFamily = fontFamily.replace(/[ ]+([0-9])/g, "$1");
+      fontFamily = fontFamily.replace(/[ ]+(\d)/g, "$1");
       const fontWeight = descriptor.get("FontWeight");
       const italicAngle = -descriptor.get("ItalicAngle");
       const cssFontInfo = {
@@ -6744,6 +6818,11 @@
       getArray: true
     });
     data.defaultFieldValue = this._decodeFormValue(defaultFieldValue);
+
+    if (fieldValue === undefined && data.defaultFieldValue !== null) {
+      data.fieldValue = data.defaultFieldValue;
+    }
+
     data.alternativeText = (0, _util.stringToPDFString)(dict.get("TU") || "");
     const defaultAppearance = (0, _core_utils.getInheritableProperty)({
       dict,
@@ -7457,6 +7536,12 @@
       return;
     }
 
+    const asValue = this._decodeFormValue(params.dict.get("AS"));
+
+    if (typeof asValue === "string") {
+      this.data.fieldValue = asValue;
+    }
+
     const exportValues = normalAppearance.getKeys();
 
     if (!exportValues.includes("Off")) {
@@ -9452,6 +9537,7 @@
   TILING: 1,
   SHADING: 2
 };
+const TEXT_CHUNK_BATCH_SIZE = 10;
 const deferred = Promise.resolve();
 
 function normalizeBlendMode(value, parsingArray = false) {
@@ -9809,11 +9895,13 @@
       bbox = null;
     }
 
-    let optionalContent = null,
-        groupOptions;
+    let optionalContent, groupOptions;
 
     if (dict.has("OC")) {
       optionalContent = await this.parseMarkedContentProps(dict.get("OC"), resources);
+    }
+
+    if (optionalContent !== undefined) {
       operatorList.addOp(_util.OPS.beginMarkedContentProps, ["OC", optionalContent]);
     }
 
@@ -9873,7 +9961,7 @@
         operatorList.addOp(_util.OPS.endGroup, [groupOptions]);
       }
 
-      if (optionalContent) {
+      if (optionalContent !== undefined) {
         operatorList.addOp(_util.OPS.endMarkedContent, []);
       }
     });
@@ -9905,17 +9993,28 @@
 
     if (!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h))) {
       (0, _util.warn)("Image dimensions are missing, or not numbers.");
-      return undefined;
+      return;
     }
 
     const maxImageSize = this.options.maxImageSize;
 
     if (maxImageSize !== -1 && w * h > maxImageSize) {
       (0, _util.warn)("Image exceeded maximum allowed size and was removed.");
-      return undefined;
+      return;
+    }
+
+    let optionalContent;
+
+    if (dict.has("OC")) {
+      optionalContent = await this.parseMarkedContentProps(dict.get("OC"), resources);
+    }
+
+    if (optionalContent !== undefined) {
+      operatorList.addOp(_util.OPS.beginMarkedContentProps, ["OC", optionalContent]);
     }
 
     const imageMask = dict.get("ImageMask", "IM") || false;
+    const interpolate = dict.get("Interpolate", "I");
     let imgData, args;
 
     if (imageMask) {
@@ -9929,7 +10028,8 @@
         width,
         height,
         imageIsFromDecodeStream: image instanceof _decode_stream.DecodeStream,
-        inverseDecode: !!decode && decode[0] > 0
+        inverseDecode: !!decode && decode[0] > 0,
+        interpolate
       });
       imgData.cached = !!cacheKey;
       args = [imgData];
@@ -9942,7 +10042,11 @@
         });
       }
 
-      return undefined;
+      if (optionalContent !== undefined) {
+        operatorList.addOp(_util.OPS.endMarkedContent, []);
+      }
+
+      return;
     }
 
     const softMask = dict.get("SMask", "SM") || false;
@@ -9960,7 +10064,12 @@
       });
       imgData = imageObj.createImageData(true);
       operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]);
-      return undefined;
+
+      if (optionalContent !== undefined) {
+        operatorList.addOp(_util.OPS.endMarkedContent, []);
+      }
+
+      return;
     }
 
     let objId = `img_${this.idFactory.createObjId()}`,
@@ -10022,7 +10131,9 @@
       }
     }
 
-    return undefined;
+    if (optionalContent !== undefined) {
+      operatorList.addOp(_util.OPS.endMarkedContent, []);
+    }
   }
 
   handleSMask(smask, resources, operatorList, task, stateManager, localColorSpaceCache) {
@@ -10103,7 +10214,7 @@
     return transferMaps;
   }
 
-  handleTilingType(fn, color, resources, pattern, patternDict, operatorList, task, cacheKey, localTilingPatternCache) {
+  handleTilingType(fn, color, resources, pattern, patternDict, operatorList, task, localTilingPatternCache) {
     const tilingOpList = new _operator_list.OperatorList();
 
     const patternResources = _primitives.Dict.merge({
@@ -10122,8 +10233,8 @@
       operatorList.addDependencies(tilingOpList.dependencies);
       operatorList.addOp(fn, tilingPatternIR);
 
-      if (cacheKey) {
-        localTilingPatternCache.set(cacheKey, patternDict.objId, {
+      if (patternDict.objId) {
+        localTilingPatternCache.set(null, patternDict.objId, {
           operatorListIR,
           dict: patternDict
         });
@@ -10548,8 +10659,8 @@
     const patternName = args.pop();
 
     if (patternName instanceof _primitives.Name) {
-      const name = patternName.name;
-      const localTilingPattern = localTilingPatternCache.getByName(name);
+      const rawPattern = patterns.getRaw(patternName.name);
+      const localTilingPattern = rawPattern instanceof _primitives.Ref && localTilingPatternCache.getByRef(rawPattern);
 
       if (localTilingPattern) {
         try {
@@ -10560,7 +10671,7 @@
         } catch (ex) {}
       }
 
-      const pattern = patterns.get(name);
+      const pattern = this.xref.fetchIfRef(rawPattern);
 
       if (pattern) {
         const dict = (0, _primitives.isStream)(pattern) ? pattern.dict : pattern;
@@ -10568,7 +10679,7 @@
 
         if (typeNum === PatternType.TILING) {
           const color = cs.base ? cs.base.getRgb(args, 0) : null;
-          return this.handleTilingType(fn, color, resources, pattern, dict, operatorList, task, name, localTilingPatternCache);
+          return this.handleTilingType(fn, color, resources, pattern, dict, operatorList, task, localTilingPatternCache);
         } else if (typeNum === PatternType.SHADING) {
           const shading = dict.get("Shading");
           const matrix = dict.getArray("Matrix");
@@ -11609,8 +11720,6 @@
       if (textContentItem.initialized) {
         textContentItem.hasEOL = true;
         flushTextContentItem();
-      } else if (textContent.items.length > 0) {
-        textContent.items[textContent.items.length - 1].hasEOL = true;
       } else {
         textContent.items.push({
           str: "",
@@ -11684,20 +11793,26 @@
       textContentItem.str.length = 0;
     }
 
-    function enqueueChunk() {
+    function enqueueChunk(batch = false) {
       const length = textContent.items.length;
 
-      if (length > 0) {
-        sink.enqueue(textContent, length);
-        textContent.items = [];
-        textContent.styles = Object.create(null);
+      if (length === 0) {
+        return;
       }
+
+      if (batch && length < TEXT_CHUNK_BATCH_SIZE) {
+        return;
+      }
+
+      sink.enqueue(textContent, length);
+      textContent.items = [];
+      textContent.styles = Object.create(null);
     }
 
     const timeSlotManager = new TimeSlotManager();
     return new Promise(function promiseBody(resolve, reject) {
       const next = function (promise) {
-        enqueueChunk();
+        enqueueChunk(true);
         Promise.all([promise, sink.ready]).then(function () {
           try {
             promiseBody(resolve, reject);
@@ -12389,6 +12504,11 @@
 
         const map = new Array(cmap.length);
         cmap.forEach(function (charCode, token) {
+          if (typeof token === "number") {
+            map[charCode] = String.fromCodePoint(token);
+            return;
+          }
+
           const str = [];
 
           for (let k = 0; k < token.length; k += 2) {
@@ -14382,7 +14502,7 @@
     while (true) {
       let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -14403,7 +14523,7 @@
     while (true) {
       let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -14425,7 +14545,7 @@
         obj = lexer.getObj();
         const array = [];
 
-        while (!(0, _primitives.isCmd)(obj, "]") && !(0, _primitives.isEOF)(obj)) {
+        while (!(0, _primitives.isCmd)(obj, "]") && obj !== _primitives.EOF) {
           array.push(obj);
           obj = lexer.getObj();
         }
@@ -14443,7 +14563,7 @@
     while (true) {
       let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -14464,7 +14584,7 @@
     while (true) {
       let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -14488,7 +14608,7 @@
     while (true) {
       let obj = lexer.getObj();
 
-      if ((0, _primitives.isEOF)(obj)) {
+      if (obj === _primitives.EOF) {
         break;
       }
 
@@ -14537,7 +14657,7 @@
       try {
         const obj = lexer.getObj();
 
-        if ((0, _primitives.isEOF)(obj)) {
+        if (obj === _primitives.EOF) {
           break;
         } else if ((0, _primitives.isName)(obj)) {
           if (obj.name === "WMode") {
@@ -14793,11 +14913,11 @@
         case "[":
           const array = [];
 
-          while (!(0, _primitives.isCmd)(this.buf1, "]") && !(0, _primitives.isEOF)(this.buf1)) {
+          while (!(0, _primitives.isCmd)(this.buf1, "]") && this.buf1 !== _primitives.EOF) {
             array.push(this.getObj(cipherTransform));
           }
 
-          if ((0, _primitives.isEOF)(this.buf1)) {
+          if (this.buf1 === _primitives.EOF) {
             if (this.recoveryMode) {
               return array;
             }
@@ -14811,7 +14931,7 @@
         case "<<":
           const dict = new _primitives.Dict(this.xref);
 
-          while (!(0, _primitives.isCmd)(this.buf1, ">>") && !(0, _primitives.isEOF)(this.buf1)) {
+          while (!(0, _primitives.isCmd)(this.buf1, ">>") && this.buf1 !== _primitives.EOF) {
             if (!(0, _primitives.isName)(this.buf1)) {
               (0, _util.info)("Malformed dictionary: key must be a name object");
               this.shift();
@@ -14821,14 +14941,14 @@
             const key = this.buf1.name;
             this.shift();
 
-            if ((0, _primitives.isEOF)(this.buf1)) {
+            if (this.buf1 === _primitives.EOF) {
               break;
             }
 
             dict.set(key, this.getObj(cipherTransform));
           }
 
-          if ((0, _primitives.isEOF)(this.buf1)) {
+          if (this.buf1 === _primitives.EOF) {
             if (this.recoveryMode) {
               return dict;
             }
@@ -15132,7 +15252,7 @@
     const dict = new _primitives.Dict(this.xref);
     let dictLength;
 
-    while (!(0, _primitives.isCmd)(this.buf1, "ID") && !(0, _primitives.isEOF)(this.buf1)) {
+    while (!(0, _primitives.isCmd)(this.buf1, "ID") && this.buf1 !== _primitives.EOF) {
       if (!(0, _primitives.isName)(this.buf1)) {
         throw new _util.FormatError("Dictionary key must be a name object");
       }
@@ -15140,7 +15260,7 @@
       const key = this.buf1.name;
       this.shift();
 
-      if ((0, _primitives.isEOF)(this.buf1)) {
+      if (this.buf1 === _primitives.EOF) {
         break;
       }
 
@@ -15894,6 +16014,16 @@
     }
 
     let str = String.fromCharCode(ch);
+
+    if (ch < 0x20 || ch > 0x7f) {
+      const nextCh = this.peekChar();
+
+      if (nextCh >= 0x20 && nextCh <= 0x7f) {
+        this.nextChar();
+        return _primitives.Cmd.get(str);
+      }
+    }
+
     const knownCommands = this.knownCommands;
     let knownCommandFound = knownCommands && knownCommands[str] !== undefined;
 
@@ -17582,7 +17712,7 @@
 
 class Jbig2Error extends _util.BaseException {
   constructor(msg) {
-    super(`JBIG2 error: ${msg}`);
+    super(`JBIG2 error: ${msg}`, "Jbig2Error");
   }
 
 }
@@ -20230,20 +20360,25 @@
 
 class JpegError extends _util.BaseException {
   constructor(msg) {
-    super(`JPEG error: ${msg}`);
+    super(`JPEG error: ${msg}`, "JpegError");
   }
 
 }
 
 class DNLMarkerError extends _util.BaseException {
   constructor(message, scanLines) {
-    super(message);
+    super(message, "DNLMarkerError");
     this.scanLines = scanLines;
   }
 
 }
 
-class EOIMarkerError extends _util.BaseException {}
+class EOIMarkerError extends _util.BaseException {
+  constructor(msg) {
+    super(msg, "EOIMarkerError");
+  }
+
+}
 
 const dctZigZag = new Uint8Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]);
 const dctCos1 = 4017;
@@ -21554,7 +21689,7 @@
 
 class JpxError extends _util.BaseException {
   constructor(msg) {
-    super(`JPX error: ${msg}`);
+    super(`JPX error: ${msg}`, "JpxError");
   }
 
 }
@@ -22772,6 +22907,12 @@
           zeroBitPlanesTree = new TagTree(width, height);
           precinct.inclusionTree = inclusionTree;
           precinct.zeroBitPlanesTree = zeroBitPlanesTree;
+
+          for (let l = 0; l < layerNumber; l++) {
+            if (readBits(1) !== 0) {
+              throw new JpxError("Invalid tag tree");
+            }
+          }
         }
 
         if (inclusionTree.reset(codeblockColumn, codeblockRow, layerNumber)) {
@@ -24418,8 +24559,8 @@
       if (properties.toUnicode.has(charCode)) {
         continue;
       }
-    } else {
-      if (properties.hasEncoding && properties.differences[charCode] !== undefined) {
+    } else if (properties.hasEncoding) {
+      if (properties.differences.length === 0 || properties.differences[charCode] !== undefined) {
         continue;
       }
     }
@@ -24593,6 +24734,12 @@
   return [fileType, fileSubtype];
 }
 
+function applyStandardFontGlyphMap(map, glyphMap) {
+  for (const charCode in glyphMap) {
+    map[+charCode] = glyphMap[charCode];
+  }
+}
+
 function buildToFontChar(encoding, glyphsUnicodeMap, differences) {
   const toFontChar = [];
   let unicode;
@@ -25118,26 +25265,14 @@
     this.remeasure = (!isStandardFont || isNarrow) && Object.keys(this.widths).length > 0;
 
     if ((isStandardFont || isMappedToStandardFont) && type === "CIDFontType2" && this.cidEncoding.startsWith("Identity-")) {
-      const GlyphMapForStandardFonts = (0, _standard_fonts.getGlyphMapForStandardFonts)(),
-            cidToGidMap = properties.cidToGidMap;
+      const cidToGidMap = properties.cidToGidMap;
       const map = [];
-
-      for (const charCode in GlyphMapForStandardFonts) {
-        map[+charCode] = GlyphMapForStandardFonts[charCode];
-      }
+      applyStandardFontGlyphMap(map, (0, _standard_fonts.getGlyphMapForStandardFonts)());
 
       if (/Arial-?Black/i.test(name)) {
-        const SupplementalGlyphMapForArialBlack = (0, _standard_fonts.getSupplementalGlyphMapForArialBlack)();
-
-        for (const charCode in SupplementalGlyphMapForArialBlack) {
-          map[+charCode] = SupplementalGlyphMapForArialBlack[charCode];
-        }
+        applyStandardFontGlyphMap(map, (0, _standard_fonts.getSupplementalGlyphMapForArialBlack)());
       } else if (/Calibri/i.test(name)) {
-        const SupplementalGlyphMapForCalibri = (0, _standard_fonts.getSupplementalGlyphMapForCalibri)();
-
-        for (const charCode in SupplementalGlyphMapForCalibri) {
-          map[+charCode] = SupplementalGlyphMapForCalibri[charCode];
-        }
+        applyStandardFontGlyphMap(map, (0, _standard_fonts.getSupplementalGlyphMapForCalibri)());
       }
 
       if (cidToGidMap) {
@@ -25148,11 +25283,19 @@
             map[+charCode] = cidToGidMap[cid];
           }
         }
-      }
 
-      const isIdentityUnicode = this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap;
+        if (cidToGidMap.length !== this.toUnicode.length && properties.hasIncludedToUnicodeMap && this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap) {
+          this.toUnicode.forEach(function (charCode, unicodeCharCode) {
+            const cid = map[charCode];
+
+            if (cidToGidMap[cid] === undefined) {
+              map[+charCode] = unicodeCharCode;
+            }
+          });
+        }
+      }
 
-      if (!isIdentityUnicode) {
+      if (!(this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap)) {
         this.toUnicode.forEach(function (charCode, unicodeCharCode) {
           map[+charCode] = unicodeCharCode;
         });
@@ -25169,7 +25312,15 @@
 
       this.toFontChar = buildToFontChar(_encodings.ZapfDingbatsEncoding, (0, _glyphlist.getDingbatsGlyphsUnicode)(), this.differences);
     } else if (isStandardFont) {
-      this.toFontChar = buildToFontChar(this.defaultEncoding, (0, _glyphlist.getGlyphsUnicode)(), this.differences);
+      const map = buildToFontChar(this.defaultEncoding, (0, _glyphlist.getGlyphsUnicode)(), this.differences);
+
+      if (type === "CIDFontType2" && !this.cidEncoding.startsWith("Identity-") && !(this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap)) {
+        this.toUnicode.forEach(function (charCode, unicodeCharCode) {
+          map[+charCode] = unicodeCharCode;
+        });
+      }
+
+      this.toFontChar = map;
     } else {
       const glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
       const map = [];
@@ -25188,11 +25339,7 @@
 
       if (this.composite && this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap) {
         if (/Verdana/i.test(name)) {
-          const GlyphMapForStandardFonts = (0, _standard_fonts.getGlyphMapForStandardFonts)();
-
-          for (const charCode in GlyphMapForStandardFonts) {
-            map[+charCode] = GlyphMapForStandardFonts[charCode];
-          }
+          applyStandardFontGlyphMap(map, (0, _standard_fonts.getGlyphMapForStandardFonts)());
         }
       }
 
@@ -26545,7 +26692,8 @@
       const cmapEncodingId = cmapTable.encodingId;
       const cmapMappings = cmapTable.mappings;
       const cmapMappingsLength = cmapMappings.length;
-      let baseEncoding = [];
+      let baseEncoding = [],
+          forcePostTable = false;
 
       if (properties.hasEncoding && (properties.baseEncodingName === "MacRomanEncoding" || properties.baseEncodingName === "WinAnsiEncoding")) {
         baseEncoding = (0, _encodings.getEncoding)(properties.baseEncodingName);
@@ -26559,7 +26707,7 @@
 
           if (this.differences[charCode] !== undefined) {
             glyphName = this.differences[charCode];
-          } else if (baseEncoding[charCode] !== "") {
+          } else if (baseEncoding.length && baseEncoding[charCode] !== "") {
             glyphName = baseEncoding[charCode];
           } else {
             glyphName = _encodings.StandardEncoding[charCode];
@@ -26578,6 +26726,20 @@
             unicodeOrCharCode = _encodings.MacRomanEncoding.indexOf(standardGlyphName);
           }
 
+          if (unicodeOrCharCode === undefined) {
+            if (!properties.glyphNames && properties.hasIncludedToUnicodeMap && !(this.toUnicode instanceof _to_unicode_map.IdentityToUnicodeMap)) {
+              const unicode = this.toUnicode.get(charCode);
+
+              if (unicode) {
+                unicodeOrCharCode = unicode.codePointAt(0);
+              }
+            }
+
+            if (unicodeOrCharCode === undefined) {
+              continue;
+            }
+          }
+
           for (let i = 0; i < cmapMappingsLength; ++i) {
             if (cmapMappings[i].charCode !== unicodeOrCharCode) {
               continue;
@@ -26591,6 +26753,8 @@
         for (let i = 0; i < cmapMappingsLength; ++i) {
           charCodeToGlyphId[cmapMappings[i].charCode] = cmapMappings[i].glyphId;
         }
+
+        forcePostTable = true;
       } else {
         for (let i = 0; i < cmapMappingsLength; ++i) {
           let charCode = cmapMappings[i].charCode;
@@ -26605,7 +26769,7 @@
 
       if (properties.glyphNames && (baseEncoding.length || this.differences.length)) {
         for (let i = 0; i < 256; ++i) {
-          if (charCodeToGlyphId[i] !== undefined) {
+          if (!forcePostTable && charCodeToGlyphId[i] !== undefined) {
             continue;
           }
 
@@ -29037,6 +29201,12 @@
   t["ComicSansMS-Bold"] = "Comic Sans MS-Bold";
   t["ComicSansMS-BoldItalic"] = "Comic Sans MS-BoldItalic";
   t["ComicSansMS-Italic"] = "Comic Sans MS-Italic";
+  t["ItcSymbol-Bold"] = "Helvetica-Bold";
+  t["ItcSymbol-BoldItalic"] = "Helvetica-BoldOblique";
+  t["ItcSymbol-Book"] = "Helvetica";
+  t["ItcSymbol-BookItalic"] = "Helvetica-Oblique";
+  t["ItcSymbol-Medium"] = "Helvetica";
+  t["ItcSymbol-MediumItalic"] = "Helvetica-Oblique";
   t.LucidaConsole = "Courier";
   t["LucidaConsole-Bold"] = "Courier-Bold";
   t["LucidaConsole-BoldItalic"] = "Courier-BoldOblique";
@@ -29376,12 +29546,17 @@
   t[169] = 171;
   t[170] = 187;
   t[171] = 8230;
+  t[200] = 193;
+  t[203] = 205;
   t[210] = 218;
   t[223] = 711;
   t[224] = 321;
   t[225] = 322;
+  t[226] = 352;
   t[227] = 353;
+  t[228] = 381;
   t[229] = 382;
+  t[233] = 221;
   t[234] = 253;
   t[252] = 263;
   t[253] = 268;
@@ -29391,11 +29566,13 @@
   t[261] = 261;
   t[265] = 280;
   t[266] = 281;
+  t[267] = 282;
   t[268] = 283;
   t[269] = 313;
   t[275] = 323;
   t[276] = 324;
   t[278] = 328;
+  t[283] = 344;
   t[284] = 345;
   t[285] = 346;
   t[286] = 347;
@@ -29611,14 +29788,19 @@
 const getSupplementalGlyphMapForCalibri = (0, _core_utils.getLookupTableFactory)(function (t) {
   t[1] = 32;
   t[4] = 65;
+  t[6] = 193;
   t[17] = 66;
   t[18] = 67;
+  t[21] = 268;
   t[24] = 68;
   t[28] = 69;
+  t[30] = 201;
+  t[32] = 282;
   t[38] = 70;
   t[39] = 71;
   t[44] = 72;
   t[47] = 73;
+  t[49] = 205;
   t[58] = 74;
   t[60] = 75;
   t[62] = 76;
@@ -29628,26 +29810,35 @@
   t[87] = 80;
   t[89] = 81;
   t[90] = 82;
+  t[92] = 344;
   t[94] = 83;
+  t[97] = 352;
   t[100] = 84;
   t[104] = 85;
   t[115] = 86;
   t[116] = 87;
   t[121] = 88;
   t[122] = 89;
+  t[124] = 221;
   t[127] = 90;
+  t[129] = 381;
   t[258] = 97;
+  t[260] = 225;
   t[268] = 261;
   t[271] = 98;
   t[272] = 99;
   t[273] = 263;
+  t[275] = 269;
   t[282] = 100;
   t[286] = 101;
+  t[288] = 233;
+  t[290] = 283;
   t[295] = 281;
   t[296] = 102;
   t[336] = 103;
   t[346] = 104;
   t[349] = 105;
+  t[351] = 237;
   t[361] = 106;
   t[364] = 107;
   t[367] = 108;
@@ -29659,15 +29850,19 @@
   t[393] = 112;
   t[395] = 113;
   t[396] = 114;
+  t[398] = 345;
   t[400] = 115;
   t[401] = 347;
+  t[403] = 353;
   t[410] = 116;
   t[437] = 117;
   t[448] = 118;
   t[449] = 119;
   t[454] = 120;
   t[455] = 121;
+  t[457] = 253;
   t[460] = 122;
+  t[462] = 382;
   t[463] = 380;
   t[853] = 44;
   t[855] = 58;
@@ -35333,7 +35528,9 @@
       (0, _util.unreachable)("Cannot initialize BaseLocalCache.");
     }
 
-    if (!options || !options.onlyRefs) {
+    this._onlyRefs = (options && options.onlyRefs) === true;
+
+    if (!this._onlyRefs) {
       this._nameRefMap = new Map();
       this._imageMap = new Map();
     }
@@ -35342,6 +35539,10 @@
   }
 
   getByName(name) {
+    if (this._onlyRefs) {
+      (0, _util.unreachable)("Should not call `getByName` method.");
+    }
+
     const ref = this._nameRefMap.get(name);
 
     if (ref) {
@@ -35428,10 +35629,6 @@
     });
   }
 
-  getByName(name) {
-    (0, _util.unreachable)("Should not call `getByName` method.");
-  }
-
   set(name = null, ref, data) {
     if (!ref) {
       throw new Error('LocalFunctionCache.set - expected "ref" argument.');
@@ -35478,28 +35675,22 @@
 exports.LocalGStateCache = LocalGStateCache;
 
 class LocalTilingPatternCache extends BaseLocalCache {
-  set(name, ref = null, data) {
-    if (typeof name !== "string") {
-      throw new Error('LocalTilingPatternCache.set - expected "name" argument.');
-    }
-
-    if (ref) {
-      if (this._imageCache.has(ref)) {
-        return;
-      }
-
-      this._nameRefMap.set(name, ref);
-
-      this._imageCache.put(ref, data);
+  constructor(options) {
+    super({
+      onlyRefs: true
+    });
+  }
 
-      return;
+  set(name = null, ref, data) {
+    if (!ref) {
+      throw new Error('LocalTilingPatternCache.set - expected "ref" argument.');
     }
 
-    if (this._imageMap.has(name)) {
+    if (this._imageCache.has(ref)) {
       return;
     }
 
-    this._imageMap.set(name, data);
+    this._imageCache.put(ref, data);
   }
 
 }
@@ -39552,12 +39743,12 @@
     return (0, _util.shadow)(this, "CHUNK_SIZE_ABOUT", this.CHUNK_SIZE - 5);
   }
 
-  constructor(intent, streamSink) {
+  constructor(intent = 0, streamSink) {
     this._streamSink = streamSink;
     this.fnArray = [];
     this.argsArray = [];
 
-    if (streamSink && !(intent && intent.startsWith("oplist-"))) {
+    if (streamSink && !(intent & _util.RenderingIntentFlag.OPLIST)) {
       this.optimizer = new QueueOptimizer(this);
     } else {
       this.optimizer = new NullOptimizer(this);
@@ -39805,7 +39996,7 @@
 
     this.width = width;
     this.height = height;
-    this.interpolate = dict.get("Interpolate", "I") || false;
+    this.interpolate = dict.get("Interpolate", "I");
     this.imageMask = dict.get("ImageMask", "IM") || false;
     this.matte = dict.get("Matte") || false;
     let bitsPerComponent = image.bitsPerComponent;
@@ -39950,7 +40141,8 @@
     width,
     height,
     imageIsFromDecodeStream,
-    inverseDecode
+    inverseDecode,
+    interpolate
   }) {
     const computedLength = (width + 7 >> 3) * height;
     const actualLength = imgArray.byteLength;
@@ -39980,7 +40172,8 @@
     return {
       data,
       width,
-      height
+      height,
+      interpolate
     };
   }
 
@@ -40210,6 +40403,7 @@
     const imgData = {
       width: drawWidth,
       height: drawHeight,
+      interpolate: this.interpolate,
       kind: 0,
       data: null
     };
@@ -40366,10 +40560,10 @@
 }));
 exports.Catalog = void 0;
 
-var _primitives = __w_pdfjs_require__(5);
-
 var _core_utils = __w_pdfjs_require__(9);
 
+var _primitives = __w_pdfjs_require__(5);
+
 var _util = __w_pdfjs_require__(2);
 
 var _name_number_tree = __w_pdfjs_require__(65);
@@ -40421,6 +40615,16 @@
     return (0, _util.shadow)(this, "version", version.name);
   }
 
+  get needsRendering() {
+    const needsRendering = this._catDict.get("NeedsRendering");
+
+    if (!(0, _util.isBool)(needsRendering)) {
+      return (0, _util.shadow)(this, "needsRendering", false);
+    }
+
+    return (0, _util.shadow)(this, "needsRendering", needsRendering);
+  }
+
   get collection() {
     let collection = null;
 
@@ -40461,6 +40665,12 @@
     return (0, _util.shadow)(this, "acroForm", acroForm);
   }
 
+  get acroFormRef() {
+    const value = this._catDict.getRaw("AcroForm");
+
+    return (0, _util.shadow)(this, "acroFormRef", (0, _primitives.isRef)(value) ? value : null);
+  }
+
   get metadata() {
     const streamRef = this._catDict.getRaw("Metadata");
 
@@ -41669,18 +41879,6 @@
   }
 
   static parseDestDictionary(params) {
-    function addDefaultProtocolToUrl(url) {
-      return url.startsWith("www.") ? `http://${url}` : url;
-    }
-
-    function tryConvertUrlEncoding(url) {
-      try {
-        return (0, _util.stringToUTF8String)(url);
-      } catch (e) {
-        return url;
-      }
-    }
-
     const destDict = params.destDict;
 
     if (!(0, _primitives.isDict)(destDict)) {
@@ -41733,7 +41931,7 @@
           if ((0, _primitives.isName)(url)) {
             url = "/" + url.name;
           } else if ((0, _util.isString)(url)) {
-            url = addDefaultProtocolToUrl(url);
+            url = (0, _core_utils.addDefaultProtocolToUrl)(url);
           }
 
           break;
@@ -41826,7 +42024,7 @@
     }
 
     if ((0, _util.isString)(url)) {
-      url = tryConvertUrlEncoding(url);
+      url = (0, _core_utils.tryConvertUrlEncoding)(url);
       const absoluteUrl = (0, _util.createValidAbsoluteUrl)(url, docBaseUrl);
 
       if (absoluteUrl) {
@@ -43412,10 +43610,16 @@
     buffer.push(`(${(0, _util.escapeString)(value)})`);
   } else if (typeof value === "number") {
     buffer.push(numberToString(value));
+  } else if (typeof value === "boolean") {
+    buffer.push(value.toString());
   } else if ((0, _primitives.isDict)(value)) {
     writeDict(value, buffer, transform);
   } else if ((0, _primitives.isStream)(value)) {
     writeStream(value, buffer, transform);
+  } else if (value === null) {
+    buffer.push("null");
+  } else {
+    (0, _util.warn)(`Unhandled value in writer: ${typeof value}, please file a bug.`);
   }
 }
 
@@ -43491,26 +43695,63 @@
   return buffer.join("");
 }
 
-function updateXFA(xfaData, datasetsRef, newRefs, xref) {
-  if (datasetsRef === null || xref === null) {
+function updateXFA({
+  xfaData,
+  xfaDatasetsRef,
+  hasXfaDatasetsEntry,
+  acroFormRef,
+  acroForm,
+  newRefs,
+  xref,
+  xrefInfo
+}) {
+  if (xref === null) {
     return;
   }
 
+  if (!hasXfaDatasetsEntry) {
+    if (!acroFormRef) {
+      (0, _util.warn)("XFA - Cannot save it");
+      return;
+    }
+
+    const oldXfa = acroForm.get("XFA");
+    const newXfa = oldXfa.slice();
+    newXfa.splice(2, 0, "datasets");
+    newXfa.splice(3, 0, xfaDatasetsRef);
+    acroForm.set("XFA", newXfa);
+    const encrypt = xref.encrypt;
+    let transform = null;
+
+    if (encrypt) {
+      transform = encrypt.createCipherTransform(acroFormRef.num, acroFormRef.gen);
+    }
+
+    const buffer = [`${acroFormRef.num} ${acroFormRef.gen} obj\n`];
+    writeDict(acroForm, buffer, transform);
+    buffer.push("\n");
+    acroForm.set("XFA", oldXfa);
+    newRefs.push({
+      ref: acroFormRef,
+      data: buffer.join("")
+    });
+  }
+
   if (xfaData === null) {
-    const datasets = xref.fetchIfRef(datasetsRef);
+    const datasets = xref.fetchIfRef(xfaDatasetsRef);
     xfaData = writeXFADataForAcroform(datasets.getString(), newRefs);
   }
 
   const encrypt = xref.encrypt;
 
   if (encrypt) {
-    const transform = encrypt.createCipherTransform(datasetsRef.num, datasetsRef.gen);
+    const transform = encrypt.createCipherTransform(xfaDatasetsRef.num, xfaDatasetsRef.gen);
     xfaData = transform.encryptString(xfaData);
   }
 
-  const data = `${datasetsRef.num} ${datasetsRef.gen} obj\n` + `<< /Type /EmbeddedFile /Length ${xfaData.length}>>\nstream\n` + xfaData + "\nendstream\nendobj\n";
+  const data = `${xfaDatasetsRef.num} ${xfaDatasetsRef.gen} obj\n` + `<< /Type /EmbeddedFile /Length ${xfaData.length}>>\nstream\n` + xfaData + "\nendstream\nendobj\n";
   newRefs.push({
-    ref: datasetsRef,
+    ref: xfaDatasetsRef,
     data
   });
 }
@@ -43520,10 +43761,26 @@
   xrefInfo,
   newRefs,
   xref = null,
-  datasetsRef = null,
+  hasXfa = false,
+  xfaDatasetsRef = null,
+  hasXfaDatasetsEntry = false,
+  acroFormRef = null,
+  acroForm = null,
   xfaData = null
 }) {
-  updateXFA(xfaData, datasetsRef, newRefs, xref);
+  if (hasXfa) {
+    updateXFA({
+      xfaData,
+      xfaDatasetsRef,
+      hasXfaDatasetsEntry,
+      acroFormRef,
+      acroForm,
+      newRefs,
+      xref,
+      xrefInfo
+    });
+  }
+
   const newXref = new _primitives.Dict(null);
   const refForXrefTable = xrefInfo.newRef;
   let buffer, baseOffset;
@@ -44813,11 +45070,7 @@
     if (cipher instanceof AESBaseCipher) {
       const strLen = s.length;
       const pad = 16 - strLen % 16;
-
-      if (pad !== 16) {
-        s = s.padEnd(16 * Math.ceil(strLen / 16), String.fromCharCode(pad));
-      }
-
+      s += String.fromCharCode(pad).repeat(pad);
       const iv = new Uint8Array(16);
 
       if (typeof crypto !== "undefined") {
@@ -46460,9 +46713,13 @@
     this[$content] = value.toString();
   }
 
-  [$dump]() {
+  [$dump](hasNS = false) {
     const dumped = Object.create(null);
 
+    if (hasNS) {
+      dumped.$ns = this[$namespaceId];
+    }
+
     if (this[$content]) {
       dumped.$content = this[$content];
     }
@@ -46471,7 +46728,7 @@
     dumped.children = [];
 
     for (const child of this[_children]) {
-      dumped.children.push(child[$dump]());
+      dumped.children.push(child[$dump](hasNS));
     }
 
     dumped.attributes = Object.create(null);
@@ -46608,7 +46865,7 @@
   in: x => x * 72,
   px: x => x
 };
-const measurementPattern = /([+-]?[0-9]+\.?[0-9]*)(.*)/;
+const measurementPattern = /([+-]?\d+\.?\d*)(.*)/;
 
 function stripQuotes(str) {
   if (str.startsWith("'") || str.startsWith('"')) {
@@ -46939,6 +47196,8 @@
 
 var _xfa_object = __w_pdfjs_require__(75);
 
+var _namespaces = __w_pdfjs_require__(77);
+
 var _util = __w_pdfjs_require__(2);
 
 const namePattern = /^[^.[]+/;
@@ -46950,8 +47209,9 @@
   dotBracket: 3,
   dotParen: 4
 };
-const shortcuts = new Map([["$data", (root, current) => root.datasets.data], ["$template", (root, current) => root.template], ["$connectionSet", (root, current) => root.connectionSet], ["$form", (root, current) => root.form], ["$layout", (root, current) => root.layout], ["$host", (root, current) => root.host], ["$dataWindow", (root, current) => root.dataWindow], ["$event", (root, current) => root.event], ["!", (root, current) => root.datasets], ["$xfa", (root, current) => root], ["xfa", (root, current) => root], ["$", (root, current) => current]]);
+const shortcuts = new Map([["$data", (root, current) => root.datasets ? root.datasets.data : root], ["$record", (root, current) => (root.datasets ? root.datasets.data : root)[_xfa_object.$getChildren]()[0]], ["$template", (root, current) => root.template], ["$connectionSet", (root, current) => root.connectionSet], ["$form", (root, current) => root.form], ["$layout", (root, current) => root.layout], ["$host", (root, current) => root.host], ["$dataWindow", (root, current) => root.dataWindow], ["$event", (root, current) => root.event], ["!", (root, current) => root.datasets], ["$xfa", (root, current) => root], ["xfa", (root, current) => root], ["$", (root, current) => current]]);
 const somCache = new WeakMap();
+const NS_DATASETS = _namespaces.NamespaceIds.datasets.id;
 
 function parseIndex(index) {
   index = index.trim();
@@ -47177,7 +47437,8 @@
     index
   } of path) {
     for (let i = 0, ii = !isFinite(index) ? 0 : index; i <= ii; i++) {
-      node = new _xfa_object.XmlObject(root[_xfa_object.$namespaceId], name);
+      const nsId = root[_xfa_object.$namespaceId] === NS_DATASETS ? -1 : root[_xfa_object.$namespaceId];
+      node = new _xfa_object.XmlObject(nsId, name);
 
       root[_xfa_object.$appendChild](node);
     }
@@ -47290,6 +47551,8 @@
 
 var _util = __w_pdfjs_require__(2);
 
+const NS_DATASETS = _namespaces.NamespaceIds.datasets.id;
+
 function createText(content) {
   const node = new _template.Text({});
   node[_xfa_object.$content] = content;
@@ -47701,7 +47964,8 @@
         if (dataChildren.length > 0) {
           this._bindOccurrences(child, [dataChildren[0]], null);
         } else if (this.emptyMerge) {
-          const dataChild = child[_xfa_object.$data] = new _xfa_object.XmlObject(dataNode[_xfa_object.$namespaceId], child.name || "root");
+          const nsId = dataNode[_xfa_object.$namespaceId] === NS_DATASETS ? -1 : dataNode[_xfa_object.$namespaceId];
+          const dataChild = child[_xfa_object.$data] = new _xfa_object.XmlObject(nsId, child.name || "root");
 
           dataNode[_xfa_object.$appendChild](dataChild);
 
@@ -47814,7 +48078,8 @@
           match = dataNode[_xfa_object.$getRealChildrenByNameIt](child.name, false, this.emptyMerge).next().value;
 
           if (!match) {
-            match = child[_xfa_object.$data] = new _xfa_object.XmlObject(dataNode[_xfa_object.$namespaceId], child.name);
+            const nsId = dataNode[_xfa_object.$namespaceId] === NS_DATASETS ? -1 : dataNode[_xfa_object.$namespaceId];
+            match = child[_xfa_object.$data] = new _xfa_object.XmlObject(nsId, child.name);
 
             if (this.emptyMerge) {
               match[_xfa_object.$consumed] = true;
@@ -47890,6 +48155,10 @@
 const SVG_NS = "http://www.w3.org/2000/svg";
 const MAX_ATTEMPTS_FOR_LRTB_LAYOUT = 2;
 const MAX_EMPTY_PAGES = 3;
+const DEFAULT_TAB_INDEX = 5000;
+const HEADING_PATTERN = /^H(\d+)$/;
+const MIMES = new Set(["image/gif", "image/jpeg", "image/jpg", "image/pjpeg", "image/png", "image/apng", "image/x-png", "image/bmp", "image/x-ms-bmp", "image/tiff", "image/tif"]);
+const IMAGES_HEADERS = [[[0x42, 0x4d], "image/bmp"], [[0xff, 0xd8, 0xff], "image/jpeg"], [[0x49, 0x49, 0x2a, 0x00], "image/tiff"], [[0x4d, 0x4d, 0x00, 0x2a], "image/tiff"], [[0x47, 0x49, 0x46, 0x38, 0x39, 0x61], "image/gif"], [[0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a], "image/png"]];
 
 function getBorderDims(node) {
   if (!node || !node.border) {
@@ -47943,7 +48212,12 @@
 
 function setTabIndex(node) {
   while (node) {
-    if (!node.traversal || node[_xfa_object.$tabIndex]) {
+    if (!node.traversal) {
+      node[_xfa_object.$tabIndex] = node[_xfa_object.$getParent]()[_xfa_object.$tabIndex];
+      return;
+    }
+
+    if (node[_xfa_object.$tabIndex]) {
       return;
     }
 
@@ -47957,6 +48231,7 @@
     }
 
     if (!next || !next.ref) {
+      node[_xfa_object.$tabIndex] = node[_xfa_object.$getParent]()[_xfa_object.$tabIndex];
       return;
     }
 
@@ -47974,6 +48249,62 @@
   }
 }
 
+function applyAssist(obj, attributes) {
+  const assist = obj.assist;
+
+  if (assist) {
+    const assistTitle = assist[_xfa_object.$toHTML]();
+
+    if (assistTitle) {
+      attributes.title = assistTitle;
+    }
+
+    const role = assist.role;
+    const match = role.match(HEADING_PATTERN);
+
+    if (match) {
+      const ariaRole = "heading";
+      const ariaLevel = match[1];
+      attributes.role = ariaRole;
+      attributes["aria-level"] = ariaLevel;
+    }
+  }
+
+  if (obj.layout === "table") {
+    attributes.role = "table";
+  } else if (obj.layout === "row") {
+    attributes.role = "row";
+  } else {
+    const parent = obj[_xfa_object.$getParent]();
+
+    if (parent.layout === "row") {
+      if (parent.assist && parent.assist.role === "TH") {
+        attributes.role = "columnheader";
+      } else {
+        attributes.role = "cell";
+      }
+    }
+  }
+}
+
+function ariaLabel(obj) {
+  if (!obj.assist) {
+    return null;
+  }
+
+  const assist = obj.assist;
+
+  if (assist.speak && assist.speak[_xfa_object.$content] !== "") {
+    return assist.speak[_xfa_object.$content];
+  }
+
+  if (assist.toolTip) {
+    return assist.toolTip[_xfa_object.$content];
+  }
+
+  return null;
+}
+
 function valueToHtml(value) {
   return _utils.HTMLResult.success({
     name: "div",
@@ -48255,6 +48586,10 @@
     return true;
   }
 
+  [_xfa_object.$isBindable]() {
+    return true;
+  }
+
   [_xfa_object.$addHTML](html, bbox) {
     const [x, y, w, h] = bbox;
     this[_xfa_object.$extra].width = Math.max(this[_xfa_object.$extra].width, x + w);
@@ -48342,7 +48677,7 @@
     this.charEncoding = (0, _utils.getKeyword)({
       data: attributes.charEncoding ? attributes.charEncoding.toLowerCase() : "",
       defaultValue: "",
-      validate: k => ["utf-8", "big-five", "fontspecific", "gbk", "gb-18030", "gb-2312", "ksc-5601", "none", "shift-jis", "ucs-2", "utf-16"].includes(k) || k.match(/iso-8859-[0-9]{2}/)
+      validate: k => ["utf-8", "big-five", "fontspecific", "gbk", "gb-18030", "gb-2312", "ksc-5601", "none", "shift-jis", "ucs-2", "utf-16"].includes(k) || k.match(/iso-8859-\d{2}/)
     });
     this.checksum = (0, _utils.getStringOption)(attributes.checksum, ["none", "1mod10", "1mod10_1mod11", "2mod10", "auto"]);
     this.dataColumnCount = (0, _utils.getInteger)({
@@ -48848,8 +49183,8 @@
 
     const items = field.items.children.length && field.items.children[0][_xfa_object.$toHTML]().html || [];
     const exportedValue = {
-      on: (items[0] || "on").toString(),
-      off: (items[1] || "off").toString()
+      on: (items[0] !== undefined ? items[0] : "on").toString(),
+      off: (items[1] !== undefined ? items[1] : "off").toString()
     };
     const value = field.value && field.value[_xfa_object.$text]() || "off";
     const checked = value === exportedValue.on || undefined;
@@ -48879,7 +49214,9 @@
         dataId,
         type,
         checked,
-        xfaOn: exportedValue.on
+        xfaOn: exportedValue.on,
+        xfaOff: exportedValue.off,
+        "aria-label": ariaLabel(field)
       }
     };
 
@@ -48923,6 +49260,10 @@
 
     const field = ui[_xfa_object.$getParent]();
 
+    const fontSize = field.font && field.font.size || 10;
+    const optionStyle = {
+      fontSize: `calc(${fontSize}px * var(--zoom-factor))`
+    };
     const children = [];
 
     if (field.items.children.length > 0) {
@@ -48946,7 +49287,8 @@
         const option = {
           name: "option",
           attributes: {
-            value: values[i] || displayed[i]
+            value: values[i] || displayed[i],
+            style: optionStyle
           },
           value: displayed[i]
         };
@@ -48974,7 +49316,8 @@
       class: ["xfaSelect"],
       fieldId: field[_xfa_object.$uid],
       dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
-      style
+      style,
+      "aria-label": ariaLabel(field)
     };
 
     if (this.open === "multiSelect") {
@@ -49186,7 +49529,8 @@
         fieldId: field[_xfa_object.$uid],
         dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
         class: ["xfaTextfield"],
-        style
+        style,
+        "aria-label": ariaLabel(field)
       }
     };
     return _utils.HTMLResult.success({
@@ -49333,6 +49677,8 @@
   }
 
   [_xfa_object.$toHTML](availableSpace) {
+    setTabIndex(this);
+
     if (this.presence === "hidden" || this.presence === "inactive") {
       return _utils.HTMLResult.EMPTY;
     }
@@ -49408,12 +49754,7 @@
       attributes,
       children: []
     };
-    const assist = this.assist ? this.assist[_xfa_object.$toHTML]() : null;
-
-    if (assist) {
-      html.attributes.title = assist;
-    }
-
+    applyAssist(this, attributes);
     const bbox = (0, _html_utils.computeBbox)(this, html, availableSpace);
     const value = this.value ? this.value[_xfa_object.$toHTML](availableSpace).html : null;
 
@@ -49789,6 +50130,8 @@
   }
 
   [_xfa_object.$toHTML](availableSpace) {
+    setTabIndex(this);
+
     if (this.presence === "hidden" || this.presence === "inactive" || this.h === 0 || this.w === 0) {
       return _utils.HTMLResult.EMPTY;
     }
@@ -49831,10 +50174,6 @@
       return _utils.HTMLResult.FAILURE;
     }
 
-    availableSpace = {
-      width: this.w === "" ? availableSpace.width : this.w,
-      height: this.h === "" ? availableSpace.height : this.h
-    };
     const filter = new Set(["field"]);
 
     if (this.layout.includes("row")) {
@@ -49935,12 +50274,7 @@
       attributes,
       children
     };
-    const assist = this.assist ? this.assist[_xfa_object.$toHTML]() : null;
-
-    if (assist) {
-      html.attributes.title = assist;
-    }
-
+    applyAssist(this, attributes);
     delete this[_xfa_object.$extra];
     return _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
   }
@@ -50046,6 +50380,8 @@
   }
 
   [_xfa_object.$toHTML](availableSpace) {
+    setTabIndex(this);
+
     if (!this.ui) {
       this.ui = new Ui({});
       this.ui[_xfa_object.$globalData] = this[_xfa_object.$globalData];
@@ -50074,8 +50410,6 @@
       this.ui[_xfa_object.$appendChild](node);
     }
 
-    setTabIndex(this);
-
     if (!this.ui || this.presence === "hidden" || this.presence === "inactive" || this.h === 0 || this.w === 0) {
       return _utils.HTMLResult.EMPTY;
     }
@@ -50219,12 +50553,7 @@
       attributes,
       children
     };
-    const assist = this.assist ? this.assist[_xfa_object.$toHTML]() : null;
-
-    if (assist) {
-      html.attributes.title = assist;
-    }
-
+    applyAssist(this, attributes);
     const borderStyle = this.border ? this.border[_xfa_object.$toStyle]() : null;
     const bbox = (0, _html_utils.computeBbox)(this, html, availableSpace);
 
@@ -50278,6 +50607,11 @@
         }
 
         if (value) {
+          if (this.ui.numericEdit) {
+            value = parseFloat(value);
+            value = isNaN(value) ? "" : value.toString();
+          }
+
           if (ui.children[0].name === "textarea") {
             ui.children[0].attributes.textContent = value;
           } else {
@@ -50669,6 +51003,10 @@
   }
 
   [_xfa_object.$toHTML]() {
+    if (this.contentType && !MIMES.has(this.contentType.toLowerCase())) {
+      return _utils.HTMLResult.EMPTY;
+    }
+
     let buffer = this[_xfa_object.$globalData].images && this[_xfa_object.$globalData].images.get(this.href);
 
     if (!buffer && (this.href || !this[_xfa_object.$content])) {
@@ -50683,6 +51021,19 @@
       return _utils.HTMLResult.EMPTY;
     }
 
+    if (!this.contentType) {
+      for (const [header, type] of IMAGES_HEADERS) {
+        if (buffer.length > header.length && header.every((x, i) => x === buffer[i])) {
+          this.contentType = type;
+          break;
+        }
+      }
+
+      if (!this.contentType) {
+        return _utils.HTMLResult.EMPTY;
+      }
+    }
+
     const blob = new Blob([buffer], {
       type: this.contentType
     });
@@ -50716,12 +51067,15 @@
         break;
     }
 
+    const parent = this[_xfa_object.$getParent]();
+
     return _utils.HTMLResult.success({
       name: "img",
       attributes: {
         class: ["xfaImage"],
         style,
-        src: URL.createObjectURL(blob)
+        src: URL.createObjectURL(blob),
+        alt: parent ? ariaLabel(parent[_xfa_object.$getParent]()) : null
       }
     });
   }
@@ -51085,7 +51439,8 @@
         fieldId: field[_xfa_object.$uid],
         dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
         class: ["xfaTextfield"],
-        style
+        style,
+        "aria-label": ariaLabel(field)
       }
     };
     return _utils.HTMLResult.success({
@@ -52089,6 +52444,8 @@
   }
 
   [_xfa_object.$toHTML](availableSpace) {
+    setTabIndex(this);
+
     if (this.break) {
       if (this.break.after !== "auto" || this.break.afterTarget !== "") {
         const node = new BreakAfter({
@@ -52321,11 +52678,7 @@
       attributes,
       children
     };
-    const assist = this.assist ? this.assist[_xfa_object.$toHTML]() : null;
-
-    if (assist) {
-      html.attributes.title = assist;
-    }
+    applyAssist(this, attributes);
 
     const result = _utils.HTMLResult.success((0, _html_utils.createWrapper)(this, html), bbox);
 
@@ -52379,6 +52732,10 @@
     return parent;
   }
 
+  [_xfa_object.$isBindable]() {
+    return true;
+  }
+
 }
 
 class SubjectDN extends _xfa_object.ContentObject {
@@ -52427,7 +52784,7 @@
     this.textEncoding = (0, _utils.getKeyword)({
       data: attributes.textEncoding ? attributes.textEncoding.toLowerCase() : "",
       defaultValue: "",
-      validate: k => ["utf-8", "big-five", "fontspecific", "gbk", "gb-18030", "gb-2312", "ksc-5601", "none", "shift-jis", "ucs-2", "utf-16"].includes(k) || k.match(/iso-8859-[0-9]{2}/)
+      validate: k => ["utf-8", "big-five", "fontspecific", "gbk", "gb-18030", "gb-2312", "ksc-5601", "none", "shift-jis", "ucs-2", "utf-16"].includes(k) || k.match(/iso-8859-\d{2}/)
     });
     this.use = attributes.use || "";
     this.usehref = attributes.usehref || "";
@@ -52456,7 +52813,7 @@
       (0, _util.warn)("XFA - Several subforms in template node: please file a bug.");
     }
 
-    this[_xfa_object.$tabIndex] = 1000;
+    this[_xfa_object.$tabIndex] = DEFAULT_TAB_INDEX;
   }
 
   [_xfa_object.$isSplittable]() {
@@ -52851,7 +53208,8 @@
           dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
           fieldId: field[_xfa_object.$uid],
           class: ["xfaTextfield"],
-          style
+          style,
+          "aria-label": ariaLabel(field)
         }
       };
     } else {
@@ -52862,7 +53220,8 @@
           dataId: field[_xfa_object.$data] && field[_xfa_object.$data][_xfa_object.$uid] || field[_xfa_object.$uid],
           fieldId: field[_xfa_object.$uid],
           class: ["xfaTextfield"],
-          style
+          style,
+          "aria-label": ariaLabel(field)
         }
       };
     }
@@ -53096,6 +53455,10 @@
 
   [_xfa_object.$text]() {
     if (this.exData) {
+      if (typeof this.exData[_xfa_object.$content] === "string") {
+        return this.exData[_xfa_object.$content].trim();
+      }
+
       return this.exData[_xfa_object.$content][_xfa_object.$text]().trim();
     }
 
@@ -53895,20 +54258,20 @@
             }
 
             if (parent[_xfa_object.$extra].numberInLine === 0) {
-              return space.height > 0;
+              return space.height > ERROR;
             }
 
             return false;
           }
 
-          return space.width > 0;
+          return space.width > ERROR;
         }
 
         if (node.w !== "") {
           return Math.round(w - space.width) <= ERROR;
         }
 
-        return space.width > 0;
+        return space.width > ERROR;
       }
 
       if (node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].noLayoutFailure) {
@@ -53920,14 +54283,14 @@
       }
 
       if (node.w === "" || Math.round(w - space.width) <= ERROR) {
-        return space.height > 0;
+        return space.height > ERROR;
       }
 
       if (parent[_xfa_object.$isThereMoreWidth]()) {
         return false;
       }
 
-      return space.height > 0;
+      return space.height > ERROR;
 
     case "table":
     case "tb":
@@ -53940,14 +54303,14 @@
       }
 
       if (node.w === "" || Math.round(w - space.width) <= ERROR) {
-        return space.height > 0;
+        return space.height > ERROR;
       }
 
       if (parent[_xfa_object.$isThereMoreWidth]()) {
         return false;
       }
 
-      return space.height > 0;
+      return space.height > ERROR;
 
     case "position":
       if (node[_xfa_object.$getTemplateRoot]()[_xfa_object.$extra].noLayoutFailure) {
@@ -58330,10 +58693,14 @@
 
 var _namespaces = __w_pdfjs_require__(77);
 
+var _core_utils = __w_pdfjs_require__(9);
+
 var _html_utils = __w_pdfjs_require__(82);
 
 var _utils = __w_pdfjs_require__(76);
 
+var _util = __w_pdfjs_require__(2);
+
 const XHTML_NS_ID = _namespaces.NamespaceIds.xhtml.id;
 const VALID_STYLES = new Set(["color", "font", "font-family", "font-size", "font-stretch", "font-style", "font-weight", "margin", "margin-bottom", "margin-left", "margin-right", "margin-top", "letter-spacing", "line-height", "orphans", "page-break-after", "page-break-before", "page-break-inside", "tab-interval", "tab-stop", "text-align", "text-decoration", "text-indent", "vertical-align", "widows", "kerning-mode", "xfa-font-horizontal-scale", "xfa-font-vertical-scale", "xfa-spacerun", "xfa-tab-stops"]);
 const StyleMapping = new Map([["page-break-after", "breakAfter"], ["page-break-before", "breakBefore"], ["page-break-inside", "breakInside"], ["kerning-mode", value => value === "none" ? "none" : "normal"], ["xfa-font-horizontal-scale", value => `scaleX(${Math.max(0, Math.min(parseInt(value) / 100)).toFixed(2)})`], ["xfa-font-vertical-scale", value => `scaleY(${Math.max(0, Math.min(parseInt(value) / 100)).toFixed(2)})`], ["xfa-spacerun", ""], ["xfa-tab-stops", ""], ["font-size", (value, original) => {
@@ -58568,7 +58935,19 @@
 class A extends XhtmlObject {
   constructor(attributes) {
     super(attributes, "a");
-    this.href = attributes.href || "";
+    let href = "";
+
+    if (typeof attributes.href === "string") {
+      let url = (0, _core_utils.addDefaultProtocolToUrl)(attributes.href);
+      url = (0, _core_utils.tryConvertUrlEncoding)(url);
+      const absoluteUrl = (0, _util.createValidAbsoluteUrl)(url);
+
+      if (absoluteUrl) {
+        href = absoluteUrl.href;
+      }
+    }
+
+    this.href = href;
   }
 
 }
@@ -59715,7 +60094,8 @@
 };
 
 function wrapReason(reason) {
-  if (typeof reason !== "object" || reason === null) {
+  if (!(reason instanceof Error || typeof reason === "object" && reason !== null)) {
+    (0, _util.warn)('wrapReason: Expected "reason" to be a (possibly cloned) Error.');
     return reason;
   }
 
@@ -59726,6 +60106,9 @@
     case "MissingPDFException":
       return new _util.MissingPDFException(reason.message);
 
+    case "PasswordException":
+      return new _util.PasswordException(reason.message, reason.code);
+
     case "UnexpectedResponseException":
       return new _util.UnexpectedResponseException(reason.message, reason.status);
 
@@ -60059,7 +60442,7 @@
         this.streamSinks[streamId].desiredSize = data.desiredSize;
         const {
           onPull
-        } = this.streamSinks[data.streamId];
+        } = this.streamSinks[streamId];
         new Promise(function (resolve) {
           resolve(onPull && onPull());
         }).then(function () {
@@ -60131,7 +60514,7 @@
 
         const {
           onCancel
-        } = this.streamSinks[data.streamId];
+        } = this.streamSinks[streamId];
         new Promise(function (resolve) {
           resolve(onCancel && onCancel(wrapReason(data.reason)));
         }).then(function () {
@@ -60380,8 +60763,8 @@
 
 var _worker = __w_pdfjs_require__(1);
 
-const pdfjsVersion = '2.11.22';
-const pdfjsBuild = '4ad5c5d52';
+const pdfjsVersion = '2.11.298';
+const pdfjsBuild = 'd370a281c';
 })();
 
 /******/ 	return __webpack_exports__;
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/PdfJsDefaultPreferences.jsm thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/PdfJsDefaultPreferences.jsm
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/PdfJsDefaultPreferences.jsm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/PdfJsDefaultPreferences.jsm	2021-12-09 12:00:11.000000000 +0000
@@ -22,6 +22,7 @@
 "use strict";
 var EXPORTED_SYMBOLS = ["PdfJsDefaultPreferences"];
 var PdfJsDefaultPreferences = Object.freeze({
+ "annotationMode": 2,
  "cursorToolOnLoad": 0,
  "defaultZoomValue": "",
  "disablePageLabels": false,
@@ -32,7 +33,6 @@
  "historyUpdateUrl": false,
  "ignoreDestinationZoom": false,
  "pdfBugEnabled": false,
- "renderInteractiveForms": true,
  "sidebarViewOnLoad": -1,
  "scrollModeOnLoad": -1,
  "spreadModeOnLoad": -1,
@@ -44,5 +44,5 @@
  "disableFontFace": false,
  "disableRange": false,
  "disableStream": false,
- "enableXfa": false
+ "enableXfa": true
 });
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/web/debugger.js thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/web/debugger.js
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/web/debugger.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/web/debugger.js	2021-12-09 12:00:11.000000000 +0000
@@ -540,7 +540,8 @@
         });
       }
     },
-    init(pdfjsLib, container) {
+    init(pdfjsLib, container, ids) {
+      this.enable(ids);
       /*
        * Basic Layout:
        * PDFBug
@@ -589,12 +590,8 @@
           tool.init(pdfjsLib);
         } else {
           panel.textContent =
-            tool.name +
-            " is disabled. To enable add " +
-            ' "' +
-            tool.id +
-            '" to the pdfBug parameter ' +
-            "and refresh (separate multiple by commas).";
+            `${tool.name} is disabled. To enable add "${tool.id}" to ` +
+            "the pdfBug parameter and refresh (separate multiple by commas).";
         }
         buttons.push(panelButton);
       }
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/web/viewer.css thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/web/viewer.css
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/web/viewer.css	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/web/viewer.css	2021-12-09 12:00:10.000000000 +0000
@@ -65,6 +65,11 @@
   background: rgba(0, 0, 255, 1);
 }
 
+/* Avoids https://github.com/mozilla/pdf.js/issues/13840 in Chrome */
+.textLayer br::selection {
+  background: transparent;
+}
+
 .textLayer .endOfContent {
   display: block;
   position: absolute;
@@ -164,6 +169,14 @@
   border: 1px solid transparent;
 }
 
+.annotationLayer .textWidgetAnnotation input :focus,
+.annotationLayer .textWidgetAnnotation textarea :focus,
+.annotationLayer .choiceWidgetAnnotation select :focus,
+.annotationLayer .buttonWidgetAnnotation.checkBox :focus,
+.annotationLayer .buttonWidgetAnnotation.radioButton :focus {
+  outline: auto;
+}
+
 .annotationLayer .buttonWidgetAnnotation.checkBox input:checked:before,
 .annotationLayer .buttonWidgetAnnotation.checkBox input:checked:after,
 .annotationLayer .buttonWidgetAnnotation.radioButton input:checked:before {
@@ -280,6 +293,37 @@
   --unfocused-field-background: url("data:image/svg+xml;charset=UTF-8,<svg width='1px' height='1px' xmlns='http://www.w3.org/2000/svg'><rect width='100%' height='100%' style='fill:rgba(0, 54, 255, 0.13);'/></svg>");
 }
 
+.xfaLayer .highlight {
+  margin: -1px;
+  padding: 1px;
+  background-color: rgba(239, 203, 237, 1);
+  border-radius: 4px;
+}
+
+.xfaLayer .highlight.appended {
+  position: initial;
+}
+
+.xfaLayer .highlight.begin {
+  border-radius: 4px 0 0 4px;
+}
+
+.xfaLayer .highlight.end {
+  border-radius: 0 4px 4px 0;
+}
+
+.xfaLayer .highlight.middle {
+  border-radius: 0;
+}
+
+.xfaLayer .highlight.selected {
+  background-color: rgba(203, 223, 203, 1);
+}
+
+.xfaLayer ::selection {
+  background: rgba(0, 0, 255, 1);
+}
+
 .xfaPage {
   overflow: hidden;
   position: relative;
@@ -418,7 +462,13 @@
 .xfaSelect:focus {
   background-image: none;
   background-color: transparent;
-  outline: none;
+  outline: auto;
+  outline-offset: -1px;
+}
+
+.xfaCheckbox:focus,
+.xfaRadio:focus {
+  outline: auto;
 }
 
 .xfaTextfield,
@@ -554,6 +604,7 @@
   --page-margin: 1px auto -8px;
   --page-border: 9px solid transparent;
   --spreadHorizontalWrapped-margin-LR: -3.5px;
+  --zoom-factor: 1;
 }
 
 @media screen and (forced-colors: active) {
@@ -687,6 +738,8 @@
   --sidebar-width: 200px;
   --sidebar-transition-duration: 200ms;
   --sidebar-transition-timing-function: ease;
+  --scale-select-container-width: 140px;
+  --scale-select-overflow: 22px;
   --loadingBar-end-offset: 0;
 
   --toolbar-icon-opacity: 0.7;
@@ -1549,7 +1602,7 @@
 }
 
 .dropdownToolbarButton {
-  width: 140px;
+  width: var(--scale-select-container-width);
   padding: 0;
   overflow: hidden;
   background-color: var(--dropdown-btn-bg-color);
@@ -1569,7 +1622,9 @@
 }
 
 .dropdownToolbarButton > select {
-  width: 162px;
+  width: calc(
+    var(--scale-select-container-width) + var(--scale-select-overflow)
+  );
   height: 28px;
   font-size: 12px;
   color: var(--main-color);
@@ -2461,7 +2516,7 @@
   }
 
   #printContainer > .xfaPrintedPage .xfaPage {
-    position: initial;
+    position: absolute;
   }
 
   #printContainer > .xfaPrintedPage {
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/web/viewer.js thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/web/viewer.js
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/content/web/viewer.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/content/web/viewer.js	2021-12-09 12:00:10.000000000 +0000
@@ -44,6 +44,10 @@
 };
 exports.OptionKind = OptionKind;
 const defaultOptions = {
+  annotationMode: {
+    value: 2,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
   cursorToolOnLoad: {
     value: 0,
     kind: OptionKind.VIEWER + OptionKind.PREFERENCE
@@ -113,10 +117,6 @@
     value: "canvas",
     kind: OptionKind.VIEWER
   },
-  renderInteractiveForms: {
-    value: true,
-    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
-  },
   sidebarViewOnLoad: {
     value: -1,
     kind: OptionKind.VIEWER + OptionKind.PREFERENCE
@@ -174,7 +174,7 @@
     kind: OptionKind.API
   },
   enableXfa: {
-    value: false,
+    value: true,
     kind: OptionKind.API + OptionKind.PREFERENCE
   },
   fontExtraProperties: {
@@ -279,6 +279,10 @@
     delete userOptions[name];
   }
 
+  static _hasUserOptions() {
+    return Object.keys(userOptions).length > 0;
+  }
+
 }
 
 exports.AppOptions = AppOptions;
@@ -336,13 +340,12 @@
 
 var _pdf_viewer = __webpack_require__(26);
 
-var _secondary_toolbar = __webpack_require__(34);
+var _secondary_toolbar = __webpack_require__(35);
 
-var _toolbar = __webpack_require__(36);
+var _toolbar = __webpack_require__(37);
 
-var _view_history = __webpack_require__(37);
+var _view_history = __webpack_require__(38);
 
-const DEFAULT_SCALE_DELTA = 1.1;
 const DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000;
 const FORCE_PAGES_LOADED_TIMEOUT = 10000;
 const WHEEL_ZOOM_DISABLED_TIMEOUT = 1000;
@@ -448,6 +451,7 @@
   isViewerEmbedded: window.parent !== window,
   url: "",
   baseUrl: "",
+  _downloadUrl: "",
   externalServices: DefaultExternalServices,
   _boundEvents: Object.create(null),
   documentInfo: null,
@@ -495,48 +499,48 @@
 
   async _parseHashParameters() {
     if (!_app_options.AppOptions.get("pdfBugEnabled")) {
-      return undefined;
+      return;
     }
 
     const hash = document.location.hash.substring(1);
 
     if (!hash) {
-      return undefined;
+      return;
     }
 
-    const hashParams = (0, _ui_utils.parseQueryString)(hash),
+    const params = (0, _ui_utils.parseQueryString)(hash),
           waitOn = [];
 
-    if ("disableworker" in hashParams && hashParams.disableworker === "true") {
+    if (params.get("disableworker") === "true") {
       waitOn.push(loadFakeWorker());
     }
 
-    if ("disablerange" in hashParams) {
-      _app_options.AppOptions.set("disableRange", hashParams.disablerange === "true");
+    if (params.has("disablerange")) {
+      _app_options.AppOptions.set("disableRange", params.get("disablerange") === "true");
     }
 
-    if ("disablestream" in hashParams) {
-      _app_options.AppOptions.set("disableStream", hashParams.disablestream === "true");
+    if (params.has("disablestream")) {
+      _app_options.AppOptions.set("disableStream", params.get("disablestream") === "true");
     }
 
-    if ("disableautofetch" in hashParams) {
-      _app_options.AppOptions.set("disableAutoFetch", hashParams.disableautofetch === "true");
+    if (params.has("disableautofetch")) {
+      _app_options.AppOptions.set("disableAutoFetch", params.get("disableautofetch") === "true");
     }
 
-    if ("disablefontface" in hashParams) {
-      _app_options.AppOptions.set("disableFontFace", hashParams.disablefontface === "true");
+    if (params.has("disablefontface")) {
+      _app_options.AppOptions.set("disableFontFace", params.get("disablefontface") === "true");
     }
 
-    if ("disablehistory" in hashParams) {
-      _app_options.AppOptions.set("disableHistory", hashParams.disablehistory === "true");
+    if (params.has("disablehistory")) {
+      _app_options.AppOptions.set("disableHistory", params.get("disablehistory") === "true");
     }
 
-    if ("verbosity" in hashParams) {
-      _app_options.AppOptions.set("verbosity", hashParams.verbosity | 0);
+    if (params.has("verbosity")) {
+      _app_options.AppOptions.set("verbosity", params.get("verbosity") | 0);
     }
 
-    if ("textlayer" in hashParams) {
-      switch (hashParams.textlayer) {
+    if (params.has("textlayer")) {
+      switch (params.get("textlayer")) {
         case "off":
           _app_options.AppOptions.set("textLayerMode", _ui_utils.TextLayerMode.DISABLE);
 
@@ -546,27 +550,29 @@
         case "shadow":
         case "hover":
           const viewer = this.appConfig.viewerContainer;
-          viewer.classList.add("textLayer-" + hashParams.textlayer);
+          viewer.classList.add(`textLayer-${params.get("textlayer")}`);
           break;
       }
     }
 
-    if ("pdfbug" in hashParams) {
+    if (params.has("pdfbug")) {
       _app_options.AppOptions.set("pdfBug", true);
 
       _app_options.AppOptions.set("fontExtraProperties", true);
 
-      const enabled = hashParams.pdfbug.split(",");
-      waitOn.push(loadAndEnablePDFBug(enabled));
+      const enabled = params.get("pdfbug").split(",");
+      waitOn.push(initPDFBug(enabled));
     }
 
     if (waitOn.length === 0) {
-      return undefined;
+      return;
     }
 
-    return Promise.all(waitOn).catch(reason => {
+    try {
+      await Promise.all(waitOn);
+    } catch (reason) {
       console.error(`_parseHashParameters: "${reason.message}".`);
-    });
+    }
   },
 
   async _initializeL10n() {
@@ -614,10 +620,20 @@
   },
 
   async _initializeViewerComponents() {
-    const appConfig = this.appConfig;
-    const eventBus = appConfig.eventBus || new _ui_utils.EventBus({
-      isInAutomation: this.externalServices.isInAutomation
-    });
+    const {
+      appConfig,
+      externalServices
+    } = this;
+    let eventBus;
+
+    if (appConfig.eventBus) {
+      eventBus = appConfig.eventBus;
+    } else if (externalServices.isInAutomation) {
+      eventBus = new _ui_utils.AutomationEventBus();
+    } else {
+      eventBus = new _ui_utils.EventBus();
+    }
+
     this.eventBus = eventBus;
     this.overlayManager = new _overlay_manager.OverlayManager();
     const pdfRenderingQueue = new _pdf_rendering_queue.PDFRenderingQueue();
@@ -630,7 +646,7 @@
       ignoreDestinationZoom: _app_options.AppOptions.get("ignoreDestinationZoom")
     });
     this.pdfLinkService = pdfLinkService;
-    const downloadManager = this.externalServices.createDownloadManager();
+    const downloadManager = externalServices.createDownloadManager();
     this.downloadManager = downloadManager;
     const findController = new _pdf_find_controller.PDFFindController({
       linkService: pdfLinkService,
@@ -640,7 +656,7 @@
     const pdfScriptingManager = new _pdf_scripting_manager.PDFScriptingManager({
       eventBus,
       sandboxBundleSrc: null,
-      scriptingFactory: this.externalServices,
+      scriptingFactory: externalServices,
       docPropertiesLookup: this._scriptingDocProperties.bind(this)
     });
     this.pdfScriptingManager = pdfScriptingManager;
@@ -654,16 +670,15 @@
       linkService: pdfLinkService,
       downloadManager,
       findController,
-      scriptingManager: pdfScriptingManager,
+      scriptingManager: _app_options.AppOptions.get("enableScripting") && pdfScriptingManager,
       renderer: _app_options.AppOptions.get("renderer"),
       l10n: this.l10n,
       textLayerMode: _app_options.AppOptions.get("textLayerMode"),
+      annotationMode: _app_options.AppOptions.get("annotationMode"),
       imageResourcesPath: _app_options.AppOptions.get("imageResourcesPath"),
-      renderInteractiveForms: _app_options.AppOptions.get("renderInteractiveForms"),
       enablePrintAutoRotate: _app_options.AppOptions.get("enablePrintAutoRotate"),
       useOnlyCssZoom: _app_options.AppOptions.get("useOnlyCssZoom"),
-      maxCanvasPixels: _app_options.AppOptions.get("maxCanvasPixels"),
-      enableScripting: _app_options.AppOptions.get("enableScripting")
+      maxCanvasPixels: _app_options.AppOptions.get("maxCanvasPixels")
     });
     pdfRenderingQueue.setViewer(this.pdfViewer);
     pdfLinkService.setViewer(this.pdfViewer);
@@ -676,11 +691,14 @@
       l10n: this.l10n
     });
     pdfRenderingQueue.setThumbnailViewer(this.pdfThumbnailViewer);
-    this.pdfHistory = new _pdf_history.PDFHistory({
-      linkService: pdfLinkService,
-      eventBus
-    });
-    pdfLinkService.setHistory(this.pdfHistory);
+
+    if (!this.isViewerEmbedded && !_app_options.AppOptions.get("disableHistory")) {
+      this.pdfHistory = new _pdf_history.PDFHistory({
+        linkService: pdfLinkService,
+        eventBus
+      });
+      pdfLinkService.setHistory(this.pdfHistory);
+    }
 
     if (!this.supportsIntegratedFind) {
       this.findBar = new _pdf_find_bar.PDFFindBar(appConfig.findBar, eventBus, this.l10n);
@@ -742,36 +760,20 @@
     return this._initializedCapability.promise;
   },
 
-  zoomIn(ticks) {
+  zoomIn(steps) {
     if (this.pdfViewer.isInPresentationMode) {
       return;
     }
 
-    let newScale = this.pdfViewer.currentScale;
-
-    do {
-      newScale = (newScale * DEFAULT_SCALE_DELTA).toFixed(2);
-      newScale = Math.ceil(newScale * 10) / 10;
-      newScale = Math.min(_ui_utils.MAX_SCALE, newScale);
-    } while (--ticks > 0 && newScale < _ui_utils.MAX_SCALE);
-
-    this.pdfViewer.currentScaleValue = newScale;
+    this.pdfViewer.increaseScale(steps);
   },
 
-  zoomOut(ticks) {
+  zoomOut(steps) {
     if (this.pdfViewer.isInPresentationMode) {
       return;
     }
 
-    let newScale = this.pdfViewer.currentScale;
-
-    do {
-      newScale = (newScale / DEFAULT_SCALE_DELTA).toFixed(2);
-      newScale = Math.floor(newScale * 10) / 10;
-      newScale = Math.max(_ui_utils.MIN_SCALE, newScale);
-    } while (--ticks > 0 && newScale > _ui_utils.MIN_SCALE);
-
-    this.pdfViewer.currentScaleValue = newScale;
+    this.pdfViewer.decreaseScale(steps);
   },
 
   zoomReset() {
@@ -855,9 +857,14 @@
     });
   },
 
-  setTitleUsingUrl(url = "") {
+  setTitleUsingUrl(url = "", downloadUrl = null) {
     this.url = url;
     this.baseUrl = url.split("#")[0];
+
+    if (downloadUrl) {
+      this._downloadUrl = downloadUrl === url ? this.baseUrl : downloadUrl.split("#")[0];
+    }
+
     let title = (0, _pdfjsLib.getPdfFilenameFromUrl)(url, "");
 
     if (!title) {
@@ -883,6 +890,15 @@
     return this._contentDispositionFilename || (0, _pdfjsLib.getPdfFilenameFromUrl)(this.url);
   },
 
+  _hideViewBookmark() {
+    const {
+      toolbar,
+      secondaryToolbar
+    } = this.appConfig;
+    toolbar.viewBookmark.hidden = true;
+    secondaryToolbar.viewBookmarkButton.hidden = true;
+  },
+
   _cancelIdleCallbacks() {
     if (!this._idleCallbacks.size) {
       return;
@@ -898,6 +914,8 @@
   async close() {
     this._unblockDocumentLoadEvent();
 
+    this._hideViewBookmark();
+
     if (!this.pdfLoadingTask) {
       return;
     }
@@ -922,6 +940,7 @@
     this.downloadComplete = false;
     this.url = "";
     this.baseUrl = "";
+    this._downloadUrl = "";
     this.documentInfo = null;
     this.metadata = null;
     this._contentDispositionFilename = null;
@@ -935,15 +954,8 @@
     this.pdfOutlineViewer.reset();
     this.pdfAttachmentViewer.reset();
     this.pdfLayerViewer.reset();
-
-    if (this.pdfHistory) {
-      this.pdfHistory.reset();
-    }
-
-    if (this.findBar) {
-      this.findBar.reset();
-    }
-
+    this.pdfHistory?.reset();
+    this.findBar?.reset();
     this.toolbar.reset();
     this.secondaryToolbar.reset();
 
@@ -968,12 +980,12 @@
     const parameters = Object.create(null);
 
     if (typeof file === "string") {
-      this.setTitleUsingUrl(file);
+      this.setTitleUsingUrl(file, file);
       parameters.url = file;
     } else if (file && "byteLength" in file) {
       parameters.data = file;
     } else if (file.url && file.originalUrl) {
-      this.setTitleUsingUrl(file.originalUrl);
+      this.setTitleUsingUrl(file.originalUrl, file.url);
       parameters.url = file.url;
     }
 
@@ -1050,7 +1062,7 @@
   async download({
     sourceEventType = "download"
   } = {}) {
-    const url = this.baseUrl,
+    const url = this._downloadUrl,
           filename = this._docFilename;
 
     try {
@@ -1075,7 +1087,7 @@
 
     this._saveInProgress = true;
     await this.pdfScriptingManager.dispatchWillSave();
-    const url = this.baseUrl,
+    const url = this._downloadUrl,
           filename = this._docFilename;
 
     try {
@@ -1087,6 +1099,7 @@
       });
       await this.downloadManager.download(blob, url, filename, sourceEventType);
     } catch (reason) {
+      console.error(`Error when saving the document: ${reason.message}`);
       await this.download({
         sourceEventType
       });
@@ -1503,9 +1516,14 @@
     }
 
     if (info.IsXFAPresent && !info.IsAcroFormPresent && !pdfDocument.isPureXfa) {
-      console.warn("Warning: XFA support is not enabled");
+      if (pdfDocument.loadingParams.enableXfa) {
+        console.warn("Warning: XFA Foreground documents are not supported");
+      } else {
+        console.warn("Warning: XFA support is not enabled");
+      }
+
       this.fallback(_pdfjsLib.UNSUPPORTED_FEATURES.forms);
-    } else if ((info.IsAcroFormPresent || info.IsXFAPresent) && !this.pdfViewer.renderInteractiveForms) {
+    } else if ((info.IsAcroFormPresent || info.IsXFAPresent) && !this.pdfViewer.renderForms) {
       console.warn("Warning: Interactive form support is not enabled");
       this.fallback(_pdfjsLib.UNSUPPORTED_FEATURES.forms);
     }
@@ -1598,7 +1616,7 @@
     viewOnLoad,
     initialDest = null
   }) {
-    if (this.isViewerEmbedded || _app_options.AppOptions.get("disableHistory")) {
+    if (!this.pdfHistory) {
       return;
     }
 
@@ -1758,10 +1776,7 @@
     if (this.printService) {
       this.printService.destroy();
       this.printService = null;
-
-      if (this.pdfDocument) {
-        this.pdfDocument.annotationStorage.resetModified();
-      }
+      this.pdfDocument?.annotationStorage.resetModified();
     }
 
     this.forceRendering();
@@ -1772,11 +1787,7 @@
   },
 
   requestPresentationMode() {
-    if (!this.pdfPresentationMode) {
-      return;
-    }
-
-    this.pdfPresentationMode.request();
+    this.pdfPresentationMode?.request();
   },
 
   triggerPrinting() {
@@ -2086,17 +2097,18 @@
     _pdfjsLib.GlobalWorkerOptions.workerSrc = _app_options.AppOptions.get("workerSrc");
   }
 
-  return (0, _pdfjsLib.loadScript)(_pdfjsLib.PDFWorker.getWorkerSrc());
+  await (0, _pdfjsLib.loadScript)(_pdfjsLib.PDFWorker.workerSrc);
 }
 
-function loadAndEnablePDFBug(enabledTabs) {
-  const appConfig = PDFViewerApplication.appConfig;
-  return (0, _pdfjsLib.loadScript)(appConfig.debuggerScriptPath).then(function () {
-    PDFBug.enable(enabledTabs);
-    PDFBug.init({
-      OPS: _pdfjsLib.OPS
-    }, appConfig.mainContainer);
-  });
+async function initPDFBug(enabledTabs) {
+  const {
+    debuggerScriptPath,
+    mainContainer
+  } = PDFViewerApplication.appConfig;
+  await (0, _pdfjsLib.loadScript)(debuggerScriptPath);
+  PDFBug.init({
+    OPS: _pdfjsLib.OPS
+  }, mainContainer, enabledTabs);
 }
 
 function reportPageStatsPDFBug({
@@ -2163,7 +2175,7 @@
 }
 
 function webViewerOpenFileViaURL(file) {
-  PDFViewerApplication.setTitleUsingUrl(file);
+  PDFViewerApplication.setTitleUsingUrl(file, file);
   PDFViewerApplication.initPassiveLoading();
 }
 
@@ -2352,7 +2364,7 @@
 
   if (!PDFViewerApplication.isInitialViewSet) {
     PDFViewerApplication.initialBookmark = hash;
-  } else if (!PDFViewerApplication.pdfHistory.popStateInProgress) {
+  } else if (!PDFViewerApplication.pdfHistory?.popStateInProgress) {
     PDFViewerApplication.pdfLinkService.setHash(hash);
   }
 }
@@ -2943,13 +2955,13 @@
 exports.scrollIntoView = scrollIntoView;
 exports.waitOnEventOrTimeout = waitOnEventOrTimeout;
 exports.watchScroll = watchScroll;
-exports.WaitOnType = exports.VERTICAL_PADDING = exports.UNKNOWN_SCALE = exports.TextLayerMode = exports.SpreadMode = exports.SidebarView = exports.ScrollMode = exports.SCROLLBAR_PADDING = exports.RendererType = exports.ProgressBar = exports.PresentationModeState = exports.MIN_SCALE = exports.MAX_SCALE = exports.MAX_AUTO_SCALE = exports.EventBus = exports.DEFAULT_SCALE_VALUE = exports.DEFAULT_SCALE = exports.CSS_UNITS = exports.AutoPrintRegExp = exports.animationStarted = void 0;
-const CSS_UNITS = 96.0 / 72.0;
-exports.CSS_UNITS = CSS_UNITS;
+exports.WaitOnType = exports.VERTICAL_PADDING = exports.UNKNOWN_SCALE = exports.TextLayerMode = exports.SpreadMode = exports.SidebarView = exports.ScrollMode = exports.SCROLLBAR_PADDING = exports.RendererType = exports.ProgressBar = exports.PresentationModeState = exports.MIN_SCALE = exports.MAX_SCALE = exports.MAX_AUTO_SCALE = exports.EventBus = exports.DEFAULT_SCALE_VALUE = exports.DEFAULT_SCALE_DELTA = exports.DEFAULT_SCALE = exports.AutoPrintRegExp = exports.AutomationEventBus = exports.animationStarted = void 0;
 const DEFAULT_SCALE_VALUE = "auto";
 exports.DEFAULT_SCALE_VALUE = DEFAULT_SCALE_VALUE;
 const DEFAULT_SCALE = 1.0;
 exports.DEFAULT_SCALE = DEFAULT_SCALE;
+const DEFAULT_SCALE_DELTA = 1.1;
+exports.DEFAULT_SCALE_DELTA = DEFAULT_SCALE_DELTA;
 const MIN_SCALE = 0.1;
 exports.MIN_SCALE = MIN_SCALE;
 const MAX_SCALE = 10.0;
@@ -3094,14 +3106,13 @@
 }
 
 function parseQueryString(query) {
-  const parts = query.split("&");
-  const params = Object.create(null);
+  const params = new Map();
 
-  for (let i = 0, ii = parts.length; i < ii; ++i) {
-    const param = parts[i].split("=");
-    const key = param[0].toLowerCase();
-    const value = param.length > 1 ? param[1] : null;
-    params[decodeURIComponent(key)] = decodeURIComponent(value);
+  for (const part of query.split("&")) {
+    const param = part.split("="),
+          key = param[0].toLowerCase(),
+          value = param.length > 1 ? param[1] : "";
+    params.set(decodeURIComponent(key), decodeURIComponent(value));
   }
 
   return params;
@@ -3416,36 +3427,9 @@
 });
 exports.animationStarted = animationStarted;
 
-function dispatchDOMEvent(eventName, args = null) {
-  const details = Object.create(null);
-
-  if (args?.length > 0) {
-    const obj = args[0];
-
-    for (const key in obj) {
-      const value = obj[key];
-
-      if (key === "source") {
-        if (value === window || value === document) {
-          return;
-        }
-
-        continue;
-      }
-
-      details[key] = value;
-    }
-  }
-
-  const event = document.createEvent("CustomEvent");
-  event.initCustomEvent(eventName, true, true, details);
-  document.dispatchEvent(event);
-}
-
 class EventBus {
-  constructor(options) {
+  constructor() {
     this._listeners = Object.create(null);
-    this._isInAutomation = options?.isInAutomation === true;
   }
 
   on(eventName, listener, options = null) {
@@ -3462,19 +3446,13 @@
     });
   }
 
-  dispatch(eventName) {
+  dispatch(eventName, data) {
     const eventListeners = this._listeners[eventName];
 
     if (!eventListeners || eventListeners.length === 0) {
-      if (this._isInAutomation) {
-        const args = Array.prototype.slice.call(arguments, 1);
-        dispatchDOMEvent(eventName, args);
-      }
-
       return;
     }
 
-    const args = Array.prototype.slice.call(arguments, 1);
     let externalListeners;
 
     for (const {
@@ -3491,20 +3469,16 @@
         continue;
       }
 
-      listener.apply(null, args);
+      listener(data);
     }
 
     if (externalListeners) {
       for (const listener of externalListeners) {
-        listener.apply(null, args);
+        listener(data);
       }
 
       externalListeners = null;
     }
-
-    if (this._isInAutomation) {
-      dispatchDOMEvent(eventName, args);
-    }
   }
 
   _on(eventName, listener, options = null) {
@@ -3535,6 +3509,36 @@
 
 exports.EventBus = EventBus;
 
+class AutomationEventBus extends EventBus {
+  dispatch(eventName, data) {
+    super.dispatch(eventName, data);
+    const details = Object.create(null);
+
+    if (data) {
+      for (const key in data) {
+        const value = data[key];
+
+        if (key === "source") {
+          if (value === window || value === document) {
+            return;
+          }
+
+          continue;
+        }
+
+        details[key] = value;
+      }
+    }
+
+    const event = document.createEvent("CustomEvent");
+    event.initCustomEvent(eventName, true, true, details);
+    document.dispatchEvent(event);
+  }
+
+}
+
+exports.AutomationEventBus = AutomationEventBus;
+
 function clamp(v, min, max) {
   return Math.min(Math.max(v, min), max);
 }
@@ -4012,6 +4016,10 @@
     return this.highestPriorityPage === view.renderingId;
   }
 
+  hasViewer() {
+    return !!this.pdfViewer;
+  }
+
   renderHighestPriority(currentlyVisiblePages) {
     if (this.idleTimeout) {
       clearTimeout(this.idleTimeout);
@@ -6278,8 +6286,8 @@
   _parseCurrentHash(checkNameddest = false) {
     const hash = unescape(getCurrentHash()).substring(1);
     const params = (0, _ui_utils.parseQueryString)(hash);
-    const nameddest = params.nameddest || "";
-    let page = params.page | 0;
+    const nameddest = params.get("nameddest") || "";
+    let page = params.get("page") | 0;
 
     if (!this._isValidPage(page) || checkNameddest && nameddest.length > 0) {
       page = null;
@@ -6437,9 +6445,7 @@
     return true;
   }
 
-  const {
-    nameddest
-  } = (0, _ui_utils.parseQueryString)(destHash);
+  const nameddest = (0, _ui_utils.parseQueryString)(destHash).get("nameddest");
 
   if (nameddest === pushHash) {
     return true;
@@ -6862,20 +6868,20 @@
     if (hash.includes("=")) {
       const params = (0, _ui_utils.parseQueryString)(hash);
 
-      if ("search" in params) {
+      if (params.has("search")) {
         this.eventBus.dispatch("findfromurlhash", {
           source: this,
-          query: params.search.replace(/"/g, ""),
-          phraseSearch: params.phrase === "true"
+          query: params.get("search").replace(/"/g, ""),
+          phraseSearch: params.get("phrase") === "true"
         });
       }
 
-      if ("page" in params) {
-        pageNumber = params.page | 0 || 1;
+      if (params.has("page")) {
+        pageNumber = params.get("page") | 0 || 1;
       }
 
-      if ("zoom" in params) {
-        const zoomArgs = params.zoom.split(",");
+      if (params.has("zoom")) {
+        const zoomArgs = params.get("zoom").split(",");
         const zoomArg = zoomArgs[0];
         const zoomArgNumber = parseFloat(zoomArg);
 
@@ -6916,15 +6922,15 @@
         this.page = pageNumber;
       }
 
-      if ("pagemode" in params) {
+      if (params.has("pagemode")) {
         this.eventBus.dispatch("pagemode", {
           source: this,
-          mode: params.pagemode
+          mode: params.get("pagemode")
         });
       }
 
-      if ("nameddest" in params) {
-        this.goToDestination(params.nameddest);
+      if (params.has("nameddest")) {
+        this.goToDestination(params.get("nameddest"));
       }
     } else {
       dest = unescape(hash);
@@ -6949,17 +6955,11 @@
   executeNamedAction(action) {
     switch (action) {
       case "GoBack":
-        if (this.pdfHistory) {
-          this.pdfHistory.back();
-        }
-
+        this.pdfHistory?.back();
         break;
 
       case "GoForward":
-        if (this.pdfHistory) {
-          this.pdfHistory.forward();
-        }
-
+        this.pdfHistory?.forward();
         break;
 
       case "NextPage":
@@ -8107,6 +8107,49 @@
 
           this._pdfViewer.currentScaleValue = value;
           break;
+
+        case "SaveAs":
+          this._eventBus.dispatch("save", {
+            source: this
+          });
+
+          break;
+
+        case "FirstPage":
+          this._pdfViewer.currentPageNumber = 1;
+          break;
+
+        case "LastPage":
+          this._pdfViewer.currentPageNumber = this._pdfViewer.pagesCount;
+          break;
+
+        case "NextPage":
+          this._pdfViewer.nextPage();
+
+          break;
+
+        case "PrevPage":
+          this._pdfViewer.previousPage();
+
+          break;
+
+        case "ZoomViewIn":
+          if (isInPresentationMode) {
+            return;
+          }
+
+          this._pdfViewer.increaseScale();
+
+          break;
+
+        case "ZoomViewOut":
+          if (isInPresentationMode) {
+            return;
+          }
+
+          this._pdfViewer.decreaseScale();
+
+          break;
       }
 
       return;
@@ -8892,9 +8935,12 @@
     }
 
     this._pagesRotation = rotation;
+    const updateArgs = {
+      rotation
+    };
 
-    for (let i = 0, ii = this._thumbnails.length; i < ii; i++) {
-      this._thumbnails[i].update(rotation);
+    for (const thumbnail of this._thumbnails) {
+      thumbnail.update(updateArgs);
     }
   }
 
@@ -9212,8 +9258,10 @@
     }
   }
 
-  update(rotation) {
-    if (typeof rotation !== "undefined") {
+  update({
+    rotation = null
+  }) {
+    if (typeof rotation === "number") {
       this.rotation = rotation;
     }
 
@@ -9566,9 +9614,11 @@
 
 var _struct_tree_layer_builder = __webpack_require__(31);
 
-var _text_layer_builder = __webpack_require__(32);
+var _text_highlighter = __webpack_require__(32);
 
-var _xfa_layer_builder = __webpack_require__(33);
+var _text_layer_builder = __webpack_require__(33);
+
+var _xfa_layer_builder = __webpack_require__(34);
 
 const DEFAULT_CACHE_SIZE = 10;
 
@@ -9632,13 +9682,12 @@
       throw new Error("Cannot initialize BaseViewer.");
     }
 
-    const viewerVersion = '2.11.22';
+    const viewerVersion = '2.11.298';
 
     if (_pdfjsLib.version !== viewerVersion) {
       throw new Error(`The API version "${_pdfjsLib.version}" does not match the Viewer version "${viewerVersion}".`);
     }
 
-    this._name = this.constructor.name;
     this.container = options.container;
     this.viewer = options.viewer || options.container.firstElementChild;
     this.eventBus = options.eventBus;
@@ -9647,15 +9696,14 @@
     this.findController = options.findController || null;
     this._scriptingManager = options.scriptingManager || null;
     this.removePageBorders = options.removePageBorders || false;
-    this.textLayerMode = Number.isInteger(options.textLayerMode) ? options.textLayerMode : _ui_utils.TextLayerMode.ENABLE;
+    this.textLayerMode = options.textLayerMode ?? _ui_utils.TextLayerMode.ENABLE;
+    this._annotationMode = options.annotationMode ?? _pdfjsLib.AnnotationMode.ENABLE_FORMS;
     this.imageResourcesPath = options.imageResourcesPath || "";
-    this.renderInteractiveForms = options.renderInteractiveForms !== false;
     this.enablePrintAutoRotate = options.enablePrintAutoRotate || false;
     this.renderer = options.renderer || _ui_utils.RendererType.CANVAS;
     this.useOnlyCssZoom = options.useOnlyCssZoom || false;
     this.maxCanvasPixels = options.maxCanvasPixels;
     this.l10n = options.l10n || _l10n_utils.NullL10n;
-    this.enableScripting = options.enableScripting === true && !!this._scriptingManager;
     this.defaultRenderingQueue = !options.renderingQueue;
 
     if (this.defaultRenderingQueue) {
@@ -9665,6 +9713,7 @@
       this.renderingQueue = options.renderingQueue;
     }
 
+    this._doc = document.documentElement;
     this.scroll = (0, _ui_utils.watchScroll)(this.container, this._scrollUpdate.bind(this));
     this.presentationModeState = _ui_utils.PresentationModeState.UNKNOWN;
     this._onBeforeDraw = this._onAfterDraw = null;
@@ -9700,6 +9749,14 @@
     });
   }
 
+  get renderForms() {
+    return this._annotationMode === _pdfjsLib.AnnotationMode.ENABLE_FORMS;
+  }
+
+  get enableScripting() {
+    return !!this._scriptingManager;
+  }
+
   get currentPageNumber() {
     return this._currentPageNumber;
   }
@@ -9714,7 +9771,7 @@
     }
 
     if (!this._setCurrentPageNumber(val, true)) {
-      console.error(`${this._name}.currentPageNumber: "${val}" is not a valid page.`);
+      console.error(`currentPageNumber: "${val}" is not a valid page.`);
     }
   }
 
@@ -9767,7 +9824,7 @@
     }
 
     if (!this._setCurrentPageNumber(page, true)) {
-      console.error(`${this._name}.currentPageLabel: "${val}" is not a valid page.`);
+      console.error(`currentPageLabel: "${val}" is not a valid page.`);
     }
   }
 
@@ -9824,10 +9881,12 @@
 
     this._pagesRotation = rotation;
     const pageNumber = this._currentPageNumber;
+    const updateArgs = {
+      rotation
+    };
 
-    for (let i = 0, ii = this._pages.length; i < ii; i++) {
-      const pageView = this._pages[i];
-      pageView.update(pageView.scale, rotation);
+    for (const pageView of this._pages) {
+      pageView.update(updateArgs);
     }
 
     if (this._currentScaleValue) {
@@ -9938,9 +9997,10 @@
       this._optionalContentConfigPromise = optionalContentConfigPromise;
       const scale = this.currentScale;
       const viewport = firstPdfPage.getViewport({
-        scale: scale * _ui_utils.CSS_UNITS
+        scale: scale * _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS
       });
-      const textLayerFactory = this.textLayerMode !== _ui_utils.TextLayerMode.DISABLE ? this : null;
+      const textLayerFactory = this.textLayerMode !== _ui_utils.TextLayerMode.DISABLE && !isPureXfa ? this : null;
+      const annotationLayerFactory = this._annotationMode !== _pdfjsLib.AnnotationMode.DISABLE ? this : null;
       const xfaLayerFactory = isPureXfa ? this : null;
 
       for (let pageNum = 1; pageNum <= pagesCount; ++pageNum) {
@@ -9954,11 +10014,12 @@
           renderingQueue: this.renderingQueue,
           textLayerFactory,
           textLayerMode: this.textLayerMode,
-          annotationLayerFactory: this,
+          annotationLayerFactory,
+          annotationMode: this._annotationMode,
           xfaLayerFactory,
+          textHighlighterFactory: this,
           structTreeLayerFactory: this,
           imageResourcesPath: this.imageResourcesPath,
-          renderInteractiveForms: this.renderInteractiveForms,
           renderer: this.renderer,
           useOnlyCssZoom: this.useOnlyCssZoom,
           maxCanvasPixels: this.maxCanvasPixels,
@@ -9984,7 +10045,7 @@
           this.findController.setDocument(pdfDocument);
         }
 
-        if (this.enableScripting) {
+        if (this._scriptingManager) {
           this._scriptingManager.setDocument(pdfDocument);
         }
 
@@ -10046,7 +10107,7 @@
       this._pageLabels = null;
     } else if (!(Array.isArray(labels) && this.pdfDocument.numPages === labels.length)) {
       this._pageLabels = null;
-      console.error(`${this._name}.setPageLabels: Invalid page labels.`);
+      console.error(`setPageLabels: Invalid page labels.`);
     } else {
       this._pageLabels = labels;
     }
@@ -10121,8 +10182,14 @@
       return;
     }
 
-    for (let i = 0, ii = this._pages.length; i < ii; i++) {
-      this._pages[i].update(newScale);
+    this._doc.style.setProperty("--zoom-factor", newScale);
+
+    const updateArgs = {
+      scale: newScale
+    };
+
+    for (const pageView of this._pages) {
+      pageView.update(updateArgs);
     }
 
     this._currentScale = newScale;
@@ -10210,7 +10277,7 @@
           break;
 
         default:
-          console.error(`${this._name}._setScale: "${value}" is an unknown zoom value.`);
+          console.error(`_setScale: "${value}" is an unknown zoom value.`);
           return;
       }
 
@@ -10257,7 +10324,7 @@
     const pageView = Number.isInteger(pageNumber) && this._pages[pageNumber - 1];
 
     if (!pageView) {
-      console.error(`${this._name}.scrollPageIntoView: ` + `"${pageNumber}" is not a valid pageNumber parameter.`);
+      console.error(`scrollPageIntoView: "${pageNumber}" is not a valid pageNumber parameter.`);
       return;
     }
 
@@ -10274,8 +10341,8 @@
         widthScale,
         heightScale;
     const changeOrientation = pageView.rotation % 180 !== 0;
-    const pageWidth = (changeOrientation ? pageView.height : pageView.width) / pageView.scale / _ui_utils.CSS_UNITS;
-    const pageHeight = (changeOrientation ? pageView.width : pageView.height) / pageView.scale / _ui_utils.CSS_UNITS;
+    const pageWidth = (changeOrientation ? pageView.height : pageView.width) / pageView.scale / _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS;
+    const pageHeight = (changeOrientation ? pageView.width : pageView.height) / pageView.scale / _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS;
     let scale = 0;
 
     switch (destArray[1].name) {
@@ -10321,13 +10388,13 @@
         height = destArray[5] - y;
         const hPadding = this.removePageBorders ? 0 : _ui_utils.SCROLLBAR_PADDING;
         const vPadding = this.removePageBorders ? 0 : _ui_utils.VERTICAL_PADDING;
-        widthScale = (this.container.clientWidth - hPadding) / width / _ui_utils.CSS_UNITS;
-        heightScale = (this.container.clientHeight - vPadding) / height / _ui_utils.CSS_UNITS;
+        widthScale = (this.container.clientWidth - hPadding) / width / _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS;
+        heightScale = (this.container.clientHeight - vPadding) / height / _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS;
         scale = Math.min(Math.abs(widthScale), Math.abs(heightScale));
         break;
 
       default:
-        console.error(`${this._name}.scrollPageIntoView: ` + `"${destArray[1].name}" is not a valid destination type.`);
+        console.error(`scrollPageIntoView: "${destArray[1].name}" is not a valid destination type.`);
         return;
     }
 
@@ -10490,7 +10557,7 @@
     }
 
     if (!(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.pagesCount)) {
-      console.error(`${this._name}.isPageVisible: "${pageNumber}" is not a valid page.`);
+      console.error(`isPageVisible: "${pageNumber}" is not a valid page.`);
       return false;
     }
 
@@ -10505,7 +10572,7 @@
     }
 
     if (!(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.pagesCount)) {
-      console.error(`${this._name}.isPageCached: "${pageNumber}" is not a valid page.`);
+      console.error(`isPageCached: "${pageNumber}" is not a valid page.`);
       return false;
     }
 
@@ -10579,29 +10646,38 @@
     return false;
   }
 
-  createTextLayerBuilder(textLayerDiv, pageIndex, viewport, enhanceTextSelection = false, eventBus) {
+  createTextLayerBuilder(textLayerDiv, pageIndex, viewport, enhanceTextSelection = false, eventBus, highlighter) {
     return new _text_layer_builder.TextLayerBuilder({
       textLayerDiv,
       eventBus,
       pageIndex,
       viewport,
-      findController: this.isInPresentationMode ? null : this.findController,
-      enhanceTextSelection: this.isInPresentationMode ? false : enhanceTextSelection
+      enhanceTextSelection: this.isInPresentationMode ? false : enhanceTextSelection,
+      highlighter
     });
   }
 
-  createAnnotationLayerBuilder(pageDiv, pdfPage, annotationStorage = null, imageResourcesPath = "", renderInteractiveForms = false, l10n = _l10n_utils.NullL10n, enableScripting = null, hasJSActionsPromise = null, mouseState = null) {
+  createTextHighlighter(pageIndex, eventBus) {
+    return new _text_highlighter.TextHighlighter({
+      eventBus,
+      pageIndex,
+      findController: this.isInPresentationMode ? null : this.findController
+    });
+  }
+
+  createAnnotationLayerBuilder(pageDiv, pdfPage, annotationStorage = null, imageResourcesPath = "", renderForms = true, l10n = _l10n_utils.NullL10n, enableScripting = null, hasJSActionsPromise = null, mouseState = null, fieldObjectsPromise = null) {
     return new _annotation_layer_builder.AnnotationLayerBuilder({
       pageDiv,
       pdfPage,
       annotationStorage: annotationStorage || this.pdfDocument?.annotationStorage,
       imageResourcesPath,
-      renderInteractiveForms,
+      renderForms,
       linkService: this.linkService,
       downloadManager: this.downloadManager,
       l10n,
       enableScripting: enableScripting ?? this.enableScripting,
       hasJSActionsPromise: hasJSActionsPromise || this.pdfDocument?.hasJSActions(),
+      fieldObjectsPromise: fieldObjectsPromise || this.pdfDocument?.getFieldObjects(),
       mouseState: mouseState || this._scriptingManager?.mouseState
     });
   }
@@ -10682,9 +10758,12 @@
     }
 
     this._optionalContentConfigPromise = promise;
+    const updateArgs = {
+      optionalContentConfigPromise: promise
+    };
 
     for (const pageView of this._pages) {
-      pageView.update(pageView.scale, pageView.rotation, promise);
+      pageView.update(updateArgs);
     }
 
     this.update();
@@ -10958,6 +11037,30 @@
     return true;
   }
 
+  increaseScale(steps = 1) {
+    let newScale = this._currentScale;
+
+    do {
+      newScale = (newScale * _ui_utils.DEFAULT_SCALE_DELTA).toFixed(2);
+      newScale = Math.ceil(newScale * 10) / 10;
+      newScale = Math.min(_ui_utils.MAX_SCALE, newScale);
+    } while (--steps > 0 && newScale < _ui_utils.MAX_SCALE);
+
+    this.currentScaleValue = newScale;
+  }
+
+  decreaseScale(steps = 1) {
+    let newScale = this._currentScale;
+
+    do {
+      newScale = (newScale / _ui_utils.DEFAULT_SCALE_DELTA).toFixed(2);
+      newScale = Math.floor(newScale * 10) / 10;
+      newScale = Math.max(_ui_utils.MIN_SCALE, newScale);
+    } while (--steps > 0 && newScale > _ui_utils.MIN_SCALE);
+
+    this.currentScaleValue = newScale;
+  }
+
 }
 
 exports.BaseViewer = BaseViewer;
@@ -10987,10 +11090,11 @@
     downloadManager,
     annotationStorage = null,
     imageResourcesPath = "",
-    renderInteractiveForms = true,
+    renderForms = true,
     l10n = _l10n_utils.NullL10n,
     enableScripting = false,
     hasJSActionsPromise = null,
+    fieldObjectsPromise = null,
     mouseState = null
   }) {
     this.pageDiv = pageDiv;
@@ -10998,58 +11102,56 @@
     this.linkService = linkService;
     this.downloadManager = downloadManager;
     this.imageResourcesPath = imageResourcesPath;
-    this.renderInteractiveForms = renderInteractiveForms;
+    this.renderForms = renderForms;
     this.l10n = l10n;
     this.annotationStorage = annotationStorage;
     this.enableScripting = enableScripting;
     this._hasJSActionsPromise = hasJSActionsPromise;
+    this._fieldObjectsPromise = fieldObjectsPromise;
     this._mouseState = mouseState;
     this.div = null;
     this._cancelled = false;
   }
 
-  render(viewport, intent = "display") {
-    return Promise.all([this.pdfPage.getAnnotations({
+  async render(viewport, intent = "display") {
+    const [annotations, hasJSActions = false, fieldObjects = null] = await Promise.all([this.pdfPage.getAnnotations({
       intent
-    }), this._hasJSActionsPromise]).then(([annotations, hasJSActions = false]) => {
-      if (this._cancelled) {
-        return;
-      }
+    }), this._hasJSActionsPromise, this._fieldObjectsPromise]);
 
-      if (annotations.length === 0) {
-        return;
-      }
+    if (this._cancelled || annotations.length === 0) {
+      return;
+    }
 
-      const parameters = {
-        viewport: viewport.clone({
-          dontFlip: true
-        }),
-        div: this.div,
-        annotations,
-        page: this.pdfPage,
-        imageResourcesPath: this.imageResourcesPath,
-        renderInteractiveForms: this.renderInteractiveForms,
-        linkService: this.linkService,
-        downloadManager: this.downloadManager,
-        annotationStorage: this.annotationStorage,
-        enableScripting: this.enableScripting,
-        hasJSActions,
-        mouseState: this._mouseState
-      };
+    const parameters = {
+      viewport: viewport.clone({
+        dontFlip: true
+      }),
+      div: this.div,
+      annotations,
+      page: this.pdfPage,
+      imageResourcesPath: this.imageResourcesPath,
+      renderForms: this.renderForms,
+      linkService: this.linkService,
+      downloadManager: this.downloadManager,
+      annotationStorage: this.annotationStorage,
+      enableScripting: this.enableScripting,
+      hasJSActions,
+      fieldObjects,
+      mouseState: this._mouseState
+    };
 
-      if (this.div) {
-        _pdfjsLib.AnnotationLayer.update(parameters);
-      } else {
-        this.div = document.createElement("div");
-        this.div.className = "annotationLayer";
-        this.pageDiv.appendChild(this.div);
-        parameters.div = this.div;
+    if (this.div) {
+      _pdfjsLib.AnnotationLayer.update(parameters);
+    } else {
+      this.div = document.createElement("div");
+      this.div.className = "annotationLayer";
+      this.pageDiv.appendChild(this.div);
+      parameters.div = this.div;
 
-        _pdfjsLib.AnnotationLayer.render(parameters);
+      _pdfjsLib.AnnotationLayer.render(parameters);
 
-        this.l10n.translate(this.div);
-      }
-    });
+      this.l10n.translate(this.div);
+    }
   }
 
   cancel() {
@@ -11069,17 +11171,18 @@
 exports.AnnotationLayerBuilder = AnnotationLayerBuilder;
 
 class DefaultAnnotationLayerFactory {
-  createAnnotationLayerBuilder(pageDiv, pdfPage, annotationStorage = null, imageResourcesPath = "", renderInteractiveForms = true, l10n = _l10n_utils.NullL10n, enableScripting = false, hasJSActionsPromise = null, mouseState = null) {
+  createAnnotationLayerBuilder(pageDiv, pdfPage, annotationStorage = null, imageResourcesPath = "", renderForms = true, l10n = _l10n_utils.NullL10n, enableScripting = false, hasJSActionsPromise = null, mouseState = null, fieldObjectsPromise = null) {
     return new AnnotationLayerBuilder({
       pageDiv,
       pdfPage,
       imageResourcesPath,
-      renderInteractiveForms,
+      renderForms,
       linkService: new _pdf_link_service.SimpleLinkService(),
       l10n,
       annotationStorage,
       enableScripting,
       hasJSActionsPromise,
+      fieldObjectsPromise,
       mouseState
     });
   }
@@ -11227,10 +11330,10 @@
 }));
 exports.PDFPageView = void 0;
 
-var _ui_utils = __webpack_require__(3);
-
 var _pdfjsLib = __webpack_require__(4);
 
+var _ui_utils = __webpack_require__(3);
+
 var _app_options = __webpack_require__(1);
 
 var _l10n_utils = __webpack_require__(29);
@@ -11253,9 +11356,9 @@
     this.pdfPageRotate = defaultViewport.rotation;
     this._optionalContentConfigPromise = options.optionalContentConfigPromise || null;
     this.hasRestrictedScaling = false;
-    this.textLayerMode = Number.isInteger(options.textLayerMode) ? options.textLayerMode : _ui_utils.TextLayerMode.ENABLE;
+    this.textLayerMode = options.textLayerMode ?? _ui_utils.TextLayerMode.ENABLE;
+    this._annotationMode = options.annotationMode ?? _pdfjsLib.AnnotationMode.ENABLE_FORMS;
     this.imageResourcesPath = options.imageResourcesPath || "";
-    this.renderInteractiveForms = options.renderInteractiveForms !== false;
     this.useOnlyCssZoom = options.useOnlyCssZoom || false;
     this.maxCanvasPixels = options.maxCanvasPixels || MAX_CANVAS_PIXELS;
     this.eventBus = options.eventBus;
@@ -11263,6 +11366,7 @@
     this.textLayerFactory = options.textLayerFactory;
     this.annotationLayerFactory = options.annotationLayerFactory;
     this.xfaLayerFactory = options.xfaLayerFactory;
+    this.textHighlighter = options.textHighlighterFactory?.createTextHighlighter(this.id - 1, this.eventBus);
     this.structTreeLayerFactory = options.structTreeLayerFactory;
     this.renderer = options.renderer || _ui_utils.RendererType.CANVAS;
     this.l10n = options.l10n || _l10n_utils.NullL10n;
@@ -11271,6 +11375,7 @@
     this.renderingState = _pdf_rendering_queue.RenderingStates.INITIAL;
     this.resume = null;
     this._renderError = null;
+    this._isStandalone = !this.renderingQueue?.hasViewer();
     this.annotationLayer = null;
     this.textLayer = null;
     this.zoomLayer = null;
@@ -11296,7 +11401,7 @@
     this.pdfPageRotate = pdfPage.rotate;
     const totalRotation = (this.rotation + this.pdfPageRotate) % 360;
     this.viewport = pdfPage.getViewport({
-      scale: this.scale * _ui_utils.CSS_UNITS,
+      scale: this.scale * _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS,
       rotation: totalRotation
     });
     this.reset();
@@ -11330,7 +11435,11 @@
     let error = null;
 
     try {
-      await this.xfaLayer.render(this.viewport, "display");
+      const result = await this.xfaLayer.render(this.viewport, "display");
+
+      if (this.textHighlighter) {
+        this._buildXfaTextContentItems(result.textDivs);
+      }
     } catch (ex) {
       error = ex;
     } finally {
@@ -11342,6 +11451,18 @@
     }
   }
 
+  async _buildXfaTextContentItems(textDivs) {
+    const text = await this.pdfPage.getTextContent();
+    const items = [];
+
+    for (const item of text.items) {
+      items.push(item.str);
+    }
+
+    this.textHighlighter.setTextMapping(textDivs, items);
+    this.textHighlighter.enable();
+  }
+
   _resetZoomLayer(removeFromDOM = false) {
     if (!this.zoomLayer) {
       return;
@@ -11425,10 +11546,14 @@
     div.appendChild(this.loadingIconDiv);
   }
 
-  update(scale, rotation, optionalContentConfigPromise = null) {
+  update({
+    scale = 0,
+    rotation = null,
+    optionalContentConfigPromise = null
+  }) {
     this.scale = scale || this.scale;
 
-    if (typeof rotation !== "undefined") {
+    if (typeof rotation === "number") {
       this.rotation = rotation;
     }
 
@@ -11436,9 +11561,14 @@
       this._optionalContentConfigPromise = optionalContentConfigPromise;
     }
 
+    if (this._isStandalone) {
+      const doc = document.documentElement;
+      doc.style.setProperty("--zoom-factor", this.scale);
+    }
+
     const totalRotation = (this.rotation + this.pdfPageRotate) % 360;
     this.viewport = this.viewport.clone({
-      scale: this.scale * _ui_utils.CSS_UNITS,
+      scale: this.scale * _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS,
       rotation: totalRotation
     });
 
@@ -11528,6 +11658,7 @@
     if (this.xfaLayer && (!keepXfaLayer || !this.xfaLayer.div)) {
       this.xfaLayer.cancel();
       this.xfaLayer = null;
+      this.textHighlighter?.disable();
     }
 
     if (this._onTextLayerRendered) {
@@ -11670,7 +11801,7 @@
         div.appendChild(textLayerDiv);
       }
 
-      textLayer = this.textLayerFactory.createTextLayerBuilder(textLayerDiv, this.id - 1, this.viewport, this.textLayerMode === _ui_utils.TextLayerMode.ENABLE_ENHANCE, this.eventBus);
+      textLayer = this.textLayerFactory.createTextLayerBuilder(textLayerDiv, this.id - 1, this.viewport, this.textLayerMode === _ui_utils.TextLayerMode.ENABLE_ENHANCE, this.eventBus, this.textHighlighter);
     }
 
     this.textLayer = textLayer;
@@ -11749,9 +11880,9 @@
       return finishPaintTask(reason);
     });
 
-    if (this.annotationLayerFactory) {
+    if (this._annotationMode !== _pdfjsLib.AnnotationMode.DISABLE && this.annotationLayerFactory) {
       if (!this.annotationLayer) {
-        this.annotationLayer = this.annotationLayerFactory.createAnnotationLayerBuilder(div, pdfPage, null, this.imageResourcesPath, this.renderInteractiveForms, this.l10n, null, null, null);
+        this.annotationLayer = this.annotationLayerFactory.createAnnotationLayerBuilder(div, pdfPage, null, this.imageResourcesPath, this._annotationMode === _pdfjsLib.AnnotationMode.ENABLE_FORMS, this.l10n, null, null, null, null);
       }
 
       this._renderAnnotationLayer();
@@ -11844,7 +11975,7 @@
 
     if (this.useOnlyCssZoom) {
       const actualSizeViewport = viewport.clone({
-        scale: _ui_utils.CSS_UNITS
+        scale: _pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS
       });
       outputScale.sx *= actualSizeViewport.width / viewport.width;
       outputScale.sy *= actualSizeViewport.height / viewport.height;
@@ -11877,7 +12008,7 @@
       canvasContext: ctx,
       transform,
       viewport: this.viewport,
-      renderInteractiveForms: this.renderInteractiveForms,
+      annotationMode: this._annotationMode,
       optionalContentConfigPromise: this._optionalContentConfigPromise
     };
     const renderTask = this.pdfPage.render(renderContext);
@@ -12055,88 +12186,46 @@
 
 /***/ }),
 /* 32 */
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ ((__unused_webpack_module, exports) => {
 
 
 
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.TextLayerBuilder = exports.DefaultTextLayerFactory = void 0;
-
-var _pdfjsLib = __webpack_require__(4);
-
-const EXPAND_DIVS_TIMEOUT = 300;
+exports.TextHighlighter = void 0;
 
-class TextLayerBuilder {
+class TextHighlighter {
   constructor({
-    textLayerDiv,
+    findController,
     eventBus,
-    pageIndex,
-    viewport,
-    findController = null,
-    enhanceTextSelection = false
+    pageIndex
   }) {
-    this.textLayerDiv = textLayerDiv;
+    this.findController = findController;
+    this.matches = [];
     this.eventBus = eventBus;
-    this.textContent = null;
-    this.textContentItemsStr = [];
-    this.textContentStream = null;
-    this.renderingDone = false;
     this.pageIdx = pageIndex;
-    this.pageNumber = this.pageIdx + 1;
-    this.matches = [];
-    this.viewport = viewport;
-    this.textDivs = [];
-    this.findController = findController;
-    this.textLayerRenderTask = null;
-    this.enhanceTextSelection = enhanceTextSelection;
     this._onUpdateTextLayerMatches = null;
-
-    this._bindMouse();
+    this.textDivs = null;
+    this.textContentItemsStr = null;
+    this.enabled = false;
   }
 
-  _finishRendering() {
-    this.renderingDone = true;
-
-    if (!this.enhanceTextSelection) {
-      const endOfContent = document.createElement("div");
-      endOfContent.className = "endOfContent";
-      this.textLayerDiv.appendChild(endOfContent);
-    }
-
-    this.eventBus.dispatch("textlayerrendered", {
-      source: this,
-      pageNumber: this.pageNumber,
-      numTextDivs: this.textDivs.length
-    });
+  setTextMapping(divs, texts) {
+    this.textDivs = divs;
+    this.textContentItemsStr = texts;
   }
 
-  render(timeout = 0) {
-    if (!(this.textContent || this.textContentStream) || this.renderingDone) {
-      return;
+  enable() {
+    if (!this.textDivs || !this.textContentItemsStr) {
+      throw new Error("Text divs and strings have not been set.");
     }
 
-    this.cancel();
-    this.textDivs = [];
-    const textLayerFrag = document.createDocumentFragment();
-    this.textLayerRenderTask = (0, _pdfjsLib.renderTextLayer)({
-      textContent: this.textContent,
-      textContentStream: this.textContentStream,
-      container: textLayerFrag,
-      viewport: this.viewport,
-      textDivs: this.textDivs,
-      textContentItemsStr: this.textContentItemsStr,
-      timeout,
-      enhanceTextSelection: this.enhanceTextSelection
-    });
-    this.textLayerRenderTask.promise.then(() => {
-      this.textLayerDiv.appendChild(textLayerFrag);
-
-      this._finishRendering();
+    if (this.enabled) {
+      throw new Error("TextHighlighter is already enabled.");
+    }
 
-      this._updateMatches();
-    }, function (reason) {});
+    this.enabled = true;
 
     if (!this._onUpdateTextLayerMatches) {
       this._onUpdateTextLayerMatches = evt => {
@@ -12147,14 +12236,17 @@
 
       this.eventBus._on("updatetextlayermatches", this._onUpdateTextLayerMatches);
     }
+
+    this._updateMatches();
   }
 
-  cancel() {
-    if (this.textLayerRenderTask) {
-      this.textLayerRenderTask.cancel();
-      this.textLayerRenderTask = null;
+  disable() {
+    if (!this.enabled) {
+      return;
     }
 
+    this.enabled = false;
+
     if (this._onUpdateTextLayerMatches) {
       this.eventBus._off("updatetextlayermatches", this._onUpdateTextLayerMatches);
 
@@ -12162,16 +12254,6 @@
     }
   }
 
-  setTextContentStream(readableStream) {
-    this.cancel();
-    this.textContentStream = readableStream;
-  }
-
-  setTextContent(textContent) {
-    this.cancel();
-    this.textContent = textContent;
-  }
-
   _convertMatches(matches, matchesLength) {
     if (!matches) {
       return [];
@@ -12227,7 +12309,9 @@
 
     const {
       findController,
-      pageIdx,
+      pageIdx
+    } = this;
+    const {
       textContentItemsStr,
       textDivs
     } = this;
@@ -12247,7 +12331,16 @@
     }
 
     function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
-      const div = textDivs[divIdx];
+      let div = textDivs[divIdx];
+
+      if (div.nodeType === Node.TEXT_NODE) {
+        const span = document.createElement("span");
+        div.parentNode.insertBefore(span, div);
+        span.appendChild(div);
+        textDivs[divIdx] = span;
+        div = span;
+      }
+
       const content = textContentItemsStr[divIdx].substring(fromOffset, toOffset);
       const node = document.createTextNode(content);
 
@@ -12321,14 +12414,16 @@
   }
 
   _updateMatches() {
-    if (!this.renderingDone) {
+    if (!this.enabled) {
       return;
     }
 
     const {
       findController,
       matches,
-      pageIdx,
+      pageIdx
+    } = this;
+    const {
       textContentItemsStr,
       textDivs
     } = this;
@@ -12358,6 +12453,113 @@
     this._renderMatches(this.matches);
   }
 
+}
+
+exports.TextHighlighter = TextHighlighter;
+
+/***/ }),
+/* 33 */
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.TextLayerBuilder = exports.DefaultTextLayerFactory = void 0;
+
+var _pdfjsLib = __webpack_require__(4);
+
+const EXPAND_DIVS_TIMEOUT = 300;
+
+class TextLayerBuilder {
+  constructor({
+    textLayerDiv,
+    eventBus,
+    pageIndex,
+    viewport,
+    highlighter = null,
+    enhanceTextSelection = false
+  }) {
+    this.textLayerDiv = textLayerDiv;
+    this.eventBus = eventBus;
+    this.textContent = null;
+    this.textContentItemsStr = [];
+    this.textContentStream = null;
+    this.renderingDone = false;
+    this.pageNumber = pageIndex + 1;
+    this.viewport = viewport;
+    this.textDivs = [];
+    this.textLayerRenderTask = null;
+    this.highlighter = highlighter;
+    this.enhanceTextSelection = enhanceTextSelection;
+
+    this._bindMouse();
+  }
+
+  _finishRendering() {
+    this.renderingDone = true;
+
+    if (!this.enhanceTextSelection) {
+      const endOfContent = document.createElement("div");
+      endOfContent.className = "endOfContent";
+      this.textLayerDiv.appendChild(endOfContent);
+    }
+
+    this.eventBus.dispatch("textlayerrendered", {
+      source: this,
+      pageNumber: this.pageNumber,
+      numTextDivs: this.textDivs.length
+    });
+  }
+
+  render(timeout = 0) {
+    if (!(this.textContent || this.textContentStream) || this.renderingDone) {
+      return;
+    }
+
+    this.cancel();
+    this.textDivs.length = 0;
+    this.highlighter?.setTextMapping(this.textDivs, this.textContentItemsStr);
+    const textLayerFrag = document.createDocumentFragment();
+    this.textLayerRenderTask = (0, _pdfjsLib.renderTextLayer)({
+      textContent: this.textContent,
+      textContentStream: this.textContentStream,
+      container: textLayerFrag,
+      viewport: this.viewport,
+      textDivs: this.textDivs,
+      textContentItemsStr: this.textContentItemsStr,
+      timeout,
+      enhanceTextSelection: this.enhanceTextSelection
+    });
+    this.textLayerRenderTask.promise.then(() => {
+      this.textLayerDiv.appendChild(textLayerFrag);
+
+      this._finishRendering();
+
+      this.highlighter?.enable();
+    }, function (reason) {});
+  }
+
+  cancel() {
+    if (this.textLayerRenderTask) {
+      this.textLayerRenderTask.cancel();
+      this.textLayerRenderTask = null;
+    }
+
+    this.highlighter?.disable();
+  }
+
+  setTextContentStream(readableStream) {
+    this.cancel();
+    this.textContentStream = readableStream;
+  }
+
+  setTextContent(textContent) {
+    this.cancel();
+    this.textContent = textContent;
+  }
+
   _bindMouse() {
     const div = this.textLayerDiv;
     let expandDivsTimer = null;
@@ -12396,13 +12598,14 @@
 exports.TextLayerBuilder = TextLayerBuilder;
 
 class DefaultTextLayerFactory {
-  createTextLayerBuilder(textLayerDiv, pageIndex, viewport, enhanceTextSelection = false, eventBus) {
+  createTextLayerBuilder(textLayerDiv, pageIndex, viewport, enhanceTextSelection = false, eventBus, highlighter) {
     return new TextLayerBuilder({
       textLayerDiv,
       pageIndex,
       viewport,
       enhanceTextSelection,
-      eventBus
+      eventBus,
+      highlighter
     });
   }
 
@@ -12411,7 +12614,7 @@
 exports.DefaultTextLayerFactory = DefaultTextLayerFactory;
 
 /***/ }),
-/* 33 */
+/* 34 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
@@ -12427,13 +12630,13 @@
   constructor({
     pageDiv,
     pdfPage,
-    xfaHtml,
-    annotationStorage
+    annotationStorage,
+    xfaHtml
   }) {
     this.pageDiv = pageDiv;
     this.pdfPage = pdfPage;
-    this.xfaHtml = xfaHtml;
     this.annotationStorage = annotationStorage;
+    this.xfaHtml = xfaHtml;
     this.div = null;
     this._cancelled = false;
   }
@@ -12454,14 +12657,16 @@
       this.pageDiv.appendChild(div);
       parameters.div = div;
 
-      _pdfjsLib.XfaLayer.render(parameters);
+      const result = _pdfjsLib.XfaLayer.render(parameters);
 
-      return Promise.resolve();
+      return Promise.resolve(result);
     }
 
     return this.pdfPage.getXfa().then(xfa => {
-      if (this._cancelled) {
-        return;
+      if (this._cancelled || !xfa) {
+        return {
+          textDivs: []
+        };
       }
 
       const parameters = {
@@ -12476,14 +12681,13 @@
       };
 
       if (this.div) {
-        _pdfjsLib.XfaLayer.update(parameters);
-      } else {
-        this.div = document.createElement("div");
-        this.pageDiv.appendChild(this.div);
-        parameters.div = this.div;
-
-        _pdfjsLib.XfaLayer.render(parameters);
+        return _pdfjsLib.XfaLayer.update(parameters);
       }
+
+      this.div = document.createElement("div");
+      this.pageDiv.appendChild(this.div);
+      parameters.div = this.div;
+      return _pdfjsLib.XfaLayer.render(parameters);
     }).catch(error => {
       console.error(error);
     });
@@ -12520,7 +12724,7 @@
 exports.DefaultXfaLayerFactory = DefaultXfaLayerFactory;
 
 /***/ }),
-/* 34 */
+/* 35 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
@@ -12534,7 +12738,7 @@
 
 var _pdf_cursor_tools = __webpack_require__(5);
 
-var _pdf_single_page_viewer = __webpack_require__(35);
+var _pdf_single_page_viewer = __webpack_require__(36);
 
 class SecondaryToolbar {
   constructor(options, mainContainer, eventBus) {
@@ -12839,7 +13043,7 @@
 exports.SecondaryToolbar = SecondaryToolbar;
 
 /***/ }),
-/* 35 */
+/* 36 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
@@ -12968,7 +13172,7 @@
 exports.PDFSinglePageViewer = PDFSinglePageViewer;
 
 /***/ }),
-/* 36 */
+/* 37 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
@@ -12981,8 +13185,6 @@
 var _ui_utils = __webpack_require__(3);
 
 const PAGE_NUMBER_LOADING_INDICATOR = "visiblePageIsLoading";
-const SCALE_SELECT_CONTAINER_WIDTH = 140;
-const SCALE_SELECT_WIDTH = 162;
 
 class Toolbar {
   constructor(options, eventBus, l10n) {
@@ -13020,7 +13222,6 @@
     this.items = {
       numPages: options.numPages,
       pageNumber: options.pageNumber,
-      scaleSelectContainer: options.scaleSelectContainer,
       scaleSelect: options.scaleSelect,
       customScaleOption: options.customScaleOption,
       previous: options.previous,
@@ -13202,17 +13403,16 @@
       l10n
     } = this;
     const predefinedValuesPromise = Promise.all([l10n.get("page_scale_auto"), l10n.get("page_scale_actual"), l10n.get("page_scale_fit"), l10n.get("page_scale_width")]);
+    const style = getComputedStyle(items.scaleSelect),
+          scaleSelectContainerWidth = parseInt(style.getPropertyValue("--scale-select-container-width"), 10),
+          scaleSelectOverflow = parseInt(style.getPropertyValue("--scale-select-overflow"), 10);
     let canvas = document.createElement("canvas");
     canvas.mozOpaque = true;
     let ctx = canvas.getContext("2d", {
       alpha: false
     });
     await _ui_utils.animationStarted;
-    const {
-      fontSize,
-      fontFamily
-    } = getComputedStyle(items.scaleSelect);
-    ctx.font = `${fontSize} ${fontFamily}`;
+    ctx.font = `${style.fontSize} ${style.fontFamily}`;
     let maxWidth = 0;
 
     for (const predefinedValue of await predefinedValuesPromise) {
@@ -13225,12 +13425,11 @@
       }
     }
 
-    const overflow = SCALE_SELECT_WIDTH - SCALE_SELECT_CONTAINER_WIDTH;
-    maxWidth += 2 * overflow;
+    maxWidth += 2 * scaleSelectOverflow;
 
-    if (maxWidth > SCALE_SELECT_CONTAINER_WIDTH) {
-      items.scaleSelect.style.width = `${maxWidth + overflow}px`;
-      items.scaleSelectContainer.style.width = `${maxWidth}px`;
+    if (maxWidth > scaleSelectContainerWidth) {
+      const doc = document.documentElement;
+      doc.style.setProperty("--scale-select-container-width", `${maxWidth}px`);
     }
 
     canvas.width = 0;
@@ -13243,7 +13442,7 @@
 exports.Toolbar = Toolbar;
 
 /***/ }),
-/* 37 */
+/* 38 */
 /***/ ((__unused_webpack_module, exports) => {
 
 
@@ -13338,7 +13537,7 @@
 exports.ViewHistory = ViewHistory;
 
 /***/ }),
-/* 38 */
+/* 39 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
@@ -13348,13 +13547,13 @@
 }));
 exports.FirefoxCom = exports.DownloadManager = void 0;
 
-__webpack_require__(39);
+__webpack_require__(40);
 
 var _app = __webpack_require__(2);
 
 var _pdfjsLib = __webpack_require__(4);
 
-var _preferences = __webpack_require__(40);
+var _preferences = __webpack_require__(41);
 
 var _ui_utils = __webpack_require__(3);
 
@@ -13762,7 +13961,7 @@
 });
 
 /***/ }),
-/* 39 */
+/* 40 */
 /***/ (() => {
 
 
@@ -13884,7 +14083,7 @@
 })(void 0);
 
 /***/ }),
-/* 40 */
+/* 41 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
@@ -13904,6 +14103,7 @@
 
     Object.defineProperty(this, "defaults", {
       value: Object.freeze({
+        "annotationMode": 2,
         "cursorToolOnLoad": 0,
         "defaultZoomValue": "",
         "disablePageLabels": false,
@@ -13914,7 +14114,6 @@
         "historyUpdateUrl": false,
         "ignoreDestinationZoom": false,
         "pdfBugEnabled": false,
-        "renderInteractiveForms": true,
         "sidebarViewOnLoad": -1,
         "scrollModeOnLoad": -1,
         "spreadModeOnLoad": -1,
@@ -13926,7 +14125,7 @@
         "disableFontFace": false,
         "disableRange": false,
         "disableStream": false,
-        "enableXfa": false
+        "enableXfa": true
       }),
       writable: false,
       enumerable: true,
@@ -14016,7 +14215,7 @@
 exports.BasePreferences = BasePreferences;
 
 /***/ }),
-/* 41 */
+/* 42 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
@@ -14028,13 +14227,13 @@
 
 var _pdfjsLib = __webpack_require__(4);
 
-var _print_utils = __webpack_require__(42);
+var _print_utils = __webpack_require__(43);
 
 var _app = __webpack_require__(2);
 
 function composePage(pdfDocument, pageNumber, size, printContainer, printResolution, optionalContentConfigPromise) {
   const canvas = document.createElement("canvas");
-  const PRINT_UNITS = printResolution / 72.0;
+  const PRINT_UNITS = printResolution / _pdfjsLib.PixelsPerInch.PDF;
   canvas.width = Math.floor(size.width * PRINT_UNITS);
   canvas.height = Math.floor(size.height * PRINT_UNITS);
   const canvasWrapper = document.createElement("div");
@@ -14064,7 +14263,7 @@
           rotation: size.rotation
         }),
         intent: "print",
-        includeAnnotationStorage: true,
+        annotationMode: _pdfjsLib.AnnotationMode.ENABLE_STORAGE,
         optionalContentConfigPromise
       };
       currentRenderTask = thisRenderTask = pdfPage.render(renderContext);
@@ -14145,7 +14344,7 @@
 };
 
 /***/ }),
-/* 42 */
+/* 43 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
@@ -14155,16 +14354,14 @@
 }));
 exports.getXfaHtmlForPrinting = getXfaHtmlForPrinting;
 
-var _ui_utils = __webpack_require__(3);
-
-var _xfa_layer_builder = __webpack_require__(33);
-
 var _pdfjsLib = __webpack_require__(4);
 
+var _xfa_layer_builder = __webpack_require__(34);
+
 function getXfaHtmlForPrinting(printContainer, pdfDocument) {
   const xfaHtml = pdfDocument.allXfaHtml;
   const factory = new _xfa_layer_builder.DefaultXfaLayerFactory();
-  const scale = Math.round(_ui_utils.CSS_UNITS * 100) / 100;
+  const scale = Math.round(_pdfjsLib.PixelsPerInch.PDF_TO_CSS_UNITS * 100) / 100;
 
   for (const xfaPage of xfaHtml.children) {
     const page = document.createElement("div");
@@ -14232,15 +14429,15 @@
 
 var _app = __webpack_require__(2);
 
-const pdfjsVersion = '2.11.22';
-const pdfjsBuild = '4ad5c5d52';
+const pdfjsVersion = '2.11.298';
+const pdfjsBuild = 'd370a281c';
 window.PDFViewerApplication = _app.PDFViewerApplication;
 window.PDFViewerApplicationOptions = _app_options.AppOptions;
 ;
 {
-  __webpack_require__(38);
+  __webpack_require__(39);
 
-  __webpack_require__(41);
+  __webpack_require__(42);
 }
 ;
 ;
@@ -14257,7 +14454,6 @@
       container: document.getElementById("toolbarViewer"),
       numPages: document.getElementById("numPages"),
       pageNumber: document.getElementById("pageNumber"),
-      scaleSelectContainer: document.getElementById("scaleSelectContainer"),
       scaleSelect: document.getElementById("scaleSelect"),
       customScaleOption: document.getElementById("customScaleOption"),
       previous: document.getElementById("previous"),
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/moz.yaml thunderbird-91.4.0+build2/toolkit/components/pdfjs/moz.yaml
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/moz.yaml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/moz.yaml	2021-12-09 12:00:10.000000000 +0000
@@ -20,7 +20,7 @@
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: version 2.11.22
+  release: version 2.11.298
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/README.mozilla thunderbird-91.4.0+build2/toolkit/components/pdfjs/README.mozilla
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/README.mozilla	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/README.mozilla	2021-12-09 12:00:11.000000000 +0000
@@ -1,5 +1,5 @@
 This is the PDF.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 2.11.22
+Current extension version is: 2.11.298
 
-Taken from upstream commit: 4ad5c5d52
+Taken from upstream commit: d370a281c
diff -Nru thunderbird-91.3.2+build1/toolkit/components/pdfjs/test/browser_pdfjs_form.js thunderbird-91.4.0+build2/toolkit/components/pdfjs/test/browser_pdfjs_form.js
--- thunderbird-91.3.2+build1/toolkit/components/pdfjs/test/browser_pdfjs_form.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/components/pdfjs/test/browser_pdfjs_form.js	2021-12-09 12:00:10.000000000 +0000
@@ -24,12 +24,12 @@
 add_task(async function test_defaults() {
   // Ensure the default preference is set to the expected value.
   let defaultBranch = Services.prefs.getDefaultBranch("pdfjs.");
-  let prefType = defaultBranch.getPrefType("renderInteractiveForms");
-  let renderForms = Services.prefs.getBoolPref("pdfjs.renderInteractiveForms");
+  let prefType = defaultBranch.getPrefType("annotationMode");
+  let renderForms = Services.prefs.getIntPref("pdfjs.annotationMode") === 2;
 
   is(
     prefType,
-    Ci.nsIPrefBranch.PREF_BOOL,
+    Ci.nsIPrefBranch.PREF_INT,
     "The form pref is defined by default"
   );
 
@@ -56,7 +56,7 @@
     async function(browser) {
       // First, make sure they are enabled.
       await SpecialPowers.pushPrefEnv({
-        set: [["pdfjs.renderInteractiveForms", true]],
+        set: [["pdfjs.annotationMode", 2]],
       });
       await waitForPdfJSAnnotationLayer(
         browser,
@@ -69,7 +69,7 @@
       );
       // Now disable the forms.
       await SpecialPowers.pushPrefEnv({
-        set: [["pdfjs.renderInteractiveForms", false]],
+        set: [["pdfjs.annotationMode", 1]],
       });
       await waitForPdfJSAnnotationLayer(
         browser,
diff -Nru thunderbird-91.3.2+build1/toolkit/content/gmp-sources/widevinecdm.json thunderbird-91.4.0+build2/toolkit/content/gmp-sources/widevinecdm.json
--- thunderbird-91.3.2+build1/toolkit/content/gmp-sources/widevinecdm.json	2021-11-19 11:55:57.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/content/gmp-sources/widevinecdm.json	2021-12-09 12:00:10.000000000 +0000
@@ -1,27 +1,27 @@
 {
   "hashFunction": "sha512",
-  "name": "Widevine-4.10.2209.1",
+  "name": "Widevine-4.10.2391.0",
   "schema_version": 1000,
   "vendors": {
     "gmp-widevinecdm": {
       "platforms": {
         "Darwin_aarch64-gcc3": {
-          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2209.1-mac-arm64.zip",
-          "filesize": 6802982,
-          "hashValue": "cec27865699d183419bea89b3d92e9aed8763ff8427de305bbc9cd01a3d3e4ac219450d1ff06d77d6e5727b243040e8e3c2fb767254678902d3cb0055b709b8b"
+          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2391.0-mac-arm64.zip",
+          "filesize": 6511203,
+          "hashValue": "041a9bbe89160f604d72db92fc9c1fdce75d528706245c837d4d0ea71e96c1b5106e512ca37e075373ceaeda64e6dd42e02889edaee8dc3077718620a16b4f2e"
         },
         "Darwin_x86_64-gcc3": {
           "alias": "Darwin_x86_64-gcc3-u-i386-x86_64"
         },
         "Darwin_x86_64-gcc3-u-i386-x86_64": {
-          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2209.1-mac-x64.zip",
-          "filesize": 7199960,
-          "hashValue": "545d4140175ec3763955e3349e0c95f20e5f7819e25c8d381c1324e9416989cedc50954cd199afb053e4a9fa2333c6ce580c02ca60313588f8de03bafc4843c2"
+          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2391.0-mac-x64.zip",
+          "filesize": 6942023,
+          "hashValue": "2cf195a99dd13019c2f29e036f98e10905d1472f013970bd8b2f0ff65fe2b20a9058570c57b3595c1b9824326ac11a185a80008d618c673736323355345d69fe"
         },
         "Linux_x86_64-gcc3": {
-          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2209.1-linux-x64.zip",
-          "filesize": 6718745,
-          "hashValue": "7775f2a08cd77f3b1ab80c34d9306007a02aba02a19d91db96335468885b185e0126a784a8877d3846e50cad2539efce9854d8647c09ed139a148476456f59b7"
+          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2391.0-linux-x64.zip",
+          "filesize": 6328796,
+          "hashValue": "8ce16faae96274e1f5ec63f6f543fa33ab3b7d469e59fac2d8b45cb27d3c95820cf80cd362d6e972a1c3c27e5c1b28c018fbdc2bb7df50f095391a646e277a99"
         },
         "Linux_x86_64-gcc3-asan": {
           "alias": "Linux_x86_64-gcc3"
@@ -30,9 +30,9 @@
           "alias": "WINNT_x86-msvc"
         },
         "WINNT_x86-msvc": {
-          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2209.1-win-ia32.zip",
-          "filesize": 6650740,
-          "hashValue": "a46123a191eb91b26fac1148f43b8037057edcb6c176cea85cf13fa9efdef2ded45cf8ddafa3ebc04ffbe0e9ec35095dfa8ed7e99bc58b20f0fa6e8ee2022642"
+          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2391.0-win-ia32.zip",
+          "filesize": 6331242,
+          "hashValue": "24569de210f6a6d47daf0e64441f0c575dcbb23e5ff2fcb705edcd6e0fce9378caafd84e81a1c0efd25056a686ab8cb47855f43230ee37ddabc97453b72024ff"
         },
         "WINNT_x86-msvc-x64": {
           "alias": "WINNT_x86-msvc"
@@ -41,15 +41,18 @@
           "alias": "WINNT_x86-msvc"
         },
         "WINNT_x86_64-msvc": {
-          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2209.1-win-x64.zip",
-          "filesize": 6862914,
-          "hashValue": "abfe5016a8e18034eed7a6afb3ebdcf3f151d4e3d61668ce5dd64579d28ca90fe29931e34d08f4d0ec29fe16a8df40dbc7233ad36519aa99a86e831acf5298c5"
+          "fileUrl": "https://redirector.gvt1.com/edgedl/widevine-cdm/4.10.2391.0-win-x64.zip",
+          "filesize": 6537814,
+          "hashValue": "81b2329d38a9370afc490db805a05c4b506b113ebd00f4e488bca97fd96267d92cb477e3a635880464ca66ed32f448e46ad3645f6af072547b5f09100db2bf74"
         },
         "WINNT_x86_64-msvc-x64": {
           "alias": "WINNT_x86_64-msvc"
+        },
+        "WINNT_x86_64-msvc-x64-asan": {
+          "alias": "WINNT_x86_64-msvc"
         }
       },
-      "version": "4.10.2209.1"
+      "version": "4.10.2391.0"
     }
   }
 }
diff -Nru thunderbird-91.3.2+build1/toolkit/content/tests/browser/browser_autoscroll_disabled_on_links.js thunderbird-91.4.0+build2/toolkit/content/tests/browser/browser_autoscroll_disabled_on_links.js
--- thunderbird-91.3.2+build1/toolkit/content/tests/browser/browser_autoscroll_disabled_on_links.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/content/tests/browser/browser_autoscroll_disabled_on_links.js	2021-12-09 12:00:10.000000000 +0000
@@ -0,0 +1,125 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+add_task(async function test_autoscroll_links() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["general.autoScroll", true],
+      ["middlemouse.contentLoadURL", false],
+      ["test.events.async.enabled", false],
+    ],
+  });
+
+  let autoScroller;
+  function onPopupShown(aEvent) {
+    if (aEvent.originalTarget.id != "autoscroller") {
+      return false;
+    }
+    autoScroller = aEvent.originalTarget;
+    return true;
+  }
+  window.addEventListener("popupshown", onPopupShown, { capture: true });
+  registerCleanupFunction(() => {
+    window.removeEventListener("popupshown", onPopupShown, { capture: true });
+  });
+  function popupIsNotClosed() {
+    return autoScroller && autoScroller.state != "closed";
+  }
+
+  async function promiseNativeMouseMiddleButtonDown(aBrowser) {
+    await EventUtils.promiseNativeMouseEvent({
+      type: "mousemove",
+      target: aBrowser,
+      atCenter: true,
+    });
+    return EventUtils.promiseNativeMouseEvent({
+      type: "mousedown",
+      target: aBrowser,
+      atCenter: true,
+      button: 1, // middle button
+    });
+  }
+  async function promiseNativeMouseMiddleButtonUp(aBrowser) {
+    return EventUtils.promiseNativeMouseEvent({
+      type: "mouseup",
+      target: aBrowser,
+      atCenter: true,
+      button: 1, // middle button
+    });
+  }
+  function promiseWaitForAutoScrollerClosed() {
+    if (!autoScroller || autoScroller.state == "closed") {
+      return Promise.resolve();
+    }
+    let result = BrowserTestUtils.waitForEvent(
+      autoScroller,
+      "popuphidden",
+      { capture: true },
+      () => {
+        return true;
+      }
+    );
+    EventUtils.synthesizeKey("KEY_Escape");
+    return result;
+  }
+
+  async function testMarkup(markup) {
+    return BrowserTestUtils.withNewTab(
+      "https://example.com/browser/toolkit/content/tests/browser/file_empty.html",
+      async function(browser) {
+        await SpecialPowers.spawn(browser, [markup], html => {
+          // eslint-disable-next-line no-unsanitized/property
+          content.document.body.innerHTML = html;
+          content.document.documentElement.scrollTop = 1;
+          content.document.documentElement.scrollTop; // Flush layout.
+        });
+        await promiseNativeMouseMiddleButtonDown(browser);
+        try {
+          await TestUtils.waitForCondition(
+            popupIsNotClosed,
+            "Wait for timeout of popup",
+            100,
+            10
+          );
+          ok(false, "Autoscroll shouldn't be started on " + markup);
+        } catch (e) {
+          ok(
+            typeof e == "string" && e.includes(" - timed out after 10 tries."),
+            `Autoscroll shouldn't be started on ${markup} (${
+              typeof e == "string" ? e : e.message
+            })`
+          );
+        } finally {
+          await promiseNativeMouseMiddleButtonUp(browser);
+          let waitForAutoScrollEnd = promiseWaitForAutoScrollerClosed();
+          await waitForAutoScrollEnd;
+        }
+      }
+    );
+  }
+
+  await testMarkup(
+    '<a href="https://example.com/" style="display: block; position: absolute; height:100%; width:100%; background: aqua">Click me</a>'
+  );
+
+  await testMarkup(`
+    <svg viewbox="0 0 100 100" style="display: block; height: 100%; width: 100%;">
+      <a href="https://example.com/">
+        <rect height=100 width=100 fill=blue />
+      </a>
+    </svg>`);
+
+  await testMarkup(`
+    <a href="https://example.com/">
+      <svg viewbox="0 0 100 100" style="display: block; height: 100%; width: 100%;">
+        <use href="#x"/>
+      </svg>
+    </a>
+
+    <svg viewbox="0 0 100 100" style="display: none">
+      <rect id="x" height=100 width=100 fill=green />
+    </svg>
+    `);
+});
diff -Nru thunderbird-91.3.2+build1/toolkit/content/tests/browser/browser.ini thunderbird-91.4.0+build2/toolkit/content/tests/browser/browser.ini
--- thunderbird-91.3.2+build1/toolkit/content/tests/browser/browser.ini	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/content/tests/browser/browser.ini	2021-12-09 12:00:11.000000000 +0000
@@ -23,6 +23,7 @@
 [browser_autoscroll_disabled.js]
 skip-if = true # Bug 1312652
 [browser_autoscroll_disabled_on_editable_content.js]
+[browser_autoscroll_disabled_on_links.js]
 [browser_delay_autoplay_media.js]
 tags = audiochannel
 skip-if = (os == "win" && processor == "aarch64") # aarch64 due to 1536573
diff -Nru thunderbird-91.3.2+build1/toolkit/library/rust/shared/Cargo.toml thunderbird-91.4.0+build2/toolkit/library/rust/shared/Cargo.toml
--- thunderbird-91.3.2+build1/toolkit/library/rust/shared/Cargo.toml	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/library/rust/shared/Cargo.toml	2021-12-09 12:00:10.000000000 +0000
@@ -20,7 +20,7 @@
 mozurl = { path = "../../../../netwerk/base/mozurl" }
 webrender_bindings = { path = "../../../../gfx/webrender_bindings", optional = true }
 cubeb-coreaudio = { git = "https://github.com/mozilla/cubeb-coreaudio-rs", rev = "ad56ea14ac915f1e7ecbcf6ac38182443b0dd29e", optional = true }
-cubeb-pulse = { git = "https://github.com/mozilla/cubeb-pulse-rs", rev="c87b50aebfa088c1ad30c74819d4e9829f88b2e3", optional = true, features=["pulse-dlopen"] }
+cubeb-pulse = { git = "https://github.com/mozilla/cubeb-pulse-rs", rev="b0acd9e16c0249d61835a2d23735fbcbd8cbef64", optional = true, features=["pulse-dlopen"] }
 cubeb-sys = { version = "0.9", optional = true, features=["gecko-in-tree"] }
 encoding_glue = { path = "../../../../intl/encoding_glue" }
 audioipc-client = { git = "https://github.com/mozilla/audioipc-2", rev = "7537bfadad2e981577eb75e4f13662fc517e1a09", optional = true }
diff -Nru thunderbird-91.3.2+build1/toolkit/modules/AsyncPrefs.jsm thunderbird-91.4.0+build2/toolkit/modules/AsyncPrefs.jsm
--- thunderbird-91.3.2+build1/toolkit/modules/AsyncPrefs.jsm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/modules/AsyncPrefs.jsm	2021-12-09 12:00:11.000000000 +0000
@@ -40,7 +40,7 @@
   "pdfjs.previousHandler.alwaysAskBeforeHandling",
   "pdfjs.previousHandler.preferredAction",
   "pdfjs.renderer",
-  "pdfjs.renderInteractiveForms",
+  "pdfjs.annotationMode",
   "pdfjs.sidebarViewOnLoad",
   "pdfjs.scrollModeOnLoad",
   "pdfjs.spreadModeOnLoad",
diff -Nru thunderbird-91.3.2+build1/toolkit/modules/BrowserUtils.jsm thunderbird-91.4.0+build2/toolkit/modules/BrowserUtils.jsm
--- thunderbird-91.3.2+build1/toolkit/modules/BrowserUtils.jsm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/modules/BrowserUtils.jsm	2021-12-09 12:00:10.000000000 +0000
@@ -140,6 +140,71 @@
       "moz-extension" == scheme
     );
   },
+
+  /**
+   * Extracts linkNode and href for a click event.
+   *
+   * @param event
+   *        The click event.
+   * @return [href, linkNode, linkPrincipal].
+   *
+   * @note linkNode will be null if the click wasn't on an anchor
+   *       element. This includes SVG links, because callers expect |node|
+   *       to behave like an <a> element, which SVG links (XLink) don't.
+   */
+  hrefAndLinkNodeForClickEvent(event) {
+    // We should get a window off the event, and bail if not:
+    let content = event.view || event.composedTarget?.ownerGlobal;
+    if (!content?.HTMLAnchorElement) {
+      return null;
+    }
+    function isHTMLLink(aNode) {
+      // Be consistent with what nsContextMenu.js does.
+      return (
+        (aNode instanceof content.HTMLAnchorElement && aNode.href) ||
+        (aNode instanceof content.HTMLAreaElement && aNode.href) ||
+        aNode instanceof content.HTMLLinkElement
+      );
+    }
+
+    let node = event.composedTarget;
+    while (node && !isHTMLLink(node)) {
+      node = node.flattenedTreeParentNode;
+    }
+
+    if (node) {
+      return [node.href, node, node.ownerDocument.nodePrincipal];
+    }
+
+    // If there is no linkNode, try simple XLink.
+    let href, baseURI;
+    node = event.composedTarget;
+    while (node && !href) {
+      if (
+        node.nodeType == content.Node.ELEMENT_NODE &&
+        (node.localName == "a" ||
+          node.namespaceURI == "http://www.w3.org/1998/Math/MathML")
+      ) {
+        href =
+          node.getAttribute("href") ||
+          node.getAttributeNS("http://www.w3.org/1999/xlink", "href");
+        if (href) {
+          baseURI = node.ownerDocument.baseURIObject;
+          break;
+        }
+      }
+      node = node.flattenedTreeParentNode;
+    }
+
+    // In case of XLink, we don't return the node we got href from since
+    // callers expect <a>-like elements.
+    // Note: makeURI() will throw if aUri is not a valid URI.
+    return [
+      href ? Services.io.newURI(href, null, baseURI).spec : null,
+      null,
+      node && node.ownerDocument.nodePrincipal,
+    ];
+  },
 };
 
 XPCOMUtils.defineLazyPreferenceGetter(
diff -Nru thunderbird-91.3.2+build1/toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_extension.js thunderbird-91.4.0+build2/toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_extension.js
--- thunderbird-91.3.2+build1/toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_extension.js	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_extension.js	2021-12-09 12:00:11.000000000 +0000
@@ -37,11 +37,20 @@
   dialog.getButton("accept").removeAttribute("disabled");
   dialog.acceptDialog();
   let download = await downloadFinishedPromise;
-  let f = new FileUtils.File(download.target.path);
-  // We cannot assume that the filename is a particular
-  let extensions = f.leafName.substring(f.leafName.indexOf("."));
-  is(extensions, ".EXE", "Should not duplicate extension");
+  // We cannot assume that the filename didn't change.
+  let filename = PathUtils.filename(download.target.path);
+  Assert.ok(
+    filename.indexOf(".") == filename.lastIndexOf("."),
+    "Should not duplicate extension"
+  );
+  Assert.ok(filename.endsWith(".EXE"), "Should not change extension");
   await list.remove(download);
-  f.remove(true);
   BrowserTestUtils.removeTab(tab);
+  try {
+    await IOUtils.remove(download.target.path);
+  } catch (ex) {
+    // Ignore errors in removing the file, the system may keep it locked and
+    // it's not a critical issue.
+    info("Failed to remove the file " + ex);
+  }
 });
diff -Nru thunderbird-91.3.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_langpack_locale_match.js thunderbird-91.4.0+build2/toolkit/mozapps/extensions/test/xpcshell/test_langpack_locale_match.js
--- thunderbird-91.3.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_langpack_locale_match.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/mozapps/extensions/test/xpcshell/test_langpack_locale_match.js	2021-12-09 12:00:11.000000000 +0000
@@ -0,0 +1,44 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * Tests that lang-packs matching the packaged locale do not register
+ * their sources.
+ */
+
+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+
+const enUSID = "langpack-en-US@tests.mozilla.org";
+
+add_task(async function testInstallMatchingLangpack() {
+  Services.locale.requestedLocales = ["en-US"];
+  Assert.equal(Services.locale.requestedLocale, "en-US");
+
+  await promiseStartupManager();
+
+  let langpack = {
+    "manifest.json": {
+      name: "Test en-US Language Pack",
+      version: "1.0",
+      manifest_version: 2,
+      langpack_id: "en-US",
+      applications: { gecko: { id: enUSID } },
+      languages: {
+        "en-US": {
+          version: "20211012155819",
+          chrome_resources: {},
+        },
+      },
+    },
+  };
+
+  await Promise.all([
+    TestUtils.topicObserved("webextension-langpack-startup-aborted"),
+    AddonTestUtils.promiseInstallXPI(langpack),
+  ]);
+
+  let a1 = await AddonManager.getAddonByID(enUSID);
+  await a1.uninstall();
+  await promiseShutdownManager();
+});
diff -Nru thunderbird-91.3.2+build1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini thunderbird-91.4.0+build2/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
--- thunderbird-91.3.2+build1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-11-19 11:55:58.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-12-09 12:00:11.000000000 +0000
@@ -51,6 +51,7 @@
 [test_install_icons.js]
 [test_isDebuggable.js]
 [test_isReady.js]
+[test_langpack_locale_match.js]
 [test_locale.js]
 [test_moved_extension_metadata.js]
 skip-if = true
diff -Nru thunderbird-91.3.2+build1/toolkit/mozapps/update/updater/updater.cpp thunderbird-91.4.0+build2/toolkit/mozapps/update/updater/updater.cpp
--- thunderbird-91.3.2+build1/toolkit/mozapps/update/updater/updater.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/mozapps/update/updater/updater.cpp	2021-12-09 12:00:11.000000000 +0000
@@ -352,13 +352,7 @@
   return ret;
 }
 
-#if defined(TEST_UPDATER)
-#  define HAS_ENV_CHECK 1
-#elif defined(MOZ_MAINTENANCE_SERVICE)
-#  define HAS_ENV_CHECK 1
-#endif
-
-#if defined(HAS_ENV_CHECK)
+#if defined(TEST_UPDATER) || defined(XP_WIN)
 static bool EnvHasValue(const char* name) {
   const char* val = getenv(name);
   return (val && *val);
@@ -2240,7 +2234,7 @@
 }
 #endif
 
-#if defined(XP_WIN) && defined(MOZ_MAINTENANCE_SERVICE)
+#if defined(XP_WIN)
 /*
  * Reads the secure update status file and sets isSucceeded to true if the
  * status is set to succeeded.
diff -Nru thunderbird-91.3.2+build1/toolkit/profile/moz.build thunderbird-91.4.0+build2/toolkit/profile/moz.build
--- thunderbird-91.3.2+build1/toolkit/profile/moz.build	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/profile/moz.build	2021-12-09 12:00:11.000000000 +0000
@@ -36,7 +36,8 @@
 
 FINAL_LIBRARY = "xul"
 
-DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]
+for var in ("MOZ_APP_NAME", "MOZ_APP_BASENAME"):
+    DEFINES[var] = '"%s"' % CONFIG[var]
 
 JAR_MANIFESTS += ["jar.mn"]
 
diff -Nru thunderbird-91.3.2+build1/toolkit/themes/shared/findbar.css thunderbird-91.4.0+build2/toolkit/themes/shared/findbar.css
--- thunderbird-91.3.2+build1/toolkit/themes/shared/findbar.css	2021-11-19 11:55:58.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/themes/shared/findbar.css	2021-12-09 12:00:10.000000000 +0000
@@ -77,7 +77,7 @@
 html|input.findbar-textbox[status="notfound"] {
   border-color: transparent;
   outline: 2px solid var(--input-error-border-color, #E22850);
-  outline-offset: -1px; /* Prevents antialising around the corners */
+  outline-offset: -2px;
 }
 
 html|input.findbar-textbox[flash="true"] {
diff -Nru thunderbird-91.3.2+build1/toolkit/xre/nsNativeAppSupportCocoa.mm thunderbird-91.4.0+build2/toolkit/xre/nsNativeAppSupportCocoa.mm
--- thunderbird-91.3.2+build1/toolkit/xre/nsNativeAppSupportCocoa.mm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/xre/nsNativeAppSupportCocoa.mm	2021-12-09 12:00:10.000000000 +0000
@@ -114,7 +114,7 @@
 
       nsCOMPtr<nsIWidget> widget = nullptr;
       baseWindow->GetMainWidget(getter_AddRefs(widget));
-      if (!widget) {
+      if (!widget || !widget->IsVisible()) {
         windowList->HasMoreElements(&more);
         continue;
       }
@@ -127,9 +127,14 @@
     }  // end while
 
     if (!haveNonMiniaturized) {
-      // Deminiaturize the most recenty used window
+      // Prioritize browser windows for deminiaturization
       nsCOMPtr<mozIDOMWindowProxy> mru;
-      wm->GetMostRecentWindow(nullptr, getter_AddRefs(mru));
+      wm->GetMostRecentBrowserWindow(getter_AddRefs(mru));
+
+      // Failing that, deminiaturize the most recently used window
+      if (!mru) {
+        wm->GetMostRecentWindow(nullptr, getter_AddRefs(mru));
+      }
 
       if (mru) {
         NSWindow* cocoaMru = nil;
diff -Nru thunderbird-91.3.2+build1/toolkit/xre/PolicyChecks.h thunderbird-91.4.0+build2/toolkit/xre/PolicyChecks.h
--- thunderbird-91.3.2+build1/toolkit/xre/PolicyChecks.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/toolkit/xre/PolicyChecks.h	2021-12-09 12:00:11.000000000 +0000
@@ -11,14 +11,16 @@
 
 #  include <windows.h>
 
+#  define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\Mozilla\\" MOZ_APP_BASENAME
+
 // NB: This code must be able to run apart from XPCOM
 
 namespace mozilla {
 
 inline bool PolicyHasRegValue(HKEY aKey, LPCWSTR aName, DWORD* aValue) {
   DWORD len = sizeof(DWORD);
-  LONG ret = ::RegGetValueW(aKey, L"SOFTWARE\\Policies\\Mozilla\\Firefox",
-                            aName, RRF_RT_DWORD, nullptr, aValue, &len);
+  LONG ret = ::RegGetValueW(aKey, POLICY_REGKEY_NAME, aName, RRF_RT_DWORD,
+                            nullptr, aValue, &len);
   return ret == ERROR_SUCCESS;
 }
 
diff -Nru thunderbird-91.3.2+build1/uriloader/exthandler/nsExternalHelperAppService.cpp thunderbird-91.4.0+build2/uriloader/exthandler/nsExternalHelperAppService.cpp
--- thunderbird-91.3.2+build1/uriloader/exthandler/nsExternalHelperAppService.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/uriloader/exthandler/nsExternalHelperAppService.cpp	2021-12-09 12:00:11.000000000 +0000
@@ -1005,6 +1005,25 @@
 static const char kExternalProtocolDefaultPref[] =
     "network.protocol-handler.external-default";
 
+// static
+nsresult nsExternalHelperAppService::EscapeURI(nsIURI* aURI, nsIURI** aResult) {
+  MOZ_ASSERT(aURI);
+  MOZ_ASSERT(aResult);
+
+  nsAutoCString spec;
+  aURI->GetSpec(spec);
+
+  if (spec.Find("%00") != -1) return NS_ERROR_MALFORMED_URI;
+
+  nsAutoCString escapedSpec;
+  nsresult rv = NS_EscapeURL(spec, esc_AlwaysCopy | esc_ExtHandler, escapedSpec,
+                             fallible);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIIOService> ios(do_GetIOService());
+  return ios->NewURI(escapedSpec, nullptr, nullptr, aResult);
+}
+
 NS_IMETHODIMP
 nsExternalHelperAppService::LoadURI(nsIURI* aURI,
                                     nsIPrincipal* aTriggeringPrincipal,
@@ -1018,21 +1037,12 @@
     return NS_OK;
   }
 
-  nsAutoCString spec;
-  aURI->GetSpec(spec);
-
-  if (spec.Find("%00") != -1) return NS_ERROR_MALFORMED_URI;
-
-  spec.ReplaceSubstring("\"", "%22");
-  spec.ReplaceSubstring("`", "%60");
-
-  nsCOMPtr<nsIIOService> ios(do_GetIOService());
-  nsCOMPtr<nsIURI> uri;
-  nsresult rv = ios->NewURI(spec, nullptr, nullptr, getter_AddRefs(uri));
+  nsCOMPtr<nsIURI> escapedURI;
+  nsresult rv = EscapeURI(aURI, getter_AddRefs(escapedURI));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsAutoCString scheme;
-  uri->GetScheme(scheme);
+  escapedURI->GetScheme(scheme);
   if (scheme.IsEmpty()) return NS_OK;  // must have a scheme
 
   // Deny load if the prefs say to do so
@@ -1115,7 +1125,7 @@
       do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return chooser->HandleURI(handler, uri, aTriggeringPrincipal,
+  return chooser->HandleURI(handler, escapedURI, aTriggeringPrincipal,
                             aBrowsingContext, aTriggeredExternally);
 }
 
diff -Nru thunderbird-91.3.2+build1/uriloader/exthandler/nsExternalHelperAppService.h thunderbird-91.4.0+build2/uriloader/exthandler/nsExternalHelperAppService.h
--- thunderbird-91.3.2+build1/uriloader/exthandler/nsExternalHelperAppService.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/uriloader/exthandler/nsExternalHelperAppService.h	2021-12-09 12:00:11.000000000 +0000
@@ -81,6 +81,7 @@
                                bool* aResult) override;
   NS_IMETHOD GetProtocolHandlerInfo(const nsACString& aScheme,
                                     nsIHandlerInfo** aHandlerInfo) override;
+
   NS_IMETHOD LoadURI(nsIURI* aURI, nsIPrincipal* aTriggeringPrincipal,
                      mozilla::dom::BrowsingContext* aBrowsingContext,
                      bool aWasTriggeredExternally) override;
@@ -117,6 +118,9 @@
 
   static already_AddRefed<nsExternalHelperAppService> GetSingleton();
 
+  // Internal method. Only called directly from tests.
+  static nsresult EscapeURI(nsIURI* aURI, nsIURI** aResult);
+
  protected:
   virtual ~nsExternalHelperAppService();
 
diff -Nru thunderbird-91.3.2+build1/widget/cocoa/nsCursorManager.mm thunderbird-91.4.0+build2/widget/cocoa/nsCursorManager.mm
--- thunderbird-91.3.2+build1/widget/cocoa/nsCursorManager.mm	2021-11-19 11:55:58.000000000 +0000
+++ thunderbird-91.4.0+build2/widget/cocoa/nsCursorManager.mm	2021-12-09 12:00:11.000000000 +0000
@@ -240,6 +240,10 @@
 
   // As the user moves the mouse, this gets called repeatedly with the same aCursorImage
   if (sCurrentCursor == aCursor && sCurrentCursorScaleFactor == scaleFactor && mCurrentMacCursor) {
+    // Native dragging can unset our cursor apparently (see bug 1739352).
+    if (MOZ_UNLIKELY(![mCurrentMacCursor isSet])) {
+      [mCurrentMacCursor set];
+    }
     return NS_OK;
   }
 
diff -Nru thunderbird-91.3.2+build1/widget/cocoa/nsLookAndFeel.mm thunderbird-91.4.0+build2/widget/cocoa/nsLookAndFeel.mm
--- thunderbird-91.3.2+build1/widget/cocoa/nsLookAndFeel.mm	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/widget/cocoa/nsLookAndFeel.mm	2021-12-09 12:00:11.000000000 +0000
@@ -540,6 +540,8 @@
 }
 
 nsresult nsLookAndFeel::NativeGetFloat(FloatID aID, float& aResult) {
+  NS_OBJC_BEGIN_TRY_BLOCK_RETURN;
+
   nsresult res = NS_OK;
 
   switch (aID) {
@@ -549,12 +551,21 @@
     case FloatID::SpellCheckerUnderlineRelativeSize:
       aResult = 2.0f;
       break;
+    case FloatID::CursorScale: {
+      id uaDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"com.apple.universalaccess"];
+      float f = [uaDefaults floatForKey:@"mouseDriverCursorSize"];
+      [uaDefaults release];
+      aResult = f > 0.0 ? f : 1.0;  // default to 1.0 if value not available
+      break;
+    }
     default:
       aResult = -1.0;
       res = NS_ERROR_FAILURE;
   }
 
   return res;
+
+  NS_OBJC_END_TRY_BLOCK_RETURN(NS_ERROR_FAILURE);
 }
 
 bool nsLookAndFeel::SystemWantsDarkTheme() {
diff -Nru thunderbird-91.3.2+build1/widget/gtk/DMABufSurface.cpp thunderbird-91.4.0+build2/widget/gtk/DMABufSurface.cpp
--- thunderbird-91.3.2+build1/widget/gtk/DMABufSurface.cpp	2021-11-19 11:55:58.000000000 +0000
+++ thunderbird-91.4.0+build2/widget/gtk/DMABufSurface.cpp	2021-12-09 12:00:11.000000000 +0000
@@ -189,15 +189,15 @@
 }
 
 void DMABufSurface::FenceDelete() {
-  if (!mGL) return;
-  const auto& gle = gl::GLContextEGL::Cast(mGL);
-  const auto& egl = gle->mEgl;
-
   if (mSyncFd > 0) {
     close(mSyncFd);
     mSyncFd = -1;
   }
 
+  if (!mGL) return;
+  const auto& gle = gl::GLContextEGL::Cast(mGL);
+  const auto& egl = gle->mEgl;
+
   if (mSync) {
     egl->fDestroySync(mSync);
     mSync = nullptr;
diff -Nru thunderbird-91.3.2+build1/widget/LookAndFeel.h thunderbird-91.4.0+build2/widget/LookAndFeel.h
--- thunderbird-91.3.2+build1/widget/LookAndFeel.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/widget/LookAndFeel.h	2021-12-09 12:00:11.000000000 +0000
@@ -415,6 +415,9 @@
     // GTK text scale factor.
     TextScaleFactor,
 
+    // Mouse pointer scaling factor.
+    CursorScale,
+
     // Not an ID; used to define the range of valid IDs.  Must be last.
     End,
   };
diff -Nru thunderbird-91.3.2+build1/widget/nsXPLookAndFeel.cpp thunderbird-91.4.0+build2/widget/nsXPLookAndFeel.cpp
--- thunderbird-91.3.2+build1/widget/nsXPLookAndFeel.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/widget/nsXPLookAndFeel.cpp	2021-12-09 12:00:11.000000000 +0000
@@ -187,6 +187,7 @@
     "ui.SpellCheckerUnderlineRelativeSize",
     "ui.caretAspectRatio",
     "ui.textScaleFactor",
+    "ui.cursorScale",
 };
 
 static_assert(ArrayLength(sFloatPrefs) == size_t(LookAndFeel::FloatID::End),
diff -Nru thunderbird-91.3.2+build1/widget/windows/nsWindow.cpp thunderbird-91.4.0+build2/widget/windows/nsWindow.cpp
--- thunderbird-91.3.2+build1/widget/windows/nsWindow.cpp	2021-11-19 11:55:58.000000000 +0000
+++ thunderbird-91.4.0+build2/widget/windows/nsWindow.cpp	2021-12-09 12:00:12.000000000 +0000
@@ -1655,6 +1655,18 @@
     // we're actually already showing, we won't hit it in the normal way.
     ::SendMessageW(mWnd, WM_CHANGEUISTATE,
                    MAKEWPARAM(UIS_SET, UISF_HIDEFOCUS | UISF_HIDEACCEL), 0);
+#if defined(ACCESSIBILITY)
+    // If our HWND has focus and the a11y engine hasn't started yet, fire a
+    // focus win event. Windows already did this when the skeleton UI appeared,
+    // but a11y wouldn't have been able to start at that point even if a client
+    // responded. Firing this now gives clients the chance to respond with
+    // WM_GETOBJECT, which will trigger the a11y engine. We don't want to do
+    // this if the a11y engine has already started because it has probably
+    // already fired focus on a descendant.
+    if (::GetFocus() == mWnd && !GetAccService()) {
+      ::NotifyWinEvent(EVENT_OBJECT_FOCUS, mWnd, OBJID_CLIENT, CHILDID_SELF);
+    }
+#endif  // defined(ACCESSIBILITY)
   }
 
   if (mWindowType == eWindowType_popup) {
diff -Nru thunderbird-91.3.2+build1/xpcom/io/nsEscape.cpp thunderbird-91.4.0+build2/xpcom/io/nsEscape.cpp
--- thunderbird-91.3.2+build1/xpcom/io/nsEscape.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/xpcom/io/nsEscape.cpp	2021-12-09 12:00:11.000000000 +0000
@@ -236,40 +236,41 @@
 // parts of an URL.  The bits are the "url components" in the enum EscapeMask,
 // see nsEscape.h.
 //
-// esc_Scheme        =     1
-// esc_Username      =     2
-// esc_Password      =     4
-// esc_Host          =     8
-// esc_Directory     =    16
-// esc_FileBaseName  =    32
-// esc_FileExtension =    64
-// esc_Param         =   128
-// esc_Query         =   256
-// esc_Ref           =   512
+// esc_Scheme        =      1
+// esc_Username      =      2
+// esc_Password      =      4
+// esc_Host          =      8
+// esc_Directory     =     16
+// esc_FileBaseName  =     32
+// esc_FileExtension =     64
+// esc_Param         =    128
+// esc_Query         =    256
+// esc_Ref           =    512
+// esc_ExtHandler    = 131072
 
 static const uint32_t EscapeChars[256] =
     // clang-format off
-//   0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+//     0      1      2      3      4      5      6      7      8      9      A      B      C      D      E      F
 {
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 0x
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 1x
-     0,1023,   0, 512,1023,   0,1023, 624,1023,1023,1023,1023,1023,1023, 953, 784,  // 2x   !"#$%&'()*+,-./
-  1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1008,1008,   0,1008,   0, 768,  // 3x  0123456789:;<=>?
-  1008,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,  // 4x  @ABCDEFGHIJKLMNO
-  1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1008, 896,1008, 896,1023,  // 5x  PQRSTUVWXYZ[\]^_
-   384,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,  // 6x  `abcdefghijklmno
-  1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023, 896,1012, 896,1023,   0,  // 7x  pqrstuvwxyz{|}~ DEL
-     0                                                                              // 80 to FF are zero
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,  // 0x
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,  // 1x
+       0,132095,     0,131584,132095,     0,132095,131696,132095,132095,132095,132095,132095,132095,132025,131856,  // 2x   !"#$%&'()*+,-./
+  132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132080,132080,     0,132080,     0,131840,  // 3x  0123456789:;<=>?
+  132080,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,  // 4x  @ABCDEFGHIJKLMNO
+  132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132080,   896,132080,   896,132095,  // 5x  PQRSTUVWXYZ[\]^_
+     384,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,  // 6x  `abcdefghijklmno
+  132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,132095,   896,  1012,   896,132095,     0,  // 7x  pqrstuvwxyz{|}~ DEL
+       0                                                                                                            // 80 to FF are zero
 };
 // clang-format on
 
-static uint16_t dontNeedEscape(unsigned char aChar, uint32_t aFlags) {
+static bool dontNeedEscape(unsigned char aChar, uint32_t aFlags) {
   return EscapeChars[(uint32_t)aChar] & aFlags;
 }
-static uint16_t dontNeedEscape(uint16_t aChar, uint32_t aFlags) {
+static bool dontNeedEscape(uint16_t aChar, uint32_t aFlags) {
   return aChar < mozilla::ArrayLength(EscapeChars)
              ? (EscapeChars[(uint32_t)aChar] & aFlags)
-             : 0;
+             : false;
 }
 
 //----------------------------------------------------------------------------------------
diff -Nru thunderbird-91.3.2+build1/xpcom/io/nsEscape.h thunderbird-91.4.0+build2/xpcom/io/nsEscape.h
--- thunderbird-91.3.2+build1/xpcom/io/nsEscape.h	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/xpcom/io/nsEscape.h	2021-12-09 12:00:12.000000000 +0000
@@ -102,7 +102,10 @@
       1u << 13, /* copy input to result buf even if escaping is unnecessary */
   esc_Colon = 1u << 14,       /* forces escape of colon */
   esc_SkipControl = 1u << 15, /* skips C0 and DEL from unescaping */
-  esc_Spaces = 1u << 16       /* forces escape of spaces */
+  esc_Spaces = 1u << 16,      /* forces escape of spaces */
+  esc_ExtHandler = 1u << 17   /* For escaping external protocol handler urls.
+                               * Escapes everything except:
+                               * a-z, 0-9 and !#$&'()*+,-./:;=?@[]_~ */
 };
 
 /**
diff -Nru thunderbird-91.3.2+build1/xpcom/threads/nsTimerImpl.cpp thunderbird-91.4.0+build2/xpcom/threads/nsTimerImpl.cpp
--- thunderbird-91.3.2+build1/xpcom/threads/nsTimerImpl.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/xpcom/threads/nsTimerImpl.cpp	2021-12-09 12:00:11.000000000 +0000
@@ -570,7 +570,7 @@
   uint32_t oldDelay;
   TimeStamp oldTimeout;
   Callback callbackDuringFire{UnknownCallback{}};
-  nsCOMPtr<nsITimer> kungFuDeathGrip;
+  nsCOMPtr<nsITimer> timer;
 
   {
     // Don't fire callbacks or fiddle with refcounts when the mutex is locked.
@@ -588,7 +588,7 @@
     // Ensure that the nsITimer does not unhook from the nsTimerImpl during
     // Fire; this will cause null pointer crashes if the user of the timer drops
     // its reference, and then uses the nsITimer* passed in the callback.
-    kungFuDeathGrip = mITimer;
+    timer = mITimer;
   }
 
   AUTO_PROFILER_LABEL("nsTimerImpl::Fire", OTHER);
@@ -617,12 +617,12 @@
 
   callbackDuringFire.match(
       [](const UnknownCallback&) {},
-      [&](const InterfaceCallback& i) { i->Notify(mITimer); },
+      [&](const InterfaceCallback& i) { i->Notify(timer); },
       [&](const ObserverCallback& o) {
-        o->Observe(mITimer, NS_TIMER_CALLBACK_TOPIC, nullptr);
+        o->Observe(timer, NS_TIMER_CALLBACK_TOPIC, nullptr);
       },
-      [&](const FuncCallback& f) { f.mFunc(mITimer, f.mClosure); },
-      [&](const ClosureCallback& c) { c.mFunc(mITimer); });
+      [&](const FuncCallback& f) { f.mFunc(timer, f.mClosure); },
+      [&](const ClosureCallback& c) { c.mFunc(timer); });
 
   MutexAutoLock lock(mMutex);
   if (aGeneration == mGeneration) {
diff -Nru thunderbird-91.3.2+build1/xpcom/threads/ThreadEventQueue.cpp thunderbird-91.4.0+build2/xpcom/threads/ThreadEventQueue.cpp
--- thunderbird-91.3.2+build1/xpcom/threads/ThreadEventQueue.cpp	2021-11-19 11:56:01.000000000 +0000
+++ thunderbird-91.4.0+build2/xpcom/threads/ThreadEventQueue.cpp	2021-12-09 12:00:11.000000000 +0000
@@ -259,7 +259,8 @@
 
 void ThreadEventQueue::SetObserver(nsIThreadObserver* aObserver) {
   MutexAutoLock lock(mLock);
-  mObserver = aObserver;
+  nsCOMPtr observer = aObserver;
+  mObserver.swap(observer);
   if (NS_IsMainThread()) {
     TaskController::Get()->SetThreadObserver(aObserver);
   }